diff --git a/MAINTAINERS b/MAINTAINERS
index 7bc9ff2633a8..f30686a4b8c4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -20,7 +20,7 @@ It is not a registry of 'turf' or private property.
 
 subsystem	login	notes
 -----------------------------
-kqueue		jmg	Pre-commit review requested.
+kqueue		jmg	Pre-commit review requested.  Documentation Required.
 libc/posix1e	rwatson	Pre-commit review requested.
 POSIX.1e ACLs	rwatson	Pre-commit review requested.
 UFS EAs		rwatson	Pre-commit review requested.
@@ -102,13 +102,12 @@ linux emul	emulation	Please discuss changes here.
 bs{diff,patch}	cperciva	Pre-commit review requested.
 portsnap	cperciva	Pre-commit review requested.
 freebsd-update	cperciva	Pre-commit review requested.
-openssl		benl		Pre-commit review requested.
+openssl		benl,jkim	Pre-commit review requested.
 sys/netgraph/bluetooth	emax	Pre-commit review preferred.
 lib/libbluetooth	emax	Pre-commit review preferred.
 lib/libsdp		emax	Pre-commit review preferred.
 usr.bin/bluetooth	emax	Pre-commit review preferred.
 usr.sbin/bluetooth	emax	Pre-commit review preferred.
-gnu/usr.bin/send-pr	bugmaster	Pre-commit review requested.
 *env(3)		secteam	Due to the problematic security history of this
 			code, please have patches reviewed by secteam.
 share/zoneinfo		edwin	Heads-up appreciated, since our data is coming
@@ -133,3 +132,4 @@ release/release.sh	gjb	Pre-commit review and regression tests
 				requested.
 nanobsd		imp	Pre-commit review requested for coordination.
 vmm(4)		neel,grehan	Pre-commit review requested.
+opencrypto	jmg	Pre-commit review requested.  Documentation Required.
diff --git a/Makefile b/Makefile
index c47ba90a70cb..2e26f7fa8230 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@
 #                       specified with XDEV and XDEV_ARCH.
 # xdev-build          - Build cross-development tools.
 # xdev-install        - Install cross-development tools.
+# xdev-links          - Create traditional links in /usr/bin for cc, etc
 # 
 # "quick" way to test all kernel builds:
 # 	_jflag=`sysctl -n hw.ncpu`
@@ -82,7 +83,7 @@
 #
 # See src/UPDATING `COMMON ITEMS' for more complete information.
 #
-# If TARGET=machine (e.g. ia64, sparc64, ...) is specified you can
+# If TARGET=machine (e.g. powerpc, sparc64, ...) is specified you can
 # cross build world for other machine types using the buildworld target,
 # and once the world is built you can cross build a kernel using the
 # buildkernel target.
@@ -110,6 +111,7 @@ TGTS=	all all-man buildenv buildenvvars buildkernel buildworld \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _cross-tools _includes _libraries _depend \
 	build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
+	xdev-links \
 
 TGTS+=	${SUBDIR_TARGETS}
 
@@ -172,6 +174,13 @@ _TARGET=${TARGET}
 .if defined(TARGET_ARCH) && !defined(_TARGET_ARCH)
 _TARGET_ARCH=${TARGET_ARCH}
 .endif
+# for historical compatibility for xdev targets
+.if defined(XDEV)
+_TARGET=	${XDEV}
+.endif
+.if defined(XDEV_ARCH)
+_TARGET_ARCH=	${XDEV_ARCH}
+.endif
 # Otherwise, default to current machine type and architecture.
 _TARGET?=	${MACHINE}
 _TARGET_ARCH?=	${MACHINE_ARCH}
@@ -329,6 +338,7 @@ MMAKEENV=	MAKEOBJDIRPREFIX=${MYMAKE:H} \
 MMAKE=		${MMAKEENV} ${MAKE} \
 		-DNO_MAN -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WERROR \
+		MK_TESTS=no \
 		DESTDIR= PROGNAME=${MYMAKE:T}
 
 bmake: .PHONY
@@ -361,7 +371,7 @@ kernel-toolchains:
 # existing system is.
 #
 .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
-TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64
+TARGETS?=amd64 arm i386 mips pc98 powerpc sparc64
 TARGET_ARCHES_arm?=	arm armeb armv6 armv6hf
 TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32
 TARGET_ARCHES_powerpc?=	powerpc powerpc64
diff --git a/Makefile.inc1 b/Makefile.inc1
index 344da994ef32..5a8977e71970 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -17,6 +17,7 @@
 #	-DNO_DOCUPDATE do not update doc in ${MAKE} update
 #	-DWITHOUT_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
+#	LOCAL_ITOOLS="list of tools" to add additional tools to the ITOOLS list
 #	LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target
 #	LOCAL_MTREE="list of mtree files" to process to allow local directories
 #	    to be created before files are installed
@@ -139,7 +140,7 @@ SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
 VERSION=	FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE}
 .endif
 
-KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
+KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
 .if ${TARGET} == ${TARGET_ARCH}
 _t=		${TARGET}
 .else
@@ -394,7 +395,8 @@ LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		PATH=${TMPPATH} \
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32 \
-		LIBPRIVATEDIR=/usr/lib32/private
+		LIBPRIVATEDIR=/usr/lib32/private \
+		DTRACE="${DTRACE} -32"
 LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \
 		CXX="${XCXX} ${LIB32FLAGS}" \
 		DESTDIR=${LIB32TMP} \
@@ -756,7 +758,8 @@ _zoneinfo=	zic tzsetup
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \
 	date echo egrep find grep id install ${_install-info} \
 	ln lockf make mkdir mtree mv pwd_mkdb \
-	rm sed services_mkdb sh sysctl test true uname wc ${_zoneinfo}
+	rm sed services_mkdb sh sysctl test true uname wc ${_zoneinfo} \
+	${LOCAL_ITOOLS}
 
 #
 # distributeworld
@@ -780,6 +783,11 @@ EXTRA_DISTRIBUTIONS+=	lib32
 EXTRA_DISTRIBUTIONS+=	tests
 .endif
 
+DEBUG_DISTRIBUTIONS=
+.if ${MK_DEBUG_FILES} != "no"
+DEBUG_DISTRIBUTIONS+=	base ${EXTRA_DISTRIBUTIONS:S,doc,,}
+.endif
+
 MTREE_MAGIC?=	mtree 2.0
 
 distributeworld installworld: _installcheck_world
@@ -856,8 +864,7 @@ distributeworld installworld: _installcheck_world
 	awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
 	${DESTDIR}/${DISTDIR}/${dist}.meta
 .endfor
-.if ${MK_DEBUG_FILES} != "no"
-. for dist in base ${EXTRA_DISTRIBUTIONS}
+.for dist in ${DEBUG_DISTRIBUTIONS}
 	@# For each file that exists in this dist, print the corresponding
 	@# line from the METALOG.  This relies on the fact that
 	@# a line containing only the filename will sort immediatly before
@@ -866,8 +873,7 @@ distributeworld installworld: _installcheck_world
 	find ./${dist}/usr/lib/debug | sort -u ${METALOG} - | \
 	awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
 	${DESTDIR}/${DISTDIR}/${dist}.debug.meta
-. endfor
-.endif
+.endfor
 .endif
 .endif
 
@@ -885,19 +891,17 @@ packageworld:
 .endif
 .endfor
 
-.if ${MK_DEBUG_FILES} != "no"
-. for dist in base ${EXTRA_DISTRIBUTIONS}
-.  if defined(NO_ROOT)
+.for dist in ${DEBUG_DISTRIBUTIONS}
+. if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \
+	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \
 	    @${DESTDIR}/${DISTDIR}/${dist}.debug.meta
-.  else
+. else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
-	    tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \
+	    tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \
 	    usr/lib/debug
-.  endif
-. endfor
-.endif
+. endif
+.endfor
 
 #
 # reinstall
@@ -1196,16 +1200,17 @@ _gperf=		gnu/usr.bin/gperf
 _groff=		gnu/usr.bin/groff
 .endif
 
+.if ${MK_VT} != "no"
+_vtfontcvt=	usr.bin/vtfontcvt
+.endif
+
 .if ${BOOTSTRAPPING} < 900002
 _sed=		usr.bin/sed
 .endif
 
-.if ${BOOTSTRAPPING} < 900006
-_lex=		usr.bin/lex
-.endif
-
 .if ${BOOTSTRAPPING} < 1000002
-_m4=		usr.bin/m4
+_m4=		lib/libohash \
+		usr.bin/m4
 .endif
 
 .if ${BOOTSTRAPPING} < 1000013
@@ -1226,6 +1231,10 @@ _nmtree=	lib/libnetbsd \
 _cat=		bin/cat
 .endif
 
+.if ${BOOTSTRAPPING} < 1000033
+_lex=		usr.bin/lex
+.endif
+
 .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
 _awk=		usr.bin/awk
 .endif
@@ -1295,7 +1304,8 @@ bootstrap-tools: .MAKE
     ${_gensnmptree} \
     usr.sbin/config \
     ${_crunch} \
-    ${_nmtree}
+    ${_nmtree} \
+    ${_vtfontcvt}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${MAKE} DIRPRFX=${_tool}/ obj && \
@@ -1358,9 +1368,6 @@ kernel-tools: .MAKE
 #
 # cross-tools: Build cross-building tools
 #
-.if !defined(TARGET_ARCH) && defined(XDEV_ARCH)
-TARGET_ARCH=	${XDEV_ARCH}
-.endif
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
@@ -1401,7 +1408,8 @@ cross-tools: .MAKE
     usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
     ${_btxld} \
     ${_crunchide} \
-    ${_kgzip}
+    ${_kgzip} \
+    sys/boot/usb/tools
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${MAKE} DIRPRFX=${_tool}/ obj && \
@@ -1486,9 +1494,10 @@ _prebuild_libs=	${_kerberos5_lib_libasn1} \
 		lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_lib_libldns} \
 		${_secure_lib_libssh} ${_secure_lib_libssl}
-.if ${MK_GNUCXX} != "no" && ${MK_CXX} != "no"
+.if ${MK_GNUCXX} != "no"
 _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
 gnu/lib/libstdc++__L: lib/msun__L
+gnu/lib/libsupc++__L: gnu/lib/libstdc++__L
 .endif
 
 .if defined(WITH_ATF) || ${MK_TESTS} != "no"
@@ -1845,9 +1854,9 @@ builddtb:
 
 ###############
 
-.if defined(XDEV) && defined(XDEV_ARCH)
+.if defined(TARGET) && defined(TARGET_ARCH)
 
-.if ${XDEV} == ${MACHINE} && ${XDEV_ARCH} == ${MACHINE_ARCH}
+.if ${TARGET} == ${MACHINE} && ${TARGET_ARCH} == ${MACHINE_ARCH}
 XDEV_CPUTYPE?=${CPUTYPE}
 .else
 XDEV_CPUTYPE?=${TARGET_CPUTYPE}
@@ -1856,10 +1865,10 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE}
 NOFUN=-DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT \
 	MK_MAN=no MK_NLS=no MK_PROFILE=no \
 	MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no MK_WARNS=no \
-	TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
+	TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}
 
-XDDIR=${XDEV_ARCH}-freebsd
+XDDIR=${TARGET_ARCH}-freebsd
 XDTP?=/usr/${XDDIR}
 .if ${XDTP:N/*}
 .error XDTP variable should be an absolute path
@@ -1875,7 +1884,7 @@ CD2CFLAGS=-isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib \
 	-B${XDDESTDIR}/usr/bin -B${XDDESTDIR}/usr/lib
 CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${CD2CFLAGS}" \
 	CPP="${CPP} ${CD2CFLAGS}" \
-	MACHINE=${XDEV} MACHINE_ARCH=${XDEV_ARCH}
+	MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}
 
 CDTMP=	${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
 CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
@@ -1885,7 +1894,7 @@ XDDESTDIR=${DESTDIR}/${XDTP}
 OSREL!= uname -r | sed -e 's/[-(].*//'
 .endif
 
-.ORDER: xdev-build xdev-install
+.ORDER: xdev-build xdev-install xdev-links
 xdev: xdev-build xdev-install
 
 .ORDER: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools
@@ -1934,9 +1943,13 @@ _xi-mtree:
 	    -p ${XDDESTDIR}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${XDDESTDIR}/usr/include >/dev/null
+.if ${MK_TESTS} != "no"
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
+	    -p ${XDDESTDIR}/usr >/dev/null
+.endif
 
-.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
-xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
+.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
+xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
 
 _xi-cross-tools:
 	@echo "_xi-cross-tools"
@@ -1959,9 +1972,9 @@ _xi-libraries:
 	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \
 		DESTDIR=${XDDESTDIR}
 
-_xi-links:
+xdev-links:
 	${_+_}cd ${XDDESTDIR}/usr/bin; \
-       mkdir -p ../../../../usr/bin; \
+	mkdir -p ../../../../usr/bin; \
 		for i in *; do \
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}-$$i; \
@@ -1969,6 +1982,6 @@ _xi-links:
 			    ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
 		done
 .else
-xdev xdev-build xdev-install:
-	@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target"
+xdev xdev-build xdev-install xdev-links:
+	@echo "*** Error: Both TARGET and TARGET_ARCH must be defined for \"${.TARGET}\" target"
 .endif
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index ab87b78d3e62..803715cca040 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,94 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20140811: otp-sha renamed to otp-sha1
+OLD_FILES+=usr/bin/otp-sha
+OLD_FILES+=usr/share/man/man1/otp-sha.1.gz
+# 20140807: Remove private lib files that should not be installed.
+OLD_FILES+=usr/lib/private/libatf-c.a
+OLD_FILES+=usr/lib/private/libatf-c.so
+OLD_FILES+=usr/lib/private/libatf-c_p.a
+OLD_FILES+=usr/lib/private/libatf-c++.a
+OLD_FILES+=usr/lib/private/libatf-c++.so
+OLD_FILES+=usr/lib/private/libatf-c++_p.a
+OLD_FILES+=usr/lib/private/libbsdstat.a
+OLD_FILES+=usr/lib/private/libbsdstat.so
+OLD_FILES+=usr/lib/private/libbsdstat_p.a
+OLD_FILES+=usr/lib/private/libheimipcc.a
+OLD_FILES+=usr/lib/private/libheimipcc.so
+OLD_FILES+=usr/lib/private/libheimipcc_p.a
+OLD_FILES+=usr/lib/private/libheimipcs.a
+OLD_FILES+=usr/lib/private/libheimipcs.so
+OLD_FILES+=usr/lib/private/libheimipcs_p.a
+OLD_FILES+=usr/lib/private/libldns.a
+OLD_FILES+=usr/lib/private/libldns.so
+OLD_FILES+=usr/lib/private/libldns_p.a
+OLD_FILES+=usr/lib/private/libssh.a
+OLD_FILES+=usr/lib/private/libssh.so
+OLD_FILES+=usr/lib/private/libssh.p.a
+OLD_FILES+=usr/lib/private/libunbound.a
+OLD_FILES+=usr/lib/private/libunbound.so
+OLD_FILES+=usr/lib/private/libunbound_p.a
+OLD_FILES+=usr/lib/private/libucl.a
+OLD_FILES+=usr/lib/private/libucl.so
+OLD_FILES+=usr/lib/private/libucl_p.a
+# 20140803: Remove an obsolete man page
+OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz
+# 20140728: libsbuf restored to old version.
+OLD_LIBS+=lib/libsbuf.so.7
+# 20140728: Remove an obsolete man page
+OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz
+OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
+OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz
+# 20140723: renamed to PCBGROUP.9
+OLD_FILES+=usr/share/man/man9/PCBGROUPS.9.gz
+# 20140718: Remove obsolete man pages
+OLD_FILES+=usr/share/man/man9/zero_copy.9.gz
+OLD_FILES+=usr/share/man/man9/zero_copy_sockets.9.gz
+# 20140718: Remove an obsolete man page
+OLD_FILES+=usr/share/man/man9/pmap_page_protect.9.gz
+# 20140717: Remove an obsolete man page
+OLD_FILES+=usr/share/man/man9/pmap_clear_reference.9.gz
+# 20140716: Remove an incorrectly named man page
+OLD_FILES+=usr/share/man/man9/pmap_ts_modified.9.gz
+# 20140712: Removal of bsd.dtrace.mk
+OLD_FILES+=usr/share/mk/bsd.dtrace.mk
+# 20140705: turn libreadline into an internal lib
+OLD_LIBS+=lib/libreadline.so.8
+OLD_FILES+=usr/lib/libreadline.a
+OLD_FILES+=usr/lib/libreadline_p.a
+OLD_FILES+=usr/lib/libreadline.so
+OLD_FILES+=usr/lib/libhistory.a
+OLD_FILES+=usr/lib/libhistory_p.a
+OLD_FILES+=usr/lib/libhistory.so
+OLD_LIBS+=usr/lib/libhistory.so.8
+OLD_FILES+=usr/include/readline/chardefs.h
+OLD_FILES+=usr/include/readline/history.h
+OLD_FILES+=usr/include/readline/keymaps.h
+OLD_FILES+=usr/include/readline/readline.h
+OLD_FILES+=usr/include/readline/rlconf.h
+OLD_FILES+=usr/include/readline/rlstdc.h
+OLD_FILES+=usr/include/readline/rltypedefs.h
+OLD_FILES+=usr/include/readline/rltypedefs.h
+OLD_FILES+=usr/share/info/readline.info.gz
+OLD_FILES+=usr/share/man/man3/readline.3.gz
+# 20140625: csup removal
+OLD_FILES+=usr/bin/csup
+OLD_FILES+=usr/bin/cpasswd
+OLD_FILES+=usr/share/man/man1/csup.1.gz
+OLD_FILES+=usr/share/man/man1/cpasswd.1.gz
+OLD_FILES+=usr/share/examples/cvsup/README
+OLD_FILES+=usr/share/examples/cvsup/cvs-supfile
+OLD_FILES+=usr/share/examples/cvsup/stable-supfile
+OLD_FILES+=usr/share/examples/cvsup/standard-supfile
+OLD_DIRS+=usr/share/examples/cvsup
+# 20140614: send-pr removal
+OLD_FILES+=usr/bin/sendbug
+OLD_FILES+=usr/share/info/send-pr.info.gz
+OLD_FILES+=usr/share/man/man1/send-pr.1.gz
+OLD_FILES+=usr/share/man/man1/sendbug.1.gz
+OLD_FILES+=etc/gnats/freefall
+OLD_DIRS+=etc/gnats
 # 20140512: new clang import which bumps version from 3.4 to 3.4.1.
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_pclmul.h
@@ -544,6 +632,7 @@ OLD_FILES+=usr/share/man/man9/vfs_mount.9.gz
 OLD_FILES+=usr/bin/cvs
 OLD_FILES+=usr/bin/cvsbug
 OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ascii.gz
+OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ps.gz
 OLD_DIRS+=usr/share/doc/psd/28.cvs
 OLD_FILES+=usr/share/examples/cvs/contrib/README
 OLD_FILES+=usr/share/examples/cvs/contrib/clmerge
@@ -1164,9 +1253,6 @@ OLD_FILES+=usr/include/xmmintrin.h
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/mmintrin.h
 .endif
-.if ${TARGET_ARCH} == "ia64"
-OLD_FILES+=usr/include/ia64intrin.h
-.endif
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/altivec.h
 OLD_FILES+=usr/include/ppc-asm.h
@@ -1184,10 +1270,6 @@ OLD_FILES+=usr/include/machine/rm7000.h
 OLD_FILES+=usr/include/machine/defs.h
 OLD_FILES+=usr/include/machine/queue.h
 .endif
-# 20100326: [ia64] removed <machine/nexusvar.h>
-.if ${TARGET_ARCH} == "ia64"
-OLD_FILES+=usr/include/machine/nexusvar.h
-.endif
 # 20100326: gcpio removal
 OLD_FILES+=usr/bin/gcpio
 OLD_FILES+=usr/share/info/cpio.info.gz
@@ -1201,11 +1283,6 @@ OLD_FILES+=usr/share/man/man3/regexp.3.gz
 OLD_FILES+=usr/share/man/man3/regsub.3.gz
 # 20100303: actual removal of utmp.h
 OLD_FILES+=usr/include/utmp.h
-# 20100227: [ia64] removed <machine/sapicreg.h> and <machine/sapicvar.h>
-.if ${TARGET_ARCH} == "ia64"
-OLD_FILES+=usr/include/machine/sapicreg.h
-OLD_FILES+=usr/include/machine/sapicvar.h
-.endif
 # 20100208: man pages moved
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz
@@ -1898,14 +1975,6 @@ OLD_FILES+=usr/share/man/man8/arlcontrol.8.gz
 OLD_FILES+=sbin/sunlabel
 OLD_FILES+=usr/share/man/man8/sunlabel.8.gz
 .endif
-# 20080703: bsdlabel & fdisk removed on ia64
-.if ${TARGET_ARCH} == "ia64"
-OLD_FILES+=sbin/bsdlabel
-OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz
-OLD_FILES+=usr/share/man/man8/disklabel.8.gz
-OLD_FILES+=sbin/fdisk
-OLD_FILES+=usr/share/man/man8/fdisk.8.gz
-.endif
 # 20080701: wpa_supplicant.conf moved to share/examples/etc/
 OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf
 OLD_DIRS+=usr/share/examples/wpa_supplicant
@@ -2114,12 +2183,6 @@ OLD_FILES+=usr/include/sys/_elf_solaris.h
 OLD_FILES+=usr/share/man/man3/pmc_x86_get_msr.3.gz
 # 20071108: Removed very crunch OLDCARD support file
 OLD_FILES+=etc/defaults/pccard.conf
-# 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64.
-.if ${TARGET_ARCH} == "ia64"
-OLD_FILES+=rescue/bsdlabel
-OLD_FILES+=rescue/fdisk
-OLD_FILES+=rescue/gpt
-.endif
 # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
 OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd
@@ -2780,10 +2843,6 @@ OLD_FILES+=usr/share/man/man8/mount_std.8.gz
 OLD_FILES+=usr/share/man/man4/uhidev.4.gz
 # 20061106: archive_write_prepare.3 removed
 OLD_FILES+=usr/share/man/man3/archive_write_prepare.3.gz
-.if ${TARGET_ARCH} == "ia64"
-# 20061104: skiload.help removed
-OLD_FILES+=boot/skiload.help
-.endif
 # 20061018: pccardc removed
 OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz
 # 20060930: demangle.h from contrib/libstdc++/include/ext/
diff --git a/UPDATING b/UPDATING
index 75d844eab19b..cb00e10d167b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -1,4 +1,4 @@
-Updating Information for FreeBSD current users
+Updating Information for FreeBSD current users.
 
 This file is maintained and copyrighted by M. Warner Losh <imp@freebsd.org>.
 See end of file for further details.  For commonly done items, please see the
@@ -31,6 +31,59 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20140729:
+	The ofwfb driver, used to provide a graphics console on PowerPC when
+	using vt(4), no longer allows mmap() of all of physical memory. This
+	will prevent Xorg on PowerPC with some ATI graphics cards from
+	initializing properly unless x11-servers/xorg-server is updated to
+	1.12.4_8 or newer.
+
+20140723:
+	The xdev targets have been converted to using TARGET and
+	TARGET_ARCH instead of XDEV and XDEV_ARCH.
+
+20140719:
+	The default unbound configuration has been modified to address
+	issues with reverse lookups on networks that use private
+	address ranges.  If you use the local_unbound service, run
+	"service local_unbound setup" as root to regenerate your
+	configuration, then "service local_unbound reload" to load the
+	new configuration.
+
+20140709:
+	The GNU texinfo and GNU info pages are not built and installed
+	anymore, WITH_INFO knob has been added to allow to built and install
+	them again.
+
+20140708:
+	The GNU readline library is now an INTERNALLIB - that is, it is
+	statically linked into consumers (GDB and variants) in the base
+	system, and the shared library is no longer installed.  The
+	devel/readline port is available for third party software that
+	requires readline.
+
+20140702:
+	The Itanium architecture (ia64) has been removed from the list of
+	known architectures. This is the first step in the removal of the
+	architecture.
+
+20140701:
+	Commit r268115 has added NFSv4.1 server support, merged from
+	projects/nfsv4.1-server.  Since this includes changes to the
+	internal interfaces between the NFS related modules, a full
+	build of the kernel and modules will be necessary.
+	__FreeBSD_version has been bumped.
+
+20140629:
+	The WITHOUT_VT_SUPPORT kernel config knob has been renamed
+	WITHOUT_VT.  (The other _SUPPORT knobs have a consistent meaning
+	which differs from the behaviour controlled by this knob.)
+
+20140619:
+	Maximal length of the serial number in CTL was increased from 16 to
+	64 chars, that breaks ABI.  All CTL-related tools, such as ctladm
+	and ctld, need to be rebuilt to work with a new kernel.
+
 20140606:
 	The libatf-c and libatf-c++ major versions were downgraded to 0 and
 	1 respectively to match the upstream numbers.  They were out of
@@ -71,7 +124,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
 	Although this has survived make universe and some upgrade scenarios,
 	other upgrade scenarios may have broken. At least one form of
 	temporary breakage was fixed with MAKESYSPATH settings for buildworld
-	as well...
+	as well... In cases where MAKESYSPATH isn't working with this
+	setting, you'll need to set it to the full path to your tree.
 
 	One side effect of all this cleaning up is that bsd.compiler.mk
 	is no longer implicitly included by bsd.own.mk. If you wish to
diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 920c31e81648..a61242b2294a 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -151,7 +151,6 @@ This command will query the status of the specified media unit, and
 will move it to the element specified in its source attribute.
 This is a convenient way to return media from a drive or portal
 to its previous element in the changer.
-.Pp
 .It Ic position Xo
 .Ar <to ET> <to EU>
 .Op Cm inv
@@ -173,7 +172,6 @@ Report which picker unit the changer is currently configured to use.
 .Xc
 Configure the changer to use picker
 .Ar <unit> .
-.Pp
 .It Ic ielem Xo
 .Op Ar <timeout>
 .Xc
@@ -292,13 +290,11 @@ Configure the changer to use picker 2 (third picker) for operations.
 The
 .Nm
 program and SCSI changer driver were written by
-.An Jason R. Thorpe Aq thorpej@and.com
+.An Jason R. Thorpe Aq Mt thorpej@and.com
 for And Communications,
 .Pa http://www.and.com/ .
 .Pp
 Additional work by
-.An Hans Huebner
-.Aq hans@artcom.de
+.An Hans Huebner Aq Mt hans@artcom.de
 and
-.An Steve Gunn
-.Aq csg@waterspout.com .
+.An Steve Gunn Aq Mt csg@waterspout.com .
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index c8845f9523c9..9f305b4f5f04 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -40,8 +40,8 @@ MLINKS= csh.1 tcsh.1
 # utilities of the same name are handled with the associated manpage,
 # builtin.1 in share/man/man1/.
 
-DPADD=	${LIBTERMCAP} ${LIBCRYPT}
-LDADD=	-ltermcap -lcrypt
+DPADD=	${LIBTERMCAPW} ${LIBCRYPT}
+LDADD=	-ltermcapw -lcrypt
 
 LINKS=	${BINDIR}/csh ${BINDIR}/tcsh
 
diff --git a/bin/date/tests/Makefile b/bin/date/tests/Makefile
index 2301dcf203d1..d023195b3289 100644
--- a/bin/date/tests/Makefile
+++ b/bin/date/tests/Makefile
@@ -4,6 +4,6 @@
 
 TESTSDIR=	${TESTSBASE}/bin/date
 
-TAP_TESTS_SH=	legacy_test
+ATF_TESTS_SH=	format_string_test
 
 .include <bsd.test.mk>
diff --git a/bin/date/tests/format_string_test.sh b/bin/date/tests/format_string_test.sh
new file mode 100755
index 000000000000..0bd4f1ea7b95
--- /dev/null
+++ b/bin/date/tests/format_string_test.sh
@@ -0,0 +1,92 @@
+#
+# Regression tests for date(1)
+#
+# Submitted by Edwin Groothuis <edwin@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+#
+# These two date/times have been chosen carefully -- they
+# create both the single digit and double/multidigit version of
+# the values.
+#
+# To create a new one, make sure you are using the UTC timezone!
+#
+
+TEST1=3222243		# 1970-02-07 07:04:03
+TEST2=1005600000	# 2001-11-12 21:11:12
+
+check()
+{
+	local format_string exp_output_1 exp_output_2
+
+	format_string=${1}
+	exp_output_1=${2}
+	exp_output_2=${3}
+
+	atf_check -o "inline:${exp_output_1}\n" \
+	    date -r ${TEST1} +%${format_string}
+	atf_check -o "inline:${exp_output_2}\n" \
+	    date -r ${TEST2} +%${format_string}
+}
+
+format_string_test()
+{
+	local desc exp_output_1 exp_output_2 flag
+
+	desc=${1}
+	flag=${2}
+	exp_output_1=${3}
+	exp_output_2=${4}
+
+	atf_test_case ${desc}_test
+	eval "
+${desc}_test_body() {
+	check ${flag} '${exp_output_1}' '${exp_output_2}';
+}"
+	atf_add_test_case ${desc}_test
+}
+
+atf_init_test_cases()
+{
+	format_string_test A A Saturday Monday
+	format_string_test a a Sat Mon
+	format_string_test B B February November
+	format_string_test b b Feb Nov
+	format_string_test C C 19 20
+	format_string_test c c "Sat Feb  7 07:04:03 1970" "Mon Nov 12 21:20:00 2001"
+	format_string_test D D 02/07/70 11/12/01
+	format_string_test d d 07 12
+	format_string_test e e " 7" 12
+	format_string_test F F "1970-02-07" "2001-11-12"
+	format_string_test G G 1970 2001
+	format_string_test g g 70 01
+	format_string_test H H 07 21
+	format_string_test h h Feb Nov
+	format_string_test I I 07 09
+	format_string_test j j 038 316
+	format_string_test k k " 7" 21
+	format_string_test l l " 7" " 9"
+	format_string_test M M 04 20
+	format_string_test m m 02 11
+	format_string_test p p AM PM
+	format_string_test R R 07:04 21:20
+	format_string_test r r "07:04:03 AM" "09:20:00 PM"
+	format_string_test S S 03 00
+	format_string_test s s ${TEST1} ${TEST2}
+	format_string_test U U 05 45
+	format_string_test u u 6 1
+	format_string_test V V 06 46
+	format_string_test v v " 7-Feb-1970" "12-Nov-2001"
+	format_string_test W W 05 46
+	format_string_test w w 6 1
+	format_string_test X X "07:04:03" "21:20:00"
+	format_string_test x x "02/07/70" "11/12/01"
+	format_string_test Y Y 1970 2001
+	format_string_test y y 70 01
+	format_string_test Z Z UTC UTC
+	format_string_test z z +0000 +0000
+	format_string_test percent % % %
+	format_string_test plus + "Sat Feb  7 07:04:03 UTC 1970" "Mon Nov 12 21:20:00 UTC 2001"
+}
diff --git a/bin/date/tests/legacy_test.sh b/bin/date/tests/legacy_test.sh
deleted file mode 100644
index 981bdd017168..000000000000
--- a/bin/date/tests/legacy_test.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-#
-# Regression tests for date(1)
-#
-# Submitted by Edwin Groothuis <edwin@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-#
-# These two date/times have been chosen carefully, they
-# create both the single digit and double/multidigit version of
-# the values.
-#
-# To create a new one, make sure you are using the UTC timezone!
-#
-
-TEST1=3222243		# 1970-02-07 07:04:03
-TEST2=1005600000	# 2001-11-12 21:11:12
-
-export LC_ALL=C
-export TZ=UTC
-count=0
-
-check()
-{
-	S=$1
-	A1=$2
-	A2=$3
-
-	count=`expr ${count} + 1`
-
-	if [ -z "${A2}" ]; then A2=${A1}; fi
-
-	R=`date -r ${TEST1} +%${S}`
-	if [ "${R}" = "${A1}" ]; then
-		echo "ok ${S}{t1}"
-	else
-		echo "no ok ${S}{t1} - (got ${R}, expected ${A1})"
-	fi
-
-	R=`date -r ${TEST2} +%${S}`
-	if [ "${R}" = "${A2}" ]; then
-		echo "ok ${S}{t2}"
-	else
-		echo "no ok ${S}{t2} - (got ${R}, expected ${A2})"
-	fi
-}
-
-echo "1..78"
-
-check A Saturday Monday
-check a Sat Mon
-check B February November
-check b Feb Nov
-check C 19 20
-check c "Sat Feb  7 07:04:03 1970" "Mon Nov 12 21:20:00 2001"
-check D 02/07/70 11/12/01
-check d 07 12
-check e " 7" 12
-check F "1970-02-07" "2001-11-12"
-check G 1970 2001
-check g 70 01
-check H 07 21
-check h Feb Nov
-check I 07 09
-check j 038 316
-check k " 7" 21
-check l " 7" " 9"
-check M 04 20
-check m 02 11
-check p AM PM
-check R 07:04 21:20
-check r "07:04:03 AM" "09:20:00 PM"
-check S 03 00
-check s ${TEST1} ${TEST2}
-check U 05 45
-check u 6 1
-check V 06 46
-check v " 7-Feb-1970" "12-Nov-2001"
-check W 05 46
-check w 6 1
-check X "07:04:03" "21:20:00"
-check x "02/07/70" "11/12/01"
-check Y 1970 2001
-check y 70 01
-check Z UTC UTC
-check z +0000 +0000
-check % % %
-check + "Sat Feb  7 07:04:03 UTC 1970" "Mon Nov 12 21:20:00 UTC 2001"
diff --git a/bin/freebsd-version/freebsd-version.1 b/bin/freebsd-version/freebsd-version.1
index 1eea5bbd972b..7e471bf5955e 100644
--- a/bin/freebsd-version/freebsd-version.1
+++ b/bin/freebsd-version/freebsd-version.1
@@ -121,4 +121,4 @@ command appeared in
 The
 .Nm
 utility and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index 7149d9146b0c..dce204655be0 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -11,8 +11,8 @@ LDADD=	-lutil
 .if !defined(RELEASE_CRUNCH) && \
 	${MK_LS_COLORS} != no
 CFLAGS+= -DCOLORLS
-DPADD+=	${LIBTERMCAP}
-LDADD+=	-ltermcap
+DPADD+=	${LIBTERMCAPW}
+LDADD+=	-ltermcapw
 .endif
 
 .include <bsd.prog.mk>
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 2710f890774b..3e832acbfdf0 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -278,6 +278,7 @@ fastcopy(const char *from, const char *to, struct stat *sbp)
 	static char *bp = NULL;
 	mode_t oldmode;
 	int nread, from_fd, to_fd;
+	struct stat tsb;
 
 	if ((from_fd = open(from, O_RDONLY, 0)) < 0) {
 		warn("fastcopy: open() failed (from): %s", from);
@@ -336,10 +337,18 @@ err:		if (unlink(to))
 	 * if the server supports flags and we were trying to *remove* flags
 	 * on a file that we copied, i.e., that we didn't create.)
 	 */
-	errno = 0;
-	if (fchflags(to_fd, sbp->st_flags))
-		if (errno != EOPNOTSUPP || sbp->st_flags != 0)
-			warn("%s: set flags (was: 0%07o)", to, sbp->st_flags);
+	if (fstat(to_fd, &tsb) == 0) {
+		if ((sbp->st_flags  & ~UF_ARCHIVE) !=
+		    (tsb.st_flags & ~UF_ARCHIVE)) {
+			if (fchflags(to_fd,
+			    sbp->st_flags | (tsb.st_flags & UF_ARCHIVE)))
+				if (errno != EOPNOTSUPP ||
+				    ((sbp->st_flags & ~UF_ARCHIVE) != 0))
+					warn("%s: set flags (was: 0%07o)",
+					    to, sbp->st_flags);
+		}
+	} else
+		warn("%s: cannot stat", to);
 
 	tval[0].tv_sec = sbp->st_atime;
 	tval[1].tv_sec = sbp->st_mtime;
diff --git a/bin/pkill/pkill.1 b/bin/pkill/pkill.1
index 1ca383fa395a..3f219b69a0f3 100644
--- a/bin/pkill/pkill.1
+++ b/bin/pkill/pkill.1
@@ -291,5 +291,4 @@ Solaris 7.
 They made their first appearance in
 .Fx 5.3 .
 .Sh AUTHORS
-.An Andrew Doran
-.Aq ad@NetBSD.org
+.An Andrew Doran Aq Mt ad@NetBSD.org
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 3d7edf7ea8e1..d8e56fba30e4 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd June 6, 2014
+.Dd August 7, 2014
 .Dt PS 1
 .Os
 .Sh NAME
@@ -332,7 +332,6 @@ the include file
 .It Dv "P_SINGLE_BOUNDARY" Ta No "0x400000" Ta "Threads should suspend at user boundary"
 .It Dv "P_HWPMC" Ta No "0x800000" Ta "Process is using HWPMCs"
 .It Dv "P_JAILED" Ta No "0x1000000" Ta "Process is in jail"
-.It Dv "P_ORPHAN" Ta No "0x2000000" Ta "Orphaned by original parent, reparented to debugger"
 .It Dv "P_INEXEC" Ta No "0x4000000" Ta "Process is in execve()"
 .It Dv "P_STATCHILD" Ta No "0x8000000" Ta "Child process stopped or exited"
 .It Dv "P_INMEM" Ta No "0x10000000" Ta "Loaded into memory"
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index 824b627dec40..840b560a7d4f 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -121,7 +121,6 @@ each directory's contents are processed (as well as before the attempt
 is made to remove the directory).
 If the user does not respond affirmatively, the file hierarchy rooted in
 that directory is skipped.
-.Pp
 .It Fl r
 Equivalent to
 .Fl R .
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 976b4eeb57c2..46807b9e4e58 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -335,7 +335,7 @@ rm_tree(char **argv)
 		warn("%s", p->fts_path);
 		eval = 1;
 	}
-	if (errno)
+	if (!fflag && errno)
 		err(1, "fts_read");
 	fts_close(fts);
 }
diff --git a/bin/setfacl/setfacl.1 b/bin/setfacl/setfacl.1
index 410431560d50..7894233c0f58 100644
--- a/bin/setfacl/setfacl.1
+++ b/bin/setfacl/setfacl.1
@@ -485,6 +485,6 @@ NFSv4 ACL support was introduced in
 The
 .Nm
 utility was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
 NFSv4 ACL support was implemented by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index 6a982bc2b8b7..ad43d33e6c3c 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -18,8 +18,8 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS}
 # utilities of the same name are handled with the associated manpage,
 # builtin.1 in share/man/man1/.
 
-DPADD= ${LIBEDIT} ${LIBTERMCAP}
-LDADD= -ledit -ltermcap
+DPADD= ${LIBEDIT} ${LIBTERMCAPW}
+LDADD= -ledit -ltermcapw
 
 CFLAGS+=-DSHELL -I. -I${.CURDIR}
 # for debug:
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 4f7559e18487..3fd3050111da 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -1250,8 +1250,16 @@ bltincmd(int argc, char **argv)
 int
 breakcmd(int argc, char **argv)
 {
-	int n = argc > 1 ? number(argv[1]) : 1;
+	long n;
+	char *end;
 
+	if (argc > 1) {
+		/* Allow arbitrarily large numbers. */
+		n = strtol(argv[1], &end, 10);
+		if (!is_digit(argv[1][0]) || *end != '\0')
+			error("Illegal number: %s", argv[1]);
+	} else
+		n = 1;
 	if (n > loopnest)
 		n = loopnest;
 	if (n > 0) {
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index 1b8d3c7dc22c..c9d4126488e6 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -365,7 +365,7 @@ find_command(const char *name, struct cmdentry *entry, int act,
 	for (;(fullname = padvance(&path, name)) != NULL; stunalloc(fullname)) {
 		idx++;
 		if (pathopt) {
-			if (prefix("func", pathopt)) {
+			if (strncmp(pathopt, "func", 4) == 0) {
 				/* handled below */
 			} else {
 				continue; /* ignore unimplemented options */
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index a126ca60a6dd..15afc9ce67fe 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -846,9 +846,11 @@ varisset(const char *name, int nulok)
 		}
 	} else if (is_digit(*name)) {
 		char *ap;
-		int num = atoi(name);
+		long num;
 
-		if (num > shellparam.nparam)
+		errno = 0;
+		num = strtol(name, NULL, 10);
+		if (errno != 0 || num > shellparam.nparam)
 			return 0;
 
 		if (num == 0)
@@ -928,17 +930,16 @@ varvalue(const char *name, int quoted, int subtype, int flag)
 				STPUTC(sep, expdest);
 		}
 		break;
-	case '0':
-		p = arg0;
-		strtodest(p, flag, subtype, quoted);
-		break;
 	default:
 		if (is_digit(*name)) {
 			num = atoi(name);
-			if (num > 0 && num <= shellparam.nparam) {
+			if (num == 0)
+				p = arg0;
+			else if (num > 0 && num <= shellparam.nparam)
 				p = shellparam.p[num - 1];
-				strtodest(p, flag, subtype, quoted);
-			}
+			else
+				break;
+			strtodest(p, flag, subtype, quoted);
 		}
 		break;
 	}
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index af5887e02804..93553c11e5bd 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -562,6 +562,7 @@ getjob_nonotfound(const char *name)
 {
 	int jobno;
 	struct job *found, *jp;
+	size_t namelen;
 	pid_t pid;
 	int i;
 
@@ -603,10 +604,12 @@ currentjob:	if ((jp = getcurjob(NULL)) == NULL)
 			if (found != NULL)
 				return (found);
 		} else {
+			namelen = strlen(name);
 			found = NULL;
 			for (jp = jobtab, i = njobs ; --i >= 0 ; jp++) {
 				if (jp->used && jp->nprocs > 0
-				 && prefix(name + 1, jp->ps[0].cmd)) {
+				 && strncmp(jp->ps[0].cmd, name + 1,
+				 namelen - 1) == 0) {
 					if (found)
 						error("%s: ambiguous", name);
 					found = jp;
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index 27fa53db2fb4..027d8ae3faf4 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -411,13 +411,32 @@ static const struct limits limits[] = {
 	{ (char *) 0,		(char *)0,	0,		   0, '\0' }
 };
 
+enum limithow { SOFT = 0x1, HARD = 0x2 };
+
+static void
+printlimit(enum limithow how, const struct rlimit *limit,
+    const struct limits *l)
+{
+	rlim_t val = 0;
+
+	if (how & SOFT)
+		val = limit->rlim_cur;
+	else if (how & HARD)
+		val = limit->rlim_max;
+	if (val == RLIM_INFINITY)
+		out1str("unlimited\n");
+	else
+	{
+		val /= l->factor;
+		out1fmt("%jd\n", (intmax_t)val);
+	}
+}
+
 int
 ulimitcmd(int argc __unused, char **argv __unused)
 {
-	int	c;
 	rlim_t val = 0;
-	enum { SOFT = 0x1, HARD = 0x2 }
-			how = SOFT | HARD;
+	enum limithow how = SOFT | HARD;
 	const struct limits	*l;
 	int		set, all = 0;
 	int		optc, what;
@@ -453,17 +472,22 @@ ulimitcmd(int argc __unused, char **argv __unused)
 		if (strcmp(p, "unlimited") == 0)
 			val = RLIM_INFINITY;
 		else {
-			val = 0;
+			char *end;
+			uintmax_t uval;
 
-			while ((c = *p++) >= '0' && c <= '9')
-			{
-				val = (val * 10) + (long)(c - '0');
-				if (val < 0)
-					break;
-			}
-			if (c)
+			if (*p < '0' || *p > '9')
+				error("bad number");
+			errno = 0;
+			uval = strtoumax(p, &end, 10);
+			if (errno != 0 || *end != '\0')
+				error("bad number");
+			if (uval > UINTMAX_MAX / l->factor)
+				error("bad number");
+			uval *= l->factor;
+			val = (rlim_t)uval;
+			if (val < 0 || (uintmax_t)val != uval ||
+			    val == RLIM_INFINITY)
 				error("bad number");
-			val *= l->factor;
 		}
 	}
 	if (all) {
@@ -471,10 +495,6 @@ ulimitcmd(int argc __unused, char **argv __unused)
 			char optbuf[40];
 			if (getrlimit(l->cmd, &limit) < 0)
 				error("can't get limit: %s", strerror(errno));
-			if (how & SOFT)
-				val = limit.rlim_cur;
-			else if (how & HARD)
-				val = limit.rlim_max;
 
 			if (l->units)
 				snprintf(optbuf, sizeof(optbuf),
@@ -483,13 +503,7 @@ ulimitcmd(int argc __unused, char **argv __unused)
 				snprintf(optbuf, sizeof(optbuf),
 					"(-%c) ", l->option);
 			out1fmt("%-18s %18s ", l->name, optbuf);
-			if (val == RLIM_INFINITY)
-				out1str("unlimited\n");
-			else
-			{
-				val /= l->factor;
-				out1fmt("%jd\n", (intmax_t)val);
-			}
+			printlimit(how, &limit, l);
 		}
 		return 0;
 	}
@@ -503,19 +517,7 @@ ulimitcmd(int argc __unused, char **argv __unused)
 			limit.rlim_max = val;
 		if (setrlimit(l->cmd, &limit) < 0)
 			error("bad limit: %s", strerror(errno));
-	} else {
-		if (how & SOFT)
-			val = limit.rlim_cur;
-		else if (how & HARD)
-			val = limit.rlim_max;
-
-		if (val == RLIM_INFINITY)
-			out1str("unlimited\n");
-		else
-		{
-			val /= l->factor;
-			out1fmt("%jd\n", (intmax_t)val);
-		}
-	}
+	} else
+		printlimit(how, &limit, l);
 	return 0;
 }
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index de7e9b648958..03ea8bac608c 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -60,21 +60,6 @@ char nullstr[1];		/* zero length string */
  */
 
 
-/*
- * prefix -- see if pfx is a prefix of string.
- */
-
-int
-prefix(const char *pfx, const char *string)
-{
-	while (*pfx) {
-		if (*pfx++ != *string++)
-			return 0;
-	}
-	return 1;
-}
-
-
 /*
  * Convert a string of digits to an integer, printing an error message on
  * failure.
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index 87b76c8acff6..919fc867e7cf 100644
--- a/bin/sh/mystring.h
+++ b/bin/sh/mystring.h
@@ -35,7 +35,6 @@
 
 #include <string.h>
 
-int prefix(const char *, const char *);
 int number(const char *);
 int is_number(const char *);
 
diff --git a/bin/sh/tests/Makefile b/bin/sh/tests/Makefile
index 51c6dc443367..c092962ae303 100644
--- a/bin/sh/tests/Makefile
+++ b/bin/sh/tests/Makefile
@@ -4,15 +4,12 @@
 
 TESTSDIR=	${TESTSBASE}/bin/sh
 
-TAP_TESTS_SH=	legacy_test
-TAP_TESTS_SH_SED_legacy_test=	-e 's,__SH__,/bin/sh,g'
-# Some tests in here are silently not run when the tests are executed as
-# root.  Explicitly tell Kyua to drop privileges.
-#
-# TODO(jmmv): Kyua needs to do this by default, not only when explicitly
-# requested.  See https://code.google.com/p/kyua/issues/detail?id=6
-TEST_METADATA.legacy_test+= required_user="unprivileged"
-
-SUBDIR+=	builtins errors execution expansion parameters parser set-e
+TESTS_SUBDIRS+=	builtins
+TESTS_SUBDIRS+=	errors
+TESTS_SUBDIRS+=	execution
+TESTS_SUBDIRS+=	expansion
+TESTS_SUBDIRS+=	parameters
+TESTS_SUBDIRS+=	parser
+TESTS_SUBDIRS+=	set-e
 
 .include <bsd.test.mk>
diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile
index 7a71318c8227..07c8098e22b7 100644
--- a/bin/sh/tests/builtins/Makefile
+++ b/bin/sh/tests/builtins/Makefile
@@ -1,9 +1,13 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
-FILESDIR=	${TESTSBASE}/bin/sh/builtins
-KYUAFILE=	no
+TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
+
+.PATH: ${.CURDIR:H}
+ATF_TESTS_SH=	functional_test
+
+FILESDIR=	${TESTSDIR}
 
 FILES=		alias.0 alias.0.stdout
 FILES+=		alias.1 alias.1.stderr
@@ -14,6 +18,7 @@ FILES+=		break2.0 break2.0.stdout
 FILES+=		break3.0
 FILES+=		break4.4
 FILES+=		break5.4
+FILES+=		break6.0
 FILES+=		builtin1.0
 FILES+=		case1.0
 FILES+=		case2.0
@@ -99,7 +104,9 @@ FILES+=		local1.0
 FILES+=		local2.0
 FILES+=		local3.0
 FILES+=		local4.0
+.if ${MK_NLS} != "no"
 FILES+=		locale1.0
+.endif
 FILES+=		printf1.0
 FILES+=		printf2.0
 FILES+=		printf3.0
diff --git a/bin/sh/tests/builtins/break6.0 b/bin/sh/tests/builtins/break6.0
new file mode 100644
index 000000000000..09fc0d85eaa3
--- /dev/null
+++ b/bin/sh/tests/builtins/break6.0
@@ -0,0 +1,8 @@
+# $FreeBSD$
+# Per POSIX, this need only work if LONG_MAX > 4294967295.
+
+while :; do
+	break 4294967296
+	echo bad
+	exit 3
+done
diff --git a/bin/sh/tests/errors/Makefile b/bin/sh/tests/errors/Makefile
index 9f8b0f2045d9..ace9a01ccd7d 100644
--- a/bin/sh/tests/errors/Makefile
+++ b/bin/sh/tests/errors/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
-FILESDIR=	${TESTSBASE}/bin/sh/errors
-KYUAFILE=	no
+.PATH: ${.CURDIR:H}
+ATF_TESTS_SH=	functional_test
+
+FILESDIR=	${TESTSDIR}
 
 FILES=		assignment-error1.0
 FILES+=		assignment-error2.0
diff --git a/bin/sh/tests/errors/bad-parm-exp2.2.stderr b/bin/sh/tests/errors/bad-parm-exp2.2.stderr
index d027a5ad4ef3..1135af092cee 100644
--- a/bin/sh/tests/errors/bad-parm-exp2.2.stderr
+++ b/bin/sh/tests/errors/bad-parm-exp2.2.stderr
@@ -1 +1 @@
-./errors/bad-parm-exp2.2: ${}: Bad substitution
+./bad-parm-exp2.2: ${}: Bad substitution
diff --git a/bin/sh/tests/errors/bad-parm-exp3.2.stderr b/bin/sh/tests/errors/bad-parm-exp3.2.stderr
index ef40251f23f6..b28fdfffc4b6 100644
--- a/bin/sh/tests/errors/bad-parm-exp3.2.stderr
+++ b/bin/sh/tests/errors/bad-parm-exp3.2.stderr
@@ -1 +1 @@
-./errors/bad-parm-exp3.2: ${foo/}: Bad substitution
+./bad-parm-exp3.2: ${foo/}: Bad substitution
diff --git a/bin/sh/tests/errors/bad-parm-exp4.2.stderr b/bin/sh/tests/errors/bad-parm-exp4.2.stderr
index 89bd80f0e8e2..1487b61c2bcb 100644
--- a/bin/sh/tests/errors/bad-parm-exp4.2.stderr
+++ b/bin/sh/tests/errors/bad-parm-exp4.2.stderr
@@ -1 +1 @@
-./errors/bad-parm-exp4.2: ${foo:@...}: Bad substitution
+./bad-parm-exp4.2: ${foo:@...}: Bad substitution
diff --git a/bin/sh/tests/errors/bad-parm-exp5.2.stderr b/bin/sh/tests/errors/bad-parm-exp5.2.stderr
index 89b19978f9d1..2138c2eeb368 100644
--- a/bin/sh/tests/errors/bad-parm-exp5.2.stderr
+++ b/bin/sh/tests/errors/bad-parm-exp5.2.stderr
@@ -1 +1 @@
-./errors/bad-parm-exp5.2: ${/}: Bad substitution
+./bad-parm-exp5.2: ${/}: Bad substitution
diff --git a/bin/sh/tests/errors/bad-parm-exp6.2.stderr b/bin/sh/tests/errors/bad-parm-exp6.2.stderr
index dbf14b596e1f..ba3b671c6088 100644
--- a/bin/sh/tests/errors/bad-parm-exp6.2.stderr
+++ b/bin/sh/tests/errors/bad-parm-exp6.2.stderr
@@ -1 +1 @@
-./errors/bad-parm-exp6.2: ${foo...}: Bad substitution
+./bad-parm-exp6.2: ${foo...}: Bad substitution
diff --git a/bin/sh/tests/execution/Makefile b/bin/sh/tests/execution/Makefile
index 302d0d824c41..2653d5ffe799 100644
--- a/bin/sh/tests/execution/Makefile
+++ b/bin/sh/tests/execution/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
-FILESDIR=	${TESTSBASE}/bin/sh/execution
-KYUAFILE=	no
+.PATH: ${.CURDIR:H}
+ATF_TESTS_SH=	functional_test
+
+FILESDIR=	${TESTSDIR}
 
 FILES=		bg1.0
 FILES+=		bg2.0
diff --git a/bin/sh/tests/expansion/Makefile b/bin/sh/tests/expansion/Makefile
index bd2431971f4a..8ded7e13dbc8 100644
--- a/bin/sh/tests/expansion/Makefile
+++ b/bin/sh/tests/expansion/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
-FILESDIR=	${TESTSBASE}/bin/sh/expansion
-KYUAFILE=	no
+.PATH: ${.CURDIR:H}
+ATF_TESTS_SH=	functional_test
+
+FILESDIR=	${TESTSDIR}
 
 FILES=		arith1.0
 FILES+=		arith2.0
diff --git a/bin/sh/tests/functional_test.sh b/bin/sh/tests/functional_test.sh
new file mode 100755
index 000000000000..33bee097de2a
--- /dev/null
+++ b/bin/sh/tests/functional_test.sh
@@ -0,0 +1,78 @@
+#
+# Copyright 2014 EMC Corp.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * 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
+# 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.
+#
+# $FreeBSD$
+
+SRCDIR=$(atf_get_srcdir)
+
+check()
+{
+	local tc=${1}; shift
+
+	export SH=$(atf_config_get bin.sh.test_shell /bin/sh)
+
+	local err_file="${SRCDIR}/${tc}.stderr"
+	[ -f "${err_file}" ] && err_flag="-e file:${err_file}"
+	local out_file="${SRCDIR}/${tc}.stdout"
+	[ -f "${out_file}" ] && out_flag="-o file:${out_file}"
+
+	# We need to copy the testcase scenario file because some of the
+	# testcases hardcode relative paths in the stderr/stdout.
+	#
+	# TODO: we might be able to generate this path at build time
+	cp ${SRCDIR}/${tc} .
+
+	atf_check -s exit:${tc##*.} ${err_flag} ${out_flag} ${SH} "./${tc}"
+}
+
+add_testcase()
+{
+	local tc=${1}
+	local tc_escaped word
+
+	case "${tc%.*}" in
+	*-*)
+		local IFS="-"
+		for word in ${tc%.*}; do
+			tc_escaped="${tc_escaped:+${tc_escaped}_}${word}"
+		done
+		;;
+	*)
+		tc_escaped=${tc%.*}
+		;;
+	esac
+
+	atf_test_case ${tc_escaped}
+	eval "${tc_escaped}_body() { check ${tc}; }"
+	atf_add_test_case ${tc_escaped}
+}
+
+atf_init_test_cases()
+{
+	for path in $(find -Es "${SRCDIR}" -regex '.*\.[0-9]+$'); do
+		add_testcase ${path##*/}
+	done
+}
diff --git a/bin/sh/tests/legacy_test.sh b/bin/sh/tests/legacy_test.sh
deleted file mode 100644
index d43f5ddd8aab..000000000000
--- a/bin/sh/tests/legacy_test.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-# $FreeBSD$
-
-: ${SH:="__SH__"}
-export SH
-
-# TODO(jmmv): The Kyua TAP interface should be passing us the value of
-# "srcdir" as an environment variable, just as it does with the ATF
-# interface in the form of a configuration variable.  For now, just try
-# to guess this.
-: ${TESTS_DATA:=$(dirname ${0})}
-
-COUNTER=1
-
-do_test() {
-	c=${COUNTER}
-	COUNTER=$((COUNTER+1))
-	${SH} $1 > tmp.stdout 2> tmp.stderr
-	if [ $? -ne $2 ]; then
-		echo "not ok ${c} - ${1} # wrong exit status"
-		rm tmp.stdout tmp.stderr
-		return
-	fi
-	sed -I '' -e "s|^${TESTS_DATA}|.|" tmp.stderr
-	for i in stdout stderr; do
-		if [ -f ${1}.${i} ]; then
-			if ! cmp -s tmp.${i} ${1}.${i}; then
-				echo "not ok ${c} - ${1} # wrong output on ${i}"
-				rm tmp.stdout tmp.stderr
-				return
-			fi
-		elif [ -s tmp.${i} ]; then
-			echo "not ok ${c} - ${1} # wrong output on ${i}"
-			rm tmp.stdout tmp.stderr
-			return
-		fi
-	done
-	echo "ok ${c} - ${1}"
-	rm tmp.stdout tmp.stderr
-}
-
-TESTS=$(find -Es ${TESTS_DATA} -regex ".*\.[0-9]+")
-printf "1..%d\n" $(echo ${TESTS} | wc -w)
-
-for i in ${TESTS} ; do
-	do_test ${i} ${i##*.}
-done
diff --git a/bin/sh/tests/parameters/Makefile b/bin/sh/tests/parameters/Makefile
index fafc059ec24f..47165290425f 100644
--- a/bin/sh/tests/parameters/Makefile
+++ b/bin/sh/tests/parameters/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
-FILESDIR=	${TESTSBASE}/bin/sh/parameters
-KYUAFILE=	no
+.PATH: ${.CURDIR:H}
+ATF_TESTS_SH=	functional_test
+
+FILESDIR=	${TESTSDIR}
 
 FILES=		env1.0
 FILES+=		exitstatus1.0
@@ -13,6 +15,9 @@ FILES+=		optind1.0
 FILES+=		optind2.0
 FILES+=		positional1.0
 FILES+=		positional2.0
+FILES+=		positional3.0
+FILES+=		positional4.0
+FILES+=		positional5.0
 FILES+=		pwd1.0
 FILES+=		pwd2.0
 
diff --git a/bin/sh/tests/parameters/positional3.0 b/bin/sh/tests/parameters/positional3.0
new file mode 100644
index 000000000000..1200469b4e12
--- /dev/null
+++ b/bin/sh/tests/parameters/positional3.0
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+r=$(${SH} -c 'echo ${01:+yes}${010:+yes}' '' a '' '' '' '' '' '' '' '' b)
+[ "$r" = yesyes ]
diff --git a/bin/sh/tests/parameters/positional4.0 b/bin/sh/tests/parameters/positional4.0
new file mode 100644
index 000000000000..c1c380c0feac
--- /dev/null
+++ b/bin/sh/tests/parameters/positional4.0
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+set -- "x$0" 2 3 4 5 6 7 8 9 "y$0"
+[ "${01}.${010}" = "$1.${10}" ]
diff --git a/bin/sh/tests/parameters/positional5.0 b/bin/sh/tests/parameters/positional5.0
new file mode 100644
index 000000000000..eeaaba5321ff
--- /dev/null
+++ b/bin/sh/tests/parameters/positional5.0
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+i=1
+r=0
+while [ $i -lt $((0x100000000)) ]; do
+	t=
+	eval t=\${$i-x}
+	case $t in
+	x) ;;
+	*) echo "Problem with \${$i}" >&2; r=1 ;;
+	esac
+	i=$((i + 0x10000000))
+done
+exit $r
diff --git a/bin/sh/tests/parser/Makefile b/bin/sh/tests/parser/Makefile
index 03650b1d2d91..4b2e76dce51e 100644
--- a/bin/sh/tests/parser/Makefile
+++ b/bin/sh/tests/parser/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
-FILESDIR=	${TESTSBASE}/bin/sh/parser
-KYUAFILE=	no
+.PATH: ${.CURDIR:H}
+ATF_TESTS_SH=	functional_test
+
+FILESDIR=	${TESTSDIR}
 
 FILES=		alias1.0
 FILES+=		alias2.0
diff --git a/bin/sh/tests/set-e/Makefile b/bin/sh/tests/set-e/Makefile
index 55d79174f98a..f733b60b1e18 100644
--- a/bin/sh/tests/set-e/Makefile
+++ b/bin/sh/tests/set-e/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+TESTSDIR=	${TESTSBASE}/bin/sh/${.CURDIR:T}
 
-FILESDIR=	${TESTSBASE}/bin/sh/set-e
-KYUAFILE=	no
+.PATH: ${.CURDIR:H}
+ATF_TESTS_SH=	functional_test
+
+FILESDIR=	${TESTSDIR}
 
 FILES=		and1.0
 FILES+=		and2.1
diff --git a/cddl/contrib/dtracetoolkit/Apps/shellsnoop b/cddl/contrib/dtracetoolkit/Apps/shellsnoop
index 95f42c046529..69ff379a6519 100755
--- a/cddl/contrib/dtracetoolkit/Apps/shellsnoop
+++ b/cddl/contrib/dtracetoolkit/Apps/shellsnoop
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/bin/sh
 #
 # shellsnoop - A program to print read/write details from shells,
 #	       such as keystrokes and command outputs.
@@ -140,18 +140,14 @@ dtrace -n '
  /*
   * Remember this PID is a shell child
   */
- syscall::exec:entry, syscall::exece:entry
+ syscall::execve:entry
  /execname == "sh"   || execname == "ksh"  || execname == "csh"  || 
   execname == "tcsh" || execname == "zsh"  || execname == "bash"/
  {
 	child[pid] = 1;
  
-	/* debug */
-	this->parent = (char *)curthread->t_procp->p_parent->p_user.u_comm;
-	OPT_debug == 1 ? printf("PID %d CMD %s started. (%s)\n",
-	    pid, execname, stringof(this->parent)) : 1;
  }
- syscall::exec:entry, syscall::exece:entry
+ syscall::execve:entry
  /(OPT_pid == 1 && PID != ppid) || (OPT_uid == 1 && UID != uid)/
  {
 	/* forget if filtered */
@@ -256,12 +252,12 @@ dtrace -n '
  /*
   *  Cleanup
   */
- syscall::rexit:entry
+ syscall::exit:entry
  {
 	child[pid] = 0;
 
 	/* debug */
-	this->parent = (char *)curthread->t_procp->p_parent->p_user.u_comm;
+	this->parent = (char *)curthread->td_proc->p_pptr->p_comm;
 	OPT_debug == 1 ? printf("PID %d CMD %s exited. (%s)\n",
 	 pid, execname, stringof(this->parent)) : 1;
  }
diff --git a/cddl/contrib/dtracetoolkit/rwsnoop b/cddl/contrib/dtracetoolkit/rwsnoop
index 9d4932487cce..c96bd68f0143 100755
--- a/cddl/contrib/dtracetoolkit/rwsnoop
+++ b/cddl/contrib/dtracetoolkit/rwsnoop
@@ -1,10 +1,10 @@
-#!/usr/bin/ksh
+#!/bin/sh
 #
 # rwsnoop - snoop read/write events.
-#           Written using DTrace (Solaris 10 3/05).
+#           Originally written using DTrace (Solaris 10 3/05).
 #
 # This is measuring reads and writes at the application level. This matches
-# the syscalls read, write, pread and pwrite.
+# the syscalls read, and write.
 #
 # $Id: rwsnoop 3 2007-08-01 10:50:08Z brendan $
 #
@@ -12,15 +12,14 @@
 # 
 #		rwsnoop		# default output
 #
-#		-j		# print project ID
 #		-P		# print parent process ID
 #		-t		# print timestamp, us
 #		-v		# print time, string
-#		-Z		# print zone ID
+#		-J		# print jail ID
 #		-n name		# this process name only
 #		-p PID		# this PID only
 #	eg,
-#		rwsnoop -Z		# print zone ID
+#		rwsnoop -J		# print jail ID
 #		rwsnoop -n bash 	# monitor processes named "bash"
 #		rwsnoop > out.txt	# recommended
 #
@@ -32,8 +31,7 @@
 # FIELDS:
 #		TIME		Timestamp, us
 #		TIMESTR		Time, string
-#		ZONE		Zone ID
-#		PROJ		Project ID
+#		JAIL		JAIL ID
 #		UID		User ID
 #		PID		Process ID
 #		PPID		Parent Process ID
@@ -71,6 +69,7 @@
 # 24-Jul-2005   Brendan Gregg   Created this.
 # 17-Sep-2005	   "      "	Increased switchrate.
 # 17-Sep-2005	   "      "	Last update.
+# 26-Jul-2014   George Neville-Neil	Port to FreeBSD
 #
 
 
@@ -79,8 +78,8 @@
 #
 
 ### default variables
-opt_name=0; opt_pid=0; opt_proj=0; opt_zone=0; opt_time=0; opt_timestr=0
-opt_bytes=1; filter=0; pname=.; pid=0; opt_ppid=0
+opt_name=0; opt_pid=0; opt_jailid=0; opt_time=0; opt_timestr=0
+opt_bytes=1; filter=0; pname=.; pid=0; opt_ppid=0;
 
 ### process options
 while getopts n:Pp:jtvZ name
@@ -89,23 +88,21 @@ do
 	n)	opt_name=1; pname=$OPTARG ;;
 	p)	opt_pid=1; pid=$OPTARG ;;
 	P)	opt_ppid=1 ;;
-	j)	opt_proj=1 ;;
 	t)	opt_time=1 ;;
 	v)	opt_timestr=1 ;;
-	Z)	opt_zone=1 ;;
+	J)	opt_jailid=1 ;;
 	h|?)	cat <<-END >&2
 		USAGE: rwsnoop [-jPtvZ] [-n name] [-p pid]
  
-		                -j       # print project ID
 		                -P       # print parent process ID
 		                -t       # print timestamp, us
 		                -v       # print time, string
-		                -Z       # print zone ID
+		                -J       # print jail ID
 		                -n name  # this process name only
 		                -p PID   # this PID only
 		   eg,
 		        rwsnoop          # default output
-		        rwsnoop -Z       # print zone ID
+		        rwsnoop -J       # print jail ID
 		        rwsnoop -n bash  # monitor processes named "bash"
 		END
 		exit 1
@@ -115,11 +112,13 @@ done
 shift $(( $OPTIND - 1 ))
 
 ### option logic
-if (( opt_name || opt_pid )); then
+if [ $opt_name -ne 0 ]; then
 	filter=1
 fi
 
-
+if [ $opt_pid -ne 0 ]; then
+	filter=1
+fi
 
 #################################
 # --- Main Program, DTrace ---
@@ -128,8 +127,7 @@ fi
  /*
   * Command line arguments
   */
- inline int OPT_proj 	= '$opt_proj';
- inline int OPT_zone 	= '$opt_zone';
+ inline int OPT_jailid 	= '$opt_jailid';
  inline int OPT_bytes 	= '$opt_bytes';
  inline int OPT_name 	= '$opt_name';
  inline int OPT_ppid 	= '$opt_ppid';
@@ -151,11 +149,10 @@ fi
 	/* print header */
 	OPT_time    ? printf("%-14s ", "TIME") : 1;
 	OPT_timestr ? printf("%-20s ", "TIMESTR") : 1;
-	OPT_proj    ? printf("%5s ", "PROJ") : 1;
-	OPT_zone    ? printf("%5s ", "ZONE") : 1;
+	OPT_jailid    ? printf("%5s ", "JAILID") : 1;
 	OPT_ppid    ? printf("%6s ", "PPID") : 1;
-	printf("%5s %6s %-12s %1s %7s %s\n",
-	    "UID", "PID", "CMD", "D", "BYTES", "FILE");
+	printf("%5s %6s %-12s %4s %1s %7s\n",
+	    "UID", "PID", "CMD", "FD", "D", "BYTES");
  }
 
  /*
@@ -205,7 +202,10 @@ fi
  {
 	/*
 	 * Fetch filename
+         * XXX Not yet implemented.
 	 */
+/*
+
 	this->filistp = curthread->t_procp->p_user.u_finfo.fi_list;
 	this->ufentryp = (uf_entry_t *)((uint64_t)this->filistp +
 	    (uint64_t)self->fd * (uint64_t)sizeof(uf_entry_t));
@@ -213,17 +213,16 @@ fi
 	this->vnodep = this->filep != 0 ? this->filep->f_vnode : 0;
 	self->vpath = this->vnodep ? (this->vnodep->v_path != 0 ? 
 	    cleanpath(this->vnodep->v_path) : "<unknown>") : "<unknown>";
-
+*/
 	/*
 	 * Print details
 	 */
 	OPT_time    ? printf("%-14d ", timestamp / 1000) : 1;
 	OPT_timestr ? printf("%-20Y ", walltimestamp) : 1;
-	OPT_proj    ? printf("%5d ", curpsinfo->pr_projid) : 1;
-	OPT_zone    ? printf("%5d ", curpsinfo->pr_zoneid) : 1;
+	OPT_jailid    ? printf("%5d ", curpsinfo->pr_jailid) : 1;
 	OPT_ppid    ? printf("%6d ", ppid) : 1;
-	printf("%5d %6d %-12.12s %1s %7d %s\n",
-	    uid, pid, execname, self->rw, (int)self->size, self->vpath);
+	printf("%5d %6d %-12.12s %4d %1s %7d\n",
+	    uid, pid, execname, self->fd, self->rw, (int)self->size);
 	
 	self->ok = 0;
 	self->fd = 0;
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
index a745ceb71732..4cbb866cfad7 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
+++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
@@ -25,6 +25,7 @@
  */
 /*
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  */
 
 #include <sys/types.h>
@@ -513,6 +514,7 @@ static void
 print_probe_info(const dtrace_probeinfo_t *p)
 {
 	char buf[BUFSIZ];
+	char *user;
 	int i;
 
 	oprintf("\n\tProbe Description Attributes\n");
@@ -536,10 +538,14 @@ print_probe_info(const dtrace_probeinfo_t *p)
 	oprintf("\n\tArgument Types\n");
 
 	for (i = 0; i < p->dtp_argc; i++) {
+		if (p->dtp_argv[i].dtt_flags & DTT_FL_USER)
+			user = "userland ";
+		else
+			user = "";
 		if (ctf_type_name(p->dtp_argv[i].dtt_ctfp,
 		    p->dtp_argv[i].dtt_type, buf, sizeof (buf)) == NULL)
 			(void) strlcpy(buf, "(unknown)", sizeof (buf));
-		oprintf("\t\targs[%d]: %s\n", i, buf);
+		oprintf("\t\targs[%d]: %s%s\n", i, user, buf);
 	}
 
 	if (p->dtp_argc == 0)
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d
new file mode 100644
index 000000000000..a594afc7d603
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d
@@ -0,0 +1,32 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2013 Joyent, Inc.  All rights reserved.
+ */
+
+#pragma D option quiet
+#pragma D option encoding=utf8
+#pragma D option aggzoom
+
+tick-1ms
+/i++ < 320/
+{
+	@ = lquantize(i, 0, 640, 1, i);
+	@ = lquantize(641 - i, 0, 640, 1, i);
+}
+
+tick-1ms
+/i == 320/
+{
+	printa(@);
+	exit(0);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d.out
new file mode 100644
index 000000000000..68482ffbe14f
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggencoding.d.out
@@ -0,0 +1,646 @@
+
+
+           value  ------------- Distribution ------------- count    
+               0 |                                         0        
+               1 |                                         1        
+               2 |▏                                        2        
+               3 |▎                                        3        
+               4 |▍                                        4        
+               5 |▌                                        5        
+               6 |▋                                        6        
+               7 |▊                                        7        
+               8 |▉                                        8        
+               9 |█                                        9        
+              10 |█▏                                       10       
+              11 |█▎                                       11       
+              12 |█▍                                       12       
+              13 |█▌                                       13       
+              14 |█▋                                       14       
+              15 |█▊                                       15       
+              16 |█▉                                       16       
+              17 |██                                       17       
+              18 |██▏                                      18       
+              19 |██▎                                      19       
+              20 |██▍                                      20       
+              21 |██▍                                      21       
+              22 |██▌                                      22       
+              23 |██▋                                      23       
+              24 |██▊                                      24       
+              25 |██▉                                      25       
+              26 |███                                      26       
+              27 |███▏                                     27       
+              28 |███▎                                     28       
+              29 |███▍                                     29       
+              30 |███▌                                     30       
+              31 |███▋                                     31       
+              32 |███▊                                     32       
+              33 |███▉                                     33       
+              34 |████                                     34       
+              35 |████▏                                    35       
+              36 |████▎                                    36       
+              37 |████▍                                    37       
+              38 |████▌                                    38       
+              39 |████▋                                    39       
+              40 |████▊                                    40       
+              41 |████▊                                    41       
+              42 |████▉                                    42       
+              43 |█████                                    43       
+              44 |█████▏                                   44       
+              45 |█████▎                                   45       
+              46 |█████▍                                   46       
+              47 |█████▌                                   47       
+              48 |█████▋                                   48       
+              49 |█████▊                                   49       
+              50 |█████▉                                   50       
+              51 |██████                                   51       
+              52 |██████▏                                  52       
+              53 |██████▎                                  53       
+              54 |██████▍                                  54       
+              55 |██████▌                                  55       
+              56 |██████▋                                  56       
+              57 |██████▊                                  57       
+              58 |██████▉                                  58       
+              59 |███████                                  59       
+              60 |███████▏                                 60       
+              61 |███████▏                                 61       
+              62 |███████▎                                 62       
+              63 |███████▍                                 63       
+              64 |███████▌                                 64       
+              65 |███████▋                                 65       
+              66 |███████▊                                 66       
+              67 |███████▉                                 67       
+              68 |████████                                 68       
+              69 |████████▏                                69       
+              70 |████████▎                                70       
+              71 |████████▍                                71       
+              72 |████████▌                                72       
+              73 |████████▋                                73       
+              74 |████████▊                                74       
+              75 |████████▉                                75       
+              76 |█████████                                76       
+              77 |█████████▏                               77       
+              78 |█████████▎                               78       
+              79 |█████████▍                               79       
+              80 |█████████▌                               80       
+              81 |█████████▌                               81       
+              82 |█████████▋                               82       
+              83 |█████████▊                               83       
+              84 |█████████▉                               84       
+              85 |██████████                               85       
+              86 |██████████▏                              86       
+              87 |██████████▎                              87       
+              88 |██████████▍                              88       
+              89 |██████████▌                              89       
+              90 |██████████▋                              90       
+              91 |██████████▊                              91       
+              92 |██████████▉                              92       
+              93 |███████████                              93       
+              94 |███████████▏                             94       
+              95 |███████████▎                             95       
+              96 |███████████▍                             96       
+              97 |███████████▌                             97       
+              98 |███████████▋                             98       
+              99 |███████████▊                             99       
+             100 |███████████▉                             100      
+             101 |███████████▉                             101      
+             102 |████████████                             102      
+             103 |████████████▏                            103      
+             104 |████████████▎                            104      
+             105 |████████████▍                            105      
+             106 |████████████▌                            106      
+             107 |████████████▋                            107      
+             108 |████████████▊                            108      
+             109 |████████████▉                            109      
+             110 |█████████████                            110      
+             111 |█████████████▏                           111      
+             112 |█████████████▎                           112      
+             113 |█████████████▍                           113      
+             114 |█████████████▌                           114      
+             115 |█████████████▋                           115      
+             116 |█████████████▊                           116      
+             117 |█████████████▉                           117      
+             118 |██████████████                           118      
+             119 |██████████████▏                          119      
+             120 |██████████████▎                          120      
+             121 |██████████████▎                          121      
+             122 |██████████████▍                          122      
+             123 |██████████████▌                          123      
+             124 |██████████████▋                          124      
+             125 |██████████████▊                          125      
+             126 |██████████████▉                          126      
+             127 |███████████████                          127      
+             128 |███████████████▏                         128      
+             129 |███████████████▎                         129      
+             130 |███████████████▍                         130      
+             131 |███████████████▌                         131      
+             132 |███████████████▋                         132      
+             133 |███████████████▊                         133      
+             134 |███████████████▉                         134      
+             135 |████████████████                         135      
+             136 |████████████████▏                        136      
+             137 |████████████████▎                        137      
+             138 |████████████████▍                        138      
+             139 |████████████████▌                        139      
+             140 |████████████████▋                        140      
+             141 |████████████████▋                        141      
+             142 |████████████████▊                        142      
+             143 |████████████████▉                        143      
+             144 |█████████████████                        144      
+             145 |█████████████████▏                       145      
+             146 |█████████████████▎                       146      
+             147 |█████████████████▍                       147      
+             148 |█████████████████▌                       148      
+             149 |█████████████████▋                       149      
+             150 |█████████████████▊                       150      
+             151 |█████████████████▉                       151      
+             152 |██████████████████                       152      
+             153 |██████████████████▏                      153      
+             154 |██████████████████▎                      154      
+             155 |██████████████████▍                      155      
+             156 |██████████████████▌                      156      
+             157 |██████████████████▋                      157      
+             158 |██████████████████▊                      158      
+             159 |██████████████████▉                      159      
+             160 |███████████████████                      160      
+             161 |███████████████████                      161      
+             162 |███████████████████▏                     162      
+             163 |███████████████████▎                     163      
+             164 |███████████████████▍                     164      
+             165 |███████████████████▌                     165      
+             166 |███████████████████▋                     166      
+             167 |███████████████████▊                     167      
+             168 |███████████████████▉                     168      
+             169 |████████████████████                     169      
+             170 |████████████████████▏                    170      
+             171 |████████████████████▎                    171      
+             172 |████████████████████▍                    172      
+             173 |████████████████████▌                    173      
+             174 |████████████████████▋                    174      
+             175 |████████████████████▊                    175      
+             176 |████████████████████▉                    176      
+             177 |█████████████████████                    177      
+             178 |█████████████████████▏                   178      
+             179 |█████████████████████▎                   179      
+             180 |█████████████████████▍                   180      
+             181 |█████████████████████▍                   181      
+             182 |█████████████████████▌                   182      
+             183 |█████████████████████▋                   183      
+             184 |█████████████████████▊                   184      
+             185 |█████████████████████▉                   185      
+             186 |██████████████████████                   186      
+             187 |██████████████████████▏                  187      
+             188 |██████████████████████▎                  188      
+             189 |██████████████████████▍                  189      
+             190 |██████████████████████▌                  190      
+             191 |██████████████████████▋                  191      
+             192 |██████████████████████▊                  192      
+             193 |██████████████████████▉                  193      
+             194 |███████████████████████                  194      
+             195 |███████████████████████▏                 195      
+             196 |███████████████████████▎                 196      
+             197 |███████████████████████▍                 197      
+             198 |███████████████████████▌                 198      
+             199 |███████████████████████▋                 199      
+             200 |███████████████████████▊                 200      
+             201 |███████████████████████▊                 201      
+             202 |███████████████████████▉                 202      
+             203 |████████████████████████                 203      
+             204 |████████████████████████▏                204      
+             205 |████████████████████████▎                205      
+             206 |████████████████████████▍                206      
+             207 |████████████████████████▌                207      
+             208 |████████████████████████▋                208      
+             209 |████████████████████████▊                209      
+             210 |████████████████████████▉                210      
+             211 |█████████████████████████                211      
+             212 |█████████████████████████▏               212      
+             213 |█████████████████████████▎               213      
+             214 |█████████████████████████▍               214      
+             215 |█████████████████████████▌               215      
+             216 |█████████████████████████▋               216      
+             217 |█████████████████████████▊               217      
+             218 |█████████████████████████▉               218      
+             219 |██████████████████████████               219      
+             220 |██████████████████████████▏              220      
+             221 |██████████████████████████▏              221      
+             222 |██████████████████████████▎              222      
+             223 |██████████████████████████▍              223      
+             224 |██████████████████████████▌              224      
+             225 |██████████████████████████▋              225      
+             226 |██████████████████████████▊              226      
+             227 |██████████████████████████▉              227      
+             228 |███████████████████████████              228      
+             229 |███████████████████████████▏             229      
+             230 |███████████████████████████▎             230      
+             231 |███████████████████████████▍             231      
+             232 |███████████████████████████▌             232      
+             233 |███████████████████████████▋             233      
+             234 |███████████████████████████▊             234      
+             235 |███████████████████████████▉             235      
+             236 |████████████████████████████             236      
+             237 |████████████████████████████▏            237      
+             238 |████████████████████████████▎            238      
+             239 |████████████████████████████▍            239      
+             240 |████████████████████████████▌            240      
+             241 |████████████████████████████▌            241      
+             242 |████████████████████████████▋            242      
+             243 |████████████████████████████▊            243      
+             244 |████████████████████████████▉            244      
+             245 |█████████████████████████████            245      
+             246 |█████████████████████████████▏           246      
+             247 |█████████████████████████████▎           247      
+             248 |█████████████████████████████▍           248      
+             249 |█████████████████████████████▌           249      
+             250 |█████████████████████████████▋           250      
+             251 |█████████████████████████████▊           251      
+             252 |█████████████████████████████▉           252      
+             253 |██████████████████████████████           253      
+             254 |██████████████████████████████▏          254      
+             255 |██████████████████████████████▎          255      
+             256 |██████████████████████████████▍          256      
+             257 |██████████████████████████████▌          257      
+             258 |██████████████████████████████▋          258      
+             259 |██████████████████████████████▊          259      
+             260 |██████████████████████████████▉          260      
+             261 |██████████████████████████████▉          261      
+             262 |███████████████████████████████          262      
+             263 |███████████████████████████████▏         263      
+             264 |███████████████████████████████▎         264      
+             265 |███████████████████████████████▍         265      
+             266 |███████████████████████████████▌         266      
+             267 |███████████████████████████████▋         267      
+             268 |███████████████████████████████▊         268      
+             269 |███████████████████████████████▉         269      
+             270 |████████████████████████████████         270      
+             271 |████████████████████████████████▏        271      
+             272 |████████████████████████████████▎        272      
+             273 |████████████████████████████████▍        273      
+             274 |████████████████████████████████▌        274      
+             275 |████████████████████████████████▋        275      
+             276 |████████████████████████████████▊        276      
+             277 |████████████████████████████████▉        277      
+             278 |█████████████████████████████████        278      
+             279 |█████████████████████████████████▏       279      
+             280 |█████████████████████████████████▎       280      
+             281 |█████████████████████████████████▎       281      
+             282 |█████████████████████████████████▍       282      
+             283 |█████████████████████████████████▌       283      
+             284 |█████████████████████████████████▋       284      
+             285 |█████████████████████████████████▊       285      
+             286 |█████████████████████████████████▉       286      
+             287 |██████████████████████████████████       287      
+             288 |██████████████████████████████████▏      288      
+             289 |██████████████████████████████████▎      289      
+             290 |██████████████████████████████████▍      290      
+             291 |██████████████████████████████████▌      291      
+             292 |██████████████████████████████████▋      292      
+             293 |██████████████████████████████████▊      293      
+             294 |██████████████████████████████████▉      294      
+             295 |███████████████████████████████████      295      
+             296 |███████████████████████████████████▏     296      
+             297 |███████████████████████████████████▎     297      
+             298 |███████████████████████████████████▍     298      
+             299 |███████████████████████████████████▌     299      
+             300 |███████████████████████████████████▋     300      
+             301 |███████████████████████████████████▋     301      
+             302 |███████████████████████████████████▊     302      
+             303 |███████████████████████████████████▉     303      
+             304 |████████████████████████████████████     304      
+             305 |████████████████████████████████████▏    305      
+             306 |████████████████████████████████████▎    306      
+             307 |████████████████████████████████████▍    307      
+             308 |████████████████████████████████████▌    308      
+             309 |████████████████████████████████████▋    309      
+             310 |████████████████████████████████████▊    310      
+             311 |████████████████████████████████████▉    311      
+             312 |█████████████████████████████████████    312      
+             313 |█████████████████████████████████████▏   313      
+             314 |█████████████████████████████████████▎   314      
+             315 |█████████████████████████████████████▍   315      
+             316 |█████████████████████████████████████▌   316      
+             317 |█████████████████████████████████████▋   317      
+             318 |█████████████████████████████████████▊   318      
+             319 |█████████████████████████████████████▉   319      
+             320 |██████████████████████████████████████   320      
+             321 |██████████████████████████████████████   320      
+             322 |█████████████████████████████████████▉   319      
+             323 |█████████████████████████████████████▊   318      
+             324 |█████████████████████████████████████▋   317      
+             325 |█████████████████████████████████████▌   316      
+             326 |█████████████████████████████████████▍   315      
+             327 |█████████████████████████████████████▎   314      
+             328 |█████████████████████████████████████▏   313      
+             329 |█████████████████████████████████████    312      
+             330 |████████████████████████████████████▉    311      
+             331 |████████████████████████████████████▊    310      
+             332 |████████████████████████████████████▋    309      
+             333 |████████████████████████████████████▌    308      
+             334 |████████████████████████████████████▍    307      
+             335 |████████████████████████████████████▎    306      
+             336 |████████████████████████████████████▏    305      
+             337 |████████████████████████████████████     304      
+             338 |███████████████████████████████████▉     303      
+             339 |███████████████████████████████████▊     302      
+             340 |███████████████████████████████████▋     301      
+             341 |███████████████████████████████████▋     300      
+             342 |███████████████████████████████████▌     299      
+             343 |███████████████████████████████████▍     298      
+             344 |███████████████████████████████████▎     297      
+             345 |███████████████████████████████████▏     296      
+             346 |███████████████████████████████████      295      
+             347 |██████████████████████████████████▉      294      
+             348 |██████████████████████████████████▊      293      
+             349 |██████████████████████████████████▋      292      
+             350 |██████████████████████████████████▌      291      
+             351 |██████████████████████████████████▍      290      
+             352 |██████████████████████████████████▎      289      
+             353 |██████████████████████████████████▏      288      
+             354 |██████████████████████████████████       287      
+             355 |█████████████████████████████████▉       286      
+             356 |█████████████████████████████████▊       285      
+             357 |█████████████████████████████████▋       284      
+             358 |█████████████████████████████████▌       283      
+             359 |█████████████████████████████████▍       282      
+             360 |█████████████████████████████████▎       281      
+             361 |█████████████████████████████████▎       280      
+             362 |█████████████████████████████████▏       279      
+             363 |█████████████████████████████████        278      
+             364 |████████████████████████████████▉        277      
+             365 |████████████████████████████████▊        276      
+             366 |████████████████████████████████▋        275      
+             367 |████████████████████████████████▌        274      
+             368 |████████████████████████████████▍        273      
+             369 |████████████████████████████████▎        272      
+             370 |████████████████████████████████▏        271      
+             371 |████████████████████████████████         270      
+             372 |███████████████████████████████▉         269      
+             373 |███████████████████████████████▊         268      
+             374 |███████████████████████████████▋         267      
+             375 |███████████████████████████████▌         266      
+             376 |███████████████████████████████▍         265      
+             377 |███████████████████████████████▎         264      
+             378 |███████████████████████████████▏         263      
+             379 |███████████████████████████████          262      
+             380 |██████████████████████████████▉          261      
+             381 |██████████████████████████████▉          260      
+             382 |██████████████████████████████▊          259      
+             383 |██████████████████████████████▋          258      
+             384 |██████████████████████████████▌          257      
+             385 |██████████████████████████████▍          256      
+             386 |██████████████████████████████▎          255      
+             387 |██████████████████████████████▏          254      
+             388 |██████████████████████████████           253      
+             389 |█████████████████████████████▉           252      
+             390 |█████████████████████████████▊           251      
+             391 |█████████████████████████████▋           250      
+             392 |█████████████████████████████▌           249      
+             393 |█████████████████████████████▍           248      
+             394 |█████████████████████████████▎           247      
+             395 |█████████████████████████████▏           246      
+             396 |█████████████████████████████            245      
+             397 |████████████████████████████▉            244      
+             398 |████████████████████████████▊            243      
+             399 |████████████████████████████▋            242      
+             400 |████████████████████████████▌            241      
+             401 |████████████████████████████▌            240      
+             402 |████████████████████████████▍            239      
+             403 |████████████████████████████▎            238      
+             404 |████████████████████████████▏            237      
+             405 |████████████████████████████             236      
+             406 |███████████████████████████▉             235      
+             407 |███████████████████████████▊             234      
+             408 |███████████████████████████▋             233      
+             409 |███████████████████████████▌             232      
+             410 |███████████████████████████▍             231      
+             411 |███████████████████████████▎             230      
+             412 |███████████████████████████▏             229      
+             413 |███████████████████████████              228      
+             414 |██████████████████████████▉              227      
+             415 |██████████████████████████▊              226      
+             416 |██████████████████████████▋              225      
+             417 |██████████████████████████▌              224      
+             418 |██████████████████████████▍              223      
+             419 |██████████████████████████▎              222      
+             420 |██████████████████████████▏              221      
+             421 |██████████████████████████▏              220      
+             422 |██████████████████████████               219      
+             423 |█████████████████████████▉               218      
+             424 |█████████████████████████▊               217      
+             425 |█████████████████████████▋               216      
+             426 |█████████████████████████▌               215      
+             427 |█████████████████████████▍               214      
+             428 |█████████████████████████▎               213      
+             429 |█████████████████████████▏               212      
+             430 |█████████████████████████                211      
+             431 |████████████████████████▉                210      
+             432 |████████████████████████▊                209      
+             433 |████████████████████████▋                208      
+             434 |████████████████████████▌                207      
+             435 |████████████████████████▍                206      
+             436 |████████████████████████▎                205      
+             437 |████████████████████████▏                204      
+             438 |████████████████████████                 203      
+             439 |███████████████████████▉                 202      
+             440 |███████████████████████▊                 201      
+             441 |███████████████████████▊                 200      
+             442 |███████████████████████▋                 199      
+             443 |███████████████████████▌                 198      
+             444 |███████████████████████▍                 197      
+             445 |███████████████████████▎                 196      
+             446 |███████████████████████▏                 195      
+             447 |███████████████████████                  194      
+             448 |██████████████████████▉                  193      
+             449 |██████████████████████▊                  192      
+             450 |██████████████████████▋                  191      
+             451 |██████████████████████▌                  190      
+             452 |██████████████████████▍                  189      
+             453 |██████████████████████▎                  188      
+             454 |██████████████████████▏                  187      
+             455 |██████████████████████                   186      
+             456 |█████████████████████▉                   185      
+             457 |█████████████████████▊                   184      
+             458 |█████████████████████▋                   183      
+             459 |█████████████████████▌                   182      
+             460 |█████████████████████▍                   181      
+             461 |█████████████████████▍                   180      
+             462 |█████████████████████▎                   179      
+             463 |█████████████████████▏                   178      
+             464 |█████████████████████                    177      
+             465 |████████████████████▉                    176      
+             466 |████████████████████▊                    175      
+             467 |████████████████████▋                    174      
+             468 |████████████████████▌                    173      
+             469 |████████████████████▍                    172      
+             470 |████████████████████▎                    171      
+             471 |████████████████████▏                    170      
+             472 |████████████████████                     169      
+             473 |███████████████████▉                     168      
+             474 |███████████████████▊                     167      
+             475 |███████████████████▋                     166      
+             476 |███████████████████▌                     165      
+             477 |███████████████████▍                     164      
+             478 |███████████████████▎                     163      
+             479 |███████████████████▏                     162      
+             480 |███████████████████                      161      
+             481 |███████████████████                      160      
+             482 |██████████████████▉                      159      
+             483 |██████████████████▊                      158      
+             484 |██████████████████▋                      157      
+             485 |██████████████████▌                      156      
+             486 |██████████████████▍                      155      
+             487 |██████████████████▎                      154      
+             488 |██████████████████▏                      153      
+             489 |██████████████████                       152      
+             490 |█████████████████▉                       151      
+             491 |█████████████████▊                       150      
+             492 |█████████████████▋                       149      
+             493 |█████████████████▌                       148      
+             494 |█████████████████▍                       147      
+             495 |█████████████████▎                       146      
+             496 |█████████████████▏                       145      
+             497 |█████████████████                        144      
+             498 |████████████████▉                        143      
+             499 |████████████████▊                        142      
+             500 |████████████████▋                        141      
+             501 |████████████████▋                        140      
+             502 |████████████████▌                        139      
+             503 |████████████████▍                        138      
+             504 |████████████████▎                        137      
+             505 |████████████████▏                        136      
+             506 |████████████████                         135      
+             507 |███████████████▉                         134      
+             508 |███████████████▊                         133      
+             509 |███████████████▋                         132      
+             510 |███████████████▌                         131      
+             511 |███████████████▍                         130      
+             512 |███████████████▎                         129      
+             513 |███████████████▏                         128      
+             514 |███████████████                          127      
+             515 |██████████████▉                          126      
+             516 |██████████████▊                          125      
+             517 |██████████████▋                          124      
+             518 |██████████████▌                          123      
+             519 |██████████████▍                          122      
+             520 |██████████████▎                          121      
+             521 |██████████████▎                          120      
+             522 |██████████████▏                          119      
+             523 |██████████████                           118      
+             524 |█████████████▉                           117      
+             525 |█████████████▊                           116      
+             526 |█████████████▋                           115      
+             527 |█████████████▌                           114      
+             528 |█████████████▍                           113      
+             529 |█████████████▎                           112      
+             530 |█████████████▏                           111      
+             531 |█████████████                            110      
+             532 |████████████▉                            109      
+             533 |████████████▊                            108      
+             534 |████████████▋                            107      
+             535 |████████████▌                            106      
+             536 |████████████▍                            105      
+             537 |████████████▎                            104      
+             538 |████████████▏                            103      
+             539 |████████████                             102      
+             540 |███████████▉                             101      
+             541 |███████████▉                             100      
+             542 |███████████▊                             99       
+             543 |███████████▋                             98       
+             544 |███████████▌                             97       
+             545 |███████████▍                             96       
+             546 |███████████▎                             95       
+             547 |███████████▏                             94       
+             548 |███████████                              93       
+             549 |██████████▉                              92       
+             550 |██████████▊                              91       
+             551 |██████████▋                              90       
+             552 |██████████▌                              89       
+             553 |██████████▍                              88       
+             554 |██████████▎                              87       
+             555 |██████████▏                              86       
+             556 |██████████                               85       
+             557 |█████████▉                               84       
+             558 |█████████▊                               83       
+             559 |█████████▋                               82       
+             560 |█████████▌                               81       
+             561 |█████████▌                               80       
+             562 |█████████▍                               79       
+             563 |█████████▎                               78       
+             564 |█████████▏                               77       
+             565 |█████████                                76       
+             566 |████████▉                                75       
+             567 |████████▊                                74       
+             568 |████████▋                                73       
+             569 |████████▌                                72       
+             570 |████████▍                                71       
+             571 |████████▎                                70       
+             572 |████████▏                                69       
+             573 |████████                                 68       
+             574 |███████▉                                 67       
+             575 |███████▊                                 66       
+             576 |███████▋                                 65       
+             577 |███████▌                                 64       
+             578 |███████▍                                 63       
+             579 |███████▎                                 62       
+             580 |███████▏                                 61       
+             581 |███████▏                                 60       
+             582 |███████                                  59       
+             583 |██████▉                                  58       
+             584 |██████▊                                  57       
+             585 |██████▋                                  56       
+             586 |██████▌                                  55       
+             587 |██████▍                                  54       
+             588 |██████▎                                  53       
+             589 |██████▏                                  52       
+             590 |██████                                   51       
+             591 |█████▉                                   50       
+             592 |█████▊                                   49       
+             593 |█████▋                                   48       
+             594 |█████▌                                   47       
+             595 |█████▍                                   46       
+             596 |█████▎                                   45       
+             597 |█████▏                                   44       
+             598 |█████                                    43       
+             599 |████▉                                    42       
+             600 |████▊                                    41       
+             601 |████▊                                    40       
+             602 |████▋                                    39       
+             603 |████▌                                    38       
+             604 |████▍                                    37       
+             605 |████▎                                    36       
+             606 |████▏                                    35       
+             607 |████                                     34       
+             608 |███▉                                     33       
+             609 |███▊                                     32       
+             610 |███▋                                     31       
+             611 |███▌                                     30       
+             612 |███▍                                     29       
+             613 |███▎                                     28       
+             614 |███▏                                     27       
+             615 |███                                      26       
+             616 |██▉                                      25       
+             617 |██▊                                      24       
+             618 |██▋                                      23       
+             619 |██▌                                      22       
+             620 |██▍                                      21       
+             621 |██▍                                      20       
+             622 |██▎                                      19       
+             623 |██▏                                      18       
+             624 |██                                       17       
+             625 |█▉                                       16       
+             626 |█▊                                       15       
+             627 |█▋                                       14       
+             628 |█▌                                       13       
+             629 |█▍                                       12       
+             630 |█▎                                       11       
+             631 |█▏                                       10       
+             632 |█                                        9        
+             633 |▉                                        8        
+             634 |▊                                        7        
+             635 |▋                                        6        
+             636 |▌                                        5        
+             637 |▍                                        4        
+             638 |▎                                        3        
+             639 |▏                                        2        
+          >= 640 |                                         1        
+
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d
new file mode 100644
index 000000000000..317aecefddfe
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d
@@ -0,0 +1,46 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2013 Joyent, Inc.  All rights reserved.
+ */
+
+#pragma D option agghist
+#pragma D option quiet
+
+BEGIN
+{
+	@["demerit"] = sum(-10);
+	@["wtf"] = sum(10);
+	@["bot"] = sum(20);
+
+	@bagnoogle["SOAP/XML"] = sum(1);
+	@bagnoogle["XACML store"] = sum(5);
+	@bagnoogle["SAML token"] = sum(6);
+
+	@stalloogle["breakfast"] = sum(-5);
+	@stalloogle["non-diet pepsi"] = sum(-20);
+	@stalloogle["parrot"] = sum(-100);
+
+	printa(@);
+	printa(@bagnoogle);
+	printa(@stalloogle);
+
+	printf("\nzoomed:");
+
+	setopt("aggzoom");
+	printa(@);
+	printa(@bagnoogle);
+	printa(@stalloogle);
+
+	exit(0);
+}
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d.out
new file mode 100644
index 000000000000..d76e4da4b82d
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.agghist.d.out
@@ -0,0 +1,38 @@
+
+
+              key  ------------- Distribution ------------- count    
+          demerit                @@@@@|                     -10      
+              wtf                     |@@@@@                10       
+              bot                     |@@@@@@@@@@           20       
+
+
+              key  ------------- Distribution ------------- count    
+         SOAP/XML |@@@                                      1        
+      XACML store |@@@@@@@@@@@@@@@@@                        5        
+       SAML token |@@@@@@@@@@@@@@@@@@@@                     6        
+
+
+              key  ------------- Distribution ------------- count    
+           parrot         @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@| -100     
+   non-diet pepsi                                   @@@@@@| -20      
+        breakfast                                       @@| -5       
+
+zoomed:
+
+              key  ------------- Distribution ------------- count    
+          demerit           @@@@@@@@@@|                     -10      
+              wtf                     |@@@@@@@@@@           10       
+              bot                     |@@@@@@@@@@@@@@@@@@@  20       
+
+
+              key  ------------- Distribution ------------- count    
+         SOAP/XML |@@@@@@@                                  1        
+      XACML store |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@        5        
+       SAML token |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 6        
+
+
+              key  ------------- Distribution ------------- count    
+           parrot   @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@| -100     
+   non-diet pepsi                                 @@@@@@@@| -20      
+        breakfast                                       @@| -5       
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d
new file mode 100644
index 000000000000..c9fdba76c4be
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d
@@ -0,0 +1,53 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2013 Joyent, Inc.  All rights reserved.
+ */
+
+#pragma D option aggpack
+#pragma D option encoding=ascii
+#pragma D option quiet
+
+BEGIN
+{
+	@x = quantize(1 << 32);
+	@y[1] = quantize(1);
+	@z["mumble"] = quantize(1);
+	@xx["foo", (char)1, (short)2, (long)3] = quantize(1);
+
+	@neg = lquantize(-10, -10, 20, 1, -1);
+	@neg = lquantize(-5, -10, 20, 1, 1);
+	@neg = lquantize(0, -10, 20, 1, 1);
+
+	i = 0;
+}
+
+tick-1ms
+{
+	@a[i] = quantize(0, i);
+	@a[i] = quantize(1, 100 - i);
+	i++;
+}
+
+tick-1ms
+/i > 100/
+{
+	exit(0);
+}
+
+END
+{
+	setopt("aggzoom", "true");
+	printa(@neg);
+	setopt("aggzoom", "false");
+	printa(@neg);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d.out
new file mode 100644
index 000000000000..5300ebdbe934
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpack.d.out
@@ -0,0 +1,124 @@
+
+
+     min .--------------------------------. max      | count
+   < -10 : V    X    X                    : >= 20    | 1
+
+
+     min .--------------------------------. max      | count
+   < -10 : v    x    x                    : >= 20    | 1
+
+
+        min .---. max        | count
+ 2147483648 : X : 8589934592 | 1
+
+      key  min .---. max  | count
+        1    0 : X : 2    | 1
+
+              key  min .---. max  | count
+           mumble    0 : X : 2    | 1
+
+                                         key  min .---. max  | count
+              foo   1     2                3    0 : X : 2    | 1
+
+      key  min .---. max  | count
+      100    0 :X  : 2    | 100
+       99    0 :X_ : 2    | 100
+       98    0 :X_ : 2    | 100
+       97    0 :X_ : 2    | 100
+       96    0 :X_ : 2    | 100
+       95    0 :X_ : 2    | 100
+       94    0 :X_ : 2    | 100
+       93    0 :X_ : 2    | 100
+       92    0 :X_ : 2    | 100
+       91    0 :X_ : 2    | 100
+       90    0 :X_ : 2    | 100
+       89    0 :X_ : 2    | 100
+       88    0 :X_ : 2    | 100
+       87    0 :X_ : 2    | 100
+       86    0 :X_ : 2    | 100
+       85    0 :X_ : 2    | 100
+       84    0 :X_ : 2    | 100
+       83    0 :X_ : 2    | 100
+       82    0 :X_ : 2    | 100
+       81    0 :X_ : 2    | 100
+       80    0 :X_ : 2    | 100
+       79    0 :X_ : 2    | 100
+       78    0 :xx : 2    | 100
+       77    0 :xx : 2    | 100
+       76    0 :xx : 2    | 100
+       75    0 :xx : 2    | 100
+       74    0 :xx : 2    | 100
+       73    0 :xx : 2    | 100
+       72    0 :xx : 2    | 100
+       71    0 :xx : 2    | 100
+       70    0 :xx : 2    | 100
+       69    0 :xx : 2    | 100
+       68    0 :xx : 2    | 100
+       67    0 :xx : 2    | 100
+       66    0 :xx : 2    | 100
+       65    0 :xx : 2    | 100
+       64    0 :xx : 2    | 100
+       63    0 :xx : 2    | 100
+       62    0 :xx : 2    | 100
+       61    0 :xx : 2    | 100
+       60    0 :xx : 2    | 100
+       59    0 :xx : 2    | 100
+       58    0 :xx : 2    | 100
+       57    0 :xx : 2    | 100
+       56    0 :xx : 2    | 100
+       55    0 :xx : 2    | 100
+       54    0 :xx : 2    | 100
+       53    0 :xx : 2    | 100
+       52    0 :xx : 2    | 100
+       51    0 :xx : 2    | 100
+       50    0 :xx : 2    | 100
+       49    0 :xx : 2    | 100
+       48    0 :xx : 2    | 100
+       47    0 :xx : 2    | 100
+       46    0 :xx : 2    | 100
+       45    0 :xx : 2    | 100
+       44    0 :xx : 2    | 100
+       43    0 :xx : 2    | 100
+       42    0 :xx : 2    | 100
+       41    0 :xx : 2    | 100
+       40    0 :xx : 2    | 100
+       39    0 :xx : 2    | 100
+       38    0 :xx : 2    | 100
+       37    0 :xx : 2    | 100
+       36    0 :xx : 2    | 100
+       35    0 :xx : 2    | 100
+       34    0 :xx : 2    | 100
+       33    0 :xx : 2    | 100
+       32    0 :xx : 2    | 100
+       31    0 :xx : 2    | 100
+       30    0 :xx : 2    | 100
+       29    0 :xx : 2    | 100
+       28    0 :xx : 2    | 100
+       27    0 :xx : 2    | 100
+       26    0 :xx : 2    | 100
+       25    0 :xx : 2    | 100
+       24    0 :xx : 2    | 100
+       23    0 :xx : 2    | 100
+       22    0 :xx : 2    | 100
+       21    0 :_X : 2    | 100
+       20    0 :_X : 2    | 100
+       19    0 :_X : 2    | 100
+       18    0 :_X : 2    | 100
+       17    0 :_X : 2    | 100
+       16    0 :_X : 2    | 100
+       15    0 :_X : 2    | 100
+       14    0 :_X : 2    | 100
+       13    0 :_X : 2    | 100
+       12    0 :_X : 2    | 100
+       11    0 :_X : 2    | 100
+       10    0 :_X : 2    | 100
+        9    0 :_X : 2    | 100
+        8    0 :_X : 2    | 100
+        7    0 :_X : 2    | 100
+        6    0 :_X : 2    | 100
+        5    0 :_X : 2    | 100
+        4    0 :_X : 2    | 100
+        3    0 :_X : 2    | 100
+        2    0 :_X : 2    | 100
+        1    0 :_X : 2    | 100
+        0    0 : X : 2    | 100
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh
new file mode 100644
index 000000000000..f055a08c13e6
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh
@@ -0,0 +1,75 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc.  All rights reserved.
+#
+
+let width=8
+
+function outputchar
+{
+	banner $3 | /bin/nawk -v line=$1 -v pos=$2 -v width=$width '{ \
+		for (i = 1; i <= length($0); i++) { \
+			if (substr($0, i, 1) == " ") \
+				continue; \
+			printf("\t@letter%d[%d] = lquantize(%d, 0, 40, 1);\n", \
+			    line, NR, i + (pos * width));
+		} \
+	}'
+}
+
+function outputstr
+{
+	let pos=0;
+	let line=0
+
+	printf "#pragma D option aggpack\n#pragma D option aggsortkey\n"
+
+	printf "BEGIN\n{\n"
+	for c in `echo "$1" | /bin/nawk '{ \
+		for (i = 1; i <= length($0); i++) { \
+			c = substr($0, i, 1); \
+			printf("%s\n", c == " " ? "space" : \
+			    c == "\n" ? "newline" : c); \
+		} \
+	}'`; do
+		if [[ "$c" == "space" ]]; then
+			let line=line+1
+			let pos=0
+			continue
+		fi
+
+		outputchar $line $pos $c
+		let pos=pos+1
+	done
+
+	let i=0
+
+	while [[ $i -le $line ]]; do
+		printf "\tprinta(@letter%d);\n" $i
+		let i=i+1
+	done
+	printf "\texit(0);\n}\n"
+}
+
+dtrace -qs /dev/stdin -x encoding=utf8 <<EOF
+`outputstr "why must i do this"`
+EOF
+
+dtrace -qs /dev/stdin -x encoding=ascii -x aggzoom <<EOF
+`outputstr "i am not well"`
+EOF
+
+dtrace -qs /dev/stdin -x encoding=utf8 -x aggzoom <<EOF
+`outputstr "send help"`
+EOF
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh.out
new file mode 100644
index 000000000000..a7eba38785bc
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackbanner.ksh.out
@@ -0,0 +1,102 @@
+
+
+      key     min .------------------------------------------. max      | count
+        2     < 0 :   ▂    ▂  ▂    ▂   ▂   ▂                 : >= 40    | 6
+        3     < 0 :   ▂    ▂  ▂    ▂    ▂ ▂                  : >= 40    | 6
+        4     < 0 :   ▂    ▂  ▂▂▂▂▂▂     ▂                   : >= 40    | 9
+        5     < 0 :   ▂ ▂▂ ▂  ▂    ▂     ▂                   : >= 40    | 7
+        6     < 0 :   ▂▂  ▂▂  ▂    ▂     ▂                   : >= 40    | 7
+        7     < 0 :   ▂    ▂  ▂    ▂     ▂                   : >= 40    | 5
+
+
+      key     min .------------------------------------------. max      | count
+        2     < 0 :   ▂    ▂  ▂    ▂   ▂▂▂▂    ▂▂▂▂▂         : >= 40    | 13
+        3     < 0 :   ▂▂  ▂▂  ▂    ▂  ▂          ▂           : >= 40    | 8
+        4     < 0 :   ▂ ▂▂ ▂  ▂    ▂   ▂▂▂▂      ▂           : >= 40    | 11
+        5     < 0 :   ▂    ▂  ▂    ▂       ▂     ▂           : >= 40    | 6
+        6     < 0 :   ▂    ▂  ▂    ▂  ▂    ▂     ▂           : >= 40    | 7
+        7     < 0 :   ▂    ▂   ▂▂▂▂    ▂▂▂▂      ▂           : >= 40    | 11
+
+
+      key     min .------------------------------------------. max      | count
+        2     < 0 :      █                                   : >= 40    | 1
+        3     < 0 :      █                                   : >= 40    | 1
+        4     < 0 :      █                                   : >= 40    | 1
+        5     < 0 :      █                                   : >= 40    | 1
+        6     < 0 :      █                                   : >= 40    | 1
+        7     < 0 :      █                                   : >= 40    | 1
+
+
+      key     min .------------------------------------------. max      | count
+        2     < 0 :   ▂▂▂▂▂    ▂▂▂▂                          : >= 40    | 9
+        3     < 0 :   ▃    ▃  ▃    ▃                         : >= 40    | 4
+        4     < 0 :   ▃    ▃  ▃    ▃                         : >= 40    | 4
+        5     < 0 :   ▃    ▃  ▃    ▃                         : >= 40    | 4
+        6     < 0 :   ▃    ▃  ▃    ▃                         : >= 40    | 4
+        7     < 0 :   ▂▂▂▂▂    ▂▂▂▂                          : >= 40    | 9
+
+
+      key     min .------------------------------------------. max      | count
+        2     < 0 :    ▂▂▂▂▂  ▂    ▂     ▂     ▂▂▂▂          : >= 40    | 12
+        3     < 0 :      ▂    ▂    ▂     ▂    ▂              : >= 40    | 5
+        4     < 0 :      ▂    ▂▂▂▂▂▂     ▂     ▂▂▂▂          : >= 40    | 12
+        5     < 0 :      ▂    ▂    ▂     ▂         ▂         : >= 40    | 5
+        6     < 0 :      ▂    ▂    ▂     ▂    ▂    ▂         : >= 40    | 6
+        7     < 0 :      ▂    ▂    ▂     ▂     ▂▂▂▂          : >= 40    | 8
+
+
+
+      key     min .------------------------------------------. max      | count
+        2     < 0 :      X                                   : >= 40    | 1
+        3     < 0 :      X                                   : >= 40    | 1
+        4     < 0 :      X                                   : >= 40    | 1
+        5     < 0 :      X                                   : >= 40    | 1
+        6     < 0 :      X                                   : >= 40    | 1
+        7     < 0 :      X                                   : >= 40    | 1
+
+
+      key     min .------------------------------------------. max      | count
+        2     < 0 :     XX    X    X                         : >= 40    | 4
+        3     < 0 :    X  X   XX  XX                         : >= 40    | 6
+        4     < 0 :   X    X  X XX X                         : >= 40    | 6
+        5     < 0 :   XXXXXX  X    X                         : >= 40    | 8
+        6     < 0 :   X    X  X    X                         : >= 40    | 4
+        7     < 0 :   X    X  X    X                         : >= 40    | 4
+
+
+      key     min .------------------------------------------. max      | count
+        2     < 0 :   X    X   XXXX    XXXXX                 : >= 40    | 11
+        3     < 0 :   XX   X  X    X     X                   : >= 40    | 6
+        4     < 0 :   X X  X  X    X     X                   : >= 40    | 6
+        5     < 0 :   X  X X  X    X     X                   : >= 40    | 6
+        6     < 0 :   X   XX  X    X     X                   : >= 40    | 6
+        7     < 0 :   X    X   XXXX      X                   : >= 40    | 7
+
+
+      key     min .------------------------------------------. max      | count
+        2     < 0 :   X    X  XXXXXX  X       X              : >= 40    | 10
+        3     < 0 :   X    X  X       X       X              : >= 40    | 5
+        4     < 0 :   X    X  XXXXX   X       X              : >= 40    | 9
+        5     < 0 :   X XX X  X       X       X              : >= 40    | 7
+        6     < 0 :   XX  XX  X       X       X              : >= 40    | 7
+        7     < 0 :   X    X  XXXXXX  XXXXXX  XXXXXX         : >= 40    | 20
+
+
+
+      key     min .------------------------------------------. max      | count
+        2     < 0 :    ████   ██████  █    █  █████          : >= 40    | 17
+        3     < 0 :   █       █       ██   █  █    █         : >= 40    | 7
+        4     < 0 :    ████   █████   █ █  █  █    █         : >= 40    | 14
+        5     < 0 :        █  █       █  █ █  █    █         : >= 40    | 7
+        6     < 0 :   █    █  █       █   ██  █    █         : >= 40    | 8
+        7     < 0 :    ████   ██████  █    █  █████          : >= 40    | 17
+
+
+      key     min .------------------------------------------. max      | count
+        2     < 0 :   █    █  ██████  █       █████          : >= 40    | 14
+        3     < 0 :   █    █  █       █       █    █         : >= 40    | 6
+        4     < 0 :   ██████  █████   █       █    █         : >= 40    | 14
+        5     < 0 :   █    █  █       █       █████          : >= 40    | 9
+        6     < 0 :   █    █  █       █       █              : >= 40    | 5
+        7     < 0 :   █    █  ██████  ██████  █              : >= 40    | 15
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d
new file mode 100644
index 000000000000..2f297e25939c
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d
@@ -0,0 +1,43 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2013 Joyent, Inc.  All rights reserved.
+ */
+
+#pragma D option encoding=ascii
+#pragma D option quiet
+
+tick-1ms
+/i++ < 30/
+{
+	@[1] = lquantize(i, 0, 40, 1, 1000);
+	@[2] = lquantize(i, 0, 40, 1, 1000);
+	@[3] = lquantize(i, 0, 40, 1, 1000);
+}
+
+tick-1ms
+/i == 40/
+{
+	@[1] = lquantize(0, 0, 40, 1, 1);
+	@[1] = lquantize(i, 0, 40, 1, 2000);
+	@[2] = lquantize(0, 0, 40, 1, 1);
+	@[2] = lquantize(i, 0, 40, 1, 2000);
+	@[3] = lquantize(0, 0, 40, 1, 1);
+	@[3] = lquantize(i, 0, 40, 1, 2000);
+
+	printa(@);
+	setopt("aggpack");
+	printa(@);
+	setopt("aggzoom");
+	printa(@);
+	exit(0);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d.out
new file mode 100644
index 000000000000..a22a2a4a173e
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggpackzoom.d.out
@@ -0,0 +1,149 @@
+
+        1
+           value  ------------- Distribution ------------- count    
+             < 0 |                                         0        
+               0 |                                         1        
+               1 |@                                        1000     
+               2 |@                                        1000     
+               3 |@                                        1000     
+               4 |@                                        1000     
+               5 |@                                        1000     
+               6 |@                                        1000     
+               7 |@                                        1000     
+               8 |@                                        1000     
+               9 |@                                        1000     
+              10 |@                                        1000     
+              11 |@                                        1000     
+              12 |@                                        1000     
+              13 |@                                        1000     
+              14 |@                                        1000     
+              15 |@                                        1000     
+              16 |@                                        1000     
+              17 |@                                        1000     
+              18 |@                                        1000     
+              19 |@                                        1000     
+              20 |@                                        1000     
+              21 |@                                        1000     
+              22 |@                                        1000     
+              23 |@                                        1000     
+              24 |@                                        1000     
+              25 |@                                        1000     
+              26 |@                                        1000     
+              27 |@                                        1000     
+              28 |@                                        1000     
+              29 |@                                        1000     
+              30 |@                                        1000     
+              31 |                                         0        
+              32 |                                         0        
+              33 |                                         0        
+              34 |                                         0        
+              35 |                                         0        
+              36 |                                         0        
+              37 |                                         0        
+              38 |                                         0        
+              39 |                                         0        
+           >= 40 |@@                                       2000     
+
+        2
+           value  ------------- Distribution ------------- count    
+             < 0 |                                         0        
+               0 |                                         1        
+               1 |@                                        1000     
+               2 |@                                        1000     
+               3 |@                                        1000     
+               4 |@                                        1000     
+               5 |@                                        1000     
+               6 |@                                        1000     
+               7 |@                                        1000     
+               8 |@                                        1000     
+               9 |@                                        1000     
+              10 |@                                        1000     
+              11 |@                                        1000     
+              12 |@                                        1000     
+              13 |@                                        1000     
+              14 |@                                        1000     
+              15 |@                                        1000     
+              16 |@                                        1000     
+              17 |@                                        1000     
+              18 |@                                        1000     
+              19 |@                                        1000     
+              20 |@                                        1000     
+              21 |@                                        1000     
+              22 |@                                        1000     
+              23 |@                                        1000     
+              24 |@                                        1000     
+              25 |@                                        1000     
+              26 |@                                        1000     
+              27 |@                                        1000     
+              28 |@                                        1000     
+              29 |@                                        1000     
+              30 |@                                        1000     
+              31 |                                         0        
+              32 |                                         0        
+              33 |                                         0        
+              34 |                                         0        
+              35 |                                         0        
+              36 |                                         0        
+              37 |                                         0        
+              38 |                                         0        
+              39 |                                         0        
+           >= 40 |@@                                       2000     
+
+        3
+           value  ------------- Distribution ------------- count    
+             < 0 |                                         0        
+               0 |                                         1        
+               1 |@                                        1000     
+               2 |@                                        1000     
+               3 |@                                        1000     
+               4 |@                                        1000     
+               5 |@                                        1000     
+               6 |@                                        1000     
+               7 |@                                        1000     
+               8 |@                                        1000     
+               9 |@                                        1000     
+              10 |@                                        1000     
+              11 |@                                        1000     
+              12 |@                                        1000     
+              13 |@                                        1000     
+              14 |@                                        1000     
+              15 |@                                        1000     
+              16 |@                                        1000     
+              17 |@                                        1000     
+              18 |@                                        1000     
+              19 |@                                        1000     
+              20 |@                                        1000     
+              21 |@                                        1000     
+              22 |@                                        1000     
+              23 |@                                        1000     
+              24 |@                                        1000     
+              25 |@                                        1000     
+              26 |@                                        1000     
+              27 |@                                        1000     
+              28 |@                                        1000     
+              29 |@                                        1000     
+              30 |@                                        1000     
+              31 |                                         0        
+              32 |                                         0        
+              33 |                                         0        
+              34 |                                         0        
+              35 |                                         0        
+              36 |                                         0        
+              37 |                                         0        
+              38 |                                         0        
+              39 |                                         0        
+           >= 40 |@@                                       2000     
+
+
+
+      key     min .------------------------------------------. max      | count
+        1     < 0 : _______________________________         _: >= 40    | 32001
+        2     < 0 : _______________________________         _: >= 40    | 32001
+        3     < 0 : _______________________________         _: >= 40    | 32001
+
+
+      key     min .------------------------------------------. max      | count
+        1     < 0 : _xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx         X: >= 40    | 32001
+        2     < 0 : _xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx         X: >= 40    | 32001
+        3     < 0 : _xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx         X: >= 40    | 32001
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d
new file mode 100644
index 000000000000..f237d26272f4
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d
@@ -0,0 +1,35 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2013 Joyent, Inc.  All rights reserved.
+ */
+
+#pragma D option encoding=ascii
+#pragma D option quiet
+
+tick-1ms
+/i++ < 90/
+{
+	@ = lquantize(i, 0, 100, 1, 1000);
+}
+
+tick-1ms
+/i == 100/
+{
+	@ = lquantize(i++, 0, 100, 1, 2000);
+	@ = lquantize(i++, 0, 100, 1, 3000);
+
+	printa(@);
+	setopt("aggzoom");
+	printa(@);
+	exit(0);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d.out
new file mode 100644
index 000000000000..acddf7f731ad
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.aggzoom.d.out
@@ -0,0 +1,211 @@
+
+
+           value  ------------- Distribution ------------- count    
+               0 |                                         0        
+               1 |                                         1000     
+               2 |                                         1000     
+               3 |                                         1000     
+               4 |                                         1000     
+               5 |                                         1000     
+               6 |                                         1000     
+               7 |                                         1000     
+               8 |                                         1000     
+               9 |                                         1000     
+              10 |                                         1000     
+              11 |                                         1000     
+              12 |                                         1000     
+              13 |                                         1000     
+              14 |                                         1000     
+              15 |                                         1000     
+              16 |                                         1000     
+              17 |                                         1000     
+              18 |                                         1000     
+              19 |                                         1000     
+              20 |                                         1000     
+              21 |                                         1000     
+              22 |                                         1000     
+              23 |                                         1000     
+              24 |                                         1000     
+              25 |                                         1000     
+              26 |                                         1000     
+              27 |                                         1000     
+              28 |                                         1000     
+              29 |                                         1000     
+              30 |                                         1000     
+              31 |                                         1000     
+              32 |                                         1000     
+              33 |                                         1000     
+              34 |                                         1000     
+              35 |                                         1000     
+              36 |                                         1000     
+              37 |                                         1000     
+              38 |                                         1000     
+              39 |                                         1000     
+              40 |                                         1000     
+              41 |                                         1000     
+              42 |                                         1000     
+              43 |                                         1000     
+              44 |                                         1000     
+              45 |                                         1000     
+              46 |                                         1000     
+              47 |                                         1000     
+              48 |                                         1000     
+              49 |                                         1000     
+              50 |                                         1000     
+              51 |                                         1000     
+              52 |                                         1000     
+              53 |                                         1000     
+              54 |                                         1000     
+              55 |                                         1000     
+              56 |                                         1000     
+              57 |                                         1000     
+              58 |                                         1000     
+              59 |                                         1000     
+              60 |                                         1000     
+              61 |                                         1000     
+              62 |                                         1000     
+              63 |                                         1000     
+              64 |                                         1000     
+              65 |                                         1000     
+              66 |                                         1000     
+              67 |                                         1000     
+              68 |                                         1000     
+              69 |                                         1000     
+              70 |                                         1000     
+              71 |                                         1000     
+              72 |                                         1000     
+              73 |                                         1000     
+              74 |                                         1000     
+              75 |                                         1000     
+              76 |                                         1000     
+              77 |                                         1000     
+              78 |                                         1000     
+              79 |                                         1000     
+              80 |                                         1000     
+              81 |                                         1000     
+              82 |                                         1000     
+              83 |                                         1000     
+              84 |                                         1000     
+              85 |                                         1000     
+              86 |                                         1000     
+              87 |                                         1000     
+              88 |                                         1000     
+              89 |                                         1000     
+              90 |                                         1000     
+              91 |                                         0        
+              92 |                                         0        
+              93 |                                         0        
+              94 |                                         0        
+              95 |                                         0        
+              96 |                                         0        
+              97 |                                         0        
+              98 |                                         0        
+              99 |                                         0        
+          >= 100 |@@                                       5000     
+
+
+
+           value  ------------- Distribution ------------- count    
+               0 |                                         0        
+               1 |@@@@@@@@                                 1000     
+               2 |@@@@@@@@                                 1000     
+               3 |@@@@@@@@                                 1000     
+               4 |@@@@@@@@                                 1000     
+               5 |@@@@@@@@                                 1000     
+               6 |@@@@@@@@                                 1000     
+               7 |@@@@@@@@                                 1000     
+               8 |@@@@@@@@                                 1000     
+               9 |@@@@@@@@                                 1000     
+              10 |@@@@@@@@                                 1000     
+              11 |@@@@@@@@                                 1000     
+              12 |@@@@@@@@                                 1000     
+              13 |@@@@@@@@                                 1000     
+              14 |@@@@@@@@                                 1000     
+              15 |@@@@@@@@                                 1000     
+              16 |@@@@@@@@                                 1000     
+              17 |@@@@@@@@                                 1000     
+              18 |@@@@@@@@                                 1000     
+              19 |@@@@@@@@                                 1000     
+              20 |@@@@@@@@                                 1000     
+              21 |@@@@@@@@                                 1000     
+              22 |@@@@@@@@                                 1000     
+              23 |@@@@@@@@                                 1000     
+              24 |@@@@@@@@                                 1000     
+              25 |@@@@@@@@                                 1000     
+              26 |@@@@@@@@                                 1000     
+              27 |@@@@@@@@                                 1000     
+              28 |@@@@@@@@                                 1000     
+              29 |@@@@@@@@                                 1000     
+              30 |@@@@@@@@                                 1000     
+              31 |@@@@@@@@                                 1000     
+              32 |@@@@@@@@                                 1000     
+              33 |@@@@@@@@                                 1000     
+              34 |@@@@@@@@                                 1000     
+              35 |@@@@@@@@                                 1000     
+              36 |@@@@@@@@                                 1000     
+              37 |@@@@@@@@                                 1000     
+              38 |@@@@@@@@                                 1000     
+              39 |@@@@@@@@                                 1000     
+              40 |@@@@@@@@                                 1000     
+              41 |@@@@@@@@                                 1000     
+              42 |@@@@@@@@                                 1000     
+              43 |@@@@@@@@                                 1000     
+              44 |@@@@@@@@                                 1000     
+              45 |@@@@@@@@                                 1000     
+              46 |@@@@@@@@                                 1000     
+              47 |@@@@@@@@                                 1000     
+              48 |@@@@@@@@                                 1000     
+              49 |@@@@@@@@                                 1000     
+              50 |@@@@@@@@                                 1000     
+              51 |@@@@@@@@                                 1000     
+              52 |@@@@@@@@                                 1000     
+              53 |@@@@@@@@                                 1000     
+              54 |@@@@@@@@                                 1000     
+              55 |@@@@@@@@                                 1000     
+              56 |@@@@@@@@                                 1000     
+              57 |@@@@@@@@                                 1000     
+              58 |@@@@@@@@                                 1000     
+              59 |@@@@@@@@                                 1000     
+              60 |@@@@@@@@                                 1000     
+              61 |@@@@@@@@                                 1000     
+              62 |@@@@@@@@                                 1000     
+              63 |@@@@@@@@                                 1000     
+              64 |@@@@@@@@                                 1000     
+              65 |@@@@@@@@                                 1000     
+              66 |@@@@@@@@                                 1000     
+              67 |@@@@@@@@                                 1000     
+              68 |@@@@@@@@                                 1000     
+              69 |@@@@@@@@                                 1000     
+              70 |@@@@@@@@                                 1000     
+              71 |@@@@@@@@                                 1000     
+              72 |@@@@@@@@                                 1000     
+              73 |@@@@@@@@                                 1000     
+              74 |@@@@@@@@                                 1000     
+              75 |@@@@@@@@                                 1000     
+              76 |@@@@@@@@                                 1000     
+              77 |@@@@@@@@                                 1000     
+              78 |@@@@@@@@                                 1000     
+              79 |@@@@@@@@                                 1000     
+              80 |@@@@@@@@                                 1000     
+              81 |@@@@@@@@                                 1000     
+              82 |@@@@@@@@                                 1000     
+              83 |@@@@@@@@                                 1000     
+              84 |@@@@@@@@                                 1000     
+              85 |@@@@@@@@                                 1000     
+              86 |@@@@@@@@                                 1000     
+              87 |@@@@@@@@                                 1000     
+              88 |@@@@@@@@                                 1000     
+              89 |@@@@@@@@                                 1000     
+              90 |@@@@@@@@                                 1000     
+              91 |                                         0        
+              92 |                                         0        
+              93 |                                         0        
+              94 |                                         0        
+              95 |                                         0        
+              96 |                                         0        
+              97 |                                         0        
+              98 |                                         0        
+              99 |                                         0        
+          >= 100 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@   5000     
+
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d
index d508596a97ff..9b02e982fe0d 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d
@@ -22,6 +22,7 @@
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2012, Joyent, Inc.  All rights reserved.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -97,6 +98,9 @@ INTFUNC(ntohll(0x1234567890abcdefL))
 STRFUNC(inet_ntoa((ipaddr_t *)alloca(sizeof (ipaddr_t))))
 STRFUNC(inet_ntoa6((in6_addr_t *)alloca(sizeof (in6_addr_t))))
 STRFUNC(inet_ntop(AF_INET, (void *)alloca(sizeof (ipaddr_t))))
+INTFUNC(getf(0))
+INTFUNC(strtoll("0x12EE5D5", 16))
+STRFUNC(json("{\"systemtap\": false}", "systemtap"))
 
 BEGIN
 /subr == DIF_SUBR_MAX + 1/
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.general.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.general.d
new file mode 100644
index 000000000000..4600811d95b9
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.general.d
@@ -0,0 +1,179 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2012, Joyent, Inc.  All rights reserved.
+ */
+
+/*
+ * General functional tests of JSON parser for json().
+ */
+
+#pragma D option quiet
+#pragma D option strsize=1k
+
+#define	TST(name)				\
+	printf("\ntst |%s|\n", name)
+#define	IN2(vala, valb)				\
+	in = strjoin(vala, valb);		\
+	printf("in  |%s|\n", in)
+#define	IN(val)					\
+	in = val;				\
+	printf("in  |%s|\n", in)
+#define	SEL(ss)					\
+	out = json(in, ss);			\
+	printf("sel |%s|\nout |%s|\n", ss,	\
+	    out != NULL ? out : "<NULL>")
+
+BEGIN
+{
+	TST("empty array");
+	IN("[]");
+	SEL("0");
+
+	TST("one-element array: integer");
+	IN("[1]");
+	SEL("0");
+	SEL("1");
+	SEL("100");
+	SEL("-1");
+
+	TST("one-element array: hex integer (not in spec, not supported)");
+	IN("[0x1000]");
+	SEL("0");
+
+	TST("one-element array: float");
+	IN("[1.5001]");
+	SEL("0");
+
+	TST("one-element array: float + exponent");
+	IN("[16.3e10]");
+	SEL("0");
+
+	TST("one-element array: integer + whitespace");
+	IN("[ \t   5\t]");
+	SEL("0");
+
+	TST("one-element array: integer + exponent + whitespace");
+	IN("[ \t    \t 16E10  \t ]");
+	SEL("0");
+
+	TST("one-element array: string");
+	IN("[\"alpha\"]");
+	SEL("0");
+
+	TST("alternative first-element indexing");
+	IN("[1,5,10,15,20]");
+	SEL("[0]");
+	SEL("[3]");
+	SEL("[4]");
+	SEL("[5]");
+
+	TST("one-element array: object");
+	IN("[ { \"first\": true, \"second\": false }]");
+	SEL("0.first");
+	SEL("0.second");
+	SEL("0.third");
+
+	TST("many-element array: integers");
+	IN("[0,1,1,2,3,5,8,13,21,34,55,89,144,233,377]");
+	SEL("10"); /* F(10) = 55 */
+	SEL("14"); /* F(14) = 377 */
+	SEL("19");
+
+	TST("many-element array: multiple types");
+	IN2("[\"string\",32,true,{\"a\":9,\"b\":false},100.3e10,false,200.5,",
+	    "{\"key\":\"val\"},null]");
+	SEL("0");
+	SEL("0.notobject");
+	SEL("1");
+	SEL("2");
+	SEL("3");
+	SEL("3.a");
+	SEL("3.b");
+	SEL("3.c");
+	SEL("4");
+	SEL("5");
+	SEL("6");
+	SEL("7");
+	SEL("7.key");
+	SEL("7.key.notobject");
+	SEL("7.nonexist");
+	SEL("8");
+	SEL("9");
+
+	TST("many-element array: multiple types + whitespace");
+	IN2("\n[\t\"string\" ,\t32 , true\t,\t {\"a\":  9,\t\"b\": false},\t\t",
+	    "100.3e10, false, 200.5,{\"key\" \t:\n \"val\"},\t\t null ]\t\t");
+	SEL("0");
+	SEL("0.notobject");
+	SEL("1");
+	SEL("2");
+	SEL("3");
+	SEL("3.a");
+	SEL("3.b");
+	SEL("3.c");
+	SEL("4");
+	SEL("5");
+	SEL("6");
+	SEL("7");
+	SEL("7.key");
+	SEL("7.key.notobject");
+	SEL("7.nonexist");
+	SEL("8");
+	SEL("9");
+
+	TST("two-element array: various string escape codes");
+	IN2("[\"abcd \\\" \\\\ \\/ \\b \\f \\n \\r \\t \\u0000 \\uf00F \", ",
+	    "\"final\"]");
+	SEL("0");
+	SEL("1");
+
+	TST("three-element array: broken escape code");
+	IN("[\"fine here\", \"dodgey \\u00AZ\", \"wont get here\"]");
+	SEL("0");
+	SEL("1");
+	SEL("2");
+
+	TST("nested objects");
+	IN2("{ \"top\": { \"mid\"  : { \"legs\": \"feet\" }, \"number\": 9, ",
+	    "\"array\":[0,1,{\"a\":true,\"bb\":[1,2,false,{\"x\":\"yz\"}]}]}}");
+	SEL("top");
+	SEL("fargo");
+	SEL("top.mid");
+	SEL("top.centre");
+	SEL("top.mid.legs");
+	SEL("top.mid.number");
+	SEL("top.mid.array");
+	SEL("top.number");
+	SEL("top.array");
+	SEL("top.array[0]");
+	SEL("top.array[1]");
+	SEL("top.array[2]");
+	SEL("top.array[2].a");
+	SEL("top.array[2].b");
+	SEL("top.array[2].bb");
+	SEL("top.array[2].bb[0]");
+	SEL("top.array[2].bb[1]");
+	SEL("top.array[2].bb[2]");
+	SEL("top.array[2].bb[3]");
+	SEL("top.array[2].bb[3].x");
+	SEL("top.array[2].bb[3].x.nofurther");
+	SEL("top.array[2].bb[4]");
+	SEL("top.array[3]");
+
+	exit(0);
+}
+
+ERROR
+{
+	exit(1);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.general.d.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.general.d.out
new file mode 100644
index 000000000000..a857ab91d831
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.general.d.out
@@ -0,0 +1,218 @@
+
+tst |empty array|
+in  |[]|
+sel |0|
+out |<NULL>|
+
+tst |one-element array: integer|
+in  |[1]|
+sel |0|
+out |1|
+sel |1|
+out |<NULL>|
+sel |100|
+out |<NULL>|
+sel |-1|
+out |<NULL>|
+
+tst |one-element array: hex integer (not in spec, not supported)|
+in  |[0x1000]|
+sel |0|
+out |<NULL>|
+
+tst |one-element array: float|
+in  |[1.5001]|
+sel |0|
+out |1.5001|
+
+tst |one-element array: float + exponent|
+in  |[16.3e10]|
+sel |0|
+out |16.3e10|
+
+tst |one-element array: integer + whitespace|
+in  |[ 	   5	]|
+sel |0|
+out |5|
+
+tst |one-element array: integer + exponent + whitespace|
+in  |[ 	    	 16E10  	 ]|
+sel |0|
+out |16E10|
+
+tst |one-element array: string|
+in  |["alpha"]|
+sel |0|
+out |alpha|
+
+tst |alternative first-element indexing|
+in  |[1,5,10,15,20]|
+sel |[0]|
+out |1|
+sel |[3]|
+out |15|
+sel |[4]|
+out |20|
+sel |[5]|
+out |<NULL>|
+
+tst |one-element array: object|
+in  |[ { "first": true, "second": false }]|
+sel |0.first|
+out |true|
+sel |0.second|
+out |false|
+sel |0.third|
+out |<NULL>|
+
+tst |many-element array: integers|
+in  |[0,1,1,2,3,5,8,13,21,34,55,89,144,233,377]|
+sel |10|
+out |55|
+sel |14|
+out |377|
+sel |19|
+out |<NULL>|
+
+tst |many-element array: multiple types|
+in  |["string",32,true,{"a":9,"b":false},100.3e10,false,200.5,{"key":"val"},null]|
+sel |0|
+out |string|
+sel |0.notobject|
+out |<NULL>|
+sel |1|
+out |32|
+sel |2|
+out |true|
+sel |3|
+out |{"a":9,"b":false}|
+sel |3.a|
+out |9|
+sel |3.b|
+out |false|
+sel |3.c|
+out |<NULL>|
+sel |4|
+out |100.3e10|
+sel |5|
+out |false|
+sel |6|
+out |200.5|
+sel |7|
+out |{"key":"val"}|
+sel |7.key|
+out |val|
+sel |7.key.notobject|
+out |<NULL>|
+sel |7.nonexist|
+out |<NULL>|
+sel |8|
+out |null|
+sel |9|
+out |<NULL>|
+
+tst |many-element array: multiple types + whitespace|
+in  |
+[	"string" ,	32 , true	,	 {"a":  9,	"b": false},		100.3e10, false, 200.5,{"key" 	:
+ "val"},		 null ]		|
+sel |0|
+out |string|
+sel |0.notobject|
+out |<NULL>|
+sel |1|
+out |32|
+sel |2|
+out |true|
+sel |3|
+out |{"a":  9,	"b": false}|
+sel |3.a|
+out |9|
+sel |3.b|
+out |false|
+sel |3.c|
+out |<NULL>|
+sel |4|
+out |100.3e10|
+sel |5|
+out |false|
+sel |6|
+out |200.5|
+sel |7|
+out |{"key" 	:
+ "val"}|
+sel |7.key|
+out |val|
+sel |7.key.notobject|
+out |<NULL>|
+sel |7.nonexist|
+out |<NULL>|
+sel |8|
+out |null|
+sel |9|
+out |<NULL>|
+
+tst |two-element array: various string escape codes|
+in  |["abcd \" \\ \/ \b \f \n \r \t \u0000 \uf00F ", "final"]|
+sel |0|
+out |abcd \" \\ \/ \b \f \n \r \t \u0000 \uf00F |
+sel |1|
+out |final|
+
+tst |three-element array: broken escape code|
+in  |["fine here", "dodgey \u00AZ", "wont get here"]|
+sel |0|
+out |fine here|
+sel |1|
+out |<NULL>|
+sel |2|
+out |<NULL>|
+
+tst |nested objects|
+in  |{ "top": { "mid"  : { "legs": "feet" }, "number": 9, "array":[0,1,{"a":true,"bb":[1,2,false,{"x":"yz"}]}]}}|
+sel |top|
+out |{ "mid"  : { "legs": "feet" }, "number": 9, "array":[0,1,{"a":true,"bb":[1,2,false,{"x":"yz"}]}]}|
+sel |fargo|
+out |<NULL>|
+sel |top.mid|
+out |{ "legs": "feet" }|
+sel |top.centre|
+out |<NULL>|
+sel |top.mid.legs|
+out |feet|
+sel |top.mid.number|
+out |<NULL>|
+sel |top.mid.array|
+out |<NULL>|
+sel |top.number|
+out |9|
+sel |top.array|
+out |[0,1,{"a":true,"bb":[1,2,false,{"x":"yz"}]}]|
+sel |top.array[0]|
+out |0|
+sel |top.array[1]|
+out |1|
+sel |top.array[2]|
+out |{"a":true,"bb":[1,2,false,{"x":"yz"}]}|
+sel |top.array[2].a|
+out |true|
+sel |top.array[2].b|
+out |<NULL>|
+sel |top.array[2].bb|
+out |[1,2,false,{"x":"yz"}]|
+sel |top.array[2].bb[0]|
+out |1|
+sel |top.array[2].bb[1]|
+out |2|
+sel |top.array[2].bb[2]|
+out |false|
+sel |top.array[2].bb[3]|
+out |{"x":"yz"}|
+sel |top.array[2].bb[3].x|
+out |yz|
+sel |top.array[2].bb[3].x.nofurther|
+out |<NULL>|
+sel |top.array[2].bb[4]|
+out |<NULL>|
+sel |top.array[3]|
+out |<NULL>|
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.strsize.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.strsize.d
new file mode 100644
index 000000000000..6aa50b9ad02b
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.strsize.d
@@ -0,0 +1,51 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2012, Joyent, Inc.  All rights reserved.
+ */
+
+/*
+ * ASSERTION:
+ *   json() run time must be bounded above by strsize.  This test makes strsize
+ *   small and deliberately overflows it to prove we bail and return NULL in
+ *   the event that we run off the end of the string.
+ *
+ */
+
+#pragma D option quiet
+#pragma D option strsize=18
+
+BEGIN
+{
+	in = "{\"a\":         1024}"; /* length == 19 */
+	out = json(in, "a");
+	printf("|%s|\n%s\n\n", in, out != NULL ? out : "<NULL>");
+
+	in = "{\"a\": 1024}"; /* length == 11 */
+	out = json(in, "a");
+	printf("|%s|\n%s\n\n", in, out != NULL ? out : "<NULL>");
+
+	in = "{\"a\":false,\"b\":true}"; /* length == 20 */
+	out = json(in, "b");
+	printf("|%s|\n%s\n\n", in, out != NULL ? out : "<NULL>");
+
+	in = "{\"a\":false,\"b\":20}"; /* length == 18 */
+	out = json(in, "b");
+	printf("|%s|\n%s\n\n", in, out != NULL ? out : "<NULL>");
+
+	exit(0);
+}
+
+ERROR
+{
+	exit(1);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.strsize.d.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.strsize.d.out
new file mode 100644
index 000000000000..7f1d79b6fedb
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.strsize.d.out
@@ -0,0 +1,13 @@
+|{"a":         1024|
+<NULL>
+
+|{"a": 1024}|
+1024
+
+|{"a":false,"b":tru|
+<NULL>
+
+|{"a":false,"b":20}|
+20
+
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c
new file mode 100644
index 000000000000..307106d903b5
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c
@@ -0,0 +1,61 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2012 (c), Joyent, Inc.  All rights reserved.
+ */
+
+#include <sys/sdt.h>
+#include "usdt.h"
+
+#define	FMT	"{" \
+		"  \"sizes\": [ \"first\", 2, %f ]," \
+		"  \"index\": %d," \
+		"  \"facts\": {" \
+		"    \"odd\": \"%s\"," \
+		"    \"even\": \"%s\"" \
+		"  }," \
+		"  \"action\": \"%s\"" \
+		"}\n"
+
+int
+waiting(volatile int *a)
+{
+	return (*a);
+}
+
+int
+main(int argc, char **argv)
+{
+	volatile int a = 0;
+	int idx;
+	double size = 250.5;
+
+	while (waiting(&a) == 0)
+		continue;
+
+	for (idx = 0; idx < 10; idx++) {
+		char *odd, *even, *json, *action;
+
+		size *= 1.78;
+		odd = idx % 2 == 1 ? "true" : "false";
+		even = idx % 2 == 0 ? "true" : "false";
+		action = idx == 7 ? "ignore" : "print";
+
+		asprintf(&json, FMT, size, idx, odd, even, action);
+		BUNYAN_FAKE_LOG_DEBUG(json);
+		free(json);
+	}
+
+	BUNYAN_FAKE_LOG_DEBUG("{\"finished\": true}");
+
+	return (0);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.d
new file mode 100644
index 000000000000..f0fbdd5cabab
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.d
@@ -0,0 +1,65 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2012, Joyent, Inc.  All rights reserved.
+ */
+
+#pragma D option strsize=4k
+#pragma D option quiet
+#pragma D option destructive
+
+/*
+ * This test reads a JSON string from a USDT probe, roughly simulating the
+ * primary motivating use case for the json() subroutine: filtering
+ * JSON-formatted log messages from a logging subsystem like node-bunyan.
+ */
+
+pid$1:a.out:waiting:entry
+{
+	this->value = (int *)alloca(sizeof (int));
+	*this->value = 1;
+	copyout(this->value, arg0, sizeof (int));
+}
+
+bunyan*$1:::log-*
+{
+	this->j = copyinstr(arg0);
+}
+
+bunyan*$1:::log-*
+/json(this->j, "finished") == NULL && json(this->j, "action") != "ignore"/
+{
+	this->index = strtoll(json(this->j, "index"));
+	this->size = json(this->j, "sizes[2]");
+	this->odd = json(this->j, "facts.odd");
+	this->even = json(this->j, "facts.even");
+	printf("[%d] sz %s odd %s even %s\n", this->index, this->size,
+	    this->odd, this->even);
+}
+
+bunyan*$1:::log-*
+/json(this->j, "finished") != NULL/
+{
+	printf("FINISHED!\n");
+	exit(0);
+}
+
+tick-10s
+{
+	printf("ERROR: Timed out before finish message!\n");
+	exit(1);
+}
+
+ERROR
+{
+	exit(1);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.d.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.d.out
new file mode 100644
index 000000000000..c7f58bb535dd
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.d.out
@@ -0,0 +1,11 @@
+[0] sz 445.890000 odd false even true
+[1] sz 793.684200 odd true even false
+[2] sz 1412.757876 odd false even true
+[3] sz 2514.709019 odd true even false
+[4] sz 4476.182054 odd false even true
+[5] sz 7967.604057 odd true even false
+[6] sz 14182.335221 odd false even true
+[8] sz 44935.310914 odd false even true
+[9] sz 79984.853427 odd true even false
+FINISHED!
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/usdt.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/usdt.d
new file mode 100644
index 000000000000..1a4fc87f60f4
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/usdt.d
@@ -0,0 +1,27 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2012, Joyent, Inc.  All rights reserved.
+ */
+
+/*
+ * Sets up a fake node-bunyan-like USDT provider for use from C.
+ */
+
+provider bunyan_fake {
+	probe log__trace(char *msg);
+	probe log__debug(char *msg);
+	probe log__info(char *msg);
+	probe log__warn(char *msg);
+	probe log__error(char *msg);
+	probe log__fatal(char *msg);
+};
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.fds.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.fds.ksh
new file mode 100644
index 000000000000..a5aa27137efa
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.fds.ksh
@@ -0,0 +1,91 @@
+#
+# 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 (c) 2012, Joyent, Inc. All rights reserved.
+#
+
+tmpin=/tmp/tst.fds.$$.d
+tmpout1=/tmp/tst.fds.$$.out1
+tmpout2=/tmp/tst.fds.$$.out2
+
+cat > $tmpin <<EOF
+#define DUMPFIELD(fd, fmt, field) \
+	errmsg = "could not dump field"; \
+	printf("%d: field =fmt\n", fd, fds[fd].field);
+
+/*
+ * Note that we are explicitly not looking at fi_mount -- it (by design) does
+ * not work if not running with kernel permissions.
+ */
+#define DUMP(fd)	\
+	DUMPFIELD(fd, %s, fi_name); \
+	DUMPFIELD(fd, %s, fi_dirname); \
+	DUMPFIELD(fd, %s, fi_pathname); \
+	DUMPFIELD(fd, %d, fi_offset); \
+	DUMPFIELD(fd, %s, fi_fs); \
+	DUMPFIELD(fd, %o, fi_oflags);
+
+BEGIN
+{
+	DUMP(0);
+	DUMP(1);
+	DUMP(2);
+	DUMP(3);
+	DUMP(4);
+	exit(0);
+}
+
+ERROR
+{
+	printf("error: %s\n", errmsg);
+	exit(1);
+}
+EOF
+
+#
+# First, with all privs
+#
+/usr/sbin/dtrace -q -Cs /dev/stdin < $tmpin > $tmpout2
+mv $tmpout2 $tmpout1
+
+#
+# And now with only dtrace_proc and dtrace_user -- the output should be
+# identical.
+#
+ppriv -s A=basic,dtrace_proc,dtrace_user $$
+
+/usr/sbin/dtrace -q -Cs /dev/stdin < $tmpin > $tmpout2
+
+echo ">>> $tmpout1"
+cat $tmpout1
+
+echo ">>> $tmpout2"
+cat $tmpout2
+
+rval=0
+
+if ! cmp $tmpout1 $tmpout2 ; then
+	rval=1
+fi
+
+rm $tmpout1 $tmpout2 $tmpin
+exit $rval
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh
index ae4934cdeb34..da9bb4c6c6b3 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh
@@ -22,8 +22,8 @@
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright (c) 2012, Joyent, Inc. All rights reserved.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 ppriv -s A=basic,dtrace_proc,dtrace_user $$
 
@@ -31,7 +31,7 @@ ppriv -s A=basic,dtrace_proc,dtrace_user $$
 
 BEGIN {
 	errorcount = 0;
-	expected_errorcount = 23;
+	expected_errorcount = 27;
 }
 
 BEGIN { trace(mutex_owned(&`pidlock)); }
@@ -55,6 +55,8 @@ BEGIN { trace(strtok(`initname, "/")); }
 BEGIN { trace(strtok(NULL, "/")); }
 BEGIN { trace(strtok("foo/bar", `initname)); }
 BEGIN { trace(strtok(NULL, `initname)); }
+BEGIN { trace(strtoll(`initname)); }
+BEGIN { trace(strtoll(`initname, 10)); }
 BEGIN { trace(substr(`initname, 2, 3)); }
 
 BEGIN { trace(ddi_pathname(`top_devinfo, 1)); }
@@ -63,6 +65,9 @@ BEGIN { trace(strjoin("foo", `initname)); }
 BEGIN { trace(dirname(`initname)); }
 BEGIN { trace(cleanpath(`initname)); }
 
+BEGIN { j = "{\"/sbin/init\":\"uh oh\"}"; trace(json(j, `initname)); }
+BEGIN { trace(json(`initname, "x")); }
+
 ERROR {
 	errorcount++;
 }
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.getf.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.getf.ksh
new file mode 100644
index 000000000000..7dbb83fba94a
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.getf.ksh
@@ -0,0 +1,98 @@
+#
+# 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 (c) 2012, Joyent, Inc. All rights reserved.
+#
+
+ppriv -s A=basic,dtrace_proc,dtrace_user $$
+
+/usr/sbin/dtrace -q -Cs /dev/stdin <<EOF
+
+#define CANREAD(field) \
+	BEGIN { this->fp = getf(0); errmsg = "can't read field"; \
+	    printf("field: "); trace(this->fp->field); printf("\n"); }
+
+#define CANTREAD(field) \
+	BEGIN { errmsg = ""; this->fp = getf(0); trace(this->fp->field); \
+	    printf("\nable to successfully read field!"); exit(1); }
+
+CANREAD(f_flag)
+CANREAD(f_flag2)
+CANREAD(f_vnode)
+CANREAD(f_offset)
+CANREAD(f_cred)
+CANREAD(f_audit_data)
+CANREAD(f_count)
+
+/*
+ * We can potentially read parts of our cred, but we can't dereference
+ * through cr_zone.
+ */
+CANTREAD(f_cred->cr_zone->zone_id)
+
+CANREAD(f_vnode->v_path)
+CANREAD(f_vnode->v_op)
+CANREAD(f_vnode->v_op->vnop_name)
+
+CANTREAD(f_vnode->v_flag)
+CANTREAD(f_vnode->v_count)
+CANTREAD(f_vnode->v_pages)
+CANTREAD(f_vnode->v_type)
+CANTREAD(f_vnode->v_vfsmountedhere)
+CANTREAD(f_vnode->v_op->vop_open)
+
+BEGIN
+{
+	errmsg = "";
+	this->fp = getf(0);
+	this->fp2 = getf(1);
+
+	trace(this->fp->f_vnode);
+	printf("\nable to successfully read this->fp!");
+	exit(1);
+}
+
+BEGIN
+{
+	errmsg = "";
+	this->fp = getf(0);
+}
+
+BEGIN
+{
+	trace(this->fp->f_vnode);
+	printf("\nable to successfully read this->fp from prior clause!");
+}
+
+BEGIN
+{
+	exit(0);
+}
+
+ERROR
+/errmsg != ""/
+{
+	printf("fatal error: %s", errmsg);
+	exit(1);
+}
+	
+EOF
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.procpriv.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.procpriv.ksh
new file mode 100644
index 000000000000..7022566391f4
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.procpriv.ksh
@@ -0,0 +1,138 @@
+#
+# 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 (c) 2012, Joyent, Inc. All rights reserved.
+#
+
+ppriv -s A=basic,dtrace_proc,dtrace_user $$
+
+#
+# When we have dtrace_proc (but lack dtrace_kernel), we expect to be able to
+# read certain curpsinfo/curlwpsinfo/curcpu fields even though they require
+# reading in-kernel state.  However, there are other fields in these translated
+# structures that we know we shouldn't be able to read, as they require reading
+# in-kernel state that we cannot read with only dtrace_proc.  Finally, there
+# are a few fields that we may or may not be able to read depending on the
+# specifics of context.  This test therefore asserts that we can read what we
+# think we should be able to, that we can't read what we think we shouldn't be
+# able to, and (for purposes of completeness) that we are indifferent about
+# what we cannot assert one way or the other.
+#
+/usr/sbin/dtrace -q -Cs /dev/stdin <<EOF
+
+#define CANREAD(what, field) \
+    BEGIN { errmsg = "can't read field from what"; printf("field: "); \
+	trace(what->field); printf("\n"); }
+
+#define CANTREAD(what, field) \
+    BEGIN { errmsg = ""; trace(what->field); \
+	printf("\nable to successfully read field from what!"); exit(1); }
+
+#define MIGHTREAD(what, field) \
+    BEGIN { errmsg = ""; printf("field: "); trace(what->field); printf("\n"); }
+
+#define CANREADVAR(vname) \
+    BEGIN { errmsg = "can't read vname"; printf("vname: "); \
+	trace(vname); printf("\n"); }
+
+#define CANTREADVAR(vname) \
+    BEGIN { errmsg = ""; trace(vname); \
+	printf("\nable to successfully read vname!"); exit(1); }
+
+#define MIGHTREADVAR(vname) \
+    BEGIN { errmsg = ""; printf("vname: "); trace(vname); printf("\n"); }
+
+CANREAD(curpsinfo, pr_pid)
+CANREAD(curpsinfo, pr_nlwp)
+CANREAD(curpsinfo, pr_ppid)
+CANREAD(curpsinfo, pr_uid)
+CANREAD(curpsinfo, pr_euid)
+CANREAD(curpsinfo, pr_gid)
+CANREAD(curpsinfo, pr_egid)
+CANREAD(curpsinfo, pr_addr)
+CANREAD(curpsinfo, pr_start)
+CANREAD(curpsinfo, pr_fname)
+CANREAD(curpsinfo, pr_psargs)
+CANREAD(curpsinfo, pr_argc)
+CANREAD(curpsinfo, pr_argv)
+CANREAD(curpsinfo, pr_envp)
+CANREAD(curpsinfo, pr_dmodel)
+
+/*
+ * If our p_pgidp points to the same pid structure as our p_pidp, we will
+ * be able to read pr_pgid -- but we won't if not.
+ */
+MIGHTREAD(curpsinfo, pr_pgid)
+
+CANTREAD(curpsinfo, pr_sid)
+CANTREAD(curpsinfo, pr_ttydev)
+CANTREAD(curpsinfo, pr_projid)
+CANTREAD(curpsinfo, pr_zoneid)
+CANTREAD(curpsinfo, pr_contract)
+
+CANREAD(curlwpsinfo, pr_flag)
+CANREAD(curlwpsinfo, pr_lwpid)
+CANREAD(curlwpsinfo, pr_addr)
+CANREAD(curlwpsinfo, pr_wchan)
+CANREAD(curlwpsinfo, pr_stype)
+CANREAD(curlwpsinfo, pr_state)
+CANREAD(curlwpsinfo, pr_sname)
+CANREAD(curlwpsinfo, pr_syscall)
+CANREAD(curlwpsinfo, pr_pri)
+CANREAD(curlwpsinfo, pr_onpro)
+CANREAD(curlwpsinfo, pr_bindpro)
+CANREAD(curlwpsinfo, pr_bindpset)
+
+CANTREAD(curlwpsinfo, pr_clname)
+CANTREAD(curlwpsinfo, pr_lgrp)
+
+CANREAD(curcpu, cpu_id)
+
+CANTREAD(curcpu, cpu_pset)
+CANTREAD(curcpu, cpu_chip)
+CANTREAD(curcpu, cpu_lgrp)
+CANTREAD(curcpu, cpu_info)
+
+/*
+ * We cannot assert one thing or another about the variable "root":  for those
+ * with only dtrace_proc, it will be readable in the global but not readable in
+ * the non-global.
+ */
+MIGHTREADVAR(root)
+
+CANREADVAR(cpu)
+CANTREADVAR(pset)
+CANTREADVAR(cwd)
+CANTREADVAR(chip)
+CANTREADVAR(lgrp)
+
+BEGIN
+{
+	exit(0);
+}
+
+ERROR
+/errmsg != ""/
+{
+	printf("fatal error: %s", errmsg);
+	exit(1);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.providers.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.providers.ksh
new file mode 100644
index 000000000000..94c3722f78b7
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.providers.ksh
@@ -0,0 +1,126 @@
+#
+# 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 (c) 2012, Joyent, Inc. All rights reserved.
+#
+
+#
+# First, make sure that we can successfully enable the io provider
+#
+if ! dtrace -P io -n BEGIN'{exit(0)}' > /dev/null 2>&1 ; then
+	echo failed to enable io provider with full privs
+	exit 1
+fi
+
+ppriv -s A=basic,dtrace_proc,dtrace_user $$
+
+#
+# Now make sure that we cannot enable the io provider with reduced privs
+#
+if ! dtrace -x errtags -P io -n BEGIN'{exit(1)}' 2>&1 | \
+    grep D_PDESC_ZERO > /dev/null 2>&1 ; then
+	echo successfully enabled the io provider with reduced privs
+	exit 1
+fi
+
+#
+# Keeping our reduced privs, we want to assure that we can see every provider
+# that we think we should be able to see -- and that we can see curpsinfo
+# state but can't otherwise see arguments.
+#
+/usr/sbin/dtrace -wq -Cs /dev/stdin <<EOF
+
+int seen[string];
+int err;
+
+#define CANENABLE(provider) \
+provider:::								\
+/err == 0 && progenyof(\$pid) && !seen["provider"]/			\
+{									\
+	trace(arg0);							\
+	printf("\nsuccessful trace of arg0 in %s:%s:%s:%s\n",		\
+	    probeprov, probemod, probefunc, probename);			\
+	exit(++err);							\
+}									\
+									\
+provider:::								\
+/progenyof(\$pid)/							\
+{									\
+	seen["provider"]++;						\
+}									\
+									\
+provider:::								\
+/progenyof(\$pid)/							\
+{									\
+	errstr = "provider";						\
+	this->ignore = stringof(curpsinfo->pr_psargs);			\
+	errstr = "";							\
+}									\
+									\
+END									\
+/err == 0 && !seen["provider"]/						\
+{									\
+	printf("no probes from provider\n");				\
+	exit(++err);							\
+}									\
+									\
+END									\
+/err == 0/								\
+{									\
+	printf("saw %d probes from provider\n", seen["provider"]);	\
+}
+
+CANENABLE(proc)
+CANENABLE(sched)
+CANENABLE(vminfo)
+CANENABLE(sysinfo)
+
+BEGIN
+{
+	/*
+	 * We'll kick off a system of a do-nothing command -- which should be
+	 * enough to kick proc, sched, vminfo and sysinfo probes.
+	 */
+	system("echo > /dev/null");
+}
+
+ERROR
+/err == 0 && errstr != ""/
+{
+	printf("fatal error: couldn't read curpsinfo->pr_psargs in ");
+	printf("%s-provided probe\n", errstr);
+	exit(++err);
+}
+
+proc:::exit
+/progenyof(\$pid)/
+{
+	exit(0);
+}
+
+tick-10ms
+/i++ > 500/
+{
+	printf("exit probe did not seem to fire\n");
+	exit(++err);
+}
+EOF
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/strtoll/err.BaseTooLarge.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/strtoll/err.BaseTooLarge.d
new file mode 100644
index 000000000000..4d6b5af75b55
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/strtoll/err.BaseTooLarge.d
@@ -0,0 +1,35 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ */
+
+/*
+ * ASSERTION:
+ *   The largest base we will accept is Base 36 -- i.e. using all of 0-9 and
+ *   A-Z as numerals.
+ *
+ * SECTION: Actions and Subroutines/strtoll()
+ */
+
+#pragma D option quiet
+
+BEGIN
+{
+	printf("%d\n", strtoll("0", 37));
+	exit(0);
+}
+
+ERROR
+{
+	exit(1);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/strtoll/err.BaseTooSmall.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/strtoll/err.BaseTooSmall.d
new file mode 100644
index 000000000000..de56b50e9eda
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/strtoll/err.BaseTooSmall.d
@@ -0,0 +1,34 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ */
+
+/*
+ * ASSERTION:
+ *   The smallest base we will accept is Base 2.
+ *
+ * SECTION: Actions and Subroutines/strtoll()
+ */
+
+#pragma D option quiet
+
+BEGIN
+{
+	printf("%d\n", strtoll("0", 1));
+	exit(0);
+}
+
+ERROR
+{
+	exit(1);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/strtoll/tst.strtoll.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/strtoll/tst.strtoll.d
new file mode 100644
index 000000000000..0b1812a53ce0
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/strtoll/tst.strtoll.d
@@ -0,0 +1,66 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ */
+
+/*
+ * ASSERTION:
+ *   Test the strtoll() subroutine.
+ *
+ * SECTION: Actions and Subroutines/strtoll()
+ */
+
+#pragma D option quiet
+
+BEGIN
+{
+
+	/* minimum base (2) and maximum base (36): */
+	printf("%d\n", strtoll("0", 2));
+	printf("%d\n", strtoll("1", 36));
+
+	/* simple tests: */
+	printf("%d\n", strtoll("0x20", 16));
+	printf("%d\n", strtoll("-32", 10));
+	printf("%d\n", strtoll("010", 8));
+	printf("%d\n", strtoll("101010", 2));
+
+	/* INT64_MIN and INT64_MAX: */
+	printf("%d\n", strtoll("9223372036854775807"));
+	printf("%d\n", strtoll("-9223372036854775808"));
+	printf("%d\n", strtoll("0777777777777777777777", 8));
+	printf("%d\n", strtoll("-01000000000000000000000", 8));
+
+	/* wrapping: */
+	printf("%d\n", strtoll("1000000000000000000000", 8));
+	printf("%d\n", strtoll("-1000000000000000000001", 8));
+
+	/* hex without prefix: */
+	printf("%d\n", strtoll("baddcafe", 16));
+
+	/* stopping at first out-of-base character: */
+	printf("%d\n", strtoll("12j", 10));
+	printf("%d\n", strtoll("102", 2));
+
+	/* base 36: */
+	printf("%d\n", strtoll("-0DTrace4EverZ", 36));
+
+	/* base 10 is assumed: */
+	printf("%d\n", strtoll("1985"));
+	printf("%d\n", strtoll("-2012"));
+
+	/* empty string: */
+	printf("%d\n", strtoll(""));
+
+	exit(0);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/strtoll/tst.strtoll.d.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/strtoll/tst.strtoll.d.out
new file mode 100644
index 000000000000..d12eb9c1973b
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/strtoll/tst.strtoll.d.out
@@ -0,0 +1,20 @@
+0
+1
+32
+-32
+8
+42
+9223372036854775807
+-9223372036854775808
+9223372036854775807
+-9223372036854775808
+-9223372036854775808
+9223372036854775807
+3135097598
+12
+2
+-1819882045752187535
+1985
+-2012
+0
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidpid.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidpid.d
new file mode 100644
index 000000000000..4865d81ee1e9
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidpid.d
@@ -0,0 +1,21 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2013 Joyent, Inc.  All rights reserved.
+ */
+
+#pragma D option quiet
+
+BEGIN
+{
+	trace((pidfoo`int)0);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidpid2.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidpid2.d
new file mode 100644
index 000000000000..bafed1217279
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidpid2.d
@@ -0,0 +1,21 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2013 Joyent, Inc.  All rights reserved.
+ */
+
+#pragma D option quiet
+
+BEGIN
+{
+	trace((pid8foo`int)0);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidpid3.d b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidpid3.d
new file mode 100644
index 000000000000..fb9443a828ea
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidpid3.d
@@ -0,0 +1,21 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright (c) 2013 Joyent, Inc.  All rights reserved.
+ */
+
+#pragma D option quiet
+
+BEGIN
+{
+	trace((pid0`int)0);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh
new file mode 100644
index 000000000000..978cde3cf0ef
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype.ksh
@@ -0,0 +1,34 @@
+#! /usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc. All rights reserved.
+#
+
+#
+# While it's hard to be completely certain that a type of the name we want
+# doesn't exist, we're going to try to pick a name which is rather unique.
+#
+
+if [ $# != 1 ]; then
+        echo expected one argument: '<'dtrace-path'>'
+        exit 2
+fi
+
+dtrace=$1
+t="season_8_mountain_of_madness_t"
+pid=$$
+
+rc=`$dtrace -n "BEGIN{ trace(pid$pid`$t)0); }"`
+
+exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh
new file mode 100644
index 000000000000..e64ed526ed37
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.invalidtype2.ksh
@@ -0,0 +1,35 @@
+#! /usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc. All rights reserved.
+#
+
+#
+# While it's hard to be completely certain that a type of the name we want
+# doesn't exist, we're going to try to pick a name which is rather
+# unique. This time we're also going to use the pid$target alias.
+#
+
+if [ $# != 1 ]; then
+        echo expected one argument: '<'dtrace-path'>'
+        exit 2
+fi
+
+dtrace=$1
+t="season_8_mountain_of_madness_t"
+pid=$$
+
+rc=`$dtrace -n "BEGIN{ trace(pid`$t)0); }"` -p $pid
+
+exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh
new file mode 100644
index 000000000000..d987c8da7a47
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/err.user64mode.ksh
@@ -0,0 +1,90 @@
+#! /usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc. All rights reserved.
+#
+
+#
+# This test is purposefully using a 64-bit DTrace and thus 64-bit types
+# when compared with a 32-bit process. This test uses the userland
+# keyword and so the implicit copyin should access illegal memory and
+# thus exit.
+#
+
+if [ $# != 1 ]; then
+        echo expected one argument: '<'dtrace-path'>'
+        exit 2
+fi
+
+dtrace=$1
+t="zelda_info_t"
+exe="tst.chasestrings.exe"
+
+elfdump "./$exe" | grep -q '.SUNW_ctf' 
+if [[ $? -ne 0 ]]; then
+	echo "CTF does not exist in $exe, that's a bug" >&2
+	exit 1
+fi
+
+./$exe &
+pid=$!
+
+$dtrace -64 -qs /dev/stdin <<EOF
+typedef struct info {
+        char    *zi_gamename;
+        int     zi_ndungeons;
+        char    *zi_villain;
+        int     zi_haszelda;
+} info_t;
+
+pid$pid::has_princess:entry
+/next == 0/
+{
+	this->t = (userland info_t *)arg0;
+	printf("game: %s, dungeon: %d, villain: %s, zelda: %d\n",
+	    stringof(this->t->zi_gamename), this->t->zi_ndungeons,
+	    stringof(this->t->zi_villain), this->t->zi_haszelda);
+	next = 1;
+}
+
+pid$pid::has_dungeons:entry
+/next == 1/
+{
+	this->t = (userland info_t *)arg0;
+	printf("game: %s, dungeon: %d, villain: %s, zelda: %d\n",
+	    stringof(this->t->zi_gamename), this->t->zi_ndungeons,
+	    stringof(this->t->zi_villain), this->t->zi_haszelda);
+	next = 2;
+}
+
+pid$pid::has_villain:entry
+/next == 2/
+{
+	this->t = (userland info_t *)arg0;
+	printf("game: %s, dungeon: %d, villain: %s, zelda: %d\n",
+	    stringof(this->t->zi_gamename), this->t->zi_ndungeons,
+	    stringof(this->t->zi_villain), this->t->zi_haszelda);
+	exit(0);
+}
+
+ERROR
+{
+	exit(1);
+}
+EOF
+rc=$?
+
+kill -9 $pid
+
+exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.c
new file mode 100644
index 000000000000..a4d25f8ca872
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.c
@@ -0,0 +1,46 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2013 (c) Joyent, Inc. All rights reserved.
+ */
+
+/*
+ * This test tries to make sure that we have CTF data for a type that only this
+ * binary would reasonably have. In this case, the
+ * season_7_lisa_the_vegetarian_t.
+ */
+#include <unistd.h>
+
+typedef struct season_7_lisa_the_vegetarian {
+	int fr_salad;
+} season_7_lisa_the_vegetarian_t;
+
+int
+sleeper(season_7_lisa_the_vegetarian_t *lp)
+{
+	for (;;) {
+		sleep(lp->fr_salad);
+	}
+	/*NOTREACHED*/
+	return (0);
+}
+
+int
+main(void)
+{
+	season_7_lisa_the_vegetarian_t l;
+	l.fr_salad = 100;
+
+	sleeper(&l);
+
+	return (0);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh
new file mode 100644
index 000000000000..151a93676d6d
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.aouttype.ksh
@@ -0,0 +1,44 @@
+#! /usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc. All rights reserved.
+#
+
+#
+# Lookup a type that is inside a.out.
+#
+
+if [ $# != 1 ]; then
+        echo expected one argument: '<'dtrace-path'>'
+        exit 2
+fi
+
+dtrace=$1
+t="season_7_lisa_the_vegetrian_t *"
+exe="tst.aouttype.exe"
+
+elfdump "./$exe" | grep -q '.SUNW_ctf' 
+if [[ $? -ne 0 ]]; then
+	echo "CTF does not exist in $exe, that's a bug" >&2
+	exit 1
+fi
+
+./$exe &
+pid=$!
+
+rc=`$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"`
+
+kill -9 $pid
+
+exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.c
new file mode 100644
index 000000000000..595a7cb6c575
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.c
@@ -0,0 +1,79 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2013 (c) Joyent, Inc. All rights reserved.
+ */
+
+/*
+ * This test takes data from the current binary which is basically running in a
+ * loop between two functions and our goal is to have two unique types that they
+ * contain which we can print.
+ */
+
+#include <unistd.h>
+
+typedef struct zelda_info {
+	char	*zi_gamename;
+	int	zi_ndungeons;
+	char	*zi_villain;
+	int	zi_haszelda;
+} zelda_info_t;
+
+static int
+has_princess(zelda_info_t *z)
+{
+	return (z->zi_haszelda);
+}
+
+static int
+has_dungeons(zelda_info_t *z)
+{
+	return (z->zi_ndungeons != 0);
+}
+
+static const char *
+has_villain(zelda_info_t *z)
+{
+	return (z->zi_villain);
+}
+
+int
+main(void)
+{
+	zelda_info_t oot;
+	zelda_info_t la;
+	zelda_info_t lttp;
+
+	oot.zi_gamename = "Ocarina of Time";
+	oot.zi_ndungeons = 10;
+	oot.zi_villain = "Ganondorf";
+	oot.zi_haszelda = 1;
+
+	la.zi_gamename = "Link's Awakening";
+	la.zi_ndungeons = 9;
+	la.zi_villain = "Nightmare";
+	la.zi_haszelda = 0;
+
+	lttp.zi_gamename = "A Link to the Past";
+	lttp.zi_ndungeons = 12;
+	lttp.zi_villain = "Ganon";
+	lttp.zi_haszelda = 1;
+
+	for (;;) {
+		(void) has_princess(&oot);
+		(void) has_dungeons(&la);
+		(void) has_villain(&lttp);
+		sleep(1);
+	}
+
+	return (0);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh
new file mode 100644
index 000000000000..25028460db43
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh
@@ -0,0 +1,76 @@
+#! /usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc. All rights reserved.
+#
+
+#
+# This test is checking that we can read members and that pointers inside
+# members point to valid data that is intelligible, eg. strings.
+#
+
+if [ $# != 1 ]; then
+        echo expected one argument: '<'dtrace-path'>'
+        exit 2
+fi
+
+dtrace=$1
+t="zelda_info_t"
+exe="tst.chasestrings.exe"
+
+elfdump "./$exe" | grep -q '.SUNW_ctf' 
+if [[ $? -ne 0 ]]; then
+	echo "CTF does not exist in $exe, that's a bug" >&2
+	exit 1
+fi
+
+./$exe &
+pid=$!
+
+$dtrace -qs /dev/stdin <<EOF
+pid$pid::has_princess:entry
+/next == 0/
+{
+	this->t = (pid$pid\`$t *)(copyin(arg0, sizeof (pid$pid\`$t)));
+	printf("game: %s, dungeon: %d, villain: %s, zelda: %d\n",
+	    copyinstr((uintptr_t)this->t->zi_gamename), this->t->zi_ndungeons,
+	    copyinstr((uintptr_t)this->t->zi_villain), this->t->zi_haszelda);
+	next = 1;
+}
+
+pid$pid::has_dungeons:entry
+/next == 1/
+{
+	this->t = (pid$pid\`$t *)(copyin(arg0, sizeof (pid$pid\`$t)));
+	printf("game: %s, dungeon: %d, villain: %s, zelda: %d\n",
+	    copyinstr((uintptr_t)this->t->zi_gamename), this->t->zi_ndungeons,
+	    copyinstr((uintptr_t)this->t->zi_villain), this->t->zi_haszelda);
+	next = 2;
+}
+
+pid$pid::has_villain:entry
+/next == 2/
+{
+	this->t = (pid$pid\`$t *)(copyin(arg0, sizeof (pid$pid\`$t)));
+	printf("game: %s, dungeon: %d, villain: %s, zelda: %d\n",
+	    copyinstr((uintptr_t)this->t->zi_gamename), this->t->zi_ndungeons,
+	    copyinstr((uintptr_t)this->t->zi_villain), this->t->zi_haszelda);
+	exit(0);
+}
+EOF
+rc=$?
+
+kill -9 $pid
+
+exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh.out
new file mode 100644
index 000000000000..219e406e61d6
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.chasestrings.ksh.out
@@ -0,0 +1,4 @@
+game: Ocarina of Time, dungeon: 10, villain: Ganondorf, zelda: 1
+game: Link's Awakening, dungeon: 9, villain: Nightmare, zelda: 0
+game: A Link to the Past, dungeon: 12, villain: Ganon, zelda: 1
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.c
new file mode 100644
index 000000000000..916a5b51b949
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.c
@@ -0,0 +1,29 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2013 (c) Joyent, Inc. All rights reserved.
+ */
+
+/*
+ * We're linked against libc which has types, though we do not.
+ */
+#include <unistd.h>
+
+int
+main(void)
+{
+	for (;;) {
+		sleep(1000);
+	}
+	/*NOTREACHED*/
+	return (0);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh
new file mode 100644
index 000000000000..af7c6c8fe13a
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.libtype.ksh
@@ -0,0 +1,45 @@
+#! /usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc. All rights reserved.
+#
+
+#
+# Here we want to make sure that the program in question does not have ctf data
+# in its a.out; however, we can get types out of a linked libc.
+#
+
+if [ $# != 1 ]; then
+        echo expected one argument: '<'dtrace-path'>'
+        exit 2
+fi
+
+dtrace=$1
+t="int"
+exe="tst.libtype.exe"
+
+elfdump "./$exe" | grep -q '.SUNW_ctf' 
+if [[ $? -eq 0 ]]; then
+	echo "CTF exists in $exe, that's a bug" >&2
+	exit 1
+fi
+
+./$exe &
+pid=$!
+
+rc=`$dtrace -n "BEGIN{ trace((pid$pid\`$t)0); exit(0); }"`
+
+kill -9 $pid
+
+exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.linkmap.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.linkmap.ksh
new file mode 100644
index 000000000000..f767def53de8
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.linkmap.ksh
@@ -0,0 +1,44 @@
+#! /usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc. All rights reserved.
+#
+
+#
+# We should be able to see both strstr from libc and from ld on an
+# alternate linkmap.
+#
+
+if [ $# != 1 ]; then
+        echo expected one argument: '<'dtrace-path'>'
+        exit 2
+fi
+
+dtrace=$1
+
+$dtrace -q -p $$ -s /dev/stdin  <<EOF
+pid\$target:LM1\`ld.so.1:strstr:entry,
+pid\$target:libc.so.1:strstr:entry
+{
+	exit (0);
+}
+
+BEGIN
+{
+	exit (0);
+}
+EOF
+rc=$?
+
+exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh
new file mode 100644
index 000000000000..febb0159185a
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprint.ksh
@@ -0,0 +1,69 @@
+#! /usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc. All rights reserved.
+#
+
+#
+# Use print() on userland CTF types and verify we get the data we expect.
+#
+
+if [ $# != 1 ]; then
+        echo expected one argument: '<'dtrace-path'>'
+        exit 2
+fi
+
+dtrace=$1
+t="final_fantasy_info_t"
+exe="tst.printtype.exe"
+
+elfdump "./$exe" | grep -q '.SUNW_ctf' 
+if [[ $? -ne 0 ]]; then
+	echo "CTF does not exist in $exe, that's a bug" >&2
+	exit 1
+fi
+
+./$exe &
+pid=$!
+
+$dtrace -qs /dev/stdin <<EOF
+pid$pid::ff_getgameid:entry
+/next == 0/
+{
+	print(*args[0]);
+	printf("\n");
+	next = 1;
+}
+
+pid$pid::ff_getpartysize:entry
+/next == 1/
+{
+	print(*args[0]);
+	printf("\n");
+	next = 2;
+}
+
+pid$pid::ff_getsummons:entry
+/next == 2/
+{
+	print(*args[0]);
+	printf("\n");
+	exit(0);
+}
+EOF
+rc=$?
+
+kill -9 $pid
+
+exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh
new file mode 100644
index 000000000000..7398dc41d9da
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.pidprinttarg.ksh
@@ -0,0 +1,70 @@
+#! /usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc. All rights reserved.
+#
+
+#
+# Use print() on userland CTF types and verify we get the data we
+# expect. This time, use $target to make sure that path works correctly.
+#
+
+if [ $# != 1 ]; then
+        echo expected one argument: '<'dtrace-path'>'
+        exit 2
+fi
+
+dtrace=$1
+t="final_fantasy_info_t"
+exe="tst.printtype.exe"
+
+elfdump "./$exe" | grep -q '.SUNW_ctf' 
+if [[ $? -ne 0 ]]; then
+	echo "CTF does not exist in $exe, that's a bug" >&2
+	exit 1
+fi
+
+./$exe &
+pid=$!
+
+$dtrace -p $pid -qs /dev/stdin <<EOF
+pid\$target::ff_getgameid:entry
+/next == 0/
+{
+	print(*args[0]);
+	printf("\n");
+	next = 1;
+}
+
+pid\$target::ff_getpartysize:entry
+/next == 1/
+{
+	print(*args[0]);
+	printf("\n");
+	next = 2;
+}
+
+pid\$target::ff_getsummons:entry
+/next == 2/
+{
+	print(*args[0]);
+	printf("\n");
+	exit(0);
+}
+EOF
+rc=$?
+
+kill -9 $pid
+
+exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.c b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.c
new file mode 100644
index 000000000000..6c27593e972b
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.c
@@ -0,0 +1,72 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2013 (c) Joyent, Inc. All rights reserved.
+ */
+
+/*
+ * The point of this is to use print() on various functions to make sure that we
+ * can print basic structures. Note that we purposefully are making sure that
+ * there are no pointers here.
+ */
+#include <unistd.h>
+
+typedef struct final_fantasy_info {
+	int ff_gameid;
+	int ff_partysize;
+	int ff_hassummons;
+} final_fantasy_info_t;
+
+static int
+ff_getgameid(final_fantasy_info_t *f)
+{
+	return (0);
+}
+
+static int
+ff_getpartysize(final_fantasy_info_t *f)
+{
+	return (0);
+}
+
+static int
+ff_getsummons(final_fantasy_info_t *f)
+{
+	return (0);
+}
+
+int
+main(void)
+{
+	final_fantasy_info_t ffiii, ffx, ffi;
+
+	ffi.ff_gameid = 1;
+	ffi.ff_partysize = 4;
+	ffi.ff_hassummons = 0;
+
+	ffiii.ff_gameid = 6;
+	ffiii.ff_partysize = 4;
+	ffiii.ff_hassummons = 1;
+
+	ffx.ff_gameid = 10;
+	ffx.ff_partysize = 3;
+	ffx.ff_hassummons = 1;
+
+	for (;;) {
+		ff_getgameid(&ffi);
+		ff_getpartysize(&ffx);
+		ff_getsummons(&ffiii);
+		sleep(1);
+	}
+	/*NOTREACHED*/
+	return (0);
+}
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh
new file mode 100644
index 000000000000..dfc15358290d
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh
@@ -0,0 +1,69 @@
+#! /usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc. All rights reserved.
+#
+
+#
+# Use print() on userland CTF types and verify we get the data we expect.
+#
+
+if [ $# != 1 ]; then
+        echo expected one argument: '<'dtrace-path'>'
+        exit 2
+fi
+
+dtrace=$1
+t="final_fantasy_info_t"
+exe="tst.printtype.exe"
+
+elfdump "./$exe" | grep -q '.SUNW_ctf' 
+if [[ $? -ne 0 ]]; then
+	echo "CTF does not exist in $exe, that's a bug" >&2
+	exit 1
+fi
+
+./$exe &
+pid=$!
+
+$dtrace -qs /dev/stdin <<EOF
+pid$pid::ff_getgameid:entry
+/next == 0/
+{
+	print(*(pid$pid\`$t *)(copyin(arg0, sizeof (pid$pid\`$t))));
+	printf("\n");
+	next = 1;
+}
+
+pid$pid::ff_getpartysize:entry
+/next == 1/
+{
+	print(*(pid$pid\`$t *)(copyin(arg0, sizeof (pid$pid\`$t))));
+	printf("\n");
+	next = 2;
+}
+
+pid$pid::ff_getsummons:entry
+/next == 2/
+{
+	print(*(pid$pid\`$t *)(copyin(arg0, sizeof (pid$pid\`$t))));
+	printf("\n");
+	exit(0);
+}
+EOF
+rc=$?
+
+kill -9 $pid
+
+exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh.out
new file mode 100644
index 000000000000..1770ba23548f
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtype.ksh.out
@@ -0,0 +1,16 @@
+final_fantasy_info_t {
+    int ff_gameid = 0x1
+    int ff_partysize = 0x4
+    int ff_hassummons = 0
+}
+final_fantasy_info_t {
+    int ff_gameid = 0xa
+    int ff_partysize = 0x3
+    int ff_hassummons = 0x1
+}
+final_fantasy_info_t {
+    int ff_gameid = 0x6
+    int ff_partysize = 0x4
+    int ff_hassummons = 0x1
+}
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh
new file mode 100644
index 000000000000..025d4a8c02df
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.printtypetarg.ksh
@@ -0,0 +1,70 @@
+#! /usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc. All rights reserved.
+#
+
+#
+# Use print() on userland CTF types and verify we get the data we
+# expect. Use the pid` alias for $target.
+#
+
+if [ $# != 1 ]; then
+        echo expected one argument: '<'dtrace-path'>'
+        exit 2
+fi
+
+dtrace=$1
+t="final_fantasy_info_t"
+exe="tst.printtype.exe"
+
+elfdump "./$exe" | grep -q '.SUNW_ctf' 
+if [[ $? -ne 0 ]]; then
+	echo "CTF does not exist in $exe, that's a bug" >&2
+	exit 1
+fi
+
+./$exe &
+pid=$!
+
+$dtrace -p $pid -qs /dev/stdin <<EOF
+pid\$target::ff_getgameid:entry
+/next == 0/
+{
+	print(*(pid\`$t *)(copyin(arg0, sizeof (pid\`$t))));
+	printf("\n");
+	next = 1;
+}
+
+pid\$target::ff_getpartysize:entry
+/next == 1/
+{
+	print(*(pid\`$t *)(copyin(arg0, sizeof (pid\`$t))));
+	printf("\n");
+	next = 2;
+}
+
+pid\$target::ff_getsummons:entry
+/next == 2/
+{
+	print(*(pid\`$t *)(copyin(arg0, sizeof (pid\`$t))));
+	printf("\n");
+	exit(0);
+}
+EOF
+rc=$?
+
+kill -9 $pid
+
+exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
new file mode 100644
index 000000000000..58811ff6fb5a
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh
@@ -0,0 +1,83 @@
+#! /usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc. All rights reserved.
+#
+
+#
+# Simple test that if we manually use the userland keyword that it
+# works.
+#
+
+if [ $# != 1 ]; then
+        echo expected one argument: '<'dtrace-path'>'
+        exit 2
+fi
+
+dtrace=$1
+t="zelda_info_t"
+exe="tst.chasestrings.exe"
+
+elfdump "./$exe" | grep -q '.SUNW_ctf' 
+if [[ $? -ne 0 ]]; then
+	echo "CTF does not exist in $exe, that's a bug" >&2
+	exit 1
+fi
+
+./$exe &
+pid=$!
+
+$dtrace -32 -qs /dev/stdin <<EOF
+typedef struct info {
+        char    *zi_gamename;
+        int     zi_ndungeons;
+        char    *zi_villain;
+        int     zi_haszelda;
+} info_t;
+
+pid$pid::has_princess:entry
+/next == 0/
+{
+	this->t = (userland info_t *)arg0;
+	printf("game: %s, dungeon: %d, villain: %s, zelda: %d\n",
+	    stringof(this->t->zi_gamename), this->t->zi_ndungeons,
+	    stringof(this->t->zi_villain), this->t->zi_haszelda);
+	next = 1;
+}
+
+pid$pid::has_dungeons:entry
+/next == 1/
+{
+	this->t = (userland info_t *)arg0;
+	printf("game: %s, dungeon: %d, villain: %s, zelda: %d\n",
+	    stringof(this->t->zi_gamename), this->t->zi_ndungeons,
+	    stringof(this->t->zi_villain), this->t->zi_haszelda);
+	next = 2;
+}
+
+pid$pid::has_villain:entry
+/next == 2/
+{
+	this->t = (userland info_t *)arg0;
+	printf("game: %s, dungeon: %d, villain: %s, zelda: %d\n",
+	    stringof(this->t->zi_gamename), this->t->zi_ndungeons,
+	    stringof(this->t->zi_villain), this->t->zi_haszelda);
+	exit(0);
+}
+EOF
+rc=$?
+
+kill -9 $pid
+
+exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh.out
new file mode 100644
index 000000000000..219e406e61d6
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userlandkey.ksh.out
@@ -0,0 +1,4 @@
+game: Ocarina of Time, dungeon: 10, villain: Ganondorf, zelda: 1
+game: Link's Awakening, dungeon: 9, villain: Nightmare, zelda: 0
+game: A Link to the Past, dungeon: 12, villain: Ganon, zelda: 1
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh
new file mode 100644
index 000000000000..79d79de8aec6
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh
@@ -0,0 +1,72 @@
+#! /usr/bin/ksh
+#
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2013 Joyent, Inc. All rights reserved.
+#
+
+#
+# This test is checking that we can read members and that pointers inside
+# members point to valid data that is intelligible, eg. strings.
+#
+
+if [ $# != 1 ]; then
+        echo expected one argument: '<'dtrace-path'>'
+        exit 2
+fi
+
+dtrace=$1
+exe="tst.chasestrings.exe"
+
+elfdump "./$exe" | grep -q '.SUNW_ctf' 
+if [[ $? -ne 0 ]]; then
+	echo "CTF does not exist in $exe, that's a bug" >&2
+	exit 1
+fi
+
+./$exe &
+pid=$!
+
+$dtrace -qs /dev/stdin <<EOF
+pid$pid::has_princess:entry
+/next == 0/
+{
+	printf("game: %s, dungeon: %d, villain: %s, zelda: %d\n",
+	    stringof(args[0]->zi_gamename), args[0]->zi_ndungeons,
+	    stringof(args[0]->zi_villain), args[0]->zi_haszelda);
+	next = 1;
+}
+
+pid$pid::has_dungeons:entry
+/next == 1/
+{
+	printf("game: %s, dungeon: %d, villain: %s, zelda: %d\n",
+	    stringof(args[0]->zi_gamename), args[0]->zi_ndungeons,
+	    stringof(args[0]->zi_villain), args[0]->zi_haszelda);
+	next = 2;
+}
+
+pid$pid::has_villain:entry
+/next == 2/
+{
+	printf("game: %s, dungeon: %d, villain: %s, zelda: %d\n",
+	    stringof(args[0]->zi_gamename), args[0]->zi_ndungeons,
+	    stringof(args[0]->zi_villain), args[0]->zi_haszelda);
+	exit(0);
+}
+EOF
+rc=$?
+
+kill -9 $pid
+
+exit $rc
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh.out
new file mode 100644
index 000000000000..219e406e61d6
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/uctf/tst.userstrings.ksh.out
@@ -0,0 +1,4 @@
+game: Ocarina of Time, dungeon: 10, villain: Ganondorf, zelda: 1
+game: Link's Awakening, dungeon: 9, villain: Nightmare, zelda: 0
+game: A Link to the Past, dungeon: 12, villain: Ganon, zelda: 1
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
new file mode 100644
index 000000000000..7def9ed2abce
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh
@@ -0,0 +1,106 @@
+#
+# 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 (c) 2013, Joyent, Inc. All rights reserved.
+#
+
+if [ $# != 1 ]; then
+	echo expected one argument: '<'dtrace-path'>'
+	exit 2
+fi
+
+dtrace=$1
+DIR=/var/tmp/dtest.$$
+
+mkdir $DIR
+cd $DIR
+
+echo '#pragma D option quiet' > test.d
+echo '#pragma D option aggsortkey' >> test.d
+
+cat > test.c <<EOF
+#include <unistd.h>
+
+void
+main()
+{
+EOF
+
+objs=
+
+for oogle in doogle bagnoogle; do
+	cat > $oogle.c <<EOF
+#include <sys/sdt.h>
+
+void
+$oogle()
+{
+	DTRACE_PROBE($oogle, knows);
+}
+EOF
+
+	cat > $oogle.d <<EOF
+provider $oogle {
+	probe knows();
+};
+EOF
+
+	cc -c $oogle.c
+
+	if [ $? -ne 0 ]; then
+		print -u2 "failed to compile $oogle.c"
+		exit 1
+	fi
+
+	$dtrace -G -32 -s $oogle.d $oogle.o -o $oogle.d.o
+
+	if [ $? -ne 0 ]; then
+		print -u2 "failed to process $oogle.d"
+		exit 1
+	fi
+
+	objs="$objs $oogle.o $oogle.d.o"
+	echo $oogle'();' >> test.c
+	echo $oogle'$target:::{@[probefunc] = count()}' >> test.d
+done
+
+echo "}" >> test.c
+
+echo 'END{printa("%-10s %@d\\n", @)}' >> test.d
+
+cc -o test test.c $objs
+
+if [ $? -ne 0 ]; then
+	print -u2 "failed to compile test.c"
+	exit 1
+fi
+
+$dtrace -s ./test.d -Zc ./test
+
+if [ $? -ne 0 ]; then
+	print -u2 "failed to execute test"
+	exit 1
+fi
+
+cd /
+/usr/bin/rm -rf $DIR
+exit 0
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh.out b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh.out
new file mode 100644
index 000000000000..966b6f673531
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.multiprov.ksh.out
@@ -0,0 +1,3 @@
+bagnoogle  1
+doogle     1
+
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
new file mode 100644
index 000000000000..a43970f56072
--- /dev/null
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noprobes.ksh
@@ -0,0 +1,59 @@
+#
+# 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 (c) 2013, Joyent, Inc. All rights reserved.
+#
+
+if [ $# != 1 ]; then
+	echo expected one argument: '<'dtrace-path'>'
+	exit 2
+fi
+
+dtrace=$1
+DIR=/var/tmp/dtest.$$
+
+mkdir $DIR
+cd $DIR
+
+cat > test.c <<EOF
+void
+foo()
+{}
+EOF
+
+cat > doogle.d <<EOF
+provider doogle {
+	probe bagnoogle();
+};
+EOF
+
+cc -c test.c
+$dtrace -G -32 -s doogle.d test.o -o doogle.d.o
+
+if [ $? -eq 0 ]; then
+	print -u2 "dtrace succeeded despite having no probe sites"
+	exit 1
+fi
+
+cd /
+/usr/bin/rm -rf $DIR
+exit 0
diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb.8 b/cddl/contrib/opensolaris/cmd/zdb/zdb.8
index e59f37006429..4ef437e9daa1 100644
--- a/cddl/contrib/opensolaris/cmd/zdb/zdb.8
+++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.8
@@ -14,12 +14,12 @@
 .\"
 .\" Copyright 2012, Richard Lowe.
 .\" Copyright (c) 2012, Marcelo Araujo <araujo@FreeBSD.org>.
-.\" Copyright (c) 2012 by Delphix. All rights reserved.
+.\" Copyright (c) 2012, 2014 by Delphix. All rights reserved.
 .\" All Rights Reserved.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 20, 2014
+.Dd July 26, 2014
 .Dt ZDB 8
 .Os
 .Sh NAME
@@ -27,11 +27,12 @@
 .Nd Display zpool debugging and consistency information
 .Sh SYNOPSIS
 .Nm
-.Op Fl CumdibcsDvhLXFPA
+.Op Fl CumdibcsDvhLMXFPA
 .Op Fl e Op Fl p Ar path...
 .Op Fl t Ar txg
 .Op Fl U Ar cache
-.Op Fl M Ar inflight I/Os
+.Op Fl I Ar inflight I/Os
+.Op Fl x Ar dumpdir
 .Ar poolname
 .Op Ar object ...
 .Nm
@@ -41,7 +42,7 @@
 .Ar dataset
 .Op Ar object ...
 .Nm
-.Fl m Op Fl LXFPA
+.Fl m Op Fl MLXFPA
 .Op Fl t Ar txg
 .Op Fl e Op Fl p Ar path...
 .Op Fl U Ar cache
@@ -154,6 +155,13 @@ By default,
 verifies that all non-free blocks are referenced, which can be very expensive.
 .It Fl m
 Display the offset, spacemap, and free space of each metaslab.
+When specified twice, also display information about the on-disk free
+space histogram associated with each metaslab. When specified three time,
+display the maximum contiguous free space, the in-core free space histogram,
+and the percentage of free space in each space map.  When specified
+four times display every spacemap record.
+.It Fl M
+Display the offset, spacemap, and free space of each metaslab.
 When specified twice, also display information about the maximum contiguous
 free space and the percentage of free space in each space map.
 When specified three times display every spacemap record.
@@ -217,10 +225,18 @@ Operate on an exported pool, not present in
 The
 .Fl p
 flag specifies the path under which devices are to be searched.
+.It Fl x Ar dumpdir
+All blocks accessed will be copied to files in the specified directory.
+The blocks will be placed in sparse files whose name is the same as
+that of the file or device read.  zdb can be then run on the generated files.
+Note that the
+.Fl bbc
+flags are sufficient to access (and thus copy)
+all metadata on the pool.
 .It Fl F
 Attempt to make an unreadable pool readable by trying progressively older
 transactions.
-.It Fl M Ar inflight I/Os
+.It Fl I Ar inflight I/Os
 Limit the number of outstanding checksum I/Os to the specified value.
 The default value is 200. This option affects the performance of the
 .Fl c
diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb.c b/cddl/contrib/opensolaris/cmd/zdb/zdb.c
index 61e80714ac21..04970fc70bd4 100644
--- a/cddl/contrib/opensolaris/cmd/zdb/zdb.c
+++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.c
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 #include <stdio.h>
@@ -75,9 +75,9 @@
 	DMU_OT_ZAP_OTHER : DMU_OT_NUMTYPES))
 
 #ifndef lint
-extern int zfs_recover;
+extern boolean_t zfs_recover;
 #else
-int zfs_recover;
+boolean_t zfs_recover;
 #endif
 
 const char cmdname[] = "zdb";
@@ -111,11 +111,11 @@ static void
 usage(void)
 {
 	(void) fprintf(stderr,
-	    "Usage: %s [-CumdibcsDvhLXFPA] [-t txg] [-e [-p path...]] "
-	    "[-U config] [-M inflight I/Os] poolname [object...]\n"
+	    "Usage: %s [-CumMdibcsDvhLXFPA] [-t txg] [-e [-p path...]] "
+	    "[-U config] [-I inflight I/Os] [-x dumpdir] poolname [object...]\n"
 	    "       %s [-divPA] [-e -p path...] [-U config] dataset "
 	    "[object...]\n"
-	    "       %s -m [-LXFPA] [-t txg] [-e [-p path...]] [-U config] "
+	    "       %s -mM [-LXFPA] [-t txg] [-e [-p path...]] [-U config] "
 	    "poolname [vdev [metaslab...]]\n"
 	    "       %s -R [-A] [-e [-p path...]] poolname "
 	    "vdev:offset:size[:flags]\n"
@@ -138,6 +138,7 @@ usage(void)
 	(void) fprintf(stderr, "        -h pool history\n");
 	(void) fprintf(stderr, "        -b block statistics\n");
 	(void) fprintf(stderr, "        -m metaslabs\n");
+	(void) fprintf(stderr, "        -M metaslab groups\n");
 	(void) fprintf(stderr, "        -c checksum all metadata (twice for "
 	    "all data) blocks\n");
 	(void) fprintf(stderr, "        -s report stats on zdb's I/O\n");
@@ -150,7 +151,7 @@ usage(void)
 	(void) fprintf(stderr, "        -R read and display block from a "
 	    "device\n\n");
 	(void) fprintf(stderr, "    Below options are intended for use "
-	    "with other options (except -l):\n");
+	    "with other options:\n");
 	(void) fprintf(stderr, "        -A ignore assertions (-A), enable "
 	    "panic recovery (-AA) or both (-AAA)\n");
 	(void) fprintf(stderr, "        -F attempt automatic rewind within "
@@ -163,11 +164,14 @@ usage(void)
 	    "has altroot/not in a cachefile\n");
 	(void) fprintf(stderr, "        -p <path> -- use one or more with "
 	    "-e to specify path to vdev dir\n");
-	(void) fprintf(stderr, "	-P print numbers in parseable form\n");
+	(void) fprintf(stderr, "        -x <dumpdir> -- "
+	    "dump all read blocks into specified directory\n");
+	(void) fprintf(stderr, "        -P print numbers in parseable form\n");
 	(void) fprintf(stderr, "        -t <txg> -- highest txg to use when "
 	    "searching for uberblocks\n");
-	(void) fprintf(stderr, "        -M <number of inflight I/Os> -- "
-	    "specify the maximum number of checksumming I/Os [default is 200]");
+	(void) fprintf(stderr, "        -I <number of inflight I/Os> -- "
+	    "specify the maximum number of "
+	    "checksumming I/Os [default is 200]\n");
 	(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "
 	    "to make only that option verbose\n");
 	(void) fprintf(stderr, "Default is to dump everything non-verbosely\n");
@@ -545,7 +549,7 @@ get_metaslab_refcount(vdev_t *vd)
 {
 	int refcount = 0;
 
-	if (vd->vdev_top == vd) {
+	if (vd->vdev_top == vd && !vd->vdev_removing) {
 		for (int m = 0; m < vd->vdev_ms_count; m++) {
 			space_map_t *sm = vd->vdev_ms[m]->ms_sm;
 
@@ -683,9 +687,10 @@ dump_metaslab(metaslab_t *msp)
 		 * 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");
+		(void) printf("\tOn-disk histogram:\t\tfragmentation %llu\n",
+		    (u_longlong_t)msp->ms_fragmentation);
 		dump_histogram(sm->sm_phys->smp_histogram,
-		    SPACE_MAP_HISTOGRAM_SIZE(sm), sm->sm_shift);
+		    SPACE_MAP_HISTOGRAM_SIZE, sm->sm_shift);
 	}
 
 	if (dump_opt['d'] > 5 || dump_opt['m'] > 3) {
@@ -709,6 +714,47 @@ print_vdev_metaslab_header(vdev_t *vd)
 	    "---------------", "-------------");
 }
 
+static void
+dump_metaslab_groups(spa_t *spa)
+{
+	vdev_t *rvd = spa->spa_root_vdev;
+	metaslab_class_t *mc = spa_normal_class(spa);
+	uint64_t fragmentation;
+
+	metaslab_class_histogram_verify(mc);
+
+	for (int c = 0; c < rvd->vdev_children; c++) {
+		vdev_t *tvd = rvd->vdev_child[c];
+		metaslab_group_t *mg = tvd->vdev_mg;
+
+		if (mg->mg_class != mc)
+			continue;
+
+		metaslab_group_histogram_verify(mg);
+		mg->mg_fragmentation = metaslab_group_fragmentation(mg);
+
+		(void) printf("\tvdev %10llu\t\tmetaslabs%5llu\t\t"
+		    "fragmentation",
+		    (u_longlong_t)tvd->vdev_id,
+		    (u_longlong_t)tvd->vdev_ms_count);
+		if (mg->mg_fragmentation == ZFS_FRAG_INVALID) {
+			(void) printf("%3s\n", "-");
+		} else {
+			(void) printf("%3llu%%\n",
+			    (u_longlong_t)mg->mg_fragmentation);
+		}
+		dump_histogram(mg->mg_histogram, RANGE_TREE_HISTOGRAM_SIZE, 0);
+	}
+
+	(void) printf("\tpool %s\tfragmentation", spa_name(spa));
+	fragmentation = metaslab_class_fragmentation(mc);
+	if (fragmentation == ZFS_FRAG_INVALID)
+		(void) printf("\t%3s\n", "-");
+	else
+		(void) printf("\t%3llu%%\n", (u_longlong_t)fragmentation);
+	dump_histogram(mc->mc_histogram, RANGE_TREE_HISTOGRAM_SIZE, 0);
+}
+
 static void
 dump_metaslabs(spa_t *spa)
 {
@@ -1032,7 +1078,8 @@ dump_dnode(objset_t *os, uint64_t object, void *data, size_t size)
 }
 
 static uint64_t
-blkid2offset(const dnode_phys_t *dnp, const blkptr_t *bp, const zbookmark_t *zb)
+blkid2offset(const dnode_phys_t *dnp, const blkptr_t *bp,
+    const zbookmark_phys_t *zb)
 {
 	if (dnp == NULL) {
 		ASSERT(zb->zb_level < 0);
@@ -1059,8 +1106,17 @@ snprintf_blkptr_compact(char *blkbuf, size_t buflen, const blkptr_t *bp)
 		return;
 	}
 
-	blkbuf[0] = '\0';
+	if (BP_IS_EMBEDDED(bp)) {
+		(void) sprintf(blkbuf,
+		    "EMBEDDED et=%u %llxL/%llxP B=%llu",
+		    (int)BPE_GET_ETYPE(bp),
+		    (u_longlong_t)BPE_GET_LSIZE(bp),
+		    (u_longlong_t)BPE_GET_PSIZE(bp),
+		    (u_longlong_t)bp->blk_birth);
+		return;
+	}
 
+	blkbuf[0] = '\0';
 	for (int i = 0; i < ndvas; i++)
 		(void) snprintf(blkbuf + strlen(blkbuf),
 		    buflen - strlen(blkbuf), "%llu:%llx:%llx ",
@@ -1078,21 +1134,23 @@ snprintf_blkptr_compact(char *blkbuf, size_t buflen, const blkptr_t *bp)
 		    "%llxL/%llxP F=%llu B=%llu/%llu",
 		    (u_longlong_t)BP_GET_LSIZE(bp),
 		    (u_longlong_t)BP_GET_PSIZE(bp),
-		    (u_longlong_t)bp->blk_fill,
+		    (u_longlong_t)BP_GET_FILL(bp),
 		    (u_longlong_t)bp->blk_birth,
 		    (u_longlong_t)BP_PHYSICAL_BIRTH(bp));
 	}
 }
 
 static void
-print_indirect(blkptr_t *bp, const zbookmark_t *zb,
+print_indirect(blkptr_t *bp, const zbookmark_phys_t *zb,
     const dnode_phys_t *dnp)
 {
 	char blkbuf[BP_SPRINTF_LEN];
 	int l;
 
-	ASSERT3U(BP_GET_TYPE(bp), ==, dnp->dn_type);
-	ASSERT3U(BP_GET_LEVEL(bp), ==, zb->zb_level);
+	if (!BP_IS_EMBEDDED(bp)) {
+		ASSERT3U(BP_GET_TYPE(bp), ==, dnp->dn_type);
+		ASSERT3U(BP_GET_LEVEL(bp), ==, zb->zb_level);
+	}
 
 	(void) printf("%16llx ", (u_longlong_t)blkid2offset(dnp, bp, zb));
 
@@ -1112,7 +1170,7 @@ print_indirect(blkptr_t *bp, const zbookmark_t *zb,
 
 static int
 visit_indirect(spa_t *spa, const dnode_phys_t *dnp,
-    blkptr_t *bp, const zbookmark_t *zb)
+    blkptr_t *bp, const zbookmark_phys_t *zb)
 {
 	int err = 0;
 
@@ -1138,7 +1196,7 @@ visit_indirect(spa_t *spa, const dnode_phys_t *dnp,
 		/* recursively visit blocks below this */
 		cbp = buf->b_data;
 		for (i = 0; i < epb; i++, cbp++) {
-			zbookmark_t czb;
+			zbookmark_phys_t czb;
 
 			SET_BOOKMARK(&czb, zb->zb_objset, zb->zb_object,
 			    zb->zb_level - 1,
@@ -1146,10 +1204,10 @@ visit_indirect(spa_t *spa, const dnode_phys_t *dnp,
 			err = visit_indirect(spa, dnp, cbp, &czb);
 			if (err)
 				break;
-			fill += cbp->blk_fill;
+			fill += BP_GET_FILL(cbp);
 		}
 		if (!err)
-			ASSERT3U(fill, ==, bp->blk_fill);
+			ASSERT3U(fill, ==, BP_GET_FILL(bp));
 		(void) arc_buf_remove_ref(buf, &buf);
 	}
 
@@ -1162,7 +1220,7 @@ dump_indirect(dnode_t *dn)
 {
 	dnode_phys_t *dnp = dn->dn_phys;
 	int j;
-	zbookmark_t czb;
+	zbookmark_phys_t czb;
 
 	(void) printf("Indirect blocks:\n");
 
@@ -1816,14 +1874,14 @@ dump_dir(objset_t *os)
 
 	if (dds.dds_type == DMU_OST_META) {
 		dds.dds_creation_txg = TXG_INITIAL;
-		usedobjs = os->os_rootbp->blk_fill;
+		usedobjs = BP_GET_FILL(os->os_rootbp);
 		refdbytes = os->os_spa->spa_dsl_pool->
 		    dp_mos_dir->dd_phys->dd_used_bytes;
 	} else {
 		dmu_objset_space(os, &refdbytes, &scratch, &usedobjs, &scratch);
 	}
 
-	ASSERT3U(usedobjs, ==, os->os_rootbp->blk_fill);
+	ASSERT3U(usedobjs, ==, BP_GET_FILL(os->os_rootbp));
 
 	zdb_nicenum(refdbytes, numbuf);
 
@@ -2108,6 +2166,8 @@ typedef struct zdb_blkstats {
 	uint64_t zb_lsize;
 	uint64_t zb_psize;
 	uint64_t zb_count;
+	uint64_t zb_gangs;
+	uint64_t zb_ditto_samevdev;
 	uint64_t zb_psize_histogram[PSIZE_HISTO_SIZE];
 } zdb_blkstats_t;
 
@@ -2132,6 +2192,9 @@ typedef struct zdb_cb {
 	zdb_blkstats_t	zcb_type[ZB_TOTAL + 1][ZDB_OT_TOTAL + 1];
 	uint64_t	zcb_dedup_asize;
 	uint64_t	zcb_dedup_blocks;
+	uint64_t	zcb_embedded_blocks[NUM_BP_EMBEDDED_TYPES];
+	uint64_t	zcb_embedded_histogram[NUM_BP_EMBEDDED_TYPES]
+	    [BPE_PAYLOAD_SIZE];
 	uint64_t	zcb_start;
 	uint64_t	zcb_lastprint;
 	uint64_t	zcb_totalasize;
@@ -2155,6 +2218,7 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t *zilog, const blkptr_t *bp,
 	for (int i = 0; i < 4; i++) {
 		int l = (i < 2) ? BP_GET_LEVEL(bp) : ZB_TOTAL;
 		int t = (i & 1) ? type : ZDB_OT_TOTAL;
+		int equal;
 		zdb_blkstats_t *zb = &zcb->zcb_type[l][t];
 
 		zb->zb_asize += BP_GET_ASIZE(bp);
@@ -2162,6 +2226,34 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t *zilog, const blkptr_t *bp,
 		zb->zb_psize += BP_GET_PSIZE(bp);
 		zb->zb_count++;
 		zb->zb_psize_histogram[BP_GET_PSIZE(bp) >> SPA_MINBLOCKSHIFT]++;
+
+		zb->zb_gangs += BP_COUNT_GANG(bp);
+
+		switch (BP_GET_NDVAS(bp)) {
+		case 2:
+			if (DVA_GET_VDEV(&bp->blk_dva[0]) ==
+			    DVA_GET_VDEV(&bp->blk_dva[1]))
+				zb->zb_ditto_samevdev++;
+			break;
+		case 3:
+			equal = (DVA_GET_VDEV(&bp->blk_dva[0]) ==
+			    DVA_GET_VDEV(&bp->blk_dva[1])) +
+			    (DVA_GET_VDEV(&bp->blk_dva[0]) ==
+			    DVA_GET_VDEV(&bp->blk_dva[2])) +
+			    (DVA_GET_VDEV(&bp->blk_dva[1]) ==
+			    DVA_GET_VDEV(&bp->blk_dva[2]));
+			if (equal != 0)
+				zb->zb_ditto_samevdev++;
+			break;
+		}
+
+	}
+
+	if (BP_IS_EMBEDDED(bp)) {
+		zcb->zcb_embedded_blocks[BPE_GET_ETYPE(bp)]++;
+		zcb->zcb_embedded_histogram[BPE_GET_ETYPE(bp)]
+		    [BPE_GET_PSIZE(bp)]++;
+		return;
 	}
 
 	if (dump_opt['L'])
@@ -2200,7 +2292,7 @@ zdb_blkptr_done(zio_t *zio)
 	blkptr_t *bp = zio->io_bp;
 	int ioerr = zio->io_error;
 	zdb_cb_t *zcb = zio->io_private;
-	zbookmark_t *zb = &zio->io_bookmark;
+	zbookmark_phys_t *zb = &zio->io_bookmark;
 
 	zio_data_buf_free(zio->io_data, zio->io_size);
 
@@ -2235,7 +2327,7 @@ zdb_blkptr_done(zio_t *zio)
 /* ARGSUSED */
 static int
 zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
 	zdb_cb_t *zcb = arg;
 	dmu_object_type_t type;
@@ -2263,7 +2355,8 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
 
 	is_metadata = (BP_GET_LEVEL(bp) != 0 || DMU_OT_IS_METADATA(type));
 
-	if (dump_opt['c'] > 1 || (dump_opt['c'] && is_metadata)) {
+	if (!BP_IS_EMBEDDED(bp) &&
+	    (dump_opt['c'] > 1 || (dump_opt['c'] && is_metadata))) {
 		size_t size = BP_GET_PSIZE(bp);
 		void *data = zio_data_buf_alloc(size);
 		int flags = ZIO_FLAG_CANFAIL | ZIO_FLAG_SCRUB | ZIO_FLAG_RAW;
@@ -2319,8 +2412,7 @@ zdb_leak(void *arg, uint64_t start, uint64_t size)
 }
 
 static metaslab_ops_t zdb_metaslab_ops = {
-	NULL,	/* alloc */
-	NULL	/* fragmented */
+	NULL	/* alloc */
 };
 
 static void
@@ -2455,7 +2547,7 @@ dump_block_stats(spa_t *spa)
 	zdb_blkstats_t *zb, *tzb;
 	uint64_t norm_alloc, norm_space, total_alloc, total_found;
 	int flags = TRAVERSE_PRE | TRAVERSE_PREFETCH_METADATA | TRAVERSE_HARD;
-	int leaks = 0;
+	boolean_t leaks = B_FALSE;
 
 	(void) printf("\nTraversing all blocks %s%s%s%s%s...\n\n",
 	    (dump_opt['c'] || !dump_opt['L']) ? "to verify " : "",
@@ -2543,7 +2635,7 @@ dump_block_stats(spa_t *spa)
 		    (u_longlong_t)total_alloc,
 		    (dump_opt['L']) ? "unreachable" : "leaked",
 		    (longlong_t)(total_alloc - total_found));
-		leaks = 1;
+		leaks = B_TRUE;
 	}
 
 	if (tzb->zb_count == 0)
@@ -2552,6 +2644,8 @@ dump_block_stats(spa_t *spa)
 	(void) printf("\n");
 	(void) printf("\tbp count:      %10llu\n",
 	    (u_longlong_t)tzb->zb_count);
+	(void) printf("\tganged count:  %10llu\n",
+	    (longlong_t)tzb->zb_gangs);
 	(void) printf("\tbp logical:    %10llu      avg: %6llu\n",
 	    (u_longlong_t)tzb->zb_lsize,
 	    (u_longlong_t)(tzb->zb_lsize / tzb->zb_count));
@@ -2573,6 +2667,28 @@ dump_block_stats(spa_t *spa)
 	(void) printf("\tSPA allocated: %10llu     used: %5.2f%%\n",
 	    (u_longlong_t)norm_alloc, 100.0 * norm_alloc / norm_space);
 
+	for (bp_embedded_type_t i = 0; i < NUM_BP_EMBEDDED_TYPES; i++) {
+		if (zcb.zcb_embedded_blocks[i] == 0)
+			continue;
+		(void) printf("\n");
+		(void) printf("\tadditional, non-pointer bps of type %u: "
+		    "%10llu\n",
+		    i, (u_longlong_t)zcb.zcb_embedded_blocks[i]);
+
+		if (dump_opt['b'] >= 3) {
+			(void) printf("\t number of (compressed) bytes:  "
+			    "number of bps\n");
+			dump_histogram(zcb.zcb_embedded_histogram[i],
+			    sizeof (zcb.zcb_embedded_histogram[i]) /
+			    sizeof (zcb.zcb_embedded_histogram[i][0]), 0);
+		}
+	}
+
+	if (tzb->zb_ditto_samevdev != 0) {
+		(void) printf("\tDittoed blocks on same vdev: %llu\n",
+		    (longlong_t)tzb->zb_ditto_samevdev);
+	}
+
 	if (dump_opt['b'] >= 2) {
 		int l, t, level;
 		(void) printf("\nBlocks\tLSIZE\tPSIZE\tASIZE"
@@ -2580,7 +2696,7 @@ dump_block_stats(spa_t *spa)
 
 		for (t = 0; t <= ZDB_OT_TOTAL; t++) {
 			char csize[32], lsize[32], psize[32], asize[32];
-			char avg[32];
+			char avg[32], gang[32];
 			char *typename;
 
 			if (t < DMU_OT_NUMTYPES)
@@ -2621,6 +2737,7 @@ dump_block_stats(spa_t *spa)
 				zdb_nicenum(zb->zb_psize, psize);
 				zdb_nicenum(zb->zb_asize, asize);
 				zdb_nicenum(zb->zb_asize / zb->zb_count, avg);
+				zdb_nicenum(zb->zb_gangs, gang);
 
 				(void) printf("%6s\t%5s\t%5s\t%5s\t%5s"
 				    "\t%5.2f\t%6.2f\t",
@@ -2634,6 +2751,11 @@ dump_block_stats(spa_t *spa)
 					(void) printf("    L%d %s\n",
 					    level, typename);
 
+				if (dump_opt['b'] >= 3 && zb->zb_gangs > 0) {
+					(void) printf("\t number of ganged "
+					    "blocks: %s\n", gang);
+				}
+
 				if (dump_opt['b'] >= 4) {
 					(void) printf("psize "
 					    "(in 512-byte sectors): "
@@ -2668,20 +2790,20 @@ typedef struct zdb_ddt_entry {
 /* ARGSUSED */
 static int
 zdb_ddt_add_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
 	avl_tree_t *t = arg;
 	avl_index_t where;
 	zdb_ddt_entry_t *zdde, zdde_search;
 
-	if (BP_IS_HOLE(bp))
+	if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
 		return (0);
 
 	if (dump_opt['S'] > 1 && zb->zb_level == ZB_ROOT_LEVEL) {
 		(void) printf("traversing objset %llu, %llu objects, "
 		    "%lu blocks so far\n",
 		    (u_longlong_t)zb->zb_objset,
-		    (u_longlong_t)bp->blk_fill,
+		    (u_longlong_t)BP_GET_FILL(bp),
 		    avl_numnodes(t));
 	}
 
@@ -2785,6 +2907,8 @@ dump_zpool(spa_t *spa)
 
 	if (dump_opt['d'] > 2 || dump_opt['m'])
 		dump_metaslabs(spa);
+	if (dump_opt['M'])
+		dump_metaslab_groups(spa);
 
 	if (dump_opt['d'] || dump_opt['i']) {
 		dump_dir(dp->dp_meta_objset);
@@ -3279,7 +3403,8 @@ main(int argc, char **argv)
 
 	dprintf_setup(&argc, argv);
 
-	while ((c = getopt(argc, argv, "bcdhilmM:suCDRSAFLXevp:t:U:P")) != -1) {
+	while ((c = getopt(argc, argv,
+	    "bcdhilmMI:suCDRSAFLXx:evp:t:U:P")) != -1) {
 		switch (c) {
 		case 'b':
 		case 'c':
@@ -3292,6 +3417,7 @@ main(int argc, char **argv)
 		case 'u':
 		case 'C':
 		case 'D':
+		case 'M':
 		case 'R':
 		case 'S':
 			dump_opt[c]++;
@@ -3305,10 +3431,7 @@ main(int argc, char **argv)
 		case 'P':
 			dump_opt[c]++;
 			break;
-		case 'v':
-			verbose++;
-			break;
-		case 'M':
+		case 'I':
 			max_inflight = strtoull(optarg, NULL, 0);
 			if (max_inflight == 0) {
 				(void) fprintf(stderr, "maximum number "
@@ -3343,6 +3466,12 @@ main(int argc, char **argv)
 		case 'U':
 			spa_config_path = optarg;
 			break;
+		case 'v':
+			verbose++;
+			break;
+		case 'x':
+			vn_dumpdir = optarg;
+			break;
 		default:
 			usage();
 			break;
diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c b/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
index 17f7ad3e8c2f..583e42228660 100644
--- a/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
+++ b/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
@@ -24,7 +24,7 @@
  */
 
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  */
 
 /*
@@ -122,7 +122,7 @@ zil_prt_rec_write(zilog_t *zilog, int txtype, lr_write_t *lr)
 {
 	char *data, *dlimit;
 	blkptr_t *bp = &lr->lr_blkptr;
-	zbookmark_t zb;
+	zbookmark_phys_t zb;
 	char buf[SPA_MAXBLOCKSIZE];
 	int verbose = MAX(dump_opt['d'], dump_opt['i']);
 	int error;
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs.8 b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
index a28abf016057..2315e056aaf4 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 27, 2014
+.Dd June 30, 2014
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -179,11 +179,12 @@
 .Ar bookmark
 .Nm
 .Cm send
-.Op Fl DnPpRv
+.Op Fl DnPpRve
 .Op Fl i Ar snapshot | Fl I Ar snapshot
 .Ar snapshot
 .Nm
 .Cm send
+.Op Fl e
 .Op Fl i Ar snapshot Ns | Ns bookmark
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Nm
@@ -2476,7 +2477,7 @@ feature.
 .It Xo
 .Nm
 .Cm send
-.Op Fl DnPpRv
+.Op Fl DnPpRve
 .Op Fl i Ar snapshot | Fl I Ar snapshot
 .Ar snapshot
 .Xc
@@ -2548,6 +2549,29 @@ be used regardless of the dataset's
 property, but performance will be much better if the filesystem uses a
 dedup-capable checksum (eg.
 .Sy sha256 ) .
+.It Fl e
+Generate a more compact stream by using WRITE_EMBEDDED records for blocks
+which are stored more compactly on disk by the
+.Sy embedded_data
+pool
+feature.
+This flag has no effect if the
+.Sy embedded_data
+feature is
+disabled.
+The receiving system must have the
+.Sy embedded_data
+feature
+enabled.
+If the
+.Sy lz4_compress
+feature is active on the sending system,
+then the receiving system must have that feature enabled as well.
+See
+.Xr zpool-features 7
+for details on ZFS feature flags and the
+.Sy embedded_data
+feature.
 .It Fl p
 Include the dataset's properties in the stream. This flag is implicit when
 .Fl R
@@ -2572,6 +2596,7 @@ on future versions of
 .It Xo
 .Nm
 .Cm send
+.Op Fl e
 .Op Fl i Ar snapshot Ns | Ns Ar bookmark
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Xc
@@ -2597,6 +2622,29 @@ specified as the last component of the name
 If the incremental target is a clone, the incremental source can
 be the origin snapshot, or an earlier snapshot in the origin's filesystem,
 or the origin's origin, etc.
+.It Fl e
+Generate a more compact stream by using WRITE_EMBEDDED records for blocks
+which are stored more compactly on disk by the
+.Sy embedded_data
+pool
+feature.
+This flag has no effect if the
+.Sy embedded_data
+feature is
+disabled.
+The receiving system must have the
+.Sy embedded_data
+feature
+enabled.
+If the
+.Sy lz4_compress
+feature is active on the sending system,
+then the receiving system must have that feature enabled as well.
+See
+.Xr zpool-features 7
+for details on ZFS feature flags and the
+.Sy embedded_data
+feature.
 .El
 .It Xo
 .Nm
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
index 4c5f8d44bdc4..a3b461e1159c 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
@@ -21,7 +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, 2014 by Delphix. All rights reserved.
  * Copyright 2012 Milan Jurik. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
@@ -274,9 +274,9 @@ get_usage(zfs_help_t idx)
 	case HELP_ROLLBACK:
 		return (gettext("\trollback [-rRf] <snapshot>\n"));
 	case HELP_SEND:
-		return (gettext("\tsend [-DnPpRv] [-[iI] snapshot] "
+		return (gettext("\tsend [-DnPpRve] [-[iI] snapshot] "
 		    "<snapshot>\n"
-		    "\tsend [-i snapshot|bookmark] "
+		    "\tsend [-e] [-i snapshot|bookmark] "
 		    "<filesystem|volume|snapshot>\n"));
 	case HELP_SET:
 		return (gettext("\tset <property=value> "
@@ -590,6 +590,7 @@ finish_progress(char *done)
 	free(pt_header);
 	pt_header = NULL;
 }
+
 /*
  * zfs clone [-p] [-o prop=value] ... <snap> <fs | vol>
  *
@@ -3368,6 +3369,7 @@ rollback_check_dependent(zfs_handle_t *zhp, void *data)
 	zfs_close(zhp);
 	return (0);
 }
+
 /*
  * Report any snapshots more recent than the one specified.  Used when '-r' is
  * not specified.  We reuse this same callback for the snapshot dependents - if
@@ -3707,7 +3709,7 @@ zfs_do_send(int argc, char **argv)
 	boolean_t extraverbose = B_FALSE;
 
 	/* check options */
-	while ((c = getopt(argc, argv, ":i:I:RDpvnP")) != -1) {
+	while ((c = getopt(argc, argv, ":i:I:RDpvnPe")) != -1) {
 		switch (c) {
 		case 'i':
 			if (fromname)
@@ -3742,6 +3744,9 @@ zfs_do_send(int argc, char **argv)
 		case 'n':
 			flags.dryrun = B_TRUE;
 			break;
+		case 'e':
+			flags.embed_data = B_TRUE;
+			break;
 		case ':':
 			(void) fprintf(stderr, gettext("missing argument for "
 			    "'%c' option\n"), optopt);
@@ -3780,6 +3785,7 @@ zfs_do_send(int argc, char **argv)
 	if (strchr(argv[0], '@') == NULL ||
 	    (fromname && strchr(fromname, '#') != NULL)) {
 		char frombuf[ZFS_MAXNAMELEN];
+		enum lzc_send_flags lzc_flags = 0;
 
 		if (flags.replicate || flags.doall || flags.props ||
 		    flags.dedup || flags.dryrun || flags.verbose ||
@@ -3794,6 +3800,9 @@ zfs_do_send(int argc, char **argv)
 		if (zhp == NULL)
 			return (1);
 
+		if (flags.embed_data)
+			lzc_flags |= LZC_SEND_FLAG_EMBED_DATA;
+
 		if (fromname != NULL &&
 		    (fromname[0] == '#' || fromname[0] == '@')) {
 			/*
@@ -3807,7 +3816,7 @@ zfs_do_send(int argc, char **argv)
 			(void) strlcat(frombuf, fromname, sizeof (frombuf));
 			fromname = frombuf;
 		}
-		err = zfs_send_one(zhp, fromname, STDOUT_FILENO);
+		err = zfs_send_one(zhp, fromname, STDOUT_FILENO, lzc_flags);
 		zfs_close(zhp);
 		return (err != 0);
 	}
@@ -6847,6 +6856,9 @@ zfs_do_bookmark(int argc, char **argv)
 		case ENOTSUP:
 			err_msg = "bookmark feature not enabled";
 			break;
+		case ENOSPC:
+			err_msg = "out of space";
+			break;
 		default:
 			err_msg = "unknown error";
 			break;
@@ -6855,7 +6867,7 @@ zfs_do_bookmark(int argc, char **argv)
 		    dgettext(TEXT_DOMAIN, err_msg));
 	}
 
-	return (ret);
+	return (ret != 0);
 
 usage:
 	usage(B_FALSE);
diff --git a/cddl/contrib/opensolaris/cmd/zhack/zhack.c b/cddl/contrib/opensolaris/cmd/zhack/zhack.c
index ace8c32f1a30..6e3f0294a623 100644
--- a/cddl/contrib/opensolaris/cmd/zhack/zhack.c
+++ b/cddl/contrib/opensolaris/cmd/zhack/zhack.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
@@ -362,7 +362,7 @@ zhack_do_feature_enable(int argc, char **argv)
 		    feature.fi_guid);
 
 	VERIFY0(dsl_sync_task(spa_name(spa), NULL,
-	    zhack_feature_enable_sync, &feature, 5));
+	    zhack_feature_enable_sync, &feature, 5, ZFS_SPACE_CHECK_NORMAL));
 
 	spa_close(spa, FTAG);
 
@@ -473,7 +473,8 @@ zhack_do_feature_ref(int argc, char **argv)
 	}
 
 	VERIFY0(dsl_sync_task(spa_name(spa), NULL,
-	    decr ? feature_decr_sync : feature_incr_sync, &feature, 5));
+	    decr ? feature_decr_sync : feature_incr_sync, &feature,
+	    5, ZFS_SPACE_CHECK_NORMAL));
 
 	spa_close(spa, FTAG);
 }
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 b/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
index 5560de97fd0e..437b37413b9a 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 April 23, 2014
+.Dd July 1, 2014
 .Dt ZPOOL-FEATURES 7
 .Os
 .Sh NAME
@@ -235,14 +235,11 @@ administrator can turn on
 compression on any dataset on the
 pool using the
 .Xr zfs 8
-command. Please note that doing so will
-immediately activate the
-.Sy lz4_compress
-feature on the underlying
-pool
-.Pq even before any data is written ,
-and the feature will not be
-deactivated.
+command.
+Also, all newly written metadata
+will be compressed with
+.Sy lz4
+algorithm.
 Since this feature is not read-only compatible, this
 operation will render the pool unimportable on systems without support
 for the
@@ -251,6 +248,12 @@ feature.
 Booting off of
 .Sy lz4
 -compressed root pools is supported.
+.Pp
+This feature becomes
+.Sy active
+as soon as it is enabled and will
+never return to being
+.Sy enabled .
 .It Sy multi_vdev_crash_dump
 .Bl -column "READ\-ONLY COMPATIBLE" "com.joyent:multi_vdev_crash_dump"
 .It GUID Ta com.joyent:multi_vdev_crash_dump
@@ -396,6 +399,34 @@ This feature becomes
 as soon as it is enabled and will
 never return to being
 .Sy enabled .
+.It Sy embedded_data
+.Bl -column "READ\-ONLY COMPATIBLE" "com.delphix:embedded_data"
+.It GUID Ta com.delphix:embedded_data
+.It READ\-ONLY COMPATIBLE Ta no
+.It DEPENDENCIES Ta none
+.El
+.Pp
+This feature improves the performance and compression ratio of
+highly-compressible blocks.
+Blocks whose contents can compress to 112 bytes
+or smaller can take advantage of this feature.
+.Pp
+When this feature is enabled, the contents of highly-compressible blocks are
+stored in the block "pointer" itself
+.Po a misnomer in this case, as it contains
+the compresseed data, rather than a pointer to its location on disk
+.Pc .
+Thus
+the space of the block
+.Pq one sector, typically 512 bytes or 4KB
+is saved,
+and no additional i/o is needed to read and write the data block.
+.Pp
+This feature becomes
+.Sy active
+as soon as it is enabled and will
+never return to being
+.Sy enabled .
 .El
 .Sh SEE ALSO
 .Xr zpool 8
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool.8 b/cddl/contrib/opensolaris/cmd/zpool/zpool.8
index 1061e452f034..a8463cfc7cc9 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool.8
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool.8
@@ -21,12 +21,12 @@
 .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
 .\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved.
 .\" Copyright (c) 2011, Justin T. Gibbs <gibbs@FreeBSD.org>
-.\" Copyright (c) 2012 by Delphix. All Rights Reserved.
+.\" Copyright (c) 2013 by Delphix. All Rights Reserved.
 .\" Copyright (c) 2012, Glen Barber <gjb@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 28, 2014
+.Dd July 26, 2014
 .Dt ZPOOL 8
 .Os
 .Sh NAME
@@ -543,6 +543,15 @@ For example, a
 value of 1.76 indicates that 1.76 units of data were stored but only 1 unit of disk space was actually consumed. See
 .Xr zfs 8
 for a description of the deduplication feature.
+.It Sy expandsize
+Amount of uninitialized space within the pool or device that can be used to
+increase the total capacity of the pool.
+Uninitialized space consists of
+any space on an EFI labeled vdev which has not been brought online
+.Pq i.e. zpool online -e .
+This space occurs when a LUN is dynamically expanded.
+.It Sy fragmentation
+The amount of fragmentation in the pool.
 .It Sy free
 Number of blocks within the pool that are not allocated.
 .It Sy freeing
@@ -555,8 +564,6 @@ Over time
 will decrease while
 .Sy free
 increases.
-.It Sy expandsize
-This property has currently no value on FreeBSD.
 .It Sy guid
 A unique identifier for the pool.
 .It Sy health
@@ -1041,7 +1048,6 @@ the following fields:
 See the
 .Qq Sx Properties
 section for more information on the available pool properties.
-.Pp
 .It Fl H
 Scripted mode. Do not display headers, and separate fields by a single tab
 instead of arbitrary space.
@@ -1392,7 +1398,10 @@ instead of arbitrary space.
 .It Fl p
 Display numbers in parsable (exact) values.
 .It Fl v
-Show more detailed information.
+Verbose statistics. Reports usage statistics for individual
+.Em vdevs
+within
+the pool, in addition to the pool-wide statistics.
 .It Fl o Ar property Ns Op , Ns Ar ...
 Comma-separated list of properties to display. See the
 .Qq Sx Properties
@@ -1401,6 +1410,8 @@ section for a list of valid properties. The default list is
 .Sy size ,
 .Sy used ,
 .Sy available ,
+.Sy fragmentation ,
+.Sy expandsize ,
 .Sy capacity  ,
 .Sy health ,
 .Sy altroot .
@@ -1665,7 +1676,8 @@ can change.
 .It Fl x
 Only display status for pools that are exhibiting errors or are otherwise
 unavailable.
-Warnings about pools not using the latest on-disk format will not be included.
+Warnings about pools not using the latest on-disk format, having non-native
+block size or disabled features will not be included.
 .It Fl v
 Displays verbose data error information, printing out a complete list of all
 data errors since the last complete pool scrub.
@@ -1785,9 +1797,9 @@ is immediately available to any datasets within the pool.
 The following command lists all available pools on the system.
 .Bd -literal -offset 2n
 .Li # Ic zpool list
-NAME   SIZE  ALLOC   FREE    CAP  DEDUP  HEALTH  ALTROOT
-pool  2.70T   473G  2.24T    17%  1.00x  ONLINE  -
-test  1.98G  89.5K  1.98G     0%  1.00x  ONLINE  -
+NAME   SIZE  ALLOC   FREE   FRAG  EXPANDSZ    CAP  DEDUP  HEALTH  ALTROOT
+pool  2.70T   473G  2.24T    33%         -    17%  1.00x  ONLINE  -
+test  1.98G  89.5K  1.98G    48%         -     0%  1.00x  ONLINE  -
 .Ed
 .It Sy Example 7 No Listing All Properties for a Pool
 .Pp
@@ -1915,7 +1927,35 @@ subcommand as follows:
 .Bd -literal -offset 2n
 .Li # Ic zpool iostat -v pool 5
 .Ed
-.It Sy Example 15 No Removing a Mirrored Log Device
+.It Xo
+.Sy Example 15
+Displaying expanded space on a device
+.Xc
+.Pp
+The following command dipslays the detailed information for the
+.Em data
+pool.
+This pool is comprised of a single
+.Em raidz
+vdev where one of its
+devices increased its capacity by 10GB.
+In this example, the pool will not
+be able to utilized this extra capacity until all the devices under the
+.Em raidz
+vdev have been expanded.
+.Bd -literal -offset 2n
+.Li # Ic zpool list -v data
+NAME       SIZE  ALLOC   FREE   FRAG  EXPANDSZ    CAP  DEDUP  HEALTH  ALTROOT
+data      23.9G  14.6G  9.30G    48%         -    61%  1.00x  ONLINE  -
+  raidz1  23.9G  14.6G  9.30G    48%         -
+    ada0      -      -      -      -         -
+    ada1      -      -      -      -       10G
+    ada2      -      -      -      -         -
+.Ed
+.It Xo
+.Sy Example 16
+Removing a Mirrored Log Device
+.Xc
 .Pp
 The following command removes the mirrored log device
 .Em mirror-2 .
@@ -1947,7 +1987,12 @@ is:
 .Bd -literal -offset 2n
 .Li # Ic zpool remove tank mirror-2
 .Ed
-.It Sy Example 16 No Recovering a Faulted Tn ZFS No Pool
+.It Xo
+.Sy Example 17
+Recovering a Faulted
+.Tn ZFS
+Pool
+.Xc
 .Pp
 If a pool is faulted but recoverable, a message indicating this state is
 provided by
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
index bec5e7054401..fe731691d9e1 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2012 by Frederik Wessels. All rights reserved.
  * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
  * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved.
@@ -2033,7 +2033,7 @@ zpool_do_import(int argc, char **argv)
 			break;
 		case 'T':
 			errno = 0;
-			txg = strtoull(optarg, &endptr, 10);
+			txg = strtoull(optarg, &endptr, 0);
 			if (errno != 0 || *endptr != '\0') {
 				(void) fprintf(stderr,
 				    gettext("invalid txg value\n"));
@@ -2900,10 +2900,15 @@ print_one_column(zpool_prop_t prop, uint64_t value, boolean_t scripted)
 	boolean_t fixed;
 	size_t width = zprop_width(prop, &fixed, ZFS_TYPE_POOL);
 
-	zfs_nicenum(value, propval, sizeof (propval));
 
 	if (prop == ZPOOL_PROP_EXPANDSZ && value == 0)
 		(void) strlcpy(propval, "-", sizeof (propval));
+	else if (prop == ZPOOL_PROP_FRAGMENTATION && value == ZFS_FRAG_INVALID)
+		(void) strlcpy(propval, "-", sizeof (propval));
+	else if (prop == ZPOOL_PROP_FRAGMENTATION)
+		(void) snprintf(propval, sizeof (propval), "%llu%%", value);
+	else
+		zfs_nicenum(value, propval, sizeof (propval));
 
 	if (scripted)
 		(void) printf("\t%s", propval);
@@ -2936,9 +2941,9 @@ print_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
 		/* only toplevel vdevs have capacity stats */
 		if (vs->vs_space == 0) {
 			if (scripted)
-				(void) printf("\t-\t-\t-");
+				(void) printf("\t-\t-\t-\t-");
 			else
-				(void) printf("      -      -      -");
+				(void) printf("      -      -      -      -");
 		} else {
 			print_one_column(ZPOOL_PROP_SIZE, vs->vs_space,
 			    scripted);
@@ -2946,6 +2951,8 @@ print_list_stats(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
 			    scripted);
 			print_one_column(ZPOOL_PROP_FREE,
 			    vs->vs_space - vs->vs_alloc, scripted);
+			print_one_column(ZPOOL_PROP_FRAGMENTATION,
+			    vs->vs_fragmentation, scripted);
 		}
 		print_one_column(ZPOOL_PROP_EXPANDSZ, vs->vs_esize,
 		    scripted);
@@ -3031,8 +3038,8 @@ zpool_do_list(int argc, char **argv)
 	int ret;
 	list_cbdata_t cb = { 0 };
 	static char default_props[] =
-	    "name,size,allocated,free,capacity,dedupratio,"
-	    "health,altroot";
+	    "name,size,allocated,free,fragmentation,expandsize,capacity,"
+	    "dedupratio,health,altroot";
 	char *props = default_props;
 	unsigned long interval = 0, count = 0;
 	zpool_list_t *list;
@@ -3076,17 +3083,10 @@ zpool_do_list(int argc, char **argv)
 	if (zprop_get_list(g_zfs, props, &cb.cb_proplist, ZFS_TYPE_POOL) != 0)
 		usage(B_FALSE);
 
-	if ((list = pool_list_get(argc, argv, &cb.cb_proplist, &ret)) == NULL)
-		return (1);
-
-	if (argc == 0 && !cb.cb_scripted && pool_list_count(list) == 0) {
-		(void) printf(gettext("no pools available\n"));
-		zprop_free_list(cb.cb_proplist);
-		return (0);
-	}
-
 	for (;;) {
-		pool_list_update(list);
+		if ((list = pool_list_get(argc, argv, &cb.cb_proplist,
+		    &ret)) == NULL)
+			return (1);
 
 		if (pool_list_count(list) == 0)
 			break;
@@ -3109,9 +3109,16 @@ zpool_do_list(int argc, char **argv)
 		if (count != 0 && --count == 0)
 			break;
 
+		pool_list_free(list);
 		(void) sleep(interval);
 	}
 
+	if (argc == 0 && !cb.cb_scripted && pool_list_count(list) == 0) {
+		(void) printf(gettext("no pools available\n"));
+		ret = 0;
+	}
+
+	pool_list_free(list);
 	zprop_free_list(cb.cb_proplist);
 	return (ret);
 }
@@ -4101,6 +4108,7 @@ status_callback(zpool_handle_t *zhp, void *data)
 	if (cbp->cb_explain &&
 	    (reason == ZPOOL_STATUS_OK ||
 	    reason == ZPOOL_STATUS_VERSION_OLDER ||
+	    reason == ZPOOL_STATUS_NON_NATIVE_ASHIFT ||
 	    reason == ZPOOL_STATUS_FEAT_DISABLED)) {
 		if (!cbp->cb_allpools) {
 			(void) printf(gettext("pool '%s' is healthy\n"),
diff --git a/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c b/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c
index f7a409162537..dce1cb3d765b 100644
--- a/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c
+++ b/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c
@@ -49,7 +49,6 @@
  */
 #define	DUMP_GROUPING	4
 
-uint64_t drr_record_count[DRR_NUMTYPES];
 uint64_t total_write_size = 0;
 uint64_t total_stream_len = 0;
 FILE *send_stream = 0;
@@ -123,7 +122,7 @@ print_block(char *buf, int length)
 	 * Start printing ASCII characters at a constant offset, after
 	 * the hex prints. Leave 3 characters per byte on a line (2 digit
 	 * hex number plus 1 space) plus spaces between characters and
-	 * groupings
+	 * groupings.
 	 */
 	int ascii_start = BYTES_PER_LINE * 3 +
 	    BYTES_PER_LINE / DUMP_GROUPING + 2;
@@ -160,6 +159,8 @@ int
 main(int argc, char *argv[])
 {
 	char *buf = malloc(INITIAL_BUFLEN);
+	uint64_t drr_record_count[DRR_NUMTYPES] = { 0 };
+	uint64_t total_records = 0;
 	dmu_replay_record_t thedrr;
 	dmu_replay_record_t *drr = &thedrr;
 	struct drr_begin *drrb = &thedrr.drr_u.drr_begin;
@@ -170,6 +171,7 @@ main(int argc, char *argv[])
 	struct drr_write_byref *drrwbr = &thedrr.drr_u.drr_write_byref;
 	struct drr_free *drrf = &thedrr.drr_u.drr_free;
 	struct drr_spill *drrs = &thedrr.drr_u.drr_spill;
+	struct drr_write_embedded *drrwe = &thedrr.drr_u.drr_write_embedded;
 	char c;
 	boolean_t verbose = B_FALSE;
 	boolean_t first = B_TRUE;
@@ -264,6 +266,7 @@ main(int argc, char *argv[])
 		}
 
 		drr_record_count[drr->drr_type]++;
+		total_records++;
 
 		switch (drr->drr_type) {
 		case DRR_BEGIN:
@@ -376,8 +379,8 @@ main(int argc, char *argv[])
 				    drro->drr_bonuslen);
 			}
 			if (drro->drr_bonuslen > 0) {
-				(void) ssread(buf, P2ROUNDUP(drro->drr_bonuslen,
-				    8), &zc);
+				(void) ssread(buf,
+				    P2ROUNDUP(drro->drr_bonuslen, 8), &zc);
 				if (dump) {
 					print_block(buf,
 					    P2ROUNDUP(drro->drr_bonuslen, 8));
@@ -506,6 +509,38 @@ main(int argc, char *argv[])
 				print_block(buf, drrs->drr_length);
 			}
 			break;
+		case DRR_WRITE_EMBEDDED:
+			if (do_byteswap) {
+				drrwe->drr_object =
+				    BSWAP_64(drrwe->drr_object);
+				drrwe->drr_offset =
+				    BSWAP_64(drrwe->drr_offset);
+				drrwe->drr_length =
+				    BSWAP_64(drrwe->drr_length);
+				drrwe->drr_toguid =
+				    BSWAP_64(drrwe->drr_toguid);
+				drrwe->drr_lsize =
+				    BSWAP_32(drrwe->drr_lsize);
+				drrwe->drr_psize =
+				    BSWAP_32(drrwe->drr_psize);
+			}
+			if (verbose) {
+				(void) printf("WRITE_EMBEDDED object = %llu "
+				    "offset = %llu length = %llu\n"
+				    "toguid = %llx comp = %u etype = %u "
+				    "lsize = %u psize = %u\n",
+				    (u_longlong_t)drrwe->drr_object,
+				    (u_longlong_t)drrwe->drr_offset,
+				    (u_longlong_t)drrwe->drr_length,
+				    (u_longlong_t)drrwe->drr_toguid,
+				    drrwe->drr_compression,
+				    drrwe->drr_etype,
+				    drrwe->drr_lsize,
+				    drrwe->drr_psize);
+			}
+			(void) ssread(buf,
+			    P2ROUNDUP(drrwe->drr_psize, 8), &zc);
+			break;
 		}
 		pcksum = zc;
 	}
@@ -524,18 +559,16 @@ main(int argc, char *argv[])
 	    (u_longlong_t)drr_record_count[DRR_FREEOBJECTS]);
 	(void) printf("\tTotal DRR_WRITE records = %lld\n",
 	    (u_longlong_t)drr_record_count[DRR_WRITE]);
+	(void) printf("\tTotal DRR_WRITE_BYREF records = %lld\n",
+	    (u_longlong_t)drr_record_count[DRR_WRITE_BYREF]);
+	(void) printf("\tTotal DRR_WRITE_EMBEDDED records = %lld\n",
+	    (u_longlong_t)drr_record_count[DRR_WRITE_EMBEDDED]);
 	(void) printf("\tTotal DRR_FREE records = %lld\n",
 	    (u_longlong_t)drr_record_count[DRR_FREE]);
 	(void) printf("\tTotal DRR_SPILL records = %lld\n",
 	    (u_longlong_t)drr_record_count[DRR_SPILL]);
 	(void) printf("\tTotal records = %lld\n",
-	    (u_longlong_t)(drr_record_count[DRR_BEGIN] +
-	    drr_record_count[DRR_OBJECT] +
-	    drr_record_count[DRR_FREEOBJECTS] +
-	    drr_record_count[DRR_WRITE] +
-	    drr_record_count[DRR_FREE] +
-	    drr_record_count[DRR_SPILL] +
-	    drr_record_count[DRR_END]));
+	    (u_longlong_t)total_records);
 	(void) printf("\tTotal write size = %lld (0x%llx)\n",
 	    (u_longlong_t)total_write_size, (u_longlong_t)total_write_size);
 	(void) printf("\tTotal stream length = %lld (0x%llx)\n",
diff --git a/cddl/contrib/opensolaris/cmd/ztest/ztest.c b/cddl/contrib/opensolaris/cmd/ztest/ztest.c
index 6e028c3f5a31..5ed87ce13717 100644
--- a/cddl/contrib/opensolaris/cmd/ztest/ztest.c
+++ b/cddl/contrib/opensolaris/cmd/ztest/ztest.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>.  All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
@@ -53,7 +53,7 @@
  *     At random times, the child self-immolates with a SIGKILL.
  *     This is the software equivalent of pulling the power cord.
  *     The parent then runs the test again, using the existing
- *     storage pool, as many times as desired. If backwards compatability
+ *     storage pool, as many times as desired. If backwards compatibility
  *     testing is enabled ztest will sometimes run the "older" version
  *     of ztest after a SIGKILL.
  *
@@ -172,7 +172,7 @@ static const ztest_shared_opts_t ztest_opts_defaults = {
 	.zo_mirrors = 2,
 	.zo_raidz = 4,
 	.zo_raidz_parity = 1,
-	.zo_vdev_size = SPA_MINDEVSIZE,
+	.zo_vdev_size = SPA_MINDEVSIZE * 2,
 	.zo_datasets = 7,
 	.zo_threads = 23,
 	.zo_passtime = 60,		/* 60 seconds */
@@ -187,6 +187,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_ms;
+extern int metaslab_preload_limit;
 
 static ztest_shared_opts_t *ztest_shared_opts;
 static ztest_shared_opts_t ztest_opts;
@@ -809,7 +810,7 @@ static uint64_t
 ztest_get_ashift(void)
 {
 	if (ztest_opts.zo_ashift == 0)
-		return (SPA_MINBLOCKSHIFT + ztest_random(3));
+		return (SPA_MINBLOCKSHIFT + ztest_random(5));
 	return (ztest_opts.zo_ashift);
 }
 
@@ -968,11 +969,28 @@ ztest_random_spa_version(uint64_t initial_version)
 	return (version);
 }
 
+/*
+ * Find the largest ashift used
+ */
+static uint64_t
+ztest_spa_get_ashift() {
+	uint64_t i;
+	uint64_t ashift = SPA_MINBLOCKSHIFT;
+	vdev_t *rvd = ztest_spa->spa_root_vdev;
+
+	for (i = 0; i < rvd->vdev_children; i++) {
+		ashift = MAX(ashift, rvd->vdev_child[i]->vdev_ashift);
+	}
+	return (ashift);
+}
+
 static int
 ztest_random_blocksize(void)
 {
-	return (1 << (SPA_MINBLOCKSHIFT +
-	    ztest_random(SPA_MAXBLOCKSHIFT - SPA_MINBLOCKSHIFT + 1)));
+	// Choose a block size >= the ashift.
+	uint64_t block_shift =
+	    ztest_random(SPA_MAXBLOCKSHIFT - ztest_spa_get_ashift() + 1);
+	return (1 << (SPA_MINBLOCKSHIFT + block_shift));
 }
 
 static int
@@ -1267,13 +1285,13 @@ static void
 ztest_bt_verify(ztest_block_tag_t *bt, objset_t *os, uint64_t object,
     uint64_t offset, uint64_t gen, uint64_t txg, uint64_t crtxg)
 {
-	ASSERT(bt->bt_magic == BT_MAGIC);
-	ASSERT(bt->bt_objset == dmu_objset_id(os));
-	ASSERT(bt->bt_object == object);
-	ASSERT(bt->bt_offset == offset);
-	ASSERT(bt->bt_gen <= gen);
-	ASSERT(bt->bt_txg <= txg);
-	ASSERT(bt->bt_crtxg == crtxg);
+	ASSERT3U(bt->bt_magic, ==, BT_MAGIC);
+	ASSERT3U(bt->bt_objset, ==, dmu_objset_id(os));
+	ASSERT3U(bt->bt_object, ==, object);
+	ASSERT3U(bt->bt_offset, ==, offset);
+	ASSERT3U(bt->bt_gen, <=, gen);
+	ASSERT3U(bt->bt_txg, <=, txg);
+	ASSERT3U(bt->bt_crtxg, ==, crtxg);
 }
 
 static ztest_block_tag_t *
@@ -3472,6 +3490,11 @@ ztest_dsl_dataset_promote_busy(ztest_ds_t *zd, uint64_t id)
 	if (error)
 		fatal(0, "dmu_objset_own(%s) = %d", snap2name, error);
 	error = dsl_dataset_promote(clone2name, NULL);
+	if (error == ENOSPC) {
+		dmu_objset_disown(os, FTAG);
+		ztest_record_enospc(FTAG);
+		goto out;
+	}
 	if (error != EBUSY)
 		fatal(0, "dsl_dataset_promote(%s), %d, not EBUSY", clone2name,
 		    error);
@@ -3627,11 +3650,19 @@ ztest_dmu_read_write(ztest_ds_t *zd, uint64_t id)
 		return;
 	}
 
-	dmu_object_set_checksum(os, bigobj,
-	    (enum zio_checksum)ztest_random_dsl_prop(ZFS_PROP_CHECKSUM), tx);
+	enum zio_checksum cksum;
+	do {
+		cksum = (enum zio_checksum)
+		    ztest_random_dsl_prop(ZFS_PROP_CHECKSUM);
+	} while (cksum >= ZIO_CHECKSUM_LEGACY_FUNCTIONS);
+	dmu_object_set_checksum(os, bigobj, cksum, tx);
 
-	dmu_object_set_compress(os, bigobj,
-	    (enum zio_compress)ztest_random_dsl_prop(ZFS_PROP_COMPRESSION), tx);
+	enum zio_compress comp;
+	do {
+		comp = (enum zio_compress)
+		    ztest_random_dsl_prop(ZFS_PROP_COMPRESSION);
+	} while (comp >= ZIO_COMPRESS_LEGACY_FUNCTIONS);
+	dmu_object_set_compress(os, bigobj, comp, tx);
 
 	/*
 	 * For each index from n to n + s, verify that the existing bufwad
@@ -4711,8 +4742,13 @@ ztest_dmu_snapshot_hold(ztest_ds_t *zd, uint64_t id)
 	error = dsl_dataset_user_hold(holds, 0, NULL);
 	fnvlist_free(holds);
 
-	if (error)
-		fatal(0, "dsl_dataset_user_hold(%s)", fullname, tag);
+	if (error == ENOSPC) {
+		ztest_record_enospc("dsl_dataset_user_hold");
+		goto out;
+	} else if (error) {
+		fatal(0, "dsl_dataset_user_hold(%s, %s) = %u",
+		    fullname, tag, error);
+	}
 
 	error = dsl_destroy_snapshot(fullname, B_FALSE);
 	if (error != EBUSY) {
@@ -5165,7 +5201,7 @@ ztest_run_zdb(char *pool)
 	isa = strdup(isa);
 	/* LINTED */
 	(void) sprintf(bin,
-	    "/usr/sbin%.*s/zdb -bcc%s%s -U %s %s",
+	    "/usr/sbin%.*s/zdb -bcc%s%s -d -U %s %s",
 	    isalen,
 	    isa,
 	    ztest_opts.zo_verbose >= 3 ? "s" : "",
@@ -5578,6 +5614,7 @@ ztest_run(ztest_shared_t *zs)
 	kernel_init(FREAD | FWRITE);
 	VERIFY0(spa_open(ztest_opts.zo_pool, &spa, FTAG));
 	spa->spa_debug = B_TRUE;
+	metaslab_preload_limit = ztest_random(20) + 1;
 	ztest_spa = spa;
 
 	VERIFY0(dmu_objset_own(ztest_opts.zo_pool,
@@ -5747,17 +5784,31 @@ ztest_freeze(void)
 	 */
 	spa_freeze(spa);
 
+	/*
+	 * Because it is hard to predict how much space a write will actually
+	 * require beforehand, we leave ourselves some fudge space to write over
+	 * capacity.
+	 */
+	uint64_t capacity = metaslab_class_get_space(spa_normal_class(spa)) / 2;
+
 	/*
 	 * Run tests that generate log records but don't alter the pool config
 	 * or depend on DSL sync tasks (snapshots, objset create/destroy, etc).
 	 * We do a txg_wait_synced() after each iteration to force the txg
 	 * to increase well beyond the last synced value in the uberblock.
 	 * The ZIL should be OK with that.
+	 *
+	 * Run a random number of times less than zo_maxloops and ensure we do
+	 * not run out of space on the pool.
 	 */
 	while (ztest_random(10) != 0 &&
-	    numloops++ < ztest_opts.zo_maxloops) {
-		ztest_dmu_write_parallel(zd, 0);
-		ztest_dmu_object_alloc_free(zd, 0);
+	    numloops++ < ztest_opts.zo_maxloops &&
+	    metaslab_class_get_alloc(spa_normal_class(spa)) < capacity) {
+		ztest_od_t od;
+		ztest_od_init(&od, 0, FTAG, 0, DMU_OT_UINT64_OTHER, 0, 0);
+		VERIFY0(ztest_object_init(zd, &od, sizeof (od), B_FALSE));
+		ztest_io(zd, od.od_object,
+		    ztest_random(ZTEST_RANGE_LOCKS) << SPA_MAXBLOCKSHIFT);
 		txg_wait_synced(spa_get_dsl(spa), 0);
 	}
 
diff --git a/cddl/contrib/opensolaris/common/avl/avl.c b/cddl/contrib/opensolaris/common/avl/avl.c
index dd39c12d215e..4223da49915c 100644
--- a/cddl/contrib/opensolaris/common/avl/avl.c
+++ b/cddl/contrib/opensolaris/common/avl/avl.c
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2014 by Delphix. All rights reserved.
+ */
+
 /*
  * AVL - generic AVL tree implementation for kernel use
  *
@@ -37,7 +41,7 @@
  * insertion and deletion relatively efficiently. Searching the tree is
  * still a fast operation, roughly O(log(N)).
  *
- * The key to insertion and deletion is a set of tree maniuplations called
+ * The key to insertion and deletion is a set of tree manipulations called
  * rotations, which bring unbalanced subtrees back into the semi-balanced state.
  *
  * This implementation of AVL trees has the following peculiarities:
@@ -45,7 +49,7 @@
  *	- The AVL specific data structures are physically embedded as fields
  *	  in the "using" data structures.  To maintain generality the code
  *	  must constantly translate between "avl_node_t *" and containing
- *	  data structure "void *"s by adding/subracting the avl_offset.
+ *	  data structure "void *"s by adding/subtracting the avl_offset.
  *
  *	- Since the AVL data is always embedded in other structures, there is
  *	  no locking or memory allocation in the AVL routines. This must be
@@ -85,6 +89,12 @@
  *	  is a modified "avl_node_t *".  The bottom bit (normally 0 for a
  *	  pointer) is set to indicate if that the new node has a value greater
  *	  than the value of the indicated "avl_node_t *".
+ *
+ * Note - in addition to userland (e.g. libavl and libutil) and the kernel
+ * (e.g. genunix), avl.c is compiled into ld.so and kmdb's genunix module,
+ * which each have their own compilation environments and subsequent
+ * requirements. Each of these environments must be considered when adding
+ * dependencies from avl.c.
  */
 
 #include <sys/types.h>
@@ -94,7 +104,7 @@
 #include <sys/cmn_err.h>
 
 /*
- * Small arrays to translate between balance (or diff) values and child indeces.
+ * Small arrays to translate between balance (or diff) values and child indices.
  *
  * Code that deals with binary tree data structures will randomly use
  * left and right children when examining a tree.  C "if()" statements
@@ -114,7 +124,8 @@ static const int  avl_balance2child[]	= {0, 0, 1};
  *
  * - If there is a left child, go to it, then to it's rightmost descendant.
  *
- * - otherwise we return thru parent nodes until we've come from a right child.
+ * - otherwise we return through parent nodes until we've come from a right
+ *   child.
  *
  * Return Value:
  * NULL - if at the end of the nodes
@@ -863,6 +874,24 @@ avl_update(avl_tree_t *t, void *obj)
 	return (B_FALSE);
 }
 
+void
+avl_swap(avl_tree_t *tree1, avl_tree_t *tree2)
+{
+	avl_node_t *temp_node;
+	ulong_t temp_numnodes;
+
+	ASSERT3P(tree1->avl_compar, ==, tree2->avl_compar);
+	ASSERT3U(tree1->avl_offset, ==, tree2->avl_offset);
+	ASSERT3U(tree1->avl_size, ==, tree2->avl_size);
+
+	temp_node = tree1->avl_root;
+	temp_numnodes = tree1->avl_numnodes;
+	tree1->avl_root = tree2->avl_root;
+	tree1->avl_numnodes = tree2->avl_numnodes;
+	tree2->avl_root = temp_node;
+	tree2->avl_numnodes = temp_numnodes;
+}
+
 /*
  * initialize a new AVL tree
  */
@@ -919,7 +948,7 @@ avl_is_empty(avl_tree_t *tree)
 
 /*
  * Post-order tree walk used to visit all tree nodes and destroy the tree
- * in post order. This is used for destroying a tree w/o paying any cost
+ * in post order. This is used for destroying a tree without paying any cost
  * for rebalancing it.
  *
  * example:
diff --git a/cddl/contrib/opensolaris/common/ctf/ctf_open.c b/cddl/contrib/opensolaris/common/ctf/ctf_open.c
index 2148389fff80..001cf5c59104 100644
--- a/cddl/contrib/opensolaris/common/ctf/ctf_open.c
+++ b/cddl/contrib/opensolaris/common/ctf/ctf_open.c
@@ -25,7 +25,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2012, Joyent, Inc.  All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc.  All rights reserved.
  */
 
 #include <ctf_impl.h>
@@ -787,6 +787,92 @@ ctf_bufopen(const ctf_sect_t *ctfsect, const ctf_sect_t *symsect,
 	return (NULL);
 }
 
+/*
+ * Dupliate a ctf_file_t and its underlying section information into a new
+ * container. This works by copying the three ctf_sect_t's of the original
+ * container if they exist and passing those into ctf_bufopen. To copy those, we
+ * mmap anonymous memory with ctf_data_alloc and bcopy the data across. It's not
+ * the cheapest thing, but it's what we've got.
+ */
+ctf_file_t *
+ctf_dup(ctf_file_t *ofp)
+{
+	ctf_file_t *fp;
+	ctf_sect_t ctfsect, symsect, strsect;
+	ctf_sect_t *ctp, *symp, *strp;
+	void *cbuf, *symbuf, *strbuf;
+	int err;
+
+	cbuf = symbuf = strbuf = NULL;
+	/*
+	 * The ctfsect isn't allowed to not exist, but the symbol and string
+	 * section might not. We only need to copy the data of the section, not
+	 * the name, as ctf_bufopen will take care of that.
+	 */
+	bcopy(&ofp->ctf_data, &ctfsect, sizeof (ctf_sect_t));
+	cbuf = ctf_data_alloc(ctfsect.cts_size);
+	if (cbuf == NULL) {
+		(void) ctf_set_errno(ofp, ECTF_MMAP);
+		return (NULL);
+	}
+
+	bcopy(ctfsect.cts_data, cbuf, ctfsect.cts_size);
+	ctf_data_protect(cbuf, ctfsect.cts_size);
+	ctfsect.cts_data = cbuf;
+	ctfsect.cts_offset = 0;
+	ctp = &ctfsect;
+
+	if (ofp->ctf_symtab.cts_data != NULL) {
+		bcopy(&ofp->ctf_symtab, &symsect, sizeof (ctf_sect_t));
+		symbuf = ctf_data_alloc(symsect.cts_size);
+		if (symbuf == NULL) {
+			(void) ctf_set_errno(ofp, ECTF_MMAP);
+			goto err;
+		}
+		bcopy(symsect.cts_data, symbuf, symsect.cts_size);
+		ctf_data_protect(symbuf, symsect.cts_size);
+		symsect.cts_data = symbuf;
+		symsect.cts_offset = 0;
+		symp = &symsect;
+	} else {
+		symp = NULL;
+	}
+
+	if (ofp->ctf_strtab.cts_data != NULL) {
+		bcopy(&ofp->ctf_strtab, &strsect, sizeof (ctf_sect_t));
+		strbuf = ctf_data_alloc(strsect.cts_size);
+		if (strbuf == NULL) {
+			(void) ctf_set_errno(ofp, ECTF_MMAP);
+			goto err;
+		}
+		bcopy(strsect.cts_data, strbuf, strsect.cts_size);
+		ctf_data_protect(strbuf, strsect.cts_size);
+		strsect.cts_data = strbuf;
+		strsect.cts_offset = 0;
+		strp = &strsect;
+	} else {
+		strp = NULL;
+	}
+
+	fp = ctf_bufopen(ctp, symp, strp, &err);
+	if (fp == NULL) {
+		(void) ctf_set_errno(ofp, err);
+		goto err;
+	}
+
+	fp->ctf_flags |= LCTF_MMAP;
+
+	return (fp);
+
+err:
+	ctf_data_free(cbuf, ctfsect.cts_size);
+	if (symbuf != NULL)
+		ctf_data_free(symbuf, symsect.cts_size);
+	if (strbuf != NULL)
+		ctf_data_free(strbuf, strsect.cts_size);
+	return (NULL);
+}
+
 /*
  * Close the specified CTF container and free associated data structures.  Note
  * that ctf_close() is a reference counted operation: if the specified file is
diff --git a/cddl/contrib/opensolaris/common/ctf/ctf_types.c b/cddl/contrib/opensolaris/common/ctf/ctf_types.c
index 290c518ae72b..ab1b9ff14bd2 100644
--- a/cddl/contrib/opensolaris/common/ctf/ctf_types.c
+++ b/cddl/contrib/opensolaris/common/ctf/ctf_types.c
@@ -25,8 +25,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <ctf_impl.h>
 
 ssize_t
@@ -199,8 +197,9 @@ ctf_type_resolve(ctf_file_t *fp, ctf_id_t type)
  * Lookup the given type ID and print a string name for it into buf.  Return
  * the actual number of bytes (not including \0) needed to format the name.
  */
-ssize_t
-ctf_type_lname(ctf_file_t *fp, ctf_id_t type, char *buf, size_t len)
+static ssize_t
+ctf_type_qlname(ctf_file_t *fp, ctf_id_t type, char *buf, size_t len,
+    const char *qname)
 {
 	ctf_decl_t cd;
 	ctf_decl_node_t *cdp;
@@ -255,6 +254,8 @@ ctf_type_lname(ctf_file_t *fp, ctf_id_t type, char *buf, size_t len)
 			case CTF_K_INTEGER:
 			case CTF_K_FLOAT:
 			case CTF_K_TYPEDEF:
+				if (qname != NULL)
+					ctf_decl_sprintf(&cd, "%s`", qname);
 				ctf_decl_sprintf(&cd, "%s", name);
 				break;
 			case CTF_K_POINTER:
@@ -268,13 +269,22 @@ ctf_type_lname(ctf_file_t *fp, ctf_id_t type, char *buf, size_t len)
 				break;
 			case CTF_K_STRUCT:
 			case CTF_K_FORWARD:
-				ctf_decl_sprintf(&cd, "struct %s", name);
+				ctf_decl_sprintf(&cd, "struct ");
+				if (qname != NULL)
+					ctf_decl_sprintf(&cd, "%s`", qname);
+				ctf_decl_sprintf(&cd, "%s", name);
 				break;
 			case CTF_K_UNION:
-				ctf_decl_sprintf(&cd, "union %s", name);
+				ctf_decl_sprintf(&cd, "union ");
+				if (qname != NULL)
+					ctf_decl_sprintf(&cd, "%s`", qname);
+				ctf_decl_sprintf(&cd, "%s", name);
 				break;
 			case CTF_K_ENUM:
-				ctf_decl_sprintf(&cd, "enum %s", name);
+				ctf_decl_sprintf(&cd, "enum ");
+				if (qname != NULL)
+					ctf_decl_sprintf(&cd, "%s`", qname);
+				ctf_decl_sprintf(&cd, "%s", name);
 				break;
 			case CTF_K_VOLATILE:
 				ctf_decl_sprintf(&cd, "volatile");
@@ -301,6 +311,12 @@ ctf_type_lname(ctf_file_t *fp, ctf_id_t type, char *buf, size_t len)
 	return (cd.cd_len);
 }
 
+ssize_t
+ctf_type_lname(ctf_file_t *fp, ctf_id_t type, char *buf, size_t len)
+{
+	return (ctf_type_qlname(fp, type, buf, len, NULL));
+}
+
 /*
  * Lookup the given type ID and print a string name for it into buf.  If buf
  * is too small, return NULL: the ECTF_NAMELEN error is set on 'fp' for us.
@@ -308,10 +324,19 @@ ctf_type_lname(ctf_file_t *fp, ctf_id_t type, char *buf, size_t len)
 char *
 ctf_type_name(ctf_file_t *fp, ctf_id_t type, char *buf, size_t len)
 {
-	ssize_t rv = ctf_type_lname(fp, type, buf, len);
+	ssize_t rv = ctf_type_qlname(fp, type, buf, len, NULL);
 	return (rv >= 0 && rv < len ? buf : NULL);
 }
 
+char *
+ctf_type_qname(ctf_file_t *fp, ctf_id_t type, char *buf, size_t len,
+    const char *qname)
+{
+	ssize_t rv = ctf_type_qlname(fp, type, buf, len, qname);
+	return (rv >= 0 && rv < len ? buf : NULL);
+}
+
+
 /*
  * Resolve the type down to a base type node, and then return the size
  * of the type storage in bytes.
diff --git a/cddl/contrib/opensolaris/common/util/strtolctype.h b/cddl/contrib/opensolaris/common/util/strtolctype.h
new file mode 100644
index 000000000000..a1d18367d345
--- /dev/null
+++ b/cddl/contrib/opensolaris/common/util/strtolctype.h
@@ -0,0 +1,79 @@
+/*
+ * 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) 1988 AT&T	*/
+/*	  All Rights Reserved  	*/
+
+#ifndef	_COMMON_UTIL_CTYPE_H
+#define	_COMMON_UTIL_CTYPE_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/*
+ * This header file contains a collection of macros that the strtou?ll?
+ * functions in common/util use to test characters.  What we need is a kernel
+ * version of ctype.h.
+ *
+ * NOTE: These macros are used within several DTrace probe context functions.
+ * They must not be altered to make function calls or perform actions not
+ * safe in probe context.
+ */
+
+#if defined(sun) &&	(defined(_KERNEL) || defined(_BOOT))
+
+#define	isalnum(ch)	(isalpha(ch) || isdigit(ch))
+#define	isalpha(ch)	(isupper(ch) || islower(ch))
+#define	isdigit(ch)	((ch) >= '0' && (ch) <= '9')
+#define	islower(ch)	((ch) >= 'a' && (ch) <= 'z')
+#define	isspace(ch)	(((ch) == ' ') || ((ch) == '\r') || ((ch) == '\n') || \
+			((ch) == '\t') || ((ch) == '\f'))
+#define	isupper(ch)	((ch) >= 'A' && (ch) <= 'Z')
+#define	isxdigit(ch)	(isdigit(ch) || ((ch) >= 'a' && (ch) <= 'f') || \
+			((ch) >= 'A' && (ch) <= 'F'))
+
+#endif	/* _KERNEL || _BOOT */
+
+#define	DIGIT(x)	\
+	(isdigit(x) ? (x) - '0' : islower(x) ? (x) + 10 - 'a' : (x) + 10 - 'A')
+
+#define	MBASE	('z' - 'a' + 1 + 10)
+
+/*
+ * The following macro is a version of isalnum() that limits alphabetic
+ * characters to the ranges a-z and A-Z; locale dependent characters will not
+ * return 1.  The members of a-z and A-Z are assumed to be in ascending order
+ * and contiguous.
+ */
+#define	lisalnum(x)	\
+	(isdigit(x) || ((x) >= 'a' && (x) <= 'z') || ((x) >= 'A' && (x) <= 'Z'))
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _COMMON_UTIL_CTYPE_H */
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c
index b0f2b4a1af32..6b571fafdd04 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c
@@ -25,7 +25,7 @@
  */
 
 /*
- * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
@@ -1300,6 +1300,231 @@ dtrace_aggregate_walk(dtrace_hdl_t *dtp, dtrace_aggregate_f *func, void *arg)
 	return (0);
 }
 
+static int
+dt_aggregate_total(dtrace_hdl_t *dtp, boolean_t clear)
+{
+	dt_ahashent_t *h;
+	dtrace_aggdata_t **total;
+	dtrace_aggid_t max = DTRACE_AGGVARIDNONE, id;
+	dt_aggregate_t *agp = &dtp->dt_aggregate;
+	dt_ahash_t *hash = &agp->dtat_hash;
+	uint32_t tflags;
+
+	tflags = DTRACE_A_TOTAL | DTRACE_A_HASNEGATIVES | DTRACE_A_HASPOSITIVES;
+
+	/*
+	 * If we need to deliver per-aggregation totals, we're going to take
+	 * three passes over the aggregate:  one to clear everything out and
+	 * determine our maximum aggregation ID, one to actually total
+	 * everything up, and a final pass to assign the totals to the
+	 * individual elements.
+	 */
+	for (h = hash->dtah_all; h != NULL; h = h->dtahe_nextall) {
+		dtrace_aggdata_t *aggdata = &h->dtahe_data;
+
+		if ((id = dt_aggregate_aggvarid(h)) > max)
+			max = id;
+
+		aggdata->dtada_total = 0;
+		aggdata->dtada_flags &= ~tflags;
+	}
+
+	if (clear || max == DTRACE_AGGVARIDNONE)
+		return (0);
+
+	total = dt_zalloc(dtp, (max + 1) * sizeof (dtrace_aggdata_t *));
+
+	if (total == NULL)
+		return (-1);
+
+	for (h = hash->dtah_all; h != NULL; h = h->dtahe_nextall) {
+		dtrace_aggdata_t *aggdata = &h->dtahe_data;
+		dtrace_aggdesc_t *agg = aggdata->dtada_desc;
+		dtrace_recdesc_t *rec;
+		caddr_t data;
+		int64_t val, *addr;
+
+		rec = &agg->dtagd_rec[agg->dtagd_nrecs - 1];
+		data = aggdata->dtada_data;
+		addr = (int64_t *)(uintptr_t)(data + rec->dtrd_offset);
+
+		switch (rec->dtrd_action) {
+		case DTRACEAGG_STDDEV:
+			val = dt_stddev((uint64_t *)addr, 1);
+			break;
+
+		case DTRACEAGG_SUM:
+		case DTRACEAGG_COUNT:
+			val = *addr;
+			break;
+
+		case DTRACEAGG_AVG:
+			val = addr[0] ? (addr[1] / addr[0]) : 0;
+			break;
+
+		default:
+			continue;
+		}
+
+		if (total[agg->dtagd_varid] == NULL) {
+			total[agg->dtagd_varid] = aggdata;
+			aggdata->dtada_flags |= DTRACE_A_TOTAL;
+		} else {
+			aggdata = total[agg->dtagd_varid];
+		}
+
+		if (val > 0)
+			aggdata->dtada_flags |= DTRACE_A_HASPOSITIVES;
+
+		if (val < 0) {
+			aggdata->dtada_flags |= DTRACE_A_HASNEGATIVES;
+			val = -val;
+		}
+
+		if (dtp->dt_options[DTRACEOPT_AGGZOOM] != DTRACEOPT_UNSET) {
+			val = (int64_t)((long double)val *
+			    (1 / DTRACE_AGGZOOM_MAX));
+
+			if (val > aggdata->dtada_total)
+				aggdata->dtada_total = val;
+		} else {
+			aggdata->dtada_total += val;
+		}
+	}
+
+	/*
+	 * And now one final pass to set everyone's total.
+	 */
+	for (h = hash->dtah_all; h != NULL; h = h->dtahe_nextall) {
+		dtrace_aggdata_t *aggdata = &h->dtahe_data, *t;
+		dtrace_aggdesc_t *agg = aggdata->dtada_desc;
+
+		if ((t = total[agg->dtagd_varid]) == NULL || aggdata == t)
+			continue;
+
+		aggdata->dtada_total = t->dtada_total;
+		aggdata->dtada_flags |= (t->dtada_flags & tflags);
+	}
+
+	dt_free(dtp, total);
+
+	return (0);
+}
+
+static int
+dt_aggregate_minmaxbin(dtrace_hdl_t *dtp, boolean_t clear)
+{
+	dt_ahashent_t *h;
+	dtrace_aggdata_t **minmax;
+	dtrace_aggid_t max = DTRACE_AGGVARIDNONE, id;
+	dt_aggregate_t *agp = &dtp->dt_aggregate;
+	dt_ahash_t *hash = &agp->dtat_hash;
+
+	for (h = hash->dtah_all; h != NULL; h = h->dtahe_nextall) {
+		dtrace_aggdata_t *aggdata = &h->dtahe_data;
+
+		if ((id = dt_aggregate_aggvarid(h)) > max)
+			max = id;
+
+		aggdata->dtada_minbin = 0;
+		aggdata->dtada_maxbin = 0;
+		aggdata->dtada_flags &= ~DTRACE_A_MINMAXBIN;
+	}
+
+	if (clear || max == DTRACE_AGGVARIDNONE)
+		return (0);
+
+	minmax = dt_zalloc(dtp, (max + 1) * sizeof (dtrace_aggdata_t *));
+
+	if (minmax == NULL)
+		return (-1);
+
+	for (h = hash->dtah_all; h != NULL; h = h->dtahe_nextall) {
+		dtrace_aggdata_t *aggdata = &h->dtahe_data;
+		dtrace_aggdesc_t *agg = aggdata->dtada_desc;
+		dtrace_recdesc_t *rec;
+		caddr_t data;
+		int64_t *addr;
+		int minbin = -1, maxbin = -1, i;
+		int start = 0, size;
+
+		rec = &agg->dtagd_rec[agg->dtagd_nrecs - 1];
+		size = rec->dtrd_size / sizeof (int64_t);
+		data = aggdata->dtada_data;
+		addr = (int64_t *)(uintptr_t)(data + rec->dtrd_offset);
+
+		switch (rec->dtrd_action) {
+		case DTRACEAGG_LQUANTIZE:
+			/*
+			 * For lquantize(), we always display the entire range
+			 * of the aggregation when aggpack is set.
+			 */
+			start = 1;
+			minbin = start;
+			maxbin = size - 1 - start;
+			break;
+
+		case DTRACEAGG_QUANTIZE:
+			for (i = start; i < size; i++) {
+				if (!addr[i])
+					continue;
+
+				if (minbin == -1)
+					minbin = i - start;
+
+				maxbin = i - start;
+			}
+
+			if (minbin == -1) {
+				/*
+				 * If we have no data (e.g., due to a clear()
+				 * or negative increments), we'll use the
+				 * zero bucket as both our min and max.
+				 */
+				minbin = maxbin = DTRACE_QUANTIZE_ZEROBUCKET;
+			}
+
+			break;
+
+		default:
+			continue;
+		}
+
+		if (minmax[agg->dtagd_varid] == NULL) {
+			minmax[agg->dtagd_varid] = aggdata;
+			aggdata->dtada_flags |= DTRACE_A_MINMAXBIN;
+			aggdata->dtada_minbin = minbin;
+			aggdata->dtada_maxbin = maxbin;
+			continue;
+		}
+
+		if (minbin < minmax[agg->dtagd_varid]->dtada_minbin)
+			minmax[agg->dtagd_varid]->dtada_minbin = minbin;
+
+		if (maxbin > minmax[agg->dtagd_varid]->dtada_maxbin)
+			minmax[agg->dtagd_varid]->dtada_maxbin = maxbin;
+	}
+
+	/*
+	 * And now one final pass to set everyone's minbin and maxbin.
+	 */
+	for (h = hash->dtah_all; h != NULL; h = h->dtahe_nextall) {
+		dtrace_aggdata_t *aggdata = &h->dtahe_data, *mm;
+		dtrace_aggdesc_t *agg = aggdata->dtada_desc;
+
+		if ((mm = minmax[agg->dtagd_varid]) == NULL || aggdata == mm)
+			continue;
+
+		aggdata->dtada_minbin = mm->dtada_minbin;
+		aggdata->dtada_maxbin = mm->dtada_maxbin;
+		aggdata->dtada_flags |= DTRACE_A_MINMAXBIN;
+	}
+
+	dt_free(dtp, minmax);
+
+	return (0);
+}
+
 static int
 dt_aggregate_walk_sorted(dtrace_hdl_t *dtp,
     dtrace_aggregate_f *func, void *arg,
@@ -1309,6 +1534,23 @@ dt_aggregate_walk_sorted(dtrace_hdl_t *dtp,
 	dt_ahashent_t *h, **sorted;
 	dt_ahash_t *hash = &agp->dtat_hash;
 	size_t i, nentries = 0;
+	int rval = -1;
+
+	agp->dtat_flags &= ~(DTRACE_A_TOTAL | DTRACE_A_MINMAXBIN);
+
+	if (dtp->dt_options[DTRACEOPT_AGGHIST] != DTRACEOPT_UNSET) {
+		agp->dtat_flags |= DTRACE_A_TOTAL;
+
+		if (dt_aggregate_total(dtp, B_FALSE) != 0)
+			return (-1);
+	}
+
+	if (dtp->dt_options[DTRACEOPT_AGGPACK] != DTRACEOPT_UNSET) {
+		agp->dtat_flags |= DTRACE_A_MINMAXBIN;
+
+		if (dt_aggregate_minmaxbin(dtp, B_FALSE) != 0)
+			return (-1);
+	}
 
 	for (h = hash->dtah_all; h != NULL; h = h->dtahe_nextall)
 		nentries++;
@@ -1316,7 +1558,7 @@ dt_aggregate_walk_sorted(dtrace_hdl_t *dtp,
 	sorted = dt_alloc(dtp, nentries * sizeof (dt_ahashent_t *));
 
 	if (sorted == NULL)
-		return (-1);
+		goto out;
 
 	for (h = hash->dtah_all, i = 0; h != NULL; h = h->dtahe_nextall)
 		sorted[i++] = h;
@@ -1340,14 +1582,20 @@ dt_aggregate_walk_sorted(dtrace_hdl_t *dtp,
 	for (i = 0; i < nentries; i++) {
 		h = sorted[i];
 
-		if (dt_aggwalk_rval(dtp, h, func(&h->dtahe_data, arg)) == -1) {
-			dt_free(dtp, sorted);
-			return (-1);
-		}
+		if (dt_aggwalk_rval(dtp, h, func(&h->dtahe_data, arg)) == -1)
+			goto out;
 	}
 
+	rval = 0;
+out:
+	if (agp->dtat_flags & DTRACE_A_TOTAL)
+		(void) dt_aggregate_total(dtp, B_TRUE);
+
+	if (agp->dtat_flags & DTRACE_A_MINMAXBIN)
+		(void) dt_aggregate_minmaxbin(dtp, B_TRUE);
+
 	dt_free(dtp, sorted);
-	return (0);
+	return (rval);
 }
 
 int
@@ -1870,6 +2118,8 @@ dtrace_aggregate_print(dtrace_hdl_t *dtp, FILE *fp,
 {
 	dt_print_aggdata_t pd;
 
+	bzero(&pd, sizeof (pd));
+
 	pd.dtpa_dtp = dtp;
 	pd.dtpa_fp = fp;
 	pd.dtpa_allunprint = 1;
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_as.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_as.c
index 457b8fd7219c..f937261c3541 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_as.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_as.c
@@ -23,8 +23,10 @@
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Joyent, Inc. All rights reserved.
+ */
 
 #include <sys/types.h>
 #include <strings.h>
@@ -125,7 +127,7 @@ dt_copyvar(dt_idhash_t *dhp, dt_ident_t *idp, void *data)
 		dvp->dtdv_flags |= DIFV_F_MOD;
 
 	bzero(&dn, sizeof (dn));
-	dt_node_type_assign(&dn, idp->di_ctfp, idp->di_type);
+	dt_node_type_assign(&dn, idp->di_ctfp, idp->di_type, B_FALSE);
 	dt_node_diftype(pcb->pcb_hdl, &dn, &dvp->dtdv_type);
 
 	idp->di_flags &= ~(DT_IDFLG_DIFR | DT_IDFLG_DIFW);
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
index 64b98c4527bf..35b8f0289b9f 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, Joyent Inc. All rights reserved.
+ * Copyright (c) 2013, Joyent Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
@@ -663,6 +663,8 @@ dt_action_printflike(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp,
 static void
 dt_action_trace(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
 {
+	int ctflib;
+
 	dtrace_actdesc_t *ap = dt_stmt_action(dtp, sdp);
 	boolean_t istrace = (dnp->dn_ident->di_id == DT_ACT_TRACE);
 	const char *act = istrace ?  "trace" : "print";
@@ -694,7 +696,10 @@ dt_action_trace(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
 	 * like arrays and function pointers that can't be resolved by
 	 * ctf_type_lookup().  This is later processed by dtrace_dof_create()
 	 * and turned into a reference into the string table so that we can
-	 * get the type information when we process the data after the fact.
+	 * get the type information when we process the data after the fact.  In
+	 * the case where we are referring to userland CTF data, we also need to
+	 * to identify which ctf container in question we care about and encode
+	 * that within the name.
 	 */
 	if (dnp->dn_ident->di_id == DT_ACT_PRINT) {
 		dt_node_t *dret;
@@ -705,11 +710,27 @@ dt_action_trace(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
 		dmp = dt_module_lookup_by_ctf(dtp, dret->dn_ctfp);
 
 		n = snprintf(NULL, 0, "%s`%ld", dmp->dm_name, dret->dn_type) + 1;
+		if (dmp->dm_pid != 0) {
+			ctflib = dt_module_getlibid(dtp, dmp, dret->dn_ctfp);
+			assert(ctflib >= 0);
+			n = snprintf(NULL, 0, "%s`%d`%ld", dmp->dm_name,
+			    ctflib, dret->dn_type) + 1;
+		} else {
+			n = snprintf(NULL, 0, "%s`%ld", dmp->dm_name,
+			    dret->dn_type) + 1;
+		}
 		sdp->dtsd_strdata = dt_alloc(dtp, n);
 		if (sdp->dtsd_strdata == NULL)
 			longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
 		(void) snprintf(sdp->dtsd_strdata, n, "%s`%ld", dmp->dm_name,
 		    dret->dn_type);
+		if (dmp->dm_pid != 0) {
+			(void) snprintf(sdp->dtsd_strdata, n, "%s`%d`%ld",
+			    dmp->dm_name, ctflib, dret->dn_type);
+		} else {
+			(void) snprintf(sdp->dtsd_strdata, n, "%s`%ld",
+			    dmp->dm_name, dret->dn_type);
+		}
 	}
 
 	ap->dtad_difo = dt_as(yypcb);
@@ -2268,12 +2289,15 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, const char *path)
 			dt_dprintf("skipping library %s, already processed "
 			    "library with the same name: %s", dp->d_name,
 			    dld->dtld_library);
+			(void) fclose(fp);
 			continue;
 		}
 
 		dtp->dt_filetag = fname;
-		if (dt_lib_depend_add(dtp, &dtp->dt_lib_dep, fname) != 0)
+		if (dt_lib_depend_add(dtp, &dtp->dt_lib_dep, fname) != 0) {
+			(void) fclose(fp);
 			return (-1); /* preserve dt_errno */
+		}
 
 		rv = dt_compile(dtp, DT_CTX_DPROG,
 		    DTRACE_PROBESPEC_NAME, NULL,
@@ -2281,8 +2305,10 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, const char *path)
 
 		if (rv != NULL && dtp->dt_errno &&
 		    (dtp->dt_errno != EDT_COMPILER ||
-		    dtp->dt_errtag != dt_errtag(D_PRAGMA_DEPEND)))
+		    dtp->dt_errtag != dt_errtag(D_PRAGMA_DEPEND))) {
+			(void) fclose(fp);
 			return (-1); /* preserve dt_errno */
+		}
 
 		if (dtp->dt_errno)
 			dt_dprintf("error parsing library %s: %s\n",
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
index 8d9e49449eca..072cb0558813 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
@@ -24,7 +24,7 @@
  */
 
 /*
- * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
@@ -59,6 +59,25 @@ dt_fabsl(long double x)
 	return (x);
 }
 
+static int
+dt_ndigits(long long val)
+{
+	int rval = 1;
+	long long cmp = 10;
+
+	if (val < 0) {
+		val = val == INT64_MIN ? INT64_MAX : -val;
+		rval++;
+	}
+
+	while (val > cmp && cmp > 0) {
+		rval++;
+		cmp *= 10;
+	}
+
+	return (rval < 4 ? 4 : rval);
+}
+
 /*
  * 128-bit arithmetic functions needed to support the stddev() aggregating
  * action.
@@ -487,7 +506,125 @@ dt_nullrec()
 	return (DTRACE_CONSUME_NEXT);
 }
 
-int
+static void
+dt_quantize_total(dtrace_hdl_t *dtp, int64_t datum, long double *total)
+{
+	long double val = dt_fabsl((long double)datum);
+
+	if (dtp->dt_options[DTRACEOPT_AGGZOOM] == DTRACEOPT_UNSET) {
+		*total += val;
+		return;
+	}
+
+	/*
+	 * If we're zooming in on an aggregation, we want the height of the
+	 * highest value to be approximately 95% of total bar height -- so we
+	 * adjust up by the reciprocal of DTRACE_AGGZOOM_MAX when comparing to
+	 * our highest value.
+	 */
+	val *= 1 / DTRACE_AGGZOOM_MAX;
+
+	if (*total < val)
+		*total = val;
+}
+
+static int
+dt_print_quanthdr(dtrace_hdl_t *dtp, FILE *fp, int width)
+{
+	return (dt_printf(dtp, fp, "\n%*s %41s %-9s\n",
+	    width ? width : 16, width ? "key" : "value",
+	    "------------- Distribution -------------", "count"));
+}
+
+static int
+dt_print_quanthdr_packed(dtrace_hdl_t *dtp, FILE *fp, int width,
+    const dtrace_aggdata_t *aggdata, dtrace_actkind_t action)
+{
+	int min = aggdata->dtada_minbin, max = aggdata->dtada_maxbin;
+	int minwidth, maxwidth, i;
+
+	assert(action == DTRACEAGG_QUANTIZE || action == DTRACEAGG_LQUANTIZE);
+
+	if (action == DTRACEAGG_QUANTIZE) {
+		if (min != 0 && min != DTRACE_QUANTIZE_ZEROBUCKET)
+			min--;
+
+		if (max < DTRACE_QUANTIZE_NBUCKETS - 1)
+			max++;
+
+		minwidth = dt_ndigits(DTRACE_QUANTIZE_BUCKETVAL(min));
+		maxwidth = dt_ndigits(DTRACE_QUANTIZE_BUCKETVAL(max));
+	} else {
+		maxwidth = 8;
+		minwidth = maxwidth - 1;
+		max++;
+	}
+
+	if (dt_printf(dtp, fp, "\n%*s %*s .",
+	    width, width > 0 ? "key" : "", minwidth, "min") < 0)
+		return (-1);
+
+	for (i = min; i <= max; i++) {
+		if (dt_printf(dtp, fp, "-") < 0)
+			return (-1);
+	}
+
+	return (dt_printf(dtp, fp, ". %*s | count\n", -maxwidth, "max"));
+}
+
+/*
+ * We use a subset of the Unicode Block Elements (U+2588 through U+258F,
+ * inclusive) to represent aggregations via UTF-8 -- which are expressed via
+ * 3-byte UTF-8 sequences.
+ */
+#define	DTRACE_AGGUTF8_FULL	0x2588
+#define	DTRACE_AGGUTF8_BASE	0x258f
+#define	DTRACE_AGGUTF8_LEVELS	8
+
+#define	DTRACE_AGGUTF8_BYTE0(val)	(0xe0 | ((val) >> 12))
+#define	DTRACE_AGGUTF8_BYTE1(val)	(0x80 | (((val) >> 6) & 0x3f))
+#define	DTRACE_AGGUTF8_BYTE2(val)	(0x80 | ((val) & 0x3f))
+
+static int
+dt_print_quantline_utf8(dtrace_hdl_t *dtp, FILE *fp, int64_t val,
+    uint64_t normal, long double total)
+{
+	uint_t len = 40, i, whole, partial;
+	long double f = (dt_fabsl((long double)val) * len) / total;
+	const char *spaces = "                                        ";
+
+	whole = (uint_t)f;
+	partial = (uint_t)((f - (long double)(uint_t)f) *
+	    (long double)DTRACE_AGGUTF8_LEVELS);
+
+	if (dt_printf(dtp, fp, "|") < 0)
+		return (-1);
+
+	for (i = 0; i < whole; i++) {
+		if (dt_printf(dtp, fp, "%c%c%c",
+		    DTRACE_AGGUTF8_BYTE0(DTRACE_AGGUTF8_FULL),
+		    DTRACE_AGGUTF8_BYTE1(DTRACE_AGGUTF8_FULL),
+		    DTRACE_AGGUTF8_BYTE2(DTRACE_AGGUTF8_FULL)) < 0)
+			return (-1);
+	}
+
+	if (partial != 0) {
+		partial = DTRACE_AGGUTF8_BASE - (partial - 1);
+
+		if (dt_printf(dtp, fp, "%c%c%c",
+		    DTRACE_AGGUTF8_BYTE0(partial),
+		    DTRACE_AGGUTF8_BYTE1(partial),
+		    DTRACE_AGGUTF8_BYTE2(partial)) < 0)
+			return (-1);
+
+		i++;
+	}
+
+	return (dt_printf(dtp, fp, "%s %-9lld\n", spaces + i,
+	    (long long)val / normal));
+}
+
+static int
 dt_print_quantline(dtrace_hdl_t *dtp, FILE *fp, int64_t val,
     uint64_t normal, long double total, char positives, char negatives)
 {
@@ -505,6 +642,11 @@ dt_print_quantline(dtrace_hdl_t *dtp, FILE *fp, int64_t val,
 
 	if (!negatives) {
 		if (positives) {
+			if (dtp->dt_encoding == DT_ENCODING_UTF8) {
+				return (dt_print_quantline_utf8(dtp, fp, val,
+				    normal, total));
+			}
+
 			f = (dt_fabsl((long double)val) * len) / total;
 			depth = (uint_t)(f + 0.5);
 		} else {
@@ -547,6 +689,73 @@ dt_print_quantline(dtrace_hdl_t *dtp, FILE *fp, int64_t val,
 	}
 }
 
+/*
+ * As with UTF-8 printing of aggregations, we use a subset of the Unicode
+ * Block Elements (U+2581 through U+2588, inclusive) to represent our packed
+ * aggregation.
+ */
+#define	DTRACE_AGGPACK_BASE	0x2581
+#define	DTRACE_AGGPACK_LEVELS	8
+
+static int
+dt_print_packed(dtrace_hdl_t *dtp, FILE *fp,
+    long double datum, long double total)
+{
+	static boolean_t utf8_checked = B_FALSE;
+	static boolean_t utf8;
+	char *ascii = "__xxxxXX";
+	char *neg = "vvvvVV";
+	unsigned int len;
+	long double val;
+
+	if (!utf8_checked) {
+		char *term;
+
+		/*
+		 * We want to determine if we can reasonably emit UTF-8 for our
+		 * packed aggregation.  To do this, we will check for terminals
+		 * that are known to be primitive to emit UTF-8 on these.
+		 */
+		utf8_checked = B_TRUE;
+
+		if (dtp->dt_encoding == DT_ENCODING_ASCII) {
+			utf8 = B_FALSE;
+		} else if (dtp->dt_encoding == DT_ENCODING_UTF8) {
+			utf8 = B_TRUE;
+		} else if ((term = getenv("TERM")) != NULL &&
+		    (strcmp(term, "sun") == 0 ||
+		    strcmp(term, "sun-color") == 0) ||
+		    strcmp(term, "dumb") == 0) {
+			utf8 = B_FALSE;
+		} else {
+			utf8 = B_TRUE;
+		}
+	}
+
+	if (datum == 0)
+		return (dt_printf(dtp, fp, " "));
+
+	if (datum < 0) {
+		len = strlen(neg);
+		val = dt_fabsl(datum * (len - 1)) / total;
+		return (dt_printf(dtp, fp, "%c", neg[(uint_t)(val + 0.5)]));
+	}
+
+	if (utf8) {
+		int block = DTRACE_AGGPACK_BASE + (unsigned int)(((datum *
+		    (DTRACE_AGGPACK_LEVELS - 1)) / total) + 0.5);
+
+		return (dt_printf(dtp, fp, "%c%c%c",
+		    DTRACE_AGGUTF8_BYTE0(block),
+		    DTRACE_AGGUTF8_BYTE1(block),
+		    DTRACE_AGGUTF8_BYTE2(block)));
+	}
+
+	len = strlen(ascii);
+	val = (datum * (len - 1)) / total;
+	return (dt_printf(dtp, fp, "%c", ascii[(uint_t)(val + 0.5)]));
+}
+
 int
 dt_print_quantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
     size_t size, uint64_t normal)
@@ -564,9 +773,9 @@ dt_print_quantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
 
 	if (first_bin == DTRACE_QUANTIZE_NBUCKETS - 1) {
 		/*
-		 * There isn't any data.  This is possible if (and only if)
-		 * negative increment values have been used.  In this case,
-		 * we'll print the buckets around 0.
+		 * There isn't any data.  This is possible if the aggregation
+		 * has been clear()'d or if negative increment values have been
+		 * used.  Regardless, we'll print the buckets around 0.
 		 */
 		first_bin = DTRACE_QUANTIZE_ZEROBUCKET - 1;
 		last_bin = DTRACE_QUANTIZE_ZEROBUCKET + 1;
@@ -584,11 +793,10 @@ dt_print_quantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
 	for (i = first_bin; i <= last_bin; i++) {
 		positives |= (data[i] > 0);
 		negatives |= (data[i] < 0);
-		total += dt_fabsl((long double)data[i]);
+		dt_quantize_total(dtp, data[i], &total);
 	}
 
-	if (dt_printf(dtp, fp, "\n%16s %41s %-9s\n", "value",
-	    "------------- Distribution -------------", "count") < 0)
+	if (dt_print_quanthdr(dtp, fp, 0) < 0)
 		return (-1);
 
 	for (i = first_bin; i <= last_bin; i++) {
@@ -604,6 +812,48 @@ dt_print_quantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
 	return (0);
 }
 
+int
+dt_print_quantize_packed(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
+    size_t size, const dtrace_aggdata_t *aggdata)
+{
+	const int64_t *data = addr;
+	long double total = 0, count = 0;
+	int min = aggdata->dtada_minbin, max = aggdata->dtada_maxbin, i;
+	int64_t minval, maxval;
+
+	if (size != DTRACE_QUANTIZE_NBUCKETS * sizeof (uint64_t))
+		return (dt_set_errno(dtp, EDT_DMISMATCH));
+
+	if (min != 0 && min != DTRACE_QUANTIZE_ZEROBUCKET)
+		min--;
+
+	if (max < DTRACE_QUANTIZE_NBUCKETS - 1)
+		max++;
+
+	minval = DTRACE_QUANTIZE_BUCKETVAL(min);
+	maxval = DTRACE_QUANTIZE_BUCKETVAL(max);
+
+	if (dt_printf(dtp, fp, " %*lld :", dt_ndigits(minval),
+	    (long long)minval) < 0)
+		return (-1);
+
+	for (i = min; i <= max; i++) {
+		dt_quantize_total(dtp, data[i], &total);
+		count += data[i];
+	}
+
+	for (i = min; i <= max; i++) {
+		if (dt_print_packed(dtp, fp, data[i], total) < 0)
+			return (-1);
+	}
+
+	if (dt_printf(dtp, fp, ": %*lld | %lld\n",
+	    -dt_ndigits(maxval), (long long)maxval, (long long)count) < 0)
+		return (-1);
+
+	return (0);
+}
+
 int
 dt_print_lquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
     size_t size, uint64_t normal)
@@ -651,7 +901,7 @@ dt_print_lquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
 	for (i = first_bin; i <= last_bin; i++) {
 		positives |= (data[i] > 0);
 		negatives |= (data[i] < 0);
-		total += dt_fabsl((long double)data[i]);
+		dt_quantize_total(dtp, data[i], &total);
 	}
 
 	if (dt_printf(dtp, fp, "\n%16s %41s %-9s\n", "value",
@@ -663,8 +913,7 @@ dt_print_lquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
 		int err;
 
 		if (i == 0) {
-			(void) snprintf(c, sizeof (c), "< %d",
-			    base / (uint32_t)normal);
+			(void) snprintf(c, sizeof (c), "< %d", base);
 			err = dt_printf(dtp, fp, "%16s ", c);
 		} else if (i == levels + 1) {
 			(void) snprintf(c, sizeof (c), ">= %d",
@@ -683,6 +932,59 @@ dt_print_lquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
 	return (0);
 }
 
+/*ARGSUSED*/
+int
+dt_print_lquantize_packed(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
+    size_t size, const dtrace_aggdata_t *aggdata)
+{
+	const int64_t *data = addr;
+	long double total = 0, count = 0;
+	int min, max, base, err;
+	uint64_t arg;
+	uint16_t step, levels;
+	char c[32];
+	unsigned int i;
+
+	if (size < sizeof (uint64_t))
+		return (dt_set_errno(dtp, EDT_DMISMATCH));
+
+	arg = *data++;
+	size -= sizeof (uint64_t);
+
+	base = DTRACE_LQUANTIZE_BASE(arg);
+	step = DTRACE_LQUANTIZE_STEP(arg);
+	levels = DTRACE_LQUANTIZE_LEVELS(arg);
+
+	if (size != sizeof (uint64_t) * (levels + 2))
+		return (dt_set_errno(dtp, EDT_DMISMATCH));
+
+	min = 0;
+	max = levels + 1;
+
+	if (min == 0) {
+		(void) snprintf(c, sizeof (c), "< %d", base);
+		err = dt_printf(dtp, fp, "%8s :", c);
+	} else {
+		err = dt_printf(dtp, fp, "%8d :", base + (min - 1) * step);
+	}
+
+	if (err < 0)
+		return (-1);
+
+	for (i = min; i <= max; i++) {
+		dt_quantize_total(dtp, data[i], &total);
+		count += data[i];
+	}
+
+	for (i = min; i <= max; i++) {
+		if (dt_print_packed(dtp, fp, data[i], total) < 0)
+			return (-1);
+	}
+
+	(void) snprintf(c, sizeof (c), ">= %d", base + (levels * step));
+	return (dt_printf(dtp, fp, ": %-8s | %lld\n", c, (long long)count));
+}
+
 int
 dt_print_llquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
     size_t size, uint64_t normal)
@@ -740,7 +1042,7 @@ dt_print_llquantize(dtrace_hdl_t *dtp, FILE *fp, const void *addr,
 	for (i = first_bin; i <= last_bin; i++) {
 		positives |= (data[i] > 0);
 		negatives |= (data[i] < 0);
-		total += dt_fabsl((long double)data[i]);
+		dt_quantize_total(dtp, data[i], &total);
 	}
 
 	if (dt_printf(dtp, fp, "\n%16s %41s %-9s\n", "value",
@@ -823,7 +1125,7 @@ dt_print_stddev(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
 }
 
 /*ARGSUSED*/
-int
+static int
 dt_print_bytes(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
     size_t nbytes, int width, int quiet, int forceraw)
 {
@@ -876,10 +1178,12 @@ dt_print_bytes(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
 			if (j != nbytes)
 				break;
 
-			if (quiet)
+			if (quiet) {
 				return (dt_printf(dtp, fp, "%s", c));
-			else
-				return (dt_printf(dtp, fp, "  %-*s", width, c));
+			} else {
+				return (dt_printf(dtp, fp, " %s%*s",
+				    width < 0 ? " " : "", width, c));
+			}
 		}
 
 		break;
@@ -1793,10 +2097,83 @@ dt_trunc(dtrace_hdl_t *dtp, caddr_t base, dtrace_recdesc_t *rec)
 
 static int
 dt_print_datum(dtrace_hdl_t *dtp, FILE *fp, dtrace_recdesc_t *rec,
-    caddr_t addr, size_t size, uint64_t normal)
+    caddr_t addr, size_t size, const dtrace_aggdata_t *aggdata,
+    uint64_t normal, dt_print_aggdata_t *pd)
 {
-	int err;
+	int err, width;
 	dtrace_actkind_t act = rec->dtrd_action;
+	boolean_t packed = pd->dtpa_agghist || pd->dtpa_aggpack;
+	dtrace_aggdesc_t *agg = aggdata->dtada_desc;
+
+	static struct {
+		size_t size;
+		int width;
+		int packedwidth;
+	} *fmt, fmttab[] = {
+		{ sizeof (uint8_t),	3,	3 },
+		{ sizeof (uint16_t),	5,	5 },
+		{ sizeof (uint32_t),	8,	8 },
+		{ sizeof (uint64_t),	16,	16 },
+		{ 0,			-50,	16 }
+	};
+
+	if (packed && pd->dtpa_agghisthdr != agg->dtagd_varid) {
+		dtrace_recdesc_t *r;
+
+		width = 0;
+
+		/*
+		 * To print our quantization header for either an agghist or
+		 * aggpack aggregation, we need to iterate through all of our
+		 * of our records to determine their width.
+		 */
+		for (r = rec; !DTRACEACT_ISAGG(r->dtrd_action); r++) {
+			for (fmt = fmttab; fmt->size &&
+			    fmt->size != r->dtrd_size; fmt++)
+				continue;
+
+			width += fmt->packedwidth + 1;
+		}
+
+		if (pd->dtpa_agghist) {
+			if (dt_print_quanthdr(dtp, fp, width) < 0)
+				return (-1);
+		} else {
+			if (dt_print_quanthdr_packed(dtp, fp,
+			    width, aggdata, r->dtrd_action) < 0)
+				return (-1);
+		}
+
+		pd->dtpa_agghisthdr = agg->dtagd_varid;
+	}
+
+	if (pd->dtpa_agghist && DTRACEACT_ISAGG(act)) {
+		char positives = aggdata->dtada_flags & DTRACE_A_HASPOSITIVES;
+		char negatives = aggdata->dtada_flags & DTRACE_A_HASNEGATIVES;
+		int64_t val;
+
+		assert(act == DTRACEAGG_SUM || act == DTRACEAGG_COUNT);
+		val = (long long)*((uint64_t *)addr);
+
+		if (dt_printf(dtp, fp, " ") < 0)
+			return (-1);
+
+		return (dt_print_quantline(dtp, fp, val, normal,
+		    aggdata->dtada_total, positives, negatives));
+	}
+
+	if (pd->dtpa_aggpack && DTRACEACT_ISAGG(act)) {
+		switch (act) {
+		case DTRACEAGG_QUANTIZE:
+			return (dt_print_quantize_packed(dtp,
+			    fp, addr, size, aggdata));
+		case DTRACEAGG_LQUANTIZE:
+			return (dt_print_lquantize_packed(dtp,
+			    fp, addr, size, aggdata));
+		default:
+			break;
+		}
+	}
 
 	switch (act) {
 	case DTRACEACT_STACK:
@@ -1839,28 +2216,33 @@ dt_print_datum(dtrace_hdl_t *dtp, FILE *fp, dtrace_recdesc_t *rec,
 		break;
 	}
 
+	for (fmt = fmttab; fmt->size && fmt->size != size; fmt++)
+		continue;
+
+	width = packed ? fmt->packedwidth : fmt->width;
+
 	switch (size) {
 	case sizeof (uint64_t):
-		err = dt_printf(dtp, fp, " %16lld",
+		err = dt_printf(dtp, fp, " %*lld", width,
 		    /* LINTED - alignment */
 		    (long long)*((uint64_t *)addr) / normal);
 		break;
 	case sizeof (uint32_t):
 		/* LINTED - alignment */
-		err = dt_printf(dtp, fp, " %8d", *((uint32_t *)addr) /
+		err = dt_printf(dtp, fp, " %*d", width, *((uint32_t *)addr) /
 		    (uint32_t)normal);
 		break;
 	case sizeof (uint16_t):
 		/* LINTED - alignment */
-		err = dt_printf(dtp, fp, " %5d", *((uint16_t *)addr) /
+		err = dt_printf(dtp, fp, " %*d", width, *((uint16_t *)addr) /
 		    (uint32_t)normal);
 		break;
 	case sizeof (uint8_t):
-		err = dt_printf(dtp, fp, " %3d", *((uint8_t *)addr) /
+		err = dt_printf(dtp, fp, " %*d", width, *((uint8_t *)addr) /
 		    (uint32_t)normal);
 		break;
 	default:
-		err = dt_print_bytes(dtp, fp, addr, size, 50, 0, 0);
+		err = dt_print_bytes(dtp, fp, addr, size, width, 0, 0);
 		break;
 	}
 
@@ -1881,6 +2263,9 @@ dt_print_aggs(const dtrace_aggdata_t **aggsdata, int naggvars, void *arg)
 	caddr_t addr;
 	size_t size;
 
+	pd->dtpa_agghist = (aggdata->dtada_flags & DTRACE_A_TOTAL);
+	pd->dtpa_aggpack = (aggdata->dtada_flags & DTRACE_A_MINMAXBIN);
+
 	/*
 	 * Iterate over each record description in the key, printing the traced
 	 * data, skipping the first datum (the tuple member created by the
@@ -1897,7 +2282,8 @@ dt_print_aggs(const dtrace_aggdata_t **aggsdata, int naggvars, void *arg)
 			break;
 		}
 
-		if (dt_print_datum(dtp, fp, rec, addr, size, 1) < 0)
+		if (dt_print_datum(dtp, fp, rec, addr,
+		    size, aggdata, 1, pd) < 0)
 			return (-1);
 
 		if (dt_buffered_flush(dtp, NULL, rec, aggdata,
@@ -1920,7 +2306,8 @@ dt_print_aggs(const dtrace_aggdata_t **aggsdata, int naggvars, void *arg)
 		assert(DTRACEACT_ISAGG(act));
 		normal = aggdata->dtada_normal;
 
-		if (dt_print_datum(dtp, fp, rec, addr, size, normal) < 0)
+		if (dt_print_datum(dtp, fp, rec, addr,
+		    size, aggdata, normal, pd) < 0)
 			return (-1);
 
 		if (dt_buffered_flush(dtp, NULL, rec, aggdata,
@@ -1931,8 +2318,10 @@ dt_print_aggs(const dtrace_aggdata_t **aggsdata, int naggvars, void *arg)
 			agg->dtagd_flags |= DTRACE_AGD_PRINTED;
 	}
 
-	if (dt_printf(dtp, fp, "\n") < 0)
-		return (-1);
+	if (!pd->dtpa_agghist && !pd->dtpa_aggpack) {
+		if (dt_printf(dtp, fp, "\n") < 0)
+			return (-1);
+	}
 
 	if (dt_buffered_flush(dtp, NULL, NULL, aggdata,
 	    DTRACE_BUFDATA_AGGFORMAT | DTRACE_BUFDATA_AGGLAST) < 0)
@@ -2401,7 +2790,7 @@ dt_consume_cpu(dtrace_hdl_t *dtp, FILE *fp, int cpu,
 				}
 
 				n = dt_print_bytes(dtp, fp, addr,
-				    tracememsize, 33, quiet, 1);
+				    tracememsize, -33, quiet, 1);
 
 				tracememsize = 0;
 
@@ -2434,7 +2823,7 @@ dt_consume_cpu(dtrace_hdl_t *dtp, FILE *fp, int cpu,
 				break;
 			default:
 				n = dt_print_bytes(dtp, fp, addr,
-				    rec->dtrd_size, 33, quiet, 0);
+				    rec->dtrd_size, -33, quiet, 0);
 				break;
 			}
 
@@ -2555,7 +2944,7 @@ dt_get_buf(dtrace_hdl_t *dtp, int cpu, dtrace_bufdesc_t **bufp)
 {
 	dtrace_optval_t size;
 	dtrace_bufdesc_t *buf = dt_zalloc(dtp, sizeof (*buf));
-	int error;
+	int error, rval;
 
 	if (buf == NULL)
 		return (-1);
@@ -2574,7 +2963,6 @@ dt_get_buf(dtrace_hdl_t *dtp, int cpu, dtrace_bufdesc_t **bufp)
 #else
 	if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, &buf) == -1) {
 #endif
-		dt_put_buf(dtp, buf);
 		/*
 		 * If we failed with ENOENT, it may be because the
 		 * CPU was unconfigured -- this is okay.  Any other
@@ -2582,10 +2970,12 @@ dt_get_buf(dtrace_hdl_t *dtp, int cpu, dtrace_bufdesc_t **bufp)
 		 */
 		if (errno == ENOENT) {
 			*bufp = NULL;
-			return (0);
-		}
+			rval = 0;
+		} else
+			rval = dt_set_errno(dtp, errno);
 
-		return (dt_set_errno(dtp, errno));
+		dt_put_buf(dtp, buf);
+		return (rval);
 	}
 
 	error = dt_unring_buf(dtp, buf);
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c
index 871fdd530487..d717d569629d 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c
@@ -21,7 +21,8 @@
  */
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Joyent, Inc. All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -779,7 +780,7 @@ dt_decl_enumerator(char *s, dt_node_t *dnp)
 	yyintdecimal = 0;
 
 	dnp = dt_node_int(value);
-	dt_node_type_assign(dnp, dsp->ds_ctfp, dsp->ds_type);
+	dt_node_type_assign(dnp, dsp->ds_ctfp, dsp->ds_type, B_FALSE);
 
 	if ((inp = malloc(sizeof (dt_idnode_t))) == NULL)
 		longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM);
@@ -821,6 +822,8 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip)
 	char *name;
 	int rv;
 
+	tip->dtt_flags = 0;
+
 	/*
 	 * Based on our current #include depth and decl stack depth, determine
 	 * which dynamic CTF module and scope to use when adding any new types.
@@ -828,6 +831,9 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip)
 	dmp = yypcb->pcb_idepth ? dtp->dt_cdefs : dtp->dt_ddefs;
 	flag = yypcb->pcb_dstack.ds_next ? CTF_ADD_NONROOT : CTF_ADD_ROOT;
 
+	if (ddp->dd_attr & DT_DA_USER)
+		tip->dtt_flags = DTT_FL_USER;
+
 	/*
 	 * If we have already cached a CTF type for this decl, then we just
 	 * return the type information for the cached type.
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.h b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.h
index 2933155c784f..d32287578219 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.h
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.h
@@ -23,12 +23,14 @@
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Joyent, Inc. All rights reserved.
+ */
 
 #ifndef	_DT_DECL_H
 #define	_DT_DECL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <libctf.h>
 #include <dtrace.h>
@@ -59,6 +61,7 @@ typedef struct dt_decl {
 #define	DT_DA_RESTRICT	0x0040		/* qualify type as restrict */
 #define	DT_DA_VOLATILE	0x0080		/* qualify type as volatile */
 #define	DT_DA_PAREN	0x0100		/* parenthesis tag */
+#define	DT_DA_USER	0x0200		/* user-land type specifier */
 
 typedef enum dt_dclass {
 	DT_DC_DEFAULT,			/* no storage class specified */
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c
index fff4235a6bc3..c0af36420e0c 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c
@@ -26,7 +26,8 @@
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Joyent, Inc. All rights reserved.
  */
 
 #include <strings.h>
@@ -312,9 +313,10 @@ dt_dis_typestr(const dtrace_diftype_t *t, char *buf, size_t len)
 		(void) snprintf(ckind, sizeof (ckind), "0x%x", t->dtdt_ckind);
 	}
 
-	if (t->dtdt_flags & DIF_TF_BYREF) {
-		(void) snprintf(buf, len, "%s (%s) by ref (size %lu)",
-		    kind, ckind, (ulong_t)t->dtdt_size);
+	if (t->dtdt_flags & (DIF_TF_BYREF | DIF_TF_BYUREF)) {
+		(void) snprintf(buf, len, "%s (%s) by %sref (size %lu)",
+		    kind, ckind, (t->dtdt_flags & DIF_TF_BYUREF) ? "user " : "",
+		    (ulong_t)t->dtdt_size);
 	} else {
 		(void) snprintf(buf, len, "%s (%s) (size %lu)",
 		    kind, ckind, (ulong_t)t->dtdt_size);
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
index d8dbbabb3b2b..2327ff75e4d4 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
@@ -111,7 +111,8 @@ static const struct {
 	{ EDT_BADAGGVAR, "Invalid aggregation variable identifier" },
 	{ EDT_OVERSION,	"Client requested deprecated version of library" },
 	{ EDT_ENABLING_ERR, "Failed to enable probe" },
-	{ EDT_NOPROBES, "No probe sites found for declared provider" }
+	{ EDT_NOPROBES, "No probe sites found for declared provider" },
+	{ EDT_CANTLOAD, "Failed to load module" },
 };
 
 static const int _dt_nerr = sizeof (_dt_errlist) / sizeof (_dt_errlist[0]);
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
index 0c12623bc422..07790f4ebc2c 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
@@ -23,8 +23,10 @@
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ */
 
 #include <dt_impl.h>
 
@@ -102,6 +104,7 @@
 %token	DT_KEY_TYPEDEF
 %token	DT_KEY_UNION
 %token	DT_KEY_UNSIGNED
+%token	DT_KEY_USERLAND
 %token	DT_KEY_VOID
 %token	DT_KEY_VOLATILE
 %token	DT_KEY_WHILE
@@ -633,6 +636,7 @@ type_specifier:	DT_KEY_VOID { $$ = dt_decl_spec(CTF_K_INTEGER, DUP("void")); }
 	|	DT_KEY_DOUBLE { $$ = dt_decl_spec(CTF_K_FLOAT, DUP("double")); }
 	|	DT_KEY_SIGNED { $$ = dt_decl_attr(DT_DA_SIGNED); }
 	|	DT_KEY_UNSIGNED { $$ = dt_decl_attr(DT_DA_UNSIGNED); }
+	|	DT_KEY_USERLAND { $$ = dt_decl_attr(DT_DA_USER); }
 	|	DT_KEY_STRING {
 			$$ = dt_decl_spec(CTF_K_TYPEDEF, DUP("string"));
 		}
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c
index 13adbb45e1a7..5a2f0e4c1f5c 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c
@@ -22,6 +22,8 @@
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Joyent, Inc. All rights reserved.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -104,7 +106,7 @@ dt_idcook_sign(dt_node_t *dnp, dt_ident_t *idp,
 		}
 	}
 
-	dt_node_type_assign(dnp, idp->di_ctfp, idp->di_type);
+	dt_node_type_assign(dnp, idp->di_ctfp, idp->di_type, B_FALSE);
 }
 
 /*
@@ -163,7 +165,7 @@ dt_idcook_assc(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
 		if (argc != 0)
 			isp->dis_args[argc - 1].dn_list = NULL;
 
-		dt_node_type_assign(dnp, idp->di_ctfp, idp->di_type);
+		dt_node_type_assign(dnp, idp->di_ctfp, idp->di_type, B_FALSE);
 
 	} else {
 		dt_idcook_sign(dnp, idp, argc, args,
@@ -304,7 +306,7 @@ dt_idcook_func(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
 			}
 
 			dt_node_type_assign(&isp->dis_args[i],
-			    dtt.dtt_ctfp, dtt.dtt_type);
+			    dtt.dtt_ctfp, dtt.dtt_type, B_FALSE);
 		}
 	}
 
@@ -391,7 +393,9 @@ dt_idcook_args(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *ap)
 
 		dt_node_type_assign(dnp,
 		    prp->pr_argv[ap->dn_value].dtt_ctfp,
-		    prp->pr_argv[ap->dn_value].dtt_type);
+		    prp->pr_argv[ap->dn_value].dtt_type,
+		    prp->pr_argv[ap->dn_value].dtt_flags & DTT_FL_USER ?
+		    B_TRUE : B_FALSE);
 
 	} else if ((dxp = dt_xlator_lookup(dtp,
 	    nnp, xnp, DT_XLATE_FUZZY)) != NULL || (
@@ -419,7 +423,8 @@ dt_idcook_args(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *ap)
 		dnp->dn_ident->di_ctfp = xidp->di_ctfp;
 		dnp->dn_ident->di_type = xidp->di_type;
 
-		dt_node_type_assign(dnp, DT_DYN_CTFP(dtp), DT_DYN_TYPE(dtp));
+		dt_node_type_assign(dnp, DT_DYN_CTFP(dtp), DT_DYN_TYPE(dtp),
+		    B_FALSE);
 
 	} else {
 		xyerror(D_ARGS_XLATOR, "translator for %s[%lld] from %s to %s "
@@ -465,7 +470,7 @@ dt_idcook_regs(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *ap)
 	idp->di_ctfp = dtt.dtt_ctfp;
 	idp->di_type = dtt.dtt_type;
 
-	dt_node_type_assign(dnp, idp->di_ctfp, idp->di_type);
+	dt_node_type_assign(dnp, idp->di_ctfp, idp->di_type, B_FALSE);
 }
 
 /*ARGSUSED*/
@@ -487,7 +492,7 @@ dt_idcook_type(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
 		idp->di_type = dtt.dtt_type;
 	}
 
-	dt_node_type_assign(dnp, idp->di_ctfp, idp->di_type);
+	dt_node_type_assign(dnp, idp->di_ctfp, idp->di_type, B_FALSE);
 }
 
 /*ARGSUSED*/
@@ -495,7 +500,7 @@ static void
 dt_idcook_thaw(dt_node_t *dnp, dt_ident_t *idp, int argc, dt_node_t *args)
 {
 	if (idp->di_ctfp != NULL && idp->di_type != CTF_ERR)
-		dt_node_type_assign(dnp, idp->di_ctfp, idp->di_type);
+		dt_node_type_assign(dnp, idp->di_ctfp, idp->di_type, B_FALSE);
 }
 
 static void
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
index 2bae2208dead..b7abbc2fddc9 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
@@ -146,6 +146,10 @@ typedef struct dt_module {
 	caddr_t dm_reloc_offset;	/* Symbol relocation offset. */
 	uintptr_t *dm_sec_offsets;
 #endif
+	pid_t dm_pid;		/* pid for this module */
+	uint_t dm_nctflibs;	/* number of ctf children libraries */
+	ctf_file_t **dm_libctfp; /* process library ctf pointers */
+	char **dm_libctfn;	/* names of process ctf containers */
 } dt_module_t;
 
 #define	DT_DM_LOADED	0x1	/* module symbol and type data is loaded */
@@ -189,6 +193,9 @@ typedef struct dt_print_aggdata {
 	dtrace_aggvarid_t dtpa_id;	/* aggregation variable of interest */
 	FILE *dtpa_fp;			/* file pointer */
 	int dtpa_allunprint;		/* print only unprinted aggregations */
+	int dtpa_agghist;		/* print aggregation as histogram */
+	int dtpa_agghisthdr;		/* aggregation histogram hdr printed */
+	int dtpa_aggpack;		/* pack quantized aggregations */
 } dt_print_aggdata_t;
 
 typedef struct dt_dirpath {
@@ -283,6 +290,7 @@ struct dtrace_hdl {
 	uint_t dt_linktype;	/* dtrace link output file type (see below) */
 	uint_t dt_xlatemode;	/* dtrace translator linking mode (see below) */
 	uint_t dt_stdcmode;	/* dtrace stdc compatibility mode (see below) */
+	uint_t dt_encoding;	/* dtrace output encoding (see below) */
 	uint_t dt_treedump;	/* dtrace tree debug bitmap (see below) */
 	uint64_t dt_options[DTRACEOPT_MAX]; /* dtrace run-time options */
 	int dt_version;		/* library version requested by client */
@@ -373,6 +381,14 @@ struct dtrace_hdl {
 #define	DT_STDC_XS	2	/* K&R C: __STDC__ not defined */
 #define	DT_STDC_XT	3	/* ISO C + K&R C compat with ISO: __STDC__=0 */
 
+/*
+ * Values for the dt_encoding property, which is used to force a particular
+ * character encoding (overriding default behavior and/or automatic detection).
+ */
+#define	DT_ENCODING_UNSET	0
+#define	DT_ENCODING_ASCII	1
+#define	DT_ENCODING_UTF8	2
+
 /*
  * Macro to test whether a given pass bit is set in the dt_treedump bit-vector.
  * If the bit for pass 'p' is set, the D compiler displays the parse tree for
@@ -536,7 +552,8 @@ enum {
 	EDT_BADAGGVAR,		/* invalid aggregation variable identifier */
 	EDT_OVERSION,		/* client is requesting deprecated version */
 	EDT_ENABLING_ERR,	/* failed to enable probe */
-	EDT_NOPROBES		/* no probes sites for declared provider */
+	EDT_NOPROBES,		/* no probes sites for declared provider */
+	EDT_CANTLOAD		/* failed to load a module */
 };
 
 /*
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
index b31933ea2a67..032d3034d67a 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
@@ -23,6 +23,10 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  */
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ */
 
 #include <string.h>
 #include <stdlib.h>
@@ -93,13 +97,17 @@ static void unput(int);
 %}
 
 %e 1500		/* maximum nodes */
-%p 3700		/* maximum positions */
+%p 4900		/* maximum positions */
 %n 600		/* maximum states */
+%a 3000		/* maximum transitions */
 
 %s S0 S1 S2 S3 S4
 
 RGX_AGG		"@"[a-zA-Z_][0-9a-zA-Z_]*
 RGX_PSPEC	[-$:a-zA-Z_.?*\\\[\]!][-$:0-9a-zA-Z_.`?*\\\[\]!]*
+RGX_ALTIDENT	[a-zA-Z_][0-9a-zA-Z_]*
+RGX_LMID	LM[0-9a-fA-F]+`
+RGX_MOD_IDENT	[a-zA-Z_`][0-9a-z.A-Z_`]*`
 RGX_IDENT	[a-zA-Z_`][0-9a-zA-Z_`]*
 RGX_INT		([0-9]+|0[xX][0-9A-Fa-f]+)[uU]?[lL]?[lL]?
 RGX_FP		([0-9]+("."?)[0-9]*|"."[0-9]+)((e|E)("+"|-)?[0-9]+)?[fFlL]?
@@ -169,6 +177,7 @@ if (yypcb->pcb_token != 0) {
 <S0>typedef	return (DT_KEY_TYPEDEF);
 <S0>union	return (DT_KEY_UNION);
 <S0>unsigned	return (DT_KEY_UNSIGNED);
+<S0>userland	return (DT_KEY_USERLAND);
 <S0>void	return (DT_KEY_VOID);
 <S0>volatile	return (DT_KEY_VOLATILE);
 <S0>while	return (DT_KEY_WHILE);
@@ -347,7 +356,9 @@ if (yypcb->pcb_token != 0) {
 			return (DT_TOK_INT);
 		}
 
-<S0>{RGX_IDENT}	{
+<S0>{RGX_IDENT} |
+<S0>{RGX_MOD_IDENT}{RGX_IDENT} |
+<S0>{RGX_MOD_IDENT} {
 			return (id_or_type(yytext));
 		}
 
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
index f31c60069901..13300b086358 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
@@ -230,9 +230,6 @@ prepare_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf32_t *dep)
 #if defined(__arm__)
 /* XXX */
 printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
-#elif defined(__ia64__)
-/* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
 #elif defined(__i386) || defined(__amd64)
 			rel->r_offset = s->dofs_offset +
 			    dofr[j].dofr_offset;
@@ -424,8 +421,6 @@ prepare_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf64_t *dep)
 #ifdef DOODAD
 #if defined(__arm__)
 /* XXX */
-#elif defined(__ia64__)
-/* XXX */
 #elif defined(__mips__)
 /* XXX */
 #elif defined(__powerpc__)
@@ -535,8 +530,6 @@ dump_elf32(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
 	elf_file.ehdr.e_type = ET_REL;
 #if defined(__arm__)
 	elf_file.ehdr.e_machine = EM_ARM;
-#elif defined(__ia64__)
-	elf_file.ehdr.e_machine = EM_IA_64;
 #elif defined(__mips__)
 	elf_file.ehdr.e_machine = EM_MIPS;
 #elif defined(__powerpc__)
@@ -683,8 +676,6 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, int fd)
 	elf_file.ehdr.e_type = ET_REL;
 #if defined(__arm__)
 	elf_file.ehdr.e_machine = EM_ARM;
-#elif defined(__ia64__)
-	elf_file.ehdr.e_machine = EM_IA_64;
 #elif defined(__mips__)
 	elf_file.ehdr.e_machine = EM_MIPS;
 #elif defined(__powerpc__)
@@ -814,15 +805,6 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
 printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
 	return (0);
 }
-#elif defined(__ia64__)
-/* 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__);
-	return (0);
-}
 #elif defined(__mips__)
 /* XXX */
 static int
@@ -1235,9 +1217,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
 
 	if (dtp->dt_oflags & DTRACE_O_LP64) {
 		eclass = ELFCLASS64;
-#if defined(__ia64__)
-		emachine1 = emachine2 = EM_IA_64;
-#elif defined(__mips__)
+#if defined(__mips__)
 		emachine1 = emachine2 = EM_MIPS;
 #elif defined(__powerpc__)
 		emachine1 = emachine2 = EM_PPC64;
@@ -1258,7 +1238,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp)
 #elif defined(__sparc)
 		emachine1 = EM_SPARC;
 		emachine2 = EM_SPARC32PLUS;
-#elif defined(__i386) || defined(__amd64) || defined(__ia64__)
+#elif defined(__i386) || defined(__amd64)
 		emachine1 = emachine2 = EM_386;
 #endif
 		symsize = sizeof (Elf32_Sym);
@@ -1915,7 +1895,6 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
 			goto done;
 		}
 #if !defined(sun)
-#define BROKEN_LIBELF
 		/*
 		 * FreeBSD's ld(1) is not instructed to interpret and add
 		 * correctly the SUNW_dof section present in tfile.
@@ -1939,9 +1918,6 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
 		/*
 		 * Add the string '.SUWN_dof' to the shstrtab section.
 		 */
-#ifdef BROKEN_LIBELF
-		elf_flagelf(e, ELF_C_SET, ELF_F_LAYOUT);
-#endif
 		elf_getshdrstrndx(e, &stridx);
 		scn = elf_getscn(e, stridx);
 		gelf_getshdr(scn, &shdr);
@@ -1953,54 +1929,6 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
 		loc = shdr.sh_size;
 		shdr.sh_size += data->d_size;
 		gelf_update_shdr(scn, &shdr);
-#ifdef BROKEN_LIBELF
-		off = shdr.sh_offset;
-		rc = shdr.sh_offset + shdr.sh_size;
-		gelf_getehdr(e, &ehdr);
-		if (ehdr.e_shoff > off) {
-			off = ehdr.e_shoff + ehdr.e_shnum * ehdr.e_shentsize;
-			rc = roundup(rc, 8);
-			ehdr.e_shoff = rc;
-			gelf_update_ehdr(e, &ehdr);
-			rc += ehdr.e_shnum * ehdr.e_shentsize;
-		}
-		for (;;) {
-			scn0 = NULL;
-			scn = NULL;
-			while ((scn = elf_nextscn(e, scn)) != NULL) {
-				gelf_getshdr(scn, &shdr);
-				if (shdr.sh_type == SHT_NOBITS ||
-				    shdr.sh_offset < off)
-					continue;
-				/* Find the immediately adjcent section. */
-				if (scn0 == NULL ||
-				    shdr.sh_offset < shdr0.sh_offset) {
-					scn0 = scn;
-					gelf_getshdr(scn0, &shdr0);
-				}
-			}
-			if (scn0 == NULL)
-				break;
-			/* Load section data to work around another bug */
-			elf_getdata(scn0, NULL);
-			/* Update section header, assure section alignment */
-			off = shdr0.sh_offset + shdr0.sh_size;
-			rc = roundup(rc, shdr0.sh_addralign);
-			shdr0.sh_offset = rc;
-			gelf_update_shdr(scn0, &shdr0);
-			rc += shdr0.sh_size;
-		}
-		if (elf_update(e, ELF_C_WRITE) < 0) {
-			ret = dt_link_error(dtp, NULL, -1, NULL,
-			    "failed to add append the shstrtab section: %s",
-			    elf_errmsg(elf_errno()));
-			elf_end(e);
-			close(efd);
-			goto done;
-		}
-		elf_end(e);
-		e = elf_begin(efd, ELF_C_RDWR, NULL);
-#endif
 		/*
 		 * Construct the .SUNW_dof section.
 		 */
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c
index c6d92c87eb40..6ab7cd9619c3 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c
@@ -39,7 +39,7 @@
 static int
 dt_strdata_add(dtrace_hdl_t *dtp, dtrace_recdesc_t *rec, void ***data, int *max)
 {
-	int maxformat;
+	int maxformat, rval;
 	dtrace_fmtdesc_t fmt;
 	void *result;
 
@@ -63,8 +63,9 @@ dt_strdata_add(dtrace_hdl_t *dtp, dtrace_recdesc_t *rec, void ***data, int *max)
 		return (dt_set_errno(dtp, EDT_NOMEM));
 
 	if (dt_ioctl(dtp, DTRACEIOC_FORMAT, &fmt) == -1) {
+		rval = dt_set_errno(dtp, errno);
 		free(fmt.dtfd_string);
-		return (dt_set_errno(dtp, errno));
+		return (rval);
 	}
 
 	while (rec->dtrd_format > (maxformat = *max)) {
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
index 497faa995871..e3905c1ff45a 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
@@ -22,6 +22,9 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  */
+/*
+ * Copyright (c) 2013, Joyent, Inc.  All rights reserved.
+ */
 
 #include <sys/types.h>
 #if defined(sun)
@@ -50,6 +53,7 @@
 #include <dirent.h>
 #if !defined(sun)
 #include <fcntl.h>
+#include <libproc_compat.h>
 #endif
 
 #include <dt_strtab.h>
@@ -462,6 +466,9 @@ static const dt_modops_t dt_modops_64 = {
 dt_module_t *
 dt_module_create(dtrace_hdl_t *dtp, const char *name)
 {
+	long pid;
+	char *eptr;
+	dt_ident_t *idp;
 	uint_t h = dt_strtab_hash(name, NULL) % dtp->dt_modbuckets;
 	dt_module_t *dmp;
 
@@ -485,6 +492,32 @@ dt_module_create(dtrace_hdl_t *dtp, const char *name)
 	else
 		dmp->dm_ops = &dt_modops_32;
 
+	/*
+	 * Modules for userland processes are special. They always refer to a
+	 * specific process and have a copy of their CTF data from a specific
+	 * instant in time. Any dt_module_t that begins with 'pid' is a module
+	 * for a specific process, much like how any probe description that
+	 * begins with 'pid' is special. pid123 refers to process 123. A module
+	 * that is just 'pid' refers specifically to pid$target. This is
+	 * generally done as D does not currently allow for macros to be
+	 * evaluated when working with types.
+	 */
+	if (strncmp(dmp->dm_name, "pid", 3) == 0) {
+		errno = 0;
+		if (dmp->dm_name[3] == '\0') {
+			idp = dt_idhash_lookup(dtp->dt_macros, "target");
+			if (idp != NULL && idp->di_id != 0)
+				dmp->dm_pid = idp->di_id;
+		} else {
+			pid = strtol(dmp->dm_name + 3, &eptr, 10);
+			if (errno == 0 && *eptr == '\0')
+				dmp->dm_pid = (pid_t)pid;
+			else
+				dt_dprintf("encountered malformed pid "
+				    "module: %s\n", dmp->dm_name);
+		}
+	}
+
 	return (dmp);
 }
 
@@ -554,12 +587,169 @@ dt_module_load_sect(dtrace_hdl_t *dtp, dt_module_t *dmp, ctf_sect_t *ctsp)
 	return (0);
 }
 
+typedef struct dt_module_cb_arg {
+	struct ps_prochandle *dpa_proc;
+	dtrace_hdl_t *dpa_dtp;
+	dt_module_t *dpa_dmp;
+	uint_t dpa_count;
+} dt_module_cb_arg_t;
+
+/* ARGSUSED */
+static int
+dt_module_load_proc_count(void *arg, const prmap_t *prmap, const char *obj)
+{
+	ctf_file_t *fp;
+	dt_module_cb_arg_t *dcp = arg;
+
+	/* Try to grab a ctf container if it exists */
+	fp = Pname_to_ctf(dcp->dpa_proc, obj);
+	if (fp != NULL)
+		dcp->dpa_count++;
+	return (0);
+}
+
+/* ARGSUSED */
+static int
+dt_module_load_proc_build(void *arg, const prmap_t *prmap, const char *obj)
+{
+	ctf_file_t *fp;
+	char buf[MAXPATHLEN], *p;
+	dt_module_cb_arg_t *dcp = arg;
+	int count = dcp->dpa_count;
+	Lmid_t lmid;
+
+	fp = Pname_to_ctf(dcp->dpa_proc, obj);
+	if (fp == NULL)
+		return (0);
+	fp = ctf_dup(fp);
+	if (fp == NULL)
+		return (0);
+	dcp->dpa_dmp->dm_libctfp[count] = fp;
+	/*
+	 * While it'd be nice to simply use objname here, because of our prior
+	 * actions we'll always get a resolved object name to its on disk file.
+	 * Like the pid provider, we need to tell a bit of a lie here. The type
+	 * that the user thinks of is in terms of the libraries they requested,
+	 * eg. libc.so.1, they don't care about the fact that it's
+	 * libc_hwcap.so.1.
+	 */
+	(void) Pobjname(dcp->dpa_proc, prmap->pr_vaddr, buf, sizeof (buf));
+	if ((p = strrchr(buf, '/')) == NULL)
+		p = buf;
+	else
+		p++;
+
+	/*
+	 * If for some reason we can't find a link map id for this module, which
+	 * would be really quite weird. We instead just say the link map id is
+	 * zero.
+	 */
+	if (Plmid(dcp->dpa_proc, prmap->pr_vaddr, &lmid) != 0)
+		lmid = 0;
+
+	if (lmid == 0)
+		dcp->dpa_dmp->dm_libctfn[count] = strdup(p);
+	else
+		(void) asprintf(&dcp->dpa_dmp->dm_libctfn[count],
+		    "LM%x`%s", lmid, p);
+	if (dcp->dpa_dmp->dm_libctfn[count] == NULL)
+		return (1);
+	ctf_setspecific(fp, dcp->dpa_dmp);
+	dcp->dpa_count++;
+	return (0);
+}
+
+/*
+ * We've been asked to load data that belongs to another process. As such we're
+ * going to pgrab it at this instant, load everything that we might ever care
+ * about, and then drive on. The reason for this is that the process that we're
+ * interested in might be changing. As long as we have grabbed it, then this
+ * can't be a problem for us.
+ *
+ * For now, we're actually going to punt on most things and just try to get CTF
+ * data, nothing else. Basically this is only useful as a source of type
+ * information, we can't go and do the stacktrace lookups, etc.
+ */
+static int
+dt_module_load_proc(dtrace_hdl_t *dtp, dt_module_t *dmp)
+{
+	struct ps_prochandle *p;
+	dt_module_cb_arg_t arg;
+
+	/*
+	 * Note that on success we do not release this hold. We must hold this
+	 * for our life time.
+	 */
+	p = dt_proc_grab(dtp, dmp->dm_pid, 0, PGRAB_RDONLY | PGRAB_FORCE);
+	if (p == NULL) {
+		dt_dprintf("failed to grab pid: %d\n", (int)dmp->dm_pid);
+		return (dt_set_errno(dtp, EDT_CANTLOAD));
+	}
+	dt_proc_lock(dtp, p);
+
+	arg.dpa_proc = p;
+	arg.dpa_dtp = dtp;
+	arg.dpa_dmp = dmp;
+	arg.dpa_count = 0;
+	if (Pobject_iter_resolved(p, dt_module_load_proc_count, &arg) != 0) {
+		dt_dprintf("failed to iterate objects\n");
+		dt_proc_release(dtp, p);
+		return (dt_set_errno(dtp, EDT_CANTLOAD));
+	}
+
+	if (arg.dpa_count == 0) {
+		dt_dprintf("no ctf data present\n");
+		dt_proc_unlock(dtp, p);
+		dt_proc_release(dtp, p);
+		return (dt_set_errno(dtp, EDT_CANTLOAD));
+	}
+
+	dmp->dm_libctfp = malloc(sizeof (ctf_file_t *) * arg.dpa_count);
+	if (dmp->dm_libctfp == NULL) {
+		dt_proc_unlock(dtp, p);
+		dt_proc_release(dtp, p);
+		return (dt_set_errno(dtp, EDT_NOMEM));
+	}
+	bzero(dmp->dm_libctfp, sizeof (ctf_file_t *) * arg.dpa_count);
+
+	dmp->dm_libctfn = malloc(sizeof (char *) * arg.dpa_count);
+	if (dmp->dm_libctfn == NULL) {
+		free(dmp->dm_libctfp);
+		dt_proc_unlock(dtp, p);
+		dt_proc_release(dtp, p);
+		return (dt_set_errno(dtp, EDT_NOMEM));
+	}
+	bzero(dmp->dm_libctfn, sizeof (char *) * arg.dpa_count);
+
+	dmp->dm_nctflibs = arg.dpa_count;
+
+	arg.dpa_count = 0;
+	if (Pobject_iter_resolved(p, dt_module_load_proc_build, &arg) != 0) {
+		dt_proc_unlock(dtp, p);
+		dt_module_unload(dtp, dmp);
+		dt_proc_release(dtp, p);
+		return (dt_set_errno(dtp, EDT_CANTLOAD));
+	}
+	assert(arg.dpa_count == dmp->dm_nctflibs);
+	dt_dprintf("loaded %d ctf modules for pid %d\n", arg.dpa_count,
+	    (int)dmp->dm_pid);
+
+	dt_proc_unlock(dtp, p);
+	dt_proc_release(dtp, p);
+	dmp->dm_flags |= DT_DM_LOADED;
+
+	return (0);
+}
+
 int
 dt_module_load(dtrace_hdl_t *dtp, dt_module_t *dmp)
 {
 	if (dmp->dm_flags & DT_DM_LOADED)
 		return (0); /* module is already loaded */
 
+	if (dmp->dm_pid != 0)
+		return (dt_module_load_proc(dtp, dmp));
+
 	dmp->dm_ctdata.cts_name = ".SUNW_ctf";
 	dmp->dm_ctdata.cts_type = SHT_PROGBITS;
 	dmp->dm_ctdata.cts_flags = 0;
@@ -645,6 +835,14 @@ dt_module_load(dtrace_hdl_t *dtp, dt_module_t *dmp)
 	return (0);
 }
 
+int
+dt_module_hasctf(dtrace_hdl_t *dtp, dt_module_t *dmp)
+{
+	if (dmp->dm_pid != 0 && dmp->dm_nctflibs > 0)
+		return (1);
+	return (dt_module_getctf(dtp, dmp) != NULL);
+}
+
 ctf_file_t *
 dt_module_getctf(dtrace_hdl_t *dtp, dt_module_t *dmp)
 {
@@ -718,6 +916,8 @@ dt_module_getctf(dtrace_hdl_t *dtp, dt_module_t *dmp)
 void
 dt_module_unload(dtrace_hdl_t *dtp, dt_module_t *dmp)
 {
+	int i;
+
 	ctf_close(dmp->dm_ctfp);
 	dmp->dm_ctfp = NULL;
 
@@ -733,6 +933,17 @@ dt_module_unload(dtrace_hdl_t *dtp, dt_module_t *dmp)
 	}
 #endif
 
+	if (dmp->dm_libctfp != NULL) {
+		for (i = 0; i < dmp->dm_nctflibs; i++) {
+			ctf_close(dmp->dm_libctfp[i]);
+			free(dmp->dm_libctfn[i]);
+		}
+		free(dmp->dm_libctfp);
+		free(dmp->dm_libctfn);
+		dmp->dm_libctfp = NULL;
+		dmp->dm_nctflibs = 0;
+	}
+
 	bzero(&dmp->dm_ctdata, sizeof (ctf_sect_t));
 	bzero(&dmp->dm_symtab, sizeof (ctf_sect_t));
 	bzero(&dmp->dm_strtab, sizeof (ctf_sect_t));
@@ -778,6 +989,8 @@ dt_module_unload(dtrace_hdl_t *dtp, dt_module_t *dmp)
 	(void) elf_end(dmp->dm_elf);
 	dmp->dm_elf = NULL;
 
+	dmp->dm_pid = 0;
+
 	dmp->dm_flags &= ~DT_DM_LOADED;
 }
 
@@ -866,6 +1079,34 @@ dt_module_modelname(dt_module_t *dmp)
 		return ("32-bit");
 }
 
+/* ARGSUSED */
+int
+dt_module_getlibid(dtrace_hdl_t *dtp, dt_module_t *dmp, const ctf_file_t *fp)
+{
+	int i;
+
+	for (i = 0; i < dmp->dm_nctflibs; i++) {
+		if (dmp->dm_libctfp[i] == fp)
+			return (i);
+	}
+
+	return (-1);
+}
+
+/* ARGSUSED */
+ctf_file_t *
+dt_module_getctflib(dtrace_hdl_t *dtp, dt_module_t *dmp, const char *name)
+{
+	int i;
+
+	for (i = 0; i < dmp->dm_nctflibs; i++) {
+		if (strcmp(dmp->dm_libctfn[i], name) == 0)
+			return (dmp->dm_libctfp[i]);
+	}
+
+	return (NULL);
+}
+
 /*
  * Update our module cache by adding an entry for the specified module 'name'.
  * We create the dt_module_t and populate it using /system/object/<name>/.
@@ -1294,8 +1535,10 @@ dtrace_lookup_by_type(dtrace_hdl_t *dtp, const char *object, const char *name,
 	dt_module_t *dmp;
 	int found = 0;
 	ctf_id_t id;
-	uint_t n;
+	uint_t n, i;
 	int justone;
+	ctf_file_t *fp;
+	char *buf, *p, *q;
 
 	uint_t mask = 0; /* mask of dt_module flags to match */
 	uint_t bits = 0; /* flag bits that must be present */
@@ -1310,7 +1553,6 @@ dtrace_lookup_by_type(dtrace_hdl_t *dtp, const char *object, const char *name,
 			return (-1); /* dt_errno is set for us */
 		n = 1;
 		justone = 1;
-
 	} else {
 		if (object == DTRACE_OBJ_KMODS)
 			mask = bits = DT_DM_KERNEL;
@@ -1334,7 +1576,7 @@ dtrace_lookup_by_type(dtrace_hdl_t *dtp, const char *object, const char *name,
 		 * module.  If our search was scoped to only one module then
 		 * return immediately leaving dt_errno unmodified.
 		 */
-		if (dt_module_getctf(dtp, dmp) == NULL) {
+		if (dt_module_hasctf(dtp, dmp) == 0) {
 			if (justone)
 				return (-1);
 			continue;
@@ -1346,13 +1588,38 @@ dtrace_lookup_by_type(dtrace_hdl_t *dtp, const char *object, const char *name,
 		 * 'tip' and keep going in the hope that we will locate the
 		 * underlying structure definition.  Otherwise just return.
 		 */
-		if ((id = ctf_lookup_by_name(dmp->dm_ctfp, name)) != CTF_ERR) {
+		if (dmp->dm_pid == 0) {
+			id = ctf_lookup_by_name(dmp->dm_ctfp, name);
+			fp = dmp->dm_ctfp;
+		} else {
+			if ((p = strchr(name, '`')) != NULL) {
+				buf = strdup(name);
+				if (buf == NULL)
+					return (dt_set_errno(dtp, EDT_NOMEM));
+				p = strchr(buf, '`');
+				if ((q = strchr(p + 1, '`')) != NULL)
+					p = q;
+				*p = '\0';
+				fp = dt_module_getctflib(dtp, dmp, buf);
+				if (fp == NULL || (id = ctf_lookup_by_name(fp,
+				    p + 1)) == CTF_ERR)
+					id = CTF_ERR;
+				free(buf);
+			} else {
+				for (i = 0; i < dmp->dm_nctflibs; i++) {
+					fp = dmp->dm_libctfp[i];
+					id = ctf_lookup_by_name(fp, name);
+					if (id != CTF_ERR)
+						break;
+				}
+			}
+		}
+		if (id != CTF_ERR) {
 			tip->dtt_object = dmp->dm_name;
-			tip->dtt_ctfp = dmp->dm_ctfp;
+			tip->dtt_ctfp = fp;
 			tip->dtt_type = id;
-
-			if (ctf_type_kind(dmp->dm_ctfp, ctf_type_resolve(
-			    dmp->dm_ctfp, id)) != CTF_K_FORWARD)
+			if (ctf_type_kind(fp, ctf_type_resolve(fp, id)) !=
+			    CTF_K_FORWARD)
 				return (0);
 
 			found++;
@@ -1374,6 +1641,7 @@ dtrace_symbol_type(dtrace_hdl_t *dtp, const GElf_Sym *symp,
 	tip->dtt_object = NULL;
 	tip->dtt_ctfp = NULL;
 	tip->dtt_type = CTF_ERR;
+	tip->dtt_flags = 0;
 
 	if ((dmp = dt_module_lookup_by_name(dtp, sip->dts_object)) == NULL)
 		return (dt_set_errno(dtp, EDT_NOMOD));
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.h b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.h
index 8334a2bb811e..d103e028e425 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.h
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.h
@@ -23,12 +23,13 @@
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright (c) 2013, Joyent, Inc.  All rights reserved.
+ */
 
 #ifndef	_DT_MODULE_H
 #define	_DT_MODULE_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <dt_impl.h>
 
 #ifdef	__cplusplus
@@ -43,11 +44,16 @@ extern void dt_module_destroy(dtrace_hdl_t *, dt_module_t *);
 extern dt_module_t *dt_module_lookup_by_name(dtrace_hdl_t *, const char *);
 extern dt_module_t *dt_module_lookup_by_ctf(dtrace_hdl_t *, ctf_file_t *);
 
+extern int dt_module_hasctf(dtrace_hdl_t *, dt_module_t *);
 extern ctf_file_t *dt_module_getctf(dtrace_hdl_t *, dt_module_t *);
 extern dt_ident_t *dt_module_extern(dtrace_hdl_t *, dt_module_t *,
     const char *, const dtrace_typeinfo_t *);
 
 extern const char *dt_module_modelname(dt_module_t *);
+extern int dt_module_getlibid(dtrace_hdl_t *, dt_module_t *,
+    const ctf_file_t *);
+extern ctf_file_t *dt_module_getctflib(dtrace_hdl_t *, dt_module_t *,
+    const char *);
 
 #ifdef	__cplusplus
 }
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
index 92251d5f4f4b..f6c140bdeec8 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
@@ -122,8 +122,12 @@
 #define	DT_VERS_1_8_1	DT_VERSION_NUMBER(1, 8, 1)
 #define	DT_VERS_1_9	DT_VERSION_NUMBER(1, 9, 0)
 #define	DT_VERS_1_9_1	DT_VERSION_NUMBER(1, 9, 1)
-#define	DT_VERS_LATEST	DT_VERS_1_9_1
-#define	DT_VERS_STRING	"Sun D 1.9.1"
+#define	DT_VERS_1_10	DT_VERSION_NUMBER(1, 10, 0)
+#define	DT_VERS_1_11	DT_VERSION_NUMBER(1, 11, 0)
+#define	DT_VERS_1_12	DT_VERSION_NUMBER(1, 12, 0)
+#define	DT_VERS_1_12_1	DT_VERSION_NUMBER(1, 12, 1)
+#define	DT_VERS_LATEST	DT_VERS_1_12_1
+#define	DT_VERS_STRING	"Sun D 1.12.1"
 
 const dt_version_t _dtrace_versions[] = {
 	DT_VERS_1_0,	/* D API 1.0.0 (PSARC 2001/466) Solaris 10 FCS */
@@ -145,6 +149,10 @@ const dt_version_t _dtrace_versions[] = {
 	DT_VERS_1_8_1,	/* D API 1.8.1 */
 	DT_VERS_1_9,	/* D API 1.9 */
 	DT_VERS_1_9_1,	/* D API 1.9.1 */
+	DT_VERS_1_10,	/* D API 1.10 */
+	DT_VERS_1_11,	/* D API 1.11 */
+	DT_VERS_1_12,	/* D API 1.12 */
+	DT_VERS_1_12_1,	/* D API 1.12.1 */
 	0
 };
 
@@ -275,6 +283,8 @@ static const dt_ident_t _dtrace_globals[] = {
 	&dt_idops_func, "uint64_t(uint64_t)" },
 { "htons", DT_IDENT_FUNC, 0, DIF_SUBR_HTONS, DT_ATTR_EVOLCMN, DT_VERS_1_3,
 	&dt_idops_func, "uint16_t(uint16_t)" },
+{ "getf", DT_IDENT_FUNC, 0, DIF_SUBR_GETF, DT_ATTR_STABCMN, DT_VERS_1_10,
+	&dt_idops_func, "file_t *(int)" },
 { "gid", DT_IDENT_SCALAR, 0, DIF_VAR_GID, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_type, "gid_t" },
 { "id", DT_IDENT_SCALAR, 0, DIF_VAR_ID, DT_ATTR_STABCMN, DT_VERS_1_0,
@@ -297,6 +307,8 @@ static const dt_ident_t _dtrace_globals[] = {
 	DT_VERS_1_5, &dt_idops_func, "string(int, void *)" },
 { "ipl", DT_IDENT_SCALAR, 0, DIF_VAR_IPL, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_type, "uint_t" },
+{ "json", DT_IDENT_FUNC, 0, DIF_SUBR_JSON, DT_ATTR_STABCMN, DT_VERS_1_11,
+	&dt_idops_func, "string(const char *, const char *)" },
 { "jstack", DT_IDENT_ACTFUNC, 0, DT_ACT_JSTACK, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_func, "stack(...)" },
 { "lltostr", DT_IDENT_FUNC, 0, DIF_SUBR_LLTOSTR, DT_ATTR_STABCMN, DT_VERS_1_0,
@@ -448,6 +460,8 @@ static const dt_ident_t _dtrace_globals[] = {
 	&dt_idops_func, "string(const char *, const char *)" },
 { "strtok", DT_IDENT_FUNC, 0, DIF_SUBR_STRTOK, DT_ATTR_STABCMN, DT_VERS_1_1,
 	&dt_idops_func, "string(const char *, const char *)" },
+{ "strtoll", DT_IDENT_FUNC, 0, DIF_SUBR_STRTOLL, DT_ATTR_STABCMN, DT_VERS_1_11,
+	&dt_idops_func, "int64_t(const char *, [int])" },
 { "substr", DT_IDENT_FUNC, 0, DIF_SUBR_SUBSTR, DT_ATTR_STABCMN, DT_VERS_1_1,
 	&dt_idops_func, "string(const char *, int, [int])" },
 { "sum", DT_IDENT_AGGFUNC, 0, DTRACEAGG_SUM, DT_ATTR_STABCMN, DT_VERS_1_0,
@@ -1144,6 +1158,7 @@ dt_vopen(int version, int flags, int *errp,
 	dtp->dt_linktype = DT_LTYP_ELF;
 	dtp->dt_xlatemode = DT_XL_STATIC;
 	dtp->dt_stdcmode = DT_STDC_XA;
+	dtp->dt_encoding = DT_ENCODING_UNSET;
 	dtp->dt_version = version;
 	dtp->dt_fd = dtfd;
 	dtp->dt_ftfd = ftfd;
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c
index c20d250d0b8e..832af888446a 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c
@@ -25,6 +25,7 @@
  */
 
 /*
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
@@ -336,6 +337,23 @@ dt_opt_linktype(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
 	return (0);
 }
 
+/*ARGSUSED*/
+static int
+dt_opt_encoding(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
+{
+	if (arg == NULL)
+		return (dt_set_errno(dtp, EDT_BADOPTVAL));
+
+	if (strcmp(arg, "ascii") == 0)
+		dtp->dt_encoding = DT_ENCODING_ASCII;
+	else if (strcmp(arg, "utf8") == 0)
+		dtp->dt_encoding = DT_ENCODING_UTF8;
+	else
+		return (dt_set_errno(dtp, EDT_BADOPTVAL));
+
+	return (0);
+}
+
 /*ARGSUSED*/
 static int
 dt_opt_evaltime(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
@@ -928,6 +946,7 @@ static const dt_option_t _dtrace_ctoptions[] = {
 	{ "define", dt_opt_cpp_opts, (uintptr_t)"-D" },
 	{ "droptags", dt_opt_droptags },
 	{ "empty", dt_opt_cflags, DTRACE_C_EMPTY },
+	{ "encoding", dt_opt_encoding },
 	{ "errtags", dt_opt_cflags, DTRACE_C_ETAGS },
 	{ "evaltime", dt_opt_evaltime },
 	{ "incdir", dt_opt_cpp_opts, (uintptr_t)"-I" },
@@ -988,11 +1007,14 @@ static const dt_option_t _dtrace_rtoptions[] = {
  * Dynamic run-time options.
  */
 static const dt_option_t _dtrace_drtoptions[] = {
+	{ "agghist", dt_opt_runtime, DTRACEOPT_AGGHIST },
+	{ "aggpack", dt_opt_runtime, DTRACEOPT_AGGPACK },
 	{ "aggrate", dt_opt_rate, DTRACEOPT_AGGRATE },
 	{ "aggsortkey", dt_opt_runtime, DTRACEOPT_AGGSORTKEY },
 	{ "aggsortkeypos", dt_opt_runtime, DTRACEOPT_AGGSORTKEYPOS },
 	{ "aggsortpos", dt_opt_runtime, DTRACEOPT_AGGSORTPOS },
 	{ "aggsortrev", dt_opt_runtime, DTRACEOPT_AGGSORTREV },
+	{ "aggzoom", dt_opt_runtime, DTRACEOPT_AGGZOOM },
 	{ "flowindent", dt_opt_runtime, DTRACEOPT_FLOWINDENT },
 	{ "quiet", dt_opt_runtime, DTRACEOPT_QUIET },
 	{ "rawbytes", dt_opt_runtime, DTRACEOPT_RAWBYTES },
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c
index 5b3be7de728e..6ce3dadd4e84 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c
@@ -22,8 +22,8 @@
 
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Copyright (c) 2011, Joyent Inc. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013, Joyent Inc. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -197,7 +197,7 @@ dt_type_lookup(const char *s, dtrace_typeinfo_t *tip)
 {
 	static const char delimiters[] = " \t\n\r\v\f*`";
 	dtrace_hdl_t *dtp = yypcb->pcb_hdl;
-	const char *p, *q, *end, *obj;
+	const char *p, *q, *r, *end, *obj;
 
 	for (p = s, end = s + strlen(s); *p != '\0'; p = q) {
 		while (isspace(*p))
@@ -225,8 +225,23 @@ dt_type_lookup(const char *s, dtrace_typeinfo_t *tip)
 			bcopy(s, type, (size_t)(p - s));
 			bcopy(q + 1, type + (size_t)(p - s), strlen(q + 1) + 1);
 
-			if (strchr(q + 1, '`') != NULL)
-				return (dt_set_errno(dtp, EDT_BADSCOPE));
+			/*
+			 * There may be at most three delimeters. The second
+			 * delimeter is usually used to distinguish the type
+			 * within a given module, however, there could be a link
+			 * map id on the scene in which case that delimeter
+			 * would be the third. We determine presence of the lmid
+			 * if it rouglhly meets the from LM[0-9]
+			 */
+			if ((r = strchr(q + 1, '`')) != NULL &&
+			    ((r = strchr(r + 1, '`')) != NULL)) {
+				if (strchr(r + 1, '`') != NULL)
+					return (dt_set_errno(dtp,
+					    EDT_BADSCOPE));
+				if (q[1] != 'L' || q[2] != 'M')
+					return (dt_set_errno(dtp,
+					    EDT_BADSCOPE));
+			}
 
 			return (dtrace_lookup_by_type(dtp, object, type, tip));
 		}
@@ -256,6 +271,7 @@ dt_type_pointer(dtrace_typeinfo_t *tip)
 	ctf_file_t *ctfp = tip->dtt_ctfp;
 	ctf_id_t type = tip->dtt_type;
 	ctf_id_t base = ctf_type_resolve(ctfp, type);
+	uint_t bflags = tip->dtt_flags;
 
 	dt_module_t *dmp;
 	ctf_id_t ptr;
@@ -287,6 +303,7 @@ dt_type_pointer(dtrace_typeinfo_t *tip)
 	tip->dtt_object = dmp->dm_name;
 	tip->dtt_ctfp = dmp->dm_ctfp;
 	tip->dtt_type = ptr;
+	tip->dtt_flags = bflags;
 
 	return (0);
 }
@@ -390,7 +407,7 @@ void
 dt_node_promote(dt_node_t *lp, dt_node_t *rp, dt_node_t *dnp)
 {
 	dt_type_promote(lp, rp, &dnp->dn_ctfp, &dnp->dn_type);
-	dt_node_type_assign(dnp, dnp->dn_ctfp, dnp->dn_type);
+	dt_node_type_assign(dnp, dnp->dn_ctfp, dnp->dn_type, B_FALSE);
 	dt_node_attr_assign(dnp, dt_attr_min(lp->dn_attr, rp->dn_attr));
 }
 
@@ -659,7 +676,8 @@ dt_node_attr_assign(dt_node_t *dnp, dtrace_attribute_t attr)
 }
 
 void
-dt_node_type_assign(dt_node_t *dnp, ctf_file_t *fp, ctf_id_t type)
+dt_node_type_assign(dt_node_t *dnp, ctf_file_t *fp, ctf_id_t type,
+    boolean_t user)
 {
 	ctf_id_t base = ctf_type_resolve(fp, type);
 	uint_t kind = ctf_type_kind(fp, base);
@@ -691,6 +709,9 @@ dt_node_type_assign(dt_node_t *dnp, ctf_file_t *fp, ctf_id_t type)
 	    type == DT_DYN_TYPE(yypcb->pcb_hdl))
 		dnp->dn_flags |= DT_NF_REF;
 
+	if (user)
+		dnp->dn_flags |= DT_NF_USERLAND;
+
 	dnp->dn_flags |= DT_NF_COOKED;
 	dnp->dn_ctfp = fp;
 	dnp->dn_type = type;
@@ -728,6 +749,7 @@ size_t
 dt_node_type_size(const dt_node_t *dnp)
 {
 	ctf_id_t base;
+	dtrace_hdl_t *dtp = yypcb->pcb_hdl;
 
 	if (dnp->dn_kind == DT_NODE_STRING)
 		return (strlen(dnp->dn_string) + 1);
@@ -740,6 +762,20 @@ dt_node_type_size(const dt_node_t *dnp)
 	if (ctf_type_kind(dnp->dn_ctfp, base) == CTF_K_FORWARD)
 		return (0);
 
+	/*
+	 * Here we have a 32-bit user pointer that is being used with a 64-bit
+	 * kernel. When we're using it and its tagged as a userland reference --
+	 * then we need to keep it as a 32-bit pointer. However, if we are
+	 * referring to it as a kernel address, eg. being used after a copyin()
+	 * then we need to make sure that we actually return the kernel's size
+	 * of a pointer, 8 bytes.
+	 */
+	if (ctf_type_kind(dnp->dn_ctfp, base) == CTF_K_POINTER &&
+	    ctf_getmodel(dnp->dn_ctfp) == CTF_MODEL_ILP32 &&
+	    !(dnp->dn_flags & DT_NF_USERLAND) &&
+	    dtp->dt_conf.dtc_ctfmodel == CTF_MODEL_LP64)
+			return (8);
+
 	return (ctf_type_size(dnp->dn_ctfp, dnp->dn_type));
 }
 
@@ -1226,7 +1262,7 @@ dt_node_int(uintmax_t value)
 		if (value <= dtp->dt_ints[i].did_limit) {
 			dt_node_type_assign(dnp,
 			    dtp->dt_ints[i].did_ctfp,
-			    dtp->dt_ints[i].did_type);
+			    dtp->dt_ints[i].did_type, B_FALSE);
 
 			/*
 			 * If a prefix character is present in macro text, add
@@ -1261,7 +1297,7 @@ dt_node_string(char *string)
 	dnp = dt_node_alloc(DT_NODE_STRING);
 	dnp->dn_op = DT_TOK_STRING;
 	dnp->dn_string = string;
-	dt_node_type_assign(dnp, DT_STR_CTFP(dtp), DT_STR_TYPE(dtp));
+	dt_node_type_assign(dnp, DT_STR_CTFP(dtp), DT_STR_TYPE(dtp), B_FALSE);
 
 	return (dnp);
 }
@@ -1337,7 +1373,8 @@ dt_node_type(dt_decl_t *ddp)
 	dnp = dt_node_alloc(DT_NODE_TYPE);
 	dnp->dn_op = DT_TOK_IDENT;
 	dnp->dn_string = name;
-	dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type);
+
+	dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type, dtt.dtt_flags);
 
 	if (dtt.dtt_ctfp == dtp->dt_cdefs->dm_ctfp ||
 	    dtt.dtt_ctfp == dtp->dt_ddefs->dm_ctfp)
@@ -1581,7 +1618,8 @@ dt_node_decl(void)
 		bzero(&idn, sizeof (dt_node_t));
 
 		if (idp != NULL && idp->di_type != CTF_ERR)
-			dt_node_type_assign(&idn, idp->di_ctfp, idp->di_type);
+			dt_node_type_assign(&idn, idp->di_ctfp, idp->di_type,
+			    B_FALSE);
 		else if (idp != NULL)
 			(void) dt_ident_cook(&idn, idp, NULL);
 
@@ -1791,7 +1829,7 @@ dt_node_offsetof(dt_decl_t *ddp, char *s)
 	}
 
 	bzero(&dn, sizeof (dn));
-	dt_node_type_assign(&dn, dtt.dtt_ctfp, ctm.ctm_type);
+	dt_node_type_assign(&dn, dtt.dtt_ctfp, ctm.ctm_type, B_FALSE);
 
 	if (dn.dn_flags & DT_NF_BITFIELD) {
 		xyerror(D_OFFSETOF_BITFIELD,
@@ -1847,7 +1885,8 @@ dt_node_op1(int op, dt_node_t *cp)
 		}
 
 		dt_node_type_assign(cp, dtp->dt_ddefs->dm_ctfp,
-		    ctf_lookup_by_name(dtp->dt_ddefs->dm_ctfp, "size_t"));
+		    ctf_lookup_by_name(dtp->dt_ddefs->dm_ctfp, "size_t"),
+		    B_FALSE);
 
 		cp->dn_kind = DT_NODE_INT;
 		cp->dn_op = DT_TOK_INT;
@@ -1925,17 +1964,17 @@ dt_node_op2(int op, dt_node_t *lp, dt_node_t *rp)
 		case DT_TOK_LOR:
 			dnp->dn_value = l || r;
 			dt_node_type_assign(dnp,
-			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp));
+			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp), B_FALSE);
 			break;
 		case DT_TOK_LXOR:
 			dnp->dn_value = (l != 0) ^ (r != 0);
 			dt_node_type_assign(dnp,
-			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp));
+			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp), B_FALSE);
 			break;
 		case DT_TOK_LAND:
 			dnp->dn_value = l && r;
 			dt_node_type_assign(dnp,
-			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp));
+			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp), B_FALSE);
 			break;
 		case DT_TOK_BOR:
 			dnp->dn_value = l | r;
@@ -1952,12 +1991,12 @@ dt_node_op2(int op, dt_node_t *lp, dt_node_t *rp)
 		case DT_TOK_EQU:
 			dnp->dn_value = l == r;
 			dt_node_type_assign(dnp,
-			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp));
+			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp), B_FALSE);
 			break;
 		case DT_TOK_NEQ:
 			dnp->dn_value = l != r;
 			dt_node_type_assign(dnp,
-			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp));
+			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp), B_FALSE);
 			break;
 		case DT_TOK_LT:
 			dt_node_promote(lp, rp, dnp);
@@ -1966,7 +2005,7 @@ dt_node_op2(int op, dt_node_t *lp, dt_node_t *rp)
 			else
 				dnp->dn_value = l < r;
 			dt_node_type_assign(dnp,
-			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp));
+			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp), B_FALSE);
 			break;
 		case DT_TOK_LE:
 			dt_node_promote(lp, rp, dnp);
@@ -1975,7 +2014,7 @@ dt_node_op2(int op, dt_node_t *lp, dt_node_t *rp)
 			else
 				dnp->dn_value = l <= r;
 			dt_node_type_assign(dnp,
-			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp));
+			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp), B_FALSE);
 			break;
 		case DT_TOK_GT:
 			dt_node_promote(lp, rp, dnp);
@@ -1984,7 +2023,7 @@ dt_node_op2(int op, dt_node_t *lp, dt_node_t *rp)
 			else
 				dnp->dn_value = l > r;
 			dt_node_type_assign(dnp,
-			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp));
+			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp), B_FALSE);
 			break;
 		case DT_TOK_GE:
 			dt_node_promote(lp, rp, dnp);
@@ -1993,7 +2032,7 @@ dt_node_op2(int op, dt_node_t *lp, dt_node_t *rp)
 			else
 				dnp->dn_value = l >= r;
 			dt_node_type_assign(dnp,
-			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp));
+			    DT_INT_CTFP(dtp), DT_INT_TYPE(dtp), B_FALSE);
 			break;
 		case DT_TOK_LSH:
 			dnp->dn_value = l << r;
@@ -2234,7 +2273,7 @@ dt_node_inline(dt_node_t *expr)
 	 * until we have successfully cooked the right-hand expression, below.
 	 */
 	dnp = dt_node_alloc(DT_NODE_INLINE);
-	dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type);
+	dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type, B_FALSE);
 	dt_node_attr_assign(dnp, _dtrace_defattr);
 
 	if (dt_node_is_void(dnp)) {
@@ -2389,7 +2428,8 @@ dt_node_member(dt_decl_t *ddp, char *name, dt_node_t *expr)
 	dnp->dn_membexpr = expr;
 
 	if (ddp != NULL)
-		dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type);
+		dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type,
+		    dtt.dtt_flags);
 
 	return (dnp);
 }
@@ -2420,10 +2460,10 @@ dt_node_xlator(dt_decl_t *ddp, dt_decl_t *sdp, char *name, dt_node_t *members)
 	}
 
 	bzero(&sn, sizeof (sn));
-	dt_node_type_assign(&sn, src.dtt_ctfp, src.dtt_type);
+	dt_node_type_assign(&sn, src.dtt_ctfp, src.dtt_type, B_FALSE);
 
 	bzero(&dn, sizeof (dn));
-	dt_node_type_assign(&dn, dst.dtt_ctfp, dst.dtt_type);
+	dt_node_type_assign(&dn, dst.dtt_ctfp, dst.dtt_type, B_FALSE);
 
 	if (dt_xlator_lookup(dtp, &sn, &dn, DT_XLATE_EXACT) != NULL) {
 		xyerror(D_XLATE_REDECL,
@@ -2669,7 +2709,7 @@ dt_xcook_ident(dt_node_t *dnp, dt_idhash_t *dhp, uint_t idkind, int create)
 			attr = dt_ident_cook(dnp, idp, NULL);
 		else {
 			dt_node_type_assign(dnp,
-			    DT_DYN_CTFP(dtp), DT_DYN_TYPE(dtp));
+			    DT_DYN_CTFP(dtp), DT_DYN_TYPE(dtp), B_FALSE);
 			attr = idp->di_attr;
 		}
 
@@ -2745,7 +2785,8 @@ dt_xcook_ident(dt_node_t *dnp, dt_idhash_t *dhp, uint_t idkind, int create)
 		dnp->dn_ident = idp;
 		dnp->dn_flags |= DT_NF_LVALUE;
 
-		dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type);
+		dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type,
+		    dtt.dtt_flags);
 		dt_node_attr_assign(dnp, _dtrace_symattr);
 
 		if (uref) {
@@ -2793,7 +2834,7 @@ dt_xcook_ident(dt_node_t *dnp, dt_idhash_t *dhp, uint_t idkind, int create)
 			attr = dt_ident_cook(dnp, idp, NULL);
 		else {
 			dt_node_type_assign(dnp,
-			    DT_DYN_CTFP(dtp), DT_DYN_TYPE(dtp));
+			    DT_DYN_CTFP(dtp), DT_DYN_TYPE(dtp), B_FALSE);
 			attr = idp->di_attr;
 		}
 
@@ -2896,7 +2937,8 @@ dt_cook_op1(dt_node_t *dnp, uint_t idflags)
 			xyerror(D_TYPE_ERR, "failed to lookup int64_t\n");
 
 		dt_ident_type_assign(cp->dn_ident, dtt.dtt_ctfp, dtt.dtt_type);
-		dt_node_type_assign(cp, dtt.dtt_ctfp, dtt.dtt_type);
+		dt_node_type_assign(cp, dtt.dtt_ctfp, dtt.dtt_type,
+		    dtt.dtt_flags);
 	}
 
 	if (cp->dn_kind == DT_NODE_VAR)
@@ -2913,7 +2955,8 @@ dt_cook_op1(dt_node_t *dnp, uint_t idflags)
 
 			dnp->dn_ident = &dxp->dx_souid;
 			dt_node_type_assign(dnp,
-			    dnp->dn_ident->di_ctfp, dnp->dn_ident->di_type);
+			    dnp->dn_ident->di_ctfp, dnp->dn_ident->di_type,
+			    cp->dn_flags & DT_NF_USERLAND);
 			break;
 		}
 
@@ -2933,7 +2976,8 @@ dt_cook_op1(dt_node_t *dnp, uint_t idflags)
 			    "cannot dereference non-pointer type\n");
 		}
 
-		dt_node_type_assign(dnp, cp->dn_ctfp, type);
+		dt_node_type_assign(dnp, cp->dn_ctfp, type,
+		    cp->dn_flags & DT_NF_USERLAND);
 		base = ctf_type_resolve(cp->dn_ctfp, type);
 		kind = ctf_type_kind(cp->dn_ctfp, base);
 
@@ -2990,7 +3034,8 @@ dt_cook_op1(dt_node_t *dnp, uint_t idflags)
 			xyerror(D_OP_SCALAR, "operator %s requires an operand "
 			    "of scalar type\n", opstr(dnp->dn_op));
 		}
-		dt_node_type_assign(dnp, DT_INT_CTFP(dtp), DT_INT_TYPE(dtp));
+		dt_node_type_assign(dnp, DT_INT_CTFP(dtp), DT_INT_TYPE(dtp),
+		    B_FALSE);
 		break;
 
 	case DT_TOK_ADDROF:
@@ -3023,10 +3068,8 @@ dt_cook_op1(dt_node_t *dnp, uint_t idflags)
 			    dt_node_type_name(cp, n, sizeof (n)));
 		}
 
-		dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type);
-
-		if (cp->dn_flags & DT_NF_USERLAND)
-			dnp->dn_flags |= DT_NF_USERLAND;
+		dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type,
+		    cp->dn_flags & DT_NF_USERLAND);
 		break;
 
 	case DT_TOK_SIZEOF:
@@ -3041,7 +3084,8 @@ dt_cook_op1(dt_node_t *dnp, uint_t idflags)
 		}
 
 		dt_node_type_assign(dnp, dtp->dt_ddefs->dm_ctfp,
-		    ctf_lookup_by_name(dtp->dt_ddefs->dm_ctfp, "size_t"));
+		    ctf_lookup_by_name(dtp->dt_ddefs->dm_ctfp, "size_t"),
+		    B_FALSE);
 		break;
 
 	case DT_TOK_STRINGOF:
@@ -3051,7 +3095,8 @@ dt_cook_op1(dt_node_t *dnp, uint_t idflags)
 			    "cannot apply stringof to a value of type %s\n",
 			    dt_node_type_name(cp, n, sizeof (n)));
 		}
-		dt_node_type_assign(dnp, DT_STR_CTFP(dtp), DT_STR_TYPE(dtp));
+		dt_node_type_assign(dnp, DT_STR_CTFP(dtp), DT_STR_TYPE(dtp),
+		    cp->dn_flags & DT_NF_USERLAND);
 		break;
 
 	case DT_TOK_PREINC:
@@ -3244,7 +3289,8 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
 			    "of scalar type\n", opstr(op));
 		}
 
-		dt_node_type_assign(dnp, DT_INT_CTFP(dtp), DT_INT_TYPE(dtp));
+		dt_node_type_assign(dnp, DT_INT_CTFP(dtp), DT_INT_TYPE(dtp),
+		    B_FALSE);
 		dt_node_attr_assign(dnp, dt_attr_min(lp->dn_attr, rp->dn_attr));
 		break;
 
@@ -3288,7 +3334,8 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
 			rp->dn_op = DT_TOK_INT;
 			rp->dn_value = (intmax_t)val;
 
-			dt_node_type_assign(rp, lp->dn_ctfp, lp->dn_type);
+			dt_node_type_assign(rp, lp->dn_ctfp, lp->dn_type,
+			    B_FALSE);
 			dt_node_attr_assign(rp, _dtrace_symattr);
 		}
 
@@ -3320,7 +3367,8 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
 			    dt_node_type_name(rp, n2, sizeof (n2)));
 		}
 
-		dt_node_type_assign(dnp, DT_INT_CTFP(dtp), DT_INT_TYPE(dtp));
+		dt_node_type_assign(dnp, DT_INT_CTFP(dtp), DT_INT_TYPE(dtp),
+		    B_FALSE);
 		dt_node_attr_assign(dnp, dt_attr_min(lp->dn_attr, rp->dn_attr));
 		break;
 
@@ -3368,7 +3416,7 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
 			    dt_node_type_name(rp, n2, sizeof (n2)));
 		}
 
-		dt_node_type_assign(dnp, ctfp, type);
+		dt_node_type_assign(dnp, ctfp, type, B_FALSE);
 		dt_node_attr_assign(dnp, dt_attr_min(lp->dn_attr, rp->dn_attr));
 
 		if (uref)
@@ -3509,7 +3557,7 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
 		 */
 		if (lp->dn_kind == DT_NODE_VAR &&
 		    dt_ident_unref(lp->dn_ident)) {
-			dt_node_type_assign(lp, ctfp, type);
+			dt_node_type_assign(lp, ctfp, type, B_FALSE);
 			dt_ident_type_assign(lp->dn_ident, ctfp, type);
 
 			if (uref) {
@@ -3723,7 +3771,7 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
 		type = ctf_type_resolve(ctfp, m.ctm_type);
 		kind = ctf_type_kind(ctfp, type);
 
-		dt_node_type_assign(dnp, ctfp, m.ctm_type);
+		dt_node_type_assign(dnp, ctfp, m.ctm_type, B_FALSE);
 		dt_node_attr_assign(dnp, lp->dn_attr);
 
 		if (op == DT_TOK_PTR && (kind != CTF_K_ARRAY ||
@@ -3849,7 +3897,8 @@ dt_cook_op2(dt_node_t *dnp, uint_t idflags)
 		}
 
 		dnp->dn_ident = dt_xlator_ident(dxp, lp->dn_ctfp, lp->dn_type);
-		dt_node_type_assign(dnp, DT_DYN_CTFP(dtp), DT_DYN_TYPE(dtp));
+		dt_node_type_assign(dnp, DT_DYN_CTFP(dtp), DT_DYN_TYPE(dtp),
+		    B_FALSE);
 		dt_node_attr_assign(dnp,
 		    dt_attr_min(rp->dn_attr, dnp->dn_ident->di_attr));
 		break;
@@ -4014,7 +4063,7 @@ dt_cook_op3(dt_node_t *dnp, uint_t idflags)
 		    "used in a conditional context\n");
 	}
 
-	dt_node_type_assign(dnp, ctfp, type);
+	dt_node_type_assign(dnp, ctfp, type, B_FALSE);
 	dt_node_attr_assign(dnp, dt_attr_min(dnp->dn_expr->dn_attr,
 	    dt_attr_min(lp->dn_attr, rp->dn_attr)));
 
@@ -4047,7 +4096,8 @@ dt_cook_aggregation(dt_node_t *dnp, uint_t idflags)
 		dt_node_attr_assign(dnp, dt_ident_cook(dnp,
 		    dnp->dn_ident, &dnp->dn_aggtup));
 	} else {
-		dt_node_type_assign(dnp, DT_DYN_CTFP(dtp), DT_DYN_TYPE(dtp));
+		dt_node_type_assign(dnp, DT_DYN_CTFP(dtp), DT_DYN_TYPE(dtp),
+		    B_FALSE);
 		dt_node_attr_assign(dnp, dnp->dn_ident->di_attr);
 	}
 
@@ -4249,7 +4299,8 @@ dt_cook_xlator(dt_node_t *dnp, uint_t idflags)
 		}
 
 		(void) dt_node_cook(mnp, DT_IDFLG_REF);
-		dt_node_type_assign(mnp, dxp->dx_dst_ctfp, ctm.ctm_type);
+		dt_node_type_assign(mnp, dxp->dx_dst_ctfp, ctm.ctm_type,
+		    B_FALSE);
 		attr = dt_attr_min(attr, mnp->dn_attr);
 
 		if (dt_node_is_argcompat(mnp, mnp->dn_membexpr) == 0) {
@@ -4268,7 +4319,7 @@ dt_cook_xlator(dt_node_t *dnp, uint_t idflags)
 	dxp->dx_souid.di_attr = attr;
 	dxp->dx_ptrid.di_attr = attr;
 
-	dt_node_type_assign(dnp, DT_DYN_CTFP(dtp), DT_DYN_TYPE(dtp));
+	dt_node_type_assign(dnp, DT_DYN_CTFP(dtp), DT_DYN_TYPE(dtp), B_FALSE);
 	dt_node_attr_assign(dnp, _dtrace_defattr);
 
 	return (dnp);
@@ -4561,7 +4612,9 @@ dt_node_diftype(dtrace_hdl_t *dtp, const dt_node_t *dnp, dtrace_diftype_t *tp)
 		    ctf_type_resolve(dnp->dn_ctfp, dnp->dn_type));
 	}
 
-	tp->dtdt_flags = (dnp->dn_flags & DT_NF_REF) ? DIF_TF_BYREF : 0;
+	tp->dtdt_flags = (dnp->dn_flags & DT_NF_REF) ?
+	    (dnp->dn_flags & DT_NF_USERLAND) ? DIF_TF_BYUREF :
+	    DIF_TF_BYREF : 0;
 	tp->dtdt_pad = 0;
 	tp->dtdt_size = ctf_type_size(dnp->dn_ctfp, dnp->dn_type);
 }
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h
index 6064efb2e65a..38f21c9f2e9e 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h
@@ -22,12 +22,14 @@
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Joyent, Inc. All rights reserved.
+ */
 
 #ifndef	_DT_PARSER_H
 #define	_DT_PARSER_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/dtrace.h>
 
@@ -223,7 +225,7 @@ extern void dt_node_list_free(dt_node_t **);
 extern void dt_node_link_free(dt_node_t **);
 
 extern void dt_node_attr_assign(dt_node_t *, dtrace_attribute_t);
-extern void dt_node_type_assign(dt_node_t *, ctf_file_t *, ctf_id_t);
+extern void dt_node_type_assign(dt_node_t *, ctf_file_t *, ctf_id_t, boolean_t);
 extern void dt_node_type_propagate(const dt_node_t *, dt_node_t *);
 extern const char *dt_node_type_name(const dt_node_t *, char *, size_t);
 extern size_t dt_node_type_size(const dt_node_t *);
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
index b145818db4d6..c865a2df7702 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
@@ -23,6 +23,9 @@
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright (c) 2013, Joyent, Inc.  All rights reserved.
+ */
 
 #include <assert.h>
 #include <strings.h>
@@ -35,6 +38,7 @@
 #endif
 #include <libgen.h>
 #include <stddef.h>
+#include <sys/sysmacros.h>
 
 #include <dt_impl.h>
 #include <dt_program.h>
@@ -43,6 +47,7 @@
 #if !defined(sun)
 #include <libproc_compat.h>
 #endif
+#include <dt_module.h>
 
 typedef struct dt_pid_probe {
 	dtrace_hdl_t *dpp_dtp;
@@ -827,3 +832,170 @@ dt_pid_create_probes_module(dtrace_hdl_t *dtp, dt_proc_t *dpr)
 
 	return (ret);
 }
+
+/*
+ * libdtrace has a backroom deal with us to ask us for type information on
+ * behalf of pid provider probes when fasttrap doesn't return any type
+ * information. Instead we'll look up the module and see if there is type
+ * information available. However, if there is no type information available due
+ * to a lack of CTF data, then we want to make sure that DTrace still carries on
+ * in face of that. As such we don't have a meaningful exit code about failure.
+ * We emit information about why we failed to the dtrace debug log so someone
+ * can figure it out by asking nicely for DTRACE_DEBUG.
+ */
+void
+dt_pid_get_types(dtrace_hdl_t *dtp, const dtrace_probedesc_t *pdp,
+    dtrace_argdesc_t *adp, int *nargs)
+{
+	dt_module_t *dmp;
+	ctf_file_t *fp;
+	ctf_funcinfo_t f;
+	ctf_id_t argv[32];
+	GElf_Sym sym;
+#if defined(sun)
+	prsyminfo_t si;
+#else
+	void *si;
+#endif
+	struct ps_prochandle *p;
+	int i, args;
+	char buf[DTRACE_ARGTYPELEN];
+	const char *mptr;
+	char *eptr;
+	int ret = 0;
+	int argc = sizeof (argv) / sizeof (ctf_id_t);
+	Lmid_t lmid;
+
+	/* Set up a potential outcome */
+	args = *nargs;
+	*nargs = 0;
+
+	/*
+	 * If we don't have an entry or return probe then we can just stop right
+	 * now as we don't have arguments for offset probes.
+	 */
+	if (strcmp(pdp->dtpd_name, "entry") != 0 &&
+	    strcmp(pdp->dtpd_name, "return") != 0)
+		return;
+
+	dmp = dt_module_create(dtp, pdp->dtpd_provider);
+	if (dmp == NULL) {
+		dt_dprintf("failed to find module for %s\n",
+		    pdp->dtpd_provider);
+		return;
+	}
+	if (dt_module_load(dtp, dmp) != 0) {
+		dt_dprintf("failed to load module for %s\n",
+		    pdp->dtpd_provider);
+		return;
+	}
+
+	/*
+	 * We may be working with a module that doesn't have ctf. If that's the
+	 * case then we just return now and move on with life.
+	 */
+	fp = dt_module_getctflib(dtp, dmp, pdp->dtpd_mod);
+	if (fp == NULL) {
+		dt_dprintf("no ctf container for  %s\n",
+		    pdp->dtpd_mod);
+		return;
+	}
+	p = dt_proc_grab(dtp, dmp->dm_pid, 0, PGRAB_RDONLY | PGRAB_FORCE);
+	if (p == NULL) {
+		dt_dprintf("failed to grab pid\n");
+		return;
+	}
+	dt_proc_lock(dtp, p);
+
+	/*
+	 * Check to see if the D module has a link map ID and separate that out
+	 * for properly interrogating libproc.
+	 */
+	if ((mptr = strchr(pdp->dtpd_mod, '`')) != NULL) {
+		if (strlen(pdp->dtpd_mod) < 3) {
+			dt_dprintf("found weird modname with linkmap, "
+			    "aborting: %s\n", pdp->dtpd_mod);
+			goto out;
+		}
+		if (pdp->dtpd_mod[0] != 'L' || pdp->dtpd_mod[1] != 'M') {
+			dt_dprintf("missing leading 'LM', "
+			    "aborting: %s\n", pdp->dtpd_mod);
+			goto out;
+		}
+		errno = 0;
+		lmid = strtol(pdp->dtpd_mod + 2, &eptr, 16);
+		if (errno == ERANGE || eptr != mptr) {
+			dt_dprintf("failed to parse out lmid, aborting: %s\n",
+			    pdp->dtpd_mod);
+			goto out;
+		}
+		mptr++;
+	} else {
+		mptr = pdp->dtpd_mod;
+		lmid = 0;
+	}
+
+	if (Pxlookup_by_name(p, lmid, mptr, pdp->dtpd_func,
+	    &sym, &si) != 0) {
+		dt_dprintf("failed to find function %s in %s`%s\n",
+		    pdp->dtpd_func, pdp->dtpd_provider, pdp->dtpd_mod);
+		goto out;
+	}
+#if defined(sun)
+	if (ctf_func_info(fp, si.prs_id, &f) == CTF_ERR) {
+		dt_dprintf("failed to get ctf information for %s in %s`%s\n",
+		    pdp->dtpd_func, pdp->dtpd_provider, pdp->dtpd_mod);
+		goto out;
+	}
+#endif
+
+	(void) snprintf(buf, sizeof (buf), "%s`%s", pdp->dtpd_provider,
+	    pdp->dtpd_mod);
+
+	if (strcmp(pdp->dtpd_name, "return") == 0) {
+		if (args < 2)
+			goto out;
+
+		bzero(adp, sizeof (dtrace_argdesc_t));
+		adp->dtargd_ndx = 0;
+		adp->dtargd_id = pdp->dtpd_id;
+		adp->dtargd_mapping = adp->dtargd_ndx;
+		/*
+		 * We explicitly leave out the library here, we only care that
+		 * it is some int. We are assuming that there is no ctf
+		 * container in here that is lying about what an int is.
+		 */
+		(void) snprintf(adp->dtargd_native, DTRACE_ARGTYPELEN,
+		    "user %s`%s", pdp->dtpd_provider, "int");
+		adp++;
+		bzero(adp, sizeof (dtrace_argdesc_t));
+		adp->dtargd_ndx = 1;
+		adp->dtargd_id = pdp->dtpd_id;
+		adp->dtargd_mapping = adp->dtargd_ndx;
+		ret = snprintf(adp->dtargd_native, DTRACE_ARGTYPELEN,
+		    "userland ");
+		(void) ctf_type_qname(fp, f.ctc_return, adp->dtargd_native +
+		    ret, DTRACE_ARGTYPELEN - ret, buf);
+		*nargs = 2;
+#if defined(sun)
+	} else {
+		if (ctf_func_args(fp, si.prs_id, argc, argv) == CTF_ERR)
+			goto out;
+
+		*nargs = MIN(args, f.ctc_argc);
+		for (i = 0; i < *nargs; i++, adp++) {
+			bzero(adp, sizeof (dtrace_argdesc_t));
+			adp->dtargd_ndx = i;
+			adp->dtargd_id = pdp->dtpd_id;
+			adp->dtargd_mapping = adp->dtargd_ndx;
+			ret = snprintf(adp->dtargd_native, DTRACE_ARGTYPELEN,
+			    "userland ");
+			(void) ctf_type_qname(fp, argv[i], adp->dtargd_native +
+			    ret, DTRACE_ARGTYPELEN - ret, buf);
+		}
+#endif
+	}
+out:
+	dt_proc_unlock(dtp, p);
+	dt_proc_release(dtp, p);
+}
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.h b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.h
index 886e33d8339a..4bf39c864580 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.h
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.h
@@ -24,12 +24,13 @@
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright (c) 2013, Joyent, Inc.  All rights reserved.
+ */
 
 #ifndef	_DT_PID_H
 #define	_DT_PID_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <libproc.h>
 #include <sys/fasttrap.h>
 #include <dt_impl.h>
@@ -57,6 +58,9 @@ extern int dt_pid_create_offset_probe(struct ps_prochandle *, dtrace_hdl_t *,
 extern int dt_pid_create_glob_offset_probes(struct ps_prochandle *,
     dtrace_hdl_t *, fasttrap_probe_spec_t *, const GElf_Sym *, const char *);
 
+extern void dt_pid_get_types(dtrace_hdl_t *, const dtrace_probedesc_t *,
+    dtrace_argdesc_t *, int *);
+
 #ifdef	__cplusplus
 }
 #endif
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c
index ccfa3da39dfe..fb8ea16289ef 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c
@@ -647,12 +647,16 @@ dtrace_print(dtrace_hdl_t *dtp, FILE *fp, const char *typename,
 	dt_printarg_t pa;
 	ctf_id_t id;
 	dt_module_t *dmp;
+	ctf_file_t *ctfp;
+	int libid;
 
 	/*
 	 * Split the fully-qualified type ID (module`id).  This should
 	 * always be the format, but if for some reason we don't find the
 	 * expected value, return 0 to fall back to the generic trace()
-	 * behavior.
+	 * behavior. In the case of userland CTF modules this will actually be
+	 * of the format (module`lib`id). This is due to the fact that those
+	 * modules have multiple CTF containers which `lib` identifies.
 	 */
 	for (s = typename; *s != '\0' && *s != '`'; s++)
 		;
@@ -663,6 +667,20 @@ dtrace_print(dtrace_hdl_t *dtp, FILE *fp, const char *typename,
 	object = alloca(s - typename + 1);
 	bcopy(typename, object, s - typename);
 	object[s - typename] = '\0';
+	dmp = dt_module_lookup_by_name(dtp, object);
+	if (dmp == NULL)
+		return (0);
+
+	if (dmp->dm_pid != 0) {
+		libid = atoi(s + 1);
+		s = strchr(s + 1, '`');
+		if (s == NULL || libid > dmp->dm_nctflibs)
+			return (0);
+		ctfp = dmp->dm_libctfp[libid];
+	} else {
+		ctfp = dt_module_getctf(dtp, dmp);
+	}
+
 	id = atoi(s + 1);
 
 	/*
@@ -670,16 +688,13 @@ dtrace_print(dtrace_hdl_t *dtp, FILE *fp, const char *typename,
 	 * wrong and we can't resolve the ID, bail out and let trace() do the
 	 * work.
 	 */
-	dmp = dt_module_lookup_by_name(dtp, object);
-	if (dmp == NULL || ctf_type_kind(dt_module_getctf(dtp, dmp),
-	    id) == CTF_ERR) {
+	if (ctfp == NULL || ctf_type_kind(ctfp, id) == CTF_ERR)
 		return (0);
-	}
 
 	/* setup the print structure and kick off the main print routine */
 	pa.pa_dtp = dtp;
 	pa.pa_addr = addr;
-	pa.pa_ctfp = dt_module_getctf(dtp, dmp);
+	pa.pa_ctfp = ctfp;
 	pa.pa_nest = 0;
 	pa.pa_depth = 0;
 	pa.pa_file = fp;
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
index e4cbd210d4b5..eeb8735f6f05 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
@@ -21,8 +21,8 @@
 
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, Joyent, Inc. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #if defined(sun)
@@ -1075,7 +1075,7 @@ dt_printf_validate(dt_pfargv_t *pfv, uint_t flags,
 		xyerror(D_TYPE_ERR, "failed to lookup agg type %s\n", aggtype);
 
 	bzero(&aggnode, sizeof (aggnode));
-	dt_node_type_assign(&aggnode, dtt.dtt_ctfp, dtt.dtt_type);
+	dt_node_type_assign(&aggnode, dtt.dtt_ctfp, dtt.dtt_type, B_FALSE);
 
 	for (i = 0, j = 0; i < pfv->pfv_argc; i++, pfd = pfd->pfd_next) {
 		const dt_pfconv_t *pfc = pfd->pfd_conv;
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c
index 188ce0e05796..0f1bfe07b7b1 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c
@@ -23,8 +23,9 @@
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2013, Joyent, Inc.  All rights reserved.
+ */
 
 #include <sys/types.h>
 #if defined(sun)
@@ -45,6 +46,8 @@
 #include <dt_module.h>
 #include <dt_string.h>
 #include <dt_list.h>
+#include <dt_pid.h>
+#include <dtrace.h>
 
 static dt_provider_t *
 dt_provider_insert(dtrace_hdl_t *dtp, dt_provider_t *pvp, uint_t h)
@@ -272,6 +275,21 @@ dt_probe_discover(dt_provider_t *pvp, const dtrace_probedesc_t *pdp)
 	xc = i;
 	nc++;
 
+	/*
+	 * The pid provider believes in giving the kernel a break. No reason to
+	 * give the kernel all the ctf containers that we're keeping ourselves
+	 * just to get it back from it. So if we're coming from a pid provider
+	 * probe and the kernel gave us no argument information we'll get some
+	 * here. If for some crazy reason the kernel knows about our userland
+	 * types then we just ignore this.
+	 */
+	if (xc == 0 && nc == 0 &&
+	    strncmp(pvp->pv_desc.dtvd_name, "pid", 3) == 0) {
+		nc = adc;
+		dt_pid_get_types(dtp, pdp, adv, &nc);
+		xc = nc;
+	}
+
 	/*
 	 * Now that we have discovered the number of native and translated
 	 * arguments from the argument descriptions, allocate a new probe ident
@@ -318,7 +336,8 @@ dt_probe_discover(dt_provider_t *pvp, const dtrace_probedesc_t *pdp)
 			dtt.dtt_type = CTF_ERR;
 		} else {
 			dt_node_type_assign(prp->pr_nargv[adp->dtargd_mapping],
-			    dtt.dtt_ctfp, dtt.dtt_type);
+			    dtt.dtt_ctfp, dtt.dtt_type,
+			    dtt.dtt_flags & DTT_FL_USER ? B_TRUE : B_FALSE);
 		}
 
 		if (dtt.dtt_type != CTF_ERR && (adp->dtargd_xlate[0] == '\0' ||
@@ -337,7 +356,7 @@ dt_probe_discover(dt_provider_t *pvp, const dtrace_probedesc_t *pdp)
 			dtt.dtt_type = CTF_ERR;
 		} else {
 			dt_node_type_assign(prp->pr_xargv[i],
-			    dtt.dtt_ctfp, dtt.dtt_type);
+			    dtt.dtt_ctfp, dtt.dtt_type, B_FALSE);
 		}
 
 		prp->pr_mapping[i] = adp->dtargd_mapping;
@@ -638,7 +657,7 @@ dt_probe_tag(dt_probe_t *prp, uint_t argn, dt_node_t *dnp)
 	bzero(dnp, sizeof (dt_node_t));
 	dnp->dn_kind = DT_NODE_TYPE;
 
-	dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type);
+	dt_node_type_assign(dnp, dtt.dtt_ctfp, dtt.dtt_type, B_FALSE);
 	dt_node_attr_assign(dnp, _dtrace_defattr);
 
 	return (dnp);
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c
index 68e64bb1970c..d19fb88245e2 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c
@@ -184,7 +184,7 @@ dtrace_go(dtrace_hdl_t *dtp)
 {
 	dtrace_enable_io_t args;
 	void *dof;
-	int err;
+	int error, r;
 
 	if (dtp->dt_active)
 		return (dt_set_errno(dtp, EINVAL));
@@ -206,11 +206,12 @@ dtrace_go(dtrace_hdl_t *dtp)
 
 	args.dof = dof;
 	args.n_matched = 0;
-	err = dt_ioctl(dtp, DTRACEIOC_ENABLE, &args);
+	r = dt_ioctl(dtp, DTRACEIOC_ENABLE, &args);
+	error = errno;
 	dtrace_dof_destroy(dtp, dof);
 
-	if (err == -1 && (errno != ENOTTY || dtp->dt_vector == NULL))
-		return (dt_set_errno(dtp, errno));
+	if (r == -1 && (error != ENOTTY || dtp->dt_vector == NULL))
+		return (dt_set_errno(dtp, error));
 
 	if (dt_ioctl(dtp, DTRACEIOC_GO, &dtp->dt_beganon) == -1) {
 		if (errno == EACCES)
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_xlator.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_xlator.c
index 7ac0cc42f558..74bd48786131 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_xlator.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_xlator.c
@@ -23,8 +23,10 @@
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Joyent, Inc. All rights reserved.
+ */
 
 #include <strings.h>
 #include <assert.h>
@@ -69,7 +71,7 @@ dt_xlator_create_member(const char *name, ctf_id_t type, ulong_t off, void *arg)
 	enp->dn_op = DT_TOK_XLATE;
 	enp->dn_xlator = dxp;
 	enp->dn_xmember = mnp;
-	dt_node_type_assign(enp, dxp->dx_dst_ctfp, type);
+	dt_node_type_assign(enp, dxp->dx_dst_ctfp, type, B_FALSE);
 
 	/*
 	 * For the member itself, we use a DT_NODE_MEMBER as usual with the
@@ -83,7 +85,7 @@ dt_xlator_create_member(const char *name, ctf_id_t type, ulong_t off, void *arg)
 
 	mnp->dn_membname = strdup(name);
 	mnp->dn_membexpr = enp;
-	dt_node_type_assign(mnp, dxp->dx_dst_ctfp, type);
+	dt_node_type_assign(mnp, dxp->dx_dst_ctfp, type, B_FALSE);
 
 	if (mnp->dn_membname == NULL)
 		return (dt_set_errno(dtp, EDT_NOMEM));
@@ -318,7 +320,8 @@ dt_xlator_lookup(dtrace_hdl_t *dtp, dt_node_t *src, dt_node_t *dst, int flags)
 
 	for (dxp = dt_list_next(&dtp->dt_xlators); dxp != NULL;
 	    dxp = dt_list_next(dxp)) {
-		dt_node_type_assign(&xn, dxp->dx_src_ctfp, dxp->dx_src_type);
+		dt_node_type_assign(&xn, dxp->dx_src_ctfp, dxp->dx_src_type,
+		    B_FALSE);
 		if (ctf_type_compat(dxp->dx_dst_ctfp, dxp->dx_dst_base,
 		    dst_ctfp, dst_base) && dt_node_is_argcompat(src, &xn))
 			goto out;
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h b/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h
index b2e31086cf30..6f88e6d46c42 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h
@@ -25,7 +25,8 @@
  */
 
 /*
- * Copyright (c) 2011, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  */
 
 #ifndef	_DTRACE_H
@@ -356,6 +357,12 @@ extern int dtrace_handle_setopt(dtrace_hdl_t *,
 #define	DTRACE_A_PERCPU		0x0001
 #define	DTRACE_A_KEEPDELTA	0x0002
 #define	DTRACE_A_ANONYMOUS	0x0004
+#define	DTRACE_A_TOTAL		0x0008
+#define	DTRACE_A_MINMAXBIN	0x0010
+#define	DTRACE_A_HASNEGATIVES	0x0020
+#define	DTRACE_A_HASPOSITIVES	0x0040
+
+#define	DTRACE_AGGZOOM_MAX		0.95	/* height of max bar */
 
 #define	DTRACE_AGGWALK_ERROR		-1	/* error while processing */
 #define	DTRACE_AGGWALK_NEXT		0	/* proceed to next element */
@@ -376,6 +383,10 @@ struct dtrace_aggdata {
 	caddr_t dtada_delta;			/* delta data, if available */
 	caddr_t *dtada_percpu;			/* per CPU data, if avail */
 	caddr_t *dtada_percpu_delta;		/* per CPU delta, if avail */
+	int64_t dtada_total;			/* per agg total, if avail */
+	uint16_t dtada_minbin;			/* minimum bin, if avail */
+	uint16_t dtada_maxbin;			/* maximum bin, if avail */
+	uint32_t dtada_flags;			/* flags */
 };
 
 typedef int dtrace_aggregate_f(const dtrace_aggdata_t *, void *);
@@ -495,8 +506,11 @@ typedef struct dtrace_typeinfo {
 	const char *dtt_object;			/* object containing type */
 	ctf_file_t *dtt_ctfp;			/* CTF container handle */
 	ctf_id_t dtt_type;			/* CTF type identifier */
+	uint_t dtt_flags;			/* Misc. flags */
 } dtrace_typeinfo_t;
 
+#define	DTT_FL_USER	0x1			/* user type */
+
 extern int dtrace_lookup_by_type(dtrace_hdl_t *, const char *, const char *,
     dtrace_typeinfo_t *);
 
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
index 24131d68e71b..ef18b457e056 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
@@ -42,6 +42,7 @@
 #include <sys/fs/zfs.h>
 #include <sys/avl.h>
 #include <sys/zfs_ioctl.h>
+#include <libzfs_core.h>
 
 #ifdef	__cplusplus
 extern "C" {
@@ -607,13 +608,16 @@ typedef struct sendflags {
 
 	/* show progress (ie. -v) */
 	boolean_t progress;
+
+	/* WRITE_EMBEDDED records of type DATA are permitted */
+	boolean_t embed_data;
 } sendflags_t;
 
 typedef boolean_t (snapfilter_cb_t)(zfs_handle_t *, void *);
 
 extern int zfs_send(zfs_handle_t *, const char *, const char *,
     sendflags_t *, int, snapfilter_cb_t, void *, nvlist_t **);
-extern int zfs_send_one(zfs_handle_t *, const char *, int);
+extern int zfs_send_one(zfs_handle_t *, const char *, int, enum lzc_send_flags);
 
 extern int zfs_promote(zfs_handle_t *);
 extern int zfs_hold(zfs_handle_t *, const char *, const char *,
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
index 3c8119de5330..a3f6129876c9 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
@@ -72,16 +72,23 @@ zcmd_ioctl(int fd, int request, zfs_cmd_t *zc)
 	if (zfs_ioctl_version == ZFS_IOCVER_UNDEF)
 		zfs_ioctl_version = get_zfs_ioctl_version();
 
-	if (zfs_ioctl_version == ZFS_IOCVER_LZC)
-		cflag = ZFS_CMD_COMPAT_LZC;
-	else if (zfs_ioctl_version == ZFS_IOCVER_DEADMAN)
-		cflag = ZFS_CMD_COMPAT_DEADMAN;
-
-	/*
-	 * If vfs.zfs.version.ioctl is not defined, assume we have v28
-	 * compatible binaries and use vfs.zfs.version.spa to test for v15
-	 */
-	if (zfs_ioctl_version < ZFS_IOCVER_DEADMAN) {
+	if (zfs_ioctl_version >= ZFS_IOCVER_DEADMAN) {
+		switch (zfs_ioctl_version) {
+		case ZFS_IOCVER_ZCMD:
+			cflag = ZFS_CMD_COMPAT_ZCMD;
+			break;
+		case ZFS_IOCVER_LZC:
+			cflag = ZFS_CMD_COMPAT_LZC;
+			break;
+		case ZFS_IOCVER_DEADMAN:
+			cflag = ZFS_CMD_COMPAT_DEADMAN;
+			break;
+		}
+	} else {
+		/*
+		 * If vfs.zfs.version.ioctl is not defined, assume we have v28
+		 * compatible binaries and use vfs.zfs.version.spa to test for v15
+		 */
 		cflag = ZFS_CMD_COMPAT_V28;
 
 		if (zfs_spa_version < 0)
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
index 11378a2c2f27..d7126bf77bbe 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2012 DEY Storage Systems, Inc.  All rights reserved.
  * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
  * All rights reserved.
@@ -3873,7 +3873,6 @@ zfs_rename(zfs_handle_t *zhp, const char *source, const char *target,
 	     strcmp(property, "none") == 0)) {
 		flags.nounmount = B_TRUE;
 	}
-
 	if (flags.recurse) {
 
 		parentname = zfs_strdup(zhp->zfs_hdl, zhp->zfs_name);
@@ -3888,8 +3887,7 @@ zfs_rename(zfs_handle_t *zhp, const char *source, const char *target,
 			ret = -1;
 			goto error;
 		}
-
-	} else {
+	} else if (zhp->zfs_type != ZFS_TYPE_SNAPSHOT) {
 		if ((cl = changelist_gather(zhp, ZFS_PROP_NAME,
 		    flags.nounmount ? CL_GATHER_DONT_UNMOUNT : 0,
 		    flags.forceunmount ? MS_FORCE : 0)) == NULL) {
@@ -3941,23 +3939,23 @@ zfs_rename(zfs_handle_t *zhp, const char *source, const char *target,
 		 * On failure, we still want to remount any filesystems that
 		 * were previously mounted, so we don't alter the system state.
 		 */
-		if (!flags.recurse)
+		if (cl != NULL)
 			(void) changelist_postfix(cl);
 	} else {
-		if (!flags.recurse) {
+		if (cl != NULL) {
 			changelist_rename(cl, zfs_get_name(zhp), target);
 			ret = changelist_postfix(cl);
 		}
 	}
 
 error:
-	if (parentname) {
+	if (parentname != NULL) {
 		free(parentname);
 	}
-	if (zhrp) {
+	if (zhrp != NULL) {
 		zfs_close(zhrp);
 	}
-	if (cl) {
+	if (cl != NULL) {
 		changelist_free(cl);
 	}
 	return (ret);
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
index b2959dd1b841..f8596ede3ba6 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
@@ -21,6 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014 by Delphix. All rights reserved.
  */
 
 /*
@@ -736,16 +737,6 @@ zfs_share_proto(zfs_handle_t *zhp, zfs_share_proto_t *proto)
 	if (!zfs_is_mountable(zhp, mountpoint, sizeof (mountpoint), NULL))
 		return (0);
 
-#ifdef sun
-	if ((ret = zfs_init_libshare(hdl, SA_INIT_SHARE_API)) != SA_OK) {
-		(void) zfs_error_fmt(hdl, EZFS_SHARENFSFAILED,
-		    dgettext(TEXT_DOMAIN, "cannot share '%s': %s"),
-		    zfs_get_name(zhp), _sa_errorstr != NULL ?
-		    _sa_errorstr(ret) : "");
-		return (-1);
-	}
-#endif
-
 	for (curr_proto = proto; *curr_proto != PROTO_END; curr_proto++) {
 		/*
 		 * Return success if there are no share options.
@@ -756,6 +747,17 @@ zfs_share_proto(zfs_handle_t *zhp, zfs_share_proto_t *proto)
 		    strcmp(shareopts, "off") == 0)
 			continue;
 
+#ifdef illumos
+		ret = zfs_init_libshare(hdl, SA_INIT_SHARE_API);
+		if (ret != SA_OK) {
+			(void) zfs_error_fmt(hdl, EZFS_SHARENFSFAILED,
+			    dgettext(TEXT_DOMAIN, "cannot share '%s': %s"),
+			    zfs_get_name(zhp), _sa_errorstr != NULL ?
+			    _sa_errorstr(ret) : "");
+			return (-1);
+		}
+#endif
+
 		/*
 		 * If the 'zoned' property is set, then zfs_is_mountable()
 		 * will have already bailed out if we are in the global zone.
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
index 02f0b96b8c11..30b2d87ce66d 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  */
 
@@ -303,6 +303,7 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf, size_t len,
 		case ZPOOL_PROP_ALLOCATED:
 		case ZPOOL_PROP_FREE:
 		case ZPOOL_PROP_FREEING:
+		case ZPOOL_PROP_LEAKED:
 		case ZPOOL_PROP_EXPANDSZ:
 			if (literal) {
 				(void) snprintf(buf, len, "%llu",
@@ -321,6 +322,14 @@ zpool_get_prop(zpool_handle_t *zhp, zpool_prop_t prop, char *buf, size_t len,
 				    (u_longlong_t)intval);
 			}
 			break;
+		case ZPOOL_PROP_FRAGMENTATION:
+			if (intval == UINT64_MAX) {
+				(void) strlcpy(buf, "-", len);
+			} else {
+				(void) snprintf(buf, len, "%llu%%",
+				    (u_longlong_t)intval);
+			}
+			break;
 
 		case ZPOOL_PROP_DEDUPRATIO:
 			(void) snprintf(buf, len, "%llu.%02llux",
@@ -3512,7 +3521,7 @@ zpool_vdev_name(libzfs_handle_t *hdl, zpool_handle_t *zhp, nvlist_t *nv,
 static int
 zbookmark_compare(const void *a, const void *b)
 {
-	return (memcmp(a, b, sizeof (zbookmark_t)));
+	return (memcmp(a, b, sizeof (zbookmark_phys_t)));
 }
 
 /*
@@ -3524,7 +3533,7 @@ zpool_get_errlog(zpool_handle_t *zhp, nvlist_t **nverrlistp)
 {
 	zfs_cmd_t zc = { 0 };
 	uint64_t count;
-	zbookmark_t *zb = NULL;
+	zbookmark_phys_t *zb = NULL;
 	int i;
 
 	/*
@@ -3537,7 +3546,7 @@ zpool_get_errlog(zpool_handle_t *zhp, nvlist_t **nverrlistp)
 	if (count == 0)
 		return (0);
 	if ((zc.zc_nvlist_dst = (uintptr_t)zfs_alloc(zhp->zpool_hdl,
-	    count * sizeof (zbookmark_t))) == (uintptr_t)NULL)
+	    count * sizeof (zbookmark_phys_t))) == (uintptr_t)NULL)
 		return (-1);
 	zc.zc_nvlist_dst_size = count;
 	(void) strcpy(zc.zc_name, zhp->zpool_name);
@@ -3546,11 +3555,14 @@ zpool_get_errlog(zpool_handle_t *zhp, nvlist_t **nverrlistp)
 		    &zc) != 0) {
 			free((void *)(uintptr_t)zc.zc_nvlist_dst);
 			if (errno == ENOMEM) {
+				void *dst;
+
 				count = zc.zc_nvlist_dst_size;
-				if ((zc.zc_nvlist_dst = (uintptr_t)
-				    zfs_alloc(zhp->zpool_hdl, count *
-				    sizeof (zbookmark_t))) == (uintptr_t)NULL)
+				dst = zfs_alloc(zhp->zpool_hdl, count *
+				    sizeof (zbookmark_phys_t));
+				if (dst == NULL)
 					return (-1);
+				zc.zc_nvlist_dst = (uintptr_t)dst;
 			} else {
 				return (-1);
 			}
@@ -3566,11 +3578,11 @@ zpool_get_errlog(zpool_handle_t *zhp, nvlist_t **nverrlistp)
 	 * _not_ copied as part of the process.  So we point the start of our
 	 * array appropriate and decrement the total number of elements.
 	 */
-	zb = ((zbookmark_t *)(uintptr_t)zc.zc_nvlist_dst) +
+	zb = ((zbookmark_phys_t *)(uintptr_t)zc.zc_nvlist_dst) +
 	    zc.zc_nvlist_dst_size;
 	count -= zc.zc_nvlist_dst_size;
 
-	qsort(zb, count, sizeof (zbookmark_t), zbookmark_compare);
+	qsort(zb, count, sizeof (zbookmark_phys_t), zbookmark_compare);
 
 	verify(nvlist_alloc(nverrlistp, 0, KM_SLEEP) == 0);
 
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
index feddb694c32a..97f18d7bb223 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
@@ -21,7 +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, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  * Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
  * All rights reserved.
@@ -45,6 +45,7 @@
 #include <time.h>
 
 #include <libzfs.h>
+#include <libzfs_core.h>
 
 #include "zfs_namecheck.h"
 #include "zfs_prop.h"
@@ -222,6 +223,7 @@ cksummer(void *arg)
 	struct drr_object *drro = &thedrr.drr_u.drr_object;
 	struct drr_write *drrw = &thedrr.drr_u.drr_write;
 	struct drr_spill *drrs = &thedrr.drr_u.drr_spill;
+	struct drr_write_embedded *drrwe = &thedrr.drr_u.drr_write_embedded;
 	FILE *ofp;
 	int outfd;
 	dmu_replay_record_t wbr_drr = {0};
@@ -418,6 +420,20 @@ cksummer(void *arg)
 			break;
 		}
 
+		case DRR_WRITE_EMBEDDED:
+		{
+			if (cksum_and_write(drr, sizeof (dmu_replay_record_t),
+			    &stream_cksum, outfd) == -1)
+				goto out;
+			(void) ssread(buf,
+			    P2ROUNDUP((uint64_t)drrwe->drr_psize, 8), ofp);
+			if (cksum_and_write(buf,
+			    P2ROUNDUP((uint64_t)drrwe->drr_psize, 8),
+			    &stream_cksum, outfd) == -1)
+				goto out;
+			break;
+		}
+
 		case DRR_FREE:
 		{
 			if (cksum_and_write(drr, sizeof (dmu_replay_record_t),
@@ -799,7 +815,7 @@ typedef struct send_dump_data {
 	char prevsnap[ZFS_MAXNAMELEN];
 	uint64_t prevsnap_obj;
 	boolean_t seenfrom, seento, replicate, doall, fromorigin;
-	boolean_t verbose, dryrun, parsable, progress;
+	boolean_t verbose, dryrun, parsable, progress, embed_data;
 	int outfd;
 	boolean_t err;
 	nvlist_t *fss;
@@ -878,7 +894,8 @@ estimate_ioctl(zfs_handle_t *zhp, uint64_t fromsnap_obj,
  */
 static int
 dump_ioctl(zfs_handle_t *zhp, const char *fromsnap, uint64_t fromsnap_obj,
-    boolean_t fromorigin, int outfd, nvlist_t *debugnv)
+    boolean_t fromorigin, int outfd, enum lzc_send_flags flags,
+    nvlist_t *debugnv)
 {
 	zfs_cmd_t zc = { 0 };
 	libzfs_handle_t *hdl = zhp->zfs_hdl;
@@ -892,6 +909,7 @@ dump_ioctl(zfs_handle_t *zhp, const char *fromsnap, uint64_t fromsnap_obj,
 	zc.zc_obj = fromorigin;
 	zc.zc_sendobj = zfs_prop_get_int(zhp, ZFS_PROP_OBJSETID);
 	zc.zc_fromobj = fromsnap_obj;
+	zc.zc_flags = flags;
 
 	VERIFY(0 == nvlist_alloc(&thisdbg, NV_UNIQUE_NAME, 0));
 	if (fromsnap && fromsnap[0] != '\0') {
@@ -1144,8 +1162,12 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
 			}
 		}
 
+		enum lzc_send_flags flags = 0;
+		if (sdd->embed_data)
+			flags |= LZC_SEND_FLAG_EMBED_DATA;
+
 		err = dump_ioctl(zhp, sdd->prevsnap, sdd->prevsnap_obj,
-		    fromorigin, sdd->outfd, sdd->debugnv);
+		    fromorigin, sdd->outfd, flags, sdd->debugnv);
 
 		if (sdd->progress) {
 			(void) pthread_cancel(tid);
@@ -1489,6 +1511,7 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
 	sdd.parsable = flags->parsable;
 	sdd.progress = flags->progress;
 	sdd.dryrun = flags->dryrun;
+	sdd.embed_data = flags->embed_data;
 	sdd.filter_cb = filter_func;
 	sdd.filter_cb_arg = cb_arg;
 	if (debugnvp)
@@ -1620,7 +1643,8 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
 }
 
 int
-zfs_send_one(zfs_handle_t *zhp, const char *from, int fd)
+zfs_send_one(zfs_handle_t *zhp, const char *from, int fd,
+    enum lzc_send_flags flags)
 {
 	int err;
 	libzfs_handle_t *hdl = zhp->zfs_hdl;
@@ -1629,7 +1653,7 @@ zfs_send_one(zfs_handle_t *zhp, const char *from, int fd)
 	(void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
 	    "warning: cannot send '%s'"), zhp->zfs_name);
 
-	err = lzc_send(zhp->zfs_name, from, fd);
+	err = lzc_send(zhp->zfs_name, from, fd, flags);
 	if (err != 0) {
 		switch (errno) {
 		case EXDEV:
@@ -2576,6 +2600,16 @@ recv_skip(libzfs_handle_t *hdl, int fd, boolean_t byteswap)
 			(void) recv_read(hdl, fd, buf,
 			    drr->drr_u.drr_spill.drr_length, B_FALSE, NULL);
 			break;
+		case DRR_WRITE_EMBEDDED:
+			if (byteswap) {
+				drr->drr_u.drr_write_embedded.drr_psize =
+				    BSWAP_32(drr->drr_u.drr_write_embedded.
+				    drr_psize);
+			}
+			(void) recv_read(hdl, fd, buf,
+			    P2ROUNDUP(drr->drr_u.drr_write_embedded.drr_psize,
+			    8), B_FALSE, NULL);
+			break;
 		case DRR_WRITE_BYREF:
 		case DRR_FREEOBJECTS:
 		case DRR_FREE:
diff --git a/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c b/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
index 1c87223373b8..cb38dc2d1282 100644
--- a/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
+++ b/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
@@ -486,6 +486,8 @@ lzc_get_holds(const char *snapname, nvlist_t **holdsp)
 }
 
 /*
+ * Generate a zfs send stream for the specified snapshot and write it to
+ * the specified file descriptor.
  *
  * "snapname" is the full name of the snapshot to send (e.g. "pool/fs@snap")
  *
@@ -499,9 +501,15 @@ lzc_get_holds(const char *snapname, nvlist_t **holdsp)
  * snapshot in the origin, etc.
  *
  * "fd" is the file descriptor to write the send stream to.
+ *
+ * If "flags" contains LZC_SEND_FLAG_EMBED_DATA, the stream is permitted
+ * to contain DRR_WRITE_EMBEDDED records with drr_etype==BP_EMBEDDED_TYPE_DATA,
+ * which the receiving system must support (as indicated by support
+ * for the "embedded_data" feature).
  */
 int
-lzc_send(const char *snapname, const char *from, int fd)
+lzc_send(const char *snapname, const char *from, int fd,
+    enum lzc_send_flags flags)
 {
 	nvlist_t *args;
 	int err;
@@ -510,6 +518,8 @@ lzc_send(const char *snapname, const char *from, int fd)
 	fnvlist_add_int32(args, "fd", fd);
 	if (from != NULL)
 		fnvlist_add_string(args, "fromsnap", from);
+	if (flags & LZC_SEND_FLAG_EMBED_DATA)
+		fnvlist_add_boolean(args, "embedok");
 	err = lzc_ioctl(ZFS_IOC_SEND_NEW, snapname, args, NULL);
 	nvlist_free(args);
 	return (err);
diff --git a/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h b/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
index 380560ff306e..99883fecc133 100644
--- a/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
+++ b/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
@@ -53,7 +53,11 @@ int lzc_hold(nvlist_t *, int, nvlist_t **);
 int lzc_release(nvlist_t *, nvlist_t **);
 int lzc_get_holds(const char *, nvlist_t **);
 
-int lzc_send(const char *, const char *, int);
+enum lzc_send_flags {
+	LZC_SEND_FLAG_EMBED_DATA = 1 << 0
+};
+
+int lzc_send(const char *, const char *, int, enum lzc_send_flags);
 int lzc_receive(const char *, nvlist_t *, const char *, boolean_t, int);
 int lzc_send_space(const char *, const char *, uint64_t *);
 
diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
index 2b174f9bed5d..1a2c2ac0fd98 100644
--- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <zlib.h>
+#include <libgen.h>
 #include <sys/spa.h>
 #include <sys/stat.h>
 #include <sys/processor.h>
@@ -52,6 +53,9 @@ char hw_serial[HW_HOSTID_LEN];
 kmutex_t cpu_lock;
 #endif
 
+/* If set, all blocks read will be copied to the specified directory. */
+char *vn_dumpdir = NULL;
+
 struct utsname utsname = {
 	"userland", "libzpool", "1", "1", "na"
 };
@@ -415,6 +419,7 @@ int
 vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3)
 {
 	int fd;
+	int dump_fd;
 	vnode_t *vp;
 	int old_umask;
 	char realpath[MAXPATHLEN];
@@ -463,6 +468,17 @@ vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3)
 	if (flags & FCREAT)
 		(void) umask(old_umask);
 
+	if (vn_dumpdir != NULL) {
+		char dumppath[MAXPATHLEN];
+		(void) snprintf(dumppath, sizeof (dumppath),
+		    "%s/%s", vn_dumpdir, basename(realpath));
+		dump_fd = open64(dumppath, O_CREAT | O_WRONLY, 0666);
+		if (dump_fd == -1)
+			return (errno);
+	} else {
+		dump_fd = -1;
+	}
+
 	if (fd == -1)
 		return (errno);
 
@@ -478,6 +494,7 @@ vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3)
 	vp->v_fd = fd;
 	vp->v_size = st.st_size;
 	vp->v_path = spa_strdup(path);
+	vp->v_dump_fd = dump_fd;
 
 	return (0);
 }
@@ -510,6 +527,11 @@ vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset,
 
 	if (uio == UIO_READ) {
 		iolen = pread64(vp->v_fd, addr, len, offset);
+		if (vp->v_dump_fd != -1) {
+			int status =
+			    pwrite64(vp->v_dump_fd, addr, iolen, offset);
+			ASSERT(status != -1);
+		}
 	} else {
 		/*
 		 * To simulate partial disk writes, we split writes into two
@@ -536,6 +558,8 @@ void
 vn_close(vnode_t *vp, int openflag, cred_t *cr, kthread_t *td)
 {
 	close(vp->v_fd);
+	if (vp->v_dump_fd != -1)
+		close(vp->v_dump_fd);
 	spa_strfree(vp->v_path);
 	umem_free(vp, sizeof (vnode_t));
 }
@@ -663,7 +687,7 @@ __dprintf(const char *file, const char *func, int line, const char *fmt, ...)
 		if (dprintf_find_string("pid"))
 			(void) printf("%d ", getpid());
 		if (dprintf_find_string("tid"))
-			(void) printf("%ul ", thr_self());
+			(void) printf("%lu ", thr_self());
 #if 0
 		if (dprintf_find_string("cpu"))
 			(void) printf("%u ", getcpuid());
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 cc8285d2ea96..03027c35dc05 100644
--- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
@@ -424,8 +424,10 @@ typedef struct vnode {
 	uint64_t	v_size;
 	int		v_fd;
 	char		*v_path;
+	int		v_dump_fd;
 } vnode_t;
 
+extern char *vn_dumpdir;
 #define	AV_SCANSTAMP_SZ	32		/* length of anti-virus scanstamp */
 
 typedef struct xoptattr {
diff --git a/cddl/lib/libdtrace/libproc_compat.h b/cddl/lib/libdtrace/libproc_compat.h
index d796f34f48aa..7e54ada6bf94 100644
--- a/cddl/lib/libdtrace/libproc_compat.h
+++ b/cddl/lib/libdtrace/libproc_compat.h
@@ -45,8 +45,10 @@
 #define	Pgrab_error strerror
 #define	Plmid_to_map(p, l, o) proc_obj2map((p), (o))
 #define	Plookup_by_addr proc_addr2sym
+#define	Pname_to_ctf(p, obj) NULL
 #define	Pname_to_map proc_name2map
 #define	Pobject_iter proc_iter_objs
+#define	Pobject_iter_resolved(p, f, arg) 1
 #define	Pobjname proc_objname
 #define	Pread proc_read
 #define	Prd_agent proc_rdagent
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 7d4528f6aafa..8f60a20a23a7 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -14,7 +14,7 @@
 .if exists(${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S)
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
 ATOMIC_SRCS=	opensolaris_atomic.S
-.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64"
+.if ${MACHINE_ARCH} != "sparc64"
 ACFLAGS+=	-Wa,--noexecstack
 .endif
 .else
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
index 1884d249d21b..bfcb017415ba 100644
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -18,6 +18,7 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
index adb5023a6e51..008788bd9366 100644
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
@@ -11,6 +11,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem
 CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs_core/common
 CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common
 CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
index fa9ab98f5b3a..0e2ec8f82e16 100644
--- a/cddl/usr.sbin/zdb/Makefile
+++ b/cddl/usr.sbin/zdb/Makefile
@@ -15,6 +15,7 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile
index 9ae33951d63f..8064cf1ea039 100644
--- a/cddl/usr.sbin/zhack/Makefile
+++ b/cddl/usr.sbin/zhack/Makefile
@@ -14,6 +14,7 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
diff --git a/contrib/binutils/gas/config/tc-arm.c b/contrib/binutils/gas/config/tc-arm.c
index 9efe5760e64f..08dbb6fff888 100644
--- a/contrib/binutils/gas/config/tc-arm.c
+++ b/contrib/binutils/gas/config/tc-arm.c
@@ -3837,6 +3837,7 @@ s_arm_eabi_attribute (int ignored ATTRIBUTE_UNUSED)
 #endif /* OBJ_ELF */
 
 static void s_arm_arch (int);
+static void s_arm_arch_extension (int);
 static void s_arm_object_arch (int);
 static void s_arm_cpu (int);
 static void s_arm_fpu (int);
@@ -3891,6 +3892,7 @@ const pseudo_typeS md_pseudo_table[] =
   { "syntax",	   s_syntax,	  0 },
   { "cpu",	   s_arm_cpu,	  0 },
   { "arch",	   s_arm_arch,	  0 },
+  { "arch_extension",	   s_arm_arch_extension,	  0 },
   { "object_arch", s_arm_object_arch,	0 },
   { "fpu",	   s_arm_fpu,	  0 },
 #ifdef OBJ_ELF
@@ -20154,6 +20156,7 @@ static const struct arm_option_cpu_value_table arm_extensions[] =
   {"xscale",		ARM_FEATURE (0, ARM_CEXT_XSCALE)},
   {"iwmmxt",		ARM_FEATURE (0, ARM_CEXT_IWMMXT)},
   {"iwmmxt2",		ARM_FEATURE (0, ARM_CEXT_IWMMXT2)},
+  {"sec",		ARM_FEATURE (ARM_EXT_V6Z, 0)},
   {NULL,		ARM_ARCH_NONE}
 };
 
@@ -20337,7 +20340,7 @@ arm_parse_arch (char * str)
     }
 
   for (opt = arm_archs; opt->name != NULL; opt++)
-    if (streq (opt->name, str))
+    if (strncmp (opt->name, str, optlen) == 0)
       {
 	march_cpu_opt = &opt->value;
 	march_fpu_opt = &opt->default_fpu;
@@ -20738,6 +20741,34 @@ s_arm_arch (int ignored ATTRIBUTE_UNUSED)
   ignore_rest_of_line ();
 }
 
+/* Parse a .arch_extension directive.  */
+
+static void
+s_arm_arch_extension (int ignored ATTRIBUTE_UNUSED)
+{
+  const struct arm_option_cpu_value_table *opt;
+  char saved_char;
+  char *name;
+
+  name = input_line_pointer;
+  while (*input_line_pointer && !ISSPACE(*input_line_pointer))
+    input_line_pointer++;
+  saved_char = *input_line_pointer;
+  *input_line_pointer = 0;
+
+  for (opt = arm_extensions; opt->name != NULL; opt++)
+    if (streq (opt->name, name))
+      {
+	ARM_MERGE_FEATURE_SETS (cpu_variant, cpu_variant, opt->value);
+	*input_line_pointer = saved_char;
+	demand_empty_rest_of_line ();
+	return;
+      }
+
+  as_bad (_("unknown architecture `%s'\n"), name);
+  *input_line_pointer = saved_char;
+  ignore_rest_of_line ();
+}
 
 /* Parse a .object_arch directive.  */
 
diff --git a/contrib/bmake/ChangeLog b/contrib/bmake/ChangeLog
index ba9cb272a486..1dbf0ef01f2c 100644
--- a/contrib/bmake/ChangeLog
+++ b/contrib/bmake/ChangeLog
@@ -1,3 +1,28 @@
+2014-06-20  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20140620
+	  Merge with NetBSD make, pick up
+	  o var.c return varNoError rather than var_Error for ::= modidiers.
+
+2014-05-22  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20140522
+	  Merge with NetBSD make, pick up
+	  o var.c detect some parse errors.
+
+2014-04-05  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* Fix spelling errors - patch from Pedro Giffuni
+
+2014-02-14  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20140214
+	  Merge with NetBSD make, pick up
+	  o .INCLUDEFROM*
+	  o use Var_Value to get MAKEOBJDIR[PREFIX]
+	  o reduced realloc'ign in brk_string.
+	* configure.in: add a check for compiler supporting __func__
+
 2014-01-03  Simon J. Gerraty  <sjg@bad.crufty.net>
 
 	* boot-strap: ignore mksrc=none
@@ -64,7 +89,7 @@
 
 	* Makefile (MAKE_VERSION): 20130716
 	  Merge with NetBSD make, pick up
-	  o number of gmake compatability tweaks
+	  o number of gmake compatibility tweaks
 	    -w for gmake style entering/leaving messages
 	    if .MAKE.LEVEL > 0 indicate it in progname "make[1]" etc.
 	    handle MAKEFLAGS containing only letters.
diff --git a/contrib/bmake/Makefile b/contrib/bmake/Makefile
index 6e4b8b4d0480..42258c4e854e 100644
--- a/contrib/bmake/Makefile
+++ b/contrib/bmake/Makefile
@@ -1,7 +1,7 @@
-#	$Id: Makefile,v 1.23 2014/01/02 22:20:52 sjg Exp $
+#	$Id: Makefile,v 1.27 2014/06/20 14:51:54 sjg Exp $
 
 # Base version on src date
-MAKE_VERSION= 20140101
+MAKE_VERSION= 20140620
 
 PROG=	bmake
 
@@ -117,7 +117,7 @@ MANTARGET?= man
 # turn this on by default - ignored if we are root
 WITH_INSTALL_AS_USER=
 
-# supress with -DWITHOUT_*
+# suppress with -DWITHOUT_*
 OPTIONS_DEFAULT_YES+= \
 	AUTOCONF_MK \
 	INSTALL_MK \
diff --git a/contrib/bmake/README b/contrib/bmake/README
index fb688a33bc65..d09e977e48be 100644
--- a/contrib/bmake/README
+++ b/contrib/bmake/README
@@ -18,7 +18,7 @@ interesting changes, so that bmake tracks it very closely.
 
 Building:
 
-The prefered way to bootstrap bmake is:
+The preferred way to bootstrap bmake is:
 
 ./bmake/boot-strap
 
diff --git a/contrib/bmake/bmake.1 b/contrib/bmake/bmake.1
index d6ead4926c95..5363e88b9b86 100644
--- a/contrib/bmake/bmake.1
+++ b/contrib/bmake/bmake.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.226 2013/11/07 18:50:46 dholland Exp $
+.\"	$NetBSD: make.1,v 1.229 2014/01/19 10:23:29 apb Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd October 25, 2013
+.Dd February 14, 2014
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -706,6 +706,10 @@ was executed.
 Refer to the description of
 .Ql Ev PWD
 for more details.
+.It Va .INCLUDEDFROMDIR
+The directory of the file this Makefile was included from.
+.It Va .INCLUDEDFROMFILE
+The filename of the file this Makefile was included from.
 .It Ev MAKE
 The name that
 .Nm
@@ -1246,6 +1250,15 @@ and
 are orthogonal; the former specifies whether multiple words are
 potentially affected, the latter whether multiple substitutions can
 potentially occur within each affected word.
+.Pp
+As for the
+.Cm \&:S
+modifier, the
+.Ar pattern
+and
+.Ar replacement
+are subjected to variable expansion before being parsed as
+regular expressions.
 .It Cm \&:T
 Replaces each word in the variable with its last component.
 .It Cm \&:u
diff --git a/contrib/bmake/bmake.cat1 b/contrib/bmake/bmake.cat1
index 4a6ad0b63e6d..0ce26a5a1cc0 100644
--- a/contrib/bmake/bmake.cat1
+++ b/contrib/bmake/bmake.cat1
@@ -450,6 +450,13 @@ VVAARRIIAABBLLEE AASSSSIIGGNNMMEENNTTSS
      _._C_U_R_D_I_R         A path to the directory where bbmmaakkee was executed.  Refer
                      to the description of `PWD' for more details.
 
+     _._I_N_C_L_U_D_E_D_F_R_O_M_D_I_R
+                     The directory of the file this Makefile was included
+                     from.
+
+     _._I_N_C_L_U_D_E_D_F_R_O_M_F_I_L_E
+                     The filename of the file this Makefile was included from.
+
      MAKE            The name that bbmmaakkee was executed with (_a_r_g_v_[_0_]).  For
                      compatibility bbmmaakkee also sets _._M_A_K_E with the same value.
                      The preferred variable to use is the environment variable
@@ -796,6 +803,9 @@ VVAARRIIAABBLLEE AASSSSIIGGNNMMEENNTTSS
           multiple words are potentially affected, the latter whether multiple
           substitutions can potentially occur within each affected word.
 
+          As for the ::SS modifier, the _p_a_t_t_e_r_n and _r_e_p_l_a_c_e_m_e_n_t are subjected to
+          variable expansion before being parsed as regular expressions.
+
      ::TT   Replaces each word in the variable with its last component.
 
      ::uu   Remove adjacent duplicate words (like uniq(1)).
@@ -1384,4 +1394,4 @@ BBUUGGSS
 
      There is no way of escaping a space character in a filename.
 
-NetBSD 5.1                     October 25, 2013                     NetBSD 5.1
+NetBSD 5.1                     February 14, 2014                    NetBSD 5.1
diff --git a/contrib/bmake/boot-strap b/contrib/bmake/boot-strap
index 3c25c374d4cd..340c46a9af20 100755
--- a/contrib/bmake/boot-strap
+++ b/contrib/bmake/boot-strap
@@ -111,7 +111,7 @@
 #	Simon J. Gerraty <sjg@crufty.net>
 
 # RCSid:
-#	$Id: boot-strap,v 1.44 2014/01/08 14:49:10 sjg Exp $
+#	$Id: boot-strap,v 1.45 2014/04/05 22:56:54 sjg Exp $
 #
 #	@(#) Copyright (c) 2001 Simon J. Gerraty
 #
@@ -197,7 +197,7 @@ get_optarg() {
 
 here=`'pwd'`
 if [ $here = $Mydir ]; then
-   # avoid polution
+   # avoid pollution
    OBJROOT=../
 fi
 
@@ -453,7 +453,7 @@ op_all() {
 		echo "Use --install-destdir=/somewhere to set DESTDIR during install"
 		echo "Use --install-host-target to use INSTALL_BIN=$HOST_TARGET/bin"
 		echo "Use -DWITH_PROG_VERSION to install as bmake-$MAKE_VERSION"
-		echo "Use -DWITHOUT_PROG_LINK to supress bmake -> bmake-$MAKE_VERSION symlink"
+		echo "Use -DWITHOUT_PROG_LINK to suppress bmake -> bmake-$MAKE_VERSION symlink"
 		echo "Use -DWITHOUT_INSTALL_MK to skip installing files to $prefix/share/mk"
 	fi
 }
diff --git a/contrib/bmake/bsd.after-import.mk b/contrib/bmake/bsd.after-import.mk
index 85bd2c12599b..9a65096a9597 100644
--- a/contrib/bmake/bsd.after-import.mk
+++ b/contrib/bmake/bsd.after-import.mk
@@ -1,4 +1,4 @@
-# $Id: bsd.after-import.mk,v 1.11 2012/12/29 19:32:25 sjg Exp $
+# $Id: bsd.after-import.mk,v 1.12 2014/02/14 23:45:49 sjg Exp $
 
 # This makefile is for use when integrating bmake into a BSD build
 # system.  Use this makefile after importing bmake.
@@ -41,15 +41,13 @@ SRCTOP := ${srctop}
 HOST_OS!= uname
 .endif
 
-# .../share/mk will find ${SRCTOP}/share/mk
-# if we are within ${SRCTOP}
-DEFAULT_SYS_PATH= .../share/mk:/usr/share/mk
-
 BOOTSTRAP_ARGS = \
-	--with-default-sys-path='${DEFAULT_SYS_PATH}' \
 	--prefix /usr \
 	--share /usr/share
 
+.if !empty(DEFAULT_SYS_PATH)
+BOOTSTRAP_ARGS += --with-default-sys-path='${DEFAULT_SYS_PATH}'
+.endif
 
 # run boot-strap with minimal influence
 bootstrap:	${BMAKE_SRC}/boot-strap ${MAKEFILE}
diff --git a/contrib/bmake/config.h.in b/contrib/bmake/config.h.in
index 7108dcf2f67b..ce30da1e36ca 100644
--- a/contrib/bmake/config.h.in
+++ b/contrib/bmake/config.h.in
@@ -144,6 +144,9 @@
    `HAVE_STRUCT_STAT_ST_RDEV' instead. */
 #undef HAVE_ST_RDEV
 
+/* Define to 1 if you have the `sysctl' function. */
+#undef HAVE_SYSCTL
+
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
    */
 #undef HAVE_SYS_DIR_H
@@ -164,6 +167,9 @@
 /* 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/sysctl.h> header file. */
+#undef HAVE_SYS_SYSCTL_H
+
 /* Define to 1 if you have the <sys/time.h> header file. */
 #undef HAVE_SYS_TIME_H
 
@@ -298,6 +304,9 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
+/* C99 function name */
+#undef __func__
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
diff --git a/contrib/bmake/configure b/contrib/bmake/configure
index 2aaa5eb2109c..e3ff4de5b042 100755
--- a/contrib/bmake/configure
+++ b/contrib/bmake/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for bmake 20140101.
+# Generated by GNU Autoconf 2.64 for bmake 20140214.
 #
 # Report bugs to <sjg@NetBSD.org>.
 #
@@ -549,8 +549,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='bmake'
 PACKAGE_TARNAME='bmake'
-PACKAGE_VERSION='20140101'
-PACKAGE_STRING='bmake 20140101'
+PACKAGE_VERSION='20140214'
+PACKAGE_STRING='bmake 20140214'
 PACKAGE_BUGREPORT='sjg@NetBSD.org'
 PACKAGE_URL=''
 
@@ -1221,7 +1221,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 bmake 20140101 to adapt to many kinds of systems.
+\`configure' configures bmake 20140214 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1282,7 +1282,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bmake 20140101:";;
+     short | recursive ) echo "Configuration of bmake 20140214:";;
    esac
   cat <<\_ACEOF
 
@@ -1387,7 +1387,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bmake configure 20140101
+bmake configure 20140214
 generated by GNU Autoconf 2.64
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1908,7 +1908,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 bmake $as_me 20140101, which was
+It was created by bmake $as_me 20140214, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
@@ -5708,6 +5708,32 @@ $as_echo "#define HAVE_ST_RDEV 1" >>confdefs.h
 fi
 
 
+echo "checking if compiler supports __func__" >&6
+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 ()
+{
+const char *func = __func__;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+
+$as_echo "#define __func__ __FUNCTION__" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 echo $ECHO_N "checking if diff -u works... $ECHO_C" >&6
 if diff -u /dev/null /dev/null > /dev/null 2>&1; then
    diff_u=-u
@@ -6378,7 +6404,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 bmake $as_me 20140101, which was
+This file was extended by bmake $as_me 20140214, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6438,7 +6464,7 @@ Report bugs to <sjg@NetBSD.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-bmake config.status 20140101
+bmake config.status 20140214
 configured by $0, generated by GNU Autoconf 2.64,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/contrib/bmake/configure.in b/contrib/bmake/configure.in
index 394f397c9c66..ecaa53aa900f 100644
--- a/contrib/bmake/configure.in
+++ b/contrib/bmake/configure.in
@@ -1,12 +1,12 @@
 dnl
 dnl RCSid:
-dnl	$Id: configure.in,v 1.51 2014/01/02 22:20:52 sjg Exp $
+dnl	$Id: configure.in,v 1.52 2014/02/15 22:27:59 sjg Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script
 dnl
 AC_PREREQ(2.50)
-AC_INIT([bmake], [20140101], [sjg@NetBSD.org])
-AC_CONFIG_HEADER(config.h)
+AC_INIT([bmake], [20140214], [sjg@NetBSD.org])
+AC_CONFIG_HEADERS(config.h)
 
 dnl make srcdir absolute
 case "$srcdir" in
@@ -203,6 +203,11 @@ dnl
 AC_HEADER_STAT
 AC_STRUCT_ST_RDEV
 dnl
+echo "checking if compiler supports __func__" >&6
+AC_LANG(C)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[[const char *func = __func__;]])],,
+	AC_DEFINE(__func__, __FUNCTION__, C99 function name))
+dnl
 dnl we want this for unit-tests/Makefile
 echo $ECHO_N "checking if diff -u works... $ECHO_C" >&6
 if diff -u /dev/null /dev/null > /dev/null 2>&1; then
diff --git a/contrib/bmake/main.c b/contrib/bmake/main.c
index 78fbf41a07d4..f86184c37db7 100644
--- a/contrib/bmake/main.c
+++ b/contrib/bmake/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.225 2013/09/14 15:09:34 matt Exp $	*/
+/*	$NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.225 2013/09/14 15:09:34 matt Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\
 #if 0
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.225 2013/09/14 15:09:34 matt Exp $");
+__RCSID("$NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1102,11 +1102,12 @@ main(int argc, char **argv)
 	 */
 #ifndef NO_PWD_OVERRIDE
 	if (!ignorePWD) {
-		char *pwd;
+		char *pwd, *ptmp1 = NULL, *ptmp2 = NULL;
 
 		if ((pwd = getenv("PWD")) != NULL &&
-		    getenv("MAKEOBJDIRPREFIX") == NULL) {
-			const char *makeobjdir = getenv("MAKEOBJDIR");
+		    Var_Value("MAKEOBJDIRPREFIX", VAR_CMD, &ptmp1) == NULL) {
+			const char *makeobjdir = Var_Value("MAKEOBJDIR",
+			    VAR_CMD, &ptmp2);
 
 			if (makeobjdir == NULL || !strchr(makeobjdir, '$')) {
 				if (stat(pwd, &sb) == 0 &&
@@ -1115,6 +1116,8 @@ main(int argc, char **argv)
 					(void)strncpy(curdir, pwd, MAXPATHLEN);
 			}
 		}
+		free(ptmp1);
+		free(ptmp2);
 	}
 #endif
 	Var_Set(".CURDIR", curdir, VAR_GLOBAL, 0);
@@ -1131,11 +1134,13 @@ main(int argc, char **argv)
 	Dir_Init(curdir);
 	(void)Main_SetObjdir(curdir);
 
-	if ((path = getenv("MAKEOBJDIRPREFIX")) != NULL) {
+	if ((path = Var_Value("MAKEOBJDIRPREFIX", VAR_CMD, &p1)) != NULL) {
 		(void)snprintf(mdpath, MAXPATHLEN, "%s%s", path, curdir);
 		(void)Main_SetObjdir(mdpath);
-	} else if ((path = getenv("MAKEOBJDIR")) != NULL) {
+		free(p1);
+	} else if ((path = Var_Value("MAKEOBJDIR", VAR_CMD, &p1)) != NULL) {
 		(void)Main_SetObjdir(path);
+		free(p1);
 	} else {
 		(void)snprintf(mdpath, MAXPATHLEN, "%s.%s", _PATH_OBJDIR, machine);
 		if (!Main_SetObjdir(mdpath) && !Main_SetObjdir(_PATH_OBJDIR)) {
diff --git a/contrib/bmake/make.1 b/contrib/bmake/make.1
index 5422c1983304..8a841dbb742c 100644
--- a/contrib/bmake/make.1
+++ b/contrib/bmake/make.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.226 2013/11/07 18:50:46 dholland Exp $
+.\"	$NetBSD: make.1,v 1.230 2014/02/15 18:55:30 sjg Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd October 25, 2013
+.Dd February 14, 2014
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -706,6 +706,10 @@ was executed.
 Refer to the description of
 .Ql Ev PWD
 for more details.
+.It Va .INCLUDEDFROMDIR
+The directory of the file this Makefile was included from.
+.It Va .INCLUDEDFROMFILE
+The filename of the file this Makefile was included from.
 .It Ev MAKE
 The name that
 .Nm
@@ -1257,6 +1261,15 @@ and
 are orthogonal; the former specifies whether multiple words are
 potentially affected, the latter whether multiple substitutions can
 potentially occur within each affected word.
+.Pp
+As for the
+.Cm \&:S
+modifier, the
+.Ar pattern
+and
+.Ar replacement
+are subjected to variable expansion before being parsed as
+regular expressions.
 .It Cm \&:T
 Replaces each word in the variable with its last component.
 .It Cm \&:u
diff --git a/contrib/bmake/mk/ChangeLog b/contrib/bmake/mk/ChangeLog
index 973db00b8a30..80671ef13f00 100644
--- a/contrib/bmake/mk/ChangeLog
+++ b/contrib/bmake/mk/ChangeLog
@@ -1,3 +1,60 @@
+2014-05-22  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* install-mk (MK_VERSION): 20140522
+
+	* lib.mk: use CC to link shlib for linux too
+	  patch from Brendan MacDonell
+
+2014-05-05  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* meta.autodep.mk: add _reldir_{finish,failed} for gathering stats
+	  if WITH_META_STATS is defined.
+
+2014-05-02  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* dirdeps.mk: accept -DWITHOUT_DIRDEPS (same a as -DNO_DIRDEPS)
+	  to supress dirdeps outside of .CURDIR.
+
+2014-04-05  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* Fix spelling errors - patch from Pedro Giffuni
+
+2014-03-14  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* install-mk (MK_VERSION): 20140314
+
+	* dirdeps.mk (beforedirdeps): a handy hook
+
+	* dirdeps.mk (DIRDEP_MAKE): allow the actual command we run
+	  to visit leaf dirs to be intercepted (eg. for distributed
+	  build).
+
+	* dirdeps.mk (__depdirs): ensure // don't sneak in
+	
+	* gendirdeps.mk (DIRDEPS): ensure // don't sneak in
+
+
+2014-02-21  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* rst2htm.mk (RST2PDF): add support for rst2pdf
+
+2014-02-14  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* install-mk (MK_VERSION): bump version
+	* dirdeps.mk (_last_dependfile): use .INCLUDEDFROMFILE if
+	  available.
+
+2014-02-10  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* options.mk: avoid :U so this isn't bmake dependent
+
+2014-02-09  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* options.mk: cleanup and simplify semanitcs 
+	  NO_* dominates all, if both WITH_* and WITHOUT_*
+	  are defined then result is DOMINATE_* which defaults to "no".
+	  Ie. WITHOUT_ normally wins.
+
 2013-12-12  Simon J. Gerraty  <sjg@bad.crufty.net>
 
 	* install-mk (MK_VERSION): bump version
@@ -490,7 +547,7 @@
 	* dep.mk: auto.dep.mk does not do 'make depend' so ignore it if
 	  asked to do that.
 	  fix/simplify the tests for when to run mkdep.
-	* auto.dep.mk: add some explaination of how/what we do.
+	* auto.dep.mk: add some explanation of how/what we do.
 	* autodep.mk: skip the .OPTIONAL frobbing of .depend
 	  bmake's FROM_DEPEND flag makes it redundant.
 	
@@ -640,7 +697,7 @@
 2006-12-30  Simon J. Gerraty  <sjg@void.crufty.net>
 
 	* install-mk (MK_VERSION): bump version
-	* added libs.mk - analagous to progs.mk
+	* added libs.mk - analogous to progs.mk
 	  make both of them always inlcude {lib,prog}.mk
 
 2006-12-28  Simon J. Gerraty  <sjg@void.crufty.net>
diff --git a/contrib/bmake/mk/autodep.mk b/contrib/bmake/mk/autodep.mk
index 744770fe5a3c..818c474e843f 100644
--- a/contrib/bmake/mk/autodep.mk
+++ b/contrib/bmake/mk/autodep.mk
@@ -1,6 +1,6 @@
 #
 # RCSid:
-#	$Id: autodep.mk,v 1.32 2010/04/19 17:37:56 sjg Exp $
+#	$Id: autodep.mk,v 1.33 2014/04/05 22:56:54 sjg Exp $
 #
 #	@(#) Copyright (c) 1999-2010, Simon J. Gerraty
 #
@@ -16,7 +16,7 @@
 
 # This module provides automagic dependency generation along the
 # lines suggested in the GNU make.info
-# The depend target is mainly for backwards compatability,
+# The depend target is mainly for backwards compatibility,
 # dependencies are normally updated as part of compilation.
 
 # set MKDEP=autodep and dep.mk will include us
diff --git a/contrib/bmake/mk/dirdeps.mk b/contrib/bmake/mk/dirdeps.mk
index 3335fdb0943a..8c342be86fc2 100644
--- a/contrib/bmake/mk/dirdeps.mk
+++ b/contrib/bmake/mk/dirdeps.mk
@@ -1,4 +1,4 @@
-# $Id: dirdeps.mk,v 1.29 2013/10/13 18:43:53 sjg Exp $
+# $Id: dirdeps.mk,v 1.35 2014/05/03 06:27:56 sjg Exp $
 
 # Copyright (c) 2010-2013, Juniper Networks, Inc.
 # All rights reserved.
@@ -44,7 +44,7 @@
 #	All unqualified entries end up being qualified with .${TARGET_SPEC}
 #	and partially qualified (if TARGET_SPEC_VARS has multiple
 #	entries) are also expanded to a full .<target_spec>.
-#	The  _DIRDEPS_USE target uses the suffix to set TARGET_SPEC
+#	The  _DIRDEP_USE target uses the suffix to set TARGET_SPEC
 #	correctly when visiting each entry.
 #
 #	The fully qualified directory entries are used to construct a
@@ -71,7 +71,7 @@
 #
 # TARGET_SPEC_VARS
 #	The default value is just MACHINE, and for most environments
-#	this is sufficient.  The _DIRDEPS_USE target actually sets
+#	this is sufficient.  The _DIRDEP_USE target actually sets
 #	both MACHINE and TARGET_SPEC to the suffix of the current
 #	target so that in the general case TARGET_SPEC can be ignored.
 #
@@ -196,7 +196,11 @@ N_notmachine := ${.MAKE.DEPENDFILE_PREFERENCE:E:N*${MACHINE}*:${M_ListToSkip}}
 # if we were included recursively _DEP_TARGET_SPEC should be valid.
 .if empty(_DEP_TARGET_SPEC)
 # we may or may not have included a dependfile yet
+.if defined(.INCLUDEDFROMFILE)
+_last_dependfile := ${.INCLUDEDFROMFILE:M${.MAKE.DEPENDFILE_PREFIX}*}
+.else
 _last_dependfile := ${.MAKE.MAKEFILES:M*/${.MAKE.DEPENDFILE_PREFIX}*:[-1]}
+.endif
 .if !empty(_debug_reldir)
 .info ${DEP_RELDIR}.${DEP_TARGET_SPEC}: _last_dependfile='${_last_dependfile}'
 .endif
@@ -239,7 +243,8 @@ DEP_MACHINE := ${_DEP_TARGET_SPEC}
 # we can use this as a clue to do initialization and other one time things.
 .if !target(_DIRDEP_USE)
 # make sure this target exists
-dirdeps:
+dirdeps: beforedirdeps .WAIT
+beforedirdeps:
 
 # We normally expect to be included by Makefile.depend.*
 # which sets the DEP_* macros below.
@@ -269,12 +274,15 @@ DEP_SKIP_DIR = ${SKIP_DIR} \
 
 NSkipDir = ${DEP_SKIP_DIR:${M_ListToSkip}}
 
-.if defined(NO_DIRDEPS) || defined(NODIRDEPS)
+.if defined(NO_DIRDEPS) || defined(NODIRDEPS) || defined(WITHOUT_DIRDEPS)
 # confine ourselves to the original dir
 DIRDEPS_FILTER += M${_DEP_RELDIR}*
 .endif
 
-# we supress SUBDIR when visiting the leaves
+# this is what we run below
+DIRDEP_MAKE?= ${.MAKE}
+
+# we suppress SUBDIR when visiting the leaves
 # we assume sys.mk will set MACHINE_ARCH
 # you can add extras to DIRDEP_USE_ENV
 # if there is no makefile in the target directory, we skip it.
@@ -285,7 +293,7 @@ _DIRDEP_USE:	.USE .MAKE
 		MACHINE_ARCH= NO_SUBDIR=1 ${DIRDEP_USE_ENV} \
 		TARGET_SPEC=${.TARGET:E} \
 		MACHINE=${.TARGET:E} \
-		${.MAKE} -C ${.TARGET:R} || exit 1; \
+		${DIRDEP_MAKE} -C ${.TARGET:R} || exit 1; \
 		break; \
 	done
 
@@ -397,7 +405,7 @@ DEP_DIRDEPS_FILTER = U
 .endif
 
 # this is what we start with
-__depdirs := ${DIRDEPS:${NSkipDir}:${DEP_DIRDEPS_FILTER:ts:}:O:u:@d@${SRCTOP}/$d@}
+__depdirs := ${DIRDEPS:${NSkipDir}:${DEP_DIRDEPS_FILTER:ts:}:C,//+,/,g:O:u:@d@${SRCTOP}/$d@}
 
 # some entries may be qualified with .<machine> 
 # the :M*/*/*.* just tries to limit the dirs we check to likely ones.
diff --git a/contrib/bmake/mk/dpadd.mk b/contrib/bmake/mk/dpadd.mk
index a940b61c144c..abc92df761c5 100644
--- a/contrib/bmake/mk/dpadd.mk
+++ b/contrib/bmake/mk/dpadd.mk
@@ -1,4 +1,4 @@
-# $Id: dpadd.mk,v 1.18 2011/11/10 05:13:37 sjg Exp $
+# $Id: dpadd.mk,v 1.19 2014/04/05 22:56:54 sjg Exp $
 #
 #	@(#) Copyright (c) 2004, Simon J. Gerraty
 #
@@ -68,7 +68,7 @@ DPLIBS+= ${LIBDMALLOC}
 .endif
 .endif
 
-# Order -L's to seach ours first.
+# Order -L's to search ours first.
 # Avoids picking up old versions already installed.
 __dpadd_libdirs := ${__dpadd_libs:R:H:S/^/-L/g:O:u:N-L}
 LDADD += ${__dpadd_libdirs:M-L${OBJTOP}/*}
@@ -99,9 +99,9 @@ SRC_LIBS+= ${_OBJDIR}/lib${LIB}.a
 # This little bit of magic, assumes that SRC_libfoo will be
 # set if it cannot be correctly derrived from ${LIBFOO}
 # Note that SRC_libfoo and INCLUDES_libfoo should be named for the
-# actual libary name not the variable name that might refer to it.
+# actual library name not the variable name that might refer to it.
 # 99% of the time the two are the same, but the DPADD logic
-# only has the libary name available, so stick to that.
+# only has the library name available, so stick to that.
 # 
 
 SRC_LIBS?=
diff --git a/contrib/bmake/mk/gendirdeps.mk b/contrib/bmake/mk/gendirdeps.mk
index 20e2b152a3fa..b313298b3fef 100644
--- a/contrib/bmake/mk/gendirdeps.mk
+++ b/contrib/bmake/mk/gendirdeps.mk
@@ -1,4 +1,4 @@
-# $Id: gendirdeps.mk,v 1.23 2013/09/04 17:49:20 sjg Exp $
+# $Id: gendirdeps.mk,v 1.25 2014/03/14 21:28:37 sjg Exp $
 
 # Copyright (c) 2010-2013, Juniper Networks, Inc.
 # All rights reserved.
@@ -229,7 +229,7 @@ DIRDEPS = \
 	${qualdir_list:N${RELDIR}.*:N${RELDIR}/*}
 
 # We only consider things below $RELDIR/ if they have a makefile.
-# This is the same test that _DIRDEPS_USE applies.
+# This is the same test that _DIRDEP_USE applies.
 # We have do a double test with dirdep_list as it _may_ contain 
 # qualified dirs - if we got anything from a stage dir.
 # qualdir_list we know are all qualified.
@@ -240,7 +240,7 @@ DIRDEPS += \
 	${dirdep_list:M${RELDIR}/*:@d@${.MAKE.MAKEFILE_PREFERENCE:@m@${exists(${SRCTOP}/$d/$m):?$d:${exists(${SRCTOP}/${d:R}/$m):?$d:}}@}@} \
 	${qualdir_list:M${RELDIR}/*:@d@${.MAKE.MAKEFILE_PREFERENCE:@m@${exists(${SRCTOP}/${d:R}/$m):?$d:}@}@}
 
-DIRDEPS := ${DIRDEPS:${GENDIRDEPS_FILTER:UNno:ts:}:O:u}
+DIRDEPS := ${DIRDEPS:${GENDIRDEPS_FILTER:UNno:ts:}:C,//+,/,g:O:u}
 
 .if ${DEBUG_GENDIRDEPS:Uno:@x@${RELDIR:M$x}@} != ""
 .info ${RELDIR}: M2D_OBJROOTS=${M2D_OBJROOTS}
@@ -261,7 +261,7 @@ src_dirdep_list = \
 SRC_DIRDEPS = \
 	${src_dirdep_list:N${RELDIR}:N${RELDIR}/*:C,(/h)/.*,,}
 
-SRC_DIRDEPS := ${SRC_DIRDEPS:${GENDIRDEPS_SRC_FILTER:UN/*:ts:}:O:u}
+SRC_DIRDEPS := ${SRC_DIRDEPS:${GENDIRDEPS_SRC_FILTER:UN/*:ts:}:C,//+,/,g:O:u}
 
 # if you want to capture SRC_DIRDEPS in .MAKE.DEPENDFILE put
 # SRC_DIRDEPS_FILE = ${_DEPENDFILE} 
diff --git a/contrib/bmake/mk/host-target.mk b/contrib/bmake/mk/host-target.mk
index c6d4562bf15a..eacdf1d95111 100644
--- a/contrib/bmake/mk/host-target.mk
+++ b/contrib/bmake/mk/host-target.mk
@@ -1,5 +1,5 @@
 # RCSid:
-#	$Id: host-target.mk,v 1.6 2011/03/02 05:05:21 sjg Exp $
+#	$Id: host-target.mk,v 1.7 2014/05/16 17:54:52 sjg Exp $
 
 # Host platform information; may be overridden
 .if !defined(_HOST_OSNAME)
@@ -18,6 +18,10 @@ _HOST_ARCH != uname -m
 .endif
 .export _HOST_ARCH
 .endif
+.if !defined(HOST_MACHINE)
+HOST_MACHINE != uname -m
+.export HOST_MACHINE
+.endif
 
 HOST_OSMAJOR := ${_HOST_OSREL:C/[^0-9].*//}
 HOST_OSTYPE  :=	${_HOST_OSNAME}-${_HOST_OSREL:C/\([^\)]*\)//}-${_HOST_ARCH}
diff --git a/contrib/bmake/mk/install-mk b/contrib/bmake/mk/install-mk
index b91a961410ae..7e4ee8bba5e7 100644
--- a/contrib/bmake/mk/install-mk
+++ b/contrib/bmake/mk/install-mk
@@ -55,7 +55,7 @@
 #       Simon J. Gerraty <sjg@crufty.net>
 
 # RCSid:
-#	$Id: install-mk,v 1.95 2013/12/20 06:08:52 sjg Exp $
+#	$Id: install-mk,v 1.100 2014/05/23 01:30:36 sjg Exp $
 #
 #	@(#) Copyright (c) 1994 Simon J. Gerraty
 #
@@ -70,7 +70,7 @@
 #	sjg@crufty.net
 #
 
-MK_VERSION=20131212
+MK_VERSION=20140522
 OWNER=
 GROUP=
 MODE=444
diff --git a/contrib/bmake/mk/lib.mk b/contrib/bmake/mk/lib.mk
index f219115433ec..417aa024ba87 100644
--- a/contrib/bmake/mk/lib.mk
+++ b/contrib/bmake/mk/lib.mk
@@ -1,4 +1,4 @@
-# $Id: lib.mk,v 1.49 2013/07/18 05:46:24 sjg Exp $
+# $Id: lib.mk,v 1.51 2014/05/23 01:30:36 sjg Exp $
 
 .if !target(__${.PARSEFILE}__)
 __${.PARSEFILE}__:
@@ -55,7 +55,7 @@ CFLAGS+=	${COPTS}
 # are built for different platforms and object formats.
 # OBJECT_FMT:		currently either "ELF" or "a.out", from <bsd.own.mk>
 # SHLIB_SOVERSION:	version number to be compiled into a shared library
-#			via -soname. Usualy ${SHLIB_MAJOR} on ELF.
+#			via -soname. Usually ${SHLIB_MAJOR} on ELF.
 #			NetBSD/pmax used to use ${SHLIB_MAJOR}[.${SHLIB_MINOR}
 #			[.${SHLIB_TEENY}]]
 # SHLIB_SHFLAGS:	Flags to tell ${LD} to emit shared library.
@@ -123,7 +123,7 @@ SHLIB_LDSTARTFILE?=	/usr/lib/crtbeginS.o
 SHLIB_LDENDFILE?=	/usr/lib/crtendS.o
 .endif
 
-# for compatability with the following
+# for compatibility with the following
 CC_PIC?= ${CPICFLAGS}
 LD_shared=${SHLIB_SHFLAGS}
 
@@ -175,9 +175,10 @@ AR_cq= -cqs
 .elif ${TARGET_OSNAME} == "FreeBSD"
 LD_solib= lib${LIB}_pic.a
 .elif ${TARGET_OSNAME} == "Linux"
+SHLIB_LD = ${CC}
 # this is ambiguous of course
-LD_shared=-shared -h lib${LIB}.so.${SHLIB_MAJOR}
-LD_solib= --whole-archive lib${LIB}_pic.a
+LD_shared=-shared -Wl,"-h lib${LIB}.so.${SHLIB_MAJOR}"
+LD_solib= -Wl,--whole-archive lib${LIB}_pic.a -Wl,--no-whole-archive
 # Linux uses GNU ld, which is a multi-pass linker
 # so we don't need to use lorder or tsort
 LD_objs = ${OBJS}
@@ -259,7 +260,7 @@ OPTIMIZE_OBJECT_META_FILES ?= yes
 
 
 .if ${MK_LIBTOOL} == "yes"
-# because libtool is so facist about naming the object files,
+# because libtool is so fascist about naming the object files,
 # we cannot (yet) build profiled libs
 MK_PROFILE=no
 _LIBS=lib${LIB}.a
@@ -413,7 +414,7 @@ SHLIB_AGE?=0
 .s.o .S.o .c.o:
 	${LIBTOOL} --mode=compile ${CC} ${LT_STATIC} ${CFLAGS} ${CPPFLAGS} ${IMPFLAGS} -c ${.IMPSRC}
 
-# can't really do profiled libs with libtool - its too facist about
+# can't really do profiled libs with libtool - its too fascist about
 # naming the output...
 lib${LIB}.a:: ${OBJS}
 	@rm -f ${.TARGET}
diff --git a/contrib/bmake/mk/meta.autodep.mk b/contrib/bmake/mk/meta.autodep.mk
index c29c26e85e24..a961bffb4646 100644
--- a/contrib/bmake/mk/meta.autodep.mk
+++ b/contrib/bmake/mk/meta.autodep.mk
@@ -1,4 +1,4 @@
-# $Id: meta.autodep.mk,v 1.32 2012/11/13 00:44:26 sjg Exp $
+# $Id: meta.autodep.mk,v 1.35 2014/05/09 00:05:46 sjg Exp $
 
 #
 #	@(#) Copyright (c) 2010, Simon J. Gerraty
@@ -120,7 +120,7 @@ FORCE_DPADD += ${_nonlibs:@x@${DPADD:M*/$x}@}
 # some makefiles and/or targets contain
 # circular dependencies if you dig too deep 
 # (as meta mode is apt to do) 
-# so we provide a means of supressing them.
+# so we provide a means of suppressing them.
 # the input to the loop below is target: dependency
 # with just one dependency per line.
 # Also some targets are not really local, or use random names.
@@ -137,7 +137,7 @@ SUPPRESS_DEPEND += \
 # the double $$ defers initial evaluation
 # if necessary, we fake .po dependencies, just so the result 
 # in Makefile.depend* is stable
-# The current objdir may be refered to in various ways
+# The current objdir may be referred to in various ways
 OBJDIR_REFS += ${.OBJDIR} ${.OBJDIR:tA} ${_OBJDIR} ${RELOBJTOP}/${RELDIR}
 _depend = .depend
 # it would be nice to be able to get .SUFFIXES as ${.SUFFIXES}
@@ -176,7 +176,9 @@ _depend =
 .info ${_DEPENDFILE:S,${SRCTOP}/,,} _depend=${_depend}
 .endif
 
+.if ${UPDATE_DEPENDFILE} == "yes"
 gendirdeps:	${_DEPENDFILE}
+.endif
 
 .if !target(${_DEPENDFILE})
 .if ${_bootstrap_dirdeps} == "yes"
@@ -259,4 +261,28 @@ ${_DEPENDFILE}: .PRECIOUS
 .endif
 
 CLEANFILES += *.meta filemon.* *.db
+
+# these make it easy to gather some stats
+now_utc = ${%s:L:gmtime}
+start_utc := ${now_utc}
+
+meta_stats= meta=${empty(.MAKE.META.FILES):?0:${.MAKE.META.FILES:[#]}} \
+	created=${empty(.MAKE.META.CREATED):?0:${.MAKE.META.CREATED:[#]}}
+
+#.END: _reldir_finish
+.if target(gendirdeps)
+_reldir_finish: gendirdeps
+.endif
+_reldir_finish: .NOMETA
+	@echo "${TIME_STAMP} Finished ${RELDIR}.${TARGET_SPEC} seconds=$$(( ${now_utc} - ${start_utc} )) ${meta_stats}"
+
+#.ERROR: _reldir_failed
+_reldir_failed: .NOMETA
+	@echo "${TIME_STAMP} Failed ${RELDIR}.${TARGET_SPEC} seconds=$$(( ${now_utc} - ${start_utc} )) ${meta_stats}"
+
+.if defined(WITH_META_STATS) && ${.MAKE.LEVEL} > 0
+.END: _reldir_finish
+.ERROR: _reldir_failed
+.endif
+
 .endif
diff --git a/contrib/bmake/mk/meta2deps.py b/contrib/bmake/mk/meta2deps.py
index d4e4bb14cad4..8e349e702e5b 100755
--- a/contrib/bmake/mk/meta2deps.py
+++ b/contrib/bmake/mk/meta2deps.py
@@ -37,7 +37,7 @@
 
 """
 RCSid:
-	$Id: meta2deps.py,v 1.16 2013/12/20 06:08:52 sjg Exp $
+	$Id: meta2deps.py,v 1.17 2014/04/05 22:56:54 sjg Exp $
 
 	Copyright (c) 2011-2013, Juniper Networks, Inc.
 	All rights reserved.
@@ -166,7 +166,7 @@ def __init__(self, name, conf={}):
         	Sometimes MACHINE isn't enough.
                 
         HOST_TARGET
-		when we build for the psuedo machine 'host'
+		when we build for the pseudo machine 'host'
 		the object tree uses HOST_TARGET rather than MACHINE.
 
         OBJROOTS a list of the common prefix for all obj dirs it might
@@ -296,7 +296,7 @@ def add(self, list, data, clue=''):
                 print("%s: %sAdd: %s" % (self.name, clue, data), file=self.debug_out)
 
     def find_top(self, path, list):
-        """the logical tree may be split accross multiple trees"""
+        """the logical tree may be split across multiple trees"""
         for top in list:
             if path.startswith(top):
                 if self.debug > 2:
diff --git a/contrib/bmake/mk/meta2deps.sh b/contrib/bmake/mk/meta2deps.sh
index f63aee329b6b..d96ce07c5af4 100755
--- a/contrib/bmake/mk/meta2deps.sh
+++ b/contrib/bmake/mk/meta2deps.sh
@@ -77,7 +77,7 @@
 
 
 # RCSid:
-#	$Id: meta2deps.sh,v 1.6 2013/05/11 05:16:26 sjg Exp $
+#	$Id: meta2deps.sh,v 1.7 2014/04/05 22:56:54 sjg Exp $
 
 # Copyright (c) 2010-2013, Juniper Networks, Inc.
 # All rights reserved.
@@ -348,7 +348,7 @@ meta2deps() {
 	[ -s $f ] || continue
 	case $f in
 	*qual) # a list of .dirdep files
-	    # we can prefix everthing with $OBJTOP to
+	    # we can prefix everything with $OBJTOP to
 	    # tell gendirdeps.mk that these are
 	    # DIRDEP entries, since they are already
 	    # qualified with .<machine> as needed.
diff --git a/contrib/bmake/mk/options.mk b/contrib/bmake/mk/options.mk
index aa54754b2ff4..c0b4988741ff 100644
--- a/contrib/bmake/mk/options.mk
+++ b/contrib/bmake/mk/options.mk
@@ -1,4 +1,4 @@
-# $Id: options.mk,v 1.7 2013/04/17 20:32:38 sjg Exp $
+# $Id: options.mk,v 1.10 2014/02/11 18:34:48 sjg Exp $
 #
 #	@(#) Copyright (c) 2012, Simon J. Gerraty
 #
@@ -30,15 +30,27 @@ OPTIONS_DEFAULT_VALUES += \
 	${OPTIONS_DEFAULT_YES:O:u:S,$,/yes,}
 
 OPTION_PREFIX ?= MK_
+
+# NO_* takes precedence
+# If both WITH_* and WITHOUT_* are defined, WITHOUT_ wins unless
+# DOMINANT_* is set to "yes"
+# Otherwise WITH_* and WITHOUT_* override the default.
 .for o in ${OPTIONS_DEFAULT_VALUES:M*/*}
-.if ${o:T:tl} == "no"
-.if defined(WITH_${o:H}) && !defined(NO_${o:H}) && !defined(NO${o:H})
+.if defined(NO_${o:H}) || defined(NO${o:H})
+# we cannot do it
+${OPTION_PREFIX}${o:H} ?= no
+.elif defined(WITH_${o:H}) && defined(WITHOUT_${o:H})
+# normally WITHOUT_ wins
+DOMINANT_${o:H} ?= no
+${OPTION_PREFIX}${o:H} ?= ${DOMINANT_${o:H}}
+.elif ${o:T:tl} == "no"
+.if defined(WITH_${o:H})
 ${OPTION_PREFIX}${o:H} ?= yes
 .else
 ${OPTION_PREFIX}${o:H} ?= no
 .endif
 .else
-.if defined(WITHOUT_${o:H}) || defined(NO_${o:H}) || defined(NO${o:H})
+.if defined(WITHOUT_${o:H})
 ${OPTION_PREFIX}${o:H} ?= no
 .else
 ${OPTION_PREFIX}${o:H} ?= yes
@@ -47,11 +59,19 @@ ${OPTION_PREFIX}${o:H} ?= yes
 .endfor
 
 # OPTIONS_DEFAULT_DEPENDENT += FOO_UTILS/FOO
-# if neither WITH[OUT]_FOO_UTILS is set, use value of ${OPTION_PREFIX}FOO
+# If neither WITH[OUT]_FOO_UTILS is set, (see rules above)
+# use the value of ${OPTION_PREFIX}FOO
 .for o in ${OPTIONS_DEFAULT_DEPENDENT:M*/*:O:u}
-.if defined(WITH_${o:H}) && !defined(NO_${o:H}) && !defined(NO${o:H})
+.if defined(NO_${o:H}) || defined(NO${o:H})
+# we cannot do it
+${OPTION_PREFIX}${o:H} ?= no
+.elif defined(WITH_${o:H}) && defined(WITHOUT_${o:H})
+# normally WITHOUT_ wins
+DOMINANT_${o:H} ?= no
+${OPTION_PREFIX}${o:H} ?= ${DOMINANT_${o:H}}
+.elif defined(WITH_${o:H})
 ${OPTION_PREFIX}${o:H} ?= yes
-.elif defined(WITHOUT_${o:H}) || defined(NO_${o:H}) || defined(NO${o:H})
+.elif defined(WITHOUT_${o:H})
 ${OPTION_PREFIX}${o:H} ?= no
 .else
 ${OPTION_PREFIX}${o:H} ?= ${${OPTION_PREFIX}${o:T}}
diff --git a/contrib/bmake/mk/rst2htm.mk b/contrib/bmake/mk/rst2htm.mk
index 8bd66dab48d6..4d4c940b8bc7 100644
--- a/contrib/bmake/mk/rst2htm.mk
+++ b/contrib/bmake/mk/rst2htm.mk
@@ -1,4 +1,4 @@
-# $Id: rst2htm.mk,v 1.8 2011/04/03 21:39:25 sjg Exp $
+# $Id: rst2htm.mk,v 1.9 2014/02/22 01:52:41 sjg Exp $
 #
 #	@(#) Copyright (c) 2009, Simon J. Gerraty
 #
@@ -22,6 +22,7 @@ TXTSRCS != 'ls' -1t ${.CURDIR}/*.txt ${.CURDIR}/*.rst 2>/dev/null; echo
 RSTSRCS ?= ${TXTSRCS}
 HTMFILES ?= ${RSTSRCS:R:T:O:u:%=%.htm}
 RST2HTML ?= rst2html.py
+RST2PDF ?= rst2pdf
 RST2S5 ?= rst2s5.py
 # the following will run RST2S5 if the target name contains the word 'slides'
 # otherwise it uses RST2HTML
@@ -33,11 +34,15 @@ CLEANFILES += ${HTMFILES}
 
 html:	${HTMFILES}
 
-.SUFFIXES: ${RST_SUFFIXES} .htm
+.SUFFIXES: ${RST_SUFFIXES} .htm .pdf
 
 ${RST_SUFFIXES:@s@$s.htm@}:
 	${RST2HTM} ${.IMPSRC} ${.TARGET}
 
+${RST_SUFFIXES:@s@$s.pdf@}:
+	${RST2PDF} ${.IMPSRC} ${.TARGET}
+
 .for s in ${RSTSRCS:O:u}
 ${s:R:T}.htm: $s
+${s:R:T}.pdf: $s
 .endfor
diff --git a/contrib/bmake/mk/sys.mk b/contrib/bmake/mk/sys.mk
index 30eca9b84508..236f62d0ac75 100644
--- a/contrib/bmake/mk/sys.mk
+++ b/contrib/bmake/mk/sys.mk
@@ -1,4 +1,4 @@
-# $Id: sys.mk,v 1.35 2012/11/12 06:27:51 sjg Exp $
+# $Id: sys.mk,v 1.36 2014/05/11 00:30:19 sjg Exp $
 #
 #	@(#) Copyright (c) 2003-2009, Simon J. Gerraty
 #
@@ -77,7 +77,7 @@ M_ListToSkip= O:u:ts::S,:,:N,g:S,^,N,
 # type should be a builtin in any sh since about 1980,
 # AUTOCONF := ${autoconf:L:${M_whence}}
 M_type = @x@(type $$x 2> /dev/null); echo;@:sh:[0]:N* found*:[@]:C,[()],,g
-M_whence = ${M_type}:M/*
+M_whence = ${M_type}:M/*:[1]
 
 # convert a path to a valid shell variable
 M_P2V = tu:C,[./-],_,g
diff --git a/contrib/bmake/mk/sys/SunOS.mk b/contrib/bmake/mk/sys/SunOS.mk
index f164aa282be9..73f8062794e2 100644
--- a/contrib/bmake/mk/sys/SunOS.mk
+++ b/contrib/bmake/mk/sys/SunOS.mk
@@ -1,4 +1,4 @@
-#	$Id: SunOS.mk,v 1.5 2010/01/11 23:02:05 sjg Exp $
+#	$Id: SunOS.mk,v 1.6 2014/04/05 22:56:54 sjg Exp $
 
 .if ${.PARSEFILE} == "sys.mk"
 .include <host-target.mk>
@@ -12,7 +12,7 @@ ROOT_GROUP=	root
 
 SHLIB_FULLVERSION = ${SHLIB_MAJOR}
 
-# supress the dependency
+# suppress the dependency
 LIBCRT0= /dev/null
 
 .ifndef CC
diff --git a/contrib/bmake/mk/target-flags.mk b/contrib/bmake/mk/target-flags.mk
index f8932b2f17b9..4525dbd08d7b 100644
--- a/contrib/bmake/mk/target-flags.mk
+++ b/contrib/bmake/mk/target-flags.mk
@@ -3,7 +3,7 @@
 #
 # DESCRIPTION:
 #	Include this macro file after all others in a makefile and
-#	follow it with any target specfic flag settings.
+#	follow it with any target specific flag settings.
 #	For each such variable v in TARGET_FLAG_VARS we set:
 #.nf
 #
@@ -37,7 +37,7 @@
 
 
 # RCSid:
-#	$Id: target-flags.mk,v 1.8 2002/05/08 06:01:00 sjg Exp $
+#	$Id: target-flags.mk,v 1.9 2014/04/05 22:56:54 sjg Exp $
 #
 #	@(#) Copyright (c) 1998-2002, Simon J. Gerraty
 #
diff --git a/contrib/bmake/mk/warnings.mk b/contrib/bmake/mk/warnings.mk
index 9143e4289fd5..bacbefb2b837 100644
--- a/contrib/bmake/mk/warnings.mk
+++ b/contrib/bmake/mk/warnings.mk
@@ -1,5 +1,5 @@
 # RCSid:
-#	$Id: warnings.mk,v 1.7 2009/12/11 17:06:03 sjg Exp $
+#	$Id: warnings.mk,v 1.8 2014/04/02 19:20:23 sjg Exp $
 #
 #	@(#) Copyright (c) 2002, Simon J. Gerraty
 #
@@ -42,24 +42,30 @@ HIGH_WARNINGS?= ${MEDIUM_WARNINGS} \
 	-Wswitch \
 	-Wwrite-strings
 
+EXTRA_WARNINGS?= ${HIGH_WARNINGS} -Wextra
+
 # The two step default makes it easier to test build with different defaults.
 DEFAULT_WARNINGS_SET?= MIN
 WARNINGS_SET?= ${DEFAULT_WARNINGS_SET}
 
 # If you add sets, besure to list them (you don't have to touch this list).
-ALL_WARNINGS_SETS+= MIN LOW MEDIUM HIGH
+ALL_WARNINGS_SETS+= MIN LOW MEDIUM HIGH EXTRA
 
-.if empty(${WARNINGS_SET}_WARNINGS)
-.if ${MAKE_VERSION:U0:[1]:C/.*-//} >= 20050530
+.if !empty(WARNINGS_SET)
+.for ws in ${WARNINGS_SET}
+.if empty(${ws}_WARNINGS)
+.if ${MAKE_VERSION:[1]:C/.*-//} >= 20050530
 .BEGIN:	_empty_warnings
 _empty_warnings: .PHONY
 .else
 .BEGIN:
 .endif
-	@echo "ERROR: Invalid: WARNINGS_SET=${WARNINGS_SET}"
+	@echo "ERROR: Invalid: WARNINGS_SET=${ws}"
 	@echo "ERROR: Try one of: ${ALL_WARNINGS_SETS:O:u}"; exit 1
 
 .endif
+.endfor
+.endif
 
 # Without -O or if we've set -O0 somewhere - to make debugging more effective,
 # we need to turn off -Wuninitialized as otherwise we get a warning that
@@ -69,40 +75,6 @@ _w_cflags:= ${CFLAGS} ${CPPFLAGS}
 W_uninitialized=
 .endif
 
-.if ${MAKE_VERSION:U0:[1]:C/.*-//} <= 20040118
-# This version uses .for loops to avoid a double free bug in old bmake's
-# but the .for loops are sensitive to when this file is read.
-
-# first, make a list of all the warning flags - doesn't matter if
-# its redundant - we'll sort -u
-_all_sets= ${WARNINGS_SET_${MACHINE_ARCH}} ${WARNINGS_SET} ${ALL_WARNINGS_SETS}
-_all_warnings= ${WARNINGS} ${_all_sets:O:u:@s@${$s_WARNINGS}@}
-
-# we want to set W_* for each warning so they are easy to turn off.
-# :O:u does a sort -u
-# using :C allows us to handle -f* -w* etc as well as -W*
-.for w in ${_all_warnings:O:u}
-${w:C/-(.)/\1_/} ?= $w
-.endfor
-
-# Allow for per-target warnings
-# Warning: the WARNINGS+= line below, 
-# may make your brain hurt - trust me; it works --sjg
-# the idea is that you can set WARNINGS_SET[_${MACHINE_ARCH}]=HIGH 
-# and use one of
-# W_format_mips_foo.o=
-# W_format_foo.o=
-# to turn off -Wformat for foo.o (on mips only in the first case), or
-# W_format_foo.o=-Wformat=2
-# for stricter checking.
-#
-# NOTE: that we force the target extension to be .o
-#
-.for w in ${WARNINGS_SET_${MACHINE_ARCH}:U${WARNINGS_SET}:@s@${$s_WARNINGS}@:O:u}
-WARNINGS+= ${${w:C/-(.)/\1_/}_${MACHINE_ARCH}_${.TARGET:T:R}.o:U${${w:C/-(.)/\1_/}_${.TARGET:T:R}.o:U${${w:C/-(.)/\1_/}_${MACHINE_ARCH}:U${${w:C/-(.)/\1_/}}}}}
-.endfor
-
-.else
 
 # .for loops have the [dis]advantage of being evaluated when read,
 # so adding to WARNINGS_SET[_${MACHINE_ARCH}] after this file is 
@@ -123,9 +95,19 @@ WARNINGS+= ${${w:C/-(.)/\1_/}_${MACHINE_ARCH}_${.TARGET:T:R}.o:U${${w:C/-(.)/\1_
 # 
 # NOTE: that we force the target extension to be .o
 #
-WARNINGS+= ${WARNINGS_SET_${MACHINE_ARCH}:U${WARNINGS_SET}:@s@${$s_WARNINGS}@:O:u:@w@${${w:C/-(.)/\1_/}::?=$w} ${${w:C/-(.)/\1_/}_${MACHINE_ARCH}_${.TARGET:T:R}.o:U${${w:C/-(.)/\1_/}_${.TARGET:T:R}.o:U${${w:C/-(.)/\1_/}_${MACHINE_ARCH}:U${${w:C/-(.)/\1_/}}}}}@}
 
-.endif
+# define this once, we use it a couple of times below (hence the doubled $$).
+M_warnings_list = @s@$${$$s_WARNINGS}@:O:u:@w@$${$${w:C/-(.)/\1_/}::?=$$w} $${$${w:C/-(.)/\1_/}_${MACHINE_ARCH}_${.TARGET:T:R}.o:U$${$${w:C/-(.)/\1_/}_${.TARGET:T:R}.o:U$${$${w:C/-(.)/\1_/}_${MACHINE_ARCH}:U$${$${w:C/-(.)/\1_/}}}}}@
+
+# first a list of warnings from the chosen set
+_warnings = ${WARNINGS_SET_${MACHINE_ARCH}:U${WARNINGS_SET}:${M_warnings_list}}
+# now a list of all -Wno-* overrides not just those defined by WARNINGS_SET
+# since things like -Wall imply lots of others.
+# this should be a super-set of the -Wno-* in _warnings, but 
+# just in case...
+_no_warnings = ${_warnings:M-Wno-*} ${ALL_WARNINGS_SETS:${M_warnings_list}:M-Wno-*}
+# -Wno-* must follow any others
+WARNINGS += ${_warnings:N-Wno-*} ${_no_warnings:O:u}
 
 .ifndef NO_CFLAGS_WARNINGS
 # Just ${WARNINGS} should do, but this is more flexible?
@@ -137,9 +119,10 @@ NO_CXX_WARNINGS+= \
 	missing-declarations \
 	missing-prototypes \
 	nested-externs \
+	shadow \
 	strict-prototypes
 
-.for s in ${SRCS:M*.cc}
+.for s in ${SRCS:M*.c*:N*.c:N*h}
 .for w in ${NO_CXX_WARNINGS}
 W_$w_${s:T:R}.o=
 .endfor
diff --git a/contrib/bmake/os.sh b/contrib/bmake/os.sh
index 9e45f3792f9e..b714eb782cec 100755
--- a/contrib/bmake/os.sh
+++ b/contrib/bmake/os.sh
@@ -17,7 +17,7 @@
 #	Simon J. Gerraty <sjg@crufty.net>
 
 # RCSid:
-#	$Id: os.sh,v 1.44 2010/06/29 15:37:21 sjg Exp $
+#	$Id: os.sh,v 1.46 2014/05/19 16:38:09 sjg Exp $
 #
 #	@(#) Copyright (c) 1994 Simon J. Gerraty
 #
@@ -128,11 +128,13 @@ SunOS)
 	K=-k
 	MAILER=/usr/bin/Mail
 	LOCAL_FS=local
-	case "$-" in
-	*i*) ;;
+	: $-,$ENV
+	case "$-,$ENV" in
+	*i*,*) ;;
+	*,|*ENVFILE*) ;;
 	*) ENV=;;
 	esac
-	# NetBSD at least has good backward compatability
+	# NetBSD at least has good backward compatibility
 	# so NetBSD/i386 is good enough
 	case $OS in
 	NetBSD) SHARE_ARCH=$OS/${MACHINE_ARCH:-$MACHINE};;
diff --git a/contrib/bmake/parse.c b/contrib/bmake/parse.c
index ac51abfbab19..0f9a8fcc336d 100644
--- a/contrib/bmake/parse.c
+++ b/contrib/bmake/parse.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.192 2013/10/18 20:47:06 christos Exp $	*/
+/*	$NetBSD: parse.c,v 1.194 2014/02/15 00:17:17 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.192 2013/10/18 20:47:06 christos Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.194 2014/02/15 00:17:17 christos Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.192 2013/10/18 20:47:06 christos Exp $");
+__RCSID("$NetBSD: parse.c,v 1.194 2014/02/15 00:17:17 christos Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -364,6 +364,7 @@ static int ParseAddCmd(void *, void *);
 static void ParseHasCommands(void *);
 static void ParseDoInclude(char *);
 static void ParseSetParseFile(const char *);
+static void ParseSetIncludedFile(void);
 #ifdef SYSVINCLUDE
 static void ParseTraditionalInclude(char *);
 #endif
@@ -855,7 +856,8 @@ ParseLinkSrc(void *pgnp, void *cgnp)
 	    (void)Lst_AtEnd(cgn->parents, pgn);
     pgn->unmade += 1;
     if (DEBUG(PARSE)) {
-	fprintf(debug_file, "# ParseLinkSrc: added child %s - %s\n", pgn->name, cgn->name);
+	fprintf(debug_file, "# %s: added child %s - %s\n", __func__,
+	    pgn->name, cgn->name);
 	Targ_PrintNode(pgn, 0);
 	Targ_PrintNode(cgn, 0);
     }
@@ -1030,8 +1032,8 @@ ParseDoSrc(int tOp, const char *src)
 	    (void)Lst_AtEnd(predecessor->order_succ, gn);
 	    (void)Lst_AtEnd(gn->order_pred, predecessor);
 	    if (DEBUG(PARSE)) {
-		fprintf(debug_file, "# ParseDoSrc: added Order dependency %s - %s\n",
-			predecessor->name, gn->name);
+		fprintf(debug_file, "# %s: added Order dependency %s - %s\n",
+		    __func__, predecessor->name, gn->name);
 		Targ_PrintNode(predecessor, 0);
 		Targ_PrintNode(gn, 0);
 	    }
@@ -2174,6 +2176,7 @@ Parse_include_file(char *file, Boolean isSystem, int silent)
     /* load it */
     lf = loadfile(fullname, fd);
 
+    ParseSetIncludedFile();
     /* Start reading from this file next */
     Parse_SetInput(fullname, 0, -1, loadedfile_nextbuf, lf);
     curFile->lf = lf;
@@ -2231,6 +2234,41 @@ ParseDoInclude(char *line)
 }
 
 
+/*-
+ *---------------------------------------------------------------------
+ * ParseSetIncludedFile  --
+ *	Set the .INCLUDEDFROMFILE variable to the contents of .PARSEFILE
+ *	and the .INCLUDEDFROMDIR variable to the contents of .PARSEDIR
+ *
+ * Results:
+ *	None
+ *
+ * Side Effects:
+ *	The .INCLUDEDFROMFILE variable is overwritten by the contents
+ *	of .PARSEFILE and the .INCLUDEDFROMDIR variable is overwriten
+ *	by the contents of .PARSEDIR
+ *---------------------------------------------------------------------
+ */
+static void
+ParseSetIncludedFile(void)
+{
+    char *pf, *fp = NULL;
+    char *pd, *dp = NULL;
+
+    pf = Var_Value(".PARSEFILE", VAR_GLOBAL, &fp);
+    Var_Set(".INCLUDEDFROMFILE", pf, VAR_GLOBAL, 0);
+    pd = Var_Value(".PARSEDIR", VAR_GLOBAL, &dp);
+    Var_Set(".INCLUDEDFROMDIR", pd, VAR_GLOBAL, 0);
+
+    if (DEBUG(PARSE))
+	fprintf(debug_file, "%s: ${.INCLUDEDFROMDIR} = `%s' "
+	    "${.INCLUDEDFROMFILE} = `%s'\n", __func__, pd, pf);
+
+    if (fp)
+	free(fp);
+    if (dp)
+	free(dp);
+}
 /*-
  *---------------------------------------------------------------------
  * ParseSetParseFile  --
@@ -2266,8 +2304,8 @@ ParseSetParseFile(const char *filename)
 	Var_Set(".PARSEFILE", pf = slash + 1, VAR_GLOBAL, 0);
     }
     if (DEBUG(PARSE))
-	fprintf(debug_file, "ParseSetParseFile: ${.PARSEDIR} = `%s' "
-	    "${.PARSEFILE} = `%s'\n", pd, pf);
+	fprintf(debug_file, "%s: ${.PARSEDIR} = `%s' ${.PARSEFILE} = `%s'\n",
+	    __func__, pd, pf);
     free(dirname);
 }
 
@@ -2329,8 +2367,8 @@ Parse_SetInput(const char *name, int line, int fd,
 	ParseTrackInput(name);
 
     if (DEBUG(PARSE))
-	fprintf(debug_file, "Parse_SetInput: file %s, line %d, fd %d, nextbuf %p, arg %p\n",
-		name, line, fd, nextbuf, arg);
+	fprintf(debug_file, "%s: file %s, line %d, fd %d, nextbuf %p, arg %p\n",
+	    __func__, name, line, fd, nextbuf, arg);
 
     if (fd == -1 && nextbuf == NULL)
 	/* sanity */
@@ -2402,7 +2440,7 @@ ParseTraditionalInclude(char *line)
     char	  *all_files;
 
     if (DEBUG(PARSE)) {
-	    fprintf(debug_file, "ParseTraditionalInclude: %s\n", file);
+	    fprintf(debug_file, "%s: %s\n", __func__, file);
     }
 
     /*
@@ -2461,7 +2499,7 @@ ParseGmakeExport(char *line)
     char	  *value;
 
     if (DEBUG(PARSE)) {
-	    fprintf(debug_file, "ParseGmakeExport: %s\n", variable);
+	    fprintf(debug_file, "%s: %s\n", __func__, variable);
     }
 
     /*
@@ -2541,6 +2579,8 @@ ParseEOF(void)
 	/* We've run out of input */
 	Var_Delete(".PARSEDIR", VAR_GLOBAL);
 	Var_Delete(".PARSEFILE", VAR_GLOBAL);
+	Var_Delete(".INCLUDEDFROMDIR", VAR_GLOBAL);
+	Var_Delete(".INCLUDEDFROMFILE", VAR_GLOBAL);
 	return DONE;
     }
 
diff --git a/contrib/bmake/str.c b/contrib/bmake/str.c
index bc324b8c9c20..0260447f8178 100644
--- a/contrib/bmake/str.c
+++ b/contrib/bmake/str.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: str.c,v 1.34 2012/03/03 23:16:47 dholland Exp $	*/
+/*	$NetBSD: str.c,v 1.35 2014/02/12 01:35:56 sjg Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: str.c,v 1.34 2012/03/03 23:16:47 dholland Exp $";
+static char rcsid[] = "$NetBSD: str.c,v 1.35 2014/02/12 01:35:56 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char     sccsid[] = "@(#)str.c	5.8 (Berkeley) 6/1/90";
 #else
-__RCSID("$NetBSD: str.c,v 1.34 2012/03/03 23:16:47 dholland Exp $");
+__RCSID("$NetBSD: str.c,v 1.35 2014/02/12 01:35:56 sjg Exp $");
 #endif
 #endif				/* not lint */
 #endif
@@ -145,7 +145,7 @@ brk_string(const char *str, int *store_argc, Boolean expand, char **buffer)
 	const char *p;
 	int len;
 	int argmax = 50, curlen = 0;
-    	char **argv = bmake_malloc((argmax + 1) * sizeof(char *));
+    	char **argv;
 
 	/* skip leading space chars. */
 	for (; *str == ' ' || *str == '\t'; ++str)
@@ -155,6 +155,12 @@ brk_string(const char *str, int *store_argc, Boolean expand, char **buffer)
 	if ((len = strlen(str) + 1) > curlen)
 		*buffer = bmake_malloc(curlen = len);
 
+	/*
+	 * initial argmax based on len
+	 */
+	argmax = MAX((len / 5), 50);
+	argv = bmake_malloc((argmax + 1) * sizeof(char *));
+
 	/*
 	 * copy the string; at the same time, parse backslashes,
 	 * quotes and build the argument list.
diff --git a/contrib/bmake/var.c b/contrib/bmake/var.c
index ef71a8127413..0b7e88eb8752 100644
--- a/contrib/bmake/var.c
+++ b/contrib/bmake/var.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $	*/
+/*	$NetBSD: var.c,v 1.186 2014/06/20 06:13:45 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.186 2014/06/20 06:13:45 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.184 2013/09/04 15:38:26 sjg Exp $");
+__RCSID("$NetBSD: var.c,v 1.186 2014/06/20 06:13:45 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2637,7 +2637,7 @@ ApplyModifiers(char *nstr, const char *tstr,
 			break;
 		    }
 		    free(UNCONST(pattern.rhs));
-		    newStr = var_Error;
+		    newStr = varNoError;
 		    break;
 		}
 		goto default_case; /* "::<unrecognised>" */
@@ -3661,6 +3661,7 @@ Var_Parse(const char *str, GNode *ctxt, Boolean errnum, int *lengthPtr,
 	}
     } else {
 	Buffer buf;	/* Holds the variable name */
+	int depth = 1;
 
 	endc = startc == PROPEN ? PRCLOSE : BRCLOSE;
 	Buf_Init(&buf, 0);
@@ -3668,10 +3669,21 @@ Var_Parse(const char *str, GNode *ctxt, Boolean errnum, int *lengthPtr,
 	/*
 	 * Skip to the end character or a colon, whichever comes first.
 	 */
-	for (tstr = str + 2;
-	     *tstr != '\0' && *tstr != endc && *tstr != ':';
-	     tstr++)
+	for (tstr = str + 2; *tstr != '\0'; tstr++)
 	{
+	    /*
+	     * Track depth so we can spot parse errors.
+	     */
+	    if (*tstr == startc) {
+		depth++;
+	    }
+	    if (*tstr == endc) {
+		if (--depth == 0)
+		    break;
+	    }
+	    if (depth == 1 && *tstr == ':') {
+		break;
+	    }
 	    /*
 	     * A variable inside a variable, expand
 	     */
@@ -3691,7 +3703,7 @@ Var_Parse(const char *str, GNode *ctxt, Boolean errnum, int *lengthPtr,
 	}
 	if (*tstr == ':') {
 	    haveModifier = TRUE;
-	} else if (*tstr != '\0') {
+	} else if (*tstr == endc) {
 	    haveModifier = FALSE;
 	} else {
 	    /*
@@ -4041,7 +4053,7 @@ Var_Subst(const char *var, const char *str, GNode *ctxt, Boolean undefErr)
 		 */
 		if (oldVars) {
 		    str += length;
-		} else if (undefErr) {
+		} else if (undefErr || val == var_Error) {
 		    /*
 		     * If variable is undefined, complain and skip the
 		     * variable. The complaint will stop us from doing anything
diff --git a/contrib/byacc/CHANGES b/contrib/byacc/CHANGES
index 57a6c7f3ecc6..c9d73ced986c 100644
--- a/contrib/byacc/CHANGES
+++ b/contrib/byacc/CHANGES
@@ -1,3 +1,38 @@
+2014-07-15  Thomas E. Dickey  <tom@invisible-island.net>
+
+	* aclocal.m4: resync with my-autoconf (no change to configure script)
+
+	* VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+	bump
+
+	* test/run_test.sh:
+	make top-level "make check" work again, by adding another step to filtering
+	the test results.
+
+2014-07-14  Thomas E. Dickey  <tom@invisible-island.net>
+
+	* test/run_test.sh: changes from Garrett Cooper's patch:
+		a) ensure that the script returns an error-code if there are differences
+		b) escape "." character in left side of sed expression for $YACC
+		c) ensure that $ifBTYACC has a value
+
+	* test/btyacc/big_b.output, test/btyacc/big_l.output, test/btyacc/help.output, test/btyacc/no_b_opt.output, test/btyacc/no_output2.output, test/btyacc/no_p_opt.output, test/btyacc/nostdin.output:
+	regen (reminder by Garrett Cooper)
+
+2014-07-14  Garrett.Cooper
+
+	* test/btyacc/err_inherit1.error, test/btyacc/err_inherit2.error, test/btyacc/err_inherit3.error, test/btyacc/err_inherit4.error, test/btyacc/err_inherit5.error, test/btyacc/err_syntax1.error, test/btyacc/err_syntax10.error, test/btyacc/err_syntax11.error, test/btyacc/err_syntax12.error, test/btyacc/err_syntax13.error, test/btyacc/err_syntax14.error, test/btyacc/err_syntax15.error, test/btyacc/err_syntax16.error, test/btyacc/err_syntax17.error, test/btyacc/err_syntax18.error, test/btyacc/err_syntax19.error, test/btyacc/err_syntax2.error, test/btyacc/err_syntax21.error, test/btyacc/err_syntax22.error, test/btyacc/err_syntax23.error, test/btyacc/err_syntax24.error, test/btyacc/err_syntax25.error, test/btyacc/err_syntax26.error, test/btyacc/err_syntax27.error, test/btyacc/err_syntax3.error, test/btyacc/err_syntax4.error, test/btyacc/err_syntax5.error, test/btyacc/err_syntax6.error, test/btyacc/err_syntax7.error, test/btyacc/err_syntax7a.error, test/btyacc/err_syntax7b.error, test/btyacc/err_syntax8.error, test/btyacc/err_syntax8a.error, test/btyacc/err_syntax9.error, test/yacc/err_syntax1.error, test/yacc/err_syntax10.error, test/yacc/err_syntax11.error, test/yacc/err_syntax12.error, test/yacc/err_syntax13.error, test/yacc/err_syntax14.error, test/yacc/err_syntax15.error, test/yacc/err_syntax16.error, test/yacc/err_syntax17.error, test/yacc/err_syntax18.error, test/yacc/err_syntax19.error, test/yacc/err_syntax2.error, test/yacc/err_syntax21.error, test/yacc/err_syntax22.error, test/yacc/err_syntax23.error, test/yacc/err_syntax24.error, test/yacc/err_syntax25.error, test/yacc/err_syntax26.error, test/yacc/err_syntax27.error, test/yacc/err_syntax3.error, test/yacc/err_syntax4.error, test/yacc/err_syntax5.error, test/yacc/err_syntax6.error, test/yacc/err_syntax7.error, test/yacc/err_syntax7a.error, test/yacc/err_syntax7b.error, test/yacc/err_syntax8.error, test/yacc/err_syntax8a.error, test/yacc/err_syntax9.error:
+	regen
+
+2014-05-27  Tom.Shields
+
+	* main.c: remove obsolete -D option from usage message
+
+2014-05-27  Thomas E. Dickey  <tom@invisible-island.net>
+
+	* VERSION, package/byacc.spec, package/debian/changelog, test/yacc/big_b.output, test/yacc/big_l.output, test/yacc/help.output, test/yacc/no_b_opt.output, test/yacc/no_output2.output, test/yacc/no_p_opt.output, test/yacc/nostdin.output:
+	bump
+
 2014-04-22  Thomas E. Dickey  <tom@invisible-island.net>
 
 	* mstring.c:
diff --git a/contrib/byacc/MANIFEST b/contrib/byacc/MANIFEST
index 271d9c81dd12..8a2b784c347f 100644
--- a/contrib/byacc/MANIFEST
+++ b/contrib/byacc/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for byacc-20140422, version t20140422
+MANIFEST for byacc-20140715, version t20140715
 --------------------------------------------------------------------------------
 MANIFEST                        this file
 ACKNOWLEDGEMENTS                original version of byacc - 1993
diff --git a/contrib/byacc/NOTES-btyacc-Changes b/contrib/byacc/NOTES-btyacc-Changes
deleted file mode 100644
index f074907ee0c9..000000000000
--- a/contrib/byacc/NOTES-btyacc-Changes
+++ /dev/null
@@ -1,385 +0,0 @@
-Tom Shields, March 17, 2014
-
-PARKING LOT ISSUES:
--------------------
-- verify debian packaging still works?
-
-- there are no #line directives in y.tab.i, other than those that come
-  from the input file and the skeleton file; to fix this, would need to
-  count output lines in externs_file and add 'write_externs_lineno()'
-  similar to 'write_code_lineno()'
-- if there are no defined symbols, the .tab.h file isn't empty (weird case,
-  may not be worth fixing)
-- consider: treat []-actions identical to {}-actions if not processing a
-  backtracking parser (avoids test case error)?
-
-
-BTYACC CHANGES CURRENTLY DEFERRED, BY FILE:
--------------------------------------------
-
-push.skel
-- skeleton for a 'push' parser
-- needs to be upgraded match the structure of yaccpar.skel
-
-defs.h
-- adopt '%include' changes
-- adopt '%define'/'%ifdef'/'%endif'
-- adopt -E flag to print preprocessed grammar to stdout
-
-error.c
-- adopt '%include' changes
-- NOTE: there is a btyacc change that might be worth adopting in byacc
-  [FileError() refactoring to eliminate duplicated code in most of the
-  error message functions]
-
-main.c
-- adopt '%define' changes
-- adopt '-DNAME' command line option to define preprocessor variable NAME
-- adopt -E flag to print preprocessed grammar to stdout
-- adopt '-S skeleton_file' command line option to select an alternate parser
-  skeleton file
-- the skeleton file named by the -S flag is used as provided to open the
-  file; consider a change to this behavior to check whether the named file
-  has a path prefix, and if not, look in 'installation' directory if the
-  file is not found in the working directory
-
-output.c
-- adopt '%include' changes
-
-reader.c
-- adopt '%include' changes
-- adopt '%define'/'%ifdef'/'%endif' changes
-- adopt -E flag to print preprocessed grammar to stdout
-- NOTE: there is a btyacc change that might be worth adopting in byacc
-  [copy_string() & copy_comment() refactoring to eliminate duplicated
-  code in copy_text() and copy_union()]
-
-warshall.c
-- NOTE: there is a btyacc change that might be worth adopting in byacc
-  [shifting 'mask' incrementally rather than literal '1' by a variable
-  amount each time thru the loop]
-
-
-================================================================================
-
-
-new files:
-----------
-
-skel2c
-- modified from btyacc distribution: don't generate #include defs.h
-- extended syntax recognized to include '%% insert VERSION here', generating
-  the defines for YYMAJOR, YYMINOR and YYPATCH at that point
-- made generated tables type 'const char *const' to match skelton.c from
-  byacc-20130925 baseline
-- added code to append text for write_section() to end of generated skeleton.c
-- remove conversion of tab to \t in generated skeleton.c
-- extended syntax recognized to include '%%ifdef', '%%ifndef', '%%else' and
-  '%%endif'; used in yaccpar.skel to bracket code that is specific to
-  backtracking
-
-yaccpar.skel.old
-- created from skeleton.c in byacc-20140101 baseline; use of this skeleton
-  will create a version of skeleton.c that is close to that in the
-  byacc-20140101 baseline
-- eliminated 'body_3' and 'trailer_2' skeleton segments - no need to generate
-  yyerror() invocation dynamically; YYERROR_CALL() is already generated
-  earlier, and so can be used in the skeleton to simplify
-- added 'const' to types in '%% tables' section to match what skel2c,
-  start_int_table() and state_str_table() generate
-- added a few cosmetic changes (e.g., added some additional comments,
-  reworded debugging output to match yaccpar.skel, changed yygrowstack()
-  to return YYENOMEM for 'out of memory' error, rather than -1, to match
-  yaccpar.skel; changed yyparse() return value from 1 to 2 for the
-  'out of memory' error to match yaccpar.skel)
-- added '#ifndef'/'#endif' around '#define YYINITSTACKSIZE 200' to allow
-  the value to be changed at compile time
-- changed 'printf(' to 'fprintf(stderr, '; added stack depth (yydepth) to
-  debugging output from yaccpar.skel
-- use 'YYINT' rather than 'short' for integer table types
-
-yaccpar.skel
-- renamed from btyaccpa.ske, merged with btyacc-c.ske
-- modified from btyacc distribution to match the latest byacc-20140101
-  skeleton structure & data structures
-- make local functions static 
-- change "virtual memory exceeded" to "memory exhausted" for bison
-  compatibility
-- change debug output generation from printf/puts/putc onto stdout to use
-  fprintf/fputs/fputc onto stderr; include
-  stack depth and whether or not in trial parsing
-- changed types of generated string tables to be 'const pointer to const char'
-- check all malloc()/realloc() return values, ensure return value of
-  yyparse() = 2 if parsing failed due to memory exhaustion
-- change YYDBPR() macro to YYSTYPE_TOSTRING(); define semantics as delivering
-  a char* value representing a semantic value (e.g., yylval or yyval, or the
-  contents of an entry on the semantic stack); additional parameter passed:
-  grammar symbol # (to assist interpretation of semantic value)
-- change YYPOSN to YYLTYPE and yyposn to yylloc (position corresponding to
-  yylval) for bison compatibility; add yyloc (corresponding to yyval)
-- move default definition of YYLTYPE into output.c, generating a typedef
-- add '#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)'/'#endif' around
-  all lines specific to position processing
-- add '#if defined(YYDESTRUCT_CALL)'/'#endif' around all lines specific to
-  semantic & position stack processing to reclaim memory associated with
-  discarded symbols
-- add '%%ifdef YYBTYACC'/'%%endif' around all lines specific to backtrack
-  parsing; converted by skel2c into '#if defined(YYBTYACC)'/'#endif'
-- distinguish between "yacc stack overflow" and "memory exhausted" situations
-- consolidated termination cleanup code; introduced yyreturn, set to 2 after
-  labels yyoverflow/yyenomem, set to 1 after label yyabort, set to 0 after
-  label yyaccept; all termination cases jump to label yyreturn, which does
-  any cleanup then returns yyreturn value
-- replaced YYDELETEVAL & YYDELETEPOSN user-supplied macro capability by
-  implementation of byacc-generated yydestruct() as defined by bison
-  compatible %destructor mechanism
-- moved invocation of 'YYREDUCEPOSNFUNC' macro to immediately prior to, rather
-  than after, execution of final rule action (so that, at some future
-  date, implementation extensions can be added to enable custom calculation
-  of locations associated with non-terminals within rule actions); deleted
-  unnecessary flag 'reduce_posn'; deleted 'YYCALLREDUCEPOSN' macro; deleted
-  C++ variant of 'YYREDUCEPOSNFUNC' invocation
-- adopt approach similar to bison for default computation of yyloc; change
-  macro 'YYREDUCEPOSNFUNC' name to 'YYLLOC_DEFAULT' for bison compatibility;
-  added 'yyerror_loc_range[2]' to hold start & end locations for error
-  situations that pop the stack
-- use 'YYINT' rather than 'short' for integer table types, and for indexing
-  parser tables
-
-readskel.c
-http://www.verisign.com/index.html- replaced error() with fprintf()
-
-mstring.h
-- moved contents of mstring.h to defs.h - mstring.h is obsolete
-
-mstring.c
-- replaced include of mstring.h with defs.h
-- changed 'START' to 'HEAD' to remove conflict with 'START' used for
-  the start symbol defined in defs.h
-
-modified byacc files:
----------------------
-
-skeleton.c
-- skeleton.c is now generated from the appropriate skeleton file by 'skel2c'
-
-configure.in
-- added configuration for --enable-btyacc option; if 'yes' add '-DYYBTYACC'
-  to DEFINES in makefile.in; --enable-btyacc defaults to 'no'
-- added configuration for --with-max-table-size option; if present,
-  overrides the value of MAXTABLE defined in defs.h
-- regenerate configure using autoconf
-
-makefile.in
-- added mstring.c to C_FILES
-- added mstring$o to OBJS
-- added @DEFINES@ as value of DEFINES make variable
-- added new make variable SKELETON with value 'yaccpar.skel'
-- added rule to generate skeleton.c from $(SKELETON), depending on skel2c
-  and makefile
-- added rm -f skeleton.c distclean rule
-- moved dependency on makefile from only main$o & skeleton$o to $(OBJS),
-  since if ./configure is run changing, for example, from --enable-btyacc
-  to --disable-btyacc, all files must be recompiled to ensure a clean
-  executable
-- add @MAXTABLE@ for optional '-DMAXTABLE=nnn' if configured using
-  --with-max-table-size=nnn
-- changed 'cd test && rn 0f test-*'to 'rm -f $(testdir)/test-*'
-
-test/run_test.sh
-- ???
-
-test/run_make.sh
-- ???
-
-defs.h
-- moved contents of mstring.h to defs.h - mstring.h is obsolete
-- added <limits.h> to get the various system defined machine limits;
-  changed definitions of MAXCHAR, MAXSHORT, MINSHORT & BITS_PER_WORD to use
-  defines from <limits.h>; changed definitions of BIT and SETBIT to use
-  value of BITS_PER_WORD
-- added typedef for __compar_fn_t, conditioned on _COMPAR_FN_T being
-  undefined (at least for Mac OSX environment)
-- adopt new symbol class values ACTION and ARGUMENT
-- adopt changes/additions used by inherited attribute processing
-- clean up locations of extern function definitions to match where they
-  actually live in source files
-- adopt error functions from inherited attribute processing; added new error
-  functions
-- added keyword code LOCATIONS for %locations
-- added keyword code DESTRUCTOR for %destructor
-- added extern decl for 'int locations'; true if %locations present
-- added extern decl for 'int backtrack'; initialized to 0 (= false), set to
-  1 (= true) if -B flag is present
-- added extern decl for 'int destructor'; true if at least one %destructor
-  present in grammar spec file
-- define 'YYINT' as the smallest C type that can be used to address a
-  table of size 'MAXTABLE'; define 'YYINT' based on the value of
-  'MAXTABLE' using the standard system type size definitions from <limits.h>;
-  define 'MAXYYINT' and 'MINYYINT' accordingly
-- change 'Value_t' and 'Index_t' to 'YYINT' from 'short'
-- allow 'MAXTABLE' to be defined by '-DMAXTABLE=nnn' at compile-time
-
-closure.c
-- changed print_closure(), print_EFF() and print_first_derives() to 'static';
-  added fwd declarations
-- changed 'short' to 'Value_t' (in some instances, 'Value_t' was already
-  used for variables/parameters that were related to variables/parameters
-  declared as 'short'
-
-error.c
-- adopt error functions from inherited attribute processing; added a few
-  additional inherited attribute error functions
-
-graph.c
-- changed 'short' to 'Value_t' (in some instances, 'Value_t' was already
-  used for variables/parameters that were related to variables/parameters
-  declared as 'short'
-
-lalr.c
-- changed MAXSHORT to MAXYYINT
-
-lr0.c
-- changed MAXSHORT to MAXYYINT
-- changed 'short' to 'Value_t' (in some instances, 'Value_t' was already
-  used for variables/parameters that were related to variables/parameters
-  declared as 'short'
-
-main.c
-- changed 'short' to 'Value_t' (in some instances, 'Value_t' was already
-  used for variables/parameters that were related to variables/parameters
-  declared as 'short'
-
-mkpar.c
-- backtracking attempts to resolve shift/reduce and reduce/reduce conflicts
-
-output.c
-- generate prefix & YYPREFIX defines into externs file (-i, .tab.i) and
-  code file (-r, .code.c); generate into output file (.tab.c) only if not
-  using -r option; eliminates doubled output of prefix aliases if -r with
-  no -i in y.tab.c and y.code.c or if -r & -i in y.tab.i and y.code.c
-- changed types of generated string tables to be 'const pointer to const char'
-- adopt backtracking as an alternative in cases where otherwise we have a
-  conflict in the parsing actions (3, rather than 2, choices)
-- wrap defines file with (where "yy" is value of 'symbol_prefix')
-    #ifndef __yy_defines_h_
-    #define _yy_defines_h_
-
-    <defines>
-
-    #endif
-- avoid writing %%xdecls skeleton section twice if -r used
-- eliminated 'body_3' and 'trailer_2' skeleton segments - no need to generate
-  yyerror() invocation dynamically; YYERROR_CALL() is already generated
-  earlier, and can be used in the pareser skeleton
-- if -P flag (pure_parser), add yylloc as 2nd parameter to yylex()
-  (declaration & call)
-- change YYPOSN to YYLTYPE and yyposn to yylloc (position corresponding to
-  yylval) for bison compatibility; add yyloc (corresponding to yyval)
-- generate yylloc parameters for yylex & yyerror if %locations present
-- add location as 1st parameter to declaraion & invocation of yyerror() if
-  %locations present
-- output backtrack parsing tables if -B flag is present
-- added generation of yystos[] with output_accessing_symbols() to allow
-  translation from a parser internal state number to the corresponding
-  grammar symbol number [0 .. nsyms) of the accessing symbol of that parser
-  state; used in the generated code for YYDESTRUCT_CALL() &
-  YYSTYPE_TOSTRING() to enable the correct semantic value union tag to be
-  determined when executing the implementation of YYDESTRUCT_CALL() or
-  YYSTYPE_TOSTRING() (similar to yystos[] in bison)
-- added to output_prefix(): yystos; yycindex & yyctable if compiling
-  backtracking; yyloc & yylloc if %locations used
-- extended yyname[] to include all grammar symbols, not just the terminal
-  symbols: '$end', 'error', '$accept', all non-terminals, including internally
-  generated non-terminals for embedded actions in rules, and 'illegal-symbol'
-  (which bison spells '$undefined'); '$end' already defined as a symbol 0,
-  rathern than adding 'end-of-file' as the name of symbol 0; added
-  'illegal-symbol' from byacc-20140101 (NOTE: the comment in the code that
-  says byacc does not predefine '$end' and '$error' is incorrect; however,
-  both bison and byacc spell '$error' as 'error')
-- added generation of #define YYTRANSLATE() from byacc-20140101, but changed
-  the definition for the undefined symbol case because it is no longer in
-  yyname[YYMAXTOKEN+1] but rather occurs after the last non-terminal symbol;
-  added #define YYUNDFTOKEN to contain the index in yyname of 'illegal-symbol'
-- generate YYLTYPE in output_ltype() as a struct like for bison rather than
-  using #define in yaccpar.skel
-- added 'write_code_lineno' invocation at start of 'output_prefix'
-- added 'write_code_lineno' invocation at start of 'output_pure_parser'
-- added 'write_code_lineno' invocation prior to generation of #include
-  for externs file
-- added 'write_code_lineno' invocation after 1st 'write_section(fp, xdecls)'
-- added '++outline;' prior to output of '#define YYTRANSLATE' - this was
-  actually causing almost all of the invocations of 'write_code_lineno' to
-  put out the correct #line directive
-- corrected 'write_code_lineno' - the line number in a #line directive is
-  the number of the next line, not the number of the #line line
-- changed MAXSHORT to MAXYYINT; changed 'high' local static from 'int' to
-  'long' so that it can get higher than 'MAXYYINT' without machine-dependent
-  behavior; changed related formats from '%d' to '%ld'
-- generate 'YYINT' rather than 'short' for integer table types
-- generate YYDESTRUCT_DECL & YYDESTRUCT_CALL macros, similar to YYERROR_DECL
-  and YYERROR_CALL macros, that can be redefined by user, if desired, to add
-  additional parameters to yydestruct() (and even change the 'yydestruct'
-  function name)
-- if at least one %destructor present, generate yydestruct(); 1st parameter
-  is a string indicating the context in which yydestruct() is invoked
-  (e.g., discarding input token, discarding state on stack, cleanup when
-  aborting); 2nd parameter is the internal grammar symbol number [0..nsyms)
-  of the accessing symbol of the parser state on the top of the stack; 3rd
-  parameter is a pointer to the semantic value to be reclaimed associated
-  with the grammar symbol in the 2nd parameter; if %locations is defined,
-  the 4th parameter is a pointer to the position value to be reclaimed
-  associated with the grammar symbol in the 2nd parameter
-
-reader.c
-- adopt []-actions, similar to {}-actions; {}-actions are only executed when
-  not in trial mode, but []-actions are executed regardless of mode
-- adopt new symbol class values ACTION and ARGUMENT
-- adopt inherited attributes (syntax resembles arguments to non-terminal
-  symbols)
-- adopt keyword table lookup from btyacc, modified to handle equivalence
-  of '-' and '_' in spelling of keywords
-- adopt refactoring of tag table creation into cache_tag() for use in
-  multiple locations
-- added new error functions in place of btyacc's generic error() function
-- changed '0' to 'NULL' for pointer initialization
-- reworked for-loop at end of get_line (part of DEFERRED '%ifdef/%endif' change)
-- added %locations directive for bison compatibility to enable position
-  processing
-- added decl for 'int locations'; true if %locations present
-- added decl 'int backtrack'; initialized to 0 (= false), set to
-  1 (= true) if -B flag is present
-- process %locations if present, set location = 1
-- only process []-actions and only generate 'if (!yytrial)' prefix for
-  {}-actions if backtracking is enabled
-- add decl for 'int destructor'; true if at least one %destructor is present
-- add %destructor directive to enable semantic & position stack processing to
-  reclaim memory associated with discarded symbols
-- process bison compatible %destructor (set destructor = 1); support @$ in
-  %destructor code to reference the position value if %locations is defined
-- changed 'short' to 'Value_t' (in some instances, 'Value_t' was already
-  used for variables/parameters that were related to variables/parameters
-  declared as 'short'
-- if %locations present, support @N and @$ syntax as for bison to reference
-  the locations associated with the N-th rhs symbol and the lhs symbol,
-  respectively
-
-symtab.c
-- initialize fields added to 'struct bucket' for non-terminal symbol
-  inherited attributes
-
-verbose.c
-- for parse states with conflicts, the contents of the y.output file include
-  the trial shift and/or trial reduce actions
-- added output to the end of the verbose report showing the correspondance
-  between grammar symbol #, internal parser symbol #, and grammar symbol name
-- changed 'short' to 'Value_t' (in some instances, 'Value_t' was already
-  used for variables/parameters that were related to variables/parameters
-  declared as 'short'
-
-yacc.1
-- added options 'P', 'V', 'y' and '-o output_file' to the yacc command
-  synopsis (already covered in the description section)
-- added options 'B', 'D' and 'L' to the yacc command synopsis; added text in
-  the description section
-- added %locations description to the extensions section
diff --git a/contrib/byacc/NOTES-btyacc-Disposition b/contrib/byacc/NOTES-btyacc-Disposition
deleted file mode 100644
index 98e527bccab0..000000000000
--- a/contrib/byacc/NOTES-btyacc-Disposition
+++ /dev/null
@@ -1,80 +0,0 @@
-Tom Shields, March 17, 2014
-
-NOTE: README.BTYACC needs to be re-written (or another README file created)
-to explain how the extensions were adopted into the byacc-20140101 baseline.
-
-bytacc changes adopted; see README.BTYACC for details.
-------------------------------------------------------
-
-    Changes to the skeleton to send debugging output to stderr.
-
-    Changes to the types of the grammar tables from 'short' to 'int' if
-MAXTABLE is defined to be > MAXSHORT for generation of large grammar tables
-for large grammars.  This can be set with the invocation of configure
-using the --with-max-table-size=N option
-
-    Changes to add syntactic sugaring for definition and semantic processing
-of inherited attributes associated with non-terminal symbols on the rhs of
-rules.  Inherited attributes are implemented as {}-actions, and as such may
-introduce reduce/reduce conflicts.  The advantage over manual {}-actions is
-that checking is performed on the number and types of inherited attributes,
-and the positions on the semantic stack are automatically calculated.
-Identical actions produced by the inherited attribute syntax are collapsed
-into a single action, reducing reduce/reduce conflicts.
-
-    The %type specification is extended to define the types of inherited
-attributes associated with non-terminal symbols on the lhs of rules, in
-addition to its original purpose in yacc for specifying the type of the
-symbol itself on the parser's value stack.  In order to permit the two
- aspects to be used independently, the <type> specification following
-%type is optional.
-
-    Added a mechanism to the parser skeleton for computing and propagating
-the text position of grammar symbols if %locations directive is present in
-the grammar specificaion, or if yacc is invoked with the -L flag. Includes
-support for "@$" and "@N" (for N an integer) in actions to refer to symbol
-locations.
-
-    Added a bison compatible %destructor directive to define a memory
-management mechanism to the parser skeleton that enables cleanup of semantic
-values and text positions associated with the parsing stack that are
-automatically discarded during error processing.
-
-The following is only available if configure is invoked with the
---enable-btyacc=yes:
-
-    Changes to enable backtracking with semantic disambiguation, if yacc is
-invoked with the -B flag.  A yacc parser disambiguates shift/reduce conflicts
-by choosing to shift, and reduce/reduce conflicts by reducing using the
-earliest grammar rule (in the grammar specification).  A btyacc parser handles
-a conflict by remembering the current parse point and entering into trial parse
-mode.  In trial parse mode, the parser tries each of the conflicting options
-until the first successs or until all options are exhausted.  If the parser
-runs into an error while in trial parse mode, it backtracks to the most recent
-conflict point and tries the next alternative.  If the parser finds a
-successful parse, it backtracks to the point where it first entered trial parse
-mode and continues with normal parsing, using the action at the start of the
-successful trial path.  Success in trial parse mode is achieved either by
-successfully reducing the start symbol at the end of input or by invocation of
-YYVALID (or YYVALID_NESTED).  Semantic disambiguation is supported within
-[]-actions, which are always executed, with invocation of YYERROR to terminate
-a trial path or YYVALID (and YYVALID_NESTED).  Yacc {}-actions are only
-executed during normal parsing.
-
-
-btyacc changes deferred:
-------------------------
-
-    The -S command line flag to enable use of an alternate parser skeleton,
-read from an external file.
-
-    Preprocessor statements: %define, %ifdef/%endif, %include.
-
-
-btyacc changes rejected:
-------------------------
-
-    The yyerror_detailed() option for error messages is replaced by the
-byacc feature for specifying options paramters to yyerror().
-
-    C++-specific features in the parser skeleton.
diff --git a/contrib/byacc/VERSION b/contrib/byacc/VERSION
index 50894d11578d..088ee4dd9313 100644
--- a/contrib/byacc/VERSION
+++ b/contrib/byacc/VERSION
@@ -1 +1 @@
-20140422
+20140715
diff --git a/contrib/byacc/aclocal.m4 b/contrib/byacc/aclocal.m4
index 5283b2e53cc2..0df47aa1331e 100644
--- a/contrib/byacc/aclocal.m4
+++ b/contrib/byacc/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.34 2014/04/06 19:16:18 tom Exp $
+dnl $Id: aclocal.m4,v 1.35 2014/07/15 19:38:05 tom Exp $
 dnl Macros for byacc configure script (Thomas E. Dickey)
 dnl ---------------------------------------------------------------------------
 dnl Copyright 2004-2013,2014 Thomas E. Dickey
@@ -28,7 +28,7 @@ dnl sale, use or other dealings in this Software without prior written
 dnl authorization.
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
-dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56
+dnl CF_ACVERSION_CHECK version: 5 updated: 2014/06/04 19:11:49
 dnl ------------------
 dnl Conditionally generate script according to whether we're using a given autoconf.
 dnl
@@ -37,7 +37,7 @@ dnl $2 = code to use if AC_ACVERSION is at least as high as $1.
 dnl $3 = code to use if AC_ACVERSION is older than $1.
 define([CF_ACVERSION_CHECK],
 [
-ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl
+ifdef([AC_ACVERSION], ,[ifdef([AC_AUTOCONF_VERSION],[m4_copy([AC_AUTOCONF_VERSION],[AC_ACVERSION])],[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])])dnl
 ifdef([m4_version_compare],
 [m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
 [CF_ACVERSION_COMPARE(
@@ -930,7 +930,7 @@ AC_PROG_AWK
 test -z "$AWK" && AC_MSG_ERROR(No awk program found)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_CC version: 3 updated: 2012/10/06 15:31:55
+dnl CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58
 dnl ----------
 dnl standard check for CC, plus followup sanity checks
 dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name
@@ -940,7 +940,7 @@ CF_GCC_VERSION
 CF_ACVERSION_CHECK(2.52,
 	[AC_PROG_CC_STDC],
 	[CF_ANSI_CC_REQD])
-CF_CC_ENV_FLAGS 
+CF_CC_ENV_FLAGS
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14
diff --git a/contrib/byacc/main.c b/contrib/byacc/main.c
index 324c834cba0f..5de92358a053 100644
--- a/contrib/byacc/main.c
+++ b/contrib/byacc/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.50 2014/04/22 23:34:47 tom Exp $ */
+/* $Id: main.c,v 1.51 2014/05/28 02:01:55 Tom.Shields Exp $ */
 
 #include <signal.h>
 #ifndef _WIN32
@@ -208,7 +208,6 @@ usage(void)
 	,"  -b file_prefix        set filename prefix (default \"y.\")"
 	,"  -B                    create a backtracking parser"
 	,"  -d                    write definitions (" DEFINES_SUFFIX ")"
-	,"  -D                    enable value stack memory reclamation"
 	,"  -i                    write interface (y.tab.i)"
 	,"  -g                    write a graphical description"
 	,"  -l                    suppress #line directives"
diff --git a/contrib/byacc/package/byacc.spec b/contrib/byacc/package/byacc.spec
index 5444afd4c262..b2ac30eefa2e 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 20140422
+%define AppVersion 20140715
 %define UseProgram yacc
-# $XTermId: byacc.spec,v 1.20 2014/04/22 08:13:20 tom Exp $
+# $XTermId: byacc.spec,v 1.22 2014/07/15 19:36:54 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: 1
diff --git a/contrib/byacc/package/debian/changelog b/contrib/byacc/package/debian/changelog
index efbef7da51a1..33f31faa6278 100644
--- a/contrib/byacc/package/debian/changelog
+++ b/contrib/byacc/package/debian/changelog
@@ -1,3 +1,15 @@
+byacc (20140715) unstable; urgency=low
+
+  * maintenance updates
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 15 Jul 2014 15:36:54 -0400
+
+byacc (20140527) unstable; urgency=low
+
+  * remove obsolete option from usage message
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Tue, 27 May 2014 22:01:55 -0400
+
 byacc (20140422) unstable; urgency=low
 
   * maintenance updates
diff --git a/contrib/byacc/package/mingw-byacc.spec b/contrib/byacc/package/mingw-byacc.spec
index 0374e9117974..24230cb5b61a 100644
--- a/contrib/byacc/package/mingw-byacc.spec
+++ b/contrib/byacc/package/mingw-byacc.spec
@@ -1,8 +1,8 @@
 Summary: byacc - public domain Berkeley LALR Yacc parser generator
 %define AppProgram byacc
-%define AppVersion 20140422
+%define AppVersion 20140715
 %define UseProgram yacc
-# $XTermId: mingw-byacc.spec,v 1.3 2014/04/22 08:13:20 tom Exp $
+# $XTermId: mingw-byacc.spec,v 1.4 2014/07/15 19:36:54 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: 1
diff --git a/contrib/byacc/package/pkgsrc/Makefile b/contrib/byacc/package/pkgsrc/Makefile
index 2cb387fd2196..750137a64725 100644
--- a/contrib/byacc/package/pkgsrc/Makefile
+++ b/contrib/byacc/package/pkgsrc/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.9 2008/07/24 17:13:00 tonnerre Exp $
 #
 
-DISTNAME=	byacc-20140422
+DISTNAME=	byacc-20140715
 PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://invisible-island.net/byacc/
diff --git a/contrib/byacc/test/btyacc/big_b.output b/contrib/byacc/test/btyacc/big_b.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/big_b.output
+++ b/contrib/byacc/test/btyacc/big_b.output
@@ -4,7 +4,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/byacc/test/btyacc/big_l.output b/contrib/byacc/test/btyacc/big_l.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/big_l.output
+++ b/contrib/byacc/test/btyacc/big_l.output
@@ -4,7 +4,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/byacc/test/btyacc/err_inherit1.error b/contrib/byacc/test/btyacc/err_inherit1.error
index 1d662b649485..203b9063e908 100644
--- a/contrib/byacc/test/btyacc/err_inherit1.error
+++ b/contrib/byacc/test/btyacc/err_inherit1.error
@@ -1,3 +1,3 @@
-YACC: e - line 64 of "./test/err_inherit1.y", unterminated argument list
+YACC: e - line 64 of "./err_inherit1.y", unterminated argument list
 namelist($c, $t
         ^
diff --git a/contrib/byacc/test/btyacc/err_inherit2.error b/contrib/byacc/test/btyacc/err_inherit2.error
index a3fa54a4ff73..c016b63f179d 100644
--- a/contrib/byacc/test/btyacc/err_inherit2.error
+++ b/contrib/byacc/test/btyacc/err_inherit2.error
@@ -1,5 +1,5 @@
-YACC: w - line 64 of "./test/err_inherit2.y", number of arguments of namelist doesn't agree with previous declaration
-YACC: w - line 64 of "./test/err_inherit2.y", type of argument 1 to namelist doesn't agree with previous declaration
-YACC: e - line 64 of "./test/err_inherit2.y", bad formal argument list
+YACC: w - line 64 of "./err_inherit2.y", number of arguments of namelist doesn't agree with previous declaration
+YACC: w - line 64 of "./err_inherit2.y", type of argument 1 to namelist doesn't agree with previous declaration
+YACC: e - line 64 of "./err_inherit2.y", bad formal argument list
 namelist($<tval>c, $t, extra): namelist NAME
                              ^
diff --git a/contrib/byacc/test/btyacc/err_inherit3.error b/contrib/byacc/test/btyacc/err_inherit3.error
index 6e27dd0504c5..e0ab28a91799 100644
--- a/contrib/byacc/test/btyacc/err_inherit3.error
+++ b/contrib/byacc/test/btyacc/err_inherit3.error
@@ -1,23 +1,23 @@
-YACC: w - line 64 of "./test/err_inherit3.y", number of arguments of namelist doesn't agree with previous declaration
-YACC: w - line 64 of "./test/err_inherit3.y", wrong number of arguments for namelist
+YACC: w - line 64 of "./err_inherit3.y", number of arguments of namelist doesn't agree with previous declaration
+YACC: w - line 64 of "./err_inherit3.y", wrong number of arguments for namelist
 namelist: namelist($c) NAME
                        ^
-YACC: w - line 64 of "./test/err_inherit3.y", unknown argument $c
-YACC: w - line 64 of "./test/err_inherit3.y", untyped argument $c
-YACC: w - line 65 of "./test/err_inherit3.y", unknown argument $t
+YACC: w - line 64 of "./err_inherit3.y", unknown argument $c
+YACC: w - line 64 of "./err_inherit3.y", untyped argument $c
+YACC: w - line 65 of "./err_inherit3.y", unknown argument $t
 	    { $$->s = mksymbol($<tval>t, $<cval>c, $2);
 	                       ^
-YACC: w - line 65 of "./test/err_inherit3.y", unknown argument $c
+YACC: w - line 65 of "./err_inherit3.y", unknown argument $c
 	    { $$->s = mksymbol($<tval>t, $<cval>c, $2);
 	                                 ^
-YACC: w - line 69 of "./test/err_inherit3.y", unknown argument $t
+YACC: w - line 69 of "./err_inherit3.y", unknown argument $t
 	    { $$->s = mksymbol($t, $c, $1);
 	                         ^
-YACC: w - line 69 of "./test/err_inherit3.y", untyped argument $t
-YACC: w - line 69 of "./test/err_inherit3.y", unknown argument $c
+YACC: w - line 69 of "./err_inherit3.y", untyped argument $t
+YACC: w - line 69 of "./err_inherit3.y", unknown argument $c
 	    { $$->s = mksymbol($t, $c, $1);
 	                             ^
-YACC: w - line 69 of "./test/err_inherit3.y", untyped argument $c
-YACC: w - line 0 of "./test/err_inherit3.y", start symbol declaration requires arguments
+YACC: w - line 69 of "./err_inherit3.y", untyped argument $c
+YACC: w - line 0 of "./err_inherit3.y", start symbol declaration requires arguments
 YACC: 1 rule never reduced
 YACC: 3 shift/reduce conflicts.
diff --git a/contrib/byacc/test/btyacc/err_inherit4.error b/contrib/byacc/test/btyacc/err_inherit4.error
index 00eb9890a533..20aa216ba239 100644
--- a/contrib/byacc/test/btyacc/err_inherit4.error
+++ b/contrib/byacc/test/btyacc/err_inherit4.error
@@ -1,13 +1,13 @@
-YACC: w - line 32 of "./test/err_inherit4.y", destructor redeclared
+YACC: w - line 32 of "./err_inherit4.y", destructor redeclared
 %destructor	{
            	^
-YACC: w - line 77 of "./test/err_inherit4.y", wrong number of default arguments for namelist
+YACC: w - line 77 of "./err_inherit4.y", wrong number of default arguments for namelist
 	{ $$ = $1; @$ = @2; }
 	^
-YACC: w - line 77 of "./test/err_inherit4.y", wrong type for default argument 2 to namelist
+YACC: w - line 77 of "./err_inherit4.y", wrong type for default argument 2 to namelist
 	{ $$ = $1; @$ = @2; }
 	^
-YACC: w - line 77 of "./test/err_inherit4.y", wrong type for default argument 1 to namelist
+YACC: w - line 77 of "./err_inherit4.y", wrong type for default argument 1 to namelist
 	{ $$ = $1; @$ = @2; }
 	^
-YACC: w - line 77 of "./test/err_inherit4.y", @2 references beyond the end of the current rule
+YACC: w - line 77 of "./err_inherit4.y", @2 references beyond the end of the current rule
diff --git a/contrib/byacc/test/btyacc/err_inherit5.error b/contrib/byacc/test/btyacc/err_inherit5.error
index edc58c984c59..ceabc34591b2 100644
--- a/contrib/byacc/test/btyacc/err_inherit5.error
+++ b/contrib/byacc/test/btyacc/err_inherit5.error
@@ -1 +1 @@
-YACC: e - line 74 of "./test/err_inherit5.y", illegal @$ or @N reference
+YACC: e - line 74 of "./err_inherit5.y", illegal @$ or @N reference
diff --git a/contrib/byacc/test/btyacc/err_syntax1.error b/contrib/byacc/test/btyacc/err_syntax1.error
index e3a341d4ee3d..5df5c22ef17b 100644
--- a/contrib/byacc/test/btyacc/err_syntax1.error
+++ b/contrib/byacc/test/btyacc/err_syntax1.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax1.y", syntax error
+YACC: e - line 1 of "./err_syntax1.y", syntax error
 	?%	{
 	^
diff --git a/contrib/byacc/test/btyacc/err_syntax10.error b/contrib/byacc/test/btyacc/err_syntax10.error
index ceb876ec6037..61a72c0408af 100644
--- a/contrib/byacc/test/btyacc/err_syntax10.error
+++ b/contrib/byacc/test/btyacc/err_syntax10.error
@@ -1,3 +1,3 @@
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '(' has been redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '*' has been redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '&' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '(' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '*' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '&' has been redeclared
diff --git a/contrib/byacc/test/btyacc/err_syntax11.error b/contrib/byacc/test/btyacc/err_syntax11.error
index df0aee4fb588..b2dd79c50504 100644
--- a/contrib/byacc/test/btyacc/err_syntax11.error
+++ b/contrib/byacc/test/btyacc/err_syntax11.error
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax11.y", the precedence of '|' has been redeclared
+YACC: w - line 7 of "./err_syntax11.y", the precedence of '|' has been redeclared
diff --git a/contrib/byacc/test/btyacc/err_syntax12.error b/contrib/byacc/test/btyacc/err_syntax12.error
index 9399e82e1d76..358960bdb9ec 100644
--- a/contrib/byacc/test/btyacc/err_syntax12.error
+++ b/contrib/byacc/test/btyacc/err_syntax12.error
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax12.y", the value of text has been redeclared
+YACC: w - line 7 of "./err_syntax12.y", the value of text has been redeclared
diff --git a/contrib/byacc/test/btyacc/err_syntax13.error b/contrib/byacc/test/btyacc/err_syntax13.error
index dd062569c1dc..9ffa8b40c271 100644
--- a/contrib/byacc/test/btyacc/err_syntax13.error
+++ b/contrib/byacc/test/btyacc/err_syntax13.error
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax13.y", the start symbol text is a token
+YACC: e - line 7 of "./err_syntax13.y", the start symbol text is a token
diff --git a/contrib/byacc/test/btyacc/err_syntax14.error b/contrib/byacc/test/btyacc/err_syntax14.error
index 787a21760b3d..73e9f7c8319f 100644
--- a/contrib/byacc/test/btyacc/err_syntax14.error
+++ b/contrib/byacc/test/btyacc/err_syntax14.error
@@ -1,2 +1,2 @@
-YACC: w - line 7 of "./test/err_syntax14.y", the start symbol has been redeclared
+YACC: w - line 7 of "./err_syntax14.y", the start symbol has been redeclared
 YACC: e - the start symbol text2 is undefined
diff --git a/contrib/byacc/test/btyacc/err_syntax15.error b/contrib/byacc/test/btyacc/err_syntax15.error
index 63600f1bd126..36dc03fef8bb 100644
--- a/contrib/byacc/test/btyacc/err_syntax15.error
+++ b/contrib/byacc/test/btyacc/err_syntax15.error
@@ -1 +1 @@
-YACC: e - line 9 of "./test/err_syntax15.y", no grammar has been specified
+YACC: e - line 9 of "./err_syntax15.y", no grammar has been specified
diff --git a/contrib/byacc/test/btyacc/err_syntax16.error b/contrib/byacc/test/btyacc/err_syntax16.error
index b8dd094b9409..6ff158970452 100644
--- a/contrib/byacc/test/btyacc/err_syntax16.error
+++ b/contrib/byacc/test/btyacc/err_syntax16.error
@@ -1 +1 @@
-YACC: e - line 14 of "./test/err_syntax16.y", a token appears on the lhs of a production
+YACC: e - line 14 of "./err_syntax16.y", a token appears on the lhs of a production
diff --git a/contrib/byacc/test/btyacc/err_syntax17.error b/contrib/byacc/test/btyacc/err_syntax17.error
index 24032f613202..8a8b64b07123 100644
--- a/contrib/byacc/test/btyacc/err_syntax17.error
+++ b/contrib/byacc/test/btyacc/err_syntax17.error
@@ -1,3 +1,3 @@
-YACC: e - line 8 of "./test/err_syntax17.y", unterminated action
+YACC: e - line 8 of "./err_syntax17.y", unterminated action
 S: { error
    ^
diff --git a/contrib/byacc/test/btyacc/err_syntax18.error b/contrib/byacc/test/btyacc/err_syntax18.error
index 305b4cf45e3c..c52fd71a1ecb 100644
--- a/contrib/byacc/test/btyacc/err_syntax18.error
+++ b/contrib/byacc/test/btyacc/err_syntax18.error
@@ -1 +1 @@
-YACC: w - line 9 of "./test/err_syntax18.y", $4 references beyond the end of the current rule
+YACC: w - line 9 of "./err_syntax18.y", $4 references beyond the end of the current rule
diff --git a/contrib/byacc/test/btyacc/err_syntax19.error b/contrib/byacc/test/btyacc/err_syntax19.error
index 895c8fe16264..2499b7fc4f13 100644
--- a/contrib/byacc/test/btyacc/err_syntax19.error
+++ b/contrib/byacc/test/btyacc/err_syntax19.error
@@ -1,3 +1,3 @@
-YACC: e - line 9 of "./test/err_syntax19.y", illegal $-name
+YACC: e - line 9 of "./err_syntax19.y", illegal $-name
             {  $$ = $<oops>; }
                     ^
diff --git a/contrib/byacc/test/btyacc/err_syntax2.error b/contrib/byacc/test/btyacc/err_syntax2.error
index fefda9fcf445..29fe56c28b48 100644
--- a/contrib/byacc/test/btyacc/err_syntax2.error
+++ b/contrib/byacc/test/btyacc/err_syntax2.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax2.y", unmatched /*
+YACC: e - line 1 of "./err_syntax2.y", unmatched /*
 %{ /*
    ^
diff --git a/contrib/byacc/test/btyacc/err_syntax21.error b/contrib/byacc/test/btyacc/err_syntax21.error
index 162d82d0c96d..9b0dc17b6629 100644
--- a/contrib/byacc/test/btyacc/err_syntax21.error
+++ b/contrib/byacc/test/btyacc/err_syntax21.error
@@ -1 +1 @@
-YACC: e - line 12 of "./test/err_syntax21.y", $0 is untyped
+YACC: e - line 12 of "./err_syntax21.y", $0 is untyped
diff --git a/contrib/byacc/test/btyacc/err_syntax22.error b/contrib/byacc/test/btyacc/err_syntax22.error
index 9c71619c4e25..8622aa73f598 100644
--- a/contrib/byacc/test/btyacc/err_syntax22.error
+++ b/contrib/byacc/test/btyacc/err_syntax22.error
@@ -1 +1 @@
-YACC: e - line 17 of "./test/err_syntax22.y", $2 (recur) is untyped
+YACC: e - line 17 of "./err_syntax22.y", $2 (recur) is untyped
diff --git a/contrib/byacc/test/btyacc/err_syntax23.error b/contrib/byacc/test/btyacc/err_syntax23.error
index bcde6e7fac40..3ccbbd1fee8f 100644
--- a/contrib/byacc/test/btyacc/err_syntax23.error
+++ b/contrib/byacc/test/btyacc/err_syntax23.error
@@ -1 +1 @@
-YACC: e - line 18 of "./test/err_syntax23.y", $$ is untyped
+YACC: e - line 18 of "./err_syntax23.y", $$ is untyped
diff --git a/contrib/byacc/test/btyacc/err_syntax24.error b/contrib/byacc/test/btyacc/err_syntax24.error
index bdd3aeda0db3..c1538898ce0b 100644
--- a/contrib/byacc/test/btyacc/err_syntax24.error
+++ b/contrib/byacc/test/btyacc/err_syntax24.error
@@ -1,2 +1,2 @@
-YACC: w - line 21 of "./test/err_syntax24.y", the default action assigns an undefined value to $$
-YACC: e - line 22 of "./test/err_syntax24.y", $$ is untyped
+YACC: w - line 21 of "./err_syntax24.y", the default action assigns an undefined value to $$
+YACC: e - line 22 of "./err_syntax24.y", $$ is untyped
diff --git a/contrib/byacc/test/btyacc/err_syntax25.error b/contrib/byacc/test/btyacc/err_syntax25.error
index ea45a70310de..234a7b9fcd3c 100644
--- a/contrib/byacc/test/btyacc/err_syntax25.error
+++ b/contrib/byacc/test/btyacc/err_syntax25.error
@@ -1,3 +1,3 @@
-YACC: e - line 11 of "./test/err_syntax25.y", too many %union declarations
+YACC: e - line 11 of "./err_syntax25.y", too many %union declarations
 %union {
 ^
diff --git a/contrib/byacc/test/btyacc/err_syntax26.error b/contrib/byacc/test/btyacc/err_syntax26.error
index cddd5741bf7a..c9a09ad19929 100644
--- a/contrib/byacc/test/btyacc/err_syntax26.error
+++ b/contrib/byacc/test/btyacc/err_syntax26.error
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax26.y", unexpected end-of-file
+YACC: e - line 6 of "./err_syntax26.y", unexpected end-of-file
diff --git a/contrib/byacc/test/btyacc/err_syntax27.error b/contrib/byacc/test/btyacc/err_syntax27.error
index 4737f99b9a37..2a277087c356 100644
--- a/contrib/byacc/test/btyacc/err_syntax27.error
+++ b/contrib/byacc/test/btyacc/err_syntax27.error
@@ -1 +1 @@
-YACC: e - line 3 of "./test/err_syntax27.y", missing '}'
+YACC: e - line 3 of "./err_syntax27.y", missing '}'
diff --git a/contrib/byacc/test/btyacc/err_syntax3.error b/contrib/byacc/test/btyacc/err_syntax3.error
index 6926214f5e7b..7e4871b87ad2 100644
--- a/contrib/byacc/test/btyacc/err_syntax3.error
+++ b/contrib/byacc/test/btyacc/err_syntax3.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax3.y", unterminated string
+YACC: e - line 6 of "./err_syntax3.y", unterminated string
 %token <text> '(' '*' '&
                       ^
diff --git a/contrib/byacc/test/btyacc/err_syntax4.error b/contrib/byacc/test/btyacc/err_syntax4.error
index 72b683ee7d4b..6a10d4040eb5 100644
--- a/contrib/byacc/test/btyacc/err_syntax4.error
+++ b/contrib/byacc/test/btyacc/err_syntax4.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax4.y", unmatched %{
+YACC: e - line 1 of "./err_syntax4.y", unmatched %{
 %{
 ^
diff --git a/contrib/byacc/test/btyacc/err_syntax5.error b/contrib/byacc/test/btyacc/err_syntax5.error
index fd3bf0df6b9f..37a8500b053a 100644
--- a/contrib/byacc/test/btyacc/err_syntax5.error
+++ b/contrib/byacc/test/btyacc/err_syntax5.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax5.y", unterminated %union declaration
+YACC: e - line 6 of "./err_syntax5.y", unterminated %union declaration
 %union {
 ^
diff --git a/contrib/byacc/test/btyacc/err_syntax6.error b/contrib/byacc/test/btyacc/err_syntax6.error
index ae83bd2a3735..bde624a71599 100644
--- a/contrib/byacc/test/btyacc/err_syntax6.error
+++ b/contrib/byacc/test/btyacc/err_syntax6.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax6.y", illegal tag
+YACC: e - line 6 of "./err_syntax6.y", illegal tag
 %token <text) '(' '*' '&
        ^
diff --git a/contrib/byacc/test/btyacc/err_syntax7.error b/contrib/byacc/test/btyacc/err_syntax7.error
index fb6342288f52..ce5717e775e8 100644
--- a/contrib/byacc/test/btyacc/err_syntax7.error
+++ b/contrib/byacc/test/btyacc/err_syntax7.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7.y", illegal character
+YACC: e - line 6 of "./err_syntax7.y", illegal character
 %token <text> '\777'
                ^
diff --git a/contrib/byacc/test/btyacc/err_syntax7a.error b/contrib/byacc/test/btyacc/err_syntax7a.error
index f6adba64ddc1..213711e11ff0 100644
--- a/contrib/byacc/test/btyacc/err_syntax7a.error
+++ b/contrib/byacc/test/btyacc/err_syntax7a.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7a.y", illegal character
+YACC: e - line 6 of "./err_syntax7a.y", illegal character
 %token <text> '\xfff'
                ^
diff --git a/contrib/byacc/test/btyacc/err_syntax7b.error b/contrib/byacc/test/btyacc/err_syntax7b.error
index f3e512fd1a71..19b617ccca1c 100644
--- a/contrib/byacc/test/btyacc/err_syntax7b.error
+++ b/contrib/byacc/test/btyacc/err_syntax7b.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7b.y", illegal character
+YACC: e - line 6 of "./err_syntax7b.y", illegal character
 %token <text> '\x.'
                ^
diff --git a/contrib/byacc/test/btyacc/err_syntax8.error b/contrib/byacc/test/btyacc/err_syntax8.error
index 53a3a328d05e..c6a4cc943fa2 100644
--- a/contrib/byacc/test/btyacc/err_syntax8.error
+++ b/contrib/byacc/test/btyacc/err_syntax8.error
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8.y", illegal use of reserved symbol .
+YACC: e - line 6 of "./err_syntax8.y", illegal use of reserved symbol .
diff --git a/contrib/byacc/test/btyacc/err_syntax8a.error b/contrib/byacc/test/btyacc/err_syntax8a.error
index 3135551633f0..ed503e90451b 100644
--- a/contrib/byacc/test/btyacc/err_syntax8a.error
+++ b/contrib/byacc/test/btyacc/err_syntax8a.error
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8a.y", illegal use of reserved symbol $$123
+YACC: e - line 6 of "./err_syntax8a.y", illegal use of reserved symbol $$123
diff --git a/contrib/byacc/test/btyacc/err_syntax9.error b/contrib/byacc/test/btyacc/err_syntax9.error
index 43696bd1f4c3..1f74b7ea0a26 100644
--- a/contrib/byacc/test/btyacc/err_syntax9.error
+++ b/contrib/byacc/test/btyacc/err_syntax9.error
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax9.y", the start symbol text cannot be declared to be a token
+YACC: e - line 7 of "./err_syntax9.y", the start symbol text cannot be declared to be a token
diff --git a/contrib/byacc/test/btyacc/help.output b/contrib/byacc/test/btyacc/help.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/help.output
+++ b/contrib/byacc/test/btyacc/help.output
@@ -4,7 +4,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/byacc/test/btyacc/no_b_opt.output b/contrib/byacc/test/btyacc/no_b_opt.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/no_b_opt.output
+++ b/contrib/byacc/test/btyacc/no_b_opt.output
@@ -4,7 +4,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/byacc/test/btyacc/no_output2.output b/contrib/byacc/test/btyacc/no_output2.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/no_output2.output
+++ b/contrib/byacc/test/btyacc/no_output2.output
@@ -4,7 +4,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/byacc/test/btyacc/no_p_opt.output b/contrib/byacc/test/btyacc/no_p_opt.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/no_p_opt.output
+++ b/contrib/byacc/test/btyacc/no_p_opt.output
@@ -4,7 +4,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/byacc/test/btyacc/nostdin.output b/contrib/byacc/test/btyacc/nostdin.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/btyacc/nostdin.output
+++ b/contrib/byacc/test/btyacc/nostdin.output
@@ -4,7 +4,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/byacc/test/run_test.sh b/contrib/byacc/test/run_test.sh
index d9faf0bd76a6..22ac61dc9ca9 100755
--- a/contrib/byacc/test/run_test.sh
+++ b/contrib/byacc/test/run_test.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
-# $Id: run_test.sh,v 1.22 2014/04/09 11:00:45 tom Exp $
+# $Id: run_test.sh,v 1.24 2014/07/15 19:21:10 tom Exp $
 # vi:ts=4 sw=4:
 
+errors=0
+
 # NEW is the file created by the testcase
 # REF is the reference file against which to compare
 test_diffs() {
@@ -11,13 +13,15 @@ test_diffs() {
 	if test ! -f $CMP
 	then
 		echo "...not found $CMP"
+		errors=1
 	else
 		sed	-e s,$NEW,$REF, \
-			-e "s%$YACC%YACC%" \
+			-e "s%$YACC_escaped%YACC%" \
 			-e '/YYPATCH/s/[0-9][0-9]*/"yyyymmdd"/' \
 			-e '/#define YYPATCH/s/PATCH/CHECK/' \
 			-e 's,#line \([1-9][0-9]*\) "'$REF_DIR'/,#line \1 ",' \
 			-e 's,#line \([1-9][0-9]*\) "'$TEST_DIR'/,#line \1 ",' \
+			-e 's,\(YACC:.* line [0-9][0-9]* of "\)'$TEST_DIR/',\1./,' \
 			< $CMP >$tmpfile \
 			&& mv $tmpfile $CMP
 		if test ! -f $REF
@@ -31,6 +35,7 @@ test_diffs() {
 		else
 			echo "...diff $REF"
 			diff -u $REF $CMP
+			errors=1
 		fi
 	fi
 }
@@ -62,10 +67,11 @@ else
 fi
 
 YACC=$PROG_DIR/yacc
+YACC_escaped=`echo "$PROG_DIR/yacc" | sed -e 's/\./\\\./g'`
 
 tmpfile=temp$$
 
-ifBTYACC=`fgrep -l 'define YYBTYACC' config.h > /dev/null; test $? != 0; echo $?`
+ifBTYACC=`fgrep -l 'define YYBTYACC' $PROG_DIR/config.h > /dev/null; test $? != 0; echo $?`
 
 if test $ifBTYACC = 0; then
 	REF_DIR=${TEST_DIR}/yacc
@@ -236,3 +242,5 @@ do
 		;;
 	esac
 done
+
+exit $errors
diff --git a/contrib/byacc/test/yacc/big_b.output b/contrib/byacc/test/yacc/big_b.output
index 889f0130b120..c98de14b4ad0 100644
--- a/contrib/byacc/test/yacc/big_b.output
+++ b/contrib/byacc/test/yacc/big_b.output
@@ -5,7 +5,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/byacc/test/yacc/big_l.output b/contrib/byacc/test/yacc/big_l.output
index 889f0130b120..c98de14b4ad0 100644
--- a/contrib/byacc/test/yacc/big_l.output
+++ b/contrib/byacc/test/yacc/big_l.output
@@ -5,7 +5,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/byacc/test/yacc/err_syntax1.error b/contrib/byacc/test/yacc/err_syntax1.error
index e3a341d4ee3d..5df5c22ef17b 100644
--- a/contrib/byacc/test/yacc/err_syntax1.error
+++ b/contrib/byacc/test/yacc/err_syntax1.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax1.y", syntax error
+YACC: e - line 1 of "./err_syntax1.y", syntax error
 	?%	{
 	^
diff --git a/contrib/byacc/test/yacc/err_syntax10.error b/contrib/byacc/test/yacc/err_syntax10.error
index ceb876ec6037..61a72c0408af 100644
--- a/contrib/byacc/test/yacc/err_syntax10.error
+++ b/contrib/byacc/test/yacc/err_syntax10.error
@@ -1,3 +1,3 @@
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '(' has been redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '*' has been redeclared
-YACC: w - line 7 of "./test/err_syntax10.y", the type of '&' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '(' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '*' has been redeclared
+YACC: w - line 7 of "./err_syntax10.y", the type of '&' has been redeclared
diff --git a/contrib/byacc/test/yacc/err_syntax11.error b/contrib/byacc/test/yacc/err_syntax11.error
index df0aee4fb588..b2dd79c50504 100644
--- a/contrib/byacc/test/yacc/err_syntax11.error
+++ b/contrib/byacc/test/yacc/err_syntax11.error
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax11.y", the precedence of '|' has been redeclared
+YACC: w - line 7 of "./err_syntax11.y", the precedence of '|' has been redeclared
diff --git a/contrib/byacc/test/yacc/err_syntax12.error b/contrib/byacc/test/yacc/err_syntax12.error
index 9399e82e1d76..358960bdb9ec 100644
--- a/contrib/byacc/test/yacc/err_syntax12.error
+++ b/contrib/byacc/test/yacc/err_syntax12.error
@@ -1 +1 @@
-YACC: w - line 7 of "./test/err_syntax12.y", the value of text has been redeclared
+YACC: w - line 7 of "./err_syntax12.y", the value of text has been redeclared
diff --git a/contrib/byacc/test/yacc/err_syntax13.error b/contrib/byacc/test/yacc/err_syntax13.error
index dd062569c1dc..9ffa8b40c271 100644
--- a/contrib/byacc/test/yacc/err_syntax13.error
+++ b/contrib/byacc/test/yacc/err_syntax13.error
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax13.y", the start symbol text is a token
+YACC: e - line 7 of "./err_syntax13.y", the start symbol text is a token
diff --git a/contrib/byacc/test/yacc/err_syntax14.error b/contrib/byacc/test/yacc/err_syntax14.error
index 787a21760b3d..73e9f7c8319f 100644
--- a/contrib/byacc/test/yacc/err_syntax14.error
+++ b/contrib/byacc/test/yacc/err_syntax14.error
@@ -1,2 +1,2 @@
-YACC: w - line 7 of "./test/err_syntax14.y", the start symbol has been redeclared
+YACC: w - line 7 of "./err_syntax14.y", the start symbol has been redeclared
 YACC: e - the start symbol text2 is undefined
diff --git a/contrib/byacc/test/yacc/err_syntax15.error b/contrib/byacc/test/yacc/err_syntax15.error
index 63600f1bd126..36dc03fef8bb 100644
--- a/contrib/byacc/test/yacc/err_syntax15.error
+++ b/contrib/byacc/test/yacc/err_syntax15.error
@@ -1 +1 @@
-YACC: e - line 9 of "./test/err_syntax15.y", no grammar has been specified
+YACC: e - line 9 of "./err_syntax15.y", no grammar has been specified
diff --git a/contrib/byacc/test/yacc/err_syntax16.error b/contrib/byacc/test/yacc/err_syntax16.error
index b8dd094b9409..6ff158970452 100644
--- a/contrib/byacc/test/yacc/err_syntax16.error
+++ b/contrib/byacc/test/yacc/err_syntax16.error
@@ -1 +1 @@
-YACC: e - line 14 of "./test/err_syntax16.y", a token appears on the lhs of a production
+YACC: e - line 14 of "./err_syntax16.y", a token appears on the lhs of a production
diff --git a/contrib/byacc/test/yacc/err_syntax17.error b/contrib/byacc/test/yacc/err_syntax17.error
index 24032f613202..8a8b64b07123 100644
--- a/contrib/byacc/test/yacc/err_syntax17.error
+++ b/contrib/byacc/test/yacc/err_syntax17.error
@@ -1,3 +1,3 @@
-YACC: e - line 8 of "./test/err_syntax17.y", unterminated action
+YACC: e - line 8 of "./err_syntax17.y", unterminated action
 S: { error
    ^
diff --git a/contrib/byacc/test/yacc/err_syntax18.error b/contrib/byacc/test/yacc/err_syntax18.error
index 305b4cf45e3c..c52fd71a1ecb 100644
--- a/contrib/byacc/test/yacc/err_syntax18.error
+++ b/contrib/byacc/test/yacc/err_syntax18.error
@@ -1 +1 @@
-YACC: w - line 9 of "./test/err_syntax18.y", $4 references beyond the end of the current rule
+YACC: w - line 9 of "./err_syntax18.y", $4 references beyond the end of the current rule
diff --git a/contrib/byacc/test/yacc/err_syntax19.error b/contrib/byacc/test/yacc/err_syntax19.error
index 895c8fe16264..2499b7fc4f13 100644
--- a/contrib/byacc/test/yacc/err_syntax19.error
+++ b/contrib/byacc/test/yacc/err_syntax19.error
@@ -1,3 +1,3 @@
-YACC: e - line 9 of "./test/err_syntax19.y", illegal $-name
+YACC: e - line 9 of "./err_syntax19.y", illegal $-name
             {  $$ = $<oops>; }
                     ^
diff --git a/contrib/byacc/test/yacc/err_syntax2.error b/contrib/byacc/test/yacc/err_syntax2.error
index fefda9fcf445..29fe56c28b48 100644
--- a/contrib/byacc/test/yacc/err_syntax2.error
+++ b/contrib/byacc/test/yacc/err_syntax2.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax2.y", unmatched /*
+YACC: e - line 1 of "./err_syntax2.y", unmatched /*
 %{ /*
    ^
diff --git a/contrib/byacc/test/yacc/err_syntax21.error b/contrib/byacc/test/yacc/err_syntax21.error
index 162d82d0c96d..9b0dc17b6629 100644
--- a/contrib/byacc/test/yacc/err_syntax21.error
+++ b/contrib/byacc/test/yacc/err_syntax21.error
@@ -1 +1 @@
-YACC: e - line 12 of "./test/err_syntax21.y", $0 is untyped
+YACC: e - line 12 of "./err_syntax21.y", $0 is untyped
diff --git a/contrib/byacc/test/yacc/err_syntax22.error b/contrib/byacc/test/yacc/err_syntax22.error
index 9c71619c4e25..8622aa73f598 100644
--- a/contrib/byacc/test/yacc/err_syntax22.error
+++ b/contrib/byacc/test/yacc/err_syntax22.error
@@ -1 +1 @@
-YACC: e - line 17 of "./test/err_syntax22.y", $2 (recur) is untyped
+YACC: e - line 17 of "./err_syntax22.y", $2 (recur) is untyped
diff --git a/contrib/byacc/test/yacc/err_syntax23.error b/contrib/byacc/test/yacc/err_syntax23.error
index bcde6e7fac40..3ccbbd1fee8f 100644
--- a/contrib/byacc/test/yacc/err_syntax23.error
+++ b/contrib/byacc/test/yacc/err_syntax23.error
@@ -1 +1 @@
-YACC: e - line 18 of "./test/err_syntax23.y", $$ is untyped
+YACC: e - line 18 of "./err_syntax23.y", $$ is untyped
diff --git a/contrib/byacc/test/yacc/err_syntax24.error b/contrib/byacc/test/yacc/err_syntax24.error
index bdd3aeda0db3..c1538898ce0b 100644
--- a/contrib/byacc/test/yacc/err_syntax24.error
+++ b/contrib/byacc/test/yacc/err_syntax24.error
@@ -1,2 +1,2 @@
-YACC: w - line 21 of "./test/err_syntax24.y", the default action assigns an undefined value to $$
-YACC: e - line 22 of "./test/err_syntax24.y", $$ is untyped
+YACC: w - line 21 of "./err_syntax24.y", the default action assigns an undefined value to $$
+YACC: e - line 22 of "./err_syntax24.y", $$ is untyped
diff --git a/contrib/byacc/test/yacc/err_syntax25.error b/contrib/byacc/test/yacc/err_syntax25.error
index ea45a70310de..234a7b9fcd3c 100644
--- a/contrib/byacc/test/yacc/err_syntax25.error
+++ b/contrib/byacc/test/yacc/err_syntax25.error
@@ -1,3 +1,3 @@
-YACC: e - line 11 of "./test/err_syntax25.y", too many %union declarations
+YACC: e - line 11 of "./err_syntax25.y", too many %union declarations
 %union {
 ^
diff --git a/contrib/byacc/test/yacc/err_syntax26.error b/contrib/byacc/test/yacc/err_syntax26.error
index cddd5741bf7a..c9a09ad19929 100644
--- a/contrib/byacc/test/yacc/err_syntax26.error
+++ b/contrib/byacc/test/yacc/err_syntax26.error
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax26.y", unexpected end-of-file
+YACC: e - line 6 of "./err_syntax26.y", unexpected end-of-file
diff --git a/contrib/byacc/test/yacc/err_syntax27.error b/contrib/byacc/test/yacc/err_syntax27.error
index 4737f99b9a37..2a277087c356 100644
--- a/contrib/byacc/test/yacc/err_syntax27.error
+++ b/contrib/byacc/test/yacc/err_syntax27.error
@@ -1 +1 @@
-YACC: e - line 3 of "./test/err_syntax27.y", missing '}'
+YACC: e - line 3 of "./err_syntax27.y", missing '}'
diff --git a/contrib/byacc/test/yacc/err_syntax3.error b/contrib/byacc/test/yacc/err_syntax3.error
index 6926214f5e7b..7e4871b87ad2 100644
--- a/contrib/byacc/test/yacc/err_syntax3.error
+++ b/contrib/byacc/test/yacc/err_syntax3.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax3.y", unterminated string
+YACC: e - line 6 of "./err_syntax3.y", unterminated string
 %token <text> '(' '*' '&
                       ^
diff --git a/contrib/byacc/test/yacc/err_syntax4.error b/contrib/byacc/test/yacc/err_syntax4.error
index 72b683ee7d4b..6a10d4040eb5 100644
--- a/contrib/byacc/test/yacc/err_syntax4.error
+++ b/contrib/byacc/test/yacc/err_syntax4.error
@@ -1,3 +1,3 @@
-YACC: e - line 1 of "./test/err_syntax4.y", unmatched %{
+YACC: e - line 1 of "./err_syntax4.y", unmatched %{
 %{
 ^
diff --git a/contrib/byacc/test/yacc/err_syntax5.error b/contrib/byacc/test/yacc/err_syntax5.error
index fd3bf0df6b9f..37a8500b053a 100644
--- a/contrib/byacc/test/yacc/err_syntax5.error
+++ b/contrib/byacc/test/yacc/err_syntax5.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax5.y", unterminated %union declaration
+YACC: e - line 6 of "./err_syntax5.y", unterminated %union declaration
 %union {
 ^
diff --git a/contrib/byacc/test/yacc/err_syntax6.error b/contrib/byacc/test/yacc/err_syntax6.error
index ae83bd2a3735..bde624a71599 100644
--- a/contrib/byacc/test/yacc/err_syntax6.error
+++ b/contrib/byacc/test/yacc/err_syntax6.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax6.y", illegal tag
+YACC: e - line 6 of "./err_syntax6.y", illegal tag
 %token <text) '(' '*' '&
        ^
diff --git a/contrib/byacc/test/yacc/err_syntax7.error b/contrib/byacc/test/yacc/err_syntax7.error
index fb6342288f52..ce5717e775e8 100644
--- a/contrib/byacc/test/yacc/err_syntax7.error
+++ b/contrib/byacc/test/yacc/err_syntax7.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7.y", illegal character
+YACC: e - line 6 of "./err_syntax7.y", illegal character
 %token <text> '\777'
                ^
diff --git a/contrib/byacc/test/yacc/err_syntax7a.error b/contrib/byacc/test/yacc/err_syntax7a.error
index f6adba64ddc1..213711e11ff0 100644
--- a/contrib/byacc/test/yacc/err_syntax7a.error
+++ b/contrib/byacc/test/yacc/err_syntax7a.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7a.y", illegal character
+YACC: e - line 6 of "./err_syntax7a.y", illegal character
 %token <text> '\xfff'
                ^
diff --git a/contrib/byacc/test/yacc/err_syntax7b.error b/contrib/byacc/test/yacc/err_syntax7b.error
index f3e512fd1a71..19b617ccca1c 100644
--- a/contrib/byacc/test/yacc/err_syntax7b.error
+++ b/contrib/byacc/test/yacc/err_syntax7b.error
@@ -1,3 +1,3 @@
-YACC: e - line 6 of "./test/err_syntax7b.y", illegal character
+YACC: e - line 6 of "./err_syntax7b.y", illegal character
 %token <text> '\x.'
                ^
diff --git a/contrib/byacc/test/yacc/err_syntax8.error b/contrib/byacc/test/yacc/err_syntax8.error
index 53a3a328d05e..c6a4cc943fa2 100644
--- a/contrib/byacc/test/yacc/err_syntax8.error
+++ b/contrib/byacc/test/yacc/err_syntax8.error
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8.y", illegal use of reserved symbol .
+YACC: e - line 6 of "./err_syntax8.y", illegal use of reserved symbol .
diff --git a/contrib/byacc/test/yacc/err_syntax8a.error b/contrib/byacc/test/yacc/err_syntax8a.error
index 3135551633f0..ed503e90451b 100644
--- a/contrib/byacc/test/yacc/err_syntax8a.error
+++ b/contrib/byacc/test/yacc/err_syntax8a.error
@@ -1 +1 @@
-YACC: e - line 6 of "./test/err_syntax8a.y", illegal use of reserved symbol $$123
+YACC: e - line 6 of "./err_syntax8a.y", illegal use of reserved symbol $$123
diff --git a/contrib/byacc/test/yacc/err_syntax9.error b/contrib/byacc/test/yacc/err_syntax9.error
index 43696bd1f4c3..1f74b7ea0a26 100644
--- a/contrib/byacc/test/yacc/err_syntax9.error
+++ b/contrib/byacc/test/yacc/err_syntax9.error
@@ -1 +1 @@
-YACC: e - line 7 of "./test/err_syntax9.y", the start symbol text cannot be declared to be a token
+YACC: e - line 7 of "./err_syntax9.y", the start symbol text cannot be declared to be a token
diff --git a/contrib/byacc/test/yacc/help.output b/contrib/byacc/test/yacc/help.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/yacc/help.output
+++ b/contrib/byacc/test/yacc/help.output
@@ -4,7 +4,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/byacc/test/yacc/no_b_opt.output b/contrib/byacc/test/yacc/no_b_opt.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/yacc/no_b_opt.output
+++ b/contrib/byacc/test/yacc/no_b_opt.output
@@ -4,7 +4,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/byacc/test/yacc/no_output2.output b/contrib/byacc/test/yacc/no_output2.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/yacc/no_output2.output
+++ b/contrib/byacc/test/yacc/no_output2.output
@@ -4,7 +4,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/byacc/test/yacc/no_p_opt.output b/contrib/byacc/test/yacc/no_p_opt.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/yacc/no_p_opt.output
+++ b/contrib/byacc/test/yacc/no_p_opt.output
@@ -4,7 +4,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/byacc/test/yacc/nostdin.output b/contrib/byacc/test/yacc/nostdin.output
index 28e455543be0..112b7c7a41c5 100644
--- a/contrib/byacc/test/yacc/nostdin.output
+++ b/contrib/byacc/test/yacc/nostdin.output
@@ -4,7 +4,6 @@ Options:
   -b file_prefix        set filename prefix (default "y.")
   -B                    create a backtracking parser
   -d                    write definitions (.tab.h)
-  -D                    enable value stack memory reclamation
   -i                    write interface (y.tab.i)
   -g                    write a graphical description
   -l                    suppress #line directives
diff --git a/contrib/file/ChangeLog b/contrib/file/ChangeLog
index 4c19cc6034ba..ed3df664c5d1 100644
--- a/contrib/file/ChangeLog
+++ b/contrib/file/ChangeLog
@@ -1,3 +1,245 @@
+2014-06-12  12:28  Christos Zoulas <christos@zoulas.com>
+
+	* release 5.19
+
+2014-06-09   9:04  Christos Zoulas <christos@zoulas.com>
+	
+	* Misc buffer overruns and missing buffer size tests in cdf parsing
+	  (Francisco Alonso, Jan Kaluza)
+
+2014-06-02  14:50  Christos Zoulas <christos@zoulas.com>
+
+	* Enforce limit of 8K on regex searches that have no limits
+	* Allow the l modifier for regex to mean line count. Default
+	  to byte count. If line count is specified, assume a max
+	  of 80 characters per line to limit the byte count.
+	* Don't allow conversions to be used for dates, allowing
+	  the mask field to be used as an offset.
+
+2014-05-30  12:51  Christos Zoulas <christos@zoulas.com>
+
+	* Make the range operator limit the length of the
+	  regex search.
+
+2014-05-14  19:23  Christos Zoulas <christos@zoulas.com>
+
+	* PR/347: Windows fixes
+	* PR/352: Hangul word processor recognition
+	* PR/354: Encoding irregularities in text files
+
+2014-05-06  6:12  Christos Zoulas <christos@zoulas.com>
+
+	* Fix uninitialized title in CDF files (Jan Kaluza)
+
+2014-05-04  14:55  Christos Zoulas <christos@zoulas.com>
+
+	* PR/351: Fix compilation of empty files 
+
+2014-04-30  17:39  Christos Zoulas <christos@zoulas.com>
+
+	* Fix integer formats: We don't specify 'l' or
+	  'h' and 'hh' specifiers anymore, only 'll' for
+	  quads and nothing for the rest. This is so that
+	  magic writing is simpler.
+
+2014-04-01  15:25  Christos Zoulas <christos@zoulas.com>
+
+	* PR/341: Jan Kaluza, fix memory leak
+	* PR/342: Jan Kaluza, fix out of bounds read
+
+2014-03-28  15:25  Christos Zoulas <christos@zoulas.com>
+
+	* Fix issue with long formats not matching fmtcheck
+
+2014-03-26  11:25  Christos Zoulas <christos@zoulas.com>
+
+	* release 5.18
+
+2014-03-15  17:45  Christos Zoulas <christos@zoulas.com>
+
+	* add fmtcheck(3) for those who don't have it
+
+2014-03-14  15:12  Christos Zoulas <christos@zoulas.com>
+
+	* prevent mime entries from being attached to magic
+	  entries with no descriptions
+
+	* adjust magic strength for regex type
+
+	* remove superfluous ascmagic with encoding test
+
+2014-03-06  12:01  Christos Zoulas <christos@zoulas.com>
+
+	* fix regression fix echo -ne "\012\013\014" | file -i -
+	  which printed "binary" instead of "application/octet-stream"
+
+	* add size_t overflow check for magic file size
+
+2014-02-27  16:01  Christos Zoulas <christos@zoulas.com>
+
+	* experimental support for matching with CFD CLSID
+
+2014-02-18  13:04  Kimmo Suominen (kimmo@suominen.com)
+
+	* Cache old LC_CTYPE locale before setting it to "C", so
+	  we can use it to restore LC_CTYPE instead of asking
+	  setlocale() to scan the environment variables.
+
+2014-02-12  18:21  Christos Zoulas <christos@zoulas.com>
+
+	* Count recursion levels through indirect magic
+
+2014-02-11  10:40  Christos Zoulas <christos@zoulas.com>
+
+	* Prevent infinite recursion on files with indirect offsets of 0
+
+2014-01-30  21:00  Christos Zoulas <christos@zoulas.com>
+
+	* Add -E flag that makes file print filesystem errors to stderr
+	  and exit.
+
+2014-01-08  17:20  Christos Zoulas <christos@zoulas.com>
+
+	* mime printing could print results from multiple magic entries
+	  if there were multiple matches.
+	* in some cases overflow was not detected when computing offsets
+	  in softmagic.
+
+2013-12-05  12:00  Christos Zoulas <christos@zoulas.com>
+
+	* use strcasestr() to for cdf strings
+	* reset to the "C" locale while doing regex operations, or case
+	  insensitive comparisons; this is provisional
+
+2013-11-19  20:10  Christos Zoulas <christos@zoulas.com>
+
+	* always leave magic file loaded, don't unload for magic_check, etc.
+	* fix default encoding to binary instead of unknown which broke recently
+	* handle empty and one byte files, less specially so that
+	  --mime-encoding does not break completely.
+		`
+2013-11-06  14:40  Christos Zoulas <christos@zoulas.com>
+
+	* fix erroneous non-zero exit code from non-existant file and message
+
+2013-10-29  14:25  Christos Zoulas <christos@zoulas.com>
+
+	* add CDF MSI file detection (Guy Helmer)
+
+2013-09-03  11:56  Christos Zoulas <christos@zoulas.com>
+
+	* Don't mix errors and regular output if there was an error
+	* in magic_descriptor() don't close the file and try to restore
+	  its position
+
+2013-05-30  17:25  Christos Zoulas <christos@zoulas.com>
+
+	* Don't treat magic as an error if offset was past EOF (Christoph Biedl)
+
+2013-05-28  17:25  Christos Zoulas <christos@zoulas.com>
+	
+	* Fix spacing issues in softmagic and elf (Jan Kaluza)
+
+2013-05-02  18:00  Christos Zoulas <christos@zoulas.com>
+
+	* Fix segmentation fault with multiple magic_load commands.
+
+2013-04-22  11:20  Christos Zoulas <christos@zoulas.com>
+
+	* The way "default" was implemented was not very useful
+	  because the "if something was printed at that level"
+	  was not easily controlled by the user, and the format
+	  was bound to a string which is too restrictive. Add
+	  a "clear" for that level keyword and make "default"
+	  void. This way one can do:
+
+		>>13	clear	x
+		>>13	lelong	1	foo
+		>>13	lelong	2	bar
+		>>13	default	x
+		>>>13	lelong	x	unknown %x
+
+2013-03-25  13:20  Christos Zoulas <christos@zoulas.com>
+
+	* disallow strength setting in "name" entries
+
+2013-03-06  21:24  Christos Zoulas <christos@zoulas.com>
+
+	* fix recursive magic separator printing
+
+2013-02-26  19:28  Christos Zoulas <christos@zoulas.com>
+
+	* limit recursion level for mget
+	* fix pread() related breakage in cdf
+	* handle offsets properly in recursive "use"
+
+2013-02-18  10:39  Christos Zoulas <christos@zoulas.com>
+
+	* add elf reading of debug info to determine if file is stripped
+	  (Jan Kaluza)
+	* use pread()
+
+2013-01-25  18:05  Christos Zoulas <christos@zoulas.com>
+
+	* change mime description size from 64 to 80 to accommodate OOXML.
+
+2013-01-11  14:50  Christos Zoulas <christos@zoulas.com>
+
+	* Warn about inconsistent continuation levels.
+	* Change fsmagic to add a space after it prints.
+
+2013-01-10  21:00  Christos Zoulas <christos@zoulas.com>
+
+	* Make getline public so that file can link against it.
+	  Perhaps it is better to rename it, or hide it differently.
+	  Fixes builds on platforms that do not provide it.
+	  
+2013-01-07  16:30  Christos Zoulas <christos@zoulas.com>
+
+	* Add SuS d{,1,2,4,8}, u{,1,2,4,8} and document
+	  what long, int, short, etc is (Guy Harris)
+
+2013-01-06  11:20  Christos Zoulas <christos@zoulas.com>
+
+	* add magic_version function and constant
+	* Redo memory allocation and de-allocation.
+	  (prevents double frees on non mmap platforms)
+	* Fix bug with name/use having to do with passing
+	  found state from the parent to the child and back.
+
+2012-12-19   8:47  Christos Zoulas <christos@zoulas.com>
+
+	* Only print elf capabilities for archs we know (Jan Kaluza)
+
+2012-10-30  19:14  Christos Zoulas <christos@zoulas.com>
+
+	* Add "name" and "use" file types in order to look
+	  inside mach-o files.
+
+2012-09-06  10:40  Christos Zoulas <christos@zoulas.com>
+
+	* make --version exit 0 (Matthew Schultz)
+	* add string/T (Jan Kaluza)
+
+2012-08-09  2:15  Christos Zoulas <christos@zoulas.com>
+
+	* add z and t modifiers for our own vasprintf
+	* search for $HOME/.magic.mgc if it is there first
+	* fix reads from a pipe, and preserve errno
+
+2012-05-15  13:12  Christos Zoulas <christos@zoulas.com>
+
+	* use ctime_r, asctime_r
+
+2012-04-06  17:18  Christos Zoulas <christos@zoulas.com>
+
+	* Fixes for indirect offsets to handle apple disk formats
+
+2012-04-03  18:26  Christos Zoulas <christos@zoulas.com>
+
+	* Add windows date field types
+	* More info for windows shortcuts (incomplete)
+
 2012-02-20  17:33  Christos Zoulas <christos@zoulas.com>
 
 	* Fix CDF parsing issues found by CERT's fuzzing tool (Will Dormann)
@@ -851,7 +1093,7 @@
 
 	* Identify gnu tar vs. posix tar
 
-	* When keep going, don't print spurious newlines (Radek Vok�l)
+	* When keep going, don't print spurious newlines (Radek Vokal)
 
 2006-04-01 12:02 Christos Zoulas <christos@astron.com>
 
@@ -875,7 +1117,7 @@
 2005-10-31 8:54 Christos Zoulas <christos@astron.com>
 
 	* Fix regression where the core info was not completely processed
-	    (Radek Vok�l)
+	    (Radek Vokal)
 
 2005-10-20 11:15 Christos Zoulas <christos@astron.com>
 
@@ -892,7 +1134,7 @@
 2005-09-20 13:33 Christos Zoulas <christos@astron.com>
 
 	* Don't print SVR4 Style in core files multiple times
-	    (Radek Vok�l)
+	    (Radek Vokal)
 
 2005-08-27 04:09 Christos Zoulas <christos@astron.com>
 
diff --git a/contrib/file/Magdir/assembler b/contrib/file/Magdir/assembler
deleted file mode 100644
index 90aa4ca65c0f..000000000000
--- a/contrib/file/Magdir/assembler
+++ /dev/null
@@ -1,14 +0,0 @@
-#------------------------------------------------------------------------------
-# $File: assembler,v 1.1 2011/12/08 12:12:46 rrt Exp $
-# make:  file(1) magic for assembler source
-#
-0	regex	\^\.asciiz\?	assembler source text
-!:mime	text/x-asm
-0	regex	\^\.byte		assembler source text
-!:mime	text/x-asm
-0	regex	\^\.even		assembler source text
-!:mime	text/x-asm
-0	regex	\^\.globl		assembler source text
-!:mime	text/x-asm
-0	regex	\^\.text		assembler source text
-!:mime	text/x-asm
diff --git a/contrib/file/Magdir/cafebabe b/contrib/file/Magdir/cafebabe
deleted file mode 100644
index 6400e2f3b0e2..000000000000
--- a/contrib/file/Magdir/cafebabe
+++ /dev/null
@@ -1,40 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: cafebabe,v 1.8 2009/09/19 16:28:08 christos Exp $
-# Cafe Babes unite!
-#
-# Since Java bytecode and Mach-O fat-files have the same magic number, the test
-# must be performed in the same "magic" sequence to get both right.  The long
-# at offset 4 in a mach-O fat file tells the number of architectures; the short at
-# offset 4 in a Java bytecode file is the JVM minor version and the
-# short at offset 6 is the JVM major version.  Since there are only 
-# only 18 labeled Mach-O architectures at current, and the first released 
-# Java class format was version 43.0, we can safely choose any number
-# between 18 and 39 to test the number of architectures against
-# (and use as a hack). Let's not use 18, because the Mach-O people
-# might add another one or two as time goes by...
-#
-0	belong		0xcafebabe
-!:mime	application/x-java-applet
->4	belong		>30		compiled Java class data,
->>6	beshort		x	        version %d.
->>4	beshort		x       	\b%d
-# Which is which?
-#>>4	belong		0x032d		(Java 1.0)
-#>>4	belong		0x032d		(Java 1.1)
->>4	belong		0x002e		(Java 1.2)
->>4	belong		0x002f		(Java 1.3)
->>4	belong		0x0030		(Java 1.4)
->>4	belong		0x0031		(Java 1.5)
->>4	belong		0x0032		(Java 1.6)
-
-
-0	belong		0xcafebabe
->4	belong		1		Mach-O fat file with 1 architecture
->4	belong		>1
->>4	belong		<20		Mach-O fat file with %ld architectures
-
-0	belong		0xcafed00d	JAR compressed with pack200,
->>5	byte		x		version %d.
->>4	byte		x		\b%d
-!:mime	application/x-java-pack200
diff --git a/contrib/file/Magdir/database b/contrib/file/Magdir/database
deleted file mode 100644
index 956a53ba4cf1..000000000000
--- a/contrib/file/Magdir/database
+++ /dev/null
@@ -1,295 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: database,v 1.28 2011/09/16 19:40:40 christos Exp $
-# database:  file(1) magic for various databases
-#
-# extracted from header/code files by Graeme Wilford (eep2gw@ee.surrey.ac.uk)
-#
-#
-# GDBM magic numbers
-#  Will be maintained as part of the GDBM distribution in the future.
-#  <downsj@teeny.org>
-0	belong	0x13579ace	GNU dbm 1.x or ndbm database, big endian
-!:mime	application/x-gdbm
-0	lelong	0x13579ace	GNU dbm 1.x or ndbm database, little endian
-!:mime	application/x-gdbm
-0	string	GDBM		GNU dbm 2.x database
-!:mime	application/x-gdbm
-#
-# Berkeley DB
-#
-# Ian Darwin's file /etc/magic files: big/little-endian version.
-#
-# Hash 1.85/1.86 databases store metadata in network byte order.
-# Btree 1.85/1.86 databases store the metadata in host byte order.
-# Hash and Btree 2.X and later databases store the metadata in host byte order.
-
-0	long	0x00061561	Berkeley DB
-!:mime	application/x-dbm
->8	belong	4321
->>4	belong	>2		1.86
->>4	belong	<3		1.85
->>4	belong	>0		(Hash, version %d, native byte-order)
->8	belong	1234
->>4	belong	>2		1.86
->>4	belong	<3		1.85
->>4	belong	>0		(Hash, version %d, little-endian)
-
-0	belong	0x00061561	Berkeley DB
->8	belong	4321
->>4	belong	>2		1.86
->>4	belong	<3		1.85
->>4	belong	>0		(Hash, version %d, big-endian)
->8	belong	1234
->>4	belong	>2		1.86
->>4	belong	<3		1.85
->>4	belong	>0		(Hash, version %d, native byte-order)
-
-0	long	0x00053162	Berkeley DB 1.85/1.86
->4	long	>0		(Btree, version %d, native byte-order)
-0	belong	0x00053162	Berkeley DB 1.85/1.86
->4	belong	>0		(Btree, version %d, big-endian)
-0	lelong	0x00053162	Berkeley DB 1.85/1.86
->4	lelong	>0		(Btree, version %d, little-endian)
-
-12	long	0x00061561	Berkeley DB
->16	long	>0		(Hash, version %d, native byte-order)
-12	belong	0x00061561	Berkeley DB
->16	belong	>0		(Hash, version %d, big-endian)
-12	lelong	0x00061561	Berkeley DB
->16	lelong	>0		(Hash, version %d, little-endian)
-
-12	long	0x00053162	Berkeley DB
->16	long	>0		(Btree, version %d, native byte-order)
-12	belong	0x00053162	Berkeley DB
->16	belong	>0		(Btree, version %d, big-endian)
-12	lelong	0x00053162	Berkeley DB
->16	lelong	>0		(Btree, version %d, little-endian)
-
-12	long	0x00042253	Berkeley DB
->16	long	>0		(Queue, version %d, native byte-order)
-12	belong	0x00042253	Berkeley DB
->16	belong	>0		(Queue, version %d, big-endian)
-12	lelong	0x00042253	Berkeley DB
->16	lelong	>0		(Queue, version %d, little-endian)
-
-# From Max Bowsher.
-12	long	0x00040988	Berkeley DB
->16	long	>0		(Log, version %d, native byte-order)
-12	belong	0x00040988	Berkeley DB 
->16	belong	>0		(Log, version %d, big-endian)
-12	lelong	0x00040988	Berkeley DB
->16	lelong	>0		(Log, version %d, little-endian)
-
-#
-#
-# Round Robin Database Tool by Tobias Oetiker <oetiker@ee.ethz.ch>
-0	string	RRD		RRDTool DB
->4	string	x		version %s
-#----------------------------------------------------------------------
-# ROOT: file(1) magic for ROOT databases
-#
-0       string  root\0  ROOT file
->4      belong  x       Version %d
->33     belong  x       (Compression: %d)
-
-# XXX: Weak magic.
-# Alex Ott <ott@jet.msk.su>
-## Paradox file formats
-#2	  leshort	0x0800	Paradox 
-#>0x39	  byte		3	v. 3.0 
-#>0x39	  byte		4	v. 3.5 
-#>0x39	  byte		9	v. 4.x 
-#>0x39	  byte		10	v. 5.x 
-#>0x39	  byte		11	v. 5.x 
-#>0x39	  byte		12	v. 7.x 
-#>>0x04	  byte		0	indexed .DB data file 
-#>>0x04	  byte		1	primary index .PX file 
-#>>0x04	  byte		2	non-indexed .DB data file 
-#>>0x04	  byte		3	non-incrementing secondary index .Xnn file 
-#>>0x04	  byte		4	secondary index .Ynn file 
-#>>0x04	  byte		5	incrementing secondary index .Xnn file 
-#>>0x04	  byte		6	non-incrementing secondary index .XGn file 
-#>>0x04	  byte		7	secondary index .YGn file 
-#>>>0x04	  byte		8	incrementing secondary index .XGn file 
-
-## XBase database files
-#0      byte       0x02	
-#>8     leshort	  >0
-#>>12   leshort    0	FoxBase 
-#!:mime	application/x-dbf
-#>>>0x04	lelong		0		(no records)
-#>>>0x04	lelong		>0		(%ld records)
-#
-#0      byte       0x03	
-#!:mime	application/x-dbf
-#>8     leshort	  >0
-#>>12   leshort    0	FoxBase+, FoxPro, dBaseIII+, dBaseIV, no memo 
-#>>>0x04	lelong		0		(no records)
-#>>>0x04	lelong		>0		(%ld records)
-#
-#0      byte       0x04	
-#!:mime	application/x-dbf
-#>8     leshort	  >0
-#>>12   leshort    0	dBASE IV no memo file 
-#>>>0x04	lelong		0		(no records)
-#>>>0x04	lelong		>0		(%ld records)
-#
-#0      byte       0x05	
-#!:mime	application/x-dbf
-#>8     leshort	  >0
-#>>12   leshort    0	dBASE V no memo file 
-#>>>0x04	lelong		0		(no records)
-#>>>0x04	lelong		>0		(%ld records)
-#
-#0      byte       0x30
-#!:mime	application/x-dbf
-#>8     leshort	  >0
-#>>12   leshort    0	Visual FoxPro 
-#>>>0x04	lelong		0		(no records)
-#>>>0x04	lelong		>0		(%ld records)
-#
-#0      byte       0x43
-#!:mime	application/x-dbf
-#>8     leshort	  >0
-#>>12   leshort    0	FlagShip with memo var size 
-#>>>0x04	lelong		0		(no records)
-#>>>0x04	lelong		>0		(%ld records)
-#
-#0      byte       0x7b
-#!:mime	application/x-dbf
-#>8     leshort	  >0
-#>>12   leshort    0	dBASEIV with memo 
-#>>>0x04	lelong		0		(no records)
-#>>>0x04	lelong		>0		(%ld records)
-#
-#0      byte       0x83	
-#!:mime	application/x-dbf
-#>8     leshort	  >0
-#>>12   leshort    0	FoxBase+, dBaseIII+ with memo 
-#>>>0x04	lelong		0		(no records)
-#>>>0x04	lelong		>0		(%ld records)
-#
-#0      byte       0x8b
-#!:mime	application/x-dbf
-#>8     leshort	  >0
-#>>12   leshort    0	dBaseIV with memo 
-#>>>0x04	lelong		0		(no records)
-#>>>0x04	lelong		>0		(%ld records)
-#
-#0      byte       0x8e	
-#!:mime	application/x-dbf
-#>8     leshort	  >0
-#>>12   leshort    0	dBaseIV with SQL Table 
-#>>>0x04	lelong		0		(no records)
-#>>>0x04	lelong		>0		(%ld records)
-#
-#0      byte       0xb3
-#!:mime	application/x-dbf
-#>8     leshort	  >0
-#>>12   leshort    0	FlagShip with .dbt memo 
-#>>>0x04	lelong		0		(no records)
-#>>>0x04	lelong		>0		(%ld records)
-#
-#0      byte       0xf5
-#!:mime	application/x-dbf
-#>8     leshort	  >0
-#>>12   leshort    0	FoxPro with memo 
-#>>>0x04	lelong		0		(no records)
-#>>>0x04	lelong		>0		(%ld records)
-#
-#0	leshort		0x0006		DBase 3 index file
-
-# MS Access database
-4	string	Standard\ Jet\ DB	Microsoft Access Database
-!:mime	application/x-msaccess
-
-# TDB database from Samba et al - Martin Pool <mbp@samba.org>
-0	string	TDB\ file		TDB database
->32	lelong	0x2601196D		version 6, little-endian
->>36	lelong	x			hash size %d bytes
-
-# SE Linux policy database
-0       lelong  0xf97cff8c      SE Linux policy
->16     lelong  x               v%d
->20     lelong  1      MLS
->24     lelong  x       %d symbols
->28     lelong  x       %d ocons
-
-# ICE authority file data (Wolfram Kleff)
-2	string		ICE		ICE authority data
-
-# X11 Xauthority file (Wolfram Kleff)
-10	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
-11	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
-12	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
-13	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
-14	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
-15	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
-16	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
-17	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
-18	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
-
-# From: Maxime Henrion <mux@FreeBSD.org>
-# PostgreSQL's custom dump format, Maxime Henrion <mux@FreeBSD.org>
-0	string		PGDMP		PostgreSQL custom database dump
->5	byte		x		- v%d
->6	byte		x		\b.%d
->5	beshort		<0x101		\b-0
->5	beshort		>0x100
->>7	byte		x		\b-%d
-
-# Type: Advanced Data Format (ADF) database
-# URL:  http://www.grc.nasa.gov/WWW/cgns/adf/
-# From: Nicolas Chauvat <nicolas.chauvat@logilab.fr>
-0	string	@(#)ADF\ Database	CGNS Advanced Data Format
-
-# Tokyo Cabinet magic data
-# http://tokyocabinet.sourceforge.net/index.html
-0	string		ToKyO\ CaBiNeT\n	Tokyo Cabinet
->14	string		x			\b (%s)
->32	byte		0			\b, Hash
-!:mime	application/x-tokyocabinet-hash
->32	byte		1			\b, B+ tree
-!:mime	application/x-tokyocabinet-btree
->32	byte		2			\b, Fixed-length
-!:mime	application/x-tokyocabinet-fixed
->32	byte		3			\b, Table
-!:mime	application/x-tokyocabinet-table
->33	byte		&1			\b, [open]
->33	byte		&2			\b, [fatal]
->34	byte		x			\b, apow=%d
->35	byte		x			\b, fpow=%d
->36	byte		&0x01			\b, [large]
->36	byte		&0x02			\b, [deflate]
->36	byte		&0x04			\b, [bzip]
->36	byte		&0x08			\b, [tcbs]
->36	byte		&0x10			\b, [excodec]
->40	lequad		x			\b, bnum=%lld
->48	lequad		x			\b, rnum=%lld
->56	lequad		x			\b, fsiz=%lld
-
-# G-IR database made by gobject-introspect toolset,
-# http://live.gnome.org/GObjectIntrospection
-0	string		GOBJ\nMETADATA\r\n\032	G-IR binary database
->16	byte		x			\b, v%d
->17	byte		x			\b.%d
->20	leshort		x			\b, %d entries
->22	leshort		x			\b/%d local
-
-# Type:	QDBM Quick Database Manager
-# From:	Benoit Sibaud <bsibaud@april.org>
-0	string		\\[depot\\]\n\f		Quick Database Manager, little endian
-0	string		\\[DEPOT\\]\n\f		Quick Database Manager, big endian
-
-# Type:	TokyoCabinet database
-# URL:	http://tokyocabinet.sourceforge.net/
-# From:	Benoit Sibaud <bsibaud@april.org>
-0	string		ToKyO\ CaBiNeT\n	TokyoCabinet database
->14	string		x			(version %s)
-
-# From:  Stéphane Blondon http://www.yaal.fr
-# Database file for Zope (done by FileStorage)
-0	string		FS21	Zope Object Database File Storage (data)
-# Cache file for the database of Zope (done by ClientStorage)
-0	string		ZEC3	Zope Object Database Client Cache File (data)
diff --git a/contrib/file/Magdir/dolby b/contrib/file/Magdir/dolby
deleted file mode 100644
index fee287ccf13b..000000000000
--- a/contrib/file/Magdir/dolby
+++ /dev/null
@@ -1,60 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: dolby,v 1.5 2009/09/19 16:28:08 christos Exp $
-# ATSC A/53 aka AC-3 aka Dolby Digital <ashitaka@gmx.at>
-# from http://www.atsc.org/standards/a_52a.pdf
-# corrections, additions, etc. are always welcome!
-#
-# syncword
-0       beshort         0x0b77  ATSC A/52 aka AC-3 aka Dolby Digital stream,
-# fscod
->4      byte&0xc0       0x00    48 kHz,
->4      byte&0xc0       0x40    44.1 kHz,
->4      byte&0xc0       0x80    32 kHz,
-# is this one used for 96 kHz?
->4      byte&0xc0       0xc0    reserved frequency,
-#
->5	byte&7 = 0		\b, complete main (CM)
->5	byte&7 = 1		\b, music and effects (ME)
->5	byte&7 = 2		\b, visually impaired (VI)
->5	byte&7 = 3		\b, hearing impaired (HI)
->5	byte&7 = 4		\b, dialogue (D)
->5	byte&7 = 5		\b, commentary (C)
->5	byte&7 = 6		\b, emergency (E)
-# acmod
->6      byte&0xe0       0x00    1+1 front,
->6      byte&0xe0       0x20    1 front/0 rear,
->6      byte&0xe0       0x40    2 front/0 rear,
->6      byte&0xe0       0x60    3 front/0 rear,
->6      byte&0xe0       0x80    2 front/1 rear,
->6      byte&0xe0       0xa0    3 front/1 rear,
->6      byte&0xe0       0xc0    2 front/2 rear,
->6      byte&0xe0       0xe0    3 front/2 rear,
-# lfeon (these may be incorrect)
->7      byte&0x40       0x00    LFE off,
->7      byte&0x40       0x40    LFE on,
-#
->4	byte&0x3e = 0x00	\b, 32 kbit/s
->4	byte&0x3e = 0x02        \b, 40 kbit/s
->4	byte&0x3e = 0x04        \b, 48 kbit/s
->4	byte&0x3e = 0x06        \b, 56 kbit/s
->4	byte&0x3e = 0x08        \b, 64 kbit/s
->4	byte&0x3e = 0x0a        \b, 80 kbit/s
->4	byte&0x3e = 0x0c        \b, 96 kbit/s
->4	byte&0x3e = 0x0e        \b, 112 kbit/s
->4	byte&0x3e = 0x10        \b, 128 kbit/s
->4	byte&0x3e = 0x12        \b, 160 kbit/s
->4	byte&0x3e = 0x14        \b, 192 kbit/s
->4	byte&0x3e = 0x16        \b, 224 kbit/s
->4	byte&0x3e = 0x18        \b, 256 kbit/s
->4	byte&0x3e = 0x1a        \b, 320 kbit/s
->4	byte&0x3e = 0x1c        \b, 384 kbit/s
->4	byte&0x3e = 0x1e        \b, 448 kbit/s
->4	byte&0x3e = 0x20        \b, 512 kbit/s
->4	byte&0x3e = 0x22        \b, 576 kbit/s
->4	byte&0x3e = 0x24        \b, 640 kbit/s
-# dsurmod (these may be incorrect)
->6      beshort&0x0180  0x0000  Dolby Surround not indicated
->6      beshort&0x0180  0x0080  not Dolby Surround encoded
->6      beshort&0x0180  0x0100  Dolby Surround encoded
->6      beshort&0x0180  0x0180  reserved Dolby Surround mode
diff --git a/contrib/file/Magdir/dyadic b/contrib/file/Magdir/dyadic
deleted file mode 100644
index c1a2c3c53e39..000000000000
--- a/contrib/file/Magdir/dyadic
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: dyadic,v 1.5 2010/09/20 18:55:20 rrt Exp $
-# Dyadic: file(1) magic for Dyalog APL.
-#
-0	byte	0xaa
->1	byte	<4		Dyalog APL
->>1	byte	0x00		incomplete workspace
->>1	byte	0x01		component file
->>1	byte	0x02		external variable
->>1	byte	0x03		workspace
->>2	byte	x		version %d
->>3	byte	x		.%d
-
-0	beshort		0xaa03		Dyalog APL
->2	byte		x		workspace type %d
->3	byte		x		subtype %d
->7	byte&0x28	0x00		32-bit
->7	byte&0x28	0x20		64-bit
->7	byte&0x0c	0x00		classic
->7	byte&0x0c	0x04		unicode
->7	byte&0x88	0x00		big-endian
->7	byte&0x88	0x80		little-endian
-
-0	byte		0xaa		Dyalog APL
->1	byte		0x00		aplcore
->1	byte		0x01		component file 32-bit non-journaled non-checksummed
->1	byte		0x02		external variable exclusive
->1	byte		0x06		external variable shared
->1	byte		0x07		session
->1	byte		0x08		mapped file 32-bit
->1	byte		0x09		component file 64-bit non-journaled non-checksummed
->1	byte		0x0a		mapped file 64-bit
->1	byte		0x0b		component file 32-bit level 1 journaled non-checksummed
->1	byte		0x0c		component file 64-bit level 1 journaled non-checksummed
->1	byte		0x0d		component file 32-bit level 1 journaled checksummed
->1	byte		0x0e		component file 64-bit level 1 journaled checksummed
->1	byte		0x0f		component file 32-bit level 2 journaled checksummed
->1	byte		0x10		component file 64-bit level 2 journaled checksummed
->1	byte		0x11		component file 32-bit level 3 journaled checksummed
->1	byte		0x12		component file 64-bit level 3 journaled checksummed
->1	byte		0x13		component file 32-bit non-journaled checksummed
->1	byte		0x14		component file 64-bit non-journaled checksummed
->1	byte		0x80		DDB
-
-0	short		0x6060		Dyalog APL transfer
diff --git a/contrib/file/Magdir/elf b/contrib/file/Magdir/elf
deleted file mode 100644
index 8e3b7bc74191..000000000000
--- a/contrib/file/Magdir/elf
+++ /dev/null
@@ -1,295 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: elf,v 1.54 2011/12/17 17:16:29 christos Exp $
-# elf:  file(1) magic for ELF executables
-#
-# We have to check the byte order flag to see what byte order all the
-# other stuff in the header is in.
-#
-# What're the correct byte orders for the nCUBE and the Fujitsu VPP500?
-#
-# Created by: unknown
-# Modified by (1): Daniel Quinlan <quinlan@yggdrasil.com>
-# Modified by (2): Peter Tobias <tobias@server.et-inf.fho-emden.de> (core support)
-# Modified by (3): Christian 'Dr. Disk' Hechelmann <drdisk@ds9.au.s.shuttle.de> (fix of core support)
-# Modified by (4): <gerardo.cacciari@gmail.com> (VMS Itanium)
-# Modified by (5): Matthias Urlichs <smurf@debian.org> (Listing of many architectures)
-0	string		\177ELF		ELF
->4	byte		0		invalid class
->4	byte		1		32-bit
->4	byte		2		64-bit
->5	byte		0		invalid byte order
->5	byte		1		LSB
->>16	leshort		0		no file type,
-!:strength *2
-!:mime	application/octet-stream
->>16	leshort		1		relocatable,
-!:mime	application/x-object
->>16	leshort		2		executable,
-!:mime	application/x-executable
->>16	leshort		3		shared object,
-!:mime	application/x-sharedlib
->>16	leshort		4		core file
-!:mime	application/x-coredump
-# Core file detection is not reliable.
-#>>>(0x38+0xcc) string	>\0		of '%s'
-#>>>(0x38+0x10) lelong	>0		(signal %d),
->>16	leshort		&0xff00		processor-specific,
->>18	leshort		0		no machine,
->>18	leshort		1		AT&T WE32100 - invalid byte order,
->>18	leshort		2		SPARC - invalid byte order,
->>18	leshort		3		Intel 80386,
->>18	leshort		4		Motorola
->>>36	lelong		&0x01000000	68000 - invalid byte order,
->>>36	lelong		&0x00810000	CPU32 - invalid byte order,
->>>36	lelong		0		68020 - invalid byte order,
->>18	leshort		5		Motorola 88000 - invalid byte order,
->>18	leshort		6		Intel 80486,
->>18	leshort		7		Intel 80860,
-# The official e_machine number for MIPS is now #8, regardless of endianness.
-# The second number (#10) will be deprecated later. For now, we still
-# say something if #10 is encountered, but only gory details for #8.
->>18	leshort		8		MIPS,
->>>36	lelong		&0x20		N32
->>18	leshort		10		MIPS,
->>>36	lelong		&0x20		N32
->>18	leshort		8
-# only for 32-bit
->>>4	byte		1
->>>>36  lelong&0xf0000000	0x00000000	MIPS-I
->>>>36  lelong&0xf0000000	0x10000000	MIPS-II
->>>>36  lelong&0xf0000000	0x20000000	MIPS-III
->>>>36  lelong&0xf0000000	0x30000000	MIPS-IV
->>>>36  lelong&0xf0000000	0x40000000	MIPS-V
->>>>36  lelong&0xf0000000	0x50000000	MIPS32
->>>>36  lelong&0xf0000000	0x60000000	MIPS64
->>>>36  lelong&0xf0000000	0x70000000	MIPS32 rel2
->>>>36  lelong&0xf0000000	0x80000000	MIPS64 rel2
-# only for 64-bit
->>>4	byte		2
->>>>48  lelong&0xf0000000	0x00000000	MIPS-I
->>>>48  lelong&0xf0000000	0x10000000	MIPS-II
->>>>48  lelong&0xf0000000	0x20000000	MIPS-III
->>>>48  lelong&0xf0000000	0x30000000	MIPS-IV
->>>>48  lelong&0xf0000000	0x40000000	MIPS-V
->>>>48  lelong&0xf0000000	0x50000000	MIPS32
->>>>48  lelong&0xf0000000	0x60000000	MIPS64
->>>>48  lelong&0xf0000000	0x70000000	MIPS32 rel2
->>>>48  lelong&0xf0000000	0x80000000	MIPS64 rel2
->>18	leshort		9		Amdahl - invalid byte order,
->>18	leshort		10		MIPS (deprecated),
->>18	leshort		11		RS6000 - invalid byte order,
->>18	leshort		15		PA-RISC - invalid byte order,
->>>50	leshort		0x0214		2.0
->>>48	leshort		&0x0008		(LP64),
->>18	leshort		16		nCUBE,
->>18	leshort		17		Fujitsu VPP500,
->>18	leshort		18		SPARC32PLUS - invalid byte order,
->>18	leshort		20		PowerPC,
->>18	leshort		22		IBM S/390,
->>18	leshort		36		NEC V800,
->>18	leshort		37		Fujitsu FR20,
->>18	leshort		38		TRW RH-32,
->>18	leshort		39		Motorola RCE,
->>18	leshort		40		ARM,
->>18	leshort		41		Alpha,
->>18	leshort		0xa390		IBM S/390 (obsolete),
->>18	leshort		42		Renesas SH,
->>18	leshort		43		SPARC V9 - invalid byte order,
->>18	leshort		44		Siemens Tricore Embedded Processor,
->>18	leshort		45		Argonaut RISC Core, Argonaut Technologies Inc.,
->>18	leshort		46		Renesas H8/300,
->>18	leshort		47		Renesas H8/300H,
->>18	leshort		48		Renesas H8S,
->>18	leshort		49		Renesas H8/500,
->>18	leshort		50		IA-64,
->>18	leshort		51		Stanford MIPS-X,
->>18	leshort		52		Motorola Coldfire,
->>18	leshort		53		Motorola M68HC12,
->>18	leshort		54		Fujitsu MMA,
->>18	leshort		55		Siemens PCP,
->>18	leshort		56		Sony nCPU,
->>18	leshort		57		Denso NDR1,
->>18	leshort		58		Start*Core,
->>18	leshort		59		Toyota ME16,
->>18	leshort		60		ST100,
->>18	leshort		61		Tinyj emb.,
->>18	leshort		62		x86-64,
->>18	leshort		63		Sony DSP,
->>18	leshort		66		FX66,
->>18	leshort		67		ST9+ 8/16 bit,
->>18	leshort		68		ST7 8 bit,
->>18	leshort		69		MC68HC16,
->>18	leshort		70		MC68HC11,
->>18	leshort		71		MC68HC08,
->>18	leshort		72		MC68HC05,
->>18	leshort		73		SGI SVx,
->>18	leshort		74		ST19 8 bit,
->>18	leshort		75		Digital VAX,
->>18	leshort		76		Axis cris,
->>18	leshort		77		Infineon 32-bit embedded,
->>18	leshort		78		Element 14 64-bit DSP,
->>18	leshort		79		LSI Logic 16-bit DSP,
->>18	leshort		80		MMIX,
->>18	leshort		81		Harvard machine-independent,
->>18	leshort		82		SiTera Prism,
->>18	leshort		83		Atmel AVR 8-bit,
->>18	leshort		84		Fujitsu FR30,
->>18	leshort		85		Mitsubishi D10V,
->>18	leshort		86		Mitsubishi D30V,
->>18	leshort		87		NEC v850,
->>18	leshort		88		Renesas M32R,
->>18	leshort		89		Matsushita MN10300,
->>18	leshort		90		Matsushita MN10200,
->>18	leshort		91		picoJava,
->>18	leshort		92		OpenRISC,
->>18	leshort		93		ARC Cores Tangent-A5,
->>18	leshort		94		Tensilica Xtensa,
->>18	leshort		97		NatSemi 32k,
->>18	leshort		106		Analog Devices Blackfin,
->>18	leshort		113		Altera Nios II,
->>18	leshort		0xae		META,
->>18	leshort		187		Tilera TILE64,
->>18	leshort		188		Tilera TILEPro,
->>18	leshort		191		Tilera TILE-Gx,
->>18	leshort		0x3426		OpenRISC (obsolete),
->>18	leshort		0x8472		OpenRISC (obsolete),
->>18	leshort		0x9026		Alpha (unofficial),
->>20	lelong		0		invalid version
->>20	lelong		1		version 1
->>36	lelong		1		MathCoPro/FPU/MAU Required
->5	byte		2		MSB
->>16	beshort		0		no file type,
-!:mime	application/octet-stream
->>16	beshort		1		relocatable,
-!:mime	application/x-object
->>16	beshort		2		executable,
-!:mime	application/x-executable
->>16	beshort		3		shared object,
-!:mime	application/x-sharedlib
->>16	beshort		4		core file,
-!:mime	application/x-coredump
-#>>>(0x38+0xcc) string	>\0		of '%s'
-#>>>(0x38+0x10) belong	>0		(signal %d),
->>16	beshort		&0xff00		processor-specific,
->>18	beshort		0		no machine,
->>18	beshort		1		AT&T WE32100,
->>18	beshort		2		SPARC,
->>18	beshort		3		Intel 80386 - invalid byte order,
->>18	beshort		4		Motorola
->>>36	belong		&0x01000000	68000,
->>>36	belong		&0x00810000	CPU32,
->>>36	belong		0		68020,
->>18	beshort		5		Motorola 88000,
->>18	beshort		6		Intel 80486 - invalid byte order,
->>18	beshort		7		Intel 80860,
-# only for MIPS - see comment in little-endian section above.
->>18	beshort		8		MIPS,
->>>36	belong		&0x20		N32
->>18	beshort		10		MIPS,
->>>36	belong		&0x20		N32
->>18	beshort		8
-# only for 32-bit
->>>4	byte		1
->>>>36  belong&0xf0000000	0x00000000	MIPS-I
->>>>36  belong&0xf0000000	0x10000000	MIPS-II
->>>>36  belong&0xf0000000	0x20000000	MIPS-III
->>>>36  belong&0xf0000000	0x30000000	MIPS-IV
->>>>36  belong&0xf0000000	0x40000000	MIPS-V
->>>>36  belong&0xf0000000	0x50000000	MIPS32
->>>>36  belong&0xf0000000	0x60000000	MIPS64
->>>>36  belong&0xf0000000	0x70000000	MIPS32 rel2
->>>>36  belong&0xf0000000	0x80000000	MIPS64 rel2
-# only for 64-bit
->>>4	byte		2
->>>>48	belong&0xf0000000	0x00000000	MIPS-I
->>>>48	belong&0xf0000000	0x10000000	MIPS-II
->>>>48	belong&0xf0000000	0x20000000	MIPS-III
->>>>48	belong&0xf0000000	0x30000000	MIPS-IV
->>>>48	belong&0xf0000000	0x40000000	MIPS-V
->>>>48	belong&0xf0000000	0x50000000	MIPS32
->>>>48	belong&0xf0000000	0x60000000	MIPS64
->>>>48	belong&0xf0000000	0x70000000	MIPS32 rel2
->>>>48	belong&0xf0000000	0x80000000	MIPS64 rel2
->>18	beshort		9		Amdahl,
->>18	beshort		10		MIPS (deprecated),
->>18	beshort		11		RS6000,
->>18	beshort		15		PA-RISC
->>>50	beshort		0x0214		2.0
->>>48	beshort		&0x0008		(LP64)
->>18	beshort		16		nCUBE,
->>18	beshort		17		Fujitsu VPP500,
->>18	beshort		18		SPARC32PLUS,
->>>36	belong&0xffff00	0x000100	V8+ Required,
->>>36	belong&0xffff00	0x000200	Sun UltraSPARC1 Extensions Required,
->>>36	belong&0xffff00	0x000400	HaL R1 Extensions Required,
->>>36	belong&0xffff00	0x000800	Sun UltraSPARC3 Extensions Required,
->>18	beshort		20		PowerPC or cisco 4500,
->>18	beshort		21		64-bit PowerPC or cisco 7500,
->>18	beshort		22		IBM S/390,
->>18	beshort		23		Cell SPU,
->>18	beshort		24		cisco SVIP,
->>18	beshort		25		cisco 7200,
->>18	beshort		36		NEC V800 or cisco 12000,
->>18	beshort		37		Fujitsu FR20,
->>18	beshort		38		TRW RH-32,
->>18	beshort		39		Motorola RCE,
->>18	beshort		40		ARM,
->>18	beshort		41		Alpha,
->>18	beshort		42		Renesas SH,
->>18	beshort		43		SPARC V9,
->>>48	belong&0xffff00	0x000200	Sun UltraSPARC1 Extensions Required,
->>>48	belong&0xffff00	0x000400	HaL R1 Extensions Required,
->>>48	belong&0xffff00	0x000800	Sun UltraSPARC3 Extensions Required,
->>>48	belong&0x3	0		total store ordering,
->>>48	belong&0x3	1		partial store ordering,
->>>48	belong&0x3	2		relaxed memory ordering,
->>18	beshort		44		Siemens Tricore Embedded Processor,
->>18	beshort		45		Argonaut RISC Core, Argonaut Technologies Inc.,
->>18	beshort		46		Renesas H8/300,
->>18	beshort		47		Renesas H8/300H,
->>18	beshort		48		Renesas H8S,
->>18	beshort		49		Renesas H8/500,
->>18	beshort		50		IA-64,
->>18	beshort		51		Stanford MIPS-X,
->>18	beshort		52		Motorola Coldfire,
->>18	beshort		53		Motorola M68HC12,
->>18	beshort		73		Cray NV1,
->>18	beshort		75		Digital VAX,
->>18	beshort		88		Renesas M32R,
->>18	leshort		92		OpenRISC,
->>18	leshort		0x3426		OpenRISC (obsolete),
->>18	leshort		0x8472		OpenRISC (obsolete),
->>18	beshort		94		Tensilica Xtensa,
->>18	beshort		97		NatSemi 32k,
->>18	beshort		187		Tilera TILE64,
->>18	beshort		188		Tilera TILEPro,
->>18	beshort		191		Tilera TILE-Gx,
->>18	beshort		0x18ad		AVR32 (unofficial),
->>18	beshort		0x9026		Alpha (unofficial),
->>18	beshort		0xa390		IBM S/390 (obsolete),
->>20	belong		0		invalid version
->>20	belong		1		version 1
->>36	belong		1		MathCoPro/FPU/MAU Required
-# Up to now only 0, 1 and 2 are defined; I've seen a file with 0x83, it seemed
-# like proper ELF, but extracting the string had bad results.
->4      byte            <0x80
->>8	string		>\0		(%s)
->8	string		\0
->>7	byte		0		(SYSV)
->>7	byte		1		(HP-UX)
->>7	byte		2		(NetBSD)
->>7	byte		3		(GNU/Linux)
->>7	byte		4		(GNU/Hurd)
->>7	byte		5		(86Open)
->>7	byte		6		(Solaris)
->>7	byte		7		(Monterey)
->>7	byte		8		(IRIX)
->>7	byte		9		(FreeBSD)
->>7	byte		10		(Tru64)
->>7	byte		11		(Novell Modesto)
->>7	byte		12		(OpenBSD)
->8      string          \2
->>7     byte            13              (OpenVMS)
->>7	byte		97		(ARM)
->>7	byte		255		(embedded)
diff --git a/contrib/file/Magdir/flash b/contrib/file/Magdir/flash
deleted file mode 100644
index dea35aed0bde..000000000000
--- a/contrib/file/Magdir/flash
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: flash,v 1.9 2009/11/08 01:30:01 christos Exp $
-# flash:	file(1) magic for Macromedia Flash file format
-#
-# See
-#
-#	http://www.macromedia.com/software/flash/open/
-#
-0	string		FWS		Macromedia Flash data,
->3	byte		x		version %d
-!:mime	application/x-shockwave-flash
-0	string		CWS		Macromedia Flash data (compressed),
-!:mime	application/x-shockwave-flash
->3	byte		x		version %d
-# From: Cal Peake <cp@absolutedigital.net>
-0	string		FLV		Macromedia Flash Video
-!:mime	video/x-flv
-
-#
-# Yosu Gomez
-0       string AGD2\xbe\xb8\xbb\xcd\x00 Macromedia Freehand 7 Document
-0       string AGD3\xbe\xb8\xbb\xcc\x00 Macromedia Freehand 8 Document
-# From Dave Wilson
-0	string AGD4\xbe\xb8\xbb\xcb\x00	Macromedia Freehand 9 Document
diff --git a/contrib/file/Magdir/gnome-keyring b/contrib/file/Magdir/gnome-keyring
deleted file mode 100644
index 463688fe7dcb..000000000000
--- a/contrib/file/Magdir/gnome-keyring
+++ /dev/null
@@ -1,26 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: gnome-keyring,v 1.2 2009/09/19 16:28:09 christos Exp $
-# GNOME keyring
-# Contributed by Josh Triplett
-# FIXME: Could be simplified if pstring supported two-byte counts
-0         string   GnomeKeyring\n\r\0\n GNOME keyring
->&0       ubyte    0                    \b, major version 0
->>&0      ubyte    0                    \b, minor version 0
->>>&0     ubyte    0                    \b, crypto type 0 (AEL)
->>>&0     ubyte    >0                   \b, crypto type %hhu (unknown)
->>>&1     ubyte    0                    \b, hash type 0 (MD5)
->>>&1     ubyte    >0                   \b, hash type %hhu (unknown)
->>>&2     ubelong  0xFFFFFFFF           \b, name NULL
->>>&2     ubelong  !0xFFFFFFFF
->>>>&-4   ubelong  >255                 \b, name too long for file's pstring type
->>>>&-4   ubelong  <256
->>>>>&-1  pstring  x                    \b, name "%s"
->>>>>>&0  ubeqdate x                    \b, last modified %s
->>>>>>&8  ubeqdate x                    \b, created %s
->>>>>>&16 ubelong  &1
->>>>>>>&0 ubelong  x                    \b, locked if idle for %u seconds
->>>>>>&16 ubelong  ^1                   \b, not locked if idle
->>>>>>&24 ubelong  x                    \b, hash iterations %u
->>>>>>&28 ubequad  x                    \b, salt %llu
->>>>>>&52 ubelong  x                    \b, %u item(s)
diff --git a/contrib/file/Magdir/mach b/contrib/file/Magdir/mach
deleted file mode 100644
index 8d03f1ae4a28..000000000000
--- a/contrib/file/Magdir/mach
+++ /dev/null
@@ -1,86 +0,0 @@
-
-#------------------------------------------------------------
-# $File: mach,v 1.9 2009/09/19 16:28:10 christos Exp $
-# Mach has two magic numbers, 0xcafebabe and 0xfeedface.
-# Unfortunately the first, cafebabe, is shared with
-# Java ByteCode, so they are both handled in the file "cafebabe".
-# The "feedface" ones are handled herein.
-#------------------------------------------------------------
-0	lelong&0xfffffffe	0xfeedface	Mach-O
->0	byte		0xcf		64-bit
->12	lelong		1		object
->12	lelong		2		executable
->12	lelong		3		fixed virtual memory shared library
->12	lelong		4		core
->12	lelong		5		preload executable
->12	lelong		6		dynamically linked shared library
->12	lelong		7		dynamic linker
->12	lelong		8		bundle
->12	lelong		9		dynamically linked shared library stub
->12	lelong		>9
->>12	lelong		x		filetype=%ld
->4	lelong		<0
->>4	lelong		x		architecture=%ld
->4	lelong		1		vax
->4	lelong		2		romp
->4	lelong		3		architecture=3
->4	lelong		4		ns32032
->4	lelong		5		ns32332
->4	lelong		6		m68k
->4	lelong		7		i386
->4	lelong		8		mips
->4	lelong		9		ns32532
->4	lelong		10		architecture=10
->4	lelong		11		hppa
->4	lelong		12		acorn
->4	lelong		13		m88k
->4	lelong		14		sparc
->4	lelong		15		i860-big
->4	lelong		16		i860
->4	lelong		17		rs6000
->4	lelong		18		ppc
->4	lelong		16777234	ppc64
->4	lelong		>16777234
->>4	lelong		x		architecture=%ld
-#
-0	belong&0xfffffffe	0xfeedface	Mach-O
->3	byte		0xcf		64-bit
->12	belong		1		object
->12	belong		2		executable
->12	belong		3		fixed virtual memory shared library
->12	belong		4		core
->12	belong		5		preload executable
->12	belong		6               dynamically linked shared library
->12	belong		7               dynamic linker
->12	belong		8		bundle
->12	belong		9		dynamically linked shared library stub
->12	belong		>9
->>12	belong		x		filetype=%ld
->4	belong		<0
->>4	belong		x		architecture=%ld
->4	belong		1		vax
->4	belong		2		romp
->4	belong		3		architecture=3
->4	belong		4		ns32032
->4	belong		5		ns32332
->4	belong		6		for m68k architecture
-# from NeXTstep 3.0 <mach/machine.h>
-# i.e. mc680x0_all, ignore
-# >>8	belong		1		(mc68030)
->>8	belong		2		(mc68040)
->>8	belong		3		(mc68030 only)
->4	belong		7		i386
->4	belong		8		mips
->4	belong		9		ns32532
->4	belong		10		architecture=10
->4	belong		11		hppa
->4	belong		12		acorn
->4	belong		13		m88k
->4	belong		14		sparc
->4	belong		15		i860-big
->4	belong		16		i860
->4	belong		17		rs6000
->4	belong		18		ppc
->4	belong		16777234	ppc64
->4	belong		>16777234
->>4	belong		x		architecture=%ld
diff --git a/contrib/file/Magdir/mips b/contrib/file/Magdir/mips
deleted file mode 100644
index b49fecd24e90..000000000000
--- a/contrib/file/Magdir/mips
+++ /dev/null
@@ -1,182 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: mips,v 1.7 2011/05/03 01:44:17 christos Exp $
-# mips:  file(1) magic for Silicon Graphics (MIPS, IRIS, IRIX, etc.)
-#                         Dec Ultrix (MIPS)
-# all of SGI's *current* machines and OSes run in big-endian mode on the
-# MIPS machines, as far as I know.
-#
-# XXX - what is the blank "-" line?
-#
-# kbd file definitions
-0	string	kbd!map		kbd map file
->8	byte	>0		Ver %d:
->10	short	>0		with %d table(s)
-0	belong	0407		old SGI 68020 executable
-0	belong	0410		old SGI 68020 pure executable
-0	beshort	0x8765		disk quotas file
-0	beshort	0x0506		IRIS Showcase file
->2	byte	0x49		-
->3	byte	x		- version %ld
-0	beshort	0x0226		IRIS Showcase template
->2	byte	0x63		-
->3	byte	x		- version %ld
-0	belong	0x5343464d	IRIS Showcase file
->4	byte	x		- version %ld
-0	belong	0x5443464d	IRIS Showcase template
->4	byte	x		- version %ld
-0	belong	0xdeadbabe	IRIX Parallel Arena
->8	belong	>0		- version %ld
-#
-0	beshort	0x0160		MIPSEB ECOFF executable
->20	beshort	0407		(impure)
->20	beshort	0410		(swapped)
->20	beshort	0413		(paged)
->8	belong	>0		not stripped
->8	belong	0		stripped
->22	byte	x		- version %ld
->23	byte	x		\b.%ld
-#
-0	beshort	0x0162		MIPSEL-BE ECOFF executable
->20	beshort	0407		(impure)
->20	beshort	0410		(swapped)
->20	beshort	0413		(paged)
->8	belong	>0		not stripped
->8	belong	0		stripped
->23	byte	x		- version %d
->22	byte	x		\b.%ld
-#
-0	beshort	0x6001		MIPSEB-LE ECOFF executable
->20	beshort	03401		(impure)
->20	beshort	04001		(swapped)
->20	beshort	05401		(paged)
->8	belong	>0		not stripped
->8	belong	0		stripped
->23	byte	x		- version %d
->22	byte	x		\b.%ld
-#
-0	beshort	0x6201		MIPSEL ECOFF executable
->20	beshort	03401		(impure)
->20	beshort	04001		(swapped)
->20	beshort	05401		(paged)
->8	belong	>0		not stripped
->8	belong	0		stripped
->23	byte	x		- version %ld
->22	byte	x		\b.%ld
-#
-# MIPS 2 additions
-#
-0	beshort	0x0163		MIPSEB MIPS-II ECOFF executable
->20	beshort	0407		(impure)
->20	beshort	0410		(swapped)
->20	beshort	0413		(paged)
->8	belong	>0		not stripped
->8	belong	0		stripped
->22	byte	x		- version %ld
->23	byte	x		\b.%ld
-#
-0	beshort	0x0166		MIPSEL-BE MIPS-II ECOFF executable
->20	beshort	0407		(impure)
->20	beshort	0410		(swapped)
->20	beshort	0413		(paged)
->8	belong	>0		not stripped
->8	belong	0		stripped
->22	byte	x		- version %ld
->23	byte	x		\b.%ld
-#
-0	beshort	0x6301		MIPSEB-LE MIPS-II ECOFF executable
->20	beshort	03401		(impure)
->20	beshort	04001		(swapped)
->20	beshort	05401		(paged)
->8	belong	>0		not stripped
->8	belong	0		stripped
->23	byte	x		- version %ld
->22	byte	x		\b.%ld
-#
-0	beshort	0x6601		MIPSEL MIPS-II ECOFF executable
->20	beshort	03401		(impure)
->20	beshort	04001		(swapped)
->20	beshort	05401		(paged)
->8	belong	>0		not stripped
->8	belong	0		stripped
->23	byte	x		- version %ld
->22	byte	x		\b.%ld
-#
-# MIPS 3 additions
-#
-0	beshort	0x0140		MIPSEB MIPS-III ECOFF executable
->20	beshort	0407		(impure)
->20	beshort	0410		(swapped)
->20	beshort	0413		(paged)
->8	belong	>0		not stripped
->8	belong	0		stripped
->22	byte	x		- version %ld
->23	byte	x		\b.%ld
-#
-0	beshort	0x0142		MIPSEL-BE MIPS-III ECOFF executable
->20	beshort	0407		(impure)
->20	beshort	0410		(swapped)
->20	beshort	0413		(paged)
->8	belong	>0		not stripped
->8	belong	0		stripped
->22	byte	x		- version %ld
->23	byte	x		\b.%ld
-#
-0	beshort	0x4001		MIPSEB-LE MIPS-III ECOFF executable
->20	beshort	03401		(impure)
->20	beshort	04001		(swapped)
->20	beshort	05401		(paged)
->8	belong	>0		not stripped
->8	belong	0		stripped
->23	byte	x		- version %ld
->22	byte	x		\b.%ld
-#
-0	beshort	0x4201		MIPSEL MIPS-III ECOFF executable
->20	beshort	03401		(impure)
->20	beshort	04001		(swapped)
->20	beshort	05401		(paged)
->8	belong	>0		not stripped
->8	belong	0		stripped
->23	byte	x		- version %ld
->22	byte	x		\b.%ld
-#
-0	beshort	0x180		MIPSEB Ucode
-0	beshort	0x182		MIPSEL-BE Ucode
-# 32bit core file
-0	belong	0xdeadadb0	IRIX core dump
->4	belong	1		of
->16	string	>\0		'%s'
-# 64bit core file
-0	belong	0xdeadad40	IRIX 64-bit core dump
->4	belong	1		of
->16	string	>\0		'%s'
-# N32bit core file
-0       belong	0xbabec0bb	IRIX N32 core dump
->4      belong	1               of
->16     string	>\0             '%s'
-# New style crash dump file
-0	string	\x43\x72\x73\x68\x44\x75\x6d\x70	IRIX vmcore dump of
->36	string	>\0					'%s'
-# Trusted IRIX info
-0	string	SGIAUDIT	SGI Audit file
->8	byte	x		- version %d
->9	byte	x		\b.%ld
-#
-0	string	WNGZWZSC	Wingz compiled script
-0	string	WNGZWZSS	Wingz spreadsheet
-0	string	WNGZWZHP	Wingz help file
-#
-0	string	#Inventor V	IRIS Inventor 1.0 file
-0	string	#Inventor V2	Open Inventor 2.0 file
-# GLF is OpenGL stream encoding
-0	string	glfHeadMagic();		GLF_TEXT
-4	belong	0x7d000000		GLF_BINARY_LSB_FIRST
-!:strength -30
-4	belong	0x0000007d		GLF_BINARY_MSB_FIRST
-!:strength -30
-# GLS is OpenGL stream encoding; GLS is the successor of GLF
-0	string	glsBeginGLS(		GLS_TEXT
-4	belong	0x10000000		GLS_BINARY_LSB_FIRST
-!:strength -30
-4	belong	0x00000010		GLS_BINARY_MSB_FIRST
-!:strength -30
diff --git a/contrib/file/Magdir/msooxml b/contrib/file/Magdir/msooxml
deleted file mode 100644
index 6ccebf641bfc..000000000000
--- a/contrib/file/Magdir/msooxml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: msooxml,v 1.1 2011/01/25 18:36:19 christos Exp $
-# msooxml:  file(1) magic for Microsoft Office XML
-# From: Ralf Brown <ralf.brown@gmail.com>
-
-# .docx, .pptx, and .xlsx are XML plus other files inside a ZIP
-#   archive.  The first member file is normally "[Content_Types].xml".
-# Since MSOOXML doesn't have anything like the uncompressed "mimetype"
-#   file of ePub or OpenDocument, we'll have to scan for a filename
-#   which can distinguish between the three types
-
-# start by checking for ZIP local file header signature
-0               string          PK\003\004
-# make sure the first file is correct
->0x1E           string          [Content_Types].xml
-# skip to the second local file header
-#   since some documents include a 520-byte extra field following the file
-#   header,  we need to scan for the next header
->>(18.l+49)     search/2000     PK\003\004
-# now skip to the *third* local file header; again, we need to scan due to a
-#   520-byte extra field following the file header
->>>&26          search/1000     PK\003\004
-# and check the subdirectory name to determine which type of OOXML
-#   file we have
->>>>&26         string          word/           Microsoft Word 2007+
-!:mime application/msword
->>>>&26         string          ppt/            Microsoft PowerPoint 2007+
-!:mime application/vnd.ms-powerpoint
->>>>&26         string          xl/             Microsoft Excel 2007+
-!:mime application/vnd.ms-excel
->>>>&26         default         x               Microsoft OOXML
-!:strength +10
diff --git a/contrib/file/Magdir/sgi b/contrib/file/Magdir/sgi
deleted file mode 100644
index 2a8af1faf14c..000000000000
--- a/contrib/file/Magdir/sgi
+++ /dev/null
@@ -1,71 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: sgi,v 1.18 2010/11/25 15:00:12 christos Exp $
-# sgi:  file(1) magic for Silicon Graphics applications
-
-#
-#
-# Performance Co-Pilot file types
-0	string	PmNs				PCP compiled namespace (V.0)
-0	string	PmN				PCP compiled namespace
->3	string	>\0				(V.%1.1s)
-#3	lelong	0x84500526			PCP archive
-3	belong	0x84500526			PCP archive
->7	byte	x				(V.%d)
-#>20	lelong	-2				temporal index
-#>20	lelong	-1				metadata
-#>20	lelong	0				log volume #0
-#>20	lelong	>0				log volume #%ld
->20	belong	-2				temporal index
->20	belong	-1				metadata
->20	belong	0				log volume #0
->20	belong	>0				log volume #%ld
->24	string	>\0				host: %s
-0	string	PCPFolio			PCP
->9	string	Version:			Archive Folio
->18	string	>\0				(V.%s)
-0	string	#pmchart			PCP pmchart view
->9	string	Version
->17	string	>\0				(V%-3.3s)
-0	string	#kmchart			PCP kmchart view
->9	string	Version
->17	string	>\0				(V.%s)
-0	string	pmview				PCP pmview config
->7	string	Version
->15	string	>\0				(V%-3.3s)
-0	string	#pmlogger			PCP pmlogger config
->10	string	Version
->18	string	>\0				(V%1.1s)
-0	string	#pmdahotproc			PCP pmdahotproc config
->13	string	Version
->21	string	>\0				(V%-3.3s)
-0	string	PcPh				PCP Help
->4	string	1				Index
->4	string	2				Text
->5	string	>\0				(V.%1.1s)
-0	string	#pmieconf-rules			PCP pmieconf rules
->16	string	>\0				(V.%1.1s)
-3	string	pmieconf-pmie			PCP pmie config
->17	string	>\0				(V.%1.1s)
-
-# SpeedShop data files
-0	lelong	0x13130303			SpeedShop data file
-
-# mdbm files
-0	lelong	0x01023962			mdbm file, version 0 (obsolete)
-0	string	mdbm				mdbm file,
->5	byte	x				version %d,
->6	byte	x				2^%d pages,
->7	byte	x				pagesize 2^%d,
->17	byte	x				hash %d,
->11	byte	x				dataformat %d
-
-# Alias Maya files
-0	string/t	//Maya ASCII	Alias Maya Ascii File,
->13	string	>\0	version %s
-8	string	MAYAFOR4	Alias Maya Binary File,
->32	string	>\0	version %s scene
-8	string	MayaFOR4	Alias Maya Binary File,
->32	string	>\0	version %s scene
-8	string	CIMG		Alias Maya Image File
-8	string	DEEP		Alias Maya Image File
diff --git a/contrib/file/Magdir/sql b/contrib/file/Magdir/sql
deleted file mode 100644
index cce5550fef42..000000000000
--- a/contrib/file/Magdir/sql
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: sql,v 1.6 2009/09/19 16:28:12 christos Exp $
-# sql:  file(1) magic for SQL files
-#
-# From: "Marty Leisner" <mleisner@eng.mc.xerox.com>
-# Recognize some MySQL files.
-#
-0	beshort			0xfe01		MySQL table definition file
->2	byte			x		Version %d
-0	belong&0xffffff00	0xfefe0300	MySQL MISAM index file
->3	byte			x		Version %d
-0	belong&0xffffff00	0xfefe0700	MySQL MISAM compressed data file
->3	byte			x		Version %d
-0	belong&0xffffff00	0xfefe0500	MySQL ISAM index file
->3	byte			x		Version %d
-0	belong&0xffffff00	0xfefe0600	MySQL ISAM compressed data file
->3	byte			x		Version %d
-0	string		 	\376bin		MySQL replication log
-
-#------------------------------------------------------------------------------
-# iRiver H Series database file 
-# From Ken Guest <ken@linux.ie>
-# As observed from iRivNavi.iDB and unencoded firmware
-#
-0   string		iRivDB	iRiver Database file
->11  string	>\0	Version %s
->39  string		iHP-100	[H Series]
-
-#------------------------------------------------------------------------------
-# SQLite database files
-# Ken Guest <ken@linux.ie>, Ty Sarna, Zack Weinberg
-#
-# Version 1 used GDBM internally; its files cannot be distinguished
-# from other GDBM files.
-#
-# Version 2 used this format:
-0	string	**\ This\ file\ contains\ an\ SQLite  SQLite 2.x database
-
-# Version 3 of SQLite allows applications to embed their own "user version"
-# number in the database.  Detect this and distinguish those files.
-
-0   string  SQLite\ format\ 3
->60 string  _MTN               Monotone source repository
->60 belong  !0                 SQLite 3.x database, user version %u
->60 belong  0                  SQLite 3.x database
diff --git a/contrib/file/Magdir/unknown b/contrib/file/Magdir/unknown
deleted file mode 100644
index 82ac2ad164f3..000000000000
--- a/contrib/file/Magdir/unknown
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: unknown,v 1.7 2009/09/19 16:28:13 christos Exp $
-# unknown:  file(1) magic for unknown machines
-#
-# XXX - this probably should be pruned, as it'll match PDP-11 and
-# VAX image formats.
-#
-# 0x107 is 0407; 0x108 is 0410; both are PDP-11 (executable and pure,
-# respectively).
-#
-# 0x109 is 0411; that's PDP-11 split I&D, but the PDP-11 version doesn't
-# have the "version %ld", which may be a bogus COFFism (I don't think
-# there ever was COFF for the PDP-11).
-#
-# 0x10B is 0413; that's VAX demand-paged, but this is a short, not a
-# long, as it would be on a VAX.
-#
-# 0x10C is 0414 and 0x10E is 416; those *are* unknown.
-#
-0	short		0x107		unknown machine executable
->8	short		>0		not stripped
->15	byte		>0		- version %ld
-0	short		0x108		unknown pure executable
->8	short		>0		not stripped
->15	byte		>0		- version %ld
-0	short		0x109		PDP-11 separate I&D
->8	short		>0		not stripped
->15	byte		>0		- version %ld
-0	short		0x10b		unknown pure executable
->8	short		>0		not stripped
->15	byte		>0		- version %ld
-0	long		0x10c		unknown demand paged pure executable
->16	long		>0		not stripped
-0	long		0x10e		unknown readable demand paged pure executable
diff --git a/contrib/file/Magdir/virtual b/contrib/file/Magdir/virtual
deleted file mode 100644
index 7b729d403504..000000000000
--- a/contrib/file/Magdir/virtual
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: virtual,v 1.2 2011/11/22 13:30:05 christos Exp $
-# From: James Nobis <quel@quelrod.net>
-# Microsoft hard disk images for:
-# Virtual Server
-# Virtual PC
-# http://technet.microsoft.com/en-us/virtualserver/bb676673.aspx
-# .vhd
-0	string	conectix	Microsoft Disk Image, Virtual Server or Virtual PC
-
-# Sun xVM VirtualBox Disk Image
-# From: Richard W.M. Jones <rich@annexia.org>
-# VirtualBox Disk Image
-0x40	ulelong		0xbeda107f	VirtualBox Disk Image
->0x44	uleshort	>0		\b, major %u
->0x46	uleshort	>0		\b, minor %u
diff --git a/contrib/file/Magdir/windows b/contrib/file/Magdir/windows
deleted file mode 100644
index cd760ec767ec..000000000000
--- a/contrib/file/Magdir/windows
+++ /dev/null
@@ -1,122 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: windows,v 1.4 2009/09/19 16:28:13 christos Exp $
-# windows:  file(1) magic for Microsoft Windows
-#
-# This file is mainly reserved for files where programs
-# using them are run almost always on MS Windows 3.x or
-# above, or files only used exclusively in Windows OS,
-# where there is no better category to allocate for.
-# For example, even though WinZIP almost run on Windows
-# only, it is better to treat them as "archive" instead.
-# For format usable in DOS, such as generic executable
-# format, please specify under "msdos" file.
-#
-
-
-# Summary: Outlook Express DBX file
-# Extension: .dbx
-# Created by: Christophe Monniez
-0	string	\xCF\xAD\x12\xFE	MS Outlook Express DBX file
->4	byte	=0xC5			\b, message database
->4	byte	=0xC6			\b, folder database
->4	byte	=0xC7			\b, account information
->4	byte	=0x30			\b, offline database
-
-
-# Summary: Windows crash dump
-# Extension: .dmp
-# Created by: Andreas Schuster (http://computer.forensikblog.de/)
-# Reference (1): http://computer.forensikblog.de/en/2008/02/64bit_magic.html
-# Modified by (1): Abel Cheung (Avoid match with first 4 bytes only)
-0	string		PAGE		
->4	string		DUMP		MS Windows 32bit crash dump
->>0x05c	byte            0		\b, no PAE
->>0x05c	byte            1		\b, PAE
->>0xf88	lelong		1		\b, full dump
->>0xf88	lelong		2		\b, kernel dump
->>0xf88	lelong		3		\b, small dump
->>0x068	lelong		x		\b, %ld pages
->4	string		DU64		MS Windows 64bit crash dump
->>0xf98	lelong		1		\b, full dump
->>0xf98	lelong		2		\b, kernel dump
->>0xf98	lelong		3		\b, small dump
->>0x090	lequad		x		\b, %lld pages
-
-
-# Summary: Vista Event Log
-# Extension: .evtx
-# Created by: Andreas Schuster (http://computer.forensikblog.de/)
-# Reference (1): http://computer.forensikblog.de/en/2007/05/some_magic.html
-0	string		ElfFile\0	MS Windows Vista Event Log
->0x2a	leshort		x		\b, %d chunks
->>0x10	lelong		x		\b (no. %d in use)
->0x18	lelong		>1		\b, next record no. %d
->0x18	lelong		=1		\b, empty
->0x78	lelong		&1		\b, DIRTY
->0x78	lelong		&2		\b, FULL
-
-
-# Summary: Windows 3.1 group files
-# Extension: .grp
-# Created by: unknown
-0	string		\120\115\103\103	MS Windows 3.1 group files
-
-
-# Summary: Old format help files
-# Extension: .hlp
-# Created by: Dirk Jagdmann <doj@cubic.org>
-0	lelong		0x00035f3f		MS Windows 3.x help file
-
-
-# Summary: Hyper terminal
-# Extension: .ht
-# Created by: unknown
-0	string		HyperTerminal\ 
->15	string		1.0\ --\ HyperTerminal\ data\ file	MS Windows HyperTerminal profile
-
-
-# Summary: Windows shortcut
-# Extension: .lnk
-# Created by: unknown
-0	string		\114\0\0\0\001\024\002\0\0\0\0\0\300\0\0\0\0\0\0\106	MS Windows shortcut
-
-
-# Summary: Outlook Personal Folders
-# Created by: unknown
-0	lelong		0x4E444221	Microsoft Outlook email folder
->10	leshort		0x0e		(<=2002)
->10	leshort		0x17		(>=2003)
-
-
-# Summary: Windows help cache
-# Created by: unknown
-0	string		\164\146\115\122\012\000\000\000\001\000\000\000	MS Windows help cache
-
-
-# Summary: IE cache file
-# Created by: Christophe Monniez
-0	string	Client\ UrlCache\ MMF 	Internet Explorer cache file
->20	string	>\0			version %s
-
-
-# Summary: Registry files
-# Created by: unknown
-# Modified by (1): Joerg Jenderek
-0	string		regf		MS Windows registry file, NT/2000 or above
-0	string		CREG		MS Windows 95/98/ME registry file
-0	string		SHCC3		MS Windows 3.1 registry file
-
-
-# Summary: Windows Registry text
-# Extension: .reg
-# Submitted by: Abel Cheung <abelcheung@gmail.com>
-0	string		REGEDIT4\r\n\r\n	Windows Registry text (Win95 or above)
-0	string		Windows\ Registry\ Editor\ 
->&0	string		Version\ 5.00\r\n\r\n	Windows Registry text (Win2K or above)
-
-
-# From: Pal Tamas <folti@balabit.hu>
-# Autorun File
-0       string/c          [autorun]\r\n   Microsoft Windows Autorun file.
-!:mime	application/x-setupscript. 
diff --git a/contrib/file/Magdir/xilinx b/contrib/file/Magdir/xilinx
deleted file mode 100644
index 26efb1baebf3..000000000000
--- a/contrib/file/Magdir/xilinx
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#------------------------------------------------------------------------------
-# $File: xilinx,v 1.4 2009/09/19 16:28:13 christos Exp $
-# This is Aaron's attempt at a MAGIC file for Xilinx .bit files.
-# Xilinx-Magic@RevRagnarok.com
-# Got the info from FPGA-FAQ 0026
-#
-# First there is the sync header and its length
-0	beshort 0x0009
->2 	belong	=0x0ff00ff0
->>&0	belong  =0x0ff00ff0
->>>&0	beshort =0x0000	
->>>>&0	pstring	a	Xilinx BIT data
-# Next is a Pascal-style string with the NCD name. We want to capture that.
->>>>0x0F	pstring	x	- from %s
-# It is followed by a NUL
->>>>>&1	byte	0x00
-# And then 'b'
->>>>>&2	string b
-# With the part number:
-#>>>>>&5 string	4v	(Virtex4)
-#>>>>>&5 string  2v	(Virtex II
-#>>>>>>&0	string	!p	\b)
-#>>>>>>&0	string	p	Pro)
->>>>>&4	pstring x	- for %s
-# And then NUL / 'c' / Build Data / NUL / 'd' / Date / NUL / 'e' / Data Length
->>>>>>&1	byte	0x00
->>>>>>&2	string	c
->>>>>>&4	pstring	x	- built %s
->>>>>>>&1	byte	0x00
->>>>>>>&2	string	d
->>>>>>>&4	pstring	x	\b(%s)
->>>>>>>>&1	byte	0x00
->>>>>>>>&2	string	e
->>>>>>>>&4	belong	x	- data length 0x%lx
diff --git a/contrib/file/Makefile.am b/contrib/file/Makefile.am
index 2aa32fcc249e..8bd927d943ac 100644
--- a/contrib/file/Makefile.am
+++ b/contrib/file/Makefile.am
@@ -1,280 +1,5 @@
-#
-# $File: Makefile.am,v 1.78 2012/01/27 01:41:26 christos Exp $
-#
-MAGIC_FRAGMENT_BASE = Magdir
-MAGIC_DIR = $(top_srcdir)/magic
-MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
+ACLOCAL_AMFLAGS = -I m4
 
-pkgdata_DATA = magic.mgc
+EXTRA_DIST = MAINT
 
-EXTRA_DIST = \
-$(MAGIC_DIR)/Header \
-$(MAGIC_DIR)/Localstuff \
-$(MAGIC_FRAGMENT_DIR)/acorn \
-$(MAGIC_FRAGMENT_DIR)/adi \
-$(MAGIC_FRAGMENT_DIR)/adventure \
-$(MAGIC_FRAGMENT_DIR)/allegro \
-$(MAGIC_FRAGMENT_DIR)/alliant \
-$(MAGIC_FRAGMENT_DIR)/amanda \
-$(MAGIC_FRAGMENT_DIR)/amigaos \
-$(MAGIC_FRAGMENT_DIR)/animation \
-$(MAGIC_FRAGMENT_DIR)/apl \
-$(MAGIC_FRAGMENT_DIR)/apple \
-$(MAGIC_FRAGMENT_DIR)/applix \
-$(MAGIC_FRAGMENT_DIR)/archive \
-$(MAGIC_FRAGMENT_DIR)/assembler \
-$(MAGIC_FRAGMENT_DIR)/asterix \
-$(MAGIC_FRAGMENT_DIR)/att3b \
-$(MAGIC_FRAGMENT_DIR)/audio \
-$(MAGIC_FRAGMENT_DIR)/basis \
-$(MAGIC_FRAGMENT_DIR)/bflt \
-$(MAGIC_FRAGMENT_DIR)/blcr \
-$(MAGIC_FRAGMENT_DIR)/blender \
-$(MAGIC_FRAGMENT_DIR)/blit \
-$(MAGIC_FRAGMENT_DIR)/bout \
-$(MAGIC_FRAGMENT_DIR)/bsdi \
-$(MAGIC_FRAGMENT_DIR)/bsi \
-$(MAGIC_FRAGMENT_DIR)/btsnoop \
-$(MAGIC_FRAGMENT_DIR)/c-lang \
-$(MAGIC_FRAGMENT_DIR)/c64 \
-$(MAGIC_FRAGMENT_DIR)/cad \
-$(MAGIC_FRAGMENT_DIR)/cafebabe \
-$(MAGIC_FRAGMENT_DIR)/cddb \
-$(MAGIC_FRAGMENT_DIR)/chord \
-$(MAGIC_FRAGMENT_DIR)/cisco \
-$(MAGIC_FRAGMENT_DIR)/citrus \
-$(MAGIC_FRAGMENT_DIR)/clarion \
-$(MAGIC_FRAGMENT_DIR)/claris \
-$(MAGIC_FRAGMENT_DIR)/clipper \
-$(MAGIC_FRAGMENT_DIR)/commands \
-$(MAGIC_FRAGMENT_DIR)/communications \
-$(MAGIC_FRAGMENT_DIR)/compress \
-$(MAGIC_FRAGMENT_DIR)/console \
-$(MAGIC_FRAGMENT_DIR)/convex \
-$(MAGIC_FRAGMENT_DIR)/cracklib \
-$(MAGIC_FRAGMENT_DIR)/ctags \
-$(MAGIC_FRAGMENT_DIR)/cups \
-$(MAGIC_FRAGMENT_DIR)/dact \
-$(MAGIC_FRAGMENT_DIR)/database \
-$(MAGIC_FRAGMENT_DIR)/diamond \
-$(MAGIC_FRAGMENT_DIR)/diff \
-$(MAGIC_FRAGMENT_DIR)/digital \
-$(MAGIC_FRAGMENT_DIR)/dolby \
-$(MAGIC_FRAGMENT_DIR)/dump \
-$(MAGIC_FRAGMENT_DIR)/dyadic \
-$(MAGIC_FRAGMENT_DIR)/ebml \
-$(MAGIC_FRAGMENT_DIR)/editors \
-$(MAGIC_FRAGMENT_DIR)/efi \
-$(MAGIC_FRAGMENT_DIR)/elf \
-$(MAGIC_FRAGMENT_DIR)/encore \
-$(MAGIC_FRAGMENT_DIR)/epoc \
-$(MAGIC_FRAGMENT_DIR)/erlang \
-$(MAGIC_FRAGMENT_DIR)/esri \
-$(MAGIC_FRAGMENT_DIR)/fcs \
-$(MAGIC_FRAGMENT_DIR)/filesystems \
-$(MAGIC_FRAGMENT_DIR)/flash \
-$(MAGIC_FRAGMENT_DIR)/fonts \
-$(MAGIC_FRAGMENT_DIR)/fortran \
-$(MAGIC_FRAGMENT_DIR)/frame \
-$(MAGIC_FRAGMENT_DIR)/freebsd \
-$(MAGIC_FRAGMENT_DIR)/fsav \
-$(MAGIC_FRAGMENT_DIR)/fusecompress \
-$(MAGIC_FRAGMENT_DIR)/games \
-$(MAGIC_FRAGMENT_DIR)/gcc \
-$(MAGIC_FRAGMENT_DIR)/geo \
-$(MAGIC_FRAGMENT_DIR)/geos \
-$(MAGIC_FRAGMENT_DIR)/gimp \
-$(MAGIC_FRAGMENT_DIR)/gnome-keyring \
-$(MAGIC_FRAGMENT_DIR)/gnu \
-$(MAGIC_FRAGMENT_DIR)/gnumeric \
-$(MAGIC_FRAGMENT_DIR)/grace \
-$(MAGIC_FRAGMENT_DIR)/graphviz \
-$(MAGIC_FRAGMENT_DIR)/gringotts \
-$(MAGIC_FRAGMENT_DIR)/guile \
-$(MAGIC_FRAGMENT_DIR)/hitachi-sh \
-$(MAGIC_FRAGMENT_DIR)/hp \
-$(MAGIC_FRAGMENT_DIR)/human68k \
-$(MAGIC_FRAGMENT_DIR)/ibm370 \
-$(MAGIC_FRAGMENT_DIR)/ibm6000 \
-$(MAGIC_FRAGMENT_DIR)/iff \
-$(MAGIC_FRAGMENT_DIR)/images \
-$(MAGIC_FRAGMENT_DIR)/inform \
-$(MAGIC_FRAGMENT_DIR)/intel \
-$(MAGIC_FRAGMENT_DIR)/interleaf \
-$(MAGIC_FRAGMENT_DIR)/island \
-$(MAGIC_FRAGMENT_DIR)/ispell \
-$(MAGIC_FRAGMENT_DIR)/isz \
-$(MAGIC_FRAGMENT_DIR)/java \
-$(MAGIC_FRAGMENT_DIR)/jpeg \
-$(MAGIC_FRAGMENT_DIR)/karma \
-$(MAGIC_FRAGMENT_DIR)/kde \
-$(MAGIC_FRAGMENT_DIR)/kml \
-$(MAGIC_FRAGMENT_DIR)/lecter \
-$(MAGIC_FRAGMENT_DIR)/lex \
-$(MAGIC_FRAGMENT_DIR)/lif \
-$(MAGIC_FRAGMENT_DIR)/linux \
-$(MAGIC_FRAGMENT_DIR)/lisp \
-$(MAGIC_FRAGMENT_DIR)/llvm \
-$(MAGIC_FRAGMENT_DIR)/lua \
-$(MAGIC_FRAGMENT_DIR)/luks \
-$(MAGIC_FRAGMENT_DIR)/m4 \
-$(MAGIC_FRAGMENT_DIR)/mach \
-$(MAGIC_FRAGMENT_DIR)/macintosh \
-$(MAGIC_FRAGMENT_DIR)/magic \
-$(MAGIC_FRAGMENT_DIR)/mail.news \
-$(MAGIC_FRAGMENT_DIR)/make \
-$(MAGIC_FRAGMENT_DIR)/maple \
-$(MAGIC_FRAGMENT_DIR)/marc21 \
-$(MAGIC_FRAGMENT_DIR)/mathcad \
-$(MAGIC_FRAGMENT_DIR)/mathematica \
-$(MAGIC_FRAGMENT_DIR)/matroska \
-$(MAGIC_FRAGMENT_DIR)/mcrypt \
-$(MAGIC_FRAGMENT_DIR)/mercurial \
-$(MAGIC_FRAGMENT_DIR)/metastore \
-$(MAGIC_FRAGMENT_DIR)/mime \
-$(MAGIC_FRAGMENT_DIR)/mips \
-$(MAGIC_FRAGMENT_DIR)/mirage \
-$(MAGIC_FRAGMENT_DIR)/misctools \
-$(MAGIC_FRAGMENT_DIR)/mkid \
-$(MAGIC_FRAGMENT_DIR)/mlssa \
-$(MAGIC_FRAGMENT_DIR)/mmdf \
-$(MAGIC_FRAGMENT_DIR)/modem \
-$(MAGIC_FRAGMENT_DIR)/motorola \
-$(MAGIC_FRAGMENT_DIR)/mozilla \
-$(MAGIC_FRAGMENT_DIR)/msdos \
-$(MAGIC_FRAGMENT_DIR)/msooxml \
-$(MAGIC_FRAGMENT_DIR)/msvc \
-$(MAGIC_FRAGMENT_DIR)/mup \
-$(MAGIC_FRAGMENT_DIR)/music \
-$(MAGIC_FRAGMENT_DIR)/natinst \
-$(MAGIC_FRAGMENT_DIR)/ncr \
-$(MAGIC_FRAGMENT_DIR)/netbsd \
-$(MAGIC_FRAGMENT_DIR)/netscape \
-$(MAGIC_FRAGMENT_DIR)/netware \
-$(MAGIC_FRAGMENT_DIR)/news \
-$(MAGIC_FRAGMENT_DIR)/nitpicker \
-$(MAGIC_FRAGMENT_DIR)/oasis \
-$(MAGIC_FRAGMENT_DIR)/ocaml \
-$(MAGIC_FRAGMENT_DIR)/octave \
-$(MAGIC_FRAGMENT_DIR)/ole2compounddocs \
-$(MAGIC_FRAGMENT_DIR)/olf \
-$(MAGIC_FRAGMENT_DIR)/os2 \
-$(MAGIC_FRAGMENT_DIR)/os400 \
-$(MAGIC_FRAGMENT_DIR)/os9 \
-$(MAGIC_FRAGMENT_DIR)/osf1 \
-$(MAGIC_FRAGMENT_DIR)/palm \
-$(MAGIC_FRAGMENT_DIR)/parix \
-$(MAGIC_FRAGMENT_DIR)/parrot \
-$(MAGIC_FRAGMENT_DIR)/pascal \
-$(MAGIC_FRAGMENT_DIR)/pbm \
-$(MAGIC_FRAGMENT_DIR)/pdf \
-$(MAGIC_FRAGMENT_DIR)/pdp \
-$(MAGIC_FRAGMENT_DIR)/perl \
-$(MAGIC_FRAGMENT_DIR)/pgp \
-$(MAGIC_FRAGMENT_DIR)/pkgadd \
-$(MAGIC_FRAGMENT_DIR)/plan9 \
-$(MAGIC_FRAGMENT_DIR)/plus5 \
-$(MAGIC_FRAGMENT_DIR)/printer \
-$(MAGIC_FRAGMENT_DIR)/project \
-$(MAGIC_FRAGMENT_DIR)/psdbms \
-$(MAGIC_FRAGMENT_DIR)/pulsar \
-$(MAGIC_FRAGMENT_DIR)/pyramid \
-$(MAGIC_FRAGMENT_DIR)/python \
-$(MAGIC_FRAGMENT_DIR)/revision \
-$(MAGIC_FRAGMENT_DIR)/riff \
-$(MAGIC_FRAGMENT_DIR)/rinex \
-$(MAGIC_FRAGMENT_DIR)/rpm \
-$(MAGIC_FRAGMENT_DIR)/rtf \
-$(MAGIC_FRAGMENT_DIR)/ruby \
-$(MAGIC_FRAGMENT_DIR)/sc \
-$(MAGIC_FRAGMENT_DIR)/sccs \
-$(MAGIC_FRAGMENT_DIR)/scientific \
-$(MAGIC_FRAGMENT_DIR)/securitycerts \
-$(MAGIC_FRAGMENT_DIR)/selinux \
-$(MAGIC_FRAGMENT_DIR)/sendmail \
-$(MAGIC_FRAGMENT_DIR)/sequent \
-$(MAGIC_FRAGMENT_DIR)/sgi \
-$(MAGIC_FRAGMENT_DIR)/sgml \
-$(MAGIC_FRAGMENT_DIR)/sharc \
-$(MAGIC_FRAGMENT_DIR)/sinclair \
-$(MAGIC_FRAGMENT_DIR)/sisu \
-$(MAGIC_FRAGMENT_DIR)/sketch \
-$(MAGIC_FRAGMENT_DIR)/smalltalk \
-$(MAGIC_FRAGMENT_DIR)/smile \
-$(MAGIC_FRAGMENT_DIR)/sniffer \
-$(MAGIC_FRAGMENT_DIR)/softquad \
-$(MAGIC_FRAGMENT_DIR)/spec \
-$(MAGIC_FRAGMENT_DIR)/spectrum \
-$(MAGIC_FRAGMENT_DIR)/sql \
-$(MAGIC_FRAGMENT_DIR)/ssh \
-$(MAGIC_FRAGMENT_DIR)/ssl \
-$(MAGIC_FRAGMENT_DIR)/sun \
-$(MAGIC_FRAGMENT_DIR)/sysex \
-$(MAGIC_FRAGMENT_DIR)/tcl \
-$(MAGIC_FRAGMENT_DIR)/teapot \
-$(MAGIC_FRAGMENT_DIR)/terminfo \
-$(MAGIC_FRAGMENT_DIR)/tex \
-$(MAGIC_FRAGMENT_DIR)/tgif \
-$(MAGIC_FRAGMENT_DIR)/ti-8x \
-$(MAGIC_FRAGMENT_DIR)/timezone \
-$(MAGIC_FRAGMENT_DIR)/troff \
-$(MAGIC_FRAGMENT_DIR)/tuxedo \
-$(MAGIC_FRAGMENT_DIR)/typeset \
-$(MAGIC_FRAGMENT_DIR)/unicode \
-$(MAGIC_FRAGMENT_DIR)/unknown \
-$(MAGIC_FRAGMENT_DIR)/uuencode \
-$(MAGIC_FRAGMENT_DIR)/varied.out \
-$(MAGIC_FRAGMENT_DIR)/varied.script \
-$(MAGIC_FRAGMENT_DIR)/vax \
-$(MAGIC_FRAGMENT_DIR)/vicar \
-$(MAGIC_FRAGMENT_DIR)/virtual \
-$(MAGIC_FRAGMENT_DIR)/virtutech \
-$(MAGIC_FRAGMENT_DIR)/visx \
-$(MAGIC_FRAGMENT_DIR)/vms \
-$(MAGIC_FRAGMENT_DIR)/vmware \
-$(MAGIC_FRAGMENT_DIR)/vorbis \
-$(MAGIC_FRAGMENT_DIR)/vxl \
-$(MAGIC_FRAGMENT_DIR)/warc \
-$(MAGIC_FRAGMENT_DIR)/weak \
-$(MAGIC_FRAGMENT_DIR)/windows \
-$(MAGIC_FRAGMENT_DIR)/wireless \
-$(MAGIC_FRAGMENT_DIR)/wordprocessors \
-$(MAGIC_FRAGMENT_DIR)/wsdl \
-$(MAGIC_FRAGMENT_DIR)/xdelta \
-$(MAGIC_FRAGMENT_DIR)/xenix \
-$(MAGIC_FRAGMENT_DIR)/xilinx \
-$(MAGIC_FRAGMENT_DIR)/xo65 \
-$(MAGIC_FRAGMENT_DIR)/xwindows \
-$(MAGIC_FRAGMENT_DIR)/zfs \
-$(MAGIC_FRAGMENT_DIR)/zilog \
-$(MAGIC_FRAGMENT_DIR)/zyxel 
-
-MAGIC = magic.mgc
-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
-
-# FIXME: Build file natively as well so that it can be used to compile
-# the target's magic file; for now we bail if the local version does not match
-if IS_CROSS_COMPILE
-FILE_COMPILE = file
-FILE_COMPILE_DEP =
-else
-FILE_COMPILE = $(top_builddir)/src/file
-FILE_COMPILE_DEP = $(FILE_COMPILE)
-endif
-
-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
-	@rm -fr magic
-	@mkdir magic && cp -p $(EXTRA_DIST) magic
-	@(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
-	    echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
-	  else \
-	    v=$$(file --version | sed -e s/file-// -e q); \
-	    if [ "$$v" != "${PACKAGE_VERSION}" ]; then \
-		echo "Cannot use the installed version of file ($$v) to"; \
-		echo "cross-compile file ${PACKAGE_VERSION}"; \
-		echo "Please install file ${PACKAGE_VERSION} locally first"; \
-		exit 1; \
-	    fi; \
-	  fi)
-	$(FILE_COMPILE) -C -m magic
-	@rm -fr magic
+SUBDIRS = src magic tests doc python
diff --git a/contrib/file/Makefile.in b/contrib/file/Makefile.in
index 11bafdc8bed0..eed031897ffd 100644
--- a/contrib/file/Makefile.in
+++ b/contrib/file/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 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.
@@ -14,8 +13,52 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -33,8 +76,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = magic
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+subdir = .
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in AUTHORS COPYING ChangeLog INSTALL NEWS \
+	README TODO compile config.guess config.sub depcomp install-sh \
+	missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -42,42 +89,111 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/acinclude.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 = $(top_builddir)/config.h
+CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-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__installdirs = "$(DESTDIR)$(pkgdatadir)"
-DATA = $(pkgdata_DATA)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
+DIST_SUBDIRS = $(SUBDIRS)
 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
+am__post_remove_distdir = $(am__remove_distdir)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
 pkgdatadir = @pkgdatadir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -90,11 +206,13 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -104,6 +222,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -118,6 +237,7 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MINGW = @MINGW@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
@@ -145,6 +265,7 @@ 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_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -178,7 +299,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -194,332 +314,181 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-
-#
-# $File: Makefile.am,v 1.78 2012/01/27 01:41:26 christos Exp $
-#
-MAGIC_FRAGMENT_BASE = Magdir
-MAGIC_DIR = $(top_srcdir)/magic
-MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
-pkgdata_DATA = magic.mgc
-EXTRA_DIST = \
-$(MAGIC_DIR)/Header \
-$(MAGIC_DIR)/Localstuff \
-$(MAGIC_FRAGMENT_DIR)/acorn \
-$(MAGIC_FRAGMENT_DIR)/adi \
-$(MAGIC_FRAGMENT_DIR)/adventure \
-$(MAGIC_FRAGMENT_DIR)/allegro \
-$(MAGIC_FRAGMENT_DIR)/alliant \
-$(MAGIC_FRAGMENT_DIR)/amanda \
-$(MAGIC_FRAGMENT_DIR)/amigaos \
-$(MAGIC_FRAGMENT_DIR)/animation \
-$(MAGIC_FRAGMENT_DIR)/apl \
-$(MAGIC_FRAGMENT_DIR)/apple \
-$(MAGIC_FRAGMENT_DIR)/applix \
-$(MAGIC_FRAGMENT_DIR)/archive \
-$(MAGIC_FRAGMENT_DIR)/assembler \
-$(MAGIC_FRAGMENT_DIR)/asterix \
-$(MAGIC_FRAGMENT_DIR)/att3b \
-$(MAGIC_FRAGMENT_DIR)/audio \
-$(MAGIC_FRAGMENT_DIR)/basis \
-$(MAGIC_FRAGMENT_DIR)/bflt \
-$(MAGIC_FRAGMENT_DIR)/blcr \
-$(MAGIC_FRAGMENT_DIR)/blender \
-$(MAGIC_FRAGMENT_DIR)/blit \
-$(MAGIC_FRAGMENT_DIR)/bout \
-$(MAGIC_FRAGMENT_DIR)/bsdi \
-$(MAGIC_FRAGMENT_DIR)/bsi \
-$(MAGIC_FRAGMENT_DIR)/btsnoop \
-$(MAGIC_FRAGMENT_DIR)/c-lang \
-$(MAGIC_FRAGMENT_DIR)/c64 \
-$(MAGIC_FRAGMENT_DIR)/cad \
-$(MAGIC_FRAGMENT_DIR)/cafebabe \
-$(MAGIC_FRAGMENT_DIR)/cddb \
-$(MAGIC_FRAGMENT_DIR)/chord \
-$(MAGIC_FRAGMENT_DIR)/cisco \
-$(MAGIC_FRAGMENT_DIR)/citrus \
-$(MAGIC_FRAGMENT_DIR)/clarion \
-$(MAGIC_FRAGMENT_DIR)/claris \
-$(MAGIC_FRAGMENT_DIR)/clipper \
-$(MAGIC_FRAGMENT_DIR)/commands \
-$(MAGIC_FRAGMENT_DIR)/communications \
-$(MAGIC_FRAGMENT_DIR)/compress \
-$(MAGIC_FRAGMENT_DIR)/console \
-$(MAGIC_FRAGMENT_DIR)/convex \
-$(MAGIC_FRAGMENT_DIR)/cracklib \
-$(MAGIC_FRAGMENT_DIR)/ctags \
-$(MAGIC_FRAGMENT_DIR)/cups \
-$(MAGIC_FRAGMENT_DIR)/dact \
-$(MAGIC_FRAGMENT_DIR)/database \
-$(MAGIC_FRAGMENT_DIR)/diamond \
-$(MAGIC_FRAGMENT_DIR)/diff \
-$(MAGIC_FRAGMENT_DIR)/digital \
-$(MAGIC_FRAGMENT_DIR)/dolby \
-$(MAGIC_FRAGMENT_DIR)/dump \
-$(MAGIC_FRAGMENT_DIR)/dyadic \
-$(MAGIC_FRAGMENT_DIR)/ebml \
-$(MAGIC_FRAGMENT_DIR)/editors \
-$(MAGIC_FRAGMENT_DIR)/efi \
-$(MAGIC_FRAGMENT_DIR)/elf \
-$(MAGIC_FRAGMENT_DIR)/encore \
-$(MAGIC_FRAGMENT_DIR)/epoc \
-$(MAGIC_FRAGMENT_DIR)/erlang \
-$(MAGIC_FRAGMENT_DIR)/esri \
-$(MAGIC_FRAGMENT_DIR)/fcs \
-$(MAGIC_FRAGMENT_DIR)/filesystems \
-$(MAGIC_FRAGMENT_DIR)/flash \
-$(MAGIC_FRAGMENT_DIR)/fonts \
-$(MAGIC_FRAGMENT_DIR)/fortran \
-$(MAGIC_FRAGMENT_DIR)/frame \
-$(MAGIC_FRAGMENT_DIR)/freebsd \
-$(MAGIC_FRAGMENT_DIR)/fsav \
-$(MAGIC_FRAGMENT_DIR)/fusecompress \
-$(MAGIC_FRAGMENT_DIR)/games \
-$(MAGIC_FRAGMENT_DIR)/gcc \
-$(MAGIC_FRAGMENT_DIR)/geo \
-$(MAGIC_FRAGMENT_DIR)/geos \
-$(MAGIC_FRAGMENT_DIR)/gimp \
-$(MAGIC_FRAGMENT_DIR)/gnome-keyring \
-$(MAGIC_FRAGMENT_DIR)/gnu \
-$(MAGIC_FRAGMENT_DIR)/gnumeric \
-$(MAGIC_FRAGMENT_DIR)/grace \
-$(MAGIC_FRAGMENT_DIR)/graphviz \
-$(MAGIC_FRAGMENT_DIR)/gringotts \
-$(MAGIC_FRAGMENT_DIR)/guile \
-$(MAGIC_FRAGMENT_DIR)/hitachi-sh \
-$(MAGIC_FRAGMENT_DIR)/hp \
-$(MAGIC_FRAGMENT_DIR)/human68k \
-$(MAGIC_FRAGMENT_DIR)/ibm370 \
-$(MAGIC_FRAGMENT_DIR)/ibm6000 \
-$(MAGIC_FRAGMENT_DIR)/iff \
-$(MAGIC_FRAGMENT_DIR)/images \
-$(MAGIC_FRAGMENT_DIR)/inform \
-$(MAGIC_FRAGMENT_DIR)/intel \
-$(MAGIC_FRAGMENT_DIR)/interleaf \
-$(MAGIC_FRAGMENT_DIR)/island \
-$(MAGIC_FRAGMENT_DIR)/ispell \
-$(MAGIC_FRAGMENT_DIR)/isz \
-$(MAGIC_FRAGMENT_DIR)/java \
-$(MAGIC_FRAGMENT_DIR)/jpeg \
-$(MAGIC_FRAGMENT_DIR)/karma \
-$(MAGIC_FRAGMENT_DIR)/kde \
-$(MAGIC_FRAGMENT_DIR)/kml \
-$(MAGIC_FRAGMENT_DIR)/lecter \
-$(MAGIC_FRAGMENT_DIR)/lex \
-$(MAGIC_FRAGMENT_DIR)/lif \
-$(MAGIC_FRAGMENT_DIR)/linux \
-$(MAGIC_FRAGMENT_DIR)/lisp \
-$(MAGIC_FRAGMENT_DIR)/llvm \
-$(MAGIC_FRAGMENT_DIR)/lua \
-$(MAGIC_FRAGMENT_DIR)/luks \
-$(MAGIC_FRAGMENT_DIR)/m4 \
-$(MAGIC_FRAGMENT_DIR)/mach \
-$(MAGIC_FRAGMENT_DIR)/macintosh \
-$(MAGIC_FRAGMENT_DIR)/magic \
-$(MAGIC_FRAGMENT_DIR)/mail.news \
-$(MAGIC_FRAGMENT_DIR)/make \
-$(MAGIC_FRAGMENT_DIR)/maple \
-$(MAGIC_FRAGMENT_DIR)/marc21 \
-$(MAGIC_FRAGMENT_DIR)/mathcad \
-$(MAGIC_FRAGMENT_DIR)/mathematica \
-$(MAGIC_FRAGMENT_DIR)/matroska \
-$(MAGIC_FRAGMENT_DIR)/mcrypt \
-$(MAGIC_FRAGMENT_DIR)/mercurial \
-$(MAGIC_FRAGMENT_DIR)/metastore \
-$(MAGIC_FRAGMENT_DIR)/mime \
-$(MAGIC_FRAGMENT_DIR)/mips \
-$(MAGIC_FRAGMENT_DIR)/mirage \
-$(MAGIC_FRAGMENT_DIR)/misctools \
-$(MAGIC_FRAGMENT_DIR)/mkid \
-$(MAGIC_FRAGMENT_DIR)/mlssa \
-$(MAGIC_FRAGMENT_DIR)/mmdf \
-$(MAGIC_FRAGMENT_DIR)/modem \
-$(MAGIC_FRAGMENT_DIR)/motorola \
-$(MAGIC_FRAGMENT_DIR)/mozilla \
-$(MAGIC_FRAGMENT_DIR)/msdos \
-$(MAGIC_FRAGMENT_DIR)/msooxml \
-$(MAGIC_FRAGMENT_DIR)/msvc \
-$(MAGIC_FRAGMENT_DIR)/mup \
-$(MAGIC_FRAGMENT_DIR)/music \
-$(MAGIC_FRAGMENT_DIR)/natinst \
-$(MAGIC_FRAGMENT_DIR)/ncr \
-$(MAGIC_FRAGMENT_DIR)/netbsd \
-$(MAGIC_FRAGMENT_DIR)/netscape \
-$(MAGIC_FRAGMENT_DIR)/netware \
-$(MAGIC_FRAGMENT_DIR)/news \
-$(MAGIC_FRAGMENT_DIR)/nitpicker \
-$(MAGIC_FRAGMENT_DIR)/oasis \
-$(MAGIC_FRAGMENT_DIR)/ocaml \
-$(MAGIC_FRAGMENT_DIR)/octave \
-$(MAGIC_FRAGMENT_DIR)/ole2compounddocs \
-$(MAGIC_FRAGMENT_DIR)/olf \
-$(MAGIC_FRAGMENT_DIR)/os2 \
-$(MAGIC_FRAGMENT_DIR)/os400 \
-$(MAGIC_FRAGMENT_DIR)/os9 \
-$(MAGIC_FRAGMENT_DIR)/osf1 \
-$(MAGIC_FRAGMENT_DIR)/palm \
-$(MAGIC_FRAGMENT_DIR)/parix \
-$(MAGIC_FRAGMENT_DIR)/parrot \
-$(MAGIC_FRAGMENT_DIR)/pascal \
-$(MAGIC_FRAGMENT_DIR)/pbm \
-$(MAGIC_FRAGMENT_DIR)/pdf \
-$(MAGIC_FRAGMENT_DIR)/pdp \
-$(MAGIC_FRAGMENT_DIR)/perl \
-$(MAGIC_FRAGMENT_DIR)/pgp \
-$(MAGIC_FRAGMENT_DIR)/pkgadd \
-$(MAGIC_FRAGMENT_DIR)/plan9 \
-$(MAGIC_FRAGMENT_DIR)/plus5 \
-$(MAGIC_FRAGMENT_DIR)/printer \
-$(MAGIC_FRAGMENT_DIR)/project \
-$(MAGIC_FRAGMENT_DIR)/psdbms \
-$(MAGIC_FRAGMENT_DIR)/pulsar \
-$(MAGIC_FRAGMENT_DIR)/pyramid \
-$(MAGIC_FRAGMENT_DIR)/python \
-$(MAGIC_FRAGMENT_DIR)/revision \
-$(MAGIC_FRAGMENT_DIR)/riff \
-$(MAGIC_FRAGMENT_DIR)/rinex \
-$(MAGIC_FRAGMENT_DIR)/rpm \
-$(MAGIC_FRAGMENT_DIR)/rtf \
-$(MAGIC_FRAGMENT_DIR)/ruby \
-$(MAGIC_FRAGMENT_DIR)/sc \
-$(MAGIC_FRAGMENT_DIR)/sccs \
-$(MAGIC_FRAGMENT_DIR)/scientific \
-$(MAGIC_FRAGMENT_DIR)/securitycerts \
-$(MAGIC_FRAGMENT_DIR)/selinux \
-$(MAGIC_FRAGMENT_DIR)/sendmail \
-$(MAGIC_FRAGMENT_DIR)/sequent \
-$(MAGIC_FRAGMENT_DIR)/sgi \
-$(MAGIC_FRAGMENT_DIR)/sgml \
-$(MAGIC_FRAGMENT_DIR)/sharc \
-$(MAGIC_FRAGMENT_DIR)/sinclair \
-$(MAGIC_FRAGMENT_DIR)/sisu \
-$(MAGIC_FRAGMENT_DIR)/sketch \
-$(MAGIC_FRAGMENT_DIR)/smalltalk \
-$(MAGIC_FRAGMENT_DIR)/smile \
-$(MAGIC_FRAGMENT_DIR)/sniffer \
-$(MAGIC_FRAGMENT_DIR)/softquad \
-$(MAGIC_FRAGMENT_DIR)/spec \
-$(MAGIC_FRAGMENT_DIR)/spectrum \
-$(MAGIC_FRAGMENT_DIR)/sql \
-$(MAGIC_FRAGMENT_DIR)/ssh \
-$(MAGIC_FRAGMENT_DIR)/ssl \
-$(MAGIC_FRAGMENT_DIR)/sun \
-$(MAGIC_FRAGMENT_DIR)/sysex \
-$(MAGIC_FRAGMENT_DIR)/tcl \
-$(MAGIC_FRAGMENT_DIR)/teapot \
-$(MAGIC_FRAGMENT_DIR)/terminfo \
-$(MAGIC_FRAGMENT_DIR)/tex \
-$(MAGIC_FRAGMENT_DIR)/tgif \
-$(MAGIC_FRAGMENT_DIR)/ti-8x \
-$(MAGIC_FRAGMENT_DIR)/timezone \
-$(MAGIC_FRAGMENT_DIR)/troff \
-$(MAGIC_FRAGMENT_DIR)/tuxedo \
-$(MAGIC_FRAGMENT_DIR)/typeset \
-$(MAGIC_FRAGMENT_DIR)/unicode \
-$(MAGIC_FRAGMENT_DIR)/unknown \
-$(MAGIC_FRAGMENT_DIR)/uuencode \
-$(MAGIC_FRAGMENT_DIR)/varied.out \
-$(MAGIC_FRAGMENT_DIR)/varied.script \
-$(MAGIC_FRAGMENT_DIR)/vax \
-$(MAGIC_FRAGMENT_DIR)/vicar \
-$(MAGIC_FRAGMENT_DIR)/virtual \
-$(MAGIC_FRAGMENT_DIR)/virtutech \
-$(MAGIC_FRAGMENT_DIR)/visx \
-$(MAGIC_FRAGMENT_DIR)/vms \
-$(MAGIC_FRAGMENT_DIR)/vmware \
-$(MAGIC_FRAGMENT_DIR)/vorbis \
-$(MAGIC_FRAGMENT_DIR)/vxl \
-$(MAGIC_FRAGMENT_DIR)/warc \
-$(MAGIC_FRAGMENT_DIR)/weak \
-$(MAGIC_FRAGMENT_DIR)/windows \
-$(MAGIC_FRAGMENT_DIR)/wireless \
-$(MAGIC_FRAGMENT_DIR)/wordprocessors \
-$(MAGIC_FRAGMENT_DIR)/wsdl \
-$(MAGIC_FRAGMENT_DIR)/xdelta \
-$(MAGIC_FRAGMENT_DIR)/xenix \
-$(MAGIC_FRAGMENT_DIR)/xilinx \
-$(MAGIC_FRAGMENT_DIR)/xo65 \
-$(MAGIC_FRAGMENT_DIR)/xwindows \
-$(MAGIC_FRAGMENT_DIR)/zfs \
-$(MAGIC_FRAGMENT_DIR)/zilog \
-$(MAGIC_FRAGMENT_DIR)/zyxel 
-
-MAGIC = magic.mgc
-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
-@IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file
-
-# FIXME: Build file natively as well so that it can be used to compile
-# the target's magic file; for now we bail if the local version does not match
-@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file
-@IS_CROSS_COMPILE_FALSE@FILE_COMPILE_DEP = $(FILE_COMPILE)
-@IS_CROSS_COMPILE_TRUE@FILE_COMPILE_DEP = 
-all: all-am
+ACLOCAL_AMFLAGS = -I m4
+EXTRA_DIST = MAINT
+SUBDIRS = src magic tests doc python
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
+am--refresh: Makefile
+	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu magic/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu magic/Makefile
+	  $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+	$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+	$(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
+config.h: stamp-h1
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-pkgdataDATA: $(pkgdata_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || 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)$(pkgdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
-	done
 
-uninstall-pkgdataDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-tags: TAGS
-TAGS:
+distclean-libtool:
+	-rm -f libtool config.lt
 
-ctags: CTAGS
-CTAGS:
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
 
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	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-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -549,31 +518,188 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
 	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+	-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__post_remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
+
+dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__post_remove_distdir)
+
+dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__post_remove_distdir)
+
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_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.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 u+w $(distdir)
+	mkdir $(distdir)/_build $(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__post_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
+check: check-recursive
+all-am: Makefile config.h
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-am
+installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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)
@@ -582,104 +708,96 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
 
-distclean: distclean-am
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
 
-dvi: dvi-am
+dvi: dvi-recursive
 
 dvi-am:
 
-html: html-am
+html: html-recursive
 
 html-am:
 
-info: info-am
+info: info-recursive
 
 info-am:
 
-install-data-am: install-pkgdataDATA
+install-data-am:
 
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am:
 
-install-html: install-html-am
+install-html: install-html-recursive
 
 install-html-am:
 
-install-info: install-info-am
+install-info: install-info-recursive
 
 install-info-am:
 
 install-man:
 
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
-install-ps: install-ps-am
+install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
-pdf: pdf-am
+pdf: pdf-recursive
 
 pdf-am:
 
-ps: ps-am
+ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-pkgdataDATA
+uninstall-am:
 
-.MAKE: install-am install-strip
+.MAKE: $(am__recursive_targets) all install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pkgdataDATA install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-pkgdataDATA
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
 
 
-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
-	@rm -fr magic
-	@mkdir magic && cp -p $(EXTRA_DIST) magic
-	@(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
-	    echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
-	  else \
-	    v=$$(file --version | sed -e s/file-// -e q); \
-	    if [ "$$v" != "${PACKAGE_VERSION}" ]; then \
-		echo "Cannot use the installed version of file ($$v) to"; \
-		echo "cross-compile file ${PACKAGE_VERSION}"; \
-		echo "Please install file ${PACKAGE_VERSION} locally first"; \
-		exit 1; \
-	    fi; \
-	  fi)
-	$(FILE_COMPILE) -C -m magic
-	@rm -fr magic
-
 # 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/file/README b/contrib/file/README
index 2b57a70624fd..cfc530f520e9 100644
--- a/contrib/file/README
+++ b/contrib/file/README
@@ -1,10 +1,14 @@
-** README for file(1) Command **
-@(#) $File: README,v 1.44 2011/03/24 13:03:39 rrt Exp $
+## README for file(1) Command ##
 
-Mailing List: file@mx.gw.com
-Bug tracker: http://bugs.gw.com/
+    @(#) $File: README,v 1.48 2014/03/07 13:55:30 christos Exp $
+
+Mailing List: file@mx.gw.com  
+Mailing List archives: http://mx.gw.com/pipermail/file/  
+Bug tracker: http://bugs.gw.com/  
 E-mail: christos@astron.com
 
+[![Build Status](https://travis-ci.org/file/file.png?branch=master)](https://travis-ci.org/file/file)
+
 Phone: Do not even think of telephoning me about this program. Send cash first!
 
 This is Release 5.x of Ian Darwin's (copyright but distributable)
@@ -13,13 +17,13 @@ It knows the 'magic number' of several thousands of file types.
 This version is the standard "file" command for Linux,
 *BSD, and other systems. (See "patchlevel.h" for the exact release number).
 
-You can download the latest version of file from:
+You can download the latest version of the original sources for file from:
 
 	ftp://ftp.astron.com/pub/file/
 
-A public read-only git repository is available at:
+A public read-only git repository of the same sources is available at:
 
-	https://github.com/glensc/file
+	https://github.com/file/file
 
 The major changes for 5.x are CDF file parsing, indirect magic, and
 overhaul in mime and ascii encoding handling.
@@ -28,7 +32,7 @@ The major feature of 4.x is the refactoring of the code into a library,
 and the re-write of the file command in terms of that library. The library
 itself, libmagic can be used by 3rd party programs that wish to identify
 file types without having to fork() and exec() file. The prime contributor
-for 4.0 was M\xe5ns Rullg\xe5rd.
+for 4.0 was Mans Rullgard.
 
 UNIX is a trademark of UNIX System Laboratories.
 
@@ -60,38 +64,42 @@ magic numbers assigned to all sorts of data files that
 are in reasonable circulation. Send your magic numbers,
 in magic(5) format please, to the maintainer, Christos Zoulas.
 
-COPYING - read this first.
-README - read this second (you are currently reading this file).
+COPYING - read this first.  
+README - read this second (you are currently reading this file).  
 INSTALL - read on how to install
 
-src/apprentice.c - parses /etc/magic to learn magic
-src/apptype.c - used for OS/2 specific application type magic
-src/asprintf.c - replacement for OS's that don't have it.
-src/ascmagic.c - third & last set of tests, based on hardwired assumptions.
-src/cdf.c - parser for Microsoft Compound Document Files
-src/cdf_time.c - time converter for CDF.
-src/compress.c - handles decompressing files to look inside.
-src/encoding.c - handles unicode encodings
-src/file.c - the main program
-src/file.h - header file
-src/fsmagic.c - first set of tests the program runs, based on filesystem info
-src/funcs.c - utilility functions
-src/getopt_long.c - used for OS/2 specific application type magic
-src/is_tar.c, tar.h - knows about tarchives (courtesy John Gilmore).
-src/names.h - header file for ascmagic.c
-src/magic.c - the libmagic api
-src/print.c - print results, errors, warnings.
-src/readcdf.c - CDF wrapper.
-src/readelf.[ch] - Stand-alone elf parsing code.
-src/softmagic.c - 2nd set of tests, based on /etc/magic
-src/strlcat.c - used for OS/2 specific application type magic
-src/strlcpy.c - used for OS/2 specific application type magic
-src/vasprintf.c - used for OS/2 specific application type magic
-doc/file.1 - man page for the command
-doc/magic.4 - man page for the magic file, courtesy Guy Harris.
+src/apprentice.c - parses /etc/magic to learn magic  
+src/apptype.c - used for OS/2 specific application type magic  
+src/asprintf.c - replacement for OS's that don't have it.  
+src/ascmagic.c - third & last set of tests, based on hardwired assumptions.  
+src/asctime_r.c - for systems that don't have it.  
+src/asprintf.c - for systems that don't have it.  
+src/cdf.c - parser for Microsoft Compound Document Files  
+src/cdf_time.c - time converter for CDF.  
+src/compress.c - handles decompressing files to look inside.  
+src/ctime_r.c - for systems that don't have it.  
+src/encoding.c - handles unicode encodings  
+src/file.c - the main program  
+src/file.h - header file  
+src/fsmagic.c - first set of tests the program runs, based on filesystem info  
+src/funcs.c - utilility functions  
+src/getopt_long.c - for systems that don't have it.  
+src/getline.c - for systems that don't have it.  
+src/is_tar.c, tar.h - knows about tarchives (courtesy John Gilmore).  
+src/names.h - header file for ascmagic.c  
+src/magic.c - the libmagic api  
+src/print.c - print results, errors, warnings.  
+src/readcdf.c - CDF wrapper.  
+src/readelf.[ch] - Stand-alone elf parsing code.  
+src/softmagic.c - 2nd set of tests, based on /etc/magic  
+src/strlcat.c - for systems that don't have it.  
+src/strlcpy.c - for systems that don't have it.  
+src/vasprintf.c - for systems that don't have it.  
+doc/file.man - man page for the command  
+doc/magic.man - man page for the magic file, courtesy Guy Harris.
 	Install as magic.4 on USG and magic.5 on V7 or Berkeley; cf Makefile.
-Magdir - directory of /etc/magic pieces
 
+Magdir - directory of /etc/magic pieces
 ------------------------------------------------------------------------------
 
 If you submit a new magic entry please make sure you read the following
diff --git a/contrib/file/TODO b/contrib/file/TODO
index bdfbdc4146db..f78893f49392 100644
--- a/contrib/file/TODO
+++ b/contrib/file/TODO
@@ -1,6 +1,17 @@
-TODOs live in the TODO section of doc/file.man (i.e. file(1)). They
-are more visible there, so please add any further TODOs to that file,
-not here.
+Most TODOs live in the TODO section of doc/file.man (i.e. file(1)).
+They are more visible there, so please add any further TODOs to that
+file, not here. More speculative material can live here.
 
 (This change was made when Reuben Thomas noticed that all the bugs
 listed in the BUGS section of the man page had been fixed!)
+
+---
+
+It would be nice to simplify file considerably. For example,
+reimplement the apprentice and non-pattern magic methods in Python,
+and compile the magic patterns to a giant regex (or something similar;
+maybe using Ragel (http://www.complang.org/ragel/)) so that only a
+small amount of C is needed (because fast execution is typically only
+required for soft magic, not the more detailed information given by
+hard-wired routines). In this regard, note that hplip, which is
+BSD-licensed, has a magic reimplementation in Python.
diff --git a/contrib/file/aclocal.m4 b/contrib/file/aclocal.m4
index 3a7e27a80ab7..a9ddc4b1f9d8 100644
--- a/contrib/file/aclocal.m4
+++ b/contrib/file/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.14 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,15 +11,94 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# visibility.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2005, 2008, 2010-2013 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Tests whether the compiler supports the command-line option
+dnl -fvisibility=hidden and the function and variable attributes
+dnl __attribute__((__visibility__("hidden"))) and
+dnl __attribute__((__visibility__("default"))).
+dnl Does *not* test for __visibility__("protected") - which has tricky
+dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
+dnl Mac OS X.
+dnl Does *not* test for __visibility__("internal") - which has processor
+dnl dependent semantics.
+dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
+dnl "really only recommended for legacy code".
+dnl Set the variable CFLAG_VISIBILITY.
+dnl Defines and sets the variable HAVE_VISIBILITY.
+
+AC_DEFUN([gl_VISIBILITY],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  CFLAG_VISIBILITY=
+  HAVE_VISIBILITY=0
+  if test -n "$GCC"; then
+    dnl First, check whether -Werror can be added to the command line, or
+    dnl whether it leads to an error because of some other option that the
+    dnl user has put into $CC $CFLAGS $CPPFLAGS.
+    AC_MSG_CHECKING([whether the -Werror option is usable])
+    AC_CACHE_VAL([gl_cv_cc_vis_werror], [
+      gl_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -Werror"
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM([[]], [[]])],
+        [gl_cv_cc_vis_werror=yes],
+        [gl_cv_cc_vis_werror=no])
+      CFLAGS="$gl_save_CFLAGS"])
+    AC_MSG_RESULT([$gl_cv_cc_vis_werror])
+    dnl Now check whether visibility declarations are supported.
+    AC_MSG_CHECKING([for simple visibility declarations])
+    AC_CACHE_VAL([gl_cv_cc_visibility], [
+      gl_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -fvisibility=hidden"
+      dnl We use the option -Werror and a function dummyfunc, because on some
+      dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
+      dnl "visibility attribute not supported in this configuration; ignored"
+      dnl at the first function definition in every compilation unit, and we
+      dnl don't want to use the option in this case.
+      if test $gl_cv_cc_vis_werror = yes; then
+        CFLAGS="$CFLAGS -Werror"
+      fi
+      AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+             extern __attribute__((__visibility__("default"))) int exportedvar;
+             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+             void dummyfunc (void) {}
+           ]],
+           [[]])],
+        [gl_cv_cc_visibility=yes],
+        [gl_cv_cc_visibility=no])
+      CFLAGS="$gl_save_CFLAGS"])
+    AC_MSG_RESULT([$gl_cv_cc_visibility])
+    if test $gl_cv_cc_visibility = yes; then
+      CFLAG_VISIBILITY="-fvisibility=hidden"
+      HAVE_VISIBILITY=1
+    fi
+  fi
+  AC_SUBST([CFLAG_VISIBILITY])
+  AC_SUBST([HAVE_VISIBILITY])
+  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
+    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
+])
+
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -31,10 +110,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.14], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,22 +129,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.14])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -84,7 +163,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -110,22 +189,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -144,16 +220,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -163,7 +237,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -176,12 +250,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -189,8 +264,9 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # 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'.
+  # 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.
@@ -229,16 +305,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > 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
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > 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"
+    # 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
+    # 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
@@ -247,16 +323,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # 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
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    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}
@@ -304,7 +380,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -314,34 +390,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf 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
@@ -354,7 +435,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # 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
+    # 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.
@@ -366,21 +447,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # 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
+    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
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -398,7 +477,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -406,32 +485,23 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -444,7 +514,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -473,31 +543,40 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -508,34 +587,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -557,7 +680,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -576,16 +699,14 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -601,14 +722,12 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -626,7 +745,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# 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
@@ -651,52 +770,14 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# 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
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -704,11 +785,10 @@ AC_DEFUN([AM_MISSING_PROG],
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -721,63 +801,35 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -788,24 +840,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != 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_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# 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='
@@ -816,32 +926,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# 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".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     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
+     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".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -851,36 +969,85 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -888,34 +1055,32 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# 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.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -923,24 +1088,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -950,75 +1113,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
 
-  # tar/untar a dummy directory, and stop if the command works
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
diff --git a/contrib/file/compile b/contrib/file/compile
index c0096a7b5632..531136b068ef 100755
--- a/contrib/file/compile
+++ b/contrib/file/compile
@@ -1,10 +1,9 @@
 #! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
+# Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2009-10-06.20; # UTC
+scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -29,21 +28,224 @@ scriptversion=2009-10-06.20; # UTC
 # 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_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  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
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# 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)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-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
+     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
+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'.
+right script to run: please start by reading the file 'INSTALL'.
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
@@ -53,11 +255,13 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
 esac
 
 ofile=
 cfile=
-eat=
 
 for arg
 do
@@ -66,8 +270,8 @@ do
   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.
+	# 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)
@@ -94,10 +298,10 @@ do
 done
 
 if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
+  # 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
+  # '.c' file was seen then we are probably linking.  That is also
   # ok.
   exec "$@"
 fi
@@ -106,7 +310,7 @@ fi
 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
+# 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
diff --git a/contrib/file/config.guess b/contrib/file/config.guess
new file mode 100755
index 000000000000..d622a44e551f
--- /dev/null
+++ b/contrib/file/config.guess
@@ -0,0 +1,1530 @@
+#! /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-02-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
+# 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, 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 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 ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	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 ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	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/file/config.h.in b/contrib/file/config.h.in
index ae147aeae561..7f22fa8e363c 100644
--- a/contrib/file/config.h.in
+++ b/contrib/file/config.h.in
@@ -1,14 +1,23 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Define in built-in ELF support is used */
 #undef BUILTIN_ELF
 
 /* Define for ELF core file support */
 #undef ELFCORE
 
+/* Define to 1 if you have the `asctime_r' function. */
+#undef HAVE_ASCTIME_R
+
 /* Define to 1 if you have the `asprintf' function. */
 #undef HAVE_ASPRINTF
 
+/* Define to 1 if you have the `ctime_r' function. */
+#undef HAVE_CTIME_R
+
 /* HAVE_DAYLIGHT */
 #undef HAVE_DAYLIGHT
 
@@ -29,6 +38,9 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
+/* Define to 1 if you have the `fmtcheck' function. */
+#undef HAVE_FMTCHECK
+
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
@@ -44,11 +56,11 @@
 /* Define to 1 if you have the `getopt_long' function. */
 #undef HAVE_GETOPT_LONG
 
-/* Define to 1 if the system has the type `int32_t'. */
-#undef HAVE_INT32_T
+/* Define to 1 if you have the `getpagesize' function. */
+#undef HAVE_GETPAGESIZE
 
-/* Define to 1 if the system has the type `int64_t'. */
-#undef HAVE_INT64_T
+/* Define to 1 if the system has the type `intptr_t'. */
+#undef HAVE_INTPTR_T
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
@@ -65,7 +77,7 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
-/* Define to 1 if you have the `mbrtowc' function. */
+/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
 #undef HAVE_MBRTOWC
 
 /* Define to 1 if <wchar.h> declares mbstate_t. */
@@ -74,14 +86,20 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the `mkostemp' function. */
+#undef HAVE_MKOSTEMP
+
 /* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 
-/* Define to 1 if you have the `mmap' function. */
+/* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
-/* Define to 1 if the system has the type `pid_t'. */
-#undef HAVE_PID_T
+/* Define to 1 if you have the `pread' function. */
+#undef HAVE_PREAD
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#undef HAVE_STDDEF_H
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
@@ -89,6 +107,9 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
+/* Define to 1 if you have the `strcasestr' function. */
+#undef HAVE_STRCASESTR
+
 /* Define to 1 if you have the `strerror' function. */
 #undef HAVE_STRERROR
 
@@ -128,6 +149,9 @@
 /* Define to 1 if you have the <sys/mman.h> header file. */
 #undef HAVE_SYS_MMAN_H
 
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
@@ -152,17 +176,8 @@
 /* HAVE_TZNAME */
 #undef HAVE_TZNAME
 
-/* Define to 1 if the system has the type `uint16_t'. */
-#undef HAVE_UINT16_T
-
-/* Define to 1 if the system has the type `uint32_t'. */
-#undef HAVE_UINT32_T
-
-/* Define to 1 if the system has the type `uint64_t'. */
-#undef HAVE_UINT64_T
-
-/* Define to 1 if the system has the type `uint8_t'. */
-#undef HAVE_UINT8_T
+/* Define to 1 if the system has the type `uintptr_t'. */
+#undef HAVE_UINTPTR_T
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
@@ -179,6 +194,16 @@
 /* Define to 1 if you have the `vasprintf' function. */
 #undef HAVE_VASPRINTF
 
+/* Define to 1 if you have the `vfork' function. */
+#undef HAVE_VFORK
+
+/* Define to 1 if you have the <vfork.h> header file. */
+#undef HAVE_VFORK_H
+
+/* Define to 1 or 0, depending whether the compiler supports simple visibility
+   declarations. */
+#undef HAVE_VISIBILITY
+
 /* Define to 1 if you have the <wchar.h> header file. */
 #undef HAVE_WCHAR_H
 
@@ -188,6 +213,12 @@
 /* Define to 1 if you have the `wcwidth' function. */
 #undef HAVE_WCWIDTH
 
+/* Define to 1 if `fork' works. */
+#undef HAVE_WORKING_FORK
+
+/* Define to 1 if `vfork' works. */
+#undef HAVE_WORKING_VFORK
+
 /* Define to 1 if you have the <zlib.h> header file. */
 #undef HAVE_ZLIB_H
 
@@ -203,9 +234,6 @@
    <sysmacros.h>. */
 #undef MAJOR_IN_SYSMACROS
 
-/* 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
 
@@ -227,9 +255,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* The size of `long long', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
@@ -261,6 +286,23 @@
 /* Version number of package */
 #undef VERSION
 
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
@@ -280,43 +322,67 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+#undef _UINT32_T
+
+/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+#undef _UINT64_T
+
+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+#undef _UINT8_T
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
+/* Define to the type of a signed integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+#undef int32_t
+
+/* Define to the type of a signed integer type of width exactly 64 bits if
+   such a type exists and the standard includes do not define it. */
+#undef int64_t
+
+/* Define to the type of a signed integer type wide enough to hold a pointer,
+   if such a type exists, and if the system does not define it. */
+#undef intptr_t
+
 /* Define to a type if <wchar.h> does not define. */
 #undef mbstate_t
 
 /* Define to `long int' if <sys/types.h> does not define. */
 #undef off_t
 
+/* Define to `int' if <sys/types.h> does not define. */
+#undef pid_t
+
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
+/* Define to the type of an unsigned integer type of width exactly 16 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint16_t
 
-#ifndef HAVE_UINT8_T
-typedef unsigned char uint8_t;
-#endif
-#ifndef HAVE_UINT16_T
-typedef unsigned short uint16_t;
-#endif
-#ifndef HAVE_UINT32_T
-typedef unsigned int uint32_t;
-#endif
-#ifndef HAVE_INT32_T
-typedef int int32_t;
-#endif
-#ifndef HAVE_UINT64_T
-#if SIZEOF_LONG_LONG == 8
-typedef unsigned long long uint64_t;
-#else
-typedef unsigned long uint64_t;
-#endif
-#endif
-#ifndef HAVE_INT64_T
-#if SIZEOF_LONG_LONG == 8
-typedef long long int64_t;
-#else
-typedef long int64_t;
-#endif
-#endif
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint32_t
 
+/* Define to the type of an unsigned integer type of width exactly 64 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint64_t
+
+/* Define to the type of an unsigned integer type of width exactly 8 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint8_t
+
+/* Define to the type of an unsigned integer type wide enough to hold a
+   pointer, if such a type exists, and if the system does not define it. */
+#undef uintptr_t
+
+/* Define as `fork' if `vfork' does not work. */
+#undef vfork
diff --git a/contrib/file/config.sub b/contrib/file/config.sub
new file mode 100755
index 000000000000..59bb593f109c
--- /dev/null
+++ b/contrib/file/config.sub
@@ -0,0 +1,1779 @@
+#! /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-04-18'
+
+# 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, 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.
+
+
+# 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/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    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*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-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 \
+	| aarch64 | aarch64_be \
+	| 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 | m68hcs12x | 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
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	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-* \
+	| aarch64-* | aarch64_be-* \
+	| 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/file/configure b/contrib/file/configure
index 7d234a199502..757d14310409 100755
--- a/contrib/file/configure
+++ b/contrib/file/configure
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for file 5.11.
+# Generated by GNU Autoconf 2.69 for file 5.19.
 #
 # Report bugs to <christos@astron.com>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # 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
+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+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 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
@@ -169,12 +192,21 @@ 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"
+test x\$exitcode = x0 || exit 1
+test -x / || 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 \$(( 1 + 1 )) = 2 || exit 1"
+test \$(( 1 + 1 )) = 2 || 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"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
@@ -214,21 +246,25 @@ 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+"$@"}
+  export CONFIG_SHELL
+             # 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
+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+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -331,6 +367,14 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -452,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   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; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # 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).
@@ -486,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... 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'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -507,28 +555,8 @@ else
   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
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # 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'"
@@ -536,155 +564,8 @@ 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'"
 
-
-
-# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
-fi
-
-# 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
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "$0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
@@ -709,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='file'
 PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.11'
-PACKAGE_STRING='file 5.11'
+PACKAGE_VERSION='5.19'
+PACKAGE_STRING='file 5.19'
 PACKAGE_BUGREPORT='christos@astron.com'
 PACKAGE_URL=''
 
@@ -750,20 +631,25 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
+ac_header_list=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 IS_CROSS_COMPILE_FALSE
 IS_CROSS_COMPILE_TRUE
 LIBOBJS
+HAVE_VISIBILITY
+CFLAG_VISIBILITY
 OTOOL64
 OTOOL
 LIPO
 NMEDIT
 DSYMUTIL
-lt_ECHO
+MANIFEST_TOOL
 RANLIB
+ac_ct_AR
 AR
+DLLTOOL
 OBJDUMP
 NM
 ac_ct_DUMPBIN
@@ -779,6 +665,7 @@ CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -810,6 +697,8 @@ build_cpu
 build
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -879,11 +768,12 @@ enable_elf
 enable_elf_core
 enable_fsect_man5
 enable_dependency_tracking
-enable_shared
 enable_static
 with_pic
+enable_shared
 enable_fast_install
 with_gnu_ld
+with_sysroot
 enable_libtool_lock
 enable_largefile
 enable_warnings
@@ -1352,8 +1242,6 @@ target=$target_alias
 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
@@ -1439,7 +1327,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 file 5.11 to adapt to many kinds of systems.
+\`configure' configures file 5.19 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1509,7 +1397,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of file 5.11:";;
+     short | recursive ) echo "Configuration of file 5.19:";;
    esac
   cat <<\_ACEOF
 
@@ -1517,15 +1405,17 @@ 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-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
   --disable-elf            disable builtin ELF support
   --disable-elf-core       disable ELF core file support
   --enable-fsect-man5      enable file formats in man section 5
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --enable-static[=PKGS]  build static libraries [default=no]
   --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-libtool-lock  avoid locking (might break parallel builds)
@@ -1535,9 +1425,11 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --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
@@ -1615,10 +1507,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-file configure 5.11
-generated by GNU Autoconf 2.68
+file configure 5.19
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1895,7 +1787,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2138,189 +2030,141 @@ $as_echo "$ac_res" >&6; }
 
 } # ac_fn_c_check_decl
 
-# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
-# --------------------------------------------
-# Tries to find the compile-time value of EXPR in a program that includes
-# INCLUDES, setting VAR accordingly. Returns whether the value could be
-# computed
-ac_fn_c_compute_int ()
+# ac_fn_c_find_uintX_t LINENO BITS VAR
+# ------------------------------------
+# Finds an unsigned integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_uintX_t ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if test "$cross_compiling" = yes; then
-    # Depending upon the size, compute the lo and hi bounds.
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
+$as_echo_n "checking for uint$2_t... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+     # Order is important - never check a type that is potentially smaller
+     # than half of the expected target width.
+     for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
+	 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$4
+$ac_includes_default
 int
 main ()
 {
-static int test_array [1 - 2 * !(($2) >= 0)];
-test_array [0] = 0
+static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid; break
-else
-  as_fn_arith $ac_mid + 1 && ac_lo=$as_val
-			if test $ac_lo -le $ac_mid; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_lo=$ac_mid; break
-else
-  as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
-			if test $ac_mid -le $ac_hi; then
-			  ac_lo= ac_hi=
-			  break
-			fi
-			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  ac_lo= ac_hi=
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_hi=$ac_mid
-else
-  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in #((
-?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
-'') ac_retval=1 ;;
+  case $ac_type in #(
+  uint$2_t) :
+    eval "$3=yes" ;; #(
+  *) :
+    eval "$3=\$ac_type" ;;
 esac
-  else
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       if eval test \"x\$"$3"\" = x"no"; then :
+
+else
+  break
+fi
+     done
+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_find_uintX_t
+
+# ac_fn_c_find_intX_t LINENO BITS VAR
+# -----------------------------------
+# Finds a signed integer type with width BITS, setting cache variable VAR
+# accordingly.
+ac_fn_c_find_intX_t ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
+$as_echo_n "checking for int$2_t... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+     # Order is important - never check a type that is potentially smaller
+     # than half of the expected target width.
+     for ac_type in int$2_t 'int' 'long int' \
+	 'long long int' 'short int' 'signed char'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$4
-static long int longval () { return $2; }
-static unsigned long int ulongval () { return $2; }
-#include <stdio.h>
-#include <stdlib.h>
+$ac_includes_default
+	     enum { N = $2 / 2 - 1 };
 int
 main ()
 {
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    return 1;
-  if (($2) < 0)
-    {
-      long int i = longval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%ld", i);
-    }
-  else
-    {
-      unsigned long int i = ulongval ();
-      if (i != ($2))
-	return 1;
-      fprintf (f, "%lu", i);
-    }
-  /* Do not output a trailing newline, as this causes \r\n confusion
-     on some platforms.  */
-  return ferror (f) || fclose (f) != 0;
+static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  echo >>conftest.val; read $3 <conftest.val; ac_retval=0
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+	        enum { N = $2 / 2 - 1 };
+int
+main ()
+{
+static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
+		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
 else
-  ac_retval=1
+  case $ac_type in #(
+  int$2_t) :
+    eval "$3=yes" ;; #(
+  *) :
+    eval "$3=\$ac_type" ;;
+esac
 fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-rm -f conftest.val
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       if eval test \"x\$"$3"\" = x"no"; then :
 
-  fi
+else
+  break
+fi
+     done
+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
-  as_fn_set_status $ac_retval
 
-} # ac_fn_c_compute_int
+} # ac_fn_c_find_intX_t
 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 file $as_me 5.11, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by file $as_me 5.19, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2599,6 +2443,9 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+as_fn_append ac_header_list " stdlib.h"
+as_fn_append ac_header_list " unistd.h"
+as_fn_append ac_header_list " sys/param.h"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2667,7 +2514,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-am__api_version='1.11'
+am__api_version='1.14'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2735,7 +2582,7 @@ case $as_dir/ in #((
     # 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 as_fn_executable_p "$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.
@@ -2793,9 +2640,6 @@ 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='
@@ -2806,32 +2650,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# 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
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     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
+     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
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -2843,6 +2695,16 @@ Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2865,12 +2727,12 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 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;}
+  { $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
@@ -2882,10 +2744,10 @@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# 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.
+# 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.
@@ -2904,7 +2766,7 @@ 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 as_fn_executable_p "$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
@@ -2944,7 +2806,7 @@ 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 as_fn_executable_p "$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
@@ -2995,7 +2857,7 @@ do
   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
+	   as_fn_executable_p "$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) '* | \
@@ -3024,12 +2886,6 @@ 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.
@@ -3048,7 +2904,7 @@ 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 as_fn_executable_p "$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
@@ -3112,6 +2968,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -3134,7 +3029,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='file'
- VERSION='5.11'
+ VERSION='5.19'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3162,28 +3057,107 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
+# 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}'
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
 
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=0;;
 esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
 AM_BACKSLASH='\'
 
 
@@ -3368,6 +3342,7 @@ fi
 
 
 
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -3387,7 +3362,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# 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
@@ -3420,6 +3395,7 @@ 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=
@@ -3452,7 +3428,7 @@ 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 as_fn_executable_p "$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
@@ -3492,7 +3468,7 @@ 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 as_fn_executable_p "$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
@@ -3545,7 +3521,7 @@ 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 as_fn_executable_p "$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
@@ -3586,7 +3562,7 @@ 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 as_fn_executable_p "$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
@@ -3644,7 +3620,7 @@ 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 as_fn_executable_p "$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
@@ -3688,7 +3664,7 @@ 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 as_fn_executable_p "$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
@@ -4134,8 +4110,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* 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);
@@ -4220,6 +4195,65 @@ 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
+{ $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; }
+if ${am_cv_prog_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.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != 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=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
@@ -4231,8 +4265,9 @@ else
   # 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'.
+  # 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.
@@ -4266,16 +4301,16 @@ else
     : > 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
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > 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"
+    # 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
+    # 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
@@ -4284,16 +4319,16 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # 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
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    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}
@@ -4347,6 +4382,298 @@ else
 fi
 
 
+   case $ac_cv_prog_cc_stdc in #(
+  no) :
+    ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #(
+  *) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if ${ac_cv_prog_cc_c99+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+}
+
+int
+main ()
+{
+
+  // Check bool.
+  _Bool success = false;
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+	  || dynamic_array[ni.number - 1] != 543);
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" 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_c99"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c99" != xno; then :
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+else
+  { $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>
+struct stat;
+/* 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 :
+  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+else
+  ac_cv_prog_cc_stdc=no
+fi
+
+fi
+ ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5
+$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; }
+  if ${ac_cv_prog_cc_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+
+  case $ac_cv_prog_cc_stdc in #(
+  no) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;; #(
+  '') :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;; #(
+  *) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5
+$as_echo "$ac_cv_prog_cc_stdc" >&6; } ;;
+esac
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4502,7 +4829,7 @@ do
     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
+      as_fn_executable_p "$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
@@ -4568,7 +4895,7 @@ do
     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
+      as_fn_executable_p "$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
@@ -4775,8 +5102,8 @@ else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#	  define __EXTENSIONS__ 1
-	  $ac_includes_default
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
 int
 main ()
 {
@@ -4807,799 +5134,229 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
 
 
 
-
-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 "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} 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
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
 
-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
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
 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=""
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
 
 int
 main ()
 {
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
+  # It does; now see whether it defined to BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
 
   ;
   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
+  ac_cv_c_bigendian=yes
 else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
+  ac_cv_c_bigendian=no
 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
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      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;
-}
+#include <limits.h>
 
-/* 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];
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
   ;
   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
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
 
-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 :
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
 
-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
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
 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'.
-  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
-      ;;
-    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
+  ac_cv_c_bigendian=no
+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
-  done
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
 
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
 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
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
+$ac_includes_default
 int
 main ()
 {
 
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
   ;
   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
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+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
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
 fi
-rm -f core conftest*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
 
-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
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
@@ -5621,8 +5378,8 @@ esac
 
 
 
-macro_version='2.2.6b'
-macro_revision='1.3017'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -5638,6 +5395,75 @@ macro_revision='1.3017'
 
 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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 { $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 :
@@ -5660,7 +5486,7 @@ do
     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
+      as_fn_executable_p "$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
@@ -5739,7 +5565,7 @@ do
     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
+      as_fn_executable_p "$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
@@ -5973,8 +5799,11 @@ 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 "$ac_tool_prefix"; then
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  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
@@ -5992,7 +5821,7 @@ 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 as_fn_executable_p "$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
@@ -6018,7 +5847,7 @@ fi
 fi
 if test -z "$DUMPBIN"; then
   ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  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
@@ -6036,7 +5865,7 @@ 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 as_fn_executable_p "$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
@@ -6073,6 +5902,15 @@ esac
   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"
@@ -6092,13 +5930,13 @@ if ${lt_cv_nm_interface+:} false; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6095: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6098: $NM \\\"conftest.$ac_objext\\\"\"" >&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:6101: output\"" >&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"
@@ -6144,6 +5982,11 @@ else
     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.
@@ -6169,6 +6012,11 @@ else
     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
@@ -6208,8 +6056,8 @@ else
       # 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"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+      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`
@@ -6251,8 +6099,8 @@ $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"}, \
-      = c,a/b,, \
+  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
@@ -6301,6 +6149,80 @@ 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 :
@@ -6317,6 +6239,11 @@ case $reload_flag in
 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'
@@ -6351,7 +6278,7 @@ 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 as_fn_executable_p "$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
@@ -6391,7 +6318,7 @@ 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 as_fn_executable_p "$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
@@ -6480,16 +6407,18 @@ 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.
-  if ( file / ) >/dev/null 2>&1; then
+  # 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
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    # 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)
+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'
@@ -6519,6 +6448,10 @@ 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
@@ -6527,11 +6460,11 @@ hpux10.20* | hpux11*)
     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]) shared object file - PA-RISC [0-9].[0-9]'
+    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_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
@@ -6552,8 +6485,8 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -6634,6 +6567,21 @@ 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
@@ -6647,11 +6595,164 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
 
 
+
+
+
+
+
+
+
+
+
+
 
 
 if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
+  # 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 as_fn_executable_p "$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 as_fn_executable_p "$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 :
@@ -6666,8 +6767,8 @@ 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}ar"
+  if as_fn_executable_p "$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
@@ -6687,11 +6788,15 @@ $as_echo "no" >&6; }
 fi
 
 
+    test -n "$AR" && break
+  done
 fi
-if test -z "$ac_cv_prog_AR"; then
+if test -z "$AR"; then
   ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+  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 :
@@ -6706,8 +6811,8 @@ 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="ar"
+  if as_fn_executable_p "$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
@@ -6726,6 +6831,10 @@ else
 $as_echo "no" >&6; }
 fi
 
+
+  test -n "$ac_ct_AR" && break
+done
+
   if test "x$ac_ct_AR" = x; then
     AR="false"
   else
@@ -6737,12 +6846,10 @@ ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
   fi
-else
-  AR="$ac_cv_prog_AR"
 fi
 
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
+: ${AR=ar}
+: ${AR_FLAGS=cru}
 
 
 
@@ -6754,6 +6861,64 @@ test -z "$AR_FLAGS" && 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
@@ -6771,7 +6936,7 @@ 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 as_fn_executable_p "$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
@@ -6811,7 +6976,7 @@ 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 as_fn_executable_p "$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
@@ -6870,7 +7035,7 @@ 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 as_fn_executable_p "$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
@@ -6910,7 +7075,7 @@ 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 as_fn_executable_p "$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
@@ -6960,15 +7125,27 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  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
+
+
+
+
+
+
 
 
 
@@ -7076,8 +7253,8 @@ esac
 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'"
+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=
@@ -7101,6 +7278,7 @@ for ac_symprfx in "" "_"; do
     # 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};"\
@@ -7113,6 +7291,7 @@ for ac_symprfx in "" "_"; do
   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
@@ -7138,8 +7317,8 @@ _LT_EOF
   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
+    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
@@ -7154,6 +7333,18 @@ _LT_EOF
       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
@@ -7165,7 +7356,7 @@ _LT_EOF
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -7191,8 +7382,8 @@ static const void *lt_preloaded_setup() {
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
+	  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
@@ -7202,8 +7393,8 @@ _LT_EOF
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&5
 	fi
@@ -7240,6 +7431,12 @@ else
 $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
 
 
 
@@ -7260,6 +7457,49 @@ 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 :
@@ -7292,7 +7532,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7295 "configure"' > conftest.$ac_ext
+  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=$?
@@ -7427,7 +7667,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*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
@@ -7438,7 +7678,20 @@ sparc*-*solaris*)
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      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"
@@ -7454,6 +7707,123 @@ 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 as_fn_executable_p "$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 as_fn_executable_p "$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*)
@@ -7474,7 +7844,7 @@ 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 as_fn_executable_p "$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
@@ -7514,7 +7884,7 @@ 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 as_fn_executable_p "$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
@@ -7566,7 +7936,7 @@ 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 as_fn_executable_p "$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
@@ -7606,7 +7976,7 @@ 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 as_fn_executable_p "$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
@@ -7658,7 +8028,7 @@ 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 as_fn_executable_p "$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
@@ -7698,7 +8068,7 @@ 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 as_fn_executable_p "$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
@@ -7750,7 +8120,7 @@ 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 as_fn_executable_p "$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
@@ -7790,7 +8160,7 @@ 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 as_fn_executable_p "$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
@@ -7842,7 +8212,7 @@ 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 as_fn_executable_p "$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
@@ -7882,7 +8252,7 @@ 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 as_fn_executable_p "$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
@@ -7961,7 +8331,13 @@ else
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# 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
@@ -7972,6 +8348,7 @@ else
 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 :
@@ -8004,6 +8381,41 @@ rm -f core conftest.err conftest.$ac_objext \
 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' ;;
@@ -8031,7 +8443,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":"; then
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -8054,7 +8466,68 @@ done
 
 
 
+
+
 # Set options
+# 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=no
+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=yes
+
+
+
+
+
 
 
 
@@ -8095,52 +8568,6 @@ 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; pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-
-test -z "$pic_mode" && pic_mode=default
-
-
-
-
-
 
 
   # Check whether --enable-fast-install was given.
@@ -8200,6 +8627,11 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+
+
+
+
+
 
 
 
@@ -8255,19 +8687,6 @@ _ACEOF
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
@@ -8280,23 +8699,6 @@ aix3*)
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# 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'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -8325,7 +8727,7 @@ for cc_temp in $compiler""; do
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 
 
 # Only perform the check for file, if the check method requires it
@@ -8534,7 +8936,12 @@ if test -n "$compiler"; then
 lt_prog_compiler_no_builtin_flag=
 
 if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+  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; }
@@ -8554,15 +8961,15 @@ else
    -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:8557: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8561: \$? = $ac_status" >&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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $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
@@ -8591,8 +8998,6 @@ fi
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $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 test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -8640,6 +9045,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       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
@@ -8682,6 +9093,15 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       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
@@ -8723,7 +9143,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -8744,7 +9164,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 	lt_prog_compiler_pic='--shared'
 	lt_prog_compiler_static='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      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,'
@@ -8756,25 +9182,40 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      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,'
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
+        *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'
-	  lt_prog_compiler_wl=''
 	  ;;
 	esac
 	;;
@@ -8806,7 +9247,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	lt_prog_compiler_wl='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl='-Wl,';;
@@ -8863,13 +9304,17 @@ case $host_os in
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
 
+{ $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.
@@ -8893,15 +9338,15 @@ else
    -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:8896: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8900: \$? = $ac_status" >&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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $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
@@ -8930,6 +9375,11 @@ fi
 
 
 
+
+
+
+
+
 #
 # Check to make sure the static flag actually works.
 #
@@ -8949,7 +9399,7 @@ else
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $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
@@ -8998,16 +9448,16 @@ else
    -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:9001: $lt_compile\"" >&5)
+   (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:9005: \$? = $ac_status" >&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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $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
@@ -9053,16 +9503,16 @@ else
    -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:9056: $lt_compile\"" >&5)
+   (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:9060: \$? = $ac_status" >&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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $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
@@ -9128,7 +9578,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -9175,7 +9624,33 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   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}'
 
@@ -9193,6 +9668,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
     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 ...
@@ -9208,11 +9684,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** 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 modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** 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
@@ -9248,10 +9725,12 @@ _LT_EOF
       # _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/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+      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'
@@ -9269,6 +9748,11 @@ _LT_EOF
       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
@@ -9284,7 +9768,7 @@ _LT_EOF
       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)
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test "$host_os" = linux-dietlibc; then
 	case $cc_basename in
@@ -9294,15 +9778,16 @@ _LT_EOF
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=
+	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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  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*)	# 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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	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' ;;
@@ -9313,13 +9798,17 @@ _LT_EOF
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
-	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  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
@@ -9335,17 +9824,16 @@ _LT_EOF
         fi
 
 	case $cc_basename in
-	xlf*)
+	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=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  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 $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -9359,8 +9847,8 @@ _LT_EOF
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	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'
+	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
       ;;
 
@@ -9378,8 +9866,8 @@ _LT_EOF
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	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'
+	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
@@ -9425,8 +9913,8 @@ _LT_EOF
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	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'
+	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
@@ -9466,8 +9954,10 @@ _LT_EOF
       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")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  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
@@ -9554,7 +10044,13 @@ _LT_EOF
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        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
@@ -9567,25 +10063,32 @@ main ()
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-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 "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  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 "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  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 $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        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'
@@ -9594,7 +10097,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 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
@@ -9607,30 +10116,42 @@ main ()
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-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 "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  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 "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  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'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
+	  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'
@@ -9662,20 +10183,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      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 `$ECHO "X$deplibs" | $Xsed -e '\''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'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
+      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*)
@@ -9685,7 +10250,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  whole_archive_flag_spec=''
+  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
@@ -9693,7 +10263,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
+    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}"
@@ -9711,10 +10281,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=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
@@ -9727,7 +10293,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -9736,7 +10302,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      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
@@ -9744,7 +10310,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	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
@@ -9759,14 +10325,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      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_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -9778,16 +10343,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      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 -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -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
@@ -9799,7 +10364,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -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
@@ -9827,26 +10431,39 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	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.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	# 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) {}
+int foo (void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
+  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"
+           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" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	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'
@@ -9908,17 +10525,17 @@ rm -f core conftest.err conftest.$ac_objext \
       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'
+      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" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	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" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	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'
@@ -9928,13 +10545,13 @@ rm -f core conftest.err conftest.$ac_objext \
     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} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	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" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	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 "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $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'
@@ -9947,9 +10564,9 @@ rm -f core conftest.err conftest.$ac_objext \
       no_undefined_flag=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	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 ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $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"*)
@@ -10137,44 +10754,50 @@ x|xyes)
       # 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; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+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
+	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
+	  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
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+	  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
@@ -10326,11 +10949,6 @@ esac
 
 
 
-
-
-
-
-
 
 
 
@@ -10345,16 +10963,23 @@ if test "$GCC" = yes; then
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  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 -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
+    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=
@@ -10367,7 +10992,7 @@ if test "$GCC" = yes; then
 	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 '
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -10387,7 +11012,13 @@ BEGIN {RS=" "; FS="/|\n";} {
   if (lt_foo != "") { lt_freq[lt_foo]++; }
   if (lt_freq[lt_foo] == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+  # 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
@@ -10413,7 +11044,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  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
 
@@ -10422,7 +11053,7 @@ aix3*)
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -10475,7 +11106,7 @@ amigaos*)
   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=`$ECHO "X$lib" | $Xsed -e '\''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'
+    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
   ;;
@@ -10487,7 +11118,7 @@ beos*)
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  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'
@@ -10506,8 +11137,9 @@ cygwin* | mingw* | pw32* | cegcc*)
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  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}`~
@@ -10528,36 +11160,83 @@ cygwin* | mingw* | pw32* | cegcc*)
     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="/usr/lib /lib/w32api /lib /usr/local/lib"
+
+      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}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        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
       ;;
     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
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -10578,7 +11257,7 @@ darwin* | rhapsody*)
   ;;
 
 dgux*)
-  version_type=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'
@@ -10586,10 +11265,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -10597,7 +11272,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -10615,7 +11290,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10635,12 +11310,26 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=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}'
   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
   ;;
 
@@ -10686,12 +11375,14 @@ hpux9* | hpux10* | hpux11*)
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # 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
+  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}'
@@ -10707,7 +11398,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -10744,9 +11435,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu)
-  version_type=linux
+# 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}'
@@ -10754,12 +11445,17 @@ linux* | k*bsd*-gnu)
   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
-  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
+  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
@@ -10772,13 +11468,17 @@ main ()
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
+  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
+    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
@@ -10787,7 +11487,7 @@ rm -f core conftest.err conftest.$ac_objext \
 
   # 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;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -10819,7 +11519,7 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  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
@@ -10888,7 +11588,7 @@ rdos*)
   ;;
 
 solaris*)
-  version_type=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}'
@@ -10913,7 +11613,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  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
@@ -10937,7 +11637,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    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
@@ -10968,7 +11668,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=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}'
@@ -10978,7 +11678,7 @@ tpf*)
   ;;
 
 uts4*)
-  version_type=linux
+  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
@@ -11084,6 +11784,11 @@ fi
 
 
 
+
+
+
+
+
 
 
 
@@ -11420,7 +12125,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11423 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11461,7 +12166,13 @@ else
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* 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);
@@ -11470,7 +12181,11 @@ int main ()
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -11516,7 +12231,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11519 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11557,7 +12272,13 @@ else
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* 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);
@@ -11566,7 +12287,11 @@ int main ()
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -11735,6 +12460,8 @@ CC="$lt_save_CC"
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -11744,6 +12471,91 @@ CC="$lt_save_CC"
 
 
 
+
+  CFLAG_VISIBILITY=
+  HAVE_VISIBILITY=0
+  if test -n "$GCC"; then
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5
+$as_echo_n "checking whether the -Werror option is usable... " >&6; }
+    if ${gl_cv_cc_vis_werror+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      gl_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -Werror"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_cc_vis_werror=yes
+else
+  gl_cv_cc_vis_werror=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+      CFLAGS="$gl_save_CFLAGS"
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5
+$as_echo "$gl_cv_cc_vis_werror" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5
+$as_echo_n "checking for simple visibility declarations... " >&6; }
+    if ${gl_cv_cc_visibility+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      gl_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS -fvisibility=hidden"
+                                    if test $gl_cv_cc_vis_werror = yes; then
+        CFLAGS="$CFLAGS -Werror"
+      fi
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+             extern __attribute__((__visibility__("default"))) int exportedvar;
+             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+             void dummyfunc (void) {}
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  gl_cv_cc_visibility=yes
+else
+  gl_cv_cc_visibility=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+      CFLAGS="$gl_save_CFLAGS"
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5
+$as_echo "$gl_cv_cc_visibility" >&6; }
+    if test $gl_cv_cc_visibility = yes; then
+      CFLAG_VISIBILITY="-fvisibility=hidden"
+      HAVE_VISIBILITY=1
+    fi
+  fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_VISIBILITY $HAVE_VISIBILITY
+_ACEOF
+
+
 { $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 :
@@ -11960,7 +12772,7 @@ fi
 
 done
 
-for ac_header in utime.h wchar.h wctype.h limits.h
+for ac_header in stddef.h utime.h wchar.h wctype.h limits.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -12023,11 +12835,11 @@ else
 int
 main ()
 {
-/* FIXME: Include the comments suggested by Paul. */
+
 #ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
+  /* Ultrix mips cc rejects this sort of thing.  */
   typedef int charset[2];
-  const charset cs;
+  const charset cs = { 0, 0 };
   /* SunOS 4.1.1 cc rejects this.  */
   char const *const *pcpcc;
   char **ppc;
@@ -12044,8 +12856,9 @@ main ()
   ++pcpcc;
   ppc = (char**) pcpcc;
   pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
+  { /* SCO 3.2v4 cc rejects this sort of thing.  */
+    char tx;
+    char *t = &tx;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
@@ -12061,10 +12874,10 @@ main ()
     iptr p = 0;
     ++p;
   }
-  { /* AIX XL C 1.02.0.0 rejects this saying
+  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
+    struct s { int j; const int *ap[3]; } bx;
+    struct s *b = &bx; b->j = 5;
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
@@ -12125,6 +12938,16 @@ _ACEOF
 fi
 
 
+ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "$ac_includes_default"
+if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_TM_TM_GMTOFF 1
+_ACEOF
+
+
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
 if ${ac_cv_struct_tm+:} false; then :
@@ -12160,16 +12983,10 @@ $as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
 
 fi
 
-ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "$ac_includes_default"
-if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then :
+ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
+#include <$ac_cv_struct_tm>
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_STRUCT_TM_TM_GMTOFF 1
-_ACEOF
-
-
-fi
-ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "$ac_includes_default"
+"
 if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
@@ -12179,6 +12996,60 @@ _ACEOF
 
 fi
 
+if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
+
+$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
+
+else
+  ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_tzname" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_TZNAME $ac_have_decl
+_ACEOF
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
+$as_echo_n "checking for tzname... " >&6; }
+if ${ac_cv_var_tzname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <time.h>
+#if !HAVE_DECL_TZNAME
+extern char *tzname[];
+#endif
+
+int
+main ()
+{
+return tzname[0][0];
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_var_tzname=yes
+else
+  ac_cv_var_tzname=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
+$as_echo "$ac_cv_var_tzname" >&6; }
+  if test $ac_cv_var_tzname = yes; then
+
+$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
+
+  fi
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_zone in struct tm" >&5
 $as_echo_n "checking for tm_zone in struct tm... " >&6; }
 if ${ac_cv_struct_tm_zone+:} false; then :
@@ -12536,6 +13407,8 @@ _ACEOF
 esac
 rm -rf conftest*
   fi
+
+
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
@@ -12673,104 +13546,616 @@ $as_echo "#define HAVE_STRUCT_OPTION 1" >>confdefs.h
 
 fi
 
-
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
 if test "x$ac_cv_type_pid_t" = xyes; then :
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_PID_T 1
-_ACEOF
-
-
-fi
-ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "$ac_includes_default"
-if test "x$ac_cv_type_uint8_t" = xyes; then :
+else
 
 cat >>confdefs.h <<_ACEOF
-#define HAVE_UINT8_T 1
+#define pid_t int
 _ACEOF
 
-
-fi
-ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "$ac_includes_default"
-if test "x$ac_cv_type_uint16_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UINT16_T 1
-_ACEOF
-
-
-fi
-ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default"
-if test "x$ac_cv_type_uint32_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UINT32_T 1
-_ACEOF
-
-
-fi
-ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
-if test "x$ac_cv_type_int32_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INT32_T 1
-_ACEOF
-
-
-fi
-ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "$ac_includes_default"
-if test "x$ac_cv_type_uint64_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_UINT64_T 1
-_ACEOF
-
-
-fi
-ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "$ac_includes_default"
-if test "x$ac_cv_type_int64_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INT64_T 1
-_ACEOF
-
-
 fi
 
-# The cast to long int works around a bug in the HP C Compiler
-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-# This bug is HP SR number 8606223364.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
-$as_echo_n "checking size of long long... " >&6; }
-if ${ac_cv_sizeof_long_long+:} false; then :
+ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t"
+case $ac_cv_c_uint8_t in #(
+  no|yes) ;; #(
+  *)
+
+$as_echo "#define _UINT8_T 1" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define uint8_t $ac_cv_c_uint8_t
+_ACEOF
+;;
+  esac
+
+ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t"
+case $ac_cv_c_uint16_t in #(
+  no|yes) ;; #(
+  *)
+
+
+cat >>confdefs.h <<_ACEOF
+#define uint16_t $ac_cv_c_uint16_t
+_ACEOF
+;;
+  esac
+
+ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
+case $ac_cv_c_uint32_t in #(
+  no|yes) ;; #(
+  *)
+
+$as_echo "#define _UINT32_T 1" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define uint32_t $ac_cv_c_uint32_t
+_ACEOF
+;;
+  esac
+
+ac_fn_c_find_intX_t "$LINENO" "32" "ac_cv_c_int32_t"
+case $ac_cv_c_int32_t in #(
+  no|yes) ;; #(
+  *)
+
+cat >>confdefs.h <<_ACEOF
+#define int32_t $ac_cv_c_int32_t
+_ACEOF
+;;
+esac
+
+ac_fn_c_find_uintX_t "$LINENO" "64" "ac_cv_c_uint64_t"
+case $ac_cv_c_uint64_t in #(
+  no|yes) ;; #(
+  *)
+
+$as_echo "#define _UINT64_T 1" >>confdefs.h
+
+
+cat >>confdefs.h <<_ACEOF
+#define uint64_t $ac_cv_c_uint64_t
+_ACEOF
+;;
+  esac
+
+ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t"
+case $ac_cv_c_int64_t in #(
+  no|yes) ;; #(
+  *)
+
+cat >>confdefs.h <<_ACEOF
+#define int64_t $ac_cv_c_int64_t
+_ACEOF
+;;
+esac
+
+
+  ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_intptr_t" = xyes; then :
+
+$as_echo "#define HAVE_INTPTR_T 1" >>confdefs.h
+
+else
+  for ac_type in 'int' 'long int' 'long long int'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define intptr_t $ac_type
+_ACEOF
+
+	  ac_type=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       test -z "$ac_type" && break
+     done
+fi
+
+
+
+  ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_uintptr_t" = xyes; then :
+
+$as_echo "#define HAVE_UINTPTR_T 1" >>confdefs.h
+
+else
+  for ac_type in 'unsigned int' 'unsigned long int' \
+	'unsigned long long int'; do
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];
+test_array [0] = 0;
+return test_array [0];
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define uintptr_t $ac_type
+_ACEOF
+
+	  ac_type=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       test -z "$ac_type" && break
+     done
+fi
+
+
+
+
+
+  for ac_header in $ac_header_list
+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_func in getpagesize
+do :
+  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPAGESIZE 1
+_ACEOF
+
+fi
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+$as_echo_n "checking for working mmap... " >&6; }
+if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
-
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_mmap_fixed_mapped=no
 else
-  if test "$ac_cv_type_long_long" = 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 77 "cannot compute sizeof (long long)
-See \`config.log' for more details" "$LINENO" 5; }
-   else
-     ac_cv_sizeof_long_long=0
-   fi
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+/* malloc might have been renamed as rpl_malloc. */
+#undef malloc
+
+/* Thanks to Mike Haertel and Jim Avera for this test.
+   Here is a matrix of mmap possibilities:
+	mmap private not fixed
+	mmap private fixed at somewhere currently unmapped
+	mmap private fixed at somewhere already mapped
+	mmap shared not fixed
+	mmap shared fixed at somewhere currently unmapped
+	mmap shared fixed at somewhere already mapped
+   For private mappings, we should verify that changes cannot be read()
+   back from the file, nor mmap's back from the file at a different
+   address.  (There have been systems where private was not correctly
+   implemented like the infamous i386 svr4.0, and systems where the
+   VM page cache was not coherent with the file system buffer cache
+   like early versions of FreeBSD and possibly contemporary NetBSD.)
+   For shared mappings, we should conversely verify that changes get
+   propagated back to all the places they're supposed to be.
+
+   Grep wants private fixed already mapped.
+   The main things grep needs to know about mmap are:
+   * does it exist and is it safe to write into the mmap'd area
+   * how to use it (BSD variants)  */
+
+#include <fcntl.h>
+#include <sys/mman.h>
+
+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+char *malloc ();
+#endif
+
+/* This mess was copied from the GNU getpagesize.h.  */
+#ifndef HAVE_GETPAGESIZE
+# ifdef _SC_PAGESIZE
+#  define getpagesize() sysconf(_SC_PAGESIZE)
+# else /* no _SC_PAGESIZE */
+#  ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#   ifdef EXEC_PAGESIZE
+#    define getpagesize() EXEC_PAGESIZE
+#   else /* no EXEC_PAGESIZE */
+#    ifdef NBPG
+#     define getpagesize() NBPG * CLSIZE
+#     ifndef CLSIZE
+#      define CLSIZE 1
+#     endif /* no CLSIZE */
+#    else /* no NBPG */
+#     ifdef NBPC
+#      define getpagesize() NBPC
+#     else /* no NBPC */
+#      ifdef PAGESIZE
+#       define getpagesize() PAGESIZE
+#      endif /* PAGESIZE */
+#     endif /* no NBPC */
+#    endif /* no NBPG */
+#   endif /* no EXEC_PAGESIZE */
+#  else /* no HAVE_SYS_PARAM_H */
+#   define getpagesize() 8192	/* punt totally */
+#  endif /* no HAVE_SYS_PARAM_H */
+# endif /* no _SC_PAGESIZE */
+
+#endif /* no HAVE_GETPAGESIZE */
+
+int
+main ()
+{
+  char *data, *data2, *data3;
+  const char *cdata2;
+  int i, pagesize;
+  int fd, fd2;
+
+  pagesize = getpagesize ();
+
+  /* First, make a file with some known garbage in it. */
+  data = (char *) malloc (pagesize);
+  if (!data)
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    *(data + i) = rand ();
+  umask (0);
+  fd = creat ("conftest.mmap", 0600);
+  if (fd < 0)
+    return 2;
+  if (write (fd, data, pagesize) != pagesize)
+    return 3;
+  close (fd);
+
+  /* Next, check that the tail of a page is zero-filled.  File must have
+     non-zero length, otherwise we risk SIGBUS for entire page.  */
+  fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
+  if (fd2 < 0)
+    return 4;
+  cdata2 = "";
+  if (write (fd2, cdata2, 1) != 1)
+    return 5;
+  data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+  if (data2 == MAP_FAILED)
+    return 6;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data2 + i))
+      return 7;
+  close (fd2);
+  if (munmap (data2, pagesize))
+    return 8;
+
+  /* Next, try to mmap the file at a fixed address which already has
+     something else allocated at it.  If we can, also make sure that
+     we see the same garbage.  */
+  fd = open ("conftest.mmap", O_RDWR);
+  if (fd < 0)
+    return 9;
+  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
+    return 10;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data2 + i))
+      return 11;
+
+  /* Finally, make sure that changes to the mapped area do not
+     percolate back to the file as seen by read().  (This is a bug on
+     some variants of i386 svr4.0.)  */
+  for (i = 0; i < pagesize; ++i)
+    *(data2 + i) = *(data2 + i) + 1;
+  data3 = (char *) malloc (pagesize);
+  if (!data3)
+    return 12;
+  if (read (fd, data3, pagesize) != pagesize)
+    return 13;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data3 + i))
+      return 14;
+  close (fd);
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_mmap_fixed_mapped=yes
+else
+  ac_cv_func_mmap_fixed_mapped=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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-$as_echo "$ac_cv_sizeof_long_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
+if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
 
+fi
+rm -f conftest.mmap conftest.txt
 
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+for ac_header in vfork.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
+if test "x$ac_cv_header_vfork_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VFORK_H 1
 _ACEOF
 
+fi
 
+done
+
+for ac_func in fork vfork
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+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
+
+if test "x$ac_cv_func_fork" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
+$as_echo_n "checking for working fork... " >&6; }
+if ${ac_cv_func_fork_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_fork_works=cross
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	  /* By Ruediger Kuhlmann. */
+	  return fork () < 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_fork_works=yes
+else
+  ac_cv_func_fork_works=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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
+$as_echo "$ac_cv_func_fork_works" >&6; }
+
+else
+  ac_cv_func_fork_works=$ac_cv_func_fork
+fi
+if test "x$ac_cv_func_fork_works" = xcross; then
+  case $host in
+    *-*-amigaos* | *-*-msdosdjgpp*)
+      # Override, as these systems have only a dummy fork() stub
+      ac_cv_func_fork_works=no
+      ;;
+    *)
+      ac_cv_func_fork_works=yes
+      ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
+fi
+ac_cv_func_vfork_works=$ac_cv_func_vfork
+if test "x$ac_cv_func_vfork" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
+$as_echo_n "checking for working vfork... " >&6; }
+if ${ac_cv_func_vfork_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_vfork_works=cross
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Thanks to Paul Eggert for this test.  */
+$ac_includes_default
+#include <sys/wait.h>
+#ifdef HAVE_VFORK_H
+# include <vfork.h>
+#endif
+/* On some sparc systems, changes by the child to local and incoming
+   argument registers are propagated back to the parent.  The compiler
+   is told about this with #include <vfork.h>, but some compilers
+   (e.g. gcc -O) don't grok <vfork.h>.  Test for this by using a
+   static variable whose address is put into a register that is
+   clobbered by the vfork.  */
+static void
+#ifdef __cplusplus
+sparc_address_test (int arg)
+# else
+sparc_address_test (arg) int arg;
+#endif
+{
+  static pid_t child;
+  if (!child) {
+    child = vfork ();
+    if (child < 0) {
+      perror ("vfork");
+      _exit(2);
+    }
+    if (!child) {
+      arg = getpid();
+      write(-1, "", 0);
+      _exit (arg);
+    }
+  }
+}
+
+int
+main ()
+{
+  pid_t parent = getpid ();
+  pid_t child;
+
+  sparc_address_test (0);
+
+  child = vfork ();
+
+  if (child == 0) {
+    /* Here is another test for sparc vfork register problems.  This
+       test uses lots of local variables, at least as many local
+       variables as main has allocated so far including compiler
+       temporaries.  4 locals are enough for gcc 1.40.3 on a Solaris
+       4.1.3 sparc, but we use 8 to be safe.  A buggy compiler should
+       reuse the register of parent for one of the local variables,
+       since it will think that parent can't possibly be used any more
+       in this routine.  Assigning to the local variable will thus
+       munge parent in the parent process.  */
+    pid_t
+      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
+      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
+    /* Convince the compiler that p..p7 are live; otherwise, it might
+       use the same hardware register for all 8 local variables.  */
+    if (p != p1 || p != p2 || p != p3 || p != p4
+	|| p != p5 || p != p6 || p != p7)
+      _exit(1);
+
+    /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
+       from child file descriptors.  If the child closes a descriptor
+       before it execs or exits, this munges the parent's descriptor
+       as well.  Test for this by closing stdout in the child.  */
+    _exit(close(fileno(stdout)) != 0);
+  } else {
+    int status;
+    struct stat st;
+
+    while (wait(&status) != child)
+      ;
+    return (
+	 /* Was there some problem with vforking?  */
+	 child < 0
+
+	 /* Did the child fail?  (This shouldn't happen.)  */
+	 || status
+
+	 /* Did the vfork/compiler bug occur?  */
+	 || parent != getpid()
+
+	 /* Did the file descriptor bug occur?  */
+	 || fstat(fileno(stdout), &st) != 0
+	 );
+  }
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_vfork_works=yes
+else
+  ac_cv_func_vfork_works=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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
+$as_echo "$ac_cv_func_vfork_works" >&6; }
+
+fi;
+if test "x$ac_cv_func_fork_works" = xcross; then
+  ac_cv_func_vfork_works=$ac_cv_func_vfork
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
+fi
+
+if test "x$ac_cv_func_vfork_works" = xyes; then
+
+$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h
+
+else
+
+$as_echo "#define vfork fork" >>confdefs.h
+
+fi
+if test "x$ac_cv_func_fork_works" = xyes; then
+
+$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
+
+fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mbrtowc and mbstate_t are properly declared" >&5
+$as_echo_n "checking whether mbrtowc and mbstate_t are properly declared... " >&6; }
+if ${ac_cv_func_mbrtowc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <wchar.h>
+int
+main ()
+{
+wchar_t wc;
+	      char const s[] = "";
+	      size_t n = 1;
+	      mbstate_t state;
+	      return ! (sizeof state && (mbrtowc) (&wc, s, n, &state));
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_func_mbrtowc=yes
+else
+  ac_cv_func_mbrtowc=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mbrtowc" >&5
+$as_echo "$ac_cv_func_mbrtowc" >&6; }
+  if test $ac_cv_func_mbrtowc = yes; then
+
+$as_echo "#define HAVE_MBRTOWC 1" >>confdefs.h
+
+  fi
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc compiler warnings" >&5
@@ -12806,7 +14191,7 @@ fi
 fi
 
 
-for ac_func in mmap strerror strndup strtoul mbrtowc mkstemp utimes utime wcwidth strtof fork
+for ac_func in strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -12897,6 +14282,71 @@ esac
 
 fi
 
+ac_fn_c_check_func "$LINENO" "ctime_r" "ac_cv_func_ctime_r"
+if test "x$ac_cv_func_ctime_r" = xyes; then :
+  $as_echo "#define HAVE_CTIME_R 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" ctime_r.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS ctime_r.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "asctime_r" "ac_cv_func_asctime_r"
+if test "x$ac_cv_func_asctime_r" = xyes; then :
+  $as_echo "#define HAVE_ASCTIME_R 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" asctime_r.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS asctime_r.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread"
+if test "x$ac_cv_func_pread" = xyes; then :
+  $as_echo "#define HAVE_PREAD 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" pread.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS pread.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "strcasestr" "ac_cv_func_strcasestr"
+if test "x$ac_cv_func_strcasestr" = xyes; then :
+  $as_echo "#define HAVE_STRCASESTR 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" strcasestr.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strcasestr.$ac_objext"
+ ;;
+esac
+
+fi
+
+ac_fn_c_check_func "$LINENO" "fmtcheck" "ac_cv_func_fmtcheck"
+if test "x$ac_cv_func_fmtcheck" = xyes; then :
+  $as_echo "#define HAVE_FMTCHECK 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" fmtcheck.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS fmtcheck.$ac_objext"
+ ;;
+esac
+
+fi
+
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
@@ -13114,6 +14564,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -13138,10 +14596,7 @@ 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__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 "${IS_CROSS_COMPILE_TRUE}" && test -z "${IS_CROSS_COMPILE_FALSE}"; then
   as_fn_error $? "conditional \"IS_CROSS_COMPILE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -13444,16 +14899,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... 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'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -13513,28 +14968,16 @@ else
   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
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # 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'"
@@ -13555,8 +14998,8 @@ 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 file $as_me 5.11, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by file $as_me 5.19, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -13621,11 +15064,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-file config.status 5.11
-configured by $0, generated by GNU Autoconf 2.68,
+file config.status 5.19
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -13716,7 +15159,7 @@ 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
+  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'
@@ -13750,131 +15193,154 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $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_shared='`$ECHO "$enable_shared" | $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"`'
 
 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 SED \
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
 GREP \
 EGREP \
 FGREP \
@@ -13887,8 +15353,13 @@ 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 \
@@ -13898,14 +15369,14 @@ 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 \
-SHELL \
-ECHO \
+nm_file_list_spec \
 lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
 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 \
@@ -13919,9 +15390,7 @@ with_gnu_ld \
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
-fix_srcfile_path \
 exclude_expsyms \
 include_expsyms \
 file_list_spec \
@@ -13929,12 +15398,13 @@ variables_saved_for_relink \
 libname_spec \
 library_names_spec \
 soname_spec \
+install_override_mode \
 finish_eval \
 old_striplib \
 striplib; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -13956,14 +15426,15 @@ 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; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -13971,12 +15442,6 @@ sys_lib_dlsearch_path_spec; do
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-  ;;
-esac
-
 ac_aux_dir='$ac_aux_dir'
 xsi_shell='$xsi_shell'
 lt_shell_append='$lt_shell_append'
@@ -14610,7 +16075,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf 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
@@ -14623,7 +16088,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     # 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
+    # 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.
@@ -14657,21 +16122,19 @@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # 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
+    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
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -14725,7 +16188,8 @@ $as_echo X"$file" |
 # 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 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -14761,18 +16225,27 @@ available_tags=""
 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 build shared libraries.
+build_libtool_libs=$enable_shared
+
 # 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
@@ -14822,9 +16295,11 @@ SP2NL=$lt_lt_SP2NL
 # turn newlines into spaces.
 NL2SP=$lt_lt_NL2SP
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+# 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
@@ -14832,13 +16307,30 @@ 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".
+# 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
 
@@ -14847,6 +16339,9 @@ 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
 
@@ -14865,21 +16360,24 @@ 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
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
-
 # 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
 
@@ -14936,6 +16434,9 @@ 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
 
@@ -14975,6 +16476,10 @@ 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
 
@@ -14987,12 +16492,12 @@ with_gcc=$GCC
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
 # 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
 
@@ -15042,10 +16547,6 @@ no_undefined_flag=$lt_no_undefined_flag
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -15079,9 +16580,6 @@ inherit_rpath=$inherit_rpath
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols
 
@@ -15097,6 +16595,9 @@ 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
 
@@ -15129,212 +16630,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
   # 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
-  case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# 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 ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# 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 ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# 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_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}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# 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 ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -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 file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
+  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=:
 
 
-# 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 "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1+=\$2"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1=\$$1\$2"
-}
-
-_LT_EOF
-    ;;
-  esac
+  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 -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
+  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=:
 
-  mv -f "$cfgfile" "$ofile" ||
+
+  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"
 
diff --git a/contrib/file/configure.ac b/contrib/file/configure.ac
index 1511c9ac33cb..3d55c38c22dd 100644
--- a/contrib/file/configure.ac
+++ b/contrib/file/configure.ac
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(file, 5.11, christos@astron.com)
-AM_INIT_AUTOMAKE()
+AC_INIT([file],[5.19],[christos@astron.com])
+AM_INIT_AUTOMAKE([subdir-objects foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_MSG_CHECKING(for builtin ELF support)
@@ -66,21 +66,22 @@ AC_SUBST(fsect)
 AM_CONDITIONAL(FSECT5, test x$fsect = x5)
 
 AC_SUBST(WARNINGS)
-AC_GNU_SOURCE
 
 dnl Checks for programs.
-AC_PROG_CC
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
 AM_PROG_CC_C_O
+AC_C_BIGENDIAN
 AC_PROG_INSTALL
 AC_PROG_LN_S
-AC_PROG_LIBTOOL
-
+LT_INIT([disable-static pic-only])
+gl_VISIBILITY
 dnl Checks for headers
 AC_HEADER_STDC
 AC_HEADER_MAJOR
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(stdint.h fcntl.h locale.h stdint.h inttypes.h unistd.h)
-AC_CHECK_HEADERS(utime.h wchar.h wctype.h limits.h)
+AC_CHECK_HEADERS(stddef.h utime.h wchar.h wctype.h limits.h)
 AC_CHECK_HEADERS(getopt.h err.h)
 AC_CHECK_HEADERS(sys/mman.h sys/stat.h sys/types.h sys/utime.h sys/time.h)
 AC_CHECK_HEADERS(zlib.h)
@@ -91,45 +92,26 @@ AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
 AC_CHECK_MEMBERS([struct stat.st_rdev])
 
-AC_STRUCT_TM
-AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.tm_zone])
+AC_CHECK_MEMBERS([struct tm.tm_gmtoff])
+AC_STRUCT_TIMEZONE
 AC_STRUCT_TIMEZONE_DAYLIGHT
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 AC_TYPE_MBSTATE_T
 
 AC_STRUCT_OPTION_GETOPT_H
-
-AC_CHECK_TYPES([pid_t, uint8_t, uint16_t, uint32_t, int32_t, uint64_t, int64_t])
-AC_CHECK_SIZEOF(long long)
-AH_BOTTOM([
-#ifndef HAVE_UINT8_T
-typedef unsigned char uint8_t;
-#endif
-#ifndef HAVE_UINT16_T
-typedef unsigned short uint16_t;
-#endif
-#ifndef HAVE_UINT32_T
-typedef unsigned int uint32_t;
-#endif
-#ifndef HAVE_INT32_T
-typedef int int32_t;
-#endif
-#ifndef HAVE_UINT64_T
-#if SIZEOF_LONG_LONG == 8
-typedef unsigned long long uint64_t;
-#else
-typedef unsigned long uint64_t;
-#endif
-#endif
-#ifndef HAVE_INT64_T
-#if SIZEOF_LONG_LONG == 8
-typedef long long int64_t;
-#else
-typedef long int64_t;
-#endif
-#endif
-])
+AC_TYPE_PID_T
+AC_TYPE_UINT8_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_INT32_T
+AC_TYPE_UINT64_T
+AC_TYPE_INT64_T
+AC_TYPE_INTPTR_T
+AC_TYPE_UINTPTR_T
+AC_FUNC_MMAP
+AC_FUNC_FORK
+AC_FUNC_MBRTOWC
 
 AC_MSG_CHECKING(for gcc compiler warnings)
 AC_ARG_ENABLE(warnings,
@@ -156,10 +138,10 @@ else
 fi])
 
 dnl Checks for functions
-AC_CHECK_FUNCS(mmap strerror strndup strtoul mbrtowc mkstemp utimes utime wcwidth strtof fork)
+AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof)
 
 dnl Provide implementation of some required functions if necessary
-AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline)
+AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline ctime_r asctime_r pread strcasestr fmtcheck)
 
 dnl Checks for libraries
 AC_CHECK_LIB(z,gzopen)
diff --git a/contrib/file/depcomp b/contrib/file/depcomp
new file mode 100755
index 000000000000..4ebd5b3a2f2d
--- /dev/null
+++ b/contrib/file/depcomp
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2013-05-30.07; # UTC
+
+# Copyright (C) 1999-2013 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
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+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"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# 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
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+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 -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## 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).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - 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 -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # 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.
+## 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.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | 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 -ne 0; then
+    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 ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # 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
+  ;;
+
+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.
+  set_dir_from "$object"
+  set_base_from "$object"
+  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 -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    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.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  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 -ne 0; then
+     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,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_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.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool 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$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+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 -ne 0; then
+    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/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  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|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | 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"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | 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::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$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/file/doc/Makefile.am b/contrib/file/doc/Makefile.am
new file mode 100644
index 000000000000..4a78589cede5
--- /dev/null
+++ b/contrib/file/doc/Makefile.am
@@ -0,0 +1,32 @@
+MAGIC	 = $(pkgdatadir)/magic
+if FSECT5
+man_MAGIC = magic.5
+else
+man_MAGIC = magic.4
+endif
+fsect = @fsect@
+man_MANS = file.1 $(man_MAGIC) libmagic.3
+
+EXTRA_DIST = file.man magic.man libmagic.man
+CLEANFILES = $(man_MANS)
+
+file.1:	Makefile file.man
+	@rm -f $@
+	sed -e s@__CSECTION__@1@g \
+	    -e s@__FSECTION__@${fsect}@g \
+	    -e s@__VERSION__@${VERSION}@g \
+	    -e s@__MAGIC__@${MAGIC}@g $(srcdir)/file.man > $@
+
+magic.${fsect}: Makefile magic.man
+	@rm -f $@
+	sed -e s@__CSECTION__@1@g \
+	    -e s@__FSECTION__@${fsect}@g \
+	    -e s@__VERSION__@${VERSION}@g \
+	    -e s@__MAGIC__@${MAGIC}@g $(srcdir)/magic.man > $@
+
+libmagic.3: Makefile libmagic.man
+	@rm -f $@
+	sed -e s@__CSECTION__@1@g \
+	    -e s@__FSECTION__@${fsect}@g \
+	    -e s@__VERSION__@${VERSION}@g \
+	    -e s@__MAGIC__@${MAGIC}@g $(srcdir)/libmagic.man > $@
diff --git a/contrib/file/doc/Makefile.in b/contrib/file/doc/Makefile.in
new file mode 100644
index 000000000000..8d0fa7b8df61
--- /dev/null
+++ b/contrib/file/doc/Makefile.in
@@ -0,0 +1,669 @@
+# Makefile.in generated by automake 1.14 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 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@
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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@
+subdir = doc
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+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; }; \
+  }
+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" \
+	"$(DESTDIR)$(man4dir)" "$(DESTDIR)$(man5dir)"
+man3dir = $(mandir)/man3
+man4dir = $(mandir)/man4
+man5dir = $(mandir)/man5
+NROFF = nroff
+MANS = $(man_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MINGW = @MINGW@
+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@
+WARNINGS = @WARNINGS@
+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_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@
+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@
+fsect = @fsect@
+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_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAGIC = $(pkgdatadir)/magic
+@FSECT5_FALSE@man_MAGIC = magic.4
+@FSECT5_TRUE@man_MAGIC = magic.5
+man_MANS = file.1 $(man_MAGIC) libmagic.3
+EXTRA_DIST = file.man magic.man libmagic.man
+CLEANFILES = $(man_MANS)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign doc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-man1: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
+	} | 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='$(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: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man3dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.3[a-z]*$$/p'; \
+	fi; \
+	} | 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='$(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: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man4dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man4dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man4dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.4[a-z]*$$/p'; \
+	fi; \
+	} | 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='$(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: $(man_MANS)
+	@$(NORMAL_INSTALL)
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man5dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.5[a-z]*$$/p'; \
+	fi; \
+	} | 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='$(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)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@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
+check-am: all-am
+check: check-am
+all-am: Makefile $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" "$(DESTDIR)$(man5dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: 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)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+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-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-man
+
+uninstall-man: uninstall-man1 uninstall-man3 uninstall-man4 \
+	uninstall-man5
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-man3 install-man4 install-man5 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am uninstall-man uninstall-man1 \
+	uninstall-man3 uninstall-man4 uninstall-man5
+
+
+file.1:	Makefile file.man
+	@rm -f $@
+	sed -e s@__CSECTION__@1@g \
+	    -e s@__FSECTION__@${fsect}@g \
+	    -e s@__VERSION__@${VERSION}@g \
+	    -e s@__MAGIC__@${MAGIC}@g $(srcdir)/file.man > $@
+
+magic.${fsect}: Makefile magic.man
+	@rm -f $@
+	sed -e s@__CSECTION__@1@g \
+	    -e s@__FSECTION__@${fsect}@g \
+	    -e s@__VERSION__@${VERSION}@g \
+	    -e s@__MAGIC__@${MAGIC}@g $(srcdir)/magic.man > $@
+
+libmagic.3: Makefile libmagic.man
+	@rm -f $@
+	sed -e s@__CSECTION__@1@g \
+	    -e s@__FSECTION__@${fsect}@g \
+	    -e s@__VERSION__@${VERSION}@g \
+	    -e s@__MAGIC__@${MAGIC}@g $(srcdir)/libmagic.man > $@
+
+# 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/file/file.man b/contrib/file/doc/file.man
similarity index 89%
rename from contrib/file/file.man
rename to contrib/file/doc/file.man
index fff77308976f..361188e13998 100644
--- a/contrib/file/file.man
+++ b/contrib/file/doc/file.man
@@ -1,5 +1,5 @@
-.\" $File: file.man,v 1.98 2011/12/08 12:12:46 rrt Exp $
-.Dd October 17, 2011
+.\" $File: file.man,v 1.106 2014/03/07 23:11:51 christos Exp $
+.Dd January 30, 2014
 .Dt FILE __CSECTION__
 .Os
 .Sh NAME
@@ -8,7 +8,7 @@
 .Sh SYNOPSIS
 .Nm
 .Bk -words
-.Op Fl bchiklLNnprsvz0
+.Op Fl bcEhiklLNnprsvz0
 .Op Fl Fl apple
 .Op Fl Fl mime-encoding
 .Op Fl Fl mime-type
@@ -164,6 +164,10 @@ in any of the character sets listed above is simply said to be
 .Dq data .
 .Sh OPTIONS
 .Bl -tag -width indent
+.It Fl Fl apple
+Causes the file command to output the file type and creator code as
+used by older MacOS versions. The code consists of eight letters,
+the first describing the file type, the latter the creator.
 .It Fl b , Fl Fl brief
 Do not prepend filenames to output lines (brief mode).
 .It Fl C , Fl Fl compile
@@ -175,6 +179,10 @@ Cause a checking printout of the parsed form of the magic file.
 This is usually used in conjunction with the
 .Fl m
 flag to debug a new magic file before installing it.
+.It Fl E
+On filesystem errors (file not found etc), instead of handling the error
+as regular output as POSIX mandates and keep going, issue an error message
+and exit.
 .It Fl e , Fl Fl exclude Ar testname
 Exclude the test named in
 .Ar testname
@@ -259,8 +267,16 @@ prepended.
 (If you want a newline, see the
 .Fl r
 option.)
+The magic pattern with the highest strength (see the
+.Fl l
+option) comes first.
 .It Fl l , Fl Fl list
-Print information about the strength of each magic pattern.
+Shows a list of patterns and their strength sorted descending by
+.Xr magic 4
+strength
+which is used for the matching (see also the
+.Fl k
+option).
 .It Fl L , Fl Fl dereference
 option causes symlinks to be followed, as the like-named option in
 .Xr ls 1
@@ -268,8 +284,6 @@ option causes symlinks to be followed, as the like-named option in
 This is the default if the environment variable
 .Ev POSIXLY_CORRECT
 is defined.
-.It Fl l
-Shows sorted patterns list in the order which is used for the matching.
 .It Fl m , Fl Fl magic-file Ar magicfiles
 Specify an alternate list of files and directories containing magic.
 This can be a single item, or a colon-separated list.
@@ -325,7 +339,7 @@ after the end of the filename.
 Nice to
 .Xr cut 1
 the output.
-This does not affect the separator which is still printed.
+This does not affect the separator, which is still printed.
 .It Fl -help
 Print a help message and exit.
 .El
@@ -547,20 +561,27 @@ returns 0 on success, and non-zero on error.
 Please report bugs and send patches to the bug tracker at
 .Pa http://bugs.gw.com/
 or the mailing list at
-.Aq file@mx.gw.com .
+.Aq file@mx.gw.com
+(visit
+.Pa http://mx.gw.com/mailman/listinfo/file
+first to subscribe).
 .Sh TODO
 .Pp
 Fix output so that tests for MIME and APPLE flags are not needed all
-over the place, and actual output is only done in one place. This
-needs a design. Suggestion: push possible outputs on to a list, then
-pick the last-pushed (most specific, one hopes) value at the end, or
-use a default if the list is empty. This should not slow down evaluation.
+over the place, and actual output is only done in one place.
+This needs a design.
+Suggestion: push possible outputs on to a list, then pick the
+last-pushed (most specific, one hopes) value at the end, or
+use a default if the list is empty.
+This should not slow down evaluation.
 .Pp
-Continue to squash all magic bugs. See Debian BTS for a good source.
+Continue to squash all magic bugs.
+See Debian BTS for a good source.
 .Pp
 Store arbitrarily long strings, for example for %s patterns, so that
-they can be printed out. Fixes Debian bug #271672. Would require more
-complex store/load code in apprentice.
+they can be printed out.
+Fixes Debian bug #271672.
+Would require more complex store/load code in apprentice.
 .Pp
 Add syntax for relative offsets after current level (Debian bug #466037).
 .Pp
@@ -570,6 +591,30 @@ Add a zip library so we can peek inside Office2007 documents to
 figure out what they are.
 .Pp
 Add an option to print URLs for the sources of the file descriptions.
+.Pp
+Combine script searches and add a way to map executable names to MIME
+types (e.g. have a magic value for !:mime which causes the resulting
+string to be looked up in a table).
+This would avoid adding the same magic repeatedly for each new
+hash-bang interpreter.
+.Pp
+Fix
+.Dq name
+and
+.Dq use
+to check for consistency at compile time (duplicate 
+.Dq name ,
+.Dq use
+pointing to undefined
+.Dq name
+).
+Make 
+.Dq name
+/
+.Dq use 
+more efficient by keeping a sorted list of names.
+Special-case ^ to flip endianness in the parser so that it does not
+have to be escaped, and document it.
 .Sh AVAILABILITY
 You can obtain the original author's latest version by anonymous FTP
 on
diff --git a/contrib/file/libmagic.man b/contrib/file/doc/libmagic.man
similarity index 93%
rename from contrib/file/libmagic.man
rename to contrib/file/doc/libmagic.man
index 272b8386a30e..ee9cdb284efd 100644
--- a/contrib/file/libmagic.man
+++ b/contrib/file/doc/libmagic.man
@@ -1,4 +1,4 @@
-.\" $File: libmagic.man,v 1.26 2011/12/19 17:49:31 christos Exp $
+.\" $File: libmagic.man,v 1.28 2014/03/02 14:47:16 christos Exp $
 .\"
 .\" Copyright (c) Christos Zoulas 2003.
 .\" All Rights Reserved.
@@ -25,19 +25,22 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 19, 2011
+.Dd January 6, 2012
 .Dt LIBMAGIC 3
 .Os
 .Sh NAME
 .Nm magic_open ,
 .Nm magic_close ,
 .Nm magic_error ,
+.Nm magic_errno ,
 .Nm magic_descriptor ,
 .Nm magic_buffer ,
 .Nm magic_setflags ,
 .Nm magic_check ,
 .Nm magic_compile ,
-.Nm magic_load
+.Nm magic_list ,
+.Nm magic_load ,
+.Nm magic_version
 .Nd Magic number recognition library
 .Sh LIBRARY
 .Lb libmagic
@@ -67,6 +70,8 @@
 .Fn magic_list "magic_t cookie" "const char *filename"
 .Ft int
 .Fn magic_load "magic_t cookie" "const char *filename"
+.Ft int
+.Fn magic_version "void"
 .Sh DESCRIPTION
 These functions
 operate on the magic database file
@@ -246,6 +251,16 @@ If that variable is not set, the default database file name is __MAGIC__.
 adds
 .Dq .mgc
 to the database filename as appropriate.
+.Pp
+The
+.Fn magic_version
+command returns the version number of this library which is compiled into
+the shared library using the constant
+.Dv MAGIC_VERSION
+from
+.In magic.h .
+This can be used by client programs to verify that the version they compile
+against is the same as the version that they run against.
 .Sh RETURN VALUES
 The function
 .Fn magic_open
@@ -276,6 +291,9 @@ function returns a textual description of the errors of the above
 functions, or
 .Dv NULL
 if there was no error.
+The
+.Fn magic_version
+always returns the version number of the library.
 Finally,
 .Fn magic_setflags
 returns \-1 on systems that don't support
diff --git a/contrib/file/magic.man b/contrib/file/doc/magic.man
similarity index 79%
rename from contrib/file/magic.man
rename to contrib/file/doc/magic.man
index 12045682aa1c..762da481231d 100644
--- a/contrib/file/magic.man
+++ b/contrib/file/doc/magic.man
@@ -1,5 +1,5 @@
-.\" $File: magic.man,v 1.71 2011/12/07 11:58:24 rrt Exp $
-.Dd April 20, 2011
+.\" $File: magic.man,v 1.84 2014/06/03 19:01:34 christos Exp $
+.Dd June 3, 2014
 .Dt MAGIC __FSECTION__
 .Os
 .\" install as magic.4 on USG, magic.5 on V7, Berkeley and Linux systems.
@@ -51,7 +51,7 @@ A 64-bit double precision IEEE floating point number in this machine's native by
 .It Dv string
 A string of bytes.
 The string type specification can be optionally followed
-by /[WwcCtb]*.
+by /[WwcCtbT]*.
 The
 .Dq W
 flag compacts whitespace in the target, which must
@@ -85,8 +85,12 @@ The
 flag forces the test to be done for text files, while the
 .Dq b
 flag forces the test to be done for binary files.
+The
+.Dq T
+flag causes the string to be trimmed, i.e. leading and trailing whitespace
+is deleted before the string is printed.
 .It Dv pstring
-A Pascal-style string where the first byte/short/int is interpreted as the an
+A Pascal-style string where the first byte/short/int is interpreted as the
 unsigned length.
 The length defaults to byte and can be specified as a modifier.
 The following modifiers are supported:
@@ -121,6 +125,8 @@ local time rather than UTC.
 .It Dv qldate
 An eight-byte value interpreted as a UNIX-style date, but interpreted as
 local time rather than UTC.
+.It Dv qwdate
+An eight-byte value interpreted as a Windows-style date.
 .It Dv beid3
 A 32-bit ID3 length in big-endian byte order.
 .It Dv beshort
@@ -147,6 +153,9 @@ than UTC.
 An eight-byte value in big-endian byte order,
 interpreted as a UNIX-style date, but interpreted as local time rather
 than UTC.
+.It Dv beqwdate
+An eight-byte value in big-endian byte order,
+interpreted as a Windows-style date.
 .It Dv bestring16
 A two-byte unicode (UCS16) string in big-endian byte order.
 .It Dv leid3
@@ -175,6 +184,9 @@ than UTC.
 An eight-byte value in little-endian byte order,
 interpreted as a UNIX-style date, but interpreted as local time rather
 than UTC.
+.It Dv leqwdate
+An eight-byte value in little-endian byte order,
+interpreted as a Windows-style date.
 .It Dv lestring16
 A two-byte unicode (UCS16) string in little-endian byte order.
 .It Dv melong
@@ -188,6 +200,27 @@ interpreted as a UNIX-style date, but interpreted as local time rather
 than UTC.
 .It Dv indirect
 Starting at the given offset, consult the magic database again.
+.It Dv name
+Define a
+.Dq named
+magic instance that can be called from another
+.Dv use
+magic entry, like a subroutine call.
+Named instance direct magic offsets are relative to the offset of the
+previous matched entry, but indirect offsets are relative to the beginning
+of the file as usual.
+Named magic entries always match.
+.It Dv use
+Recursively call the named magic starting from the current offset.
+If the name of the referenced begins with a
+.Dv ^
+then the endianness of the magic is switched; if the magic mentioned
+.Dv leshort
+for example,
+it is treated as
+.Dv beshort
+and vice versa.
+This is useful to avoid duplicating the rules for different endianness.
 .It Dv regex
 A regular expression match in extended POSIX regular expression syntax
 (like egrep).
@@ -195,19 +228,25 @@ Regular expressions can take exponential time to process, and their
 performance is hard to predict, so their use is discouraged.
 When used in production environments, their performance
 should be carefully checked.
-The type specification can be optionally followed by
-.Dv /[c][s] .
+The size of the string to search should also be limited by specifying
+.Dv /<length> ,
+to avoid performance issues scanning long files.
+The type specification can also be optionally followed by
+.Dv /[c][s][l] .
 The
 .Dq c
 flag makes the match case insensitive, while the
 .Dq s
 flag update the offset to the start offset of the match, rather than the end.
-The regular expression is tested against line
-.Dv N + 1
-onwards, where
-.Dv N
-is the given offset.
-Line endings are assumed to be in the machine's native format.
+The
+.Dq l
+modifier, changes the limit of length to mean number of lines instead of a
+byte count.
+Lines are delimited by the platforms native line delimiter.
+When a line count is specified, an implicit byte count also computed assuming
+each line is 80 characters long.
+If neither a byte or line count is specified, the search is limited automatically
+to 8KiB.
 .Dv ^
 and
 .Dv $
@@ -216,22 +255,91 @@ not beginning and end of file.
 .It Dv search
 A literal string search starting at the given offset.
 The same modifier flags can be used as for string patterns.
-The modifier flags (if any) must be followed by
-.Dv /number
-the range, that is, the number of positions at which the match will be
+The search expression must contain the range in the form
+.Dv /number,
+that is the number of positions at which the match will be
 attempted, starting from the start offset.
 This is suitable for
 searching larger binary expressions with variable offsets, using
 .Dv \e
 escapes for special characters.
-The offset works as for regex.
+The order of modifier and number is not relevant.
 .It Dv default
 This is intended to be used with the test
 .Em x
-(which is always true) and a message that is to be used if there are
-no other matches.
+(which is always true) and it has no type.
+It matches when no other test at that continuation level has matched before.
+Clearing that matched tests for a continuation level, can be done using the
+.Dv clear
+test.
+.It Dv clear
+This test is always true and clears the match flag for that continuation level.
+It is intended to be used with the
+.Dv default
+test.
 .El
 .Pp
+For compatibility with the Single
+.Ux
+Standard, the type specifiers
+.Dv dC
+and
+.Dv d1
+are equivalent to
+.Dv byte ,
+the type specifiers
+.Dv uC
+and
+.Dv u1
+are equivalent to
+.Dv ubyte ,
+the type specifiers
+.Dv dS
+and
+.Dv d2
+are equivalent to
+.Dv short ,
+the type specifiers
+.Dv uS
+and
+.Dv u2
+are equivalent to
+.Dv ushort ,
+the type specifiers
+.Dv dI ,
+.Dv dL ,
+and
+.Dv d4
+are equivalent to
+.Dv long ,
+the type specifiers
+.Dv uI ,
+.Dv uL ,
+and
+.Dv u4
+are equivalent to
+.Dv ulong ,
+the type specifier
+.Dv d8
+is equivalent to
+.Dv quad ,
+the type specifier
+.Dv u8
+is equivalent to
+.Dv uquad ,
+and the type specifier
+.Dv s
+is equivalent to
+.Dv string .
+In addition, the type specifier
+.Dv dQ
+is equivalent to
+.Dv quad
+and the type specifier
+.Dv uQ
+is equivalent to
+.Dv uquad .
+.Pp
 Each top-level magic pattern (see below for an explanation of levels)
 is classified as text or binary according to the types used.
 Types
@@ -307,6 +415,9 @@ is octal, and
 .Dv 0x13
 is hexadecimal.
 .Pp
+Numeric operations are not performed on date types, instead the numeric
+value is interpreted as an offset.
+.Pp
 For string values, the string from the
 file must match the specified string.
 The operators
@@ -324,6 +435,9 @@ then print the string), with
 .Em \*[Gt]\e0
 (because all non-empty strings are greater than the empty string).
 .Pp
+Dates are treated as numerical values in the respective internal
+representation.
+.Pp
 The special test
 .Em x
 always evaluates to true.
@@ -511,7 +625,7 @@ Or even both!
 \*[Gt]\*[Gt]\*[Gt]\*[Am](\*[Am]0x54.l-3)  string  UNACE  \eb, ACE self-extracting archive
 .Ed
 .Pp
-Finally, if you have to deal with offset/length pairs in your file, even the
+If you have to deal with offset/length pairs in your file, even the
 second value in a parenthesized expression can be taken from the file itself,
 using another set of parentheses.
 Note that this additional indirect offset is always relative to the
@@ -526,6 +640,18 @@ start of the main indirect offset.
 # these are located 14 and 10 bytes after the section name
 \*[Gt]\*[Gt]\*[Gt]\*[Gt](\*[Am]0xe.l+(-4)) string       PK\e3\e4 \eb, ZIP self-extracting archive
 .Ed
+.Pp
+If you have a list of known avalues at a particular continuation level,
+and you want to provide a switch-like default case:
+.Bd -literal -offset indent
+# clear that continuation level match
+\*[Gt]18	clear
+\*[Gt]18	lelong	1	one
+\*[Gt]18	lelong	2	two
+\*[Gt]18	default	x
+# print default match
+\*[Gt]\*[Gt]18	lelong	x	unmatched 0x%x
+.Ed
 .Sh SEE ALSO
 .Xr file __CSECTION__
 \- the command that reads this file.
@@ -537,19 +663,41 @@ The formats
 .Dv melong ,
 .Dv short ,
 .Dv beshort ,
-.Dv leshort ,
-.Dv date ,
-.Dv bedate ,
-.Dv medate ,
-.Dv ledate ,
-.Dv beldate ,
-.Dv leldate ,
 and
-.Dv meldate
-are system-dependent; perhaps they should be specified as a number
-of bytes (2B, 4B, etc),
-since the files being recognized typically come from
-a system on which the lengths are invariant.
+.Dv leshort
+do not depend on the length of the C data types
+.Dv short
+and
+.Dv long
+on the platform, even though the Single
+.Ux
+Specification implies that they do.  However, as OS X Mountain Lion has
+passed the Single
+.Ux
+Specification validation suite, and supplies a version of
+.Xr file __CSECTION__
+in which they do not depend on the sizes of the C data types and that is
+built for a 64-bit environment in which
+.Dv long
+is 8 bytes rather than 4 bytes, presumably the validation suite does not
+test whether, for example
+.Dv long
+refers to an item with the same size as the C data type
+.Dv long .
+There should probably be
+.Dv type
+names
+.Dv int8 ,
+.Dv uint8 ,
+.Dv int16 ,
+.Dv uint16 ,
+.Dv int32 ,
+.Dv uint32 ,
+.Dv int64 ,
+and
+.Dv uint64 ,
+and specified-byte-order variants of them,
+to make it clearer that those types have specified widths.
 .\"
 .\" From: guy@sun.uucp (Guy Harris)
 .\" Newsgroups: net.bugs.usg
diff --git a/contrib/file/install-sh b/contrib/file/install-sh
index 68b81002eaeb..b12c0f718920 100755
--- a/contrib/file/install-sh
+++ b/contrib/file/install-sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: install-sh.in,v 1.5 2010/10/08 19:57:05 tez Exp $
+# $NetBSD: install-sh.in,v 1.6 2012/01/11 13:07:31 hans Exp $
 # This script now also installs multiple files, but might choke on installing
 # multiple files with spaces in the file names.
 #
@@ -45,6 +45,7 @@ rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
 instcmd="$cpprog"
+instflags=""
 pathcompchmodcmd="$chmodprog 755"
 chmodcmd="$chmodprog 755"
 chowncmd=""
@@ -84,6 +85,11 @@ while [ x"$1" != x ]; do
 	    shift
 	    continue;;
 
+	-m*)
+	    chmodcmd="$chmodprog ${1#-m}"
+	    shift
+	    continue;;
+
 	-o) chowncmd="$chownprog $2"
 	    shift
 	    shift
@@ -104,6 +110,10 @@ while [ x"$1" != x ]; do
 	    shift
 	    continue;;
 
+	-p) instflags="-p"
+	    shift
+	    continue;;
+
 	*)  if [ x"$msrc" = x ]
 	    then
 		msrc="$dst"
@@ -154,7 +164,7 @@ else
 
 	if [ -f "$srcarg" ]
 	then
-		doinst="$instcmd"
+		doinst="$instcmd $instflags"
 	elif [ -d "$srcarg" ]
 	then
 		echo "install: $srcarg: not a regular file"
diff --git a/contrib/file/ltmain.sh b/contrib/file/ltmain.sh
new file mode 100755
index 000000000000..f53abfd976e2
--- /dev/null
+++ b/contrib/file/ltmain.sh
@@ -0,0 +1,9664 @@
+
+# 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"
+
+unset CP
+unset MV
+unset RM
+: ${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=
+	versuffix2=
+	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"
+	  versuffix2="$major.$age"
+	  ;;
+
+	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=
+	    versuffix2=
+	  else
+	    versuffix=".0.0"
+	    versuffix2=".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=
+	  versuffix2=
+	  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* | *-*-mirbsd* | *-*-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
+	versuffix2_save=$versuffix2
+	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=""
+	versuffix2=""
+	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
+	versuffix2=$versuffix2_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/file/m4/libtool.m4 b/contrib/file/m4/libtool.m4
new file mode 100644
index 000000000000..44e0ecff11e3
--- /dev/null
+++ b/contrib/file/m4/libtool.m4
@@ -0,0 +1,7982 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 57 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_REPLACE_SHELLFNS
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
+
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  ppc64-*linux*|powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  ppc*-*linux*|powerpc*-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
+
+
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
+
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/contrib/file/m4/ltoptions.m4 b/contrib/file/m4/ltoptions.m4
new file mode 100644
index 000000000000..5d9acd8e23bc
--- /dev/null
+++ b/contrib/file/m4/ltoptions.m4
@@ -0,0 +1,384 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 7 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/contrib/file/m4/ltsugar.m4 b/contrib/file/m4/ltsugar.m4
new file mode 100644
index 000000000000..9000a057d31d
--- /dev/null
+++ b/contrib/file/m4/ltsugar.m4
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/contrib/file/m4/ltversion.m4 b/contrib/file/m4/ltversion.m4
new file mode 100644
index 000000000000..07a8602d48d6
--- /dev/null
+++ b/contrib/file/m4/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 3337 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.2'
+macro_revision='1.3337'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/contrib/file/m4/lt~obsolete.m4 b/contrib/file/m4/lt~obsolete.m4
new file mode 100644
index 000000000000..c573da90c5cc
--- /dev/null
+++ b/contrib/file/m4/lt~obsolete.m4
@@ -0,0 +1,98 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/contrib/file/Header b/contrib/file/magic/Header
similarity index 100%
rename from contrib/file/Header
rename to contrib/file/magic/Header
diff --git a/contrib/file/Localstuff b/contrib/file/magic/Localstuff
similarity index 100%
rename from contrib/file/Localstuff
rename to contrib/file/magic/Localstuff
diff --git a/contrib/file/Magdir/acorn b/contrib/file/magic/Magdir/acorn
similarity index 100%
rename from contrib/file/Magdir/acorn
rename to contrib/file/magic/Magdir/acorn
diff --git a/contrib/file/Magdir/adi b/contrib/file/magic/Magdir/adi
similarity index 100%
rename from contrib/file/Magdir/adi
rename to contrib/file/magic/Magdir/adi
diff --git a/contrib/file/Magdir/adventure b/contrib/file/magic/Magdir/adventure
similarity index 92%
rename from contrib/file/Magdir/adventure
rename to contrib/file/magic/Magdir/adventure
index febc2077f129..37b4cb3de2e0 100644
--- a/contrib/file/Magdir/adventure
+++ b/contrib/file/magic/Magdir/adventure
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: adventure,v 1.13 2010/12/31 16:32:54 christos Exp $
+# $File: adventure,v 1.14 2012/06/21 01:32:26 christos Exp $
 # adventure: file(1) magic for Adventure game files
 #
 # from Allen Garvin <earendil@faeryland.tamu-commerce.edu>
@@ -33,10 +33,14 @@
 #
 0	ubyte			>0
 >0	ubyte			<9
->>16	belong&0xfe00f0f0	0x3030	Infocom game data
->>>0	ubyte			x	(Z-machine %d,
->>>>2	ubeshort		x	Release %d /
->>>>18	string			>\0	Serial %.6s)
+>>16	belong&0xfe00f0f0	0x3030
+>>>0	ubyte			< 10
+>>>>2	ubeshort		< 10
+>>>>>18	regex			[0-9][0-9][0-9][0-9][0-9][0-9]
+>>>>>>0	ubyte			< 10	Infocom (Z-machine %d,
+>>>>>>>2	ubeshort	< 10 	Release %d /
+>>>>>>>>18	string		>\0	Serial %.6s)
+!:strength + 40
 
 #------------------------------------------------------------------------------
 # Glulx:  file(1) magic for Glulx binaries.
diff --git a/contrib/file/Magdir/allegro b/contrib/file/magic/Magdir/allegro
similarity index 100%
rename from contrib/file/Magdir/allegro
rename to contrib/file/magic/Magdir/allegro
diff --git a/contrib/file/Magdir/alliant b/contrib/file/magic/Magdir/alliant
similarity index 100%
rename from contrib/file/Magdir/alliant
rename to contrib/file/magic/Magdir/alliant
diff --git a/contrib/file/Magdir/amanda b/contrib/file/magic/Magdir/amanda
similarity index 100%
rename from contrib/file/Magdir/amanda
rename to contrib/file/magic/Magdir/amanda
diff --git a/contrib/file/Magdir/amigaos b/contrib/file/magic/Magdir/amigaos
similarity index 92%
rename from contrib/file/Magdir/amigaos
rename to contrib/file/magic/Magdir/amigaos
index f4c9cf265317..8fdf37662c57 100644
--- a/contrib/file/Magdir/amigaos
+++ b/contrib/file/magic/Magdir/amigaos
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: amigaos,v 1.14 2009/09/19 16:28:07 christos Exp $
+# $File: amigaos,v 1.15 2012/06/21 01:13:59 christos Exp $
 # amigaos:  file(1) magic for AmigaOS binary formats:
 
 #
@@ -63,3 +63,6 @@
 # From: Alex Beregszaszi <alex@fsn.hu>
 0	string		LZX		LZX compressed archive (Amiga)
 
+# From: Przemek Kramarczyk <pkramarczyk@gmail.com>
+0	string 		.KEY		AmigaDOS script
+0	string 		.key		AmigaDOS script
diff --git a/contrib/file/magic/Magdir/android b/contrib/file/magic/Magdir/android
new file mode 100644
index 000000000000..4a4c3feb8923
--- /dev/null
+++ b/contrib/file/magic/Magdir/android
@@ -0,0 +1,100 @@
+
+#------------------------------------------------------------
+# $File: android,v 1.4 2014/06/03 19:01:34 christos Exp $
+# Various android related magic entries
+#------------------------------------------------------------
+
+# Dalvik .dex format. http://retrodev.com/android/dexformat.html
+# From <mkf@google.com> "Mike Fleming"
+# Fixed to avoid regexec 17 errors on some dex files
+# From <diff@lookout.com> "Tim Strazzere"
+0	string	dex\n
+>0	regex	dex\n[0-9]{2}\0	Dalvik dex file
+>4	string	>000			version %s
+0	string	dey\n
+>0	regex	dey\n[0-9]{2}\0	Dalvik dex file (optimized for host)
+>4	string	>000			version %s
+
+# http://android.stackexchange.com/questions/23357/\
+# is-there-a-way-to-look-inside-and-modify-an-adb-backup-created-file/\
+# 23608#23608
+0	string	ANDROID\040BACKUP\n	Android Backup
+>15	string	1\n			\b, version 1
+>17	string	0\n			\b, uncompressed
+>17	string	1\n			\b, compressed
+>19	string	none\n			\b, unencrypted
+>19	string	AES-256\n		\b, encrypted AES-256
+
+# Android bootimg format
+# From https://android.googlesource.com/\
+# platform/system/core/+/master/mkbootimg/bootimg.h
+0		string	ANDROID!	Android bootimg
+>8		lelong	>0			\b, kernel
+>>12	lelong	>0			\b (0x%x)
+>16		lelong	>0			\b, ramdisk
+>>20	lelong	>0			\b (0x%x)
+>24		lelong	>0			\b, second stage
+>>28	lelong	>0			\b (0x%x)
+>36		lelong	>0			\b, page size: %d
+>38		string	>0			\b, name: %s
+>64		string	>0		 	\b, cmdline (%s)
+# Dalvik .dex format. http://retrodev.com/android/dexformat.html
+# From <mkf@google.com> "Mike Fleming"
+# Fixed to avoid regexec 17 errors on some dex files
+# From <diff@lookout.com> "Tim Strazzere"
+0	string	dex\n
+>0	regex	dex\n[0-9]{2}\0	Dalvik dex file
+>4	string	>000			version %s
+0	string	dey\n
+>0	regex	dey\n[0-9]{2}\0	Dalvik dex file (optimized for host)
+>4	string	>000			version %s
+
+# http://android.stackexchange.com/questions/23357/\
+# is-there-a-way-to-look-inside-and-modify-an-adb-backup-created-file/\
+# 23608#23608
+0	string	ANDROID\040BACKUP\n	Android Backup
+>15	string	1\n			\b, version 1
+>17	string	0\n			\b, uncompressed
+>17	string	1\n			\b, compressed
+>19	string	none\n			\b, unencrypted
+>19	string	AES-256\n		\b, encrypted AES-256
+
+# Android bootimg format
+# From https://android.googlesource.com/\
+# platform/system/core/+/master/mkbootimg/bootimg.h
+0		string	ANDROID!	Android bootimg
+>8		lelong	>0			\b, kernel
+>>12	lelong	>0			\b (0x%x)
+>16		lelong	>0			\b, ramdisk
+>>20	lelong	>0			\b (0x%x)
+>24		lelong	>0			\b, second stage
+>>28	lelong	>0			\b (0x%x)
+>36		lelong	>0			\b, page size: %d
+>38		string	>0			\b, name: %s
+>64		string	>0		 	\b, cmdline (%s)
+
+# Android Backup archive
+# From: Ariel Shkedi
+# File extension: .ab
+# No mime-type defined
+# URL: https://github.com/android/platform_frameworks_base/blob/\
+# 0bacfd2ba68d21a68a3df345b830bc2a1e515b5a/services/java/com/\
+# android/server/BackupManagerService.java#L2367
+# After the header comes a tar file
+# If compressed, the entire tar file is compressed with JAVA deflate
+#
+# Include the version number hardcoded with the magic string to avoid
+# false positives
+0	string/b	ANDROID\ BACKUP\n1\n	Android Backup
+>17	string		0\n			\b, Not-Compressed
+>17	string		1\n			\b, Compressed
+# any string as long as it's not the word none (which is matched below)
+>>19    regex/1l	\^([^n\n]|n[^o]|no[^n]|non[^e]|none.+).*	\b, Encrypted (%s)
+>>19	string		none\n			\b, Not-Encrypted
+# Commented out because they don't seem useful to print
+# (but they are part of the header - the tar file comes after them):
+#>>>&1		regex/1l .*	\b, Password salt: %s
+#>>>>&1		regex/1l .*	\b, Master salt: %s
+#>>>>>&1	regex/1l .*	\b, PBKDF2 rounds: %s
+#>>>>>>&1	regex/1l .*	\b, IV: %s
+#>>>>>>>&1	regex/1l .*	\b, Key: %s
diff --git a/contrib/file/Magdir/animation b/contrib/file/magic/Magdir/animation
similarity index 96%
rename from contrib/file/Magdir/animation
rename to contrib/file/magic/Magdir/animation
index c09a26ac85e3..561fe79e5127 100644
--- a/contrib/file/Magdir/animation
+++ b/contrib/file/magic/Magdir/animation
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: animation,v 1.45 2011/09/06 11:00:06 christos Exp $
+# $File: animation,v 1.53 2014/04/30 21:41:02 christos Exp $
 # animation:  file(1) magic for animation/movie formats
 #
 # animation formats
@@ -89,7 +89,10 @@
 >>4      byte               77             \b, main
 >>4      byte               88             \b, extended
 >>6      byte               x              \b @ L %u
+# GRR too general as it catches also FoxPro Memo example NG.FPT
 >3       byte               0xB0           MPEG sequence, v4
+# TODO: maybe this extra line exclude FoxPro Memo example NG.FPT starting with 000001b0 00000100 00000000
+#>>4      byte               !0             MPEG sequence, v4
 !:mime  video/mpeg4-generic
 >>5      belong             0x000001B5
 >>>9     byte               &0x80
@@ -448,6 +451,7 @@
 
 # MP2, M2A
 0       beshort&0xFFFE  0xFFF4         MPEG ADTS, layer II, v2
+!:mime	audio/mpeg
 # rate 
 >2      byte&0xF0       0x10           \b,   8 kbps
 >2      byte&0xF0       0x20           \b,  16 kbps 
@@ -617,7 +621,7 @@
 # Live MPEG-4 audio streams (instead of RTP FlexMux)
 0       beshort&0xFFE0  0x56E0         MPEG-4 LOAS
 !:mime	audio/x-mp4a-latm
-#>1     beshort&0x1FFF  x              \b, %u byte packet
+#>1     beshort&0x1FFF  x              \b, %hu byte packet
 >3      byte&0xE0       0x40
 >>4     byte&0x3C       0x04           \b, single stream
 >>4     byte&0x3C       0x08           \b, 2 streams
@@ -688,10 +692,6 @@
 # iso 13818 transport stream
 #
 # from Oskar Schirmer <schirmer@scara.com> Feb 3, 2001 (ISO 13818.1)
-# (the following is a little bit restrictive and works fine for a stream
-#  that starts with PAT properly. it won't work for stream data, that is
-#  cut from an input device data right in the middle, but this shouldn't
-#  disturb)
 # syncbyte      8 bit	0x47
 # error_ind     1 bit	-
 # payload_start 1 bit	1
@@ -699,9 +699,9 @@
 # PID          13 bit	0x0000
 # scrambling    2 bit	-
 # adaptfld_ctrl 2 bit	1 or 3
-# conti_count   4 bit	0
-0	belong&0xFF5FFF1F	0x47400010	MPEG transport stream data
->188	byte			!0x47		CORRUPTED
+# conti_count   4 bit	-
+0	belong&0xFF5FFF10	0x47400010
+>188	byte			0x47		MPEG transport stream data
 
 # DIF digital video file format <mpruett@sgi.com>
 0	belong&0xffffff00	0x1f070000      DIF
@@ -719,16 +719,16 @@
 !:mime	video/x-mng
 >4	belong			!0x0d0a1a0a	CORRUPTED,
 >4	belong			0x0d0a1a0a
->>16    belong	x				%ld x
->>20    belong	x				%ld
+>>16    belong	x				%d x
+>>20    belong	x				%d
 
 # JNG Video Format, <URL:http://www.libpng.org/pub/mng/spec/>
 0	string			\x8bJNG		JNG video data,
 !:mime	video/x-jng
 >4	belong			!0x0d0a1a0a	CORRUPTED,
 >4	belong			0x0d0a1a0a
->>16    belong	x				%ld x
->>20    belong	x				%ld
+>>16    belong	x				%d x
+>>20    belong	x				%d
 
 # Vivo video (Wolfram Kleff)
 3	string		\x0D\x0AVersion:Vivo	Vivo video data
@@ -755,7 +755,7 @@
 >0	byte		x		GameCube movie,
 >0x34	ubeshort	x		%d x
 >0x36	ubeshort	x		%d,
->0x26	ubeshort	x		%dµs,
+>0x26	ubeshort	x		%dus,
 >0x42	ubeshort	0		no audio
 >0x42	ubeshort	>0		%dHz audio
 
@@ -789,25 +789,26 @@
 
 #						MPEG file
 # MPEG sequences
-# FIXME: This section is from the old magic.mime file and needs integrating with the rest
-0       belong             0x000001BA
->4      byte               &0x40
-!:mime	video/mp2p
->4      byte               ^0x40
-!:mime	video/mpeg
-0       belong             0x000001BB
-!:mime	video/mpeg
-0       belong             0x000001B0
-!:mime	video/mp4v-es
-0       belong             0x000001B5
-!:mime	video/mp4v-es
-0       belong             0x000001B3
-!:mime	video/mpv
-0       belong&0xFF5FFF1F  0x47400010
-!:mime	video/mp2t
-0       belong             0x00000001
->4      byte&0x1F	   0x07
-!:mime	video/h264
+# FIXME: This section is from the old magic.mime file and needs
+# integrating with the rest
+#0       belong             0x000001BA
+#>4      byte               &0x40
+#!:mime	video/mp2p
+#>4      byte               ^0x40
+#!:mime	video/mpeg
+#0       belong             0x000001BB
+#!:mime	video/mpeg
+#0       belong             0x000001B0
+#!:mime	video/mp4v-es
+#0       belong             0x000001B5
+#!:mime	video/mp4v-es
+#0       belong             0x000001B3
+#!:mime	video/mpv
+#0       belong&0xFF5FFF10  0x47400010
+#!:mime	video/mp2t
+#0       belong             0x00000001
+#>4      byte&0x1F	   0x07
+#!:mime	video/h264
 
 # Type: Bink Video
 # Extension: .bik
diff --git a/contrib/file/magic/Magdir/aout b/contrib/file/magic/Magdir/aout
new file mode 100644
index 000000000000..69b6ec60d865
--- /dev/null
+++ b/contrib/file/magic/Magdir/aout
@@ -0,0 +1,46 @@
+
+#------------------------------------------------------------------------------
+# $File: aout,v 1.1 2013/01/09 22:37:23 christos Exp $
+# aout:  file(1) magic for a.out executable/object/etc entries that
+# handle executables on multiple platforms.
+#
+
+#
+# Little-endian 32-bit-int a.out, merged from bsdi (for BSD/OS, from
+# BSDI), netbsd, and vax (for UNIX/32V and BSD)
+#
+# XXX - is there anything we can look at to distinguish BSD/OS 386 from
+# NetBSD 386 from various VAX binaries?  The BSD/OS shared library flag
+# works only for binaries using shared libraries.  Grabbing the entry
+# point from the a.out header, using it to find the first code executed
+# in the program, and looking at that might help.
+#
+0	lelong		0407		a.out little-endian 32-bit executable
+>16	lelong		>0		not stripped
+>32	byte		0x6a		(uses BSD/OS shared libs)
+
+0	lelong		0410		a.out little-endian 32-bit pure executable
+>16	lelong		>0		not stripped
+>32	byte		0x6a		(uses BSD/OS shared libs)
+
+0	lelong		0413		a.out little-endian 32-bit demand paged pure executable
+>16	lelong		>0		not stripped
+>32	byte		0x6a		(uses BSD/OS shared libs)
+
+#
+# Big-endian 32-bit-int a.out, merged from sun (for old 68010 SunOS a.out),
+# mips (for old 68020(!) SGI a.out), and netbsd (for old big-endian a.out).
+#
+# XXX - is there anything we can look at to distinguish old SunOS 68010
+# from old 68020 IRIX from old NetBSD?  Again, I guess we could look at
+# the first instruction or instructions in the program.
+#
+0	belong		0407		a.out big-endian 32-bit executable
+>16	belong		>0		not stripped
+
+0	belong		0410		a.out big-endian 32-bit pure executable
+>16	belong		>0		not stripped
+
+0	belong		0413		a.out big-endian 32-bit demand paged executable
+>16	belong		>0		not stripped
+
diff --git a/contrib/file/Magdir/apl b/contrib/file/magic/Magdir/apl
similarity index 100%
rename from contrib/file/Magdir/apl
rename to contrib/file/magic/Magdir/apl
diff --git a/contrib/file/Magdir/apple b/contrib/file/magic/Magdir/apple
similarity index 80%
rename from contrib/file/Magdir/apple
rename to contrib/file/magic/Magdir/apple
index dad3eee9258d..e3dd059f8aaf 100644
--- a/contrib/file/Magdir/apple
+++ b/contrib/file/magic/Magdir/apple
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: apple,v 1.24 2010/11/25 15:00:12 christos Exp $
+# $File: apple,v 1.29 2014/04/30 21:41:02 christos Exp $
 # apple:  file(1) magic for Apple file formats
 #
 0	search/1/t	FiLeStArTfIlEsTaRt	binscii (apple ][) text
@@ -106,8 +106,13 @@
 # This is incredibly sloppy, but will be true if the program was
 # written at its usual memory location of 2048 and its first line
 # number is less than 256.  Yuck.
+# update by Joerg Jenderek at Feb 2013
 
-0       belong&0xff00ff 0x80000 Applesoft BASIC program data
+# GRR: this test is still too general as it catches also Gujin BOOT144.SYS (0xfa080000)
+#0       belong&0xff00ff 0x80000 Applesoft BASIC program data
+0	belong&0x00ff00ff	0x00080000	
+# assuming that line number must be positive
+>2	leshort			>0		Applesoft BASIC program data, first line number %d
 #>2     leshort         x       \b, first line number %d
 
 # ORCA/EZ assembler:
@@ -199,15 +204,15 @@
 #  purposes in YellowStep/Cocoa, including some nib files.
 # From: David Remahl <dremahl@apple.com>
 2		string		typedstream	NeXT/Apple typedstream data, big endian
->0		byte		x		\b, version %hhd
+>0		byte		x		\b, version %d
 >0		byte		<5		\b
 >>13	byte		0x81	\b
->>>14	ubeshort	x		\b, system %hd
+>>>14	ubeshort	x		\b, system %d
 2		string		streamtyped NeXT/Apple typedstream data, little endian
->0		byte		x		\b, version %hhd
+>0		byte		x		\b, version %d
 >0		byte		<5		\b
 >>13	byte		0x81	\b
->>>14	uleshort	x		\b, system %hd
+>>>14	uleshort	x		\b, system %d
 
 #------------------------------------------------------------------------------
 # CAF: Apple CoreAudio File Format
@@ -249,3 +254,49 @@
 # From: "Nelson A. de Oliveira" <naoliv@gmail.com>
 # .vdi
 4	string innotek\ VirtualBox\ Disk\ Image %s
+
+# Apple disk partition stuff, strengthen the magic using byte 4
+0	beshort	0x4552
+>4	byte	0			Apple Driver Map
+>>2	beshort	x			\b, blocksize %d
+>>4	belong	x			\b, blockcount %d
+>>10	beshort	x			\b, devtype %d
+>>12	beshort	x			\b, devid %d
+>>20	beshort x			\b, descriptors %d
+# Assume 	8 partitions each at a multiple of the sector size.
+# We could glean this from the partition descriptors, but they are empty!?!?
+>>(2.S*1)	indirect		\b, contains[@0x%x]: 
+>>(2.S*2)	indirect		\b, contains[@0x%x]: 
+>>(2.S*3)	indirect		\b, contains[@0x%x]: 
+>>(2.S*4)	indirect		\b, contains[@0x%x]: 
+>>(2.S*5)	indirect		\b, contains[@0x%x]: 
+>>(2.S*6)	indirect		\b, contains[@0x%x]: 
+>>(2.S*7)	indirect		\b, contains[@0x%x]: 
+>>(2.S*8)	indirect		\b, contains[@0x%x]: 
+
+# Yes, the 3rd and 4th bytes are reserved, but we use them to make the
+# magic stronger.
+0	belong	0x504d0000		Apple Partition Map
+>4	belong	x			\b, map block count %d
+>8	belong	x			\b, start block %d
+>12	belong	x			\b, block count %d
+>16	string >0			\b, name %s
+>48	string >0			\b, type %s
+>124	string >0			\b, processor %s
+>140	string >0			\b, boot arguments %s
+>92	belong	& 1			\b, valid
+>92	belong	& 2			\b, allocated
+>92	belong	& 4			\b, in use
+>92	belong	& 8			\b, has boot info
+>92	belong	& 16			\b, readable
+>92	belong	& 32			\b, writable
+>92	belong	& 64			\b, pic boot code
+>92	belong	& 128			\b, chain compatible driver
+>92	belong	& 256			\b, real driver
+>92	belong	& 512			\b, chain driver
+>92	belong	& 1024			\b, mount at startup
+>92	belong	& 2048			\b, is the startup partition
+
+#http://wiki.mozilla.org/DS_Store_File_Format`
+#http://en.wikipedia.org/wiki/.DS_Store
+0	string	\0\0\0\1Bud1\0		Apple Desktop Services Store
diff --git a/contrib/file/Magdir/applix b/contrib/file/magic/Magdir/applix
similarity index 100%
rename from contrib/file/Magdir/applix
rename to contrib/file/magic/Magdir/applix
diff --git a/contrib/file/Magdir/archive b/contrib/file/magic/Magdir/archive
similarity index 81%
rename from contrib/file/Magdir/archive
rename to contrib/file/magic/Magdir/archive
index 2ff3323c40e4..91fbadd183f0 100644
--- a/contrib/file/Magdir/archive
+++ b/contrib/file/magic/Magdir/archive
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: archive,v 1.70 2011/10/26 15:44:47 christos Exp $
+# $File: archive,v 1.87 2014/06/03 19:15:58 christos Exp $
 # archive:  file(1) magic for archive formats (see also "msdos" for self-
 #           extracting compressed archives)
 #
@@ -36,12 +36,66 @@
 0	string		070701		ASCII cpio archive (SVR4 with no CRC)
 0	string		070702		ASCII cpio archive (SVR4 with CRC)
 
-# Debian package (needs to go before regular portable archives)
+#
+# Various archive formats used by various versions of the "ar"
+# command.
+#
+
+#
+# Original UNIX archive formats.
+# They were written with binary values in host byte order, and
+# the magic number was a host "int", which might have been 16 bits
+# or 32 bits.  We don't say "PDP-11" or "VAX", as there might have
+# been ports to little-endian 16-bit-int or 32-bit-int platforms
+# (x86?) using some of those formats; if none existed, feel free
+# to use "PDP-11" for little-endian 16-bit and "VAX" for little-endian
+# 32-bit.  There might have been big-endian ports of that sort as
+# well.
+#
+0	leshort		0177555		very old 16-bit-int little-endian archive
+0	beshort		0177555		very old 16-bit-int big-endian archive
+0	lelong		0177555		very old 32-bit-int little-endian archive
+0	belong		0177555		very old 32-bit-int big-endian archive
+
+0	leshort		0177545		old 16-bit-int little-endian archive
+>2	string		__.SYMDEF	random library
+0	beshort		0177545		old 16-bit-int big-endian archive
+>2	string		__.SYMDEF	random library
+0	lelong		0177545		old 32-bit-int little-endian archive
+>4	string		__.SYMDEF	random library
+0	belong		0177545		old 32-bit-int big-endian archive
+>4	string		__.SYMDEF	random library
+
+#
+# From "pdp" (but why a 4-byte quantity?)
+#
+0	lelong		0x39bed		PDP-11 old archive
+0	lelong		0x39bee		PDP-11 4.0 archive
+
+#
+# XXX - what flavor of APL used this, and was it a variant of
+# some ar archive format?  It's similar to, but not the same
+# as, the APL workspace magic numbers in pdp.
+#
+0	long		0100554		apl workspace
+
+#
+# System V Release 1 portable(?) archive format.
+#
+0	string		=<ar>		System V Release 1 ar archive
+!:mime	application/x-archive
+
+#
+# Debian package; it's in the portable archive format, and needs to go
+# before the entry for regular portable archives, as it's recognized as
+# a portable archive whose first member has a name beginning with
+# "debian".
 #
 0	string		=!<arch>\ndebian
-!:mime	application/x-debian-package
 >8	string		debian-split	part of multipart Debian package
+!:mime	application/vnd.debian.binary-package
 >8	string		debian-binary	Debian binary package
+!:mime	application/vnd.debian.binary-package
 >8	string		!debian
 >68	string		>\0		(format %s)
 # These next two lines do not work, because a bzip2 Debian archive
@@ -53,18 +107,14 @@
 #>84	string		gz		\b, uses gzip compression
 #>136	ledate		x		created: %s
 
-# other archives
-0	long		0177555		very old archive
-0	short		0177555		very old PDP-11 archive
-0	long		0177545		old archive
-0	short		0177545		old PDP-11 archive
-0	long		0100554		apl workspace
-0	string		=<ar>		archive
-!:mime	application/x-archive
-
-# MIPS archive (needs to go before regular portable archives)
+#
+# MIPS archive; they're in the portable archive format, and need to go
+# before the entry for regular portable archives, as it's recognized as
+# a portable archive whose first member has a name beginning with
+# "__________E".
 #
 0	string	=!<arch>\n__________E	MIPS archive
+!:mime	application/x-archive
 >20	string	U			with MIPS Ucode members
 >21	string	L			with MIPSEL members
 >21	string	B			with MIPSEB members
@@ -75,56 +125,20 @@
 0	search/1	-h-		Software Tools format archive text
 
 #
-# XXX - why are there multiple <ar> thingies?  Note that 0x213c6172 is
-# "!<ar", so, for new-style (4.xBSD/SVR2andup) archives, we have:
-#
-# 0	string		=!<arch>		current ar archive
-# 0	long		0x213c6172	archive file
-#
-# and for SVR1 archives, we have:
-#
-# 0	string		\<ar>		System V Release 1 ar archive
-# 0	string		=<ar>		archive
-#
-# XXX - did Aegis really store shared libraries, breakpointed modules,
-# and absolute code program modules in the same format as new-style
-# "ar" archives?
+# BSD/SVR2-and-later portable archive formats.
 #
 0	string		=!<arch>		current ar archive
 !:mime	application/x-archive
 >8	string		__.SYMDEF	random library
->0	belong		=65538		- pre SR9.5
->0	belong		=65539		- post SR9.5
->0	beshort		2		- object archive
->0	beshort		3		- shared library module
->0	beshort		4		- debug break-pointed module
->0	beshort		5		- absolute code program module
-0	string		\<ar>		System V Release 1 ar archive
-0	string		=<ar>		archive
+>68	string		__.SYMDEF\ SORTED	random library
+
 #
-# XXX - from "vax", which appears to collect a bunch of byte-swapped
-# thingies, to help you recognize VAX files on big-endian machines;
-# with "leshort", "lelong", and "string", that's no longer necessary....
+# "Thin" archive, as can be produced by GNU ar.
 #
-0	belong		0x65ff0000	VAX 3.0 archive
-0	belong		0x3c61723e	VAX 5.0 archive
-#
-0	long		0x213c6172	archive file
-0	lelong		0177555		very old VAX archive
-0	leshort		0177555		very old PDP-11 archive
-#
-# XXX - "pdp" claims that 0177545 can have an __.SYMDEF member and thus
-# be a random library (it said 0xff65 rather than 0177545).
-#
-0	lelong		0177545		old VAX archive
->8	string		__.SYMDEF	random library
-0	leshort		0177545		old PDP-11 archive
->8	string		__.SYMDEF	random library
-#
-# From "pdp" (but why a 4-byte quantity?)
-#
-0	lelong		0x39bed		PDP-11 old archive
-0	lelong		0x39bee		PDP-11 4.0 archive
+0	string		=!<thin>\n	thin archive with
+>68	belong		0		no symbol entries
+>68	belong		1		%d symbol entry
+>68	belong		>1		%d symbol entries
 
 # ARC archiver, from Daniel Quinlan (quinlan@yggdrasil.com)
 #
@@ -184,7 +198,10 @@
 # SAR
 3	string	LH5 SAR archive data
 # BSArc/BS2
-0	string	\212\3SB \0 BSArc/BS2 archive data
+0	string	\212\3SB\020\0	BSArc/BS2 archive data
+# Bethesda Softworks Archive (Oblivion)
+0	string	BSA\0 		BSArc archive data
+>4	lelong	x		version %d
 # MAR
 2	string	=-ah MAR archive data
 # ACB
@@ -209,7 +226,7 @@
 # AMGC
 0	string	\xad6" AMGC archive data
 # NuLIB
-0	string	NõFélå NuLIB archive data
+0	string	N\xc3\xb5F\xc3\xa9lx\xc3\xa5 NuLIB archive data
 # PakLeo
 0	string	LEOLZW PAKLeo archive data
 # ChArc
@@ -221,7 +238,7 @@
 # Freeze
 0	string	\x1f\x9f\x4a\x10\x0a Freeze archive data
 # KBoom
-0	string	¨MP¨ KBoom archive data
+0	string	\xc2\xa8MP\xc2\xa8 KBoom archive data
 # NSQ, must go after CDC Codec
 0	string	\x76\xff NSQ archive data
 # DPA
@@ -252,14 +269,14 @@
 >9	string	\0
 >>0	string	KWAJ
 >>>7	string	\321\003	MS Compress archive data
->>>>14	ulong	>0		\b, original size: %ld bytes
+>>>>14	ulong	>0		\b, original size: %d bytes
 >>>>18		ubyte	>0x65
 >>>>>18		string	x       \b, was %.8s
 >>>>>(10.b-4)	string	x       \b.%.3s
 # MP3 (archiver, not lossy audio compression)
 0	string	MP3\x1a MP3-Archiver archive data
 # ZET
-0	string	OZÝ ZET archive data
+0	string	OZ\xc3\x9d ZET archive data
 # TSComp
 0	string	\x65\x5d\x13\x8c\x08\x01\x03\x00 TSComp archive data
 # ARQ
@@ -290,7 +307,7 @@
 # Xtreme
 0	string	ULEB\0 Xtreme archive data
 # Pack Magic
-0	string	@â\1\0 Pack Magic archive data
+0	string	@\xc3\xa2\1\0 Pack Magic archive data
 # BTS
 0	belong&0xfeffffff	0x1a034465 BTS archive data
 # ELI 5750
@@ -426,7 +443,7 @@
 # XPack Data
 0	string	xpa XPack archive data
 # XPack Single Data
-0	string	Í\ jm XPack single archive data
+0	string	\xc3\x8d\ jm XPack single archive data
 
 # TODO: missing due to unknown magic/magic at end of file:
 #DWC
@@ -481,7 +498,7 @@
 # This is a really bad format. A file containing HAWAII will match this...
 #0	string		HA		HA archive data,
 #>2	leshort		=1		1 file,
-#>2	leshort		>1		%u files,
+#>2	leshort		>1		%hu files,
 #>4	byte&0x0f	=0		first is type CPY
 #>4	byte&0x0f	=1		first is type ASC
 #>4	byte&0x0f	=2		first is type HSC
@@ -571,6 +588,7 @@
 !:mime	application/zip
 
 # Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
+0	string		PK\005\006	Zip archive data (empty)
 0	string		PK\003\004
 
 # Specialised zip formats which start with a member named 'mimetype'
@@ -660,11 +678,10 @@
 !:mime	application/vnd.oasis.opendocument.image-template
 
 #  EPUB (OEBPS) books using OCF (OEBPS Container Format)
-#    From: Adam Buchbinder <adam.buchbinder@gmail.com>
 #    http://www.idpf.org/ocf/ocf1.0/download/ocf10.htm, section 4.
-#    (mimetype contains "application/epub+zip")
->>50	string	epub+zip		EPUB ebook data
-!:mime	application/epub+zip
+#    From: Ralf Brown <ralf.brown@gmail.com>
+>>50	string	epub+zip	EPUB document
+!:mime application/epub+zip
 
 #  Catch other ZIP-with-mimetype formats
 #	In a ZIP file, the bytes immediately after a member's contents are
@@ -684,16 +701,21 @@
 >>>38		regex	[!-OQ-~]+		Zip data (MIME type "%s"?)
 !:mime	application/zip
 
+# Java Jar files
+>(26.s+30)	leshort	0xcafe		Java archive data (JAR)
+!:mime	application/java-archive
+
 # Generic zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
 #   Next line excludes specialized formats:
->26    string          !\x8\0\0\0mimetype	Zip archive data
+>(26.s+30)	leshort	!0xcafe
+>>26    string          !\x8\0\0\0mimetype	Zip archive data
 !:mime	application/zip
->>4	byte		0x09		\b, at least v0.9 to extract
->>4	byte		0x0a		\b, at least v1.0 to extract
->>4	byte		0x0b		\b, at least v1.1 to extract
->>4	byte		0x14		\b, at least v2.0 to extract
->>4	byte		0x2d		\b, at least v3.0 to extract
->>0x161	string		WINZIP		\b, WinZIP self-extracting
+>>>4	byte		0x09		\b, at least v0.9 to extract
+>>>4	byte		0x0a		\b, at least v1.0 to extract
+>>>4	byte		0x0b		\b, at least v1.1 to extract
+>>>4	byte		0x14		\b, at least v2.0 to extract
+>>>4	byte		0x2d		\b, at least v3.0 to extract
+>>>0x161	string		WINZIP		\b, WinZIP self-extracting
 
 # StarView Metafile
 # From Pierre Ducroquet <pinaraf@pinaraf.info>
@@ -852,7 +874,7 @@
 # From: Dirk Jagdmann <doj@cubic.org>
 # xar archive format: http://code.google.com/p/xar/
 0	string	xar!		xar archive
->6	beshort	x		- version %ld
+>6	beshort	x		- version %d
 
 # From: "Nelson A. de Oliveira" <naoliv@gmail.com>
 # .kgb
@@ -884,14 +906,8 @@
 #   archive must be an uncompressed file called 'mimetype' with contents
 #   'application/epub+zip'
 
-# start by checking that this is a ZIP archive, then check for the
-#   proper mimetype file
-# From: Ralf Brown <ralf.brown@gmail.com>
-0	string	PK\003\004
->0x1E	string	mimetypeapplication/epub+zip	EPUB document
-!:mime application/epub+zip
 
-# From: "Michał Górny" <mgorny@gentoo.org>
+# From: "Michael Gorny" <mgorny@gentoo.org>
 # ZPAQ: http://mattmahoney.net/dc/zpaq.html
 0	string	zPQ	ZPAQ stream
 >3	byte	x	\b, level %d
@@ -905,3 +921,67 @@
 >36	byte	16		\b, back-to-front
 >42	beshort	x		\b, (%dx,
 >44	beshort	x		%d)
+
+# Symantec GHOST image by Joerg Jenderek at May 2014
+# http://us.norton.com/ghost/
+# http://www.garykessler.net/library/file_sigs.html
+0		ubelong&0xFFFFf7f0	0xFEEF0100	Norton GHost image
+# *.GHO
+>2		ubyte&0x08		0x00		\b, first file
+# *.GHS or *.[0-9] with cns program option
+>2		ubyte&0x08		0x08		\b, split file
+# part of split index interesting for *.ghs
+>>4		ubyte			x		id=0x%x
+# compression tag minus one equals numeric compression command line switch z[1-9]
+>3		ubyte			0		\b, no compression
+>3		ubyte			2		\b, fast compression (Z1)
+>3		ubyte			3		\b, medium compression (Z2)
+>3		ubyte			>3		
+>>3		ubyte			<11		\b, compression (Z%d-1)
+>2		ubyte&0x08		0x00		
+# ~ 30 byte password field only for *.gho
+>>12		ubequad			!0		\b, password protected
+>>44		ubyte			!1		
+# 1~Image All, sector-by-sector only for *.gho
+>>>10		ubyte			1		\b, sector copy
+# 1~Image Boot track only for *.gho
+>>>43		ubyte			1		\b, boot track
+# 1~Image Disc only for *.gho implies Image Boot track and sector copy
+>>44		ubyte			1		\b, disc sector copy
+# optional image description only *.gho
+>>0xff		string			>\0		"%-.254s"
+# look for DOS sector end sequence
+>0xE08	search/7776		\x55\xAA	
+>>&-512	indirect		x		\b; contains 
+
+# Symantec GHOST image by Joerg Jenderek at May 2014
+# http://us.norton.com/ghost/
+# http://www.garykessler.net/library/file_sigs.html
+0		ubelong&0xFFFFf7f0	0xFEEF0100	Norton GHost image
+# *.GHO
+>2		ubyte&0x08		0x00		\b, first file
+# *.GHS or *.[0-9] with cns program option
+>2		ubyte&0x08		0x08		\b, split file
+# part of split index interesting for *.ghs
+>>4		ubyte			x		id=0x%x
+# compression tag minus one equals numeric compression command line switch z[1-9]
+>3		ubyte			0		\b, no compression
+>3		ubyte			2		\b, fast compression (Z1)
+>3		ubyte			3		\b, medium compression (Z2)
+>3		ubyte			>3		
+>>3		ubyte			<11		\b, compression (Z%d-1)
+>2		ubyte&0x08		0x00		
+# ~ 30 byte password field only for *.gho
+>>12		ubequad			!0		\b, password protected
+>>44		ubyte			!1		
+# 1~Image All, sector-by-sector only for *.gho
+>>>10		ubyte			1		\b, sector copy
+# 1~Image Boot track only for *.gho
+>>>43		ubyte			1		\b, boot track
+# 1~Image Disc only for *.gho implies Image Boot track and sector copy
+>>44		ubyte			1		\b, disc sector copy
+# optional image description only *.gho
+>>0xff		string			>\0		"%-.254s"
+# look for DOS sector end sequence
+>0xE08	search/7776		\x55\xAA	
+>>&-512	indirect		x		\b; contains 
diff --git a/contrib/file/magic/Magdir/assembler b/contrib/file/magic/Magdir/assembler
new file mode 100644
index 000000000000..805a326bebce
--- /dev/null
+++ b/contrib/file/magic/Magdir/assembler
@@ -0,0 +1,18 @@
+#------------------------------------------------------------------------------
+# $File: assembler,v 1.6 2013/12/11 14:14:20 christos Exp $
+# make:  file(1) magic for assembler source
+#
+0	regex	\^[\040\t]{0,50}\\.asciiz		assembler source text
+!:mime	text/x-asm
+0	regex	\^[\040\t]{0,50}\\.byte		assembler source text
+!:mime	text/x-asm
+0	regex	\^[\040\t]{0,50}\\.even		assembler source text
+!:mime	text/x-asm
+0	regex	\^[\040\t]{0,50}\\.globl		assembler source text
+!:mime	text/x-asm
+0	regex	\^[\040\t]{0,50}\\.text		assembler source text
+!:mime	text/x-asm
+0	regex	\^[\040\t]{0,50}\\.file		assembler source text
+!:mime	text/x-asm
+0	regex	\^[\040\t]{0,50}\\.type		assembler source text
+!:mime	text/x-asm
diff --git a/contrib/file/Magdir/asterix b/contrib/file/magic/Magdir/asterix
similarity index 100%
rename from contrib/file/Magdir/asterix
rename to contrib/file/magic/Magdir/asterix
diff --git a/contrib/file/Magdir/att3b b/contrib/file/magic/Magdir/att3b
similarity index 85%
rename from contrib/file/Magdir/att3b
rename to contrib/file/magic/Magdir/att3b
index 96880111e057..a3ed9c0037a9 100644
--- a/contrib/file/Magdir/att3b
+++ b/contrib/file/magic/Magdir/att3b
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: att3b,v 1.8 2009/09/19 16:28:08 christos Exp $
+# $File: att3b,v 1.9 2014/04/30 21:41:02 christos Exp $
 # att3b:  file(1) magic for AT&T 3B machines
 #
 # The `versions' should be un-commented if they work for you.
@@ -11,10 +11,10 @@
 # The 3B20 conflicts with SCCS.
 #0	beshort		0550		3b20 COFF executable
 #>12	belong		>0		not stripped
-#>22	beshort		>0		- version %ld
+#>22	beshort		>0		- version %d
 #0	beshort		0551		3b20 COFF executable (TV)
 #>12	belong		>0		not stripped
-#>22	beshort		>0		- version %ld
+#>22	beshort		>0		- version %d
 #
 # WE32K
 #
@@ -29,12 +29,12 @@
 >20	beshort		0410		(pure)
 >20	beshort		0413		(demand paged)
 >20	beshort		0443		(target shared library)
->22	beshort		>0		- version %ld
+>22	beshort		>0		- version %d
 0	beshort		0561		WE32000 COFF executable (TV)
 >12	belong		>0		not stripped
 #>18	beshort		&00020000	- 32100 required
 #>18	beshort		&00040000	and MAU hardware required
-#>22	beshort		>0		- version %ld
+#>22	beshort		>0		- version %d
 #
 # core file for 3b2 
 0	string		\000\004\036\212\200	3b2 core file
diff --git a/contrib/file/Magdir/audio b/contrib/file/magic/Magdir/audio
similarity index 92%
rename from contrib/file/Magdir/audio
rename to contrib/file/magic/Magdir/audio
index 0cbe25903280..338d8aebda63 100644
--- a/contrib/file/Magdir/audio
+++ b/contrib/file/magic/Magdir/audio
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: audio,v 1.64 2012/02/20 16:37:34 christos Exp $
+# $File: audio,v 1.71 2014/05/14 23:30:28 christos Exp $
 # audio:  file(1) magic for sound formats (see also "iff")
 #
 # Jan Nicolai Langfeldt (janl@ifi.uio.no), Dan Quinlan (quinlan@yggdrasil.com),
@@ -104,7 +104,7 @@
 
 # first entry is also the string "NTRK"
 0	belong		0x4e54524b	MultiTrack sound data
->4	belong		x		- version %ld
+>4	belong		x		- version %d
 
 # Extended MOD format (*.emd) (Greg Roelofs, newt@uchicago.edu); NOT TESTED
 # [based on posting 940824 by "Dirk/Elastik", husberg@lehtori.cc.tut.fi]
@@ -512,7 +512,7 @@
 >>12		ulelong		x		\b, sample rate %d
 
 # adlib sound files
-# From Gürkan Sengün <gurkan@linuks.mine.nu>, http://www.linuks.mine.nu
+# From Gurkan Sengun <gurkan@linuks.mine.nu>, http://www.linuks.mine.nu
 0    	string		RAWADATA	RdosPlay RAW
 
 1068	string		RoR		AMUSIC Adlib Tracker
@@ -571,6 +571,7 @@
 
 # musepak support From: "Jiri Pejchal" <jiri.pejchal@gmail.com>
 0       string          MP+     Musepack audio
+!:mime	audio/x-musepack
 >3      byte            255     \b, SV pre8
 >3      byte&0xF        0x6     \b, SV 6
 >3      byte&0xF        0x8     \b, SV 8
@@ -636,3 +637,66 @@
 # URL:  http://wiki.multimedia.cx/index.php?title=WavPack
 # From: Mike Melanson <mike@multimedia.cx>
 0	string	wvpk	WavPack Lossless Audio
+
+# From Fabio R. Schmidlin <frs@pop.com.br>
+# VGM music file
+0	string		Vgm\ 
+>9	ubyte		>0	VGM Video Game Music dump v
+>>9	ubyte/16	>0	\b%d
+>>9	ubyte&0x0F	x	\b%d
+>>8	ubyte/16	x	\b.%d
+>>8	ubyte&0x0F	>0	\b%d
+#Get soundchips
+>>8	ubyte		x	\b, soundchip(s)=
+>>0x0C	ulelong		>0	SN76489,
+>>0x10	ulelong		>0	YM2413,
+>>0x2C	ulelong		>0	YM2612,
+>>0x30	ulelong		>0	YM2151,
+>>0x38	ulelong		>0	Sega PCM,
+>>0x34	ulelong		>0xC
+>>>0x40	ulelong		>0	RF5C68,
+>>0x34	ulelong		>0x10
+>>>0x44	ulelong		>0	YM2203,
+>>0x34	ulelong		>0x14
+>>>0x48	ulelong		>0	YM2608,
+>>0x34	ulelong		>0x18
+>>>0x4C	lelong		>0	YM2610,
+>>>0x4C	lelong		<0	YM2610B,
+>>0x34	ulelong		>0x1C
+>>>0x50	ulelong		>0	YM3812,
+>>0x34	ulelong		>0x20
+>>>0x54	ulelong		>0	YM3526,
+>>0x34	ulelong		>0x24
+>>>0x58	ulelong		>0	Y8950,
+>>0x34	ulelong		>0x28
+>>>0x5C	ulelong		>0	YMF262,
+>>0x34	ulelong		>0x2C
+>>>0x60	ulelong		>0	YMF278B,
+>>0x34	ulelong		>0x30
+>>>0x64	ulelong		>0	YMF271,
+>>0x34	ulelong		>0x34
+>>>0x68	ulelong		>0	YMZ280B,
+>>0x34	ulelong		>0x38
+>>>0x6C	ulelong		>0	RF5C164,
+>>0x34	ulelong		>0x3C
+>>>0x70	ulelong		>0	PWM,
+>>0x34	ulelong		>0x40
+>>>0x74	ulelong		>0
+>>>>0x78 ubyte		0x00	AY-3-8910,
+>>>>0x78 ubyte		0x01	AY-3-8912,
+>>>>0x78 ubyte		0x02	AY-3-8913,
+>>>>0x78 ubyte		0x03	AY-3-8930,
+>>>>0x78 ubyte		0x10	YM2149,
+>>>>0x78 ubyte		0x11	YM3439,
+
+# GVOX Encore file format
+# Since this is a proprietary file format and there is no publicly available
+# format specification, this is just based on induction
+#
+0	string	SCOW
+>4	byte	0xc4	GVOX Encore music, version 5.0 or above
+>4	byte	0xc2	GVOX Encore music, version < 5.0
+
+0	string	ZBOT
+>4	byte	0xc5	GVOX Encore music, version < 5.0
+
diff --git a/contrib/file/Magdir/basis b/contrib/file/magic/Magdir/basis
similarity index 100%
rename from contrib/file/Magdir/basis
rename to contrib/file/magic/Magdir/basis
diff --git a/contrib/file/Magdir/bflt b/contrib/file/magic/Magdir/bflt
similarity index 80%
rename from contrib/file/Magdir/bflt
rename to contrib/file/magic/Magdir/bflt
index 03eb59d34ae1..c46b4dbb4be9 100644
--- a/contrib/file/Magdir/bflt
+++ b/contrib/file/magic/Magdir/bflt
@@ -1,12 +1,12 @@
 
 #------------------------------------------------------------------------------
-# $File: bflt,v 1.4 2009/09/19 16:28:08 christos Exp $
+# $File: bflt,v 1.5 2014/04/30 21:41:02 christos Exp $
 # bFLT: file(1) magic for BFLT uclinux binary files
 #
 # From Philippe De Muyter <phdm@macqel.be>
 #
 0	string		bFLT		BFLT executable
->4	belong		x		- version %ld
+>4	belong		x		- version %d
 >4	belong		4
 >>36	belong&0x1	0x1		ram
 >>36	belong&0x2	0x2		gotpic
diff --git a/contrib/file/magic/Magdir/blackberry b/contrib/file/magic/Magdir/blackberry
new file mode 100644
index 000000000000..4a61d4e98cfa
--- /dev/null
+++ b/contrib/file/magic/Magdir/blackberry
@@ -0,0 +1,8 @@
+
+#------------------------------------------------------------------------------
+# $File: blackberry,v 1.1 2014/01/31 01:51:32 christos Exp $
+# blackberry:  file(1) magic for BlackBerry file formats
+#
+5	belong	0		
+>8	belong  010010010	BlackBerry RIM ETP file
+>>22	string	x		\b for %s
diff --git a/contrib/file/Magdir/blcr b/contrib/file/magic/Magdir/blcr
similarity index 100%
rename from contrib/file/Magdir/blcr
rename to contrib/file/magic/Magdir/blcr
diff --git a/contrib/file/Magdir/blender b/contrib/file/magic/Magdir/blender
similarity index 100%
rename from contrib/file/Magdir/blender
rename to contrib/file/magic/Magdir/blender
diff --git a/contrib/file/Magdir/blit b/contrib/file/magic/Magdir/blit
similarity index 100%
rename from contrib/file/Magdir/blit
rename to contrib/file/magic/Magdir/blit
diff --git a/contrib/file/Magdir/bout b/contrib/file/magic/Magdir/bout
similarity index 100%
rename from contrib/file/Magdir/bout
rename to contrib/file/magic/Magdir/bout
diff --git a/contrib/file/Magdir/bsdi b/contrib/file/magic/Magdir/bsdi
similarity index 63%
rename from contrib/file/Magdir/bsdi
rename to contrib/file/magic/Magdir/bsdi
index be16e3a1a23b..8499b0c90363 100644
--- a/contrib/file/Magdir/bsdi
+++ b/contrib/file/magic/Magdir/bsdi
@@ -1,27 +1,17 @@
 
 #------------------------------------------------------------------------------
-# $File: bsdi,v 1.5 2009/09/19 16:28:08 christos Exp $
+# $File: bsdi,v 1.7 2014/03/29 15:40:34 christos Exp $
 # bsdi:  file(1) magic for BSD/OS (from BSDI) objects
+# Some object/executable formats use the same magic numbers as are used
+# in other OSes; those are handled by entries in aout.
 #
 
 0	lelong		0314		386 compact demand paged pure executable
 >16	lelong		>0		not stripped
 >32	byte		0x6a		(uses shared libs)
 
-0	lelong		0407		386 executable
->16	lelong		>0		not stripped
->32	byte		0x6a		(uses shared libs)
-
-0	lelong		0410		386 pure executable
->16	lelong		>0		not stripped
->32	byte		0x6a		(uses shared libs)
-
-0	lelong		0413		386 demand paged pure executable
->16	lelong		>0		not stripped
->32	byte		0x6a		(uses shared libs)
-
 # same as in SunOS 4.x, except for static shared libraries
-0	belong&077777777	0600413		sparc demand paged
+0	belong&077777777	0600413		SPARC demand paged
 >0	byte		&0x80
 >>20	belong		<4096		shared library
 >>20	belong		=4096		dynamically linked executable
@@ -30,13 +20,13 @@
 >16	belong		>0		not stripped
 >36	belong		0xb4100001	(uses shared libs)
 
-0	belong&077777777	0600410		sparc pure
+0	belong&077777777	0600410		SPARC pure
 >0	byte		&0x80		dynamically linked executable
 >0	byte		^0x80		executable
 >16	belong		>0		not stripped
 >36	belong		0xb4100001	(uses shared libs)
 
-0	belong&077777777	0600407		sparc
+0	belong&077777777	0600407		SPARC
 >0	byte		&0x80		dynamically linked executable
 >0	byte		^0x80		executable
 >16	belong		>0		not stripped
diff --git a/contrib/file/Magdir/bsi b/contrib/file/magic/Magdir/bsi
similarity index 100%
rename from contrib/file/Magdir/bsi
rename to contrib/file/magic/Magdir/bsi
diff --git a/contrib/file/Magdir/btsnoop b/contrib/file/magic/Magdir/btsnoop
similarity index 100%
rename from contrib/file/Magdir/btsnoop
rename to contrib/file/magic/Magdir/btsnoop
diff --git a/contrib/file/Magdir/c-lang b/contrib/file/magic/Magdir/c-lang
similarity index 65%
rename from contrib/file/Magdir/c-lang
rename to contrib/file/magic/Magdir/c-lang
index 066562760a51..39889ec1cf32 100644
--- a/contrib/file/Magdir/c-lang
+++ b/contrib/file/magic/Magdir/c-lang
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: c-lang,v 1.16 2011/12/09 08:02:16 rrt Exp $
+# $File: c-lang,v 1.19 2014/06/03 19:17:27 christos Exp $
 # c-lang:  file(1) magic for C and related languages programs
 #
 
@@ -12,37 +12,37 @@
 # C
 0	regex	\^#include	C source text
 !:mime	text/x-c
-0	regex	\^char		C source text
+0	regex	\^char[\ \t\n]+	C source text
 !:mime	text/x-c
-0	regex	\^double		C source text
+0	regex	\^double[\ \t\n]+		C source text
 !:mime	text/x-c
-0	regex	\^extern		C source text
+0	regex	\^extern[\ \t\n]+		C source text
 !:mime	text/x-c
-0	regex	\^float		C source text
+0	regex	\^float[\ \t\n]+		C source text
 !:mime	text/x-c
-0	regex	\^struct		C source text
+0	regex	\^struct[\ \t\n]+		C source text
 !:mime	text/x-c
-0	regex	\^union		C source text
+0	regex	\^union[\ \t\n]+		C source text
 !:mime	text/x-c
 0	search/8192	main(		C source text
 !:mime	text/x-c
 
 # C++
 # The strength of these rules is increased so they beat the C rules above
-0	regex	\^template	C++ source text
-!:strength + 10
+0	regex	\^template[\ \t\n]+	C++ source text
+!:strength + 5
 !:mime	text/x-c++
-0	regex	\^virtual		C++ source text
-!:strength + 10
+0	regex	\^virtual[\ \t\n]+		C++ source text
+!:strength + 5
 !:mime	text/x-c++
-0	regex	\^class		C++ source text
-!:strength + 10
+0	regex	\^class[\ \t\n]+		C++ source text
+!:strength + 5
 !:mime	text/x-c++
 0	regex	\^public:		C++ source text
-!:strength + 10
+!:strength + 5
 !:mime	text/x-c++
 0	regex	\^private:		C++ source text
-!:strength + 10
+!:strength + 5
 !:mime	text/x-c++
 
 # From: Mikhail Teterin <mi@aldan.algebra.com> 
@@ -50,7 +50,7 @@
 >7	string		x		version %.2s
 # We skip the path here, because it is often long (so file will
 # truncate it) and mostly redundant.
-# The inverted index functionality was added some time betwen
+# The inverted index functionality was added some time between
 # versions 11 and 15, so look for -q if version is above 14:
 >7	string		>14
 >>10	search/100	\ -q\ 		with inverted index
diff --git a/contrib/file/Magdir/c64 b/contrib/file/magic/Magdir/c64
similarity index 100%
rename from contrib/file/Magdir/c64
rename to contrib/file/magic/Magdir/c64
diff --git a/contrib/file/Magdir/cad b/contrib/file/magic/Magdir/cad
similarity index 69%
rename from contrib/file/Magdir/cad
rename to contrib/file/magic/Magdir/cad
index cc4ef343d822..9b09fd7a1917 100644
--- a/contrib/file/Magdir/cad
+++ b/contrib/file/magic/Magdir/cad
@@ -1,16 +1,9 @@
 
 #------------------------------------------------------------------------------
-# $File: cad,v 1.11 2011/12/08 12:12:46 rrt Exp $
+# $File: cad,v 1.13 2014/03/23 18:05:38 christos Exp $
 # autocad:  file(1) magic for cad files
 #
 
-# AutoCAD DWG versions R13/R14 (www.autodesk.com)
-# Written December 01, 2003 by Lester Hightower
-# Based on the DWG File Format Specifications at http://www.opendwg.org/
-0	string	       \101\103\061\060\061		   AutoCAD
->5	string	       \062\000\000\000\000		   DWG ver. R13
->5	string	       \064\000\000\000\000		   DWG ver. R14
-
 # Microstation DGN/CIT Files (www.bentley.com)
 # Last updated July 29, 2005 by Lester Hightower
 # DGN is the default file extension of Microstation/Intergraph CAD files.
@@ -49,19 +42,62 @@
 >4	string	\030\000\000			CITFile
 >4	string	\030\000\003			CITFile
 
+# AutoCAD 
+# Merge of the different contributions and updates from http://en.wikipedia.org/wiki/Dwg
+# and http://www.iana.org/assignments/media-types/image/vnd.dwg
+0	string	MC0.0	DWG AutoDesk AutoCAD Release 1.0
+!:mime image/vnd.dwg
+0	string	AC1.2	DWG AutoDesk AutoCAD Release 1.2
+!:mime image/vnd.dwg
+0	string	AC1.3	DWG AutoDesk AutoCAD Release 1.3
+!:mime image/vnd.dwg
+0	string	AC1.40	DWG AutoDesk AutoCAD Release 1.40
+!:mime image/vnd.dwg
+0	string	AC1.50	DWG AutoDesk AutoCAD Release 2.05
+!:mime image/vnd.dwg
+0	string	AC2.10	DWG AutoDesk AutoCAD Release 2.10
+!:mime image/vnd.dwg
+0	string	AC2.21	DWG AutoDesk AutoCAD Release 2.21
+!:mime image/vnd.dwg
+0	string	AC2.22	DWG AutoDesk AutoCAD Release 2.22
+!:mime image/vnd.dwg
+0	string	AC1001	DWG AutoDesk AutoCAD Release 2.22
+!:mime image/vnd.dwg
+0	string	AC1002	DWG AutoDesk AutoCAD Release 2.50
+!:mime image/vnd.dwg
+0	string	AC1003	DWG AutoDesk AutoCAD Release 2.60
+!:mime image/vnd.dwg
+0	string	AC1004	DWG AutoDesk AutoCAD Release 9
+!:mime image/vnd.dwg
+0	string	AC1006	DWG AutoDesk AutoCAD Release 10
+!:mime image/vnd.dwg
+0	string	AC1009	DWG AutoDesk AutoCAD Release 11/12
+!:mime image/vnd.dwg
+# AutoCAD DWG versions R13/R14 (www.autodesk.com)
+# Written December 01, 2003 by Lester Hightower
+# Based on the DWG File Format Specifications at http://www.opendwg.org/
 # AutoCad, from Nahuel Greco
 # AutoCAD DWG versions R12/R13/R14 (www.autodesk.com)
-0	string	AC1012		DWG AutoDesk AutoCad (release 12)
-0	string	AC1013		DWG AutoDesk AutoCad (release 13)
-0	string	AC1014		DWG AutoDesk AutoCad (release 14)
+0	string	AC1012	DWG AutoDesk AutoCAD Release 13
+!:mime image/vnd.dwg
+0	string	AC1014	DWG AutoDesk AutoCAD Release 14
+!:mime image/vnd.dwg
+0	string	AC1015	DWG AutoDesk AutoCAD 2000/2002
+!:mime image/vnd.dwg
+
 # A new version of AutoCAD DWG
 # Sergey Zaykov (mail_of_sergey@mail.ru, sergey_zaikov@rambler.ru,
 # ICQ 358572321)
 # From various sources like:
 # http://autodesk.blogs.com/between_the_lines/autocad-release-history.html
-0	string	AC1018 		DWG AutoDesk AutoCAD 2004/2005/2006
-0	string	AC1021 		DWG AutoDesk AutoCAD 2007/2008/2009
-0	string	AC1024 		DWG AutoDesk AutoCAD 2010/2011
+0	string	AC1018	DWG AutoDesk AutoCAD 2004/2005/2006
+!:mime image/vnd.dwg
+0	string	AC1021	DWG AutoDesk AutoCAD 2007/2008/2009
+!:mime image/vnd.dwg
+0	string	AC1024	DWG AutoDesk AutoCAD 2010/2011/2012
+!:mime image/vnd.dwg
+0	string	AC1027	DWG AutoDesk AutoCAD 2013/2014
+!:mime image/vnd.dwg
 
 # KOMPAS 2D drawing from ASCON 
 # This is KOMPAS 2D drawing or fragment of drawing but is not detailed nor
@@ -110,9 +146,11 @@
 0	beshort	0x0809		Bentley/Intergraph MicroStation
 >0x02	byte	0xfe
 >>0x04	beshort	0x1800		CIT raster CAD
-0	string	AC1012		AutoDesk AutoCAD R13
-0	string	AC1014		AutoDesk AutoCAD R14 
-0	string	AC1015		AutoDesk AutoCAD R2000
 
 # 3DS (3d Studio files) Conflicts with diff output 0x3d '='
 #16	beshort		0x3d3d		image/x-3ds
+
+# MegaCAD 2D/3D drawing (.prt)
+# http://megacad.de/
+# From: Markus Heidelberg <markus.heidelberg@web.de>
+0	string	MegaCad23\0	MegaCAD 2D/3D drawing
diff --git a/contrib/file/magic/Magdir/cafebabe b/contrib/file/magic/Magdir/cafebabe
new file mode 100644
index 000000000000..b3206e71e49e
--- /dev/null
+++ b/contrib/file/magic/Magdir/cafebabe
@@ -0,0 +1,63 @@
+
+#------------------------------------------------------------------------------
+# $File: cafebabe,v 1.16 2014/04/30 21:41:02 christos Exp $
+# Cafe Babes unite!
+#
+# Since Java bytecode and Mach-O universal binaries have the same magic number,
+# the test must be performed in the same "magic" sequence to get both right.
+# The long at offset 4 in a Mach-O universal binary tells the number of
+# architectures; the short at offset 4 in a Java bytecode file is the JVM minor
+# version and the short at offset 6 is the JVM major version.  Since there are only 
+# only 18 labeled Mach-O architectures at current, and the first released 
+# Java class format was version 43.0, we can safely choose any number
+# between 18 and 39 to test the number of architectures against
+# (and use as a hack). Let's not use 18, because the Mach-O people
+# might add another one or two as time goes by...
+#
+### JAVA START ###
+0	belong		0xcafebabe
+>4	belong		>30		compiled Java class data,
+!:mime	application/x-java-applet
+>>6	beshort		x	        version %d.
+>>4	beshort		x       	\b%d
+# Which is which?
+#>>4	belong		0x032d		(Java 1.0)
+#>>4	belong		0x032d		(Java 1.1)
+>>4	belong		0x002e		(Java 1.2)
+>>4	belong		0x002f		(Java 1.3)
+>>4	belong		0x0030		(Java 1.4)
+>>4	belong		0x0031		(Java 1.5)
+>>4	belong		0x0032		(Java 1.6)
+
+0	belong		0xcafed00d	JAR compressed with pack200,
+>5	byte		x		version %d.
+>4	byte		x		\b%d
+!:mime	application/x-java-pack200
+
+
+0	belong		0xcafed00d	JAR compressed with pack200,
+>5	byte		x		version %d.
+>4	byte		x		\b%d
+!:mime	application/x-java-pack200
+
+### JAVA END ###
+### MACH-O START ###
+
+0	name		mach-o		\b [
+>0	use		mach-o-cpu	\b
+>&(8.L)	indirect			\b: 
+>0	belong		x		\b]
+
+0	belong		0xcafebabe
+>4	belong		1		Mach-O universal binary with 1 architecture:
+>>8	use		mach-o		\b
+>4	belong		>1
+>>4	belong		<20		Mach-O universal binary with %d architectures:
+>>>8	use		mach-o		\b
+>>>28	use		mach-o		\b
+>>4	belong		>2
+>>>48	use		mach-o		\b
+>>4	belong		>3
+>>>68	use		mach-o		\b
+
+### MACH-O END ###
diff --git a/contrib/file/Magdir/cddb b/contrib/file/magic/Magdir/cddb
similarity index 100%
rename from contrib/file/Magdir/cddb
rename to contrib/file/magic/Magdir/cddb
diff --git a/contrib/file/Magdir/chord b/contrib/file/magic/Magdir/chord
similarity index 100%
rename from contrib/file/Magdir/chord
rename to contrib/file/magic/Magdir/chord
diff --git a/contrib/file/Magdir/cisco b/contrib/file/magic/Magdir/cisco
similarity index 100%
rename from contrib/file/Magdir/cisco
rename to contrib/file/magic/Magdir/cisco
diff --git a/contrib/file/Magdir/citrus b/contrib/file/magic/Magdir/citrus
similarity index 100%
rename from contrib/file/Magdir/citrus
rename to contrib/file/magic/Magdir/citrus
diff --git a/contrib/file/Magdir/clarion b/contrib/file/magic/Magdir/clarion
similarity index 88%
rename from contrib/file/Magdir/clarion
rename to contrib/file/magic/Magdir/clarion
index cff7a3bdd0e0..9fa0049dab10 100644
--- a/contrib/file/Magdir/clarion
+++ b/contrib/file/magic/Magdir/clarion
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: clarion,v 1.4 2009/09/19 16:28:08 christos Exp $
+# $File: clarion,v 1.5 2014/04/30 21:41:02 christos Exp $
 # clarion:  file(1) magic for # Clarion Personal/Professional Developer
 # (v2 and above)
 # From: Julien Blache <jb@jblache.org>
@@ -15,7 +15,7 @@
 >2	leshort	&0x0010	\b, compressed
 >2	leshort	&0x0040	\b, read only
 # number of records
->5	lelong	x	\b, %ld records
+>5	lelong	x	\b, %d records
 
 # Memo files
 0	leshort	0x334d	Clarion Developer (v2 and above) memo data
diff --git a/contrib/file/Magdir/claris b/contrib/file/magic/Magdir/claris
similarity index 82%
rename from contrib/file/Magdir/claris
rename to contrib/file/magic/Magdir/claris
index a2b120a834c5..0f7b591b77f3 100644
--- a/contrib/file/Magdir/claris
+++ b/contrib/file/magic/Magdir/claris
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: claris,v 1.5 2009/09/19 16:28:08 christos Exp $
+# $File: claris,v 1.7 2014/06/03 19:17:27 christos Exp $
 # claris:  file(1) magic for claris
 # "H. Nanosecond" <aldomel@ix.netcom.com>
 # Claris Works a word processor, etc.
@@ -11,16 +11,16 @@
 #*
 #0001000 #010 250 377 377 377 377 000 213 000 230 000 021 002 377 014 000
 #null to byte 1000 octal
-514	string	\377\377\377\377\000	Claris clip art?
->0	string	\0\0\0\0\0\0\0\0\0\0\0\0\0	yes.
-514	string	\377\377\377\377\001	Claris clip art?
->0	string	\0\0\0\0\0\0\0\0\0\0\0\0\0	yes.
+514	string	\377\377\377\377\000
+>0	string	\0\0\0\0\0\0\0\0\0\0\0\0\0	Claris clip art
+514	string	\377\377\377\377\001
+>0	string	\0\0\0\0\0\0\0\0\0\0\0\0\0	Claris clip art
 
 # Claris works files
 # .cwk
 0	string	\002\000\210\003\102\117\102\117\000\001\206 Claris works document
 # .plt
-0	string	\020\341\000\000\010\010	Claris Works pallete files .plt
+0	string	\020\341\000\000\010\010	Claris Works palette files .plt
 
 # .msp a dictionary file I am not sure about this I have only one .msp file
 0	string	\002\271\262\000\040\002\000\164	Claris works dictionary
diff --git a/contrib/file/Magdir/clipper b/contrib/file/magic/Magdir/clipper
similarity index 94%
rename from contrib/file/Magdir/clipper
rename to contrib/file/magic/Magdir/clipper
index 9f4753405906..98278ebf0615 100644
--- a/contrib/file/Magdir/clipper
+++ b/contrib/file/magic/Magdir/clipper
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: clipper,v 1.6 2009/09/19 16:28:08 christos Exp $
+# $File: clipper,v 1.7 2014/04/30 21:41:02 christos Exp $
 # clipper:  file(1) magic for Intergraph (formerly Fairchild) Clipper.
 #
 # XXX - what byte order does the Clipper use?
@@ -35,7 +35,7 @@
 >20	short		0413		(demand paged)
 >20	short		0443		(target shared library)
 >12	long		>0		not stripped
->22	short		>0		- version %ld
+>22	short		>0		- version %d
 0	short		0577		CLIPPER COFF executable
 >18	short&074000	000000		C1 R1 
 >18	short&074000	004000		C2 R1
@@ -47,7 +47,7 @@
 >20	short		0413		(paged)
 >20	short		0443		(target shared library)
 >12	long		>0		not stripped
->22	short		>0		- version %ld
+>22	short		>0		- version %d
 >48	long&01		01		alignment trap enabled
 >52	byte		1		-Ctnc
 >52	byte		2		-Ctsw
diff --git a/contrib/file/Magdir/commands b/contrib/file/magic/Magdir/commands
similarity index 80%
rename from contrib/file/Magdir/commands
rename to contrib/file/magic/Magdir/commands
index 4fb151f32927..20c1058c04f2 100644
--- a/contrib/file/Magdir/commands
+++ b/contrib/file/magic/Magdir/commands
@@ -1,16 +1,23 @@
 
 #------------------------------------------------------------------------------
-# $File: commands,v 1.42 2011/12/05 23:14:02 rrt Exp $
+# $File: commands,v 1.50 2014/05/30 16:48:44 christos Exp $
 # commands:  file(1) magic for various shells and interpreters
 #
 #0	string/w	:			shell archive or script for antique kernel text
 0	string/wt	#!\ /bin/sh		POSIX shell script text executable
 !:mime	text/x-shellscript
+0	string/wb	#!\ /bin/sh		POSIX shell script executable (binary data)
+!:mime	text/x-shellscript
+
 0	string/wt	#!\ /bin/csh		C shell script text executable
 !:mime	text/x-shellscript
+
 # korn shell magic, sent by George Wu, gwu@clyde.att.com
 0	string/wt	#!\ /bin/ksh		Korn shell script text executable
 !:mime	text/x-shellscript
+0	string/wb	#!\ /bin/ksh		Korn shell script executable (binary data)
+!:mime	text/x-shellscript
+
 0	string/wt 	#!\ /bin/tcsh		Tenex C shell script text executable
 !:mime	text/x-shellscript
 0	string/wt	#!\ /usr/bin/tcsh	Tenex C shell script text executable
@@ -49,7 +56,7 @@
 !:mime	text/x-awk
 0	string/wt	#!\ /usr/bin/awk	awk script text executable
 !:mime	text/x-awk
-0	regex		=^\\s*BEGIN\\s*[{]	awk script text
+0	regex/4096	=^\\s{0,100}BEGIN\\s{0,100}[{]	awk script text
 
 # AT&T Bell Labs' Plan 9 shell
 0	string/wt	#!\ /bin/rc	Plan 9 rc shell script text executable
@@ -57,27 +64,38 @@
 # bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
 0	string/wt	#!\ /bin/bash	Bourne-Again shell script text executable
 !:mime	text/x-shellscript
+0	string/wb	#!\ /bin/bash	Bourne-Again shell script executable (binary data)
+!:mime	text/x-shellscript
 0	string/wt	#!\ /usr/bin/bash	Bourne-Again shell script text executable
 !:mime	text/x-shellscript
+0	string/wb	#!\ /usr/bin/bash	Bourne-Again shell script executable (binary data)
+!:mime	text/x-shellscript
 0	string/wt	#!\ /usr/local/bash	Bourne-Again shell script text executable
 !:mime	text/x-shellscript
+0	string/wb	#!\ /usr/local/bash	Bourne-Again shell script executable (binary data)
+!:mime	text/x-shellscript
 0	string/wt	#!\ /usr/local/bin/bash	Bourne-Again shell script text executable
 !:mime	text/x-shellscript
+0	string/wb	#!\ /usr/local/bin/bash	Bourne-Again shell script executable (binary data)
+!:mime	text/x-shellscript
 
 # PHP scripts
 # Ulf Harnhammar <ulfh@update.uu.se>
 0	search/1/c	=<?php			PHP script text
+!:strength + 10
 !:mime	text/x-php
 0	search/1	=<?\n			PHP script text
 !:mime	text/x-php
 0	search/1	=<?\r			PHP script text
 !:mime	text/x-php
 0	search/1/w	#!\ /usr/local/bin/php	PHP script text executable
+!:strength + 10
 !:mime	text/x-php
 0	search/1/w	#!\ /usr/bin/php	PHP script text executable
+!:strength + 10
 !:mime	text/x-php
 # Smarty compiled template, http://www.smarty.net/
-# Elan Ruusamäe <glen@delfi.ee>
+# Elan Ruusamae <glen@delfi.ee>
 0	string	=<?php\ /*\ Smarty\ version	Smarty compiled template
 >24	regex	[0-9.]+				\b, version %s
 !:mime	text/x-php
diff --git a/contrib/file/Magdir/communications b/contrib/file/magic/Magdir/communications
similarity index 100%
rename from contrib/file/Magdir/communications
rename to contrib/file/magic/Magdir/communications
diff --git a/contrib/file/Magdir/compress b/contrib/file/magic/Magdir/compress
similarity index 89%
rename from contrib/file/Magdir/compress
rename to contrib/file/magic/Magdir/compress
index 94c209d76112..9dc9489771bf 100644
--- a/contrib/file/Magdir/compress
+++ b/contrib/file/magic/Magdir/compress
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: compress,v 1.49 2011/12/07 22:04:27 christos Exp $
+# $File: compress,v 1.58 2014/05/07 19:36:59 christos Exp $
 # compress:  file(1) magic for pure-compression formats (no archives)
 #
 # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
@@ -22,6 +22,7 @@
 #         other than 8 ("deflate", the only method defined in RFC 1952).
 0       string          \037\213        gzip compressed data
 !:mime	application/x-gzip
+!:strength * 2
 >2	byte		<8		\b, reserved method
 >2	byte		>8		\b, unknown method
 >3	byte		&0x01		\b, ASCII
@@ -30,6 +31,10 @@
 >3	byte&0xC	=0x08
 >>10	string		x		\b, was "%s"
 >3	byte		&0x10		\b, has comment
+>3	byte		&0x20		\b, encrypted
+>4	ledate		>0		\b, last modified: %s
+>8	byte		2		\b, max compression
+>8	byte		4		\b, max speed
 >9	byte		=0x00		\b, from FAT filesystem (MS-DOS, OS/2, NT)
 >9	byte		=0x01		\b, from Amiga
 >9	byte		=0x02		\b, from VMS
@@ -44,11 +49,6 @@
 >9	byte		=0x0B		\b, from NTFS filesystem (NT)
 >9	byte		=0x0C		\b, from QDOS
 >9	byte		=0x0D		\b, from Acorn RISCOS
->3	byte		&0x10		\b, comment
->3	byte		&0x20		\b, encrypted
->4	ledate		>0		\b, last modified: %s
->8	byte		2		\b, max compression
->8	byte		4		\b, max speed
 
 # packed data, Huffman (minimum redundancy) codes on a byte-by-byte basis
 0	string		\037\036	packed data
@@ -191,10 +191,13 @@
 
 # Type: LZMA
 0	lelong&0xffffff	=0x5d
->12	leshort		=0xff			LZMA compressed data,
+>12	leshort		0xff			LZMA compressed data,
+!:mime	application/x-lzma
+>>5	lequad		=0xffffffffffffffff	streamed
+>>5	lequad		!0xffffffffffffffff	non-streamed, size %lld
+>12	leshort		0			LZMA compressed data,
 >>5	lequad		=0xffffffffffffffff	streamed
 >>5	lequad		!0xffffffffffffffff	non-streamed, size %lld
-!:mime	application/x-lzma
 
 # http://tukaani.org/xz/xz-file-format.txt
 0	ustring		\xFD7zXZ\x00		XZ compressed data
@@ -206,6 +209,15 @@
 >5	byte		x			\b.%d
 !:mime	application/x-lrzip
 
+# http://fastcompression.blogspot.fi/2013/04/lz4-streaming-format-final.html
+0	lelong		0x184d2204	LZ4 compressed data (v1.4+)
+!:mime	application/x-lz4
+# Added by osm0sis@xda-developers.com
+0 	lelong		0x184c2103	LZ4 compressed data (v1.0-v1.3)
+!:mime	application/x-lz4
+0	lelong		0x184c2102	LZ4 compressed data (v0.1-v0.9)
+!:mime	application/x-lz4
+
 # AFX compressed files (Wolfram Kleff)
 2	string		-afx-		AFX compressed file data
 
@@ -229,3 +241,13 @@
 >6	byte	>-1		%i)
 >7	long	>0		, original size: %i bytes
 >15	long	>30		, block size: %i bytes
+
+# Valve Pack (VPK) files
+0	lelong	0x55aa1234	Valve Pak file
+>0x4	lelong	x		\b, version %u
+>0x8	lelong	x		\b, %u entries
+
+# Snappy framing format
+# http://code.google.com/p/snappy/source/browse/trunk/framing_format.txt
+0	string	\377\006\0\0sNaPpY	snappy framed data
+!:mime	application/x-snappy-framed
diff --git a/contrib/file/Magdir/console b/contrib/file/magic/Magdir/console
similarity index 97%
rename from contrib/file/Magdir/console
rename to contrib/file/magic/Magdir/console
index 573dd15fd582..27227a4126b2 100644
--- a/contrib/file/Magdir/console
+++ b/contrib/file/magic/Magdir/console
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: console,v 1.18 2010/09/20 19:19:17 rrt Exp $
+# $File: console,v 1.19 2013/02/06 14:18:52 christos Exp $
 # Console game magic
 # Toby Deshane <hac@shoelace.digivill.net>
 #    ines:  file(1) magic for Marat's iNES Nintendo Entertainment System
@@ -137,7 +137,7 @@
 >113	string	x		(%s)
 
 #------------------------------------------------------------------------------
-# Microsoft Xbox executables .xbe (Esa Hyytiä <ehyytia@cc.hut.fi>)
+# Microsoft Xbox executables .xbe (Esa Hyytia <ehyytia@cc.hut.fi>)
 0       string          XBEH            XBE, Microsoft Xbox executable
 # probabilistic checks whether signed or not
 >0x0004 ulelong =0x0
@@ -177,7 +177,7 @@
 # From: Serge van den Boom <svdb@stack.nl>
 0	string		\x01ZZZZZ\x01	3DO "Opera" file system
 
-# From Gürkan Sengün <gurkan@linuks.mine.nu>, www.linuks.mine.nu
+# From Gurkan Sengun <gurkan@linuks.mine.nu>, www.linuks.mine.nu
 0	string		GBS		Nintendo Gameboy Music/Audio Data
 12	string		GameBoy\ Music\ Module	Nintendo Gameboy Music Module
 
diff --git a/contrib/file/Magdir/convex b/contrib/file/magic/Magdir/convex
similarity index 94%
rename from contrib/file/Magdir/convex
rename to contrib/file/magic/Magdir/convex
index 6141a82bba08..6b28f768cc48 100644
--- a/contrib/file/Magdir/convex
+++ b/contrib/file/magic/Magdir/convex
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: convex,v 1.7 2009/09/19 16:28:08 christos Exp $
+# $File: convex,v 1.8 2012/10/03 23:44:43 christos Exp $
 # convex:  file(1) magic for Convex boxes
 #
 # Convexes are big-endian.
@@ -30,8 +30,6 @@
 # The restore program uses these number to determine how the data is
 # to be extracted.
 #
-24	belong	=60011	dump format, 4.1 BSD or earlier
-24	belong	=60012	dump format, 4.2 or 4.3 BSD without IDC
 24	belong	=60013	dump format, 4.2 or 4.3 BSD (IDC compatible)
 24	belong	=60014	dump format, Convex Storage Manager by-reference dump
 #
diff --git a/contrib/file/Magdir/cracklib b/contrib/file/magic/Magdir/cracklib
similarity index 100%
rename from contrib/file/Magdir/cracklib
rename to contrib/file/magic/Magdir/cracklib
diff --git a/contrib/file/Magdir/ctags b/contrib/file/magic/Magdir/ctags
similarity index 100%
rename from contrib/file/Magdir/ctags
rename to contrib/file/magic/Magdir/ctags
diff --git a/contrib/file/magic/Magdir/ctf b/contrib/file/magic/Magdir/ctf
new file mode 100644
index 000000000000..37fdd1b60d23
--- /dev/null
+++ b/contrib/file/magic/Magdir/ctf
@@ -0,0 +1,23 @@
+
+#--------------------------------------------------------------
+# ctf:  file(1) magic for CTF (Common Trace Format) trace files
+#
+# Specs. available here: <http://www.efficios.com/ctf>
+#--------------------------------------------------------------
+
+# CTF trace data
+0	lelong	0xc1fc1fc1	Common Trace Format (CTF) trace data (LE)
+0	belong	0xc1fc1fc1	Common Trace Format (CTF) trace data (BE)
+
+# CTF metadata (packetized)
+0	lelong	0x75d11d57	Common Trace Format (CTF) packetized metadata (LE)
+>35	byte	x		\b, v%d
+>36	byte	x		\b.%d
+0	belong	0x75d11d57	Common Trace Format (CTF) packetized metadata (BE)
+>35	byte	x		\b, v%d
+>36	byte	x		\b.%d
+
+# CTF metadata (plain text)
+0	string	/*\x20CTF\x20   Common Trace Format (CTF) plain text metadata
+!:strength + 5			# this is to make sure we beat C
+>&0	regex	[0-9]+\.[0-9]+	\b, v%s
diff --git a/contrib/file/magic/Magdir/cubemap b/contrib/file/magic/Magdir/cubemap
new file mode 100644
index 000000000000..e2f87d854224
--- /dev/null
+++ b/contrib/file/magic/Magdir/cubemap
@@ -0,0 +1,8 @@
+
+#------------------------------------------------------------------------------
+# $File: cubemap,v 1.1 2012/06/06 13:03:20 christos Exp $
+# file(1) magic(5) data for cubemaps  Martin Erik Werner <martinerikwerner@gmail.com>
+#
+0	string	ACMP	Map file for the AssaultCube FPS game
+0	string	CUBE	Map file for cube and cube2 engine games
+0	string	MAPZ)	Map file for the Blood Frontier/Red Eclipse FPS games
diff --git a/contrib/file/Magdir/cups b/contrib/file/magic/Magdir/cups
similarity index 62%
rename from contrib/file/Magdir/cups
rename to contrib/file/magic/Magdir/cups
index da2cc4cce01e..005a134586e8 100644
--- a/contrib/file/Magdir/cups
+++ b/contrib/file/magic/Magdir/cups
@@ -1,55 +1,12 @@
 
 #------------------------------------------------------------------------------
-# $File: cups,v 1.1 2011/11/10 18:59:54 christos Exp $
+# $File: cups,v 1.3 2014/05/28 19:50:41 christos Exp $
 # Cups: file(1) magic for the cups raster file format
 # From: Laurent Martelli <martellilaurent@gmail.com>
 # http://www.cups.org/documentation.php/spec-raster.html
 #
 
-# Cups Raster image format, Big Endian
-0	string		RaS		
-!:mime	application/vnd.cups-raster
->3	string		t		Cups Raster version 1, Big Endian
->3	string		2		Cups Raster version 2, Big Endian
->3	string		3		Cups Raster version 3, Big Endian
->280	belong		x		\b, %d
->284	belong		x		\bx%d dpi
->376	belong		x		\b, %dx
->380	belong		x		\b%d pixels
->388	belong		x		%d bits/color
->392	belong		x		%d bits/pixel
->400	belong		0		ColorOrder=Chunky
->400	belong		1		ColorOrder=Banded
->400	belong		2		ColorOrder=Planar
->404	belong		0		ColorSpace=gray
->404	belong		1		ColorSpace=RGB
->404	belong		2		ColorSpace=RGBA
->404	belong		3		ColorSpace=black
->404	belong		4		ColorSpace=CMY
->404	belong		5		ColorSpace=YMC
->404	belong		6		ColorSpace=CMYK
->404	belong		7		ColorSpace=YMCK
->404	belong		8		ColorSpace=KCMY
->404	belong		9		ColorSpace=KCMYcm
->404	belong		10		ColorSpace=GMCK
->404	belong		11		ColorSpace=GMCS
->404	belong		12		ColorSpace=WHITE
->404	belong		13		ColorSpace=GOLD
->404	belong		14		ColorSpace=SILVER
->404	belong		15		ColorSpace=CIE XYZ
->404	belong		16		ColorSpace=CIE Lab
->404	belong		17		ColorSpace=RGBW
->404	belong		18		ColorSpace=sGray
->404	belong		19		ColorSpace=sRGB
->404	belong		20		ColorSpace=AdobeRGB
-
-
-# Cups Raster image format, Little Endian
-1	string		SaR		
->0	string		t		Cups Raster version 1, Little Endian
->0	string		2		Cups Raster version 2, Little Endian
->0	string		3		Cups Raster version 3, Little Endian
-!:mime	application/vnd.cups-raster
+0	name		cups-le
 >280	lelong		x		\b, %d
 >284	lelong		x		\bx%d dpi
 >376	lelong		x		\b, %dx
@@ -80,3 +37,20 @@
 >404	lelong		18		ColorSpace=sGray
 >404	lelong		19		ColorSpace=sRGB
 >404	lelong		20		ColorSpace=AdobeRGB
+
+# Cups Raster image format, Big Endian
+0	string		RaS		
+>3	string		t		Cups Raster version 1, Big Endian
+>3	string		2		Cups Raster version 2, Big Endian
+>3	string		3		Cups Raster version 3, Big Endian
+!:mime	application/vnd.cups-raster
+>0	use		^cups-le
+
+
+# Cups Raster image format, Little Endian
+1	string		SaR		
+>0	string		t		Cups Raster version 1, Little Endian
+>0	string		2		Cups Raster version 2, Little Endian
+>0	string		3		Cups Raster version 3, Little Endian
+!:mime	application/vnd.cups-raster
+>0	use		cups-le
diff --git a/contrib/file/Magdir/dact b/contrib/file/magic/Magdir/dact
similarity index 100%
rename from contrib/file/Magdir/dact
rename to contrib/file/magic/Magdir/dact
diff --git a/contrib/file/magic/Magdir/database b/contrib/file/magic/Magdir/database
new file mode 100644
index 000000000000..b18e25621126
--- /dev/null
+++ b/contrib/file/magic/Magdir/database
@@ -0,0 +1,490 @@
+
+#------------------------------------------------------------------------------
+# $File: database,v 1.41 2014/06/03 19:17:27 christos Exp $
+# database:  file(1) magic for various databases
+#
+# extracted from header/code files by Graeme Wilford (eep2gw@ee.surrey.ac.uk)
+#
+#
+# GDBM magic numbers
+#  Will be maintained as part of the GDBM distribution in the future.
+#  <downsj@teeny.org>
+0	belong	0x13579ace	GNU dbm 1.x or ndbm database, big endian
+!:mime	application/x-gdbm
+0	lelong	0x13579ace	GNU dbm 1.x or ndbm database, little endian
+!:mime	application/x-gdbm
+0	string	GDBM		GNU dbm 2.x database
+!:mime	application/x-gdbm
+#
+# Berkeley DB
+#
+# Ian Darwin's file /etc/magic files: big/little-endian version.
+#
+# Hash 1.85/1.86 databases store metadata in network byte order.
+# Btree 1.85/1.86 databases store the metadata in host byte order.
+# Hash and Btree 2.X and later databases store the metadata in host byte order.
+
+0	long	0x00061561	Berkeley DB
+!:mime	application/x-dbm
+>8	belong	4321
+>>4	belong	>2		1.86
+>>4	belong	<3		1.85
+>>4	belong	>0		(Hash, version %d, native byte-order)
+>8	belong	1234
+>>4	belong	>2		1.86
+>>4	belong	<3		1.85
+>>4	belong	>0		(Hash, version %d, little-endian)
+
+0	belong	0x00061561	Berkeley DB
+>8	belong	4321
+>>4	belong	>2		1.86
+>>4	belong	<3		1.85
+>>4	belong	>0		(Hash, version %d, big-endian)
+>8	belong	1234
+>>4	belong	>2		1.86
+>>4	belong	<3		1.85
+>>4	belong	>0		(Hash, version %d, native byte-order)
+
+0	long	0x00053162	Berkeley DB 1.85/1.86
+>4	long	>0		(Btree, version %d, native byte-order)
+0	belong	0x00053162	Berkeley DB 1.85/1.86
+>4	belong	>0		(Btree, version %d, big-endian)
+0	lelong	0x00053162	Berkeley DB 1.85/1.86
+>4	lelong	>0		(Btree, version %d, little-endian)
+
+12	long	0x00061561	Berkeley DB
+>16	long	>0		(Hash, version %d, native byte-order)
+12	belong	0x00061561	Berkeley DB
+>16	belong	>0		(Hash, version %d, big-endian)
+12	lelong	0x00061561	Berkeley DB
+>16	lelong	>0		(Hash, version %d, little-endian)
+
+12	long	0x00053162	Berkeley DB
+>16	long	>0		(Btree, version %d, native byte-order)
+12	belong	0x00053162	Berkeley DB
+>16	belong	>0		(Btree, version %d, big-endian)
+12	lelong	0x00053162	Berkeley DB
+>16	lelong	>0		(Btree, version %d, little-endian)
+
+12	long	0x00042253	Berkeley DB
+>16	long	>0		(Queue, version %d, native byte-order)
+12	belong	0x00042253	Berkeley DB
+>16	belong	>0		(Queue, version %d, big-endian)
+12	lelong	0x00042253	Berkeley DB
+>16	lelong	>0		(Queue, version %d, little-endian)
+
+# From Max Bowsher.
+12	long	0x00040988	Berkeley DB
+>16	long	>0		(Log, version %d, native byte-order)
+12	belong	0x00040988	Berkeley DB 
+>16	belong	>0		(Log, version %d, big-endian)
+12	lelong	0x00040988	Berkeley DB
+>16	lelong	>0		(Log, version %d, little-endian)
+
+#
+#
+# Round Robin Database Tool by Tobias Oetiker <oetiker@ee.ethz.ch>
+0	string/b	RRD\0		RRDTool DB
+>4	string/b	x		version %s
+
+>>10	short		!0		16bit aligned
+>>>10	bedouble	8.642135e+130	big-endian
+>>>>18	short		x		32bit long (m68k)
+
+>>10	short		0
+>>>12	long		!0		32bit aligned
+>>>>12	bedouble	8.642135e+130	big-endian
+>>>>>20 long		0		64bit long
+>>>>>20 long		!0		32bit long  
+>>>>12	ledouble	8.642135e+130	little-endian
+>>>>>24 long		0		64bit long
+>>>>>24 long		!0		32bit long (i386)
+>>>>12	string		\x43\x2b\x1f\x5b\x2f\x25\xc0\xc7	middle-endian
+>>>>>24 short		!0		32bit long (arm)
+
+>>8	quad		0		64bit aligned
+>>>16	bedouble	8.642135e+130	big-endian
+>>>>24	long		0		64bit long (s390x)
+>>>>24	long		!0		32bit long (hppa/mips/ppc/s390/SPARC)
+>>>16	ledouble	8.642135e+130	little-endian
+>>>>28	long		0		64bit long (alpha/amd64/ia64)
+>>>>28	long		!0		32bit long (armel/mipsel)
+
+#----------------------------------------------------------------------
+# ROOT: file(1) magic for ROOT databases
+#
+0       string  root\0  ROOT file
+>4      belong  x       Version %d
+>33     belong  x       (Compression: %d)
+
+# XXX: Weak magic.
+# Alex Ott <ott@jet.msk.su>
+## Paradox file formats
+#2	  leshort	0x0800	Paradox 
+#>0x39	  byte		3	v. 3.0 
+#>0x39	  byte		4	v. 3.5 
+#>0x39	  byte		9	v. 4.x 
+#>0x39	  byte		10	v. 5.x 
+#>0x39	  byte		11	v. 5.x 
+#>0x39	  byte		12	v. 7.x 
+#>>0x04	  byte		0	indexed .DB data file 
+#>>0x04	  byte		1	primary index .PX file 
+#>>0x04	  byte		2	non-indexed .DB data file 
+#>>0x04	  byte		3	non-incrementing secondary index .Xnn file 
+#>>0x04	  byte		4	secondary index .Ynn file 
+#>>0x04	  byte		5	incrementing secondary index .Xnn file 
+#>>0x04	  byte		6	non-incrementing secondary index .XGn file 
+#>>0x04	  byte		7	secondary index .YGn file 
+#>>>0x04	  byte		8	incrementing secondary index .XGn file 
+
+## XBase database files
+# updated by Joerg Jenderek at Feb 2013
+# http://www.dbase.com/Knowledgebase/INT/db7_file_fmt.htm
+# http://www.clicketyclick.dk/databases/xbase/format/dbf.html
+# http://home.f1.htw-berlin.de/scheibl/db/intern/dBase.htm
+# inspect VVYYMMDD , where 1<= MM <= 12 and 1<= DD <= 31
+0	ubelong&0x0000FFFF		<0x00000C20	
+# skip Infocom game Z-machine
+>2		ubyte			>0		
+# skip Androids *.xml
+>>3		ubyte			>0		
+>>>3		ubyte			<32		
+# 1 < version VV
+>>>>0		ubyte			>1		
+# skip HELP.CA3 by test for reserved byte ( NULL )
+>>>>>27		ubyte			0		
+# reserved bytes not always 0 ; also found 0x3901 (T4.DBF) ,0x7101 (T5.DBF,T6.DBF)
+#>>>>>30		ubeshort     		x		30NULL?%x
+# possible production flag,tag numbers(<=0x30),tag length(<=0x20), reserved (NULL) 
+>>>>>>24	ubelong&0xffFFFFff	>0x01302000	
+# .DBF or .MDX
+>>>>>>24	ubelong&0xffFFFFff	<0x01302001	
+# for Xbase Database file (*.DBF) reserved (NULL) for multi-user
+>>>>>>>24	ubelong&0xffFFFFff	=0		
+# test for 2 reserved NULL bytes,transaction and encryption byte flag
+>>>>>>>>12	ubelong&0xFFFFfEfE	0		
+# test for MDX flag
+>>>>>>>>>28	ubyte			x		
+>>>>>>>>>28	ubyte&0xf8		0		
+# header size >= 32
+>>>>>>>>>>8	uleshort		>31		
+# skip PIC15736.PCX by test for language driver name or field name
+>>>>>>>>>>>32	ubyte			>0		
+#!:mime	application/x-dbf; charset=unknown-8bit ??
+#!:mime	application/x-dbase
+>>>>>>>>>>>>0	use			xbase-type
+# database file
+>>>>>>>>>>>>0	ubyte			x		\b DBF
+>>>>>>>>>>>>4	lelong			0		\b, no records
+>>>>>>>>>>>>4	lelong			>0		\b, %d record
+# plural s appended
+>>>>>>>>>>>>>4	lelong			>1		\bs
+# http://www.clicketyclick.dk/databases/xbase/format/dbf_check.html#CHECK_DBF
+# 1 <= record size <= 4000 (dBase 3,4) or 32 * KB (=0x8000)
+>>>>>>>>>>>>10	uleshort		x		* %d
+# file size = records * record size + header size
+>>>>>>>>>>>>1	ubyte			x		\b, update-date
+>>>>>>>>>>>>1	use			xbase-date
+# http://msdn.microsoft.com/de-de/library/cc483186(v=vs.71).aspx
+#>>>>>>>>>>>>29	ubyte			=0		\b, codepage ID=0x%x
+# 2~cp850 , 3~cp1252 , 0x1b~?? ; what code page is 0x1b ?
+>>>>>>>>>>>>29	ubyte			>0		\b, codepage ID=0x%x
+#>>>>>>>>>>>>28	ubyte&0x01		0		\b, no index file
+>>>>>>>>>>>>28	ubyte&0x01		1		\b, with index file .MDX
+>>>>>>>>>>>>28	ubyte&0x02		2		\b, with memo .FPT
+>>>>>>>>>>>>28	ubyte&0x04		4		\b, DataBaseContainer
+# 1st record offset + 1 = header size
+>>>>>>>>>>>>8	uleshort		>0		
+>>>>>>>>>>>>(8.s+1)	ubyte		>0		
+>>>>>>>>>>>>>8		uleshort	>0		\b, at offset %d
+>>>>>>>>>>>>>(8.s+1)	ubyte		>0		
+>>>>>>>>>>>>>>&-1	string		>\0		1st record "%s"
+# for multiple index files (*.MDX) Production flag,tag numbers(<=0x30),tag length(<=0x20), reserverd (NULL) 
+>>>>>>>24	ubelong&0x0133f7ff	>0		
+# test for reserved NULL byte
+>>>>>>>>47	ubyte			x		
+# test for valid TAG key format (0x10 or 0)
+>>>>>>>>>559	ubyte&0xeF		0		
+# test MM <= 12
+>>>>>>>>>45	ubeshort		<0x0C20		
+>>>>>>>>>>45	ubyte			>0		
+>>>>>>>>>>>46	ubyte			<32		
+>>>>>>>>>>>>46	ubyte			>0		
+#!:mime	application/x-mdx
+>>>>>>>>>>>>>0	use			xbase-type
+>>>>>>>>>>>>>0	ubyte			x		\b MDX
+>>>>>>>>>>>>>1	ubyte			x		\b, creation-date
+>>>>>>>>>>>>>1	use			xbase-date
+>>>>>>>>>>>>>44	ubyte			x		\b, update-date
+>>>>>>>>>>>>>44	use			xbase-date
+# No.of tags in use (1,2,5,12)
+>>>>>>>>>>>>>28	uleshort		x		\b, %d
+# No. of entries in tag (0x30)
+>>>>>>>>>>>>>25	ubyte			x		\b/%d tags
+#  Length of tag
+>>>>>>>>>>>>>26	ubyte			x		* %d
+# 1st tag name_
+>>>>>>>>>>>>>548	string		x		\b, 1st tag "%.11s"
+# 2nd tag name
+#>>>>>>>>>>>>(26.b+548)	string		x		\b, 2nd tag "%.11s"
+#
+#		Print the xBase names of different version variants 
+0	name				xbase-type
+>0	ubyte		<2		
+# 1 < version
+>0	ubyte		>1		
+>>0	ubyte		0x02		FoxBase
+# FoxBase+/dBaseIII+, no memo
+>>0	ubyte		0x03		FoxBase+/dBase III
+!:mime	application/x-dbf
+# dBASE IV no memo file
+>>0	ubyte		0x04		dBase IV
+!:mime	application/x-dbf
+# dBASE V no memo file
+>>0	ubyte		0x05		dBase V
+!:mime	application/x-dbf
+>>0	ubyte		0x30		Visual FoxPro
+!:mime	application/x-dbf
+>>0	ubyte		0x31		Visual FoxPro, autoincrement
+!:mime	application/x-dbf
+# Visual FoxPro, with field type Varchar or Varbinary
+>>0	ubyte		0x32		Visual FoxPro, with field type Varchar
+!:mime	application/x-dbf
+# dBASE IV SQL, no memo;dbv memo var size (Flagship)
+>>0	ubyte		0x43		dBase IV, with SQL table
+!:mime	application/x-dbf
+# http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
+#>>0	ubyte		0x62		dBase IV, with SQL table
+#!:mime	application/x-dbf
+# dBASE IV, with memo!!
+>>0	ubyte		0x7b		dBase IV, with memo
+!:mime	application/x-dbf
+# http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
+#>>0	ubyte		0x82		dBase IV, with SQL system
+#!:mime	application/x-dbf
+# FoxBase+/dBaseIII+ with memo .DBT!
+>>0	ubyte		0x83		FoxBase+/dBase III, with memo .DBT
+!:mime	application/x-dbf
+# VISUAL OBJECTS (first 1.0 versions) for the Dbase III files (NTX clipper driver); memo file
+>>0	ubyte		0x87		VISUAL OBJECTS, with memo file
+!:mime	application/x-dbf
+# http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
+#>>0	ubyte		0x8A		FoxBase+/dBase III, with memo .DBT
+#!:mime	application/x-dbf
+# dBASE IV with memo!
+>>0	ubyte		0x8B		dBase IV, with memo .DBT
+!:mime	application/x-dbf
+# dBase IV with SQL Table,no memo?
+>>0	ubyte		0x8E		dBase IV, with SQL table
+!:mime	application/x-dbf
+# .dbv and .dbt memo (Flagship)?
+>>0	ubyte		0xB3		Flagship
+# http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
+#>>0	ubyte		0xCA		dBase IV with memo .DBT
+#!:mime	application/x-dbf
+# dBASE IV with SQL table, with memo .DBT
+>>0	ubyte		0xCB		dBase IV with SQL table, with memo .DBT
+!:mime	application/x-dbf
+# HiPer-Six format;Clipper SIX, with SMT memo file		
+>>0	ubyte		0xE5		Clipper SIX with memo
+!:mime	application/x-dbf
+# http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
+#>>0	ubyte		0xF4		dBase IV, with SQL table, with memo
+#!:mime	application/x-dbf
+>>0	ubyte		0xF5		FoxPro with memo
+!:mime	application/x-dbf
+# http://msdn.microsoft.com/en-US/library/st4a0s68(v=vs.80).aspx
+#>>0	ubyte		0xFA		FoxPro 2.x, with memo
+#!:mime	application/x-dbf
+# unknown version (should not happen)
+>>0	default		x		xBase
+!:mime	application/x-dbf
+>>>0	ubyte		x		(0x%x)
+# flags in version byte
+# DBT flag (with dBASE III memo .DBT)!!
+# >>0	ubyte&0x80	>0		DBT_FLAG=%x
+# memo flag ??
+# >>0	ubyte&0x08	>0		MEMO_FLAG=%x
+# SQL flag ??
+# >>0	ubyte&0x70	>0		SQL_FLAG=%x
+#		test and print the date of xBase .DBF .MDX
+0	name				xbase-date
+# inspect YYMMDD , where 1<= MM <= 12 and 1<= DD <= 31
+>0	ubelong		x		
+>1	ubyte		<13		
+>>1	ubyte		>0		
+>>>2	ubyte		>0		
+>>>>2	ubyte		<32		
+>>>>>0	ubyte		x		
+# YY is interpreted as 20YY or 19YY
+>>>>>>0	ubyte		<100		\b %.2d
+# YY is interpreted 1900+YY; TODO: display yy or 20yy instead 1YY
+>>>>>>0	ubyte		>99		\b %d
+>>>>>1	ubyte		x		\b-%d
+>>>>>2	ubyte		x		\b-%d
+
+#	dBase memo files .DBT or .FPT
+# http://msdn.microsoft.com/en-us/library/8599s21w(v=vs.80).aspx
+16		ubyte		<4		
+>16		ubyte		!2		
+>>16		ubyte		!1		
+# next free block index is positive
+>>>0		ulelong		>0		
+# skip many JPG. ZIP, BZ2 by test for reserved bytes NULL , 0|2 , 0|1 , low byte of block size
+>>>>17		ubelong&0xFFfdFE00	0x00000000	
+# skip many RAR by test for low byte 0 ,high byte 0|2|even of block size, 0|a|e|d7 , 0|64h
+>>>>>20		ubelong&0xFF01209B	0x00000000	
+# dBASE III
+>>>>>>16	ubyte		3		
+# dBASE III DBT
+>>>>>>>0	use		xbase-memo-print
+# dBASE IV DBT , FoxPro FPT or many PNG , ZIP , DBF garbage
+>>>>>>16	ubyte		0		
+# dBASE IV DBT with DBF name or DBF garbage
+>>>>>>>8	ubelong		>0x40000000	
+# skip DBF and catch dBASE IV DBT with DBF name and with non big index of next free block
+>>>>>>>>0	ulelong		<0x01010002	
+>>>>>>>>>0	use		xbase-memo-print
+>>>>>>>8	ubelong		0		
+# skip MM*DD*.bin by test for for reserved NULL byte
+>>>>>>>>508	ubelong		0		
+# real memo files should contain text here
+>>>>>>>>>520	ubelong		>0x20202019	
+>>>>>>>>>>520	ubelong		<0xFEFEFEFF	
+>>>>>>>>>>>0	use		xbase-memo-print
+# garbage PCX , ZIP , JAR , XPI 
+>>>>>>>8	default		x		
+
+#		Print the information of dBase DBT or FoxPro FPT memo files 
+0	name				xbase-memo-print
+>0	ubyte			x		
+# test version
+# memo file
+>>16	ubyte			3		dBase III DBT
+>>16	ubyte			0		
+>>>512	ubelong			<0x00000003	FoxPro FPT
+# Size of blocks for FoxPro
+>>>>6	ubeshort		x		\b, blocks size %u
+# Number of next available block for appending data for FoxPro
+>>>>0	ubelong			=0		\b, next free block index %u
+>>>>0	ubelong			!0		\b, next free block index %u
+>>>512	default			x		dBase IV DBT
+# DBF file name without extension
+>>>>8	string			>\0		\b of %-.8s.DBF
+# size of blocks  ; not reliable 0x2020204C
+#>>>>4	ulelong			=0		\b, blocks size %u
+>>>>4	ulelong			!0		\b, blocks size %u
+# Block length found 0 , 512
+#>>>>20	uleshort		=0		\b, block length %u
+>>>>20	uleshort		!0		\b, block length %u
+# Number of next available block for appending data
+>>>>0	ulelong			=0		\b, next free block index %u
+>>>>0	ulelong			!0		\b, next free block index %u
+>>512	ubelong			x		
+>>>512	ubelong			=0xFFFF0800	
+>>>>520	string			>\0		\b, 1st used item "%s"
+# FoxPro
+>>>512	ubelong			<3		
+# FoxPro memo
+>>>>512	ubelong			=1		
+>>>>520	string			>\0		\b, 1st used item "%s"
+>>>512	default			x		
+# may be deleted memo field
+>>>>512	string			>\0		\b, 1st item "%s"
+
+# TODO: 
+# DBASE index file *.NDX
+# DBASE Compound Index file *.CDX
+# dBASE IV Printer Driver *.PRF
+## End of XBase database stuff
+
+# MS Access database
+4	string	Standard\ Jet\ DB	Microsoft Access Database
+!:mime	application/x-msaccess
+4	string	Standard\ ACE\ DB	Microsoft Access Database
+!:mime	application/x-msaccess
+
+# TDB database from Samba et al - Martin Pool <mbp@samba.org>
+0	string	TDB\ file		TDB database
+>32	lelong	0x2601196D		version 6, little-endian
+>>36	lelong	x			hash size %d bytes
+
+# SE Linux policy database
+0       lelong  0xf97cff8c      SE Linux policy
+>16     lelong  x               v%d
+>20     lelong  1      MLS
+>24     lelong  x       %d symbols
+>28     lelong  x       %d ocons
+
+# ICE authority file data (Wolfram Kleff)
+2	string		ICE		ICE authority data
+
+# X11 Xauthority file (Wolfram Kleff)
+10	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
+11	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
+12	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
+13	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
+14	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
+15	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
+16	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
+17	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
+18	string		MIT-MAGIC-COOKIE-1	X11 Xauthority data
+
+# From: Maxime Henrion <mux@FreeBSD.org>
+# PostgreSQL's custom dump format, Maxime Henrion <mux@FreeBSD.org>
+0	string		PGDMP		PostgreSQL custom database dump
+>5	byte		x		- v%d
+>6	byte		x		\b.%d
+>5	beshort		<0x101		\b-0
+>5	beshort		>0x100
+>>7	byte		x		\b-%d
+
+# Type: Advanced Data Format (ADF) database
+# URL:  http://www.grc.nasa.gov/WWW/cgns/adf/
+# From: Nicolas Chauvat <nicolas.chauvat@logilab.fr>
+0	string	@(#)ADF\ Database	CGNS Advanced Data Format
+
+# Tokyo Cabinet magic data
+# http://tokyocabinet.sourceforge.net/index.html
+0	string		ToKyO\ CaBiNeT\n	Tokyo Cabinet
+>14	string		x			\b (%s)
+>32	byte		0			\b, Hash
+!:mime	application/x-tokyocabinet-hash
+>32	byte		1			\b, B+ tree
+!:mime	application/x-tokyocabinet-btree
+>32	byte		2			\b, Fixed-length
+!:mime	application/x-tokyocabinet-fixed
+>32	byte		3			\b, Table
+!:mime	application/x-tokyocabinet-table
+>33	byte		&1			\b, [open]
+>33	byte		&2			\b, [fatal]
+>34	byte		x			\b, apow=%d
+>35	byte		x			\b, fpow=%d
+>36	byte		&0x01			\b, [large]
+>36	byte		&0x02			\b, [deflate]
+>36	byte		&0x04			\b, [bzip]
+>36	byte		&0x08			\b, [tcbs]
+>36	byte		&0x10			\b, [excodec]
+>40	lequad		x			\b, bnum=%lld
+>48	lequad		x			\b, rnum=%lld
+>56	lequad		x			\b, fsiz=%lld
+
+# Type:	QDBM Quick Database Manager
+# From:	Benoit Sibaud <bsibaud@april.org>
+0	string		\\[depot\\]\n\f		Quick Database Manager, little endian
+0	string		\\[DEPOT\\]\n\f		Quick Database Manager, big endian
+
+# Type:	TokyoCabinet database
+# URL:	http://tokyocabinet.sourceforge.net/
+# From:	Benoit Sibaud <bsibaud@april.org>
+0	string		ToKyO\ CaBiNeT\n	TokyoCabinet database
+>14	string		x			(version %s)
+
+# From:  Stephane Blondon http://www.yaal.fr
+# Database file for Zope (done by FileStorage)
+0	string		FS21	Zope Object Database File Storage (data)
+# Cache file for the database of Zope (done by ClientStorage)
+0	string		ZEC3	Zope Object Database Client Cache File (data)
+
+# IDA (Interactive Disassembler) database
+0	string		IDA1	IDA (Interactive Disassembler) database
diff --git a/contrib/file/Magdir/diamond b/contrib/file/magic/Magdir/diamond
similarity index 100%
rename from contrib/file/Magdir/diamond
rename to contrib/file/magic/Magdir/diamond
diff --git a/contrib/file/Magdir/diff b/contrib/file/magic/Magdir/diff
similarity index 61%
rename from contrib/file/Magdir/diff
rename to contrib/file/magic/Magdir/diff
index 73f0135df86a..59243801eb5a 100644
--- a/contrib/file/Magdir/diff
+++ b/contrib/file/magic/Magdir/diff
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: diff,v 1.12 2010/12/07 16:52:52 christos Exp $
+# $File: diff,v 1.14 2012/09/16 23:08:54 christos Exp $
 # diff:  file(1) magic for diff(1) output
 #
 0	search/1	diff\ 		diff output text
@@ -16,7 +16,7 @@
 !:mime	text/x-diff
 
 # bsdiff:  file(1) magic for bsdiff(1) output
-0	string/t		BSDIFF40	bsdiff(1) patch file
+0	string/b		BSDIFF40	bsdiff(1) patch file
 
 
 # unified diff
@@ -27,3 +27,14 @@
 >>>>&0	search/1 @@	unified diff output text
 !:mime	text/x-diff
 !:strength + 90
+
+# librsync -- the library for network deltas
+#
+# Copyright (C) 2001 by Martin Pool.  You may do whatever you want with
+# this file.
+#
+0	belong		0x72730236	rdiff network-delta data
+
+0	belong		0x72730136	rdiff network-delta signature data
+>4	belong		x		(block length=%d,
+>8	belong		x		signature strength=%d)
diff --git a/contrib/file/Magdir/digital b/contrib/file/magic/Magdir/digital
similarity index 71%
rename from contrib/file/Magdir/digital
rename to contrib/file/magic/Magdir/digital
index b1b77dd8c75f..f66e0bc55917 100644
--- a/contrib/file/Magdir/digital
+++ b/contrib/file/magic/Magdir/digital
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: digital,v 1.10 2011/05/03 01:44:17 christos Exp $
+# $File: digital,v 1.11 2013/01/11 16:45:23 christos Exp $
 #  Digital UNIX - Info
 #
 0	string	=!<arch>\n________64E	Alpha archive
@@ -8,20 +8,20 @@
 #
 
 0	leshort		0603
->>24	leshort		0410		COFF format alpha pure
->>24	leshort		0413		COFF format alpha demand paged
->>>22	leshort&030000	!020000		executable
->>>22	leshort&020000	!0		dynamically linked
->>>16	lelong		!0		not stripped
->>>16	lelong		0		stripped
->>>27	byte		x		- version %d
->>>26	byte		x		\b.%d
->>>28	byte		x		\b-%d
->>24	leshort		0407		COFF format alpha object
->>>22	leshort&030000	020000		shared library
->>>27	byte		x		- version %d
->>>26	byte		x		\b.%d
->>>28	byte		x		\b-%d
+>24	leshort		0410		COFF format alpha pure
+>24	leshort		0413		COFF format alpha demand paged
+>>22	leshort&030000	!020000		executable
+>>22	leshort&020000	!0		dynamically linked
+>>16	lelong		!0		not stripped
+>>16	lelong		0		stripped
+>>27	byte		x		- version %d
+>>26	byte		x		\b.%d
+>>28	byte		x		\b-%d
+>24	leshort		0407		COFF format alpha object
+>>22	leshort&030000	020000		shared library
+>>27	byte		x		- version %d
+>>26	byte		x		\b.%d
+>>28	byte		x		\b-%d
 
 # Basic recognition of Digital UNIX core dumps - Mike Bremford <mike@opac.bl.uk>
 #
diff --git a/contrib/file/magic/Magdir/dolby b/contrib/file/magic/Magdir/dolby
new file mode 100644
index 000000000000..573398f347c8
--- /dev/null
+++ b/contrib/file/magic/Magdir/dolby
@@ -0,0 +1,69 @@
+
+#------------------------------------------------------------------------------
+# $File: dolby,v 1.7 2014/01/08 22:37:23 christos Exp $
+# ATSC A/53 aka AC-3 aka Dolby Digital <ashitaka@gmx.at>
+# from http://www.atsc.org/standards/a_52a.pdf
+# corrections, additions, etc. are always welcome!
+#
+# syncword
+0	beshort		0x0b77	ATSC A/52 aka AC-3 aka Dolby Digital stream,
+# Proposed audio/ac3 RFC/4184
+!:mime	audio/vnd.dolby.dd-raw
+# fscod
+>4	byte&0xc0 = 0x00	48 kHz,
+>4	byte&0xc0 = 0x40	44.1 kHz,
+>4	byte&0xc0 = 0x80	32 kHz,
+# is this one used for 96 kHz?
+>4	byte&0xc0 = 0xc0	reserved frequency,
+#
+>5	byte&0x07 = 0x00	\b, complete main (CM)
+>5	byte&0x07 = 0x01	\b, music and effects (ME)
+>5	byte&0x07 = 0x02	\b, visually impaired (VI)
+>5	byte&0x07 = 0x03	\b, hearing impaired (HI)
+>5	byte&0x07 = 0x04	\b, dialogue (D)
+>5	byte&0x07 = 0x05	\b, commentary (C)
+>5	byte&0x07 = 0x06	\b, emergency (E)
+>5	beshort&0x07e0  0x0720	\b, voiceover (VO) 
+>5	beshort&0x07e0 >0x0720	\b, karaoke
+# acmod
+>6	byte&0xe0 = 0x00	1+1 front,
+>>6	byte&0x10 = 0x10	LFE on,
+>6	byte&0xe0 = 0x20	1 front/0 rear,
+>>6	byte&0x10 = 0x10	LFE on,
+>6	byte&0xe0 = 0x40	2 front/0 rear,
+# dsurmod (for stereo only)
+>>6	byte&0x18 = 0x00	Dolby Surround not indicated
+>>6	byte&0x18 = 0x08	not Dolby Surround encoded
+>>6	byte&0x18 = 0x10	Dolby Surround encoded
+>>6	byte&0x18 = 0x18	reserved Dolby Surround mode
+>>6	byte&0x04 = 0x04	LFE on,
+>6	byte&0xe0 = 0x60	3 front/0 rear,
+>>6	byte&0x04 = 0x04	LFE on,
+>6	byte&0xe0 = 0x80	2 front/1 rear,
+>>6	byte&0x04 = 0x04	LFE on,
+>6	byte&0xe0 = 0xa0	3 front/1 rear,
+>>6	byte&0x01 = 0x01	LFE on,
+>6	byte&0xe0 = 0xc0	2 front/2 rear,
+>>6	byte&0x04 = 0x04	LFE on,
+>6	byte&0xe0 = 0xe0	3 front/2 rear,
+>>6	byte&0x01 = 0x01	LFE on,
+#
+>4	byte&0x3e = 0x00	\b, 32 kbit/s
+>4	byte&0x3e = 0x02	\b, 40 kbit/s
+>4	byte&0x3e = 0x04	\b, 48 kbit/s
+>4	byte&0x3e = 0x06	\b, 56 kbit/s
+>4	byte&0x3e = 0x08	\b, 64 kbit/s
+>4	byte&0x3e = 0x0a	\b, 80 kbit/s
+>4	byte&0x3e = 0x0c	\b, 96 kbit/s
+>4	byte&0x3e = 0x0e	\b, 112 kbit/s
+>4	byte&0x3e = 0x10	\b, 128 kbit/s
+>4	byte&0x3e = 0x12	\b, 160 kbit/s
+>4	byte&0x3e = 0x14	\b, 192 kbit/s
+>4	byte&0x3e = 0x16	\b, 224 kbit/s
+>4	byte&0x3e = 0x18	\b, 256 kbit/s
+>4	byte&0x3e = 0x1a	\b, 320 kbit/s
+>4	byte&0x3e = 0x1c	\b, 384 kbit/s
+>4	byte&0x3e = 0x1e	\b, 448 kbit/s
+>4	byte&0x3e = 0x20	\b, 512 kbit/s
+>4	byte&0x3e = 0x22	\b, 576 kbit/s
+>4	byte&0x3e = 0x24	\b, 640 kbit/s
diff --git a/contrib/file/Magdir/dump b/contrib/file/magic/Magdir/dump
similarity index 50%
rename from contrib/file/Magdir/dump
rename to contrib/file/magic/Magdir/dump
index 1ac91e22010c..1a20ace29c4b 100644
--- a/contrib/file/Magdir/dump
+++ b/contrib/file/magic/Magdir/dump
@@ -1,14 +1,14 @@
 
 #------------------------------------------------------------------------------
-# $File: dump,v 1.11 2009/09/19 16:28:09 christos Exp $
+# $File: dump,v 1.13 2014/04/30 21:41:02 christos Exp $
 # dump:  file(1) magic for dump file format--for new and old dump filesystems
 #
 # We specify both byte orders in order to recognize byte-swapped dumps.
 #
-24	belong	60012		new-fs dump file (big endian),
+0	name	new-dump-be
 >4	bedate	x		Previous dump %s,
 >8	bedate	x		This dump %s,
->12	belong	>0		Volume %ld,
+>12	belong	>0		Volume %d,
 >692	belong	0		Level zero, type:
 >692	belong	>0		Level %d, type:
 >0	belong	1		tape header,
@@ -24,10 +24,10 @@
 >824	string	>\0		Host %s,
 >888	belong	>0		Flags %x
 
-24	belong	60011		old-fs dump file (big endian),
+0	name	old-dump-be
 #>4	bedate	x		Previous dump %s,
 #>8	bedate	x		This dump %s,
->12	belong	>0		Volume %ld,
+>12	belong	>0		Volume %d,
 >692	belong	0		Level zero, type:
 >692	belong	>0		Level %d, type:
 >0	belong	1		tape header,
@@ -43,48 +43,48 @@
 >824	string	>\0		Host %s,
 >888	belong	>0		Flags %x
 
-24	lelong	60012		new-fs dump file (little endian),
->4	ledate	x		This dump %s,
->8	ledate	x		Previous dump %s,
->12	lelong	>0		Volume %ld,
->692	lelong	0		Level zero, type:
->692	lelong	>0		Level %d, type:
->0	lelong	1		tape header,
->0	lelong	2		beginning of file record,
->0	lelong	3		map of inodes on tape,
->0	lelong	4		continuation of file record,
->0	lelong	5		end of volume,
->0	lelong	6		map of inodes deleted,
->0	lelong	7		end of medium (for floppy),
+0	name	ufs2-dump-be
+>896	beqdate	x		Previous dump %s,
+>904	beqdate	x		This dump %s,
+>12	belong	>0		Volume %d,
+>692	belong	0		Level zero, type:
+>692	belong	>0		Level %d, type:
+>0	belong	1		tape header,
+>0	belong	2		beginning of file record,
+>0	belong	3		map of inodes on tape,
+>0	belong	4		continuation of file record,
+>0	belong	5		end of volume,
+>0	belong	6		map of inodes deleted,
+>0	belong	7		end of medium (for floppy),
 >676	string	>\0		Label %s,
 >696	string	>\0		Filesystem %s,
 >760	string	>\0		Device %s,
 >824	string	>\0		Host %s,
->888	lelong	>0		Flags %x
+>888	belong	>0		Flags %x
 
-24	lelong	60011		old-fs dump file (little endian),
-#>4	ledate	x		Previous dump %s,
-#>8	ledate	x		This dump %s,
->12	lelong	>0		Volume %ld,
->692	lelong	0		Level zero, type:
->692	lelong	>0		Level %d, type:
->0	lelong	1		tape header,
->0	lelong	2		beginning of file record,
->0	lelong	3		map of inodes on tape,
->0	lelong	4		continuation of file record,
->0	lelong	5		end of volume,
->0	lelong	6		map of inodes deleted,
->0	lelong	7		end of medium (for floppy),
->676	string	>\0		Label %s,
->696	string	>\0		Filesystem %s,
->760	string	>\0		Device %s,
->824	string	>\0		Host %s,
->888	lelong	>0		Flags %x
+24	belong	60012		new-fs dump file (big endian), 
+>0	use	new-dump-be
+
+24	belong	60011		old-fs dump file (big endian), 
+>0	use	old-dump-be
+
+24	lelong	60012		new-fs dump file (little endian), 
+>0	use	\^new-dump-be
+
+24	lelong	60011		old-fs dump file (little endian), 
+>0	use	\^old-dump-be
+
+
+24	belong	0x19540119	new-fs dump file (ufs2, big endian), 
+>0	use	ufs2-dump-be
+
+24	lelong	0x19540119	new-fs dump file (ufs2, little endian), 
+>0	use	\^ufs2-dump-be
 
 18	leshort	60011		old-fs dump file (16-bit, assuming PDP-11 endianness),
 >2	medate	x		Previous dump %s,
 >6	medate	x		This dump %s,
->10	leshort	>0		Volume %ld,
+>10	leshort	>0		Volume %d,
 >0	leshort	1		tape header.
 >0	leshort	2		beginning of file record.
 >0	leshort	3		map of inodes on tape.
@@ -92,41 +92,3 @@
 >0	leshort	5		end of volume.
 >0	leshort	6		map of inodes deleted.
 >0	leshort	7		end of medium (for floppy).
-
-24	belong	0x19540119	new-fs dump file (ufs2, big endian),
->896	beqdate	x		Previous dump %s,
->904	beqdate	x		This dump %s,
->12	belong	>0		Volume %ld,
->692	belong	0		Level zero, type:
->692	belong	>0		Level %d, type:
->0	belong	1		tape header,
->0	belong	2		beginning of file record,
->0	belong	3		map of inodes on tape,
->0	belong	4		continuation of file record,
->0	belong	5		end of volume,
->0	belong	6		map of inodes deleted,
->0	belong	7		end of medium (for floppy),
->676	string	>\0		Label %s,
->696	string	>\0		Filesystem %s,
->760	string	>\0		Device %s,
->824	string	>\0		Host %s,
->888	belong	>0		Flags %x
-
-24	lelong	0x19540119	new-fs dump file (ufs2, little endian),
->896	leqdate	x		This dump %s,
->904	leqdate	x		Previous dump %s,
->12	lelong	>0		Volume %ld,
->692	lelong	0		Level zero, type:
->692	lelong	>0		Level %d, type:
->0	lelong	1		tape header,
->0	lelong	2		beginning of file record,
->0	lelong	3		map of inodes on tape,
->0	lelong	4		continuation of file record,
->0	lelong	5		end of volume,
->0	lelong	6		map of inodes deleted,
->0	lelong	7		end of medium (for floppy),
->676	string	>\0		Label %s,
->696	string	>\0		Filesystem %s,
->760	string	>\0		Device %s,
->824	string	>\0		Host %s,
->888	lelong	>0		Flags %x
diff --git a/contrib/file/magic/Magdir/dyadic b/contrib/file/magic/Magdir/dyadic
new file mode 100644
index 000000000000..18f18bcf178e
--- /dev/null
+++ b/contrib/file/magic/Magdir/dyadic
@@ -0,0 +1,56 @@
+
+#------------------------------------------------------------------------------
+# $File: dyadic,v 1.6 2014/06/01 19:14:42 christos Exp $
+# Dyadic: file(1) magic for Dyalog APL.
+#
+# updated by Joerg Jenderek at Oct 2013
+# http://en.wikipedia.org/wiki/Dyalog_APL
+# http://www.dyalog.com/
+# .DXV Dyalog APL External Variable
+# .DIN Dyalog APL Input Table
+# .DOT Dyalog APL Output Table
+# .DFT Dyalog APL Format File
+0	ubeshort&0xFF60	0xaa00		
+# skip biblio.dbt
+>1	byte		!4		
+# real Dyalog APL have non zero version numbers like 7.3 or 13.4
+>>2	ubeshort	>0x0000		Dyalog APL
+>>>1	byte		0x00		aplcore
+#>>>1	byte		0x00		incomplete workspace
+# *.DCF Dyalog APL Component File
+>>>1	byte		0x01		component file 32-bit non-journaled non-checksummed
+#>>>1	byte		0x01		component file
+>>>1	byte		0x02		external variable exclusive
+#>>>1	byte		0x02		external variable
+# *.DWS Dyalog APL Workspace
+>>>1	byte		0x03		workspace
+>>>>7	byte&0x28	0x00		32-bit
+>>>>7	byte&0x28	0x20		64-bit
+>>>>7	byte&0x0c	0x00		classic
+>>>>7	byte&0x0c	0x04		unicode
+>>>>7	byte&0x88	0x00		big-endian
+>>>>7	byte&0x88	0x80		little-endian
+>>>1	byte		0x06		external variable shared
+# *.DSE Dyalog APL Session , *.DLF Dyalog APL Session Log File
+>>>1	byte		0x07		session
+>>>1	byte		0x08		mapped file 32-bit
+>>>1	byte		0x09		component file 64-bit non-journaled non-checksummed
+>>>1	byte		0x0a		mapped file 64-bit
+>>>1	byte		0x0b		component file 32-bit level 1 journaled non-checksummed
+>>>1	byte		0x0c		component file 64-bit level 1 journaled non-checksummed
+>>>1	byte		0x0d		component file 32-bit level 1 journaled checksummed
+>>>1	byte		0x0e		component file 64-bit level 1 journaled checksummed
+>>>1	byte		0x0f		component file 32-bit level 2 journaled checksummed
+>>>1	byte		0x10		component file 64-bit level 2 journaled checksummed
+>>>1	byte		0x11		component file 32-bit level 3 journaled checksummed
+>>>1	byte		0x12		component file 64-bit level 3 journaled checksummed
+>>>1	byte		0x13		component file 32-bit non-journaled checksummed
+>>>1	byte		0x14		component file 64-bit non-journaled checksummed
+>>>1	byte		0x80		DDB
+>>>2	byte		x		version %d
+>>>3	byte		x		\b.%d
+#>>>2	byte		x		type %d
+#>>>3	byte		x		subtype %d
+
+# *.DXF Dyalog APL Transfer File
+0	short		0x6060		Dyalog APL transfer
diff --git a/contrib/file/Magdir/ebml b/contrib/file/magic/Magdir/ebml
similarity index 100%
rename from contrib/file/Magdir/ebml
rename to contrib/file/magic/Magdir/ebml
diff --git a/contrib/file/Magdir/editors b/contrib/file/magic/Magdir/editors
similarity index 100%
rename from contrib/file/Magdir/editors
rename to contrib/file/magic/Magdir/editors
diff --git a/contrib/file/Magdir/efi b/contrib/file/magic/Magdir/efi
similarity index 79%
rename from contrib/file/Magdir/efi
rename to contrib/file/magic/Magdir/efi
index 7335c5cefd51..7760100b1989 100644
--- a/contrib/file/Magdir/efi
+++ b/contrib/file/magic/Magdir/efi
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: efi,v 1.4 2009/09/19 16:28:09 christos Exp $
+# $File: efi,v 1.5 2014/04/30 21:41:02 christos Exp $
 # efi:  file(1) magic for Universal EFI binaries
 
 0	lelong	0x0ef1fab9
@@ -12,4 +12,4 @@
 >>&0	lelong	0x01000007	\b, x86_64
 >>&20	lelong	7		\b, i386
 >>&20	lelong	0x01000007	\b, x86_64
->4	lelong	>2		Universal EFI binary with %ld architectures
+>4	lelong	>2		Universal EFI binary with %d architectures
diff --git a/contrib/file/magic/Magdir/elf b/contrib/file/magic/Magdir/elf
new file mode 100644
index 000000000000..b007f88fecf6
--- /dev/null
+++ b/contrib/file/magic/Magdir/elf
@@ -0,0 +1,324 @@
+
+#------------------------------------------------------------------------------
+# $File: elf,v 1.67 2014/06/12 13:52:48 christos Exp $
+# elf:  file(1) magic for ELF executables
+#
+# We have to check the byte order flag to see what byte order all the
+# other stuff in the header is in.
+#
+# What're the correct byte orders for the nCUBE and the Fujitsu VPP500?
+#
+# Created by: unknown
+# Modified by (1): Daniel Quinlan <quinlan@yggdrasil.com>
+# Modified by (2): Peter Tobias <tobias@server.et-inf.fho-emden.de> (core support)
+# Modified by (3): Christian 'Dr. Disk' Hechelmann <drdisk@ds9.au.s.shuttle.de> (fix of core support)
+# Modified by (4): <gerardo.cacciari@gmail.com> (VMS Itanium)
+# Modified by (5): Matthias Urlichs <smurf@debian.org> (Listing of many architectures)
+
+0	name		elf-le
+>16	leshort		0		no file type,
+!:mime	application/octet-stream
+>16	leshort		1		relocatable,
+!:mime	application/x-object
+>16	leshort		2		executable,
+!:mime	application/x-executable
+>16	leshort		3		shared object,
+!:mime	application/x-sharedlib
+>16	leshort		4		core file
+!:mime	application/x-coredump
+# Core file detection is not reliable.
+#>>>(0x38+0xcc) string	>\0		of '%s'
+#>>>(0x38+0x10) lelong	>0		(signal %d),
+>16	leshort		&0xff00		processor-specific,
+>18	clear		x
+>18	leshort		0		no machine,
+>18	leshort		1		AT&T WE32100,
+>18	leshort		2		SPARC,
+>18	leshort		3		Intel 80386,
+>18	leshort		4		Motorola m68k,
+>>4	byte		1
+>>>36	lelong		&0x01000000	68000,
+>>>36	lelong		&0x00810000	CPU32,
+>>>36	lelong		0		68020,
+>18	leshort		5		Motorola m88k,
+>18	leshort		6		Intel 80486,
+>18	leshort		7		Intel 80860,
+# The official e_machine number for MIPS is now #8, regardless of endianness.
+# The second number (#10) will be deprecated later. For now, we still
+# say something if #10 is encountered, but only gory details for #8.
+>18	leshort		8		MIPS,
+>>4	byte		1
+>>>36	lelong		&0x20		N32
+>18	leshort		10		MIPS,
+>>4	byte		1
+>>>36	lelong		&0x20		N32
+>18	leshort		8
+# only for 32-bit
+>>4	byte		1
+>>>36  lelong&0xf0000000	0x00000000	MIPS-I
+>>>36  lelong&0xf0000000	0x10000000	MIPS-II
+>>>36  lelong&0xf0000000	0x20000000	MIPS-III
+>>>36  lelong&0xf0000000	0x30000000	MIPS-IV
+>>>36  lelong&0xf0000000	0x40000000	MIPS-V
+>>>36  lelong&0xf0000000	0x50000000	MIPS32
+>>>36  lelong&0xf0000000	0x60000000	MIPS64
+>>>36  lelong&0xf0000000	0x70000000	MIPS32 rel2
+>>>36  lelong&0xf0000000	0x80000000	MIPS64 rel2
+# only for 64-bit
+>>4	byte		2
+>>>48  lelong&0xf0000000	0x00000000	MIPS-I
+>>>48  lelong&0xf0000000	0x10000000	MIPS-II
+>>>48  lelong&0xf0000000	0x20000000	MIPS-III
+>>>48  lelong&0xf0000000	0x30000000	MIPS-IV
+>>>48  lelong&0xf0000000	0x40000000	MIPS-V
+>>>48  lelong&0xf0000000	0x50000000	MIPS32
+>>>48  lelong&0xf0000000	0x60000000	MIPS64
+>>>48  lelong&0xf0000000	0x70000000	MIPS32 rel2
+>>>48  lelong&0xf0000000	0x80000000	MIPS64 rel2
+>18	leshort		9		Amdahl,
+>18	leshort		10		MIPS (deprecated),
+>18	leshort		11		RS6000,
+>18	leshort		15		PA-RISC,
+# only for 32-bit
+>>4	byte		1
+>>>38	leshort		0x0214		2.0
+>>>36	leshort		&0x0008		(LP64)
+# only for 64-bit
+>>4	byte		2
+>>>50	leshort		0x0214		2.0
+>>>48	leshort		&0x0008		(LP64)
+>18	leshort		16		nCUBE,
+>18	leshort		17		Fujitsu VPP500,
+>18	leshort		18		SPARC32PLUS,
+# only for 32-bit
+>>4	byte		1
+>>>36	lelong&0xffff00	0x000100	V8+ Required,
+>>>36	lelong&0xffff00	0x000200	Sun UltraSPARC1 Extensions Required,
+>>>36	lelong&0xffff00	0x000400	HaL R1 Extensions Required,
+>>>36	lelong&0xffff00	0x000800	Sun UltraSPARC3 Extensions Required,
+>18	leshort		19		Intel 80960,
+>18	leshort		20		PowerPC or cisco 4500,
+>18	leshort		21		64-bit PowerPC or cisco 7500,
+>18	leshort		22		IBM S/390,
+>18	leshort		23		Cell SPU,
+>18	leshort		24		cisco SVIP,
+>18	leshort		25		cisco 7200,
+>18	leshort		36		NEC V800 or cisco 12000,
+>18	leshort		37		Fujitsu FR20,
+>18	leshort		38		TRW RH-32,
+>18	leshort		39		Motorola RCE,
+>18	leshort		40		ARM,
+>>4	byte		1
+>>>36	lelong&0xff000000	0x04000000	EABI4
+>>>36	lelong&0xff000000	0x05000000	EABI5
+>>>36	lelong		&0x00800000	BE8
+>>>36	lelong		&0x00400000	LE8
+>18	leshort		41		Alpha,
+>18	leshort		42		Renesas SH,
+>18	leshort		43		SPARC V9,
+>>4	byte		2
+>>>48	lelong&0xffff00	0x000200	Sun UltraSPARC1 Extensions Required,
+>>>48	lelong&0xffff00	0x000400	HaL R1 Extensions Required,
+>>>48	lelong&0xffff00	0x000800	Sun UltraSPARC3 Extensions Required,
+>>>48	lelong&0x3	0		total store ordering,
+>>>48	lelong&0x3	1		partial store ordering,
+>>>48	lelong&0x3	2		relaxed memory ordering,
+>18	leshort		44		Siemens Tricore Embedded Processor,
+>18	leshort		45		Argonaut RISC Core, Argonaut Technologies Inc.,
+>18	leshort		46		Renesas H8/300,
+>18	leshort		47		Renesas H8/300H,
+>18	leshort		48		Renesas H8S,
+>18	leshort		49		Renesas H8/500,
+>18	leshort		50		IA-64,
+>18	leshort		51		Stanford MIPS-X,
+>18	leshort		52		Motorola Coldfire,
+>18	leshort		53		Motorola M68HC12,
+>18	leshort		54		Fujitsu MMA,
+>18	leshort		55		Siemens PCP,
+>18	leshort		56		Sony nCPU,
+>18	leshort		57		Denso NDR1,
+>18	leshort		58		Start*Core,
+>18	leshort		59		Toyota ME16,
+>18	leshort		60		ST100,
+>18	leshort		61		Tinyj emb.,
+>18	leshort		62		x86-64,
+>18	leshort		63		Sony DSP,
+>18	leshort		64		DEC PDP-10,
+>18	leshort		65		DEC PDP-11,
+>18	leshort		66		FX66,
+>18	leshort		67		ST9+ 8/16 bit,
+>18	leshort		68		ST7 8 bit,
+>18	leshort		69		MC68HC16,
+>18	leshort		70		MC68HC11,
+>18	leshort		71		MC68HC08,
+>18	leshort		72		MC68HC05,
+>18	leshort		73		SGI SVx or Cray NV1,
+>18	leshort		74		ST19 8 bit,
+>18	leshort		75		Digital VAX,
+>18	leshort		76		Axis cris,
+>18	leshort		77		Infineon 32-bit embedded,
+>18	leshort		78		Element 14 64-bit DSP,
+>18	leshort		79		LSI Logic 16-bit DSP,
+>18	leshort		80		MMIX,
+>18	leshort		81		Harvard machine-independent,
+>18	leshort		82		SiTera Prism,
+>18	leshort		83		Atmel AVR 8-bit,
+>18	leshort		84		Fujitsu FR30,
+>18	leshort		85		Mitsubishi D10V,
+>18	leshort		86		Mitsubishi D30V,
+>18	leshort		87		NEC v850,
+>18	leshort		88		Renesas M32R,
+>18	leshort		89		Matsushita MN10300,
+>18	leshort		90		Matsushita MN10200,
+>18	leshort		91		picoJava,
+>18	leshort		92		OpenRISC,
+>18	leshort		93		ARC Cores Tangent-A5,
+>18	leshort		94		Tensilica Xtensa,
+>18	leshort		95		Alphamosaic VideoCore,
+>18	leshort		96		Thompson Multimedia,
+>18	leshort		97		NatSemi 32k,
+>18	leshort		98		Tenor Network TPC,
+>18	leshort		99		Trebia SNP 1000,
+>18	leshort		100		STMicroelectronics ST200,
+>18	leshort		101		Ubicom IP2022,
+>18	leshort		102		MAX Processor,
+>18	leshort		103		NatSemi CompactRISC,
+>18	leshort		104		Fujitsu F2MC16,
+>18	leshort		105		TI msp430,
+>18	leshort		106		Analog Devices Blackfin,
+>18	leshort		107		S1C33 Family of Seiko Epson,
+>18	leshort		108		Sharp embedded,
+>18	leshort		109		Arca RISC,
+>18	leshort		110		PKU-Unity Ltd.,
+>18	leshort		111		eXcess: 16/32/64-bit,
+>18	leshort		112		Icera Deep Execution Processor,
+>18	leshort		113		Altera Nios II,
+>18	leshort		114		NatSemi CRX,
+>18	leshort		115		Motorola XGATE,
+>18	leshort		116		Infineon C16x/XC16x,
+>18	leshort		117		Renesas M16C series,
+>18	leshort		118		Microchip dsPIC30F,
+>18	leshort		119		Freescale RISC core,
+>18	leshort		120		Renesas M32C series,
+>18	leshort		131		Altium TSK3000 core,
+>18	leshort		132		Freescale RS08,
+>18	leshort		134		Cyan Technology eCOG2,
+>18	leshort		135		Sunplus S+core7 RISC,
+>18	leshort		136		New Japan Radio (NJR) 24-bit DSP,
+>18	leshort		137		Broadcom VideoCore III,
+>18	leshort		138		LatticeMico32,
+>18	leshort		139		Seiko Epson C17 family,
+>18	leshort		140		TI TMS320C6000 DSP family,
+>18	leshort		141		TI TMS320C2000 DSP family,
+>18	leshort		142		TI TMS320C55x DSP family,
+>18	leshort		160		STMicroelectronics 64bit VLIW DSP,
+>18	leshort		161		Cypress M8C,
+>18	leshort		162		Renesas R32C series,
+>18	leshort		163		NXP TriMedia family,
+>18	leshort		164		QUALCOMM DSP6,
+>18	leshort		165		Intel 8051 and variants,
+>18	leshort		166		STMicroelectronics STxP7x family,
+>18	leshort		167		Andes embedded RISC,
+>18	leshort		168		Cyan eCOG1X family,
+>18	leshort		169		Dallas MAXQ30,
+>18	leshort		170		New Japan Radio (NJR) 16-bit DSP,
+>18	leshort		171		M2000 Reconfigurable RISC,
+>18	leshort		172		Cray NV2 vector architecture,
+>18	leshort		173		Renesas RX family,
+>18	leshort		174		META,
+>18	leshort		175		MCST Elbrus,
+>18	leshort		176		Cyan Technology eCOG16 family,
+>18	leshort		177		NatSemi CompactRISC,
+>18	leshort		178		Freescale Extended Time Processing Unit,
+>18	leshort		179		Infineon SLE9X,
+>18	leshort		180		Intel L1OM,
+>18	leshort		181		Intel K1OM,
+>18	leshort		183		ARM aarch64,
+>18	leshort		185		Atmel 32-bit family,
+>18	leshort		186		STMicroeletronics STM8 8-bit,
+>18	leshort		187		Tilera TILE64,
+>18	leshort		188		Tilera TILEPro,
+>18	leshort		189		Xilinx MicroBlaze 32-bit RISC,
+>18	leshort		190		NVIDIA CUDA architecture,
+>18	leshort		191		Tilera TILE-Gx,
+>18	leshort		197		Renesas RL78 family,
+>18	leshort		199		Renesas 78K0R,
+>18	leshort		200		Freescale 56800EX,
+>18	leshort		201		Beyond BA1,
+>18	leshort		202		Beyond BA2,
+>18	leshort		203		XMOS xCORE,
+>18	leshort		204		Microchip 8-bit PIC(r),
+>18	leshort		210		KM211 KM32,
+>18	leshort		211		KM211 KMX32,
+>18	leshort		212		KM211 KMX16,
+>18	leshort		213		KM211 KMX8,
+>18	leshort		214		KM211 KVARC,
+>18	leshort		215		Paneve CDP,
+>18	leshort		216		Cognitive Smart Memory,
+>18	leshort		217		iCelero CoolEngine,
+>18	leshort		218		Nanoradio Optimized RISC,
+>18	leshort		0x1057		AVR (unofficial),
+>18	leshort		0x1059		MSP430 (unofficial),
+>18	leshort		0x1223		Adapteva Epiphany (unofficial),
+>18	leshort		0x2530		Morpho MT (unofficial),
+>18	leshort		0x3330		FR30 (unofficial),
+>18	leshort		0x3426		OpenRISC (obsolete),
+>18	leshort		0x4688		Infineon C166 (unofficial),
+>18	leshort		0x5441		Cygnus FRV (unofficial),
+>18	leshort		0x5aa5		DLX (unofficial),
+>18	leshort		0x7650		Cygnus D10V (unofficial),
+>18	leshort		0x7676		Cygnus D30V (unofficial),
+>18	leshort		0x8217		Ubicom IP2xxx (unofficial),
+>18	leshort		0x8472		OpenRISC (obsolete),
+>18	leshort		0x9025		Cygnus PowerPC (unofficial),
+>18	leshort		0x9026		Alpha (unofficial),
+>18	leshort		0x9041		Cygnus M32R (unofficial),
+>18	leshort		0x9080		Cygnus V850 (unofficial),
+>18	leshort		0xa390		IBM S/390 (obsolete),
+>18	leshort		0xabc7		Old Xtensa (unofficial),
+>18	leshort		0xad45		xstormy16 (unofficial),
+>18	leshort		0xbaab		Old MicroBlaze (unofficial),,
+>18	leshort		0xbeef		Cygnus MN10300 (unofficial),
+>18	leshort		0xdead		Cygnus MN10200 (unofficial),
+>18	leshort		0xf00d		Toshiba MeP (unofficial),
+>18	leshort		0xfeb0		Renesas M32C (unofficial),
+>18	leshort		0xfeba		Vitesse IQ2000 (unofficial),
+>18	leshort		0xfebb		NIOS (unofficial),
+>18	leshort		0xfeed		Moxie (unofficial),
+>18	default		x
+>>18	leshort		x		*unknown arch 0x%x*
+>20	lelong		0		invalid version
+>20	lelong		1		version 1
+
+0	string		\177ELF		ELF
+!:strength *2
+>4	byte		0		invalid class
+>4	byte		1		32-bit
+>4	byte		2		64-bit
+>5	byte		0		invalid byte order
+>5	byte		1		LSB
+>>0	use		elf-le
+>5	byte		2		MSB
+>>0	use		\^elf-le
+# Up to now only 0, 1 and 2 are defined; I've seen a file with 0x83, it seemed
+# like proper ELF, but extracting the string had bad results.
+>4      byte            <0x80
+>>8	string		>\0		(%s)
+>8	string		\0
+>>7	byte		0		(SYSV)
+>>7	byte		1		(HP-UX)
+>>7	byte		2		(NetBSD)
+>>7	byte		3		(GNU/Linux)
+>>7	byte		4		(GNU/Hurd)
+>>7	byte		5		(86Open)
+>>7	byte		6		(Solaris)
+>>7	byte		7		(Monterey)
+>>7	byte		8		(IRIX)
+>>7	byte		9		(FreeBSD)
+>>7	byte		10		(Tru64)
+>>7	byte		11		(Novell Modesto)
+>>7	byte		12		(OpenBSD)
+>8      string          \2
+>>7     byte            13              (OpenVMS)
+>>7	byte		97		(ARM)
+>>7	byte		255		(embedded)
diff --git a/contrib/file/Magdir/encore b/contrib/file/magic/Magdir/encore
similarity index 84%
rename from contrib/file/Magdir/encore
rename to contrib/file/magic/Magdir/encore
index ef82eed64b0c..287b388dbaa1 100644
--- a/contrib/file/Magdir/encore
+++ b/contrib/file/magic/Magdir/encore
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: encore,v 1.6 2009/09/19 16:28:09 christos Exp $
+# $File: encore,v 1.7 2014/04/30 21:41:02 christos Exp $
 # encore:  file(1) magic for Encore machines
 #
 # XXX - needs to have the byte order specified (NS32K was little-endian,
@@ -12,11 +12,11 @@
 >20	short		0x10b		demand-paged executable
 >20	short		0x10f		unsupported executable
 >12	long		>0		not stripped
->22	short		>0		- version %ld
+>22	short		>0		- version %d
 >22	short		0		-
 #>4	date		x		stamp %s
 0	short		0x155		Encore unsupported executable
 >12	long		>0		not stripped
->22	short		>0		- version %ld
+>22	short		>0		- version %d
 >22	short		0		-
 #>4	date		x		stamp %s
diff --git a/contrib/file/Magdir/epoc b/contrib/file/magic/Magdir/epoc
similarity index 84%
rename from contrib/file/Magdir/epoc
rename to contrib/file/magic/Magdir/epoc
index c67a8b66e7b6..6f4ab5fc38e2 100644
--- a/contrib/file/Magdir/epoc
+++ b/contrib/file/magic/Magdir/epoc
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: epoc,v 1.7 2009/09/19 16:28:09 christos Exp $
+# $File: epoc,v 1.9 2013/12/21 14:28:15 christos Exp $
 # EPOC : file(1) magic for EPOC documents [Psion Series 5/Osaris/Geofox 1]
 # Stefan Praszalowicz <hpicollo@worldnet.fr> and Peter Breitenlohner <peb@mppmu.mpg.de>
 # Useful information for improving this file can be found at:
@@ -21,6 +21,7 @@
 !:mime application/x-epoc-word
 >>8	lelong		0x10000085	OPL program (TextEd)
 !:mime application/x-epoc-opl
+>>8	lelong		0x10000087	Comms settings
 >>8	lelong		0x10000088	Sheet file
 !:mime application/x-epoc-sheet
 >>8	lelong		0x100001C4	EasyFax initialisation file
@@ -29,11 +30,19 @@
 >4	lelong		0x10000074	OPL application
 !:mime application/x-epoc-app
 >4	lelong		0x1000008A	exported multi-bitmap image
+>4	lelong		0x1000016D
+>>8	lelong		0x10000087	Comms names
 
 0	lelong		0x10000041	Psion Series 5 ROM multi-bitmap image
 
 0	lelong		0x10000050	Psion Series 5
 >4	lelong		0x1000006D	database
+>>8	lelong		0x10000084	Agenda file
+!:mime application/x-epoc-agenda
+>>8	lelong		0x10000086	Data file
+!:mime application/x-epoc-data
+>>8	lelong		0x10000CEA	Jotter file
+!:mime application/x-epoc-jotter
 >4	lelong		0x100000E4	ini file
 
 0	lelong		0x10000079	Psion Series 5 binary:
diff --git a/contrib/file/Magdir/erlang b/contrib/file/magic/Magdir/erlang
similarity index 100%
rename from contrib/file/Magdir/erlang
rename to contrib/file/magic/Magdir/erlang
diff --git a/contrib/file/Magdir/esri b/contrib/file/magic/Magdir/esri
similarity index 100%
rename from contrib/file/Magdir/esri
rename to contrib/file/magic/Magdir/esri
diff --git a/contrib/file/Magdir/fcs b/contrib/file/magic/Magdir/fcs
similarity index 100%
rename from contrib/file/Magdir/fcs
rename to contrib/file/magic/Magdir/fcs
diff --git a/contrib/file/Magdir/filesystems b/contrib/file/magic/Magdir/filesystems
similarity index 50%
rename from contrib/file/Magdir/filesystems
rename to contrib/file/magic/Magdir/filesystems
index af9695b9a42a..7225d7599653 100644
--- a/contrib/file/Magdir/filesystems
+++ b/contrib/file/magic/Magdir/filesystems
@@ -1,8 +1,189 @@
-
 #------------------------------------------------------------------------------
-# $File: filesystems,v 1.61 2011/01/10 14:01:10 christos Exp $
+# $File: filesystems,v 1.95 2014/06/03 19:17:27 christos Exp $
 # filesystems:  file(1) magic for different filesystems
 #
+0	name	partid  
+>0	ubyte	0x00	Unused
+>0	ubyte	0x01	12-bit FAT
+>0	ubyte	0x02	XENIX /
+>0	ubyte	0x03	XENIX /usr
+>0	ubyte	0x04	16-bit FAT, less than 32M
+>0	ubyte	0x05	extended partition
+>0	ubyte	0x06	16-bit FAT, more than 32M
+>0	ubyte	0x07	OS/2 HPFS, NTFS, QNX2, Adv. UNIX
+>0	ubyte	0x08	AIX or os, or etc.
+>0	ubyte	0x09	AIX boot partition or Coherent
+>0	ubyte	0x0a	O/2 boot manager or Coherent swap
+>0	ubyte	0x0b	32-bit FAT
+>0	ubyte	0x0c	32-bit FAT, LBA-mapped
+>0	ubyte	0x0d	7XXX, LBA-mapped
+>0	ubyte	0x0e	16-bit FAT, LBA-mapped
+>0	ubyte	0x0f	extended partition, LBA-mapped
+>0	ubyte	0x10	OPUS
+>0	ubyte	0x11 	OS/2 DOS 12-bit FAT
+>0	ubyte	0x12 	Compaq diagnostics
+>0	ubyte	0x14 	OS/2 DOS 16-bit FAT <32M
+>0	ubyte	0x16 	OS/2 DOS 16-bit FAT >=32M
+>0	ubyte	0x17 	OS/2 hidden IFS
+>0	ubyte	0x18 	AST Windows swapfile
+>0	ubyte	0x19 	Willowtech Photon coS
+>0	ubyte	0x1b 	hidden win95 fat 32
+>0	ubyte	0x1c 	hidden win95 fat 32 lba
+>0	ubyte	0x1d	hidden win95 fat 16 lba
+>0	ubyte	0x20 	Willowsoft OFS1
+>0	ubyte	0x21 	reserved
+>0	ubyte	0x23 	reserved
+>0	ubyte	0x24	NEC DOS
+>0	ubyte	0x26 	reserved
+>0	ubyte	0x31 	reserved
+>0	ubyte	0x32	Alien Internet Services NOS
+>0	ubyte	0x33 	reserved
+>0	ubyte	0x34 	reserved
+>0	ubyte	0x35 	JFS on OS2
+>0	ubyte	0x36 	reserved
+>0	ubyte	0x38 	Theos
+>0	ubyte	0x39 	Plan 9, or Theos spanned
+>0	ubyte	0x3a 	Theos ver 4 4gb partition
+>0	ubyte	0x3b 	Theos ve 4 extended partition
+>0	ubyte	0x3c 	PartitionMagic recovery
+>0	ubyte	0x3d 	Hidden Netware
+>0	ubyte	0x40 	VENIX 286 or LynxOS
+>0	ubyte	0x41	PReP
+>0	ubyte	0x42	linux swap sharing DRDOS disk
+>0	ubyte	0x43	linux sharing DRDOS disk
+>0	ubyte	0x44	GoBack change utility
+>0	ubyte	0x45	Boot US Boot manager
+>0	ubyte	0x46	EUMEL/Elan or Ergos 3
+>0	ubyte	0x47	EUMEL/Elan or Ergos 3
+>0	ubyte	0x48	EUMEL/Elan or Ergos 3
+>0	ubyte	0x4a	ALFX/THIN filesystem for DOS
+>0	ubyte	0x4c	Oberon partition
+>0	ubyte	0x4d 	QNX4.x
+>0	ubyte	0x4e 	QNX4.x 2nd part
+>0	ubyte	0x4f 	QNX4.x 3rd part
+>0	ubyte	0x50 	DM (disk manager)
+>0	ubyte	0x51 	DM6 Aux1 (or Novell)
+>0	ubyte	0x52 	CP/M or Microport SysV/AT
+>0	ubyte	0x53 	DM6 Aux3
+>0	ubyte	0x54	DM6 DDO
+>0	ubyte	0x55	EZ-Drive (disk manager)
+>0	ubyte	0x56	Golden Bow (disk manager)
+>0	ubyte	0x57	Drive PRO
+>0	ubyte	0x5c	Priam Edisk (disk manager)
+>0	ubyte	0x61	SpeedStor
+>0	ubyte	0x63	GNU HURD or Mach or Sys V/386
+>0	ubyte	0x64	Novell Netware 2.xx or Speedstore
+>0	ubyte	0x65	Novell Netware 3.xx
+>0	ubyte	0x66	Novell 386 Netware
+>0	ubyte	0x67	Novell
+>0	ubyte	0x68	Novell
+>0	ubyte	0x69	Novell
+>0	ubyte	0x70	DiskSecure Multi-Boot
+>0	ubyte	0x71	reserved
+>0	ubyte	0x73	reserved
+>0	ubyte	0x74	reserved
+>0	ubyte	0x75	PC/IX
+>0	ubyte	0x76	reserved
+>0	ubyte	0x77	M2FS/M2CS partition
+>0	ubyte	0x78	XOSL boot loader filesystem
+>0	ubyte	0x80	MINIX until 1.4a
+>0	ubyte	0x81	MINIX since 1.4b
+>0	ubyte	0x82	Linux swap or Solaris
+>0	ubyte	0x83	Linux native
+>0	ubyte	0x84	OS/2 hidden C: drive
+>0	ubyte	0x85	Linux extended partition
+>0	ubyte	0x86	NT FAT volume set
+>0	ubyte	0x87	NTFS volume set or HPFS mirrored
+>0	ubyte	0x8a	Linux Kernel AiR-BOOT partition
+>0	ubyte	0x8b	Legacy Fault tolerant FAT32
+>0	ubyte	0x8c	Legacy Fault tolerant FAT32 ext
+>0	ubyte	0x8d	Hidden free FDISK FAT12
+>0	ubyte	0x8e	Linux Logical Volume Manager
+>0	ubyte	0x90	Hidden free FDISK FAT16
+>0	ubyte	0x91	Hidden free FDISK DOS EXT
+>0	ubyte	0x92	Hidden free FDISK FAT16 Big
+>0	ubyte	0x93	Amoeba filesystem
+>0	ubyte	0x94	Amoeba bad block table
+>0	ubyte	0x95	MIT EXOPC native partitions
+>0	ubyte	0x97	Hidden free FDISK FAT32
+>0	ubyte	0x98	Datalight ROM-DOS Super-Boot
+>0	ubyte	0x99	Mylex EISA SCSI
+>0	ubyte	0x9a	Hidden free FDISK FAT16 LBA
+>0	ubyte	0x9b	Hidden free FDISK EXT LBA
+>0	ubyte	0x9f	BSDI?
+>0	ubyte	0xa0	IBM Thinkpad hibernation
+>0	ubyte	0xa1	HP Volume expansion (SpeedStor)
+>0	ubyte	0xa3	HP Volume expansion (SpeedStor)
+>0	ubyte	0xa4	HP Volume expansion (SpeedStor)
+>0	ubyte	0xa5	386BSD partition type
+>0	ubyte	0xa6	OpenBSD partition type
+>0	ubyte	0xa7	NeXTSTEP 486
+>0	ubyte	0xa8	Apple UFS
+>0	ubyte	0xa9	NetBSD partition type
+>0	ubyte	0xaa	Olivetty Fat12 1.44MB Service part
+>0	ubyte	0xab	Apple Boot
+>0	ubyte	0xae	SHAG OS filesystem
+>0	ubyte	0xaf	Apple HFS
+>0	ubyte	0xb0	BootStar Dummy
+>0	ubyte	0xb1	reserved
+>0	ubyte	0xb3	reserved
+>0	ubyte	0xb4	reserved
+>0	ubyte	0xb6	reserved
+>0	ubyte	0xb7	BSDI BSD/386 filesystem
+>0	ubyte	0xb8	BSDI BSD/386 swap
+>0	ubyte	0xbb	Boot Wizard Hidden
+>0	ubyte	0xbe	Solaris 8 partition type
+>0	ubyte	0xbf	Solaris partition type
+>0	ubyte	0xc0 	CTOS
+>0	ubyte	0xc1 	DRDOS/sec (FAT-12)
+>0	ubyte	0xc2 	Hidden Linux
+>0	ubyte	0xc3 	Hidden Linux swap
+>0	ubyte	0xc4 	DRDOS/sec (FAT-16, < 32M)
+>0	ubyte	0xc5 	DRDOS/sec (EXT)
+>0	ubyte	0xc6 	DRDOS/sec (FAT-16, >= 32M)
+>0	ubyte	0xc7 	Syrinx (Cyrnix?) or HPFS disabled
+>0	ubyte	0xc8 	Reserved for DR-DOS 8.0+
+>0	ubyte	0xc9 	Reserved for DR-DOS 8.0+
+>0	ubyte	0xca 	Reserved for DR-DOS 8.0+
+>0	ubyte	0xcb 	DR-DOS 7.04+ Secured FAT32 CHS
+>0	ubyte	0xcc 	DR-DOS 7.04+ Secured FAT32 LBA
+>0	ubyte	0xcd	CTOS Memdump
+>0	ubyte	0xce 	DR-DOS 7.04+ FAT16X LBA
+>0	ubyte	0xcf 	DR-DOS 7.04+ EXT LBA
+>0	ubyte	0xd0 	REAL/32 secure big partition
+>0	ubyte	0xd1 	Old Multiuser DOS FAT12
+>0	ubyte	0xd4 	Old Multiuser DOS FAT16 Small
+>0	ubyte	0xd5 	Old Multiuser DOS Extended
+>0	ubyte	0xd6 	Old Multiuser DOS FAT16 Big
+>0	ubyte	0xd8 	CP/M 86
+>0	ubyte	0xdb 	CP/M or Concurrent CP/M
+>0	ubyte	0xdd 	Hidden CTOS Memdump
+>0	ubyte	0xde 	Dell PowerEdge Server utilities
+>0	ubyte	0xdf 	DG/UX virtual disk manager
+>0	ubyte	0xe0 	STMicroelectronics ST AVFS
+>0	ubyte	0xe1 	DOS access or SpeedStor 12-bit
+>0	ubyte	0xe3 	DOS R/O or Storage Dimensions
+>0	ubyte	0xe4 	SpeedStor 16-bit FAT < 1024 cyl.
+>0	ubyte	0xe5	reserved
+>0	ubyte	0xe6	reserved
+>0	ubyte	0xeb 	BeOS
+>0	ubyte	0xee	GPT Protective MBR
+>0	ubyte	0xef	EFI system partition
+>0	ubyte	0xf0 	Linux PA-RISC boot loader
+>0	ubyte	0xf1 	SpeedStor or Storage Dimensions
+>0	ubyte	0xf2 	DOS 3.3+ Secondary
+>0	ubyte	0xf3	reserved
+>0	ubyte	0xf4	SpeedStor large partition
+>0	ubyte	0xf5	Prologue multi-volumen partition
+>0	ubyte	0xf6 	reserved
+>0	ubyte	0xf9 	pCache: ext2/ext3 persistent cache
+>0	ubyte	0xfa 	Bochs x86 emulator
+>0	ubyte	0xfb 	VMware File System
+>0	ubyte	0xfc 	VMware Swap
+>0	ubyte	0xfd 	Linux RAID partition persistent sb
+>0	ubyte	0xfe	LANstep or IBM PS/2 IML
+>0	ubyte	0xff 	Xenix Bad Block Table
+
 0	string	\366\366\366\366	PC formatted floppy with no filesystem
 # Sun disk labels
 # From /usr/include/sun/dklabel.h:
@@ -23,11 +204,12 @@
 >>0752	short		>0		%d alt cyls,
 >>0754	short		>0		%d heads/partition,
 >>0756	short		>0		%d sectors/track,
->>0764	long		>0		start cyl %ld,
->>0770	long		x		%ld blocks
+>>0764	long		>0		start cyl %d,
+>>0770	long		x		%d blocks
 # Is there a boot block written 1 sector in?
 >512    belong&077777777	0600407	\b, boot block present
-# Joerg Jenderek: Smart Boot Manager backup file is 41 byte header + first sectors of disc
+
+# Joerg Jenderek: Smart Boot Manager backup file is 25 (MSDOS) or 41 (LINUX) byte header + first sectors of disk
 # (http://btmgr.sourceforge.net/docs/user-guide-3.html)
 0		string	SBMBAKUP_	Smart Boot Manager backup file
 >9		string	x		\b, version %-5.5s
@@ -41,8 +223,10 @@
 >>>>21		ubyte	x		\b, from drive 0x%x
 >>>22		ubyte	>0		
 >>>>21		string	x		\b, from drive %s
+>>>535		search/17	\x55\xAA	
+>>>>&-512	indirect	x	\b; contains 
 
-# Joerg Jenderek
+# updated by Joerg Jenderek at Nov 2012
 # DOS Emulator image is 128 byte, null right padded header + harddisc image
 0	string	DOSEMU\0			
 >0x27E	leshort	0xAA55			
@@ -52,17 +236,186 @@
 >>>>7	ulelong	>0		\b, %u heads
 >>>>11	ulelong	>0		\b, %d sectors/track
 >>>>15	ulelong	>0		\b, %d cylinders
+>>>>128	indirect	x	\b; contains 
 
-# updated by Joerg Jenderek at Sep 2007
+# added by Joerg Jenderek at Nov 2012
+# http://www.thenakedpc.com/articles/v04/08/0408-05.html
+# Symantec (Peter Norton) Image.dat file consists of variable header, bootrecord, part of FAT and root directory data
+0	string	PNCIHISK\0		Norton Utilities disc image data
+# real x86 boot sector with jump instruction
+>509	search/1026	\x55\xAA\xeb	
+>>&-1	indirect	x		\b; contains 
+# http://file-extension.net/seeker/file_extension_dat
+0	string	PNCIUNDO		Norton Disk Doctor UnDo file
+#
+
+# DOS/MBR boot sector updated by Joerg Jenderek at Sep 2007,May 2011,2013
+# for any allowed sector sizes
+30		search/481	\x55\xAA	
+# to display DOS/MBR boot sector (40) before old one (strength=50+21),Syslinux bootloader (71),SYSLINUX MBR (37+36),NetBSD mbr (110),AdvanceMAME mbr (111)
+# DOS BPB information (70) and after DOS floppy (120) like in previous file version
+!:strength +72
+# for sector sizes < 512 Bytes
+>11		uleshort	<512		
+>>(11.s-2)	uleshort	0xAA55		DOS/MBR boot sector
+# for sector sizes with 512 or more Bytes
+>0x1FE		leshort		0xAA55		DOS/MBR boot sector
+# keep old DOS/MBR boot sector as dummy for mbr and bootloader displaying
 # only for sector sizes with 512 or more Bytes
-0x1FE	leshort	0xAA55			x86 boot sector
-# to do also for sectors < than 512 Bytes and some other files, GRR
-#30	search/481	\x55\xAA	x86 boot sector
-# not for BeOS floppy 1440k, MBRs
-#(11.s-2) uleshort	0xAA55		x86 boot sector
+0x1FE		leshort		0xAA55		
+#
+# to display information (50) before DOS BPB (strength=70) and after DOS floppy (120) like in old file version
+!:strength +21
 >2	string	OSBS			\b, OS/BS MBR
-# J\xf6rg Jenderek <joerg dot jenderek at web dot de>
->0x8C	string	Invalid\ partition\ table	\b, MS-DOS MBR
+# added by Joerg Jenderek at Feb 2013 according to http://thestarman.pcministry.com/asm/mbr/
+# and http://en.wikipedia.org/wiki/Master_Boot_Record
+# test for nearly all MS-DOS Master Boot Record initial program loader (IPL) is now done by 
+# characteristic assembler instructions: xor ax,ax;mov ss,ax;mov sp,7c00
+>0	search/2	\x33\xc0\x8e\xd0\xbc\x00\x7c	MS-MBR
+# Microsoft Windows 95A and early ( http://thestarman.pcministry.com/asm/mbr/STDMBR.htm )
+# assembler instructions: mov si,sp;push ax;pop es;push ax;pop ds;sti;cld
+>>8	ubequad		0x8bf45007501ffbfc		
+# http://thestarman.pcministry.com/asm/mbr/200MBR.htm
+>>>0x16	ubyte		0xF3				\b,DOS 2
+>>>>219	regex		Author\ -\ 			Author:
+# found "David Litton" , "A Pehrsson  "
+>>>>>&0	string		x				"%s"
+>>>0x16	ubyte		0xF2				
+# NEC MS-DOS 3.30 Rev. 3 . See http://thestarman.pcministry.com/asm/mbr/DOS33MBR.htm
+# assembler instructions: mov di,077c;cmp word ptrl[di],a55a;jnz
+>>>>0x22	ubequad	0xbf7c07813d5aa575		\b,NEC 3.3
+# version MS-DOS 3.30 til MS-Windows 95A (WinVer=4.00.1111)
+>>>>0x22	default	x				\b,D0S version 3.3-7.0
+# error messages are printed by assembler instructions: mov si,06nn;...;int 10 (0xBEnn06;...)
+# where nn is string offset varying for different languages
+# "Invalid partition table"				nn=0x8b for english version
+>>>>>(0x49.b)	string		Invalid\ partition\ table		english
+>>>>>(0x49.b)	string		Ung\201ltige\ Partitionstabelle		german
+>>>>>(0x49.b)	string		Table\ de\ partition\ invalide		french
+>>>>>(0x49.b)	string		Tabela\ de\ parti\207ao\ inv\240lida	portuguese
+>>>>>(0x49.b)	string		Tabla\ de\ partici\242n\ no\ v\240lida	spanish
+>>>>>(0x49.b)	string		Tavola\ delle\ partizioni\ non\ valida	italian
+>>>>>0x49	ubyte		>0			at offset 0x%x
+>>>>>>(0x49.b)	string		>\0			"%s"
+# "Error loading operating system"			nn=0xa3 for english version
+# "Fehler beim Laden des Betriebssystems"		nn=0xa7 for german version
+# "Erreur en chargeant syst\212me d'exploitation"	nn=0xa7 for french version
+# "Erro na inicializa\207ao do sistema operacional"	nn=0xa7 for portuguese Brazilian version
+# "Error al cargar sistema operativo"			nn=0xa8 for spanish version
+# "Errore durante il caricamento del sistema operativo"	nn=0xae for italian version
+>>>>>0x74	ubyte		>0			at offset 0x%x
+>>>>>>(0x74.b)	string		>\0			"%s"
+# "Missing operating system"				nn=0xc2 for english version
+# "Betriebssystem fehlt"				nn=0xcd for german version
+# "Syst\212me d'exploitation absent"			nn=0xd2 for french version
+# "Sistema operacional nao encontrado"			nn=0xd4 for portuguese Brazilian version
+# "Falta sistema operativo"				nn=0xca for spanish version
+# "Sistema operativo mancante"				nn=0xe2 for italian version
+>>>>>0x79	ubyte		>0			at offset 0x%x
+>>>>>>(0x79.b)	string		>\0			"%s"
+# Microsoft Windows 95B to XP (http://thestarman.pcministry.com/asm/mbr/95BMEMBR.htm)
+# assembler instructions: push ax;pop es;push  ax;pop ds;cld;mov si,7c1b
+>>8	ubequad		0x5007501ffcbe1b7c		
+# assembler instructions: rep;movsb;retf;mov si,07be;mov cl,04
+>>>24		ubequad	0xf3a4cbbebe07b104		9M
+# "Invalid partition table"				nn=0x10F for english version
+# "Ung\201ltige Partitionstabelle"				nn=0x10F for german version
+# "Table de partition erron\202e"				nn=0x10F for french version
+# "\216\257\245\340\240\346\250\256\255\255\240\357 \341\250\341\342\245\254\240 \255\245 \255\240\251\244\245\255\240"	nn=0x10F for russian version
+>>>>(0x3C.b+0x0FF)	string	Invalid\ partition\ table		english
+>>>>(0x3C.b+0x0FF)	string	Ung\201ltige\ Partitionstabelle		german
+>>>>(0x3C.b+0x0FF)	string	Table\ de\ partition\ erron\202e	french
+>>>>(0x3C.b+0x0FF)	string	\215\245\257\340\240\242\250\253\354\255\240\357\ \342\240\241\253\250\346\240	russian
+>>>>0x3C		ubyte	x			at offset 0x%x+0xFF
+>>>>(0x3C.b+0x0FF)	string	>\0			"%s"
+# "Error loading operating system"			nn=0x127 for english version
+# "Fehler beim Laden des Betriebssystems"		nn=0x12b for german version
+# "Erreur lors du chargement du syst\212me d'exploitation"	nn=0x12a for french version
+# "\216\350\250\241\252\240 \257\340\250 \247\240\243\340\343\247\252\245 \256\257\245\340\240\346\250\256\255\255\256\251 \341\250\341\342\245\254\353"	nn=0x12d for russian version
+>>>>0xBD		ubyte	x			at offset 0x1%x
+>>>>(0xBD.b+0x100)	string	>\0			"%s"
+# "Missing operating system"				nn=0x146 for english version
+# "Betriebssystem fehlt"				nn=0x151 for german version
+# "Syst\212me d'exploitation manquant"			nn=0x15e for french version
+# "\216\257\245\340\240\346\250\256\255\255\240\357 \341\250\341\342\245\254\240 \255\245 \255\240\251\244\245\255\240"	nn=0x156 for russian version
+>>>>0xA9		ubyte	x			at offset 0x1%x
+>>>>(0xA9.b+0x100)	string	>\0			"%s"
+# http://thestarman.pcministry.com/asm/mbr/Win2kmbr.htm
+# assembler instructions: rep;movsb;retf;mov BP,07be;mov cl,04
+>>>24		ubequad	0xf3a4cbbdbe07b104		XP
+# where xxyyzz are lower bits from offsets of error messages varying for different languages
+>>>>0x1B4	ubelong&0x00FFFFFF	0x002c4463	english
+>>>>0x1B4	ubelong&0x00FFFFFF	0x002c486e	german
+# "Invalid partition table"				xx=0x12C for english version
+# "Ung\201ltige Partitionstabelle"				xx=0x12C for german version
+>>>>0x1b5	ubyte		>0			at offset 0x1%x
+>>>>(0x1b5.b+0x100)	string	>\0			"%s"
+# "Error loading operating system"			yy=0x144 for english version
+# "Fehler beim Laden des Betriebssystems"		yy=0x148 for german version
+>>>>0x1b6	ubyte		>0			at offset 0x1%x
+>>>>(0x1b6.b+0x100)	string	>\0			"%s"
+# "Missing operating system"				zz=0x163 for english version
+# "Betriebssystem nicht vorhanden"			zz=0x16e for german version
+>>>>0x1b7	ubyte		>0			at offset 0x1%x
+>>>>(0x1b7.b+0x100)	string	>\0			"%s"
+# Microsoft Windows Vista or 7
+# assembler instructions: ..;mov ds,ax;mov si,7c00;mov di,..00
+>>8	ubequad		0xc08ed8be007cbf00		
+# Microsoft Windows Vista (http://thestarman.pcministry.com/asm/mbr/VistaMBR.htm)
+# assembler instructions: jnz 0729;cmp ebx,"TCPA"
+>>>0xEC		ubequad	0x753b6681fb544350		Vista
+# where xxyyzz are lower bits from offsets of error messages varying for different languages
+>>>>0x1B4	ubelong&0x00FFFFFF	0x00627a99	english
+#>>>>0x1B4	ubelong&0x00FFFFFF	?		german
+# "Invalid partition table"				xx=0x162 for english version
+# "Ung\201ltige Partitionstabelle"				xx=0x1?? for german version
+>>>>0x1b5	ubyte		>0			at offset 0x1%x
+>>>>(0x1b5.b+0x100)	string	>\0			"%s"
+# "Error loading operating system"			yy=0x17a for english version
+# "Fehler beim Laden des Betriebssystems"		yy= 0x1?? for german version
+>>>>0x1b6	ubyte		>0			at offset 0x1%x
+>>>>(0x1b6.b+0x100)	string	>\0			"%s"
+# "Missing operating system"				zz=0x199 for english version
+# "Betriebssystem nicht vorhanden"			zz=0x1?? for german version
+>>>>0x1b7	ubyte		>0			at offset 0x1%x
+>>>>(0x1b7.b+0x100)	string	>\0			"%s"
+# Microsoft Windows 7 (http://thestarman.pcministry.com/asm/mbr/W7MBR.htm)
+# assembler instructions: cmp ebx,"TCPA";cmp
+>>>0xEC		ubequad	0x6681fb5443504175		Windows 7
+# where xxyyzz are lower bits from offsets of error messages varying for different languages
+>>>>0x1B4	ubelong&0x00FFFFFF	0x00637b9a	english
+#>>>>0x1B4	ubelong&0x00FFFFFF	?		german
+# "Invalid partition table"				xx=0x163 for english version
+# "Ung\201ltige Partitionstabelle"				xx=0x1?? for german version
+>>>>0x1b5	ubyte		>0			at offset 0x1%x
+>>>>(0x1b5.b+0x100)	string	>\0			"%s"
+# "Error loading operating system"			yy=0x17b for english version
+# "Fehler beim Laden des Betriebssystems"		yy=0x1?? for german version
+>>>>0x1b6	ubyte		>0			at offset 0x1%x
+>>>>(0x1b6.b+0x100)	string	>\0			"%s"
+# "Missing operating system"				zz=0x19a for english version
+# "Betriebssystem nicht vorhanden"			zz=0x1?? for german version
+>>>>0x1b7	ubyte		>0			at offset 0x1%x
+>>>>(0x1b7.b+0x100)	string	>\0			"%s"
+# http://thestarman.pcministry.com/asm/mbr/Win2kmbr.htm#DiskSigs
+# http://en.wikipedia.org/wiki/MBR_disk_signature#ID
+>>0x1b8	ulelong		>0				\b, disk signature 0x%-.4x
+# driveID/timestamp for Win 95B,98,98SE and ME. See http://thestarman.pcministry.com/asm/mbr/mystery.htm
+>>0xDA	uleshort		0			
+>>>0xDC 	ulelong		>0			\b, created
+# physical drive number (0x80-0xFF) when the Windows wrote that byte to the drive
+>>>>0xDC	ubyte		x			with driveID 0x%x
+# hours, minutes and seconds 
+>>>>0xDf	ubyte		x			at %x
+>>>>0xDe	ubyte		x			\b:%x
+>>>>0xDd	ubyte		x			\b:%x
+# special case for Microsoft MS-DOS 3.21 spanish
+# assembler instructions: cli;mov $0x30,%ax;mov %ax,%ss;mov 
+>0	ubequad		0xfab830008ed0bc00		
+# assembler instructions: $0x1f00,%sp;mov $0x80cb,%di;add %cl,(%bx,%si);in (%dx),%ax;mov 
+>>8	ubequad		0x1fbfcb800008ed8		MS-MBR,D0S version 3.21 spanish
+# Microsoft MBR IPL end
+
 # dr-dos with some upper-, lowercase variants
 >0x9D	string	Invalid\ partition\ table$	
 >>181	string	No\ Operating\ System$		
@@ -81,30 +434,9 @@
 >>>>>>358	string	Press\ any\ key\ to\ continue.\n\r$	
 >>>>>>>387	string	Copyright\ (c)\ 1984,1998	
 >>>>>>>>411	string	Caldera\ Inc.\0		\b, DR-DOS MBR (IBMBIO.LDR)
->0x10F	string	Ung\201ltige\ Partitionstabelle	\b, MS-DOS MBR, german version 4.10.1998, 4.10.2222
->>0x1B8	ubelong	>0				\b, Serial 0x%-.4x
->0x8B	string	Ung\201ltige\ Partitionstabelle	\b, MS-DOS MBR, german version 5.00 to 4.00.950
->271	string	Invalid\ partition\ table\0		
->>295	string	Error\ loading\ operating\ system\0	
->>>326	string	Missing\ operating\ system\0		\b, mbr
 #
->139	string	Invalid\ partition\ table\0		
->>163	string	Error\ loading\ operating\ system\0	
->>>194	string	Missing\ operating\ system\0		\b, Microsoft Windows XP mbr
-# http://www.heise.de/ct/05/09/006/ page 184
-#HKEY_LOCAL_MACHINE\SYSTEM\MountedDevices\DosDevices\?:=Serial4Bytes+8Bytes
->>>>0x1B8	ulelong	>0				\b,Serial 0x%-.4x
->300	string	Invalid\ partition\ table\0	
->>324	string	Error\ loading\ operating\ system\0
->>>355	string	Missing\ operating\ system\0		\b, Microsoft Windows XP MBR
-#??>>>389	string	Invalid\ system\ disk		
->>>>0x1B8	ulelong	>0				\b, Serial 0x%-.4x
->300	string	Ung\201ltige\ Partitionstabelle
-#split string to avoid error: String too long
->>328	string	Fehler\ beim\ Laden\ 	
->>>346	string	des\ Betriebssystems	
->>>>366	string	Betriebssystem\ nicht\ vorhanden	\b, Microsoft Windows XP MBR (german)
->>>>>0x1B8	ulelong	>0				\b, Serial 0x%-.4x
+# tests for different MS-DOS Master Boot Records (MBR) moved and merged
+#
 #>0x145	string	Default:\ F				\b, FREE-DOS MBR
 #>0x14B	string	Default:\ F				\b, FREE-DOS 1.0 MBR
 >0x145	search/7	Default:\ F			\b, FREE-DOS MBR
@@ -131,8 +463,7 @@
 >>>>>>>420	ubyte&0x0F	0Xf			\b ask
 >>>>>420	ubyte		x			\b)
 #
->271	string	Operating\ system\ loading 		
->>296	string	error\r					\b, SYSLINUX MBR (2.10)
+# SYSLINUX MBR moved
 # http://www.acronis.de/
 >362	string	MBR\ Error\ \0\r			
 >>376	string	ress\ any\ key\ to\ 			
@@ -188,88 +519,58 @@
 >>>>>379	string	GRUB\ \0		\b, GRUB version 0.95 or 0.96
 >>>>391		string	Geom\0Hard\ Disk\0Read\0\ Error\0
 >>>>>385	string	GRUB\ \0		\b, GRUB version 0.97
-#unkown version
+# unknown version
 >>>343		string	Geom\0Read\0\ Error\0	
 >>>>321		string	Loading\ stage1.5	\b, GRUB version x.y
 >>>380		string	Geom\0Hard\ Disk\0Read\0\ Error\0
 >>>>374		string	GRUB\ \0		\b, GRUB version n.m
-# http://syslinux.zytor.com/
->478	string	Boot\ failed\r			
->>495	string	LDLINUX\ SYS			\b, SYSLINUX bootloader (1.62)
->480	string	Boot\ failed\r			
->>495	string	LDLINUX\ SYS			\b, SYSLINUX bootloader (2.06 or 2.11)
->484	string	Boot\ error\r			\b, SYSLINUX bootloader (3.11)
+# SYSLINUX bootloader moved
 >395	string	chksum\0\ ERROR!\0		\b, Gujin bootloader
 # http://www.bcdwb.de/bcdw/index_e.htm
 >3	string	BCDL				
 >>498	string	BCDL\ \ \ \ BIN			\b, Bootable CD Loader (1.50Z)
-# mbr partition table entries
-# OEM-ID does not contain MicroSoft,NEWLDR,DOS,SYSLINUX,or MTOOLs
->3			string		!MS
->>3			string		!SYSLINUX
->>>3			string		!MTOOL
->>>>3			string		!NEWLDR
->>>>>5			string		!DOS
-# not FAT (32 bit)
->>>>>>82		string		!FAT32
-#not Linux kernel
->>>>>>>514		string		!HdrS
-#not BeOS
->>>>>>>>422		string		!Be\ Boot\ Loader
-# active flag 0 or 0x80 and type > 0
->>>>>>>>>446		ubyte		<0x81	
->>>>>>>>>>446		ubyte&0x7F	0	
->>>>>>>>>>>450		ubyte		>0	\b; partition 1: ID=0x%x
->>>>>>>>>>>>446		ubyte		0x80	\b, active
->>>>>>>>>>>>447		ubyte		x	\b, starthead %u
-#>>>>>>>>>>>>448		ubyte		x	\b, start C_S: 0x%x
-#>>>>>>>>>>>>448		ubeshort&1023	x	\b, startcylinder? %d
->>>>>>>>>>>>454		ulelong		x	\b, startsector %u
->>>>>>>>>>>>458		ulelong		x	\b, %u sectors
-#
->>>>>>>>>462		ubyte		<0x81	
->>>>>>>>>>462		ubyte&0x7F	0		
->>>>>>>>>>>466		ubyte		>0	\b; partition 2: ID=0x%x
->>>>>>>>>>>>462		ubyte		0x80	\b, active
->>>>>>>>>>>>463		ubyte		x	\b, starthead %u
-#>>>>>>>>>>>>464		ubyte		x	\b, start C_S: 0x%x
-#>>>>>>>>>>>>464		ubeshort&1023	x	\b, startcylinder? %d
->>>>>>>>>>>>470		ulelong		x	\b, startsector %u
->>>>>>>>>>>>474		ulelong		x	\b, %u sectors
-#
->>>>>>>>>478		ubyte		<0x81		
->>>>>>>>>>478		ubyte&0x7F	0		
->>>>>>>>>>>482		ubyte		>0	\b; partition 3: ID=0x%x
->>>>>>>>>>>>478		ubyte		0x80	\b, active
->>>>>>>>>>>>479		ubyte		x	\b, starthead %u
-#>>>>>>>>>>>>480		ubyte		x	\b, start C_S: 0x%x
-#>>>>>>>>>>>>481		ubyte		x	\b, start C2S: 0x%x
-#>>>>>>>>>>>>480		ubeshort&1023	x	\b, startcylinder? %d
->>>>>>>>>>>>486		ulelong		x	\b, startsector %u
->>>>>>>>>>>>490		ulelong		x	\b, %u sectors
-#
->>>>>>>>>494		ubyte		<0x81	
->>>>>>>>>>494		ubyte&0x7F	0		
->>>>>>>>>>>498		ubyte		>0	\b; partition 4: ID=0x%x
->>>>>>>>>>>>494		ubyte		0x80	\b, active
->>>>>>>>>>>>495		ubyte		x	\b, starthead %u
-#>>>>>>>>>>>>496		ubyte		x	\b, start C_S: 0x%x
-#>>>>>>>>>>>>496		ubeshort&1023	x	\b, startcylinder? %d
->>>>>>>>>>>>502		ulelong		x	\b, startsector %u
->>>>>>>>>>>>506		ulelong		x	\b, %u sectors
+# mbr partition table entries updated by Joerg Jenderek at Sep 2013
+# skip Norton Utilities disc image data
+>3		string		!IHISK		
+# skip Linux style boot sector starting with assember instructions mov 0x7c0,ax;
+>>0		belong		!0xb8c0078e		
+# not Linux kernel 
+>>>514		string		!HdrS			
+# not BeOS
+>>>>422		string		!Be\ Boot\ Loader	
+# jump over BPB instruction implies DOS bootsector or AdvanceMAME mbr 
+>>>>>0		ubelong&0xFD000000	=0xE9000000	
+# AdvanceMAME mbr
+>>>>>>(1.b+2)	ubequad		0xfa31c08ed88ec08e	
+>>>>>>>446	use		partition-table
+# mbr, Norton Utilities disc image data, or 2nd,etc. sector of x86 bootloader
+>>>>>0		ubelong&0xFD000000	!0xE9000000	
+# skip FSInfosector
+>>>>>>0		string		!RRaA		
+# skip 3rd sector of MS x86 bootloader with assember instructions cli;MOVZX EAX,BYTE PTR [BP+10];MOV ECX,
+# http://thestarman.pcministry.com/asm/mbr/MSWIN41.htm
+>>>>>>>0	ubequad		!0xfa660fb64610668b	
+# skip 13rd sector of MS x86 bootloader
+>>>>>>>>0	ubequad		!0x660fb64610668b4e	
+# skip sector starting with DOS new line
+>>>>>>>>>0	string		!\r\n			
+# allowed active flag 0,80h-FFh
+>>>>>>>>>>446	ubyte		0			
+>>>>>>>>>>>446	use		partition-table
+>>>>>>>>>>446	ubyte		>0x7F			
+>>>>>>>>>>>446	use		partition-table
+# TODO: test for extended bootrecord (ebr) moved and merged with mbr partition table entries
 # mbr partition table entries end
 # http://www.acronis.de/
 #FAT label=ACRONIS\ SZ
 #OEM-ID=BOOTWIZ0
 >442	string	Non-system\ disk,\ 	
 >>459	string	press\ any\ key...\x7\0		\b, Acronis Startup Recovery Loader
-# DOS names like F11.SYS are 8 right space padded bytes+3 bytes
->>>477		ubyte&0xDF	>0		
->>>>477		string		x 		\b %-.3s
->>>>>480	ubyte&0xDF	>0		
->>>>>>480	string		x 		\b%-.5s
->>>>485		ubyte&0xDF	>0		
->>>>>485	string		x 		\b.%-.3s
+# updated by Joerg Jenderek at Nov 2012, Sep 2013
+# DOS names like F11.SYS or BOOTWIZ.SYS are 8 right space padded bytes+3 bytes
+# display 1 space
+>>>447	ubyte	x		\b 
+>>>477	use	DOS-filename
 #
 >185	string	FDBOOT\ Version\ 			
 >>204	string	\rNo\ Systemdisk.\ 			
@@ -279,24 +580,39 @@
 >>>>>291 string and\ press\ any\ key.\n\r		\b, FDBOOT harddisk Bootloader
 >>>>>>200 string	>\0                             \b, version %-3s
 >242	string	Bootsector\ from\ C.H.\ Hochst\204	
->>278	string	No\ Systemdisk.\ 			
->>>293	string	Booting\ from\ harddisk.\n\r		
->>>441	string	Cannot\ load\ from\ harddisk.\n\r	
->>>>469 string	Insert\ Systemdisk\ 			
->>>>>487 string and\ press\ any\ key.\n\r		\b, WinImage harddisk Bootloader
->>>>>>209 string	>\0                             \b, version %-4.4s
+# http://freecode.com/projects/dosfstools	dosfstools-n.m/src/mkdosfs.c
+# updated by Joerg Jenderek at Nov 2012. Use search directive with offset instead of string
+# skip name "C.H. Hochstaetter" partly because it is sometimes written without umlaut
+>242	search/127	Bootsector\ from\ C.H.\ Hochst			
+>>278	search/127	No\ Systemdisk.\ Booting\ from\ harddisk	
+# followed by variants with point,CR-NL or NL-CR
+>>>208	search/261	Cannot\ load\ from\ harddisk.			
+# followed by variants CR-NL or NL-CR
+>>>>236	search/235	Insert\ Systemdisk\ and\ press\ any\ key.	
+# followed by variants with point,CR-NL or NL-CR
+>>>>>180	search/96	Disk\ formatted\ with\ WinImage\ 	\b, WinImage harddisk Bootloader
+# followed by string like "6.50 (c) 1993-2004 Gilles Vollant"
+>>>>>>&0	string		x 					\b, version %-4.4s
 >(1.b+2)	ubyte		0xe			
 >>(1.b+3)	ubyte		0x1f			
 >>>(1.b+4)	ubyte		0xbe			
->>>>(1.b+5)	ubyte		0x77			
->>>>(1.b+6)	ubyte		0x7c			
->>>>>(1.b+7)	ubyte		0xac			
->>>>>>(1.b+8)	ubyte		0x22			
->>>>>>>(1.b+9)	ubyte		0xc0			
->>>>>>>>(1.b+10)	ubyte	0x74			
->>>>>>>>>(1.b+11)	ubyte	0xb			
->>>>>>>>>>(1.b+12)	ubyte	0x56			
->>>>>>>>>>(1.b+13)	ubyte	0xb4			\b, mkdosfs boot message display
+# message offset found at (1.b+5) is 0x77 for FAT32 or 0x5b for others
+>>>>(1.b+5)	ubyte&0xd3	0x53			
+>>>>>(1.b+6)	ubyte		0x7c			
+# assembler instructions: lodsb;and al,al;jz 0xb;push si;mov ah,
+>>>>>>(1.b+7)	ubyte		0xac			
+>>>>>>>(1.b+8)	ubyte		0x22			
+>>>>>>>>(1.b+9)	ubyte		0xc0			
+>>>>>>>>>(1.b+10)	ubyte	0x74			
+>>>>>>>>>>(1.b+11)	ubyte	0x0b			
+>>>>>>>>>>>(1.b+12)	ubyte	0x56			
+>>>>>>>>>>>>(1.b+13)	ubyte	0xb4			\b, mkdosfs boot message display
+# FAT1X version
+>>>>>>>>>>>>>(1.b+5)	ubyte	0x5b			
+>>>>>>>>>>>>>>0x5b	string	>\0			"%-s"
+# FAT32 version
+>>>>>>>>>>>>>(1.b+5)	ubyte	0x77			
+>>>>>>>>>>>>>>0x77	string	>\0			"%-s"
 >214	string	Please\ try\ to\ install\ FreeDOS\ 	\b, DOS Emulator boot message display
 #>>244	string	from\ dosemu-freedos-*-bin.tgz\r	
 #>>>170	string	Sorry,\ could\ not\ load\ an\ 		
@@ -694,74 +1010,26 @@
 # It just looks for a program file name at the root directory
 # and loads corresponding file with following execution.
 # DOS names like STARTUP.BIN,STARTUPC.COM,STARTUPE.EXE are 8 right space padded bytes+3 bytes
->>>>499			ubyte&0xDF	>0		\b, COM/EXE Bootloader
->>>>>499		string		x 		\b %-.1s
->>>>>>500		ubyte&0xDF	>0		
->>>>>>>500		string		x 		\b%-.1s
->>>>>>>>501		ubyte&0xDF	>0		
->>>>>>>>>501		string		x 		\b%-.1s
->>>>>>>>>>502		ubyte&0xDF	>0		
->>>>>>>>>>>502		string		x 		\b%-.1s
->>>>>>>>>>>>503		ubyte&0xDF	>0		
->>>>>>>>>>>>>503	string		x 		\b%-.1s
->>>>>>>>>>>>>>504	ubyte&0xDF	>0		
->>>>>>>>>>>>>>>504	string		x 		\b%-.1s
->>>>>>>>>>>>>>>>505	ubyte&0xDF	>0		
->>>>>>>>>>>>>>>>>505	string		x 		\b%-.1s
->>>>>>>>>>>>>>>>>>506	ubyte&0xDF	>0		
->>>>>>>>>>>>>>>>>>>506	string		x 		\b%-.1s
-#name extension
->>>>>507		ubyte&0xDF	>0		\b.
->>>>>>507		string		x 		\b%-.1s
->>>>>>>508		ubyte&0xDF	>0		
->>>>>>>>508		string		x 		\b%-.1s
->>>>>>>>>509		ubyte&0xDF	>0		
->>>>>>>>>>509		string		x 		\b%-.1s
+>>>>499			ubyte&0xDF	>0		\b, COM/EXE Bootloader 
+>>>>>499		use		DOS-filename
 #If the boot sector fails to read any other sector,
 #it prints a very short message ("RE") to the screen and hangs the computer.
 #If the boot sector fails to find needed program in the root directory,
 #it also hangs with another message ("NF").
 >>>>>492		string		RENF		\b, FAT (12 bit)
 >>>>>495		string		RENF		\b, FAT (16 bit)
-# http://alexfru.chat.ru/epm.html#bootprog
->494	ubyte	>0x4D					
->>495	string	>E					
->>>495	string	<S					
-#OEM-ID is not reliable
->>>>3	string	BootProg				
-# It just looks for a program file name at the root directory
-# and loads corresponding file with following execution.
-# DOS names like STARTUP.BIN,STARTUPC.COM,STARTUPE.EXE are 8 right space padded bytes+3 bytes
->>>>499			ubyte&0xDF	>0		\b, COM/EXE Bootloader
->>>>>499		string		x 		\b %-.1s
->>>>>>500		ubyte&0xDF	>0		
->>>>>>>500		string		x 		\b%-.1s
->>>>>>>>501		ubyte&0xDF	>0		
->>>>>>>>>501		string		x 		\b%-.1s
->>>>>>>>>>502		ubyte&0xDF	>0		
->>>>>>>>>>>502		string		x 		\b%-.1s
->>>>>>>>>>>>503		ubyte&0xDF	>0		
->>>>>>>>>>>>>503	string		x 		\b%-.1s
->>>>>>>>>>>>>>504	ubyte&0xDF	>0		
->>>>>>>>>>>>>>>504	string		x 		\b%-.1s
->>>>>>>>>>>>>>>>505	ubyte&0xDF	>0		
->>>>>>>>>>>>>>>>>505	string		x 		\b%-.1s
->>>>>>>>>>>>>>>>>>506	ubyte&0xDF	>0		
->>>>>>>>>>>>>>>>>>>506	string		x 		\b%-.1s
-#name extension
->>>>>507		ubyte&0xDF	>0		\b.
->>>>>>507		string		x 		\b%-.1s
->>>>>>>508		ubyte&0xDF	>0		
->>>>>>>>508		string		x 		\b%-.1s
->>>>>>>>>509		ubyte&0xDF	>0		
->>>>>>>>>>509		string		x 		\b%-.1s
 #If the boot sector fails to read any other sector,
 #it prints a very short message ("RE") to the screen and hangs the computer.
-#If the boot sector fails to find needed program in the root directory,
-#it also hangs with another message ("NF").
->>>>>492		string		RENF		\b, FAT (12 bit)
->>>>>495		string		RENF		\b, FAT (16 bit)
 # x86 bootloader end
+
+# added by Joerg Jenderek at Feb 2013 according to http://thestarman.pcministry.com/asm/mbr/MSWIN41.htm#FSINFO
+# and http://en.wikipedia.org/wiki/File_Allocation_Table#FS_Information_Sector
+>0		string		RRaA		
+>>0x1E4		string		rrAa		\b, FSInfosector
+#>>0x1FC	uleshort	=0		SHOULD BE ZERO
+>>>0x1E8	ulelong		<0xffffffff	\b, %u free clusters
+>>>0x1EC	ulelong		<0xffffffff	\b, last allocated cluster %u
+
 # updated by Joerg Jenderek at Sep 2007
 >3	ubyte	0			
 #no active flag
@@ -776,149 +1044,100 @@
 >>>>>>>466	ubyte	0x05			\b, extended partition table
 >>>>>>>466	ubyte	0x0F			\b, extended partition table (LBA)
 >>>>>>>466	ubyte	0x0			\b, extended partition table (last)	
-# JuMP short     bootcodeoffset NOP assembler instructions will usually be EB xx 90
-# http://mirror.href.com/thestarman/asm/2bytejumps.htmm#FWD
-# older drives may use Near JuMP instruction E9 xx xx
->0		lelong&0x009000EB	0x009000EB 
->0		lelong&0x000000E9	0x000000E9 
-# minimal short forward jump found 03cx??
-# maximal short forward jump is 07fx
->1		ubyte			<0xff	\b, code offset 0x%x
-# mtools-3.9.8/msdos.h
-# usual values are marked with comments to get only informations of strange FAT systems
-# valid sectorsize must be a power of 2 from 32 to 32768
->>11		uleshort&0x000f	x		
->>>11		uleshort	<32769		
->>>>11		uleshort	>31		
->>>>>21		ubyte&0xf0	0xF0		
->>>>>>3		string		>\0		\b, OEM-ID "%8.8s"
-#http://mirror.href.com/thestarman/asm/debug/debug2.htm#IHC
->>>>>>>8	string		IHC		\b cached by Windows 9M
->>>>>>11	uleshort	>512		\b, Bytes/sector %u
-#>>>>>>11	uleshort	=512		\b, Bytes/sector %u=512 (usual)
->>>>>>11	uleshort	<512		\b, Bytes/sector %u
->>>>>>13	ubyte		>1		\b, sectors/cluster %u
-#>>>>>>13	ubyte		=1		\b, sectors/cluster %u (usual on Floppies)
->>>>>>14	uleshort	>32		\b, reserved sectors %u
-#>>>>>>14	uleshort	=32		\b, reserved sectors %u (usual Fat32)
-#>>>>>>14	uleshort	>1		\b, reserved sectors %u
-#>>>>>>14	uleshort	=1		\b, reserved sectors %u (usual FAT12,FAT16)
->>>>>>14	uleshort	<1		\b, reserved sectors %u
->>>>>>16	ubyte		>2		\b, FATs %u
-#>>>>>>16	ubyte		=2		\b, FATs %u (usual)
->>>>>>16	ubyte		=1		\b, FAT  %u
->>>>>>16	ubyte		>0
->>>>>>17	uleshort	>0		\b, root entries %u
-#>>>>>>17	uleshort	=0		\b, root entries %u=0 (usual Fat32)
->>>>>>19	uleshort	>0		\b, sectors %u (volumes <=32 MB) 
-#>>>>>>19	uleshort	=0		\b, sectors %u=0 (usual Fat32)
->>>>>>21	ubyte		>0xF0		\b, Media descriptor 0x%x
-#>>>>>>21	ubyte		=0xF0		\b, Media descriptor 0x%x (usual floppy)
->>>>>>21	ubyte		<0xF0		\b, Media descriptor 0x%x
->>>>>>22	uleshort	>0		\b, sectors/FAT %u
-#>>>>>>22	uleshort	=0		\b, sectors/FAT %u=0 (usual Fat32)
->>>>>>26	ubyte		>2		\b, heads %u
-#>>>>>>26	ubyte		=2		\b, heads %u (usual floppy)
->>>>>>26	ubyte		=1		\b, heads %u
-#skip for Digital Research DOS (version 3.41) 1440 kB Bootdisk
->>>>>>38	ubyte		!0x70		
->>>>>>>28	ulelong		>0		\b, hidden sectors %u
-#>>>>>>>28	ulelong		=0		\b, hidden sectors %u (usual floppy)
->>>>>>>32	ulelong		>0		\b, sectors %u (volumes > 32 MB) 
-#>>>>>>>32	ulelong		=0		\b, sectors %u (volumes > 32 MB)
-# FAT<32 specific 
->>>>>>82	string		!FAT32
-#>>>>>>>36	ubyte		0x80		\b, physical drive 0x%x=0x80 (usual harddisk)
-#>>>>>>>36	ubyte		0		\b, physical drive 0x%x=0 (usual floppy)
->>>>>>>36	ubyte		!0x80		
->>>>>>>>36	ubyte		!0		\b, physical drive 0x%x
->>>>>>>37	ubyte		>0		\b, reserved 0x%x
-#>>>>>>>37	ubyte		=0		\b, reserved 0x%x
->>>>>>>38	ubyte		>0x29		\b, dos < 4.0 BootSector (0x%x)
->>>>>>>38	ubyte		<0x29		\b, dos < 4.0 BootSector (0x%x)
->>>>>>>38	ubyte		=0x29
->>>>>>>>39	ulelong		x		\b, serial number 0x%x
->>>>>>>>43	string		<NO\ NAME	\b, label: "%11.11s"
->>>>>>>>43	string		>NO\ NAME	\b, label: "%11.11s"
->>>>>>>>43	string		=NO\ NAME	\b, unlabeled
->>>>>>>54	string		FAT		\b, FAT
->>>>>>>>54	string		FAT12		\b (12 bit)
->>>>>>>>54	string		FAT16		\b (16 bit)
-# FAT32 specific
->>>>>>82	string		FAT32		\b, FAT (32 bit)
->>>>>>>36	ulelong		x		\b, sectors/FAT %u
->>>>>>>40	uleshort	>0		\b, extension flags %u
-#>>>>>>>40	uleshort	=0		\b, extension flags %u
->>>>>>>42	uleshort	>0		\b, fsVersion %u
-#>>>>>>>42	uleshort	=0		\b, fsVersion %u (usual)
->>>>>>>44	ulelong		>2		\b, rootdir cluster %u
-#>>>>>>>44	ulelong		=2		\b, rootdir cluster %u
-#>>>>>>>44	ulelong		=1		\b, rootdir cluster %u
->>>>>>>48	uleshort	>1		\b, infoSector %u
-#>>>>>>>48	uleshort	=1		\b, infoSector %u (usual)
->>>>>>>48	uleshort	<1		\b, infoSector %u
->>>>>>>50	uleshort	>6		\b, Backup boot sector %u
-#>>>>>>>50	uleshort	=6		\b, Backup boot sector %u (usual) 
->>>>>>>50	uleshort	<6		\b, Backup boot sector %u
->>>>>>>54	ulelong		>0		\b, reserved1 0x%x
->>>>>>>58	ulelong		>0		\b, reserved2 0x%x
->>>>>>>62	ulelong		>0		\b, reserved3 0x%x
-# same structure as FAT1X 
->>>>>>>64	ubyte		>0x80		\b, physical drive 0x%x
-#>>>>>>>64	ubyte		=0x80		\b, physical drive 0x%x=80 (usual harddisk)
->>>>>>>64	ubyte&0x7F	>0		\b, physical drive 0x%x
-#>>>>>>>64	ubyte		=0		\b, physical drive 0x%x=0 (usual floppy)
->>>>>>>65	ubyte		>0		\b, reserved 0x%x
->>>>>>>66	ubyte		>0x29		\b, dos < 4.0 BootSector (0x%x)
->>>>>>>66	ubyte		<0x29		\b, dos < 4.0 BootSector (0x%x)
->>>>>>>66	ubyte		=0x29
->>>>>>>>67	ulelong		x		\b, serial number 0x%x
->>>>>>>>71	string		<NO\ NAME	\b, label: "%11.11s"
->>>>>>>71	string		>NO\ NAME	\b, label: "%11.11s"
->>>>>>>71	string		=NO\ NAME	\b, unlabeled
-### FATs end
+
+# DOS x86 sector separated and moved from "DOS/MBR boot sector" by Joerg Jenderek at May 2011
+
 >0x200	lelong	0x82564557		\b, BSD disklabel
+
+# by Joerg Jenderek at Apr 2013
+#	Print the DOS filenames from directory entry form with 8 right space padded bytes + 3 bytes for extension
+#	like IO.SYS. MSDOS.SYS , KERNEL.SYS , DRBIO.SYS
+0	name			DOS-filename
+# space=0x20 (00100000b) means empty 
+>0			ubyte&0xDF	>0		
+>>0			ubyte		x 		\b%c
+>>>1			ubyte&0xDF	>0		
+>>>>1			ubyte		x 		\b%c
+>>>>>2			ubyte&0xDF	>0		
+>>>>>>2			ubyte		x 		\b%c
+>>>>>>>3		ubyte&0xDF	>0		
+>>>>>>>>3		ubyte		x 		\b%c
+>>>>>>>>>4		ubyte&0xDF	>0		
+>>>>>>>>>>4		ubyte		x 		\b%c
+>>>>>>>>>>>5		ubyte&0xDF	>0		
+>>>>>>>>>>>>5		ubyte		x 		\b%c
+>>>>>>>>>>>>>6		ubyte&0xDF	>0		
+>>>>>>>>>>>>>>6		ubyte		x 		\b%c
+>>>>>>>>>>>>>>>7	ubyte&0xDF	>0		
+>>>>>>>>>>>>>>>>7	ubyte		x 		\b%c
+# DOS filename extension
+>>8			ubyte&0xDF	>0		\b.
+>>>8			ubyte		x 		\b%c
+>>>>9			ubyte&0xDF	>0		
+>>>>>9			ubyte		x 		\b%c
+>>>>>>10		ubyte&0xDF	>0		
+>>>>>>>10		ubyte		x 		\b%c
+#	Print 2 following DOS filenames from directory entry form
+#	like IO.SYS+MSDOS.SYS or ibmbio.com+ibmdos.com
+0	name			2xDOS-filename
+# display 1 space
+>0			ubyte		x		\b 
+>0			use		DOS-filename
+>11			ubyte		x		\b+
+>11			use		DOS-filename
+
+# http://en.wikipedia.org/wiki/Master_boot_record#PTE
+# display standard partition table
+0	name				partition-table
+#>0		ubyte		x	PARTITION-TABLE
+# test and display 1st til 4th partition table entry
+>0		use			partition-entry-test
+>16		use			partition-entry-test
+>32		use			partition-entry-test
+>48		use			partition-entry-test
+#		test for entry of partition table
+0	name				partition-entry-test
+# partition type ID > 0
+>4		ubyte		>0
+# active flag 0
+>>0		ubyte		0	
+>>>0		use		partition-entry
+# active flag 0x80, 0x81, ... 
+>>0		ubyte		>0x7F	
+>>>0		use		partition-entry
+#		Print entry of partition table
+0	name				partition-entry
+# partition type ID > 0
+>4		ubyte		>0	\b; partition
+>>64		leshort		0xAA55	1
+>>48		leshort		0xAA55	2
+>>32		leshort		0xAA55	3
+>>16		leshort		0xAA55	4
+>>4		ubyte		x	: ID=0x%x
+>>0		ubyte&0x80	0x80	\b, active
+>>0		ubyte		>0x80	0x%x
+>>1		ubyte		x	\b, start-CHS (
+>>1		use		partition-chs
+>>5		ubyte		x	\b), end-CHS (
+>>5		use		partition-chs
+>>8		ulelong		x	\b), startsector %u
+>>12		ulelong		x	\b, %u sectors
+#		Print cylinder,head,sector (CHS) of partition entry
+0	name				partition-chs
+# cylinder
+>1		ubyte		x	\b0x
+>1		ubyte&0xC0	0x40	\b1
+>1		ubyte&0xC0	0x80	\b2
+>1		ubyte&0xC0	0xC0	\b3
+>2		ubyte		x	\b%x
+# head
+>0		ubyte		x	\b,%u
+# sector
+>1		ubyte&0x3F	x	\b,%u
+
 # FATX 
 0		string		FATX		FATX filesystem data
 
-
-# Minix filesystems - Juan Cespedes <cespedes@debian.org>
-0x410	leshort		0x137f
-!:strength / 2
->0x402	beshort		< 100		Minix filesystem, V1, %d zones
->0x1e	string		minix		\b, bootable
-0x410	beshort		0x137f
-!:strength / 2
->0x402	beshort		< 100		Minix filesystem, V1 (big endian), %d zones
->0x1e	string		minix		\b, bootable
-0x410	leshort		0x138f
-!:strength / 2
->0x402	beshort		< 100		Minix filesystem, V1, 30 char names, %d zones
->0x1e	string		minix		\b, bootable
-0x410	beshort		0x138f
-!:strength / 2
->0x402	beshort		< 100		Minix filesystem, V1, 30 char names (big endian), %d zones
->0x1e	string		minix		\b, bootable
-0x410	leshort		0x2468
->0x402	beshort		< 100		Minix filesystem, V2, %d zones
->0x1e	string		minix		\b, bootable
-0x410	beshort		0x2468
->0x402	beshort		< 100		Minix filesystem, V2 (big endian), %d zones
->0x1e	string		minix		\b, bootable
-
-0x410	leshort		0x2478
->0x402	beshort		< 100		Minix filesystem, V2, 30 char names, %d zones
->0x1e	string		minix		\b, bootable
-0x410	leshort		0x2478
->0x402	beshort		< 100		Minix filesystem, V2, 30 char names, %d zones
->0x1e	string		minix		\b, bootable
-0x410	beshort		0x2478
->0x402	beshort		!0		Minix filesystem, V2, 30 char names (big endian), %d zones
->0x1e	string		minix		\b, bootable
-0x410	leshort		0x4d5a
->0x402	beshort		!0		Minix filesystem, V3, %d zones
->0x1e	string		minix		\b, bootable
-
 # romfs filesystems - Juan Cespedes <cespedes@debian.org>
 0	string		-rom1fs-	romfs filesystem, version 1
 >8	belong	x			%d bytes,
@@ -933,12 +1152,143 @@
 
 0x18b	string	OS/2	OS/2 Boot Manager
 
-# updated by Joerg Jenderek at Oct 2008!!
+# updated by Joerg Jenderek at Oct 2008 and Sep 2012
 # http://syslinux.zytor.com/iso.php
-0	ulelong	0x7c40eafa		isolinux Loader
+# tested with versions 1.47,1.48,1.49,1.50,1.62,1.76,2.00,2.10;3.00,3.11,3.31,;3.70,3.71,3.73,3.75,3.80,3.82,3.84,3.86,4.01,4.03 and 4.05
+# assembler instructions: cli;jmp 0:7Cyy (yy=0x40,0x5e,0x6c,0x6e,0x77);nop;nop
+0	ulequad&0x909000007cc0eafa	0x909000007c40eafa	
+>631	search/689	ISOLINUX\ 	isolinux Loader
+>>&0	string		x		(version %-4.4s)
 # http://syslinux.zytor.com/pxe.php
-0	ulelong	0x007c05ea		pxelinux Loader
-0	ulelong	0x60669c66		pxelinux Loader
+# assembler instructions: jmp 7C05
+0	ulelong	0x007c05ea		pxelinux loader (version 2.13 or older)
+# assembler instructions: pushfd;pushad
+0	ulelong	0x60669c66		pxelinux loader
+# assembler instructions: jmp 05
+0	ulelong	0xc00005ea		pxelinux loader (version 3.70 or newer)
+# http://syslinux.zytor.com/wiki/index.php/SYSLINUX
+0	string	LDLINUX\ SYS\ 		SYSLINUX loader
+>12	string	x			(older version %-4.4s)
+0	string	\r\nSYSLINUX\ 		SYSLINUX loader
+>11	string	x			(version %-4.4s)
+# syslinux updated and separated from "DOS/MBR boot sector" by Joerg Jenderek at Sep 2012
+# assembler instructions: jmp yy (yy=0x3c,0x58);nop;"SYSLINUX"
+0	ulelong&0x80909bEB	0x009018EB	
+# OEM-ID not always "SYSLINUX"
+>434	search/47	Boot\ failed		
+# followed by \r\n\0 or :\ 
+>>482	search/132	\0LDLINUX\ SYS		Syslinux bootloader (version 2.13 or older)
+>>1	ubyte		0x58			Syslinux bootloader (version 3.0-3.9)
+>459	search/30	Boot\ error\r\n\0	
+>>1	ubyte		0x58			Syslinux bootloader (version 3.10 or newer)
+# SYSLINUX MBR updated and separated from "DOS/MBR boot sector" by Joerg Jenderek at Sep 2012
+# assembler instructions: mov di,0600h;mov cx,0100h
+16	search/4	\xbf\x00\x06\xb9\x00\x01		
+# to display SYSLINUX MBR (36) before old DOS/MBR boot sector one with partition table (strength=50+21)
+!:strength +36
+>94	search/249	Missing\ operating\ system		
+# followed by \r for versions older 3.35 , .\r for versions newer 3.52 and point for other
+# skip Ranish MBR
+>>408	search/4	HD1/\0	 				
+>>408	default		x					
+>>>250	search/118	\0Operating\ system\ load		SYSLINUX MBR
+# followed by "ing " or space
+>>>>292	search/98	error   				
+>>>>>&0	string		\r		    			(version 3.35 or older)
+>>>>>&0	string		.\r					(version 3.52 or newer)
+>>>>>&0	default		x					(version 3.36-3.51 )
+>368	search/106	\0Disk\ error\ on\ boot\r\n		SYSLINUX GPT-MBR
+>>156	search/10	\0Boot\ partition\ not\ found\r\n	
+>>>270	search/10	\0OS\ not\ bootable\r\n			(version 3.86 or older)
+>>174	search/10	\0Missing\ OS\r\n			
+>>>189	search/10	\0Multiple\ active\ partitions\r\n	(version 4.00 or newer)
+# SYSLINUX END
+
+# NetBSD mbr variants (master-boot-code version 1.22) added by Joerg Jenderek at Nov 2012
+# assembler instructions: xor ax,ax;mov	ax,ss;mov sp,0x7c00;mov	ax,
+0	ubequad		0x31c08ed0bc007c8e			
+# mbr_bootsel magic before partition table not reliable with small ipl fragments
+#>444	uleshort	0xb5e1					
+>0004	uleshort	x					
+# ERRorTeXT
+>>181	search/166		Error\ \0\r\n				NetBSD mbr
+# NT Drive Serial Number http://thestarman.pcministry.com/asm/mbr/Win2kmbr.htm#DS
+>>>0x1B8	ubelong		>0					\b,Serial 0x%-.8x
+# BOOTSEL definitions contains assembler instructions: int 0x13;pop dx;push dx;push dx
+>>>0xbb		search/71	\xcd\x13\x5a\x52\x52			\b,bootselector
+# BOOT_EXTENDED definitions contains assembler instructions: 
+# xchg ecx,edx;addl ecx,edx;movw lba_info,si;movb 0x42,ah;pop dx;push dx;int 0x13
+>>>0x96	search/1	\x66\x87\xca\x66\x01\xca\x66\x89\x16\x3a\x07\xbe\x32\x07\xb4\x42\x5a\x52\xcd\x13	\b,boot extended
+# COM_PORT_VAL definitions contains assembler instructions: outb al,dx;add 5,dl;inb %dx;test 0x40,al
+>>>0x130	search/55	\xee\x80\xc2\x05\xec\xa8\x40		\b,serial IO
+# not TERSE_ERROR
+>>>196		search/106	No\ active\ partition\0			
+>>>>&0		string		Disk\ read\ error\0			
+>>>>>&0		string		No\ operating\ system\0			\b,verbose
+# not NO_CHS definitions contains assembler instructions: pop dx;push dx;movb $8,ah;int0x13
+>>>0x7d		search/7	\x5a\x52\xb4\x08\xcd\x13		\b,CHS
+# not NO_LBA_CHECK definitions contains assembler instructions: movw 0x55aa,bx;movb 0x41,ah;pop	dx;push	dx;int 0x13
+>>>0xa4		search/84	\xbb\xaa\x55\xb4\x41\x5a\x52\xcd\x13	\b,LBA-check
+# assembler instructions: movw nametab,bx
+>>>0x26	    search/21	\xBB\x94\x07					
+# not NO_BANNER definitions contains assembler instructions: mov banner,si;call message_crlf
+>>>>&-9	ubequad&0xBE00f0E800febb94	0xBE0000E80000bb94		
+>>>>>181	search/166		Error\ \0			
+# "a: disk" , "Fn: diskn" or "NetBSD MBR boot"
+>>>>>>&3	string			x				\b,"%s"
+# Andrea Mazzoleni AdvanceCD mbr loader of http://advancemame.sourceforge.net/boot-readme.html
+# added by Joerg Jenderek at Nov 2012 for versions 1.3 - 1.4
+# assembler instructions: jmp short 0x58;nop;ASCII
+0	ubequad&0xeb58908000000000	0xeb58900000000000	
+# assembler instructions: cli;xor ax,ax;mov ds,ax;mov es,ax;mov ss,
+>(1.b+2)	ubequad			0xfa31c08ed88ec08e	
+# Error messages at end of code
+>>376		string	No\ operating\ system\r\n\0		
+>>>398		string	Disk\ error\r\n\0FDD\0HDD\0		
+>>>>419		string	\ EBIOS\r\n\0				AdvanceMAME mbr
+
+# Neil Turton mbr loader variant of http://www.chiark.greenend.org.uk/~neilt/mbr/ 
+# added by Joerg Jenderek at Mar 2011 for versions 1.0.0 - 1.1.11
+# for 1st version assembler instructions:	cld;xor ax,ax;mov DS,ax;MOV ES,AX;mov SI,
+# or  	  	  	    			cld;xor ax,ax;mov SS,ax;XOR SP,SP;mov DS,
+0	ulequad&0xcE1b40D48EC031FC	0x8E0000D08EC031FC	
+# pointer to the data starting with Neil Turton signature string
+>(0x1BC.s)		string		NDTmbr			
+>>&-14			string		1234F\0			Turton mbr (
+# parameters also viewed by install-mbr --list
+>>>(0x1BC.s+7)		ubyte		x			\b%u<=
+>>>(0x1BC.s+9)		ubyte		x			\bVersion<=%u
+#>>>(0x1BC.s+8)		ubyte		x			asm_flag_%x
+>>>(0x1BC.s+8)		ubyte&1		1			\b,Y2K-Fix
+# variant used by testdisk of http://www.cgsecurity.org/wiki/Menu_MBRCode
+>>>(0x1BC.s+8)		ubyte&2		2			\b,TestDisk
+#0x1~1,..,0x8~4,0x10~F,0x80~A enabled
+#>>>(0x1BC.s+10)		ubyte		x			\b,flags 0x%x
+#0x0~1,0x1~2,...,0x3~4,0x4~F,0x7~D default boot
+#>>>(0x1BC.s+11)		ubyte		x			\b,cfg_def 0x%x
+# for older versions
+>>>(0x1BC.s+9)		ubyte		<2			
+#>>>>(0x1BC.s+12)	ubyte		18			\b,%hhu/18 seconds
+>>>>(0x1BC.s+12)	ubyte		!18			\b,%u/18 seconds
+# floppy A: or B:
+>>>>(0x1BC.s+13)	ubyte		<2			\b,floppy 0x%x
+>>>>(0x1BC.s+13)	ubyte		>1			
+# 1st hard disc
+#>>>>>(0x1BC.s+13)	ubyte		0x80			\b,drive 0x%x
+# not 1st hard disc
+>>>>>(0x1BC.s+13)	ubyte		!0x80			\b,drive 0x%x
+# for version >= 2 maximal timeout can be 65534
+>>>(0x1BC.s+9)		ubyte		>1			
+#>>>>(0x1BC.s+12)	uleshort	18			\b,%u/18 seconds
+>>>>(0x1BC.s+12)	uleshort	!18			\b,%u/18 seconds
+# floppy A: or B:
+>>>>(0x1BC.s+14)	ubyte		<2			\b,floppy 0x%x
+>>>>(0x1BC.s+14)	ubyte		>1			
+# 1st hard disc
+#>>>>>(0x1BC.s+14)	ubyte		0x80			\b,drive 0x%x
+# not 1st hard disc
+>>>>>(0x1BC.s+14)	ubyte		!0x80			\b,drive 0x%x
+>>>0	ubyte		x					\b)
 
 # added by Joerg Jenderek
 # In the second sector (+0x200) are variables according to grub-0.97/stage2/asm.S or
@@ -961,7 +1311,7 @@
 >>>>0x207	ubyte		x		\b.%u
 # module_size for 1.94
 >>>>0x208	ulelong		<0xffffff	\b, installed partition %u
-#>>>>0x208	ulelong		=0xffffff	\b, %u (default)
+#>>>>0x208	ulelong		=0xffffff	\b, %lu (default)
 >>>>0x208	ulelong		>0xffffff	\b, installed partition %u
 # GRUB 0.5.95 unofficial
 >>>>0x20C	ulelong&0x2E300000 0x2E300000	
@@ -995,6 +1345,178 @@
 >>>>>0x217 	ulong		!0xffffffff	
 >>>>>>0x217 	string		>\0		\b, configuration file %-s
 
+# DOS x86 sector updated and separated from "DOS/MBR boot sector" by Joerg Jenderek at May 2011
+# JuMP short     bootcodeoffset NOP assembler instructions will usually be EB xx 90
+# over BIOS parameter block (BPB)
+# http://thestarman.pcministry.com/asm/2bytejumps.htm#FWD
+# older drives may use Near JuMP instruction E9 xx xx
+# minimal short forward jump found 0x29 for bootloaders or 0x0
+# maximal short forward jump is 0x7f
+# OEM-ID is empty or contain readable bytes
+0		ulelong&0x804000E9	0x000000E9	
+# mtools-3.9.8/msdos.h
+# usual values are marked with comments to get only informations of strange FAT systems
+# valid sectorsize must be a power of 2 from 32 to 32768
+>11		uleshort&0xf001f	0	
+>>11		uleshort	<32769		
+>>>11		uleshort	>31		
+>>>>21		ubyte&0xf0	0xF0		
+>>>>>0		ubyte		0xEB		
+>>>>>>1		ubyte		x		\b, code offset 0x%x+2
+>>>>>0		ubyte		0xE9		
+>>>>>>1		uleshort	x		\b, code offset 0x%x+2
+>>>>>3		string		>\0		\b, OEM-ID "%-.8s"
+#http://mirror.href.com/thestarman/asm/debug/debug2.htm#IHC
+>>>>>>8		string		IHC		\b cached by Windows 9M
+>>>>>11		uleshort	>512		\b, Bytes/sector %u
+#>>>>>11	uleshort	=512		\b, Bytes/sector %u=512 (usual)
+>>>>>11		uleshort	<512		\b, Bytes/sector %u
+>>>>>13		ubyte		>1		\b, sectors/cluster %u
+#>>>>>13	ubyte		=1		\b, sectors/cluster %u (usual on Floppies)
+>>>>>82		string		FAT32		
+>>>>>>14	uleshort	!32		\b, reserved sectors %u
+#>>>>>>14	uleshort	=32		\b, reserved sectors %u (usual Fat32)
+>>>>>82		string		!FAT32		
+>>>>>>14	uleshort	>1		\b, reserved sectors %u
+#>>>>>>14	uleshort	=1		\b, reserved sectors %u (usual FAT12,FAT16)
+#>>>>>>14	uleshort	0		\b, reserved sectors %u (usual NTFS)
+>>>>>16		ubyte		>2		\b, FATs %u
+#>>>>>16	ubyte		=2		\b, FATs %u (usual)
+>>>>>16		ubyte		=1		\b, FAT  %u
+>>>>>16		ubyte		>0
+>>>>>17		uleshort	>0		\b, root entries %u
+#>>>>>17	uleshort	=0		\b, root entries %hu=0 (usual Fat32)
+>>>>>19		uleshort	>0		\b, sectors %u (volumes <=32 MB) 
+#>>>>>19	uleshort	=0		\b, sectors %hu=0 (usual Fat32)
+>>>>>21		ubyte		>0xF0		\b, Media descriptor 0x%x
+#>>>>>21	ubyte		=0xF0		\b, Media descriptor 0x%x (usual floppy)
+>>>>>21		ubyte		<0xF0		\b, Media descriptor 0x%x
+>>>>>22		uleshort	>0		\b, sectors/FAT %u
+#>>>>>22	uleshort	=0		\b, sectors/FAT %hu=0 (usual Fat32)
+>>>>>24		uleshort	x		\b, sectors/track %u
+>>>>>26		ubyte		>2		\b, heads %u
+#>>>>>26	ubyte		=2		\b, heads %u (usual floppy)
+>>>>>26		ubyte		=1		\b, heads %u
+# valid only for sector sizes with more then 32 Bytes
+>>>>>11		uleshort	>32		
+# skip for Digital Research DOS (version 3.41) 1440 kB Bootdisk
+>>>>>>38	ubyte		!0x70		
+>>>>>>>28	ulelong		>0		\b, hidden sectors %u
+#>>>>>>>28	ulelong		=0		\b, hidden sectors %u (usual floppy)
+>>>>>>>32	ulelong		>0		\b, sectors %u (volumes > 32 MB) 
+#>>>>>>>32	ulelong		=0		\b, sectors %u (volumes > 32 MB)
+# FAT<32 bit specific 
+>>>>>>>82	string		!FAT32
+#>>>>>>>>36	ubyte		0x80		\b, physical drive 0x%x=0x80 (usual harddisk)
+#>>>>>>>>36	ubyte		0		\b, physical drive 0x%x=0 (usual floppy)
+>>>>>>>>36	ubyte		!0x80		
+>>>>>>>>>36	ubyte		!0		\b, physical drive 0x%x
+>>>>>>>>37	ubyte		>0		\b, reserved 0x%x
+#>>>>>>>>37	ubyte		=0		\b, reserved 0x%x
+# value is 0x80 for NTFS
+>>>>>>>>38	ubyte		!0x29		\b, dos < 4.0 BootSector (0x%x)
+>>>>>>>>38	ubyte		=0x29
+>>>>>>>>>39	ulelong		x		\b, serial number 0x%x
+>>>>>>>>>43	string		<NO\ NAME	\b, label: "%11.11s"
+>>>>>>>>>43	string		>NO\ NAME	\b, label: "%11.11s"
+>>>>>>>>>43	string		=NO\ NAME	\b, unlabeled
+# there exist some old floppies without word FAT at offset 54
+# a word like "FATnm   " is only a hint for a FAT size on nm-bits
+# Normally the number of clusters is calculated by the values of BPP.
+# if it is small enough FAT is 12 bit, if it is too big enough FAT is 32 bit,
+# otherwise FAT is 16 bit.
+# http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/determining-fat-widths.html
+>>>>>>54	string		FAT		\b, FAT
+>>>>>>>54	string		FAT12		\b (12 bit)
+>>>>>>>54	string		FAT16		\b (16 bit)
+# FAT32 bit specific
+>>>>>82		string		FAT32		\b, FAT (32 bit)
+>>>>>>36	ulelong		x		\b, sectors/FAT %u
+# http://technet.microsoft.com/en-us/library/cc977221.aspx
+>>>>>>40	uleshort	>0		\b, extension flags 0x%x
+#>>>>>>40	uleshort	=0		\b, extension flags %hu
+>>>>>>42	uleshort	>0		\b, fsVersion %u
+#>>>>>>42	uleshort	=0		\b, fsVersion %u (usual)
+>>>>>>44	ulelong		>2		\b, rootdir cluster %u
+#>>>>>>44	ulelong		=2		\b, rootdir cluster %u
+#>>>>>>44	ulelong		=1		\b, rootdir cluster %u
+>>>>>>48	uleshort	>1		\b, infoSector %u
+#>>>>>>48	uleshort	=1		\b, infoSector %u (usual)
+>>>>>>48	uleshort	<1		\b, infoSector %u
+>>>>>>50	uleshort	>6		\b, Backup boot sector %u
+#>>>>>>50	uleshort	=6		\b, Backup boot sector %u (usual) 
+>>>>>>50	uleshort	<6		\b, Backup boot sector %u
+# corrected by Joerg Jenderek at Feb 2011 according to http://thestarman.pcministry.com/asm/mbr/MSWIN41.htm#FSINFO
+>>>>>>52	ulelong		>0		\b, reserved1 0x%x
+>>>>>>56	ulelong		>0		\b, reserved2 0x%x
+>>>>>>60	ulelong		>0		\b, reserved3 0x%x
+# same structure as FAT1X 
+#>>>>>>64	ubyte		=0x80		\b, physical drive 0x%x=80 (usual harddisk)
+#>>>>>>64	ubyte		=0		\b, physical drive 0x%x=0 (usual floppy)
+>>>>>>64	ubyte		!0x80		
+>>>>>>>64	ubyte		>0		\b, physical drive 0x%x
+# in Windows NT bit 0 is a dirty flag to request chkdsk at boot time. bit 1 requests surface scan too
+>>>>>>65	ubyte		>0		\b, reserved 0x%x
+>>>>>>66	ubyte		!0x29		\b, dos < 4.0 BootSector (0x%x)
+>>>>>>66	ubyte		=0x29
+>>>>>>>67	ulelong		x		\b, serial number 0x%x
+>>>>>>>71	string		<NO\ NAME	\b, label: "%11.11s"
+>>>>>>>71	string		>NO\ NAME	\b, label: "%11.11s"
+>>>>>>>71	string		=NO\ NAME	\b, unlabeled
+# additional tests for floppy image added by Joerg Jenderek
+# no fixed disk 
+>>>>>21		ubyte		!0xF8		
+# floppy media with 12 bit FAT
+>>>>>>54	string		!FAT16		
+# test for FAT after bootsector
+>>>>>>>(11.s)	ulelong&0x00ffffF0	0x00ffffF0	\b, followed by FAT
+# floppy image
+!:mime application/x-ima
+# NTFS specific added by Joerg Jenderek at Mar 2011 according to http://thestarman.pcministry.com/asm/mbr/NTFSBR.htm
+# and http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/bios-parameter-block.html
+# 0 FATs
+>>>>>16	ubyte		=0		
+# 0 root entries
+>>>>>>17	uleshort	=0		
+# 0 DOS sectors
+>>>>>>>19	uleshort	=0		
+# 0 sectors/FAT
+# dos < 4.0 BootSector value found is 0x80
+#38	ubyte		=0x80			\b, dos < 4.0 BootSector (0x%x)
+>>>>>>>>22	uleshort	=0		\b; NTFS
+>>>>>>>>>24	uleshort	>0		\b, sectors/track %u
+>>>>>>>>>36	ulelong		!0x800080	\b, physical drive 0x%x
+>>>>>>>>>40	ulequad		>0		\b, sectors %lld
+>>>>>>>>>48	ulequad		>0		\b, $MFT start cluster %lld
+>>>>>>>>>56	ulequad		>0		\b, $MFTMirror start cluster %lld
+# Values 0 to 127 represent MFT record sizes of 0 to 127 clusters.
+# Values 128 to 255 represent MFT record sizes of 2^(256-N) bytes. 
+>>>>>>>>>64	lelong		<256		
+>>>>>>>>>>64	lelong		<128		\b, clusters/RecordSegment %d
+>>>>>>>>>>64	ubyte		>127		\b, bytes/RecordSegment 2^(-1*%i)
+# Values 0 to 127 represent index block sizes of 0 to 127 clusters.
+# Values 128 to 255 represent index block sizes of 2^(256-N) byte
+>>>>>>>>>68	ulelong		<256		
+>>>>>>>>>>68	ulelong		<128		\b, clusters/index block %d
+#>>>>>>>>>>68	ulelong		>127		\b, bytes/index block 2^(256-%d)
+>>>>>>>>>>68	ubyte		>127		\b, bytes/index block 2^(-1*%i)
+>>>>>>>>>72	ulequad		x		\b, serial number 0%llx
+>>>>>>>>>80	ulelong		>0		\b, checksum 0x%x
+#>>>>>>>>>80	ulelong		=0		\b, checksum 0x%x=0 (usual)
+>>>>>>>>>0x258	ulelong&0x00009090	=0x00009090	
+>>>>>>>>>>&-92		indirect	x	\b; contains 
+# For 2nd NTFS sector added by Joerg Jenderek at Jan 2013
+# http://thestarman.pcministry.com/asm/mbr/NTFSbrHexEd.htm
+# unused assembler instructions JMP y2;NOP;NOP
+0x056		ulelong&0xFFFF0FFF	0x909002EB	
+# unicode loadername terminated by CTRL-D
+>(0.s*2)	ulelong&0xFFFFFF00	0x00040000		
+# loadernames are NTLDR,CMLDR,PELDR,$LDR$ or BOOTMGR
+>>0x002		lestring16	x	Microsoft Windows XP/VISTA bootloader %-5.5s
+>>0x12		string		$	
+>>>0x0c		lestring16	x	\b%-2.2s
+### DOS,NTFS boot sectors end
+
 9564	lelong		0x00011954	Unix Fast File system [v1] (little-endian),
 >8404	string		x		last mounted on %s,
 #>9504	ledate		x		last checked at %s,
@@ -1025,7 +1547,7 @@
 >&-180	lelong		x		average file size %d,
 >&-176	lelong		x		average number of files in dir %d,
 >&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %ld,
+>&-264	lelong		x		pending inodes to free %d,
 >&-664	lequad		x		system-wide uuid %0llx,
 >&-1316	lelong		x		minimum percentage of free blocks %d,
 >&-1248	lelong		0		TIME optimization
@@ -1045,7 +1567,7 @@
 >&-180	lelong		x		average file size %d,
 >&-176	lelong		x		average number of files in dir %d,
 >&-272	lequad		x		pending blocks to free %lld,
->&-264	lelong		x		pending inodes to free %ld,
+>&-264	lelong		x		pending inodes to free %d,
 >&-664	lequad		x		system-wide uuid %0llx,
 >&-1316	lelong		x		minimum percentage of free blocks %d,
 >&-1248	lelong		0		TIME optimization
@@ -1085,7 +1607,7 @@
 >&-180	belong		x		average file size %d,
 >&-176	belong		x		average number of files in dir %d,
 >&-272	bequad		x		pending blocks to free %lld,
->&-264	belong		x		pending inodes to free %ld,
+>&-264	belong		x		pending inodes to free %d,
 >&-664	bequad		x		system-wide uuid %0llx,
 >&-1316	belong		x		minimum percentage of free blocks %d,
 >&-1248	belong		0		TIME optimization
@@ -1105,7 +1627,7 @@
 >&-180	belong		x		average file size %d,
 >&-176	belong		x		average number of files in dir %d,
 >&-272	bequad		x		pending blocks to free %lld,
->&-264	belong		x		pending inodes to free %ld,
+>&-264	belong		x		pending inodes to free %d,
 >&-664	bequad		x		system-wide uuid %0llx,
 >&-1316	belong		x		minimum percentage of free blocks %d,
 >&-1248	belong		0		TIME optimization
@@ -1157,6 +1679,51 @@
 #>0x464	lelong          &0x0000020      (many subdirs)
 #>0x463	lelong          &0x0000040      (extra isize)
 
+# Minix filesystems - Juan Cespedes <cespedes@debian.org>
+0x410	leshort		0x137f
+!:strength / 2
+>0x402	beshort		< 100
+>0x402	beshort		> -1		Minix filesystem, V1, %d zones
+>0x1e	string		minix		\b, bootable
+0x410	beshort		0x137f
+!:strength / 2
+>0x402	beshort		< 100
+>0x402	beshort		> -1		Minix filesystem, V1 (big endian), %d zones
+>0x1e	string		minix		\b, bootable
+0x410	leshort		0x138f
+!:strength / 2
+>0x402	beshort		< 100
+>0x402	beshort		> -1		Minix filesystem, V1, 30 char names, %d zones
+>0x1e	string		minix		\b, bootable
+0x410	beshort		0x138f
+!:strength / 2
+>0x402	beshort		< 100
+>0x402	beshort		> -1		Minix filesystem, V1, 30 char names (big endian), %d zones
+>0x1e	string		minix		\b, bootable
+0x410	leshort		0x2468
+>0x402	beshort		< 100
+>>0x402	beshort		> -1		Minix filesystem, V2, %d zones
+>0x1e	string		minix		\b, bootable
+0x410	beshort		0x2468
+>0x402	beshort		< 100
+>0x402	beshort		> -1		Minix filesystem, V2 (big endian), %d zones
+>0x1e	string		minix		\b, bootable
+
+0x410	leshort		0x2478
+>0x402	beshort		< 100
+>0x402	beshort		> -1		Minix filesystem, V2, 30 char names, %d zones
+>0x1e	string		minix		\b, bootable
+0x410	leshort		0x2478
+>0x402	beshort		< 100
+>0x402	beshort		> -1		Minix filesystem, V2, 30 char names, %d zones
+>0x1e	string		minix		\b, bootable
+0x410	beshort		0x2478
+>0x402	beshort		!0		Minix filesystem, V2, 30 char names (big endian), %d zones
+>0x1e	string		minix		\b, bootable
+0x410	leshort		0x4d5a
+>0x402	beshort		!0		Minix filesystem, V3, %d zones
+>0x1e	string		minix		\b, bootable
+
 # SGI disk labels - Nathan Scott <nathans@debian.org>
 0	belong		0x0BE5A941	SGI disk label (volume header)
 
@@ -1170,25 +1737,33 @@
 ############################################################################
 # Minix-ST kernel floppy
 0x800	belong		0x46fc2700	Atari-ST Minix kernel image
->19	string		\240\5\371\5\0\011\0\2\0	\b, 720k floppy
->19	string		\320\2\370\5\0\011\0\1\0	\b, 360k floppy
+# http://en.wikipedia.org/wiki/BIOS_parameter_block
+# floppies with valid BPB and any instruction at beginning
+>19	string		\240\005\371\005\0\011\0\2\0	\b, 720k floppy
+>19	string		\320\002\370\005\0\011\0\1\0	\b, 360k floppy
 
 ############################################################################
 # Hmmm, is this a better way of detecting _standard_ floppy images ?
-19	string		\320\2\360\3\0\011\0\1\0	DOS floppy 360k
->0x1FE	leshort		0xAA55		\b, x86 hard disk boot sector
-19	string		\240\5\371\3\0\011\0\2\0	DOS floppy 720k
->0x1FE	leshort		0xAA55		\b, x86 hard disk boot sector
+19	string		\320\002\360\003\0\011\0\1\0	DOS floppy 360k
+>0x1FE	leshort		0xAA55		\b, DOS/MBR hard disk boot sector
+19	string		\240\005\371\003\0\011\0\2\0	DOS floppy 720k
+>0x1FE	leshort		0xAA55		\b, DOS/MBR hard disk boot sector
 19	string		\100\013\360\011\0\022\0\2\0	DOS floppy 1440k
->0x1FE	leshort		0xAA55		\b, x86 hard disk boot sector
+>0x1FE	leshort		0xAA55		\b, DOS/MBR hard disk boot sector
 
-19	string		\240\5\371\5\0\011\0\2\0	DOS floppy 720k, IBM
->0x1FE	leshort		0xAA55		\b, x86 hard disk boot sector
-19	string		\100\013\371\5\0\011\0\2\0	DOS floppy 1440k, mkdosfs
->0x1FE	leshort		0xAA55		\b, x86 hard disk boot sector
+19	string		\240\005\371\005\0\011\0\2\0	DOS floppy 720k, IBM
+>0x1FE	leshort		0xAA55		\b, DOS/MBR hard disk boot sector
+19	string		\100\013\371\005\0\011\0\2\0	DOS floppy 1440k, mkdosfs
+>0x1FE	leshort		0xAA55		\b, DOS/MBR hard disk boot sector
 
-19	string		\320\2\370\5\0\011\0\1\0	Atari-ST floppy 360k
-19	string		\240\5\371\5\0\011\0\2\0	Atari-ST floppy 720k
+19	string		\320\002\370\005\0\011\0\1\0	Atari-ST floppy 360k
+19	string		\240\005\371\005\0\011\0\2\0	Atari-ST floppy 720k
+#			|       |   |     |     |
+#			|       |   |     |     heads
+#			|       |   |     sectors/track
+#			|       |   sectors/FAT
+#			|       media descriptor
+#		BPB:	sectors
 
 #  Valid media descriptor bytes for MS-DOS:
 #
@@ -1226,11 +1801,85 @@
 #        10	SS, 8 SPT
 #        11	DS, 8 SPT
 #
-#  11111001	Double density 3� floppy disk, high density 5�
-#  11110000	High density 3� floppy disk
+#  11111001	Double density 3 1/2 floppy disk, high density 5 1/4
+#  11110000	High density 3 1/2 floppy disk
 #  11111000	Hard disk any format
 #
 
+# all FAT12 (strength=70) floppies with sectorsize 512 added by Joerg Jenderek at Jun 2013
+# http://en.wikipedia.org/wiki/File_Allocation_Table#Exceptions
+# Too Weak.
+#512		ubelong&0xE0ffff00	0xE0ffff00		
+# without valid Media descriptor in place of BPB, cases with are done at other places
+#>21		ubyte			<0xE5			floppy with old FAT filesystem
+# but valid Media descriptor at begin of FAT
+#>>512		ubyte			=0xed			720k
+#>>512		ubyte			=0xf0			1440k
+#>>512		ubyte			=0xf8			720k
+#>>512		ubyte			=0xf9			1220k
+#>>512		ubyte			=0xfa			320k
+#>>512		ubyte			=0xfb			640k
+#>>512		ubyte			=0xfc			180k
+# look like an an old DOS directory entry
+#>>>0xA0E	ubequad			0			
+#>>>>0xA00	ubequad			!0			
+#!:mime application/x-ima
+#>>512		ubyte			=0xfd			
+# look for 2nd FAT at different location to distinguish between 360k and 500k
+#>>>0x600	ubelong&0xE0ffff00	0xE0ffff00		360k
+#>>>0x500	ubelong&0xE0ffff00	0xE0ffff00		500k
+#>>>0xA0E	ubequad			0			
+#!:mime application/x-ima
+#>>512		ubyte			=0xfe			
+#>>>0x400	ubelong&0xE0ffff00	0xE0ffff00		160k
+#>>>>0x60E	ubequad			0			
+#>>>>>0x600	ubequad			!0			
+#!:mime application/x-ima
+#>>>0xC00	ubelong&0xE0ffff00	0xE0ffff00		1200k
+#>>512		ubyte			=0xff			320k
+#>>>0x60E	ubequad			0			
+#>>>>0x600	ubequad			!0			
+#!:mime application/x-ima
+#>>512		ubyte			x			\b, Media descriptor 0x%x
+# without x86 jump instruction
+#>>0		ulelong&0x804000E9	!0x000000E9		
+# assembler instructions: CLI;MOV SP,1E7;MOV AX;07c0;MOV 	
+#>>>0	ubequad				0xfabce701b8c0078e	\b, MS-DOS 1.12 bootloader
+# IOSYS.COM+MSDOS.COM
+#>>>>0xc4	use			2xDOS-filename
+#>>0		ulelong&0x804000E9	=0x000000E9	
+# only x86 short jump instruction found
+#>>>0		ubyte			=0xEB
+#>>>>1		ubyte			x			\b, code offset 0x%x+2
+# http://thestarman.pcministry.com/DOS/ibm100/Boot.htm
+# assembler instructions: CLI;MOV AX,CS;MOV DS,AX;MOV DX,0		
+#>>>>(1.b+2)	ubequad			0xfa8cc88ed8ba0000	\b, PC-DOS 1.0 bootloader 
+# ibmbio.com+ibmdos.com
+#>>>>>0x176	use			DOS-filename
+#>>>>>0x181	ubyte			x			\b+
+#>>>>>0x182	use			DOS-filename
+# http://thestarman.pcministry.com/DOS/ibm110/Boot.htm
+# assembler instructions: CLI;MOV AX,CS;MOV DS,AX;XOR DX,DX;MOV		
+#>>>>(1.b+2)	ubequad			0xfa8cc88ed833d28e	\b, PC-DOS 1.1 bootloader 
+# ibmbio.com+ibmdos.com
+#>>>>>0x18b	use			DOS-filename
+#>>>>>0x196	ubyte			x			\b+
+#>>>>>0x197	use			DOS-filename
+# http://en.wikipedia.org/wiki/Zenith_Data_Systems
+# assembler instructions: MOV BX,07c0;MOV SS,BX;MOV SP,01c6		
+#>>>>(1.b+2)	ubequad			0xbbc0078ed3bcc601	\b, Zenith Data Systems MS-DOS 1.25 bootloader
+# IO.SYS+MSDOS.SYS
+#>>>>>0x20	use			2xDOS-filename
+# http://en.wikipedia.org/wiki/Corona_Data_Systems
+# assembler instructions: MOV AX,CS;MOV DS,AX;CLI;MOV SS,AX;		
+#>>>>(1.b+2)	ubequad			0x8cc88ed8fa8ed0bc	\b, MS-DOS 1.25 bootloader
+# IO.SYS+MSDOS.SYS
+#>>>>>0x69	use			2xDOS-filename
+# assembler instructions: CLI;PUSH CS;POP SS;MOV SP,7c00;		
+#>>>>(1.b+2)	ubequad			0xfa0e17bc007cb860	\b, MS-DOS 2.11 bootloader
+# defect IO.SYS+MSDOS.SYS ?
+#>>>>>0x162	use			2xDOS-filename
+
 # CDROM Filesystems
 # Modified for UDF by gerardo.cacciari@gmail.com
 32769	string    CD001     #
@@ -1243,35 +1892,35 @@
 >>38917	byte     >0x33      (unknown version, ID 0x%X)
 >>38917	byte     <0x31      (unknown version, ID 0x%X)
 # "application id" which appears to be used as a volume label
->32808	string    >\0       '%s'
+>32808	string/T  >\0       '%s'
 >34816	string    \000CD001\001EL\ TORITO\ SPECIFICATION    (bootable)
 37633	string    CD001     ISO 9660 CD-ROM filesystem data (raw 2352 byte sectors)
 !:mime	application/x-iso9660-image
-32776	string    CDROM     High Sierra CD-ROM filesystem data
+32777	string    CDROM     High Sierra CD-ROM filesystem data
 
 # .cso files
 0    string    CISO	Compressed ISO CD image
 
 # cramfs filesystem - russell@coker.com.au
 0       lelong    0x28cd3d45      Linux Compressed ROM File System data, little endian
->4      lelong  x size %lu
+>4      lelong  x size %u
 >8      lelong  &1 version #2
 >8      lelong  &2 sorted_dirs
 >8      lelong  &4 hole_support
 >32     lelong  x CRC 0x%x,
->36     lelong  x edition %lu,
->40     lelong  x %lu blocks,
->44     lelong  x %lu files
+>36     lelong  x edition %u,
+>40     lelong  x %u blocks,
+>44     lelong  x %u files
 
 0       belong    0x28cd3d45      Linux Compressed ROM File System data, big endian
->4      belong  x size %lu
+>4      belong  x size %u
 >8      belong  &1 version #2
 >8      belong  &2 sorted_dirs
 >8      belong  &4 hole_support
 >32     belong  x CRC 0x%x,
->36     belong  x edition %lu,
->40     belong  x %lu blocks,
->44     belong  x %lu files
+>36     belong  x edition %u,
+>40     belong  x %u blocks,
+>44     belong  x %u files
 
 # reiserfs - russell@coker.com.au
 0x10034		string	ReIsErFs	ReiserFS V3.5
@@ -1414,8 +2063,6 @@
 >28 leshort >3
 >>8	ledate	x	created: %s
 
-0	string		td\000		floppy image data (TeleDisk)
-
 # AFS Dump Magic
 # From: Ty Sarna <tsarna@sarna.org> 
 0       string                  \x01\xb3\xa1\x13\x22    AFS Dump
@@ -1538,8 +2185,8 @@
 >16	ulequad	>0	\b fblock table at %lld,
 >24	ulequad	>0	\b inode table at %lld,
 >32	ulequad	>0	\b root at %lld,
->40	ulelong	>0	\b fblock size = %ld,
->44	ulelong	>0	\b block size = %ld,
+>40	ulelong	>0	\b fblock size = %d,
+>44	ulelong	>0	\b block size = %d,
 >48	ulequad	>0	\b bytes = %lld
 
 # Type:	xfs metadump image
@@ -1569,3 +2216,64 @@
 >>&8	lelong	x	\b, blocksize %d
 >>&32	lelong&0x00000006	>0	(dirty)
 >>&36	lelong	>0	(compressed)
+
+# LFS
+0	lelong	0x070162	LFS filesystem image
+>4	lelong	1		version 1,
+>>8	lelong	x		\b blocks %u,
+>>12	lelong	x		\b blocks per segment %u,
+>4	lelong	2		version 2,
+>>8	lelong	x		\b fragments %u,
+>>12	lelong	x		\b bytes per segment %u,
+>16	lelong	x		\b disk blocks %u,
+>20	lelong	x		\b block size %u,
+>24	lelong	x		\b fragment size %u,
+>28	lelong	x		\b fragments per block %u,
+>32	lelong	x		\b start for free list %u,
+>36	lelong	x		\b number of free blocks %d,
+>40	lelong	x		\b number of files %u,
+>44	lelong	x		\b blocks available for writing %d,
+>48	lelong	x		\b inodes in cache %d,
+>52	lelong	x		\b inode file disk address 0x%x,
+>56	lelong	x		\b inode file inode number %u,
+>60	lelong	x		\b address of last segment written 0x%x,
+>64	lelong	x		\b address of next segment to write 0x%x,
+>68	lelong	x		\b address of current segment written 0x%x
+
+0	string	td\000		floppy image data (TeleDisk, compressed)
+0	string	TD\000		floppy image data (TeleDisk)
+
+0	string	CQ\024		floppy image data (CopyQM, 
+>16	leshort	x		%d sectors, 
+>18	leshort	x		%d heads.)
+
+0	string	ACT\020Apricot\020disk\020image\032\004	floppy image data (ApriDisk)
+
+0	beshort	0xAA58		floppy image data (IBM SaveDskF, old)
+0	beshort	0xAA59		floppy image data (IBM SaveDskF)
+0	beshort	0xAA5A		floppy image data (IBM SaveDskF, compressed)
+
+0	string	\074CPM_Disk\076	disk image data (YAZE)
+
+# ReFS
+# Richard W.M. Jones <rjones@redhat.com>
+0	string	\0\0\0ReFS\0	ReFS filesystem image
+
+# EFW encase image file format:
+# Gregoire Passault
+# http://www.forensicswiki.org/wiki/Encase_image_file_format
+0	string	EVF\x09\x0d\x0a\xff\x00	EWF/Expert Witness/EnCase image file format
+
+# UBIfs
+# Linux kernel sources: fs/ubifs/ubifs-media.h
+0       belong  0x31181006
+>0x16   short   0               UBIfs image
+>0x08   lequad  x               \b, sequence number %llu
+>0x10   leshort x               \b, length %u
+>0x04   lelong  x               \b, CRC 0x%08x
+
+0       belong  0x55424923
+>0x04   short   <2
+>0x05   string  \0\0\0
+>0x1c   string  \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
+>0x04   short   x       UBI image, version %u
diff --git a/contrib/file/magic/Magdir/flash b/contrib/file/magic/Magdir/flash
new file mode 100644
index 000000000000..b06f879efcd5
--- /dev/null
+++ b/contrib/file/magic/Magdir/flash
@@ -0,0 +1,40 @@
+
+#------------------------------------------------------------------------------
+# $File: flash,v 1.11 2014/05/02 00:26:49 christos Exp $
+# flash:	file(1) magic for Macromedia Flash file format
+#
+# See
+#
+#	http://www.macromedia.com/software/flash/open/
+#	http://wwwimages.adobe.com/www.adobe.com/content/dam/Adobe/\
+#	en/devnet/swf/pdf/swf-file-format-spec.pdf page 27
+#
+
+0   name        swf-details
+>0	string		F		Macromedia Flash data
+!:mime	application/x-shockwave-flash
+>0	string		C		Macromedia Flash data (compressed)
+!:mime	application/x-shockwave-flash
+>0	string		Z		Macromedia Flash data (lzma compressed)
+!:mime	application/x-shockwave-flash
+>3   byte        x      \b, version %d
+
+1   string      WS
+>4  lelong      !0
+>>3 byte        255 Suspicious
+>>>0    use     swf-details
+
+>>3 ubyte       <32
+>>>3 ubyte      !0
+>>>>0   use     swf-details
+
+# From: Cal Peake <cp@absolutedigital.net>
+0	string		FLV\x01		Macromedia Flash Video
+!:mime	video/x-flv
+
+#
+# Yosu Gomez
+0       string AGD2\xbe\xb8\xbb\xcd\x00 Macromedia Freehand 7 Document
+0       string AGD3\xbe\xb8\xbb\xcc\x00 Macromedia Freehand 8 Document
+# From Dave Wilson
+0	string AGD4\xbe\xb8\xbb\xcb\x00	Macromedia Freehand 9 Document
diff --git a/contrib/file/Magdir/fonts b/contrib/file/magic/Magdir/fonts
similarity index 81%
rename from contrib/file/Magdir/fonts
rename to contrib/file/magic/Magdir/fonts
index 917d372e6ef6..4b3173cd2af6 100644
--- a/contrib/file/Magdir/fonts
+++ b/contrib/file/magic/Magdir/fonts
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: fonts,v 1.23 2010/09/20 18:55:20 rrt Exp $
+# $File: fonts,v 1.27 2014/04/30 21:41:02 christos Exp $
 # fonts:  file(1) magic for font data
 #
 0	search/1	FONT		ASCII vfont text
@@ -16,8 +16,15 @@
 0	string		%!PS-Adobe-3.0\ Resource-Font	PostScript Type 1 font text
 
 # X11 font files in SNF (Server Natural Format) format
+# updated by Joerg Jenderek at Feb 2013
+# http://computer-programming-forum.com/51-perl/8f22fb96d2e34bab.htm
 0	belong		00000004		X11 SNF font data, MSB first
-0	lelong		00000004		X11 SNF font data, LSB first
+#>104	belong		00000004		X11 SNF font data, MSB first
+!:mime	application/x-font-sfn
+# GRR: line below too general as it catches also Xbase index file t3-CHAR.NDX
+0	lelong		00000004		
+>104	lelong		00000004		X11 SNF font data, LSB first
+!:mime	application/x-font-sfn
 
 # X11 Bitmap Distribution Format, from Daniel Quinlan (quinlan@yggdrasil.com)
 0	search/1	STARTFONT\ 		X11 BDF font text
@@ -75,7 +82,7 @@
 0	string		OTTO		OpenType font data
 !:mime application/vnd.ms-opentype
 
-# Gürkan Sengün <gurkan@linuks.mine.nu>, www.linuks.mine.nu 
+# Gurkan Sengun <gurkan@linuks.mine.nu>, www.linuks.mine.nu 
 0	string		SplineFontDB:	Spline Font Database 
 !:mime application/vnd.font-fontforge-sfd
 >14	string		x		version %s
@@ -83,3 +90,11 @@
 # EOT
 34	string		LP		Embedded OpenType (EOT)
 !:mime application/vnd.ms-fontobject
+
+# Web Open Font Format (.woff)
+# http://www.w3.org/TR/WOFF/
+0	string		wOFF	Web Open Font Format
+>4	belong		x	\b, flavor %d
+>8	belong		x	\b, length %d
+>20	beshort		x	\b, version %d
+>22	beshort		x	\b.%d
diff --git a/contrib/file/Magdir/fortran b/contrib/file/magic/Magdir/fortran
similarity index 51%
rename from contrib/file/Magdir/fortran
rename to contrib/file/magic/Magdir/fortran
index e2ef0cdb754c..921beec39681 100644
--- a/contrib/file/Magdir/fortran
+++ b/contrib/file/magic/Magdir/fortran
@@ -1,6 +1,7 @@
 
 #------------------------------------------------------------------------------
-# $File: fortran,v 1.6 2009/09/19 16:28:09 christos Exp $
+# $File: fortran,v 1.8 2014/06/03 19:01:34 christos Exp $
 # FORTRAN source
-0	regex/100	\^[Cc][\ \t]	FORTRAN program
+0	regex/100l	\^[Cc][\ \t]	FORTRAN program
 !:mime	text/x-fortran
+!:strength - 5
diff --git a/contrib/file/Magdir/frame b/contrib/file/magic/Magdir/frame
similarity index 100%
rename from contrib/file/Magdir/frame
rename to contrib/file/magic/Magdir/frame
diff --git a/contrib/file/Magdir/freebsd b/contrib/file/magic/Magdir/freebsd
similarity index 100%
rename from contrib/file/Magdir/freebsd
rename to contrib/file/magic/Magdir/freebsd
diff --git a/contrib/file/Magdir/fsav b/contrib/file/magic/Magdir/fsav
similarity index 91%
rename from contrib/file/Magdir/fsav
rename to contrib/file/magic/Magdir/fsav
index 0a7a7f802056..ecdc4f654b7c 100644
--- a/contrib/file/Magdir/fsav
+++ b/contrib/file/magic/Magdir/fsav
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: fsav,v 1.11 2009/09/19 16:28:09 christos Exp $
+# $File: fsav,v 1.13 2013/03/25 17:18:47 christos Exp $
 # fsav:  file(1) magic for datafellows fsav virus definition files
 # Anthon van der Neut (anthon@mnt.org)
 
@@ -61,3 +61,6 @@
 # Type: Grisoft AVG AntiVirus
 # From: David Newgas <david@newgas.net>
 0	string	AVG7_ANTIVIRUS_VAULT_FILE	AVG 7 Antivirus vault file data
+
+0	string	X5O!P%@AP[4\\PZX54(P^)7CC)7}$EICAR
+>33	string	-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*	EICAR virus test files
diff --git a/contrib/file/Magdir/fusecompress b/contrib/file/magic/Magdir/fusecompress
similarity index 100%
rename from contrib/file/Magdir/fusecompress
rename to contrib/file/magic/Magdir/fusecompress
diff --git a/contrib/file/Magdir/games b/contrib/file/magic/Magdir/games
similarity index 96%
rename from contrib/file/Magdir/games
rename to contrib/file/magic/Magdir/games
index e8116289cb5e..779bc6cfd643 100644
--- a/contrib/file/Magdir/games
+++ b/contrib/file/magic/Magdir/games
@@ -1,19 +1,19 @@
 
 #------------------------------------------------------------------------------
-# $File: games,v 1.13 2012/02/13 22:50:50 christos Exp $
+# $File: games,v 1.14 2014/04/30 21:41:02 christos Exp $
 # games:  file(1) for games
 
 # Fabio Bonelli <fabiobonelli@libero.it>
 # Quake II - III data files
 0       string  IDP2        	Quake II 3D Model file,
->20     long    x               %lu skin(s),
->8      long    x               (%lu x
->12     long    x 		%lu),
->40     long    x               %lu frame(s),
->16     long    x               Frame size %lu bytes,
->24     long  	x               %lu vertices/frame,
->28     long    x            	%lu texture coordinates,
->32     long    x               %lu triangles/frame
+>20     long    x               %u skin(s),
+>8      long    x               (%u x
+>12     long    x 		%u),
+>40     long    x               %u frame(s),
+>16     long    x               Frame size %u bytes,
+>24     long  	x               %u vertices/frame,
+>28     long    x            	%u texture coordinates,
+>32     long    x               %u triangles/frame
 
 0       string  IBSP            Quake
 >4      long    0x26            II Map file (BSP)
@@ -146,7 +146,7 @@
 
 
 0	string	MComprHD	MAME CHD compressed hard disk image,
->12	belong	x		version %lu
+>12	belong	x		version %u
 
 # doom - submitted by Jon Dowland
 
diff --git a/contrib/file/Magdir/gcc b/contrib/file/magic/Magdir/gcc
similarity index 100%
rename from contrib/file/Magdir/gcc
rename to contrib/file/magic/Magdir/gcc
diff --git a/contrib/file/Magdir/geo b/contrib/file/magic/Magdir/geo
similarity index 89%
rename from contrib/file/Magdir/geo
rename to contrib/file/magic/Magdir/geo
index 924c71e93562..9a765fed0c11 100644
--- a/contrib/file/Magdir/geo
+++ b/contrib/file/magic/Magdir/geo
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: geo,v 1.1 2010/02/23 23:40:07 christos Exp $
+# $File: geo,v 1.3 2013/01/04 00:47:02 christos Exp $
 # Geo- files from Kurt Schwehr <schwehr@ccom.unh.edu>
 
 ######################################################################
@@ -103,3 +103,15 @@
 
 # https://midas.psi.ch/elog/
 0	string	$@MID@$	elog journal entry
+
+# Geospatial Designs http://www.geospatialdesigns.com/surfer6_format.htm
+0	string		DSBB	Surfer 6 binary grid file
+>4	leshort		x	\b, %d
+>6	leshort		x	\bx%d
+>8	ledouble	x	\b, minx=%g
+>16	ledouble	x	\b, maxx=%g
+>24	ledouble	x	\b, miny=%g
+>32	ledouble	x	\b, maxy=%g
+>40	ledouble	x	\b, minz=%g
+>48	ledouble	x	\b, maxz=%g
+
diff --git a/contrib/file/Magdir/geos b/contrib/file/magic/Magdir/geos
similarity index 100%
rename from contrib/file/Magdir/geos
rename to contrib/file/magic/Magdir/geos
diff --git a/contrib/file/Magdir/gimp b/contrib/file/magic/Magdir/gimp
similarity index 75%
rename from contrib/file/Magdir/gimp
rename to contrib/file/magic/Magdir/gimp
index a360bd8e124b..516abb25a1fe 100644
--- a/contrib/file/Magdir/gimp
+++ b/contrib/file/magic/Magdir/gimp
@@ -1,13 +1,17 @@
 
 #------------------------------------------------------------------------------
-# $File: gimp,v 1.7 2010/09/20 18:55:20 rrt Exp $
-# GIMP Gradient: file(1) magic for the GIMP's gradient data files
+# $File: gimp,v 1.9 2014/04/30 21:41:02 christos Exp $
+# GIMP Gradient: file(1) magic for the GIMP's gradient data files (.ggr)
 # by Federico Mena <federico@nuclecu.unam.mx>
 
-0       string          GIMP\ Gradient  GIMP gradient data
+0       string/t        GIMP\ Gradient  GIMP gradient data
+
+# GIMP palette (.gpl)
+# From: Markus Heidelberg <markus.heidelberg@web.de>
+0       string/t        GIMP\ Palette   GIMP palette data
 
 #------------------------------------------------------------------------------
-# XCF:  file(1) magic for the XCF image format used in the GIMP developed
+# XCF:  file(1) magic for the XCF image format used in the GIMP (.xcf) developed
 #       by Spencer Kimball and Peter Mattis
 #       ('Bucky' LaDieu, nega@vt.edu)
 
@@ -16,15 +20,15 @@
 >9	string		file		version 0,
 >9	string		v		version
 >>10	string		>\0		%s,
->14	belong		x		%lu x
->18	belong		x		%lu,
+>14	belong		x		%u x
+>18	belong		x		%u,
 >22     belong          0               RGB Color
 >22     belong          1               Greyscale
 >22     belong          2               Indexed Color
 >22	belong		>2		Unknown Image Type.
 
 #------------------------------------------------------------------------------
-# XCF:  file(1) magic for the patterns used in the GIMP, developed
+# XCF:  file(1) magic for the patterns used in the GIMP (.pat), developed
 #       by Spencer Kimball and Peter Mattis
 #       ('Bucky' LaDieu, nega@vt.edu)
 
@@ -32,7 +36,7 @@
 >24     string          x               %s
 
 #------------------------------------------------------------------------------
-# XCF:  file(1) magic for the brushes used in the GIMP, developed
+# XCF:  file(1) magic for the brushes used in the GIMP (.gbr), developed
 #       by Spencer Kimball and Peter Mattis
 #       ('Bucky' LaDieu, nega@vt.edu)
 
diff --git a/contrib/file/magic/Magdir/gnome b/contrib/file/magic/Magdir/gnome
new file mode 100644
index 000000000000..32c9ae938812
--- /dev/null
+++ b/contrib/file/magic/Magdir/gnome
@@ -0,0 +1,59 @@
+
+#------------------------------------------------------------------------------
+# $File: gnome,v 1.5 2014/04/30 21:41:02 christos Exp $
+# GNOME related files
+
+# Contributed by Josh Triplett
+# FIXME: Could be simplified if pstring supported two-byte counts
+0         string   GnomeKeyring\n\r\0\n GNOME keyring
+>&0       ubyte    0                    \b, major version 0
+>>&0      ubyte    0                    \b, minor version 0
+>>>&0     ubyte    0                    \b, crypto type 0 (AES)
+>>>&0     ubyte    >0                   \b, crypto type %u (unknown)
+>>>&1     ubyte    0                    \b, hash type 0 (MD5)
+>>>&1     ubyte    >0                   \b, hash type %u (unknown)
+>>>&2     ubelong  0xFFFFFFFF           \b, name NULL
+>>>&2     ubelong  !0xFFFFFFFF
+>>>>&-4   ubelong  >255                 \b, name too long for file's pstring type
+>>>>&-4   ubelong  <256
+>>>>>&-1  pstring  x                    \b, name "%s"
+>>>>>>&0  ubeqdate x                    \b, last modified %s
+>>>>>>&8  ubeqdate x                    \b, created %s
+>>>>>>&16 ubelong  &1
+>>>>>>>&0 ubelong  x                    \b, locked if idle for %u seconds
+>>>>>>&16 ubelong  ^1                   \b, not locked if idle
+>>>>>>&24 ubelong  x                    \b, hash iterations %u
+>>>>>>&28 ubequad  x                    \b, salt %llu
+>>>>>>&52 ubelong  x                    \b, %u item(s)
+
+# From: Alex Beregszaszi <alex@fsn.hu>
+4	string	gtktalog		GNOME Catalogue (gtktalog)
+>13	string	>\0			version %s
+
+# Summary: GStreamer binary registry
+# Extension: .bin
+# Submitted by: Josh Triplett <josh@joshtriplett.org>
+0	belong	0xc0def00d		GStreamer binary registry
+>4	string	x			\b, version %s
+
+# GVariant Database file
+# By Elan Ruusamae <glen@delfi.ee>
+# https://github.com/GNOME/gvdb/blob/master/gvdb-format.h
+# It's always "GVariant", it's byte swapped on incompatible archs
+# See https://github.com/GNOME/gvdb/blob/master/gvdb-builder.c
+# file_builder_serialise()
+# http://developer.gnome.org/glib/2.34/glib-GVariant.html#GVariant
+0	string	GVariant	GVariant Database file,
+# version is never filled. probably future extension
+>8	lelong	x		version %d
+# not sure are these usable, so commented out
+#>>16	lelong	x		start %d,
+#>>>20	lelong	x		end %d
+
+# G-IR database made by gobject-introspect toolset,
+# http://live.gnome.org/GObjectIntrospection
+0	string		GOBJ\nMETADATA\r\n\032	G-IR binary database
+>16	byte		x			\b, v%d
+>17	byte		x			\b.%d
+>20	leshort		x			\b, %d entries
+>22	leshort		x			\b/%d local
diff --git a/contrib/file/Magdir/gnu b/contrib/file/magic/Magdir/gnu
similarity index 61%
rename from contrib/file/Magdir/gnu
rename to contrib/file/magic/Magdir/gnu
index 4789c0a2a667..e4a0a16aa43e 100644
--- a/contrib/file/Magdir/gnu
+++ b/contrib/file/magic/Magdir/gnu
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: gnu,v 1.13 2012/01/03 17:16:54 christos Exp $
+# $File: gnu,v 1.15 2014/02/06 14:21:02 christos Exp $
 # gnu:  file(1) magic for various GNU tools
 #
 # GNU nlsutils message catalog file format
@@ -37,6 +37,32 @@
 0       beshort         0x9901                  GPG key public ring
 !:mime	application/x-gnupg-keyring
 
+# Symmetric encryption
+0	leshort		0x0d8c
+>4	leshort		0x0203
+>>2	leshort		0x0204		GPG symmetrically encrypted data (3DES cipher)
+>>2	leshort		0x0304		GPG symmetrically encrypted data (CAST5 cipher)
+>>2	leshort		0x0404		GPG symmetrically encrypted data (BLOWFISH cipher)
+>>2	leshort		0x0704		GPG symmetrically encrypted data (AES cipher)
+>>2	leshort		0x0804		GPG symmetrically encrypted data (AES192 cipher)
+>>2	leshort		0x0904		GPG symmetrically encrypted data (AES256 cipher)
+>>2	leshort		0x0a04		GPG symmetrically encrypted data (TWOFISH cipher)
+>>2	leshort		0x0b04		GPG symmetrically encrypted data (CAMELLIA128 cipher)
+>>2	leshort		0x0c04		GPG symmetrically encrypted data (CAMELLIA192 cipher)
+>>2	leshort		0x0d04		GPG symmetrically encrypted data (CAMELLIA256 cipher)
+
+
+# GnuPG Keybox file
+# <http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=kbx/keybox-blob.c;hb=HEAD>
+# From: Philipp Hahn <hahn@univention.de>
+0	belong	32
+>4	byte	1
+>>8	string	KBXf	GPG keybox database
+>>>5	byte	1	version %d
+>>>16	bedate	x	\b, created-at %s
+>>>20	bedate	x	\b, last-maintained %s
+
+
 # Gnumeric spreadsheet
 # This entry is only semi-helpful, as Gnumeric compresses its files, so
 # they will ordinarily reported as "compressed", but at least -z helps
diff --git a/contrib/file/Magdir/gnumeric b/contrib/file/magic/Magdir/gnumeric
similarity index 100%
rename from contrib/file/Magdir/gnumeric
rename to contrib/file/magic/Magdir/gnumeric
diff --git a/contrib/file/magic/Magdir/gpt b/contrib/file/magic/Magdir/gpt
new file mode 100644
index 000000000000..c48a58f7fe63
--- /dev/null
+++ b/contrib/file/magic/Magdir/gpt
@@ -0,0 +1,240 @@
+
+#------------------------------------------------------------------------------
+# $File: gpt,v 1.3 2014/04/30 21:41:02 christos Exp $
+#
+# GPT Partition table patterns.
+# Author: Rogier Goossens (goossens.rogier@gmail.com)
+# Note that a GPT-formatted disk must contain an MBR as well.
+#
+
+# The initial segment (up to >>>>>>>>422) was copied from the X86
+# partition table code (aka MBR).
+# This is kept separate, so that MBR partitions are not reported as well.
+# (use -k if you do want them as well)
+
+# First, detect the MBR partiton table
+# If more than one GPT protective MBR partition exists, don't print anything
+# (the other MBR detection code will then just print the MBR partition table)
+0x1FE			leshort		0xAA55
+>3			string		!MS
+>>3			string		!SYSLINUX
+>>>3			string		!MTOOL
+>>>>3			string		!NEWLDR
+>>>>>5			string		!DOS
+# not FAT (32 bit)
+>>>>>>82		string		!FAT32
+#not Linux kernel
+>>>>>>>514		string		!HdrS
+#not BeOS
+>>>>>>>>422		string		!Be\ Boot\ Loader
+# GPT with protective MBR entry in partition 1 (only)
+>>>>>>>>>450		ubyte		0xee
+>>>>>>>>>>466		ubyte		!0xee
+>>>>>>>>>>>482		ubyte		!0xee
+>>>>>>>>>>>>498		ubyte		!0xee
+#>>>>>>>>>>>>>446	use		gpt-mbr-partition
+>>>>>>>>>>>>>(454.l*8192)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>0			use		gpt-mbr-type
+>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>0			ubyte		x		of 8192 bytes		
+>>>>>>>>>>>>>(454.l*8192)	string		!EFI\ PART
+>>>>>>>>>>>>>>(454.l*4096)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>0		ubyte		x		of 4096 bytes
+>>>>>>>>>>>>>>(454.l*4096)	string		!EFI\ PART
+>>>>>>>>>>>>>>>(454.l*2048)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>>0		ubyte		x		of 2048 bytes
+>>>>>>>>>>>>>>>(454.l*2048)	string		!EFI\ PART
+>>>>>>>>>>>>>>>>(454.l*1024)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>>>0		ubyte		x		of 1024 bytes
+>>>>>>>>>>>>>>>>(454.l*1024)	string		!EFI\ PART
+>>>>>>>>>>>>>>>>>(454.l*512)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>>>>0		ubyte		x		of 512 bytes
+# GPT with protective MBR entry in partition 2 (only)
+>>>>>>>>>450		ubyte		!0xee
+>>>>>>>>>>466		ubyte		0xee
+>>>>>>>>>>>482		ubyte		!0xee
+>>>>>>>>>>>>498		ubyte		!0xee
+#>>>>>>>>>>>>>462	use		gpt-mbr-partition
+>>>>>>>>>>>>>(470.l*8192)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>0			use		gpt-mbr-type
+>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>0			ubyte		x		of 8192 bytes		
+>>>>>>>>>>>>>(470.l*8192)	string		!EFI\ PART
+>>>>>>>>>>>>>>(470.l*4096)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>0		ubyte		x		of 4096 bytes
+>>>>>>>>>>>>>>(470.l*4096)	string		!EFI\ PART
+>>>>>>>>>>>>>>>(470.l*2048)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>>0		ubyte		x		of 2048 bytes
+>>>>>>>>>>>>>>>(470.l*2048)	string		!EFI\ PART
+>>>>>>>>>>>>>>>>(470.l*1024)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>>>0		ubyte		x		of 1024 bytes
+>>>>>>>>>>>>>>>>(470.l*1024)	string		!EFI\ PART
+>>>>>>>>>>>>>>>>>(470.l*512)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>>>>0		ubyte		x		of 512 bytes
+# GPT with protective MBR entry in partition 3 (only)
+>>>>>>>>>450		ubyte		!0xee
+>>>>>>>>>>466		ubyte		!0xee
+>>>>>>>>>>>482		ubyte		0xee
+>>>>>>>>>>>>498		ubyte		!0xee
+#>>>>>>>>>>>>>478	use		gpt-mbr-partition
+>>>>>>>>>>>>>(486.l*8192)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>0			use		gpt-mbr-type
+>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>0			ubyte		x		of 8192 bytes		
+>>>>>>>>>>>>>(486.l*8192)	string		!EFI\ PART
+>>>>>>>>>>>>>>(486.l*4096)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>0		ubyte		x		of 4096 bytes
+>>>>>>>>>>>>>>(486.l*4096)	string		!EFI\ PART
+>>>>>>>>>>>>>>>(486.l*2048)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>>0		ubyte		x		of 2048 bytes
+>>>>>>>>>>>>>>>(486.l*2048)	string		!EFI\ PART
+>>>>>>>>>>>>>>>>(486.l*1024)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>>>0		ubyte		x		of 1024 bytes
+>>>>>>>>>>>>>>>>(486.l*1024)	string		!EFI\ PART
+>>>>>>>>>>>>>>>>>(486.l*512)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>>>>0		ubyte		x		of 512 bytes
+# GPT with protective MBR entry in partition 4 (only)
+>>>>>>>>>450		ubyte		!0xee
+>>>>>>>>>>466		ubyte		!0xee
+>>>>>>>>>>>482		ubyte		!0xee
+>>>>>>>>>>>>498		ubyte		0xee
+#>>>>>>>>>>>>>494	use		gpt-mbr-partition
+>>>>>>>>>>>>>(502.l*8192)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>0			use		gpt-mbr-type
+>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>0			ubyte		x		of 8192 bytes		
+>>>>>>>>>>>>>(502.l*8192)	string		!EFI\ PART
+>>>>>>>>>>>>>>(502.l*4096)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>0		ubyte		x		of 4096 bytes
+>>>>>>>>>>>>>>(502.l*4096)	string		!EFI\ PART
+>>>>>>>>>>>>>>>(502.l*2048)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>>0		ubyte		x		of 2048 bytes
+>>>>>>>>>>>>>>>(502.l*2048)	string		!EFI\ PART
+>>>>>>>>>>>>>>>>(502.l*1024)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>>>0		ubyte		x		of 1024 bytes
+>>>>>>>>>>>>>>>>(502.l*1024)	string		!EFI\ PART
+>>>>>>>>>>>>>>>>>(502.l*512)	string		EFI\ PART	GPT partition table
+>>>>>>>>>>>>>>>>>>0		use		gpt-mbr-type
+>>>>>>>>>>>>>>>>>>&-8		use		gpt-table
+>>>>>>>>>>>>>>>>>>0		ubyte		x		of 512 bytes
+
+# The following code does GPT detection and processing, including
+# sector size detection.
+# It has to be duplicated above because the top-level pattern
+# (i.e. not called using 'use') must print *something* for file
+# to count it as a match. Text only printed in named patterns is
+# not counted, and causes file to continue, and try and match
+# other patterns.
+#
+# Unfortunately, when assuming sector sizes >=16k, if the sector size
+# happens to be 512 instead, we may find confusing data after the GPT
+# table...  If the GPT table has less than 128 entries, this may even
+# happen for assumed sector sizes as small as 4k
+# This could be solved by checking for the presence of the backup GPT
+# header as well, but that makes the logic extremely complex
+##0		name		gpt-mbr-partition
+##>(8.l*8192)	string		EFI\ PART
+##>>(8.l*8192)	use		gpt-mbr-type
+##>>&-8		use		gpt-table
+##>>0		ubyte		x		of 8192 bytes		
+##>(8.l*8192)	string		!EFI\ PART
+##>>(8.l*4096)	string		EFI\ PART	GPT partition table
+##>>>0		use		gpt-mbr-type
+##>>>&-8		use		gpt-table
+##>>>0		ubyte		x		of 4096 bytes
+##>>(8.l*4096)	string		!EFI\ PART
+##>>>(8.l*2048)	string		EFI\ PART	GPT partition table
+##>>>>0		use		gpt-mbr-type
+##>>>>&-8		use		gpt-table
+##>>>>0		ubyte		x		of 2048 bytes
+##>>>(8.l*2048)	string		!EFI\ PART
+##>>>>(8.l*1024)	string		EFI\ PART	GPT partition table
+##>>>>>0		use		gpt-mbr-type
+##>>>>>&-8	use		gpt-table
+##>>>>>0		ubyte		x		of 1024 bytes
+##>>>>(8.l*1024)	string		!EFI\ PART
+##>>>>>(8.l*512)	string		EFI\ PART	GPT partition table
+##>>>>>>0		use		gpt-mbr-type
+##>>>>>>&-8	use		gpt-table
+##>>>>>>0		ubyte		x		of 512 bytes
+
+# Print details of MBR type for a GPT-disk
+# Calling code ensures that there is only one 0xee partition.
+0		name		gpt-mbr-type
+# GPT with protective MBR entry in partition 1
+>450		ubyte		0xee
+>>454		ulelong		1
+>>>462		string		!\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	\b (with hybrid MBR)
+>>454		ulelong		!1													\b (nonstandard: not at LBA 1)
+# GPT with protective MBR entry in partition 2
+>466		ubyte		0xee
+>>470		ulelong		1
+>>>478		string		\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
+>>>>446		string		!\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0					\b (with hybrid MBR)
+>>>478		string		!\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	\b (with hybrid MBR)
+>>470		ulelong		!1									\b (nonstandard: not at LBA 1)
+# GPT with protective MBR entry in partition 3
+>482		ubyte		0xee
+>>486		ulelong		1
+>>>494		string		\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0
+>>>>446		string		!\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	\b (with hybrid MBR)
+>>>494		string		!\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0					\b (with hybrid MBR)
+>>486		ulelong		!1									\b (nonstandard: not at LBA 1)
+# GPT with protective MBR entry in partition 4
+>498		ubyte		0xee
+>>502		ulelong		1		
+>>>446		string		!\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	\b (with hybrid MBR)
+>>502		ulelong		!1													\b (nonstandard: not at LBA 1)
+
+# Print the information from a GPT partition table structure
+0		name		gpt-table
+>10		uleshort	x		\b, version %u
+>8		uleshort	x		\b.%u
+>56		ulelong		x		\b, GUID: %08x
+>60		uleshort	x		\b-%04x
+>62		uleshort	x		\b-%04x
+>64		ubeshort	x		\b-%04x
+>66		ubeshort	x		\b-%04x
+>68		ubelong		x		\b%08x
+#>80		uleshort	x		\b, %d partition entries
+>32		ulequad+1	x		\b, disk size: %lld sectors
+
+# In case a GPT data-structure is at LBA 0, report it as well
+# This covers systems which are not GPT-aware, and which show
+# and allow access to the protective partition. This code will
+# detect the contents of such a partition.
+0		string		EFI\ PART	GPT data structure (nonstandard: at LBA 0)
+>0		use		gpt-table
+>0		ubyte		x		(sector size unknown)
+
+
diff --git a/contrib/file/Magdir/grace b/contrib/file/magic/Magdir/grace
similarity index 100%
rename from contrib/file/Magdir/grace
rename to contrib/file/magic/Magdir/grace
diff --git a/contrib/file/Magdir/graphviz b/contrib/file/magic/Magdir/graphviz
similarity index 65%
rename from contrib/file/Magdir/graphviz
rename to contrib/file/magic/Magdir/graphviz
index b944d4637c6b..cddc1164005a 100644
--- a/contrib/file/Magdir/graphviz
+++ b/contrib/file/magic/Magdir/graphviz
@@ -1,12 +1,12 @@
 
 #------------------------------------------------------------------------------
-# $File: graphviz,v 1.7 2009/09/19 16:28:09 christos Exp $
+# $File: graphviz,v 1.8 2014/06/03 19:01:34 christos Exp $
 # graphviz:  file(1) magic for http://www.graphviz.org/
 
 # FIXME: These patterns match too generally. For example, the first
 # line matches a LaTeX file containing the word "graph" (with a {
 # following later) and the second line matches this file.
-#0	regex/100	[\r\n\t\ ]*graph[\r\n\t\ ]+.*\\{	graphviz graph text
+#0	regex/100l	[\r\n\t\ ]*graph[\r\n\t\ ]+.*\\{	graphviz graph text
 #!:mime	text/vnd.graphviz
-#0	regex/100	[\r\n\t\ ]*digraph[\r\n\t\ ]+.*\\{	graphviz digraph text
+#0	regex/100l	[\r\n\t\ ]*digraph[\r\n\t\ ]+.*\\{	graphviz digraph text
 #!:mime	text/vnd.graphviz
diff --git a/contrib/file/Magdir/gringotts b/contrib/file/magic/Magdir/gringotts
similarity index 100%
rename from contrib/file/Magdir/gringotts
rename to contrib/file/magic/Magdir/gringotts
diff --git a/contrib/file/Magdir/guile b/contrib/file/magic/Magdir/guile
similarity index 100%
rename from contrib/file/Magdir/guile
rename to contrib/file/magic/Magdir/guile
diff --git a/contrib/file/Magdir/hitachi-sh b/contrib/file/magic/Magdir/hitachi-sh
similarity index 67%
rename from contrib/file/Magdir/hitachi-sh
rename to contrib/file/magic/Magdir/hitachi-sh
index 96067e9ba524..213d2d69c4f8 100644
--- a/contrib/file/Magdir/hitachi-sh
+++ b/contrib/file/magic/Magdir/hitachi-sh
@@ -1,11 +1,14 @@
 
 #------------------------------------------------------------------------------
-# $File: hitachi-sh,v 1.5 2009/09/19 16:28:09 christos Exp $
+# $File: hitachi-sh,v 1.6 2013/01/29 19:31:33 christos Exp $
 # hitach-sh: file(1) magic for Hitachi Super-H
 #
 # Super-H COFF
 #
+# below test line conflicts with 2nd NTFS filesystem sector 
 0	beshort		0x0500		Hitachi SH big-endian COFF
+# 2nd NTFS filesystem sector often starts with 0x05004e00 for unicode string 5 NTLDR
+#0	ubelong&0xFFFFNMPQ	0x0500NMPQ     Hitachi SH big-endian COFF
 >18	beshort&0x0002	=0x0000		object
 >18	beshort&0x0002	=0x0002		executable
 >18	beshort&0x0008	=0x0008		\b, stripped
diff --git a/contrib/file/Magdir/hp b/contrib/file/magic/Magdir/hp
similarity index 96%
rename from contrib/file/Magdir/hp
rename to contrib/file/magic/Magdir/hp
index 3201c1567c8a..b01c3a40b0a7 100644
--- a/contrib/file/Magdir/hp
+++ b/contrib/file/magic/Magdir/hp
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: hp,v 1.23 2009/09/19 16:28:09 christos Exp $
+# $File: hp,v 1.24 2014/04/30 21:41:02 christos Exp $
 # hp:  file(1) magic for Hewlett Packard machines (see also "printer")
 #
 # XXX - somebody should figure out whether any byte order needs to be
@@ -41,10 +41,10 @@
 #### Old Apollo stuff
 0	beshort		0627		Apollo m68k COFF executable
 >18	beshort		^040000		not stripped
->22	beshort		>0		- version %ld
+>22	beshort		>0		- version %d
 0	beshort		0624		apollo a88k COFF executable
 >18	beshort		^040000		not stripped
->22	beshort		>0		- version %ld
+>22	beshort		>0		- version %d
 0       long            01203604016     TML 0123 byte-order format
 0       long            01702407010     TML 1032 byte-order format
 0       long            01003405017     TML 2301 byte-order format
@@ -128,58 +128,58 @@
 
 #### 500
 0	long		0x02080106	HP s500 relocatable executable
->16	long		>0		- version %ld
+>16	long		>0		- version %d
 
 0	long		0x02080107	HP s500 executable
->16	long		>0		- version %ld
+>16	long		>0		- version %d
 
 0	long		0x02080108	HP s500 pure executable
->16	long		>0		- version %ld
+>16	long		>0		- version %d
 
 #### 200
 0	belong 		0x020c0108	HP s200 pure executable
->4	beshort		>0		- version %ld
+>4	beshort		>0		- version %d
 >8	belong		&0x80000000	save fp regs
 >8	belong		&0x40000000	dynamically linked
 >8	belong		&0x20000000	debuggable
 >36	belong		>0		not stripped
 
 0	belong		0x020c0107	HP s200 executable
->4	beshort		>0		- version %ld
+>4	beshort		>0		- version %d
 >8	belong		&0x80000000	save fp regs
 >8	belong		&0x40000000	dynamically linked
 >8	belong		&0x20000000	debuggable
 >36	belong		>0		not stripped
 
 0	belong		0x020c010b	HP s200 demand-load executable
->4	beshort		>0		- version %ld
+>4	beshort		>0		- version %d
 >8	belong		&0x80000000	save fp regs
 >8	belong		&0x40000000	dynamically linked
 >8	belong		&0x20000000	debuggable
 >36	belong		>0		not stripped
 
 0	belong		0x020c0106	HP s200 relocatable executable
->4	beshort		>0		- version %ld
+>4	beshort		>0		- version %d
 >6	beshort		>0		- highwater %d
 >8	belong		&0x80000000	save fp regs
 >8	belong		&0x20000000	debuggable
 >8	belong		&0x10000000	PIC
 
 0	belong 		0x020a0108	HP s200 (2.x release) pure executable
->4	beshort		>0		- version %ld
+>4	beshort		>0		- version %d
 >36	belong		>0		not stripped
 
 0	belong		0x020a0107	HP s200 (2.x release) executable
->4	beshort		>0		- version %ld
+>4	beshort		>0		- version %d
 >36	belong		>0		not stripped
 
 0	belong		0x020c010e	HP s200 shared library
->4	beshort		>0		- version %ld
+>4	beshort		>0		- version %d
 >6	beshort		>0		- highwater %d
 >36	belong		>0		not stripped
 
 0	belong		0x020c010d	HP s200 dynamic load library
->4	beshort		>0		- version %ld
+>4	beshort		>0		- version %d
 >6	beshort		>0		- highwater %d
 >36	belong		>0		not stripped
 
@@ -192,7 +192,7 @@
 0	long		0x015821a6	HP core file
 
 0	long		0x4da7eee8	HP-WINDOWS font
->8	byte		>0		- version %ld
+>8	byte		>0		- version %d
 0	string		Bitmapfile	HP Bitmapfile
 
 0	string		IMGfile	CIS 	compimg HP Bitmapfile
diff --git a/contrib/file/Magdir/human68k b/contrib/file/magic/Magdir/human68k
similarity index 100%
rename from contrib/file/Magdir/human68k
rename to contrib/file/magic/Magdir/human68k
diff --git a/contrib/file/Magdir/ibm370 b/contrib/file/magic/Magdir/ibm370
similarity index 88%
rename from contrib/file/Magdir/ibm370
rename to contrib/file/magic/Magdir/ibm370
index 37d17bd8a549..7887dc3c5c7a 100644
--- a/contrib/file/Magdir/ibm370
+++ b/contrib/file/magic/Magdir/ibm370
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: ibm370,v 1.8 2009/09/19 16:28:09 christos Exp $
+# $File: ibm370,v 1.9 2014/04/30 21:41:02 christos Exp $
 # ibm370:  file(1) magic for IBM 370 and compatibles.
 #
 # "ibm370" said that 0x15d == 0535 was "ibm 370 pure executable".
@@ -36,13 +36,13 @@
 >12	belong		>0		not stripped
 0       beshort		0531		SVR2 executable (Amdahl-UTS)
 >12	belong		>0		not stripped
->24     belong		>0		- version %ld
+>24     belong		>0		- version %d
 0	beshort		0534		SVR2 pure executable (Amdahl-UTS)
 >12	belong		>0		not stripped
->24	belong		>0		- version %ld
+>24	belong		>0		- version %d
 0	beshort		0530		SVR2 pure executable (USS/370)
 >12	belong		>0		not stripped
->24	belong		>0		- version %ld
+>24	belong		>0		- version %d
 0	beshort		0535		SVR2 executable (USS/370)
 >12	belong		>0		not stripped
->24	belong		>0		- version %ld
+>24	belong		>0		- version %d
diff --git a/contrib/file/Magdir/ibm6000 b/contrib/file/magic/Magdir/ibm6000
similarity index 58%
rename from contrib/file/Magdir/ibm6000
rename to contrib/file/magic/Magdir/ibm6000
index 72755fafc498..7f45072a187a 100644
--- a/contrib/file/Magdir/ibm6000
+++ b/contrib/file/magic/Magdir/ibm6000
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: ibm6000,v 1.9 2009/09/19 16:28:09 christos Exp $
+# $File: ibm6000,v 1.12 2013/09/16 15:12:42 christos Exp $
 # ibm6000:  file(1) magic for RS/6000 and the RT PC.
 #
 0	beshort		0x01df		executable (RISC System/6000 V3.1) or obj module
@@ -18,3 +18,14 @@
 0	string		\<aiaff>	archive
 0	string		\<bigaf>	archive (big format)
 
+0	beshort		0x01f7		64-bit XCOFF executable or object module
+>20	belong		0		not stripped
+# GRR: this test is still too general as it catches also many FATs of DOS filesystems
+4	belong		&0x0feeddb0	
+# real core dump could not be 32-bit and 64-bit together
+>7	byte&0x03	!3		AIX core file
+>>1	byte		&0x01		fulldump
+>>7	byte		&0x01		32-bit
+>>>0x6e0	string	>\0		\b, %s
+>>7	byte		&0x02		64-bit
+>>>0x524	string	>\0		\b, %s
diff --git a/contrib/file/magic/Magdir/icc b/contrib/file/magic/Magdir/icc
new file mode 100644
index 000000000000..37fa30e8cb8c
--- /dev/null
+++ b/contrib/file/magic/Magdir/icc
@@ -0,0 +1,51 @@
+
+#------------------------------------------------------------------------------
+# $File: icc,v 1.1 2013/01/08 01:43:18 christos Exp $
+# icc:  file(1) magic for International Color Consortium file formats
+
+#
+# Color profiles as per the ICC's "Image technology colour management -
+# Architecture, profile format, and data structure" specification.
+# See
+#
+#	http://www.color.org/specification/ICC1v43_2010-12.pdf
+#
+# for Specification ICC.1:2010 (Profile version 4.3.0.0).
+#
+# Bytes 36 to 39 contain a generic profile file signature of "acsp";
+# bytes 40 to 43 "may be used to identify the primary platform/operating
+# system framework for which the profile was created".
+#
+# There are other fields that might be worth dumping as well.
+#
+
+# This appears to be what's used for Apple ColorSync profiles.
+# Instead of adding that, Apple just changed the generic "acsp" entry
+# to be for "ColorSync ICC Color Profile" rather than "Kodak Color
+# Management System, ICC Profile".
+# Yes, it's "APPL", not "AAPL"; see the spec.
+36	string		acspAPPL	ColorSync ICC Profile
+!:mime	application/vnd.iccprofile
+
+# Microsoft ICM color profile
+36	string		acspMSFT	Microsoft ICM Color Profile
+!:mime	application/vnd.iccprofile
+
+# Yes, that's a blank after "SGI".
+36	string		acspSGI\ 	SGI ICC Profile
+!:mime	application/vnd.iccprofile
+
+# XXX - is this what's used for the Sun KCMS or not?  The standard file
+# uses just "acsp" for that, but Apple's file uses it for "ColorSync",
+# and there *is* an identified "primary platform" value of SUNW.
+36	string		acspSUNW	Sun KCMS ICC Profile
+!:mime	application/vnd.iccprofile
+
+# Any other profile.
+# XXX - should we use "acsp\0\0\0\0" for "no primary platform" profiles,
+# and use "acsp" for everything else and dump the "primary platform"
+# string in those cases?
+36	string		acsp		ICC Profile
+!:mime	application/vnd.iccprofile
+
+
diff --git a/contrib/file/Magdir/iff b/contrib/file/magic/Magdir/iff
similarity index 100%
rename from contrib/file/Magdir/iff
rename to contrib/file/magic/Magdir/iff
diff --git a/contrib/file/Magdir/images b/contrib/file/magic/Magdir/images
similarity index 75%
rename from contrib/file/Magdir/images
rename to contrib/file/magic/Magdir/images
index 1d4a0232a902..fe04b49be96a 100644
--- a/contrib/file/Magdir/images
+++ b/contrib/file/magic/Magdir/images
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: images,v 1.72 2011/12/08 12:12:46 rrt Exp $
+# $File: images,v 1.91 2014/04/30 21:41:02 christos Exp $
 # images:  file(1) magic for image formats (see also "iff", and "c-lang" for
 # XPM bitmaps)
 #
@@ -18,31 +18,59 @@
 # `xv' recognizes only a subset of the following (RGB with pixelsize = 24)
 # `tgatoppm' recognizes a superset (Index may be anything)
 1	belong&0xfff7ffff	0x01010000	Targa image data - Map
+!:strength + 2
 >2	byte&8			8		- RLE
->12	leshort			>0		%hd x
->14	leshort			>0		%hd
+>12	leshort			>0		%d x
+>14	leshort			>0		%d
 1	belong&0xfff7ffff	0x00020000	Targa image data - RGB
+!:strength + 2
 >2	byte&8			8		- RLE
->12	leshort			>0		%hd x
->14	leshort			>0		%hd
+>12	leshort			>0		%d x
+>14	leshort			>0		%d
 1	belong&0xfff7ffff	0x00030000	Targa image data - Mono
+!:strength + 2
 >2	byte&8			8		- RLE
->12	leshort			>0		%hd x
->14	leshort			>0		%hd
+>12	leshort			>0		%d x
+>14	leshort			>0		%d
 
 # PBMPLUS images
 # The next byte following the magic is always whitespace.
-0	search/1	P1		Netpbm PBM image text
+# strength is changed to try these patterns before "x86 boot sector"
+0	search/1	P1		
+>3	regex		=[0-9]{0,50}\ [0-9]{0,50}		Netpbm PBM image text
+>3	regex		=[0-9]{1,50}\ 		\b, size = %sx
+>>3	regex		=\ [0-9]{1,50}	\b%s
+!:strength + 45
 !:mime	image/x-portable-bitmap
-0	search/1b	P2		Netpbm PGM image text
+0	search/1	P2		
+>3	regex		=[0-9]{0,50}\ [0-9]{0,50}		Netpbm PGM image text
+>3	regex		=[0-9]{1,50}\ 		\b, size = %sx
+>>3	regex		=\ [0-9]{1,50}	\b%s
+!:strength + 45
 !:mime	image/x-portable-greymap
-0	search/1	P3		Netpbm PPM image text
+0	search/1	P3
+>3	regex		=[0-9]{0,50}\ [0-9]{0,50}		Netpbm PPM image text
+>3	regex		=[0-9]{1,50}\ 		\b, size = %sx
+>>3	regex		=\ [0-9]{1,50}	\b%s
+!:strength + 45
 !:mime	image/x-portable-pixmap
-0	string		P4		Netpbm PBM "rawbits" image data
+0	string		P4		
+>3	regex		=[0-9]{0,50}\ [0-9]{0,50}		Netpbm PBM "rawbits" image data
+>3	regex		=[0-9]{1,50}\ 		\b, size = %sx
+>>3	regex		=\ [0-9]{1,50}	\b%s
+!:strength + 45
 !:mime	image/x-portable-bitmap
-0	string		P5		Netpbm PGM "rawbits" image data
+0	string		P5		
+>3	regex		=[0-9]{0,50}\ [0-9]{0,50}		Netpbm PGM "rawbits" image data
+>3	regex		=[0-9]{1,50}\ 		\b, size = %sx
+>>3	regex		=\ [0-9]{1,50}	\b%s
+!:strength + 45
 !:mime	image/x-portable-greymap
-0	string		P6		Netpbm PPM "rawbits" image data
+0	string		P6		
+>3	regex		=[0-9]{0,50}\ [0-9]{0,50}		Netpbm PPM "rawbits" image data
+>3	regex		=[0-9]{1,50}\ 		\b, size = %sx
+>>3	regex		=\ [0-9]{1,50}	\b%s
+!:strength + 45
 !:mime	image/x-portable-pixmap
 0	string		P7		Netpbm PAM image file
 !:mime	image/x-portable-pixmap
@@ -103,8 +131,8 @@
 #
 0	string		\x89PNG\x0d\x0a\x1a\x0a		PNG image data
 !:mime	image/png
->16	belong		x		\b, %ld x
->20	belong		x		%ld,
+>16	belong		x		\b, %d x
+>20	belong		x		%d,
 >24	byte		x		%d-bit
 >25	byte		0		grayscale,
 >25	byte		2		\b/color RGB,
@@ -139,8 +167,8 @@
 !:apple	8BIMGIFf
 >4	string		7a		\b, version 8%s,
 >4	string		9a		\b, version 8%s,
->6	leshort		>0		%hd x
->8	leshort		>0		%hd
+>6	leshort		>0		%d x
+>8	leshort		>0		%d
 #>10	byte		&0x80		color mapped,
 #>10	byte&0x07	=0x00		2 colors
 #>10	byte&0x07	=0x01		4 colors
@@ -203,8 +231,36 @@
 # From: Herbert Rosmanith <herp@wildsau.idv.uni.linz.at>
 0	string		Sfff		structured fax file
 
+# From: Joerg Jenderek <joerg.jen.der.ek@gmx.net>
+# most files with the extension .EPA and some with .BMP
+0	string		\x11\x06	Award BIOS Logo, 136 x 84
+!:mime	image/x-award-bioslogo
+0	string		\x11\x09	Award BIOS Logo, 136 x 126
+!:mime	image/x-award-bioslogo
+#0	string		\x07\x1f	BIOS Logo corrupted?
+# http://www.blackfiveservices.co.uk/awbmtools.shtml
+# http://biosgfx.narod.ru/v3/
+# http://biosgfx.narod.ru/abr-2/
+0	string		AWBM		
+>4	leshort		<1981		Award BIOS bitmap
+!:mime	image/x-award-bmp
+# image width is a multiple of 4
+>>4	leshort&0x0003	0		
+>>>4		leshort	x		\b, %d
+>>>6		leshort	x		x %d
+>>4	leshort&0x0003	>0		\b,
+>>>4	leshort&0x0003	=1		
+>>>>4		leshort	x		%d+3
+>>>4	leshort&0x0003	=2		
+>>>>4		leshort	x		%d+2
+>>>4	leshort&0x0003	=3		
+>>>>4		leshort	x		%d+1
+>>>6		leshort	x		x %d
+# at offset 8 starts imagedata followed by "RGB " marker
 
 # PC bitmaps (OS/2, Windows BMP files)  (Greg Roelofs, newt@uchicago.edu)
+# http://en.wikipedia.org/wiki/BMP_file_format#DIB_header_.\
+# 28bitmap_information_header.29
 0	string		BM
 >14	leshort		12		PC bitmap, OS/2 1.x format
 !:mime	image/x-ms-bmp
@@ -219,6 +275,16 @@
 >>18	lelong		x		\b, %d x
 >>22	lelong		x		%d x
 >>28	leshort		x		%d
+>14	leshort		124		PC bitmap, Windows 98/2000 and newer format
+!:mime	image/x-ms-bmp
+>>18	lelong		x		\b, %d x
+>>22	lelong		x		%d x
+>>28	leshort		x		%d
+>14	leshort		108		PC bitmap, Windows 95/NT4 and newer format
+!:mime	image/x-ms-bmp
+>>18	lelong		x		\b, %d x
+>>22	lelong		x		%d x
+>>28	leshort		x		%d
 >14	leshort		128		PC bitmap, Windows NT/2000 format
 !:mime	image/x-ms-bmp
 >>18	lelong		x		\b, %d x
@@ -376,7 +442,7 @@
 >5	byte	0x00		(white background)
 >5	byte	0xFF		(black background)
 
-# Gürkan Sengün <gurkan@linuks.mine.nu>, www.linuks.mine.nu
+# Gurkan Sengun <gurkan@linuks.mine.nu>, www.linuks.mine.nu
 # http://www.atarimax.com/jindroush.atari.org/afmtatr.html
 0	leshort	0x0296		Atari ATR image
 
@@ -401,38 +467,39 @@
 #>12	beshort	3		RP175
 #>12	beshort	4		YUV
 
-#------------------------------------------------------------------------------
-#
-# Marco Schmidt (marcoschmidt@users.sourceforge.net) -- an image  file format
-# for the EPOC operating system, which is used with PDAs like those from Psion
-#
-# see http://huizen.dds.nl/~frodol/psiconv/html/Index.html for a description
-# of various EPOC file formats
-
-0	string \x37\x00\x00\x10\x42\x00\x00\x10\x00\x00\x00\x00\x39\x64\x39\x47 EPOC MBM image file
-
 # PCX image files
 # From: Dan Fandrich <dan@coneharvesters.com>
-0	beshort		0x0a00	PCX ver. 2.5 image data
-0	beshort		0x0a02	PCX ver. 2.8 image data, with palette
-0	beshort		0x0a03	PCX ver. 2.8 image data, without palette
-0	beshort		0x0a04	PCX for Windows image data
-0	beshort		0x0a05	PCX ver. 3.0 image data
->4	leshort		x      bounding box [%hd,
->6	leshort		x      %hd] -
->8	leshort		x      [%hd,
->10	leshort		x      %hd],
->65	byte		>1	%d planes each of
->3	byte		x	%hhd-bit
->68	byte		0	image,
->68	byte		1	colour,
->68	byte		2	grayscale,
->68	byte		>2	image,
->68	byte		<0	image,
->12	leshort		>0	%hd x
->>14	leshort		x      %hd dpi,
->2	byte		0	uncompressed
->2	byte		1	RLE compressed
+# updated by Joerg Jenderek at Feb 2013 by http://de.wikipedia.org/wiki/PCX
+# http://web.archive.org/web/20100206055706/http://www.qzx.com/pc-gpe/pcx.txt
+# GRR: original test was still too general as it catches xbase examples T5.DBT,T6.DBT with 0xa000000
+# test for bytes 0x0a,version byte (0,2,3,4,5),compression byte flag(0,1), bit depth (>0) of PCX or T5.DBT,T6.DBT
+0	ubelong&0xffF8fe00	0x0a000000	
+# for PCX bit depth > 0 
+>3	ubyte		>0	
+# test for valid versions
+>>1	ubyte		<6	
+>>>1	ubyte		!1	PCX
+!:mime	image/x-pcx
+#!:mime	image/pcx
+>>>>1	ubyte		0	ver. 2.5 image data
+>>>>1	ubyte		2	ver. 2.8 image data, with palette
+>>>>1	ubyte		3	ver. 2.8 image data, without palette
+>>>>1	ubyte		4	for Windows image data
+>>>>1	ubyte		5	ver. 3.0 image data
+>>>>4	uleshort	x	bounding box [%d,
+>>>>6	uleshort	x	%d] -
+>>>>8	uleshort	x	[%d,
+>>>>10	uleshort	x	%d],
+>>>>65	ubyte		>1	%d planes each of
+>>>>3	ubyte		x	%d-bit
+>>>>68	byte		1	colour,
+>>>>68	byte		2	grayscale,
+# this should not happen
+>>>>68	default		x	image,
+>>>>12	leshort		>0	%d x
+>>>>>14	uleshort	x	%d dpi,
+>>>>2	byte		0	uncompressed
+>>>>2	byte		1	RLE compressed
 
 # Adobe Photoshop
 # From: Asbjoern Sloth Toennesen <asbjorn@lila.io>
@@ -554,7 +621,7 @@
 # Author: Hans-Joachim Baader <hjb@pro-linux.de>
 0		string	PaRtImAgE-VoLuMe	PartImage
 >0x0020		string	0.6.1		file version %s
->>0x0060	lelong	>-1		volume %ld
+>>0x0060	lelong	>-1		volume %d
 #>>0x0064 8 byte identifier
 #>>0x007c reserved
 >>0x0200	string	>\0		type %s
@@ -577,8 +644,8 @@
 # Kodak Cineon format for scanned negatives
 # http://www.kodak.com/US/en/motion/support/dlad/
 0	lelong  0xd75f2a80	Cineon image data
->200	belong  >0		\b, %ld x
->204	belong  >0		%ld
+>200	belong  >0		\b, %d x
+>204	belong  >0		%d
 
 
 # Bio-Rad .PIC is an image format used by microscope control systems
@@ -590,10 +657,10 @@
 14	leshort <2
 >62	leshort <2
 >>54	leshort 12345		Bio-Rad .PIC Image File
->>>0	leshort >0		%hd x
->>>2	leshort >0		%hd,
+>>>0	leshort >0		%d x
+>>>2	leshort >0		%d,
 >>>4	leshort =1		1 image in file
->>>4	leshort >1		%hd images in file
+>>>4	leshort >1		%d images in file
 
 # From Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 # The description of *.mrw format can be found at
@@ -615,9 +682,61 @@
 >12	string	THUM		DjVu page thumbnails
 !:mime	image/vnd.djvu
 
+# Originally by Marc Espie
+# Modified by Robert Minsk <robertminsk at yahoo.com>
+# http://www.openexr.com/openexrfilelayout.pdf
+0	lelong		20000630	OpenEXR image data,
+!:mime image/x-exr
+>4	lelong&0x000000ff x		version %d,
+>4	lelong		^0x00000200	storage: scanline
+>4	lelong		&0x00000200	storage: tiled
+>8	search/0x1000	compression\0	\b, compression:
+>>&16	byte		0		none
+>>&16	byte		1		rle
+>>&16	byte		2		zips
+>>&16	byte		3		zip
+>>&16	byte		4		piz
+>>&16	byte		5		pxr24
+>>&16	byte		6		b44
+>>&16	byte		7		b44a
+>>&16	byte		>7		unknown
+>8	 search/0x1000	dataWindow\0	\b, dataWindow:
+>>&10	lelong		x		(%d
+>>&14	lelong		x		%d)-
+>>&18	lelong		x		\b(%d
+>>&22	lelong		x		%d)
+>8	search/0x1000	displayWindow\0	\b, displayWindow:
+>>&10	lelong		x		(%d
+>>&14	lelong		x		%d)-
+>>&18	lelong		x		\b(%d
+>>&22	lelong		x		%d)
+>8	search/0x1000	lineOrder\0	 \b, lineOrder:
+>>&14	byte		0		increasing y
+>>&14	byte		1		decreasing y
+>>&14	byte		2		random y
+>>&14	byte		>2		unknown
 
-# From Marc Espie
-0	lelong	20000630		OpenEXR image data
+# SMPTE Digital Picture Exchange Format, SMPTE DPX
+#
+# ANSI/SMPTE 268M-1994, SMPTE Standard for File Format for Digital
+# Moving-Picture Exchange (DPX), v1.0, 18 February 1994
+# Robert Minsk <robertminsk at yahoo.com>
+0	string		SDPX	DPX image data, big-endian,
+!:mime image/x-dpx
+>768	beshort		<4
+>>772	belong		x	%dx
+>>776	belong		x	\b%d,
+>768	beshort		>3
+>>776	belong		x	%dx
+>>772	belong		x	\b%d,
+>768	beshort		0	left to right/top to bottom
+>768	beshort		1	right to left/top to bottom
+>768	beshort		2	left to right/bottom to top
+>768	beshort		3	right to left/bottom to top
+>768	beshort		4	top to bottom/left to right
+>768	beshort		5	top to bottom/right to left
+>768	leshort		6	bottom to top/left to right
+>768	leshort		7	bottom to top/right to left
 
 # From: Tom Hilinski <tom.hilinski@comcast.net>
 # http://www.unidata.ucar.edu/packages/netcdf/
@@ -630,6 +749,15 @@
 !:mime	application/x-hdf
 0	string	\211HDF\r\n\032\n	Hierarchical Data Format (version 5) data
 !:mime	application/x-hdf
+512	string	\211HDF\r\n\032\n	Hierarchical Data Format (version 5) with 512 bytes user block
+!:mime	application/x-hdf
+1024	string	\211HDF\r\n\032\n	Hierarchical Data Format (version 5) with 1k user block
+!:mime	application/x-hdf
+2048	string	\211HDF\r\n\032\n	Hierarchical Data Format (version 5) with 2k user block
+!:mime	application/x-hdf
+4096	string	\211HDF\r\n\032\n	Hierarchical Data Format (version 5) with 4k user block
+!:mime	application/x-hdf
+
 
 # From: Tobias Burnus <burnus@net-b.de>
 # Xara (for a while: Corel Xara) is a graphic package, see
@@ -665,11 +793,40 @@
 # From Tano M Fotang <mfotang@quanteq.com>
 0	string	\xff\xa0\xff\xa8\x00	Wavelet Scalar Quantization image data
 
-# JPEG 2000 Code Stream Bitmap
-# From Petr Splichal <psplicha@redhat.com>
-0	string	\xFF\x4F\xFF\x51\x00	JPEG-2000 Code Stream Bitmap data
+# Type:		PCO B16 image files
+# URL:		http://www.pco.de/fileadmin/user_upload/db/download/MA_CWDCOPIE_0412b.pdf
+# From:		Florian Philipp <florian.philipp@binarywings.net>
+# Extension:	.b16
+# Description:	Pixel image format produced by PCO Camware, typically used
+#		together with PCO cameras.
+# Note:		Different versions exist for e.g. 8 bit and 16 bit images.
+#		Documentation is incomplete.
+0	string/b	PCO-	PCO B16 image data
+>12	lelong		x	\b, %dx
+>16	lelong		x	\b%d
+>20	lelong		0	\b, short header
+>20	lelong		-1	\b, extended header
+>>24	lelong		0	\b, grayscale
+>>>36	lelong		0	linear LUT
+>>>36	lelong		1	logarithmic LUT
+>>>28	lelong		x	[%d
+>>>32	lelong		x	\b,%d]
+>>24	lelong		1	\b, color
+>>>64	lelong		0	linear LUT
+>>>64	lelong		1	logarithmic LUT
+>>>40	lelong		x	r[%d
+>>>44	lelong		x	\b,%d]
+>>>48	lelong		x	g[%d
+>>>52	lelong		x	\b,%d]
+>>>56	lelong		x	b[%d
+>>>60	lelong		x	\b,%d]
 
-# From: Rick Richardson <rick.richardson@comcast.net>
+# Polar Monitor Bitmap (.pmb) used as logo for Polar Electro watches
+# From: Markus Heidelberg <markus.heidelberg at web.de>
+0	string/t	[BitmapInfo2]	Polar Monitor Bitmap text
+!:mime	image/x-polar-monitor-bitmap
+
+# From: Rick Richardson <rickrich@gmail.com>
 0	string	GARMIN\ BITMAP\ 01	Garmin Bitmap file
 
 # Type:	Ulead Photo Explorer5 (.pe5)
@@ -733,3 +890,8 @@
 # Not really an image.
 # From: "Tano M. Fotang" <mfotang@quanteq.com>
 0	string	\x46\x4d\x52\x00	ISO/IEC 19794-2 Format Minutiae Record (FMR)
+
+# WEBP https://developers.google.com/speed/webp/docs/riff_container
+0	string	RIFF
+>8	string	WEBP	Web/P image data
+>>4	lelong	x	\b, %d bytes
diff --git a/contrib/file/Magdir/inform b/contrib/file/magic/Magdir/inform
similarity index 100%
rename from contrib/file/Magdir/inform
rename to contrib/file/magic/Magdir/inform
diff --git a/contrib/file/Magdir/intel b/contrib/file/magic/Magdir/intel
similarity index 86%
rename from contrib/file/Magdir/intel
rename to contrib/file/magic/Magdir/intel
index 47812a0ea351..9fa90f478449 100644
--- a/contrib/file/Magdir/intel
+++ b/contrib/file/magic/Magdir/intel
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: intel,v 1.10 2011/03/30 19:51:00 christos Exp $
+# $File: intel,v 1.12 2014/04/30 21:41:02 christos Exp $
 # intel:  file(1) magic for x86 Unix
 #
 # Various flavors of x86 UNIX executable/object (other than Xenix, which
@@ -16,28 +16,28 @@
 #
 0	leshort		0502		basic-16 executable
 >12	lelong		>0		not stripped
-#>22	leshort		>0		- version %ld
+#>22	leshort		>0		- version %d
 0	leshort		0503		basic-16 executable (TV)
 >12	lelong		>0		not stripped
-#>22	leshort		>0		- version %ld
+#>22	leshort		>0		- version %d
 0	leshort		0510		x86 executable
 >12	lelong		>0		not stripped
 0	leshort		0511		x86 executable (TV)
 >12	lelong		>0		not stripped
 0	leshort		=0512		iAPX 286 executable small model (COFF)
 >12	lelong		>0		not stripped
-#>22	leshort		>0		- version %ld
+#>22	leshort		>0		- version %d
 0	leshort		=0522		iAPX 286 executable large model (COFF)
 >12	lelong		>0		not stripped
-#>22	leshort		>0		- version %ld
+#>22	leshort		>0		- version %d
 # SGI labeled the next entry as "iAPX 386 executable" --Dan Quinlan
 0	leshort		=0514		80386 COFF executable
 >12	lelong		>0		not stripped
->22	leshort		>0		- version %ld
+>22	leshort		>0		- version %d
 
 # rom: file(1) magic for BIOS ROM Extensions found in intel machines
 #      mapped into memory between 0xC0000 and 0xFFFFF
-# From Gürkan Sengün <gurkan@linuks.mine.nu>, www.linuks.mine.nu
+# From Gurkan Sengun <gurkan@linuks.mine.nu>, www.linuks.mine.nu
 0        beshort         0x55AA       BIOS (ia32) ROM Ext.
 >5       string          USB          USB
 >7       string          LDR          UNDI image
diff --git a/contrib/file/Magdir/interleaf b/contrib/file/magic/Magdir/interleaf
similarity index 100%
rename from contrib/file/Magdir/interleaf
rename to contrib/file/magic/Magdir/interleaf
diff --git a/contrib/file/Magdir/island b/contrib/file/magic/Magdir/island
similarity index 100%
rename from contrib/file/Magdir/island
rename to contrib/file/magic/Magdir/island
diff --git a/contrib/file/Magdir/ispell b/contrib/file/magic/Magdir/ispell
similarity index 100%
rename from contrib/file/Magdir/ispell
rename to contrib/file/magic/Magdir/ispell
diff --git a/contrib/file/Magdir/isz b/contrib/file/magic/Magdir/isz
similarity index 89%
rename from contrib/file/Magdir/isz
rename to contrib/file/magic/Magdir/isz
index 316bbd4acf69..3388a82a5b9d 100644
--- a/contrib/file/Magdir/isz
+++ b/contrib/file/magic/Magdir/isz
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: isz,v 1.1 2010/03/27 16:17:09 christos Exp $
+# $File: isz,v 1.3 2014/04/30 21:41:02 christos Exp $
 # ISO Zipped file format 
 # http://www.ezbsystems.com/isz/iszspec.txt
 0	string	IsZ!	ISO Zipped file
diff --git a/contrib/file/Magdir/java b/contrib/file/magic/Magdir/java
similarity index 63%
rename from contrib/file/Magdir/java
rename to contrib/file/magic/Magdir/java
index 0aca86a5e19a..b09302ee65d5 100644
--- a/contrib/file/Magdir/java
+++ b/contrib/file/magic/Magdir/java
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------
-# $File: java,v 1.13 2011/12/08 12:12:46 rrt Exp $
+# $File: java,v 1.16 2013/09/24 20:22:03 christos Exp $
 # Java ByteCode and Mach-O binaries (e.g., Mac OS X) use the
 # same magic number, 0xcafebabe, so they are both handled
 # in the entry called "cafebabe".
@@ -15,15 +15,6 @@
 0	belong		0xcececece	Java JCE KeyStore
 !:mime	application/x-java-jce-keystore
 
-# Dalvik .dex format. http://retrodev.com/android/dexformat.html
-# From <mkf@google.com> "Mike Fleming"
-0	string	dex\n
->0	regex	dex\n[0-9][0-9][0-9]\0	Dalvik dex file
->4	string	>000			version %s
-0	string	dey\n
->0	regex	dey\n[0-9][0-9][0-9]\0	Dalvik dex file (optimized for host)
->4	string	>000			version %s
-
 # Java source
 0	regex	^import.*;$	Java source
 !:mime	text/x-java
diff --git a/contrib/file/magic/Magdir/javascript b/contrib/file/magic/Magdir/javascript
new file mode 100644
index 000000000000..8f664533a1fb
--- /dev/null
+++ b/contrib/file/magic/Magdir/javascript
@@ -0,0 +1,17 @@
+
+#------------------------------------------------------------------------------
+# $File: javascript,v 1.1 2012/06/16 13:30:36 christos Exp $
+# javascript:  magic for javascript and node.js scripts.
+#
+0	search/1/w	#!/bin/node		Node.js script text executable
+!:mime application/javascript
+0	search/1/w	#!/usr/bin/node		Node.js script text executable
+!:mime application/javascript
+0	search/1/w	#!/bin/nodejs		Node.js script text executable
+!:mime application/javascript
+0	search/1/w	#!/usr/bin/nodejs	Node.js script text executable
+!:mime application/javascript
+0	search/1	#!/usr/bin/env\ node	Node.js script text executable
+!:mime application/javascript
+0	search/1	#!/usr/bin/env\ nodejs	Node.js script text executable
+!:mime application/javascript
diff --git a/contrib/file/Magdir/jpeg b/contrib/file/magic/Magdir/jpeg
similarity index 90%
rename from contrib/file/Magdir/jpeg
rename to contrib/file/magic/Magdir/jpeg
index 7814245add34..bc8b34266434 100644
--- a/contrib/file/Magdir/jpeg
+++ b/contrib/file/magic/Magdir/jpeg
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: jpeg,v 1.16 2011/01/04 19:29:32 rrt Exp $
+# $File: jpeg,v 1.19 2013/02/04 15:50:03 christos Exp $
 # JPEG images
 # SunOS 5.5.1 had
 #
@@ -12,7 +12,7 @@
 0	beshort		0xffd8		JPEG image data
 !:mime	image/jpeg
 !:apple	8BIMJPEG
-!:strength +1
+!:strength +2
 >6	string		JFIF		\b, JFIF standard
 # The following added by Erik Rossen <rossen@freesurf.ch> 1999-09-06
 # in a vain attempt to add image size reporting for JFIF.  Note that these
@@ -153,7 +153,20 @@
 0	string		hsi1		JPEG image data, HSI proprietary
 
 # From: David Santinoli <david@santinoli.com>
-0	string		\x00\x00\x00\x0C\x6A\x50\x20\x20\x0D\x0A\x87\x0A	JPEG 2000 image data
+0	string		\x00\x00\x00\x0C\x6A\x50\x20\x20\x0D\x0A\x87\x0A	JPEG 2000
+# From: Johan van der Knijff <johan.vanderknijff@kb.nl>
+# Added sub-entries for JP2, JPX, JPM and MJ2 formats; added mimetypes
+# https://github.com/bitsgalore/jp2kMagic
+#
+# Now read value of 'Brand' field, which yields a few possibilities:
+>20	string		\x6a\x70\x32\x20	Part 1 (JP2)
+!:mime	image/jp2
+>20	string		\x6a\x70\x78\x20	Part 2 (JPX)
+!:mime	image/jpx
+>20	string		\x6a\x70\x6d\x20	Part 6 (JPM)
+!:mime	image/jpm
+>20	string		\x6d\x6a\x70\x32	Part 3 (MJ2)
+!:mime	video/mj2
 
 # Type: JPEG 2000 codesream
 # From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
diff --git a/contrib/file/Magdir/karma b/contrib/file/magic/Magdir/karma
similarity index 74%
rename from contrib/file/Magdir/karma
rename to contrib/file/magic/Magdir/karma
index 007a4b74b220..47d5d97304a8 100644
--- a/contrib/file/Magdir/karma
+++ b/contrib/file/magic/Magdir/karma
@@ -1,9 +1,9 @@
 
 #------------------------------------------------------------------------------
-# $File: karma,v 1.6 2009/09/19 16:28:10 christos Exp $
+# $File: karma,v 1.7 2014/04/30 21:41:02 christos Exp $
 # karma:  file(1) magic for Karma data files
 #
 # From <rgooch@atnf.csiro.au>
 
 0	string		KarmaRHD Version	Karma Data Structure Version
->16	belong		x		%lu
+>16	belong		x		%u
diff --git a/contrib/file/Magdir/kde b/contrib/file/magic/Magdir/kde
similarity index 100%
rename from contrib/file/Magdir/kde
rename to contrib/file/magic/Magdir/kde
diff --git a/contrib/file/magic/Magdir/keepass b/contrib/file/magic/Magdir/keepass
new file mode 100644
index 000000000000..ba132d57de83
--- /dev/null
+++ b/contrib/file/magic/Magdir/keepass
@@ -0,0 +1,20 @@
+
+#------------------------------------------------------------------------------
+# $File: keepass,v 1.1 2012/12/24 22:14:56 christos Exp $
+# keepass: file(1) magic for KeePass file
+#
+# Keepass Password Safe:
+#  * original one: http://keepass.info/
+#  * *nix port:    http://www.keepassx.org/
+#  * android port: http://code.google.com/p/keepassdroid/
+
+0	lelong		0x9AA2D903	Keepass password database
+>4	lelong		0xB54BFB65	1.x KDB
+>>48	lelong		>0		\b, %d groups
+>>52	lelong		>0		\b, %d entries
+>>8	lelong&0x0f	1		\b, SHA-256
+>>8	lelong&0x0f	2		\b, AES
+>>8	lelong&0x0f	4		\b, RC4
+>>8	lelong&0x0f	8		\b, Twofish
+>>120	lelong		>0		\b, %d key transformation rounds
+>4	lelong		0xB54BFB67	2.x KDBX
diff --git a/contrib/file/Magdir/kml b/contrib/file/magic/Magdir/kml
similarity index 100%
rename from contrib/file/Magdir/kml
rename to contrib/file/magic/Magdir/kml
diff --git a/contrib/file/Magdir/lecter b/contrib/file/magic/Magdir/lecter
similarity index 100%
rename from contrib/file/Magdir/lecter
rename to contrib/file/magic/Magdir/lecter
diff --git a/contrib/file/Magdir/lex b/contrib/file/magic/Magdir/lex
similarity index 100%
rename from contrib/file/Magdir/lex
rename to contrib/file/magic/Magdir/lex
diff --git a/contrib/file/Magdir/lif b/contrib/file/magic/Magdir/lif
similarity index 100%
rename from contrib/file/Magdir/lif
rename to contrib/file/magic/Magdir/lif
diff --git a/contrib/file/Magdir/linux b/contrib/file/magic/Magdir/linux
similarity index 82%
rename from contrib/file/Magdir/linux
rename to contrib/file/magic/Magdir/linux
index 8d4c60adfd9e..c2b17627b4e6 100644
--- a/contrib/file/Magdir/linux
+++ b/contrib/file/magic/Magdir/linux
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: linux,v 1.42 2012/02/07 21:35:03 christos Exp $
+# $File: linux,v 1.57 2014/05/20 20:10:17 christos Exp $
 # linux:  file(1) magic for Linux files
 #
 # Values for Linux/i386 binaries, from Daniel Quinlan <quinlan@yggdrasil.com>
@@ -36,8 +36,11 @@
 >28	long		!0		not stripped
 0	string		\01\03\040\20	Minix-386 executable
 >28	long		!0		not stripped
+0	string		\01\03\04\20	Minix-386 NSYM/GNU executable
+>28	long		!0		not stripped
 # core dump file, from Bill Reynolds <bill@goshawk.lanl.gov>
 216	lelong		0421		Linux/i386 core file
+!:strength / 2
 >220	string		>\0		of '%s'
 >200	lelong		>0		(signal %d)
 #
@@ -46,7 +49,10 @@
 2	string		LILO		Linux/i386 LILO boot/chain loader
 #
 # Linux make config build file, from Ole Aamot <oka@oka.no>
-28 	string		make\ config	Linux make config build file
+# Updated by Ken Sharp
+28	string		make\ config		Linux make config build file (old)
+49	search/70	Kernel\ Configuration	Linux make config build file
+
 #
 # PSF fonts, from H. Peter Anvin <hpa@yggdrasil.com>
 # Updated by Adam Buchbinder <adam.buchbinder@gmail.com>
@@ -88,18 +94,21 @@
 # From Daniel Novotny <dnovotny@redhat.com>
 # swap file for PowerPC
 65526	string		SWAPSPACE2	Linux/ppc swap file
+16374	string		SWAPSPACE2	Linux/ia64 swap file
 #
 # Linux kernel boot images, from Albert Cahalan <acahalan@cs.uml.edu>
 # and others such as Axel Kohlmeyer <akohlmey@rincewind.chemie.uni-ulm.de>
-# and Nicol�s Lichtmaier <nick@debian.org>
+# and Nicolas Lichtmaier <nick@debian.org>
 # All known start with: b8 c0 07 8e d8 b8 00 90 8e c0 b9 00 01 29 f6 29
 # Linux kernel boot images (i386 arch) (Wolfram Kleff)
 514	string		HdrS		Linux kernel
+!:strength + 55
 >510	leshort		0xAA55		x86 boot executable
 >>518	leshort		>0x1ff
 >>>529	byte		0		zImage,
 >>>529	byte		1		bzImage,
->>>(526.s+0x200) string	>\0		version %s,
+>>>526	lelong		>0
+>>>>(526.s+0x200) string	>\0	version %s,
 >>498	leshort		1		RO-rootFS,
 >>498	leshort		0		RW-rootFS,
 >>508	leshort		>0		root_dev 0x%X,
@@ -114,10 +123,10 @@
 >0x1e3		string	Loading		version 1.3.79 or older
 >0x1e9		string	Loading		from prehistoric times
 
-# System.map files - Nicol�s Lichtmaier <nick@debian.org>
+# System.map files - Nicolas Lichtmaier <nick@debian.org>
 8	search/1	\ A\ _text	Linux kernel symbol map text
 
-# LSM entries - Nicol�s Lichtmaier <nick@debian.org>
+# LSM entries - Nicolas Lichtmaier <nick@debian.org>
 0	search/1	Begin3	Linux Software Map entry text
 0	search/1	Begin4	Linux Software Map entry text (new format)
 
@@ -213,9 +222,11 @@
 # 0	lelong&0xFF00FFFF 0x17000301	ld86 SPARC executable
 
 # SYSLINUX boot logo files (from 'ppmtolss16' sources)
-# http://syslinux.zytor.com/
-#
+# http://www.syslinux.org/wiki/index.php/SYSLINUX#Display_graphic_from_filename:
+# file extension .lss .16
 0	lelong	=0x1413f33d		SYSLINUX' LSS16 image data
+# syslinux-4.05/mime/image/x-lss16.xml
+!:mime image/x-lss16
 >4	leshort	x			\b, width %d
 >6	leshort	x			\b, height %d
 
@@ -338,3 +349,67 @@
 #>2	regex		\(name\ [^)]*\)		%s
 >20	search/256	(name			(name
 >>&1	string		x			%s...)
+
+# Systemd journald files
+# See http://www.freedesktop.org/wiki/Software/systemd/journal-files/.
+# From: Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl>
+
+# check magic
+0	string	LPKSHHRH
+# check that state is one of known values
+>16		ubyte&252	0
+# check that each half of three unique id128s is non-zero
+>>24		ubequad		>0
+>>>32		ubequad		>0
+>>>>40		ubequad		>0
+>>>>>48		ubequad		>0
+>>>>>>56	ubequad		>0
+>>>>>>>64	ubequad		>0	Journal file
+!:mime application/octet-stream
+# provide more info
+>>>>>>>>184	leqdate		0	empty
+>>>>>>>>16	ubyte		0	\b, offline
+>>>>>>>>16	ubyte		1	\b, online
+>>>>>>>>16	ubyte		2	\b, archived
+>>>>>>>>8	ulelong&1	1	\b, sealed
+>>>>>>>>12	ulelong&1	1	\b, compressed
+
+# BCache backing and cache devices
+# From: Gabriel de Perthuis <g2p.code@gmail.com>
+0x1008		lequad		8
+>0x1018		string		\xc6\x85\x73\xf6\x4e\x1a\x45\xca\x82\x65\xf5\x7f\x48\xba\x6d\x81	BCache
+>>0x1010	ulequad		0	cache device
+>>0x1010	ulequad		1	backing device
+>>0x1010	ulequad		3	cache device
+>>0x1010	ulequad		4	backing device
+>>0x1048	string		>0	\b, label "%.32s"
+>>0x1028	ubelong		x	\b, uuid %08x
+>>0x102c	ubeshort	x	\b-%04x
+>>0x102e	ubeshort	x	\b-%04x
+>>0x1030	ubeshort	x	\b-%04x
+>>0x1032	ubelong		x	\b-%08x
+>>0x1036	ubeshort	x	\b%04x
+>>0x1038	ubelong		x	\b, set uuid %08x
+>>0x103c	ubeshort	x	\b-%04x
+>>0x103e	ubeshort	x	\b-%04x
+>>0x1040	ubeshort	x	\b-%04x
+>>0x1042	ubelong		x	\b-%08x
+>>0x1046	ubeshort	x	\b%04x
+
+# Linux device tree:
+# File format description can be found in the Linux kernel sources at 
+# Documentation/devicetree/booting-without-of.txt
+# From Christoph Biedl
+0		belong		0xd00dfeed
+# structure and strings must be within blob
+>&(8.L)		byte		x
+>>&(12.L)	byte		x
+>>>20		belong		>1	Device Tree Blob version %d
+>>>>4		belong		x	\b, size=%d
+>>>>20		belong		>1
+>>>>>28		belong		x	\b, boot CPU=%d
+>>>>20		belong		>2
+>>>>>32		belong		x	\b, string block size=%d
+>>>>20		belong		>16
+>>>>>36		belong		x	\b, DT structure block size=%d
+
diff --git a/contrib/file/Magdir/lisp b/contrib/file/magic/Magdir/lisp
similarity index 100%
rename from contrib/file/Magdir/lisp
rename to contrib/file/magic/Magdir/lisp
diff --git a/contrib/file/Magdir/llvm b/contrib/file/magic/Magdir/llvm
similarity index 55%
rename from contrib/file/Magdir/llvm
rename to contrib/file/magic/Magdir/llvm
index 44a40094036c..1f15eac7b52e 100644
--- a/contrib/file/Magdir/llvm
+++ b/contrib/file/magic/Magdir/llvm
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: llvm,v 1.5 2010/09/20 18:55:20 rrt Exp $
+# $File: llvm,v 1.8 2013/01/12 03:09:51 christos Exp $
 # llvm:  file(1) magic for LLVM byte-codes
 # URL:  http://llvm.org/docs/BitCodeFormat.html
 # From: Al Stone <ahs3@fc.hp.com>
@@ -9,5 +9,13 @@
 0	string	llvc0	LLVM byte-codes, null compression
 0	string	llvc1	LLVM byte-codes, gzip compression
 0	string	llvc2	LLVM byte-codes, bzip2 compression
-0	string	\xde\xc0\x17\x0b	LLVM bitcode, wrapper
-0       string	BC\xc0\xde	LLVM bitcode
+
+0	lelong	0x0b17c0de	LLVM bitcode, wrapper
+# Are these Mach-O ABI values?  They appear to be.
+>16	lelong	0x01000007	x86_64
+>16	lelong	0x00000007	i386
+>16	lelong	0x00000012	ppc
+>16	lelong	0x01000012	ppc64
+>16	lelong 	0x0000000c	arm
+
+0	string	BC\xc0\xde	LLVM IR bitcode
diff --git a/contrib/file/Magdir/lua b/contrib/file/magic/Magdir/lua
similarity index 92%
rename from contrib/file/Magdir/lua
rename to contrib/file/magic/Magdir/lua
index fbb9f09dabf4..4c578be60ff5 100644
--- a/contrib/file/Magdir/lua
+++ b/contrib/file/magic/Magdir/lua
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: lua,v 1.5 2009/09/19 16:28:10 christos Exp $
+# $File: lua,v 1.6 2013/01/09 16:23:17 christos Exp $
 # lua:  file(1) magic for Lua scripting language
 # URL:  http://www.lua.org/
 # From: Reuben Thomas <rrt@sc3d.org>, Seo Sanghyeon <tinuviel@sparcs.kaist.ac.kr>
diff --git a/contrib/file/Magdir/luks b/contrib/file/magic/Magdir/luks
similarity index 100%
rename from contrib/file/Magdir/luks
rename to contrib/file/magic/Magdir/luks
diff --git a/contrib/file/Magdir/m4 b/contrib/file/magic/Magdir/m4
similarity index 100%
rename from contrib/file/Magdir/m4
rename to contrib/file/magic/Magdir/m4
diff --git a/contrib/file/magic/Magdir/mach b/contrib/file/magic/Magdir/mach
new file mode 100644
index 000000000000..23b9f8a12604
--- /dev/null
+++ b/contrib/file/magic/Magdir/mach
@@ -0,0 +1,214 @@
+
+#------------------------------------------------------------
+# $File: mach,v 1.19 2014/04/30 21:41:02 christos Exp $
+# Mach has two magic numbers, 0xcafebabe and 0xfeedface.
+# Unfortunately the first, cafebabe, is shared with
+# Java ByteCode, so they are both handled in the file "cafebabe".
+# The "feedface" ones are handled herein.
+#------------------------------------------------------------
+# if set, it's for the 64-bit version of the architecture
+# yes, this is separate from the low-order magic number bit
+# it's also separate from the "64-bit libraries" bit in the
+# upper 8 bits of the CPU subtype
+
+0	name	mach-o-cpu
+>0	belong&0x01000000	0
+#
+# 32-bit ABIs.
+#
+#				1	vax
+>>0	belong&0x00ffffff	1
+>>>4		belong&0x00ffffff	0	vax
+>>>4		belong&0x00ffffff	1	vax11/780
+>>>4		belong&0x00ffffff	2	vax11/785
+>>>4		belong&0x00ffffff	3	vax11/750
+>>>4		belong&0x00ffffff	4	vax11/730
+>>>4		belong&0x00ffffff	5	uvaxI
+>>>4		belong&0x00ffffff	6	uvaxII
+>>>4		belong&0x00ffffff	7	vax8200
+>>>4		belong&0x00ffffff	8	vax8500
+>>>4		belong&0x00ffffff	9	vax8600
+>>>4		belong&0x00ffffff	10	vax8650
+>>>4		belong&0x00ffffff	11	vax8800
+>>>4		belong&0x00ffffff	12	uvaxIII
+>>>4		belong&0x00ffffff	>12	vax subarchitecture=%d
+>>0	belong&0x00ffffff	2	romp
+>>0	belong&0x00ffffff	3	architecture=3
+>>0	belong&0x00ffffff	4	ns32032
+>>0	belong&0x00ffffff	5	ns32332
+>>0	belong&0x00ffffff	6	m68k
+#				7	x86
+>>0	belong&0x00ffffff	7
+>>>4	belong&0x0000000f	3		i386
+>>>4	belong&0x0000000f	4		i486
+>>>>4	belong&0x00fffff0	0
+>>>>4	belong&0x00fffff0	0x80		\bsx
+>>>4	belong&0x0000000f	5		i586
+>>>4	belong&0x0000000f	6
+>>>>4	belong&0x00fffff0	0		p6
+>>>>4	belong&0x00fffff0	0x10		pentium_pro
+>>>>4	belong&0x00fffff0	0x20		pentium_2_m0x20
+>>>>4	belong&0x00fffff0	0x30		pentium_2_m3
+>>>>4	belong&0x00fffff0	0x40		pentium_2_m0x40
+>>>>4	belong&0x00fffff0	0x50		pentium_2_m5
+>>>>4	belong&0x00fffff0	>0x50		pentium_2_m0x%x
+>>>4	belong&0x0000000f	7		celeron
+>>>>4	belong&0x00fffff0	0x00		\b_m0x%x
+>>>>4	belong&0x00fffff0	0x10		\b_m0x%x
+>>>>4	belong&0x00fffff0	0x20		\b_m0x%x
+>>>>4	belong&0x00fffff0	0x30		\b_m0x%x
+>>>>4	belong&0x00fffff0	0x40		\b_m0x%x
+>>>>4	belong&0x00fffff0	0x50		\b_m0x%x
+>>>>4	belong&0x00fffff0	0x60
+>>>>4	belong&0x00fffff0	0x70		\b_mobile
+>>>>4	belong&0x00fffff0	>0x70		\b_m0x%x
+>>>4	belong&0x0000000f	8		pentium_3
+>>>>4	belong&0x00fffff0	0x00
+>>>>4	belong&0x00fffff0	0x10		\b_m
+>>>>4	belong&0x00fffff0	0x20		\b_xeon
+>>>>4	belong&0x00fffff0	>0x20		\b_m0x%x
+>>>4	belong&0x0000000f	9		pentiumM
+>>>>4	belong&0x00fffff0	0x00
+>>>>4	belong&0x00fffff0	>0x00		\b_m0x%x
+>>>4	belong&0x0000000f	10		pentium_4
+>>>>4	belong&0x00fffff0	0x00
+>>>>4	belong&0x00fffff0	0x10		\b_m
+>>>>4	belong&0x00fffff0	>0x10		\b_m0x%x
+>>>4	belong&0x0000000f	11		itanium
+>>>>4	belong&0x00fffff0	0x00
+>>>>4	belong&0x00fffff0	0x10		\b_2
+>>>>4	belong&0x00fffff0	>0x10		\b_m0x%x
+>>>4	belong&0x0000000f	12		xeon
+>>>>4	belong&0x00fffff0	0x00
+>>>>4	belong&0x00fffff0	0x10		\b_mp
+>>>>4	belong&0x00fffff0	>0x10		\b_m0x%x
+>>>4	belong&0x0000000f	>12		ia32 family=%d
+>>>>4	belong&0x00fffff0	0x00
+>>>>4	belong&0x00fffff0	>0x00		model=%x
+>>0	belong&0x00ffffff	8	mips
+>>>4		belong&0x00ffffff	1	R2300
+>>>4		belong&0x00ffffff	2	R2600
+>>>4		belong&0x00ffffff	3	R2800
+>>>4		belong&0x00ffffff	4	R2000a
+>>>4		belong&0x00ffffff	5	R2000
+>>>4		belong&0x00ffffff	6	R3000a
+>>>4		belong&0x00ffffff	7	R3000
+>>>4		belong&0x00ffffff	>7	subarchitecture=%d
+>>0	belong&0x00ffffff	9	ns32532
+>>0	belong&0x00ffffff	10	mc98000
+>>0	belong&0x00ffffff	11	hppa
+>>>4		belong&0x00ffffff	0	7100
+>>>4		belong&0x00ffffff	1	7100LC
+>>>4		belong&0x00ffffff	>1	subarchitecture=%d
+>>0	belong&0x00ffffff	12	arm
+>>>4		belong&0x00ffffff	0
+>>>4		belong&0x00ffffff	1	subarchitecture=%d
+>>>4		belong&0x00ffffff	2	subarchitecture=%d
+>>>4		belong&0x00ffffff	3	subarchitecture=%d
+>>>4		belong&0x00ffffff	4	subarchitecture=%d
+>>>4		belong&0x00ffffff	5	\b_v4t
+>>>4		belong&0x00ffffff	6	\b_v6
+>>>4		belong&0x00ffffff	7	\b_v5tej
+>>>4		belong&0x00ffffff	8	\b_xscale
+>>>4		belong&0x00ffffff	9	\b_v7
+>>>4		belong&0x00ffffff	10	\b_v7f
+>>>4		belong&0x00ffffff	11	subarchitecture=%d
+>>>4		belong&0x00ffffff	12	\b_v7k
+>>>4		belong&0x00ffffff	>12	subarchitecture=%d
+#				13	m88k
+>>0	belong&0x00ffffff	13
+>>>4		belong&0x00ffffff	0	mc88000
+>>>4		belong&0x00ffffff	1	mc88100
+>>>4		belong&0x00ffffff	2	mc88110
+>>>4		belong&0x00ffffff	>2	mc88000 subarchitecture=%d
+>>0	belong&0x00ffffff	14	SPARC
+>>0	belong&0x00ffffff	15	i860g
+>>0	belong&0x00ffffff	16	alpha
+>>0	belong&0x00ffffff	17	rs6000
+>>0	belong&0x00ffffff	18	ppc
+>>>4		belong&0x00ffffff	0
+>>>4		belong&0x00ffffff	1	\b_601
+>>>4		belong&0x00ffffff	2	\b_602
+>>>4		belong&0x00ffffff	3	\b_603
+>>>4		belong&0x00ffffff	4	\b_603e
+>>>4		belong&0x00ffffff	5	\b_603ev
+>>>4		belong&0x00ffffff	6	\b_604
+>>>4		belong&0x00ffffff	7	\b_604e
+>>>4		belong&0x00ffffff	8	\b_620
+>>>4		belong&0x00ffffff	9	\b_650
+>>>4		belong&0x00ffffff	10	\b_7400
+>>>4		belong&0x00ffffff	11	\b_7450
+>>>4		belong&0x00ffffff	100	\b_970
+>>>4		belong&0x00ffffff	>100	subarchitecture=%d
+>>0	belong&0x00ffffff	>18	architecture=%d
+>0	belong&0x01000000	0x01000000
+#
+# 64-bit ABIs.
+#
+>>0	belong&0x00ffffff	0	64-bit architecture=%d
+>>0	belong&0x00ffffff	1	64-bit architecture=%d
+>>0	belong&0x00ffffff	2	64-bit architecture=%d
+>>0	belong&0x00ffffff	3	64-bit architecture=%d
+>>0	belong&0x00ffffff	4	64-bit architecture=%d
+>>0	belong&0x00ffffff	5	64-bit architecture=%d
+>>0	belong&0x00ffffff	6	64-bit architecture=%d
+>>0	belong&0x00ffffff	7	x86_64
+>>>4		belong&0x00ffffff	0	subarchitecture=%d
+>>>4		belong&0x00ffffff	1	subarchitecture=%d
+>>>4		belong&0x00ffffff	2	subarchitecture=%d
+>>>4		belong&0x00ffffff	3
+>>>4		belong&0x00ffffff	4	\b_arch1
+>>>4		belong&0x00ffffff	>4	subarchitecture=%d
+>>0	belong&0x00ffffff	8	64-bit architecture=%d
+>>0	belong&0x00ffffff	9	64-bit architecture=%d
+>>0	belong&0x00ffffff	10	64-bit architecture=%d
+>>0	belong&0x00ffffff	11	64-bit architecture=%d
+>>0	belong&0x00ffffff	12	64-bit architecture=%d
+>>0	belong&0x00ffffff	13	64-bit architecture=%d
+>>0	belong&0x00ffffff	14	64-bit architecture=%d
+>>0	belong&0x00ffffff	15	64-bit architecture=%d
+>>0	belong&0x00ffffff	16	64-bit architecture=%d
+>>0	belong&0x00ffffff	17	64-bit architecture=%d
+>>0	belong&0x00ffffff	18	ppc64
+>>>4		belong&0x00ffffff	0
+>>>4		belong&0x00ffffff	1		\b_601
+>>>4		belong&0x00ffffff	2		\b_602
+>>>4		belong&0x00ffffff	3		\b_603
+>>>4		belong&0x00ffffff	4		\b_603e
+>>>4		belong&0x00ffffff	5		\b_603ev
+>>>4		belong&0x00ffffff	6		\b_604
+>>>4		belong&0x00ffffff	7		\b_604e
+>>>4		belong&0x00ffffff	8		\b_620
+>>>4		belong&0x00ffffff	9		\b_650
+>>>4		belong&0x00ffffff	10		\b_7400
+>>>4		belong&0x00ffffff	11		\b_7450
+>>>4		belong&0x00ffffff	100		\b_970
+>>>4		belong&0x00ffffff	>100		subarchitecture=%d
+>>0	belong&0x00ffffff	>18	64-bit architecture=%d
+
+
+0	name		mach-o-be
+>0	byte		0xcf		64-bit
+>4	use		mach-o-cpu
+>12	belong		1		object
+>12	belong		2		executable
+>12	belong		3		fixed virtual memory shared library
+>12	belong		4		core
+>12	belong		5		preload executable
+>12	belong		6		dynamically linked shared library
+>12	belong		7		dynamic linker
+>12	belong		8		bundle
+>12	belong		9		dynamically linked shared library stub
+>12	belong		10		dSYM companion file
+>12	belong		11		kext bundle
+>12	belong		>11
+>>12	belong		x		filetype=%d
+
+#
+0	lelong&0xfffffffe	0xfeedface	Mach-O
+!:strength +1
+>0	use	\^mach-o-be
+
+0	belong&0xfffffffe	0xfeedface	Mach-O
+!:strength +1
+>0	use	mach-o-be
diff --git a/contrib/file/Magdir/macintosh b/contrib/file/magic/Magdir/macintosh
similarity index 99%
rename from contrib/file/Magdir/macintosh
rename to contrib/file/magic/Magdir/macintosh
index b9933b1b4976..d86fd8f4fdc4 100644
--- a/contrib/file/Magdir/macintosh
+++ b/contrib/file/magic/Magdir/macintosh
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: macintosh,v 1.22 2011/05/17 17:40:31 rrt Exp $
+# $File: macintosh,v 1.23 2013/11/19 18:47:58 christos Exp $
 # macintosh description
 #
 # BinHex is the Macintosh ASCII-encoded file format (see also "apple")
@@ -263,6 +263,9 @@
 0	string		$FL2		SPSS System File
 >24	string		x		%s
 
+0	string		$FL3		SPSS System File
+>24	string		x		%s
+
 # Macintosh filesystem data
 # From "Tom N Harris" <telliamed@mac.com>
 # Fixed HFS+ and Partition map magic: Ethan Benson <erbenson@alaska.net>
diff --git a/contrib/file/magic/Magdir/macos b/contrib/file/magic/Magdir/macos
new file mode 100644
index 000000000000..0bacc13a487e
--- /dev/null
+++ b/contrib/file/magic/Magdir/macos
@@ -0,0 +1,7 @@
+
+#------------------------------------------------------------------------------
+# $File: macos,v 1.1 2012/12/21 16:41:07 christos Exp $
+# MacOS files
+#
+
+0	string		book\0\0\0\0mark\0\0\0\0	MacOS Alias file
diff --git a/contrib/file/Magdir/magic b/contrib/file/magic/Magdir/magic
similarity index 100%
rename from contrib/file/Magdir/magic
rename to contrib/file/magic/Magdir/magic
diff --git a/contrib/file/Magdir/mail.news b/contrib/file/magic/Magdir/mail.news
similarity index 92%
rename from contrib/file/Magdir/mail.news
rename to contrib/file/magic/Magdir/mail.news
index f4bb1f55e90b..7a8123af149a 100644
--- a/contrib/file/Magdir/mail.news
+++ b/contrib/file/magic/Magdir/mail.news
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: mail.news,v 1.20 2011/12/08 12:12:46 rrt Exp $
+# $File: mail.news,v 1.22 2013/01/04 14:22:07 christos Exp $
 # mail.news:  file(1) magic for mail and news
 #
 # Unfortunately, saved netnews also has From line added in some news software.
@@ -14,9 +14,9 @@
 !:mime	message/rfc822
 0	string/t		Pipe\ to 	mail piping text
 !:mime	message/rfc822
-0	string/t		Delivered-To:	SMTP mail text
+0	string/tc		delivered-to:	SMTP mail text
 !:mime	message/rfc822
-0	string/t		Return-Path:	SMTP mail text
+0	string/tc		return-path:	SMTP mail text
 !:mime	message/rfc822
 0	string/t		Path:		news text
 !:mime	message/news
@@ -34,6 +34,7 @@
 
 # TNEF files...
 0	lelong		0x223E9F78	Transport Neutral Encapsulation Format
+!:mime	application/vnd.ms-tnef
 
 # From: Kevin Sullivan <ksulliva@psc.edu>
 0	string		*mbx*		MBX mail folder
diff --git a/contrib/file/Magdir/make b/contrib/file/magic/Magdir/make
similarity index 100%
rename from contrib/file/Magdir/make
rename to contrib/file/magic/Magdir/make
diff --git a/contrib/file/magic/Magdir/map b/contrib/file/magic/Magdir/map
new file mode 100644
index 000000000000..d9471fe51b62
--- /dev/null
+++ b/contrib/file/magic/Magdir/map
@@ -0,0 +1,25 @@
+
+
+#------------------------------------------------------------------------------
+# $File: map,v 1.1 2014/06/03 18:22:25 christos Exp $
+# map:  file(1) magic for Map data
+#
+
+# Garmin .FIT files http://pub.ks-and-ks.ne.jp/cycling/edge500_fit.shtml
+8	string	.FIT		FIT Map data
+>15	byte	0
+>>35	belong	x		\b, unit id %d
+# 20 years after unix epoch
+>>39	lelong	x		\b, serial %u
+>>43	ledate/631152000 x	\b, %s
+
+>>47	leshort x		\b, manufacturer %d
+>>47	leshort	1		\b (garmin)
+>>49	leshort x		\b, product %d
+>>53	byte	x		\b, type %d
+>>53	byte	1		\b (Device)
+>>53	byte	2		\b (Settings)
+>>53	byte	3		\b (Sports/Cycling)
+>>53	byte	4		\b (Activity)
+>>53	byte	8		\b (Elevations)
+>>53	byte	10		\b (Totals)
diff --git a/contrib/file/Magdir/maple b/contrib/file/magic/Magdir/maple
similarity index 95%
rename from contrib/file/Magdir/maple
rename to contrib/file/magic/Magdir/maple
index 4a263e084691..05a8eaf298be 100644
--- a/contrib/file/Magdir/maple
+++ b/contrib/file/magic/Magdir/maple
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: maple,v 1.6 2009/09/19 16:28:10 christos Exp $
+# $File: maple,v 1.7 2013/01/11 16:45:23 christos Exp $
 # maple:  file(1) magic for maple files
 # "H. Nanosecond" <aldomel@ix.netcom.com>
 # Maple V release 4, a multi-purpose math program
@@ -33,7 +33,7 @@
 # that is {VERSION major_version miunor_version computer_type version_string}
 0	string	{VERSION\ 	Maple worksheet
 >9	string	>\0	version %.1s.
->>>11	string	>\0	%.1s
+>>11	string	>\0	%.1s
 
 # .mps
 0	string	\0\0\001$	Maple something
diff --git a/contrib/file/Magdir/marc21 b/contrib/file/magic/Magdir/marc21
similarity index 66%
rename from contrib/file/Magdir/marc21
rename to contrib/file/magic/Magdir/marc21
index 83f7959e0580..7e859a3893b9 100644
--- a/contrib/file/Magdir/marc21
+++ b/contrib/file/magic/Magdir/marc21
@@ -12,17 +12,17 @@
 20	string	45	
 
 # leader starts with 5 digits, followed by codes specific to MARC format
->0	regex/1	(^[0-9]{5})[acdnp][^bhlnqsu-z]	MARC21 Bibliographic
+>0	regex/1l	(^[0-9]{5})[acdnp][^bhlnqsu-z]	MARC21 Bibliographic
 !:mime	application/marc
->0	regex/1	(^[0-9]{5})[acdnosx][z]	MARC21 Authority
+>0	regex/1l	(^[0-9]{5})[acdnosx][z]	MARC21 Authority
 !:mime	application/marc
->0	regex/1	(^[0-9]{5})[cdn][uvxy]	MARC21 Holdings
+>0	regex/1l	(^[0-9]{5})[cdn][uvxy]	MARC21 Holdings
 !:mime	application/marc
-0	regex/1	(^[0-9]{5})[acdn][w]	MARC21 Classification
+0	regex/1l	(^[0-9]{5})[acdn][w]	MARC21 Classification
 !:mime	application/marc
->0	regex/1	(^[0-9]{5})[cdn][q]	MARC21 Community
+>0	regex/1l	(^[0-9]{5})[cdn][q]	MARC21 Community
 !:mime	application/marc
 
 # leader position 22-23, should be "00" but is it?
->0	regex/1	(^.{21})([^0]{2})	(non-conforming)
+>0	regex/1l	(^.{21})([^0]{2})	(non-conforming)
 !:mime	application/marc
diff --git a/contrib/file/Magdir/mathcad b/contrib/file/magic/Magdir/mathcad
similarity index 100%
rename from contrib/file/Magdir/mathcad
rename to contrib/file/magic/Magdir/mathcad
diff --git a/contrib/file/Magdir/mathematica b/contrib/file/magic/Magdir/mathematica
similarity index 100%
rename from contrib/file/Magdir/mathematica
rename to contrib/file/magic/Magdir/mathematica
diff --git a/contrib/file/Magdir/matroska b/contrib/file/magic/Magdir/matroska
similarity index 54%
rename from contrib/file/Magdir/matroska
rename to contrib/file/magic/Magdir/matroska
index 62299d21f9b9..0c0e29985f45 100644
--- a/contrib/file/Magdir/matroska
+++ b/contrib/file/magic/Magdir/matroska
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: matroska,v 1.6 2010/09/20 21:11:35 rrt Exp $
+# $File: matroska,v 1.8 2013/02/08 17:25:16 christos Exp $
 # matroska:  file(1) magic for Matroska files
 #
 # See http://www.matroska.org/
@@ -9,15 +9,9 @@
 # EBML id:
 0		belong		0x1a45dfa3
 # DocType id:
->5		beshort		0x4282
+>4		search/4096 	\x42\x82
 # DocType contents:
->>8		string		matroska	Matroska data
-!:mime  video/x-matroska
-
-# EBML id:
-0		belong		0x1a45dfa3
-# DocType id:
->0		search/4096 	\x42\x82
-# DocType contents:
->>&1		string		webm	WebM
+>>&1		string		webm		WebM
 !:mime  video/webm
+>>&1		string		matroska	Matroska data
+!:mime  video/x-matroska
diff --git a/contrib/file/Magdir/mcrypt b/contrib/file/magic/Magdir/mcrypt
similarity index 100%
rename from contrib/file/Magdir/mcrypt
rename to contrib/file/magic/Magdir/mcrypt
diff --git a/contrib/file/Magdir/mercurial b/contrib/file/magic/Magdir/mercurial
similarity index 100%
rename from contrib/file/Magdir/mercurial
rename to contrib/file/magic/Magdir/mercurial
diff --git a/contrib/file/Magdir/metastore b/contrib/file/magic/Magdir/metastore
similarity index 100%
rename from contrib/file/Magdir/metastore
rename to contrib/file/magic/Magdir/metastore
diff --git a/contrib/file/Magdir/mime b/contrib/file/magic/Magdir/mime
similarity index 100%
rename from contrib/file/Magdir/mime
rename to contrib/file/magic/Magdir/mime
diff --git a/contrib/file/magic/Magdir/mips b/contrib/file/magic/Magdir/mips
new file mode 100644
index 000000000000..fe83614703a3
--- /dev/null
+++ b/contrib/file/magic/Magdir/mips
@@ -0,0 +1,120 @@
+
+#------------------------------------------------------------------------------
+# $File: mips,v 1.10 2014/04/30 21:41:02 christos Exp $
+# mips:  file(1) magic for MIPS ECOFF and Ucode, as used in SGI IRIX
+# and DEC Ultrix
+#
+0	beshort	0x0160		MIPSEB ECOFF executable
+>20	beshort	0407		(impure)
+>20	beshort	0410		(swapped)
+>20	beshort	0413		(paged)
+>8	belong	>0		not stripped
+>8	belong	0		stripped
+>22	byte	x		- version %d
+>23	byte	x		\b.%d
+#
+0	beshort	0x0162		MIPSEL-BE ECOFF executable
+>20	beshort	0407		(impure)
+>20	beshort	0410		(swapped)
+>20	beshort	0413		(paged)
+>8	belong	>0		not stripped
+>8	belong	0		stripped
+>23	byte	x		- version %d
+>22	byte	x		\b.%d
+#
+0	beshort	0x6001		MIPSEB-LE ECOFF executable
+>20	beshort	03401		(impure)
+>20	beshort	04001		(swapped)
+>20	beshort	05401		(paged)
+>8	belong	>0		not stripped
+>8	belong	0		stripped
+>23	byte	x		- version %d
+>22	byte	x		\b.%d
+#
+0	beshort	0x6201		MIPSEL ECOFF executable
+>20	beshort	03401		(impure)
+>20	beshort	04001		(swapped)
+>20	beshort	05401		(paged)
+>8	belong	>0		not stripped
+>8	belong	0		stripped
+>23	byte	x		- version %d
+>22	byte	x		\b.%d
+#
+# MIPS 2 additions
+#
+0	beshort	0x0163		MIPSEB MIPS-II ECOFF executable
+>20	beshort	0407		(impure)
+>20	beshort	0410		(swapped)
+>20	beshort	0413		(paged)
+>8	belong	>0		not stripped
+>8	belong	0		stripped
+>22	byte	x		- version %d
+>23	byte	x		\b.%d
+#
+0	beshort	0x0166		MIPSEL-BE MIPS-II ECOFF executable
+>20	beshort	0407		(impure)
+>20	beshort	0410		(swapped)
+>20	beshort	0413		(paged)
+>8	belong	>0		not stripped
+>8	belong	0		stripped
+>22	byte	x		- version %d
+>23	byte	x		\b.%d
+#
+0	beshort	0x6301		MIPSEB-LE MIPS-II ECOFF executable
+>20	beshort	03401		(impure)
+>20	beshort	04001		(swapped)
+>20	beshort	05401		(paged)
+>8	belong	>0		not stripped
+>8	belong	0		stripped
+>23	byte	x		- version %d
+>22	byte	x		\b.%d
+#
+0	beshort	0x6601		MIPSEL MIPS-II ECOFF executable
+>20	beshort	03401		(impure)
+>20	beshort	04001		(swapped)
+>20	beshort	05401		(paged)
+>8	belong	>0		not stripped
+>8	belong	0		stripped
+>23	byte	x		- version %d
+>22	byte	x		\b.%d
+#
+# MIPS 3 additions
+#
+0	beshort	0x0140		MIPSEB MIPS-III ECOFF executable
+>20	beshort	0407		(impure)
+>20	beshort	0410		(swapped)
+>20	beshort	0413		(paged)
+>8	belong	>0		not stripped
+>8	belong	0		stripped
+>22	byte	x		- version %d
+>23	byte	x		\b.%d
+#
+0	beshort	0x0142		MIPSEL-BE MIPS-III ECOFF executable
+>20	beshort	0407		(impure)
+>20	beshort	0410		(swapped)
+>20	beshort	0413		(paged)
+>8	belong	>0		not stripped
+>8	belong	0		stripped
+>22	byte	x		- version %d
+>23	byte	x		\b.%d
+#
+0	beshort	0x4001		MIPSEB-LE MIPS-III ECOFF executable
+>20	beshort	03401		(impure)
+>20	beshort	04001		(swapped)
+>20	beshort	05401		(paged)
+>8	belong	>0		not stripped
+>8	belong	0		stripped
+>23	byte	x		- version %d
+>22	byte	x		\b.%d
+#
+0	beshort	0x4201		MIPSEL MIPS-III ECOFF executable
+>20	beshort	03401		(impure)
+>20	beshort	04001		(swapped)
+>20	beshort	05401		(paged)
+>8	belong	>0		not stripped
+>8	belong	0		stripped
+>23	byte	x		- version %d
+>22	byte	x		\b.%d
+#
+0	beshort	0x180		MIPSEB Ucode
+0	beshort	0x182		MIPSEL-BE Ucode
diff --git a/contrib/file/Magdir/mirage b/contrib/file/magic/Magdir/mirage
similarity index 100%
rename from contrib/file/Magdir/mirage
rename to contrib/file/magic/Magdir/mirage
diff --git a/contrib/file/Magdir/misctools b/contrib/file/magic/Magdir/misctools
similarity index 67%
rename from contrib/file/Magdir/misctools
rename to contrib/file/magic/Magdir/misctools
index 394706564ed7..0367ec06f25a 100644
--- a/contrib/file/Magdir/misctools
+++ b/contrib/file/magic/Magdir/misctools
@@ -1,6 +1,6 @@
 
 #-----------------------------------------------------------------------------
-# $File: misctools,v 1.12 2010/09/29 18:36:49 rrt Exp $
+# $File: misctools,v 1.14 2014/03/06 16:08:58 christos Exp $
 # misctools:  file(1) magic for miscellaneous UNIX tools.
 #
 0	search/1	%%!!			X-Post-It-Note text
@@ -9,16 +9,6 @@
 0	string/c	BEGIN:VCARD		vCard visiting card
 !:mime	text/x-vcard
 
-# From: Alex Beregszaszi <alex@fsn.hu>
-4	string	gtktalog		GNOME Catalogue (gtktalog)
->13	string	>\0			version %s
-
-# Summary: GStreamer binary registry
-# Extension: .bin
-# Submitted by: Josh Triplett <josh@joshtriplett.org>
-0	belong	0xc0def00d		GStreamer binary registry
->4	string	x			\b, version %s
-
 # Summary: Libtool library file
 # Extension: .la
 # Submitted by: Tomasz Trojanowski <tomek@uninet.com.pl>
@@ -31,3 +21,8 @@
 
 # From: Daniel Novotny <dnovotny@redhat.com>
 0	string		MDMP\x93\xA7				MDMP crash report data
+
+# Summary: abook addressbook file
+# Submitted by: Mark Schreiber <mark7@alumni.cmu.edu>
+0	string	#\x20abook\x20addressbook\x20file abook address book
+!:mime application/x-abook-addressbook
diff --git a/contrib/file/Magdir/mkid b/contrib/file/magic/Magdir/mkid
similarity index 100%
rename from contrib/file/Magdir/mkid
rename to contrib/file/magic/Magdir/mkid
diff --git a/contrib/file/Magdir/mlssa b/contrib/file/magic/Magdir/mlssa
similarity index 100%
rename from contrib/file/Magdir/mlssa
rename to contrib/file/magic/Magdir/mlssa
diff --git a/contrib/file/Magdir/mmdf b/contrib/file/magic/Magdir/mmdf
similarity index 100%
rename from contrib/file/Magdir/mmdf
rename to contrib/file/magic/Magdir/mmdf
diff --git a/contrib/file/Magdir/modem b/contrib/file/magic/Magdir/modem
similarity index 100%
rename from contrib/file/Magdir/modem
rename to contrib/file/magic/Magdir/modem
diff --git a/contrib/file/Magdir/motorola b/contrib/file/magic/Magdir/motorola
similarity index 78%
rename from contrib/file/Magdir/motorola
rename to contrib/file/magic/Magdir/motorola
index b56e5e483a45..e19a9075621f 100644
--- a/contrib/file/Magdir/motorola
+++ b/contrib/file/magic/Magdir/motorola
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: motorola,v 1.10 2009/09/19 16:28:11 christos Exp $
+# $File: motorola,v 1.11 2014/04/30 21:41:02 christos Exp $
 # motorola:  file(1) magic for Motorola 68K and 88K binaries
 #
 # 68K
@@ -40,27 +40,27 @@
 # not larger than 1 MB (which is a lot on ST).
 # The additional 0x601b distinction I took from Doug Lee's magic.
 0	belong&0xFFFFFFF0	0x601A0000	Atari ST M68K contiguous executable
->2	belong			x		(txt=%ld,
->6	belong			x		dat=%ld,
->10	belong			x		bss=%ld,
->14	belong			x		sym=%ld)
+>2	belong			x		(txt=%d,
+>6	belong			x		dat=%d,
+>10	belong			x		bss=%d,
+>14	belong			x		sym=%d)
 0	belong&0xFFFFFFF0	0x601B0000	Atari ST M68K non-contig executable
->2	belong			x		(txt=%ld,
->6	belong			x		dat=%ld,
->10	belong			x		bss=%ld,
->14	belong			x		sym=%ld)
+>2	belong			x		(txt=%d,
+>6	belong			x		dat=%d,
+>10	belong			x		bss=%d,
+>14	belong			x		sym=%d)
 
 # Atari ST/TT... program format (sent by Wolfram Kleff <kleff@cs.uni-bonn.de>)
 0       beshort         0x601A          Atari 68xxx executable,
->2      belong          x               text len %lu,
->6      belong          x               data len %lu,
->10     belong          x               BSS len %lu,
->14     belong          x               symboltab len %lu,
+>2      belong          x               text len %u,
+>6      belong          x               data len %u,
+>10     belong          x               BSS len %u,
+>14     belong          x               symboltab len %u,
 >18     belong          0
 >22     belong          &0x01           fastload flag,
 >22     belong          &0x02           may be loaded to alternate RAM,
 >22     belong          &0x04           malloc may be from alternate RAM,
->22     belong          x               flags: 0x%lX,
+>22     belong          x               flags: 0x%X,
 >26     beshort         0               no relocation tab
 >26     beshort         !0              + relocation tab
 >30     string          SFX             [Self-Extracting LZH SFX archive]
@@ -68,4 +68,4 @@
 >44     string          ZIP!            [Self-Extracting ZIP SFX archive]
 
 0       beshort         0x0064          Atari 68xxx CPX file
->8      beshort         x               (version %04lx)
+>8      beshort         x               (version %04x)
diff --git a/contrib/file/Magdir/mozilla b/contrib/file/magic/Magdir/mozilla
similarity index 100%
rename from contrib/file/Magdir/mozilla
rename to contrib/file/magic/Magdir/mozilla
diff --git a/contrib/file/Magdir/msdos b/contrib/file/magic/Magdir/msdos
similarity index 89%
rename from contrib/file/Magdir/msdos
rename to contrib/file/magic/Magdir/msdos
index fe505e83f838..64d486223699 100644
--- a/contrib/file/Magdir/msdos
+++ b/contrib/file/magic/Magdir/msdos
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: msdos,v 1.77 2011/12/07 22:05:05 christos Exp $
+# $File: msdos,v 1.100 2014/06/03 19:17:27 christos Exp $
 # msdos:  file(1) magic for MS-DOS files
 #
 
@@ -42,9 +42,9 @@
 # Many of the compressed formats were extraced from IDARC 1.23 source code.
 #
 0	string/b	MZ
-!:mime	application/x-dosexec
 # All non-DOS EXE extensions have the relocation table more than 0x40 bytes into the file.
 >0x18	leshort <0x40 MS-DOS executable
+!:mime	application/x-dosexec
 # These traditional tests usually work but not always.  When test quality support is
 # implemented these can be turned on.
 #>>0x18	leshort	0x1c	(Borland compiler)
@@ -56,6 +56,7 @@
 
 # Maybe it's a PE?
 >>(0x3c.l) string PE\0\0 PE
+!:mime	application/x-dosexec
 >>>(0x3c.l+24)	leshort		0x010b	\b32 executable
 >>>(0x3c.l+24)	leshort		0x020b	\b32+ executable
 >>>(0x3c.l+24)	leshort		0x0107	ROM image
@@ -83,6 +84,7 @@
 >>>(0x3c.l+4)	leshort		0x1a6	Hitachi SH4
 >>>(0x3c.l+4)	leshort		0x1c0	ARM
 >>>(0x3c.l+4)	leshort		0x1c2	ARM Thumb
+>>>(0x3c.l+4)	leshort		0x1c4	ARMv7 Thumb
 >>>(0x3c.l+4)	leshort		0x1f0	PowerPC
 >>>(0x3c.l+4)	leshort		0x200	Intel Itanium
 >>>(0x3c.l+4)	leshort		0x266	MIPS16
@@ -133,8 +135,10 @@
 # Hmm, not a PE but the relocation table is too high for a traditional DOS exe,
 # must be one of the unusual subformats.
 >>(0x3c.l) string !PE\0\0 MS-DOS executable
+!:mime	application/x-dosexec
 
 >>(0x3c.l)		string		NE \b, NE
+!:mime	application/x-dosexec
 >>>(0x3c.l+0x36)	byte		1 for OS/2 1.x
 >>>(0x3c.l+0x36)	byte		2 for MS Windows 3.x
 >>>(0x3c.l+0x36)	byte		3 for MS-DOS
@@ -149,6 +153,7 @@
 >>>(0x3c.l+0x70)	search/0x80	WinZip(R)\ Self-Extractor \b, ZIP self-extracting archive (WinZip)
 
 >>(0x3c.l)		string		LX\0\0 \b, LX
+!:mime	application/x-dosexec
 >>>(0x3c.l+0x0a)	leshort		<1 (unknown OS)
 >>>(0x3c.l+0x0a)	leshort		1 for OS/2
 >>>(0x3c.l+0x0a)	leshort		2 for MS Windows
@@ -167,8 +172,10 @@
 
 # MS Windows system file, supposedly a collection of LE executables
 >>(0x3c.l)		string		W3 \b, W3 for MS Windows
+!:mime	application/x-dosexec
 
 >>(0x3c.l)		string		LE\0\0 \b, LE executable
+!:mime	application/x-dosexec
 >>>(0x3c.l+0x0a)	leshort		1
 # some DOS extenders use LE files with OS/2 header
 >>>>0x240		search/0x100	DOS/4G for MS-DOS, DOS4GW DOS extender
@@ -195,6 +202,7 @@
 # and definitely not NE/LE/LX/PE
 >>0x3c		lelong	>0x20000000
 >>>(4.s*512)	leshort !0x014c \b, MZ for MS-DOS
+!:mime	application/x-dosexec
 # header data too small for extended executable
 >2		long	!0
 >>0x18		leshort <0x40
@@ -202,17 +210,19 @@
 
 >>>>&(2.s-514)	string	!LE
 >>>>>&-2	string	!BW \b, MZ for MS-DOS
+!:mime	application/x-dosexec
 >>>>&(2.s-514)	string	LE \b, LE
 >>>>>0x240	search/0x100	DOS/4G for MS-DOS, DOS4GW DOS extender
 # educated guess since indirection is still not capable enough for complex offset
 # calculations (next embedded executable would be at &(&2*512+&0-2)
 # I suspect there are only LE executables in these multi-exe files
 >>>>&(2.s-514)	string	BW
->>>>>0x240	search/0x100	DOS/4G ,\b LE for MS-DOS, DOS4GW DOS extender (embedded)
->>>>>0x240	search/0x100	!DOS/4G ,\b BW collection for MS-DOS
+>>>>>0x240	search/0x100	DOS/4G	\b, LE for MS-DOS, DOS4GW DOS extender (embedded)
+>>>>>0x240	search/0x100	!DOS/4G	\b, BW collection for MS-DOS
 
 # This sequence skips to the first COFF segment, usually .text
 >(4.s*512)	leshort		0x014c \b, COFF
+!:mime	application/x-dosexec
 >>(8.s*16)	string		go32stub for MS-DOS, DJGPP go32 DOS extender
 >>(8.s*16)	string		emx
 >>>&1		string		x for DOS, Win or OS/2, emx %s
@@ -312,7 +322,7 @@
 >5	ubyte		>0		
 >>8	string		x		\b, name=%-.2s
 0	string	\xffKEYB\ \ \ \0\0\0\0	
->12	string	\0\0\0\0`\360		MS-DOS KEYBoard Layout file
+>12	string	\0\0\0\0`\004\360	MS-DOS KEYBoard Layout file
 
 # .COM formats (Daniel Quinlan, quinlan@yggdrasil.com)
 # Uncommenting only the first two lines will cover about 2/3 of COM files,
@@ -372,7 +382,7 @@
 # they have their real name at offset 22
 >>>>>22		string			>\0			\b%-.5s
 >4	uleshort&0x8000			0x0000			
-# 32 bit sector adressing ( > 32 MB) for block devices
+# 32 bit sector addressing ( > 32 MB) for block devices
 >>4	uleshort&0x0002			0x0002			\b,32-bit sector-
 # support by driver functions 13h, 17h, 18h
 >4	uleshort&0x0040			0x0040			\b,IOCTL-
@@ -498,11 +508,18 @@
 !:mime	application/msword
 0	string/b	\333\245-\0\0\0			Microsoft Office Document
 !:mime	application/msword
-512	string/b		\354\245\301		Microsoft Word Document
+512	string/b	\354\245\301			Microsoft Word Document
 !:mime	application/msword
+
+#
+0	string/b	\xDB\xA5\x2D\x00		Microsoft WinWord 2.0 Document
+!:mime application/msword
 #
 2080	string	Microsoft\ Excel\ 5.0\ Worksheet	%s
 !:mime	application/vnd.ms-excel
+#
+0	string/b	\xDB\xA5\x2D\x00		Microsoft WinWord 2.0 Document
+!:mime application/msword
 
 2080	string	Foglio\ di\ lavoro\ Microsoft\ Exce	%s
 !:mime	application/vnd.ms-excel
@@ -570,16 +587,48 @@
 #ico files
 0	string/b	\102\101\050\000\000\000\056\000\000\000\000\000\000\000	Icon for MS Windows
 
-# Windows icons (Ian Springer <ips@fpk.hp.com>)
-0	string/b	\000\000\001\000	MS Windows icon resource
-!:mime	image/x-icon
->4	byte	1			- 1 icon
->4	byte	>1			- %d icons
->>6	byte	>0			\b, %dx
->>>7	byte	>0			\b%d
->>8	byte	0			\b, 256-colors
->>8	byte	>0			\b, %d-colors
+# Windows icons
+0   name    ico-dir
+# not entirely accurate, the number of icons is part of the header
+>0  byte    1   - 1 icon
+>0  ubyte   >1  - %d icons
+>2  byte    0   \b, 256x
+>2  byte    !0  \b, %dx
+>3  byte    0   \b256
+>3  byte    !0  \b%d
+>4  ubyte   !0  \b, %d colors
 
+0   belong  0x00000100
+>9  byte    0
+>>0 byte    x           MS Windows icon resource
+!:mime	image/x-icon
+>>4 use     ico-dir
+>9  ubyte   0xff
+>>0 byte    x           MS Windows icon resource
+!:mime	image/x-icon
+>>4 use     ico-dir
+
+# Windows non-animated cursors
+0   name    cur-dir
+# not entirely accurate, the number of icons is part of the header
+>0  byte        1   - 1 icon
+>0  ubyte       >1  - %d icons
+>2  byte        0   \b, 256x
+>2  byte        !0  \b, %dx
+>3  byte        0   \b256
+>3  byte        !0  \b%d
+>6  uleshort    x   \b, hotspot @%dx
+>8  uleshort    x   \b%d
+
+0   belong  0x00000200
+>9  byte    0
+>>0 byte    x           MS Windows cursor resource
+!:mime image/x-cur
+>>4 use     cur-dir
+>9  ubyte   0xff
+>>0 byte    x           MS Windows cursor resource
+!:mime image/x-cur
+>>4 use     cur-dir
 
 # .chr files
 0	string/b	PK\010\010BGI	Borland font 
@@ -637,16 +686,14 @@
 0	lelong		0x08086b70	TurboC BGI file
 0	lelong		0x08084b50	TurboC Font file
 
-# WARNING: below line conflicts with Infocom game data Z-machine 3
-0	byte		0x03
->0x02	byte		<0x13		DBase 3 data file
->>0x04	lelong		0		(no records)
->>0x04	lelong		>0		(%ld records)
-0	byte		0x83
->0x02	byte		<0x13		DBase 3 data file with memo(s)
->>0x04	lelong		0		(no records)
->>0x04	lelong		>0		(%ld records)
-0	leshort		0x0006		DBase 3 index file
+# Debian#712046: The magic below identifies "Delphi compiled form data". 
+# An additional source of information is available at:
+# http://www.woodmann.com/fravia/dafix_t1.htm
+0	string		TPF0
+>4	pstring		>\0		Delphi compiled form '%s'
+
+# tests for DBase files moved, updated and merged to database
+
 0	string		PMCC		Windows 3.x .GRP file
 1	string		RDC-meg		MegaDots 
 >8	byte		>0x2F		version %c
@@ -702,6 +749,28 @@
 0	leshort		0x223e9f78	TNEF
 !:mime	application/vnd.ms-tnef
 
+# Norton Guide (.NG , .HLP) files added by Joerg Jenderek from source NG2HTML.C
+# of http://www.davep.org/norton-guides/ng2h-105.tgz
+# http://en.wikipedia.org/wiki/Norton_Guides
+0	string		NG\0\001	
+# only value 0x100 found at offset 2
+>2	ulelong		0x00000100	Norton Guide
+# Title[40]
+>>8	string		>\0		"%-.40s"
+#>>6	uleshort	x		\b, MenuCount=%u
+# szCredits[5][66]
+>>48	string		>\0		\b, %-.66s
+>>114	string		>\0		%-.66s
+
+# 4DOS help (.HLP) files added by Joerg Jenderek from source TPHELP.PAS 
+# of http://www.4dos.info/
+# pointer,HelpID[8]=4DHnnnmm
+0	ulelong	0x48443408		4DOS help file
+>4	string	x			\b, version %-4.4s
+
+# old binary Microsoft (.HLP) files added by Joerg Jenderek from http://file-extension.net/seeker/file_extension_hlp
+0	ulequad	0x3a000000024e4c	MS Advisor help file
+
 # HtmlHelp files (.chm)
 0	string/b	ITSF\003\000\000\000\x60\000\000\000\001\000\000\000	MS Windows HtmlHelp Data
 
@@ -747,80 +816,6 @@
 >40	string	\ EMF		Windows Enhanced Metafile (EMF) image data
 >>44	ulelong x		version 0x%x
 
-# From: Alex Beregszaszi <alex@fsn.hu>
-0	string/b	COWD		VMWare3
->4	byte	3		disk image
->>32	lelong	x		(%d/
->>36	lelong	x		\b%d/
->>40	lelong	x		\b%d)
->4	byte	2		undoable disk image
->>32	string	>\0		(%s)
-
-0	string/b	VMDK		 VMware4 disk image
-0	string/b	KDMV		 VMware4 disk image
-
-#--------------------------------------------------------------------
-# Qemu Emulator Images
-# Lines written by Friedrich Schwittay (f.schwittay@yousable.de)
-# Updated by Adam Buchbinder (adam.buchbinder@gmail.com)
-# Made by reading sources, reading documentation, and doing trial and error
-# on existing QCOW files
-0	string/b	QFI\xFB	QEMU QCOW Image
-
-# Uncomment the following line to display Magic (only used for debugging
-# this magic number)
-#>0	string/b	x	, Magic: %s
-
-# There are currently 2 Versions: "1" and "2".
-# http://www.gnome.org/~markmc/qcow-image-format-version-1.html
->4	belong	1	(v1)
-
-# Using the existence of the Backing File Offset to determine whether
-# to read Backing File Information
->>12	belong	 >0	 \b, has backing file (
-# Note that this isn't a null-terminated string; the length is actually
-# (16.L). Assuming a null-terminated string happens to work usually, but it
-# may spew junk until it reaches a \0 in some cases.
->>>(12.L)	 string >\0	\bpath %s
-
-# Modification time of the Backing File
-# Really useful if you want to know if your backing
-# file is still usable together with this image
->>>>20	bedate >0	\b, mtime %s)
->>>>20	default x	\b)
-
-# Size is stored in bytes in a big-endian u64.
->>24	bequad	x	 \b, %lld bytes
-
-# 1 for AES encryption, 0 for none.
->>36	belong	1	\b, AES-encrypted
-
-# http://www.gnome.org/~markmc/qcow-image-format.html
->4	belong	2	(v2)
-# Using the existence of the Backing File Offset to determine whether
-# to read Backing File Information
->>8	bequad  >0	 \b, has backing file
-# Note that this isn't a null-terminated string; the length is actually
-# (16.L). Assuming a null-terminated string happens to work usually, but it
-# may spew junk until it reaches a \0 in some cases. Also, since there's no
-# .Q modifier, we just use the bottom four bytes as an offset. Note that if
-# the file is over 4G, and the backing file path is stored after the first 4G,
-# the wrong filename will be printed. (This should be (8.Q), when that syntax
-# is introduced.)
->>>(12.L)	 string >\0	(path %s)
->>24	bequad	x	\b, %lld bytes
->>32	belong	1	\b, AES-encrypted
-
->4	default x	(unknown version)
-
-0	string/b	QEVM		QEMU suspend to disk image
-
-0	string/b	Bochs\ Virtual\ HD\ Image	Bochs disk image,
->32	string	x				type %s,
->48	string	x				subtype %s
-
-0	lelong	0x02468ace			Bochs Sparse disk image
-
 # from http://filext.com by Derek M Jones <derek@knosof.co.uk>
 # False positive with PPT (also currently this string is too long)
 #0	string/b	\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x3E\x00\x03\x00\xFE\xFF\x09\x00\x06	Microsoft Installer
@@ -854,8 +849,8 @@
 # URL:	http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/DDSFileReference/ddsfileformat.asp
 # From: Morten Hustveit <morten@debian.org>
 0	string/b	DDS\040\174\000\000\000 Microsoft DirectDraw Surface (DDS),
->16	lelong	>0			%hd x
->12	lelong	>0			%hd,
+>16	lelong	>0			%d x
+>12	lelong	>0			%d,
 >84	string	x			%.4s
 
 # Type: Microsoft Document Imaging Format (.mdi)
@@ -874,3 +869,15 @@
 
 # Windows Imaging (WIM) Image
 0	string/b	MSWIM\000\000\000	Windows imaging (WIM) image
+
+# The second byte of these signatures is a file version; I don't know what, 
+# if anything, produced files with version numbers 0-2.
+# From: John Elliott <johne@seasip.demon.co.uk>
+0	string	\xfc\x03\x00	Mallard BASIC program data (v1.11)
+0	string	\xfc\x04\x00	Mallard BASIC program data (v1.29+)
+0	string	\xfc\x03\x01	Mallard BASIC protected program data (v1.11)
+0	string	\xfc\x04\x01	Mallard BASIC protected program data (v1.29+)
+
+0	string	MIOPEN		Mallard BASIC Jetsam data
+0	string	Jetsam0		Mallard BASIC Jetsam index data
+
diff --git a/contrib/file/magic/Magdir/msooxml b/contrib/file/magic/Magdir/msooxml
new file mode 100644
index 000000000000..e5be5b37db36
--- /dev/null
+++ b/contrib/file/magic/Magdir/msooxml
@@ -0,0 +1,36 @@
+
+#------------------------------------------------------------------------------
+# $File: msooxml,v 1.4 2014/01/06 18:16:24 rrt Exp $
+# msooxml:  file(1) magic for Microsoft Office XML
+# From: Ralf Brown <ralf.brown@gmail.com>
+
+# .docx, .pptx, and .xlsx are XML plus other files inside a ZIP
+#   archive.  The first member file is normally "[Content_Types].xml".
+#   but some libreoffice generated files put this later. Perhaps skip
+#   the "[Content_Types].xml" test?
+# Since MSOOXML doesn't have anything like the uncompressed "mimetype"
+#   file of ePub or OpenDocument, we'll have to scan for a filename
+#   which can distinguish between the three types
+
+# start by checking for ZIP local file header signature
+0		string		PK\003\004
+!:strength +10
+# make sure the first file is correct
+>0x1E		regex		\[Content_Types\]\.xml|_rels/\.rels
+# skip to the second local file header
+# since some documents include a 520-byte extra field following the file
+# header, we need to scan for the next header
+>>(18.l+49)	search/2000	PK\003\004
+# now skip to the *third* local file header; again, we need to scan due to a
+# 520-byte extra field following the file header
+>>>&26		search/1000	PK\003\004
+# and check the subdirectory name to determine which type of OOXML
+# file we have.  Correct the mimetype with the registered ones:
+# http://technet.microsoft.com/en-us/library/cc179224.aspx
+>>>>&26		string		word/		Microsoft Word 2007+
+!:mime application/vnd.openxmlformats-officedocument.wordprocessingml.document
+>>>>&26		string		ppt/		Microsoft PowerPoint 2007+
+!:mime application/vnd.openxmlformats-officedocument.presentationml.presentation
+>>>>&26		string		xl/		Microsoft Excel 2007+
+!:mime application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+>>>>&26		default		x		Microsoft OOXML
diff --git a/contrib/file/Magdir/msvc b/contrib/file/magic/Magdir/msvc
similarity index 100%
rename from contrib/file/Magdir/msvc
rename to contrib/file/magic/Magdir/msvc
diff --git a/contrib/file/magic/Magdir/msx b/contrib/file/magic/Magdir/msx
new file mode 100644
index 000000000000..0eacbe520811
--- /dev/null
+++ b/contrib/file/magic/Magdir/msx
@@ -0,0 +1,255 @@
+
+#------------------------------------------------------------------------------
+# msx:  file(1) magic for the MSX Home Computer
+# v1.1
+# Fabio R. Schmidlin <sd-snatcher@users.sourceforge.net>
+
+############## MSX Music file formats ##############
+
+# Gigamix MGSDRV music file
+0	string		MGS	MSX Gigamix MGSDRV3 music file, 
+>6	ubeshort	0x0D0A
+>>3	byte		x	\bv%c
+>>4	byte		x	\b.%c
+>>5	byte		x	\b%c
+>>8	string		>\0	\b, title: %s
+
+1	string		mgs2\ 	MSX Gigamix MGSDRV2 music file
+>6	uleshort	0x80
+>>0x2E	uleshort	0
+>>>0x30	string		>\0	\b, title: %s
+
+# KSS music file
+0	string		KSCC	KSS music file v1.03
+>0xE	byte		0
+>>0xF	byte&0x02	0	\b, soundchips: AY-3-8910, SCC(+)
+>>0xF	byte&0x02	2	\b, soundchip(s): SN76489
+>>>0xF	byte&0x04	4	stereo
+>>0xF	byte&0x01	1	\b, YM2413
+>>0xF	byte&0x08	8	\b, Y8950
+
+0	string		KSSX	KSS music file v1.20
+>0xE	byte&0xEF	0
+>>0xF	byte&0x40	0x00	\b, 60Hz
+>>0xF	byte&0x40	0x40	\b, 50Hz
+>>0xF	byte&0x02	0	\b, soundchips: AY-3-8910, SCC(+)
+>>0xF	byte&0x02	0x02	\b, soundchips: SN76489
+>>>0xF	byte&0x04	0x04	stereo
+>>0xF	byte&0x01	0x01	\b, 
+>>>0xF	byte&0x18	0x00	\bYM2413
+>>>0xF	byte&0x18	0x08	\bYM2413, Y8950
+>>>0xF	byte&0x18	0x18	\bYM2413+Y8950 pseudostereo
+>>0xF	byte&0x18	0x10	\b, Majyutsushi DAC
+
+# Moonblaster for Moonsound
+0	string		MBMS
+>4	byte		0x10	MSX Moonblaster for MoonSound music
+
+# Music Player K-kaz
+0	string		MPK	MSX Music Player K-kaz song
+>6	ubeshort	0x0D0A
+>>3	byte		x	v%c
+>>4	byte		x	\b.%c
+>>5	byte		x	\b%c
+
+# I don't know why these don't work
+#0	search/0xFFFF	\r\n.FM9
+#>0	search/0xFFFF	\r\n#FORMAT	MSX Music Player K-kaz source MML file
+#0	search/0xFFFF	\r\nFM1\ \=
+#>0	search/0xFFFF	\r\nPSG1\=
+#>>0	search/0xFFFF	\r\nSCC1\=		MSX MuSiCa MML source file
+
+# OPX Music file
+0x35	beshort		0x0d0a
+>0x7B	beshort		0x0d0a
+>>0x7D	byte		0x1a
+>>>0x87	uleshort	0		MSX OPX Music file
+>>>>0x86	byte		0		v1.5
+>>>>>0	string		>\32		\b, title: %s
+>>>>0x86	byte		1		v2.4
+>>>>>0	string		>\32		\b, title: %s
+
+# SCMD music file
+0x8B	string		SCMD
+>0xCE	uleshort	0	MSX SCMD Music file
+#>>-2	uleshort	0x6a71	; The file must end with this value. How to code this here?
+>>0x8F	string		>\0		\b, title: %s
+
+0	search/0xFFFF	\r\n@title
+>&0	search/0xFFFF	\r\n@m=[	MSX SCMD source MML file
+
+
+############## MSX image file formats ##############
+
+# MSX raw VRAM dump
+0	ubyte		0xFE
+>1	uleshort	0
+>>5	uleshort	0
+>>>3	uleshort	0x37FF		MSX SC2/GRP raw image
+>>>3	uleshort	0x6A00		MSX Graph Saurus SR5 raw image
+>>>3	uleshort	>0x769E
+>>>>3	uleshort	<0x8000		MSX GE5/GE6 raw image
+>>>>>3	uleshort	0x7FFF		\b, with sprite patterns
+>>>3	uleshort	0xD3FF		MSX screen 7-12 raw image
+>>>3	uleshort	0xD400		MSX Graph Saurus SR7/SR8/SRS raw image
+
+# Graph Saurus compressed images
+0	ubyte		0xFD
+>1	uleshort	0
+>>5	uleshort	0
+>>>3	uleshort	>0x013D		MSX Graph Saurus compressed image
+
+# Maki-chan Graphic format
+0	string		MAKI02\ \ 	Maki-chan image,
+>8	byte		x		system ID: %c
+>9	byte		x		\b%c
+>10	byte		x		\b%c
+>11	byte		x		\b%c,
+>13	search/0x200	\x1A
+# >>&3	ubyte		0		, video mode: PC-98 400 lines, 16 analog colors
+# >>&3	ubyte		1		, video mode: MSX SC7, 16 analog colors
+# >>&3	ubyte		2		, video mode: VM-98 400 lines, 8 analog colors
+# >>&3	ubyte		3		, video mode: PC-88 analog, 200 lines, 8 analog colors
+# >>&3	ubyte		4		, video mode: 400 lines, 16 digital colors
+# >>&3	ubyte		5		, video mode: 200 lines, 16 digital colors
+# >>&3	ubyte		6		, video mode: old PC-98 digital 400 lines, 8 colors
+# >>&3	ubyte		7		, video mode: PC-88 400 lines, 8 digital colors
+>>&8	uleshort+1	x		%dx
+>>&10	uleshort+1	x		\b%d,
+>>&3	ubyte&0x82	0x80		256 colors
+>>&3	ubyte&0x82	0x00		16 colors
+>>&3	ubyte&0x82	0x01		8 colors
+>>&3	ubyte&0x04	4		digital
+>>&3	ubyte&0x04	0		analog
+>>&3	ubyte&0x01	1		\b, 2:1 dot aspect ratio
+
+# Japanese PIC file
+0	string		PIC\x1A
+>4	lelong		0		Japanese PIC image file
+
+# MSX G9B image file
+0	string		G9B
+>1	uleshort	11
+>>3	uleshort	>10
+>>>5	ubyte		>0		MSX G9B image, depth=%d
+>>>>8	uleshort	x		\b, %dx
+>>>>10	uleshort	x		\b%d
+>>>>5	ubyte		<9
+>>>>>6	ubyte		0
+>>>>>>7	ubyte		x		\b, codec=%d RGB color palettes
+>>>>>6	ubyte		64		\b, codec=RGB fixed color
+>>>>>6	ubyte		128		\b, codec=YJK
+>>>>>6	ubyte		192		\b, codec=YUV
+>>>>5	ubyte		>8		codec=RGB fixed color
+>>>>12	ubyte		0		\b, raw
+>>>>12	ubyte		1		\b, bitbuster compression
+
+############## Other MSX file formats ##############
+
+# MSX ROMs
+0	string		AB
+>2	uleshort	0x0010			MSX ROM
+>>2	uleshort	x			\b, init=0x%4x
+>>4	uleshort	>0			\b, stat=0x%4x
+>>6	uleshort	>0			\b, dev=0x%4x
+>>8	uleshort	>0			\b, bas=0x%4x
+>2	uleshort	0x4010			MSX ROM
+>>2	uleshort	x			\b, init=0x%04x
+>>4	uleshort	>0			\b, stat=0x%04x
+>>6	uleshort	>0			\b, dev=0x%04x
+>>8	uleshort	>0			\b, bas=0x%04x
+>2	uleshort	0x8010			MSX ROM
+>>2	uleshort	x			\b, init=0x%04x
+>>4	uleshort	>0			\b, stat=0x%04x
+>>6	uleshort	>0			\b, dev=0x%04x
+>>8	uleshort	>0			\b, bas=0x%04x
+
+0	string		AB
+#>2	string		5JSuperLAYDOCK		MSX Super Laydock ROM
+#>3	string		@HYDLIDE3MSX		MSX Hydlide-3 ROM
+#>3	string		@3\x80IA862		Golvellius MSX1 ROM
+>2	uleshort	>10
+>>10	string		\0\0\0\0\0\0		MSX ROM
+>>>0x10	string		YZ\0\0\0\0		Konami Game Master 2 MSX ROM
+>>>0x10	string		CD			\b, Konami RC-
+>>>>0x12	ubyte		x			\b%d
+>>>>0x13	ubyte/16	x			\b%d
+>>>>0x13	ubyte&0xF	x			\b%d
+>>>0x10	string		EF			\b, Konami RC-
+>>>>0x12	ubyte		x			\b%d
+>>>>0x13	ubyte/16	x			\b%d
+>>>>0x13	ubyte&0xF	x			\b%d
+>>>2	uleshort	x			\b, init=0x%04x
+>>>4	uleshort	>0			\b, stat=0x%04x
+>>>6	uleshort	>0			\b, dev=0x%04x
+>>>8	uleshort	>0			\b, bas=0x%04x
+>2	uleshort	0
+>>4	uleshort	0
+>>>6	uleshort	0
+>>>>8	uleshort	>0			MSX BASIC program in ROM, bas=0x%04x
+
+0x4000	string		AB
+>0x4002	uleshort	>0x4010
+>>0x400A	string		\0\0\0\0\0\0	MSX MegaROM with nonstandard page order
+>>0x4002	uleshort	x			\b, init=0x%04x
+>>0x4004	uleshort	>0			\b, stat=0x%04x
+>>0x4006	uleshort	>0			\b, dev=0x%04x
+>>0x4008	uleshort	>0			\b, bas=0x%04x
+
+0x8000	string		AB
+>0x8002	uleshort	>0x4010
+>>0x800A	string		\0\0\0\0\0\0	MSX MegaROM with nonstandard page order
+>>0x8002	uleshort	x			\b, init=0x%04x
+>>0x8004	uleshort	>0			\b, stat=0x%04x
+>>0x8006	uleshort	>0			\b, dev=0x%04x
+>>0x8008	uleshort	>0			\b, bas=0x%04x
+
+
+0x3C000	string		AB
+>0x3C008	string		\0\0\0\0\0\0\0\0	MSX MegaROM with nonstandard page order
+>>0x3C002	uleshort	x			\b, init=0x%04x
+>>0x3C004	uleshort	>0			\b, stat=0x%04x
+>>0x3C006	uleshort	>0			\b, dev=0x%04x
+>>0x3C008	uleshort	>0			\b, bas=0x%04x
+
+# MSX BIN file
+#0	byte		0xFE
+#>1	uleshort	>0x8000
+#>>3	uleshort	>0x8004
+#>>>5	uleshort	>0x8000			MSX BIN file
+
+# MSX-BASIC file
+0	byte		0xFF
+>3	uleshort	0x000A
+>>1	uleshort	>0x8000			MSX-BASIC program
+
+# MSX .CAS file
+0	string	\x1F\xA6\xDE\xBA\xCC\x13\x7D\x74	MSX cassette archive
+
+# Mega-Assembler file
+0	byte		0xFE
+>1	uleshort	0x0001
+>>5	uleshort	0xffff
+>>>6	byte		0x0A		MSX Mega-Assembler source
+
+# Execrom Patchfile
+0	string		ExecROM\ patchfile\x1A	MSX ExecROM patchfile
+>0x12	ubyte/16	x		v%d
+>0x12	ubyte&0xF	x		\b.%d
+>0x13	ubyte		x		\b, contains %d patches
+
+# Konami's King's Valley-2 custom stage (ELG file)
+4	uleshort	0x0900
+>0xF	byte		1
+>>0x14	byte		0
+>>>0x1E	string		\ \ \ 
+>>>>0x23	byte	1
+>>>>>0x25	byte	0
+>>>>>>0x15	string	>\x30
+>>>>>>>0x15	string	<\x5A		Konami King's Valley-2 custom stage, title: "%-8.8s"
+>>>>>>>>0x1D	byte	<32	\b, theme: %d
+
+# Metal Gear 1 savegame
+#0x4F	string	\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF
+#>>0x60	string	\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF
+#>>>0x7B	string	\0x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x00	Metal Gear 1 savegame
diff --git a/contrib/file/Magdir/mup b/contrib/file/magic/Magdir/mup
similarity index 100%
rename from contrib/file/Magdir/mup
rename to contrib/file/magic/Magdir/mup
diff --git a/contrib/file/Magdir/music b/contrib/file/magic/Magdir/music
similarity index 100%
rename from contrib/file/Magdir/music
rename to contrib/file/magic/Magdir/music
diff --git a/contrib/file/Magdir/natinst b/contrib/file/magic/Magdir/natinst
similarity index 86%
rename from contrib/file/Magdir/natinst
rename to contrib/file/magic/Magdir/natinst
index 7c319801260a..7a55ddecdf92 100644
--- a/contrib/file/Magdir/natinst
+++ b/contrib/file/magic/Magdir/natinst
@@ -1,10 +1,10 @@
 
 #-----------------------------------------------------------------------------
-# $File: natinst,v 1.4 2009/09/19 16:28:11 christos Exp $
+# $File: natinst,v 1.6 2014/06/03 19:17:27 christos Exp $
 # natinst:  file(1) magic for National Instruments Code Files
 
 #
-# From <egamez@fcfm.buap.mx> Enrique G�mez-Flores
+# From <egamez@fcfm.buap.mx> Enrique Gamez-Flores
 # version 1
 # Many formats still missing, we use, for the moment LabVIEW
 # We guess VXI format file. VISA, LabWindowsCVI, BridgeVIEW, etc, are missing
@@ -12,7 +12,7 @@
 0       string          RSRC            National Instruments,
 # Check if it's a LabVIEW File
 >8      string          LV              LabVIEW File,
-# Check wich kind of file is
+# Check which kind of file it is
 >>10    string          SB              Code Resource File, data
 >>10    string          IN              Virtual Instrument Program, data
 >>10    string          AR              VI Library, data
diff --git a/contrib/file/Magdir/ncr b/contrib/file/magic/Magdir/ncr
similarity index 83%
rename from contrib/file/Magdir/ncr
rename to contrib/file/magic/Magdir/ncr
index 4067596f592e..21b09aba5c50 100644
--- a/contrib/file/Magdir/ncr
+++ b/contrib/file/magic/Magdir/ncr
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: ncr,v 1.7 2009/09/19 16:28:11 christos Exp $
+# $File: ncr,v 1.8 2014/04/30 21:41:02 christos Exp $
 # ncr:  file(1) magic for NCR Tower objects
 #
 # contributed by
@@ -11,27 +11,27 @@
 >12	   belong		>0	not stripped
 >20	   beshort		0407	executable
 >20	   beshort		0410	pure executable
->22	   beshort		>0	- version %ld
+>22	   beshort		>0	- version %d
 0	beshort		000615	Tower/XP rel 2 object
 >12	   belong		>0	not stripped
 >20	   beshort		0407	executable
 >20	   beshort		0410	pure executable
->22	   beshort		>0	- version %ld
+>22	   beshort		>0	- version %d
 0	beshort		000620	Tower/XP rel 3 object
 >12	   belong		>0	not stripped
 >20	   beshort		0407	executable
 >20	   beshort		0410	pure executable
->22	   beshort		>0	- version %ld
+>22	   beshort		>0	- version %d
 0	beshort		000625	Tower/XP rel 3 object
 >12	   belong		>0	not stripped
 >20	   beshort		0407	executable
 >20	   beshort		0410	pure executable
->22	   beshort		>0	- version %ld
+>22	   beshort		>0	- version %d
 0	beshort		000630	Tower32/600/400 68020 object
 >12	   belong		>0	not stripped
 >20	   beshort		0407	executable
 >20	   beshort		0410	pure executable
->22	   beshort		>0	- version %ld
+>22	   beshort		>0	- version %d
 0	beshort		000640	Tower32/800 68020
 >18	   beshort		&020000	w/68881 object
 >18	   beshort		&040000	compatible object
@@ -39,11 +39,11 @@
 >20	   beshort		0407	executable
 >20	   beshort		0413	pure executable
 >12	   belong		>0	not stripped
->22	   beshort		>0	- version %ld
+>22	   beshort		>0	- version %d
 0	beshort		000645	Tower32/800 68010
 >18	   beshort		&040000	compatible object
 >18	   beshort		&060000 object
 >20	   beshort		0407	executable
 >20	   beshort		0413	pure executable
 >12	   belong		>0	not stripped
->22	   beshort		>0	- version %ld
+>22	   beshort		>0	- version %d
diff --git a/contrib/file/magic/Magdir/neko b/contrib/file/magic/Magdir/neko
new file mode 100644
index 000000000000..ac5ff354ec12
--- /dev/null
+++ b/contrib/file/magic/Magdir/neko
@@ -0,0 +1,12 @@
+
+#------------------------------------------------------------
+# $File: neko,v 1.1 2009/11/10 20:36:10 christos Exp $
+
+# From: Mikhail Gusarov <dottedmag@dottedmag.net>
+# NekoVM (http://nekovm.org/) bytecode
+0	string		NEKO	NekoVM bytecode
+>4	lelong		x	(%d global symbols,
+>8	lelong		x	%d global fields,
+>12	lelong		x	%d bytecode ops)
+!:mime	application/x-nekovm-bytecode
+
diff --git a/contrib/file/Magdir/netbsd b/contrib/file/magic/Magdir/netbsd
similarity index 94%
rename from contrib/file/Magdir/netbsd
rename to contrib/file/magic/Magdir/netbsd
index 927acedf315c..3234610af133 100644
--- a/contrib/file/Magdir/netbsd
+++ b/contrib/file/magic/Magdir/netbsd
@@ -1,16 +1,14 @@
 
 #------------------------------------------------------------------------------
-# $File: netbsd,v 1.19 2011/10/31 17:23:34 christos Exp $
+# $File: netbsd,v 1.21 2014/03/29 15:40:34 christos Exp $
 # netbsd:  file(1) magic for NetBSD objects
 #
 # All new-style magic numbers are in network byte order.
+# The old-style magic numbers are indistinguishable from the same magic
+# numbers used in other systems, and are handled, for all those systems,
+# in aout.
 #
 
-0	lelong			000000407	a.out NetBSD little-endian object file
->16	lelong			>0		not stripped
-0	belong			000000407	a.out NetBSD big-endian object file
->16	belong			>0		not stripped
-
 0	belong&0377777777	041400413	a.out NetBSD/i386 demand paged
 >0	byte			&0x80		
 >>20	lelong			<4096		shared library
@@ -102,25 +100,25 @@
 0	belong&0377777777	045200507	a.out NetBSD/powerpc core
 >12	string			>\0		from '%s'
 
-0	belong&0377777777	042400413	a.out NetBSD/sparc demand paged
+0	belong&0377777777	042400413	a.out NetBSD/SPARC demand paged
 >0	byte			&0x80		
 >>20	belong			<8192		shared library
 >>20	belong			=8192		dynamically linked executable
 >>20	belong			>8192		dynamically linked executable
 >0	byte			^0x80		executable
 >16	belong			>0		not stripped
-0	belong&0377777777	042400410	a.out NetBSD/sparc pure
+0	belong&0377777777	042400410	a.out NetBSD/SPARC pure
 >0	byte			&0x80		dynamically linked executable
 >0	byte			^0x80		executable
 >16	belong			>0		not stripped
-0	belong&0377777777	042400407	a.out NetBSD/sparc
+0	belong&0377777777	042400407	a.out NetBSD/SPARC
 >0	byte			&0x80		dynamically linked executable
 >0	byte			^0x80
 >>0	byte			&0x40		position independent
 >>20	belong			!0		executable
 >>20	belong			=0		object file
 >16	belong			>0		not stripped
-0	belong&0377777777	042400507	a.out NetBSD/sparc core
+0	belong&0377777777	042400507	a.out NetBSD/SPARC core
 >12	string			>\0		from '%s'
 >32	belong			!0		(signal %d)
 
@@ -256,7 +254,7 @@
 >0	belong&0x03ff0000 0x00870000	\b, m68k BSD (8K pages)
 >0	belong&0x03ff0000 0x00880000	\b, m68k BSD (4K pages)
 >0	belong&0x03ff0000 0x00890000	\b, ns32532 BSD
->0	belong&0x03ff0000 0x008a0000	\b, sparc/32 BSD
+>0	belong&0x03ff0000 0x008a0000	\b, SPARC/32 BSD
 >0	belong&0x03ff0000 0x008b0000	\b, pmax BSD
 >0	belong&0x03ff0000 0x008c0000	\b, vax BSD (1K pages)
 >0	belong&0x03ff0000 0x008d0000	\b, alpha BSD
@@ -270,7 +268,7 @@
 >0	belong&0x03ff0000 0x00950000	\b, mips2 BSD
 >0	belong&0x03ff0000 0x00960000	\b, parisc BSD
 >0	belong&0x03ff0000 0x00970000	\b, sh5/64 BSD
->0	belong&0x03ff0000 0x00980000	\b, sparc/64 BSD
+>0	belong&0x03ff0000 0x00980000	\b, SPARC/64 BSD
 >0	belong&0x03ff0000 0x00990000	\b, amd64 BSD
 >0	belong&0x03ff0000 0x009a0000	\b, hp200 (68010) BSD
 >0	belong&0x03ff0000 0x009b0000	\b, hp300 (68020+68881) BSD
diff --git a/contrib/file/Magdir/netscape b/contrib/file/magic/Magdir/netscape
similarity index 100%
rename from contrib/file/Magdir/netscape
rename to contrib/file/magic/Magdir/netscape
diff --git a/contrib/file/Magdir/netware b/contrib/file/magic/Magdir/netware
similarity index 100%
rename from contrib/file/Magdir/netware
rename to contrib/file/magic/Magdir/netware
diff --git a/contrib/file/Magdir/news b/contrib/file/magic/Magdir/news
similarity index 100%
rename from contrib/file/Magdir/news
rename to contrib/file/magic/Magdir/news
diff --git a/contrib/file/Magdir/nitpicker b/contrib/file/magic/Magdir/nitpicker
similarity index 86%
rename from contrib/file/Magdir/nitpicker
rename to contrib/file/magic/Magdir/nitpicker
index d1a66287fd5d..2486dee037f4 100644
--- a/contrib/file/Magdir/nitpicker
+++ b/contrib/file/magic/Magdir/nitpicker
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: nitpicker,v 1.4 2009/09/19 16:28:11 christos Exp $
+# $File: nitpicker,v 1.6 2014/04/30 21:41:02 christos Exp $
 # nitpicker:  file(1) magic for Flowfiles.
 # From: Christian Jachmann <C.Jachmann@gmx.net> http://www.nitpicker.de
 0	string	NPFF	NItpicker Flow File 
diff --git a/contrib/file/Magdir/oasis b/contrib/file/magic/Magdir/oasis
similarity index 75%
rename from contrib/file/Magdir/oasis
rename to contrib/file/magic/Magdir/oasis
index e527185fd1c4..45ad6d137d2d 100644
--- a/contrib/file/Magdir/oasis
+++ b/contrib/file/magic/Magdir/oasis
@@ -1,9 +1,9 @@
 
 #------------------------------------------------------------------------------
-# $File: oasis,v 1.1 2011/03/15 02:09:38 christos Exp $
+# $File: oasis,v 1.2 2014/06/03 19:17:27 christos Exp $
 # OASIS
 # Summary: OASIS stream file
-# Long descripton: Open Artwork System Interchange Standard
+# Long description: Open Artwork System Interchange Standard
 # File extension: .oas
 # Full name:	Ben Cowley (bcowley@broadcom.com)
 #		Philip Dixon (pdixon@broadcom.com)
diff --git a/contrib/file/Magdir/ocaml b/contrib/file/magic/Magdir/ocaml
similarity index 100%
rename from contrib/file/Magdir/ocaml
rename to contrib/file/magic/Magdir/ocaml
diff --git a/contrib/file/Magdir/octave b/contrib/file/magic/Magdir/octave
similarity index 100%
rename from contrib/file/Magdir/octave
rename to contrib/file/magic/Magdir/octave
diff --git a/contrib/file/Magdir/ole2compounddocs b/contrib/file/magic/Magdir/ole2compounddocs
similarity index 100%
rename from contrib/file/Magdir/ole2compounddocs
rename to contrib/file/magic/Magdir/ole2compounddocs
diff --git a/contrib/file/Magdir/olf b/contrib/file/magic/Magdir/olf
similarity index 100%
rename from contrib/file/Magdir/olf
rename to contrib/file/magic/Magdir/olf
diff --git a/contrib/file/Magdir/os2 b/contrib/file/magic/Magdir/os2
similarity index 100%
rename from contrib/file/Magdir/os2
rename to contrib/file/magic/Magdir/os2
diff --git a/contrib/file/Magdir/os400 b/contrib/file/magic/Magdir/os400
similarity index 100%
rename from contrib/file/Magdir/os400
rename to contrib/file/magic/Magdir/os400
diff --git a/contrib/file/Magdir/os9 b/contrib/file/magic/Magdir/os9
similarity index 100%
rename from contrib/file/Magdir/os9
rename to contrib/file/magic/Magdir/os9
diff --git a/contrib/file/Magdir/osf1 b/contrib/file/magic/Magdir/osf1
similarity index 100%
rename from contrib/file/Magdir/osf1
rename to contrib/file/magic/Magdir/osf1
diff --git a/contrib/file/Magdir/palm b/contrib/file/magic/Magdir/palm
similarity index 54%
rename from contrib/file/Magdir/palm
rename to contrib/file/magic/Magdir/palm
index 536f384a2942..e852cc718107 100644
--- a/contrib/file/Magdir/palm
+++ b/contrib/file/magic/Magdir/palm
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: palm,v 1.9 2012/01/16 15:16:43 christos Exp $
+# $File: palm,v 1.13 2014/03/30 21:40:08 christos Exp $
 # palm:	 file(1) magic for PalmOS {.prc,.pdb}: applications, docfiles, and hacks
 #
 # Brian Lalor <blalor@hcirisc.cs.binghamton.edu>
@@ -9,18 +9,70 @@
 # 8 character identifiers at byte 60, one I found for appl is BIGb.
 # What are the possibilities and where is this documented?
 
+# The common header format for PalmOS .pdb/.prc files is
+# {
+#         char            name[ 32 ];
+#         Word            attributes;
+#         Word            version;
+#         DWord           creationDate;
+#         DWord           modificationDate;
+#         DWord           lastBackupDate;
+#         DWord           modificationNumber;
+#         DWord           appInfoID;
+#         DWord           sortInfoID;
+#         char            type[4];
+#         char            creator[4];
+#         DWord           uniqueIDSeed;
+#         RecordListType  recordList;
+# };
+#
+# Datestamps are unsigned seconds since the MacOS epoch (Jan 1, 1904),
+# or Unix/POSIX time + 2082844800.
+
+0		name		aportisdoc
+# date is supposed to be big-endian seconds since 1 Jan 1904, but many
+# files contain the timestamp in little-endian or a completely
+# nonsensical value...
+#>36		bedate-2082844800	>0	\b, created %s
+# compression: 1=uncomp, 2=orig, 0x4448=HuffDic
+>(78.L)		beshort		=1		\b, uncompressed
+# compressed
+>(78.L)		beshort		>1
+>>(78.L+4)	belong		x		\b, %d bytes uncompressed
+
 # appl
-#59	byte			\0
-#>60	string			appl		PalmOS application
-#>0	string			>\0		"%s"
-# TEXt
-#59	byte			\0
-#>60	belong			TEXt		AportisDoc file
-#>0	string			>\0		"%s"
+#60		string		appl		PalmOS application
+#>0		string		>\0		"%s"
+
 # HACK
-#59	byte			\0
-#>60	string			HACK		HackMaster hack
-#>0	string			>\0		"%s"
+#60		string		HACK		HackMaster hack
+#>0		string		>\0		"%s"
+
+# iSiloX e-book
+60		string		SDocSilX	iSiloX E-book
+>0		string		>\0		"%s"
+
+# Mobipocket (www.mobipocket.com), donated by Carl Witty
+# expanded by Ralf Brown
+60		string	 	BOOKMOBI	Mobipocket E-book
+# MobiPocket stores a full title, pointed at by the belong at offset
+# 0x54 in its header at (78.L), with length given by the belong at
+# offset 0x58.
+# there's no guarantee that the title string is null-terminated, but
+# we currently can't specify a variable-length string where the length
+# field is not at the start of the string; in practice, the data
+# following the string always seems to start with a zero byte
+>(78.L)		belong		x
+>>&(&0x50.L-4)	string		>\0		"%s"
+>0		use		aportisdoc
+>>(78.L+0x68)	belong		>0		\b, version %d
+>>(78.L+0x1C)	belong		!0		\b, codepage %d
+>>(78.L+0x0C)	beshort	 	>0		\b, encrypted (type %d)
+
+# AportisDoc/PalmDOC
+60		string		TEXtREAd	AportisDoc/PalmDOC E-book
+>0		string		>\0		"%s"
+>0		use		aportisdoc
 
 # Variety of PalmOS document types
 # Michael-John Turner <mj@debian.org>
@@ -89,8 +141,12 @@
 >>(0x4E.L+1)	byte		x		%02d)
 
 # Palm OS .prc file types
-60		string		libr		Palm OS dynamic library data
->0		string		>\0		"%s"
+60		string		libr
+# flags, only bit 0 or bit 6
+# http://en.wikipedia.org/wiki/PRC_%28Palm_OS%29
+# http://web.mit.edu/tytso/www/pilot/prc-format.html
+>0x20		beshort&0xffbe	0
+>>0		string		>\0		Palm OS dynamic library data "%s"
 60		string		ptch		Palm OS operating system patch data
 >0		string		>\0		"%s"
 
diff --git a/contrib/file/Magdir/parix b/contrib/file/magic/Magdir/parix
similarity index 100%
rename from contrib/file/Magdir/parix
rename to contrib/file/magic/Magdir/parix
diff --git a/contrib/file/Magdir/parrot b/contrib/file/magic/Magdir/parrot
similarity index 100%
rename from contrib/file/Magdir/parrot
rename to contrib/file/magic/Magdir/parrot
diff --git a/contrib/file/Magdir/pascal b/contrib/file/magic/Magdir/pascal
similarity index 100%
rename from contrib/file/Magdir/pascal
rename to contrib/file/magic/Magdir/pascal
diff --git a/contrib/file/magic/Magdir/pbf b/contrib/file/magic/Magdir/pbf
new file mode 100644
index 000000000000..d133d12bf621
--- /dev/null
+++ b/contrib/file/magic/Magdir/pbf
@@ -0,0 +1,11 @@
+
+#------------------------------------------------------------------------------
+# $File: pbf,v 1.1 2013/12/21 14:27:24 christos Exp $
+# file(1) magic(5) data for OpenStreetMap
+
+# OpenStreetMap Protocolbuffer Binary Format (.osm.pbf)
+# http://wiki.openstreetmap.org/wiki/PBF_Format
+# From: Markus Heidelberg <markus.heidelberg@web.de>
+0	belong		0x0000000D
+>4	beshort		0x0A09
+>>6	string		OSMHeader	OpenStreetMap Protocolbuffer Binary Format
diff --git a/contrib/file/Magdir/pbm b/contrib/file/magic/Magdir/pbm
similarity index 100%
rename from contrib/file/Magdir/pbm
rename to contrib/file/magic/Magdir/pbm
diff --git a/contrib/file/Magdir/pdf b/contrib/file/magic/Magdir/pdf
similarity index 85%
rename from contrib/file/Magdir/pdf
rename to contrib/file/magic/Magdir/pdf
index ccde22f2c15f..dc2f7992d124 100644
--- a/contrib/file/Magdir/pdf
+++ b/contrib/file/magic/Magdir/pdf
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: pdf,v 1.6 2009/09/19 16:28:11 christos Exp $
+# $File: pdf,v 1.7 2013/08/22 07:47:26 christos Exp $
 # pdf:  file(1) magic for Portable Document Format
 #
 
@@ -12,5 +12,6 @@
 # From: Nick Schmalenberger <nick@schmalenberger.us>
 # Forms Data Format
 0       string          %FDF-           FDF document
+!:mime application/vnd.fdf
 >5      byte            x               \b, version %c
 >7      byte            x               \b.%c
diff --git a/contrib/file/Magdir/pdp b/contrib/file/magic/Magdir/pdp
similarity index 65%
rename from contrib/file/Magdir/pdp
rename to contrib/file/magic/Magdir/pdp
index fa4b82b6a896..0afee0c9ba5c 100644
--- a/contrib/file/Magdir/pdp
+++ b/contrib/file/magic/Magdir/pdp
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: pdp,v 1.8 2009/09/19 16:28:11 christos Exp $
+# $File: pdp,v 1.10 2014/04/30 21:41:02 christos Exp $
 # pdp:  file(1) magic for PDP-11 executable/object and APL workspace
 #
 0	lelong		0101555		PDP-11 single precision APL workspace
@@ -10,18 +10,24 @@
 #
 0	leshort		0407		PDP-11 executable
 >8	leshort		>0		not stripped
->15	byte		>0		- version %ld
+>15	byte		>0		- version %d
 
-0	leshort		0401		PDP-11 UNIX/RT ldp
+# updated by Joerg Jenderek at Mar 2013
+# GRR: line below too general as it catches also Windows precompiled setup information *.PNF
+0	leshort		0401		
+# skip *.PNF with WinDirPathOffset 58h 
+>68	ulelong		!0x00000058	PDP-11 UNIX/RT ldp
+# skip *.PNF with high byte of InfVersionDatumCount zero
+#>>15	byte		!0		PDP-11 UNIX/RT ldp
 0	leshort		0405		PDP-11 old overlay
 
 0	leshort		0410		PDP-11 pure executable
 >8	leshort		>0		not stripped
->15	byte		>0		- version %ld
+>15	byte		>0		- version %d
 
 0	leshort		0411		PDP-11 separate I&D executable
 >8	leshort		>0		not stripped
->15	byte		>0		- version %ld
+>15	byte		>0		- version %d
 
 0	leshort		0437		PDP-11 kernel overlay
 
diff --git a/contrib/file/Magdir/perl b/contrib/file/magic/Magdir/perl
similarity index 55%
rename from contrib/file/Magdir/perl
rename to contrib/file/magic/Magdir/perl
index e11f2ab58747..b5b54fbc820a 100644
--- a/contrib/file/Magdir/perl
+++ b/contrib/file/magic/Magdir/perl
@@ -1,20 +1,14 @@
 #------------------------------------------------------------------------------
-# $File: perl,v 1.17 2011/12/16 16:24:40 rrt Exp $
+# $File: perl,v 1.22 2014/04/28 12:04:35 christos Exp $
 # perl:  file(1) magic for Larry Wall's perl language.
 #
 # The `eval' lines recognizes an outrageously clever hack.
 # Keith Waclena <keith@cerberus.uchicago.edu>
 # Send additions to <perl5-porters@perl.org>
-0	search/1/w	#!\ /bin/perl			Perl script text executable
-!:mime	text/x-perl
 0	search/1	eval\ "exec\ /bin/perl		Perl script text
 !:mime	text/x-perl
-0	search/1/w	#!\ /usr/bin/perl		Perl script text executable
-!:mime	text/x-perl
 0	search/1	eval\ "exec\ /usr/bin/perl	Perl script text
 !:mime	text/x-perl
-0	search/1/w	#!\ /usr/local/bin/perl		Perl script text executable
-!:mime	text/x-perl
 0	search/1	eval\ "exec\ /usr/local/bin/perl	Perl script text
 !:mime	text/x-perl
 0	search/1	eval\ '(exit\ $?0)'\ &&\ eval\ 'exec	Perl script text
@@ -23,17 +17,20 @@
 !:mime	text/x-perl
 0	search/1	#!\ /usr/bin/env\ perl	Perl script text executable
 !:mime	text/x-perl
+0	search/1	#!
+>0	regex	\^#!.*/bin/perl$	Perl script text executable
+!:mime	text/x-perl
 
 # by Dmitry V. Levin and Alexey Tourbin
 # check the first line
 0	search/1	package
 >0	regex		\^package[\ \t]+[0-9A-Za-z_:]+\ *;	Perl5 module source text
+!:strength + 10
 # not 'p', check other lines
 0	search/1	!p
 >0	regex		\^package[\ \t]+[0-9A-Za-z_:]+\ *;
 >>0	regex		\^1\ *;|\^(use|sub|my)\ .*[(;{=]	Perl5 module source text
-
-
+!:strength + 10
 
 # Perl POD documents
 # From: Tom Hukins <tom@eborcom.com>
@@ -43,6 +40,9 @@
 0	search/1/W	\n\=head1\ 	Perl POD document text
 0	search/1/W	\=head2\ 	Perl POD document text
 0	search/1/W	\n\=head2\ 	Perl POD document text
+0	search/1/W	\=encoding\ 	Perl POD document text
+0	search/1/W	\n\=encoding\ 	Perl POD document text
+
 
 # Perl Storable data files.
 0	string	perl-store	perl Storable (v0.6) data
@@ -57,3 +57,34 @@
 >>4	byte	=5	(major 2)
 >>4	byte	=4	(major 2)
 >>5	byte	>0	(minor %d)
+
+# This is Debian #742949 by Zefram <zefram@fysh.org>:
+# -----------------------------------------------------------
+# The Perl module Hash::SharedMem
+# <https://metacpan.org/release/Hash-SharedMem> defines a file format
+# for a key/value store.  Details of the file format are in the "DESIGN"
+# file in the module distribution.  Magic:
+0	bequad	=0xa58afd185cbf5af7	Hash::SharedMem master file, big-endian
+>8	bequad	<0x1000000
+>>15	byte	>2	\b, line size 2^%d byte
+>>14	byte	>2	\b, page size 2^%d byte
+>>13	byte	&1
+>>>13	byte	>1	\b, max fanout %d
+0	lequad	=0xa58afd185cbf5af7	Hash::SharedMem master file, little-endian
+>8	lequad	<0x1000000
+>>8	byte	>2	\b, line size 2^%d byte
+>>9	byte	>2	\b, page size 2^%d byte
+>>10	byte	&1
+>>>10	byte	>1	\b, max fanout %d
+0	bequad	=0xc693dac5ed5e47c2	Hash::SharedMem data file, big-endian
+>8	bequad	<0x1000000
+>>15	byte	>2	\b, line size 2^%d byte
+>>14	byte	>2	\b, page size 2^%d byte
+>>13	byte	&1
+>>>13	byte	>1	\b, max fanout %d
+0	lequad	=0xc693dac5ed5e47c2	Hash::SharedMem data file, little-endian
+>8	lequad	<0x1000000
+>>8	byte	>2	\b, line size 2^%d byte
+>>9	byte	>2	\b, page size 2^%d byte
+>>10	byte	&1
+>>>10	byte	>1	\b, max fanout %d
diff --git a/contrib/file/magic/Magdir/pgf b/contrib/file/magic/Magdir/pgf
new file mode 100644
index 000000000000..825f5f685690
--- /dev/null
+++ b/contrib/file/magic/Magdir/pgf
@@ -0,0 +1,52 @@
+
+#------------------------------------------------------------------------------
+# $File: pgf,v 1.1 2013/04/22 15:19:49 christos Exp $
+# pgf: file(1) magic for Progressive Graphics File (PGF)
+#
+# <http://www.libpgf.org/uploads/media/PGF_Details_01.pdf>
+# 2013 by Philipp Hahn <pmhahn debian org>
+0 string PGF Progressive Graphics image data,
+!:mime image/x-pgf
+>3	string	2	version %s,
+>3	string	4	version %s,
+>3	string	5	version %s,
+>3	string	6	version %s,
+#	PGFPreHeader
+#>>4	lelong	x	header size %d,
+#	PGFHeader
+>>8	lelong	x	%d x
+>>12	lelong	x	%d,
+>>16	byte	x	%d levels,
+>>17	byte	x	compression level %d,
+>>18	byte	x	%d bpp,
+>>19	byte	x	%d channels,
+>>20	clear	x
+>>20	byte	0	bitmap,
+>>20	byte	1	gray scale,
+>>20	byte	2	indexed color,
+>>20	byte	3	RGB color,
+>>20	byte	4	CYMK color,
+>>20	byte	5	HSL color,
+>>20	byte	6	HSB color,
+>>20	byte	7	multi-channel,
+>>20	byte	8	duo tone,
+>>20	byte	9	LAB color,
+>>20	byte	10	gray scale 16,
+>>20	byte	11	RGB color 48,
+>>20	byte	12	LAB color 48,
+>>20	byte	13	CYMK color 64,
+>>20	byte	14	deep multi-channel,
+>>20	byte	15	duo tone 16,
+>>20	byte	17	RGBA color,
+>>20	byte	18	gray scale 32,
+>>20	byte	19	RGB color 12,
+>>20	byte	20	RGB color 16,
+>>20	byte	255	unknown format,
+>>20	default	x	format 
+>>>20	byte	x	\b %d,
+>>21	byte	x	%d bpc
+#	PGFPostHeader
+#	Level-Sizes
+#>>(4.l+4)	lelong x level 0 size: %d
+#>>(4.l+8)	lelong x level 1 size: %d
+#>>(4.l+12)	lelong x level 2 size: %d
diff --git a/contrib/file/Magdir/pgp b/contrib/file/magic/Magdir/pgp
similarity index 100%
rename from contrib/file/Magdir/pgp
rename to contrib/file/magic/Magdir/pgp
diff --git a/contrib/file/Magdir/pkgadd b/contrib/file/magic/Magdir/pkgadd
similarity index 100%
rename from contrib/file/Magdir/pkgadd
rename to contrib/file/magic/Magdir/pkgadd
diff --git a/contrib/file/Magdir/plan9 b/contrib/file/magic/Magdir/plan9
similarity index 100%
rename from contrib/file/Magdir/plan9
rename to contrib/file/magic/Magdir/plan9
diff --git a/contrib/file/Magdir/plus5 b/contrib/file/magic/Magdir/plus5
similarity index 100%
rename from contrib/file/Magdir/plus5
rename to contrib/file/magic/Magdir/plus5
diff --git a/contrib/file/Magdir/printer b/contrib/file/magic/Magdir/printer
similarity index 86%
rename from contrib/file/Magdir/printer
rename to contrib/file/magic/Magdir/printer
index d9d39eefc830..10168266c924 100644
--- a/contrib/file/Magdir/printer
+++ b/contrib/file/magic/Magdir/printer
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: printer,v 1.25 2011/05/20 23:31:46 christos Exp $
+# $File: printer,v 1.26 2014/04/12 14:51:52 christos Exp $
 # printer:  file(1) magic for printer-formatted files
 #
 
@@ -68,6 +68,22 @@
 0	string		\033%-12345X@PJL
 >&0	search/10000	%!			PJL encapsulated PostScript document text
 
+# Rick Richardson <rickrich@gmail.com>
+
+# For Fuji-Xerox Printers - HBPL stands for Host Based Printer Language
+# For Oki Data Printers - HIPERC
+# For Konica Minolta Printers - LAVAFLOW
+# For Samsung Printers - QPDL
+# For HP Printers - ZJS stands for Zenographics ZJStream
+0	string		\033%-12345X@PJL	HP Printer Job Language data
+>0	search/10000	@PJL\ ENTER\ LANGUAGE=HBPL	- HBPL
+>0	search/10000	@PJL\ ENTER\ LANGUAGE=HIPERC	- Oki Data HIPERC
+>0	search/10000	@PJL\ ENTER\ LANGUAGE=LAVAFLOW	- Konica Minolta LAVAFLOW
+>0	search/10000	@PJL\ ENTER\ LANGUAGE=QPDL	- Samsung QPDL
+>0	search/10000	@PJL\ ENTER\ LANGUAGE\ =\ QPDL	- Samsung QPDL
+>0	search/10000	@PJL\ ENTER\ LANGUAGE=ZJS	- HP ZJS
+
+
 # HP Printer Control Language, Daniel Quinlan (quinlan@yggdrasil.com)
 0	string		\033E\033	HP PCL printer data
 >3	string		\&l0A		- default page size
@@ -108,7 +124,7 @@
 
 #------------------------------------------------------------------------------
 # zenographics:  file(1) magic for Zenographics ZjStream printer data
-# Rick Richardson  rickr@mn.rr.com
+# Rick Richardson <rickrich@gmail.com>
 0	string		JZJZ
 >0x12	string		ZZ		Zenographics ZjStream printer data (big-endian)
 0	string		ZJZJ
@@ -117,7 +133,7 @@
 
 #------------------------------------------------------------------------------
 # Oak Technologies printer stream
-# Rick Richardson <rickr@mn.rr.com>
+# Rick Richardson <rickrich@gmail.com>
 0       string          OAK
 >0x07	byte		0
 >0x0b	byte		0	Oak Technologies printer stream
diff --git a/contrib/file/Magdir/project b/contrib/file/magic/Magdir/project
similarity index 100%
rename from contrib/file/Magdir/project
rename to contrib/file/magic/Magdir/project
diff --git a/contrib/file/Magdir/psdbms b/contrib/file/magic/Magdir/psdbms
similarity index 100%
rename from contrib/file/Magdir/psdbms
rename to contrib/file/magic/Magdir/psdbms
diff --git a/contrib/file/Magdir/pulsar b/contrib/file/magic/Magdir/pulsar
similarity index 100%
rename from contrib/file/Magdir/pulsar
rename to contrib/file/magic/Magdir/pulsar
diff --git a/contrib/file/magic/Magdir/pwsafe b/contrib/file/magic/Magdir/pwsafe
new file mode 100644
index 000000000000..93dcfb123469
--- /dev/null
+++ b/contrib/file/magic/Magdir/pwsafe
@@ -0,0 +1,14 @@
+
+#------------------------------------------------------------------------------
+# $File: pwsafe,v 1.1 2012/10/25 00:12:19 christos Exp $
+# pwsafe: file(1) magic for passwordsafe file
+#
+# Password Safe
+# http://passwordsafe.sourceforge.net/
+# file format specs
+# http://passwordsafe.svn.sourceforge.net/viewvc/passwordsafe/trunk/pwsafe/pwsafe/docs/formatV3.txt
+# V2 http://passwordsafe.svn.sourceforge.net/viewvc/passwordsafe/trunk/pwsafe/pwsafe/docs/formatV2.txt
+# V1 http://passwordsafe.svn.sourceforge.net/viewvc/passwordsafe/trunk/pwsafe/pwsafe/docs/notes.txt
+# V2 and V1 have no easy identifier that I can find
+# .psafe3
+0	string	PWS3	Password Safe V3 database
diff --git a/contrib/file/Magdir/pyramid b/contrib/file/magic/Magdir/pyramid
similarity index 100%
rename from contrib/file/Magdir/pyramid
rename to contrib/file/magic/Magdir/pyramid
diff --git a/contrib/file/Magdir/python b/contrib/file/magic/Magdir/python
similarity index 81%
rename from contrib/file/Magdir/python
rename to contrib/file/magic/Magdir/python
index e339014e9cf6..d954ee63f57b 100644
--- a/contrib/file/Magdir/python
+++ b/contrib/file/magic/Magdir/python
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: python,v 1.20 2011/12/13 13:53:14 christos Exp $
+# $File: python,v 1.25 2014/05/06 16:08:32 christos Exp $
 # python:  file(1) magic for python
 #
 # Outlook puts """ too for urgent messages
@@ -22,6 +22,7 @@
 0	belong		0x3b0c0d0a	python 3.0 byte-compiled
 0	belong		0x4f0c0d0a	python 3.1 byte-compiled
 0	belong		0x6c0c0d0a	python 3.2 byte-compiled
+0	belong		0x9e0c0d0a	python 3.3 byte-compiled
 
 0	search/1/w	#!\ /usr/bin/python	Python script text executable
 !:mime text/x-python
@@ -43,13 +44,13 @@
 !:mime text/x-python
 
 # comments
-0	search/4096	'''
->&0	regex	.*'''$	Python script text executable
-!:mime text/x-python
+#0	search/4096	'''
+#>&0	regex	.*'''$	Python script text executable
+#!:mime text/x-python
 
-0	search/4096	"""
->&0	regex	.*"""$	Python script text executable
-!:mime text/x-python
+#0	search/4096	"""
+#>&0	regex	.*"""$	Python script text executable
+#!:mime text/x-python
 
 # try:
 # except: or finally:
@@ -59,3 +60,8 @@
 !:mime text/x-python
 >&0	search/4096	finally:	Python script text executable
 !:mime text/x-python
+
+# def name(args, args):
+0	regex	 \^(\ |\\t){0,50}def\ {1,50}[a-zA-Z]{1,100}
+>&0	regex	\ {0,50}\\(([a-zA-Z]|,|\ ){1,255}\\):$ Python script text executable
+!:mime text/x-python
diff --git a/contrib/file/Magdir/revision b/contrib/file/magic/Magdir/revision
similarity index 94%
rename from contrib/file/Magdir/revision
rename to contrib/file/magic/Magdir/revision
index b337ee3b2d7b..e4e4de105963 100644
--- a/contrib/file/Magdir/revision
+++ b/contrib/file/magic/Magdir/revision
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: revision,v 1.8 2010/11/25 15:00:12 christos Exp $
+# $File: revision,v 1.9 2013/02/06 14:18:52 christos Exp $
 # file(1) magic for revision control files
 # From Hendrik Scholz <hendrik@scholz.net>
 0	string/t	/1\ :pserver:	cvs password text file
@@ -29,7 +29,7 @@
 >4	belong	=2		\b, version 2
 
 # Type: Git index file
-# From: Frédéric Brière <fbriere@fbriere.net>
+# From: Frederic Briare <fbriere@fbriere.net>
 0	string	DIRC		Git index
 >4	belong	>0		\b, version %d
 >>8	belong	>0		\b, %d entries
diff --git a/contrib/file/Magdir/riff b/contrib/file/magic/Magdir/riff
similarity index 85%
rename from contrib/file/Magdir/riff
rename to contrib/file/magic/Magdir/riff
index 4fffafacf31f..d63ba4bbbef8 100644
--- a/contrib/file/Magdir/riff
+++ b/contrib/file/magic/Magdir/riff
@@ -1,12 +1,52 @@
 
 #------------------------------------------------------------------------------
-# $File: riff,v 1.22 2011/09/06 11:00:06 christos Exp $
+# $File: riff,v 1.27 2014/04/30 21:41:02 christos Exp $
 # riff:  file(1) magic for RIFF format
 # See
 #
 #	http://www.seanet.com/users/matts/riffmci/riffmci.htm
 #
-# AVI section extended by Patrik R�dman <patrik+file-magic@iki.fi>
+
+# audio format tag. Assume limits: max 1024 bit, 128 channels, 1 MHz
+0   name    riff-wave
+>0	leshort		1		\b, Microsoft PCM
+>>14	leshort		>0
+>>>14	leshort		<1024	\b, %d bit
+>0	leshort		2		\b, Microsoft ADPCM
+>0	leshort		6		\b, ITU G.711 A-law
+>0	leshort		7		\b, ITU G.711 mu-law
+>0	leshort		8		\b, Microsoft DTS
+>0	leshort		17		\b, IMA ADPCM
+>0	leshort		20		\b, ITU G.723 ADPCM (Yamaha)
+>0	leshort		49		\b, GSM 6.10
+>0	leshort		64		\b, ITU G.721 ADPCM
+>0	leshort		80		\b, MPEG
+>0	leshort		85		\b, MPEG Layer 3
+>0	leshort		0x2001		\b, DTS
+>2	leshort		=1		\b, mono
+>2	leshort		=2		\b, stereo
+>2	leshort		>2
+>>2	leshort		<128	\b, %d channels
+>4	lelong		>0
+>>4	lelong		<1000000	%d Hz
+
+# try to find "fmt "
+0   name    riff-walk
+>0  string  fmt\x20
+>>4 lelong  <0x80
+>>>8 use    riff-wave
+>0  string  LIST
+>>&(4.l+4)  use riff-walk
+>0  string  DISP
+>>&(4.l+4)  use riff-walk
+>0  string  bext
+>>&(4.l+4)  use riff-walk
+>0  string  Fake
+>>&(4.l+4)  use riff-walk
+>0  string  fact
+>>&(4.l+4)  use riff-walk
+
+# AVI section extended by Patrik Radman <patrik+file-magic@iki.fi>
 #
 0	string		RIFF		RIFF (little-endian) data
 # RIFF Palette format
@@ -35,33 +75,21 @@
 # Microsoft WAVE format (*.wav)
 >8	string		WAVE		\b, WAVE audio
 !:mime	audio/x-wav
->>20	leshort		1		\b, Microsoft PCM
->>>34	leshort		>0		\b, %d bit
->>20	leshort		2		\b, Microsoft ADPCM
->>20	leshort		6		\b, ITU G.711 A-law
->>20	leshort		7		\b, ITU G.711 mu-law
->>20	leshort		8		\b, Microsoft DTS
->>20	leshort		17		\b, IMA ADPCM
->>20	leshort		20		\b, ITU G.723 ADPCM (Yamaha)
->>20	leshort		49		\b, GSM 6.10
->>20	leshort		64		\b, ITU G.721 ADPCM
->>20	leshort		80		\b, MPEG
->>20	leshort		85		\b, MPEG Layer 3
->>20	leshort		0x2001		\b, DTS
->>22	leshort		=1		\b, mono
->>22	leshort		=2		\b, stereo
->>22	leshort		>2		\b, %d channels
->>24	lelong		>0		%d Hz
+>>12    string  >\0
+>>>12   use     riff-walk
 # Corel Draw Picture
 >8	string		CDRA		\b, Corel Draw Picture
 !:mime	image/x-coreldraw
+>8	string		CDR6		\b, Corel Draw Picture, version 6
+!:mime	image/x-coreldraw
+>8	string		NUNDROOT	\b, Steinberg CuBase
 # AVI == Audio Video Interleave
 >8	string		AVI\040		\b, AVI
 !:mime	video/x-msvideo
 >>12    string          LIST
 >>>20   string          hdrlavih
->>>>&36 lelong          x               \b, %lu x
->>>>&40 lelong          x               %lu,
+>>>>&36 lelong          x               \b, %u x
+>>>>&40 lelong          x               %u,
 >>>>&4  lelong          >1000000        <1 fps,
 >>>>&4  lelong          1000000         1.00 fps,
 >>>>&4  lelong          500000          2.00 fps,
@@ -220,6 +248,7 @@
 >>24	belong		>0		%d Hz
 # Corel Draw Picture
 >8	string		CDRA		\b, Corel Draw Picture
+>8	string		CDR6		\b, Corel Draw Picture, version 6
 # AVI == Audio Video Interleave
 >8	string		AVI\040		\b, AVI
 # Animated Cursor format
@@ -247,7 +276,7 @@
 
 #------------------------------------------------------------------------------
 # MBWF/RF64
-# see EBU � TECH 3306 http://tech.ebu.ch/docs/tech/tech3306-2009.pdf
+# see EBU TECH 3306 http://tech.ebu.ch/docs/tech/tech3306-2009.pdf
 0	string	RF64\xff\xff\xff\xffWAVEds64		MBWF/RF64 audio
 !:mime	audio/x-wav
 >40	search/256	fmt\x20		\b
diff --git a/contrib/file/Magdir/rinex b/contrib/file/magic/Magdir/rinex
similarity index 100%
rename from contrib/file/Magdir/rinex
rename to contrib/file/magic/Magdir/rinex
diff --git a/contrib/file/Magdir/rpm b/contrib/file/magic/Magdir/rpm
similarity index 69%
rename from contrib/file/Magdir/rpm
rename to contrib/file/magic/Magdir/rpm
index 85232c6cd160..9a795f841ade 100644
--- a/contrib/file/Magdir/rpm
+++ b/contrib/file/magic/Magdir/rpm
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: rpm,v 1.11 2011/06/14 12:47:41 christos Exp $
+# $File: rpm,v 1.12 2013/01/11 16:45:23 christos Exp $
 #
 # RPM: file(1) magic for Red Hat Packages   Erik Troan (ewt@redhat.com)
 #
@@ -31,22 +31,15 @@
 >>8	beshort		255		noarch
 
 #delta RPM    Daniel Novotny (dnovotny@redhat.com)
-0	string	drpm	Delta RPM
+0	string		drpm		Delta RPM
 !:mime  application/x-rpm
 >12	string 	x	%s
-
->>>8	beshort		11		MIPSel
->>>8	beshort		12		ARM
->>>8	beshort		13		MiNT
->>>8	beshort		14		S/390
->>>8	beshort		15		S/390x
->>>8	beshort		16		PowerPC64
->>>8	beshort		17		SuperH
->>>8	beshort		18		Xtensa
+>>8	beshort		11		MIPSel
+>>8	beshort		12		ARM
+>>8	beshort		13		MiNT
+>>8	beshort		14		S/390
+>>8	beshort		15		S/390x
+>>8	beshort		16		PowerPC64
+>>8	beshort		17		SuperH
+>>8	beshort		18		Xtensa
 >>10	string		x		%s
-
-# Type:	Delta RPM
-# From:	Daniel Novotny (dnovotny@redhat.com)
-0	string		drpm		Delta RPM
-!:mime application/x-rpm
->12	string		x		%s
diff --git a/contrib/file/Magdir/rtf b/contrib/file/magic/Magdir/rtf
similarity index 100%
rename from contrib/file/Magdir/rtf
rename to contrib/file/magic/Magdir/rtf
diff --git a/contrib/file/Magdir/ruby b/contrib/file/magic/Magdir/ruby
similarity index 100%
rename from contrib/file/Magdir/ruby
rename to contrib/file/magic/Magdir/ruby
diff --git a/contrib/file/Magdir/sc b/contrib/file/magic/Magdir/sc
similarity index 100%
rename from contrib/file/Magdir/sc
rename to contrib/file/magic/Magdir/sc
diff --git a/contrib/file/Magdir/sccs b/contrib/file/magic/Magdir/sccs
similarity index 100%
rename from contrib/file/Magdir/sccs
rename to contrib/file/magic/Magdir/sccs
diff --git a/contrib/file/Magdir/scientific b/contrib/file/magic/Magdir/scientific
similarity index 91%
rename from contrib/file/Magdir/scientific
rename to contrib/file/magic/Magdir/scientific
index 7418f1ba54ac..f780743ca495 100644
--- a/contrib/file/Magdir/scientific
+++ b/contrib/file/magic/Magdir/scientific
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: scientific,v 1.7 2010/09/20 19:19:17 rrt Exp $
+# $File: scientific,v 1.9 2014/06/03 19:01:34 christos Exp $
 # scientific:  file(1) magic for scientific formats 
 #
 # From: Joe Krahn <krahn@niehs.nih.gov>
@@ -65,7 +65,7 @@
 0       search/1/c	0\ HEAD         GEDCOM genealogy text
 >&0     search		1\ GEDC
 >>&0    search		2\ VERS         version
->>>&1   search/1	>\0		%s
+>>>&1   string		>\0		%s
 # From: Phil Endecott <phil05@chezphil.org>
 0	string	\000\060\000\040\000\110\000\105\000\101\000\104		GEDCOM data
 0	string	\060\000\040\000\110\000\105\000\101\000\104\000		GEDCOM data
@@ -91,12 +91,12 @@
 # uppercase letters. However, examples have been seen without the date string,
 # e.g., the example on the chemime site.
 0	string	HEADER\ \ \ \ 
->&0	regex/1	\^.{40}
->>&0	regex/1	[0-9]{2}-[A-Z]{3}-[0-9]{2}\ {3}
->>>&0	regex/1s	[A-Z0-9]{4}.{14}$
->>>>&0	regex/1	[A-Z0-9]{4}	Protein Data Bank data, ID Code %s
+>&0	regex/1l	\^.{40}
+>>&0	regex/1l	[0-9]{2}-[A-Z]{3}-[0-9]{2}\ {3}
+>>>&0	regex/1ls	[A-Z0-9]{4}.{14}$
+>>>>&0	regex/1l	[A-Z0-9]{4}	Protein Data Bank data, ID Code %s
 !:mime	chemical/x-pdb
->>>>0	regex/1	[0-9]{2}-[A-Z]{3}-[0-9]{2}	\b, %s
+>>>>0	regex/1l	[0-9]{2}-[A-Z]{3}-[0-9]{2}	\b, %s
 
 # Type:	GDSII Stream file
 0	belong	0x00060002	GDSII Stream file
diff --git a/contrib/file/Magdir/securitycerts b/contrib/file/magic/Magdir/securitycerts
similarity index 100%
rename from contrib/file/Magdir/securitycerts
rename to contrib/file/magic/Magdir/securitycerts
diff --git a/contrib/file/Magdir/selinux b/contrib/file/magic/Magdir/selinux
similarity index 100%
rename from contrib/file/Magdir/selinux
rename to contrib/file/magic/Magdir/selinux
diff --git a/contrib/file/Magdir/sendmail b/contrib/file/magic/Magdir/sendmail
similarity index 100%
rename from contrib/file/Magdir/sendmail
rename to contrib/file/magic/Magdir/sendmail
diff --git a/contrib/file/Magdir/sequent b/contrib/file/magic/Magdir/sequent
similarity index 61%
rename from contrib/file/Magdir/sequent
rename to contrib/file/magic/Magdir/sequent
index 0ce6bf2c796a..9ef2aa9e67d8 100644
--- a/contrib/file/Magdir/sequent
+++ b/contrib/file/magic/Magdir/sequent
@@ -1,35 +1,45 @@
 
 #------------------------------------------------------------------------------
-# $File: sequent,v 1.8 2009/09/19 16:28:12 christos Exp $
+# $File: sequent,v 1.11 2014/06/02 19:27:54 christos Exp $
 # sequent:  file(1) magic for Sequent machines
 #
 # Sequent information updated by Don Dwiggins <atsun!dwiggins>.
 # For Sequent's multiprocessor systems (incomplete).
 0	lelong	0x00ea        	BALANCE NS32000 .o
 >16	lelong	>0		not stripped
->124	lelong	>0		version %ld
+>124	lelong	>0		version %d
 0	lelong	0x10ea        	BALANCE NS32000 executable (0 @ 0)
 >16	lelong  >0            	not stripped
->124	lelong	>0		version %ld
+>124	lelong	>0		version %d
 0	lelong	0x20ea        	BALANCE NS32000 executable (invalid @ 0)
 >16	lelong  >0            	not stripped
->124	lelong	>0		version %ld
+>124	lelong	>0		version %d
 0	lelong	0x30ea        	BALANCE NS32000 standalone executable
 >16	lelong  >0          	not stripped
->124	lelong	>0		version %ld
+>124	lelong	>0		version %d
 #
 # Symmetry information added by Jason Merrill <jason@jarthur.claremont.edu>.
 # Symmetry magic nums will not be reached if DOS COM comes before them;
 # byte 0xeb is matched before these get a chance.
 0	leshort	0x12eb		SYMMETRY i386 .o
 >16	lelong	>0		not stripped
->124	lelong	>0		version %ld
+>124	lelong	>0		version %d
 0	leshort	0x22eb		SYMMETRY i386 executable (0 @ 0)
 >16	lelong	>0		not stripped
->124	lelong	>0		version %ld
+>124	lelong	>0		version %d
 0	leshort	0x32eb		SYMMETRY i386 executable (invalid @ 0)
 >16	lelong	>0		not stripped
->124	lelong	>0		version %ld
+>124	lelong	>0		version %d
 0	leshort	0x42eb		SYMMETRY i386 standalone executable
 >16	lelong	>0		not stripped
->124	lelong	>0		version %ld
+>124	lelong	>0		version %d
+# http://en.wikipedia.org/wiki/Sequent_Computer_Systems
+# below test line conflicts with MS-DOS 2.11 floppies and Acronis loader
+#0	leshort	0x42eb		SYMMETRY i386 standalone executable
+0	leshort	0x42eb		
+# skip unlike negative version
+>124	lelong	>-1		
+# assuming version 28867614 is very low probable
+>>124	lelong	!28867614	SYMMETRY i386 standalone executable
+>>>16	lelong	>0		not stripped
+>>>124	lelong	>0		version %d
diff --git a/contrib/file/magic/Magdir/sereal b/contrib/file/magic/Magdir/sereal
new file mode 100644
index 000000000000..e40f9e2f4f07
--- /dev/null
+++ b/contrib/file/magic/Magdir/sereal
@@ -0,0 +1,24 @@
+#------------------------------------------------------------------------------
+# $File: sereal,v 1.1 2014/05/14 23:04:59 christos Exp $
+# sereal: file(1) magic the Sereal binary serialization format
+#
+# From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+#
+# See the specification of the format at
+# https://github.com/Sereal/Sereal/blob/master/sereal_spec.pod#document-header-format
+#
+# I'd have liked to do the byte&0xF0 matching against 0, 1, 2 ... by
+# doing (byte&0xF0)>>4 here, but unfortunately that's not
+# supported. So when we print out a message about an unknown format
+# we'll print out e.g. 0x30 instead of the more human-readable
+# 0x30>>4.
+#
+# See https://github.com/Sereal/Sereal/commit/35372ae01d in the
+# Sereal.git repository for test Sereal data.
+0      string             \=srl   Sereal data
+!:mime application/sereal
+>4     byte&0x0F          x       (version %d,
+>4     byte&0xF0          0x00    uncompressed)
+>4     byte&0xF0          0x10    compressed with non-incremental Snappy)
+>4     byte&0xF0          0x20    compressed with incremental Snappy)
+>4     byte&0xF0          >0x20   unknown subformat, flag: %d>>4)
diff --git a/contrib/file/magic/Magdir/sgi b/contrib/file/magic/Magdir/sgi
new file mode 100644
index 000000000000..a6223d78d117
--- /dev/null
+++ b/contrib/file/magic/Magdir/sgi
@@ -0,0 +1,138 @@
+
+#------------------------------------------------------------------------------
+# $File: sgi,v 1.21 2014/04/30 21:41:02 christos Exp $
+# sgi:  file(1) magic for Silicon Graphics operating systems and applications
+#
+# Executable images are handled either in aout (for old-style a.out
+# files for 68K; they are indistinguishable from other big-endian 32-bit
+# a.out files) or in mips (for MIPS ECOFF and Ucode files)
+#
+
+# kbd file definitions
+0	string	kbd!map		kbd map file
+>8	byte	>0		Ver %d:
+>10	short	>0		with %d table(s)
+
+0	beshort	0x8765		disk quotas file
+
+0	beshort	0x0506		IRIS Showcase file
+>2	byte	0x49		-
+>3	byte	x		- version %d
+0	beshort	0x0226		IRIS Showcase template
+>2	byte	0x63		-
+>3	byte	x		- version %d
+0	belong	0x5343464d	IRIS Showcase file
+>4	byte	x		- version %d
+0	belong	0x5443464d	IRIS Showcase template
+>4	byte	x		- version %d
+0	belong	0xdeadbabe	IRIX Parallel Arena
+>8	belong	>0		- version %d
+
+# core files
+#
+# 32bit core file
+0	belong	0xdeadadb0	IRIX core dump
+>4	belong	1		of
+>16	string	>\0		'%s'
+# 64bit core file
+0	belong	0xdeadad40	IRIX 64-bit core dump
+>4	belong	1		of
+>16	string	>\0		'%s'
+# N32bit core file
+0       belong	0xbabec0bb	IRIX N32 core dump
+>4      belong	1               of
+>16     string	>\0             '%s'
+# New style crash dump file
+0	string	\x43\x72\x73\x68\x44\x75\x6d\x70	IRIX vmcore dump of
+>36	string	>\0					'%s'
+
+# Trusted IRIX info
+0	string	SGIAUDIT	SGI Audit file
+>8	byte	x		- version %d
+>9	byte	x		\b.%d
+#
+0	string	WNGZWZSC	Wingz compiled script
+0	string	WNGZWZSS	Wingz spreadsheet
+0	string	WNGZWZHP	Wingz help file
+#
+0	string	#Inventor V	IRIS Inventor 1.0 file
+0	string	#Inventor V2	Open Inventor 2.0 file
+# GLF is OpenGL stream encoding
+0	string	glfHeadMagic();		GLF_TEXT
+4	belong	0x7d000000		GLF_BINARY_LSB_FIRST
+!:strength -30
+4	belong	0x0000007d		GLF_BINARY_MSB_FIRST
+!:strength -30
+# GLS is OpenGL stream encoding; GLS is the successor of GLF
+0	string	glsBeginGLS(		GLS_TEXT
+4	belong	0x10000000		GLS_BINARY_LSB_FIRST
+!:strength -30
+4	belong	0x00000010		GLS_BINARY_MSB_FIRST
+!:strength -30
+
+#
+#
+# Performance Co-Pilot file types
+0	string	PmNs				PCP compiled namespace (V.0)
+0	string	PmN				PCP compiled namespace
+>3	string	>\0				(V.%1.1s)
+#3	lelong	0x84500526			PCP archive
+3	belong	0x84500526			PCP archive
+>7	byte	x				(V.%d)
+#>20	lelong	-2				temporal index
+#>20	lelong	-1				metadata
+#>20	lelong	0				log volume #0
+#>20	lelong	>0				log volume #%d
+>20	belong	-2				temporal index
+>20	belong	-1				metadata
+>20	belong	0				log volume #0
+>20	belong	>0				log volume #%d
+>24	string	>\0				host: %s
+0	string	PCPFolio			PCP
+>9	string	Version:			Archive Folio
+>18	string	>\0				(V.%s)
+0	string	#pmchart			PCP pmchart view
+>9	string	Version
+>17	string	>\0				(V%-3.3s)
+0	string	#kmchart			PCP kmchart view
+>9	string	Version
+>17	string	>\0				(V.%s)
+0	string	pmview				PCP pmview config
+>7	string	Version
+>15	string	>\0				(V%-3.3s)
+0	string	#pmlogger			PCP pmlogger config
+>10	string	Version
+>18	string	>\0				(V%1.1s)
+0	string	#pmdahotproc			PCP pmdahotproc config
+>13	string	Version
+>21	string	>\0				(V%-3.3s)
+0	string	PcPh				PCP Help
+>4	string	1				Index
+>4	string	2				Text
+>5	string	>\0				(V.%1.1s)
+0	string	#pmieconf-rules			PCP pmieconf rules
+>16	string	>\0				(V.%1.1s)
+3	string	pmieconf-pmie			PCP pmie config
+>17	string	>\0				(V.%1.1s)
+
+# SpeedShop data files
+0	lelong	0x13130303			SpeedShop data file
+
+# mdbm files
+0	lelong	0x01023962			mdbm file, version 0 (obsolete)
+0	string	mdbm				mdbm file,
+>5	byte	x				version %d,
+>6	byte	x				2^%d pages,
+>7	byte	x				pagesize 2^%d,
+>17	byte	x				hash %d,
+>11	byte	x				dataformat %d
+
+# Alias Maya files
+0	string/t	//Maya\040ASCII	Alias Maya Ascii File,
+>13	string	>\0	version %s
+8	string	MAYAFOR4	Alias Maya Binary File,
+>32	string	>\0	version %s scene
+8	string	MayaFOR4	Alias Maya Binary File,
+>32	string	>\0	version %s scene
+8	string	CIMG		Alias Maya Image File
+8	string	DEEP		Alias Maya Image File
diff --git a/contrib/file/Magdir/sgml b/contrib/file/magic/Magdir/sgml
similarity index 84%
rename from contrib/file/Magdir/sgml
rename to contrib/file/magic/Magdir/sgml
index 3f78c2f4d5c3..f9cab0816539 100644
--- a/contrib/file/Magdir/sgml
+++ b/contrib/file/magic/Magdir/sgml
@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# $File: sgml,v 1.27 2011/12/07 12:01:24 rrt Exp $
+# $File: sgml,v 1.30 2013/12/21 14:27:24 christos Exp $
 # Type:	SVG Vectorial Graphics
 # From:	Noel Torres <tecnico@ejerciciosresueltos.com>
 0	string		\<?xml\ version="
@@ -15,6 +15,13 @@
 >>19	search/4096	\<urlset		XML Sitemap document text
 !:mime	application/xml-sitemap
 
+# OpenStreetMap XML (.osm)
+# http://wiki.openstreetmap.org/wiki/OSM_XML
+# From: Markus Heidelberg <markus.heidelberg@web.de>
+0	string		\<?xml\ version="
+>15	string		>\0
+>>19	search/4096	\<osm			OpenStreetMap XML data
+
 # xhtml
 0	string/t		\<?xml\ version="
 >15	string		>\0
@@ -36,35 +43,47 @@
 # adapted to string extenstions by Anthon van der Neut <anthon@mnt.org)
 0	search/4096/cWt	\<!doctype\ html	HTML document text
 !:mime	text/html
+!:strength + 5
 0	search/4096/cwt	\<head			HTML document text
 !:mime	text/html
+!:strength + 5
 0	search/4096/cwt	\<title			HTML document text
 !:mime	text/html
+!:strength + 5
 0	search/4096/cwt	\<html			HTML document text
 !:mime	text/html
+!:strength + 5
 0	search/4096/cwt	\<script 		HTML document text
 !:mime	text/html
+!:strength + 5
 0	search/4096/cwt	\<style 		HTML document text
 !:mime	text/html
+!:strength + 5
 0	search/4096/cwt	\<table			HTML document text
 !:mime	text/html
+!:strength + 5
 0	search/4096/cwt	\<a\ href=		HTML document text
 !:mime	text/html
+!:strength + 5
 
 # Extensible markup language (XML), a subset of SGML
 # from Marc Prud'hommeaux (marc@apocalypse.org)
 0	search/1/cwt	\<?xml			XML document text
 !:mime	application/xml
+!:strength + 5
 0	string/t		\<?xml\ version\ "	XML
 !:mime	application/xml
+!:strength + 5
 0	string/t		\<?xml\ version="	XML
 !:mime	application/xml
->15	search/1	>\0			%.3s document text
+!:strength + 5
+>15	string/t	>\0			%.3s document text
 >>23	search/1	\<xsl:stylesheet	(XSL stylesheet)
 >>24	search/1	\<xsl:stylesheet	(XSL stylesheet)
 0	string		\<?xml\ version='	XML
 !:mime	application/xml
->15	search/1	>\0			%.3s document text
+!:strength + 5
+>15	string/t	>\0			%.3s document text
 >>23	search/1	\<xsl:stylesheet	(XSL stylesheet)
 >>24	search/1	\<xsl:stylesheet	(XSL stylesheet)
 0	search/1/wbt	\<?xml			XML document text
diff --git a/contrib/file/Magdir/sharc b/contrib/file/magic/Magdir/sharc
similarity index 89%
rename from contrib/file/Magdir/sharc
rename to contrib/file/magic/Magdir/sharc
index d5f360460b6a..b40e65234282 100644
--- a/contrib/file/Magdir/sharc
+++ b/contrib/file/magic/Magdir/sharc
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------
-# $File: sharc,v 1.6 2009/09/19 16:28:12 christos Exp $
+# $File: sharc,v 1.7 2014/04/30 21:41:02 christos Exp $
 # file(1) magic for sharc files
 #
 # SHARC DSP, MIDI SysEx and RiscOS filetype definitions added by 
@@ -19,5 +19,5 @@
 0	string			.system		SHARC architecture file
 
 0	leshort			0x521C		SHARC COFF binary
->2	leshort			>1		, %hd sections
+>2	leshort			>1		, %d sections
 >>12	lelong			>0		, not stripped
diff --git a/contrib/file/Magdir/sinclair b/contrib/file/magic/Magdir/sinclair
similarity index 100%
rename from contrib/file/Magdir/sinclair
rename to contrib/file/magic/Magdir/sinclair
diff --git a/contrib/file/Magdir/sisu b/contrib/file/magic/Magdir/sisu
similarity index 100%
rename from contrib/file/Magdir/sisu
rename to contrib/file/magic/Magdir/sisu
diff --git a/contrib/file/Magdir/sketch b/contrib/file/magic/Magdir/sketch
similarity index 100%
rename from contrib/file/Magdir/sketch
rename to contrib/file/magic/Magdir/sketch
diff --git a/contrib/file/Magdir/smalltalk b/contrib/file/magic/Magdir/smalltalk
similarity index 100%
rename from contrib/file/Magdir/smalltalk
rename to contrib/file/magic/Magdir/smalltalk
diff --git a/contrib/file/Magdir/smile b/contrib/file/magic/Magdir/smile
similarity index 100%
rename from contrib/file/Magdir/smile
rename to contrib/file/magic/Magdir/smile
diff --git a/contrib/file/Magdir/sniffer b/contrib/file/magic/Magdir/sniffer
similarity index 66%
rename from contrib/file/Magdir/sniffer
rename to contrib/file/magic/Magdir/sniffer
index 47f5798bd6e5..34eb7c481ad8 100644
--- a/contrib/file/Magdir/sniffer
+++ b/contrib/file/magic/Magdir/sniffer
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: sniffer,v 1.18 2011/08/08 08:49:27 christos Exp $
+# $File: sniffer,v 1.19 2013/01/06 01:11:04 christos Exp $
 # sniffer:  file(1) magic for packet capture files
 #
 # From: guy@alum.mit.edu (Guy Harris)
@@ -17,6 +17,7 @@
 >6	leshort		2		(Token Ring)
 >6	leshort		3		(FDDI)
 >6	leshort		4		(ATM)
+>6	leshort		>4		(type %d)
 
 #
 # Microsoft Network Monitor 2.x capture files.
@@ -29,6 +30,12 @@
 >6	leshort		2		(Token Ring)
 >6	leshort		3		(FDDI)
 >6	leshort		4		(ATM)
+>6	leshort		5		(IP-over-IEEE 1394)
+>6	leshort		6		(802.11)
+>6	leshort		7		(Raw IP)
+>6	leshort		8		(Raw IP)
+>6	leshort		9		(Raw IP)
+>6	leshort		>9		(type %d)
 
 #
 # Network General Sniffer capture files.
@@ -57,6 +64,7 @@
 # Sorry, make that "Network Associates Sniffer Basic, and Windows
 # Sniffer Pro", capture files."
 # Sorry, make that "Network General Sniffer capture files."
+# Sorry, make that "NetScout Sniffer capture files."
 #
 0	string		XCP\0		NetXRay capture file
 >4	string		>\0		- version %s
@@ -73,8 +81,7 @@
 # the main program that uses that format, but there are other programs
 # that use "libpcap", or that use the same capture file format.)
 #
-0	ubelong		0xa1b2c3d4	tcpdump capture file (big-endian)
-!:mime	application/vnd.tcpdump.pcap
+0	name		pcap-be
 >4	beshort		x		- version %d
 >6	beshort		x		\b.%d
 >20	belong		0		(No link-layer encapsulation
@@ -116,8 +123,10 @@
 >20	belong		127		(802.11 with radiotap header
 >20	belong		129		(Linux ARCNET
 >20	belong		138		(Apple IP over IEEE 1394
+>20	belong		139		(MTP2 with pseudo-header
 >20	belong		140		(MTP2
 >20	belong		141		(MTP3
+>20	belong		142		(SCCP
 >20	belong		143		(DOCSIS
 >20	belong		144		(IrDA
 >20	belong		147		(Private use 0
@@ -137,72 +146,53 @@
 >20	belong		161		(Private use 14
 >20	belong		162		(Private use 15
 >20	belong		163		(802.11 with AVS header
+>20	belong		165		(BACnet MS/TP
+>20	belong		166		(PPPD
+>20	belong		169		(GPRS LLC
+>20	belong		177		(Linux LAPD
+>20	belong		187		(Bluetooth HCI H4
+>20	belong		189		(Linux USB
+>20	belong		192		(PPI
+>20	belong		195		(802.15.4
+>20	belong		196		(SITA
+>20	belong		197		(Endace ERF
+>20	belong		201		(Bluetooth HCI H4 with pseudo-header
+>20	belong		202		(AX.25 with KISS header
+>20	belong		203		(LAPD
+>20	belong		204		(PPP with direction pseudo-header
+>20	belong		205		(Cisco HDLC with direction pseudo-header
+>20	belong		206		(Frame Relay with direction pseudo-header
+>20	belong		209		(Linux IPMB
+>20	belong		215		(802.15.4 with non-ASK PHY header
+>20	belong		220		(Memory-mapped Linux USB
+>20	belong		224		(Fibre Channel FC-2
+>20	belong		225		(Fibre Channel FC-2 with frame delimiters
+>20	belong		226		(Solaris IPNET
+>20	belong		227		(SocketCAN
+>20	belong		228		(Raw IPv4
+>20	belong		229		(Raw IPv6
+>20	belong		230		(802.15.4 without FCS
+>20	belong		231		(D-Bus messages
+>20	belong		235		(DVB-CI
+>20	belong		236		(MUX27010
+>20	belong		237		(STANAG 5066 D_PDUs
+>20	belong		239		(Linux netlink NFLOG messages
+>20	belong		240		(Hilscher netAnalyzer
+>20	belong		241		(Hilscher netAnalyzer with delimiters
+>20	belong		242		(IP-over-Infiniband
+>20	belong		243		(MPEG-2 Transport Stream packets
+>20	belong		244		(ng4t ng40
+>20	belong		245		(NFC LLCP
+>20	belong		247		(Infiniband
+>20	belong		248		(SCTP
 >16	belong		x		\b, capture length %d)
+
+0	ubelong		0xa1b2c3d4	tcpdump capture file (big-endian)
+!:mime	application/vnd.tcpdump.pcap
+>0	use	pcap-be
 0	ulelong		0xa1b2c3d4	tcpdump capture file (little-endian)
 !:mime	application/vnd.tcpdump.pcap
->4	leshort		x		- version %d
->6	leshort		x		\b.%d
->20	lelong		0		(No link-layer encapsulation
->20	lelong		1		(Ethernet
->20	lelong		2		(3Mb Ethernet
->20	lelong		3		(AX.25
->20	lelong		4		(ProNET
->20	lelong		5		(CHAOS
->20	lelong		6		(Token Ring
->20	lelong		7		(ARCNET
->20	lelong		8		(SLIP
->20	lelong		9		(PPP
->20	lelong		10		(FDDI
->20	lelong		11		(RFC 1483 ATM
->20	lelong		12		(raw IP
->20	lelong		13		(BSD/OS SLIP
->20	lelong		14		(BSD/OS PPP
->20	lelong		19		(Linux ATM Classical IP
->20	lelong		50		(PPP or Cisco HDLC
->20	lelong		51		(PPP-over-Ethernet
->20	lelong		99		(Symantec Enterprise Firewall
->20	lelong		100		(RFC 1483 ATM
->20	lelong		101		(raw IP
->20	lelong		102		(BSD/OS SLIP
->20	lelong		103		(BSD/OS PPP
->20	lelong		104		(BSD/OS Cisco HDLC
->20	lelong		105		(802.11
->20	lelong		106		(Linux Classical IP over ATM
->20	lelong		107		(Frame Relay
->20	lelong		108		(OpenBSD loopback
->20	lelong		109		(OpenBSD IPsec encrypted
->20	lelong		112		(Cisco HDLC
->20	lelong		113		(Linux "cooked"
->20	lelong		114		(LocalTalk
->20	lelong		117		(OpenBSD PFLOG
->20	lelong		119		(802.11 with Prism header
->20	lelong		122		(RFC 2625 IP over Fibre Channel
->20	lelong		123		(SunATM
->20	lelong		127		(802.11 with radiotap header
->20	lelong		129		(Linux ARCNET
->20	lelong		138		(Apple IP over IEEE 1394
->20	lelong		140		(MTP2
->20	lelong		141		(MTP3
->20	lelong		143		(DOCSIS
->20	lelong		144		(IrDA
->20	lelong		147		(Private use 0
->20	lelong		148		(Private use 1
->20	lelong		149		(Private use 2
->20	lelong		150		(Private use 3
->20	lelong		151		(Private use 4
->20	lelong		152		(Private use 5
->20	lelong		153		(Private use 6
->20	lelong		154		(Private use 7
->20	lelong		155		(Private use 8
->20	lelong		156		(Private use 9
->20	lelong		157		(Private use 10
->20	lelong		158		(Private use 11
->20	lelong		159		(Private use 12
->20	lelong		160		(Private use 13
->20	lelong		161		(Private use 14
->20	lelong		162		(Private use 15
->20	lelong		163		(802.11 with AVS header
->16	lelong		x		\b, capture length %d)
+>0	use	\^pcap-be
 
 #
 # "libpcap"-with-Alexey-Kuznetsov's-patches capture files.
@@ -211,43 +201,9 @@
 # that use "libpcap", or that use the same capture file format.)
 #
 0	ubelong		0xa1b2cd34	extended tcpdump capture file (big-endian)
->4	beshort		x		- version %d
->6	beshort		x		\b.%d
->20	belong		0		(No link-layer encapsulation
->20	belong		1		(Ethernet
->20	belong		2		(3Mb Ethernet
->20	belong		3		(AX.25
->20	belong		4		(ProNET
->20	belong		5		(CHAOS
->20	belong		6		(Token Ring
->20	belong		7		(ARCNET
->20	belong		8		(SLIP
->20	belong		9		(PPP
->20	belong		10		(FDDI
->20	belong		11		(RFC 1483 ATM
->20	belong		12		(raw IP
->20	belong		13		(BSD/OS SLIP
->20	belong		14		(BSD/OS PPP
->16	belong		x		\b, capture length %d)
+>0	use	pcap-be
 0	ulelong		0xa1b2cd34	extended tcpdump capture file (little-endian)
->4	leshort		x		- version %d
->6	leshort		x		\b.%d
->20	lelong		0		(No link-layer encapsulation
->20	lelong		1		(Ethernet
->20	lelong		2		(3Mb Ethernet
->20	lelong		3		(AX.25
->20	lelong		4		(ProNET
->20	lelong		5		(CHAOS
->20	lelong		6		(Token Ring
->20	lelong		7		(ARCNET
->20	lelong		8		(SLIP
->20	lelong		9		(PPP
->20	lelong		10		(FDDI
->20	lelong		11		(RFC 1483 ATM
->20	lelong		12		(raw IP
->20	lelong		13		(BSD/OS SLIP
->20	lelong		14		(BSD/OS PPP
->16	lelong		x		\b, capture length %d)
+>0	use	\^pcap-be
 
 #
 # "pcap-ng" capture files.
@@ -295,9 +251,9 @@
 >8	lelong		x		\b, %d stations found
 
 #
-# EtherPeek/AiroPeek "version 9" capture files.
+# *Peek tagged capture files.
 #
-0	string		\177ver		EtherPeek/AiroPeek capture file
+0	string		\177ver		EtherPeek/AiroPeek/OmniPeek capture file
 
 #
 # Visual Networks traffic capture files.
diff --git a/contrib/file/Magdir/softquad b/contrib/file/magic/Magdir/softquad
similarity index 100%
rename from contrib/file/Magdir/softquad
rename to contrib/file/magic/Magdir/softquad
diff --git a/contrib/file/Magdir/spec b/contrib/file/magic/Magdir/spec
similarity index 100%
rename from contrib/file/Magdir/spec
rename to contrib/file/magic/Magdir/spec
diff --git a/contrib/file/Magdir/spectrum b/contrib/file/magic/Magdir/spectrum
similarity index 100%
rename from contrib/file/Magdir/spectrum
rename to contrib/file/magic/Magdir/spectrum
diff --git a/contrib/file/magic/Magdir/sql b/contrib/file/magic/Magdir/sql
new file mode 100644
index 000000000000..c69f44f0bb5d
--- /dev/null
+++ b/contrib/file/magic/Magdir/sql
@@ -0,0 +1,83 @@
+
+#------------------------------------------------------------------------------
+# $File: sql,v 1.15 2014/04/30 21:41:02 christos Exp $
+# sql:  file(1) magic for SQL files
+#
+# From: "Marty Leisner" <mleisner@eng.mc.xerox.com>
+# Recognize some MySQL files.
+# Elan Ruusamae <glen@delfi.ee>, added MariaDB signatures
+# from https://bazaar.launchpad.net/~maria-captains/maria/5.5/view/head:/support-files/magic
+#
+0	beshort			0xfe01		MySQL table definition file
+>2	byte			x		Version %d
+0	belong&0xffffff00	0xfefe0700	MySQL MyISAM index file
+>3	byte			x		Version %d
+0	belong&0xffffff00	0xfefe0800	MySQL MyISAM compressed data file
+>3	byte			x		Version %d
+0	belong&0xffffff00	0xfefe0900	MySQL Maria index file
+>3	byte			x		Version %d
+0	belong&0xffffff00	0xfefe0A00	MySQL Maria compressed data file
+>3	byte			x		Version %d
+0	belong&0xffffff00	0xfefe0500	MySQL ISAM index file
+>3	byte			x		Version %d
+0	belong&0xffffff00	0xfefe0600	MySQL ISAM compressed data file
+>3	byte			x		Version %d
+0	string			\376bin		MySQL replication log
+0	belong&0xffffff00	0xfefe0b00
+>4	string			MARIALOG	MySQL Maria transaction log file
+>>3	byte			x		Version %d
+0	belong&0xffffff00	0xfefe0c00
+>4	string			MACF		MySQL Maria control file
+>>3	byte			x		Version %d
+
+#------------------------------------------------------------------------------
+# iRiver H Series database file 
+# From Ken Guest <ken@linux.ie>
+# As observed from iRivNavi.iDB and unencoded firmware
+#
+0   string		iRivDB	iRiver Database file
+>11  string	>\0	Version %s
+>39  string		iHP-100	[H Series]
+
+#------------------------------------------------------------------------------
+# SQLite database files
+# Ken Guest <ken@linux.ie>, Ty Sarna, Zack Weinberg
+#
+# Version 1 used GDBM internally; its files cannot be distinguished
+# from other GDBM files.
+#
+# Version 2 used this format:
+0	string	**\ This\ file\ contains\ an\ SQLite  SQLite 2.x database
+
+# Version 3 of SQLite allows applications to embed their own "user version"
+# number in the database at offset 60.  Later, SQLite added an "application id"
+# at offset 68 that is preferred over "user version" for indicating the
+# associated application.
+#
+0   string  SQLite\ format\ 3
+>60 belong  =0x5f4d544e  Monotone source repository - SQLite3 database
+>68 belong  =0x0f055112  Fossil checkout - SQLite3 database
+>68 belong  =0x0f055113  Fossil global configuration - SQLite3 database
+>68 belong  =0x0f055111  Fossil repository - SQLite3 database
+>68 belong  =0x42654462  Bentley Systems BeSQLite Database - SQLite3 database
+>68 belong  =0x42654c6e  Bentley Systems Localization File - SQLite3 database
+>68 belong  =0x47504b47  OGC GeoPackage file - SQLite3 database
+>68 default x            SQLite 3.x database
+>>68 belong  !0          \b, application id %u
+>>60 belong  !0          \b, user version %d
+
+# SQLite Write-Ahead Log from SQLite version >= 3.7.0
+# http://www.sqlite.org/fileformat.html#walformat
+0	belong&0xfffffffe	0x377f0682	SQLite Write-Ahead Log,
+>4	belong	x	version %d
+
+# SQLite Rollback Journal
+# http://www.sqlite.org/fileformat.html#rollbackjournal
+0	string	\xd9\xd5\x05\xf9\x20\xa1\x63\xd7	SQLite Rollback Journal
+
+# Panasonic channel list database svl.bin or svl.db added by Joerg Jenderek
+# http://www.ullrich.es/job/service-menue/panasonic/panasonic-sendersortierung-sat-am-pc/
+# pceditor_V2003.jar
+0	string		PSDB\0			Panasonic channel list database
+>126	string		SQLite\ format\ 3	
+>>&-15	indirect	x			\b; contains 
diff --git a/contrib/file/Magdir/ssh b/contrib/file/magic/Magdir/ssh
similarity index 60%
rename from contrib/file/Magdir/ssh
rename to contrib/file/magic/Magdir/ssh
index c87f388303d6..d867af0d7a41 100644
--- a/contrib/file/Magdir/ssh
+++ b/contrib/file/magic/Magdir/ssh
@@ -6,3 +6,6 @@
 
 0	string	ssh-dss\ 		OpenSSH DSA public key
 0	string	ssh-rsa\ 		OpenSSH RSA public key
+0	string	ecdsa-sha2-nistp256	OpenSSH ECDSA public key
+0	string	ecdsa-sha2-nistp384	OpenSSH ECDSA public key
+0	string	ecdsa-sha2-nistp521	OpenSSH ECDSA public key
diff --git a/contrib/file/Magdir/ssl b/contrib/file/magic/Magdir/ssl
similarity index 85%
rename from contrib/file/Magdir/ssl
rename to contrib/file/magic/Magdir/ssl
index 4d8706e2b8ca..5d5daeeaf30f 100644
--- a/contrib/file/Magdir/ssl
+++ b/contrib/file/magic/Magdir/ssl
@@ -5,3 +5,4 @@
 0	string	-----BEGIN\ CERTIFICATE\ REQ	PEM certificate request
 0	string	-----BEGIN\ RSA\ PRIVATE	PEM RSA private key
 0	string	-----BEGIN\ DSA\ PRIVATE	PEM DSA private key
+0	string	-----BEGIN\ EC\ PRIVATE	PEM EC private key
diff --git a/contrib/file/Magdir/sun b/contrib/file/magic/Magdir/sun
similarity index 68%
rename from contrib/file/Magdir/sun
rename to contrib/file/magic/Magdir/sun
index 1fd37ede65bd..802a9eb8896d 100644
--- a/contrib/file/Magdir/sun
+++ b/contrib/file/magic/Magdir/sun
@@ -1,12 +1,15 @@
 
 #------------------------------------------------------------------------------
-# $File: sun,v 1.22 2011/02/10 01:52:51 christos Exp $
+# $File: sun,v 1.27 2014/04/30 21:41:02 christos Exp $
 # sun:  file(1) magic for Sun machines
 #
 # Values for big-endian Sun (MC680x0, SPARC) binaries on pre-5.x
-# releases.  (5.x uses ELF.)
+# releases.  (5.x uses ELF.)  Entries for executables without an
+# architecture type, used before the 68020-based Sun-3's came out,
+# are in aout, as they're indistinguishable from other big-endian
+# 32-bit a.out files.
 #
-0	belong&077777777	0600413		sparc demand paged
+0	belong&077777777	0600413		a.out SunOS SPARC demand paged
 >0	byte		&0x80
 >>20	belong		<4096		shared library
 >>20	belong		=4096		dynamically linked executable
@@ -14,17 +17,17 @@
 >0	byte		^0x80		executable
 >16	belong		>0		not stripped
 
-0	belong&077777777	0600410		sparc pure
+0	belong&077777777	0600410		a.out SunOS SPARC pure
 >0	byte		&0x80		dynamically linked executable
 >0	byte		^0x80		executable
 >16	belong		>0		not stripped
 
-0	belong&077777777	0600407		sparc
+0	belong&077777777	0600407		a.out SunOS SPARC
 >0	byte		&0x80		dynamically linked executable
 >0	byte		^0x80		executable
 >16	belong		>0		not stripped
 
-0	belong&077777777	0400413		mc68020 demand paged
+0	belong&077777777	0400413		a.out SunOS mc68020 demand paged
 >0	byte		&0x80
 >>20	belong		<4096		shared library
 >>20	belong		=4096		dynamically linked executable
@@ -32,17 +35,17 @@
 >0	byte		^0x80		executable
 >16	belong		>0		not stripped
 
-0	belong&077777777	0400410		mc68020 pure
+0	belong&077777777	0400410		a.out SunOS mc68020 pure
 >0	byte		&0x80		dynamically linked executable
 >0	byte		^0x80		executable
 >16	belong		>0		not stripped
 
-0	belong&077777777	0400407		mc68020
+0	belong&077777777	0400407		a.out SunOS mc68020
 >0	byte		&0x80		dynamically linked executable
 >0	byte		^0x80		executable
 >16	belong		>0		not stripped
 
-0	belong&077777777	0200413		mc68010 demand paged
+0	belong&077777777	0200413		a.out SunOS mc68010 demand paged
 >0	byte		&0x80
 >>20	belong		<4096		shared library
 >>20	belong		=4096		dynamically linked executable
@@ -50,24 +53,16 @@
 >0	byte		^0x80		executable
 >16	belong		>0		not stripped
 
-0	belong&077777777	0200410		mc68010 pure
+0	belong&077777777	0200410		a.out SunOS mc68010 pure
 >0	byte		&0x80		dynamically linked executable
 >0	byte		^0x80		executable
 >16	belong		>0		not stripped
 
-0	belong&077777777	0200407		mc68010
+0	belong&077777777	0200407		a.out SunOS mc68010
 >0	byte		&0x80		dynamically linked executable
 >0	byte		^0x80		executable
 >16	belong		>0		not stripped
 
-# reworked these to avoid anything beginning with zero becoming "old sun-2"
-0	belong		0407		old sun-2 executable
->16	belong		>0		not stripped
-0	belong		0410		old sun-2 pure executable
->16	belong		>0		not stripped
-0	belong		0413		old sun-2 demand paged executable
->16	belong		>0		not stripped
-
 #
 # Core files.  "SPARC 4.x BCP" means "core file from a SunOS 4.x SPARC
 # binary executed in compatibility mode under SunOS 5.x".
@@ -96,10 +91,13 @@
 # Sun SunPC
 0	long		0xfa33c08e	SunPC 4.0 Hard Disk
 0	string		#SUNPC_CONFIG	SunPC 4.0 Properties Values
-# Sun snoop (see RFC 1761, which describes the capture file format).
+# Sun snoop (see RFC 1761, which describes the capture file format,
+# RFC 3827, which describes some additional datalink types, and
+# http://www.iana.org/assignments/snoop-datalink-types/snoop-datalink-types.xml,
+# which is the IANA registry of Snoop datalink types)
 #
 0	string		snoop		Snoop capture file
->8	belong		>0		- version %ld
+>8	belong		>0		- version %d
 >12	belong		0		(IEEE 802.3)
 >12	belong		1		(IEEE 802.4)
 >12	belong		2		(IEEE 802.5)
@@ -109,14 +107,25 @@
 >12	belong		6		(Character synchronous)
 >12	belong		7		(IBM channel-to-channel adapter)
 >12	belong		8		(FDDI)
->12	belong		9		(Unknown)
-
-# Microsoft ICM color profile
-36	string		acspMSFT	Microsoft ICM Color Profile
-!:mime	application/vnd.iccprofile
-# Sun KCMS
-36	string		acsp		Kodak Color Management System, ICC Profile
-!:mime	application/vnd.iccprofile
+>12	belong		9		(Other)
+>12	belong		10		(type %d)
+>12	belong		11		(type %d)
+>12	belong		12		(type %d)
+>12	belong		13		(type %d)
+>12	belong		14		(type %d)
+>12	belong		15		(type %d)
+>12	belong		16		(Fibre Channel)
+>12	belong		17		(ATM)
+>12	belong		18		(ATM Classical IP)
+>12	belong		19		(type %d)
+>12	belong		20		(type %d)
+>12	belong		21		(type %d)
+>12	belong		22		(type %d)
+>12	belong		23		(type %d)
+>12	belong		24		(type %d)
+>12	belong		25		(type %d)
+>12	belong		26		(IP over Infiniband)
+>12	belong		>26		(type %d)
 
 #---------------------------------------------------------------------------
 # The following entries have been tested by Duncan Laurie <duncan@sun.com> (a
@@ -130,5 +139,3 @@
 # New format for Sun/Cobalt boot ROMs is annoying, it stores the version code
 # at the very end where file(1) can't get it.
 0       string CRfs     COBALT boot rom data (Flat boot rom or file system)
-
-
diff --git a/contrib/file/magic/Magdir/symbos b/contrib/file/magic/Magdir/symbos
new file mode 100644
index 000000000000..c97a42e0c74d
--- /dev/null
+++ b/contrib/file/magic/Magdir/symbos
@@ -0,0 +1,42 @@
+
+#------------------------------------------------------------------------------
+# msx:  file(1) magic for the SymbOS operating system
+# http://www.symbos.de
+# Fabio R. Schmidlin <frs@pop.com.br>
+
+# SymbOS EXE file
+0x30	string		SymExe		SymbOS executable
+>0x36	ubyte		x		v%c
+>0x37	ubyte		x		\b.%c
+>0xF	string		x		\b, name: %s
+
+# SymbOS DOX document
+0	string		INFOq\0		SymbOS DOX document
+
+# Symbos driver
+0	string		SMD1		SymbOS driver
+>19	byte		x		\b, name: %c
+>20	byte		x		\b%c
+>21	byte		x		\b%c
+>22	byte		x		\b%c
+>23	byte		x		\b%c
+>24	byte		x		\b%c
+>25	byte		x		\b%c
+>26	byte		x		\b%c
+>27	byte		x		\b%c
+>28	byte		x		\b%c
+>29	byte		x		\b%c
+>30	byte		x		\b%c
+>31	byte		x		\b%c
+
+# Symbos video
+0	string		SymVid		SymbOS video
+>6	ubyte		x		v%c
+>7	ubyte		x		\b.%c
+
+# Soundtrakker 128 ST2 music
+0	byte		0
+>0xC	string		\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x40\x00	Soundtrakker 128 ST2 music,
+>>1	string		x		name: %s
+
+
diff --git a/contrib/file/Magdir/sysex b/contrib/file/magic/Magdir/sysex
similarity index 97%
rename from contrib/file/Magdir/sysex
rename to contrib/file/magic/Magdir/sysex
index 70b5b1cf24a1..97472e275548 100644
--- a/contrib/file/Magdir/sysex
+++ b/contrib/file/magic/Magdir/sysex
@@ -1,10 +1,12 @@
 
 #------------------------------------------------------------------------
-# $File: sysex,v 1.6 2009/09/19 16:28:12 christos Exp $
+# $File: sysex,v 1.8 2014/06/03 19:17:27 christos Exp $
 # sysex: file(1) magic for MIDI sysex files
 #
-# 
-0	byte			0xF0		SysEx File -
+# GRR: original 1 byte test at offset was too general as it catches also many FATs of DOS filesystems
+# where real SYStem EXclusive messages at offset 1 are limited to seven bits
+# http://en.wikipedia.org/wiki/MIDI
+0	ubeshort&0xFF80		0xF000		SysEx File -
 
 # North American Group
 >1	byte			0x01		Sequential
@@ -210,7 +212,7 @@
 >1	byte			0x52		Zoom
 >1	byte			0x54		Matsushita
 >1	byte			0x57		Acoustic tech. lab.
-
+# http://www.midi.org/techspecs/manid.php
 >1	belong&0xffffff00	0x00007400	Ta Horng
 >1	belong&0xffffff00	0x00007500	e-Tek
 >1	belong&0xffffff00	0x00007600	E-Voice
diff --git a/contrib/file/Magdir/tcl b/contrib/file/magic/Magdir/tcl
similarity index 98%
rename from contrib/file/Magdir/tcl
rename to contrib/file/magic/Magdir/tcl
index 223f93b58c19..515fa8dbb9bd 100644
--- a/contrib/file/Magdir/tcl
+++ b/contrib/file/magic/Magdir/tcl
@@ -5,7 +5,7 @@
 
 # Tcl scripts
 0	search/1/w	#!\ /usr/bin/tcl	Tcl script text executable
-!:mime	text/x-lua
+!:mime	text/x-tcl
 0	search/1/w	#!\ /usr/local/bin/tcl	Tcl script text executable
 !:mime	text/x-tcl
 0	search/1	#!/usr/bin/env\ tcl	Tcl script text executable
diff --git a/contrib/file/Magdir/teapot b/contrib/file/magic/Magdir/teapot
similarity index 100%
rename from contrib/file/Magdir/teapot
rename to contrib/file/magic/Magdir/teapot
diff --git a/contrib/file/Magdir/terminfo b/contrib/file/magic/Magdir/terminfo
similarity index 100%
rename from contrib/file/Magdir/terminfo
rename to contrib/file/magic/Magdir/terminfo
diff --git a/contrib/file/Magdir/tex b/contrib/file/magic/Magdir/tex
similarity index 75%
rename from contrib/file/Magdir/tex
rename to contrib/file/magic/Magdir/tex
index e8d2e8762a8c..1737ea95c1d6 100644
--- a/contrib/file/Magdir/tex
+++ b/contrib/file/magic/Magdir/tex
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: tex,v 1.18 2011/02/08 13:45:15 christos Exp $
+# $File: tex,v 1.20 2014/03/16 02:53:03 christos Exp $
 # tex:  file(1) magic for TeX files
 #
 # XXX - needs byte-endian stuff (big-endian and little-endian DVI?)
@@ -40,6 +40,9 @@
 0	search/4096	\\input		TeX document text
 !:mime	text/x-tex
 !:strength + 15
+0	search/4096	\\begin		LaTeX document text
+!:mime	text/x-tex
+!:strength + 15
 0	search/4096	\\section	LaTeX document text
 !:mime	text/x-tex
 !:strength + 18
@@ -103,3 +106,34 @@
 0	search/1	@c\ @mapfile{	TeX font aliases text file
 
 0	string		#LyX		LyX document text
+
+# ConTeXt documents
+#	http://wiki.contextgarden.net/
+0	search/4096	\\setupcolors[		ConTeXt document text
+!:strength + 15
+0	search/4096	\\definecolor[		ConTeXt document text
+!:strength + 15
+0	search/4096	\\setupinteraction[	ConTeXt document text
+!:strength + 15
+0	search/4096	\\useURL[		ConTeXt document text
+!:strength + 15
+0	search/4096	\\setuppapersize[	ConTeXt document text
+!:strength + 15
+0	search/4096	\\setuplayout[		ConTeXt document text
+!:strength + 15
+0	search/4096	\\setupfooter[		ConTeXt document text
+!:strength + 15
+0	search/4096	\\setupfootertexts[	ConTeXt document text
+!:strength + 15
+0	search/4096	\\setuppagenumbering[	ConTeXt document text
+!:strength + 15
+0	search/4096	\\setupbodyfont[	ConTeXt document text
+!:strength + 15
+0	search/4096	\\setuphead[		ConTeXt document text
+!:strength + 15
+0	search/4096	\\setupitemize[		ConTeXt document text
+!:strength + 15
+0	search/4096	\\setupwhitespace[	ConTeXt document text
+!:strength + 15
+0	search/4096	\\setupindenting[	ConTeXt document text
+!:strength + 15
diff --git a/contrib/file/Magdir/tgif b/contrib/file/magic/Magdir/tgif
similarity index 100%
rename from contrib/file/Magdir/tgif
rename to contrib/file/magic/Magdir/tgif
diff --git a/contrib/file/Magdir/ti-8x b/contrib/file/magic/Magdir/ti-8x
similarity index 98%
rename from contrib/file/Magdir/ti-8x
rename to contrib/file/magic/Magdir/ti-8x
index d7903febcb07..205f982d2d91 100644
--- a/contrib/file/Magdir/ti-8x
+++ b/contrib/file/magic/Magdir/ti-8x
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: ti-8x,v 1.6 2009/09/19 16:28:12 christos Exp $
+# $File: ti-8x,v 1.7 2014/04/30 21:41:02 christos Exp $
 # ti-8x: file(1) magic for the TI-8x and TI-9x Graphing Calculators.
 #
 # From: Ryan McGuire (rmcguire@freenet.columbus.oh.us).
@@ -222,7 +222,7 @@
 >49		byte		0x24		type: application,
 >49		byte		0x25		type: certificate,
 >49		byte		0x3e		type: license,
->74		lelong		>0		size: %ld bytes
+>74		lelong		>0		size: %d bytes
 
 # VTi & TiEmu skins (TI Graphing Calculators).
 # From: Romain Lievin (roms@lpg.ticalc.org).
diff --git a/contrib/file/Magdir/timezone b/contrib/file/magic/Magdir/timezone
similarity index 100%
rename from contrib/file/Magdir/timezone
rename to contrib/file/magic/Magdir/timezone
diff --git a/contrib/file/Magdir/troff b/contrib/file/magic/Magdir/troff
similarity index 83%
rename from contrib/file/Magdir/troff
rename to contrib/file/magic/Magdir/troff
index b24ea0a49862..cb6bc00eb8ee 100644
--- a/contrib/file/Magdir/troff
+++ b/contrib/file/magic/Magdir/troff
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: troff,v 1.10 2009/09/19 16:28:12 christos Exp $
+# $File: troff,v 1.11 2014/06/03 19:01:34 christos Exp $
 # troff:  file(1) magic for *roff
 #
 # updated by Daniel Quinlan (quinlan@yggdrasil.com)
@@ -16,9 +16,9 @@
 !:mime	text/troff
 0	search/1	'''		troff or preprocessor input text
 !:mime	text/troff
-0	regex/20	\^\\.[A-Za-z0-9][A-Za-z0-9][\ \t]	troff or preprocessor input text
+0	regex/20l	\^\\.[A-Za-z0-9][A-Za-z0-9][\ \t]	troff or preprocessor input text
 !:mime	text/troff
-0	regex/20	\^\\.[A-Za-z0-9][A-Za-z0-9]$	troff or preprocessor input text
+0	regex/20l	\^\\.[A-Za-z0-9][A-Za-z0-9]$	troff or preprocessor input text
 !:mime	text/troff
 
 # ditroff intermediate output text
diff --git a/contrib/file/Magdir/tuxedo b/contrib/file/magic/Magdir/tuxedo
similarity index 100%
rename from contrib/file/Magdir/tuxedo
rename to contrib/file/magic/Magdir/tuxedo
diff --git a/contrib/file/Magdir/typeset b/contrib/file/magic/Magdir/typeset
similarity index 100%
rename from contrib/file/Magdir/typeset
rename to contrib/file/magic/Magdir/typeset
diff --git a/contrib/file/Magdir/unicode b/contrib/file/magic/Magdir/unicode
similarity index 100%
rename from contrib/file/Magdir/unicode
rename to contrib/file/magic/Magdir/unicode
diff --git a/contrib/file/magic/Magdir/unknown b/contrib/file/magic/Magdir/unknown
new file mode 100644
index 000000000000..578a8ea06d76
--- /dev/null
+++ b/contrib/file/magic/Magdir/unknown
@@ -0,0 +1,34 @@
+
+#------------------------------------------------------------------------------
+# $File: unknown,v 1.8 2013/01/09 22:37:24 christos Exp $
+# unknown:  file(1) magic for unknown machines
+#
+# 0x107 is 0407, 0x108 is 0410, and 0x109 is 0411; those are all PDP-11
+# (executable, pure, and split I&D, respectively), but the PDP-11 version
+# doesn't have the "version %ld", which may be a bogus COFFism (I don't
+# think there was ever COFF for the PDP-11).
+#
+# 0x10B is 0413; that's VAX demand-paged, but this is a short, not a
+# long, as it would be on a VAX.  In any case, that could collide with
+# VAX demand-paged files, as the magic number is little-endian on those
+# binaries, so the first 16 bits of the file would contain 0x10B.
+#
+# Therefore, those entries are commented out.
+#
+# 0x10C is 0414 and 0x10E is 0416; those *are* unknown.
+#
+#0	short		0x107		unknown machine executable
+#>8	short		>0		not stripped
+#>15	byte		>0		- version %ld
+#0	short		0x108		unknown pure executable
+#>8	short		>0		not stripped
+#>15	byte		>0		- version %ld
+#0	short		0x109		PDP-11 separate I&D
+#>8	short		>0		not stripped
+#>15	byte		>0		- version %ld
+#0	short		0x10b		unknown pure executable
+#>8	short		>0		not stripped
+#>15	byte		>0		- version %ld
+0	long		0x10c		unknown demand paged pure executable
+>16	long		>0		not stripped
+0	long		0x10e		unknown readable demand paged pure executable
diff --git a/contrib/file/magic/Magdir/uterus b/contrib/file/magic/Magdir/uterus
new file mode 100644
index 000000000000..a8be8a880d28
--- /dev/null
+++ b/contrib/file/magic/Magdir/uterus
@@ -0,0 +1,16 @@
+
+#------------------------------------------------------------------------------
+# $File: uterus,v 1.3 2014/04/30 21:41:02 christos Exp $
+# file(1) magic for uterus files
+# http://freecode.com/projects/uterus
+#
+0	string		UTE+	uterus file
+>4	string		v	\b, version
+>5	byte		x	%c
+>6	string		.	\b.
+>7	byte		x	\b%c
+>8	string		\<\>	\b, big-endian
+>>16	belong		>0	\b, slut size %u
+>8	string		\>\<	\b, litte-endian
+>>16	lelong		>0	\b, slut size %u
+>10	byte		&8	\b, compressed
diff --git a/contrib/file/Magdir/uuencode b/contrib/file/magic/Magdir/uuencode
similarity index 100%
rename from contrib/file/Magdir/uuencode
rename to contrib/file/magic/Magdir/uuencode
diff --git a/contrib/file/Magdir/varied.out b/contrib/file/magic/Magdir/varied.out
similarity index 94%
rename from contrib/file/Magdir/varied.out
rename to contrib/file/magic/Magdir/varied.out
index 3d8aa9219a4b..01caf07fafa0 100644
--- a/contrib/file/Magdir/varied.out
+++ b/contrib/file/magic/Magdir/varied.out
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: varied.out,v 1.22 2010/07/02 00:06:27 christos Exp $
+# $File: varied.out,v 1.23 2014/04/30 21:41:02 christos Exp $
 # varied.out:  file(1) magic for various USG systems
 #
 #	Herewith many of the object file formats used by USG systems.
@@ -26,7 +26,7 @@
 >7      string          >\0     version '%s'
 # gnu gmon magic From: Eugen Dedu <dedu@ese-metz.fr>
 0	string		gmon		GNU prof performance data
->4	long		x		- version %ld
+>4	long		x		- version %d
 # From: Dave Pearson <davep@davep.org>
 # Harbour <URL:http://harbour-project.org/> HRB files.
 0	string		\xc0HRB		Harbour HRB file
diff --git a/contrib/file/Magdir/varied.script b/contrib/file/magic/Magdir/varied.script
similarity index 58%
rename from contrib/file/Magdir/varied.script
rename to contrib/file/magic/Magdir/varied.script
index 50259d3ed922..eb71b2f57723 100644
--- a/contrib/file/Magdir/varied.script
+++ b/contrib/file/magic/Magdir/varied.script
@@ -1,28 +1,56 @@
 #------------------------------------------------------------------------------
-# $File: varied.script,v 1.9 2011/12/16 16:32:48 rrt Exp $
+# $File: varied.script,v 1.10 2014/03/01 22:32:39 christos Exp $
 # varied.script:  file(1) magic for various interpreter scripts
 
 0	string/t		#!\ /			a
 >3	string		>\0			%s script text executable
 !:strength / 2
+
+0	string/b		#!\ /			a
+>3	string		>\0			%s script executable (binary data)
+!:strength / 2
+
 0	string/t		#!\t/			a
 >3	string		>\0			%s script text executable
 !:strength / 2
+
+0	string/b		#!\t/			a
+>3	string		>\0			%s script executable (binary data)
+!:strength / 2
+
 0	string/t		#!/			a
 >2	string		>\0			%s script text executable
 !:strength / 2
+
+0	string/b		#!/			a
+>2	string		>\0			%s script executable (binary data)
+!:strength / 2
+
 0	string/t		#!\ 			script text executable
 >3	string		>\0			for %s
 !:strength / 3
 
+0	string/b		#!\ 			script executable
+>3	string		>\0			for %s (binary data)
+!:strength / 3
+
 # using env
 0	string/t	#!/usr/bin/env		a
 >15	string/t	>\0			%s script text executable
 !:strength / 10
+
+0	string/b	#!/usr/bin/env		a
+>15	string/b	>\0			%s script executable (binary data)
+!:strength / 10
+
 0	string/t	#!\ /usr/bin/env	a
 >16	string/t	>\0			%s script text executable
 !:strength / 10
 
+0	string/b	#!\ /usr/bin/env	a
+>16	string/b	>\0			%s script executable (binary data)
+!:strength / 10
+
 # From: arno <arenevier@fdn.fr>
 # mozilla xpconnect typelib
 # see http://www.mozilla.org/scriptable/typelib_file.html
diff --git a/contrib/file/Magdir/vax b/contrib/file/magic/Magdir/vax
similarity index 50%
rename from contrib/file/Magdir/vax
rename to contrib/file/magic/Magdir/vax
index 31a35123dd4b..11de6cef0056 100644
--- a/contrib/file/Magdir/vax
+++ b/contrib/file/magic/Magdir/vax
@@ -1,35 +1,27 @@
 
 #------------------------------------------------------------------------------
-# $File: vax,v 1.7 2009/09/19 16:28:13 christos Exp $
+# $File: vax,v 1.9 2014/04/30 21:41:02 christos Exp $
 # vax:  file(1) magic for VAX executable/object and APL workspace
 #
 0	lelong		0101557		VAX single precision APL workspace
 0	lelong		0101556		VAX double precision APL workspace
 
 #
-# VAX a.out (32V, BSD)
+# VAX a.out (BSD; others collide with 386 and other 32-bit little-endian
+# executables, and are handled in aout)
 #
-0	lelong		0407		VAX executable
->16	lelong		>0		not stripped
-
-0	lelong		0410		VAX pure executable
->16	lelong		>0		not stripped
-
-0	lelong		0413		VAX demand paged pure executable
->16	lelong		>0		not stripped
-
-0	lelong		0420		VAX demand paged (first page unmapped) pure executable
+0	lelong		0420		a.out VAX demand paged (first page unmapped) pure executable
 >16	lelong		>0		not stripped
 
 #
 # VAX COFF
 #
-# The `versions' should be un-commented if they work for you.
+# The `versions' were commented out, but have been un-commented out.
 # (Was the problem just one of endianness?)
 #
 0	leshort		0570		VAX COFF executable
 >12	lelong		>0		not stripped
->22	leshort		>0		- version %ld
+>22	leshort		>0		- version %d
 0	leshort		0575		VAX COFF pure executable
 >12	lelong		>0		not stripped
->22	leshort		>0		- version %ld
+>22	leshort		>0		- version %d
diff --git a/contrib/file/Magdir/vicar b/contrib/file/magic/Magdir/vicar
similarity index 100%
rename from contrib/file/Magdir/vicar
rename to contrib/file/magic/Magdir/vicar
diff --git a/contrib/file/magic/Magdir/virtual b/contrib/file/magic/Magdir/virtual
new file mode 100644
index 000000000000..26442bf94b98
--- /dev/null
+++ b/contrib/file/magic/Magdir/virtual
@@ -0,0 +1,123 @@
+
+#------------------------------------------------------------------------------
+# $File: virtual,v 1.6 2014/05/07 21:25:41 christos Exp $
+# From: James Nobis <quel@quelrod.net>
+# Microsoft hard disk images for:
+# Virtual Server
+# Virtual PC
+# http://technet.microsoft.com/en-us/virtualserver/bb676673.aspx
+# .vhd
+0	string	conectix	Microsoft Disk Image, Virtual Server or Virtual PC
+
+# libvirt
+# From: Philipp Hahn <hahn@univention.de>
+0	string	LibvirtQemudSave	Libvirt QEMU Suspend Image
+>0x10	lelong	x	\b, version %u
+>0x14	lelong	x	\b, XML length %u
+>0x18	lelong	1	\b, running
+>0x1c	lelong	1	\b, compressed
+
+0	string	LibvirtQemudPart	Libvirt QEMU partial Suspend Image
+# From: Alex Beregszaszi <alex@fsn.hu>
+0	string/b	COWD		VMWare3
+>4	byte	3		disk image
+>>32	lelong	x		(%d/
+>>36	lelong	x		\b%d/
+>>40	lelong	x		\b%d)
+>4	byte	2		undoable disk image
+>>32	string	>\0		(%s)
+
+0	string/b	VMDK		 VMware4 disk image
+0	string/b	KDMV		 VMware4 disk image
+
+#--------------------------------------------------------------------
+# Qemu Emulator Images
+# Lines written by Friedrich Schwittay (f.schwittay@yousable.de)
+# Updated by Adam Buchbinder (adam.buchbinder@gmail.com)
+# Made by reading sources, reading documentation, and doing trial and error
+# on existing QCOW files
+0	string/b	QFI\xFB	QEMU QCOW Image
+
+# Uncomment the following line to display Magic (only used for debugging
+# this magic number)
+#>0	string/b	x	, Magic: %s
+
+# There are currently 2 Versions: "1" and "2".
+# http://www.gnome.org/~markmc/qcow-image-format-version-1.html
+>4	belong	1	(v1)
+
+# Using the existence of the Backing File Offset to determine whether
+# to read Backing File Information
+>>12	belong	 >0	 \b, has backing file (
+# Note that this isn't a null-terminated string; the length is actually
+# (16.L). Assuming a null-terminated string happens to work usually, but it
+# may spew junk until it reaches a \0 in some cases.
+>>>(12.L)	 string >\0	\bpath %s
+
+# Modification time of the Backing File
+# Really useful if you want to know if your backing
+# file is still usable together with this image
+>>>>20	bedate >0	\b, mtime %s)
+>>>>20	default x	\b)
+
+# Size is stored in bytes in a big-endian u64.
+>>24	bequad	x	 \b, %lld bytes
+
+# 1 for AES encryption, 0 for none.
+>>36	belong	1	\b, AES-encrypted
+
+# http://www.gnome.org/~markmc/qcow-image-format.html
+>4	belong	2	(v2)
+# Using the existence of the Backing File Offset to determine whether
+# to read Backing File Information
+>>8	bequad  >0	 \b, has backing file
+# Note that this isn't a null-terminated string; the length is actually
+# (16.L). Assuming a null-terminated string happens to work usually, but it
+# may spew junk until it reaches a \0 in some cases. Also, since there's no
+# .Q modifier, we just use the bottom four bytes as an offset. Note that if
+# the file is over 4G, and the backing file path is stored after the first 4G,
+# the wrong filename will be printed. (This should be (8.Q), when that syntax
+# is introduced.)
+>>>(12.L)	 string >\0	(path %s)
+>>24	bequad	x	\b, %lld bytes
+>>32	belong	1	\b, AES-encrypted
+
+>4	belong	3	(v3)
+# Using the existence of the Backing File Offset to determine whether
+# to read Backing File Information
+>>8	bequad  >0	 \b, has backing file
+# Note that this isn't a null-terminated string; the length is actually
+# (16.L). Assuming a null-terminated string happens to work usually, but it
+# may spew junk until it reaches a \0 in some cases. Also, since there's no
+# .Q modifier, we just use the bottom four bytes as an offset. Note that if
+# the file is over 4G, and the backing file path is stored after the first 4G,
+# the wrong filename will be printed. (This should be (8.Q), when that syntax
+# is introduced.)
+>>>(12.L)	 string >\0	(path %s)
+>>24	bequad	x	\b, %lld bytes
+>>32	belong	1	\b, AES-encrypted
+
+>4	default x	(unknown version)
+
+0	string/b	QEVM		QEMU suspend to disk image
+
+# QEMU QED Image
+# http://wiki.qemu.org/Features/QED/Specification
+0	string/b	QED\0		QEMU QED Image
+
+# VDI Image
+# Sun xVM VirtualBox Disk Image
+# From: Richard W.M. Jones <rich@annexia.org>
+# VirtualBox Disk Image
+0x40	ulelong		0xbeda107f	VirtualBox Disk Image
+>0x44	uleshort	>0		\b, major %u
+>0x46	uleshort	>0		\b, minor %u
+>0	string		>\0		(%s)
+>368	lequad		x		 \b, %lld bytes
+
+0	string/b	Bochs\ Virtual\ HD\ Image	Bochs disk image,
+>32	string	x				type %s,
+>48	string	x				subtype %s
+
+0	lelong	0x02468ace			Bochs Sparse disk image
+
diff --git a/contrib/file/Magdir/virtutech b/contrib/file/magic/Magdir/virtutech
similarity index 100%
rename from contrib/file/Magdir/virtutech
rename to contrib/file/magic/Magdir/virtutech
diff --git a/contrib/file/Magdir/visx b/contrib/file/magic/Magdir/visx
similarity index 100%
rename from contrib/file/Magdir/visx
rename to contrib/file/magic/Magdir/visx
diff --git a/contrib/file/Magdir/vms b/contrib/file/magic/Magdir/vms
similarity index 81%
rename from contrib/file/Magdir/vms
rename to contrib/file/magic/Magdir/vms
index d114dfd79e5b..be716b38e3c4 100644
--- a/contrib/file/Magdir/vms
+++ b/contrib/file/magic/Magdir/vms
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: vms,v 1.6 2009/09/19 16:28:13 christos Exp $
+# $File: vms,v 1.7 2013/03/09 22:36:00 christos Exp $
 # vms:  file(1) magic for VMS executables (experimental)
 #
 # VMS .exe formats, both VAX and AXP (Greg Roelofs, newt@uchicago.edu)
@@ -24,5 +24,7 @@
 #   00030  00 00 00 00 01 00 00 00  00 00 00 00 00 00 00 00  ................
 #   00040  00 00 00 00 ff ff ff ff  ff ff ff ff 02 00 00 00  ................
 #
-0	belong	0x03000000	VMS Alpha executable
->75264	string	PK\003\004	\b, Info-ZIP SFX archive v5.12 w/decryption
+# GRR this test is still too general as it catches example adressen.dbt
+0	belong	0x03000000	
+>8	ubelong	0xec020000	VMS Alpha executable
+>>75264	string	PK\003\004	\b, Info-ZIP SFX archive v5.12 w/decryption
diff --git a/contrib/file/Magdir/vmware b/contrib/file/magic/Magdir/vmware
similarity index 100%
rename from contrib/file/Magdir/vmware
rename to contrib/file/magic/Magdir/vmware
diff --git a/contrib/file/Magdir/vorbis b/contrib/file/magic/Magdir/vorbis
similarity index 95%
rename from contrib/file/Magdir/vorbis
rename to contrib/file/magic/Magdir/vorbis
index ed6c040c3092..4406512cef2d 100644
--- a/contrib/file/Magdir/vorbis
+++ b/contrib/file/magic/Magdir/vorbis
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: vorbis,v 1.16 2009/09/19 16:28:13 christos Exp $
+# $File: vorbis,v 1.18 2014/04/30 21:41:02 christos Exp $
 # vorbis:  file(1) magic for Ogg/Vorbis files
 #
 # From Felix von Leitner <leitner@fefe.de>
@@ -56,13 +56,13 @@
 >>>37		string/c	xvid		(XviD)
 # --- First vorbis packet - general header ---
 >>28		string		\x01vorbis	\b, Vorbis audio,
->>>35		lelong		!0		UNKNOWN VERSION %lu,
+>>>35		lelong		!0		UNKNOWN VERSION %u,
 ##>>>35		lelong		0		version 0,
 >>>35		lelong		0
 >>>>39		ubyte		1		mono,
 >>>>39		ubyte		2		stereo,
 >>>>39		ubyte		>2		%u channels,
->>>>40		lelong		x		%lu Hz
+>>>>40		lelong		x		%u Hz
 # Minimal, nominal and maximal bitrates specified when encoding
 >>>>48		string		<\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff	\b,
 # The above tests if at least one of these is specified:
@@ -72,13 +72,13 @@
 # Vorbis 1.0 uses 0 instead of -1.
 >>>>>>52	lelong		!0
 >>>>>>>52	lelong		!-1000
->>>>>>>>52	lelong		x		<%lu
+>>>>>>>>52	lelong		x		<%u
 >>>>>48		lelong		!-1
->>>>>>48	lelong		x		~%lu
+>>>>>>48	lelong		x		~%u
 >>>>>44		lelong		!-1
 >>>>>>44	lelong		!-1000
 >>>>>>>44	lelong		!0
->>>>>>>>44	lelong		x		>%lu
+>>>>>>>>44	lelong		x		>%u
 >>>>>48		string		<\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff	bps
 # -- Second vorbis header packet - the comments
 # A kludge to read the vendor string.  It's a counted string, not a
diff --git a/contrib/file/Magdir/vxl b/contrib/file/magic/Magdir/vxl
similarity index 100%
rename from contrib/file/Magdir/vxl
rename to contrib/file/magic/Magdir/vxl
diff --git a/contrib/file/Magdir/warc b/contrib/file/magic/Magdir/warc
similarity index 100%
rename from contrib/file/Magdir/warc
rename to contrib/file/magic/Magdir/warc
diff --git a/contrib/file/Magdir/weak b/contrib/file/magic/Magdir/weak
similarity index 100%
rename from contrib/file/Magdir/weak
rename to contrib/file/magic/Magdir/weak
diff --git a/contrib/file/magic/Magdir/windows b/contrib/file/magic/Magdir/windows
new file mode 100644
index 000000000000..1879f292d091
--- /dev/null
+++ b/contrib/file/magic/Magdir/windows
@@ -0,0 +1,336 @@
+
+#------------------------------------------------------------------------------
+# $File: windows,v 1.8 2014/04/30 21:41:02 christos Exp $
+# windows:  file(1) magic for Microsoft Windows
+#
+# This file is mainly reserved for files where programs
+# using them are run almost always on MS Windows 3.x or
+# above, or files only used exclusively in Windows OS,
+# where there is no better category to allocate for.
+# For example, even though WinZIP almost run on Windows
+# only, it is better to treat them as "archive" instead.
+# For format usable in DOS, such as generic executable
+# format, please specify under "msdos" file.
+#
+
+
+# Summary: Outlook Express DBX file
+# Extension: .dbx
+# Created by: Christophe Monniez
+0	string	\xCF\xAD\x12\xFE	MS Outlook Express DBX file
+>4	byte	=0xC5			\b, message database
+>4	byte	=0xC6			\b, folder database
+>4	byte	=0xC7			\b, account information
+>4	byte	=0x30			\b, offline database
+
+
+# Summary: Windows crash dump
+# Extension: .dmp
+# Created by: Andreas Schuster (http://computer.forensikblog.de/)
+# Reference (1): http://computer.forensikblog.de/en/2008/02/64bit_magic.html
+# Modified by (1): Abel Cheung (Avoid match with first 4 bytes only)
+0	string		PAGE		
+>4	string		DUMP		MS Windows 32bit crash dump
+>>0x05c	byte            0		\b, no PAE
+>>0x05c	byte            1		\b, PAE
+>>0xf88	lelong		1		\b, full dump
+>>0xf88	lelong		2		\b, kernel dump
+>>0xf88	lelong		3		\b, small dump
+>>0x068	lelong		x		\b, %d pages
+>4	string		DU64		MS Windows 64bit crash dump
+>>0xf98	lelong		1		\b, full dump
+>>0xf98	lelong		2		\b, kernel dump
+>>0xf98	lelong		3		\b, small dump
+>>0x090	lequad		x		\b, %lld pages
+
+
+# Summary: Vista Event Log
+# Extension: .evtx
+# Created by: Andreas Schuster (http://computer.forensikblog.de/)
+# Reference (1): http://computer.forensikblog.de/en/2007/05/some_magic.html
+0	string		ElfFile\0	MS Windows Vista Event Log
+>0x2a	leshort		x		\b, %d chunks
+>>0x10	lelong		x		\b (no. %d in use)
+>0x18	lelong		>1		\b, next record no. %d
+>0x18	lelong		=1		\b, empty
+>0x78	lelong		&1		\b, DIRTY
+>0x78	lelong		&2		\b, FULL
+
+
+# Summary: Windows 3.1 group files
+# Extension: .grp
+# Created by: unknown
+0	string		\120\115\103\103	MS Windows 3.1 group files
+
+
+# Summary: Old format help files
+# Extension: .hlp
+# Created by: Dirk Jagdmann <doj@cubic.org>
+0	lelong		0x00035f3f		MS Windows 3.x help file
+
+
+# Summary: Hyper terminal
+# Extension: .ht
+# Created by: unknown
+0	string		HyperTerminal\ 
+>15	string		1.0\ --\ HyperTerminal\ data\ file	MS Windows HyperTerminal profile
+
+# http://ithreats.files.wordpress.com/2009/05/\
+# lnk_the_windows_shortcut_file_format.pdf
+# Summary: Windows shortcut
+# Extension: .lnk
+# Created by: unknown
+# 'L' + GUUID
+0	string		\114\0\0\0\001\024\002\0\0\0\0\0\300\0\0\0\0\0\0\106	MS Windows shortcut
+>20	lelong&1	1	\b, Item id list present
+>20	lelong&2	2	\b, Points to a file or directory
+>20	lelong&4	4	\b, Has Description string
+>20	lelong&8	8	\b, Has Relative path
+>20	lelong&16	16	\b, Has Working directory
+>20	lelong&32	32	\b, Has command line arguments
+>20	lelong&64	64	\b, Icon
+>>56	lelong			\b number=%d
+>24	lelong&1	1	\b, Read-Only
+>24	lelong&2	2	\b, Hidden
+>24	lelong&4	4	\b, System
+>24	lelong&8	8	\b, Volume Label
+>24	lelong&16	16	\b, Directory
+>24	lelong&32	32	\b, Archive
+>24	lelong&64	64	\b, Encrypted
+>24	lelong&128	128	\b, Normal
+>24	lelong&256	256	\b, Temporary
+>24	lelong&512	512	\b, Sparse
+>24	lelong&1024	1024	\b, Reparse point
+>24	lelong&2048	2048	\b, Compressed
+>24	lelong&4096	4096	\b, Offline
+>28	leqwdate	x	\b, ctime=%s
+>36	leqwdate	x	\b, mtime=%s
+>44	leqwdate	x	\b, atime=%s
+>52	lelong		x	\b, length=%u, window=
+>60	lelong&1	1	\bhide
+>60	lelong&2	2	\bnormal
+>60	lelong&4	4	\bshowminimized
+>60	lelong&8	8	\bshowmaximized
+>60	lelong&16	16	\bshownoactivate
+>60	lelong&32	32	\bminimize
+>60	lelong&64	64	\bshowminnoactive
+>60	lelong&128	128	\bshowna
+>60	lelong&256	256	\brestore
+>60	lelong&512	512	\bshowdefault
+#>20	lelong&1	0
+#>>20	lelong&2	2
+#>>>(72.l-64)	pstring/h	x	\b [%s]
+#>20	lelong&1	1
+#>>20	lelong&2	2
+#>>>(72.s)	leshort	x
+#>>>&75	pstring/h	x	\b [%s]
+
+# Summary: Outlook Personal Folders
+# Created by: unknown
+0	lelong		0x4E444221	Microsoft Outlook email folder
+>10	leshort		0x0e		(<=2002)
+>10	leshort		0x17		(>=2003)
+
+
+# Summary: Windows help cache
+# Created by: unknown
+0	string		\164\146\115\122\012\000\000\000\001\000\000\000	MS Windows help cache
+
+
+# Summary: IE cache file
+# Created by: Christophe Monniez
+0	string	Client\ UrlCache\ MMF 	Internet Explorer cache file
+>20	string	>\0			version %s
+
+
+# Summary: Registry files
+# Created by: unknown
+# Modified by (1): Joerg Jenderek
+0	string		regf		MS Windows registry file, NT/2000 or above
+0	string		CREG		MS Windows 95/98/ME registry file
+0	string		SHCC3		MS Windows 3.1 registry file
+
+
+# Summary: Windows Registry text
+# Extension: .reg
+# Submitted by: Abel Cheung <abelcheung@gmail.com>
+0	string		REGEDIT4\r\n\r\n	Windows Registry text (Win95 or above)
+0	string		Windows\ Registry\ Editor\ 
+>&0	string		Version\ 5.00\r\n\r\n	Windows Registry text (Win2K or above)
+
+# Windows *.INF *.INI files updated by Joerg Jenderek at Apr 2013
+# emtpy ,comment , section , unicode line
+0	regex/s		\\`(\r\n|;|[[]|\xFF\xFE)			
+# left bracket in section line
+>&0	search/8192	[						
+# http://en.wikipedia.org/wiki/Autorun.inf
+# http://msdn.microsoft.com/en-us/library/windows/desktop/cc144200.aspx
+>>&0	regex/c		\^(autorun)]\r\n				
+>>>&0	ubyte		=0x5b						INItialization configuration
+!:mime application/x-wine-extension-ini
+# From: Pal Tamas <folti@balabit.hu>
+# Autorun File
+>>>&0	ubyte		!0x5b						Microsoft Windows Autorun file
+!:mime application/x-setupscript
+# http://msdn.microsoft.com/en-us/library/windows/hardware/ff549520(v=vs.85).aspx
+# version strings ASCII coded case-independent for Windows setup information script file
+>>&0	regex/c		\^(version|strings)]				Windows setup INFormation
+!:mime	application/x-setupscript
+#!:mime application/inf
+#!:mime application/x-wine-extension-inf
+>>&0	regex/c		\^(WinsockCRCList|OEMCPL)]			Windows setup INFormation
+!:mime	text/inf
+# http://www.winfaq.de/faq_html/Content/tip2500/onlinefaq.php?h=tip2653.htm
+# http://msdn.microsoft.com/en-us/library/windows/desktop/cc144102.aspx
+# .ShellClassInfo DeleteOnCopy LocalizedFileNames ASCII coded case-independent
+>>&0	regex/c	\^(\.ShellClassInfo|DeleteOnCopy|LocalizedFileNames)]	Windows desktop.ini
+!:mime application/x-wine-extension-ini
+#!:mime text/plain
+# http://support.microsoft.com/kb/84709/
+>>&0	regex/c		\^(don't\ load)]				Windows CONTROL.INI
+!:mime application/x-wine-extension-ini
+>>&0	regex/c		\^(ndishlp\\$|protman\\$|NETBEUI\\$)]		Windows PROTOCOL.INI
+!:mime application/x-wine-extension-ini
+# http://technet.microsoft.com/en-us/library/cc722567.aspx
+# http://www.winfaq.de/faq_html/Content/tip0000/onlinefaq.php?h=tip0137.htm
+>>&0	regex/c		\^(windows|Compatibility|embedding)]		Windows WIN.INI
+!:mime application/x-wine-extension-ini
+# http://en.wikipedia.org/wiki/SYSTEM.INI
+>>&0	regex/c		\^(boot|386enh|drivers)]			Windows SYSTEM.INI
+!:mime application/x-wine-extension-ini
+# http://www.mdgx.com/newtip6.htm
+>>&0	regex/c		\^(SafeList)]					Windows IOS.INI
+!:mime application/x-wine-extension-ini
+# http://en.wikipedia.org/wiki/NTLDR	Windows Boot Loader information
+>>&0	regex/c		\^(boot\x20loader)]				Windows boot.ini
+!:mime application/x-wine-extension-ini
+>>>&0	ubyte		x						
+# http://en.wikipedia.org/wiki/CONFIG.SYS
+>>&0	regex/c		\^(menu)]\r\n					MS-DOS CONFIG.SYS
+# http://support.microsoft.com/kb/118579/
+>>&0	regex/c		\^(Paths)]\r\n					MS-DOS MSDOS.SYS
+# VERS string unicoded case-independent
+>>&0	ubequad&0xFFdfFFdfFFdfFFdf	0x0056004500520053		
+# ION] string unicoded case-independent
+>>>&0	ubequad&0xFFdfFFdfFFdfFFff	0x0049004f004e005d		Windows setup INFormation 
+!:mime application/x-setupscript
+# STRI string unicoded case-independent
+>>&0	ubequad&0xFFdfFFdfFFdfFFdf	0x0053005400520049		
+# NGS] string unicoded case-independent
+>>>&0	ubequad&0xFFdfFFdfFFdfFFff	0x004e00470053005D		Windows setup INFormation 
+!:mime application/x-setupscript
+# unknown keyword after opening bracket
+>>&0	default				x				
+>>>&0	search/8192			[				
+# version Strings FileIdentification
+>>>>&0	string/c			version				Windows setup INFormation 
+!:mime application/x-setupscript
+# VERS string unicoded case-independent
+>>>>&0	ubequad&0xFFdfFFdfFFdfFFdf	0x0056004500520053		
+# ION] string unicoded case-independent
+>>>>>&0	ubequad&0xFFdfFFdfFFdfFFff	0x0049004f004e005d		Windows setup INFormation 
+!:mime application/x-setupscript
+# http://en.wikipedia.org/wiki/Initialization_file	Windows Initialization File or other
+#>>>>&0	default				x				Generic INItialization configuration
+#!:mime application/x-wine-extension-ini
+
+# Windows Precompiled INF files *.PNF added by Joerg Jenderek at Mar 2013 of _PNF_HEADER inf.h
+# http://read.pudn.com/downloads3/sourcecode/windows/248345/win2k/private/windows/setup/setupapi/inf.h__.htm
+# GRR: line below too general as it catches also PDP-11 UNIX/RT ldp
+0		leshort&0xFeFe	0x0000		
+# test for unused null bits in PNF_FLAGs
+>4	ulelong&0xFCffFe00	0x00000000	
+# only found 58h for Offset of WinDirPath immediately after _PNF_HEADER structure
+>>68		ulelong		>0x57		
+# test for zero high byte of InfValueBlockSize, followed by WinDirPath like
+# C:\WINDOWS (ASCII 0x433a5c.. , unicode 0x43003a005c..) or X:\MININT
+>>>(68.l-1)	ubelong&0xffE0C519	=0x00400018	Windows Precompiled iNF
+!:mime	application/x-pnf
+# currently only found Major Version=1 and Minor Version=1
+#>>>>0		uleshort	=0x0101		
+#>>>>>1		ubyte		x		\b, version %u
+#>>>>>0		ubyte		x		\b.%u
+>>>>0		uleshort	!0x0101		
+>>>>>1		ubyte		x		\b, version %u
+>>>>>0		ubyte		x		\b.%u
+# 1 ,2 (windows 98 SE)
+#>>>>2		uleshort	=2		\b, InfStyle %u
+>>>>2		uleshort	!2		\b, InfStyle %u
+#	PNF_FLAG_IS_UNICODE		0x00000001
+#	PNF_FLAG_HAS_STRINGS		0x00000002
+#	PNF_FLAG_SRCPATH_IS_URL		0x00000004
+#	PNF_FLAG_HAS_VOLATILE_DIRIDS	0x00000008
+#	PNF_FLAG_INF_VERIFIED		0x00000010
+#	PNF_FLAG_INF_DIGITALLY_SIGNED	0x00000020
+#	??				0x00000100
+#	??				0x01000000
+#	??				0x02000000
+>>>>4	ulelong&0x00000001	0x00000001	\b, unicoded
+>>>>4	ulelong&0x00000020	0x00000020	\b, digitally signed
+#>>>>8		ulelong		x		\b, InfSubstValueListOffset 0x%x
+# many 0, 1 lmouusb.PNF, 2 linkfx10.PNF , f webfdr16.PNF
+#>>>>12		uleshort	x		\b, InfSubstValueCount 0x%x
+# only < 9 found
+#>>>>14		uleshort	x		\b, InfVersionDatumCount 0x%x
+# only found values lower 0x0000ffff
+#>>>>16		ulelong		x		\b, InfVersionDataSize 0x%x
+# only found positive values lower 0x00ffFFff for InfVersionDataOffset
+>>>>20		ulelong		x		\b, at 0x%x
+>>>>4	ulelong&0x00000001	=0x00000001	
+# case independent: CatalogFile Class DriverVer layoutfile LayoutFile SetupClass signature Signature    
+>>>>>(20.l)	lestring16	x		"%s"
+>>>>4	ulelong&0x00000001	!0x00000001	
+>>>>>(20.l)	string		x		"%s"
+# FILETIME is number of 100-nanosecond intervals since 1 January 1601
+#>>>>24		ulequad		x		\b, InfVersionLastWriteTime %16.16llx
+# only found values lower 0x00ffFFff
+#>>>>32		ulelong		x		\b, StringTableBlockOffset 0x%x
+#>>>>36		ulelong		x		\b, StringTableBlockSize 0x%x
+#>>>>40		ulelong		x		\b, InfSectionCount 0x%x
+#>>>>44		ulelong		x		\b, InfSectionBlockOffset 0x%x
+#>>>>48		ulelong		x		\b, InfSectionBlockSize 0x%x
+#>>>>52		ulelong		x		\b, InfLineBlockOffset 0x%x
+#>>>>56		ulelong		x		\b, InfLineBlockSize 0x%x
+#>>>>60		ulelong		x		\b, InfValueBlockOffset 0x%x
+#>>>>64		ulelong		x		\b, InfValueBlockSize 0x%x
+# WinDirPathOffset
+#>>>>68		ulelong		x		\b, at 0x%x
+>>>>68		ulelong		>0x57		
+>>>>>4	ulelong&0x00000001	=0x00000001	
+>>>>>>(68.l)	ubequad		=0x43003a005c005700			
+# normally unicoded C:\Windows
+#>>>>>>>(68.l)	lestring16	x		\b, WinDirPath "%s"
+>>>>>>(68.l)	ubequad		!0x43003a005c005700			
+>>>>>>>(68.l)	lestring16	x		\b, WinDirPath "%s"
+>>>>>4	ulelong&0x00000001	!0x00000001	
+# normally ASCII C:\WINDOWS
+#>>>>>>(68.l)	string		=C:\\WINDOWS	\b, WinDirPath "%s"
+>>>>>>(68.l)	string		!C:\\WINDOWS	\b, WinDirPath "%s"
+# found OsLoaderPathOffset values often 0 , once 70h corelist.PNF, once 68h ASCII machine.PNF 
+#>>>>72		ulelong		>0		\b, at 0x%x
+>>>>72		ulelong		>0		\b,
+>>>>>4	ulelong&0x00000001	=0x00000001	
+>>>>>>(72.l)	lestring16	x		OsLoaderPath "%s"
+>>>>>4	ulelong&0x00000001	!0x00000001	
+# seldom C:\ instead empty
+>>>>>>(72.l)	string		x		OsLoaderPath "%s"
+# 1fdh
+#>>>>76		uleshort	x		\b, StringTableHashBucketCount 0x%x
+>>>>78		uleshort	!0x407		\b, LanguageId %x
+# only 407h found
+#>>>>78		uleshort	=0x407		\b, LanguageId %x
+# InfSourcePathOffset often 0
+#>>>>80		ulelong		>0		\b, at 0x%x
+>>>>80		ulelong		>0		\b,
+>>>>>4	ulelong&0x00000001	=0x00000001	
+>>>>>>(80.l)	lestring16	x		SourcePath "%s"
+>>>>>4	ulelong&0x00000001	!0x00000001	
+>>>>>>(80.l)	string		>\0		SourcePath "%s"
+# OriginalInfNameOffset often 0
+#>>>>84		ulelong		>0		\b, at 0x%x
+>>>>84		ulelong		>0		\b,
+>>>>>4	ulelong&0x00000001	=0x00000001	
+>>>>>>(84.l)	lestring16	x		InfName "%s"
+>>>>>4	ulelong&0x00000001	!0x00000001	
+>>>>>>(84.l)	string		>\0		InfName "%s"
+
diff --git a/contrib/file/Magdir/wireless b/contrib/file/magic/Magdir/wireless
similarity index 100%
rename from contrib/file/Magdir/wireless
rename to contrib/file/magic/Magdir/wireless
diff --git a/contrib/file/Magdir/wordprocessors b/contrib/file/magic/Magdir/wordprocessors
similarity index 91%
rename from contrib/file/Magdir/wordprocessors
rename to contrib/file/magic/Magdir/wordprocessors
index 0ee4723a4299..951f6035d92d 100644
--- a/contrib/file/Magdir/wordprocessors
+++ b/contrib/file/magic/Magdir/wordprocessors
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: wordprocessors,v 1.15 2010/09/20 19:19:17 rrt Exp $
+# $File: wordprocessors,v 1.18 2013/06/03 19:07:29 christos Exp $
 # wordprocessors:  file(1) magic fo word processors.
 #
 ####### PWP file format used on Smith Corona Personal Word Processors:
@@ -110,7 +110,7 @@
 512	string		R\0o\0o\0t\0	Hangul (Korean) Word Processor File 2000
 !:mime	application/x-hwp
 
-# CosmicBook, from Beno�t Rouits
+# CosmicBook, from Benoit Rouits
 0       string  CSBK    Ted Neslson's CosmicBook hypertext file
 
 2       string  EYWR    AmigaWriter file
@@ -156,8 +156,17 @@
 0	string/w	\<map\ version	Freemind document
 !:mime	application/x-freemind
 
+# Type: Freeplane mindmap documents
+# From: Felix Natter <fnatter@gmx.net>
+0       string/w        \<map\ version="freeplane  Freeplane document
+!:mime  application/x-freeplane
+
 # Type:        Scribus
 # From:        Werner Fink <werner@suse.de>
 0	string	\<SCRIBUSUTF8\ Version		Scribus Document
 0	string	\<SCRIBUSUTF8NEW\ Version	Scribus Document
 !:mime	application/x-scribus
+
+# help files .hlp compiled from html and used by gfxboot added by Joerg Jenderek
+# markups page=0x04,label=0x12, followed by strings like "opt" or "main" and title=0x14
+0	ulelong&0x8080FFFF	0x00001204	gfxboot compiled html help file
diff --git a/contrib/file/Magdir/wsdl b/contrib/file/magic/Magdir/wsdl
similarity index 82%
rename from contrib/file/Magdir/wsdl
rename to contrib/file/magic/Magdir/wsdl
index 63865bd7e201..94bd1d1110fe 100644
--- a/contrib/file/Magdir/wsdl
+++ b/contrib/file/magic/Magdir/wsdl
@@ -1,11 +1,11 @@
 
 #------------------------------------------------------------------------------
-# $File: wsdl,v 1.1 2011/01/19 19:34:50 christos Exp $
+# $File: wsdl,v 1.3 2013/02/06 14:18:52 christos Exp $
 # wsdl: PHP WSDL Cache, http://www.php.net/manual/en/book.soap.php
 # Cache format extracted from source:
 # http://svn.php.net/viewvc/php/php-src/trunk/ext/soap/php_sdl.c?revision=HEAD&view=markup
 # Requires file >= 5.05, see http://mx.gw.com/pipermail/file/2010/000683.html
-# By Elan Ruusamäe <glen@delfi.ee>, Patryk Zawadzki <patrys@pld-linux.org>, 2010-2011
+# By Elan Ruusamae <glen@delfi.ee>, Patryk Zawadzki <patrys@pld-linux.org>, 2010-2011
 0		string		wsdl		PHP WSDL cache,
 >4		byte		x		version 0x%02x
 >6		ledate		x		\b, created %s
diff --git a/contrib/file/Magdir/xdelta b/contrib/file/magic/Magdir/xdelta
similarity index 100%
rename from contrib/file/Magdir/xdelta
rename to contrib/file/magic/Magdir/xdelta
diff --git a/contrib/file/Magdir/xenix b/contrib/file/magic/Magdir/xenix
similarity index 100%
rename from contrib/file/Magdir/xenix
rename to contrib/file/magic/Magdir/xenix
diff --git a/contrib/file/magic/Magdir/xilinx b/contrib/file/magic/Magdir/xilinx
new file mode 100644
index 000000000000..91e84d91d0ee
--- /dev/null
+++ b/contrib/file/magic/Magdir/xilinx
@@ -0,0 +1,40 @@
+
+#------------------------------------------------------------------------------
+# $File: xilinx,v 1.7 2014/04/30 21:41:02 christos Exp $
+# This is Aaron's attempt at a MAGIC file for Xilinx .bit files.
+# Xilinx-Magic@RevRagnarok.com
+# Got the info from FPGA-FAQ 0026
+#
+# Rewritten to use pstring/H instead of hardcoded lengths by O. Freyermuth, 
+# fixes at least reading of bitfiles from Spartan 2, 3, 6. 
+# http://www.fpga-faq.com/FAQ_Pages/0026_Tell_me_about_bit_files.htm
+#
+# First there is the sync header and its length
+0	beshort 0x0009
+>2 	belong	=0x0ff00ff0
+>>&0	belong  =0x0ff00ff0
+>>>&0	byte    =0x00
+>>>&1   beshort =0x0001
+>>>&3	string	a	Xilinx BIT data
+# Next is a Pascal-style string with the NCD name. We want to capture that.
+>>>>&0	   pstring/H	x	- from %s
+# And then 'b'
+>>>>>&1    string b
+# Then the model / part number: 
+>>>>>>&0   pstring/H    x       - for %s
+# Then 'c'
+>>>>>>>&1 string c
+# Then the build-date
+>>>>>>>>&0 pstring/H    x       - built %s
+# Then 'd'
+>>>>>>>>>&1   string d
+# Then the build-time
+>>>>>>>>>>&0  pstring/H x        \b(%s)
+# Then 'e'
+>>>>>>>>>>>&1  string e
+# And length of data
+>>>>>>>>>>>>&0 belong x          - data length 0x%x
+
+# Raw bitstream files
+0      long    0xffffffff      
+>&0    belong  0xaa995566      Xilinx RAW bitstream (.BIN)
diff --git a/contrib/file/Magdir/xo65 b/contrib/file/magic/Magdir/xo65
similarity index 100%
rename from contrib/file/Magdir/xo65
rename to contrib/file/magic/Magdir/xo65
diff --git a/contrib/file/Magdir/xwindows b/contrib/file/magic/Magdir/xwindows
similarity index 79%
rename from contrib/file/Magdir/xwindows
rename to contrib/file/magic/Magdir/xwindows
index 93126fbaa885..eb208927f01e 100644
--- a/contrib/file/Magdir/xwindows
+++ b/contrib/file/magic/Magdir/xwindows
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: xwindows,v 1.7 2011/05/03 01:44:17 christos Exp $
+# $File: xwindows,v 1.9 2014/04/30 21:41:02 christos Exp $
 # xwindows:  file(1) magic for various X/Window system file formats.
 
 # Compiled X Keymap 
@@ -10,7 +10,7 @@
 >0	byte	=0				obsolete
 0	string	xkm				Compiled XKB Keymap: msb,
 >3	byte	>0				version %d
->0	byte	=0				obsolete
+>3	byte	=0				obsolete
 
 # xfsdump archive
 0	string	xFSdump0			xfsdump archive
@@ -18,10 +18,10 @@
 
 # Jaleo XFS files
 0	long	395726				Jaleo XFS file
->4	long	x				- version %ld
->8	long	x				- [%ld -
->20	long	x				\b%ldx
->24	long	x				\b%ldx
+>4	long	x				- version %d
+>8	long	x				- [%d -
+>20	long	x				\b%dx
+>24	long	x				\b%dx
 >28	long	1008				\bYUV422]
 >28	long	1000				\bRGB24]
 
@@ -31,5 +31,5 @@
 # http://cgit.freedesktop.org/xorg/lib/libXcursor/tree/include/X11/Xcursor/Xcursor.h
 0	string		Xcur		Xcursor data
 !:mime	image/x-xcursor
->10	leshort		x		version %hd
->>8	leshort		x		\b.%hd
+>10	leshort		x		version %d
+>>8	leshort		x		\b.%d
diff --git a/contrib/file/Magdir/zfs b/contrib/file/magic/Magdir/zfs
similarity index 94%
rename from contrib/file/Magdir/zfs
rename to contrib/file/magic/Magdir/zfs
index 1f74409a8c75..77675ed7196f 100644
--- a/contrib/file/Magdir/zfs
+++ b/contrib/file/magic/Magdir/zfs
@@ -37,14 +37,14 @@
 
 # Big-endian values
 8	string	\000\000\000\002\365\272\313\254 ZFS shapshot (big-endian machine),
->20	belong	x	version %lu,
+>20	belong	x	version %u,
 >32	belong	0	type: NONE,
 >32	belong	1	type: META,
 >32	belong	2	type: ZFS,
 >32	belong	3	type: ZVOL,
 >32	belong	4	type: OTHER,
 >32	belong	5	type: ANY,
->32	belong	>5	type: UNKNOWN (%lu),
+>32	belong	>5	type: UNKNOWN (%u),
 >40	byte	x	destination GUID: %02X
 >41	byte	x	%02X
 >42	byte	x	%02X
@@ -67,14 +67,14 @@
 
 # Little-endian values
 8	string	\254\313\272\365\002\000\000\000	ZFS shapshot (little-endian machine),
->16	lelong	x	version %lu,
+>16	lelong	x	version %u,
 >32	lelong	0	type: NONE,
 >32	lelong	1	type: META,
 >32	lelong	2	type: ZFS,
 >32	lelong	3	type: ZVOL,
 >32	lelong	4	type: OTHER,
 >32	lelong	5	type: ANY,
->32	lelong	>5	type: UNKNOWN (%lu),
+>32	lelong	>5	type: UNKNOWN (%u),
 >47	byte	x	destination GUID: %02X
 >46	byte	x	%02X
 >45	byte	x	%02X
diff --git a/contrib/file/Magdir/zilog b/contrib/file/magic/Magdir/zilog
similarity index 100%
rename from contrib/file/Magdir/zilog
rename to contrib/file/magic/Magdir/zilog
diff --git a/contrib/file/Magdir/zyxel b/contrib/file/magic/Magdir/zyxel
similarity index 100%
rename from contrib/file/Magdir/zyxel
rename to contrib/file/magic/Magdir/zyxel
diff --git a/contrib/file/magic/Makefile.am b/contrib/file/magic/Makefile.am
new file mode 100644
index 000000000000..27e11811c63c
--- /dev/null
+++ b/contrib/file/magic/Makefile.am
@@ -0,0 +1,299 @@
+#
+# $File: Makefile.am,v 1.98 2014/06/03 18:22:34 christos Exp $
+#
+MAGIC_FRAGMENT_BASE = Magdir
+MAGIC_DIR = $(top_srcdir)/magic
+MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
+
+pkgdata_DATA = magic.mgc
+
+EXTRA_DIST = \
+$(MAGIC_DIR)/Header \
+$(MAGIC_DIR)/Localstuff \
+$(MAGIC_FRAGMENT_DIR)/acorn \
+$(MAGIC_FRAGMENT_DIR)/adi \
+$(MAGIC_FRAGMENT_DIR)/adventure \
+$(MAGIC_FRAGMENT_DIR)/allegro \
+$(MAGIC_FRAGMENT_DIR)/alliant \
+$(MAGIC_FRAGMENT_DIR)/amanda \
+$(MAGIC_FRAGMENT_DIR)/amigaos \
+$(MAGIC_FRAGMENT_DIR)/android \
+$(MAGIC_FRAGMENT_DIR)/animation \
+$(MAGIC_FRAGMENT_DIR)/aout \
+$(MAGIC_FRAGMENT_DIR)/apl \
+$(MAGIC_FRAGMENT_DIR)/apple \
+$(MAGIC_FRAGMENT_DIR)/applix \
+$(MAGIC_FRAGMENT_DIR)/archive \
+$(MAGIC_FRAGMENT_DIR)/assembler \
+$(MAGIC_FRAGMENT_DIR)/asterix \
+$(MAGIC_FRAGMENT_DIR)/att3b \
+$(MAGIC_FRAGMENT_DIR)/audio \
+$(MAGIC_FRAGMENT_DIR)/basis \
+$(MAGIC_FRAGMENT_DIR)/bflt \
+$(MAGIC_FRAGMENT_DIR)/blackberry \
+$(MAGIC_FRAGMENT_DIR)/blcr \
+$(MAGIC_FRAGMENT_DIR)/blender \
+$(MAGIC_FRAGMENT_DIR)/blit \
+$(MAGIC_FRAGMENT_DIR)/bout \
+$(MAGIC_FRAGMENT_DIR)/bsdi \
+$(MAGIC_FRAGMENT_DIR)/bsi \
+$(MAGIC_FRAGMENT_DIR)/btsnoop \
+$(MAGIC_FRAGMENT_DIR)/c-lang \
+$(MAGIC_FRAGMENT_DIR)/c64 \
+$(MAGIC_FRAGMENT_DIR)/cad \
+$(MAGIC_FRAGMENT_DIR)/cafebabe \
+$(MAGIC_FRAGMENT_DIR)/cddb \
+$(MAGIC_FRAGMENT_DIR)/chord \
+$(MAGIC_FRAGMENT_DIR)/cisco \
+$(MAGIC_FRAGMENT_DIR)/citrus \
+$(MAGIC_FRAGMENT_DIR)/clarion \
+$(MAGIC_FRAGMENT_DIR)/claris \
+$(MAGIC_FRAGMENT_DIR)/clipper \
+$(MAGIC_FRAGMENT_DIR)/commands \
+$(MAGIC_FRAGMENT_DIR)/communications \
+$(MAGIC_FRAGMENT_DIR)/compress \
+$(MAGIC_FRAGMENT_DIR)/console \
+$(MAGIC_FRAGMENT_DIR)/convex \
+$(MAGIC_FRAGMENT_DIR)/cracklib \
+$(MAGIC_FRAGMENT_DIR)/ctags \
+$(MAGIC_FRAGMENT_DIR)/ctf \
+$(MAGIC_FRAGMENT_DIR)/cubemap \
+$(MAGIC_FRAGMENT_DIR)/cups \
+$(MAGIC_FRAGMENT_DIR)/dact \
+$(MAGIC_FRAGMENT_DIR)/database \
+$(MAGIC_FRAGMENT_DIR)/diamond \
+$(MAGIC_FRAGMENT_DIR)/diff \
+$(MAGIC_FRAGMENT_DIR)/digital \
+$(MAGIC_FRAGMENT_DIR)/dolby \
+$(MAGIC_FRAGMENT_DIR)/dump \
+$(MAGIC_FRAGMENT_DIR)/dyadic \
+$(MAGIC_FRAGMENT_DIR)/ebml \
+$(MAGIC_FRAGMENT_DIR)/editors \
+$(MAGIC_FRAGMENT_DIR)/efi \
+$(MAGIC_FRAGMENT_DIR)/elf \
+$(MAGIC_FRAGMENT_DIR)/encore \
+$(MAGIC_FRAGMENT_DIR)/epoc \
+$(MAGIC_FRAGMENT_DIR)/erlang \
+$(MAGIC_FRAGMENT_DIR)/esri \
+$(MAGIC_FRAGMENT_DIR)/fcs \
+$(MAGIC_FRAGMENT_DIR)/filesystems \
+$(MAGIC_FRAGMENT_DIR)/flash \
+$(MAGIC_FRAGMENT_DIR)/fonts \
+$(MAGIC_FRAGMENT_DIR)/fortran \
+$(MAGIC_FRAGMENT_DIR)/frame \
+$(MAGIC_FRAGMENT_DIR)/freebsd \
+$(MAGIC_FRAGMENT_DIR)/fsav \
+$(MAGIC_FRAGMENT_DIR)/fusecompress \
+$(MAGIC_FRAGMENT_DIR)/games \
+$(MAGIC_FRAGMENT_DIR)/gcc \
+$(MAGIC_FRAGMENT_DIR)/geo \
+$(MAGIC_FRAGMENT_DIR)/geos \
+$(MAGIC_FRAGMENT_DIR)/gimp \
+$(MAGIC_FRAGMENT_DIR)/gnome \
+$(MAGIC_FRAGMENT_DIR)/gnu \
+$(MAGIC_FRAGMENT_DIR)/gnumeric \
+$(MAGIC_FRAGMENT_DIR)/gpt \
+$(MAGIC_FRAGMENT_DIR)/grace \
+$(MAGIC_FRAGMENT_DIR)/graphviz \
+$(MAGIC_FRAGMENT_DIR)/gringotts \
+$(MAGIC_FRAGMENT_DIR)/guile \
+$(MAGIC_FRAGMENT_DIR)/hitachi-sh \
+$(MAGIC_FRAGMENT_DIR)/hp \
+$(MAGIC_FRAGMENT_DIR)/human68k \
+$(MAGIC_FRAGMENT_DIR)/ibm370 \
+$(MAGIC_FRAGMENT_DIR)/ibm6000 \
+$(MAGIC_FRAGMENT_DIR)/icc \
+$(MAGIC_FRAGMENT_DIR)/iff \
+$(MAGIC_FRAGMENT_DIR)/images \
+$(MAGIC_FRAGMENT_DIR)/inform \
+$(MAGIC_FRAGMENT_DIR)/intel \
+$(MAGIC_FRAGMENT_DIR)/interleaf \
+$(MAGIC_FRAGMENT_DIR)/island \
+$(MAGIC_FRAGMENT_DIR)/ispell \
+$(MAGIC_FRAGMENT_DIR)/isz \
+$(MAGIC_FRAGMENT_DIR)/java \
+$(MAGIC_FRAGMENT_DIR)/javascript \
+$(MAGIC_FRAGMENT_DIR)/jpeg \
+$(MAGIC_FRAGMENT_DIR)/karma \
+$(MAGIC_FRAGMENT_DIR)/kde \
+$(MAGIC_FRAGMENT_DIR)/keepass \
+$(MAGIC_FRAGMENT_DIR)/kml \
+$(MAGIC_FRAGMENT_DIR)/lecter \
+$(MAGIC_FRAGMENT_DIR)/lex \
+$(MAGIC_FRAGMENT_DIR)/lif \
+$(MAGIC_FRAGMENT_DIR)/linux \
+$(MAGIC_FRAGMENT_DIR)/lisp \
+$(MAGIC_FRAGMENT_DIR)/llvm \
+$(MAGIC_FRAGMENT_DIR)/lua \
+$(MAGIC_FRAGMENT_DIR)/luks \
+$(MAGIC_FRAGMENT_DIR)/m4 \
+$(MAGIC_FRAGMENT_DIR)/mach \
+$(MAGIC_FRAGMENT_DIR)/macos \
+$(MAGIC_FRAGMENT_DIR)/macintosh \
+$(MAGIC_FRAGMENT_DIR)/magic \
+$(MAGIC_FRAGMENT_DIR)/mail.news \
+$(MAGIC_FRAGMENT_DIR)/make \
+$(MAGIC_FRAGMENT_DIR)/map \
+$(MAGIC_FRAGMENT_DIR)/maple \
+$(MAGIC_FRAGMENT_DIR)/marc21 \
+$(MAGIC_FRAGMENT_DIR)/mathcad \
+$(MAGIC_FRAGMENT_DIR)/mathematica \
+$(MAGIC_FRAGMENT_DIR)/matroska \
+$(MAGIC_FRAGMENT_DIR)/mcrypt \
+$(MAGIC_FRAGMENT_DIR)/mercurial \
+$(MAGIC_FRAGMENT_DIR)/metastore \
+$(MAGIC_FRAGMENT_DIR)/mime \
+$(MAGIC_FRAGMENT_DIR)/mips \
+$(MAGIC_FRAGMENT_DIR)/mirage \
+$(MAGIC_FRAGMENT_DIR)/misctools \
+$(MAGIC_FRAGMENT_DIR)/mkid \
+$(MAGIC_FRAGMENT_DIR)/mlssa \
+$(MAGIC_FRAGMENT_DIR)/mmdf \
+$(MAGIC_FRAGMENT_DIR)/modem \
+$(MAGIC_FRAGMENT_DIR)/motorola \
+$(MAGIC_FRAGMENT_DIR)/mozilla \
+$(MAGIC_FRAGMENT_DIR)/msdos \
+$(MAGIC_FRAGMENT_DIR)/msooxml \
+$(MAGIC_FRAGMENT_DIR)/msx \
+$(MAGIC_FRAGMENT_DIR)/msvc \
+$(MAGIC_FRAGMENT_DIR)/mup \
+$(MAGIC_FRAGMENT_DIR)/music \
+$(MAGIC_FRAGMENT_DIR)/natinst \
+$(MAGIC_FRAGMENT_DIR)/ncr \
+$(MAGIC_FRAGMENT_DIR)/neko \
+$(MAGIC_FRAGMENT_DIR)/netbsd \
+$(MAGIC_FRAGMENT_DIR)/netscape \
+$(MAGIC_FRAGMENT_DIR)/netware \
+$(MAGIC_FRAGMENT_DIR)/news \
+$(MAGIC_FRAGMENT_DIR)/nitpicker \
+$(MAGIC_FRAGMENT_DIR)/oasis \
+$(MAGIC_FRAGMENT_DIR)/ocaml \
+$(MAGIC_FRAGMENT_DIR)/octave \
+$(MAGIC_FRAGMENT_DIR)/ole2compounddocs \
+$(MAGIC_FRAGMENT_DIR)/olf \
+$(MAGIC_FRAGMENT_DIR)/os2 \
+$(MAGIC_FRAGMENT_DIR)/os400 \
+$(MAGIC_FRAGMENT_DIR)/os9 \
+$(MAGIC_FRAGMENT_DIR)/osf1 \
+$(MAGIC_FRAGMENT_DIR)/palm \
+$(MAGIC_FRAGMENT_DIR)/parix \
+$(MAGIC_FRAGMENT_DIR)/parrot \
+$(MAGIC_FRAGMENT_DIR)/pascal \
+$(MAGIC_FRAGMENT_DIR)/pbf \
+$(MAGIC_FRAGMENT_DIR)/pbm \
+$(MAGIC_FRAGMENT_DIR)/pdf \
+$(MAGIC_FRAGMENT_DIR)/pdp \
+$(MAGIC_FRAGMENT_DIR)/perl \
+$(MAGIC_FRAGMENT_DIR)/pgf \
+$(MAGIC_FRAGMENT_DIR)/pgp \
+$(MAGIC_FRAGMENT_DIR)/pkgadd \
+$(MAGIC_FRAGMENT_DIR)/plan9 \
+$(MAGIC_FRAGMENT_DIR)/plus5 \
+$(MAGIC_FRAGMENT_DIR)/printer \
+$(MAGIC_FRAGMENT_DIR)/project \
+$(MAGIC_FRAGMENT_DIR)/psdbms \
+$(MAGIC_FRAGMENT_DIR)/pulsar \
+$(MAGIC_FRAGMENT_DIR)/pwsafe \
+$(MAGIC_FRAGMENT_DIR)/pyramid \
+$(MAGIC_FRAGMENT_DIR)/python \
+$(MAGIC_FRAGMENT_DIR)/revision \
+$(MAGIC_FRAGMENT_DIR)/riff \
+$(MAGIC_FRAGMENT_DIR)/rinex \
+$(MAGIC_FRAGMENT_DIR)/rpm \
+$(MAGIC_FRAGMENT_DIR)/rtf \
+$(MAGIC_FRAGMENT_DIR)/ruby \
+$(MAGIC_FRAGMENT_DIR)/sc \
+$(MAGIC_FRAGMENT_DIR)/sccs \
+$(MAGIC_FRAGMENT_DIR)/scientific \
+$(MAGIC_FRAGMENT_DIR)/securitycerts \
+$(MAGIC_FRAGMENT_DIR)/selinux \
+$(MAGIC_FRAGMENT_DIR)/sendmail \
+$(MAGIC_FRAGMENT_DIR)/sequent \
+$(MAGIC_FRAGMENT_DIR)/sereal \
+$(MAGIC_FRAGMENT_DIR)/sgi \
+$(MAGIC_FRAGMENT_DIR)/sgml \
+$(MAGIC_FRAGMENT_DIR)/sharc \
+$(MAGIC_FRAGMENT_DIR)/sinclair \
+$(MAGIC_FRAGMENT_DIR)/sisu \
+$(MAGIC_FRAGMENT_DIR)/sketch \
+$(MAGIC_FRAGMENT_DIR)/smalltalk \
+$(MAGIC_FRAGMENT_DIR)/smile \
+$(MAGIC_FRAGMENT_DIR)/sniffer \
+$(MAGIC_FRAGMENT_DIR)/softquad \
+$(MAGIC_FRAGMENT_DIR)/spec \
+$(MAGIC_FRAGMENT_DIR)/spectrum \
+$(MAGIC_FRAGMENT_DIR)/sql \
+$(MAGIC_FRAGMENT_DIR)/ssh \
+$(MAGIC_FRAGMENT_DIR)/ssl \
+$(MAGIC_FRAGMENT_DIR)/sun \
+$(MAGIC_FRAGMENT_DIR)/symbos \
+$(MAGIC_FRAGMENT_DIR)/sysex \
+$(MAGIC_FRAGMENT_DIR)/tcl \
+$(MAGIC_FRAGMENT_DIR)/teapot \
+$(MAGIC_FRAGMENT_DIR)/terminfo \
+$(MAGIC_FRAGMENT_DIR)/tex \
+$(MAGIC_FRAGMENT_DIR)/tgif \
+$(MAGIC_FRAGMENT_DIR)/ti-8x \
+$(MAGIC_FRAGMENT_DIR)/timezone \
+$(MAGIC_FRAGMENT_DIR)/troff \
+$(MAGIC_FRAGMENT_DIR)/tuxedo \
+$(MAGIC_FRAGMENT_DIR)/typeset \
+$(MAGIC_FRAGMENT_DIR)/unicode \
+$(MAGIC_FRAGMENT_DIR)/unknown \
+$(MAGIC_FRAGMENT_DIR)/uterus \
+$(MAGIC_FRAGMENT_DIR)/uuencode \
+$(MAGIC_FRAGMENT_DIR)/varied.out \
+$(MAGIC_FRAGMENT_DIR)/varied.script \
+$(MAGIC_FRAGMENT_DIR)/vax \
+$(MAGIC_FRAGMENT_DIR)/vicar \
+$(MAGIC_FRAGMENT_DIR)/virtual \
+$(MAGIC_FRAGMENT_DIR)/virtutech \
+$(MAGIC_FRAGMENT_DIR)/visx \
+$(MAGIC_FRAGMENT_DIR)/vms \
+$(MAGIC_FRAGMENT_DIR)/vmware \
+$(MAGIC_FRAGMENT_DIR)/vorbis \
+$(MAGIC_FRAGMENT_DIR)/vxl \
+$(MAGIC_FRAGMENT_DIR)/warc \
+$(MAGIC_FRAGMENT_DIR)/weak \
+$(MAGIC_FRAGMENT_DIR)/windows \
+$(MAGIC_FRAGMENT_DIR)/wireless \
+$(MAGIC_FRAGMENT_DIR)/wordprocessors \
+$(MAGIC_FRAGMENT_DIR)/wsdl \
+$(MAGIC_FRAGMENT_DIR)/xdelta \
+$(MAGIC_FRAGMENT_DIR)/xenix \
+$(MAGIC_FRAGMENT_DIR)/xilinx \
+$(MAGIC_FRAGMENT_DIR)/xo65 \
+$(MAGIC_FRAGMENT_DIR)/xwindows \
+$(MAGIC_FRAGMENT_DIR)/zfs \
+$(MAGIC_FRAGMENT_DIR)/zilog \
+$(MAGIC_FRAGMENT_DIR)/zyxel 
+
+MAGIC = magic.mgc
+CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
+
+# FIXME: Build file natively as well so that it can be used to compile
+# the target's magic file; for now we bail if the local version does not match
+if IS_CROSS_COMPILE
+FILE_COMPILE = file${EXEEXT}
+FILE_COMPILE_DEP =
+else
+FILE_COMPILE = $(top_builddir)/src/file${EXEEXT}
+FILE_COMPILE_DEP = $(FILE_COMPILE)
+endif
+
+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
+	@rm -fr magic
+	@mkdir magic && cp -p $(EXTRA_DIST) magic
+	@(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
+	    echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
+	  else \
+	    v=$$(file --version | sed -e s/file-// -e q); \
+	    if [ "$$v" != "${PACKAGE_VERSION}" ]; then \
+		echo "Cannot use the installed version of file ($$v) to"; \
+		echo "cross-compile file ${PACKAGE_VERSION}"; \
+		echo "Please install file ${PACKAGE_VERSION} locally first"; \
+		exit 1; \
+	    fi; \
+	  fi)
+	$(FILE_COMPILE) -C -m magic
+	@rm -fr magic
diff --git a/contrib/file/magic/Makefile.in b/contrib/file/magic/Makefile.in
new file mode 100644
index 000000000000..e86cdbf960b8
--- /dev/null
+++ b/contrib/file/magic/Makefile.in
@@ -0,0 +1,776 @@
+# Makefile.in generated by automake 1.14 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 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@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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@
+subdir = magic
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+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)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MINGW = @MINGW@
+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@
+WARNINGS = @WARNINGS@
+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_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@
+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@
+fsect = @fsect@
+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_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+#
+# $File: Makefile.am,v 1.98 2014/06/03 18:22:34 christos Exp $
+#
+MAGIC_FRAGMENT_BASE = Magdir
+MAGIC_DIR = $(top_srcdir)/magic
+MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
+pkgdata_DATA = magic.mgc
+EXTRA_DIST = \
+$(MAGIC_DIR)/Header \
+$(MAGIC_DIR)/Localstuff \
+$(MAGIC_FRAGMENT_DIR)/acorn \
+$(MAGIC_FRAGMENT_DIR)/adi \
+$(MAGIC_FRAGMENT_DIR)/adventure \
+$(MAGIC_FRAGMENT_DIR)/allegro \
+$(MAGIC_FRAGMENT_DIR)/alliant \
+$(MAGIC_FRAGMENT_DIR)/amanda \
+$(MAGIC_FRAGMENT_DIR)/amigaos \
+$(MAGIC_FRAGMENT_DIR)/android \
+$(MAGIC_FRAGMENT_DIR)/animation \
+$(MAGIC_FRAGMENT_DIR)/aout \
+$(MAGIC_FRAGMENT_DIR)/apl \
+$(MAGIC_FRAGMENT_DIR)/apple \
+$(MAGIC_FRAGMENT_DIR)/applix \
+$(MAGIC_FRAGMENT_DIR)/archive \
+$(MAGIC_FRAGMENT_DIR)/assembler \
+$(MAGIC_FRAGMENT_DIR)/asterix \
+$(MAGIC_FRAGMENT_DIR)/att3b \
+$(MAGIC_FRAGMENT_DIR)/audio \
+$(MAGIC_FRAGMENT_DIR)/basis \
+$(MAGIC_FRAGMENT_DIR)/bflt \
+$(MAGIC_FRAGMENT_DIR)/blackberry \
+$(MAGIC_FRAGMENT_DIR)/blcr \
+$(MAGIC_FRAGMENT_DIR)/blender \
+$(MAGIC_FRAGMENT_DIR)/blit \
+$(MAGIC_FRAGMENT_DIR)/bout \
+$(MAGIC_FRAGMENT_DIR)/bsdi \
+$(MAGIC_FRAGMENT_DIR)/bsi \
+$(MAGIC_FRAGMENT_DIR)/btsnoop \
+$(MAGIC_FRAGMENT_DIR)/c-lang \
+$(MAGIC_FRAGMENT_DIR)/c64 \
+$(MAGIC_FRAGMENT_DIR)/cad \
+$(MAGIC_FRAGMENT_DIR)/cafebabe \
+$(MAGIC_FRAGMENT_DIR)/cddb \
+$(MAGIC_FRAGMENT_DIR)/chord \
+$(MAGIC_FRAGMENT_DIR)/cisco \
+$(MAGIC_FRAGMENT_DIR)/citrus \
+$(MAGIC_FRAGMENT_DIR)/clarion \
+$(MAGIC_FRAGMENT_DIR)/claris \
+$(MAGIC_FRAGMENT_DIR)/clipper \
+$(MAGIC_FRAGMENT_DIR)/commands \
+$(MAGIC_FRAGMENT_DIR)/communications \
+$(MAGIC_FRAGMENT_DIR)/compress \
+$(MAGIC_FRAGMENT_DIR)/console \
+$(MAGIC_FRAGMENT_DIR)/convex \
+$(MAGIC_FRAGMENT_DIR)/cracklib \
+$(MAGIC_FRAGMENT_DIR)/ctags \
+$(MAGIC_FRAGMENT_DIR)/ctf \
+$(MAGIC_FRAGMENT_DIR)/cubemap \
+$(MAGIC_FRAGMENT_DIR)/cups \
+$(MAGIC_FRAGMENT_DIR)/dact \
+$(MAGIC_FRAGMENT_DIR)/database \
+$(MAGIC_FRAGMENT_DIR)/diamond \
+$(MAGIC_FRAGMENT_DIR)/diff \
+$(MAGIC_FRAGMENT_DIR)/digital \
+$(MAGIC_FRAGMENT_DIR)/dolby \
+$(MAGIC_FRAGMENT_DIR)/dump \
+$(MAGIC_FRAGMENT_DIR)/dyadic \
+$(MAGIC_FRAGMENT_DIR)/ebml \
+$(MAGIC_FRAGMENT_DIR)/editors \
+$(MAGIC_FRAGMENT_DIR)/efi \
+$(MAGIC_FRAGMENT_DIR)/elf \
+$(MAGIC_FRAGMENT_DIR)/encore \
+$(MAGIC_FRAGMENT_DIR)/epoc \
+$(MAGIC_FRAGMENT_DIR)/erlang \
+$(MAGIC_FRAGMENT_DIR)/esri \
+$(MAGIC_FRAGMENT_DIR)/fcs \
+$(MAGIC_FRAGMENT_DIR)/filesystems \
+$(MAGIC_FRAGMENT_DIR)/flash \
+$(MAGIC_FRAGMENT_DIR)/fonts \
+$(MAGIC_FRAGMENT_DIR)/fortran \
+$(MAGIC_FRAGMENT_DIR)/frame \
+$(MAGIC_FRAGMENT_DIR)/freebsd \
+$(MAGIC_FRAGMENT_DIR)/fsav \
+$(MAGIC_FRAGMENT_DIR)/fusecompress \
+$(MAGIC_FRAGMENT_DIR)/games \
+$(MAGIC_FRAGMENT_DIR)/gcc \
+$(MAGIC_FRAGMENT_DIR)/geo \
+$(MAGIC_FRAGMENT_DIR)/geos \
+$(MAGIC_FRAGMENT_DIR)/gimp \
+$(MAGIC_FRAGMENT_DIR)/gnome \
+$(MAGIC_FRAGMENT_DIR)/gnu \
+$(MAGIC_FRAGMENT_DIR)/gnumeric \
+$(MAGIC_FRAGMENT_DIR)/gpt \
+$(MAGIC_FRAGMENT_DIR)/grace \
+$(MAGIC_FRAGMENT_DIR)/graphviz \
+$(MAGIC_FRAGMENT_DIR)/gringotts \
+$(MAGIC_FRAGMENT_DIR)/guile \
+$(MAGIC_FRAGMENT_DIR)/hitachi-sh \
+$(MAGIC_FRAGMENT_DIR)/hp \
+$(MAGIC_FRAGMENT_DIR)/human68k \
+$(MAGIC_FRAGMENT_DIR)/ibm370 \
+$(MAGIC_FRAGMENT_DIR)/ibm6000 \
+$(MAGIC_FRAGMENT_DIR)/icc \
+$(MAGIC_FRAGMENT_DIR)/iff \
+$(MAGIC_FRAGMENT_DIR)/images \
+$(MAGIC_FRAGMENT_DIR)/inform \
+$(MAGIC_FRAGMENT_DIR)/intel \
+$(MAGIC_FRAGMENT_DIR)/interleaf \
+$(MAGIC_FRAGMENT_DIR)/island \
+$(MAGIC_FRAGMENT_DIR)/ispell \
+$(MAGIC_FRAGMENT_DIR)/isz \
+$(MAGIC_FRAGMENT_DIR)/java \
+$(MAGIC_FRAGMENT_DIR)/javascript \
+$(MAGIC_FRAGMENT_DIR)/jpeg \
+$(MAGIC_FRAGMENT_DIR)/karma \
+$(MAGIC_FRAGMENT_DIR)/kde \
+$(MAGIC_FRAGMENT_DIR)/keepass \
+$(MAGIC_FRAGMENT_DIR)/kml \
+$(MAGIC_FRAGMENT_DIR)/lecter \
+$(MAGIC_FRAGMENT_DIR)/lex \
+$(MAGIC_FRAGMENT_DIR)/lif \
+$(MAGIC_FRAGMENT_DIR)/linux \
+$(MAGIC_FRAGMENT_DIR)/lisp \
+$(MAGIC_FRAGMENT_DIR)/llvm \
+$(MAGIC_FRAGMENT_DIR)/lua \
+$(MAGIC_FRAGMENT_DIR)/luks \
+$(MAGIC_FRAGMENT_DIR)/m4 \
+$(MAGIC_FRAGMENT_DIR)/mach \
+$(MAGIC_FRAGMENT_DIR)/macos \
+$(MAGIC_FRAGMENT_DIR)/macintosh \
+$(MAGIC_FRAGMENT_DIR)/magic \
+$(MAGIC_FRAGMENT_DIR)/mail.news \
+$(MAGIC_FRAGMENT_DIR)/make \
+$(MAGIC_FRAGMENT_DIR)/map \
+$(MAGIC_FRAGMENT_DIR)/maple \
+$(MAGIC_FRAGMENT_DIR)/marc21 \
+$(MAGIC_FRAGMENT_DIR)/mathcad \
+$(MAGIC_FRAGMENT_DIR)/mathematica \
+$(MAGIC_FRAGMENT_DIR)/matroska \
+$(MAGIC_FRAGMENT_DIR)/mcrypt \
+$(MAGIC_FRAGMENT_DIR)/mercurial \
+$(MAGIC_FRAGMENT_DIR)/metastore \
+$(MAGIC_FRAGMENT_DIR)/mime \
+$(MAGIC_FRAGMENT_DIR)/mips \
+$(MAGIC_FRAGMENT_DIR)/mirage \
+$(MAGIC_FRAGMENT_DIR)/misctools \
+$(MAGIC_FRAGMENT_DIR)/mkid \
+$(MAGIC_FRAGMENT_DIR)/mlssa \
+$(MAGIC_FRAGMENT_DIR)/mmdf \
+$(MAGIC_FRAGMENT_DIR)/modem \
+$(MAGIC_FRAGMENT_DIR)/motorola \
+$(MAGIC_FRAGMENT_DIR)/mozilla \
+$(MAGIC_FRAGMENT_DIR)/msdos \
+$(MAGIC_FRAGMENT_DIR)/msooxml \
+$(MAGIC_FRAGMENT_DIR)/msx \
+$(MAGIC_FRAGMENT_DIR)/msvc \
+$(MAGIC_FRAGMENT_DIR)/mup \
+$(MAGIC_FRAGMENT_DIR)/music \
+$(MAGIC_FRAGMENT_DIR)/natinst \
+$(MAGIC_FRAGMENT_DIR)/ncr \
+$(MAGIC_FRAGMENT_DIR)/neko \
+$(MAGIC_FRAGMENT_DIR)/netbsd \
+$(MAGIC_FRAGMENT_DIR)/netscape \
+$(MAGIC_FRAGMENT_DIR)/netware \
+$(MAGIC_FRAGMENT_DIR)/news \
+$(MAGIC_FRAGMENT_DIR)/nitpicker \
+$(MAGIC_FRAGMENT_DIR)/oasis \
+$(MAGIC_FRAGMENT_DIR)/ocaml \
+$(MAGIC_FRAGMENT_DIR)/octave \
+$(MAGIC_FRAGMENT_DIR)/ole2compounddocs \
+$(MAGIC_FRAGMENT_DIR)/olf \
+$(MAGIC_FRAGMENT_DIR)/os2 \
+$(MAGIC_FRAGMENT_DIR)/os400 \
+$(MAGIC_FRAGMENT_DIR)/os9 \
+$(MAGIC_FRAGMENT_DIR)/osf1 \
+$(MAGIC_FRAGMENT_DIR)/palm \
+$(MAGIC_FRAGMENT_DIR)/parix \
+$(MAGIC_FRAGMENT_DIR)/parrot \
+$(MAGIC_FRAGMENT_DIR)/pascal \
+$(MAGIC_FRAGMENT_DIR)/pbf \
+$(MAGIC_FRAGMENT_DIR)/pbm \
+$(MAGIC_FRAGMENT_DIR)/pdf \
+$(MAGIC_FRAGMENT_DIR)/pdp \
+$(MAGIC_FRAGMENT_DIR)/perl \
+$(MAGIC_FRAGMENT_DIR)/pgf \
+$(MAGIC_FRAGMENT_DIR)/pgp \
+$(MAGIC_FRAGMENT_DIR)/pkgadd \
+$(MAGIC_FRAGMENT_DIR)/plan9 \
+$(MAGIC_FRAGMENT_DIR)/plus5 \
+$(MAGIC_FRAGMENT_DIR)/printer \
+$(MAGIC_FRAGMENT_DIR)/project \
+$(MAGIC_FRAGMENT_DIR)/psdbms \
+$(MAGIC_FRAGMENT_DIR)/pulsar \
+$(MAGIC_FRAGMENT_DIR)/pwsafe \
+$(MAGIC_FRAGMENT_DIR)/pyramid \
+$(MAGIC_FRAGMENT_DIR)/python \
+$(MAGIC_FRAGMENT_DIR)/revision \
+$(MAGIC_FRAGMENT_DIR)/riff \
+$(MAGIC_FRAGMENT_DIR)/rinex \
+$(MAGIC_FRAGMENT_DIR)/rpm \
+$(MAGIC_FRAGMENT_DIR)/rtf \
+$(MAGIC_FRAGMENT_DIR)/ruby \
+$(MAGIC_FRAGMENT_DIR)/sc \
+$(MAGIC_FRAGMENT_DIR)/sccs \
+$(MAGIC_FRAGMENT_DIR)/scientific \
+$(MAGIC_FRAGMENT_DIR)/securitycerts \
+$(MAGIC_FRAGMENT_DIR)/selinux \
+$(MAGIC_FRAGMENT_DIR)/sendmail \
+$(MAGIC_FRAGMENT_DIR)/sequent \
+$(MAGIC_FRAGMENT_DIR)/sereal \
+$(MAGIC_FRAGMENT_DIR)/sgi \
+$(MAGIC_FRAGMENT_DIR)/sgml \
+$(MAGIC_FRAGMENT_DIR)/sharc \
+$(MAGIC_FRAGMENT_DIR)/sinclair \
+$(MAGIC_FRAGMENT_DIR)/sisu \
+$(MAGIC_FRAGMENT_DIR)/sketch \
+$(MAGIC_FRAGMENT_DIR)/smalltalk \
+$(MAGIC_FRAGMENT_DIR)/smile \
+$(MAGIC_FRAGMENT_DIR)/sniffer \
+$(MAGIC_FRAGMENT_DIR)/softquad \
+$(MAGIC_FRAGMENT_DIR)/spec \
+$(MAGIC_FRAGMENT_DIR)/spectrum \
+$(MAGIC_FRAGMENT_DIR)/sql \
+$(MAGIC_FRAGMENT_DIR)/ssh \
+$(MAGIC_FRAGMENT_DIR)/ssl \
+$(MAGIC_FRAGMENT_DIR)/sun \
+$(MAGIC_FRAGMENT_DIR)/symbos \
+$(MAGIC_FRAGMENT_DIR)/sysex \
+$(MAGIC_FRAGMENT_DIR)/tcl \
+$(MAGIC_FRAGMENT_DIR)/teapot \
+$(MAGIC_FRAGMENT_DIR)/terminfo \
+$(MAGIC_FRAGMENT_DIR)/tex \
+$(MAGIC_FRAGMENT_DIR)/tgif \
+$(MAGIC_FRAGMENT_DIR)/ti-8x \
+$(MAGIC_FRAGMENT_DIR)/timezone \
+$(MAGIC_FRAGMENT_DIR)/troff \
+$(MAGIC_FRAGMENT_DIR)/tuxedo \
+$(MAGIC_FRAGMENT_DIR)/typeset \
+$(MAGIC_FRAGMENT_DIR)/unicode \
+$(MAGIC_FRAGMENT_DIR)/unknown \
+$(MAGIC_FRAGMENT_DIR)/uterus \
+$(MAGIC_FRAGMENT_DIR)/uuencode \
+$(MAGIC_FRAGMENT_DIR)/varied.out \
+$(MAGIC_FRAGMENT_DIR)/varied.script \
+$(MAGIC_FRAGMENT_DIR)/vax \
+$(MAGIC_FRAGMENT_DIR)/vicar \
+$(MAGIC_FRAGMENT_DIR)/virtual \
+$(MAGIC_FRAGMENT_DIR)/virtutech \
+$(MAGIC_FRAGMENT_DIR)/visx \
+$(MAGIC_FRAGMENT_DIR)/vms \
+$(MAGIC_FRAGMENT_DIR)/vmware \
+$(MAGIC_FRAGMENT_DIR)/vorbis \
+$(MAGIC_FRAGMENT_DIR)/vxl \
+$(MAGIC_FRAGMENT_DIR)/warc \
+$(MAGIC_FRAGMENT_DIR)/weak \
+$(MAGIC_FRAGMENT_DIR)/windows \
+$(MAGIC_FRAGMENT_DIR)/wireless \
+$(MAGIC_FRAGMENT_DIR)/wordprocessors \
+$(MAGIC_FRAGMENT_DIR)/wsdl \
+$(MAGIC_FRAGMENT_DIR)/xdelta \
+$(MAGIC_FRAGMENT_DIR)/xenix \
+$(MAGIC_FRAGMENT_DIR)/xilinx \
+$(MAGIC_FRAGMENT_DIR)/xo65 \
+$(MAGIC_FRAGMENT_DIR)/xwindows \
+$(MAGIC_FRAGMENT_DIR)/zfs \
+$(MAGIC_FRAGMENT_DIR)/zilog \
+$(MAGIC_FRAGMENT_DIR)/zyxel 
+
+MAGIC = magic.mgc
+CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
+@IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file${EXEEXT}
+
+# FIXME: Build file natively as well so that it can be used to compile
+# the target's magic file; for now we bail if the local version does not match
+@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file${EXEEXT}
+@IS_CROSS_COMPILE_FALSE@FILE_COMPILE_DEP = $(FILE_COMPILE)
+@IS_CROSS_COMPILE_TRUE@FILE_COMPILE_DEP = 
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign magic/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign magic/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgdataDATA: $(pkgdata_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+	fi; \
+	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)$(pkgdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
+	done
+
+uninstall-pkgdataDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@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
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: 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)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgdataDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+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 Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgdataDATA install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags-am uninstall uninstall-am uninstall-pkgdataDATA
+
+
+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
+	@rm -fr magic
+	@mkdir magic && cp -p $(EXTRA_DIST) magic
+	@(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
+	    echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
+	  else \
+	    v=$$(file --version | sed -e s/file-// -e q); \
+	    if [ "$$v" != "${PACKAGE_VERSION}" ]; then \
+		echo "Cannot use the installed version of file ($$v) to"; \
+		echo "cross-compile file ${PACKAGE_VERSION}"; \
+		echo "Please install file ${PACKAGE_VERSION} locally first"; \
+		exit 1; \
+	    fi; \
+	  fi)
+	$(FILE_COMPILE) -C -m magic
+	@rm -fr magic
+
+# 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/file/magic2mime b/contrib/file/magic2mime
deleted file mode 100644
index 26f84d28a160..000000000000
--- a/contrib/file/magic2mime
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/env perl
-# -*- PERL -*-
-# $File: magic2mime,v 1.4 2006/11/25 18:36:10 christos Exp $
-# Copyright (c) 1996, 1997 vax@linkdead.paranoia.com (VaX#n8)
-#
-# Usage: echo 'your-file-output-here' | file_to_ctype.pl
-#        file -b files... | file_to_ctype.pl
-# It acts like a filter, reading from STDIN and any files on the command
-# line, printing to STDOUT.
-
-## refs
-# http://www.faqs.org/faqs/mail/mime-faq/part1/index.html
-#  comp.mail.mime FAQ
-# ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/media-types
-#  assigned content-types
-# ftp://ftp.uu.net/inet/rfc/rfc-index
-#  RFC index; search for MIME
-
-@mapping =
-(
-	# defaults
-    'data', 'application/octet-stream',
-    'text', 'text/plain',
-	# more specific
-	'^Rich Text Format data', 'text/richtext',
-	'^HTML document text', 'text/html',
-	'^exported SGML document text', 'text/sgml',
-	'mail text', 'message/rfc822',
-	'news text', 'message/news',
-	'^PostScript document text', 'application/postscript',
-	'^BinHex binary text', 'application/mac-binhex40',
-	'^Zip archive data', 'application/zip',
-	'^Microsoft Word', 'application/msword',
-	'^PGP key', 'application/pgp-keys',
-	'^PGP encrypted', 'application/pgp-encrypted',
-	'^PGP armored data signature', 'application/pgp-signature',
-    '^JPEG image', 'image/jpeg',
-    '^GIF image', 'image/gif',
-	'^PNG image', 'image/png',
-    '^TIFF image', 'image/tiff',
-	'Computer Graphics Metafile', 'image/cgf',
-	'^Sun/NeXT audio data', 'audio/basic',
-    '^MPEG', 'video/mpeg',
-    '^Apple QuickTime movie', 'video/quicktime',
-    '^DICOM medical imaging data', 'application/dicom',
-	# made up by me
-    '^bitmap', 'image/x-bitmap',
-    '^PC bitmap data, Windows 3.x format', 'image/x-msw3bmp',
-    '^FLI', 'video/x-fli',
-    '^FLC', 'video/x-flc',
-    'AVI data', 'video/x-avi',
-    'WAVE', 'audio/x-wav',
-    'VOC', 'audio/x-voc',
-);
-
-local($mimetype,$index,$regexp);
-while (<>)
-  {
-    chop;
-    $index = $#mapping - 1;
-    while ($index > -1 && !defined($mimetype))
-      {
-         $mimetype = $mapping[$index + 1] if (/$mapping[$index]/);
-         $index -= 2;
-      }
-    print "$mimetype\n";
-	undef $mimetype; # hack
-  }
-0;
diff --git a/contrib/file/missing b/contrib/file/missing
new file mode 100755
index 000000000000..cdea514931f5
--- /dev/null
+++ b/contrib/file/missing
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2012-06-26.16; # UTC
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written 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
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+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
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'automa4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# 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/file/names.h b/contrib/file/names.h
deleted file mode 100644
index 2682edcc3a0f..000000000000
--- a/contrib/file/names.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) Ian F. Darwin 1986-1995.
- * Software written by Ian F. Darwin and others;
- * maintained 1995-present by Christos Zoulas and others.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice immediately at the beginning of the file, without modification,
- *    this list of conditions, and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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.
- */
-/*
- * Names.h - names and types used by ascmagic in file(1).
- * These tokens are here because they can appear anywhere in
- * the first HOWMANY bytes, while tokens in MAGIC must
- * appear at fixed offsets into the file. Don't make HOWMANY
- * too high unless you have a very fast CPU.
- *
- * $File: names.h,v 1.32 2008/02/11 00:19:29 rrt Exp $
- */
-
-/*
-	modified by Chris Lowth - 9 April 2000
-	to add mime type strings to the types table.
-*/
-
-/* these types are used to index the table 'types': keep em in sync! */
-#define	L_C	0		/* first and foremost on UNIX */
-#define	L_CC	1		/* Bjarne's postincrement */
-#define	L_MAKE	2		/* Makefiles */
-#define	L_PLI	3		/* PL/1 */
-#define	L_MACH	4		/* some kinda assembler */
-#define	L_ENG	5		/* English */
-#define	L_PAS	6		/* Pascal */
-#define	L_MAIL	7		/* Electronic mail */
-#define	L_NEWS	8		/* Usenet Netnews */
-#define	L_JAVA	9		/* Java code */
-#define	L_HTML	10		/* HTML */
-#define	L_BCPL	11		/* BCPL */
-#define	L_M4	12		/* M4 */
-#define	L_PO	13		/* PO */
-
-static const struct {
-	char human[48];
-	char mime[16];
-} types[] = {
-	{ "C program",					"text/x-c", },
-	{ "C++ program",				"text/x-c++" },
-	{ "make commands",				"text/x-makefile" },
-	{ "PL/1 program",				"text/x-pl1" },
-	{ "assembler program",				"text/x-asm" },
-	{ "English",					"text/plain" },
-	{ "Pascal program",				"text/x-pascal" },
-	{ "mail",					"text/x-mail" },
-	{ "news",					"text/x-news" },
-	{ "Java program",				"text/x-java" },
-	{ "HTML document",				"text/html", },
-	{ "BCPL program",				"text/x-bcpl" },
-	{ "M4 macro language pre-processor",		"text/x-m4" },
-	{ "PO (gettext message catalogue)",             "text/x-po" },
-	{ "cannot happen error on names.h/types",	"error/x-error" }
-};
-
-/*
- * XXX - how should we distinguish Java from C++?
- * The trick used in a Debian snapshot, of having "extends" or "implements"
- * as tags for Java, doesn't work very well, given that those keywords
- * are often preceded by "class", which flags it as C++.
- *
- * Perhaps we need to be able to say
- *
- *	If "class" then
- *
- *		if "extends" or "implements" then
- *			Java
- *		else
- *			C++
- *	endif
- *
- * Or should we use other keywords, such as "package" or "import"?
- * Unfortunately, Ada95 uses "package", and Modula-3 uses "import",
- * although I infer from the language spec at
- *
- *	http://www.research.digital.com/SRC/m3defn/html/m3.html
- *
- * that Modula-3 uses "IMPORT" rather than "import", i.e. it must be
- * in all caps.
- *
- * So, for now, we go with "import".  We must put it before the C++
- * stuff, so that we don't misidentify Java as C++.  Not using "package"
- * means we won't identify stuff that defines a package but imports
- * nothing; hopefully, very little Java code imports nothing (one of the
- * reasons for doing OO programming is to import as much as possible
- * and write only what you need to, right?).
- *
- * Unfortunately, "import" may cause us to misidentify English text
- * as Java, as it comes after "the" and "The".  Perhaps we need a fancier
- * heuristic to identify Java?
- */
-static const struct names {
-	char name[14];
-	short type;
-} names[] = {
-	/* These must be sorted by eye for optimal hit rate */
-	/* Add to this list only after substantial meditation */
-	{"msgid",	L_PO},
-	{"dnl",		L_M4},
-	{"import",	L_JAVA},
-	{"\"libhdr\"",	L_BCPL},
-	{"\"LIBHDR\"",	L_BCPL},
-	{"//",		L_CC},
-	{"template",	L_CC},
-	{"virtual",	L_CC},
-	{"class",	L_CC},
-	{"public:",	L_CC},
-	{"private:",	L_CC},
-	{"/*",		L_C},	/* must precede "The", "the", etc. */
-	{"#include",	L_C},
-	{"char",	L_C},
-	{"The",		L_ENG},
-	{"the",		L_ENG},
-	{"double",	L_C},
-	{"extern",	L_C},
-	{"float",	L_C},
-	{"struct",	L_C},
-	{"union",	L_C},
-	{"CFLAGS",	L_MAKE},
-	{"LDFLAGS",	L_MAKE},
-	{"all:",	L_MAKE},
-	{".PRECIOUS",	L_MAKE},
-	{".ascii",	L_MACH},
-	{".asciiz",	L_MACH},
-	{".byte",	L_MACH},
-	{".even",	L_MACH},
-	{".globl",	L_MACH},
-	{".text",	L_MACH},
-	{"clr",		L_MACH},
-	{"(input,",	L_PAS},
-	{"program",	L_PAS},
-	{"record",	L_PAS},
-	{"dcl",		L_PLI},
-	{"Received:",	L_MAIL},
-	{">From",	L_MAIL},
-	{"Return-Path:",L_MAIL},
-	{"Cc:",		L_MAIL},
-	{"Newsgroups:",	L_NEWS},
-	{"Path:",	L_NEWS},
-	{"Organization:",L_NEWS},
-	{"href=",	L_HTML},
-	{"HREF=",	L_HTML},
-	{"<body",	L_HTML},
-	{"<BODY",	L_HTML},
-	{"<html",	L_HTML},
-	{"<HTML",	L_HTML},
-	{"<!--",	L_HTML},
-};
-#define NNAMES (sizeof(names)/sizeof(struct names))
diff --git a/contrib/file/python/Makefile.am b/contrib/file/python/Makefile.am
new file mode 100644
index 000000000000..e0c469528e96
--- /dev/null
+++ b/contrib/file/python/Makefile.am
@@ -0,0 +1,3 @@
+
+EXTRA_DIST = README example.py magic.py setup.py
+
diff --git a/contrib/file/python/Makefile.in b/contrib/file/python/Makefile.in
new file mode 100644
index 000000000000..63a34b4667ba
--- /dev/null
+++ b/contrib/file/python/Makefile.in
@@ -0,0 +1,427 @@
+# Makefile.in generated by automake 1.14 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 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@
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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@
+subdir = python
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am README
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MINGW = @MINGW@
+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@
+WARNINGS = @WARNINGS@
+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_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@
+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@
+fsect = @fsect@
+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_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = README example.py magic.py setup.py
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign python/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign python/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@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
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: 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:
+
+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)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+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 Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
+
+
+# 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/file/python/README b/contrib/file/python/README
new file mode 100644
index 000000000000..8b9a2a7e4074
--- /dev/null
+++ b/contrib/file/python/README
@@ -0,0 +1,13 @@
+This directory contains Python bindings to allow you to access the
+libmagic api. At the moment their status is "experimental".
+
+You can install the modules either with:
+
+$ python setup.py build
+$ python setup.py install
+
+or, if you have easy_install:
+
+$ easy_install .
+
+magic-python should work now!
diff --git a/contrib/file/python/example.py b/contrib/file/python/example.py
new file mode 100644
index 000000000000..0cd0b5e7ec2b
--- /dev/null
+++ b/contrib/file/python/example.py
@@ -0,0 +1,17 @@
+#! /usr/bin/python
+
+import magic
+
+ms = magic.open(magic.NONE)
+ms.load()
+tp = ms.file("/bin/ls")
+print (tp)
+
+f = open("/bin/ls", "rb")
+buf = f.read(4096)
+f.close()
+
+tp = ms.buffer(buf)
+print (tp)
+
+ms.close()
diff --git a/contrib/file/python/magic.py b/contrib/file/python/magic.py
new file mode 100644
index 000000000000..a17e8dad169a
--- /dev/null
+++ b/contrib/file/python/magic.py
@@ -0,0 +1,221 @@
+#!/usr/bin/env python
+'''
+Python bindings for libmagic
+'''
+
+import ctypes
+
+from ctypes import *
+from ctypes.util import find_library
+
+
+def _init():
+    """
+    Loads the shared library through ctypes and returns a library
+    L{ctypes.CDLL} instance
+    """
+    return ctypes.cdll.LoadLibrary(find_library('magic'))
+
+_libraries = {}
+_libraries['magic'] = _init()
+
+# Flag constants for open and setflags
+MAGIC_NONE = NONE = 0
+MAGIC_DEBUG = DEBUG = 1
+MAGIC_SYMLINK = SYMLINK = 2
+MAGIC_COMPRESS = COMPRESS = 4
+MAGIC_DEVICES = DEVICES = 8
+MAGIC_MIME_TYPE = MIME_TYPE = 16
+MAGIC_CONTINUE = CONTINUE = 32
+MAGIC_CHECK = CHECK = 64
+MAGIC_PRESERVE_ATIME = PRESERVE_ATIME = 128
+MAGIC_RAW = RAW = 256
+MAGIC_ERROR = ERROR = 512
+MAGIC_MIME_ENCODING = MIME_ENCODING = 1024
+MAGIC_MIME = MIME = 1040
+MAGIC_APPLE = APPLE = 2048
+
+MAGIC_NO_CHECK_COMPRESS = NO_CHECK_COMPRESS = 4096
+MAGIC_NO_CHECK_TAR = NO_CHECK_TAR = 8192
+MAGIC_NO_CHECK_SOFT = NO_CHECK_SOFT = 16384
+MAGIC_NO_CHECK_APPTYPE = NO_CHECK_APPTYPE = 32768
+MAGIC_NO_CHECK_ELF = NO_CHECK_ELF = 65536
+MAGIC_NO_CHECK_TEXT = NO_CHECK_TEXT = 131072
+MAGIC_NO_CHECK_CDF = NO_CHECK_CDF = 262144
+MAGIC_NO_CHECK_TOKENS = NO_CHECK_TOKENS = 1048576
+MAGIC_NO_CHECK_ENCODING = NO_CHECK_ENCODING = 2097152
+
+MAGIC_NO_CHECK_BUILTIN = NO_CHECK_BUILTIN = 4173824
+
+
+class magic_set(Structure):
+    pass
+magic_set._fields_ = []
+magic_t = POINTER(magic_set)
+
+_open = _libraries['magic'].magic_open
+_open.restype = magic_t
+_open.argtypes = [c_int]
+
+_close = _libraries['magic'].magic_close
+_close.restype = None
+_close.argtypes = [magic_t]
+
+_file = _libraries['magic'].magic_file
+_file.restype = c_char_p
+_file.argtypes = [magic_t, c_char_p]
+
+_descriptor = _libraries['magic'].magic_descriptor
+_descriptor.restype = c_char_p
+_descriptor.argtypes = [magic_t, c_int]
+
+_buffer = _libraries['magic'].magic_buffer
+_buffer.restype = c_char_p
+_buffer.argtypes = [magic_t, c_void_p, c_size_t]
+
+_error = _libraries['magic'].magic_error
+_error.restype = c_char_p
+_error.argtypes = [magic_t]
+
+_setflags = _libraries['magic'].magic_setflags
+_setflags.restype = c_int
+_setflags.argtypes = [magic_t, c_int]
+
+_load = _libraries['magic'].magic_load
+_load.restype = c_int
+_load.argtypes = [magic_t, c_char_p]
+
+_compile = _libraries['magic'].magic_compile
+_compile.restype = c_int
+_compile.argtypes = [magic_t, c_char_p]
+
+_check = _libraries['magic'].magic_check
+_check.restype = c_int
+_check.argtypes = [magic_t, c_char_p]
+
+_list = _libraries['magic'].magic_list
+_list.restype = c_int
+_list.argtypes = [magic_t, c_char_p]
+
+_errno = _libraries['magic'].magic_errno
+_errno.restype = c_int
+_errno.argtypes = [magic_t]
+
+
+class Magic(object):
+    def __init__(self, ms):
+        self._magic_t = ms
+
+    def close(self):
+        """
+        Closes the magic database and deallocates any resources used.
+        """
+        _close(self._magic_t)
+
+    def file(self, filename):
+        """
+        Returns a textual description of the contents of the argument passed
+        as a filename or None if an error occurred and the MAGIC_ERROR flag
+        is set.  A call to errno() will return the numeric error code.
+        """
+        try:  # attempt python3 approach first
+            if isinstance(filename, bytes):
+                bi = filename
+            else:
+                bi = bytes(filename, 'utf-8')
+            return str(_file(self._magic_t, bi), 'utf-8')
+        except:
+            return _file(self._magic_t, filename.encode('utf-8'))
+
+    def descriptor(self, fd):
+        """
+        Like the file method, but the argument is a file descriptor.
+        """
+        return _descriptor(self._magic_t, fd)
+
+    def buffer(self, buf):
+        """
+        Returns a textual description of the contents of the argument passed
+        as a buffer or None if an error occurred and the MAGIC_ERROR flag
+        is set. A call to errno() will return the numeric error code.
+        """
+        try:  # attempt python3 approach first
+            return str(_buffer(self._magic_t, buf, len(buf)), 'utf-8')
+        except:
+            return _buffer(self._magic_t, buf, len(buf))
+
+    def error(self):
+        """
+        Returns a textual explanation of the last error or None
+        if there was no error.
+        """
+        try:  # attempt python3 approach first
+            return str(_error(self._magic_t), 'utf-8')
+        except:
+            return _error(self._magic_t)
+
+    def setflags(self, flags):
+        """
+        Set flags on the magic object which determine how magic checking
+        behaves; a bitwise OR of the flags described in libmagic(3), but
+        without the MAGIC_ prefix.
+
+        Returns -1 on systems that don't support utime(2) or utimes(2)
+        when PRESERVE_ATIME is set.
+        """
+        return _setflags(self._magic_t, flags)
+
+    def load(self, filename=None):
+        """
+        Must be called to load entries in the colon separated list of database
+        files passed as argument or the default database file if no argument
+        before any magic queries can be performed.
+
+        Returns 0 on success and -1 on failure.
+        """
+        return _load(self._magic_t, filename)
+
+    def compile(self, dbs):
+        """
+        Compile entries in the colon separated list of database files
+        passed as argument or the default database file if no argument.
+        Returns 0 on success and -1 on failure.
+        The compiled files created are named from the basename(1) of each file
+        argument with ".mgc" appended to it.
+        """
+        return _compile(self._magic_t, dbs)
+
+    def check(self, dbs):
+        """
+        Check the validity of entries in the colon separated list of
+        database files passed as argument or the default database file
+        if no argument.
+        Returns 0 on success and -1 on failure.
+        """
+        return _check(self._magic_t, dbs)
+
+    def list(self, dbs):
+        """
+        Check the validity of entries in the colon separated list of
+        database files passed as argument or the default database file
+        if no argument.
+        Returns 0 on success and -1 on failure.
+        """
+        return _list(self._magic_t, dbs)
+
+    def errno(self):
+        """
+        Returns a numeric error code. If return value is 0, an internal
+        magic error occurred. If return value is non-zero, the value is
+        an OS error code. Use the errno module or os.strerror() can be used
+        to provide detailed error information.
+        """
+        return _errno(self._magic_t)
+
+
+def open(flags):
+    """
+    Returns a magic object on success and None on failure.
+    Flags argument as for setflags.
+    """
+    return Magic(_open(flags))
diff --git a/contrib/file/python/setup.py b/contrib/file/python/setup.py
new file mode 100644
index 000000000000..2c3b527bb890
--- /dev/null
+++ b/contrib/file/python/setup.py
@@ -0,0 +1,10 @@
+# Python distutils build script for magic extension
+from distutils.core import setup
+
+setup(name = 'Magic file extensions',
+    version = '0.2',
+    author = 'Reuben Thomas',
+    author_email = 'rrt@sc3d.org',
+    license = 'BSD',
+    description = 'libmagic Python bindings',
+    py_modules = ['magic'])
diff --git a/contrib/file/Makefile.am-src b/contrib/file/src/Makefile.am
similarity index 72%
rename from contrib/file/Makefile.am-src
rename to contrib/file/src/Makefile.am
index 968e5849c178..e3196ce562b2 100644
--- a/contrib/file/Makefile.am-src
+++ b/contrib/file/src/Makefile.am
@@ -5,7 +5,7 @@ include_HEADERS = magic.h
 bin_PROGRAMS = file
 
 AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
-AM_CFLAGS = @WARNINGS@
+AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
 
 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
 	encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \
@@ -21,3 +21,10 @@ libmagic_la_LIBADD = $(LTLIBOBJS) $(MINGWLIBS)
 
 file_SOURCES = file.c
 file_LDADD = libmagic.la
+CLEANFILES = magic.h
+EXTRA_DIST = magic.h.in
+HDR= $(top_srcdir)/src/magic.h.in
+BUILT_SOURCES = magic.h
+
+magic.h:	${HDR}
+	sed -e "s/X.YY/$$(echo @VERSION@ | tr -d .)/" < ${HDR} > $@
diff --git a/contrib/file/src/Makefile.in b/contrib/file/src/Makefile.in
new file mode 100644
index 000000000000..970ff0b6501e
--- /dev/null
+++ b/contrib/file/src/Makefile.in
@@ -0,0 +1,783 @@
+# Makefile.in generated by automake 1.14 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 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@
+
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+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@
+bin_PROGRAMS = file$(EXEEXT)
+subdir = src
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am pread.c \
+	ctime_r.c getline.c vasprintf.c asprintf.c asctime_r.c \
+	fmtcheck.c strlcpy.c getopt_long.c strcasestr.c strlcat.c \
+	$(top_srcdir)/depcomp $(include_HEADERS)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+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)$(includedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libmagic_la_DEPENDENCIES = $(LTLIBOBJS) $(am__DEPENDENCIES_1)
+am_libmagic_la_OBJECTS = magic.lo apprentice.lo softmagic.lo \
+	ascmagic.lo encoding.lo compress.lo is_tar.lo readelf.lo \
+	print.lo fsmagic.lo funcs.lo apptype.lo cdf.lo cdf_time.lo \
+	readcdf.lo
+libmagic_la_OBJECTS = $(am_libmagic_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libmagic_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libmagic_la_LDFLAGS) $(LDFLAGS) -o $@
+PROGRAMS = $(bin_PROGRAMS)
+am_file_OBJECTS = file.$(OBJEXT)
+file_OBJECTS = $(am_file_OBJECTS)
+file_DEPENDENCIES = libmagic.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(libmagic_la_SOURCES) $(file_SOURCES)
+DIST_SOURCES = $(libmagic_la_SOURCES) $(file_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(include_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+pkgdatadir = @pkgdatadir@
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+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@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MINGW = @MINGW@
+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@
+WARNINGS = @WARNINGS@
+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_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@
+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@
+fsect = @fsect@
+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_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+MAGIC = $(pkgdatadir)/magic
+lib_LTLIBRARIES = libmagic.la
+include_HEADERS = magic.h
+AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
+AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
+libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
+	encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \
+	funcs.c file.h readelf.h tar.h apptype.c \
+	file_opts.h elfclass.h mygetopt.h cdf.c cdf_time.c readcdf.c cdf.h
+
+libmagic_la_LDFLAGS = -no-undefined -version-info 1:0:0
+@MINGW_FALSE@MINGWLIBS = 
+@MINGW_TRUE@MINGWLIBS = -lgnurx -lshlwapi
+libmagic_la_LIBADD = $(LTLIBOBJS) $(MINGWLIBS)
+file_SOURCES = file.c
+file_LDADD = libmagic.la
+CLEANFILES = magic.h
+EXTRA_DIST = magic.h.in
+HDR = $(top_srcdir)/src/magic.h.in
+BUILT_SOURCES = magic.h
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@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 " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  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)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libmagic.la: $(libmagic_la_OBJECTS) $(libmagic_la_DEPENDENCIES) $(EXTRA_libmagic_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libmagic_la_LINK) -rpath $(libdir) $(libmagic_la_OBJECTS) $(libmagic_la_LIBADD) $(LIBS)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	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
+
+file$(EXEEXT): $(file_OBJECTS) $(file_DEPENDENCIES) $(EXTRA_file_DEPENDENCIES) 
+	@rm -f file$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(file_OBJECTS) $(file_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/asctime_r.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/asprintf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ctime_r.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fmtcheck.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getline.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt_long.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasestr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strlcat.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strlcpy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vasprintf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apprentice.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apptype.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ascmagic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdf_time.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/encoding.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsmagic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/funcs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/is_tar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/magic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readcdf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readelf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/softmagic.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)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@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)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@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)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@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-includeHEADERS: $(include_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
+	fi; \
+	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: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	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-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	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"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+install-binPROGRAMS: install-libLTLIBRARIES
+
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(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)
+
+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-generic clean-libLTLIBRARIES \
+	clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf $(DEPDIR) ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-includeHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf $(DEPDIR) ./$(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-binPROGRAMS uninstall-includeHEADERS \
+	uninstall-libLTLIBRARIES
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libtool cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-includeHEADERS uninstall-libLTLIBRARIES
+
+
+magic.h:	${HDR}
+	sed -e "s/X.YY/$$(echo @VERSION@ | tr -d .)/" < ${HDR} > $@
+
+# 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/file/apprentice.c b/contrib/file/src/apprentice.c
similarity index 68%
rename from contrib/file/apprentice.c
rename to contrib/file/src/apprentice.c
index 8e0f2cf5e7b8..71e9af65e683 100644
--- a/contrib/file/apprentice.c
+++ b/contrib/file/src/apprentice.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: apprentice.c,v 1.173 2011/12/08 12:38:24 rrt Exp $")
+FILE_RCSID("@(#)$File: apprentice.c,v 1.211 2014/06/03 19:01:34 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -40,6 +40,9 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.173 2011/12/08 12:38:24 rrt Exp $")
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
@@ -48,6 +51,15 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.173 2011/12/08 12:38:24 rrt Exp $")
 #include <sys/mman.h>
 #endif
 #include <dirent.h>
+#if defined(HAVE_LIMITS_H)
+#include <limits.h>
+#endif
+
+#ifndef SSIZE_MAX
+#define MAXMAGIC_SIZE        ((ssize_t)0x7fffffff)
+#else
+#define MAXMAGIC_SIZE        SSIZE_MAX
+#endif
 
 #define	EATAB {while (isascii((unsigned char) *l) && \
 		      isspace((unsigned char) *l))  ++l;}
@@ -71,12 +83,28 @@ FILE_RCSID("@(#)$File: apprentice.c,v 1.173 2011/12/08 12:38:24 rrt Exp $")
 #define MAP_FILE 0
 #endif
 
+#define ALLOC_CHUNK	(size_t)10
+#define ALLOC_INCR	(size_t)200
+
 struct magic_entry {
 	struct magic *mp;	
 	uint32_t cont_count;
 	uint32_t max_count;
 };
 
+struct magic_entry_set {
+	struct magic_entry *me;
+	uint32_t count;
+	uint32_t max;
+};
+
+struct magic_map {
+	void *p;
+	size_t len;
+	struct magic *magic[MAGIC_SETS];
+	uint32_t nmagic[MAGIC_SETS];
+};
+
 int file_formats[FILE_NAMES_SIZE];
 const size_t file_nformats = FILE_NAMES_SIZE;
 const char *file_names[FILE_NAMES_SIZE];
@@ -86,30 +114,26 @@ private int getvalue(struct magic_set *ms, struct magic *, const char **, int);
 private int hextoint(int);
 private const char *getstr(struct magic_set *, struct magic *, const char *,
     int);
-private int parse(struct magic_set *, struct magic_entry **, uint32_t *,
-    const char *, size_t, int);
+private int parse(struct magic_set *, struct magic_entry *, const char *,
+    size_t, int);
 private void eatsize(const char **);
-private int apprentice_1(struct magic_set *, const char *, int, struct mlist *);
+private int apprentice_1(struct magic_set *, const char *, int);
 private size_t apprentice_magic_strength(const struct magic *);
 private int apprentice_sort(const void *, const void *);
-#ifndef COMPILE_ONLY
 private void apprentice_list(struct mlist *, int );
-#endif
-private int apprentice_load(struct magic_set *, struct magic **, uint32_t *,
+private struct magic_map *apprentice_load(struct magic_set *, 
     const char *, int);
-#ifndef COMPILE_ONLY
+private struct mlist *mlist_alloc(void);
+private void mlist_free(struct mlist *);
 private void byteswap(struct magic *, uint32_t);
 private void bs1(struct magic *);
 private uint16_t swap2(uint16_t);
 private uint32_t swap4(uint32_t);
 private uint64_t swap8(uint64_t);
-#endif
 private char *mkdbname(struct magic_set *, const char *, int);
-#ifndef COMPILE_ONLY
-private int apprentice_map(struct magic_set *, struct magic **, uint32_t *,
-    const char *);
-#endif
-private int apprentice_compile(struct magic_set *, struct magic **, uint32_t *,
+private struct magic_map *apprentice_map(struct magic_set *, const char *);
+private void apprentice_unmap(struct magic_map *);
+private int apprentice_compile(struct magic_set *, struct magic_map *,
     const char *);
 private int check_format_type(const char *, int);
 private int check_format(struct magic_set *, struct magic *);
@@ -119,7 +143,6 @@ private int parse_strength(struct magic_set *, struct magic_entry *, const char
 private int parse_apple(struct magic_set *, struct magic_entry *, const char *);
 
 
-private size_t maxmagic = 0;
 private size_t magicsize = sizeof(struct magic);
 
 private const char usg_hdr[] = "cont\toffset\ttype\topcode\tmask\tvalue\tdesc";
@@ -170,17 +193,27 @@ main(int argc, char *argv[])
 }
 #endif /* COMPILE_ONLY */
 
-static const struct type_tbl_s {
+struct type_tbl_s {
 	const char name[16];
 	const size_t len;
 	const int type;
 	const int format;
-} type_tbl[] = {
+};
+
+/*
+ * XXX - the actual Single UNIX Specification says that "long" means "long",
+ * as in the C data type, but we treat it as meaning "4-byte integer".
+ * Given that the OS X version of file 5.04 did the same, I guess that passes
+ * the actual test; having "long" be dependent on how big a "long" is on
+ * the machine running "file" is silly.
+ */
+static const struct type_tbl_s type_tbl[] = {
 # define XX(s)		s, (sizeof(s) - 1)
 # define XX_NULL	"", 0
+	{ XX("invalid"),	FILE_INVALID,		FILE_FMT_NONE },
 	{ XX("byte"),		FILE_BYTE,		FILE_FMT_NUM },
 	{ XX("short"),		FILE_SHORT,		FILE_FMT_NUM },
-	{ XX("default"),	FILE_DEFAULT,		FILE_FMT_STR },
+	{ XX("default"),	FILE_DEFAULT,		FILE_FMT_NONE },
 	{ XX("long"),		FILE_LONG,		FILE_FMT_NUM },
 	{ XX("string"),		FILE_STRING,		FILE_FMT_STR },
 	{ XX("date"),		FILE_DATE,		FILE_FMT_STR },
@@ -218,18 +251,34 @@ static const struct type_tbl_s {
 	{ XX("ledouble"),	FILE_LEDOUBLE,		FILE_FMT_DOUBLE },
 	{ XX("leid3"),		FILE_LEID3,		FILE_FMT_NUM },
 	{ XX("beid3"),		FILE_BEID3,		FILE_FMT_NUM },
-	{ XX("indirect"),	FILE_INDIRECT,		FILE_FMT_NONE },
+	{ XX("indirect"),	FILE_INDIRECT,		FILE_FMT_NUM },
+	{ XX("qwdate"),		FILE_QWDATE,		FILE_FMT_STR },
+	{ XX("leqwdate"),	FILE_LEQWDATE,		FILE_FMT_STR },
+	{ XX("beqwdate"),	FILE_BEQWDATE,		FILE_FMT_STR },
+	{ XX("name"),		FILE_NAME,		FILE_FMT_NONE },
+	{ XX("use"),		FILE_USE,		FILE_FMT_NONE },
+	{ XX("clear"),		FILE_CLEAR,		FILE_FMT_NONE },
 	{ XX_NULL,		FILE_INVALID,		FILE_FMT_NONE },
-# undef XX
-# undef XX_NULL
 };
 
+/*
+ * These are not types, and cannot be preceded by "u" to make them
+ * unsigned.
+ */
+static const struct type_tbl_s special_tbl[] = {
+	{ XX("name"),		FILE_NAME,		FILE_FMT_STR },
+	{ XX("use"),		FILE_USE,		FILE_FMT_STR },
+	{ XX_NULL,		FILE_INVALID,		FILE_FMT_NONE },
+};
+# undef XX
+# undef XX_NULL
+
 private int
-get_type(const char *l, const char **t)
+get_type(const struct type_tbl_s *tbl, const char *l, const char **t)
 {
 	const struct type_tbl_s *p;
 
-	for (p = type_tbl; p->len; p++) {
+	for (p = tbl; p->len; p++) {
 		if (strncmp(l, p->name, p->len) == 0) {
 			if (t)
 				*t = l + p->len;
@@ -239,6 +288,91 @@ get_type(const char *l, const char **t)
 	return p->type;
 }
 
+private int
+get_standard_integer_type(const char *l, const char **t)
+{
+	int type;
+
+	if (isalpha((unsigned char)l[1])) {
+		switch (l[1]) {
+		case 'C':
+			/* "dC" and "uC" */
+			type = FILE_BYTE;
+			break;
+		case 'S':
+			/* "dS" and "uS" */
+			type = FILE_SHORT;
+			break;
+		case 'I':
+		case 'L':
+			/*
+			 * "dI", "dL", "uI", and "uL".
+			 *
+			 * XXX - the actual Single UNIX Specification says
+			 * that "L" means "long", as in the C data type,
+			 * but we treat it as meaning "4-byte integer".
+			 * Given that the OS X version of file 5.04 did
+			 * the same, I guess that passes the actual SUS
+			 * validation suite; having "dL" be dependent on
+			 * how big a "long" is on the machine running
+			 * "file" is silly.
+			 */
+			type = FILE_LONG;
+			break;
+		case 'Q':
+			/* "dQ" and "uQ" */
+			type = FILE_QUAD;
+			break;
+		default:
+			/* "d{anything else}", "u{anything else}" */
+			return FILE_INVALID;
+		}
+		l += 2;
+	} else if (isdigit((unsigned char)l[1])) {
+		/*
+		 * "d{num}" and "u{num}"; we only support {num} values
+		 * of 1, 2, 4, and 8 - the Single UNIX Specification
+		 * doesn't say anything about whether arbitrary
+		 * values should be supported, but both the Solaris 10
+		 * and OS X Mountain Lion versions of file passed the
+		 * Single UNIX Specification validation suite, and
+		 * neither of them support values bigger than 8 or
+		 * non-power-of-2 values.
+		 */
+		if (isdigit((unsigned char)l[2])) {
+			/* Multi-digit, so > 9 */
+			return FILE_INVALID;
+		}
+		switch (l[1]) {
+		case '1':
+			type = FILE_BYTE;
+			break;
+		case '2':
+			type = FILE_SHORT;
+			break;
+		case '4':
+			type = FILE_LONG;
+			break;
+		case '8':
+			type = FILE_QUAD;
+			break;
+		default:
+			/* XXX - what about 3, 5, 6, or 7? */
+			return FILE_INVALID;
+		}
+		l += 2;
+	} else {
+		/*
+		 * "d" or "u" by itself.
+		 */
+		type = FILE_LONG;
+		++l;
+	}
+	if (t)
+		*t = l;
+	return type;
+}
+
 private void
 init_file_tables(void)
 {
@@ -254,154 +388,314 @@ init_file_tables(void)
 		file_names[p->type] = p->name;
 		file_formats[p->type] = p->format;
 	}
+	assert(p - type_tbl == FILE_NAMES_SIZE);
+}
+
+private int
+add_mlist(struct mlist *mlp, struct magic_map *map, size_t idx)
+{
+	struct mlist *ml;
+
+	if ((ml = CAST(struct mlist *, malloc(sizeof(*ml)))) == NULL)
+		return -1;
+
+	ml->map = idx == 0 ? map : NULL;
+	ml->magic = map->magic[idx];
+	ml->nmagic = map->nmagic[idx];
+
+	mlp->prev->next = ml;
+	ml->prev = mlp->prev;
+	ml->next = mlp;
+	mlp->prev = ml;
+	return 0;
 }
 
 /*
  * Handle one file or directory.
  */
 private int
-apprentice_1(struct magic_set *ms, const char *fn, int action,
-    struct mlist *mlist)
+apprentice_1(struct magic_set *ms, const char *fn, int action)
 {
-	struct magic *magic = NULL;
-	uint32_t nmagic = 0;
 #ifndef COMPILE_ONLY
 	struct mlist *ml;
-#endif
-	int rv = -1;
+#endif /* COMPILE_ONLY */
+	struct magic_map *map;
 #ifndef COMPILE_ONLY
-	int mapped;
-#endif
+	size_t i;
+#endif /* COMPILE_ONLY */
 
 	if (magicsize != FILE_MAGICSIZE) {
 		file_error(ms, 0, "magic element size %lu != %lu",
-		    (unsigned long)sizeof(*magic),
+		    (unsigned long)sizeof(*map->magic[0]),
 		    (unsigned long)FILE_MAGICSIZE);
 		return -1;
 	}
 
 	if (action == FILE_COMPILE) {
-		rv = apprentice_load(ms, &magic, &nmagic, fn, action);
-		if (rv != 0)
+		map = apprentice_load(ms, fn, action);
+		if (map == NULL)
 			return -1;
-		rv = apprentice_compile(ms, &magic, &nmagic, fn);
-		free(magic);
-		return rv;
+		return apprentice_compile(ms, map, fn);
 	}
 
 #ifndef COMPILE_ONLY
-	if ((rv = apprentice_map(ms, &magic, &nmagic, fn)) == -1) {
+	map = apprentice_map(ms, fn);
+	if (map == NULL) {
 		if (ms->flags & MAGIC_CHECK)
 			file_magwarn(ms, "using regular magic file `%s'", fn);
-		rv = apprentice_load(ms, &magic, &nmagic, fn, action);
-		if (rv != 0)
+		map = apprentice_load(ms, fn, action);
+		if (map == NULL)
 			return -1;
 	}
 
-	mapped = rv;
-	     
-	if (magic == NULL) {
-		file_delmagic(magic, mapped, nmagic);
-		return -1;
+	for (i = 0; i < MAGIC_SETS; i++) {
+		if (add_mlist(ms->mlist[i], map, i) == -1) {
+			file_oomem(ms, sizeof(*ml));
+			apprentice_unmap(map);
+			return -1;
+		}
 	}
 
-	if ((ml = CAST(struct mlist *, malloc(sizeof(*ml)))) == NULL) {
-		file_delmagic(magic, mapped, nmagic);
-		file_oomem(ms, sizeof(*ml));
-		return -1;
-	}
-
-	ml->magic = magic;
-	ml->nmagic = nmagic;
-	ml->mapped = mapped;
-
-	mlist->prev->next = ml;
-	ml->prev = mlist->prev;
-	ml->next = mlist;
-	mlist->prev = ml;
-
 	if (action == FILE_LIST) {
-		printf("Binary patterns:\n");
-		apprentice_list(mlist, BINTEST);
-		printf("Text patterns:\n");
-		apprentice_list(mlist, TEXTTEST);
+		for (i = 0; i < MAGIC_SETS; i++) {
+			printf("Set %zu:\nBinary patterns:\n", i);
+			apprentice_list(ms->mlist[i], BINTEST);
+			printf("Text patterns:\n");
+			apprentice_list(ms->mlist[i], TEXTTEST);
+		}
 	}
 #endif /* COMPILE_ONLY */
+	
 	return 0;
 }
 
 protected void
-file_delmagic(struct magic *p, int type, size_t entries)
+file_ms_free(struct magic_set *ms)
 {
-	if (p == NULL)
+	size_t i;
+	if (ms == NULL)
 		return;
-	switch (type) {
-	case 2:
-#ifdef QUICK
-		p--;
-		(void)munmap((void *)p, sizeof(*p) * (entries + 1));
-		break;
-#else
-		(void)&entries;
-		abort();
-		/*NOTREACHED*/
-#endif
-	case 1:
-		p--;
-		/*FALLTHROUGH*/
-	case 0:
-		free(p);
-		break;
-	default:
-		abort();
+	for (i = 0; i < MAGIC_SETS; i++)
+		mlist_free(ms->mlist[i]);
+	free(ms->o.pbuf);
+	free(ms->o.buf);
+	free(ms->c.li);
+	free(ms);
+}
+
+protected struct magic_set *
+file_ms_alloc(int flags)
+{
+	struct magic_set *ms;
+	size_t i, len;
+
+	if ((ms = CAST(struct magic_set *, calloc((size_t)1,
+	    sizeof(struct magic_set)))) == NULL)
+		return NULL;
+
+	if (magic_setflags(ms, flags) == -1) {
+		errno = EINVAL;
+		goto free;
 	}
+
+	ms->o.buf = ms->o.pbuf = NULL;
+	len = (ms->c.len = 10) * sizeof(*ms->c.li);
+
+	if ((ms->c.li = CAST(struct level_info *, malloc(len))) == NULL)
+		goto free;
+
+	ms->event_flags = 0;
+	ms->error = -1;
+	for (i = 0; i < MAGIC_SETS; i++)
+		ms->mlist[i] = NULL;
+	ms->file = "unknown";
+	ms->line = 0;
+	return ms;
+free:
+	free(ms);
+	return NULL;
+}
+
+private void
+apprentice_unmap(struct magic_map *map)
+{
+	if (map == NULL)
+		return;
+	if (map->p != NULL) {
+#ifdef QUICK
+		if (map->len)
+			(void)munmap(map->p, map->len);
+		else
+#endif
+		free(map->p);
+	} else {
+		uint32_t j;
+		for (j = 0; j < MAGIC_SETS; j++)
+			free(map->magic[j]);
+	}
+	free(map);
+}
+
+private struct mlist *
+mlist_alloc(void)
+{
+	struct mlist *mlist;
+	if ((mlist = CAST(struct mlist *, calloc(1, sizeof(*mlist)))) == NULL) {
+		return NULL;
+	}
+	mlist->next = mlist->prev = mlist;
+	return mlist;
+}
+
+private void
+mlist_free(struct mlist *mlist)
+{
+	struct mlist *ml;
+
+	if (mlist == NULL)
+		return;
+
+	for (ml = mlist->next; ml != mlist;) {
+		struct mlist *next = ml->next;
+		if (ml->map)
+			apprentice_unmap(ml->map);
+		free(ml);
+		ml = next;
+	}
+	free(ml);
 }
 
 /* const char *fn: list of magic files and directories */
-protected struct mlist *
+protected int
 file_apprentice(struct magic_set *ms, const char *fn, int action)
 {
 	char *p, *mfn;
 	int file_err, errs = -1;
-	struct mlist *mlist;
+	size_t i;
+
+	if (ms->mlist[0] != NULL)
+		file_reset(ms);
 
 	if ((fn = magic_getpath(fn, action)) == NULL)
-		return NULL;
+		return -1;
 
 	init_file_tables();
 
 	if ((mfn = strdup(fn)) == NULL) {
 		file_oomem(ms, strlen(fn));
-		return NULL;
+		return -1;
+	}
+
+	for (i = 0; i < MAGIC_SETS; i++) {
+		mlist_free(ms->mlist[i]);
+		if ((ms->mlist[i] = mlist_alloc()) == NULL) {
+			file_oomem(ms, sizeof(*ms->mlist[i]));
+			if (i != 0) {
+				--i;
+				do
+					mlist_free(ms->mlist[i]);
+				while (i != 0);
+			}
+			free(mfn);
+			return -1;
+		}
 	}
 	fn = mfn;
 
-	if ((mlist = CAST(struct mlist *, malloc(sizeof(*mlist)))) == NULL) {
-		free(mfn);
-		file_oomem(ms, sizeof(*mlist));
-		return NULL;
-	}
-	mlist->next = mlist->prev = mlist;
-
 	while (fn) {
 		p = strchr(fn, PATHSEP);
 		if (p)
 			*p++ = '\0';
 		if (*fn == '\0')
 			break;
-		file_err = apprentice_1(ms, fn, action, mlist);
+		file_err = apprentice_1(ms, fn, action);
 		errs = MAX(errs, file_err);
 		fn = p;
 	}
-	if (errs == -1) {
-		free(mfn);
-		free(mlist);
-		mlist = NULL;
-		file_error(ms, 0, "could not find any magic files!");
-		return NULL;
-	}
+
 	free(mfn);
-	return mlist;
+
+	if (errs == -1) {
+		for (i = 0; i < MAGIC_SETS; i++) {
+			mlist_free(ms->mlist[i]);
+			ms->mlist[i] = NULL;
+		}
+		file_error(ms, 0, "could not find any valid magic files!");
+		return -1;
+	}
+
+#if 0
+	/*
+	 * Always leave the database loaded
+	 */
+	if (action == FILE_LOAD)
+		return 0;
+
+	for (i = 0; i < MAGIC_SETS; i++) {
+		mlist_free(ms->mlist[i]);
+		ms->mlist[i] = NULL;
+	}
+#endif
+
+	switch (action) {
+	case FILE_LOAD:
+	case FILE_COMPILE:
+	case FILE_CHECK:
+	case FILE_LIST:
+		return 0;
+	default:
+		file_error(ms, 0, "Invalid action %d", action);
+		return -1;
+	}
+}
+
+/*
+ * Compute the real length of a magic expression, for the purposes
+ * of determining how "strong" a magic expression is (approximating
+ * how specific its matches are):
+ *	- magic characters count 0 unless escaped.
+ *	- [] expressions count 1
+ *	- {} expressions count 0
+ *	- regular characters or escaped magic characters count 1
+ *	- 0 length expressions count as one
+ */
+private size_t
+nonmagic(const char *str)
+{
+	const char *p;
+	size_t rv = 0;
+
+	for (p = str; *p; p++)
+		switch (*p) {
+		case '\\':	/* Escaped anything counts 1 */
+			if (!*++p)
+				p--;
+			rv++;
+			continue;
+		case '?':	/* Magic characters count 0 */
+		case '*':
+		case '.':
+		case '+':
+		case '^':
+		case '$':
+			continue;
+		case '[':	/* Bracketed expressions count 1 the ']' */
+			while (*p && *p != ']')
+				p++;
+			p--;
+			continue;
+		case '{':	/* Braced expressions count 0 */
+			while (*p && *p != '}')
+				p++;
+			if (!*p)
+				p--;
+			continue;
+		default:	/* Anything else counts 1 */
+			rv++;
+			continue;
+		}
+
+	return rv == 0 ? 1 : rv;	/* Return at least 1 */
 }
 
 /*
@@ -411,7 +705,7 @@ private size_t
 apprentice_magic_strength(const struct magic *m)
 {
 #define MULT 10
-	size_t val = 2 * MULT;	/* baseline strength */
+	size_t v, val = 2 * MULT;	/* baseline strength */
 
 	switch (m->type) {
 	case FILE_DEFAULT:	/* make sure this sorts last */
@@ -447,10 +741,14 @@ apprentice_magic_strength(const struct magic *m)
 		break;
 
 	case FILE_SEARCH:
-	case FILE_REGEX:
 		val += m->vallen * MAX(MULT / m->vallen, 1);
 		break;
 
+	case FILE_REGEX:
+		v = nonmagic(m->value.s);
+		val += v * MAX(MULT / v, 1);
+		break;
+
 	case FILE_DATE:
 	case FILE_LEDATE:
 	case FILE_BEDATE:
@@ -474,14 +772,21 @@ apprentice_magic_strength(const struct magic *m)
 	case FILE_QLDATE:
 	case FILE_LEQLDATE:
 	case FILE_BEQLDATE:
+	case FILE_QWDATE:
+	case FILE_LEQWDATE:
+	case FILE_BEQWDATE:
 	case FILE_DOUBLE:
 	case FILE_BEDOUBLE:
 	case FILE_LEDOUBLE:
 		val += 8 * MULT;
 		break;
 
+	case FILE_INDIRECT:
+	case FILE_NAME:
+	case FILE_USE:
+		break;
+
 	default:
-		val = 0;
 		(void)fprintf(stderr, "Bad type %d\n", m->type);
 		abort();
 	}
@@ -563,7 +868,6 @@ apprentice_sort(const void *a, const void *b)
 /*  
  * Shows sorted patterns list in the order which is used for the matching
  */
-#ifndef COMPILE_ONLY
 private void
 apprentice_list(struct mlist *mlist, int mode)
 {
@@ -597,7 +901,6 @@ apprentice_list(struct mlist *mlist, int mode)
 		}
 	}
 }
-#endif /* COMPILE_ONLY */
 
 private void
 set_test_type(struct magic *mstart, struct magic *m)
@@ -628,6 +931,9 @@ set_test_type(struct magic *mstart, struct magic *m)
 	case FILE_QLDATE:
 	case FILE_LEQLDATE:
 	case FILE_BEQLDATE:
+	case FILE_QWDATE:
+	case FILE_LEQWDATE:
+	case FILE_BEQWDATE:
 	case FILE_FLOAT:
 	case FILE_BEFLOAT:
 	case FILE_LEFLOAT:
@@ -675,16 +981,41 @@ set_test_type(struct magic *mstart, struct magic *m)
 	}
 }
 
+private int
+addentry(struct magic_set *ms, struct magic_entry *me,
+   struct magic_entry_set *mset)
+{
+	size_t i = me->mp->type == FILE_NAME ? 1 : 0;
+	if (mset[i].count == mset[i].max) {
+		struct magic_entry *mp;
+
+		mset[i].max += ALLOC_INCR;
+		if ((mp = CAST(struct magic_entry *,
+		    realloc(mset[i].me, sizeof(*mp) * mset[i].max))) ==
+		    NULL) {
+			file_oomem(ms, sizeof(*mp) * mset[i].max);
+			return -1;
+		}
+		(void)memset(&mp[mset[i].count], 0, sizeof(*mp) *
+		    ALLOC_INCR);
+		mset[i].me = mp;
+	}
+	mset[i].me[mset[i].count++] = *me;
+	memset(me, 0, sizeof(*me));
+	return 0;
+}
+
 /*
  * Load and parse one file.
  */
 private void
 load_1(struct magic_set *ms, int action, const char *fn, int *errs,
-   struct magic_entry **marray, uint32_t *marraycount)
+   struct magic_entry_set *mset)
 {
 	size_t lineno = 0, llen = 0;
 	char *line = NULL;
 	ssize_t len;
+	struct magic_entry me;
 
 	FILE *f = fopen(ms->file = fn, "r");
 	if (f == NULL) {
@@ -695,6 +1026,7 @@ load_1(struct magic_set *ms, int action, const char *fn, int *errs,
 		return;
 	}
 
+	memset(&me, 0, sizeof(me));
 	/* read and parse this file */
 	for (ms->line = 1; (len = getline(&line, &llen, f)) != -1;
 	    ms->line++) {
@@ -724,15 +1056,14 @@ load_1(struct magic_set *ms, int action, const char *fn, int *errs,
 					(*errs)++;
 					continue;
 				}
-				if (*marraycount == 0) {
+				if (me.mp == NULL) {
 					file_error(ms, 0,
 					    "No current entry for :!%s type",
 						bang[i].name);
 					(*errs)++;
 					continue;
 				}
-				if ((*bang[i].fun)(ms, 
-				    &(*marray)[*marraycount - 1],
+				if ((*bang[i].fun)(ms, &me,
 				    line + bang[i].len + 2) != 0) {
 					(*errs)++;
 					continue;
@@ -741,12 +1072,21 @@ load_1(struct magic_set *ms, int action, const char *fn, int *errs,
 			}
 			/*FALLTHROUGH*/
 		default:
-			if (parse(ms, marray, marraycount, line, lineno,
-			    action) != 0)
+		again:
+			switch (parse(ms, &me, line, lineno, action)) {
+			case 0:
+				continue;
+			case 1:
+				(void)addentry(ms, &me, mset);
+				goto again;
+			default:
 				(*errs)++;
-			break;
+				break;
+			}
 		}
 	}
+	if (me.mp)
+		(void)addentry(ms, &me, mset);
 	free(line);
 	(void)fclose(f);
 }
@@ -761,28 +1101,120 @@ cmpstrp(const void *p1, const void *p2)
         return strcmp(*(char *const *)p1, *(char *const *)p2);
 }
 
+
+private uint32_t
+set_text_binary(struct magic_set *ms, struct magic_entry *me, uint32_t nme,
+    uint32_t starttest)
+{
+	static const char text[] = "text";
+	static const char binary[] = "binary";
+	static const size_t len = sizeof(text);
+
+	uint32_t i = starttest;
+
+	do {
+		set_test_type(me[starttest].mp, me[i].mp);
+		if ((ms->flags & MAGIC_DEBUG) == 0)
+			continue;
+		(void)fprintf(stderr, "%s%s%s: %s\n",
+		    me[i].mp->mimetype,
+		    me[i].mp->mimetype[0] == '\0' ? "" : "; ",
+		    me[i].mp->desc[0] ? me[i].mp->desc : "(no description)",
+		    me[i].mp->flag & BINTEST ? binary : text);
+		if (me[i].mp->flag & BINTEST) {
+			char *p = strstr(me[i].mp->desc, text);
+			if (p && (p == me[i].mp->desc ||
+			    isspace((unsigned char)p[-1])) &&
+			    (p + len - me[i].mp->desc == MAXstring
+			    || (p[len] == '\0' ||
+			    isspace((unsigned char)p[len]))))
+				(void)fprintf(stderr, "*** Possible "
+				    "binary test for text type\n");
+		}
+	} while (++i < nme && me[i].mp->cont_level != 0);
+	return i;
+}
+
+private void
+set_last_default(struct magic_set *ms, struct magic_entry *me, uint32_t nme)
+{
+	uint32_t i;
+	for (i = 0; i < nme; i++) {
+		if (me[i].mp->cont_level == 0 &&
+		    me[i].mp->type == FILE_DEFAULT) {
+			while (++i < nme)
+				if (me[i].mp->cont_level == 0)
+					break;
+			if (i != nme) {
+				/* XXX - Ugh! */
+				ms->line = me[i].mp->lineno;
+				file_magwarn(ms,
+				    "level 0 \"default\" did not sort last");
+			}
+			return;					    
+		}
+	}
+}
+
 private int
-apprentice_load(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
-    const char *fn, int action)
+coalesce_entries(struct magic_set *ms, struct magic_entry *me, uint32_t nme,
+    struct magic **ma, uint32_t *nma)
+{
+	uint32_t i, mentrycount = 0;
+	size_t slen;
+
+	for (i = 0; i < nme; i++)
+		mentrycount += me[i].cont_count;
+
+	slen = sizeof(**ma) * mentrycount;
+	if ((*ma = CAST(struct magic *, malloc(slen))) == NULL) {
+		file_oomem(ms, slen);
+		return -1;
+	}
+
+	mentrycount = 0;
+	for (i = 0; i < nme; i++) {
+		(void)memcpy(*ma + mentrycount, me[i].mp,
+		    me[i].cont_count * sizeof(**ma));
+		mentrycount += me[i].cont_count;
+	}
+	*nma = mentrycount;
+	return 0;
+}
+
+private void
+magic_entry_free(struct magic_entry *me, uint32_t nme)
+{
+	uint32_t i;
+	if (me == NULL)
+		return;
+	for (i = 0; i < nme; i++)
+		free(me[i].mp);
+	free(me);
+}
+
+private struct magic_map *
+apprentice_load(struct magic_set *ms, const char *fn, int action)
 {
 	int errs = 0;
-	struct magic_entry *marray;
-	uint32_t marraycount, i, mentrycount = 0, starttest;
-	size_t slen, files = 0, maxfiles = 0;
+	uint32_t i, j;
+	size_t files = 0, maxfiles = 0;
 	char **filearr = NULL, *mfn;
 	struct stat st;
+	struct magic_map *map;
+	struct magic_entry_set mset[MAGIC_SETS];
 	DIR *dir;
 	struct dirent *d;
 
+	memset(mset, 0, sizeof(mset));
 	ms->flags |= MAGIC_CHECK;	/* Enable checks for parsed files */
 
-        maxmagic = MAXMAGIS;
-	if ((marray = CAST(struct magic_entry *, calloc(maxmagic,
-	    sizeof(*marray)))) == NULL) {
-		file_oomem(ms, maxmagic * sizeof(*marray));
-		return -1;
+
+	if ((map = CAST(struct magic_map *, calloc(1, sizeof(*map)))) == NULL)
+	{
+		file_oomem(ms, sizeof(*map));
+		return NULL;
 	}
-	marraycount = 0;
 
 	/* print silly verbose header for USG compat. */
 	if (action == FILE_CHECK)
@@ -825,100 +1257,50 @@ apprentice_load(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
 		closedir(dir);
 		qsort(filearr, files, sizeof(*filearr), cmpstrp);
 		for (i = 0; i < files; i++) {
-			load_1(ms, action, filearr[i], &errs, &marray,
-			    &marraycount);
+			load_1(ms, action, filearr[i], &errs, mset);
 			free(filearr[i]);
 		}
 		free(filearr);
 	} else
-		load_1(ms, action, fn, &errs, &marray, &marraycount);
+		load_1(ms, action, fn, &errs, mset);
 	if (errs)
 		goto out;
 
-	/* Set types of tests */
-	for (i = 0; i < marraycount; ) {
-		if (marray[i].mp->cont_level != 0) {
-			i++;
-			continue;
-		}
-
-		starttest = i;
-		do {
-			static const char text[] = "text";
-			static const char binary[] = "binary";
-			static const size_t len = sizeof(text);
-			set_test_type(marray[starttest].mp, marray[i].mp);
-			if ((ms->flags & MAGIC_DEBUG) == 0)
+	for (j = 0; j < MAGIC_SETS; j++) {
+		/* Set types of tests */
+		for (i = 0; i < mset[j].count; ) {
+			if (mset[j].me[i].mp->cont_level != 0) {
+				i++;
 				continue;
-			(void)fprintf(stderr, "%s%s%s: %s\n",
-			    marray[i].mp->mimetype,
-			    marray[i].mp->mimetype[0] == '\0' ? "" : "; ",
-			    marray[i].mp->desc[0] ? marray[i].mp->desc :
-			    "(no description)",
-			    marray[i].mp->flag & BINTEST ? binary : text);
-			if (marray[i].mp->flag & BINTEST) {
-				char *p = strstr(marray[i].mp->desc, text);
-				if (p && (p == marray[i].mp->desc ||
-				    isspace((unsigned char)p[-1])) &&
-				    (p + len - marray[i].mp->desc == 
-				    MAXstring || (p[len] == '\0' ||
-				    isspace((unsigned char)p[len]))))
-					(void)fprintf(stderr, "*** Possible "
-					    "binary test for text type\n");
 			}
-		} while (++i < marraycount && marray[i].mp->cont_level != 0);
-	}
+			i = set_text_binary(ms, mset[j].me, mset[j].count, i);
+		}
+		qsort(mset[j].me, mset[j].count, sizeof(*mset[j].me),
+		    apprentice_sort);
 
-	qsort(marray, marraycount, sizeof(*marray), apprentice_sort);
+		/*
+		 * Make sure that any level 0 "default" line is last
+		 * (if one exists).
+		 */
+		set_last_default(ms, mset[j].me, mset[j].count);
 
-	/*
-	 * Make sure that any level 0 "default" line is last (if one exists).
-	 */
-	for (i = 0; i < marraycount; i++) {
-		if (marray[i].mp->cont_level == 0 &&
-		    marray[i].mp->type == FILE_DEFAULT) {
-			while (++i < marraycount)
-				if (marray[i].mp->cont_level == 0)
-					break;
-			if (i != marraycount) {
-				/* XXX - Ugh! */
-				ms->line = marray[i].mp->lineno;
-				file_magwarn(ms,
-				    "level 0 \"default\" did not sort last");
-			}
-			break;					    
+		/* coalesce per file arrays into a single one */
+		if (coalesce_entries(ms, mset[j].me, mset[j].count,
+		    &map->magic[j], &map->nmagic[j]) == -1) {
+			errs++;
+			goto out;
 		}
 	}
 
-	for (i = 0; i < marraycount; i++)
-		mentrycount += marray[i].cont_count;
-
-	slen = sizeof(**magicp) * mentrycount;
-	if ((*magicp = CAST(struct magic *, malloc(slen))) == NULL) {
-		file_oomem(ms, slen);
-		errs++;
-		goto out;
-	}
-
-	mentrycount = 0;
-	for (i = 0; i < marraycount; i++) {
-		(void)memcpy(*magicp + mentrycount, marray[i].mp,
-		    marray[i].cont_count * sizeof(**magicp));
-		mentrycount += marray[i].cont_count;
-	}
 out:
-	for (i = 0; i < marraycount; i++)
-		free(marray[i].mp);
-	free(marray);
-	if (errs) {
-		*magicp = NULL;
-		*nmagicp = 0;
-		return errs;
-	} else {
-		*nmagicp = mentrycount;
-		return 0;
-	}
+	for (j = 0; j < MAGIC_SETS; j++)
+		magic_entry_free(mset[j].me, mset[j].count);
 
+	if (errs) {
+		apprentice_unmap(map);
+		return NULL;
+	}
+	return map;
 }
 
 /*
@@ -964,10 +1346,13 @@ file_signextend(struct magic_set *ms, struct magic *m, uint64_t v)
 		case FILE_LEQUAD:
 		case FILE_QDATE:
 		case FILE_QLDATE:
+		case FILE_QWDATE:
 		case FILE_BEQDATE:
 		case FILE_BEQLDATE:
+		case FILE_BEQWDATE:
 		case FILE_LEQDATE:
 		case FILE_LEQLDATE:
+		case FILE_LEQWDATE:
 		case FILE_DOUBLE:
 		case FILE_BEDOUBLE:
 		case FILE_LEDOUBLE:
@@ -981,6 +1366,9 @@ file_signextend(struct magic_set *ms, struct magic *m, uint64_t v)
 		case FILE_SEARCH:
 		case FILE_DEFAULT:
 		case FILE_INDIRECT:
+		case FILE_NAME:
+		case FILE_USE:
+		case FILE_CLEAR:
 			break;
 		default:
 			if (ms->flags & MAGIC_CHECK)
@@ -998,7 +1386,8 @@ string_modifier_check(struct magic_set *ms, struct magic *m)
 	if ((ms->flags & MAGIC_CHECK) == 0)
 		return 0;
 
-	if (m->type != FILE_PSTRING && (m->str_flags & PSTRING_LEN) != 0) {
+	if ((m->type != FILE_REGEX || (m->str_flags & REGEX_LINE_COUNT) == 0) &&
+	    (m->type != FILE_PSTRING && (m->str_flags & PSTRING_LEN) != 0)) {
 		file_magwarn(ms,
 		    "'/BHhLl' modifiers are only allowed for pascal strings\n");
 		return -1;
@@ -1150,22 +1539,25 @@ check_cond(struct magic_set *ms, int cond, uint32_t cont_level)
  * parse one line from magic file, put into magic[index++] if valid
  */
 private int
-parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp, 
-    const char *line, size_t lineno, int action)
+parse(struct magic_set *ms, struct magic_entry *me, const char *line,
+    size_t lineno, int action)
 {
 #ifdef ENABLE_CONDITIONALS
 	static uint32_t last_cont_level = 0;
 #endif
 	size_t i;
-	struct magic_entry *me;
 	struct magic *m;
 	const char *l = line;
 	char *t;
 	int op;
 	uint32_t cont_level;
+	int32_t diff;
 
 	cont_level = 0;
 
+	/*
+	 * Parse the offset.
+	 */
 	while (*l == '>') {
 		++l;		/* step over */
 		cont_level++; 
@@ -1176,16 +1568,21 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp,
 			return -1;
 	last_cont_level = cont_level;
 #endif
-
-#define ALLOC_CHUNK	(size_t)10
-#define ALLOC_INCR	(size_t)200
-
 	if (cont_level != 0) {
-		if (*nmentryp == 0) {
-			file_error(ms, 0, "No current entry for continuation");
+		if (me->mp == NULL) {
+			file_magerror(ms, "No current entry for continuation");
 			return -1;
 		}
-		me = &(*mentryp)[*nmentryp - 1];
+		if (me->cont_count == 0) {
+			file_magerror(ms, "Continuations present with 0 count");
+			return -1;
+		}
+		m = &me->mp[me->cont_count - 1];
+		diff = (int32_t)cont_level - (int32_t)m->cont_level;
+		if (diff > 1)
+			file_magwarn(ms, "New continuation level %u is more "
+			    "than one larger than current level %u", cont_level,
+			    m->cont_level);
 		if (me->cont_count == me->max_count) {
 			struct magic *nm;
 			size_t cnt = me->max_count + ALLOC_CHUNK;
@@ -1201,31 +1598,15 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp,
 		(void)memset(m, 0, sizeof(*m));
 		m->cont_level = cont_level;
 	} else {
-		if (*nmentryp == maxmagic) {
-			struct magic_entry *mp;
-
-			maxmagic += ALLOC_INCR;
-			if ((mp = CAST(struct magic_entry *,
-			    realloc(*mentryp, sizeof(*mp) * maxmagic))) ==
-			    NULL) {
-				file_oomem(ms, sizeof(*mp) * maxmagic);
-				return -1;
-			}
-			(void)memset(&mp[*nmentryp], 0, sizeof(*mp) *
-			    ALLOC_INCR);
-			*mentryp = mp;
+		static const size_t len = sizeof(*m) * ALLOC_CHUNK;
+		if (me->mp != NULL)
+			return 1;
+		if ((m = CAST(struct magic *, malloc(len))) == NULL) {
+			file_oomem(ms, len);
+			return -1;
 		}
-		me = &(*mentryp)[*nmentryp];
-		if (me->mp == NULL) {
-			size_t len = sizeof(*m) * ALLOC_CHUNK;
-			if ((m = CAST(struct magic *, malloc(len))) == NULL) {
-				file_oomem(ms, len);
-				return -1;
-			}
-			me->mp = m;
-			me->max_count = ALLOC_CHUNK;
-		} else
-			m = me->mp;
+		me->mp = m;
+		me->max_count = ALLOC_CHUNK;
 		(void)memset(m, 0, sizeof(*m));
 		m->factor_op = FILE_FACTOR_OP_NONE;
 		m->cont_level = 0;
@@ -1355,12 +1736,54 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp,
 	EATAB;
 #endif
 
+	/*
+	 * Parse the type.
+	 */
 	if (*l == 'u') {
-		++l;
-		m->flag |= UNSIGNED;
+		/*
+		 * Try it as a keyword type prefixed by "u"; match what
+		 * follows the "u".  If that fails, try it as an SUS
+		 * integer type. 
+		 */
+		m->type = get_type(type_tbl, l + 1, &l);
+		if (m->type == FILE_INVALID) {
+			/*
+			 * Not a keyword type; parse it as an SUS type,
+			 * 'u' possibly followed by a number or C/S/L.
+			 */
+			m->type = get_standard_integer_type(l, &l);
+		}
+		/* It's unsigned. */
+		if (m->type != FILE_INVALID)
+			m->flag |= UNSIGNED;
+	} else {
+		/*
+		 * Try it as a keyword type.  If that fails, try it as
+		 * an SUS integer type if it begins with "d" or as an
+		 * SUS string type if it begins with "s".  In any case,
+		 * it's not unsigned.
+		 */
+		m->type = get_type(type_tbl, l, &l);
+		if (m->type == FILE_INVALID) {
+			/*
+			 * Not a keyword type; parse it as an SUS type,
+			 * either 'd' possibly followed by a number or
+			 * C/S/L, or just 's'.
+			 */
+			if (*l == 'd')
+				m->type = get_standard_integer_type(l, &l);
+			else if (*l == 's' && !isalpha((unsigned char)l[1])) {
+				m->type = FILE_STRING;
+				++l;
+			}
+		}
 	}
 
-	m->type = get_type(l, &l);
+	if (m->type == FILE_INVALID) {
+		/* Not found - try it as a special keyword. */
+		m->type = get_type(special_tbl, l, &l);
+	}
+			
 	if (m->type == FILE_INVALID) {
 		if (ms->flags & MAGIC_CHECK)
 			file_magwarn(ms, "type `%s' invalid", l);
@@ -1433,6 +1856,9 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp,
 				case CHAR_TEXTTEST:
 					m->str_flags |= STRING_TEXTTEST;
 					break;
+				case CHAR_TRIM:
+					m->str_flags |= STRING_TRIM;
+					break;
 				case CHAR_PSTRING_1_LE:
 					if (m->type != FILE_PSTRING)
 						goto bad;
@@ -1454,8 +1880,13 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp,
 					m->str_flags = (m->str_flags & ~PSTRING_LEN) | PSTRING_4_BE;
 					break;
 				case CHAR_PSTRING_4_LE:
-					if (m->type != FILE_PSTRING)
+					switch (m->type) {
+					case FILE_PSTRING:
+					case FILE_REGEX:
+						break;
+					default:
 						goto bad;
+					}
 					m->str_flags = (m->str_flags & ~PSTRING_LEN) | PSTRING_4_LE;
 					break;
 				case CHAR_PSTRING_LENGTH_INCLUDES_ITSELF:
@@ -1575,8 +2006,6 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp,
 	}
 #endif
 	m->mimetype[0] = '\0';		/* initialise MIME type to none */
-	if (m->cont_level == 0)
-		++(*nmentryp);		/* make room for next */
 	return 0;
 }
 
@@ -1598,6 +2027,11 @@ parse_strength(struct magic_set *ms, struct magic_entry *me, const char *line)
 		    m->factor_op, m->factor);
 		return -1;
 	}
+	if (m->type == FILE_NAME) {
+		file_magwarn(ms, "%s: Strength setting is not supported in "
+		    "\"name\" magic entries", m->value.s);
+		return -1;
+	}
 	EATAB;
 	switch (*l) {
 	case FILE_FACTOR_OP_NONE:
@@ -1634,6 +2068,51 @@ parse_strength(struct magic_set *ms, struct magic_entry *me, const char *line)
 	return -1;
 }
 
+private int
+parse_extra(struct magic_set *ms, struct magic_entry *me, const char *line,
+    off_t off, size_t len, const char *name, int nt)
+{
+	size_t i;
+	const char *l = line;
+	struct magic *m = &me->mp[me->cont_count == 0 ? 0 : me->cont_count - 1];
+	char *buf = (char *)m + off;
+
+	if (buf[0] != '\0') {
+		len = nt ? strlen(buf) : len;
+		file_magwarn(ms, "Current entry already has a %s type "
+		    "`%.*s', new type `%s'", name, (int)len, buf, l);
+		return -1;
+	}	
+
+	if (*m->desc == '\0') {
+		file_magwarn(ms, "Current entry does not yet have a "
+		    "description for adding a %s type", name);
+		return -1;
+	}
+
+	EATAB;
+	for (i = 0; *l && ((isascii((unsigned char)*l) &&
+	    isalnum((unsigned char)*l)) || strchr("-+/.", *l)) &&
+	    i < len; buf[i++] = *l++)
+		continue;
+
+	if (i == len && *l) {
+		if (nt)
+			buf[len - 1] = '\0';
+		if (ms->flags & MAGIC_CHECK)
+			file_magwarn(ms, "%s type `%s' truncated %"
+			    SIZE_T_FORMAT "u", name, line, i);
+	} else {
+		if (nt)
+			buf[i] = '\0';
+	}
+
+	if (i > 0)
+		return 0;
+	else
+		return -1;
+}
+
 /*
  * Parse an Apple CREATOR/TYPE annotation from magic file and put it into
  * magic[index - 1]
@@ -1641,32 +2120,10 @@ parse_strength(struct magic_set *ms, struct magic_entry *me, const char *line)
 private int
 parse_apple(struct magic_set *ms, struct magic_entry *me, const char *line)
 {
-	size_t i;
-	const char *l = line;
-	struct magic *m = &me->mp[me->cont_count == 0 ? 0 : me->cont_count - 1];
+	struct magic *m = &me->mp[0];
 
-	if (m->apple[0] != '\0') {
-		file_magwarn(ms, "Current entry already has a APPLE type "
-		    "`%.8s', new type `%s'", m->mimetype, l);
-		return -1;
-	}	
-
-	EATAB;
-	for (i = 0; *l && ((isascii((unsigned char)*l) &&
-	    isalnum((unsigned char)*l)) || strchr("-+/.", *l)) &&
-	    i < sizeof(m->apple); m->apple[i++] = *l++)
-		continue;
-	if (i == sizeof(m->apple) && *l) {
-		/* We don't need to NUL terminate here, printing handles it */
-		if (ms->flags & MAGIC_CHECK)
-			file_magwarn(ms, "APPLE type `%s' truncated %"
-			    SIZE_T_FORMAT "u", line, i);
-	}
-
-	if (i > 0)
-		return 0;
-	else
-		return -1;
+	return parse_extra(ms, me, line, offsetof(struct magic, apple),
+	    sizeof(m->apple), "APPLE", 0);
 }
 
 /*
@@ -1676,49 +2133,50 @@ parse_apple(struct magic_set *ms, struct magic_entry *me, const char *line)
 private int
 parse_mime(struct magic_set *ms, struct magic_entry *me, const char *line)
 {
-	size_t i;
-	const char *l = line;
-	struct magic *m = &me->mp[me->cont_count == 0 ? 0 : me->cont_count - 1];
+	struct magic *m = &me->mp[0];
 
-	if (m->mimetype[0] != '\0') {
-		file_magwarn(ms, "Current entry already has a MIME type `%s',"
-		    " new type `%s'", m->mimetype, l);
-		return -1;
-	}	
-
-	EATAB;
-	for (i = 0; *l && ((isascii((unsigned char)*l) &&
-	    isalnum((unsigned char)*l)) || strchr("-+/.", *l)) &&
-	    i < sizeof(m->mimetype); m->mimetype[i++] = *l++)
-		continue;
-	if (i == sizeof(m->mimetype)) {
-		m->mimetype[sizeof(m->mimetype) - 1] = '\0';
-		if (ms->flags & MAGIC_CHECK)
-			file_magwarn(ms, "MIME type `%s' truncated %"
-			    SIZE_T_FORMAT "u", m->mimetype, i);
-	} else
-		m->mimetype[i] = '\0';
-
-	if (i > 0)
-		return 0;
-	else
-		return -1;
+	return parse_extra(ms, me, line, offsetof(struct magic, mimetype),
+	    sizeof(m->mimetype), "MIME", 1);
 }
 
 private int
 check_format_type(const char *ptr, int type)
 {
-	int quad = 0;
+	int quad = 0, h;
 	if (*ptr == '\0') {
 		/* Missing format string; bad */
 		return -1;
 	}
 
-	switch (type) {
+	switch (file_formats[type]) {
 	case FILE_FMT_QUAD:
 		quad = 1;
 		/*FALLTHROUGH*/
 	case FILE_FMT_NUM:
+		if (quad == 0) {
+			switch (type) {
+			case FILE_BYTE:
+				h = 2;
+				break;
+			case FILE_SHORT:
+			case FILE_BESHORT:
+			case FILE_LESHORT:
+				h = 1;
+				break;
+			case FILE_LONG:
+			case FILE_BELONG:
+			case FILE_LELONG:
+			case FILE_MELONG:
+			case FILE_LEID3:
+			case FILE_BEID3:
+			case FILE_INDIRECT:
+				h = 0;
+				break;
+			default:
+				abort();
+			}
+		} else
+			h = 0;
 		if (*ptr == '-')
 			ptr++;
 		if (*ptr == '.')
@@ -1735,45 +2193,67 @@ check_format_type(const char *ptr, int type)
 		}
 	
 		switch (*ptr++) {
+#ifdef STRICT_FORMAT 	/* "long" formats are int formats for us */
+		/* so don't accept the 'l' modifier */
 		case 'l':
 			switch (*ptr++) {
 			case 'i':
 			case 'd':
 			case 'u':
+			case 'o':
 			case 'x':
 			case 'X':
-				return 0;
+				return h != 0 ? -1 : 0;
 			default:
 				return -1;
 			}
 		
+		/*
+		 * Don't accept h and hh modifiers. They make writing
+		 * magic entries more complicated, for very little benefit
+		 */
 		case 'h':
+			if (h-- <= 0)
+				return -1;
 			switch (*ptr++) {
 			case 'h':
+				if (h-- <= 0)
+					return -1;
 				switch (*ptr++) {
 				case 'i':
 				case 'd':
 				case 'u':
+				case 'o':
 				case 'x':
 				case 'X':
 					return 0;
 				default:
 					return -1;
 				}
+			case 'i':
 			case 'd':
-				return 0;
+			case 'u':
+			case 'o':
+			case 'x':
+			case 'X':
+				return h != 0 ? -1 : 0;
 			default:
 				return -1;
 			}
-
-		case 'i':
+#endif
 		case 'c':
+			return h != 2 ? -1 : 0;
+		case 'i':
 		case 'd':
 		case 'u':
+		case 'o':
 		case 'x':
 		case 'X':
+#ifdef STRICT_FORMAT
+			return h != 0 ? -1 : 0;
+#else
 			return 0;
-			
+#endif
 		default:
 			return -1;
 		}
@@ -1860,7 +2340,7 @@ check_format(struct magic_set *ms, struct magic *m)
 	}
 
 	ptr++;
-	if (check_format_type(ptr, file_formats[m->type]) == -1) {
+	if (check_format_type(ptr, m->type) == -1) {
 		/*
 		 * TODO: this error message is unhelpful if the format
 		 * string is not one character long
@@ -1898,6 +2378,8 @@ getvalue(struct magic_set *ms, struct magic *m, const char **p, int action)
 	case FILE_PSTRING:
 	case FILE_REGEX:
 	case FILE_SEARCH:
+	case FILE_NAME:
+	case FILE_USE:
 		*p = getstr(ms, m, *p, action == FILE_COMPILE);
 		if (*p == NULL) {
 			if (ms->flags & MAGIC_CHECK)
@@ -1905,6 +2387,16 @@ getvalue(struct magic_set *ms, struct magic *m, const char **p, int action)
 				    m->value.s);
 			return -1;
 		}
+		if (m->type == FILE_REGEX) {
+			file_regex_t rx;
+			int rc = file_regcomp(&rx, m->value.s, REG_EXTENDED);
+			if (rc) {
+				if (ms->flags & MAGIC_CHECK)
+					file_regerror(&rx, rc, ms);
+			}
+			file_regfree(&rx);
+			return rc ? -1 : 0;
+		}
 		return 0;
 	case FILE_FLOAT:
 	case FILE_BEFLOAT:
@@ -2204,64 +2696,71 @@ eatsize(const char **p)
 	*p = l;
 }
 
-#ifndef COMPILE_ONLY
 /*
  * handle a compiled file.
  */
-private int
-apprentice_map(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
-    const char *fn)
+
+private struct magic_map *
+apprentice_map(struct magic_set *ms, const char *fn)
 {
 	int fd;
 	struct stat st;
 	uint32_t *ptr;
-	uint32_t version;
+	uint32_t version, entries, nentries;
 	int needsbyteswap;
 	char *dbname = NULL;
-	void *mm = NULL;
+	struct magic_map *map;
+	size_t i;
+
+	fd = -1;
+	if ((map = CAST(struct magic_map *, calloc(1, sizeof(*map)))) == NULL) {
+		file_oomem(ms, sizeof(*map));
+		goto error;
+	}
 
 	dbname = mkdbname(ms, fn, 0);
 	if (dbname == NULL)
-		goto error2;
+		goto error;
 
 	if ((fd = open(dbname, O_RDONLY|O_BINARY)) == -1)
-		goto error2;
+		goto error;
 
 	if (fstat(fd, &st) == -1) {
 		file_error(ms, errno, "cannot stat `%s'", dbname);
-		goto error1;
+		goto error;
 	}
-	if (st.st_size < 8) {
-		file_error(ms, 0, "file `%s' is too small", dbname);
-		goto error1;
+	if (st.st_size < 8 || st.st_size > MAXMAGIC_SIZE) {
+		file_error(ms, 0, "file `%s' is too %s", dbname,
+		    st.st_size < 8 ? "small" : "large");
+		goto error;
 	}
 
+	map->len = (size_t)st.st_size;
 #ifdef QUICK
-	if ((mm = mmap(0, (size_t)st.st_size, PROT_READ|PROT_WRITE,
+	if ((map->p = mmap(0, (size_t)st.st_size, PROT_READ|PROT_WRITE,
 	    MAP_PRIVATE|MAP_FILE, fd, (off_t)0)) == MAP_FAILED) {
 		file_error(ms, errno, "cannot map `%s'", dbname);
-		goto error1;
+		goto error;
 	}
-#define RET	2
 #else
-	if ((mm = CAST(void *, malloc((size_t)st.st_size))) == NULL) {
-		file_oomem(ms, (size_t)st.st_size);
-		goto error1;
+	if ((map->p = CAST(void *, malloc(map->len))) == NULL) {
+		file_oomem(ms, map->len);
+		goto error;
 	}
-	if (read(fd, mm, (size_t)st.st_size) != (ssize_t)st.st_size) {
+	if (read(fd, map->p, map->len) != (ssize_t)map->len) {
 		file_badread(ms);
-		goto error1;
+		goto error;
 	}
+	map->len = 0;
 #define RET	1
 #endif
-	*magicp = CAST(struct magic *, mm);
 	(void)close(fd);
 	fd = -1;
-	ptr = (uint32_t *)(void *)*magicp;
+	ptr = CAST(uint32_t *, map->p);
 	if (*ptr != MAGICNO) {
 		if (swap4(*ptr) != MAGICNO) {
 			file_error(ms, 0, "bad magic in `%s'", dbname);
-			goto error1;
+			goto error;
 		}
 		needsbyteswap = 1;
 	} else
@@ -2274,75 +2773,90 @@ apprentice_map(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
 		file_error(ms, 0, "File %s supports only version %d magic "
 		    "files. `%s' is version %d", VERSION,
 		    VERSIONNO, dbname, version);
-		goto error1;
+		goto error;
+	}
+	entries = (uint32_t)(st.st_size / sizeof(struct magic));
+	if ((off_t)(entries * sizeof(struct magic)) != st.st_size) {
+		file_error(ms, 0, "Size of `%s' %" INT64_T_FORMAT "u is not "
+		    "a multiple of %" SIZE_T_FORMAT "u",
+		    dbname, (unsigned long long)st.st_size,
+		    sizeof(struct magic));
+		goto error;
+	}
+	map->magic[0] = CAST(struct magic *, map->p) + 1;
+	nentries = 0;
+	for (i = 0; i < MAGIC_SETS; i++) {
+		if (needsbyteswap)
+			map->nmagic[i] = swap4(ptr[i + 2]);
+		else
+			map->nmagic[i] = ptr[i + 2];
+		if (i != MAGIC_SETS - 1)
+			map->magic[i + 1] = map->magic[i] + map->nmagic[i];
+		nentries += map->nmagic[i];
+	}
+	if (entries != nentries + 1) {
+		file_error(ms, 0, "Inconsistent entries in `%s' %u != %u",
+		    dbname, entries, nentries + 1);
+		goto error;
 	}
-	*nmagicp = (uint32_t)(st.st_size / sizeof(struct magic));
-	if (*nmagicp > 0)
-		(*nmagicp)--;
-	(*magicp)++;
 	if (needsbyteswap)
-		byteswap(*magicp, *nmagicp);
+		for (i = 0; i < MAGIC_SETS; i++)
+			byteswap(map->magic[i], map->nmagic[i]);
 	free(dbname);
-	return RET;
+	return map;
 
-error1:
+error:
 	if (fd != -1)
 		(void)close(fd);
-	if (mm) {
-#ifdef QUICK
-		(void)munmap((void *)mm, (size_t)st.st_size);
-#else
-		free(mm);
-#endif
-	} else {
-		*magicp = NULL;
-		*nmagicp = 0;
-	}
-error2:
+	apprentice_unmap(map);
 	free(dbname);
-	return -1;
+	return NULL;
 }
-#endif /* COMPILE_ONLY */
 
-private const uint32_t ar[] = {
-    MAGICNO, VERSIONNO
-};
 /*
  * handle an mmaped file.
  */
 private int
-apprentice_compile(struct magic_set *ms, struct magic **magicp,
-    uint32_t *nmagicp, const char *fn)
+apprentice_compile(struct magic_set *ms, struct magic_map *map, const char *fn)
 {
+	static const size_t nm = sizeof(*map->nmagic) * MAGIC_SETS;
+	static const size_t m = sizeof(**map->magic);
 	int fd = -1;
+	size_t len;
 	char *dbname;
 	int rv = -1;
+	uint32_t i;
+	union {
+		struct magic m;
+		uint32_t h[2 + MAGIC_SETS];
+	} hdr;
 
 	dbname = mkdbname(ms, fn, 1);
 
 	if (dbname == NULL) 
 		goto out;
 
-	if ((fd = open(dbname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644)) == -1) {
+	if ((fd = open(dbname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644)) == -1) 
+	{
 		file_error(ms, errno, "cannot open `%s'", dbname);
 		goto out;
 	}
+	memset(&hdr, 0, sizeof(hdr));
+	hdr.h[0] = MAGICNO;
+	hdr.h[1] = VERSIONNO;
+	memcpy(hdr.h + 2, map->nmagic, nm);
 
-	if (write(fd, ar, sizeof(ar)) != (ssize_t)sizeof(ar)) {
+	if (write(fd, &hdr, sizeof(hdr)) != (ssize_t)sizeof(hdr)) {
 		file_error(ms, errno, "error writing `%s'", dbname);
 		goto out;
 	}
 
-	if (lseek(fd, (off_t)sizeof(struct magic), SEEK_SET)
-	    != sizeof(struct magic)) {
-		file_error(ms, errno, "error seeking `%s'", dbname);
-		goto out;
-	}
-
-	if (write(fd, *magicp, (sizeof(struct magic) * *nmagicp)) 
-	    != (ssize_t)(sizeof(struct magic) * *nmagicp)) {
-		file_error(ms, errno, "error writing `%s'", dbname);
-		goto out;
+	for (i = 0; i < MAGIC_SETS; i++) {
+		len = m * map->nmagic[i];
+		if (write(fd, map->magic[i], len) != (ssize_t)len) {
+			file_error(ms, errno, "error writing `%s'", dbname);
+			goto out;
+		}
 	}
 
 	if (fd != -1)
@@ -2383,14 +2897,16 @@ mkdbname(struct magic_set *ms, const char *fn, int strip)
 	q++;
 	/* Compatibility with old code that looked in .mime */
 	if (ms->flags & MAGIC_MIME) {
-		asprintf(&buf, "%.*s.mime%s", (int)(q - fn), fn, ext);
+		if (asprintf(&buf, "%.*s.mime%s", (int)(q - fn), fn, ext) < 0)
+			return NULL;
 		if (access(buf, R_OK) != -1) {
 			ms->flags &= MAGIC_MIME_TYPE;
 			return buf;
 		}
 		free(buf);
 	}
-	asprintf(&buf, "%.*s%s", (int)(q - fn), fn, ext);
+	if (asprintf(&buf, "%.*s%s", (int)(q - fn), fn, ext) < 0)
+		return NULL;
 
 	/* Compatibility with old code that looked in .mime */
 	if (strstr(p, ".mime") != NULL)
@@ -2398,7 +2914,6 @@ mkdbname(struct magic_set *ms, const char *fn, int strip)
 	return buf;
 }
 
-#ifndef COMPILE_ONLY
 /*
  * Byteswap an mmap'ed file if needed
  */
@@ -2490,7 +3005,6 @@ bs1(struct magic *m)
 		m->num_mask = swap8(m->num_mask);
 	}
 }
-#endif /* COMPILE_ONLY */
 
 protected size_t 
 file_pstring_length_size(const struct magic *m)
@@ -2539,3 +3053,30 @@ file_pstring_get_length(const struct magic *m, const char *s)
 
 	return len;
 }
+
+protected int
+file_magicfind(struct magic_set *ms, const char *name, struct mlist *v)
+{
+	uint32_t i, j;
+	struct mlist *mlist, *ml;
+
+	mlist = ms->mlist[1];
+
+	for (ml = mlist->next; ml != mlist; ml = ml->next) {
+		struct magic *ma = ml->magic;
+		uint32_t nma = ml->nmagic;
+		for (i = 0; i < nma; i++) {
+			if (ma[i].type != FILE_NAME)
+				continue;
+			if (strcmp(ma[i].value.s, name) == 0) {
+				v->magic = &ma[i];
+				for (j = i + 1; j < nma; j++)
+				    if (ma[j].cont_level == 0)
+					    break;
+				v->nmagic = j - i;
+				return 0;
+			}
+		}
+	}
+	return -1;
+}
diff --git a/contrib/file/apptype.c b/contrib/file/src/apptype.c
similarity index 100%
rename from contrib/file/apptype.c
rename to contrib/file/src/apptype.c
diff --git a/contrib/file/ascmagic.c b/contrib/file/src/ascmagic.c
similarity index 97%
rename from contrib/file/ascmagic.c
rename to contrib/file/src/ascmagic.c
index 5a1caacb5a70..ca2666556872 100644
--- a/contrib/file/ascmagic.c
+++ b/contrib/file/src/ascmagic.c
@@ -35,7 +35,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: ascmagic.c,v 1.84 2011/12/08 12:38:24 rrt Exp $")
+FILE_RCSID("@(#)$File: ascmagic.c,v 1.88 2014/02/12 23:20:53 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -72,7 +72,7 @@ file_ascmagic(struct magic_set *ms, const unsigned char *buf, size_t nbytes,
 	int text)
 {
 	unichar *ubuf = NULL;
-	size_t ulen;
+	size_t ulen = 0;
 	int rv = 1;
 
 	const char *code = NULL;
@@ -134,7 +134,7 @@ file_ascmagic_with_encoding(struct magic_set *ms, const unsigned char *buf,
 		goto done;
 	}
 
-	if ((ms->flags & MAGIC_NO_CHECK_SOFT) == 0) {
+	if (ulen > 0 && (ms->flags & MAGIC_NO_CHECK_SOFT) == 0) {
 		/* Convert ubuf to UTF-8 and try text soft magic */
 		/* malloc size is a conservative overestimate; could be
 		   improved, or at least realloced after conversion. */
@@ -147,7 +147,7 @@ file_ascmagic_with_encoding(struct magic_set *ms, const unsigned char *buf,
 		    == NULL)
 			goto done;
 		if ((rv = file_softmagic(ms, utf8_buf,
-		    (size_t)(utf8_end - utf8_buf), TEXTTEST, text)) == 0)
+		    (size_t)(utf8_end - utf8_buf), 0, TEXTTEST, text)) == 0)
 			rv = -1;
 	}
 
@@ -211,6 +211,7 @@ file_ascmagic_with_encoding(struct magic_set *ms, const unsigned char *buf,
 				case 0:
 					if (file_printf(ms, ", ") == -1)
 						goto done;
+					break;
 				case -1:
 					goto done;
 				default:
diff --git a/contrib/file/src/asctime_r.c b/contrib/file/src/asctime_r.c
new file mode 100644
index 000000000000..3a0ec0447b9f
--- /dev/null
+++ b/contrib/file/src/asctime_r.c
@@ -0,0 +1,19 @@
+/*	$File: asctime_r.c,v 1.1 2012/05/15 17:14:36 christos Exp $	*/
+
+#include "file.h"
+#ifndef	lint
+FILE_RCSID("@(#)$File: asctime_r.c,v 1.1 2012/05/15 17:14:36 christos Exp $")
+#endif	/* lint */
+#include <time.h>
+#include <string.h>
+
+/* asctime_r is not thread-safe anyway */
+char *
+asctime_r(const struct tm *t, char *dst)
+{
+	char *p = asctime(t);
+	if (p == NULL)
+		return NULL;
+	memcpy(dst, p, 26);
+	return dst;
+}
diff --git a/contrib/file/asprintf.c b/contrib/file/src/asprintf.c
similarity index 100%
rename from contrib/file/asprintf.c
rename to contrib/file/src/asprintf.c
diff --git a/contrib/file/cdf.c b/contrib/file/src/cdf.c
similarity index 94%
rename from contrib/file/cdf.c
rename to contrib/file/src/cdf.c
index d05d279e53c3..106fc7ac02f3 100644
--- a/contrib/file/cdf.c
+++ b/contrib/file/src/cdf.c
@@ -35,7 +35,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: cdf.c,v 1.50 2012/02/20 22:35:29 christos Exp $")
+FILE_RCSID("@(#)$File: cdf.c,v 1.63 2014/06/09 13:04:37 christos Exp $")
 #endif
 
 #include <assert.h>
@@ -267,13 +267,15 @@ cdf_check_stream_offset(const cdf_stream_t *sst, const cdf_header_t *h,
 {
 	const char *b = (const char *)sst->sst_tab;
 	const char *e = ((const char *)p) + tail;
+	size_t ss = sst->sst_dirlen < h->h_min_size_standard_stream ?
+	    CDF_SHORT_SEC_SIZE(h) : CDF_SEC_SIZE(h);
 	(void)&line;
-	if (e >= b && (size_t)(e - b) < CDF_SEC_SIZE(h) * sst->sst_len)
+	if (e >= b && (size_t)(e - b) <= ss * sst->sst_len)
 		return 0;
-	DPRINTF(("%d: offset begin %p end %p %" SIZE_T_FORMAT "u"
-	    " >= %" SIZE_T_FORMAT "u [%" SIZE_T_FORMAT "u %"
+	DPRINTF(("%d: offset begin %p < end %p || %" SIZE_T_FORMAT "u"
+	    " > %" SIZE_T_FORMAT "u [%" SIZE_T_FORMAT "u %"
 	    SIZE_T_FORMAT "u]\n", line, b, e, (size_t)(e - b),
-	    CDF_SEC_SIZE(h) * sst->sst_len, CDF_SEC_SIZE(h), sst->sst_len));
+	    ss * sst->sst_len, ss, sst->sst_len));
 	errno = EFTYPE;
 	return -1;
 }
@@ -296,10 +298,7 @@ cdf_read(const cdf_info_t *info, off_t off, void *buf, size_t len)
 	if (info->i_fd == -1)
 		return -1;
 
-	if (lseek(info->i_fd, off, SEEK_SET) == (off_t)-1)
-		return -1;
-
-	if (read(info->i_fd, buf, len) != (ssize_t)len)
+	if (pread(info->i_fd, buf, len, off) != (ssize_t)len)
 		return -1;
 
 	return (ssize_t)len;
@@ -355,10 +354,10 @@ cdf_read_short_sector(const cdf_stream_t *sst, void *buf, size_t offs,
 	size_t ss = CDF_SHORT_SEC_SIZE(h);
 	size_t pos = CDF_SHORT_SEC_POS(h, id);
 	assert(ss == len);
-	if (pos > CDF_SEC_SIZE(h) * sst->sst_len) {
+	if (pos + len > CDF_SEC_SIZE(h) * sst->sst_len) {
 		DPRINTF(("Out of bounds read %" SIZE_T_FORMAT "u > %"
 		    SIZE_T_FORMAT "u\n",
-		    pos, CDF_SEC_SIZE(h) * sst->sst_len));
+		    pos + len, CDF_SEC_SIZE(h) * sst->sst_len));
 		return -1;
 	}
 	(void)memcpy(((char *)buf) + offs,
@@ -458,7 +457,8 @@ size_t
 cdf_count_chain(const cdf_sat_t *sat, cdf_secid_t sid, size_t size)
 {
 	size_t i, j;
-	cdf_secid_t maxsector = (cdf_secid_t)(sat->sat_len * size);
+	cdf_secid_t maxsector = (cdf_secid_t)((sat->sat_len * size)
+	    / sizeof(maxsector));
 
 	DPRINTF(("Chain:"));
 	for (j = i = 0; sid >= 0; i++, j++) {
@@ -468,13 +468,18 @@ cdf_count_chain(const cdf_sat_t *sat, cdf_secid_t sid, size_t size)
 			errno = EFTYPE;
 			return (size_t)-1;
 		}
-		if (sid > maxsector) {
-			DPRINTF(("Sector %d > %d\n", sid, maxsector));
+		if (sid >= maxsector) {
+			DPRINTF(("Sector %d >= %d\n", sid, maxsector));
 			errno = EFTYPE;
 			return (size_t)-1;
 		}
 		sid = CDF_TOLE4((uint32_t)sat->sat_tab[sid]);
 	}
+	if (i == 0) {
+		DPRINTF((" none, sid: %d\n", sid));
+		return (size_t)-1;
+
+	}
 	DPRINTF(("\n"));
 	return i;
 }
@@ -678,11 +683,13 @@ cdf_read_ssat(const cdf_info_t *info, const cdf_header_t *h,
 
 int
 cdf_read_short_stream(const cdf_info_t *info, const cdf_header_t *h,
-    const cdf_sat_t *sat, const cdf_dir_t *dir, cdf_stream_t *scn)
+    const cdf_sat_t *sat, const cdf_dir_t *dir, cdf_stream_t *scn,
+    const cdf_directory_t **root)
 {
 	size_t i;
 	const cdf_directory_t *d;
 
+	*root = NULL;
 	for (i = 0; i < dir->dir_len; i++)
 		if (dir->dir_tab[i].d_type == CDF_DIR_TYPE_ROOT_STORAGE)
 			break;
@@ -691,6 +698,7 @@ cdf_read_short_stream(const cdf_info_t *info, const cdf_header_t *h,
 	if (i == dir->dir_len)
 		goto out;
 	d = &dir->dir_tab[i];
+	*root = d;
 
 	/* If the it is not there, just fake it; some docs don't have it */
 	if (d->d_stream_first_sector < 0)
@@ -718,19 +726,28 @@ int
 cdf_read_summary_info(const cdf_info_t *info, const cdf_header_t *h,
     const cdf_sat_t *sat, const cdf_sat_t *ssat, const cdf_stream_t *sst,
     const cdf_dir_t *dir, cdf_stream_t *scn)
+{
+	return cdf_read_user_stream(info, h, sat, ssat, sst, dir,
+	    "\05SummaryInformation", scn);
+}
+
+int
+cdf_read_user_stream(const cdf_info_t *info, const cdf_header_t *h,
+    const cdf_sat_t *sat, const cdf_sat_t *ssat, const cdf_stream_t *sst,
+    const cdf_dir_t *dir, const char *name, cdf_stream_t *scn)
 {
 	size_t i;
 	const cdf_directory_t *d;
-	static const char name[] = "\05SummaryInformation";
+	size_t name_len = strlen(name) + 1;
 
 	for (i = dir->dir_len; i > 0; i--)
 		if (dir->dir_tab[i - 1].d_type == CDF_DIR_TYPE_USER_STREAM &&
-		    cdf_namecmp(name, dir->dir_tab[i - 1].d_name, sizeof(name))
+		    cdf_namecmp(name, dir->dir_tab[i - 1].d_name, name_len)
 		    == 0)
 			break;
 
 	if (i == 0) {
-		DPRINTF(("Cannot find summary information section\n"));
+		DPRINTF(("Cannot find user stream `%s'\n", name));
 		errno = ESRCH;
 		return -1;
 	}
@@ -799,7 +816,11 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
 	if (cdf_check_stream_offset(sst, h, e, 0, __LINE__) == -1)
 		goto out;
 	for (i = 0; i < sh.sh_properties; i++) {
-		size_t ofs = CDF_GETUINT32(p, (i << 1) + 1);
+		size_t tail = (i << 1) + 1;
+		if (cdf_check_stream_offset(sst, h, p, tail * sizeof(uint32_t),
+		    __LINE__) == -1)
+			goto out;
+		size_t ofs = CDF_GETUINT32(p, tail);
 		q = (const uint8_t *)(const void *)
 		    ((const char *)(const void *)p + ofs
 		    - 2 * sizeof(uint32_t));
@@ -813,6 +834,10 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
 		    i, inp[i].pi_id, inp[i].pi_type, q - p, offs));
 		if (inp[i].pi_type & CDF_VECTOR) {
 			nelements = CDF_GETUINT32(q, 1);
+			if (nelements == 0) {
+				DPRINTF(("CDF_VECTOR with nelements == 0\n"));
+				goto out;
+			}
 			o = 2;
 		} else {
 			nelements = 1;
@@ -887,7 +912,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
 			}
 			DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n",
 			    nelements));
-			for (j = 0; j < nelements; j++, i++) {
+			for (j = 0; j < nelements && i < sh.sh_properties;
+			    j++, i++)
+			{
 				uint32_t l = CDF_GETUINT32(q, o);
 				inp[i].pi_str.s_len = l;
 				inp[i].pi_str.s_buf = (const char *)
@@ -932,7 +959,7 @@ int
 cdf_unpack_summary_info(const cdf_stream_t *sst, const cdf_header_t *h,
     cdf_summary_info_header_t *ssi, cdf_property_info_t **info, size_t *count)
 {
-	size_t i, maxcount;
+	size_t maxcount;
 	const cdf_summary_info_header_t *si =
 	    CAST(const cdf_summary_info_header_t *, sst->sst_tab);
 	const cdf_section_declaration_t *sd =
@@ -947,21 +974,13 @@ cdf_unpack_summary_info(const cdf_stream_t *sst, const cdf_header_t *h,
 	ssi->si_os = CDF_TOLE2(si->si_os);
 	ssi->si_class = si->si_class;
 	cdf_swap_class(&ssi->si_class);
-	ssi->si_count = CDF_TOLE2(si->si_count);
+	ssi->si_count = CDF_TOLE4(si->si_count);
 	*count = 0;
 	maxcount = 0;
 	*info = NULL;
-	for (i = 0; i < CDF_TOLE4(si->si_count); i++) {
-		if (i >= CDF_LOOP_LIMIT) {
-			DPRINTF(("Unpack summary info loop limit"));
-			errno = EFTYPE;
-			return -1;
-		}
-		if (cdf_read_property_info(sst, h, CDF_TOLE4(sd->sd_offset),
-		    info, count, &maxcount) == -1) {
-			return -1;
-		}
-	}
+	if (cdf_read_property_info(sst, h, CDF_TOLE4(sd->sd_offset), info,
+	    count, &maxcount) == -1)
+		return -1;
 	return 0;
 }
 
@@ -1141,6 +1160,7 @@ cdf_dump_dir(const cdf_info_t *info, const cdf_header_t *h,
 	    "user stream", "lockbytes", "property", "root storage" };
 
 	for (i = 0; i < dir->dir_len; i++) {
+		char buf[26];
 		d = &dir->dir_tab[i];
 		for (j = 0; j < sizeof(name); j++)
 			name[j] = (char)CDF_TOLE2(d->d_name[j]);
@@ -1156,9 +1176,10 @@ cdf_dump_dir(const cdf_info_t *info, const cdf_header_t *h,
 		(void)fprintf(stderr, "Right child: %d\n", d->d_right_child);
 		(void)fprintf(stderr, "Flags: 0x%x\n", d->d_flags);
 		cdf_timestamp_to_timespec(&ts, d->d_created);
-		(void)fprintf(stderr, "Created %s", cdf_ctime(&ts.tv_sec));
+		(void)fprintf(stderr, "Created %s", cdf_ctime(&ts.tv_sec, buf));
 		cdf_timestamp_to_timespec(&ts, d->d_modified);
-		(void)fprintf(stderr, "Modified %s", cdf_ctime(&ts.tv_sec));
+		(void)fprintf(stderr, "Modified %s",
+		    cdf_ctime(&ts.tv_sec, buf));
 		(void)fprintf(stderr, "Stream %d\n", d->d_stream_first_sector);
 		(void)fprintf(stderr, "Size %d\n", d->d_size);
 		switch (d->d_type) {
@@ -1236,9 +1257,10 @@ cdf_dump_property_info(const cdf_property_info_t *info, size_t count)
 				cdf_print_elapsed_time(buf, sizeof(buf), tp);
 				(void)fprintf(stderr, "timestamp %s\n", buf);
 			} else {
+				char buf[26];
 				cdf_timestamp_to_timespec(&ts, tp);
 				(void)fprintf(stderr, "timestamp %s",
-				    cdf_ctime(&ts.tv_sec));
+				    cdf_ctime(&ts.tv_sec, buf));
 			}
 			break;
 		case CDF_CLIPBOARD:
diff --git a/contrib/file/cdf.h b/contrib/file/src/cdf.h
similarity index 97%
rename from contrib/file/cdf.h
rename to contrib/file/src/cdf.h
index 6fe2646e935d..910fb95fc341 100644
--- a/contrib/file/cdf.h
+++ b/contrib/file/src/cdf.h
@@ -294,9 +294,13 @@ int cdf_read_dir(const cdf_info_t *, const cdf_header_t *, const cdf_sat_t *,
 int cdf_read_ssat(const cdf_info_t *, const cdf_header_t *, const cdf_sat_t *,
     cdf_sat_t *);
 int cdf_read_short_stream(const cdf_info_t *, const cdf_header_t *,
-    const cdf_sat_t *, const cdf_dir_t *, cdf_stream_t *);
+    const cdf_sat_t *, const cdf_dir_t *, cdf_stream_t *,
+    const cdf_directory_t **);
 int cdf_read_property_info(const cdf_stream_t *, const cdf_header_t *, uint32_t,
     cdf_property_info_t **, size_t *, size_t *);
+int cdf_read_user_stream(const cdf_info_t *, const cdf_header_t *,
+    const cdf_sat_t *, const cdf_sat_t *, const cdf_stream_t *,
+    const cdf_dir_t *, const char *, cdf_stream_t *);
 int cdf_read_summary_info(const cdf_info_t *, const cdf_header_t *,
     const cdf_sat_t *, const cdf_sat_t *, const cdf_stream_t *,
     const cdf_dir_t *, cdf_stream_t *);
@@ -308,7 +312,7 @@ int cdf_print_elapsed_time(char *, size_t, cdf_timestamp_t);
 uint16_t cdf_tole2(uint16_t);
 uint32_t cdf_tole4(uint32_t);
 uint64_t cdf_tole8(uint64_t);
-char *cdf_ctime(const time_t *);
+char *cdf_ctime(const time_t *, char *);
 
 #ifdef CDF_DEBUG
 void cdf_dump_header(const cdf_header_t *);
diff --git a/contrib/file/cdf_time.c b/contrib/file/src/cdf_time.c
similarity index 93%
rename from contrib/file/cdf_time.c
rename to contrib/file/src/cdf_time.c
index 5061b46cd312..1e572de539f8 100644
--- a/contrib/file/cdf_time.c
+++ b/contrib/file/src/cdf_time.c
@@ -27,7 +27,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: cdf_time.c,v 1.11 2011/12/13 13:48:41 christos Exp $")
+FILE_RCSID("@(#)$File: cdf_time.c,v 1.15 2014/05/14 23:15:42 christos Exp $")
 #endif
 
 #include <time.h>
@@ -117,7 +117,7 @@ cdf_timestamp_to_timespec(struct timespec *ts, cdf_timestamp_t t)
 	tm.tm_hour = (int)(t % 24);
 	t /= 24;
 
-	// XXX: Approx
+	/* XXX: Approx */
 	tm.tm_year = (int)(CDF_BASE_YEAR + (t / 365));
 
 	rdays = cdf_getdays(tm.tm_year);
@@ -166,29 +166,29 @@ cdf_timespec_to_timestamp(cdf_timestamp_t *t, const struct timespec *ts)
 }
 
 char *
-cdf_ctime(const time_t *sec)
+cdf_ctime(const time_t *sec, char *buf)
 {
-	static char ctbuf[26];
-	char *ptr = ctime(sec);
+	char *ptr = ctime_r(sec, buf);
 	if (ptr != NULL)
-		return ptr;
-	(void)snprintf(ctbuf, sizeof(ctbuf), "*Bad* 0x%16.16llx\n",
+		return buf;
+	(void)snprintf(buf, 26, "*Bad* 0x%16.16" INT64_T_FORMAT "x\n",
 	    (long long)*sec);
-	return ctbuf;
+	return buf;
 }
 
 
-#ifdef TEST
+#ifdef TEST_TIME
 int
 main(int argc, char *argv[])
 {
 	struct timespec ts;
+	char buf[25];
 	static const cdf_timestamp_t tst = 0x01A5E403C2D59C00ULL;
 	static const char *ref = "Sat Apr 23 01:30:00 1977";
 	char *p, *q;
 
 	cdf_timestamp_to_timespec(&ts, tst);
-	p = cdf_ctime(&ts.tv_sec);
+	p = cdf_ctime(&ts.tv_sec, buf);
 	if ((q = strchr(p, '\n')) != NULL)
 		*q = '\0';
 	if (strcmp(ref, p) != 0)
diff --git a/contrib/file/compress.c b/contrib/file/src/compress.c
similarity index 94%
rename from contrib/file/compress.c
rename to contrib/file/src/compress.c
index 2d8d77f2cb35..45251b1d40c2 100644
--- a/contrib/file/compress.c
+++ b/contrib/file/src/compress.c
@@ -35,7 +35,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: compress.c,v 1.68 2011/12/08 12:38:24 rrt Exp $")
+FILE_RCSID("@(#)$File: compress.c,v 1.73 2014/01/05 15:55:21 christos Exp $")
 #endif
 
 #include "magic.h"
@@ -80,6 +80,7 @@ private const struct {
 	{ "LZIP",     4, { "lzip", "-cdq", NULL }, 1 },
  	{ "\3757zXZ\0",6,{ "xz", "-cd", NULL }, 1 },		/* XZ Utils */
  	{ "LRZI",     4, { "lrzip", "-dqo-", NULL }, 1 },	/* LRZIP */
+ 	{ "\004\"M\030", 4, { "lz4", "-cd", NULL }, 1 },	/* LZ4 */
 };
 
 #define NODATA ((size_t)~0)
@@ -121,14 +122,12 @@ file_zmagic(struct magic_set *ms, int fd, const char *name,
 				if (file_printf(ms, mime ?
 				    " compressed-encoding=" : " (") == -1)
 					goto error;
+				if (file_buffer(ms, -1, NULL, buf, nbytes) == -1)
+					goto error;
+				if (!mime && file_printf(ms, ")") == -1)
+					goto error;
 			}
 
-			if ((mime == 0 || mime & MAGIC_MIME_ENCODING) &&
-			    file_buffer(ms, -1, NULL, buf, nbytes) == -1)
-				goto error;
-
-			if (!mime && file_printf(ms, ")") == -1)
-				goto error;
 			rv = 1;
 			break;
 		}
@@ -168,12 +167,9 @@ swrite(int fd, const void *buf, size_t n)
  * `safe' read for sockets and pipes.
  */
 protected ssize_t
-sread(int fd, void *buf, size_t n, int canbepipe __attribute__ ((unused)))
+sread(int fd, void *buf, size_t n, int canbepipe __attribute__((__unused__)))
 {
 	ssize_t rv;
-#ifdef FD_ZERO
-	ssize_t cnt;
-#endif
 #ifdef FIONREAD
 	int t = 0;
 #endif
@@ -183,8 +179,9 @@ sread(int fd, void *buf, size_t n, int canbepipe __attribute__ ((unused)))
 		goto nocheck;
 
 #ifdef FIONREAD
-	if ((canbepipe && (ioctl(fd, FIONREAD, &t) == -1)) || (t == 0)) {
+	if (canbepipe && (ioctl(fd, FIONREAD, &t) == -1 || t == 0)) {
 #ifdef FD_ZERO
+		ssize_t cnt;
 		for (cnt = 0;; cnt++) {
 			fd_set check;
 			struct timeval tout = {0, 100 * 1000};
@@ -241,9 +238,6 @@ file_pipe2file(struct magic_set *ms, int fd, const void *startbuf,
 	char buf[4096];
 	ssize_t r;
 	int tfd;
-#ifdef HAVE_MKSTEMP
-	int te;
-#endif
 
 	(void)strlcpy(buf, "/tmp/file.XXXXXX", sizeof buf);
 #ifndef HAVE_MKSTEMP
@@ -255,10 +249,13 @@ file_pipe2file(struct magic_set *ms, int fd, const void *startbuf,
 		errno = r;
 	}
 #else
-	tfd = mkstemp(buf);
-	te = errno;
-	(void)unlink(buf);
-	errno = te;
+	{
+		int te;
+		tfd = mkstemp(buf);
+		te = errno;
+		(void)unlink(buf);
+		errno = te;
+	}
 #endif
 	if (tfd == -1) {
 		file_error(ms, errno,
@@ -399,16 +396,19 @@ uncompressbuf(struct magic_set *ms, int fd, size_t method,
 	case 0:	/* child */
 		(void) close(0);
 		if (fd != -1) {
-		    (void) dup(fd);
+		    if (dup(fd) == -1)
+			_exit(1);
 		    (void) lseek(0, (off_t)0, SEEK_SET);
 		} else {
-		    (void) dup(fdin[0]);
+		    if (dup(fdin[0]) == -1)
+			_exit(1);
 		    (void) close(fdin[0]);
 		    (void) close(fdin[1]);
 		}
 
 		(void) close(1);
-		(void) dup(fdout[1]);
+		if (dup(fdout[1]) == -1)
+			_exit(1);
 		(void) close(fdout[0]);
 		(void) close(fdout[1]);
 #ifndef DEBUG
diff --git a/contrib/file/src/ctime_r.c b/contrib/file/src/ctime_r.c
new file mode 100644
index 000000000000..ca7ad2fc9134
--- /dev/null
+++ b/contrib/file/src/ctime_r.c
@@ -0,0 +1,19 @@
+/*	$File: ctime_r.c,v 1.1 2012/05/15 17:14:36 christos Exp $	*/
+
+#include "file.h"
+#ifndef	lint
+FILE_RCSID("@(#)$File: ctime_r.c,v 1.1 2012/05/15 17:14:36 christos Exp $")
+#endif	/* lint */
+#include <time.h>
+#include <string.h>
+
+/* ctime_r is not thread-safe anyway */
+char *
+ctime_r(const time_t *t, char *dst)
+{
+	char *p = ctime(t);
+	if (p == NULL)
+		return NULL;
+	memcpy(dst, p, 26);
+	return dst;
+}
diff --git a/contrib/file/elfclass.h b/contrib/file/src/elfclass.h
similarity index 95%
rename from contrib/file/elfclass.h
rename to contrib/file/src/elfclass.h
index 2e7741b3fc00..010958a4296f 100644
--- a/contrib/file/elfclass.h
+++ b/contrib/file/src/elfclass.h
@@ -59,7 +59,8 @@
 		    (off_t)elf_getu(swap, elfhdr.e_shoff),
 		    elf_getu16(swap, elfhdr.e_shnum),
 		    (size_t)elf_getu16(swap, elfhdr.e_shentsize),
-		    fsize, &flags, elf_getu16(swap, elfhdr.e_machine)) == -1)
+		    fsize, &flags, elf_getu16(swap, elfhdr.e_machine),
+		    (int)elf_getu16(swap, elfhdr.e_shstrndx)) == -1)
 			return -1;
 		break;
 
diff --git a/contrib/file/encoding.c b/contrib/file/src/encoding.c
similarity index 99%
rename from contrib/file/encoding.c
rename to contrib/file/src/encoding.c
index dee57a6e8f58..b75e0ccb7ff2 100644
--- a/contrib/file/encoding.c
+++ b/contrib/file/src/encoding.c
@@ -35,7 +35,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: encoding.c,v 1.7 2012/01/24 19:02:02 christos Exp $")
+FILE_RCSID("@(#)$File: encoding.c,v 1.9 2013/11/19 20:45:50 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -72,13 +72,17 @@ file_encoding(struct magic_set *ms, const unsigned char *buf, size_t nbytes, uni
 	unsigned char *nbuf = NULL;
 
 	*type = "text";
-	mlen = (nbytes + 1) * sizeof(nbuf[0]);
-	if ((nbuf = CAST(unsigned char *, calloc((size_t)1, mlen))) == NULL) {
+	*ulen = 0;
+	*code = "unknown";
+	*code_mime = "binary";
+
+	mlen = (nbytes + 1) * sizeof((*ubuf)[0]);
+	if ((*ubuf = CAST(unichar *, calloc((size_t)1, mlen))) == NULL) {
 		file_oomem(ms, mlen);
 		goto done;
 	}
-	mlen = (nbytes + 1) * sizeof((*ubuf)[0]);
-	if ((*ubuf = CAST(unichar *, calloc((size_t)1, mlen))) == NULL) {
+	mlen = (nbytes + 1) * sizeof(nbuf[0]);
+	if ((nbuf = CAST(unsigned char *, calloc((size_t)1, mlen))) == NULL) {
 		file_oomem(ms, mlen);
 		goto done;
 	}
diff --git a/contrib/file/file.c b/contrib/file/src/file.c
similarity index 89%
rename from contrib/file/file.c
rename to contrib/file/src/file.c
index 408ec6389abb..370da91462e1 100644
--- a/contrib/file/file.c
+++ b/contrib/file/src/file.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: file.c,v 1.145 2011/12/08 12:12:46 rrt Exp $")
+FILE_RCSID("@(#)$File: file.c,v 1.153 2014/02/11 15:41:04 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -71,9 +71,9 @@ int getopt_long(int argc, char * const *argv, const char *optstring, const struc
 #endif
 
 #ifdef S_IFLNK
-#define FILE_FLAGS "-bchikLlNnprsvz0"
+#define FILE_FLAGS "-bcEhikLlNnprsvz0"
 #else
-#define FILE_FLAGS "-bciklNnprsvz0"
+#define FILE_FLAGS "-bcEiklNnprsvz0"
 #endif
 
 # define USAGE  \
@@ -101,7 +101,7 @@ private const struct option long_options[] = {
 #undef OPT_LONGONLY
     {0, 0, NULL, 0}
 };
-#define OPTSTRING	"bcCde:f:F:hiklLm:nNprsvz0"
+#define OPTSTRING	"bcCde:Ef:F:hiklLm:nNprsvz0"
 
 private const struct {
 	const char *name;
@@ -122,8 +122,8 @@ private const struct {
 private char *progname;		/* used throughout 		*/
 
 private void usage(void);
+private void docprint(const char *);
 private void help(void);
-int main(int, char *[]);
 
 private int unwrap(struct magic_set *, const char *);
 private int process(struct magic_set *ms, const char *, int);
@@ -194,6 +194,9 @@ main(int argc, char *argv[])
 		case 'd':
 			flags |= MAGIC_DEBUG|MAGIC_CHECK;
 			break;
+		case 'E':
+			flags |= MAGIC_ERROR;
+			break;
 		case 'e':
 			for (i = 0; i < sizeof(nv) / sizeof(nv[0]); i++)
 				if (strcmp(nv[i].name, optarg) == 0)
@@ -252,7 +255,7 @@ main(int argc, char *argv[])
 			(void)fprintf(stdout, "%s-%s\n", progname, VERSION);
 			(void)fprintf(stdout, "magic file from %s\n",
 				       magicfile);
-			return 1;
+			return 0;
 		case 'z':
 			flags |= MAGIC_COMPRESS;
 			break;
@@ -276,6 +279,11 @@ main(int argc, char *argv[])
 	if (e)
 		return e;
 
+	if (MAGIC_VERSION != magic_version())
+		(void)fprintf(stderr, "%s: compiled magic version [%d] "
+		    "does not match with shared library magic version [%d]\n",
+		    progname, MAGIC_VERSION, magic_version());
+
 	switch(action) {
 	case FILE_CHECK:
 	case FILE_COMPILE:
@@ -437,7 +445,7 @@ process(struct magic_set *ms, const char *inname, int wid)
 	}
 }
 
-size_t
+protected size_t
 file_mbswidth(const char *s)
 {
 #if defined(HAVE_WCHAR_H) && defined(HAVE_MBRTOWC) && defined(HAVE_WCWIDTH)
@@ -460,8 +468,11 @@ file_mbswidth(const char *s)
 			 * is always right
 			 */
 			width++;
-		} else
-			width += wcwidth(nextchar);
+		} else {
+			int w = wcwidth(nextchar);
+			if (w > 0)
+				width += w;
+		}
 
 		s += bytesconsumed, n -= bytesconsumed;
 	}
@@ -478,6 +489,36 @@ usage(void)
 	exit(1);
 }
 
+private void
+docprint(const char *opts)
+{
+	size_t i;
+	int comma;
+	char *sp, *p;
+
+	p = strstr(opts, "%o");
+	if (p == NULL) {
+		fprintf(stdout, "%s", opts);
+		return;
+	}
+
+	for (sp = p - 1; sp > opts && *sp == ' '; sp--)
+		continue;
+
+	fprintf(stdout, "%.*s", (int)(p - opts), opts);
+
+	comma = 0;
+	for (i = 0; i < __arraycount(nv); i++) {
+		fprintf(stdout, "%s%s", comma++ ? ", " : "", nv[i].name);
+		if (i && i % 5 == 0) {
+			fprintf(stdout, ",\n%*s", (int)(p - sp - 1), "");
+			comma = 0;
+		}
+	}
+
+	fprintf(stdout, "%s", opts + (p - opts) + 2);
+}
+
 private void
 help(void)
 {
@@ -486,9 +527,11 @@ help(void)
 "Determine type of FILEs.\n"
 "\n", stdout);
 #define OPT(shortname, longname, opt, doc)      \
-	fprintf(stdout, "  -%c, --" longname doc, shortname);
+	fprintf(stdout, "  -%c, --" longname, shortname), \
+	docprint(doc);
 #define OPT_LONGONLY(longname, opt, doc)        \
-	fprintf(stdout, "      --" longname doc);
+	fprintf(stdout, "      --" longname),	\
+	docprint(doc);
 #include "file_opts.h"
 #undef OPT
 #undef OPT_LONGONLY
diff --git a/contrib/file/file.h b/contrib/file/src/file.h
similarity index 84%
rename from contrib/file/file.h
rename to contrib/file/src/file.h
index 175f6596646f..67a25680cd2d 100644
--- a/contrib/file/file.h
+++ b/contrib/file/src/file.h
@@ -27,7 +27,7 @@
  */
 /*
  * file.h - definitions for file(1) program
- * @(#)$File: file.h,v 1.135 2011/09/20 15:30:14 christos Exp $
+ * @(#)$File: file.h,v 1.152 2014/06/03 19:01:34 christos Exp $
  */
 
 #ifndef __file_h__
@@ -62,6 +62,7 @@
 #include <inttypes.h>
 #endif
 #include <regex.h>
+#include <time.h>
 #include <sys/types.h>
 #include <sys/param.h>
 /* Do this here and now, because struct stat gets re-defined on solaris */
@@ -81,10 +82,18 @@
 #endif
 
 #define private static
+
+#if HAVE_VISIBILITY && !defined(WIN32)
+#define public  __attribute__ ((__visibility__("default")))
+#ifndef protected
+#define protected __attribute__ ((__visibility__("hidden")))
+#endif
+#else
+#define public
 #ifndef protected
 #define protected
 #endif
-#define public
+#endif
 
 #ifndef __arraycount
 #define __arraycount(a) (sizeof(a) / sizeof(a[0]))
@@ -119,12 +128,13 @@
 #endif
 #define MAXMAGIS 8192		/* max entries in any one magic file
 				   or directory */
-#define MAXDESC	64		/* max leng of text description/MIME type */
-#define MAXstring 64		/* max leng of "string" types */
+#define MAXDESC	64		/* max len of text description/MIME type */
+#define MAXMIME	80		/* max len of text MIME type */
+#define MAXstring 64		/* max len of "string" types */
 
 #define MAGICNO		0xF11E041C
-#define VERSIONNO	8
-#define FILE_MAGICSIZE	232
+#define VERSIONNO	12
+#define FILE_MAGICSIZE	248
 
 #define	FILE_LOAD	0
 #define FILE_CHECK	1
@@ -207,7 +217,13 @@ struct magic {
 #define				FILE_BEID3	39
 #define				FILE_LEID3	40
 #define				FILE_INDIRECT	41
-#define				FILE_NAMES_SIZE	42/* size of array to contain all names */
+#define				FILE_QWDATE	42
+#define				FILE_LEQWDATE	43
+#define				FILE_BEQWDATE	44
+#define				FILE_NAME	45
+#define				FILE_USE	46
+#define				FILE_CLEAR	47
+#define				FILE_NAMES_SIZE	48 /* size of array to contain all names */
 
 #define IS_STRING(t) \
 	((t) == FILE_STRING || \
@@ -216,7 +232,8 @@ struct magic {
 	 (t) == FILE_LESTRING16 || \
 	 (t) == FILE_REGEX || \
 	 (t) == FILE_SEARCH || \
-	 (t) == FILE_DEFAULT)
+	 (t) == FILE_NAME || \
+	 (t) == FILE_USE)
 
 #define FILE_FMT_NONE 0
 #define FILE_FMT_NUM  1 /* "cduxXi" */
@@ -284,9 +301,9 @@ struct magic {
 	union VALUETYPE value;	/* either number or string */
 	/* Words 17-32 */
 	char desc[MAXDESC];	/* description */
-	/* Words 33-48 */
-	char mimetype[MAXDESC]; /* MIME type */
-	/* Words 49-50 */
+	/* Words 33-52 */
+	char mimetype[MAXMIME]; /* MIME type */
+	/* Words 53-54 */
 	char apple[8];
 };
 
@@ -304,15 +321,18 @@ struct magic {
 #define PSTRING_2_LE				BIT(9)
 #define PSTRING_4_BE				BIT(10)
 #define PSTRING_4_LE				BIT(11)
+#define REGEX_LINE_COUNT			BIT(11)
 #define PSTRING_LEN	\
     (PSTRING_1_BE|PSTRING_2_LE|PSTRING_2_BE|PSTRING_4_LE|PSTRING_4_BE)
 #define PSTRING_LENGTH_INCLUDES_ITSELF		BIT(12)
+#define	STRING_TRIM				BIT(13)
 #define CHAR_COMPACT_WHITESPACE			'W'
 #define CHAR_COMPACT_OPTIONAL_WHITESPACE	'w'
 #define CHAR_IGNORE_LOWERCASE			'c'
 #define CHAR_IGNORE_UPPERCASE			'C'
 #define CHAR_REGEX_OFFSET_START			's'
 #define CHAR_TEXTTEST				't'
+#define	CHAR_TRIM				'T'
 #define CHAR_BINTEST				'b'
 #define CHAR_PSTRING_1_BE			'B'
 #define CHAR_PSTRING_1_LE			'B'
@@ -328,10 +348,8 @@ struct magic {
 /* list of magic entries */
 struct mlist {
 	struct magic *magic;		/* array of magic entries */
-	uint32_t nmagic;			/* number of entries in array */
-	int mapped;  /* allocation type: 0 => apprentice_file
-		      *                  1 => apprentice_map + malloc
-		      *                  2 => apprentice_map + mmap */
+	uint32_t nmagic;		/* number of entries in array */
+	void *map;			/* internal resources used by entry */
 	struct mlist *next, *prev;
 };
 
@@ -351,8 +369,11 @@ struct level_info {
 	int last_cond;	/* used for error checking by parse() */
 #endif
 };
+
+#define MAGIC_SETS	2
+
 struct magic_set {
-	struct mlist *mlist;
+	struct mlist *mlist[MAGIC_SETS];	/* list of regular entries */
 	struct cont {
 		size_t len;
 		struct level_info *li;
@@ -386,12 +407,17 @@ struct magic_set {
 typedef unsigned long unichar;
 
 struct stat;
-protected const char *file_fmttime(uint32_t, int);
+#define FILE_T_LOCAL	1
+#define FILE_T_WINDOWS	2
+protected const char *file_fmttime(uint64_t, int, char *);
+protected struct magic_set *file_ms_alloc(int);
+protected void file_ms_free(struct magic_set *);
 protected int file_buffer(struct magic_set *, int, const char *, const void *,
     size_t);
 protected int file_fsmagic(struct magic_set *, const char *, struct stat *);
 protected int file_pipe2file(struct magic_set *, int, const void *, size_t);
-protected int file_vprintf(struct magic_set *, const char *, va_list);
+protected int file_vprintf(struct magic_set *, const char *, va_list)
+    __attribute__((__format__(__printf__, 2, 0)));
 protected size_t file_printedlen(const struct magic_set *);
 protected int file_replace(struct magic_set *, const char *, const char *);
 protected int file_printf(struct magic_set *, const char *, ...)
@@ -414,11 +440,11 @@ protected int file_encoding(struct magic_set *, const unsigned char *, size_t,
     unichar **, size_t *, const char **, const char **, const char **);
 protected int file_is_tar(struct magic_set *, const unsigned char *, size_t);
 protected int file_softmagic(struct magic_set *, const unsigned char *, size_t,
-    int, int);
-protected struct mlist *file_apprentice(struct magic_set *, const char *, int);
+    size_t, int, int);
+protected int file_apprentice(struct magic_set *, const char *, int);
+protected int file_magicfind(struct magic_set *, const char *, struct mlist *);
 protected uint64_t file_signextend(struct magic_set *, struct magic *,
     uint64_t);
-protected void file_delmagic(struct magic *, int type, size_t entries);
 protected void file_badread(struct magic_set *);
 protected void file_badseek(struct magic_set *);
 protected void file_oomem(struct magic_set *, size_t);
@@ -443,6 +469,18 @@ protected int file_os2_apptype(struct magic_set *, const char *, const void *,
     size_t);
 #endif /* __EMX__ */
 
+typedef struct {
+	const char *pat;
+	char *old_lc_ctype;
+	int rc;
+	regex_t rx;
+} file_regex_t;
+
+protected int file_regcomp(file_regex_t *, const char *, int);
+protected int file_regexec(file_regex_t *, const char *, size_t, regmatch_t *,
+    int);
+protected void file_regfree(file_regex_t *);
+protected void file_regerror(file_regex_t *, int, struct magic_set *);
 
 #ifndef COMPILE_ONLY
 extern const char *file_names[];
@@ -460,22 +498,38 @@ extern char *sys_errlist[];
 #define strtoul(a, b, c)	strtol(a, b, c)
 #endif
 
+#ifndef HAVE_PREAD
+ssize_t pread(int, void *, size_t, off_t);
+#endif
 #ifndef HAVE_VASPRINTF
 int vasprintf(char **, const char *, va_list);
 #endif
 #ifndef HAVE_ASPRINTF
-int asprintf(char **ptr, const char *format_string, ...);
+int asprintf(char **, const char *, ...);
 #endif
 
 #ifndef HAVE_STRLCPY
-size_t strlcpy(char *dst, const char *src, size_t siz);
+size_t strlcpy(char *, const char *, size_t);
 #endif
 #ifndef HAVE_STRLCAT
-size_t strlcat(char *dst, const char *src, size_t siz);
+size_t strlcat(char *, const char *, size_t);
+#endif
+#ifndef HAVE_STRCASESTR
+char *strcasestr(const char *, const char *);
 #endif
 #ifndef HAVE_GETLINE
-ssize_t getline(char **dst, size_t *len, FILE *fp);
-ssize_t getdelim(char **dst, size_t *len, int delimiter, FILE *fp);
+ssize_t getline(char **, size_t *, FILE *);
+ssize_t getdelim(char **, size_t *, int, FILE *);
+#endif
+#ifndef HAVE_CTIME_R
+char   *ctime_r(const time_t *, char *);
+#endif
+#ifndef HAVE_ASCTIME_R
+char   *asctime_r(const struct tm *, char *);
+#endif
+#ifndef HAVE_FMTCHECK
+const char *fmtcheck(const char *, const char *) 
+     __attribute__((__format_arg__(2)));
 #endif
 
 #if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H) && !defined(QUICK)
diff --git a/contrib/file/file_opts.h b/contrib/file/src/file_opts.h
similarity index 96%
rename from contrib/file/file_opts.h
rename to contrib/file/src/file_opts.h
index 8a176721f632..db34eb732b05 100644
--- a/contrib/file/file_opts.h
+++ b/contrib/file/src/file_opts.h
@@ -23,7 +23,7 @@ OPT('c', "checking-printout", 0, "    print the parsed form of the magic file, u
     "                               before installing it\n")
 OPT('e', "exclude", 1, " TEST         exclude TEST from the list of test to be\n"
     "                               performed for file. Valid tests are:\n"
-    "                               ascii, apptype, compress, elf, soft, tar, tokens, troff\n")
+    "                               %o\n")
 OPT('f', "files-from", 1, " FILE      read the filenames to be examined from FILE\n")
 OPT('F', "separator", 1, " STRING     use string as separator instead of `:'\n")
 OPT('i', "mime", 0, "                 output MIME type strings (--mime-type and\n"
@@ -32,8 +32,8 @@ OPT_LONGONLY("apple", 0, "                output the Apple CREATOR/TYPE\n")
 OPT_LONGONLY("mime-type", 0, "            output the MIME type\n")
 OPT_LONGONLY("mime-encoding", 0, "        output the MIME encoding\n")
 OPT('k', "keep-going", 0, "           don't stop at the first match\n")
-#ifdef S_IFLNK
 OPT('l', "list", 0, "                 list magic strength\n")
+#ifdef S_IFLNK
 OPT('L', "dereference", 0, "          follow symlinks (default)\n")
 OPT('h', "no-dereference", 0, "       don't follow symlinks\n")
 #endif
diff --git a/contrib/file/src/fmtcheck.c b/contrib/file/src/fmtcheck.c
new file mode 100644
index 000000000000..0fc70387199d
--- /dev/null
+++ b/contrib/file/src/fmtcheck.c
@@ -0,0 +1,234 @@
+/*	$NetBSD: fmtcheck.c,v 1.8 2008/04/28 20:22:59 martin Exp $	*/
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code was contributed to The NetBSD Foundation by Allen Briggs.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "file.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+enum __e_fmtcheck_types {
+	FMTCHECK_START,
+	FMTCHECK_SHORT,
+	FMTCHECK_INT,
+	FMTCHECK_LONG,
+	FMTCHECK_QUAD,
+	FMTCHECK_SHORTPOINTER,
+	FMTCHECK_INTPOINTER,
+	FMTCHECK_LONGPOINTER,
+	FMTCHECK_QUADPOINTER,
+	FMTCHECK_DOUBLE,
+	FMTCHECK_LONGDOUBLE,
+	FMTCHECK_STRING,
+	FMTCHECK_WIDTH,
+	FMTCHECK_PRECISION,
+	FMTCHECK_DONE,
+	FMTCHECK_UNKNOWN
+};
+typedef enum __e_fmtcheck_types EFT;
+
+#define RETURN(pf,f,r) do { \
+			*(pf) = (f); \
+			return r; \
+		       } /*NOTREACHED*/ /*CONSTCOND*/ while (0)
+
+static EFT
+get_next_format_from_precision(const char **pf)
+{
+	int		sh, lg, quad, longdouble;
+	const char	*f;
+
+	sh = lg = quad = longdouble = 0;
+
+	f = *pf;
+	switch (*f) {
+	case 'h':
+		f++;
+		sh = 1;
+		break;
+	case 'l':
+		f++;
+		if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN);
+		if (*f == 'l') {
+			f++;
+			quad = 1;
+		} else {
+			lg = 1;
+		}
+		break;
+	case 'q':
+		f++;
+		quad = 1;
+		break;
+	case 'L':
+		f++;
+		longdouble = 1;
+		break;
+	default:
+		break;
+	}
+	if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN);
+	if (strchr("diouxX", *f)) {
+		if (longdouble)
+			RETURN(pf,f,FMTCHECK_UNKNOWN);
+		if (lg)
+			RETURN(pf,f,FMTCHECK_LONG);
+		if (quad)
+			RETURN(pf,f,FMTCHECK_QUAD);
+		RETURN(pf,f,FMTCHECK_INT);
+	}
+	if (*f == 'n') {
+		if (longdouble)
+			RETURN(pf,f,FMTCHECK_UNKNOWN);
+		if (sh)
+			RETURN(pf,f,FMTCHECK_SHORTPOINTER);
+		if (lg)
+			RETURN(pf,f,FMTCHECK_LONGPOINTER);
+		if (quad)
+			RETURN(pf,f,FMTCHECK_QUADPOINTER);
+		RETURN(pf,f,FMTCHECK_INTPOINTER);
+	}
+	if (strchr("DOU", *f)) {
+		if (sh + lg + quad + longdouble)
+			RETURN(pf,f,FMTCHECK_UNKNOWN);
+		RETURN(pf,f,FMTCHECK_LONG);
+	}
+	if (strchr("eEfg", *f)) {
+		if (longdouble)
+			RETURN(pf,f,FMTCHECK_LONGDOUBLE);
+		if (sh + lg + quad)
+			RETURN(pf,f,FMTCHECK_UNKNOWN);
+		RETURN(pf,f,FMTCHECK_DOUBLE);
+	}
+	if (*f == 'c') {
+		if (sh + lg + quad + longdouble)
+			RETURN(pf,f,FMTCHECK_UNKNOWN);
+		RETURN(pf,f,FMTCHECK_INT);
+	}
+	if (*f == 's') {
+		if (sh + lg + quad + longdouble)
+			RETURN(pf,f,FMTCHECK_UNKNOWN);
+		RETURN(pf,f,FMTCHECK_STRING);
+	}
+	if (*f == 'p') {
+		if (sh + lg + quad + longdouble)
+			RETURN(pf,f,FMTCHECK_UNKNOWN);
+		RETURN(pf,f,FMTCHECK_LONG);
+	}
+	RETURN(pf,f,FMTCHECK_UNKNOWN);
+	/*NOTREACHED*/
+}
+
+static EFT
+get_next_format_from_width(const char **pf)
+{
+	const char	*f;
+
+	f = *pf;
+	if (*f == '.') {
+		f++;
+		if (*f == '*') {
+			RETURN(pf,f,FMTCHECK_PRECISION);
+		}
+		/* eat any precision (empty is allowed) */
+		while (isdigit((unsigned char)*f)) f++;
+		if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN);
+	}
+	RETURN(pf,f,get_next_format_from_precision(pf));
+	/*NOTREACHED*/
+}
+
+static EFT
+get_next_format(const char **pf, EFT eft)
+{
+	int		infmt;
+	const char	*f;
+
+	if (eft == FMTCHECK_WIDTH) {
+		(*pf)++;
+		return get_next_format_from_width(pf);
+	} else if (eft == FMTCHECK_PRECISION) {
+		(*pf)++;
+		return get_next_format_from_precision(pf);
+	}
+
+	f = *pf;
+	infmt = 0;
+	while (!infmt) {
+		f = strchr(f, '%');
+		if (f == NULL)
+			RETURN(pf,f,FMTCHECK_DONE);
+		f++;
+		if (!*f)
+			RETURN(pf,f,FMTCHECK_UNKNOWN);
+		if (*f != '%')
+			infmt = 1;
+		else
+			f++;
+	}
+
+	/* Eat any of the flags */
+	while (*f && (strchr("#0- +", *f)))
+		f++;
+
+	if (*f == '*') {
+		RETURN(pf,f,FMTCHECK_WIDTH);
+	}
+	/* eat any width */
+	while (isdigit((unsigned char)*f)) f++;
+	if (!*f) {
+		RETURN(pf,f,FMTCHECK_UNKNOWN);
+	}
+
+	RETURN(pf,f,get_next_format_from_width(pf));
+	/*NOTREACHED*/
+}
+
+const char *
+fmtcheck(const char *f1, const char *f2)
+{
+	const char	*f1p, *f2p;
+	EFT		f1t, f2t;
+
+	if (!f1) return f2;
+	
+	f1p = f1;
+	f1t = FMTCHECK_START;
+	f2p = f2;
+	f2t = FMTCHECK_START;
+	while ((f1t = get_next_format(&f1p, f1t)) != FMTCHECK_DONE) {
+		if (f1t == FMTCHECK_UNKNOWN)
+			return f2;
+		f2t = get_next_format(&f2p, f2t);
+		if (f1t != f2t)
+			return f2;
+	}
+	return f1;
+}
diff --git a/contrib/file/fsmagic.c b/contrib/file/src/fsmagic.c
similarity index 69%
rename from contrib/file/fsmagic.c
rename to contrib/file/src/fsmagic.c
index 7200271fc69a..ef5492f2a106 100644
--- a/contrib/file/fsmagic.c
+++ b/contrib/file/src/fsmagic.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: fsmagic.c,v 1.64 2011/08/14 09:03:12 christos Exp $")
+FILE_RCSID("@(#)$File: fsmagic.c,v 1.73 2014/05/14 23:15:42 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -53,7 +53,11 @@ FILE_RCSID("@(#)$File: fsmagic.c,v 1.64 2011/08/14 09:03:12 christos Exp $")
 #ifdef major			/* Might be defined in sys/types.h.  */
 # define HAVE_MAJOR
 #endif
-  
+#ifdef WIN32
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+
 #ifndef HAVE_MAJOR
 # define major(dev)  (((dev) >> 8) & 0xff)
 # define minor(dev)  ((dev) & 0xff)
@@ -98,7 +102,7 @@ handle_mime(struct magic_set *ms, int mime, const char *str)
 protected int
 file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
 {
-	int ret = 0;
+	int ret, did = 0;
 	int mime = ms->flags & MAGIC_MIME;
 #ifdef	S_IFLNK
 	char buf[BUFSIZ+4];
@@ -111,6 +115,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
 	if (fn == NULL)
 		return 0;
 
+#define COMMA	(did++ ? ", " : "")
 	/*
 	 * Fstat is cheaper but fails for files you don't have read perms on.
 	 * On 4.2BSD and similar systems, use lstat() to identify symlinks.
@@ -122,6 +127,35 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
 #endif
 	ret = stat(fn, sb);	/* don't merge into if; see "ret =" above */
 
+#ifdef WIN32
+	{
+		HANDLE hFile = CreateFile(fn, 0, FILE_SHARE_DELETE |
+		    FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0,
+		    NULL);
+		if (hFile != INVALID_HANDLE_VALUE) {
+			/*
+			 * Stat failed, but we can still open it - assume it's
+			 * a block device, if nothing else.
+			 */
+			if (ret) {
+				sb->st_mode = S_IFBLK;
+				ret = 0;
+			}
+			switch (GetFileType(hFile)) {
+			case FILE_TYPE_CHAR:
+				sb->st_mode |= S_IFCHR;
+				sb->st_mode &= ~S_IFREG;
+				break;
+			case FILE_TYPE_PIPE:
+				sb->st_mode |= S_IFIFO;
+				sb->st_mode &= ~S_IFREG;
+				break;
+			}
+			CloseHandle(hFile);
+		}
+	}
+#endif
+
 	if (ret) {
 		if (ms->flags & MAGIC_ERROR) {
 			file_error(ms, errno, "cannot stat `%s'", fn);
@@ -130,24 +164,24 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
 		if (file_printf(ms, "cannot open `%s' (%s)",
 		    fn, strerror(errno)) == -1)
 			return -1;
-		ms->event_flags |= EVENT_HAD_ERR;
-		return -1;
+		return 0;
 	}
 
+	ret = 1;
 	if (!mime) {
 #ifdef S_ISUID
-		if (sb->st_mode & S_ISUID) 
-			if (file_printf(ms, "setuid ") == -1)
+		if (sb->st_mode & S_ISUID)
+			if (file_printf(ms, "%ssetuid", COMMA) == -1)
 				return -1;
 #endif
 #ifdef S_ISGID
 		if (sb->st_mode & S_ISGID) 
-			if (file_printf(ms, "setgid ") == -1)
+			if (file_printf(ms, "%ssetgid", COMMA) == -1)
 				return -1;
 #endif
 #ifdef S_ISVTX
 		if (sb->st_mode & S_ISVTX) 
-			if (file_printf(ms, "sticky ") == -1)
+			if (file_printf(ms, "%ssticky", COMMA) == -1)
 				return -1;
 #endif
 	}
@@ -157,9 +191,9 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
 		if (mime) {
 			if (handle_mime(ms, mime, "directory") == -1)
 				return -1;
-		} else if (file_printf(ms, "directory") == -1)
+		} else if (file_printf(ms, "%sdirectory", COMMA) == -1)
 			return -1;
-		return 1;
+		break;
 #ifdef S_IFCHR
 	case S_IFCHR:
 		/* 
@@ -167,30 +201,32 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
 		 * like ordinary files.  Otherwise, just report that they
 		 * are block special files and go on to the next file.
 		 */
-		if ((ms->flags & MAGIC_DEVICES) != 0)
+		if ((ms->flags & MAGIC_DEVICES) != 0) {
+			ret = 0;
 			break;
+		}
 		if (mime) {
 			if (handle_mime(ms, mime, "chardevice") == -1)
 				return -1;
 		} else {
-#ifdef HAVE_STAT_ST_RDEV
+#ifdef HAVE_STRUCT_STAT_ST_RDEV
 # ifdef dv_unit
-			if (file_printf(ms, "character special (%d/%d/%d)",
-			    major(sb->st_rdev), dv_unit(sb->st_rdev),
+			if (file_printf(ms, "%scharacter special (%d/%d/%d)",
+			    COMMA, major(sb->st_rdev), dv_unit(sb->st_rdev),
 					dv_subunit(sb->st_rdev)) == -1)
 				return -1;
 # else
-			if (file_printf(ms, "character special (%ld/%ld)",
-			    (long)major(sb->st_rdev), (long)minor(sb->st_rdev))
-			    == -1)
+			if (file_printf(ms, "%scharacter special (%ld/%ld)",
+			    COMMA, (long)major(sb->st_rdev),
+			    (long)minor(sb->st_rdev)) == -1)
 				return -1;
 # endif
 #else
-			if (file_printf(ms, "character special") == -1)
+			if (file_printf(ms, "%scharacter special", COMMA) == -1)
 				return -1;
 #endif
 		}
-		return 1;
+		break;
 #endif
 #ifdef S_IFBLK
 	case S_IFBLK:
@@ -199,29 +235,32 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
 		 * like ordinary files.  Otherwise, just report that they
 		 * are block special files and go on to the next file.
 		 */
-		if ((ms->flags & MAGIC_DEVICES) != 0)
+		if ((ms->flags & MAGIC_DEVICES) != 0) {
+			ret = 0;
 			break;
+		}
 		if (mime) {
 			if (handle_mime(ms, mime, "blockdevice") == -1)
 				return -1;
 		} else {
-#ifdef HAVE_STAT_ST_RDEV
+#ifdef HAVE_STRUCT_STAT_ST_RDEV
 # ifdef dv_unit
-			if (file_printf(ms, "block special (%d/%d/%d)",
-					major(sb->st_rdev), dv_unit(sb->st_rdev),
-					dv_subunit(sb->st_rdev)) == -1)
+			if (file_printf(ms, "%sblock special (%d/%d/%d)",
+			    COMMA, major(sb->st_rdev), dv_unit(sb->st_rdev),
+			    dv_subunit(sb->st_rdev)) == -1)
 				return -1;
 # else
-			if (file_printf(ms, "block special (%ld/%ld)",
-					(long)major(sb->st_rdev), (long)minor(sb->st_rdev)) == -1)
+			if (file_printf(ms, "%sblock special (%ld/%ld)",
+			    COMMA, (long)major(sb->st_rdev),
+			    (long)minor(sb->st_rdev)) == -1)
 				return -1;
 # endif
 #else
-			if (file_printf(ms, "block special") == -1)
+			if (file_printf(ms, "%sblock special", COMMA) == -1)
 				return -1;
 #endif
 		}
-		return 1;
+		break;
 #endif
 	/* TODO add code to handle V7 MUX and Blit MUX files */
 #ifdef	S_IFIFO
@@ -231,18 +270,18 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
 		if (mime) {
 			if (handle_mime(ms, mime, "fifo") == -1)
 				return -1;
-		} else if (file_printf(ms, "fifo (named pipe)") == -1)
+		} else if (file_printf(ms, "%sfifo (named pipe)", COMMA) == -1)
 			return -1;
-		return 1;
+		break;
 #endif
 #ifdef	S_IFDOOR
 	case S_IFDOOR:
 		if (mime) {
 			if (handle_mime(ms, mime, "door") == -1)
 				return -1;
-		} else if (file_printf(ms, "door") == -1)
+		} else if (file_printf(ms, "%sdoor", COMMA) == -1)
 			return -1;
-		return 1;
+		break;
 #endif
 #ifdef	S_IFLNK
 	case S_IFLNK:
@@ -256,10 +295,10 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
 				if (handle_mime(ms, mime, "symlink") == -1)
 					return -1;
 			} else if (file_printf(ms,
-			    "unreadable symlink `%s' (%s)", fn,
+			    "%sunreadable symlink `%s' (%s)", COMMA, fn,
 			    strerror(errno)) == -1)
 				return -1;
-			return 1;
+			break;
 		}
 		buf[nch] = '\0';	/* readlink(2) does not do this */
 
@@ -285,9 +324,10 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
 						    "x-path-too-long") == -1)
 							return -1;
 					} else if (file_printf(ms,
-					    "path too long: `%s'", fn) == -1)
+					    "%spath too long: `%s'", COMMA,
+					    fn) == -1)
 						return -1;
-					return 1;
+					break;
 				}
 				/* take dir part */
 				(void)strlcpy(buf2, fn, sizeof buf2);
@@ -306,16 +346,17 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
 			ms->flags &= MAGIC_SYMLINK;
 			p = magic_file(ms, buf);
 			ms->flags |= MAGIC_SYMLINK;
-			return p != NULL ? 1 : -1;
+			if (p == NULL)
+				return -1;
 		} else { /* just print what it points to */
 			if (mime) {
 				if (handle_mime(ms, mime, "symlink") == -1)
 					return -1;
-			} else if (file_printf(ms, "symbolic link to `%s'",
-			    buf) == -1)
+			} else if (file_printf(ms, "%ssymbolic link to `%s'",
+			    COMMA, buf) == -1)
 				return -1;
 		}
-		return 1;
+		break;
 #endif
 #ifdef	S_IFSOCK
 #ifndef __COHERENT__
@@ -323,38 +364,44 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
 		if (mime) {
 			if (handle_mime(ms, mime, "socket") == -1)
 				return -1;
-		} else if (file_printf(ms, "socket") == -1)
+		} else if (file_printf(ms, "%ssocket", COMMA) == -1)
 			return -1;
-		return 1;
+		break;
 #endif
 #endif
 	case S_IFREG:
+		/*
+		 * regular file, check next possibility
+		 *
+		 * If stat() tells us the file has zero length, report here that
+		 * the file is empty, so we can skip all the work of opening and
+		 * reading the file.
+		 * But if the -s option has been given, we skip this
+		 * optimization, since on some systems, stat() reports zero
+		 * size for raw disk partitions. (If the block special device
+		 * really has zero length, the fact that it is empty will be
+		 * detected and reported correctly when we read the file.)
+		 */
+		if ((ms->flags & MAGIC_DEVICES) == 0 && sb->st_size == 0) {
+			if (mime) {
+				if (handle_mime(ms, mime, "x-empty") == -1)
+					return -1;
+			} else if (file_printf(ms, "%sempty", COMMA) == -1)
+				return -1;
+			break;
+		}
+		ret = 0;
 		break;
+
 	default:
 		file_error(ms, 0, "invalid mode 0%o", sb->st_mode);
 		return -1;
 		/*NOTREACHED*/
 	}
 
-	/*
-	 * regular file, check next possibility
-	 *
-	 * If stat() tells us the file has zero length, report here that
-	 * the file is empty, so we can skip all the work of opening and 
-	 * reading the file.
-	 * But if the -s option has been given, we skip this optimization,
-	 * since on some systems, stat() reports zero size for raw disk
-	 * partitions.  (If the block special device really has zero length,
-	 * the fact that it is empty will be detected and reported correctly
-	 * when we read the file.)
-	 */
-	if ((ms->flags & MAGIC_DEVICES) == 0 && sb->st_size == 0) {
-		if (mime) {
-			if (handle_mime(ms, mime, "x-empty") == -1)
-				return -1;
-		} else if (file_printf(ms, "empty") == -1)
-			return -1;
-		return 1;
+	if (!mime && did && ret == 0) {
+	    if (file_printf(ms, " ") == -1)
+		    return -1;
 	}
-	return 0;
+	return ret;
 }
diff --git a/contrib/file/funcs.c b/contrib/file/src/funcs.c
similarity index 83%
rename from contrib/file/funcs.c
rename to contrib/file/src/funcs.c
index 0b2a3d0ca37c..3a2f67c4dab8 100644
--- a/contrib/file/funcs.c
+++ b/contrib/file/src/funcs.c
@@ -27,10 +27,11 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: funcs.c,v 1.60 2011/12/08 12:38:24 rrt Exp $")
+FILE_RCSID("@(#)$File: funcs.c,v 1.72 2014/05/14 23:15:42 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
+#include <assert.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
@@ -44,6 +45,9 @@ FILE_RCSID("@(#)$File: funcs.c,v 1.60 2011/12/08 12:38:24 rrt Exp $")
 #if defined(HAVE_LIMITS_H)
 #include <limits.h>
 #endif
+#if defined(HAVE_LOCALE_H)
+#include <locale.h>
+#endif
 
 #ifndef SIZE_MAX
 #define SIZE_MAX	((size_t)~0)
@@ -58,6 +62,8 @@ file_vprintf(struct magic_set *ms, const char *fmt, va_list ap)
 	int len;
 	char *buf, *newstr;
 
+	if (ms->event_flags & EVENT_HAD_ERR)
+		return 0;
 	len = vasprintf(&buf, fmt, ap);
 	if (len < 0)
 		goto out;
@@ -93,6 +99,7 @@ file_printf(struct magic_set *ms, const char *fmt, ...)
  * error - print best error message possible
  */
 /*VARARGS*/
+__attribute__((__format__(__printf__, 3, 0)))
 private void
 file_error_core(struct magic_set *ms, int error, const char *f, va_list va,
     size_t lineno)
@@ -166,27 +173,22 @@ file_buffer(struct magic_set *ms, int fd, const char *inname __attribute__ ((unu
 	size_t ulen;
 	const char *code = NULL;
 	const char *code_mime = "binary";
-	const char *type = NULL;
-
-
+	const char *type = "application/octet-stream";
+	const char *def = "data";
+	const char *ftype = NULL;
 
 	if (nb == 0) {
-		if ((!mime || (mime & MAGIC_MIME_TYPE)) &&
-		    file_printf(ms, mime ? "application/x-empty" :
-		    "empty") == -1)
-			return -1;
-		return 1;
+		def = "empty";
+		type = "application/x-empty";
+		goto simple;
 	} else if (nb == 1) {
-		if ((!mime || (mime & MAGIC_MIME_TYPE)) &&
-		    file_printf(ms, mime ? "application/octet-stream" :
-		    "very short file (no magic)") == -1)
-			return -1;
-		return 1;
+		def = "very short file (no magic)";
+		goto simple;
 	}
 
 	if ((ms->flags & MAGIC_NO_CHECK_ENCODING) == 0) {
 		looks_text = file_encoding(ms, ubuf, nb, &u8buf, &ulen,
-		    &code, &code_mime, &type);
+		    &code, &code_mime, &ftype);
 	}
 
 #ifdef __EMX__
@@ -207,7 +209,7 @@ file_buffer(struct magic_set *ms, int fd, const char *inname __attribute__ ((unu
 		if ((m = file_zmagic(ms, fd, inname, ubuf, nb)) != 0) {
 			if ((ms->flags & MAGIC_DEBUG) != 0)
 				(void)fprintf(stderr, "zmagic %d\n", m);
-			goto done;
+			goto done_encoding;
 		}
 #endif
 	/* Check if we have a tar file */
@@ -228,7 +230,7 @@ file_buffer(struct magic_set *ms, int fd, const char *inname __attribute__ ((unu
 
 	/* try soft magic tests */
 	if ((ms->flags & MAGIC_NO_CHECK_SOFT) == 0)
-		if ((m = file_softmagic(ms, ubuf, nb, BINTEST,
+		if ((m = file_softmagic(ms, ubuf, nb, 0, BINTEST,
 		    looks_text)) != 0) {
 			if ((ms->flags & MAGIC_DEBUG) != 0)
 				(void)fprintf(stderr, "softmagic %d\n", m);
@@ -261,25 +263,13 @@ file_buffer(struct magic_set *ms, int fd, const char *inname __attribute__ ((unu
 				(void)fprintf(stderr, "ascmagic %d\n", m);
 			goto done;
 		}
-
-		/* try to discover text encoding */
-		if ((ms->flags & MAGIC_NO_CHECK_ENCODING) == 0) {
-			if (looks_text == 0)
-				if ((m = file_ascmagic_with_encoding( ms, ubuf,
-				    nb, u8buf, ulen, code, type, looks_text))
-				    != 0) {
-					if ((ms->flags & MAGIC_DEBUG) != 0)
-						(void)fprintf(stderr,
-						    "ascmagic/enc %d\n", m);
-					goto done;
-				}
-		}
 	}
 
+simple:
 	/* give up */
 	m = 1;
 	if ((!mime || (mime & MAGIC_MIME_TYPE)) &&
-	    file_printf(ms, mime ? "application/octet-stream" : "data") == -1) {
+	    file_printf(ms, "%s", mime ? type : def) == -1) {
 	    rv = -1;
 	}
  done:
@@ -290,6 +280,9 @@ file_buffer(struct magic_set *ms, int fd, const char *inname __attribute__ ((unu
 		if (file_printf(ms, "%s", code_mime) == -1)
 			rv = -1;
 	}
+#if HAVE_FORK
+ done_encoding:
+#endif
 	free(u8buf);
 	if (rv)
 		return rv;
@@ -301,7 +294,7 @@ file_buffer(struct magic_set *ms, int fd, const char *inname __attribute__ ((unu
 protected int
 file_reset(struct magic_set *ms)
 {
-	if (ms->mlist == NULL) {
+	if (ms->mlist[0] == NULL) {
 		file_error(ms, 0, "no magic files loaded");
 		return -1;
 	}
@@ -436,26 +429,65 @@ file_printedlen(const struct magic_set *ms)
 protected int
 file_replace(struct magic_set *ms, const char *pat, const char *rep)
 {
-	regex_t rx;
-	int rc;
+	file_regex_t rx;
+	int rc, rv = -1;
 
-	rc = regcomp(&rx, pat, REG_EXTENDED);
+	rc = file_regcomp(&rx, pat, REG_EXTENDED);
 	if (rc) {
-		char errmsg[512];
-		(void)regerror(rc, &rx, errmsg, sizeof(errmsg));
-		file_magerror(ms, "regex error %d, (%s)", rc, errmsg);
-		return -1;
+		file_regerror(&rx, rc, ms);
 	} else {
 		regmatch_t rm;
 		int nm = 0;
-		while (regexec(&rx, ms->o.buf, 1, &rm, 0) == 0) {
+		while (file_regexec(&rx, ms->o.buf, 1, &rm, 0) == 0) {
 			ms->o.buf[rm.rm_so] = '\0';
 			if (file_printf(ms, "%s%s", rep,
 			    rm.rm_eo != 0 ? ms->o.buf + rm.rm_eo : "") == -1)
-				return -1;
+				goto out;
 			nm++;
 		}
-		regfree(&rx);
-		return nm;
+		rv = nm;
 	}
+out:
+	file_regfree(&rx);
+	return rv;
+}
+
+protected int
+file_regcomp(file_regex_t *rx, const char *pat, int flags)
+{
+	rx->old_lc_ctype = setlocale(LC_CTYPE, NULL);
+	assert(rx->old_lc_ctype != NULL);
+	rx->old_lc_ctype = strdup(rx->old_lc_ctype);
+	assert(rx->old_lc_ctype != NULL);
+	rx->pat = pat;
+
+	(void)setlocale(LC_CTYPE, "C");
+	return rx->rc = regcomp(&rx->rx, pat, flags);
+}
+
+protected int
+file_regexec(file_regex_t *rx, const char *str, size_t nmatch,
+    regmatch_t* pmatch, int eflags)
+{
+	assert(rx->rc == 0);
+	return regexec(&rx->rx, str, nmatch, pmatch, eflags);
+}
+
+protected void
+file_regfree(file_regex_t *rx)
+{
+	if (rx->rc == 0)
+		regfree(&rx->rx);
+	(void)setlocale(LC_CTYPE, rx->old_lc_ctype);
+	free(rx->old_lc_ctype);
+}
+
+protected void
+file_regerror(file_regex_t *rx, int rc, struct magic_set *ms)
+{
+	char errmsg[512];
+
+	(void)regerror(rc, &rx->rx, errmsg, sizeof(errmsg));
+	file_magerror(ms, "regex error %d for `%s', (%s)", rc, rx->pat,
+	    errmsg);
 }
diff --git a/contrib/file/getline.c b/contrib/file/src/getline.c
similarity index 99%
rename from contrib/file/getline.c
rename to contrib/file/src/getline.c
index e3c41c4af835..99cd15075caa 100644
--- a/contrib/file/getline.c
+++ b/contrib/file/src/getline.c
@@ -37,7 +37,7 @@
 #include <errno.h>
 #include <string.h>
 
-ssize_t
+public ssize_t
 getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
 {
 	char *ptr, *eptr;
diff --git a/contrib/file/getopt_long.c b/contrib/file/src/getopt_long.c
similarity index 100%
rename from contrib/file/getopt_long.c
rename to contrib/file/src/getopt_long.c
diff --git a/contrib/file/is_tar.c b/contrib/file/src/is_tar.c
similarity index 100%
rename from contrib/file/is_tar.c
rename to contrib/file/src/is_tar.c
diff --git a/contrib/file/magic.c b/contrib/file/src/magic.c
similarity index 79%
rename from contrib/file/magic.c
rename to contrib/file/src/magic.c
index 22e5c9b38555..e4bd12ba2291 100644
--- a/contrib/file/magic.c
+++ b/contrib/file/src/magic.c
@@ -33,7 +33,7 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: magic.c,v 1.74 2011/05/26 01:27:59 christos Exp $")
+FILE_RCSID("@(#)$File: magic.c,v 1.84 2014/05/14 23:15:42 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
@@ -71,12 +71,11 @@ FILE_RCSID("@(#)$File: magic.c,v 1.74 2011/05/26 01:27:59 christos Exp $")
 #endif
 #endif
 
-private void free_mlist(struct mlist *);
-#ifndef COMPILE_ONLY
 private void close_and_restore(const struct magic_set *, const char *, int,
     const struct stat *);
 private int unreadable_info(struct magic_set *, mode_t, const char *);
 private const char* get_default_magic(void);
+#ifndef COMPILE_ONLY
 private const char *file_or_fd(struct magic_set *, const char *, int);
 #endif
 
@@ -101,16 +100,21 @@ get_default_magic(void)
 	if ((home = getenv("HOME")) == NULL)
 		return MAGIC;
 
-	if (asprintf(&hmagicpath, "%s/.magic", home) < 0)
+	if (asprintf(&hmagicpath, "%s/.magic.mgc", home) < 0)
 		return MAGIC;
-	if (stat(hmagicpath, &st) == -1)
-		goto out;
-	if (S_ISDIR(st.st_mode)) {
+	if (stat(hmagicpath, &st) == -1) {
 		free(hmagicpath);
-		if (asprintf(&hmagicpath, "%s/%s", home, hmagic) < 0)
+		if (asprintf(&hmagicpath, "%s/.magic", home) < 0)
 			return MAGIC;
-		if (access(hmagicpath, R_OK) == -1)
+		if (stat(hmagicpath, &st) == -1)
 			goto out;
+		if (S_ISDIR(st.st_mode)) {
+			free(hmagicpath);
+			if (asprintf(&hmagicpath, "%s/%s", home, hmagic) < 0)
+				return MAGIC;
+			if (access(hmagicpath, R_OK) == -1)
+				goto out;
+		}
 	}
 
 	if (asprintf(&default_magic, "%s:%s", hmagicpath, MAGIC) < 0)
@@ -122,8 +126,9 @@ get_default_magic(void)
 	free(hmagicpath);
 	return MAGIC;
 #else
-	char *hmagicp = hmagicpath;
+	char *hmagicp;
 	char *tmppath = NULL;
+	hmagicpath = NULL;
 
 #define APPENDPATH() \
 	do { \
@@ -210,64 +215,21 @@ magic_getpath(const char *magicfile, int action)
 public struct magic_set *
 magic_open(int flags)
 {
-	struct magic_set *ms;
-	size_t len;
-
-	if ((ms = CAST(struct magic_set *, calloc((size_t)1,
-	    sizeof(struct magic_set)))) == NULL)
-		return NULL;
-
-	if (magic_setflags(ms, flags) == -1) {
-		errno = EINVAL;
-		goto free;
-	}
-
-	ms->o.buf = ms->o.pbuf = NULL;
-	len = (ms->c.len = 10) * sizeof(*ms->c.li);
-
-	if ((ms->c.li = CAST(struct level_info *, malloc(len))) == NULL)
-		goto free;
-
-	ms->event_flags = 0;
-	ms->error = -1;
-	ms->mlist = NULL;
-	ms->file = "unknown";
-	ms->line = 0;
-	return ms;
-free:
-	free(ms);
-	return NULL;
+	return file_ms_alloc(flags);
 }
 
-private void
-free_mlist(struct mlist *mlist)
-{
-	struct mlist *ml;
-
-	if (mlist == NULL)
-		return;
-
-	for (ml = mlist->next; ml != mlist;) {
-		struct mlist *next = ml->next;
-		struct magic *mg = ml->magic;
-		file_delmagic(mg, ml->mapped, ml->nmagic);
-		free(ml);
-		ml = next;
-	}
-	free(ml);
-}
-
-#ifndef COMPILE_ONLY
 private int
 unreadable_info(struct magic_set *ms, mode_t md, const char *file)
 {
-	/* We cannot open it, but we were able to stat it. */
-	if (access(file, W_OK) == 0)
-		if (file_printf(ms, "writable, ") == -1)
-			return -1;
-	if (access(file, X_OK) == 0)
-		if (file_printf(ms, "executable, ") == -1)
-			return -1;
+	if (file) {
+		/* We cannot open it, but we were able to stat it. */
+		if (access(file, W_OK) == 0)
+			if (file_printf(ms, "writable, ") == -1)
+				return -1;
+		if (access(file, X_OK) == 0)
+			if (file_printf(ms, "executable, ") == -1)
+				return -1;
+	}
 	if (S_ISREG(md))
 		if (file_printf(ms, "regular file, ") == -1)
 			return -1;
@@ -275,16 +237,13 @@ unreadable_info(struct magic_set *ms, mode_t md, const char *file)
 		return -1;
 	return 0;
 }
-#endif
 
 public void
 magic_close(struct magic_set *ms)
 {
-	free_mlist(ms->mlist);
-	free(ms->o.pbuf);
-	free(ms->o.buf);
-	free(ms->c.li);
-	free(ms);
+	if (ms == NULL)
+		return;
+	file_ms_free(ms);
 }
 
 /*
@@ -293,45 +252,40 @@ magic_close(struct magic_set *ms)
 public int
 magic_load(struct magic_set *ms, const char *magicfile)
 {
-	struct mlist *ml = file_apprentice(ms, magicfile, FILE_LOAD);
-	if (ml) {
-		free_mlist(ms->mlist);
-		ms->mlist = ml;
-		return 0;
-	}
-	return -1;
+	if (ms == NULL)
+		return -1;
+	return file_apprentice(ms, magicfile, FILE_LOAD);
 }
 
 public int
 magic_compile(struct magic_set *ms, const char *magicfile)
 {
-	struct mlist *ml = file_apprentice(ms, magicfile, FILE_COMPILE);
-	free_mlist(ml);
-	return ml ? 0 : -1;
+	if (ms == NULL)
+		return -1;
+	return file_apprentice(ms, magicfile, FILE_COMPILE);
 }
 
 public int
 magic_check(struct magic_set *ms, const char *magicfile)
 {
-	struct mlist *ml = file_apprentice(ms, magicfile, FILE_CHECK);
-	free_mlist(ml);
-	return ml ? 0 : -1;
+	if (ms == NULL)
+		return -1;
+	return file_apprentice(ms, magicfile, FILE_CHECK);
 }
 
 public int
 magic_list(struct magic_set *ms, const char *magicfile)
 {
-	struct mlist *ml = file_apprentice(ms, magicfile, FILE_LIST);
-	free_mlist(ml);
-	return ml ? 0 : -1;
+	if (ms == NULL)
+		return -1;
+	return file_apprentice(ms, magicfile, FILE_LIST);
 }
 
-#ifndef COMPILE_ONLY
 private void
 close_and_restore(const struct magic_set *ms, const char *name, int fd,
     const struct stat *sb)
 {
-	if (fd == STDIN_FILENO)
+	if (fd == STDIN_FILENO || name == NULL)
 		return;
 	(void) close(fd);
 
@@ -360,6 +314,7 @@ close_and_restore(const struct magic_set *ms, const char *name, int fd,
 	}
 }
 
+#ifndef COMPILE_ONLY
 
 /*
  * find type of descriptor
@@ -367,6 +322,8 @@ close_and_restore(const struct magic_set *ms, const char *name, int fd,
 public const char *
 magic_descriptor(struct magic_set *ms, int fd)
 {
+	if (ms == NULL)
+		return NULL;
 	return file_or_fd(ms, NULL, fd);
 }
 
@@ -376,6 +333,8 @@ magic_descriptor(struct magic_set *ms, int fd)
 public const char *
 magic_file(struct magic_set *ms, const char *inname)
 {
+	if (ms == NULL)
+		return NULL;
 	return file_or_fd(ms, inname, STDIN_FILENO);
 }
 
@@ -387,6 +346,10 @@ file_or_fd(struct magic_set *ms, const char *inname, int fd)
 	struct stat	sb;
 	ssize_t nbytes = 0;	/* number of bytes read from a datafile */
 	int	ispipe = 0;
+	off_t	pos = (off_t)-1;
+
+	if (file_reset(ms) == -1)
+		goto out;
 
 	/*
 	 * one extra for terminating '\0', and
@@ -396,9 +359,6 @@ file_or_fd(struct magic_set *ms, const char *inname, int fd)
 	if ((buf = CAST(unsigned char *, malloc(HOWMANY + SLOP))) == NULL)
 		return NULL;
 
-	if (file_reset(ms) == -1)
-		goto done;
-
 	switch (file_fsmagic(ms, inname, &sb)) {
 	case -1:		/* error */
 		goto done;
@@ -409,13 +369,22 @@ file_or_fd(struct magic_set *ms, const char *inname, int fd)
 		goto done;
 	}
 
+#ifdef WIN32
+	/* Place stdin in binary mode, so EOF (Ctrl+Z) doesn't stop early. */
+	if (fd == STDIN_FILENO)
+		_setmode(STDIN_FILENO, O_BINARY);
+#endif
+
 	if (inname == NULL) {
 		if (fstat(fd, &sb) == 0 && S_ISFIFO(sb.st_mode))
 			ispipe = 1;
+		else
+			pos = lseek(fd, (off_t)0, SEEK_CUR);
 	} else {
 		int flags = O_RDONLY|O_BINARY;
+		int okstat = stat(inname, &sb) == 0;
 
-		if (stat(inname, &sb) == 0 && S_ISFIFO(sb.st_mode)) {
+		if (okstat && S_ISFIFO(sb.st_mode)) {
 #ifdef O_NONBLOCK
 			flags |= O_NONBLOCK;
 #endif
@@ -424,7 +393,20 @@ file_or_fd(struct magic_set *ms, const char *inname, int fd)
 
 		errno = 0;
 		if ((fd = open(inname, flags)) < 0) {
-			if (unreadable_info(ms, sb.st_mode, inname) == -1)
+#ifdef WIN32
+			/*
+			 * Can't stat, can't open.  It may have been opened in
+			 * fsmagic, so if the user doesn't have read permission,
+			 * allow it to say so; otherwise an error was probably
+			 * displayed in fsmagic.
+			 */
+			if (!okstat && errno == EACCES) {
+				sb.st_mode = S_IFBLK;
+				okstat = 1;
+			}
+#endif
+			if (okstat &&
+			    unreadable_info(ms, sb.st_mode, inname) == -1)
 				goto done;
 			rv = 0;
 			goto done;
@@ -458,8 +440,18 @@ file_or_fd(struct magic_set *ms, const char *inname, int fd)
 		}
 
 	} else {
-		if ((nbytes = read(fd, (char *)buf, HOWMANY)) == -1) {
-			file_error(ms, errno, "cannot read `%s'", inname);
+		/* Windows refuses to read from a big console buffer. */
+		size_t howmany =
+#if defined(WIN32) && HOWMANY > 8 * 1024
+				_isatty(fd) ? 8 * 1024 :
+#endif
+				HOWMANY;
+		if ((nbytes = read(fd, (char *)buf, howmany)) == -1) {
+			if (inname == NULL && fd != STDIN_FILENO)
+				file_error(ms, errno, "cannot read fd %d", fd);
+			else
+				file_error(ms, errno, "cannot read `%s'",
+				    inname == NULL ? "/dev/stdin" : inname);
 			goto done;
 		}
 	}
@@ -470,7 +462,10 @@ file_or_fd(struct magic_set *ms, const char *inname, int fd)
 	rv = 0;
 done:
 	free(buf);
+	if (pos != (off_t)-1)
+		(void)lseek(fd, pos, SEEK_SET);
 	close_and_restore(ms, inname, fd, &sb);
+out:
 	return rv == 0 ? file_getbuffer(ms) : NULL;
 }
 
@@ -478,6 +473,8 @@ file_or_fd(struct magic_set *ms, const char *inname, int fd)
 public const char *
 magic_buffer(struct magic_set *ms, const void *buf, size_t nb)
 {
+	if (ms == NULL)
+		return NULL;
 	if (file_reset(ms) == -1)
 		return NULL;
 	/*
@@ -489,23 +486,29 @@ magic_buffer(struct magic_set *ms, const void *buf, size_t nb)
 	}
 	return file_getbuffer(ms);
 }
-#endif /* COMPILE_ONLY */
+#endif
 
 public const char *
 magic_error(struct magic_set *ms)
 {
+	if (ms == NULL)
+		return "Magic database is not open";
 	return (ms->event_flags & EVENT_HAD_ERR) ? ms->o.buf : NULL;
 }
 
 public int
 magic_errno(struct magic_set *ms)
 {
+	if (ms == NULL)
+		return EINVAL;
 	return (ms->event_flags & EVENT_HAD_ERR) ? ms->error : 0;
 }
 
 public int
 magic_setflags(struct magic_set *ms, int flags)
 {
+	if (ms == NULL)
+		return -1;
 #if !defined(HAVE_UTIME) && !defined(HAVE_UTIMES)
 	if (flags & MAGIC_PRESERVE_ATIME)
 		return -1;
@@ -513,3 +516,9 @@ magic_setflags(struct magic_set *ms, int flags)
 	ms->flags = flags;
 	return 0;
 }
+
+public int
+magic_version(void)
+{
+	return MAGIC_VERSION;
+}
diff --git a/contrib/file/magic.h b/contrib/file/src/magic.h
similarity index 97%
rename from contrib/file/magic.h
rename to contrib/file/src/magic.h
index 2bbed764d26d..38e59d70881b 100644
--- a/contrib/file/magic.h
+++ b/contrib/file/src/magic.h
@@ -65,6 +65,7 @@
 	MAGIC_NO_CHECK_CDF	| \
 	MAGIC_NO_CHECK_TOKENS	| \
 	MAGIC_NO_CHECK_ENCODING	| \
+	0			  \
 )
 
 /* Defined for backwards compatibility (renamed) */
@@ -74,6 +75,8 @@
 #define	MAGIC_NO_CHECK_FORTRAN	0x000000 /* Don't check ascii/fortran */
 #define	MAGIC_NO_CHECK_TROFF	0x000000 /* Don't check ascii/troff */
 
+#define MAGIC_VERSION		518	/* This implementation */
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -91,6 +94,7 @@ const char *magic_buffer(magic_t, const void *, size_t);
 const char *magic_error(magic_t);
 int magic_setflags(magic_t, int);
 
+int magic_version(void);
 int magic_load(magic_t, const char *);
 int magic_compile(magic_t, const char *);
 int magic_check(magic_t, const char *);
diff --git a/contrib/file/src/magic.h.in b/contrib/file/src/magic.h.in
new file mode 100644
index 000000000000..86fc41b77f0f
--- /dev/null
+++ b/contrib/file/src/magic.h.in
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) Christos Zoulas 2003.
+ * All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice immediately at the beginning of the file, without modification,
+ *    this list of conditions, and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 _MAGIC_H
+#define _MAGIC_H
+
+#include <sys/types.h>
+
+#define	MAGIC_NONE		0x000000 /* No flags */
+#define	MAGIC_DEBUG		0x000001 /* Turn on debugging */
+#define	MAGIC_SYMLINK		0x000002 /* Follow symlinks */
+#define	MAGIC_COMPRESS		0x000004 /* Check inside compressed files */
+#define	MAGIC_DEVICES		0x000008 /* Look at the contents of devices */
+#define	MAGIC_MIME_TYPE		0x000010 /* Return the MIME type */
+#define	MAGIC_CONTINUE		0x000020 /* Return all matches */
+#define	MAGIC_CHECK		0x000040 /* Print warnings to stderr */
+#define	MAGIC_PRESERVE_ATIME	0x000080 /* Restore access time on exit */
+#define	MAGIC_RAW		0x000100 /* Don't translate unprintable chars */
+#define	MAGIC_ERROR		0x000200 /* Handle ENOENT etc as real errors */
+#define	MAGIC_MIME_ENCODING	0x000400 /* Return the MIME encoding */
+#define MAGIC_MIME		(MAGIC_MIME_TYPE|MAGIC_MIME_ENCODING)
+#define	MAGIC_APPLE		0x000800 /* Return the Apple creator and type */
+
+#define	MAGIC_NO_CHECK_COMPRESS	0x001000 /* Don't check for compressed files */
+#define	MAGIC_NO_CHECK_TAR	0x002000 /* Don't check for tar files */
+#define	MAGIC_NO_CHECK_SOFT	0x004000 /* Don't check magic entries */
+#define	MAGIC_NO_CHECK_APPTYPE	0x008000 /* Don't check application type */
+#define	MAGIC_NO_CHECK_ELF	0x010000 /* Don't check for elf details */
+#define	MAGIC_NO_CHECK_TEXT	0x020000 /* Don't check for text files */
+#define	MAGIC_NO_CHECK_CDF	0x040000 /* Don't check for cdf files */
+#define	MAGIC_NO_CHECK_TOKENS	0x100000 /* Don't check tokens */
+#define MAGIC_NO_CHECK_ENCODING 0x200000 /* Don't check text encodings */
+
+/* No built-in tests; only consult the magic file */
+#define MAGIC_NO_CHECK_BUILTIN	( \
+	MAGIC_NO_CHECK_COMPRESS	| \
+	MAGIC_NO_CHECK_TAR	| \
+/*	MAGIC_NO_CHECK_SOFT	| */ \
+	MAGIC_NO_CHECK_APPTYPE	| \
+	MAGIC_NO_CHECK_ELF	| \
+	MAGIC_NO_CHECK_TEXT	| \
+	MAGIC_NO_CHECK_CDF	| \
+	MAGIC_NO_CHECK_TOKENS	| \
+	MAGIC_NO_CHECK_ENCODING	| \
+	0			  \
+)
+
+/* Defined for backwards compatibility (renamed) */
+#define	MAGIC_NO_CHECK_ASCII	MAGIC_NO_CHECK_TEXT
+
+/* Defined for backwards compatibility; do nothing */
+#define	MAGIC_NO_CHECK_FORTRAN	0x000000 /* Don't check ascii/fortran */
+#define	MAGIC_NO_CHECK_TROFF	0x000000 /* Don't check ascii/troff */
+
+#define MAGIC_VERSION		X.YY	/* This implementation */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct magic_set *magic_t;
+magic_t magic_open(int);
+void magic_close(magic_t);
+
+const char *magic_getpath(const char *, int);
+const char *magic_file(magic_t, const char *);
+const char *magic_descriptor(magic_t, int);
+const char *magic_buffer(magic_t, const void *, size_t);
+
+const char *magic_error(magic_t);
+int magic_setflags(magic_t, int);
+
+int magic_version(void);
+int magic_load(magic_t, const char *);
+int magic_compile(magic_t, const char *);
+int magic_check(magic_t, const char *);
+int magic_list(magic_t, const char *);
+int magic_errno(magic_t);
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif /* _MAGIC_H */
diff --git a/contrib/file/mygetopt.h b/contrib/file/src/mygetopt.h
similarity index 83%
rename from contrib/file/mygetopt.h
rename to contrib/file/src/mygetopt.h
index 4cb879fe75d3..ef87525eaf5b 100644
--- a/contrib/file/mygetopt.h
+++ b/contrib/file/src/mygetopt.h
@@ -15,6 +15,13 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff --git a/contrib/file/src/pread.c b/contrib/file/src/pread.c
new file mode 100644
index 000000000000..649f60953ff0
--- /dev/null
+++ b/contrib/file/src/pread.c
@@ -0,0 +1,14 @@
+#include "file.h"
+#ifndef lint
+FILE_RCSID("@(#)$File: pread.c,v 1.2 2013/04/02 16:23:07 christos Exp $")
+#endif  /* lint */
+#include <fcntl.h>
+#include <unistd.h>
+
+ssize_t
+pread(int fd, void *buf, size_t len, off_t off) {
+	if (lseek(fd, off, SEEK_SET) == (off_t)-1)
+		return -1;
+
+	return read(fd, buf, len);
+}
diff --git a/contrib/file/print.c b/contrib/file/src/print.c
similarity index 83%
rename from contrib/file/print.c
rename to contrib/file/src/print.c
index 4187a2ee0d2b..fa817986740d 100644
--- a/contrib/file/print.c
+++ b/contrib/file/src/print.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: print.c,v 1.71 2011/09/20 15:28:09 christos Exp $")
+FILE_RCSID("@(#)$File: print.c,v 1.76 2013/02/26 18:25:00 christos Exp $")
 #endif  /* lint */
 
 #include <string.h>
@@ -45,31 +45,33 @@ FILE_RCSID("@(#)$File: print.c,v 1.71 2011/09/20 15:28:09 christos Exp $")
 
 #define SZOF(a)	(sizeof(a) / sizeof(a[0]))
 
+#include "cdf.h"
+
 #ifndef COMPILE_ONLY
 protected void
 file_mdump(struct magic *m)
 {
-	private const char optyp[] = { FILE_OPS };
+	static const char optyp[] = { FILE_OPS };
+	char tbuf[26];
 
 	(void) fprintf(stderr, "%u: %.*s %u", m->lineno,
 	    (m->cont_level & 7) + 1, ">>>>>>>>", m->offset);
 
 	if (m->flag & INDIR) {
 		(void) fprintf(stderr, "(%s,",
-			       /* Note: type is unsigned */
-			       (m->in_type < file_nnames) ? 
-					file_names[m->in_type] : "*bad*");
+		    /* Note: type is unsigned */
+		    (m->in_type < file_nnames) ? file_names[m->in_type] :
+		    "*bad in_type*");
 		if (m->in_op & FILE_OPINVERSE)
 			(void) fputc('~', stderr);
 		(void) fprintf(stderr, "%c%u),",
-			       ((size_t)(m->in_op & FILE_OPS_MASK) <
-			       SZOF(optyp)) ? 
-					optyp[m->in_op & FILE_OPS_MASK] : '?',
-				m->in_offset);
+		    ((size_t)(m->in_op & FILE_OPS_MASK) <
+		    SZOF(optyp)) ? optyp[m->in_op & FILE_OPS_MASK] : '?',
+		    m->in_offset);
 	}
 	(void) fprintf(stderr, " %s%s", (m->flag & UNSIGNED) ? "u" : "",
-		       /* Note: type is unsigned */
-		       (m->type < file_nnames) ? file_names[m->type] : "*bad*");
+	    /* Note: type is unsigned */
+	    (m->type < file_nnames) ? file_names[m->type] : "*bad type");
 	if (m->mask_op & FILE_OPINVERSE)
 		(void) fputc('~', stderr);
 
@@ -132,6 +134,7 @@ file_mdump(struct magic *m)
 		case FILE_MELONG:
 		case FILE_BESHORT:
 		case FILE_BELONG:
+		case FILE_INDIRECT:
 			(void) fprintf(stderr, "%d", m->value.l);
 			break;
 		case FILE_BEQUAD:
@@ -153,26 +156,31 @@ file_mdump(struct magic *m)
 		case FILE_BEDATE:
 		case FILE_MEDATE:
 			(void)fprintf(stderr, "%s,",
-			    file_fmttime(m->value.l, 1));
+			    file_fmttime(m->value.l, FILE_T_LOCAL, tbuf));
 			break;
 		case FILE_LDATE:
 		case FILE_LELDATE:
 		case FILE_BELDATE:
 		case FILE_MELDATE:
 			(void)fprintf(stderr, "%s,",
-			    file_fmttime(m->value.l, 0));
-			break;
+			    file_fmttime(m->value.l, 0, tbuf));
 		case FILE_QDATE:
 		case FILE_LEQDATE:
 		case FILE_BEQDATE:
 			(void)fprintf(stderr, "%s,",
-			    file_fmttime((uint32_t)m->value.q, 1));
+			    file_fmttime(m->value.q, FILE_T_LOCAL, tbuf));
 			break;
 		case FILE_QLDATE:
 		case FILE_LEQLDATE:
 		case FILE_BEQLDATE:
 			(void)fprintf(stderr, "%s,",
-			    file_fmttime((uint32_t)m->value.q, 0));
+			    file_fmttime(m->value.q, 0, tbuf));
+			break;
+		case FILE_QWDATE:
+		case FILE_LEQWDATE:
+		case FILE_BEQWDATE:
+			(void)fprintf(stderr, "%s,",
+			    file_fmttime(m->value.q, FILE_T_WINDOWS, tbuf));
 			break;
 		case FILE_FLOAT:
 		case FILE_BEFLOAT:
@@ -187,8 +195,12 @@ file_mdump(struct magic *m)
 		case FILE_DEFAULT:
 			/* XXX - do anything here? */
 			break;
+		case FILE_USE:
+		case FILE_NAME:
+			(void) fprintf(stderr, "'%s'", m->value.s);
+			break;
 		default:
-			(void) fputs("*bad*", stderr);
+			(void) fprintf(stderr, "*bad type %d*", m->type);
 			break;
 		}
 	}
@@ -216,14 +228,20 @@ file_magwarn(struct magic_set *ms, const char *f, ...)
 }
 
 protected const char *
-file_fmttime(uint32_t v, int local)
+file_fmttime(uint64_t v, int flags, char *buf)
 {
 	char *pp;
 	time_t t = (time_t)v;
 	struct tm *tm;
 
-	if (local) {
-		pp = ctime(&t);
+	if (flags & FILE_T_WINDOWS) {
+		struct timespec ts;
+		cdf_timestamp_to_timespec(&ts, t);
+		t = ts.tv_sec;
+	}
+
+	if (flags & FILE_T_LOCAL) {
+		pp = ctime_r(&t, buf);
 	} else {
 #ifndef HAVE_DAYLIGHT
 		private int daylight = 0;
@@ -245,7 +263,7 @@ file_fmttime(uint32_t v, int local)
 		tm = gmtime(&t);
 		if (tm == NULL)
 			goto out;
-		pp = asctime(tm);
+		pp = asctime_r(tm, buf);
 	}
 
 	if (pp == NULL)
@@ -253,5 +271,5 @@ file_fmttime(uint32_t v, int local)
 	pp[strcspn(pp, "\n")] = '\0';
 	return pp;
 out:
-	return "*Invalid time*";
+	return strcpy(buf, "*Invalid time*");
 }
diff --git a/contrib/file/readcdf.c b/contrib/file/src/readcdf.c
similarity index 64%
rename from contrib/file/readcdf.c
rename to contrib/file/src/readcdf.c
index 9cd0ceb0de68..7ced9ea68924 100644
--- a/contrib/file/readcdf.c
+++ b/contrib/file/src/readcdf.c
@@ -26,23 +26,107 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: readcdf.c,v 1.29 2012/02/20 20:04:58 christos Exp $")
+FILE_RCSID("@(#)$File: readcdf.c,v 1.44 2014/05/14 23:22:48 christos Exp $")
 #endif
 
+#include <assert.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <time.h>
 #include <ctype.h>
+#if defined(HAVE_LOCALE_H)
+#include <locale.h>
+#endif
 
 #include "cdf.h"
 #include "magic.h"
 
 #define NOTMIME(ms) (((ms)->flags & MAGIC_MIME) == 0)
 
+static const struct nv {
+	const char *pattern;
+	const char *mime;
+} app2mime[] =  {
+	{ "Word",			"msword",		},
+	{ "Excel",			"vnd.ms-excel",		},
+	{ "Powerpoint",			"vnd.ms-powerpoint",	},
+	{ "Crystal Reports",		"x-rpt",		},
+	{ "Advanced Installer",		"vnd.ms-msi",		},
+	{ "InstallShield",		"vnd.ms-msi",		},
+	{ "Microsoft Patch Compiler",	"vnd.ms-msi",		},
+	{ "NAnt",			"vnd.ms-msi",		},
+	{ "Windows Installer",		"vnd.ms-msi",		},
+	{ NULL,				NULL,			},
+}, name2mime[] = {
+	{ "WordDocument",		"msword",		},
+	{ "PowerPoint",			"vnd.ms-powerpoint",	},
+	{ "DigitalSignature",		"vnd.ms-msi",		},
+	{ NULL,				NULL,			},
+}, name2desc[] = {
+	{ "WordDocument",		"Microsoft Office Word",},
+	{ "PowerPoint",			"Microsoft PowerPoint",	},
+	{ "DigitalSignature",		"Microsoft Installer",	},
+	{ NULL,				NULL,			},
+};
+
+static const struct cv {
+	uint64_t clsid[2];
+	const char *mime;
+} clsid2mime[] = {
+	{
+		{ 0x00000000000c1084LLU, 0x46000000000000c0LLU  },
+		"x-msi",
+	},
+	{	{ 0,			 0			},
+		NULL,
+	},
+}, clsid2desc[] = {
+	{
+		{ 0x00000000000c1084LLU, 0x46000000000000c0LLU  },
+		"MSI Installer",
+	},
+	{	{ 0,			 0			},
+		NULL,
+	},
+};
+
+private const char *
+cdf_clsid_to_mime(const uint64_t clsid[2], const struct cv *cv)
+{
+	size_t i;
+	for (i = 0; cv[i].mime != NULL; i++) {
+		if (clsid[0] == cv[i].clsid[0] && clsid[1] == cv[i].clsid[1])
+			return cv[i].mime;
+	}
+	return NULL;
+}
+
+private const char *
+cdf_app_to_mime(const char *vbuf, const struct nv *nv)
+{
+	size_t i;
+	const char *rv = NULL;
+	char *old_lc_ctype;
+
+	old_lc_ctype = setlocale(LC_CTYPE, NULL);
+	assert(old_lc_ctype != NULL);
+	old_lc_ctype = strdup(old_lc_ctype);
+	assert(old_lc_ctype != NULL);
+	(void)setlocale(LC_CTYPE, "C");
+	for (i = 0; nv[i].pattern != NULL; i++)
+		if (strcasestr(vbuf, nv[i].pattern) != NULL) {
+			rv = nv[i].mime;
+			break;
+		}
+	(void)setlocale(LC_CTYPE, old_lc_ctype);
+	free(old_lc_ctype);
+	return rv;
+}
+
 private int
 cdf_file_property_info(struct magic_set *ms, const cdf_property_info_t *info,
-    size_t count)
+    size_t count, const cdf_directory_t *root_storage)
 {
         size_t i;
         cdf_timestamp_t tp;
@@ -52,6 +136,10 @@ cdf_file_property_info(struct magic_set *ms, const cdf_property_info_t *info,
         const char *s;
         int len;
 
+        if (!NOTMIME(ms) && root_storage)
+		str = cdf_clsid_to_mime(root_storage->d_storage_uuid,
+		    clsid2mime);
+
         for (i = 0; i < count; i++) {
                 cdf_print_property_name(buf, sizeof(buf), info[i].pi_id);
                 switch (info[i].pi_type) {
@@ -92,12 +180,11 @@ cdf_file_property_info(struct magic_set *ms, const cdf_property_info_t *info,
                                 if (info[i].pi_type == CDF_LENGTH32_WSTRING)
                                     k++;
                                 s = info[i].pi_str.s_buf;
-                                for (j = 0; j < sizeof(vbuf) && len--;
-                                    j++, s += k) {
+                                for (j = 0; j < sizeof(vbuf) && len--; s += k) {
                                         if (*s == '\0')
                                                 break;
                                         if (isprint((unsigned char)*s))
-                                                vbuf[j] = *s;
+                                                vbuf[j++] = *s;
                                 }
                                 if (j == sizeof(vbuf))
                                         --j;
@@ -108,25 +195,17 @@ cdf_file_property_info(struct magic_set *ms, const cdf_property_info_t *info,
                                                     buf, vbuf) == -1)
                                                         return -1;
                                         }
-                                } else if (info[i].pi_id ==
-                                        CDF_PROPERTY_NAME_OF_APPLICATION) {
-                                        if (strstr(vbuf, "Word"))
-                                                str = "msword";
-                                        else if (strstr(vbuf, "Excel"))
-                                                str = "vnd.ms-excel";
-                                        else if (strstr(vbuf, "Powerpoint"))
-                                                str = "vnd.ms-powerpoint";
-                                        else if (strstr(vbuf,
-                                            "Crystal Reports"))
-                                                str = "x-rpt";
-                                }
-                        }
+                                } else if (str == NULL && info[i].pi_id ==
+				    CDF_PROPERTY_NAME_OF_APPLICATION) {
+					str = cdf_app_to_mime(vbuf, app2mime);
+				}
+			}
                         break;
                 case CDF_FILETIME:
                         tp = info[i].pi_tp;
                         if (tp != 0) {
+				char tbuf[64];
                                 if (tp < 1000000000000000LL) {
-                                        char tbuf[64];
                                         cdf_print_elapsed_time(tbuf,
                                             sizeof(tbuf), tp);
                                         if (NOTMIME(ms) && file_printf(ms,
@@ -135,9 +214,10 @@ cdf_file_property_info(struct magic_set *ms, const cdf_property_info_t *info,
                                 } else {
                                         char *c, *ec;
                                         cdf_timestamp_to_timespec(&ts, tp);
-                                        c = cdf_ctime(&ts.tv_sec);
-                                        if ((ec = strchr(c, '\n')) != NULL)
-                                                *ec = '\0';
+                                        c = cdf_ctime(&ts.tv_sec, tbuf);
+                                        if (c != NULL &&
+					    (ec = strchr(c, '\n')) != NULL)
+						*ec = '\0';
 
                                         if (NOTMIME(ms) && file_printf(ms,
                                             ", %s: %s", buf, c) == -1)
@@ -162,7 +242,7 @@ cdf_file_property_info(struct magic_set *ms, const cdf_property_info_t *info,
 
 private int
 cdf_file_summary_info(struct magic_set *ms, const cdf_header_t *h,
-    const cdf_stream_t *sst)
+    const cdf_stream_t *sst, const cdf_directory_t *root_storage)
 {
         cdf_summary_info_header_t si;
         cdf_property_info_t *info;
@@ -173,6 +253,8 @@ cdf_file_summary_info(struct magic_set *ms, const cdf_header_t *h,
                 return -1;
 
         if (NOTMIME(ms)) {
+		const char *str;
+
                 if (file_printf(ms, "Composite Document File V2 Document")
 		    == -1)
                         return -1;
@@ -200,14 +282,35 @@ cdf_file_summary_info(struct magic_set *ms, const cdf_header_t *h,
                                 return -2;
                         break;
                 }
-        }
+		if (root_storage) {
+			str = cdf_clsid_to_mime(root_storage->d_storage_uuid,
+			    clsid2desc);
+			if (str)
+				if (file_printf(ms, ", %s", str) == -1)
+					return -2;
+			}
+		}
 
-        m = cdf_file_property_info(ms, info, count);
+        m = cdf_file_property_info(ms, info, count, root_storage);
         free(info);
 
         return m == -1 ? -2 : m;
 }
 
+#ifdef notdef
+private char *
+format_clsid(char *buf, size_t len, const uint64_t uuid[2]) {
+	snprintf(buf, len, "%.8" PRIx64 "-%.4" PRIx64 "-%.4" PRIx64 "-%.4" 
+	    PRIx64 "-%.12" PRIx64,
+	    (uuid[0] >> 32) & (uint64_t)0x000000000ffffffffLLU,
+	    (uuid[0] >> 16) & (uint64_t)0x0000000000000ffffLLU,
+	    (uuid[0] >>  0) & (uint64_t)0x0000000000000ffffLLU, 
+	    (uuid[1] >> 48) & (uint64_t)0x0000000000000ffffLLU,
+	    (uuid[1] >>  0) & (uint64_t)0x0000fffffffffffffLLU);
+	return buf;
+}
+#endif
+
 protected int
 file_trycdf(struct magic_set *ms, int fd, const unsigned char *buf,
     size_t nbytes)
@@ -253,13 +356,50 @@ file_trycdf(struct magic_set *ms, int fd, const unsigned char *buf,
                 goto out2;
         }
 
-        if ((i = cdf_read_short_stream(&info, &h, &sat, &dir, &sst)) == -1) {
+        const cdf_directory_t *root_storage;
+        if ((i = cdf_read_short_stream(&info, &h, &sat, &dir, &sst,
+	    &root_storage)) == -1) {
                 expn = "Cannot read short stream";
                 goto out3;
         }
 #ifdef CDF_DEBUG
         cdf_dump_dir(&info, &h, &sat, &ssat, &sst, &dir);
 #endif
+#ifdef notdef
+	if (root_storage) {
+		if (NOTMIME(ms)) {
+			char clsbuf[128];
+			if (file_printf(ms, "CLSID %s, ",
+			    format_clsid(clsbuf, sizeof(clsbuf),
+			    root_storage->d_storage_uuid)) == -1)
+				return -1;
+		}
+	}
+#endif
+
+	if ((i = cdf_read_user_stream(&info, &h, &sat, &ssat, &sst, &dir,
+	    "FileHeader", &scn)) != -1) {
+#define HWP5_SIGNATURE "HWP Document File"
+		if (scn.sst_dirlen >= sizeof(HWP5_SIGNATURE) - 1
+		    && memcmp(scn.sst_tab, HWP5_SIGNATURE,
+		    sizeof(HWP5_SIGNATURE) - 1) == 0) {
+		    if (NOTMIME(ms)) {
+			if (file_printf(ms,
+			    "Hangul (Korean) Word Processor File 5.x") == -1)
+			    return -1;
+		    } else {
+			if (file_printf(ms, "application/x-hwp") == -1)
+			    return -1;
+		    }
+		    i = 1;
+		    goto out5;
+		} else {
+		    free(scn.sst_tab);
+		    scn.sst_tab = NULL;
+		    scn.sst_len = 0;
+		    scn.sst_dirlen = 0;
+		}
+	}
 
         if ((i = cdf_read_summary_info(&info, &h, &sat, &ssat, &sst, &dir,
             &scn)) == -1) {
@@ -274,26 +414,37 @@ file_trycdf(struct magic_set *ms, int fd, const unsigned char *buf,
 #ifdef CDF_DEBUG
         cdf_dump_summary_info(&h, &scn);
 #endif
-        if ((i = cdf_file_summary_info(ms, &h, &scn)) < 0)
-                expn = "Can't expand summary_info";
+        if ((i = cdf_file_summary_info(ms, &h, &scn, root_storage)) < 0)
+            expn = "Can't expand summary_info";
+
 	if (i == 0) {
-		const char *str = "vnd.ms-office";
+		const char *str = NULL;
 		cdf_directory_t *d;
 		char name[__arraycount(d->d_name)];
 		size_t j, k;
-		for (j = 0; j < dir.dir_len; j++) {
-		    d = &dir.dir_tab[j];
-		    for (k = 0; k < sizeof(name); k++)
-			name[k] = (char)cdf_tole2(d->d_name[k]);
-		    if (strstr(name, "WordDocument") == 0) {
-			str = "msword";
-			break;
-		    }
+
+		for (j = 0; str == NULL && j < dir.dir_len; j++) {
+			d = &dir.dir_tab[j];
+			for (k = 0; k < sizeof(name); k++)
+				name[k] = (char)cdf_tole2(d->d_name[k]);
+			str = cdf_app_to_mime(name,
+			    NOTMIME(ms) ? name2desc : name2mime);
+		}
+		if (NOTMIME(ms)) {
+			if (str != NULL) {
+				if (file_printf(ms, "%s", str) == -1)
+					return -1;
+				i = 1;
+			}
+		} else {
+			if (str == NULL)
+				str = "vnd.ms-office";
+			if (file_printf(ms, "application/%s", str) == -1)
+				return -1;
+			i = 1;
 		}
-                if (file_printf(ms, "application/%s", str) == -1)
-                        return -1;
-		i = 1;
 	}
+out5:
         free(scn.sst_tab);
 out4:
         free(sst.sst_tab);
@@ -304,15 +455,19 @@ file_trycdf(struct magic_set *ms, int fd, const unsigned char *buf,
 out1:
         free(sat.sat_tab);
 out0:
-        if (i != 1) {
-		if (i == -1)
-		    if (file_printf(ms, "Composite Document File V2 Document")
-			== -1)
-			    return -1;
-                if (*expn)
-                        if (file_printf(ms, ", %s%s", corrupt, expn) == -1)
-                                return -1;
-                i = 1;
-        }
+	if (i == -1) {
+	    if (NOTMIME(ms)) {
+		if (file_printf(ms,
+		    "Composite Document File V2 Document") == -1)
+		    return -1;
+		if (*expn)
+		    if (file_printf(ms, ", %s%s", corrupt, expn) == -1)
+			return -1;
+	    } else {
+		if (file_printf(ms, "application/CDFV2-corrupt") == -1)
+		    return -1;
+	    }
+	    i = 1;
+	}
         return i;
 }
diff --git a/contrib/file/readelf.c b/contrib/file/src/readelf.c
similarity index 77%
rename from contrib/file/readelf.c
rename to contrib/file/src/readelf.c
index 8b141e12d405..ede7e0c751c8 100644
--- a/contrib/file/readelf.c
+++ b/contrib/file/src/readelf.c
@@ -27,7 +27,7 @@
 #include "file.h"
 
 #ifndef lint
-FILE_RCSID("@(#)$File: readelf.c,v 1.90 2011/08/23 08:01:12 christos Exp $")
+FILE_RCSID("@(#)$File: readelf.c,v 1.103 2014/05/02 02:25:10 christos Exp $")
 #endif
 
 #ifdef BUILTIN_ELF
@@ -48,7 +48,7 @@ private int dophn_core(struct magic_set *, int, int, int, off_t, int, size_t,
 private int dophn_exec(struct magic_set *, int, int, int, off_t, int, size_t,
     off_t, int *, int);
 private int doshn(struct magic_set *, int, int, int, off_t, int, size_t,
-    off_t, int *, int);
+    off_t, int *, int, int);
 private size_t donote(struct magic_set *, void *, size_t, size_t, int,
     int, size_t, int *);
 
@@ -127,21 +127,15 @@ getu64(int swap, uint64_t value)
 
 #define elf_getu16(swap, value) getu16(swap, value)
 #define elf_getu32(swap, value) getu32(swap, value)
-#ifdef USE_ARRAY_FOR_64BIT_TYPES
-# define elf_getu64(swap, array) \
-	((swap ? ((uint64_t)elf_getu32(swap, array[0])) << 32 : elf_getu32(swap, array[0])) + \
-	 (swap ? elf_getu32(swap, array[1]) : ((uint64_t)elf_getu32(swap, array[1]) << 32)))
-#else
-# define elf_getu64(swap, value) getu64(swap, value)
-#endif
+#define elf_getu64(swap, value) getu64(swap, value)
 
 #define xsh_addr	(clazz == ELFCLASS32			\
-			 ? (void *) &sh32			\
-			 : (void *) &sh64)
+			 ? (void *)&sh32			\
+			 : (void *)&sh64)
 #define xsh_sizeof	(clazz == ELFCLASS32			\
-			 ? sizeof sh32				\
-			 : sizeof sh64)
-#define xsh_size	(clazz == ELFCLASS32			\
+			 ? sizeof(sh32)				\
+			 : sizeof(sh64))
+#define xsh_size	(size_t)(clazz == ELFCLASS32		\
 			 ? elf_getu32(swap, sh32.sh_size)	\
 			 : elf_getu64(swap, sh64.sh_size))
 #define xsh_offset	(off_t)(clazz == ELFCLASS32		\
@@ -150,12 +144,15 @@ getu64(int swap, uint64_t value)
 #define xsh_type	(clazz == ELFCLASS32			\
 			 ? elf_getu32(swap, sh32.sh_type)	\
 			 : elf_getu32(swap, sh64.sh_type))
+#define xsh_name    	(clazz == ELFCLASS32			\
+			 ? elf_getu32(swap, sh32.sh_name)	\
+			 : elf_getu32(swap, sh64.sh_name))
 #define xph_addr	(clazz == ELFCLASS32			\
 			 ? (void *) &ph32			\
 			 : (void *) &ph64)
 #define xph_sizeof	(clazz == ELFCLASS32			\
-			 ? sizeof ph32				\
-			 : sizeof ph64)
+			 ? sizeof(ph32)				\
+			 : sizeof(ph64))
 #define xph_type	(clazz == ELFCLASS32			\
 			 ? elf_getu32(swap, ph32.p_type)	\
 			 : elf_getu32(swap, ph64.p_type))
@@ -171,8 +168,8 @@ getu64(int swap, uint64_t value)
 			 ? elf_getu32(swap, ph32.p_filesz)	\
 			 : elf_getu64(swap, ph64.p_filesz)))
 #define xnh_addr	(clazz == ELFCLASS32			\
-			 ? (void *) &nh32			\
-			 : (void *) &nh64)
+			 ? (void *)&nh32			\
+			 : (void *)&nh64)
 #define xph_memsz	(size_t)((clazz == ELFCLASS32		\
 			 ? elf_getu32(swap, ph32.p_memsz)	\
 			 : elf_getu64(swap, ph64.p_memsz)))
@@ -192,8 +189,8 @@ getu64(int swap, uint64_t value)
 			 ? prpsoffsets32[i]			\
 			 : prpsoffsets64[i])
 #define xcap_addr	(clazz == ELFCLASS32			\
-			 ? (void *) &cap32			\
-			 : (void *) &cap64)
+			 ? (void *)&cap32			\
+			 : (void *)&cap64)
 #define xcap_sizeof	(clazz == ELFCLASS32			\
 			 ? sizeof cap32				\
 			 : sizeof cap64)
@@ -295,7 +292,7 @@ dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
 {
 	Elf32_Phdr ph32;
 	Elf64_Phdr ph64;
-	size_t offset;
+	size_t offset, len;
 	unsigned char nbuf[BUFSIZ];
 	ssize_t bufsize;
 
@@ -309,11 +306,7 @@ dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
 	 * Loop through all the program headers.
 	 */
 	for ( ; num; num--) {
-		if (lseek(fd, off, SEEK_SET) == (off_t)-1) {
-			file_badseek(ms);
-			return -1;
-		}
-		if (read(fd, xph_addr, xph_sizeof) == -1) {
+		if (pread(fd, xph_addr, xph_sizeof, off) == -1) {
 			file_badread(ms);
 			return -1;
 		}
@@ -331,13 +324,8 @@ dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
 		 * This is a PT_NOTE section; loop through all the notes
 		 * in the section.
 		 */
-		if (lseek(fd, xph_offset, SEEK_SET) == (off_t)-1) {
-			file_badseek(ms);
-			return -1;
-		}
-		bufsize = read(fd, nbuf,
-		    ((xph_filesz < sizeof(nbuf)) ? xph_filesz : sizeof(nbuf)));
-		if (bufsize == -1) {
+		len = xph_filesz < sizeof(nbuf) ? xph_filesz : sizeof(nbuf);
+		if ((bufsize = pread(fd, nbuf, len, xph_offset)) == -1) {
 			file_badread(ms);
 			return -1;
 		}
@@ -356,6 +344,126 @@ dophn_core(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
 }
 #endif
 
+static void
+do_note_netbsd_version(struct magic_set *ms, int swap, void *v)
+{
+	uint32_t desc;
+	(void)memcpy(&desc, v, sizeof(desc));
+	desc = elf_getu32(swap, desc);
+
+	if (file_printf(ms, ", for NetBSD") == -1)
+		return;
+	/*
+	 * The version number used to be stuck as 199905, and was thus
+	 * basically content-free.  Newer versions of NetBSD have fixed
+	 * this and now use the encoding of __NetBSD_Version__:
+	 *
+	 *	MMmmrrpp00
+	 *
+	 * M = major version
+	 * m = minor version
+	 * r = release ["",A-Z,Z[A-Z] but numeric]
+	 * p = patchlevel
+	 */
+	if (desc > 100000000U) {
+		uint32_t ver_patch = (desc / 100) % 100;
+		uint32_t ver_rel = (desc / 10000) % 100;
+		uint32_t ver_min = (desc / 1000000) % 100;
+		uint32_t ver_maj = desc / 100000000;
+
+		if (file_printf(ms, " %u.%u", ver_maj, ver_min) == -1)
+			return;
+		if (ver_rel == 0 && ver_patch != 0) {
+			if (file_printf(ms, ".%u", ver_patch) == -1)
+				return;
+		} else if (ver_rel != 0) {
+			while (ver_rel > 26) {
+				if (file_printf(ms, "Z") == -1)
+					return;
+				ver_rel -= 26;
+			}
+			if (file_printf(ms, "%c", 'A' + ver_rel - 1)
+			    == -1)
+				return;
+		}
+	}
+}
+
+static void
+do_note_freebsd_version(struct magic_set *ms, int swap, void *v)
+{
+	uint32_t desc;
+
+	(void)memcpy(&desc, v, sizeof(desc));
+	desc = elf_getu32(swap, desc);
+	if (file_printf(ms, ", for FreeBSD") == -1)
+		return;
+
+	/*
+	 * Contents is __FreeBSD_version, whose relation to OS
+	 * versions is defined by a huge table in the Porter's
+	 * Handbook.  This is the general scheme:
+	 * 
+	 * Releases:
+	 * 	Mmp000 (before 4.10)
+	 * 	Mmi0p0 (before 5.0)
+	 * 	Mmm0p0
+	 * 
+	 * Development branches:
+	 * 	Mmpxxx (before 4.6)
+	 * 	Mmp1xx (before 4.10)
+	 * 	Mmi1xx (before 5.0)
+	 * 	M000xx (pre-M.0)
+	 * 	Mmm1xx
+	 * 
+	 * M = major version
+	 * m = minor version
+	 * i = minor version increment (491000 -> 4.10)
+	 * p = patchlevel
+	 * x = revision
+	 * 
+	 * The first release of FreeBSD to use ELF by default
+	 * was version 3.0.
+	 */
+	if (desc == 460002) {
+		if (file_printf(ms, " 4.6.2") == -1)
+			return;
+	} else if (desc < 460100) {
+		if (file_printf(ms, " %d.%d", desc / 100000,
+		    desc / 10000 % 10) == -1)
+			return;
+		if (desc / 1000 % 10 > 0)
+			if (file_printf(ms, ".%d", desc / 1000 % 10) == -1)
+				return;
+		if ((desc % 1000 > 0) || (desc % 100000 == 0))
+			if (file_printf(ms, " (%d)", desc) == -1)
+				return;
+	} else if (desc < 500000) {
+		if (file_printf(ms, " %d.%d", desc / 100000,
+		    desc / 10000 % 10 + desc / 1000 % 10) == -1)
+			return;
+		if (desc / 100 % 10 > 0) {
+			if (file_printf(ms, " (%d)", desc) == -1)
+				return;
+		} else if (desc / 10 % 10 > 0) {
+			if (file_printf(ms, ".%d", desc / 10 % 10) == -1)
+				return;
+		}
+	} else {
+		if (file_printf(ms, " %d.%d", desc / 100000,
+		    desc / 1000 % 100) == -1)
+			return;
+		if ((desc / 100 % 10 > 0) ||
+		    (desc % 100000 / 100 == 0)) {
+			if (file_printf(ms, " (%d)", desc) == -1)
+				return;
+		} else if (desc / 10 % 10 > 0) {
+			if (file_printf(ms, ".%d", desc / 10 % 10) == -1)
+				return;
+		}
+	}
+}
+
 private size_t
 donote(struct magic_set *ms, void *vbuf, size_t offset, size_t size,
     int clazz, int swap, size_t align, int *flags)
@@ -416,6 +524,10 @@ donote(struct magic_set *ms, void *vbuf, size_t offset, size_t size,
 	    (FLAGS_DID_NOTE|FLAGS_DID_BUILD_ID))
 		goto core;
 
+	if (namesz == 5 && strcmp((char *)&nbuf[noff], "SuSE") == 0 &&
+	    xnh_type == NT_GNU_VERSION && descsz == 2) {
+	    file_printf(ms, ", for SuSE %d.%d", nbuf[doff], nbuf[doff + 1]);
+	}
 	if (namesz == 4 && strcmp((char *)&nbuf[noff], "GNU") == 0 &&
 	    xnh_type == NT_GNU_VERSION && descsz == 16) {
 		uint32_t desc[4];
@@ -457,139 +569,80 @@ donote(struct magic_set *ms, void *vbuf, size_t offset, size_t size,
 
 	if (namesz == 4 && strcmp((char *)&nbuf[noff], "GNU") == 0 &&
 	    xnh_type == NT_GNU_BUILD_ID && (descsz == 16 || descsz == 20)) {
-	    uint32_t desc[5], i;
-	    if (file_printf(ms, ", BuildID[%s]=0x", descsz == 16 ? "md5/uuid" :
+	    uint8_t desc[20];
+	    uint32_t i;
+	    if (file_printf(ms, ", BuildID[%s]=", descsz == 16 ? "md5/uuid" :
 		"sha1") == -1)
 		    return size;
 	    (void)memcpy(desc, &nbuf[doff], descsz);
-	    for (i = 0; i < descsz >> 2; i++)
-		if (file_printf(ms, "%.8x", desc[i]) == -1)
+	    for (i = 0; i < descsz; i++)
+		if (file_printf(ms, "%02x", desc[i]) == -1)
 		    return size;
 	    *flags |= FLAGS_DID_BUILD_ID;
 	}
 
-	if (namesz == 7 && strcmp((char *)&nbuf[noff], "NetBSD") == 0 &&
-	    xnh_type == NT_NETBSD_VERSION && descsz == 4) {
+	if (namesz == 4 && strcmp((char *)&nbuf[noff], "PaX") == 0 &&
+	    xnh_type == NT_NETBSD_PAX && descsz == 4) {
+		static const char *pax[] = {
+		    "+mprotect",
+		    "-mprotect",
+		    "+segvguard",
+		    "-segvguard",
+		    "+ASLR",
+		    "-ASLR",
+		};
 		uint32_t desc;
+		size_t i;
+		int did = 0;
+
 		(void)memcpy(&desc, &nbuf[doff], sizeof(desc));
 		desc = elf_getu32(swap, desc);
 
-		if (file_printf(ms, ", for NetBSD") == -1)
+		if (desc && file_printf(ms, ", PaX: ") == -1)
 			return size;
-		/*
-		 * The version number used to be stuck as 199905, and was thus
-		 * basically content-free.  Newer versions of NetBSD have fixed
-		 * this and now use the encoding of __NetBSD_Version__:
-		 *
-		 *	MMmmrrpp00
-		 *
-		 * M = major version
-		 * m = minor version
-		 * r = release ["",A-Z,Z[A-Z] but numeric]
-		 * p = patchlevel
-		 */
-		if (desc > 100000000U) {
-			uint32_t ver_patch = (desc / 100) % 100;
-			uint32_t ver_rel = (desc / 10000) % 100;
-			uint32_t ver_min = (desc / 1000000) % 100;
-			uint32_t ver_maj = desc / 100000000;
 
-			if (file_printf(ms, " %u.%u", ver_maj, ver_min) == -1)
+		for (i = 0; i < __arraycount(pax); i++) {
+			if (((1 << i) & desc) == 0)
+				continue;
+			if (file_printf(ms, "%s%s", did++ ? "," : "",
+			    pax[i]) == -1)
 				return size;
-			if (ver_rel == 0 && ver_patch != 0) {
-				if (file_printf(ms, ".%u", ver_patch) == -1)
-					return size;
-			} else if (ver_rel != 0) {
-				while (ver_rel > 26) {
-					if (file_printf(ms, "Z") == -1)
-						return size;
-					ver_rel -= 26;
-				}
-				if (file_printf(ms, "%c", 'A' + ver_rel - 1)
-				    == -1)
-					return size;
-			}
 		}
-		*flags |= FLAGS_DID_NOTE;
+	}
+
+	if (namesz == 7 && strcmp((char *)&nbuf[noff], "NetBSD") == 0) {
+		switch (xnh_type) {
+		case NT_NETBSD_VERSION:
+			if (descsz == 4) {
+				do_note_netbsd_version(ms, swap, &nbuf[doff]);
+				*flags |= FLAGS_DID_NOTE;
+				return size;
+			}
+			break;
+		case NT_NETBSD_MARCH:
+			if (file_printf(ms, ", compiled for: %.*s", (int)descsz,
+			    (const char *)&nbuf[doff]) == -1)
+				return size;
+			break;
+		case NT_NETBSD_CMODEL:
+			if (file_printf(ms, ", compiler model: %.*s",
+			    (int)descsz, (const char *)&nbuf[doff]) == -1)
+				return size;
+			break;
+		default:
+			if (file_printf(ms, ", note=%u", xnh_type) == -1)
+				return size;
+			break;
+		}
 		return size;
 	}
 
-	if (namesz == 8 && strcmp((char *)&nbuf[noff], "FreeBSD") == 0 &&
-	    xnh_type == NT_FREEBSD_VERSION && descsz == 4) {
-		uint32_t desc;
-		(void)memcpy(&desc, &nbuf[doff], sizeof(desc));
-		desc = elf_getu32(swap, desc);
-		if (file_printf(ms, ", for FreeBSD") == -1)
+	if (namesz == 8 && strcmp((char *)&nbuf[noff], "FreeBSD") == 0) {
+	    	if (xnh_type == NT_FREEBSD_VERSION && descsz == 4) {
+			do_note_freebsd_version(ms, swap, &nbuf[doff]);
+			*flags |= FLAGS_DID_NOTE;
 			return size;
-
-		/*
-		 * Contents is __FreeBSD_version, whose relation to OS
-		 * versions is defined by a huge table in the Porter's
-		 * Handbook.  This is the general scheme:
-		 * 
-		 * Releases:
-		 * 	Mmp000 (before 4.10)
-		 * 	Mmi0p0 (before 5.0)
-		 * 	Mmm0p0
-		 * 
-		 * Development branches:
-		 * 	Mmpxxx (before 4.6)
-		 * 	Mmp1xx (before 4.10)
-		 * 	Mmi1xx (before 5.0)
-		 * 	M000xx (pre-M.0)
-		 * 	Mmm1xx
-		 * 
-		 * M = major version
-		 * m = minor version
-		 * i = minor version increment (491000 -> 4.10)
-		 * p = patchlevel
-		 * x = revision
-		 * 
-		 * The first release of FreeBSD to use ELF by default
-		 * was version 3.0.
-		 */
-		if (desc == 460002) {
-			if (file_printf(ms, " 4.6.2") == -1)
-				return size;
-		} else if (desc < 460100) {
-			if (file_printf(ms, " %d.%d", desc / 100000,
-			    desc / 10000 % 10) == -1)
-				return size;
-			if (desc / 1000 % 10 > 0)
-				if (file_printf(ms, ".%d", desc / 1000 % 10)
-				    == -1)
-					return size;
-			if ((desc % 1000 > 0) || (desc % 100000 == 0))
-				if (file_printf(ms, " (%d)", desc) == -1)
-					return size;
-		} else if (desc < 500000) {
-			if (file_printf(ms, " %d.%d", desc / 100000,
-			    desc / 10000 % 10 + desc / 1000 % 10) == -1)
-				return size;
-			if (desc / 100 % 10 > 0) {
-				if (file_printf(ms, " (%d)", desc) == -1)
-					return size;
-			} else if (desc / 10 % 10 > 0) {
-				if (file_printf(ms, ".%d", desc / 10 % 10)
-				    == -1)
-					return size;
-			}
-		} else {
-			if (file_printf(ms, " %d.%d", desc / 100000,
-			    desc / 1000 % 100) == -1)
-				return size;
-			if ((desc / 100 % 10 > 0) ||
-			    (desc % 100000 / 100 == 0)) {
-				if (file_printf(ms, " (%d)", desc) == -1)
-					return size;
-			} else if (desc / 10 % 10 > 0) {
-				if (file_printf(ms, ".%d", desc / 10 % 10)
-				    == -1)
-					return size;
-			}
 		}
-		*flags |= FLAGS_DID_NOTE;
-		return size;
 	}
 
 	if (namesz == 8 && strcmp((char *)&nbuf[noff], "OpenBSD") == 0 &&
@@ -842,15 +895,16 @@ static const cap_desc_t cap_desc_386[] = {
 
 private int
 doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
-    size_t size, off_t fsize, int *flags, int mach)
+    size_t size, off_t fsize, int *flags, int mach, int strtab)
 {
 	Elf32_Shdr sh32;
 	Elf64_Shdr sh64;
 	int stripped = 1;
 	void *nbuf;
-	off_t noff, coff;
+	off_t noff, coff, name_off;
 	uint64_t cap_hw1 = 0;	/* SunOS 5.x hardware capabilites */
 	uint64_t cap_sf1 = 0;	/* SunOS 5.x software capabilites */
+	char name[50];
 
 	if (size != xsh_sizeof) {
 		if (file_printf(ms, ", corrupted section header size") == -1)
@@ -858,12 +912,24 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
 		return 0;
 	}
 
+	/* Read offset of name section to be able to read section names later */
+	if (pread(fd, xsh_addr, xsh_sizeof, off + size * strtab) == -1) {
+		file_badread(ms);
+		return -1;
+	}
+	name_off = xsh_offset;
+
 	for ( ; num; num--) {
-		if (lseek(fd, off, SEEK_SET) == (off_t)-1) {
-			file_badseek(ms);
+		/* Read the name of this section. */
+		if (pread(fd, name, sizeof(name), name_off + xsh_name) == -1) {
+			file_badread(ms);
 			return -1;
 		}
-		if (read(fd, xsh_addr, xsh_sizeof) == -1) {
+		name[sizeof(name) - 1] = '\0';
+		if (strcmp(name, ".debug_info") == 0)
+			stripped = 0;
+
+		if (pread(fd, xsh_addr, xsh_sizeof, off) == -1) {
 			file_badread(ms);
 			return -1;
 		}
@@ -888,39 +954,41 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
 		/* Things we can determine when we seek */
 		switch (xsh_type) {
 		case SHT_NOTE:
-			if ((nbuf = malloc((size_t)xsh_size)) == NULL) {
+			if ((nbuf = malloc(xsh_size)) == NULL) {
 				file_error(ms, errno, "Cannot allocate memory"
 				    " for note");
 				return -1;
 			}
-			if ((noff = lseek(fd, (off_t)xsh_offset, SEEK_SET)) ==
-			    (off_t)-1) {
+			if (pread(fd, nbuf, xsh_size, xsh_offset) == -1) {
 				file_badread(ms);
 				free(nbuf);
 				return -1;
 			}
-			if (read(fd, nbuf, (size_t)xsh_size) !=
-			    (ssize_t)xsh_size) {
-				free(nbuf);
-				file_badread(ms);
-				return -1;
-			}
 
 			noff = 0;
 			for (;;) {
 				if (noff >= (off_t)xsh_size)
 					break;
 				noff = donote(ms, nbuf, (size_t)noff,
-				    (size_t)xsh_size, clazz, swap, 4,
-				    flags);
+				    xsh_size, clazz, swap, 4, flags);
 				if (noff == 0)
 					break;
 			}
 			free(nbuf);
 			break;
 		case SHT_SUNW_cap:
-			if (lseek(fd, (off_t)xsh_offset, SEEK_SET) ==
-			    (off_t)-1) {
+			switch (mach) {
+			case EM_SPARC:
+			case EM_SPARCV9:
+			case EM_IA_64:
+			case EM_386:
+			case EM_AMD64:
+				break;
+			default:
+				goto skip;
+			}
+
+			if (lseek(fd, xsh_offset, SEEK_SET) == (off_t)-1) {
 				file_badseek(ms);
 				return -1;
 			}
@@ -937,6 +1005,36 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
 					file_badread(ms);
 					return -1;
 				}
+				if (cbuf[0] == 'A') {
+#ifdef notyet
+					char *p = cbuf + 1;
+					uint32_t len, tag;
+					memcpy(&len, p, sizeof(len));
+					p += 4;
+					len = getu32(swap, len);
+					if (memcmp("gnu", p, 3) != 0) {
+					    if (file_printf(ms,
+						", unknown capability %.3s", p)
+						== -1)
+						return -1;
+					    break;
+					}
+					p += strlen(p) + 1;
+					tag = *p++;
+					memcpy(&len, p, sizeof(len));
+					p += 4;
+					len = getu32(swap, len);
+					if (tag != 1) {
+					    if (file_printf(ms, ", unknown gnu"
+						" capability tag %d", tag)
+						== -1)
+						return -1;
+					    break;
+					}
+					// gnu attributes 
+#endif
+					break;
+				}
 				(void)memcpy(xcap_addr, cbuf, xcap_sizeof);
 				switch (xcap_tag) {
 				case CA_SUNW_NULL:
@@ -958,12 +1056,13 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
 					break;
 				}
 			}
-			break;
-
+			/*FALLTHROUGH*/
+		skip:
 		default:
 			break;
 		}
 	}
+
 	if (file_printf(ms, ", %sstripped", stripped ? "" : "not ") == -1)
 		return -1;
 	if (cap_hw1) {
@@ -1042,7 +1141,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
 	const char *shared_libraries = "";
 	unsigned char nbuf[BUFSIZ];
 	ssize_t bufsize;
-	size_t offset, align;
+	size_t offset, align, len;
 	
 	if (size != xph_sizeof) {
 		if (file_printf(ms, ", corrupted program header size") == -1)
@@ -1051,13 +1150,8 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
 	}
 
   	for ( ; num; num--) {
-		if (lseek(fd, off, SEEK_SET) == (off_t)-1) {
-			file_badseek(ms);
-			return -1;
-		}
-
-  		if (read(fd, xph_addr, xph_sizeof) == -1) {
-  			file_badread(ms);
+		if (pread(fd, xph_addr, xph_sizeof, off) == -1) {
+			file_badread(ms);
 			return -1;
 		}
 
@@ -1095,12 +1189,9 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
 			 * This is a PT_NOTE section; loop through all the notes
 			 * in the section.
 			 */
-			if (lseek(fd, xph_offset, SEEK_SET) == (off_t)-1) {
-				file_badseek(ms);
-				return -1;
-			}
-			bufsize = read(fd, nbuf, ((xph_filesz < sizeof(nbuf)) ?
-			    xph_filesz : sizeof(nbuf)));
+			len = xph_filesz < sizeof(nbuf) ? xph_filesz
+			    : sizeof(nbuf);
+			bufsize = pread(fd, nbuf, len, xph_offset);
 			if (bufsize == -1) {
 				file_badread(ms);
 				return -1;
diff --git a/contrib/file/readelf.h b/contrib/file/src/readelf.h
similarity index 89%
rename from contrib/file/readelf.h
rename to contrib/file/src/readelf.h
index c79e84447b6c..732b20c88e72 100644
--- a/contrib/file/readelf.h
+++ b/contrib/file/src/readelf.h
@@ -44,17 +44,9 @@ typedef uint16_t	Elf32_Half;
 typedef uint32_t	Elf32_Word;
 typedef uint8_t		Elf32_Char;
 
-#if SIZEOF_LONG_LONG != 8
-#define	USE_ARRAY_FOR_64BIT_TYPES
-typedef	uint32_t 	Elf64_Addr[2];
-typedef	uint32_t 	Elf64_Off[2];
-typedef uint32_t 	Elf64_Xword[2];
-#else
-#undef USE_ARRAY_FOR_64BIT_TYPES
 typedef	uint64_t 	Elf64_Addr;
 typedef	uint64_t 	Elf64_Off;
 typedef uint64_t 	Elf64_Xword;
-#endif
 typedef uint16_t	Elf64_Half;
 typedef uint32_t	Elf64_Word;
 typedef uint8_t		Elf64_Char;
@@ -224,7 +216,6 @@ typedef struct {
 #define	NT_TASKSTRUCT	4
 #define	NT_PLATFORM	5
 #define	NT_AUXV		6
-#define	NT_THRMISC	7
 
 /* Note types used in executables */
 /* NetBSD executables (name = "NetBSD") */
@@ -264,6 +255,46 @@ typedef struct {
  */
 #define	NT_GNU_BUILD_ID		3
 
+/*
+ * NetBSD-specific note type: PaX.
+ * There should be 1 NOTE per executable.
+ * name: PaX\0
+ * namesz: 4
+ * desc:
+ *	word[0]: capability bitmask
+ * descsz: 4
+ */
+#define NT_NETBSD_PAX		3
+#define NT_NETBSD_PAX_MPROTECT		0x01	/* Force enable Mprotect */
+#define NT_NETBSD_PAX_NOMPROTECT	0x02	/* Force disable Mprotect */
+#define NT_NETBSD_PAX_GUARD		0x04	/* Force enable Segvguard */
+#define NT_NETBSD_PAX_NOGUARD		0x08	/* Force disable Servguard */
+#define NT_NETBSD_PAX_ASLR		0x10	/* Force enable ASLR */
+#define NT_NETBSD_PAX_NOASLR		0x20	/* Force disable ASLR */
+
+/*
+ * NetBSD-specific note type: MACHINE_ARCH.
+ * There should be 1 NOTE per executable.
+ * name:	NetBSD\0
+ * namesz:	7
+ * desc:	string
+ * descsz:	variable
+ */
+#define NT_NETBSD_MARCH		5
+
+/*
+ * NetBSD-specific note type: COMPILER MODEL.
+ * There should be 1 NOTE per executable.
+ * name:	NetBSD\0
+ * namesz:	7
+ * desc:	string
+ * descsz:	variable
+ */
+#define NT_NETBSD_CMODEL	6
+
+#if !defined(ELFSIZE) && defined(ARCH_ELFSIZE)
+#define ELFSIZE ARCH_ELFSIZE
+#endif
 /* SunOS 5.x hardware/software capabilities */
 typedef struct {
 	Elf32_Word	c_tag;
diff --git a/contrib/file/softmagic.c b/contrib/file/src/softmagic.c
similarity index 72%
rename from contrib/file/softmagic.c
rename to contrib/file/src/softmagic.c
index 22e1190af8a0..ed97aa79d651 100644
--- a/contrib/file/softmagic.c
+++ b/contrib/file/src/softmagic.c
@@ -32,27 +32,33 @@
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: softmagic.c,v 1.147 2011/11/05 15:44:22 rrt Exp $")
+FILE_RCSID("@(#)$File: softmagic.c,v 1.191 2014/06/04 17:36:34 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
+#include <assert.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <time.h>
+#if defined(HAVE_LOCALE_H)
+#include <locale.h>
+#endif
 
 
 private int match(struct magic_set *, struct magic *, uint32_t,
-    const unsigned char *, size_t, int, int);
+    const unsigned char *, size_t, size_t, int, int, int, int, int *, int *,
+    int *);
 private int mget(struct magic_set *, const unsigned char *,
-    struct magic *, size_t, unsigned int, int);
+    struct magic *, size_t, size_t, unsigned int, int, int, int, int, int *,
+    int *, int *);
 private int magiccheck(struct magic_set *, struct magic *);
 private int32_t mprint(struct magic_set *, struct magic *);
 private int32_t moffset(struct magic_set *, struct magic *);
 private void mdebug(uint32_t, const char *, size_t);
 private int mcopy(struct magic_set *, union VALUETYPE *, int, int,
-    const unsigned char *, uint32_t, size_t, size_t);
-private int mconvert(struct magic_set *, struct magic *);
+    const unsigned char *, uint32_t, size_t, struct magic *);
+private int mconvert(struct magic_set *, struct magic *, int);
 private int print_sep(struct magic_set *, int);
 private int handle_annotation(struct magic_set *, struct magic *);
 private void cvt_8(union VALUETYPE *, const struct magic *);
@@ -60,6 +66,7 @@ private void cvt_16(union VALUETYPE *, const struct magic *);
 private void cvt_32(union VALUETYPE *, const struct magic *);
 private void cvt_64(union VALUETYPE *, const struct magic *);
 
+#define OFFSET_OOB(n, o, i)	((n) < (o) || (i) > ((n) - (o)))
 /*
  * softmagic - lookup one file in parsed, in-memory copy of database
  * Passed the name and FILE * of one file to be typed.
@@ -67,18 +74,38 @@ private void cvt_64(union VALUETYPE *, const struct magic *);
 /*ARGSUSED1*/		/* nbytes passed for regularity, maybe need later */
 protected int
 file_softmagic(struct magic_set *ms, const unsigned char *buf, size_t nbytes,
-    int mode, int text)
+    size_t level, int mode, int text)
 {
 	struct mlist *ml;
-	int rv;
-	for (ml = ms->mlist->next; ml != ms->mlist; ml = ml->next)
-		if ((rv = match(ms, ml->magic, ml->nmagic, buf, nbytes, mode,
-		    text)) != 0)
+	int rv, printed_something = 0, need_separator = 0;
+	for (ml = ms->mlist[0]->next; ml != ms->mlist[0]; ml = ml->next)
+		if ((rv = match(ms, ml->magic, ml->nmagic, buf, nbytes, 0, mode,
+		    text, 0, level, &printed_something, &need_separator,
+		    NULL)) != 0)
 			return rv;
 
 	return 0;
 }
 
+#define FILE_FMTDEBUG
+#ifdef FILE_FMTDEBUG
+#define F(a, b, c) file_fmtcheck((a), (b), (c), __FILE__, __LINE__)
+
+private const char * __attribute__((__format_arg__(3)))
+file_fmtcheck(struct magic_set *ms, const struct magic *m, const char *def,
+	const char *file, size_t line)
+{
+	const char *ptr = fmtcheck(m->desc, def);
+	if (ptr == def)
+		file_magerror(ms,
+		    "%s, %zu: format `%s' does not match with `%s'",
+		    file, line, m->desc, def);
+	return ptr;
+}
+#else
+#define F(a, b, c) fmtcheck((b)->desc, (c))
+#endif
+
 /*
  * Go through the whole list, stopping if you find a match.  Process all
  * the continuations of that match before returning.
@@ -108,16 +135,19 @@ file_softmagic(struct magic_set *ms, const unsigned char *buf, size_t nbytes,
  */
 private int
 match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
-    const unsigned char *s, size_t nbytes, int mode, int text)
+    const unsigned char *s, size_t nbytes, size_t offset, int mode, int text,
+    int flip, int recursion_level, int *printed_something, int *need_separator,
+    int *returnval)
 {
 	uint32_t magindex = 0;
 	unsigned int cont_level = 0;
-	int need_separator = 0;
-	int returnval = 0, e; /* if a match is found it is set to 1*/
+	int returnvalv = 0, e; /* if a match is found it is set to 1*/
 	int firstline = 1; /* a flag to print X\n  X\n- X */
-	int printed_something = 0;
 	int print = (ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0;
 
+	if (returnval == NULL)
+		returnval = &returnvalv;
+
 	if (file_check_mem(ms, cont_level) == -1)
 		return -1;
 
@@ -125,13 +155,16 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 		int flush = 0;
 		struct magic *m = &magic[magindex];
 
+		if (m->type != FILE_NAME)
 		if ((IS_STRING(m->type) &&
-		     ((text && (m->str_flags & (STRING_BINTEST | STRING_TEXTTEST)) == STRING_BINTEST) ||
-		      (!text && (m->str_flags & (STRING_TEXTTEST | STRING_BINTEST)) == STRING_TEXTTEST))) ||
+#define FLT (STRING_BINTEST | STRING_TEXTTEST)
+		     ((text && (m->str_flags & FLT) == STRING_BINTEST) ||
+		      (!text && (m->str_flags & FLT) == STRING_TEXTTEST))) ||
 		    (m->flag & mode) != mode) {
 			/* Skip sub-tests */
-			while (magic[magindex + 1].cont_level != 0 &&
-			       ++magindex < nmagic)
+			while (magindex + 1 < nmagic &&
+                               magic[magindex + 1].cont_level != 0 &&
+			       ++magindex)
 				continue;
 			continue; /* Skip to next top-level test*/
 		}
@@ -140,7 +173,9 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 		ms->line = m->lineno;
 
 		/* if main entry matches, print it... */
-		switch (mget(ms, s, m, nbytes, cont_level, text)) {
+		switch (mget(ms, s, m, nbytes, offset, cont_level, mode, text,
+		    flip, recursion_level + 1, printed_something,
+		    need_separator, returnval)) {
 		case -1:
 			return -1;
 		case 0:
@@ -148,7 +183,7 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 			break;
 		default:
 			if (m->type == FILE_INDIRECT)
-				returnval = 1;
+				*returnval = 1;
 
 			switch (magiccheck(ms, m)) {
 			case -1:
@@ -173,15 +208,19 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 			continue;
 		}
 
-		if ((e = handle_annotation(ms, m)) != 0)
+		if ((e = handle_annotation(ms, m)) != 0) {
+			*need_separator = 1;
+			*printed_something = 1;
+			*returnval = 1;
 			return e;
+		}
 		/*
 		 * If we are going to print something, we'll need to print
 		 * a blank before we print something else.
 		 */
 		if (*m->desc) {
-			need_separator = 1;
-			printed_something = 1;
+			*need_separator = 1;
+			*printed_something = 1;
 			if (print_sep(ms, firstline) == -1)
 				return -1;
 		}
@@ -196,8 +235,8 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 		if (file_check_mem(ms, ++cont_level) == -1)
 			return -1;
 
-		while (magic[magindex+1].cont_level != 0 &&
-		    ++magindex < nmagic) {
+		while (++magindex < nmagic &&
+		    magic[magindex].cont_level != 0) {
 			m = &magic[magindex];
 			ms->line = m->lineno; /* for messages */
 
@@ -223,7 +262,9 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 					continue;
 			}
 #endif
-			switch (mget(ms, s, m, nbytes, cont_level, text)) {
+			switch (mget(ms, s, m, nbytes, offset, cont_level, mode,
+			    text, flip, recursion_level + 1, printed_something,
+			    need_separator, returnval)) {
 			case -1:
 				return -1;
 			case 0:
@@ -233,7 +274,7 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 				break;
 			default:
 				if (m->type == FILE_INDIRECT)
-					returnval = 1;
+					*returnval = 1;
 				flush = 0;
 				break;
 			}
@@ -250,21 +291,26 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 #ifdef ENABLE_CONDITIONALS
 				ms->c.li[cont_level].last_match = 1;
 #endif
-				if (m->type != FILE_DEFAULT)
-					ms->c.li[cont_level].got_match = 1;
-				else if (ms->c.li[cont_level].got_match) {
+				if (m->type == FILE_CLEAR)
 					ms->c.li[cont_level].got_match = 0;
-					break;
-				}
-				if ((e = handle_annotation(ms, m)) != 0)
+				else if (ms->c.li[cont_level].got_match) {
+					if (m->type == FILE_DEFAULT)
+						break;
+				} else
+					ms->c.li[cont_level].got_match = 1;
+				if ((e = handle_annotation(ms, m)) != 0) {
+					*need_separator = 1;
+					*printed_something = 1;
+					*returnval = 1;
 					return e;
+				}
 				/*
 				 * If we are going to print something,
 				 * make sure that we have a separator first.
 				 */
 				if (*m->desc) {
-					if (!printed_something) {
-						printed_something = 1;
+					if (!*printed_something) {
+						*printed_something = 1;
 						if (print_sep(ms, firstline)
 						    == -1)
 							return -1;
@@ -277,13 +323,13 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 				 * this item isn't empty.
 				 */
 				/* space if previous printed */
-				if (need_separator
+				if (*need_separator
 				    && ((m->flag & NOSPACE) == 0)
 				    && *m->desc) {
 					if (print &&
 					    file_printf(ms, " ") == -1)
 						return -1;
-					need_separator = 0;
+					*need_separator = 0;
 				}
 				if (print && mprint(ms, m) == -1)
 					return -1;
@@ -291,7 +337,7 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 				ms->c.li[cont_level].off = moffset(ms, m);
 
 				if (*m->desc)
-					need_separator = 1;
+					*need_separator = 1;
 
 				/*
 				 * If we see any continuations
@@ -303,38 +349,36 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
 				break;
 			}
 		}
-		if (printed_something) {
+		if (*printed_something) {
 			firstline = 0;
 			if (print)
-				returnval = 1;
+				*returnval = 1;
 		}
-		if ((ms->flags & MAGIC_CONTINUE) == 0 && printed_something) {
-			return returnval; /* don't keep searching */
+		if ((ms->flags & MAGIC_CONTINUE) == 0 && *printed_something) {
+			return *returnval; /* don't keep searching */
 		}
 	}
-	return returnval;  /* This is hit if -k is set or there is no match */
+	return *returnval;  /* This is hit if -k is set or there is no match */
 }
 
 private int
 check_fmt(struct magic_set *ms, struct magic *m)
 {
-	regex_t rx;
-	int rc;
+	file_regex_t rx;
+	int rc, rv = -1;
 
 	if (strchr(m->desc, '%') == NULL)
 		return 0;
 
-	rc = regcomp(&rx, "%[-0-9\\.]*s", REG_EXTENDED|REG_NOSUB);
+	rc = file_regcomp(&rx, "%[-0-9\\.]*s", REG_EXTENDED|REG_NOSUB);
 	if (rc) {
-		char errmsg[512];
-		(void)regerror(rc, &rx, errmsg, sizeof(errmsg));
-		file_magerror(ms, "regex error %d, (%s)", rc, errmsg);
-		return -1;
+		file_regerror(&rx, rc, ms);
 	} else {
-		rc = regexec(&rx, m->desc, 0, 0, 0);
-		regfree(&rx);
-		return !rc;
+		rc = file_regexec(&rx, m->desc, 0, 0, 0);
+		rv = !rc;
 	}
+	file_regfree(&rx);
+	return rv;
 }
 
 #ifndef HAVE_STRNDUP
@@ -363,7 +407,7 @@ mprint(struct magic_set *ms, struct magic *m)
 	float vf;
 	double vd;
 	int64_t t = 0;
- 	char buf[128];
+ 	char buf[128], tbuf[26];
 	union VALUETYPE *p = &ms->ms_value;
 
   	switch (m->type) {
@@ -373,13 +417,14 @@ mprint(struct magic_set *ms, struct magic *m)
 		case -1:
 			return -1;
 		case 1:
-			(void)snprintf(buf, sizeof(buf), "%c",
+			(void)snprintf(buf, sizeof(buf), "%d",
 			    (unsigned char)v);
-			if (file_printf(ms, m->desc, buf) == -1)
+			if (file_printf(ms, F(ms, m, "%s"), buf) == -1)
 				return -1;
 			break;
 		default:
-			if (file_printf(ms, m->desc, (unsigned char) v) == -1)
+			if (file_printf(ms, F(ms, m, "%d"),
+			    (unsigned char) v) == -1)
 				return -1;
 			break;
 		}
@@ -394,14 +439,14 @@ mprint(struct magic_set *ms, struct magic *m)
 		case -1:
 			return -1;
 		case 1:
-			(void)snprintf(buf, sizeof(buf), "%hu",
+			(void)snprintf(buf, sizeof(buf), "%u",
 			    (unsigned short)v);
-			if (file_printf(ms, m->desc, buf) == -1)
+			if (file_printf(ms, F(ms, m, "%s"), buf) == -1)
 				return -1;
 			break;
 		default:
-			if (
-			    file_printf(ms, m->desc, (unsigned short) v) == -1)
+			if (file_printf(ms, F(ms, m, "%u"),
+			    (unsigned short) v) == -1)
 				return -1;
 			break;
 		}
@@ -417,12 +462,12 @@ mprint(struct magic_set *ms, struct magic *m)
 		case -1:
 			return -1;
 		case 1:
-			(void)snprintf(buf, sizeof(buf), "%u", (uint32_t)v);
-			if (file_printf(ms, m->desc, buf) == -1)
+			(void)snprintf(buf, sizeof(buf), "%u", (uint32_t) v);
+			if (file_printf(ms, F(ms, m, "%s"), buf) == -1)
 				return -1;
 			break;
 		default:
-			if (file_printf(ms, m->desc, (uint32_t) v) == -1)
+			if (file_printf(ms, F(ms, m, "%u"), (uint32_t) v) == -1)
 				return -1;
 			break;
 		}
@@ -433,8 +478,21 @@ mprint(struct magic_set *ms, struct magic *m)
   	case FILE_BEQUAD:
   	case FILE_LEQUAD:
 		v = file_signextend(ms, m, p->q);
-		if (file_printf(ms, m->desc, (uint64_t) v) == -1)
+		switch (check_fmt(ms, m)) {
+		case -1:
 			return -1;
+		case 1:
+			(void)snprintf(buf, sizeof(buf), "%" INT64_T_FORMAT "u",
+			    (unsigned long long)v);
+			if (file_printf(ms, F(ms, m, "%s"), buf) == -1)
+				return -1;
+			break;
+		default:
+			if (file_printf(ms, F(ms, m, "%" INT64_T_FORMAT "u"),
+			    (unsigned long long) v) == -1)
+				return -1;
+			break;
+		}
 		t = ms->offset + sizeof(int64_t);
   		break;
 
@@ -443,16 +501,35 @@ mprint(struct magic_set *ms, struct magic *m)
   	case FILE_BESTRING16:
   	case FILE_LESTRING16:
 		if (m->reln == '=' || m->reln == '!') {
-			if (file_printf(ms, m->desc, m->value.s) == -1)
+			if (file_printf(ms, F(ms, m, "%s"), m->value.s) == -1)
 				return -1;
 			t = ms->offset + m->vallen;
 		}
 		else {
+			char *str = p->s;
+
+			/* compute t before we mangle the string? */
+			t = ms->offset + strlen(str);
+
 			if (*m->value.s == '\0')
-				p->s[strcspn(p->s, "\n")] = '\0';
-			if (file_printf(ms, m->desc, p->s) == -1)
+				str[strcspn(str, "\n")] = '\0';
+
+			if (m->str_flags & STRING_TRIM) {
+				char *last;
+				while (isspace((unsigned char)*str))
+					str++;
+				last = str;
+				while (*last)
+					last++;
+				--last;
+				while (isspace((unsigned char)*last))
+					last--;
+				*++last = '\0';
+			}
+
+			if (file_printf(ms, F(ms, m, "%s"), str) == -1)
 				return -1;
-			t = ms->offset + strlen(p->s);
+
 			if (m->type == FILE_PSTRING)
 				t += file_pstring_length_size(m);
 		}
@@ -462,25 +539,27 @@ mprint(struct magic_set *ms, struct magic *m)
 	case FILE_BEDATE:
 	case FILE_LEDATE:
 	case FILE_MEDATE:
-		if (file_printf(ms, m->desc, file_fmttime(p->l, 1)) == -1)
+		if (file_printf(ms, F(ms, m, "%s"),
+		    file_fmttime(p->l + m->num_mask, FILE_T_LOCAL, tbuf)) == -1)
 			return -1;
-		t = ms->offset + sizeof(time_t);
+		t = ms->offset + sizeof(uint32_t);
 		break;
 
 	case FILE_LDATE:
 	case FILE_BELDATE:
 	case FILE_LELDATE:
 	case FILE_MELDATE:
-		if (file_printf(ms, m->desc, file_fmttime(p->l, 0)) == -1)
+		if (file_printf(ms, F(ms, m, "%s"),
+		    file_fmttime(p->l + m->num_mask, 0, tbuf)) == -1)
 			return -1;
-		t = ms->offset + sizeof(time_t);
+		t = ms->offset + sizeof(uint32_t);
 		break;
 
 	case FILE_QDATE:
 	case FILE_BEQDATE:
 	case FILE_LEQDATE:
-		if (file_printf(ms, m->desc, file_fmttime((uint32_t)p->q,
-		    1)) == -1)
+		if (file_printf(ms, F(ms, m, "%s"),
+		    file_fmttime(p->q + m->num_mask, FILE_T_LOCAL, tbuf)) == -1)
 			return -1;
 		t = ms->offset + sizeof(uint64_t);
 		break;
@@ -488,8 +567,17 @@ mprint(struct magic_set *ms, struct magic *m)
 	case FILE_QLDATE:
 	case FILE_BEQLDATE:
 	case FILE_LEQLDATE:
-		if (file_printf(ms, m->desc, file_fmttime((uint32_t)p->q,
-		    0)) == -1)
+		if (file_printf(ms, F(ms, m, "%s"),
+		    file_fmttime(p->q + m->num_mask, 0, tbuf)) == -1)
+			return -1;
+		t = ms->offset + sizeof(uint64_t);
+		break;
+
+	case FILE_QWDATE:
+	case FILE_BEQWDATE:
+	case FILE_LEQWDATE:
+		if (file_printf(ms, F(ms, m, "%s"),
+		    file_fmttime(p->q + m->num_mask, FILE_T_WINDOWS, tbuf)) == -1)
 			return -1;
 		t = ms->offset + sizeof(uint64_t);
 		break;
@@ -503,11 +591,11 @@ mprint(struct magic_set *ms, struct magic *m)
 			return -1;
 		case 1:
 			(void)snprintf(buf, sizeof(buf), "%g", vf);
-			if (file_printf(ms, m->desc, buf) == -1)
+			if (file_printf(ms, F(ms, m, "%s"), buf) == -1)
 				return -1;
 			break;
 		default:
-			if (file_printf(ms, m->desc, vf) == -1)
+			if (file_printf(ms, F(ms, m, "%g"), vf) == -1)
 				return -1;
 			break;
 		}
@@ -523,11 +611,11 @@ mprint(struct magic_set *ms, struct magic *m)
 			return -1;
 		case 1:
 			(void)snprintf(buf, sizeof(buf), "%g", vd);
-			if (file_printf(ms, m->desc, buf) == -1)
+			if (file_printf(ms, F(ms, m, "%s"), buf) == -1)
 				return -1;
 			break;
 		default:
-			if (file_printf(ms, m->desc, vd) == -1)
+			if (file_printf(ms, F(ms, m, "%g"), vd) == -1)
 				return -1;
 			break;
 		}
@@ -543,7 +631,7 @@ mprint(struct magic_set *ms, struct magic *m)
 			file_oomem(ms, ms->search.rm_len);
 			return -1;
 		}
-		rval = file_printf(ms, m->desc, cp);
+		rval = file_printf(ms, F(ms, m, "%s"), cp);
 		free(cp);
 
 		if (rval == -1)
@@ -557,7 +645,7 @@ mprint(struct magic_set *ms, struct magic *m)
 	}
 
 	case FILE_SEARCH:
-	  	if (file_printf(ms, m->desc, m->value.s) == -1)
+	  	if (file_printf(ms, F(ms, m, "%s"), m->value.s) == -1)
 			return -1;
 		if ((m->str_flags & REGEX_OFFSET_START))
 			t = ms->search.offset;
@@ -566,12 +654,15 @@ mprint(struct magic_set *ms, struct magic *m)
 		break;
 
 	case FILE_DEFAULT:
-	  	if (file_printf(ms, m->desc, m->value.s) == -1)
+	case FILE_CLEAR:
+	  	if (file_printf(ms, "%s", m->desc) == -1)
 			return -1;
 		t = ms->offset;
 		break;
 
 	case FILE_INDIRECT:
+	case FILE_USE:
+	case FILE_NAME:
 		t = ms->offset;
 		break;
 
@@ -619,7 +710,7 @@ moffset(struct magic_set *ms, struct magic *m)
 				p->s[strcspn(p->s, "\n")] = '\0';
 			t = CAST(uint32_t, (ms->offset + strlen(p->s)));
 			if (m->type == FILE_PSTRING)
-				t += file_pstring_length_size(m);
+				t += (uint32_t)file_pstring_length_size(m);
 			return t;
 		}
 
@@ -627,13 +718,13 @@ moffset(struct magic_set *ms, struct magic *m)
 	case FILE_BEDATE:
 	case FILE_LEDATE:
 	case FILE_MEDATE:
-		return CAST(int32_t, (ms->offset + sizeof(time_t)));
+		return CAST(int32_t, (ms->offset + sizeof(uint32_t)));
 
 	case FILE_LDATE:
 	case FILE_BELDATE:
 	case FILE_LELDATE:
 	case FILE_MELDATE:
-		return CAST(int32_t, (ms->offset + sizeof(time_t)));
+		return CAST(int32_t, (ms->offset + sizeof(uint32_t)));
 
 	case FILE_QDATE:
 	case FILE_BEQDATE:
@@ -668,9 +759,8 @@ moffset(struct magic_set *ms, struct magic *m)
 		else
 			return CAST(int32_t, (ms->search.offset + m->vallen));
 
+	case FILE_CLEAR:
 	case FILE_DEFAULT:
-		return ms->offset;
-
 	case FILE_INDIRECT:
 		return ms->offset;
 
@@ -679,6 +769,56 @@ moffset(struct magic_set *ms, struct magic *m)
 	}
 }
 
+private int
+cvt_flip(int type, int flip)
+{
+	if (flip == 0)
+		return type;
+	switch (type) {
+	case FILE_BESHORT:
+		return FILE_LESHORT;
+	case FILE_BELONG:
+		return FILE_LELONG;
+	case FILE_BEDATE:
+		return FILE_LEDATE;
+	case FILE_BELDATE:
+		return FILE_LELDATE;
+	case FILE_BEQUAD:
+		return FILE_LEQUAD;
+	case FILE_BEQDATE:
+		return FILE_LEQDATE;
+	case FILE_BEQLDATE:
+		return FILE_LEQLDATE;
+	case FILE_BEQWDATE:
+		return FILE_LEQWDATE;
+	case FILE_LESHORT:
+		return FILE_BESHORT;
+	case FILE_LELONG:
+		return FILE_BELONG;
+	case FILE_LEDATE:
+		return FILE_BEDATE;
+	case FILE_LELDATE:
+		return FILE_BELDATE;
+	case FILE_LEQUAD:
+		return FILE_BEQUAD;
+	case FILE_LEQDATE:
+		return FILE_BEQDATE;
+	case FILE_LEQLDATE:
+		return FILE_BEQLDATE;
+	case FILE_LEQWDATE:
+		return FILE_BEQWDATE;
+	case FILE_BEFLOAT:
+		return FILE_LEFLOAT;
+	case FILE_LEFLOAT:
+		return FILE_BEFLOAT;
+	case FILE_BEDOUBLE:
+		return FILE_LEDOUBLE;
+	case FILE_LEDOUBLE:
+		return FILE_BEDOUBLE;
+	default:
+		return type;
+	}
+}
 #define DO_CVT(fld, cast) \
 	if (m->num_mask) \
 		switch (m->mask_op & FILE_OPS_MASK) { \
@@ -769,11 +909,12 @@ cvt_double(union VALUETYPE *p, const struct magic *m)
  * (unless you have a better idea)
  */
 private int
-mconvert(struct magic_set *ms, struct magic *m)
+mconvert(struct magic_set *ms, struct magic *m, int flip)
 {
 	union VALUETYPE *p = &ms->ms_value;
+	uint8_t type;
 
-	switch (m->type) {
+	switch (type = cvt_flip(m->type, flip)) {
 	case FILE_BYTE:
 		cvt_8(p, m);
 		return 1;
@@ -788,6 +929,7 @@ mconvert(struct magic_set *ms, struct magic *m)
 	case FILE_QUAD:
 	case FILE_QDATE:
 	case FILE_QLDATE:
+	case FILE_QWDATE:
 		cvt_64(p, m);
 		return 1;
 	case FILE_STRING:
@@ -798,10 +940,18 @@ mconvert(struct magic_set *ms, struct magic *m)
 		return 1;
 	}
 	case FILE_PSTRING: {
-		char *ptr1 = p->s, *ptr2 = ptr1 + file_pstring_length_size(m);
+		size_t sz = file_pstring_length_size(m);
+		char *ptr1 = p->s, *ptr2 = ptr1 + sz;
 		size_t len = file_pstring_get_length(m, ptr1);
-		if (len >= sizeof(p->s))
-			len = sizeof(p->s) - 1;
+		if (len >= sizeof(p->s)) {
+			/*
+			 * The size of the pascal string length (sz)
+			 * is 1, 2, or 4. We need at least 1 byte for NUL
+			 * termination, but we've already truncated the
+			 * string by p->s, so we need to deduct sz.
+			 */ 
+			len = sizeof(p->s) - sz;
+		}
 		while (len--)
 			*ptr1++ = *ptr2++;
 		*ptr1 = '\0';
@@ -816,17 +966,20 @@ mconvert(struct magic_set *ms, struct magic *m)
 	case FILE_BELDATE:
 		p->l = (int32_t)
 		    ((p->hl[0]<<24)|(p->hl[1]<<16)|(p->hl[2]<<8)|(p->hl[3]));
-		cvt_32(p, m);
+		if (type == FILE_BELONG)
+			cvt_32(p, m);
 		return 1;
 	case FILE_BEQUAD:
 	case FILE_BEQDATE:
 	case FILE_BEQLDATE:
+	case FILE_BEQWDATE:
 		p->q = (uint64_t)
 		    (((uint64_t)p->hq[0]<<56)|((uint64_t)p->hq[1]<<48)|
 		     ((uint64_t)p->hq[2]<<40)|((uint64_t)p->hq[3]<<32)|
 		     ((uint64_t)p->hq[4]<<24)|((uint64_t)p->hq[5]<<16)|
 		     ((uint64_t)p->hq[6]<<8)|((uint64_t)p->hq[7]));
-		cvt_64(p, m);
+		if (type == FILE_BEQUAD)
+			cvt_64(p, m);
 		return 1;
 	case FILE_LESHORT:
 		p->h = (short)((p->hs[1]<<8)|(p->hs[0]));
@@ -837,24 +990,28 @@ mconvert(struct magic_set *ms, struct magic *m)
 	case FILE_LELDATE:
 		p->l = (int32_t)
 		    ((p->hl[3]<<24)|(p->hl[2]<<16)|(p->hl[1]<<8)|(p->hl[0]));
-		cvt_32(p, m);
+		if (type == FILE_LELONG)
+			cvt_32(p, m);
 		return 1;
 	case FILE_LEQUAD:
 	case FILE_LEQDATE:
 	case FILE_LEQLDATE:
+	case FILE_LEQWDATE:
 		p->q = (uint64_t)
 		    (((uint64_t)p->hq[7]<<56)|((uint64_t)p->hq[6]<<48)|
 		     ((uint64_t)p->hq[5]<<40)|((uint64_t)p->hq[4]<<32)|
 		     ((uint64_t)p->hq[3]<<24)|((uint64_t)p->hq[2]<<16)|
 		     ((uint64_t)p->hq[1]<<8)|((uint64_t)p->hq[0]));
-		cvt_64(p, m);
+		if (type == FILE_LEQUAD)
+			cvt_64(p, m);
 		return 1;
 	case FILE_MELONG:
 	case FILE_MEDATE:
 	case FILE_MELDATE:
 		p->l = (int32_t)
 		    ((p->hl[1]<<24)|(p->hl[0]<<16)|(p->hl[3]<<8)|(p->hl[2]));
-		cvt_32(p, m);
+		if (type == FILE_MELONG)
+			cvt_32(p, m);
 		return 1;
 	case FILE_FLOAT:
 		cvt_float(p, m);
@@ -889,6 +1046,9 @@ mconvert(struct magic_set *ms, struct magic *m)
 	case FILE_REGEX:
 	case FILE_SEARCH:
 	case FILE_DEFAULT:
+	case FILE_CLEAR:
+	case FILE_NAME:
+	case FILE_USE:
 		return 1;
 	default:
 		file_magerror(ms, "invalid type %d in mconvert()", m->type);
@@ -900,7 +1060,7 @@ mconvert(struct magic_set *ms, struct magic *m)
 private void
 mdebug(uint32_t offset, const char *str, size_t len)
 {
-	(void) fprintf(stderr, "mget @%d: ", offset);
+	(void) fprintf(stderr, "mget/%zu @%d: ", len, offset);
 	file_showstr(stderr, str, len);
 	(void) fputc('\n', stderr);
 	(void) fputc('\n', stderr);
@@ -908,7 +1068,7 @@ mdebug(uint32_t offset, const char *str, size_t len)
 
 private int
 mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir,
-    const unsigned char *s, uint32_t offset, size_t nbytes, size_t linecnt)
+    const unsigned char *s, uint32_t offset, size_t nbytes, struct magic *m)
 {
 	/*
 	 * Note: FILE_SEARCH and FILE_REGEX do not actually copy
@@ -928,15 +1088,29 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir,
 			const char *last;	/* end of search region */
 			const char *buf;	/* start of search region */
 			const char *end;
-			size_t lines;
+			size_t lines, linecnt, bytecnt;
 
 			if (s == NULL) {
 				ms->search.s_len = 0;
 				ms->search.s = NULL;
 				return 0;
 			}
+
+			if (m->str_flags & REGEX_LINE_COUNT) {
+				linecnt = m->str_range;
+				bytecnt = linecnt * 80;
+			} else {
+				linecnt = 0;
+				bytecnt = m->str_range;
+			}
+
+			if (bytecnt == 0)
+				bytecnt = 8192;
+			if (bytecnt > nbytes)
+				bytecnt = nbytes;
+
 			buf = RCAST(const char *, s) + offset;
-			end = last = RCAST(const char *, s) + nbytes;
+			end = last = RCAST(const char *, s) + bytecnt;
 			/* mget() guarantees buf <= last */
 			for (lines = linecnt, b = buf; lines && b < end &&
 			     ((b = CAST(const char *,
@@ -949,7 +1123,7 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir,
 					b++;
 			}
 			if (lines)
-				last = RCAST(const char *, s) + nbytes;
+				last = RCAST(const char *, s) + bytecnt;
 
 			ms->search.s = buf;
 			ms->search.s_len = last - buf;
@@ -967,12 +1141,9 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir,
 			if (type == FILE_BESTRING16)
 				src++;
 
-			/* check for pointer overflow */
-			if (src < s) {
-				file_magerror(ms, "invalid offset %u in mcopy()",
-				    offset);
-				return -1;
-			}
+			/* check that offset is within range */
+			if (offset >= nbytes)
+				break;
 			for (/*EMPTY*/; src < esrc; src += 2, dst++) {
 				if (dst < edst)
 					*dst = *src;
@@ -1017,17 +1188,30 @@ mcopy(struct magic_set *ms, union VALUETYPE *p, int type, int indir,
 }
 
 private int
-mget(struct magic_set *ms, const unsigned char *s,
-    struct magic *m, size_t nbytes, unsigned int cont_level, int text)
+mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
+    size_t nbytes, size_t o, unsigned int cont_level, int mode, int text,
+    int flip, int recursion_level, int *printed_something,
+    int *need_separator, int *returnval)
 {
-	uint32_t offset = ms->offset;
-	uint32_t count = m->str_range;
+	uint32_t soffset, offset = ms->offset;
+	uint32_t lhs;
+	int rv, oneed_separator, in_type;
+	char *sbuf, *rbuf;
 	union VALUETYPE *p = &ms->ms_value;
+	struct mlist ml;
 
-	if (mcopy(ms, p, m->type, m->flag & INDIR, s, offset, nbytes, count) == -1)
+	if (recursion_level >= 20) {
+		file_error(ms, 0, "recursion nesting exceeded");
+		return -1;
+	}
+
+	if (mcopy(ms, p, m->type, m->flag & INDIR, s, (uint32_t)(offset + o),
+	    (uint32_t)nbytes, m) == -1)
 		return -1;
 
 	if ((ms->flags & MAGIC_DEBUG) != 0) {
+		fprintf(stderr, "mget(type=%d, flag=%x, offset=%u, o=%zu, "
+		    "nbytes=%zu)\n", m->type, m->flag, offset, o, nbytes);
 		mdebug(offset, (char *)(void *)p, sizeof(union VALUETYPE));
 #ifndef COMPILE_ONLY
 		file_mdump(m);
@@ -1039,7 +1223,7 @@ mget(struct magic_set *ms, const unsigned char *s,
 		if (m->in_op & FILE_OPINDIRECT) {
 			const union VALUETYPE *q = CAST(const union VALUETYPE *,
 			    ((const void *)(s + offset + off)));
-			switch (m->in_type) {
+			switch (cvt_flip(m->in_type, flip)) {
 			case FILE_BYTE:
 				off = q->b;
 				break;
@@ -1070,10 +1254,12 @@ mget(struct magic_set *ms, const unsigned char *s,
 						 (q->hl[3]<<8)|(q->hl[2]));
 				break;
 			}
+			if ((ms->flags & MAGIC_DEBUG) != 0)
+				fprintf(stderr, "indirect offs=%u\n", off);
 		}
-		switch (m->in_type) {
+		switch (in_type = cvt_flip(m->in_type, flip)) {
 		case FILE_BYTE:
-			if (nbytes < (offset + 1))
+			if (OFFSET_OOB(nbytes, offset, 1))
 				return 0;
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
@@ -1108,111 +1294,79 @@ mget(struct magic_set *ms, const unsigned char *s,
 				offset = ~offset;
 			break;
 		case FILE_BESHORT:
-			if (nbytes < (offset + 2))
+			if (OFFSET_OOB(nbytes, offset, 2))
 				return 0;
+			lhs = (p->hs[0] << 8) | p->hs[1];
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
 				case FILE_OPAND:
-					offset = (short)((p->hs[0]<<8)|
-							 (p->hs[1])) &
-						 off;
+					offset = lhs & off;
 					break;
 				case FILE_OPOR:
-					offset = (short)((p->hs[0]<<8)|
-							 (p->hs[1])) |
-						 off;
+					offset = lhs | off;
 					break;
 				case FILE_OPXOR:
-					offset = (short)((p->hs[0]<<8)|
-							 (p->hs[1])) ^
-						 off;
+					offset = lhs ^ off;
 					break;
 				case FILE_OPADD:
-					offset = (short)((p->hs[0]<<8)|
-							 (p->hs[1])) +
-						 off;
+					offset = lhs + off;
 					break;
 				case FILE_OPMINUS:
-					offset = (short)((p->hs[0]<<8)|
-							 (p->hs[1])) -
-						 off;
+					offset = lhs - off;
 					break;
 				case FILE_OPMULTIPLY:
-					offset = (short)((p->hs[0]<<8)|
-							 (p->hs[1])) *
-						 off;
+					offset = lhs * off;
 					break;
 				case FILE_OPDIVIDE:
-					offset = (short)((p->hs[0]<<8)|
-							 (p->hs[1])) /
-						 off;
+					offset = lhs / off;
 					break;
 				case FILE_OPMODULO:
-					offset = (short)((p->hs[0]<<8)|
-							 (p->hs[1])) %
-						 off;
+					offset = lhs % off;
 					break;
 				}
 			} else
-				offset = (short)((p->hs[0]<<8)|
-						 (p->hs[1]));
+				offset = lhs;
 			if (m->in_op & FILE_OPINVERSE)
 				offset = ~offset;
 			break;
 		case FILE_LESHORT:
-			if (nbytes < (offset + 2))
+			if (OFFSET_OOB(nbytes, offset, 2))
 				return 0;
+			lhs = (p->hs[1] << 8) | p->hs[0];
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
 				case FILE_OPAND:
-					offset = (short)((p->hs[1]<<8)|
-							 (p->hs[0])) &
-						 off;
+					offset = lhs & off;
 					break;
 				case FILE_OPOR:
-					offset = (short)((p->hs[1]<<8)|
-							 (p->hs[0])) |
-						 off;
+					offset = lhs | off;
 					break;
 				case FILE_OPXOR:
-					offset = (short)((p->hs[1]<<8)|
-							 (p->hs[0])) ^
-						 off;
+					offset = lhs ^ off;
 					break;
 				case FILE_OPADD:
-					offset = (short)((p->hs[1]<<8)|
-							 (p->hs[0])) +
-						 off;
+					offset = lhs + off;
 					break;
 				case FILE_OPMINUS:
-					offset = (short)((p->hs[1]<<8)|
-							 (p->hs[0])) -
-						 off;
+					offset = lhs - off;
 					break;
 				case FILE_OPMULTIPLY:
-					offset = (short)((p->hs[1]<<8)|
-							 (p->hs[0])) *
-						 off;
+					offset = lhs * off;
 					break;
 				case FILE_OPDIVIDE:
-					offset = (short)((p->hs[1]<<8)|
-							 (p->hs[0])) /
-						 off;
+					offset = lhs / off;
 					break;
 				case FILE_OPMODULO:
-					offset = (short)((p->hs[1]<<8)|
-							 (p->hs[0])) %
-						 off;
+					offset = lhs % off;
 					break;
 				}
 			} else
-				offset = (short)((p->hs[1]<<8)|
-						 (p->hs[0]));
+				offset = lhs;
 			if (m->in_op & FILE_OPINVERSE)
 				offset = ~offset;
 			break;
 		case FILE_SHORT:
-			if (nbytes < (offset + 2))
+			if (OFFSET_OOB(nbytes, offset, 2))
 				return 0;
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
@@ -1249,218 +1403,119 @@ mget(struct magic_set *ms, const unsigned char *s,
 			break;
 		case FILE_BELONG:
 		case FILE_BEID3:
-			if (nbytes < (offset + 4))
+			if (OFFSET_OOB(nbytes, offset, 4))
 				return 0;
+			lhs = (p->hl[0] << 24) | (p->hl[1] << 16) |
+			    (p->hl[2] << 8) | p->hl[3];
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
 				case FILE_OPAND:
-					offset = (int32_t)((p->hl[0]<<24)|
-							 (p->hl[1]<<16)|
-							 (p->hl[2]<<8)|
-							 (p->hl[3])) &
-						 off;
+					offset = lhs & off;
 					break;
 				case FILE_OPOR:
-					offset = (int32_t)((p->hl[0]<<24)|
-							 (p->hl[1]<<16)|
-							 (p->hl[2]<<8)|
-							 (p->hl[3])) |
-						 off;
+					offset = lhs | off;
 					break;
 				case FILE_OPXOR:
-					offset = (int32_t)((p->hl[0]<<24)|
-							 (p->hl[1]<<16)|
-							 (p->hl[2]<<8)|
-							 (p->hl[3])) ^
-						 off;
+					offset = lhs ^ off;
 					break;
 				case FILE_OPADD:
-					offset = (int32_t)((p->hl[0]<<24)|
-							 (p->hl[1]<<16)|
-							 (p->hl[2]<<8)|
-							 (p->hl[3])) +
-						 off;
+					offset = lhs + off;
 					break;
 				case FILE_OPMINUS:
-					offset = (int32_t)((p->hl[0]<<24)|
-							 (p->hl[1]<<16)|
-							 (p->hl[2]<<8)|
-							 (p->hl[3])) -
-						 off;
+					offset = lhs - off;
 					break;
 				case FILE_OPMULTIPLY:
-					offset = (int32_t)((p->hl[0]<<24)|
-							 (p->hl[1]<<16)|
-							 (p->hl[2]<<8)|
-							 (p->hl[3])) *
-						 off;
+					offset = lhs * off;
 					break;
 				case FILE_OPDIVIDE:
-					offset = (int32_t)((p->hl[0]<<24)|
-							 (p->hl[1]<<16)|
-							 (p->hl[2]<<8)|
-							 (p->hl[3])) /
-						 off;
+					offset = lhs / off;
 					break;
 				case FILE_OPMODULO:
-					offset = (int32_t)((p->hl[0]<<24)|
-							 (p->hl[1]<<16)|
-							 (p->hl[2]<<8)|
-							 (p->hl[3])) %
-						 off;
+					offset = lhs % off;
 					break;
 				}
 			} else
-				offset = (int32_t)((p->hl[0]<<24)|
-						 (p->hl[1]<<16)|
-						 (p->hl[2]<<8)|
-						 (p->hl[3]));
+				offset = lhs;
 			if (m->in_op & FILE_OPINVERSE)
 				offset = ~offset;
 			break;
 		case FILE_LELONG:
 		case FILE_LEID3:
-			if (nbytes < (offset + 4))
+			if (OFFSET_OOB(nbytes, offset, 4))
 				return 0;
+			lhs = (p->hl[3] << 24) | (p->hl[2] << 16) |
+			    (p->hl[1] << 8) | p->hl[0];
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
 				case FILE_OPAND:
-					offset = (int32_t)((p->hl[3]<<24)|
-							 (p->hl[2]<<16)|
-							 (p->hl[1]<<8)|
-							 (p->hl[0])) &
-						 off;
+					offset = lhs & off;
 					break;
 				case FILE_OPOR:
-					offset = (int32_t)((p->hl[3]<<24)|
-							 (p->hl[2]<<16)|
-							 (p->hl[1]<<8)|
-							 (p->hl[0])) |
-						 off;
+					offset = lhs | off;
 					break;
 				case FILE_OPXOR:
-					offset = (int32_t)((p->hl[3]<<24)|
-							 (p->hl[2]<<16)|
-							 (p->hl[1]<<8)|
-							 (p->hl[0])) ^
-						 off;
+					offset = lhs ^ off;
 					break;
 				case FILE_OPADD:
-					offset = (int32_t)((p->hl[3]<<24)|
-							 (p->hl[2]<<16)|
-							 (p->hl[1]<<8)|
-							 (p->hl[0])) +
-						 off;
+					offset = lhs + off;
 					break;
 				case FILE_OPMINUS:
-					offset = (int32_t)((p->hl[3]<<24)|
-							 (p->hl[2]<<16)|
-							 (p->hl[1]<<8)|
-							 (p->hl[0])) -
-						 off;
+					offset = lhs - off;
 					break;
 				case FILE_OPMULTIPLY:
-					offset = (int32_t)((p->hl[3]<<24)|
-							 (p->hl[2]<<16)|
-							 (p->hl[1]<<8)|
-							 (p->hl[0])) *
-						 off;
+					offset = lhs * off;
 					break;
 				case FILE_OPDIVIDE:
-					offset = (int32_t)((p->hl[3]<<24)|
-							 (p->hl[2]<<16)|
-							 (p->hl[1]<<8)|
-							 (p->hl[0])) /
-						 off;
+					offset = lhs / off;
 					break;
 				case FILE_OPMODULO:
-					offset = (int32_t)((p->hl[3]<<24)|
-							 (p->hl[2]<<16)|
-							 (p->hl[1]<<8)|
-							 (p->hl[0])) %
-						 off;
+					offset = lhs % off;
 					break;
 				}
 			} else
-				offset = (int32_t)((p->hl[3]<<24)|
-						 (p->hl[2]<<16)|
-						 (p->hl[1]<<8)|
-						 (p->hl[0]));
+				offset = lhs;
 			if (m->in_op & FILE_OPINVERSE)
 				offset = ~offset;
 			break;
 		case FILE_MELONG:
-			if (nbytes < (offset + 4))
+			if (OFFSET_OOB(nbytes, offset, 4))
 				return 0;
+			lhs = (p->hl[1] << 24) | (p->hl[0] << 16) |
+			    (p->hl[3] << 8) | p->hl[2];
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
 				case FILE_OPAND:
-					offset = (int32_t)((p->hl[1]<<24)|
-							 (p->hl[0]<<16)|
-							 (p->hl[3]<<8)|
-							 (p->hl[2])) &
-						 off;
+					offset = lhs & off;
 					break;
 				case FILE_OPOR:
-					offset = (int32_t)((p->hl[1]<<24)|
-							 (p->hl[0]<<16)|
-							 (p->hl[3]<<8)|
-							 (p->hl[2])) |
-						 off;
+					offset = lhs | off;
 					break;
 				case FILE_OPXOR:
-					offset = (int32_t)((p->hl[1]<<24)|
-							 (p->hl[0]<<16)|
-							 (p->hl[3]<<8)|
-							 (p->hl[2])) ^
-						 off;
+					offset = lhs ^ off;
 					break;
 				case FILE_OPADD:
-					offset = (int32_t)((p->hl[1]<<24)|
-							 (p->hl[0]<<16)|
-							 (p->hl[3]<<8)|
-							 (p->hl[2])) +
-						 off;
+					offset = lhs + off;
 					break;
 				case FILE_OPMINUS:
-					offset = (int32_t)((p->hl[1]<<24)|
-							 (p->hl[0]<<16)|
-							 (p->hl[3]<<8)|
-							 (p->hl[2])) -
-						 off;
+					offset = lhs - off;
 					break;
 				case FILE_OPMULTIPLY:
-					offset = (int32_t)((p->hl[1]<<24)|
-							 (p->hl[0]<<16)|
-							 (p->hl[3]<<8)|
-							 (p->hl[2])) *
-						 off;
+					offset = lhs * off;
 					break;
 				case FILE_OPDIVIDE:
-					offset = (int32_t)((p->hl[1]<<24)|
-							 (p->hl[0]<<16)|
-							 (p->hl[3]<<8)|
-							 (p->hl[2])) /
-						 off;
+					offset = lhs / off;
 					break;
 				case FILE_OPMODULO:
-					offset = (int32_t)((p->hl[1]<<24)|
-							 (p->hl[0]<<16)|
-							 (p->hl[3]<<8)|
-							 (p->hl[2])) %
-						 off;
+					offset = lhs % off;
 					break;
 				}
 			} else
-				offset = (int32_t)((p->hl[1]<<24)|
-						 (p->hl[0]<<16)|
-						 (p->hl[3]<<8)|
-						 (p->hl[2]));
+				offset = lhs;
 			if (m->in_op & FILE_OPINVERSE)
 				offset = ~offset;
 			break;
 		case FILE_LONG:
-			if (nbytes < (offset + 4))
+			if (OFFSET_OOB(nbytes, offset, 4))
 				return 0;
 			if (off) {
 				switch (m->in_op & FILE_OPS_MASK) {
@@ -1494,9 +1549,11 @@ mget(struct magic_set *ms, const unsigned char *s,
 			if (m->in_op & FILE_OPINVERSE)
 				offset = ~offset;
 			break;
+		default:
+			break;
 		}
 
-		switch (m->in_type) {
+		switch (in_type) {
 		case FILE_LEID3:
 		case FILE_BEID3:
 			offset = ((((offset >>  0) & 0x7f) <<  0) |
@@ -1510,8 +1567,16 @@ mget(struct magic_set *ms, const unsigned char *s,
 
 		if (m->flag & INDIROFFADD) {
 			offset += ms->c.li[cont_level-1].off;
+			if (offset == 0) {
+				if ((ms->flags & MAGIC_DEBUG) != 0)
+					fprintf(stderr,
+					    "indirect *zero* offset\n");
+				return 0;
+			}
+			if ((ms->flags & MAGIC_DEBUG) != 0)
+				fprintf(stderr, "indirect +offs=%u\n", offset);
 		}
-		if (mcopy(ms, p, m->type, 0, s, offset, nbytes, count) == -1)
+		if (mcopy(ms, p, m->type, 0, s, offset, nbytes, m) == -1)
 			return -1;
 		ms->offset = offset;
 
@@ -1527,14 +1592,14 @@ mget(struct magic_set *ms, const unsigned char *s,
 	/* Verify we have enough data to match magic type */
 	switch (m->type) {
 	case FILE_BYTE:
-		if (nbytes < (offset + 1)) /* should alway be true */
+		if (OFFSET_OOB(nbytes, offset, 1))
 			return 0;
 		break;
 
 	case FILE_SHORT:
 	case FILE_BESHORT:
 	case FILE_LESHORT:
-		if (nbytes < (offset + 2))
+		if (OFFSET_OOB(nbytes, offset, 2))
 			return 0;
 		break;
 
@@ -1553,21 +1618,21 @@ mget(struct magic_set *ms, const unsigned char *s,
 	case FILE_FLOAT:
 	case FILE_BEFLOAT:
 	case FILE_LEFLOAT:
-		if (nbytes < (offset + 4))
+		if (OFFSET_OOB(nbytes, offset, 4))
 			return 0;
 		break;
 
 	case FILE_DOUBLE:
 	case FILE_BEDOUBLE:
 	case FILE_LEDOUBLE:
-		if (nbytes < (offset + 8))
+		if (OFFSET_OOB(nbytes, offset, 8))
 			return 0;
 		break;
 
 	case FILE_STRING:
 	case FILE_PSTRING:
 	case FILE_SEARCH:
-		if (nbytes < (offset + m->vallen))
+		if (OFFSET_OOB(nbytes, offset, m->vallen))
 			return 0;
 		break;
 
@@ -1577,19 +1642,68 @@ mget(struct magic_set *ms, const unsigned char *s,
 		break;
 
 	case FILE_INDIRECT:
-	  	if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 &&
-		    file_printf(ms, "%s", m->desc) == -1)
-			return -1;
+		if (offset == 0)
+			return 0;
 		if (nbytes < offset)
 			return 0;
-		return file_softmagic(ms, s + offset, nbytes - offset,
-		    BINTEST, text);
+		sbuf = ms->o.buf;
+		soffset = ms->offset;
+		ms->o.buf = NULL;
+		ms->offset = 0;
+		rv = file_softmagic(ms, s + offset, nbytes - offset,
+		    recursion_level, BINTEST, text);
+		if ((ms->flags & MAGIC_DEBUG) != 0)
+			fprintf(stderr, "indirect @offs=%u[%d]\n", offset, rv);
+		rbuf = ms->o.buf;
+		ms->o.buf = sbuf;
+		ms->offset = soffset;
+		if (rv == 1) {
+			if ((ms->flags & (MAGIC_MIME|MAGIC_APPLE)) == 0 &&
+			    file_printf(ms, F(ms, m, "%u"), offset) == -1) {
+				free(rbuf);
+				return -1;
+			}
+			if (file_printf(ms, "%s", rbuf) == -1) {
+				free(rbuf);
+				return -1;
+			}
+		}
+		free(rbuf);
+		return rv;
 
+	case FILE_USE:
+		if (nbytes < offset)
+			return 0;
+		sbuf = m->value.s;
+		if (*sbuf == '^') {
+			sbuf++;
+			flip = !flip;
+		}
+		if (file_magicfind(ms, sbuf, &ml) == -1) {
+			file_error(ms, 0, "cannot find entry `%s'", sbuf);
+			return -1;
+		}
+
+		oneed_separator = *need_separator;
+		if (m->flag & NOSPACE)
+			*need_separator = 0;
+		rv = match(ms, ml.magic, ml.nmagic, s, nbytes, offset + o,
+		    mode, text, flip, recursion_level, printed_something,
+		    need_separator, returnval);
+		if (rv != 1)
+		    *need_separator = oneed_separator;
+		return rv;
+
+	case FILE_NAME:
+		if (file_printf(ms, "%s", m->desc) == -1)
+			return -1;
+		return 1;
 	case FILE_DEFAULT:	/* nothing to check */
+	case FILE_CLEAR:
 	default:
 		break;
 	}
-	if (!mconvert(ms, m))
+	if (!mconvert(ms, m, flip))
 		return 0;
 	return 1;
 }
@@ -1714,6 +1828,9 @@ magiccheck(struct magic_set *ms, struct magic *m)
 	case FILE_QLDATE:
 	case FILE_BEQLDATE:
 	case FILE_LEQLDATE:
+	case FILE_QWDATE:
+	case FILE_BEQWDATE:
+	case FILE_LEQWDATE:
 		v = p->q;
 		break;
 
@@ -1744,7 +1861,6 @@ magiccheck(struct magic_set *ms, struct magic *m)
 			break;
 
 		default:
-			matched = 0;
 			file_magerror(ms, "cannot happen with float: invalid relation `%c'",
 			    m->reln);
 			return -1;
@@ -1778,13 +1894,13 @@ magiccheck(struct magic_set *ms, struct magic *m)
 			break;
 
 		default:
-			matched = 0;
 			file_magerror(ms, "cannot happen with double: invalid relation `%c'", m->reln);
 			return -1;
 		}
 		return matched;
 
 	case FILE_DEFAULT:
+	case FILE_CLEAR:
 		l = 0;
 		v = 0;
 		break;
@@ -1816,7 +1932,8 @@ magiccheck(struct magic_set *ms, struct magic *m)
 			if (slen + idx > ms->search.s_len)
 				break;
 
-			v = file_strncmp(m->value.s, ms->search.s + idx, slen, m->str_flags);
+			v = file_strncmp(m->value.s, ms->search.s + idx, slen,
+			    m->str_flags);
 			if (v == 0) {	/* found match */
 				ms->search.offset += idx;
 				break;
@@ -1826,34 +1943,33 @@ magiccheck(struct magic_set *ms, struct magic *m)
 	}
 	case FILE_REGEX: {
 		int rc;
-		regex_t rx;
-		char errmsg[512];
+		file_regex_t rx;
 
 		if (ms->search.s == NULL)
 			return 0;
 
 		l = 0;
-		rc = regcomp(&rx, m->value.s,
+		rc = file_regcomp(&rx, m->value.s,
 		    REG_EXTENDED|REG_NEWLINE|
 		    ((m->str_flags & STRING_IGNORE_CASE) ? REG_ICASE : 0));
 		if (rc) {
-			(void)regerror(rc, &rx, errmsg, sizeof(errmsg));
-			file_magerror(ms, "regex error %d, (%s)",
-			    rc, errmsg);
+			file_regerror(&rx, rc, ms);
 			v = (uint64_t)-1;
-		}
-		else {
+		} else {
 			regmatch_t pmatch[1];
+			size_t slen = ms->search.s_len;
 #ifndef REG_STARTEND
 #define	REG_STARTEND	0
-			size_t l = ms->search.s_len - 1;
-			char c = ms->search.s[l];
-			((char *)(intptr_t)ms->search.s)[l] = '\0';
+			char c;
+			if (slen != 0)
+				slen--;
+			c = ms->search.s[slen];
+			((char *)(intptr_t)ms->search.s)[slen] = '\0';
 #else
 			pmatch[0].rm_so = 0;
-			pmatch[0].rm_eo = ms->search.s_len;
+			pmatch[0].rm_eo = slen;
 #endif
-			rc = regexec(&rx, (const char *)ms->search.s,
+			rc = file_regexec(&rx, (const char *)ms->search.s,
 			    1, pmatch, REG_STARTEND);
 #if REG_STARTEND == 0
 			((char *)(intptr_t)ms->search.s)[l] = c;
@@ -1872,19 +1988,19 @@ magiccheck(struct magic_set *ms, struct magic *m)
 				break;
 
 			default:
-				(void)regerror(rc, &rx, errmsg, sizeof(errmsg));
-				file_magerror(ms, "regexec error %d, (%s)",
-				    rc, errmsg);
+				file_regerror(&rx, rc, ms);
 				v = (uint64_t)-1;
 				break;
 			}
-			regfree(&rx);
 		}
+		file_regfree(&rx);
 		if (v == (uint64_t)-1)
 			return -1;
 		break;
 	}
 	case FILE_INDIRECT:
+	case FILE_USE:
+	case FILE_NAME:
 		return 1;
 	default:
 		file_magerror(ms, "invalid type %d in magiccheck()", m->type);
@@ -1974,7 +2090,6 @@ magiccheck(struct magic_set *ms, struct magic *m)
 		break;
 
 	default:
-		matched = 0;
 		file_magerror(ms, "cannot happen: invalid relation `%c'",
 		    m->reln);
 		return -1;
diff --git a/sys/ia64/include/cpu.h b/contrib/file/src/strcasestr.c
similarity index 56%
rename from sys/ia64/include/cpu.h
rename to contrib/file/src/strcasestr.c
index 9d7a936097a8..3db407f3d8bf 100644
--- a/sys/ia64/include/cpu.h
+++ b/contrib/file/src/strcasestr.c
@@ -1,14 +1,11 @@
-/* $FreeBSD$ */
-/* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
+/*	$NetBSD: strcasestr.c,v 1.3 2005/11/29 03:12:00 christos Exp $	*/
 
 /*-
- * Copyright (c) 1988 University of Utah.
- * Copyright (c) 1982, 1990, 1993
+ * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  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.
+ * Chris Torek.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -18,7 +15,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.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -33,43 +30,55 @@
  * LIABILITY, OR TORT (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: Utah $Hdr: cpu.h 1.16 91/03/25$
- *
- *	@(#)cpu.h	8.4 (Berkeley) 1/5/94
  */
 
-#ifndef _MACHINE_CPU_H_
-#define _MACHINE_CPU_H_
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: strcasestr.c,v 1.3 2005/11/29 03:12:00 christos Exp $");
+__RCSID("$NetBSD: strncasecmp.c,v 1.2 2007/06/04 18:19:27 christos Exp $");
+#endif /* LIBC_SCCS and not lint */
 
-#include <machine/frame.h>
+#include "file.h"
 
-#define	TRAPF_PC(tf)		((tf)->tf_special.iip)
-#define	TRAPF_CPL(tf)		((tf)->tf_special.psr & IA64_PSR_CPL)
-#define	TRAPF_USERMODE(tf)	(TRAPF_CPL(tf) != IA64_PSR_CPL_KERN)
+#include <assert.h>
+#include <ctype.h>
+#include <string.h>
 
-#ifdef _KERNEL
+static int
+_strncasecmp(const char *s1, const char *s2, size_t n)
+{
+	if (n != 0) {
+		const unsigned char *us1 = (const unsigned char *)s1,
+				*us2 = (const unsigned char *)s2;
 
-#ifdef GPROF
-extern char btext[];
-extern char etext[];
-#endif
+		do {
+			if (tolower(*us1) != tolower(*us2++))
+				return tolower(*us1) - tolower(*--us2);
+			if (*us1++ == '\0')
+				break;
+		} while (--n != 0);
+	}
+	return 0;
+}
 
 /*
- * Return contents of in-cpu fast counter as a sort of "bogo-time"
- * for non-critical timing.
+ * Find the first occurrence of find in s, ignore case.
  */
-#define	get_cyclecount		ia64_get_itc
+char *
+strcasestr(const char *s, const char *find)
+{
+	char c, sc;
+	size_t len;
 
-/* Used by signaling code. */
-#define	cpu_getstack(td)	((td)->td_frame->tf_special.sp)
-#define	cpu_spinwait()		/* nothing */
-
-void	cpu_halt(void);
-void	cpu_reset(void);
-void	fork_trampoline(void);				/* MAGIC */
-void	swi_vm(void *);
-
-#endif /* _KERNEL */
-
-#endif /* _MACHINE_CPU_H_ */
+	if ((c = *find++) != 0) {
+		c = tolower((unsigned char)c);
+		len = strlen(find);
+		do {
+			do {
+				if ((sc = *s++) == 0)
+					return (NULL);
+			} while ((char)tolower((unsigned char)sc) != c);
+		} while (_strncasecmp(s, find, len) != 0);
+		s--;
+	}
+	return (char *)(intptr_t)(s);
+}
diff --git a/contrib/file/strlcat.c b/contrib/file/src/strlcat.c
similarity index 100%
rename from contrib/file/strlcat.c
rename to contrib/file/src/strlcat.c
diff --git a/contrib/file/strlcpy.c b/contrib/file/src/strlcpy.c
similarity index 100%
rename from contrib/file/strlcpy.c
rename to contrib/file/src/strlcpy.c
diff --git a/contrib/file/tar.h b/contrib/file/src/tar.h
similarity index 100%
rename from contrib/file/tar.h
rename to contrib/file/src/tar.h
diff --git a/contrib/file/vasprintf.c b/contrib/file/src/vasprintf.c
similarity index 96%
rename from contrib/file/vasprintf.c
rename to contrib/file/src/vasprintf.c
index 80bd58e71984..cc43ae3bf9b0 100644
--- a/contrib/file/vasprintf.c
+++ b/contrib/file/src/vasprintf.c
@@ -83,7 +83,7 @@ trying to do any interpretation
 flag:   none   +     -     #     (blank)
 width:  n    0n    *
 prec:   none   .0    .n     .*
-modifier:    F N L h l ll    ('F' and 'N' are ms-dos/16-bit specific)
+modifier:    F N L h l ll z t    ('F' and 'N' are ms-dos/16-bit specific)
 type:  d i o u x X f e g E G c s p n
 
 
@@ -108,7 +108,7 @@ you use strange formats.
 #include "file.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: vasprintf.c,v 1.8 2011/12/08 12:38:24 rrt Exp $")
+FILE_RCSID("@(#)$File: vasprintf.c,v 1.12 2014/05/14 23:09:21 christos Exp $")
 #endif	/* lint */
 
 #include <assert.h>
@@ -119,6 +119,9 @@ FILE_RCSID("@(#)$File: vasprintf.c,v 1.8 2011/12/08 12:38:24 rrt Exp $")
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
 
 #define ALLOC_CHUNK 2048
 #define ALLOC_SECURITY_MARGIN 1024   /* big value because some platforms have very big 'G' exponent */
@@ -385,7 +388,12 @@ static int dispatch(xprintf_struct *s)
     prec = -1;                  /* no .prec specified */
 
   /* modifier */
-  if (*SRCTXT == 'L' || *SRCTXT == 'h' || *SRCTXT == 'l') {
+  switch (*SRCTXT) {
+  case 'L':
+  case 'h':
+  case 'l':
+  case 'z':
+  case 't':
     modifier = *SRCTXT;
     SRCTXT++;
     if (modifier=='l' && *SRCTXT=='l') {
@@ -393,8 +401,11 @@ static int dispatch(xprintf_struct *s)
       modifier = 'L';  /* 'll' == 'L'      long long == long double */
     } /* only for compatibility ; not portable */
     INCOHERENT_TEST();
-  } else
+    break;
+  default:
     modifier = -1;              /* no modifier specified */
+    break;
+  }
 
   /* type */
   type = *SRCTXT;
@@ -477,6 +488,10 @@ static int dispatch(xprintf_struct *s)
       return print_it(s, (size_t)approx_width, format_string, va_arg(s->vargs, long int));
     case 'h':
       return print_it(s, (size_t)approx_width, format_string, va_arg(s->vargs, int));
+    case 'z':
+      return print_it(s, (size_t)approx_width, format_string, va_arg(s->vargs, size_t));
+    case 't':
+      return print_it(s, (size_t)approx_width, format_string, va_arg(s->vargs, ptrdiff_t));
       /* 'int' instead of 'short int' because default promotion is 'int' */
     default:
       INCOHERENT();
@@ -544,7 +559,7 @@ static int dispatch(xprintf_struct *s)
  */
 static int core(xprintf_struct *s)
 {
-  size_t len, save_len;
+  size_t save_len;
   char *dummy_base;
 
   /* basic checks */
@@ -569,8 +584,7 @@ static int core(xprintf_struct *s)
   for (;;) {
     /* up to end of source string */
     if (*(s->src_string) == 0) {
-      *(s->dest_string) = 0;    /* final 0 */
-      len = s->real_len + 1;
+      *(s->dest_string) = '\0';    /* final NUL */
       break;
     }
 
@@ -579,15 +593,13 @@ static int core(xprintf_struct *s)
 
     /* up to end of dest string */
     if (s->real_len >= s->maxlen) {
-      (s->buffer_base)[s->maxlen] = 0; /* final 0 */
-      len = s->maxlen + 1;
+      (s->buffer_base)[s->maxlen] = '\0'; /* final NUL */
       break;
     }
   }
 
   /* for (v)asnprintf */
   dummy_base = s->buffer_base;
-  save_len = 0;                 /* just to avoid a compiler warning */
 
   dummy_base = s->buffer_base + s->real_len;
   save_len = s->real_len;
@@ -624,7 +636,7 @@ int vasprintf(char **ptr, const char *format_string, va_list vargs)
 #ifdef __va_copy
   __va_copy (s.vargs, vargs);
 #else
-  memcpy (&s.vargs, vargs, sizeof (va_list));
+  memcpy (&s.vargs, &vargs, sizeof (s.va_args));
 #endif /* __va_copy */
 #endif /* va_copy */
   s.maxlen = (size_t)INT_MAX;
diff --git a/contrib/file/tests/Makefile.am b/contrib/file/tests/Makefile.am
index 0665c7b4b4fb..c2cb5eee68de 100644
--- a/contrib/file/tests/Makefile.am
+++ b/contrib/file/tests/Makefile.am
@@ -3,9 +3,14 @@ test_LDADD = $(top_builddir)/src/libmagic.la
 test_CPPFLAGS = -I$(top_srcdir)/src
 
 EXTRA_DIST = \
-	gedcom.magic gedcom.testfile gedcom.result
+escapevel.result \
+escapevel.testfile \
+gedcom.result \
+gedcom.testfile \
+issue311docx.result \
+issue311docx.testfile
 
 T = $(top_srcdir)/tests
 check-local:
 	MAGIC=$(top_builddir)/magic/magic ./test
-	for i in $T/*.testfile; do MAGIC=$T/$${i%%.testfile}.magic $(top_builddir)/tests/test $T/$$i $T/$${i%%.testfile}.result; done
+	for i in $T/*.testfile; do echo Running test: $$i; MAGIC=$(top_builddir)/magic/magic ./test $$i $${i%%.testfile}.result; done
diff --git a/contrib/file/tests/Makefile.in b/contrib/file/tests/Makefile.in
index bc428e471ea6..691692b0f88f 100644
--- a/contrib/file/tests/Makefile.in
+++ b/contrib/file/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 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.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -34,7 +78,8 @@ build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = test$(EXEEXT)
 subdir = tests
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -49,9 +94,22 @@ CONFIG_CLEAN_VPATH_FILES =
 test_SOURCES = test.c
 test_OBJECTS = test-test.$(OBJEXT)
 test_DEPENDENCIES = $(top_builddir)/src/libmagic.la
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -62,24 +120,42 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = test.c
 DIST_SOURCES = test.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -95,11 +171,13 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -109,6 +187,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -123,6 +202,7 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MINGW = @MINGW@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
@@ -150,6 +230,7 @@ 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_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -183,7 +264,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -202,7 +282,12 @@ top_srcdir = @top_srcdir@
 test_LDADD = $(top_builddir)/src/libmagic.la
 test_CPPFLAGS = -I$(top_srcdir)/src
 EXTRA_DIST = \
-	gedcom.magic gedcom.testfile gedcom.result
+escapevel.result \
+escapevel.testfile \
+gedcom.result \
+gedcom.testfile \
+issue311docx.result \
+issue311docx.testfile
 
 T = $(top_srcdir)/tests
 all: all-am
@@ -218,9 +303,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu tests/Makefile
+	  $(AUTOMAKE) --foreign tests/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -248,7 +333,8 @@ clean-checkPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) 
+
+test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) $(EXTRA_test_DEPENDENCIES) 
 	@rm -f test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_OBJECTS) $(test_LDADD) $(LIBS)
 
@@ -261,44 +347,42 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-test.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)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@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)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@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)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@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 test-test.o: test.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test-test.o -MD -MP -MF $(DEPDIR)/test-test.Tpo -c -o test-test.o `test -f 'test.c' || echo '$(srcdir)/'`test.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test-test.Tpo $(DEPDIR)/test-test.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test.c' object='test-test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test.c' object='test-test.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test-test.o `test -f 'test.c' || echo '$(srcdir)/'`test.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test-test.o `test -f 'test.c' || echo '$(srcdir)/'`test.c
 
 test-test.obj: test.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test-test.obj -MD -MP -MF $(DEPDIR)/test-test.Tpo -c -o test-test.obj `if test -f 'test.c'; then $(CYGPATH_W) 'test.c'; else $(CYGPATH_W) '$(srcdir)/test.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test-test.Tpo $(DEPDIR)/test-test.Po
-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test.c' object='test-test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test.c' object='test-test.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test-test.obj `if test -f 'test.c'; then $(CYGPATH_W) 'test.c'; else $(CYGPATH_W) '$(srcdir)/test.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test-test.obj `if test -f 'test.c'; then $(CYGPATH_W) 'test.c'; else $(CYGPATH_W) '$(srcdir)/test.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -306,26 +390,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-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
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	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; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -337,15 +410,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	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; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -354,6 +423,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -404,10 +488,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:
@@ -492,9 +581,9 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-	distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
@@ -504,11 +593,11 @@ uninstall-am:
 	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
+	tags tags-am uninstall uninstall-am
 
 check-local:
 	MAGIC=$(top_builddir)/magic/magic ./test
-	for i in $T/*.testfile; do MAGIC=$T/$${i%%.testfile}.magic $(top_builddir)/tests/test $T/$$i $T/$${i%%.testfile}.result; done
+	for i in $T/*.testfile; do echo Running test: $$i; MAGIC=$(top_builddir)/magic/magic ./test $$i $${i%%.testfile}.result; done
 
 # 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.
diff --git a/contrib/file/tests/README b/contrib/file/tests/README
index 31f9b14e02e4..5826773a9772 100644
--- a/contrib/file/tests/README
+++ b/contrib/file/tests/README
@@ -3,15 +3,12 @@ file tests
 
 This directory contains tests for file. It is highly encouraged to add
 one each time a bug is found, and each time new magic is added. Each
-test consists of three files:
+test consists of two files:
 
-  TEST.magic
   TEST.testfile
   TEST.result
 
-where TEST is the base name of the test, TEST.magic contains the magic
-used, TEST.testfile is the input, and TEST.result is the desired
-output from file.
+where TEST is the base name of the test, TEST.testfile is the input,
+and TEST.result is the desired output from file.
 
-It suffices to add a triplet of test files to the directory to have
-them included in "make check".
+To add a new test just add the test files to the directory.
diff --git a/contrib/file/tests/escapevel.result b/contrib/file/tests/escapevel.result
new file mode 100644
index 000000000000..c0a265c77afb
--- /dev/null
+++ b/contrib/file/tests/escapevel.result
@@ -0,0 +1 @@
+Zip data (MIME type "application/vnd.nz.gen.geek_central.ti5x"?)
\ No newline at end of file
diff --git a/contrib/file/tests/escapevel.testfile b/contrib/file/tests/escapevel.testfile
new file mode 100644
index 000000000000..28572603422e
Binary files /dev/null and b/contrib/file/tests/escapevel.testfile differ
diff --git a/contrib/file/tests/gedcom.magic b/contrib/file/tests/gedcom.magic
deleted file mode 100644
index 616fd56b6956..000000000000
--- a/contrib/file/tests/gedcom.magic
+++ /dev/null
@@ -1,6 +0,0 @@
-# GEDCOM Genealogy file
-
-0       string/c        0\ HEAD         GEDCOM genealogy data
->&0     search          1\ GEDC
->>&0    search          2\ VERS         version
->>>&1   string          >\0             %s
diff --git a/contrib/file/tests/gedcom.result b/contrib/file/tests/gedcom.result
index bbb0eb86c7a8..1fd81618d8fb 100644
--- a/contrib/file/tests/gedcom.result
+++ b/contrib/file/tests/gedcom.result
@@ -1 +1 @@
-GEDCOM genealogy data version 5.5
\ No newline at end of file
+GEDCOM genealogy text version 5.5, ASCII text
\ No newline at end of file
diff --git a/contrib/file/tests/issue311docx.result b/contrib/file/tests/issue311docx.result
new file mode 100644
index 000000000000..646ee85609fd
--- /dev/null
+++ b/contrib/file/tests/issue311docx.result
@@ -0,0 +1 @@
+Microsoft Word 2007+
\ No newline at end of file
diff --git a/contrib/file/tests/issue311docx.testfile b/contrib/file/tests/issue311docx.testfile
new file mode 100644
index 000000000000..e4328ec3ae9d
Binary files /dev/null and b/contrib/file/tests/issue311docx.testfile differ
diff --git a/contrib/gcc/config/arm/unwind-arm.h b/contrib/gcc/config/arm/unwind-arm.h
index 8a5c5ce35d25..ab8531d14fe7 100644
--- a/contrib/gcc/config/arm/unwind-arm.h
+++ b/contrib/gcc/config/arm/unwind-arm.h
@@ -232,7 +232,7 @@ extern "C" {
       if (!tmp)
 	return 0;
 
-#if defined(linux) || defined(__NetBSD__)
+#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__)
       /* Pc-relative indirect.  */
       tmp += ptr;
       tmp = *(_Unwind_Word *) tmp;
diff --git a/contrib/gcc/version.c b/contrib/gcc/version.c
index dd972acf127b..549b413ab6fe 100644
--- a/contrib/gcc/version.c
+++ b/contrib/gcc/version.c
@@ -18,7 +18,7 @@
    forward us bugs reported to you, if you determine that they are
    not bugs in your modifications.)  */
 
-const char bug_report_url[] = "<URL:http://www.freebsd.org/send-pr.html>";
+const char bug_report_url[] = "<URL:http://www.freebsd.org/support.html>";
 
 /* The complete version string, assembled from several pieces.
    BASEVER, DATESTAMP, and DEVPHASE are defined by the Makefile.  */
diff --git a/contrib/ipfilter/lib/printhost.c b/contrib/ipfilter/lib/printhost.c
index eaf3fda45844..009a9bb1803e 100644
--- a/contrib/ipfilter/lib/printhost.c
+++ b/contrib/ipfilter/lib/printhost.c
@@ -23,9 +23,9 @@ printhost(family, addr)
 	if ((family == -1) || !*addr)
 		PRINTF("any");
 	else {
+#ifdef  USE_INET6
 		void *ptr = addr;
 
-#ifdef  USE_INET6
 		PRINTF("%s", inet_ntop(family, ptr, ipbuf, sizeof(ipbuf)));
 #else
 		ipa.s_addr = *addr;
diff --git a/contrib/ipfilter/lib/printhostmask.c b/contrib/ipfilter/lib/printhostmask.c
index 10d90b2df96e..b1e41f9c0a87 100644
--- a/contrib/ipfilter/lib/printhostmask.c
+++ b/contrib/ipfilter/lib/printhostmask.c
@@ -25,9 +25,9 @@ printhostmask(family, addr, mask)
 	if ((family == -1) || ((!addr || !*addr) && (!mask || !*mask)))
 		PRINTF("any");
 	else {
+#ifdef  USE_INET6
 		void *ptr = addr;
 
-#ifdef  USE_INET6
 		PRINTF("%s", inet_ntop(family, ptr, ipbuf, sizeof(ipbuf)));
 #else
 		ipa.s_addr = *addr;
diff --git a/contrib/ipfilter/lib/printipfexpr.c b/contrib/ipfilter/lib/printipfexpr.c
index 64c2f1c1a7e8..06b987e07575 100644
--- a/contrib/ipfilter/lib/printipfexpr.c
+++ b/contrib/ipfilter/lib/printipfexpr.c
@@ -3,7 +3,9 @@
 static void printport __P((int *));
 static void printhosts __P((int *));
 static void printsingle __P((int *));
+#ifdef USE_INET6
 static void printhostsv6 __P((int *));
+#endif
 
 void
 printipfexpr(array)
diff --git a/contrib/ipfilter/lib/save_v1trap.c b/contrib/ipfilter/lib/save_v1trap.c
index b17f62c722ca..78671c79c768 100644
--- a/contrib/ipfilter/lib/save_v1trap.c
+++ b/contrib/ipfilter/lib/save_v1trap.c
@@ -178,7 +178,7 @@ snmpv1_parse(char **strings)
 		if (ctx->fd >= 0) {
 			ctx->sin.sin_family = AF_INET;
 			ctx->sin.sin_port = htons(162);
-			if (connect(ctx->fd, &ctx->sin,
+			if (connect(ctx->fd, (struct sockaddr *)&ctx->sin,
 				    sizeof(ctx->sin)) != 0) {
 					snmpv1_destroy(ctx);
 					return NULL;
diff --git a/contrib/ipfilter/lib/save_v2trap.c b/contrib/ipfilter/lib/save_v2trap.c
index 24349bb40581..78e76f6646fa 100644
--- a/contrib/ipfilter/lib/save_v2trap.c
+++ b/contrib/ipfilter/lib/save_v2trap.c
@@ -181,7 +181,7 @@ snmpv2_parse(char **strings)
 		if (ctx->fd >= 0) {
 			ctx->sin.sin_family = AF_INET;
 			ctx->sin.sin_port = htons(162);
-			if (connect(ctx->fd, &ctx->sin,
+			if (connect(ctx->fd, (struct sockaddr *)&ctx->sin,
 				    sizeof(ctx->sin)) != 0) {
 					snmpv2_destroy(ctx);
 					return NULL;
diff --git a/contrib/libc++/include/list b/contrib/libc++/include/list
index 800a1a3f5aa8..7ccc778c9436 100644
--- a/contrib/libc++/include/list
+++ b/contrib/libc++/include/list
@@ -2046,6 +2046,8 @@ list<_Tp, _Alloc>::remove(const value_type& __x)
             for (; __j != __e && *__j == __x; ++__j)
                 ;
             __i = erase(__i, __j);
+            if (__i != __e)
+                __i = _VSTD::next(__i);
         }
         else
             ++__i;
@@ -2065,6 +2067,8 @@ list<_Tp, _Alloc>::remove_if(_Pred __pred)
             for (; __j != __e && __pred(*__j); ++__j)
                 ;
             __i = erase(__i, __j);
+            if (__i != __e)
+                __i = _VSTD::next(__i);
         }
         else
             ++__i;
diff --git a/contrib/libstdc++/libsupc++/unwind-cxx.h b/contrib/libstdc++/libsupc++/unwind-cxx.h
index 7eb150e059bb..2ccd11e633f2 100644
--- a/contrib/libstdc++/libsupc++/unwind-cxx.h
+++ b/contrib/libstdc++/libsupc++/unwind-cxx.h
@@ -142,9 +142,9 @@ typedef enum {
   ctm_succeeded = 1,
   ctm_succeeded_with_ptr_to_base = 2
 } __cxa_type_match_result;
-extern "C" bool __cxa_type_match(_Unwind_Exception*, const std::type_info*,
+extern "C" __cxa_type_match_result __cxa_type_match(_Unwind_Exception*, const std::type_info*,
 				 bool, void**);
-extern "C" void __cxa_begin_cleanup (_Unwind_Exception*);
+extern "C" bool __cxa_begin_cleanup (_Unwind_Exception*);
 extern "C" void __cxa_end_cleanup (void);
 #endif
 
diff --git a/contrib/libucl/ChangeLog.md b/contrib/libucl/ChangeLog.md
new file mode 100644
index 000000000000..09c331f4c6d1
--- /dev/null
+++ b/contrib/libucl/ChangeLog.md
@@ -0,0 +1,6 @@
+# Version history
+
+## Libucl 0.5
+
+- Streamline emitter has been added, so it is now possible to output partial `ucl` objects
+- Emitter now is more flexible due to emitter_context structure
diff --git a/contrib/libucl/configure.ac b/contrib/libucl/configure.ac
index de78e8b183aa..2d612f6236e8 100644
--- a/contrib/libucl/configure.ac
+++ b/contrib/libucl/configure.ac
@@ -1,7 +1,7 @@
 m4_define([maj_ver], [0])
-m4_define([med_ver], [4])
-m4_define([min_ver], [1])
-m4_define([so_version], [1:0:0])
+m4_define([med_ver], [5])
+m4_define([min_ver], [0])
+m4_define([so_version], [2:0:0])
 m4_define([ucl_version], [maj_ver.med_ver.min_ver])
 
 AC_INIT([libucl],[ucl_version],[https://github.com/vstakhov/libucl],[libucl])
diff --git a/contrib/libucl/doc/api.md b/contrib/libucl/doc/api.md
index 41e660a428ea..174c7ff47060 100644
--- a/contrib/libucl/doc/api.md
+++ b/contrib/libucl/doc/api.md
@@ -52,15 +52,15 @@ Used to parse `ucl` files and provide interface to extract `ucl` object. Current
 ### Emitting functions
 Convert `ucl` objects to some textual or binary representation. Currently, libucl supports the following exports:
 
-- `JSON` - valid json format (can possibly loose some original data, such as implicit arrays)
-- `Config` - human-readable configuration format (losseless)
+- `JSON` - valid json format (can possibly lose some original data, such as implicit arrays)
+- `Config` - human-readable configuration format (lossless)
 - `YAML` - embedded yaml format (has the same limitations as `json` output)
 
 ### Conversion functions
 Help to convert `ucl` objects to C types. These functions are used to convert `ucl_object_t` to C primitive types, such as numbers, strings or boolean values.
 
 ### Generation functions
-Allow creating of `ucl` objects from C types and creating of complex `ucl` objects, such as hashes or arrays from primitive `ucl` objects, such as numbers or strings.
+Allow creation of `ucl` objects from C types and creating of complex `ucl` objects, such as hashes or arrays from primitive `ucl` objects, such as numbers or strings.
 
 ### Iteration functions
 Iterate over `ucl` complex objects or over a chain of values, for example when a key in an object has multiple values (that can be treated as implicit array or implicit consolidation).
@@ -148,7 +148,7 @@ bool ucl_parser_add_file (struct ucl_parser *parser,
     const char *filename);
 ~~~
 
-Load file `filename` and parse it with the specified `parser`. This function uses `mmap` call to load file, therefore, it should not be `shrinked` during parsing. Otherwise, `libucl` can cause memory corruption and terminate the calling application. This function is also used by the internal handler of `include` macro, hence, this macro has the same limitation.
+Load file `filename` and parse it with the specified `parser`. This function uses `mmap` call to load file, therefore, it should not be `shrunk` during parsing. Otherwise, `libucl` can cause memory corruption and terminate the calling application. This function is also used by the internal handler of `include` macro, hence, this macro has the same limitation.
 
 ### ucl_parser_get_object
 
@@ -225,7 +225,7 @@ ucl_parser_add_chunk (parser, inbuf, r);
 fclose (in);
 
 if (ucl_parser_get_error (parser)) {
-	printf ("Error occured: %s\n", ucl_parser_get_error (parser));
+	printf ("Error occurred: %s\n", ucl_parser_get_error (parser));
 	ret = 1;
 }
 else {
@@ -251,7 +251,7 @@ Libucl can transform UCL objects to a number of tectual formats:
 - compact yaml: `UCL_EMIT_YAML` - compact YAML output
 
 Moreover, libucl API allows to select a custom set of emitting functions allowing 
-efficent and zero-copy output of libucl objects. Libucl uses the following structure to support this feature:
+efficient and zero-copy output of libucl objects. Libucl uses the following structure to support this feature:
 
 ~~~C
 struct ucl_emitter_functions {
@@ -298,12 +298,12 @@ This function is similar to the previous with the exception that it accepts the
 
 # Conversion functions
 
-Conversion functions are used to convert UCL objects to primitive types, such as strings, numbers or boolean values. There are two types of conversion functions:
+Conversion functions are used to convert UCL objects to primitive types, such as strings, numbers, or boolean values. There are two types of conversion functions:
 
 - safe: try to convert an ucl object to a primitive type and fail if such a conversion is not possible
 - unsafe: return primitive type without additional checks, if the object cannot be converted then some reasonable default is returned (NULL for strings and 0 for numbers)
 
-Also there is a single `ucl_object_tostring_forced` function that converts any UCL object (including compound types - arrays and objects) to a string representation. For compound and numeric types this function performs emitting to a compact json format actually.
+Also there is a single `ucl_object_tostring_forced` function that converts any UCL object (including compound types - arrays and objects) to a string representation. For objects, arrays, booleans and numeric types this function performs emitting to a compact json format actually.
 
 Here is a list of all conversion functions:
 
@@ -311,14 +311,14 @@ Here is a list of all conversion functions:
 - `ucl_object_todouble` - returns `double` of UCL object
 - `ucl_object_toboolean` - returns `bool` of UCL object
 - `ucl_object_tostring` - returns `const char *` of UCL object (this string is NULL terminated)
-- `ucl_object_tolstring` - returns `const char *` and `size_t` len of UCL object (string can be not NULL terminated)
+- `ucl_object_tolstring` - returns `const char *` and `size_t` len of UCL object (string does not need to be NULL terminated)
 - `ucl_object_tostring_forced` - returns string representation of any UCL object
 
 Strings returned by these pointers are associated with the UCL object and exist over its lifetime. A caller should not free this memory.
 
 # Generation functions
 
-It is possible to generate UCL objects from C primitive types. Moreover, libucl permits to create and modify complex UCL objects, such as arrays or associative objects. 
+It is possible to generate UCL objects from C primitive types. Moreover, libucl allows creation and modifying complex UCL objects, such as arrays or associative objects. 
 
 ## ucl_object_new
 ~~~C
@@ -350,8 +350,8 @@ Libucl provides the functions similar to inverse conversion functions called wit
 - `ucl_object_fromint` - converts `int64_t` to UCL object
 - `ucl_object_fromdouble` - converts `double` to UCL object
 - `ucl_object_fromboolean` - converts `bool` to UCL object
-- `ucl_object_fromstring` - converts `const char *` to UCL object (this string is NULL terminated)
-- `ucl_object_fromlstring` - converts `const char *` and `size_t` len to UCL object (string can be not NULL terminated)
+- `ucl_object_fromstring` - converts `const char *` to UCL object (this string should be NULL terminated)
+- `ucl_object_fromlstring` - converts `const char *` and `size_t` len to UCL object (string does not need to be NULL terminated)
 
 Also there is a function to generate UCL object from a string performing various parsing or conversion operations called `ucl_object_fromstring_common`.
 
@@ -361,7 +361,7 @@ ucl_object_t * ucl_object_fromstring_common (const char *str,
 	size_t len, enum ucl_string_flags flags)
 ~~~
 
-This function is used to convert a string `str` of size `len` to an UCL objects applying `flags` conversions. If `len` is equal to zero then a `str` is assumed as NULL-terminated. This function supports the following flags (a set of flags can be specified using logical `OR` operation):
+This function is used to convert a string `str` of size `len` to a UCL object applying `flags` conversions. If `len` is equal to zero then a `str` is assumed as NULL-terminated. This function supports the following flags (a set of flags can be specified using logical `OR` operation):
 
 - `UCL_STRING_ESCAPE` - perform JSON escape
 - `UCL_STRING_TRIM` - trim leading and trailing whitespaces
@@ -385,7 +385,7 @@ const ucl_object_t* ucl_iterate_object (const ucl_object_t *obj,
 	ucl_object_iter_t *iter, bool expand_values);
 ~~~
 
-This function accept opaque iterator pointer `iter`. In the first call this iterator *must* be initialized to `NULL`. Iterator is changed by this function call. `ucl_iterate_object` returns the next UCL object in the compound object `obj` or `NULL` if all objects have been iterated. The reference count of the object returned is not increased, so a caller should not unref the object or modify its content (e.g. by inserting to another compound object). The object `obj` should not be changed during the iteration process as well. `expand_values` flag speicifies whether `ucl_iterate_object` should expand keys with multiple values. The general rule is that if you need to iterate throught the *object* or *explicit array*, then you always need to set this flag to `true`. However, if you get some key in the object and want to extract all its values then you should set `expand_values` to `false`. Mixing of iteration types are not permitted since the iterator is set according to the iteration type and cannot be reused. Here is an example of iteration over the objects using libucl API (assuming that `top` is `UCL_OBJECT` in this example):
+This function accepts opaque iterator pointer `iter`. In the first call this iterator *must* be initialized to `NULL`. Iterator is changed by this function call. `ucl_iterate_object` returns the next UCL object in the compound object `obj` or `NULL` if all objects have been iterated. The reference count of the object returned is not increased, so a caller should not unref the object or modify its content (e.g. by inserting to another compound object). The object `obj` should not be changed during the iteration process as well. `expand_values` flag speicifies whether `ucl_iterate_object` should expand keys with multiple values. The general rule is that if you need to iterate through the *object* or *explicit array*, then you always need to set this flag to `true`. However, if you get some key in the object and want to extract all its values then you should set `expand_values` to `false`. Mixing of iteration types is not permitted since the iterator is set according to the iteration type and cannot be reused. Here is an example of iteration over the objects using libucl API (assuming that `top` is `UCL_OBJECT` in this example):
 
 ~~~C
 ucl_object_iter_t it = NULL, it_obj = NULL;
@@ -412,13 +412,13 @@ bool ucl_object_validate (const ucl_object_t *schema,
 	const ucl_object_t *obj, struct ucl_schema_error *err);
 ~~~
 
-This function uses ucl object `schema`, that must be valid in terms of `json-schema` draft v4, to validate input object `obj`. If this function returns `true` then validation procedure has been succeed. Otherwise, `false` is returned and `err` is set to a specific value. If caller set `err` to NULL then this function does not set any error just returning `false`. Error is the structure defined as following:
+This function uses ucl object `schema`, that must be valid in terms of `json-schema` draft v4, to validate input object `obj`. If this function returns `true` then validation procedure has been succeed. Otherwise, `false` is returned and `err` is set to a specific value. If a caller sets `err` to NULL then this function does not set any error just returning `false`. Error is the structure defined as following:
 
 ~~~C
 struct ucl_schema_error {
 	enum ucl_schema_error_code code;	/* error code */
 	char msg[128];				/* error message */
-	ucl_object_t *obj;			/* object where error occured */
+	ucl_object_t *obj;			/* object where error occurred */
 };
 ~~~
 
@@ -436,4 +436,4 @@ enum ucl_schema_error_code {
 };
 ~~~
 
-`msg` is a stiring description of an error and `obj` is an object where error has been occurred. Error object is not allocated by libucl, so there is no need to free it after validation (a static object should thus be used).
\ No newline at end of file
+`msg` is a string description of an error and `obj` is an object where error has occurred. Error object is not allocated by libucl, so there is no need to free it after validation (a static object should thus be used).
diff --git a/contrib/libucl/doc/libucl.3 b/contrib/libucl/doc/libucl.3
index a185d1a56675..e319a0d3f932 100644
--- a/contrib/libucl/doc/libucl.3
+++ b/contrib/libucl/doc/libucl.3
@@ -1,4 +1,4 @@
-.TH LIBUCL 5 "March 20, 2014" "Libucl manual"
+.TH "LIBUCL" "3" "July 26, 2014" "Libucl manual" ""
 .SH NAME
 .PP
 \f[B]ucl_parser_new\f[], \f[B]ucl_parser_register_macro\f[],
@@ -32,10 +32,10 @@ In future, this limitation can be removed.
 Convert \f[C]ucl\f[] objects to some textual or binary representation.
 Currently, libucl supports the following exports:
 .IP \[bu] 2
-\f[C]JSON\f[] \- valid json format (can possibly loose some original
+\f[C]JSON\f[] \- valid json format (can possibly lose some original
 data, such as implicit arrays)
 .IP \[bu] 2
-\f[C]Config\f[] \- human\-readable configuration format (losseless)
+\f[C]Config\f[] \- human\-readable configuration format (lossless)
 .IP \[bu] 2
 \f[C]YAML\f[] \- embedded yaml format (has the same limitations as
 \f[C]json\f[] output)
@@ -46,7 +46,7 @@ These functions are used to convert \f[C]ucl_object_t\f[] to C primitive
 types, such as numbers, strings or boolean values.
 .SS Generation functions
 .PP
-Allow creating of \f[C]ucl\f[] objects from C types and creating of
+Allow creation of \f[C]ucl\f[] objects from C types and creating of
 complex \f[C]ucl\f[] objects, such as hashes or arrays from primitive
 \f[C]ucl\f[] objects, such as numbers or strings.
 .SS Iteration functions
@@ -175,7 +175,7 @@ bool\ ucl_parser_add_file\ (struct\ ucl_parser\ *parser,\
 Load file \f[C]filename\f[] and parse it with the specified
 \f[C]parser\f[].
 This function uses \f[C]mmap\f[] call to load file, therefore, it should
-not be \f[C]shrinked\f[] during parsing.
+not be \f[C]shrunk\f[] during parsing.
 Otherwise, \f[C]libucl\f[] can cause memory corruption and terminate the
 calling application.
 This function is also used by the internal handler of \f[C]include\f[]
@@ -290,7 +290,7 @@ ucl_parser_add_chunk\ (parser,\ inbuf,\ r);
 fclose\ (in);
 
 if\ (ucl_parser_get_error\ (parser))\ {
-\ \ \ \ printf\ ("Error\ occured:\ %s\\n",\ ucl_parser_get_error\ (parser));
+\ \ \ \ printf\ ("Error\ occurred:\ %s\\n",\ ucl_parser_get_error\ (parser));
 \ \ \ \ ret\ =\ 1;
 }
 else\ {
@@ -323,7 +323,7 @@ newlines and spaces
 compact yaml: \f[C]UCL_EMIT_YAML\f[] \- compact YAML output
 .PP
 Moreover, libucl API allows to select a custom set of emitting functions
-allowing efficent and zero\-copy output of libucl objects.
+allowing efficient and zero\-copy output of libucl objects.
 Libucl uses the following structure to support this feature:
 .IP
 .nf
@@ -390,7 +390,7 @@ emitters (including C++ ones, for example).
 .SH CONVERSION FUNCTIONS
 .PP
 Conversion functions are used to convert UCL objects to primitive types,
-such as strings, numbers or boolean values.
+such as strings, numbers, or boolean values.
 There are two types of conversion functions:
 .IP \[bu] 2
 safe: try to convert an ucl object to a primitive type and fail if such
@@ -403,8 +403,8 @@ strings and 0 for numbers)
 Also there is a single \f[C]ucl_object_tostring_forced\f[] function that
 converts any UCL object (including compound types \- arrays and objects)
 to a string representation.
-For compound and numeric types this function performs emitting to a
-compact json format actually.
+For objects, arrays, booleans and numeric types this function performs
+emitting to a compact json format actually.
 .PP
 Here is a list of all conversion functions:
 .IP \[bu] 2
@@ -418,7 +418,8 @@ Here is a list of all conversion functions:
 object (this string is NULL terminated)
 .IP \[bu] 2
 \f[C]ucl_object_tolstring\f[] \- returns \f[C]const\ char\ *\f[] and
-\f[C]size_t\f[] len of UCL object (string can be not NULL terminated)
+\f[C]size_t\f[] len of UCL object (string does not need to be NULL
+terminated)
 .IP \[bu] 2
 \f[C]ucl_object_tostring_forced\f[] \- returns string representation of
 any UCL object
@@ -429,7 +430,7 @@ A caller should not free this memory.
 .SH GENERATION FUNCTIONS
 .PP
 It is possible to generate UCL objects from C primitive types.
-Moreover, libucl permits to create and modify complex UCL objects, such
+Moreover, libucl allows creation and modifying complex UCL objects, such
 as arrays or associative objects.
 .SS ucl_object_new
 .IP
@@ -467,10 +468,10 @@ converts \f[C]int64_t\f[] to UCL object \-
 \f[C]ucl_object_fromdouble\f[] \- converts \f[C]double\f[] to UCL object
 \- \f[C]ucl_object_fromboolean\f[] \- converts \f[C]bool\f[] to UCL
 object \- \f[C]ucl_object_fromstring\f[] \- converts
-\f[C]const\ char\ *\f[] to UCL object (this string is NULL terminated)
-\- \f[C]ucl_object_fromlstring\f[] \- converts \f[C]const\ char\ *\f[]
-and \f[C]size_t\f[] len to UCL object (string can be not NULL
-terminated)
+\f[C]const\ char\ *\f[] to UCL object (this string should be NULL
+terminated) \- \f[C]ucl_object_fromlstring\f[] \- converts
+\f[C]const\ char\ *\f[] and \f[C]size_t\f[] len to UCL object (string
+does not need to be NULL terminated)
 .PP
 Also there is a function to generate UCL object from a string performing
 various parsing or conversion operations called
@@ -485,7 +486,7 @@ ucl_object_t\ *\ ucl_object_fromstring_common\ (const\ char\ *str,\
 .fi
 .PP
 This function is used to convert a string \f[C]str\f[] of size
-\f[C]len\f[] to an UCL objects applying \f[C]flags\f[] conversions.
+\f[C]len\f[] to a UCL object applying \f[C]flags\f[] conversions.
 If \f[C]len\f[] is equal to zero then a \f[C]str\f[] is assumed as
 NULL\-terminated.
 This function supports the following flags (a set of flags can be
@@ -538,7 +539,7 @@ const\ ucl_object_t*\ ucl_iterate_object\ (const\ ucl_object_t\ *obj,\
 \f[]
 .fi
 .PP
-This function accept opaque iterator pointer \f[C]iter\f[].
+This function accepts opaque iterator pointer \f[C]iter\f[].
 In the first call this iterator \f[I]must\f[] be initialized to
 \f[C]NULL\f[].
 Iterator is changed by this function call.
@@ -551,12 +552,12 @@ The object \f[C]obj\f[] should not be changed during the iteration
 process as well.
 \f[C]expand_values\f[] flag speicifies whether
 \f[C]ucl_iterate_object\f[] should expand keys with multiple values.
-The general rule is that if you need to iterate throught the
+The general rule is that if you need to iterate through the
 \f[I]object\f[] or \f[I]explicit array\f[], then you always need to set
 this flag to \f[C]true\f[].
 However, if you get some key in the object and want to extract all its
 values then you should set \f[C]expand_values\f[] to \f[C]false\f[].
-Mixing of iteration types are not permitted since the iterator is set
+Mixing of iteration types is not permitted since the iterator is set
 according to the iteration type and cannot be reused.
 Here is an example of iteration over the objects using libucl API
 (assuming that \f[C]top\f[] is \f[C]UCL_OBJECT\f[] in this example):
@@ -599,8 +600,8 @@ If this function returns \f[C]true\f[] then validation procedure has
 been succeed.
 Otherwise, \f[C]false\f[] is returned and \f[C]err\f[] is set to a
 specific value.
-If caller set \f[C]err\f[] to NULL then this function does not set any
-error just returning \f[C]false\f[].
+If a caller sets \f[C]err\f[] to NULL then this function does not set
+any error just returning \f[C]false\f[].
 Error is the structure defined as following:
 .IP
 .nf
@@ -608,7 +609,7 @@ Error is the structure defined as following:
 struct\ ucl_schema_error\ {
 \ \ \ \ enum\ ucl_schema_error_code\ code;\ \ \ \ /*\ error\ code\ */
 \ \ \ \ char\ msg[128];\ \ \ \ \ \ \ \ \ \ \ \ \ \ /*\ error\ message\ */
-\ \ \ \ ucl_object_t\ *obj;\ \ \ \ \ \ \ \ \ \ /*\ object\ where\ error\ occured\ */
+\ \ \ \ ucl_object_t\ *obj;\ \ \ \ \ \ \ \ \ \ /*\ object\ where\ error\ occurred\ */
 };
 \f[]
 .fi
@@ -629,8 +630,8 @@ enum\ ucl_schema_error_code\ {
 \f[]
 .fi
 .PP
-\f[C]msg\f[] is a stiring description of an error and \f[C]obj\f[] is an
-object where error has been occurred.
+\f[C]msg\f[] is a string description of an error and \f[C]obj\f[] is an
+object where error has occurred.
 Error object is not allocated by libucl, so there is no need to free it
 after validation (a static object should thus be used).
 .SH AUTHORS
diff --git a/contrib/libucl/doc/pandoc.template b/contrib/libucl/doc/pandoc.template
index e29e20c287b7..6d5f0277ae40 100644
--- a/contrib/libucl/doc/pandoc.template
+++ b/contrib/libucl/doc/pandoc.template
@@ -1,6 +1,6 @@
-% LIBUCL(5) Libucl manual
+% LIBUCL(3) Libucl manual
 % Vsevolod Stakhov <vsevolod@highsecure.ru>
-% March 20, 2014
+% July 26, 2014
 
 # Name
 
diff --git a/contrib/libucl/include/ucl.h b/contrib/libucl/include/ucl.h
index 3eeea9a7df0e..b40f11322508 100644
--- a/contrib/libucl/include/ucl.h
+++ b/contrib/libucl/include/ucl.h
@@ -786,6 +786,7 @@ UCL_EXTERN bool ucl_parser_set_filevars (struct ucl_parser *parser, const char *
  * @{
  */
 
+struct ucl_emitter_context;
 /**
  * Structure using for emitter callbacks
  */
@@ -798,10 +799,49 @@ struct ucl_emitter_functions {
 	int (*ucl_emitter_append_int) (int64_t elt, void *ud);
 	/** Append floating point element */
 	int (*ucl_emitter_append_double) (double elt, void *ud);
+	/** Free userdata */
+	void (*ucl_emitter_free_func)(void *ud);
 	/** Opaque userdata pointer */
 	void *ud;
 };
 
+struct ucl_emitter_operations {
+	/** Write a primitive element */
+	void (*ucl_emitter_write_elt) (struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj, bool first, bool print_key);
+	/** Start ucl object */
+	void (*ucl_emitter_start_object) (struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj, bool print_key);
+	/** End ucl object */
+	void (*ucl_emitter_end_object) (struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj);
+	/** Start ucl array */
+	void (*ucl_emitter_start_array) (struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj, bool print_key);
+	void (*ucl_emitter_end_array) (struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj);
+};
+
+/**
+ * Structure that defines emitter functions
+ */
+struct ucl_emitter_context {
+	/** Name of emitter (e.g. json, compact_json) */
+	const char *name;
+	/** Unique id (e.g. UCL_EMIT_JSON for standard emitters */
+	int id;
+	/** A set of output functions */
+	const struct ucl_emitter_functions *func;
+	/** A set of output operations */
+	const struct ucl_emitter_operations *ops;
+	/** Current amount of indent tabs */
+	unsigned int ident;
+	/** Top level object */
+	const ucl_object_t *top;
+	/** The rest of context */
+	unsigned char data[1];
+};
+
 /**
  * Emit object to a string
  * @param obj object
@@ -817,11 +857,81 @@ UCL_EXTERN unsigned char *ucl_object_emit (const ucl_object_t *obj,
  * @param obj object
  * @param emit_type if type is #UCL_EMIT_JSON then emit json, if type is
  * #UCL_EMIT_CONFIG then emit config like object
+ * @param emitter a set of emitter functions
  * @return dump of an object (must be freed after using) or NULL in case of error
  */
 UCL_EXTERN bool ucl_object_emit_full (const ucl_object_t *obj,
 		enum ucl_emitter emit_type,
 		struct ucl_emitter_functions *emitter);
+
+/**
+ * Start streamlined UCL object emitter
+ * @param obj top UCL object
+ * @param emit_type emit type
+ * @param emitter a set of emitter functions
+ * @return new streamlined context that should be freed by
+ * `ucl_object_emit_streamline_finish`
+ */
+UCL_EXTERN struct ucl_emitter_context* ucl_object_emit_streamline_new (
+		const ucl_object_t *obj, enum ucl_emitter emit_type,
+		struct ucl_emitter_functions *emitter);
+
+/**
+ * Start object or array container for the streamlined output
+ * @param ctx streamlined context
+ * @param obj container object
+ */
+UCL_EXTERN void ucl_object_emit_streamline_start_container (
+		struct ucl_emitter_context *ctx, const ucl_object_t *obj);
+/**
+ * Add a complete UCL object to streamlined output
+ * @param ctx streamlined context
+ * @param obj object to output
+ */
+UCL_EXTERN void ucl_object_emit_streamline_add_object (
+		struct ucl_emitter_context *ctx, const ucl_object_t *obj);
+/**
+ * End previously added container
+ * @param ctx streamlined context
+ */
+UCL_EXTERN void ucl_object_emit_streamline_end_container (
+		struct ucl_emitter_context *ctx);
+/**
+ * Terminate streamlined container finishing all containers in it
+ * @param ctx streamlined context
+ */
+UCL_EXTERN void ucl_object_emit_streamline_finish (
+		struct ucl_emitter_context *ctx);
+
+/**
+ * Returns functions to emit object to memory
+ * @param pmem target pointer (should be freed by caller)
+ * @return emitter functions structure
+ */
+UCL_EXTERN struct ucl_emitter_functions* ucl_object_emit_memory_funcs (
+		void **pmem);
+
+/**
+ * Returns functions to emit object to FILE *
+ * @param fp FILE * object
+ * @return emitter functions structure
+ */
+UCL_EXTERN struct ucl_emitter_functions* ucl_object_emit_file_funcs (
+		FILE *fp);
+/**
+ * Returns functions to emit object to a file descriptor
+ * @param fd file descriptor
+ * @return emitter functions structure
+ */
+UCL_EXTERN struct ucl_emitter_functions* ucl_object_emit_fd_funcs (
+		int fd);
+
+/**
+ * Free emitter functions
+ * @param f pointer to functions
+ */
+UCL_EXTERN void ucl_object_emit_funcs_free (struct ucl_emitter_functions *f);
+
 /** @} */
 
 /**
diff --git a/contrib/libucl/src/Makefile.am b/contrib/libucl/src/Makefile.am
index 76391cd044f0..417d34e161ca 100644
--- a/contrib/libucl/src/Makefile.am
+++ b/contrib/libucl/src/Makefile.am
@@ -4,6 +4,8 @@ libucl_common_cflags=	-I$(top_srcdir)/src \
 			-Wall -W -Wno-unused-parameter -Wno-pointer-sign
 lib_LTLIBRARIES=	libucl.la
 libucl_la_SOURCES=	ucl_emitter.c \
+					ucl_emitter_streamline.c \
+					ucl_emitter_utils.c \
 					ucl_hash.c \
 					ucl_parser.c \
 					ucl_schema.c \
diff --git a/contrib/libucl/src/ucl_emitter.c b/contrib/libucl/src/ucl_emitter.c
index 04c3d4b13232..11fe50c00602 100644
--- a/contrib/libucl/src/ucl_emitter.c
+++ b/contrib/libucl/src/ucl_emitter.c
@@ -36,38 +36,55 @@
 #endif
 
 /**
- * @file rcl_emitter.c
+ * @file ucl_emitter.c
  * Serialise UCL object to various of output formats
  */
 
+static void ucl_emitter_common_elt (struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj, bool first, bool print_key, bool compact);
+
+#define UCL_EMIT_TYPE_OPS(type)		\
+	static void ucl_emit_ ## type ## _elt (struct ucl_emitter_context *ctx,	\
+		const ucl_object_t *obj, bool first, bool print_key);	\
+	static void ucl_emit_ ## type ## _start_obj (struct ucl_emitter_context *ctx,	\
+		const ucl_object_t *obj, bool print_key);	\
+	static void ucl_emit_ ## type## _start_array (struct ucl_emitter_context *ctx,	\
+		const ucl_object_t *obj, bool print_key);	\
+	static void ucl_emit_ ##type## _end_object (struct ucl_emitter_context *ctx,	\
+		const ucl_object_t *obj);	\
+	static void ucl_emit_ ##type## _end_array (struct ucl_emitter_context *ctx,	\
+		const ucl_object_t *obj)
+
+/*
+ * JSON format operations
+ */
+UCL_EMIT_TYPE_OPS(json);
+UCL_EMIT_TYPE_OPS(json_compact);
+UCL_EMIT_TYPE_OPS(config);
+UCL_EMIT_TYPE_OPS(yaml);
+
+#define UCL_EMIT_TYPE_CONTENT(type) {	\
+	.ucl_emitter_write_elt = ucl_emit_ ## type ## _elt,	\
+	.ucl_emitter_start_object = ucl_emit_ ## type ##_start_obj,	\
+	.ucl_emitter_start_array = ucl_emit_ ## type ##_start_array,	\
+	.ucl_emitter_end_object = ucl_emit_ ## type ##_end_object,	\
+	.ucl_emitter_end_array = ucl_emit_ ## type ##_end_array	\
+}
+
+
+const struct ucl_emitter_operations ucl_standartd_emitter_ops[] = {
+	[UCL_EMIT_JSON] = UCL_EMIT_TYPE_CONTENT(json),
+	[UCL_EMIT_JSON_COMPACT] = UCL_EMIT_TYPE_CONTENT(json_compact),
+	[UCL_EMIT_CONFIG] = UCL_EMIT_TYPE_CONTENT(config),
+	[UCL_EMIT_YAML] = UCL_EMIT_TYPE_CONTENT(yaml)
+};
+
+/*
+ * Utility to check whether we need a top object
+ */
+#define UCL_EMIT_IDENT_TOP_OBJ(ctx, obj) ((ctx)->top != (obj) || \
+		((ctx)->id == UCL_EMIT_JSON_COMPACT || (ctx)->id == UCL_EMIT_JSON))
 
-static void ucl_obj_write_json (const ucl_object_t *obj,
-		struct ucl_emitter_functions *func,
-		unsigned int tabs,
-		bool start_tabs,
-		bool compact);
-static void ucl_elt_write_json (const ucl_object_t *obj,
-		struct ucl_emitter_functions *func,
-		unsigned int tabs,
-		bool start_tabs,
-		bool compact);
-static void ucl_elt_write_config (const ucl_object_t *obj,
-		struct ucl_emitter_functions *func,
-		unsigned int tabs,
-		bool start_tabs,
-		bool is_top,
-		bool expand_array);
-static void ucl_elt_write_yaml (const ucl_object_t *obj,
-		struct ucl_emitter_functions *func,
-		unsigned int tabs,
-		bool start_tabs,
-		bool compact,
-		bool expand_array);
-static void ucl_elt_array_write_yaml (const ucl_object_t *obj,
-		struct ucl_emitter_functions *func,
-		unsigned int tabs,
-		bool start_tabs,
-		bool is_top);
 
 /**
  * Add tabulation to the output buffer
@@ -75,189 +92,282 @@ static void ucl_elt_array_write_yaml (const ucl_object_t *obj,
  * @param tabs number of tabs to add
  */
 static inline void
-ucl_add_tabs (struct ucl_emitter_functions *func, unsigned int tabs, bool compact)
+ucl_add_tabs (const struct ucl_emitter_functions *func, unsigned int tabs,
+		bool compact)
 {
-	if (!compact) {
+	if (!compact && tabs > 0) {
 		func->ucl_emitter_append_character (' ', tabs * 4, func->ud);
 	}
 }
 
 /**
- * Serialise string
- * @param str string to emit
- * @param buf target buffer
+ * Print key for the element
+ * @param ctx
+ * @param obj
  */
 static void
-ucl_elt_string_write_json (const char *str, size_t size,
-		struct ucl_emitter_functions *func)
+ucl_emitter_print_key (bool print_key, struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj, bool compact)
 {
-	const char *p = str, *c = str;
-	size_t len = 0;
+	const struct ucl_emitter_functions *func = ctx->func;
 
-	func->ucl_emitter_append_character ('"', 1, func->ud);
-	while (size) {
-		if (ucl_test_character (*p, UCL_CHARACTER_JSON_UNSAFE)) {
-			if (len > 0) {
-				func->ucl_emitter_append_len (c, len, func->ud);
-			}
-			switch (*p) {
-			case '\n':
-				func->ucl_emitter_append_len ("\\n", 2, func->ud);
-				break;
-			case '\r':
-				func->ucl_emitter_append_len ("\\r", 2, func->ud);
-				break;
-			case '\b':
-				func->ucl_emitter_append_len ("\\b", 2, func->ud);
-				break;
-			case '\t':
-				func->ucl_emitter_append_len ("\\t", 2, func->ud);
-				break;
-			case '\f':
-				func->ucl_emitter_append_len ("\\f", 2, func->ud);
-				break;
-			case '\\':
-				func->ucl_emitter_append_len ("\\\\", 2, func->ud);
-				break;
-			case '"':
-				func->ucl_emitter_append_len ("\\\"", 2, func->ud);
-				break;
-			}
-			len = 0;
-			c = ++p;
+	if (!print_key) {
+		return;
+	}
+
+	if (ctx->id == UCL_EMIT_CONFIG) {
+		if (obj->flags & UCL_OBJECT_NEED_KEY_ESCAPE) {
+			ucl_elt_string_write_json (obj->key, obj->keylen, ctx);
 		}
 		else {
-			p ++;
-			len ++;
+			func->ucl_emitter_append_len (obj->key, obj->keylen, func->ud);
 		}
-		size --;
-	}
-	if (len > 0) {
-		func->ucl_emitter_append_len (c, len, func->ud);
-	}
-	func->ucl_emitter_append_character ('"', 1, func->ud);
-}
 
-/**
- * Write a single object to the buffer
- * @param obj object to write
- * @param buf target buffer
- */
-static void
-ucl_elt_obj_write_json (const ucl_object_t *obj, struct ucl_emitter_functions *func,
-		unsigned int tabs, bool start_tabs, bool compact)
-{
-	const ucl_object_t *cur;
-	ucl_hash_iter_t it = NULL;
-
-	if (start_tabs) {
-		ucl_add_tabs (func, tabs, compact);
-	}
-	if (compact) {
-		func->ucl_emitter_append_character ('{', 1, func->ud);
+		if (obj->type != UCL_OBJECT && obj->type != UCL_ARRAY) {
+			func->ucl_emitter_append_len (" = ", 3, func->ud);
+		}
+		else {
+			func->ucl_emitter_append_character (' ', 1, func->ud);
+		}
 	}
 	else {
-		func->ucl_emitter_append_len ("{\n", 2, func->ud);
-	}
-	while ((cur = ucl_hash_iterate (obj->value.ov, &it))) {
-		ucl_add_tabs (func, tabs + 1, compact);
-		if (cur->keylen > 0) {
-			ucl_elt_string_write_json (cur->key, cur->keylen, func);
+		if (obj->keylen > 0) {
+			ucl_elt_string_write_json (obj->key, obj->keylen, ctx);
 		}
 		else {
 			func->ucl_emitter_append_len ("null", 4, func->ud);
 		}
+
 		if (compact) {
 			func->ucl_emitter_append_character (':', 1, func->ud);
 		}
 		else {
 			func->ucl_emitter_append_len (": ", 2, func->ud);
 		}
-		ucl_obj_write_json (cur, func, tabs + 1, false, compact);
-		if (ucl_hash_iter_has_next (it)) {
-			if (compact) {
-				func->ucl_emitter_append_character (',', 1, func->ud);
+	}
+}
+
+static void
+ucl_emitter_finish_object (struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj, bool compact, bool is_array)
+{
+	const struct ucl_emitter_functions *func = ctx->func;
+
+	if (ctx->id == UCL_EMIT_CONFIG && obj != ctx->top) {
+		if (obj->type != UCL_OBJECT && obj->type != UCL_ARRAY) {
+			if (!is_array) {
+				/* Objects are split by ';' */
+				func->ucl_emitter_append_len (";\n", 2, func->ud);
 			}
 			else {
+				/* Use commas for arrays */
 				func->ucl_emitter_append_len (",\n", 2, func->ud);
 			}
 		}
-		else if (!compact) {
+		else {
 			func->ucl_emitter_append_character ('\n', 1, func->ud);
 		}
 	}
-	ucl_add_tabs (func, tabs, compact);
-	func->ucl_emitter_append_character ('}', 1, func->ud);
 }
 
 /**
- * Write a single array to the buffer
- * @param obj array to write
- * @param buf target buffer
+ * End standard ucl object
+ * @param ctx emitter context
+ * @param compact compact flag
  */
 static void
-ucl_elt_array_write_json (const ucl_object_t *obj, struct ucl_emitter_functions *func,
-		unsigned int tabs, bool start_tabs, bool compact)
+ucl_emitter_common_end_object (struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj, bool compact)
 {
-	const ucl_object_t *cur = obj;
+	const struct ucl_emitter_functions *func = ctx->func;
 
-	if (start_tabs) {
-		ucl_add_tabs (func, tabs, compact);
+	if (UCL_EMIT_IDENT_TOP_OBJ(ctx, obj)) {
+		ctx->ident --;
+		if (compact) {
+			func->ucl_emitter_append_character ('}', 1, func->ud);
+		}
+		else {
+			if (ctx->id != UCL_EMIT_CONFIG) {
+				/* newline is already added for this format */
+				func->ucl_emitter_append_character ('\n', 1, func->ud);
+			}
+			ucl_add_tabs (func, ctx->ident, compact);
+			func->ucl_emitter_append_character ('}', 1, func->ud);
+		}
 	}
+
+	ucl_emitter_finish_object (ctx, obj, compact, false);
+}
+
+/**
+ * End standard ucl array
+ * @param ctx emitter context
+ * @param compact compact flag
+ */
+static void
+ucl_emitter_common_end_array (struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj, bool compact)
+{
+	const struct ucl_emitter_functions *func = ctx->func;
+
+	ctx->ident --;
+	if (compact) {
+		func->ucl_emitter_append_character (']', 1, func->ud);
+	}
+	else {
+		if (ctx->id != UCL_EMIT_CONFIG) {
+			/* newline is already added for this format */
+			func->ucl_emitter_append_character ('\n', 1, func->ud);
+		}
+		ucl_add_tabs (func, ctx->ident, compact);
+		func->ucl_emitter_append_character (']', 1, func->ud);
+	}
+
+	ucl_emitter_finish_object (ctx, obj, compact, true);
+}
+
+/**
+ * Start emit standard UCL array
+ * @param ctx emitter context
+ * @param obj object to write
+ * @param compact compact flag
+ */
+static void
+ucl_emitter_common_start_array (struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj, bool print_key, bool compact)
+{
+	const ucl_object_t *cur;
+	const struct ucl_emitter_functions *func = ctx->func;
+	bool first = true;
+
+	ucl_emitter_print_key (print_key, ctx, obj, compact);
+
 	if (compact) {
 		func->ucl_emitter_append_character ('[', 1, func->ud);
 	}
 	else {
 		func->ucl_emitter_append_len ("[\n", 2, func->ud);
 	}
+
+	ctx->ident ++;
+
+	if (obj->type == UCL_ARRAY) {
+		/* explicit array */
+		cur = obj->value.av;
+	}
+	else {
+		/* implicit array */
+		cur = obj;
+	}
+
 	while (cur) {
-		ucl_elt_write_json (cur, func, tabs + 1, true, compact);
-		if (cur->next != NULL) {
-			if (compact) {
-				func->ucl_emitter_append_character (',', 1, func->ud);
-			}
-			else {
-				func->ucl_emitter_append_len (",\n", 2, func->ud);
-			}
-		}
-		else if (!compact) {
-			func->ucl_emitter_append_character ('\n', 1, func->ud);
-		}
+		ucl_emitter_common_elt (ctx, cur, first, false, compact);
+		first = false;
 		cur = cur->next;
 	}
-	ucl_add_tabs (func, tabs, compact);
-	func->ucl_emitter_append_character (']', 1, func->ud);
 }
 
 /**
- * Emit a single element
- * @param obj object
- * @param buf buffer
+ * Start emit standard UCL object
+ * @param ctx emitter context
+ * @param obj object to write
+ * @param compact compact flag
  */
 static void
-ucl_elt_write_json (const ucl_object_t *obj, struct ucl_emitter_functions *func,
-		unsigned int tabs, bool start_tabs, bool compact)
+ucl_emitter_common_start_object (struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj, bool print_key, bool compact)
 {
+	ucl_hash_iter_t it = NULL;
+	const ucl_object_t *cur, *elt;
+	const struct ucl_emitter_functions *func = ctx->func;
+	bool first = true;
+
+	ucl_emitter_print_key (print_key, ctx, obj, compact);
+	/*
+	 * Print <ident_level>{
+	 * <ident_level + 1><object content>
+	 */
+	if (UCL_EMIT_IDENT_TOP_OBJ(ctx, obj)) {
+		if (compact) {
+			func->ucl_emitter_append_character ('{', 1, func->ud);
+		}
+		else {
+			func->ucl_emitter_append_len ("{\n", 2, func->ud);
+		}
+		ctx->ident ++;
+	}
+
+	while ((cur = ucl_hash_iterate (obj->value.ov, &it))) {
+
+		if (ctx->id == UCL_EMIT_CONFIG) {
+			LL_FOREACH (cur, elt) {
+				ucl_emitter_common_elt (ctx, elt, first, true, compact);
+			}
+		}
+		else {
+			/* Expand implicit arrays */
+			if (cur->next != NULL) {
+				if (!first) {
+					if (compact) {
+						func->ucl_emitter_append_character (',', 1, func->ud);
+					}
+					else {
+						func->ucl_emitter_append_len (",\n", 2, func->ud);
+					}
+				}
+				ucl_add_tabs (func, ctx->ident, compact);
+				ucl_emitter_common_start_array (ctx, cur, true, compact);
+				ucl_emitter_common_end_array (ctx, cur, compact);
+			}
+			else {
+				ucl_emitter_common_elt (ctx, cur, first, true, compact);
+			}
+		}
+
+		first = false;
+	}
+}
+
+/**
+ * Common choice of object emitting
+ * @param ctx emitter context
+ * @param obj object to print
+ * @param first flag to mark the first element
+ * @param print_key print key of an object
+ * @param compact compact output
+ */
+static void
+ucl_emitter_common_elt (struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj, bool first, bool print_key, bool compact)
+{
+	const struct ucl_emitter_functions *func = ctx->func;
 	bool flag;
 
+	if (ctx->id != UCL_EMIT_CONFIG && !first) {
+		if (compact) {
+			func->ucl_emitter_append_character (',', 1, func->ud);
+		}
+		else {
+			func->ucl_emitter_append_len (",\n", 2, func->ud);
+		}
+	}
+
+	ucl_add_tabs (func, ctx->ident, compact);
+
 	switch (obj->type) {
 	case UCL_INT:
-		if (start_tabs) {
-			ucl_add_tabs (func, tabs, compact);
-		}
+		ucl_emitter_print_key (print_key, ctx, obj, compact);
 		func->ucl_emitter_append_int (ucl_object_toint (obj), func->ud);
+		ucl_emitter_finish_object (ctx, obj, compact, !print_key);
 		break;
 	case UCL_FLOAT:
 	case UCL_TIME:
-		if (start_tabs) {
-			ucl_add_tabs (func, tabs, compact);
-		}
+		ucl_emitter_print_key (print_key, ctx, obj, compact);
 		func->ucl_emitter_append_double (ucl_object_todouble (obj), func->ud);
+		ucl_emitter_finish_object (ctx, obj, compact, !print_key);
 		break;
 	case UCL_BOOLEAN:
-		if (start_tabs) {
-			ucl_add_tabs (func, tabs, compact);
-		}
+		ucl_emitter_print_key (print_key, ctx, obj, compact);
 		flag = ucl_object_toboolean (obj);
 		if (flag) {
 			func->ucl_emitter_append_len ("true", 4, func->ud);
@@ -265,499 +375,75 @@ ucl_elt_write_json (const ucl_object_t *obj, struct ucl_emitter_functions *func,
 		else {
 			func->ucl_emitter_append_len ("false", 5, func->ud);
 		}
+		ucl_emitter_finish_object (ctx, obj, compact, !print_key);
 		break;
 	case UCL_STRING:
-		if (start_tabs) {
-			ucl_add_tabs (func, tabs, compact);
-		}
-		ucl_elt_string_write_json (obj->value.sv, obj->len, func);
+		ucl_emitter_print_key (print_key, ctx, obj, compact);
+		ucl_elt_string_write_json (obj->value.sv, obj->len, ctx);
+		ucl_emitter_finish_object (ctx, obj, compact, !print_key);
 		break;
 	case UCL_NULL:
-		if (start_tabs) {
-			ucl_add_tabs (func, tabs, compact);
-		}
+		ucl_emitter_print_key (print_key, ctx, obj, compact);
 		func->ucl_emitter_append_len ("null", 4, func->ud);
+		ucl_emitter_finish_object (ctx, obj, compact, !print_key);
 		break;
 	case UCL_OBJECT:
-		ucl_elt_obj_write_json (obj, func, tabs, start_tabs, compact);
+		ucl_emitter_common_start_object (ctx, obj, print_key, compact);
+		ucl_emitter_common_end_object (ctx, obj, compact);
 		break;
 	case UCL_ARRAY:
-		ucl_elt_array_write_json (obj->value.av, func, tabs, start_tabs, compact);
+		ucl_emitter_common_start_array (ctx, obj, print_key, compact);
+		ucl_emitter_common_end_array (ctx, obj, compact);
 		break;
 	case UCL_USERDATA:
 		break;
 	}
 }
 
-/**
- * Write a single object to the buffer
- * @param obj object
- * @param buf target buffer
- */
-static void
-ucl_obj_write_json (const ucl_object_t *obj, struct ucl_emitter_functions *func,
-		unsigned int tabs, bool start_tabs, bool compact)
-{
-	const ucl_object_t *cur;
-	bool is_array = (obj->next != NULL);
-
-	if (is_array) {
-		/* This is an array actually */
-		if (start_tabs) {
-			ucl_add_tabs (func, tabs, compact);
-		}
-
-		if (compact) {
-			func->ucl_emitter_append_character ('[', 1, func->ud);
-		}
-		else {
-			func->ucl_emitter_append_len ("[\n", 2, func->ud);
-		}
-		cur = obj;
-		while (cur != NULL) {
-			ucl_elt_write_json (cur, func, tabs + 1, true, compact);
-			if (cur->next) {
-				func->ucl_emitter_append_character (',', 1, func->ud);
-			}
-			if (!compact) {
-				func->ucl_emitter_append_character ('\n', 1, func->ud);
-			}
-			cur = cur->next;
-		}
-		ucl_add_tabs (func, tabs, compact);
-		func->ucl_emitter_append_character (']', 1, func->ud);
-	}
-	else {
-		ucl_elt_write_json (obj, func, tabs, start_tabs, compact);
-	}
-
-}
-
-/**
- * Emit an object to json
- * @param obj object
- * @return json output (should be freed after using)
- */
-static void
-ucl_object_emit_json (const ucl_object_t *obj, bool compact,
-		struct ucl_emitter_functions *func)
-{
-	ucl_obj_write_json (obj, func, 0, false, compact);
-}
-
-/**
- * Write a single object to the buffer
- * @param obj object to write
- * @param buf target buffer
- */
-static void
-ucl_elt_obj_write_config (const ucl_object_t *obj, struct ucl_emitter_functions *func,
-		unsigned int tabs, bool start_tabs, bool is_top)
-{
-	const ucl_object_t *cur, *cur_obj;
-	ucl_hash_iter_t it = NULL;
-
-	if (start_tabs) {
-		ucl_add_tabs (func, tabs, is_top);
-	}
-	if (!is_top) {
-		func->ucl_emitter_append_len ("{\n", 2, func->ud);
-	}
-
-	while ((cur = ucl_hash_iterate (obj->value.ov, &it))) {
-		LL_FOREACH (cur, cur_obj) {
-			ucl_add_tabs (func, tabs + 1, is_top);
-			if (cur_obj->flags & UCL_OBJECT_NEED_KEY_ESCAPE) {
-				ucl_elt_string_write_json (cur_obj->key, cur_obj->keylen, func);
-			}
-			else {
-				func->ucl_emitter_append_len (cur_obj->key, cur_obj->keylen, func->ud);
-			}
-			if (cur_obj->type != UCL_OBJECT && cur_obj->type != UCL_ARRAY) {
-				func->ucl_emitter_append_len (" = ", 3, func->ud);
-			}
-			else {
-				func->ucl_emitter_append_character (' ', 1, func->ud);
-			}
-			ucl_elt_write_config (cur_obj, func,
-					is_top ? tabs : tabs + 1,
-					false, false, false);
-			if (cur_obj->type != UCL_OBJECT && cur_obj->type != UCL_ARRAY) {
-				func->ucl_emitter_append_len (";\n", 2, func->ud);
-			}
-			else {
-				func->ucl_emitter_append_character ('\n', 1, func->ud);
-			}
-		}
-	}
-
-	ucl_add_tabs (func, tabs, is_top);
-	if (!is_top) {
-		func->ucl_emitter_append_character ('}', 1, func->ud);
-	}
-}
-
-/**
- * Write a single array to the buffer
- * @param obj array to write
- * @param buf target buffer
- */
-static void
-ucl_elt_array_write_config (const ucl_object_t *obj, struct ucl_emitter_functions *func,
-		unsigned int tabs, bool start_tabs, bool is_top)
-{
-	const ucl_object_t *cur = obj;
-
-	if (start_tabs) {
-		ucl_add_tabs (func, tabs, false);
-	}
-
-	func->ucl_emitter_append_len ("[\n", 2, func->ud);
-	while (cur) {
-		ucl_elt_write_config (cur, func, tabs + 1, true, false, false);
-		func->ucl_emitter_append_len (",\n", 2, func->ud);
-		cur = cur->next;
-	}
-	ucl_add_tabs (func, tabs, false);
-	func->ucl_emitter_append_character (']', 1, func->ud);
-}
-
-/**
- * Emit a single element
- * @param obj object
- * @param buf buffer
- */
-static void
-ucl_elt_write_config (const ucl_object_t *obj, struct ucl_emitter_functions *func,
-		unsigned int tabs, bool start_tabs, bool is_top, bool expand_array)
-{
-	bool flag;
-
-	if (expand_array && obj->next != NULL) {
-		ucl_elt_array_write_config (obj, func, tabs, start_tabs, is_top);
-	}
-	else {
-		switch (obj->type) {
-		case UCL_INT:
-			if (start_tabs) {
-				ucl_add_tabs (func, tabs, false);
-			}
-			func->ucl_emitter_append_int (ucl_object_toint (obj), func->ud);
-			break;
-		case UCL_FLOAT:
-		case UCL_TIME:
-			if (start_tabs) {
-				ucl_add_tabs (func, tabs, false);
-			}
-			func->ucl_emitter_append_double (ucl_object_todouble (obj), func->ud);
-			break;
-		case UCL_BOOLEAN:
-			if (start_tabs) {
-				ucl_add_tabs (func, tabs, false);
-			}
-			flag = ucl_object_toboolean (obj);
-			if (flag) {
-				func->ucl_emitter_append_len ("true", 4, func->ud);
-			}
-			else {
-				func->ucl_emitter_append_len ("false", 5, func->ud);
-			}
-			break;
-		case UCL_STRING:
-			if (start_tabs) {
-				ucl_add_tabs (func, tabs, false);
-			}
-			ucl_elt_string_write_json (obj->value.sv, obj->len, func);
-			break;
-		case UCL_NULL:
-			if (start_tabs) {
-				ucl_add_tabs (func, tabs, false);
-			}
-			func->ucl_emitter_append_len ("null", 4, func->ud);
-			break;
-		case UCL_OBJECT:
-			ucl_elt_obj_write_config (obj, func, tabs, start_tabs, is_top);
-			break;
-		case UCL_ARRAY:
-			ucl_elt_array_write_config (obj->value.av, func, tabs, start_tabs, is_top);
-			break;
-		case UCL_USERDATA:
-			break;
-		}
-	}
-}
-
-/**
- * Emit an object to rcl
- * @param obj object
- * @return rcl output (should be freed after using)
- */
-static void
-ucl_object_emit_config (const ucl_object_t *obj, struct ucl_emitter_functions *func)
-{
-	ucl_elt_write_config (obj, func, 0, false, true, true);
-}
-
-
-static void
-ucl_obj_write_yaml (const ucl_object_t *obj, struct ucl_emitter_functions *func,
-		unsigned int tabs, bool start_tabs)
-{
-	bool is_array = (obj->next != NULL);
-
-	if (is_array) {
-		ucl_elt_array_write_yaml (obj, func, tabs, start_tabs, false);
-	}
-	else {
-		ucl_elt_write_yaml (obj, func, tabs, start_tabs, false, true);
-	}
-}
-
-/**
- * Write a single object to the buffer
- * @param obj object to write
- * @param buf target buffer
- */
-static void
-ucl_elt_obj_write_yaml (const ucl_object_t *obj, struct ucl_emitter_functions *func,
-		unsigned int tabs, bool start_tabs, bool is_top)
-{
-	const ucl_object_t *cur;
-	ucl_hash_iter_t it = NULL;
-
-	if (start_tabs) {
-		ucl_add_tabs (func, tabs, is_top);
-	}
-	if (!is_top) {
-		func->ucl_emitter_append_len ("{\n", 2, func->ud);
-	}
-
-	while ((cur = ucl_hash_iterate (obj->value.ov, &it))) {
-		ucl_add_tabs (func, tabs + 1, is_top);
-		if (cur->keylen > 0) {
-			ucl_elt_string_write_json (cur->key, cur->keylen, func);
-		}
-		else {
-			func->ucl_emitter_append_len ("null", 4, func->ud);
-		}
-		func->ucl_emitter_append_len (": ", 2, func->ud);
-		ucl_obj_write_yaml (cur, func, is_top ? tabs : tabs + 1, false);
-		if (ucl_hash_iter_has_next(it)) {
-			if (!is_top) {
-				func->ucl_emitter_append_len (",\n", 2, func->ud);
-			}
-			else {
-				func->ucl_emitter_append_character ('\n', 1, func->ud);
-			}
-		}
-		else {
-			func->ucl_emitter_append_character ('\n', 1, func->ud);
-		}
-	}
-
-	ucl_add_tabs (func, tabs, is_top);
-	if (!is_top) {
-		func->ucl_emitter_append_character ('}', 1, func->ud);
-	}
-}
-
-/**
- * Write a single array to the buffer
- * @param obj array to write
- * @param buf target buffer
- */
-static void
-ucl_elt_array_write_yaml (const ucl_object_t *obj, struct ucl_emitter_functions *func,
-		unsigned int tabs, bool start_tabs, bool is_top)
-{
-	const ucl_object_t *cur = obj;
-
-	if (start_tabs) {
-		ucl_add_tabs (func, tabs, false);
-	}
-
-	func->ucl_emitter_append_len ("[\n", 2, func->ud);
-	while (cur) {
-		ucl_elt_write_yaml (cur, func, tabs + 1, true, false, false);
-		func->ucl_emitter_append_len (",\n", 2, func->ud);
-		cur = cur->next;
-	}
-	ucl_add_tabs (func, tabs, false);
-	func->ucl_emitter_append_character (']', 1, func->ud);
-}
-
-/**
- * Emit a single element
- * @param obj object
- * @param buf buffer
- */
-static void
-ucl_elt_write_yaml (const ucl_object_t *obj, struct ucl_emitter_functions *func,
-		unsigned int tabs, bool start_tabs, bool is_top, bool expand_array)
-{
-	bool flag;
-
-	if (expand_array && obj->next != NULL ) {
-		ucl_elt_array_write_yaml (obj, func, tabs, start_tabs, is_top);
-	}
-	else {
-		switch (obj->type) {
-		case UCL_INT:
-			if (start_tabs) {
-				ucl_add_tabs (func, tabs, false);
-			}
-			func->ucl_emitter_append_int (ucl_object_toint (obj), func->ud);
-			break;
-		case UCL_FLOAT:
-		case UCL_TIME:
-			if (start_tabs) {
-				ucl_add_tabs (func, tabs, false);
-			}
-			func->ucl_emitter_append_double (ucl_object_todouble (obj), func->ud);
-			break;
-		case UCL_BOOLEAN:
-			if (start_tabs) {
-				ucl_add_tabs (func, tabs, false);
-			}
-			flag = ucl_object_toboolean (obj);
-			if (flag) {
-				func->ucl_emitter_append_len ("true", 4, func->ud);
-			}
-			else {
-				func->ucl_emitter_append_len ("false", 5, func->ud);
-			}
-			break;
-		case UCL_STRING:
-			if (start_tabs) {
-				ucl_add_tabs (func, tabs, false);
-			}
-			ucl_elt_string_write_json (obj->value.sv, obj->len, func);
-			break;
-		case UCL_NULL:
-			if (start_tabs) {
-				ucl_add_tabs (func, tabs, false);
-			}
-			func->ucl_emitter_append_len ("null", 4, func->ud);
-			break;
-		case UCL_OBJECT:
-			ucl_elt_obj_write_yaml (obj, func, tabs, start_tabs, is_top);
-			break;
-		case UCL_ARRAY:
-			ucl_elt_array_write_yaml (obj->value.av, func, tabs, start_tabs, is_top);
-			break;
-		case UCL_USERDATA:
-			break;
-		}
-	}
-}
-
-/**
- * Emit an object to rcl
- * @param obj object
- * @return rcl output (should be freed after using)
- */
-static void
-ucl_object_emit_yaml (const ucl_object_t *obj, struct ucl_emitter_functions *func)
-{
-	ucl_elt_write_yaml (obj, func, 0, false, true, true);
-}
-
 /*
- * Generic utstring output
+ * Specific standard implementations of the emitter functions
  */
-static int
-ucl_utstring_append_character (unsigned char c, size_t len, void *ud)
-{
-	UT_string *buf = ud;
-
-	if (len == 1) {
-		utstring_append_c (buf, c);
-	}
-	else {
-		utstring_reserve (buf, len);
-		memset (&buf->d[buf->i], c, len);
-		buf->i += len;
-		buf->d[buf->i] = '\0';
+#define UCL_EMIT_TYPE_IMPL(type, compact)		\
+	static void ucl_emit_ ## type ## _elt (struct ucl_emitter_context *ctx,	\
+		const ucl_object_t *obj, bool first, bool print_key) {	\
+		ucl_emitter_common_elt (ctx, obj, first, print_key, (compact));	\
+	}	\
+	static void ucl_emit_ ## type ## _start_obj (struct ucl_emitter_context *ctx,	\
+		const ucl_object_t *obj, bool print_key) {	\
+		ucl_emitter_common_start_object (ctx, obj, print_key, (compact));	\
+	}	\
+	static void ucl_emit_ ## type## _start_array (struct ucl_emitter_context *ctx,	\
+		const ucl_object_t *obj, bool print_key) {	\
+		ucl_emitter_common_start_array (ctx, obj, print_key, (compact));	\
+	}	\
+	static void ucl_emit_ ##type## _end_object (struct ucl_emitter_context *ctx,	\
+		const ucl_object_t *obj) {	\
+		ucl_emitter_common_end_object (ctx, obj, (compact));	\
+	}	\
+	static void ucl_emit_ ##type## _end_array (struct ucl_emitter_context *ctx,	\
+		const ucl_object_t *obj) {	\
+		ucl_emitter_common_end_array (ctx, obj, (compact));	\
 	}
 
-	return 0;
-}
-
-static int
-ucl_utstring_append_len (const unsigned char *str, size_t len, void *ud)
-{
-	UT_string *buf = ud;
-
-	utstring_append_len (buf, str, len);
-
-	return 0;
-}
-
-static int
-ucl_utstring_append_int (int64_t val, void *ud)
-{
-	UT_string *buf = ud;
-
-	utstring_printf (buf, "%jd", (intmax_t)val);
-	return 0;
-}
-
-static int
-ucl_utstring_append_double (double val, void *ud)
-{
-	UT_string *buf = ud;
-	const double delta = 0.0000001;
-
-	if (val == (double)(int)val) {
-		utstring_printf (buf, "%.1lf", val);
-	}
-	else if (fabs (val - (double)(int)val) < delta) {
-		/* Write at maximum precision */
-		utstring_printf (buf, "%.*lg", DBL_DIG, val);
-	}
-	else {
-		utstring_printf (buf, "%lf", val);
-	}
-
-	return 0;
-}
-
+UCL_EMIT_TYPE_IMPL(json, false);
+UCL_EMIT_TYPE_IMPL(json_compact, true);
+UCL_EMIT_TYPE_IMPL(config, false);
+UCL_EMIT_TYPE_IMPL(yaml, false);
 
 unsigned char *
 ucl_object_emit (const ucl_object_t *obj, enum ucl_emitter emit_type)
 {
-	UT_string *buf = NULL;
 	unsigned char *res = NULL;
-	struct ucl_emitter_functions func = {
-		.ucl_emitter_append_character = ucl_utstring_append_character,
-		.ucl_emitter_append_len = ucl_utstring_append_len,
-		.ucl_emitter_append_int = ucl_utstring_append_int,
-		.ucl_emitter_append_double = ucl_utstring_append_double
-	};
-
+	struct ucl_emitter_functions *func;
 	if (obj == NULL) {
 		return NULL;
 	}
 
-	utstring_new (buf);
-	func.ud = buf;
+	func = ucl_object_emit_memory_funcs ((void **)&res);
 
-	if (buf != NULL) {
-		if (emit_type == UCL_EMIT_JSON) {
-			ucl_object_emit_json (obj, false, &func);
-		}
-		else if (emit_type == UCL_EMIT_JSON_COMPACT) {
-			ucl_object_emit_json (obj, true, &func);
-		}
-		else if (emit_type == UCL_EMIT_YAML) {
-			ucl_object_emit_yaml (obj, &func);
-		}
-		else {
-			ucl_object_emit_config (obj, &func);
-		}
-
-		res = utstring_body (buf);
-		free (buf);
+	if (func != NULL) {
+		ucl_object_emit_full (obj, emit_type, func);
+		ucl_object_emit_funcs_free (func);
 	}
 
 	return res;
@@ -767,71 +453,19 @@ bool
 ucl_object_emit_full (const ucl_object_t *obj, enum ucl_emitter emit_type,
 		struct ucl_emitter_functions *emitter)
 {
-	if (emit_type == UCL_EMIT_JSON) {
-		ucl_object_emit_json (obj, false, emitter);
-	}
-	else if (emit_type == UCL_EMIT_JSON_COMPACT) {
-		ucl_object_emit_json (obj, true, emitter);
-	}
-	else if (emit_type == UCL_EMIT_YAML) {
-		ucl_object_emit_yaml (obj, emitter);
-	}
-	else {
-		ucl_object_emit_config (obj, emitter);
-	}
+	const struct ucl_emitter_context *ctx;
+	struct ucl_emitter_context my_ctx;
+	bool res = false;
 
-	/* XXX: need some error checks here */
-	return true;
-}
+	ctx = ucl_emit_get_standard_context (emit_type);
+	if (ctx != NULL) {
+		memcpy (&my_ctx, ctx, sizeof (my_ctx));
+		my_ctx.func = emitter;
+		my_ctx.ident = 0;
+		my_ctx.top = obj;
 
-
-unsigned char *
-ucl_object_emit_single_json (const ucl_object_t *obj)
-{
-	UT_string *buf = NULL;
-	unsigned char *res = NULL;
-
-	if (obj == NULL) {
-		return NULL;
-	}
-
-	utstring_new (buf);
-
-	if (buf != NULL) {
-		switch (obj->type) {
-		case UCL_OBJECT:
-			ucl_utstring_append_len ("object", 6, buf);
-			break;
-		case UCL_ARRAY:
-			ucl_utstring_append_len ("array", 5, buf);
-			break;
-		case UCL_INT:
-			ucl_utstring_append_int (obj->value.iv, buf);
-			break;
-		case UCL_FLOAT:
-		case UCL_TIME:
-			ucl_utstring_append_double (obj->value.dv, buf);
-			break;
-		case UCL_NULL:
-			ucl_utstring_append_len ("null", 4, buf);
-			break;
-		case UCL_BOOLEAN:
-			if (obj->value.iv) {
-				ucl_utstring_append_len ("true", 4, buf);
-			}
-			else {
-				ucl_utstring_append_len ("false", 5, buf);
-			}
-			break;
-		case UCL_STRING:
-			ucl_utstring_append_len (obj->value.sv, obj->len, buf);
-			break;
-		case UCL_USERDATA:
-			ucl_utstring_append_len ("userdata", 8, buf);
-			break;
-		}
-		res = utstring_body (buf);
-		free (buf);
+		my_ctx.ops->ucl_emitter_write_elt (&my_ctx, obj, true, false);
+		res = true;
 	}
 
 	return res;
diff --git a/contrib/libucl/src/ucl_emitter_streamline.c b/contrib/libucl/src/ucl_emitter_streamline.c
new file mode 100644
index 000000000000..acf4a305a46e
--- /dev/null
+++ b/contrib/libucl/src/ucl_emitter_streamline.c
@@ -0,0 +1,166 @@
+/* Copyright (c) 2014, Vsevolod Stakhov
+ * 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 ''AS IS'' AND ANY
+ * EXPRESS OR 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 BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ucl.h"
+#include "ucl_internal.h"
+#include "ucl_chartable.h"
+
+struct ucl_emitter_streamline_stack {
+	bool is_array;
+	bool empty;
+	const ucl_object_t *obj;
+	struct ucl_emitter_streamline_stack *next;
+};
+
+struct ucl_emitter_context_streamline {
+	/* Inherited from the main context */
+	const char *name;
+	int id;
+	const struct ucl_emitter_functions *func;
+	const struct ucl_emitter_operations *ops;
+	unsigned int ident;
+	const ucl_object_t *top;
+
+	/* Streamline specific fields */
+	struct ucl_emitter_streamline_stack *containers;
+};
+
+#define TO_STREAMLINE(ctx) (struct ucl_emitter_context_streamline *)(ctx)
+
+struct ucl_emitter_context*
+ucl_object_emit_streamline_new (const ucl_object_t *obj,
+		enum ucl_emitter emit_type,
+		struct ucl_emitter_functions *emitter)
+{
+	const struct ucl_emitter_context *ctx;
+	struct ucl_emitter_context_streamline *sctx;
+
+	ctx = ucl_emit_get_standard_context (emit_type);
+	if (ctx == NULL) {
+		return NULL;
+	}
+
+	sctx = calloc (1, sizeof (*sctx));
+	if (sctx == NULL) {
+		return NULL;
+	}
+
+	memcpy (sctx, ctx, sizeof (*ctx));
+	sctx->func = emitter;
+	sctx->top = obj;
+
+	ucl_object_emit_streamline_start_container ((struct ucl_emitter_context *)sctx,
+			obj);
+
+	return (struct ucl_emitter_context *)sctx;
+}
+
+void
+ucl_object_emit_streamline_start_container (struct ucl_emitter_context *ctx,
+		const ucl_object_t *obj)
+{
+	struct ucl_emitter_context_streamline *sctx = TO_STREAMLINE(ctx);
+	struct ucl_emitter_streamline_stack *st, *top;
+	bool print_key = false;
+
+	/* Check top object presence */
+	if (sctx->top == NULL) {
+		sctx->top = obj;
+	}
+
+	top = sctx->containers;
+	st = malloc (sizeof (*st));
+	if (st != NULL) {
+		if (top != NULL && !top->is_array) {
+			print_key = true;
+		}
+		st->empty = true;
+		st->obj = obj;
+		if (obj != NULL && obj->type == UCL_ARRAY) {
+			st->is_array = true;
+			sctx->ops->ucl_emitter_start_array (ctx, obj, print_key);
+		}
+		else {
+			st->is_array = false;
+			sctx->ops->ucl_emitter_start_object (ctx, obj, print_key);
+		}
+	}
+
+	LL_PREPEND (sctx->containers, st);
+}
+
+void
+ucl_object_emit_streamline_add_object (
+		struct ucl_emitter_context *ctx, const ucl_object_t *obj)
+{
+	struct ucl_emitter_context_streamline *sctx = TO_STREAMLINE(ctx);
+	bool is_array = false, is_first = false;
+
+	if (sctx->containers != NULL) {
+		if (sctx->containers->is_array) {
+			is_array = true;
+		}
+		if (sctx->containers->empty) {
+			is_first = true;
+			sctx->containers->empty = false;
+		}
+	}
+
+	sctx->ops->ucl_emitter_write_elt (ctx, obj, is_first, !is_array);
+}
+
+void
+ucl_object_emit_streamline_end_container (struct ucl_emitter_context *ctx)
+{
+	struct ucl_emitter_context_streamline *sctx = TO_STREAMLINE(ctx);
+	struct ucl_emitter_streamline_stack *st;
+
+	if (sctx->containers != NULL) {
+		st = sctx->containers;
+
+		if (st->is_array) {
+			sctx->ops->ucl_emitter_end_array (ctx, st->obj);
+		}
+		else {
+			sctx->ops->ucl_emitter_end_object (ctx, st->obj);
+		}
+		sctx->containers = st->next;
+		free (st);
+	}
+}
+
+void
+ucl_object_emit_streamline_finish (struct ucl_emitter_context *ctx)
+{
+	struct ucl_emitter_context_streamline *sctx = TO_STREAMLINE(ctx);
+
+	while (sctx->containers != NULL) {
+		ucl_object_emit_streamline_end_container (ctx);
+	}
+
+	free (sctx);
+}
diff --git a/contrib/libucl/src/ucl_emitter_utils.c b/contrib/libucl/src/ucl_emitter_utils.c
new file mode 100644
index 000000000000..c619ab9df15e
--- /dev/null
+++ b/contrib/libucl/src/ucl_emitter_utils.c
@@ -0,0 +1,466 @@
+/* Copyright (c) 2014, Vsevolod Stakhov
+ * 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 ''AS IS'' AND ANY
+ * EXPRESS OR 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 BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ucl.h"
+#include "ucl_internal.h"
+#include "ucl_chartable.h"
+
+#ifdef HAVE_FLOAT_H
+#include <float.h>
+#endif
+#ifdef HAVE_MATH_H
+#include <math.h>
+#endif
+
+extern const struct ucl_emitter_operations ucl_standartd_emitter_ops[];
+
+static const struct ucl_emitter_context ucl_standard_emitters[] = {
+	[UCL_EMIT_JSON] = {
+		.name = "json",
+		.id = UCL_EMIT_JSON,
+		.func = NULL,
+		.ops = &ucl_standartd_emitter_ops[UCL_EMIT_JSON]
+	},
+	[UCL_EMIT_JSON_COMPACT] = {
+		.name = "json_compact",
+		.id = UCL_EMIT_JSON_COMPACT,
+		.func = NULL,
+		.ops = &ucl_standartd_emitter_ops[UCL_EMIT_JSON_COMPACT]
+	},
+	[UCL_EMIT_CONFIG] = {
+		.name = "config",
+		.id = UCL_EMIT_CONFIG,
+		.func = NULL,
+		.ops = &ucl_standartd_emitter_ops[UCL_EMIT_CONFIG]
+	},
+	[UCL_EMIT_YAML] = {
+		.name = "yaml",
+		.id = UCL_EMIT_YAML,
+		.func = NULL,
+		.ops = &ucl_standartd_emitter_ops[UCL_EMIT_YAML]
+	}
+};
+
+/**
+ * Get standard emitter context for a specified emit_type
+ * @param emit_type type of emitter
+ * @return context or NULL if input is invalid
+ */
+const struct ucl_emitter_context *
+ucl_emit_get_standard_context (enum ucl_emitter emit_type)
+{
+	if (emit_type >= UCL_EMIT_JSON && emit_type <= UCL_EMIT_YAML) {
+		return &ucl_standard_emitters[emit_type];
+	}
+
+	return NULL;
+}
+
+/**
+ * Serialise string
+ * @param str string to emit
+ * @param buf target buffer
+ */
+void
+ucl_elt_string_write_json (const char *str, size_t size,
+		struct ucl_emitter_context *ctx)
+{
+	const char *p = str, *c = str;
+	size_t len = 0;
+	const struct ucl_emitter_functions *func = ctx->func;
+
+	if (ctx->id != UCL_EMIT_YAML) {
+		func->ucl_emitter_append_character ('"', 1, func->ud);
+	}
+
+	while (size) {
+		if (ucl_test_character (*p, UCL_CHARACTER_JSON_UNSAFE)) {
+			if (len > 0) {
+				func->ucl_emitter_append_len (c, len, func->ud);
+			}
+			switch (*p) {
+			case '\n':
+				func->ucl_emitter_append_len ("\\n", 2, func->ud);
+				break;
+			case '\r':
+				func->ucl_emitter_append_len ("\\r", 2, func->ud);
+				break;
+			case '\b':
+				func->ucl_emitter_append_len ("\\b", 2, func->ud);
+				break;
+			case '\t':
+				func->ucl_emitter_append_len ("\\t", 2, func->ud);
+				break;
+			case '\f':
+				func->ucl_emitter_append_len ("\\f", 2, func->ud);
+				break;
+			case '\\':
+				func->ucl_emitter_append_len ("\\\\", 2, func->ud);
+				break;
+			case '"':
+				func->ucl_emitter_append_len ("\\\"", 2, func->ud);
+				break;
+			}
+			len = 0;
+			c = ++p;
+		}
+		else {
+			p ++;
+			len ++;
+		}
+		size --;
+	}
+	if (len > 0) {
+		func->ucl_emitter_append_len (c, len, func->ud);
+	}
+	if (ctx->id != UCL_EMIT_YAML) {
+		func->ucl_emitter_append_character ('"', 1, func->ud);
+	}
+}
+
+/*
+ * Generic utstring output
+ */
+static int
+ucl_utstring_append_character (unsigned char c, size_t len, void *ud)
+{
+	UT_string *buf = ud;
+
+	if (len == 1) {
+		utstring_append_c (buf, c);
+	}
+	else {
+		utstring_reserve (buf, len);
+		memset (&buf->d[buf->i], c, len);
+		buf->i += len;
+		buf->d[buf->i] = '\0';
+	}
+
+	return 0;
+}
+
+static int
+ucl_utstring_append_len (const unsigned char *str, size_t len, void *ud)
+{
+	UT_string *buf = ud;
+
+	utstring_append_len (buf, str, len);
+
+	return 0;
+}
+
+static int
+ucl_utstring_append_int (int64_t val, void *ud)
+{
+	UT_string *buf = ud;
+
+	utstring_printf (buf, "%jd", (intmax_t)val);
+	return 0;
+}
+
+static int
+ucl_utstring_append_double (double val, void *ud)
+{
+	UT_string *buf = ud;
+	const double delta = 0.0000001;
+
+	if (val == (double)(int)val) {
+		utstring_printf (buf, "%.1lf", val);
+	}
+	else if (fabs (val - (double)(int)val) < delta) {
+		/* Write at maximum precision */
+		utstring_printf (buf, "%.*lg", DBL_DIG, val);
+	}
+	else {
+		utstring_printf (buf, "%lf", val);
+	}
+
+	return 0;
+}
+
+/*
+ * Generic file output
+ */
+static int
+ucl_file_append_character (unsigned char c, size_t len, void *ud)
+{
+	FILE *fp = ud;
+
+	while (len --) {
+		fputc (c, fp);
+	}
+
+	return 0;
+}
+
+static int
+ucl_file_append_len (const unsigned char *str, size_t len, void *ud)
+{
+	FILE *fp = ud;
+
+	fwrite (str, len, 1, fp);
+
+	return 0;
+}
+
+static int
+ucl_file_append_int (int64_t val, void *ud)
+{
+	FILE *fp = ud;
+
+	fprintf (fp, "%jd", (intmax_t)val);
+
+	return 0;
+}
+
+static int
+ucl_file_append_double (double val, void *ud)
+{
+	FILE *fp = ud;
+	const double delta = 0.0000001;
+
+	if (val == (double)(int)val) {
+		fprintf (fp, "%.1lf", val);
+	}
+	else if (fabs (val - (double)(int)val) < delta) {
+		/* Write at maximum precision */
+		fprintf (fp, "%.*lg", DBL_DIG, val);
+	}
+	else {
+		fprintf (fp, "%lf", val);
+	}
+
+	return 0;
+}
+
+/*
+ * Generic file descriptor writing functions
+ */
+static int
+ucl_fd_append_character (unsigned char c, size_t len, void *ud)
+{
+	int fd = *(int *)ud;
+	unsigned char *buf;
+
+	if (len == 1) {
+		write (fd, &c, 1);
+	}
+	else {
+		buf = malloc (len);
+		if (buf == NULL) {
+			/* Fallback */
+			while (len --) {
+				write (fd, &c, 1);
+			}
+		}
+		else {
+			memset (buf, c, len);
+			write (fd, buf, len);
+			free (buf);
+		}
+	}
+
+	return 0;
+}
+
+static int
+ucl_fd_append_len (const unsigned char *str, size_t len, void *ud)
+{
+	int fd = *(int *)ud;
+
+	write (fd, str, len);
+
+	return 0;
+}
+
+static int
+ucl_fd_append_int (int64_t val, void *ud)
+{
+	int fd = *(int *)ud;
+	char intbuf[64];
+
+	snprintf (intbuf, sizeof (intbuf), "%jd", (intmax_t)val);
+	write (fd, intbuf, strlen (intbuf));
+
+	return 0;
+}
+
+static int
+ucl_fd_append_double (double val, void *ud)
+{
+	int fd = *(int *)ud;
+	const double delta = 0.0000001;
+	char nbuf[64];
+
+	if (val == (double)(int)val) {
+		snprintf (nbuf, sizeof (nbuf), "%.1lf", val);
+	}
+	else if (fabs (val - (double)(int)val) < delta) {
+		/* Write at maximum precision */
+		snprintf (nbuf, sizeof (nbuf), "%.*lg", DBL_DIG, val);
+	}
+	else {
+		snprintf (nbuf, sizeof (nbuf), "%lf", val);
+	}
+
+	write (fd, nbuf, strlen (nbuf));
+
+	return 0;
+}
+
+struct ucl_emitter_functions*
+ucl_object_emit_memory_funcs (void **pmem)
+{
+	struct ucl_emitter_functions *f;
+	UT_string *s;
+
+	f = calloc (1, sizeof (*f));
+
+	if (f != NULL) {
+		f->ucl_emitter_append_character = ucl_utstring_append_character;
+		f->ucl_emitter_append_double = ucl_utstring_append_double;
+		f->ucl_emitter_append_int = ucl_utstring_append_int;
+		f->ucl_emitter_append_len = ucl_utstring_append_len;
+		f->ucl_emitter_free_func = free;
+		utstring_new (s);
+		f->ud = s;
+		*pmem = s->d;
+		s->pd = pmem;
+	}
+
+	return f;
+}
+
+struct ucl_emitter_functions*
+ucl_object_emit_file_funcs (FILE *fp)
+{
+	struct ucl_emitter_functions *f;
+
+	f = calloc (1, sizeof (*f));
+
+	if (f != NULL) {
+		f->ucl_emitter_append_character = ucl_file_append_character;
+		f->ucl_emitter_append_double = ucl_file_append_double;
+		f->ucl_emitter_append_int = ucl_file_append_int;
+		f->ucl_emitter_append_len = ucl_file_append_len;
+		f->ucl_emitter_free_func = NULL;
+		f->ud = fp;
+	}
+
+	return f;
+}
+
+struct ucl_emitter_functions*
+ucl_object_emit_fd_funcs (int fd)
+{
+	struct ucl_emitter_functions *f;
+	int *ip;
+
+	f = calloc (1, sizeof (*f));
+
+	if (f != NULL) {
+		ip = malloc (sizeof (fd));
+		if (ip == NULL) {
+			free (f);
+			return NULL;
+		}
+
+		memcpy (ip, &fd, sizeof (fd));
+		f->ucl_emitter_append_character = ucl_fd_append_character;
+		f->ucl_emitter_append_double = ucl_fd_append_double;
+		f->ucl_emitter_append_int = ucl_fd_append_int;
+		f->ucl_emitter_append_len = ucl_fd_append_len;
+		f->ucl_emitter_free_func = free;
+		f->ud = ip;
+	}
+
+	return f;
+}
+
+void
+ucl_object_emit_funcs_free (struct ucl_emitter_functions *f)
+{
+	if (f != NULL) {
+		if (f->ucl_emitter_free_func != NULL) {
+			f->ucl_emitter_free_func (f->ud);
+		}
+		free (f);
+	}
+}
+
+
+unsigned char *
+ucl_object_emit_single_json (const ucl_object_t *obj)
+{
+	UT_string *buf = NULL;
+	unsigned char *res = NULL;
+
+	if (obj == NULL) {
+		return NULL;
+	}
+
+	utstring_new (buf);
+
+	if (buf != NULL) {
+		switch (obj->type) {
+		case UCL_OBJECT:
+			ucl_utstring_append_len ("object", 6, buf);
+			break;
+		case UCL_ARRAY:
+			ucl_utstring_append_len ("array", 5, buf);
+			break;
+		case UCL_INT:
+			ucl_utstring_append_int (obj->value.iv, buf);
+			break;
+		case UCL_FLOAT:
+		case UCL_TIME:
+			ucl_utstring_append_double (obj->value.dv, buf);
+			break;
+		case UCL_NULL:
+			ucl_utstring_append_len ("null", 4, buf);
+			break;
+		case UCL_BOOLEAN:
+			if (obj->value.iv) {
+				ucl_utstring_append_len ("true", 4, buf);
+			}
+			else {
+				ucl_utstring_append_len ("false", 5, buf);
+			}
+			break;
+		case UCL_STRING:
+			ucl_utstring_append_len (obj->value.sv, obj->len, buf);
+			break;
+		case UCL_USERDATA:
+			ucl_utstring_append_len ("userdata", 8, buf);
+			break;
+		}
+		res = utstring_body (buf);
+		free (buf);
+	}
+
+	return res;
+}
diff --git a/contrib/libucl/src/ucl_internal.h b/contrib/libucl/src/ucl_internal.h
index 0e3ecd012cc7..0ac8de84c2ed 100644
--- a/contrib/libucl/src/ucl_internal.h
+++ b/contrib/libucl/src/ucl_internal.h
@@ -342,6 +342,22 @@ ucl_hash_insert_object (ucl_hash_t *hashlin, const ucl_object_t *obj)
 	return hashlin;
 }
 
+/**
+ * Get standard emitter context for a specified emit_type
+ * @param emit_type type of emitter
+ * @return context or NULL if input is invalid
+ */
+const struct ucl_emitter_context *
+ucl_emit_get_standard_context (enum ucl_emitter emit_type);
+
+/**
+ * Serialise string
+ * @param str string to emit
+ * @param buf target buffer
+ */
+void ucl_elt_string_write_json (const char *str, size_t size,
+		struct ucl_emitter_context *ctx);
+
 /**
  * Emit a single object to string
  * @param obj
diff --git a/contrib/libucl/src/ucl_parser.c b/contrib/libucl/src/ucl_parser.c
index b4fe5afc8246..e51a54b77bc6 100644
--- a/contrib/libucl/src/ucl_parser.c
+++ b/contrib/libucl/src/ucl_parser.c
@@ -393,9 +393,16 @@ ucl_expand_single_variable (struct ucl_parser *parser, const char *ptr,
 
 		/* Leave variable as is */
 		if (!found) {
-			memcpy (d, ptr, 2);
-			d += 2;
-			ret --;
+			if (strict) {
+				/* Copy '${' */
+				memcpy (d, ptr, 2);
+				d += 2;
+				ret --;
+			}
+			else {
+				memcpy (d, ptr, 1);
+				d ++;
+			}
 		}
 	}
 
@@ -1654,6 +1661,11 @@ ucl_state_machine (struct ucl_parser *parser)
 				return false;
 			}
 			else {
+				/* Skip any spaces */
+				while (p < chunk->end && ucl_test_character (*p,
+						UCL_CHARACTER_WHITESPACE_UNSAFE)) {
+					ucl_chunk_skipc (chunk, p);
+				}
 				p = chunk->pos;
 				if (*p == '[') {
 					parser->state = UCL_STATE_VALUE;
diff --git a/contrib/libucl/tests/Makefile.am b/contrib/libucl/tests/Makefile.am
index efc93506c1ed..a21a65c16534 100644
--- a/contrib/libucl/tests/Makefile.am
+++ b/contrib/libucl/tests/Makefile.am
@@ -3,7 +3,8 @@ EXTRA_DIST = $(TESTS) basic schema generate.res rcl_test.json.xz
 TESTS = basic.test \
 		generate.test \
 		schema.test \
-		speed.test
+		speed.test \
+		streamline.test
 TESTS_ENVIRONMENT = $(SH) \
 			TEST_DIR=$(top_srcdir)/tests \
 			TEST_OUT_DIR=$(top_builddir)/tests \
@@ -30,4 +31,8 @@ test_schema_SOURCES = test_schema.c
 test_schema_LDADD = $(common_test_ldadd)
 test_schema_CFLAGS = $(common_test_cflags)
 
-check_PROGRAMS = test_basic test_speed test_generate test_schema
+test_streamline_SOURCES = test_streamline.c
+test_streamline_LDADD = $(common_test_ldadd)
+test_streamline_CFLAGS = $(common_test_cflags)
+
+check_PROGRAMS = test_basic test_speed test_generate test_schema test_streamline
\ No newline at end of file
diff --git a/contrib/libucl/tests/basic/11.in b/contrib/libucl/tests/basic/11.in
new file mode 100644
index 000000000000..3131fc7e1547
--- /dev/null
+++ b/contrib/libucl/tests/basic/11.in
@@ -0,0 +1,3 @@
+
+
+   {"key": "value"}
diff --git a/contrib/libucl/tests/basic/11.res b/contrib/libucl/tests/basic/11.res
new file mode 100644
index 000000000000..4b17c4b4eb1b
--- /dev/null
+++ b/contrib/libucl/tests/basic/11.res
@@ -0,0 +1,2 @@
+key = "value";
+
diff --git a/contrib/libucl/tests/streamline.res b/contrib/libucl/tests/streamline.res
new file mode 100644
index 000000000000..5eb18d7c2737
--- /dev/null
+++ b/contrib/libucl/tests/streamline.res
@@ -0,0 +1,8 @@
+key1 = "test string";
+key2 = "test \\nstring";
+key3 = "  test string    \n";
+key4 [
+    10,
+    10.100000,
+    9.999000,
+]
diff --git a/contrib/libucl/tests/streamline.test b/contrib/libucl/tests/streamline.test
new file mode 100755
index 000000000000..dbe583622fca
--- /dev/null
+++ b/contrib/libucl/tests/streamline.test
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+PROG=${TEST_BINARY_DIR}/test_streamline
+
+$PROG ${TEST_OUT_DIR}/streamline.out
+diff -s ${TEST_OUT_DIR}/streamline.out ${TEST_DIR}/streamline.res -u 2>/dev/null
+if [ $? -ne 0 ] ; then
+	rm ${TEST_OUT_DIR}/streamline.out
+	echo "Test: streamline.res output missmatch"
+	exit 1
+fi
+rm ${TEST_OUT_DIR}/streamline.out
\ No newline at end of file
diff --git a/contrib/libucl/tests/test_basic.c b/contrib/libucl/tests/test_basic.c
index 5a977aa7191a..b4ed7788dce4 100644
--- a/contrib/libucl/tests/test_basic.c
+++ b/contrib/libucl/tests/test_basic.c
@@ -33,15 +33,21 @@ main (int argc, char **argv)
 	FILE *in, *out;
 	unsigned char *emitted = NULL;
 	const char *fname_in = NULL, *fname_out = NULL;
-	int ret = 0, inlen, opt, json = 0;
+	int ret = 0, inlen, opt, json = 0, compact = 0, yaml = 0;
 
-	while ((opt = getopt(argc, argv, "j")) != -1) {
+	while ((opt = getopt(argc, argv, "jcy")) != -1) {
 		switch (opt) {
 		case 'j':
 			json = 1;
 			break;
+		case 'c':
+			compact = 1;
+			break;
+		case 'y':
+			yaml = 1;
+			break;
 		default: /* '?' */
-			fprintf (stderr, "Usage: %s [-j] [in] [out]\n",
+			fprintf (stderr, "Usage: %s [-jcy] [in] [out]\n",
 					argv[0]);
 			exit (EXIT_FAILURE);
 		}
@@ -104,7 +110,15 @@ main (int argc, char **argv)
 	}
 	obj = ucl_parser_get_object (parser);
 	if (json) {
-		emitted = ucl_object_emit (obj, UCL_EMIT_JSON);
+		if (compact) {
+			emitted = ucl_object_emit (obj, UCL_EMIT_JSON_COMPACT);
+		}
+		else {
+			emitted = ucl_object_emit (obj, UCL_EMIT_JSON);
+		}
+	}
+	else if (yaml) {
+		emitted = ucl_object_emit (obj, UCL_EMIT_YAML);
 	}
 	else {
 		emitted = ucl_object_emit (obj, UCL_EMIT_CONFIG);
@@ -125,7 +139,15 @@ main (int argc, char **argv)
 	}
 	obj = ucl_parser_get_object (parser2);
 	if (json) {
-		emitted = ucl_object_emit (obj, UCL_EMIT_JSON);
+		if (compact) {
+			emitted = ucl_object_emit (obj, UCL_EMIT_JSON_COMPACT);
+		}
+		else {
+			emitted = ucl_object_emit (obj, UCL_EMIT_JSON);
+		}
+	}
+	else if (yaml) {
+		emitted = ucl_object_emit (obj, UCL_EMIT_YAML);
 	}
 	else {
 		emitted = ucl_object_emit (obj, UCL_EMIT_CONFIG);
diff --git a/contrib/libucl/tests/test_streamline.c b/contrib/libucl/tests/test_streamline.c
new file mode 100644
index 000000000000..4c56c4cdcffd
--- /dev/null
+++ b/contrib/libucl/tests/test_streamline.c
@@ -0,0 +1,92 @@
+/* Copyright (c) 2013, Vsevolod Stakhov
+ * 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 ''AS IS'' AND ANY
+ * EXPRESS OR 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 BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING 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 <errno.h>
+#include <assert.h>
+#include "ucl.h"
+
+int
+main (int argc, char **argv)
+{
+	ucl_object_t *obj, *cur, *ar;
+	FILE *out;
+	const char *fname_out = NULL;
+	struct ucl_emitter_context *ctx;
+	struct ucl_emitter_functions *f;
+	int ret = 0;
+
+	switch (argc) {
+	case 2:
+		fname_out = argv[1];
+		break;
+	}
+
+	if (fname_out != NULL) {
+		out = fopen (fname_out, "w");
+		if (out == NULL) {
+			exit (-errno);
+		}
+	}
+	else {
+		out = stdout;
+	}
+
+	obj = ucl_object_typed_new (UCL_OBJECT);
+
+	/* Create some strings */
+	cur = ucl_object_fromstring_common ("  test string    ", 0, UCL_STRING_TRIM);
+	ucl_object_insert_key (obj, cur, "key1", 0, false);
+	cur = ucl_object_fromstring_common ("  test \nstring\n    ", 0, UCL_STRING_TRIM | UCL_STRING_ESCAPE);
+	ucl_object_insert_key (obj, cur, "key2", 0, false);
+	cur = ucl_object_fromstring_common ("  test string    \n", 0, 0);
+	ucl_object_insert_key (obj, cur, "key3", 0, false);
+
+	f = ucl_object_emit_file_funcs (out);
+	ctx = ucl_object_emit_streamline_new (obj, UCL_EMIT_CONFIG, f);
+
+	assert (ctx != NULL);
+
+	/* Array of numbers */
+	ar = ucl_object_typed_new (UCL_ARRAY);
+	ar->key = "key4";
+	ar->keylen = sizeof ("key4") - 1;
+
+	ucl_object_emit_streamline_start_container (ctx, ar);
+	cur = ucl_object_fromint (10);
+	ucl_object_emit_streamline_add_object (ctx, cur);
+	cur = ucl_object_fromdouble (10.1);
+	ucl_object_emit_streamline_add_object (ctx, cur);
+	cur = ucl_object_fromdouble (9.999);
+	ucl_object_emit_streamline_add_object (ctx, cur);
+
+
+	ucl_object_emit_streamline_end_container (ctx);
+	ucl_object_emit_streamline_finish (ctx);
+	ucl_object_emit_funcs_free (f);
+	ucl_object_unref (obj);
+
+	fclose (out);
+
+	return ret;
+}
diff --git a/contrib/libucl/uthash/utstring.h b/contrib/libucl/uthash/utstring.h
index 4ef7b5690dc6..f11f34b77e75 100644
--- a/contrib/libucl/uthash/utstring.h
+++ b/contrib/libucl/uthash/utstring.h
@@ -44,6 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 typedef struct {
     char *d;
+    void **pd;
     size_t n; /* allocd size */
     size_t i; /* index of first unused byte */
 } UT_string;
@@ -54,6 +55,7 @@ do {                                                       \
      (s)->d = (char*)realloc((s)->d, (s)->n + amt);        \
      if ((s)->d == NULL) oom();                            \
      (s)->n += amt;                                        \
+     if ((s)->pd) *((s)->pd) = (s)->d;                     \
   }                                                        \
 } while(0)
 
@@ -78,7 +80,7 @@ do {                                                       \
 
 #define utstring_new(s)                                    \
 do {                                                       \
-   s = (UT_string*)calloc(sizeof(UT_string),1);            \
+   s = (UT_string*)calloc(1, sizeof(UT_string));          \
    if (!s) oom();                                          \
    utstring_init(s);                                       \
 } while(0)
diff --git a/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h b/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h
index 13bb08f08c09..ce2ba016cf4d 100644
--- a/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h
+++ b/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h
@@ -569,6 +569,7 @@ class LLVM_LIBRARY_VISIBILITY DAGTypeLegalizer {
   void SplitVecRes_BUILD_VECTOR(SDNode *N, SDValue &Lo, SDValue &Hi);
   void SplitVecRes_CONCAT_VECTORS(SDNode *N, SDValue &Lo, SDValue &Hi);
   void SplitVecRes_EXTRACT_SUBVECTOR(SDNode *N, SDValue &Lo, SDValue &Hi);
+  void SplitVecRes_INSERT_SUBVECTOR(SDNode *N, SDValue &Lo, SDValue &Hi);
   void SplitVecRes_FPOWI(SDNode *N, SDValue &Lo, SDValue &Hi);
   void SplitVecRes_INSERT_VECTOR_ELT(SDNode *N, SDValue &Lo, SDValue &Hi);
   void SplitVecRes_LOAD(LoadSDNode *N, SDValue &Lo, SDValue &Hi);
diff --git a/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp b/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
index 5f4ff7533619..fb8c6021721e 100644
--- a/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
+++ b/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
@@ -506,6 +506,7 @@ void DAGTypeLegalizer::SplitVectorResult(SDNode *N, unsigned ResNo) {
   case ISD::BUILD_VECTOR:      SplitVecRes_BUILD_VECTOR(N, Lo, Hi); break;
   case ISD::CONCAT_VECTORS:    SplitVecRes_CONCAT_VECTORS(N, Lo, Hi); break;
   case ISD::EXTRACT_SUBVECTOR: SplitVecRes_EXTRACT_SUBVECTOR(N, Lo, Hi); break;
+  case ISD::INSERT_SUBVECTOR:  SplitVecRes_INSERT_SUBVECTOR(N, Lo, Hi); break;
   case ISD::FP_ROUND_INREG:    SplitVecRes_InregOp(N, Lo, Hi); break;
   case ISD::FPOWI:             SplitVecRes_FPOWI(N, Lo, Hi); break;
   case ISD::INSERT_VECTOR_ELT: SplitVecRes_INSERT_VECTOR_ELT(N, Lo, Hi); break;
@@ -725,6 +726,43 @@ void DAGTypeLegalizer::SplitVecRes_EXTRACT_SUBVECTOR(SDNode *N, SDValue &Lo,
                                    TLI.getVectorIdxTy()));
 }
 
+void DAGTypeLegalizer::SplitVecRes_INSERT_SUBVECTOR(SDNode *N, SDValue &Lo,
+                                                    SDValue &Hi) {
+  SDValue Vec = N->getOperand(0);
+  SDValue SubVec = N->getOperand(1);
+  SDValue Idx = N->getOperand(2);
+  SDLoc dl(N);
+  GetSplitVector(Vec, Lo, Hi);
+
+  // Spill the vector to the stack.
+  EVT VecVT = Vec.getValueType();
+  EVT SubVecVT = VecVT.getVectorElementType();
+  SDValue StackPtr = DAG.CreateStackTemporary(VecVT);
+  SDValue Store = DAG.getStore(DAG.getEntryNode(), dl, Vec, StackPtr,
+                               MachinePointerInfo(), false, false, 0);
+
+  // Store the new subvector into the specified index.
+  SDValue SubVecPtr = GetVectorElementPointer(StackPtr, SubVecVT, Idx);
+  Type *VecType = VecVT.getTypeForEVT(*DAG.getContext());
+  unsigned Alignment = TLI.getDataLayout()->getPrefTypeAlignment(VecType);
+  Store = DAG.getStore(Store, dl, SubVec, SubVecPtr, MachinePointerInfo(),
+                       false, false, 0);
+
+  // Load the Lo part from the stack slot.
+  Lo = DAG.getLoad(Lo.getValueType(), dl, Store, StackPtr, MachinePointerInfo(),
+                   false, false, false, 0);
+
+  // Increment the pointer to the other part.
+  unsigned IncrementSize = Lo.getValueType().getSizeInBits() / 8;
+  StackPtr =
+      DAG.getNode(ISD::ADD, dl, StackPtr.getValueType(), StackPtr,
+                  DAG.getConstant(IncrementSize, StackPtr.getValueType()));
+
+  // Load the Hi part from the stack slot.
+  Hi = DAG.getLoad(Hi.getValueType(), dl, Store, StackPtr, MachinePointerInfo(),
+                   false, false, false, MinAlign(Alignment, IncrementSize));
+}
+
 void DAGTypeLegalizer::SplitVecRes_FPOWI(SDNode *N, SDValue &Lo,
                                          SDValue &Hi) {
   SDLoc dl(N);
diff --git a/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp b/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp
index 4e3b0b83244a..970c804e71ee 100644
--- a/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp
+++ b/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp
@@ -1026,6 +1026,10 @@ bool PPCFastISel::SelectFPToI(const Instruction *I, bool IsSigned) {
   if (DstVT != MVT::i32 && DstVT != MVT::i64)
     return false;
 
+  // If we don't have FCTIDUZ and we need it, punt to SelectionDAG.
+  if (DstVT == MVT::i64 && !IsSigned && !PPCSubTarget.hasFPCVT())
+    return false;
+
   Value *Src = I->getOperand(0);
   Type *SrcTy = Src->getType();
   if (!isTypeLegal(SrcTy, SrcVT))
diff --git a/contrib/llvm/patches/patch-r267704-llvm-r211435-fix-avx-backend.diff b/contrib/llvm/patches/patch-r267704-llvm-r211435-fix-avx-backend.diff
new file mode 100644
index 000000000000..f64fc47c544c
--- /dev/null
+++ b/contrib/llvm/patches/patch-r267704-llvm-r211435-fix-avx-backend.diff
@@ -0,0 +1,125 @@
+Pull in r211435 from upstream llvm trunk (by Benjamin Kramer):
+
+  Legalizer: Add support for splitting insert_subvectors.
+
+  We handle this by spilling the whole thing to the stack and doing the
+  insertion as a store.
+
+  PR19492. This happens in real code because the vectorizer creates
+  v2i128 when AVX is enabled.
+
+This fixes a "fatal error: error in backend: Do not know how to split
+the result of this operator!" message encountered during compilation of
+the net-p2p/libtorrent-rasterbar port.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/267704
+
+Index: lib/CodeGen/SelectionDAG/LegalizeTypes.h
+===================================================================
+--- lib/CodeGen/SelectionDAG/LegalizeTypes.h
++++ lib/CodeGen/SelectionDAG/LegalizeTypes.h
+@@ -569,6 +569,7 @@ class LLVM_LIBRARY_VISIBILITY DAGTypeLegalizer {
+   void SplitVecRes_BUILD_VECTOR(SDNode *N, SDValue &Lo, SDValue &Hi);
+   void SplitVecRes_CONCAT_VECTORS(SDNode *N, SDValue &Lo, SDValue &Hi);
+   void SplitVecRes_EXTRACT_SUBVECTOR(SDNode *N, SDValue &Lo, SDValue &Hi);
++  void SplitVecRes_INSERT_SUBVECTOR(SDNode *N, SDValue &Lo, SDValue &Hi);
+   void SplitVecRes_FPOWI(SDNode *N, SDValue &Lo, SDValue &Hi);
+   void SplitVecRes_INSERT_VECTOR_ELT(SDNode *N, SDValue &Lo, SDValue &Hi);
+   void SplitVecRes_LOAD(LoadSDNode *N, SDValue &Lo, SDValue &Hi);
+Index: lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
+===================================================================
+--- lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
++++ lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
+@@ -506,6 +506,7 @@ void DAGTypeLegalizer::SplitVectorResult(SDNode *N
+   case ISD::BUILD_VECTOR:      SplitVecRes_BUILD_VECTOR(N, Lo, Hi); break;
+   case ISD::CONCAT_VECTORS:    SplitVecRes_CONCAT_VECTORS(N, Lo, Hi); break;
+   case ISD::EXTRACT_SUBVECTOR: SplitVecRes_EXTRACT_SUBVECTOR(N, Lo, Hi); break;
++  case ISD::INSERT_SUBVECTOR:  SplitVecRes_INSERT_SUBVECTOR(N, Lo, Hi); break;
+   case ISD::FP_ROUND_INREG:    SplitVecRes_InregOp(N, Lo, Hi); break;
+   case ISD::FPOWI:             SplitVecRes_FPOWI(N, Lo, Hi); break;
+   case ISD::INSERT_VECTOR_ELT: SplitVecRes_INSERT_VECTOR_ELT(N, Lo, Hi); break;
+@@ -725,6 +726,43 @@ void DAGTypeLegalizer::SplitVecRes_EXTRACT_SUBVECT
+                                    TLI.getVectorIdxTy()));
+ }
+ 
++void DAGTypeLegalizer::SplitVecRes_INSERT_SUBVECTOR(SDNode *N, SDValue &Lo,
++                                                    SDValue &Hi) {
++  SDValue Vec = N->getOperand(0);
++  SDValue SubVec = N->getOperand(1);
++  SDValue Idx = N->getOperand(2);
++  SDLoc dl(N);
++  GetSplitVector(Vec, Lo, Hi);
++
++  // Spill the vector to the stack.
++  EVT VecVT = Vec.getValueType();
++  EVT SubVecVT = VecVT.getVectorElementType();
++  SDValue StackPtr = DAG.CreateStackTemporary(VecVT);
++  SDValue Store = DAG.getStore(DAG.getEntryNode(), dl, Vec, StackPtr,
++                               MachinePointerInfo(), false, false, 0);
++
++  // Store the new subvector into the specified index.
++  SDValue SubVecPtr = GetVectorElementPointer(StackPtr, SubVecVT, Idx);
++  Type *VecType = VecVT.getTypeForEVT(*DAG.getContext());
++  unsigned Alignment = TLI.getDataLayout()->getPrefTypeAlignment(VecType);
++  Store = DAG.getStore(Store, dl, SubVec, SubVecPtr, MachinePointerInfo(),
++                       false, false, 0);
++
++  // Load the Lo part from the stack slot.
++  Lo = DAG.getLoad(Lo.getValueType(), dl, Store, StackPtr, MachinePointerInfo(),
++                   false, false, false, 0);
++
++  // Increment the pointer to the other part.
++  unsigned IncrementSize = Lo.getValueType().getSizeInBits() / 8;
++  StackPtr =
++      DAG.getNode(ISD::ADD, dl, StackPtr.getValueType(), StackPtr,
++                  DAG.getConstant(IncrementSize, StackPtr.getValueType()));
++
++  // Load the Hi part from the stack slot.
++  Hi = DAG.getLoad(Hi.getValueType(), dl, Store, StackPtr, MachinePointerInfo(),
++                   false, false, false, MinAlign(Alignment, IncrementSize));
++}
++
+ void DAGTypeLegalizer::SplitVecRes_FPOWI(SDNode *N, SDValue &Lo,
+                                          SDValue &Hi) {
+   SDLoc dl(N);
+Index: test/CodeGen/X86/vec_split.ll
+===================================================================
+--- test/CodeGen/X86/vec_split.ll
++++ test/CodeGen/X86/vec_split.ll
+@@ -40,3 +40,36 @@ define <32 x i16> @split32(<32 x i16> %a, <32 x i1
+   %2 = select <32 x i1> %1, <32 x i16> %a, <32 x i16> %b
+   ret <32 x i16> %2
+ }
++
++; PR19492
++define i128 @split128(<2 x i128> %a, <2 x i128> %b) {
++; SSE4-LABEL: split128:
++; SSE4: addq
++; SSE4: adcq
++; SSE4: addq
++; SSE4: adcq
++; SSE4: addq
++; SSE4: adcq
++; SSE4: ret
++; AVX1-LABEL: split128:
++; AVX1: addq
++; AVX1: adcq
++; AVX1: addq
++; AVX1: adcq
++; AVX1: addq
++; AVX1: adcq
++; AVX1: ret
++; AVX2-LABEL: split128:
++; AVX2: addq
++; AVX2: adcq
++; AVX2: addq
++; AVX2: adcq
++; AVX2: addq
++; AVX2: adcq
++; AVX2: ret
++  %add = add nsw <2 x i128> %a, %b
++  %rdx.shuf = shufflevector <2 x i128> %add, <2 x i128> undef, <2 x i32> <i32 undef, i32 0>
++  %bin.rdx = add <2 x i128> %add, %rdx.shuf
++  %e = extractelement <2 x i128> %bin.rdx, i32 1
++  ret i128 %e
++}
diff --git a/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff b/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff
new file mode 100644
index 000000000000..2cfb93ea36c4
--- /dev/null
+++ b/contrib/llvm/patches/patch-r267981-llvm-r211435-fix-ppc-fctiduz.diff
@@ -0,0 +1,494 @@
+Pull in r211627 from upstream llvm trunk (by Bill Schmidt):
+
+  [PPC64] Fix PR20071 (fctiduz generated for targets lacking that
+  instruction)
+
+  PR20071 identifies a problem in PowerPC's fast-isel implementation
+  for floating-point conversion to integer.  The fctiduz instruction
+  was added in Power ISA 2.06 (i.e., Power7 and later).  However, this
+  instruction is being generated regardless of which 64-bit PowerPC
+  target is selected.
+
+  The intent is for fast-isel to punt to DAG selection when this
+  instruction is not available.  This patch implements that change.
+  For testing purposes, the existing fast-isel-conversion.ll test adds
+  a RUN line for -mcpu=970 and tests for the expected code generation.
+  Additionally, the existing test fast-isel-conversion-p5.ll was found
+  to be incorrectly expecting the unavailable instruction to be
+  generated.  I've removed these test variants since we have adequate
+  coverage in fast-isel-conversion.ll.
+
+This is needed to compile clang with debug+asserts on older powerpc64
+and ppc970 targets.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/267981
+
+Index: lib/Target/PowerPC/PPCFastISel.cpp
+===================================================================
+--- lib/Target/PowerPC/PPCFastISel.cpp	(revision 106)
++++ lib/Target/PowerPC/PPCFastISel.cpp	(revision 107)
+@@ -1026,6 +1026,10 @@ bool PPCFastISel::SelectFPToI(const Instruction *I
+   if (DstVT != MVT::i32 && DstVT != MVT::i64)
+     return false;
+ 
++  // If we don't have FCTIDUZ and we need it, punt to SelectionDAG.
++  if (DstVT == MVT::i64 && !IsSigned && !PPCSubTarget.hasFPCVT())
++    return false;
++
+   Value *Src = I->getOperand(0);
+   Type *SrcTy = Src->getType();
+   if (!isTypeLegal(SrcTy, SrcVT))
+Index: test/CodeGen/PowerPC/fast-isel-conversion-p5.ll
+===================================================================
+--- test/CodeGen/PowerPC/fast-isel-conversion-p5.ll	(revision 106)
++++ test/CodeGen/PowerPC/fast-isel-conversion-p5.ll	(revision 107)
+@@ -116,18 +116,6 @@ entry:
+   ret void
+ }
+ 
+-define void @fptoui_float_i64(float %a) nounwind ssp {
+-entry:
+-; ELF64: fptoui_float_i64
+-  %b.addr = alloca i64, align 4
+-  %conv = fptoui float %a to i64
+-; ELF64: fctiduz
+-; ELF64: stfd
+-; ELF64: ld
+-  store i64 %conv, i64* %b.addr, align 4
+-  ret void
+-}
+-
+ define void @fptoui_double_i32(double %a) nounwind ssp {
+ entry:
+ ; ELF64: fptoui_double_i32
+@@ -140,14 +128,3 @@ entry:
+   ret void
+ }
+ 
+-define void @fptoui_double_i64(double %a) nounwind ssp {
+-entry:
+-; ELF64: fptoui_double_i64
+-  %b.addr = alloca i64, align 8
+-  %conv = fptoui double %a to i64
+-; ELF64: fctiduz
+-; ELF64: stfd
+-; ELF64: ld
+-  store i64 %conv, i64* %b.addr, align 8
+-  ret void
+-}
+Index: test/CodeGen/PowerPC/fast-isel-conversion.ll
+===================================================================
+--- test/CodeGen/PowerPC/fast-isel-conversion.ll	(revision 106)
++++ test/CodeGen/PowerPC/fast-isel-conversion.ll	(revision 107)
+@@ -1,15 +1,24 @@
+ ; RUN: llc < %s -O0 -verify-machineinstrs -fast-isel-abort -mtriple=powerpc64-unknown-linux-gnu -mcpu=pwr7 | FileCheck %s --check-prefix=ELF64
++; RUN: llc < %s -O0 -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -mcpu=970 | FileCheck %s --check-prefix=PPC970
+ 
++;; Tests for 970 don't use -fast-isel-abort because we intentionally punt
++;; to SelectionDAG in some cases.
++
+ ; Test sitofp
+ 
+ define void @sitofp_single_i64(i64 %a, float %b) nounwind ssp {
+ entry:
+ ; ELF64: sitofp_single_i64
++; PPC970: sitofp_single_i64
+   %b.addr = alloca float, align 4
+   %conv = sitofp i64 %a to float
+ ; ELF64: std
+ ; ELF64: lfd
+ ; ELF64: fcfids
++; PPC970: std
++; PPC970: lfd
++; PPC970: fcfid
++; PPC970: frsp
+   store float %conv, float* %b.addr, align 4
+   ret void
+ }
+@@ -17,11 +26,16 @@ entry:
+ define void @sitofp_single_i32(i32 %a, float %b) nounwind ssp {
+ entry:
+ ; ELF64: sitofp_single_i32
++; PPC970: sitofp_single_i32
+   %b.addr = alloca float, align 4
+   %conv = sitofp i32 %a to float
+ ; ELF64: std
+ ; ELF64: lfiwax
+ ; ELF64: fcfids
++; PPC970: std
++; PPC970: lfd
++; PPC970: fcfid
++; PPC970: frsp
+   store float %conv, float* %b.addr, align 4
+   ret void
+ }
+@@ -29,6 +43,7 @@ entry:
+ define void @sitofp_single_i16(i16 %a, float %b) nounwind ssp {
+ entry:
+ ; ELF64: sitofp_single_i16
++; PPC970: sitofp_single_i16
+   %b.addr = alloca float, align 4
+   %conv = sitofp i16 %a to float
+ ; ELF64: extsh
+@@ -35,6 +50,11 @@ entry:
+ ; ELF64: std
+ ; ELF64: lfd
+ ; ELF64: fcfids
++; PPC970: extsh
++; PPC970: std
++; PPC970: lfd
++; PPC970: fcfid
++; PPC970: frsp
+   store float %conv, float* %b.addr, align 4
+   ret void
+ }
+@@ -42,6 +62,7 @@ entry:
+ define void @sitofp_single_i8(i8 %a) nounwind ssp {
+ entry:
+ ; ELF64: sitofp_single_i8
++; PPC970: sitofp_single_i8
+   %b.addr = alloca float, align 4
+   %conv = sitofp i8 %a to float
+ ; ELF64: extsb
+@@ -48,6 +69,11 @@ entry:
+ ; ELF64: std
+ ; ELF64: lfd
+ ; ELF64: fcfids
++; PPC970: extsb
++; PPC970: std
++; PPC970: lfd
++; PPC970: fcfid
++; PPC970: frsp
+   store float %conv, float* %b.addr, align 4
+   ret void
+ }
+@@ -55,11 +81,15 @@ entry:
+ define void @sitofp_double_i32(i32 %a, double %b) nounwind ssp {
+ entry:
+ ; ELF64: sitofp_double_i32
++; PPC970: sitofp_double_i32
+   %b.addr = alloca double, align 8
+   %conv = sitofp i32 %a to double
+ ; ELF64: std
+ ; ELF64: lfiwax
+ ; ELF64: fcfid
++; PPC970: std
++; PPC970: lfd
++; PPC970: fcfid
+   store double %conv, double* %b.addr, align 8
+   ret void
+ }
+@@ -67,11 +97,15 @@ entry:
+ define void @sitofp_double_i64(i64 %a, double %b) nounwind ssp {
+ entry:
+ ; ELF64: sitofp_double_i64
++; PPC970: sitofp_double_i64
+   %b.addr = alloca double, align 8
+   %conv = sitofp i64 %a to double
+ ; ELF64: std
+ ; ELF64: lfd
+ ; ELF64: fcfid
++; PPC970: std
++; PPC970: lfd
++; PPC970: fcfid
+   store double %conv, double* %b.addr, align 8
+   ret void
+ }
+@@ -79,6 +113,7 @@ entry:
+ define void @sitofp_double_i16(i16 %a, double %b) nounwind ssp {
+ entry:
+ ; ELF64: sitofp_double_i16
++; PPC970: sitofp_double_i16
+   %b.addr = alloca double, align 8
+   %conv = sitofp i16 %a to double
+ ; ELF64: extsh
+@@ -85,6 +120,10 @@ entry:
+ ; ELF64: std
+ ; ELF64: lfd
+ ; ELF64: fcfid
++; PPC970: extsh
++; PPC970: std
++; PPC970: lfd
++; PPC970: fcfid
+   store double %conv, double* %b.addr, align 8
+   ret void
+ }
+@@ -92,6 +131,7 @@ entry:
+ define void @sitofp_double_i8(i8 %a, double %b) nounwind ssp {
+ entry:
+ ; ELF64: sitofp_double_i8
++; PPC970: sitofp_double_i8
+   %b.addr = alloca double, align 8
+   %conv = sitofp i8 %a to double
+ ; ELF64: extsb
+@@ -98,6 +138,10 @@ entry:
+ ; ELF64: std
+ ; ELF64: lfd
+ ; ELF64: fcfid
++; PPC970: extsb
++; PPC970: std
++; PPC970: lfd
++; PPC970: fcfid
+   store double %conv, double* %b.addr, align 8
+   ret void
+ }
+@@ -107,11 +151,13 @@ entry:
+ define void @uitofp_single_i64(i64 %a, float %b) nounwind ssp {
+ entry:
+ ; ELF64: uitofp_single_i64
++; PPC970: uitofp_single_i64
+   %b.addr = alloca float, align 4
+   %conv = uitofp i64 %a to float
+ ; ELF64: std
+ ; ELF64: lfd
+ ; ELF64: fcfidus
++; PPC970-NOT: fcfidus
+   store float %conv, float* %b.addr, align 4
+   ret void
+ }
+@@ -119,11 +165,14 @@ entry:
+ define void @uitofp_single_i32(i32 %a, float %b) nounwind ssp {
+ entry:
+ ; ELF64: uitofp_single_i32
++; PPC970: uitofp_single_i32
+   %b.addr = alloca float, align 4
+   %conv = uitofp i32 %a to float
+ ; ELF64: std
+ ; ELF64: lfiwzx
+ ; ELF64: fcfidus
++; PPC970-NOT: lfiwzx
++; PPC970-NOT: fcfidus
+   store float %conv, float* %b.addr, align 4
+   ret void
+ }
+@@ -131,6 +180,7 @@ entry:
+ define void @uitofp_single_i16(i16 %a, float %b) nounwind ssp {
+ entry:
+ ; ELF64: uitofp_single_i16
++; PPC970: uitofp_single_i16
+   %b.addr = alloca float, align 4
+   %conv = uitofp i16 %a to float
+ ; ELF64: rldicl {{[0-9]+}}, {{[0-9]+}}, 0, 48
+@@ -137,6 +187,11 @@ entry:
+ ; ELF64: std
+ ; ELF64: lfd
+ ; ELF64: fcfidus
++; PPC970: rlwinm {{[0-9]+}}, {{[0-9]+}}, 0, 16, 31
++; PPC970: std
++; PPC970: lfd
++; PPC970: fcfid
++; PPC970: frsp
+   store float %conv, float* %b.addr, align 4
+   ret void
+ }
+@@ -144,6 +199,7 @@ entry:
+ define void @uitofp_single_i8(i8 %a) nounwind ssp {
+ entry:
+ ; ELF64: uitofp_single_i8
++; PPC970: uitofp_single_i8
+   %b.addr = alloca float, align 4
+   %conv = uitofp i8 %a to float
+ ; ELF64: rldicl {{[0-9]+}}, {{[0-9]+}}, 0, 56
+@@ -150,6 +206,11 @@ entry:
+ ; ELF64: std
+ ; ELF64: lfd
+ ; ELF64: fcfidus
++; PPC970: rlwinm {{[0-9]+}}, {{[0-9]+}}, 0, 24, 31
++; PPC970: std
++; PPC970: lfd
++; PPC970: fcfid
++; PPC970: frsp
+   store float %conv, float* %b.addr, align 4
+   ret void
+ }
+@@ -157,11 +218,13 @@ entry:
+ define void @uitofp_double_i64(i64 %a, double %b) nounwind ssp {
+ entry:
+ ; ELF64: uitofp_double_i64
++; PPC970: uitofp_double_i64
+   %b.addr = alloca double, align 8
+   %conv = uitofp i64 %a to double
+ ; ELF64: std
+ ; ELF64: lfd
+ ; ELF64: fcfidu
++; PPC970-NOT: fcfidu
+   store double %conv, double* %b.addr, align 8
+   ret void
+ }
+@@ -169,11 +232,14 @@ entry:
+ define void @uitofp_double_i32(i32 %a, double %b) nounwind ssp {
+ entry:
+ ; ELF64: uitofp_double_i32
++; PPC970: uitofp_double_i32
+   %b.addr = alloca double, align 8
+   %conv = uitofp i32 %a to double
+ ; ELF64: std
+ ; ELF64: lfiwzx
+ ; ELF64: fcfidu
++; PPC970-NOT: lfiwzx
++; PPC970-NOT: fcfidu
+   store double %conv, double* %b.addr, align 8
+   ret void
+ }
+@@ -181,6 +247,7 @@ entry:
+ define void @uitofp_double_i16(i16 %a, double %b) nounwind ssp {
+ entry:
+ ; ELF64: uitofp_double_i16
++; PPC970: uitofp_double_i16
+   %b.addr = alloca double, align 8
+   %conv = uitofp i16 %a to double
+ ; ELF64: rldicl {{[0-9]+}}, {{[0-9]+}}, 0, 48
+@@ -187,6 +254,10 @@ entry:
+ ; ELF64: std
+ ; ELF64: lfd
+ ; ELF64: fcfidu
++; PPC970: rlwinm {{[0-9]+}}, {{[0-9]+}}, 0, 16, 31
++; PPC970: std
++; PPC970: lfd
++; PPC970: fcfid
+   store double %conv, double* %b.addr, align 8
+   ret void
+ }
+@@ -194,6 +265,7 @@ entry:
+ define void @uitofp_double_i8(i8 %a, double %b) nounwind ssp {
+ entry:
+ ; ELF64: uitofp_double_i8
++; PPC970: uitofp_double_i8
+   %b.addr = alloca double, align 8
+   %conv = uitofp i8 %a to double
+ ; ELF64: rldicl {{[0-9]+}}, {{[0-9]+}}, 0, 56
+@@ -200,6 +272,10 @@ entry:
+ ; ELF64: std
+ ; ELF64: lfd
+ ; ELF64: fcfidu
++; PPC970: rlwinm {{[0-9]+}}, {{[0-9]+}}, 0, 24, 31
++; PPC970: std
++; PPC970: lfd
++; PPC970: fcfid
+   store double %conv, double* %b.addr, align 8
+   ret void
+ }
+@@ -209,11 +285,15 @@ entry:
+ define void @fptosi_float_i32(float %a) nounwind ssp {
+ entry:
+ ; ELF64: fptosi_float_i32
++; PPC970: fptosi_float_i32
+   %b.addr = alloca i32, align 4
+   %conv = fptosi float %a to i32
+ ; ELF64: fctiwz
+ ; ELF64: stfd
+ ; ELF64: lwa
++; PPC970: fctiwz
++; PPC970: stfd
++; PPC970: lwa
+   store i32 %conv, i32* %b.addr, align 4
+   ret void
+ }
+@@ -221,11 +301,15 @@ entry:
+ define void @fptosi_float_i64(float %a) nounwind ssp {
+ entry:
+ ; ELF64: fptosi_float_i64
++; PPC970: fptosi_float_i64
+   %b.addr = alloca i64, align 4
+   %conv = fptosi float %a to i64
+ ; ELF64: fctidz
+ ; ELF64: stfd
+ ; ELF64: ld
++; PPC970: fctidz
++; PPC970: stfd
++; PPC970: ld
+   store i64 %conv, i64* %b.addr, align 4
+   ret void
+ }
+@@ -233,11 +317,15 @@ entry:
+ define void @fptosi_double_i32(double %a) nounwind ssp {
+ entry:
+ ; ELF64: fptosi_double_i32
++; PPC970: fptosi_double_i32
+   %b.addr = alloca i32, align 8
+   %conv = fptosi double %a to i32
+ ; ELF64: fctiwz
+ ; ELF64: stfd
+ ; ELF64: lwa
++; PPC970: fctiwz
++; PPC970: stfd
++; PPC970: lwa
+   store i32 %conv, i32* %b.addr, align 8
+   ret void
+ }
+@@ -245,11 +333,15 @@ entry:
+ define void @fptosi_double_i64(double %a) nounwind ssp {
+ entry:
+ ; ELF64: fptosi_double_i64
++; PPC970: fptosi_double_i64
+   %b.addr = alloca i64, align 8
+   %conv = fptosi double %a to i64
+ ; ELF64: fctidz
+ ; ELF64: stfd
+ ; ELF64: ld
++; PPC970: fctidz
++; PPC970: stfd
++; PPC970: ld
+   store i64 %conv, i64* %b.addr, align 8
+   ret void
+ }
+@@ -259,11 +351,15 @@ entry:
+ define void @fptoui_float_i32(float %a) nounwind ssp {
+ entry:
+ ; ELF64: fptoui_float_i32
++; PPC970: fptoui_float_i32
+   %b.addr = alloca i32, align 4
+   %conv = fptoui float %a to i32
+ ; ELF64: fctiwuz
+ ; ELF64: stfd
+ ; ELF64: lwz
++; PPC970: fctidz
++; PPC970: stfd
++; PPC970: lwz
+   store i32 %conv, i32* %b.addr, align 4
+   ret void
+ }
+@@ -271,11 +367,13 @@ entry:
+ define void @fptoui_float_i64(float %a) nounwind ssp {
+ entry:
+ ; ELF64: fptoui_float_i64
++; PPC970: fptoui_float_i64
+   %b.addr = alloca i64, align 4
+   %conv = fptoui float %a to i64
+ ; ELF64: fctiduz
+ ; ELF64: stfd
+ ; ELF64: ld
++; PPC970-NOT: fctiduz
+   store i64 %conv, i64* %b.addr, align 4
+   ret void
+ }
+@@ -283,11 +381,15 @@ entry:
+ define void @fptoui_double_i32(double %a) nounwind ssp {
+ entry:
+ ; ELF64: fptoui_double_i32
++; PPC970: fptoui_double_i32
+   %b.addr = alloca i32, align 8
+   %conv = fptoui double %a to i32
+ ; ELF64: fctiwuz
+ ; ELF64: stfd
+ ; ELF64: lwz
++; PPC970: fctidz
++; PPC970: stfd
++; PPC970: lwz
+   store i32 %conv, i32* %b.addr, align 8
+   ret void
+ }
+@@ -295,11 +397,13 @@ entry:
+ define void @fptoui_double_i64(double %a) nounwind ssp {
+ entry:
+ ; ELF64: fptoui_double_i64
++; PPC970: fptoui_double_i64
+   %b.addr = alloca i64, align 8
+   %conv = fptoui double %a to i64
+ ; ELF64: fctiduz
+ ; ELF64: stfd
+ ; ELF64: ld
++; PPC970-NOT: fctiduz
+   store i64 %conv, i64* %b.addr, align 8
+   ret void
+ }
diff --git a/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp b/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp
index 36aae33ec838..69b642edb6e8 100644
--- a/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp
+++ b/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp
@@ -183,7 +183,8 @@ static const char *getARMTargetCPU(const ArgList &Args,
     MArch = Triple.getArchName();
   }
 
-  if (Triple.getOS() == llvm::Triple::NetBSD) {
+  if (Triple.getOS() == llvm::Triple::NetBSD ||
+      Triple.getOS() == llvm::Triple::FreeBSD) {
     if (MArch == "armv6")
       return "arm1176jzf-s";
   }
diff --git a/contrib/llvm/tools/clang/lib/Driver/Tools.cpp b/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
index 8b68869bdd9f..525a9f0300aa 100644
--- a/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
+++ b/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
@@ -499,7 +499,8 @@ static std::string getARMTargetCPU(const ArgList &Args,
     MArch = Triple.getArchName();
   }
 
-  if (Triple.getOS() == llvm::Triple::NetBSD) {
+  if (Triple.getOS() == llvm::Triple::NetBSD ||
+      Triple.getOS() == llvm::Triple::FreeBSD) {
     if (MArch == "armv6")
       return "arm1176jzf-s";
   }
diff --git a/contrib/llvm/tools/lldb/tools/driver/Platform.h b/contrib/llvm/tools/lldb/tools/driver/Platform.h
index faa2991bf6f3..87b1d171a827 100644
--- a/contrib/llvm/tools/lldb/tools/driver/Platform.h
+++ b/contrib/llvm/tools/lldb/tools/driver/Platform.h
@@ -101,12 +101,6 @@
     #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/openbsm/libbsm/bsm_io.c b/contrib/openbsm/libbsm/bsm_io.c
index 85fab590b402..44c3b351eb1e 100644
--- a/contrib/openbsm/libbsm/bsm_io.c
+++ b/contrib/openbsm/libbsm/bsm_io.c
@@ -949,7 +949,7 @@ print_header32_tok(FILE *fp, tokenstr_t *tok, char *del, int oflags)
 {
 
 	print_tok_type(fp, tok->id, "header", oflags);
-	if (oflags & AU_OFLAG_RAW) {
+	if (oflags & AU_OFLAG_XML) {
 		open_attr(fp, "version");
 		print_1_byte(fp, tok->tt.hdr32.version, "%u");
 		close_attr(fp);
diff --git a/contrib/opie/libopie/challenge.c b/contrib/opie/libopie/challenge.c
index fc836aa6cc5d..6c42018db0a3 100644
--- a/contrib/opie/libopie/challenge.c
+++ b/contrib/opie/libopie/challenge.c
@@ -68,7 +68,9 @@ int opiechallenge FUNCTION((mp, name, ss), struct opie *mp AND char *name AND ch
   }
 
   if (rval ||
-    (snprintf(ss, OPIE_CHALLENGE_MAX, "otp-%s %d %s ext", algids[MDX], mp->opie_n - 1, mp->opie_seed) >= OPIE_CHALLENGE_MAX)) {
+    (snprintf(ss, OPIE_CHALLENGE_MAX+1, "otp-%s %d %s ext", algids[MDX], mp->opie_n - 1, mp->opie_seed) >= OPIE_CHALLENGE_MAX+1)) {
+    if (!rval)
+      rval = 1;
     opierandomchallenge(ss);
     memset(mp, 0, sizeof(*mp));
   }
diff --git a/contrib/opie/opie.h b/contrib/opie/opie.h
index 2549d04fc427..8e88135a55e1 100644
--- a/contrib/opie/opie.h
+++ b/contrib/opie/opie.h
@@ -69,11 +69,11 @@ struct opie {
 /* Maximum length of a seed */
 #define OPIE_SEED_MAX 16
 
-/* Max length of hash algorithm name (md4/md5) */
-#define OPIE_HASHNAME_MAX 3
+/* Max length of hash algorithm name (md4/md5/sha1) */
+#define OPIE_HASHNAME_MAX 4
 
-/* Maximum length of a challenge (otp-md? 9999 seed) */
-#define OPIE_CHALLENGE_MAX (4+OPIE_HASHNAME_MAX+1+4+1+OPIE_SEED_MAX)
+/* Maximum length of a challenge (otp-md? 9999 seed ext) */
+#define OPIE_CHALLENGE_MAX (4+OPIE_HASHNAME_MAX+1+4+1+OPIE_SEED_MAX+1+3)
 
 /* Maximum length of a response that we allow */
 #define OPIE_RESPONSE_MAX (9+1+19+1+9+OPIE_SEED_MAX+1+19+1+19+1+19)
diff --git a/contrib/opie/opiekey.c b/contrib/opie/opiekey.c
index a260d9650d16..a6c7aab69767 100644
--- a/contrib/opie/opiekey.c
+++ b/contrib/opie/opiekey.c
@@ -145,7 +145,7 @@ int main FUNCTION((argc, argv), int argc AND char *argv[])
   int type = RESPONSE_STANDARD;
   int force = 0;
 
-  if (slash = strchr(argv[0], '/'))
+  if (slash = strrchr(argv[0], '/'))
     slash++;
   else
     slash = argv[0];
diff --git a/contrib/serf/CHANGES b/contrib/serf/CHANGES
index 64eaaa3b5582..6d39b0c5c096 100644
--- a/contrib/serf/CHANGES
+++ b/contrib/serf/CHANGES
@@ -1,4 +1,11 @@
-Serf 1.3.5 [2014-04-27, from /tags/1.3.5, rxxxx]
+Serf 1.3.7 [2014-08-11, from /tags/1.3.7, r2411]
+  Handle NUL bytes in fields of an X.509 certificate. (r2393, r2399)
+
+Serf 1.3.6 [2014-06-09, from /tags/1.3.6, r2372]
+  Revert r2319 from serf 1.3.5: this change was making serf call handle_response
+    multiple times in case of an error response, leading to unexpected behavior.
+
+Serf 1.3.5 [2014-04-27, from /tags/1.3.5, r2355]
   Fix issue #125: no reverse lookup during Negotiate authentication for proxies.
   Fix a crash caused by incorrect reuse of the ssltunnel CONNECT request (r2316)
   Cancel request if response parsing failed + authn callback set (r2319)
diff --git a/contrib/serf/auth/auth.c b/contrib/serf/auth/auth.c
index 811709122a8c..6ba3ba5ab59e 100644
--- a/contrib/serf/auth/auth.c
+++ b/contrib/serf/auth/auth.c
@@ -408,7 +408,6 @@ apr_status_t serf__handle_auth_response(int *consumed_response,
                consider the reponse body as invalid and discard it. */
             status = discard_body(response);
             *consumed_response = 1;
-
             if (!APR_STATUS_IS_EOF(status)) {
                 return status;
             }
diff --git a/contrib/serf/buckets/ssl_buckets.c b/contrib/serf/buckets/ssl_buckets.c
index 1a27d3f8e4fe..d2fe51d71501 100644
--- a/contrib/serf/buckets/ssl_buckets.c
+++ b/contrib/serf/buckets/ssl_buckets.c
@@ -202,6 +202,8 @@ struct serf_ssl_certificate_t {
 };
 
 static void disable_compression(serf_ssl_context_t *ssl_ctx);
+static char *
+    pstrdup_escape_nul_bytes(const char *buf, int len, apr_pool_t *pool);
 
 #if SSL_VERBOSE
 /* Log all ssl alerts that we receive from the server. */
@@ -427,6 +429,85 @@ static BIO_METHOD bio_file_method = {
 #endif
 };
 
+typedef enum san_copy_t {
+    EscapeNulAndCopy = 0,
+    ErrorOnNul = 1,
+} san_copy_t;
+
+
+static apr_status_t
+get_subject_alt_names(apr_array_header_t **san_arr, X509 *ssl_cert,
+                      san_copy_t copy_action, apr_pool_t *pool)
+{
+    STACK_OF(GENERAL_NAME) *names;
+
+    /* assert: copy_action == ErrorOnNul || (san_arr && pool) */
+
+    if (san_arr) {
+        *san_arr = NULL;
+    }
+
+    /* Get subjectAltNames */
+    names = X509_get_ext_d2i(ssl_cert, NID_subject_alt_name, NULL, NULL);
+    if (names) {
+        int names_count = sk_GENERAL_NAME_num(names);
+        int name_idx;
+
+        if (san_arr)
+            *san_arr = apr_array_make(pool, names_count, sizeof(char*));
+        for (name_idx = 0; name_idx < names_count; name_idx++) {
+            char *p = NULL;
+            GENERAL_NAME *nm = sk_GENERAL_NAME_value(names, name_idx);
+
+            switch (nm->type) {
+                case GEN_DNS:
+                    if (copy_action == ErrorOnNul &&
+                        strlen(nm->d.ia5->data) != nm->d.ia5->length)
+                        return SERF_ERROR_SSL_CERT_FAILED;
+                    if (san_arr && *san_arr)
+                        p = pstrdup_escape_nul_bytes((const char *)nm->d.ia5->data,
+                                                     nm->d.ia5->length,
+                                                     pool);
+                    break;
+                default:
+                    /* Don't know what to do - skip. */
+                    break;
+            }
+
+            if (p) {
+                APR_ARRAY_PUSH(*san_arr, char*) = p;
+            }
+        }
+        sk_GENERAL_NAME_pop_free(names, GENERAL_NAME_free);
+    }
+    
+    return APR_SUCCESS;
+}
+
+static apr_status_t validate_cert_hostname(X509 *server_cert, apr_pool_t *pool)
+{
+    char buf[1024];
+    int length;
+    apr_status_t ret;
+
+    ret = get_subject_alt_names(NULL, server_cert, ErrorOnNul, NULL);
+    if (ret) {
+      return ret;
+    } else {
+        /* Fail if the subject's CN field contains \0 characters. */
+        X509_NAME *subject = X509_get_subject_name(server_cert);
+        if (!subject)
+            return SERF_ERROR_SSL_CERT_FAILED;
+
+        length = X509_NAME_get_text_by_NID(subject, NID_commonName, buf, 1024);
+        if (length != -1)
+            if (strlen(buf) != length)
+                return SERF_ERROR_SSL_CERT_FAILED;
+    }
+
+    return APR_SUCCESS;
+}
+
 static int
 validate_server_certificate(int cert_valid, X509_STORE_CTX *store_ctx)
 {
@@ -435,6 +516,7 @@ validate_server_certificate(int cert_valid, X509_STORE_CTX *store_ctx)
     X509 *server_cert;
     int err, depth;
     int failures = 0;
+    apr_status_t status;
 
     ssl = X509_STORE_CTX_get_ex_data(store_ctx,
                                      SSL_get_ex_data_X509_STORE_CTX_idx());
@@ -475,6 +557,11 @@ validate_server_certificate(int cert_valid, X509_STORE_CTX *store_ctx)
         }
     }
 
+    /* Validate hostname */
+    status = validate_cert_hostname(server_cert, ctx->pool);
+    if (status)
+        failures |= SERF_SSL_CERT_UNKNOWN_FAILURE;
+
     /* Check certificate expiry dates. */
     if (X509_cmp_current_time(X509_get_notBefore(server_cert)) >= 0) {
         failures |= SERF_SSL_CERT_NOTYETVALID;
@@ -485,7 +572,6 @@ validate_server_certificate(int cert_valid, X509_STORE_CTX *store_ctx)
 
     if (ctx->server_cert_callback &&
         (depth == 0 || failures)) {
-        apr_status_t status;
         serf_ssl_certificate_t *cert;
         apr_pool_t *subpool;
 
@@ -512,7 +598,6 @@ validate_server_certificate(int cert_valid, X509_STORE_CTX *store_ctx)
 
     if (ctx->server_cert_chain_callback
         && (depth == 0 || failures)) {
-        apr_status_t status;
         STACK_OF(X509) *chain;
         const serf_ssl_certificate_t **certs;
         int certs_len;
@@ -1461,7 +1546,50 @@ serf_ssl_context_t *serf_bucket_ssl_encrypt_context_get(
 
 /* Functions to read a serf_ssl_certificate structure. */
 
-/* Creates a hash_table with keys (E, CN, OU, O, L, ST and C). */
+/* Takes a counted length string and escapes any NUL bytes so that
+ * it can be used as a C string.  NUL bytes are escaped as 3 characters
+ * "\00" (that's a literal backslash).
+ * The returned string is allocated in POOL.
+ */
+static char *
+pstrdup_escape_nul_bytes(const char *buf, int len, apr_pool_t *pool)
+{
+    int i, nul_count = 0;
+    char *ret;
+
+    /* First determine if there are any nul bytes in the string. */
+    for (i = 0; i < len; i++) {
+        if (buf[i] == '\0')
+            nul_count++;
+    }
+
+    if (nul_count == 0) {
+        /* There aren't so easy case to just copy the string */
+        ret = apr_pstrdup(pool, buf);
+    } else {
+        /* There are so we have to replace nul bytes with escape codes
+         * Proper length is the length of the original string, plus
+         * 2 times the number of nulls (for two digit hex code for
+         * the value) + the trailing null. */
+        char *pos;
+        ret = pos = apr_palloc(pool, len + 2 * nul_count + 1);
+        for (i = 0; i < len; i++) {
+            if (buf[i] != '\0') {
+                *(pos++) = buf[i];
+            } else {
+                *(pos++) = '\\';
+                *(pos++) = '0';
+                *(pos++) = '0';
+            }
+        }
+        *pos = '\0';
+    }
+
+    return ret;
+}
+
+/* Creates a hash_table with keys (E, CN, OU, O, L, ST and C). Any NUL bytes in
+   these fields in the certificate will be escaped as \00. */
 static apr_hash_t *
 convert_X509_NAME_to_table(X509_NAME *org, apr_pool_t *pool)
 {
@@ -1474,37 +1602,44 @@ convert_X509_NAME_to_table(X509_NAME *org, apr_pool_t *pool)
                                     NID_commonName,
                                     buf, 1024);
     if (ret != -1)
-        apr_hash_set(tgt, "CN", APR_HASH_KEY_STRING, apr_pstrdup(pool, buf));
+        apr_hash_set(tgt, "CN", APR_HASH_KEY_STRING,
+                     pstrdup_escape_nul_bytes(buf, ret, pool));
     ret = X509_NAME_get_text_by_NID(org,
                                     NID_pkcs9_emailAddress,
                                     buf, 1024);
     if (ret != -1)
-        apr_hash_set(tgt, "E", APR_HASH_KEY_STRING, apr_pstrdup(pool, buf));
+        apr_hash_set(tgt, "E", APR_HASH_KEY_STRING,
+                     pstrdup_escape_nul_bytes(buf, ret, pool));
     ret = X509_NAME_get_text_by_NID(org,
                                     NID_organizationalUnitName,
                                     buf, 1024);
     if (ret != -1)
-        apr_hash_set(tgt, "OU", APR_HASH_KEY_STRING, apr_pstrdup(pool, buf));
+        apr_hash_set(tgt, "OU", APR_HASH_KEY_STRING,
+                     pstrdup_escape_nul_bytes(buf, ret, pool));
     ret = X509_NAME_get_text_by_NID(org,
                                     NID_organizationName,
                                     buf, 1024);
     if (ret != -1)
-        apr_hash_set(tgt, "O", APR_HASH_KEY_STRING, apr_pstrdup(pool, buf));
+        apr_hash_set(tgt, "O", APR_HASH_KEY_STRING,
+                     pstrdup_escape_nul_bytes(buf, ret, pool));
     ret = X509_NAME_get_text_by_NID(org,
                                     NID_localityName,
                                     buf, 1024);
     if (ret != -1)
-        apr_hash_set(tgt, "L", APR_HASH_KEY_STRING, apr_pstrdup(pool, buf));
+        apr_hash_set(tgt, "L", APR_HASH_KEY_STRING,
+                     pstrdup_escape_nul_bytes(buf, ret, pool));
     ret = X509_NAME_get_text_by_NID(org,
                                     NID_stateOrProvinceName,
                                     buf, 1024);
     if (ret != -1)
-        apr_hash_set(tgt, "ST", APR_HASH_KEY_STRING, apr_pstrdup(pool, buf));
+        apr_hash_set(tgt, "ST", APR_HASH_KEY_STRING,
+                     pstrdup_escape_nul_bytes(buf, ret, pool));
     ret = X509_NAME_get_text_by_NID(org,
                                     NID_countryName,
                                     buf, 1024);
     if (ret != -1)
-        apr_hash_set(tgt, "C", APR_HASH_KEY_STRING, apr_pstrdup(pool, buf));
+        apr_hash_set(tgt, "C", APR_HASH_KEY_STRING,
+                     pstrdup_escape_nul_bytes(buf, ret, pool));
 
     return tgt;
 }
@@ -1550,7 +1685,7 @@ apr_hash_t *serf_ssl_cert_certificate(
     unsigned int md_size, i;
     unsigned char md[EVP_MAX_MD_SIZE];
     BIO *bio;
-    STACK_OF(GENERAL_NAME) *names;
+    apr_array_header_t *san_arr;
 
     /* sha1 fingerprint */
     if (X509_digest(cert->ssl_cert, EVP_sha1(), md, &md_size)) {
@@ -1595,32 +1730,8 @@ apr_hash_t *serf_ssl_cert_certificate(
     BIO_free(bio);
 
     /* Get subjectAltNames */
-    names = X509_get_ext_d2i(cert->ssl_cert, NID_subject_alt_name, NULL, NULL);
-    if (names) {
-        int names_count = sk_GENERAL_NAME_num(names);
-
-        apr_array_header_t *san_arr = apr_array_make(pool, names_count,
-                                                     sizeof(char*));
+    if (!get_subject_alt_names(&san_arr, cert->ssl_cert, EscapeNulAndCopy, pool))
         apr_hash_set(tgt, "subjectAltName", APR_HASH_KEY_STRING, san_arr);
-        for (i = 0; i < names_count; i++) {
-            char *p = NULL;
-            GENERAL_NAME *nm = sk_GENERAL_NAME_value(names, i);
-
-            switch (nm->type) {
-            case GEN_DNS:
-                p = apr_pstrmemdup(pool, (const char *)nm->d.ia5->data,
-                                   nm->d.ia5->length);
-                break;
-            default:
-                /* Don't know what to do - skip. */
-                break;
-            }
-            if (p) {
-                APR_ARRAY_PUSH(san_arr, char*) = p;
-            }
-        }
-        sk_GENERAL_NAME_pop_free(names, GENERAL_NAME_free);
-    }
 
     return tgt;
 }
diff --git a/contrib/serf/outgoing.c b/contrib/serf/outgoing.c
index 0d0e5e2e1c9a..3fc726c038e4 100644
--- a/contrib/serf/outgoing.c
+++ b/contrib/serf/outgoing.c
@@ -916,22 +916,21 @@ static apr_status_t handle_response(serf_request_t *request,
      * themselves by not registering credential callbacks.
      */
     if (request->conn->ctx->cred_cb) {
-        status = serf__handle_auth_response(&consumed_response,
-                                            request,
-                                            request->resp_bkt,
-                                            request->handler_baton,
-                                            pool);
+      status = serf__handle_auth_response(&consumed_response,
+                                          request,
+                                          request->resp_bkt,
+                                          request->handler_baton,
+                                          pool);
 
-        if (SERF_BUCKET_READ_ERROR(status)) {
-            /* Report the request as 'died'/'cancelled' to the application */
-            (void)(*request->handler)(request,
-                                      NULL,
-                                      request->handler_baton,
-                                      pool);
-        }
+      /* If there was an error reading the response (maybe there wasn't
+         enough data available), don't bother passing the response to the
+         application.
 
-        if (status)
-            return status;
+         If the authentication was tried, but failed, pass the response
+         to the application, maybe it can do better. */
+      if (status) {
+          return status;
+      }
     }
 
     if (!consumed_response) {
diff --git a/contrib/serf/serf.h b/contrib/serf/serf.h
index 55d6a3a1b43e..f6f34a7c7ddd 100644
--- a/contrib/serf/serf.h
+++ b/contrib/serf/serf.h
@@ -1062,7 +1062,7 @@ void serf_debug__bucket_alloc_check(
 /* Version info */
 #define SERF_MAJOR_VERSION 1
 #define SERF_MINOR_VERSION 3
-#define SERF_PATCH_VERSION 5
+#define SERF_PATCH_VERSION 7
 
 /* Version number string */
 #define SERF_VERSION_STRING APR_STRINGIFY(SERF_MAJOR_VERSION) "." \
diff --git a/contrib/sqlite3/INSTALL b/contrib/sqlite3/INSTALL
index 23e5f25d0e5f..a1e89e18ad20 100644
--- a/contrib/sqlite3/INSTALL
+++ b/contrib/sqlite3/INSTALL
@@ -1,16 +1,25 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
 
-These are generic installation instructions.
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +32,9 @@ debugging `configure').
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,30 +44,37 @@ some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
 
-  5. You can remove the program binaries and object files from the
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,45 +83,69 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+   By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -116,16 +156,47 @@ Documentation and other data files still use the regular prefix.
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -137,14 +208,58 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -152,7 +267,8 @@ type, such as `sun4', or a canonical name which has the form:
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -170,9 +286,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +297,7 @@ A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -190,21 +306,29 @@ them in the `configure' command line, using `VAR=value'.  For example:
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
-     Print a summary of the options to `configure', and exit.
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
 
 `--version'
 `-V'
@@ -231,6 +355,16 @@ configuration-related scripts to be executed by `/bin/bash'.
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 
diff --git a/contrib/sqlite3/Makefile.in b/contrib/sqlite3/Makefile.in
index e74bc0138d80..d0b8c3e97502 100644
--- a/contrib/sqlite3/Makefile.in
+++ b/contrib/sqlite3/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 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.
@@ -17,15 +18,29 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -40,56 +55,84 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = sqlite3$(EXEEXT)
+subdir = .
 DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/sqlite3.pc.in $(top_srcdir)/configure INSTALL \
 	config.guess config.sub depcomp install-sh ltmain.sh missing
-subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_CLEAN_FILES = sqlite3.pc
+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 = `echo $$p | sed -e 's|^.*/||'`;
+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)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)" \
 	"$(DESTDIR)$(includedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libsqlite3_la_LIBADD =
 am_libsqlite3_la_OBJECTS = sqlite3.lo
 libsqlite3_la_OBJECTS = $(am_libsqlite3_la_OBJECTS)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+libsqlite3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libsqlite3_la_LDFLAGS) $(LDFLAGS) -o $@
 PROGRAMS = $(bin_PROGRAMS)
 am_sqlite3_OBJECTS = shell.$(OBJEXT)
 sqlite3_OBJECTS = $(am_sqlite3_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir)
+DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/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 --mode=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 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libsqlite3_la_SOURCES) $(sqlite3_SOURCES)
 DIST_SOURCES = $(libsqlite3_la_SOURCES) $(sqlite3_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pkgconfig_DATA)
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -97,16 +140,18 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(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@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -119,57 +164,65 @@ 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@
 DYNAMIC_EXTENSION_FLAGS = @DYNAMIC_EXTENSION_FLAGS@
-ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+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@
 READLINE_LIBS = @READLINE_LIBS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 THREADSAFE_FLAGS = @THREADSAFE_FLAGS@
 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_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -181,6 +234,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -208,8 +262,12 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
 lib_LTLIBRARIES = libsqlite3.la
 libsqlite3_la_SOURCES = sqlite3.c
@@ -226,21 +284,21 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
+	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 \
@@ -256,28 +314,34 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
 	$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
 sqlite3.pc: $(top_builddir)/config.status $(srcdir)/sqlite3.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  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)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@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:
@@ -288,39 +352,57 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libsqlite3.la: $(libsqlite3_la_OBJECTS) $(libsqlite3_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libsqlite3_la_LDFLAGS) $(libsqlite3_la_OBJECTS) $(libsqlite3_la_LIBADD) $(LIBS)
+libsqlite3.la: $(libsqlite3_la_OBJECTS) $(libsqlite3_la_DEPENDENCIES) $(EXTRA_libsqlite3_la_DEPENDENCIES) 
+	$(libsqlite3_la_LINK) -rpath $(libdir) $(libsqlite3_la_OBJECTS) $(libsqlite3_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	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)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@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)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-sqlite3$(EXEEXT): $(sqlite3_OBJECTS) $(sqlite3_DEPENDENCIES) 
+	@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
+sqlite3$(EXEEXT): $(sqlite3_OBJECTS) $(sqlite3_DEPENDENCIES) $(EXTRA_sqlite3_DEPENDENCIES) 
 	@rm -f sqlite3$(EXEEXT)
-	$(LINK) $(sqlite3_LDFLAGS) $(sqlite3_OBJECTS) $(sqlite3_LDADD) $(LIBS)
+	$(LINK) $(sqlite3_OBJECTS) $(sqlite3_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -332,22 +414,22 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqlite3.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.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 $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.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 `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.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 $@ $<
@@ -359,177 +441,215 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-install-man1: $(man1_MANS) $(man_MANS)
+	-rm -f libtool config.lt
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
+	} | 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 \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-	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='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(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-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
 	done
 
 uninstall-pkgconfigDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-	done
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 install-includeHEADERS: $(include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
-	@list='$(include_HEADERS)'; for p in $$list; do \
+	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+	  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)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
-	done
+	@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; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	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; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(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; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  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)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	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; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(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) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
+	@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)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/.
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	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; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    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 \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	-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 $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
+	  ! -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 -9 -c >$(distdir).tar.bz2
+	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
@@ -555,13 +675,19 @@ dist dist-all: distdir
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  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) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -569,10 +695,13 @@ distcheck: dist
 	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-$$$$/" \
-	  && cd $(distdir)/_build \
+	  && 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 \
@@ -593,14 +722,24 @@ distcheck: dist
 	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	  && $(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 '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@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)"; \
@@ -623,7 +762,7 @@ install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -635,16 +774,22 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:
 
 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)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -667,6 +812,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -674,12 +821,30 @@ info-am:
 install-data-am: install-includeHEADERS install-man \
 	install-pkgconfigDATA
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man: install-man1
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -703,30 +868,34 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
-	uninstall-info-am uninstall-libLTLIBRARIES uninstall-man \
-	uninstall-pkgconfigDATA
+	uninstall-libLTLIBRARIES uninstall-man uninstall-pkgconfigDATA
 
 uninstall-man: uninstall-man1
 
+.MAKE: install-am install-strip
+
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
 	clean-libtool ctags dist dist-all dist-bzip2 dist-gzip \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-exec \
-	install-exec-am install-includeHEADERS install-info \
-	install-info-am install-libLTLIBRARIES install-man \
-	install-man1 install-pkgconfigDATA install-strip 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-binPROGRAMS \
-	uninstall-includeHEADERS uninstall-info-am \
+	dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-includeHEADERS install-info install-info-am \
+	install-libLTLIBRARIES install-man install-man1 install-pdf \
+	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+	install-strip 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-binPROGRAMS uninstall-includeHEADERS \
 	uninstall-libLTLIBRARIES uninstall-man uninstall-man1 \
 	uninstall-pkgconfigDATA
 
+
 # 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/sqlite3/aclocal.m4 b/contrib/sqlite3/aclocal.m4
index 4723f850086f..2f6e954bfd00 100644
--- a/contrib/sqlite3/aclocal.m4
+++ b/contrib/sqlite3/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,103 +12,208 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
 
-# serial 48 AC_PROG_LIBTOOL
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 57 LT_INIT
 
 
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-	         [m4_ifdef([AC_PROVIDE_$1],
-		           [$2], [$3])])])
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
 
 
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	[AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-	     [define([LT_AC_PROG_GCJ],
-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
 
 
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="$ltmain"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 AC_SUBST(LIBTOOL)dnl
 
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
 
 
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
 dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
 
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
 
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
 
 case $host_os in
 aix3*)
@@ -121,116 +227,706 @@ aix3*)
   ;;
 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 to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
 # Global variables:
-default_ofile=libtool
+ofile=libtool
 can_build_shared=yes
 
 # All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
 
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
+with_gnu_ld="$lt_cv_prog_gnu_ld"
 
 old_CC="$CC"
 old_CFLAGS="$CFLAGS"
 
 # Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
 test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-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 \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
 _LT_CC_BASENAME([$compiler])
 
 # Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
+    _LT_PATH_MAGIC
   fi
   ;;
 esac
 
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
 # Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
 
 
-# _LT_AC_SYS_COMPILER
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
 # -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_REPLACE_SHELLFNS
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
 [AC_REQUIRE([AC_PROG_CC])dnl
 
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
@@ -239,35 +935,20 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
 # Allow CC to be a program name with arguments.
 compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
+])# _LT_TAG_COMPILER
 
 
 # _LT_COMPILER_BOILERPLATE
 # ------------------------
 # Check for compiler boilerplate output or warnings with
 # the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
+$RM conftest*
 ])# _LT_COMPILER_BOILERPLATE
 
 
@@ -275,207 +956,323 @@ $rm conftest*
 # ----------------------
 # Check for linker boilerplate output or warnings with
 # the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
-$rm conftest*
+$RM -r conftest*
 ])# _LT_LINKER_BOILERPLATE
 
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
 
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
 # Links a minimal program and checks the executable
 # for the system default hardcoded library path. In most cases,
 # this is /usr/lib:/lib, but when the MPI compilers are used
 # the location of the communication and MPI libs are included too.
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
 
 
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
 
 
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
+
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
 esac
 
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
 
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-[$]*
-EOF
-  exit 0
-fi
-
-# 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
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "[$]0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
 
 
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
 [AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
@@ -486,86 +1283,93 @@ ia64-*-hpux*)
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
+      *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 __oline__ "configure"' > conftest.$ac_ext
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
+    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-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
-    *32-bit*)
-      case $host in
-        x86_64-*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-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
+      *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*
@@ -577,53 +1381,145 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
   CFLAGS="$CFLAGS -belf"
   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
     [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
      AC_LANG_POP])
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      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*
   ;;
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-  ])
 esac
 
 need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
+])# _LT_ENABLE_LOCK
 
 
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 #		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
 # ----------------------------------------------------------------
 # Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
 AC_CACHE_CHECK([$1], [$2],
   [$2=no
-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$3"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -634,48 +1530,55 @@ AC_CACHE_CHECK([$1], [$2],
    -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
      fi
    fi
-   $rm conftest*
+   $RM conftest*
 ])
 
 if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
+    m4_if([$5], , :, [$5])
 else
-    ifelse([$6], , :, [$6])
+    m4_if([$6], , :, [$6])
 fi
-])# AC_LIBTOOL_COMPILER_OPTION
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
 
 
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
   [$2=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          $2=yes
@@ -684,22 +1587,28 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
        $2=yes
      fi
    fi
-   $rm conftest*
+   $RM -r conftest*
    LDFLAGS="$save_LDFLAGS"
 ])
 
 if test x"[$]$2" = xyes; then
-    ifelse([$4], , :, [$4])
+    m4_if([$4], , :, [$4])
 else
-    ifelse([$5], , :, [$5])
+    m4_if([$5], , :, [$5])
 fi
-])# AC_LIBTOOL_LINKER_OPTION
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
 
 
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
 AC_MSG_CHECKING([the maximum length of command line arguments])
 AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
   i=0
@@ -721,7 +1630,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=-1;
     ;;
 
-  cygwin* | mingw*)
+  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,
@@ -732,6 +1641,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     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.
@@ -757,6 +1671,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     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
@@ -776,30 +1695,41 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
   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/.*[[ 	]]//'`
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
     else
       lt_cv_sys_max_cmd_len=32768
     fi
     ;;
   *)
-    # 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.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    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`
+    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
 ])
@@ -808,28 +1738,36 @@ if test -n $lt_cv_sys_max_cmd_len ; then
 else
   AC_MSG_RESULT(none)
 fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
 
 
-# _LT_AC_CHECK_DLFCN
-# ------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
 
 
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
 if test "$cross_compiling" = yes; then :
   [$4]
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -870,11 +1808,13 @@ else
 #  endif
 #endif
 
-#ifdef __cplusplus
-extern "C" void exit (int);
+/* 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
 
-void fnord() { int i=42;}
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -883,15 +1823,19 @@ int main ()
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
     puts (dlerror ());
 
-    exit (status);
+  return status;
 }]
-EOF
+_LT_EOF
   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
     lt_status=$?
@@ -906,13 +1850,13 @@ EOF
   fi
 fi
 rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
+])# _LT_TRY_DLOPEN_SELF
 
 
-# AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
 if test "x$enable_dlopen" != xyes; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
@@ -928,15 +1872,15 @@ else
     lt_cv_dlopen_self=yes
     ;;
 
-  mingw* | pw32*)
+  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
@@ -946,13 +1890,13 @@ else
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     ])
-   ;;
+    ;;
 
   *)
     AC_CHECK_FUNC([shl_load],
 	  [lt_cv_dlopen="shl_load"],
       [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
 	[AC_CHECK_FUNC([dlopen],
 	      [lt_cv_dlopen="dlopen"],
 	  [AC_CHECK_LIB([dl], [dlopen],
@@ -960,7 +1904,7 @@ else
 	    [AC_CHECK_LIB([svld], [dlopen],
 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
 	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
 	      ])
 	    ])
 	  ])
@@ -988,7 +1932,7 @@ else
 
     AC_CACHE_CHECK([whether a program can dlopen itself],
 	  lt_cv_dlopen_self, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
+	  _LT_TRY_DLOPEN_SELF(
 	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
 	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
     ])
@@ -996,8 +1940,8 @@ else
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-    	  lt_cv_dlopen_self_static, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
 	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
 	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
       ])
@@ -1019,22 +1963,36 @@ else
   *) enable_dlopen_self_static=unknown ;;
   esac
 fi
-])# AC_LIBTOOL_DLOPEN_SELF
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
 
 
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $rm -r conftest 2>/dev/null
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   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
@@ -1045,46 +2003,50 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
    -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $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_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
    chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $rm conftest*
+   $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
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
    cd ..
-   rmdir conftest
-   $rm conftest*
+   $RM -r conftest
+   $RM conftest*
 ])
-])# AC_LIBTOOL_PROG_CC_C_O
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
 
 
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
 # Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
 
 hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
   AC_MSG_CHECKING([if we can lock with hard links])
   hard_links=yes
-  $rm conftest*
+  $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
@@ -1097,12 +2059,13 @@ if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks"
 else
   need_locks=no
 fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
 
 
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
 [AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
 [rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -1114,40 +2077,46 @@ else
 fi
 rmdir .libs 2>/dev/null])
 objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
 
 
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
 # Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
 [AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 
-  # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
     # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+    _LT_TAGVAR(hardcode_action, $1)=relink
   else
     # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+    _LT_TAGVAR(hardcode_action, $1)=immediate
   fi
 else
   # We cannot hardcode anything, or else we can only hardcode existing
   # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
 fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
 
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
   # Fast installation is not supported
   enable_fast_install=no
 elif test "$shlibpath_overrides_runpath" = yes ||
@@ -1155,43 +2124,121 @@ elif test "$shlibpath_overrides_runpath" = yes ||
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
 
 
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
 old_striplib=
 AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
   AC_MSG_RESULT([yes])
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         AC_MSG_RESULT([yes])
-       else
-  AC_MSG_RESULT([no])
-fi
-       ;;
-   *)
-  AC_MSG_RESULT([no])
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
     ;;
   esac
 fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
 
 
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+# _LT_SYS_DYNAMIC_LINKER([TAG])
 # -----------------------------
 # PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -1205,20 +2252,6 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # 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.
-    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
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -1228,7 +2261,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  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
 
@@ -1236,8 +2269,8 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
-  version_type=linux
+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
@@ -1255,7 +2288,7 @@ aix4* | aix5*)
       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
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
@@ -1281,9 +2314,18 @@ aix4* | aix5*)
   ;;
 
 amigaos*)
-  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=`$echo "X$lib" | $Xsed -e '\''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'
+  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*)
@@ -1293,7 +2335,7 @@ beos*)
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  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'
@@ -1306,61 +2348,112 @@ bsdi[[45]]*)
   # libtool to hard-code these into programs
   ;;
 
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
   shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
+  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'\''`~
+      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'
+      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'
+       $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="/usr/lib /lib/w32api /lib /usr/local/lib"
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
       ;;
-    mingw*)
+    mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        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
       ;;
     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
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -1370,22 +2463,18 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  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`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
 dgux*)
-  version_type=linux
+  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'
@@ -1393,22 +2482,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  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='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -1416,7 +2489,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -1434,7 +2507,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -1446,7 +2519,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -1454,12 +2527,26 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=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}'
   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
   ;;
 
@@ -1485,18 +2572,18 @@ hpux9* | hpux10* | hpux11*)
     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
-     ;;
-   *)
+  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
@@ -1505,12 +2592,14 @@ hpux9* | hpux10* | hpux11*)
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # 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
   ;;
 
-interix3*)
-  version_type=linux
+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}'
@@ -1526,7 +2615,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -1563,9 +2652,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux*)
-  version_type=linux
+# 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}'
@@ -1573,6 +2662,22 @@ linux*)
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
@@ -1580,7 +2685,7 @@ linux*)
 
   # 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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -1593,23 +2698,11 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  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='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+  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'
@@ -1624,20 +2717,22 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  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=linux
+*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=yes
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
   ;;
 
 openbsd*)
@@ -1646,13 +2741,13 @@ openbsd*)
   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  ;;
+    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
+  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
@@ -1686,8 +2781,12 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
-  version_type=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}'
@@ -1712,7 +2811,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  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
@@ -1720,7 +2819,6 @@ sysv4 | sysv4.3*)
     sni)
       shlibpath_overrides_runpath=no
       need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
       runpath_var=LD_RUN_PATH
       ;;
     siemens)
@@ -1737,7 +2835,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    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
@@ -1751,13 +2849,12 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   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'
-    shlibpath_overrides_runpath=no
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
     case $host_os in
       sco3.2v5*)
         sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
@@ -1767,8 +2864,19 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   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
+  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
@@ -1785,276 +2893,56 @@ 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
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
 
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-        [include additional configurations @<:@automatic@:>@])],
-    [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    AC_MSG_WARN([output file `$ofile' does not exist])
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-    else
-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-    "") ;;
-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-	    (test "X$CXX" != "Xg++"))) ; then
-	  AC_LIBTOOL_LANG_CXX_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-	  AC_LIBTOOL_LANG_F77_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-	  AC_LIBTOOL_LANG_GCJ_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-	AC_LIBTOOL_LANG_RC_CONFIG
-	;;
-
-      *)
-	AC_MSG_ERROR([Unsupported tag name: $tagname])
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-  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
-])# _LT_AC_TAGCONFIG
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
 
 
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 DLLs
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-# set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
+# _LT_PATH_TOOL_PREFIX(TOOL)
 # --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
 AC_MSG_CHECKING([for $1])
 AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
 [case $MAGIC_CMD in
@@ -2067,7 +2955,7 @@ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
 dnl $ac_dummy forces splitting on constant user-supplied paths.
 dnl POSIX.2 word splitting is done only on the output of word expansions,
 dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
   for ac_dir in $ac_dummy; do
     IFS="$lt_save_ifs"
     test -z "$ac_dir" && ac_dir=.
@@ -2082,7 +2970,7 @@ dnl not every word.  This closes a longstanding sh security hole.
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
-	    cat <<EOF 1>&2
+	    cat <<_LT_EOF 1>&2
 
 *** Warning: the command libtool uses to detect shared libraries,
 *** $file_magic_cmd, produces output that libtool cannot recognize.
@@ -2093,7 +2981,7 @@ dnl not every word.  This closes a longstanding sh security hole.
 *** may want to report the problem to your system manager and/or to
 *** bug-libtool@gnu.org
 
-EOF
+_LT_EOF
 	  fi ;;
 	esac
       fi
@@ -2110,37 +2998,48 @@ if test -n "$MAGIC_CMD"; then
 else
   AC_MSG_RESULT(no)
 fi
-])# AC_PATH_TOOL_PREFIX
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
 
 
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
   else
     MAGIC_CMD=:
   fi
 fi
-])# AC_PATH_MAGIC
+])# _LT_PATH_MAGIC
 
 
-# AC_PROG_LD
+# LT_PATH_LD
 # ----------
 # find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
@@ -2157,9 +3056,9 @@ if test "$GCC" = yes; then
     [[\\/]]* | ?:[[\\/]]*)
       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%/%"`
+      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"
       ;;
@@ -2209,15 +3108,24 @@ else
   AC_MSG_RESULT(no)
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
 
 
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
@@ -2228,14 +3136,14 @@ case `$LD -v 2>&1 </dev/null` in
   ;;
 esac])
 with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
+])# _LT_PATH_LD_GNU
 
 
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
+# _LT_CMD_RELOAD
+# --------------
 # find reload flag for linker
 #   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+m4_defun([_LT_CMD_RELOAD],
 [AC_CACHE_CHECK([for $LD option to reload object files],
   lt_cv_ld_reload_flag,
   [lt_cv_ld_reload_flag='-r'])
@@ -2246,6 +3154,11 @@ case $reload_flag in
 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'
@@ -2254,15 +3167,19 @@ case $host_os in
     fi
     ;;
 esac
-])# AC_PROG_LD_RELOAD_FLAG
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
 
 
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
 # how to check for library dependencies
 #  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
 lt_cv_deplibs_check_method,
 [lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
@@ -2279,7 +3196,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[[4-9]]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -2301,8 +3218,22 @@ cygwin*)
 
 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'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+  # 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'
   ;;
 
@@ -2310,8 +3241,8 @@ darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+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.
@@ -2330,6 +3261,10 @@ 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
@@ -2338,17 +3273,17 @@ hpux10.20* | hpux11*)
     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]) shared object file - PA-RISC [0-9].[0-9]']
+    [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_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
   ;;
 
-interix3*)
+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)$'
   ;;
@@ -2363,13 +3298,13 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux*)
+# 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
+  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)$'
@@ -2382,12 +3317,12 @@ newos6*)
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
+*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
+  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)$'
@@ -2398,10 +3333,18 @@ 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)
@@ -2429,28 +3372,53 @@ sysv4 | sysv4.3*)
   esac
   ;;
 
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
 ])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
 
 
-# AC_PROG_NM
+# LT_PATH_NM
 # ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
 [if test -n "$NM"; then
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
   lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
+  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
@@ -2486,20 +3454,128 @@ else
     done
     IFS="$lt_save_ifs"
   done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  : ${lt_cv_path_NM=no}
 fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
 
 
-# AC_CHECK_LIBM
-# -------------
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# LT_LIB_M
+# --------
 # check for math library
-AC_DEFUN([AC_CHECK_LIBM],
+AC_DEFUN([LT_LIB_M],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
@@ -2510,2104 +3586,52 @@ case $host in
   AC_CHECK_LIB(m, cos, LIBM="-lm")
   ;;
 esac
-])# AC_CHECK_LIBM
+AC_SUBST([LIBM])
+])# LT_LIB_M
 
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
 
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-# (note the single quotes!).  If your package is not flat and you're not
-# using automake, define top_builddir and top_srcdir appropriately in
-# the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
 
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
 
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that
-# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-# and an installed libltdl is not found, it is assumed to be `libltdl'.
-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and top_srcdir
-# appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, lt_dlinit,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-# _LT_AC_PROG_CXXCPP
-# ------------------
-AC_DEFUN([_LT_AC_PROG_CXXCPP],
-[
-AC_REQUIRE([AC_PROG_CXX])
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-fi
-])# _LT_AC_PROG_CXXCPP
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# -------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF
-
-# Report which library types will actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-    ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_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++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-  AC_PROG_LD
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  aix4* | aix5*)
-    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]].*|aix5*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-	;;
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    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
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	else
-	  # We have old collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	fi
-	;;
-      esac
-      shared_flag='-shared'
-      if test "$aix_use_runtimelinking" = yes; then
-	shared_flag="$shared_flag "'${wl}-G'
-      fi
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds its shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-
-  beos*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-      # support --undefined.  This deserves some investigation.  FIXME
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-    # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-  ;;
-      darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
-      output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
-      fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-        fi
-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-      fi
-        ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      ghcx*)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  freebsd[[12]]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  freebsd* | kfreebsd*-gnu | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC*)
-      # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    aCC*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-      case $host_cpu in
-      hppa*64*|ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-        ;;
-      *)
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        ;;
-      esac
-    fi
-    case $host_cpu in
-    hppa*64*|ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      aCC*)
-	case $host_cpu in
-	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case $host_cpu in
-	    hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    ia64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  interix3*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-    # Instead, shared libraries are loaded at an image base (0x10000000 by
-    # default) and relocated if they conflict, which is a slow very memory
-    # consuming and fragmenting process.  To avoid this, we pick a random,
-    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC*)
-	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-	;;
-    esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    ;;
-  linux*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc*)
-	# Intel C++
-	with_gnu_ld=yes
-	# version 8.0 and above of icpc choke on multiply defined symbols
-	# if we add $predep_objects and $postdep_objects, however 7.1 and
-	# earlier do not add the objects themselves.
-	case `$CC -V 2>&1` in
-	*"Version 7."*)
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	*)  # Version 8.0 or newer
-	  tmp_idyn=
-	  case $host_cpu in
-	    ia64*) tmp_idyn=' -i_dynamic';;
-	  esac
-  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  ;;
-	esac
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      pgCC*)
-        # Portland Group C++ compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-        ;;
-      cxx*)
-	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $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; echo $list'
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx*)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  netbsd*)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  openbsd*)
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    fi
-    output_verbose_link_cmd='echo'
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $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; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC*)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx*)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $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; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      lcc*)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC*)
-	# Sun C++ 4.2, 5.x and Centerline C++
-        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	case $host_os in
-	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-	    ;;
-	esac
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-	output_verbose_link_cmd='echo'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx*)
-	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -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 \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  sysv5* | sco3.2v5* | sco5v6*)
-    # Note: We can NOT use -z defs as we might desire, because we do not
-    # link with -lc, and that would cause any symbols used from libc to
-    # always be unresolved, which means just about no library would
-    # ever link correctly.  If we're not using GNU ld we use -z text
-    # though, which does catch some bad symbols but isn't as heavy-handed
-    # as -z defs.
-    # 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.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-    runpath_var='LD_RUN_PATH'
-
-    case $cc_basename in
-      CC*)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-    esac
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC*)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-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
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $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
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
-[case $host_os in
-interix3*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_AC_TAGVAR(predep_objects,$1)=
-  _LT_AC_TAGVAR(postdep_objects,$1)=
-  _LT_AC_TAGVAR(postdeps,$1)=
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # 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.
-    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case $host_os in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# -------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # 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
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    _LT_AC_TAGVAR(compiler, $1) \
-    _LT_AC_TAGVAR(CC, $1) \
-    _LT_AC_TAGVAR(LD, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-    _LT_AC_TAGVAR(predep_objects, $1) \
-    _LT_AC_TAGVAR(postdep_objects, $1) \
-    _LT_AC_TAGVAR(predeps, $1) \
-    _LT_AC_TAGVAR(postdeps, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-    _LT_AC_TAGVAR(archive_cmds, $1) \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-    _LT_AC_TAGVAR(module_cmds, $1) \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-    _LT_AC_TAGVAR(include_expsyms, $1); do
-
-    case $var in
-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\[$]0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-    ;;
-  esac
-
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
-
-  cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 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 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.
-
-# 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//"
-
-# 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
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# 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
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# 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
-
-# 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
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# 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
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# 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
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# 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
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# 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=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# 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
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
-  case $host_os in
-  aix3*)
-    cat <<\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
-EOF
-    ;;
-  esac
-
-  # 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)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-])
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 
 if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
 
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
     lt_cv_prog_compiler_rtti_exceptions,
     [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
 fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
 
 
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 AC_MSG_CHECKING([command to parse $NM output from $compiler object])
 AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
@@ -4621,33 +3645,18 @@ symcode='[[BCDEGRST]]'
 # Regexp to match symbols that can be accessed directly from C.
 sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
 # Define system-specific variables.
 case $host_os in
 aix*)
   symcode='[[BCDT]]'
   ;;
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
   symcode='[[ABCDGISTW]]'
   ;;
-hpux*) # Its linker distinguishes data from code symbols
+hpux*)
   if test "$host_cpu" = ia64; then
     symcode='[[ABCDEGRST]]'
   fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDGIRSTW]]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  fi
   ;;
 irix* | nonstopux*)
   symcode='[[BCDEGRST]]'
@@ -4672,49 +3681,79 @@ sysv4)
   ;;
 esac
 
-# 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
-
 # If we're using GNU nm, then use its standard symbol codes.
 case `$NM -V 2>&1` in
 *GNU* | *'with BFD'*)
   symcode='[[ABCDGIRSTW]]' ;;
 esac
 
-# Try without a prefix undercore, then with it.
+# 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.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  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 <<EOF
+  cat > conftest.$ac_ext <<_LT_EOF
 #ifdef __cplusplus
 extern "C" {
 #endif
 char nm_test_var;
-void nm_test_func(){}
+void nm_test_func(void);
+void nm_test_func(void){}
 #ifdef __cplusplus
 }
 #endif
 int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
+_LT_EOF
 
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -4723,53 +3762,67 @@ EOF
       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 <<EOF > conftest.$ac_ext
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-EOF
+_LT_EOF
 	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
 
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
+	  cat <<_LT_EOF >> conftest.$ac_ext
 
-/* The mapping between symbol names and symbols. */
-const struct {
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
   const char *name;
-  lt_ptr_t address;
+  void       *address;
 }
-lt_preloaded_symbols[[]] =
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
 {
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
+  { "@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
-EOF
+_LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
 	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
 	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 	fi
@@ -4783,7 +3836,7 @@ EOF
     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
     cat conftest.$ac_ext >&5
   fi
-  rm -f conftest* conftst*
+  rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test "$pipe_works" = yes; then
@@ -4801,141 +3854,181 @@ if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; the
 else
   AC_MSG_RESULT(ok)
 fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
 
 
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
 
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
+m4_if([$1], [CXX], [
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
     case $host_os in
     aix*)
       # All AIX code is PIC.
       if test "$host_cpu" = ia64; then
 	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
       ;;
+
     amigaos*)
-      # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
       ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
-    mingw* | os2* | pw32*)
+    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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
       # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
     *djgpp*)
       # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
-    interix3*)
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
     sysv4*MP*)
       if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
       fi
       ;;
     hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
+      # 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*|ia64*)
+      hppa*64*)
 	;;
       *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	;;
       esac
       ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
     *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
     esac
   else
     case $host_os in
-      aix4* | aix5*)
+      aix[[4-9]]*)
 	# All AIX code is PIC.
 	if test "$host_cpu" = ia64; then
 	  # AIX 5 now supports IA64 processor
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	else
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
 	fi
 	;;
       chorus*)
 	case $cc_basename in
 	cxch68*)
 	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 	  ;;
 	esac
 	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           ;;
-         esac
-       ;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    ;;
 	  ghcx*)
 	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
 	  *)
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu | dragonfly*)
+      freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
 	case $cc_basename in
 	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 	    if test "$host_cpu" != ia64; then
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 	    fi
 	    ;;
 	  aCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
 	      ;;
 	    *)
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 	      ;;
 	    esac
 	    ;;
@@ -4950,41 +4043,62 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       irix5* | irix6* | nonstopux*)
 	case $cc_basename in
 	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    # CC pic flag -KPIC is the default.
 	    ;;
 	  *)
 	    ;;
 	esac
 	;;
-      linux*)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	    ;;
-	  pgCC*)
-	    # Portland Group C++ compiler.
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	    ;;
 	  cxx*)
 	    # Compaq C++
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
 	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	    ;;
 	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
 	    ;;
 	esac
 	;;
@@ -4995,7 +4109,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       mvs*)
 	case $cc_basename in
 	  cxx*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
 	    ;;
 	  *)
 	    ;;
@@ -5003,22 +4117,27 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	;;
       netbsd*)
 	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
 	  KCC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 	    ;;
 	  RCC*)
 	    # Rational C++ 2.4.1
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
 	  cxx*)
 	    # Digital/Compaq C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
 	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
 	  *)
 	    ;;
@@ -5028,15 +4147,15 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	;;
       solaris*)
 	case $cc_basename in
-	  CC*)
+	  CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 	    ;;
 	  gcx*)
 	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 	    ;;
 	  *)
 	    ;;
@@ -5046,22 +4165,12 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	case $cc_basename in
 	  CC*)
 	    # Sun C++ 4.x
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	    ;;
 	  lcc*)
 	    # Lucid
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
 	  *)
 	    ;;
@@ -5070,58 +4179,99 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 	case $cc_basename in
 	  CC*)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
 	    ;;
 	esac
 	;;
       vxworks*)
 	;;
       *)
-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 	;;
     esac
   fi
 ],
 [
   if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
     case $host_os in
       aix*)
       # All AIX code is PIC.
       if test "$host_cpu" = ia64; then
 	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
       ;;
 
     amigaos*)
-      # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
       ;;
 
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     darwin* | rhapsody*)
       # PIC is the default on this platform
       # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
-    interix3*)
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
@@ -5129,64 +4279,57 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
       enable_shared=no
       ;;
 
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
     sysv4*MP*)
       if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
       fi
       ;;
 
-    hpux*)
-      # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
     *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
     aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       if test "$host_cpu" = ia64; then
 	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       else
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         ;;
-       esac
-       ;;
 
-    mingw* | pw32* | os2*)
+    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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
       ;;
 
     hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
       case $host_cpu in
@@ -5194,210 +4337,309 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	# +Z the default
 	;;
       *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 	;;
       esac
       # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    linux*)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
-      icc* | ecc*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
         ;;
       ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
         # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
       esac
       ;;
 
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
     osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
     solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
       *)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
       esac
       ;;
 
     sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
     sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
     sysv4*MP*)
       if test -d /usr/nec ;then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
       ;;
 
     sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
     unicos*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
       ;;
 
     uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
     *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
       ;;
     esac
   fi
 ])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
 
 #
 # Check to make sure the PIC flag actually works.
 #
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
      "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
      esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
 fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
 
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
 #
 # Check to make sure the static flag actually works.
 #
-wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
   $lt_tmp_static_flag,
   [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-])
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
 
 
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
 # See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   case $host_os in
-  aix4* | aix5*)
+  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
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
   *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
   esac
-],[
+], [
   runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
   # include_expsyms should be a list of space-separated symbols to be *always*
   # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
+  _LT_TAGVAR(include_expsyms, $1)=
   # exclude_expsyms can be an extended regexp of symbols to exclude
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
   extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  _LT_CC_BASENAME([$compiler])
+
   case $host_os in
-  cygwin* | mingw* | pw32*)
+  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++.
@@ -5414,8 +4656,34 @@ ifelse([$1],[CXX],[
     ;;
   esac
 
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -5423,16 +4691,17 @@ ifelse([$1],[CXX],[
     # are reset later if shared libraries are not supported. Putting them
     # here allows them to be overridden if necessary.
     runpath_var=LD_RUN_PATH
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
     # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
     fi
     supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
+    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 ...
@@ -5442,61 +4711,65 @@ ifelse([$1],[CXX],[
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[[3-9]]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** 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 modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** 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.
 
-EOF
+_LT_EOF
       fi
       ;;
 
     amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
       ;;
 
     beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
       else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
       # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file (1st line
 	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
 	  cp $export_symbols $output_objdir/$soname.def;
 	else
 	  echo EXPORTS > $output_objdir/$soname.def;
@@ -5504,70 +4777,118 @@ EOF
 	fi~
 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
-    interix3*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
       # Instead, shared libraries are loaded at an image base (0x10000000 by
       # default) and relocated if they conflict, which is a slow very memory
       # consuming and fragmenting process.  To avoid this, we pick a random,
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
 	esac
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 
-	if test $supports_anon_versioning = yes; then
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
       else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+        _LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
     netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
     solaris*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
 
 *** Warning: The releases 2.8.* of the GNU linker cannot reliably
 *** create shared libraries on Solaris systems.  Therefore, libtool
@@ -5576,19 +4897,19 @@ EOF
 *** your PATH or compiler configuration so that the native linker is
 *** used, and then restart.
 
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
       case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
 *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
@@ -5601,58 +4922,62 @@ EOF
 _LT_EOF
 	;;
 	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 	  else
-	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+	    _LT_TAGVAR(ld_shlibs, $1)=no
 	  fi
 	;;
       esac
       ;;
 
     sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
     esac
 
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
       runpath_var=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
     case $host_os in
     aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
       if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
       fi
       ;;
 
-    aix4* | aix5*)
+    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.
@@ -5662,22 +4987,24 @@ _LT_EOF
       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
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+	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
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
 	  done
 	  ;;
 	esac
@@ -5692,30 +5019,32 @@ _LT_EOF
       # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
       # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
 
       if test "$GCC" = yes; then
 	case $host_os in aix4.[[012]]|aix4.[[012]].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
-  	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+	  # We have reworked collect2
+	  :
 	  else
-  	  # We have old collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
 	  fi
 	  ;;
 	esac
@@ -5726,8 +5055,8 @@ _LT_EOF
       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:
+	# 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
@@ -5738,130 +5067,139 @@ _LT_EOF
 	fi
       fi
 
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(always_export_symbols, $1)=yes
       if test "$aix_use_runtimelinking" = yes; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
 	if test "$host_cpu" = ia64; then
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 _LT_AC_SYS_LIBPATH_AIX
-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
       ;;
 
     amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
       ;;
 
     bsdi[[45]]*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
       ;;
 
-    cygwin* | mingw* | pw32*)
+    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.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[[012]])
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[[012]])
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-          ;;
-      esac
-    fi
+      _LT_DARWIN_LINKER_FEATURES($1)
       ;;
 
     dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
@@ -5869,106 +5207,112 @@ _LT_EOF
     # does not break anything, and helps significantly (at the cost of a little
     # extra space).
     freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     hpux9*)
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
 
       # hardcode_minus_L: Not really in the search PATH,
       # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
       if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
-	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
       fi
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
 	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
 	hppa*64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
 	  ;;
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
 	case $host_cpu in
 	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 	  ;;
 	*)
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
 	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
 	  ;;
 	esac
       fi
@@ -5976,191 +5320,236 @@ _LT_EOF
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
     netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
       ;;
 
     openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
       else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
+	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
     os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       ;;
 
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
       else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
       ;;
 
     solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
-	wlarc=''
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
       *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
       esac
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
     sunos4*)
       if test "x$host_vendor" = xsequent; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     sysv4)
       case $host_vendor in
 	sni)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
 	;;
 	siemens)
 	  ## LD is ld it makes a PLAMLIB
 	  ## CC just makes a GrossModule.
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
         ;;
 	motorola)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
 	;;
       esac
       runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
       ;;
 
     sysv4*MP*)
       if test -d /usr/nec; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 	runpath_var=LD_RUN_PATH
 	hardcode_runpath_var=yes
-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       runpath_var='LD_RUN_PATH'
 
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
@@ -6171,50 +5560,65 @@ _LT_EOF
       # ever link correctly.  If we're not using GNU ld we use -z text
       # though, which does catch some bad symbols but isn't as heavy-handed
       # as -z defs.
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
       runpath_var='LD_RUN_PATH'
 
       if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
     uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      _LT_TAGVAR(ld_shlibs, $1)=no
       ;;
     esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
   fi
 ])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
 
 #
 # Do we need to explicitly link libc?
 #
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
 x|xyes)
   # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 
   if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+    case $_LT_TAGVAR(archive_cmds, $1) in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
       ;;
@@ -6222,120 +5626,2091 @@ x|xyes)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
       ;;
     esac
   fi
   ;;
 esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
 
 
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
 
 
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 # ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
 
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
 
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
 ])
 
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
 #  a released version of Autoconf we should remove this    #
 #  macro and use it instead.                               #
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
+
+m4_defun([AC_PROG_SED],
 [AC_MSG_CHECKING([for a sed that does not truncate output])
 AC_CACHE_VAL(lt_cv_path_SED,
 [# Loop through the user's path and test for sed and gsed.
@@ -6353,6 +7728,7 @@ do
     done
   done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6385,36 +7761,901 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
 done
 ])
 SED=$lt_cv_path_SED
+AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
 ])
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
+
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
+
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 7 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
+
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
+
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 3337 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.2'
+macro_revision='1.3337'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
+
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.11.5], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.11.5])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -6462,14 +8703,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 7
+# serial 9
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -6478,8 +8719,11 @@ AC_DEFUN([AM_CONDITIONAL],
 [AC_PREREQ(2.52)dnl
  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -6493,15 +8737,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -6529,6 +8772,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -6540,6 +8784,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # 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.
@@ -6557,6 +8802,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [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
@@ -6574,7 +8829,17 @@ AC_CACHE_CHECK([dependency style of $depcc],
     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
@@ -6584,18 +8849,23 @@ AC_CACHE_CHECK([dependency style of $depcc],
 	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
-    # 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.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $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 sub/conftest.${OBJEXT-o} 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
@@ -6644,63 +8914,79 @@ AC_DEFUN([AM_DEP_TRACK],
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 3
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; 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.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  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_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+[{
+  # 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")`
+    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_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
 
@@ -6719,14 +9005,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 16
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -6743,16 +9029,20 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.62])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath
@@ -6772,6 +9062,9 @@ m4_ifval([$2],
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
@@ -6787,8 +9080,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -6796,20 +9089,37 @@ AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
 ])
 
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
 
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
@@ -6820,29 +9130,40 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+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
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -6868,13 +9189,13 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -6883,7 +9204,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
 [am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
@@ -6893,24 +9214,24 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
+# 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
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
 fi
 AC_SUBST([am__include])
 AC_SUBST([am__quote])
@@ -6920,14 +9241,14 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 6
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -6943,7 +9264,15 @@ AC_SUBST($1)])
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+AC_REQUIRE_AUX_FILE([missing])dnl
+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 "
@@ -6953,78 +9282,45 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -7032,16 +9328,16 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
 
 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
 # -------------------------------------------
@@ -7051,14 +9347,14 @@ AC_DEFUN([_AM_IF_OPTION],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_SANITY_CHECK
 # ---------------
@@ -7067,16 +9363,29 @@ AC_DEFUN([AM_SANITY_CHECK],
 # 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]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+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`
+   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`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -7101,12 +9410,14 @@ Check your system clock])
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -7126,12 +9437,31 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 3
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -7153,10 +9483,11 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])
diff --git a/contrib/sqlite3/config.guess b/contrib/sqlite3/config.guess
index 917bbc50f36a..d622a44e551f 100755
--- a/contrib/sqlite3/config.guess
+++ b/contrib/sqlite3/config.guess
@@ -1,9 +1,10 @@
 #! /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 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2012-02-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
@@ -16,9 +17,7 @@ timestamp='2005-07-08'
 # 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.
+# 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
@@ -26,16 +25,16 @@ timestamp='2005-07-08'
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# 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.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# 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,.*/,,'`
 
@@ -55,7 +54,8 @@ 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
+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
@@ -106,7 +106,7 @@ 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 -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$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 ; } ;
@@ -143,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# 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
@@ -160,6 +160,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    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
@@ -168,7 +169,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -178,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -206,8 +207,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -218,7 +222,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -264,7 +268,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# 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'`
-	exit ;;
+	# 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
@@ -290,7 +297,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -319,14 +326,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	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:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    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
@@ -370,23 +396,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # 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}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -456,8 +482,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# 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 ] || \
@@ -470,7 +496,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -527,7 +553,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *: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
@@ -570,52 +596,52 @@ EOF
 	    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" ;;
+		    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
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#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);
+		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);
-              }
+		    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
@@ -635,7 +661,7 @@ EOF
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -706,22 +732,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -745,14 +771,14 @@ EOF
 	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 ;;
+	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}"
+	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}
@@ -764,27 +790,48 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	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 ;;
-    i*:MINGW*:*)
+    *: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
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	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
@@ -794,7 +841,7 @@ EOF
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
-    amd64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
     p*:CYGWIN*:*)
@@ -814,71 +861,13 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
-    arm*:Linux:*:*)
+    aarch64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    ia64:Linux:*:*)
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
 	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:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#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; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#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; }
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -888,11 +877,90 @@ EOF
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	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
@@ -901,14 +969,17 @@ EOF
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    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
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -916,68 +987,18 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+    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:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; 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
@@ -985,11 +1006,11 @@ EOF
 	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,
+	# 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.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1006,7 +1027,7 @@ EOF
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1021,7 +1042,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1049,10 +1070,13 @@ EOF
 	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 i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
+	# 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 ;;
@@ -1087,8 +1111,18 @@ EOF
 	/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; } ;;
+	/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 ;;
@@ -1101,7 +1135,7 @@ EOF
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1121,10 +1155,10 @@ EOF
 		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 ;;
+    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
@@ -1150,11 +1184,11 @@ EOF
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1164,6 +1198,9 @@ EOF
     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 ;;
@@ -1173,6 +1210,15 @@ EOF
     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 ;;
@@ -1182,7 +1228,16 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
+	    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}
@@ -1198,6 +1253,9 @@ EOF
     *: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 ;;
@@ -1243,13 +1301,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	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`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1261,6 +1319,15 @@ EOF
     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 ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1283,11 +1350,11 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
@@ -1421,9 +1488,9 @@ 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://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  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
diff --git a/contrib/sqlite3/config.sub b/contrib/sqlite3/config.sub
index 1c366dfde9ab..c894da45500c 100755
--- a/contrib/sqlite3/config.sub
+++ b/contrib/sqlite3/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2012-02-10'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -20,9 +21,7 @@ timestamp='2005-07-08'
 # 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.
+# 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
@@ -31,13 +30,16 @@ timestamp='2005-07-08'
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# 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.
@@ -71,7 +73,8 @@ 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
+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
@@ -119,11 +122,18 @@ esac
 # 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-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  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/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -146,10 +156,13 @@ case $os in
 	-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)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+	-bluegene*)
+		os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -164,13 +177,17 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-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/'`
@@ -187,6 +204,10 @@ case $os in
 		# 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/'`
@@ -228,23 +249,32 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| 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 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| epiphany \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -257,35 +287,65 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| moxie \
+	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| 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 | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
+	| 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 | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
+	c54x)
+		basic_machine=tic54x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | 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
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	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
@@ -301,29 +361,36 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| 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-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| 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-* \
-	| m32r-* | m32rle-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -336,30 +403,38 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| 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-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
 	| tron-* \
-	| v850-* | v850e-* | vax-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
-	m32c-*)
+	# 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.
@@ -377,7 +452,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -423,6 +498,10 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -431,10 +510,35 @@ case $basic_machine in
 		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
@@ -463,8 +567,8 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -502,6 +606,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -617,7 +725,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -656,6 +763,14 @@ case $basic_machine in
 		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
 		;;
@@ -667,10 +782,17 @@ case $basic_machine in
 		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
 		;;
@@ -696,10 +818,21 @@ case $basic_machine in
 		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
@@ -764,6 +897,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -794,6 +933,14 @@ case $basic_machine in
 		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
 		;;
@@ -803,6 +950,12 @@ case $basic_machine in
 	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
 		;;
@@ -832,9 +985,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -859,6 +1013,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -885,6 +1043,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -896,6 +1058,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -917,6 +1082,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -973,17 +1141,9 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
 		;;
 	tx39)
 		basic_machine=mipstx39-unknown
@@ -1052,6 +1212,9 @@ case $basic_machine in
 	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
@@ -1060,6 +1223,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1098,10 +1265,10 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	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)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1145,9 +1312,12 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# 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|'`
 		;;
@@ -1168,27 +1338,31 @@ case $os in
 	# 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* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -*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* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -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* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -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*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1227,7 +1401,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1276,7 +1450,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1318,6 +1492,11 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1340,6 +1519,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1349,9 +1534,18 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1370,13 +1564,13 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
+	mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
@@ -1401,7 +1595,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
@@ -1506,7 +1700,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
diff --git a/contrib/sqlite3/configure b/contrib/sqlite3/configure
index f27217f98b54..593f31c58556 100755
--- a/contrib/sqlite3/configure
+++ b/contrib/sqlite3/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.7.17.
+# Generated by GNU Autoconf 2.69 for sqlite 3.8.5.
 #
 # Report bugs to <http://www.sqlite.org>.
 #
@@ -198,6 +198,14 @@ test -x / || exit 1"
   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
@@ -556,160 +564,8 @@ 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'"
 
-
-
-# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# 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
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
-
-tagnames=${tagnames+${tagnames},}CXX
-
-tagnames=${tagnames+${tagnames},}F77
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
@@ -734,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.7.17'
-PACKAGE_STRING='sqlite 3.7.17'
+PACKAGE_VERSION='3.8.5'
+PACKAGE_STRING='sqlite 3.8.5'
 PACKAGE_BUGREPORT='http://www.sqlite.org'
 PACKAGE_URL=''
 
@@ -776,30 +632,34 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='LTLIBOBJS
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
 LIBOBJS
 DYNAMIC_EXTENSION_FLAGS
 THREADSAFE_FLAGS
 READLINE_LIBS
 BUILD_CFLAGS
-MKDIR_P
-LIBTOOL
-ac_ct_F77
-FFLAGS
-F77
-CXXCPP
-am__fastdepCXX_FALSE
-am__fastdepCXX_TRUE
-CXXDEPMODE
-ac_ct_CXX
-CXXFLAGS
-CXX
 CPP
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+ac_ct_AR
 AR
-ECHO
+DLLTOOL
+OBJDUMP
 LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
 EGREP
 GREP
+SED
 host_os
 host_vendor
 host_cpu
@@ -808,10 +668,12 @@ build_os
 build_vendor
 build_cpu
 build
+LIBTOOL
 RANLIB
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -832,6 +694,7 @@ am__leading_dot
 SET_MAKE
 AWK
 mkdir_p
+MKDIR_P
 INSTALL_STRIP_PROGRAM
 STRIP
 install_sh
@@ -843,6 +706,7 @@ ACLOCAL
 VERSION
 PACKAGE
 CYGPATH_W
+am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
@@ -891,11 +755,11 @@ enable_largefile
 enable_dependency_tracking
 enable_shared
 enable_static
+with_pic
 enable_fast_install
 with_gnu_ld
+with_sysroot
 enable_libtool_lock
-with_pic
-with_tags
 enable_readline
 enable_threadsafe
 enable_dynamic_extensions
@@ -908,13 +772,7 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP
-CXX
-CXXFLAGS
-CCC
-CXXCPP
-F77
-FFLAGS'
+CPP'
 
 
 # Initialize some variables set by options.
@@ -1455,7 +1313,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 sqlite 3.7.17 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.8.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1525,7 +1383,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sqlite 3.7.17:";;
+     short | recursive ) echo "Configuration of sqlite 3.8.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1549,10 +1407,11 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
-  --with-tags[=TAGS]      include additional configurations [automatic]
+  --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
@@ -1563,11 +1422,6 @@ Some influential environment variables:
   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
-  F77         Fortran 77 compiler command
-  FFLAGS      Fortran 77 compiler flags
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1635,7 +1489,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sqlite configure 3.7.17
+sqlite configure 3.8.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1733,6 +1587,37 @@ fi
 
 } # 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.
@@ -1770,97 +1655,6 @@ fi
 
 } # ac_fn_c_try_cpp
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $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
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ------------------------------------ ##
-## Report this to http://www.sqlite.org ##
-## ------------------------------------ ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $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=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
 # ac_fn_c_try_run LINENO
 # ----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
@@ -1903,37 +1697,6 @@ fi
 
 } # ac_fn_c_try_run
 
-# 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_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -2001,211 +1764,6 @@ $as_echo "$ac_res" >&6; }
 
 } # 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 ||
-	 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_f77_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_f77_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_f77_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_f77_try_compile
-
-# ac_fn_f77_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_f77_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_f77_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 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_f77_try_link
-
 # ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
 # ---------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
@@ -2255,7 +1813,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 sqlite $as_me 3.7.17, which was
+It was created by sqlite $as_me 3.8.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2606,7 +2164,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # Use automake.
-am__api_version="1.9"
+am__api_version='1.11'
+
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
@@ -2734,16 +2293,29 @@ $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`
+   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`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$*" != "X $srcdir/configure conftest.file" \
@@ -2781,7 +2353,14 @@ 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`
 
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+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 "
@@ -2791,168 +2370,14 @@ else
 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-
-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 as_fn_executable_p "$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;;
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
   *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
 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
-
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-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='sqlite'
- VERSION='3.7.17'
-
-
-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"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
 
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@@ -3052,15 +2477,195 @@ else
 fi
 
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+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
+	   as_fn_executable_p "$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 as_fn_executable_p "$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='sqlite'
+ VERSION='3.8.5'
+
+
+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.
+# 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}'
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
@@ -3075,7 +2680,7 @@ ac_config_commands="$ac_config_commands depfiles"
 am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
@@ -3086,24 +2691,24 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
+# 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
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
 fi
 
 
@@ -3119,10 +2724,9 @@ 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
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -3131,7 +2735,6 @@ else
 fi
 
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3934,6 +3537,7 @@ else
   # 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.
@@ -3951,6 +3555,11 @@ else
   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
@@ -3968,7 +3577,17 @@ else
     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
@@ -3978,18 +3597,23 @@ 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
-    # 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.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $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 sub/conftest.${OBJEXT-o} 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
@@ -4017,9 +3641,7 @@ fi
 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -4785,6 +4407,7 @@ else
   # 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.
@@ -4802,6 +4425,11 @@ else
   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
@@ -4819,7 +4447,17 @@ else
     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
@@ -4829,18 +4467,23 @@ 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
-    # 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.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $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 sub/conftest.${OBJEXT-o} 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
@@ -4868,9 +4511,7 @@ fi
 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -4973,78 +4614,31 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-# 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
+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
 
 
-# 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
+
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
-# 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
 
 
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
 # 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
@@ -5116,62 +4710,156 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
+# 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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 { $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 ${lt_cv_path_SED+:} false; then :
+if ${ac_cv_path_SED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  # Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+            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 lt_ac_prog in sed gsed; do
+    for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$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
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
   done
-done
-
+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
 
-SED=$lt_cv_path_SED
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
-$as_echo "$SED" >&6; }
+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; }
@@ -5303,6 +4991,92 @@ $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"
+      as_fn_executable_p "$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 :
@@ -5328,9 +5102,9 @@ $as_echo_n "checking for ld used by $CC... " >&6; }
     [\\/]* | ?:[\\/]*)
       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%/%"`
+      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"
       ;;
@@ -5408,33 +5182,15 @@ $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 $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
-  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
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
-$as_echo_n "checking for BSD-compatible nm... " >&6; }
+
+
+
+
+
+
+{ $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
@@ -5479,12 +5235,161 @@ else
     done
     IFS="$lt_save_ifs"
   done
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+  : ${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; }
-NM="$lt_cv_path_NM"
+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 as_fn_executable_p "$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 as_fn_executable_p "$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; }
@@ -5497,8 +5402,425 @@ else
 $as_echo "no, using $LN_S" >&6; }
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognise dependent libraries" >&5
-$as_echo_n "checking how to recognise dependent libraries... " >&6; }
+# 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 as_fn_executable_p "$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 as_fn_executable_p "$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
@@ -5517,7 +5839,7 @@ lt_cv_deplibs_check_method='unknown'
 # whether `pass_all' will *always* work, you probably want this one.
 
 case $host_os in
-aix4* | aix5*)
+aix[4-9]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5539,8 +5861,22 @@ cygwin*)
 
 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'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+  # 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'
   ;;
 
@@ -5548,8 +5884,8 @@ darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu | dragonfly*)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+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.
@@ -5568,6 +5904,10 @@ 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
@@ -5576,17 +5916,17 @@ hpux10.20* | hpux11*)
     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]) shared object file - PA-RISC [0-9].[0-9]'
+    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_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
   ;;
 
-interix3*)
+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)$'
   ;;
@@ -5601,13 +5941,13 @@ irix5* | irix6* | nonstopux*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux*)
+# 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
+  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)$'
@@ -5620,12 +5960,12 @@ newos6*)
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
+*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
+  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)$'
@@ -5636,10 +5976,18 @@ 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)
@@ -5667,7 +6015,7 @@ sysv4 | sysv4.3*)
   esac
   ;;
 
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
@@ -5675,10 +6023,615 @@ 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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -5691,6 +6644,319 @@ 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;
@@ -5710,54 +6976,55 @@ ia64-*-hpux*)
   $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"
-      ;;
+      *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 5725 "configure"' > conftest.$ac_ext
+  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
+    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-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+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
@@ -5766,38 +7033,44 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
   $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-*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-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
+      *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*
@@ -5850,7 +7123,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*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
@@ -5861,20 +7134,778 @@ sparc*-*solaris*)
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-      *)    LD="${LD-ld} -64" ;;
+      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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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 as_fn_executable_p "$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'
@@ -6145,7 +8176,8 @@ done
 
 for ac_header in dlfcn.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+  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
@@ -6155,1059 +8187,199 @@ fi
 
 done
 
-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 as_fn_executable_p "$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 as_fn_executable_p "$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
+# Set options
 
 
-  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
+        enable_dlopen=no
 
-  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.  */
+  enable_win32_dll=no
 
-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'.
-  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
-  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
-
-    case $depmode in
-    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
-      ;;
-    none) break ;;
-    esac
-    # 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.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} 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
-
-
-
-
-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
-
-fi
-
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor
-  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_F77+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$F77"; then
-  ac_cv_prog_F77="$F77" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_F77="$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
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5
-$as_echo "$F77" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$F77" && break
-  done
-fi
-if test -z "$F77"; then
-  ac_ct_F77=$F77
-  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor
-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_F77+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_F77"; then
-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_F77="$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_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5
-$as_echo "$ac_ct_F77" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_F77" && break
-done
-
-  if test "x$ac_ct_F77" = x; then
-    F77=""
-  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
-    F77=$ac_ct_F77
-  fi
-fi
-
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 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
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5
-$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; }
-if ${ac_cv_f77_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-if ac_fn_f77_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_f77_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5
-$as_echo "$ac_cv_f77_compiler_gnu" >&6; }
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5
-$as_echo_n "checking whether $F77 accepts -g... " >&6; }
-if ${ac_cv_prog_f77_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  FFLAGS=-g
-cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_f77_try_compile "$LINENO"; then :
-  ac_cv_prog_f77_g=yes
-else
-  ac_cv_prog_f77_g=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5
-$as_echo "$ac_cv_prog_f77_g" >&6; }
-if test "$ac_test_FFLAGS" = set; then
-  FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-g -O2"
-  else
-    FFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-O2"
-  else
-    FFLAGS=
-  fi
-fi
-
-if test $ac_compiler_gnu = yes; then
-  G77=yes
-else
-  G77=
-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
-
-
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# 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*)
-    # 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;
-    ;;
-
-  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
-    ;;
-
-  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
-    ;;
-  *)
-    # 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.
-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    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`
-    ;;
-  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
-
-
-
-
-# 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]*\)'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-linux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDGIRSTW]'
-    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  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
-
-# 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
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Try without a prefix undercore, 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.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-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 <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_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_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
+            # 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
-      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 -f 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; }
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
+  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
@@ -7233,6 +8405,13 @@ 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
@@ -7245,350 +8424,26 @@ aix3*)
   ;;
 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 to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
 # Global variables:
-default_ofile=libtool
+ofile=libtool
 can_build_shared=yes
 
 # All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
+
 with_gnu_ld="$lt_cv_prog_gnu_ld"
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $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
-
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="ar"
-    $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
-
-  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
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-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 as_fn_executable_p "$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 as_fn_executable_p "$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
-
-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 as_fn_executable_p "$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 as_fn_executable_p "$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
-
-
 old_CC="$CC"
 old_CFLAGS="$CFLAGS"
 
 # Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
 test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
 test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
 test -z "$ac_objext" && ac_objext=o
 
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-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 \$oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
 for cc_temp in $compiler""; do
   case $cc_temp in
     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
@@ -7597,10 +8452,11 @@ for cc_temp in $compiler""; do
     *) break;;
   esac
 done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+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
@@ -7631,7 +8487,7 @@ else
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
-	    cat <<EOF 1>&2
+	    cat <<_LT_EOF 1>&2
 
 *** Warning: the command libtool uses to detect shared libraries,
 *** $file_magic_cmd, produces output that libtool cannot recognize.
@@ -7642,7 +8498,7 @@ else
 *** may want to report the problem to your system manager and/or to
 *** bug-libtool@gnu.org
 
-EOF
+_LT_EOF
 	  fi ;;
 	esac
       fi
@@ -7664,6 +8520,10 @@ else
 $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
@@ -7693,7 +8553,7 @@ else
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
-	    cat <<EOF 1>&2
+	    cat <<_LT_EOF 1>&2
 
 *** Warning: the command libtool uses to detect shared libraries,
 *** $file_magic_cmd, produces output that libtool cannot recognize.
@@ -7704,7 +8564,7 @@ else
 *** may want to report the problem to your system manager and/or to
 *** bug-libtool@gnu.org
 
-EOF
+_LT_EOF
 	  fi ;;
 	esac
       fi
@@ -7726,6 +8586,7 @@ else
 $as_echo "no" >&6; }
 fi
 
+
   else
     MAGIC_CMD=:
   fi
@@ -7735,28 +8596,8 @@ fi
   ;;
 esac
 
-enable_dlopen=no
-enable_win32_dll=no
-
-# 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
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
-else
-  pic_mode=default
-fi
-
-test -z "$pic_mode" && pic_mode=default
-
 # Use C for the default configuration in the libtool script
-tagname=
+
 lt_save_CC="$CC"
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -7773,10 +8614,15 @@ objext=o
 objext=$objext
 
 # Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
+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);}\n'
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
 
 
 # If no C compiler was specified, use CC.
@@ -7788,36 +8634,44 @@ 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
-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+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*
+$RM conftest*
 
 ac_outfile=conftest.$ac_objext
-printf "$lt_simple_link_test_code" >conftest.$ac_ext
+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 conftest*
+$RM -r conftest*
 
 
+if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
 
 if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+  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 "$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
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   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.
@@ -7828,21 +8682,21 @@ else
    -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:7831: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7835: \$? = $ac_status" >&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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $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*
+   $RM conftest*
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
@@ -7856,12 +8710,15 @@ fi
 
 fi
 
-lt_prog_compiler_wl=
+
+
+
+
+
+  lt_prog_compiler_wl=
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $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 test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -7877,19 +8734,29 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       ;;
 
     amigaos*)
-      # 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'
+      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* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
-    mingw* | pw32* | os2*)
+    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'
       ;;
 
@@ -7899,7 +8766,27 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_pic='-fno-common'
       ;;
 
-    interix3*)
+    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.
       ;;
@@ -7911,29 +8798,31 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       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
       ;;
 
-    hpux*)
-      # 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='-fPIC'
-	;;
-      esac
-      ;;
-
     *)
       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
@@ -7946,18 +8835,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic='-qnocommon'
-         lt_prog_compiler_wl='-Wl,'
-         ;;
-       esac
-       ;;
 
-    mingw* | pw32* | os2*)
+    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'
@@ -7985,19 +8864,34 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    linux*)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
       case $cc_basename in
-      icc* | ecc*)
+      # 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'
         ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      # 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,'
@@ -8009,20 +8903,72 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
         # 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*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	lt_prog_compiler_wl='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl='-Wl,';;
@@ -8070,63 +9016,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
     esac
   fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-#
-# 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_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_prog_compiler_pic_works=no
-  ac_outfile=conftest.$ac_objext
-   printf "$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:8099: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:8103: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_works" >&5
-$as_echo "$lt_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_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
 case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
@@ -8137,59 +9026,139 @@ case $host_os in
     ;;
 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_prog_compiler_static_works+:} false; then :
+if ${lt_cv_prog_compiler_static_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  lt_prog_compiler_static_works=no
+  lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+   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 "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $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_prog_compiler_static_works=yes
+         lt_cv_prog_compiler_static_works=yes
        fi
      else
-       lt_prog_compiler_static_works=yes
+       lt_cv_prog_compiler_static_works=yes
      fi
    fi
-   $rm conftest*
+   $RM -r conftest*
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_static_works" >&5
-$as_echo "$lt_prog_compiler_static_works" >&6; }
+{ $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_prog_compiler_static_works" = xyes; then
+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 "$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
+   $RM -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+   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
@@ -8200,43 +9169,100 @@ else
    -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:8203: $lt_compile\"" >&5)
+   (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:8207: \$? = $ac_status" >&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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $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*
+   $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
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
    cd ..
-   rmdir conftest
-   $rm conftest*
+   $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*
+  $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
@@ -8252,31 +9278,38 @@ else
   need_locks=no
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+
+
+
+
+
+  { $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=
-  enable_shared_with_static_runtimes=no
+  always_export_symbols=no
   archive_cmds=
   archive_expsym_cmds=
-  old_archive_From_new_cmds=
-  old_archive_from_expsyms_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
   export_dynamic_flag_spec=
-  whole_archive_flag_spec=
-  thread_safe_flag_spec=
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
+  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
-  hardcode_automatic=no
   module_cmds=
   module_expsym_cmds=
-  always_export_symbols=no
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  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=
@@ -8284,26 +9317,17 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
   # 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_"
+  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=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
-  cygwin* | mingw* | pw32*)
+  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++.
@@ -8321,7 +9345,33 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
   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}'
 
@@ -8329,16 +9379,17 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
     # 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'
+    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=
+    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>/dev/null` in
+    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 ...
@@ -8348,38 +9399,40 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
     # See if GNU ld supports shared libraries.
     case $host_os in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
 	ld_shlibs=no
-	cat <<EOF 1>&2
+	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** 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 modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** 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.
 
-EOF
+_LT_EOF
       fi
       ;;
 
     amigaos*)
-      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
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs=no
+      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
+      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
@@ -8389,16 +9442,18 @@ EOF
       fi
       ;;
 
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+    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/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      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
+      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...
@@ -8414,7 +9469,12 @@ EOF
       fi
       ;;
 
-    interix3*)
+    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'
@@ -8429,51 +9489,94 @@ EOF
       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'
       ;;
 
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
+    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; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        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*)	# 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; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	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
+	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
-	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	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 $supports_anon_versioning = yes; 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 -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
+        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
+        ld_shlibs=no
       fi
       ;;
 
     netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+      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 $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'
+	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
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
-	cat <<EOF 1>&2
+	cat <<_LT_EOF 1>&2
 
 *** Warning: The releases 2.8.* of the GNU linker cannot reliably
 *** create shared libraries on Solaris systems.  Therefore, libtool
@@ -8482,10 +9585,10 @@ EOF
 *** your PATH or compiler configuration so that the native linker is
 *** used, and then restart.
 
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	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'
+_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
@@ -8507,10 +9610,14 @@ EOF
 _LT_EOF
 	;;
 	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
+	  # 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
@@ -8526,9 +9633,9 @@ _LT_EOF
       ;;
 
     *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	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'
+      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
@@ -8558,7 +9665,7 @@ _LT_EOF
       fi
       ;;
 
-    aix4* | aix5*)
+    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.
@@ -8568,22 +9675,24 @@ _LT_EOF
       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
-	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")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
+	# 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'
+	  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].*|aix5*)
+	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
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
 	  done
 	  ;;
 	esac
@@ -8600,28 +9709,30 @@ _LT_EOF
 
       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
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
-  	  # We have reworked collect2
-  	  hardcode_direct=yes
+	  # 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=
+	  # 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
@@ -8632,8 +9743,8 @@ _LT_EOF
       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:
+	# 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
@@ -8644,6 +9755,7 @@ _LT_EOF
 	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
@@ -8651,8 +9763,15 @@ _LT_EOF
 	# 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.
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        # 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
@@ -8665,26 +9784,47 @@ main ()
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+  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 "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  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 echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
+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.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 # 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
@@ -8697,23 +9837,42 @@ main ()
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
+  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 "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  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'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
+	  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'
@@ -8722,86 +9881,119 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     amigaos*)
-      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
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
+      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*)
+    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.
-      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 `echo "$deplibs" | $SED -e '\''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'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
+      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*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc=no
-      hardcode_direct=no
-      hardcode_automatic=yes
-      hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec=''
-      link_all_deplibs=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs=no
-          ;;
-      esac
-    fi
+
+
+  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*)
@@ -8810,10 +10002,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=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
@@ -8826,7 +10014,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -8834,8 +10022,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+    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
@@ -8843,9 +10031,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	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'
+	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=:
@@ -8858,18 +10046,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      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
@@ -8877,16 +10064,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      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 ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -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
@@ -8898,7 +10085,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -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
@@ -8908,12 +10134,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	case $host_cpu in
 	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld='+b $libdir'
 	  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,
@@ -8926,18 +10152,49 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	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='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld='-rpath $libdir'
+	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
+      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
@@ -8955,25 +10212,33 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       ;;
 
+    *nto* | *qnx*)
+      ;;
+
     openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      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'
+      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
-       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
+	ld_shlibs=no
       fi
       ;;
 
@@ -8981,18 +10246,19 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       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'
+      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" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	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='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+	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=:
       ;;
@@ -9000,49 +10266,59 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     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} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	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='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -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; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+	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 text'
+      no_undefined_flag=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds='$CC -shared ${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 ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+	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
-	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'
+	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 linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
+	# 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
       ;;
@@ -9099,7 +10375,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       fi
       ;;
 
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+    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
@@ -9125,18 +10401,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       allow_undefined_flag='${wl}-z,nodefs'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      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,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	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,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	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
       ;;
 
@@ -9150,12 +10426,36 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       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?
 #
@@ -9175,52 +10475,274 @@ x|xyes)
       # 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; }
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+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
+	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
+	  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
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+	  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 "$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=
@@ -9234,20 +10756,6 @@ shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # 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.
-    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
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
@@ -9257,7 +10765,7 @@ need_version=unknown
 
 case $host_os in
 aix3*)
-  version_type=linux
+  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
 
@@ -9265,8 +10773,8 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
-  version_type=linux
+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
@@ -9284,7 +10792,7 @@ aix4* | aix5*)
       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
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
@@ -9310,9 +10818,18 @@ aix4* | aix5*)
   ;;
 
 amigaos*)
-  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=`$echo "X$lib" | $Xsed -e '\''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'
+  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*)
@@ -9322,7 +10839,7 @@ beos*)
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  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'
@@ -9335,61 +10852,112 @@ bsdi[45]*)
   # libtool to hard-code these into programs
   ;;
 
-cygwin* | mingw* | pw32*)
+cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
   shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
+  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'\''`~
+      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'
+      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'
+       $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="/usr/lib /lib/w32api /lib /usr/local/lib"
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
-    mingw*)
+    mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        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
       ;;
     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
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -9399,22 +10967,18 @@ darwin* | rhapsody*)
   version_type=darwin
   need_lib_prefix=no
   need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  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`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
+
+  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
+  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'
@@ -9422,22 +10986,6 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  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='GNU ld.so'
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -9445,7 +10993,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -9463,7 +11011,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -9475,7 +11023,7 @@ freebsd* | dragonfly*)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
-  freebsd*) # from 4.6 on
+  *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -9483,12 +11031,26 @@ freebsd* | dragonfly*)
   ;;
 
 gnu*)
-  version_type=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}'
   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
   ;;
 
@@ -9514,18 +11076,18 @@ hpux9* | hpux10* | hpux11*)
     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
-     ;;
-   *)
+  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
@@ -9534,12 +11096,14 @@ hpux9* | hpux10* | hpux11*)
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # 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
   ;;
 
-interix3*)
-  version_type=linux
+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}'
@@ -9555,7 +11119,7 @@ irix5* | irix6* | nonstopux*)
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -9592,9 +11156,9 @@ linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux*)
-  version_type=linux
+# 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}'
@@ -9602,6 +11166,41 @@ linux*)
   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.
@@ -9609,7 +11208,7 @@ linux*)
 
   # 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)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -9622,23 +11221,11 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-knetbsd*-gnu)
-  version_type=linux
-  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='GNU ld.so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+  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'
@@ -9653,20 +11240,22 @@ netbsd*)
   ;;
 
 newsos6)
-  version_type=linux
+  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=linux
+*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=yes
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
   ;;
 
 openbsd*)
@@ -9675,13 +11264,13 @@ openbsd*)
   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  ;;
+    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
+  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
@@ -9715,8 +11304,12 @@ osf3* | osf4* | osf5*)
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   ;;
 
+rdos*)
+  dynamic_linker=no
+  ;;
+
 solaris*)
-  version_type=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}'
@@ -9741,7 +11334,7 @@ sunos4*)
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  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
@@ -9749,7 +11342,6 @@ sysv4 | sysv4.3*)
     sni)
       shlibpath_overrides_runpath=no
       need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
       runpath_var=LD_RUN_PATH
       ;;
     siemens)
@@ -9766,7 +11358,7 @@ sysv4 | sysv4.3*)
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    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
@@ -9780,13 +11372,12 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   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'
-    shlibpath_overrides_runpath=no
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
     case $host_os in
       sco3.2v5*)
         sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
@@ -9796,8 +11387,19 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   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
+  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
@@ -9816,19 +11418,117 @@ if test "$GCC" = yes; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+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" || \
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
    test "X$hardcode_automatic" = "Xyes" ; then
 
-  # We can hardcode non-existant directories.
+  # 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_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
      test "$hardcode_minus_L" != no; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action=relink
@@ -9844,7 +11544,8 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
-if test "$hardcode_action" = relink; then
+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 ||
@@ -9853,36 +11554,12 @@ elif test "$shlibpath_overrides_runpath" = yes ||
   enable_fast_install=needless
 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"
-         { $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
 
-if test "x$enable_dlopen" != xyes; then
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
@@ -9897,15 +11574,15 @@ else
     lt_cv_dlopen_self=yes
     ;;
 
-  mingw* | pw32*)
+  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
@@ -9955,7 +11632,7 @@ else
 
 fi
 
-   ;;
+    ;;
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
@@ -9999,7 +11676,7 @@ 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="-dld"
+  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 :
@@ -10120,7 +11797,7 @@ 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="-dld"
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
 
@@ -10168,8 +11845,8 @@ else
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 10172 "configure"
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10210,11 +11887,13 @@ else
 #  endif
 #endif
 
-#ifdef __cplusplus
-extern "C" void exit (int);
+/* 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
 
-void fnord() { int i=42;}
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -10223,15 +11902,19 @@ int main ()
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
     puts (dlerror ());
 
-    exit (status);
+  return status;
 }
-EOF
+_LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
@@ -10268,8 +11951,8 @@ else
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 10272 "configure"
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10310,11 +11993,13 @@ else
 #  endif
 #endif
 
-#ifdef __cplusplus
-extern "C" void exit (int);
+/* 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
 
-void fnord() { int i=42;}
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -10323,15 +12008,19 @@ int main ()
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
     puts (dlerror ());
 
-    exit (status);
+  return status;
 }
-EOF
+_LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
@@ -10375,6004 +12064,103 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; }
 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
-  ;;
 
-aix4* | aix5*)
-  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; }
 
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # 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
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler \
-    CC \
-    LD \
-    lt_prog_compiler_wl \
-    lt_prog_compiler_pic \
-    lt_prog_compiler_static \
-    lt_prog_compiler_no_builtin_flag \
-    export_dynamic_flag_spec \
-    thread_safe_flag_spec \
-    whole_archive_flag_spec \
-    enable_shared_with_static_runtimes \
-    old_archive_cmds \
-    old_archive_from_new_cmds \
-    predep_objects \
-    postdep_objects \
-    predeps \
-    postdeps \
-    compiler_lib_search_path \
-    archive_cmds \
-    archive_expsym_cmds \
-    postinstall_cmds \
-    postuninstall_cmds \
-    old_archive_from_expsyms_cmds \
-    allow_undefined_flag \
-    no_undefined_flag \
-    export_symbols_cmds \
-    hardcode_libdir_flag_spec \
-    hardcode_libdir_flag_spec_ld \
-    hardcode_libdir_separator \
-    hardcode_automatic \
-    module_cmds \
-    module_expsym_cmds \
-    lt_cv_prog_compiler_c_o \
-    exclude_expsyms \
-    include_expsyms; do
 
-    case $var in
-    old_archive_cmds | \
-    old_archive_from_new_cmds | \
-    archive_cmds | \
-    archive_expsym_cmds | \
-    module_cmds | \
-    module_expsym_cmds | \
-    old_archive_from_expsyms_cmds | \
-    export_symbols_cmds | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
 
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
 
-cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ofile" >&5
-$as_echo "$as_me: creating $ofile" >&6;}
 
-  cat <<__EOF__ >> "$cfgfile"
-#! $SHELL
 
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 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 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.
 
-# 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//"
 
-# 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
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# 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
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# 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
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# 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
-
-# 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
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# 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
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# 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
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# 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 and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-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
-
-# 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
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# 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
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# 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
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# 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 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
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# 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
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
-
-# 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
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_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
-
-# ### END LIBTOOL CONFIG
-
-__EOF__
 
 
+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
-  aix3*)
-    cat <<\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
-EOF
-    ;;
-  esac
-
-  # 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)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-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"
-
-
-# Check whether --with-tags was given.
-if test "${with_tags+set}" = set; then :
-  withval=$with_tags; tagnames="$withval"
-fi
-
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: output file \`$ofile' does not exist" >&5
-$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
+  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}: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-    fi
-  fi
-  if test -z "$LTCFLAGS"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-    "") ;;
-    *)  as_fn_error $? "invalid tag name: $tagname" "$LINENO" 5
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      as_fn_error $? "tag name \"$tagname\" already exists" "$LINENO" 5
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	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
-
-
-
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_shlibpath_var_CXX=unsupported
-hardcode_automatic_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
-
-# 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=
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-
-# 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
-printf "$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
-printf "$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 conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-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++"}
-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 "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-# We don't want -fno-exception wen 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 "$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 -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds_CXX='$CC -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 "\-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
-    ;;
-  aix4* | aix5*)
-    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].*|aix5*)
-	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_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
-
-    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
-	  hardcode_direct_CXX=yes
-	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
-
-    # 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.
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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 echo "${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.
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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'
-	# Exported symbols can be pulled into shared objects from archives
-	whole_archive_flag_spec_CXX='$convenience'
-	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*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-    # as there is no search path for DLLs.
-    hardcode_libdir_flag_spec_CXX='-L$libdir'
-    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
-  ;;
-      darwin* | rhapsody*)
-        case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-        esac
-      archive_cmds_need_lc_CXX=no
-      hardcode_direct_CXX=no
-      hardcode_automatic_CXX=yes
-      hardcode_shlibpath_var_CXX=unsupported
-      whole_archive_flag_spec_CXX=''
-      link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes ; then
-      lt_int_apple_cc_single_mod=no
-      output_verbose_link_cmd='echo'
-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-       lt_int_apple_cc_single_mod=yes
-      fi
-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      else
-          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'
-        fi
-        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          else
-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          fi
-            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_CXX=no
-          ;;
-      esac
-      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
-    ;;
-  freebsd[12]*)
-    # 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* | kfreebsd*-gnu | dragonfly*)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    ld_shlibs_CXX=yes
-    ;;
-  gnu*)
-    ;;
-  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) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${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*)
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-        ;;
-      *)
-	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_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; echo $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 -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    *)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${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
-    ;;
-  interix3*)
-    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" && echo -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 -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	  else
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${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=:
-    ;;
-  linux*)
-    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; echo $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*)
-	# 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*)
-        # Portland Group C++ compiler
-	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'
-
-	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; $echo \"$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=`echo $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; echo $list'
-	;;
-    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::"'
-    ;;
-  openbsd2*)
-    # C++ shared libraries are fairly broken
-    ld_shlibs_CXX=no
-    ;;
-  openbsd*)
-    hardcode_direct_CXX=yes
-    hardcode_shlibpath_var_CXX=no
-    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='echo'
-    ;;
-  osf3*)
-    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
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx*)
-	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" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	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.
-	#
-	# 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=`echo $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; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  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 "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  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.
-	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
-	;;
-      RCC*)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx*)
-	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" && echo -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'
-	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=`echo $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; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-
-	  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 "\-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*)
-	# 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 C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker. We must also pass each convience library through
-	    # to the system linker between allextract/defaultextract.
-	    # The C++ compiler will combine linker options so we
-	    # cannot just pass the convience library names through
-	    # without $wl.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-	    ;;
-	esac
-	link_all_deplibs_CXX=yes
-
-	output_verbose_link_cmd='echo'
-
-	# 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 -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 -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 \"\-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 \"\-L\""
-	  fi
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-	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.
-    # 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.
-    # So that behaviour is only enabled if SCOABSPATH is set to a
-    # non-empty value in the environment.  Most likely only useful for
-    # creating official distributions of packages.
-    # This is a hack until libtool officially supports absolute path
-    # names for shared libraries.
-    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='`test -z "$SCOABSPATH" && echo ${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,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	;;
-      *)
-	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$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"
-
-
-cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-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
-  # 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
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $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
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p 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
-       ;;
-
-    *.$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
-
-# PORTME: override above test on systems where it is broken
-case $host_os in
-interix3*)
-  # 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=
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC*)
-    # 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.
-    postdeps_CXX='-lCstd -lCrun'
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     ;;
   esac
-  ;;
-esac
-
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
-
-lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
-
-{ $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; }
-
-  # 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*)
-      # 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'
-      ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | os2* | pw32*)
-      # 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'
-      ;;
-    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=
-      ;;
-    interix3*)
-      # 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 IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	;;
-      *)
-	lt_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix4* | aix5*)
-	# 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_AC_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
-	;;
-       darwin*)
-         # PIC is the default on this platform
-         # Common symbols not allowed in MH_DYLIB files
-         case $cc_basename in
-           xlc*)
-           lt_prog_compiler_pic_CXX='-qnocommon'
-           lt_prog_compiler_wl_CXX='-Wl,'
-           ;;
-         esac
-       ;;
-      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* | kfreebsd*-gnu | 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*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  icpc* | ecpc*)
-	    # Intel C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  pgCC*)
-	    # 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'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      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*)
-	    # 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
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	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
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
-    esac
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-
-#
-# 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_prog_compiler_pic_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_prog_compiler_pic_works_CXX=no
-  ac_outfile=conftest.$ac_objext
-   printf "$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:12548: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:12552: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_works_CXX" >&5
-$as_echo "$lt_prog_compiler_pic_works_CXX" >&6; }
-
-if test x"$lt_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
-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
-
-#
-# 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_prog_compiler_static_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_prog_compiler_static_works_CXX=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$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 "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_CXX=yes
-       fi
-     else
-       lt_prog_compiler_static_works_CXX=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_static_works_CXX" >&5
-$as_echo "$lt_prog_compiler_static_works_CXX" >&6; }
-
-if test x"$lt_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
-   printf "$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:12652: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:12656: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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 ..
-   rmdir 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'
-  case $host_os in
-  aix4* | aix5*)
-    # 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
-    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")) && (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*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    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
 
-#
-# 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; }
-      $rm conftest*
-      printf "$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
-	  archive_cmds_need_lc_CXX=no
-        else
-	  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*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
-$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-      ;;
-    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"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # 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.
-    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
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-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
-  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'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  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*)
-  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=`$echo "X$lib" | $Xsed -e '\''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'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  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*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    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'
-    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="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        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
-      ;;
-    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
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # 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}${versuffix}$shared_ext ${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`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  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
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  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='GNU ld.so'
-  ;;
-
-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[123]*) 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
-    ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  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
-  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'
-  ;;
-
-interix3*)
-  version_type=linux
-  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
-	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 Linux ELF.
-linux*)
-  version_type=linux
-  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
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  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='GNU 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
-  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=linux
-  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
-  ;;
-
-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"
-  ;;
-
-solaris*)
-  version_type=linux
-  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
-  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
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      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
-    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
-  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'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    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'
-  ;;
-
-uts4*)
-  version_type=linux
-  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
-
-{ $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-existant 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_AC_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; 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
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # 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
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_CXX \
-    CC_CXX \
-    LD_CXX \
-    lt_prog_compiler_wl_CXX \
-    lt_prog_compiler_pic_CXX \
-    lt_prog_compiler_static_CXX \
-    lt_prog_compiler_no_builtin_flag_CXX \
-    export_dynamic_flag_spec_CXX \
-    thread_safe_flag_spec_CXX \
-    whole_archive_flag_spec_CXX \
-    enable_shared_with_static_runtimes_CXX \
-    old_archive_cmds_CXX \
-    old_archive_from_new_cmds_CXX \
-    predep_objects_CXX \
-    postdep_objects_CXX \
-    predeps_CXX \
-    postdeps_CXX \
-    compiler_lib_search_path_CXX \
-    archive_cmds_CXX \
-    archive_expsym_cmds_CXX \
-    postinstall_cmds_CXX \
-    postuninstall_cmds_CXX \
-    old_archive_from_expsyms_cmds_CXX \
-    allow_undefined_flag_CXX \
-    no_undefined_flag_CXX \
-    export_symbols_cmds_CXX \
-    hardcode_libdir_flag_spec_CXX \
-    hardcode_libdir_flag_spec_ld_CXX \
-    hardcode_libdir_separator_CXX \
-    hardcode_automatic_CXX \
-    module_cmds_CXX \
-    module_expsym_cmds_CXX \
-    lt_cv_prog_compiler_c_o_CXX \
-    exclude_expsyms_CXX \
-    include_expsyms_CXX; do
-
-    case $var in
-    old_archive_cmds_CXX | \
-    old_archive_from_new_cmds_CXX | \
-    archive_cmds_CXX | \
-    archive_expsym_cmds_CXX | \
-    module_cmds_CXX | \
-    module_expsym_cmds_CXX | \
-    old_archive_from_expsyms_cmds_CXX | \
-    export_symbols_cmds_CXX | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# 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
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# 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
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# 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
-
-# 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
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_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
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
-# Library versioning type.
-version_type=$version_type
-
-# 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
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# 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 and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-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
-
-# 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
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# 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
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# 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
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_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 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
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# 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
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_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
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# 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
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-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
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-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
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-
-
-archive_cmds_need_lc_F77=no
-allow_undefined_flag_F77=
-always_export_symbols_F77=no
-archive_expsym_cmds_F77=
-export_dynamic_flag_spec_F77=
-hardcode_direct_F77=no
-hardcode_libdir_flag_spec_F77=
-hardcode_libdir_flag_spec_ld_F77=
-hardcode_libdir_separator_F77=
-hardcode_minus_L_F77=no
-hardcode_automatic_F77=no
-module_cmds_F77=
-module_expsym_cmds_F77=
-link_all_deplibs_F77=unknown
-old_archive_cmds_F77=$old_archive_cmds
-no_undefined_flag_F77=
-whole_archive_flag_spec_F77=
-enable_shared_with_static_runtimes_F77=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-objext_F77=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# 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
-printf "$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
-printf "$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 conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-compiler_F77=$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 "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+  # 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 "$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 "$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
+  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
-  ;;
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+  # 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
-  fi
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+    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 "$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
+  # 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; }
 
-GCC_F77="$G77"
-LD_F77="$LD"
 
-lt_prog_compiler_wl_F77=
-lt_prog_compiler_pic_F77=
-lt_prog_compiler_static_F77=
 
-{ $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 test "$GCC" = yes; then
-    lt_prog_compiler_wl_F77='-Wl,'
-    lt_prog_compiler_static_F77='-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_F77='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # 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_F77='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # 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_F77='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_F77='-fno-common'
-      ;;
-
-    interix3*)
-      # 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_F77=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_F77=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # 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_F77='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_F77='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      else
-	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic_F77='-qnocommon'
-         lt_prog_compiler_wl_F77='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | pw32* | os2*)
-      # 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_F77='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_F77='-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_F77='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-KPIC'
-	lt_prog_compiler_static_F77='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-fpic'
-	lt_prog_compiler_static_F77='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_F77='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_F77='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl_F77='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_F77='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_F77='-Qoption ld '
-      lt_prog_compiler_pic_F77='-PIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_F77='-Kconform_pic'
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_F77='-pic'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-    esac
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_F77" >&5
-$as_echo "$lt_prog_compiler_pic_F77" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_F77"; then
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
-if ${lt_prog_compiler_pic_works_F77+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_prog_compiler_pic_works_F77=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
-   # 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:14222: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:14226: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_F77=yes
-     fi
-   fi
-   $rm conftest*
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_works_F77" >&5
-$as_echo "$lt_prog_compiler_pic_works_F77" >&6; }
-
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-    case $lt_prog_compiler_pic_F77 in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-     esac
-else
-    lt_prog_compiler_pic_F77=
-     lt_prog_compiler_can_build_shared_F77=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_F77=
-    ;;
-  *)
-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
-{ $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_prog_compiler_static_works_F77+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_prog_compiler_static_works_F77=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$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 "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_F77=yes
-       fi
-     else
-       lt_prog_compiler_static_works_F77=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_static_works_F77" >&5
-$as_echo "$lt_prog_compiler_static_works_F77" >&6; }
-
-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
-    :
-else
-    lt_prog_compiler_static_F77=
-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_F77+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_F77=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$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:14326: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:14330: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_F77=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 ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_F77" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_F77" = 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_F77=
-  enable_shared_with_static_runtimes_F77=no
-  archive_cmds_F77=
-  archive_expsym_cmds_F77=
-  old_archive_From_new_cmds_F77=
-  old_archive_from_expsyms_cmds_F77=
-  export_dynamic_flag_spec_F77=
-  whole_archive_flag_spec_F77=
-  thread_safe_flag_spec_F77=
-  hardcode_libdir_flag_spec_F77=
-  hardcode_libdir_flag_spec_ld_F77=
-  hardcode_libdir_separator_F77=
-  hardcode_direct_F77=no
-  hardcode_minus_L_F77=no
-  hardcode_shlibpath_var_F77=unsupported
-  link_all_deplibs_F77=unknown
-  hardcode_automatic_F77=no
-  module_cmds_F77=
-  module_expsym_cmds_F77=
-  always_export_symbols_F77=no
-  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_F77=
-  # 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_F77="_GLOBAL_OFFSET_TABLE_"
-  # 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.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # 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_F77=yes
-  if test "$with_gnu_ld" = 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_F77='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_F77='${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_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_F77=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [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
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, 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 modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$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_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_F77=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_F77=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=no
-      enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_F77='$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_F77='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_F77=no
-      fi
-      ;;
-
-    interix3*)
-      hardcode_direct_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_F77='${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_F77='$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_F77='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'
-      ;;
-
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$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' ;;
-	esac
-	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $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_F77=no
-	cat <<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.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs_F77=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
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    ld_shlibs_F77=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_F77" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_F77=
-      export_dynamic_flag_spec_F77=
-      whole_archive_flag_spec_F77=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=yes
-      archive_expsym_cmds_F77='$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_F77=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_F77=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      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
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_F77='$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].*|aix5*)
-	  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_F77=''
-      hardcode_direct_F77=yes
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
-
-      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
-  	  hardcode_direct_F77=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_F77=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_F77=yes
-  	  hardcode_libdir_flag_spec_F77='-L$libdir'
-  	  hardcode_libdir_separator_F77=
-	  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
-
-      # 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_F77=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_F77='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_f77_try_link "$LINENO"; then :
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${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_F77='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$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.
-	 cat > conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-if ac_fn_f77_try_link "$LINENO"; then :
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_F77='${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_F77=' ${wl}-bernotok'
-	  allow_undefined_flag_F77=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_F77='$convenience'
-	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_F77="\$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*)
-      archive_cmds_F77='$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_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_F77=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_F77=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # 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.
-      hardcode_libdir_flag_spec_F77=' '
-      allow_undefined_flag_F77=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_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_F77='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_F77=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc_F77=no
-      hardcode_direct_F77=no
-      hardcode_automatic_F77=yes
-      hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77=''
-      link_all_deplibs_F77=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_F77=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_F77=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_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${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_F77='$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_F77='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_direct_F77=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$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_F77='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_F77=:
-
-	hardcode_direct_F77=yes
-	export_dynamic_flag_spec_F77='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_F77=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$CC -shared -fPIC ${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_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_F77=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-	  ;;
-	*)
-	  hardcode_direct_F77=yes
-	  export_dynamic_flag_spec_F77='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      link_all_deplibs_F77=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    newsos6)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      allow_undefined_flag_F77=unsupported
-      archive_cmds_F77='$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_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_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_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    solaris*)
-      no_undefined_flag_F77=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_F77='$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'
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_shlibpath_var_F77=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
-      esac
-      link_all_deplibs_F77=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_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_F77='$CC -r -o $output$reload_objs'
-	  hardcode_direct_F77=no
-        ;;
-	motorola)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_F77=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_F77=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-      no_undefined_flag_F77='${wl}-z,text'
-      archive_cmds_need_lc_F77=no
-      hardcode_shlibpath_var_F77=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$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_F77='${wl}-z,text'
-      allow_undefined_flag_F77='${wl}-z,nodefs'
-      archive_cmds_need_lc_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      ld_shlibs_F77=no
-      ;;
-    esac
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_F77" >&5
-$as_echo "$ld_shlibs_F77" >&6; }
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_F77" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_F77=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_F77 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; }
-      $rm conftest*
-      printf "$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_F77
-	pic_flag=$lt_prog_compiler_pic_F77
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
-        allow_undefined_flag_F77=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds_F77 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
-	  archive_cmds_need_lc_F77=no
-        else
-	  archive_cmds_need_lc_F77=yes
-        fi
-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_F77" >&5
-$as_echo "$archive_cmds_need_lc_F77" >&6; }
-      ;;
-    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"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # 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.
-    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
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-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
-  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'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  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*)
-  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=`$echo "X$lib" | $Xsed -e '\''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'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  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*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    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'
-    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="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        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
-      ;;
-    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
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # 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}${versuffix}$shared_ext ${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`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  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
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  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='GNU ld.so'
-  ;;
-
-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[123]*) 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
-    ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  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
-  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'
-  ;;
-
-interix3*)
-  version_type=linux
-  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
-	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 Linux ELF.
-linux*)
-  version_type=linux
-  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
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  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='GNU 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
-  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=linux
-  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
-  ;;
-
-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"
-  ;;
-
-solaris*)
-  version_type=linux
-  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
-  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
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      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
-    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
-  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'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    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'
-  ;;
-
-uts4*)
-  version_type=linux
-  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
-
-{ $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_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var_F77" || \
-   test "X$hardcode_automatic_F77" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_F77" != 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_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-     test "$hardcode_minus_L_F77" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_F77=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_F77=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_F77=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_F77" >&5
-$as_echo "$hardcode_action_F77" >&6; }
-
-if test "$hardcode_action_F77" = relink; 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
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # 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
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_F77 \
-    CC_F77 \
-    LD_F77 \
-    lt_prog_compiler_wl_F77 \
-    lt_prog_compiler_pic_F77 \
-    lt_prog_compiler_static_F77 \
-    lt_prog_compiler_no_builtin_flag_F77 \
-    export_dynamic_flag_spec_F77 \
-    thread_safe_flag_spec_F77 \
-    whole_archive_flag_spec_F77 \
-    enable_shared_with_static_runtimes_F77 \
-    old_archive_cmds_F77 \
-    old_archive_from_new_cmds_F77 \
-    predep_objects_F77 \
-    postdep_objects_F77 \
-    predeps_F77 \
-    postdeps_F77 \
-    compiler_lib_search_path_F77 \
-    archive_cmds_F77 \
-    archive_expsym_cmds_F77 \
-    postinstall_cmds_F77 \
-    postuninstall_cmds_F77 \
-    old_archive_from_expsyms_cmds_F77 \
-    allow_undefined_flag_F77 \
-    no_undefined_flag_F77 \
-    export_symbols_cmds_F77 \
-    hardcode_libdir_flag_spec_F77 \
-    hardcode_libdir_flag_spec_ld_F77 \
-    hardcode_libdir_separator_F77 \
-    hardcode_automatic_F77 \
-    module_cmds_F77 \
-    module_expsym_cmds_F77 \
-    lt_cv_prog_compiler_c_o_F77 \
-    exclude_expsyms_F77 \
-    include_expsyms_F77; do
-
-    case $var in
-    old_archive_cmds_F77 | \
-    old_archive_from_new_cmds_F77 | \
-    archive_cmds_F77 | \
-    archive_expsym_cmds_F77 | \
-    module_cmds_F77 | \
-    module_expsym_cmds_F77 | \
-    old_archive_from_expsyms_cmds_F77 | \
-    export_symbols_cmds_F77 | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_F77
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# 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
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_F77
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_F77
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_F77
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_F77
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_F77
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# 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
-
-# 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
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_F77
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
-
-# Library versioning type.
-version_type=$version_type
-
-# 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
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_F77
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_F77
-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_F77
-module_expsym_cmds=$lt_module_expsym_cmds_F77
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_F77
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_F77
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-
-# 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
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_F77
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_F77
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# 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
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_F77
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# 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_F77
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_F77
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_F77
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
-
-# 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_F77
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_F77
-
-# 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
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_F77
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_F77
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_F77
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_F77
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -16381,3117 +12169,28 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 CC="$lt_save_CC"
 
-	else
-	  tagname=""
-	fi
-	;;
 
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
 
 
-# Source file extension for Java test sources.
-ac_ext=java
 
-# Object file extension for compiled Java test sources.
-objext=o
-objext_GCJ=$objext
 
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
 
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
 
-# 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
-printf "$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
-printf "$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 conftest*
 
+        ac_config_commands="$ac_config_commands libtool"
 
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-compiler_GCJ=$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 "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
 
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-archive_cmds_need_lc_GCJ=no
 
-old_archive_cmds_GCJ=$old_archive_cmds
+# Only expand once:
 
 
-lt_prog_compiler_no_builtin_flag_GCJ=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-
-{ $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
-   printf "$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:16478: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:16482: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl_GCJ=
-lt_prog_compiler_pic_GCJ=
-lt_prog_compiler_static_GCJ=
-
-{ $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 test "$GCC" = yes; then
-    lt_prog_compiler_wl_GCJ='-Wl,'
-    lt_prog_compiler_static_GCJ='-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_GCJ='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # 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_GCJ='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # 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_GCJ='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_GCJ='-fno-common'
-      ;;
-
-    interix3*)
-      # 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_GCJ=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_GCJ=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # 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_GCJ='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_GCJ='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      else
-	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-      darwin*)
-        # PIC is the default on this platform
-        # Common symbols not allowed in MH_DYLIB files
-       case $cc_basename in
-         xlc*)
-         lt_prog_compiler_pic_GCJ='-qnocommon'
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         ;;
-       esac
-       ;;
-
-    mingw* | pw32* | os2*)
-      # 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_GCJ='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_GCJ='-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_GCJ='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    linux*)
-      case $cc_basename in
-      icc* | ecc*)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-KPIC'
-	lt_prog_compiler_static_GCJ='-static'
-        ;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-fpic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_GCJ='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_GCJ='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95*)
-	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl_GCJ='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_GCJ='-Qoption ld '
-      lt_prog_compiler_pic_GCJ='-PIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_GCJ='-Kconform_pic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_GCJ='-pic'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-    esac
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_GCJ" >&5
-$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
-if ${lt_prog_compiler_pic_works_GCJ+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_prog_compiler_pic_works_GCJ=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-   # 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:16746: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:16750: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_prog_compiler_pic_works_GCJ=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_works_GCJ" >&5
-$as_echo "$lt_prog_compiler_pic_works_GCJ" >&6; }
-
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-    case $lt_prog_compiler_pic_GCJ in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-     esac
-else
-    lt_prog_compiler_pic_GCJ=
-     lt_prog_compiler_can_build_shared_GCJ=no
-fi
-
-fi
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_GCJ=
-    ;;
-  *)
-    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
-    ;;
-esac
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
-{ $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_prog_compiler_static_works_GCJ+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_prog_compiler_static_works_GCJ=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   printf "$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 "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_prog_compiler_static_works_GCJ=yes
-       fi
-     else
-       lt_prog_compiler_static_works_GCJ=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_static_works_GCJ" >&5
-$as_echo "$lt_prog_compiler_static_works_GCJ" >&6; }
-
-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
-    :
-else
-    lt_prog_compiler_static_GCJ=
-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_GCJ+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_GCJ=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$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:16850: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:16854: \$? = $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 "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/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_GCJ=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 ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_GCJ" = 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_GCJ=
-  enable_shared_with_static_runtimes_GCJ=no
-  archive_cmds_GCJ=
-  archive_expsym_cmds_GCJ=
-  old_archive_From_new_cmds_GCJ=
-  old_archive_from_expsyms_cmds_GCJ=
-  export_dynamic_flag_spec_GCJ=
-  whole_archive_flag_spec_GCJ=
-  thread_safe_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_ld_GCJ=
-  hardcode_libdir_separator_GCJ=
-  hardcode_direct_GCJ=no
-  hardcode_minus_L_GCJ=no
-  hardcode_shlibpath_var_GCJ=unsupported
-  link_all_deplibs_GCJ=unknown
-  hardcode_automatic_GCJ=no
-  module_cmds_GCJ=
-  module_expsym_cmds_GCJ=
-  always_export_symbols_GCJ=no
-  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_GCJ=
-  # 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_GCJ="_GLOBAL_OFFSET_TABLE_"
-  # 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.
-  extract_expsyms_cmds=
-  # Just being paranoid about ensuring that cc_basename is set.
-  for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # 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_GCJ=yes
-  if test "$with_gnu_ld" = 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_GCJ='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_GCJ='${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_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_GCJ=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>/dev/null` in
-      *\ [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
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, 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 modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$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_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_GCJ=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_GCJ=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=no
-      enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_GCJ='$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_GCJ='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_GCJ=no
-      fi
-      ;;
-
-    interix3*)
-      hardcode_direct_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec_GCJ='${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_GCJ='$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_GCJ='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'
-      ;;
-
-    linux*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	tmp_addflag=
-	case $cc_basename,$host_cpu in
-	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$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' ;;
-	esac
-	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-	if test $supports_anon_versioning = yes; then
-	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-  $echo "local: *; };" >> $output_objdir/$libname.ver~
-	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	fi
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $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_GCJ=no
-	cat <<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.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs_GCJ=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
-	;;
-	*)
-	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-	  else
-	    ld_shlibs_GCJ=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_GCJ" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec_GCJ=
-      export_dynamic_flag_spec_GCJ=
-      whole_archive_flag_spec_GCJ=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=yes
-      archive_expsym_cmds_GCJ='$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_GCJ=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_GCJ=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      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
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_GCJ='$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].*|aix5*)
-	  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_GCJ=''
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-
-      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
-  	  hardcode_direct_GCJ=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_GCJ=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_GCJ=yes
-  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-  	  hardcode_libdir_separator_GCJ=
-	  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
-
-      # 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_GCJ=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_GCJ='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${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_GCJ='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_GCJ="-z nodefs"
-	  archive_expsym_cmds_GCJ="\$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.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_GCJ='${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_GCJ=' ${wl}-bernotok'
-	  allow_undefined_flag_GCJ=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_GCJ='$convenience'
-	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds_GCJ="\$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*)
-      archive_cmds_GCJ='$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_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_GCJ=no
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec_GCJ=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # 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.
-      hardcode_libdir_flag_spec_GCJ=' '
-      allow_undefined_flag_GCJ=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_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_GCJ='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_GCJ=yes
-      ;;
-
-    darwin* | rhapsody*)
-      case $host_os in
-        rhapsody* | darwin1.[012])
-         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-         ;;
-       *) # Darwin 1.3 on
-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-         else
-           case ${MACOSX_DEPLOYMENT_TARGET} in
-             10.[012])
-               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-               ;;
-             10.*)
-               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-               ;;
-           esac
-         fi
-         ;;
-      esac
-      archive_cmds_need_lc_GCJ=no
-      hardcode_direct_GCJ=no
-      hardcode_automatic_GCJ=yes
-      hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ=''
-      link_all_deplibs_GCJ=yes
-    if test "$GCC" = yes ; then
-    	output_verbose_link_cmd='echo'
-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      case $cc_basename in
-        xlc*)
-         output_verbose_link_cmd='echo'
-         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-          ;;
-       *)
-         ld_shlibs_GCJ=no
-          ;;
-      esac
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_GCJ=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_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu | dragonfly*)
-      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${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_GCJ='$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_GCJ='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_direct_GCJ=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$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_GCJ='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_GCJ=:
-
-	hardcode_direct_GCJ=yes
-	export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L_GCJ=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$CC -shared -fPIC ${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_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_GCJ=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-	  ;;
-	*)
-	  hardcode_direct_GCJ=yes
-	  export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    newsos6)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      allow_undefined_flag_GCJ=unsupported
-      archive_cmds_GCJ='$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_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_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_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    solaris*)
-      no_undefined_flag_GCJ=' -z text'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	wlarc=''
-	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_GCJ='$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'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
- 	# The compiler driver will combine linker options so we
- 	# cannot just pass the convience library names through
- 	# without $wl, iff we do not link with $LD.
- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	case $wlarc in
- 	'')
- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
- 	*)
- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- 	esac ;;
-      esac
-      link_all_deplibs_GCJ=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_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
-	  hardcode_direct_GCJ=no
-        ;;
-	motorola)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_GCJ=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_GCJ=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
-      no_undefined_flag_GCJ='${wl}-z,text'
-      archive_cmds_need_lc_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$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_GCJ='${wl}-z,text'
-      allow_undefined_flag_GCJ='${wl}-z,nodefs'
-      archive_cmds_need_lc_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      ld_shlibs_GCJ=no
-      ;;
-    esac
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_GCJ" >&5
-$as_echo "$ld_shlibs_GCJ" >&6; }
-test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_GCJ" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_GCJ=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_GCJ 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; }
-      $rm conftest*
-      printf "$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_GCJ
-	pic_flag=$lt_prog_compiler_pic_GCJ
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-        allow_undefined_flag_GCJ=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds_GCJ 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
-	  archive_cmds_need_lc_GCJ=no
-        else
-	  archive_cmds_need_lc_GCJ=yes
-        fi
-        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_GCJ" >&5
-$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
-      ;;
-    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"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # 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.
-    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
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-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
-  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'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  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*)
-  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=`$echo "X$lib" | $Xsed -e '\''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'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux
-  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*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    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'
-    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="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        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
-      ;;
-    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
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # 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}${versuffix}$shared_ext ${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`'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  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
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  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='GNU ld.so'
-  ;;
-
-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[123]*) 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
-    ;;
-  freebsd*) # from 4.6 on
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  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
-  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'
-  ;;
-
-interix3*)
-  version_type=linux
-  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
-	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 Linux ELF.
-linux*)
-  version_type=linux
-  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
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  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='GNU 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
-  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=linux
-  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
-  ;;
-
-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"
-  ;;
-
-solaris*)
-  version_type=linux
-  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
-  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
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      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
-    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
-  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'
-    shlibpath_overrides_runpath=no
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    shlibpath_overrides_runpath=yes
-    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'
-  ;;
-
-uts4*)
-  version_type=linux
-  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
-
-{ $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_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var_GCJ" || \
-   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_GCJ" != 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_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-     test "$hardcode_minus_L_GCJ" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_GCJ=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_GCJ=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_GCJ=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_GCJ" >&5
-$as_echo "$hardcode_action_GCJ" >&6; }
-
-if test "$hardcode_action_GCJ" = relink; 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
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # 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
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_GCJ \
-    CC_GCJ \
-    LD_GCJ \
-    lt_prog_compiler_wl_GCJ \
-    lt_prog_compiler_pic_GCJ \
-    lt_prog_compiler_static_GCJ \
-    lt_prog_compiler_no_builtin_flag_GCJ \
-    export_dynamic_flag_spec_GCJ \
-    thread_safe_flag_spec_GCJ \
-    whole_archive_flag_spec_GCJ \
-    enable_shared_with_static_runtimes_GCJ \
-    old_archive_cmds_GCJ \
-    old_archive_from_new_cmds_GCJ \
-    predep_objects_GCJ \
-    postdep_objects_GCJ \
-    predeps_GCJ \
-    postdeps_GCJ \
-    compiler_lib_search_path_GCJ \
-    archive_cmds_GCJ \
-    archive_expsym_cmds_GCJ \
-    postinstall_cmds_GCJ \
-    postuninstall_cmds_GCJ \
-    old_archive_from_expsyms_cmds_GCJ \
-    allow_undefined_flag_GCJ \
-    no_undefined_flag_GCJ \
-    export_symbols_cmds_GCJ \
-    hardcode_libdir_flag_spec_GCJ \
-    hardcode_libdir_flag_spec_ld_GCJ \
-    hardcode_libdir_separator_GCJ \
-    hardcode_automatic_GCJ \
-    module_cmds_GCJ \
-    module_expsym_cmds_GCJ \
-    lt_cv_prog_compiler_c_o_GCJ \
-    exclude_expsyms_GCJ \
-    include_expsyms_GCJ; do
-
-    case $var in
-    old_archive_cmds_GCJ | \
-    old_archive_from_new_cmds_GCJ | \
-    archive_cmds_GCJ | \
-    archive_expsym_cmds_GCJ | \
-    module_cmds_GCJ | \
-    module_expsym_cmds_GCJ | \
-    old_archive_from_expsyms_cmds_GCJ | \
-    export_symbols_cmds_GCJ | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# 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
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_GCJ
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_GCJ
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_GCJ
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_GCJ
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_GCJ
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# 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
-
-# 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
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_GCJ
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-
-# Library versioning type.
-version_type=$version_type
-
-# 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
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_GCJ
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_GCJ
-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_GCJ
-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_GCJ
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-
-# 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
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_GCJ
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# 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
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_GCJ
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# 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_GCJ
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_GCJ
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_GCJ
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-
-# 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_GCJ
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_GCJ
-
-# 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
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_GCJ
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_GCJ
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_GCJ
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-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"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-objext_RC=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# 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
-printf "$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
-printf "$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 conftest*
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-compiler_RC=$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 "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-
-lt_cv_prog_compiler_c_o_RC=yes
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # 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
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_RC \
-    CC_RC \
-    LD_RC \
-    lt_prog_compiler_wl_RC \
-    lt_prog_compiler_pic_RC \
-    lt_prog_compiler_static_RC \
-    lt_prog_compiler_no_builtin_flag_RC \
-    export_dynamic_flag_spec_RC \
-    thread_safe_flag_spec_RC \
-    whole_archive_flag_spec_RC \
-    enable_shared_with_static_runtimes_RC \
-    old_archive_cmds_RC \
-    old_archive_from_new_cmds_RC \
-    predep_objects_RC \
-    postdep_objects_RC \
-    predeps_RC \
-    postdeps_RC \
-    compiler_lib_search_path_RC \
-    archive_cmds_RC \
-    archive_expsym_cmds_RC \
-    postinstall_cmds_RC \
-    postuninstall_cmds_RC \
-    old_archive_from_expsyms_cmds_RC \
-    allow_undefined_flag_RC \
-    no_undefined_flag_RC \
-    export_symbols_cmds_RC \
-    hardcode_libdir_flag_spec_RC \
-    hardcode_libdir_flag_spec_ld_RC \
-    hardcode_libdir_separator_RC \
-    hardcode_automatic_RC \
-    module_cmds_RC \
-    module_expsym_cmds_RC \
-    lt_cv_prog_compiler_c_o_RC \
-    exclude_expsyms_RC \
-    include_expsyms_RC; do
-
-    case $var in
-    old_archive_cmds_RC | \
-    old_archive_from_new_cmds_RC | \
-    archive_cmds_RC | \
-    archive_expsym_cmds_RC | \
-    module_cmds_RC | \
-    module_expsym_cmds_RC | \
-    old_archive_from_expsyms_cmds_RC | \
-    export_symbols_cmds_RC | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_RC
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# 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
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
-
-# A language-specific compiler.
-CC=$lt_compiler_RC
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_RC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_RC
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_RC
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# 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
-
-# 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
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_RC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-
-# Library versioning type.
-version_type=$version_type
-
-# 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
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_RC
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_RC
-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_RC
-module_expsym_cmds=$lt_module_expsym_cmds_RC
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_RC
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_RC
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-
-# 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
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_RC
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_RC
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# 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
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_RC
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# 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_RC
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_RC
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-
-# 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_RC
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_RC
-
-# 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
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_RC
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_RC
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_RC
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-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"
-
-	;;
-
-      *)
-	as_fn_error $? "Unsupported tag name: $tagname" "$LINENO" 5
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    as_fn_error $? "unable to update list of available tagged configurations." "$LINENO" 5
-  fi
-fi
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Prevent multiple expansion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $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
-	   as_fn_executable_p "$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; }
 
 
 # Check for library functions that SQLite can optionally use.
@@ -20080,6 +12779,14 @@ 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
@@ -20092,10 +12799,6 @@ 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
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -20493,7 +13196,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 sqlite $as_me 3.7.17, which was
+This file was extended by sqlite $as_me 3.8.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20550,7 +13253,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="\\
-sqlite config.status 3.7.17
+sqlite config.status 3.8.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -20660,6 +13363,283 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 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"`'
+
+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; 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; 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
@@ -20669,6 +13649,7 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "sqlite3.pc") CONFIG_FILES="$CONFIG_FILES sqlite3.pc" ;;
 
@@ -21100,17 +14081,28 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
 
   case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; 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.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
+    "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\(//\)$' \| \
@@ -21133,28 +14125,28 @@ $as_echo X"$mf" |
 	    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" ||
+    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\(//\)$' \| \
@@ -21177,11 +14169,642 @@ $as_echo X"$file" |
 	    q
 	  }
 	  s/.*/./; q'`
-    as_dir=$dirpart/$fdir; as_fn_mkdir_p
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   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=""
+
+# ### 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
+
+# ### 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"
+
  ;;
 
   esac
diff --git a/contrib/sqlite3/configure.ac b/contrib/sqlite3/configure.ac
index 93ff04c151d7..94289b1b7771 100644
--- a/contrib/sqlite3/configure.ac
+++ b/contrib/sqlite3/configure.ac
@@ -8,7 +8,7 @@
 #
 
 AC_PREREQ(2.61)
-AC_INIT(sqlite, 3.7.17, http://www.sqlite.org)
+AC_INIT(sqlite, 3.8.5, http://www.sqlite.org)
 AC_CONFIG_SRCDIR([sqlite3.c])
 
 # Use automake.
diff --git a/contrib/sqlite3/depcomp b/contrib/sqlite3/depcomp
index 04701da536f3..25a39e6cd5c8 100755
--- a/contrib/sqlite3/depcomp
+++ b/contrib/sqlite3/depcomp
@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-07-09.11
+scriptversion=2012-03-27.16; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011, 2012 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
@@ -16,9 +17,7 @@ scriptversion=2005-07-09.11
 # 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.
+# 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
@@ -29,7 +28,7 @@ scriptversion=2005-07-09.11
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -41,11 +40,11 @@ as side-effects.
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  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 outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -58,6 +57,12 @@ EOF
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 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
@@ -86,12 +91,48 @@ if test "$depmode" = dashXmstdout; then
    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
+
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+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.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## 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
@@ -127,20 +168,21 @@ gcc)
 ## 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.
+## 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
+  tr ' ' "$nl" < "$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.
+## 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 '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -172,20 +214,17 @@ sgi)
     # 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
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
+    tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
+   >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -195,40 +234,51 @@ sgi)
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # 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
+  ;;
+
 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
+  # 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.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
+  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 -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
   if test $stat -eq 0; then :
   else
-    rm -f "$tmpdepfile"
+    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
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
+    # 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,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -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
@@ -239,23 +289,26 @@ aix)
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -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:
+  # 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 \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -264,23 +317,74 @@ icc)
     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 \'.
+  # 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"
+  # '$object: dependent.h' and one to simply 'dependent.h:'.
+  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
+    < "$tmpdepfile" > "$depfile"
+  sed '
+    s/[ '"$tab"'][ '"$tab"']*/ /g
+    s/^ *//
+    s/ *\\*$//
+    s/^[^:]*: *//
+    /^$/d
+    /:$/d
+    s/$/ :/
+  ' < "$tmpdepfile" >> "$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'.
+   # 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.
+   # 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=
@@ -288,13 +392,13 @@ tru64)
 
    if test "$libtool" = yes; then
       # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
+      # 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 in $dir.libs/$base.o.d and
+      # 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
@@ -326,14 +430,59 @@ tru64)
    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"
+      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -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/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  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.
@@ -345,13 +494,13 @@ dashmstdout)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -371,15 +520,14 @@ dashmstdout)
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # 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.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
+  tr ' ' "$nl" < "$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"
@@ -396,38 +544,46 @@ makedepend)
   "$@" || exit $?
   # Remove any Libtool call
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
   # X makedepend
   shift
-  cleared=no
-  for arg in "$@"; do
+  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/^.*\././'`"
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
+  # 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 ' ' "$nl" | \
 ## 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"
@@ -441,13 +597,13 @@ cpp)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -479,13 +635,27 @@ cpp)
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
+  # 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
@@ -498,16 +668,23 @@ msvisualcpp)
 	;;
     esac
   done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  "$@" -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"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$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 "$@"
   ;;
@@ -526,5 +703,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/contrib/sqlite3/install-sh b/contrib/sqlite3/install-sh
index 4d4a9519eaf8..a9244eb07865 100755
--- a/contrib/sqlite3/install-sh
+++ b/contrib/sqlite3/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+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
@@ -39,38 +39,68 @@ scriptversion=2005-05-14.22
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# 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-}"
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
 
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+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
 
-chmodcmd="$chmodprog 0755"
-chowncmd=
 chgrpcmd=
-stripcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -80,81 +110,94 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
--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.
---help     display this help and exit.
---version  display version info and exit.
+     --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 CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
-    -c) shift
-        continue;;
+    -c) ;;
 
-    -d) dir_arg=true
-        shift
-        continue;;
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
     --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
+    -s) stripcmd=$stripprog;;
 
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
+    -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
-	shift
-	continue;;
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
+    --)	shift
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
+  shift
 done
 
-if test -z "$1"; then
+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
@@ -164,24 +207,51 @@ if test -z "$1"; then
   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 starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src ;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
+    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 '*'.
@@ -190,71 +260,194 @@ do
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
-    dst=$dstarg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst ;;
-    esac
+    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: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      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
 
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+  obsolete_mkdir_used=false
 
-  # Make sure that the destination directory exists.
+  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;;
 
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
 
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
+	# 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
 
-    pathcomp=
+	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
 
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
+	    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
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
+      $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
-      pathcomp=$pathcomp/
-    done
+    fi
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+    { 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
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +455,9 @@ do
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -273,51 +465,63 @@ do
     # 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 "$dsttmp"; } &&
+    { 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"; } &&
 
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 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.
+    # 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` &&
 
-	   # 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.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
+       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 &&
 
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
+       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
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); 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-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/contrib/sqlite3/ltmain.sh b/contrib/sqlite3/ltmain.sh
index b4583e7e2694..6a2f1166a9fa 100755
--- a/contrib/sqlite3/ltmain.sh
+++ b/contrib/sqlite3/ltmain.sh
@@ -1,52 +1,90 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
+
+# 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  Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
+# 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.
 #
-# This program is distributed in the hope that it will be useful, but
+# 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# 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]...
 #
-# 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.
+# 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/>.
 
-basename="s,^.*/,,g"
-
-# 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"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
+PROGRAM=libtool
 PACKAGE=libtool
-VERSION=1.5.24
-TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
+VERSION=2.4.2
+TIMESTAMP=""
+package_revision=1.3337
 
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -60,98 +98,457 @@ fi
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
 
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# 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'
-# 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
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+# 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
+          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"
 
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
 
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-duplicate_deps=no
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# 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
+}
 
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
 
 # func_mktempdir [string]
 # Make a temporary directory that won't clash with other running
@@ -161,7 +558,7 @@ func_mktempdir ()
 {
     my_template="${TMPDIR-/tmp}/${1-$progname}"
 
-    if test "$run" = ":"; then
+    if test "$opt_dry_run" = ":"; then
       # Return a directory name, but don't create it in dry-run mode
       my_tmpdir="${my_template}-$$"
     else
@@ -170,72 +567,805 @@ func_mktempdir ()
       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}$$"
+        # 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
+        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" || {
-        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
-	exit $EXIT_FAILURE
-      }
+      test -d "$my_tmpdir" || \
+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
     fi
 
-    $echo "X$my_tmpdir" | $Xsed
+    $ECHO "$my_tmpdir"
 }
 
 
-# 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.
-func_win32_libid ()
+# 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 ()
 {
-  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
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	$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"
-      ;;
+    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
-  $echo $win32_libid_type
 }
 
 
+# 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.
@@ -244,39 +1374,36 @@ func_win32_libid ()
 # 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
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
+	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 "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+      " $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
+	  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.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
+	      # 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 "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+	    " $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.
@@ -290,11 +1417,10 @@ func_infer_tag ()
 	# was found and let the user know that the "--tag" command
 	# line option must be used.
 	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with \`--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
 	fi
 	;;
       esac
@@ -302,354 +1428,528 @@ func_infer_tag ()
 }
 
 
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
+
+# 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 ()
 {
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
-    fi
-}
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
-
-    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
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  extracted_serial=`expr $extracted_serial + 1`
-	  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"
-
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
-	exit $exit_status
-      fi
-      case $host in
-      *-darwin*)
-	$show "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	if test -z "$run"; then
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-	  if test -n "$darwin_arches"; then 
-	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      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 have a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      lipo -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    ${rm}r unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd "$darwin_orig_dir"
- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	fi # $run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
-}
-# End of Shell function definitions
-#####################################
-
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
-disable_libs=no
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    echo "\
-$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
-
-Copyright (C) 2007  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."
-    exit $?
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-    done
-    exit $?
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
+    write_libobj=${1}
     if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
+      write_lobj=\'${2}\'
     else
-      $echo "disable shared libraries"
+      write_lobj=none
     fi
+
     if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
+      write_oldobj=\'${3}\'
     else
-      $echo "disable static libraries"
+      write_oldobj=none
     fi
-    exit $?
-    ;;
 
-  --finish) mode="finish" ;;
+    $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.
 
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
+# Name of the PIC object.
+pic_object=$write_lobj
 
-  --preserve-dup-deps) duplicate_deps="yes" ;;
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
 
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
 
-  --tag)
-    prevopt="--tag"
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
 
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
 
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
+# 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
 
-  *)
-    nonopt="$arg"
-    break
+
+# 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
-done
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
 
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
 
-case $disable_libs in
-no) 
-  ;;
-shared)
-  build_libtool_libs=no
-  build_old_libs=yes
-  ;;
-static)
-  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-  ;;
-esac
+##################################################
+# $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.
 
-# 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=
 
-if test -z "$show_help"; then
+# 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
 
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
+
+# 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
       ;;
     *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
       ;;
-    esac
+  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
 
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
+
+# 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
 
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
 
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
+# 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"
@@ -658,6 +1958,7 @@ if test -z "$show_help"; then
     arg_mode=normal
     libobj=
     later=
+    pie_flag=
 
     for arg
     do
@@ -678,16 +1979,19 @@ if test -z "$show_help"; then
 	# Accept any command-line options.
 	case $arg in
 	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify \`-o' more than once"
 	  arg_mode=target
 	  continue
 	  ;;
 
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
+	-pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  func_append later " $arg"
 	  continue
 	  ;;
 
@@ -702,31 +2006,24 @@ if test -z "$show_help"; then
 	  ;;            #  replaced later.  I would guess that would be a bug.
 
 	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
 	  lastarg=
 	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
+	  for arg in $args; do
 	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
+	    func_append_quoted lastarg "$arg"
 	  done
 	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
 
 	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
+	  func_append base_compile " $lastarg"
 	  continue
 	  ;;
 
-	* )
+	*)
 	  # Accept the current argument as the source file.
 	  # The previous "srcfile" becomes the current argument.
 	  #
@@ -738,65 +2035,41 @@ if test -z "$show_help"; then
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
+      func_append_quoted base_compile "$lastarg"
     done # for arg
 
     case $arg_mode in
     arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
+      func_fatal_error "you must specify an argument for -Xcompile"
       ;;
     target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
+      func_fatal_error "you must specify a target with \`-o'"
       ;;
     *)
       # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+      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
-    xform='[cCFSifmso]'
     case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.[fF][09]?) xform=[fF][09]. ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    *.obj) xform=obj ;;
+    *.[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
 
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
     case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
     *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
+      func_fatal_error "cannot determine name of library object from \`$libobj'"
       ;;
     esac
 
@@ -804,7 +2077,15 @@ if test -z "$show_help"; then
 
     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
 	;;
@@ -821,28 +2102,17 @@ if test -z "$show_help"; then
       esac
     done
 
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
+    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
 
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
+    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
@@ -851,12 +2121,9 @@ if test -z "$show_help"; then
       removelist="$lobj $libobj ${libobj}T"
     fi
 
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
       pic_mode=default
       ;;
     esac
@@ -868,10 +2135,8 @@ if test -z "$show_help"; then
     # 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 "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
     else
       output_obj=
       need_locks=no
@@ -881,13 +2146,13 @@ if test -z "$show_help"; then
     # 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 $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
+      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 "\
+	$ECHO "\
 *** ERROR, $lockfile exists and contains:
 `cat $lockfile 2>/dev/null`
 
@@ -898,34 +2163,21 @@ 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."
 
-	$run $rm $removelist
+	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
-      $echo "$srcfile" > "$lockfile"
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
     fi
 
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
+    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
@@ -939,32 +2191,19 @@ EOF
 	command="$base_compile $qsrcfile"
       fi
 
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	exit_status=$?
-	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $exit_status
-	fi
-      fi
+      func_mkdir_p "$xdir$objdir"
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
-	command="$command -o $lobj"
+	func_append command " -o $lobj"
       fi
 
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      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 "\
+	$ECHO "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -978,65 +2217,42 @@ 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."
 
-	$run $rm $removelist
+	$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
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
       fi
 
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
       # Allow error messages only from the first compilation.
       if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
+	suppress_output=' >/dev/null 2>&1'
       fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
     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"
+	command="$base_compile $qsrcfile$pie_flag"
       else
 	command="$base_compile $qsrcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
+	func_append command " -o $obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
+      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 "\
+	$ECHO "\
 *** ERROR, $lockfile contains:
 `cat $lockfile 2>/dev/null`
 
@@ -1050,53 +2266,2835 @@ 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."
 
-	$run $rm $removelist
+	$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
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
       fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
     fi
 
-    $run $mv "${libobj}T" "${libobj}"
+    $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
-      $run $rm "$lockfile"
-    fi
+      # 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+\"\$@\"}
+"
     ;;
 
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
+  *)
+    $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*)
+    *-*-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
@@ -1114,10 +5112,10 @@ EOF
       allow_undefined=yes
       ;;
     esac
-    libtool_args="$nonopt"
+    libtool_args=$nonopt
     base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
+    compile_command=$nonopt
+    finalize_command=$nonopt
 
     compile_rpath=
     finalize_rpath=
@@ -1132,8 +5130,10 @@ EOF
     dllsearchpath=
     lib_search_path=`pwd`
     inst_prefix_dir=
+    new_inherited_linker_flags=
 
     avoid_version=no
+    bindir=
     dlfiles=
     dlprefiles=
     dlself=no
@@ -1147,7 +5147,6 @@ EOF
     no_install=no
     objs=
     non_pic_objects=
-    notinst_path= # paths that contain not-installed libtool libraries
     precious_files_regex=
     prefer_static_libs=no
     preload=no
@@ -1161,18 +5160,25 @@ EOF
     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
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+	    func_warning "complete static linking is impossible in this configuration"
 	  fi
 	  if test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
@@ -1206,29 +5212,30 @@ EOF
     while test "$#" -gt 0; do
       arg="$1"
       shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
+      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)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @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.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
 	    preload=yes
 	  fi
 	  case $arg in
@@ -1255,9 +5262,9 @@ EOF
 	    ;;
 	  *)
 	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
+	      func_append dlfiles " $arg"
 	    else
-	      dlprefiles="$dlprefiles $arg"
+	      func_append dlprefiles " $arg"
 	    fi
 	    prev=
 	    continue
@@ -1266,10 +5273,8 @@ EOF
 	  ;;
 	expsyms)
 	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file \`$arg' does not exist"
 	  prev=
 	  continue
 	  ;;
@@ -1278,11 +5283,120 @@ EOF
 	  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=
@@ -1293,174 +5407,59 @@ EOF
 	  prev=
 	  continue
 	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		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
-		      dlfiles="$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.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$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
-		  non_pic_objects="$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"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
 	rpath | xrpath)
 	  # We need an absolute path.
 	  case $arg in
 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
 	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_error "only absolute run-paths are allowed"
 	    ;;
 	  esac
 	  if test "$prev" = rpath; then
 	    case "$rpath " in
 	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
+	    *) func_append rpath " $arg" ;;
 	    esac
 	  else
 	    case "$xrpath " in
 	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
+	    *) func_append xrpath " $arg" ;;
 	    esac
 	  fi
 	  prev=
 	  continue
 	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
+	shrext)
+	  shrext_cmds="$arg"
 	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
 	  continue
 	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
+	weak)
+	  func_append weak_libs " $arg"
 	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
 	  continue
 	  ;;
 	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
+	xcompiler)
+	  func_append compiler_flags " $qarg"
 	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
-	darwin_framework|darwin_framework_skip)
-	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
+	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
 	  ;;
 	*)
@@ -1476,16 +5475,16 @@ EOF
       case $arg in
       -all-static)
 	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
+	  # 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.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
 	;;
 
       -avoid-version)
@@ -1493,6 +5492,11 @@ EOF
 	continue
 	;;
 
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
       -dlopen)
 	prev=dlfiles
 	continue
@@ -1510,8 +5514,7 @@ EOF
 
       -export-symbols | -export-symbols-regex)
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
 	fi
 	if test "X$arg" = "X-export-symbols"; then
 	  prev=expsyms
@@ -1521,15 +5524,8 @@ EOF
 	continue
 	;;
 
-      -framework|-arch|-isysroot)
-	case " $CC " in
-	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
-		prev=darwin_framework_skip ;;
-	  *) compiler_flags="$compiler_flags $arg"
-	     prev=darwin_framework ;;
-	esac
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
+      -framework)
+	prev=framework
 	continue
 	;;
 
@@ -1543,45 +5539,59 @@ EOF
       -L[A-Z][A-Z]*:*)
 	case $with_gcc/$host in
 	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
 	  ;;
 	esac
 	continue
 	;;
 
       -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-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`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    absdir="$dir"
-	    notinst_path="$notinst_path $dir"
-	  fi
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
 	  dir="$absdir"
 	  ;;
 	esac
 	case "$deplibs " in
-	*" -L$dir "*) ;;
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
 	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
+	  # 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*)
-	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  ::) dllsearchpath=$dir;;
+	  *) func_append dllsearchpath ":$dir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -1591,7 +5601,7 @@ EOF
       -l*)
 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
@@ -1605,7 +5615,7 @@ EOF
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
+	    func_append deplibs " System.ltframework"
 	    continue
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
@@ -1625,24 +5635,7 @@ EOF
 	   ;;
 	 esac
 	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      -model)
-	compile_command="$compile_command $arg"
-	compiler_flags="$compiler_flags $arg"
-	finalize_command="$finalize_command $arg"
-	prev=xcompiler
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
+	func_append deplibs " $arg"
 	continue
 	;;
 
@@ -1651,36 +5644,31 @@ EOF
 	continue
 	;;
 
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m* pass through architecture-specific compiler args for GCC
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-      # -F/path gives path to uninstalled frameworks, gcc on darwin
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+      # 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
+	;;
 
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
+      -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
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
+	continue
+	;;
 
-      -shrext)
-	prev=shrext
+      -multi_module)
+	single_module="${wl}-multi_module"
 	continue
 	;;
 
@@ -1691,11 +5679,11 @@ EOF
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+	*-*-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.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+	  func_warning "\`-no-install' is ignored for $host"
+	  func_warning "assuming \`-no-fast-install' instead"
 	  fast_install=no
 	  ;;
 	*) no_install=yes ;;
@@ -1736,22 +5724,36 @@ EOF
 	;;
 
       -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-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
+	  ;;
 	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
+	  func_fatal_error "only absolute run-paths are allowed"
 	  ;;
 	esac
 	case "$xrpath " in
 	*" $dir "*) ;;
-	*) xrpath="$xrpath $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
@@ -1770,47 +5772,49 @@ EOF
 	prev=vinfo
 	continue
 	;;
+
       -version-number)
 	prev=vinfo
 	vinfo_number=yes
 	continue
 	;;
 
+      -weak)
+        prev=weak
+	continue
+	;;
+
       -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
 	arg=
 	save_ifs="$IFS"; IFS=','
 	for flag in $args; do
 	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
+          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"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
 	;;
 
       -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
 	arg=
 	save_ifs="$IFS"; IFS=','
 	for flag in $args; do
 	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
+          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"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
 	;;
 
       -Xcompiler)
@@ -1828,53 +5832,68 @@ EOF
 	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.
       -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
 	;;
 
       *.$objext)
 	# A standard object.
-	objs="$objs $arg"
+	func_append objs " $arg"
 	;;
 
       *.lo)
 	# A libtool-controlled object.
 
 	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	if func_lalib_unsafe_p "$arg"; then
 	  pic_object=
 	  non_pic_object=
 
 	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
+	  func_source "$arg"
 
-	  if test -z "$pic_object" || \
+	  if test -z "$pic_object" ||
 	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
+	     test "$pic_object" = none &&
 	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_error "cannot find name of object for \`$arg'"
 	  fi
 
 	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
+	  func_dirname "$arg" "/" ""
+	  xdir="$func_dirname_result"
 
 	  if test "$pic_object" != none; then
 	    # Prepend the subdirectory the object is found in.
@@ -1882,7 +5901,7 @@ EOF
 
 	    if test "$prev" = dlfiles; then
 	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
+		func_append dlfiles " $pic_object"
 		prev=
 		continue
 	      else
@@ -1894,12 +5913,12 @@ EOF
 	    # CHECK ME:  I think I busted this.  -Ossama
 	    if test "$prev" = dlprefiles; then
 	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
+	      func_append dlprefiles " $pic_object"
 	      prev=
 	    fi
 
 	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
+	    func_append libobjs " $pic_object"
 	    arg="$pic_object"
 	  fi
 
@@ -1909,7 +5928,7 @@ EOF
 	    non_pic_object="$xdir$non_pic_object"
 
 	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $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
@@ -1917,52 +5936,47 @@ EOF
 	    # If the PIC object exists, use it instead.
 	    # $xdir was prepended to $pic_object above.
 	    non_pic_object="$pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
+	    func_append non_pic_objects " $non_pic_object"
 	  fi
 	else
 	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
+	  if $opt_dry_run; then
 	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
+	    func_dirname "$arg" "/" ""
+	    xdir="$func_dirname_result"
 
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
+	    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.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
+	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.
-	  dlfiles="$dlfiles $arg"
+	  func_append dlfiles " $func_resolve_sysroot_result"
 	  prev=
 	elif test "$prev" = dlprefiles; then
 	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
+	  func_append dlprefiles " $func_resolve_sysroot_result"
 	  prev=
 	else
-	  deplibs="$deplibs $arg"
+	  func_append deplibs " $func_resolve_sysroot_result"
 	fi
 	continue
 	;;
@@ -1971,70 +5985,53 @@ EOF
       *)
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
+	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
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
       fi
     done # argument parsing loop
 
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
+    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\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
     fi
 
     oldlibs=
     # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+    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 \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+      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\"
 
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
+    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.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $exit_status
-      fi
-    fi
+    func_mkdir_p "$output_objdir"
 
     # Determine the type of output
     case $output in
     "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
+      func_fatal_help "you must specify an output file"
       ;;
     *.$libext) linkmode=oldlib ;;
     *.lo | *.$objext) linkmode=obj ;;
@@ -2042,27 +6039,18 @@ EOF
     *) linkmode=prog ;; # Anything else should be a program.
     esac
 
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    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 test "X$duplicate_deps" = "Xyes" ; then
+      if $opt_preserve_dup_deps ; then
 	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	esac
       fi
-      libs="$libs $deplib"
+      func_append libs " $deplib"
     done
 
     if test "$linkmode" = lib; then
@@ -2072,12 +6060,12 @@ EOF
       # $postdeps and mark them as special (i.e., whose duplicates are
       # not to be eliminated).
       pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+      if $opt_duplicate_compiler_generated_deps; then
 	for pre_post_dep in $predeps $postdeps; do
 	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
 	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	  func_append pre_post_deps " $pre_post_dep"
 	done
       fi
       pre_post_deps=
@@ -2088,15 +6076,16 @@ EOF
     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 link"
+	passes="conv dlpreopen link"
 	for file in $dlfiles $dlprefiles; do
 	  case $file in
 	  *.la) ;;
 	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
 	    ;;
 	  esac
 	done
@@ -2112,7 +6101,20 @@ EOF
     *)  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"
@@ -2125,31 +6127,68 @@ EOF
 	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)
+	-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
-	    compiler_flags="$compiler_flags $deplib"
+	    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
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+	    func_warning "\`-l' is ignored for archives/objects"
 	    continue
 	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	  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}"
@@ -2179,21 +6218,17 @@ EOF
 	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 	      case " $predeps $postdeps " in
 	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		if func_lalib_p "$lib"; then
 		  library_names=
 		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
+		  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
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
+		    func_dirname "$lib" "" "."
+		    ladir="$func_dirname_result"
 		    lib=$ladir/$old_library
 		    if test "$linkmode,$pass" = "prog,link"; then
 		      compile_deplibs="$deplib $compile_deplibs"
@@ -2205,19 +6240,36 @@ EOF
 		    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"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    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
@@ -2230,27 +6282,34 @@ EOF
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+	    func_warning "\`-L' is ignored for archives/objects"
 	    ;;
 	  esac # linkmode
 	  continue
 	  ;; # -L
 	-R*)
 	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+	    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 "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
+	    *) func_append xrpath " $dir" ;;
 	    esac
 	  fi
 	  deplibs="$deplib $deplibs"
 	  continue
 	  ;;
-	*.la) lib="$deplib" ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
 	*.$libext)
 	  if test "$pass" = conv; then
 	    deplibs="$deplib $deplibs"
@@ -2258,35 +6317,41 @@ EOF
 	  fi
 	  case $linkmode in
 	  lib)
-	    valid_a_lib=no
-	    case $deplibs_check_method in
-	      match_pattern*)
-		set dummy $deplibs_check_method
-	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-		if eval $echo \"$deplib\" 2>/dev/null \
-		    | $SED 10q \
+	    # 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
-		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 used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
+	      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)
@@ -2307,11 +6372,11 @@ EOF
 	    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.
-	      newdlprefiles="$newdlprefiles $deplib"
+	      func_append newdlprefiles " $deplib"
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    else
-	      newdlfiles="$newdlfiles $deplib"
+	      func_append newdlfiles " $deplib"
 	    fi
 	  fi
 	  continue
@@ -2321,21 +6386,18 @@ EOF
 	  continue
 	  ;;
 	esac # case $deplib
+
 	if test "$found" = yes || test -f "$lib"; then :
 	else
-	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
-	  exit $EXIT_FAILURE
+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
 	fi
 
 	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
 
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
+	func_dirname "$lib" "" "."
+	ladir="$func_dirname_result"
 
 	dlname=
 	dlopen=
@@ -2343,6 +6405,7 @@ EOF
 	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
@@ -2351,16 +6414,24 @@ EOF
 
 
 	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
+	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" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 	fi
 
 	if test "$pass" = conv; then
@@ -2368,45 +6439,47 @@ EOF
 	  deplibs="$lib $deplibs"
 	  if test -z "$libdir"; then
 	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
+	      func_fatal_error "cannot find name of link library for \`$lib'"
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
+	    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=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
+	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
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
+	  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
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
 	  fi
 	  if test -z "$dlname" ||
 	     test "$dlopen_support" != yes ||
@@ -2415,9 +6488,9 @@ EOF
 	    # 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.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	    func_append dlprefiles " $lib $dependency_libs"
 	  else
-	    newdlfiles="$newdlfiles $lib"
+	    func_append newdlfiles " $lib"
 	  fi
 	  continue
 	fi # $pass = dlopen
@@ -2428,24 +6501,25 @@ EOF
 	*)
 	  abs_ladir=`cd "$ladir" && pwd`
 	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+	    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
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	func_basename "$lib"
+	laname="$func_basename_result"
 
 	# Find the relevant object directory and library name.
 	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
+	  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="$libdir"
-	    absdir="$libdir"
+	    dir="$lt_sysroot$libdir"
+	    absdir="$lt_sysroot$libdir"
 	  fi
 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 	else
@@ -2453,32 +6527,62 @@ EOF
 	    dir="$ladir"
 	    absdir="$abs_ladir"
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  else
 	    dir="$ladir/$objdir"
 	    absdir="$abs_ladir/$objdir"
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  fi
 	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
 
 	# This library was specified with -dlpreopen.
 	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	  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
@@ -2496,7 +6600,7 @@ EOF
 
 
 	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
+	  func_append newlib_search_path " $ladir"
 	  deplibs="$lib $deplibs"
 
 	  linkalldeplibs=no
@@ -2508,7 +6612,10 @@ EOF
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+	    -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
@@ -2518,12 +6625,12 @@ EOF
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
+	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $deplib"
 	  done # for deplib
 	  continue
 	fi # $linkmode = prog...
@@ -2531,15 +6638,14 @@ EOF
 	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 "$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
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $absdir" ;;
+	      case "$temp_rpath:" in
+	      *"$absdir:"*) ;;
+	      *) func_append temp_rpath "$absdir:" ;;
 	      esac
 	    fi
 
@@ -2551,7 +6657,7 @@ EOF
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -2560,7 +6666,7 @@ EOF
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -2577,27 +6683,43 @@ EOF
 
 	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
+	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
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
+	  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)
-	  if 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"
+	  # 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
-	    $echo "*** $linklib is not portable!"
+	  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
@@ -2609,7 +6731,7 @@ EOF
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -2618,7 +6740,7 @@ EOF
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -2627,17 +6749,19 @@ EOF
 	  if test -n "$old_archive_from_expsyms_cmds"; then
 	    # figure out the soname
 	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
+	    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*)
-		major=`expr $current - $age`
+	      *cygwin* | mingw* | *cegcc*)
+	        func_arith $current - $age
+		major=$func_arith_result
 		versuffix="-$major"
 		;;
 	      esac
@@ -2648,43 +6772,29 @@ EOF
 
 	    # Make a new name for the extract_expsyms_cmds to use
 	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+	    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
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
+	      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
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
+	      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 "$mode" != relink; then
+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -2699,17 +6809,21 @@ EOF
 		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
 		    *-*-unixware7*) add_dir="-L$dir" ;;
 		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
+		    # 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 |
-                      $EGREP ": [^:]* bundle" >/dev/null ; 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"
+			 $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
@@ -2727,15 +6841,16 @@ EOF
 	      fi
 	      ;;
 	    relink)
-	      if test "$hardcode_direct" = yes; then
+	      if test "$hardcode_direct" = yes &&
+	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		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
 		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
 		      ;;
 		  esac
 		fi
@@ -2751,14 +6866,13 @@ EOF
 	    esac
 
 	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
+	      func_fatal_configuration "unsupported hardcode properties"
 	    fi
 
 	    if test -n "$add_shlibpath"; then
 	      case :$compile_shlibpath: in
 	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
 	      esac
 	    fi
 	    if test "$linkmode" = prog; then
@@ -2767,23 +6881,24 @@ EOF
 	    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 && \
+	      if test "$hardcode_direct" != yes &&
+		 test "$hardcode_minus_L" != yes &&
 		 test "$hardcode_shlibpath_var" = yes; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
 		esac
 	      fi
 	    fi
 	  fi
 
-	  if test "$linkmode" = prog || test "$mode" = relink; then
+	  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; then
+	    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"
@@ -2791,15 +6906,15 @@ EOF
 	    elif test "$hardcode_shlibpath_var" = yes; then
 	      case :$finalize_shlibpath: in
 	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$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"
+		add="$inst_prefix_dir$libdir/$linklib"
 	      else
-	        add="$libdir/$linklib"
+		add="$libdir/$linklib"
 	      fi
 	    else
 	      # We cannot seem to hardcode it, guess we'll fake it.
@@ -2808,7 +6923,7 @@ EOF
 	      if test -n "$inst_prefix_dir"; then
 		case $libdir in
 		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
 		    ;;
 		esac
 	      fi
@@ -2843,21 +6958,21 @@ EOF
 
 	    # 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."
+	    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."
+	      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."
+		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
@@ -2881,120 +6996,113 @@ EOF
 	    temp_deplibs=
 	    for libdir in $dependency_libs; do
 	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
 		   case " $xrpath " in
 		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
+		   *) func_append xrpath " $temp_xrpath";;
 		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      *) func_append temp_deplibs " $libdir";;
 	      esac
 	    done
 	    dependency_libs="$temp_deplibs"
 	  fi
 
-	  newlib_search_path="$newlib_search_path $absdir"
+	  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"
-	    if test "X$duplicate_deps" = "Xyes" ; then
+	    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
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    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)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
+	        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
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+		    func_warning "cannot determine absolute directory name of \`$dir'"
 		    absdir="$dir"
 		  fi
 		  ;;
 		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
-		  fi
-		  #if test "$absdir" != "$libdir"; then
-		  #  $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  #fi
-		  path="$absdir"
-		fi
-		depdepl=
+		if $GREP "^installed=no" $deplib > /dev/null; then
 		case $host in
 		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
+		  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 "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
+		    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
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
 		  fi
-		  path=""
 		  ;;
 		*)
-		  path="-L$path"
+		  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
 		;;
-	      -l*)
-		case $host in
-		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
-		  ;;
-		*) continue ;;
-		esac
-		;;
-	      *) continue ;;
 	      esac
 	      case " $deplibs " in
 	      *" $path "*) ;;
 	      *) deplibs="$path $deplibs" ;;
 	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $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
@@ -3009,7 +7117,7 @@ EOF
 	  for dir in $newlib_search_path; do
 	    case "$lib_search_path " in
 	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
+	    *) func_append lib_search_path " $dir" ;;
 	    esac
 	  done
 	  newlib_search_path=
@@ -3067,10 +7175,10 @@ EOF
 	    -L*)
 	      case " $tmp_libs " in
 	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      *) func_append tmp_libs " $deplib" ;;
 	      esac
 	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    *) func_append tmp_libs " $deplib" ;;
 	    esac
 	  done
 	  eval $var=\"$tmp_libs\"
@@ -3086,98 +7194,96 @@ EOF
 	  ;;
 	esac
 	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
+	  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 "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+	func_warning "\`-dlopen' is ignored for archives"
       fi
 
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+      esac
 
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for archives"
 
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for archives"
 
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
+      test -n "$vinfo" && \
+	func_warning "\`-version-info/-version-number' is ignored for archives"
 
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
+      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"
-      objs="$objs$old_deplibs"
+      func_append objs "$old_deplibs"
       ;;
 
     lib)
       # Make sure we only generate libraries of the form `libNAME.la'.
       case $outputname in
       lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
 	eval shared_ext=\"$shrext_cmds\"
 	eval libname=\"$libname_spec\"
 	;;
       *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
+	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
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
 	  eval shared_ext=\"$shrext_cmds\"
 	  eval libname=\"$libname_spec\"
 	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
 	fi
 	;;
       esac
 
       if test -n "$objs"; then
 	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
+	  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!"
-	  libobjs="$libobjs $objs"
+	  echo
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  func_append libobjs " $objs"
 	fi
       fi
 
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
+      test "$dlself" != no && \
+	func_warning "\`-dlopen self' is ignored for libtool libraries"
 
       set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
+      shift
+      test "$#" -gt 1 && \
+	func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+      install_libdir="$1"
 
       oldlibs=
       if test -z "$rpath"; then
@@ -3191,25 +7297,21 @@ EOF
 	  build_old_libs=yes
 	fi
 
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
+	test -n "$vinfo" && \
+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
 
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
+	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"
 
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
+	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
@@ -3217,9 +7319,9 @@ EOF
 
 	case $vinfo_number in
 	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
+	  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
@@ -3228,18 +7330,21 @@ EOF
 	  # 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)
-	    current=`expr $number_major + $number_minor`
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
 	    age="$number_minor"
 	    revision="$number_revision"
 	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
+	  freebsd-aout|freebsd-elf|qnx|sunos)
 	    current="$number_major"
 	    revision="$number_minor"
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor`
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
 	    age="$number_minor"
 	    revision="$number_minor"
 	    lt_irix_increment=no
@@ -3247,9 +7352,9 @@ EOF
 	  esac
 	  ;;
 	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
+	  current="$1"
+	  revision="$2"
+	  age="$3"
 	  ;;
 	esac
 
@@ -3257,34 +7362,30 @@ EOF
 	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]) ;;
 	*)
-	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  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]) ;;
 	*)
-	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  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]) ;;
 	*)
-	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  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
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
+	  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.
@@ -3297,10 +7398,12 @@ EOF
 	darwin)
 	  # Like Linux, but with the current version available in
 	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
+	  func_arith $current - $age
+	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
+	  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"
 	  ;;
@@ -3312,15 +7415,17 @@ EOF
 
 	freebsd-elf)
 	  major=".$current"
-	  versuffix=".$current";
+	  versuffix=".$current"
 	  ;;
 
 	irix | nonstopux)
 	  if test "X$lt_irix_increment" = "Xno"; then
-	    major=`expr $current - $age`
+	    func_arith $current - $age
 	  else
-	    major=`expr $current - $age + 1`
+	    func_arith $current - $age + 1
 	  fi
+	  major=$func_arith_result
+
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
@@ -3330,8 +7435,10 @@ EOF
 	  # Add in all the interfaces that we are compatible with.
 	  loop=$revision
 	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
 	    verstring="$verstring_prefix$major.$iface:$verstring"
 	  done
 
@@ -3340,26 +7447,35 @@ EOF
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
-	  major=.`expr $current - $age`
+	linux) # correct to gnu/linux during the next big refactor
+	  func_arith $current - $age
+	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
 	  ;;
 
 	osf)
-	  major=.`expr $current - $age`
+	  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
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
+	    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.
-	  verstring="$verstring:${current}.0"
+	  func_append verstring ":${current}.0"
+	  ;;
+
+	qnx)
+	  major=".$current"
+	  versuffix=".$current"
 	  ;;
 
 	sunos)
@@ -3370,14 +7486,13 @@ EOF
 	windows)
 	  # Use '-' rather than '.', since we only want one
 	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
+	  func_arith $current - $age
+	  major=$func_arith_result
 	  versuffix="-$major"
 	  ;;
 
 	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit $EXIT_FAILURE
+	  func_fatal_configuration "unknown library version type \`$version_type'"
 	  ;;
 	esac
 
@@ -3411,7 +7526,7 @@ EOF
 	# Check to see if the archive will have undefined symbols.
 	if test "$allow_undefined" = yes; then
 	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+	    func_warning "undefined symbols not allowed in $host shared libraries"
 	    build_libtool_libs=no
 	    build_old_libs=yes
 	  fi
@@ -3419,58 +7534,62 @@ EOF
 	  # Don't allow undefined symbols.
 	  allow_undefined_flag="$no_undefined_flag"
 	fi
+
       fi
 
-      if test "$mode" != relink; then
+      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/*"`
+	tempremovelist=`$ECHO "$output_objdir/*"`
 	for p in $tempremovelist; do
 	  case $p in
-	    *.$objext)
+	    *.$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
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
 		   continue
 		 fi
 	       fi
-	       removelist="$removelist $p"
+	       func_append removelist " $p"
 	       ;;
 	    *) ;;
 	  esac
 	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
+	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
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+	func_append oldlibs " $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+	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} -e "s% $path % %g"`
-      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #	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
-	  temp_xrpath="$temp_xrpath -R$libdir"
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
 	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -3484,7 +7603,7 @@ EOF
       for lib in $old_dlfiles; do
 	case " $dlprefiles $dlfiles " in
 	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
+	*) func_append dlfiles " $lib" ;;
 	esac
       done
 
@@ -3494,19 +7613,19 @@ EOF
       for lib in $old_dlprefiles; do
 	case "$dlprefiles " in
 	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $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*)
+	  *-*-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
-	    deplibs="$deplibs -framework System"
+	    func_append deplibs " System.ltframework"
 	    ;;
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
@@ -3520,10 +7639,10 @@ EOF
 	  *-*-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
-	      deplibs="$deplibs -lc"
+	      func_append deplibs " -lc"
 	    fi
 	    ;;
 	  esac
@@ -3557,120 +7676,139 @@ EOF
 	  # 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.
-	  $rm conftest.c
+	  $opt_dry_run || $RM conftest.c
 	  cat > conftest.c <<EOF
 	  int main() { return 0; }
 EOF
-	  $rm conftest
+	  $opt_dry_run || $RM conftest
 	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
+	      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 "*)
-		    newdeplibs="$newdeplibs $i"
+		    func_append newdeplibs " $i"
 		    i=""
 		    ;;
 		  esac
-	        fi
+		fi
 		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
+		  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
-		    newdeplibs="$newdeplibs $i"
+		    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."
+		    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
-	      else
-		newdeplibs="$newdeplibs $i"
-	      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
-	      name=`expr $i : '-l\(.*\)'`
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
+	      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 "*)
-		      newdeplibs="$newdeplibs $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
-		    deplib_match=$2
+		    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
-		      newdeplibs="$newdeplibs $i"
+		      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."
+		      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."
+		  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
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
 	    done
 	  fi
 	  ;;
 	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
+	    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 "*)
-		  newdeplibs="$newdeplibs $a_deplib"
+		  func_append newdeplibs " $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
 	      fi
 	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
+		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
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  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
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
 			continue
 		      fi
 		      # The statement above tries to avoid entering an
@@ -3683,13 +7821,13 @@ EOF
 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
 			case $potliblink in
 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
 			esac
 		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
+		      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
@@ -3698,50 +7836,52 @@ EOF
 	      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"
+		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)"
+		  $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"
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
 		fi
 	      fi
-	    else
+	      ;;
+	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
 	  done # Gone through all deplibs.
 	  ;;
 	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 	  for a_deplib in $deplibs; do
-	    name=`expr $a_deplib : '-l\(.*\)'`
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
+	    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 "*)
-		  newdeplibs="$newdeplibs $a_deplib"
+		  func_append newdeplibs " $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
 	      fi
 	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
+		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
-		      newdeplibs="$newdeplibs $a_deplib"
+		    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
@@ -3750,46 +7890,48 @@ EOF
 	      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"
+		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)"
+		  $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"
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
 		fi
 	      fi
-	    else
+	      ;;
+	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
 	  done # Gone through all deplibs.
 	  ;;
 	none | unknown | *)
 	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
+	  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 "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
 	    done
 	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
 	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
 	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
 	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
+	    echo "*** All declared inter-library dependencies are being dropped."
 	    droppeddeps=yes
-	  fi
+	    ;;
+	  esac
 	  ;;
 	esac
 	versuffix=$versuffix_save
@@ -3800,24 +7942,24 @@ EOF
 
 	case $host in
 	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	  # 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."
+	    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."
+	      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"
@@ -3827,16 +7969,16 @@ EOF
 	      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."
+	    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."
+	      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
@@ -3850,7 +7992,14 @@ EOF
 	# 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
@@ -3861,7 +8010,7 @@ EOF
 	*)
 	  case " $deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -3871,15 +8020,14 @@ EOF
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       deplibs="$new_libs"
 
-
       # All the library-specific variables (install_libdir is set above).
       library_names=
       old_library=
@@ -3887,15 +8035,22 @@ EOF
 
       # 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 "$mode" != relink && rpath="$compile_rpath$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
@@ -3904,18 +8059,18 @@ EOF
 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		    ;;
 		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		    ;;
 		  esac
 		fi
 	      else
 		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
+		func_append dep_rpath " $flag"
 	      fi
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -3923,20 +8078,13 @@ EOF
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      case $archive_cmds in
-	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
-	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
-	      esac
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    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
-	      rpath="$rpath$dir:"
+	      func_append rpath "$dir:"
 	    done
 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 	  fi
@@ -3944,7 +8092,7 @@ EOF
 	fi
 
 	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -3953,8 +8101,9 @@ EOF
 	eval shared_ext=\"$shrext_cmds\"
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
-	realname="$2"
-	shift; shift
+	shift
+	realname="$1"
+	shift
 
 	if test -n "$soname_spec"; then
 	  eval soname=\"$soname_spec\"
@@ -3969,83 +8118,166 @@ EOF
 	linknames=
 	for link
 	do
-	  linknames="$linknames $link"
+	  func_append linknames " $link"
 	done
 
 	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	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
-	    $show "generating symbol list for \`$libname.la'"
+	    func_verbose "generating symbol list for \`$libname.la'"
 	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
+	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
 	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
+	    for cmd1 in $cmds; do
 	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
+	      # 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.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
+		# 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"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
+	    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
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+	  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 "*) ;;
-		*)
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
+	  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"
-	    generated="$generated $gentop"
+	    func_append generated " $gentop"
 
 	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
+	    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\"
-	  linker_flags="$linker_flags $flag"
+	  func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+	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.
@@ -4058,22 +8290,24 @@ EOF
 	    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
+	  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:" &&
-	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	   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.
-	  $echo "creating reloadable object files..."
+	  # 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
@@ -4087,77 +8321,171 @@ EOF
 	    save_libobjs=$libobjs
 	  fi
 	  save_output=$output
-	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
+	  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=
-	  delfiles=
 	  last_robj=
 	  k=1
-	  output=$output_objdir/$output_la-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$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.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$output_la-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$output_la-${k}.$objext
-	      objlist=$obj
-	      len=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
-	  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~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+	    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
 
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
+	      # 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"
 
-	  # Set up a command to remove the reloadable object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
-	  done
+	    else
+	      output=
+	    fi
 
-	  $echo "creating a temporary reloadable object file: $output"
+	    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
 
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
+	    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"
-	    $show "$cmd"
-	    $run eval "$cmd" || 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.
@@ -4165,6 +8493,7 @@ EOF
 
 	  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.
@@ -4177,28 +8506,45 @@ EOF
 	      cmds=$module_cmds
 	    fi
 	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
 	    fi
 	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
 	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\"
-	  $show "$cmd"
-	  $run eval "$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 "$mode" = relink; then
-	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	    if test "$opt_mode" = relink; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
 	    fi
 
 	    exit $lt_exit
@@ -4207,13 +8553,12 @@ EOF
 	IFS="$save_ifs"
 
 	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || 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
-	      $show "${rm}r $gentop"
-	      $run ${rm}r "$gentop"
+	      func_show_eval '${RM}r "$gentop"'
 	    fi
 	  fi
 
@@ -4223,8 +8568,7 @@ EOF
 	# Create links to the real library.
 	for linkname in $linknames; do
 	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
 	  fi
 	done
 
@@ -4237,38 +8581,35 @@ EOF
       ;;
 
     obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+	func_warning "\`-dlopen' is ignored for objects"
       fi
 
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+      esac
 
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for objects"
 
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for objects"
 
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
+      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)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+	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=
@@ -4277,7 +8618,7 @@ EOF
       esac
 
       # Delete the old objects.
-      $run $rm $obj $libobj
+      $opt_dry_run || $RM $obj $libobj
 
       # Objects from convenience libraries.  This assumes
       # single-version convenience libraries.  Whenever we create
@@ -4293,35 +8634,29 @@ EOF
       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 "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
+	  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 "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+      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"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
+      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
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
+	  func_show_eval '${RM}r "$gentop"'
 	fi
 
 	exit $EXIT_SUCCESS
@@ -4329,14 +8664,13 @@ EOF
 
       if test "$build_libtool_libs" != yes; then
 	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
+	  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"
-	# $run eval "echo timestamp > $libobj" || exit $?
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
 	exit $EXIT_SUCCESS
       fi
 
@@ -4344,20 +8678,11 @@ EOF
 	# Only do commands if we really have different PIC objects.
 	reload_objs="$libobjs $reload_conv_objs"
 	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
+	func_execute_cmds "$reload_cmds" 'exit $?'
       fi
 
       if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
+	func_show_eval '${RM}r "$gentop"'
       fi
 
       exit $EXIT_SUCCESS
@@ -4365,39 +8690,45 @@ EOF
 
     prog)
       case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
       esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for programs"
 
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for programs"
 
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
+      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 "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	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
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
+      *-*-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
 
 
@@ -4410,7 +8741,7 @@ EOF
 	*)
 	  case " $compile_deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -4420,17 +8751,17 @@ EOF
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       compile_deplibs="$new_libs"
 
 
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
+      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.
@@ -4438,7 +8769,7 @@ EOF
 	  # This is the magic to use -rpath.
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
       fi
@@ -4457,30 +8788,32 @@ EOF
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  *) func_append perm_rpath " $libdir" ;;
 	  esac
 	fi
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  ::) dllsearchpath=$libdir;;
+	  *) func_append dllsearchpath ":$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -4506,18 +8839,18 @@ EOF
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$finalize_perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
 	  esac
 	fi
       done
@@ -4531,281 +8864,57 @@ EOF
 
       if test -n "$libobjs" && test "$build_old_libs" = yes; then
 	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
       fi
 
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
       fi
 
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$outputname.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    else
-	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-              case $host in
-              *cygwin* | *mingw* )
-	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-                ;;
-              esac
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # 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/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-"
-
-	    case $host in
-	    *cygwin* | *mingw* )
-	  $echo >> "$output_objdir/$dlsyms" "\
-/* DATA imports from DLLs on WIN32 can't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs */
-struct {
-"
-	      ;;
-	    * )
-	  $echo >> "$output_objdir/$dlsyms" "\
-const struct {
-"
-	      ;;
-	    esac
-
-
-	  $echo >> "$output_objdir/$dlsyms" "\
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  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*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-          case $host in
-          *cygwin* | *mingw* )
-            if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            else
-              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-             fi
-            ;;
-          * )
-            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
-            ;;
-          esac
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	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 "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+      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 "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+	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.
-	$show "$link_command"
-	$run eval "$link_command"
-	exit_status=$?
+	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 -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
+	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 "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
       if test -n "$compile_shlibpath$finalize_shlibpath"; then
 	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
       fi
@@ -4820,7 +8929,7 @@ static const void *lt_preloaded_setup() {
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -4828,7 +8937,7 @@ static const void *lt_preloaded_setup() {
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -4838,12 +8947,18 @@ static const void *lt_preloaded_setup() {
 	# 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 "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
-	$run $rm $output
+	$opt_dry_run || $RM $output
 	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || 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
 
@@ -4852,13 +8967,13 @@ static const void *lt_preloaded_setup() {
 	link_command="$compile_var$compile_command$compile_rpath"
 	relink_command="$finalize_var$finalize_command$finalize_rpath"
 
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+	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 "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4870,608 +8985,98 @@ static const void *lt_preloaded_setup() {
       fi
 
       # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
       # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
+      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.
-      $show "creating $output"
+      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}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	    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
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	    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 "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
       fi
 
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
+      # 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) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+	  *.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
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
 	  *) exeext= ;;
 	esac
 	case $host in
 	  *cygwin* | *mingw* )
-            output_name=`basename $output`
-            output_path=`dirname $output`
-            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
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   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.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#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
-# 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 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-/* -DDEBUG is fairly common in CFLAGS.  */
-#undef DEBUG
-#if defined DEBUGWRAPPER
-# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
-#else
-# define DEBUG(format, ...)
-#endif
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-const char * base_name (const char *name);
-char * find_executable(const char *wrapper);
-int    check_executable(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  DEBUG("(main) argv[0]      : %s\n",argv[0]);
-  DEBUG("(main) program_name : %s\n",program_name);
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-            cat >> $cwrappersource <<EOF
-  newargz[0] = (char *) xstrdup("$SHELL");
-EOF
-
-            cat >> $cwrappersource <<"EOF"
-  newargz[1] = find_executable(argv[0]);
-  if (newargz[1] == NULL)
-    lt_fatal("Couldn't find %s", argv[0]);
-  DEBUG("(main) found exe at : %s\n",newargz[1]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-
-  for (i=0; i<argc+1; i++)
-  {
-    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
-    ;
-  }
-
-EOF
-
-            case $host_os in
-              mingw*)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",(char const **)newargz);
-EOF
-              ;;
-              *)
-                cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-              ;;
-            esac
-
-            cat >> $cwrappersource <<"EOF"
-  return 127;
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("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;
-
-  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0) &&
-      (
-        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
-#if defined (S_IXOTH)
-       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
-#endif
-#if defined (S_IXGRP)
-       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
-#endif
-       ((st.st_mode & S_IXUSR) == S_IXUSR))
-      )
-    return 1;
-  else
-    return 0;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise */
-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;
-
-  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-
-  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 ("getcwd failed");
-          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 ("getcwd failed");
-  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 *
-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;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-          # we should really use a build-platform specific compiler
-          # here, but OTOH, the wrappers (shell script and this C one)
-          # are only useful if you want to execute the "real" binary.
-          # Since the "real" binary is built for $host, then this
-          # wrapper might as well be built for $host, too.
-          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
-          ;;
-        esac
-        $rm $output
-        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# 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.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible (taken from Autoconf:_AS_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 variable:
-  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
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e '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 \"X\$file\" | \$Xsed -e '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 \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  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 >> $output "\
-
-    # 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 $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # 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 \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
+	    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
 
-	*)
-	  $echo >> $output "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
+	    func_emit_wrapper no > $output
+	    chmod +x $output
 	  ;;
 	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \$*\"
-      exit $EXIT_FAILURE
-    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 $EXIT_FAILURE
-  fi
-fi\
-"
-	chmod +x $output
-      fi
+      }
       exit $EXIT_SUCCESS
       ;;
     esac
@@ -5480,7 +9085,7 @@ fi\
     for oldlib in $oldlibs; do
 
       if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
+	oldobjs="$libobjs_save $symfileobj"
 	addlibs="$convenience"
 	build_libtool_libs=no
       else
@@ -5489,22 +9094,35 @@ fi\
 	  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"
-	generated="$generated $gentop"
+	func_append generated " $gentop"
 
 	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
+	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
+	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
@@ -5513,32 +9131,22 @@ fi\
 	# not supported by libtool).
 	if (for obj in $oldobjs
 	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+	      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..."
-
-	  if test -z "$gentop"; then
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    exit_status=$?
-	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
-	      exit $exit_status
-	    fi
-	  fi
-
+	  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
-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+	    func_basename "$obj"
+	    objbase="$func_basename_result"
 	    case " $oldobjs " in
 	    " ") oldobjs=$obj ;;
 	    *[\ /]"$objbase "*)
@@ -5546,58 +9154,74 @@ fi\
 		# Make sure we don't pick an alternate name that also
 		# overlaps.
 		newobj=lt$counter-$objbase
-		counter=`expr $counter + 1`
+		func_arith $counter + 1
+		counter=$func_arith_result
 		case " $oldobjs " in
 		*[\ /]"$newobj "*) ;;
 		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
 		esac
 	      done
-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      $run ln "$obj" "$gentop/$newobj" ||
-	      $run cp "$obj" "$gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
 	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
+	    *) 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\"
 
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	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
-	  $echo "using piecewise archive linking..."
+	  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
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
-	       test "$len" -le "$max_cmd_len"; then
+	    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
+		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
@@ -5609,49 +9233,39 @@ fi\
 	  fi
 	fi
       fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
+      func_execute_cmds "$cmds" 'exit $?'
     done
 
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
+    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"
-      $show "creating $output"
+      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}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	  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
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	  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 "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+      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.
-      if test -z "$run"; then
+      $opt_dry_run || {
 	for installed in no yes; do
 	  if test "$installed" = yes; then
 	    if test -z "$install_libdir"; then
@@ -5663,38 +9277,60 @@ fi\
 	    for deplib in $dependency_libs; do
 	      case $deplib in
 	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
+		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"
 		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      -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
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
+	      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
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
+	      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
@@ -5704,7 +9340,7 @@ fi\
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlfiles="$newdlfiles $abs"
+	      func_append newdlfiles " $abs"
 	    done
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
@@ -5713,19 +9349,37 @@ fi\
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlprefiles="$newdlprefiles $abs"
+	      func_append newdlprefiles " $abs"
 	    done
 	    dlprefiles="$newdlprefiles"
 	  fi
-	  $rm $output
+	  $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) tdlname=../bin/$dlname ;;
+	    *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 "\
+	  $ECHO > $output "\
 # $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -5739,9 +9393,15 @@ 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
@@ -5760,748 +9420,29 @@ 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 "\
+	    $ECHO >> $output "\
 relink_command=\"$relink_command\""
 	  fi
 	done
-      fi
+      }
 
       # Do a symbolic link so that the libtool archive can be found in
       # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
       ;;
     esac
     exit $EXIT_SUCCESS
-    ;;
+}
 
-  # libtool install mode
-  install)
-    modename="$modename: install"
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
+    func_mode_link ${1+"$@"}
 
-    # 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.
-       $echo "X$nonopt" | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
 
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) 
-      	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o) prev=$arg ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	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.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$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 "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.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
-	  else
-	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run 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
-	      if test "$linkname" != "$realname"; then
-                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || {
-	      lt_exit=$?
-
-	      # Restore the uninstalled library and exit
-	      if test "$mode" = relink; then
-		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
-	      fi
-
-	      exit $lt_exit
-	    }
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$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
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run 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
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  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
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo 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.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # Note that it is not necessary on cygwin/mingw to append a dot to
-	  # foo even if both foo 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.
-	  #
-	  # If there is no directory component, then add one.
-	  case $wrapper in
-	  */* | *\\*) . ${wrapper} ;;
-	  *) . ./${wrapper} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir=`func_mktempdir`
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "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)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    $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"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "X----------------------------------------------------------------------" | $Xsed
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	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
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; 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 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
-	      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
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $opt_debug
+    RM="$nonopt"
     files=
     rmforce=
     exit_status=0
@@ -6513,44 +9454,41 @@ relink_command=\"$relink_command\""
     for arg
     do
       case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
+      -f) func_append RM " $arg"; rmforce=yes ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
       esac
     done
 
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
 
     rmdirs=
 
-    origobjdir="$objdir"
     for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
+      func_dirname "$file" "" "."
+      dir="$func_dirname_result"
+      if test "X$dir" = X.; then
+	odir="$objdir"
       else
-	objdir="$dir/$origobjdir"
+	odir="$dir/$objdir"
       fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
+      func_basename "$file"
+      name="$func_basename_result"
+      test "$opt_mode" = uninstall && odir="$dir"
 
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test "$opt_mode" = clean; then
 	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
+	  *" $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
+      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
@@ -6564,55 +9502,32 @@ relink_command=\"$relink_command\""
       case $name in
       *.la)
 	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
+	    func_append rmfiles " $odir/$n"
 	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
-	  case "$mode" in
+	  case "$opt_mode" in
 	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
+	    case " $library_names " in
 	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
 	    esac
-	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    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.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
+	      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.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
 	    fi
 	    # FIXME: should reinstall the best remaining shared library.
 	    ;;
@@ -6622,288 +9537,95 @@ relink_command=\"$relink_command\""
 
       *.lo)
 	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	if func_lalib_p "$file"; then
 
 	  # Read the .lo file
-	  . $dir/$name
+	  func_source $dir/$name
 
 	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
+	  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
-	    rmfiles="$rmfiles $dir/$non_pic_object"
+	  if test -n "$non_pic_object" &&
+	     test "$non_pic_object" != none; then
+	    func_append rmfiles " $dir/$non_pic_object"
 	  fi
 	fi
 	;;
 
       *)
-	if test "$mode" = clean ; then
+	if test "$opt_mode" = clean ; then
 	  noexename=$name
 	  case $file in
 	  *.exe)
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.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
-	    rmfiles="$rmfiles $file"
+	    func_append rmfiles " $file"
 	    ;;
 	  esac
 	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
+	  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
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
 	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
+	      func_append rmfiles " $odir/lt-$name"
 	    fi
 	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	      func_append rmfiles " $odir/lt-${noexename}.c"
 	    fi
 	  fi
 	fi
 	;;
       esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
-    objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
       if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
       fi
     done
 
     exit $exit_status
-    ;;
+}
 
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
+    func_mode_uninstall ${1+"$@"}
 
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
+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
+  eval exec "$exec_cmd"
   exit $EXIT_FAILURE
 fi
 
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
+exit $exit_status
 
-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
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-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.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [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: $modename [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
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-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: $modename [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: $modename [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: $modename [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 rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [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
-  -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
-  -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]
-
-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: $modename [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."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $?
 
 # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting
@@ -6917,14 +9639,17 @@ exit $?
 # configuration.  But we'll never go from static-only to shared-only.
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-disable_libs=shared
+build_libtool_libs=no
+build_old_libs=yes
 # ### END LIBTOOL TAG CONFIG: disable-shared
 
 # ### BEGIN LIBTOOL TAG CONFIG: disable-static
-disable_libs=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/sqlite3/missing b/contrib/sqlite3/missing
index 894e786e16c1..86a8fc31e3c2 100755
--- a/contrib/sqlite3/missing
+++ b/contrib/sqlite3/missing
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2012-01-06.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
+# 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
@@ -18,9 +18,7 @@ scriptversion=2005-06-08.21
 # 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.
+# 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
@@ -33,6 +31,8 @@ if test $# -eq 0; then
 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.
@@ -44,7 +44,7 @@ fi
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,15 +77,18 @@ 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
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   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 $?
     ;;
@@ -103,23 +106,21 @@ Send bug reports to <bug-automake@gnu.org>."
 
 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).
-case "$1" in
-  lex|yacc)
+# 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.
     ;;
 
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -135,7 +136,7 @@ esac
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $program in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -145,7 +146,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch aclocal.m4
     ;;
 
-  autoconf)
+  autoconf*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
@@ -154,7 +155,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch configure
     ;;
 
-  autoheader)
+  autoheader*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
@@ -164,7 +165,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -184,7 +185,7 @@ WARNING: \`$1' is $msg.  You should only need it if
 	   while read f; do touch "$f"; done
     ;;
 
-  autom4te)
+  autom4te*)
     echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
          You might have modified some files without having the
@@ -192,8 +193,8 @@ WARNING: \`$1' is needed, but is $msg.
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -207,80 +208,78 @@ WARNING: \`$1' is needed, but is $msg.
     fi
     ;;
 
-  bison|yacc)
+  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 [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
+    if test $# -ne 1; then
+        eval LASTARG=\${$#}
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
 
-  lex|flex)
+  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 [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
+    if test $# -ne 1; then
+        eval LASTARG=\${$#}
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
 
-  help2man)
+  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 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    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 1
+	exit $?
     fi
     ;;
 
-  makeinfo)
+  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
@@ -289,11 +288,17 @@ WARNING: \`$1' is $msg.  You should only need it if
          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 's/.*-o \([^ ]*\).*/\1/p'`
+    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`
+      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
@@ -303,41 +308,6 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch $file
     ;;
 
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.
@@ -356,5 +326,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/contrib/sqlite3/shell.c b/contrib/sqlite3/shell.c
index 1be2871fed9a..1f8681f63950 100644
--- a/contrib/sqlite3/shell.c
+++ b/contrib/sqlite3/shell.c
@@ -45,15 +45,17 @@
 # include <sys/types.h>
 #endif
 
-#ifdef HAVE_EDITLINE
-# include <editline/editline.h>
-#endif
-#if defined(HAVE_READLINE) && HAVE_READLINE==1
+#if defined(HAVE_READLINE) && HAVE_READLINE!=0
 # include <readline/readline.h>
 # include <readline/history.h>
+#else
+# undef HAVE_READLINE
 #endif
-#if !defined(HAVE_EDITLINE) && (!defined(HAVE_READLINE) || HAVE_READLINE!=1)
-# define readline(p) local_getline(p,stdin,0)
+#if defined(HAVE_EDITLINE) && !defined(HAVE_READLINE)
+# define HAVE_READLINE 1
+# include <editline/readline.h>
+#endif
+#if !defined(HAVE_READLINE)
 # define add_history(X)
 # define read_history(X)
 # define write_history(X)
@@ -63,15 +65,22 @@
 #if defined(_WIN32) || defined(WIN32)
 # include <io.h>
 #define isatty(h) _isatty(h)
-#define access(f,m) _access((f),(m))
+#ifndef access
+# define access(f,m) _access((f),(m))
+#endif
 #undef popen
-#define popen(a,b) _popen((a),(b))
+#define popen _popen
 #undef pclose
-#define pclose(x) _pclose(x)
+#define pclose _pclose
 #else
 /* Make sure isatty() has a prototype.
 */
 extern int isatty(int);
+
+/* popen and pclose are not C89 functions and so are sometimes omitted from
+** the <stdio.h> header */
+extern FILE *popen(const char*,const char*);
+extern int pclose(FILE*);
 #endif
 
 #if defined(_WIN32_WCE)
@@ -82,21 +91,38 @@ extern int isatty(int);
 #define isatty(x) 1
 #endif
 
-/* True if the timer is enabled */
-static int enableTimer = 0;
-
 /* ctype macros that work with signed characters */
 #define IsSpace(X)  isspace((unsigned char)X)
 #define IsDigit(X)  isdigit((unsigned char)X)
 #define ToLower(X)  (char)tolower((unsigned char)X)
 
+
+/* True if the timer is enabled */
+static int enableTimer = 0;
+
+/* Return the current wall-clock time */
+static sqlite3_int64 timeOfDay(void){
+  static sqlite3_vfs *clockVfs = 0;
+  sqlite3_int64 t;
+  if( clockVfs==0 ) clockVfs = sqlite3_vfs_find(0);
+  if( clockVfs->iVersion>=1 && clockVfs->xCurrentTimeInt64!=0 ){
+    clockVfs->xCurrentTimeInt64(clockVfs, &t);
+  }else{
+    double r;
+    clockVfs->xCurrentTime(clockVfs, &r);
+    t = (sqlite3_int64)(r*86400000.0);
+  }
+  return t;
+}
+
 #if !defined(_WIN32) && !defined(WIN32) && !defined(_WRS_KERNEL) \
  && !defined(__minux)
 #include <sys/time.h>
 #include <sys/resource.h>
 
 /* Saved resource information for the beginning of an operation */
-static struct rusage sBegin;
+static struct rusage sBegin;  /* CPU time at start */
+static sqlite3_int64 iBegin;  /* Wall-clock time at start */
 
 /*
 ** Begin timing an operation
@@ -104,6 +130,7 @@ static struct rusage sBegin;
 static void beginTimer(void){
   if( enableTimer ){
     getrusage(RUSAGE_SELF, &sBegin);
+    iBegin = timeOfDay();
   }
 }
 
@@ -119,8 +146,10 @@ static double timeDiff(struct timeval *pStart, struct timeval *pEnd){
 static void endTimer(void){
   if( enableTimer ){
     struct rusage sEnd;
+    sqlite3_int64 iEnd = timeOfDay();
     getrusage(RUSAGE_SELF, &sEnd);
-    printf("CPU Time: user %f sys %f\n",
+    printf("Run Time: real %.3f user %f sys %f\n",
+       (iEnd - iBegin)*0.001,
        timeDiff(&sBegin.ru_utime, &sEnd.ru_utime),
        timeDiff(&sBegin.ru_stime, &sEnd.ru_stime));
   }
@@ -138,6 +167,7 @@ static void endTimer(void){
 static HANDLE hProcess;
 static FILETIME ftKernelBegin;
 static FILETIME ftUserBegin;
+static sqlite3_int64 ftWallBegin;
 typedef BOOL (WINAPI *GETPROCTIMES)(HANDLE, LPFILETIME, LPFILETIME, LPFILETIME, LPFILETIME);
 static GETPROCTIMES getProcessTimesAddr = NULL;
 
@@ -175,6 +205,7 @@ static void beginTimer(void){
   if( enableTimer && getProcessTimesAddr ){
     FILETIME ftCreation, ftExit;
     getProcessTimesAddr(hProcess, &ftCreation, &ftExit, &ftKernelBegin, &ftUserBegin);
+    ftWallBegin = timeOfDay();
   }
 }
 
@@ -191,8 +222,10 @@ static double timeDiff(FILETIME *pStart, FILETIME *pEnd){
 static void endTimer(void){
   if( enableTimer && getProcessTimesAddr){
     FILETIME ftCreation, ftExit, ftKernelEnd, ftUserEnd;
+    sqlite3_int64 ftWallEnd = timeOfDay();
     getProcessTimesAddr(hProcess, &ftCreation, &ftExit, &ftKernelEnd, &ftUserEnd);
-    printf("CPU Time: user %f sys %f\n",
+    printf("Run Time: real %.3f user %f sys %f\n",
+       (ftWallEnd - ftWallBegin)*0.001,
        timeDiff(&ftUserBegin, &ftUserEnd),
        timeDiff(&ftKernelBegin, &ftKernelEnd));
   }
@@ -332,23 +365,13 @@ static void shellstaticFunc(
 ** to the text.  NULL is returned at end of file, or if malloc()
 ** fails.
 **
-** The interface is like "readline" but no command-line editing
-** is done.
+** If zLine is not NULL then it is a malloced buffer returned from
+** a previous call to this routine that may be reused.
 */
-static char *local_getline(char *zPrompt, FILE *in, int csvFlag){
-  char *zLine;
-  int nLine;
-  int n;
-  int inQuote = 0;
+static char *local_getline(char *zLine, FILE *in){
+  int nLine = zLine==0 ? 0 : 100;
+  int n = 0;
 
-  if( zPrompt && *zPrompt ){
-    printf("%s",zPrompt);
-    fflush(stdout);
-  }
-  nLine = 100;
-  zLine = malloc( nLine );
-  if( zLine==0 ) return 0;
-  n = 0;
   while( 1 ){
     if( n+100>nLine ){
       nLine = nLine*2 + 100;
@@ -363,42 +386,48 @@ static char *local_getline(char *zPrompt, FILE *in, int csvFlag){
       zLine[n] = 0;
       break;
     }
-    while( zLine[n] ){
-      if( zLine[n]=='"' ) inQuote = !inQuote;
-      n++;
-    }
-    if( n>0 && zLine[n-1]=='\n' && (!inQuote || !csvFlag) ){
+    while( zLine[n] ) n++;
+    if( n>0 && zLine[n-1]=='\n' ){
       n--;
       if( n>0 && zLine[n-1]=='\r' ) n--;
       zLine[n] = 0;
       break;
     }
   }
-  zLine = realloc( zLine, n+1 );
   return zLine;
 }
 
 /*
 ** Retrieve a single line of input text.
 **
-** zPrior is a string of prior text retrieved.  If not the empty
-** string, then issue a continuation prompt.
+** If in==0 then read from standard input and prompt before each line.
+** If isContinuation is true, then a continuation prompt is appropriate.
+** If isContinuation is zero, then the main prompt should be used.
+**
+** If zPrior is not NULL then it is a buffer from a prior call to this
+** routine that can be reused.
+**
+** The result is stored in space obtained from malloc() and must either
+** be freed by the caller or else passed back into this routine via the
+** zPrior argument for reuse.
 */
-static char *one_input_line(const char *zPrior, FILE *in){
+static char *one_input_line(FILE *in, char *zPrior, int isContinuation){
   char *zPrompt;
   char *zResult;
   if( in!=0 ){
-    return local_getline(0, in, 0);
-  }
-  if( zPrior && zPrior[0] ){
-    zPrompt = continuePrompt;
+    zResult = local_getline(zPrior, in);
   }else{
-    zPrompt = mainPrompt;
-  }
-  zResult = readline(zPrompt);
-#if defined(HAVE_READLINE) && HAVE_READLINE==1
-  if( zResult && *zResult ) add_history(zResult);
+    zPrompt = isContinuation ? continuePrompt : mainPrompt;
+#if defined(HAVE_READLINE)
+    free(zPrior);
+    zResult = readline(zPrompt);
+    if( zResult && *zResult ) add_history(zResult);
+#else
+    printf("%s", zPrompt);
+    fflush(stdout);
+    zResult = local_getline(zPrior, stdin);
 #endif
+  }
   return zResult;
 }
 
@@ -417,7 +446,9 @@ struct previous_mode_data {
 struct callback_data {
   sqlite3 *db;           /* The database */
   int echoOn;            /* True to echo input commands */
+  int autoEQP;           /* Run EXPLAIN QUERY PLAN prior to seach SQL stmt */
   int statsOn;           /* True to display memory stats before each finalize */
+  int outCount;          /* Revert to stdout when reaching zero */
   int cnt;               /* Number of records displayed so far */
   FILE *out;             /* Write results here */
   FILE *traceOut;        /* Output for sqlite3_trace() */
@@ -436,9 +467,13 @@ struct callback_data {
                          ** .explain ON */
   char outfile[FILENAME_MAX]; /* Filename for *out */
   const char *zDbFilename;    /* name of the database file */
+  char *zFreeOnClose;         /* Filename to free when closing */
   const char *zVfs;           /* Name of VFS to use */
   sqlite3_stmt *pStmt;   /* Current statement if any. */
   FILE *pLog;            /* Write log output here */
+  int *aiIndent;         /* Array of indents used in MODE_Explain */
+  int nIndent;           /* Size of array aiIndent[] */
+  int iIndent;           /* Index of current op in aiIndent[] */
 };
 
 /*
@@ -554,7 +589,7 @@ static void output_c_string(FILE *out, const char *z){
     }else if( c=='\r' ){
       fputc('\\', out);
       fputc('r', out);
-    }else if( !isprint(c) ){
+    }else if( !isprint(c&0xff) ){
       fprintf(out, "\\%03o", c&0xff);
     }else{
       fputc(c, out);
@@ -569,6 +604,7 @@ static void output_c_string(FILE *out, const char *z){
 */
 static void output_html_string(FILE *out, const char *z){
   int i;
+  if( z==0 ) z = "";
   while( *z ){
     for(i=0;   z[i] 
             && z[i]!='<' 
@@ -662,7 +698,8 @@ static void output_csv(struct callback_data *p, const char *z, int bSep){
 */
 static void interrupt_handler(int NotUsed){
   UNUSED_PARAMETER(NotUsed);
-  seenInterrupt = 1;
+  seenInterrupt++;
+  if( seenInterrupt>2 ) exit(1);
   if( db ) sqlite3_interrupt(db);
 }
 #endif
@@ -740,10 +777,15 @@ static int shell_callback(void *pArg, int nArg, char **azArg, char **azCol, int
         }else{
            w = 10;
         }
-        if( p->mode==MODE_Explain && azArg[i] && 
-           strlen30(azArg[i])>w ){
+        if( p->mode==MODE_Explain && azArg[i] && strlen30(azArg[i])>w ){
           w = strlen30(azArg[i]);
         }
+        if( i==1 && p->aiIndent && p->pStmt ){
+          if( p->iIndent<p->nIndent ){
+            fprintf(p->out, "%*.s", p->aiIndent[p->iIndent], "");
+          }
+          p->iIndent++;
+        }
         if( w<0 ){
           fprintf(p->out,"%*.*s%s",-w,-w,
               azArg[i] ? azArg[i] : p->nullvalue, i==nArg-1 ? "\n": "  ");
@@ -837,7 +879,8 @@ static int shell_callback(void *pArg, int nArg, char **azArg, char **azCol, int
         }else if( aiType && aiType[i]==SQLITE_TEXT ){
           if( zSep[0] ) fprintf(p->out,"%s",zSep);
           output_quoted_string(p->out, azArg[i]);
-        }else if( aiType && (aiType[i]==SQLITE_INTEGER || aiType[i]==SQLITE_FLOAT) ){
+        }else if( aiType && (aiType[i]==SQLITE_INTEGER
+                             || aiType[i]==SQLITE_FLOAT) ){
           fprintf(p->out,"%s%s",zSep, azArg[i]);
         }else if( aiType && aiType[i]==SQLITE_BLOB && p->pStmt ){
           const void *pBlob = sqlite3_column_blob(p->pStmt, i);
@@ -971,10 +1014,10 @@ static int run_table_dump_query(
   int nResult;
   int i;
   const char *z;
-  rc = sqlite3_prepare(p->db, zSelect, -1, &pSelect, 0);
+  rc = sqlite3_prepare_v2(p->db, zSelect, -1, &pSelect, 0);
   if( rc!=SQLITE_OK || !pSelect ){
     fprintf(p->out, "/**** ERROR: (%d) %s *****/\n", rc, sqlite3_errmsg(p->db));
-    p->nErr++;
+    if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
     return rc;
   }
   rc = sqlite3_step(pSelect);
@@ -1001,7 +1044,7 @@ static int run_table_dump_query(
   rc = sqlite3_finalize(pSelect);
   if( rc!=SQLITE_OK ){
     fprintf(p->out, "/**** ERROR: (%d) %s *****/\n", rc, sqlite3_errmsg(p->db));
-    p->nErr++;
+    if( (rc&0xff)!=SQLITE_CORRUPT ) p->nErr++;
   }
   return rc;
 }
@@ -1109,11 +1152,112 @@ static int display_stats(
     fprintf(pArg->out, "Sort Operations:                     %d\n", iCur);
     iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_AUTOINDEX, bReset);
     fprintf(pArg->out, "Autoindex Inserts:                   %d\n", iCur);
+    iCur = sqlite3_stmt_status(pArg->pStmt, SQLITE_STMTSTATUS_VM_STEP, bReset);
+    fprintf(pArg->out, "Virtual Machine Steps:               %d\n", iCur);
   }
 
   return 0;
 }
 
+/*
+** Parameter azArray points to a zero-terminated array of strings. zStr
+** points to a single nul-terminated string. Return non-zero if zStr
+** is equal, according to strcmp(), to any of the strings in the array.
+** Otherwise, return zero.
+*/
+static int str_in_array(const char *zStr, const char **azArray){
+  int i;
+  for(i=0; azArray[i]; i++){
+    if( 0==strcmp(zStr, azArray[i]) ) return 1;
+  }
+  return 0;
+}
+
+/*
+** If compiled statement pSql appears to be an EXPLAIN statement, allocate
+** and populate the callback_data.aiIndent[] array with the number of
+** spaces each opcode should be indented before it is output. 
+**
+** The indenting rules are:
+**
+**     * For each "Next", "Prev", "VNext" or "VPrev" instruction, indent
+**       all opcodes that occur between the p2 jump destination and the opcode
+**       itself by 2 spaces.
+**
+**     * For each "Goto", if the jump destination is earlier in the program
+**       and ends on one of:
+**          Yield  SeekGt  SeekLt  RowSetRead  Rewind
+**       or if the P1 parameter is one instead of zero,
+**       then indent all opcodes between the earlier instruction
+**       and "Goto" by 2 spaces.
+*/
+static void explain_data_prepare(struct callback_data *p, sqlite3_stmt *pSql){
+  const char *zSql;               /* The text of the SQL statement */
+  const char *z;                  /* Used to check if this is an EXPLAIN */
+  int *abYield = 0;               /* True if op is an OP_Yield */
+  int nAlloc = 0;                 /* Allocated size of p->aiIndent[], abYield */
+  int iOp;                        /* Index of operation in p->aiIndent[] */
+
+  const char *azNext[] = { "Next", "Prev", "VPrev", "VNext", "SorterNext",
+                           "NextIfOpen", "PrevIfOpen", 0 };
+  const char *azYield[] = { "Yield", "SeekLT", "SeekGT", "RowSetRead", "Rewind", 0 };
+  const char *azGoto[] = { "Goto", 0 };
+
+  /* Try to figure out if this is really an EXPLAIN statement. If this
+  ** cannot be verified, return early.  */
+  zSql = sqlite3_sql(pSql);
+  if( zSql==0 ) return;
+  for(z=zSql; *z==' ' || *z=='\t' || *z=='\n' || *z=='\f' || *z=='\r'; z++);
+  if( sqlite3_strnicmp(z, "explain", 7) ) return;
+
+  for(iOp=0; SQLITE_ROW==sqlite3_step(pSql); iOp++){
+    int i;
+    int iAddr = sqlite3_column_int(pSql, 0);
+    const char *zOp = (const char*)sqlite3_column_text(pSql, 1);
+
+    /* Set p2 to the P2 field of the current opcode. Then, assuming that
+    ** p2 is an instruction address, set variable p2op to the index of that
+    ** instruction in the aiIndent[] array. p2 and p2op may be different if
+    ** the current instruction is part of a sub-program generated by an
+    ** SQL trigger or foreign key.  */
+    int p2 = sqlite3_column_int(pSql, 3);
+    int p2op = (p2 + (iOp-iAddr));
+
+    /* Grow the p->aiIndent array as required */
+    if( iOp>=nAlloc ){
+      nAlloc += 100;
+      p->aiIndent = (int*)sqlite3_realloc(p->aiIndent, nAlloc*sizeof(int));
+      abYield = (int*)sqlite3_realloc(abYield, nAlloc*sizeof(int));
+    }
+    abYield[iOp] = str_in_array(zOp, azYield);
+    p->aiIndent[iOp] = 0;
+    p->nIndent = iOp+1;
+
+    if( str_in_array(zOp, azNext) ){
+      for(i=p2op; i<iOp; i++) p->aiIndent[i] += 2;
+    }
+    if( str_in_array(zOp, azGoto) && p2op<p->nIndent
+     && (abYield[p2op] || sqlite3_column_int(pSql, 2))
+    ){
+      for(i=p2op+1; i<iOp; i++) p->aiIndent[i] += 2;
+    }
+  }
+
+  p->iIndent = 0;
+  sqlite3_free(abYield);
+  sqlite3_reset(pSql);
+}
+
+/*
+** Free the array allocated by explain_data_prepare().
+*/
+static void explain_data_delete(struct callback_data *p){
+  sqlite3_free(p->aiIndent);
+  p->aiIndent = 0;
+  p->nIndent = 0;
+  p->iIndent = 0;
+}
+
 /*
 ** Execute a statement or set of statements.  Print 
 ** any result rows/columns depending on the current mode 
@@ -1166,6 +1310,23 @@ static int shell_exec(
         fprintf(pArg->out, "%s\n", zStmtSql ? zStmtSql : zSql);
       }
 
+      /* Show the EXPLAIN QUERY PLAN if .eqp is on */
+      if( pArg && pArg->autoEQP ){
+        sqlite3_stmt *pExplain;
+        char *zEQP = sqlite3_mprintf("EXPLAIN QUERY PLAN %s", sqlite3_sql(pStmt));
+        rc = sqlite3_prepare_v2(db, zEQP, -1, &pExplain, 0);
+        if( rc==SQLITE_OK ){
+          while( sqlite3_step(pExplain)==SQLITE_ROW ){
+            fprintf(pArg->out,"--EQP-- %d,", sqlite3_column_int(pExplain, 0));
+            fprintf(pArg->out,"%d,", sqlite3_column_int(pExplain, 1));
+            fprintf(pArg->out,"%d,", sqlite3_column_int(pExplain, 2));
+            fprintf(pArg->out,"%s\n", sqlite3_column_text(pExplain, 3));
+          }
+        }
+        sqlite3_finalize(pExplain);
+        sqlite3_free(zEQP);
+      }
+
       /* Output TESTCTRL_EXPLAIN text of requested */
       if( pArg && pArg->mode==MODE_Explain ){
         const char *zExplain = 0;
@@ -1175,6 +1336,12 @@ static int shell_exec(
         }
       }
 
+      /* If the shell is currently in ".explain" mode, gather the extra
+      ** data required to add indents to the output.*/
+      if( pArg && pArg->mode==MODE_Explain ){
+        explain_data_prepare(pArg, pStmt);
+      }
+
       /* perform the first step.  this will tell us if we
       ** have a result set or not and how wide it is.
       */
@@ -1192,7 +1359,7 @@ static int shell_exec(
             char **azCols = (char **)pData;      /* Names of result columns */
             char **azVals = &azCols[nCol];       /* Results */
             int *aiTypes = (int *)&azVals[nCol]; /* Result types */
-            int i;
+            int i, x;
             assert(sizeof(int) <= sizeof(char *)); 
             /* save off ptrs to column names */
             for(i=0; i<nCol; i++){
@@ -1201,8 +1368,12 @@ static int shell_exec(
             do{
               /* extract the data and data types */
               for(i=0; i<nCol; i++){
-                azVals[i] = (char *)sqlite3_column_text(pStmt, i);
-                aiTypes[i] = sqlite3_column_type(pStmt, i);
+                aiTypes[i] = x = sqlite3_column_type(pStmt, i);
+                if( x==SQLITE_BLOB && pArg && pArg->mode==MODE_Insert ){
+                  azVals[i] = "";
+                }else{
+                  azVals[i] = (char*)sqlite3_column_text(pStmt, i);
+                }
                 if( !azVals[i] && (aiTypes[i]!=SQLITE_NULL) ){
                   rc = SQLITE_NOMEM;
                   break; /* from for */
@@ -1228,6 +1399,8 @@ static int shell_exec(
         }
       }
 
+      explain_data_delete(pArg);
+
       /* print usage stats if stats on */
       if( pArg && pArg->statsOn ){
         display_stats(db, pArg, 0);
@@ -1278,7 +1451,7 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
   
   if( strcmp(zTable, "sqlite_sequence")==0 ){
     zPrepStmt = "DELETE FROM sqlite_sequence;\n";
-  }else if( strcmp(zTable, "sqlite_stat1")==0 ){
+  }else if( sqlite3_strglob("sqlite_stat?", zTable)==0 ){
     fprintf(p->out, "ANALYZE sqlite_master;\n");
   }else if( strncmp(zTable, "sqlite_", 7)==0 ){
     return 0;
@@ -1310,7 +1483,7 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
     zTableInfo = appendText(zTableInfo, zTable, '"');
     zTableInfo = appendText(zTableInfo, ");", 0);
 
-    rc = sqlite3_prepare(p->db, zTableInfo, -1, &pTableInfo, 0);
+    rc = sqlite3_prepare_v2(p->db, zTableInfo, -1, &pTableInfo, 0);
     free(zTableInfo);
     if( rc!=SQLITE_OK || !pTableInfo ){
       return 1;
@@ -1399,16 +1572,17 @@ static int run_schema_dump_query(
 */
 static char zHelp[] =
   ".backup ?DB? FILE      Backup DB (default \"main\") to FILE\n"
-  ".bail ON|OFF           Stop after hitting an error.  Default OFF\n"
+  ".bail on|off           Stop after hitting an error.  Default OFF\n"
+  ".clone NEWDB           Clone data into NEWDB from the existing database\n"
   ".databases             List names and files of attached databases\n"
   ".dump ?TABLE? ...      Dump the database in an SQL text format\n"
   "                         If TABLE specified, only dump tables matching\n"
   "                         LIKE pattern TABLE.\n"
-  ".echo ON|OFF           Turn command echo on or off\n"
+  ".echo on|off           Turn command echo on or off\n"
   ".exit                  Exit this program\n"
-  ".explain ?ON|OFF?      Turn output mode suitable for EXPLAIN on or off.\n"
+  ".explain ?on|off?      Turn output mode suitable for EXPLAIN on or off.\n"
   "                         With no args, it turns EXPLAIN on.\n"
-  ".header(s) ON|OFF      Turn display of headers on or off\n"
+  ".headers on|off        Turn display of headers on or off\n"
   ".help                  Show this message\n"
   ".import FILE TABLE     Import data from FILE into TABLE\n"
   ".indices ?TABLE?       Show names of all indices\n"
@@ -1431,30 +1605,32 @@ static char zHelp[] =
   "                         tabs     Tab-separated values\n"
   "                         tcl      TCL list elements\n"
   ".nullvalue STRING      Use STRING in place of NULL values\n"
-  ".output FILENAME       Send output to FILENAME\n"
-  ".output stdout         Send output to the screen\n"
+  ".once FILENAME         Output for the next SQL command only to FILENAME\n"
+  ".open ?FILENAME?       Close existing database and reopen FILENAME\n"
+  ".output ?FILENAME?     Send output to FILENAME or stdout\n"
   ".print STRING...       Print literal STRING\n"
   ".prompt MAIN CONTINUE  Replace the standard prompts\n"
   ".quit                  Exit this program\n"
   ".read FILENAME         Execute SQL in FILENAME\n"
   ".restore ?DB? FILE     Restore content of DB (default \"main\") from FILE\n"
+  ".save FILE             Write in-memory database into FILE\n"
   ".schema ?TABLE?        Show the CREATE statements\n"
   "                         If TABLE specified, only show tables matching\n"
   "                         LIKE pattern TABLE.\n"
   ".separator STRING      Change separator used by output mode and .import\n"
+  ".shell CMD ARGS...     Run CMD ARGS... in a system shell\n"
   ".show                  Show the current values for various settings\n"
-  ".stats ON|OFF          Turn stats on or off\n"
+  ".stats on|off          Turn stats on or off\n"
+  ".system CMD ARGS...    Run CMD ARGS... in a system shell\n"
   ".tables ?TABLE?        List names of tables\n"
   "                         If TABLE specified, only list tables matching\n"
   "                         LIKE pattern TABLE.\n"
   ".timeout MS            Try opening locked tables for MS milliseconds\n"
+  ".timer on|off          Turn SQL timer on or off\n"
   ".trace FILE|off        Output each SQL statement as it is run\n"
   ".vfsname ?AUX?         Print the name of the VFS stack\n"
   ".width NUM1 NUM2 ...   Set column widths for \"column\" mode\n"
-;
-
-static char zTimerHelp[] =
-  ".timer ON|OFF          Turn the CPU timer measurement on or off\n"
+  "                         Negative values right-justify\n"
 ;
 
 /* Forward reference */
@@ -1464,7 +1640,7 @@ static int process_input(struct callback_data *p, FILE *in);
 ** Make sure the database is open.  If it is not, then open it.  If
 ** the database fails to open, print an error message and exit.
 */
-static void open_db(struct callback_data *p){
+static void open_db(struct callback_data *p, int keepAlive){
   if( p->db==0 ){
     sqlite3_initialize();
     sqlite3_open(p->zDbFilename, &p->db);
@@ -1476,6 +1652,7 @@ static void open_db(struct callback_data *p){
     if( db==0 || SQLITE_OK!=sqlite3_errcode(db) ){
       fprintf(stderr,"Error: unable to open database \"%s\": %s\n", 
           p->zDbFilename, sqlite3_errmsg(db));
+      if( keepAlive ) return;
       exit(1);
     }
 #ifndef SQLITE_OMIT_LOAD_EXTENSION
@@ -1490,12 +1667,14 @@ static void open_db(struct callback_data *p){
 **    \t    -> tab
 **    \n    -> newline
 **    \r    -> carriage return
+**    \"    -> "
 **    \NNN  -> ascii character NNN in octal
 **    \\    -> backslash
 */
 static void resolve_backslashes(char *z){
   int i, j;
   char c;
+  while( *z && *z!='\\' ) z++;
   for(i=j=0; (c = z[i])!=0; i++, j++){
     if( c=='\\' ){
       c = z[++i];
@@ -1505,6 +1684,8 @@ static void resolve_backslashes(char *z){
         c = '\t';
       }else if( c=='r' ){
         c = '\r';
+      }else if( c=='\\' ){
+        c = '\\';
       }else if( c>='0' && c<='7' ){
         c -= '0';
         if( z[i+1]>='0' && z[i+1]<='7' ){
@@ -1519,25 +1700,18 @@ static void resolve_backslashes(char *z){
     }
     z[j] = c;
   }
-  z[j] = 0;
+  if( j<i ) z[j] = 0;
 }
 
 /*
-** Interpret zArg as a boolean value.  Return either 0 or 1.
+** Return the value of a hexadecimal digit.  Return -1 if the input
+** is not a hex digit.
 */
-static int booleanValue(char *zArg){
-  int i;
-  for(i=0; zArg[i]>='0' && zArg[i]<='9'; i++){}
-  if( i>0 && zArg[i]==0 ) return atoi(zArg);
-  if( sqlite3_stricmp(zArg, "on")==0 || sqlite3_stricmp(zArg,"yes")==0 ){
-    return 1;
-  }
-  if( sqlite3_stricmp(zArg, "off")==0 || sqlite3_stricmp(zArg,"no")==0 ){
-    return 0;
-  }
-  fprintf(stderr, "ERROR: Not a boolean value: \"%s\". Assuming \"no\".\n",
-          zArg);
-  return 0;
+static int hexDigitValue(char c){
+  if( c>='0' && c<='9' ) return c - '0';
+  if( c>='a' && c<='f' ) return c - 'a' + 10;
+  if( c>='A' && c<='F' ) return c - 'A' + 10;
+  return -1;
 }
 
 /*
@@ -1564,11 +1738,20 @@ static sqlite3_int64 integerValue(const char *zArg){
   }else if( zArg[0]=='+' ){
     zArg++;
   }
-  while( isdigit(zArg[0]) ){
-    v = v*10 + zArg[0] - '0';
-    zArg++;
+  if( zArg[0]=='0' && zArg[1]=='x' ){
+    int x;
+    zArg += 2;
+    while( (x = hexDigitValue(zArg[0]))>=0 ){
+      v = (v<<4) + x;
+      zArg++;
+    }
+  }else{
+    while( IsDigit(zArg[0]) ){
+      v = v*10 + zArg[0] - '0';
+      zArg++;
+    }
   }
-  for(i=0; i<sizeof(aMult)/sizeof(aMult[0]); i++){
+  for(i=0; i<ArraySize(aMult); i++){
     if( sqlite3_stricmp(aMult[i].zSuffix, zArg)==0 ){
       v *= aMult[i].iMult;
       break;
@@ -1577,6 +1760,29 @@ static sqlite3_int64 integerValue(const char *zArg){
   return isNeg? -v : v;
 }
 
+/*
+** Interpret zArg as either an integer or a boolean value.  Return 1 or 0
+** for TRUE and FALSE.  Return the integer value if appropriate.
+*/
+static int booleanValue(char *zArg){
+  int i;
+  if( zArg[0]=='0' && zArg[1]=='x' ){
+    for(i=2; hexDigitValue(zArg[i])>=0; i++){}
+  }else{
+    for(i=0; zArg[i]>='0' && zArg[i]<='9'; i++){}
+  }
+  if( i>0 && zArg[i]==0 ) return (int)(integerValue(zArg) & 0xffffffff);
+  if( sqlite3_stricmp(zArg, "on")==0 || sqlite3_stricmp(zArg,"yes")==0 ){
+    return 1;
+  }
+  if( sqlite3_stricmp(zArg, "off")==0 || sqlite3_stricmp(zArg,"no")==0 ){
+    return 0;
+  }
+  fprintf(stderr, "ERROR: Not a boolean value: \"%s\". Assuming \"no\".\n",
+          zArg);
+  return 0;
+}
+
 /*
 ** Close an output file, assuming it is not stderr or stdout
 */
@@ -1623,6 +1829,334 @@ static void test_breakpoint(void){
   nCall++;
 }
 
+/*
+** An object used to read a CSV file
+*/
+typedef struct CSVReader CSVReader;
+struct CSVReader {
+  const char *zFile;  /* Name of the input file */
+  FILE *in;           /* Read the CSV text from this input stream */
+  char *z;            /* Accumulated text for a field */
+  int n;              /* Number of bytes in z */
+  int nAlloc;         /* Space allocated for z[] */
+  int nLine;          /* Current line number */
+  int cTerm;          /* Character that terminated the most recent field */
+  int cSeparator;     /* The separator character.  (Usually ",") */
+};
+
+/* Append a single byte to z[] */
+static void csv_append_char(CSVReader *p, int c){
+  if( p->n+1>=p->nAlloc ){
+    p->nAlloc += p->nAlloc + 100;
+    p->z = sqlite3_realloc(p->z, p->nAlloc);
+    if( p->z==0 ){
+      fprintf(stderr, "out of memory\n");
+      exit(1);
+    }
+  }
+  p->z[p->n++] = (char)c;
+}
+
+/* Read a single field of CSV text.  Compatible with rfc4180 and extended
+** with the option of having a separator other than ",".
+**
+**   +  Input comes from p->in.
+**   +  Store results in p->z of length p->n.  Space to hold p->z comes
+**      from sqlite3_malloc().
+**   +  Use p->cSep as the separator.  The default is ",".
+**   +  Keep track of the line number in p->nLine.
+**   +  Store the character that terminates the field in p->cTerm.  Store
+**      EOF on end-of-file.
+**   +  Report syntax errors on stderr
+*/
+static char *csv_read_one_field(CSVReader *p){
+  int c, pc, ppc;
+  int cSep = p->cSeparator;
+  p->n = 0;
+  c = fgetc(p->in);
+  if( c==EOF || seenInterrupt ){
+    p->cTerm = EOF;
+    return 0;
+  }
+  if( c=='"' ){
+    int startLine = p->nLine;
+    int cQuote = c;
+    pc = ppc = 0;
+    while( 1 ){
+      c = fgetc(p->in);
+      if( c=='\n' ) p->nLine++;
+      if( c==cQuote ){
+        if( pc==cQuote ){
+          pc = 0;
+          continue;
+        }
+      }
+      if( (c==cSep && pc==cQuote)
+       || (c=='\n' && pc==cQuote)
+       || (c=='\n' && pc=='\r' && ppc==cQuote)
+       || (c==EOF && pc==cQuote)
+      ){
+        do{ p->n--; }while( p->z[p->n]!=cQuote );
+        p->cTerm = c;
+        break;
+      }
+      if( pc==cQuote && c!='\r' ){
+        fprintf(stderr, "%s:%d: unescaped %c character\n",
+                p->zFile, p->nLine, cQuote);
+      }
+      if( c==EOF ){
+        fprintf(stderr, "%s:%d: unterminated %c-quoted field\n",
+                p->zFile, startLine, cQuote);
+        p->cTerm = EOF;
+        break;
+      }
+      csv_append_char(p, c);
+      ppc = pc;
+      pc = c;
+    }
+  }else{
+    while( c!=EOF && c!=cSep && c!='\n' ){
+      csv_append_char(p, c);
+      c = fgetc(p->in);
+    }
+    if( c=='\n' ){
+      p->nLine++;
+      if( p->n>0 && p->z[p->n-1]=='\r' ) p->n--;
+    }
+    p->cTerm = c;
+  }
+  if( p->z ) p->z[p->n] = 0;
+  return p->z;
+}
+
+/*
+** Try to transfer data for table zTable.  If an error is seen while
+** moving forward, try to go backwards.  The backwards movement won't
+** work for WITHOUT ROWID tables.
+*/
+static void tryToCloneData(
+  struct callback_data *p,
+  sqlite3 *newDb,
+  const char *zTable
+){
+  sqlite3_stmt *pQuery = 0; 
+  sqlite3_stmt *pInsert = 0;
+  char *zQuery = 0;
+  char *zInsert = 0;
+  int rc;
+  int i, j, n;
+  int nTable = (int)strlen(zTable);
+  int k = 0;
+  int cnt = 0;
+  const int spinRate = 10000;
+
+  zQuery = sqlite3_mprintf("SELECT * FROM \"%w\"", zTable);
+  rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
+  if( rc ){
+    fprintf(stderr, "Error %d: %s on [%s]\n",
+            sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
+            zQuery);
+    goto end_data_xfer;
+  }
+  n = sqlite3_column_count(pQuery);
+  zInsert = sqlite3_malloc(200 + nTable + n*3);
+  if( zInsert==0 ){
+    fprintf(stderr, "out of memory\n");
+    goto end_data_xfer;
+  }
+  sqlite3_snprintf(200+nTable,zInsert,
+                   "INSERT OR IGNORE INTO \"%s\" VALUES(?", zTable);
+  i = (int)strlen(zInsert);
+  for(j=1; j<n; j++){
+    memcpy(zInsert+i, ",?", 2);
+    i += 2;
+  }
+  memcpy(zInsert+i, ");", 3);
+  rc = sqlite3_prepare_v2(newDb, zInsert, -1, &pInsert, 0);
+  if( rc ){
+    fprintf(stderr, "Error %d: %s on [%s]\n",
+            sqlite3_extended_errcode(newDb), sqlite3_errmsg(newDb),
+            zQuery);
+    goto end_data_xfer;
+  }
+  for(k=0; k<2; k++){
+    while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
+      for(i=0; i<n; i++){
+        switch( sqlite3_column_type(pQuery, i) ){
+          case SQLITE_NULL: {
+            sqlite3_bind_null(pInsert, i+1);
+            break;
+          }
+          case SQLITE_INTEGER: {
+            sqlite3_bind_int64(pInsert, i+1, sqlite3_column_int64(pQuery,i));
+            break;
+          }
+          case SQLITE_FLOAT: {
+            sqlite3_bind_double(pInsert, i+1, sqlite3_column_double(pQuery,i));
+            break;
+          }
+          case SQLITE_TEXT: {
+            sqlite3_bind_text(pInsert, i+1,
+                             (const char*)sqlite3_column_text(pQuery,i),
+                             -1, SQLITE_STATIC);
+            break;
+          }
+          case SQLITE_BLOB: {
+            sqlite3_bind_blob(pInsert, i+1, sqlite3_column_blob(pQuery,i),
+                                            sqlite3_column_bytes(pQuery,i),
+                                            SQLITE_STATIC);
+            break;
+          }
+        }
+      } /* End for */
+      rc = sqlite3_step(pInsert);
+      if( rc!=SQLITE_OK && rc!=SQLITE_ROW && rc!=SQLITE_DONE ){
+        fprintf(stderr, "Error %d: %s\n", sqlite3_extended_errcode(newDb),
+                        sqlite3_errmsg(newDb));
+      }
+      sqlite3_reset(pInsert);
+      cnt++;
+      if( (cnt%spinRate)==0 ){
+        printf("%c\b", "|/-\\"[(cnt/spinRate)%4]);
+        fflush(stdout);
+      }
+    } /* End while */
+    if( rc==SQLITE_DONE ) break;
+    sqlite3_finalize(pQuery);
+    sqlite3_free(zQuery);
+    zQuery = sqlite3_mprintf("SELECT * FROM \"%w\" ORDER BY rowid DESC;",
+                             zTable);
+    rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
+    if( rc ){
+      fprintf(stderr, "Warning: cannot step \"%s\" backwards", zTable);
+      break;
+    }
+  } /* End for(k=0...) */
+
+end_data_xfer:
+  sqlite3_finalize(pQuery);
+  sqlite3_finalize(pInsert);
+  sqlite3_free(zQuery);
+  sqlite3_free(zInsert);
+}
+
+
+/*
+** Try to transfer all rows of the schema that match zWhere.  For
+** each row, invoke xForEach() on the object defined by that row.
+** If an error is encountered while moving forward through the
+** sqlite_master table, try again moving backwards.
+*/
+static void tryToCloneSchema(
+  struct callback_data *p,
+  sqlite3 *newDb,
+  const char *zWhere,
+  void (*xForEach)(struct callback_data*,sqlite3*,const char*)
+){
+  sqlite3_stmt *pQuery = 0;
+  char *zQuery = 0;
+  int rc;
+  const unsigned char *zName;
+  const unsigned char *zSql;
+  char *zErrMsg = 0;
+
+  zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
+                           " WHERE %s", zWhere);
+  rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
+  if( rc ){
+    fprintf(stderr, "Error: (%d) %s on [%s]\n",
+                    sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
+                    zQuery);
+    goto end_schema_xfer;
+  }
+  while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
+    zName = sqlite3_column_text(pQuery, 0);
+    zSql = sqlite3_column_text(pQuery, 1);
+    printf("%s... ", zName); fflush(stdout);
+    sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
+    if( zErrMsg ){
+      fprintf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
+      sqlite3_free(zErrMsg);
+      zErrMsg = 0;
+    }
+    if( xForEach ){
+      xForEach(p, newDb, (const char*)zName);
+    }
+    printf("done\n");
+  }
+  if( rc!=SQLITE_DONE ){
+    sqlite3_finalize(pQuery);
+    sqlite3_free(zQuery);
+    zQuery = sqlite3_mprintf("SELECT name, sql FROM sqlite_master"
+                             " WHERE %s ORDER BY rowid DESC", zWhere);
+    rc = sqlite3_prepare_v2(p->db, zQuery, -1, &pQuery, 0);
+    if( rc ){
+      fprintf(stderr, "Error: (%d) %s on [%s]\n",
+                      sqlite3_extended_errcode(p->db), sqlite3_errmsg(p->db),
+                      zQuery);
+      goto end_schema_xfer;
+    }
+    while( (rc = sqlite3_step(pQuery))==SQLITE_ROW ){
+      zName = sqlite3_column_text(pQuery, 0);
+      zSql = sqlite3_column_text(pQuery, 1);
+      printf("%s... ", zName); fflush(stdout);
+      sqlite3_exec(newDb, (const char*)zSql, 0, 0, &zErrMsg);
+      if( zErrMsg ){
+        fprintf(stderr, "Error: %s\nSQL: [%s]\n", zErrMsg, zSql);
+        sqlite3_free(zErrMsg);
+        zErrMsg = 0;
+      }
+      if( xForEach ){
+        xForEach(p, newDb, (const char*)zName);
+      }
+      printf("done\n");
+    }
+  }
+end_schema_xfer:
+  sqlite3_finalize(pQuery);
+  sqlite3_free(zQuery);
+}
+
+/*
+** Open a new database file named "zNewDb".  Try to recover as much information
+** as possible out of the main database (which might be corrupt) and write it
+** into zNewDb.
+*/
+static void tryToClone(struct callback_data *p, const char *zNewDb){
+  int rc;
+  sqlite3 *newDb = 0;
+  if( access(zNewDb,0)==0 ){
+    fprintf(stderr, "File \"%s\" already exists.\n", zNewDb);
+    return;
+  }
+  rc = sqlite3_open(zNewDb, &newDb);
+  if( rc ){
+    fprintf(stderr, "Cannot create output database: %s\n",
+            sqlite3_errmsg(newDb));
+  }else{
+    sqlite3_exec(p->db, "PRAGMA writable_schema=ON;", 0, 0, 0);
+    sqlite3_exec(newDb, "BEGIN EXCLUSIVE;", 0, 0, 0);
+    tryToCloneSchema(p, newDb, "type='table'", tryToCloneData);
+    tryToCloneSchema(p, newDb, "type!='table'", 0);
+    sqlite3_exec(newDb, "COMMIT;", 0, 0, 0);
+    sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0);
+  }
+  sqlite3_close(newDb);
+}
+
+/*
+** Change the output file back to stdout
+*/
+static void output_reset(struct callback_data *p){
+  if( p->outfile[0]=='|' ){
+    pclose(p->out);
+  }else{
+    output_file_close(p->out);
+  }
+  p->outfile[0] = 0;
+  p->out = stdout;
+}
+
 /*
 ** If an input line begins with "." then invoke this routine to
 ** process that line.
@@ -1644,7 +2178,10 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     if( zLine[i]=='\'' || zLine[i]=='"' ){
       int delim = zLine[i++];
       azArg[nArg++] = &zLine[i];
-      while( zLine[i] && zLine[i]!=delim ){ i++; }
+      while( zLine[i] && zLine[i]!=delim ){ 
+        if( zLine[i]=='\\' && delim=='"' && zLine[i+1]!=0 ) i++;
+        i++; 
+      }
       if( zLine[i]==delim ){
         zLine[i++] = 0;
       }
@@ -1662,10 +2199,11 @@ static int do_meta_command(char *zLine, struct callback_data *p){
   if( nArg==0 ) return 0; /* no tokens, no error */
   n = strlen30(azArg[0]);
   c = azArg[0][0];
-  if( c=='b' && n>=3 && strncmp(azArg[0], "backup", n)==0 ){
+  if( (c=='b' && n>=3 && strncmp(azArg[0], "backup", n)==0)
+   || (c=='s' && n>=3 && strncmp(azArg[0], "save", n)==0)
+  ){
     const char *zDestFile = 0;
     const char *zDb = 0;
-    const char *zKey = 0;
     sqlite3 *pDest;
     sqlite3_backup *pBackup;
     int j;
@@ -1673,9 +2211,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
       const char *z = azArg[j];
       if( z[0]=='-' ){
         while( z[0]=='-' ) z++;
-        if( strcmp(z,"key")==0 && j<nArg-1 ){
-          zKey = azArg[++j];
-        }else
+        /* No options to process at this time */
         {
           fprintf(stderr, "unknown option: %s\n", azArg[j]);
           return 1;
@@ -1701,12 +2237,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
       sqlite3_close(pDest);
       return 1;
     }
-#ifdef SQLITE_HAS_CODEC
-    sqlite3_key(pDest, zKey, (int)strlen(zKey));
-#else
-    (void)zKey;
-#endif
-    open_db(p);
+    open_db(p, 0);
     pBackup = sqlite3_backup_init(pDest, "main", p->db, zDb);
     if( pBackup==0 ){
       fprintf(stderr, "Error: %s\n", sqlite3_errmsg(pDest));
@@ -1724,8 +2255,13 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     sqlite3_close(pDest);
   }else
 
-  if( c=='b' && n>=3 && strncmp(azArg[0], "bail", n)==0 && nArg>1 && nArg<3 ){
-    bail_on_error = booleanValue(azArg[1]);
+  if( c=='b' && n>=3 && strncmp(azArg[0], "bail", n)==0 ){
+    if( nArg==2 ){
+      bail_on_error = booleanValue(azArg[1]);
+    }else{
+      fprintf(stderr, "Usage: .bail on|off\n");
+      rc = 1;
+    }
   }else
 
   /* The undocumented ".breakpoint" command causes a call to the no-op
@@ -1735,10 +2271,19 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     test_breakpoint();
   }else
 
-  if( c=='d' && n>1 && strncmp(azArg[0], "databases", n)==0 && nArg==1 ){
+  if( c=='c' && strncmp(azArg[0], "clone", n)==0 ){
+    if( nArg==2 ){
+      tryToClone(p, azArg[1]);
+    }else{
+      fprintf(stderr, "Usage: .clone FILENAME\n");
+      rc = 1;
+    }
+  }else
+
+  if( c=='d' && n>1 && strncmp(azArg[0], "databases", n)==0 ){
     struct callback_data data;
     char *zErrMsg = 0;
-    open_db(p);
+    open_db(p, 0);
     memcpy(&data, p, sizeof(data));
     data.showHeader = 1;
     data.mode = MODE_Column;
@@ -1754,11 +2299,16 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     }
   }else
 
-  if( c=='d' && strncmp(azArg[0], "dump", n)==0 && nArg<3 ){
-    open_db(p);
+  if( c=='d' && strncmp(azArg[0], "dump", n)==0 ){
+    open_db(p, 0);
     /* When playing back a "dump", the content might appear in an order
     ** which causes immediate foreign key constraints to be violated.
     ** So disable foreign-key constraint enforcement to prevent problems. */
+    if( nArg!=1 && nArg!=2 ){
+      fprintf(stderr, "Usage: .dump ?LIKE-PATTERN?\n");
+      rc = 1;
+      goto meta_command_exit;
+    }
     fprintf(p->out, "PRAGMA foreign_keys=OFF;\n");
     fprintf(p->out, "BEGIN TRANSACTION;\n");
     p->writableSchema = 0;
@@ -1803,16 +2353,30 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     fprintf(p->out, p->nErr ? "ROLLBACK; -- due to errors\n" : "COMMIT;\n");
   }else
 
-  if( c=='e' && strncmp(azArg[0], "echo", n)==0 && nArg>1 && nArg<3 ){
-    p->echoOn = booleanValue(azArg[1]);
+  if( c=='e' && strncmp(azArg[0], "echo", n)==0 ){
+    if( nArg==2 ){
+      p->echoOn = booleanValue(azArg[1]);
+    }else{
+      fprintf(stderr, "Usage: .echo on|off\n");
+      rc = 1;
+    }
+  }else
+
+  if( c=='e' && strncmp(azArg[0], "eqp", n)==0 ){
+    if( nArg==2 ){
+      p->autoEQP = booleanValue(azArg[1]);
+    }else{
+      fprintf(stderr, "Usage: .eqp on|off\n");
+      rc = 1;
+    }   
   }else
 
   if( c=='e' && strncmp(azArg[0], "exit", n)==0 ){
-    if( nArg>1 && (rc = atoi(azArg[1]))!=0 ) exit(rc);
+    if( nArg>1 && (rc = (int)integerValue(azArg[1]))!=0 ) exit(rc);
     rc = 2;
   }else
 
-  if( c=='e' && strncmp(azArg[0], "explain", n)==0 && nArg<3 ){
+  if( c=='e' && strncmp(azArg[0], "explain", n)==0 ){
     int val = nArg>=2 ? booleanValue(azArg[1]) : 1;
     if(val == 1) {
       if(!p->explainPrev.valid) {
@@ -1830,7 +2394,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
       */
       p->mode = MODE_Explain;
       p->showHeader = 1;
-      memset(p->colWidth,0,ArraySize(p->colWidth));
+      memset(p->colWidth,0,sizeof(p->colWidth));
       p->colWidth[0] = 4;                  /* addr */
       p->colWidth[1] = 13;                 /* opcode */
       p->colWidth[2] = 4;                  /* P1 */
@@ -1847,62 +2411,120 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     }
   }else
 
-  if( c=='h' && (strncmp(azArg[0], "header", n)==0 ||
-                 strncmp(azArg[0], "headers", n)==0) && nArg>1 && nArg<3 ){
-    p->showHeader = booleanValue(azArg[1]);
-  }else
-
-  if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
-    fprintf(stderr,"%s",zHelp);
-    if( HAS_TIMER ){
-      fprintf(stderr,"%s",zTimerHelp);
+  if( c=='h' && strncmp(azArg[0], "headers", n)==0 ){
+    if( nArg==2 ){
+      p->showHeader = booleanValue(azArg[1]);
+    }else{
+      fprintf(stderr, "Usage: .headers on|off\n");
+      rc = 1;
     }
   }else
 
-  if( c=='i' && strncmp(azArg[0], "import", n)==0 && nArg==3 ){
-    char *zTable = azArg[2];    /* Insert data into this table */
-    char *zFile = azArg[1];     /* The file from which to extract data */
+  if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
+    fprintf(p->out, "%s", zHelp);
+  }else
+
+  if( c=='i' && strncmp(azArg[0], "import", n)==0 ){
+    char *zTable;               /* Insert data into this table */
+    char *zFile;                /* Name of file to extra content from */
     sqlite3_stmt *pStmt = NULL; /* A statement */
     int nCol;                   /* Number of columns in the table */
     int nByte;                  /* Number of bytes in an SQL string */
     int i, j;                   /* Loop counters */
+    int needCommit;             /* True to COMMIT or ROLLBACK at end */
     int nSep;                   /* Number of bytes in p->separator[] */
     char *zSql;                 /* An SQL statement */
-    char *zLine;                /* A single line of input from the file */
-    char **azCol;               /* zLine[] broken up into columns */
-    char *zCommit;              /* How to commit changes */   
-    FILE *in;                   /* The input file */
-    int lineno = 0;             /* Line number of input file */
+    CSVReader sCsv;             /* Reader context */
+    int (*xCloser)(FILE*);      /* Procedure to close th3 connection */
 
-    open_db(p);
+    if( nArg!=3 ){
+      fprintf(stderr, "Usage: .import FILE TABLE\n");
+      goto meta_command_exit;
+    }
+    zFile = azArg[1];
+    zTable = azArg[2];
+    seenInterrupt = 0;
+    memset(&sCsv, 0, sizeof(sCsv));
+    open_db(p, 0);
     nSep = strlen30(p->separator);
     if( nSep==0 ){
       fprintf(stderr, "Error: non-null separator required for import\n");
       return 1;
     }
+    if( nSep>1 ){
+      fprintf(stderr, "Error: multi-character separators not allowed"
+                      " for import\n");
+      return 1;
+    }
+    sCsv.zFile = zFile;
+    sCsv.nLine = 1;
+    if( sCsv.zFile[0]=='|' ){
+      sCsv.in = popen(sCsv.zFile+1, "r");
+      sCsv.zFile = "<pipe>";
+      xCloser = pclose;
+    }else{
+      sCsv.in = fopen(sCsv.zFile, "rb");
+      xCloser = fclose;
+    }
+    if( sCsv.in==0 ){
+      fprintf(stderr, "Error: cannot open \"%s\"\n", zFile);
+      return 1;
+    }
+    sCsv.cSeparator = p->separator[0];
     zSql = sqlite3_mprintf("SELECT * FROM %s", zTable);
     if( zSql==0 ){
       fprintf(stderr, "Error: out of memory\n");
+      xCloser(sCsv.in);
       return 1;
     }
     nByte = strlen30(zSql);
-    rc = sqlite3_prepare(p->db, zSql, -1, &pStmt, 0);
+    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
+    csv_append_char(&sCsv, 0);    /* To ensure sCsv.z is allocated */
+    if( rc && sqlite3_strglob("no such table: *", sqlite3_errmsg(db))==0 ){
+      char *zCreate = sqlite3_mprintf("CREATE TABLE %s", zTable);
+      char cSep = '(';
+      while( csv_read_one_field(&sCsv) ){
+        zCreate = sqlite3_mprintf("%z%c\n  \"%s\" TEXT", zCreate, cSep, sCsv.z);
+        cSep = ',';
+        if( sCsv.cTerm!=sCsv.cSeparator ) break;
+      }
+      if( cSep=='(' ){
+        sqlite3_free(zCreate);
+        sqlite3_free(sCsv.z);
+        xCloser(sCsv.in);
+        fprintf(stderr,"%s: empty file\n", sCsv.zFile);
+        return 1;
+      }
+      zCreate = sqlite3_mprintf("%z\n)", zCreate);
+      rc = sqlite3_exec(p->db, zCreate, 0, 0, 0);
+      sqlite3_free(zCreate);
+      if( rc ){
+        fprintf(stderr, "CREATE TABLE %s(...) failed: %s\n", zTable,
+                sqlite3_errmsg(db));
+        sqlite3_free(sCsv.z);
+        xCloser(sCsv.in);
+        return 1;
+      }
+      rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
+    }
     sqlite3_free(zSql);
     if( rc ){
       if (pStmt) sqlite3_finalize(pStmt);
       fprintf(stderr,"Error: %s\n", sqlite3_errmsg(db));
+      xCloser(sCsv.in);
       return 1;
     }
     nCol = sqlite3_column_count(pStmt);
     sqlite3_finalize(pStmt);
     pStmt = 0;
     if( nCol==0 ) return 0; /* no columns, no error */
-    zSql = malloc( nByte + 20 + nCol*2 );
+    zSql = sqlite3_malloc( nByte*2 + 20 + nCol*2 );
     if( zSql==0 ){
       fprintf(stderr, "Error: out of memory\n");
+      xCloser(sCsv.in);
       return 1;
     }
-    sqlite3_snprintf(nByte+20, zSql, "INSERT INTO %s VALUES(?", zTable);
+    sqlite3_snprintf(nByte+20, zSql, "INSERT INTO \"%w\" VALUES(?", zTable);
     j = strlen30(zSql);
     for(i=1; i<nCol; i++){
       zSql[j++] = ',';
@@ -1910,86 +2532,59 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     }
     zSql[j++] = ')';
     zSql[j] = 0;
-    rc = sqlite3_prepare(p->db, zSql, -1, &pStmt, 0);
-    free(zSql);
+    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
+    sqlite3_free(zSql);
     if( rc ){
       fprintf(stderr, "Error: %s\n", sqlite3_errmsg(db));
       if (pStmt) sqlite3_finalize(pStmt);
+      xCloser(sCsv.in);
       return 1;
     }
-    in = fopen(zFile, "rb");
-    if( in==0 ){
-      fprintf(stderr, "Error: cannot open \"%s\"\n", zFile);
-      sqlite3_finalize(pStmt);
-      return 1;
-    }
-    azCol = malloc( sizeof(azCol[0])*(nCol+1) );
-    if( azCol==0 ){
-      fprintf(stderr, "Error: out of memory\n");
-      fclose(in);
-      sqlite3_finalize(pStmt);
-      return 1;
-    }
-    sqlite3_exec(p->db, "BEGIN", 0, 0, 0);
-    zCommit = "COMMIT";
-    while( (zLine = local_getline(0, in, 1))!=0 ){
-      char *z, c;
-      int inQuote = 0;
-      lineno++;
-      azCol[0] = zLine;
-      for(i=0, z=zLine; (c = *z)!=0; z++){
-        if( c=='"' ) inQuote = !inQuote;
-        if( c=='\n' ) lineno++;
-        if( !inQuote && c==p->separator[0] && strncmp(z,p->separator,nSep)==0 ){
-          *z = 0;
-          i++;
-          if( i<nCol ){
-            azCol[i] = &z[nSep];
-            z += nSep-1;
-          }
-        }
-      } /* end for */
-      *z = 0;
-      if( i+1!=nCol ){
-        fprintf(stderr,
-                "Error: %s line %d: expected %d columns of data but found %d\n",
-                zFile, lineno, nCol, i+1);
-        zCommit = "ROLLBACK";
-        free(zLine);
-        rc = 1;
-        break; /* from while */
-      }
+    needCommit = sqlite3_get_autocommit(db);
+    if( needCommit ) sqlite3_exec(db, "BEGIN", 0, 0, 0);
+    do{
+      int startLine = sCsv.nLine;
       for(i=0; i<nCol; i++){
-        if( azCol[i][0]=='"' ){
-          int k;
-          for(z=azCol[i], j=1, k=0; z[j]; j++){
-            if( z[j]=='"' ){ j++; if( z[j]==0 ) break; }
-            z[k++] = z[j];
-          }
-          z[k] = 0;
+        char *z = csv_read_one_field(&sCsv);
+        if( z==0 && i==0 ) break;
+        sqlite3_bind_text(pStmt, i+1, z, -1, SQLITE_TRANSIENT);
+        if( i<nCol-1 && sCsv.cTerm!=sCsv.cSeparator ){
+          fprintf(stderr, "%s:%d: expected %d columns but found %d - "
+                          "filling the rest with NULL\n",
+                          sCsv.zFile, startLine, nCol, i+1);
+          i++;
+          while( i<nCol ){ sqlite3_bind_null(pStmt, i); i++; }
         }
-        sqlite3_bind_text(pStmt, i+1, azCol[i], -1, SQLITE_STATIC);
       }
-      sqlite3_step(pStmt);
-      rc = sqlite3_reset(pStmt);
-      free(zLine);
-      if( rc!=SQLITE_OK ){
-        fprintf(stderr,"Error: %s\n", sqlite3_errmsg(db));
-        zCommit = "ROLLBACK";
-        rc = 1;
-        break; /* from while */
+      if( sCsv.cTerm==sCsv.cSeparator ){
+        do{
+          csv_read_one_field(&sCsv);
+          i++;
+        }while( sCsv.cTerm==sCsv.cSeparator );
+        fprintf(stderr, "%s:%d: expected %d columns but found %d - "
+                        "extras ignored\n",
+                        sCsv.zFile, startLine, nCol, i);
       }
-    } /* end while */
-    free(azCol);
-    fclose(in);
+      if( i>=nCol ){
+        sqlite3_step(pStmt);
+        rc = sqlite3_reset(pStmt);
+        if( rc!=SQLITE_OK ){
+          fprintf(stderr, "%s:%d: INSERT failed: %s\n", sCsv.zFile, startLine,
+                  sqlite3_errmsg(db));
+        }
+      }
+    }while( sCsv.cTerm!=EOF );
+
+    xCloser(sCsv.in);
+    sqlite3_free(sCsv.z);
     sqlite3_finalize(pStmt);
-    sqlite3_exec(p->db, zCommit, 0, 0, 0);
+    if( needCommit ) sqlite3_exec(db, "COMMIT", 0, 0, 0);
   }else
 
-  if( c=='i' && strncmp(azArg[0], "indices", n)==0 && nArg<3 ){
+  if( c=='i' && strncmp(azArg[0], "indices", n)==0 ){
     struct callback_data data;
     char *zErrMsg = 0;
-    open_db(p);
+    open_db(p, 0);
     memcpy(&data, p, sizeof(data));
     data.showHeader = 0;
     data.mode = MODE_List;
@@ -2003,7 +2598,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
         "ORDER BY 1",
         callback, &data, &zErrMsg
       );
-    }else{
+    }else if( nArg==2 ){
       zShellStatic = azArg[1];
       rc = sqlite3_exec(p->db,
         "SELECT name FROM sqlite_master "
@@ -2015,6 +2610,10 @@ static int do_meta_command(char *zLine, struct callback_data *p){
         callback, &data, &zErrMsg
       );
       zShellStatic = 0;
+    }else{
+      fprintf(stderr, "Usage: .indices ?LIKE-PATTERN?\n");
+      rc = 1;
+      goto meta_command_exit;
     }
     if( zErrMsg ){
       fprintf(stderr,"Error: %s\n", zErrMsg);
@@ -2050,12 +2649,17 @@ static int do_meta_command(char *zLine, struct callback_data *p){
 #endif
 
 #ifndef SQLITE_OMIT_LOAD_EXTENSION
-  if( c=='l' && strncmp(azArg[0], "load", n)==0 && nArg>=2 ){
+  if( c=='l' && strncmp(azArg[0], "load", n)==0 ){
     const char *zFile, *zProc;
     char *zErrMsg = 0;
+    if( nArg<2 ){
+      fprintf(stderr, "Usage: .load FILE ?ENTRYPOINT?\n");
+      rc = 1;
+      goto meta_command_exit;
+    }
     zFile = azArg[1];
     zProc = nArg>=3 ? azArg[2] : 0;
-    open_db(p);
+    open_db(p, 0);
     rc = sqlite3_load_extension(p->db, zFile, zProc, &zErrMsg);
     if( rc!=SQLITE_OK ){
       fprintf(stderr, "Error: %s\n", zErrMsg);
@@ -2065,38 +2669,41 @@ static int do_meta_command(char *zLine, struct callback_data *p){
   }else
 #endif
 
-  if( c=='l' && strncmp(azArg[0], "log", n)==0 && nArg>=2 ){
-    const char *zFile = azArg[1];
-    output_file_close(p->pLog);
-    p->pLog = output_file_open(zFile);
+  if( c=='l' && strncmp(azArg[0], "log", n)==0 ){
+    if( nArg!=2 ){
+      fprintf(stderr, "Usage: .log FILENAME\n");
+      rc = 1;
+    }else{
+      const char *zFile = azArg[1];
+      output_file_close(p->pLog);
+      p->pLog = output_file_open(zFile);
+    }
   }else
 
-  if( c=='m' && strncmp(azArg[0], "mode", n)==0 && nArg==2 ){
-    int n2 = strlen30(azArg[1]);
-    if( (n2==4 && strncmp(azArg[1],"line",n2)==0)
-        ||
-        (n2==5 && strncmp(azArg[1],"lines",n2)==0) ){
+  if( c=='m' && strncmp(azArg[0], "mode", n)==0 ){
+    const char *zMode = nArg>=2 ? azArg[1] : "";
+    int n2 = (int)strlen(zMode);
+    int c2 = zMode[0];
+    if( c2=='l' && n2>2 && strncmp(azArg[1],"lines",n2)==0 ){
       p->mode = MODE_Line;
-    }else if( (n2==6 && strncmp(azArg[1],"column",n2)==0)
-              ||
-              (n2==7 && strncmp(azArg[1],"columns",n2)==0) ){
+    }else if( c2=='c' && strncmp(azArg[1],"columns",n2)==0 ){
       p->mode = MODE_Column;
-    }else if( n2==4 && strncmp(azArg[1],"list",n2)==0 ){
+    }else if( c2=='l' && n2>2 && strncmp(azArg[1],"list",n2)==0 ){
       p->mode = MODE_List;
-    }else if( n2==4 && strncmp(azArg[1],"html",n2)==0 ){
+    }else if( c2=='h' && strncmp(azArg[1],"html",n2)==0 ){
       p->mode = MODE_Html;
-    }else if( n2==3 && strncmp(azArg[1],"tcl",n2)==0 ){
+    }else if( c2=='t' && strncmp(azArg[1],"tcl",n2)==0 ){
       p->mode = MODE_Tcl;
       sqlite3_snprintf(sizeof(p->separator), p->separator, " ");
-    }else if( n2==3 && strncmp(azArg[1],"csv",n2)==0 ){
+    }else if( c2=='c' && strncmp(azArg[1],"csv",n2)==0 ){
       p->mode = MODE_Csv;
       sqlite3_snprintf(sizeof(p->separator), p->separator, ",");
-    }else if( n2==4 && strncmp(azArg[1],"tabs",n2)==0 ){
+    }else if( c2=='t' && strncmp(azArg[1],"tabs",n2)==0 ){
       p->mode = MODE_List;
       sqlite3_snprintf(sizeof(p->separator), p->separator, "\t");
-    }else if( n2==6 && strncmp(azArg[1],"insert",n2)==0 ){
+    }else if( c2=='i' && strncmp(azArg[1],"insert",n2)==0 ){
       p->mode = MODE_Insert;
-      set_table_name(p, "table");
+      set_table_name(p, nArg>=3 ? azArg[2] : "table");
     }else {
       fprintf(stderr,"Error: mode should be one of: "
          "column csv html insert line list tabs tcl\n");
@@ -2104,49 +2711,75 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     }
   }else
 
-  if( c=='m' && strncmp(azArg[0], "mode", n)==0 && nArg==3 ){
-    int n2 = strlen30(azArg[1]);
-    if( n2==6 && strncmp(azArg[1],"insert",n2)==0 ){
-      p->mode = MODE_Insert;
-      set_table_name(p, azArg[2]);
-    }else {
-      fprintf(stderr, "Error: invalid arguments: "
-        " \"%s\". Enter \".help\" for help\n", azArg[2]);
+  if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 ){
+    if( nArg==2 ){
+      sqlite3_snprintf(sizeof(p->nullvalue), p->nullvalue,
+                       "%.*s", (int)ArraySize(p->nullvalue)-1, azArg[1]);
+    }else{
+      fprintf(stderr, "Usage: .nullvalue STRING\n");
       rc = 1;
     }
   }else
 
-  if( c=='n' && strncmp(azArg[0], "nullvalue", n)==0 && nArg==2 ) {
-    sqlite3_snprintf(sizeof(p->nullvalue), p->nullvalue,
-                     "%.*s", (int)ArraySize(p->nullvalue)-1, azArg[1]);
+  if( c=='o' && strncmp(azArg[0], "open", n)==0 && n>=2 ){
+    sqlite3 *savedDb = p->db;
+    const char *zSavedFilename = p->zDbFilename;
+    char *zNewFilename = 0;
+    p->db = 0;
+    if( nArg>=2 ){
+      p->zDbFilename = zNewFilename = sqlite3_mprintf("%s", azArg[1]);
+    }
+    open_db(p, 1);
+    if( p->db!=0 ){
+      sqlite3_close(savedDb);
+      sqlite3_free(p->zFreeOnClose);
+      p->zFreeOnClose = zNewFilename;
+    }else{
+      sqlite3_free(zNewFilename);
+      p->db = savedDb;
+      p->zDbFilename = zSavedFilename;
+    }
   }else
 
-  if( c=='o' && strncmp(azArg[0], "output", n)==0 && nArg==2 ){
-    if( p->outfile[0]=='|' ){
-      pclose(p->out);
-    }else{
-      output_file_close(p->out);
+  if( c=='o'
+   && (strncmp(azArg[0], "output", n)==0 || strncmp(azArg[0], "once", n)==0)
+  ){
+    const char *zFile = nArg>=2 ? azArg[1] : "stdout";
+    if( nArg>2 ){
+      fprintf(stderr, "Usage: .%s FILE\n", azArg[0]);
+      rc = 1;
+      goto meta_command_exit;
     }
-    p->outfile[0] = 0;
-    if( azArg[1][0]=='|' ){
-      p->out = popen(&azArg[1][1], "w");
+    if( n>1 && strncmp(azArg[0], "once", n)==0 ){
+      if( nArg<2 ){
+        fprintf(stderr, "Usage: .once FILE\n");
+        rc = 1;
+        goto meta_command_exit;
+      }
+      p->outCount = 2;
+    }else{
+      p->outCount = 0;
+    }
+    output_reset(p);
+    if( zFile[0]=='|' ){
+      p->out = popen(zFile + 1, "w");
       if( p->out==0 ){
-        fprintf(stderr,"Error: cannot open pipe \"%s\"\n", &azArg[1][1]);
+        fprintf(stderr,"Error: cannot open pipe \"%s\"\n", zFile + 1);
         p->out = stdout;
         rc = 1;
       }else{
-        sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", azArg[1]);
+        sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
       }
     }else{
-      p->out = output_file_open(azArg[1]);
+      p->out = output_file_open(zFile);
       if( p->out==0 ){
-        if( strcmp(azArg[1],"off")!=0 ){
-          fprintf(stderr,"Error: cannot write to \"%s\"\n", azArg[1]);
+        if( strcmp(zFile,"off")!=0 ){
+          fprintf(stderr,"Error: cannot write to \"%s\"\n", zFile);
         }
         p->out = stdout;
         rc = 1;
       } else {
-        sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", azArg[1]);
+        sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
       }
     }
   }else
@@ -2160,7 +2793,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     fprintf(p->out, "\n");
   }else
 
-  if( c=='p' && strncmp(azArg[0], "prompt", n)==0 && (nArg==2 || nArg==3)){
+  if( c=='p' && strncmp(azArg[0], "prompt", n)==0 ){
     if( nArg >= 2) {
       strncpy(mainPrompt,azArg[1],(int)ArraySize(mainPrompt)-1);
     }
@@ -2169,12 +2802,18 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     }
   }else
 
-  if( c=='q' && strncmp(azArg[0], "quit", n)==0 && nArg==1 ){
+  if( c=='q' && strncmp(azArg[0], "quit", n)==0 ){
     rc = 2;
   }else
 
-  if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 && nArg==2 ){
-    FILE *alt = fopen(azArg[1], "rb");
+  if( c=='r' && n>=3 && strncmp(azArg[0], "read", n)==0 ){
+    FILE *alt;
+    if( nArg!=2 ){
+      fprintf(stderr, "Usage: .read FILE\n");
+      rc = 1;
+      goto meta_command_exit;
+    }
+    alt = fopen(azArg[1], "rb");
     if( alt==0 ){
       fprintf(stderr,"Error: cannot open \"%s\"\n", azArg[1]);
       rc = 1;
@@ -2184,7 +2823,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     }
   }else
 
-  if( c=='r' && n>=3 && strncmp(azArg[0], "restore", n)==0 && nArg>1 && nArg<4){
+  if( c=='r' && n>=3 && strncmp(azArg[0], "restore", n)==0 ){
     const char *zSrcFile;
     const char *zDb;
     sqlite3 *pSrc;
@@ -2194,9 +2833,13 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     if( nArg==2 ){
       zSrcFile = azArg[1];
       zDb = "main";
-    }else{
+    }else if( nArg==3 ){
       zSrcFile = azArg[2];
       zDb = azArg[1];
+    }else{
+      fprintf(stderr, "Usage: .restore ?DB? FILE\n");
+      rc = 1;
+      goto meta_command_exit;
     }
     rc = sqlite3_open(zSrcFile, &pSrc);
     if( rc!=SQLITE_OK ){
@@ -2204,7 +2847,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
       sqlite3_close(pSrc);
       return 1;
     }
-    open_db(p);
+    open_db(p, 0);
     pBackup = sqlite3_backup_init(p->db, zDb, pSrc, "main");
     if( pBackup==0 ){
       fprintf(stderr, "Error: %s\n", sqlite3_errmsg(p->db));
@@ -2231,14 +2874,14 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     sqlite3_close(pSrc);
   }else
 
-  if( c=='s' && strncmp(azArg[0], "schema", n)==0 && nArg<3 ){
+  if( c=='s' && strncmp(azArg[0], "schema", n)==0 ){
     struct callback_data data;
     char *zErrMsg = 0;
-    open_db(p);
+    open_db(p, 0);
     memcpy(&data, p, sizeof(data));
     data.showHeader = 0;
     data.mode = MODE_Semi;
-    if( nArg>1 ){
+    if( nArg==2 ){
       int i;
       for(i=0; azArg[1][i]; i++) azArg[1][i] = ToLower(azArg[1][i]);
       if( strcmp(azArg[1],"sqlite_master")==0 ){
@@ -2282,7 +2925,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
           callback, &data, &zErrMsg);
         zShellStatic = 0;
       }
-    }else{
+    }else if( nArg==1 ){
       rc = sqlite3_exec(p->db,
          "SELECT sql FROM "
          "  (SELECT sql sql, type type, tbl_name tbl_name, name name, rowid x"
@@ -2292,6 +2935,10 @@ static int do_meta_command(char *zLine, struct callback_data *p){
          "ORDER BY rowid",
          callback, &data, &zErrMsg
       );
+    }else{
+      fprintf(stderr, "Usage: .schema ?LIKE-PATTERN?\n");
+      rc = 1;
+      goto meta_command_exit;
     }
     if( zErrMsg ){
       fprintf(stderr,"Error: %s\n", zErrMsg);
@@ -2305,14 +2952,67 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     }
   }else
 
-  if( c=='s' && strncmp(azArg[0], "separator", n)==0 && nArg==2 ){
-    sqlite3_snprintf(sizeof(p->separator), p->separator,
-                     "%.*s", (int)sizeof(p->separator)-1, azArg[1]);
+#ifdef SQLITE_DEBUG
+  /* Undocumented commands for internal testing.  Subject to change
+  ** without notice. */
+  if( c=='s' && n>=10 && strncmp(azArg[0], "selftest-", 9)==0 ){
+    if( strncmp(azArg[0]+9, "boolean", n-9)==0 ){
+      int i, v;
+      for(i=1; i<nArg; i++){
+        v = booleanValue(azArg[i]);
+        fprintf(p->out, "%s: %d 0x%x\n", azArg[i], v, v);
+      }
+    }
+    if( strncmp(azArg[0]+9, "integer", n-9)==0 ){
+      int i; sqlite3_int64 v;
+      for(i=1; i<nArg; i++){
+        char zBuf[200];
+        v = integerValue(azArg[i]);
+        sqlite3_snprintf(sizeof(zBuf),zBuf,"%s: %lld 0x%llx\n", azArg[i],v,v);
+        fprintf(p->out, "%s", zBuf);
+      }
+    }
+  }else
+#endif
+
+  if( c=='s' && strncmp(azArg[0], "separator", n)==0 ){
+    if( nArg==2 ){
+      sqlite3_snprintf(sizeof(p->separator), p->separator,
+                       "%.*s", (int)sizeof(p->separator)-1, azArg[1]);
+    }else{
+      fprintf(stderr, "Usage: .separator STRING\n");
+      rc = 1;
+    }
   }else
 
-  if( c=='s' && strncmp(azArg[0], "show", n)==0 && nArg==1 ){
+  if( c=='s'
+   && (strncmp(azArg[0], "shell", n)==0 || strncmp(azArg[0],"system",n)==0)
+  ){
+    char *zCmd;
     int i;
+    if( nArg<2 ){
+      fprintf(stderr, "Usage: .system COMMAND\n");
+      rc = 1;
+      goto meta_command_exit;
+    }
+    zCmd = sqlite3_mprintf(strchr(azArg[1],' ')==0?"%s":"\"%s\"", azArg[1]);
+    for(i=2; i<nArg; i++){
+      zCmd = sqlite3_mprintf(strchr(azArg[i],' ')==0?"%z %s":"%z \"%s\"",
+                             zCmd, azArg[i]);
+    }
+    (void)system(zCmd);
+    sqlite3_free(zCmd);
+  }else
+
+  if( c=='s' && strncmp(azArg[0], "show", n)==0 ){
+    int i;
+    if( nArg!=1 ){
+      fprintf(stderr, "Usage: .show\n");
+      rc = 1;
+      goto meta_command_exit;
+    }
     fprintf(p->out,"%9.9s: %s\n","echo", p->echoOn ? "on" : "off");
+    fprintf(p->out,"%9.9s: %s\n","eqp", p->autoEQP ? "on" : "off");
     fprintf(p->out,"%9.9s: %s\n","explain", p->explainPrev.valid ? "on" :"off");
     fprintf(p->out,"%9.9s: %s\n","headers", p->showHeader ? "on" : "off");
     fprintf(p->out,"%9.9s: %s\n","mode", modeDescr[p->mode]);
@@ -2332,17 +3032,22 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     fprintf(p->out,"\n");
   }else
 
-  if( c=='s' && strncmp(azArg[0], "stats", n)==0 && nArg>1 && nArg<3 ){
-    p->statsOn = booleanValue(azArg[1]);
+  if( c=='s' && strncmp(azArg[0], "stats", n)==0 ){
+    if( nArg==2 ){
+      p->statsOn = booleanValue(azArg[1]);
+    }else{
+      fprintf(stderr, "Usage: .stats on|off\n");
+      rc = 1;
+    }
   }else
 
-  if( c=='t' && n>1 && strncmp(azArg[0], "tables", n)==0 && nArg<3 ){
+  if( c=='t' && n>1 && strncmp(azArg[0], "tables", n)==0 ){
     sqlite3_stmt *pStmt;
     char **azResult;
     int nRow, nAlloc;
     char *zSql = 0;
     int ii;
-    open_db(p);
+    open_db(p, 0);
     rc = sqlite3_prepare_v2(p->db, "PRAGMA database_list", -1, &pStmt, 0);
     if( rc ) return rc;
     zSql = sqlite3_mprintf(
@@ -2438,11 +3143,12 @@ static int do_meta_command(char *zLine, struct callback_data *p){
       { "optimizations",         SQLITE_TESTCTRL_OPTIMIZATIONS          },
       { "iskeyword",             SQLITE_TESTCTRL_ISKEYWORD              },
       { "scratchmalloc",         SQLITE_TESTCTRL_SCRATCHMALLOC          },
+      { "byteorder",             SQLITE_TESTCTRL_BYTEORDER              },
     };
     int testctrl = -1;
     int rc = 0;
     int i, n;
-    open_db(p);
+    open_db(p, 0);
 
     /* convert testctrl text option to value. allow any unique prefix
     ** of the option name, or a numerical value. */
@@ -2458,7 +3164,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
         }
       }
     }
-    if( testctrl<0 ) testctrl = atoi(azArg[1]);
+    if( testctrl<0 ) testctrl = (int)integerValue(azArg[1]);
     if( (testctrl<SQLITE_TESTCTRL_FIRST) || (testctrl>SQLITE_TESTCTRL_LAST) ){
       fprintf(stderr,"Error: invalid testctrl option: %s\n", azArg[1]);
     }else{
@@ -2478,9 +3184,10 @@ static int do_meta_command(char *zLine, struct callback_data *p){
           break;
 
         /* sqlite3_test_control(int) */
-        case SQLITE_TESTCTRL_PRNG_SAVE:           
-        case SQLITE_TESTCTRL_PRNG_RESTORE:        
+        case SQLITE_TESTCTRL_PRNG_SAVE:
+        case SQLITE_TESTCTRL_PRNG_RESTORE:
         case SQLITE_TESTCTRL_PRNG_RESET:
+        case SQLITE_TESTCTRL_BYTEORDER:
           if( nArg==2 ){
             rc = sqlite3_test_control(testctrl);
             fprintf(p->out, "%d (0x%08x)\n", rc, rc);
@@ -2492,7 +3199,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
         /* sqlite3_test_control(int, uint) */
         case SQLITE_TESTCTRL_PENDING_BYTE:        
           if( nArg==3 ){
-            unsigned int opt = (unsigned int)integerValue(azArg[2]);        
+            unsigned int opt = (unsigned int)integerValue(azArg[2]);
             rc = sqlite3_test_control(testctrl, opt);
             fprintf(p->out, "%d (0x%08x)\n", rc, rc);
           } else {
@@ -2505,7 +3212,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
         case SQLITE_TESTCTRL_ASSERT:              
         case SQLITE_TESTCTRL_ALWAYS:              
           if( nArg==3 ){
-            int opt = atoi(azArg[2]);        
+            int opt = booleanValue(azArg[2]);        
             rc = sqlite3_test_control(testctrl, opt);
             fprintf(p->out, "%d (0x%08x)\n", rc, rc);
           } else {
@@ -2540,20 +3247,32 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     }
   }else
 
-  if( c=='t' && n>4 && strncmp(azArg[0], "timeout", n)==0 && nArg==2 ){
-    open_db(p);
-    sqlite3_busy_timeout(p->db, atoi(azArg[1]));
+  if( c=='t' && n>4 && strncmp(azArg[0], "timeout", n)==0 ){
+    open_db(p, 0);
+    sqlite3_busy_timeout(p->db, nArg>=2 ? (int)integerValue(azArg[1]) : 0);
   }else
     
-  if( HAS_TIMER && c=='t' && n>=5 && strncmp(azArg[0], "timer", n)==0
-   && nArg==2
-  ){
-    enableTimer = booleanValue(azArg[1]);
+  if( c=='t' && n>=5 && strncmp(azArg[0], "timer", n)==0 ){
+    if( nArg==2 ){
+      enableTimer = booleanValue(azArg[1]);
+      if( enableTimer && !HAS_TIMER ){
+        fprintf(stderr, "Error: timer not available on this system.\n");
+        enableTimer = 0;
+      }
+    }else{
+      fprintf(stderr, "Usage: .timer on|off\n");
+      rc = 1;
+    }
   }else
   
-  if( c=='t' && strncmp(azArg[0], "trace", n)==0 && nArg>1 ){
-    open_db(p);
+  if( c=='t' && strncmp(azArg[0], "trace", n)==0 ){
+    open_db(p, 0);
     output_file_close(p->traceOut);
+    if( nArg!=2 ){
+      fprintf(stderr, "Usage: .trace FILE|off\n");
+      rc = 1;
+      goto meta_command_exit;
+    }
     p->traceOut = output_file_open(azArg[1]);
 #if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
     if( p->traceOut==0 ){
@@ -2584,15 +3303,15 @@ static int do_meta_command(char *zLine, struct callback_data *p){
 #if defined(SQLITE_DEBUG) && defined(SQLITE_ENABLE_WHERETRACE)
   if( c=='w' && strncmp(azArg[0], "wheretrace", n)==0 ){
     extern int sqlite3WhereTrace;
-    sqlite3WhereTrace = booleanValue(azArg[1]);
+    sqlite3WhereTrace = nArg>=2 ? booleanValue(azArg[1]) : 0xff;
   }else
 #endif
 
-  if( c=='w' && strncmp(azArg[0], "width", n)==0 && nArg>1 ){
+  if( c=='w' && strncmp(azArg[0], "width", n)==0 ){
     int j;
     assert( nArg<=ArraySize(azArg) );
     for(j=1; j<nArg && j<ArraySize(p->colWidth); j++){
-      p->colWidth[j-1] = atoi(azArg[j]);
+      p->colWidth[j-1] = (int)integerValue(azArg[j]);
     }
   }else
 
@@ -2602,6 +3321,11 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     rc = 1;
   }
 
+meta_command_exit:
+  if( p->outCount ){
+    p->outCount--;
+    if( p->outCount==0 ) output_reset(p);
+  }
   return rc;
 }
 
@@ -2609,7 +3333,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
 ** Return TRUE if a semicolon occurs anywhere in the first N characters
 ** of string z[].
 */
-static int _contains_semicolon(const char *z, int N){
+static int line_contains_semicolon(const char *z, int N){
   int i;
   for(i=0; i<N; i++){  if( z[i]==';' ) return 1; }
   return 0;
@@ -2644,7 +3368,7 @@ static int _all_whitespace(const char *z){
 ** than a semi-colon.  The SQL Server style "go" command is understood
 ** as is the Oracle "/".
 */
-static int _is_command_terminator(const char *zLine){
+static int line_is_command_terminator(const char *zLine){
   while( IsSpace(zLine[0]) ){ zLine++; };
   if( zLine[0]=='/' && _all_whitespace(&zLine[1]) ){
     return 1;  /* Oracle */
@@ -2660,7 +3384,7 @@ static int _is_command_terminator(const char *zLine){
 ** Return true if zSql is a complete SQL statement.  Return false if it
 ** ends in the middle of a string literal or C-style comment.
 */
-static int _is_complete(char *zSql, int nSql){
+static int line_is_complete(char *zSql, int nSql){
   int rc;
   if( zSql==0 ) return 1;
   zSql[nSql] = ';';
@@ -2680,20 +3404,21 @@ static int _is_complete(char *zSql, int nSql){
 ** Return the number of errors.
 */
 static int process_input(struct callback_data *p, FILE *in){
-  char *zLine = 0;
-  char *zSql = 0;
-  int nSql = 0;
-  int nSqlPrior = 0;
-  char *zErrMsg;
-  int rc;
-  int errCnt = 0;
-  int lineno = 0;
-  int startline = 0;
+  char *zLine = 0;          /* A single input line */
+  char *zSql = 0;           /* Accumulated SQL text */
+  int nLine;                /* Length of current line */
+  int nSql = 0;             /* Bytes of zSql[] used */
+  int nAlloc = 0;           /* Allocated zSql[] space */
+  int nSqlPrior = 0;        /* Bytes of zSql[] used by prior line */
+  char *zErrMsg;            /* Error message returned */
+  int rc;                   /* Error code */
+  int errCnt = 0;           /* Number of errors seen */
+  int lineno = 0;           /* Current line number */
+  int startline = 0;        /* Line number for start of current input */
 
   while( errCnt==0 || !bail_on_error || (in==0 && stdin_is_interactive) ){
     fflush(p->out);
-    free(zLine);
-    zLine = one_input_line(zSql, in);
+    zLine = one_input_line(in, zLine, nSql>0);
     if( zLine==0 ){
       /* End of input */
       if( stdin_is_interactive ) printf("\n");
@@ -2704,7 +3429,10 @@ static int process_input(struct callback_data *p, FILE *in){
       seenInterrupt = 0;
     }
     lineno++;
-    if( (zSql==0 || zSql[0]==0) && _all_whitespace(zLine) ) continue;
+    if( nSql==0 && _all_whitespace(zLine) ){
+      if( p->echoOn ) printf("%s\n", zLine);
+      continue;
+    }
     if( zLine && zLine[0]=='.' && nSql==0 ){
       if( p->echoOn ) printf("%s\n", zLine);
       rc = do_meta_command(zLine, p);
@@ -2715,38 +3443,35 @@ static int process_input(struct callback_data *p, FILE *in){
       }
       continue;
     }
-    if( _is_command_terminator(zLine) && _is_complete(zSql, nSql) ){
+    if( line_is_command_terminator(zLine) && line_is_complete(zSql, nSql) ){
       memcpy(zLine,";",2);
     }
-    nSqlPrior = nSql;
-    if( zSql==0 ){
-      int i;
-      for(i=0; zLine[i] && IsSpace(zLine[i]); i++){}
-      if( zLine[i]!=0 ){
-        nSql = strlen30(zLine);
-        zSql = malloc( nSql+3 );
-        if( zSql==0 ){
-          fprintf(stderr, "Error: out of memory\n");
-          exit(1);
-        }
-        memcpy(zSql, zLine, nSql+1);
-        startline = lineno;
-      }
-    }else{
-      int len = strlen30(zLine);
-      zSql = realloc( zSql, nSql + len + 4 );
+    nLine = strlen30(zLine);
+    if( nSql+nLine+2>=nAlloc ){
+      nAlloc = nSql+nLine+100;
+      zSql = realloc(zSql, nAlloc);
       if( zSql==0 ){
-        fprintf(stderr,"Error: out of memory\n");
+        fprintf(stderr, "Error: out of memory\n");
         exit(1);
       }
-      zSql[nSql++] = '\n';
-      memcpy(&zSql[nSql], zLine, len+1);
-      nSql += len;
     }
-    if( zSql && _contains_semicolon(&zSql[nSqlPrior], nSql-nSqlPrior)
+    nSqlPrior = nSql;
+    if( nSql==0 ){
+      int i;
+      for(i=0; zLine[i] && IsSpace(zLine[i]); i++){}
+      assert( nAlloc>0 && zSql!=0 );
+      memcpy(zSql, zLine+i, nLine+1-i);
+      startline = lineno;
+      nSql = nLine-i;
+    }else{
+      zSql[nSql++] = '\n';
+      memcpy(zSql+nSql, zLine, nLine+1);
+      nSql += nLine;
+    }
+    if( nSql && line_contains_semicolon(&zSql[nSqlPrior], nSql-nSqlPrior)
                 && sqlite3_complete(zSql) ){
       p->cnt = 0;
-      open_db(p);
+      open_db(p, 0);
       BEGIN_TIMER;
       rc = shell_exec(p->db, zSql, shell_callback, p, &zErrMsg);
       END_TIMER;
@@ -2767,16 +3492,17 @@ static int process_input(struct callback_data *p, FILE *in){
         }
         errCnt++;
       }
-      free(zSql);
-      zSql = 0;
       nSql = 0;
-    }else if( zSql && _all_whitespace(zSql) ){
-      free(zSql);
-      zSql = 0;
+      if( p->outCount ){
+        output_reset(p);
+        p->outCount = 0;
+      }
+    }else if( nSql && _all_whitespace(zSql) ){
+      if( p->echoOn ) printf("%s\n", zSql);
       nSql = 0;
     }
   }
-  if( zSql ){
+  if( nSql ){
     if( !_all_whitespace(zSql) ){
       fprintf(stderr, "Error: incomplete SQL: %s\n", zSql);
     }
@@ -2950,6 +3676,26 @@ static void main_init(struct callback_data *data) {
   sqlite3_config(SQLITE_CONFIG_SINGLETHREAD);
 }
 
+/*
+** Output text to the console in a font that attracts extra attention.
+*/
+#ifdef _WIN32
+static void printBold(const char *zText){
+  HANDLE out = GetStdHandle(STD_OUTPUT_HANDLE);
+  CONSOLE_SCREEN_BUFFER_INFO defaultScreenInfo;
+  GetConsoleScreenBufferInfo(out, &defaultScreenInfo);
+  SetConsoleTextAttribute(out,
+         FOREGROUND_RED|FOREGROUND_INTENSITY
+  );
+  printf("%s", zText);
+  SetConsoleTextAttribute(out, defaultScreenInfo.wAttributes);
+}
+#else
+static void printBold(const char *zText){
+  printf("\033[1m%s\033[0m", zText);
+}
+#endif
+
 /*
 ** Get the argument to an --option.  Throw an error and die if no argument
 ** is available.
@@ -2970,12 +3716,15 @@ int main(int argc, char **argv){
   char *zFirstCmd = 0;
   int i;
   int rc = 0;
+  int warnInmemoryDb = 0;
 
+#if USE_SYSTEM_SQLITE+0!=1
   if( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)!=0 ){
     fprintf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
             sqlite3_sourceid(), SQLITE_SOURCE_ID);
     exit(1);
   }
+#endif
   Argv0 = argv[0];
   main_init(&data);
   stdin_is_interactive = isatty(0);
@@ -3024,7 +3773,6 @@ int main(int argc, char **argv){
       stdin_is_interactive = 0;
     }else if( strcmp(z,"-heap")==0 ){
 #if defined(SQLITE_ENABLE_MEMSYS3) || defined(SQLITE_ENABLE_MEMSYS5)
-      int j, c;
       const char *zSize;
       sqlite3_int64 szHeap;
 
@@ -3065,9 +3813,15 @@ int main(int argc, char **argv){
   if( data.zDbFilename==0 ){
 #ifndef SQLITE_OMIT_MEMORYDB
     data.zDbFilename = ":memory:";
+    warnInmemoryDb = argc==1;
 #else
     fprintf(stderr,"%s: Error: no database filename specified\n", Argv0);
     return 1;
+#endif
+#ifdef SQLITE_SHELL_DBNAME_PROC
+    { extern void SQLITE_SHELL_DBNAME_PROC(const char**);
+      SQLITE_SHELL_DBNAME_PROC(&data.zDbFilename);
+      warnInmemoryDb = 0; }
 #endif
   }
   data.out = stdout;
@@ -3078,7 +3832,7 @@ int main(int argc, char **argv){
   ** to the sqlite command-line tool.
   */
   if( access(data.zDbFilename, 0)==0 ){
-    open_db(&data);
+    open_db(&data, 0);
   }
 
   /* Process the initialization file if there is one.  If no -init option
@@ -3124,6 +3878,8 @@ int main(int argc, char **argv){
       data.showHeader = 0;
     }else if( strcmp(z,"-echo")==0 ){
       data.echoOn = 1;
+    }else if( strcmp(z,"-eqp")==0 ){
+      data.autoEQP = 1;
     }else if( strcmp(z,"-stats")==0 ){
       data.statsOn = 1;
     }else if( strcmp(z,"-bail")==0 ){
@@ -3158,7 +3914,7 @@ int main(int argc, char **argv){
         rc = do_meta_command(z, &data);
         if( rc && bail_on_error ) return rc==2 ? 0 : rc;
       }else{
-        open_db(&data);
+        open_db(&data, 0);
         rc = shell_exec(data.db, z, shell_callback, &data, &zErrMsg);
         if( zErrMsg!=0 ){
           fprintf(stderr,"Error: %s\n", zErrMsg);
@@ -3182,7 +3938,7 @@ int main(int argc, char **argv){
       rc = do_meta_command(zFirstCmd, &data);
       if( rc==2 ) rc = 0;
     }else{
-      open_db(&data);
+      open_db(&data, 0);
       rc = shell_exec(data.db, zFirstCmd, shell_callback, &data, &zErrMsg);
       if( zErrMsg!=0 ){
         fprintf(stderr,"Error: %s\n", zErrMsg);
@@ -3201,10 +3957,15 @@ int main(int argc, char **argv){
       int nHistory;
       printf(
         "SQLite version %s %.19s\n" /*extra-version-info*/
-        "Enter \".help\" for instructions\n"
-        "Enter SQL statements terminated with a \";\"\n",
+        "Enter \".help\" for usage hints.\n",
         sqlite3_libversion(), sqlite3_sourceid()
       );
+      if( warnInmemoryDb ){
+        printf("Connected to a ");
+        printBold("transient in-memory database");
+        printf(".\nUse \".open FILENAME\" to reopen on a "
+               "persistent database.\n");
+      }
       zHome = find_home_dir();
       if( zHome ){
         nHistory = strlen30(zHome) + 20;
@@ -3212,7 +3973,7 @@ int main(int argc, char **argv){
           sqlite3_snprintf(nHistory, zHistory,"%s/.sqlite_history", zHome);
         }
       }
-#if defined(HAVE_READLINE) && HAVE_READLINE==1
+#if defined(HAVE_READLINE)
       if( zHistory ) read_history(zHistory);
 #endif
       rc = process_input(&data, 0);
@@ -3229,5 +3990,6 @@ int main(int argc, char **argv){
   if( data.db ){
     sqlite3_close(data.db);
   }
+  sqlite3_free(data.zFreeOnClose); 
   return rc;
 }
diff --git a/contrib/sqlite3/sqlite3.1 b/contrib/sqlite3/sqlite3.1
index 785995bf60e3..02df7f44c752 100644
--- a/contrib/sqlite3/sqlite3.1
+++ b/contrib/sqlite3/sqlite3.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH SQLITE3 1 "Mon Apr 15 23:49:17 2002"
+.TH SQLITE3 1 "Mon Jan 31 11:14:00 2014"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -49,7 +49,7 @@ a table named "memos" and insert a couple of records into that table:
 $ 
 .B sqlite3 mydata.db
 .br
-SQLite version 3.1.3
+SQLite version 3.8.3
 .br
 Enter ".help" for instructions
 .br
@@ -108,15 +108,24 @@ sqlite>
 .B .help
 .nf
 .cc |
+.backup ?DB? FILE      Backup DB (default "main") to FILE
+.bail ON|OFF           Stop after hitting an error.  Default OFF
 .databases             List names and files of attached databases
 .dump ?TABLE? ...      Dump the database in an SQL text format
+                         If TABLE specified, only dump tables matching
+                         LIKE pattern TABLE.
 .echo ON|OFF           Turn command echo on or off
 .exit                  Exit this program
-.explain ON|OFF        Turn output mode suitable for EXPLAIN on or off.
+.explain ?ON|OFF?      Turn output mode suitable for EXPLAIN on or off.
+                         With no args, it turns EXPLAIN on.
 .header(s) ON|OFF      Turn display of headers on or off
 .help                  Show this message
 .import FILE TABLE     Import data from FILE into TABLE
-.indices TABLE         Show names of all indices on TABLE
+.indices ?TABLE?       Show names of all indices
+                         If TABLE specified, only show indices for tables
+                         matching LIKE pattern TABLE.
+.load FILE ?ENTRY?     Load an extension library
+.log FILE|off          Turn logging on or off.  FILE can be stderr/stdout
 .mode MODE ?TABLE?     Set output mode where MODE is one of:
                          csv      Comma-separated values
                          column   Left-aligned columns.  (See .width)
@@ -126,46 +135,76 @@ sqlite>
                          list     Values delimited by .separator string
                          tabs     Tab-separated values
                          tcl      TCL list elements
-.nullvalue STRING      Print STRING in place of NULL values
+.nullvalue STRING      Use STRING in place of NULL values
+.open ?FILENAME?       Close existing database and reopen FILENAME
 .output FILENAME       Send output to FILENAME
 .output stdout         Send output to the screen
+.print STRING...       Print literal STRING
 .prompt MAIN CONTINUE  Replace the standard prompts
 .quit                  Exit this program
 .read FILENAME         Execute SQL in FILENAME
+.restore ?DB? FILE     Restore content of DB (default "main") from FILE
 .schema ?TABLE?        Show the CREATE statements
+                         If TABLE specified, only show tables matching
+                         LIKE pattern TABLE.
 .separator STRING      Change separator used by output mode and .import
 .show                  Show the current values for various settings
-.tables ?PATTERN?      List names of tables matching a LIKE pattern
+.stats ON|OFF          Turn stats on or off
+.tables ?TABLE?        List names of tables
+                         If TABLE specified, only list tables matching
+                         LIKE pattern TABLE.
 .timeout MS            Try opening locked tables for MS milliseconds
-.width NUM NUM ...     Set column widths for "column" mode
+.trace FILE|off        Output each SQL statement as it is run
+.vfsname ?AUX?         Print the name of the VFS stack
+.width NUM1 NUM2 ...   Set column widths for "column" mode
+.timer ON|OFF          Turn the CPU timer measurement on or off
 sqlite>
 |cc .
 .sp
 .fi
-
 .SH OPTIONS
 .B sqlite3
 has the following options:
 .TP
-.BI \-init\ file
-Read and execute commands from
-.I file
-, which can contain a mix of SQL statements and meta-commands.
+.B \-bail
+Stop after hitting an error.
 .TP
-.B \-echo
-Print commands before execution.
-.TP
-.B \-[no]header
-Turn headers on or off.
+.B \-batch
+Force batch I/O.
 .TP
 .B \-column
 Query results will be displayed in a table like form, using
 whitespace characters to separate the columns and align the
 output.
 .TP
+.BI \-cmd\  command
+run
+.I command
+before reading stdin
+.TP
+.B \-csv
+Set output mode to CSV (comma separated values).
+.TP
+.B \-echo
+Print commands before execution.
+.TP
+.BI \-init\  file
+Read and execute commands from
+.I file
+, which can contain a mix of SQL statements and meta-commands.
+.TP
+.B \-[no]header
+Turn headers on or off.
+.TP
+.B \-help
+Show help on options and exit.
+.TP
 .B \-html
 Query results will be output as simple HTML tables.
 .TP
+.B \-interactive
+Force interactive I/O.
+.TP
 .B \-line
 Query results will be displayed with one value per line, rows
 separated by a blank line.  Designed to be easily parsed by
@@ -175,18 +214,28 @@ scripts or other programs
 Query results will be displayed with the separator (|, by default)
 character between each field value.  The default.
 .TP
-.BI \-separator\  separator
-Set output field separator.  Default is '|'.
+.BI \-mmap\  N
+Set default mmap size to
+.I N
+\.
 .TP
 .BI \-nullvalue\  string
 Set string used to represent NULL values.  Default is ''
 (empty string).
 .TP
+.BI \-separator\  separator
+Set output field separator.  Default is '|'.
+.TP
+.B \-stats
+Print memory stats before each finalize.
+.TP
 .B \-version
 Show SQLite version.
 .TP
-.B \-help
-Show help on options and exit.
+.BI \-vfs\  name
+Use
+.I name
+as the default VFS.
 
 
 .SH INIT FILE
@@ -222,8 +271,9 @@ o All other command line options are processed.
 .SH SEE ALSO
 http://www.sqlite.org/
 .br
-The sqlite-doc package
+The sqlite3-doc package.
 .SH AUTHOR
 This manual page was originally written by Andreas Rottmann
 <rotty@debian.org>, for the Debian GNU/Linux system (but may be used
-by others).   It was subsequently revised by Bill Bumgarner <bbum@mac.com>.
+by others). It was subsequently revised by Bill Bumgarner <bbum@mac.com> and
+further updated by Laszlo Boszormenyi <gcs@debian.hu> .
diff --git a/contrib/sqlite3/sqlite3.c b/contrib/sqlite3/sqlite3.c
index deef4608994d..9228d249c8ba 100644
--- a/contrib/sqlite3/sqlite3.c
+++ b/contrib/sqlite3/sqlite3.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 ** This file is an amalgamation of many separate C source files from SQLite
-** version 3.7.17.  By combining all the individual C code files into this 
+** version 3.8.5.  By combining all the individual C code files into this 
 ** single large file, the entire code can be compiled as a single translation
 ** unit.  This allows many compilers to do optimizations that would not be
 ** possible if the files were compiled separately.  Performance improvements
@@ -60,6 +60,11 @@
 ** in Red Hat 6.0, so the code won't work.  Hence, for maximum binary
 ** portability you should omit LFS.
 **
+** The previous paragraph was written in 2005.  (This paragraph is written
+** on 2008-11-28.) These days, all Linux kernels support large files, so
+** you should probably leave LFS enabled.  But some embedded platforms might
+** lack LFS in which case the SQLITE_DISABLE_LFS macro might still be useful.
+**
 ** Similar is true for Mac OS X.  LFS is only supported on Mac OS X 9 and later.
 */
 #ifndef SQLITE_DISABLE_LFS
@@ -71,502 +76,41 @@
 #endif
 
 /*
-** Include the configuration header output by 'configure' if we're using the
-** autoconf-based build
+** For MinGW, check to see if we can include the header file containing its
+** version information, among other things.  Normally, this internal MinGW
+** header file would [only] be included automatically by other MinGW header
+** files; however, the contained version information is now required by this
+** header file to work around binary compatibility issues (see below) and
+** this is the only known way to reliably obtain it.  This entire #if block
+** would be completely unnecessary if there was any other way of detecting
+** MinGW via their preprocessor (e.g. if they customized their GCC to define
+** some MinGW-specific macros).  When compiling for MinGW, either the
+** _HAVE_MINGW_H or _HAVE__MINGW_H (note the extra underscore) macro must be
+** defined; otherwise, detection of conditions specific to MinGW will be
+** disabled.
 */
-#ifdef _HAVE_SQLITE_CONFIG_H
-#include "config.h"
-#endif
-
-/************** Include sqliteLimit.h in the middle of sqliteInt.h ***********/
-/************** Begin file sqliteLimit.h *************************************/
-/*
-** 2007 May 7
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-** 
-** This file defines various limits of what SQLite can process.
-*/
-
-/*
-** The maximum length of a TEXT or BLOB in bytes.   This also
-** limits the size of a row in a table or index.
-**
-** The hard limit is the ability of a 32-bit signed integer
-** to count the size: 2^31-1 or 2147483647.
-*/
-#ifndef SQLITE_MAX_LENGTH
-# define SQLITE_MAX_LENGTH 1000000000
+#if defined(_HAVE_MINGW_H)
+# include "mingw.h"
+#elif defined(_HAVE__MINGW_H)
+# include "_mingw.h"
 #endif
 
 /*
-** This is the maximum number of
-**
-**    * Columns in a table
-**    * Columns in an index
-**    * Columns in a view
-**    * Terms in the SET clause of an UPDATE statement
-**    * Terms in the result set of a SELECT statement
-**    * Terms in the GROUP BY or ORDER BY clauses of a SELECT statement.
-**    * Terms in the VALUES clause of an INSERT statement
-**
-** The hard upper limit here is 32676.  Most database people will
-** tell you that in a well-normalized database, you usually should
-** not have more than a dozen or so columns in any table.  And if
-** that is the case, there is no point in having more than a few
-** dozen values in any of the other situations described above.
+** For MinGW version 4.x (and higher), check to see if the _USE_32BIT_TIME_T
+** define is required to maintain binary compatibility with the MSVC runtime
+** library in use (e.g. for Windows XP).
 */
-#ifndef SQLITE_MAX_COLUMN
-# define SQLITE_MAX_COLUMN 2000
+#if !defined(_USE_32BIT_TIME_T) && !defined(_USE_64BIT_TIME_T) && \
+    defined(_WIN32) && !defined(_WIN64) && \
+    defined(__MINGW_MAJOR_VERSION) && __MINGW_MAJOR_VERSION >= 4 && \
+    defined(__MSVCRT__)
+# define _USE_32BIT_TIME_T
 #endif
 
-/*
-** The maximum length of a single SQL statement in bytes.
-**
-** It used to be the case that setting this value to zero would
-** turn the limit off.  That is no longer true.  It is not possible
-** to turn this limit off.
+/* The public SQLite interface.  The _FILE_OFFSET_BITS macro must appear
+** first in QNX.  Also, the _USE_32BIT_TIME_T macro must appear first for
+** MinGW.
 */
-#ifndef SQLITE_MAX_SQL_LENGTH
-# define SQLITE_MAX_SQL_LENGTH 1000000000
-#endif
-
-/*
-** The maximum depth of an expression tree. This is limited to 
-** some extent by SQLITE_MAX_SQL_LENGTH. But sometime you might 
-** want to place more severe limits on the complexity of an 
-** expression.
-**
-** A value of 0 used to mean that the limit was not enforced.
-** But that is no longer true.  The limit is now strictly enforced
-** at all times.
-*/
-#ifndef SQLITE_MAX_EXPR_DEPTH
-# define SQLITE_MAX_EXPR_DEPTH 1000
-#endif
-
-/*
-** The maximum number of terms in a compound SELECT statement.
-** The code generator for compound SELECT statements does one
-** level of recursion for each term.  A stack overflow can result
-** if the number of terms is too large.  In practice, most SQL
-** never has more than 3 or 4 terms.  Use a value of 0 to disable
-** any limit on the number of terms in a compount SELECT.
-*/
-#ifndef SQLITE_MAX_COMPOUND_SELECT
-# define SQLITE_MAX_COMPOUND_SELECT 500
-#endif
-
-/*
-** The maximum number of opcodes in a VDBE program.
-** Not currently enforced.
-*/
-#ifndef SQLITE_MAX_VDBE_OP
-# define SQLITE_MAX_VDBE_OP 25000
-#endif
-
-/*
-** The maximum number of arguments to an SQL function.
-*/
-#ifndef SQLITE_MAX_FUNCTION_ARG
-# define SQLITE_MAX_FUNCTION_ARG 127
-#endif
-
-/*
-** The maximum number of in-memory pages to use for the main database
-** table and for temporary tables.  The SQLITE_DEFAULT_CACHE_SIZE
-*/
-#ifndef SQLITE_DEFAULT_CACHE_SIZE
-# define SQLITE_DEFAULT_CACHE_SIZE  2000
-#endif
-#ifndef SQLITE_DEFAULT_TEMP_CACHE_SIZE
-# define SQLITE_DEFAULT_TEMP_CACHE_SIZE  500
-#endif
-
-/*
-** The default number of frames to accumulate in the log file before
-** checkpointing the database in WAL mode.
-*/
-#ifndef SQLITE_DEFAULT_WAL_AUTOCHECKPOINT
-# define SQLITE_DEFAULT_WAL_AUTOCHECKPOINT  1000
-#endif
-
-/*
-** The maximum number of attached databases.  This must be between 0
-** and 62.  The upper bound on 62 is because a 64-bit integer bitmap
-** is used internally to track attached databases.
-*/
-#ifndef SQLITE_MAX_ATTACHED
-# define SQLITE_MAX_ATTACHED 10
-#endif
-
-
-/*
-** The maximum value of a ?nnn wildcard that the parser will accept.
-*/
-#ifndef SQLITE_MAX_VARIABLE_NUMBER
-# define SQLITE_MAX_VARIABLE_NUMBER 999
-#endif
-
-/* Maximum page size.  The upper bound on this value is 65536.  This a limit
-** imposed by the use of 16-bit offsets within each page.
-**
-** Earlier versions of SQLite allowed the user to change this value at
-** compile time. This is no longer permitted, on the grounds that it creates
-** a library that is technically incompatible with an SQLite library 
-** compiled with a different limit. If a process operating on a database 
-** with a page-size of 65536 bytes crashes, then an instance of SQLite 
-** compiled with the default page-size limit will not be able to rollback 
-** the aborted transaction. This could lead to database corruption.
-*/
-#ifdef SQLITE_MAX_PAGE_SIZE
-# undef SQLITE_MAX_PAGE_SIZE
-#endif
-#define SQLITE_MAX_PAGE_SIZE 65536
-
-
-/*
-** The default size of a database page.
-*/
-#ifndef SQLITE_DEFAULT_PAGE_SIZE
-# define SQLITE_DEFAULT_PAGE_SIZE 1024
-#endif
-#if SQLITE_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
-# undef SQLITE_DEFAULT_PAGE_SIZE
-# define SQLITE_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
-#endif
-
-/*
-** Ordinarily, if no value is explicitly provided, SQLite creates databases
-** with page size SQLITE_DEFAULT_PAGE_SIZE. However, based on certain
-** device characteristics (sector-size and atomic write() support),
-** SQLite may choose a larger value. This constant is the maximum value
-** SQLite will choose on its own.
-*/
-#ifndef SQLITE_MAX_DEFAULT_PAGE_SIZE
-# define SQLITE_MAX_DEFAULT_PAGE_SIZE 8192
-#endif
-#if SQLITE_MAX_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
-# undef SQLITE_MAX_DEFAULT_PAGE_SIZE
-# define SQLITE_MAX_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
-#endif
-
-
-/*
-** Maximum number of pages in one database file.
-**
-** This is really just the default value for the max_page_count pragma.
-** This value can be lowered (or raised) at run-time using that the
-** max_page_count macro.
-*/
-#ifndef SQLITE_MAX_PAGE_COUNT
-# define SQLITE_MAX_PAGE_COUNT 1073741823
-#endif
-
-/*
-** Maximum length (in bytes) of the pattern in a LIKE or GLOB
-** operator.
-*/
-#ifndef SQLITE_MAX_LIKE_PATTERN_LENGTH
-# define SQLITE_MAX_LIKE_PATTERN_LENGTH 50000
-#endif
-
-/*
-** Maximum depth of recursion for triggers.
-**
-** A value of 1 means that a trigger program will not be able to itself
-** fire any triggers. A value of 0 means that no trigger programs at all 
-** may be executed.
-*/
-#ifndef SQLITE_MAX_TRIGGER_DEPTH
-# define SQLITE_MAX_TRIGGER_DEPTH 1000
-#endif
-
-/************** End of sqliteLimit.h *****************************************/
-/************** Continuing where we left off in sqliteInt.h ******************/
-
-/* Disable nuisance warnings on Borland compilers */
-#if defined(__BORLANDC__)
-#pragma warn -rch /* unreachable code */
-#pragma warn -ccc /* Condition is always true or false */
-#pragma warn -aus /* Assigned value is never used */
-#pragma warn -csu /* Comparing signed and unsigned */
-#pragma warn -spa /* Suspicious pointer arithmetic */
-#endif
-
-/* Needed for various definitions... */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
-#endif
-
-#if defined(__OpenBSD__) && !defined(_BSD_SOURCE)
-# define _BSD_SOURCE
-#endif
-
-/*
-** Include standard header files as necessary
-*/
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-/*
-** The following macros are used to cast pointers to integers and
-** integers to pointers.  The way you do this varies from one compiler
-** to the next, so we have developed the following set of #if statements
-** to generate appropriate macros for a wide range of compilers.
-**
-** The correct "ANSI" way to do this is to use the intptr_t type. 
-** Unfortunately, that typedef is not available on all compilers, or
-** if it is available, it requires an #include of specific headers
-** that vary from one machine to the next.
-**
-** Ticket #3860:  The llvm-gcc-4.2 compiler from Apple chokes on
-** the ((void*)&((char*)0)[X]) construct.  But MSVC chokes on ((void*)(X)).
-** So we have to define the macros in different ways depending on the
-** compiler.
-*/
-#if defined(__PTRDIFF_TYPE__)  /* This case should work for GCC */
-# define SQLITE_INT_TO_PTR(X)  ((void*)(__PTRDIFF_TYPE__)(X))
-# define SQLITE_PTR_TO_INT(X)  ((int)(__PTRDIFF_TYPE__)(X))
-#elif !defined(__GNUC__)       /* Works for compilers other than LLVM */
-# define SQLITE_INT_TO_PTR(X)  ((void*)&((char*)0)[X])
-# define SQLITE_PTR_TO_INT(X)  ((int)(((char*)X)-(char*)0))
-#elif defined(HAVE_STDINT_H)   /* Use this case if we have ANSI headers */
-# define SQLITE_INT_TO_PTR(X)  ((void*)(intptr_t)(X))
-# define SQLITE_PTR_TO_INT(X)  ((int)(intptr_t)(X))
-#else                          /* Generates a warning - but it always works */
-# define SQLITE_INT_TO_PTR(X)  ((void*)(X))
-# define SQLITE_PTR_TO_INT(X)  ((int)(X))
-#endif
-
-/*
-** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
-** 0 means mutexes are permanently disable and the library is never
-** threadsafe.  1 means the library is serialized which is the highest
-** level of threadsafety.  2 means the libary is multithreaded - multiple
-** threads can use SQLite as long as no two threads try to use the same
-** database connection at the same time.
-**
-** Older versions of SQLite used an optional THREADSAFE macro.
-** We support that for legacy.
-*/
-#if !defined(SQLITE_THREADSAFE)
-# if defined(THREADSAFE)
-#   define SQLITE_THREADSAFE THREADSAFE
-# else
-#   define SQLITE_THREADSAFE 1 /* IMP: R-07272-22309 */
-# endif
-#endif
-
-/*
-** Powersafe overwrite is on by default.  But can be turned off using
-** the -DSQLITE_POWERSAFE_OVERWRITE=0 command-line option.
-*/
-#ifndef SQLITE_POWERSAFE_OVERWRITE
-# define SQLITE_POWERSAFE_OVERWRITE 1
-#endif
-
-/*
-** The SQLITE_DEFAULT_MEMSTATUS macro must be defined as either 0 or 1.
-** It determines whether or not the features related to 
-** SQLITE_CONFIG_MEMSTATUS are available by default or not. This value can
-** be overridden at runtime using the sqlite3_config() API.
-*/
-#if !defined(SQLITE_DEFAULT_MEMSTATUS)
-# define SQLITE_DEFAULT_MEMSTATUS 1
-#endif
-
-/*
-** Exactly one of the following macros must be defined in order to
-** specify which memory allocation subsystem to use.
-**
-**     SQLITE_SYSTEM_MALLOC          // Use normal system malloc()
-**     SQLITE_WIN32_MALLOC           // Use Win32 native heap API
-**     SQLITE_ZERO_MALLOC            // Use a stub allocator that always fails
-**     SQLITE_MEMDEBUG               // Debugging version of system malloc()
-**
-** On Windows, if the SQLITE_WIN32_MALLOC_VALIDATE macro is defined and the
-** assert() macro is enabled, each call into the Win32 native heap subsystem
-** will cause HeapValidate to be called.  If heap validation should fail, an
-** assertion will be triggered.
-**
-** (Historical note:  There used to be several other options, but we've
-** pared it down to just these three.)
-**
-** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as
-** the default.
-*/
-#if defined(SQLITE_SYSTEM_MALLOC) \
-  + defined(SQLITE_WIN32_MALLOC) \
-  + defined(SQLITE_ZERO_MALLOC) \
-  + defined(SQLITE_MEMDEBUG)>1
-# error "Two or more of the following compile-time configuration options\
- are defined but at most one is allowed:\
- SQLITE_SYSTEM_MALLOC, SQLITE_WIN32_MALLOC, SQLITE_MEMDEBUG,\
- SQLITE_ZERO_MALLOC"
-#endif
-#if defined(SQLITE_SYSTEM_MALLOC) \
-  + defined(SQLITE_WIN32_MALLOC) \
-  + defined(SQLITE_ZERO_MALLOC) \
-  + defined(SQLITE_MEMDEBUG)==0
-# define SQLITE_SYSTEM_MALLOC 1
-#endif
-
-/*
-** If SQLITE_MALLOC_SOFT_LIMIT is not zero, then try to keep the
-** sizes of memory allocations below this value where possible.
-*/
-#if !defined(SQLITE_MALLOC_SOFT_LIMIT)
-# define SQLITE_MALLOC_SOFT_LIMIT 1024
-#endif
-
-/*
-** We need to define _XOPEN_SOURCE as follows in order to enable
-** recursive mutexes on most Unix systems.  But Mac OS X is different.
-** The _XOPEN_SOURCE define causes problems for Mac OS X we are told,
-** so it is omitted there.  See ticket #2673.
-**
-** Later we learn that _XOPEN_SOURCE is poorly or incorrectly
-** implemented on some systems.  So we avoid defining it at all
-** if it is already defined or if it is unneeded because we are
-** not doing a threadsafe build.  Ticket #2681.
-**
-** See also ticket #2741.
-*/
-#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) \
- && !defined(__APPLE__) && SQLITE_THREADSAFE
-#  define _XOPEN_SOURCE 500  /* Needed to enable pthread recursive mutexes */
-#endif
-
-/*
-** The TCL headers are only needed when compiling the TCL bindings.
-*/
-#if defined(SQLITE_TCL) || defined(TCLSH)
-# include <tcl.h>
-#endif
-
-/*
-** NDEBUG and SQLITE_DEBUG are opposites.  It should always be true that
-** defined(NDEBUG)==!defined(SQLITE_DEBUG).  If this is not currently true,
-** make it true by defining or undefining NDEBUG.
-**
-** Setting NDEBUG makes the code smaller and run faster by disabling the
-** number assert() statements in the code.  So we want the default action
-** to be for NDEBUG to be set and NDEBUG to be undefined only if SQLITE_DEBUG
-** is set.  Thus NDEBUG becomes an opt-in rather than an opt-out
-** feature.
-*/
-#if !defined(NDEBUG) && !defined(SQLITE_DEBUG) 
-# define NDEBUG 1
-#endif
-#if defined(NDEBUG) && defined(SQLITE_DEBUG)
-# undef NDEBUG
-#endif
-
-/*
-** The testcase() macro is used to aid in coverage testing.  When 
-** doing coverage testing, the condition inside the argument to
-** testcase() must be evaluated both true and false in order to
-** get full branch coverage.  The testcase() macro is inserted
-** to help ensure adequate test coverage in places where simple
-** condition/decision coverage is inadequate.  For example, testcase()
-** can be used to make sure boundary values are tested.  For
-** bitmask tests, testcase() can be used to make sure each bit
-** is significant and used at least once.  On switch statements
-** where multiple cases go to the same block of code, testcase()
-** can insure that all cases are evaluated.
-**
-*/
-#ifdef SQLITE_COVERAGE_TEST
-SQLITE_PRIVATE   void sqlite3Coverage(int);
-# define testcase(X)  if( X ){ sqlite3Coverage(__LINE__); }
-#else
-# define testcase(X)
-#endif
-
-/*
-** The TESTONLY macro is used to enclose variable declarations or
-** other bits of code that are needed to support the arguments
-** within testcase() and assert() macros.
-*/
-#if !defined(NDEBUG) || defined(SQLITE_COVERAGE_TEST)
-# define TESTONLY(X)  X
-#else
-# define TESTONLY(X)
-#endif
-
-/*
-** Sometimes we need a small amount of code such as a variable initialization
-** to setup for a later assert() statement.  We do not want this code to
-** appear when assert() is disabled.  The following macro is therefore
-** used to contain that setup code.  The "VVA" acronym stands for
-** "Verification, Validation, and Accreditation".  In other words, the
-** code within VVA_ONLY() will only run during verification processes.
-*/
-#ifndef NDEBUG
-# define VVA_ONLY(X)  X
-#else
-# define VVA_ONLY(X)
-#endif
-
-/*
-** The ALWAYS and NEVER macros surround boolean expressions which 
-** are intended to always be true or false, respectively.  Such
-** expressions could be omitted from the code completely.  But they
-** are included in a few cases in order to enhance the resilience
-** of SQLite to unexpected behavior - to make the code "self-healing"
-** or "ductile" rather than being "brittle" and crashing at the first
-** hint of unplanned behavior.
-**
-** In other words, ALWAYS and NEVER are added for defensive code.
-**
-** When doing coverage testing ALWAYS and NEVER are hard-coded to
-** be true and false so that the unreachable code then specify will
-** not be counted as untested code.
-*/
-#if defined(SQLITE_COVERAGE_TEST)
-# define ALWAYS(X)      (1)
-# define NEVER(X)       (0)
-#elif !defined(NDEBUG)
-# define ALWAYS(X)      ((X)?1:(assert(0),0))
-# define NEVER(X)       ((X)?(assert(0),1):0)
-#else
-# define ALWAYS(X)      (X)
-# define NEVER(X)       (X)
-#endif
-
-/*
-** Return true (non-zero) if the input is a integer that is too large
-** to fit in 32-bits.  This macro is used inside of various testcase()
-** macros to verify that we have tested SQLite for large-file support.
-*/
-#define IS_BIG_INT(X)  (((X)&~(i64)0xffffffff)!=0)
-
-/*
-** The macro unlikely() is a hint that surrounds a boolean
-** expression that is usually false.  Macro likely() surrounds
-** a boolean expression that is usually true.  GCC is able to
-** use these hints to generate better code, sometimes.
-*/
-#if defined(__GNUC__) && 0
-# define likely(X)    __builtin_expect((X),1)
-# define unlikely(X)  __builtin_expect((X),0)
-#else
-# define likely(X)    !!(X)
-# define unlikely(X)  !!(X)
-#endif
-
 /************** Include sqlite3.h in the middle of sqliteInt.h ***************/
 /************** Begin file sqlite3.h *****************************************/
 /*
@@ -678,9 +222,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.7.17"
-#define SQLITE_VERSION_NUMBER 3007017
-#define SQLITE_SOURCE_ID      "2013-05-20 00:56:22 118a3b35693b134d56ebd780123b7fd6f1497668"
+#define SQLITE_VERSION        "3.8.5"
+#define SQLITE_VERSION_NUMBER 3008005
+#define SQLITE_SOURCE_ID      "2014-06-04 14:06:34 b1ed4f2a34ba66c29b130f8d13e9092758019212"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -941,7 +485,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**);
 ** <ul>
 ** <li> The application must insure that the 1st parameter to sqlite3_exec()
 **      is a valid and open [database connection].
-** <li> The application must not close [database connection] specified by
+** <li> The application must not close the [database connection] specified by
 **      the 1st parameter to sqlite3_exec() while sqlite3_exec() is running.
 ** <li> The application must not modify the SQL statement text passed into
 **      the 2nd parameter of sqlite3_exec() while sqlite3_exec() is running.
@@ -1018,7 +562,7 @@ SQLITE_API int sqlite3_exec(
 ** [sqlite3_extended_result_codes()] API.
 **
 ** Some of the available extended result codes are listed here.
-** One may expect the number of extended result codes will be expand
+** One may expect the number of extended result codes will increase
 ** over time.  Software that uses extended result codes should expect
 ** to see new result codes in future releases of SQLite.
 **
@@ -1049,15 +593,20 @@ SQLITE_API int sqlite3_exec(
 #define SQLITE_IOERR_SEEK              (SQLITE_IOERR | (22<<8))
 #define SQLITE_IOERR_DELETE_NOENT      (SQLITE_IOERR | (23<<8))
 #define SQLITE_IOERR_MMAP              (SQLITE_IOERR | (24<<8))
+#define SQLITE_IOERR_GETTEMPPATH       (SQLITE_IOERR | (25<<8))
+#define SQLITE_IOERR_CONVPATH          (SQLITE_IOERR | (26<<8))
 #define SQLITE_LOCKED_SHAREDCACHE      (SQLITE_LOCKED |  (1<<8))
 #define SQLITE_BUSY_RECOVERY           (SQLITE_BUSY   |  (1<<8))
+#define SQLITE_BUSY_SNAPSHOT           (SQLITE_BUSY   |  (2<<8))
 #define SQLITE_CANTOPEN_NOTEMPDIR      (SQLITE_CANTOPEN | (1<<8))
 #define SQLITE_CANTOPEN_ISDIR          (SQLITE_CANTOPEN | (2<<8))
 #define SQLITE_CANTOPEN_FULLPATH       (SQLITE_CANTOPEN | (3<<8))
+#define SQLITE_CANTOPEN_CONVPATH       (SQLITE_CANTOPEN | (4<<8))
 #define SQLITE_CORRUPT_VTAB            (SQLITE_CORRUPT | (1<<8))
 #define SQLITE_READONLY_RECOVERY       (SQLITE_READONLY | (1<<8))
 #define SQLITE_READONLY_CANTLOCK       (SQLITE_READONLY | (2<<8))
 #define SQLITE_READONLY_ROLLBACK       (SQLITE_READONLY | (3<<8))
+#define SQLITE_READONLY_DBMOVED        (SQLITE_READONLY | (4<<8))
 #define SQLITE_ABORT_ROLLBACK          (SQLITE_ABORT | (2<<8))
 #define SQLITE_CONSTRAINT_CHECK        (SQLITE_CONSTRAINT | (1<<8))
 #define SQLITE_CONSTRAINT_COMMITHOOK   (SQLITE_CONSTRAINT | (2<<8))
@@ -1068,8 +617,10 @@ SQLITE_API int sqlite3_exec(
 #define SQLITE_CONSTRAINT_TRIGGER      (SQLITE_CONSTRAINT | (7<<8))
 #define SQLITE_CONSTRAINT_UNIQUE       (SQLITE_CONSTRAINT | (8<<8))
 #define SQLITE_CONSTRAINT_VTAB         (SQLITE_CONSTRAINT | (9<<8))
+#define SQLITE_CONSTRAINT_ROWID        (SQLITE_CONSTRAINT |(10<<8))
 #define SQLITE_NOTICE_RECOVER_WAL      (SQLITE_NOTICE | (1<<8))
 #define SQLITE_NOTICE_RECOVER_ROLLBACK (SQLITE_NOTICE | (2<<8))
+#define SQLITE_WARNING_AUTOINDEX       (SQLITE_WARNING | (1<<8))
 
 /*
 ** CAPI3REF: Flags For File Open Operations
@@ -1123,7 +674,11 @@ SQLITE_API int sqlite3_exec(
 ** after reboot following a crash or power loss, the only bytes in a
 ** file that were written at the application level might have changed
 ** and that adjacent bytes, even bytes within the same sector are
-** guaranteed to be unchanged.
+** guaranteed to be unchanged.  The SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN
+** flag indicate that a file cannot be deleted when open.  The
+** SQLITE_IOCAP_IMMUTABLE flag indicates that the file is on
+** read-only media and cannot be changed even by processes with
+** elevated privileges.
 */
 #define SQLITE_IOCAP_ATOMIC                 0x00000001
 #define SQLITE_IOCAP_ATOMIC512              0x00000002
@@ -1138,6 +693,7 @@ SQLITE_API int sqlite3_exec(
 #define SQLITE_IOCAP_SEQUENTIAL             0x00000400
 #define SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN  0x00000800
 #define SQLITE_IOCAP_POWERSAFE_OVERWRITE    0x00001000
+#define SQLITE_IOCAP_IMMUTABLE              0x00002000
 
 /*
 ** CAPI3REF: File Locking Levels
@@ -1354,15 +910,29 @@ struct sqlite3_io_methods {
 ** additional information.
 **
 ** <li>[[SQLITE_FCNTL_SYNC_OMITTED]]
-** ^(The [SQLITE_FCNTL_SYNC_OMITTED] opcode is generated internally by
-** SQLite and sent to all VFSes in place of a call to the xSync method
-** when the database connection has [PRAGMA synchronous] set to OFF.)^
-** Some specialized VFSes need this signal in order to operate correctly
-** when [PRAGMA synchronous | PRAGMA synchronous=OFF] is set, but most 
-** VFSes do not need this signal and should silently ignore this opcode.
-** Applications should not call [sqlite3_file_control()] with this
-** opcode as doing so may disrupt the operation of the specialized VFSes
-** that do require it.  
+** No longer in use.
+**
+** <li>[[SQLITE_FCNTL_SYNC]]
+** The [SQLITE_FCNTL_SYNC] opcode is generated internally by SQLite and
+** sent to the VFS immediately before the xSync method is invoked on a
+** database file descriptor. Or, if the xSync method is not invoked 
+** because the user has configured SQLite with 
+** [PRAGMA synchronous | PRAGMA synchronous=OFF] it is invoked in place 
+** of the xSync method. In most cases, the pointer argument passed with
+** this file-control is NULL. However, if the database file is being synced
+** as part of a multi-database commit, the argument points to a nul-terminated
+** string containing the transactions master-journal file name. VFSes that 
+** do not need this signal should silently ignore this opcode. Applications 
+** should not call [sqlite3_file_control()] with this opcode as doing so may 
+** disrupt the operation of the specialized VFSes that do require it.  
+**
+** <li>[[SQLITE_FCNTL_COMMIT_PHASETWO]]
+** The [SQLITE_FCNTL_COMMIT_PHASETWO] opcode is generated internally by SQLite
+** and sent to the VFS after a transaction has been committed immediately
+** but before the database is unlocked. VFSes that do not need this signal
+** should silently ignore this opcode. Applications should not call
+** [sqlite3_file_control()] with this opcode as doing so may disrupt the 
+** operation of the specialized VFSes that do require it.  
 **
 ** <li>[[SQLITE_FCNTL_WIN32_AV_RETRY]]
 ** ^The [SQLITE_FCNTL_WIN32_AV_RETRY] opcode is used to configure automatic
@@ -1478,6 +1048,26 @@ struct sqlite3_io_methods {
 ** can be queried by passing in a pointer to a negative number.  This
 ** file-control is used internally to implement [PRAGMA mmap_size].
 **
+** <li>[[SQLITE_FCNTL_TRACE]]
+** The [SQLITE_FCNTL_TRACE] file control provides advisory information
+** to the VFS about what the higher layers of the SQLite stack are doing.
+** This file control is used by some VFS activity tracing [shims].
+** The argument is a zero-terminated string.  Higher layers in the
+** SQLite stack may generate instances of this file control if
+** the [SQLITE_USE_FCNTL_TRACE] compile-time option is enabled.
+**
+** <li>[[SQLITE_FCNTL_HAS_MOVED]]
+** The [SQLITE_FCNTL_HAS_MOVED] file control interprets its argument as a
+** pointer to an integer and it writes a boolean into that integer depending
+** on whether or not the file has been renamed, moved, or deleted since it
+** was first opened.
+**
+** <li>[[SQLITE_FCNTL_WIN32_SET_HANDLE]]
+** The [SQLITE_FCNTL_WIN32_SET_HANDLE] opcode is used for debugging.  This
+** opcode causes the xFileControl method to swap the file handle with the one
+** pointed to by the pArg argument.  This capability is used during testing
+** and only needs to be supported when SQLITE_TEST is defined.
+**
 ** </ul>
 */
 #define SQLITE_FCNTL_LOCKSTATE               1
@@ -1497,6 +1087,11 @@ struct sqlite3_io_methods {
 #define SQLITE_FCNTL_BUSYHANDLER            15
 #define SQLITE_FCNTL_TEMPFILENAME           16
 #define SQLITE_FCNTL_MMAP_SIZE              18
+#define SQLITE_FCNTL_TRACE                  19
+#define SQLITE_FCNTL_HAS_MOVED              20
+#define SQLITE_FCNTL_SYNC                   21
+#define SQLITE_FCNTL_COMMIT_PHASETWO        22
+#define SQLITE_FCNTL_WIN32_SET_HANDLE       23
 
 /*
 ** CAPI3REF: Mutex Handle
@@ -1941,7 +1536,7 @@ SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...);
 ** or [sqlite3_realloc()] first calls xRoundup.  If xRoundup returns 0, 
 ** that causes the corresponding memory allocation to fail.
 **
-** The xInit method initializes the memory allocator.  (For example,
+** The xInit method initializes the memory allocator.  For example,
 ** it might allocate any require mutexes or initialize internal data
 ** structures.  The xShutdown method is invoked (indirectly) by
 ** [sqlite3_shutdown()] and should deallocate any resources acquired
@@ -2183,27 +1778,27 @@ struct sqlite3_mem_methods {
 ** function must be threadsafe. </dd>
 **
 ** [[SQLITE_CONFIG_URI]] <dt>SQLITE_CONFIG_URI
-** <dd> This option takes a single argument of type int. If non-zero, then
+** <dd>^(This option takes a single argument of type int. If non-zero, then
 ** URI handling is globally enabled. If the parameter is zero, then URI handling
-** is globally disabled. If URI handling is globally enabled, all filenames
+** is globally disabled.)^ ^If URI handling is globally enabled, all filenames
 ** passed to [sqlite3_open()], [sqlite3_open_v2()], [sqlite3_open16()] or
 ** specified as part of [ATTACH] commands are interpreted as URIs, regardless
 ** of whether or not the [SQLITE_OPEN_URI] flag is set when the database
-** connection is opened. If it is globally disabled, filenames are
+** connection is opened. ^If it is globally disabled, filenames are
 ** only interpreted as URIs if the SQLITE_OPEN_URI flag is set when the
-** database connection is opened. By default, URI handling is globally
+** database connection is opened. ^(By default, URI handling is globally
 ** disabled. The default value may be changed by compiling with the
-** [SQLITE_USE_URI] symbol defined.
+** [SQLITE_USE_URI] symbol defined.)^
 **
 ** [[SQLITE_CONFIG_COVERING_INDEX_SCAN]] <dt>SQLITE_CONFIG_COVERING_INDEX_SCAN
-** <dd> This option takes a single integer argument which is interpreted as
+** <dd>^This option takes a single integer argument which is interpreted as
 ** a boolean in order to enable or disable the use of covering indices for
-** full table scans in the query optimizer.  The default setting is determined
+** full table scans in the query optimizer.  ^The default setting is determined
 ** by the [SQLITE_ALLOW_COVERING_INDEX_SCAN] compile-time option, or is "on"
 ** if that compile-time option is omitted.
 ** The ability to disable the use of covering indices for full table scans
 ** is because some incorrectly coded legacy applications might malfunction
-** malfunction when the optimization is enabled.  Providing the ability to
+** when the optimization is enabled.  Providing the ability to
 ** disable the optimization allows the older, buggy application code to work
 ** without change even with newer versions of SQLite.
 **
@@ -2232,17 +1827,24 @@ struct sqlite3_mem_methods {
 **
 ** [[SQLITE_CONFIG_MMAP_SIZE]]
 ** <dt>SQLITE_CONFIG_MMAP_SIZE
-** <dd>SQLITE_CONFIG_MMAP_SIZE takes two 64-bit integer (sqlite3_int64) values
+** <dd>^SQLITE_CONFIG_MMAP_SIZE takes two 64-bit integer (sqlite3_int64) values
 ** that are the default mmap size limit (the default setting for
 ** [PRAGMA mmap_size]) and the maximum allowed mmap size limit.
-** The default setting can be overridden by each database connection using
+** ^The default setting can be overridden by each database connection using
 ** either the [PRAGMA mmap_size] command, or by using the
-** [SQLITE_FCNTL_MMAP_SIZE] file control.  The maximum allowed mmap size
+** [SQLITE_FCNTL_MMAP_SIZE] file control.  ^(The maximum allowed mmap size
 ** cannot be changed at run-time.  Nor may the maximum allowed mmap size
 ** exceed the compile-time maximum mmap size set by the
-** [SQLITE_MAX_MMAP_SIZE] compile-time option.  
-** If either argument to this option is negative, then that argument is
+** [SQLITE_MAX_MMAP_SIZE] compile-time option.)^
+** ^If either argument to this option is negative, then that argument is
 ** changed to its compile-time default.
+**
+** [[SQLITE_CONFIG_WIN32_HEAPSIZE]]
+** <dt>SQLITE_CONFIG_WIN32_HEAPSIZE
+** <dd>^This option is only available if SQLite is compiled for Windows
+** with the [SQLITE_WIN32_MALLOC] pre-processor macro defined.
+** SQLITE_CONFIG_WIN32_HEAPSIZE takes a 32-bit unsigned integer value
+** that specifies the maximum size of the created heap.
 ** </dl>
 */
 #define SQLITE_CONFIG_SINGLETHREAD  1  /* nil */
@@ -2267,6 +1869,7 @@ struct sqlite3_mem_methods {
 #define SQLITE_CONFIG_COVERING_INDEX_SCAN 20  /* int */
 #define SQLITE_CONFIG_SQLLOG       21  /* xSqllog, void* */
 #define SQLITE_CONFIG_MMAP_SIZE    22  /* sqlite3_int64, sqlite3_int64 */
+#define SQLITE_CONFIG_WIN32_HEAPSIZE      23  /* int nByte */
 
 /*
 ** CAPI3REF: Database Connection Configuration Options
@@ -2343,19 +1946,21 @@ SQLITE_API int sqlite3_extended_result_codes(sqlite3*, int onoff);
 /*
 ** CAPI3REF: Last Insert Rowid
 **
-** ^Each entry in an SQLite table has a unique 64-bit signed
+** ^Each entry in most SQLite tables (except for [WITHOUT ROWID] tables)
+** has a unique 64-bit signed
 ** integer key called the [ROWID | "rowid"]. ^The rowid is always available
 ** as an undeclared column named ROWID, OID, or _ROWID_ as long as those
 ** names are not also used by explicitly declared columns. ^If
 ** the table has a column of type [INTEGER PRIMARY KEY] then that column
 ** is another alias for the rowid.
 **
-** ^This routine returns the [rowid] of the most recent
-** successful [INSERT] into the database from the [database connection]
-** in the first argument.  ^As of SQLite version 3.7.7, this routines
-** records the last insert rowid of both ordinary tables and [virtual tables].
-** ^If no successful [INSERT]s
-** have ever occurred on that database connection, zero is returned.
+** ^The sqlite3_last_insert_rowid(D) interface returns the [rowid] of the 
+** most recent successful [INSERT] into a rowid table or [virtual table]
+** on database connection D.
+** ^Inserts into [WITHOUT ROWID] tables are not recorded.
+** ^If no successful [INSERT]s into rowid tables
+** have ever occurred on the database connection D, 
+** then sqlite3_last_insert_rowid(D) returns zero.
 **
 ** ^(If an [INSERT] occurs within a trigger or within a [virtual table]
 ** method, then this routine will return the [rowid] of the inserted
@@ -2921,11 +2526,13 @@ SQLITE_API sqlite3_int64 sqlite3_memory_highwater(int resetFlag);
 ** applications to access the same PRNG for other purposes.
 **
 ** ^A call to this routine stores N bytes of randomness into buffer P.
+** ^If N is less than one, then P can be a NULL pointer.
 **
-** ^The first time this routine is invoked (either internally or by
-** the application) the PRNG is seeded using randomness obtained
-** from the xRandomness method of the default [sqlite3_vfs] object.
-** ^On all subsequent invocations, the pseudo-randomness is generated
+** ^If this routine has not been previously called or if the previous
+** call had N less than one, then the PRNG is seeded using randomness
+** obtained from the xRandomness method of the default [sqlite3_vfs] object.
+** ^If the previous call to this routine had an N of 1 or more then
+** the pseudo-randomness is generated
 ** internally and without recourse to the [sqlite3_vfs] xRandomness
 ** method.
 */
@@ -3085,6 +2692,7 @@ SQLITE_API int sqlite3_set_authorizer(
 #define SQLITE_FUNCTION             31   /* NULL            Function Name   */
 #define SQLITE_SAVEPOINT            32   /* Operation       Savepoint Name  */
 #define SQLITE_COPY                  0   /* No longer used */
+#define SQLITE_RECURSIVE            33   /* NULL            NULL            */
 
 /*
 ** CAPI3REF: Tracing And Profiling Functions
@@ -3128,9 +2736,10 @@ SQLITE_API SQLITE_EXPERIMENTAL void *sqlite3_profile(sqlite3*,
 ** interface is to keep a GUI updated during a large query.
 **
 ** ^The parameter P is passed through as the only parameter to the 
-** callback function X.  ^The parameter N is the number of 
+** callback function X.  ^The parameter N is the approximate number of 
 ** [virtual machine instructions] that are evaluated between successive
-** invocations of the callback X.
+** invocations of the callback X.  ^If N is less than one then the progress
+** handler is disabled.
 **
 ** ^Only a single progress handler may be defined at one time per
 ** [database connection]; setting a new progress handler cancels the
@@ -3296,6 +2905,30 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 **     ^If sqlite3_open_v2() is used and the "cache" parameter is present in
 **     a URI filename, its value overrides any behavior requested by setting
 **     SQLITE_OPEN_PRIVATECACHE or SQLITE_OPEN_SHAREDCACHE flag.
+**
+**  <li> <b>psow</b>: ^The psow parameter may be "true" (or "on" or "yes" or
+**     "1") or "false" (or "off" or "no" or "0") to indicate that the
+**     [powersafe overwrite] property does or does not apply to the
+**     storage media on which the database file resides.  ^The psow query
+**     parameter only works for the built-in unix and Windows VFSes.
+**
+**  <li> <b>nolock</b>: ^The nolock parameter is a boolean query parameter
+**     which if set disables file locking in rollback journal modes.  This
+**     is useful for accessing a database on a filesystem that does not
+**     support locking.  Caution:  Database corruption might result if two
+**     or more processes write to the same database and any one of those
+**     processes uses nolock=1.
+**
+**  <li> <b>immutable</b>: ^The immutable parameter is a boolean query
+**     parameter that indicates that the database file is stored on
+**     read-only media.  ^When immutable is set, SQLite assumes that the
+**     database file cannot be changed, even by a process with higher
+**     privilege, and so the database is opened read-only and all locking
+**     and change detection is disabled.  Caution: Setting the immutable
+**     property on a database file that does in fact change can result
+**     in incorrect query results and/or [SQLITE_CORRUPT] errors.
+**     See also: [SQLITE_IOCAP_IMMUTABLE].
+**       
 ** </ul>
 **
 ** ^Specifying an unknown parameter in the query component of a URI is not an
@@ -3325,8 +2958,9 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 **          Open file "data.db" in the current directory for read-only access.
 **          Regardless of whether or not shared-cache mode is enabled by
 **          default, use a private cache.
-** <tr><td> file:/home/fred/data.db?vfs=unix-nolock <td>
-**          Open file "/home/fred/data.db". Use the special VFS "unix-nolock".
+** <tr><td> file:/home/fred/data.db?vfs=unix-dotfile <td>
+**          Open file "/home/fred/data.db". Use the special VFS "unix-dotfile"
+**          that uses dot-files in place of posix advisory locking.
 ** <tr><td> file:data.db?mode=readonly <td> 
 **          An error. "readonly" is not a valid option for the "mode" parameter.
 ** </table>
@@ -3664,7 +3298,6 @@ SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
 ** choice of query plan if the parameter is the left-hand side of a [LIKE]
 ** or [GLOB] operator or if the parameter is compared to an indexed column
 ** and the [SQLITE_ENABLE_STAT3] compile-time option is enabled.
-** the 
 ** </li>
 ** </ol>
 */
@@ -4326,19 +3959,19 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);
 **
 ** <tr><td>  NULL    <td> INTEGER   <td> Result is 0
 ** <tr><td>  NULL    <td>  FLOAT    <td> Result is 0.0
-** <tr><td>  NULL    <td>   TEXT    <td> Result is NULL pointer
-** <tr><td>  NULL    <td>   BLOB    <td> Result is NULL pointer
+** <tr><td>  NULL    <td>   TEXT    <td> Result is a NULL pointer
+** <tr><td>  NULL    <td>   BLOB    <td> Result is a NULL pointer
 ** <tr><td> INTEGER  <td>  FLOAT    <td> Convert from integer to float
 ** <tr><td> INTEGER  <td>   TEXT    <td> ASCII rendering of the integer
 ** <tr><td> INTEGER  <td>   BLOB    <td> Same as INTEGER->TEXT
-** <tr><td>  FLOAT   <td> INTEGER   <td> Convert from float to integer
+** <tr><td>  FLOAT   <td> INTEGER   <td> [CAST] to INTEGER
 ** <tr><td>  FLOAT   <td>   TEXT    <td> ASCII rendering of the float
-** <tr><td>  FLOAT   <td>   BLOB    <td> Same as FLOAT->TEXT
-** <tr><td>  TEXT    <td> INTEGER   <td> Use atoi()
-** <tr><td>  TEXT    <td>  FLOAT    <td> Use atof()
+** <tr><td>  FLOAT   <td>   BLOB    <td> [CAST] to BLOB
+** <tr><td>  TEXT    <td> INTEGER   <td> [CAST] to INTEGER
+** <tr><td>  TEXT    <td>  FLOAT    <td> [CAST] to REAL
 ** <tr><td>  TEXT    <td>   BLOB    <td> No change
-** <tr><td>  BLOB    <td> INTEGER   <td> Convert to TEXT then use atoi()
-** <tr><td>  BLOB    <td>  FLOAT    <td> Convert to TEXT then use atof()
+** <tr><td>  BLOB    <td> INTEGER   <td> [CAST] to INTEGER
+** <tr><td>  BLOB    <td>  FLOAT    <td> [CAST] to REAL
 ** <tr><td>  BLOB    <td>   TEXT    <td> Add a zero terminator if needed
 ** </table>
 ** </blockquote>)^
@@ -4394,7 +4027,7 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);
 ** described above, or until [sqlite3_step()] or [sqlite3_reset()] or
 ** [sqlite3_finalize()] is called.  ^The memory space used to hold strings
 ** and BLOBs is freed automatically.  Do <b>not</b> pass the pointers returned
-** [sqlite3_column_blob()], [sqlite3_column_text()], etc. into
+** from [sqlite3_column_blob()], [sqlite3_column_text()], etc. into
 ** [sqlite3_free()].
 **
 ** ^(If a memory allocation error occurs during the evaluation of any
@@ -4503,15 +4136,24 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
 **
 ** ^The fourth parameter, eTextRep, specifies what
 ** [SQLITE_UTF8 | text encoding] this SQL function prefers for
-** its parameters.  Every SQL function implementation must be able to work
-** with UTF-8, UTF-16le, or UTF-16be.  But some implementations may be
-** more efficient with one encoding than another.  ^An application may
-** invoke sqlite3_create_function() or sqlite3_create_function16() multiple
-** times with the same function but with different values of eTextRep.
+** its parameters.  The application should set this parameter to
+** [SQLITE_UTF16LE] if the function implementation invokes 
+** [sqlite3_value_text16le()] on an input, or [SQLITE_UTF16BE] if the
+** implementation invokes [sqlite3_value_text16be()] on an input, or
+** [SQLITE_UTF16] if [sqlite3_value_text16()] is used, or [SQLITE_UTF8]
+** otherwise.  ^The same SQL function may be registered multiple times using
+** different preferred text encodings, with different implementations for
+** each encoding.
 ** ^When multiple implementations of the same function are available, SQLite
 ** will pick the one that involves the least amount of data conversion.
-** If there is only a single implementation which does not care what text
-** encoding is used, then the fourth argument should be [SQLITE_ANY].
+**
+** ^The fourth parameter may optionally be ORed with [SQLITE_DETERMINISTIC]
+** to signal that the function will always return the same result given
+** the same inputs within a single SQL statement.  Most SQL functions are
+** deterministic.  The built-in [random()] SQL function is an example of a
+** function that is not deterministic.  The SQLite query planner is able to
+** perform additional optimizations on deterministic functions, so use
+** of the [SQLITE_DETERMINISTIC] flag is recommended where possible.
 **
 ** ^(The fifth parameter is an arbitrary pointer.  The implementation of the
 ** function can gain access to this pointer using [sqlite3_user_data()].)^
@@ -4597,9 +4239,19 @@ SQLITE_API int sqlite3_create_function_v2(
 #define SQLITE_UTF16LE        2
 #define SQLITE_UTF16BE        3
 #define SQLITE_UTF16          4    /* Use native byte order */
-#define SQLITE_ANY            5    /* sqlite3_create_function only */
+#define SQLITE_ANY            5    /* Deprecated */
 #define SQLITE_UTF16_ALIGNED  8    /* sqlite3_create_collation only */
 
+/*
+** CAPI3REF: Function Flags
+**
+** These constants may be ORed together with the 
+** [SQLITE_UTF8 | preferred text encoding] as the fourth argument
+** to [sqlite3_create_function()], [sqlite3_create_function16()], or
+** [sqlite3_create_function_v2()].
+*/
+#define SQLITE_DETERMINISTIC    0x800
+
 /*
 ** CAPI3REF: Deprecated Functions
 ** DEPRECATED
@@ -4750,41 +4402,49 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*);
 /*
 ** CAPI3REF: Function Auxiliary Data
 **
-** The following two functions may be used by scalar SQL functions to
+** These functions may be used by (non-aggregate) SQL functions to
 ** associate metadata with argument values. If the same value is passed to
 ** multiple invocations of the same SQL function during query execution, under
-** some circumstances the associated metadata may be preserved. This may
-** be used, for example, to add a regular-expression matching scalar
-** function. The compiled version of the regular expression is stored as
-** metadata associated with the SQL value passed as the regular expression
-** pattern.  The compiled regular expression can be reused on multiple
-** invocations of the same function so that the original pattern string
-** does not need to be recompiled on each invocation.
+** some circumstances the associated metadata may be preserved.  An example
+** of where this might be useful is in a regular-expression matching
+** function. The compiled version of the regular expression can be stored as
+** metadata associated with the pattern string.  
+** Then as long as the pattern string remains the same,
+** the compiled regular expression can be reused on multiple
+** invocations of the same function.
 **
 ** ^The sqlite3_get_auxdata() interface returns a pointer to the metadata
 ** associated by the sqlite3_set_auxdata() function with the Nth argument
-** value to the application-defined function. ^If no metadata has been ever
-** been set for the Nth argument of the function, or if the corresponding
-** function parameter has changed since the meta-data was set,
-** then sqlite3_get_auxdata() returns a NULL pointer.
+** value to the application-defined function. ^If there is no metadata
+** associated with the function argument, this sqlite3_get_auxdata() interface
+** returns a NULL pointer.
 **
-** ^The sqlite3_set_auxdata() interface saves the metadata
-** pointed to by its 3rd parameter as the metadata for the N-th
-** argument of the application-defined function.  Subsequent
-** calls to sqlite3_get_auxdata() might return this data, if it has
-** not been destroyed.
-** ^If it is not NULL, SQLite will invoke the destructor
-** function given by the 4th parameter to sqlite3_set_auxdata() on
-** the metadata when the corresponding function parameter changes
-** or when the SQL statement completes, whichever comes first.
+** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as metadata for the N-th
+** argument of the application-defined function.  ^Subsequent
+** calls to sqlite3_get_auxdata(C,N) return P from the most recent
+** sqlite3_set_auxdata(C,N,P,X) call if the metadata is still valid or
+** NULL if the metadata has been discarded.
+** ^After each call to sqlite3_set_auxdata(C,N,P,X) where X is not NULL,
+** SQLite will invoke the destructor function X with parameter P exactly
+** once, when the metadata is discarded.
+** SQLite is free to discard the metadata at any time, including: <ul>
+** <li> when the corresponding function parameter changes, or
+** <li> when [sqlite3_reset()] or [sqlite3_finalize()] is called for the
+**      SQL statement, or
+** <li> when sqlite3_set_auxdata() is invoked again on the same parameter, or
+** <li> during the original sqlite3_set_auxdata() call when a memory 
+**      allocation error occurs. </ul>)^
 **
-** SQLite is free to call the destructor and drop metadata on any
-** parameter of any function at any time.  ^The only guarantee is that
-** the destructor will be called before the metadata is dropped.
+** Note the last bullet in particular.  The destructor X in 
+** sqlite3_set_auxdata(C,N,P,X) might be called immediately, before the
+** sqlite3_set_auxdata() interface even returns.  Hence sqlite3_set_auxdata()
+** should be called near the end of the function implementation and the
+** function implementation should not make any use of P after
+** sqlite3_set_auxdata() has been called.
 **
 ** ^(In practice, metadata is preserved between function calls for
-** expressions that are constant at compile time. This includes literal
-** values and [parameters].)^
+** function parameters that are compile-time constants, including literal
+** values and [parameters] and expressions composed from the same.)^
 **
 ** These routines must be called from the same thread in which
 ** the SQL function is running.
@@ -5089,6 +4749,11 @@ SQLITE_API int sqlite3_key(
   sqlite3 *db,                   /* Database to be rekeyed */
   const void *pKey, int nKey     /* The key */
 );
+SQLITE_API int sqlite3_key_v2(
+  sqlite3 *db,                   /* Database to be rekeyed */
+  const char *zDbName,           /* Name of the database */
+  const void *pKey, int nKey     /* The key */
+);
 
 /*
 ** Change the key on an open database.  If the current database is not
@@ -5102,6 +4767,11 @@ SQLITE_API int sqlite3_rekey(
   sqlite3 *db,                   /* Database to be rekeyed */
   const void *pKey, int nKey     /* The new key */
 );
+SQLITE_API int sqlite3_rekey_v2(
+  sqlite3 *db,                   /* Database to be rekeyed */
+  const char *zDbName,           /* Name of the database */
+  const void *pKey, int nKey     /* The new key */
+);
 
 /*
 ** Specify the activation key for a SEE database.  Unless 
@@ -5353,12 +5023,13 @@ SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
 **
 ** ^The sqlite3_update_hook() interface registers a callback function
 ** with the [database connection] identified by the first argument
-** to be invoked whenever a row is updated, inserted or deleted.
+** to be invoked whenever a row is updated, inserted or deleted in
+** a rowid table.
 ** ^Any callback set by a previous call to this function
 ** for the same database connection is overridden.
 **
 ** ^The second argument is a pointer to the function to invoke when a
-** row is updated, inserted or deleted.
+** row is updated, inserted or deleted in a rowid table.
 ** ^The first argument to the callback is a copy of the third argument
 ** to sqlite3_update_hook().
 ** ^The second callback argument is one of [SQLITE_INSERT], [SQLITE_DELETE],
@@ -5371,6 +5042,7 @@ SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
 **
 ** ^(The update hook is not invoked when internal system tables are
 ** modified (i.e. sqlite_master and sqlite_sequence).)^
+** ^The update hook is not invoked when [WITHOUT ROWID] tables are modified.
 **
 ** ^In the current implementation, the update hook
 ** is not invoked when duplication rows are deleted because of an
@@ -5452,8 +5124,8 @@ SQLITE_API int sqlite3_release_memory(int);
 **
 ** ^The sqlite3_db_release_memory(D) interface attempts to free as much heap
 ** memory as possible from database connection D. Unlike the
-** [sqlite3_release_memory()] interface, this interface is effect even
-** when then [SQLITE_ENABLE_MEMORY_MANAGEMENT] compile-time option is
+** [sqlite3_release_memory()] interface, this interface is in effect even
+** when the [SQLITE_ENABLE_MEMORY_MANAGEMENT] compile-time option is
 ** omitted.
 **
 ** See also: [sqlite3_release_memory()]
@@ -5687,10 +5359,23 @@ SQLITE_API int sqlite3_enable_load_extension(sqlite3 *db, int onoff);
 ** on the list of automatic extensions is a harmless no-op. ^No entry point
 ** will be called more than once for each database connection that is opened.
 **
-** See also: [sqlite3_reset_auto_extension()].
+** See also: [sqlite3_reset_auto_extension()]
+** and [sqlite3_cancel_auto_extension()]
 */
 SQLITE_API int sqlite3_auto_extension(void (*xEntryPoint)(void));
 
+/*
+** CAPI3REF: Cancel Automatic Extension Loading
+**
+** ^The [sqlite3_cancel_auto_extension(X)] interface unregisters the
+** initialization routine X that was registered using a prior call to
+** [sqlite3_auto_extension(X)].  ^The [sqlite3_cancel_auto_extension(X)]
+** routine returns 1 if initialization routine X was successfully 
+** unregistered and it returns 0 if X was not on the list of initialization
+** routines.
+*/
+SQLITE_API int sqlite3_cancel_auto_extension(void (*xEntryPoint)(void));
+
 /*
 ** CAPI3REF: Reset Automatic Extension Loading
 **
@@ -5815,10 +5500,22 @@ struct sqlite3_module {
 ** the correct order to satisfy the ORDER BY clause so that no separate
 ** sorting step is required.
 **
-** ^The estimatedCost value is an estimate of the cost of doing the
-** particular lookup.  A full scan of a table with N entries should have
-** a cost of N.  A binary search of a table of N entries should have a
-** cost of approximately log(N).
+** ^The estimatedCost value is an estimate of the cost of a particular
+** strategy. A cost of N indicates that the cost of the strategy is similar
+** to a linear scan of an SQLite table with N rows. A cost of log(N) 
+** indicates that the expense of the operation is similar to that of a
+** binary search on a unique indexed field of an SQLite table with N rows.
+**
+** ^The estimatedRows value is an estimate of the number of rows that
+** will be returned by the strategy.
+**
+** IMPORTANT: The estimatedRows field was added to the sqlite3_index_info
+** structure for SQLite version 3.8.2. If a virtual table extension is
+** used with an SQLite version earlier than 3.8.2, the results of attempting 
+** to read or write the estimatedRows field are undefined (but are likely 
+** to included crashing the application). The estimatedRows field should
+** therefore only be used if [sqlite3_libversion_number()] returns a
+** value greater than or equal to 3008002.
 */
 struct sqlite3_index_info {
   /* Inputs */
@@ -5843,7 +5540,9 @@ struct sqlite3_index_info {
   char *idxStr;              /* String, possibly obtained from sqlite3_malloc */
   int needToFreeIdxStr;      /* Free idxStr using sqlite3_free() if true */
   int orderByConsumed;       /* True if output is already ordered */
-  double estimatedCost;      /* Estimated cost of using this index */
+  double estimatedCost;           /* Estimated cost of using this index */
+  /* Fields below are only available in SQLite 3.8.2 and later */
+  sqlite3_int64 estimatedRows;    /* Estimated number of rows returned */
 };
 
 /*
@@ -6047,6 +5746,9 @@ typedef struct sqlite3_blob sqlite3_blob;
 ** interface.  Use the [UPDATE] SQL command to change the size of a
 ** blob.
 **
+** ^The [sqlite3_blob_open()] interface will fail for a [WITHOUT ROWID]
+** table.  Incremental BLOB I/O is not possible on [WITHOUT ROWID] tables.
+**
 ** ^The [sqlite3_bind_zeroblob()] and [sqlite3_result_zeroblob()] interfaces
 ** and the built-in [zeroblob] SQL function can be used, if desired,
 ** to create an empty, zero-filled blob in which to read or write using
@@ -6570,7 +6272,10 @@ SQLITE_API int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_SCRATCHMALLOC           17
 #define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
 #define SQLITE_TESTCTRL_EXPLAIN_STMT            19
-#define SQLITE_TESTCTRL_LAST                    19
+#define SQLITE_TESTCTRL_NEVER_CORRUPT           20
+#define SQLITE_TESTCTRL_VDBE_COVERAGE           21
+#define SQLITE_TESTCTRL_BYTEORDER               22
+#define SQLITE_TESTCTRL_LAST                    22
 
 /*
 ** CAPI3REF: SQLite Runtime Status
@@ -6803,6 +6508,12 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r
 ** on subsequent SQLITE_DBSTATUS_CACHE_WRITE requests is undefined.)^ ^The
 ** highwater mark associated with SQLITE_DBSTATUS_CACHE_WRITE is always 0.
 ** </dd>
+**
+** [[SQLITE_DBSTATUS_DEFERRED_FKS]] ^(<dt>SQLITE_DBSTATUS_DEFERRED_FKS</dt>
+** <dd>This parameter returns zero for the current value if and only if
+** all foreign key constraints (deferred or immediate) have been
+** resolved.)^  ^The highwater mark is always 0.
+** </dd>
 ** </dl>
 */
 #define SQLITE_DBSTATUS_LOOKASIDE_USED       0
@@ -6815,7 +6526,8 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r
 #define SQLITE_DBSTATUS_CACHE_HIT            7
 #define SQLITE_DBSTATUS_CACHE_MISS           8
 #define SQLITE_DBSTATUS_CACHE_WRITE          9
-#define SQLITE_DBSTATUS_MAX                  9   /* Largest defined DBSTATUS */
+#define SQLITE_DBSTATUS_DEFERRED_FKS        10
+#define SQLITE_DBSTATUS_MAX                 10   /* Largest defined DBSTATUS */
 
 
 /*
@@ -6869,11 +6581,21 @@ SQLITE_API int sqlite3_stmt_status(sqlite3_stmt*, int op,int resetFlg);
 ** A non-zero value in this counter may indicate an opportunity to
 ** improvement performance by adding permanent indices that do not
 ** need to be reinitialized each time the statement is run.</dd>
+**
+** [[SQLITE_STMTSTATUS_VM_STEP]] <dt>SQLITE_STMTSTATUS_VM_STEP</dt>
+** <dd>^This is the number of virtual machine operations executed
+** by the prepared statement if that number is less than or equal
+** to 2147483647.  The number of virtual machine operations can be 
+** used as a proxy for the total work done by the prepared statement.
+** If the number of virtual machine operations exceeds 2147483647
+** then the value returned by this statement status code is undefined.
+** </dd>
 ** </dl>
 */
 #define SQLITE_STMTSTATUS_FULLSCAN_STEP     1
 #define SQLITE_STMTSTATUS_SORT              2
 #define SQLITE_STMTSTATUS_AUTOINDEX         3
+#define SQLITE_STMTSTATUS_VM_STEP           4
 
 /*
 ** CAPI3REF: Custom Page Cache Object
@@ -7752,7 +7474,7 @@ SQLITE_API int sqlite3_vtab_on_conflict(sqlite3 *);
 #if 0
 }  /* End of the 'extern "C"' block */
 #endif
-#endif
+#endif /* _SQLITE3_H_ */
 
 /*
 ** 2010 August 30
@@ -7776,6 +7498,16 @@ extern "C" {
 #endif
 
 typedef struct sqlite3_rtree_geometry sqlite3_rtree_geometry;
+typedef struct sqlite3_rtree_query_info sqlite3_rtree_query_info;
+
+/* The double-precision datatype used by RTree depends on the
+** SQLITE_RTREE_INT_ONLY compile-time option.
+*/
+#ifdef SQLITE_RTREE_INT_ONLY
+  typedef sqlite3_int64 sqlite3_rtree_dbl;
+#else
+  typedef double sqlite3_rtree_dbl;
+#endif
 
 /*
 ** Register a geometry callback named zGeom that can be used as part of an
@@ -7786,11 +7518,7 @@ typedef struct sqlite3_rtree_geometry sqlite3_rtree_geometry;
 SQLITE_API int sqlite3_rtree_geometry_callback(
   sqlite3 *db,
   const char *zGeom,
-#ifdef SQLITE_RTREE_INT_ONLY
-  int (*xGeom)(sqlite3_rtree_geometry*, int n, sqlite3_int64 *a, int *pRes),
-#else
-  int (*xGeom)(sqlite3_rtree_geometry*, int n, double *a, int *pRes),
-#endif
+  int (*xGeom)(sqlite3_rtree_geometry*, int, sqlite3_rtree_dbl*,int*),
   void *pContext
 );
 
@@ -7802,11 +7530,60 @@ SQLITE_API int sqlite3_rtree_geometry_callback(
 struct sqlite3_rtree_geometry {
   void *pContext;                 /* Copy of pContext passed to s_r_g_c() */
   int nParam;                     /* Size of array aParam[] */
-  double *aParam;                 /* Parameters passed to SQL geom function */
+  sqlite3_rtree_dbl *aParam;      /* Parameters passed to SQL geom function */
   void *pUser;                    /* Callback implementation user data */
   void (*xDelUser)(void *);       /* Called by SQLite to clean up pUser */
 };
 
+/*
+** Register a 2nd-generation geometry callback named zScore that can be 
+** used as part of an R-Tree geometry query as follows:
+**
+**   SELECT ... FROM <rtree> WHERE <rtree col> MATCH $zQueryFunc(... params ...)
+*/
+SQLITE_API int sqlite3_rtree_query_callback(
+  sqlite3 *db,
+  const char *zQueryFunc,
+  int (*xQueryFunc)(sqlite3_rtree_query_info*),
+  void *pContext,
+  void (*xDestructor)(void*)
+);
+
+
+/*
+** A pointer to a structure of the following type is passed as the 
+** argument to scored geometry callback registered using
+** sqlite3_rtree_query_callback().
+**
+** Note that the first 5 fields of this structure are identical to
+** sqlite3_rtree_geometry.  This structure is a subclass of
+** sqlite3_rtree_geometry.
+*/
+struct sqlite3_rtree_query_info {
+  void *pContext;                   /* pContext from when function registered */
+  int nParam;                       /* Number of function parameters */
+  sqlite3_rtree_dbl *aParam;        /* value of function parameters */
+  void *pUser;                      /* callback can use this, if desired */
+  void (*xDelUser)(void*);          /* function to free pUser */
+  sqlite3_rtree_dbl *aCoord;        /* Coordinates of node or entry to check */
+  unsigned int *anQueue;            /* Number of pending entries in the queue */
+  int nCoord;                       /* Number of coordinates */
+  int iLevel;                       /* Level of current node or entry */
+  int mxLevel;                      /* The largest iLevel value in the tree */
+  sqlite3_int64 iRowid;             /* Rowid for current entry */
+  sqlite3_rtree_dbl rParentScore;   /* Score of parent node */
+  int eParentWithin;                /* Visibility of parent node */
+  int eWithin;                      /* OUT: Visiblity */
+  sqlite3_rtree_dbl rScore;         /* OUT: Write the score here */
+};
+
+/*
+** Allowed values for sqlite3_rtree_query.eWithin and .eParentWithin.
+*/
+#define NOT_WITHIN       0   /* Object completely outside of query region */
+#define PARTLY_WITHIN    1   /* Object partially overlaps query region */
+#define FULLY_WITHIN     2   /* Object fully contained within query region */
+
 
 #if 0
 }  /* end of the 'extern "C"' block */
@@ -7817,6 +7594,489 @@ struct sqlite3_rtree_geometry {
 
 /************** End of sqlite3.h *********************************************/
 /************** Continuing where we left off in sqliteInt.h ******************/
+
+/*
+** Include the configuration header output by 'configure' if we're using the
+** autoconf-based build
+*/
+#ifdef _HAVE_SQLITE_CONFIG_H
+#include "config.h"
+#endif
+
+/************** Include sqliteLimit.h in the middle of sqliteInt.h ***********/
+/************** Begin file sqliteLimit.h *************************************/
+/*
+** 2007 May 7
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+** 
+** This file defines various limits of what SQLite can process.
+*/
+
+/*
+** The maximum length of a TEXT or BLOB in bytes.   This also
+** limits the size of a row in a table or index.
+**
+** The hard limit is the ability of a 32-bit signed integer
+** to count the size: 2^31-1 or 2147483647.
+*/
+#ifndef SQLITE_MAX_LENGTH
+# define SQLITE_MAX_LENGTH 1000000000
+#endif
+
+/*
+** This is the maximum number of
+**
+**    * Columns in a table
+**    * Columns in an index
+**    * Columns in a view
+**    * Terms in the SET clause of an UPDATE statement
+**    * Terms in the result set of a SELECT statement
+**    * Terms in the GROUP BY or ORDER BY clauses of a SELECT statement.
+**    * Terms in the VALUES clause of an INSERT statement
+**
+** The hard upper limit here is 32676.  Most database people will
+** tell you that in a well-normalized database, you usually should
+** not have more than a dozen or so columns in any table.  And if
+** that is the case, there is no point in having more than a few
+** dozen values in any of the other situations described above.
+*/
+#ifndef SQLITE_MAX_COLUMN
+# define SQLITE_MAX_COLUMN 2000
+#endif
+
+/*
+** The maximum length of a single SQL statement in bytes.
+**
+** It used to be the case that setting this value to zero would
+** turn the limit off.  That is no longer true.  It is not possible
+** to turn this limit off.
+*/
+#ifndef SQLITE_MAX_SQL_LENGTH
+# define SQLITE_MAX_SQL_LENGTH 1000000000
+#endif
+
+/*
+** The maximum depth of an expression tree. This is limited to 
+** some extent by SQLITE_MAX_SQL_LENGTH. But sometime you might 
+** want to place more severe limits on the complexity of an 
+** expression.
+**
+** A value of 0 used to mean that the limit was not enforced.
+** But that is no longer true.  The limit is now strictly enforced
+** at all times.
+*/
+#ifndef SQLITE_MAX_EXPR_DEPTH
+# define SQLITE_MAX_EXPR_DEPTH 1000
+#endif
+
+/*
+** The maximum number of terms in a compound SELECT statement.
+** The code generator for compound SELECT statements does one
+** level of recursion for each term.  A stack overflow can result
+** if the number of terms is too large.  In practice, most SQL
+** never has more than 3 or 4 terms.  Use a value of 0 to disable
+** any limit on the number of terms in a compount SELECT.
+*/
+#ifndef SQLITE_MAX_COMPOUND_SELECT
+# define SQLITE_MAX_COMPOUND_SELECT 500
+#endif
+
+/*
+** The maximum number of opcodes in a VDBE program.
+** Not currently enforced.
+*/
+#ifndef SQLITE_MAX_VDBE_OP
+# define SQLITE_MAX_VDBE_OP 25000
+#endif
+
+/*
+** The maximum number of arguments to an SQL function.
+*/
+#ifndef SQLITE_MAX_FUNCTION_ARG
+# define SQLITE_MAX_FUNCTION_ARG 127
+#endif
+
+/*
+** The maximum number of in-memory pages to use for the main database
+** table and for temporary tables.  The SQLITE_DEFAULT_CACHE_SIZE
+*/
+#ifndef SQLITE_DEFAULT_CACHE_SIZE
+# define SQLITE_DEFAULT_CACHE_SIZE  2000
+#endif
+#ifndef SQLITE_DEFAULT_TEMP_CACHE_SIZE
+# define SQLITE_DEFAULT_TEMP_CACHE_SIZE  500
+#endif
+
+/*
+** The default number of frames to accumulate in the log file before
+** checkpointing the database in WAL mode.
+*/
+#ifndef SQLITE_DEFAULT_WAL_AUTOCHECKPOINT
+# define SQLITE_DEFAULT_WAL_AUTOCHECKPOINT  1000
+#endif
+
+/*
+** The maximum number of attached databases.  This must be between 0
+** and 62.  The upper bound on 62 is because a 64-bit integer bitmap
+** is used internally to track attached databases.
+*/
+#ifndef SQLITE_MAX_ATTACHED
+# define SQLITE_MAX_ATTACHED 10
+#endif
+
+
+/*
+** The maximum value of a ?nnn wildcard that the parser will accept.
+*/
+#ifndef SQLITE_MAX_VARIABLE_NUMBER
+# define SQLITE_MAX_VARIABLE_NUMBER 999
+#endif
+
+/* Maximum page size.  The upper bound on this value is 65536.  This a limit
+** imposed by the use of 16-bit offsets within each page.
+**
+** Earlier versions of SQLite allowed the user to change this value at
+** compile time. This is no longer permitted, on the grounds that it creates
+** a library that is technically incompatible with an SQLite library 
+** compiled with a different limit. If a process operating on a database 
+** with a page-size of 65536 bytes crashes, then an instance of SQLite 
+** compiled with the default page-size limit will not be able to rollback 
+** the aborted transaction. This could lead to database corruption.
+*/
+#ifdef SQLITE_MAX_PAGE_SIZE
+# undef SQLITE_MAX_PAGE_SIZE
+#endif
+#define SQLITE_MAX_PAGE_SIZE 65536
+
+
+/*
+** The default size of a database page.
+*/
+#ifndef SQLITE_DEFAULT_PAGE_SIZE
+# define SQLITE_DEFAULT_PAGE_SIZE 1024
+#endif
+#if SQLITE_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
+# undef SQLITE_DEFAULT_PAGE_SIZE
+# define SQLITE_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
+#endif
+
+/*
+** Ordinarily, if no value is explicitly provided, SQLite creates databases
+** with page size SQLITE_DEFAULT_PAGE_SIZE. However, based on certain
+** device characteristics (sector-size and atomic write() support),
+** SQLite may choose a larger value. This constant is the maximum value
+** SQLite will choose on its own.
+*/
+#ifndef SQLITE_MAX_DEFAULT_PAGE_SIZE
+# define SQLITE_MAX_DEFAULT_PAGE_SIZE 8192
+#endif
+#if SQLITE_MAX_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE
+# undef SQLITE_MAX_DEFAULT_PAGE_SIZE
+# define SQLITE_MAX_DEFAULT_PAGE_SIZE SQLITE_MAX_PAGE_SIZE
+#endif
+
+
+/*
+** Maximum number of pages in one database file.
+**
+** This is really just the default value for the max_page_count pragma.
+** This value can be lowered (or raised) at run-time using that the
+** max_page_count macro.
+*/
+#ifndef SQLITE_MAX_PAGE_COUNT
+# define SQLITE_MAX_PAGE_COUNT 1073741823
+#endif
+
+/*
+** Maximum length (in bytes) of the pattern in a LIKE or GLOB
+** operator.
+*/
+#ifndef SQLITE_MAX_LIKE_PATTERN_LENGTH
+# define SQLITE_MAX_LIKE_PATTERN_LENGTH 50000
+#endif
+
+/*
+** Maximum depth of recursion for triggers.
+**
+** A value of 1 means that a trigger program will not be able to itself
+** fire any triggers. A value of 0 means that no trigger programs at all 
+** may be executed.
+*/
+#ifndef SQLITE_MAX_TRIGGER_DEPTH
+# define SQLITE_MAX_TRIGGER_DEPTH 1000
+#endif
+
+/************** End of sqliteLimit.h *****************************************/
+/************** Continuing where we left off in sqliteInt.h ******************/
+
+/* Disable nuisance warnings on Borland compilers */
+#if defined(__BORLANDC__)
+#pragma warn -rch /* unreachable code */
+#pragma warn -ccc /* Condition is always true or false */
+#pragma warn -aus /* Assigned value is never used */
+#pragma warn -csu /* Comparing signed and unsigned */
+#pragma warn -spa /* Suspicious pointer arithmetic */
+#endif
+
+/* Needed for various definitions... */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+
+#if defined(__OpenBSD__) && !defined(_BSD_SOURCE)
+# define _BSD_SOURCE
+#endif
+
+/*
+** Include standard header files as necessary
+*/
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
+/*
+** The following macros are used to cast pointers to integers and
+** integers to pointers.  The way you do this varies from one compiler
+** to the next, so we have developed the following set of #if statements
+** to generate appropriate macros for a wide range of compilers.
+**
+** The correct "ANSI" way to do this is to use the intptr_t type. 
+** Unfortunately, that typedef is not available on all compilers, or
+** if it is available, it requires an #include of specific headers
+** that vary from one machine to the next.
+**
+** Ticket #3860:  The llvm-gcc-4.2 compiler from Apple chokes on
+** the ((void*)&((char*)0)[X]) construct.  But MSVC chokes on ((void*)(X)).
+** So we have to define the macros in different ways depending on the
+** compiler.
+*/
+#if defined(__PTRDIFF_TYPE__)  /* This case should work for GCC */
+# define SQLITE_INT_TO_PTR(X)  ((void*)(__PTRDIFF_TYPE__)(X))
+# define SQLITE_PTR_TO_INT(X)  ((int)(__PTRDIFF_TYPE__)(X))
+#elif !defined(__GNUC__)       /* Works for compilers other than LLVM */
+# define SQLITE_INT_TO_PTR(X)  ((void*)&((char*)0)[X])
+# define SQLITE_PTR_TO_INT(X)  ((int)(((char*)X)-(char*)0))
+#elif defined(HAVE_STDINT_H)   /* Use this case if we have ANSI headers */
+# define SQLITE_INT_TO_PTR(X)  ((void*)(intptr_t)(X))
+# define SQLITE_PTR_TO_INT(X)  ((int)(intptr_t)(X))
+#else                          /* Generates a warning - but it always works */
+# define SQLITE_INT_TO_PTR(X)  ((void*)(X))
+# define SQLITE_PTR_TO_INT(X)  ((int)(X))
+#endif
+
+/*
+** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
+** 0 means mutexes are permanently disable and the library is never
+** threadsafe.  1 means the library is serialized which is the highest
+** level of threadsafety.  2 means the library is multithreaded - multiple
+** threads can use SQLite as long as no two threads try to use the same
+** database connection at the same time.
+**
+** Older versions of SQLite used an optional THREADSAFE macro.
+** We support that for legacy.
+*/
+#if !defined(SQLITE_THREADSAFE)
+# if defined(THREADSAFE)
+#   define SQLITE_THREADSAFE THREADSAFE
+# else
+#   define SQLITE_THREADSAFE 1 /* IMP: R-07272-22309 */
+# endif
+#endif
+
+/*
+** Powersafe overwrite is on by default.  But can be turned off using
+** the -DSQLITE_POWERSAFE_OVERWRITE=0 command-line option.
+*/
+#ifndef SQLITE_POWERSAFE_OVERWRITE
+# define SQLITE_POWERSAFE_OVERWRITE 1
+#endif
+
+/*
+** The SQLITE_DEFAULT_MEMSTATUS macro must be defined as either 0 or 1.
+** It determines whether or not the features related to 
+** SQLITE_CONFIG_MEMSTATUS are available by default or not. This value can
+** be overridden at runtime using the sqlite3_config() API.
+*/
+#if !defined(SQLITE_DEFAULT_MEMSTATUS)
+# define SQLITE_DEFAULT_MEMSTATUS 1
+#endif
+
+/*
+** Exactly one of the following macros must be defined in order to
+** specify which memory allocation subsystem to use.
+**
+**     SQLITE_SYSTEM_MALLOC          // Use normal system malloc()
+**     SQLITE_WIN32_MALLOC           // Use Win32 native heap API
+**     SQLITE_ZERO_MALLOC            // Use a stub allocator that always fails
+**     SQLITE_MEMDEBUG               // Debugging version of system malloc()
+**
+** On Windows, if the SQLITE_WIN32_MALLOC_VALIDATE macro is defined and the
+** assert() macro is enabled, each call into the Win32 native heap subsystem
+** will cause HeapValidate to be called.  If heap validation should fail, an
+** assertion will be triggered.
+**
+** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as
+** the default.
+*/
+#if defined(SQLITE_SYSTEM_MALLOC) \
+  + defined(SQLITE_WIN32_MALLOC) \
+  + defined(SQLITE_ZERO_MALLOC) \
+  + defined(SQLITE_MEMDEBUG)>1
+# error "Two or more of the following compile-time configuration options\
+ are defined but at most one is allowed:\
+ SQLITE_SYSTEM_MALLOC, SQLITE_WIN32_MALLOC, SQLITE_MEMDEBUG,\
+ SQLITE_ZERO_MALLOC"
+#endif
+#if defined(SQLITE_SYSTEM_MALLOC) \
+  + defined(SQLITE_WIN32_MALLOC) \
+  + defined(SQLITE_ZERO_MALLOC) \
+  + defined(SQLITE_MEMDEBUG)==0
+# define SQLITE_SYSTEM_MALLOC 1
+#endif
+
+/*
+** If SQLITE_MALLOC_SOFT_LIMIT is not zero, then try to keep the
+** sizes of memory allocations below this value where possible.
+*/
+#if !defined(SQLITE_MALLOC_SOFT_LIMIT)
+# define SQLITE_MALLOC_SOFT_LIMIT 1024
+#endif
+
+/*
+** We need to define _XOPEN_SOURCE as follows in order to enable
+** recursive mutexes on most Unix systems and fchmod() on OpenBSD.
+** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
+** it.
+*/
+#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
+#  define _XOPEN_SOURCE 600
+#endif
+
+/*
+** NDEBUG and SQLITE_DEBUG are opposites.  It should always be true that
+** defined(NDEBUG)==!defined(SQLITE_DEBUG).  If this is not currently true,
+** make it true by defining or undefining NDEBUG.
+**
+** Setting NDEBUG makes the code smaller and faster by disabling the
+** assert() statements in the code.  So we want the default action
+** to be for NDEBUG to be set and NDEBUG to be undefined only if SQLITE_DEBUG
+** is set.  Thus NDEBUG becomes an opt-in rather than an opt-out
+** feature.
+*/
+#if !defined(NDEBUG) && !defined(SQLITE_DEBUG) 
+# define NDEBUG 1
+#endif
+#if defined(NDEBUG) && defined(SQLITE_DEBUG)
+# undef NDEBUG
+#endif
+
+/*
+** Enable SQLITE_ENABLE_EXPLAIN_COMMENTS if SQLITE_DEBUG is turned on.
+*/
+#if !defined(SQLITE_ENABLE_EXPLAIN_COMMENTS) && defined(SQLITE_DEBUG)
+# define SQLITE_ENABLE_EXPLAIN_COMMENTS 1
+#endif
+
+/*
+** The testcase() macro is used to aid in coverage testing.  When 
+** doing coverage testing, the condition inside the argument to
+** testcase() must be evaluated both true and false in order to
+** get full branch coverage.  The testcase() macro is inserted
+** to help ensure adequate test coverage in places where simple
+** condition/decision coverage is inadequate.  For example, testcase()
+** can be used to make sure boundary values are tested.  For
+** bitmask tests, testcase() can be used to make sure each bit
+** is significant and used at least once.  On switch statements
+** where multiple cases go to the same block of code, testcase()
+** can insure that all cases are evaluated.
+**
+*/
+#ifdef SQLITE_COVERAGE_TEST
+SQLITE_PRIVATE   void sqlite3Coverage(int);
+# define testcase(X)  if( X ){ sqlite3Coverage(__LINE__); }
+#else
+# define testcase(X)
+#endif
+
+/*
+** The TESTONLY macro is used to enclose variable declarations or
+** other bits of code that are needed to support the arguments
+** within testcase() and assert() macros.
+*/
+#if !defined(NDEBUG) || defined(SQLITE_COVERAGE_TEST)
+# define TESTONLY(X)  X
+#else
+# define TESTONLY(X)
+#endif
+
+/*
+** Sometimes we need a small amount of code such as a variable initialization
+** to setup for a later assert() statement.  We do not want this code to
+** appear when assert() is disabled.  The following macro is therefore
+** used to contain that setup code.  The "VVA" acronym stands for
+** "Verification, Validation, and Accreditation".  In other words, the
+** code within VVA_ONLY() will only run during verification processes.
+*/
+#ifndef NDEBUG
+# define VVA_ONLY(X)  X
+#else
+# define VVA_ONLY(X)
+#endif
+
+/*
+** The ALWAYS and NEVER macros surround boolean expressions which 
+** are intended to always be true or false, respectively.  Such
+** expressions could be omitted from the code completely.  But they
+** are included in a few cases in order to enhance the resilience
+** of SQLite to unexpected behavior - to make the code "self-healing"
+** or "ductile" rather than being "brittle" and crashing at the first
+** hint of unplanned behavior.
+**
+** In other words, ALWAYS and NEVER are added for defensive code.
+**
+** When doing coverage testing ALWAYS and NEVER are hard-coded to
+** be true and false so that the unreachable code they specify will
+** not be counted as untested code.
+*/
+#if defined(SQLITE_COVERAGE_TEST)
+# define ALWAYS(X)      (1)
+# define NEVER(X)       (0)
+#elif !defined(NDEBUG)
+# define ALWAYS(X)      ((X)?1:(assert(0),0))
+# define NEVER(X)       ((X)?(assert(0),1):0)
+#else
+# define ALWAYS(X)      (X)
+# define NEVER(X)       (X)
+#endif
+
+/*
+** Return true (non-zero) if the input is a integer that is too large
+** to fit in 32-bits.  This macro is used inside of various testcase()
+** macros to verify that we have tested SQLite for large-file support.
+*/
+#define IS_BIG_INT(X)  (((X)&~(i64)0xffffffff)!=0)
+
+/*
+** The macro unlikely() is a hint that surrounds a boolean
+** expression that is usually false.  Macro likely() surrounds
+** a boolean expression that is usually true.  These hints could,
+** in theory, be used by the compiler to generate better code, but
+** currently they are just comments for human readers.
+*/
+#define likely(X)    (X)
+#define unlikely(X)  (X)
+
 /************** Include hash.h in the middle of sqliteInt.h ******************/
 /************** Begin file hash.h ********************************************/
 /*
@@ -7920,163 +8180,165 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*);
 /************** Continuing where we left off in sqliteInt.h ******************/
 /************** Include parse.h in the middle of sqliteInt.h *****************/
 /************** Begin file parse.h *******************************************/
-#define TK_SEMI                            1
-#define TK_EXPLAIN                         2
-#define TK_QUERY                           3
-#define TK_PLAN                            4
-#define TK_BEGIN                           5
-#define TK_TRANSACTION                     6
-#define TK_DEFERRED                        7
-#define TK_IMMEDIATE                       8
-#define TK_EXCLUSIVE                       9
-#define TK_COMMIT                         10
-#define TK_END                            11
-#define TK_ROLLBACK                       12
-#define TK_SAVEPOINT                      13
-#define TK_RELEASE                        14
-#define TK_TO                             15
-#define TK_TABLE                          16
-#define TK_CREATE                         17
-#define TK_IF                             18
-#define TK_NOT                            19
-#define TK_EXISTS                         20
-#define TK_TEMP                           21
-#define TK_LP                             22
-#define TK_RP                             23
-#define TK_AS                             24
-#define TK_COMMA                          25
-#define TK_ID                             26
-#define TK_INDEXED                        27
-#define TK_ABORT                          28
-#define TK_ACTION                         29
-#define TK_AFTER                          30
-#define TK_ANALYZE                        31
-#define TK_ASC                            32
-#define TK_ATTACH                         33
-#define TK_BEFORE                         34
-#define TK_BY                             35
-#define TK_CASCADE                        36
-#define TK_CAST                           37
-#define TK_COLUMNKW                       38
-#define TK_CONFLICT                       39
-#define TK_DATABASE                       40
-#define TK_DESC                           41
-#define TK_DETACH                         42
-#define TK_EACH                           43
-#define TK_FAIL                           44
-#define TK_FOR                            45
-#define TK_IGNORE                         46
-#define TK_INITIALLY                      47
-#define TK_INSTEAD                        48
-#define TK_LIKE_KW                        49
-#define TK_MATCH                          50
-#define TK_NO                             51
-#define TK_KEY                            52
-#define TK_OF                             53
-#define TK_OFFSET                         54
-#define TK_PRAGMA                         55
-#define TK_RAISE                          56
-#define TK_REPLACE                        57
-#define TK_RESTRICT                       58
-#define TK_ROW                            59
-#define TK_TRIGGER                        60
-#define TK_VACUUM                         61
-#define TK_VIEW                           62
-#define TK_VIRTUAL                        63
-#define TK_REINDEX                        64
-#define TK_RENAME                         65
-#define TK_CTIME_KW                       66
-#define TK_ANY                            67
-#define TK_OR                             68
-#define TK_AND                            69
-#define TK_IS                             70
-#define TK_BETWEEN                        71
-#define TK_IN                             72
-#define TK_ISNULL                         73
-#define TK_NOTNULL                        74
-#define TK_NE                             75
-#define TK_EQ                             76
-#define TK_GT                             77
-#define TK_LE                             78
-#define TK_LT                             79
-#define TK_GE                             80
-#define TK_ESCAPE                         81
-#define TK_BITAND                         82
-#define TK_BITOR                          83
-#define TK_LSHIFT                         84
-#define TK_RSHIFT                         85
-#define TK_PLUS                           86
-#define TK_MINUS                          87
-#define TK_STAR                           88
-#define TK_SLASH                          89
-#define TK_REM                            90
-#define TK_CONCAT                         91
-#define TK_COLLATE                        92
-#define TK_BITNOT                         93
-#define TK_STRING                         94
-#define TK_JOIN_KW                        95
-#define TK_CONSTRAINT                     96
-#define TK_DEFAULT                        97
-#define TK_NULL                           98
-#define TK_PRIMARY                        99
-#define TK_UNIQUE                         100
-#define TK_CHECK                          101
-#define TK_REFERENCES                     102
-#define TK_AUTOINCR                       103
-#define TK_ON                             104
-#define TK_INSERT                         105
-#define TK_DELETE                         106
-#define TK_UPDATE                         107
-#define TK_SET                            108
-#define TK_DEFERRABLE                     109
-#define TK_FOREIGN                        110
-#define TK_DROP                           111
-#define TK_UNION                          112
-#define TK_ALL                            113
-#define TK_EXCEPT                         114
-#define TK_INTERSECT                      115
-#define TK_SELECT                         116
-#define TK_DISTINCT                       117
-#define TK_DOT                            118
-#define TK_FROM                           119
-#define TK_JOIN                           120
-#define TK_USING                          121
-#define TK_ORDER                          122
-#define TK_GROUP                          123
-#define TK_HAVING                         124
-#define TK_LIMIT                          125
-#define TK_WHERE                          126
-#define TK_INTO                           127
-#define TK_VALUES                         128
-#define TK_INTEGER                        129
-#define TK_FLOAT                          130
-#define TK_BLOB                           131
-#define TK_REGISTER                       132
-#define TK_VARIABLE                       133
-#define TK_CASE                           134
-#define TK_WHEN                           135
-#define TK_THEN                           136
-#define TK_ELSE                           137
-#define TK_INDEX                          138
-#define TK_ALTER                          139
-#define TK_ADD                            140
-#define TK_TO_TEXT                        141
-#define TK_TO_BLOB                        142
-#define TK_TO_NUMERIC                     143
-#define TK_TO_INT                         144
-#define TK_TO_REAL                        145
-#define TK_ISNOT                          146
-#define TK_END_OF_FILE                    147
-#define TK_ILLEGAL                        148
-#define TK_SPACE                          149
-#define TK_UNCLOSED_STRING                150
-#define TK_FUNCTION                       151
-#define TK_COLUMN                         152
-#define TK_AGG_FUNCTION                   153
-#define TK_AGG_COLUMN                     154
-#define TK_CONST_FUNC                     155
-#define TK_UMINUS                         156
-#define TK_UPLUS                          157
+#define TK_SEMI                             1
+#define TK_EXPLAIN                          2
+#define TK_QUERY                            3
+#define TK_PLAN                             4
+#define TK_BEGIN                            5
+#define TK_TRANSACTION                      6
+#define TK_DEFERRED                         7
+#define TK_IMMEDIATE                        8
+#define TK_EXCLUSIVE                        9
+#define TK_COMMIT                          10
+#define TK_END                             11
+#define TK_ROLLBACK                        12
+#define TK_SAVEPOINT                       13
+#define TK_RELEASE                         14
+#define TK_TO                              15
+#define TK_TABLE                           16
+#define TK_CREATE                          17
+#define TK_IF                              18
+#define TK_NOT                             19
+#define TK_EXISTS                          20
+#define TK_TEMP                            21
+#define TK_LP                              22
+#define TK_RP                              23
+#define TK_AS                              24
+#define TK_WITHOUT                         25
+#define TK_COMMA                           26
+#define TK_ID                              27
+#define TK_INDEXED                         28
+#define TK_ABORT                           29
+#define TK_ACTION                          30
+#define TK_AFTER                           31
+#define TK_ANALYZE                         32
+#define TK_ASC                             33
+#define TK_ATTACH                          34
+#define TK_BEFORE                          35
+#define TK_BY                              36
+#define TK_CASCADE                         37
+#define TK_CAST                            38
+#define TK_COLUMNKW                        39
+#define TK_CONFLICT                        40
+#define TK_DATABASE                        41
+#define TK_DESC                            42
+#define TK_DETACH                          43
+#define TK_EACH                            44
+#define TK_FAIL                            45
+#define TK_FOR                             46
+#define TK_IGNORE                          47
+#define TK_INITIALLY                       48
+#define TK_INSTEAD                         49
+#define TK_LIKE_KW                         50
+#define TK_MATCH                           51
+#define TK_NO                              52
+#define TK_KEY                             53
+#define TK_OF                              54
+#define TK_OFFSET                          55
+#define TK_PRAGMA                          56
+#define TK_RAISE                           57
+#define TK_RECURSIVE                       58
+#define TK_REPLACE                         59
+#define TK_RESTRICT                        60
+#define TK_ROW                             61
+#define TK_TRIGGER                         62
+#define TK_VACUUM                          63
+#define TK_VIEW                            64
+#define TK_VIRTUAL                         65
+#define TK_WITH                            66
+#define TK_REINDEX                         67
+#define TK_RENAME                          68
+#define TK_CTIME_KW                        69
+#define TK_ANY                             70
+#define TK_OR                              71
+#define TK_AND                             72
+#define TK_IS                              73
+#define TK_BETWEEN                         74
+#define TK_IN                              75
+#define TK_ISNULL                          76
+#define TK_NOTNULL                         77
+#define TK_NE                              78
+#define TK_EQ                              79
+#define TK_GT                              80
+#define TK_LE                              81
+#define TK_LT                              82
+#define TK_GE                              83
+#define TK_ESCAPE                          84
+#define TK_BITAND                          85
+#define TK_BITOR                           86
+#define TK_LSHIFT                          87
+#define TK_RSHIFT                          88
+#define TK_PLUS                            89
+#define TK_MINUS                           90
+#define TK_STAR                            91
+#define TK_SLASH                           92
+#define TK_REM                             93
+#define TK_CONCAT                          94
+#define TK_COLLATE                         95
+#define TK_BITNOT                          96
+#define TK_STRING                          97
+#define TK_JOIN_KW                         98
+#define TK_CONSTRAINT                      99
+#define TK_DEFAULT                        100
+#define TK_NULL                           101
+#define TK_PRIMARY                        102
+#define TK_UNIQUE                         103
+#define TK_CHECK                          104
+#define TK_REFERENCES                     105
+#define TK_AUTOINCR                       106
+#define TK_ON                             107
+#define TK_INSERT                         108
+#define TK_DELETE                         109
+#define TK_UPDATE                         110
+#define TK_SET                            111
+#define TK_DEFERRABLE                     112
+#define TK_FOREIGN                        113
+#define TK_DROP                           114
+#define TK_UNION                          115
+#define TK_ALL                            116
+#define TK_EXCEPT                         117
+#define TK_INTERSECT                      118
+#define TK_SELECT                         119
+#define TK_VALUES                         120
+#define TK_DISTINCT                       121
+#define TK_DOT                            122
+#define TK_FROM                           123
+#define TK_JOIN                           124
+#define TK_USING                          125
+#define TK_ORDER                          126
+#define TK_GROUP                          127
+#define TK_HAVING                         128
+#define TK_LIMIT                          129
+#define TK_WHERE                          130
+#define TK_INTO                           131
+#define TK_INTEGER                        132
+#define TK_FLOAT                          133
+#define TK_BLOB                           134
+#define TK_VARIABLE                       135
+#define TK_CASE                           136
+#define TK_WHEN                           137
+#define TK_THEN                           138
+#define TK_ELSE                           139
+#define TK_INDEX                          140
+#define TK_ALTER                          141
+#define TK_ADD                            142
+#define TK_TO_TEXT                        143
+#define TK_TO_BLOB                        144
+#define TK_TO_NUMERIC                     145
+#define TK_TO_INT                         146
+#define TK_TO_REAL                        147
+#define TK_ISNOT                          148
+#define TK_END_OF_FILE                    149
+#define TK_ILLEGAL                        150
+#define TK_SPACE                          151
+#define TK_UNCLOSED_STRING                152
+#define TK_FUNCTION                       153
+#define TK_COLUMN                         154
+#define TK_AGG_FUNCTION                   155
+#define TK_AGG_COLUMN                     156
+#define TK_UMINUS                         157
+#define TK_UPLUS                          158
+#define TK_REGISTER                       159
 
 /************** End of parse.h ***********************************************/
 /************** Continuing where we left off in sqliteInt.h ******************/
@@ -8153,6 +8415,12 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash*);
 #define offsetof(STRUCTURE,FIELD) ((int)((char*)&((STRUCTURE*)0)->FIELD))
 #endif
 
+/*
+** Macros to compute minimum and maximum of two numbers.
+*/
+#define MIN(A,B) ((A)<(B)?(A):(B))
+#define MAX(A,B) ((A)>(B)?(A):(B))
+
 /*
 ** Check to see if this machine uses EBCDIC.  (Yes, believe it or
 ** not, there are still machines out there that use EBCDIC.)
@@ -8236,24 +8504,66 @@ typedef INT8_TYPE i8;              /* 1-byte signed integer */
  typedef u32 tRowcnt;    /* 32-bit is the default */
 #endif
 
+/*
+** Estimated quantities used for query planning are stored as 16-bit
+** logarithms.  For quantity X, the value stored is 10*log2(X).  This
+** gives a possible range of values of approximately 1.0e986 to 1e-986.
+** But the allowed values are "grainy".  Not every value is representable.
+** For example, quantities 16 and 17 are both represented by a LogEst
+** of 40.  However, since LogEst quantaties are suppose to be estimates,
+** not exact values, this imprecision is not a problem.
+**
+** "LogEst" is short for "Logarithmic Estimate".
+**
+** Examples:
+**      1 -> 0              20 -> 43          10000 -> 132
+**      2 -> 10             25 -> 46          25000 -> 146
+**      3 -> 16            100 -> 66        1000000 -> 199
+**      4 -> 20           1000 -> 99        1048576 -> 200
+**     10 -> 33           1024 -> 100    4294967296 -> 320
+**
+** The LogEst can be negative to indicate fractional values. 
+** Examples:
+**
+**    0.5 -> -10           0.1 -> -33        0.0625 -> -40
+*/
+typedef INT16_TYPE LogEst;
+
 /*
 ** Macros to determine whether the machine is big or little endian,
-** evaluated at runtime.
+** and whether or not that determination is run-time or compile-time.
+**
+** For best performance, an attempt is made to guess at the byte-order
+** using C-preprocessor macros.  If that is unsuccessful, or if
+** -DSQLITE_RUNTIME_BYTEORDER=1 is set, then byte-order is determined
+** at run-time.
 */
 #ifdef SQLITE_AMALGAMATION
 SQLITE_PRIVATE const int sqlite3one = 1;
 #else
 SQLITE_PRIVATE const int sqlite3one;
 #endif
-#if defined(i386) || defined(__i386__) || defined(_M_IX86)\
-                             || defined(__x86_64) || defined(__x86_64__)
+#if (defined(i386)     || defined(__i386__)   || defined(_M_IX86) ||    \
+     defined(__x86_64) || defined(__x86_64__) || defined(_M_X64)  ||    \
+     defined(_M_AMD64) || defined(_M_ARM)     || defined(__x86)   ||    \
+     defined(__arm__)) && !defined(SQLITE_RUNTIME_BYTEORDER)
+# define SQLITE_BYTEORDER    1234
 # define SQLITE_BIGENDIAN    0
 # define SQLITE_LITTLEENDIAN 1
 # define SQLITE_UTF16NATIVE  SQLITE_UTF16LE
-#else
+#endif
+#if (defined(sparc)    || defined(__ppc__))  \
+    && !defined(SQLITE_RUNTIME_BYTEORDER)
+# define SQLITE_BYTEORDER    4321
+# define SQLITE_BIGENDIAN    1
+# define SQLITE_LITTLEENDIAN 0
+# define SQLITE_UTF16NATIVE  SQLITE_UTF16BE
+#endif
+#if !defined(SQLITE_BYTEORDER)
+# define SQLITE_BYTEORDER    0     /* 0 means "unknown at compile-time" */
 # define SQLITE_BIGENDIAN    (*(char *)(&sqlite3one)==0)
 # define SQLITE_LITTLEENDIAN (*(char *)(&sqlite3one)==1)
-# define SQLITE_UTF16NATIVE (SQLITE_BIGENDIAN?SQLITE_UTF16BE:SQLITE_UTF16LE)
+# define SQLITE_UTF16NATIVE  (SQLITE_BIGENDIAN?SQLITE_UTF16BE:SQLITE_UTF16LE)
 #endif
 
 /*
@@ -8334,6 +8644,20 @@ SQLITE_PRIVATE const int sqlite3one;
 # define SQLITE_DEFAULT_MMAP_SIZE SQLITE_MAX_MMAP_SIZE
 #endif
 
+/*
+** Only one of SQLITE_ENABLE_STAT3 or SQLITE_ENABLE_STAT4 can be defined.
+** Priority is given to SQLITE_ENABLE_STAT4.  If either are defined, also
+** define SQLITE_ENABLE_STAT3_OR_STAT4
+*/
+#ifdef SQLITE_ENABLE_STAT4
+# undef SQLITE_ENABLE_STAT3
+# define SQLITE_ENABLE_STAT3_OR_STAT4 1
+#elif SQLITE_ENABLE_STAT3
+# define SQLITE_ENABLE_STAT3_OR_STAT4 1
+#elif SQLITE_ENABLE_STAT3_OR_STAT4
+# undef SQLITE_ENABLE_STAT3_OR_STAT4
+#endif
+
 /*
 ** An instance of the following structure is used to store the busy-handler
 ** callback for a given sqlite handle. 
@@ -8462,6 +8786,7 @@ typedef struct LookasideSlot LookasideSlot;
 typedef struct Module Module;
 typedef struct NameContext NameContext;
 typedef struct Parse Parse;
+typedef struct PrintfArguments PrintfArguments;
 typedef struct RowSet RowSet;
 typedef struct Savepoint Savepoint;
 typedef struct Select Select;
@@ -8478,9 +8803,8 @@ typedef struct UnpackedRecord UnpackedRecord;
 typedef struct VTable VTable;
 typedef struct VtabCtx VtabCtx;
 typedef struct Walker Walker;
-typedef struct WherePlan WherePlan;
 typedef struct WhereInfo WhereInfo;
-typedef struct WhereLevel WhereLevel;
+typedef struct With With;
 
 /*
 ** Defer sourcing vdbe.h and btree.h until after the "u8" and 
@@ -8554,8 +8878,10 @@ SQLITE_PRIVATE int sqlite3BtreeOpen(
 
 SQLITE_PRIVATE int sqlite3BtreeClose(Btree*);
 SQLITE_PRIVATE int sqlite3BtreeSetCacheSize(Btree*,int);
-SQLITE_PRIVATE int sqlite3BtreeSetMmapLimit(Btree*,sqlite3_int64);
-SQLITE_PRIVATE int sqlite3BtreeSetSafetyLevel(Btree*,int,int,int);
+#if SQLITE_MAX_MMAP_SIZE>0
+SQLITE_PRIVATE   int sqlite3BtreeSetMmapLimit(Btree*,sqlite3_int64);
+#endif
+SQLITE_PRIVATE int sqlite3BtreeSetPagerFlags(Btree*,unsigned);
 SQLITE_PRIVATE int sqlite3BtreeSyncDisabled(Btree*);
 SQLITE_PRIVATE int sqlite3BtreeSetPageSize(Btree *p, int nPagesize, int nReserve, int eFix);
 SQLITE_PRIVATE int sqlite3BtreeGetPageSize(Btree*);
@@ -8604,6 +8930,7 @@ SQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *);
 
 SQLITE_PRIVATE int sqlite3BtreeDropTable(Btree*, int, int*);
 SQLITE_PRIVATE int sqlite3BtreeClearTable(Btree*, int, int*);
+SQLITE_PRIVATE int sqlite3BtreeClearTableOfCursor(BtCursor*);
 SQLITE_PRIVATE void sqlite3BtreeTripAllCursors(Btree*, int);
 
 SQLITE_PRIVATE void sqlite3BtreeGetMeta(Btree *pBtree, int idx, u32 *pValue);
@@ -8669,21 +8996,20 @@ SQLITE_PRIVATE int sqlite3BtreeEof(BtCursor*);
 SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor*, int *pRes);
 SQLITE_PRIVATE int sqlite3BtreeKeySize(BtCursor*, i64 *pSize);
 SQLITE_PRIVATE int sqlite3BtreeKey(BtCursor*, u32 offset, u32 amt, void*);
-SQLITE_PRIVATE const void *sqlite3BtreeKeyFetch(BtCursor*, int *pAmt);
-SQLITE_PRIVATE const void *sqlite3BtreeDataFetch(BtCursor*, int *pAmt);
+SQLITE_PRIVATE const void *sqlite3BtreeKeyFetch(BtCursor*, u32 *pAmt);
+SQLITE_PRIVATE const void *sqlite3BtreeDataFetch(BtCursor*, u32 *pAmt);
 SQLITE_PRIVATE int sqlite3BtreeDataSize(BtCursor*, u32 *pSize);
 SQLITE_PRIVATE int sqlite3BtreeData(BtCursor*, u32 offset, u32 amt, void*);
-SQLITE_PRIVATE void sqlite3BtreeSetCachedRowid(BtCursor*, sqlite3_int64);
-SQLITE_PRIVATE sqlite3_int64 sqlite3BtreeGetCachedRowid(BtCursor*);
 
 SQLITE_PRIVATE char *sqlite3BtreeIntegrityCheck(Btree*, int *aRoot, int nRoot, int, int*);
 SQLITE_PRIVATE struct Pager *sqlite3BtreePager(Btree*);
 
 SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor*, u32 offset, u32 amt, void*);
-SQLITE_PRIVATE void sqlite3BtreeCacheOverflow(BtCursor *);
+SQLITE_PRIVATE void sqlite3BtreeIncrblobCursor(BtCursor *);
 SQLITE_PRIVATE void sqlite3BtreeClearCursor(BtCursor *);
 SQLITE_PRIVATE int sqlite3BtreeSetVersion(Btree *pBt, int iVersion);
 SQLITE_PRIVATE void sqlite3BtreeCursorHints(BtCursor *, unsigned int mask);
+SQLITE_PRIVATE int sqlite3BtreeIsReadonly(Btree *pBt);
 
 #ifndef NDEBUG
 SQLITE_PRIVATE int sqlite3BtreeCursorIsValid(BtCursor*);
@@ -8779,7 +9105,6 @@ typedef struct Vdbe Vdbe;
 ** The names of the following types declared in vdbeInt.h are required
 ** for the VdbeOp definition.
 */
-typedef struct VdbeFunc VdbeFunc;
 typedef struct Mem Mem;
 typedef struct SubProgram SubProgram;
 
@@ -8803,7 +9128,6 @@ struct VdbeOp {
     i64 *pI64;             /* Used when p4type is P4_INT64 */
     double *pReal;         /* Used when p4type is P4_REAL */
     FuncDef *pFunc;        /* Used when p4type is P4_FUNCDEF */
-    VdbeFunc *pVdbeFunc;   /* Used when p4type is P4_VDBEFUNC */
     CollSeq *pColl;        /* Used when p4type is P4_COLLSEQ */
     Mem *pMem;             /* Used when p4type is P4_MEM */
     VTable *pVtab;         /* Used when p4type is P4_VTAB */
@@ -8812,13 +9136,16 @@ struct VdbeOp {
     SubProgram *pProgram;  /* Used when p4type is P4_SUBPROGRAM */
     int (*xAdvance)(BtCursor *, int *);
   } p4;
-#ifdef SQLITE_DEBUG
+#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
   char *zComment;          /* Comment to improve readability */
 #endif
 #ifdef VDBE_PROFILE
-  int cnt;                 /* Number of times this instruction was executed */
+  u32 cnt;                 /* Number of times this instruction was executed */
   u64 cycles;              /* Total time spent executing this instruction */
 #endif
+#ifdef SQLITE_VDBE_COVERAGE
+  int iSrcLine;            /* Source-code line that generated this opcode */
+#endif
 };
 typedef struct VdbeOp VdbeOp;
 
@@ -8857,7 +9184,6 @@ typedef struct VdbeOpList VdbeOpList;
 #define P4_COLLSEQ  (-4)  /* P4 is a pointer to a CollSeq structure */
 #define P4_FUNCDEF  (-5)  /* P4 is a pointer to a FuncDef structure */
 #define P4_KEYINFO  (-6)  /* P4 is a pointer to a KeyInfo structure */
-#define P4_VDBEFUNC (-7)  /* P4 is a pointer to a VdbeFunc structure */
 #define P4_MEM      (-8)  /* P4 is a pointer to a Mem*    structure */
 #define P4_TRANSIENT  0   /* P4 is a pointer to a transient string */
 #define P4_VTAB     (-10) /* P4 is a pointer to an sqlite3_vtab structure */
@@ -8869,15 +9195,11 @@ typedef struct VdbeOpList VdbeOpList;
 #define P4_SUBPROGRAM  (-18) /* P4 is a pointer to a SubProgram structure */
 #define P4_ADVANCE  (-19) /* P4 is a pointer to BtreeNext() or BtreePrev() */
 
-/* When adding a P4 argument using P4_KEYINFO, a copy of the KeyInfo structure
-** is made.  That copy is freed when the Vdbe is finalized.  But if the
-** argument is P4_KEYINFO_HANDOFF, the passed in pointer is used.  It still
-** gets freed when the Vdbe is finalized so it still should be obtained
-** from a single sqliteMalloc().  But no copy is made and the calling
-** function should *not* try to free the KeyInfo.
-*/
-#define P4_KEYINFO_HANDOFF (-16)
-#define P4_KEYINFO_STATIC  (-17)
+/* Error message codes for OP_Halt */
+#define P5_ConstraintNotNull 1
+#define P5_ConstraintUnique  2
+#define P5_ConstraintCheck   3
+#define P5_ConstraintFK      4
 
 /*
 ** The Vdbe.aColName array contains 5n Mem structures, where n is the 
@@ -8914,156 +9236,163 @@ typedef struct VdbeOpList VdbeOpList;
 /************** Begin file opcodes.h *****************************************/
 /* Automatically generated.  Do not edit */
 /* See the mkopcodeh.awk script for details */
-#define OP_Goto                                 1
-#define OP_Gosub                                2
-#define OP_Return                               3
-#define OP_Yield                                4
-#define OP_HaltIfNull                           5
-#define OP_Halt                                 6
-#define OP_Integer                              7
-#define OP_Int64                                8
-#define OP_Real                               130   /* same as TK_FLOAT    */
-#define OP_String8                             94   /* same as TK_STRING   */
-#define OP_String                               9
-#define OP_Null                                10
-#define OP_Blob                                11
-#define OP_Variable                            12
-#define OP_Move                                13
-#define OP_Copy                                14
-#define OP_SCopy                               15
-#define OP_ResultRow                           16
-#define OP_Concat                              91   /* same as TK_CONCAT   */
-#define OP_Add                                 86   /* same as TK_PLUS     */
-#define OP_Subtract                            87   /* same as TK_MINUS    */
-#define OP_Multiply                            88   /* same as TK_STAR     */
-#define OP_Divide                              89   /* same as TK_SLASH    */
-#define OP_Remainder                           90   /* same as TK_REM      */
-#define OP_CollSeq                             17
-#define OP_Function                            18
-#define OP_BitAnd                              82   /* same as TK_BITAND   */
-#define OP_BitOr                               83   /* same as TK_BITOR    */
-#define OP_ShiftLeft                           84   /* same as TK_LSHIFT   */
-#define OP_ShiftRight                          85   /* same as TK_RSHIFT   */
-#define OP_AddImm                              20
-#define OP_MustBeInt                           21
-#define OP_RealAffinity                        22
-#define OP_ToText                             141   /* same as TK_TO_TEXT  */
-#define OP_ToBlob                             142   /* same as TK_TO_BLOB  */
-#define OP_ToNumeric                          143   /* same as TK_TO_NUMERIC*/
-#define OP_ToInt                              144   /* same as TK_TO_INT   */
-#define OP_ToReal                             145   /* same as TK_TO_REAL  */
-#define OP_Eq                                  76   /* same as TK_EQ       */
-#define OP_Ne                                  75   /* same as TK_NE       */
-#define OP_Lt                                  79   /* same as TK_LT       */
-#define OP_Le                                  78   /* same as TK_LE       */
-#define OP_Gt                                  77   /* same as TK_GT       */
-#define OP_Ge                                  80   /* same as TK_GE       */
-#define OP_Permutation                         23
-#define OP_Compare                             24
-#define OP_Jump                                25
-#define OP_And                                 69   /* same as TK_AND      */
-#define OP_Or                                  68   /* same as TK_OR       */
-#define OP_Not                                 19   /* same as TK_NOT      */
-#define OP_BitNot                              93   /* same as TK_BITNOT   */
-#define OP_Once                                26
-#define OP_If                                  27
-#define OP_IfNot                               28
-#define OP_IsNull                              73   /* same as TK_ISNULL   */
-#define OP_NotNull                             74   /* same as TK_NOTNULL  */
-#define OP_Column                              29
-#define OP_Affinity                            30
-#define OP_MakeRecord                          31
-#define OP_Count                               32
-#define OP_Savepoint                           33
-#define OP_AutoCommit                          34
-#define OP_Transaction                         35
-#define OP_ReadCookie                          36
-#define OP_SetCookie                           37
-#define OP_VerifyCookie                        38
-#define OP_OpenRead                            39
-#define OP_OpenWrite                           40
-#define OP_OpenAutoindex                       41
-#define OP_OpenEphemeral                       42
-#define OP_SorterOpen                          43
-#define OP_OpenPseudo                          44
-#define OP_Close                               45
-#define OP_SeekLt                              46
-#define OP_SeekLe                              47
-#define OP_SeekGe                              48
-#define OP_SeekGt                              49
-#define OP_Seek                                50
-#define OP_NotFound                            51
-#define OP_Found                               52
-#define OP_IsUnique                            53
-#define OP_NotExists                           54
-#define OP_Sequence                            55
-#define OP_NewRowid                            56
-#define OP_Insert                              57
-#define OP_InsertInt                           58
-#define OP_Delete                              59
-#define OP_ResetCount                          60
-#define OP_SorterCompare                       61
-#define OP_SorterData                          62
-#define OP_RowKey                              63
-#define OP_RowData                             64
-#define OP_Rowid                               65
-#define OP_NullRow                             66
-#define OP_Last                                67
-#define OP_SorterSort                          70
-#define OP_Sort                                71
-#define OP_Rewind                              72
-#define OP_SorterNext                          81
-#define OP_Prev                                92
-#define OP_Next                                95
-#define OP_SorterInsert                        96
-#define OP_IdxInsert                           97
-#define OP_IdxDelete                           98
-#define OP_IdxRowid                            99
-#define OP_IdxLT                              100
-#define OP_IdxGE                              101
-#define OP_Destroy                            102
-#define OP_Clear                              103
-#define OP_CreateIndex                        104
-#define OP_CreateTable                        105
-#define OP_ParseSchema                        106
-#define OP_LoadAnalysis                       107
-#define OP_DropTable                          108
-#define OP_DropIndex                          109
-#define OP_DropTrigger                        110
-#define OP_IntegrityCk                        111
-#define OP_RowSetAdd                          112
-#define OP_RowSetRead                         113
-#define OP_RowSetTest                         114
-#define OP_Program                            115
-#define OP_Param                              116
-#define OP_FkCounter                          117
-#define OP_FkIfZero                           118
-#define OP_MemMax                             119
-#define OP_IfPos                              120
-#define OP_IfNeg                              121
-#define OP_IfZero                             122
-#define OP_AggStep                            123
-#define OP_AggFinal                           124
-#define OP_Checkpoint                         125
-#define OP_JournalMode                        126
-#define OP_Vacuum                             127
-#define OP_IncrVacuum                         128
-#define OP_Expire                             129
-#define OP_TableLock                          131
-#define OP_VBegin                             132
-#define OP_VCreate                            133
-#define OP_VDestroy                           134
-#define OP_VOpen                              135
-#define OP_VFilter                            136
-#define OP_VColumn                            137
-#define OP_VNext                              138
-#define OP_VRename                            139
-#define OP_VUpdate                            140
-#define OP_Pagecount                          146
-#define OP_MaxPgcnt                           147
-#define OP_Trace                              148
-#define OP_Noop                               149
-#define OP_Explain                            150
+#define OP_Function        1 /* synopsis: r[P3]=func(r[P2@P5])             */
+#define OP_Savepoint       2
+#define OP_AutoCommit      3
+#define OP_Transaction     4
+#define OP_SorterNext      5
+#define OP_PrevIfOpen      6
+#define OP_NextIfOpen      7
+#define OP_Prev            8
+#define OP_Next            9
+#define OP_AggStep        10 /* synopsis: accum=r[P3] step(r[P2@P5])       */
+#define OP_Checkpoint     11
+#define OP_JournalMode    12
+#define OP_Vacuum         13
+#define OP_VFilter        14 /* synopsis: iplan=r[P3] zplan='P4'           */
+#define OP_VUpdate        15 /* synopsis: data=r[P3@P2]                    */
+#define OP_Goto           16
+#define OP_Gosub          17
+#define OP_Return         18
+#define OP_Not            19 /* same as TK_NOT, synopsis: r[P2]= !r[P1]    */
+#define OP_InitCoroutine  20
+#define OP_EndCoroutine   21
+#define OP_Yield          22
+#define OP_HaltIfNull     23 /* synopsis: if r[P3]=null halt               */
+#define OP_Halt           24
+#define OP_Integer        25 /* synopsis: r[P2]=P1                         */
+#define OP_Int64          26 /* synopsis: r[P2]=P4                         */
+#define OP_String         27 /* synopsis: r[P2]='P4' (len=P1)              */
+#define OP_Null           28 /* synopsis: r[P2..P3]=NULL                   */
+#define OP_SoftNull       29 /* synopsis: r[P1]=NULL                       */
+#define OP_Blob           30 /* synopsis: r[P2]=P4 (len=P1)                */
+#define OP_Variable       31 /* synopsis: r[P2]=parameter(P1,P4)           */
+#define OP_Move           32 /* synopsis: r[P2@P3]=r[P1@P3]                */
+#define OP_Copy           33 /* synopsis: r[P2@P3+1]=r[P1@P3+1]            */
+#define OP_SCopy          34 /* synopsis: r[P2]=r[P1]                      */
+#define OP_ResultRow      35 /* synopsis: output=r[P1@P2]                  */
+#define OP_CollSeq        36
+#define OP_AddImm         37 /* synopsis: r[P1]=r[P1]+P2                   */
+#define OP_MustBeInt      38
+#define OP_RealAffinity   39
+#define OP_Permutation    40
+#define OP_Compare        41 /* synopsis: r[P1@P3] <-> r[P2@P3]            */
+#define OP_Jump           42
+#define OP_Once           43
+#define OP_If             44
+#define OP_IfNot          45
+#define OP_Column         46 /* synopsis: r[P3]=PX                         */
+#define OP_Affinity       47 /* synopsis: affinity(r[P1@P2])               */
+#define OP_MakeRecord     48 /* synopsis: r[P3]=mkrec(r[P1@P2])            */
+#define OP_Count          49 /* synopsis: r[P2]=count()                    */
+#define OP_ReadCookie     50
+#define OP_SetCookie      51
+#define OP_OpenRead       52 /* synopsis: root=P2 iDb=P3                   */
+#define OP_OpenWrite      53 /* synopsis: root=P2 iDb=P3                   */
+#define OP_OpenAutoindex  54 /* synopsis: nColumn=P2                       */
+#define OP_OpenEphemeral  55 /* synopsis: nColumn=P2                       */
+#define OP_SorterOpen     56
+#define OP_OpenPseudo     57 /* synopsis: P3 columns in r[P2]              */
+#define OP_Close          58
+#define OP_SeekLT         59
+#define OP_SeekLE         60
+#define OP_SeekGE         61
+#define OP_SeekGT         62
+#define OP_Seek           63 /* synopsis: intkey=r[P2]                     */
+#define OP_NoConflict     64 /* synopsis: key=r[P3@P4]                     */
+#define OP_NotFound       65 /* synopsis: key=r[P3@P4]                     */
+#define OP_Found          66 /* synopsis: key=r[P3@P4]                     */
+#define OP_NotExists      67 /* synopsis: intkey=r[P3]                     */
+#define OP_Sequence       68 /* synopsis: r[P2]=cursor[P1].ctr++           */
+#define OP_NewRowid       69 /* synopsis: r[P2]=rowid                      */
+#define OP_Insert         70 /* synopsis: intkey=r[P3] data=r[P2]          */
+#define OP_Or             71 /* same as TK_OR, synopsis: r[P3]=(r[P1] || r[P2]) */
+#define OP_And            72 /* same as TK_AND, synopsis: r[P3]=(r[P1] && r[P2]) */
+#define OP_InsertInt      73 /* synopsis: intkey=P3 data=r[P2]             */
+#define OP_Delete         74
+#define OP_ResetCount     75
+#define OP_IsNull         76 /* same as TK_ISNULL, synopsis: if r[P1]==NULL goto P2 */
+#define OP_NotNull        77 /* same as TK_NOTNULL, synopsis: if r[P1]!=NULL goto P2 */
+#define OP_Ne             78 /* same as TK_NE, synopsis: if r[P1]!=r[P3] goto P2 */
+#define OP_Eq             79 /* same as TK_EQ, synopsis: if r[P1]==r[P3] goto P2 */
+#define OP_Gt             80 /* same as TK_GT, synopsis: if r[P1]>r[P3] goto P2 */
+#define OP_Le             81 /* same as TK_LE, synopsis: if r[P1]<=r[P3] goto P2 */
+#define OP_Lt             82 /* same as TK_LT, synopsis: if r[P1]<r[P3] goto P2 */
+#define OP_Ge             83 /* same as TK_GE, synopsis: if r[P1]>=r[P3] goto P2 */
+#define OP_SorterCompare  84 /* synopsis: if key(P1)!=rtrim(r[P3],P4) goto P2 */
+#define OP_BitAnd         85 /* same as TK_BITAND, synopsis: r[P3]=r[P1]&r[P2] */
+#define OP_BitOr          86 /* same as TK_BITOR, synopsis: r[P3]=r[P1]|r[P2] */
+#define OP_ShiftLeft      87 /* same as TK_LSHIFT, synopsis: r[P3]=r[P2]<<r[P1] */
+#define OP_ShiftRight     88 /* same as TK_RSHIFT, synopsis: r[P3]=r[P2]>>r[P1] */
+#define OP_Add            89 /* same as TK_PLUS, synopsis: r[P3]=r[P1]+r[P2] */
+#define OP_Subtract       90 /* same as TK_MINUS, synopsis: r[P3]=r[P2]-r[P1] */
+#define OP_Multiply       91 /* same as TK_STAR, synopsis: r[P3]=r[P1]*r[P2] */
+#define OP_Divide         92 /* same as TK_SLASH, synopsis: r[P3]=r[P2]/r[P1] */
+#define OP_Remainder      93 /* same as TK_REM, synopsis: r[P3]=r[P2]%r[P1] */
+#define OP_Concat         94 /* same as TK_CONCAT, synopsis: r[P3]=r[P2]+r[P1] */
+#define OP_SorterData     95 /* synopsis: r[P2]=data                       */
+#define OP_BitNot         96 /* same as TK_BITNOT, synopsis: r[P1]= ~r[P1] */
+#define OP_String8        97 /* same as TK_STRING, synopsis: r[P2]='P4'    */
+#define OP_RowKey         98 /* synopsis: r[P2]=key                        */
+#define OP_RowData        99 /* synopsis: r[P2]=data                       */
+#define OP_Rowid         100 /* synopsis: r[P2]=rowid                      */
+#define OP_NullRow       101
+#define OP_Last          102
+#define OP_SorterSort    103
+#define OP_Sort          104
+#define OP_Rewind        105
+#define OP_SorterInsert  106
+#define OP_IdxInsert     107 /* synopsis: key=r[P2]                        */
+#define OP_IdxDelete     108 /* synopsis: key=r[P2@P3]                     */
+#define OP_IdxRowid      109 /* synopsis: r[P2]=rowid                      */
+#define OP_IdxLE         110 /* synopsis: key=r[P3@P4]                     */
+#define OP_IdxGT         111 /* synopsis: key=r[P3@P4]                     */
+#define OP_IdxLT         112 /* synopsis: key=r[P3@P4]                     */
+#define OP_IdxGE         113 /* synopsis: key=r[P3@P4]                     */
+#define OP_Destroy       114
+#define OP_Clear         115
+#define OP_ResetSorter   116
+#define OP_CreateIndex   117 /* synopsis: r[P2]=root iDb=P1                */
+#define OP_CreateTable   118 /* synopsis: r[P2]=root iDb=P1                */
+#define OP_ParseSchema   119
+#define OP_LoadAnalysis  120
+#define OP_DropTable     121
+#define OP_DropIndex     122
+#define OP_DropTrigger   123
+#define OP_IntegrityCk   124
+#define OP_RowSetAdd     125 /* synopsis: rowset(P1)=r[P2]                 */
+#define OP_RowSetRead    126 /* synopsis: r[P3]=rowset(P1)                 */
+#define OP_RowSetTest    127 /* synopsis: if r[P3] in rowset(P1) goto P2   */
+#define OP_Program       128
+#define OP_Param         129
+#define OP_FkCounter     130 /* synopsis: fkctr[P1]+=P2                    */
+#define OP_FkIfZero      131 /* synopsis: if fkctr[P1]==0 goto P2          */
+#define OP_MemMax        132 /* synopsis: r[P1]=max(r[P1],r[P2])           */
+#define OP_Real          133 /* same as TK_FLOAT, synopsis: r[P2]=P4       */
+#define OP_IfPos         134 /* synopsis: if r[P1]>0 goto P2               */
+#define OP_IfNeg         135 /* synopsis: if r[P1]<0 goto P2               */
+#define OP_IfZero        136 /* synopsis: r[P1]+=P3, if r[P1]==0 goto P2   */
+#define OP_AggFinal      137 /* synopsis: accum=r[P1] N=P2                 */
+#define OP_IncrVacuum    138
+#define OP_Expire        139
+#define OP_TableLock     140 /* synopsis: iDb=P1 root=P2 write=P3          */
+#define OP_VBegin        141
+#define OP_VCreate       142
+#define OP_ToText        143 /* same as TK_TO_TEXT                         */
+#define OP_ToBlob        144 /* same as TK_TO_BLOB                         */
+#define OP_ToNumeric     145 /* same as TK_TO_NUMERIC                      */
+#define OP_ToInt         146 /* same as TK_TO_INT                          */
+#define OP_ToReal        147 /* same as TK_TO_REAL                         */
+#define OP_VDestroy      148
+#define OP_VOpen         149
+#define OP_VColumn       150 /* synopsis: r[P3]=vcolumn(P2)                */
+#define OP_VNext         151
+#define OP_VRename       152
+#define OP_Pagecount     153
+#define OP_MaxPgcnt      154
+#define OP_Init          155 /* synopsis: Start at P2                      */
+#define OP_Noop          156
+#define OP_Explain       157
 
 
 /* Properties such as "out2" or "jump" that are specified in
@@ -9078,25 +9407,26 @@ typedef struct VdbeOpList VdbeOpList;
 #define OPFLG_OUT2            0x0020  /* out2:  P2 is an output */
 #define OPFLG_OUT3            0x0040  /* out3:  P3 is an output */
 #define OPFLG_INITIALIZER {\
-/*   0 */ 0x00, 0x01, 0x01, 0x04, 0x04, 0x10, 0x00, 0x02,\
-/*   8 */ 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x24,\
-/*  16 */ 0x00, 0x00, 0x00, 0x24, 0x04, 0x05, 0x04, 0x00,\
-/*  24 */ 0x00, 0x01, 0x01, 0x05, 0x05, 0x00, 0x00, 0x00,\
-/*  32 */ 0x02, 0x00, 0x00, 0x00, 0x02, 0x10, 0x00, 0x00,\
-/*  40 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11,\
-/*  48 */ 0x11, 0x11, 0x08, 0x11, 0x11, 0x11, 0x11, 0x02,\
-/*  56 */ 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
-/*  64 */ 0x00, 0x02, 0x00, 0x01, 0x4c, 0x4c, 0x01, 0x01,\
-/*  72 */ 0x01, 0x05, 0x05, 0x15, 0x15, 0x15, 0x15, 0x15,\
-/*  80 */ 0x15, 0x01, 0x4c, 0x4c, 0x4c, 0x4c, 0x4c, 0x4c,\
-/*  88 */ 0x4c, 0x4c, 0x4c, 0x4c, 0x01, 0x24, 0x02, 0x01,\
-/*  96 */ 0x08, 0x08, 0x00, 0x02, 0x01, 0x01, 0x02, 0x00,\
-/* 104 */ 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
-/* 112 */ 0x0c, 0x45, 0x15, 0x01, 0x02, 0x00, 0x01, 0x08,\
-/* 120 */ 0x05, 0x05, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00,\
-/* 128 */ 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,\
-/* 136 */ 0x01, 0x00, 0x01, 0x00, 0x00, 0x04, 0x04, 0x04,\
-/* 144 */ 0x04, 0x04, 0x02, 0x02, 0x00, 0x00, 0x00,}
+/*   0 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,\
+/*   8 */ 0x01, 0x01, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00,\
+/*  16 */ 0x01, 0x01, 0x04, 0x24, 0x01, 0x04, 0x05, 0x10,\
+/*  24 */ 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02,\
+/*  32 */ 0x00, 0x00, 0x20, 0x00, 0x00, 0x04, 0x05, 0x04,\
+/*  40 */ 0x00, 0x00, 0x01, 0x01, 0x05, 0x05, 0x00, 0x00,\
+/*  48 */ 0x00, 0x02, 0x02, 0x10, 0x00, 0x00, 0x00, 0x00,\
+/*  56 */ 0x00, 0x00, 0x00, 0x11, 0x11, 0x11, 0x11, 0x08,\
+/*  64 */ 0x11, 0x11, 0x11, 0x11, 0x02, 0x02, 0x00, 0x4c,\
+/*  72 */ 0x4c, 0x00, 0x00, 0x00, 0x05, 0x05, 0x15, 0x15,\
+/*  80 */ 0x15, 0x15, 0x15, 0x15, 0x00, 0x4c, 0x4c, 0x4c,\
+/*  88 */ 0x4c, 0x4c, 0x4c, 0x4c, 0x4c, 0x4c, 0x4c, 0x00,\
+/*  96 */ 0x24, 0x02, 0x00, 0x00, 0x02, 0x00, 0x01, 0x01,\
+/* 104 */ 0x01, 0x01, 0x08, 0x08, 0x00, 0x02, 0x01, 0x01,\
+/* 112 */ 0x01, 0x01, 0x02, 0x00, 0x00, 0x02, 0x02, 0x00,\
+/* 120 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x45, 0x15,\
+/* 128 */ 0x01, 0x02, 0x00, 0x01, 0x08, 0x02, 0x05, 0x05,\
+/* 136 */ 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04,\
+/* 144 */ 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x01,\
+/* 152 */ 0x00, 0x02, 0x02, 0x01, 0x00, 0x00,}
 
 /************** End of opcodes.h *********************************************/
 /************** Continuing where we left off in vdbe.h ***********************/
@@ -9105,14 +9435,14 @@ typedef struct VdbeOpList VdbeOpList;
 ** Prototypes for the VDBE interface.  See comments on the implementation
 ** for a description of what each of these routines does.
 */
-SQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(sqlite3*);
+SQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(Parse*);
 SQLITE_PRIVATE int sqlite3VdbeAddOp0(Vdbe*,int);
 SQLITE_PRIVATE int sqlite3VdbeAddOp1(Vdbe*,int,int);
 SQLITE_PRIVATE int sqlite3VdbeAddOp2(Vdbe*,int,int,int);
 SQLITE_PRIVATE int sqlite3VdbeAddOp3(Vdbe*,int,int,int,int);
 SQLITE_PRIVATE int sqlite3VdbeAddOp4(Vdbe*,int,int,int,int,const char *zP4,int);
 SQLITE_PRIVATE int sqlite3VdbeAddOp4Int(Vdbe*,int,int,int,int,int);
-SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp);
+SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp, int iLineno);
 SQLITE_PRIVATE void sqlite3VdbeAddParseSchemaOp(Vdbe*,int,char*);
 SQLITE_PRIVATE void sqlite3VdbeChangeP1(Vdbe*, u32 addr, int P1);
 SQLITE_PRIVATE void sqlite3VdbeChangeP2(Vdbe*, u32 addr, int P2);
@@ -9120,7 +9450,9 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP3(Vdbe*, u32 addr, int P3);
 SQLITE_PRIVATE void sqlite3VdbeChangeP5(Vdbe*, u8 P5);
 SQLITE_PRIVATE void sqlite3VdbeJumpHere(Vdbe*, int addr);
 SQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe*, int addr);
+SQLITE_PRIVATE int sqlite3VdbeDeletePriorOpcode(Vdbe*, u8 op);
 SQLITE_PRIVATE void sqlite3VdbeChangeP4(Vdbe*, int addr, const char *zP4, int N);
+SQLITE_PRIVATE void sqlite3VdbeSetP4KeyInfo(Parse*, Index*);
 SQLITE_PRIVATE void sqlite3VdbeUsesBtree(Vdbe*, int);
 SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe*, int);
 SQLITE_PRIVATE int sqlite3VdbeMakeLabel(Vdbe*);
@@ -9133,7 +9465,6 @@ SQLITE_PRIVATE void sqlite3VdbeResolveLabel(Vdbe*, int);
 SQLITE_PRIVATE int sqlite3VdbeCurrentAddr(Vdbe*);
 #ifdef SQLITE_DEBUG
 SQLITE_PRIVATE   int sqlite3VdbeAssertMayAbort(Vdbe *, int);
-SQLITE_PRIVATE   void sqlite3VdbeTrace(Vdbe*,FILE*);
 #endif
 SQLITE_PRIVATE void sqlite3VdbeResetStepResult(Vdbe*);
 SQLITE_PRIVATE void sqlite3VdbeRewind(Vdbe*);
@@ -9145,29 +9476,81 @@ SQLITE_PRIVATE sqlite3 *sqlite3VdbeDb(Vdbe*);
 SQLITE_PRIVATE void sqlite3VdbeSetSql(Vdbe*, const char *z, int n, int);
 SQLITE_PRIVATE void sqlite3VdbeSwap(Vdbe*,Vdbe*);
 SQLITE_PRIVATE VdbeOp *sqlite3VdbeTakeOpArray(Vdbe*, int*, int*);
-SQLITE_PRIVATE sqlite3_value *sqlite3VdbeGetValue(Vdbe*, int, u8);
+SQLITE_PRIVATE sqlite3_value *sqlite3VdbeGetBoundValue(Vdbe*, int, u8);
 SQLITE_PRIVATE void sqlite3VdbeSetVarmask(Vdbe*, int);
 #ifndef SQLITE_OMIT_TRACE
 SQLITE_PRIVATE   char *sqlite3VdbeExpandSql(Vdbe*, const char*);
 #endif
 
 SQLITE_PRIVATE void sqlite3VdbeRecordUnpack(KeyInfo*,int,const void*,UnpackedRecord*);
-SQLITE_PRIVATE int sqlite3VdbeRecordCompare(int,const void*,UnpackedRecord*);
+SQLITE_PRIVATE int sqlite3VdbeRecordCompare(int,const void*,UnpackedRecord*,int);
 SQLITE_PRIVATE UnpackedRecord *sqlite3VdbeAllocUnpackedRecord(KeyInfo *, char *, int, char **);
 
+typedef int (*RecordCompare)(int,const void*,UnpackedRecord*,int);
+SQLITE_PRIVATE RecordCompare sqlite3VdbeFindCompare(UnpackedRecord*);
+
 #ifndef SQLITE_OMIT_TRIGGER
 SQLITE_PRIVATE void sqlite3VdbeLinkSubProgram(Vdbe *, SubProgram *);
 #endif
 
-
-#ifndef NDEBUG
+/* Use SQLITE_ENABLE_COMMENTS to enable generation of extra comments on
+** each VDBE opcode.
+**
+** Use the SQLITE_ENABLE_MODULE_COMMENTS macro to see some extra no-op
+** comments in VDBE programs that show key decision points in the code
+** generator.
+*/
+#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
 SQLITE_PRIVATE   void sqlite3VdbeComment(Vdbe*, const char*, ...);
 # define VdbeComment(X)  sqlite3VdbeComment X
 SQLITE_PRIVATE   void sqlite3VdbeNoopComment(Vdbe*, const char*, ...);
 # define VdbeNoopComment(X)  sqlite3VdbeNoopComment X
+# ifdef SQLITE_ENABLE_MODULE_COMMENTS
+#   define VdbeModuleComment(X)  sqlite3VdbeNoopComment X
+# else
+#   define VdbeModuleComment(X)
+# endif
 #else
 # define VdbeComment(X)
 # define VdbeNoopComment(X)
+# define VdbeModuleComment(X)
+#endif
+
+/*
+** The VdbeCoverage macros are used to set a coverage testing point
+** for VDBE branch instructions.  The coverage testing points are line
+** numbers in the sqlite3.c source file.  VDBE branch coverage testing
+** only works with an amalagmation build.  That's ok since a VDBE branch
+** coverage build designed for testing the test suite only.  No application
+** should ever ship with VDBE branch coverage measuring turned on.
+**
+**    VdbeCoverage(v)                  // Mark the previously coded instruction
+**                                     // as a branch
+**
+**    VdbeCoverageIf(v, conditional)   // Mark previous if conditional true
+**
+**    VdbeCoverageAlwaysTaken(v)       // Previous branch is always taken
+**
+**    VdbeCoverageNeverTaken(v)        // Previous branch is never taken
+**
+** Every VDBE branch operation must be tagged with one of the macros above.
+** If not, then when "make test" is run with -DSQLITE_VDBE_COVERAGE and
+** -DSQLITE_DEBUG then an ALWAYS() will fail in the vdbeTakeBranch()
+** routine in vdbe.c, alerting the developer to the missed tag.
+*/
+#ifdef SQLITE_VDBE_COVERAGE
+SQLITE_PRIVATE   void sqlite3VdbeSetLineNumber(Vdbe*,int);
+# define VdbeCoverage(v) sqlite3VdbeSetLineNumber(v,__LINE__)
+# define VdbeCoverageIf(v,x) if(x)sqlite3VdbeSetLineNumber(v,__LINE__)
+# define VdbeCoverageAlwaysTaken(v) sqlite3VdbeSetLineNumber(v,2);
+# define VdbeCoverageNeverTaken(v) sqlite3VdbeSetLineNumber(v,1);
+# define VDBE_OFFSET_LINENO(x) (__LINE__+x)
+#else
+# define VdbeCoverage(v)
+# define VdbeCoverageIf(v,x)
+# define VdbeCoverageAlwaysTaken(v)
+# define VdbeCoverageNeverTaken(v)
+# define VDBE_OFFSET_LINENO(x) 0
 #endif
 
 #endif
@@ -9259,8 +9642,20 @@ typedef struct PgHdr DbPage;
 /*
 ** Flags that make up the mask passed to sqlite3PagerAcquire().
 */
-#define PAGER_ACQUIRE_NOCONTENT     0x01  /* Do not load data from disk */
-#define PAGER_ACQUIRE_READONLY      0x02  /* Read-only page is acceptable */
+#define PAGER_GET_NOCONTENT     0x01  /* Do not load data from disk */
+#define PAGER_GET_READONLY      0x02  /* Read-only page is acceptable */
+
+/*
+** Flags for sqlite3PagerSetFlags()
+*/
+#define PAGER_SYNCHRONOUS_OFF       0x01  /* PRAGMA synchronous=OFF */
+#define PAGER_SYNCHRONOUS_NORMAL    0x02  /* PRAGMA synchronous=NORMAL */
+#define PAGER_SYNCHRONOUS_FULL      0x03  /* PRAGMA synchronous=FULL */
+#define PAGER_SYNCHRONOUS_MASK      0x03  /* Mask for three values above */
+#define PAGER_FULLFSYNC             0x04  /* PRAGMA fullfsync=ON */
+#define PAGER_CKPT_FULLFSYNC        0x08  /* PRAGMA checkpoint_fullfsync=ON */
+#define PAGER_CACHESPILL            0x10  /* PRAGMA cache_spill=ON */
+#define PAGER_FLAGS_MASK            0x1c  /* All above except SYNCHRONOUS */
 
 /*
 ** The remainder of this file contains the declarations of the functions
@@ -9288,7 +9683,7 @@ SQLITE_PRIVATE int sqlite3PagerMaxPageCount(Pager*, int);
 SQLITE_PRIVATE void sqlite3PagerSetCachesize(Pager*, int);
 SQLITE_PRIVATE void sqlite3PagerSetMmapLimit(Pager *, sqlite3_int64);
 SQLITE_PRIVATE void sqlite3PagerShrink(Pager*);
-SQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(Pager*,int,int,int);
+SQLITE_PRIVATE void sqlite3PagerSetFlags(Pager*,unsigned);
 SQLITE_PRIVATE int sqlite3PagerLockingMode(Pager *, int);
 SQLITE_PRIVATE int sqlite3PagerSetJournalMode(Pager *, int);
 SQLITE_PRIVATE int sqlite3PagerGetJournalMode(Pager*);
@@ -9302,6 +9697,7 @@ SQLITE_PRIVATE int sqlite3PagerAcquire(Pager *pPager, Pgno pgno, DbPage **ppPage
 SQLITE_PRIVATE DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno);
 SQLITE_PRIVATE void sqlite3PagerRef(DbPage*);
 SQLITE_PRIVATE void sqlite3PagerUnref(DbPage*);
+SQLITE_PRIVATE void sqlite3PagerUnrefNotNull(DbPage*);
 
 /* Operations on page references. */
 SQLITE_PRIVATE int sqlite3PagerWrite(DbPage*);
@@ -9316,7 +9712,7 @@ SQLITE_PRIVATE void sqlite3PagerPagecount(Pager*, int*);
 SQLITE_PRIVATE int sqlite3PagerBegin(Pager*, int exFlag, int);
 SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(Pager*,const char *zMaster, int);
 SQLITE_PRIVATE int sqlite3PagerExclusiveLock(Pager*);
-SQLITE_PRIVATE int sqlite3PagerSync(Pager *pPager);
+SQLITE_PRIVATE int sqlite3PagerSync(Pager *pPager, const char *zMaster);
 SQLITE_PRIVATE int sqlite3PagerCommitPhaseTwo(Pager*);
 SQLITE_PRIVATE int sqlite3PagerRollback(Pager*);
 SQLITE_PRIVATE int sqlite3PagerOpenSavepoint(Pager *pPager, int n);
@@ -9568,83 +9964,71 @@ SQLITE_PRIVATE void sqlite3PCacheSetDefault(void);
 #define _SQLITE_OS_H_
 
 /*
-** Figure out if we are dealing with Unix, Windows, or some other
-** operating system.  After the following block of preprocess macros,
-** all of SQLITE_OS_UNIX, SQLITE_OS_WIN, and SQLITE_OS_OTHER 
-** will defined to either 1 or 0.  One of the four will be 1.  The other 
-** three will be 0.
+** Attempt to automatically detect the operating system and setup the
+** necessary pre-processor macros for it.
+*/
+/************** Include os_setup.h in the middle of os.h *********************/
+/************** Begin file os_setup.h ****************************************/
+/*
+** 2013 November 25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This file contains pre-processor directives related to operating system
+** detection and/or setup.
+*/
+#ifndef _OS_SETUP_H_
+#define _OS_SETUP_H_
+
+/*
+** Figure out if we are dealing with Unix, Windows, or some other operating
+** system.
+**
+** After the following block of preprocess macros, all of SQLITE_OS_UNIX,
+** SQLITE_OS_WIN, and SQLITE_OS_OTHER will defined to either 1 or 0.  One of
+** the three will be 1.  The other two will be 0.
 */
 #if defined(SQLITE_OS_OTHER)
-# if SQLITE_OS_OTHER==1
-#   undef SQLITE_OS_UNIX
-#   define SQLITE_OS_UNIX 0
-#   undef SQLITE_OS_WIN
-#   define SQLITE_OS_WIN 0
-# else
-#   undef SQLITE_OS_OTHER
-# endif
+#  if SQLITE_OS_OTHER==1
+#    undef SQLITE_OS_UNIX
+#    define SQLITE_OS_UNIX 0
+#    undef SQLITE_OS_WIN
+#    define SQLITE_OS_WIN 0
+#  else
+#    undef SQLITE_OS_OTHER
+#  endif
 #endif
 #if !defined(SQLITE_OS_UNIX) && !defined(SQLITE_OS_OTHER)
-# define SQLITE_OS_OTHER 0
-# ifndef SQLITE_OS_WIN
-#   if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
-#     define SQLITE_OS_WIN 1
-#     define SQLITE_OS_UNIX 0
-#   else
-#     define SQLITE_OS_WIN 0
-#     define SQLITE_OS_UNIX 1
+#  define SQLITE_OS_OTHER 0
+#  ifndef SQLITE_OS_WIN
+#    if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || \
+        defined(__MINGW32__) || defined(__BORLANDC__)
+#      define SQLITE_OS_WIN 1
+#      define SQLITE_OS_UNIX 0
+#    else
+#      define SQLITE_OS_WIN 0
+#      define SQLITE_OS_UNIX 1
+#    endif
+#  else
+#    define SQLITE_OS_UNIX 0
 #  endif
-# else
-#  define SQLITE_OS_UNIX 0
-# endif
 #else
-# ifndef SQLITE_OS_WIN
-#  define SQLITE_OS_WIN 0
-# endif
+#  ifndef SQLITE_OS_WIN
+#    define SQLITE_OS_WIN 0
+#  endif
 #endif
 
-#if SQLITE_OS_WIN
-# include <windows.h>
-#endif
+#endif /* _OS_SETUP_H_ */
 
-/*
-** Determine if we are dealing with Windows NT.
-**
-** We ought to be able to determine if we are compiling for win98 or winNT
-** using the _WIN32_WINNT macro as follows:
-**
-** #if defined(_WIN32_WINNT)
-** # define SQLITE_OS_WINNT 1
-** #else
-** # define SQLITE_OS_WINNT 0
-** #endif
-**
-** However, vs2005 does not set _WIN32_WINNT by default, as it ought to,
-** so the above test does not work.  We'll just assume that everything is
-** winNT unless the programmer explicitly says otherwise by setting
-** SQLITE_OS_WINNT to 0.
-*/
-#if SQLITE_OS_WIN && !defined(SQLITE_OS_WINNT)
-# define SQLITE_OS_WINNT 1
-#endif
-
-/*
-** Determine if we are dealing with WindowsCE - which has a much
-** reduced API.
-*/
-#if defined(_WIN32_WCE)
-# define SQLITE_OS_WINCE 1
-#else
-# define SQLITE_OS_WINCE 0
-#endif
-
-/*
-** Determine if we are dealing with WinRT, which provides only a subset of
-** the full Win32 API.
-*/
-#if !defined(SQLITE_OS_WINRT)
-# define SQLITE_OS_WINRT 0
-#endif
+/************** End of os_setup.h ********************************************/
+/************** Continuing where we left off in os.h *************************/
 
 /* If the SET_FULLSYNC macro is not defined above, then make it
 ** a no-op
@@ -9917,7 +10301,6 @@ SQLITE_PRIVATE int sqlite3OsCloseFree(sqlite3_file *);
 struct Db {
   char *zName;         /* Name of this database */
   Btree *pBt;          /* The B*Tree structure for this database file */
-  u8 inTrans;          /* 0: not writable.  1: Transaction.  2: Checkpoint */
   u8 safety_level;     /* How aggressive at syncing data to disk */
   Schema *pSchema;     /* Pointer to database schema (possibly shared) */
 };
@@ -10063,9 +10446,10 @@ struct sqlite3 {
     u8 busy;                    /* TRUE if currently initializing */
     u8 orphanTrigger;           /* Last statement is orphaned TEMP trigger */
   } init;
-  int activeVdbeCnt;            /* Number of VDBEs currently executing */
-  int writeVdbeCnt;             /* Number of active VDBEs that are writing */
-  int vdbeExecCnt;              /* Number of nested calls to VdbeExec() */
+  int nVdbeActive;              /* Number of VDBEs currently running */
+  int nVdbeRead;                /* Number of active VDBEs that read or write */
+  int nVdbeWrite;               /* Number of active VDBEs that read and write */
+  int nVdbeExec;                /* Number of nested calls to VdbeExec() */
   int nExtension;               /* Number of loaded extensions */
   void **aExtension;            /* Array of shared library handles */
   void (*xTrace)(void*,const char*);        /* Trace function */
@@ -10086,8 +10470,6 @@ struct sqlite3 {
   void(*xCollNeeded16)(void*,sqlite3*,int eTextRep,const void*);
   void *pCollNeededArg;
   sqlite3_value *pErr;          /* Most recent error message */
-  char *zErrMsg;                /* Most recent error message (UTF-8 encoded) */
-  char *zErrMsg16;              /* Most recent error message (UTF-16 encoded) */
   union {
     volatile int isInterrupted; /* True if sqlite3_interrupt has been called */
     double notUsed1;            /* Spacer */
@@ -10101,7 +10483,7 @@ struct sqlite3 {
 #ifndef SQLITE_OMIT_PROGRESS_CALLBACK
   int (*xProgress)(void *);     /* The progress callback */
   void *pProgressArg;           /* Argument to the progress callback */
-  int nProgressOps;             /* Number of opcodes for progress callback */
+  unsigned nProgressOps;        /* Number of opcodes for progress callback */
 #endif
 #ifndef SQLITE_OMIT_VIRTUALTABLE
   int nVTrans;                  /* Allocated size of aVTrans */
@@ -10119,6 +10501,7 @@ struct sqlite3 {
   int nSavepoint;               /* Number of non-transaction savepoints */
   int nStatement;               /* Number of nested statement-transactions  */
   i64 nDeferredCons;            /* Net deferred constraints this transaction. */
+  i64 nDeferredImmCons;         /* Net deferred immediate constraints */
   int *pnBytesFreed;            /* If not NULL, increment this in DbFree() */
 
 #ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
@@ -10150,30 +10533,35 @@ struct sqlite3 {
 */
 #define SQLITE_VdbeTrace      0x00000001  /* True to trace VDBE execution */
 #define SQLITE_InternChanges  0x00000002  /* Uncommitted Hash table changes */
-#define SQLITE_FullColNames   0x00000004  /* Show full column names on SELECT */
-#define SQLITE_ShortColNames  0x00000008  /* Show short columns names */
-#define SQLITE_CountRows      0x00000010  /* Count rows changed by INSERT, */
+#define SQLITE_FullFSync      0x00000004  /* Use full fsync on the backend */
+#define SQLITE_CkptFullFSync  0x00000008  /* Use full fsync for checkpoint */
+#define SQLITE_CacheSpill     0x00000010  /* OK to spill pager cache */
+#define SQLITE_FullColNames   0x00000020  /* Show full column names on SELECT */
+#define SQLITE_ShortColNames  0x00000040  /* Show short columns names */
+#define SQLITE_CountRows      0x00000080  /* Count rows changed by INSERT, */
                                           /*   DELETE, or UPDATE and return */
                                           /*   the count using a callback. */
-#define SQLITE_NullCallback   0x00000020  /* Invoke the callback once if the */
+#define SQLITE_NullCallback   0x00000100  /* Invoke the callback once if the */
                                           /*   result set is empty */
-#define SQLITE_SqlTrace       0x00000040  /* Debug print SQL as it executes */
-#define SQLITE_VdbeListing    0x00000080  /* Debug listings of VDBE programs */
-#define SQLITE_WriteSchema    0x00000100  /* OK to update SQLITE_MASTER */
-#define SQLITE_VdbeAddopTrace 0x00000200  /* Trace sqlite3VdbeAddOp() calls */
-#define SQLITE_IgnoreChecks   0x00000400  /* Do not enforce check constraints */
-#define SQLITE_ReadUncommitted 0x0000800  /* For shared-cache mode */
-#define SQLITE_LegacyFileFmt  0x00001000  /* Create new databases in format 1 */
-#define SQLITE_FullFSync      0x00002000  /* Use full fsync on the backend */
-#define SQLITE_CkptFullFSync  0x00004000  /* Use full fsync for checkpoint */
-#define SQLITE_RecoveryMode   0x00008000  /* Ignore schema errors */
-#define SQLITE_ReverseOrder   0x00010000  /* Reverse unordered SELECTs */
-#define SQLITE_RecTriggers    0x00020000  /* Enable recursive triggers */
-#define SQLITE_ForeignKeys    0x00040000  /* Enforce foreign key constraints  */
-#define SQLITE_AutoIndex      0x00080000  /* Enable automatic indexes */
-#define SQLITE_PreferBuiltin  0x00100000  /* Preference to built-in funcs */
-#define SQLITE_LoadExtension  0x00200000  /* Enable load_extension */
-#define SQLITE_EnableTrigger  0x00400000  /* True to enable triggers */
+#define SQLITE_SqlTrace       0x00000200  /* Debug print SQL as it executes */
+#define SQLITE_VdbeListing    0x00000400  /* Debug listings of VDBE programs */
+#define SQLITE_WriteSchema    0x00000800  /* OK to update SQLITE_MASTER */
+#define SQLITE_VdbeAddopTrace 0x00001000  /* Trace sqlite3VdbeAddOp() calls */
+#define SQLITE_IgnoreChecks   0x00002000  /* Do not enforce check constraints */
+#define SQLITE_ReadUncommitted 0x0004000  /* For shared-cache mode */
+#define SQLITE_LegacyFileFmt  0x00008000  /* Create new databases in format 1 */
+#define SQLITE_RecoveryMode   0x00010000  /* Ignore schema errors */
+#define SQLITE_ReverseOrder   0x00020000  /* Reverse unordered SELECTs */
+#define SQLITE_RecTriggers    0x00040000  /* Enable recursive triggers */
+#define SQLITE_ForeignKeys    0x00080000  /* Enforce foreign key constraints  */
+#define SQLITE_AutoIndex      0x00100000  /* Enable automatic indexes */
+#define SQLITE_PreferBuiltin  0x00200000  /* Preference to built-in funcs */
+#define SQLITE_LoadExtension  0x00400000  /* Enable load_extension */
+#define SQLITE_EnableTrigger  0x00800000  /* True to enable triggers */
+#define SQLITE_DeferFKs       0x01000000  /* Defer all FK constraints */
+#define SQLITE_QueryOnly      0x02000000  /* Disable database changes */
+#define SQLITE_VdbeEQP        0x04000000  /* Debug EXPLAIN QUERY PLAN */
+
 
 /*
 ** Bits of the sqlite3.dbOptFlags field that are used by the
@@ -10184,12 +10572,15 @@ struct sqlite3 {
 #define SQLITE_ColumnCache    0x0002   /* Column cache */
 #define SQLITE_GroupByOrder   0x0004   /* GROUPBY cover of ORDERBY */
 #define SQLITE_FactorOutConst 0x0008   /* Constant factoring */
-#define SQLITE_IdxRealAsInt   0x0010   /* Store REAL as INT in indices */
+/*                not used    0x0010   // Was: SQLITE_IdxRealAsInt */
 #define SQLITE_DistinctOpt    0x0020   /* DISTINCT using indexes */
 #define SQLITE_CoverIdxScan   0x0040   /* Covering index scans */
 #define SQLITE_OrderByIdxJoin 0x0080   /* ORDER BY of joins via index */
 #define SQLITE_SubqCoroutine  0x0100   /* Evaluate subqueries as coroutines */
 #define SQLITE_Transitive     0x0200   /* Transitive constraints */
+#define SQLITE_OmitNoopJoin   0x0400   /* Omit unused tables in joins */
+#define SQLITE_Stat3          0x0800   /* Use the SQLITE_STAT3 table */
+#define SQLITE_AdjustOutEst   0x1000   /* Adjust output estimates using WHERE */
 #define SQLITE_AllOpts        0xffff   /* All optimizations */
 
 /*
@@ -10203,6 +10594,12 @@ struct sqlite3 {
 #define OptimizationEnabled(db, mask)   1
 #endif
 
+/*
+** Return true if it OK to factor constant expressions into the initialization
+** code. The argument is a Parse object for the code generator.
+*/
+#define ConstFactorOk(P) ((P)->okConstFactor)
+
 /*
 ** Possible values for the sqlite.magic field.
 ** The numbers are obtained at random and have no special meaning, other
@@ -10223,8 +10620,7 @@ struct sqlite3 {
 */
 struct FuncDef {
   i16 nArg;            /* Number of arguments.  -1 means unlimited */
-  u8 iPrefEnc;         /* Preferred text encoding (SQLITE_UTF8, 16LE, 16BE) */
-  u8 flags;            /* Some combination of SQLITE_FUNC_* */
+  u16 funcFlags;       /* Some combination of SQLITE_FUNC_* */
   void *pUserData;     /* User data parameter */
   FuncDef *pNext;      /* Next function with same name */
   void (*xFunc)(sqlite3_context*,int,sqlite3_value**); /* Regular function */
@@ -10260,14 +10656,17 @@ struct FuncDestructor {
 ** values must correspond to OPFLAG_LENGTHARG and OPFLAG_TYPEOFARG.  There
 ** are assert() statements in the code to verify this.
 */
-#define SQLITE_FUNC_LIKE     0x01 /* Candidate for the LIKE optimization */
-#define SQLITE_FUNC_CASE     0x02 /* Case-sensitive LIKE-type function */
-#define SQLITE_FUNC_EPHEM    0x04 /* Ephemeral.  Delete with VDBE */
-#define SQLITE_FUNC_NEEDCOLL 0x08 /* sqlite3GetFuncCollSeq() might be called */
-#define SQLITE_FUNC_COUNT    0x10 /* Built-in count(*) aggregate */
-#define SQLITE_FUNC_COALESCE 0x20 /* Built-in coalesce() or ifnull() function */
-#define SQLITE_FUNC_LENGTH   0x40 /* Built-in length() function */
-#define SQLITE_FUNC_TYPEOF   0x80 /* Built-in typeof() function */
+#define SQLITE_FUNC_ENCMASK  0x003 /* SQLITE_UTF8, SQLITE_UTF16BE or UTF16LE */
+#define SQLITE_FUNC_LIKE     0x004 /* Candidate for the LIKE optimization */
+#define SQLITE_FUNC_CASE     0x008 /* Case-sensitive LIKE-type function */
+#define SQLITE_FUNC_EPHEM    0x010 /* Ephemeral.  Delete with VDBE */
+#define SQLITE_FUNC_NEEDCOLL 0x020 /* sqlite3GetFuncCollSeq() might be called */
+#define SQLITE_FUNC_LENGTH   0x040 /* Built-in length() function */
+#define SQLITE_FUNC_TYPEOF   0x080 /* Built-in typeof() function */
+#define SQLITE_FUNC_COUNT    0x100 /* Built-in count(*) aggregate */
+#define SQLITE_FUNC_COALESCE 0x200 /* Built-in coalesce() or ifnull() */
+#define SQLITE_FUNC_UNLIKELY 0x400 /* Built-in unlikely() function */
+#define SQLITE_FUNC_CONSTANT 0x800 /* Constant inputs give a constant output */
 
 /*
 ** The following three macros, FUNCTION(), LIKEFUNC() and AGGREGATE() are
@@ -10280,6 +10679,9 @@ struct FuncDestructor {
 **     as the user-data (sqlite3_user_data()) for the function. If 
 **     argument bNC is true, then the SQLITE_FUNC_NEEDCOLL flag is set.
 **
+**   VFUNCTION(zName, nArg, iArg, bNC, xFunc)
+**     Like FUNCTION except it omits the SQLITE_FUNC_CONSTANT flag.
+**
 **   AGGREGATE(zName, nArg, iArg, bNC, xStep, xFinal)
 **     Used to create an aggregate function definition implemented by
 **     the C functions xStep and xFinal. The first four parameters
@@ -10295,18 +10697,22 @@ struct FuncDestructor {
 **     parameter.
 */
 #define FUNCTION(zName, nArg, iArg, bNC, xFunc) \
-  {nArg, SQLITE_UTF8, (bNC*SQLITE_FUNC_NEEDCOLL), \
+  {nArg, SQLITE_FUNC_CONSTANT|SQLITE_UTF8|(bNC*SQLITE_FUNC_NEEDCOLL), \
+   SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, #zName, 0, 0}
+#define VFUNCTION(zName, nArg, iArg, bNC, xFunc) \
+  {nArg, SQLITE_UTF8|(bNC*SQLITE_FUNC_NEEDCOLL), \
    SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, #zName, 0, 0}
 #define FUNCTION2(zName, nArg, iArg, bNC, xFunc, extraFlags) \
-  {nArg, SQLITE_UTF8, (bNC*SQLITE_FUNC_NEEDCOLL)|extraFlags, \
+  {nArg,SQLITE_FUNC_CONSTANT|SQLITE_UTF8|(bNC*SQLITE_FUNC_NEEDCOLL)|extraFlags,\
    SQLITE_INT_TO_PTR(iArg), 0, xFunc, 0, 0, #zName, 0, 0}
 #define STR_FUNCTION(zName, nArg, pArg, bNC, xFunc) \
-  {nArg, SQLITE_UTF8, bNC*SQLITE_FUNC_NEEDCOLL, \
+  {nArg, SQLITE_FUNC_CONSTANT|SQLITE_UTF8|(bNC*SQLITE_FUNC_NEEDCOLL), \
    pArg, 0, xFunc, 0, 0, #zName, 0, 0}
 #define LIKEFUNC(zName, nArg, arg, flags) \
-  {nArg, SQLITE_UTF8, flags, (void *)arg, 0, likeFunc, 0, 0, #zName, 0, 0}
+  {nArg, SQLITE_FUNC_CONSTANT|SQLITE_UTF8|flags, \
+   (void *)arg, 0, likeFunc, 0, 0, #zName, 0, 0}
 #define AGGREGATE(zName, nArg, arg, nc, xStep, xFinal) \
-  {nArg, SQLITE_UTF8, nc*SQLITE_FUNC_NEEDCOLL, \
+  {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL), \
    SQLITE_INT_TO_PTR(arg), 0, 0, xStep,xFinal,#zName,0,0}
 
 /*
@@ -10318,6 +10724,7 @@ struct FuncDestructor {
 struct Savepoint {
   char *zName;                        /* Savepoint name (nul-terminated) */
   i64 nDeferredCons;                  /* Number of deferred fk violations */
+  i64 nDeferredImmCons;               /* Number of deferred imm fk. */
   Savepoint *pNext;                   /* Parent savepoint (if any) */
 };
 
@@ -10354,7 +10761,8 @@ struct Column {
   char *zColl;     /* Collating sequence.  If NULL, use the default */
   u8 notNull;      /* An OE_ code for handling a NOT NULL constraint */
   char affinity;   /* One of the SQLITE_AFF_... values */
-  u16 colFlags;    /* Boolean properties.  See COLFLAG_ defines below */
+  u8 szEst;        /* Estimated size of this column.  INT==1 */
+  u8 colFlags;     /* Boolean properties.  See COLFLAG_ defines below */
 };
 
 /* Allowed values for Column.colFlags:
@@ -10416,10 +10824,16 @@ struct CollSeq {
 /*
 ** Additional bit values that can be ORed with an affinity without
 ** changing the affinity.
+**
+** The SQLITE_NOTNULL flag is a combination of NULLEQ and JUMPIFNULL.
+** It causes an assert() to fire if either operand to a comparison
+** operator is NULL.  It is added to certain comparison operators to
+** prove that the operands are always NOT NULL.
 */
 #define SQLITE_JUMPIFNULL   0x08  /* jumps if either operand is NULL */
 #define SQLITE_STOREP2      0x10  /* Store result in reg[P2] rather than jump */
 #define SQLITE_NULLEQ       0x80  /* NULL=NULL */
+#define SQLITE_NOTNULL      0x88  /* Assert that operands are never NULL */
 
 /*
 ** An object of this type is created for each virtual table present in
@@ -10513,11 +10927,12 @@ struct Table {
 #ifndef SQLITE_OMIT_CHECK
   ExprList *pCheck;    /* All CHECK constraints */
 #endif
-  tRowcnt nRowEst;     /* Estimated rows in table - from sqlite_stat1 table */
+  LogEst nRowLogEst;   /* Estimated rows in table - from sqlite_stat1 table */
   int tnum;            /* Root BTree node for this table (see note above) */
   i16 iPKey;           /* If not negative, use aCol[iPKey] as the primary key */
   i16 nCol;            /* Number of columns in this table */
   u16 nRef;            /* Number of pointers to this Table */
+  LogEst szTabRow;     /* Estimated size of each table row in bytes */
   u8 tabFlags;         /* Mask of TF_* values */
   u8 keyConf;          /* What to do in case of uniqueness conflict on iPKey */
 #ifndef SQLITE_OMIT_ALTERTABLE
@@ -10534,13 +10949,14 @@ struct Table {
 };
 
 /*
-** Allowed values for Tabe.tabFlags.
+** Allowed values for Table.tabFlags.
 */
 #define TF_Readonly        0x01    /* Read-only system table */
 #define TF_Ephemeral       0x02    /* An ephemeral table */
 #define TF_HasPrimaryKey   0x04    /* Table has a primary key */
 #define TF_Autoincrement   0x08    /* Integer primary key is autoincrement */
 #define TF_Virtual         0x10    /* Is a virtual table */
+#define TF_WithoutRowid    0x20    /* No rowid used. PRIMARY KEY is the key */
 
 
 /*
@@ -10556,6 +10972,9 @@ struct Table {
 #  define IsHiddenColumn(X) 0
 #endif
 
+/* Does the table have a rowid */
+#define HasRowid(X)     (((X)->tabFlags & TF_WithoutRowid)==0)
+
 /*
 ** Each foreign key constraint is an instance of the following structure.
 **
@@ -10570,26 +10989,35 @@ struct Table {
 **     );
 **
 ** For foreign key "fk1", the from-table is "ex1" and the to-table is "ex2".
+** Equivalent names:
+**
+**     from-table == child-table
+**       to-table == parent-table
 **
 ** Each REFERENCES clause generates an instance of the following structure
 ** which is attached to the from-table.  The to-table need not exist when
 ** the from-table is created.  The existence of the to-table is not checked.
+**
+** The list of all parents for child Table X is held at X.pFKey.
+**
+** A list of all children for a table named Z (which might not even exist)
+** is held in Schema.fkeyHash with a hash key of Z.
 */
 struct FKey {
   Table *pFrom;     /* Table containing the REFERENCES clause (aka: Child) */
-  FKey *pNextFrom;  /* Next foreign key in pFrom */
+  FKey *pNextFrom;  /* Next FKey with the same in pFrom. Next parent of pFrom */
   char *zTo;        /* Name of table that the key points to (aka: Parent) */
-  FKey *pNextTo;    /* Next foreign key on table named zTo */
-  FKey *pPrevTo;    /* Previous foreign key on table named zTo */
+  FKey *pNextTo;    /* Next with the same zTo. Next child of zTo. */
+  FKey *pPrevTo;    /* Previous with the same zTo */
   int nCol;         /* Number of columns in this key */
   /* EV: R-30323-21917 */
-  u8 isDeferred;    /* True if constraint checking is deferred till COMMIT */
-  u8 aAction[2];          /* ON DELETE and ON UPDATE actions, respectively */
-  Trigger *apTrigger[2];  /* Triggers for aAction[] actions */
-  struct sColMap {  /* Mapping of columns in pFrom to columns in zTo */
-    int iFrom;         /* Index of column in pFrom */
-    char *zCol;        /* Name of column in zTo.  If 0 use PRIMARY KEY */
-  } aCol[1];        /* One entry for each of nCol column s */
+  u8 isDeferred;       /* True if constraint checking is deferred till COMMIT */
+  u8 aAction[2];        /* ON DELETE and ON UPDATE actions, respectively */
+  Trigger *apTrigger[2];/* Triggers for aAction[] actions */
+  struct sColMap {      /* Mapping of columns in pFrom to columns in zTo */
+    int iFrom;            /* Index of column in pFrom */
+    char *zCol;           /* Name of column in zTo.  If NULL use PRIMARY KEY */
+  } aCol[1];            /* One entry for each of nCol columns */
 };
 
 /*
@@ -10629,19 +11057,25 @@ struct FKey {
 #define OE_SetDflt  8   /* Set the foreign key value to its default */
 #define OE_Cascade  9   /* Cascade the changes */
 
-#define OE_Default  99  /* Do whatever the default action is */
+#define OE_Default  10  /* Do whatever the default action is */
 
 
 /*
 ** An instance of the following structure is passed as the first
 ** argument to sqlite3VdbeKeyCompare and is used to control the 
 ** comparison of the two index keys.
+**
+** Note that aSortOrder[] and aColl[] have nField+1 slots.  There
+** are nField slots for the columns of an index then one extra slot
+** for the rowid at the end.
 */
 struct KeyInfo {
-  sqlite3 *db;        /* The database connection */
+  u32 nRef;           /* Number of references to this KeyInfo object */
   u8 enc;             /* Text encoding - one of the SQLITE_UTF* values */
-  u16 nField;         /* Number of entries in aColl[] */
-  u8 *aSortOrder;     /* Sort order for each column.  May be NULL */
+  u16 nField;         /* Number of key columns in the index */
+  u16 nXField;        /* Number of columns beyond the key columns */
+  sqlite3 *db;        /* The database connection */
+  u8 *aSortOrder;     /* Sort order for each column. */
   CollSeq *aColl[1];  /* Collating sequence for each term of the key */
 };
 
@@ -10658,21 +11092,20 @@ struct KeyInfo {
 **
 ** This structure holds a record that has already been disassembled
 ** into its constituent fields.
+**
+** The r1 and r2 member variables are only used by the optimized comparison
+** functions vdbeRecordCompareInt() and vdbeRecordCompareString().
 */
 struct UnpackedRecord {
   KeyInfo *pKeyInfo;  /* Collation and sort-order information */
   u16 nField;         /* Number of entries in apMem[] */
-  u8 flags;           /* Boolean settings.  UNPACKED_... below */
-  i64 rowid;          /* Used by UNPACKED_PREFIX_SEARCH */
+  i8 default_rc;      /* Comparison result if keys are equal */
+  u8 isCorrupt;       /* Corruption detected by xRecordCompare() */
   Mem *aMem;          /* Values */
+  int r1;             /* Value to return if (lhs > rhs) */
+  int r2;             /* Value to return if (rhs < lhs) */
 };
 
-/*
-** Allowed values of UnpackedRecord.flags
-*/
-#define UNPACKED_INCRKEY       0x01  /* Make this key an epsilon larger */
-#define UNPACKED_PREFIX_MATCH  0x02  /* A prefix match is considered OK */
-#define UNPACKED_PREFIX_SEARCH 0x04  /* Ignore final (rowid) field */
 
 /*
 ** Each SQL index is represented in memory by an
@@ -10702,42 +11135,55 @@ struct UnpackedRecord {
 */
 struct Index {
   char *zName;             /* Name of this index */
-  int *aiColumn;           /* Which columns are used by this index.  1st is 0 */
-  tRowcnt *aiRowEst;       /* From ANALYZE: Est. rows selected by each column */
+  i16 *aiColumn;           /* Which columns are used by this index.  1st is 0 */
+  LogEst *aiRowLogEst;     /* From ANALYZE: Est. rows selected by each column */
   Table *pTable;           /* The SQL table being indexed */
   char *zColAff;           /* String defining the affinity of each column */
   Index *pNext;            /* The next index associated with the same table */
   Schema *pSchema;         /* Schema containing this index */
   u8 *aSortOrder;          /* for each column: True==DESC, False==ASC */
   char **azColl;           /* Array of collation sequence names for index */
+  Expr *pPartIdxWhere;     /* WHERE clause for partial indices */
+  KeyInfo *pKeyInfo;       /* A KeyInfo object suitable for this index */
   int tnum;                /* DB Page containing root of this index */
-  u16 nColumn;             /* Number of columns in table used by this index */
+  LogEst szIdxRow;         /* Estimated average row size in bytes */
+  u16 nKeyCol;             /* Number of columns forming the key */
+  u16 nColumn;             /* Number of columns stored in the index */
   u8 onError;              /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */
-  unsigned autoIndex:2;    /* 1==UNIQUE, 2==PRIMARY KEY, 0==CREATE INDEX */
+  unsigned idxType:2;      /* 1==UNIQUE, 2==PRIMARY KEY, 0==CREATE INDEX */
   unsigned bUnordered:1;   /* Use this index for == or IN queries only */
-#ifdef SQLITE_ENABLE_STAT3
+  unsigned uniqNotNull:1;  /* True if UNIQUE and NOT NULL for all columns */
+  unsigned isResized:1;    /* True if resizeIndexObject() has been called */
+  unsigned isCovering:1;   /* True if this is a covering index */
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
   int nSample;             /* Number of elements in aSample[] */
-  tRowcnt avgEq;           /* Average nEq value for key values not in aSample */
+  int nSampleCol;          /* Size of IndexSample.anEq[] and so on */
+  tRowcnt *aAvgEq;         /* Average nEq values for keys not in aSample */
   IndexSample *aSample;    /* Samples of the left-most key */
 #endif
 };
 
+/*
+** Allowed values for Index.idxType
+*/
+#define SQLITE_IDXTYPE_APPDEF      0   /* Created using CREATE INDEX */
+#define SQLITE_IDXTYPE_UNIQUE      1   /* Implements a UNIQUE constraint */
+#define SQLITE_IDXTYPE_PRIMARYKEY  2   /* Is the PRIMARY KEY for the table */
+
+/* Return true if index X is a PRIMARY KEY index */
+#define IsPrimaryKeyIndex(X)  ((X)->idxType==SQLITE_IDXTYPE_PRIMARYKEY)
+
 /*
 ** Each sample stored in the sqlite_stat3 table is represented in memory 
 ** using a structure of this type.  See documentation at the top of the
 ** analyze.c source file for additional information.
 */
 struct IndexSample {
-  union {
-    char *z;        /* Value if eType is SQLITE_TEXT or SQLITE_BLOB */
-    double r;       /* Value if eType is SQLITE_FLOAT */
-    i64 i;          /* Value if eType is SQLITE_INTEGER */
-  } u;
-  u8 eType;         /* SQLITE_NULL, SQLITE_INTEGER ... etc. */
-  int nByte;        /* Size in byte of text or blob. */
-  tRowcnt nEq;      /* Est. number of rows where the key equals this sample */
-  tRowcnt nLt;      /* Est. number of rows where key is less than this sample */
-  tRowcnt nDLt;     /* Est. number of distinct keys less than this sample */
+  void *p;          /* Pointer to sampled record */
+  int n;            /* Size of record in bytes */
+  tRowcnt *anEq;    /* Est. number of rows where the key equals this sample */
+  tRowcnt *anLt;    /* Est. number of rows where key is less than this sample */
+  tRowcnt *anDLt;   /* Est. number of distinct keys less than this sample */
 };
 
 /*
@@ -10774,6 +11220,7 @@ struct AggInfo {
   int sortingIdx;         /* Cursor number of the sorting index */
   int sortingIdxPTab;     /* Cursor number of pseudo-table */
   int nSortingColumn;     /* Number of columns in the sorting index */
+  int mnReg, mxReg;       /* Range of registers allocated for aCol and aFunc */
   ExprList *pGroupBy;     /* The group by clause */
   struct AggInfo_col {    /* For each column used in source tables */
     Table *pTab;             /* Source table */
@@ -10878,7 +11325,7 @@ typedef int ynVar;
 struct Expr {
   u8 op;                 /* Operation performed by this node */
   char affinity;         /* The affinity of the column or 0 if not a column */
-  u16 flags;             /* Various flags.  EP_* See below */
+  u32 flags;             /* Various flags.  EP_* See below */
   union {
     char *zToken;          /* Token value. Zero terminated and dequoted */
     int iValue;            /* Non-negative integer value if EP_IntValue */
@@ -10892,8 +11339,8 @@ struct Expr {
   Expr *pLeft;           /* Left subnode */
   Expr *pRight;          /* Right subnode */
   union {
-    ExprList *pList;     /* Function arguments or in "<expr> IN (<expr-list)" */
-    Select *pSelect;     /* Used for sub-selects and "<expr> IN (<select>)" */
+    ExprList *pList;     /* op = IN, EXISTS, SELECT, CASE, FUNCTION, BETWEEN */
+    Select *pSelect;     /* EP_xIsSelect and op = IN, EXISTS, SELECT */
   } x;
 
   /* If the EP_Reduced flag is set in the Expr.flags mask, then no
@@ -10906,12 +11353,12 @@ struct Expr {
 #endif
   int iTable;            /* TK_COLUMN: cursor number of table holding column
                          ** TK_REGISTER: register number
-                         ** TK_TRIGGER: 1 -> new, 0 -> old */
+                         ** TK_TRIGGER: 1 -> new, 0 -> old
+                         ** EP_Unlikely:  1000 times likelihood */
   ynVar iColumn;         /* TK_COLUMN: column index.  -1 for rowid.
                          ** TK_VARIABLE: variable number (always >= 1). */
   i16 iAgg;              /* Which entry in pAggInfo->aCol[] or ->aFunc[] */
   i16 iRightJoinTable;   /* If EP_FromJoin, the right table of the join */
-  u8 flags2;             /* Second set of flags.  EP2_... */
   u8 op2;                /* TK_REGISTER: original value of Expr.op
                          ** TK_COLUMN: the value of p5 for OP_Column
                          ** TK_AGG_FUNCTION: nesting depth */
@@ -10922,50 +11369,46 @@ struct Expr {
 /*
 ** The following are the meanings of bits in the Expr.flags field.
 */
-#define EP_FromJoin   0x0001  /* Originated in ON or USING clause of a join */
-#define EP_Agg        0x0002  /* Contains one or more aggregate functions */
-#define EP_Resolved   0x0004  /* IDs have been resolved to COLUMNs */
-#define EP_Error      0x0008  /* Expression contains one or more errors */
-#define EP_Distinct   0x0010  /* Aggregate function with DISTINCT keyword */
-#define EP_VarSelect  0x0020  /* pSelect is correlated, not constant */
-#define EP_DblQuoted  0x0040  /* token.z was originally in "..." */
-#define EP_InfixFunc  0x0080  /* True for an infix function: LIKE, GLOB, etc */
-#define EP_Collate    0x0100  /* Tree contains a TK_COLLATE opeartor */
-#define EP_FixedDest  0x0200  /* Result needed in a specific register */
-#define EP_IntValue   0x0400  /* Integer value contained in u.iValue */
-#define EP_xIsSelect  0x0800  /* x.pSelect is valid (otherwise x.pList is) */
-#define EP_Hint       0x1000  /* Not used */
-#define EP_Reduced    0x2000  /* Expr struct is EXPR_REDUCEDSIZE bytes only */
-#define EP_TokenOnly  0x4000  /* Expr struct is EXPR_TOKENONLYSIZE bytes only */
-#define EP_Static     0x8000  /* Held in memory not obtained from malloc() */
-
-/*
-** The following are the meanings of bits in the Expr.flags2 field.
-*/
-#define EP2_MallocedToken  0x0001  /* Need to sqlite3DbFree() Expr.zToken */
-#define EP2_Irreducible    0x0002  /* Cannot EXPRDUP_REDUCE this Expr */
-
-/*
-** The pseudo-routine sqlite3ExprSetIrreducible sets the EP2_Irreducible
-** flag on an expression structure.  This flag is used for VV&A only.  The
-** routine is implemented as a macro that only works when in debugging mode,
-** so as not to burden production code.
-*/
-#ifdef SQLITE_DEBUG
-# define ExprSetIrreducible(X)  (X)->flags2 |= EP2_Irreducible
-#else
-# define ExprSetIrreducible(X)
-#endif
+#define EP_FromJoin  0x000001 /* Originated in ON or USING clause of a join */
+#define EP_Agg       0x000002 /* Contains one or more aggregate functions */
+#define EP_Resolved  0x000004 /* IDs have been resolved to COLUMNs */
+#define EP_Error     0x000008 /* Expression contains one or more errors */
+#define EP_Distinct  0x000010 /* Aggregate function with DISTINCT keyword */
+#define EP_VarSelect 0x000020 /* pSelect is correlated, not constant */
+#define EP_DblQuoted 0x000040 /* token.z was originally in "..." */
+#define EP_InfixFunc 0x000080 /* True for an infix function: LIKE, GLOB, etc */
+#define EP_Collate   0x000100 /* Tree contains a TK_COLLATE operator */
+#define EP_Generic   0x000200 /* Ignore COLLATE or affinity on this tree */
+#define EP_IntValue  0x000400 /* Integer value contained in u.iValue */
+#define EP_xIsSelect 0x000800 /* x.pSelect is valid (otherwise x.pList is) */
+#define EP_Skip      0x001000 /* COLLATE, AS, or UNLIKELY */
+#define EP_Reduced   0x002000 /* Expr struct EXPR_REDUCEDSIZE bytes only */
+#define EP_TokenOnly 0x004000 /* Expr struct EXPR_TOKENONLYSIZE bytes only */
+#define EP_Static    0x008000 /* Held in memory not obtained from malloc() */
+#define EP_MemToken  0x010000 /* Need to sqlite3DbFree() Expr.zToken */
+#define EP_NoReduce  0x020000 /* Cannot EXPRDUP_REDUCE this Expr */
+#define EP_Unlikely  0x040000 /* unlikely() or likelihood() function */
+#define EP_Constant  0x080000 /* Node is a constant */
 
 /*
 ** These macros can be used to test, set, or clear bits in the 
 ** Expr.flags field.
 */
-#define ExprHasProperty(E,P)     (((E)->flags&(P))==(P))
-#define ExprHasAnyProperty(E,P)  (((E)->flags&(P))!=0)
+#define ExprHasProperty(E,P)     (((E)->flags&(P))!=0)
+#define ExprHasAllProperty(E,P)  (((E)->flags&(P))==(P))
 #define ExprSetProperty(E,P)     (E)->flags|=(P)
 #define ExprClearProperty(E,P)   (E)->flags&=~(P)
 
+/* The ExprSetVVAProperty() macro is used for Verification, Validation,
+** and Accreditation only.  It works like ExprSetProperty() during VVA
+** processes but is a no-op for delivery.
+*/
+#ifdef SQLITE_DEBUG
+# define ExprSetVVAProperty(E,P)  (E)->flags|=(P)
+#else
+# define ExprSetVVAProperty(E,P)
+#endif
+
 /*
 ** Macros to determine the number of bytes required by a normal Expr 
 ** struct, an Expr struct with the EP_Reduced flag set in Expr.flags 
@@ -10999,7 +11442,6 @@ struct Expr {
 */
 struct ExprList {
   int nExpr;             /* Number of expressions on the list */
-  int iECursor;          /* VDBE Cursor associated with this ExprList */
   struct ExprList_item { /* For each expression in the list */
     Expr *pExpr;            /* The list of expressions */
     char *zName;            /* Token associated with this expression */
@@ -11007,8 +11449,14 @@ struct ExprList {
     u8 sortOrder;           /* 1 for DESC or 0 for ASC */
     unsigned done :1;       /* A flag to indicate when processing is finished */
     unsigned bSpanIsTab :1; /* zSpan holds DB.TABLE.COLUMN */
-    u16 iOrderByCol;        /* For ORDER BY, column number in result set */
-    u16 iAlias;             /* Index into Parse.aAlias[] for zName */
+    unsigned reusable :1;   /* Constant expression is reusable */
+    union {
+      struct {
+        u16 iOrderByCol;      /* For ORDER BY, column number in result set */
+        u16 iAlias;           /* Index into Parse.aAlias[] for zName */
+      } x;
+      int iConstExprReg;      /* Register in which Expr value is cached */
+    } u;
   } *a;                  /* Alloc a power of two greater or equal to nExpr */
 };
 
@@ -11060,6 +11508,12 @@ typedef u64 Bitmask;
 */
 #define BMS  ((int)(sizeof(Bitmask)*8))
 
+/*
+** A bit in a Bitmask
+*/
+#define MASKBIT(n)   (((Bitmask)1)<<(n))
+#define MASKBIT32(n) (((unsigned int)1)<<(n))
+
 /*
 ** The following structure describes the FROM clause of a SELECT statement.
 ** Each table or subquery in the FROM clause is a separate element of
@@ -11080,8 +11534,8 @@ typedef u64 Bitmask;
 ** contains more than 63 columns and the 64-th or later column is used.
 */
 struct SrcList {
-  i16 nSrc;        /* Number of tables or subqueries in the FROM clause */
-  i16 nAlloc;      /* Number of entries allocated in a[] below */
+  int nSrc;        /* Number of tables or subqueries in the FROM clause */
+  u32 nAlloc;      /* Number of entries allocated in a[] below */
   struct SrcList_item {
     Schema *pSchema;  /* Schema to which this item is fixed */
     char *zDatabase;  /* Name of database holding this table */
@@ -11091,10 +11545,12 @@ struct SrcList {
     Select *pSelect;  /* A SELECT statement used in place of a table name */
     int addrFillSub;  /* Address of subroutine to manifest a subquery */
     int regReturn;    /* Register holding return address of addrFillSub */
+    int regResult;    /* Registers holding results of a co-routine */
     u8 jointype;      /* Type of join between this able and the previous */
     unsigned notIndexed :1;    /* True if there is a NOT INDEXED clause */
     unsigned isCorrelated :1;  /* True if sub-query is correlated */
     unsigned viaCoroutine :1;  /* Implemented as a co-routine */
+    unsigned isRecursive :1;   /* True for recursive reference in WITH */
 #ifndef SQLITE_OMIT_EXPLAIN
     u8 iSelectId;     /* If pSelect!=0, the id of the sub-select in EQP */
 #endif
@@ -11119,79 +11575,6 @@ struct SrcList {
 #define JT_ERROR     0x0040    /* unknown or unsupported join type */
 
 
-/*
-** A WherePlan object holds information that describes a lookup
-** strategy.
-**
-** This object is intended to be opaque outside of the where.c module.
-** It is included here only so that that compiler will know how big it
-** is.  None of the fields in this object should be used outside of
-** the where.c module.
-**
-** Within the union, pIdx is only used when wsFlags&WHERE_INDEXED is true.
-** pTerm is only used when wsFlags&WHERE_MULTI_OR is true.  And pVtabIdx
-** is only used when wsFlags&WHERE_VIRTUALTABLE is true.  It is never the
-** case that more than one of these conditions is true.
-*/
-struct WherePlan {
-  u32 wsFlags;                   /* WHERE_* flags that describe the strategy */
-  u16 nEq;                       /* Number of == constraints */
-  u16 nOBSat;                    /* Number of ORDER BY terms satisfied */
-  double nRow;                   /* Estimated number of rows (for EQP) */
-  union {
-    Index *pIdx;                   /* Index when WHERE_INDEXED is true */
-    struct WhereTerm *pTerm;       /* WHERE clause term for OR-search */
-    sqlite3_index_info *pVtabIdx;  /* Virtual table index to use */
-  } u;
-};
-
-/*
-** For each nested loop in a WHERE clause implementation, the WhereInfo
-** structure contains a single instance of this structure.  This structure
-** is intended to be private to the where.c module and should not be
-** access or modified by other modules.
-**
-** The pIdxInfo field is used to help pick the best index on a
-** virtual table.  The pIdxInfo pointer contains indexing
-** information for the i-th table in the FROM clause before reordering.
-** All the pIdxInfo pointers are freed by whereInfoFree() in where.c.
-** All other information in the i-th WhereLevel object for the i-th table
-** after FROM clause ordering.
-*/
-struct WhereLevel {
-  WherePlan plan;       /* query plan for this element of the FROM clause */
-  int iLeftJoin;        /* Memory cell used to implement LEFT OUTER JOIN */
-  int iTabCur;          /* The VDBE cursor used to access the table */
-  int iIdxCur;          /* The VDBE cursor used to access pIdx */
-  int addrBrk;          /* Jump here to break out of the loop */
-  int addrNxt;          /* Jump here to start the next IN combination */
-  int addrCont;         /* Jump here to continue with the next loop cycle */
-  int addrFirst;        /* First instruction of interior of the loop */
-  u8 iFrom;             /* Which entry in the FROM clause */
-  u8 op, p5;            /* Opcode and P5 of the opcode that ends the loop */
-  int p1, p2;           /* Operands of the opcode used to ends the loop */
-  union {               /* Information that depends on plan.wsFlags */
-    struct {
-      int nIn;              /* Number of entries in aInLoop[] */
-      struct InLoop {
-        int iCur;              /* The VDBE cursor used by this IN operator */
-        int addrInTop;         /* Top of the IN loop */
-        u8 eEndLoopOp;         /* IN Loop terminator. OP_Next or OP_Prev */
-      } *aInLoop;           /* Information about each nested IN operator */
-    } in;                 /* Used when plan.wsFlags&WHERE_IN_ABLE */
-    Index *pCovidx;       /* Possible covering index for WHERE_MULTI_OR */
-  } u;
-  double rOptCost;      /* "Optimal" cost for this level */
-
-  /* The following field is really not part of the current level.  But
-  ** we need a place to cache virtual table index information for each
-  ** virtual table in the FROM clause and the WhereLevel structure is
-  ** a convenient place since there is one WhereLevel for each FROM clause
-  ** element.
-  */
-  sqlite3_index_info *pIdxInfo;  /* Index info for n-th source table */
-};
-
 /*
 ** Flags appropriate for the wctrlFlags parameter of sqlite3WhereBegin()
 ** and the WhereInfo.wctrlFlags member.
@@ -11205,33 +11588,13 @@ struct WhereLevel {
 #define WHERE_FORCE_TABLE      0x0020 /* Do not use an index-only search */
 #define WHERE_ONETABLE_ONLY    0x0040 /* Only code the 1st table in pTabList */
 #define WHERE_AND_ONLY         0x0080 /* Don't use indices for OR terms */
+#define WHERE_GROUPBY          0x0100 /* pOrderBy is really a GROUP BY */
+#define WHERE_DISTINCTBY       0x0200 /* pOrderby is really a DISTINCT clause */
+#define WHERE_WANT_DISTINCT    0x0400 /* All output needs to be distinct */
+#define WHERE_SORTBYGROUP      0x0800 /* Support sqlite3WhereIsSorted() */
 
-/*
-** The WHERE clause processing routine has two halves.  The
-** first part does the start of the WHERE loop and the second
-** half does the tail of the WHERE loop.  An instance of
-** this structure is returned by the first half and passed
-** into the second half to give some continuity.
+/* Allowed return values from sqlite3WhereIsDistinct()
 */
-struct WhereInfo {
-  Parse *pParse;            /* Parsing and code generating context */
-  SrcList *pTabList;        /* List of tables in the join */
-  u16 nOBSat;               /* Number of ORDER BY terms satisfied by indices */
-  u16 wctrlFlags;           /* Flags originally passed to sqlite3WhereBegin() */
-  u8 okOnePass;             /* Ok to use one-pass algorithm for UPDATE/DELETE */
-  u8 untestedTerms;         /* Not all WHERE terms resolved by outer loop */
-  u8 eDistinct;             /* One of the WHERE_DISTINCT_* values below */
-  int iTop;                 /* The very beginning of the WHERE loop */
-  int iContinue;            /* Jump here to continue with next record */
-  int iBreak;               /* Jump here to break out of the loop */
-  int nLevel;               /* Number of nested loop */
-  struct WhereClause *pWC;  /* Decomposition of the WHERE clause */
-  double savedNQueryLoop;   /* pParse->nQueryLoop outside the WHERE loop */
-  double nRowOut;           /* Estimated number of output rows */
-  WhereLevel a[1];          /* Information about each nest loop in WHERE */
-};
-
-/* Allowed values for WhereInfo.eDistinct and DistinctCtx.eTnctType */
 #define WHERE_DISTINCT_NOOP      0  /* DISTINCT keyword not used */
 #define WHERE_DISTINCT_UNIQUE    1  /* No duplicates */
 #define WHERE_DISTINCT_ORDERED   2  /* All duplicates are adjacent */
@@ -11261,7 +11624,7 @@ struct WhereInfo {
 struct NameContext {
   Parse *pParse;       /* The parser */
   SrcList *pSrcList;   /* One or more tables used to resolve names */
-  ExprList *pEList;    /* Optional list of named expressions */
+  ExprList *pEList;    /* Optional list of result-set columns */
   AggInfo *pAggInfo;   /* Information about aggregates at this level */
   NameContext *pNext;  /* Next outer name context.  NULL for outermost */
   int nRef;            /* Number of names resolved by this context */
@@ -11276,8 +11639,7 @@ struct NameContext {
 #define NC_HasAgg    0x02    /* One or more aggregate functions seen */
 #define NC_IsCheck   0x04    /* True if resolving names in a CHECK constraint */
 #define NC_InAggFunc 0x08    /* True if analyzing arguments to an agg func */
-#define NC_AsMaybe   0x10    /* Resolve to AS terms of the result set only
-                             ** if no other resolution is available */
+#define NC_PartIdx   0x10    /* True if resolving a partial index WHERE */
 
 /*
 ** An instance of the following structure contains all information
@@ -11304,8 +11666,8 @@ struct Select {
   u8 op;                 /* One of: TK_UNION TK_ALL TK_INTERSECT TK_EXCEPT */
   u16 selFlags;          /* Various SF_* values */
   int iLimit, iOffset;   /* Memory registers holding LIMIT & OFFSET counters */
-  int addrOpenEphm[3];   /* OP_OpenEphem opcodes related to this select */
-  double nSelectRow;     /* Estimated number of result rows */
+  int addrOpenEphm[2];   /* OP_OpenEphem opcodes related to this select */
+  u64 nSelectRow;        /* Estimated number of result rows */
   SrcList *pSrc;         /* The FROM clause */
   Expr *pWhere;          /* The WHERE clause */
   ExprList *pGroupBy;    /* The GROUP BY clause */
@@ -11313,9 +11675,9 @@ struct Select {
   ExprList *pOrderBy;    /* The ORDER BY clause */
   Select *pPrior;        /* Prior select in a compound select statement */
   Select *pNext;         /* Next select to the left in a compound */
-  Select *pRightmost;    /* Right-most select in a compound select statement */
   Expr *pLimit;          /* LIMIT expression. NULL means not used. */
   Expr *pOffset;         /* OFFSET expression. NULL means not used. */
+  With *pWith;           /* WITH clause attached to this select. Or NULL. */
 };
 
 /*
@@ -11328,41 +11690,109 @@ struct Select {
 #define SF_UsesEphemeral   0x0008  /* Uses the OpenEphemeral opcode */
 #define SF_Expanded        0x0010  /* sqlite3SelectExpand() called on this */
 #define SF_HasTypeInfo     0x0020  /* FROM subqueries have Table metadata */
-#define SF_UseSorter       0x0040  /* Sort using a sorter */
+                    /*     0x0040  NOT USED */
 #define SF_Values          0x0080  /* Synthesized from VALUES clause */
-#define SF_Materialize     0x0100  /* Force materialization of views */
+                    /*     0x0100  NOT USED */
 #define SF_NestedFrom      0x0200  /* Part of a parenthesized FROM clause */
+#define SF_MaybeConvert    0x0400  /* Need convertCompoundSelectToSubquery() */
+#define SF_Recursive       0x0800  /* The recursive part of a recursive CTE */
+#define SF_Compound        0x1000  /* Part of a compound query */
 
 
 /*
-** The results of a select can be distributed in several ways.  The
-** "SRT" prefix means "SELECT Result Type".
+** The results of a SELECT can be distributed in several ways, as defined
+** by one of the following macros.  The "SRT" prefix means "SELECT Result
+** Type".
+**
+**     SRT_Union       Store results as a key in a temporary index 
+**                     identified by pDest->iSDParm.
+**
+**     SRT_Except      Remove results from the temporary index pDest->iSDParm.
+**
+**     SRT_Exists      Store a 1 in memory cell pDest->iSDParm if the result
+**                     set is not empty.
+**
+**     SRT_Discard     Throw the results away.  This is used by SELECT
+**                     statements within triggers whose only purpose is
+**                     the side-effects of functions.
+**
+** All of the above are free to ignore their ORDER BY clause. Those that
+** follow must honor the ORDER BY clause.
+**
+**     SRT_Output      Generate a row of output (using the OP_ResultRow
+**                     opcode) for each row in the result set.
+**
+**     SRT_Mem         Only valid if the result is a single column.
+**                     Store the first column of the first result row
+**                     in register pDest->iSDParm then abandon the rest
+**                     of the query.  This destination implies "LIMIT 1".
+**
+**     SRT_Set         The result must be a single column.  Store each
+**                     row of result as the key in table pDest->iSDParm. 
+**                     Apply the affinity pDest->affSdst before storing
+**                     results.  Used to implement "IN (SELECT ...)".
+**
+**     SRT_EphemTab    Create an temporary table pDest->iSDParm and store
+**                     the result there. The cursor is left open after
+**                     returning.  This is like SRT_Table except that
+**                     this destination uses OP_OpenEphemeral to create
+**                     the table first.
+**
+**     SRT_Coroutine   Generate a co-routine that returns a new row of
+**                     results each time it is invoked.  The entry point
+**                     of the co-routine is stored in register pDest->iSDParm
+**                     and the result row is stored in pDest->nDest registers
+**                     starting with pDest->iSdst.
+**
+**     SRT_Table       Store results in temporary table pDest->iSDParm.
+**     SRT_Fifo        This is like SRT_EphemTab except that the table
+**                     is assumed to already be open.  SRT_Fifo has
+**                     the additional property of being able to ignore
+**                     the ORDER BY clause.
+**
+**     SRT_DistFifo    Store results in a temporary table pDest->iSDParm.
+**                     But also use temporary table pDest->iSDParm+1 as
+**                     a record of all prior results and ignore any duplicate
+**                     rows.  Name means:  "Distinct Fifo".
+**
+**     SRT_Queue       Store results in priority queue pDest->iSDParm (really
+**                     an index).  Append a sequence number so that all entries
+**                     are distinct.
+**
+**     SRT_DistQueue   Store results in priority queue pDest->iSDParm only if
+**                     the same record has never been stored before.  The
+**                     index at pDest->iSDParm+1 hold all prior stores.
 */
 #define SRT_Union        1  /* Store result as keys in an index */
 #define SRT_Except       2  /* Remove result from a UNION index */
 #define SRT_Exists       3  /* Store 1 if the result is not empty */
 #define SRT_Discard      4  /* Do not save the results anywhere */
+#define SRT_Fifo         5  /* Store result as data with an automatic rowid */
+#define SRT_DistFifo     6  /* Like SRT_Fifo, but unique results only */
+#define SRT_Queue        7  /* Store result in an queue */
+#define SRT_DistQueue    8  /* Like SRT_Queue, but unique results only */
 
 /* The ORDER BY clause is ignored for all of the above */
-#define IgnorableOrderby(X) ((X->eDest)<=SRT_Discard)
+#define IgnorableOrderby(X) ((X->eDest)<=SRT_DistQueue)
 
-#define SRT_Output       5  /* Output each row of result */
-#define SRT_Mem          6  /* Store result in a memory cell */
-#define SRT_Set          7  /* Store results as keys in an index */
-#define SRT_Table        8  /* Store result as data with an automatic rowid */
-#define SRT_EphemTab     9  /* Create transient tab and store like SRT_Table */
-#define SRT_Coroutine   10  /* Generate a single row of result */
+#define SRT_Output       9  /* Output each row of result */
+#define SRT_Mem         10  /* Store result in a memory cell */
+#define SRT_Set         11  /* Store results as keys in an index */
+#define SRT_EphemTab    12  /* Create transient tab and store like SRT_Table */
+#define SRT_Coroutine   13  /* Generate a single row of result */
+#define SRT_Table       14  /* Store result as data with an automatic rowid */
 
 /*
 ** An instance of this object describes where to put of the results of
 ** a SELECT statement.
 */
 struct SelectDest {
-  u8 eDest;         /* How to dispose of the results.  On of SRT_* above. */
-  char affSdst;     /* Affinity used when eDest==SRT_Set */
-  int iSDParm;      /* A parameter used by the eDest disposal method */
-  int iSdst;        /* Base register where results are written */
-  int nSdst;        /* Number of registers allocated */
+  u8 eDest;            /* How to dispose of the results.  On of SRT_* above. */
+  char affSdst;        /* Affinity used when eDest==SRT_Set */
+  int iSDParm;         /* A parameter used by the eDest disposal method */
+  int iSdst;           /* Base register where results are written */
+  int nSdst;           /* Number of registers allocated */
+  ExprList *pOrderBy;  /* Key columns for SRT_Queue and SRT_DistQueue */
 };
 
 /*
@@ -11448,11 +11878,10 @@ struct Parse {
   u8 checkSchema;      /* Causes schema cookie check after an error */
   u8 nested;           /* Number of nested calls to the parser/code generator */
   u8 nTempReg;         /* Number of temporary registers in aTempReg[] */
-  u8 nTempInUse;       /* Number of aTempReg[] currently checked out */
-  u8 nColCache;        /* Number of entries in aColCache[] */
-  u8 iColCache;        /* Next entry in aColCache[] to replace */
   u8 isMultiWrite;     /* True if statement may modify/insert multiple rows */
   u8 mayAbort;         /* True if statement may throw an ABORT exception */
+  u8 hasCompound;      /* Need to invoke convertCompoundSelectToSubquery() */
+  u8 okConstFactor;    /* OK to factor out constants */
   int aTempReg[8];     /* Holding area for temporary registers */
   int nRangeReg;       /* Size of the temporary register block */
   int iRangeReg;       /* First register in temporary register block */
@@ -11461,25 +11890,30 @@ struct Parse {
   int nMem;            /* Number of memory cells used so far */
   int nSet;            /* Number of sets used so far */
   int nOnce;           /* Number of OP_Once instructions so far */
+  int nOpAlloc;        /* Number of slots allocated for Vdbe.aOp[] */
+  int iFixedOp;        /* Never back out opcodes iFixedOp-1 or earlier */
   int ckBase;          /* Base register of data during check constraints */
+  int iPartIdxTab;     /* Table corresponding to a partial index */
   int iCacheLevel;     /* ColCache valid when aColCache[].iLevel<=iCacheLevel */
   int iCacheCnt;       /* Counter used to generate aColCache[].lru values */
+  int nLabel;          /* Number of labels used */
+  int *aLabel;         /* Space to hold the labels */
   struct yColCache {
     int iTable;           /* Table cursor number */
-    int iColumn;          /* Table column number */
+    i16 iColumn;          /* Table column number */
     u8 tempReg;           /* iReg is a temp register that needs to be freed */
     int iLevel;           /* Nesting level */
     int iReg;             /* Reg with value of this column. 0 means none. */
     int lru;              /* Least recently used entry has the smallest value */
   } aColCache[SQLITE_N_COLCACHE];  /* One for each column cache entry */
+  ExprList *pConstExpr;/* Constant expressions */
+  Token constraintName;/* Name of the constraint currently being parsed */
   yDbMask writeMask;   /* Start a write transaction on these databases */
   yDbMask cookieMask;  /* Bitmask of schema verified databases */
-  int cookieGoto;      /* Address of OP_Goto to cookie verifier subroutine */
   int cookieValue[SQLITE_MAX_ATTACHED+2];  /* Values of cookies to verify */
   int regRowid;        /* Register holding rowid of CREATE TABLE entry */
   int regRoot;         /* Register holding root page number for new objects */
   int nMaxArg;         /* Max args passed to user function by sub-program */
-  Token constraintName;/* Name of the constraint currently being parsed */
 #ifndef SQLITE_OMIT_SHARED_CACHE
   int nTableLock;        /* Number of locks in aTableLock */
   TableLock *aTableLock; /* Required table locks for shared-cache mode */
@@ -11489,18 +11923,26 @@ struct Parse {
   /* Information used while coding trigger programs. */
   Parse *pToplevel;    /* Parse structure for main program (or NULL) */
   Table *pTriggerTab;  /* Table triggers are being coded for */
-  double nQueryLoop;   /* Estimated number of iterations of a query */
+  int addrCrTab;       /* Address of OP_CreateTable opcode on CREATE TABLE */
+  int addrSkipPK;      /* Address of instruction to skip PRIMARY KEY index */
+  u32 nQueryLoop;      /* Est number of iterations of a query (10*log2(N)) */
   u32 oldmask;         /* Mask of old.* columns referenced */
   u32 newmask;         /* Mask of new.* columns referenced */
   u8 eTriggerOp;       /* TK_UPDATE, TK_INSERT or TK_DELETE */
   u8 eOrconf;          /* Default ON CONFLICT policy for trigger steps */
   u8 disableTriggers;  /* True to disable triggers */
 
-  /* Above is constant between recursions.  Below is reset before and after
-  ** each recursion */
+  /************************************************************************
+  ** Above is constant between recursions.  Below is reset before and after
+  ** each recursion.  The boundary between these two regions is determined
+  ** using offsetof(Parse,nVar) so the nVar field must be the first field
+  ** in the recursive region.
+  ************************************************************************/
 
   int nVar;                 /* Number of '?' variables seen in the SQL so far */
   int nzVar;                /* Number of available slots in azVar[] */
+  u8 iPkSortOrder;          /* ASC or DESC for INTEGER PRIMARY KEY */
+  u8 bFreeWith;             /* True if pWith should be freed with parser */
   u8 explain;               /* True if the EXPLAIN flag is found on the query */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
   u8 declareVtab;           /* True if inside sqlite3_declare_vtab() */
@@ -11514,7 +11956,6 @@ struct Parse {
 #endif
   char **azVar;             /* Pointers to names of parameters */
   Vdbe *pReprepare;         /* VM being reprepared (sqlite3Reprepare()) */
-  int *aAlias;              /* Register used to hold aliased result */
   const char *zTail;        /* All SQL text past the last semicolon parsed */
   Table *pNewTable;         /* A table being constructed by CREATE TABLE */
   Trigger *pNewTrigger;     /* Trigger under construct by a CREATE TRIGGER */
@@ -11527,6 +11968,7 @@ struct Parse {
 #endif
   Table *pZombieTab;        /* List of Table objects to delete after code gen */
   TriggerPrg *pTriggerPrg;  /* Linked list of coded triggers */
+  With *pWith;              /* Current WITH clause, or NULL */
 };
 
 /*
@@ -11646,7 +12088,7 @@ struct TriggerStep {
   Select *pSelect;     /* SELECT statment or RHS of INSERT INTO .. SELECT ... */
   Token target;        /* Target table for DELETE, UPDATE, INSERT */
   Expr *pWhere;        /* The WHERE clause for DELETE or UPDATE steps */
-  ExprList *pExprList; /* SET clause for UPDATE.  VALUES clause for INSERT */
+  ExprList *pExprList; /* SET clause for UPDATE. */
   IdList *pIdList;     /* Column names for INSERT */
   TriggerStep *pNext;  /* Next in the link-list */
   TriggerStep *pLast;  /* Last element in link-list. Valid for 1st elem only */
@@ -11661,6 +12103,7 @@ typedef struct DbFixer DbFixer;
 struct DbFixer {
   Parse *pParse;      /* The parsing context.  Error messages written here */
   Schema *pSchema;    /* Fix items to this schema */
+  int bVarOnly;       /* Check for variable references only */
   const char *zDb;    /* Make sure all objects are contained in this database */
   const char *zType;  /* Type of the container - used for error messages */
   const Token *pName; /* Name of the container - used for error messages */
@@ -11677,10 +12120,11 @@ struct StrAccum {
   int  nChar;          /* Length of the string so far */
   int  nAlloc;         /* Amount of space allocated in zText */
   int  mxAlloc;        /* Maximum allowed string length */
-  u8   mallocFailed;   /* Becomes true if any memory allocation fails */
   u8   useMalloc;      /* 0: none,  1: sqlite3DbMalloc,  2: sqlite3_malloc */
-  u8   tooBig;         /* Becomes true if string size exceeds limits */
+  u8   accError;       /* STRACCUM_NOMEM or STRACCUM_TOOBIG */
 };
+#define STRACCUM_NOMEM   1
+#define STRACCUM_TOOBIG  2
 
 /*
 ** A pointer to this structure is used to communicate information
@@ -11705,6 +12149,7 @@ struct Sqlite3Config {
   int bOpenUri;                     /* True to interpret filenames as URIs */
   int bUseCis;                      /* Use covering indices for full-scans */
   int mxStrlen;                     /* Maximum string length */
+  int neverCorrupt;                 /* Database is always well-formed */
   int szLookaside;                  /* Default lookaside buffer size */
   int nLookaside;                   /* Default lookaside buffer count */
   sqlite3_mem_methods m;            /* Low-level memory allocation interface */
@@ -11730,26 +12175,54 @@ struct Sqlite3Config {
   int isMutexInit;                  /* True after mutexes are initialized */
   int isMallocInit;                 /* True after malloc is initialized */
   int isPCacheInit;                 /* True after malloc is initialized */
-  sqlite3_mutex *pInitMutex;        /* Mutex used by sqlite3_initialize() */
   int nRefInitMutex;                /* Number of users of pInitMutex */
+  sqlite3_mutex *pInitMutex;        /* Mutex used by sqlite3_initialize() */
   void (*xLog)(void*,int,const char*); /* Function for logging */
   void *pLogArg;                       /* First argument to xLog() */
-  int bLocaltimeFault;              /* True to fail localtime() calls */
 #ifdef SQLITE_ENABLE_SQLLOG
   void(*xSqllog)(void*,sqlite3*,const char*, int);
   void *pSqllogArg;
 #endif
+#ifdef SQLITE_VDBE_COVERAGE
+  /* The following callback (if not NULL) is invoked on every VDBE branch
+  ** operation.  Set the callback using SQLITE_TESTCTRL_VDBE_COVERAGE.
+  */
+  void (*xVdbeBranch)(void*,int iSrcLine,u8 eThis,u8 eMx);  /* Callback */
+  void *pVdbeBranchArg;                                     /* 1st argument */
+#endif
+#ifndef SQLITE_OMIT_BUILTIN_TEST
+  int (*xTestCallback)(int);        /* Invoked by sqlite3FaultSim() */
+#endif
+  int bLocaltimeFault;              /* True to fail localtime() calls */
 };
 
+/*
+** This macro is used inside of assert() statements to indicate that
+** the assert is only valid on a well-formed database.  Instead of:
+**
+**     assert( X );
+**
+** One writes:
+**
+**     assert( X || CORRUPT_DB );
+**
+** CORRUPT_DB is true during normal operation.  CORRUPT_DB does not indicate
+** that the database is definitely corrupt, only that it might be corrupt.
+** For most test cases, CORRUPT_DB is set to false using a special
+** sqlite3_test_control().  This enables assert() statements to prove
+** things that are always true for well-formed databases.
+*/
+#define CORRUPT_DB  (sqlite3Config.neverCorrupt==0)
+
 /*
 ** Context pointer passed down through the tree-walk.
 */
 struct Walker {
   int (*xExprCallback)(Walker*, Expr*);     /* Callback for expressions */
   int (*xSelectCallback)(Walker*,Select*);  /* Callback for SELECTs */
+  void (*xSelectCallback2)(Walker*,Select*);/* Second callback for SELECTs */
   Parse *pParse;                            /* Parser context.  */
   int walkerDepth;                          /* Number of subqueries */
-  u8 bSelectDepthFirst;                     /* Do subqueries first */
   union {                                   /* Extra data for callback */
     NameContext *pNC;                          /* Naming context */
     int i;                                     /* Integer value */
@@ -11773,6 +12246,21 @@ SQLITE_PRIVATE int sqlite3WalkSelectFrom(Walker*, Select*);
 #define WRC_Prune       1   /* Omit children but continue walking siblings */
 #define WRC_Abort       2   /* Abandon the tree walk */
 
+/*
+** An instance of this structure represents a set of one or more CTEs
+** (common table expressions) created by a single WITH clause.
+*/
+struct With {
+  int nCte;                       /* Number of CTEs in the WITH clause */
+  With *pOuter;                   /* Containing WITH clause, or NULL */
+  struct Cte {                    /* For each CTE in the WITH clause.... */
+    char *zName;                    /* Name of this CTE */
+    ExprList *pCols;                /* List of explicit column names, or NULL */
+    Select *pSelect;                /* The definition of this CTE */
+    const char *zErr;               /* Error message for circular references */
+  } a[1];
+};
+
 /*
 ** Assuming zIn points to the first byte of a UTF-8 character,
 ** advance zIn to point to the first byte of the next UTF-8 character.
@@ -11912,10 +12400,20 @@ SQLITE_PRIVATE   int sqlite3IsNaN(double);
 # define sqlite3IsNaN(X)  0
 #endif
 
-SQLITE_PRIVATE void sqlite3VXPrintf(StrAccum*, int, const char*, va_list);
-#ifndef SQLITE_OMIT_TRACE
-SQLITE_PRIVATE void sqlite3XPrintf(StrAccum*, const char*, ...);
-#endif
+/*
+** An instance of the following structure holds information about SQL
+** functions arguments that are the parameters to the printf() function.
+*/
+struct PrintfArguments {
+  int nArg;                /* Total number of arguments */
+  int nUsed;               /* Number of arguments used so far */
+  sqlite3_value **apArg;   /* The argument values */
+};
+
+#define SQLITE_PRINTF_INTERNAL 0x01
+#define SQLITE_PRINTF_SQLFUNC  0x02
+SQLITE_PRIVATE void sqlite3VXPrintf(StrAccum*, u32, const char*, va_list);
+SQLITE_PRIVATE void sqlite3XPrintf(StrAccum*, u32, const char*, ...);
 SQLITE_PRIVATE char *sqlite3MPrintf(sqlite3*,const char*, ...);
 SQLITE_PRIVATE char *sqlite3VMPrintf(sqlite3*,const char*, va_list);
 SQLITE_PRIVATE char *sqlite3MAppendf(sqlite3*,char*,const char*,...);
@@ -11981,6 +12479,8 @@ SQLITE_PRIVATE void sqlite3BeginParse(Parse*,int);
 SQLITE_PRIVATE void sqlite3CommitInternalChanges(sqlite3*);
 SQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse*,Select*);
 SQLITE_PRIVATE void sqlite3OpenMasterTable(Parse *, int);
+SQLITE_PRIVATE Index *sqlite3PrimaryKeyIndex(Table*);
+SQLITE_PRIVATE i16 sqlite3ColumnOfIndex(Index*, i16);
 SQLITE_PRIVATE void sqlite3StartTable(Parse*,Token*,Token*,int,int,int,int);
 SQLITE_PRIVATE void sqlite3AddColumn(Parse*,Token*);
 SQLITE_PRIVATE void sqlite3AddNotNull(Parse*, int);
@@ -11989,12 +12489,18 @@ SQLITE_PRIVATE void sqlite3AddCheckConstraint(Parse*, Expr*);
 SQLITE_PRIVATE void sqlite3AddColumnType(Parse*,Token*);
 SQLITE_PRIVATE void sqlite3AddDefaultValue(Parse*,ExprSpan*);
 SQLITE_PRIVATE void sqlite3AddCollateType(Parse*, Token*);
-SQLITE_PRIVATE void sqlite3EndTable(Parse*,Token*,Token*,Select*);
+SQLITE_PRIVATE void sqlite3EndTable(Parse*,Token*,Token*,u8,Select*);
 SQLITE_PRIVATE int sqlite3ParseUri(const char*,const char*,unsigned int*,
                     sqlite3_vfs**,char**,char **);
 SQLITE_PRIVATE Btree *sqlite3DbNameToBtree(sqlite3*,const char*);
 SQLITE_PRIVATE int sqlite3CodeOnce(Parse *);
 
+#ifdef SQLITE_OMIT_BUILTIN_TEST
+# define sqlite3FaultSim(X) SQLITE_OK
+#else
+SQLITE_PRIVATE   int sqlite3FaultSim(int);
+#endif
+
 SQLITE_PRIVATE Bitvec *sqlite3BitvecCreate(u32);
 SQLITE_PRIVATE int sqlite3BitvecTest(Bitvec*, u32);
 SQLITE_PRIVATE int sqlite3BitvecSet(Bitvec*, u32);
@@ -12006,7 +12512,7 @@ SQLITE_PRIVATE int sqlite3BitvecBuiltinTest(int,int*);
 SQLITE_PRIVATE RowSet *sqlite3RowSetInit(sqlite3*, void*, unsigned int);
 SQLITE_PRIVATE void sqlite3RowSetClear(RowSet*);
 SQLITE_PRIVATE void sqlite3RowSetInsert(RowSet*, i64);
-SQLITE_PRIVATE int sqlite3RowSetTest(RowSet*, u8 iBatch, i64);
+SQLITE_PRIVATE int sqlite3RowSetTest(RowSet*, int iBatch, i64);
 SQLITE_PRIVATE int sqlite3RowSetNext(RowSet*, i64*);
 
 SQLITE_PRIVATE void sqlite3CreateView(Parse*,Token*,Token*,Token*,Select*,int,int);
@@ -12027,8 +12533,7 @@ SQLITE_PRIVATE   void sqlite3AutoincrementEnd(Parse *pParse);
 # define sqlite3AutoincrementBegin(X)
 # define sqlite3AutoincrementEnd(X)
 #endif
-SQLITE_PRIVATE int sqlite3CodeCoroutine(Parse*, Select*, SelectDest*);
-SQLITE_PRIVATE void sqlite3Insert(Parse*, SrcList*, ExprList*, Select*, IdList*, int);
+SQLITE_PRIVATE void sqlite3Insert(Parse*, SrcList*, Select*, IdList*, int);
 SQLITE_PRIVATE void *sqlite3ArrayAllocate(sqlite3*,void*,int,int*,int*);
 SQLITE_PRIVATE IdList *sqlite3IdListAppend(sqlite3*, IdList*, Token*);
 SQLITE_PRIVATE int sqlite3IdListIndex(IdList*,const char*);
@@ -12042,8 +12547,9 @@ SQLITE_PRIVATE void sqlite3SrcListShiftJoinType(SrcList*);
 SQLITE_PRIVATE void sqlite3SrcListAssignCursors(Parse*, SrcList*);
 SQLITE_PRIVATE void sqlite3IdListDelete(sqlite3*, IdList*);
 SQLITE_PRIVATE void sqlite3SrcListDelete(sqlite3*, SrcList*);
+SQLITE_PRIVATE Index *sqlite3AllocateIndexObject(sqlite3*,i16,int,char**);
 SQLITE_PRIVATE Index *sqlite3CreateIndex(Parse*,Token*,Token*,SrcList*,ExprList*,int,Token*,
-                        Token*, int, int);
+                          Expr*, int, int);
 SQLITE_PRIVATE void sqlite3DropIndex(Parse*, SrcList*, int);
 SQLITE_PRIVATE int sqlite3Select(Parse*, Select*, SelectDest*);
 SQLITE_PRIVATE Select *sqlite3SelectNew(Parse*,ExprList*,SrcList*,Expr*,ExprList*,
@@ -12059,21 +12565,31 @@ SQLITE_PRIVATE void sqlite3DeleteFrom(Parse*, SrcList*, Expr*);
 SQLITE_PRIVATE void sqlite3Update(Parse*, SrcList*, ExprList*, Expr*, int);
 SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(Parse*,SrcList*,Expr*,ExprList*,ExprList*,u16,int);
 SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo*);
+SQLITE_PRIVATE u64 sqlite3WhereOutputRowCount(WhereInfo*);
+SQLITE_PRIVATE int sqlite3WhereIsDistinct(WhereInfo*);
+SQLITE_PRIVATE int sqlite3WhereIsOrdered(WhereInfo*);
+SQLITE_PRIVATE int sqlite3WhereIsSorted(WhereInfo*);
+SQLITE_PRIVATE int sqlite3WhereContinueLabel(WhereInfo*);
+SQLITE_PRIVATE int sqlite3WhereBreakLabel(WhereInfo*);
+SQLITE_PRIVATE int sqlite3WhereOkOnePass(WhereInfo*, int*);
 SQLITE_PRIVATE int sqlite3ExprCodeGetColumn(Parse*, Table*, int, int, int, u8);
 SQLITE_PRIVATE void sqlite3ExprCodeGetColumnOfTable(Vdbe*, Table*, int, int, int);
 SQLITE_PRIVATE void sqlite3ExprCodeMove(Parse*, int, int, int);
 SQLITE_PRIVATE void sqlite3ExprCacheStore(Parse*, int, int, int);
 SQLITE_PRIVATE void sqlite3ExprCachePush(Parse*);
-SQLITE_PRIVATE void sqlite3ExprCachePop(Parse*, int);
+SQLITE_PRIVATE void sqlite3ExprCachePop(Parse*);
 SQLITE_PRIVATE void sqlite3ExprCacheRemove(Parse*, int, int);
 SQLITE_PRIVATE void sqlite3ExprCacheClear(Parse*);
 SQLITE_PRIVATE void sqlite3ExprCacheAffinityChange(Parse*, int, int);
-SQLITE_PRIVATE int sqlite3ExprCode(Parse*, Expr*, int);
+SQLITE_PRIVATE void sqlite3ExprCode(Parse*, Expr*, int);
+SQLITE_PRIVATE void sqlite3ExprCodeFactorable(Parse*, Expr*, int);
+SQLITE_PRIVATE void sqlite3ExprCodeAtInit(Parse*, Expr*, int, u8);
 SQLITE_PRIVATE int sqlite3ExprCodeTemp(Parse*, Expr*, int*);
 SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse*, Expr*, int);
-SQLITE_PRIVATE int sqlite3ExprCodeAndCache(Parse*, Expr*, int);
-SQLITE_PRIVATE void sqlite3ExprCodeConstants(Parse*, Expr*);
-SQLITE_PRIVATE int sqlite3ExprCodeExprList(Parse*, ExprList*, int, int);
+SQLITE_PRIVATE void sqlite3ExprCodeAndCache(Parse*, Expr*, int);
+SQLITE_PRIVATE int sqlite3ExprCodeExprList(Parse*, ExprList*, int, u8);
+#define SQLITE_ECEL_DUP      0x01  /* Deep, not shallow copies */
+#define SQLITE_ECEL_FACTOR   0x02  /* Factor out constant terms */
 SQLITE_PRIVATE void sqlite3ExprIfTrue(Parse*, Expr*, int, int);
 SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse*, Expr*, int, int);
 SQLITE_PRIVATE Table *sqlite3FindTable(sqlite3*,const char*, const char*);
@@ -12085,15 +12601,15 @@ SQLITE_PRIVATE void sqlite3UnlinkAndDeleteIndex(sqlite3*,int,const char*);
 SQLITE_PRIVATE void sqlite3Vacuum(Parse*);
 SQLITE_PRIVATE int sqlite3RunVacuum(char**, sqlite3*);
 SQLITE_PRIVATE char *sqlite3NameFromToken(sqlite3*, Token*);
-SQLITE_PRIVATE int sqlite3ExprCompare(Expr*, Expr*);
-SQLITE_PRIVATE int sqlite3ExprListCompare(ExprList*, ExprList*);
+SQLITE_PRIVATE int sqlite3ExprCompare(Expr*, Expr*, int);
+SQLITE_PRIVATE int sqlite3ExprListCompare(ExprList*, ExprList*, int);
+SQLITE_PRIVATE int sqlite3ExprImpliesExpr(Expr*, Expr*, int);
 SQLITE_PRIVATE void sqlite3ExprAnalyzeAggregates(NameContext*, Expr*);
 SQLITE_PRIVATE void sqlite3ExprAnalyzeAggList(NameContext*,ExprList*);
 SQLITE_PRIVATE int sqlite3FunctionUsesThisSrc(Expr*, SrcList*);
 SQLITE_PRIVATE Vdbe *sqlite3GetVdbe(Parse*);
 SQLITE_PRIVATE void sqlite3PrngSaveState(void);
 SQLITE_PRIVATE void sqlite3PrngRestoreState(void);
-SQLITE_PRIVATE void sqlite3PrngResetState(void);
 SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3*,int);
 SQLITE_PRIVATE void sqlite3CodeVerifySchema(Parse*, int);
 SQLITE_PRIVATE void sqlite3CodeVerifyNamedSchema(Parse*, const char *zDb);
@@ -12108,20 +12624,22 @@ SQLITE_PRIVATE int sqlite3ExprIsConstantNotJoin(Expr*);
 SQLITE_PRIVATE int sqlite3ExprIsConstantOrFunction(Expr*);
 SQLITE_PRIVATE int sqlite3ExprIsInteger(Expr*, int*);
 SQLITE_PRIVATE int sqlite3ExprCanBeNull(const Expr*);
-SQLITE_PRIVATE void sqlite3ExprCodeIsNullJump(Vdbe*, const Expr*, int, int);
 SQLITE_PRIVATE int sqlite3ExprNeedsNoAffinityChange(const Expr*, char);
 SQLITE_PRIVATE int sqlite3IsRowid(const char*);
-SQLITE_PRIVATE void sqlite3GenerateRowDelete(Parse*, Table*, int, int, int, Trigger *, int);
-SQLITE_PRIVATE void sqlite3GenerateRowIndexDelete(Parse*, Table*, int, int*);
-SQLITE_PRIVATE int sqlite3GenerateIndexKey(Parse*, Index*, int, int, int);
-SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(Parse*,Table*,int,int,
-                                     int*,int,int,int,int,int*);
-SQLITE_PRIVATE void sqlite3CompleteInsertion(Parse*, Table*, int, int, int*, int, int, int);
-SQLITE_PRIVATE int sqlite3OpenTableAndIndices(Parse*, Table*, int, int);
+SQLITE_PRIVATE void sqlite3GenerateRowDelete(Parse*,Table*,Trigger*,int,int,int,i16,u8,u8,u8);
+SQLITE_PRIVATE void sqlite3GenerateRowIndexDelete(Parse*, Table*, int, int, int*);
+SQLITE_PRIVATE int sqlite3GenerateIndexKey(Parse*, Index*, int, int, int, int*,Index*,int);
+SQLITE_PRIVATE void sqlite3ResolvePartIdxLabel(Parse*,int);
+SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(Parse*,Table*,int*,int,int,int,int,
+                                     u8,u8,int,int*);
+SQLITE_PRIVATE void sqlite3CompleteInsertion(Parse*,Table*,int,int,int,int*,int,int,int);
+SQLITE_PRIVATE int sqlite3OpenTableAndIndices(Parse*, Table*, int, int, u8*, int*, int*);
 SQLITE_PRIVATE void sqlite3BeginWriteOperation(Parse*, int, int);
 SQLITE_PRIVATE void sqlite3MultiWrite(Parse*);
 SQLITE_PRIVATE void sqlite3MayAbort(Parse*);
-SQLITE_PRIVATE void sqlite3HaltConstraint(Parse*, int, int, char*, int);
+SQLITE_PRIVATE void sqlite3HaltConstraint(Parse*, int, int, char*, i8, u8);
+SQLITE_PRIVATE void sqlite3UniqueConstraint(Parse*, int, Index*);
+SQLITE_PRIVATE void sqlite3RowidConstraint(Parse*, int, Table*);
 SQLITE_PRIVATE Expr *sqlite3ExprDup(sqlite3*,Expr*,int);
 SQLITE_PRIVATE ExprList *sqlite3ExprListDup(sqlite3*,ExprList*,int);
 SQLITE_PRIVATE SrcList *sqlite3SrcListDup(sqlite3*,SrcList*,int);
@@ -12155,7 +12673,7 @@ SQLITE_PRIVATE   void sqlite3CodeRowTriggerDirect(Parse *, Trigger *, Table *, i
 SQLITE_PRIVATE   void sqlite3DeleteTriggerStep(sqlite3*, TriggerStep*);
 SQLITE_PRIVATE   TriggerStep *sqlite3TriggerSelectStep(sqlite3*,Select*);
 SQLITE_PRIVATE   TriggerStep *sqlite3TriggerInsertStep(sqlite3*,Token*, IdList*,
-                                        ExprList*,Select*,u8);
+                                        Select*,u8);
 SQLITE_PRIVATE   TriggerStep *sqlite3TriggerUpdateStep(sqlite3*,Token*,ExprList*, Expr*, u8);
 SQLITE_PRIVATE   TriggerStep *sqlite3TriggerDeleteStep(sqlite3*,Token*, Expr*);
 SQLITE_PRIVATE   void sqlite3DeleteTrigger(sqlite3*, Trigger*);
@@ -12191,7 +12709,7 @@ SQLITE_PRIVATE   int sqlite3AuthReadCol(Parse*, const char *, const char *, int)
 #endif
 SQLITE_PRIVATE void sqlite3Attach(Parse*, Expr*, Expr*, Expr*);
 SQLITE_PRIVATE void sqlite3Detach(Parse*, Expr*);
-SQLITE_PRIVATE int sqlite3FixInit(DbFixer*, Parse*, int, const char*, const Token*);
+SQLITE_PRIVATE void sqlite3FixInit(DbFixer*, Parse*, int, const char*, const Token*);
 SQLITE_PRIVATE int sqlite3FixSrcList(DbFixer*, SrcList*);
 SQLITE_PRIVATE int sqlite3FixSelect(DbFixer*, Select*);
 SQLITE_PRIVATE int sqlite3FixExpr(DbFixer*, Expr*);
@@ -12203,6 +12721,12 @@ SQLITE_PRIVATE int sqlite3Atoi(const char*);
 SQLITE_PRIVATE int sqlite3Utf16ByteLen(const void *pData, int nChar);
 SQLITE_PRIVATE int sqlite3Utf8CharLen(const char *pData, int nByte);
 SQLITE_PRIVATE u32 sqlite3Utf8Read(const u8**);
+SQLITE_PRIVATE LogEst sqlite3LogEst(u64);
+SQLITE_PRIVATE LogEst sqlite3LogEstAdd(LogEst,LogEst);
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+SQLITE_PRIVATE LogEst sqlite3LogEstFromDouble(double);
+#endif
+SQLITE_PRIVATE u64 sqlite3LogEstToInt(LogEst);
 
 /*
 ** Routines to read and write variable-length integers.  These used to
@@ -12244,7 +12768,7 @@ SQLITE_PRIVATE int sqlite3VarintLen(u64 v);
 
 
 SQLITE_PRIVATE const char *sqlite3IndexAffinityStr(Vdbe *, Index *);
-SQLITE_PRIVATE void sqlite3TableAffinityStr(Vdbe *, Table *);
+SQLITE_PRIVATE void sqlite3TableAffinity(Vdbe*, Table*, int);
 SQLITE_PRIVATE char sqlite3CompareAffinity(Expr *pExpr, char aff2);
 SQLITE_PRIVATE int sqlite3IndexAffinityOk(Expr *pExpr, char idx_affinity);
 SQLITE_PRIVATE char sqlite3ExprAffinity(Expr *pExpr);
@@ -12254,8 +12778,7 @@ SQLITE_PRIVATE void *sqlite3HexToBlob(sqlite3*, const char *z, int n);
 SQLITE_PRIVATE u8 sqlite3HexToInt(int h);
 SQLITE_PRIVATE int sqlite3TwoPartName(Parse *, Token *, Token *, Token **);
 
-#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST) || \
-    defined(SQLITE_DEBUG_OS_TRACE)
+#if defined(SQLITE_TEST) 
 SQLITE_PRIVATE const char *sqlite3ErrName(int);
 #endif
 
@@ -12264,7 +12787,7 @@ SQLITE_PRIVATE int sqlite3ReadSchema(Parse *pParse);
 SQLITE_PRIVATE CollSeq *sqlite3FindCollSeq(sqlite3*,u8 enc, const char*,int);
 SQLITE_PRIVATE CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char*zName);
 SQLITE_PRIVATE CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr);
-SQLITE_PRIVATE Expr *sqlite3ExprAddCollateToken(Parse *pParse, Expr*, Token*);
+SQLITE_PRIVATE Expr *sqlite3ExprAddCollateToken(Parse *pParse, Expr*, const Token*);
 SQLITE_PRIVATE Expr *sqlite3ExprAddCollateString(Parse*,Expr*,const char*);
 SQLITE_PRIVATE Expr *sqlite3ExprSkipCollate(Expr*);
 SQLITE_PRIVATE int sqlite3CheckCollSeq(Parse *, CollSeq *);
@@ -12285,12 +12808,10 @@ SQLITE_PRIVATE const void *sqlite3ValueText(sqlite3_value*, u8);
 SQLITE_PRIVATE int sqlite3ValueBytes(sqlite3_value*, u8);
 SQLITE_PRIVATE void sqlite3ValueSetStr(sqlite3_value*, int, const void *,u8, 
                         void(*)(void*));
+SQLITE_PRIVATE void sqlite3ValueSetNull(sqlite3_value*);
 SQLITE_PRIVATE void sqlite3ValueFree(sqlite3_value*);
 SQLITE_PRIVATE sqlite3_value *sqlite3ValueNew(sqlite3 *);
 SQLITE_PRIVATE char *sqlite3Utf16to8(sqlite3 *, const void*, int, u8);
-#ifdef SQLITE_ENABLE_STAT3
-SQLITE_PRIVATE char *sqlite3Utf8to16(sqlite3 *, u8, char *, int, int *);
-#endif
 SQLITE_PRIVATE int sqlite3ValueFromExpr(sqlite3 *, Expr *, u8, u8, sqlite3_value **);
 SQLITE_PRIVATE void sqlite3ValueApplyAffinity(sqlite3_value *, u8, u8);
 #ifndef SQLITE_AMALGAMATION
@@ -12316,12 +12837,13 @@ SQLITE_PRIVATE void sqlite3SelectPrep(Parse*, Select*, NameContext*);
 SQLITE_PRIVATE int sqlite3MatchSpanName(const char*, const char*, const char*, const char*);
 SQLITE_PRIVATE int sqlite3ResolveExprNames(NameContext*, Expr*);
 SQLITE_PRIVATE void sqlite3ResolveSelectNames(Parse*, Select*, NameContext*);
+SQLITE_PRIVATE void sqlite3ResolveSelfReference(Parse*,Table*,int,Expr*,ExprList*);
 SQLITE_PRIVATE int sqlite3ResolveOrderGroupBy(Parse*, Select*, ExprList*, const char*);
 SQLITE_PRIVATE void sqlite3ColumnDefault(Vdbe *, Table *, int, int);
 SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *, Token *);
 SQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *, SrcList *);
 SQLITE_PRIVATE CollSeq *sqlite3GetCollSeq(Parse*, u8, CollSeq *, const char*);
-SQLITE_PRIVATE char sqlite3AffinityType(const char*);
+SQLITE_PRIVATE char sqlite3AffinityType(const char*, u8*);
 SQLITE_PRIVATE void sqlite3Analyze(Parse*, Token*, Token*);
 SQLITE_PRIVATE int sqlite3InvokeBusyHandler(BusyHandler*);
 SQLITE_PRIVATE int sqlite3FindDb(sqlite3*, Token*);
@@ -12335,7 +12857,13 @@ SQLITE_PRIVATE void sqlite3MinimumFileFormat(Parse*, int, int);
 SQLITE_PRIVATE void sqlite3SchemaClear(void *);
 SQLITE_PRIVATE Schema *sqlite3SchemaGet(sqlite3 *, Btree *);
 SQLITE_PRIVATE int sqlite3SchemaToIndex(sqlite3 *db, Schema *);
-SQLITE_PRIVATE KeyInfo *sqlite3IndexKeyinfo(Parse *, Index *);
+SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoAlloc(sqlite3*,int,int);
+SQLITE_PRIVATE void sqlite3KeyInfoUnref(KeyInfo*);
+SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoRef(KeyInfo*);
+SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoOfIndex(Parse*, Index*);
+#ifdef SQLITE_DEBUG
+SQLITE_PRIVATE int sqlite3KeyInfoIsWriteable(KeyInfo*);
+#endif
 SQLITE_PRIVATE int sqlite3CreateFunc(sqlite3 *, const char *, int, int, void *, 
   void (*)(sqlite3_context*,int,sqlite3_value **),
   void (*)(sqlite3_context*,int,sqlite3_value **), void (*)(sqlite3_context*),
@@ -12346,6 +12874,7 @@ SQLITE_PRIVATE int sqlite3OpenTempDatabase(Parse *);
 
 SQLITE_PRIVATE void sqlite3StrAccumInit(StrAccum*, char*, int, int);
 SQLITE_PRIVATE void sqlite3StrAccumAppend(StrAccum*,const char*,int);
+SQLITE_PRIVATE void sqlite3StrAccumAppendAll(StrAccum*,const char*);
 SQLITE_PRIVATE void sqlite3AppendSpace(StrAccum*,int);
 SQLITE_PRIVATE char *sqlite3StrAccumFinish(StrAccum*);
 SQLITE_PRIVATE void sqlite3StrAccumReset(StrAccum*);
@@ -12355,6 +12884,12 @@ SQLITE_PRIVATE Expr *sqlite3CreateColumnExpr(sqlite3 *, SrcList *, int, int);
 SQLITE_PRIVATE void sqlite3BackupRestart(sqlite3_backup *);
 SQLITE_PRIVATE void sqlite3BackupUpdate(sqlite3_backup *, Pgno, const u8 *);
 
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+SQLITE_PRIVATE void sqlite3AnalyzeFunctions(void);
+SQLITE_PRIVATE int sqlite3Stat4ProbeSetValue(Parse*,Index*,UnpackedRecord**,Expr*,u8,int,int*);
+SQLITE_PRIVATE void sqlite3Stat4ProbeFree(UnpackedRecord*);
+#endif
+
 /*
 ** The interface to the LEMON-generated parser
 */
@@ -12396,13 +12931,14 @@ SQLITE_PRIVATE   int sqlite3Utf8To8(unsigned char*);
 #else
 SQLITE_PRIVATE    void sqlite3VtabClear(sqlite3 *db, Table*);
 SQLITE_PRIVATE    void sqlite3VtabDisconnect(sqlite3 *db, Table *p);
-SQLITE_PRIVATE    int sqlite3VtabSync(sqlite3 *db, char **);
+SQLITE_PRIVATE    int sqlite3VtabSync(sqlite3 *db, Vdbe*);
 SQLITE_PRIVATE    int sqlite3VtabRollback(sqlite3 *db);
 SQLITE_PRIVATE    int sqlite3VtabCommit(sqlite3 *db);
 SQLITE_PRIVATE    void sqlite3VtabLock(VTable *);
 SQLITE_PRIVATE    void sqlite3VtabUnlock(VTable *);
 SQLITE_PRIVATE    void sqlite3VtabUnlockList(sqlite3*);
 SQLITE_PRIVATE    int sqlite3VtabSavepoint(sqlite3 *, int, int);
+SQLITE_PRIVATE    void sqlite3VtabImportErrmsg(Vdbe*, sqlite3_vtab*);
 SQLITE_PRIVATE    VTable *sqlite3GetVTable(sqlite3*, Table*);
 #  define sqlite3VtabInSync(db) ((db)->nVTrans>0 && (db)->aVTrans==0)
 #endif
@@ -12417,8 +12953,10 @@ SQLITE_PRIVATE int sqlite3VtabCallDestroy(sqlite3*, int, const char *);
 SQLITE_PRIVATE int sqlite3VtabBegin(sqlite3 *, VTable *);
 SQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction(sqlite3 *,FuncDef*, int nArg, Expr*);
 SQLITE_PRIVATE void sqlite3InvalidFunction(sqlite3_context*,int,sqlite3_value**);
+SQLITE_PRIVATE sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context*);
 SQLITE_PRIVATE int sqlite3VdbeParameterIndex(Vdbe*, const char*, int);
 SQLITE_PRIVATE int sqlite3TransferBindings(sqlite3_stmt *, sqlite3_stmt *);
+SQLITE_PRIVATE void sqlite3ParserReset(Parse*);
 SQLITE_PRIVATE int sqlite3Reprepare(Vdbe*);
 SQLITE_PRIVATE void sqlite3ExprListCheckLength(Parse*, ExprList*, const char*);
 SQLITE_PRIVATE CollSeq *sqlite3BinaryCompareCollSeq(Parse *, Expr *, Expr *);
@@ -12428,6 +12966,14 @@ SQLITE_PRIVATE const char *sqlite3JournalModename(int);
 SQLITE_PRIVATE   int sqlite3Checkpoint(sqlite3*, int, int, int*, int*);
 SQLITE_PRIVATE   int sqlite3WalDefaultHook(void*,sqlite3*,const char*,int);
 #endif
+#ifndef SQLITE_OMIT_CTE
+SQLITE_PRIVATE   With *sqlite3WithAdd(Parse*,With*,Token*,ExprList*,Select*);
+SQLITE_PRIVATE   void sqlite3WithDelete(sqlite3*,With*);
+SQLITE_PRIVATE   void sqlite3WithPush(Parse*, With*, u8);
+#else
+#define sqlite3WithPush(x,y,z)
+#define sqlite3WithDelete(x,y)
+#endif
 
 /* Declarations for functions in fkey.c. All of these are replaced by
 ** no-op macros if OMIT_FOREIGN_KEY is defined. In this case no foreign
@@ -12437,18 +12983,18 @@ SQLITE_PRIVATE   int sqlite3WalDefaultHook(void*,sqlite3*,const char*,int);
 ** provided (enforcement of FK constraints requires the triggers sub-system).
 */
 #if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER)
-SQLITE_PRIVATE   void sqlite3FkCheck(Parse*, Table*, int, int);
+SQLITE_PRIVATE   void sqlite3FkCheck(Parse*, Table*, int, int, int*, int);
 SQLITE_PRIVATE   void sqlite3FkDropTable(Parse*, SrcList *, Table*);
-SQLITE_PRIVATE   void sqlite3FkActions(Parse*, Table*, ExprList*, int);
+SQLITE_PRIVATE   void sqlite3FkActions(Parse*, Table*, ExprList*, int, int*, int);
 SQLITE_PRIVATE   int sqlite3FkRequired(Parse*, Table*, int*, int);
 SQLITE_PRIVATE   u32 sqlite3FkOldmask(Parse*, Table*);
 SQLITE_PRIVATE   FKey *sqlite3FkReferences(Table *);
 #else
-  #define sqlite3FkActions(a,b,c,d)
-  #define sqlite3FkCheck(a,b,c,d)
+  #define sqlite3FkActions(a,b,c,d,e,f)
+  #define sqlite3FkCheck(a,b,c,d,e,f)
   #define sqlite3FkDropTable(a,b,c)
-  #define sqlite3FkOldmask(a,b)      0
-  #define sqlite3FkRequired(a,b,c,d) 0
+  #define sqlite3FkOldmask(a,b)         0
+  #define sqlite3FkRequired(a,b,c,d)    0
 #endif
 #ifndef SQLITE_OMIT_FOREIGN_KEY
 SQLITE_PRIVATE   void sqlite3FkDelete(sqlite3 *, Table*);
@@ -12735,6 +13281,7 @@ SQLITE_PRIVATE SQLITE_WSD struct Sqlite3Config sqlite3Config = {
    SQLITE_USE_URI,            /* bOpenUri */
    SQLITE_ALLOW_COVERING_INDEX_SCAN,   /* bUseCis */
    0x7ffffffe,                /* mxStrlen */
+   0,                         /* neverCorrupt */
    128,                       /* szLookaside */
    500,                       /* nLookaside */
    {0,0,0,0,0,0,0,0},         /* m */
@@ -12759,18 +13306,24 @@ SQLITE_PRIVATE SQLITE_WSD struct Sqlite3Config sqlite3Config = {
    0,                         /* isMutexInit */
    0,                         /* isMallocInit */
    0,                         /* isPCacheInit */
-   0,                         /* pInitMutex */
    0,                         /* nRefInitMutex */
+   0,                         /* pInitMutex */
    0,                         /* xLog */
    0,                         /* pLogArg */
-   0,                         /* bLocaltimeFault */
 #ifdef SQLITE_ENABLE_SQLLOG
    0,                         /* xSqllog */
-   0                          /* pSqllogArg */
+   0,                         /* pSqllogArg */
 #endif
+#ifdef SQLITE_VDBE_COVERAGE
+   0,                         /* xVdbeBranch */
+   0,                         /* pVbeBranchArg */
+#endif
+#ifndef SQLITE_OMIT_BUILTIN_TEST
+   0,                         /* xTestCallback */
+#endif
+   0                          /* bLocaltimeFault */
 };
 
-
 /*
 ** Hash table for global functions - functions common to all
 ** database connections.  After initialization, this table is
@@ -12937,7 +13490,9 @@ static const char * const azCompileOpt[] = {
 #ifdef SQLITE_ENABLE_RTREE
   "ENABLE_RTREE",
 #endif
-#ifdef SQLITE_ENABLE_STAT3
+#if defined(SQLITE_ENABLE_STAT4)
+  "ENABLE_STAT4",
+#elif defined(SQLITE_ENABLE_STAT3)
   "ENABLE_STAT3",
 #endif
 #ifdef SQLITE_ENABLE_UNLOCK_NOTIFY
@@ -13033,6 +13588,9 @@ static const char * const azCompileOpt[] = {
 #ifdef SQLITE_OMIT_COMPOUND_SELECT
   "OMIT_COMPOUND_SELECT",
 #endif
+#ifdef SQLITE_OMIT_CTE
+  "OMIT_CTE",
+#endif
 #ifdef SQLITE_OMIT_DATETIME_FUNCS
   "OMIT_DATETIME_FUNCS",
 #endif
@@ -13165,6 +13723,9 @@ static const char * const azCompileOpt[] = {
 #ifdef SQLITE_SOUNDEX
   "SOUNDEX",
 #endif
+#ifdef SQLITE_SYSTEM_MALLOC
+  "SYSTEM_MALLOC",
+#endif
 #ifdef SQLITE_TCL
   "TCL",
 #endif
@@ -13180,6 +13741,9 @@ static const char * const azCompileOpt[] = {
 #ifdef SQLITE_USE_ALLOCA
   "USE_ALLOCA",
 #endif
+#ifdef SQLITE_WIN32_MALLOC
+  "WIN32_MALLOC",
+#endif
 #ifdef SQLITE_ZERO_MALLOC
   "ZERO_MALLOC"
 #endif
@@ -13279,7 +13843,7 @@ typedef struct VdbeOp Op;
 /*
 ** Boolean values
 */
-typedef unsigned char Bool;
+typedef unsigned Bool;
 
 /* Opaque type used by code in vdbesort.c */
 typedef struct VdbeSorter VdbeSorter;
@@ -13287,12 +13851,18 @@ typedef struct VdbeSorter VdbeSorter;
 /* Opaque type used by the explainer */
 typedef struct Explain Explain;
 
+/* Elements of the linked list at Vdbe.pAuxData */
+typedef struct AuxData AuxData;
+
 /*
 ** A cursor is a pointer into a single BTree within a database file.
 ** The cursor can seek to a BTree entry with a particular key, or
 ** loop over all entries of the Btree.  You can also insert new BTree
 ** entries or retrieve the key or data from the entry that the cursor
 ** is currently pointing to.
+**
+** Cursors can also point to virtual tables, sorters, or "pseudo-tables".
+** A pseudo-table is a single-row table implemented by registers.
 ** 
 ** Every cursor that the virtual machine has open is represented by an
 ** instance of the following structure.
@@ -13301,31 +13871,24 @@ struct VdbeCursor {
   BtCursor *pCursor;    /* The cursor structure of the backend */
   Btree *pBt;           /* Separate file holding temporary table */
   KeyInfo *pKeyInfo;    /* Info about index keys needed by index cursors */
-  int iDb;              /* Index of cursor database in db->aDb[] (or -1) */
+  int seekResult;       /* Result of previous sqlite3BtreeMoveto() */
   int pseudoTableReg;   /* Register holding pseudotable content. */
-  int nField;           /* Number of fields in the header */
-  Bool zeroed;          /* True if zeroed out and ready for reuse */
-  Bool rowidIsValid;    /* True if lastRowid is valid */
-  Bool atFirst;         /* True if pointing to first entry */
-  Bool useRandomRowid;  /* Generate new record numbers semi-randomly */
-  Bool nullRow;         /* True if pointing to a row with no data */
-  Bool deferredMoveto;  /* A call to sqlite3BtreeMoveto() is needed */
-  Bool isTable;         /* True if a table requiring integer keys */
-  Bool isIndex;         /* True if an index containing keys only - no data */
-  Bool isOrdered;       /* True if the underlying table is BTREE_UNORDERED */
-  Bool isSorter;        /* True if a new-style sorter */
-  Bool multiPseudo;     /* Multi-register pseudo-cursor */
+  i16 nField;           /* Number of fields in the header */
+  u16 nHdrParsed;       /* Number of header fields parsed so far */
+  i8 iDb;               /* Index of cursor database in db->aDb[] (or -1) */
+  u8 nullRow;           /* True if pointing to a row with no data */
+  u8 rowidIsValid;      /* True if lastRowid is valid */
+  u8 deferredMoveto;    /* A call to sqlite3BtreeMoveto() is needed */
+  Bool isEphemeral:1;   /* True for an ephemeral table */
+  Bool useRandomRowid:1;/* Generate new record numbers semi-randomly */
+  Bool isTable:1;       /* True if a table requiring integer keys */
+  Bool isOrdered:1;     /* True if the underlying table is BTREE_UNORDERED */
   sqlite3_vtab_cursor *pVtabCursor;  /* The cursor for a virtual table */
-  const sqlite3_module *pModule;     /* Module for cursor pVtabCursor */
   i64 seqCount;         /* Sequence counter */
   i64 movetoTarget;     /* Argument to the deferred sqlite3BtreeMoveto() */
-  i64 lastRowid;        /* Last rowid from a Next or NextIdx operation */
+  i64 lastRowid;        /* Rowid being deleted by OP_Delete */
   VdbeSorter *pSorter;  /* Sorter object for OP_SorterOpen cursors */
 
-  /* Result of last sqlite3BtreeMoveto() done by an OP_NotExists or 
-  ** OP_IsUnique opcode on this cursor. */
-  int seekResult;
-
   /* Cached information about the header for the data record that the
   ** cursor is currently pointing to.  Only valid if cacheStatus matches
   ** Vdbe.cacheCtr.  Vdbe.cacheCtr will never take on the value of
@@ -13336,10 +13899,14 @@ struct VdbeCursor {
   ** be NULL.
   */
   u32 cacheStatus;      /* Cache is valid if this matches Vdbe.cacheCtr */
-  int payloadSize;      /* Total number of bytes in the record */
-  u32 *aType;           /* Type values for all entries in the record */
-  u32 *aOffset;         /* Cached offsets to the start of each columns data */
-  u8 *aRow;             /* Data for the current row, if all on one page */
+  u32 payloadSize;      /* Total number of bytes in the record */
+  u32 szRow;            /* Byte available in aRow */
+  u32 iHdrOffset;       /* Offset to next unparsed byte of the header */
+  const u8 *aRow;       /* Data for the current row, if all on one page */
+  u32 aType[1];         /* Type values for all entries in the record */
+  /* 2*nField extra array elements allocated for aType[], beyond the one
+  ** static element declared in the structure.  nField total array slots for
+  ** aType[] and nField+1 array slots for aOffset[] */
 };
 typedef struct VdbeCursor VdbeCursor;
 
@@ -13409,7 +13976,6 @@ struct Mem {
   } u;
   int n;              /* Number of characters in string value, excluding '\0' */
   u16 flags;          /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc. */
-  u8  type;           /* One of SQLITE_NULL, SQLITE_TEXT, SQLITE_INTEGER, etc */
   u8  enc;            /* SQLITE_UTF8, SQLITE_UTF16BE, SQLITE_UTF16LE */
 #ifdef SQLITE_DEBUG
   Mem *pScopyFrom;    /* This Mem is a shallow copy of pScopyFrom */
@@ -13436,9 +14002,10 @@ struct Mem {
 #define MEM_Int       0x0004   /* Value is an integer */
 #define MEM_Real      0x0008   /* Value is a real number */
 #define MEM_Blob      0x0010   /* Value is a BLOB */
+#define MEM_AffMask   0x001f   /* Mask of affinity bits */
 #define MEM_RowSet    0x0020   /* Value is a RowSet object */
 #define MEM_Frame     0x0040   /* Value is a VdbeFrame object */
-#define MEM_Invalid   0x0080   /* Value is undefined */
+#define MEM_Undefined 0x0080   /* Value is undefined */
 #define MEM_Cleared   0x0100   /* NULL set by OP_Null, not from data */
 #define MEM_TypeMask  0x01ff   /* Mask of type bits */
 
@@ -13449,7 +14016,7 @@ struct Mem {
 ** string is \000 or \u0000 terminated
 */
 #define MEM_Term      0x0200   /* String rep is nul terminated */
-#define MEM_Dyn       0x0400   /* Need to call sqliteFree() on Mem.z */
+#define MEM_Dyn       0x0400   /* Need to call Mem.xDel() on Mem.z */
 #define MEM_Static    0x0800   /* Mem.z points to a static string */
 #define MEM_Ephem     0x1000   /* Mem.z points to an ephemeral string */
 #define MEM_Agg       0x2000   /* Mem.z points to an agg function context */
@@ -13470,26 +14037,22 @@ struct Mem {
 ** is for use inside assert() statements only.
 */
 #ifdef SQLITE_DEBUG
-#define memIsValid(M)  ((M)->flags & MEM_Invalid)==0
+#define memIsValid(M)  ((M)->flags & MEM_Undefined)==0
 #endif
 
-
-/* A VdbeFunc is just a FuncDef (defined in sqliteInt.h) that contains
-** additional information about auxiliary information bound to arguments
-** of the function.  This is used to implement the sqlite3_get_auxdata()
-** and sqlite3_set_auxdata() APIs.  The "auxdata" is some auxiliary data
-** that can be associated with a constant argument to a function.  This
-** allows functions such as "regexp" to compile their constant regular
-** expression argument once and reused the compiled code for multiple
-** invocations.
+/*
+** Each auxilliary data pointer stored by a user defined function 
+** implementation calling sqlite3_set_auxdata() is stored in an instance
+** of this structure. All such structures associated with a single VM
+** are stored in a linked list headed at Vdbe.pAuxData. All are destroyed
+** when the VM is halted (if not before).
 */
-struct VdbeFunc {
-  FuncDef *pFunc;               /* The definition of the function */
-  int nAux;                     /* Number of entries allocated for apAux[] */
-  struct AuxData {
-    void *pAux;                   /* Aux data for the i-th argument */
-    void (*xDelete)(void *);      /* Destructor for the aux data */
-  } apAux[1];                   /* One slot for each function argument */
+struct AuxData {
+  int iOp;                        /* Instruction number of OP_Function opcode */
+  int iArg;                       /* Index of function argument. */
+  void *pAux;                     /* Aux data pointer */
+  void (*xDelete)(void *);        /* Destructor for the aux data */
+  AuxData *pNext;                 /* Next element in list */
 };
 
 /*
@@ -13507,12 +14070,14 @@ struct VdbeFunc {
 */
 struct sqlite3_context {
   FuncDef *pFunc;       /* Pointer to function information.  MUST BE FIRST */
-  VdbeFunc *pVdbeFunc;  /* Auxilary data, if created. */
   Mem s;                /* The return value is stored here */
   Mem *pMem;            /* Memory cell used to store aggregate context */
   CollSeq *pColl;       /* Collating sequence */
+  Vdbe *pVdbe;          /* The VM that owns this context */
+  int iOp;              /* Instruction number of OP_Function */
   int isError;          /* Error code returned by the function. */
-  int skipFlag;         /* Skip skip accumulator loading if true */
+  u8 skipFlag;          /* Skip skip accumulator loading if true */
+  u8 fErrorOrAux;       /* isError!=0 or pVdbe->pAuxData modified */
 };
 
 /*
@@ -13554,12 +14119,9 @@ struct Vdbe {
   Mem **apArg;            /* Arguments to currently executing user function */
   Mem *aColName;          /* Column names to return */
   Mem *pResultSet;        /* Pointer to an array of results */
+  Parse *pParse;          /* Parsing context used to create this Vdbe */
   int nMem;               /* Number of memory locations currently allocated */
   int nOp;                /* Number of instructions in the program */
-  int nOpAlloc;           /* Number of slots allocated for aOp[] */
-  int nLabel;             /* Number of labels used */
-  int *aLabel;            /* Space to hold the labels */
-  u16 nResColumn;         /* Number of columns in one row of the result set */
   int nCursor;            /* Number of slots in apCsr[] */
   u32 magic;              /* Magic number for sanity checking */
   char *zErrMsg;          /* Error message written here */
@@ -13572,6 +14134,7 @@ struct Vdbe {
   u32 cacheCtr;           /* VdbeCursor row cache generation counter */
   int pc;                 /* The program counter */
   int rc;                 /* Value to return */
+  u16 nResColumn;         /* Number of columns in one row of the result set */
   u8 errorAction;         /* Recovery action to do in case of an error */
   u8 minWriteFileFormat;  /* Minimum file format for writable database files */
   bft explain:2;          /* True if EXPLAIN present on SQL command */
@@ -13580,24 +14143,24 @@ struct Vdbe {
   bft expired:1;          /* True if the VM needs to be recompiled */
   bft runOnlyOnce:1;      /* Automatically expire on reset */
   bft usesStmtJournal:1;  /* True if uses a statement journal */
-  bft readOnly:1;         /* True for read-only statements */
+  bft readOnly:1;         /* True for statements that do not write */
+  bft bIsReader:1;        /* True for statements that read */
   bft isPrepareV2:1;      /* True if prepared with prepare_v2() */
   bft doingRerun:1;       /* True if rerunning after an auto-reprepare */
   int nChange;            /* Number of db changes made since last reset */
   yDbMask btreeMask;      /* Bitmask of db->aDb[] entries referenced */
   yDbMask lockMask;       /* Subset of btreeMask that requires a lock */
   int iStatement;         /* Statement number (or 0 if has not opened stmt) */
-  int aCounter[3];        /* Counters used by sqlite3_stmt_status() */
+  u32 aCounter[5];        /* Counters used by sqlite3_stmt_status() */
 #ifndef SQLITE_OMIT_TRACE
   i64 startTime;          /* Time when query started - used for profiling */
 #endif
+  i64 iCurrentTime;       /* Value of julianday('now') for this statement */
   i64 nFkConstraint;      /* Number of imm. FK constraints this VM */
   i64 nStmtDefCons;       /* Number of def. constraints when stmt started */
+  i64 nStmtDefImmCons;    /* Number of def. imm constraints when stmt started */
   char *zSql;             /* Text of the SQL statement that generated this */
   void *pFree;            /* Free this when deleting the vdbe */
-#ifdef SQLITE_DEBUG
-  FILE *trace;            /* Write an execution trace here, if not NULL */
-#endif
 #ifdef SQLITE_ENABLE_TREE_EXPLAIN
   Explain *pExplain;      /* The explainer */
   char *zExplain;         /* Explanation of data structures */
@@ -13609,6 +14172,7 @@ struct Vdbe {
   SubProgram *pProgram;   /* Linked list of all sub-programs used by VM */
   int nOnceFlag;          /* Size of array aOnceFlag[] */
   u8 *aOnceFlag;          /* Flags for OP_Once */
+  AuxData *pAuxData;      /* Linked list of auxdata allocations */
 };
 
 /*
@@ -13630,9 +14194,9 @@ SQLITE_PRIVATE void sqlite3VdbePrintOp(FILE*, int, Op*);
 #endif
 SQLITE_PRIVATE u32 sqlite3VdbeSerialTypeLen(u32);
 SQLITE_PRIVATE u32 sqlite3VdbeSerialType(Mem*, int);
-SQLITE_PRIVATE u32 sqlite3VdbeSerialPut(unsigned char*, int, Mem*, int);
+SQLITE_PRIVATE u32 sqlite3VdbeSerialPut(unsigned char*, Mem*, u32);
 SQLITE_PRIVATE u32 sqlite3VdbeSerialGet(const unsigned char*, u32, Mem*);
-SQLITE_PRIVATE void sqlite3VdbeDeleteAuxData(VdbeFunc*, int);
+SQLITE_PRIVATE void sqlite3VdbeDeleteAuxData(Vdbe*, int, int);
 
 int sqlite2BtreeKeyCompare(BtCursor *, const void *, int, int, int *);
 SQLITE_PRIVATE int sqlite3VdbeIdxKeyCompare(VdbeCursor*,UnpackedRecord*,int*);
@@ -13665,28 +14229,29 @@ SQLITE_PRIVATE double sqlite3VdbeRealValue(Mem*);
 SQLITE_PRIVATE void sqlite3VdbeIntegerAffinity(Mem*);
 SQLITE_PRIVATE int sqlite3VdbeMemRealify(Mem*);
 SQLITE_PRIVATE int sqlite3VdbeMemNumerify(Mem*);
-SQLITE_PRIVATE int sqlite3VdbeMemFromBtree(BtCursor*,int,int,int,Mem*);
+SQLITE_PRIVATE int sqlite3VdbeMemFromBtree(BtCursor*,u32,u32,int,Mem*);
 SQLITE_PRIVATE void sqlite3VdbeMemRelease(Mem *p);
 SQLITE_PRIVATE void sqlite3VdbeMemReleaseExternal(Mem *p);
+#define VdbeMemDynamic(X)  \
+  (((X)->flags&(MEM_Agg|MEM_Dyn|MEM_RowSet|MEM_Frame))!=0)
 #define VdbeMemRelease(X)  \
-  if((X)->flags&(MEM_Agg|MEM_Dyn|MEM_RowSet|MEM_Frame)) \
-    sqlite3VdbeMemReleaseExternal(X);
+  if( VdbeMemDynamic(X) ) sqlite3VdbeMemReleaseExternal(X);
 SQLITE_PRIVATE int sqlite3VdbeMemFinalize(Mem*, FuncDef*);
 SQLITE_PRIVATE const char *sqlite3OpcodeName(int);
 SQLITE_PRIVATE int sqlite3VdbeMemGrow(Mem *pMem, int n, int preserve);
 SQLITE_PRIVATE int sqlite3VdbeCloseStatement(Vdbe *, int);
 SQLITE_PRIVATE void sqlite3VdbeFrameDelete(VdbeFrame*);
 SQLITE_PRIVATE int sqlite3VdbeFrameRestore(VdbeFrame *);
-SQLITE_PRIVATE void sqlite3VdbeMemStoreType(Mem *pMem);
 SQLITE_PRIVATE int sqlite3VdbeTransferError(Vdbe *p);
 
 SQLITE_PRIVATE int sqlite3VdbeSorterInit(sqlite3 *, VdbeCursor *);
+SQLITE_PRIVATE void sqlite3VdbeSorterReset(sqlite3 *, VdbeSorter *);
 SQLITE_PRIVATE void sqlite3VdbeSorterClose(sqlite3 *, VdbeCursor *);
 SQLITE_PRIVATE int sqlite3VdbeSorterRowkey(const VdbeCursor *, Mem *);
 SQLITE_PRIVATE int sqlite3VdbeSorterNext(sqlite3 *, const VdbeCursor *, int *);
 SQLITE_PRIVATE int sqlite3VdbeSorterRewind(sqlite3 *, const VdbeCursor *, int *);
 SQLITE_PRIVATE int sqlite3VdbeSorterWrite(sqlite3 *, const VdbeCursor *, Mem *);
-SQLITE_PRIVATE int sqlite3VdbeSorterCompare(const VdbeCursor *, Mem *, int *);
+SQLITE_PRIVATE int sqlite3VdbeSorterCompare(const VdbeCursor *, Mem *, int, int *);
 
 #if !defined(SQLITE_OMIT_SHARED_CACHE) && SQLITE_THREADSAFE>0
 SQLITE_PRIVATE   void sqlite3VdbeEnter(Vdbe*);
@@ -13698,6 +14263,7 @@ SQLITE_PRIVATE   void sqlite3VdbeLeave(Vdbe*);
 
 #ifdef SQLITE_DEBUG
 SQLITE_PRIVATE void sqlite3VdbeMemAboutToChange(Vdbe*,Mem*);
+SQLITE_PRIVATE int sqlite3VdbeCheckMemInvariants(Mem*);
 #endif
 
 #ifndef SQLITE_OMIT_FOREIGN_KEY
@@ -13953,6 +14519,16 @@ SQLITE_API int sqlite3_db_status(
       break;
     }
 
+    /* Set *pCurrent to non-zero if there are unresolved deferred foreign
+    ** key constraints.  Set *pCurrent to zero if all foreign key constraints
+    ** have been satisfied.  The *pHighwater is always set to zero.
+    */
+    case SQLITE_DBSTATUS_DEFERRED_FKS: {
+      *pHighwater = 0;
+      *pCurrent = db->nDeferredImmCons>0 || db->nDeferredCons>0;
+      break;
+    }
+
     default: {
       rc = SQLITE_ERROR;
     }
@@ -14258,8 +14834,8 @@ static int parseYyyyMmDd(const char *zDate, DateTime *p){
 ** Return the number of errors.
 */
 static int setDateTimeToCurrent(sqlite3_context *context, DateTime *p){
-  sqlite3 *db = sqlite3_context_db_handle(context);
-  if( sqlite3OsCurrentTimeInt64(db->pVfs, &p->iJD)==SQLITE_OK ){
+  p->iJD = sqlite3StmtCurrentTime(context);
+  if( p->iJD>0 ){
     p->validJD = 1;
     return 0;
   }else{
@@ -14390,6 +14966,10 @@ static void clearYMD_HMS_TZ(DateTime *p){
 **
 ** If the sqlite3GlobalConfig.bLocaltimeFault variable is true then this
 ** routine will always fail.
+**
+** EVIDENCE-OF: R-62172-00036 In this implementation, the standard C
+** library function localtime_r() is used to assist in the calculation of
+** local time.
 */
 static int osLocaltime(time_t *t, struct tm *pTm){
   int rc;
@@ -14446,6 +15026,11 @@ static sqlite3_int64 localtimeOffset(
   x = *p;
   computeYMD_HMS(&x);
   if( x.Y<1971 || x.Y>=2038 ){
+    /* EVIDENCE-OF: R-55269-29598 The localtime_r() C function normally only
+    ** works for years between 1970 and 2037. For dates outside this range,
+    ** SQLite attempts to map the year into an equivalent year within this
+    ** range, do the calculation, then map the year back.
+    */
     x.Y = 2000;
     x.M = 1;
     x.D = 1;
@@ -15042,8 +15627,8 @@ static void currentTimeFunc(
   UNUSED_PARAMETER(argc);
   UNUSED_PARAMETER(argv);
 
-  db = sqlite3_context_db_handle(context);
-  if( sqlite3OsCurrentTimeInt64(db->pVfs, &iT) ) return;
+  iT = sqlite3StmtCurrentTime(context);
+  if( iT<=0 ) return;
   t = iT/1000 - 10000*(sqlite3_int64)21086676;
 #ifdef HAVE_GMTIME_R
   pTm = gmtime_r(&t, &sNow);
@@ -15201,7 +15786,21 @@ SQLITE_PRIVATE int sqlite3OsCheckReservedLock(sqlite3_file *id, int *pResOut){
 ** routine has no return value since the return value would be meaningless.
 */
 SQLITE_PRIVATE int sqlite3OsFileControl(sqlite3_file *id, int op, void *pArg){
-  DO_OS_MALLOC_TEST(id);
+#ifdef SQLITE_TEST
+  if( op!=SQLITE_FCNTL_COMMIT_PHASETWO ){
+    /* Faults are not injected into COMMIT_PHASETWO because, assuming SQLite
+    ** is using a regular VFS, it is called after the corresponding 
+    ** transaction has been committed. Injecting a fault at this point 
+    ** confuses the test scripts - the COMMIT comand returns SQLITE_NOMEM
+    ** but the transaction is committed anyway.
+    **
+    ** The core must call OsFileControl() though, not OsFileControlHint(),
+    ** as if a custom VFS (e.g. zipvfs) returns an error here, it probably
+    ** means the commit really has failed and an error should be returned
+    ** to the user.  */
+    DO_OS_MALLOC_TEST(id);
+  }
+#endif
   return id->pMethods->xFileControl(id, op, pArg);
 }
 SQLITE_PRIVATE void sqlite3OsFileControlHint(sqlite3_file *id, int op, void *pArg){
@@ -15671,16 +16270,6 @@ SQLITE_PRIVATE void sqlite3MemSetDefault(void){
 ** macros.
 */
 #ifdef SQLITE_SYSTEM_MALLOC
-
-/*
-** The MSVCRT has malloc_usable_size() but it is called _msize().
-** The use of _msize() is automatic, but can be disabled by compiling
-** with -DSQLITE_WITHOUT_MSIZE
-*/
-#if defined(_MSC_VER) && !defined(SQLITE_WITHOUT_MSIZE)
-# define SQLITE_MALLOCSIZE _msize
-#endif
-
 #if defined(__APPLE__) && !defined(SQLITE_WITHOUT_ZONEMALLOC)
 
 /*
@@ -15703,22 +16292,48 @@ static malloc_zone_t* _sqliteZone_;
 ** Use standard C library malloc and free on non-Apple systems.  
 ** Also used by Apple systems if SQLITE_WITHOUT_ZONEMALLOC is defined.
 */
-#define SQLITE_MALLOC(x)    malloc(x)
-#define SQLITE_FREE(x)      free(x)
-#define SQLITE_REALLOC(x,y) realloc((x),(y))
+#define SQLITE_MALLOC(x)             malloc(x)
+#define SQLITE_FREE(x)               free(x)
+#define SQLITE_REALLOC(x,y)          realloc((x),(y))
 
-#if (defined(_MSC_VER) && !defined(SQLITE_WITHOUT_MSIZE)) \
-      || (defined(HAVE_MALLOC_H) && defined(HAVE_MALLOC_USABLE_SIZE))
-# include <malloc.h>    /* Needed for malloc_usable_size on linux */
-#endif
-#ifdef HAVE_MALLOC_USABLE_SIZE
-# ifndef SQLITE_MALLOCSIZE
-#  define SQLITE_MALLOCSIZE(x) malloc_usable_size(x)
-# endif
-#else
-# undef SQLITE_MALLOCSIZE
+/*
+** The malloc.h header file is needed for malloc_usable_size() function
+** on some systems (e.g. Linux).
+*/
+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLOC_USABLE_SIZE)
+#  define SQLITE_USE_MALLOC_H
+#  define SQLITE_USE_MALLOC_USABLE_SIZE
+/*
+** The MSVCRT has malloc_usable_size(), but it is called _msize().  The
+** use of _msize() is automatic, but can be disabled by compiling with
+** -DSQLITE_WITHOUT_MSIZE.  Using the _msize() function also requires
+** the malloc.h header file.
+*/
+#elif defined(_MSC_VER) && !defined(SQLITE_WITHOUT_MSIZE)
+#  define SQLITE_USE_MALLOC_H
+#  define SQLITE_USE_MSIZE
 #endif
 
+/*
+** Include the malloc.h header file, if necessary.  Also set define macro
+** SQLITE_MALLOCSIZE to the appropriate function name, which is _msize()
+** for MSVC and malloc_usable_size() for most other systems (e.g. Linux).
+** The memory size function can always be overridden manually by defining
+** the macro SQLITE_MALLOCSIZE to the desired function name.
+*/
+#if defined(SQLITE_USE_MALLOC_H)
+#  include <malloc.h>
+#  if defined(SQLITE_USE_MALLOC_USABLE_SIZE)
+#    if !defined(SQLITE_MALLOCSIZE)
+#      define SQLITE_MALLOCSIZE(x)   malloc_usable_size(x)
+#    endif
+#  elif defined(SQLITE_USE_MSIZE)
+#    if !defined(SQLITE_MALLOCSIZE)
+#      define SQLITE_MALLOCSIZE      _msize
+#    endif
+#  endif
+#endif /* defined(SQLITE_USE_MALLOC_H) */
+
 #endif /* __APPLE__ or not __APPLE__ */
 
 /*
@@ -16082,7 +16697,7 @@ static int sqlite3MemSize(void *p){
     return 0;
   }
   pHdr = sqlite3MemsysGetHeader(p);
-  return pHdr->iSize;
+  return (int)pHdr->iSize;
 }
 
 /*
@@ -16124,7 +16739,7 @@ static void randomFill(char *pBuf, int nByte){
   x = SQLITE_PTR_TO_INT(pBuf);
   y = nByte | 1;
   while( nByte >= 4 ){
-    x = (x>>1) ^ (-(x&1) & 0xd0000001);
+    x = (x>>1) ^ (-(int)(x&1) & 0xd0000001);
     y = y*1103515245 + 12345;
     r = x ^ y;
     *(int*)pBuf = r;
@@ -16132,7 +16747,7 @@ static void randomFill(char *pBuf, int nByte){
     nByte -= 4;
   }
   while( nByte-- > 0 ){
-    x = (x>>1) ^ (-(x&1) & 0xd0000001);
+    x = (x>>1) ^ (-(int)(x&1) & 0xd0000001);
     y = y*1103515245 + 12345;
     r = x ^ y;
     *(pBuf++) = r & 0xff;
@@ -16227,9 +16842,9 @@ static void sqlite3MemFree(void *pPrior){
   }
   z = (char*)pBt;
   z -= pHdr->nTitle;
-  adjustStats(pHdr->iSize, -1);
+  adjustStats((int)pHdr->iSize, -1);
   randomFill(z, sizeof(void*)*pHdr->nBacktraceSlots + sizeof(*pHdr) +
-                pHdr->iSize + sizeof(int) + pHdr->nTitle);
+                (int)pHdr->iSize + sizeof(int) + pHdr->nTitle);
   free(z);
   sqlite3_mutex_leave(mem.mutex);  
 }
@@ -16251,9 +16866,9 @@ static void *sqlite3MemRealloc(void *pPrior, int nByte){
   pOldHdr = sqlite3MemsysGetHeader(pPrior);
   pNew = sqlite3MemMalloc(nByte);
   if( pNew ){
-    memcpy(pNew, pPrior, nByte<pOldHdr->iSize ? nByte : pOldHdr->iSize);
+    memcpy(pNew, pPrior, (int)(nByte<pOldHdr->iSize ? nByte : pOldHdr->iSize));
     if( nByte>pOldHdr->iSize ){
-      randomFill(&((char*)pNew)[pOldHdr->iSize], nByte - pOldHdr->iSize);
+      randomFill(&((char*)pNew)[pOldHdr->iSize], nByte - (int)pOldHdr->iSize);
     }
     sqlite3MemFree(pPrior);
   }
@@ -16368,7 +16983,7 @@ SQLITE_PRIVATE void sqlite3MemdebugSync(){
   for(pHdr=mem.pFirst; pHdr; pHdr=pHdr->pNext){
     void **pBt = (void**)pHdr;
     pBt -= pHdr->nBacktraceSlots;
-    mem.xBacktrace(pHdr->iSize, pHdr->nBacktrace-1, &pBt[1]);
+    mem.xBacktrace((int)pHdr->iSize, pHdr->nBacktrace-1, &pBt[1]);
   }
 }
 
@@ -17252,13 +17867,13 @@ static SQLITE_WSD struct Mem5Global {
 } mem5;
 
 /*
-** Access the static variable through a macro for SQLITE_OMIT_WSD
+** Access the static variable through a macro for SQLITE_OMIT_WSD.
 */
 #define mem5 GLOBAL(struct Mem5Global, mem5)
 
 /*
 ** Assuming mem5.zPool is divided up into an array of Mem5Link
-** structures, return a pointer to the idx-th such lik.
+** structures, return a pointer to the idx-th such link.
 */
 #define MEM5LINK(idx) ((Mem5Link *)(&mem5.zPool[(idx)*mem5.szAtom]))
 
@@ -17324,37 +17939,18 @@ static void memsys5Leave(void){
 static int memsys5Size(void *p){
   int iSize = 0;
   if( p ){
-    int i = ((u8 *)p-mem5.zPool)/mem5.szAtom;
+    int i = (int)(((u8 *)p-mem5.zPool)/mem5.szAtom);
     assert( i>=0 && i<mem5.nBlock );
     iSize = mem5.szAtom * (1 << (mem5.aCtrl[i]&CTRL_LOGSIZE));
   }
   return iSize;
 }
 
-/*
-** Find the first entry on the freelist iLogsize.  Unlink that
-** entry and return its index. 
-*/
-static int memsys5UnlinkFirst(int iLogsize){
-  int i;
-  int iFirst;
-
-  assert( iLogsize>=0 && iLogsize<=LOGMAX );
-  i = iFirst = mem5.aiFreelist[iLogsize];
-  assert( iFirst>=0 );
-  while( i>0 ){
-    if( i<iFirst ) iFirst = i;
-    i = MEM5LINK(i)->next;
-  }
-  memsys5Unlink(iFirst, iLogsize);
-  return iFirst;
-}
-
 /*
 ** Return a block of memory of at least nBytes in size.
 ** Return NULL if unable.  Return NULL if nBytes==0.
 **
-** The caller guarantees that nByte positive.
+** The caller guarantees that nByte is positive.
 **
 ** The caller has obtained a mutex prior to invoking this
 ** routine so there is never any chance that two or more
@@ -17389,13 +17985,14 @@ static void *memsys5MallocUnsafe(int nByte){
   ** block.  If not, then split a block of the next larger power of
   ** two in order to create a new free block of size iLogsize.
   */
-  for(iBin=iLogsize; mem5.aiFreelist[iBin]<0 && iBin<=LOGMAX; iBin++){}
+  for(iBin=iLogsize; iBin<=LOGMAX && mem5.aiFreelist[iBin]<0; iBin++){}
   if( iBin>LOGMAX ){
     testcase( sqlite3GlobalConfig.xLog!=0 );
     sqlite3_log(SQLITE_NOMEM, "failed to allocate %u bytes", nByte);
     return 0;
   }
-  i = memsys5UnlinkFirst(iBin);
+  i = mem5.aiFreelist[iBin];
+  memsys5Unlink(i, iBin);
   while( iBin>iLogsize ){
     int newSize;
 
@@ -17415,6 +18012,12 @@ static void *memsys5MallocUnsafe(int nByte){
   if( mem5.maxCount<mem5.currentCount ) mem5.maxCount = mem5.currentCount;
   if( mem5.maxOut<mem5.currentOut ) mem5.maxOut = mem5.currentOut;
 
+#ifdef SQLITE_DEBUG
+  /* Make sure the allocated memory does not assume that it is set to zero
+  ** or retains a value from a previous allocation */
+  memset(&mem5.zPool[i*mem5.szAtom], 0xAA, iFullSz);
+#endif
+
   /* Return a pointer to the allocated memory. */
   return (void*)&mem5.zPool[i*mem5.szAtom];
 }
@@ -17429,7 +18032,7 @@ static void memsys5FreeUnsafe(void *pOld){
   /* Set iBlock to the index of the block pointed to by pOld in 
   ** the array of mem5.szAtom byte blocks pointed to by mem5.zPool.
   */
-  iBlock = ((u8 *)pOld-mem5.zPool)/mem5.szAtom;
+  iBlock = (int)(((u8 *)pOld-mem5.zPool)/mem5.szAtom);
 
   /* Check that the pointer pOld points to a valid, non-free block. */
   assert( iBlock>=0 && iBlock<mem5.nBlock );
@@ -17472,11 +18075,18 @@ static void memsys5FreeUnsafe(void *pOld){
     }
     size *= 2;
   }
+
+#ifdef SQLITE_DEBUG
+  /* Overwrite freed memory with the 0x55 bit pattern to verify that it is
+  ** not used after being freed */
+  memset(&mem5.zPool[iBlock*mem5.szAtom], 0x55, size);
+#endif
+
   memsys5Link(iBlock, iLogsize);
 }
 
 /*
-** Allocate nBytes of memory
+** Allocate nBytes of memory.
 */
 static void *memsys5Malloc(int nBytes){
   sqlite3_int64 *p = 0;
@@ -18434,6 +19044,84 @@ SQLITE_PRIVATE sqlite3_mutex_methods const *sqlite3DefaultMutex(void){
 ** This file contains the C functions that implement mutexes for win32
 */
 
+#if SQLITE_OS_WIN
+/*
+** Include the header file for the Windows VFS.
+*/
+/************** Include os_win.h in the middle of mutex_w32.c ****************/
+/************** Begin file os_win.h ******************************************/
+/*
+** 2013 November 25
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+******************************************************************************
+**
+** This file contains code that is specific to Windows.
+*/
+#ifndef _OS_WIN_H_
+#define _OS_WIN_H_
+
+/*
+** Include the primary Windows SDK header file.
+*/
+#include "windows.h"
+
+#ifdef __CYGWIN__
+# include <sys/cygwin.h>
+# include <errno.h> /* amalgamator: dontcache */
+#endif
+
+/*
+** Determine if we are dealing with Windows NT.
+**
+** We ought to be able to determine if we are compiling for Windows 9x or
+** Windows NT using the _WIN32_WINNT macro as follows:
+**
+** #if defined(_WIN32_WINNT)
+** # define SQLITE_OS_WINNT 1
+** #else
+** # define SQLITE_OS_WINNT 0
+** #endif
+**
+** However, Visual Studio 2005 does not set _WIN32_WINNT by default, as
+** it ought to, so the above test does not work.  We'll just assume that
+** everything is Windows NT unless the programmer explicitly says otherwise
+** by setting SQLITE_OS_WINNT to 0.
+*/
+#if SQLITE_OS_WIN && !defined(SQLITE_OS_WINNT)
+# define SQLITE_OS_WINNT 1
+#endif
+
+/*
+** Determine if we are dealing with Windows CE - which has a much reduced
+** API.
+*/
+#if defined(_WIN32_WCE)
+# define SQLITE_OS_WINCE 1
+#else
+# define SQLITE_OS_WINCE 0
+#endif
+
+/*
+** Determine if we are dealing with WinRT, which provides only a subset of
+** the full Win32 API.
+*/
+#if !defined(SQLITE_OS_WINRT)
+# define SQLITE_OS_WINRT 0
+#endif
+
+#endif /* _OS_WIN_H_ */
+
+/************** End of os_win.h **********************************************/
+/************** Continuing where we left off in mutex_w32.c ******************/
+#endif
+
 /*
 ** The code in this file is only used if we are compiling multithreaded
 ** on a win32 system.
@@ -18490,7 +19178,7 @@ struct sqlite3_mutex {
     }
     return osType==2;
   }
-#endif /* SQLITE_OS_WINCE */
+#endif /* SQLITE_OS_WINCE || SQLITE_OS_WINRT */
 #endif
 
 #ifdef SQLITE_DEBUG
@@ -18528,7 +19216,7 @@ static int winMutex_isInit = 0;
 ** processing, the "interlocked" magic is probably not
 ** strictly necessary.
 */
-static long winMutex_lock = 0;
+static LONG winMutex_lock = 0;
 
 SQLITE_API void sqlite3_win32_sleep(DWORD milliseconds); /* os_win.c */
 
@@ -19198,7 +19886,7 @@ SQLITE_PRIVATE void sqlite3ScratchFree(void *p){
 */
 #ifndef SQLITE_OMIT_LOOKASIDE
 static int isLookaside(sqlite3 *db, void *p){
-  return p && p>=db->lookaside.pStart && p<db->lookaside.pEnd;
+  return p>=db->lookaside.pStart && p<db->lookaside.pEnd;
 }
 #else
 #define isLookaside(A,B) 0
@@ -19214,8 +19902,9 @@ SQLITE_PRIVATE int sqlite3MallocSize(void *p){
   return sqlite3GlobalConfig.m.xSize(p);
 }
 SQLITE_PRIVATE int sqlite3DbMallocSize(sqlite3 *db, void *p){
-  assert( db==0 || sqlite3_mutex_held(db->mutex) );
-  if( db && isLookaside(db, p) ){
+  assert( db!=0 );
+  assert( sqlite3_mutex_held(db->mutex) );
+  if( isLookaside(db, p) ){
     return db->lookaside.sz;
   }else{
     assert( sqlite3MemdebugHasType(p, MEMTYPE_DB) );
@@ -19249,6 +19938,7 @@ SQLITE_API void sqlite3_free(void *p){
 */
 SQLITE_PRIVATE void sqlite3DbFree(sqlite3 *db, void *p){
   assert( db==0 || sqlite3_mutex_held(db->mutex) );
+  if( p==0 ) return;
   if( db ){
     if( db->pnBytesFreed ){
       *db->pnBytesFreed += sqlite3DbMallocSize(db, p);
@@ -19684,19 +20374,30 @@ static char et_getdigit(LONGDOUBLE_TYPE *val, int *cnt){
 #endif /* SQLITE_OMIT_FLOATING_POINT */
 
 /*
-** Append N space characters to the given string buffer.
+** Set the StrAccum object to an error mode.
 */
-SQLITE_PRIVATE void sqlite3AppendSpace(StrAccum *pAccum, int N){
-  static const char zSpaces[] = "                             ";
-  while( N>=(int)sizeof(zSpaces)-1 ){
-    sqlite3StrAccumAppend(pAccum, zSpaces, sizeof(zSpaces)-1);
-    N -= sizeof(zSpaces)-1;
-  }
-  if( N>0 ){
-    sqlite3StrAccumAppend(pAccum, zSpaces, N);
-  }
+static void setStrAccumError(StrAccum *p, u8 eError){
+  p->accError = eError;
+  p->nAlloc = 0;
 }
 
+/*
+** Extra argument values from a PrintfArguments object
+*/
+static sqlite3_int64 getIntArg(PrintfArguments *p){
+  if( p->nArg<=p->nUsed ) return 0;
+  return sqlite3_value_int64(p->apArg[p->nUsed++]);
+}
+static double getDoubleArg(PrintfArguments *p){
+  if( p->nArg<=p->nUsed ) return 0.0;
+  return sqlite3_value_double(p->apArg[p->nUsed++]);
+}
+static char *getTextArg(PrintfArguments *p){
+  if( p->nArg<=p->nUsed ) return 0;
+  return (char*)sqlite3_value_text(p->apArg[p->nUsed++]);
+}
+
+
 /*
 ** On machines with a small stack size, you can redefine the
 ** SQLITE_PRINT_BUF_SIZE to be something smaller, if desired.
@@ -19710,10 +20411,10 @@ SQLITE_PRIVATE void sqlite3AppendSpace(StrAccum *pAccum, int N){
 ** Render a string given by "fmt" into the StrAccum object.
 */
 SQLITE_PRIVATE void sqlite3VXPrintf(
-  StrAccum *pAccum,                  /* Accumulate results here */
-  int useExtended,                   /* Allow extended %-conversions */
-  const char *fmt,                   /* Format string */
-  va_list ap                         /* arguments */
+  StrAccum *pAccum,          /* Accumulate results here */
+  u32 bFlags,                /* SQLITE_PRINTF_* flags */
+  const char *fmt,           /* Format string */
+  va_list ap                 /* arguments */
 ){
   int c;                     /* Next character in the format string */
   char *bufpt;               /* Pointer to the conversion buffer */
@@ -19731,6 +20432,8 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
   etByte flag_longlong;      /* True if the "ll" flag is present */
   etByte done;               /* Loop termination flag */
   etByte xtype = 0;          /* Conversion paradigm */
+  u8 bArgList;               /* True for SQLITE_PRINTF_SQLFUNC */
+  u8 useIntern;              /* Ok to use internal conversions (ex: %T) */
   char prefix;               /* Prefix character.  "+" or "-" or " " or '\0'. */
   sqlite_uint64 longvalue;   /* Value for integer types */
   LONGDOUBLE_TYPE realvalue; /* Value for real types */
@@ -19745,16 +20448,23 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
   etByte flag_dp;            /* True if decimal point should be shown */
   etByte flag_rtz;           /* True if trailing zeros should be removed */
 #endif
+  PrintfArguments *pArgList = 0; /* Arguments for SQLITE_PRINTF_SQLFUNC */
   char buf[etBUFSIZE];       /* Conversion buffer */
 
   bufpt = 0;
+  if( bFlags ){
+    if( (bArgList = (bFlags & SQLITE_PRINTF_SQLFUNC))!=0 ){
+      pArgList = va_arg(ap, PrintfArguments*);
+    }
+    useIntern = bFlags & SQLITE_PRINTF_INTERNAL;
+  }else{
+    bArgList = useIntern = 0;
+  }
   for(; (c=(*fmt))!=0; ++fmt){
     if( c!='%' ){
-      int amt;
       bufpt = (char *)fmt;
-      amt = 1;
-      while( (c=(*++fmt))!='%' && c!=0 ) amt++;
-      sqlite3StrAccumAppend(pAccum, bufpt, amt);
+      while( (c=(*++fmt))!='%' && c!=0 ){};
+      sqlite3StrAccumAppend(pAccum, bufpt, (int)(fmt - bufpt));
       if( c==0 ) break;
     }
     if( (c=(*++fmt))==0 ){
@@ -19779,7 +20489,11 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
     /* Get the field width */
     width = 0;
     if( c=='*' ){
-      width = va_arg(ap,int);
+      if( bArgList ){
+        width = (int)getIntArg(pArgList);
+      }else{
+        width = va_arg(ap,int);
+      }
       if( width<0 ){
         flag_leftjustify = 1;
         width = -width;
@@ -19796,7 +20510,11 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
       precision = 0;
       c = *++fmt;
       if( c=='*' ){
-        precision = va_arg(ap,int);
+        if( bArgList ){
+          precision = (int)getIntArg(pArgList);
+        }else{
+          precision = va_arg(ap,int);
+        }
         if( precision<0 ) precision = -precision;
         c = *++fmt;
       }else{
@@ -19827,7 +20545,7 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
     for(idx=0; idx<ArraySize(fmtinfo); idx++){
       if( c==fmtinfo[idx].fmttype ){
         infop = &fmtinfo[idx];
-        if( useExtended || (infop->flags & FLAG_INTERN)==0 ){
+        if( useIntern || (infop->flags & FLAG_INTERN)==0 ){
           xtype = infop->type;
         }else{
           return;
@@ -19867,7 +20585,9 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
       case etRADIX:
         if( infop->flags & FLAG_SIGNED ){
           i64 v;
-          if( flag_longlong ){
+          if( bArgList ){
+            v = getIntArg(pArgList);
+          }else if( flag_longlong ){
             v = va_arg(ap,i64);
           }else if( flag_long ){
             v = va_arg(ap,long int);
@@ -19888,7 +20608,9 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
             else                       prefix = 0;
           }
         }else{
-          if( flag_longlong ){
+          if( bArgList ){
+            longvalue = (u64)getIntArg(pArgList);
+          }else if( flag_longlong ){
             longvalue = va_arg(ap,u64);
           }else if( flag_long ){
             longvalue = va_arg(ap,unsigned long int);
@@ -19908,7 +20630,7 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
           nOut = precision + 10;
           zOut = zExtra = sqlite3Malloc( nOut );
           if( zOut==0 ){
-            pAccum->mallocFailed = 1;
+            setStrAccumError(pAccum, STRACCUM_NOMEM);
             return;
           }
         }
@@ -19923,10 +20645,8 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
           *(--bufpt) = zOrd[x*2];
         }
         {
-          register const char *cset;      /* Use registers for speed */
-          register int base;
-          cset = &aDigits[infop->charset];
-          base = infop->base;
+          const char *cset = &aDigits[infop->charset];
+          u8 base = infop->base;
           do{                                           /* Convert to ascii */
             *(--bufpt) = cset[longvalue%base];
             longvalue = longvalue/base;
@@ -19948,7 +20668,11 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
       case etFLOAT:
       case etEXP:
       case etGENERIC:
-        realvalue = va_arg(ap,double);
+        if( bArgList ){
+          realvalue = getDoubleArg(pArgList);
+        }else{
+          realvalue = va_arg(ap,double);
+        }
 #ifdef SQLITE_OMIT_FLOATING_POINT
         length = 0;
 #else
@@ -19962,13 +20686,7 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
           else                         prefix = 0;
         }
         if( xtype==etGENERIC && precision>0 ) precision--;
-#if 0
-        /* Rounding works like BSD when the constant 0.4999 is used.  Wierd! */
-        for(idx=precision, rounder=0.4999; idx>0; idx--, rounder*=0.1);
-#else
-        /* It makes more sense to use 0.5 */
         for(idx=precision, rounder=0.5; idx>0; idx--, rounder*=0.1){}
-#endif
         if( xtype==etFLOAT ) realvalue += rounder;
         /* Normalize realvalue to within 10.0 > realvalue >= 1.0 */
         exp = 0;
@@ -20023,10 +20741,10 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
         }else{
           e2 = exp;
         }
-        if( e2+precision+width > etBUFSIZE - 15 ){
-          bufpt = zExtra = sqlite3Malloc( e2+precision+width+15 );
+        if( MAX(e2,0)+precision+width > etBUFSIZE - 15 ){
+          bufpt = zExtra = sqlite3Malloc( MAX(e2,0)+precision+width+15 );
           if( bufpt==0 ){
-            pAccum->mallocFailed = 1;
+            setStrAccumError(pAccum, STRACCUM_NOMEM);
             return;
           }
         }
@@ -20109,7 +20827,9 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
 #endif /* !defined(SQLITE_OMIT_FLOATING_POINT) */
         break;
       case etSIZE:
-        *(va_arg(ap,int*)) = pAccum->nChar;
+        if( !bArgList ){
+          *(va_arg(ap,int*)) = pAccum->nChar;
+        }
         length = width = 0;
         break;
       case etPERCENT:
@@ -20118,7 +20838,12 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
         length = 1;
         break;
       case etCHARX:
-        c = va_arg(ap,int);
+        if( bArgList ){
+          bufpt = getTextArg(pArgList);
+          c = bufpt ? bufpt[0] : 0;
+        }else{
+          c = va_arg(ap,int);
+        }
         buf[0] = (char)c;
         if( precision>=0 ){
           for(idx=1; idx<precision; idx++) buf[idx] = (char)c;
@@ -20130,10 +20855,14 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
         break;
       case etSTRING:
       case etDYNSTRING:
-        bufpt = va_arg(ap,char*);
+        if( bArgList ){
+          bufpt = getTextArg(pArgList);
+        }else{
+          bufpt = va_arg(ap,char*);
+        }
         if( bufpt==0 ){
           bufpt = "";
-        }else if( xtype==etDYNSTRING ){
+        }else if( xtype==etDYNSTRING && !bArgList ){
           zExtra = bufpt;
         }
         if( precision>=0 ){
@@ -20149,7 +20878,13 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
         int needQuote;
         char ch;
         char q = ((xtype==etSQLESCAPE3)?'"':'\'');   /* Quote character */
-        char *escarg = va_arg(ap,char*);
+        char *escarg;
+
+        if( bArgList ){
+          escarg = getTextArg(pArgList);
+        }else{
+          escarg = va_arg(ap,char*);
+        }
         isnull = escarg==0;
         if( isnull ) escarg = (xtype==etSQLESCAPE2 ? "NULL" : "(NULL)");
         k = precision;
@@ -20161,7 +20896,7 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
         if( n>etBUFSIZE ){
           bufpt = zExtra = sqlite3Malloc( n );
           if( bufpt==0 ){
-            pAccum->mallocFailed = 1;
+            setStrAccumError(pAccum, STRACCUM_NOMEM);
             return;
           }
         }else{
@@ -20184,7 +20919,8 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
       }
       case etTOKEN: {
         Token *pToken = va_arg(ap, Token*);
-        if( pToken ){
+        assert( bArgList==0 );
+        if( pToken && pToken->n ){
           sqlite3StrAccumAppend(pAccum, (const char*)pToken->z, pToken->n);
         }
         length = width = 0;
@@ -20194,12 +20930,13 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
         SrcList *pSrc = va_arg(ap, SrcList*);
         int k = va_arg(ap, int);
         struct SrcList_item *pItem = &pSrc->a[k];
+        assert( bArgList==0 );
         assert( k>=0 && k<pSrc->nSrc );
         if( pItem->zDatabase ){
-          sqlite3StrAccumAppend(pAccum, pItem->zDatabase, -1);
+          sqlite3StrAccumAppendAll(pAccum, pItem->zDatabase);
           sqlite3StrAccumAppend(pAccum, ".", 1);
         }
-        sqlite3StrAccumAppend(pAccum, pItem->zName, -1);
+        sqlite3StrAccumAppendAll(pAccum, pItem->zName);
         length = width = 0;
         break;
       }
@@ -20213,83 +20950,113 @@ SQLITE_PRIVATE void sqlite3VXPrintf(
     ** "length" characters long.  The field width is "width".  Do
     ** the output.
     */
-    if( !flag_leftjustify ){
-      register int nspace;
-      nspace = width-length;
-      if( nspace>0 ){
-        sqlite3AppendSpace(pAccum, nspace);
-      }
-    }
-    if( length>0 ){
-      sqlite3StrAccumAppend(pAccum, bufpt, length);
-    }
-    if( flag_leftjustify ){
-      register int nspace;
-      nspace = width-length;
-      if( nspace>0 ){
-        sqlite3AppendSpace(pAccum, nspace);
-      }
-    }
-    sqlite3_free(zExtra);
+    width -= length;
+    if( width>0 && !flag_leftjustify ) sqlite3AppendSpace(pAccum, width);
+    sqlite3StrAccumAppend(pAccum, bufpt, length);
+    if( width>0 && flag_leftjustify ) sqlite3AppendSpace(pAccum, width);
+
+    if( zExtra ) sqlite3_free(zExtra);
   }/* End for loop over the format string */
 } /* End of function */
 
 /*
-** Append N bytes of text from z to the StrAccum object.
+** Enlarge the memory allocation on a StrAccum object so that it is
+** able to accept at least N more bytes of text.
+**
+** Return the number of bytes of text that StrAccum is able to accept
+** after the attempted enlargement.  The value returned might be zero.
+*/
+static int sqlite3StrAccumEnlarge(StrAccum *p, int N){
+  char *zNew;
+  assert( p->nChar+N >= p->nAlloc ); /* Only called if really needed */
+  if( p->accError ){
+    testcase(p->accError==STRACCUM_TOOBIG);
+    testcase(p->accError==STRACCUM_NOMEM);
+    return 0;
+  }
+  if( !p->useMalloc ){
+    N = p->nAlloc - p->nChar - 1;
+    setStrAccumError(p, STRACCUM_TOOBIG);
+    return N;
+  }else{
+    char *zOld = (p->zText==p->zBase ? 0 : p->zText);
+    i64 szNew = p->nChar;
+    szNew += N + 1;
+    if( szNew > p->mxAlloc ){
+      sqlite3StrAccumReset(p);
+      setStrAccumError(p, STRACCUM_TOOBIG);
+      return 0;
+    }else{
+      p->nAlloc = (int)szNew;
+    }
+    if( p->useMalloc==1 ){
+      zNew = sqlite3DbRealloc(p->db, zOld, p->nAlloc);
+    }else{
+      zNew = sqlite3_realloc(zOld, p->nAlloc);
+    }
+    if( zNew ){
+      assert( p->zText!=0 || p->nChar==0 );
+      if( zOld==0 && p->nChar>0 ) memcpy(zNew, p->zText, p->nChar);
+      p->zText = zNew;
+    }else{
+      sqlite3StrAccumReset(p);
+      setStrAccumError(p, STRACCUM_NOMEM);
+      return 0;
+    }
+  }
+  return N;
+}
+
+/*
+** Append N space characters to the given string buffer.
+*/
+SQLITE_PRIVATE void sqlite3AppendSpace(StrAccum *p, int N){
+  if( p->nChar+N >= p->nAlloc && (N = sqlite3StrAccumEnlarge(p, N))<=0 ) return;
+  while( (N--)>0 ) p->zText[p->nChar++] = ' ';
+}
+
+/*
+** The StrAccum "p" is not large enough to accept N new bytes of z[].
+** So enlarge if first, then do the append.
+**
+** This is a helper routine to sqlite3StrAccumAppend() that does special-case
+** work (enlarging the buffer) using tail recursion, so that the
+** sqlite3StrAccumAppend() routine can use fast calling semantics.
+*/
+static void enlargeAndAppend(StrAccum *p, const char *z, int N){
+  N = sqlite3StrAccumEnlarge(p, N);
+  if( N>0 ){
+    memcpy(&p->zText[p->nChar], z, N);
+    p->nChar += N;
+  }
+}
+
+/*
+** Append N bytes of text from z to the StrAccum object.  Increase the
+** size of the memory allocation for StrAccum if necessary.
 */
 SQLITE_PRIVATE void sqlite3StrAccumAppend(StrAccum *p, const char *z, int N){
-  assert( z!=0 || N==0 );
-  if( p->tooBig | p->mallocFailed ){
-    testcase(p->tooBig);
-    testcase(p->mallocFailed);
-    return;
-  }
-  assert( p->zText!=0 || p->nChar==0 );
-  if( N<0 ){
-    N = sqlite3Strlen30(z);
-  }
-  if( N==0 || NEVER(z==0) ){
-    return;
-  }
+  assert( z!=0 );
+  assert( p->zText!=0 || p->nChar==0 || p->accError );
+  assert( N>=0 );
+  assert( p->accError==0 || p->nAlloc==0 );
   if( p->nChar+N >= p->nAlloc ){
-    char *zNew;
-    if( !p->useMalloc ){
-      p->tooBig = 1;
-      N = p->nAlloc - p->nChar - 1;
-      if( N<=0 ){
-        return;
-      }
-    }else{
-      char *zOld = (p->zText==p->zBase ? 0 : p->zText);
-      i64 szNew = p->nChar;
-      szNew += N + 1;
-      if( szNew > p->mxAlloc ){
-        sqlite3StrAccumReset(p);
-        p->tooBig = 1;
-        return;
-      }else{
-        p->nAlloc = (int)szNew;
-      }
-      if( p->useMalloc==1 ){
-        zNew = sqlite3DbRealloc(p->db, zOld, p->nAlloc);
-      }else{
-        zNew = sqlite3_realloc(zOld, p->nAlloc);
-      }
-      if( zNew ){
-        if( zOld==0 && p->nChar>0 ) memcpy(zNew, p->zText, p->nChar);
-        p->zText = zNew;
-      }else{
-        p->mallocFailed = 1;
-        sqlite3StrAccumReset(p);
-        return;
-      }
-    }
+    enlargeAndAppend(p,z,N);
+    return;
   }
   assert( p->zText );
   memcpy(&p->zText[p->nChar], z, N);
   p->nChar += N;
 }
 
+/*
+** Append the complete text of zero-terminated string z[] to the p string.
+*/
+SQLITE_PRIVATE void sqlite3StrAccumAppendAll(StrAccum *p, const char *z){
+  sqlite3StrAccumAppend(p, z, sqlite3Strlen30(z));
+}
+
+
 /*
 ** Finish off a string by making sure it is zero-terminated.
 ** Return a pointer to the resulting string.  Return a NULL
@@ -20307,7 +21074,7 @@ SQLITE_PRIVATE char *sqlite3StrAccumFinish(StrAccum *p){
       if( p->zText ){
         memcpy(p->zText, p->zBase, p->nChar+1);
       }else{
-        p->mallocFailed = 1;
+        setStrAccumError(p, STRACCUM_NOMEM);
       }
     }
   }
@@ -20338,8 +21105,7 @@ SQLITE_PRIVATE void sqlite3StrAccumInit(StrAccum *p, char *zBase, int n, int mx)
   p->nAlloc = n;
   p->mxAlloc = mx;
   p->useMalloc = 1;
-  p->tooBig = 0;
-  p->mallocFailed = 0;
+  p->accError = 0;
 }
 
 /*
@@ -20354,9 +21120,9 @@ SQLITE_PRIVATE char *sqlite3VMPrintf(sqlite3 *db, const char *zFormat, va_list a
   sqlite3StrAccumInit(&acc, zBase, sizeof(zBase),
                       db->aLimit[SQLITE_LIMIT_LENGTH]);
   acc.db = db;
-  sqlite3VXPrintf(&acc, 1, zFormat, ap);
+  sqlite3VXPrintf(&acc, SQLITE_PRINTF_INTERNAL, zFormat, ap);
   z = sqlite3StrAccumFinish(&acc);
-  if( acc.mallocFailed ){
+  if( acc.accError==STRACCUM_NOMEM ){
     db->mallocFailed = 1;
   }
   return z;
@@ -20510,17 +21276,15 @@ SQLITE_PRIVATE void sqlite3DebugPrintf(const char *zFormat, ...){
 }
 #endif
 
-#ifndef SQLITE_OMIT_TRACE
 /*
 ** variable-argument wrapper around sqlite3VXPrintf().
 */
-SQLITE_PRIVATE void sqlite3XPrintf(StrAccum *p, const char *zFormat, ...){
+SQLITE_PRIVATE void sqlite3XPrintf(StrAccum *p, u32 bFlags, const char *zFormat, ...){
   va_list ap;
   va_start(ap,zFormat);
-  sqlite3VXPrintf(p, 1, zFormat, ap);
+  sqlite3VXPrintf(p, bFlags, zFormat, ap);
   va_end(ap);
 }
-#endif
 
 /************** End of printf.c **********************************************/
 /************** Begin file random.c ******************************************/
@@ -20553,24 +21317,11 @@ static SQLITE_WSD struct sqlite3PrngType {
 } sqlite3Prng;
 
 /*
-** Get a single 8-bit random value from the RC4 PRNG.  The Mutex
-** must be held while executing this routine.
-**
-** Why not just use a library random generator like lrand48() for this?
-** Because the OP_NewRowid opcode in the VDBE depends on having a very
-** good source of random numbers.  The lrand48() library function may
-** well be good enough.  But maybe not.  Or maybe lrand48() has some
-** subtle problems on some systems that could cause problems.  It is hard
-** to know.  To minimize the risk of problems due to bad lrand48()
-** implementations, SQLite uses this random number generator based
-** on RC4, which we know works very well.
-**
-** (Later):  Actually, OP_NewRowid does not depend on a good source of
-** randomness any more.  But we will leave this code in all the same.
+** Return N random bytes.
 */
-static u8 randomByte(void){
+SQLITE_API void sqlite3_randomness(int N, void *pBuf){
   unsigned char t;
-
+  unsigned char *zBuf = pBuf;
 
   /* The "wsdPrng" macro will resolve to the pseudo-random number generator
   ** state vector.  If writable static data is unsupported on the target,
@@ -20585,6 +21336,16 @@ static u8 randomByte(void){
 # define wsdPrng sqlite3Prng
 #endif
 
+#if SQLITE_THREADSAFE
+  sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_PRNG);
+  sqlite3_mutex_enter(mutex);
+#endif
+
+  if( N<=0 ){
+    wsdPrng.isInit = 0;
+    sqlite3_mutex_leave(mutex);
+    return;
+  }
 
   /* Initialize the state of the random number generator once,
   ** the first time this routine is called.  The seed value does
@@ -20613,29 +21374,16 @@ static u8 randomByte(void){
     wsdPrng.isInit = 1;
   }
 
-  /* Generate and return single random byte
-  */
-  wsdPrng.i++;
-  t = wsdPrng.s[wsdPrng.i];
-  wsdPrng.j += t;
-  wsdPrng.s[wsdPrng.i] = wsdPrng.s[wsdPrng.j];
-  wsdPrng.s[wsdPrng.j] = t;
-  t += wsdPrng.s[wsdPrng.i];
-  return wsdPrng.s[t];
-}
-
-/*
-** Return N random bytes.
-*/
-SQLITE_API void sqlite3_randomness(int N, void *pBuf){
-  unsigned char *zBuf = pBuf;
-#if SQLITE_THREADSAFE
-  sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_PRNG);
-#endif
-  sqlite3_mutex_enter(mutex);
-  while( N-- ){
-    *(zBuf++) = randomByte();
-  }
+  assert( N>0 );
+  do{
+    wsdPrng.i++;
+    t = wsdPrng.s[wsdPrng.i];
+    wsdPrng.j += t;
+    wsdPrng.s[wsdPrng.i] = wsdPrng.s[wsdPrng.j];
+    wsdPrng.s[wsdPrng.j] = t;
+    t += wsdPrng.s[wsdPrng.i];
+    *(zBuf++) = wsdPrng.s[t];
+  }while( --N );
   sqlite3_mutex_leave(mutex);
 }
 
@@ -20664,9 +21412,6 @@ SQLITE_PRIVATE void sqlite3PrngRestoreState(void){
     sizeof(sqlite3Prng)
   );
 }
-SQLITE_PRIVATE void sqlite3PrngResetState(void){
-  GLOBAL(struct sqlite3PrngType, sqlite3Prng).isInit = 0;
-}
 #endif /* SQLITE_OMIT_BUILTIN_TEST */
 
 /************** End of random.c **********************************************/
@@ -20988,7 +21733,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemTranslate(Mem *pMem, u8 desiredEnc){
   sqlite3VdbeMemRelease(pMem);
   pMem->flags &= ~(MEM_Static|MEM_Dyn|MEM_Ephem);
   pMem->enc = desiredEnc;
-  pMem->flags |= (MEM_Term|MEM_Dyn);
+  pMem->flags |= (MEM_Term);
   pMem->z = (char*)zOut;
   pMem->zMalloc = pMem->z;
 
@@ -21116,37 +21861,10 @@ SQLITE_PRIVATE char *sqlite3Utf16to8(sqlite3 *db, const void *z, int nByte, u8 e
   }
   assert( (m.flags & MEM_Term)!=0 || db->mallocFailed );
   assert( (m.flags & MEM_Str)!=0 || db->mallocFailed );
-  assert( (m.flags & MEM_Dyn)!=0 || db->mallocFailed );
   assert( m.z || db->mallocFailed );
   return m.z;
 }
 
-/*
-** Convert a UTF-8 string to the UTF-16 encoding specified by parameter
-** enc. A pointer to the new string is returned, and the value of *pnOut
-** is set to the length of the returned string in bytes. The call should
-** arrange to call sqlite3DbFree() on the returned pointer when it is
-** no longer required.
-** 
-** If a malloc failure occurs, NULL is returned and the db.mallocFailed
-** flag set.
-*/
-#ifdef SQLITE_ENABLE_STAT3
-SQLITE_PRIVATE char *sqlite3Utf8to16(sqlite3 *db, u8 enc, char *z, int n, int *pnOut){
-  Mem m;
-  memset(&m, 0, sizeof(m));
-  m.db = db;
-  sqlite3VdbeMemSetStr(&m, z, n, SQLITE_UTF8, SQLITE_STATIC);
-  if( sqlite3VdbeMemTranslate(&m, enc) ){
-    assert( db->mallocFailed );
-    return 0;
-  }
-  assert( m.z==m.zMalloc );
-  *pnOut = m.n;
-  return m.z;
-}
-#endif
-
 /*
 ** zIn is a UTF-16 encoded unicode string at least nChar characters long.
 ** Return the number of bytes in the first nChar unicode characters
@@ -21260,6 +21978,24 @@ SQLITE_PRIVATE void sqlite3Coverage(int x){
 }
 #endif
 
+/*
+** Give a callback to the test harness that can be used to simulate faults
+** in places where it is difficult or expensive to do so purely by means
+** of inputs.
+**
+** The intent of the integer argument is to let the fault simulator know
+** which of multiple sqlite3FaultSim() calls has been hit.
+**
+** Return whatever integer value the test callback returns, or return
+** SQLITE_OK if no test callback is installed.
+*/
+#ifndef SQLITE_OMIT_BUILTIN_TEST
+SQLITE_PRIVATE int sqlite3FaultSim(int iTest){
+  int (*xCallback)(int) = sqlite3GlobalConfig.xTestCallback;
+  return xCallback ? xCallback(iTest) : SQLITE_OK;
+}
+#endif
+
 #ifndef SQLITE_OMIT_FLOATING_POINT
 /*
 ** Return true if the floating point value is Not a Number (NaN).
@@ -21344,18 +22080,17 @@ SQLITE_PRIVATE int sqlite3Strlen30(const char *z){
 ** to NULL.
 */
 SQLITE_PRIVATE void sqlite3Error(sqlite3 *db, int err_code, const char *zFormat, ...){
-  if( db && (db->pErr || (db->pErr = sqlite3ValueNew(db))!=0) ){
-    db->errCode = err_code;
-    if( zFormat ){
-      char *z;
-      va_list ap;
-      va_start(ap, zFormat);
-      z = sqlite3VMPrintf(db, zFormat, ap);
-      va_end(ap);
-      sqlite3ValueSetStr(db->pErr, -1, z, SQLITE_UTF8, SQLITE_DYNAMIC);
-    }else{
-      sqlite3ValueSetStr(db->pErr, 0, 0, SQLITE_UTF8, SQLITE_STATIC);
-    }
+  assert( db!=0 );
+  db->errCode = err_code;
+  if( zFormat && (db->pErr || (db->pErr = sqlite3ValueNew(db))!=0) ){
+    char *z;
+    va_list ap;
+    va_start(ap, zFormat);
+    z = sqlite3VMPrintf(db, zFormat, ap);
+    va_end(ap);
+    sqlite3ValueSetStr(db->pErr, -1, z, SQLITE_UTF8, SQLITE_DYNAMIC);
+  }else if( db->pErr ){
+    sqlite3ValueSetNull(db->pErr);
   }
 }
 
@@ -21422,7 +22157,8 @@ SQLITE_PRIVATE int sqlite3Dequote(char *z){
     case '[':   quote = ']';  break;  /* For MS SqlServer compatibility */
     default:    return -1;
   }
-  for(i=1, j=0; ALWAYS(z[i]); i++){
+  for(i=1, j=0;; i++){
+    assert( z[i] );
     if( z[i]==quote ){
       if( z[i+1]==quote ){
         z[j++] = quote;
@@ -21693,12 +22429,12 @@ static int compare2pow63(const char *zNum, int incr){
 ** If the zNum value is representable as a 64-bit twos-complement 
 ** integer, then write that value into *pNum and return 0.
 **
-** If zNum is exactly 9223372036854665808, return 2.  This special
-** case is broken out because while 9223372036854665808 cannot be a 
-** signed 64-bit integer, its negative -9223372036854665808 can be.
+** If zNum is exactly 9223372036854775808, return 2.  This special
+** case is broken out because while 9223372036854775808 cannot be a 
+** signed 64-bit integer, its negative -9223372036854775808 can be.
 **
 ** If zNum is too big for a 64-bit integer and is not
-** 9223372036854665808  or if zNum contains any non-numeric text,
+** 9223372036854775808  or if zNum contains any non-numeric text,
 ** then return 1.
 **
 ** length is the number of bytes in the string (bytes, not characters).
@@ -21740,7 +22476,7 @@ SQLITE_PRIVATE int sqlite3Atoi64(const char *zNum, i64 *pNum, int length, u8 enc
     u = u*10 + c - '0';
   }
   if( u>LARGEST_INT64 ){
-    *pNum = SMALLEST_INT64;
+    *pNum = neg ? SMALLEST_INT64 : LARGEST_INT64;
   }else if( neg ){
     *pNum = -(i64)u;
   }else{
@@ -21771,7 +22507,6 @@ SQLITE_PRIVATE int sqlite3Atoi64(const char *zNum, i64 *pNum, int length, u8 enc
       /* zNum is exactly 9223372036854775808.  Fits if negative.  The
       ** special case 2 overflow if positive */
       assert( u-1==LARGEST_INT64 );
-      assert( (*pNum)==SMALLEST_INT64 );
       return neg ? 0 : 2;
     }
   }
@@ -22231,7 +22966,8 @@ SQLITE_PRIVATE int sqlite3VarintLen(u64 v){
 ** Read or write a four-byte big-endian integer value.
 */
 SQLITE_PRIVATE u32 sqlite3Get4byte(const u8 *p){
-  return (p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3];
+  testcase( p[0]&0x80 );
+  return ((unsigned)p[0]<<24) | (p[1]<<16) | (p[2]<<8) | p[3];
 }
 SQLITE_PRIVATE void sqlite3Put4byte(unsigned char *p, u32 v){
   p[0] = (u8)(v>>24);
@@ -22352,13 +23088,12 @@ SQLITE_PRIVATE int sqlite3AddInt64(i64 *pA, i64 iB){
     testcase( iA>0 && LARGEST_INT64 - iA == iB );
     testcase( iA>0 && LARGEST_INT64 - iA == iB - 1 );
     if( iA>0 && LARGEST_INT64 - iA < iB ) return 1;
-    *pA += iB;
   }else{
     testcase( iA<0 && -(iA + LARGEST_INT64) == iB + 1 );
     testcase( iA<0 && -(iA + LARGEST_INT64) == iB + 2 );
     if( iA<0 && -(iA + LARGEST_INT64) > iB + 1 ) return 1;
-    *pA += iB;
   }
+  *pA += iB;
   return 0; 
 }
 SQLITE_PRIVATE int sqlite3SubInt64(i64 *pA, i64 iB){
@@ -22382,9 +23117,18 @@ SQLITE_PRIVATE int sqlite3MulInt64(i64 *pA, i64 iB){
   iA0 = iA % TWOPOWER32;
   iB1 = iB/TWOPOWER32;
   iB0 = iB % TWOPOWER32;
-  if( iA1*iB1 != 0 ) return 1;
-  assert( iA1*iB0==0 || iA0*iB1==0 );
-  r = iA1*iB0 + iA0*iB1;
+  if( iA1==0 ){
+    if( iB1==0 ){
+      *pA *= iB;
+      return 0;
+    }
+    r = iA0*iB1;
+  }else if( iB1==0 ){
+    r = iA1*iB0;
+  }else{
+    /* If both iA1 and iB1 are non-zero, overflow will result */
+    return 1;
+  }
   testcase( r==(-TWOPOWER31)-1 );
   testcase( r==(-TWOPOWER31) );
   testcase( r==TWOPOWER31 );
@@ -22437,6 +23181,85 @@ SQLITE_PRIVATE void sqlite3FileSuffix3(const char *zBaseFilename, char *z){
 }
 #endif
 
+/* 
+** Find (an approximate) sum of two LogEst values.  This computation is
+** not a simple "+" operator because LogEst is stored as a logarithmic
+** value.
+** 
+*/
+SQLITE_PRIVATE LogEst sqlite3LogEstAdd(LogEst a, LogEst b){
+  static const unsigned char x[] = {
+     10, 10,                         /* 0,1 */
+      9, 9,                          /* 2,3 */
+      8, 8,                          /* 4,5 */
+      7, 7, 7,                       /* 6,7,8 */
+      6, 6, 6,                       /* 9,10,11 */
+      5, 5, 5,                       /* 12-14 */
+      4, 4, 4, 4,                    /* 15-18 */
+      3, 3, 3, 3, 3, 3,              /* 19-24 */
+      2, 2, 2, 2, 2, 2, 2,           /* 25-31 */
+  };
+  if( a>=b ){
+    if( a>b+49 ) return a;
+    if( a>b+31 ) return a+1;
+    return a+x[a-b];
+  }else{
+    if( b>a+49 ) return b;
+    if( b>a+31 ) return b+1;
+    return b+x[b-a];
+  }
+}
+
+/*
+** Convert an integer into a LogEst.  In other words, compute an
+** approximation for 10*log2(x).
+*/
+SQLITE_PRIVATE LogEst sqlite3LogEst(u64 x){
+  static LogEst a[] = { 0, 2, 3, 5, 6, 7, 8, 9 };
+  LogEst y = 40;
+  if( x<8 ){
+    if( x<2 ) return 0;
+    while( x<8 ){  y -= 10; x <<= 1; }
+  }else{
+    while( x>255 ){ y += 40; x >>= 4; }
+    while( x>15 ){  y += 10; x >>= 1; }
+  }
+  return a[x&7] + y - 10;
+}
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/*
+** Convert a double into a LogEst
+** In other words, compute an approximation for 10*log2(x).
+*/
+SQLITE_PRIVATE LogEst sqlite3LogEstFromDouble(double x){
+  u64 a;
+  LogEst e;
+  assert( sizeof(x)==8 && sizeof(a)==8 );
+  if( x<=1 ) return 0;
+  if( x<=2000000000 ) return sqlite3LogEst((u64)x);
+  memcpy(&a, &x, 8);
+  e = (a>>52) - 1022;
+  return e*10;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+/*
+** Convert a LogEst into an integer.
+*/
+SQLITE_PRIVATE u64 sqlite3LogEstToInt(LogEst x){
+  u64 n;
+  if( x<10 ) return 1;
+  n = x%10;
+  x /= 10;
+  if( n>=5 ) n -= 2;
+  else if( n>=1 ) n -= 1;
+  if( x>=3 ){
+    return x>60 ? (u64)LARGEST_INT64 : (n+8)<<(x-3);
+  }
+  return (n+8)>>(3-x);
+}
+
 /************** End of util.c ************************************************/
 /************** Begin file hash.c ********************************************/
 /*
@@ -22493,7 +23316,7 @@ SQLITE_PRIVATE void sqlite3HashClear(Hash *pH){
 ** The hashing function.
 */
 static unsigned int strHash(const char *z, int nKey){
-  int h = 0;
+  unsigned int h = 0;
   assert( nKey>=0 );
   while( nKey > 0  ){
     h = (h<<3) ^ h ^ sqlite3UpperToLower[(unsigned char)*z++];
@@ -22724,159 +23547,171 @@ SQLITE_PRIVATE void *sqlite3HashInsert(Hash *pH, const char *pKey, int nKey, voi
 /************** Begin file opcodes.c *****************************************/
 /* Automatically generated.  Do not edit */
 /* See the mkopcodec.awk script for details. */
-#if !defined(SQLITE_OMIT_EXPLAIN) || !defined(NDEBUG) || defined(VDBE_PROFILE) || defined(SQLITE_DEBUG)
+#if !defined(SQLITE_OMIT_EXPLAIN) || defined(VDBE_PROFILE) || defined(SQLITE_DEBUG)
+#if defined(SQLITE_ENABLE_EXPLAIN_COMMENTS) || defined(SQLITE_DEBUG)
+# define OpHelp(X) "\0" X
+#else
+# define OpHelp(X)
+#endif
 SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
  static const char *const azName[] = { "?",
-     /*   1 */ "Goto",
-     /*   2 */ "Gosub",
-     /*   3 */ "Return",
-     /*   4 */ "Yield",
-     /*   5 */ "HaltIfNull",
-     /*   6 */ "Halt",
-     /*   7 */ "Integer",
-     /*   8 */ "Int64",
-     /*   9 */ "String",
-     /*  10 */ "Null",
-     /*  11 */ "Blob",
-     /*  12 */ "Variable",
-     /*  13 */ "Move",
-     /*  14 */ "Copy",
-     /*  15 */ "SCopy",
-     /*  16 */ "ResultRow",
-     /*  17 */ "CollSeq",
-     /*  18 */ "Function",
-     /*  19 */ "Not",
-     /*  20 */ "AddImm",
-     /*  21 */ "MustBeInt",
-     /*  22 */ "RealAffinity",
-     /*  23 */ "Permutation",
-     /*  24 */ "Compare",
-     /*  25 */ "Jump",
-     /*  26 */ "Once",
-     /*  27 */ "If",
-     /*  28 */ "IfNot",
-     /*  29 */ "Column",
-     /*  30 */ "Affinity",
-     /*  31 */ "MakeRecord",
-     /*  32 */ "Count",
-     /*  33 */ "Savepoint",
-     /*  34 */ "AutoCommit",
-     /*  35 */ "Transaction",
-     /*  36 */ "ReadCookie",
-     /*  37 */ "SetCookie",
-     /*  38 */ "VerifyCookie",
-     /*  39 */ "OpenRead",
-     /*  40 */ "OpenWrite",
-     /*  41 */ "OpenAutoindex",
-     /*  42 */ "OpenEphemeral",
-     /*  43 */ "SorterOpen",
-     /*  44 */ "OpenPseudo",
-     /*  45 */ "Close",
-     /*  46 */ "SeekLt",
-     /*  47 */ "SeekLe",
-     /*  48 */ "SeekGe",
-     /*  49 */ "SeekGt",
-     /*  50 */ "Seek",
-     /*  51 */ "NotFound",
-     /*  52 */ "Found",
-     /*  53 */ "IsUnique",
-     /*  54 */ "NotExists",
-     /*  55 */ "Sequence",
-     /*  56 */ "NewRowid",
-     /*  57 */ "Insert",
-     /*  58 */ "InsertInt",
-     /*  59 */ "Delete",
-     /*  60 */ "ResetCount",
-     /*  61 */ "SorterCompare",
-     /*  62 */ "SorterData",
-     /*  63 */ "RowKey",
-     /*  64 */ "RowData",
-     /*  65 */ "Rowid",
-     /*  66 */ "NullRow",
-     /*  67 */ "Last",
-     /*  68 */ "Or",
-     /*  69 */ "And",
-     /*  70 */ "SorterSort",
-     /*  71 */ "Sort",
-     /*  72 */ "Rewind",
-     /*  73 */ "IsNull",
-     /*  74 */ "NotNull",
-     /*  75 */ "Ne",
-     /*  76 */ "Eq",
-     /*  77 */ "Gt",
-     /*  78 */ "Le",
-     /*  79 */ "Lt",
-     /*  80 */ "Ge",
-     /*  81 */ "SorterNext",
-     /*  82 */ "BitAnd",
-     /*  83 */ "BitOr",
-     /*  84 */ "ShiftLeft",
-     /*  85 */ "ShiftRight",
-     /*  86 */ "Add",
-     /*  87 */ "Subtract",
-     /*  88 */ "Multiply",
-     /*  89 */ "Divide",
-     /*  90 */ "Remainder",
-     /*  91 */ "Concat",
-     /*  92 */ "Prev",
-     /*  93 */ "BitNot",
-     /*  94 */ "String8",
-     /*  95 */ "Next",
-     /*  96 */ "SorterInsert",
-     /*  97 */ "IdxInsert",
-     /*  98 */ "IdxDelete",
-     /*  99 */ "IdxRowid",
-     /* 100 */ "IdxLT",
-     /* 101 */ "IdxGE",
-     /* 102 */ "Destroy",
-     /* 103 */ "Clear",
-     /* 104 */ "CreateIndex",
-     /* 105 */ "CreateTable",
-     /* 106 */ "ParseSchema",
-     /* 107 */ "LoadAnalysis",
-     /* 108 */ "DropTable",
-     /* 109 */ "DropIndex",
-     /* 110 */ "DropTrigger",
-     /* 111 */ "IntegrityCk",
-     /* 112 */ "RowSetAdd",
-     /* 113 */ "RowSetRead",
-     /* 114 */ "RowSetTest",
-     /* 115 */ "Program",
-     /* 116 */ "Param",
-     /* 117 */ "FkCounter",
-     /* 118 */ "FkIfZero",
-     /* 119 */ "MemMax",
-     /* 120 */ "IfPos",
-     /* 121 */ "IfNeg",
-     /* 122 */ "IfZero",
-     /* 123 */ "AggStep",
-     /* 124 */ "AggFinal",
-     /* 125 */ "Checkpoint",
-     /* 126 */ "JournalMode",
-     /* 127 */ "Vacuum",
-     /* 128 */ "IncrVacuum",
-     /* 129 */ "Expire",
-     /* 130 */ "Real",
-     /* 131 */ "TableLock",
-     /* 132 */ "VBegin",
-     /* 133 */ "VCreate",
-     /* 134 */ "VDestroy",
-     /* 135 */ "VOpen",
-     /* 136 */ "VFilter",
-     /* 137 */ "VColumn",
-     /* 138 */ "VNext",
-     /* 139 */ "VRename",
-     /* 140 */ "VUpdate",
-     /* 141 */ "ToText",
-     /* 142 */ "ToBlob",
-     /* 143 */ "ToNumeric",
-     /* 144 */ "ToInt",
-     /* 145 */ "ToReal",
-     /* 146 */ "Pagecount",
-     /* 147 */ "MaxPgcnt",
-     /* 148 */ "Trace",
-     /* 149 */ "Noop",
-     /* 150 */ "Explain",
+     /*   1 */ "Function"         OpHelp("r[P3]=func(r[P2@P5])"),
+     /*   2 */ "Savepoint"        OpHelp(""),
+     /*   3 */ "AutoCommit"       OpHelp(""),
+     /*   4 */ "Transaction"      OpHelp(""),
+     /*   5 */ "SorterNext"       OpHelp(""),
+     /*   6 */ "PrevIfOpen"       OpHelp(""),
+     /*   7 */ "NextIfOpen"       OpHelp(""),
+     /*   8 */ "Prev"             OpHelp(""),
+     /*   9 */ "Next"             OpHelp(""),
+     /*  10 */ "AggStep"          OpHelp("accum=r[P3] step(r[P2@P5])"),
+     /*  11 */ "Checkpoint"       OpHelp(""),
+     /*  12 */ "JournalMode"      OpHelp(""),
+     /*  13 */ "Vacuum"           OpHelp(""),
+     /*  14 */ "VFilter"          OpHelp("iplan=r[P3] zplan='P4'"),
+     /*  15 */ "VUpdate"          OpHelp("data=r[P3@P2]"),
+     /*  16 */ "Goto"             OpHelp(""),
+     /*  17 */ "Gosub"            OpHelp(""),
+     /*  18 */ "Return"           OpHelp(""),
+     /*  19 */ "Not"              OpHelp("r[P2]= !r[P1]"),
+     /*  20 */ "InitCoroutine"    OpHelp(""),
+     /*  21 */ "EndCoroutine"     OpHelp(""),
+     /*  22 */ "Yield"            OpHelp(""),
+     /*  23 */ "HaltIfNull"       OpHelp("if r[P3]=null halt"),
+     /*  24 */ "Halt"             OpHelp(""),
+     /*  25 */ "Integer"          OpHelp("r[P2]=P1"),
+     /*  26 */ "Int64"            OpHelp("r[P2]=P4"),
+     /*  27 */ "String"           OpHelp("r[P2]='P4' (len=P1)"),
+     /*  28 */ "Null"             OpHelp("r[P2..P3]=NULL"),
+     /*  29 */ "SoftNull"         OpHelp("r[P1]=NULL"),
+     /*  30 */ "Blob"             OpHelp("r[P2]=P4 (len=P1)"),
+     /*  31 */ "Variable"         OpHelp("r[P2]=parameter(P1,P4)"),
+     /*  32 */ "Move"             OpHelp("r[P2@P3]=r[P1@P3]"),
+     /*  33 */ "Copy"             OpHelp("r[P2@P3+1]=r[P1@P3+1]"),
+     /*  34 */ "SCopy"            OpHelp("r[P2]=r[P1]"),
+     /*  35 */ "ResultRow"        OpHelp("output=r[P1@P2]"),
+     /*  36 */ "CollSeq"          OpHelp(""),
+     /*  37 */ "AddImm"           OpHelp("r[P1]=r[P1]+P2"),
+     /*  38 */ "MustBeInt"        OpHelp(""),
+     /*  39 */ "RealAffinity"     OpHelp(""),
+     /*  40 */ "Permutation"      OpHelp(""),
+     /*  41 */ "Compare"          OpHelp("r[P1@P3] <-> r[P2@P3]"),
+     /*  42 */ "Jump"             OpHelp(""),
+     /*  43 */ "Once"             OpHelp(""),
+     /*  44 */ "If"               OpHelp(""),
+     /*  45 */ "IfNot"            OpHelp(""),
+     /*  46 */ "Column"           OpHelp("r[P3]=PX"),
+     /*  47 */ "Affinity"         OpHelp("affinity(r[P1@P2])"),
+     /*  48 */ "MakeRecord"       OpHelp("r[P3]=mkrec(r[P1@P2])"),
+     /*  49 */ "Count"            OpHelp("r[P2]=count()"),
+     /*  50 */ "ReadCookie"       OpHelp(""),
+     /*  51 */ "SetCookie"        OpHelp(""),
+     /*  52 */ "OpenRead"         OpHelp("root=P2 iDb=P3"),
+     /*  53 */ "OpenWrite"        OpHelp("root=P2 iDb=P3"),
+     /*  54 */ "OpenAutoindex"    OpHelp("nColumn=P2"),
+     /*  55 */ "OpenEphemeral"    OpHelp("nColumn=P2"),
+     /*  56 */ "SorterOpen"       OpHelp(""),
+     /*  57 */ "OpenPseudo"       OpHelp("P3 columns in r[P2]"),
+     /*  58 */ "Close"            OpHelp(""),
+     /*  59 */ "SeekLT"           OpHelp(""),
+     /*  60 */ "SeekLE"           OpHelp(""),
+     /*  61 */ "SeekGE"           OpHelp(""),
+     /*  62 */ "SeekGT"           OpHelp(""),
+     /*  63 */ "Seek"             OpHelp("intkey=r[P2]"),
+     /*  64 */ "NoConflict"       OpHelp("key=r[P3@P4]"),
+     /*  65 */ "NotFound"         OpHelp("key=r[P3@P4]"),
+     /*  66 */ "Found"            OpHelp("key=r[P3@P4]"),
+     /*  67 */ "NotExists"        OpHelp("intkey=r[P3]"),
+     /*  68 */ "Sequence"         OpHelp("r[P2]=cursor[P1].ctr++"),
+     /*  69 */ "NewRowid"         OpHelp("r[P2]=rowid"),
+     /*  70 */ "Insert"           OpHelp("intkey=r[P3] data=r[P2]"),
+     /*  71 */ "Or"               OpHelp("r[P3]=(r[P1] || r[P2])"),
+     /*  72 */ "And"              OpHelp("r[P3]=(r[P1] && r[P2])"),
+     /*  73 */ "InsertInt"        OpHelp("intkey=P3 data=r[P2]"),
+     /*  74 */ "Delete"           OpHelp(""),
+     /*  75 */ "ResetCount"       OpHelp(""),
+     /*  76 */ "IsNull"           OpHelp("if r[P1]==NULL goto P2"),
+     /*  77 */ "NotNull"          OpHelp("if r[P1]!=NULL goto P2"),
+     /*  78 */ "Ne"               OpHelp("if r[P1]!=r[P3] goto P2"),
+     /*  79 */ "Eq"               OpHelp("if r[P1]==r[P3] goto P2"),
+     /*  80 */ "Gt"               OpHelp("if r[P1]>r[P3] goto P2"),
+     /*  81 */ "Le"               OpHelp("if r[P1]<=r[P3] goto P2"),
+     /*  82 */ "Lt"               OpHelp("if r[P1]<r[P3] goto P2"),
+     /*  83 */ "Ge"               OpHelp("if r[P1]>=r[P3] goto P2"),
+     /*  84 */ "SorterCompare"    OpHelp("if key(P1)!=rtrim(r[P3],P4) goto P2"),
+     /*  85 */ "BitAnd"           OpHelp("r[P3]=r[P1]&r[P2]"),
+     /*  86 */ "BitOr"            OpHelp("r[P3]=r[P1]|r[P2]"),
+     /*  87 */ "ShiftLeft"        OpHelp("r[P3]=r[P2]<<r[P1]"),
+     /*  88 */ "ShiftRight"       OpHelp("r[P3]=r[P2]>>r[P1]"),
+     /*  89 */ "Add"              OpHelp("r[P3]=r[P1]+r[P2]"),
+     /*  90 */ "Subtract"         OpHelp("r[P3]=r[P2]-r[P1]"),
+     /*  91 */ "Multiply"         OpHelp("r[P3]=r[P1]*r[P2]"),
+     /*  92 */ "Divide"           OpHelp("r[P3]=r[P2]/r[P1]"),
+     /*  93 */ "Remainder"        OpHelp("r[P3]=r[P2]%r[P1]"),
+     /*  94 */ "Concat"           OpHelp("r[P3]=r[P2]+r[P1]"),
+     /*  95 */ "SorterData"       OpHelp("r[P2]=data"),
+     /*  96 */ "BitNot"           OpHelp("r[P1]= ~r[P1]"),
+     /*  97 */ "String8"          OpHelp("r[P2]='P4'"),
+     /*  98 */ "RowKey"           OpHelp("r[P2]=key"),
+     /*  99 */ "RowData"          OpHelp("r[P2]=data"),
+     /* 100 */ "Rowid"            OpHelp("r[P2]=rowid"),
+     /* 101 */ "NullRow"          OpHelp(""),
+     /* 102 */ "Last"             OpHelp(""),
+     /* 103 */ "SorterSort"       OpHelp(""),
+     /* 104 */ "Sort"             OpHelp(""),
+     /* 105 */ "Rewind"           OpHelp(""),
+     /* 106 */ "SorterInsert"     OpHelp(""),
+     /* 107 */ "IdxInsert"        OpHelp("key=r[P2]"),
+     /* 108 */ "IdxDelete"        OpHelp("key=r[P2@P3]"),
+     /* 109 */ "IdxRowid"         OpHelp("r[P2]=rowid"),
+     /* 110 */ "IdxLE"            OpHelp("key=r[P3@P4]"),
+     /* 111 */ "IdxGT"            OpHelp("key=r[P3@P4]"),
+     /* 112 */ "IdxLT"            OpHelp("key=r[P3@P4]"),
+     /* 113 */ "IdxGE"            OpHelp("key=r[P3@P4]"),
+     /* 114 */ "Destroy"          OpHelp(""),
+     /* 115 */ "Clear"            OpHelp(""),
+     /* 116 */ "ResetSorter"      OpHelp(""),
+     /* 117 */ "CreateIndex"      OpHelp("r[P2]=root iDb=P1"),
+     /* 118 */ "CreateTable"      OpHelp("r[P2]=root iDb=P1"),
+     /* 119 */ "ParseSchema"      OpHelp(""),
+     /* 120 */ "LoadAnalysis"     OpHelp(""),
+     /* 121 */ "DropTable"        OpHelp(""),
+     /* 122 */ "DropIndex"        OpHelp(""),
+     /* 123 */ "DropTrigger"      OpHelp(""),
+     /* 124 */ "IntegrityCk"      OpHelp(""),
+     /* 125 */ "RowSetAdd"        OpHelp("rowset(P1)=r[P2]"),
+     /* 126 */ "RowSetRead"       OpHelp("r[P3]=rowset(P1)"),
+     /* 127 */ "RowSetTest"       OpHelp("if r[P3] in rowset(P1) goto P2"),
+     /* 128 */ "Program"          OpHelp(""),
+     /* 129 */ "Param"            OpHelp(""),
+     /* 130 */ "FkCounter"        OpHelp("fkctr[P1]+=P2"),
+     /* 131 */ "FkIfZero"         OpHelp("if fkctr[P1]==0 goto P2"),
+     /* 132 */ "MemMax"           OpHelp("r[P1]=max(r[P1],r[P2])"),
+     /* 133 */ "Real"             OpHelp("r[P2]=P4"),
+     /* 134 */ "IfPos"            OpHelp("if r[P1]>0 goto P2"),
+     /* 135 */ "IfNeg"            OpHelp("if r[P1]<0 goto P2"),
+     /* 136 */ "IfZero"           OpHelp("r[P1]+=P3, if r[P1]==0 goto P2"),
+     /* 137 */ "AggFinal"         OpHelp("accum=r[P1] N=P2"),
+     /* 138 */ "IncrVacuum"       OpHelp(""),
+     /* 139 */ "Expire"           OpHelp(""),
+     /* 140 */ "TableLock"        OpHelp("iDb=P1 root=P2 write=P3"),
+     /* 141 */ "VBegin"           OpHelp(""),
+     /* 142 */ "VCreate"          OpHelp(""),
+     /* 143 */ "ToText"           OpHelp(""),
+     /* 144 */ "ToBlob"           OpHelp(""),
+     /* 145 */ "ToNumeric"        OpHelp(""),
+     /* 146 */ "ToInt"            OpHelp(""),
+     /* 147 */ "ToReal"           OpHelp(""),
+     /* 148 */ "VDestroy"         OpHelp(""),
+     /* 149 */ "VOpen"            OpHelp(""),
+     /* 150 */ "VColumn"          OpHelp("r[P3]=vcolumn(P2)"),
+     /* 151 */ "VNext"            OpHelp(""),
+     /* 152 */ "VRename"          OpHelp(""),
+     /* 153 */ "Pagecount"        OpHelp(""),
+     /* 154 */ "MaxPgcnt"         OpHelp(""),
+     /* 155 */ "Init"             OpHelp("Start at P2"),
+     /* 156 */ "Noop"             OpHelp(""),
+     /* 157 */ "Explain"          OpHelp(""),
   };
   return azName[i];
 }
@@ -22931,13 +23766,6 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
 */
 #if SQLITE_OS_UNIX              /* This file is used on unix only */
 
-/* Use posix_fallocate() if it is available
-*/
-#if !defined(HAVE_POSIX_FALLOCATE) \
-      && (_XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L)
-# define HAVE_POSIX_FALLOCATE 1
-#endif
-
 /*
 ** There are various methods for file locking used for concurrency
 ** control:
@@ -22975,32 +23803,6 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
 #  endif
 #endif
 
-/*
-** These #defines should enable >2GB file support on Posix if the
-** underlying operating system supports it.  If the OS lacks
-** large file support, these should be no-ops.
-**
-** Large file support can be disabled using the -DSQLITE_DISABLE_LFS switch
-** on the compiler command line.  This is necessary if you are compiling
-** on a recent machine (ex: RedHat 7.2) but you want your code to work
-** on an older machine (ex: RedHat 6.0).  If you compile on RedHat 7.2
-** without this option, LFS is enable.  But LFS does not exist in the kernel
-** in RedHat 6.0, so the code won't work.  Hence, for maximum binary
-** portability you should omit LFS.
-**
-** The previous paragraph was written in 2005.  (This paragraph is written
-** on 2008-11-28.) These days, all Linux kernels support large files, so
-** you should probably leave LFS enabled.  But some embedded platforms might
-** lack LFS in which case the SQLITE_DISABLE_LFS macro might still be useful.
-*/
-#ifndef SQLITE_DISABLE_LFS
-# define _LARGE_FILE       1
-# ifndef _FILE_OFFSET_BITS
-#   define _FILE_OFFSET_BITS 64
-# endif
-# define _LARGEFILE_SOURCE 1
-#endif
-
 /*
 ** standard include files.
 */
@@ -23110,11 +23912,13 @@ struct unixFile {
   const char *zPath;                  /* Name of the file */
   unixShm *pShm;                      /* Shared memory segment information */
   int szChunk;                        /* Configured by FCNTL_CHUNK_SIZE */
+#if SQLITE_MAX_MMAP_SIZE>0
   int nFetchOut;                      /* Number of outstanding xFetch refs */
   sqlite3_int64 mmapSize;             /* Usable size of mapping at pMapRegion */
   sqlite3_int64 mmapSizeActual;       /* Actual size of mapping at pMapRegion */
   sqlite3_int64 mmapSizeMax;          /* Configured FCNTL_MMAP_SIZE value */
   void *pMapRegion;                   /* Memory mapped region */
+#endif
 #ifdef __QNXNTO__
   int sectorSize;                     /* Device sector size */
   int deviceCharacteristics;          /* Precomputed device characteristics */
@@ -23150,6 +23954,12 @@ struct unixFile {
 #endif
 };
 
+/* This variable holds the process id (pid) from when the xRandomness()
+** method was called.  If xOpen() is called from a different process id,
+** indicating that a fork() has occurred, the PRNG will be reset.
+*/
+static int randomnessPid = 0;
+
 /*
 ** Allowed values for the unixFile.ctrlFlags bitmask:
 */
@@ -23441,6 +24251,7 @@ static int posixFchown(int fd, uid_t uid, gid_t gid){
 
 /* Forward reference */
 static int openDirectory(const char*, int*);
+static int unixGetpagesize(void);
 
 /*
 ** Many system calls are accessed through pointer-to-functions so that
@@ -23549,6 +24360,7 @@ static struct unix_syscall {
   { "fchown",       (sqlite3_syscall_ptr)posixFchown,     0 },
 #define osFchown    ((int(*)(int,uid_t,gid_t))aSyscall[20].pCurrent)
 
+#if !defined(SQLITE_OMIT_WAL) || SQLITE_MAX_MMAP_SIZE>0
   { "mmap",       (sqlite3_syscall_ptr)mmap,     0 },
 #define osMmap ((void*(*)(void*,size_t,int,int,int,off_t))aSyscall[21].pCurrent)
 
@@ -23561,6 +24373,10 @@ static struct unix_syscall {
   { "mremap",       (sqlite3_syscall_ptr)0,               0 },
 #endif
 #define osMremap ((void*(*)(void*,size_t,size_t,int,...))aSyscall[23].pCurrent)
+#endif
+
+  { "getpagesize",  (sqlite3_syscall_ptr)unixGetpagesize, 0 },
+#define osGetpagesize ((int(*)(void))aSyscall[24].pCurrent)
 
 }; /* End of the overrideable system calls */
 
@@ -23647,6 +24463,15 @@ static const char *unixNextSystemCall(sqlite3_vfs *p, const char *zName){
   return 0;
 }
 
+/*
+** Do not accept any file descriptor less than this value, in order to avoid
+** opening database file using file descriptors that are commonly used for 
+** standard input, output, and error.
+*/
+#ifndef SQLITE_MINIMUM_FILE_DESCRIPTOR
+# define SQLITE_MINIMUM_FILE_DESCRIPTOR 3
+#endif
+
 /*
 ** Invoke open().  Do so multiple times, until it either succeeds or
 ** fails for some reason other than EINTR.
@@ -23667,13 +24492,23 @@ static const char *unixNextSystemCall(sqlite3_vfs *p, const char *zName){
 static int robust_open(const char *z, int f, mode_t m){
   int fd;
   mode_t m2 = m ? m : SQLITE_DEFAULT_FILE_PERMISSIONS;
-  do{
+  while(1){
 #if defined(O_CLOEXEC)
     fd = osOpen(z,f|O_CLOEXEC,m2);
 #else
     fd = osOpen(z,f,m2);
 #endif
-  }while( fd<0 && errno==EINTR );
+    if( fd<0 ){
+      if( errno==EINTR ) continue;
+      break;
+    }
+    if( fd>=SQLITE_MINIMUM_FILE_DESCRIPTOR ) break;
+    osClose(fd);
+    sqlite3_log(SQLITE_WARNING, 
+                "attempt to open \"%s\" as file descriptor %d", z, fd);
+    fd = -1;
+    if( osOpen("/dev/null", f, m)<0 ) break;
+  }
   if( fd>=0 ){
     if( m!=0 ){
       struct stat statbuf;
@@ -24392,6 +25227,15 @@ static int findInodeInfo(
   return SQLITE_OK;
 }
 
+/*
+** Return TRUE if pFile has been renamed or unlinked since it was first opened.
+*/
+static int fileHasMoved(unixFile *pFile){
+  struct stat buf;
+  return pFile->pInode!=0 &&
+         (osStat(pFile->zPath, &buf)!=0 || buf.st_ino!=pFile->pInode->fileId.ino);
+}
+
 
 /*
 ** Check a unixFile that is a database.  Verify the following:
@@ -24426,10 +25270,7 @@ static void verifyDbFile(unixFile *pFile){
     pFile->ctrlFlags |= UNIXFILE_WARNED;
     return;
   }
-  if( pFile->pInode!=0
-   && ((rc = osStat(pFile->zPath, &buf))!=0
-       || buf.st_ino!=pFile->pInode->fileId.ino)
-  ){
+  if( fileHasMoved(pFile) ){
     sqlite3_log(SQLITE_WARNING, "file renamed while open: %s", pFile->zPath);
     pFile->ctrlFlags |= UNIXFILE_WARNED;
     return;
@@ -24967,12 +25808,16 @@ static int posixUnlock(sqlite3_file *id, int eFileLock, int handleNFSUnlock){
 ** the requested locking level, this routine is a no-op.
 */
 static int unixUnlock(sqlite3_file *id, int eFileLock){
+#if SQLITE_MAX_MMAP_SIZE>0
   assert( eFileLock==SHARED_LOCK || ((unixFile *)id)->nFetchOut==0 );
+#endif
   return posixUnlock(id, eFileLock, 0);
 }
 
+#if SQLITE_MAX_MMAP_SIZE>0
 static int unixMapfile(unixFile *pFd, i64 nByte);
 static void unixUnmapfile(unixFile *pFd);
+#endif
 
 /*
 ** This function performs the parts of the "close file" operation 
@@ -24986,7 +25831,9 @@ static void unixUnmapfile(unixFile *pFd);
 */
 static int closeUnixFile(sqlite3_file *id){
   unixFile *pFile = (unixFile*)id;
+#if SQLITE_MAX_MMAP_SIZE>0
   unixUnmapfile(pFile);
+#endif
   if( pFile->h>=0 ){
     robust_close(pFile, pFile->h, __LINE__);
     pFile->h = -1;
@@ -26191,6 +27038,7 @@ static int seekAndRead(unixFile *id, sqlite3_int64 offset, void *pBuf, int cnt){
 #endif
   TIMER_START;
   assert( cnt==(cnt&0x1ffff) );
+  assert( id->h>2 );
   cnt &= 0x1ffff;
   do{
 #if defined(USE_PREAD)
@@ -26305,6 +27153,7 @@ static int seekAndWriteFd(
   int rc = 0;                     /* Value returned by system call */
 
   assert( nBuf==(nBuf&0x1ffff) );
+  assert( fd>2 );
   nBuf &= 0x1ffff;
   TIMER_START;
 
@@ -26690,6 +27539,7 @@ static int unixTruncate(sqlite3_file *id, i64 nByte){
     }
 #endif
 
+#if SQLITE_MAX_MMAP_SIZE>0
     /* If the file was just truncated to a size smaller than the currently
     ** mapped region, reduce the effective mapping size as well. SQLite will
     ** use read() and write() to access data beyond this point from now on.  
@@ -26697,6 +27547,7 @@ static int unixTruncate(sqlite3_file *id, i64 nByte){
     if( nByte<pFile->mmapSize ){
       pFile->mmapSize = nByte;
     }
+#endif
 
     return SQLITE_OK;
   }
@@ -26786,6 +27637,7 @@ static int fcntlSizeHint(unixFile *pFile, i64 nByte){
     }
   }
 
+#if SQLITE_MAX_MMAP_SIZE>0
   if( pFile->mmapSizeMax>0 && nByte>pFile->mmapSize ){
     int rc;
     if( pFile->szChunk<=0 ){
@@ -26798,6 +27650,7 @@ static int fcntlSizeHint(unixFile *pFile, i64 nByte){
     rc = unixMapfile(pFile, nByte);
     return rc;
   }
+#endif
 
   return SQLITE_OK;
 }
@@ -26866,18 +27719,28 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
       }
       return SQLITE_OK;
     }
+    case SQLITE_FCNTL_HAS_MOVED: {
+      *(int*)pArg = fileHasMoved(pFile);
+      return SQLITE_OK;
+    }
+#if SQLITE_MAX_MMAP_SIZE>0
     case SQLITE_FCNTL_MMAP_SIZE: {
       i64 newLimit = *(i64*)pArg;
+      int rc = SQLITE_OK;
       if( newLimit>sqlite3GlobalConfig.mxMmap ){
         newLimit = sqlite3GlobalConfig.mxMmap;
       }
       *(i64*)pArg = pFile->mmapSizeMax;
-      if( newLimit>=0 ){
+      if( newLimit>=0 && newLimit!=pFile->mmapSizeMax && pFile->nFetchOut==0 ){
         pFile->mmapSizeMax = newLimit;
-        if( newLimit<pFile->mmapSize ) pFile->mmapSize = newLimit;
+        if( pFile->mmapSize>0 ){
+          unixUnmapfile(pFile);
+          rc = unixMapfile(pFile, -1);
+        }
       }
-      return SQLITE_OK;
+      return rc;
     }
+#endif
 #ifdef SQLITE_DEBUG
     /* The pager calls this method to signal that it has done
     ** a rollback and that the database is therefore unchanged and
@@ -27140,7 +28003,7 @@ static int unixShmSystemLock(
 #ifdef SQLITE_DEBUG
   { u16 mask;
   OSTRACE(("SHM-LOCK "));
-  mask = (1<<(ofst+n)) - (1<<ofst);
+  mask = ofst>31 ? 0xffff : (1<<(ofst+n)) - (1<<ofst);
   if( rc==SQLITE_OK ){
     if( lockType==F_UNLCK ){
       OSTRACE(("unlock %d ok", ofst));
@@ -27174,6 +28037,36 @@ static int unixShmSystemLock(
   return rc;        
 }
 
+/*
+** Return the system page size.
+**
+** This function should not be called directly by other code in this file. 
+** Instead, it should be called via macro osGetpagesize().
+*/
+static int unixGetpagesize(void){
+#if defined(_BSD_SOURCE)
+  return getpagesize();
+#else
+  return (int)sysconf(_SC_PAGESIZE);
+#endif
+}
+
+/*
+** Return the minimum number of 32KB shm regions that should be mapped at
+** a time, assuming that each mapping must be an integer multiple of the
+** current system page-size.
+**
+** Usually, this is 1. The exception seems to be systems that are configured
+** to use 64KB pages - in this case each mapping must cover at least two
+** shm regions.
+*/
+static int unixShmRegionPerMap(void){
+  int shmsz = 32*1024;            /* SHM region size */
+  int pgsz = osGetpagesize();   /* System page size */
+  assert( ((pgsz-1)&pgsz)==0 );   /* Page size must be a power of 2 */
+  if( pgsz<shmsz ) return 1;
+  return pgsz/shmsz;
+}
 
 /*
 ** Purge the unixShmNodeList list of all entries with unixShmNode.nRef==0.
@@ -27185,10 +28078,11 @@ static void unixShmPurge(unixFile *pFd){
   unixShmNode *p = pFd->pInode->pShmNode;
   assert( unixMutexHeld() );
   if( p && p->nRef==0 ){
+    int nShmPerMap = unixShmRegionPerMap();
     int i;
     assert( p->pInode==pFd->pInode );
     sqlite3_mutex_free(p->mutex);
-    for(i=0; i<p->nRegion; i++){
+    for(i=0; i<p->nRegion; i+=nShmPerMap){
       if( p->h>=0 ){
         osMunmap(p->apRegion[i], p->szRegion);
       }else{
@@ -27395,6 +28289,8 @@ static int unixShmMap(
   unixShm *p;
   unixShmNode *pShmNode;
   int rc = SQLITE_OK;
+  int nShmPerMap = unixShmRegionPerMap();
+  int nReqRegion;
 
   /* If the shared-memory file has not yet been opened, open it now. */
   if( pDbFd->pShm==0 ){
@@ -27410,9 +28306,12 @@ static int unixShmMap(
   assert( pShmNode->h>=0 || pDbFd->pInode->bProcessLock==1 );
   assert( pShmNode->h<0 || pDbFd->pInode->bProcessLock==0 );
 
-  if( pShmNode->nRegion<=iRegion ){
+  /* Minimum number of regions required to be mapped. */
+  nReqRegion = ((iRegion+nShmPerMap) / nShmPerMap) * nShmPerMap;
+
+  if( pShmNode->nRegion<nReqRegion ){
     char **apNew;                      /* New apRegion[] array */
-    int nByte = (iRegion+1)*szRegion;  /* Minimum required file size */
+    int nByte = nReqRegion*szRegion;   /* Minimum required file size */
     struct stat sStat;                 /* Used by fstat() */
 
     pShmNode->szRegion = szRegion;
@@ -27461,17 +28360,19 @@ static int unixShmMap(
 
     /* Map the requested memory region into this processes address space. */
     apNew = (char **)sqlite3_realloc(
-        pShmNode->apRegion, (iRegion+1)*sizeof(char *)
+        pShmNode->apRegion, nReqRegion*sizeof(char *)
     );
     if( !apNew ){
       rc = SQLITE_IOERR_NOMEM;
       goto shmpage_out;
     }
     pShmNode->apRegion = apNew;
-    while(pShmNode->nRegion<=iRegion){
+    while( pShmNode->nRegion<nReqRegion ){
+      int nMap = szRegion*nShmPerMap;
+      int i;
       void *pMem;
       if( pShmNode->h>=0 ){
-        pMem = osMmap(0, szRegion,
+        pMem = osMmap(0, nMap,
             pShmNode->isReadonly ? PROT_READ : PROT_READ|PROT_WRITE, 
             MAP_SHARED, pShmNode->h, szRegion*(i64)pShmNode->nRegion
         );
@@ -27487,8 +28388,11 @@ static int unixShmMap(
         }
         memset(pMem, 0, szRegion);
       }
-      pShmNode->apRegion[pShmNode->nRegion] = pMem;
-      pShmNode->nRegion++;
+
+      for(i=0; i<nShmPerMap; i++){
+        pShmNode->apRegion[pShmNode->nRegion+i] = &((char*)pMem)[szRegion*i];
+      }
+      pShmNode->nRegion += nShmPerMap;
     }
   }
 
@@ -27688,37 +28592,20 @@ static int unixShmUnmap(
 # define unixShmUnmap   0
 #endif /* #ifndef SQLITE_OMIT_WAL */
 
+#if SQLITE_MAX_MMAP_SIZE>0
 /*
 ** If it is currently memory mapped, unmap file pFd.
 */
 static void unixUnmapfile(unixFile *pFd){
   assert( pFd->nFetchOut==0 );
-#if SQLITE_MAX_MMAP_SIZE>0
   if( pFd->pMapRegion ){
     osMunmap(pFd->pMapRegion, pFd->mmapSizeActual);
     pFd->pMapRegion = 0;
     pFd->mmapSize = 0;
     pFd->mmapSizeActual = 0;
   }
-#endif
 }
 
-#if SQLITE_MAX_MMAP_SIZE>0
-/*
-** Return the system page size.
-*/
-static int unixGetPagesize(void){
-#if HAVE_MREMAP
-  return 512;
-#elif defined(_BSD_SOURCE)
-  return getpagesize();
-#else
-  return (int)sysconf(_SC_PAGESIZE);
-#endif
-}
-#endif /* SQLITE_MAX_MMAP_SIZE>0 */
-
-#if SQLITE_MAX_MMAP_SIZE>0
 /*
 ** Attempt to set the size of the memory mapping maintained by file 
 ** descriptor pFd to nNew bytes. Any existing mapping is discarded.
@@ -27755,8 +28642,12 @@ static void unixRemapfile(
   if( (pFd->ctrlFlags & UNIXFILE_RDONLY)==0 ) flags |= PROT_WRITE;
 
   if( pOrig ){
-    const int szSyspage = unixGetPagesize();
+#if HAVE_MREMAP
+    i64 nReuse = pFd->mmapSize;
+#else
+    const int szSyspage = osGetpagesize();
     i64 nReuse = (pFd->mmapSize & ~(szSyspage-1));
+#endif
     u8 *pReq = &pOrig[nReuse];
 
     /* Unmap any pages of the existing mapping that cannot be reused. */
@@ -27803,7 +28694,6 @@ static void unixRemapfile(
   pFd->pMapRegion = (void *)pNew;
   pFd->mmapSize = pFd->mmapSizeActual = nNew;
 }
-#endif
 
 /*
 ** Memory map or remap the file opened by file-descriptor pFd (if the file
@@ -27822,7 +28712,6 @@ static void unixRemapfile(
 ** code otherwise.
 */
 static int unixMapfile(unixFile *pFd, i64 nByte){
-#if SQLITE_MAX_MMAP_SIZE>0
   i64 nMap = nByte;
   int rc;
 
@@ -27848,10 +28737,10 @@ static int unixMapfile(unixFile *pFd, i64 nByte){
       unixUnmapfile(pFd);
     }
   }
-#endif
 
   return SQLITE_OK;
 }
+#endif /* SQLITE_MAX_MMAP_SIZE>0 */
 
 /*
 ** If possible, return a pointer to a mapping of file fd starting at offset
@@ -27897,6 +28786,7 @@ static int unixFetch(sqlite3_file *fd, i64 iOff, int nAmt, void **pp){
 ** may now be invalid and should be unmapped.
 */
 static int unixUnfetch(sqlite3_file *fd, i64 iOff, void *p){
+#if SQLITE_MAX_MMAP_SIZE>0
   unixFile *pFd = (unixFile *)fd;   /* The underlying database file */
   UNUSED_PARAMETER(iOff);
 
@@ -27915,6 +28805,11 @@ static int unixUnfetch(sqlite3_file *fd, i64 iOff, void *p){
   }
 
   assert( pFd->nFetchOut>=0 );
+#else
+  UNUSED_PARAMETER(fd);
+  UNUSED_PARAMETER(p);
+  UNUSED_PARAMETER(iOff);
+#endif
   return SQLITE_OK;
 }
 
@@ -28246,7 +29141,9 @@ static int fillInUnixFile(
   pNew->pVfs = pVfs;
   pNew->zPath = zFilename;
   pNew->ctrlFlags = (u8)ctrlFlags;
+#if SQLITE_MAX_MMAP_SIZE>0
   pNew->mmapSizeMax = sqlite3GlobalConfig.szMmap;
+#endif
   if( sqlite3_uri_boolean(((ctrlFlags & UNIXFILE_URI) ? zFilename : 0),
                            "psow", SQLITE_POWERSAFE_OVERWRITE) ){
     pNew->ctrlFlags |= UNIXFILE_PSOW;
@@ -28401,6 +29298,7 @@ static int fillInUnixFile(
 */
 static const char *unixTempFileDir(void){
   static const char *azDirs[] = {
+     0,
      0,
      0,
      "/var/tmp",
@@ -28413,7 +29311,8 @@ static const char *unixTempFileDir(void){
   const char *zDir = 0;
 
   azDirs[0] = sqlite3_temp_directory;
-  if( !azDirs[1] ) azDirs[1] = getenv("TMPDIR");
+  if( !azDirs[1] ) azDirs[1] = getenv("SQLITE_TMPDIR");
+  if( !azDirs[2] ) azDirs[2] = getenv("TMPDIR");
   for(i=0; i<sizeof(azDirs)/sizeof(azDirs[0]); zDir=azDirs[i++]){
     if( zDir==0 ) continue;
     if( osStat(zDir, &buf) ) continue;
@@ -28700,6 +29599,16 @@ static int unixOpen(
        || eType==SQLITE_OPEN_TRANSIENT_DB || eType==SQLITE_OPEN_WAL
   );
 
+  /* Detect a pid change and reset the PRNG.  There is a race condition
+  ** here such that two or more threads all trying to open databases at
+  ** the same instant might all reset the PRNG.  But multiple resets
+  ** are harmless.
+  */
+  if( randomnessPid!=getpid() ){
+    randomnessPid = getpid();
+    sqlite3_randomness(0,0);
+  }
+
   memset(p, 0, sizeof(unixFile));
 
   if( eType==SQLITE_OPEN_MAIN_DB ){
@@ -29087,18 +29996,18 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nBuf, char *zBuf){
   ** tests repeatable.
   */
   memset(zBuf, 0, nBuf);
+  randomnessPid = getpid();  
 #if !defined(SQLITE_TEST)
   {
-    int pid, fd, got;
+    int fd, got;
     fd = robust_open("/dev/urandom", O_RDONLY, 0);
     if( fd<0 ){
       time_t t;
       time(&t);
       memcpy(zBuf, &t, sizeof(t));
-      pid = getpid();
-      memcpy(&zBuf[sizeof(t)], &pid, sizeof(pid));
-      assert( sizeof(t)+sizeof(pid)<=(size_t)nBuf );
-      nBuf = sizeof(t) + sizeof(pid);
+      memcpy(&zBuf[sizeof(t)], &randomnessPid, sizeof(randomnessPid));
+      assert( sizeof(t)+sizeof(randomnessPid)<=(size_t)nBuf );
+      nBuf = sizeof(t) + sizeof(randomnessPid);
     }else{
       do{ got = osRead(fd, zBuf, nBuf); }while( got<0 && errno==EINTR );
       robust_close(0, fd, __LINE__);
@@ -30484,7 +31393,7 @@ SQLITE_API int sqlite3_os_init(void){
 
   /* Double-check that the aSyscall[] array has been constructed
   ** correctly.  See ticket [bb3a86e890c8e96ab] */
-  assert( ArraySize(aSyscall)==24 );
+  assert( ArraySize(aSyscall)==25 );
 
   /* Register all VFSes defined in the aVfs[] array */
   for(i=0; i<(sizeof(aVfs)/sizeof(sqlite3_vfs)); i++){
@@ -30524,10 +31433,6 @@ SQLITE_API int sqlite3_os_end(void){
 */
 #if SQLITE_OS_WIN               /* This file is used for Windows only */
 
-#ifdef __CYGWIN__
-# include <sys/cygwin.h>
-#endif
-
 /*
 ** Include code that is common to all os_*.c files
 */
@@ -30741,12 +31646,16 @@ SQLITE_API int sqlite3_open_file_count = 0;
 /************** End of os_common.h *******************************************/
 /************** Continuing where we left off in os_win.c *********************/
 
+/*
+** Include the header file for the Windows VFS.
+*/
+
 /*
 ** Compiling and using WAL mode requires several APIs that are only
 ** available in Windows platforms based on the NT kernel.
 */
 #if !SQLITE_OS_WINNT && !defined(SQLITE_OMIT_WAL)
-# error "WAL mode requires support from the Windows NT kernel, compile\
+#  error "WAL mode requires support from the Windows NT kernel, compile\
  with SQLITE_OMIT_WAL."
 #endif
 
@@ -30754,7 +31663,7 @@ SQLITE_API int sqlite3_open_file_count = 0;
 ** Are most of the Win32 ANSI APIs available (i.e. with certain exceptions
 ** based on the sub-platform)?
 */
-#if !SQLITE_OS_WINCE && !SQLITE_OS_WINRT
+#if !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && !defined(SQLITE_WIN32_NO_ANSI)
 #  define SQLITE_WIN32_HAS_ANSI
 #endif
 
@@ -30762,10 +31671,125 @@ SQLITE_API int sqlite3_open_file_count = 0;
 ** Are most of the Win32 Unicode APIs available (i.e. with certain exceptions
 ** based on the sub-platform)?
 */
-#if SQLITE_OS_WINCE || SQLITE_OS_WINNT || SQLITE_OS_WINRT
+#if (SQLITE_OS_WINCE || SQLITE_OS_WINNT || SQLITE_OS_WINRT) && \
+    !defined(SQLITE_WIN32_NO_WIDE)
 #  define SQLITE_WIN32_HAS_WIDE
 #endif
 
+/*
+** Make sure at least one set of Win32 APIs is available.
+*/
+#if !defined(SQLITE_WIN32_HAS_ANSI) && !defined(SQLITE_WIN32_HAS_WIDE)
+#  error "At least one of SQLITE_WIN32_HAS_ANSI and SQLITE_WIN32_HAS_WIDE\
+ must be defined."
+#endif
+
+/*
+** Define the required Windows SDK version constants if they are not
+** already available.
+*/
+#ifndef NTDDI_WIN8
+#  define NTDDI_WIN8                        0x06020000
+#endif
+
+#ifndef NTDDI_WINBLUE
+#  define NTDDI_WINBLUE                     0x06030000
+#endif
+
+/*
+** Check if the GetVersionEx[AW] functions should be considered deprecated
+** and avoid using them in that case.  It should be noted here that if the
+** value of the SQLITE_WIN32_GETVERSIONEX pre-processor macro is zero
+** (whether via this block or via being manually specified), that implies
+** the underlying operating system will always be based on the Windows NT
+** Kernel.
+*/
+#ifndef SQLITE_WIN32_GETVERSIONEX
+#  if defined(NTDDI_VERSION) && NTDDI_VERSION >= NTDDI_WINBLUE
+#    define SQLITE_WIN32_GETVERSIONEX   0
+#  else
+#    define SQLITE_WIN32_GETVERSIONEX   1
+#  endif
+#endif
+
+/*
+** This constant should already be defined (in the "WinDef.h" SDK file).
+*/
+#ifndef MAX_PATH
+#  define MAX_PATH                      (260)
+#endif
+
+/*
+** Maximum pathname length (in chars) for Win32.  This should normally be
+** MAX_PATH.
+*/
+#ifndef SQLITE_WIN32_MAX_PATH_CHARS
+#  define SQLITE_WIN32_MAX_PATH_CHARS   (MAX_PATH)
+#endif
+
+/*
+** This constant should already be defined (in the "WinNT.h" SDK file).
+*/
+#ifndef UNICODE_STRING_MAX_CHARS
+#  define UNICODE_STRING_MAX_CHARS      (32767)
+#endif
+
+/*
+** Maximum pathname length (in chars) for WinNT.  This should normally be
+** UNICODE_STRING_MAX_CHARS.
+*/
+#ifndef SQLITE_WINNT_MAX_PATH_CHARS
+#  define SQLITE_WINNT_MAX_PATH_CHARS   (UNICODE_STRING_MAX_CHARS)
+#endif
+
+/*
+** Maximum pathname length (in bytes) for Win32.  The MAX_PATH macro is in
+** characters, so we allocate 4 bytes per character assuming worst-case of
+** 4-bytes-per-character for UTF8.
+*/
+#ifndef SQLITE_WIN32_MAX_PATH_BYTES
+#  define SQLITE_WIN32_MAX_PATH_BYTES   (SQLITE_WIN32_MAX_PATH_CHARS*4)
+#endif
+
+/*
+** Maximum pathname length (in bytes) for WinNT.  This should normally be
+** UNICODE_STRING_MAX_CHARS * sizeof(WCHAR).
+*/
+#ifndef SQLITE_WINNT_MAX_PATH_BYTES
+#  define SQLITE_WINNT_MAX_PATH_BYTES   \
+                            (sizeof(WCHAR) * SQLITE_WINNT_MAX_PATH_CHARS)
+#endif
+
+/*
+** Maximum error message length (in chars) for WinRT.
+*/
+#ifndef SQLITE_WIN32_MAX_ERRMSG_CHARS
+#  define SQLITE_WIN32_MAX_ERRMSG_CHARS (1024)
+#endif
+
+/*
+** Returns non-zero if the character should be treated as a directory
+** separator.
+*/
+#ifndef winIsDirSep
+#  define winIsDirSep(a)                (((a) == '/') || ((a) == '\\'))
+#endif
+
+/*
+** This macro is used when a local variable is set to a value that is
+** [sometimes] not used by the code (e.g. via conditional compilation).
+*/
+#ifndef UNUSED_VARIABLE_VALUE
+#  define UNUSED_VARIABLE_VALUE(x) (void)(x)
+#endif
+
+/*
+** Returns the character that should be used as the directory separator.
+*/
+#ifndef winGetDirSep
+#  define winGetDirSep()                '\\'
+#endif
+
 /*
 ** Do we need to manually define the Win32 file mapping APIs for use with WAL
 ** mode (e.g. these APIs are available in the Windows CE SDK; however, they
@@ -30801,13 +31825,6 @@ WINBASEAPI LPVOID WINAPI MapViewOfFile(HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID);
 #endif /* SQLITE_WIN32_FILEMAPPING_API && !defined(SQLITE_OMIT_WAL) */
 
-/*
-** Macro to find the minimum of two numeric values.
-*/
-#ifndef MIN
-# define MIN(x,y) ((x)<(y)?(x):(y))
-#endif
-
 /*
 ** Some Microsoft compilers lack this definition.
 */
@@ -30824,7 +31841,7 @@ WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID);
 #endif
 
 #ifndef SQLITE_OMIT_WAL
-/* Forward references */
+/* Forward references to structures used for WAL */
 typedef struct winShm winShm;           /* A connection to shared-memory */
 typedef struct winShmNode winShmNode;   /* A region of shared-memory */
 #endif
@@ -30954,6 +31971,7 @@ struct winFile {
 #  define SQLITE_WIN32_HEAP_FLAGS     (0)
 #endif
 
+
 /*
 ** The winMemData structure stores information required by the Win32-specific
 ** sqlite3_mem_methods implementation.
@@ -30961,30 +31979,41 @@ struct winFile {
 typedef struct winMemData winMemData;
 struct winMemData {
 #ifndef NDEBUG
-  u32 magic;    /* Magic number to detect structure corruption. */
+  u32 magic1;   /* Magic number to detect structure corruption. */
 #endif
   HANDLE hHeap; /* The handle to our heap. */
   BOOL bOwned;  /* Do we own the heap (i.e. destroy it on shutdown)? */
+#ifndef NDEBUG
+  u32 magic2;   /* Magic number to detect structure corruption. */
+#endif
 };
 
 #ifndef NDEBUG
-#define WINMEM_MAGIC     0x42b2830b
+#define WINMEM_MAGIC1     0x42b2830b
+#define WINMEM_MAGIC2     0xbd4d7cf4
 #endif
 
 static struct winMemData win_mem_data = {
 #ifndef NDEBUG
-  WINMEM_MAGIC,
+  WINMEM_MAGIC1,
 #endif
   NULL, FALSE
+#ifndef NDEBUG
+  ,WINMEM_MAGIC2
+#endif
 };
 
 #ifndef NDEBUG
-#define winMemAssertMagic() assert( win_mem_data.magic==WINMEM_MAGIC )
+#define winMemAssertMagic1() assert( win_mem_data.magic1==WINMEM_MAGIC1 )
+#define winMemAssertMagic2() assert( win_mem_data.magic2==WINMEM_MAGIC2 )
+#define winMemAssertMagic()  winMemAssertMagic1(); winMemAssertMagic2();
 #else
 #define winMemAssertMagic()
 #endif
 
-#define winMemGetHeap() win_mem_data.hHeap
+#define winMemGetDataPtr()  &win_mem_data
+#define winMemGetHeap()     win_mem_data.hHeap
+#define winMemGetOwned()    win_mem_data.bOwned
 
 static void *winMemMalloc(int nBytes);
 static void winMemFree(void *pPrior);
@@ -31011,7 +32040,8 @@ SQLITE_PRIVATE const sqlite3_mem_methods *sqlite3MemGetWin32(void);
 */
 #ifdef SQLITE_TEST
 SQLITE_API int sqlite3_os_type = 0;
-#else
+#elif !SQLITE_OS_WINCE && !SQLITE_OS_WINRT && \
+      defined(SQLITE_WIN32_HAS_ANSI) && defined(SQLITE_WIN32_HAS_WIDE)
 static int sqlite3_os_type = 0;
 #endif
 
@@ -31317,7 +32347,8 @@ static struct win_syscall {
 
 #define osGetTickCount ((DWORD(WINAPI*)(VOID))aSyscall[33].pCurrent)
 
-#if defined(SQLITE_WIN32_HAS_ANSI)
+#if defined(SQLITE_WIN32_HAS_ANSI) && defined(SQLITE_WIN32_GETVERSIONEX) && \
+        SQLITE_WIN32_GETVERSIONEX
   { "GetVersionExA",           (SYSCALL)GetVersionExA,           0 },
 #else
   { "GetVersionExA",           (SYSCALL)0,                       0 },
@@ -31326,10 +32357,20 @@ static struct win_syscall {
 #define osGetVersionExA ((BOOL(WINAPI*)( \
         LPOSVERSIONINFOA))aSyscall[34].pCurrent)
 
+#if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_WIDE) && \
+        defined(SQLITE_WIN32_GETVERSIONEX) && SQLITE_WIN32_GETVERSIONEX
+  { "GetVersionExW",           (SYSCALL)GetVersionExW,           0 },
+#else
+  { "GetVersionExW",           (SYSCALL)0,                       0 },
+#endif
+
+#define osGetVersionExW ((BOOL(WINAPI*)( \
+        LPOSVERSIONINFOW))aSyscall[35].pCurrent)
+
   { "HeapAlloc",               (SYSCALL)HeapAlloc,               0 },
 
 #define osHeapAlloc ((LPVOID(WINAPI*)(HANDLE,DWORD, \
-        SIZE_T))aSyscall[35].pCurrent)
+        SIZE_T))aSyscall[36].pCurrent)
 
 #if !SQLITE_OS_WINRT
   { "HeapCreate",              (SYSCALL)HeapCreate,              0 },
@@ -31338,7 +32379,7 @@ static struct win_syscall {
 #endif
 
 #define osHeapCreate ((HANDLE(WINAPI*)(DWORD,SIZE_T, \
-        SIZE_T))aSyscall[36].pCurrent)
+        SIZE_T))aSyscall[37].pCurrent)
 
 #if !SQLITE_OS_WINRT
   { "HeapDestroy",             (SYSCALL)HeapDestroy,             0 },
@@ -31346,21 +32387,21 @@ static struct win_syscall {
   { "HeapDestroy",             (SYSCALL)0,                       0 },
 #endif
 
-#define osHeapDestroy ((BOOL(WINAPI*)(HANDLE))aSyscall[37].pCurrent)
+#define osHeapDestroy ((BOOL(WINAPI*)(HANDLE))aSyscall[38].pCurrent)
 
   { "HeapFree",                (SYSCALL)HeapFree,                0 },
 
-#define osHeapFree ((BOOL(WINAPI*)(HANDLE,DWORD,LPVOID))aSyscall[38].pCurrent)
+#define osHeapFree ((BOOL(WINAPI*)(HANDLE,DWORD,LPVOID))aSyscall[39].pCurrent)
 
   { "HeapReAlloc",             (SYSCALL)HeapReAlloc,             0 },
 
 #define osHeapReAlloc ((LPVOID(WINAPI*)(HANDLE,DWORD,LPVOID, \
-        SIZE_T))aSyscall[39].pCurrent)
+        SIZE_T))aSyscall[40].pCurrent)
 
   { "HeapSize",                (SYSCALL)HeapSize,                0 },
 
 #define osHeapSize ((SIZE_T(WINAPI*)(HANDLE,DWORD, \
-        LPCVOID))aSyscall[40].pCurrent)
+        LPCVOID))aSyscall[41].pCurrent)
 
 #if !SQLITE_OS_WINRT
   { "HeapValidate",            (SYSCALL)HeapValidate,            0 },
@@ -31369,7 +32410,15 @@ static struct win_syscall {
 #endif
 
 #define osHeapValidate ((BOOL(WINAPI*)(HANDLE,DWORD, \
-        LPCVOID))aSyscall[41].pCurrent)
+        LPCVOID))aSyscall[42].pCurrent)
+
+#if !SQLITE_OS_WINCE && !SQLITE_OS_WINRT
+  { "HeapCompact",             (SYSCALL)HeapCompact,             0 },
+#else
+  { "HeapCompact",             (SYSCALL)0,                       0 },
+#endif
+
+#define osHeapCompact ((UINT(WINAPI*)(HANDLE,DWORD))aSyscall[43].pCurrent)
 
 #if defined(SQLITE_WIN32_HAS_ANSI) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
   { "LoadLibraryA",            (SYSCALL)LoadLibraryA,            0 },
@@ -31377,7 +32426,7 @@ static struct win_syscall {
   { "LoadLibraryA",            (SYSCALL)0,                       0 },
 #endif
 
-#define osLoadLibraryA ((HMODULE(WINAPI*)(LPCSTR))aSyscall[42].pCurrent)
+#define osLoadLibraryA ((HMODULE(WINAPI*)(LPCSTR))aSyscall[44].pCurrent)
 
 #if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_HAS_WIDE) && \
         !defined(SQLITE_OMIT_LOAD_EXTENSION)
@@ -31386,7 +32435,7 @@ static struct win_syscall {
   { "LoadLibraryW",            (SYSCALL)0,                       0 },
 #endif
 
-#define osLoadLibraryW ((HMODULE(WINAPI*)(LPCWSTR))aSyscall[43].pCurrent)
+#define osLoadLibraryW ((HMODULE(WINAPI*)(LPCWSTR))aSyscall[45].pCurrent)
 
 #if !SQLITE_OS_WINRT
   { "LocalFree",               (SYSCALL)LocalFree,               0 },
@@ -31394,7 +32443,7 @@ static struct win_syscall {
   { "LocalFree",               (SYSCALL)0,                       0 },
 #endif
 
-#define osLocalFree ((HLOCAL(WINAPI*)(HLOCAL))aSyscall[44].pCurrent)
+#define osLocalFree ((HLOCAL(WINAPI*)(HLOCAL))aSyscall[46].pCurrent)
 
 #if !SQLITE_OS_WINCE && !SQLITE_OS_WINRT
   { "LockFile",                (SYSCALL)LockFile,                0 },
@@ -31404,7 +32453,7 @@ static struct win_syscall {
 
 #ifndef osLockFile
 #define osLockFile ((BOOL(WINAPI*)(HANDLE,DWORD,DWORD,DWORD, \
-        DWORD))aSyscall[45].pCurrent)
+        DWORD))aSyscall[47].pCurrent)
 #endif
 
 #if !SQLITE_OS_WINCE
@@ -31415,7 +32464,7 @@ static struct win_syscall {
 
 #ifndef osLockFileEx
 #define osLockFileEx ((BOOL(WINAPI*)(HANDLE,DWORD,DWORD,DWORD,DWORD, \
-        LPOVERLAPPED))aSyscall[46].pCurrent)
+        LPOVERLAPPED))aSyscall[48].pCurrent)
 #endif
 
 #if SQLITE_OS_WINCE || (!SQLITE_OS_WINRT && !defined(SQLITE_OMIT_WAL))
@@ -31425,26 +32474,26 @@ static struct win_syscall {
 #endif
 
 #define osMapViewOfFile ((LPVOID(WINAPI*)(HANDLE,DWORD,DWORD,DWORD, \
-        SIZE_T))aSyscall[47].pCurrent)
+        SIZE_T))aSyscall[49].pCurrent)
 
   { "MultiByteToWideChar",     (SYSCALL)MultiByteToWideChar,     0 },
 
 #define osMultiByteToWideChar ((int(WINAPI*)(UINT,DWORD,LPCSTR,int,LPWSTR, \
-        int))aSyscall[48].pCurrent)
+        int))aSyscall[50].pCurrent)
 
   { "QueryPerformanceCounter", (SYSCALL)QueryPerformanceCounter, 0 },
 
 #define osQueryPerformanceCounter ((BOOL(WINAPI*)( \
-        LARGE_INTEGER*))aSyscall[49].pCurrent)
+        LARGE_INTEGER*))aSyscall[51].pCurrent)
 
   { "ReadFile",                (SYSCALL)ReadFile,                0 },
 
 #define osReadFile ((BOOL(WINAPI*)(HANDLE,LPVOID,DWORD,LPDWORD, \
-        LPOVERLAPPED))aSyscall[50].pCurrent)
+        LPOVERLAPPED))aSyscall[52].pCurrent)
 
   { "SetEndOfFile",            (SYSCALL)SetEndOfFile,            0 },
 
-#define osSetEndOfFile ((BOOL(WINAPI*)(HANDLE))aSyscall[51].pCurrent)
+#define osSetEndOfFile ((BOOL(WINAPI*)(HANDLE))aSyscall[53].pCurrent)
 
 #if !SQLITE_OS_WINRT
   { "SetFilePointer",          (SYSCALL)SetFilePointer,          0 },
@@ -31453,7 +32502,7 @@ static struct win_syscall {
 #endif
 
 #define osSetFilePointer ((DWORD(WINAPI*)(HANDLE,LONG,PLONG, \
-        DWORD))aSyscall[52].pCurrent)
+        DWORD))aSyscall[54].pCurrent)
 
 #if !SQLITE_OS_WINRT
   { "Sleep",                   (SYSCALL)Sleep,                   0 },
@@ -31461,12 +32510,12 @@ static struct win_syscall {
   { "Sleep",                   (SYSCALL)0,                       0 },
 #endif
 
-#define osSleep ((VOID(WINAPI*)(DWORD))aSyscall[53].pCurrent)
+#define osSleep ((VOID(WINAPI*)(DWORD))aSyscall[55].pCurrent)
 
   { "SystemTimeToFileTime",    (SYSCALL)SystemTimeToFileTime,    0 },
 
 #define osSystemTimeToFileTime ((BOOL(WINAPI*)(CONST SYSTEMTIME*, \
-        LPFILETIME))aSyscall[54].pCurrent)
+        LPFILETIME))aSyscall[56].pCurrent)
 
 #if !SQLITE_OS_WINCE && !SQLITE_OS_WINRT
   { "UnlockFile",              (SYSCALL)UnlockFile,              0 },
@@ -31476,7 +32525,7 @@ static struct win_syscall {
 
 #ifndef osUnlockFile
 #define osUnlockFile ((BOOL(WINAPI*)(HANDLE,DWORD,DWORD,DWORD, \
-        DWORD))aSyscall[55].pCurrent)
+        DWORD))aSyscall[57].pCurrent)
 #endif
 
 #if !SQLITE_OS_WINCE
@@ -31486,7 +32535,7 @@ static struct win_syscall {
 #endif
 
 #define osUnlockFileEx ((BOOL(WINAPI*)(HANDLE,DWORD,DWORD,DWORD, \
-        LPOVERLAPPED))aSyscall[56].pCurrent)
+        LPOVERLAPPED))aSyscall[58].pCurrent)
 
 #if SQLITE_OS_WINCE || !defined(SQLITE_OMIT_WAL)
   { "UnmapViewOfFile",         (SYSCALL)UnmapViewOfFile,         0 },
@@ -31494,17 +32543,17 @@ static struct win_syscall {
   { "UnmapViewOfFile",         (SYSCALL)0,                       0 },
 #endif
 
-#define osUnmapViewOfFile ((BOOL(WINAPI*)(LPCVOID))aSyscall[57].pCurrent)
+#define osUnmapViewOfFile ((BOOL(WINAPI*)(LPCVOID))aSyscall[59].pCurrent)
 
   { "WideCharToMultiByte",     (SYSCALL)WideCharToMultiByte,     0 },
 
 #define osWideCharToMultiByte ((int(WINAPI*)(UINT,DWORD,LPCWSTR,int,LPSTR,int, \
-        LPCSTR,LPBOOL))aSyscall[58].pCurrent)
+        LPCSTR,LPBOOL))aSyscall[60].pCurrent)
 
   { "WriteFile",               (SYSCALL)WriteFile,               0 },
 
 #define osWriteFile ((BOOL(WINAPI*)(HANDLE,LPCVOID,DWORD,LPDWORD, \
-        LPOVERLAPPED))aSyscall[59].pCurrent)
+        LPOVERLAPPED))aSyscall[61].pCurrent)
 
 #if SQLITE_OS_WINRT
   { "CreateEventExW",          (SYSCALL)CreateEventExW,          0 },
@@ -31513,7 +32562,7 @@ static struct win_syscall {
 #endif
 
 #define osCreateEventExW ((HANDLE(WINAPI*)(LPSECURITY_ATTRIBUTES,LPCWSTR, \
-        DWORD,DWORD))aSyscall[60].pCurrent)
+        DWORD,DWORD))aSyscall[62].pCurrent)
 
 #if !SQLITE_OS_WINRT
   { "WaitForSingleObject",     (SYSCALL)WaitForSingleObject,     0 },
@@ -31522,7 +32571,7 @@ static struct win_syscall {
 #endif
 
 #define osWaitForSingleObject ((DWORD(WINAPI*)(HANDLE, \
-        DWORD))aSyscall[61].pCurrent)
+        DWORD))aSyscall[63].pCurrent)
 
 #if SQLITE_OS_WINRT
   { "WaitForSingleObjectEx",   (SYSCALL)WaitForSingleObjectEx,   0 },
@@ -31531,7 +32580,7 @@ static struct win_syscall {
 #endif
 
 #define osWaitForSingleObjectEx ((DWORD(WINAPI*)(HANDLE,DWORD, \
-        BOOL))aSyscall[62].pCurrent)
+        BOOL))aSyscall[64].pCurrent)
 
 #if SQLITE_OS_WINRT
   { "SetFilePointerEx",        (SYSCALL)SetFilePointerEx,        0 },
@@ -31540,7 +32589,7 @@ static struct win_syscall {
 #endif
 
 #define osSetFilePointerEx ((BOOL(WINAPI*)(HANDLE,LARGE_INTEGER, \
-        PLARGE_INTEGER,DWORD))aSyscall[63].pCurrent)
+        PLARGE_INTEGER,DWORD))aSyscall[65].pCurrent)
 
 #if SQLITE_OS_WINRT
   { "GetFileInformationByHandleEx", (SYSCALL)GetFileInformationByHandleEx, 0 },
@@ -31549,7 +32598,7 @@ static struct win_syscall {
 #endif
 
 #define osGetFileInformationByHandleEx ((BOOL(WINAPI*)(HANDLE, \
-        FILE_INFO_BY_HANDLE_CLASS,LPVOID,DWORD))aSyscall[64].pCurrent)
+        FILE_INFO_BY_HANDLE_CLASS,LPVOID,DWORD))aSyscall[66].pCurrent)
 
 #if SQLITE_OS_WINRT && !defined(SQLITE_OMIT_WAL)
   { "MapViewOfFileFromApp",    (SYSCALL)MapViewOfFileFromApp,    0 },
@@ -31558,7 +32607,7 @@ static struct win_syscall {
 #endif
 
 #define osMapViewOfFileFromApp ((LPVOID(WINAPI*)(HANDLE,ULONG,ULONG64, \
-        SIZE_T))aSyscall[65].pCurrent)
+        SIZE_T))aSyscall[67].pCurrent)
 
 #if SQLITE_OS_WINRT
   { "CreateFile2",             (SYSCALL)CreateFile2,             0 },
@@ -31567,7 +32616,7 @@ static struct win_syscall {
 #endif
 
 #define osCreateFile2 ((HANDLE(WINAPI*)(LPCWSTR,DWORD,DWORD,DWORD, \
-        LPCREATEFILE2_EXTENDED_PARAMETERS))aSyscall[66].pCurrent)
+        LPCREATEFILE2_EXTENDED_PARAMETERS))aSyscall[68].pCurrent)
 
 #if SQLITE_OS_WINRT && !defined(SQLITE_OMIT_LOAD_EXTENSION)
   { "LoadPackagedLibrary",     (SYSCALL)LoadPackagedLibrary,     0 },
@@ -31576,7 +32625,7 @@ static struct win_syscall {
 #endif
 
 #define osLoadPackagedLibrary ((HMODULE(WINAPI*)(LPCWSTR, \
-        DWORD))aSyscall[67].pCurrent)
+        DWORD))aSyscall[69].pCurrent)
 
 #if SQLITE_OS_WINRT
   { "GetTickCount64",          (SYSCALL)GetTickCount64,          0 },
@@ -31584,7 +32633,7 @@ static struct win_syscall {
   { "GetTickCount64",          (SYSCALL)0,                       0 },
 #endif
 
-#define osGetTickCount64 ((ULONGLONG(WINAPI*)(VOID))aSyscall[68].pCurrent)
+#define osGetTickCount64 ((ULONGLONG(WINAPI*)(VOID))aSyscall[70].pCurrent)
 
 #if SQLITE_OS_WINRT
   { "GetNativeSystemInfo",     (SYSCALL)GetNativeSystemInfo,     0 },
@@ -31593,7 +32642,7 @@ static struct win_syscall {
 #endif
 
 #define osGetNativeSystemInfo ((VOID(WINAPI*)( \
-        LPSYSTEM_INFO))aSyscall[69].pCurrent)
+        LPSYSTEM_INFO))aSyscall[71].pCurrent)
 
 #if defined(SQLITE_WIN32_HAS_ANSI)
   { "OutputDebugStringA",      (SYSCALL)OutputDebugStringA,      0 },
@@ -31601,7 +32650,7 @@ static struct win_syscall {
   { "OutputDebugStringA",      (SYSCALL)0,                       0 },
 #endif
 
-#define osOutputDebugStringA ((VOID(WINAPI*)(LPCSTR))aSyscall[70].pCurrent)
+#define osOutputDebugStringA ((VOID(WINAPI*)(LPCSTR))aSyscall[72].pCurrent)
 
 #if defined(SQLITE_WIN32_HAS_WIDE)
   { "OutputDebugStringW",      (SYSCALL)OutputDebugStringW,      0 },
@@ -31609,11 +32658,11 @@ static struct win_syscall {
   { "OutputDebugStringW",      (SYSCALL)0,                       0 },
 #endif
 
-#define osOutputDebugStringW ((VOID(WINAPI*)(LPCWSTR))aSyscall[71].pCurrent)
+#define osOutputDebugStringW ((VOID(WINAPI*)(LPCWSTR))aSyscall[73].pCurrent)
 
   { "GetProcessHeap",          (SYSCALL)GetProcessHeap,          0 },
 
-#define osGetProcessHeap ((HANDLE(WINAPI*)(VOID))aSyscall[72].pCurrent)
+#define osGetProcessHeap ((HANDLE(WINAPI*)(VOID))aSyscall[74].pCurrent)
 
 #if SQLITE_OS_WINRT && !defined(SQLITE_OMIT_WAL)
   { "CreateFileMappingFromApp", (SYSCALL)CreateFileMappingFromApp, 0 },
@@ -31622,7 +32671,7 @@ static struct win_syscall {
 #endif
 
 #define osCreateFileMappingFromApp ((HANDLE(WINAPI*)(HANDLE, \
-        LPSECURITY_ATTRIBUTES,ULONG,ULONG64,LPCWSTR))aSyscall[73].pCurrent)
+        LPSECURITY_ATTRIBUTES,ULONG,ULONG64,LPCWSTR))aSyscall[75].pCurrent)
 
 }; /* End of the overrideable system calls */
 
@@ -31709,6 +32758,94 @@ static const char *winNextSystemCall(sqlite3_vfs *p, const char *zName){
   return 0;
 }
 
+#ifdef SQLITE_WIN32_MALLOC
+/*
+** If a Win32 native heap has been configured, this function will attempt to
+** compact it.  Upon success, SQLITE_OK will be returned.  Upon failure, one
+** of SQLITE_NOMEM, SQLITE_ERROR, or SQLITE_NOTFOUND will be returned.  The
+** "pnLargest" argument, if non-zero, will be used to return the size of the
+** largest committed free block in the heap, in bytes.
+*/
+SQLITE_API int sqlite3_win32_compact_heap(LPUINT pnLargest){
+  int rc = SQLITE_OK;
+  UINT nLargest = 0;
+  HANDLE hHeap;
+
+  winMemAssertMagic();
+  hHeap = winMemGetHeap();
+  assert( hHeap!=0 );
+  assert( hHeap!=INVALID_HANDLE_VALUE );
+#if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_MALLOC_VALIDATE)
+  assert( osHeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, NULL) );
+#endif
+#if !SQLITE_OS_WINCE && !SQLITE_OS_WINRT
+  if( (nLargest=osHeapCompact(hHeap, SQLITE_WIN32_HEAP_FLAGS))==0 ){
+    DWORD lastErrno = osGetLastError();
+    if( lastErrno==NO_ERROR ){
+      sqlite3_log(SQLITE_NOMEM, "failed to HeapCompact (no space), heap=%p",
+                  (void*)hHeap);
+      rc = SQLITE_NOMEM;
+    }else{
+      sqlite3_log(SQLITE_ERROR, "failed to HeapCompact (%lu), heap=%p",
+                  osGetLastError(), (void*)hHeap);
+      rc = SQLITE_ERROR;
+    }
+  }
+#else
+  sqlite3_log(SQLITE_NOTFOUND, "failed to HeapCompact, heap=%p",
+              (void*)hHeap);
+  rc = SQLITE_NOTFOUND;
+#endif
+  if( pnLargest ) *pnLargest = nLargest;
+  return rc;
+}
+
+/*
+** If a Win32 native heap has been configured, this function will attempt to
+** destroy and recreate it.  If the Win32 native heap is not isolated and/or
+** the sqlite3_memory_used() function does not return zero, SQLITE_BUSY will
+** be returned and no changes will be made to the Win32 native heap.
+*/
+SQLITE_API int sqlite3_win32_reset_heap(){
+  int rc;
+  MUTEX_LOGIC( sqlite3_mutex *pMaster; ) /* The main static mutex */
+  MUTEX_LOGIC( sqlite3_mutex *pMem; )    /* The memsys static mutex */
+  MUTEX_LOGIC( pMaster = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER); )
+  MUTEX_LOGIC( pMem = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MEM); )
+  sqlite3_mutex_enter(pMaster);
+  sqlite3_mutex_enter(pMem);
+  winMemAssertMagic();
+  if( winMemGetHeap()!=NULL && winMemGetOwned() && sqlite3_memory_used()==0 ){
+    /*
+    ** At this point, there should be no outstanding memory allocations on
+    ** the heap.  Also, since both the master and memsys locks are currently
+    ** being held by us, no other function (i.e. from another thread) should
+    ** be able to even access the heap.  Attempt to destroy and recreate our
+    ** isolated Win32 native heap now.
+    */
+    assert( winMemGetHeap()!=NULL );
+    assert( winMemGetOwned() );
+    assert( sqlite3_memory_used()==0 );
+    winMemShutdown(winMemGetDataPtr());
+    assert( winMemGetHeap()==NULL );
+    assert( !winMemGetOwned() );
+    assert( sqlite3_memory_used()==0 );
+    rc = winMemInit(winMemGetDataPtr());
+    assert( rc!=SQLITE_OK || winMemGetHeap()!=NULL );
+    assert( rc!=SQLITE_OK || winMemGetOwned() );
+    assert( rc!=SQLITE_OK || sqlite3_memory_used()==0 );
+  }else{
+    /*
+    ** The Win32 native heap cannot be modified because it may be in use.
+    */
+    rc = SQLITE_BUSY;
+  }
+  sqlite3_mutex_leave(pMem);
+  sqlite3_mutex_leave(pMaster);
+  return rc;
+}
+#endif /* SQLITE_WIN32_MALLOC */
+
 /*
 ** This function outputs the specified (ANSI) string to the Win32 debugger
 ** (if available).
@@ -31778,16 +32915,25 @@ SQLITE_API void sqlite3_win32_sleep(DWORD milliseconds){
 ** WinNT/2K/XP so that we will know whether or not we can safely call
 ** the LockFileEx() API.
 */
-#if SQLITE_OS_WINCE || SQLITE_OS_WINRT
-# define isNT()  (1)
+
+#if !defined(SQLITE_WIN32_GETVERSIONEX) || !SQLITE_WIN32_GETVERSIONEX
+# define osIsNT()  (1)
+#elif SQLITE_OS_WINCE || SQLITE_OS_WINRT || !defined(SQLITE_WIN32_HAS_ANSI)
+# define osIsNT()  (1)
 #elif !defined(SQLITE_WIN32_HAS_WIDE)
-# define isNT()  (0)
+# define osIsNT()  (0)
 #else
-  static int isNT(void){
+  static int osIsNT(void){
     if( sqlite3_os_type==0 ){
+#if defined(NTDDI_VERSION) && NTDDI_VERSION >= NTDDI_WIN8
+      OSVERSIONINFOW sInfo;
+      sInfo.dwOSVersionInfoSize = sizeof(sInfo);
+      osGetVersionExW(&sInfo);
+#else
       OSVERSIONINFOA sInfo;
       sInfo.dwOSVersionInfoSize = sizeof(sInfo);
       osGetVersionExA(&sInfo);
+#endif
       sqlite3_os_type = sInfo.dwPlatformId==VER_PLATFORM_WIN32_NT ? 2 : 1;
     }
     return sqlite3_os_type==2;
@@ -31807,12 +32953,12 @@ static void *winMemMalloc(int nBytes){
   assert( hHeap!=0 );
   assert( hHeap!=INVALID_HANDLE_VALUE );
 #if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_MALLOC_VALIDATE)
-  assert ( osHeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, NULL) );
+  assert( osHeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, NULL) );
 #endif
   assert( nBytes>=0 );
   p = osHeapAlloc(hHeap, SQLITE_WIN32_HEAP_FLAGS, (SIZE_T)nBytes);
   if( !p ){
-    sqlite3_log(SQLITE_NOMEM, "failed to HeapAlloc %u bytes (%d), heap=%p",
+    sqlite3_log(SQLITE_NOMEM, "failed to HeapAlloc %u bytes (%lu), heap=%p",
                 nBytes, osGetLastError(), (void*)hHeap);
   }
   return p;
@@ -31829,11 +32975,11 @@ static void winMemFree(void *pPrior){
   assert( hHeap!=0 );
   assert( hHeap!=INVALID_HANDLE_VALUE );
 #if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_MALLOC_VALIDATE)
-  assert ( osHeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior) );
+  assert( osHeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior) );
 #endif
   if( !pPrior ) return; /* Passing NULL to HeapFree is undefined. */
   if( !osHeapFree(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior) ){
-    sqlite3_log(SQLITE_NOMEM, "failed to HeapFree block %p (%d), heap=%p",
+    sqlite3_log(SQLITE_NOMEM, "failed to HeapFree block %p (%lu), heap=%p",
                 pPrior, osGetLastError(), (void*)hHeap);
   }
 }
@@ -31850,7 +32996,7 @@ static void *winMemRealloc(void *pPrior, int nBytes){
   assert( hHeap!=0 );
   assert( hHeap!=INVALID_HANDLE_VALUE );
 #if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_MALLOC_VALIDATE)
-  assert ( osHeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior) );
+  assert( osHeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior) );
 #endif
   assert( nBytes>=0 );
   if( !pPrior ){
@@ -31859,7 +33005,7 @@ static void *winMemRealloc(void *pPrior, int nBytes){
     p = osHeapReAlloc(hHeap, SQLITE_WIN32_HEAP_FLAGS, pPrior, (SIZE_T)nBytes);
   }
   if( !p ){
-    sqlite3_log(SQLITE_NOMEM, "failed to %s %u bytes (%d), heap=%p",
+    sqlite3_log(SQLITE_NOMEM, "failed to %s %u bytes (%lu), heap=%p",
                 pPrior ? "HeapReAlloc" : "HeapAlloc", nBytes, osGetLastError(),
                 (void*)hHeap);
   }
@@ -31878,12 +33024,12 @@ static int winMemSize(void *p){
   assert( hHeap!=0 );
   assert( hHeap!=INVALID_HANDLE_VALUE );
 #if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_MALLOC_VALIDATE)
-  assert ( osHeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, NULL) );
+  assert( osHeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, p) );
 #endif
   if( !p ) return 0;
   n = osHeapSize(hHeap, SQLITE_WIN32_HEAP_FLAGS, p);
   if( n==(SIZE_T)-1 ){
-    sqlite3_log(SQLITE_NOMEM, "failed to HeapSize block %p (%d), heap=%p",
+    sqlite3_log(SQLITE_NOMEM, "failed to HeapSize block %p (%lu), heap=%p",
                 p, osGetLastError(), (void*)hHeap);
     return 0;
   }
@@ -31904,18 +33050,25 @@ static int winMemInit(void *pAppData){
   winMemData *pWinMemData = (winMemData *)pAppData;
 
   if( !pWinMemData ) return SQLITE_ERROR;
-  assert( pWinMemData->magic==WINMEM_MAGIC );
+  assert( pWinMemData->magic1==WINMEM_MAGIC1 );
+  assert( pWinMemData->magic2==WINMEM_MAGIC2 );
 
 #if !SQLITE_OS_WINRT && SQLITE_WIN32_HEAP_CREATE
   if( !pWinMemData->hHeap ){
+    DWORD dwInitialSize = SQLITE_WIN32_HEAP_INIT_SIZE;
+    DWORD dwMaximumSize = (DWORD)sqlite3GlobalConfig.nHeap;
+    if( dwMaximumSize==0 ){
+      dwMaximumSize = SQLITE_WIN32_HEAP_MAX_SIZE;
+    }else if( dwInitialSize>dwMaximumSize ){
+      dwInitialSize = dwMaximumSize;
+    }
     pWinMemData->hHeap = osHeapCreate(SQLITE_WIN32_HEAP_FLAGS,
-                                      SQLITE_WIN32_HEAP_INIT_SIZE,
-                                      SQLITE_WIN32_HEAP_MAX_SIZE);
+                                      dwInitialSize, dwMaximumSize);
     if( !pWinMemData->hHeap ){
       sqlite3_log(SQLITE_NOMEM,
-          "failed to HeapCreate (%d), flags=%u, initSize=%u, maxSize=%u",
-          osGetLastError(), SQLITE_WIN32_HEAP_FLAGS,
-          SQLITE_WIN32_HEAP_INIT_SIZE, SQLITE_WIN32_HEAP_MAX_SIZE);
+          "failed to HeapCreate (%lu), flags=%u, initSize=%lu, maxSize=%lu",
+          osGetLastError(), SQLITE_WIN32_HEAP_FLAGS, dwInitialSize,
+          dwMaximumSize);
       return SQLITE_NOMEM;
     }
     pWinMemData->bOwned = TRUE;
@@ -31925,7 +33078,7 @@ static int winMemInit(void *pAppData){
   pWinMemData->hHeap = osGetProcessHeap();
   if( !pWinMemData->hHeap ){
     sqlite3_log(SQLITE_NOMEM,
-        "failed to GetProcessHeap (%d)", osGetLastError());
+        "failed to GetProcessHeap (%lu)", osGetLastError());
     return SQLITE_NOMEM;
   }
   pWinMemData->bOwned = FALSE;
@@ -31946,6 +33099,9 @@ static void winMemShutdown(void *pAppData){
   winMemData *pWinMemData = (winMemData *)pAppData;
 
   if( !pWinMemData ) return;
+  assert( pWinMemData->magic1==WINMEM_MAGIC1 );
+  assert( pWinMemData->magic2==WINMEM_MAGIC2 );
+
   if( pWinMemData->hHeap ){
     assert( pWinMemData->hHeap!=INVALID_HANDLE_VALUE );
 #if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_MALLOC_VALIDATE)
@@ -31953,7 +33109,7 @@ static void winMemShutdown(void *pAppData){
 #endif
     if( pWinMemData->bOwned ){
       if( !osHeapDestroy(pWinMemData->hHeap) ){
-        sqlite3_log(SQLITE_NOMEM, "failed to HeapDestroy (%d), heap=%p",
+        sqlite3_log(SQLITE_NOMEM, "failed to HeapDestroy (%lu), heap=%p",
                     osGetLastError(), (void*)pWinMemData->hHeap);
       }
       pWinMemData->bOwned = FALSE;
@@ -31994,7 +33150,7 @@ SQLITE_PRIVATE void sqlite3MemSetDefault(void){
 **
 ** Space to hold the returned string is obtained from malloc.
 */
-static LPWSTR utf8ToUnicode(const char *zFilename){
+static LPWSTR winUtf8ToUnicode(const char *zFilename){
   int nChar;
   LPWSTR zWideFilename;
 
@@ -32019,7 +33175,7 @@ static LPWSTR utf8ToUnicode(const char *zFilename){
 ** Convert Microsoft Unicode to UTF-8.  Space to hold the returned string is
 ** obtained from sqlite3_malloc().
 */
-static char *unicodeToUtf8(LPCWSTR zWideFilename){
+static char *winUnicodeToUtf8(LPCWSTR zWideFilename){
   int nByte;
   char *zFilename;
 
@@ -32047,7 +33203,7 @@ static char *unicodeToUtf8(LPCWSTR zWideFilename){
 ** Space to hold the returned string is obtained
 ** from sqlite3_malloc.
 */
-static LPWSTR mbcsToUnicode(const char *zFilename){
+static LPWSTR winMbcsToUnicode(const char *zFilename){
   int nByte;
   LPWSTR zMbcsFilename;
   int codepage = osAreFileApisANSI() ? CP_ACP : CP_OEMCP;
@@ -32077,7 +33233,7 @@ static LPWSTR mbcsToUnicode(const char *zFilename){
 ** Space to hold the returned string is obtained from
 ** sqlite3_malloc().
 */
-static char *unicodeToMbcs(LPCWSTR zWideFilename){
+static char *winUnicodeToMbcs(LPCWSTR zWideFilename){
   int nByte;
   char *zFilename;
   int codepage = osAreFileApisANSI() ? CP_ACP : CP_OEMCP;
@@ -32107,11 +33263,11 @@ SQLITE_API char *sqlite3_win32_mbcs_to_utf8(const char *zFilename){
   char *zFilenameUtf8;
   LPWSTR zTmpWide;
 
-  zTmpWide = mbcsToUnicode(zFilename);
+  zTmpWide = winMbcsToUnicode(zFilename);
   if( zTmpWide==0 ){
     return 0;
   }
-  zFilenameUtf8 = unicodeToUtf8(zTmpWide);
+  zFilenameUtf8 = winUnicodeToUtf8(zTmpWide);
   sqlite3_free(zTmpWide);
   return zFilenameUtf8;
 }
@@ -32124,11 +33280,11 @@ SQLITE_API char *sqlite3_win32_utf8_to_mbcs(const char *zFilename){
   char *zFilenameMbcs;
   LPWSTR zTmpWide;
 
-  zTmpWide = utf8ToUnicode(zFilename);
+  zTmpWide = winUtf8ToUnicode(zFilename);
   if( zTmpWide==0 ){
     return 0;
   }
-  zFilenameMbcs = unicodeToMbcs(zTmpWide);
+  zFilenameMbcs = winUnicodeToMbcs(zTmpWide);
   sqlite3_free(zTmpWide);
   return zFilenameMbcs;
 }
@@ -32158,7 +33314,7 @@ SQLITE_API int sqlite3_win32_set_directory(DWORD type, LPCWSTR zValue){
   if( ppDirectory ){
     char *zValueUtf8 = 0;
     if( zValue && zValue[0] ){
-      zValueUtf8 = unicodeToUtf8(zValue);
+      zValueUtf8 = winUnicodeToUtf8(zValue);
       if ( zValueUtf8==0 ){
         return SQLITE_NOMEM;
       }
@@ -32171,11 +33327,11 @@ SQLITE_API int sqlite3_win32_set_directory(DWORD type, LPCWSTR zValue){
 }
 
 /*
-** The return value of getLastErrorMsg
+** The return value of winGetLastErrorMsg
 ** is zero if the error message fits in the buffer, or non-zero
 ** otherwise (if the message was truncated).
 */
-static int getLastErrorMsg(DWORD lastErrno, int nBuf, char *zBuf){
+static int winGetLastErrorMsg(DWORD lastErrno, int nBuf, char *zBuf){
   /* FormatMessage returns 0 on failure.  Otherwise it
   ** returns the number of TCHARs written to the output
   ** buffer, excluding the terminating null char.
@@ -32183,16 +33339,16 @@ static int getLastErrorMsg(DWORD lastErrno, int nBuf, char *zBuf){
   DWORD dwLen = 0;
   char *zOut = 0;
 
-  if( isNT() ){
+  if( osIsNT() ){
 #if SQLITE_OS_WINRT
-    WCHAR zTempWide[MAX_PATH+1]; /* NOTE: Somewhat arbitrary. */
+    WCHAR zTempWide[SQLITE_WIN32_MAX_ERRMSG_CHARS+1];
     dwLen = osFormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM |
                              FORMAT_MESSAGE_IGNORE_INSERTS,
                              NULL,
                              lastErrno,
                              0,
                              zTempWide,
-                             MAX_PATH,
+                             SQLITE_WIN32_MAX_ERRMSG_CHARS,
                              0);
 #else
     LPWSTR zTempWide = NULL;
@@ -32209,7 +33365,7 @@ static int getLastErrorMsg(DWORD lastErrno, int nBuf, char *zBuf){
     if( dwLen > 0 ){
       /* allocate a buffer and convert to UTF8 */
       sqlite3BeginBenignMalloc();
-      zOut = unicodeToUtf8(zTempWide);
+      zOut = winUnicodeToUtf8(zTempWide);
       sqlite3EndBenignMalloc();
 #if !SQLITE_OS_WINRT
       /* free the system buffer allocated by FormatMessage */
@@ -32277,7 +33433,7 @@ static int winLogErrorAtLine(
   int i;                          /* Loop counter */
 
   zMsg[0] = 0;
-  getLastErrorMsg(lastErrno, sizeof(zMsg), zMsg);
+  winGetLastErrorMsg(lastErrno, sizeof(zMsg), zMsg);
   assert( errcode!=SQLITE_OK );
   if( zPath==0 ) zPath = "";
   for(i=0; zMsg[i] && zMsg[i]!='\r' && zMsg[i]!='\n'; i++){}
@@ -32302,29 +33458,60 @@ static int winLogErrorAtLine(
 #ifndef SQLITE_WIN32_IOERR_RETRY_DELAY
 # define SQLITE_WIN32_IOERR_RETRY_DELAY 25
 #endif
-static int win32IoerrRetry = SQLITE_WIN32_IOERR_RETRY;
-static int win32IoerrRetryDelay = SQLITE_WIN32_IOERR_RETRY_DELAY;
+static int winIoerrRetry = SQLITE_WIN32_IOERR_RETRY;
+static int winIoerrRetryDelay = SQLITE_WIN32_IOERR_RETRY_DELAY;
+
+/*
+** The "winIoerrCanRetry1" macro is used to determine if a particular I/O
+** error code obtained via GetLastError() is eligible to be retried.  It
+** must accept the error code DWORD as its only argument and should return
+** non-zero if the error code is transient in nature and the operation
+** responsible for generating the original error might succeed upon being
+** retried.  The argument to this macro should be a variable.
+**
+** Additionally, a macro named "winIoerrCanRetry2" may be defined.  If it
+** is defined, it will be consulted only when the macro "winIoerrCanRetry1"
+** returns zero.  The "winIoerrCanRetry2" macro is completely optional and
+** may be used to include additional error codes in the set that should
+** result in the failing I/O operation being retried by the caller.  If
+** defined, the "winIoerrCanRetry2" macro must exhibit external semantics
+** identical to those of the "winIoerrCanRetry1" macro.
+*/
+#if !defined(winIoerrCanRetry1)
+#define winIoerrCanRetry1(a) (((a)==ERROR_ACCESS_DENIED)        || \
+                              ((a)==ERROR_SHARING_VIOLATION)    || \
+                              ((a)==ERROR_LOCK_VIOLATION)       || \
+                              ((a)==ERROR_DEV_NOT_EXIST)        || \
+                              ((a)==ERROR_NETNAME_DELETED)      || \
+                              ((a)==ERROR_SEM_TIMEOUT)          || \
+                              ((a)==ERROR_NETWORK_UNREACHABLE))
+#endif
 
 /*
 ** If a ReadFile() or WriteFile() error occurs, invoke this routine
 ** to see if it should be retried.  Return TRUE to retry.  Return FALSE
 ** to give up with an error.
 */
-static int retryIoerr(int *pnRetry, DWORD *pError){
+static int winRetryIoerr(int *pnRetry, DWORD *pError){
   DWORD e = osGetLastError();
-  if( *pnRetry>=win32IoerrRetry ){
+  if( *pnRetry>=winIoerrRetry ){
     if( pError ){
       *pError = e;
     }
     return 0;
   }
-  if( e==ERROR_ACCESS_DENIED ||
-      e==ERROR_LOCK_VIOLATION ||
-      e==ERROR_SHARING_VIOLATION ){
-    sqlite3_win32_sleep(win32IoerrRetryDelay*(1+*pnRetry));
+  if( winIoerrCanRetry1(e) ){
+    sqlite3_win32_sleep(winIoerrRetryDelay*(1+*pnRetry));
     ++*pnRetry;
     return 1;
   }
+#if defined(winIoerrCanRetry2)
+  else if( winIoerrCanRetry2(e) ){
+    sqlite3_win32_sleep(winIoerrRetryDelay*(1+*pnRetry));
+    ++*pnRetry;
+    return 1;
+  }
+#endif
   if( pError ){
     *pError = e;
   }
@@ -32334,11 +33521,11 @@ static int retryIoerr(int *pnRetry, DWORD *pError){
 /*
 ** Log a I/O error retry episode.
 */
-static void logIoerr(int nRetry){
+static void winLogIoerr(int nRetry){
   if( nRetry ){
     sqlite3_log(SQLITE_IOERR, 
       "delayed %dms for lock/sharing conflict",
-      win32IoerrRetryDelay*nRetry*(nRetry+1)/2
+      winIoerrRetryDelay*nRetry*(nRetry+1)/2
     );
   }
 }
@@ -32403,7 +33590,7 @@ static int winceCreateLock(const char *zFilename, winFile *pFile){
   BOOL bLogged = FALSE;
   BOOL bInit = TRUE;
 
-  zName = utf8ToUnicode(zFilename);
+  zName = winUtf8ToUnicode(zFilename);
   if( zName==0 ){
     /* out of memory */
     return SQLITE_IOERR_NOMEM;
@@ -32423,10 +33610,9 @@ static int winceCreateLock(const char *zFilename, winFile *pFile){
   pFile->hMutex = osCreateMutexW(NULL, FALSE, zName);
   if (!pFile->hMutex){
     pFile->lastErrno = osGetLastError();
-    winLogError(SQLITE_IOERR, pFile->lastErrno,
-                "winceCreateLock1", zFilename);
     sqlite3_free(zName);
-    return SQLITE_IOERR;
+    return winLogError(SQLITE_IOERR, pFile->lastErrno,
+                       "winceCreateLock1", zFilename);
   }
 
   /* Acquire the mutex before continuing */
@@ -32676,7 +33862,7 @@ static BOOL winLockFile(
   return winceLockFile(phFile, offsetLow, offsetHigh,
                        numBytesLow, numBytesHigh);
 #else
-  if( isNT() ){
+  if( osIsNT() ){
     OVERLAPPED ovlp;
     memset(&ovlp, 0, sizeof(OVERLAPPED));
     ovlp.Offset = offsetLow;
@@ -32707,7 +33893,7 @@ static BOOL winUnlockFile(
   return winceUnlockFile(phFile, offsetLow, offsetHigh,
                          numBytesLow, numBytesHigh);
 #else
-  if( isNT() ){
+  if( osIsNT() ){
     OVERLAPPED ovlp;
     memset(&ovlp, 0, sizeof(OVERLAPPED));
     ovlp.Offset = offsetLow;
@@ -32737,7 +33923,7 @@ static BOOL winUnlockFile(
 ** argument to offset iOffset within the file. If successful, return 0. 
 ** Otherwise, set pFile->lastErrno and return non-zero.
 */
-static int seekWinFile(winFile *pFile, sqlite3_int64 iOffset){
+static int winSeekFile(winFile *pFile, sqlite3_int64 iOffset){
 #if !SQLITE_OS_WINRT
   LONG upperBits;                 /* Most sig. 32 bits of new offset */
   LONG lowerBits;                 /* Least sig. 32 bits of new offset */
@@ -32762,7 +33948,7 @@ static int seekWinFile(winFile *pFile, sqlite3_int64 iOffset){
       && ((lastErrno = osGetLastError())!=NO_ERROR)) ){
     pFile->lastErrno = lastErrno;
     winLogError(SQLITE_IOERR_SEEK, pFile->lastErrno,
-             "seekWinFile", pFile->zPath);
+                "winSeekFile", pFile->zPath);
     OSTRACE(("SEEK file=%p, rc=SQLITE_IOERR_SEEK\n", pFile->h));
     return 1;
   }
@@ -32783,7 +33969,7 @@ static int seekWinFile(winFile *pFile, sqlite3_int64 iOffset){
   if(!bRet){
     pFile->lastErrno = osGetLastError();
     winLogError(SQLITE_IOERR_SEEK, pFile->lastErrno,
-             "seekWinFile", pFile->zPath);
+                "winSeekFile", pFile->zPath);
     OSTRACE(("SEEK file=%p, rc=SQLITE_IOERR_SEEK\n", pFile->h));
     return 1;
   }
@@ -32794,7 +33980,8 @@ static int seekWinFile(winFile *pFile, sqlite3_int64 iOffset){
 }
 
 #if SQLITE_MAX_MMAP_SIZE>0
-/* Forward references to VFS methods */
+/* Forward references to VFS helper methods used for memory mapped files */
+static int winMapfile(winFile*, sqlite3_int64);
 static int winUnmapfile(winFile*);
 #endif
 
@@ -32821,8 +34008,7 @@ static int winClose(sqlite3_file *id){
   OSTRACE(("CLOSE file=%p\n", pFile->h));
 
 #if SQLITE_MAX_MMAP_SIZE>0
-  rc = winUnmapfile(pFile);
-  if( rc!=SQLITE_OK ) return rc;
+  winUnmapfile(pFile);
 #endif
 
   do{
@@ -32898,7 +34084,7 @@ static int winRead(
 #endif
 
 #if SQLITE_OS_WINCE
-  if( seekWinFile(pFile, offset) ){
+  if( winSeekFile(pFile, offset) ){
     OSTRACE(("READ file=%p, rc=SQLITE_FULL\n", pFile->h));
     return SQLITE_FULL;
   }
@@ -32911,13 +34097,13 @@ static int winRead(
          osGetLastError()!=ERROR_HANDLE_EOF ){
 #endif
     DWORD lastErrno;
-    if( retryIoerr(&nRetry, &lastErrno) ) continue;
+    if( winRetryIoerr(&nRetry, &lastErrno) ) continue;
     pFile->lastErrno = lastErrno;
     OSTRACE(("READ file=%p, rc=SQLITE_IOERR_READ\n", pFile->h));
     return winLogError(SQLITE_IOERR_READ, pFile->lastErrno,
-             "winRead", pFile->zPath);
+                       "winRead", pFile->zPath);
   }
-  logIoerr(nRetry);
+  winLogIoerr(nRetry);
   if( nRead<(DWORD)amt ){
     /* Unread parts of the buffer must be zero-filled */
     memset(&((char*)pBuf)[nRead], 0, amt-nRead);
@@ -32970,7 +34156,7 @@ static int winWrite(
 #endif
 
 #if SQLITE_OS_WINCE
-  rc = seekWinFile(pFile, offset);
+  rc = winSeekFile(pFile, offset);
   if( rc==0 ){
 #else
   {
@@ -32995,7 +34181,7 @@ static int winWrite(
 #else
       if( !osWriteFile(pFile->h, aRem, nRem, &nWrite, &overlapped) ){
 #endif
-        if( retryIoerr(&nRetry, &lastErrno) ) continue;
+        if( winRetryIoerr(&nRetry, &lastErrno) ) continue;
         break;
       }
       assert( nWrite==0 || nWrite<=(DWORD)nRem );
@@ -33021,13 +34207,14 @@ static int winWrite(
     if(   ( pFile->lastErrno==ERROR_HANDLE_DISK_FULL )
        || ( pFile->lastErrno==ERROR_DISK_FULL )){
       OSTRACE(("WRITE file=%p, rc=SQLITE_FULL\n", pFile->h));
-      return SQLITE_FULL;
+      return winLogError(SQLITE_FULL, pFile->lastErrno,
+                         "winWrite1", pFile->zPath);
     }
     OSTRACE(("WRITE file=%p, rc=SQLITE_IOERR_WRITE\n", pFile->h));
     return winLogError(SQLITE_IOERR_WRITE, pFile->lastErrno,
-             "winWrite", pFile->zPath);
+                       "winWrite2", pFile->zPath);
   }else{
-    logIoerr(nRetry);
+    winLogIoerr(nRetry);
   }
   OSTRACE(("WRITE file=%p, rc=SQLITE_OK\n", pFile->h));
   return SQLITE_OK;
@@ -33056,7 +34243,7 @@ static int winTruncate(sqlite3_file *id, sqlite3_int64 nByte){
   }
 
   /* SetEndOfFile() returns non-zero when successful, or zero when it fails. */
-  if( seekWinFile(pFile, nByte) ){
+  if( winSeekFile(pFile, nByte) ){
     rc = winLogError(SQLITE_IOERR_TRUNCATE, pFile->lastErrno,
                      "winTruncate1", pFile->zPath);
   }else if( 0==osSetEndOfFile(pFile->h) &&
@@ -33137,6 +34324,7 @@ static int winSync(sqlite3_file *id, int flags){
   ** no-op
   */
 #ifdef SQLITE_NO_SYNC
+  OSTRACE(("SYNC-NOP file=%p, rc=SQLITE_OK\n", pFile->h));
   return SQLITE_OK;
 #else
   rc = osFlushFileBuffers(pFile->h);
@@ -33148,7 +34336,7 @@ static int winSync(sqlite3_file *id, int flags){
     pFile->lastErrno = osGetLastError();
     OSTRACE(("SYNC file=%p, rc=SQLITE_IOERR_FSYNC\n", pFile->h));
     return winLogError(SQLITE_IOERR_FSYNC, pFile->lastErrno,
-             "winSync", pFile->zPath);
+                       "winSync", pFile->zPath);
   }
 #endif
 }
@@ -33189,7 +34377,7 @@ static int winFileSize(sqlite3_file *id, sqlite3_int64 *pSize){
        && ((lastErrno = osGetLastError())!=NO_ERROR) ){
       pFile->lastErrno = lastErrno;
       rc = winLogError(SQLITE_IOERR_FSTAT, pFile->lastErrno,
-             "winFileSize", pFile->zPath);
+                       "winFileSize", pFile->zPath);
     }
   }
 #endif
@@ -33234,10 +34422,10 @@ static int winFileSize(sqlite3_file *id, sqlite3_int64 *pSize){
 ** Different API routines are called depending on whether or not this
 ** is Win9x or WinNT.
 */
-static int getReadLock(winFile *pFile){
+static int winGetReadLock(winFile *pFile){
   int res;
   OSTRACE(("READ-LOCK file=%p, lock=%d\n", pFile->h, pFile->locktype));
-  if( isNT() ){
+  if( osIsNT() ){
 #if SQLITE_OS_WINCE
     /*
     ** NOTE: Windows CE is handled differently here due its lack of the Win32
@@ -33262,18 +34450,18 @@ static int getReadLock(winFile *pFile){
     pFile->lastErrno = osGetLastError();
     /* No need to log a failure to lock */
   }
-  OSTRACE(("READ-LOCK file=%p, rc=%s\n", pFile->h, sqlite3ErrName(res)));
+  OSTRACE(("READ-LOCK file=%p, result=%d\n", pFile->h, res));
   return res;
 }
 
 /*
 ** Undo a readlock
 */
-static int unlockReadLock(winFile *pFile){
+static int winUnlockReadLock(winFile *pFile){
   int res;
   DWORD lastErrno;
   OSTRACE(("READ-UNLOCK file=%p, lock=%d\n", pFile->h, pFile->locktype));
-  if( isNT() ){
+  if( osIsNT() ){
     res = winUnlockFile(&pFile->h, SHARED_FIRST, 0, SHARED_SIZE, 0);
   }
 #ifdef SQLITE_WIN32_HAS_ANSI
@@ -33284,9 +34472,9 @@ static int unlockReadLock(winFile *pFile){
   if( res==0 && ((lastErrno = osGetLastError())!=ERROR_NOT_LOCKED) ){
     pFile->lastErrno = lastErrno;
     winLogError(SQLITE_IOERR_UNLOCK, pFile->lastErrno,
-             "unlockReadLock", pFile->zPath);
+                "winUnlockReadLock", pFile->zPath);
   }
-  OSTRACE(("READ-UNLOCK file=%p, rc=%s\n", pFile->h, sqlite3ErrName(res)));
+  OSTRACE(("READ-UNLOCK file=%p, result=%d\n", pFile->h, res));
   return res;
 }
 
@@ -33361,8 +34549,16 @@ static int winLock(sqlite3_file *id, int locktype){
       ** If you are using this code as a model for alternative VFSes, do not
       ** copy this retry logic.  It is a hack intended for Windows only.
       */
-      OSTRACE(("LOCK-PENDING-FAIL file=%p, count=%d, rc=%s\n",
-               pFile->h, cnt, sqlite3ErrName(res)));
+      lastErrno = osGetLastError();
+      OSTRACE(("LOCK-PENDING-FAIL file=%p, count=%d, result=%d\n",
+               pFile->h, cnt, res));
+      if( lastErrno==ERROR_INVALID_HANDLE ){
+        pFile->lastErrno = lastErrno;
+        rc = SQLITE_IOERR_LOCK;
+        OSTRACE(("LOCK-FAIL file=%p, count=%d, rc=%s\n",
+                 pFile->h, cnt, sqlite3ErrName(rc)));
+        return rc;
+      }
       if( cnt ) sqlite3_win32_sleep(1);
     }
     gotPendingLock = res;
@@ -33375,7 +34571,7 @@ static int winLock(sqlite3_file *id, int locktype){
   */
   if( locktype==SHARED_LOCK && res ){
     assert( pFile->locktype==NO_LOCK );
-    res = getReadLock(pFile);
+    res = winGetReadLock(pFile);
     if( res ){
       newLocktype = SHARED_LOCK;
     }else{
@@ -33406,14 +34602,14 @@ static int winLock(sqlite3_file *id, int locktype){
   */
   if( locktype==EXCLUSIVE_LOCK && res ){
     assert( pFile->locktype>=SHARED_LOCK );
-    res = unlockReadLock(pFile);
+    res = winUnlockReadLock(pFile);
     res = winLockFile(&pFile->h, SQLITE_LOCKFILE_FLAGS, SHARED_FIRST, 0,
                       SHARED_SIZE, 0);
     if( res ){
       newLocktype = EXCLUSIVE_LOCK;
     }else{
       lastErrno = osGetLastError();
-      getReadLock(pFile);
+      winGetReadLock(pFile);
     }
   }
 
@@ -33430,10 +34626,10 @@ static int winLock(sqlite3_file *id, int locktype){
   if( res ){
     rc = SQLITE_OK;
   }else{
-    OSTRACE(("LOCK-FAIL file=%p, wanted=%d, got=%d\n",
-             pFile->h, locktype, newLocktype));
     pFile->lastErrno = lastErrno;
     rc = SQLITE_BUSY;
+    OSTRACE(("LOCK-FAIL file=%p, wanted=%d, got=%d\n",
+             pFile->h, locktype, newLocktype));
   }
   pFile->locktype = (u8)newLocktype;
   OSTRACE(("LOCK file=%p, lock=%d, rc=%s\n",
@@ -33447,7 +34643,7 @@ static int winLock(sqlite3_file *id, int locktype){
 ** non-zero, otherwise zero.
 */
 static int winCheckReservedLock(sqlite3_file *id, int *pResOut){
-  int rc;
+  int res;
   winFile *pFile = (winFile*)id;
 
   SimulateIOError( return SQLITE_IOERR_CHECKRESERVEDLOCK; );
@@ -33455,17 +34651,17 @@ static int winCheckReservedLock(sqlite3_file *id, int *pResOut){
 
   assert( id!=0 );
   if( pFile->locktype>=RESERVED_LOCK ){
-    rc = 1;
-    OSTRACE(("TEST-WR-LOCK file=%p, rc=%d (local)\n", pFile->h, rc));
+    res = 1;
+    OSTRACE(("TEST-WR-LOCK file=%p, result=%d (local)\n", pFile->h, res));
   }else{
-    rc = winLockFile(&pFile->h, SQLITE_LOCKFILEEX_FLAGS,RESERVED_BYTE, 0, 1, 0);
-    if( rc ){
+    res = winLockFile(&pFile->h, SQLITE_LOCKFILEEX_FLAGS,RESERVED_BYTE, 0, 1, 0);
+    if( res ){
       winUnlockFile(&pFile->h, RESERVED_BYTE, 0, 1, 0);
     }
-    rc = !rc;
-    OSTRACE(("TEST-WR-LOCK file=%p, rc=%d (remote)\n", pFile->h, rc));
+    res = !res;
+    OSTRACE(("TEST-WR-LOCK file=%p, result=%d (remote)\n", pFile->h, res));
   }
-  *pResOut = rc;
+  *pResOut = res;
   OSTRACE(("TEST-WR-LOCK file=%p, pResOut=%p, *pResOut=%d, rc=SQLITE_OK\n",
            pFile->h, pResOut, *pResOut));
   return SQLITE_OK;
@@ -33493,18 +34689,18 @@ static int winUnlock(sqlite3_file *id, int locktype){
   type = pFile->locktype;
   if( type>=EXCLUSIVE_LOCK ){
     winUnlockFile(&pFile->h, SHARED_FIRST, 0, SHARED_SIZE, 0);
-    if( locktype==SHARED_LOCK && !getReadLock(pFile) ){
+    if( locktype==SHARED_LOCK && !winGetReadLock(pFile) ){
       /* This should never happen.  We should always be able to
       ** reacquire the read lock */
       rc = winLogError(SQLITE_IOERR_UNLOCK, osGetLastError(),
-               "winUnlock", pFile->zPath);
+                       "winUnlock", pFile->zPath);
     }
   }
   if( type>=RESERVED_LOCK ){
     winUnlockFile(&pFile->h, RESERVED_BYTE, 0, 1, 0);
   }
   if( locktype==NO_LOCK && type>=SHARED_LOCK ){
-    unlockReadLock(pFile);
+    winUnlockReadLock(pFile);
   }
   if( type>=PENDING_LOCK ){
     winUnlockFile(&pFile->h, PENDING_BYTE, 0, 1, 0);
@@ -33531,8 +34727,10 @@ static void winModeBit(winFile *pFile, unsigned char mask, int *pArg){
   }
 }
 
-/* Forward declaration */
-static int getTempname(int nBuf, char *zBuf);
+/* Forward references to VFS helper methods used for temporary files */
+static int winGetTempname(sqlite3_vfs *, char **);
+static int winIsDir(const void *);
+static BOOL winIsDriveLetterAndColon(const char *);
 
 /*
 ** Control and query of the open file handle.
@@ -33585,44 +34783,62 @@ static int winFileControl(sqlite3_file *id, int op, void *pArg){
       return SQLITE_OK;
     }
     case SQLITE_FCNTL_VFSNAME: {
-      *(char**)pArg = sqlite3_mprintf("win32");
+      *(char**)pArg = sqlite3_mprintf("%s", pFile->pVfs->zName);
       OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h));
       return SQLITE_OK;
     }
     case SQLITE_FCNTL_WIN32_AV_RETRY: {
       int *a = (int*)pArg;
       if( a[0]>0 ){
-        win32IoerrRetry = a[0];
+        winIoerrRetry = a[0];
       }else{
-        a[0] = win32IoerrRetry;
+        a[0] = winIoerrRetry;
       }
       if( a[1]>0 ){
-        win32IoerrRetryDelay = a[1];
+        winIoerrRetryDelay = a[1];
       }else{
-        a[1] = win32IoerrRetryDelay;
+        a[1] = winIoerrRetryDelay;
       }
       OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h));
       return SQLITE_OK;
     }
+#ifdef SQLITE_TEST
+    case SQLITE_FCNTL_WIN32_SET_HANDLE: {
+      LPHANDLE phFile = (LPHANDLE)pArg;
+      HANDLE hOldFile = pFile->h;
+      pFile->h = *phFile;
+      *phFile = hOldFile;
+      OSTRACE(("FCNTL oldFile=%p, newFile=%p, rc=SQLITE_OK\n",
+               hOldFile, pFile->h));
+      return SQLITE_OK;
+    }
+#endif
     case SQLITE_FCNTL_TEMPFILENAME: {
-      char *zTFile = sqlite3MallocZero( pFile->pVfs->mxPathname );
-      if( zTFile ){
-        getTempname(pFile->pVfs->mxPathname, zTFile);
+      char *zTFile = 0;
+      int rc = winGetTempname(pFile->pVfs, &zTFile);
+      if( rc==SQLITE_OK ){
         *(char**)pArg = zTFile;
       }
-      OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h));
-      return SQLITE_OK;
+      OSTRACE(("FCNTL file=%p, rc=%s\n", pFile->h, sqlite3ErrName(rc)));
+      return rc;
     }
 #if SQLITE_MAX_MMAP_SIZE>0
     case SQLITE_FCNTL_MMAP_SIZE: {
       i64 newLimit = *(i64*)pArg;
+      int rc = SQLITE_OK;
       if( newLimit>sqlite3GlobalConfig.mxMmap ){
         newLimit = sqlite3GlobalConfig.mxMmap;
       }
       *(i64*)pArg = pFile->mmapSizeMax;
-      if( newLimit>=0 ) pFile->mmapSizeMax = newLimit;
-      OSTRACE(("FCNTL file=%p, rc=SQLITE_OK\n", pFile->h));
-      return SQLITE_OK;
+      if( newLimit>=0 && newLimit!=pFile->mmapSizeMax && pFile->nFetchOut==0 ){
+        pFile->mmapSizeMax = newLimit;
+        if( pFile->mmapSize>0 ){
+          winUnmapfile(pFile);
+          rc = winMapfile(pFile, -1);
+        }
+      }
+      OSTRACE(("FCNTL file=%p, rc=%s\n", pFile->h, sqlite3ErrName(rc)));
+      return rc;
     }
 #endif
   }
@@ -33660,7 +34876,7 @@ static int winDeviceCharacteristics(sqlite3_file *id){
 ** During sqlite3_os_init() we do a GetSystemInfo()
 ** to get the granularity size.
 */
-SYSTEM_INFO winSysInfo;
+static SYSTEM_INFO winSysInfo;
 
 #ifndef SQLITE_OMIT_WAL
 
@@ -33683,7 +34899,7 @@ static void winShmEnterMutex(void){
 static void winShmLeaveMutex(void){
   sqlite3_mutex_leave(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
 }
-#ifdef SQLITE_DEBUG
+#ifndef NDEBUG
 static int winShmMutexHeld(void) {
   return sqlite3_mutex_held(sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER));
 }
@@ -33827,7 +35043,6 @@ static int winDelete(sqlite3_vfs *,const char*,int);
 static void winShmPurge(sqlite3_vfs *pVfs, int deleteFlag){
   winShmNode **pp;
   winShmNode *p;
-  BOOL bRc;
   assert( winShmMutexHeld() );
   OSTRACE(("SHM-PURGE pid=%lu, deleteFlag=%d\n",
            osGetCurrentProcessId(), deleteFlag));
@@ -33835,14 +35050,16 @@ static void winShmPurge(sqlite3_vfs *pVfs, int deleteFlag){
   while( (p = *pp)!=0 ){
     if( p->nRef==0 ){
       int i;
-      if( p->mutex ) sqlite3_mutex_free(p->mutex);
+      if( p->mutex ){ sqlite3_mutex_free(p->mutex); }
       for(i=0; i<p->nRegion; i++){
-        bRc = osUnmapViewOfFile(p->aRegion[i].pMap);
+        BOOL bRc = osUnmapViewOfFile(p->aRegion[i].pMap);
         OSTRACE(("SHM-PURGE-UNMAP pid=%lu, region=%d, rc=%s\n",
                  osGetCurrentProcessId(), i, bRc ? "ok" : "failed"));
+        UNUSED_VARIABLE_VALUE(bRc);
         bRc = osCloseHandle(p->aRegion[i].hMap);
         OSTRACE(("SHM-PURGE-CLOSE pid=%lu, region=%d, rc=%s\n",
                  osGetCurrentProcessId(), i, bRc ? "ok" : "failed"));
+        UNUSED_VARIABLE_VALUE(bRc);
       }
       if( p->hFile.h!=NULL && p->hFile.h!=INVALID_HANDLE_VALUE ){
         SimulateIOErrorBenign(1);
@@ -33937,7 +35154,7 @@ static int winOpenSharedMemory(winFile *pDbFd){
       rc = winTruncate((sqlite3_file *)&pShmNode->hFile, 0);
       if( rc!=SQLITE_OK ){
         rc = winLogError(SQLITE_IOERR_SHMOPEN, osGetLastError(),
-                 "winOpenShm", pDbFd->zPath);
+                         "winOpenShm", pDbFd->zPath);
       }
     }
     if( rc==SQLITE_OK ){
@@ -34197,7 +35414,7 @@ static int winShmMap(
     rc = winFileSize((sqlite3_file *)&pShmNode->hFile, &sz);
     if( rc!=SQLITE_OK ){
       rc = winLogError(SQLITE_IOERR_SHMSIZE, osGetLastError(),
-               "winShmMap1", pDbFd->zPath);
+                       "winShmMap1", pDbFd->zPath);
       goto shmpage_out;
     }
 
@@ -34212,7 +35429,7 @@ static int winShmMap(
       rc = winTruncate((sqlite3_file *)&pShmNode->hFile, nByte);
       if( rc!=SQLITE_OK ){
         rc = winLogError(SQLITE_IOERR_SHMSIZE, osGetLastError(),
-                 "winShmMap2", pDbFd->zPath);
+                         "winShmMap2", pDbFd->zPath);
         goto shmpage_out;
       }
     }
@@ -34266,7 +35483,7 @@ static int winShmMap(
       if( !pMap ){
         pShmNode->lastErrno = osGetLastError();
         rc = winLogError(SQLITE_IOERR_SHMMAP, pShmNode->lastErrno,
-                 "winShmMap3", pDbFd->zPath);
+                         "winShmMap3", pDbFd->zPath);
         if( hMap ) osCloseHandle(hMap);
         goto shmpage_out;
       }
@@ -34314,7 +35531,7 @@ static int winUnmapfile(winFile *pFile){
                "rc=SQLITE_IOERR_MMAP\n", osGetCurrentProcessId(), pFile,
                pFile->pMapRegion));
       return winLogError(SQLITE_IOERR_MMAP, pFile->lastErrno,
-                         "winUnmap1", pFile->zPath);
+                         "winUnmapfile1", pFile->zPath);
     }
     pFile->pMapRegion = 0;
     pFile->mmapSize = 0;
@@ -34326,7 +35543,7 @@ static int winUnmapfile(winFile *pFile){
       OSTRACE(("UNMAP-FILE pid=%lu, pFile=%p, hMap=%p, rc=SQLITE_IOERR_MMAP\n",
                osGetCurrentProcessId(), pFile, pFile->hMap));
       return winLogError(SQLITE_IOERR_MMAP, pFile->lastErrno,
-                         "winUnmap2", pFile->zPath);
+                         "winUnmapfile2", pFile->zPath);
     }
     pFile->hMap = NULL;
   }
@@ -34401,27 +35618,28 @@ static int winMapfile(winFile *pFd, sqlite3_int64 nByte){
     if( pFd->hMap==NULL ){
       pFd->lastErrno = osGetLastError();
       rc = winLogError(SQLITE_IOERR_MMAP, pFd->lastErrno,
-                       "winMapfile", pFd->zPath);
+                       "winMapfile1", pFd->zPath);
       /* Log the error, but continue normal operation using xRead/xWrite */
-      OSTRACE(("MAP-FILE-CREATE pid=%lu, pFile=%p, rc=SQLITE_IOERR_MMAP\n",
-               osGetCurrentProcessId(), pFd));
+      OSTRACE(("MAP-FILE-CREATE pid=%lu, pFile=%p, rc=%s\n",
+               osGetCurrentProcessId(), pFd, sqlite3ErrName(rc)));
       return SQLITE_OK;
     }
     assert( (nMap % winSysInfo.dwPageSize)==0 );
-#if SQLITE_OS_WINRT
-    pNew = osMapViewOfFileFromApp(pFd->hMap, flags, 0, nMap);
-#else
     assert( sizeof(SIZE_T)==sizeof(sqlite3_int64) || nMap<=0xffffffff );
+#if SQLITE_OS_WINRT
+    pNew = osMapViewOfFileFromApp(pFd->hMap, flags, 0, (SIZE_T)nMap);
+#else
     pNew = osMapViewOfFile(pFd->hMap, flags, 0, 0, (SIZE_T)nMap);
 #endif
     if( pNew==NULL ){
       osCloseHandle(pFd->hMap);
       pFd->hMap = NULL;
       pFd->lastErrno = osGetLastError();
-      winLogError(SQLITE_IOERR_MMAP, pFd->lastErrno,
-                  "winMapfile", pFd->zPath);
-      OSTRACE(("MAP-FILE-MAP pid=%lu, pFile=%p, rc=SQLITE_IOERR_MMAP\n",
-               osGetCurrentProcessId(), pFd));
+      rc = winLogError(SQLITE_IOERR_MMAP, pFd->lastErrno,
+                       "winMapfile2", pFd->zPath);
+      /* Log the error, but continue normal operation using xRead/xWrite */
+      OSTRACE(("MAP-FILE-MAP pid=%lu, pFile=%p, rc=%s\n",
+               osGetCurrentProcessId(), pFd, sqlite3ErrName(rc)));
       return SQLITE_OK;
     }
     pFd->pMapRegion = pNew;
@@ -34560,16 +35778,37 @@ static const sqlite3_io_methods winIoMethod = {
 ** sqlite3_vfs object.
 */
 
+#if defined(__CYGWIN__)
+/*
+** Convert a filename from whatever the underlying operating system
+** supports for filenames into UTF-8.  Space to hold the result is
+** obtained from malloc and must be freed by the calling function.
+*/
+static char *winConvertToUtf8Filename(const void *zFilename){
+  char *zConverted = 0;
+  if( osIsNT() ){
+    zConverted = winUnicodeToUtf8(zFilename);
+  }
+#ifdef SQLITE_WIN32_HAS_ANSI
+  else{
+    zConverted = sqlite3_win32_mbcs_to_utf8(zFilename);
+  }
+#endif
+  /* caller will handle out of memory */
+  return zConverted;
+}
+#endif
+
 /*
 ** Convert a UTF-8 filename into whatever form the underlying
 ** operating system wants filenames in.  Space to hold the result
 ** is obtained from malloc and must be freed by the calling
 ** function.
 */
-static void *convertUtf8Filename(const char *zFilename){
+static void *winConvertFromUtf8Filename(const char *zFilename){
   void *zConverted = 0;
-  if( isNT() ){
-    zConverted = utf8ToUnicode(zFilename);
+  if( osIsNT() ){
+    zConverted = winUtf8ToUnicode(zFilename);
   }
 #ifdef SQLITE_WIN32_HAS_ANSI
   else{
@@ -34581,17 +35820,39 @@ static void *convertUtf8Filename(const char *zFilename){
 }
 
 /*
-** Create a temporary file name in zBuf.  zBuf must be big enough to
-** hold at pVfs->mxPathname characters.
+** This function returns non-zero if the specified UTF-8 string buffer
+** ends with a directory separator character or one was successfully
+** added to it.
 */
-static int getTempname(int nBuf, char *zBuf){
+static int winMakeEndInDirSep(int nBuf, char *zBuf){
+  if( zBuf ){
+    int nLen = sqlite3Strlen30(zBuf);
+    if( nLen>0 ){
+      if( winIsDirSep(zBuf[nLen-1]) ){
+        return 1;
+      }else if( nLen+1<nBuf ){
+        zBuf[nLen] = winGetDirSep();
+        zBuf[nLen+1] = '\0';
+        return 1;
+      }
+    }
+  }
+  return 0;
+}
+
+/*
+** Create a temporary file name and store the resulting pointer into pzBuf.
+** The pointer returned in pzBuf must be freed via sqlite3_free().
+*/
+static int winGetTempname(sqlite3_vfs *pVfs, char **pzBuf){
   static char zChars[] =
     "abcdefghijklmnopqrstuvwxyz"
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "0123456789";
   size_t i, j;
-  int nTempPath;
-  char zTempPath[MAX_PATH+2];
+  int nPre = sqlite3Strlen30(SQLITE_TEMP_FILE_PREFIX);
+  int nMax, nBuf, nDir, nLen;
+  char *zBuf;
 
   /* It's odd to simulate an io-error here, but really this is just
   ** using the io-error infrastructure to test that SQLite handles this
@@ -34599,21 +35860,140 @@ static int getTempname(int nBuf, char *zBuf){
   */
   SimulateIOError( return SQLITE_IOERR );
 
-  memset(zTempPath, 0, MAX_PATH+2);
-
-  if( sqlite3_temp_directory ){
-    sqlite3_snprintf(MAX_PATH-30, zTempPath, "%s", sqlite3_temp_directory);
+  /* Allocate a temporary buffer to store the fully qualified file
+  ** name for the temporary file.  If this fails, we cannot continue.
+  */
+  nMax = pVfs->mxPathname; nBuf = nMax + 2;
+  zBuf = sqlite3MallocZero( nBuf );
+  if( !zBuf ){
+    OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
+    return SQLITE_IOERR_NOMEM;
   }
-#if !SQLITE_OS_WINRT
-  else if( isNT() ){
+
+  /* Figure out the effective temporary directory.  First, check if one
+  ** has been explicitly set by the application; otherwise, use the one
+  ** configured by the operating system.
+  */
+  nDir = nMax - (nPre + 15);
+  assert( nDir>0 );
+  if( sqlite3_temp_directory ){
+    int nDirLen = sqlite3Strlen30(sqlite3_temp_directory);
+    if( nDirLen>0 ){
+      if( !winIsDirSep(sqlite3_temp_directory[nDirLen-1]) ){
+        nDirLen++;
+      }
+      if( nDirLen>nDir ){
+        sqlite3_free(zBuf);
+        OSTRACE(("TEMP-FILENAME rc=SQLITE_ERROR\n"));
+        return winLogError(SQLITE_ERROR, 0, "winGetTempname1", 0);
+      }
+      sqlite3_snprintf(nMax, zBuf, "%s", sqlite3_temp_directory);
+    }
+  }
+#if defined(__CYGWIN__)
+  else{
+    static const char *azDirs[] = {
+       0, /* getenv("SQLITE_TMPDIR") */
+       0, /* getenv("TMPDIR") */
+       0, /* getenv("TMP") */
+       0, /* getenv("TEMP") */
+       0, /* getenv("USERPROFILE") */
+       "/var/tmp",
+       "/usr/tmp",
+       "/tmp",
+       ".",
+       0        /* List terminator */
+    };
+    unsigned int i;
+    const char *zDir = 0;
+
+    if( !azDirs[0] ) azDirs[0] = getenv("SQLITE_TMPDIR");
+    if( !azDirs[1] ) azDirs[1] = getenv("TMPDIR");
+    if( !azDirs[2] ) azDirs[2] = getenv("TMP");
+    if( !azDirs[3] ) azDirs[3] = getenv("TEMP");
+    if( !azDirs[4] ) azDirs[4] = getenv("USERPROFILE");
+    for(i=0; i<sizeof(azDirs)/sizeof(azDirs[0]); zDir=azDirs[i++]){
+      void *zConverted;
+      if( zDir==0 ) continue;
+      /* If the path starts with a drive letter followed by the colon
+      ** character, assume it is already a native Win32 path; otherwise,
+      ** it must be converted to a native Win32 path via the Cygwin API
+      ** prior to using it.
+      */
+      if( winIsDriveLetterAndColon(zDir) ){
+        zConverted = winConvertFromUtf8Filename(zDir);
+        if( !zConverted ){
+          sqlite3_free(zBuf);
+          OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
+          return SQLITE_IOERR_NOMEM;
+        }
+        if( winIsDir(zConverted) ){
+          sqlite3_snprintf(nMax, zBuf, "%s", zDir);
+          sqlite3_free(zConverted);
+          break;
+        }
+        sqlite3_free(zConverted);
+      }else{
+        zConverted = sqlite3MallocZero( nMax+1 );
+        if( !zConverted ){
+          sqlite3_free(zBuf);
+          OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
+          return SQLITE_IOERR_NOMEM;
+        }
+        if( cygwin_conv_path(
+                osIsNT() ? CCP_POSIX_TO_WIN_W : CCP_POSIX_TO_WIN_A, zDir,
+                zConverted, nMax+1)<0 ){
+          sqlite3_free(zConverted);
+          sqlite3_free(zBuf);
+          OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_CONVPATH\n"));
+          return winLogError(SQLITE_IOERR_CONVPATH, (DWORD)errno,
+                             "winGetTempname2", zDir);
+        }
+        if( winIsDir(zConverted) ){
+          /* At this point, we know the candidate directory exists and should
+          ** be used.  However, we may need to convert the string containing
+          ** its name into UTF-8 (i.e. if it is UTF-16 right now).
+          */
+          char *zUtf8 = winConvertToUtf8Filename(zConverted);
+          if( !zUtf8 ){
+            sqlite3_free(zConverted);
+            sqlite3_free(zBuf);
+            OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
+            return SQLITE_IOERR_NOMEM;
+          }
+          sqlite3_snprintf(nMax, zBuf, "%s", zUtf8);
+          sqlite3_free(zUtf8);
+          sqlite3_free(zConverted);
+          break;
+        }
+        sqlite3_free(zConverted);
+      }
+    }
+  }
+#elif !SQLITE_OS_WINRT && !defined(__CYGWIN__)
+  else if( osIsNT() ){
     char *zMulti;
-    WCHAR zWidePath[MAX_PATH];
-    osGetTempPathW(MAX_PATH-30, zWidePath);
-    zMulti = unicodeToUtf8(zWidePath);
+    LPWSTR zWidePath = sqlite3MallocZero( nMax*sizeof(WCHAR) );
+    if( !zWidePath ){
+      sqlite3_free(zBuf);
+      OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
+      return SQLITE_IOERR_NOMEM;
+    }
+    if( osGetTempPathW(nMax, zWidePath)==0 ){
+      sqlite3_free(zWidePath);
+      sqlite3_free(zBuf);
+      OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_GETTEMPPATH\n"));
+      return winLogError(SQLITE_IOERR_GETTEMPPATH, osGetLastError(),
+                         "winGetTempname2", 0);
+    }
+    zMulti = winUnicodeToUtf8(zWidePath);
     if( zMulti ){
-      sqlite3_snprintf(MAX_PATH-30, zTempPath, "%s", zMulti);
+      sqlite3_snprintf(nMax, zBuf, "%s", zMulti);
       sqlite3_free(zMulti);
+      sqlite3_free(zWidePath);
     }else{
+      sqlite3_free(zWidePath);
+      sqlite3_free(zBuf);
       OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
       return SQLITE_IOERR_NOMEM;
     }
@@ -34621,36 +36001,62 @@ static int getTempname(int nBuf, char *zBuf){
 #ifdef SQLITE_WIN32_HAS_ANSI
   else{
     char *zUtf8;
-    char zMbcsPath[MAX_PATH];
-    osGetTempPathA(MAX_PATH-30, zMbcsPath);
+    char *zMbcsPath = sqlite3MallocZero( nMax );
+    if( !zMbcsPath ){
+      sqlite3_free(zBuf);
+      OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
+      return SQLITE_IOERR_NOMEM;
+    }
+    if( osGetTempPathA(nMax, zMbcsPath)==0 ){
+      sqlite3_free(zBuf);
+      OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_GETTEMPPATH\n"));
+      return winLogError(SQLITE_IOERR_GETTEMPPATH, osGetLastError(),
+                         "winGetTempname3", 0);
+    }
     zUtf8 = sqlite3_win32_mbcs_to_utf8(zMbcsPath);
     if( zUtf8 ){
-      sqlite3_snprintf(MAX_PATH-30, zTempPath, "%s", zUtf8);
+      sqlite3_snprintf(nMax, zBuf, "%s", zUtf8);
       sqlite3_free(zUtf8);
     }else{
+      sqlite3_free(zBuf);
       OSTRACE(("TEMP-FILENAME rc=SQLITE_IOERR_NOMEM\n"));
       return SQLITE_IOERR_NOMEM;
     }
   }
-#endif
-#endif
+#endif /* SQLITE_WIN32_HAS_ANSI */
+#endif /* !SQLITE_OS_WINRT */
 
-  /* Check that the output buffer is large enough for the temporary file 
-  ** name. If it is not, return SQLITE_ERROR.
+  /*
+  ** Check to make sure the temporary directory ends with an appropriate
+  ** separator.  If it does not and there is not enough space left to add
+  ** one, fail.
   */
-  nTempPath = sqlite3Strlen30(zTempPath);
-
-  if( (nTempPath + sqlite3Strlen30(SQLITE_TEMP_FILE_PREFIX) + 18) >= nBuf ){
+  if( !winMakeEndInDirSep(nDir+1, zBuf) ){
+    sqlite3_free(zBuf);
     OSTRACE(("TEMP-FILENAME rc=SQLITE_ERROR\n"));
-    return SQLITE_ERROR;
+    return winLogError(SQLITE_ERROR, 0, "winGetTempname4", 0);
   }
 
-  for(i=nTempPath; i>0 && zTempPath[i-1]=='\\'; i--){}
-  zTempPath[i] = 0;
+  /*
+  ** Check that the output buffer is large enough for the temporary file 
+  ** name in the following format:
+  **
+  **   "<temporary_directory>/etilqs_XXXXXXXXXXXXXXX\0\0"
+  **
+  ** If not, return SQLITE_ERROR.  The number 17 is used here in order to
+  ** account for the space used by the 15 character random suffix and the
+  ** two trailing NUL characters.  The final directory separator character
+  ** has already added if it was not already present.
+  */
+  nLen = sqlite3Strlen30(zBuf);
+  if( (nLen + nPre + 17) > nBuf ){
+    sqlite3_free(zBuf);
+    OSTRACE(("TEMP-FILENAME rc=SQLITE_ERROR\n"));
+    return winLogError(SQLITE_ERROR, 0, "winGetTempname5", 0);
+  }
+
+  sqlite3_snprintf(nBuf-16-nLen, zBuf+nLen, SQLITE_TEMP_FILE_PREFIX);
 
-  sqlite3_snprintf(nBuf-18, zBuf, (nTempPath > 0) ?
-                       "%s\\"SQLITE_TEMP_FILE_PREFIX : SQLITE_TEMP_FILE_PREFIX,
-                   zTempPath);
   j = sqlite3Strlen30(zBuf);
   sqlite3_randomness(15, &zBuf[j]);
   for(i=0; i<15; i++, j++){
@@ -34658,6 +36064,7 @@ static int getTempname(int nBuf, char *zBuf){
   }
   zBuf[j] = 0;
   zBuf[j+1] = 0;
+  *pzBuf = zBuf;
 
   OSTRACE(("TEMP-FILENAME name=%s, rc=SQLITE_OK\n", zBuf));
   return SQLITE_OK;
@@ -34673,13 +36080,13 @@ static int winIsDir(const void *zConverted){
   int rc = 0;
   DWORD lastErrno;
 
-  if( isNT() ){
+  if( osIsNT() ){
     int cnt = 0;
     WIN32_FILE_ATTRIBUTE_DATA sAttrData;
     memset(&sAttrData, 0, sizeof(sAttrData));
     while( !(rc = osGetFileAttributesExW((LPCWSTR)zConverted,
                              GetFileExInfoStandard,
-                             &sAttrData)) && retryIoerr(&cnt, &lastErrno) ){}
+                             &sAttrData)) && winRetryIoerr(&cnt, &lastErrno) ){}
     if( !rc ){
       return 0; /* Invalid name? */
     }
@@ -34696,14 +36103,14 @@ static int winIsDir(const void *zConverted){
 ** Open a file.
 */
 static int winOpen(
-  sqlite3_vfs *pVfs,        /* Not used */
+  sqlite3_vfs *pVfs,        /* Used to get maximum path name length */
   const char *zName,        /* Name of the file (UTF-8) */
   sqlite3_file *id,         /* Write the SQLite file handle here */
   int flags,                /* Open mode flags */
   int *pOutFlags            /* Status return flags */
 ){
   HANDLE h;
-  DWORD lastErrno;
+  DWORD lastErrno = 0;
   DWORD dwDesiredAccess;
   DWORD dwShareMode;
   DWORD dwCreationDisposition;
@@ -34719,7 +36126,7 @@ static int winOpen(
   /* If argument zPath is a NULL pointer, this function is required to open
   ** a temporary file. Use this buffer to store the file name in.
   */
-  char zTmpname[MAX_PATH+2];     /* Buffer used to create temp filename */
+  char *zTmpname = 0; /* For temporary filename, if necessary. */
 
   int rc = SQLITE_OK;            /* Function Return Code */
 #if !defined(NDEBUG) || SQLITE_OS_WINCE
@@ -34774,7 +36181,7 @@ static int winOpen(
   pFile->h = INVALID_HANDLE_VALUE;
 
 #if SQLITE_OS_WINRT
-  if( !sqlite3_temp_directory ){
+  if( !zUtf8Name && !sqlite3_temp_directory ){
     sqlite3_log(SQLITE_ERROR,
         "sqlite3_temp_directory variable should be set for WinRT");
   }
@@ -34784,9 +36191,8 @@ static int winOpen(
   ** temporary file name to use 
   */
   if( !zUtf8Name ){
-    assert(isDelete && !isOpenJournal);
-    memset(zTmpname, 0, MAX_PATH+2);
-    rc = getTempname(MAX_PATH+2, zTmpname);
+    assert( isDelete && !isOpenJournal );
+    rc = winGetTempname(pVfs, &zTmpname);
     if( rc!=SQLITE_OK ){
       OSTRACE(("OPEN name=%s, rc=%s", zUtf8Name, sqlite3ErrName(rc)));
       return rc;
@@ -34799,17 +36205,19 @@ static int winOpen(
   ** sqlite3_uri_parameter().
   */
   assert( (eType!=SQLITE_OPEN_MAIN_DB) || (flags & SQLITE_OPEN_URI) ||
-        zUtf8Name[strlen(zUtf8Name)+1]==0 );
+       zUtf8Name[sqlite3Strlen30(zUtf8Name)+1]==0 );
 
   /* Convert the filename to the system encoding. */
-  zConverted = convertUtf8Filename(zUtf8Name);
+  zConverted = winConvertFromUtf8Filename(zUtf8Name);
   if( zConverted==0 ){
+    sqlite3_free(zTmpname);
     OSTRACE(("OPEN name=%s, rc=SQLITE_IOERR_NOMEM", zUtf8Name));
     return SQLITE_IOERR_NOMEM;
   }
 
   if( winIsDir(zConverted) ){
     sqlite3_free(zConverted);
+    sqlite3_free(zTmpname);
     OSTRACE(("OPEN name=%s, rc=SQLITE_CANTOPEN_ISDIR", zUtf8Name));
     return SQLITE_CANTOPEN_ISDIR;
   }
@@ -34856,7 +36264,7 @@ static int winOpen(
   dwFlagsAndAttributes |= FILE_FLAG_RANDOM_ACCESS;
 #endif
 
-  if( isNT() ){
+  if( osIsNT() ){
 #if SQLITE_OS_WINRT
     CREATEFILE2_EXTENDED_PARAMETERS extendedParameters;
     extendedParameters.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
@@ -34871,7 +36279,7 @@ static int winOpen(
                               dwShareMode,
                               dwCreationDisposition,
                               &extendedParameters))==INVALID_HANDLE_VALUE &&
-                              retryIoerr(&cnt, &lastErrno) ){
+                              winRetryIoerr(&cnt, &lastErrno) ){
                /* Noop */
     }
 #else
@@ -34881,7 +36289,7 @@ static int winOpen(
                               dwCreationDisposition,
                               dwFlagsAndAttributes,
                               NULL))==INVALID_HANDLE_VALUE &&
-                              retryIoerr(&cnt, &lastErrno) ){
+                              winRetryIoerr(&cnt, &lastErrno) ){
                /* Noop */
     }
 #endif
@@ -34894,12 +36302,12 @@ static int winOpen(
                               dwCreationDisposition,
                               dwFlagsAndAttributes,
                               NULL))==INVALID_HANDLE_VALUE &&
-                              retryIoerr(&cnt, &lastErrno) ){
+                              winRetryIoerr(&cnt, &lastErrno) ){
                /* Noop */
     }
   }
 #endif
-  logIoerr(cnt);
+  winLogIoerr(cnt);
 
   OSTRACE(("OPEN file=%p, name=%s, access=%lx, rc=%s\n", h, zUtf8Name,
            dwDesiredAccess, (h==INVALID_HANDLE_VALUE) ? "failed" : "ok"));
@@ -34908,6 +36316,7 @@ static int winOpen(
     pFile->lastErrno = lastErrno;
     winLogError(SQLITE_CANTOPEN, pFile->lastErrno, "winOpen", zUtf8Name);
     sqlite3_free(zConverted);
+    sqlite3_free(zTmpname);
     if( isReadWrite && !isExclusive ){
       return winOpen(pVfs, zName, id, 
          ((flags|SQLITE_OPEN_READONLY) &
@@ -34936,6 +36345,7 @@ static int winOpen(
   ){
     osCloseHandle(h);
     sqlite3_free(zConverted);
+    sqlite3_free(zTmpname);
     OSTRACE(("OPEN-CE-LOCK name=%s, rc=%s\n", zName, sqlite3ErrName(rc)));
     return rc;
   }
@@ -34947,6 +36357,7 @@ static int winOpen(
     sqlite3_free(zConverted);
   }
 
+  sqlite3_free(zTmpname);
   pFile->pMethod = &winIoMethod;
   pFile->pVfs = pVfs;
   pFile->h = h;
@@ -34990,7 +36401,7 @@ static int winDelete(
   int cnt = 0;
   int rc;
   DWORD attr;
-  DWORD lastErrno;
+  DWORD lastErrno = 0;
   void *zConverted;
   UNUSED_PARAMETER(pVfs);
   UNUSED_PARAMETER(syncDir);
@@ -34998,11 +36409,12 @@ static int winDelete(
   SimulateIOError(return SQLITE_IOERR_DELETE);
   OSTRACE(("DELETE name=%s, syncDir=%d\n", zFilename, syncDir));
 
-  zConverted = convertUtf8Filename(zFilename);
+  zConverted = winConvertFromUtf8Filename(zFilename);
   if( zConverted==0 ){
+    OSTRACE(("DELETE name=%s, rc=SQLITE_IOERR_NOMEM\n", zFilename));
     return SQLITE_IOERR_NOMEM;
   }
-  if( isNT() ){
+  if( osIsNT() ){
     do {
 #if SQLITE_OS_WINRT
       WIN32_FILE_ATTRIBUTE_DATA sAttrData;
@@ -35041,7 +36453,7 @@ static int winDelete(
         rc = SQLITE_OK; /* Deleted OK. */
         break;
       }
-      if ( !retryIoerr(&cnt, &lastErrno) ){
+      if ( !winRetryIoerr(&cnt, &lastErrno) ){
         rc = SQLITE_ERROR; /* No more retries. */
         break;
       }
@@ -35069,7 +36481,7 @@ static int winDelete(
         rc = SQLITE_OK; /* Deleted OK. */
         break;
       }
-      if ( !retryIoerr(&cnt, &lastErrno) ){
+      if ( !winRetryIoerr(&cnt, &lastErrno) ){
         rc = SQLITE_ERROR; /* No more retries. */
         break;
       }
@@ -35077,10 +36489,9 @@ static int winDelete(
   }
 #endif
   if( rc && rc!=SQLITE_IOERR_DELETE_NOENT ){
-    rc = winLogError(SQLITE_IOERR_DELETE, lastErrno,
-             "winDelete", zFilename);
+    rc = winLogError(SQLITE_IOERR_DELETE, lastErrno, "winDelete", zFilename);
   }else{
-    logIoerr(cnt);
+    winLogIoerr(cnt);
   }
   sqlite3_free(zConverted);
   OSTRACE(("DELETE name=%s, rc=%s\n", zFilename, sqlite3ErrName(rc)));
@@ -35098,7 +36509,7 @@ static int winAccess(
 ){
   DWORD attr;
   int rc = 0;
-  DWORD lastErrno;
+  DWORD lastErrno = 0;
   void *zConverted;
   UNUSED_PARAMETER(pVfs);
 
@@ -35106,18 +36517,18 @@ static int winAccess(
   OSTRACE(("ACCESS name=%s, flags=%x, pResOut=%p\n",
            zFilename, flags, pResOut));
 
-  zConverted = convertUtf8Filename(zFilename);
+  zConverted = winConvertFromUtf8Filename(zFilename);
   if( zConverted==0 ){
     OSTRACE(("ACCESS name=%s, rc=SQLITE_IOERR_NOMEM\n", zFilename));
     return SQLITE_IOERR_NOMEM;
   }
-  if( isNT() ){
+  if( osIsNT() ){
     int cnt = 0;
     WIN32_FILE_ATTRIBUTE_DATA sAttrData;
     memset(&sAttrData, 0, sizeof(sAttrData));
     while( !(rc = osGetFileAttributesExW((LPCWSTR)zConverted,
                              GetFileExInfoStandard, 
-                             &sAttrData)) && retryIoerr(&cnt, &lastErrno) ){}
+                             &sAttrData)) && winRetryIoerr(&cnt, &lastErrno) ){}
     if( rc ){
       /* For an SQLITE_ACCESS_EXISTS query, treat a zero-length file
       ** as if it does not exist.
@@ -35130,11 +36541,11 @@ static int winAccess(
         attr = sAttrData.dwFileAttributes;
       }
     }else{
-      logIoerr(cnt);
+      winLogIoerr(cnt);
       if( lastErrno!=ERROR_FILE_NOT_FOUND && lastErrno!=ERROR_PATH_NOT_FOUND ){
-        winLogError(SQLITE_IOERR_ACCESS, lastErrno, "winAccess", zFilename);
         sqlite3_free(zConverted);
-        return SQLITE_IOERR_ACCESS;
+        return winLogError(SQLITE_IOERR_ACCESS, lastErrno, "winAccess",
+                           zFilename);
       }else{
         attr = INVALID_FILE_ATTRIBUTES;
       }
@@ -35164,6 +36575,15 @@ static int winAccess(
   return SQLITE_OK;
 }
 
+/*
+** Returns non-zero if the specified path name starts with a drive letter
+** followed by a colon character.
+*/
+static BOOL winIsDriveLetterAndColon(
+  const char *zPathname
+){
+  return ( sqlite3Isalpha(zPathname[0]) && zPathname[1]==':' );
+}
 
 /*
 ** Returns non-zero if the specified path name should be used verbatim.  If
@@ -35181,7 +36601,7 @@ static BOOL winIsVerbatimPathname(
   ** the final two cases; therefore, we return the safer return value of TRUE
   ** so that callers of this function will simply use it verbatim.
   */
-  if ( zPathname[0]=='/' || zPathname[0]=='\\' ){
+  if ( winIsDirSep(zPathname[0]) ){
     return TRUE;
   }
 
@@ -35191,7 +36611,7 @@ static BOOL winIsVerbatimPathname(
   ** attempt to treat it as a relative path name (i.e. they should simply use
   ** it verbatim).
   */
-  if ( sqlite3Isalpha(zPathname[0]) && zPathname[1]==':' ){
+  if ( winIsDriveLetterAndColon(zPathname) ){
     return TRUE;
   }
 
@@ -35217,7 +36637,6 @@ static int winFullPathname(
 #if defined(__CYGWIN__)
   SimulateIOError( return SQLITE_ERROR );
   UNUSED_PARAMETER(nFull);
-  assert( pVfs->mxPathname>=MAX_PATH );
   assert( nFull>=pVfs->mxPathname );
   if ( sqlite3_data_directory && !winIsVerbatimPathname(zRelative) ){
     /*
@@ -35226,14 +36645,48 @@ static int winFullPathname(
     **       for converting the relative path name to an absolute
     **       one by prepending the data directory and a slash.
     */
-    char zOut[MAX_PATH+1];
-    memset(zOut, 0, MAX_PATH+1);
-    cygwin_conv_path(CCP_POSIX_TO_WIN_A|CCP_RELATIVE, zRelative, zOut,
-                     MAX_PATH+1);
-    sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s\\%s",
-                     sqlite3_data_directory, zOut);
+    char *zOut = sqlite3MallocZero( pVfs->mxPathname+1 );
+    if( !zOut ){
+      return SQLITE_IOERR_NOMEM;
+    }
+    if( cygwin_conv_path(
+            (osIsNT() ? CCP_POSIX_TO_WIN_W : CCP_POSIX_TO_WIN_A) |
+            CCP_RELATIVE, zRelative, zOut, pVfs->mxPathname+1)<0 ){
+      sqlite3_free(zOut);
+      return winLogError(SQLITE_CANTOPEN_CONVPATH, (DWORD)errno,
+                         "winFullPathname1", zRelative);
+    }else{
+      char *zUtf8 = winConvertToUtf8Filename(zOut);
+      if( !zUtf8 ){
+        sqlite3_free(zOut);
+        return SQLITE_IOERR_NOMEM;
+      }
+      sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%c%s",
+                       sqlite3_data_directory, winGetDirSep(), zUtf8);
+      sqlite3_free(zUtf8);
+      sqlite3_free(zOut);
+    }
   }else{
-    cygwin_conv_path(CCP_POSIX_TO_WIN_A, zRelative, zFull, nFull);
+    char *zOut = sqlite3MallocZero( pVfs->mxPathname+1 );
+    if( !zOut ){
+      return SQLITE_IOERR_NOMEM;
+    }
+    if( cygwin_conv_path(
+            (osIsNT() ? CCP_POSIX_TO_WIN_W : CCP_POSIX_TO_WIN_A),
+            zRelative, zOut, pVfs->mxPathname+1)<0 ){
+      sqlite3_free(zOut);
+      return winLogError(SQLITE_CANTOPEN_CONVPATH, (DWORD)errno,
+                         "winFullPathname2", zRelative);
+    }else{
+      char *zUtf8 = winConvertToUtf8Filename(zOut);
+      if( !zUtf8 ){
+        sqlite3_free(zOut);
+        return SQLITE_IOERR_NOMEM;
+      }
+      sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s", zUtf8);
+      sqlite3_free(zUtf8);
+      sqlite3_free(zOut);
+    }
   }
   return SQLITE_OK;
 #endif
@@ -35249,8 +36702,8 @@ static int winFullPathname(
     **       for converting the relative path name to an absolute
     **       one by prepending the data directory and a backslash.
     */
-    sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s\\%s",
-                     sqlite3_data_directory, zRelative);
+    sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%c%s",
+                     sqlite3_data_directory, winGetDirSep(), zRelative);
   }else{
     sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s", zRelative);
   }
@@ -35265,7 +36718,7 @@ static int winFullPathname(
   /* If this path name begins with "/X:", where "X" is any alphabetic
   ** character, discard the initial "/" from the pathname.
   */
-  if( zRelative[0]=='/' && sqlite3Isalpha(zRelative[1]) && zRelative[2]==':' ){
+  if( zRelative[0]=='/' && winIsDriveLetterAndColon(zRelative+1) ){
     zRelative++;
   }
 
@@ -35282,22 +36735,21 @@ static int winFullPathname(
     **       for converting the relative path name to an absolute
     **       one by prepending the data directory and a backslash.
     */
-    sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s\\%s",
-                     sqlite3_data_directory, zRelative);
+    sqlite3_snprintf(MIN(nFull, pVfs->mxPathname), zFull, "%s%c%s",
+                     sqlite3_data_directory, winGetDirSep(), zRelative);
     return SQLITE_OK;
   }
-  zConverted = convertUtf8Filename(zRelative);
+  zConverted = winConvertFromUtf8Filename(zRelative);
   if( zConverted==0 ){
     return SQLITE_IOERR_NOMEM;
   }
-  if( isNT() ){
+  if( osIsNT() ){
     LPWSTR zTemp;
     nByte = osGetFullPathNameW((LPCWSTR)zConverted, 0, 0, 0);
     if( nByte==0 ){
-      winLogError(SQLITE_ERROR, osGetLastError(),
-                  "GetFullPathNameW1", zConverted);
       sqlite3_free(zConverted);
-      return SQLITE_CANTOPEN_FULLPATH;
+      return winLogError(SQLITE_CANTOPEN_FULLPATH, osGetLastError(),
+                         "winFullPathname1", zRelative);
     }
     nByte += 3;
     zTemp = sqlite3MallocZero( nByte*sizeof(zTemp[0]) );
@@ -35307,14 +36759,13 @@ static int winFullPathname(
     }
     nByte = osGetFullPathNameW((LPCWSTR)zConverted, nByte, zTemp, 0);
     if( nByte==0 ){
-      winLogError(SQLITE_ERROR, osGetLastError(),
-                  "GetFullPathNameW2", zConverted);
       sqlite3_free(zConverted);
       sqlite3_free(zTemp);
-      return SQLITE_CANTOPEN_FULLPATH;
+      return winLogError(SQLITE_CANTOPEN_FULLPATH, osGetLastError(),
+                         "winFullPathname2", zRelative);
     }
     sqlite3_free(zConverted);
-    zOut = unicodeToUtf8(zTemp);
+    zOut = winUnicodeToUtf8(zTemp);
     sqlite3_free(zTemp);
   }
 #ifdef SQLITE_WIN32_HAS_ANSI
@@ -35322,10 +36773,9 @@ static int winFullPathname(
     char *zTemp;
     nByte = osGetFullPathNameA((char*)zConverted, 0, 0, 0);
     if( nByte==0 ){
-      winLogError(SQLITE_ERROR, osGetLastError(),
-                  "GetFullPathNameA1", zConverted);
       sqlite3_free(zConverted);
-      return SQLITE_CANTOPEN_FULLPATH;
+      return winLogError(SQLITE_CANTOPEN_FULLPATH, osGetLastError(),
+                         "winFullPathname3", zRelative);
     }
     nByte += 3;
     zTemp = sqlite3MallocZero( nByte*sizeof(zTemp[0]) );
@@ -35335,11 +36785,10 @@ static int winFullPathname(
     }
     nByte = osGetFullPathNameA((char*)zConverted, nByte, zTemp, 0);
     if( nByte==0 ){
-      winLogError(SQLITE_ERROR, osGetLastError(),
-                  "GetFullPathNameA2", zConverted);
       sqlite3_free(zConverted);
       sqlite3_free(zTemp);
-      return SQLITE_CANTOPEN_FULLPATH;
+      return winLogError(SQLITE_CANTOPEN_FULLPATH, osGetLastError(),
+                         "winFullPathname4", zRelative);
     }
     sqlite3_free(zConverted);
     zOut = sqlite3_win32_mbcs_to_utf8(zTemp);
@@ -35361,18 +36810,32 @@ static int winFullPathname(
 ** Interfaces for opening a shared library, finding entry points
 ** within the shared library, and closing the shared library.
 */
-/*
-** Interfaces for opening a shared library, finding entry points
-** within the shared library, and closing the shared library.
-*/
 static void *winDlOpen(sqlite3_vfs *pVfs, const char *zFilename){
   HANDLE h;
-  void *zConverted = convertUtf8Filename(zFilename);
-  UNUSED_PARAMETER(pVfs);
-  if( zConverted==0 ){
+#if defined(__CYGWIN__)
+  int nFull = pVfs->mxPathname+1;
+  char *zFull = sqlite3MallocZero( nFull );
+  void *zConverted = 0;
+  if( zFull==0 ){
+    OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)0));
     return 0;
   }
-  if( isNT() ){
+  if( winFullPathname(pVfs, zFilename, nFull, zFull)!=SQLITE_OK ){
+    sqlite3_free(zFull);
+    OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)0));
+    return 0;
+  }
+  zConverted = winConvertFromUtf8Filename(zFull);
+  sqlite3_free(zFull);
+#else
+  void *zConverted = winConvertFromUtf8Filename(zFilename);
+  UNUSED_PARAMETER(pVfs);
+#endif
+  if( zConverted==0 ){
+    OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)0));
+    return 0;
+  }
+  if( osIsNT() ){
 #if SQLITE_OS_WINRT
     h = osLoadPackagedLibrary((LPCWSTR)zConverted, 0);
 #else
@@ -35384,20 +36847,26 @@ static void *winDlOpen(sqlite3_vfs *pVfs, const char *zFilename){
     h = osLoadLibraryA((char*)zConverted);
   }
 #endif
+  OSTRACE(("DLOPEN name=%s, handle=%p\n", zFilename, (void*)h));
   sqlite3_free(zConverted);
   return (void*)h;
 }
 static void winDlError(sqlite3_vfs *pVfs, int nBuf, char *zBufOut){
   UNUSED_PARAMETER(pVfs);
-  getLastErrorMsg(osGetLastError(), nBuf, zBufOut);
+  winGetLastErrorMsg(osGetLastError(), nBuf, zBufOut);
 }
 static void (*winDlSym(sqlite3_vfs *pVfs,void *pH,const char *zSym))(void){
+  FARPROC proc;
   UNUSED_PARAMETER(pVfs);
-  return (void(*)(void))osGetProcAddressA((HANDLE)pH, zSym);
+  proc = osGetProcAddressA((HANDLE)pH, zSym);
+  OSTRACE(("DLSYM handle=%p, symbol=%s, address=%p\n",
+           (void*)pH, zSym, (void*)proc));
+  return (void(*)(void))proc;
 }
 static void winDlClose(sqlite3_vfs *pVfs, void *pHandle){
   UNUSED_PARAMETER(pVfs);
   osFreeLibrary((HANDLE)pHandle);
+  OSTRACE(("DLCLOSE handle=%p\n", (void*)pHandle));
 }
 #else /* if SQLITE_OMIT_LOAD_EXTENSION is defined: */
   #define winDlOpen  0
@@ -35565,7 +37034,7 @@ static int winCurrentTime(sqlite3_vfs *pVfs, double *prNow){
 */
 static int winGetLastError(sqlite3_vfs *pVfs, int nBuf, char *zBuf){
   UNUSED_PARAMETER(pVfs);
-  return getLastErrorMsg(osGetLastError(), nBuf, zBuf);
+  return winGetLastErrorMsg(osGetLastError(), nBuf, zBuf);
 }
 
 /*
@@ -35575,7 +37044,7 @@ SQLITE_API int sqlite3_os_init(void){
   static sqlite3_vfs winVfs = {
     3,                   /* iVersion */
     sizeof(winFile),     /* szOsFile */
-    MAX_PATH,            /* mxPathname */
+    SQLITE_WIN32_MAX_PATH_BYTES, /* mxPathname */
     0,                   /* pNext */
     "win32",             /* zName */
     0,                   /* pAppData */
@@ -35596,10 +37065,36 @@ SQLITE_API int sqlite3_os_init(void){
     winGetSystemCall,    /* xGetSystemCall */
     winNextSystemCall,   /* xNextSystemCall */
   };
+#if defined(SQLITE_WIN32_HAS_WIDE)
+  static sqlite3_vfs winLongPathVfs = {
+    3,                   /* iVersion */
+    sizeof(winFile),     /* szOsFile */
+    SQLITE_WINNT_MAX_PATH_BYTES, /* mxPathname */
+    0,                   /* pNext */
+    "win32-longpath",    /* zName */
+    0,                   /* pAppData */
+    winOpen,             /* xOpen */
+    winDelete,           /* xDelete */
+    winAccess,           /* xAccess */
+    winFullPathname,     /* xFullPathname */
+    winDlOpen,           /* xDlOpen */
+    winDlError,          /* xDlError */
+    winDlSym,            /* xDlSym */
+    winDlClose,          /* xDlClose */
+    winRandomness,       /* xRandomness */
+    winSleep,            /* xSleep */
+    winCurrentTime,      /* xCurrentTime */
+    winGetLastError,     /* xGetLastError */
+    winCurrentTimeInt64, /* xCurrentTimeInt64 */
+    winSetSystemCall,    /* xSetSystemCall */
+    winGetSystemCall,    /* xGetSystemCall */
+    winNextSystemCall,   /* xNextSystemCall */
+  };
+#endif
 
   /* Double-check that the aSyscall[] array has been constructed
   ** correctly.  See ticket [bb3a86e890c8e96ab] */
-  assert( ArraySize(aSyscall)==74 );
+  assert( ArraySize(aSyscall)==76 );
 
   /* get memory map allocation granularity */
   memset(&winSysInfo, 0, sizeof(SYSTEM_INFO));
@@ -35612,6 +37107,11 @@ SQLITE_API int sqlite3_os_init(void){
   assert( winSysInfo.dwPageSize>0 );
 
   sqlite3_vfs_register(&winVfs, 1);
+
+#if defined(SQLITE_WIN32_HAS_WIDE)
+  sqlite3_vfs_register(&winLongPathVfs, 0);
+#endif
+
   return SQLITE_OK; 
 }
 
@@ -36062,7 +37562,8 @@ struct PCache {
   int szCache;                        /* Configured cache size */
   int szPage;                         /* Size of every page in this cache */
   int szExtra;                        /* Size of extra space for each page */
-  int bPurgeable;                     /* True if pages are on backing store */
+  u8 bPurgeable;                      /* True if pages are on backing store */
+  u8 eCreate;                         /* eCreate value for for xFetch() */
   int (*xStress)(void*,PgHdr*);       /* Call to try make a page clean */
   void *pStress;                      /* Argument to xStress */
   sqlite3_pcache *pCache;             /* Pluggable cache module */
@@ -36129,6 +37630,10 @@ static void pcacheRemoveFromDirtyList(PgHdr *pPage){
   }else{
     assert( pPage==p->pDirty );
     p->pDirty = pPage->pDirtyNext;
+    if( p->pDirty==0 && p->bPurgeable ){
+      assert( p->eCreate==1 );
+      p->eCreate = 2;
+    }
   }
   pPage->pDirtyNext = 0;
   pPage->pDirtyPrev = 0;
@@ -36149,6 +37654,9 @@ static void pcacheAddToDirtyList(PgHdr *pPage){
   if( pPage->pDirtyNext ){
     assert( pPage->pDirtyNext->pDirtyPrev==0 );
     pPage->pDirtyNext->pDirtyPrev = pPage;
+  }else if( p->bPurgeable ){
+    assert( p->eCreate==2 );
+    p->eCreate = 1;
   }
   p->pDirty = pPage;
   if( !p->pDirtyTail ){
@@ -36218,6 +37726,7 @@ SQLITE_PRIVATE void sqlite3PcacheOpen(
   p->szPage = szPage;
   p->szExtra = szExtra;
   p->bPurgeable = bPurgeable;
+  p->eCreate = 2;
   p->xStress = xStress;
   p->pStress = pStress;
   p->szCache = 100;
@@ -36257,7 +37766,7 @@ SQLITE_PRIVATE int sqlite3PcacheFetch(
   int createFlag,       /* If true, create page if it does not exist already */
   PgHdr **ppPage        /* Write the page here */
 ){
-  sqlite3_pcache_page *pPage = 0;
+  sqlite3_pcache_page *pPage;
   PgHdr *pPgHdr = 0;
   int eCreate;
 
@@ -36268,8 +37777,12 @@ SQLITE_PRIVATE int sqlite3PcacheFetch(
   /* If the pluggable cache (sqlite3_pcache*) has not been allocated,
   ** allocate it now.
   */
-  if( !pCache->pCache && createFlag ){
+  if( !pCache->pCache ){
     sqlite3_pcache *p;
+    if( !createFlag ){
+      *ppPage = 0;
+      return SQLITE_OK;
+    }
     p = sqlite3GlobalConfig.pcache2.xCreate(
         pCache->szPage, pCache->szExtra + sizeof(PgHdr), pCache->bPurgeable
     );
@@ -36280,11 +37793,16 @@ SQLITE_PRIVATE int sqlite3PcacheFetch(
     pCache->pCache = p;
   }
 
-  eCreate = createFlag * (1 + (!pCache->bPurgeable || !pCache->pDirty));
-  if( pCache->pCache ){
-    pPage = sqlite3GlobalConfig.pcache2.xFetch(pCache->pCache, pgno, eCreate);
-  }
-
+  /* eCreate defines what to do if the page does not exist.
+  **    0     Do not allocate a new page.  (createFlag==0)
+  **    1     Allocate a new page if doing so is inexpensive.
+  **          (createFlag==1 AND bPurgeable AND pDirty)
+  **    2     Allocate a new page even it doing so is difficult.
+  **          (createFlag==1 AND !(bPurgeable AND pDirty)
+  */
+  eCreate = createFlag==0 ? 0 : pCache->eCreate;
+  assert( (createFlag*(1+(!pCache->bPurgeable||!pCache->pDirty)))==eCreate );
+  pPage = sqlite3GlobalConfig.pcache2.xFetch(pCache->pCache, pgno, eCreate);
   if( !pPage && eCreate==1 ){
     PgHdr *pPg;
 
@@ -36756,6 +38274,7 @@ struct PCache1 {
 struct PgHdr1 {
   sqlite3_pcache_page page;
   unsigned int iKey;             /* Key value (page number) */
+  u8 isPinned;                   /* Page in use, not on the LRU list */
   PgHdr1 *pNext;                 /* Next in hash table chain */
   PCache1 *pCache;               /* Cache that currently owns this page */
   PgHdr1 *pLruNext;              /* Next in LRU list of unpinned pages */
@@ -37084,34 +38603,32 @@ static int pcache1ResizeHash(PCache1 *p){
 ** LRU list, then this function is a no-op.
 **
 ** The PGroup mutex must be held when this function is called.
-**
-** If pPage is NULL then this routine is a no-op.
 */
 static void pcache1PinPage(PgHdr1 *pPage){
   PCache1 *pCache;
   PGroup *pGroup;
 
-  if( pPage==0 ) return;
+  assert( pPage!=0 );
+  assert( pPage->isPinned==0 );
   pCache = pPage->pCache;
   pGroup = pCache->pGroup;
+  assert( pPage->pLruNext || pPage==pGroup->pLruTail );
+  assert( pPage->pLruPrev || pPage==pGroup->pLruHead );
   assert( sqlite3_mutex_held(pGroup->mutex) );
-  if( pPage->pLruNext || pPage==pGroup->pLruTail ){
-    if( pPage->pLruPrev ){
-      pPage->pLruPrev->pLruNext = pPage->pLruNext;
-    }
-    if( pPage->pLruNext ){
-      pPage->pLruNext->pLruPrev = pPage->pLruPrev;
-    }
-    if( pGroup->pLruHead==pPage ){
-      pGroup->pLruHead = pPage->pLruNext;
-    }
-    if( pGroup->pLruTail==pPage ){
-      pGroup->pLruTail = pPage->pLruPrev;
-    }
-    pPage->pLruNext = 0;
-    pPage->pLruPrev = 0;
-    pPage->pCache->nRecyclable--;
+  if( pPage->pLruPrev ){
+    pPage->pLruPrev->pLruNext = pPage->pLruNext;
+  }else{
+    pGroup->pLruHead = pPage->pLruNext;
   }
+  if( pPage->pLruNext ){
+    pPage->pLruNext->pLruPrev = pPage->pLruPrev;
+  }else{
+    pGroup->pLruTail = pPage->pLruPrev;
+  }
+  pPage->pLruNext = 0;
+  pPage->pLruPrev = 0;
+  pPage->isPinned = 1;
+  pCache->nRecyclable--;
 }
 
 
@@ -37143,6 +38660,7 @@ static void pcache1EnforceMaxPage(PGroup *pGroup){
   while( pGroup->nCurrentPage>pGroup->nMaxPage && pGroup->pLruTail ){
     PgHdr1 *p = pGroup->pLruTail;
     assert( p->pCache->pGroup==pGroup );
+    assert( p->isPinned==0 );
     pcache1PinPage(p);
     pcache1RemoveFromHash(p);
     pcache1FreePage(p);
@@ -37170,7 +38688,7 @@ static void pcache1TruncateUnsafe(
       if( pPage->iKey>=iLimit ){
         pCache->nPage--;
         *pp = pPage->pNext;
-        pcache1PinPage(pPage);
+        if( !pPage->isPinned ) pcache1PinPage(pPage);
         pcache1FreePage(pPage);
       }else{
         pp = &pPage->pNext;
@@ -37222,7 +38740,7 @@ static sqlite3_pcache *pcache1Create(int szPage, int szExtra, int bPurgeable){
   int sz;               /* Bytes of memory required to allocate the new cache */
 
   /*
-  ** The seperateCache variable is true if each PCache has its own private
+  ** The separateCache variable is true if each PCache has its own private
   ** PGroup.  In other words, separateCache is true for mode (1) where no
   ** mutexing is required.
   **
@@ -37380,6 +38898,7 @@ static sqlite3_pcache_page *pcache1Fetch(
   PGroup *pGroup;
   PgHdr1 *pPage = 0;
 
+  assert( offsetof(PgHdr1,page)==0 );
   assert( pCache->bPurgeable || createFlag!=1 );
   assert( pCache->bPurgeable || pCache->nMin==0 );
   assert( pCache->bPurgeable==0 || pCache->nMin==10 );
@@ -37393,8 +38912,11 @@ static sqlite3_pcache_page *pcache1Fetch(
   }
 
   /* Step 2: Abort if no existing page is found and createFlag is 0 */
-  if( pPage || createFlag==0 ){
-    pcache1PinPage(pPage);
+  if( pPage ){
+    if( !pPage->isPinned ) pcache1PinPage(pPage);
+    goto fetch_out;
+  }
+  if( createFlag==0 ){
     goto fetch_out;
   }
 
@@ -37425,6 +38947,7 @@ static sqlite3_pcache_page *pcache1Fetch(
   if( pCache->nPage>=pCache->nHash && pcache1ResizeHash(pCache) ){
     goto fetch_out;
   }
+  assert( pCache->nHash>0 && pCache->apHash );
 
   /* Step 4. Try to recycle a page. */
   if( pCache->bPurgeable && pGroup->pLruTail && (
@@ -37434,6 +38957,7 @@ static sqlite3_pcache_page *pcache1Fetch(
   )){
     PCache1 *pOther;
     pPage = pGroup->pLruTail;
+    assert( pPage->isPinned==0 );
     pcache1RemoveFromHash(pPage);
     pcache1PinPage(pPage);
     pOther = pPage->pCache;
@@ -37470,6 +38994,7 @@ static sqlite3_pcache_page *pcache1Fetch(
     pPage->pCache = pCache;
     pPage->pLruPrev = 0;
     pPage->pLruNext = 0;
+    pPage->isPinned = 1;
     *(void **)pPage->page.pExtra = 0;
     pCache->apHash[h] = pPage;
   }
@@ -37479,7 +39004,7 @@ static sqlite3_pcache_page *pcache1Fetch(
     pCache->iMaxKey = iKey;
   }
   pcache1LeaveMutex(pGroup);
-  return &pPage->page;
+  return (sqlite3_pcache_page*)pPage;
 }
 
 
@@ -37505,6 +39030,7 @@ static void pcache1Unpin(
   */
   assert( pPage->pLruPrev==0 && pPage->pLruNext==0 );
   assert( pGroup->pLruHead!=pPage && pGroup->pLruTail!=pPage );
+  assert( pPage->isPinned==1 );
 
   if( reuseUnlikely || pGroup->nCurrentPage>pGroup->nMaxPage ){
     pcache1RemoveFromHash(pPage);
@@ -37520,6 +39046,7 @@ static void pcache1Unpin(
       pGroup->pLruHead = pPage;
     }
     pCache->nRecyclable++;
+    pPage->isPinned = 0;
   }
 
   pcache1LeaveMutex(pCache->pGroup);
@@ -37646,6 +39173,7 @@ SQLITE_PRIVATE int sqlite3PcacheReleaseMemory(int nReq){
 #ifdef SQLITE_PCACHE_SEPARATE_HEADER
       nFree += sqlite3MemSize(p);
 #endif
+      assert( p->isPinned==0 );
       pcache1PinPage(p);
       pcache1RemoveFromHash(p);
       pcache1FreePage(p);
@@ -37670,6 +39198,7 @@ SQLITE_PRIVATE void sqlite3PcacheStats(
   PgHdr1 *p;
   int nRecyclable = 0;
   for(p=pcache1.grp.pLruHead; p; p=p->pLruNext){
+    assert( p->isPinned==0 );
     nRecyclable++;
   }
   *pnCurrent = pcache1.grp.nCurrentPage;
@@ -37794,8 +39323,8 @@ struct RowSet {
   struct RowSetEntry *pFresh;    /* Source of new entry objects */
   struct RowSetEntry *pForest;   /* List of binary trees of entries */
   u16 nFresh;                    /* Number of objects on pFresh */
-  u8 rsFlags;                    /* Various flags */
-  u8 iBatch;                     /* Current insert batch */
+  u16 rsFlags;                   /* Various flags */
+  int iBatch;                    /* Current insert batch */
 };
 
 /*
@@ -38129,7 +39658,7 @@ SQLITE_PRIVATE int sqlite3RowSetNext(RowSet *p, i64 *pRowid){
 ** on pRowSet->pEntry, then sort those entires into the forest at
 ** pRowSet->pForest so that they can be tested.
 */
-SQLITE_PRIVATE int sqlite3RowSetTest(RowSet *pRowSet, u8 iBatch, sqlite3_int64 iRowid){
+SQLITE_PRIVATE int sqlite3RowSetTest(RowSet *pRowSet, int iBatch, sqlite3_int64 iRowid){
   struct RowSetEntry *p, *pTree;
 
   /* This routine is never called after sqlite3RowSetNext() */
@@ -38785,6 +40314,13 @@ struct PagerSavepoint {
 #endif
 };
 
+/*
+** Bits of the Pager.doNotSpill flag.  See further description below.
+*/
+#define SPILLFLAG_OFF         0x01      /* Never spill cache.  Set via pragma */
+#define SPILLFLAG_ROLLBACK    0x02      /* Current rolling back, so do not spill */
+#define SPILLFLAG_NOSYNC      0x04      /* Spill is ok, but do not sync */
+
 /*
 ** A open page cache is an instance of struct Pager. A description of
 ** some of the more important member variables follows:
@@ -38851,19 +40387,21 @@ struct PagerSavepoint {
 **   journal file from being successfully finalized, the setMaster flag
 **   is cleared anyway (and the pager will move to ERROR state).
 **
-** doNotSpill, doNotSyncSpill
+** doNotSpill
 **
-**   These two boolean variables control the behavior of cache-spills
-**   (calls made by the pcache module to the pagerStress() routine to
-**   write cached data to the file-system in order to free up memory).
+**   This variables control the behavior of cache-spills  (calls made by
+**   the pcache module to the pagerStress() routine to write cached data
+**   to the file-system in order to free up memory).
 **
-**   When doNotSpill is non-zero, writing to the database from pagerStress()
-**   is disabled altogether. This is done in a very obscure case that
+**   When bits SPILLFLAG_OFF or SPILLFLAG_ROLLBACK of doNotSpill are set,
+**   writing to the database from pagerStress() is disabled altogether.
+**   The SPILLFLAG_ROLLBACK case is done in a very obscure case that
 **   comes up during savepoint rollback that requires the pcache module
 **   to allocate a new page to prevent the journal file from being written
-**   while it is being traversed by code in pager_playback().
+**   while it is being traversed by code in pager_playback().  The SPILLFLAG_OFF
+**   case is a user preference.
 ** 
-**   If doNotSyncSpill is non-zero, writing to the database from pagerStress()
+**   If the SPILLFLAG_NOSYNC bit is set, writing to the database from pagerStress()
 **   is permitted, but syncing the journal file is not. This flag is set
 **   by sqlite3PagerWrite() when the file-system sector-size is larger than
 **   the database page-size in order to prevent a journal sync from happening 
@@ -38949,7 +40487,8 @@ struct Pager {
   u8 ckptSyncFlags;           /* SYNC_NORMAL or SYNC_FULL for checkpoint */
   u8 walSyncFlags;            /* SYNC_NORMAL or SYNC_FULL for wal writes */
   u8 syncFlags;               /* SYNC_NORMAL or SYNC_FULL otherwise */
-  u8 tempFile;                /* zFilename is a temporary file */
+  u8 tempFile;                /* zFilename is a temporary or immutable file */
+  u8 noLock;                  /* Do not lock (except in WAL mode) */
   u8 readOnly;                /* True for a read-only database */
   u8 memDb;                   /* True to inhibit all file I/O */
 
@@ -38967,7 +40506,6 @@ struct Pager {
   u8 changeCountDone;         /* Set after incrementing the change-counter */
   u8 setMaster;               /* True if a m-j name has been written to jrnl */
   u8 doNotSpill;              /* Do not spill the cache when non-zero */
-  u8 doNotSyncSpill;          /* Do not do a spill that requires jrnl sync */
   u8 subjInMemory;            /* True to use in-memory sub-journals */
   Pgno dbSize;                /* Number of pages in the database */
   Pgno dbOrigSize;            /* dbSize before the current transaction */
@@ -39346,11 +40884,12 @@ static char *print_pager_state(Pager *p){
 **     PagerSavepoint.pInSavepoint.
 */
 static int subjRequiresPage(PgHdr *pPg){
-  Pgno pgno = pPg->pgno;
   Pager *pPager = pPg->pPager;
+  PagerSavepoint *p;
+  Pgno pgno = pPg->pgno;
   int i;
   for(i=0; i<pPager->nSavepoint; i++){
-    PagerSavepoint *p = &pPager->aSavepoint[i];
+    p = &pPager->aSavepoint[i];
     if( p->nOrig>=pgno && 0==sqlite3BitvecTest(p->pInSavepoint, pgno) ){
       return 1;
     }
@@ -39361,8 +40900,8 @@ static int subjRequiresPage(PgHdr *pPg){
 /*
 ** Return true if the page is already in the journal file.
 */
-static int pageInJournal(PgHdr *pPg){
-  return sqlite3BitvecTest(pPg->pPager->pInJournal, pPg->pgno);
+static int pageInJournal(Pager *pPager, PgHdr *pPg){
+  return sqlite3BitvecTest(pPager->pInJournal, pPg->pgno);
 }
 
 /*
@@ -39414,7 +40953,7 @@ static int pagerUnlockDb(Pager *pPager, int eLock){
   assert( eLock!=NO_LOCK || pagerUseWal(pPager)==0 );
   if( isOpen(pPager->fd) ){
     assert( pPager->eLock>=eLock );
-    rc = sqlite3OsUnlock(pPager->fd, eLock);
+    rc = pPager->noLock ? SQLITE_OK : sqlite3OsUnlock(pPager->fd, eLock);
     if( pPager->eLock!=UNKNOWN_LOCK ){
       pPager->eLock = (u8)eLock;
     }
@@ -39438,7 +40977,7 @@ static int pagerLockDb(Pager *pPager, int eLock){
 
   assert( eLock==SHARED_LOCK || eLock==RESERVED_LOCK || eLock==EXCLUSIVE_LOCK );
   if( pPager->eLock<eLock || pPager->eLock==UNKNOWN_LOCK ){
-    rc = sqlite3OsLock(pPager->fd, eLock);
+    rc = pPager->noLock ? SQLITE_OK : sqlite3OsLock(pPager->fd, eLock);
     if( rc==SQLITE_OK && (pPager->eLock!=UNKNOWN_LOCK||eLock==EXCLUSIVE_LOCK) ){
       pPager->eLock = (u8)eLock;
       IOTRACE(("LOCK %p %d\n", pPager, eLock))
@@ -39569,6 +41108,7 @@ static int readMasterJournal(sqlite3_file *pJrnl, char *zMaster, u32 nMaster){
    || szJ<16
    || SQLITE_OK!=(rc = read32bits(pJrnl, szJ-16, &len))
    || len>=nMaster 
+   || len==0 
    || SQLITE_OK!=(rc = read32bits(pJrnl, szJ-12, &cksum))
    || SQLITE_OK!=(rc = sqlite3OsRead(pJrnl, aMagic, 8, szJ-8))
    || memcmp(aMagic, aJournalMagic, 8)
@@ -39946,12 +41486,11 @@ static int writeMasterJournal(Pager *pPager, const char *zMaster){
 
   if( !zMaster 
    || pPager->journalMode==PAGER_JOURNALMODE_MEMORY 
-   || pPager->journalMode==PAGER_JOURNALMODE_OFF 
+   || !isOpen(pPager->jfd)
   ){
     return SQLITE_OK;
   }
   pPager->setMaster = 1;
-  assert( isOpen(pPager->jfd) );
   assert( pPager->journalHdr <= pPager->journalOff );
 
   /* Calculate the length in bytes and the checksum of zMaster */
@@ -40005,7 +41544,7 @@ static int writeMasterJournal(Pager *pPager, const char *zMaster){
 ** already in memory.
 */
 static PgHdr *pager_lookup(Pager *pPager, Pgno pgno){
-  PgHdr *p;                         /* Return value */
+  PgHdr *p = 0;                     /* Return value */
 
   /* It is not possible for a call to PcacheFetch() with createFlag==0 to
   ** fail, since no attempt to allocate dynamic memory will be made.
@@ -40144,6 +41683,7 @@ static void pager_unlock(Pager *pPager){
     pPager->changeCountDone = pPager->tempFile;
     pPager->eState = PAGER_OPEN;
     pPager->errCode = SQLITE_OK;
+    if( USEFETCH(pPager) ) sqlite3OsUnfetch(pPager->fd, 0, 0);
   }
 
   pPager->journalOff = 0;
@@ -40308,7 +41848,7 @@ static int pager_end_transaction(Pager *pPager, int hasMaster, int bCommit){
     PgHdr *p = pager_lookup(pPager, 1);
     if( p ){
       p->pageHash = 0;
-      sqlite3PagerUnref(p);
+      sqlite3PagerUnrefNotNull(p);
     }
   }
 #endif
@@ -40337,6 +41877,11 @@ static int pager_end_transaction(Pager *pPager, int hasMaster, int bCommit){
     rc = pager_truncate(pPager, pPager->dbSize);
   }
 
+  if( rc==SQLITE_OK && bCommit && isOpen(pPager->fd) ){
+    rc = sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_COMMIT_PHASETWO, 0);
+    if( rc==SQLITE_NOTFOUND ) rc = SQLITE_OK;
+  }
+
   if( !pPager->exclusiveMode 
    && (!pagerUseWal(pPager) || sqlite3WalExclusiveMode(pPager->pWal, 0))
   ){
@@ -40626,11 +42171,11 @@ static int pager_playback_one_page(
     ** requiring a journal-sync before it is written.
     */
     assert( isSavepnt );
-    assert( pPager->doNotSpill==0 );
-    pPager->doNotSpill++;
+    assert( (pPager->doNotSpill & SPILLFLAG_ROLLBACK)==0 );
+    pPager->doNotSpill |= SPILLFLAG_ROLLBACK;
     rc = sqlite3PagerAcquire(pPager, pgno, &pPg, 1);
-    assert( pPager->doNotSpill==1 );
-    pPager->doNotSpill--;
+    assert( (pPager->doNotSpill & SPILLFLAG_ROLLBACK)!=0 );
+    pPager->doNotSpill &= ~SPILLFLAG_ROLLBACK;
     if( rc!=SQLITE_OK ) return rc;
     pPg->flags &= ~PGHDR_NEED_READ;
     sqlite3PcacheMakeDirty(pPg);
@@ -41150,7 +42695,7 @@ static int pager_playback(Pager *pPager, int isHot){
   if( rc==SQLITE_OK
    && (pPager->eState>=PAGER_WRITER_DBMOD || pPager->eState==PAGER_OPEN)
   ){
-    rc = sqlite3PagerSync(pPager);
+    rc = sqlite3PagerSync(pPager, 0);
   }
   if( rc==SQLITE_OK ){
     rc = pager_end_transaction(pPager, zMaster[0]!='\0', 0);
@@ -41197,12 +42742,6 @@ static int readDbPage(PgHdr *pPg, u32 iFrame){
   assert( pPager->eState>=PAGER_READER && !MEMDB );
   assert( isOpen(pPager->fd) );
 
-  if( NEVER(!isOpen(pPager->fd)) ){
-    assert( pPager->tempFile );
-    memset(pPg->pData, 0, pPager->pageSize);
-    return SQLITE_OK;
-  }
-
 #ifndef SQLITE_OMIT_WAL
   if( iFrame ){
     /* Try to pull the page from the write-ahead log. */
@@ -41302,7 +42841,7 @@ static int pagerUndoCallback(void *pCtx, Pgno iPg){
       if( rc==SQLITE_OK ){
         pPager->xReiniter(pPg);
       }
-      sqlite3PagerUnref(pPg);
+      sqlite3PagerUnrefNotNull(pPg);
     }
   }
 
@@ -41710,10 +43249,10 @@ SQLITE_PRIVATE void sqlite3PagerSetCachesize(Pager *pPager, int mxPage){
 static void pagerFixMaplimit(Pager *pPager){
 #if SQLITE_MAX_MMAP_SIZE>0
   sqlite3_file *fd = pPager->fd;
-  if( isOpen(fd) ){
+  if( isOpen(fd) && fd->pMethods->iVersion>=3 ){
     sqlite3_int64 sz;
-    pPager->bUseFetch = (fd->pMethods->iVersion>=3) && pPager->szMmap>0;
     sz = pPager->szMmap;
+    pPager->bUseFetch = (sz>0);
     sqlite3OsFileControlHint(pPager->fd, SQLITE_FCNTL_MMAP_SIZE, &sz);
   }
 #endif
@@ -41735,9 +43274,12 @@ SQLITE_PRIVATE void sqlite3PagerShrink(Pager *pPager){
 }
 
 /*
-** Adjust the robustness of the database to damage due to OS crashes
-** or power failures by changing the number of syncs()s when writing
-** the rollback journal.  There are three levels:
+** Adjust settings of the pager to those specified in the pgFlags parameter.
+**
+** The "level" in pgFlags & PAGER_SYNCHRONOUS_MASK sets the robustness
+** of the database to damage due to OS crashes or power failures by
+** changing the number of syncs()s when writing the journals.
+** There are three levels:
 **
 **    OFF       sqlite3OsSync() is never called.  This is the default
 **              for temporary and transient files.
@@ -41778,22 +43320,21 @@ SQLITE_PRIVATE void sqlite3PagerShrink(Pager *pPager){
 ** and FULL=3.
 */
 #ifndef SQLITE_OMIT_PAGER_PRAGMAS
-SQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(
+SQLITE_PRIVATE void sqlite3PagerSetFlags(
   Pager *pPager,        /* The pager to set safety level for */
-  int level,            /* PRAGMA synchronous.  1=OFF, 2=NORMAL, 3=FULL */  
-  int bFullFsync,       /* PRAGMA fullfsync */
-  int bCkptFullFsync    /* PRAGMA checkpoint_fullfsync */
+  unsigned pgFlags      /* Various flags */
 ){
+  unsigned level = pgFlags & PAGER_SYNCHRONOUS_MASK;
   assert( level>=1 && level<=3 );
   pPager->noSync =  (level==1 || pPager->tempFile) ?1:0;
   pPager->fullSync = (level==3 && !pPager->tempFile) ?1:0;
   if( pPager->noSync ){
     pPager->syncFlags = 0;
     pPager->ckptSyncFlags = 0;
-  }else if( bFullFsync ){
+  }else if( pgFlags & PAGER_FULLFSYNC ){
     pPager->syncFlags = SQLITE_SYNC_FULL;
     pPager->ckptSyncFlags = SQLITE_SYNC_FULL;
-  }else if( bCkptFullFsync ){
+  }else if( pgFlags & PAGER_CKPT_FULLFSYNC ){
     pPager->syncFlags = SQLITE_SYNC_NORMAL;
     pPager->ckptSyncFlags = SQLITE_SYNC_FULL;
   }else{
@@ -41804,6 +43345,11 @@ SQLITE_PRIVATE void sqlite3PagerSetSafetyLevel(
   if( pPager->fullSync ){
     pPager->walSyncFlags |= WAL_SYNC_TRANSACTIONS;
   }
+  if( pgFlags & PAGER_CACHESPILL ){
+    pPager->doNotSpill &= ~SPILLFLAG_OFF;
+  }else{
+    pPager->doNotSpill |= SPILLFLAG_OFF;
+  }
 }
 #endif
 
@@ -42546,7 +44092,8 @@ static int pager_write_pagelist(Pager *pPager, PgHdr *pList){
   */
   assert( rc!=SQLITE_OK || isOpen(pPager->fd) );
   if( rc==SQLITE_OK 
-   && (pList->pDirty ? pPager->dbSize : pList->pgno+1)>pPager->dbHintSize 
+   && pPager->dbHintSize<pPager->dbSize
+   && (pList->pDirty || pList->pgno>pPager->dbHintSize)
   ){
     sqlite3_int64 szFile = pPager->pageSize * (sqlite3_int64)pPager->dbSize;
     sqlite3OsFileControlHint(pPager->fd, SQLITE_FCNTL_SIZE_HINT, &szFile);
@@ -42649,7 +44196,7 @@ static int subjournalPage(PgHdr *pPg){
     assert( isOpen(pPager->jfd) || pagerUseWal(pPager) );
     assert( isOpen(pPager->sjfd) || pPager->nSubRec==0 );
     assert( pagerUseWal(pPager) 
-         || pageInJournal(pPg) 
+         || pageInJournal(pPager, pPg) 
          || pPg->pgno>pPager->dbOrigSize 
     );
     rc = openSubJournal(pPager);
@@ -42703,13 +44250,14 @@ static int pagerStress(void *p, PgHdr *pPg){
   assert( pPg->pPager==pPager );
   assert( pPg->flags&PGHDR_DIRTY );
 
-  /* The doNotSyncSpill flag is set during times when doing a sync of
+  /* The doNotSpill NOSYNC bit is set during times when doing a sync of
   ** journal (and adding a new header) is not allowed.  This occurs
   ** during calls to sqlite3PagerWrite() while trying to journal multiple
   ** pages belonging to the same sector.
   **
-  ** The doNotSpill flag inhibits all cache spilling regardless of whether
-  ** or not a sync is required.  This is set during a rollback.
+  ** The doNotSpill ROLLBACK and OFF bits inhibits all cache spilling
+  ** regardless of whether or not a sync is required.  This is set during
+  ** a rollback or by user request, respectively.
   **
   ** Spilling is also prohibited when in an error state since that could
   ** lead to database corruption.   In the current implementaton it 
@@ -42719,8 +44267,13 @@ static int pagerStress(void *p, PgHdr *pPg){
   ** test for the error state as a safeguard against future changes.
   */
   if( NEVER(pPager->errCode) ) return SQLITE_OK;
-  if( pPager->doNotSpill ) return SQLITE_OK;
-  if( pPager->doNotSyncSpill && (pPg->flags & PGHDR_NEED_SYNC)!=0 ){
+  testcase( pPager->doNotSpill & SPILLFLAG_ROLLBACK );
+  testcase( pPager->doNotSpill & SPILLFLAG_OFF );
+  testcase( pPager->doNotSpill & SPILLFLAG_NOSYNC );
+  if( pPager->doNotSpill
+   && ((pPager->doNotSpill & (SPILLFLAG_ROLLBACK|SPILLFLAG_OFF))!=0
+      || (pPg->flags & PGHDR_NEED_SYNC)!=0)
+  ){
     return SQLITE_OK;
   }
 
@@ -42983,30 +44536,38 @@ SQLITE_PRIVATE int sqlite3PagerOpen(
     **    + The value returned by sqlite3OsSectorSize()
     **    + The largest page size that can be written atomically.
     */
-    if( rc==SQLITE_OK && !readOnly ){
-      setSectorSize(pPager);
-      assert(SQLITE_DEFAULT_PAGE_SIZE<=SQLITE_MAX_DEFAULT_PAGE_SIZE);
-      if( szPageDflt<pPager->sectorSize ){
-        if( pPager->sectorSize>SQLITE_MAX_DEFAULT_PAGE_SIZE ){
-          szPageDflt = SQLITE_MAX_DEFAULT_PAGE_SIZE;
-        }else{
-          szPageDflt = (u32)pPager->sectorSize;
-        }
-      }
-#ifdef SQLITE_ENABLE_ATOMIC_WRITE
-      {
-        int iDc = sqlite3OsDeviceCharacteristics(pPager->fd);
-        int ii;
-        assert(SQLITE_IOCAP_ATOMIC512==(512>>8));
-        assert(SQLITE_IOCAP_ATOMIC64K==(65536>>8));
-        assert(SQLITE_MAX_DEFAULT_PAGE_SIZE<=65536);
-        for(ii=szPageDflt; ii<=SQLITE_MAX_DEFAULT_PAGE_SIZE; ii=ii*2){
-          if( iDc&(SQLITE_IOCAP_ATOMIC|(ii>>8)) ){
-            szPageDflt = ii;
+    if( rc==SQLITE_OK ){
+      int iDc = sqlite3OsDeviceCharacteristics(pPager->fd);
+      if( !readOnly ){
+        setSectorSize(pPager);
+        assert(SQLITE_DEFAULT_PAGE_SIZE<=SQLITE_MAX_DEFAULT_PAGE_SIZE);
+        if( szPageDflt<pPager->sectorSize ){
+          if( pPager->sectorSize>SQLITE_MAX_DEFAULT_PAGE_SIZE ){
+            szPageDflt = SQLITE_MAX_DEFAULT_PAGE_SIZE;
+          }else{
+            szPageDflt = (u32)pPager->sectorSize;
+          }
+        }
+#ifdef SQLITE_ENABLE_ATOMIC_WRITE
+        {
+          int ii;
+          assert(SQLITE_IOCAP_ATOMIC512==(512>>8));
+          assert(SQLITE_IOCAP_ATOMIC64K==(65536>>8));
+          assert(SQLITE_MAX_DEFAULT_PAGE_SIZE<=65536);
+          for(ii=szPageDflt; ii<=SQLITE_MAX_DEFAULT_PAGE_SIZE; ii=ii*2){
+            if( iDc&(SQLITE_IOCAP_ATOMIC|(ii>>8)) ){
+              szPageDflt = ii;
+            }
           }
         }
-      }
 #endif
+      }
+      pPager->noLock = sqlite3_uri_boolean(zFilename, "nolock", 0);
+      if( (iDc & SQLITE_IOCAP_IMMUTABLE)!=0
+       || sqlite3_uri_boolean(zFilename, "immutable", 0) ){
+          vfsFlags |= SQLITE_OPEN_READONLY;
+          goto act_like_temp_file;
+      }
     }
   }else{
     /* If a temporary file is requested, it is not opened immediately.
@@ -43016,10 +44577,14 @@ SQLITE_PRIVATE int sqlite3PagerOpen(
     ** This branch is also run for an in-memory database. An in-memory
     ** database is the same as a temp-file that is never written out to
     ** disk and uses an in-memory rollback journal.
+    **
+    ** This branch also runs for files marked as immutable.
     */ 
+act_like_temp_file:
     tempFile = 1;
-    pPager->eState = PAGER_READER;
-    pPager->eLock = EXCLUSIVE_LOCK;
+    pPager->eState = PAGER_READER;     /* Pretend we already have a lock */
+    pPager->eLock = EXCLUSIVE_LOCK;    /* Pretend we are in EXCLUSIVE locking mode */
+    pPager->noLock = 1;                /* Do no locking */
     readOnly = (vfsFlags&SQLITE_OPEN_READONLY);
   }
 
@@ -43060,9 +44625,6 @@ SQLITE_PRIVATE int sqlite3PagerOpen(
   /* pPager->nPage = 0; */
   pPager->mxPgno = SQLITE_MAX_PAGE_COUNT;
   /* pPager->state = PAGER_UNLOCK; */
-#if 0
-  assert( pPager->state == (tempFile ? PAGER_EXCLUSIVE : PAGER_UNLOCK) );
-#endif
   /* pPager->errMask = 0; */
   pPager->tempFile = (u8)tempFile;
   assert( tempFile==PAGER_LOCKINGMODE_NORMAL 
@@ -43108,6 +44670,30 @@ SQLITE_PRIVATE int sqlite3PagerOpen(
 }
 
 
+/* Verify that the database file has not be deleted or renamed out from
+** under the pager.  Return SQLITE_OK if the database is still were it ought
+** to be on disk.  Return non-zero (SQLITE_READONLY_DBMOVED or some other error
+** code from sqlite3OsAccess()) if the database has gone missing.
+*/
+static int databaseIsUnmoved(Pager *pPager){
+  int bHasMoved = 0;
+  int rc;
+
+  if( pPager->tempFile ) return SQLITE_OK;
+  if( pPager->dbSize==0 ) return SQLITE_OK;
+  assert( pPager->zFilename && pPager->zFilename[0] );
+  rc = sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_HAS_MOVED, &bHasMoved);
+  if( rc==SQLITE_NOTFOUND ){
+    /* If the HAS_MOVED file-control is unimplemented, assume that the file
+    ** has not been moved.  That is the historical behavior of SQLite: prior to
+    ** version 3.8.3, it never checked */
+    rc = SQLITE_OK;
+  }else if( rc==SQLITE_OK && bHasMoved ){
+    rc = SQLITE_READONLY_DBMOVED;
+  }
+  return rc;
+}
+
 
 /*
 ** This function is called after transitioning from PAGER_UNLOCK to
@@ -43173,15 +44759,17 @@ static int hasHotJournal(Pager *pPager, int *pExists){
     if( rc==SQLITE_OK && !locked ){
       Pgno nPage;                 /* Number of pages in database file */
 
-      /* Check the size of the database file. If it consists of 0 pages,
-      ** then delete the journal file. See the header comment above for 
-      ** the reasoning here.  Delete the obsolete journal file under
-      ** a RESERVED lock to avoid race conditions and to avoid violating
-      ** [H33020].
-      */
       rc = pagerPagecount(pPager, &nPage);
       if( rc==SQLITE_OK ){
-        if( nPage==0 ){
+        /* If the database is zero pages in size, that means that either (1) the
+        ** journal is a remnant from a prior database with the same name where
+        ** the database file but not the journal was deleted, or (2) the initial
+        ** transaction that populates a new database is being rolled back.
+        ** In either case, the journal file can be deleted.  However, take care
+        ** not to delete the journal file if it is already open due to
+        ** journal_mode=PERSIST.
+        */
+        if( nPage==0 && !jrnlOpen ){
           sqlite3BeginBenignMalloc();
           if( pagerLockDb(pPager, RESERVED_LOCK)==SQLITE_OK ){
             sqlite3OsDelete(pVfs, pPager->zJournal, 0);
@@ -43511,7 +45099,7 @@ static void pagerUnlockIfUnused(Pager *pPager){
 ** page is initialized to all zeros. 
 **
 ** If noContent is true, it means that we do not care about the contents
-** of the page. This occurs in two seperate scenarios:
+** of the page. This occurs in two scenarios:
 **
 **   a) When reading a free-list leaf page from the database, and
 **
@@ -43542,19 +45130,19 @@ SQLITE_PRIVATE int sqlite3PagerAcquire(
   Pager *pPager,      /* The pager open on the database file */
   Pgno pgno,          /* Page number to fetch */
   DbPage **ppPage,    /* Write a pointer to the page here */
-  int flags           /* PAGER_ACQUIRE_XXX flags */
+  int flags           /* PAGER_GET_XXX flags */
 ){
   int rc = SQLITE_OK;
   PgHdr *pPg = 0;
   u32 iFrame = 0;                 /* Frame to read from WAL file */
-  const int noContent = (flags & PAGER_ACQUIRE_NOCONTENT);
+  const int noContent = (flags & PAGER_GET_NOCONTENT);
 
   /* It is acceptable to use a read-only (mmap) page for any page except
   ** page 1 if there is no write-transaction open or the ACQUIRE_READONLY
   ** flag was specified by the caller. And so long as the db is not a 
   ** temporary or in-memory database.  */
   const int bMmapOk = (pgno!=1 && USEFETCH(pPager)
-   && (pPager->eState==PAGER_READER || (flags & PAGER_ACQUIRE_READONLY))
+   && (pPager->eState==PAGER_READER || (flags & PAGER_GET_READONLY))
 #ifdef SQLITE_HAS_CODEC
    && pPager->xCodec==0
 #endif
@@ -43579,7 +45167,7 @@ SQLITE_PRIVATE int sqlite3PagerAcquire(
       if( rc!=SQLITE_OK ) goto pager_acquire_err;
     }
 
-    if( iFrame==0 && bMmapOk ){
+    if( bMmapOk && iFrame==0 ){
       void *pData = 0;
 
       rc = sqlite3OsFetch(pPager->fd, 
@@ -43720,16 +45308,19 @@ SQLITE_PRIVATE DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno){
 ** are released, a rollback occurs and the lock on the database is
 ** removed.
 */
-SQLITE_PRIVATE void sqlite3PagerUnref(DbPage *pPg){
-  if( pPg ){
-    Pager *pPager = pPg->pPager;
-    if( pPg->flags & PGHDR_MMAP ){
-      pagerReleaseMapPage(pPg);
-    }else{
-      sqlite3PcacheRelease(pPg);
-    }
-    pagerUnlockIfUnused(pPager);
+SQLITE_PRIVATE void sqlite3PagerUnrefNotNull(DbPage *pPg){
+  Pager *pPager;
+  assert( pPg!=0 );
+  pPager = pPg->pPager;
+  if( pPg->flags & PGHDR_MMAP ){
+    pagerReleaseMapPage(pPg);
+  }else{
+    sqlite3PcacheRelease(pPg);
   }
+  pagerUnlockIfUnused(pPager);
+}
+SQLITE_PRIVATE void sqlite3PagerUnref(DbPage *pPg){
+  if( pPg ) sqlite3PagerUnrefNotNull(pPg);
 }
 
 /*
@@ -43784,13 +45375,19 @@ static int pager_open_journal(Pager *pPager){
             (SQLITE_OPEN_DELETEONCLOSE|SQLITE_OPEN_TEMP_JOURNAL):
             (SQLITE_OPEN_MAIN_JOURNAL)
           );
-  #ifdef SQLITE_ENABLE_ATOMIC_WRITE
-        rc = sqlite3JournalOpen(
-            pVfs, pPager->zJournal, pPager->jfd, flags, jrnlBufferSize(pPager)
-        );
-  #else
-        rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, flags, 0);
-  #endif
+
+        /* Verify that the database still has the same name as it did when
+        ** it was originally opened. */
+        rc = databaseIsUnmoved(pPager);
+        if( rc==SQLITE_OK ){
+#ifdef SQLITE_ENABLE_ATOMIC_WRITE
+          rc = sqlite3JournalOpen(
+              pVfs, pPager->zJournal, pPager->jfd, flags, jrnlBufferSize(pPager)
+          );
+#else
+          rc = sqlite3OsOpen(pVfs, pPager->zJournal, pPager->jfd, flags, 0);
+#endif
+        }
       }
       assert( rc!=SQLITE_OK || isOpen(pPager->jfd) );
     }
@@ -43911,9 +45508,9 @@ SQLITE_PRIVATE int sqlite3PagerBegin(Pager *pPager, int exFlag, int subjInMemory
 ** of any open savepoints as appropriate.
 */
 static int pager_write(PgHdr *pPg){
-  void *pData = pPg->pData;
   Pager *pPager = pPg->pPager;
   int rc = SQLITE_OK;
+  int inJournal;
 
   /* This routine is not called unless a write-transaction has already 
   ** been started. The journal file may or may not be open at this point.
@@ -43924,14 +45521,8 @@ static int pager_write(PgHdr *pPg){
        || pPager->eState==PAGER_WRITER_DBMOD
   );
   assert( assert_pager_state(pPager) );
-
-  /* If an error has been previously detected, report the same error
-  ** again. This should not happen, but the check provides robustness. */
-  if( NEVER(pPager->errCode) )  return pPager->errCode;
-
-  /* Higher-level routines never call this function if database is not
-  ** writable.  But check anyway, just for robustness. */
-  if( NEVER(pPager->readOnly) ) return SQLITE_PERM;
+  assert( pPager->errCode==0 );
+  assert( pPager->readOnly==0 );
 
   CHECK_PAGE(pPg);
 
@@ -43955,7 +45546,8 @@ static int pager_write(PgHdr *pPg){
   ** to the journal then we can return right away.
   */
   sqlite3PcacheMakeDirty(pPg);
-  if( pageInJournal(pPg) && !subjRequiresPage(pPg) ){
+  inJournal = pageInJournal(pPager, pPg);
+  if( inJournal && (pPager->nSavepoint==0 || !subjRequiresPage(pPg)) ){
     assert( !pagerUseWal(pPager) );
   }else{
   
@@ -43963,7 +45555,7 @@ static int pager_write(PgHdr *pPg){
     ** EXCLUSIVE lock on the main database file.  Write the current page to
     ** the transaction journal if it is not there already.
     */
-    if( !pageInJournal(pPg) && !pagerUseWal(pPager) ){
+    if( !inJournal && !pagerUseWal(pPager) ){
       assert( pagerUseWal(pPager)==0 );
       if( pPg->pgno<=pPager->dbOrigSize && isOpen(pPager->jfd) ){
         u32 cksum;
@@ -43976,7 +45568,7 @@ static int pager_write(PgHdr *pPg){
         assert( pPg->pgno!=PAGER_MJ_PGNO(pPager) );
 
         assert( pPager->journalHdr<=pPager->journalOff );
-        CODEC2(pPager, pData, pPg->pgno, 7, return SQLITE_NOMEM, pData2);
+        CODEC2(pPager, pPg->pData, pPg->pgno, 7, return SQLITE_NOMEM, pData2);
         cksum = pager_cksum(pPager, (u8*)pData2);
 
         /* Even if an IO or diskfull error occurs while journalling the
@@ -44028,7 +45620,7 @@ static int pager_write(PgHdr *pPg){
     ** the statement journal format differs from the standard journal format
     ** in that it omits the checksums and the header.
     */
-    if( subjRequiresPage(pPg) ){
+    if( pPager->nSavepoint>0 && subjRequiresPage(pPg) ){
       rc = subjournalPage(pPg);
     }
   }
@@ -44060,27 +45652,27 @@ SQLITE_PRIVATE int sqlite3PagerWrite(DbPage *pDbPage){
 
   PgHdr *pPg = pDbPage;
   Pager *pPager = pPg->pPager;
-  Pgno nPagePerSector = (pPager->sectorSize/pPager->pageSize);
 
   assert( (pPg->flags & PGHDR_MMAP)==0 );
   assert( pPager->eState>=PAGER_WRITER_LOCKED );
   assert( pPager->eState!=PAGER_ERROR );
   assert( assert_pager_state(pPager) );
 
-  if( nPagePerSector>1 ){
+  if( pPager->sectorSize > (u32)pPager->pageSize ){
     Pgno nPageCount;          /* Total number of pages in database file */
     Pgno pg1;                 /* First page of the sector pPg is located on. */
     int nPage = 0;            /* Number of pages starting at pg1 to journal */
     int ii;                   /* Loop counter */
     int needSync = 0;         /* True if any page has PGHDR_NEED_SYNC */
+    Pgno nPagePerSector = (pPager->sectorSize/pPager->pageSize);
 
-    /* Set the doNotSyncSpill flag to 1. This is because we cannot allow
+    /* Set the doNotSpill NOSYNC bit to 1. This is because we cannot allow
     ** a journal header to be written between the pages journaled by
     ** this function.
     */
     assert( !MEMDB );
-    assert( pPager->doNotSyncSpill==0 );
-    pPager->doNotSyncSpill++;
+    assert( (pPager->doNotSpill & SPILLFLAG_NOSYNC)==0 );
+    pPager->doNotSpill |= SPILLFLAG_NOSYNC;
 
     /* This trick assumes that both the page-size and sector-size are
     ** an integer power of 2. It sets variable pg1 to the identifier
@@ -44111,14 +45703,14 @@ SQLITE_PRIVATE int sqlite3PagerWrite(DbPage *pDbPage){
             if( pPage->flags&PGHDR_NEED_SYNC ){
               needSync = 1;
             }
-            sqlite3PagerUnref(pPage);
+            sqlite3PagerUnrefNotNull(pPage);
           }
         }
       }else if( (pPage = pager_lookup(pPager, pg))!=0 ){
         if( pPage->flags&PGHDR_NEED_SYNC ){
           needSync = 1;
         }
-        sqlite3PagerUnref(pPage);
+        sqlite3PagerUnrefNotNull(pPage);
       }
     }
 
@@ -44134,13 +45726,13 @@ SQLITE_PRIVATE int sqlite3PagerWrite(DbPage *pDbPage){
         PgHdr *pPage = pager_lookup(pPager, pg1+ii);
         if( pPage ){
           pPage->flags |= PGHDR_NEED_SYNC;
-          sqlite3PagerUnref(pPage);
+          sqlite3PagerUnrefNotNull(pPage);
         }
       }
     }
 
-    assert( pPager->doNotSyncSpill==1 );
-    pPager->doNotSyncSpill--;
+    assert( (pPager->doNotSpill & SPILLFLAG_NOSYNC)!=0 );
+    pPager->doNotSpill &= ~SPILLFLAG_NOSYNC;
   }else{
     rc = pager_write(pDbPage);
   }
@@ -44287,17 +45879,17 @@ static int pager_incr_changecounter(Pager *pPager, int isDirectMode){
 ** If successful, or if called on a pager for which it is a no-op, this
 ** function returns SQLITE_OK. Otherwise, an IO error code is returned.
 */
-SQLITE_PRIVATE int sqlite3PagerSync(Pager *pPager){
+SQLITE_PRIVATE int sqlite3PagerSync(Pager *pPager, const char *zMaster){
   int rc = SQLITE_OK;
-  if( !pPager->noSync ){
+
+  if( isOpen(pPager->fd) ){
+    void *pArg = (void*)zMaster;
+    rc = sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_SYNC, pArg);
+    if( rc==SQLITE_NOTFOUND ) rc = SQLITE_OK;
+  }
+  if( rc==SQLITE_OK && !pPager->noSync ){
     assert( !MEMDB );
     rc = sqlite3OsSync(pPager->fd, pPager->syncFlags);
-  }else if( isOpen(pPager->fd) ){
-    assert( !MEMDB );
-    rc = sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_SYNC_OMITTED, 0);
-    if( rc==SQLITE_NOTFOUND ){
-      rc = SQLITE_OK;
-    }
   }
   return rc;
 }
@@ -44496,7 +46088,7 @@ SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne(
   
       /* Finally, sync the database file. */
       if( !noSync ){
-        rc = sqlite3PagerSync(pPager);
+        rc = sqlite3PagerSync(pPager, zMaster);
       }
       IOTRACE(("DBSYNC %p\n", pPager))
     }
@@ -44625,7 +46217,9 @@ SQLITE_PRIVATE int sqlite3PagerRollback(Pager *pPager){
 
   assert( pPager->eState==PAGER_READER || rc!=SQLITE_OK );
   assert( rc==SQLITE_OK || rc==SQLITE_FULL || rc==SQLITE_CORRUPT
-          || rc==SQLITE_NOMEM || (rc&0xFF)==SQLITE_IOERR );
+          || rc==SQLITE_NOMEM || (rc&0xFF)==SQLITE_IOERR 
+          || rc==SQLITE_CANTOPEN
+  );
 
   /* If an error occurs during a ROLLBACK, we can no longer trust the pager
   ** cache. So call pager_error() on the way out to make any error persistent.
@@ -44921,7 +46515,27 @@ SQLITE_PRIVATE void sqlite3PagerSetCodec(
 SQLITE_PRIVATE void *sqlite3PagerGetCodec(Pager *pPager){
   return pPager->pCodec;
 }
-#endif
+
+/*
+** This function is called by the wal module when writing page content
+** into the log file.
+**
+** This function returns a pointer to a buffer containing the encrypted
+** page content. If a malloc fails, this function may return NULL.
+*/
+SQLITE_PRIVATE void *sqlite3PagerCodec(PgHdr *pPg){
+  void *aData = 0;
+  CODEC2(pPg->pPager, pPg->pData, pPg->pgno, 6, return 0, aData);
+  return aData;
+}
+
+/*
+** Return the current pager state
+*/
+SQLITE_PRIVATE int sqlite3PagerState(Pager *pPager){
+  return pPager->eState;
+}
+#endif /* SQLITE_HAS_CODEC */
 
 #ifndef SQLITE_OMIT_AUTOVACUUM
 /*
@@ -45008,7 +46622,7 @@ SQLITE_PRIVATE int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno, i
   if( (pPg->flags&PGHDR_NEED_SYNC) && !isCommit ){
     needSyncPgno = pPg->pgno;
     assert( pPager->journalMode==PAGER_JOURNALMODE_OFF ||
-            pageInJournal(pPg) || pPg->pgno>pPager->dbOrigSize );
+            pageInJournal(pPager, pPg) || pPg->pgno>pPager->dbOrigSize );
     assert( pPg->flags&PGHDR_DIRTY );
   }
 
@@ -45042,7 +46656,7 @@ SQLITE_PRIVATE int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno, i
   if( MEMDB ){
     assert( pPgOld );
     sqlite3PcacheMove(pPgOld, origPgno);
-    sqlite3PagerUnref(pPgOld);
+    sqlite3PagerUnrefNotNull(pPgOld);
   }
 
   if( needSyncPgno ){
@@ -45071,7 +46685,7 @@ SQLITE_PRIVATE int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno, i
     }
     pPgHdr->flags |= PGHDR_NEED_SYNC;
     sqlite3PcacheMakeDirty(pPgHdr);
-    sqlite3PagerUnref(pPgHdr);
+    sqlite3PagerUnrefNotNull(pPgHdr);
   }
 
   return SQLITE_OK;
@@ -45476,21 +47090,6 @@ SQLITE_PRIVATE int sqlite3PagerWalFramesize(Pager *pPager){
 }
 #endif
 
-#ifdef SQLITE_HAS_CODEC
-/*
-** This function is called by the wal module when writing page content
-** into the log file.
-**
-** This function returns a pointer to a buffer containing the encrypted
-** page content. If a malloc fails, this function may return NULL.
-*/
-SQLITE_PRIVATE void *sqlite3PagerCodec(PgHdr *pPg){
-  void *aData = 0;
-  CODEC2(pPg->pPager, pPg->pData, pPg->pgno, 6, return 0, aData);
-  return aData;
-}
-#endif /* SQLITE_HAS_CODEC */
-
 #endif /* SQLITE_OMIT_DISKIO */
 
 /************** End of pager.c ***********************************************/
@@ -46802,7 +48401,7 @@ SQLITE_PRIVATE int sqlite3WalOpen(
     sqlite3OsClose(pRet->pWalFd);
     sqlite3_free(pRet);
   }else{
-    int iDC = sqlite3OsDeviceCharacteristics(pRet->pWalFd);
+    int iDC = sqlite3OsDeviceCharacteristics(pDbFd);
     if( iDC & SQLITE_IOCAP_SEQUENTIAL ){ pRet->syncHeader = 0; }
     if( iDC & SQLITE_IOCAP_POWERSAFE_OVERWRITE ){
       pRet->padToSectorBoundary = 0;
@@ -47959,7 +49558,7 @@ SQLITE_PRIVATE int sqlite3WalBeginWriteTransaction(Wal *pWal){
   if( memcmp(&pWal->hdr, (void *)walIndexHdr(pWal), sizeof(WalIndexHdr))!=0 ){
     walUnlockExclusive(pWal, WAL_WRITE_LOCK, 1);
     pWal->writeLock = 0;
-    rc = SQLITE_BUSY;
+    rc = SQLITE_BUSY_SNAPSHOT;
   }
 
   return rc;
@@ -48173,7 +49772,7 @@ static int walWriteToLog(
     iAmt -= iFirstAmt;
     pContent = (void*)(iFirstAmt + (char*)pContent);
     assert( p->syncFlags & (SQLITE_SYNC_NORMAL|SQLITE_SYNC_FULL) );
-    rc = sqlite3OsSync(p->pFd, p->syncFlags);
+    rc = sqlite3OsSync(p->pFd, p->syncFlags & SQLITE_SYNC_MASK);
     if( iAmt==0 || rc ) return rc;
   }
   rc = sqlite3OsWrite(p->pFd, pContent, iAmt, iOffset);
@@ -48668,13 +50267,13 @@ SQLITE_PRIVATE int sqlite3WalFramesize(Wal *pWal){
 **
 **   OFFSET   SIZE    DESCRIPTION
 **      0      16     Header string: "SQLite format 3\000"
-**     16       2     Page size in bytes.  
+**     16       2     Page size in bytes.  (1 means 65536)
 **     18       1     File format write version
 **     19       1     File format read version
 **     20       1     Bytes of unused space at the end of each page
-**     21       1     Max embedded payload fraction
-**     22       1     Min embedded payload fraction
-**     23       1     Min leaf payload fraction
+**     21       1     Max embedded payload fraction (must be 64)
+**     22       1     Min embedded payload fraction (must be 32)
+**     23       1     Min leaf payload fraction (must be 32)
 **     24       4     File change counter
 **     28       4     Reserved for future use
 **     32       4     First freelist page
@@ -48688,9 +50287,10 @@ SQLITE_PRIVATE int sqlite3WalFramesize(Wal *pWal){
 **     56       4     1=UTF-8 2=UTF16le 3=UTF16be
 **     60       4     User version
 **     64       4     Incremental vacuum mode
-**     68       4     unused
-**     72       4     unused
-**     76       4     unused
+**     68       4     Application-ID
+**     72      20     unused
+**     92       4     The version-valid-for number
+**     96       4     SQLITE_VERSION_NUMBER
 **
 ** All of the integer values are big-endian (most significant byte first).
 **
@@ -49106,39 +50706,46 @@ struct BtCursor {
   BtShared *pBt;            /* The BtShared this cursor points to */
   BtCursor *pNext, *pPrev;  /* Forms a linked list of all cursors */
   struct KeyInfo *pKeyInfo; /* Argument passed to comparison function */
-#ifndef SQLITE_OMIT_INCRBLOB
   Pgno *aOverflow;          /* Cache of overflow page locations */
-#endif
-  Pgno pgnoRoot;            /* The root page of this tree */
-  sqlite3_int64 cachedRowid; /* Next rowid cache.  0 means not valid */
   CellInfo info;            /* A parse of the cell we are pointing at */
-  i64 nKey;        /* Size of pKey, or last integer key */
-  void *pKey;      /* Saved key that was cursor's last known position */
+  i64 nKey;                 /* Size of pKey, or last integer key */
+  void *pKey;               /* Saved key that was cursor last known position */
+  Pgno pgnoRoot;            /* The root page of this tree */
+  int nOvflAlloc;           /* Allocated size of aOverflow[] array */
   int skipNext;    /* Prev() is noop if negative. Next() is noop if positive */
-  u8 wrFlag;                /* True if writable */
-  u8 atLast;                /* Cursor pointing to the last entry */
-  u8 validNKey;             /* True if info.nKey is valid */
+  u8 curFlags;              /* zero or more BTCF_* flags defined below */
   u8 eState;                /* One of the CURSOR_XXX constants (see below) */
-#ifndef SQLITE_OMIT_INCRBLOB
-  u8 isIncrblobHandle;      /* True if this cursor is an incr. io handle */
-#endif
   u8 hints;                             /* As configured by CursorSetHints() */
   i16 iPage;                            /* Index of current page in apPage */
   u16 aiIdx[BTCURSOR_MAX_DEPTH];        /* Current index in apPage[i] */
   MemPage *apPage[BTCURSOR_MAX_DEPTH];  /* Pages from root to current page */
 };
 
+/*
+** Legal values for BtCursor.curFlags
+*/
+#define BTCF_WriteFlag    0x01   /* True if a write cursor */
+#define BTCF_ValidNKey    0x02   /* True if info.nKey is valid */
+#define BTCF_ValidOvfl    0x04   /* True if aOverflow is valid */
+#define BTCF_AtLast       0x08   /* Cursor is pointing ot the last entry */
+#define BTCF_Incrblob     0x10   /* True if an incremental I/O handle */
+
 /*
 ** Potential values for BtCursor.eState.
 **
-** CURSOR_VALID:
-**   Cursor points to a valid entry. getPayload() etc. may be called.
-**
 ** CURSOR_INVALID:
 **   Cursor does not point to a valid entry. This can happen (for example) 
 **   because the table is empty or because BtreeCursorFirst() has not been
 **   called.
 **
+** CURSOR_VALID:
+**   Cursor points to a valid entry. getPayload() etc. may be called.
+**
+** CURSOR_SKIPNEXT:
+**   Cursor is valid except that the Cursor.skipNext field is non-zero
+**   indicating that the next sqlite3BtreeNext() or sqlite3BtreePrevious()
+**   operation should be a no-op.
+**
 ** CURSOR_REQUIRESEEK:
 **   The table that this cursor was opened on still exists, but has been 
 **   modified since the cursor was last used. The cursor position is saved
@@ -49155,8 +50762,9 @@ struct BtCursor {
 */
 #define CURSOR_INVALID           0
 #define CURSOR_VALID             1
-#define CURSOR_REQUIRESEEK       2
-#define CURSOR_FAULT             3
+#define CURSOR_SKIPNEXT          2
+#define CURSOR_REQUIRESEEK       3
+#define CURSOR_FAULT             4
 
 /* 
 ** The database page the PENDING_BYTE occupies. This page is never used.
@@ -49992,16 +51600,11 @@ static int cursorHoldsMutex(BtCursor *p){
 }
 #endif
 
-
-#ifndef SQLITE_OMIT_INCRBLOB
 /*
-** Invalidate the overflow page-list cache for cursor pCur, if any.
+** Invalidate the overflow cache of the cursor passed as the first argument.
+** on the shared btree structure pBt.
 */
-static void invalidateOverflowCache(BtCursor *pCur){
-  assert( cursorHoldsMutex(pCur) );
-  sqlite3_free(pCur->aOverflow);
-  pCur->aOverflow = 0;
-}
+#define invalidateOverflowCache(pCur) (pCur->curFlags &= ~BTCF_ValidOvfl)
 
 /*
 ** Invalidate the overflow page-list cache for all cursors opened
@@ -50015,6 +51618,7 @@ static void invalidateAllOverflowCache(BtShared *pBt){
   }
 }
 
+#ifndef SQLITE_OMIT_INCRBLOB
 /*
 ** This function is called before modifying the contents of a table
 ** to invalidate any incrblob cursors that are open on the
@@ -50037,16 +51641,14 @@ static void invalidateIncrblobCursors(
   BtShared *pBt = pBtree->pBt;
   assert( sqlite3BtreeHoldsMutex(pBtree) );
   for(p=pBt->pCursor; p; p=p->pNext){
-    if( p->isIncrblobHandle && (isClearTable || p->info.nKey==iRow) ){
+    if( (p->curFlags & BTCF_Incrblob)!=0 && (isClearTable || p->info.nKey==iRow) ){
       p->eState = CURSOR_INVALID;
     }
   }
 }
 
 #else
-  /* Stub functions when INCRBLOB is omitted */
-  #define invalidateOverflowCache(x)
-  #define invalidateAllOverflowCache(x)
+  /* Stub function when INCRBLOB is omitted */
   #define invalidateIncrblobCursors(x,y,z)
 #endif /* SQLITE_OMIT_INCRBLOB */
 
@@ -50230,7 +51832,7 @@ static int btreeMoveto(
 ){
   int rc;                    /* Status code */
   UnpackedRecord *pIdxKey;   /* Unpacked index key */
-  char aSpace[150];          /* Temp space for pIdxKey - to avoid a malloc */
+  char aSpace[200];          /* Temp space for pIdxKey - to avoid a malloc */
   char *pFree = 0;
 
   if( pKey ){
@@ -50240,6 +51842,10 @@ static int btreeMoveto(
     );
     if( pIdxKey==0 ) return SQLITE_NOMEM;
     sqlite3VdbeRecordUnpack(pCur->pKeyInfo, (int)nKey, pKey, pIdxKey);
+    if( pIdxKey->nField==0 ){
+      sqlite3DbFree(pCur->pKeyInfo->db, pFree);
+      return SQLITE_CORRUPT_BKPT;
+    }
   }else{
     pIdxKey = 0;
   }
@@ -50270,6 +51876,9 @@ static int btreeRestoreCursorPosition(BtCursor *pCur){
     sqlite3_free(pCur->pKey);
     pCur->pKey = 0;
     assert( pCur->eState==CURSOR_VALID || pCur->eState==CURSOR_INVALID );
+    if( pCur->skipNext && pCur->eState==CURSOR_VALID ){
+      pCur->eState = CURSOR_SKIPNEXT;
+    }
   }
   return rc;
 }
@@ -50285,20 +51894,32 @@ static int btreeRestoreCursorPosition(BtCursor *pCur){
 ** at is deleted out from under them.
 **
 ** This routine returns an error code if something goes wrong.  The
-** integer *pHasMoved is set to one if the cursor has moved and 0 if not.
+** integer *pHasMoved is set as follows:
+**
+**    0:   The cursor is unchanged
+**    1:   The cursor is still pointing at the same row, but the pointers
+**         returned by sqlite3BtreeKeyFetch() or sqlite3BtreeDataFetch()
+**         might now be invalid because of a balance() or other change to the
+**         b-tree.
+**    2:   The cursor is no longer pointing to the row.  The row might have
+**         been deleted out from under the cursor.
 */
 SQLITE_PRIVATE int sqlite3BtreeCursorHasMoved(BtCursor *pCur, int *pHasMoved){
   int rc;
 
+  if( pCur->eState==CURSOR_VALID ){
+    *pHasMoved = 0;
+    return SQLITE_OK;
+  }
   rc = restoreCursorPosition(pCur);
   if( rc ){
-    *pHasMoved = 1;
+    *pHasMoved = 2;
     return rc;
   }
-  if( pCur->eState!=CURSOR_VALID || pCur->skipNext!=0 ){
-    *pHasMoved = 1;
+  if( pCur->eState!=CURSOR_VALID || NEVER(pCur->skipNext!=0) ){
+    *pHasMoved = 2;
   }else{
-    *pHasMoved = 0;
+    *pHasMoved = 1;
   }
   return SQLITE_OK;
 }
@@ -50483,7 +52104,8 @@ static void btreeParseCellPtr(
   assert( n==4-4*pPage->leaf );
   if( pPage->intKey ){
     if( pPage->hasData ){
-      n += getVarint32(&pCell[n], nPayload);
+      assert( n==0 );
+      n = getVarint32(pCell, nPayload);
     }else{
       nPayload = 0;
     }
@@ -50761,7 +52383,7 @@ static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
   }else if( gap+2<=top ){
     /* Search the freelist looking for a free slot big enough to satisfy 
     ** the request. The allocation is made from the first free slot in 
-    ** the list that is large enough to accomadate it.
+    ** the list that is large enough to accommodate it.
     */
     int pc, addr;
     for(addr=hdr+1; (pc = get2byte(&data[addr]))>0; addr=pc){
@@ -51080,13 +52702,12 @@ static void zeroPage(MemPage *pPage, int flags){
     memset(&data[hdr], 0, pBt->usableSize - hdr);
   }
   data[hdr] = (char)flags;
-  first = hdr + 8 + 4*((flags&PTF_LEAF)==0 ?1:0);
+  first = hdr + ((flags&PTF_LEAF)==0 ? 12 : 8);
   memset(&data[hdr+1], 0, 4);
   data[hdr+7] = 0;
   put2byte(&data[hdr+5], pBt->usableSize);
   pPage->nFree = (u16)(pBt->usableSize - first);
   decodeFlags(pPage, flags);
-  pPage->hdrOffset = hdr;
   pPage->cellOffset = first;
   pPage->aDataEnd = &data[pBt->usableSize];
   pPage->aCellIdx = &data[first];
@@ -51127,15 +52748,12 @@ static int btreeGetPage(
   BtShared *pBt,       /* The btree */
   Pgno pgno,           /* Number of the page to fetch */
   MemPage **ppPage,    /* Return the page in this parameter */
-  int noContent,       /* Do not load page content if true */
-  int bReadonly        /* True if a read-only (mmap) page is ok */
+  int flags            /* PAGER_GET_NOCONTENT or PAGER_GET_READONLY */
 ){
   int rc;
   DbPage *pDbPage;
-  int flags = (noContent ? PAGER_ACQUIRE_NOCONTENT : 0) 
-            | (bReadonly ? PAGER_ACQUIRE_READONLY : 0);
 
-  assert( noContent==0 || bReadonly==0 );
+  assert( flags==0 || flags==PAGER_GET_NOCONTENT || flags==PAGER_GET_READONLY );
   assert( sqlite3_mutex_held(pBt->mutex) );
   rc = sqlite3PagerAcquire(pBt->pPager, pgno, (DbPage**)&pDbPage, flags);
   if( rc ) return rc;
@@ -51183,16 +52801,17 @@ static int getAndInitPage(
   BtShared *pBt,                  /* The database file */
   Pgno pgno,                      /* Number of the page to get */
   MemPage **ppPage,               /* Write the page pointer here */
-  int bReadonly                   /* True if a read-only (mmap) page is ok */
+  int bReadonly                   /* PAGER_GET_READONLY or 0 */
 ){
   int rc;
   assert( sqlite3_mutex_held(pBt->mutex) );
+  assert( bReadonly==PAGER_GET_READONLY || bReadonly==0 );
 
   if( pgno>btreePagecount(pBt) ){
     rc = SQLITE_CORRUPT_BKPT;
   }else{
-    rc = btreeGetPage(pBt, pgno, ppPage, 0, bReadonly);
-    if( rc==SQLITE_OK ){
+    rc = btreeGetPage(pBt, pgno, ppPage, bReadonly);
+    if( rc==SQLITE_OK && (*ppPage)->isInit==0 ){
       rc = btreeInitPage(*ppPage);
       if( rc!=SQLITE_OK ){
         releasePage(*ppPage);
@@ -51213,10 +52832,11 @@ static void releasePage(MemPage *pPage){
   if( pPage ){
     assert( pPage->aData );
     assert( pPage->pBt );
+    assert( pPage->pDbPage!=0 );
     assert( sqlite3PagerGetExtra(pPage->pDbPage) == (void*)pPage );
     assert( sqlite3PagerGetData(pPage->pDbPage)==pPage->aData );
     assert( sqlite3_mutex_held(pPage->pBt->mutex) );
-    sqlite3PagerUnref(pPage->pDbPage);
+    sqlite3PagerUnrefNotNull(pPage->pDbPage);
   }
 }
 
@@ -51596,6 +53216,18 @@ static int removeFromSharingList(BtShared *pBt){
 static void allocateTempSpace(BtShared *pBt){
   if( !pBt->pTmpSpace ){
     pBt->pTmpSpace = sqlite3PageMalloc( pBt->pageSize );
+
+    /* One of the uses of pBt->pTmpSpace is to format cells before
+    ** inserting them into a leaf page (function fillInCell()). If
+    ** a cell is less than 4 bytes in size, it is rounded up to 4 bytes
+    ** by the various routines that manipulate binary cells. Which
+    ** can mean that fillInCell() only initializes the first 2 or 3
+    ** bytes of pTmpSpace, but that the first 4 bytes are copied from
+    ** it into a database page. This is not actually a problem, but it
+    ** does cause a valgrind error when the 1 or 2 bytes of unitialized 
+    ** data is passed to system call write(). So to avoid this error,
+    ** zero the first 4 bytes of temp space here.  */
+    if( pBt->pTmpSpace ) memset(pBt->pTmpSpace, 0, 4);
   }
 }
 
@@ -51689,6 +53321,7 @@ SQLITE_PRIVATE int sqlite3BtreeSetCacheSize(Btree *p, int mxPage){
   return SQLITE_OK;
 }
 
+#if SQLITE_MAX_MMAP_SIZE>0
 /*
 ** Change the limit on the amount of the database file that may be
 ** memory mapped.
@@ -51701,6 +53334,7 @@ SQLITE_PRIVATE int sqlite3BtreeSetMmapLimit(Btree *p, sqlite3_int64 szMmap){
   sqlite3BtreeLeave(p);
   return SQLITE_OK;
 }
+#endif /* SQLITE_MAX_MMAP_SIZE>0 */
 
 /*
 ** Change the way data is synced to disk in order to increase or decrease
@@ -51711,17 +53345,14 @@ SQLITE_PRIVATE int sqlite3BtreeSetMmapLimit(Btree *p, sqlite3_int64 szMmap){
 ** probability of damage to near zero but with a write performance reduction.
 */
 #ifndef SQLITE_OMIT_PAGER_PRAGMAS
-SQLITE_PRIVATE int sqlite3BtreeSetSafetyLevel(
+SQLITE_PRIVATE int sqlite3BtreeSetPagerFlags(
   Btree *p,              /* The btree to set the safety level on */
-  int level,             /* PRAGMA synchronous.  1=OFF, 2=NORMAL, 3=FULL */
-  int fullSync,          /* PRAGMA fullfsync. */
-  int ckptFullSync       /* PRAGMA checkpoint_fullfync */
+  unsigned pgFlags       /* Various PAGER_* flags */
 ){
   BtShared *pBt = p->pBt;
   assert( sqlite3_mutex_held(p->db->mutex) );
-  assert( level>=1 && level<=3 );
   sqlite3BtreeEnter(p);
-  sqlite3PagerSetSafetyLevel(pBt->pPager, level, fullSync, ckptFullSync);
+  sqlite3PagerSetFlags(pBt->pPager, pgFlags);
   sqlite3BtreeLeave(p);
   return SQLITE_OK;
 }
@@ -51927,7 +53558,7 @@ static int lockBtree(BtShared *pBt){
   assert( pBt->pPage1==0 );
   rc = sqlite3PagerSharedLock(pBt->pPager);
   if( rc!=SQLITE_OK ) return rc;
-  rc = btreeGetPage(pBt, 1, &pPage1, 0, 0);
+  rc = btreeGetPage(pBt, 1, &pPage1, 0);
   if( rc!=SQLITE_OK ) return rc;
 
   /* Do some checking to help insure the file we opened really is
@@ -52080,7 +53711,8 @@ static int countValidCursors(BtShared *pBt, int wrOnly){
   BtCursor *pCur;
   int r = 0;
   for(pCur=pBt->pCursor; pCur; pCur=pCur->pNext){
-    if( (wrOnly==0 || pCur->wrFlag) && pCur->eState!=CURSOR_FAULT ) r++; 
+    if( (wrOnly==0 || (pCur->curFlags & BTCF_WriteFlag)!=0)
+     && pCur->eState!=CURSOR_FAULT ) r++; 
   }
   return r;
 }
@@ -52214,7 +53846,7 @@ SQLITE_PRIVATE int sqlite3BtreeBeginTrans(Btree *p, int wrflag){
   if( p->inTrans==TRANS_WRITE || (p->inTrans==TRANS_READ && !wrflag) ){
     goto trans_begun;
   }
-  assert( IfNotOmitAV(pBt->bDoTruncate)==0 );
+  assert( pBt->inTransaction==TRANS_WRITE || IfNotOmitAV(pBt->bDoTruncate)==0 );
 
   /* Write transactions are not possible on a read-only database */
   if( (pBt->btsFlags & BTS_READ_ONLY)!=0 && wrflag ){
@@ -52509,7 +54141,7 @@ static int relocatePage(
   ** iPtrPage.
   */
   if( eType!=PTRMAP_ROOTPAGE ){
-    rc = btreeGetPage(pBt, iPtrPage, &pPtrPage, 0, 0);
+    rc = btreeGetPage(pBt, iPtrPage, &pPtrPage, 0);
     if( rc!=SQLITE_OK ){
       return rc;
     }
@@ -52593,7 +54225,7 @@ static int incrVacuumStep(BtShared *pBt, Pgno nFin, Pgno iLastPg, int bCommit){
       u8 eMode = BTALLOC_ANY;   /* Mode parameter for allocateBtreePage() */
       Pgno iNear = 0;           /* nearby parameter for allocateBtreePage() */
 
-      rc = btreeGetPage(pBt, iLastPg, &pLastPg, 0, 0);
+      rc = btreeGetPage(pBt, iLastPg, &pLastPg, 0);
       if( rc!=SQLITE_OK ){
         return rc;
       }
@@ -52704,7 +54336,7 @@ SQLITE_PRIVATE int sqlite3BtreeIncrVacuum(Btree *p){
 
 /*
 ** This routine is called prior to sqlite3PagerCommit when a transaction
-** is commited for an auto-vacuum database.
+** is committed for an auto-vacuum database.
 **
 ** If SQLITE_OK is returned, then *pnTrunc is set to the number of pages
 ** the database file should be truncated to during the commit process. 
@@ -52819,12 +54451,13 @@ SQLITE_PRIVATE int sqlite3BtreeCommitPhaseOne(Btree *p, const char *zMaster){
 */
 static void btreeEndTransaction(Btree *p){
   BtShared *pBt = p->pBt;
+  sqlite3 *db = p->db;
   assert( sqlite3BtreeHoldsMutex(p) );
 
 #ifndef SQLITE_OMIT_AUTOVACUUM
   pBt->bDoTruncate = 0;
 #endif
-  if( p->inTrans>TRANS_NONE && p->db->activeVdbeCnt>1 ){
+  if( p->inTrans>TRANS_NONE && db->nVdbeRead>1 ){
     /* If there are other active statements that belong to this database
     ** handle, downgrade to a read-only transaction. The other statements
     ** may still be reading from the database.  */
@@ -52991,7 +54624,7 @@ SQLITE_PRIVATE int sqlite3BtreeRollback(Btree *p, int tripCode){
     /* The rollback may have destroyed the pPage1->aData value.  So
     ** call btreeGetPage() on page 1 again to make
     ** sure pPage1->aData is set correctly. */
-    if( btreeGetPage(pBt, 1, &pPage1, 0, 0)==SQLITE_OK ){
+    if( btreeGetPage(pBt, 1, &pPage1, 0)==SQLITE_OK ){
       int nPage = get4byte(28+(u8*)pPage1->aData);
       testcase( nPage==0 );
       if( nPage==0 ) sqlite3PagerPagecount(pBt->pPager, &nPage);
@@ -53154,14 +54787,14 @@ static int btreeCursor(
   pCur->pKeyInfo = pKeyInfo;
   pCur->pBtree = p;
   pCur->pBt = pBt;
-  pCur->wrFlag = (u8)wrFlag;
+  assert( wrFlag==0 || wrFlag==BTCF_WriteFlag );
+  pCur->curFlags = wrFlag;
   pCur->pNext = pBt->pCursor;
   if( pCur->pNext ){
     pCur->pNext->pPrev = pCur;
   }
   pBt->pCursor = pCur;
   pCur->eState = CURSOR_INVALID;
-  pCur->cachedRowid = 0;
   return SQLITE_OK;
 }
 SQLITE_PRIVATE int sqlite3BtreeCursor(
@@ -53202,36 +54835,6 @@ SQLITE_PRIVATE void sqlite3BtreeCursorZero(BtCursor *p){
   memset(p, 0, offsetof(BtCursor, iPage));
 }
 
-/*
-** Set the cached rowid value of every cursor in the same database file
-** as pCur and having the same root page number as pCur.  The value is
-** set to iRowid.
-**
-** Only positive rowid values are considered valid for this cache.
-** The cache is initialized to zero, indicating an invalid cache.
-** A btree will work fine with zero or negative rowids.  We just cannot
-** cache zero or negative rowids, which means tables that use zero or
-** negative rowids might run a little slower.  But in practice, zero
-** or negative rowids are very uncommon so this should not be a problem.
-*/
-SQLITE_PRIVATE void sqlite3BtreeSetCachedRowid(BtCursor *pCur, sqlite3_int64 iRowid){
-  BtCursor *p;
-  for(p=pCur->pBt->pCursor; p; p=p->pNext){
-    if( p->pgnoRoot==pCur->pgnoRoot ) p->cachedRowid = iRowid;
-  }
-  assert( pCur->cachedRowid==iRowid );
-}
-
-/*
-** Return the cached rowid for the given cursor.  A negative or zero
-** return value indicates that the rowid cache is invalid and should be
-** ignored.  If the rowid cache has never before been set, then a
-** zero is returned.
-*/
-SQLITE_PRIVATE sqlite3_int64 sqlite3BtreeGetCachedRowid(BtCursor *pCur){
-  return pCur->cachedRowid;
-}
-
 /*
 ** Close a cursor.  The read lock on the database file is released
 ** when the last cursor is closed.
@@ -53255,7 +54858,7 @@ SQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor *pCur){
       releasePage(pCur->apPage[i]);
     }
     unlockBtreeIfUnused(pBt);
-    invalidateOverflowCache(pCur);
+    sqlite3DbFree(pBtree->db, pCur->aOverflow);
     /* sqlite3_free(pCur); */
     sqlite3BtreeLeave(pBtree);
   }
@@ -53283,7 +54886,7 @@ SQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor *pCur){
     int iPage = pCur->iPage;
     memset(&info, 0, sizeof(info));
     btreeParseCell(pCur->apPage[iPage], pCur->aiIdx[iPage], &info);
-    assert( memcmp(&info, &pCur->info, sizeof(info))==0 );
+    assert( CORRUPT_DB || memcmp(&info, &pCur->info, sizeof(info))==0 );
   }
 #else
   #define assertCellInfo(x)
@@ -53294,7 +54897,7 @@ SQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor *pCur){
     if( pCur->info.nSize==0 ){
       int iPage = pCur->iPage;
       btreeParseCell(pCur->apPage[iPage],pCur->aiIdx[iPage],&pCur->info);
-      pCur->validNKey = 1;
+      pCur->curFlags |= BTCF_ValidNKey;
     }else{
       assertCellInfo(pCur);
     }
@@ -53304,8 +54907,8 @@ SQLITE_PRIVATE int sqlite3BtreeCloseCursor(BtCursor *pCur){
 #define getCellInfo(pCur)                                                      \
   if( pCur->info.nSize==0 ){                                                   \
     int iPage = pCur->iPage;                                                   \
-    btreeParseCell(pCur->apPage[iPage],pCur->aiIdx[iPage],&pCur->info); \
-    pCur->validNKey = 1;                                                       \
+    btreeParseCell(pCur->apPage[iPage],pCur->aiIdx[iPage],&pCur->info);        \
+    pCur->curFlags |= BTCF_ValidNKey;                                          \
   }else{                                                                       \
     assertCellInfo(pCur);                                                      \
   }
@@ -53426,7 +55029,7 @@ static int getOverflowPage(
 
   assert( next==0 || rc==SQLITE_DONE );
   if( rc==SQLITE_OK ){
-    rc = btreeGetPage(pBt, ovfl, &pPage, 0, (ppPage==0));
+    rc = btreeGetPage(pBt, ovfl, &pPage, (ppPage==0) ? PAGER_GET_READONLY : 0);
     assert( rc==SQLITE_OK || pPage==0 );
     if( rc==SQLITE_OK ){
       next = get4byte(pPage->aData);
@@ -53476,10 +55079,12 @@ static int copyPayload(
 
 /*
 ** This function is used to read or overwrite payload information
-** for the entry that the pCur cursor is pointing to. If the eOp
-** parameter is 0, this is a read operation (data copied into
-** buffer pBuf). If it is non-zero, a write (data copied from
-** buffer pBuf).
+** for the entry that the pCur cursor is pointing to. The eOp
+** argument is interpreted as follows:
+**
+**   0: The operation is a read. Populate the overflow cache.
+**   1: The operation is a write. Populate the overflow cache.
+**   2: The operation is a read. Do not populate the overflow cache.
 **
 ** A total of "amt" bytes are read or written beginning at "offset".
 ** Data is read to or from the buffer pBuf.
@@ -53487,11 +55092,11 @@ static int copyPayload(
 ** The content being read or written might appear on the main page
 ** or be scattered out on multiple overflow pages.
 **
-** If the BtCursor.isIncrblobHandle flag is set, and the current
-** cursor entry uses one or more overflow pages, this function
-** allocates space for and lazily popluates the overflow page-list 
-** cache array (BtCursor.aOverflow). Subsequent calls use this
-** cache to make seeking to the supplied offset more efficient.
+** If the current cursor entry uses one or more overflow pages and the
+** eOp argument is not 2, this function may allocate space for and lazily 
+** popluates the overflow page-list cache array (BtCursor.aOverflow). 
+** Subsequent calls use this cache to make seeking to the supplied offset 
+** more efficient.
 **
 ** Once an overflow page-list cache has been allocated, it may be
 ** invalidated if some other cursor writes to the same table, or if
@@ -53515,15 +55120,22 @@ static int accessPayload(
   int iIdx = 0;
   MemPage *pPage = pCur->apPage[pCur->iPage]; /* Btree page of current entry */
   BtShared *pBt = pCur->pBt;                  /* Btree this cursor belongs to */
+#ifdef SQLITE_DIRECT_OVERFLOW_READ
+  int bEnd;                                   /* True if reading to end of data */
+#endif
 
   assert( pPage );
   assert( pCur->eState==CURSOR_VALID );
   assert( pCur->aiIdx[pCur->iPage]<pPage->nCell );
   assert( cursorHoldsMutex(pCur) );
+  assert( eOp!=2 || offset==0 );      /* Always start from beginning for eOp==2 */
 
   getCellInfo(pCur);
   aPayload = pCur->info.pCell + pCur->info.nHeader;
   nKey = (pPage->intKey ? 0 : (int)pCur->info.nKey);
+#ifdef SQLITE_DIRECT_OVERFLOW_READ
+  bEnd = (offset+amt==nKey+pCur->info.nData);
+#endif
 
   if( NEVER(offset+amt > nKey+pCur->info.nData) 
    || &aPayload[pCur->info.nLocal] > &pPage->aData[pBt->usableSize]
@@ -53538,7 +55150,7 @@ static int accessPayload(
     if( a+offset>pCur->info.nLocal ){
       a = pCur->info.nLocal - offset;
     }
-    rc = copyPayload(&aPayload[offset], pBuf, a, eOp, pPage->pDbPage);
+    rc = copyPayload(&aPayload[offset], pBuf, a, (eOp & 0x01), pPage->pDbPage);
     offset = 0;
     pBuf += a;
     amt -= a;
@@ -53552,21 +55164,30 @@ static int accessPayload(
 
     nextPage = get4byte(&aPayload[pCur->info.nLocal]);
 
-#ifndef SQLITE_OMIT_INCRBLOB
-    /* If the isIncrblobHandle flag is set and the BtCursor.aOverflow[]
-    ** has not been allocated, allocate it now. The array is sized at
-    ** one entry for each overflow page in the overflow chain. The
-    ** page number of the first overflow page is stored in aOverflow[0],
-    ** etc. A value of 0 in the aOverflow[] array means "not yet known"
-    ** (the cache is lazily populated).
+    /* If the BtCursor.aOverflow[] has not been allocated, allocate it now.
+    ** Except, do not allocate aOverflow[] for eOp==2.
+    **
+    ** The aOverflow[] array is sized at one entry for each overflow page
+    ** in the overflow chain. The page number of the first overflow page is
+    ** stored in aOverflow[0], etc. A value of 0 in the aOverflow[] array
+    ** means "not yet known" (the cache is lazily populated).
     */
-    if( pCur->isIncrblobHandle && !pCur->aOverflow ){
+    if( eOp!=2 && (pCur->curFlags & BTCF_ValidOvfl)==0 ){
       int nOvfl = (pCur->info.nPayload-pCur->info.nLocal+ovflSize-1)/ovflSize;
-      pCur->aOverflow = (Pgno *)sqlite3MallocZero(sizeof(Pgno)*nOvfl);
-      /* nOvfl is always positive.  If it were zero, fetchPayload would have
-      ** been used instead of this routine. */
-      if( ALWAYS(nOvfl) && !pCur->aOverflow ){
-        rc = SQLITE_NOMEM;
+      if( nOvfl>pCur->nOvflAlloc ){
+        Pgno *aNew = (Pgno*)sqlite3DbRealloc(
+            pCur->pBtree->db, pCur->aOverflow, nOvfl*2*sizeof(Pgno)
+        );
+        if( aNew==0 ){
+          rc = SQLITE_NOMEM;
+        }else{
+          pCur->nOvflAlloc = nOvfl*2;
+          pCur->aOverflow = aNew;
+        }
+      }
+      if( rc==SQLITE_OK ){
+        memset(pCur->aOverflow, 0, nOvfl*sizeof(Pgno));
+        pCur->curFlags |= BTCF_ValidOvfl;
       }
     }
 
@@ -53574,22 +55195,19 @@ static int accessPayload(
     ** entry for the first required overflow page is valid, skip
     ** directly to it.
     */
-    if( pCur->aOverflow && pCur->aOverflow[offset/ovflSize] ){
+    if( (pCur->curFlags & BTCF_ValidOvfl)!=0 && pCur->aOverflow[offset/ovflSize] ){
       iIdx = (offset/ovflSize);
       nextPage = pCur->aOverflow[iIdx];
       offset = (offset%ovflSize);
     }
-#endif
 
     for( ; rc==SQLITE_OK && amt>0 && nextPage; iIdx++){
 
-#ifndef SQLITE_OMIT_INCRBLOB
       /* If required, populate the overflow page-list cache. */
-      if( pCur->aOverflow ){
+      if( (pCur->curFlags & BTCF_ValidOvfl)!=0 ){
         assert(!pCur->aOverflow[iIdx] || pCur->aOverflow[iIdx]==nextPage);
         pCur->aOverflow[iIdx] = nextPage;
       }
-#endif
 
       if( offset>=ovflSize ){
         /* The only reason to read this page is to obtain the page
@@ -53597,13 +55215,17 @@ static int accessPayload(
         ** data is not required. So first try to lookup the overflow
         ** page-list cache, if any, then fall back to the getOverflowPage()
         ** function.
+        **
+        ** Note that the aOverflow[] array must be allocated because eOp!=2
+        ** here.  If eOp==2, then offset==0 and this branch is never taken.
         */
-#ifndef SQLITE_OMIT_INCRBLOB
-        if( pCur->aOverflow && pCur->aOverflow[iIdx+1] ){
+        assert( eOp!=2 );
+        assert( pCur->curFlags & BTCF_ValidOvfl );
+        if( pCur->aOverflow[iIdx+1] ){
           nextPage = pCur->aOverflow[iIdx+1];
-        } else 
-#endif
+        }else{
           rc = getOverflowPage(pBt, nextPage, 0, &nextPage);
+        }
         offset -= ovflSize;
       }else{
         /* Need to read this page properly. It contains some of the
@@ -53625,13 +55247,15 @@ static int accessPayload(
         **   3) the database is file-backed, and
         **   4) there is no open write-transaction, and
         **   5) the database is not a WAL database,
+        **   6) all data from the page is being read.
         **
         ** then data can be read directly from the database file into the
         ** output buffer, bypassing the page-cache altogether. This speeds
         ** up loading large records that span many overflow pages.
         */
-        if( eOp==0                                             /* (1) */
+        if( (eOp&0x01)==0                                      /* (1) */
          && offset==0                                          /* (2) */
+         && (bEnd || a==ovflSize)                              /* (6) */
          && pBt->inTransaction==TRANS_READ                     /* (4) */
          && (fd = sqlite3PagerFile(pBt->pPager))->pMethods     /* (3) */
          && pBt->pPage1->aData[19]==0x01                       /* (5) */
@@ -53648,12 +55272,12 @@ static int accessPayload(
         {
           DbPage *pDbPage;
           rc = sqlite3PagerAcquire(pBt->pPager, nextPage, &pDbPage,
-              (eOp==0 ? PAGER_ACQUIRE_READONLY : 0)
+              ((eOp&0x01)==0 ? PAGER_GET_READONLY : 0)
           );
           if( rc==SQLITE_OK ){
             aPayload = sqlite3PagerGetData(pDbPage);
             nextPage = get4byte(aPayload);
-            rc = copyPayload(&aPayload[offset+4], pBuf, a, eOp, pDbPage);
+            rc = copyPayload(&aPayload[offset+4], pBuf, a, (eOp&0x01), pDbPage);
             sqlite3PagerUnref(pDbPage);
             offset = 0;
           }
@@ -53722,10 +55346,10 @@ SQLITE_PRIVATE int sqlite3BtreeData(BtCursor *pCur, u32 offset, u32 amt, void *p
 /*
 ** Return a pointer to payload information from the entry that the 
 ** pCur cursor is pointing to.  The pointer is to the beginning of
-** the key if skipKey==0 and it points to the beginning of data if
-** skipKey==1.  The number of bytes of available key/data is written
-** into *pAmt.  If *pAmt==0, then the value returned will not be
-** a valid pointer.
+** the key if index btrees (pPage->intKey==0) and is the data for
+** table btrees (pPage->intKey==1). The number of bytes of available
+** key/data is written into *pAmt.  If *pAmt==0, then the value
+** returned will not be a valid pointer.
 **
 ** This routine is an optimization.  It is common for the entire key
 ** and data to fit on the local page and for there to be no overflow
@@ -53738,41 +55362,18 @@ SQLITE_PRIVATE int sqlite3BtreeData(BtCursor *pCur, u32 offset, u32 amt, void *p
 ** page of the database.  The data might change or move the next time
 ** any btree routine is called.
 */
-static const unsigned char *fetchPayload(
+static const void *fetchPayload(
   BtCursor *pCur,      /* Cursor pointing to entry to read from */
-  int *pAmt,           /* Write the number of available bytes here */
-  int skipKey          /* read beginning at data if this is true */
+  u32 *pAmt            /* Write the number of available bytes here */
 ){
-  unsigned char *aPayload;
-  MemPage *pPage;
-  u32 nKey;
-  u32 nLocal;
-
   assert( pCur!=0 && pCur->iPage>=0 && pCur->apPage[pCur->iPage]);
   assert( pCur->eState==CURSOR_VALID );
+  assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
   assert( cursorHoldsMutex(pCur) );
-  pPage = pCur->apPage[pCur->iPage];
-  assert( pCur->aiIdx[pCur->iPage]<pPage->nCell );
-  if( NEVER(pCur->info.nSize==0) ){
-    btreeParseCell(pCur->apPage[pCur->iPage], pCur->aiIdx[pCur->iPage],
-                   &pCur->info);
-  }
-  aPayload = pCur->info.pCell;
-  aPayload += pCur->info.nHeader;
-  if( pPage->intKey ){
-    nKey = 0;
-  }else{
-    nKey = (int)pCur->info.nKey;
-  }
-  if( skipKey ){
-    aPayload += nKey;
-    nLocal = pCur->info.nLocal - nKey;
-  }else{
-    nLocal = pCur->info.nLocal;
-    assert( nLocal<=nKey );
-  }
-  *pAmt = nLocal;
-  return aPayload;
+  assert( pCur->aiIdx[pCur->iPage]<pCur->apPage[pCur->iPage]->nCell );
+  assert( pCur->info.nSize>0 );
+  *pAmt = pCur->info.nLocal;
+  return (void*)(pCur->info.pCell + pCur->info.nHeader);
 }
 
 
@@ -53790,23 +55391,11 @@ static const unsigned char *fetchPayload(
 ** These routines is used to get quick access to key and data
 ** in the common case where no overflow pages are used.
 */
-SQLITE_PRIVATE const void *sqlite3BtreeKeyFetch(BtCursor *pCur, int *pAmt){
-  const void *p = 0;
-  assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
-  assert( cursorHoldsMutex(pCur) );
-  if( ALWAYS(pCur->eState==CURSOR_VALID) ){
-    p = (const void*)fetchPayload(pCur, pAmt, 0);
-  }
-  return p;
+SQLITE_PRIVATE const void *sqlite3BtreeKeyFetch(BtCursor *pCur, u32 *pAmt){
+  return fetchPayload(pCur, pAmt);
 }
-SQLITE_PRIVATE const void *sqlite3BtreeDataFetch(BtCursor *pCur, int *pAmt){
-  const void *p = 0;
-  assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
-  assert( cursorHoldsMutex(pCur) );
-  if( ALWAYS(pCur->eState==CURSOR_VALID) ){
-    p = (const void*)fetchPayload(pCur, pAmt, 1);
-  }
-  return p;
+SQLITE_PRIVATE const void *sqlite3BtreeDataFetch(BtCursor *pCur, u32 *pAmt){
+  return fetchPayload(pCur, pAmt);
 }
 
 
@@ -53832,14 +55421,15 @@ static int moveToChild(BtCursor *pCur, u32 newPgno){
   if( pCur->iPage>=(BTCURSOR_MAX_DEPTH-1) ){
     return SQLITE_CORRUPT_BKPT;
   }
-  rc = getAndInitPage(pBt, newPgno, &pNewPage, (pCur->wrFlag==0));
+  rc = getAndInitPage(pBt, newPgno, &pNewPage,
+               (pCur->curFlags & BTCF_WriteFlag)==0 ? PAGER_GET_READONLY : 0);
   if( rc ) return rc;
   pCur->apPage[i+1] = pNewPage;
   pCur->aiIdx[i+1] = 0;
   pCur->iPage++;
 
   pCur->info.nSize = 0;
-  pCur->validNKey = 0;
+  pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
   if( pNewPage->nCell<1 || pNewPage->intKey!=pCur->apPage[i]->intKey ){
     return SQLITE_CORRUPT_BKPT;
   }
@@ -53897,7 +55487,7 @@ static void moveToParent(BtCursor *pCur){
   releasePage(pCur->apPage[pCur->iPage]);
   pCur->iPage--;
   pCur->info.nSize = 0;
-  pCur->validNKey = 0;
+  pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
 }
 
 /*
@@ -53924,8 +55514,6 @@ static void moveToParent(BtCursor *pCur){
 static int moveToRoot(BtCursor *pCur){
   MemPage *pRoot;
   int rc = SQLITE_OK;
-  Btree *p = pCur->pBtree;
-  BtShared *pBt = p->pBt;
 
   assert( cursorHoldsMutex(pCur) );
   assert( CURSOR_INVALID < CURSOR_REQUIRESEEK );
@@ -53940,55 +55528,51 @@ static int moveToRoot(BtCursor *pCur){
   }
 
   if( pCur->iPage>=0 ){
-    int i;
-    for(i=1; i<=pCur->iPage; i++){
-      releasePage(pCur->apPage[i]);
-    }
-    pCur->iPage = 0;
+    while( pCur->iPage ) releasePage(pCur->apPage[pCur->iPage--]);
   }else if( pCur->pgnoRoot==0 ){
     pCur->eState = CURSOR_INVALID;
     return SQLITE_OK;
   }else{
-    rc = getAndInitPage(pBt, pCur->pgnoRoot, &pCur->apPage[0], pCur->wrFlag==0);
+    rc = getAndInitPage(pCur->pBtree->pBt, pCur->pgnoRoot, &pCur->apPage[0],
+                 (pCur->curFlags & BTCF_WriteFlag)==0 ? PAGER_GET_READONLY : 0);
     if( rc!=SQLITE_OK ){
       pCur->eState = CURSOR_INVALID;
       return rc;
     }
     pCur->iPage = 0;
-
-    /* If pCur->pKeyInfo is not NULL, then the caller that opened this cursor
-    ** expected to open it on an index b-tree. Otherwise, if pKeyInfo is
-    ** NULL, the caller expects a table b-tree. If this is not the case,
-    ** return an SQLITE_CORRUPT error.  */
-    assert( pCur->apPage[0]->intKey==1 || pCur->apPage[0]->intKey==0 );
-    if( (pCur->pKeyInfo==0)!=pCur->apPage[0]->intKey ){
-      return SQLITE_CORRUPT_BKPT;
-    }
   }
-
-  /* Assert that the root page is of the correct type. This must be the
-  ** case as the call to this function that loaded the root-page (either
-  ** this call or a previous invocation) would have detected corruption 
-  ** if the assumption were not true, and it is not possible for the flags 
-  ** byte to have been modified while this cursor is holding a reference
-  ** to the page.  */
   pRoot = pCur->apPage[0];
   assert( pRoot->pgno==pCur->pgnoRoot );
-  assert( pRoot->isInit && (pCur->pKeyInfo==0)==pRoot->intKey );
+
+  /* If pCur->pKeyInfo is not NULL, then the caller that opened this cursor
+  ** expected to open it on an index b-tree. Otherwise, if pKeyInfo is
+  ** NULL, the caller expects a table b-tree. If this is not the case,
+  ** return an SQLITE_CORRUPT error. 
+  **
+  ** Earlier versions of SQLite assumed that this test could not fail
+  ** if the root page was already loaded when this function was called (i.e.
+  ** if pCur->iPage>=0). But this is not so if the database is corrupted 
+  ** in such a way that page pRoot is linked into a second b-tree table 
+  ** (or the freelist).  */
+  assert( pRoot->intKey==1 || pRoot->intKey==0 );
+  if( pRoot->isInit==0 || (pCur->pKeyInfo==0)!=pRoot->intKey ){
+    return SQLITE_CORRUPT_BKPT;
+  }
 
   pCur->aiIdx[0] = 0;
   pCur->info.nSize = 0;
-  pCur->atLast = 0;
-  pCur->validNKey = 0;
+  pCur->curFlags &= ~(BTCF_AtLast|BTCF_ValidNKey|BTCF_ValidOvfl);
 
-  if( pRoot->nCell==0 && !pRoot->leaf ){
+  if( pRoot->nCell>0 ){
+    pCur->eState = CURSOR_VALID;
+  }else if( !pRoot->leaf ){
     Pgno subpage;
     if( pRoot->pgno!=1 ) return SQLITE_CORRUPT_BKPT;
     subpage = get4byte(&pRoot->aData[pRoot->hdrOffset+8]);
     pCur->eState = CURSOR_VALID;
     rc = moveToChild(pCur, subpage);
   }else{
-    pCur->eState = ((pRoot->nCell>0)?CURSOR_VALID:CURSOR_INVALID);
+    pCur->eState = CURSOR_INVALID;
   }
   return rc;
 }
@@ -54040,7 +55624,7 @@ static int moveToRightmost(BtCursor *pCur){
   if( rc==SQLITE_OK ){
     pCur->aiIdx[pCur->iPage] = pPage->nCell-1;
     pCur->info.nSize = 0;
-    pCur->validNKey = 0;
+    pCur->curFlags &= ~BTCF_ValidNKey;
   }
   return rc;
 }
@@ -54079,7 +55663,7 @@ SQLITE_PRIVATE int sqlite3BtreeLast(BtCursor *pCur, int *pRes){
   assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
 
   /* If the cursor already points to the last entry, this is a no-op. */
-  if( CURSOR_VALID==pCur->eState && pCur->atLast ){
+  if( CURSOR_VALID==pCur->eState && (pCur->curFlags & BTCF_AtLast)!=0 ){
 #ifdef SQLITE_DEBUG
     /* This block serves to assert() that the cursor really does point 
     ** to the last entry in the b-tree. */
@@ -54102,7 +55686,12 @@ SQLITE_PRIVATE int sqlite3BtreeLast(BtCursor *pCur, int *pRes){
       assert( pCur->eState==CURSOR_VALID );
       *pRes = 0;
       rc = moveToRightmost(pCur);
-      pCur->atLast = rc==SQLITE_OK ?1:0;
+      if( rc==SQLITE_OK ){
+        pCur->curFlags |= BTCF_AtLast;
+      }else{
+        pCur->curFlags &= ~BTCF_AtLast;
+      }
+   
     }
   }
   return rc;
@@ -54144,6 +55733,7 @@ SQLITE_PRIVATE int sqlite3BtreeMovetoUnpacked(
   int *pRes                /* Write search results here */
 ){
   int rc;
+  RecordCompare xRecordCompare;
 
   assert( cursorHoldsMutex(pCur) );
   assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
@@ -54152,19 +55742,30 @@ SQLITE_PRIVATE int sqlite3BtreeMovetoUnpacked(
 
   /* If the cursor is already positioned at the point we are trying
   ** to move to, then just return without doing any work */
-  if( pCur->eState==CURSOR_VALID && pCur->validNKey 
+  if( pCur->eState==CURSOR_VALID && (pCur->curFlags & BTCF_ValidNKey)!=0
    && pCur->apPage[0]->intKey 
   ){
     if( pCur->info.nKey==intKey ){
       *pRes = 0;
       return SQLITE_OK;
     }
-    if( pCur->atLast && pCur->info.nKey<intKey ){
+    if( (pCur->curFlags & BTCF_AtLast)!=0 && pCur->info.nKey<intKey ){
       *pRes = -1;
       return SQLITE_OK;
     }
   }
 
+  if( pIdxKey ){
+    xRecordCompare = sqlite3VdbeFindCompare(pIdxKey);
+    pIdxKey->isCorrupt = 0;
+    assert( pIdxKey->default_rc==1 
+         || pIdxKey->default_rc==0 
+         || pIdxKey->default_rc==-1
+    );
+  }else{
+    xRecordCompare = 0; /* All keys are integers */
+  }
+
   rc = moveToRoot(pCur);
   if( rc ){
     return rc;
@@ -54179,10 +55780,10 @@ SQLITE_PRIVATE int sqlite3BtreeMovetoUnpacked(
   }
   assert( pCur->apPage[0]->intKey || pIdxKey );
   for(;;){
-    int lwr, upr, idx;
+    int lwr, upr, idx, c;
     Pgno chldPg;
     MemPage *pPage = pCur->apPage[pCur->iPage];
-    int c;
+    u8 *pCell;                          /* Pointer to current cell in pPage */
 
     /* pPage->nCell must be greater than zero. If this is the root-page
     ** the cursor would have been INVALID above and this for(;;) loop
@@ -54194,35 +55795,47 @@ SQLITE_PRIVATE int sqlite3BtreeMovetoUnpacked(
     assert( pPage->intKey==(pIdxKey==0) );
     lwr = 0;
     upr = pPage->nCell-1;
-    if( biasRight ){
-      pCur->aiIdx[pCur->iPage] = (u16)(idx = upr);
-    }else{
-      pCur->aiIdx[pCur->iPage] = (u16)(idx = (upr+lwr)/2);
-    }
-    for(;;){
-      u8 *pCell;                          /* Pointer to current cell in pPage */
-
-      assert( idx==pCur->aiIdx[pCur->iPage] );
-      pCur->info.nSize = 0;
-      pCell = findCell(pPage, idx) + pPage->childPtrSize;
-      if( pPage->intKey ){
+    assert( biasRight==0 || biasRight==1 );
+    idx = upr>>(1-biasRight); /* idx = biasRight ? upr : (lwr+upr)/2; */
+    pCur->aiIdx[pCur->iPage] = (u16)idx;
+    if( xRecordCompare==0 ){
+      for(;;){
         i64 nCellKey;
+        pCell = findCell(pPage, idx) + pPage->childPtrSize;
         if( pPage->hasData ){
-          u32 dummy;
-          pCell += getVarint32(pCell, dummy);
+          while( 0x80 <= *(pCell++) ){
+            if( pCell>=pPage->aDataEnd ) return SQLITE_CORRUPT_BKPT;
+          }
         }
         getVarint(pCell, (u64*)&nCellKey);
-        if( nCellKey==intKey ){
-          c = 0;
-        }else if( nCellKey<intKey ){
-          c = -1;
+        if( nCellKey<intKey ){
+          lwr = idx+1;
+          if( lwr>upr ){ c = -1; break; }
+        }else if( nCellKey>intKey ){
+          upr = idx-1;
+          if( lwr>upr ){ c = +1; break; }
         }else{
-          assert( nCellKey>intKey );
-          c = +1;
+          assert( nCellKey==intKey );
+          pCur->curFlags |= BTCF_ValidNKey;
+          pCur->info.nKey = nCellKey;
+          pCur->aiIdx[pCur->iPage] = (u16)idx;
+          if( !pPage->leaf ){
+            lwr = idx;
+            goto moveto_next_layer;
+          }else{
+            *pRes = 0;
+            rc = SQLITE_OK;
+            goto moveto_finish;
+          }
         }
-        pCur->validNKey = 1;
-        pCur->info.nKey = nCellKey;
-      }else{
+        assert( lwr+upr>=0 );
+        idx = (lwr+upr)>>1;  /* idx = (lwr+upr)/2; */
+      }
+    }else{
+      for(;;){
+        int nCell;
+        pCell = findCell(pPage, idx) + pPage->childPtrSize;
+
         /* The maximum supported page-size is 65536 bytes. This means that
         ** the maximum number of record bytes stored on an index B-Tree
         ** page is less than 16384 bytes and may be stored as a 2-byte
@@ -54231,23 +55844,20 @@ SQLITE_PRIVATE int sqlite3BtreeMovetoUnpacked(
         ** stored entirely within the b-tree page by inspecting the first 
         ** 2 bytes of the cell.
         */
-        int nCell = pCell[0];
-        if( nCell<=pPage->max1bytePayload
-         /* && (pCell+nCell)<pPage->aDataEnd */
-        ){
+        nCell = pCell[0];
+        if( nCell<=pPage->max1bytePayload ){
           /* This branch runs if the record-size field of the cell is a
           ** single byte varint and the record fits entirely on the main
           ** b-tree page.  */
           testcase( pCell+nCell+1==pPage->aDataEnd );
-          c = sqlite3VdbeRecordCompare(nCell, (void*)&pCell[1], pIdxKey);
+          c = xRecordCompare(nCell, (void*)&pCell[1], pIdxKey, 0);
         }else if( !(pCell[1] & 0x80) 
           && (nCell = ((nCell&0x7f)<<7) + pCell[1])<=pPage->maxLocal
-          /* && (pCell+nCell+2)<=pPage->aDataEnd */
         ){
           /* The record-size field is a 2 byte varint and the record 
           ** fits entirely on the main b-tree page.  */
           testcase( pCell+nCell+2==pPage->aDataEnd );
-          c = sqlite3VdbeRecordCompare(nCell, (void*)&pCell[2], pIdxKey);
+          c = xRecordCompare(nCell, (void*)&pCell[2], pIdxKey, 0);
         }else{
           /* The record flows over onto one or more overflow pages. In
           ** this case the whole cell needs to be parsed, a buffer allocated
@@ -54262,57 +55872,55 @@ SQLITE_PRIVATE int sqlite3BtreeMovetoUnpacked(
             rc = SQLITE_NOMEM;
             goto moveto_finish;
           }
-          rc = accessPayload(pCur, 0, nCell, (unsigned char*)pCellKey, 0);
+          pCur->aiIdx[pCur->iPage] = (u16)idx;
+          rc = accessPayload(pCur, 0, nCell, (unsigned char*)pCellKey, 2);
           if( rc ){
             sqlite3_free(pCellKey);
             goto moveto_finish;
           }
-          c = sqlite3VdbeRecordCompare(nCell, pCellKey, pIdxKey);
+          c = xRecordCompare(nCell, pCellKey, pIdxKey, 0);
           sqlite3_free(pCellKey);
         }
-      }
-      if( c==0 ){
-        if( pPage->intKey && !pPage->leaf ){
-          lwr = idx;
-          break;
+        assert( pIdxKey->isCorrupt==0 || c==0 );
+        if( c<0 ){
+          lwr = idx+1;
+        }else if( c>0 ){
+          upr = idx-1;
         }else{
+          assert( c==0 );
           *pRes = 0;
           rc = SQLITE_OK;
+          pCur->aiIdx[pCur->iPage] = (u16)idx;
+          if( pIdxKey->isCorrupt ) rc = SQLITE_CORRUPT;
           goto moveto_finish;
         }
+        if( lwr>upr ) break;
+        assert( lwr+upr>=0 );
+        idx = (lwr+upr)>>1;  /* idx = (lwr+upr)/2 */
       }
-      if( c<0 ){
-        lwr = idx+1;
-      }else{
-        upr = idx-1;
-      }
-      if( lwr>upr ){
-        break;
-      }
-      pCur->aiIdx[pCur->iPage] = (u16)(idx = (lwr+upr)/2);
     }
     assert( lwr==upr+1 || (pPage->intKey && !pPage->leaf) );
     assert( pPage->isInit );
     if( pPage->leaf ){
-      chldPg = 0;
-    }else if( lwr>=pPage->nCell ){
-      chldPg = get4byte(&pPage->aData[pPage->hdrOffset+8]);
-    }else{
-      chldPg = get4byte(findCell(pPage, lwr));
-    }
-    if( chldPg==0 ){
       assert( pCur->aiIdx[pCur->iPage]<pCur->apPage[pCur->iPage]->nCell );
+      pCur->aiIdx[pCur->iPage] = (u16)idx;
       *pRes = c;
       rc = SQLITE_OK;
       goto moveto_finish;
     }
+moveto_next_layer:
+    if( lwr>=pPage->nCell ){
+      chldPg = get4byte(&pPage->aData[pPage->hdrOffset+8]);
+    }else{
+      chldPg = get4byte(findCell(pPage, lwr));
+    }
     pCur->aiIdx[pCur->iPage] = (u16)lwr;
-    pCur->info.nSize = 0;
-    pCur->validNKey = 0;
     rc = moveToChild(pCur, chldPg);
-    if( rc ) goto moveto_finish;
+    if( rc ) break;
   }
 moveto_finish:
+  pCur->info.nSize = 0;
+  pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
   return rc;
 }
 
@@ -54337,6 +55945,15 @@ SQLITE_PRIVATE int sqlite3BtreeEof(BtCursor *pCur){
 ** successful then set *pRes=0.  If the cursor
 ** was already pointing to the last entry in the database before
 ** this routine was called, then set *pRes=1.
+**
+** The calling function will set *pRes to 0 or 1.  The initial *pRes value
+** will be 1 if the cursor being stepped corresponds to an SQL index and
+** if this routine could have been skipped if that SQL index had been
+** a unique index.  Otherwise the caller will have set *pRes to zero.
+** Zero is the common case. The btree implementation is free to use the
+** initial *pRes value as a hint to improve performance, but the current
+** SQLite btree implementation does not. (Note that the comdb2 btree
+** implementation does use this hint, however.)
 */
 SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor *pCur, int *pRes){
   int rc;
@@ -54344,21 +55961,31 @@ SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor *pCur, int *pRes){
   MemPage *pPage;
 
   assert( cursorHoldsMutex(pCur) );
-  rc = restoreCursorPosition(pCur);
-  if( rc!=SQLITE_OK ){
-    return rc;
-  }
   assert( pRes!=0 );
-  if( CURSOR_INVALID==pCur->eState ){
-    *pRes = 1;
-    return SQLITE_OK;
+  assert( *pRes==0 || *pRes==1 );
+  assert( pCur->skipNext==0 || pCur->eState!=CURSOR_VALID );
+  if( pCur->eState!=CURSOR_VALID ){
+    invalidateOverflowCache(pCur);
+    rc = restoreCursorPosition(pCur);
+    if( rc!=SQLITE_OK ){
+      *pRes = 0;
+      return rc;
+    }
+    if( CURSOR_INVALID==pCur->eState ){
+      *pRes = 1;
+      return SQLITE_OK;
+    }
+    if( pCur->skipNext ){
+      assert( pCur->eState==CURSOR_VALID || pCur->eState==CURSOR_SKIPNEXT );
+      pCur->eState = CURSOR_VALID;
+      if( pCur->skipNext>0 ){
+        pCur->skipNext = 0;
+        *pRes = 0;
+        return SQLITE_OK;
+      }
+      pCur->skipNext = 0;
+    }
   }
-  if( pCur->skipNext>0 ){
-    pCur->skipNext = 0;
-    *pRes = 0;
-    return SQLITE_OK;
-  }
-  pCur->skipNext = 0;
 
   pPage = pCur->apPage[pCur->iPage];
   idx = ++pCur->aiIdx[pCur->iPage];
@@ -54372,11 +55999,14 @@ SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor *pCur, int *pRes){
   testcase( idx>pPage->nCell );
 
   pCur->info.nSize = 0;
-  pCur->validNKey = 0;
+  pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
   if( idx>=pPage->nCell ){
     if( !pPage->leaf ){
       rc = moveToChild(pCur, get4byte(&pPage->aData[pPage->hdrOffset+8]));
-      if( rc ) return rc;
+      if( rc ){
+        *pRes = 0;
+        return rc;
+      }
       rc = moveToLeftmost(pCur);
       *pRes = 0;
       return rc;
@@ -54412,27 +56042,48 @@ SQLITE_PRIVATE int sqlite3BtreeNext(BtCursor *pCur, int *pRes){
 ** successful then set *pRes=0.  If the cursor
 ** was already pointing to the first entry in the database before
 ** this routine was called, then set *pRes=1.
+**
+** The calling function will set *pRes to 0 or 1.  The initial *pRes value
+** will be 1 if the cursor being stepped corresponds to an SQL index and
+** if this routine could have been skipped if that SQL index had been
+** a unique index.  Otherwise the caller will have set *pRes to zero.
+** Zero is the common case. The btree implementation is free to use the
+** initial *pRes value as a hint to improve performance, but the current
+** SQLite btree implementation does not. (Note that the comdb2 btree
+** implementation does use this hint, however.)
 */
 SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){
   int rc;
   MemPage *pPage;
 
   assert( cursorHoldsMutex(pCur) );
-  rc = restoreCursorPosition(pCur);
-  if( rc!=SQLITE_OK ){
-    return rc;
+  assert( pRes!=0 );
+  assert( *pRes==0 || *pRes==1 );
+  assert( pCur->skipNext==0 || pCur->eState!=CURSOR_VALID );
+  pCur->curFlags &= ~(BTCF_AtLast|BTCF_ValidOvfl);
+  if( pCur->eState!=CURSOR_VALID ){
+    if( ALWAYS(pCur->eState>=CURSOR_REQUIRESEEK) ){
+      rc = btreeRestoreCursorPosition(pCur);
+      if( rc!=SQLITE_OK ){
+        *pRes = 0;
+        return rc;
+      }
+    }
+    if( CURSOR_INVALID==pCur->eState ){
+      *pRes = 1;
+      return SQLITE_OK;
+    }
+    if( pCur->skipNext ){
+      assert( pCur->eState==CURSOR_VALID || pCur->eState==CURSOR_SKIPNEXT );
+      pCur->eState = CURSOR_VALID;
+      if( pCur->skipNext<0 ){
+        pCur->skipNext = 0;
+        *pRes = 0;
+        return SQLITE_OK;
+      }
+      pCur->skipNext = 0;
+    }
   }
-  pCur->atLast = 0;
-  if( CURSOR_INVALID==pCur->eState ){
-    *pRes = 1;
-    return SQLITE_OK;
-  }
-  if( pCur->skipNext<0 ){
-    pCur->skipNext = 0;
-    *pRes = 0;
-    return SQLITE_OK;
-  }
-  pCur->skipNext = 0;
 
   pPage = pCur->apPage[pCur->iPage];
   assert( pPage->isInit );
@@ -54440,6 +56091,7 @@ SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){
     int idx = pCur->aiIdx[pCur->iPage];
     rc = moveToChild(pCur, get4byte(findCell(pPage, idx)));
     if( rc ){
+      *pRes = 0;
       return rc;
     }
     rc = moveToRightmost(pCur);
@@ -54453,7 +56105,7 @@ SQLITE_PRIVATE int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){
       moveToParent(pCur);
     }
     pCur->info.nSize = 0;
-    pCur->validNKey = 0;
+    pCur->curFlags &= ~(BTCF_ValidNKey|BTCF_ValidOvfl);
 
     pCur->aiIdx[pCur->iPage]--;
     pPage = pCur->apPage[pCur->iPage];
@@ -54563,7 +56215,7 @@ static int allocateBtreePage(
       if( iTrunk>mxPage ){
         rc = SQLITE_CORRUPT_BKPT;
       }else{
-        rc = btreeGetPage(pBt, iTrunk, &pTrunk, 0, 0);
+        rc = btreeGetPage(pBt, iTrunk, &pTrunk, 0);
       }
       if( rc ){
         pTrunk = 0;
@@ -54627,7 +56279,7 @@ static int allocateBtreePage(
             goto end_allocate_page;
           }
           testcase( iNewTrunk==mxPage );
-          rc = btreeGetPage(pBt, iNewTrunk, &pNewTrunk, 0, 0);
+          rc = btreeGetPage(pBt, iNewTrunk, &pNewTrunk, 0);
           if( rc!=SQLITE_OK ){
             goto end_allocate_page;
           }
@@ -54706,8 +56358,8 @@ static int allocateBtreePage(
             memcpy(&aData[8+closest*4], &aData[4+k*4], 4);
           }
           put4byte(&aData[4], k-1);
-          noContent = !btreeGetHasContent(pBt, *pPgno);
-          rc = btreeGetPage(pBt, *pPgno, ppPage, noContent, 0);
+          noContent = !btreeGetHasContent(pBt, *pPgno) ? PAGER_GET_NOCONTENT : 0;
+          rc = btreeGetPage(pBt, *pPgno, ppPage, noContent);
           if( rc==SQLITE_OK ){
             rc = sqlite3PagerWrite((*ppPage)->pDbPage);
             if( rc!=SQLITE_OK ){
@@ -54739,7 +56391,7 @@ static int allocateBtreePage(
     ** here are confined to those pages that lie between the end of the
     ** database image and the end of the database file.
     */
-    int bNoContent = (0==IfNotOmitAV(pBt->bDoTruncate));
+    int bNoContent = (0==IfNotOmitAV(pBt->bDoTruncate)) ? PAGER_GET_NOCONTENT : 0;
 
     rc = sqlite3PagerWrite(pBt->pPage1->pDbPage);
     if( rc ) return rc;
@@ -54755,7 +56407,7 @@ static int allocateBtreePage(
       MemPage *pPg = 0;
       TRACE(("ALLOCATE: %d from end of file (pointer-map page)\n", pBt->nPage));
       assert( pBt->nPage!=PENDING_BYTE_PAGE(pBt) );
-      rc = btreeGetPage(pBt, pBt->nPage, &pPg, bNoContent, 0);
+      rc = btreeGetPage(pBt, pBt->nPage, &pPg, bNoContent);
       if( rc==SQLITE_OK ){
         rc = sqlite3PagerWrite(pPg->pDbPage);
         releasePage(pPg);
@@ -54769,7 +56421,7 @@ static int allocateBtreePage(
     *pPgno = pBt->nPage;
 
     assert( *pPgno!=PENDING_BYTE_PAGE(pBt) );
-    rc = btreeGetPage(pBt, *pPgno, ppPage, bNoContent, 0);
+    rc = btreeGetPage(pBt, *pPgno, ppPage, bNoContent);
     if( rc ) return rc;
     rc = sqlite3PagerWrite((*ppPage)->pDbPage);
     if( rc!=SQLITE_OK ){
@@ -54786,6 +56438,7 @@ static int allocateBtreePage(
   if( rc==SQLITE_OK ){
     if( sqlite3PagerPageRefcount((*ppPage)->pDbPage)>1 ){
       releasePage(*ppPage);
+      *ppPage = 0;
       return SQLITE_CORRUPT_BKPT;
     }
     (*ppPage)->isInit = 0;
@@ -54837,7 +56490,7 @@ static int freePage2(BtShared *pBt, MemPage *pMemPage, Pgno iPage){
     /* If the secure_delete option is enabled, then
     ** always fully overwrite deleted information with zeros.
     */
-    if( (!pPage && ((rc = btreeGetPage(pBt, iPage, &pPage, 0, 0))!=0) )
+    if( (!pPage && ((rc = btreeGetPage(pBt, iPage, &pPage, 0))!=0) )
      ||            ((rc = sqlite3PagerWrite(pPage->pDbPage))!=0)
     ){
       goto freepage_out;
@@ -54864,7 +56517,7 @@ static int freePage2(BtShared *pBt, MemPage *pMemPage, Pgno iPage){
     u32 nLeaf;                /* Initial number of leaf cells on trunk page */
 
     iTrunk = get4byte(&pPage1->aData[32]);
-    rc = btreeGetPage(pBt, iTrunk, &pTrunk, 0, 0);
+    rc = btreeGetPage(pBt, iTrunk, &pTrunk, 0);
     if( rc!=SQLITE_OK ){
       goto freepage_out;
     }
@@ -54910,7 +56563,7 @@ static int freePage2(BtShared *pBt, MemPage *pMemPage, Pgno iPage){
   ** first trunk in the free-list is full. Either way, the page being freed
   ** will become the new first trunk page in the free-list.
   */
-  if( pPage==0 && SQLITE_OK!=(rc = btreeGetPage(pBt, iPage, &pPage, 0, 0)) ){
+  if( pPage==0 && SQLITE_OK!=(rc = btreeGetPage(pBt, iPage, &pPage, 0)) ){
     goto freepage_out;
   }
   rc = sqlite3PagerWrite(pPage->pDbPage);
@@ -55047,7 +56700,7 @@ static int fillInCell(
     nHeader += 4;
   }
   if( pPage->hasData ){
-    nHeader += putVarint(&pCell[nHeader], nData+nZero);
+    nHeader += putVarint32(&pCell[nHeader], nData+nZero);
   }else{
     nData = nZero = 0;
   }
@@ -55175,7 +56828,6 @@ static void dropCell(MemPage *pPage, int idx, int sz, int *pRC){
   u32 pc;         /* Offset to cell content of cell being deleted */
   u8 *data;       /* pPage->aData */
   u8 *ptr;        /* Used to move bytes around within data[] */
-  u8 *endPtr;     /* End of loop */
   int rc;         /* The return code */
   int hdr;        /* Beginning of the header.  0 most pages.  100 page 1 */
 
@@ -55200,13 +56852,8 @@ static void dropCell(MemPage *pPage, int idx, int sz, int *pRC){
     *pRC = rc;
     return;
   }
-  endPtr = &pPage->aCellIdx[2*pPage->nCell - 2];
-  assert( (SQLITE_PTR_TO_INT(ptr)&1)==0 );  /* ptr is always 2-byte aligned */
-  while( ptr<endPtr ){
-    *(u16*)ptr = *(u16*)&ptr[2];
-    ptr += 2;
-  }
   pPage->nCell--;
+  memmove(ptr, ptr+2, 2*(pPage->nCell - idx));
   put2byte(&data[hdr+3], pPage->nCell);
   pPage->nFree += 2;
 }
@@ -55243,9 +56890,6 @@ static void insertCell(
   int ins;          /* Index in data[] where new cell pointer is inserted */
   int cellOffset;   /* Address of first cell pointer in data[] */
   u8 *data;         /* The content of the whole page */
-  u8 *ptr;          /* Used for moving information around in data[] */
-  u8 *endPtr;       /* End of the loop */
-
   int nSkip = (iChild ? 4 : 0);
 
   if( *pRC ) return;
@@ -55296,13 +56940,7 @@ static void insertCell(
     if( iChild ){
       put4byte(&data[idx], iChild);
     }
-    ptr = &data[end];
-    endPtr = &data[ins];
-    assert( (SQLITE_PTR_TO_INT(ptr)&1)==0 );  /* ptr is always 2-byte aligned */
-    while( ptr>endPtr ){
-      *(u16*)ptr = *(u16*)&ptr[-2];
-      ptr -= 2;
-    }
+    memmove(&data[ins+2], &data[ins], end-ins);
     put2byte(&data[ins], idx);
     put2byte(&data[pPage->hdrOffset+3], pPage->nCell);
 #ifndef SQLITE_OMIT_AUTOVACUUM
@@ -56492,7 +58130,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
   }
 
   assert( cursorHoldsMutex(pCur) );
-  assert( pCur->wrFlag && pBt->inTransaction==TRANS_WRITE
+  assert( (pCur->curFlags & BTCF_WriteFlag)!=0 && pBt->inTransaction==TRANS_WRITE
               && (pBt->btsFlags & BTS_READ_ONLY)==0 );
   assert( hasSharedCacheTableLock(p, pCur->pgnoRoot, pCur->pKeyInfo!=0, 2) );
 
@@ -56517,11 +58155,17 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
   rc = saveAllCursors(pBt, pCur->pgnoRoot, pCur);
   if( rc ) return rc;
 
-  /* If this is an insert into a table b-tree, invalidate any incrblob 
-  ** cursors open on the row being replaced (assuming this is a replace
-  ** operation - if it is not, the following is a no-op).  */
   if( pCur->pKeyInfo==0 ){
+    /* If this is an insert into a table b-tree, invalidate any incrblob 
+    ** cursors open on the row being replaced */
     invalidateIncrblobCursors(p, nKey, 0);
+
+    /* If the cursor is currently on the last row and we are appending a
+    ** new row onto the end, set the "loc" to avoid an unnecessary btreeMoveto()
+    ** call */
+    if( (pCur->curFlags&BTCF_ValidNKey)!=0 && nKey>0 && pCur->info.nKey==nKey-1 ){
+      loc = -1;
+    }
   }
 
   if( !loc ){
@@ -56572,7 +58216,7 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
 
   /* If no error has occurred and pPage has an overflow cell, call balance() 
   ** to redistribute the cells within the tree. Since balance() may move
-  ** the cursor, zero the BtCursor.info.nSize and BtCursor.validNKey
+  ** the cursor, zero the BtCursor.info.nSize and BTCF_ValidNKey
   ** variables.
   **
   ** Previous versions of SQLite called moveToRoot() to move the cursor
@@ -56591,8 +58235,8 @@ SQLITE_PRIVATE int sqlite3BtreeInsert(
   ** row without seeking the cursor. This can be a big performance boost.
   */
   pCur->info.nSize = 0;
-  pCur->validNKey = 0;
   if( rc==SQLITE_OK && pPage->nOverflow ){
+    pCur->curFlags &= ~(BTCF_ValidNKey);
     rc = balance(pCur);
 
     /* Must make sure nOverflow is reset to zero even if the balance()
@@ -56624,7 +58268,7 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur){
   assert( cursorHoldsMutex(pCur) );
   assert( pBt->inTransaction==TRANS_WRITE );
   assert( (pBt->btsFlags & BTS_READ_ONLY)==0 );
-  assert( pCur->wrFlag );
+  assert( pCur->curFlags & BTCF_WriteFlag );
   assert( hasSharedCacheTableLock(p, pCur->pgnoRoot, pCur->pKeyInfo!=0, 2) );
   assert( !hasReadConflicts(p, pCur->pgnoRoot) );
 
@@ -56647,7 +58291,7 @@ SQLITE_PRIVATE int sqlite3BtreeDelete(BtCursor *pCur){
   ** sub-tree headed by the child page of the cell being deleted. This makes
   ** balancing the tree following the delete operation easier.  */
   if( !pPage->leaf ){
-    int notUsed;
+    int notUsed = 0;
     rc = sqlite3BtreePrevious(pCur, &notUsed);
     if( rc ) return rc;
   }
@@ -56809,7 +58453,7 @@ static int btreeCreateTable(Btree *p, int *piTable, int createTabFlags){
       }
 
       /* Move the page currently at pgnoRoot to pgnoMove. */
-      rc = btreeGetPage(pBt, pgnoRoot, &pRoot, 0, 0);
+      rc = btreeGetPage(pBt, pgnoRoot, &pRoot, 0);
       if( rc!=SQLITE_OK ){
         return rc;
       }
@@ -56830,7 +58474,7 @@ static int btreeCreateTable(Btree *p, int *piTable, int createTabFlags){
       if( rc!=SQLITE_OK ){
         return rc;
       }
-      rc = btreeGetPage(pBt, pgnoRoot, &pRoot, 0, 0);
+      rc = btreeGetPage(pBt, pgnoRoot, &pRoot, 0);
       if( rc!=SQLITE_OK ){
         return rc;
       }
@@ -56900,6 +58544,7 @@ static int clearDatabasePage(
   int rc;
   unsigned char *pCell;
   int i;
+  int hdr;
 
   assert( sqlite3_mutex_held(pBt->mutex) );
   if( pgno>btreePagecount(pBt) ){
@@ -56908,6 +58553,7 @@ static int clearDatabasePage(
 
   rc = getAndInitPage(pBt, pgno, &pPage, 0);
   if( rc ) return rc;
+  hdr = pPage->hdrOffset;
   for(i=0; i<pPage->nCell; i++){
     pCell = findCell(pPage, i);
     if( !pPage->leaf ){
@@ -56918,7 +58564,7 @@ static int clearDatabasePage(
     if( rc ) goto cleardatabasepage_out;
   }
   if( !pPage->leaf ){
-    rc = clearDatabasePage(pBt, get4byte(&pPage->aData[8]), 1, pnChange);
+    rc = clearDatabasePage(pBt, get4byte(&pPage->aData[hdr+8]), 1, pnChange);
     if( rc ) goto cleardatabasepage_out;
   }else if( pnChange ){
     assert( pPage->intKey );
@@ -56927,7 +58573,7 @@ static int clearDatabasePage(
   if( freePageFlag ){
     freePage(pPage, &rc);
   }else if( (rc = sqlite3PagerWrite(pPage->pDbPage))==0 ){
-    zeroPage(pPage, pPage->aData[0] | PTF_LEAF);
+    zeroPage(pPage, pPage->aData[hdr] | PTF_LEAF);
   }
 
 cleardatabasepage_out:
@@ -56967,6 +58613,15 @@ SQLITE_PRIVATE int sqlite3BtreeClearTable(Btree *p, int iTable, int *pnChange){
   return rc;
 }
 
+/*
+** Delete all information from the single table that pCur is open on.
+**
+** This routine only work for pCur on an ephemeral table.
+*/
+SQLITE_PRIVATE int sqlite3BtreeClearTableOfCursor(BtCursor *pCur){
+  return sqlite3BtreeClearTable(pCur->pBtree, pCur->pgnoRoot, 0);
+}
+
 /*
 ** Erase all information in a table and add the root of the table to
 ** the freelist.  Except, the root of the principle table (the one on
@@ -57008,7 +58663,7 @@ static int btreeDropTable(Btree *p, Pgno iTable, int *piMoved){
     return SQLITE_LOCKED_SHAREDCACHE;
   }
 
-  rc = btreeGetPage(pBt, (Pgno)iTable, &pPage, 0, 0);
+  rc = btreeGetPage(pBt, (Pgno)iTable, &pPage, 0);
   if( rc ) return rc;
   rc = sqlite3BtreeClearTable(p, iTable, 0);
   if( rc ){
@@ -57043,7 +58698,7 @@ static int btreeDropTable(Btree *p, Pgno iTable, int *piMoved){
         */
         MemPage *pMove;
         releasePage(pPage);
-        rc = btreeGetPage(pBt, maxRootPgno, &pMove, 0, 0);
+        rc = btreeGetPage(pBt, maxRootPgno, &pMove, 0);
         if( rc!=SQLITE_OK ){
           return rc;
         }
@@ -57053,7 +58708,7 @@ static int btreeDropTable(Btree *p, Pgno iTable, int *piMoved){
           return rc;
         }
         pMove = 0;
-        rc = btreeGetPage(pBt, maxRootPgno, &pMove, 0, 0);
+        rc = btreeGetPage(pBt, maxRootPgno, &pMove, 0);
         freePage(pMove, &rc);
         releasePage(pMove);
         if( rc!=SQLITE_OK ){
@@ -57264,11 +58919,11 @@ static void checkAppendMsg(
     sqlite3StrAccumAppend(&pCheck->errMsg, "\n", 1);
   }
   if( zMsg1 ){
-    sqlite3StrAccumAppend(&pCheck->errMsg, zMsg1, -1);
+    sqlite3StrAccumAppendAll(&pCheck->errMsg, zMsg1);
   }
   sqlite3VXPrintf(&pCheck->errMsg, 1, zFormat, ap);
   va_end(ap);
-  if( pCheck->errMsg.mallocFailed ){
+  if( pCheck->errMsg.accError==STRACCUM_NOMEM ){
     pCheck->mallocFailed = 1;
   }
 }
@@ -57465,7 +59120,7 @@ static int checkTreePage(
   usableSize = pBt->usableSize;
   if( iPage==0 ) return 0;
   if( checkRef(pCheck, iPage, zParentContext) ) return 0;
-  if( (rc = btreeGetPage(pBt, (Pgno)iPage, &pPage, 0, 0))!=0 ){
+  if( (rc = btreeGetPage(pBt, (Pgno)iPage, &pPage, 0))!=0 ){
     checkAppendMsg(pCheck, zContext,
        "unable to get the page. error code=%d", rc);
     return 0;
@@ -57926,7 +59581,7 @@ SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void
   int rc;
   assert( cursorHoldsMutex(pCsr) );
   assert( sqlite3_mutex_held(pCsr->pBtree->db->mutex) );
-  assert( pCsr->isIncrblobHandle );
+  assert( pCsr->curFlags & BTCF_Incrblob );
 
   rc = restoreCursorPosition(pCsr);
   if( rc!=SQLITE_OK ){
@@ -57955,7 +59610,7 @@ SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void
   **   (d) there are no conflicting read-locks, and
   **   (e) the cursor points at a valid row of an intKey table.
   */
-  if( !pCsr->wrFlag ){
+  if( (pCsr->curFlags & BTCF_WriteFlag)==0 ){
     return SQLITE_READONLY;
   }
   assert( (pCsr->pBt->btsFlags & BTS_READ_ONLY)==0
@@ -57968,20 +59623,10 @@ SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void
 }
 
 /* 
-** Set a flag on this cursor to cache the locations of pages from the 
-** overflow list for the current row. This is used by cursors opened
-** for incremental blob IO only.
-**
-** This function sets a flag only. The actual page location cache
-** (stored in BtCursor.aOverflow[]) is allocated and used by function
-** accessPayload() (the worker function for sqlite3BtreeData() and
-** sqlite3BtreePutData()).
+** Mark this cursor as an incremental blob cursor.
 */
-SQLITE_PRIVATE void sqlite3BtreeCacheOverflow(BtCursor *pCur){
-  assert( cursorHoldsMutex(pCur) );
-  assert( sqlite3_mutex_held(pCur->pBtree->db->mutex) );
-  invalidateOverflowCache(pCur);
-  pCur->isIncrblobHandle = 1;
+SQLITE_PRIVATE void sqlite3BtreeIncrblobCursor(BtCursor *pCur){
+  pCur->curFlags |= BTCF_Incrblob;
 }
 #endif
 
@@ -58030,6 +59675,13 @@ SQLITE_PRIVATE void sqlite3BtreeCursorHints(BtCursor *pCsr, unsigned int mask){
   pCsr->hints = mask;
 }
 
+/*
+** Return true if the given Btree is read-only.
+*/
+SQLITE_PRIVATE int sqlite3BtreeIsReadonly(Btree *p){
+  return (p->pBt->btsFlags & BTS_READ_ONLY)!=0;
+}
+
 /************** End of btree.c ***********************************************/
 /************** Begin file backup.c ******************************************/
 /*
@@ -58047,12 +59699,6 @@ SQLITE_PRIVATE void sqlite3BtreeCursorHints(BtCursor *pCsr, unsigned int mask){
 ** API functions and the related features.
 */
 
-/* Macro to find the minimum of two numeric values.
-*/
-#ifndef MIN
-# define MIN(x,y) ((x)<(y)?(x):(y))
-#endif
-
 /*
 ** Structure allocated for each backup operation.
 */
@@ -58134,6 +59780,7 @@ static Btree *findBtree(sqlite3 *pErrorDb, sqlite3 *pDb, const char *zDb){
         rc = SQLITE_ERROR;
       }
       sqlite3DbFree(pErrorDb, pParse->zErrMsg);
+      sqlite3ParserReset(pParse);
       sqlite3StackFree(pErrorDb, pParse);
     }
     if( rc ){
@@ -58430,7 +60077,7 @@ SQLITE_API int sqlite3_backup_step(sqlite3_backup *p, int nPage){
       if( iSrcPg!=PENDING_BYTE_PAGE(p->pSrc->pBt) ){
         DbPage *pSrcPg;                             /* Source page object */
         rc = sqlite3PagerAcquire(pSrcPager, iSrcPg, &pSrcPg,
-                                 PAGER_ACQUIRE_READONLY);
+                                 PAGER_GET_READONLY);
         if( rc==SQLITE_OK ){
           rc = backupOnePage(p, iSrcPg, sqlite3PagerGetData(pSrcPg), 0);
           sqlite3PagerUnref(pSrcPg);
@@ -58563,7 +60210,7 @@ SQLITE_API int sqlite3_backup_step(sqlite3_backup *p, int nPage){
 
           /* Sync the database file to disk. */
           if( rc==SQLITE_OK ){
-            rc = sqlite3PagerSync(pDestPager);
+            rc = sqlite3PagerSync(pDestPager, 0);
           }
         }else{
           sqlite3PagerTruncateImage(pDestPager, nDestTruncate);
@@ -58638,10 +60285,10 @@ SQLITE_API int sqlite3_backup_finish(sqlite3_backup *p){
 
   /* Set the error code of the destination database handle. */
   rc = (p->rc==SQLITE_DONE) ? SQLITE_OK : p->rc;
-  sqlite3Error(p->pDestDb, rc, 0);
-
-  /* Exit the mutexes and free the backup context structure. */
   if( p->pDestDb ){
+    sqlite3Error(p->pDestDb, rc, 0);
+
+    /* Exit the mutexes and free the backup context structure. */
     sqlite3LeaveMutexAndCloseZombie(p->pDestDb);
   }
   sqlite3BtreeLeave(p->pSrc);
@@ -58804,6 +60451,42 @@ SQLITE_PRIVATE int sqlite3BtreeCopyFile(Btree *pTo, Btree *pFrom){
 ** name sqlite_value
 */
 
+#ifdef SQLITE_DEBUG
+/*
+** Check invariants on a Mem object.
+**
+** This routine is intended for use inside of assert() statements, like
+** this:    assert( sqlite3VdbeCheckMemInvariants(pMem) );
+*/
+SQLITE_PRIVATE int sqlite3VdbeCheckMemInvariants(Mem *p){
+  /* The MEM_Dyn bit is set if and only if Mem.xDel is a non-NULL destructor
+  ** function for Mem.z 
+  */
+  assert( (p->flags & MEM_Dyn)==0 || p->xDel!=0 );
+  assert( (p->flags & MEM_Dyn)!=0 || p->xDel==0 );
+
+  /* If p holds a string or blob, the Mem.z must point to exactly
+  ** one of the following:
+  **
+  **   (1) Memory in Mem.zMalloc and managed by the Mem object
+  **   (2) Memory to be freed using Mem.xDel
+  **   (3) An ephermal string or blob
+  **   (4) A static string or blob
+  */
+  if( (p->flags & (MEM_Str|MEM_Blob)) && p->z!=0 ){
+    assert( 
+      ((p->z==p->zMalloc)? 1 : 0) +
+      ((p->flags&MEM_Dyn)!=0 ? 1 : 0) +
+      ((p->flags&MEM_Ephem)!=0 ? 1 : 0) +
+      ((p->flags&MEM_Static)!=0 ? 1 : 0) == 1
+    );
+  }
+
+  return 1;
+}
+#endif
+
+
 /*
 ** If pMem is an object with a valid string representation, this routine
 ** ensures the internal encoding for the string representation is
@@ -58845,57 +60528,51 @@ SQLITE_PRIVATE int sqlite3VdbeChangeEncoding(Mem *pMem, int desiredEnc){
 
 /*
 ** Make sure pMem->z points to a writable allocation of at least 
-** n bytes.
+** min(n,32) bytes.
 **
-** If the third argument passed to this function is true, then memory
-** cell pMem must contain a string or blob. In this case the content is
-** preserved. Otherwise, if the third parameter to this function is false,
-** any current string or blob value may be discarded.
-**
-** This function sets the MEM_Dyn flag and clears any xDel callback.
-** It also clears MEM_Ephem and MEM_Static. If the preserve flag is 
-** not set, Mem.n is zeroed.
+** If the bPreserve argument is true, then copy of the content of
+** pMem->z into the new allocation.  pMem must be either a string or
+** blob if bPreserve is true.  If bPreserve is false, any prior content
+** in pMem->z is discarded.
 */
-SQLITE_PRIVATE int sqlite3VdbeMemGrow(Mem *pMem, int n, int preserve){
-  assert( 1 >=
-    ((pMem->zMalloc && pMem->zMalloc==pMem->z) ? 1 : 0) +
-    (((pMem->flags&MEM_Dyn)&&pMem->xDel) ? 1 : 0) + 
-    ((pMem->flags&MEM_Ephem) ? 1 : 0) + 
-    ((pMem->flags&MEM_Static) ? 1 : 0)
-  );
+SQLITE_PRIVATE int sqlite3VdbeMemGrow(Mem *pMem, int n, int bPreserve){
+  assert( sqlite3VdbeCheckMemInvariants(pMem) );
   assert( (pMem->flags&MEM_RowSet)==0 );
 
-  /* If the preserve flag is set to true, then the memory cell must already
+  /* If the bPreserve flag is set to true, then the memory cell must already
   ** contain a valid string or blob value.  */
-  assert( preserve==0 || pMem->flags&(MEM_Blob|MEM_Str) );
+  assert( bPreserve==0 || pMem->flags&(MEM_Blob|MEM_Str) );
+  testcase( bPreserve && pMem->z==0 );
 
-  if( n<32 ) n = 32;
-  if( sqlite3DbMallocSize(pMem->db, pMem->zMalloc)<n ){
-    if( preserve && pMem->z==pMem->zMalloc ){
+  if( pMem->zMalloc==0 || sqlite3DbMallocSize(pMem->db, pMem->zMalloc)<n ){
+    if( n<32 ) n = 32;
+    if( bPreserve && pMem->z==pMem->zMalloc ){
       pMem->z = pMem->zMalloc = sqlite3DbReallocOrFree(pMem->db, pMem->z, n);
-      preserve = 0;
+      bPreserve = 0;
     }else{
       sqlite3DbFree(pMem->db, pMem->zMalloc);
       pMem->zMalloc = sqlite3DbMallocRaw(pMem->db, n);
     }
+    if( pMem->zMalloc==0 ){
+      VdbeMemRelease(pMem);
+      pMem->z = 0;
+      pMem->flags = MEM_Null;  
+      return SQLITE_NOMEM;
+    }
   }
 
-  if( pMem->z && preserve && pMem->zMalloc && pMem->z!=pMem->zMalloc ){
+  if( pMem->z && bPreserve && pMem->z!=pMem->zMalloc ){
     memcpy(pMem->zMalloc, pMem->z, pMem->n);
   }
-  if( pMem->flags&MEM_Dyn && pMem->xDel ){
-    assert( pMem->xDel!=SQLITE_DYNAMIC );
+  if( (pMem->flags&MEM_Dyn)!=0 ){
+    assert( pMem->xDel!=0 && pMem->xDel!=SQLITE_DYNAMIC );
     pMem->xDel((void *)(pMem->z));
   }
 
   pMem->z = pMem->zMalloc;
-  if( pMem->z==0 ){
-    pMem->flags = MEM_Null;
-  }else{
-    pMem->flags &= ~(MEM_Ephem|MEM_Static);
-  }
+  pMem->flags &= ~(MEM_Dyn|MEM_Ephem|MEM_Static);
   pMem->xDel = 0;
-  return (pMem->z ? SQLITE_OK : SQLITE_NOMEM);
+  return SQLITE_OK;
 }
 
 /*
@@ -59062,9 +60739,9 @@ SQLITE_PRIVATE void sqlite3VdbeMemReleaseExternal(Mem *p){
     sqlite3VdbeMemFinalize(p, p->u.pDef);
     assert( (p->flags & MEM_Agg)==0 );
     sqlite3VdbeMemRelease(p);
-  }else if( p->flags&MEM_Dyn && p->xDel ){
+  }else if( p->flags&MEM_Dyn ){
     assert( (p->flags&MEM_RowSet)==0 );
-    assert( p->xDel!=SQLITE_DYNAMIC );
+    assert( p->xDel!=SQLITE_DYNAMIC && p->xDel!=0 );
     p->xDel((void *)p->z);
     p->xDel = 0;
   }else if( p->flags&MEM_RowSet ){
@@ -59077,27 +60754,23 @@ SQLITE_PRIVATE void sqlite3VdbeMemReleaseExternal(Mem *p){
 /*
 ** Release any memory held by the Mem. This may leave the Mem in an
 ** inconsistent state, for example with (Mem.z==0) and
-** (Mem.type==SQLITE_TEXT).
+** (Mem.flags==MEM_Str).
 */
 SQLITE_PRIVATE void sqlite3VdbeMemRelease(Mem *p){
+  assert( sqlite3VdbeCheckMemInvariants(p) );
   VdbeMemRelease(p);
-  sqlite3DbFree(p->db, p->zMalloc);
+  if( p->zMalloc ){
+    sqlite3DbFree(p->db, p->zMalloc);
+    p->zMalloc = 0;
+  }
   p->z = 0;
-  p->zMalloc = 0;
-  p->xDel = 0;
+  assert( p->xDel==0 );  /* Zeroed by VdbeMemRelease() above */
 }
 
 /*
 ** Convert a 64-bit IEEE double into a 64-bit signed integer.
-** If the double is too large, return 0x8000000000000000.
-**
-** Most systems appear to do this simply by assigning
-** variables and without the extra range tests.  But
-** there are reports that windows throws an expection
-** if the floating point value is out of range. (See ticket #2880.)
-** Because we do not completely understand the problem, we will
-** take the conservative approach and always do range tests
-** before attempting the conversion.
+** If the double is out of range of a 64-bit signed integer then
+** return the closest available 64-bit signed integer.
 */
 static i64 doubleToInt64(double r){
 #ifdef SQLITE_OMIT_FLOATING_POINT
@@ -59114,14 +60787,10 @@ static i64 doubleToInt64(double r){
   static const i64 maxInt = LARGEST_INT64;
   static const i64 minInt = SMALLEST_INT64;
 
-  if( r<(double)minInt ){
-    return minInt;
-  }else if( r>(double)maxInt ){
-    /* minInt is correct here - not maxInt.  It turns out that assigning
-    ** a very large positive number to an integer results in a very large
-    ** negative integer.  This makes no sense, but it is what x86 hardware
-    ** does so for compatibility we will do the same in software. */
+  if( r<=(double)minInt ){
     return minInt;
+  }else if( r>=(double)maxInt ){
+    return maxInt;
   }else{
     return (i64)r;
   }
@@ -59203,17 +60872,11 @@ SQLITE_PRIVATE void sqlite3VdbeIntegerAffinity(Mem *pMem){
   **
   ** The second and third terms in the following conditional enforces
   ** the second condition under the assumption that addition overflow causes
-  ** values to wrap around.  On x86 hardware, the third term is always
-  ** true and could be omitted.  But we leave it in because other
-  ** architectures might behave differently.
+  ** values to wrap around.
   */
   if( pMem->r==(double)pMem->u.i
    && pMem->u.i>SMALLEST_INT64
-#if defined(__i486__) || defined(__x86_64__)
-   && ALWAYS(pMem->u.i<LARGEST_INT64)
-#else
    && pMem->u.i<LARGEST_INT64
-#endif
   ){
     pMem->flags |= MEM_Int;
   }
@@ -59283,7 +60946,9 @@ SQLITE_PRIVATE void sqlite3VdbeMemSetNull(Mem *pMem){
     sqlite3RowSetClear(pMem->u.pRowSet);
   }
   MemSetTypeFlag(pMem, MEM_Null);
-  pMem->type = SQLITE_NULL;
+}
+SQLITE_PRIVATE void sqlite3ValueSetNull(sqlite3_value *p){
+  sqlite3VdbeMemSetNull((Mem*)p); 
 }
 
 /*
@@ -59293,7 +60958,6 @@ SQLITE_PRIVATE void sqlite3VdbeMemSetNull(Mem *pMem){
 SQLITE_PRIVATE void sqlite3VdbeMemSetZeroBlob(Mem *pMem, int n){
   sqlite3VdbeMemRelease(pMem);
   pMem->flags = MEM_Blob|MEM_Zero;
-  pMem->type = SQLITE_BLOB;
   pMem->n = 0;
   if( n<0 ) n = 0;
   pMem->u.nZero = n;
@@ -59316,7 +60980,6 @@ SQLITE_PRIVATE void sqlite3VdbeMemSetInt64(Mem *pMem, i64 val){
   sqlite3VdbeMemRelease(pMem);
   pMem->u.i = val;
   pMem->flags = MEM_Int;
-  pMem->type = SQLITE_INTEGER;
 }
 
 #ifndef SQLITE_OMIT_FLOATING_POINT
@@ -59331,7 +60994,6 @@ SQLITE_PRIVATE void sqlite3VdbeMemSetDouble(Mem *pMem, double val){
     sqlite3VdbeMemRelease(pMem);
     pMem->r = val;
     pMem->flags = MEM_Real;
-    pMem->type = SQLITE_FLOAT;
   }
 }
 #endif
@@ -59387,7 +61049,7 @@ SQLITE_PRIVATE void sqlite3VdbeMemAboutToChange(Vdbe *pVdbe, Mem *pMem){
   Mem *pX;
   for(i=1, pX=&pVdbe->aMem[1]; i<=pVdbe->nMem; i++, pX++){
     if( pX->pScopyFrom==pMem ){
-      pX->flags |= MEM_Invalid;
+      pX->flags |= MEM_Undefined;
       pX->pScopyFrom = 0;
     }
   }
@@ -59398,7 +61060,7 @@ SQLITE_PRIVATE void sqlite3VdbeMemAboutToChange(Vdbe *pVdbe, Mem *pMem){
 /*
 ** Size of struct Mem not including the Mem.zMalloc member.
 */
-#define MEMCELLSIZE (size_t)(&(((Mem *)0)->zMalloc))
+#define MEMCELLSIZE offsetof(Mem,zMalloc)
 
 /*
 ** Make an shallow copy of pFrom into pTo.  Prior contents of
@@ -59429,6 +61091,7 @@ SQLITE_PRIVATE int sqlite3VdbeMemCopy(Mem *pTo, const Mem *pFrom){
   VdbeMemRelease(pTo);
   memcpy(pTo, pFrom, MEMCELLSIZE);
   pTo->flags &= ~MEM_Dyn;
+  pTo->xDel = 0;
 
   if( pTo->flags&(MEM_Str|MEM_Blob) ){
     if( 0==(pFrom->flags&MEM_Static) ){
@@ -59539,7 +61202,6 @@ SQLITE_PRIVATE int sqlite3VdbeMemSetStr(
   pMem->n = nByte;
   pMem->flags = flags;
   pMem->enc = (enc==0 ? SQLITE_UTF8 : enc);
-  pMem->type = (enc==0 ? SQLITE_BLOB : SQLITE_TEXT);
 
 #ifndef SQLITE_OMIT_UTF16
   if( pMem->enc!=SQLITE_UTF8 && sqlite3VdbeMemHandleBom(pMem) ){
@@ -59554,124 +61216,6 @@ SQLITE_PRIVATE int sqlite3VdbeMemSetStr(
   return SQLITE_OK;
 }
 
-/*
-** Compare the values contained by the two memory cells, returning
-** negative, zero or positive if pMem1 is less than, equal to, or greater
-** than pMem2. Sorting order is NULL's first, followed by numbers (integers
-** and reals) sorted numerically, followed by text ordered by the collating
-** sequence pColl and finally blob's ordered by memcmp().
-**
-** Two NULL values are considered equal by this function.
-*/
-SQLITE_PRIVATE int sqlite3MemCompare(const Mem *pMem1, const Mem *pMem2, const CollSeq *pColl){
-  int rc;
-  int f1, f2;
-  int combined_flags;
-
-  f1 = pMem1->flags;
-  f2 = pMem2->flags;
-  combined_flags = f1|f2;
-  assert( (combined_flags & MEM_RowSet)==0 );
- 
-  /* If one value is NULL, it is less than the other. If both values
-  ** are NULL, return 0.
-  */
-  if( combined_flags&MEM_Null ){
-    return (f2&MEM_Null) - (f1&MEM_Null);
-  }
-
-  /* If one value is a number and the other is not, the number is less.
-  ** If both are numbers, compare as reals if one is a real, or as integers
-  ** if both values are integers.
-  */
-  if( combined_flags&(MEM_Int|MEM_Real) ){
-    if( !(f1&(MEM_Int|MEM_Real)) ){
-      return 1;
-    }
-    if( !(f2&(MEM_Int|MEM_Real)) ){
-      return -1;
-    }
-    if( (f1 & f2 & MEM_Int)==0 ){
-      double r1, r2;
-      if( (f1&MEM_Real)==0 ){
-        r1 = (double)pMem1->u.i;
-      }else{
-        r1 = pMem1->r;
-      }
-      if( (f2&MEM_Real)==0 ){
-        r2 = (double)pMem2->u.i;
-      }else{
-        r2 = pMem2->r;
-      }
-      if( r1<r2 ) return -1;
-      if( r1>r2 ) return 1;
-      return 0;
-    }else{
-      assert( f1&MEM_Int );
-      assert( f2&MEM_Int );
-      if( pMem1->u.i < pMem2->u.i ) return -1;
-      if( pMem1->u.i > pMem2->u.i ) return 1;
-      return 0;
-    }
-  }
-
-  /* If one value is a string and the other is a blob, the string is less.
-  ** If both are strings, compare using the collating functions.
-  */
-  if( combined_flags&MEM_Str ){
-    if( (f1 & MEM_Str)==0 ){
-      return 1;
-    }
-    if( (f2 & MEM_Str)==0 ){
-      return -1;
-    }
-
-    assert( pMem1->enc==pMem2->enc );
-    assert( pMem1->enc==SQLITE_UTF8 || 
-            pMem1->enc==SQLITE_UTF16LE || pMem1->enc==SQLITE_UTF16BE );
-
-    /* The collation sequence must be defined at this point, even if
-    ** the user deletes the collation sequence after the vdbe program is
-    ** compiled (this was not always the case).
-    */
-    assert( !pColl || pColl->xCmp );
-
-    if( pColl ){
-      if( pMem1->enc==pColl->enc ){
-        /* The strings are already in the correct encoding.  Call the
-        ** comparison function directly */
-        return pColl->xCmp(pColl->pUser,pMem1->n,pMem1->z,pMem2->n,pMem2->z);
-      }else{
-        const void *v1, *v2;
-        int n1, n2;
-        Mem c1;
-        Mem c2;
-        memset(&c1, 0, sizeof(c1));
-        memset(&c2, 0, sizeof(c2));
-        sqlite3VdbeMemShallowCopy(&c1, pMem1, MEM_Ephem);
-        sqlite3VdbeMemShallowCopy(&c2, pMem2, MEM_Ephem);
-        v1 = sqlite3ValueText((sqlite3_value*)&c1, pColl->enc);
-        n1 = v1==0 ? 0 : c1.n;
-        v2 = sqlite3ValueText((sqlite3_value*)&c2, pColl->enc);
-        n2 = v2==0 ? 0 : c2.n;
-        rc = pColl->xCmp(pColl->pUser, n1, v1, n2, v2);
-        sqlite3VdbeMemRelease(&c1);
-        sqlite3VdbeMemRelease(&c2);
-        return rc;
-      }
-    }
-    /* If a NULL pointer was passed as the collate function, fall through
-    ** to the blob case and use memcmp().  */
-  }
- 
-  /* Both values must be blobs.  Compare using memcmp().  */
-  rc = memcmp(pMem1->z, pMem2->z, (pMem1->n>pMem2->n)?pMem2->n:pMem1->n);
-  if( rc==0 ){
-    rc = pMem1->n - pMem2->n;
-  }
-  return rc;
-}
-
 /*
 ** Move data out of a btree key or data field and into a Mem structure.
 ** The data or key is taken from the entry that pCur is currently pointing
@@ -59687,13 +61231,13 @@ SQLITE_PRIVATE int sqlite3MemCompare(const Mem *pMem1, const Mem *pMem2, const C
 */
 SQLITE_PRIVATE int sqlite3VdbeMemFromBtree(
   BtCursor *pCur,   /* Cursor pointing at record to retrieve. */
-  int offset,       /* Offset from the start of data to return bytes from. */
-  int amt,          /* Number of bytes to return. */
+  u32 offset,       /* Offset from the start of data to return bytes from. */
+  u32 amt,          /* Number of bytes to return. */
   int key,          /* If true, retrieve from the btree key, not data. */
   Mem *pMem         /* OUT: Return data in this Mem structure. */
 ){
   char *zData;        /* Data from the btree layer */
-  int available = 0;  /* Number of bytes available on the local btree page */
+  u32 available = 0;  /* Number of bytes available on the local btree page */
   int rc = SQLITE_OK; /* Return code */
 
   assert( sqlite3BtreeCursorIsValid(pCur) );
@@ -59708,26 +61252,26 @@ SQLITE_PRIVATE int sqlite3VdbeMemFromBtree(
   }
   assert( zData!=0 );
 
-  if( offset+amt<=available && (pMem->flags&MEM_Dyn)==0 ){
+  if( offset+amt<=available ){
     sqlite3VdbeMemRelease(pMem);
     pMem->z = &zData[offset];
     pMem->flags = MEM_Blob|MEM_Ephem;
+    pMem->n = (int)amt;
   }else if( SQLITE_OK==(rc = sqlite3VdbeMemGrow(pMem, amt+2, 0)) ){
-    pMem->flags = MEM_Blob|MEM_Dyn|MEM_Term;
-    pMem->enc = 0;
-    pMem->type = SQLITE_BLOB;
     if( key ){
       rc = sqlite3BtreeKey(pCur, offset, amt, pMem->z);
     }else{
       rc = sqlite3BtreeData(pCur, offset, amt, pMem->z);
     }
-    pMem->z[amt] = 0;
-    pMem->z[amt+1] = 0;
-    if( rc!=SQLITE_OK ){
+    if( rc==SQLITE_OK ){
+      pMem->z[amt] = 0;
+      pMem->z[amt+1] = 0;
+      pMem->flags = MEM_Blob|MEM_Term;
+      pMem->n = (int)amt;
+    }else{
       sqlite3VdbeMemRelease(pMem);
     }
   }
-  pMem->n = amt;
 
   return rc;
 }
@@ -59785,12 +61329,186 @@ SQLITE_PRIVATE sqlite3_value *sqlite3ValueNew(sqlite3 *db){
   Mem *p = sqlite3DbMallocZero(db, sizeof(*p));
   if( p ){
     p->flags = MEM_Null;
-    p->type = SQLITE_NULL;
     p->db = db;
   }
   return p;
 }
 
+/*
+** Context object passed by sqlite3Stat4ProbeSetValue() through to 
+** valueNew(). See comments above valueNew() for details.
+*/
+struct ValueNewStat4Ctx {
+  Parse *pParse;
+  Index *pIdx;
+  UnpackedRecord **ppRec;
+  int iVal;
+};
+
+/*
+** Allocate and return a pointer to a new sqlite3_value object. If
+** the second argument to this function is NULL, the object is allocated
+** by calling sqlite3ValueNew().
+**
+** Otherwise, if the second argument is non-zero, then this function is 
+** being called indirectly by sqlite3Stat4ProbeSetValue(). If it has not
+** already been allocated, allocate the UnpackedRecord structure that 
+** that function will return to its caller here. Then return a pointer 
+** an sqlite3_value within the UnpackedRecord.a[] array.
+*/
+static sqlite3_value *valueNew(sqlite3 *db, struct ValueNewStat4Ctx *p){
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  if( p ){
+    UnpackedRecord *pRec = p->ppRec[0];
+
+    if( pRec==0 ){
+      Index *pIdx = p->pIdx;      /* Index being probed */
+      int nByte;                  /* Bytes of space to allocate */
+      int i;                      /* Counter variable */
+      int nCol = pIdx->nColumn;   /* Number of index columns including rowid */
+  
+      nByte = sizeof(Mem) * nCol + ROUND8(sizeof(UnpackedRecord));
+      pRec = (UnpackedRecord*)sqlite3DbMallocZero(db, nByte);
+      if( pRec ){
+        pRec->pKeyInfo = sqlite3KeyInfoOfIndex(p->pParse, pIdx);
+        if( pRec->pKeyInfo ){
+          assert( pRec->pKeyInfo->nField+pRec->pKeyInfo->nXField==nCol );
+          assert( pRec->pKeyInfo->enc==ENC(db) );
+          pRec->aMem = (Mem *)((u8*)pRec + ROUND8(sizeof(UnpackedRecord)));
+          for(i=0; i<nCol; i++){
+            pRec->aMem[i].flags = MEM_Null;
+            pRec->aMem[i].db = db;
+          }
+        }else{
+          sqlite3DbFree(db, pRec);
+          pRec = 0;
+        }
+      }
+      if( pRec==0 ) return 0;
+      p->ppRec[0] = pRec;
+    }
+  
+    pRec->nField = p->iVal+1;
+    return &pRec->aMem[p->iVal];
+  }
+#else
+  UNUSED_PARAMETER(p);
+#endif /* defined(SQLITE_ENABLE_STAT3_OR_STAT4) */
+  return sqlite3ValueNew(db);
+}
+
+/*
+** Extract a value from the supplied expression in the manner described
+** above sqlite3ValueFromExpr(). Allocate the sqlite3_value object
+** using valueNew().
+**
+** If pCtx is NULL and an error occurs after the sqlite3_value object
+** has been allocated, it is freed before returning. Or, if pCtx is not
+** NULL, it is assumed that the caller will free any allocated object
+** in all cases.
+*/
+static int valueFromExpr(
+  sqlite3 *db,                    /* The database connection */
+  Expr *pExpr,                    /* The expression to evaluate */
+  u8 enc,                         /* Encoding to use */
+  u8 affinity,                    /* Affinity to use */
+  sqlite3_value **ppVal,          /* Write the new value here */
+  struct ValueNewStat4Ctx *pCtx   /* Second argument for valueNew() */
+){
+  int op;
+  char *zVal = 0;
+  sqlite3_value *pVal = 0;
+  int negInt = 1;
+  const char *zNeg = "";
+  int rc = SQLITE_OK;
+
+  if( !pExpr ){
+    *ppVal = 0;
+    return SQLITE_OK;
+  }
+  op = pExpr->op;
+  if( NEVER(op==TK_REGISTER) ) op = pExpr->op2;
+
+  /* Handle negative integers in a single step.  This is needed in the
+  ** case when the value is -9223372036854775808.
+  */
+  if( op==TK_UMINUS
+   && (pExpr->pLeft->op==TK_INTEGER || pExpr->pLeft->op==TK_FLOAT) ){
+    pExpr = pExpr->pLeft;
+    op = pExpr->op;
+    negInt = -1;
+    zNeg = "-";
+  }
+
+  if( op==TK_STRING || op==TK_FLOAT || op==TK_INTEGER ){
+    pVal = valueNew(db, pCtx);
+    if( pVal==0 ) goto no_mem;
+    if( ExprHasProperty(pExpr, EP_IntValue) ){
+      sqlite3VdbeMemSetInt64(pVal, (i64)pExpr->u.iValue*negInt);
+    }else{
+      zVal = sqlite3MPrintf(db, "%s%s", zNeg, pExpr->u.zToken);
+      if( zVal==0 ) goto no_mem;
+      sqlite3ValueSetStr(pVal, -1, zVal, SQLITE_UTF8, SQLITE_DYNAMIC);
+    }
+    if( (op==TK_INTEGER || op==TK_FLOAT ) && affinity==SQLITE_AFF_NONE ){
+      sqlite3ValueApplyAffinity(pVal, SQLITE_AFF_NUMERIC, SQLITE_UTF8);
+    }else{
+      sqlite3ValueApplyAffinity(pVal, affinity, SQLITE_UTF8);
+    }
+    if( pVal->flags & (MEM_Int|MEM_Real) ) pVal->flags &= ~MEM_Str;
+    if( enc!=SQLITE_UTF8 ){
+      rc = sqlite3VdbeChangeEncoding(pVal, enc);
+    }
+  }else if( op==TK_UMINUS ) {
+    /* This branch happens for multiple negative signs.  Ex: -(-5) */
+    if( SQLITE_OK==sqlite3ValueFromExpr(db,pExpr->pLeft,enc,affinity,&pVal) 
+     && pVal!=0
+    ){
+      sqlite3VdbeMemNumerify(pVal);
+      if( pVal->u.i==SMALLEST_INT64 ){
+        pVal->flags &= ~MEM_Int;
+        pVal->flags |= MEM_Real;
+        pVal->r = (double)SMALLEST_INT64;
+      }else{
+        pVal->u.i = -pVal->u.i;
+      }
+      pVal->r = -pVal->r;
+      sqlite3ValueApplyAffinity(pVal, affinity, enc);
+    }
+  }else if( op==TK_NULL ){
+    pVal = valueNew(db, pCtx);
+    if( pVal==0 ) goto no_mem;
+  }
+#ifndef SQLITE_OMIT_BLOB_LITERAL
+  else if( op==TK_BLOB ){
+    int nVal;
+    assert( pExpr->u.zToken[0]=='x' || pExpr->u.zToken[0]=='X' );
+    assert( pExpr->u.zToken[1]=='\'' );
+    pVal = valueNew(db, pCtx);
+    if( !pVal ) goto no_mem;
+    zVal = &pExpr->u.zToken[2];
+    nVal = sqlite3Strlen30(zVal)-1;
+    assert( zVal[nVal]=='\'' );
+    sqlite3VdbeMemSetStr(pVal, sqlite3HexToBlob(db, zVal, nVal), nVal/2,
+                         0, SQLITE_DYNAMIC);
+  }
+#endif
+
+  *ppVal = pVal;
+  return rc;
+
+no_mem:
+  db->mallocFailed = 1;
+  sqlite3DbFree(db, zVal);
+  assert( *ppVal==0 );
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  if( pCtx==0 ) sqlite3ValueFree(pVal);
+#else
+  assert( pCtx==0 ); sqlite3ValueFree(pVal);
+#endif
+  return SQLITE_NOMEM;
+}
+
 /*
 ** Create a new sqlite3_value object, containing the value of pExpr.
 **
@@ -59808,106 +61526,168 @@ SQLITE_PRIVATE int sqlite3ValueFromExpr(
   u8 affinity,              /* Affinity to use */
   sqlite3_value **ppVal     /* Write the new value here */
 ){
-  int op;
-  char *zVal = 0;
+  return valueFromExpr(db, pExpr, enc, affinity, ppVal, 0);
+}
+
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+/*
+** The implementation of the sqlite_record() function. This function accepts
+** a single argument of any type. The return value is a formatted database 
+** record (a blob) containing the argument value.
+**
+** This is used to convert the value stored in the 'sample' column of the
+** sqlite_stat3 table to the record format SQLite uses internally.
+*/
+static void recordFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  const int file_format = 1;
+  int iSerial;                    /* Serial type */
+  int nSerial;                    /* Bytes of space for iSerial as varint */
+  int nVal;                       /* Bytes of space required for argv[0] */
+  int nRet;
+  sqlite3 *db;
+  u8 *aRet;
+
+  UNUSED_PARAMETER( argc );
+  iSerial = sqlite3VdbeSerialType(argv[0], file_format);
+  nSerial = sqlite3VarintLen(iSerial);
+  nVal = sqlite3VdbeSerialTypeLen(iSerial);
+  db = sqlite3_context_db_handle(context);
+
+  nRet = 1 + nSerial + nVal;
+  aRet = sqlite3DbMallocRaw(db, nRet);
+  if( aRet==0 ){
+    sqlite3_result_error_nomem(context);
+  }else{
+    aRet[0] = nSerial+1;
+    sqlite3PutVarint(&aRet[1], iSerial);
+    sqlite3VdbeSerialPut(&aRet[1+nSerial], argv[0], iSerial);
+    sqlite3_result_blob(context, aRet, nRet, SQLITE_TRANSIENT);
+    sqlite3DbFree(db, aRet);
+  }
+}
+
+/*
+** Register built-in functions used to help read ANALYZE data.
+*/
+SQLITE_PRIVATE void sqlite3AnalyzeFunctions(void){
+  static SQLITE_WSD FuncDef aAnalyzeTableFuncs[] = {
+    FUNCTION(sqlite_record,   1, 0, 0, recordFunc),
+  };
+  int i;
+  FuncDefHash *pHash = &GLOBAL(FuncDefHash, sqlite3GlobalFunctions);
+  FuncDef *aFunc = (FuncDef*)&GLOBAL(FuncDef, aAnalyzeTableFuncs);
+  for(i=0; i<ArraySize(aAnalyzeTableFuncs); i++){
+    sqlite3FuncDefInsert(pHash, &aFunc[i]);
+  }
+}
+
+/*
+** This function is used to allocate and populate UnpackedRecord 
+** structures intended to be compared against sample index keys stored 
+** in the sqlite_stat4 table.
+**
+** A single call to this function attempts to populates field iVal (leftmost 
+** is 0 etc.) of the unpacked record with a value extracted from expression
+** pExpr. Extraction of values is possible if:
+**
+**  * (pExpr==0). In this case the value is assumed to be an SQL NULL,
+**
+**  * The expression is a bound variable, and this is a reprepare, or
+**
+**  * The sqlite3ValueFromExpr() function is able to extract a value 
+**    from the expression (i.e. the expression is a literal value).
+**
+** If a value can be extracted, the affinity passed as the 5th argument
+** is applied to it before it is copied into the UnpackedRecord. Output
+** parameter *pbOk is set to true if a value is extracted, or false 
+** otherwise.
+**
+** When this function is called, *ppRec must either point to an object
+** allocated by an earlier call to this function, or must be NULL. If it
+** is NULL and a value can be successfully extracted, a new UnpackedRecord
+** is allocated (and *ppRec set to point to it) before returning.
+**
+** Unless an error is encountered, SQLITE_OK is returned. It is not an
+** error if a value cannot be extracted from pExpr. If an error does
+** occur, an SQLite error code is returned.
+*/
+SQLITE_PRIVATE int sqlite3Stat4ProbeSetValue(
+  Parse *pParse,                  /* Parse context */
+  Index *pIdx,                    /* Index being probed */
+  UnpackedRecord **ppRec,         /* IN/OUT: Probe record */
+  Expr *pExpr,                    /* The expression to extract a value from */
+  u8 affinity,                    /* Affinity to use */
+  int iVal,                       /* Array element to populate */
+  int *pbOk                       /* OUT: True if value was extracted */
+){
+  int rc = SQLITE_OK;
   sqlite3_value *pVal = 0;
-  int negInt = 1;
-  const char *zNeg = "";
+  sqlite3 *db = pParse->db;
+
+
+  struct ValueNewStat4Ctx alloc;
+  alloc.pParse = pParse;
+  alloc.pIdx = pIdx;
+  alloc.ppRec = ppRec;
+  alloc.iVal = iVal;
+
+  /* Skip over any TK_COLLATE nodes */
+  pExpr = sqlite3ExprSkipCollate(pExpr);
 
   if( !pExpr ){
-    *ppVal = 0;
-    return SQLITE_OK;
-  }
-  op = pExpr->op;
-
-  /* op can only be TK_REGISTER if we have compiled with SQLITE_ENABLE_STAT3.
-  ** The ifdef here is to enable us to achieve 100% branch test coverage even
-  ** when SQLITE_ENABLE_STAT3 is omitted.
-  */
-#ifdef SQLITE_ENABLE_STAT3
-  if( op==TK_REGISTER ) op = pExpr->op2;
-#else
-  if( NEVER(op==TK_REGISTER) ) op = pExpr->op2;
-#endif
-
-  /* Handle negative integers in a single step.  This is needed in the
-  ** case when the value is -9223372036854775808.
-  */
-  if( op==TK_UMINUS
-   && (pExpr->pLeft->op==TK_INTEGER || pExpr->pLeft->op==TK_FLOAT) ){
-    pExpr = pExpr->pLeft;
-    op = pExpr->op;
-    negInt = -1;
-    zNeg = "-";
-  }
-
-  if( op==TK_STRING || op==TK_FLOAT || op==TK_INTEGER ){
-    pVal = sqlite3ValueNew(db);
-    if( pVal==0 ) goto no_mem;
-    if( ExprHasProperty(pExpr, EP_IntValue) ){
-      sqlite3VdbeMemSetInt64(pVal, (i64)pExpr->u.iValue*negInt);
-    }else{
-      zVal = sqlite3MPrintf(db, "%s%s", zNeg, pExpr->u.zToken);
-      if( zVal==0 ) goto no_mem;
-      sqlite3ValueSetStr(pVal, -1, zVal, SQLITE_UTF8, SQLITE_DYNAMIC);
-      if( op==TK_FLOAT ) pVal->type = SQLITE_FLOAT;
+    pVal = valueNew(db, &alloc);
+    if( pVal ){
+      sqlite3VdbeMemSetNull((Mem*)pVal);
     }
-    if( (op==TK_INTEGER || op==TK_FLOAT ) && affinity==SQLITE_AFF_NONE ){
-      sqlite3ValueApplyAffinity(pVal, SQLITE_AFF_NUMERIC, SQLITE_UTF8);
-    }else{
-      sqlite3ValueApplyAffinity(pVal, affinity, SQLITE_UTF8);
-    }
-    if( pVal->flags & (MEM_Int|MEM_Real) ) pVal->flags &= ~MEM_Str;
-    if( enc!=SQLITE_UTF8 ){
-      sqlite3VdbeChangeEncoding(pVal, enc);
-    }
-  }else if( op==TK_UMINUS ) {
-    /* This branch happens for multiple negative signs.  Ex: -(-5) */
-    if( SQLITE_OK==sqlite3ValueFromExpr(db,pExpr->pLeft,enc,affinity,&pVal) ){
-      sqlite3VdbeMemNumerify(pVal);
-      if( pVal->u.i==SMALLEST_INT64 ){
-        pVal->flags &= MEM_Int;
-        pVal->flags |= MEM_Real;
-        pVal->r = (double)LARGEST_INT64;
-      }else{
-        pVal->u.i = -pVal->u.i;
+  }else if( pExpr->op==TK_VARIABLE
+        || NEVER(pExpr->op==TK_REGISTER && pExpr->op2==TK_VARIABLE)
+  ){
+    Vdbe *v;
+    int iBindVar = pExpr->iColumn;
+    sqlite3VdbeSetVarmask(pParse->pVdbe, iBindVar);
+    if( (v = pParse->pReprepare)!=0 ){
+      pVal = valueNew(db, &alloc);
+      if( pVal ){
+        rc = sqlite3VdbeMemCopy((Mem*)pVal, &v->aVar[iBindVar-1]);
+        if( rc==SQLITE_OK ){
+          sqlite3ValueApplyAffinity(pVal, affinity, ENC(db));
+        }
+        pVal->db = pParse->db;
       }
-      pVal->r = -pVal->r;
-      sqlite3ValueApplyAffinity(pVal, affinity, enc);
     }
-  }else if( op==TK_NULL ){
-    pVal = sqlite3ValueNew(db);
-    if( pVal==0 ) goto no_mem;
+  }else{
+    rc = valueFromExpr(db, pExpr, ENC(db), affinity, &pVal, &alloc);
   }
-#ifndef SQLITE_OMIT_BLOB_LITERAL
-  else if( op==TK_BLOB ){
-    int nVal;
-    assert( pExpr->u.zToken[0]=='x' || pExpr->u.zToken[0]=='X' );
-    assert( pExpr->u.zToken[1]=='\'' );
-    pVal = sqlite3ValueNew(db);
-    if( !pVal ) goto no_mem;
-    zVal = &pExpr->u.zToken[2];
-    nVal = sqlite3Strlen30(zVal)-1;
-    assert( zVal[nVal]=='\'' );
-    sqlite3VdbeMemSetStr(pVal, sqlite3HexToBlob(db, zVal, nVal), nVal/2,
-                         0, SQLITE_DYNAMIC);
-  }
-#endif
+  *pbOk = (pVal!=0);
 
-  if( pVal ){
-    sqlite3VdbeMemStoreType(pVal);
-  }
-  *ppVal = pVal;
-  return SQLITE_OK;
-
-no_mem:
-  db->mallocFailed = 1;
-  sqlite3DbFree(db, zVal);
-  sqlite3ValueFree(pVal);
-  *ppVal = 0;
-  return SQLITE_NOMEM;
+  assert( pVal==0 || pVal->db==db );
+  return rc;
 }
 
+/*
+** Unless it is NULL, the argument must be an UnpackedRecord object returned
+** by an earlier call to sqlite3Stat4ProbeSetValue(). This call deletes
+** the object.
+*/
+SQLITE_PRIVATE void sqlite3Stat4ProbeFree(UnpackedRecord *pRec){
+  if( pRec ){
+    int i;
+    int nCol = pRec->pKeyInfo->nField+pRec->pKeyInfo->nXField;
+    Mem *aMem = pRec->aMem;
+    sqlite3 *db = aMem[0].db;
+    for(i=0; i<nCol; i++){
+      sqlite3DbFree(db, aMem[i].zMalloc);
+    }
+    sqlite3KeyInfoUnref(pRec->pKeyInfo);
+    sqlite3DbFree(db, pRec);
+  }
+}
+#endif /* ifdef SQLITE_ENABLE_STAT4 */
+
 /*
 ** Change the string value of an sqlite3_value object
 */
@@ -59968,7 +61748,8 @@ SQLITE_PRIVATE int sqlite3ValueBytes(sqlite3_value *pVal, u8 enc){
 /*
 ** Create a new virtual database engine.
 */
-SQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(sqlite3 *db){
+SQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(Parse *pParse){
+  sqlite3 *db = pParse->db;
   Vdbe *p;
   p = sqlite3DbMallocZero(db, sizeof(Vdbe) );
   if( p==0 ) return 0;
@@ -59980,6 +61761,10 @@ SQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(sqlite3 *db){
   p->pPrev = 0;
   db->pVdbe = p;
   p->magic = VDBE_MAGIC_INIT;
+  p->pParse = pParse;
+  assert( pParse->aLabel==0 );
+  assert( pParse->nLabel==0 );
+  assert( pParse->nOpAlloc==0 );
   return p;
 }
 
@@ -60026,15 +61811,6 @@ SQLITE_PRIVATE void sqlite3VdbeSwap(Vdbe *pA, Vdbe *pB){
   pB->isPrepareV2 = pA->isPrepareV2;
 }
 
-#ifdef SQLITE_DEBUG
-/*
-** Turn tracing on or off
-*/
-SQLITE_PRIVATE void sqlite3VdbeTrace(Vdbe *p, FILE *trace){
-  p->trace = trace;
-}
-#endif
-
 /*
 ** Resize the Vdbe.aOp array so that it is at least one op larger than 
 ** it was.
@@ -60044,17 +61820,29 @@ SQLITE_PRIVATE void sqlite3VdbeTrace(Vdbe *p, FILE *trace){
 ** unchanged (this is so that any opcodes already allocated can be 
 ** correctly deallocated along with the rest of the Vdbe).
 */
-static int growOpArray(Vdbe *p){
+static int growOpArray(Vdbe *v){
   VdbeOp *pNew;
+  Parse *p = v->pParse;
   int nNew = (p->nOpAlloc ? p->nOpAlloc*2 : (int)(1024/sizeof(Op)));
-  pNew = sqlite3DbRealloc(p->db, p->aOp, nNew*sizeof(Op));
+  pNew = sqlite3DbRealloc(p->db, v->aOp, nNew*sizeof(Op));
   if( pNew ){
     p->nOpAlloc = sqlite3DbMallocSize(p->db, pNew)/sizeof(Op);
-    p->aOp = pNew;
+    v->aOp = pNew;
   }
   return (pNew ? SQLITE_OK : SQLITE_NOMEM);
 }
 
+#ifdef SQLITE_DEBUG
+/* This routine is just a convenient place to set a breakpoint that will
+** fire after each opcode is inserted and displayed using
+** "PRAGMA vdbe_addoptrace=on".
+*/
+static void test_addop_breakpoint(void){
+  static int n = 0;
+  n++;
+}
+#endif
+
 /*
 ** Add a new instruction to the list of instructions current in the
 ** VDBE.  Return the address of the new instruction.
@@ -60078,7 +61866,7 @@ SQLITE_PRIVATE int sqlite3VdbeAddOp3(Vdbe *p, int op, int p1, int p2, int p3){
   i = p->nOp;
   assert( p->magic==VDBE_MAGIC_INIT );
   assert( op>0 && op<0xff );
-  if( p->nOpAlloc<=i ){
+  if( p->pParse->nOpAlloc<=i ){
     if( growOpArray(p) ){
       return 1;
     }
@@ -60092,15 +61880,30 @@ SQLITE_PRIVATE int sqlite3VdbeAddOp3(Vdbe *p, int op, int p1, int p2, int p3){
   pOp->p3 = p3;
   pOp->p4.p = 0;
   pOp->p4type = P4_NOTUSED;
-#ifdef SQLITE_DEBUG
+#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
   pOp->zComment = 0;
+#endif
+#ifdef SQLITE_DEBUG
   if( p->db->flags & SQLITE_VdbeAddopTrace ){
+    int jj, kk;
+    Parse *pParse = p->pParse;
+    for(jj=kk=0; jj<SQLITE_N_COLCACHE; jj++){
+      struct yColCache *x = pParse->aColCache + jj;
+      if( x->iLevel>pParse->iCacheLevel || x->iReg==0 ) continue;
+      printf(" r[%d]={%d:%d}", x->iReg, x->iTable, x->iColumn);
+      kk++;
+    }
+    if( kk ) printf("\n");
     sqlite3VdbePrintOp(0, i, &p->aOp[i]);
+    test_addop_breakpoint();
   }
 #endif
 #ifdef VDBE_PROFILE
   pOp->cycles = 0;
   pOp->cnt = 0;
+#endif
+#ifdef SQLITE_VDBE_COVERAGE
+  pOp->iSrcLine = 0;
 #endif
   return i;
 }
@@ -60177,9 +61980,10 @@ SQLITE_PRIVATE int sqlite3VdbeAddOp4Int(
 **
 ** Zero is returned if a malloc() fails.
 */
-SQLITE_PRIVATE int sqlite3VdbeMakeLabel(Vdbe *p){
+SQLITE_PRIVATE int sqlite3VdbeMakeLabel(Vdbe *v){
+  Parse *p = v->pParse;
   int i = p->nLabel++;
-  assert( p->magic==VDBE_MAGIC_INIT );
+  assert( v->magic==VDBE_MAGIC_INIT );
   if( (i & (i-1))==0 ){
     p->aLabel = sqlite3DbReallocOrFree(p->db, p->aLabel, 
                                        (i*2+1)*sizeof(p->aLabel[0]));
@@ -60195,13 +61999,15 @@ SQLITE_PRIVATE int sqlite3VdbeMakeLabel(Vdbe *p){
 ** be inserted.  The parameter "x" must have been obtained from
 ** a prior call to sqlite3VdbeMakeLabel().
 */
-SQLITE_PRIVATE void sqlite3VdbeResolveLabel(Vdbe *p, int x){
+SQLITE_PRIVATE void sqlite3VdbeResolveLabel(Vdbe *v, int x){
+  Parse *p = v->pParse;
   int j = -1-x;
-  assert( p->magic==VDBE_MAGIC_INIT );
-  assert( j>=0 && j<p->nLabel );
-  if( p->aLabel ){
-    p->aLabel[j] = p->nOp;
+  assert( v->magic==VDBE_MAGIC_INIT );
+  assert( j<p->nLabel );
+  if( ALWAYS(j>=0) && p->aLabel ){
+    p->aLabel[j] = v->nOp;
   }
+  p->iFixedOp = v->nOp - 1;
 }
 
 /*
@@ -60349,43 +62155,79 @@ static void resolveP2Values(Vdbe *p, int *pMaxFuncArgs){
   int i;
   int nMaxArgs = *pMaxFuncArgs;
   Op *pOp;
-  int *aLabel = p->aLabel;
+  Parse *pParse = p->pParse;
+  int *aLabel = pParse->aLabel;
   p->readOnly = 1;
+  p->bIsReader = 0;
   for(pOp=p->aOp, i=p->nOp-1; i>=0; i--, pOp++){
     u8 opcode = pOp->opcode;
 
-    pOp->opflags = sqlite3OpcodeProperty[opcode];
-    if( opcode==OP_Function || opcode==OP_AggStep ){
-      if( pOp->p5>nMaxArgs ) nMaxArgs = pOp->p5;
-    }else if( (opcode==OP_Transaction && pOp->p2!=0) || opcode==OP_Vacuum ){
-      p->readOnly = 0;
-#ifndef SQLITE_OMIT_VIRTUALTABLE
-    }else if( opcode==OP_VUpdate ){
-      if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2;
-    }else if( opcode==OP_VFilter ){
-      int n;
-      assert( p->nOp - i >= 3 );
-      assert( pOp[-1].opcode==OP_Integer );
-      n = pOp[-1].p1;
-      if( n>nMaxArgs ) nMaxArgs = n;
+    /* NOTE: Be sure to update mkopcodeh.awk when adding or removing
+    ** cases from this switch! */
+    switch( opcode ){
+      case OP_Function:
+      case OP_AggStep: {
+        if( pOp->p5>nMaxArgs ) nMaxArgs = pOp->p5;
+        break;
+      }
+      case OP_Transaction: {
+        if( pOp->p2!=0 ) p->readOnly = 0;
+        /* fall thru */
+      }
+      case OP_AutoCommit:
+      case OP_Savepoint: {
+        p->bIsReader = 1;
+        break;
+      }
+#ifndef SQLITE_OMIT_WAL
+      case OP_Checkpoint:
 #endif
-    }else if( opcode==OP_Next || opcode==OP_SorterNext ){
-      pOp->p4.xAdvance = sqlite3BtreeNext;
-      pOp->p4type = P4_ADVANCE;
-    }else if( opcode==OP_Prev ){
-      pOp->p4.xAdvance = sqlite3BtreePrevious;
-      pOp->p4type = P4_ADVANCE;
+      case OP_Vacuum:
+      case OP_JournalMode: {
+        p->readOnly = 0;
+        p->bIsReader = 1;
+        break;
+      }
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+      case OP_VUpdate: {
+        if( pOp->p2>nMaxArgs ) nMaxArgs = pOp->p2;
+        break;
+      }
+      case OP_VFilter: {
+        int n;
+        assert( p->nOp - i >= 3 );
+        assert( pOp[-1].opcode==OP_Integer );
+        n = pOp[-1].p1;
+        if( n>nMaxArgs ) nMaxArgs = n;
+        break;
+      }
+#endif
+      case OP_Next:
+      case OP_NextIfOpen:
+      case OP_SorterNext: {
+        pOp->p4.xAdvance = sqlite3BtreeNext;
+        pOp->p4type = P4_ADVANCE;
+        break;
+      }
+      case OP_Prev:
+      case OP_PrevIfOpen: {
+        pOp->p4.xAdvance = sqlite3BtreePrevious;
+        pOp->p4type = P4_ADVANCE;
+        break;
+      }
     }
 
+    pOp->opflags = sqlite3OpcodeProperty[opcode];
     if( (pOp->opflags & OPFLG_JUMP)!=0 && pOp->p2<0 ){
-      assert( -1-pOp->p2<p->nLabel );
+      assert( -1-pOp->p2<pParse->nLabel );
       pOp->p2 = aLabel[-1-pOp->p2];
     }
   }
-  sqlite3DbFree(p->db, p->aLabel);
-  p->aLabel = 0;
-
+  sqlite3DbFree(p->db, pParse->aLabel);
+  pParse->aLabel = 0;
+  pParse->nLabel = 0;
   *pMaxFuncArgs = nMaxArgs;
+  assert( p->bIsReader!=0 || p->btreeMask==0 );
 }
 
 /*
@@ -60424,10 +62266,10 @@ SQLITE_PRIVATE VdbeOp *sqlite3VdbeTakeOpArray(Vdbe *p, int *pnOp, int *pnMaxArg)
 ** Add a whole list of operations to the operation stack.  Return the
 ** address of the first operation added.
 */
-SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp){
+SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp, int iLineno){
   int addr;
   assert( p->magic==VDBE_MAGIC_INIT );
-  if( p->nOp + nOp > p->nOpAlloc && growOpArray(p) ){
+  if( p->nOp + nOp > p->pParse->nOpAlloc && growOpArray(p) ){
     return 0;
   }
   addr = p->nOp;
@@ -60439,7 +62281,8 @@ SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp)
       VdbeOp *pOut = &p->aOp[i+addr];
       pOut->opcode = pIn->opcode;
       pOut->p1 = pIn->p1;
-      if( p2<0 && (sqlite3OpcodeProperty[pOut->opcode] & OPFLG_JUMP)!=0 ){
+      if( p2<0 ){
+        assert( sqlite3OpcodeProperty[pOut->opcode] & OPFLG_JUMP );
         pOut->p2 = addr + ADDR(p2);
       }else{
         pOut->p2 = p2;
@@ -60448,8 +62291,15 @@ SQLITE_PRIVATE int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp)
       pOut->p4type = P4_NOTUSED;
       pOut->p4.p = 0;
       pOut->p5 = 0;
-#ifdef SQLITE_DEBUG
+#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
       pOut->zComment = 0;
+#endif
+#ifdef SQLITE_VDBE_COVERAGE
+      pOut->iSrcLine = iLineno+i;
+#else
+      (void)iLineno;
+#endif
+#ifdef SQLITE_DEBUG
       if( p->db->flags & SQLITE_VdbeAddopTrace ){
         sqlite3VdbePrintOp(0, i+addr, &p->aOp[i+addr]);
       }
@@ -60511,8 +62361,8 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP5(Vdbe *p, u8 val){
 ** the address of the next instruction to be coded.
 */
 SQLITE_PRIVATE void sqlite3VdbeJumpHere(Vdbe *p, int addr){
-  assert( addr>=0 || p->db->mallocFailed );
-  if( addr>=0 ) sqlite3VdbeChangeP2(p, addr, p->nOp);
+  sqlite3VdbeChangeP2(p, addr, p->nOp);
+  p->pParse->iFixedOp = p->nOp - 1;
 }
 
 
@@ -60521,7 +62371,7 @@ SQLITE_PRIVATE void sqlite3VdbeJumpHere(Vdbe *p, int addr){
 ** the FuncDef is not ephermal, then do nothing.
 */
 static void freeEphemeralFunction(sqlite3 *db, FuncDef *pDef){
-  if( ALWAYS(pDef) && (pDef->flags & SQLITE_FUNC_EPHEM)!=0 ){
+  if( ALWAYS(pDef) && (pDef->funcFlags & SQLITE_FUNC_EPHEM)!=0 ){
     sqlite3DbFree(db, pDef);
   }
 }
@@ -60538,23 +62388,18 @@ static void freeP4(sqlite3 *db, int p4type, void *p4){
       case P4_REAL:
       case P4_INT64:
       case P4_DYNAMIC:
-      case P4_KEYINFO:
-      case P4_INTARRAY:
-      case P4_KEYINFO_HANDOFF: {
+      case P4_INTARRAY: {
         sqlite3DbFree(db, p4);
         break;
       }
+      case P4_KEYINFO: {
+        if( db->pnBytesFreed==0 ) sqlite3KeyInfoUnref((KeyInfo*)p4);
+        break;
+      }
       case P4_MPRINTF: {
         if( db->pnBytesFreed==0 ) sqlite3_free(p4);
         break;
       }
-      case P4_VDBEFUNC: {
-        VdbeFunc *pVdbeFunc = (VdbeFunc *)p4;
-        freeEphemeralFunction(db, pVdbeFunc->pFunc);
-        if( db->pnBytesFreed==0 ) sqlite3VdbeDeleteAuxData(pVdbeFunc, 0);
-        sqlite3DbFree(db, pVdbeFunc);
-        break;
-      }
       case P4_FUNCDEF: {
         freeEphemeralFunction(db, (FuncDef*)p4);
         break;
@@ -60587,7 +62432,7 @@ static void vdbeFreeOpArray(sqlite3 *db, Op *aOp, int nOp){
     Op *pOp;
     for(pOp=aOp; pOp<&aOp[nOp]; pOp++){
       freeP4(db, pOp->p4type, pOp->p4.p);
-#ifdef SQLITE_DEBUG
+#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
       sqlite3DbFree(db, pOp->zComment);
 #endif     
     }
@@ -60615,6 +62460,19 @@ SQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe *p, int addr){
     freeP4(db, pOp->p4type, pOp->p4.p);
     memset(pOp, 0, sizeof(pOp[0]));
     pOp->opcode = OP_Noop;
+    if( addr==p->nOp-1 ) p->nOp--;
+  }
+}
+
+/*
+** Remove the last opcode inserted
+*/
+SQLITE_PRIVATE int sqlite3VdbeDeletePriorOpcode(Vdbe *p, u8 op){
+  if( (p->nOp-1)>(p->pParse->iFixedOp) && p->aOp[p->nOp-1].opcode==op ){
+    sqlite3VdbeChangeToNoop(p, p->nOp-1);
+    return 1;
+  }else{
+    return 0;
   }
 }
 
@@ -60628,14 +62486,6 @@ SQLITE_PRIVATE void sqlite3VdbeChangeToNoop(Vdbe *p, int addr){
 ** the string is made into memory obtained from sqlite3_malloc().
 ** A value of n==0 means copy bytes of zP4 up to and including the
 ** first null byte.  If n>0 then copy n+1 bytes of zP4.
-**
-** If n==P4_KEYINFO it means that zP4 is a pointer to a KeyInfo structure.
-** A copy is made of the KeyInfo structure into memory obtained from
-** sqlite3_malloc, to be freed when the Vdbe is finalized.
-** n==P4_KEYINFO_HANDOFF indicates that zP4 points to a KeyInfo structure
-** stored in memory that the caller has obtained from sqlite3_malloc. The 
-** caller should not free the allocation, it will be freed when the Vdbe is
-** finalized.
 ** 
 ** Other values of n (P4_STATIC, P4_COLLSEQ etc.) indicate that zP4 points
 ** to a string or structure that is guaranteed to exist for the lifetime of
@@ -60650,7 +62500,7 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP4(Vdbe *p, int addr, const char *zP4, int
   db = p->db;
   assert( p->magic==VDBE_MAGIC_INIT );
   if( p->aOp==0 || db->mallocFailed ){
-    if ( n!=P4_KEYINFO && n!=P4_VTAB ) {
+    if( n!=P4_VTAB ){
       freeP4(db, n, (void*)*(char**)&zP4);
     }
     return;
@@ -60661,7 +62511,9 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP4(Vdbe *p, int addr, const char *zP4, int
     addr = p->nOp - 1;
   }
   pOp = &p->aOp[addr];
-  assert( pOp->p4type==P4_NOTUSED || pOp->p4type==P4_INT32 );
+  assert( pOp->p4type==P4_NOTUSED
+       || pOp->p4type==P4_INT32
+       || pOp->p4type==P4_KEYINFO );
   freeP4(db, pOp->p4type, pOp->p4.p);
   pOp->p4.p = 0;
   if( n==P4_INT32 ){
@@ -60673,26 +62525,6 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP4(Vdbe *p, int addr, const char *zP4, int
     pOp->p4.p = 0;
     pOp->p4type = P4_NOTUSED;
   }else if( n==P4_KEYINFO ){
-    KeyInfo *pKeyInfo;
-    int nField, nByte;
-
-    nField = ((KeyInfo*)zP4)->nField;
-    nByte = sizeof(*pKeyInfo) + (nField-1)*sizeof(pKeyInfo->aColl[0]) + nField;
-    pKeyInfo = sqlite3DbMallocRaw(0, nByte);
-    pOp->p4.pKeyInfo = pKeyInfo;
-    if( pKeyInfo ){
-      u8 *aSortOrder;
-      memcpy((char*)pKeyInfo, zP4, nByte - nField);
-      aSortOrder = pKeyInfo->aSortOrder;
-      assert( aSortOrder!=0 );
-      pKeyInfo->aSortOrder = (unsigned char*)&pKeyInfo->aColl[nField];
-      memcpy(pKeyInfo->aSortOrder, aSortOrder, nField);
-      pOp->p4type = P4_KEYINFO;
-    }else{
-      p->db->mallocFailed = 1;
-      pOp->p4type = P4_NOTUSED;
-    }
-  }else if( n==P4_KEYINFO_HANDOFF ){
     pOp->p4.p = (void*)zP4;
     pOp->p4type = P4_KEYINFO;
   }else if( n==P4_VTAB ){
@@ -60710,7 +62542,19 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP4(Vdbe *p, int addr, const char *zP4, int
   }
 }
 
-#ifndef NDEBUG
+/*
+** Set the P4 on the most recently added opcode to the KeyInfo for the
+** index given.
+*/
+SQLITE_PRIVATE void sqlite3VdbeSetP4KeyInfo(Parse *pParse, Index *pIdx){
+  Vdbe *v = pParse->pVdbe;
+  assert( v!=0 );
+  assert( pIdx!=0 );
+  sqlite3VdbeChangeP4(v, -1, (char*)sqlite3KeyInfoOfIndex(pParse, pIdx),
+                      P4_KEYINFO);
+}
+
+#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
 /*
 ** Change the comment on the most recently coded instruction.  Or
 ** insert a No-op and add the comment to that new instruction.  This
@@ -60745,6 +62589,15 @@ SQLITE_PRIVATE void sqlite3VdbeNoopComment(Vdbe *p, const char *zFormat, ...){
 }
 #endif  /* NDEBUG */
 
+#ifdef SQLITE_VDBE_COVERAGE
+/*
+** Set the value if the iSrcLine field for the previously coded instruction.
+*/
+SQLITE_PRIVATE void sqlite3VdbeSetLineNumber(Vdbe *v, int iLine){
+  sqlite3VdbeGetOp(v,-1)->iSrcLine = iLine;
+}
+#endif /* SQLITE_VDBE_COVERAGE */
+
 /*
 ** Return the opcode for a given address.  If the address is -1, then
 ** return the most recently inserted opcode.
@@ -60757,14 +62610,6 @@ SQLITE_PRIVATE void sqlite3VdbeNoopComment(Vdbe *p, const char *zFormat, ...){
 ** this routine is a valid pointer.  But because the dummy.opcode is 0,
 ** dummy will never be written to.  This is verified by code inspection and
 ** by running with Valgrind.
-**
-** About the #ifdef SQLITE_OMIT_TRACE:  Normally, this routine is never called
-** unless p->nOp>0.  This is because in the absense of SQLITE_OMIT_TRACE,
-** an OP_Trace instruction is always inserted by sqlite3VdbeGet() as soon as
-** a new VDBE is created.  So we are free to set addr to p->nOp-1 without
-** having to double-check to make sure that the result is non-negative. But
-** if SQLITE_OMIT_TRACE is defined, the OP_Trace is omitted and we do need to
-** check the value of p->nOp-1 before continuing.
 */
 SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe *p, int addr){
   /* C89 specifies that the constant "dummy" will be initialized to all
@@ -60772,9 +62617,6 @@ SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe *p, int addr){
   static VdbeOp dummy;  /* Ignore the MSVC warning about no initializer */
   assert( p->magic==VDBE_MAGIC_INIT );
   if( addr<0 ){
-#ifdef SQLITE_OMIT_TRACE
-    if( p->nOp==0 ) return (VdbeOp*)&dummy;
-#endif
     addr = p->nOp - 1;
   }
   assert( (addr>=0 && addr<p->nOp) || p->db->mallocFailed );
@@ -60785,6 +62627,97 @@ SQLITE_PRIVATE VdbeOp *sqlite3VdbeGetOp(Vdbe *p, int addr){
   }
 }
 
+#if defined(SQLITE_ENABLE_EXPLAIN_COMMENTS)
+/*
+** Return an integer value for one of the parameters to the opcode pOp
+** determined by character c.
+*/
+static int translateP(char c, const Op *pOp){
+  if( c=='1' ) return pOp->p1;
+  if( c=='2' ) return pOp->p2;
+  if( c=='3' ) return pOp->p3;
+  if( c=='4' ) return pOp->p4.i;
+  return pOp->p5;
+}
+
+/*
+** Compute a string for the "comment" field of a VDBE opcode listing.
+**
+** The Synopsis: field in comments in the vdbe.c source file gets converted
+** to an extra string that is appended to the sqlite3OpcodeName().  In the
+** absence of other comments, this synopsis becomes the comment on the opcode.
+** Some translation occurs:
+**
+**       "PX"      ->  "r[X]"
+**       "PX@PY"   ->  "r[X..X+Y-1]"  or "r[x]" if y is 0 or 1
+**       "PX@PY+1" ->  "r[X..X+Y]"    or "r[x]" if y is 0
+**       "PY..PY"  ->  "r[X..Y]"      or "r[x]" if y<=x
+*/
+static int displayComment(
+  const Op *pOp,     /* The opcode to be commented */
+  const char *zP4,   /* Previously obtained value for P4 */
+  char *zTemp,       /* Write result here */
+  int nTemp          /* Space available in zTemp[] */
+){
+  const char *zOpName;
+  const char *zSynopsis;
+  int nOpName;
+  int ii, jj;
+  zOpName = sqlite3OpcodeName(pOp->opcode);
+  nOpName = sqlite3Strlen30(zOpName);
+  if( zOpName[nOpName+1] ){
+    int seenCom = 0;
+    char c;
+    zSynopsis = zOpName += nOpName + 1;
+    for(ii=jj=0; jj<nTemp-1 && (c = zSynopsis[ii])!=0; ii++){
+      if( c=='P' ){
+        c = zSynopsis[++ii];
+        if( c=='4' ){
+          sqlite3_snprintf(nTemp-jj, zTemp+jj, "%s", zP4);
+        }else if( c=='X' ){
+          sqlite3_snprintf(nTemp-jj, zTemp+jj, "%s", pOp->zComment);
+          seenCom = 1;
+        }else{
+          int v1 = translateP(c, pOp);
+          int v2;
+          sqlite3_snprintf(nTemp-jj, zTemp+jj, "%d", v1);
+          if( strncmp(zSynopsis+ii+1, "@P", 2)==0 ){
+            ii += 3;
+            jj += sqlite3Strlen30(zTemp+jj);
+            v2 = translateP(zSynopsis[ii], pOp);
+            if( strncmp(zSynopsis+ii+1,"+1",2)==0 ){
+              ii += 2;
+              v2++;
+            }
+            if( v2>1 ){
+              sqlite3_snprintf(nTemp-jj, zTemp+jj, "..%d", v1+v2-1);
+            }
+          }else if( strncmp(zSynopsis+ii+1, "..P3", 4)==0 && pOp->p3==0 ){
+            ii += 4;
+          }
+        }
+        jj += sqlite3Strlen30(zTemp+jj);
+      }else{
+        zTemp[jj++] = c;
+      }
+    }
+    if( !seenCom && jj<nTemp-5 && pOp->zComment ){
+      sqlite3_snprintf(nTemp-jj, zTemp+jj, "; %s", pOp->zComment);
+      jj += sqlite3Strlen30(zTemp+jj);
+    }
+    if( jj<nTemp ) zTemp[jj] = 0;
+  }else if( pOp->zComment ){
+    sqlite3_snprintf(nTemp, zTemp, "%s", pOp->zComment);
+    jj = sqlite3Strlen30(zTemp);
+  }else{
+    zTemp[0] = 0;
+    jj = 0;
+  }
+  return jj;
+}
+#endif /* SQLITE_DEBUG */
+
+
 #if !defined(SQLITE_OMIT_EXPLAIN) || !defined(NDEBUG) \
      || defined(VDBE_PROFILE) || defined(SQLITE_DEBUG)
 /*
@@ -60795,17 +62728,20 @@ static char *displayP4(Op *pOp, char *zTemp, int nTemp){
   char *zP4 = zTemp;
   assert( nTemp>=20 );
   switch( pOp->p4type ){
-    case P4_KEYINFO_STATIC:
     case P4_KEYINFO: {
       int i, j;
       KeyInfo *pKeyInfo = pOp->p4.pKeyInfo;
       assert( pKeyInfo->aSortOrder!=0 );
-      sqlite3_snprintf(nTemp, zTemp, "keyinfo(%d", pKeyInfo->nField);
+      sqlite3_snprintf(nTemp, zTemp, "k(%d", pKeyInfo->nField);
       i = sqlite3Strlen30(zTemp);
       for(j=0; j<pKeyInfo->nField; j++){
         CollSeq *pColl = pKeyInfo->aColl[j];
         const char *zColl = pColl ? pColl->zName : "nil";
         int n = sqlite3Strlen30(zColl);
+        if( n==6 && memcmp(zColl,"BINARY",6)==0 ){
+          zColl = "B";
+          n = 1;
+        }
         if( i+n>nTemp-6 ){
           memcpy(&zTemp[i],",...",4);
           break;
@@ -60824,7 +62760,7 @@ static char *displayP4(Op *pOp, char *zTemp, int nTemp){
     }
     case P4_COLLSEQ: {
       CollSeq *pColl = pOp->p4.pColl;
-      sqlite3_snprintf(nTemp, zTemp, "collseq(%.20s)", pColl->zName);
+      sqlite3_snprintf(nTemp, zTemp, "(%.20s)", pColl->zName);
       break;
     }
     case P4_FUNCDEF: {
@@ -60978,16 +62914,21 @@ SQLITE_PRIVATE void sqlite3VdbeLeave(Vdbe *p){
 SQLITE_PRIVATE void sqlite3VdbePrintOp(FILE *pOut, int pc, Op *pOp){
   char *zP4;
   char zPtr[50];
-  static const char *zFormat1 = "%4d %-13s %4d %4d %4d %-4s %.2X %s\n";
+  char zCom[100];
+  static const char *zFormat1 = "%4d %-13s %4d %4d %4d %-13s %.2X %s\n";
   if( pOut==0 ) pOut = stdout;
   zP4 = displayP4(pOp, zPtr, sizeof(zPtr));
+#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
+  displayComment(pOp, zP4, zCom, sizeof(zCom));
+#else
+  zCom[0] = 0;
+#endif
+  /* NB:  The sqlite3OpcodeName() function is implemented by code created
+  ** by the mkopcodeh.awk and mkopcodec.awk scripts which extract the
+  ** information from the vdbe.c source text */
   fprintf(pOut, zFormat1, pc, 
       sqlite3OpcodeName(pOp->opcode), pOp->p1, pOp->p2, pOp->p3, zP4, pOp->p5,
-#ifdef SQLITE_DEBUG
-      pOp->zComment ? pOp->zComment : ""
-#else
-      ""
-#endif
+      zCom
   );
   fflush(pOut);
 }
@@ -61009,6 +62950,7 @@ static void releaseMemArray(Mem *p, int N){
     }
     for(pEnd=&p[N]; p<pEnd; p++){
       assert( (&p[1])==pEnd || p[0].db==p[1].db );
+      assert( sqlite3VdbeCheckMemInvariants(p) );
 
       /* This block is really an inlined version of sqlite3VdbeMemRelease()
       ** that takes advantage of the fact that the memory cell value is 
@@ -61022,6 +62964,10 @@ static void releaseMemArray(Mem *p, int N){
       ** with no indexes using a single prepared INSERT statement, bind() 
       ** and reset(). Inserts are grouped into a transaction.
       */
+      testcase( p->flags & MEM_Agg );
+      testcase( p->flags & MEM_Dyn );
+      testcase( p->flags & MEM_Frame );
+      testcase( p->flags & MEM_RowSet );
       if( p->flags&(MEM_Agg|MEM_Dyn|MEM_Frame|MEM_RowSet) ){
         sqlite3VdbeMemRelease(p);
       }else if( p->zMalloc ){
@@ -61029,7 +62975,7 @@ static void releaseMemArray(Mem *p, int N){
         p->zMalloc = 0;
       }
 
-      p->flags = MEM_Invalid;
+      p->flags = MEM_Undefined;
     }
     db->mallocFailed = malloc_failed;
   }
@@ -61133,7 +63079,7 @@ SQLITE_PRIVATE int sqlite3VdbeList(
     rc = SQLITE_ERROR;
     sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3ErrStr(p->rc));
   }else{
-    char *z;
+    char *zP4;
     Op *pOp;
     if( i<p->nOp ){
       /* The output line number is small enough that we are still in the
@@ -61151,15 +63097,13 @@ SQLITE_PRIVATE int sqlite3VdbeList(
     }
     if( p->explain==1 ){
       pMem->flags = MEM_Int;
-      pMem->type = SQLITE_INTEGER;
       pMem->u.i = i;                                /* Program counter */
       pMem++;
   
       pMem->flags = MEM_Static|MEM_Str|MEM_Term;
-      pMem->z = (char*)sqlite3OpcodeName(pOp->opcode);  /* Opcode */
+      pMem->z = (char*)sqlite3OpcodeName(pOp->opcode); /* Opcode */
       assert( pMem->z!=0 );
       pMem->n = sqlite3Strlen30(pMem->z);
-      pMem->type = SQLITE_TEXT;
       pMem->enc = SQLITE_UTF8;
       pMem++;
 
@@ -61185,33 +63129,29 @@ SQLITE_PRIVATE int sqlite3VdbeList(
 
     pMem->flags = MEM_Int;
     pMem->u.i = pOp->p1;                          /* P1 */
-    pMem->type = SQLITE_INTEGER;
     pMem++;
 
     pMem->flags = MEM_Int;
     pMem->u.i = pOp->p2;                          /* P2 */
-    pMem->type = SQLITE_INTEGER;
     pMem++;
 
     pMem->flags = MEM_Int;
     pMem->u.i = pOp->p3;                          /* P3 */
-    pMem->type = SQLITE_INTEGER;
     pMem++;
 
     if( sqlite3VdbeMemGrow(pMem, 32, 0) ){            /* P4 */
       assert( p->db->mallocFailed );
       return SQLITE_ERROR;
     }
-    pMem->flags = MEM_Dyn|MEM_Str|MEM_Term;
-    z = displayP4(pOp, pMem->z, 32);
-    if( z!=pMem->z ){
-      sqlite3VdbeMemSetStr(pMem, z, -1, SQLITE_UTF8, 0);
+    pMem->flags = MEM_Str|MEM_Term;
+    zP4 = displayP4(pOp, pMem->z, 32);
+    if( zP4!=pMem->z ){
+      sqlite3VdbeMemSetStr(pMem, zP4, -1, SQLITE_UTF8, 0);
     }else{
       assert( pMem->z!=0 );
       pMem->n = sqlite3Strlen30(pMem->z);
       pMem->enc = SQLITE_UTF8;
     }
-    pMem->type = SQLITE_TEXT;
     pMem++;
 
     if( p->explain==1 ){
@@ -61219,26 +63159,23 @@ SQLITE_PRIVATE int sqlite3VdbeList(
         assert( p->db->mallocFailed );
         return SQLITE_ERROR;
       }
-      pMem->flags = MEM_Dyn|MEM_Str|MEM_Term;
+      pMem->flags = MEM_Str|MEM_Term;
       pMem->n = 2;
       sqlite3_snprintf(3, pMem->z, "%.2x", pOp->p5);   /* P5 */
-      pMem->type = SQLITE_TEXT;
       pMem->enc = SQLITE_UTF8;
       pMem++;
   
-#ifdef SQLITE_DEBUG
-      if( pOp->zComment ){
-        pMem->flags = MEM_Str|MEM_Term;
-        pMem->z = pOp->zComment;
-        pMem->n = sqlite3Strlen30(pMem->z);
-        pMem->enc = SQLITE_UTF8;
-        pMem->type = SQLITE_TEXT;
-      }else
-#endif
-      {
-        pMem->flags = MEM_Null;                       /* Comment */
-        pMem->type = SQLITE_NULL;
+#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
+      if( sqlite3VdbeMemGrow(pMem, 500, 0) ){
+        assert( p->db->mallocFailed );
+        return SQLITE_ERROR;
       }
+      pMem->flags = MEM_Str|MEM_Term;
+      pMem->n = displayComment(pOp, zP4, pMem->z, 500);
+      pMem->enc = SQLITE_UTF8;
+#else
+      pMem->flags = MEM_Null;                       /* Comment */
+#endif
     }
 
     p->nResColumn = 8 - 4*(p->explain-1);
@@ -61255,15 +63192,17 @@ SQLITE_PRIVATE int sqlite3VdbeList(
 ** Print the SQL that was used to generate a VDBE program.
 */
 SQLITE_PRIVATE void sqlite3VdbePrintSql(Vdbe *p){
-  int nOp = p->nOp;
-  VdbeOp *pOp;
-  if( nOp<1 ) return;
-  pOp = &p->aOp[0];
-  if( pOp->opcode==OP_Trace && pOp->p4.z!=0 ){
-    const char *z = pOp->p4.z;
-    while( sqlite3Isspace(*z) ) z++;
-    printf("SQL: [%s]\n", z);
+  const char *z = 0;
+  if( p->zSql ){
+    z = p->zSql;
+  }else if( p->nOp>=1 ){
+    const VdbeOp *pOp = &p->aOp[0];
+    if( pOp->opcode==OP_Init && pOp->p4.z!=0 ){
+      z = pOp->p4.z;
+      while( sqlite3Isspace(*z) ) z++;
+    }
   }
+  if( z ) printf("SQL: [%s]\n", z);
 }
 #endif
 
@@ -61277,7 +63216,7 @@ SQLITE_PRIVATE void sqlite3VdbeIOTraceSql(Vdbe *p){
   if( sqlite3IoTrace==0 ) return;
   if( nOp<1 ) return;
   pOp = &p->aOp[0];
-  if( pOp->opcode==OP_Trace && pOp->p4.z!=0 ){
+  if( pOp->opcode==OP_Init && pOp->p4.z!=0 ){
     int i, j;
     char z[1000];
     sqlite3_snprintf(sizeof(z), z, "%s", pOp->p4.z);
@@ -61414,6 +63353,7 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady(
   assert( p->nOp>0 );
   assert( pParse!=0 );
   assert( p->magic==VDBE_MAGIC_INIT );
+  assert( pParse==p->pParse );
   db = p->db;
   assert( db->mallocFailed==0 );
   nVar = pParse->nVar;
@@ -61437,8 +63377,8 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady(
   /* Allocate space for memory registers, SQL variables, VDBE cursors and 
   ** an array to marshal SQL function arguments in.
   */
-  zCsr = (u8*)&p->aOp[p->nOp];       /* Memory avaliable for allocation */
-  zEnd = (u8*)&p->aOp[p->nOpAlloc];  /* First byte past end of zCsr[] */
+  zCsr = (u8*)&p->aOp[p->nOp];            /* Memory avaliable for allocation */
+  zEnd = (u8*)&p->aOp[pParse->nOpAlloc];  /* First byte past end of zCsr[] */
 
   resolveP2Values(p, &nArg);
   p->usesStmtJournal = (u8)(pParse->isMultiWrite && pParse->mayAbort);
@@ -61494,7 +63434,7 @@ SQLITE_PRIVATE void sqlite3VdbeMakeReady(
     p->aMem--;                      /* aMem[] goes from 1..nMem */
     p->nMem = nMem;                 /*       not from 0..nMem-1 */
     for(n=1; n<=nMem; n++){
-      p->aMem[n].flags = MEM_Invalid;
+      p->aMem[n].flags = MEM_Undefined;
       p->aMem[n].db = db;
     }
   }
@@ -61521,7 +63461,7 @@ SQLITE_PRIVATE void sqlite3VdbeFreeCursor(Vdbe *p, VdbeCursor *pCx){
 #ifndef SQLITE_OMIT_VIRTUALTABLE
   if( pCx->pVtabCursor ){
     sqlite3_vtab_cursor *pVtabCursor = pCx->pVtabCursor;
-    const sqlite3_module *pModule = pCx->pModule;
+    const sqlite3_module *pModule = pVtabCursor->pVtab->pModule;
     p->inVtabMethod = 1;
     pModule->xClose(pVtabCursor);
     p->inVtabMethod = 0;
@@ -61584,6 +63524,10 @@ static void closeAllCursors(Vdbe *p){
     p->pDelFrame = pDel->pParent;
     sqlite3VdbeFrameDelete(pDel);
   }
+
+  /* Delete any auxdata allocations made by the VM */
+  sqlite3VdbeDeleteAuxData(p, -1, 0);
+  assert( p->pAuxData==0 );
 }
 
 /*
@@ -61602,7 +63546,7 @@ static void Cleanup(Vdbe *p){
   int i;
   if( p->apCsr ) for(i=0; i<p->nCursor; i++) assert( p->apCsr[i]==0 );
   if( p->aMem ){
-    for(i=1; i<=p->nMem; i++) assert( p->aMem[i].flags==MEM_Invalid );
+    for(i=1; i<=p->nMem; i++) assert( p->aMem[i].flags==MEM_Undefined );
   }
 #endif
 
@@ -61692,7 +63636,7 @@ static int vdbeCommit(sqlite3 *db, Vdbe *p){
   ** required, as an xSync() callback may add an attached database
   ** to the transaction.
   */
-  rc = sqlite3VtabSync(db, &p->zErrMsg);
+  rc = sqlite3VtabSync(db, p);
 
   /* This loop determines (a) if the commit hook should be invoked and
   ** (b) how many database files have open write transactions, not 
@@ -61911,7 +63855,7 @@ static int vdbeCommit(sqlite3 *db, Vdbe *p){
 }
 
 /* 
-** This routine checks that the sqlite3.activeVdbeCnt count variable
+** This routine checks that the sqlite3.nVdbeActive count variable
 ** matches the number of vdbe's in the list sqlite3.pVdbe that are
 ** currently active. An assertion fails if the two counts do not match.
 ** This is an internal self-check only - it is not an essential processing
@@ -61924,16 +63868,19 @@ static void checkActiveVdbeCnt(sqlite3 *db){
   Vdbe *p;
   int cnt = 0;
   int nWrite = 0;
+  int nRead = 0;
   p = db->pVdbe;
   while( p ){
     if( p->magic==VDBE_MAGIC_RUN && p->pc>=0 ){
       cnt++;
       if( p->readOnly==0 ) nWrite++;
+      if( p->bIsReader ) nRead++;
     }
     p = p->pNext;
   }
-  assert( cnt==db->activeVdbeCnt );
-  assert( nWrite==db->writeVdbeCnt );
+  assert( cnt==db->nVdbeActive );
+  assert( nWrite==db->nVdbeWrite );
+  assert( nRead==db->nVdbeRead );
 }
 #else
 #define checkActiveVdbeCnt(x)
@@ -61944,7 +63891,7 @@ static void checkActiveVdbeCnt(sqlite3 *db){
 ** close it now. Argument eOp must be either SAVEPOINT_ROLLBACK or
 ** SAVEPOINT_RELEASE. If it is SAVEPOINT_ROLLBACK, then the statement
 ** transaction is rolled back. If eOp is SAVEPOINT_RELEASE, then the 
-** statement transaction is commtted.
+** statement transaction is committed.
 **
 ** If an IO error occurs, an SQLITE_IOERR_XXX error code is returned. 
 ** Otherwise SQLITE_OK.
@@ -61998,6 +63945,7 @@ SQLITE_PRIVATE int sqlite3VdbeCloseStatement(Vdbe *p, int eOp){
     ** the statement transaction was opened.  */
     if( eOp==SAVEPOINT_ROLLBACK ){
       db->nDeferredCons = p->nStmtDefCons;
+      db->nDeferredImmCons = p->nStmtDefImmCons;
     }
   }
   return rc;
@@ -62016,10 +63964,12 @@ SQLITE_PRIVATE int sqlite3VdbeCloseStatement(Vdbe *p, int eOp){
 #ifndef SQLITE_OMIT_FOREIGN_KEY
 SQLITE_PRIVATE int sqlite3VdbeCheckFk(Vdbe *p, int deferred){
   sqlite3 *db = p->db;
-  if( (deferred && db->nDeferredCons>0) || (!deferred && p->nFkConstraint>0) ){
+  if( (deferred && (db->nDeferredCons+db->nDeferredImmCons)>0) 
+   || (!deferred && p->nFkConstraint>0) 
+  ){
     p->rc = SQLITE_CONSTRAINT_FOREIGNKEY;
     p->errorAction = OE_Abort;
-    sqlite3SetString(&p->zErrMsg, db, "foreign key constraint failed");
+    sqlite3SetString(&p->zErrMsg, db, "FOREIGN KEY constraint failed");
     return SQLITE_ERROR;
   }
   return SQLITE_OK;
@@ -62069,8 +64019,9 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){
   }
   checkActiveVdbeCnt(db);
 
-  /* No commit or rollback needed if the program never started */
-  if( p->pc>=0 ){
+  /* No commit or rollback needed if the program never started or if the
+  ** SQL statement does not read or write a database file.  */
+  if( p->pc>=0 && p->bIsReader ){
     int mrc;   /* Primary error code from p->rc */
     int eStatementOp = 0;
     int isSpecialError;            /* Set to true if a 'special' error */
@@ -62123,7 +64074,7 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){
     */
     if( !sqlite3VtabInSync(db) 
      && db->autoCommit 
-     && db->writeVdbeCnt==(p->readOnly==0) 
+     && db->nVdbeWrite==(p->readOnly==0) 
     ){
       if( p->rc==SQLITE_OK || (p->errorAction==OE_Fail && !isSpecialError) ){
         rc = sqlite3VdbeCheckFk(p, 1);
@@ -62148,6 +64099,8 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){
           sqlite3RollbackAll(db, SQLITE_OK);
         }else{
           db->nDeferredCons = 0;
+          db->nDeferredImmCons = 0;
+          db->flags &= ~SQLITE_DeferFKs;
           sqlite3CommitInternalChanges(db);
         }
       }else{
@@ -62204,11 +64157,12 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){
 
   /* We have successfully halted and closed the VM.  Record this fact. */
   if( p->pc>=0 ){
-    db->activeVdbeCnt--;
-    if( !p->readOnly ){
-      db->writeVdbeCnt--;
-    }
-    assert( db->activeVdbeCnt>=db->writeVdbeCnt );
+    db->nVdbeActive--;
+    if( !p->readOnly ) db->nVdbeWrite--;
+    if( p->bIsReader ) db->nVdbeRead--;
+    assert( db->nVdbeActive>=db->nVdbeRead );
+    assert( db->nVdbeRead>=db->nVdbeWrite );
+    assert( db->nVdbeWrite>=0 );
   }
   p->magic = VDBE_MAGIC_HALT;
   checkActiveVdbeCnt(db);
@@ -62224,7 +64178,7 @@ SQLITE_PRIVATE int sqlite3VdbeHalt(Vdbe *p){
     sqlite3ConnectionUnlocked(db);
   }
 
-  assert( db->activeVdbeCnt>0 || db->autoCommit==0 || db->nStatement==0 );
+  assert( db->nVdbeActive>0 || db->autoCommit==0 || db->nStatement==0 );
   return (p->rc==SQLITE_BUSY ? SQLITE_BUSY : SQLITE_OK);
 }
 
@@ -62251,6 +64205,7 @@ SQLITE_PRIVATE int sqlite3VdbeTransferError(Vdbe *p){
   if( p->zErrMsg ){
     u8 mallocFailed = db->mallocFailed;
     sqlite3BeginBenignMalloc();
+    if( db->pErr==0 ) db->pErr = sqlite3ValueNew(db);
     sqlite3ValueSetStr(db->pErr, -1, p->zErrMsg, SQLITE_UTF8, SQLITE_TRANSIENT);
     sqlite3EndBenignMalloc();
     db->mallocFailed = mallocFailed;
@@ -62319,8 +64274,7 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){
     ** to sqlite3_step(). For consistency (since sqlite3_step() was
     ** called), set the database error in this case as well.
     */
-    sqlite3Error(db, p->rc, 0);
-    sqlite3ValueSetStr(db->pErr, -1, p->zErrMsg, SQLITE_UTF8, SQLITE_TRANSIENT);
+    sqlite3Error(db, p->rc, p->zErrMsg ? "%s" : 0, p->zErrMsg);
     sqlite3DbFree(db, p->zErrMsg);
     p->zErrMsg = 0;
   }
@@ -62341,18 +64295,31 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){
         fprintf(out, "%02x", p->aOp[i].opcode);
       }
       fprintf(out, "\n");
+      if( p->zSql ){
+        char c, pc = 0;
+        fprintf(out, "-- ");
+        for(i=0; (c = p->zSql[i])!=0; i++){
+          if( pc=='\n' ) fprintf(out, "-- ");
+          putc(c, out);
+          pc = c;
+        }
+        if( pc!='\n' ) fprintf(out, "\n");
+      }
       for(i=0; i<p->nOp; i++){
-        fprintf(out, "%6d %10lld %8lld ",
+        char zHdr[100];
+        sqlite3_snprintf(sizeof(zHdr), zHdr, "%6u %12llu %8llu ",
            p->aOp[i].cnt,
            p->aOp[i].cycles,
            p->aOp[i].cnt>0 ? p->aOp[i].cycles/p->aOp[i].cnt : 0
         );
+        fprintf(out, "%s", zHdr);
         sqlite3VdbePrintOp(out, i, &p->aOp[i]);
       }
       fclose(out);
     }
   }
 #endif
+  p->iCurrentTime = 0;
   p->magic = VDBE_MAGIC_INIT;
   return p->rc & db->errMask;
 }
@@ -62372,20 +64339,36 @@ SQLITE_PRIVATE int sqlite3VdbeFinalize(Vdbe *p){
 }
 
 /*
-** Call the destructor for each auxdata entry in pVdbeFunc for which
-** the corresponding bit in mask is clear.  Auxdata entries beyond 31
-** are always destroyed.  To destroy all auxdata entries, call this
-** routine with mask==0.
+** If parameter iOp is less than zero, then invoke the destructor for
+** all auxiliary data pointers currently cached by the VM passed as
+** the first argument.
+**
+** Or, if iOp is greater than or equal to zero, then the destructor is
+** only invoked for those auxiliary data pointers created by the user 
+** function invoked by the OP_Function opcode at instruction iOp of 
+** VM pVdbe, and only then if:
+**
+**    * the associated function parameter is the 32nd or later (counting
+**      from left to right), or
+**
+**    * the corresponding bit in argument mask is clear (where the first
+**      function parameter corrsponds to bit 0 etc.).
 */
-SQLITE_PRIVATE void sqlite3VdbeDeleteAuxData(VdbeFunc *pVdbeFunc, int mask){
-  int i;
-  for(i=0; i<pVdbeFunc->nAux; i++){
-    struct AuxData *pAux = &pVdbeFunc->apAux[i];
-    if( (i>31 || !(mask&(((u32)1)<<i))) && pAux->pAux ){
+SQLITE_PRIVATE void sqlite3VdbeDeleteAuxData(Vdbe *pVdbe, int iOp, int mask){
+  AuxData **pp = &pVdbe->pAuxData;
+  while( *pp ){
+    AuxData *pAux = *pp;
+    if( (iOp<0)
+     || (pAux->iOp==iOp && (pAux->iArg>31 || !(mask & MASKBIT32(pAux->iArg))))
+    ){
+      testcase( pAux->iArg==31 );
       if( pAux->xDelete ){
         pAux->xDelete(pAux->pAux);
       }
-      pAux->pAux = 0;
+      *pp = pAux->pNext;
+      sqlite3DbFree(pVdbe->db, pAux);
+    }else{
+      pp= &pAux->pNext;
     }
   }
 }
@@ -62411,7 +64394,6 @@ SQLITE_PRIVATE void sqlite3VdbeClearObject(sqlite3 *db, Vdbe *p){
   }
   for(i=p->nzVar-1; i>=0; i--) sqlite3DbFree(db, p->azVar[i]);
   vdbeFreeOpArray(db, p->aOp, p->nOp);
-  sqlite3DbFree(db, p->aLabel);
   sqlite3DbFree(db, p->aColName);
   sqlite3DbFree(db, p->zSql);
   sqlite3DbFree(db, p->pFree);
@@ -62475,13 +64457,13 @@ SQLITE_PRIVATE int sqlite3VdbeCursorMoveto(VdbeCursor *p){
 #endif
     p->deferredMoveto = 0;
     p->cacheStatus = CACHE_STALE;
-  }else if( ALWAYS(p->pCursor) ){
+  }else if( p->pCursor ){
     int hasMoved;
     int rc = sqlite3BtreeCursorHasMoved(p->pCursor, &hasMoved);
     if( rc ) return rc;
     if( hasMoved ){
       p->cacheStatus = CACHE_STALE;
-      p->nullRow = 1;
+      if( hasMoved==2 ) p->nullRow = 1;
     }
   }
   return SQLITE_OK;
@@ -62642,21 +64624,15 @@ static u64 floatSwap(u64 in){
 ** buf. It is assumed that the caller has allocated sufficient space.
 ** Return the number of bytes written.
 **
-** nBuf is the amount of space left in buf[].  nBuf must always be
-** large enough to hold the entire field.  Except, if the field is
-** a blob with a zero-filled tail, then buf[] might be just the right
-** size to hold everything except for the zero-filled tail.  If buf[]
-** is only big enough to hold the non-zero prefix, then only write that
-** prefix into buf[].  But if buf[] is large enough to hold both the
-** prefix and the tail then write the prefix and set the tail to all
-** zeros.
+** nBuf is the amount of space left in buf[].  The caller is responsible
+** for allocating enough space to buf[] to hold the entire field, exclusive
+** of the pMem->u.nZero bytes for a MEM_Zero value.
 **
 ** Return the number of bytes actually written into buf[].  The number
 ** of bytes in the zero-filled tail is included in the return value only
 ** if those bytes were zeroed in buf[].
 */ 
-SQLITE_PRIVATE u32 sqlite3VdbeSerialPut(u8 *buf, int nBuf, Mem *pMem, int file_format){
-  u32 serial_type = sqlite3VdbeSerialType(pMem, file_format);
+SQLITE_PRIVATE u32 sqlite3VdbeSerialPut(u8 *buf, Mem *pMem, u32 serial_type){
   u32 len;
 
   /* Integer and Real */
@@ -62671,7 +64647,6 @@ SQLITE_PRIVATE u32 sqlite3VdbeSerialPut(u8 *buf, int nBuf, Mem *pMem, int file_f
       v = pMem->u.i;
     }
     len = i = sqlite3VdbeSerialTypeLen(serial_type);
-    assert( len<=(u32)nBuf );
     while( i-- ){
       buf[i] = (u8)(v&0xFF);
       v >>= 8;
@@ -62683,17 +64658,8 @@ SQLITE_PRIVATE u32 sqlite3VdbeSerialPut(u8 *buf, int nBuf, Mem *pMem, int file_f
   if( serial_type>=12 ){
     assert( pMem->n + ((pMem->flags & MEM_Zero)?pMem->u.nZero:0)
              == (int)sqlite3VdbeSerialTypeLen(serial_type) );
-    assert( pMem->n<=nBuf );
     len = pMem->n;
     memcpy(buf, pMem->z, len);
-    if( pMem->flags & MEM_Zero ){
-      len += pMem->u.nZero;
-      assert( nBuf>=0 );
-      if( len > (u32)nBuf ){
-        len = (u32)nBuf;
-      }
-      memset(&buf[pMem->n], 0, len-pMem->n);
-    }
     return len;
   }
 
@@ -62701,6 +64667,14 @@ SQLITE_PRIVATE u32 sqlite3VdbeSerialPut(u8 *buf, int nBuf, Mem *pMem, int file_f
   return 0;
 }
 
+/* Input "x" is a sequence of unsigned characters that represent a
+** big-endian integer.  Return the equivalent native integer
+*/
+#define ONE_BYTE_INT(x)    ((i8)(x)[0])
+#define TWO_BYTE_INT(x)    (256*(i8)((x)[0])|(x)[1])
+#define THREE_BYTE_INT(x)  (65536*(i8)((x)[0])|((x)[1]<<8)|(x)[2])
+#define FOUR_BYTE_UINT(x)  (((u32)(x)[0]<<24)|((x)[1]<<16)|((x)[2]<<8)|(x)[3])
+
 /*
 ** Deserialize the data blob pointed to by buf as serial type serial_type
 ** and store the result in pMem.  Return the number of bytes read.
@@ -62710,6 +64684,8 @@ SQLITE_PRIVATE u32 sqlite3VdbeSerialGet(
   u32 serial_type,              /* Serial type to deserialize */
   Mem *pMem                     /* Memory cell to write value into */
 ){
+  u64 x;
+  u32 y;
   switch( serial_type ){
     case 10:   /* Reserved for future use */
     case 11:   /* Reserved for future use */
@@ -62718,37 +64694,38 @@ SQLITE_PRIVATE u32 sqlite3VdbeSerialGet(
       break;
     }
     case 1: { /* 1-byte signed integer */
-      pMem->u.i = (signed char)buf[0];
+      pMem->u.i = ONE_BYTE_INT(buf);
       pMem->flags = MEM_Int;
+      testcase( pMem->u.i<0 );
       return 1;
     }
     case 2: { /* 2-byte signed integer */
-      pMem->u.i = (((signed char)buf[0])<<8) | buf[1];
+      pMem->u.i = TWO_BYTE_INT(buf);
       pMem->flags = MEM_Int;
+      testcase( pMem->u.i<0 );
       return 2;
     }
     case 3: { /* 3-byte signed integer */
-      pMem->u.i = (((signed char)buf[0])<<16) | (buf[1]<<8) | buf[2];
+      pMem->u.i = THREE_BYTE_INT(buf);
       pMem->flags = MEM_Int;
+      testcase( pMem->u.i<0 );
       return 3;
     }
     case 4: { /* 4-byte signed integer */
-      pMem->u.i = (buf[0]<<24) | (buf[1]<<16) | (buf[2]<<8) | buf[3];
+      y = FOUR_BYTE_UINT(buf);
+      pMem->u.i = (i64)*(int*)&y;
       pMem->flags = MEM_Int;
+      testcase( pMem->u.i<0 );
       return 4;
     }
     case 5: { /* 6-byte signed integer */
-      u64 x = (((signed char)buf[0])<<8) | buf[1];
-      u32 y = (buf[2]<<24) | (buf[3]<<16) | (buf[4]<<8) | buf[5];
-      x = (x<<32) | y;
-      pMem->u.i = *(i64*)&x;
+      pMem->u.i = FOUR_BYTE_UINT(buf+2) + (((i64)1)<<32)*TWO_BYTE_INT(buf);
       pMem->flags = MEM_Int;
+      testcase( pMem->u.i<0 );
       return 6;
     }
     case 6:   /* 8-byte signed integer */
     case 7: { /* IEEE floating point */
-      u64 x;
-      u32 y;
 #if !defined(NDEBUG) && !defined(SQLITE_OMIT_FLOATING_POINT)
       /* Verify that integers and floating point values use the same
       ** byte order.  Or, that if SQLITE_MIXED_ENDIAN_64BIT_FLOAT is
@@ -62761,13 +64738,13 @@ SQLITE_PRIVATE u32 sqlite3VdbeSerialGet(
       swapMixedEndianFloat(t2);
       assert( sizeof(r1)==sizeof(t2) && memcmp(&r1, &t2, sizeof(r1))==0 );
 #endif
-
-      x = (buf[0]<<24) | (buf[1]<<16) | (buf[2]<<8) | buf[3];
-      y = (buf[4]<<24) | (buf[5]<<16) | (buf[6]<<8) | buf[7];
+      x = FOUR_BYTE_UINT(buf);
+      y = FOUR_BYTE_UINT(buf+4);
       x = (x<<32) | y;
       if( serial_type==6 ){
         pMem->u.i = *(i64*)&x;
         pMem->flags = MEM_Int;
+        testcase( pMem->u.i<0 );
       }else{
         assert( sizeof(x)==8 && sizeof(pMem->r)==8 );
         swapMixedEndianFloat(x);
@@ -62783,15 +64760,12 @@ SQLITE_PRIVATE u32 sqlite3VdbeSerialGet(
       return 0;
     }
     default: {
+      static const u16 aFlag[] = { MEM_Blob|MEM_Ephem, MEM_Str|MEM_Ephem };
       u32 len = (serial_type-12)/2;
       pMem->z = (char *)buf;
       pMem->n = len;
       pMem->xDel = 0;
-      if( serial_type&0x01 ){
-        pMem->flags = MEM_Str | MEM_Ephem;
-      }else{
-        pMem->flags = MEM_Blob | MEM_Ephem;
-      }
+      pMem->flags = aFlag[serial_type&1];
       return len;
     }
   }
@@ -62862,7 +64836,7 @@ SQLITE_PRIVATE void sqlite3VdbeRecordUnpack(
   u32 szHdr;
   Mem *pMem = p->aMem;
 
-  p->flags = 0;
+  p->default_rc = 0;
   assert( EIGHT_BYTE_ALIGNMENT(pMem) );
   idx = getVarint32(aKey, szHdr);
   d = szHdr;
@@ -62883,32 +64857,23 @@ SQLITE_PRIVATE void sqlite3VdbeRecordUnpack(
   p->nField = u;
 }
 
+#if SQLITE_DEBUG
 /*
-** This function compares the two table rows or index records
-** specified by {nKey1, pKey1} and pPKey2.  It returns a negative, zero
-** or positive integer if key1 is less than, equal to or 
-** greater than key2.  The {nKey1, pKey1} key must be a blob
-** created by th OP_MakeRecord opcode of the VDBE.  The pPKey2
-** key must be a parsed key such as obtained from
-** sqlite3VdbeParseRecord.
-**
-** Key1 and Key2 do not have to contain the same number of fields.
-** The key with fewer fields is usually compares less than the 
-** longer key.  However if the UNPACKED_INCRKEY flags in pPKey2 is set
-** and the common prefixes are equal, then key1 is less than key2.
-** Or if the UNPACKED_MATCH_PREFIX flag is set and the prefixes are
-** equal, then the keys are considered to be equal and
-** the parts beyond the common prefix are ignored.
+** This function compares two index or table record keys in the same way
+** as the sqlite3VdbeRecordCompare() routine. Unlike VdbeRecordCompare(),
+** this function deserializes and compares values using the
+** sqlite3VdbeSerialGet() and sqlite3MemCompare() functions. It is used
+** in assert() statements to ensure that the optimized code in
+** sqlite3VdbeRecordCompare() returns results with these two primitives.
 */
-SQLITE_PRIVATE int sqlite3VdbeRecordCompare(
+static int vdbeRecordCompareDebug(
   int nKey1, const void *pKey1, /* Left key */
-  UnpackedRecord *pPKey2        /* Right key */
+  const UnpackedRecord *pPKey2  /* Right key */
 ){
-  int d1;            /* Offset into aKey[] of next data element */
+  u32 d1;            /* Offset into aKey[] of next data element */
   u32 idx1;          /* Offset into aKey[] of next header element */
   u32 szHdr1;        /* Number of bytes in header */
   int i = 0;
-  int nField;
   int rc = 0;
   const unsigned char *aKey1 = (const unsigned char *)pKey1;
   KeyInfo *pKeyInfo;
@@ -62931,14 +64896,27 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompare(
   
   idx1 = getVarint32(aKey1, szHdr1);
   d1 = szHdr1;
-  nField = pKeyInfo->nField;
+  assert( pKeyInfo->nField+pKeyInfo->nXField>=pPKey2->nField || CORRUPT_DB );
   assert( pKeyInfo->aSortOrder!=0 );
-  while( idx1<szHdr1 && i<pPKey2->nField ){
+  assert( pKeyInfo->nField>0 );
+  assert( idx1<=szHdr1 || CORRUPT_DB );
+  do{
     u32 serial_type1;
 
     /* Read the serial types for the next element in each key. */
     idx1 += getVarint32( aKey1+idx1, serial_type1 );
-    if( d1>=nKey1 && sqlite3VdbeSerialTypeLen(serial_type1)>0 ) break;
+
+    /* Verify that there is enough key space remaining to avoid
+    ** a buffer overread.  The "d1+serial_type1+2" subexpression will
+    ** always be greater than or equal to the amount of required key space.
+    ** Use that approximation to avoid the more expensive call to
+    ** sqlite3VdbeSerialTypeLen() in the common case.
+    */
+    if( d1+serial_type1+2>(u32)nKey1
+     && d1+sqlite3VdbeSerialTypeLen(serial_type1)>(u32)nKey1 
+    ){
+      break;
+    }
 
     /* Extract the values to be compared.
     */
@@ -62946,32 +64924,16 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompare(
 
     /* Do the comparison
     */
-    rc = sqlite3MemCompare(&mem1, &pPKey2->aMem[i],
-                           i<nField ? pKeyInfo->aColl[i] : 0);
+    rc = sqlite3MemCompare(&mem1, &pPKey2->aMem[i], pKeyInfo->aColl[i]);
     if( rc!=0 ){
       assert( mem1.zMalloc==0 );  /* See comment below */
-
-      /* Invert the result if we are using DESC sort order. */
-      if( i<nField && pKeyInfo->aSortOrder[i] ){
-        rc = -rc;
+      if( pKeyInfo->aSortOrder[i] ){
+        rc = -rc;  /* Invert the result for DESC sort order. */
       }
-    
-      /* If the PREFIX_SEARCH flag is set and all fields except the final
-      ** rowid field were equal, then clear the PREFIX_SEARCH flag and set 
-      ** pPKey2->rowid to the value of the rowid field in (pKey1, nKey1).
-      ** This is used by the OP_IsUnique opcode.
-      */
-      if( (pPKey2->flags & UNPACKED_PREFIX_SEARCH) && i==(pPKey2->nField-1) ){
-        assert( idx1==szHdr1 && rc );
-        assert( mem1.flags & MEM_Int );
-        pPKey2->flags &= ~UNPACKED_PREFIX_SEARCH;
-        pPKey2->rowid = mem1.u.i;
-      }
-    
       return rc;
     }
     i++;
-  }
+  }while( idx1<szHdr1 && i<pPKey2->nField );
 
   /* No memory allocation is ever used on mem1.  Prove this using
   ** the following assert().  If the assert() fails, it indicates a
@@ -62980,24 +64942,592 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompare(
   assert( mem1.zMalloc==0 );
 
   /* rc==0 here means that one of the keys ran out of fields and
-  ** all the fields up to that point were equal. If the UNPACKED_INCRKEY
-  ** flag is set, then break the tie by treating key2 as larger.
-  ** If the UPACKED_PREFIX_MATCH flag is set, then keys with common prefixes
-  ** are considered to be equal.  Otherwise, the longer key is the 
-  ** larger.  As it happens, the pPKey2 will always be the longer
-  ** if there is a difference.
+  ** all the fields up to that point were equal. Return the the default_rc
+  ** value.  */
+  return pPKey2->default_rc;
+}
+#endif
+
+/*
+** Both *pMem1 and *pMem2 contain string values. Compare the two values
+** using the collation sequence pColl. As usual, return a negative , zero
+** or positive value if *pMem1 is less than, equal to or greater than 
+** *pMem2, respectively. Similar in spirit to "rc = (*pMem1) - (*pMem2);".
+*/
+static int vdbeCompareMemString(
+  const Mem *pMem1,
+  const Mem *pMem2,
+  const CollSeq *pColl
+){
+  if( pMem1->enc==pColl->enc ){
+    /* The strings are already in the correct encoding.  Call the
+     ** comparison function directly */
+    return pColl->xCmp(pColl->pUser,pMem1->n,pMem1->z,pMem2->n,pMem2->z);
+  }else{
+    int rc;
+    const void *v1, *v2;
+    int n1, n2;
+    Mem c1;
+    Mem c2;
+    memset(&c1, 0, sizeof(c1));
+    memset(&c2, 0, sizeof(c2));
+    sqlite3VdbeMemShallowCopy(&c1, pMem1, MEM_Ephem);
+    sqlite3VdbeMemShallowCopy(&c2, pMem2, MEM_Ephem);
+    v1 = sqlite3ValueText((sqlite3_value*)&c1, pColl->enc);
+    n1 = v1==0 ? 0 : c1.n;
+    v2 = sqlite3ValueText((sqlite3_value*)&c2, pColl->enc);
+    n2 = v2==0 ? 0 : c2.n;
+    rc = pColl->xCmp(pColl->pUser, n1, v1, n2, v2);
+    sqlite3VdbeMemRelease(&c1);
+    sqlite3VdbeMemRelease(&c2);
+    return rc;
+  }
+}
+
+/*
+** Compare the values contained by the two memory cells, returning
+** negative, zero or positive if pMem1 is less than, equal to, or greater
+** than pMem2. Sorting order is NULL's first, followed by numbers (integers
+** and reals) sorted numerically, followed by text ordered by the collating
+** sequence pColl and finally blob's ordered by memcmp().
+**
+** Two NULL values are considered equal by this function.
+*/
+SQLITE_PRIVATE int sqlite3MemCompare(const Mem *pMem1, const Mem *pMem2, const CollSeq *pColl){
+  int rc;
+  int f1, f2;
+  int combined_flags;
+
+  f1 = pMem1->flags;
+  f2 = pMem2->flags;
+  combined_flags = f1|f2;
+  assert( (combined_flags & MEM_RowSet)==0 );
+ 
+  /* If one value is NULL, it is less than the other. If both values
+  ** are NULL, return 0.
   */
-  assert( rc==0 );
-  if( pPKey2->flags & UNPACKED_INCRKEY ){
-    rc = -1;
-  }else if( pPKey2->flags & UNPACKED_PREFIX_MATCH ){
-    /* Leave rc==0 */
-  }else if( idx1<szHdr1 ){
-    rc = 1;
+  if( combined_flags&MEM_Null ){
+    return (f2&MEM_Null) - (f1&MEM_Null);
+  }
+
+  /* If one value is a number and the other is not, the number is less.
+  ** If both are numbers, compare as reals if one is a real, or as integers
+  ** if both values are integers.
+  */
+  if( combined_flags&(MEM_Int|MEM_Real) ){
+    double r1, r2;
+    if( (f1 & f2 & MEM_Int)!=0 ){
+      if( pMem1->u.i < pMem2->u.i ) return -1;
+      if( pMem1->u.i > pMem2->u.i ) return 1;
+      return 0;
+    }
+    if( (f1&MEM_Real)!=0 ){
+      r1 = pMem1->r;
+    }else if( (f1&MEM_Int)!=0 ){
+      r1 = (double)pMem1->u.i;
+    }else{
+      return 1;
+    }
+    if( (f2&MEM_Real)!=0 ){
+      r2 = pMem2->r;
+    }else if( (f2&MEM_Int)!=0 ){
+      r2 = (double)pMem2->u.i;
+    }else{
+      return -1;
+    }
+    if( r1<r2 ) return -1;
+    if( r1>r2 ) return 1;
+    return 0;
+  }
+
+  /* If one value is a string and the other is a blob, the string is less.
+  ** If both are strings, compare using the collating functions.
+  */
+  if( combined_flags&MEM_Str ){
+    if( (f1 & MEM_Str)==0 ){
+      return 1;
+    }
+    if( (f2 & MEM_Str)==0 ){
+      return -1;
+    }
+
+    assert( pMem1->enc==pMem2->enc );
+    assert( pMem1->enc==SQLITE_UTF8 || 
+            pMem1->enc==SQLITE_UTF16LE || pMem1->enc==SQLITE_UTF16BE );
+
+    /* The collation sequence must be defined at this point, even if
+    ** the user deletes the collation sequence after the vdbe program is
+    ** compiled (this was not always the case).
+    */
+    assert( !pColl || pColl->xCmp );
+
+    if( pColl ){
+      return vdbeCompareMemString(pMem1, pMem2, pColl);
+    }
+    /* If a NULL pointer was passed as the collate function, fall through
+    ** to the blob case and use memcmp().  */
+  }
+ 
+  /* Both values must be blobs.  Compare using memcmp().  */
+  rc = memcmp(pMem1->z, pMem2->z, (pMem1->n>pMem2->n)?pMem2->n:pMem1->n);
+  if( rc==0 ){
+    rc = pMem1->n - pMem2->n;
   }
   return rc;
 }
- 
+
+
+/*
+** The first argument passed to this function is a serial-type that
+** corresponds to an integer - all values between 1 and 9 inclusive 
+** except 7. The second points to a buffer containing an integer value
+** serialized according to serial_type. This function deserializes
+** and returns the value.
+*/
+static i64 vdbeRecordDecodeInt(u32 serial_type, const u8 *aKey){
+  u32 y;
+  assert( CORRUPT_DB || (serial_type>=1 && serial_type<=9 && serial_type!=7) );
+  switch( serial_type ){
+    case 0:
+    case 1:
+      testcase( aKey[0]&0x80 );
+      return ONE_BYTE_INT(aKey);
+    case 2:
+      testcase( aKey[0]&0x80 );
+      return TWO_BYTE_INT(aKey);
+    case 3:
+      testcase( aKey[0]&0x80 );
+      return THREE_BYTE_INT(aKey);
+    case 4: {
+      testcase( aKey[0]&0x80 );
+      y = FOUR_BYTE_UINT(aKey);
+      return (i64)*(int*)&y;
+    }
+    case 5: {
+      testcase( aKey[0]&0x80 );
+      return FOUR_BYTE_UINT(aKey+2) + (((i64)1)<<32)*TWO_BYTE_INT(aKey);
+    }
+    case 6: {
+      u64 x = FOUR_BYTE_UINT(aKey);
+      testcase( aKey[0]&0x80 );
+      x = (x<<32) | FOUR_BYTE_UINT(aKey+4);
+      return (i64)*(i64*)&x;
+    }
+  }
+
+  return (serial_type - 8);
+}
+
+/*
+** This function compares the two table rows or index records
+** specified by {nKey1, pKey1} and pPKey2.  It returns a negative, zero
+** or positive integer if key1 is less than, equal to or 
+** greater than key2.  The {nKey1, pKey1} key must be a blob
+** created by th OP_MakeRecord opcode of the VDBE.  The pPKey2
+** key must be a parsed key such as obtained from
+** sqlite3VdbeParseRecord.
+**
+** If argument bSkip is non-zero, it is assumed that the caller has already
+** determined that the first fields of the keys are equal.
+**
+** Key1 and Key2 do not have to contain the same number of fields. If all 
+** fields that appear in both keys are equal, then pPKey2->default_rc is 
+** returned.
+**
+** If database corruption is discovered, set pPKey2->isCorrupt to non-zero
+** and return 0.
+*/
+SQLITE_PRIVATE int sqlite3VdbeRecordCompare(
+  int nKey1, const void *pKey1,   /* Left key */
+  UnpackedRecord *pPKey2,         /* Right key */
+  int bSkip                       /* If true, skip the first field */
+){
+  u32 d1;                         /* Offset into aKey[] of next data element */
+  int i;                          /* Index of next field to compare */
+  u32 szHdr1;                     /* Size of record header in bytes */
+  u32 idx1;                       /* Offset of first type in header */
+  int rc = 0;                     /* Return value */
+  Mem *pRhs = pPKey2->aMem;       /* Next field of pPKey2 to compare */
+  KeyInfo *pKeyInfo = pPKey2->pKeyInfo;
+  const unsigned char *aKey1 = (const unsigned char *)pKey1;
+  Mem mem1;
+
+  /* If bSkip is true, then the caller has already determined that the first
+  ** two elements in the keys are equal. Fix the various stack variables so
+  ** that this routine begins comparing at the second field. */
+  if( bSkip ){
+    u32 s1;
+    idx1 = 1 + getVarint32(&aKey1[1], s1);
+    szHdr1 = aKey1[0];
+    d1 = szHdr1 + sqlite3VdbeSerialTypeLen(s1);
+    i = 1;
+    pRhs++;
+  }else{
+    idx1 = getVarint32(aKey1, szHdr1);
+    d1 = szHdr1;
+    if( d1>(unsigned)nKey1 ){ 
+      pPKey2->isCorrupt = (u8)SQLITE_CORRUPT_BKPT;
+      return 0;  /* Corruption */
+    }
+    i = 0;
+  }
+
+  VVA_ONLY( mem1.zMalloc = 0; ) /* Only needed by assert() statements */
+  assert( pPKey2->pKeyInfo->nField+pPKey2->pKeyInfo->nXField>=pPKey2->nField 
+       || CORRUPT_DB );
+  assert( pPKey2->pKeyInfo->aSortOrder!=0 );
+  assert( pPKey2->pKeyInfo->nField>0 );
+  assert( idx1<=szHdr1 || CORRUPT_DB );
+  do{
+    u32 serial_type;
+
+    /* RHS is an integer */
+    if( pRhs->flags & MEM_Int ){
+      serial_type = aKey1[idx1];
+      testcase( serial_type==12 );
+      if( serial_type>=12 ){
+        rc = +1;
+      }else if( serial_type==0 ){
+        rc = -1;
+      }else if( serial_type==7 ){
+        double rhs = (double)pRhs->u.i;
+        sqlite3VdbeSerialGet(&aKey1[d1], serial_type, &mem1);
+        if( mem1.r<rhs ){
+          rc = -1;
+        }else if( mem1.r>rhs ){
+          rc = +1;
+        }
+      }else{
+        i64 lhs = vdbeRecordDecodeInt(serial_type, &aKey1[d1]);
+        i64 rhs = pRhs->u.i;
+        if( lhs<rhs ){
+          rc = -1;
+        }else if( lhs>rhs ){
+          rc = +1;
+        }
+      }
+    }
+
+    /* RHS is real */
+    else if( pRhs->flags & MEM_Real ){
+      serial_type = aKey1[idx1];
+      if( serial_type>=12 ){
+        rc = +1;
+      }else if( serial_type==0 ){
+        rc = -1;
+      }else{
+        double rhs = pRhs->r;
+        double lhs;
+        sqlite3VdbeSerialGet(&aKey1[d1], serial_type, &mem1);
+        if( serial_type==7 ){
+          lhs = mem1.r;
+        }else{
+          lhs = (double)mem1.u.i;
+        }
+        if( lhs<rhs ){
+          rc = -1;
+        }else if( lhs>rhs ){
+          rc = +1;
+        }
+      }
+    }
+
+    /* RHS is a string */
+    else if( pRhs->flags & MEM_Str ){
+      getVarint32(&aKey1[idx1], serial_type);
+      testcase( serial_type==12 );
+      if( serial_type<12 ){
+        rc = -1;
+      }else if( !(serial_type & 0x01) ){
+        rc = +1;
+      }else{
+        mem1.n = (serial_type - 12) / 2;
+        testcase( (d1+mem1.n)==(unsigned)nKey1 );
+        testcase( (d1+mem1.n+1)==(unsigned)nKey1 );
+        if( (d1+mem1.n) > (unsigned)nKey1 ){
+          pPKey2->isCorrupt = (u8)SQLITE_CORRUPT_BKPT;
+          return 0;                /* Corruption */
+        }else if( pKeyInfo->aColl[i] ){
+          mem1.enc = pKeyInfo->enc;
+          mem1.db = pKeyInfo->db;
+          mem1.flags = MEM_Str;
+          mem1.z = (char*)&aKey1[d1];
+          rc = vdbeCompareMemString(&mem1, pRhs, pKeyInfo->aColl[i]);
+        }else{
+          int nCmp = MIN(mem1.n, pRhs->n);
+          rc = memcmp(&aKey1[d1], pRhs->z, nCmp);
+          if( rc==0 ) rc = mem1.n - pRhs->n; 
+        }
+      }
+    }
+
+    /* RHS is a blob */
+    else if( pRhs->flags & MEM_Blob ){
+      getVarint32(&aKey1[idx1], serial_type);
+      testcase( serial_type==12 );
+      if( serial_type<12 || (serial_type & 0x01) ){
+        rc = -1;
+      }else{
+        int nStr = (serial_type - 12) / 2;
+        testcase( (d1+nStr)==(unsigned)nKey1 );
+        testcase( (d1+nStr+1)==(unsigned)nKey1 );
+        if( (d1+nStr) > (unsigned)nKey1 ){
+          pPKey2->isCorrupt = (u8)SQLITE_CORRUPT_BKPT;
+          return 0;                /* Corruption */
+        }else{
+          int nCmp = MIN(nStr, pRhs->n);
+          rc = memcmp(&aKey1[d1], pRhs->z, nCmp);
+          if( rc==0 ) rc = nStr - pRhs->n;
+        }
+      }
+    }
+
+    /* RHS is null */
+    else{
+      serial_type = aKey1[idx1];
+      rc = (serial_type!=0);
+    }
+
+    if( rc!=0 ){
+      if( pKeyInfo->aSortOrder[i] ){
+        rc = -rc;
+      }
+      assert( CORRUPT_DB
+          || (rc<0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)<0)
+          || (rc>0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)>0)
+          || pKeyInfo->db->mallocFailed
+      );
+      assert( mem1.zMalloc==0 );  /* See comment below */
+      return rc;
+    }
+
+    i++;
+    pRhs++;
+    d1 += sqlite3VdbeSerialTypeLen(serial_type);
+    idx1 += sqlite3VarintLen(serial_type);
+  }while( idx1<(unsigned)szHdr1 && i<pPKey2->nField && d1<=(unsigned)nKey1 );
+
+  /* No memory allocation is ever used on mem1.  Prove this using
+  ** the following assert().  If the assert() fails, it indicates a
+  ** memory leak and a need to call sqlite3VdbeMemRelease(&mem1).  */
+  assert( mem1.zMalloc==0 );
+
+  /* rc==0 here means that one or both of the keys ran out of fields and
+  ** all the fields up to that point were equal. Return the the default_rc
+  ** value.  */
+  assert( CORRUPT_DB 
+       || pPKey2->default_rc==vdbeRecordCompareDebug(nKey1, pKey1, pPKey2) 
+  );
+  return pPKey2->default_rc;
+}
+
+/*
+** This function is an optimized version of sqlite3VdbeRecordCompare() 
+** that (a) the first field of pPKey2 is an integer, and (b) the 
+** size-of-header varint at the start of (pKey1/nKey1) fits in a single
+** byte (i.e. is less than 128).
+**
+** To avoid concerns about buffer overreads, this routine is only used
+** on schemas where the maximum valid header size is 63 bytes or less.
+*/
+static int vdbeRecordCompareInt(
+  int nKey1, const void *pKey1, /* Left key */
+  UnpackedRecord *pPKey2,       /* Right key */
+  int bSkip                     /* Ignored */
+){
+  const u8 *aKey = &((const u8*)pKey1)[*(const u8*)pKey1 & 0x3F];
+  int serial_type = ((const u8*)pKey1)[1];
+  int res;
+  u32 y;
+  u64 x;
+  i64 v = pPKey2->aMem[0].u.i;
+  i64 lhs;
+  UNUSED_PARAMETER(bSkip);
+
+  assert( bSkip==0 );
+  assert( (*(u8*)pKey1)<=0x3F || CORRUPT_DB );
+  switch( serial_type ){
+    case 1: { /* 1-byte signed integer */
+      lhs = ONE_BYTE_INT(aKey);
+      testcase( lhs<0 );
+      break;
+    }
+    case 2: { /* 2-byte signed integer */
+      lhs = TWO_BYTE_INT(aKey);
+      testcase( lhs<0 );
+      break;
+    }
+    case 3: { /* 3-byte signed integer */
+      lhs = THREE_BYTE_INT(aKey);
+      testcase( lhs<0 );
+      break;
+    }
+    case 4: { /* 4-byte signed integer */
+      y = FOUR_BYTE_UINT(aKey);
+      lhs = (i64)*(int*)&y;
+      testcase( lhs<0 );
+      break;
+    }
+    case 5: { /* 6-byte signed integer */
+      lhs = FOUR_BYTE_UINT(aKey+2) + (((i64)1)<<32)*TWO_BYTE_INT(aKey);
+      testcase( lhs<0 );
+      break;
+    }
+    case 6: { /* 8-byte signed integer */
+      x = FOUR_BYTE_UINT(aKey);
+      x = (x<<32) | FOUR_BYTE_UINT(aKey+4);
+      lhs = *(i64*)&x;
+      testcase( lhs<0 );
+      break;
+    }
+    case 8: 
+      lhs = 0;
+      break;
+    case 9:
+      lhs = 1;
+      break;
+
+    /* This case could be removed without changing the results of running
+    ** this code. Including it causes gcc to generate a faster switch 
+    ** statement (since the range of switch targets now starts at zero and
+    ** is contiguous) but does not cause any duplicate code to be generated
+    ** (as gcc is clever enough to combine the two like cases). Other 
+    ** compilers might be similar.  */ 
+    case 0: case 7:
+      return sqlite3VdbeRecordCompare(nKey1, pKey1, pPKey2, 0);
+
+    default:
+      return sqlite3VdbeRecordCompare(nKey1, pKey1, pPKey2, 0);
+  }
+
+  if( v>lhs ){
+    res = pPKey2->r1;
+  }else if( v<lhs ){
+    res = pPKey2->r2;
+  }else if( pPKey2->nField>1 ){
+    /* The first fields of the two keys are equal. Compare the trailing 
+    ** fields.  */
+    res = sqlite3VdbeRecordCompare(nKey1, pKey1, pPKey2, 1);
+  }else{
+    /* The first fields of the two keys are equal and there are no trailing
+    ** fields. Return pPKey2->default_rc in this case. */
+    res = pPKey2->default_rc;
+  }
+
+  assert( (res==0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)==0)
+       || (res<0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)<0)
+       || (res>0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)>0)
+       || CORRUPT_DB
+  );
+  return res;
+}
+
+/*
+** This function is an optimized version of sqlite3VdbeRecordCompare() 
+** that (a) the first field of pPKey2 is a string, that (b) the first field
+** uses the collation sequence BINARY and (c) that the size-of-header varint 
+** at the start of (pKey1/nKey1) fits in a single byte.
+*/
+static int vdbeRecordCompareString(
+  int nKey1, const void *pKey1, /* Left key */
+  UnpackedRecord *pPKey2,       /* Right key */
+  int bSkip
+){
+  const u8 *aKey1 = (const u8*)pKey1;
+  int serial_type;
+  int res;
+  UNUSED_PARAMETER(bSkip);
+
+  assert( bSkip==0 );
+  getVarint32(&aKey1[1], serial_type);
+
+  if( serial_type<12 ){
+    res = pPKey2->r1;      /* (pKey1/nKey1) is a number or a null */
+  }else if( !(serial_type & 0x01) ){ 
+    res = pPKey2->r2;      /* (pKey1/nKey1) is a blob */
+  }else{
+    int nCmp;
+    int nStr;
+    int szHdr = aKey1[0];
+
+    nStr = (serial_type-12) / 2;
+    if( (szHdr + nStr) > nKey1 ){
+      pPKey2->isCorrupt = (u8)SQLITE_CORRUPT_BKPT;
+      return 0;    /* Corruption */
+    }
+    nCmp = MIN( pPKey2->aMem[0].n, nStr );
+    res = memcmp(&aKey1[szHdr], pPKey2->aMem[0].z, nCmp);
+
+    if( res==0 ){
+      res = nStr - pPKey2->aMem[0].n;
+      if( res==0 ){
+        if( pPKey2->nField>1 ){
+          res = sqlite3VdbeRecordCompare(nKey1, pKey1, pPKey2, 1);
+        }else{
+          res = pPKey2->default_rc;
+        }
+      }else if( res>0 ){
+        res = pPKey2->r2;
+      }else{
+        res = pPKey2->r1;
+      }
+    }else if( res>0 ){
+      res = pPKey2->r2;
+    }else{
+      res = pPKey2->r1;
+    }
+  }
+
+  assert( (res==0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)==0)
+       || (res<0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)<0)
+       || (res>0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)>0)
+       || CORRUPT_DB
+  );
+  return res;
+}
+
+/*
+** Return a pointer to an sqlite3VdbeRecordCompare() compatible function
+** suitable for comparing serialized records to the unpacked record passed
+** as the only argument.
+*/
+SQLITE_PRIVATE RecordCompare sqlite3VdbeFindCompare(UnpackedRecord *p){
+  /* varintRecordCompareInt() and varintRecordCompareString() both assume
+  ** that the size-of-header varint that occurs at the start of each record
+  ** fits in a single byte (i.e. is 127 or less). varintRecordCompareInt()
+  ** also assumes that it is safe to overread a buffer by at least the 
+  ** maximum possible legal header size plus 8 bytes. Because there is
+  ** guaranteed to be at least 74 (but not 136) bytes of padding following each
+  ** buffer passed to varintRecordCompareInt() this makes it convenient to
+  ** limit the size of the header to 64 bytes in cases where the first field
+  ** is an integer.
+  **
+  ** The easiest way to enforce this limit is to consider only records with
+  ** 13 fields or less. If the first field is an integer, the maximum legal
+  ** header size is (12*5 + 1 + 1) bytes.  */
+  if( (p->pKeyInfo->nField + p->pKeyInfo->nXField)<=13 ){
+    int flags = p->aMem[0].flags;
+    if( p->pKeyInfo->aSortOrder[0] ){
+      p->r1 = 1;
+      p->r2 = -1;
+    }else{
+      p->r1 = -1;
+      p->r2 = 1;
+    }
+    if( (flags & MEM_Int) ){
+      return vdbeRecordCompareInt;
+    }
+    testcase( flags & MEM_Real );
+    testcase( flags & MEM_Null );
+    testcase( flags & MEM_Blob );
+    if( (flags & (MEM_Real|MEM_Null|MEM_Blob))==0 && p->pKeyInfo->aColl[0]==0 ){
+      assert( flags & MEM_Str );
+      return vdbeRecordCompareString;
+    }
+  }
+
+  return sqlite3VdbeRecordCompare;
+}
 
 /*
 ** pCur points at an index entry created using the OP_MakeRecord opcode.
@@ -63029,7 +65559,7 @@ SQLITE_PRIVATE int sqlite3VdbeIdxRowid(sqlite3 *db, BtCursor *pCur, i64 *rowid){
 
   /* Read in the complete content of the index entry */
   memset(&m, 0, sizeof(m));
-  rc = sqlite3VdbeMemFromBtree(pCur, 0, (int)nCellKey, 1, &m);
+  rc = sqlite3VdbeMemFromBtree(pCur, 0, (u32)nCellKey, 1, &m);
   if( rc ){
     return rc;
   }
@@ -63088,9 +65618,9 @@ SQLITE_PRIVATE int sqlite3VdbeIdxRowid(sqlite3 *db, BtCursor *pCur, i64 *rowid){
 ** of the keys prior to the final rowid, not the entire key.
 */
 SQLITE_PRIVATE int sqlite3VdbeIdxKeyCompare(
-  VdbeCursor *pC,             /* The cursor to compare against */
-  UnpackedRecord *pUnpacked,  /* Unpacked version of key to compare against */
-  int *res                    /* Write the comparison result here */
+  VdbeCursor *pC,                  /* The cursor to compare against */
+  UnpackedRecord *pUnpacked,       /* Unpacked version of key */
+  int *res                         /* Write the comparison result here */
 ){
   i64 nCellKey = 0;
   int rc;
@@ -63100,19 +65630,18 @@ SQLITE_PRIVATE int sqlite3VdbeIdxKeyCompare(
   assert( sqlite3BtreeCursorIsValid(pCur) );
   VVA_ONLY(rc =) sqlite3BtreeKeySize(pCur, &nCellKey);
   assert( rc==SQLITE_OK );    /* pCur is always valid so KeySize cannot fail */
-  /* nCellKey will always be between 0 and 0xffffffff because of the say
+  /* nCellKey will always be between 0 and 0xffffffff because of the way
   ** that btreeParseCellPtr() and sqlite3GetVarint32() are implemented */
   if( nCellKey<=0 || nCellKey>0x7fffffff ){
     *res = 0;
     return SQLITE_CORRUPT_BKPT;
   }
   memset(&m, 0, sizeof(m));
-  rc = sqlite3VdbeMemFromBtree(pC->pCursor, 0, (int)nCellKey, 1, &m);
+  rc = sqlite3VdbeMemFromBtree(pC->pCursor, 0, (u32)nCellKey, 1, &m);
   if( rc ){
     return rc;
   }
-  assert( pUnpacked->flags & UNPACKED_PREFIX_MATCH );
-  *res = sqlite3VdbeRecordCompare(m.n, m.z, pUnpacked);
+  *res = sqlite3VdbeRecordCompare(m.n, m.z, pUnpacked, 0);
   sqlite3VdbeMemRelease(&m);
   return SQLITE_OK;
 }
@@ -63167,7 +65696,7 @@ SQLITE_PRIVATE sqlite3 *sqlite3VdbeDb(Vdbe *v){
 **
 ** The returned value must be freed by the caller using sqlite3ValueFree().
 */
-SQLITE_PRIVATE sqlite3_value *sqlite3VdbeGetValue(Vdbe *v, int iVar, u8 aff){
+SQLITE_PRIVATE sqlite3_value *sqlite3VdbeGetBoundValue(Vdbe *v, int iVar, u8 aff){
   assert( iVar>0 );
   if( v ){
     Mem *pMem = &v->aVar[iVar-1];
@@ -63176,7 +65705,6 @@ SQLITE_PRIVATE sqlite3_value *sqlite3VdbeGetValue(Vdbe *v, int iVar, u8 aff){
       if( pRet ){
         sqlite3VdbeMemCopy((Mem *)pRet, pMem);
         sqlite3ValueApplyAffinity(pRet, aff, SQLITE_UTF8);
-        sqlite3VdbeMemStoreType((Mem *)pRet);
       }
       return pRet;
     }
@@ -63198,6 +65726,21 @@ SQLITE_PRIVATE void sqlite3VdbeSetVarmask(Vdbe *v, int iVar){
   }
 }
 
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/*
+** Transfer error message text from an sqlite3_vtab.zErrMsg (text stored
+** in memory obtained from sqlite3_malloc) into a Vdbe.zErrMsg (text stored
+** in memory obtained from sqlite3DbMalloc).
+*/
+SQLITE_PRIVATE void sqlite3VtabImportErrmsg(Vdbe *p, sqlite3_vtab *pVtab){
+  sqlite3 *db = p->db;
+  sqlite3DbFree(db, p->zErrMsg);
+  p->zErrMsg = sqlite3DbStrDup(db, pVtab->zErrMsg);
+  sqlite3_free(pVtab->zErrMsg);
+  pVtab->zErrMsg = 0;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
 /************** End of vdbeaux.c *********************************************/
 /************** Begin file vdbeapi.c *****************************************/
 /*
@@ -63335,7 +65878,6 @@ SQLITE_API const void *sqlite3_value_blob(sqlite3_value *pVal){
   Mem *p = (Mem*)pVal;
   if( p->flags & (MEM_Blob|MEM_Str) ){
     sqlite3VdbeMemExpandBlob(p);
-    p->flags &= ~MEM_Str;
     p->flags |= MEM_Blob;
     return p->n ? p->z : 0;
   }else{
@@ -63372,7 +65914,41 @@ SQLITE_API const void *sqlite3_value_text16le(sqlite3_value *pVal){
 }
 #endif /* SQLITE_OMIT_UTF16 */
 SQLITE_API int sqlite3_value_type(sqlite3_value* pVal){
-  return pVal->type;
+  static const u8 aType[] = {
+     SQLITE_BLOB,     /* 0x00 */
+     SQLITE_NULL,     /* 0x01 */
+     SQLITE_TEXT,     /* 0x02 */
+     SQLITE_NULL,     /* 0x03 */
+     SQLITE_INTEGER,  /* 0x04 */
+     SQLITE_NULL,     /* 0x05 */
+     SQLITE_INTEGER,  /* 0x06 */
+     SQLITE_NULL,     /* 0x07 */
+     SQLITE_FLOAT,    /* 0x08 */
+     SQLITE_NULL,     /* 0x09 */
+     SQLITE_FLOAT,    /* 0x0a */
+     SQLITE_NULL,     /* 0x0b */
+     SQLITE_INTEGER,  /* 0x0c */
+     SQLITE_NULL,     /* 0x0d */
+     SQLITE_INTEGER,  /* 0x0e */
+     SQLITE_NULL,     /* 0x0f */
+     SQLITE_BLOB,     /* 0x10 */
+     SQLITE_NULL,     /* 0x11 */
+     SQLITE_TEXT,     /* 0x12 */
+     SQLITE_NULL,     /* 0x13 */
+     SQLITE_INTEGER,  /* 0x14 */
+     SQLITE_NULL,     /* 0x15 */
+     SQLITE_INTEGER,  /* 0x16 */
+     SQLITE_NULL,     /* 0x17 */
+     SQLITE_FLOAT,    /* 0x18 */
+     SQLITE_NULL,     /* 0x19 */
+     SQLITE_FLOAT,    /* 0x1a */
+     SQLITE_NULL,     /* 0x1b */
+     SQLITE_INTEGER,  /* 0x1c */
+     SQLITE_NULL,     /* 0x1d */
+     SQLITE_INTEGER,  /* 0x1e */
+     SQLITE_NULL,     /* 0x1f */
+  };
+  return aType[pVal->flags&MEM_AffMask];
 }
 
 /**************************** sqlite3_result_  *******************************
@@ -63411,12 +65987,14 @@ SQLITE_API void sqlite3_result_double(sqlite3_context *pCtx, double rVal){
 SQLITE_API void sqlite3_result_error(sqlite3_context *pCtx, const char *z, int n){
   assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
   pCtx->isError = SQLITE_ERROR;
+  pCtx->fErrorOrAux = 1;
   sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF8, SQLITE_TRANSIENT);
 }
 #ifndef SQLITE_OMIT_UTF16
 SQLITE_API void sqlite3_result_error16(sqlite3_context *pCtx, const void *z, int n){
   assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
   pCtx->isError = SQLITE_ERROR;
+  pCtx->fErrorOrAux = 1;
   sqlite3VdbeMemSetStr(&pCtx->s, z, n, SQLITE_UTF16NATIVE, SQLITE_TRANSIENT);
 }
 #endif
@@ -63480,6 +66058,7 @@ SQLITE_API void sqlite3_result_zeroblob(sqlite3_context *pCtx, int n){
 }
 SQLITE_API void sqlite3_result_error_code(sqlite3_context *pCtx, int errCode){
   pCtx->isError = errCode;
+  pCtx->fErrorOrAux = 1;
   if( pCtx->s.flags & MEM_Null ){
     sqlite3VdbeMemSetStr(&pCtx->s, sqlite3ErrStr(errCode), -1, 
                          SQLITE_UTF8, SQLITE_STATIC);
@@ -63490,6 +66069,7 @@ SQLITE_API void sqlite3_result_error_code(sqlite3_context *pCtx, int errCode){
 SQLITE_API void sqlite3_result_error_toobig(sqlite3_context *pCtx){
   assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
   pCtx->isError = SQLITE_TOOBIG;
+  pCtx->fErrorOrAux = 1;
   sqlite3VdbeMemSetStr(&pCtx->s, "string or blob too big", -1, 
                        SQLITE_UTF8, SQLITE_STATIC);
 }
@@ -63499,6 +66079,7 @@ SQLITE_API void sqlite3_result_error_nomem(sqlite3_context *pCtx){
   assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
   sqlite3VdbeMemSetNull(&pCtx->s);
   pCtx->isError = SQLITE_NOMEM;
+  pCtx->fErrorOrAux = 1;
   pCtx->s.db->mallocFailed = 1;
 }
 
@@ -63582,11 +66163,13 @@ static int sqlite3Step(Vdbe *p){
     ** reset the interrupt flag.  This prevents a call to sqlite3_interrupt
     ** from interrupting a statement that has not yet started.
     */
-    if( db->activeVdbeCnt==0 ){
+    if( db->nVdbeActive==0 ){
       db->u1.isInterrupted = 0;
     }
 
-    assert( db->writeVdbeCnt>0 || db->autoCommit==0 || db->nDeferredCons==0 );
+    assert( db->nVdbeWrite>0 || db->autoCommit==0 
+        || (db->nDeferredCons==0 && db->nDeferredImmCons==0)
+    );
 
 #ifndef SQLITE_OMIT_TRACE
     if( db->xProfile && !db->init.busy ){
@@ -63594,8 +66177,9 @@ static int sqlite3Step(Vdbe *p){
     }
 #endif
 
-    db->activeVdbeCnt++;
-    if( p->readOnly==0 ) db->writeVdbeCnt++;
+    db->nVdbeActive++;
+    if( p->readOnly==0 ) db->nVdbeWrite++;
+    if( p->bIsReader ) db->nVdbeRead++;
     p->pc = 0;
   }
 #ifndef SQLITE_OMIT_EXPLAIN
@@ -63604,9 +66188,9 @@ static int sqlite3Step(Vdbe *p){
   }else
 #endif /* SQLITE_OMIT_EXPLAIN */
   {
-    db->vdbeExecCnt++;
+    db->nVdbeExec++;
     rc = sqlite3VdbeExec(p);
-    db->vdbeExecCnt--;
+    db->nVdbeExec--;
   }
 
 #ifndef SQLITE_OMIT_TRACE
@@ -63678,7 +66262,7 @@ SQLITE_API int sqlite3_step(sqlite3_stmt *pStmt){
     v->doingRerun = 1;
     assert( v->expired==0 );
   }
-  if( rc2!=SQLITE_OK && ALWAYS(v->isPrepareV2) && ALWAYS(db->pErr) ){
+  if( rc2!=SQLITE_OK ){
     /* This case occurs after failing to recompile an sql statement. 
     ** The error message from the SQL compiler has already been loaded 
     ** into the database handle. This block copies the error message 
@@ -63688,6 +66272,7 @@ SQLITE_API int sqlite3_step(sqlite3_stmt *pStmt){
     ** sqlite3_errmsg() and sqlite3_errcode().
     */
     const char *zErr = (const char *)sqlite3_value_text(db->pErr); 
+    assert( zErr!=0 || db->mallocFailed );
     sqlite3DbFree(db, v->zErrMsg);
     if( !db->mallocFailed ){
       v->zErrMsg = sqlite3DbStrDup(db, zErr);
@@ -63702,6 +66287,7 @@ SQLITE_API int sqlite3_step(sqlite3_stmt *pStmt){
   return rc;
 }
 
+
 /*
 ** Extract the user data from a sqlite3_context structure and return a
 ** pointer to it.
@@ -63726,6 +66312,19 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context *p){
   return p->s.db;
 }
 
+/*
+** Return the current time for a statement
+*/
+SQLITE_PRIVATE sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context *p){
+  Vdbe *v = p->pVdbe;
+  int rc;
+  if( v->iCurrentTime==0 ){
+    rc = sqlite3OsCurrentTimeInt64(p->s.db->pVfs, &v->iCurrentTime);
+    if( rc ) v->iCurrentTime = 0;
+  }
+  return v->iCurrentTime;
+}
+
 /*
 ** The following is the implementation of an SQL function that always
 ** fails with an error message stating that the function is used in the
@@ -63781,14 +66380,14 @@ SQLITE_API void *sqlite3_aggregate_context(sqlite3_context *p, int nByte){
 ** the user-function defined by pCtx.
 */
 SQLITE_API void *sqlite3_get_auxdata(sqlite3_context *pCtx, int iArg){
-  VdbeFunc *pVdbeFunc;
+  AuxData *pAuxData;
 
   assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
-  pVdbeFunc = pCtx->pVdbeFunc;
-  if( !pVdbeFunc || iArg>=pVdbeFunc->nAux || iArg<0 ){
-    return 0;
+  for(pAuxData=pCtx->pVdbe->pAuxData; pAuxData; pAuxData=pAuxData->pNext){
+    if( pAuxData->iOp==pCtx->iOp && pAuxData->iArg==iArg ) break;
   }
-  return pVdbeFunc->apAux[iArg].pAux;
+
+  return (pAuxData ? pAuxData->pAux : 0);
 }
 
 /*
@@ -63802,29 +66401,30 @@ SQLITE_API void sqlite3_set_auxdata(
   void *pAux, 
   void (*xDelete)(void*)
 ){
-  struct AuxData *pAuxData;
-  VdbeFunc *pVdbeFunc;
-  if( iArg<0 ) goto failed;
+  AuxData *pAuxData;
+  Vdbe *pVdbe = pCtx->pVdbe;
 
   assert( sqlite3_mutex_held(pCtx->s.db->mutex) );
-  pVdbeFunc = pCtx->pVdbeFunc;
-  if( !pVdbeFunc || pVdbeFunc->nAux<=iArg ){
-    int nAux = (pVdbeFunc ? pVdbeFunc->nAux : 0);
-    int nMalloc = sizeof(VdbeFunc) + sizeof(struct AuxData)*iArg;
-    pVdbeFunc = sqlite3DbRealloc(pCtx->s.db, pVdbeFunc, nMalloc);
-    if( !pVdbeFunc ){
-      goto failed;
-    }
-    pCtx->pVdbeFunc = pVdbeFunc;
-    memset(&pVdbeFunc->apAux[nAux], 0, sizeof(struct AuxData)*(iArg+1-nAux));
-    pVdbeFunc->nAux = iArg+1;
-    pVdbeFunc->pFunc = pCtx->pFunc;
-  }
+  if( iArg<0 ) goto failed;
 
-  pAuxData = &pVdbeFunc->apAux[iArg];
-  if( pAuxData->pAux && pAuxData->xDelete ){
+  for(pAuxData=pVdbe->pAuxData; pAuxData; pAuxData=pAuxData->pNext){
+    if( pAuxData->iOp==pCtx->iOp && pAuxData->iArg==iArg ) break;
+  }
+  if( pAuxData==0 ){
+    pAuxData = sqlite3DbMallocZero(pVdbe->db, sizeof(AuxData));
+    if( !pAuxData ) goto failed;
+    pAuxData->iOp = pCtx->iOp;
+    pAuxData->iArg = iArg;
+    pAuxData->pNext = pVdbe->pAuxData;
+    pVdbe->pAuxData = pAuxData;
+    if( pCtx->fErrorOrAux==0 ){
+      pCtx->isError = 0;
+      pCtx->fErrorOrAux = 1;
+    }
+  }else if( pAuxData->xDelete ){
     pAuxData->xDelete(pAuxData->pAux);
   }
+
   pAuxData->pAux = pAux;
   pAuxData->xDelete = xDelete;
   return;
@@ -63869,6 +66469,30 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt){
   return pVm->nResColumn;
 }
 
+/*
+** Return a pointer to static memory containing an SQL NULL value.
+*/
+static const Mem *columnNullValue(void){
+  /* Even though the Mem structure contains an element
+  ** of type i64, on certain architectures (x86) with certain compiler
+  ** switches (-Os), gcc may align this Mem object on a 4-byte boundary
+  ** instead of an 8-byte one. This all works fine, except that when
+  ** running with SQLITE_DEBUG defined the SQLite code sometimes assert()s
+  ** that a Mem structure is located on an 8-byte boundary. To prevent
+  ** these assert()s from failing, when building with SQLITE_DEBUG defined
+  ** using gcc, we force nullMem to be 8-byte aligned using the magical
+  ** __attribute__((aligned(8))) macro.  */
+  static const Mem nullMem 
+#if defined(SQLITE_DEBUG) && defined(__GNUC__)
+    __attribute__((aligned(8))) 
+#endif
+    = {0, "", (double)0, {0}, 0, MEM_Null, 0,
+#ifdef SQLITE_DEBUG
+       0, 0,  /* pScopyFrom, pFiller */
+#endif
+       0, 0 };
+  return &nullMem;
+}
 
 /*
 ** Check to see if column iCol of the given statement is valid.  If
@@ -63885,32 +66509,11 @@ static Mem *columnMem(sqlite3_stmt *pStmt, int i){
     sqlite3_mutex_enter(pVm->db->mutex);
     pOut = &pVm->pResultSet[i];
   }else{
-    /* If the value passed as the second argument is out of range, return
-    ** a pointer to the following static Mem object which contains the
-    ** value SQL NULL. Even though the Mem structure contains an element
-    ** of type i64, on certain architectures (x86) with certain compiler
-    ** switches (-Os), gcc may align this Mem object on a 4-byte boundary
-    ** instead of an 8-byte one. This all works fine, except that when
-    ** running with SQLITE_DEBUG defined the SQLite code sometimes assert()s
-    ** that a Mem structure is located on an 8-byte boundary. To prevent
-    ** these assert()s from failing, when building with SQLITE_DEBUG defined
-    ** using gcc, we force nullMem to be 8-byte aligned using the magical
-    ** __attribute__((aligned(8))) macro.  */
-    static const Mem nullMem 
-#if defined(SQLITE_DEBUG) && defined(__GNUC__)
-      __attribute__((aligned(8))) 
-#endif
-      = {0, "", (double)0, {0}, 0, MEM_Null, SQLITE_NULL, 0,
-#ifdef SQLITE_DEBUG
-         0, 0,  /* pScopyFrom, pFiller */
-#endif
-         0, 0 };
-
     if( pVm && ALWAYS(pVm->db) ){
       sqlite3_mutex_enter(pVm->db->mutex);
       sqlite3Error(pVm->db, SQLITE_RANGE, 0);
     }
-    pOut = (Mem*)&nullMem;
+    pOut = (Mem*)columnNullValue();
   }
   return pOut;
 }
@@ -64013,13 +66616,6 @@ SQLITE_API int sqlite3_column_type(sqlite3_stmt *pStmt, int i){
   return iType;
 }
 
-/* The following function is experimental and subject to change or
-** removal */
-/*int sqlite3_column_numeric_type(sqlite3_stmt *pStmt, int i){
-**  return sqlite3_value_numeric_type( columnMem(pStmt,i) );
-**}
-*/
-
 /*
 ** Convert the N-th element of pStmt->pColName[] into a string using
 ** xFunc() then return that string.  If N is out of range, return 0.
@@ -64314,7 +66910,7 @@ SQLITE_API int sqlite3_bind_text16(
 #endif /* SQLITE_OMIT_UTF16 */
 SQLITE_API int sqlite3_bind_value(sqlite3_stmt *pStmt, int i, const sqlite3_value *pValue){
   int rc;
-  switch( pValue->type ){
+  switch( sqlite3_value_type((sqlite3_value*)pValue) ){
     case SQLITE_INTEGER: {
       rc = sqlite3_bind_int64(pStmt, i, pValue->u.i);
       break;
@@ -64496,9 +67092,9 @@ SQLITE_API sqlite3_stmt *sqlite3_next_stmt(sqlite3 *pDb, sqlite3_stmt *pStmt){
 */
 SQLITE_API int sqlite3_stmt_status(sqlite3_stmt *pStmt, int op, int resetFlag){
   Vdbe *pVdbe = (Vdbe*)pStmt;
-  int v = pVdbe->aCounter[op-1];
-  if( resetFlag ) pVdbe->aCounter[op-1] = 0;
-  return v;
+  u32 v = pVdbe->aCounter[op];
+  if( resetFlag ) pVdbe->aCounter[op] = 0;
+  return (int)v;
 }
 
 /************** End of vdbeapi.c *********************************************/
@@ -64550,9 +67146,9 @@ static int findNextHostParameter(const char *zSql, int *pnToken){
 
 /*
 ** This function returns a pointer to a nul-terminated string in memory
-** obtained from sqlite3DbMalloc(). If sqlite3.vdbeExecCnt is 1, then the
+** obtained from sqlite3DbMalloc(). If sqlite3.nVdbeExec is 1, then the
 ** string contains a copy of zRawSql but with host parameters expanded to 
-** their current bindings. Or, if sqlite3.vdbeExecCnt is greater than 1, 
+** their current bindings. Or, if sqlite3.nVdbeExec is greater than 1, 
 ** then the returned string holds a copy of zRawSql with "-- " prepended
 ** to each line of text.
 **
@@ -64590,11 +67186,12 @@ SQLITE_PRIVATE char *sqlite3VdbeExpandSql(
   sqlite3StrAccumInit(&out, zBase, sizeof(zBase), 
                       db->aLimit[SQLITE_LIMIT_LENGTH]);
   out.db = db;
-  if( db->vdbeExecCnt>1 ){
+  if( db->nVdbeExec>1 ){
     while( *zRawSql ){
       const char *zStart = zRawSql;
       while( *(zRawSql++)!='\n' && *zRawSql );
       sqlite3StrAccumAppend(&out, "-- ", 3);
+      assert( (zRawSql - zStart) > 0 );
       sqlite3StrAccumAppend(&out, zStart, (int)(zRawSql-zStart));
     }
   }else{
@@ -64627,9 +67224,9 @@ SQLITE_PRIVATE char *sqlite3VdbeExpandSql(
       if( pVar->flags & MEM_Null ){
         sqlite3StrAccumAppend(&out, "NULL", 4);
       }else if( pVar->flags & MEM_Int ){
-        sqlite3XPrintf(&out, "%lld", pVar->u.i);
+        sqlite3XPrintf(&out, 0, "%lld", pVar->u.i);
       }else if( pVar->flags & MEM_Real ){
-        sqlite3XPrintf(&out, "%!.15g", pVar->r);
+        sqlite3XPrintf(&out, 0, "%!.15g", pVar->r);
       }else if( pVar->flags & MEM_Str ){
         int nOut;  /* Number of bytes of the string text to include in output */
 #ifndef SQLITE_OMIT_UTF16
@@ -64650,15 +67247,17 @@ SQLITE_PRIVATE char *sqlite3VdbeExpandSql(
           while( nOut<pVar->n && (pVar->z[nOut]&0xc0)==0x80 ){ nOut++; }
         }
 #endif    
-        sqlite3XPrintf(&out, "'%.*q'", nOut, pVar->z);
+        sqlite3XPrintf(&out, 0, "'%.*q'", nOut, pVar->z);
 #ifdef SQLITE_TRACE_SIZE_LIMIT
-        if( nOut<pVar->n ) sqlite3XPrintf(&out, "/*+%d bytes*/", pVar->n-nOut);
+        if( nOut<pVar->n ){
+          sqlite3XPrintf(&out, 0, "/*+%d bytes*/", pVar->n-nOut);
+        }
 #endif
 #ifndef SQLITE_OMIT_UTF16
         if( enc!=SQLITE_UTF8 ) sqlite3VdbeMemRelease(&utf8);
 #endif
       }else if( pVar->flags & MEM_Zero ){
-        sqlite3XPrintf(&out, "zeroblob(%d)", pVar->u.nZero);
+        sqlite3XPrintf(&out, 0, "zeroblob(%d)", pVar->u.nZero);
       }else{
         int nOut;  /* Number of bytes of the blob to include in output */
         assert( pVar->flags & MEM_Blob );
@@ -64668,11 +67267,13 @@ SQLITE_PRIVATE char *sqlite3VdbeExpandSql(
         if( nOut>SQLITE_TRACE_SIZE_LIMIT ) nOut = SQLITE_TRACE_SIZE_LIMIT;
 #endif
         for(i=0; i<nOut; i++){
-          sqlite3XPrintf(&out, "%02x", pVar->z[i]&0xff);
+          sqlite3XPrintf(&out, 0, "%02x", pVar->z[i]&0xff);
         }
         sqlite3StrAccumAppend(&out, "'", 1);
 #ifdef SQLITE_TRACE_SIZE_LIMIT
-        if( nOut<pVar->n ) sqlite3XPrintf(&out, "/*+%d bytes*/", pVar->n-nOut);
+        if( nOut<pVar->n ){
+          sqlite3XPrintf(&out, 0, "/*+%d bytes*/", pVar->n-nOut);
+        }
 #endif
       }
     }
@@ -64731,7 +67332,7 @@ SQLITE_PRIVATE void sqlite3ExplainPrintf(Vdbe *pVdbe, const char *zFormat, ...){
       sqlite3AppendSpace(&p->str, p->aIndent[n-1]);
     }   
     va_start(ap, zFormat);
-    sqlite3VXPrintf(&p->str, 1, zFormat, ap);
+    sqlite3VXPrintf(&p->str, SQLITE_PRINTF_INTERNAL, zFormat, ap);
     va_end(ap);
   }
 }
@@ -64810,33 +67411,8 @@ SQLITE_PRIVATE const char *sqlite3VdbeExplanation(Vdbe *pVdbe){
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** The code in this file implements execution method of the 
-** Virtual Database Engine (VDBE).  A separate file ("vdbeaux.c")
-** handles housekeeping details such as creating and deleting
-** VDBE instances.  This file is solely interested in executing
-** the VDBE program.
-**
-** In the external interface, an "sqlite3_stmt*" is an opaque pointer
-** to a VDBE.
-**
-** The SQL parser generates a program which is then executed by
-** the VDBE to do the work of the SQL statement.  VDBE programs are 
-** similar in form to assembly language.  The program consists of
-** a linear sequence of operations.  Each operation has an opcode 
-** and 5 operands.  Operands P1, P2, and P3 are integers.  Operand P4 
-** is a null-terminated string.  Operand P5 is an unsigned character.
-** Few opcodes use all 5 operands.
-**
-** Computation results are stored on a set of registers numbered beginning
-** with 1 and going up to Vdbe.nMem.  Each register can store
-** either an integer, a null-terminated string, a floating point
-** number, or the SQL "NULL" value.  An implicit conversion from one
-** type to the other occurs as necessary.
-** 
-** Most of the code in this file is taken up by the sqlite3VdbeExec()
-** function which does the work of interpreting a VDBE program.
-** But other routines are also provided to help in building up
-** a program instruction by instruction.
+** The code in this file implements the function that runs the
+** bytecode of a prepared statement.
 **
 ** Various scripts scan this source file in order to generate HTML
 ** documentation, headers files, or other derived files.  The formatting
@@ -64848,7 +67424,11 @@ SQLITE_PRIVATE const char *sqlite3VdbeExplanation(Vdbe *pVdbe){
 /*
 ** Invoke this macro on memory cells just prior to changing the
 ** value of the cell.  This macro verifies that shallow copies are
-** not misused.
+** not misused.  A shallow copy of a string or blob just copies a
+** pointer to the string or blob, not the content.  If the original
+** is changed while the copy is still in use, the string or blob might
+** be changed out from under the copy.  This macro verifies that nothing
+** like that ever happens.
 */
 #ifdef SQLITE_DEBUG
 # define memAboutToChange(P,M) sqlite3VdbeMemAboutToChange(P,M)
@@ -64907,7 +67487,7 @@ static void updateMaxBlobsize(Mem *p){
 #endif
 
 /*
-** The next global variable is incremented each type the OP_Found opcode
+** The next global variable is incremented each time the OP_Found opcode
 ** is executed. This is used to test whether or not the foreign key
 ** operation implemented using OP_FkIsZero is working. This variable
 ** has no function other than to help verify the correct operation of the
@@ -64927,6 +67507,34 @@ SQLITE_API int sqlite3_found_count = 0;
 # define UPDATE_MAX_BLOBSIZE(P)
 #endif
 
+/*
+** Invoke the VDBE coverage callback, if that callback is defined.  This
+** feature is used for test suite validation only and does not appear an
+** production builds.
+**
+** M is an integer, 2 or 3, that indices how many different ways the
+** branch can go.  It is usually 2.  "I" is the direction the branch
+** goes.  0 means falls through.  1 means branch is taken.  2 means the
+** second alternative branch is taken.
+*/
+#if !defined(SQLITE_VDBE_COVERAGE)
+# define VdbeBranchTaken(I,M)
+#else
+# define VdbeBranchTaken(I,M) vdbeTakeBranch(pOp->iSrcLine,I,M)
+  static void vdbeTakeBranch(int iSrcLine, u8 I, u8 M){
+    if( iSrcLine<=2 && ALWAYS(iSrcLine>0) ){
+      M = iSrcLine;
+      /* Assert the truth of VdbeCoverageAlwaysTaken() and 
+      ** VdbeCoverageNeverTaken() */
+      assert( (M & I)==I );
+    }else{
+      if( sqlite3GlobalConfig.xVdbeBranch==0 ) return;  /*NO_TEST*/
+      sqlite3GlobalConfig.xVdbeBranch(sqlite3GlobalConfig.pVdbeBranchArg,
+                                      iSrcLine,I,M);
+    }
+  }
+#endif
+
 /*
 ** Convert the given register into a string if it isn't one
 ** already. Return non-zero if a malloc() fails.
@@ -64944,38 +67552,14 @@ SQLITE_API int sqlite3_found_count = 0;
 **
 ** This routine converts an ephemeral string into a dynamically allocated
 ** string that the register itself controls.  In other words, it
-** converts an MEM_Ephem string into an MEM_Dyn string.
+** converts an MEM_Ephem string into a string with P.z==P.zMalloc.
 */
 #define Deephemeralize(P) \
    if( ((P)->flags&MEM_Ephem)!=0 \
        && sqlite3VdbeMemMakeWriteable(P) ){ goto no_mem;}
 
 /* Return true if the cursor was opened using the OP_OpenSorter opcode. */
-# define isSorter(x) ((x)->pSorter!=0)
-
-/*
-** Argument pMem points at a register that will be passed to a
-** user-defined function or returned to the user as the result of a query.
-** This routine sets the pMem->type variable used by the sqlite3_value_*() 
-** routines.
-*/
-SQLITE_PRIVATE void sqlite3VdbeMemStoreType(Mem *pMem){
-  int flags = pMem->flags;
-  if( flags & MEM_Null ){
-    pMem->type = SQLITE_NULL;
-  }
-  else if( flags & MEM_Int ){
-    pMem->type = SQLITE_INTEGER;
-  }
-  else if( flags & MEM_Real ){
-    pMem->type = SQLITE_FLOAT;
-  }
-  else if( flags & MEM_Str ){
-    pMem->type = SQLITE_TEXT;
-  }else{
-    pMem->type = SQLITE_BLOB;
-  }
-}
+#define isSorter(x) ((x)->pSorter!=0)
 
 /*
 ** Allocate VdbeCursor number iCur.  Return a pointer to it.  Return NULL
@@ -65011,9 +67595,8 @@ static VdbeCursor *allocateCursor(
   int nByte;
   VdbeCursor *pCx = 0;
   nByte = 
-      ROUND8(sizeof(VdbeCursor)) + 
-      (isBtreeCursor?sqlite3BtreeCursorSize():0) + 
-      2*nField*sizeof(u32);
+      ROUND8(sizeof(VdbeCursor)) + 2*sizeof(u32)*nField + 
+      (isBtreeCursor?sqlite3BtreeCursorSize():0);
 
   assert( iCur<p->nCursor );
   if( p->apCsr[iCur] ){
@@ -65025,12 +67608,9 @@ static VdbeCursor *allocateCursor(
     memset(pCx, 0, sizeof(VdbeCursor));
     pCx->iDb = iDb;
     pCx->nField = nField;
-    if( nField ){
-      pCx->aType = (u32 *)&pMem->z[ROUND8(sizeof(VdbeCursor))];
-    }
     if( isBtreeCursor ){
       pCx->pCursor = (BtCursor*)
-          &pMem->z[ROUND8(sizeof(VdbeCursor))+2*nField*sizeof(u32)];
+          &pMem->z[ROUND8(sizeof(VdbeCursor))+2*sizeof(u32)*nField];
       sqlite3BtreeCursorZero(pCx->pCursor);
     }
   }
@@ -65109,12 +67689,13 @@ static void applyAffinity(
 ** loss of information and return the revised type of the argument.
 */
 SQLITE_API int sqlite3_value_numeric_type(sqlite3_value *pVal){
-  Mem *pMem = (Mem*)pVal;
-  if( pMem->type==SQLITE_TEXT ){
+  int eType = sqlite3_value_type(pVal);
+  if( eType==SQLITE_TEXT ){
+    Mem *pMem = (Mem*)pVal;
     applyNumericAffinity(pMem);
-    sqlite3VdbeMemStoreType(pMem);
+    eType = sqlite3_value_type(pVal);
   }
-  return pMem->type;
+  return eType;
 }
 
 /*
@@ -65129,6 +67710,29 @@ SQLITE_PRIVATE void sqlite3ValueApplyAffinity(
   applyAffinity((Mem *)pVal, affinity, enc);
 }
 
+/*
+** Return the numeric type for pMem, either MEM_Int or MEM_Real or both or
+** none.  
+**
+** Unlike applyNumericAffinity(), this routine does not modify pMem->flags.
+** But it does set pMem->r and pMem->u.i appropriately.
+*/
+static u16 numericType(Mem *pMem){
+  if( pMem->flags & (MEM_Int|MEM_Real) ){
+    return pMem->flags & (MEM_Int|MEM_Real);
+  }
+  if( pMem->flags & (MEM_Str|MEM_Blob) ){
+    if( sqlite3AtoF(pMem->z, &pMem->r, pMem->n, pMem->enc)==0 ){
+      return 0;
+    }
+    if( sqlite3Atoi64(pMem->z, &pMem->u.i, pMem->n, pMem->enc)==SQLITE_OK ){
+      return MEM_Int;
+    }
+    return MEM_Real;
+  }
+  return 0;
+}
+
 #ifdef SQLITE_DEBUG
 /*
 ** Write a nice string representation of the contents of cell pMem
@@ -65216,37 +67820,36 @@ SQLITE_PRIVATE void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf){
 /*
 ** Print the value of a register for tracing purposes:
 */
-static void memTracePrint(FILE *out, Mem *p){
-  if( p->flags & MEM_Invalid ){
-    fprintf(out, " undefined");
+static void memTracePrint(Mem *p){
+  if( p->flags & MEM_Undefined ){
+    printf(" undefined");
   }else if( p->flags & MEM_Null ){
-    fprintf(out, " NULL");
+    printf(" NULL");
   }else if( (p->flags & (MEM_Int|MEM_Str))==(MEM_Int|MEM_Str) ){
-    fprintf(out, " si:%lld", p->u.i);
+    printf(" si:%lld", p->u.i);
   }else if( p->flags & MEM_Int ){
-    fprintf(out, " i:%lld", p->u.i);
+    printf(" i:%lld", p->u.i);
 #ifndef SQLITE_OMIT_FLOATING_POINT
   }else if( p->flags & MEM_Real ){
-    fprintf(out, " r:%g", p->r);
+    printf(" r:%g", p->r);
 #endif
   }else if( p->flags & MEM_RowSet ){
-    fprintf(out, " (rowset)");
+    printf(" (rowset)");
   }else{
     char zBuf[200];
     sqlite3VdbeMemPrettyPrint(p, zBuf);
-    fprintf(out, " ");
-    fprintf(out, "%s", zBuf);
+    printf(" %s", zBuf);
   }
 }
-static void registerTrace(FILE *out, int iReg, Mem *p){
-  fprintf(out, "REG[%d] = ", iReg);
-  memTracePrint(out, p);
-  fprintf(out, "\n");
+static void registerTrace(int iReg, Mem *p){
+  printf("REG[%d] = ", iReg);
+  memTracePrint(p);
+  printf("\n");
 }
 #endif
 
 #ifdef SQLITE_DEBUG
-#  define REGISTER_TRACE(R,M) if(p->trace)registerTrace(p->trace,R,M)
+#  define REGISTER_TRACE(R,M) if(db->flags&SQLITE_VdbeTrace)registerTrace(R,M)
 #else
 #  define REGISTER_TRACE(R,M)
 #endif
@@ -65351,20 +67954,6 @@ SQLITE_PRIVATE   sqlite_uint64 sqlite3Hwtime(void){ return ((sqlite_uint64)0); }
 
 #endif
 
-/*
-** The CHECK_FOR_INTERRUPT macro defined here looks to see if the
-** sqlite3_interrupt() routine has been called.  If it has been, then
-** processing of the VDBE program is interrupted.
-**
-** This macro added to every instruction that does a jump in order to
-** implement a loop.  This test used to be on every single instruction,
-** but that meant we more testing than we needed.  By only testing the
-** flag on jump instructions, we get a (small) speed improvement.
-*/
-#define CHECK_FOR_INTERRUPT \
-   if( db->u1.isInterrupted ) goto abort_due_to_interrupt;
-
-
 #ifndef NDEBUG
 /*
 ** This function is only called from within an assert() expression. It
@@ -65385,50 +67974,10 @@ static int checkSavepointCount(sqlite3 *db){
 }
 #endif
 
-/*
-** Transfer error message text from an sqlite3_vtab.zErrMsg (text stored
-** in memory obtained from sqlite3_malloc) into a Vdbe.zErrMsg (text stored
-** in memory obtained from sqlite3DbMalloc).
-*/
-static void importVtabErrMsg(Vdbe *p, sqlite3_vtab *pVtab){
-  sqlite3 *db = p->db;
-  sqlite3DbFree(db, p->zErrMsg);
-  p->zErrMsg = sqlite3DbStrDup(db, pVtab->zErrMsg);
-  sqlite3_free(pVtab->zErrMsg);
-  pVtab->zErrMsg = 0;
-}
-
 
 /*
-** Execute as much of a VDBE program as we can then return.
-**
-** sqlite3VdbeMakeReady() must be called before this routine in order to
-** close the program with a final OP_Halt and to set up the callbacks
-** and the error message pointer.
-**
-** Whenever a row or result data is available, this routine will either
-** invoke the result callback (if there is one) or return with
-** SQLITE_ROW.
-**
-** If an attempt is made to open a locked database, then this routine
-** will either invoke the busy callback (if there is one) or it will
-** return SQLITE_BUSY.
-**
-** If an error occurs, an error message is written to memory obtained
-** from sqlite3_malloc() and p->zErrMsg is made to point to that memory.
-** The error code is stored in p->rc and this routine returns SQLITE_ERROR.
-**
-** If the callback ever returns non-zero, then the program exits
-** immediately.  There will be no error message but the p->rc field is
-** set to SQLITE_ABORT and this routine will return SQLITE_ERROR.
-**
-** A memory allocation error causes p->rc to be set to SQLITE_NOMEM and this
-** routine to return SQLITE_ERROR.
-**
-** Other fatal errors return SQLITE_ERROR.
-**
-** After this routine has finished, sqlite3VdbeFinalize() should be
-** used to clean up the mess that was left behind.
+** Execute as much of a VDBE program as we can.
+** This is the core of sqlite3_step().  
 */
 SQLITE_PRIVATE int sqlite3VdbeExec(
   Vdbe *p                    /* The VDBE */
@@ -65440,452 +67989,22 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
   sqlite3 *db = p->db;       /* The database */
   u8 resetSchemaOnFault = 0; /* Reset schema after an error if positive */
   u8 encoding = ENC(db);     /* The database encoding */
+  int iCompare = 0;          /* Result of last OP_Compare operation */
+  unsigned nVmStep = 0;      /* Number of virtual machine steps */
 #ifndef SQLITE_OMIT_PROGRESS_CALLBACK
-  int checkProgress;         /* True if progress callbacks are enabled */
-  int nProgressOps = 0;      /* Opcodes executed since progress callback. */
+  unsigned nProgressLimit = 0;/* Invoke xProgress() when nVmStep reaches this */
 #endif
   Mem *aMem = p->aMem;       /* Copy of p->aMem */
   Mem *pIn1 = 0;             /* 1st input operand */
   Mem *pIn2 = 0;             /* 2nd input operand */
   Mem *pIn3 = 0;             /* 3rd input operand */
   Mem *pOut = 0;             /* Output operand */
-  int iCompare = 0;          /* Result of last OP_Compare operation */
   int *aPermute = 0;         /* Permutation of columns for OP_Compare */
   i64 lastRowid = db->lastRowid;  /* Saved value of the last insert ROWID */
 #ifdef VDBE_PROFILE
   u64 start;                 /* CPU clock count at start of opcode */
-  int origPc;                /* Program counter at start of opcode */
 #endif
-  /********************************************************************
-  ** Automatically generated code
-  **
-  ** The following union is automatically generated by the
-  ** vdbe-compress.tcl script.  The purpose of this union is to
-  ** reduce the amount of stack space required by this function.
-  ** See comments in the vdbe-compress.tcl script for details.
-  */
-  union vdbeExecUnion {
-    struct OP_Yield_stack_vars {
-      int pcDest;
-    } aa;
-    struct OP_Null_stack_vars {
-      int cnt;
-      u16 nullFlag;
-    } ab;
-    struct OP_Variable_stack_vars {
-      Mem *pVar;       /* Value being transferred */
-    } ac;
-    struct OP_Move_stack_vars {
-      char *zMalloc;   /* Holding variable for allocated memory */
-      int n;           /* Number of registers left to copy */
-      int p1;          /* Register to copy from */
-      int p2;          /* Register to copy to */
-    } ad;
-    struct OP_Copy_stack_vars {
-      int n;
-    } ae;
-    struct OP_ResultRow_stack_vars {
-      Mem *pMem;
-      int i;
-    } af;
-    struct OP_Concat_stack_vars {
-      i64 nByte;
-    } ag;
-    struct OP_Remainder_stack_vars {
-      char bIntint;   /* Started out as two integer operands */
-      int flags;      /* Combined MEM_* flags from both inputs */
-      i64 iA;         /* Integer value of left operand */
-      i64 iB;         /* Integer value of right operand */
-      double rA;      /* Real value of left operand */
-      double rB;      /* Real value of right operand */
-    } ah;
-    struct OP_Function_stack_vars {
-      int i;
-      Mem *pArg;
-      sqlite3_context ctx;
-      sqlite3_value **apVal;
-      int n;
-    } ai;
-    struct OP_ShiftRight_stack_vars {
-      i64 iA;
-      u64 uA;
-      i64 iB;
-      u8 op;
-    } aj;
-    struct OP_Ge_stack_vars {
-      int res;            /* Result of the comparison of pIn1 against pIn3 */
-      char affinity;      /* Affinity to use for comparison */
-      u16 flags1;         /* Copy of initial value of pIn1->flags */
-      u16 flags3;         /* Copy of initial value of pIn3->flags */
-    } ak;
-    struct OP_Compare_stack_vars {
-      int n;
-      int i;
-      int p1;
-      int p2;
-      const KeyInfo *pKeyInfo;
-      int idx;
-      CollSeq *pColl;    /* Collating sequence to use on this term */
-      int bRev;          /* True for DESCENDING sort order */
-    } al;
-    struct OP_Or_stack_vars {
-      int v1;    /* Left operand:  0==FALSE, 1==TRUE, 2==UNKNOWN or NULL */
-      int v2;    /* Right operand: 0==FALSE, 1==TRUE, 2==UNKNOWN or NULL */
-    } am;
-    struct OP_IfNot_stack_vars {
-      int c;
-    } an;
-    struct OP_Column_stack_vars {
-      u32 payloadSize;   /* Number of bytes in the record */
-      i64 payloadSize64; /* Number of bytes in the record */
-      int p1;            /* P1 value of the opcode */
-      int p2;            /* column number to retrieve */
-      VdbeCursor *pC;    /* The VDBE cursor */
-      char *zRec;        /* Pointer to complete record-data */
-      BtCursor *pCrsr;   /* The BTree cursor */
-      u32 *aType;        /* aType[i] holds the numeric type of the i-th column */
-      u32 *aOffset;      /* aOffset[i] is offset to start of data for i-th column */
-      int nField;        /* number of fields in the record */
-      int len;           /* The length of the serialized data for the column */
-      int i;             /* Loop counter */
-      char *zData;       /* Part of the record being decoded */
-      Mem *pDest;        /* Where to write the extracted value */
-      Mem sMem;          /* For storing the record being decoded */
-      u8 *zIdx;          /* Index into header */
-      u8 *zEndHdr;       /* Pointer to first byte after the header */
-      u32 offset;        /* Offset into the data */
-      u32 szField;       /* Number of bytes in the content of a field */
-      int szHdr;         /* Size of the header size field at start of record */
-      int avail;         /* Number of bytes of available data */
-      u32 t;             /* A type code from the record header */
-      Mem *pReg;         /* PseudoTable input register */
-    } ao;
-    struct OP_Affinity_stack_vars {
-      const char *zAffinity;   /* The affinity to be applied */
-      char cAff;               /* A single character of affinity */
-    } ap;
-    struct OP_MakeRecord_stack_vars {
-      u8 *zNewRecord;        /* A buffer to hold the data for the new record */
-      Mem *pRec;             /* The new record */
-      u64 nData;             /* Number of bytes of data space */
-      int nHdr;              /* Number of bytes of header space */
-      i64 nByte;             /* Data space required for this record */
-      int nZero;             /* Number of zero bytes at the end of the record */
-      int nVarint;           /* Number of bytes in a varint */
-      u32 serial_type;       /* Type field */
-      Mem *pData0;           /* First field to be combined into the record */
-      Mem *pLast;            /* Last field of the record */
-      int nField;            /* Number of fields in the record */
-      char *zAffinity;       /* The affinity string for the record */
-      int file_format;       /* File format to use for encoding */
-      int i;                 /* Space used in zNewRecord[] */
-      int len;               /* Length of a field */
-    } aq;
-    struct OP_Count_stack_vars {
-      i64 nEntry;
-      BtCursor *pCrsr;
-    } ar;
-    struct OP_Savepoint_stack_vars {
-      int p1;                         /* Value of P1 operand */
-      char *zName;                    /* Name of savepoint */
-      int nName;
-      Savepoint *pNew;
-      Savepoint *pSavepoint;
-      Savepoint *pTmp;
-      int iSavepoint;
-      int ii;
-    } as;
-    struct OP_AutoCommit_stack_vars {
-      int desiredAutoCommit;
-      int iRollback;
-      int turnOnAC;
-    } at;
-    struct OP_Transaction_stack_vars {
-      Btree *pBt;
-    } au;
-    struct OP_ReadCookie_stack_vars {
-      int iMeta;
-      int iDb;
-      int iCookie;
-    } av;
-    struct OP_SetCookie_stack_vars {
-      Db *pDb;
-    } aw;
-    struct OP_VerifyCookie_stack_vars {
-      int iMeta;
-      int iGen;
-      Btree *pBt;
-    } ax;
-    struct OP_OpenWrite_stack_vars {
-      int nField;
-      KeyInfo *pKeyInfo;
-      int p2;
-      int iDb;
-      int wrFlag;
-      Btree *pX;
-      VdbeCursor *pCur;
-      Db *pDb;
-    } ay;
-    struct OP_OpenEphemeral_stack_vars {
-      VdbeCursor *pCx;
-    } az;
-    struct OP_SorterOpen_stack_vars {
-      VdbeCursor *pCx;
-    } ba;
-    struct OP_OpenPseudo_stack_vars {
-      VdbeCursor *pCx;
-    } bb;
-    struct OP_SeekGt_stack_vars {
-      int res;
-      int oc;
-      VdbeCursor *pC;
-      UnpackedRecord r;
-      int nField;
-      i64 iKey;      /* The rowid we are to seek to */
-    } bc;
-    struct OP_Seek_stack_vars {
-      VdbeCursor *pC;
-    } bd;
-    struct OP_Found_stack_vars {
-      int alreadyExists;
-      VdbeCursor *pC;
-      int res;
-      char *pFree;
-      UnpackedRecord *pIdxKey;
-      UnpackedRecord r;
-      char aTempRec[ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*3 + 7];
-    } be;
-    struct OP_IsUnique_stack_vars {
-      u16 ii;
-      VdbeCursor *pCx;
-      BtCursor *pCrsr;
-      u16 nField;
-      Mem *aMx;
-      UnpackedRecord r;                  /* B-Tree index search key */
-      i64 R;                             /* Rowid stored in register P3 */
-    } bf;
-    struct OP_NotExists_stack_vars {
-      VdbeCursor *pC;
-      BtCursor *pCrsr;
-      int res;
-      u64 iKey;
-    } bg;
-    struct OP_NewRowid_stack_vars {
-      i64 v;                 /* The new rowid */
-      VdbeCursor *pC;        /* Cursor of table to get the new rowid */
-      int res;               /* Result of an sqlite3BtreeLast() */
-      int cnt;               /* Counter to limit the number of searches */
-      Mem *pMem;             /* Register holding largest rowid for AUTOINCREMENT */
-      VdbeFrame *pFrame;     /* Root frame of VDBE */
-    } bh;
-    struct OP_InsertInt_stack_vars {
-      Mem *pData;       /* MEM cell holding data for the record to be inserted */
-      Mem *pKey;        /* MEM cell holding key  for the record */
-      i64 iKey;         /* The integer ROWID or key for the record to be inserted */
-      VdbeCursor *pC;   /* Cursor to table into which insert is written */
-      int nZero;        /* Number of zero-bytes to append */
-      int seekResult;   /* Result of prior seek or 0 if no USESEEKRESULT flag */
-      const char *zDb;  /* database name - used by the update hook */
-      const char *zTbl; /* Table name - used by the opdate hook */
-      int op;           /* Opcode for update hook: SQLITE_UPDATE or SQLITE_INSERT */
-    } bi;
-    struct OP_Delete_stack_vars {
-      i64 iKey;
-      VdbeCursor *pC;
-    } bj;
-    struct OP_SorterCompare_stack_vars {
-      VdbeCursor *pC;
-      int res;
-    } bk;
-    struct OP_SorterData_stack_vars {
-      VdbeCursor *pC;
-    } bl;
-    struct OP_RowData_stack_vars {
-      VdbeCursor *pC;
-      BtCursor *pCrsr;
-      u32 n;
-      i64 n64;
-    } bm;
-    struct OP_Rowid_stack_vars {
-      VdbeCursor *pC;
-      i64 v;
-      sqlite3_vtab *pVtab;
-      const sqlite3_module *pModule;
-    } bn;
-    struct OP_NullRow_stack_vars {
-      VdbeCursor *pC;
-    } bo;
-    struct OP_Last_stack_vars {
-      VdbeCursor *pC;
-      BtCursor *pCrsr;
-      int res;
-    } bp;
-    struct OP_Rewind_stack_vars {
-      VdbeCursor *pC;
-      BtCursor *pCrsr;
-      int res;
-    } bq;
-    struct OP_Next_stack_vars {
-      VdbeCursor *pC;
-      int res;
-    } br;
-    struct OP_IdxInsert_stack_vars {
-      VdbeCursor *pC;
-      BtCursor *pCrsr;
-      int nKey;
-      const char *zKey;
-    } bs;
-    struct OP_IdxDelete_stack_vars {
-      VdbeCursor *pC;
-      BtCursor *pCrsr;
-      int res;
-      UnpackedRecord r;
-    } bt;
-    struct OP_IdxRowid_stack_vars {
-      BtCursor *pCrsr;
-      VdbeCursor *pC;
-      i64 rowid;
-    } bu;
-    struct OP_IdxGE_stack_vars {
-      VdbeCursor *pC;
-      int res;
-      UnpackedRecord r;
-    } bv;
-    struct OP_Destroy_stack_vars {
-      int iMoved;
-      int iCnt;
-      Vdbe *pVdbe;
-      int iDb;
-    } bw;
-    struct OP_Clear_stack_vars {
-      int nChange;
-    } bx;
-    struct OP_CreateTable_stack_vars {
-      int pgno;
-      int flags;
-      Db *pDb;
-    } by;
-    struct OP_ParseSchema_stack_vars {
-      int iDb;
-      const char *zMaster;
-      char *zSql;
-      InitData initData;
-    } bz;
-    struct OP_IntegrityCk_stack_vars {
-      int nRoot;      /* Number of tables to check.  (Number of root pages.) */
-      int *aRoot;     /* Array of rootpage numbers for tables to be checked */
-      int j;          /* Loop counter */
-      int nErr;       /* Number of errors reported */
-      char *z;        /* Text of the error report */
-      Mem *pnErr;     /* Register keeping track of errors remaining */
-    } ca;
-    struct OP_RowSetRead_stack_vars {
-      i64 val;
-    } cb;
-    struct OP_RowSetTest_stack_vars {
-      int iSet;
-      int exists;
-    } cc;
-    struct OP_Program_stack_vars {
-      int nMem;               /* Number of memory registers for sub-program */
-      int nByte;              /* Bytes of runtime space required for sub-program */
-      Mem *pRt;               /* Register to allocate runtime space */
-      Mem *pMem;              /* Used to iterate through memory cells */
-      Mem *pEnd;              /* Last memory cell in new array */
-      VdbeFrame *pFrame;      /* New vdbe frame to execute in */
-      SubProgram *pProgram;   /* Sub-program to execute */
-      void *t;                /* Token identifying trigger */
-    } cd;
-    struct OP_Param_stack_vars {
-      VdbeFrame *pFrame;
-      Mem *pIn;
-    } ce;
-    struct OP_MemMax_stack_vars {
-      Mem *pIn1;
-      VdbeFrame *pFrame;
-    } cf;
-    struct OP_AggStep_stack_vars {
-      int n;
-      int i;
-      Mem *pMem;
-      Mem *pRec;
-      sqlite3_context ctx;
-      sqlite3_value **apVal;
-    } cg;
-    struct OP_AggFinal_stack_vars {
-      Mem *pMem;
-    } ch;
-    struct OP_Checkpoint_stack_vars {
-      int i;                          /* Loop counter */
-      int aRes[3];                    /* Results */
-      Mem *pMem;                      /* Write results here */
-    } ci;
-    struct OP_JournalMode_stack_vars {
-      Btree *pBt;                     /* Btree to change journal mode of */
-      Pager *pPager;                  /* Pager associated with pBt */
-      int eNew;                       /* New journal mode */
-      int eOld;                       /* The old journal mode */
-#ifndef SQLITE_OMIT_WAL
-      const char *zFilename;          /* Name of database file for pPager */
-#endif
-    } cj;
-    struct OP_IncrVacuum_stack_vars {
-      Btree *pBt;
-    } ck;
-    struct OP_VBegin_stack_vars {
-      VTable *pVTab;
-    } cl;
-    struct OP_VOpen_stack_vars {
-      VdbeCursor *pCur;
-      sqlite3_vtab_cursor *pVtabCursor;
-      sqlite3_vtab *pVtab;
-      sqlite3_module *pModule;
-    } cm;
-    struct OP_VFilter_stack_vars {
-      int nArg;
-      int iQuery;
-      const sqlite3_module *pModule;
-      Mem *pQuery;
-      Mem *pArgc;
-      sqlite3_vtab_cursor *pVtabCursor;
-      sqlite3_vtab *pVtab;
-      VdbeCursor *pCur;
-      int res;
-      int i;
-      Mem **apArg;
-    } cn;
-    struct OP_VColumn_stack_vars {
-      sqlite3_vtab *pVtab;
-      const sqlite3_module *pModule;
-      Mem *pDest;
-      sqlite3_context sContext;
-    } co;
-    struct OP_VNext_stack_vars {
-      sqlite3_vtab *pVtab;
-      const sqlite3_module *pModule;
-      int res;
-      VdbeCursor *pCur;
-    } cp;
-    struct OP_VRename_stack_vars {
-      sqlite3_vtab *pVtab;
-      Mem *pName;
-    } cq;
-    struct OP_VUpdate_stack_vars {
-      sqlite3_vtab *pVtab;
-      sqlite3_module *pModule;
-      int nArg;
-      int i;
-      sqlite_int64 rowid;
-      Mem **apArg;
-      Mem *pX;
-    } cr;
-    struct OP_Trace_stack_vars {
-      char *zTrace;
-      char *z;
-    } cs;
-  } u;
-  /* End automatically generated code
-  ********************************************************************/
+  /*** INSERT STACK UNION HERE ***/
 
   assert( p->magic==VDBE_MAGIC_RUN );  /* sqlite3_step() verifies this */
   sqlite3VdbeEnter(p);
@@ -65895,24 +68014,49 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
     goto no_mem;
   }
   assert( p->rc==SQLITE_OK || p->rc==SQLITE_BUSY );
+  assert( p->bIsReader || p->readOnly!=0 );
   p->rc = SQLITE_OK;
+  p->iCurrentTime = 0;
   assert( p->explain==0 );
   p->pResultSet = 0;
   db->busyHandler.nBusy = 0;
-  CHECK_FOR_INTERRUPT;
+  if( db->u1.isInterrupted ) goto abort_due_to_interrupt;
   sqlite3VdbeIOTraceSql(p);
 #ifndef SQLITE_OMIT_PROGRESS_CALLBACK
-  checkProgress = db->xProgress!=0;
+  if( db->xProgress ){
+    assert( 0 < db->nProgressOps );
+    nProgressLimit = (unsigned)p->aCounter[SQLITE_STMTSTATUS_VM_STEP];
+    if( nProgressLimit==0 ){
+      nProgressLimit = db->nProgressOps;
+    }else{
+      nProgressLimit %= (unsigned)db->nProgressOps;
+    }
+  }
 #endif
 #ifdef SQLITE_DEBUG
   sqlite3BeginBenignMalloc();
-  if( p->pc==0  && (p->db->flags & SQLITE_VdbeListing)!=0 ){
+  if( p->pc==0
+   && (p->db->flags & (SQLITE_VdbeListing|SQLITE_VdbeEQP|SQLITE_VdbeTrace))!=0
+  ){
     int i;
-    printf("VDBE Program Listing:\n");
+    int once = 1;
     sqlite3VdbePrintSql(p);
-    for(i=0; i<p->nOp; i++){
-      sqlite3VdbePrintOp(stdout, i, &aOp[i]);
+    if( p->db->flags & SQLITE_VdbeListing ){
+      printf("VDBE Program Listing:\n");
+      for(i=0; i<p->nOp; i++){
+        sqlite3VdbePrintOp(stdout, i, &aOp[i]);
+      }
     }
+    if( p->db->flags & SQLITE_VdbeEQP ){
+      for(i=0; i<p->nOp; i++){
+        if( aOp[i].opcode==OP_Explain ){
+          if( once ) printf("VDBE Query Plan:\n");
+          printf("%s\n", aOp[i].p4.z);
+          once = 0;
+        }
+      }
+    }
+    if( p->db->flags & SQLITE_VdbeTrace )  printf("VDBE Trace:\n");
   }
   sqlite3EndBenignMalloc();
 #endif
@@ -65920,20 +68064,16 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
     assert( pc>=0 && pc<p->nOp );
     if( db->mallocFailed ) goto no_mem;
 #ifdef VDBE_PROFILE
-    origPc = pc;
     start = sqlite3Hwtime();
 #endif
+    nVmStep++;
     pOp = &aOp[pc];
 
     /* Only allow tracing if SQLITE_DEBUG is defined.
     */
 #ifdef SQLITE_DEBUG
-    if( p->trace ){
-      if( pc==0 ){
-        printf("VDBE Execution Trace:\n");
-        sqlite3VdbePrintSql(p);
-      }
-      sqlite3VdbePrintOp(p->trace, pc, pOp);
+    if( db->flags & SQLITE_VdbeTrace ){
+      sqlite3VdbePrintOp(stdout, pc, pOp);
     }
 #endif
       
@@ -65950,27 +68090,6 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
     }
 #endif
 
-#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
-    /* Call the progress callback if it is configured and the required number
-    ** of VDBE ops have been executed (either since this invocation of
-    ** sqlite3VdbeExec() or since last time the progress callback was called).
-    ** If the progress callback returns non-zero, exit the virtual machine with
-    ** a return code SQLITE_ABORT.
-    */
-    if( checkProgress ){
-      if( db->nProgressOps==nProgressOps ){
-        int prc;
-        prc = db->xProgress(db->pProgressArg);
-        if( prc!=0 ){
-          rc = SQLITE_INTERRUPT;
-          goto vdbe_error_halt;
-        }
-        nProgressOps = 0;
-      }
-      nProgressOps++;
-    }
-#endif
-
     /* On any opcode with the "out2-prerelease" tag, free any
     ** external allocations out of mem[p2] and set mem[p2] to be
     ** an undefined integer.  Opcodes will either fill in the integer
@@ -65979,7 +68098,7 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
     assert( pOp->opflags==sqlite3OpcodeProperty[pOp->opcode] );
     if( pOp->opflags & OPFLG_OUT2_PRERELEASE ){
       assert( pOp->p2>0 );
-      assert( pOp->p2<=p->nMem );
+      assert( pOp->p2<=(p->nMem-p->nCursor) );
       pOut = &aMem[pOp->p2];
       memAboutToChange(p, pOut);
       VdbeMemRelease(pOut);
@@ -65990,30 +68109,33 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
 #ifdef SQLITE_DEBUG
     if( (pOp->opflags & OPFLG_IN1)!=0 ){
       assert( pOp->p1>0 );
-      assert( pOp->p1<=p->nMem );
+      assert( pOp->p1<=(p->nMem-p->nCursor) );
       assert( memIsValid(&aMem[pOp->p1]) );
+      assert( sqlite3VdbeCheckMemInvariants(&aMem[pOp->p1]) );
       REGISTER_TRACE(pOp->p1, &aMem[pOp->p1]);
     }
     if( (pOp->opflags & OPFLG_IN2)!=0 ){
       assert( pOp->p2>0 );
-      assert( pOp->p2<=p->nMem );
+      assert( pOp->p2<=(p->nMem-p->nCursor) );
       assert( memIsValid(&aMem[pOp->p2]) );
+      assert( sqlite3VdbeCheckMemInvariants(&aMem[pOp->p2]) );
       REGISTER_TRACE(pOp->p2, &aMem[pOp->p2]);
     }
     if( (pOp->opflags & OPFLG_IN3)!=0 ){
       assert( pOp->p3>0 );
-      assert( pOp->p3<=p->nMem );
+      assert( pOp->p3<=(p->nMem-p->nCursor) );
       assert( memIsValid(&aMem[pOp->p3]) );
+      assert( sqlite3VdbeCheckMemInvariants(&aMem[pOp->p3]) );
       REGISTER_TRACE(pOp->p3, &aMem[pOp->p3]);
     }
     if( (pOp->opflags & OPFLG_OUT2)!=0 ){
       assert( pOp->p2>0 );
-      assert( pOp->p2<=p->nMem );
+      assert( pOp->p2<=(p->nMem-p->nCursor) );
       memAboutToChange(p, &aMem[pOp->p2]);
     }
     if( (pOp->opflags & OPFLG_OUT3)!=0 ){
       assert( pOp->p3>0 );
-      assert( pOp->p3<=p->nMem );
+      assert( pOp->p3<=(p->nMem-p->nCursor) );
       memAboutToChange(p, &aMem[pOp->p3]);
     }
 #endif
@@ -66061,10 +68183,44 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
 ** The next instruction executed will be 
 ** the one at index P2 from the beginning of
 ** the program.
+**
+** The P1 parameter is not actually used by this opcode.  However, it
+** is sometimes set to 1 instead of 0 as a hint to the command-line shell
+** that this Goto is the bottom of a loop and that the lines from P2 down
+** to the current line should be indented for EXPLAIN output.
 */
 case OP_Goto: {             /* jump */
-  CHECK_FOR_INTERRUPT;
   pc = pOp->p2 - 1;
+
+  /* Opcodes that are used as the bottom of a loop (OP_Next, OP_Prev,
+  ** OP_VNext, OP_RowSetNext, or OP_SorterNext) all jump here upon
+  ** completion.  Check to see if sqlite3_interrupt() has been called
+  ** or if the progress callback needs to be invoked. 
+  **
+  ** This code uses unstructured "goto" statements and does not look clean.
+  ** But that is not due to sloppy coding habits. The code is written this
+  ** way for performance, to avoid having to run the interrupt and progress
+  ** checks on every opcode.  This helps sqlite3_step() to run about 1.5%
+  ** faster according to "valgrind --tool=cachegrind" */
+check_for_interrupt:
+  if( db->u1.isInterrupted ) goto abort_due_to_interrupt;
+#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
+  /* Call the progress callback if it is configured and the required number
+  ** of VDBE ops have been executed (either since this invocation of
+  ** sqlite3VdbeExec() or since last time the progress callback was called).
+  ** If the progress callback returns non-zero, exit the virtual machine with
+  ** a return code SQLITE_ABORT.
+  */
+  if( db->xProgress!=0 && nVmStep>=nProgressLimit ){
+    assert( db->nProgressOps!=0 );
+    nProgressLimit = nVmStep + db->nProgressOps - (nVmStep%db->nProgressOps);
+    if( db->xProgress(db->pProgressArg) ){
+      rc = SQLITE_INTERRUPT;
+      goto vdbe_error_halt;
+    }
+  }
+#endif
+  
   break;
 }
 
@@ -66074,9 +68230,9 @@ case OP_Goto: {             /* jump */
 ** and then jump to address P2.
 */
 case OP_Gosub: {            /* jump */
-  assert( pOp->p1>0 && pOp->p1<=p->nMem );
+  assert( pOp->p1>0 && pOp->p1<=(p->nMem-p->nCursor) );
   pIn1 = &aMem[pOp->p1];
-  assert( (pIn1->flags & MEM_Dyn)==0 );
+  assert( VdbeMemDynamic(pIn1)==0 );
   memAboutToChange(p, pIn1);
   pIn1->flags = MEM_Int;
   pIn1->u.i = pc;
@@ -66087,38 +68243,84 @@ case OP_Gosub: {            /* jump */
 
 /* Opcode:  Return P1 * * * *
 **
-** Jump to the next instruction after the address in register P1.
+** Jump to the next instruction after the address in register P1.  After
+** the jump, register P1 becomes undefined.
 */
 case OP_Return: {           /* in1 */
   pIn1 = &aMem[pOp->p1];
-  assert( pIn1->flags & MEM_Int );
+  assert( pIn1->flags==MEM_Int );
   pc = (int)pIn1->u.i;
+  pIn1->flags = MEM_Undefined;
   break;
 }
 
-/* Opcode:  Yield P1 * * * *
+/* Opcode: InitCoroutine P1 P2 P3 * *
+**
+** Set up register P1 so that it will OP_Yield to the co-routine
+** located at address P3.
+**
+** If P2!=0 then the co-routine implementation immediately follows
+** this opcode.  So jump over the co-routine implementation to
+** address P2.
+*/
+case OP_InitCoroutine: {     /* jump */
+  assert( pOp->p1>0 &&  pOp->p1<=(p->nMem-p->nCursor) );
+  assert( pOp->p2>=0 && pOp->p2<p->nOp );
+  assert( pOp->p3>=0 && pOp->p3<p->nOp );
+  pOut = &aMem[pOp->p1];
+  assert( !VdbeMemDynamic(pOut) );
+  pOut->u.i = pOp->p3 - 1;
+  pOut->flags = MEM_Int;
+  if( pOp->p2 ) pc = pOp->p2 - 1;
+  break;
+}
+
+/* Opcode:  EndCoroutine P1 * * * *
+**
+** The instruction at the address in register P1 is an OP_Yield.
+** Jump to the P2 parameter of that OP_Yield.
+** After the jump, register P1 becomes undefined.
+*/
+case OP_EndCoroutine: {           /* in1 */
+  VdbeOp *pCaller;
+  pIn1 = &aMem[pOp->p1];
+  assert( pIn1->flags==MEM_Int );
+  assert( pIn1->u.i>=0 && pIn1->u.i<p->nOp );
+  pCaller = &aOp[pIn1->u.i];
+  assert( pCaller->opcode==OP_Yield );
+  assert( pCaller->p2>=0 && pCaller->p2<p->nOp );
+  pc = pCaller->p2 - 1;
+  pIn1->flags = MEM_Undefined;
+  break;
+}
+
+/* Opcode:  Yield P1 P2 * * *
 **
 ** Swap the program counter with the value in register P1.
+**
+** If the co-routine ends with OP_Yield or OP_Return then continue
+** to the next instruction.  But if the co-routine ends with
+** OP_EndCoroutine, jump immediately to P2.
 */
-case OP_Yield: {            /* in1 */
-#if 0  /* local variables moved into u.aa */
+case OP_Yield: {            /* in1, jump */
   int pcDest;
-#endif /* local variables moved into u.aa */
   pIn1 = &aMem[pOp->p1];
-  assert( (pIn1->flags & MEM_Dyn)==0 );
+  assert( VdbeMemDynamic(pIn1)==0 );
   pIn1->flags = MEM_Int;
-  u.aa.pcDest = (int)pIn1->u.i;
+  pcDest = (int)pIn1->u.i;
   pIn1->u.i = pc;
   REGISTER_TRACE(pOp->p1, pIn1);
-  pc = u.aa.pcDest;
+  pc = pcDest;
   break;
 }
 
-/* Opcode:  HaltIfNull  P1 P2 P3 P4 *
+/* Opcode:  HaltIfNull  P1 P2 P3 P4 P5
+** Synopsis:  if r[P3]=null halt
 **
 ** Check the value in register P3.  If it is NULL then Halt using
 ** parameter P1, P2, and P4 as if this were a Halt instruction.  If the
 ** value in register P3 is not NULL, then this routine is a no-op.
+** The P5 parameter should be 1.
 */
 case OP_HaltIfNull: {      /* in3 */
   pIn3 = &aMem[pOp->p3];
@@ -66126,7 +68328,7 @@ case OP_HaltIfNull: {      /* in3 */
   /* Fall through into OP_Halt */
 }
 
-/* Opcode:  Halt P1 P2 * P4 *
+/* Opcode:  Halt P1 P2 * P4 P5
 **
 ** Exit immediately.  All open cursors, etc are closed
 ** automatically.
@@ -66141,11 +68343,25 @@ case OP_HaltIfNull: {      /* in3 */
 **
 ** If P4 is not null then it is an error message string.
 **
+** P5 is a value between 0 and 4, inclusive, that modifies the P4 string.
+**
+**    0:  (no change)
+**    1:  NOT NULL contraint failed: P4
+**    2:  UNIQUE constraint failed: P4
+**    3:  CHECK constraint failed: P4
+**    4:  FOREIGN KEY constraint failed: P4
+**
+** If P5 is not zero and P4 is NULL, then everything after the ":" is
+** omitted.
+**
 ** There is an implied "Halt 0 0 0" instruction inserted at the very end of
 ** every program.  So a jump past the last instruction of the program
 ** is the same as executing Halt.
 */
 case OP_Halt: {
+  const char *zType;
+  const char *zLogFmt;
+
   if( pOp->p1==SQLITE_OK && p->pFrame ){
     /* Halt the sub-program. Return control to the parent frame. */
     VdbeFrame *pFrame = p->pFrame;
@@ -66166,18 +68382,33 @@ case OP_Halt: {
     aMem = p->aMem;
     break;
   }
-
   p->rc = pOp->p1;
   p->errorAction = (u8)pOp->p2;
   p->pc = pc;
-  if( pOp->p4.z ){
-    assert( p->rc!=SQLITE_OK );
-    sqlite3SetString(&p->zErrMsg, db, "%s", pOp->p4.z);
-    testcase( sqlite3GlobalConfig.xLog!=0 );
-    sqlite3_log(pOp->p1, "abort at %d in [%s]: %s", pc, p->zSql, pOp->p4.z);
-  }else if( p->rc ){
-    testcase( sqlite3GlobalConfig.xLog!=0 );
-    sqlite3_log(pOp->p1, "constraint failed at %d in [%s]", pc, p->zSql);
+  if( p->rc ){
+    if( pOp->p5 ){
+      static const char * const azType[] = { "NOT NULL", "UNIQUE", "CHECK",
+                                             "FOREIGN KEY" };
+      assert( pOp->p5>=1 && pOp->p5<=4 );
+      testcase( pOp->p5==1 );
+      testcase( pOp->p5==2 );
+      testcase( pOp->p5==3 );
+      testcase( pOp->p5==4 );
+      zType = azType[pOp->p5-1];
+    }else{
+      zType = 0;
+    }
+    assert( zType!=0 || pOp->p4.z!=0 );
+    zLogFmt = "abort at %d in [%s]: %s";
+    if( zType && pOp->p4.z ){
+      sqlite3SetString(&p->zErrMsg, db, "%s constraint failed: %s", 
+                       zType, pOp->p4.z);
+    }else if( pOp->p4.z ){
+      sqlite3SetString(&p->zErrMsg, db, "%s", pOp->p4.z);
+    }else{
+      sqlite3SetString(&p->zErrMsg, db, "%s constraint failed", zType);
+    }
+    sqlite3_log(pOp->p1, zLogFmt, pc, p->zSql, p->zErrMsg);
   }
   rc = sqlite3VdbeHalt(p);
   assert( rc==SQLITE_BUSY || rc==SQLITE_OK || rc==SQLITE_ERROR );
@@ -66185,13 +68416,14 @@ case OP_Halt: {
     p->rc = rc = SQLITE_BUSY;
   }else{
     assert( rc==SQLITE_OK || (p->rc&0xff)==SQLITE_CONSTRAINT );
-    assert( rc==SQLITE_OK || db->nDeferredCons>0 );
+    assert( rc==SQLITE_OK || db->nDeferredCons>0 || db->nDeferredImmCons>0 );
     rc = p->rc ? SQLITE_ERROR : SQLITE_DONE;
   }
   goto vdbe_return;
 }
 
 /* Opcode: Integer P1 P2 * * *
+** Synopsis: r[P2]=P1
 **
 ** The 32-bit integer value P1 is written into register P2.
 */
@@ -66201,6 +68433,7 @@ case OP_Integer: {         /* out2-prerelease */
 }
 
 /* Opcode: Int64 * P2 * P4 *
+** Synopsis: r[P2]=P4
 **
 ** P4 is a pointer to a 64-bit integer value.
 ** Write that value into register P2.
@@ -66213,6 +68446,7 @@ case OP_Int64: {           /* out2-prerelease */
 
 #ifndef SQLITE_OMIT_FLOATING_POINT
 /* Opcode: Real * P2 * P4 *
+** Synopsis: r[P2]=P4
 **
 ** P4 is a pointer to a 64-bit floating point value.
 ** Write that value into register P2.
@@ -66226,9 +68460,12 @@ case OP_Real: {            /* same as TK_FLOAT, out2-prerelease */
 #endif
 
 /* Opcode: String8 * P2 * P4 *
+** Synopsis: r[P2]='P4'
 **
 ** P4 points to a nul terminated UTF-8 string. This opcode is transformed 
-** into an OP_String before it is executed for the first time.
+** into an OP_String before it is executed for the first time.  During
+** this transformation, the length of string P4 is computed and stored
+** as the P1 parameter.
 */
 case OP_String8: {         /* same as TK_STRING, out2-prerelease */
   assert( pOp->p4.z!=0 );
@@ -66241,10 +68478,9 @@ case OP_String8: {         /* same as TK_STRING, out2-prerelease */
     if( rc==SQLITE_TOOBIG ) goto too_big;
     if( SQLITE_OK!=sqlite3VdbeChangeEncoding(pOut, encoding) ) goto no_mem;
     assert( pOut->zMalloc==pOut->z );
-    assert( pOut->flags & MEM_Dyn );
+    assert( VdbeMemDynamic(pOut)==0 );
     pOut->zMalloc = 0;
     pOut->flags |= MEM_Static;
-    pOut->flags &= ~MEM_Dyn;
     if( pOp->p4type==P4_DYNAMIC ){
       sqlite3DbFree(db, pOp->p4.z);
     }
@@ -66260,6 +68496,7 @@ case OP_String8: {         /* same as TK_STRING, out2-prerelease */
 }
   
 /* Opcode: String P1 P2 * P4 *
+** Synopsis: r[P2]='P4' (len=P1)
 **
 ** The string value P4 of length P1 (bytes) is stored in register P2.
 */
@@ -66274,6 +68511,7 @@ case OP_String: {          /* out2-prerelease */
 }
 
 /* Opcode: Null P1 P2 P3 * *
+** Synopsis:  r[P2..P3]=NULL
 **
 ** Write a NULL into registers P2.  If P3 greater than P2, then also write
 ** NULL into register P3 and every register in between P2 and P3.  If P3
@@ -66285,25 +68523,38 @@ case OP_String: {          /* out2-prerelease */
 ** OP_Ne or OP_Eq.
 */
 case OP_Null: {           /* out2-prerelease */
-#if 0  /* local variables moved into u.ab */
   int cnt;
   u16 nullFlag;
-#endif /* local variables moved into u.ab */
-  u.ab.cnt = pOp->p3-pOp->p2;
-  assert( pOp->p3<=p->nMem );
-  pOut->flags = u.ab.nullFlag = pOp->p1 ? (MEM_Null|MEM_Cleared) : MEM_Null;
-  while( u.ab.cnt>0 ){
+  cnt = pOp->p3-pOp->p2;
+  assert( pOp->p3<=(p->nMem-p->nCursor) );
+  pOut->flags = nullFlag = pOp->p1 ? (MEM_Null|MEM_Cleared) : MEM_Null;
+  while( cnt>0 ){
     pOut++;
     memAboutToChange(p, pOut);
     VdbeMemRelease(pOut);
-    pOut->flags = u.ab.nullFlag;
-    u.ab.cnt--;
+    pOut->flags = nullFlag;
+    cnt--;
   }
   break;
 }
 
+/* Opcode: SoftNull P1 * * * *
+** Synopsis:  r[P1]=NULL
+**
+** Set register P1 to have the value NULL as seen by the OP_MakeRecord
+** instruction, but do not free any string or blob memory associated with
+** the register, so that if the value was a string or blob that was
+** previously copied using OP_SCopy, the copies will continue to be valid.
+*/
+case OP_SoftNull: {
+  assert( pOp->p1>0 && pOp->p1<=(p->nMem-p->nCursor) );
+  pOut = &aMem[pOp->p1];
+  pOut->flags = (pOut->flags|MEM_Null)&~MEM_Undefined;
+  break;
+}
 
-/* Opcode: Blob P1 P2 * P4
+/* Opcode: Blob P1 P2 * P4 *
+** Synopsis: r[P2]=P4 (len=P1)
 **
 ** P4 points to a blob of data P1 bytes long.  Store this
 ** blob in register P2.
@@ -66317,73 +68568,75 @@ case OP_Blob: {                /* out2-prerelease */
 }
 
 /* Opcode: Variable P1 P2 * P4 *
+** Synopsis: r[P2]=parameter(P1,P4)
 **
 ** Transfer the values of bound parameter P1 into register P2
 **
-** If the parameter is named, then its name appears in P4 and P3==1.
+** If the parameter is named, then its name appears in P4.
 ** The P4 value is used by sqlite3_bind_parameter_name().
 */
 case OP_Variable: {            /* out2-prerelease */
-#if 0  /* local variables moved into u.ac */
   Mem *pVar;       /* Value being transferred */
-#endif /* local variables moved into u.ac */
 
   assert( pOp->p1>0 && pOp->p1<=p->nVar );
   assert( pOp->p4.z==0 || pOp->p4.z==p->azVar[pOp->p1-1] );
-  u.ac.pVar = &p->aVar[pOp->p1 - 1];
-  if( sqlite3VdbeMemTooBig(u.ac.pVar) ){
+  pVar = &p->aVar[pOp->p1 - 1];
+  if( sqlite3VdbeMemTooBig(pVar) ){
     goto too_big;
   }
-  sqlite3VdbeMemShallowCopy(pOut, u.ac.pVar, MEM_Static);
+  sqlite3VdbeMemShallowCopy(pOut, pVar, MEM_Static);
   UPDATE_MAX_BLOBSIZE(pOut);
   break;
 }
 
 /* Opcode: Move P1 P2 P3 * *
+** Synopsis:  r[P2@P3]=r[P1@P3]
 **
-** Move the values in register P1..P1+P3 over into
-** registers P2..P2+P3.  Registers P1..P1+P3 are
+** Move the P3 values in register P1..P1+P3-1 over into
+** registers P2..P2+P3-1.  Registers P1..P1+P3-1 are
 ** left holding a NULL.  It is an error for register ranges
-** P1..P1+P3 and P2..P2+P3 to overlap.
+** P1..P1+P3-1 and P2..P2+P3-1 to overlap.  It is an error
+** for P3 to be less than 1.
 */
 case OP_Move: {
-#if 0  /* local variables moved into u.ad */
   char *zMalloc;   /* Holding variable for allocated memory */
   int n;           /* Number of registers left to copy */
   int p1;          /* Register to copy from */
   int p2;          /* Register to copy to */
-#endif /* local variables moved into u.ad */
 
-  u.ad.n = pOp->p3 + 1;
-  u.ad.p1 = pOp->p1;
-  u.ad.p2 = pOp->p2;
-  assert( u.ad.n>0 && u.ad.p1>0 && u.ad.p2>0 );
-  assert( u.ad.p1+u.ad.n<=u.ad.p2 || u.ad.p2+u.ad.n<=u.ad.p1 );
+  n = pOp->p3;
+  p1 = pOp->p1;
+  p2 = pOp->p2;
+  assert( n>0 && p1>0 && p2>0 );
+  assert( p1+n<=p2 || p2+n<=p1 );
 
-  pIn1 = &aMem[u.ad.p1];
-  pOut = &aMem[u.ad.p2];
-  while( u.ad.n-- ){
-    assert( pOut<=&aMem[p->nMem] );
-    assert( pIn1<=&aMem[p->nMem] );
+  pIn1 = &aMem[p1];
+  pOut = &aMem[p2];
+  do{
+    assert( pOut<=&aMem[(p->nMem-p->nCursor)] );
+    assert( pIn1<=&aMem[(p->nMem-p->nCursor)] );
     assert( memIsValid(pIn1) );
     memAboutToChange(p, pOut);
-    u.ad.zMalloc = pOut->zMalloc;
-    pOut->zMalloc = 0;
-    sqlite3VdbeMemMove(pOut, pIn1);
+    VdbeMemRelease(pOut);
+    zMalloc = pOut->zMalloc;
+    memcpy(pOut, pIn1, sizeof(Mem));
 #ifdef SQLITE_DEBUG
-    if( pOut->pScopyFrom>=&aMem[u.ad.p1] && pOut->pScopyFrom<&aMem[u.ad.p1+pOp->p3] ){
-      pOut->pScopyFrom += u.ad.p1 - pOp->p2;
+    if( pOut->pScopyFrom>=&aMem[p1] && pOut->pScopyFrom<&aMem[p1+pOp->p3] ){
+      pOut->pScopyFrom += p1 - pOp->p2;
     }
 #endif
-    pIn1->zMalloc = u.ad.zMalloc;
-    REGISTER_TRACE(u.ad.p2++, pOut);
+    pIn1->flags = MEM_Undefined;
+    pIn1->xDel = 0;
+    pIn1->zMalloc = zMalloc;
+    REGISTER_TRACE(p2++, pOut);
     pIn1++;
     pOut++;
-  }
+  }while( --n );
   break;
 }
 
 /* Opcode: Copy P1 P2 P3 * *
+** Synopsis: r[P2@P3+1]=r[P1@P3+1]
 **
 ** Make a copy of registers P1..P1+P3 into registers P2..P2+P3.
 **
@@ -66391,11 +68644,9 @@ case OP_Move: {
 ** is made of any string or blob constant.  See also OP_SCopy.
 */
 case OP_Copy: {
-#if 0  /* local variables moved into u.ae */
   int n;
-#endif /* local variables moved into u.ae */
 
-  u.ae.n = pOp->p3;
+  n = pOp->p3;
   pIn1 = &aMem[pOp->p1];
   pOut = &aMem[pOp->p2];
   assert( pOut!=pIn1 );
@@ -66405,8 +68656,8 @@ case OP_Copy: {
 #ifdef SQLITE_DEBUG
     pOut->pScopyFrom = 0;
 #endif
-    REGISTER_TRACE(pOp->p2+pOp->p3-u.ae.n, pOut);
-    if( (u.ae.n--)==0 ) break;
+    REGISTER_TRACE(pOp->p2+pOp->p3-n, pOut);
+    if( (n--)==0 ) break;
     pOut++;
     pIn1++;
   }
@@ -66414,6 +68665,7 @@ case OP_Copy: {
 }
 
 /* Opcode: SCopy P1 P2 * * *
+** Synopsis: r[P2]=r[P1]
 **
 ** Make a shallow copy of register P1 into register P2.
 **
@@ -66425,7 +68677,7 @@ case OP_Copy: {
 ** during the lifetime of the copy.  Use OP_Copy to make a complete
 ** copy.
 */
-case OP_SCopy: {            /* in1, out2 */
+case OP_SCopy: {            /* out2 */
   pIn1 = &aMem[pOp->p1];
   pOut = &aMem[pOp->p2];
   assert( pOut!=pIn1 );
@@ -66433,26 +68685,36 @@ case OP_SCopy: {            /* in1, out2 */
 #ifdef SQLITE_DEBUG
   if( pOut->pScopyFrom==0 ) pOut->pScopyFrom = pIn1;
 #endif
-  REGISTER_TRACE(pOp->p2, pOut);
   break;
 }
 
 /* Opcode: ResultRow P1 P2 * * *
+** Synopsis:  output=r[P1@P2]
 **
 ** The registers P1 through P1+P2-1 contain a single row of
 ** results. This opcode causes the sqlite3_step() call to terminate
 ** with an SQLITE_ROW return code and it sets up the sqlite3_stmt
-** structure to provide access to the top P1 values as the result
-** row.
+** structure to provide access to the r(P1)..r(P1+P2-1) values as
+** the result row.
 */
 case OP_ResultRow: {
-#if 0  /* local variables moved into u.af */
   Mem *pMem;
   int i;
-#endif /* local variables moved into u.af */
   assert( p->nResColumn==pOp->p2 );
   assert( pOp->p1>0 );
-  assert( pOp->p1+pOp->p2<=p->nMem+1 );
+  assert( pOp->p1+pOp->p2<=(p->nMem-p->nCursor)+1 );
+
+#ifndef SQLITE_OMIT_PROGRESS_CALLBACK
+  /* Run the progress counter just before returning.
+  */
+  if( db->xProgress!=0
+   && nVmStep>=nProgressLimit
+   && db->xProgress(db->pProgressArg)!=0
+  ){
+    rc = SQLITE_INTERRUPT;
+    goto vdbe_error_halt;
+  }
+#endif
 
   /* If this statement has violated immediate foreign key constraints, do
   ** not return the number of rows modified. And do not RELEASE the statement
@@ -66463,8 +68725,8 @@ case OP_ResultRow: {
     break;
   }
 
-  /* If the SQLITE_CountRows flag is set in sqlite3.flags mask, then
-  ** DML statements invoke this opcode to return the number of rows
+  /* If the SQLITE_CountRows flag is set in sqlite3.flags mask, then 
+  ** DML statements invoke this opcode to return the number of rows 
   ** modified to the user. This is the only way that a VM that
   ** opens a statement transaction may invoke this opcode.
   **
@@ -66491,15 +68753,14 @@ case OP_ResultRow: {
   ** and have an assigned type.  The results are de-ephemeralized as
   ** a side effect.
   */
-  u.af.pMem = p->pResultSet = &aMem[pOp->p1];
-  for(u.af.i=0; u.af.i<pOp->p2; u.af.i++){
-    assert( memIsValid(&u.af.pMem[u.af.i]) );
-    Deephemeralize(&u.af.pMem[u.af.i]);
-    assert( (u.af.pMem[u.af.i].flags & MEM_Ephem)==0
-            || (u.af.pMem[u.af.i].flags & (MEM_Str|MEM_Blob))==0 );
-    sqlite3VdbeMemNulTerminate(&u.af.pMem[u.af.i]);
-    sqlite3VdbeMemStoreType(&u.af.pMem[u.af.i]);
-    REGISTER_TRACE(pOp->p1+u.af.i, &u.af.pMem[u.af.i]);
+  pMem = p->pResultSet = &aMem[pOp->p1];
+  for(i=0; i<pOp->p2; i++){
+    assert( memIsValid(&pMem[i]) );
+    Deephemeralize(&pMem[i]);
+    assert( (pMem[i].flags & MEM_Ephem)==0
+            || (pMem[i].flags & (MEM_Str|MEM_Blob))==0 );
+    sqlite3VdbeMemNulTerminate(&pMem[i]);
+    REGISTER_TRACE(pOp->p1+i, &pMem[i]);
   }
   if( db->mallocFailed ) goto no_mem;
 
@@ -66511,6 +68772,7 @@ case OP_ResultRow: {
 }
 
 /* Opcode: Concat P1 P2 P3 * *
+** Synopsis: r[P3]=r[P2]+r[P1]
 **
 ** Add the text in register P1 onto the end of the text in
 ** register P2 and store the result in register P3.
@@ -66523,9 +68785,7 @@ case OP_ResultRow: {
 ** to avoid a memcpy().
 */
 case OP_Concat: {           /* same as TK_CONCAT, in1, in2, out3 */
-#if 0  /* local variables moved into u.ag */
   i64 nByte;
-#endif /* local variables moved into u.ag */
 
   pIn1 = &aMem[pOp->p1];
   pIn2 = &aMem[pOp->p2];
@@ -66538,34 +68798,36 @@ case OP_Concat: {           /* same as TK_CONCAT, in1, in2, out3 */
   if( ExpandBlob(pIn1) || ExpandBlob(pIn2) ) goto no_mem;
   Stringify(pIn1, encoding);
   Stringify(pIn2, encoding);
-  u.ag.nByte = pIn1->n + pIn2->n;
-  if( u.ag.nByte>db->aLimit[SQLITE_LIMIT_LENGTH] ){
+  nByte = pIn1->n + pIn2->n;
+  if( nByte>db->aLimit[SQLITE_LIMIT_LENGTH] ){
     goto too_big;
   }
-  MemSetTypeFlag(pOut, MEM_Str);
-  if( sqlite3VdbeMemGrow(pOut, (int)u.ag.nByte+2, pOut==pIn2) ){
+  if( sqlite3VdbeMemGrow(pOut, (int)nByte+2, pOut==pIn2) ){
     goto no_mem;
   }
+  MemSetTypeFlag(pOut, MEM_Str);
   if( pOut!=pIn2 ){
     memcpy(pOut->z, pIn2->z, pIn2->n);
   }
   memcpy(&pOut->z[pIn2->n], pIn1->z, pIn1->n);
-  pOut->z[u.ag.nByte] = 0;
-  pOut->z[u.ag.nByte+1] = 0;
+  pOut->z[nByte]=0;
+  pOut->z[nByte+1] = 0;
   pOut->flags |= MEM_Term;
-  pOut->n = (int)u.ag.nByte;
+  pOut->n = (int)nByte;
   pOut->enc = encoding;
   UPDATE_MAX_BLOBSIZE(pOut);
   break;
 }
 
 /* Opcode: Add P1 P2 P3 * *
+** Synopsis:  r[P3]=r[P1]+r[P2]
 **
 ** Add the value in register P1 to the value in register P2
 ** and store the result in register P3.
 ** If either input is NULL, the result is NULL.
 */
 /* Opcode: Multiply P1 P2 P3 * *
+** Synopsis:  r[P3]=r[P1]*r[P2]
 **
 **
 ** Multiply the value in register P1 by the value in register P2
@@ -66573,12 +68835,14 @@ case OP_Concat: {           /* same as TK_CONCAT, in1, in2, out3 */
 ** If either input is NULL, the result is NULL.
 */
 /* Opcode: Subtract P1 P2 P3 * *
+** Synopsis:  r[P3]=r[P2]-r[P1]
 **
 ** Subtract the value in register P1 from the value in register P2
 ** and store the result in register P3.
 ** If either input is NULL, the result is NULL.
 */
 /* Opcode: Divide P1 P2 P3 * *
+** Synopsis:  r[P3]=r[P2]/r[P1]
 **
 ** Divide the value in register P1 by the value in register P2
 ** and store the result in register P3 (P3=P2/P1). If the value in 
@@ -66586,10 +68850,11 @@ case OP_Concat: {           /* same as TK_CONCAT, in1, in2, out3 */
 ** NULL, the result is NULL.
 */
 /* Opcode: Remainder P1 P2 P3 * *
+** Synopsis:  r[P3]=r[P2]%r[P1]
 **
-** Compute the remainder after integer division of the value in
-** register P1 by the value in register P2 and store the result in P3. 
-** If the value in register P2 is zero the result is NULL.
+** Compute the remainder after integer register P2 is divided by 
+** register P1 and store the result in register P3. 
+** If the value in register P1 is zero the result is NULL.
 ** If either operand is NULL, the result is NULL.
 */
 case OP_Add:                   /* same as TK_PLUS, in1, in2, out3 */
@@ -66597,79 +68862,79 @@ case OP_Subtract:              /* same as TK_MINUS, in1, in2, out3 */
 case OP_Multiply:              /* same as TK_STAR, in1, in2, out3 */
 case OP_Divide:                /* same as TK_SLASH, in1, in2, out3 */
 case OP_Remainder: {           /* same as TK_REM, in1, in2, out3 */
-#if 0  /* local variables moved into u.ah */
   char bIntint;   /* Started out as two integer operands */
-  int flags;      /* Combined MEM_* flags from both inputs */
+  u16 flags;      /* Combined MEM_* flags from both inputs */
+  u16 type1;      /* Numeric type of left operand */
+  u16 type2;      /* Numeric type of right operand */
   i64 iA;         /* Integer value of left operand */
   i64 iB;         /* Integer value of right operand */
   double rA;      /* Real value of left operand */
   double rB;      /* Real value of right operand */
-#endif /* local variables moved into u.ah */
 
   pIn1 = &aMem[pOp->p1];
-  applyNumericAffinity(pIn1);
+  type1 = numericType(pIn1);
   pIn2 = &aMem[pOp->p2];
-  applyNumericAffinity(pIn2);
+  type2 = numericType(pIn2);
   pOut = &aMem[pOp->p3];
-  u.ah.flags = pIn1->flags | pIn2->flags;
-  if( (u.ah.flags & MEM_Null)!=0 ) goto arithmetic_result_is_null;
-  if( (pIn1->flags & pIn2->flags & MEM_Int)==MEM_Int ){
-    u.ah.iA = pIn1->u.i;
-    u.ah.iB = pIn2->u.i;
-    u.ah.bIntint = 1;
+  flags = pIn1->flags | pIn2->flags;
+  if( (flags & MEM_Null)!=0 ) goto arithmetic_result_is_null;
+  if( (type1 & type2 & MEM_Int)!=0 ){
+    iA = pIn1->u.i;
+    iB = pIn2->u.i;
+    bIntint = 1;
     switch( pOp->opcode ){
-      case OP_Add:       if( sqlite3AddInt64(&u.ah.iB,u.ah.iA) ) goto fp_math;  break;
-      case OP_Subtract:  if( sqlite3SubInt64(&u.ah.iB,u.ah.iA) ) goto fp_math;  break;
-      case OP_Multiply:  if( sqlite3MulInt64(&u.ah.iB,u.ah.iA) ) goto fp_math;  break;
+      case OP_Add:       if( sqlite3AddInt64(&iB,iA) ) goto fp_math;  break;
+      case OP_Subtract:  if( sqlite3SubInt64(&iB,iA) ) goto fp_math;  break;
+      case OP_Multiply:  if( sqlite3MulInt64(&iB,iA) ) goto fp_math;  break;
       case OP_Divide: {
-        if( u.ah.iA==0 ) goto arithmetic_result_is_null;
-        if( u.ah.iA==-1 && u.ah.iB==SMALLEST_INT64 ) goto fp_math;
-        u.ah.iB /= u.ah.iA;
+        if( iA==0 ) goto arithmetic_result_is_null;
+        if( iA==-1 && iB==SMALLEST_INT64 ) goto fp_math;
+        iB /= iA;
         break;
       }
       default: {
-        if( u.ah.iA==0 ) goto arithmetic_result_is_null;
-        if( u.ah.iA==-1 ) u.ah.iA = 1;
-        u.ah.iB %= u.ah.iA;
+        if( iA==0 ) goto arithmetic_result_is_null;
+        if( iA==-1 ) iA = 1;
+        iB %= iA;
         break;
       }
     }
-    pOut->u.i = u.ah.iB;
+    pOut->u.i = iB;
     MemSetTypeFlag(pOut, MEM_Int);
   }else{
-    u.ah.bIntint = 0;
+    bIntint = 0;
 fp_math:
-    u.ah.rA = sqlite3VdbeRealValue(pIn1);
-    u.ah.rB = sqlite3VdbeRealValue(pIn2);
+    rA = sqlite3VdbeRealValue(pIn1);
+    rB = sqlite3VdbeRealValue(pIn2);
     switch( pOp->opcode ){
-      case OP_Add:         u.ah.rB += u.ah.rA;       break;
-      case OP_Subtract:    u.ah.rB -= u.ah.rA;       break;
-      case OP_Multiply:    u.ah.rB *= u.ah.rA;       break;
+      case OP_Add:         rB += rA;       break;
+      case OP_Subtract:    rB -= rA;       break;
+      case OP_Multiply:    rB *= rA;       break;
       case OP_Divide: {
         /* (double)0 In case of SQLITE_OMIT_FLOATING_POINT... */
-        if( u.ah.rA==(double)0 ) goto arithmetic_result_is_null;
-        u.ah.rB /= u.ah.rA;
+        if( rA==(double)0 ) goto arithmetic_result_is_null;
+        rB /= rA;
         break;
       }
       default: {
-        u.ah.iA = (i64)u.ah.rA;
-        u.ah.iB = (i64)u.ah.rB;
-        if( u.ah.iA==0 ) goto arithmetic_result_is_null;
-        if( u.ah.iA==-1 ) u.ah.iA = 1;
-        u.ah.rB = (double)(u.ah.iB % u.ah.iA);
+        iA = (i64)rA;
+        iB = (i64)rB;
+        if( iA==0 ) goto arithmetic_result_is_null;
+        if( iA==-1 ) iA = 1;
+        rB = (double)(iB % iA);
         break;
       }
     }
 #ifdef SQLITE_OMIT_FLOATING_POINT
-    pOut->u.i = u.ah.rB;
+    pOut->u.i = rB;
     MemSetTypeFlag(pOut, MEM_Int);
 #else
-    if( sqlite3IsNaN(u.ah.rB) ){
+    if( sqlite3IsNaN(rB) ){
       goto arithmetic_result_is_null;
     }
-    pOut->r = u.ah.rB;
+    pOut->r = rB;
     MemSetTypeFlag(pOut, MEM_Real);
-    if( (u.ah.flags & MEM_Real)==0 && !u.ah.bIntint ){
+    if( ((type1|type2)&MEM_Real)==0 && !bIntint ){
       sqlite3VdbeIntegerAffinity(pOut);
     }
 #endif
@@ -66705,6 +68970,7 @@ case OP_CollSeq: {
 }
 
 /* Opcode: Function P1 P2 P3 P4 P5
+** Synopsis: r[P3]=func(r[P2@P5])
 **
 ** Invoke a user function (P4 is a pointer to a Function structure that
 ** defines the function) with P5 arguments taken from register P2 and
@@ -66721,92 +68987,78 @@ case OP_CollSeq: {
 ** See also: AggStep and AggFinal
 */
 case OP_Function: {
-#if 0  /* local variables moved into u.ai */
   int i;
   Mem *pArg;
   sqlite3_context ctx;
   sqlite3_value **apVal;
   int n;
-#endif /* local variables moved into u.ai */
 
-  u.ai.n = pOp->p5;
-  u.ai.apVal = p->apArg;
-  assert( u.ai.apVal || u.ai.n==0 );
-  assert( pOp->p3>0 && pOp->p3<=p->nMem );
+  n = pOp->p5;
+  apVal = p->apArg;
+  assert( apVal || n==0 );
+  assert( pOp->p3>0 && pOp->p3<=(p->nMem-p->nCursor) );
   pOut = &aMem[pOp->p3];
   memAboutToChange(p, pOut);
 
-  assert( u.ai.n==0 || (pOp->p2>0 && pOp->p2+u.ai.n<=p->nMem+1) );
-  assert( pOp->p3<pOp->p2 || pOp->p3>=pOp->p2+u.ai.n );
-  u.ai.pArg = &aMem[pOp->p2];
-  for(u.ai.i=0; u.ai.i<u.ai.n; u.ai.i++, u.ai.pArg++){
-    assert( memIsValid(u.ai.pArg) );
-    u.ai.apVal[u.ai.i] = u.ai.pArg;
-    Deephemeralize(u.ai.pArg);
-    sqlite3VdbeMemStoreType(u.ai.pArg);
-    REGISTER_TRACE(pOp->p2+u.ai.i, u.ai.pArg);
+  assert( n==0 || (pOp->p2>0 && pOp->p2+n<=(p->nMem-p->nCursor)+1) );
+  assert( pOp->p3<pOp->p2 || pOp->p3>=pOp->p2+n );
+  pArg = &aMem[pOp->p2];
+  for(i=0; i<n; i++, pArg++){
+    assert( memIsValid(pArg) );
+    apVal[i] = pArg;
+    Deephemeralize(pArg);
+    REGISTER_TRACE(pOp->p2+i, pArg);
   }
 
-  assert( pOp->p4type==P4_FUNCDEF || pOp->p4type==P4_VDBEFUNC );
-  if( pOp->p4type==P4_FUNCDEF ){
-    u.ai.ctx.pFunc = pOp->p4.pFunc;
-    u.ai.ctx.pVdbeFunc = 0;
-  }else{
-    u.ai.ctx.pVdbeFunc = (VdbeFunc*)pOp->p4.pVdbeFunc;
-    u.ai.ctx.pFunc = u.ai.ctx.pVdbeFunc->pFunc;
-  }
-
-  u.ai.ctx.s.flags = MEM_Null;
-  u.ai.ctx.s.db = db;
-  u.ai.ctx.s.xDel = 0;
-  u.ai.ctx.s.zMalloc = 0;
+  assert( pOp->p4type==P4_FUNCDEF );
+  ctx.pFunc = pOp->p4.pFunc;
+  ctx.iOp = pc;
+  ctx.pVdbe = p;
 
   /* The output cell may already have a buffer allocated. Move
-  ** the pointer to u.ai.ctx.s so in case the user-function can use
+  ** the pointer to ctx.s so in case the user-function can use
   ** the already allocated buffer instead of allocating a new one.
   */
-  sqlite3VdbeMemMove(&u.ai.ctx.s, pOut);
-  MemSetTypeFlag(&u.ai.ctx.s, MEM_Null);
+  memcpy(&ctx.s, pOut, sizeof(Mem));
+  pOut->flags = MEM_Null;
+  pOut->xDel = 0;
+  pOut->zMalloc = 0;
+  MemSetTypeFlag(&ctx.s, MEM_Null);
 
-  u.ai.ctx.isError = 0;
-  if( u.ai.ctx.pFunc->flags & SQLITE_FUNC_NEEDCOLL ){
+  ctx.fErrorOrAux = 0;
+  if( ctx.pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL ){
     assert( pOp>aOp );
     assert( pOp[-1].p4type==P4_COLLSEQ );
     assert( pOp[-1].opcode==OP_CollSeq );
-    u.ai.ctx.pColl = pOp[-1].p4.pColl;
+    ctx.pColl = pOp[-1].p4.pColl;
   }
   db->lastRowid = lastRowid;
-  (*u.ai.ctx.pFunc->xFunc)(&u.ai.ctx, u.ai.n, u.ai.apVal); /* IMP: R-24505-23230 */
+  (*ctx.pFunc->xFunc)(&ctx, n, apVal); /* IMP: R-24505-23230 */
   lastRowid = db->lastRowid;
 
-  /* If any auxiliary data functions have been called by this user function,
-  ** immediately call the destructor for any non-static values.
-  */
-  if( u.ai.ctx.pVdbeFunc ){
-    sqlite3VdbeDeleteAuxData(u.ai.ctx.pVdbeFunc, pOp->p1);
-    pOp->p4.pVdbeFunc = u.ai.ctx.pVdbeFunc;
-    pOp->p4type = P4_VDBEFUNC;
-  }
-
   if( db->mallocFailed ){
     /* Even though a malloc() has failed, the implementation of the
     ** user function may have called an sqlite3_result_XXX() function
     ** to return a value. The following call releases any resources
     ** associated with such a value.
     */
-    sqlite3VdbeMemRelease(&u.ai.ctx.s);
+    sqlite3VdbeMemRelease(&ctx.s);
     goto no_mem;
   }
 
   /* If the function returned an error, throw an exception */
-  if( u.ai.ctx.isError ){
-    sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3_value_text(&u.ai.ctx.s));
-    rc = u.ai.ctx.isError;
+  if( ctx.fErrorOrAux ){
+    if( ctx.isError ){
+      sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3_value_text(&ctx.s));
+      rc = ctx.isError;
+    }
+    sqlite3VdbeDeleteAuxData(p, pc, pOp->p1);
   }
 
   /* Copy the result of the function into register P3 */
-  sqlite3VdbeChangeEncoding(&u.ai.ctx.s, encoding);
-  sqlite3VdbeMemMove(pOut, &u.ai.ctx.s);
+  sqlite3VdbeChangeEncoding(&ctx.s, encoding);
+  assert( pOut->flags==MEM_Null );
+  memcpy(pOut, &ctx.s, sizeof(Mem));
   if( sqlite3VdbeMemTooBig(pOut) ){
     goto too_big;
   }
@@ -66825,18 +69077,21 @@ case OP_Function: {
 }
 
 /* Opcode: BitAnd P1 P2 P3 * *
+** Synopsis:  r[P3]=r[P1]&r[P2]
 **
 ** Take the bit-wise AND of the values in register P1 and P2 and
 ** store the result in register P3.
 ** If either input is NULL, the result is NULL.
 */
 /* Opcode: BitOr P1 P2 P3 * *
+** Synopsis:  r[P3]=r[P1]|r[P2]
 **
 ** Take the bit-wise OR of the values in register P1 and P2 and
 ** store the result in register P3.
 ** If either input is NULL, the result is NULL.
 */
 /* Opcode: ShiftLeft P1 P2 P3 * *
+** Synopsis:  r[P3]=r[P2]<<r[P1]
 **
 ** Shift the integer value in register P2 to the left by the
 ** number of bits specified by the integer in register P1.
@@ -66844,6 +69099,7 @@ case OP_Function: {
 ** If either input is NULL, the result is NULL.
 */
 /* Opcode: ShiftRight P1 P2 P3 * *
+** Synopsis:  r[P3]=r[P2]>>r[P1]
 **
 ** Shift the integer value in register P2 to the right by the
 ** number of bits specified by the integer in register P1.
@@ -66854,12 +69110,10 @@ case OP_BitAnd:                 /* same as TK_BITAND, in1, in2, out3 */
 case OP_BitOr:                  /* same as TK_BITOR, in1, in2, out3 */
 case OP_ShiftLeft:              /* same as TK_LSHIFT, in1, in2, out3 */
 case OP_ShiftRight: {           /* same as TK_RSHIFT, in1, in2, out3 */
-#if 0  /* local variables moved into u.aj */
   i64 iA;
   u64 uA;
   i64 iB;
   u8 op;
-#endif /* local variables moved into u.aj */
 
   pIn1 = &aMem[pOp->p1];
   pIn2 = &aMem[pOp->p2];
@@ -66868,43 +69122,44 @@ case OP_ShiftRight: {           /* same as TK_RSHIFT, in1, in2, out3 */
     sqlite3VdbeMemSetNull(pOut);
     break;
   }
-  u.aj.iA = sqlite3VdbeIntValue(pIn2);
-  u.aj.iB = sqlite3VdbeIntValue(pIn1);
-  u.aj.op = pOp->opcode;
-  if( u.aj.op==OP_BitAnd ){
-    u.aj.iA &= u.aj.iB;
-  }else if( u.aj.op==OP_BitOr ){
-    u.aj.iA |= u.aj.iB;
-  }else if( u.aj.iB!=0 ){
-    assert( u.aj.op==OP_ShiftRight || u.aj.op==OP_ShiftLeft );
+  iA = sqlite3VdbeIntValue(pIn2);
+  iB = sqlite3VdbeIntValue(pIn1);
+  op = pOp->opcode;
+  if( op==OP_BitAnd ){
+    iA &= iB;
+  }else if( op==OP_BitOr ){
+    iA |= iB;
+  }else if( iB!=0 ){
+    assert( op==OP_ShiftRight || op==OP_ShiftLeft );
 
     /* If shifting by a negative amount, shift in the other direction */
-    if( u.aj.iB<0 ){
+    if( iB<0 ){
       assert( OP_ShiftRight==OP_ShiftLeft+1 );
-      u.aj.op = 2*OP_ShiftLeft + 1 - u.aj.op;
-      u.aj.iB = u.aj.iB>(-64) ? -u.aj.iB : 64;
+      op = 2*OP_ShiftLeft + 1 - op;
+      iB = iB>(-64) ? -iB : 64;
     }
 
-    if( u.aj.iB>=64 ){
-      u.aj.iA = (u.aj.iA>=0 || u.aj.op==OP_ShiftLeft) ? 0 : -1;
+    if( iB>=64 ){
+      iA = (iA>=0 || op==OP_ShiftLeft) ? 0 : -1;
     }else{
-      memcpy(&u.aj.uA, &u.aj.iA, sizeof(u.aj.uA));
-      if( u.aj.op==OP_ShiftLeft ){
-        u.aj.uA <<= u.aj.iB;
+      memcpy(&uA, &iA, sizeof(uA));
+      if( op==OP_ShiftLeft ){
+        uA <<= iB;
       }else{
-        u.aj.uA >>= u.aj.iB;
+        uA >>= iB;
         /* Sign-extend on a right shift of a negative number */
-        if( u.aj.iA<0 ) u.aj.uA |= ((((u64)0xffffffff)<<32)|0xffffffff) << (64-u.aj.iB);
+        if( iA<0 ) uA |= ((((u64)0xffffffff)<<32)|0xffffffff) << (64-iB);
       }
-      memcpy(&u.aj.iA, &u.aj.uA, sizeof(u.aj.iA));
+      memcpy(&iA, &uA, sizeof(iA));
     }
   }
-  pOut->u.i = u.aj.iA;
+  pOut->u.i = iA;
   MemSetTypeFlag(pOut, MEM_Int);
   break;
 }
 
 /* Opcode: AddImm  P1 P2 * * *
+** Synopsis:  r[P1]=r[P1]+P2
 ** 
 ** Add the constant P2 to the value in register P1.
 ** The result is always an integer.
@@ -66928,17 +69183,20 @@ case OP_AddImm: {            /* in1 */
 */
 case OP_MustBeInt: {            /* jump, in1 */
   pIn1 = &aMem[pOp->p1];
-  applyAffinity(pIn1, SQLITE_AFF_NUMERIC, encoding);
   if( (pIn1->flags & MEM_Int)==0 ){
-    if( pOp->p2==0 ){
-      rc = SQLITE_MISMATCH;
-      goto abort_due_to_error;
-    }else{
-      pc = pOp->p2 - 1;
+    applyAffinity(pIn1, SQLITE_AFF_NUMERIC, encoding);
+    VdbeBranchTaken((pIn1->flags&MEM_Int)==0, 2);
+    if( (pIn1->flags & MEM_Int)==0 ){
+      if( pOp->p2==0 ){
+        rc = SQLITE_MISMATCH;
+        goto abort_due_to_error;
+      }else{
+        pc = pOp->p2 - 1;
+        break;
+      }
     }
-  }else{
-    MemSetTypeFlag(pIn1, MEM_Int);
   }
+  MemSetTypeFlag(pIn1, MEM_Int);
   break;
 }
 
@@ -66966,7 +69224,7 @@ case OP_RealAffinity: {                  /* in1 */
 **
 ** Force the value in register P1 to be text.
 ** If the value is numeric, convert it to a string using the
-** equivalent of printf().  Blob values are unchanged and
+** equivalent of sprintf().  Blob values are unchanged and
 ** are afterwards simply interpreted as text.
 **
 ** A NULL value is not changed by this routine.  It remains NULL.
@@ -67063,6 +69321,7 @@ case OP_ToReal: {                  /* same as TK_TO_REAL, in1 */
 #endif /* !defined(SQLITE_OMIT_CAST) && !defined(SQLITE_OMIT_FLOATING_POINT) */
 
 /* Opcode: Lt P1 P2 P3 P4 P5
+** Synopsis: if r[P1]<r[P3] goto P2
 **
 ** Compare the values in register P1 and P3.  If reg(P3)<reg(P1) then
 ** jump to address P2.  
@@ -67097,6 +69356,7 @@ case OP_ToReal: {                  /* same as TK_TO_REAL, in1 */
 ** bit set.
 */
 /* Opcode: Ne P1 P2 P3 P4 P5
+** Synopsis: if r[P1]!=r[P3] goto P2
 **
 ** This works just like the Lt opcode except that the jump is taken if
 ** the operands in registers P1 and P3 are not equal.  See the Lt opcode for
@@ -67109,6 +69369,7 @@ case OP_ToReal: {                  /* same as TK_TO_REAL, in1 */
 ** the SQLITE_NULLEQ flag were omitted from P5.
 */
 /* Opcode: Eq P1 P2 P3 P4 P5
+** Synopsis: if r[P1]==r[P3] goto P2
 **
 ** This works just like the Lt opcode except that the jump is taken if
 ** the operands in registers P1 and P3 are equal.
@@ -67121,18 +69382,21 @@ case OP_ToReal: {                  /* same as TK_TO_REAL, in1 */
 ** the SQLITE_NULLEQ flag were omitted from P5.
 */
 /* Opcode: Le P1 P2 P3 P4 P5
+** Synopsis: if r[P1]<=r[P3] goto P2
 **
 ** This works just like the Lt opcode except that the jump is taken if
 ** the content of register P3 is less than or equal to the content of
 ** register P1.  See the Lt opcode for additional information.
 */
 /* Opcode: Gt P1 P2 P3 P4 P5
+** Synopsis: if r[P1]>r[P3] goto P2
 **
 ** This works just like the Lt opcode except that the jump is taken if
 ** the content of register P3 is greater than the content of
 ** register P1.  See the Lt opcode for additional information.
 */
 /* Opcode: Ge P1 P2 P3 P4 P5
+** Synopsis: if r[P1]>=r[P3] goto P2
 **
 ** This works just like the Lt opcode except that the jump is taken if
 ** the content of register P3 is greater than or equal to the content of
@@ -67144,18 +69408,16 @@ case OP_Lt:               /* same as TK_LT, jump, in1, in3 */
 case OP_Le:               /* same as TK_LE, jump, in1, in3 */
 case OP_Gt:               /* same as TK_GT, jump, in1, in3 */
 case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
-#if 0  /* local variables moved into u.ak */
   int res;            /* Result of the comparison of pIn1 against pIn3 */
   char affinity;      /* Affinity to use for comparison */
   u16 flags1;         /* Copy of initial value of pIn1->flags */
   u16 flags3;         /* Copy of initial value of pIn3->flags */
-#endif /* local variables moved into u.ak */
 
   pIn1 = &aMem[pOp->p1];
   pIn3 = &aMem[pOp->p3];
-  u.ak.flags1 = pIn1->flags;
-  u.ak.flags3 = pIn3->flags;
-  if( (u.ak.flags1 | u.ak.flags3)&MEM_Null ){
+  flags1 = pIn1->flags;
+  flags3 = pIn3->flags;
+  if( (flags1 | flags3)&MEM_Null ){
     /* One or both operands are NULL */
     if( pOp->p5 & SQLITE_NULLEQ ){
       /* If SQLITE_NULLEQ is set (which will only happen if the operator is
@@ -67163,14 +69425,15 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
       ** or not both operands are null.
       */
       assert( pOp->opcode==OP_Eq || pOp->opcode==OP_Ne );
-      assert( (u.ak.flags1 & MEM_Cleared)==0 );
-      if( (u.ak.flags1&MEM_Null)!=0
-       && (u.ak.flags3&MEM_Null)!=0
-       && (u.ak.flags3&MEM_Cleared)==0
+      assert( (flags1 & MEM_Cleared)==0 );
+      assert( (pOp->p5 & SQLITE_JUMPIFNULL)==0 );
+      if( (flags1&MEM_Null)!=0
+       && (flags3&MEM_Null)!=0
+       && (flags3&MEM_Cleared)==0
       ){
-        u.ak.res = 0;  /* Results are equal */
+        res = 0;  /* Results are equal */
       }else{
-        u.ak.res = 1;  /* Results are not equal */
+        res = 1;  /* Results are not equal */
       }
     }else{
       /* SQLITE_NULLEQ is clear and at least one operand is NULL,
@@ -67181,47 +69444,52 @@ case OP_Ge: {             /* same as TK_GE, jump, in1, in3 */
         pOut = &aMem[pOp->p2];
         MemSetTypeFlag(pOut, MEM_Null);
         REGISTER_TRACE(pOp->p2, pOut);
-      }else if( pOp->p5 & SQLITE_JUMPIFNULL ){
-        pc = pOp->p2-1;
+      }else{
+        VdbeBranchTaken(2,3);
+        if( pOp->p5 & SQLITE_JUMPIFNULL ){
+          pc = pOp->p2-1;
+        }
       }
       break;
     }
   }else{
     /* Neither operand is NULL.  Do a comparison. */
-    u.ak.affinity = pOp->p5 & SQLITE_AFF_MASK;
-    if( u.ak.affinity ){
-      applyAffinity(pIn1, u.ak.affinity, encoding);
-      applyAffinity(pIn3, u.ak.affinity, encoding);
+    affinity = pOp->p5 & SQLITE_AFF_MASK;
+    if( affinity ){
+      applyAffinity(pIn1, affinity, encoding);
+      applyAffinity(pIn3, affinity, encoding);
       if( db->mallocFailed ) goto no_mem;
     }
 
     assert( pOp->p4type==P4_COLLSEQ || pOp->p4.pColl==0 );
     ExpandBlob(pIn1);
     ExpandBlob(pIn3);
-    u.ak.res = sqlite3MemCompare(pIn3, pIn1, pOp->p4.pColl);
+    res = sqlite3MemCompare(pIn3, pIn1, pOp->p4.pColl);
   }
   switch( pOp->opcode ){
-    case OP_Eq:    u.ak.res = u.ak.res==0;     break;
-    case OP_Ne:    u.ak.res = u.ak.res!=0;     break;
-    case OP_Lt:    u.ak.res = u.ak.res<0;      break;
-    case OP_Le:    u.ak.res = u.ak.res<=0;     break;
-    case OP_Gt:    u.ak.res = u.ak.res>0;      break;
-    default:       u.ak.res = u.ak.res>=0;     break;
+    case OP_Eq:    res = res==0;     break;
+    case OP_Ne:    res = res!=0;     break;
+    case OP_Lt:    res = res<0;      break;
+    case OP_Le:    res = res<=0;     break;
+    case OP_Gt:    res = res>0;      break;
+    default:       res = res>=0;     break;
   }
 
   if( pOp->p5 & SQLITE_STOREP2 ){
     pOut = &aMem[pOp->p2];
     memAboutToChange(p, pOut);
     MemSetTypeFlag(pOut, MEM_Int);
-    pOut->u.i = u.ak.res;
+    pOut->u.i = res;
     REGISTER_TRACE(pOp->p2, pOut);
-  }else if( u.ak.res ){
-    pc = pOp->p2-1;
+  }else{
+    VdbeBranchTaken(res!=0, (pOp->p5 & SQLITE_NULLEQ)?2:3);
+    if( res ){
+      pc = pOp->p2-1;
+    }
   }
-
   /* Undo any changes made by applyAffinity() to the input registers. */
-  pIn1->flags = (pIn1->flags&~MEM_TypeMask) | (u.ak.flags1&MEM_TypeMask);
-  pIn3->flags = (pIn3->flags&~MEM_TypeMask) | (u.ak.flags3&MEM_TypeMask);
+  pIn1->flags = (pIn1->flags&~MEM_TypeMask) | (flags1&MEM_TypeMask);
+  pIn3->flags = (pIn3->flags&~MEM_TypeMask) | (flags3&MEM_TypeMask);
   break;
 }
 
@@ -67242,6 +69510,7 @@ case OP_Permutation: {
 }
 
 /* Opcode: Compare P1 P2 P3 P4 P5
+** Synopsis: r[P1@P3] <-> r[P2@P3]
 **
 ** Compare two vectors of registers in reg(P1)..reg(P1+P3-1) (call this
 ** vector "A") and in reg(P2)..reg(P2+P3-1) ("B").  Save the result of
@@ -67261,7 +69530,6 @@ case OP_Permutation: {
 ** and strings are less than blobs.
 */
 case OP_Compare: {
-#if 0  /* local variables moved into u.al */
   int n;
   int i;
   int p1;
@@ -67270,38 +69538,37 @@ case OP_Compare: {
   int idx;
   CollSeq *pColl;    /* Collating sequence to use on this term */
   int bRev;          /* True for DESCENDING sort order */
-#endif /* local variables moved into u.al */
 
   if( (pOp->p5 & OPFLAG_PERMUTE)==0 ) aPermute = 0;
-  u.al.n = pOp->p3;
-  u.al.pKeyInfo = pOp->p4.pKeyInfo;
-  assert( u.al.n>0 );
-  assert( u.al.pKeyInfo!=0 );
-  u.al.p1 = pOp->p1;
-  u.al.p2 = pOp->p2;
+  n = pOp->p3;
+  pKeyInfo = pOp->p4.pKeyInfo;
+  assert( n>0 );
+  assert( pKeyInfo!=0 );
+  p1 = pOp->p1;
+  p2 = pOp->p2;
 #if SQLITE_DEBUG
   if( aPermute ){
     int k, mx = 0;
-    for(k=0; k<u.al.n; k++) if( aPermute[k]>mx ) mx = aPermute[k];
-    assert( u.al.p1>0 && u.al.p1+mx<=p->nMem+1 );
-    assert( u.al.p2>0 && u.al.p2+mx<=p->nMem+1 );
+    for(k=0; k<n; k++) if( aPermute[k]>mx ) mx = aPermute[k];
+    assert( p1>0 && p1+mx<=(p->nMem-p->nCursor)+1 );
+    assert( p2>0 && p2+mx<=(p->nMem-p->nCursor)+1 );
   }else{
-    assert( u.al.p1>0 && u.al.p1+u.al.n<=p->nMem+1 );
-    assert( u.al.p2>0 && u.al.p2+u.al.n<=p->nMem+1 );
+    assert( p1>0 && p1+n<=(p->nMem-p->nCursor)+1 );
+    assert( p2>0 && p2+n<=(p->nMem-p->nCursor)+1 );
   }
 #endif /* SQLITE_DEBUG */
-  for(u.al.i=0; u.al.i<u.al.n; u.al.i++){
-    u.al.idx = aPermute ? aPermute[u.al.i] : u.al.i;
-    assert( memIsValid(&aMem[u.al.p1+u.al.idx]) );
-    assert( memIsValid(&aMem[u.al.p2+u.al.idx]) );
-    REGISTER_TRACE(u.al.p1+u.al.idx, &aMem[u.al.p1+u.al.idx]);
-    REGISTER_TRACE(u.al.p2+u.al.idx, &aMem[u.al.p2+u.al.idx]);
-    assert( u.al.i<u.al.pKeyInfo->nField );
-    u.al.pColl = u.al.pKeyInfo->aColl[u.al.i];
-    u.al.bRev = u.al.pKeyInfo->aSortOrder[u.al.i];
-    iCompare = sqlite3MemCompare(&aMem[u.al.p1+u.al.idx], &aMem[u.al.p2+u.al.idx], u.al.pColl);
+  for(i=0; i<n; i++){
+    idx = aPermute ? aPermute[i] : i;
+    assert( memIsValid(&aMem[p1+idx]) );
+    assert( memIsValid(&aMem[p2+idx]) );
+    REGISTER_TRACE(p1+idx, &aMem[p1+idx]);
+    REGISTER_TRACE(p2+idx, &aMem[p2+idx]);
+    assert( i<pKeyInfo->nField );
+    pColl = pKeyInfo->aColl[i];
+    bRev = pKeyInfo->aSortOrder[i];
+    iCompare = sqlite3MemCompare(&aMem[p1+idx], &aMem[p2+idx], pColl);
     if( iCompare ){
-      if( u.al.bRev ) iCompare = -iCompare;
+      if( bRev ) iCompare = -iCompare;
       break;
     }
   }
@@ -67317,16 +69584,17 @@ case OP_Compare: {
 */
 case OP_Jump: {             /* jump */
   if( iCompare<0 ){
-    pc = pOp->p1 - 1;
+    pc = pOp->p1 - 1;  VdbeBranchTaken(0,3);
   }else if( iCompare==0 ){
-    pc = pOp->p2 - 1;
+    pc = pOp->p2 - 1;  VdbeBranchTaken(1,3);
   }else{
-    pc = pOp->p3 - 1;
+    pc = pOp->p3 - 1;  VdbeBranchTaken(2,3);
   }
   break;
 }
 
 /* Opcode: And P1 P2 P3 * *
+** Synopsis: r[P3]=(r[P1] && r[P2])
 **
 ** Take the logical AND of the values in registers P1 and P2 and
 ** write the result into register P3.
@@ -67336,6 +69604,7 @@ case OP_Jump: {             /* jump */
 ** a NULL output.
 */
 /* Opcode: Or P1 P2 P3 * *
+** Synopsis: r[P3]=(r[P1] || r[P2])
 **
 ** Take the logical OR of the values in register P1 and P2 and
 ** store the answer in register P3.
@@ -67346,41 +69615,40 @@ case OP_Jump: {             /* jump */
 */
 case OP_And:              /* same as TK_AND, in1, in2, out3 */
 case OP_Or: {             /* same as TK_OR, in1, in2, out3 */
-#if 0  /* local variables moved into u.am */
   int v1;    /* Left operand:  0==FALSE, 1==TRUE, 2==UNKNOWN or NULL */
   int v2;    /* Right operand: 0==FALSE, 1==TRUE, 2==UNKNOWN or NULL */
-#endif /* local variables moved into u.am */
 
   pIn1 = &aMem[pOp->p1];
   if( pIn1->flags & MEM_Null ){
-    u.am.v1 = 2;
+    v1 = 2;
   }else{
-    u.am.v1 = sqlite3VdbeIntValue(pIn1)!=0;
+    v1 = sqlite3VdbeIntValue(pIn1)!=0;
   }
   pIn2 = &aMem[pOp->p2];
   if( pIn2->flags & MEM_Null ){
-    u.am.v2 = 2;
+    v2 = 2;
   }else{
-    u.am.v2 = sqlite3VdbeIntValue(pIn2)!=0;
+    v2 = sqlite3VdbeIntValue(pIn2)!=0;
   }
   if( pOp->opcode==OP_And ){
     static const unsigned char and_logic[] = { 0, 0, 0, 0, 1, 2, 0, 2, 2 };
-    u.am.v1 = and_logic[u.am.v1*3+u.am.v2];
+    v1 = and_logic[v1*3+v2];
   }else{
     static const unsigned char or_logic[] = { 0, 1, 2, 1, 1, 1, 2, 1, 2 };
-    u.am.v1 = or_logic[u.am.v1*3+u.am.v2];
+    v1 = or_logic[v1*3+v2];
   }
   pOut = &aMem[pOp->p3];
-  if( u.am.v1==2 ){
+  if( v1==2 ){
     MemSetTypeFlag(pOut, MEM_Null);
   }else{
-    pOut->u.i = u.am.v1;
+    pOut->u.i = v1;
     MemSetTypeFlag(pOut, MEM_Int);
   }
   break;
 }
 
 /* Opcode: Not P1 P2 * * *
+** Synopsis: r[P2]= !r[P1]
 **
 ** Interpret the value in register P1 as a boolean value.  Store the
 ** boolean complement in register P2.  If the value in register P1 is 
@@ -67398,6 +69666,7 @@ case OP_Not: {                /* same as TK_NOT, in1, out2 */
 }
 
 /* Opcode: BitNot P1 P2 * * *
+** Synopsis: r[P1]= ~r[P1]
 **
 ** Interpret the content of register P1 as an integer.  Store the
 ** ones-complement of the P1 value into register P2.  If P1 holds
@@ -67417,10 +69686,13 @@ case OP_BitNot: {             /* same as TK_BITNOT, in1, out2 */
 /* Opcode: Once P1 P2 * * *
 **
 ** Check if OP_Once flag P1 is set. If so, jump to instruction P2. Otherwise,
-** set the flag and fall through to the next instruction.
+** set the flag and fall through to the next instruction.  In other words,
+** this opcode causes all following opcodes up through P2 (but not including
+** P2) to run just once and to be skipped on subsequent times through the loop.
 */
 case OP_Once: {             /* jump */
   assert( pOp->p1<p->nOnceFlag );
+  VdbeBranchTaken(p->aOnceFlag[pOp->p1]!=0, 2);
   if( p->aOnceFlag[pOp->p1] ){
     pc = pOp->p2-1;
   }else{
@@ -67443,32 +69715,33 @@ case OP_Once: {             /* jump */
 */
 case OP_If:                 /* jump, in1 */
 case OP_IfNot: {            /* jump, in1 */
-#if 0  /* local variables moved into u.an */
   int c;
-#endif /* local variables moved into u.an */
   pIn1 = &aMem[pOp->p1];
   if( pIn1->flags & MEM_Null ){
-    u.an.c = pOp->p3;
+    c = pOp->p3;
   }else{
 #ifdef SQLITE_OMIT_FLOATING_POINT
-    u.an.c = sqlite3VdbeIntValue(pIn1)!=0;
+    c = sqlite3VdbeIntValue(pIn1)!=0;
 #else
-    u.an.c = sqlite3VdbeRealValue(pIn1)!=0.0;
+    c = sqlite3VdbeRealValue(pIn1)!=0.0;
 #endif
-    if( pOp->opcode==OP_IfNot ) u.an.c = !u.an.c;
+    if( pOp->opcode==OP_IfNot ) c = !c;
   }
-  if( u.an.c ){
+  VdbeBranchTaken(c!=0, 2);
+  if( c ){
     pc = pOp->p2-1;
   }
   break;
 }
 
 /* Opcode: IsNull P1 P2 * * *
+** Synopsis:  if r[P1]==NULL goto P2
 **
 ** Jump to P2 if the value in register P1 is NULL.
 */
 case OP_IsNull: {            /* same as TK_ISNULL, jump, in1 */
   pIn1 = &aMem[pOp->p1];
+  VdbeBranchTaken( (pIn1->flags & MEM_Null)!=0, 2);
   if( (pIn1->flags & MEM_Null)!=0 ){
     pc = pOp->p2 - 1;
   }
@@ -67476,11 +69749,13 @@ case OP_IsNull: {            /* same as TK_ISNULL, jump, in1 */
 }
 
 /* Opcode: NotNull P1 P2 * * *
+** Synopsis: if r[P1]!=NULL goto P2
 **
 ** Jump to P2 if the value in register P1 is not NULL.  
 */
 case OP_NotNull: {            /* same as TK_NOTNULL, jump, in1 */
   pIn1 = &aMem[pOp->p1];
+  VdbeBranchTaken( (pIn1->flags & MEM_Null)==0, 2);
   if( (pIn1->flags & MEM_Null)==0 ){
     pc = pOp->p2 - 1;
   }
@@ -67488,6 +69763,7 @@ case OP_NotNull: {            /* same as TK_NOTNULL, jump, in1 */
 }
 
 /* Opcode: Column P1 P2 P3 P4 P5
+** Synopsis:  r[P3]=PX
 **
 ** Interpret the data that cursor P1 points to as a structure built using
 ** the MakeRecord instruction.  (See the MakeRecord opcode for additional
@@ -67512,155 +69788,98 @@ case OP_NotNull: {            /* same as TK_NOTNULL, jump, in1 */
 ** skipped for length() and all content loading can be skipped for typeof().
 */
 case OP_Column: {
-#if 0  /* local variables moved into u.ao */
-  u32 payloadSize;   /* Number of bytes in the record */
   i64 payloadSize64; /* Number of bytes in the record */
-  int p1;            /* P1 value of the opcode */
   int p2;            /* column number to retrieve */
   VdbeCursor *pC;    /* The VDBE cursor */
-  char *zRec;        /* Pointer to complete record-data */
   BtCursor *pCrsr;   /* The BTree cursor */
   u32 *aType;        /* aType[i] holds the numeric type of the i-th column */
   u32 *aOffset;      /* aOffset[i] is offset to start of data for i-th column */
-  int nField;        /* number of fields in the record */
   int len;           /* The length of the serialized data for the column */
   int i;             /* Loop counter */
-  char *zData;       /* Part of the record being decoded */
   Mem *pDest;        /* Where to write the extracted value */
   Mem sMem;          /* For storing the record being decoded */
-  u8 *zIdx;          /* Index into header */
-  u8 *zEndHdr;       /* Pointer to first byte after the header */
+  const u8 *zData;   /* Part of the record being decoded */
+  const u8 *zHdr;    /* Next unparsed byte of the header */
+  const u8 *zEndHdr; /* Pointer to first byte after the header */
   u32 offset;        /* Offset into the data */
   u32 szField;       /* Number of bytes in the content of a field */
-  int szHdr;         /* Size of the header size field at start of record */
-  int avail;         /* Number of bytes of available data */
+  u32 avail;         /* Number of bytes of available data */
   u32 t;             /* A type code from the record header */
   Mem *pReg;         /* PseudoTable input register */
-#endif /* local variables moved into u.ao */
 
-
-  u.ao.p1 = pOp->p1;
-  u.ao.p2 = pOp->p2;
-  u.ao.pC = 0;
-  memset(&u.ao.sMem, 0, sizeof(u.ao.sMem));
-  assert( u.ao.p1<p->nCursor );
-  assert( pOp->p3>0 && pOp->p3<=p->nMem );
-  u.ao.pDest = &aMem[pOp->p3];
-  memAboutToChange(p, u.ao.pDest);
-  u.ao.zRec = 0;
-
-  /* This block sets the variable u.ao.payloadSize to be the total number of
-  ** bytes in the record.
-  **
-  ** u.ao.zRec is set to be the complete text of the record if it is available.
-  ** The complete record text is always available for pseudo-tables
-  ** If the record is stored in a cursor, the complete record text
-  ** might be available in the  u.ao.pC->aRow cache.  Or it might not be.
-  ** If the data is unavailable,  u.ao.zRec is set to NULL.
-  **
-  ** We also compute the number of columns in the record.  For cursors,
-  ** the number of columns is stored in the VdbeCursor.nField element.
-  */
-  u.ao.pC = p->apCsr[u.ao.p1];
-  assert( u.ao.pC!=0 );
+  p2 = pOp->p2;
+  assert( pOp->p3>0 && pOp->p3<=(p->nMem-p->nCursor) );
+  pDest = &aMem[pOp->p3];
+  memAboutToChange(p, pDest);
+  assert( pOp->p1>=0 && pOp->p1<p->nCursor );
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  assert( p2<pC->nField );
+  aType = pC->aType;
+  aOffset = aType + pC->nField;
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-  assert( u.ao.pC->pVtabCursor==0 );
+  assert( pC->pVtabCursor==0 ); /* OP_Column never called on virtual table */
 #endif
-  u.ao.pCrsr = u.ao.pC->pCursor;
-  if( u.ao.pCrsr!=0 ){
-    /* The record is stored in a B-Tree */
-    rc = sqlite3VdbeCursorMoveto(u.ao.pC);
-    if( rc ) goto abort_due_to_error;
-    if( u.ao.pC->nullRow ){
-      u.ao.payloadSize = 0;
-    }else if( u.ao.pC->cacheStatus==p->cacheCtr ){
-      u.ao.payloadSize = u.ao.pC->payloadSize;
-      u.ao.zRec = (char*)u.ao.pC->aRow;
-    }else if( u.ao.pC->isIndex ){
-      assert( sqlite3BtreeCursorIsValid(u.ao.pCrsr) );
-      VVA_ONLY(rc =) sqlite3BtreeKeySize(u.ao.pCrsr, &u.ao.payloadSize64);
-      assert( rc==SQLITE_OK );   /* True because of CursorMoveto() call above */
-      /* sqlite3BtreeParseCellPtr() uses getVarint32() to extract the
-      ** payload size, so it is impossible for u.ao.payloadSize64 to be
-      ** larger than 32 bits. */
-      assert( (u.ao.payloadSize64 & SQLITE_MAX_U32)==(u64)u.ao.payloadSize64 );
-      u.ao.payloadSize = (u32)u.ao.payloadSize64;
-    }else{
-      assert( sqlite3BtreeCursorIsValid(u.ao.pCrsr) );
-      VVA_ONLY(rc =) sqlite3BtreeDataSize(u.ao.pCrsr, &u.ao.payloadSize);
-      assert( rc==SQLITE_OK );   /* DataSize() cannot fail */
-    }
-  }else if( ALWAYS(u.ao.pC->pseudoTableReg>0) ){
-    u.ao.pReg = &aMem[u.ao.pC->pseudoTableReg];
-    if( u.ao.pC->multiPseudo ){
-      sqlite3VdbeMemShallowCopy(u.ao.pDest, u.ao.pReg+u.ao.p2, MEM_Ephem);
-      Deephemeralize(u.ao.pDest);
-      goto op_column_out;
-    }
-    assert( u.ao.pReg->flags & MEM_Blob );
-    assert( memIsValid(u.ao.pReg) );
-    u.ao.payloadSize = u.ao.pReg->n;
-    u.ao.zRec = u.ao.pReg->z;
-    u.ao.pC->cacheStatus = (pOp->p5&OPFLAG_CLEARCACHE) ? CACHE_STALE : p->cacheCtr;
-    assert( u.ao.payloadSize==0 || u.ao.zRec!=0 );
-  }else{
-    /* Consider the row to be NULL */
-    u.ao.payloadSize = 0;
-  }
+  pCrsr = pC->pCursor;
+  assert( pCrsr!=0 || pC->pseudoTableReg>0 ); /* pCrsr NULL on PseudoTables */
+  assert( pCrsr!=0 || pC->nullRow );          /* pC->nullRow on PseudoTables */
 
-  /* If u.ao.payloadSize is 0, then just store a NULL.  This can happen because of
-  ** nullRow or because of a corrupt database. */
-  if( u.ao.payloadSize==0 ){
-    MemSetTypeFlag(u.ao.pDest, MEM_Null);
-    goto op_column_out;
-  }
-  assert( db->aLimit[SQLITE_LIMIT_LENGTH]>=0 );
-  if( u.ao.payloadSize > (u32)db->aLimit[SQLITE_LIMIT_LENGTH] ){
-    goto too_big;
-  }
-
-  u.ao.nField = u.ao.pC->nField;
-  assert( u.ao.p2<u.ao.nField );
-
-  /* Read and parse the table header.  Store the results of the parse
-  ** into the record header cache fields of the cursor.
-  */
-  u.ao.aType = u.ao.pC->aType;
-  if( u.ao.pC->cacheStatus==p->cacheCtr ){
-    u.ao.aOffset = u.ao.pC->aOffset;
-  }else{
-    assert(u.ao.aType);
-    u.ao.avail = 0;
-    u.ao.pC->aOffset = u.ao.aOffset = &u.ao.aType[u.ao.nField];
-    u.ao.pC->payloadSize = u.ao.payloadSize;
-    u.ao.pC->cacheStatus = p->cacheCtr;
-
-    /* Figure out how many bytes are in the header */
-    if( u.ao.zRec ){
-      u.ao.zData = u.ao.zRec;
-    }else{
-      if( u.ao.pC->isIndex ){
-        u.ao.zData = (char*)sqlite3BtreeKeyFetch(u.ao.pCrsr, &u.ao.avail);
+  /* If the cursor cache is stale, bring it up-to-date */
+  rc = sqlite3VdbeCursorMoveto(pC);
+  if( rc ) goto abort_due_to_error;
+  if( pC->cacheStatus!=p->cacheCtr || (pOp->p5&OPFLAG_CLEARCACHE)!=0 ){
+    if( pC->nullRow ){
+      if( pCrsr==0 ){
+        assert( pC->pseudoTableReg>0 );
+        pReg = &aMem[pC->pseudoTableReg];
+        assert( pReg->flags & MEM_Blob );
+        assert( memIsValid(pReg) );
+        pC->payloadSize = pC->szRow = avail = pReg->n;
+        pC->aRow = (u8*)pReg->z;
       }else{
-        u.ao.zData = (char*)sqlite3BtreeDataFetch(u.ao.pCrsr, &u.ao.avail);
+        MemSetTypeFlag(pDest, MEM_Null);
+        goto op_column_out;
       }
-      /* If KeyFetch()/DataFetch() managed to get the entire payload,
-      ** save the payload in the u.ao.pC->aRow cache.  That will save us from
-      ** having to make additional calls to fetch the content portion of
-      ** the record.
-      */
-      assert( u.ao.avail>=0 );
-      if( u.ao.payloadSize <= (u32)u.ao.avail ){
-        u.ao.zRec = u.ao.zData;
-        u.ao.pC->aRow = (u8*)u.ao.zData;
+    }else{
+      assert( pCrsr );
+      if( pC->isTable==0 ){
+        assert( sqlite3BtreeCursorIsValid(pCrsr) );
+        VVA_ONLY(rc =) sqlite3BtreeKeySize(pCrsr, &payloadSize64);
+        assert( rc==SQLITE_OK ); /* True because of CursorMoveto() call above */
+        /* sqlite3BtreeParseCellPtr() uses getVarint32() to extract the
+        ** payload size, so it is impossible for payloadSize64 to be
+        ** larger than 32 bits. */
+        assert( (payloadSize64 & SQLITE_MAX_U32)==(u64)payloadSize64 );
+        pC->aRow = sqlite3BtreeKeyFetch(pCrsr, &avail);
+        pC->payloadSize = (u32)payloadSize64;
       }else{
-        u.ao.pC->aRow = 0;
+        assert( sqlite3BtreeCursorIsValid(pCrsr) );
+        VVA_ONLY(rc =) sqlite3BtreeDataSize(pCrsr, &pC->payloadSize);
+        assert( rc==SQLITE_OK );   /* DataSize() cannot fail */
+        pC->aRow = sqlite3BtreeDataFetch(pCrsr, &avail);
+      }
+      assert( avail<=65536 );  /* Maximum page size is 64KiB */
+      if( pC->payloadSize <= (u32)avail ){
+        pC->szRow = pC->payloadSize;
+      }else{
+        pC->szRow = avail;
+      }
+      if( pC->payloadSize > (u32)db->aLimit[SQLITE_LIMIT_LENGTH] ){
+        goto too_big;
       }
     }
-    /* The following assert is true in all cases except when
-    ** the database file has been corrupted externally.
-    **    assert( u.ao.zRec!=0 || u.ao.avail>=u.ao.payloadSize || u.ao.avail>=9 ); */
-    u.ao.szHdr = getVarint32((u8*)u.ao.zData, u.ao.offset);
+    pC->cacheStatus = p->cacheCtr;
+    pC->iHdrOffset = getVarint32(pC->aRow, offset);
+    pC->nHdrParsed = 0;
+    aOffset[0] = offset;
+    if( avail<offset ){
+      /* pC->aRow does not have to hold the entire row, but it does at least
+      ** need to cover the header of the record.  If pC->aRow does not contain
+      ** the complete header, then set it to zero, forcing the header to be
+      ** dynamically allocated. */
+      pC->aRow = 0;
+      pC->szRow = 0;
+    }
 
     /* Make sure a corrupt database has not given us an oversize header.
     ** Do this now to avoid an oversize memory allocation.
@@ -67671,161 +69890,156 @@ case OP_Column: {
     ** 3-byte type for each of the maximum of 32768 columns plus three
     ** extra bytes for the header length itself.  32768*3 + 3 = 98307.
     */
-    if( u.ao.offset > 98307 ){
+    if( offset > 98307 || offset > pC->payloadSize ){
       rc = SQLITE_CORRUPT_BKPT;
-      goto op_column_out;
+      goto op_column_error;
     }
+  }
 
-    /* Compute in u.ao.len the number of bytes of data we need to read in order
-    ** to get u.ao.nField type values.  u.ao.offset is an upper bound on this.  But
-    ** u.ao.nField might be significantly less than the true number of columns
-    ** in the table, and in that case, 5*u.ao.nField+3 might be smaller than u.ao.offset.
-    ** We want to minimize u.ao.len in order to limit the size of the memory
-    ** allocation, especially if a corrupt database file has caused u.ao.offset
-    ** to be oversized. Offset is limited to 98307 above.  But 98307 might
-    ** still exceed Robson memory allocation limits on some configurations.
-    ** On systems that cannot tolerate large memory allocations, u.ao.nField*5+3
-    ** will likely be much smaller since u.ao.nField will likely be less than
-    ** 20 or so.  This insures that Robson memory allocation limits are
-    ** not exceeded even for corrupt database files.
+  /* Make sure at least the first p2+1 entries of the header have been
+  ** parsed and valid information is in aOffset[] and aType[].
+  */
+  if( pC->nHdrParsed<=p2 ){
+    /* If there is more header available for parsing in the record, try
+    ** to extract additional fields up through the p2+1-th field 
     */
-    u.ao.len = u.ao.nField*5 + 3;
-    if( u.ao.len > (int)u.ao.offset ) u.ao.len = (int)u.ao.offset;
-
-    /* The KeyFetch() or DataFetch() above are fast and will get the entire
-    ** record header in most cases.  But they will fail to get the complete
-    ** record header if the record header does not fit on a single page
-    ** in the B-Tree.  When that happens, use sqlite3VdbeMemFromBtree() to
-    ** acquire the complete header text.
-    */
-    if( !u.ao.zRec && u.ao.avail<u.ao.len ){
-      u.ao.sMem.flags = 0;
-      u.ao.sMem.db = 0;
-      rc = sqlite3VdbeMemFromBtree(u.ao.pCrsr, 0, u.ao.len, u.ao.pC->isIndex, &u.ao.sMem);
-      if( rc!=SQLITE_OK ){
-        goto op_column_out;
-      }
-      u.ao.zData = u.ao.sMem.z;
-    }
-    u.ao.zEndHdr = (u8 *)&u.ao.zData[u.ao.len];
-    u.ao.zIdx = (u8 *)&u.ao.zData[u.ao.szHdr];
-
-    /* Scan the header and use it to fill in the u.ao.aType[] and u.ao.aOffset[]
-    ** arrays.  u.ao.aType[u.ao.i] will contain the type integer for the u.ao.i-th
-    ** column and u.ao.aOffset[u.ao.i] will contain the u.ao.offset from the beginning
-    ** of the record to the start of the data for the u.ao.i-th column
-    */
-    for(u.ao.i=0; u.ao.i<u.ao.nField; u.ao.i++){
-      if( u.ao.zIdx<u.ao.zEndHdr ){
-        u.ao.aOffset[u.ao.i] = u.ao.offset;
-        if( u.ao.zIdx[0]<0x80 ){
-          u.ao.t = u.ao.zIdx[0];
-          u.ao.zIdx++;
-        }else{
-          u.ao.zIdx += sqlite3GetVarint32(u.ao.zIdx, &u.ao.t);
+    if( pC->iHdrOffset<aOffset[0] ){
+      /* Make sure zData points to enough of the record to cover the header. */
+      if( pC->aRow==0 ){
+        memset(&sMem, 0, sizeof(sMem));
+        rc = sqlite3VdbeMemFromBtree(pCrsr, 0, aOffset[0], 
+                                     !pC->isTable, &sMem);
+        if( rc!=SQLITE_OK ){
+          goto op_column_error;
         }
-        u.ao.aType[u.ao.i] = u.ao.t;
-        u.ao.szField = sqlite3VdbeSerialTypeLen(u.ao.t);
-        u.ao.offset += u.ao.szField;
-        if( u.ao.offset<u.ao.szField ){  /* True if u.ao.offset overflows */
-          u.ao.zIdx = &u.ao.zEndHdr[1];  /* Forces SQLITE_CORRUPT return below */
+        zData = (u8*)sMem.z;
+      }else{
+        zData = pC->aRow;
+      }
+  
+      /* Fill in aType[i] and aOffset[i] values through the p2-th field. */
+      i = pC->nHdrParsed;
+      offset = aOffset[i];
+      zHdr = zData + pC->iHdrOffset;
+      zEndHdr = zData + aOffset[0];
+      assert( i<=p2 && zHdr<zEndHdr );
+      do{
+        if( zHdr[0]<0x80 ){
+          t = zHdr[0];
+          zHdr++;
+        }else{
+          zHdr += sqlite3GetVarint32(zHdr, &t);
+        }
+        aType[i] = t;
+        szField = sqlite3VdbeSerialTypeLen(t);
+        offset += szField;
+        if( offset<szField ){  /* True if offset overflows */
+          zHdr = &zEndHdr[1];  /* Forces SQLITE_CORRUPT return below */
           break;
         }
-      }else{
-        /* If u.ao.i is less that u.ao.nField, then there are fewer fields in this
-        ** record than SetNumColumns indicated there are columns in the
-        ** table. Set the u.ao.offset for any extra columns not present in
-        ** the record to 0. This tells code below to store the default value
-        ** for the column instead of deserializing a value from the record.
-        */
-        u.ao.aOffset[u.ao.i] = 0;
+        i++;
+        aOffset[i] = offset;
+      }while( i<=p2 && zHdr<zEndHdr );
+      pC->nHdrParsed = i;
+      pC->iHdrOffset = (u32)(zHdr - zData);
+      if( pC->aRow==0 ){
+        sqlite3VdbeMemRelease(&sMem);
+        sMem.flags = MEM_Null;
+      }
+  
+      /* If we have read more header data than was contained in the header,
+      ** or if the end of the last field appears to be past the end of the
+      ** record, or if the end of the last field appears to be before the end
+      ** of the record (when all fields present), then we must be dealing 
+      ** with a corrupt database.
+      */
+      if( (zHdr > zEndHdr)
+       || (offset > pC->payloadSize)
+       || (zHdr==zEndHdr && offset!=pC->payloadSize)
+      ){
+        rc = SQLITE_CORRUPT_BKPT;
+        goto op_column_error;
       }
     }
-    sqlite3VdbeMemRelease(&u.ao.sMem);
-    u.ao.sMem.flags = MEM_Null;
 
-    /* If we have read more header data than was contained in the header,
-    ** or if the end of the last field appears to be past the end of the
-    ** record, or if the end of the last field appears to be before the end
-    ** of the record (when all fields present), then we must be dealing
-    ** with a corrupt database.
+    /* If after trying to extra new entries from the header, nHdrParsed is
+    ** still not up to p2, that means that the record has fewer than p2
+    ** columns.  So the result will be either the default value or a NULL.
     */
-    if( (u.ao.zIdx > u.ao.zEndHdr) || (u.ao.offset > u.ao.payloadSize)
-         || (u.ao.zIdx==u.ao.zEndHdr && u.ao.offset!=u.ao.payloadSize) ){
-      rc = SQLITE_CORRUPT_BKPT;
+    if( pC->nHdrParsed<=p2 ){
+      if( pOp->p4type==P4_MEM ){
+        sqlite3VdbeMemShallowCopy(pDest, pOp->p4.pMem, MEM_Static);
+      }else{
+        MemSetTypeFlag(pDest, MEM_Null);
+      }
       goto op_column_out;
     }
   }
 
-  /* Get the column information. If u.ao.aOffset[u.ao.p2] is non-zero, then
-  ** deserialize the value from the record. If u.ao.aOffset[u.ao.p2] is zero,
-  ** then there are not enough fields in the record to satisfy the
-  ** request.  In this case, set the value NULL or to P4 if P4 is
-  ** a pointer to a Mem object.
+  /* Extract the content for the p2+1-th column.  Control can only
+  ** reach this point if aOffset[p2], aOffset[p2+1], and aType[p2] are
+  ** all valid.
   */
-  if( u.ao.aOffset[u.ao.p2] ){
-    assert( rc==SQLITE_OK );
-    if( u.ao.zRec ){
-      /* This is the common case where the whole row fits on a single page */
-      VdbeMemRelease(u.ao.pDest);
-      sqlite3VdbeSerialGet((u8 *)&u.ao.zRec[u.ao.aOffset[u.ao.p2]], u.ao.aType[u.ao.p2], u.ao.pDest);
-    }else{
-      /* This branch happens only when the row overflows onto multiple pages */
-      u.ao.t = u.ao.aType[u.ao.p2];
-      if( (pOp->p5 & (OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))!=0
-       && ((u.ao.t>=12 && (u.ao.t&1)==0) || (pOp->p5 & OPFLAG_TYPEOFARG)!=0)
-      ){
-        /* Content is irrelevant for the typeof() function and for
-        ** the length(X) function if X is a blob.  So we might as well use
-        ** bogus content rather than reading content from disk.  NULL works
-        ** for text and blob and whatever is in the u.ao.payloadSize64 variable
-        ** will work for everything else. */
-        u.ao.zData = u.ao.t<12 ? (char*)&u.ao.payloadSize64 : 0;
-      }else{
-        u.ao.len = sqlite3VdbeSerialTypeLen(u.ao.t);
-        sqlite3VdbeMemMove(&u.ao.sMem, u.ao.pDest);
-        rc = sqlite3VdbeMemFromBtree(u.ao.pCrsr, u.ao.aOffset[u.ao.p2], u.ao.len,  u.ao.pC->isIndex,
-                                     &u.ao.sMem);
-        if( rc!=SQLITE_OK ){
-          goto op_column_out;
-        }
-        u.ao.zData = u.ao.sMem.z;
-      }
-      sqlite3VdbeSerialGet((u8*)u.ao.zData, u.ao.t, u.ao.pDest);
-    }
-    u.ao.pDest->enc = encoding;
+  assert( p2<pC->nHdrParsed );
+  assert( rc==SQLITE_OK );
+  assert( sqlite3VdbeCheckMemInvariants(pDest) );
+  if( pC->szRow>=aOffset[p2+1] ){
+    /* This is the common case where the desired content fits on the original
+    ** page - where the content is not on an overflow page */
+    VdbeMemRelease(pDest);
+    sqlite3VdbeSerialGet(pC->aRow+aOffset[p2], aType[p2], pDest);
   }else{
-    if( pOp->p4type==P4_MEM ){
-      sqlite3VdbeMemShallowCopy(u.ao.pDest, pOp->p4.pMem, MEM_Static);
+    /* This branch happens only when content is on overflow pages */
+    t = aType[p2];
+    if( ((pOp->p5 & (OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG))!=0
+          && ((t>=12 && (t&1)==0) || (pOp->p5 & OPFLAG_TYPEOFARG)!=0))
+     || (len = sqlite3VdbeSerialTypeLen(t))==0
+    ){
+      /* Content is irrelevant for the typeof() function and for
+      ** the length(X) function if X is a blob.  So we might as well use
+      ** bogus content rather than reading content from disk.  NULL works
+      ** for text and blob and whatever is in the payloadSize64 variable
+      ** will work for everything else.  Content is also irrelevant if
+      ** the content length is 0. */
+      zData = t<=13 ? (u8*)&payloadSize64 : 0;
+      sMem.zMalloc = 0;
     }else{
-      MemSetTypeFlag(u.ao.pDest, MEM_Null);
+      memset(&sMem, 0, sizeof(sMem));
+      sqlite3VdbeMemMove(&sMem, pDest);
+      rc = sqlite3VdbeMemFromBtree(pCrsr, aOffset[p2], len, !pC->isTable,
+                                   &sMem);
+      if( rc!=SQLITE_OK ){
+        goto op_column_error;
+      }
+      zData = (u8*)sMem.z;
+    }
+    sqlite3VdbeSerialGet(zData, t, pDest);
+    /* If we dynamically allocated space to hold the data (in the
+    ** sqlite3VdbeMemFromBtree() call above) then transfer control of that
+    ** dynamically allocated space over to the pDest structure.
+    ** This prevents a memory copy. */
+    if( sMem.zMalloc ){
+      assert( sMem.z==sMem.zMalloc );
+      assert( VdbeMemDynamic(pDest)==0 );
+      assert( (pDest->flags & (MEM_Blob|MEM_Str))==0 || pDest->z==sMem.z );
+      pDest->flags &= ~(MEM_Ephem|MEM_Static);
+      pDest->flags |= MEM_Term;
+      pDest->z = sMem.z;
+      pDest->zMalloc = sMem.zMalloc;
     }
   }
-
-  /* If we dynamically allocated space to hold the data (in the
-  ** sqlite3VdbeMemFromBtree() call above) then transfer control of that
-  ** dynamically allocated space over to the u.ao.pDest structure.
-  ** This prevents a memory copy.
-  */
-  if( u.ao.sMem.zMalloc ){
-    assert( u.ao.sMem.z==u.ao.sMem.zMalloc );
-    assert( !(u.ao.pDest->flags & MEM_Dyn) );
-    assert( !(u.ao.pDest->flags & (MEM_Blob|MEM_Str)) || u.ao.pDest->z==u.ao.sMem.z );
-    u.ao.pDest->flags &= ~(MEM_Ephem|MEM_Static);
-    u.ao.pDest->flags |= MEM_Term;
-    u.ao.pDest->z = u.ao.sMem.z;
-    u.ao.pDest->zMalloc = u.ao.sMem.zMalloc;
-  }
-
-  rc = sqlite3VdbeMemMakeWriteable(u.ao.pDest);
+  pDest->enc = encoding;
 
 op_column_out:
-  UPDATE_MAX_BLOBSIZE(u.ao.pDest);
-  REGISTER_TRACE(pOp->p3, u.ao.pDest);
+  Deephemeralize(pDest);
+op_column_error:
+  UPDATE_MAX_BLOBSIZE(pDest);
+  REGISTER_TRACE(pOp->p3, pDest);
   break;
 }
 
 /* Opcode: Affinity P1 P2 * P4 *
+** Synopsis: affinity(r[P1@P2])
 **
 ** Apply affinities to a range of P2 registers starting with P1.
 **
@@ -67834,26 +70048,24 @@ case OP_Column: {
 ** memory cell in the range.
 */
 case OP_Affinity: {
-#if 0  /* local variables moved into u.ap */
   const char *zAffinity;   /* The affinity to be applied */
   char cAff;               /* A single character of affinity */
-#endif /* local variables moved into u.ap */
 
-  u.ap.zAffinity = pOp->p4.z;
-  assert( u.ap.zAffinity!=0 );
-  assert( u.ap.zAffinity[pOp->p2]==0 );
+  zAffinity = pOp->p4.z;
+  assert( zAffinity!=0 );
+  assert( zAffinity[pOp->p2]==0 );
   pIn1 = &aMem[pOp->p1];
-  while( (u.ap.cAff = *(u.ap.zAffinity++))!=0 ){
-    assert( pIn1 <= &p->aMem[p->nMem] );
+  while( (cAff = *(zAffinity++))!=0 ){
+    assert( pIn1 <= &p->aMem[(p->nMem-p->nCursor)] );
     assert( memIsValid(pIn1) );
-    ExpandBlob(pIn1);
-    applyAffinity(pIn1, u.ap.cAff, encoding);
+    applyAffinity(pIn1, cAff, encoding);
     pIn1++;
   }
   break;
 }
 
 /* Opcode: MakeRecord P1 P2 P3 P4 *
+** Synopsis: r[P3]=mkrec(r[P1@P2])
 **
 ** Convert P2 registers beginning with P1 into the [record format]
 ** use as a data record in a database table or as a key
@@ -67869,7 +70081,6 @@ case OP_Affinity: {
 ** If P4 is NULL then all index fields have the affinity NONE.
 */
 case OP_MakeRecord: {
-#if 0  /* local variables moved into u.aq */
   u8 *zNewRecord;        /* A buffer to hold the data for the new record */
   Mem *pRec;             /* The new record */
   u64 nData;             /* Number of bytes of data space */
@@ -67883,102 +70094,120 @@ case OP_MakeRecord: {
   int nField;            /* Number of fields in the record */
   char *zAffinity;       /* The affinity string for the record */
   int file_format;       /* File format to use for encoding */
-  int i;                 /* Space used in zNewRecord[] */
+  int i;                 /* Space used in zNewRecord[] header */
+  int j;                 /* Space used in zNewRecord[] content */
   int len;               /* Length of a field */
-#endif /* local variables moved into u.aq */
 
   /* Assuming the record contains N fields, the record format looks
   ** like this:
   **
   ** ------------------------------------------------------------------------
-  ** | hdr-size | type 0 | type 1 | ... | type N-1 | data0 | ... | data N-1 |
+  ** | hdr-size | type 0 | type 1 | ... | type N-1 | data0 | ... | data N-1 | 
   ** ------------------------------------------------------------------------
   **
   ** Data(0) is taken from register P1.  Data(1) comes from register P1+1
   ** and so froth.
   **
-  ** Each type field is a varint representing the serial type of the
+  ** Each type field is a varint representing the serial type of the 
   ** corresponding data element (see sqlite3VdbeSerialType()). The
   ** hdr-size field is also a varint which is the offset from the beginning
   ** of the record to data0.
   */
-  u.aq.nData = 0;         /* Number of bytes of data space */
-  u.aq.nHdr = 0;          /* Number of bytes of header space */
-  u.aq.nZero = 0;         /* Number of zero bytes at the end of the record */
-  u.aq.nField = pOp->p1;
-  u.aq.zAffinity = pOp->p4.z;
-  assert( u.aq.nField>0 && pOp->p2>0 && pOp->p2+u.aq.nField<=p->nMem+1 );
-  u.aq.pData0 = &aMem[u.aq.nField];
-  u.aq.nField = pOp->p2;
-  u.aq.pLast = &u.aq.pData0[u.aq.nField-1];
-  u.aq.file_format = p->minWriteFileFormat;
+  nData = 0;         /* Number of bytes of data space */
+  nHdr = 0;          /* Number of bytes of header space */
+  nZero = 0;         /* Number of zero bytes at the end of the record */
+  nField = pOp->p1;
+  zAffinity = pOp->p4.z;
+  assert( nField>0 && pOp->p2>0 && pOp->p2+nField<=(p->nMem-p->nCursor)+1 );
+  pData0 = &aMem[nField];
+  nField = pOp->p2;
+  pLast = &pData0[nField-1];
+  file_format = p->minWriteFileFormat;
 
   /* Identify the output register */
   assert( pOp->p3<pOp->p1 || pOp->p3>=pOp->p1+pOp->p2 );
   pOut = &aMem[pOp->p3];
   memAboutToChange(p, pOut);
 
+  /* Apply the requested affinity to all inputs
+  */
+  assert( pData0<=pLast );
+  if( zAffinity ){
+    pRec = pData0;
+    do{
+      applyAffinity(pRec++, *(zAffinity++), encoding);
+      assert( zAffinity[0]==0 || pRec<=pLast );
+    }while( zAffinity[0] );
+  }
+
   /* Loop through the elements that will make up the record to figure
   ** out how much space is required for the new record.
   */
-  for(u.aq.pRec=u.aq.pData0; u.aq.pRec<=u.aq.pLast; u.aq.pRec++){
-    assert( memIsValid(u.aq.pRec) );
-    if( u.aq.zAffinity ){
-      applyAffinity(u.aq.pRec, u.aq.zAffinity[u.aq.pRec-u.aq.pData0], encoding);
+  pRec = pLast;
+  do{
+    assert( memIsValid(pRec) );
+    serial_type = sqlite3VdbeSerialType(pRec, file_format);
+    len = sqlite3VdbeSerialTypeLen(serial_type);
+    if( pRec->flags & MEM_Zero ){
+      if( nData ){
+        sqlite3VdbeMemExpandBlob(pRec);
+      }else{
+        nZero += pRec->u.nZero;
+        len -= pRec->u.nZero;
+      }
     }
-    if( u.aq.pRec->flags&MEM_Zero && u.aq.pRec->n>0 ){
-      sqlite3VdbeMemExpandBlob(u.aq.pRec);
-    }
-    u.aq.serial_type = sqlite3VdbeSerialType(u.aq.pRec, u.aq.file_format);
-    u.aq.len = sqlite3VdbeSerialTypeLen(u.aq.serial_type);
-    u.aq.nData += u.aq.len;
-    u.aq.nHdr += sqlite3VarintLen(u.aq.serial_type);
-    if( u.aq.pRec->flags & MEM_Zero ){
-      /* Only pure zero-filled BLOBs can be input to this Opcode.
-      ** We do not allow blobs with a prefix and a zero-filled tail. */
-      u.aq.nZero += u.aq.pRec->u.nZero;
-    }else if( u.aq.len ){
-      u.aq.nZero = 0;
-    }
-  }
+    nData += len;
+    testcase( serial_type==127 );
+    testcase( serial_type==128 );
+    nHdr += serial_type<=127 ? 1 : sqlite3VarintLen(serial_type);
+  }while( (--pRec)>=pData0 );
 
   /* Add the initial header varint and total the size */
-  u.aq.nHdr += u.aq.nVarint = sqlite3VarintLen(u.aq.nHdr);
-  if( u.aq.nVarint<sqlite3VarintLen(u.aq.nHdr) ){
-    u.aq.nHdr++;
+  testcase( nHdr==126 );
+  testcase( nHdr==127 );
+  if( nHdr<=126 ){
+    /* The common case */
+    nHdr += 1;
+  }else{
+    /* Rare case of a really large header */
+    nVarint = sqlite3VarintLen(nHdr);
+    nHdr += nVarint;
+    if( nVarint<sqlite3VarintLen(nHdr) ) nHdr++;
   }
-  u.aq.nByte = u.aq.nHdr+u.aq.nData-u.aq.nZero;
-  if( u.aq.nByte>db->aLimit[SQLITE_LIMIT_LENGTH] ){
+  nByte = nHdr+nData;
+  if( nByte>db->aLimit[SQLITE_LIMIT_LENGTH] ){
     goto too_big;
   }
 
-  /* Make sure the output register has a buffer large enough to store
+  /* Make sure the output register has a buffer large enough to store 
   ** the new record. The output register (pOp->p3) is not allowed to
   ** be one of the input registers (because the following call to
   ** sqlite3VdbeMemGrow() could clobber the value before it is used).
   */
-  if( sqlite3VdbeMemGrow(pOut, (int)u.aq.nByte, 0) ){
+  if( sqlite3VdbeMemGrow(pOut, (int)nByte, 0) ){
     goto no_mem;
   }
-  u.aq.zNewRecord = (u8 *)pOut->z;
+  zNewRecord = (u8 *)pOut->z;
 
   /* Write the record */
-  u.aq.i = putVarint32(u.aq.zNewRecord, u.aq.nHdr);
-  for(u.aq.pRec=u.aq.pData0; u.aq.pRec<=u.aq.pLast; u.aq.pRec++){
-    u.aq.serial_type = sqlite3VdbeSerialType(u.aq.pRec, u.aq.file_format);
-    u.aq.i += putVarint32(&u.aq.zNewRecord[u.aq.i], u.aq.serial_type);      /* serial type */
-  }
-  for(u.aq.pRec=u.aq.pData0; u.aq.pRec<=u.aq.pLast; u.aq.pRec++){  /* serial data */
-    u.aq.i += sqlite3VdbeSerialPut(&u.aq.zNewRecord[u.aq.i], (int)(u.aq.nByte-u.aq.i), u.aq.pRec,u.aq.file_format);
-  }
-  assert( u.aq.i==u.aq.nByte );
+  i = putVarint32(zNewRecord, nHdr);
+  j = nHdr;
+  assert( pData0<=pLast );
+  pRec = pData0;
+  do{
+    serial_type = sqlite3VdbeSerialType(pRec, file_format);
+    i += putVarint32(&zNewRecord[i], serial_type);            /* serial type */
+    j += sqlite3VdbeSerialPut(&zNewRecord[j], pRec, serial_type); /* content */
+  }while( (++pRec)<=pLast );
+  assert( i==nHdr );
+  assert( j==nByte );
 
-  assert( pOp->p3>0 && pOp->p3<=p->nMem );
-  pOut->n = (int)u.aq.nByte;
-  pOut->flags = MEM_Blob | MEM_Dyn;
+  assert( pOp->p3>0 && pOp->p3<=(p->nMem-p->nCursor) );
+  pOut->n = (int)nByte;
+  pOut->flags = MEM_Blob;
   pOut->xDel = 0;
-  if( u.aq.nZero ){
-    pOut->u.nZero = u.aq.nZero;
+  if( nZero ){
+    pOut->u.nZero = nZero;
     pOut->flags |= MEM_Zero;
   }
   pOut->enc = SQLITE_UTF8;  /* In case the blob is ever converted to text */
@@ -67988,24 +70217,21 @@ case OP_MakeRecord: {
 }
 
 /* Opcode: Count P1 P2 * * *
+** Synopsis: r[P2]=count()
 **
 ** Store the number of entries (an integer value) in the table or index 
 ** opened by cursor P1 in register P2
 */
 #ifndef SQLITE_OMIT_BTREECOUNT
 case OP_Count: {         /* out2-prerelease */
-#if 0  /* local variables moved into u.ar */
   i64 nEntry;
   BtCursor *pCrsr;
-#endif /* local variables moved into u.ar */
 
-  u.ar.pCrsr = p->apCsr[pOp->p1]->pCursor;
-  if( ALWAYS(u.ar.pCrsr) ){
-    rc = sqlite3BtreeCount(u.ar.pCrsr, &u.ar.nEntry);
-  }else{
-    u.ar.nEntry = 0;
-  }
-  pOut->u.i = u.ar.nEntry;
+  pCrsr = p->apCsr[pOp->p1]->pCursor;
+  assert( pCrsr );
+  nEntry = 0;  /* Not needed.  Only used to silence a warning. */
+  rc = sqlite3BtreeCount(pCrsr, &nEntry);
+  pOut->u.i = nEntry;
   break;
 }
 #endif
@@ -68017,7 +70243,6 @@ case OP_Count: {         /* out2-prerelease */
 ** existing savepoint, P1==1, or to rollback an existing savepoint P1==2.
 */
 case OP_Savepoint: {
-#if 0  /* local variables moved into u.as */
   int p1;                         /* Value of P1 operand */
   char *zName;                    /* Name of savepoint */
   int nName;
@@ -68026,29 +70251,29 @@ case OP_Savepoint: {
   Savepoint *pTmp;
   int iSavepoint;
   int ii;
-#endif /* local variables moved into u.as */
 
-  u.as.p1 = pOp->p1;
-  u.as.zName = pOp->p4.z;
+  p1 = pOp->p1;
+  zName = pOp->p4.z;
 
-  /* Assert that the u.as.p1 parameter is valid. Also that if there is no open
-  ** transaction, then there cannot be any savepoints.
+  /* Assert that the p1 parameter is valid. Also that if there is no open
+  ** transaction, then there cannot be any savepoints. 
   */
   assert( db->pSavepoint==0 || db->autoCommit==0 );
-  assert( u.as.p1==SAVEPOINT_BEGIN||u.as.p1==SAVEPOINT_RELEASE||u.as.p1==SAVEPOINT_ROLLBACK );
+  assert( p1==SAVEPOINT_BEGIN||p1==SAVEPOINT_RELEASE||p1==SAVEPOINT_ROLLBACK );
   assert( db->pSavepoint || db->isTransactionSavepoint==0 );
   assert( checkSavepointCount(db) );
+  assert( p->bIsReader );
 
-  if( u.as.p1==SAVEPOINT_BEGIN ){
-    if( db->writeVdbeCnt>0 ){
-      /* A new savepoint cannot be created if there are active write
+  if( p1==SAVEPOINT_BEGIN ){
+    if( db->nVdbeWrite>0 ){
+      /* A new savepoint cannot be created if there are active write 
       ** statements (i.e. open read/write incremental blob handles).
       */
       sqlite3SetString(&p->zErrMsg, db, "cannot open savepoint - "
         "SQL statements in progress");
       rc = SQLITE_BUSY;
     }else{
-      u.as.nName = sqlite3Strlen30(u.as.zName);
+      nName = sqlite3Strlen30(zName);
 
 #ifndef SQLITE_OMIT_VIRTUALTABLE
       /* This call is Ok even if this savepoint is actually a transaction
@@ -68062,11 +70287,11 @@ case OP_Savepoint: {
 #endif
 
       /* Create a new savepoint structure. */
-      u.as.pNew = sqlite3DbMallocRaw(db, sizeof(Savepoint)+u.as.nName+1);
-      if( u.as.pNew ){
-        u.as.pNew->zName = (char *)&u.as.pNew[1];
-        memcpy(u.as.pNew->zName, u.as.zName, u.as.nName+1);
-
+      pNew = sqlite3DbMallocRaw(db, sizeof(Savepoint)+nName+1);
+      if( pNew ){
+        pNew->zName = (char *)&pNew[1];
+        memcpy(pNew->zName, zName, nName+1);
+    
         /* If there is no open transaction, then mark this as a special
         ** "transaction savepoint". */
         if( db->autoCommit ){
@@ -68075,44 +70300,45 @@ case OP_Savepoint: {
         }else{
           db->nSavepoint++;
         }
-
+    
         /* Link the new savepoint into the database handle's list. */
-        u.as.pNew->pNext = db->pSavepoint;
-        db->pSavepoint = u.as.pNew;
-        u.as.pNew->nDeferredCons = db->nDeferredCons;
+        pNew->pNext = db->pSavepoint;
+        db->pSavepoint = pNew;
+        pNew->nDeferredCons = db->nDeferredCons;
+        pNew->nDeferredImmCons = db->nDeferredImmCons;
       }
     }
   }else{
-    u.as.iSavepoint = 0;
+    iSavepoint = 0;
 
     /* Find the named savepoint. If there is no such savepoint, then an
     ** an error is returned to the user.  */
     for(
-      u.as.pSavepoint = db->pSavepoint;
-      u.as.pSavepoint && sqlite3StrICmp(u.as.pSavepoint->zName, u.as.zName);
-      u.as.pSavepoint = u.as.pSavepoint->pNext
+      pSavepoint = db->pSavepoint; 
+      pSavepoint && sqlite3StrICmp(pSavepoint->zName, zName);
+      pSavepoint = pSavepoint->pNext
     ){
-      u.as.iSavepoint++;
+      iSavepoint++;
     }
-    if( !u.as.pSavepoint ){
-      sqlite3SetString(&p->zErrMsg, db, "no such savepoint: %s", u.as.zName);
+    if( !pSavepoint ){
+      sqlite3SetString(&p->zErrMsg, db, "no such savepoint: %s", zName);
       rc = SQLITE_ERROR;
-    }else if( db->writeVdbeCnt>0 && u.as.p1==SAVEPOINT_RELEASE ){
-      /* It is not possible to release (commit) a savepoint if there are
+    }else if( db->nVdbeWrite>0 && p1==SAVEPOINT_RELEASE ){
+      /* It is not possible to release (commit) a savepoint if there are 
       ** active write statements.
       */
-      sqlite3SetString(&p->zErrMsg, db,
+      sqlite3SetString(&p->zErrMsg, db, 
         "cannot release savepoint - SQL statements in progress"
       );
       rc = SQLITE_BUSY;
     }else{
 
       /* Determine whether or not this is a transaction savepoint. If so,
-      ** and this is a RELEASE command, then the current transaction
-      ** is committed.
+      ** and this is a RELEASE command, then the current transaction 
+      ** is committed. 
       */
-      int isTransaction = u.as.pSavepoint->pNext==0 && db->isTransactionSavepoint;
-      if( isTransaction && u.as.p1==SAVEPOINT_RELEASE ){
+      int isTransaction = pSavepoint->pNext==0 && db->isTransactionSavepoint;
+      if( isTransaction && p1==SAVEPOINT_RELEASE ){
         if( (rc = sqlite3VdbeCheckFk(p, 1))!=SQLITE_OK ){
           goto vdbe_return;
         }
@@ -68126,51 +70352,52 @@ case OP_Savepoint: {
         db->isTransactionSavepoint = 0;
         rc = p->rc;
       }else{
-        u.as.iSavepoint = db->nSavepoint - u.as.iSavepoint - 1;
-        if( u.as.p1==SAVEPOINT_ROLLBACK ){
-          for(u.as.ii=0; u.as.ii<db->nDb; u.as.ii++){
-            sqlite3BtreeTripAllCursors(db->aDb[u.as.ii].pBt, SQLITE_ABORT);
+        iSavepoint = db->nSavepoint - iSavepoint - 1;
+        if( p1==SAVEPOINT_ROLLBACK ){
+          for(ii=0; ii<db->nDb; ii++){
+            sqlite3BtreeTripAllCursors(db->aDb[ii].pBt, SQLITE_ABORT);
           }
         }
-        for(u.as.ii=0; u.as.ii<db->nDb; u.as.ii++){
-          rc = sqlite3BtreeSavepoint(db->aDb[u.as.ii].pBt, u.as.p1, u.as.iSavepoint);
+        for(ii=0; ii<db->nDb; ii++){
+          rc = sqlite3BtreeSavepoint(db->aDb[ii].pBt, p1, iSavepoint);
           if( rc!=SQLITE_OK ){
             goto abort_due_to_error;
           }
         }
-        if( u.as.p1==SAVEPOINT_ROLLBACK && (db->flags&SQLITE_InternChanges)!=0 ){
+        if( p1==SAVEPOINT_ROLLBACK && (db->flags&SQLITE_InternChanges)!=0 ){
           sqlite3ExpirePreparedStatements(db);
           sqlite3ResetAllSchemasOfConnection(db);
           db->flags = (db->flags | SQLITE_InternChanges);
         }
       }
-
-      /* Regardless of whether this is a RELEASE or ROLLBACK, destroy all
+  
+      /* Regardless of whether this is a RELEASE or ROLLBACK, destroy all 
       ** savepoints nested inside of the savepoint being operated on. */
-      while( db->pSavepoint!=u.as.pSavepoint ){
-        u.as.pTmp = db->pSavepoint;
-        db->pSavepoint = u.as.pTmp->pNext;
-        sqlite3DbFree(db, u.as.pTmp);
+      while( db->pSavepoint!=pSavepoint ){
+        pTmp = db->pSavepoint;
+        db->pSavepoint = pTmp->pNext;
+        sqlite3DbFree(db, pTmp);
         db->nSavepoint--;
       }
 
-      /* If it is a RELEASE, then destroy the savepoint being operated on
-      ** too. If it is a ROLLBACK TO, then set the number of deferred
+      /* If it is a RELEASE, then destroy the savepoint being operated on 
+      ** too. If it is a ROLLBACK TO, then set the number of deferred 
       ** constraint violations present in the database to the value stored
       ** when the savepoint was created.  */
-      if( u.as.p1==SAVEPOINT_RELEASE ){
-        assert( u.as.pSavepoint==db->pSavepoint );
-        db->pSavepoint = u.as.pSavepoint->pNext;
-        sqlite3DbFree(db, u.as.pSavepoint);
+      if( p1==SAVEPOINT_RELEASE ){
+        assert( pSavepoint==db->pSavepoint );
+        db->pSavepoint = pSavepoint->pNext;
+        sqlite3DbFree(db, pSavepoint);
         if( !isTransaction ){
           db->nSavepoint--;
         }
       }else{
-        db->nDeferredCons = u.as.pSavepoint->nDeferredCons;
+        db->nDeferredCons = pSavepoint->nDeferredCons;
+        db->nDeferredImmCons = pSavepoint->nDeferredImmCons;
       }
 
       if( !isTransaction ){
-        rc = sqlite3VtabSavepoint(db, u.as.p1, u.as.iSavepoint);
+        rc = sqlite3VtabSavepoint(db, p1, iSavepoint);
         if( rc!=SQLITE_OK ) goto abort_due_to_error;
       }
     }
@@ -68189,49 +70416,48 @@ case OP_Savepoint: {
 ** This instruction causes the VM to halt.
 */
 case OP_AutoCommit: {
-#if 0  /* local variables moved into u.at */
   int desiredAutoCommit;
   int iRollback;
   int turnOnAC;
-#endif /* local variables moved into u.at */
 
-  u.at.desiredAutoCommit = pOp->p1;
-  u.at.iRollback = pOp->p2;
-  u.at.turnOnAC = u.at.desiredAutoCommit && !db->autoCommit;
-  assert( u.at.desiredAutoCommit==1 || u.at.desiredAutoCommit==0 );
-  assert( u.at.desiredAutoCommit==1 || u.at.iRollback==0 );
-  assert( db->activeVdbeCnt>0 );  /* At least this one VM is active */
+  desiredAutoCommit = pOp->p1;
+  iRollback = pOp->p2;
+  turnOnAC = desiredAutoCommit && !db->autoCommit;
+  assert( desiredAutoCommit==1 || desiredAutoCommit==0 );
+  assert( desiredAutoCommit==1 || iRollback==0 );
+  assert( db->nVdbeActive>0 );  /* At least this one VM is active */
+  assert( p->bIsReader );
 
 #if 0
-  if( u.at.turnOnAC && u.at.iRollback && db->activeVdbeCnt>1 ){
+  if( turnOnAC && iRollback && db->nVdbeActive>1 ){
     /* If this instruction implements a ROLLBACK and other VMs are
     ** still running, and a transaction is active, return an error indicating
-    ** that the other VMs must complete first.
+    ** that the other VMs must complete first. 
     */
     sqlite3SetString(&p->zErrMsg, db, "cannot rollback transaction - "
         "SQL statements in progress");
     rc = SQLITE_BUSY;
   }else
 #endif
-  if( u.at.turnOnAC && !u.at.iRollback && db->writeVdbeCnt>0 ){
+  if( turnOnAC && !iRollback && db->nVdbeWrite>0 ){
     /* If this instruction implements a COMMIT and other VMs are writing
-    ** return an error indicating that the other VMs must complete first.
+    ** return an error indicating that the other VMs must complete first. 
     */
     sqlite3SetString(&p->zErrMsg, db, "cannot commit transaction - "
         "SQL statements in progress");
     rc = SQLITE_BUSY;
-  }else if( u.at.desiredAutoCommit!=db->autoCommit ){
-    if( u.at.iRollback ){
-      assert( u.at.desiredAutoCommit==1 );
+  }else if( desiredAutoCommit!=db->autoCommit ){
+    if( iRollback ){
+      assert( desiredAutoCommit==1 );
       sqlite3RollbackAll(db, SQLITE_ABORT_ROLLBACK);
       db->autoCommit = 1;
     }else if( (rc = sqlite3VdbeCheckFk(p, 1))!=SQLITE_OK ){
       goto vdbe_return;
     }else{
-      db->autoCommit = (u8)u.at.desiredAutoCommit;
+      db->autoCommit = (u8)desiredAutoCommit;
       if( sqlite3VdbeHalt(p)==SQLITE_BUSY ){
         p->pc = pc;
-        db->autoCommit = (u8)(1-u.at.desiredAutoCommit);
+        db->autoCommit = (u8)(1-desiredAutoCommit);
         p->rc = rc = SQLITE_BUSY;
         goto vdbe_return;
       }
@@ -68246,34 +70472,28 @@ case OP_AutoCommit: {
     goto vdbe_return;
   }else{
     sqlite3SetString(&p->zErrMsg, db,
-        (!u.at.desiredAutoCommit)?"cannot start a transaction within a transaction":(
-        (u.at.iRollback)?"cannot rollback - no transaction is active":
+        (!desiredAutoCommit)?"cannot start a transaction within a transaction":(
+        (iRollback)?"cannot rollback - no transaction is active":
                    "cannot commit - no transaction is active"));
-
+         
     rc = SQLITE_ERROR;
   }
   break;
 }
 
-/* Opcode: Transaction P1 P2 * * *
+/* Opcode: Transaction P1 P2 P3 P4 P5
 **
-** Begin a transaction.  The transaction ends when a Commit or Rollback
-** opcode is encountered.  Depending on the ON CONFLICT setting, the
-** transaction might also be rolled back if an error is encountered.
+** Begin a transaction on database P1 if a transaction is not already
+** active.
+** If P2 is non-zero, then a write-transaction is started, or if a 
+** read-transaction is already active, it is upgraded to a write-transaction.
+** If P2 is zero, then a read-transaction is started.
 **
 ** P1 is the index of the database file on which the transaction is
 ** started.  Index 0 is the main database file and index 1 is the
 ** file used for temporary tables.  Indices of 2 or more are used for
 ** attached databases.
 **
-** If P2 is non-zero, then a write-transaction is started.  A RESERVED lock is
-** obtained on the database file when a write-transaction is started.  No
-** other process can start another write transaction while this transaction is
-** underway.  Starting a write transaction also creates a rollback journal. A
-** write transaction must be started before any changes can be made to the
-** database.  If P2 is 2 or greater then an EXCLUSIVE lock is also obtained
-** on the file.
-**
 ** If a write-transaction is started and the Vdbe.usesStmtJournal flag is
 ** true (this flag is set if the Vdbe may modify more than one row and may
 ** throw an ABORT exception), a statement transaction may also be opened.
@@ -68284,19 +70504,34 @@ case OP_AutoCommit: {
 ** entire transaction. If no error is encountered, the statement transaction
 ** will automatically commit when the VDBE halts.
 **
-** If P2 is zero, then a read-lock is obtained on the database file.
+** If P5!=0 then this opcode also checks the schema cookie against P3
+** and the schema generation counter against P4.
+** The cookie changes its value whenever the database schema changes.
+** This operation is used to detect when that the cookie has changed
+** and that the current process needs to reread the schema.  If the schema
+** cookie in P3 differs from the schema cookie in the database header or
+** if the schema generation counter in P4 differs from the current
+** generation counter, then an SQLITE_SCHEMA error is raised and execution
+** halts.  The sqlite3_step() wrapper function might then reprepare the
+** statement and rerun it from the beginning.
 */
 case OP_Transaction: {
-#if 0  /* local variables moved into u.au */
   Btree *pBt;
-#endif /* local variables moved into u.au */
+  int iMeta;
+  int iGen;
 
+  assert( p->bIsReader );
+  assert( p->readOnly==0 || pOp->p2==0 );
   assert( pOp->p1>=0 && pOp->p1<db->nDb );
   assert( (p->btreeMask & (((yDbMask)1)<<pOp->p1))!=0 );
-  u.au.pBt = db->aDb[pOp->p1].pBt;
+  if( pOp->p2 && (db->flags & SQLITE_QueryOnly)!=0 ){
+    rc = SQLITE_READONLY;
+    goto abort_due_to_error;
+  }
+  pBt = db->aDb[pOp->p1].pBt;
 
-  if( u.au.pBt ){
-    rc = sqlite3BtreeBeginTrans(u.au.pBt, pOp->p2);
+  if( pBt ){
+    rc = sqlite3BtreeBeginTrans(pBt, pOp->p2);
     if( rc==SQLITE_BUSY ){
       p->pc = pc;
       p->rc = rc = SQLITE_BUSY;
@@ -68306,26 +70541,56 @@ case OP_Transaction: {
       goto abort_due_to_error;
     }
 
-    if( pOp->p2 && p->usesStmtJournal
-     && (db->autoCommit==0 || db->activeVdbeCnt>1)
+    if( pOp->p2 && p->usesStmtJournal 
+     && (db->autoCommit==0 || db->nVdbeRead>1) 
     ){
-      assert( sqlite3BtreeIsInTrans(u.au.pBt) );
+      assert( sqlite3BtreeIsInTrans(pBt) );
       if( p->iStatement==0 ){
         assert( db->nStatement>=0 && db->nSavepoint>=0 );
-        db->nStatement++;
+        db->nStatement++; 
         p->iStatement = db->nSavepoint + db->nStatement;
       }
 
       rc = sqlite3VtabSavepoint(db, SAVEPOINT_BEGIN, p->iStatement-1);
       if( rc==SQLITE_OK ){
-        rc = sqlite3BtreeBeginStmt(u.au.pBt, p->iStatement);
+        rc = sqlite3BtreeBeginStmt(pBt, p->iStatement);
       }
 
       /* Store the current value of the database handles deferred constraint
       ** counter. If the statement transaction needs to be rolled back,
       ** the value of this counter needs to be restored too.  */
       p->nStmtDefCons = db->nDeferredCons;
+      p->nStmtDefImmCons = db->nDeferredImmCons;
     }
+
+    /* Gather the schema version number for checking */
+    sqlite3BtreeGetMeta(pBt, BTREE_SCHEMA_VERSION, (u32 *)&iMeta);
+    iGen = db->aDb[pOp->p1].pSchema->iGeneration;
+  }else{
+    iGen = iMeta = 0;
+  }
+  assert( pOp->p5==0 || pOp->p4type==P4_INT32 );
+  if( pOp->p5 && (iMeta!=pOp->p3 || iGen!=pOp->p4.i) ){
+    sqlite3DbFree(db, p->zErrMsg);
+    p->zErrMsg = sqlite3DbStrDup(db, "database schema has changed");
+    /* If the schema-cookie from the database file matches the cookie 
+    ** stored with the in-memory representation of the schema, do
+    ** not reload the schema from the database file.
+    **
+    ** If virtual-tables are in use, this is not just an optimization.
+    ** Often, v-tables store their data in other SQLite tables, which
+    ** are queried from within xNext() and other v-table methods using
+    ** prepared queries. If such a query is out-of-date, we do not want to
+    ** discard the database schema, as the user code implementing the
+    ** v-table would have to be ready for the sqlite3_vtab structure itself
+    ** to be invalidated whenever sqlite3_step() is called from within 
+    ** a v-table method.
+    */
+    if( db->aDb[pOp->p1].pSchema->schema_cookie!=iMeta ){
+      sqlite3ResetOneSchema(db, pOp->p1);
+    }
+    p->expired = 1;
+    rc = SQLITE_SCHEMA;
   }
   break;
 }
@@ -68343,21 +70608,20 @@ case OP_Transaction: {
 ** executing this instruction.
 */
 case OP_ReadCookie: {               /* out2-prerelease */
-#if 0  /* local variables moved into u.av */
   int iMeta;
   int iDb;
   int iCookie;
-#endif /* local variables moved into u.av */
 
-  u.av.iDb = pOp->p1;
-  u.av.iCookie = pOp->p3;
+  assert( p->bIsReader );
+  iDb = pOp->p1;
+  iCookie = pOp->p3;
   assert( pOp->p3<SQLITE_N_BTREE_META );
-  assert( u.av.iDb>=0 && u.av.iDb<db->nDb );
-  assert( db->aDb[u.av.iDb].pBt!=0 );
-  assert( (p->btreeMask & (((yDbMask)1)<<u.av.iDb))!=0 );
+  assert( iDb>=0 && iDb<db->nDb );
+  assert( db->aDb[iDb].pBt!=0 );
+  assert( (p->btreeMask & (((yDbMask)1)<<iDb))!=0 );
 
-  sqlite3BtreeGetMeta(db->aDb[u.av.iDb].pBt, u.av.iCookie, (u32 *)&u.av.iMeta);
-  pOut->u.i = u.av.iMeta;
+  sqlite3BtreeGetMeta(db->aDb[iDb].pBt, iCookie, (u32 *)&iMeta);
+  pOut->u.i = iMeta;
   break;
 }
 
@@ -68372,26 +70636,25 @@ case OP_ReadCookie: {               /* out2-prerelease */
 ** A transaction must be started before executing this opcode.
 */
 case OP_SetCookie: {       /* in3 */
-#if 0  /* local variables moved into u.aw */
   Db *pDb;
-#endif /* local variables moved into u.aw */
   assert( pOp->p2<SQLITE_N_BTREE_META );
   assert( pOp->p1>=0 && pOp->p1<db->nDb );
   assert( (p->btreeMask & (((yDbMask)1)<<pOp->p1))!=0 );
-  u.aw.pDb = &db->aDb[pOp->p1];
-  assert( u.aw.pDb->pBt!=0 );
+  assert( p->readOnly==0 );
+  pDb = &db->aDb[pOp->p1];
+  assert( pDb->pBt!=0 );
   assert( sqlite3SchemaMutexHeld(db, pOp->p1, 0) );
   pIn3 = &aMem[pOp->p3];
   sqlite3VdbeMemIntegerify(pIn3);
   /* See note about index shifting on OP_ReadCookie */
-  rc = sqlite3BtreeUpdateMeta(u.aw.pDb->pBt, pOp->p2, (int)pIn3->u.i);
+  rc = sqlite3BtreeUpdateMeta(pDb->pBt, pOp->p2, (int)pIn3->u.i);
   if( pOp->p2==BTREE_SCHEMA_VERSION ){
     /* When the schema cookie changes, record the new cookie internally */
-    u.aw.pDb->pSchema->schema_cookie = (int)pIn3->u.i;
+    pDb->pSchema->schema_cookie = (int)pIn3->u.i;
     db->flags |= SQLITE_InternChanges;
   }else if( pOp->p2==BTREE_FILE_FORMAT ){
     /* Record changes in the file format */
-    u.aw.pDb->pSchema->file_format = (u8)pIn3->u.i;
+    pDb->pSchema->file_format = (u8)pIn3->u.i;
   }
   if( pOp->p1==1 ){
     /* Invalidate all prepared statements whenever the TEMP database
@@ -68402,68 +70665,8 @@ case OP_SetCookie: {       /* in3 */
   break;
 }
 
-/* Opcode: VerifyCookie P1 P2 P3 * *
-**
-** Check the value of global database parameter number 0 (the
-** schema version) and make sure it is equal to P2 and that the
-** generation counter on the local schema parse equals P3.
-**
-** P1 is the database number which is 0 for the main database file
-** and 1 for the file holding temporary tables and some higher number
-** for auxiliary databases.
-**
-** The cookie changes its value whenever the database schema changes.
-** This operation is used to detect when that the cookie has changed
-** and that the current process needs to reread the schema.
-**
-** Either a transaction needs to have been started or an OP_Open needs
-** to be executed (to establish a read lock) before this opcode is
-** invoked.
-*/
-case OP_VerifyCookie: {
-#if 0  /* local variables moved into u.ax */
-  int iMeta;
-  int iGen;
-  Btree *pBt;
-#endif /* local variables moved into u.ax */
-
-  assert( pOp->p1>=0 && pOp->p1<db->nDb );
-  assert( (p->btreeMask & (((yDbMask)1)<<pOp->p1))!=0 );
-  assert( sqlite3SchemaMutexHeld(db, pOp->p1, 0) );
-  u.ax.pBt = db->aDb[pOp->p1].pBt;
-  if( u.ax.pBt ){
-    sqlite3BtreeGetMeta(u.ax.pBt, BTREE_SCHEMA_VERSION, (u32 *)&u.ax.iMeta);
-    u.ax.iGen = db->aDb[pOp->p1].pSchema->iGeneration;
-  }else{
-    u.ax.iGen = u.ax.iMeta = 0;
-  }
-  if( u.ax.iMeta!=pOp->p2 || u.ax.iGen!=pOp->p3 ){
-    sqlite3DbFree(db, p->zErrMsg);
-    p->zErrMsg = sqlite3DbStrDup(db, "database schema has changed");
-    /* If the schema-cookie from the database file matches the cookie
-    ** stored with the in-memory representation of the schema, do
-    ** not reload the schema from the database file.
-    **
-    ** If virtual-tables are in use, this is not just an optimization.
-    ** Often, v-tables store their data in other SQLite tables, which
-    ** are queried from within xNext() and other v-table methods using
-    ** prepared queries. If such a query is out-of-date, we do not want to
-    ** discard the database schema, as the user code implementing the
-    ** v-table would have to be ready for the sqlite3_vtab structure itself
-    ** to be invalidated whenever sqlite3_step() is called from within
-    ** a v-table method.
-    */
-    if( db->aDb[pOp->p1].pSchema->schema_cookie!=u.ax.iMeta ){
-      sqlite3ResetOneSchema(db, pOp->p1);
-    }
-
-    p->expired = 1;
-    rc = SQLITE_SCHEMA;
-  }
-  break;
-}
-
 /* Opcode: OpenRead P1 P2 P3 P4 P5
+** Synopsis: root=P2 iDb=P3
 **
 ** Open a read-only cursor for the database table whose root page is
 ** P2 in a database file.  The database file is determined by P3. 
@@ -68494,6 +70697,7 @@ case OP_VerifyCookie: {
 ** See also OpenWrite.
 */
 /* Opcode: OpenWrite P1 P2 P3 P4 P5
+** Synopsis: root=P2 iDb=P3
 **
 ** Open a read/write cursor named P1 on the table or index whose root
 ** page is P2.  Or if P5!=0 use the content of register P2 to find the
@@ -68514,7 +70718,6 @@ case OP_VerifyCookie: {
 */
 case OP_OpenRead:
 case OP_OpenWrite: {
-#if 0  /* local variables moved into u.ay */
   int nField;
   KeyInfo *pKeyInfo;
   int p2;
@@ -68523,82 +70726,86 @@ case OP_OpenWrite: {
   Btree *pX;
   VdbeCursor *pCur;
   Db *pDb;
-#endif /* local variables moved into u.ay */
 
   assert( (pOp->p5&(OPFLAG_P2ISREG|OPFLAG_BULKCSR))==pOp->p5 );
   assert( pOp->opcode==OP_OpenWrite || pOp->p5==0 );
+  assert( p->bIsReader );
+  assert( pOp->opcode==OP_OpenRead || p->readOnly==0 );
 
   if( p->expired ){
     rc = SQLITE_ABORT;
     break;
   }
 
-  u.ay.nField = 0;
-  u.ay.pKeyInfo = 0;
-  u.ay.p2 = pOp->p2;
-  u.ay.iDb = pOp->p3;
-  assert( u.ay.iDb>=0 && u.ay.iDb<db->nDb );
-  assert( (p->btreeMask & (((yDbMask)1)<<u.ay.iDb))!=0 );
-  u.ay.pDb = &db->aDb[u.ay.iDb];
-  u.ay.pX = u.ay.pDb->pBt;
-  assert( u.ay.pX!=0 );
+  nField = 0;
+  pKeyInfo = 0;
+  p2 = pOp->p2;
+  iDb = pOp->p3;
+  assert( iDb>=0 && iDb<db->nDb );
+  assert( (p->btreeMask & (((yDbMask)1)<<iDb))!=0 );
+  pDb = &db->aDb[iDb];
+  pX = pDb->pBt;
+  assert( pX!=0 );
   if( pOp->opcode==OP_OpenWrite ){
-    u.ay.wrFlag = 1;
-    assert( sqlite3SchemaMutexHeld(db, u.ay.iDb, 0) );
-    if( u.ay.pDb->pSchema->file_format < p->minWriteFileFormat ){
-      p->minWriteFileFormat = u.ay.pDb->pSchema->file_format;
+    wrFlag = 1;
+    assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
+    if( pDb->pSchema->file_format < p->minWriteFileFormat ){
+      p->minWriteFileFormat = pDb->pSchema->file_format;
     }
   }else{
-    u.ay.wrFlag = 0;
+    wrFlag = 0;
   }
   if( pOp->p5 & OPFLAG_P2ISREG ){
-    assert( u.ay.p2>0 );
-    assert( u.ay.p2<=p->nMem );
-    pIn2 = &aMem[u.ay.p2];
+    assert( p2>0 );
+    assert( p2<=(p->nMem-p->nCursor) );
+    pIn2 = &aMem[p2];
     assert( memIsValid(pIn2) );
     assert( (pIn2->flags & MEM_Int)!=0 );
     sqlite3VdbeMemIntegerify(pIn2);
-    u.ay.p2 = (int)pIn2->u.i;
-    /* The u.ay.p2 value always comes from a prior OP_CreateTable opcode and
-    ** that opcode will always set the u.ay.p2 value to 2 or more or else fail.
+    p2 = (int)pIn2->u.i;
+    /* The p2 value always comes from a prior OP_CreateTable opcode and
+    ** that opcode will always set the p2 value to 2 or more or else fail.
     ** If there were a failure, the prepared statement would have halted
     ** before reaching this instruction. */
-    if( NEVER(u.ay.p2<2) ) {
+    if( NEVER(p2<2) ) {
       rc = SQLITE_CORRUPT_BKPT;
       goto abort_due_to_error;
     }
   }
   if( pOp->p4type==P4_KEYINFO ){
-    u.ay.pKeyInfo = pOp->p4.pKeyInfo;
-    u.ay.pKeyInfo->enc = ENC(p->db);
-    u.ay.nField = u.ay.pKeyInfo->nField+1;
+    pKeyInfo = pOp->p4.pKeyInfo;
+    assert( pKeyInfo->enc==ENC(db) );
+    assert( pKeyInfo->db==db );
+    nField = pKeyInfo->nField+pKeyInfo->nXField;
   }else if( pOp->p4type==P4_INT32 ){
-    u.ay.nField = pOp->p4.i;
+    nField = pOp->p4.i;
   }
   assert( pOp->p1>=0 );
-  u.ay.pCur = allocateCursor(p, pOp->p1, u.ay.nField, u.ay.iDb, 1);
-  if( u.ay.pCur==0 ) goto no_mem;
-  u.ay.pCur->nullRow = 1;
-  u.ay.pCur->isOrdered = 1;
-  rc = sqlite3BtreeCursor(u.ay.pX, u.ay.p2, u.ay.wrFlag, u.ay.pKeyInfo, u.ay.pCur->pCursor);
-  u.ay.pCur->pKeyInfo = u.ay.pKeyInfo;
+  assert( nField>=0 );
+  testcase( nField==0 );  /* Table with INTEGER PRIMARY KEY and nothing else */
+  pCur = allocateCursor(p, pOp->p1, nField, iDb, 1);
+  if( pCur==0 ) goto no_mem;
+  pCur->nullRow = 1;
+  pCur->isOrdered = 1;
+  rc = sqlite3BtreeCursor(pX, p2, wrFlag, pKeyInfo, pCur->pCursor);
+  pCur->pKeyInfo = pKeyInfo;
   assert( OPFLAG_BULKCSR==BTREE_BULKLOAD );
-  sqlite3BtreeCursorHints(u.ay.pCur->pCursor, (pOp->p5 & OPFLAG_BULKCSR));
+  sqlite3BtreeCursorHints(pCur->pCursor, (pOp->p5 & OPFLAG_BULKCSR));
 
   /* Since it performs no memory allocation or IO, the only value that
   ** sqlite3BtreeCursor() may return is SQLITE_OK. */
   assert( rc==SQLITE_OK );
 
-  /* Set the VdbeCursor.isTable and isIndex variables. Previous versions of
+  /* Set the VdbeCursor.isTable variable. Previous versions of
   ** SQLite used to check if the root-page flags were sane at this point
   ** and report database corruption if they were not, but this check has
-  ** since moved into the btree layer.  */
-  u.ay.pCur->isTable = pOp->p4type!=P4_KEYINFO;
-  u.ay.pCur->isIndex = !u.ay.pCur->isTable;
+  ** since moved into the btree layer.  */  
+  pCur->isTable = pOp->p4type!=P4_KEYINFO;
   break;
 }
 
 /* Opcode: OpenEphemeral P1 P2 * P4 P5
+** Synopsis: nColumn=P2
 **
 ** Open a new cursor P1 to a transient table.
 ** The cursor is always opened read/write even if 
@@ -68610,18 +70817,13 @@ case OP_OpenWrite: {
 ** if P4 is not 0.  If P4 is not NULL, it points to a KeyInfo structure
 ** that defines the format of keys in the index.
 **
-** This opcode was once called OpenTemp.  But that created
-** confusion because the term "temp table", might refer either
-** to a TEMP table at the SQL level, or to a table opened by
-** this opcode.  Then this opcode was call OpenVirtual.  But
-** that created confusion with the whole virtual-table idea.
-**
 ** The P5 parameter can be a mask of the BTREE_* flags defined
 ** in btree.h.  These flags control aspects of the operation of
 ** the btree.  The BTREE_OMIT_JOURNAL and BTREE_SINGLE flags are
 ** added automatically.
 */
 /* Opcode: OpenAutoindex P1 P2 * P4 *
+** Synopsis: nColumn=P2
 **
 ** This opcode works the same as OP_OpenEphemeral.  It has a
 ** different name to distinguish its use.  Tables created using
@@ -68630,24 +70832,25 @@ case OP_OpenWrite: {
 */
 case OP_OpenAutoindex: 
 case OP_OpenEphemeral: {
-#if 0  /* local variables moved into u.az */
   VdbeCursor *pCx;
-#endif /* local variables moved into u.az */
-  static const int vfsFlags =
+  KeyInfo *pKeyInfo;
+
+  static const int vfsFlags = 
       SQLITE_OPEN_READWRITE |
       SQLITE_OPEN_CREATE |
       SQLITE_OPEN_EXCLUSIVE |
       SQLITE_OPEN_DELETEONCLOSE |
       SQLITE_OPEN_TRANSIENT_DB;
-
   assert( pOp->p1>=0 );
-  u.az.pCx = allocateCursor(p, pOp->p1, pOp->p2, -1, 1);
-  if( u.az.pCx==0 ) goto no_mem;
-  u.az.pCx->nullRow = 1;
-  rc = sqlite3BtreeOpen(db->pVfs, 0, db, &u.az.pCx->pBt,
+  assert( pOp->p2>=0 );
+  pCx = allocateCursor(p, pOp->p1, pOp->p2, -1, 1);
+  if( pCx==0 ) goto no_mem;
+  pCx->nullRow = 1;
+  pCx->isEphemeral = 1;
+  rc = sqlite3BtreeOpen(db->pVfs, 0, db, &pCx->pBt, 
                         BTREE_OMIT_JOURNAL | BTREE_SINGLE | pOp->p5, vfsFlags);
   if( rc==SQLITE_OK ){
-    rc = sqlite3BtreeBeginTrans(u.az.pCx->pBt, 1);
+    rc = sqlite3BtreeBeginTrans(pCx->pBt, 1);
   }
   if( rc==SQLITE_OK ){
     /* If a transient index is required, create it by calling
@@ -68655,25 +70858,24 @@ case OP_OpenEphemeral: {
     ** opening it. If a transient table is required, just use the
     ** automatically created table with root-page 1 (an BLOB_INTKEY table).
     */
-    if( pOp->p4.pKeyInfo ){
+    if( (pKeyInfo = pOp->p4.pKeyInfo)!=0 ){
       int pgno;
       assert( pOp->p4type==P4_KEYINFO );
-      rc = sqlite3BtreeCreateTable(u.az.pCx->pBt, &pgno, BTREE_BLOBKEY | pOp->p5);
+      rc = sqlite3BtreeCreateTable(pCx->pBt, &pgno, BTREE_BLOBKEY | pOp->p5); 
       if( rc==SQLITE_OK ){
         assert( pgno==MASTER_ROOT+1 );
-        rc = sqlite3BtreeCursor(u.az.pCx->pBt, pgno, 1,
-                                (KeyInfo*)pOp->p4.z, u.az.pCx->pCursor);
-        u.az.pCx->pKeyInfo = pOp->p4.pKeyInfo;
-        u.az.pCx->pKeyInfo->enc = ENC(p->db);
+        assert( pKeyInfo->db==db );
+        assert( pKeyInfo->enc==ENC(db) );
+        pCx->pKeyInfo = pKeyInfo;
+        rc = sqlite3BtreeCursor(pCx->pBt, pgno, 1, pKeyInfo, pCx->pCursor);
       }
-      u.az.pCx->isTable = 0;
+      pCx->isTable = 0;
     }else{
-      rc = sqlite3BtreeCursor(u.az.pCx->pBt, MASTER_ROOT, 1, 0, u.az.pCx->pCursor);
-      u.az.pCx->isTable = 1;
+      rc = sqlite3BtreeCursor(pCx->pBt, MASTER_ROOT, 1, 0, pCx->pCursor);
+      pCx->isTable = 1;
     }
   }
-  u.az.pCx->isOrdered = (pOp->p5!=BTREE_UNORDERED);
-  u.az.pCx->isIndex = !u.az.pCx->isTable;
+  pCx->isOrdered = (pOp->p5!=BTREE_UNORDERED);
   break;
 }
 
@@ -68684,26 +70886,26 @@ case OP_OpenEphemeral: {
 ** tables using an external merge-sort algorithm.
 */
 case OP_SorterOpen: {
-#if 0  /* local variables moved into u.ba */
   VdbeCursor *pCx;
-#endif /* local variables moved into u.ba */
 
-  u.ba.pCx = allocateCursor(p, pOp->p1, pOp->p2, -1, 1);
-  if( u.ba.pCx==0 ) goto no_mem;
-  u.ba.pCx->pKeyInfo = pOp->p4.pKeyInfo;
-  u.ba.pCx->pKeyInfo->enc = ENC(p->db);
-  u.ba.pCx->isSorter = 1;
-  rc = sqlite3VdbeSorterInit(db, u.ba.pCx);
+  assert( pOp->p1>=0 );
+  assert( pOp->p2>=0 );
+  pCx = allocateCursor(p, pOp->p1, pOp->p2, -1, 1);
+  if( pCx==0 ) goto no_mem;
+  pCx->pKeyInfo = pOp->p4.pKeyInfo;
+  assert( pCx->pKeyInfo->db==db );
+  assert( pCx->pKeyInfo->enc==ENC(db) );
+  rc = sqlite3VdbeSorterInit(db, pCx);
   break;
 }
 
-/* Opcode: OpenPseudo P1 P2 P3 * P5
+/* Opcode: OpenPseudo P1 P2 P3 * *
+** Synopsis: P3 columns in r[P2]
 **
 ** Open a new cursor that points to a fake table that contains a single
-** row of data.  The content of that one row in the content of memory
-** register P2 when P5==0.  In other words, cursor P1 becomes an alias for the 
-** MEM_Blob content contained in register P2.  When P5==1, then the
-** row is represented by P3 consecutive registers beginning with P2.
+** row of data.  The content of that one row is the content of memory
+** register P2.  In other words, cursor P1 becomes an alias for the 
+** MEM_Blob content contained in register P2.
 **
 ** A pseudo-table created by this opcode is used to hold a single
 ** row output from the sorter so that the row can be decomposed into
@@ -68714,18 +70916,16 @@ case OP_SorterOpen: {
 ** the pseudo-table.
 */
 case OP_OpenPseudo: {
-#if 0  /* local variables moved into u.bb */
   VdbeCursor *pCx;
-#endif /* local variables moved into u.bb */
 
   assert( pOp->p1>=0 );
-  u.bb.pCx = allocateCursor(p, pOp->p1, pOp->p3, -1, 0);
-  if( u.bb.pCx==0 ) goto no_mem;
-  u.bb.pCx->nullRow = 1;
-  u.bb.pCx->pseudoTableReg = pOp->p2;
-  u.bb.pCx->isTable = 1;
-  u.bb.pCx->isIndex = 0;
-  u.bb.pCx->multiPseudo = pOp->p5;
+  assert( pOp->p3>=0 );
+  pCx = allocateCursor(p, pOp->p1, pOp->p3, -1, 0);
+  if( pCx==0 ) goto no_mem;
+  pCx->nullRow = 1;
+  pCx->pseudoTableReg = pOp->p2;
+  pCx->isTable = 1;
+  assert( pOp->p5==0 );
   break;
 }
 
@@ -68742,6 +70942,7 @@ case OP_Close: {
 }
 
 /* Opcode: SeekGe P1 P2 P3 P4 *
+** Synopsis: key=r[P3@P4]
 **
 ** If cursor P1 refers to an SQL table (B-Tree that uses integer keys), 
 ** use the value in register P3 as the key.  If cursor P1 refers 
@@ -68752,9 +70953,10 @@ case OP_Close: {
 ** is greater than or equal to the key value. If there are no records 
 ** greater than or equal to the key and P2 is not zero, then jump to P2.
 **
-** See also: Found, NotFound, Distinct, SeekLt, SeekGt, SeekLe
+** See also: Found, NotFound, SeekLt, SeekGt, SeekLe
 */
 /* Opcode: SeekGt P1 P2 P3 P4 *
+** Synopsis: key=r[P3@P4]
 **
 ** If cursor P1 refers to an SQL table (B-Tree that uses integer keys), 
 ** use the value in register P3 as a key. If cursor P1 refers 
@@ -68765,9 +70967,10 @@ case OP_Close: {
 ** is greater than the key value. If there are no records greater than 
 ** the key and P2 is not zero, then jump to P2.
 **
-** See also: Found, NotFound, Distinct, SeekLt, SeekGe, SeekLe
+** See also: Found, NotFound, SeekLt, SeekGe, SeekLe
 */
 /* Opcode: SeekLt P1 P2 P3 P4 * 
+** Synopsis: key=r[P3@P4]
 **
 ** If cursor P1 refers to an SQL table (B-Tree that uses integer keys), 
 ** use the value in register P3 as a key. If cursor P1 refers 
@@ -68778,9 +70981,10 @@ case OP_Close: {
 ** is less than the key value. If there are no records less than 
 ** the key and P2 is not zero, then jump to P2.
 **
-** See also: Found, NotFound, Distinct, SeekGt, SeekGe, SeekLe
+** See also: Found, NotFound, SeekGt, SeekGe, SeekLe
 */
 /* Opcode: SeekLe P1 P2 P3 P4 *
+** Synopsis: key=r[P3@P4]
 **
 ** If cursor P1 refers to an SQL table (B-Tree that uses integer keys), 
 ** use the value in register P3 as a key. If cursor P1 refers 
@@ -68791,163 +70995,150 @@ case OP_Close: {
 ** is less than or equal to the key value. If there are no records 
 ** less than or equal to the key and P2 is not zero, then jump to P2.
 **
-** See also: Found, NotFound, Distinct, SeekGt, SeekGe, SeekLt
+** See also: Found, NotFound, SeekGt, SeekGe, SeekLt
 */
-case OP_SeekLt:         /* jump, in3 */
-case OP_SeekLe:         /* jump, in3 */
-case OP_SeekGe:         /* jump, in3 */
-case OP_SeekGt: {       /* jump, in3 */
-#if 0  /* local variables moved into u.bc */
+case OP_SeekLT:         /* jump, in3 */
+case OP_SeekLE:         /* jump, in3 */
+case OP_SeekGE:         /* jump, in3 */
+case OP_SeekGT: {       /* jump, in3 */
   int res;
   int oc;
   VdbeCursor *pC;
   UnpackedRecord r;
   int nField;
   i64 iKey;      /* The rowid we are to seek to */
-#endif /* local variables moved into u.bc */
 
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
   assert( pOp->p2!=0 );
-  u.bc.pC = p->apCsr[pOp->p1];
-  assert( u.bc.pC!=0 );
-  assert( u.bc.pC->pseudoTableReg==0 );
-  assert( OP_SeekLe == OP_SeekLt+1 );
-  assert( OP_SeekGe == OP_SeekLt+2 );
-  assert( OP_SeekGt == OP_SeekLt+3 );
-  assert( u.bc.pC->isOrdered );
-  if( ALWAYS(u.bc.pC->pCursor!=0) ){
-    u.bc.oc = pOp->opcode;
-    u.bc.pC->nullRow = 0;
-    if( u.bc.pC->isTable ){
-      /* The input value in P3 might be of any type: integer, real, string,
-      ** blob, or NULL.  But it needs to be an integer before we can do
-      ** the seek, so covert it. */
-      pIn3 = &aMem[pOp->p3];
-      applyNumericAffinity(pIn3);
-      u.bc.iKey = sqlite3VdbeIntValue(pIn3);
-      u.bc.pC->rowidIsValid = 0;
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  assert( pC->pseudoTableReg==0 );
+  assert( OP_SeekLE == OP_SeekLT+1 );
+  assert( OP_SeekGE == OP_SeekLT+2 );
+  assert( OP_SeekGT == OP_SeekLT+3 );
+  assert( pC->isOrdered );
+  assert( pC->pCursor!=0 );
+  oc = pOp->opcode;
+  pC->nullRow = 0;
+  if( pC->isTable ){
+    /* The input value in P3 might be of any type: integer, real, string,
+    ** blob, or NULL.  But it needs to be an integer before we can do
+    ** the seek, so covert it. */
+    pIn3 = &aMem[pOp->p3];
+    applyNumericAffinity(pIn3);
+    iKey = sqlite3VdbeIntValue(pIn3);
+    pC->rowidIsValid = 0;
 
-      /* If the P3 value could not be converted into an integer without
-      ** loss of information, then special processing is required... */
-      if( (pIn3->flags & MEM_Int)==0 ){
-        if( (pIn3->flags & MEM_Real)==0 ){
-          /* If the P3 value cannot be converted into any kind of a number,
-          ** then the seek is not possible, so jump to P2 */
-          pc = pOp->p2 - 1;
-          break;
-        }
-        /* If we reach this point, then the P3 value must be a floating
-        ** point number. */
-        assert( (pIn3->flags & MEM_Real)!=0 );
+    /* If the P3 value could not be converted into an integer without
+    ** loss of information, then special processing is required... */
+    if( (pIn3->flags & MEM_Int)==0 ){
+      if( (pIn3->flags & MEM_Real)==0 ){
+        /* If the P3 value cannot be converted into any kind of a number,
+        ** then the seek is not possible, so jump to P2 */
+        pc = pOp->p2 - 1;  VdbeBranchTaken(1,2);
+        break;
+      }
 
-        if( u.bc.iKey==SMALLEST_INT64 && (pIn3->r<(double)u.bc.iKey || pIn3->r>0) ){
-          /* The P3 value is too large in magnitude to be expressed as an
-          ** integer. */
-          u.bc.res = 1;
-          if( pIn3->r<0 ){
-            if( u.bc.oc>=OP_SeekGe ){  assert( u.bc.oc==OP_SeekGe || u.bc.oc==OP_SeekGt );
-              rc = sqlite3BtreeFirst(u.bc.pC->pCursor, &u.bc.res);
-              if( rc!=SQLITE_OK ) goto abort_due_to_error;
-            }
-          }else{
-            if( u.bc.oc<=OP_SeekLe ){  assert( u.bc.oc==OP_SeekLt || u.bc.oc==OP_SeekLe );
-              rc = sqlite3BtreeLast(u.bc.pC->pCursor, &u.bc.res);
-              if( rc!=SQLITE_OK ) goto abort_due_to_error;
-            }
-          }
-          if( u.bc.res ){
-            pc = pOp->p2 - 1;
-          }
-          break;
-        }else if( u.bc.oc==OP_SeekLt || u.bc.oc==OP_SeekGe ){
-          /* Use the ceiling() function to convert real->int */
-          if( pIn3->r > (double)u.bc.iKey ) u.bc.iKey++;
-        }else{
-          /* Use the floor() function to convert real->int */
-          assert( u.bc.oc==OP_SeekLe || u.bc.oc==OP_SeekGt );
-          if( pIn3->r < (double)u.bc.iKey ) u.bc.iKey--;
-        }
-      }
-      rc = sqlite3BtreeMovetoUnpacked(u.bc.pC->pCursor, 0, (u64)u.bc.iKey, 0, &u.bc.res);
-      if( rc!=SQLITE_OK ){
-        goto abort_due_to_error;
-      }
-      if( u.bc.res==0 ){
-        u.bc.pC->rowidIsValid = 1;
-        u.bc.pC->lastRowid = u.bc.iKey;
-      }
-    }else{
-      u.bc.nField = pOp->p4.i;
-      assert( pOp->p4type==P4_INT32 );
-      assert( u.bc.nField>0 );
-      u.bc.r.pKeyInfo = u.bc.pC->pKeyInfo;
-      u.bc.r.nField = (u16)u.bc.nField;
-
-      /* The next line of code computes as follows, only faster:
-      **   if( u.bc.oc==OP_SeekGt || u.bc.oc==OP_SeekLe ){
-      **     u.bc.r.flags = UNPACKED_INCRKEY;
-      **   }else{
-      **     u.bc.r.flags = 0;
-      **   }
+      /* If the approximation iKey is larger than the actual real search
+      ** term, substitute >= for > and < for <=. e.g. if the search term
+      ** is 4.9 and the integer approximation 5:
+      **
+      **        (x >  4.9)    ->     (x >= 5)
+      **        (x <= 4.9)    ->     (x <  5)
       */
-      u.bc.r.flags = (u8)(UNPACKED_INCRKEY * (1 & (u.bc.oc - OP_SeekLt)));
-      assert( u.bc.oc!=OP_SeekGt || u.bc.r.flags==UNPACKED_INCRKEY );
-      assert( u.bc.oc!=OP_SeekLe || u.bc.r.flags==UNPACKED_INCRKEY );
-      assert( u.bc.oc!=OP_SeekGe || u.bc.r.flags==0 );
-      assert( u.bc.oc!=OP_SeekLt || u.bc.r.flags==0 );
+      if( pIn3->r<(double)iKey ){
+        assert( OP_SeekGE==(OP_SeekGT-1) );
+        assert( OP_SeekLT==(OP_SeekLE-1) );
+        assert( (OP_SeekLE & 0x0001)==(OP_SeekGT & 0x0001) );
+        if( (oc & 0x0001)==(OP_SeekGT & 0x0001) ) oc--;
+      }
 
-      u.bc.r.aMem = &aMem[pOp->p3];
-#ifdef SQLITE_DEBUG
-      { int i; for(i=0; i<u.bc.r.nField; i++) assert( memIsValid(&u.bc.r.aMem[i]) ); }
-#endif
-      ExpandBlob(u.bc.r.aMem);
-      rc = sqlite3BtreeMovetoUnpacked(u.bc.pC->pCursor, &u.bc.r, 0, 0, &u.bc.res);
-      if( rc!=SQLITE_OK ){
-        goto abort_due_to_error;
+      /* If the approximation iKey is smaller than the actual real search
+      ** term, substitute <= for < and > for >=.  */
+      else if( pIn3->r>(double)iKey ){
+        assert( OP_SeekLE==(OP_SeekLT+1) );
+        assert( OP_SeekGT==(OP_SeekGE+1) );
+        assert( (OP_SeekLT & 0x0001)==(OP_SeekGE & 0x0001) );
+        if( (oc & 0x0001)==(OP_SeekLT & 0x0001) ) oc++;
       }
-      u.bc.pC->rowidIsValid = 0;
+    } 
+    rc = sqlite3BtreeMovetoUnpacked(pC->pCursor, 0, (u64)iKey, 0, &res);
+    if( rc!=SQLITE_OK ){
+      goto abort_due_to_error;
     }
-    u.bc.pC->deferredMoveto = 0;
-    u.bc.pC->cacheStatus = CACHE_STALE;
-#ifdef SQLITE_TEST
-    sqlite3_search_count++;
-#endif
-    if( u.bc.oc>=OP_SeekGe ){  assert( u.bc.oc==OP_SeekGe || u.bc.oc==OP_SeekGt );
-      if( u.bc.res<0 || (u.bc.res==0 && u.bc.oc==OP_SeekGt) ){
-        rc = sqlite3BtreeNext(u.bc.pC->pCursor, &u.bc.res);
-        if( rc!=SQLITE_OK ) goto abort_due_to_error;
-        u.bc.pC->rowidIsValid = 0;
-      }else{
-        u.bc.res = 0;
-      }
-    }else{
-      assert( u.bc.oc==OP_SeekLt || u.bc.oc==OP_SeekLe );
-      if( u.bc.res>0 || (u.bc.res==0 && u.bc.oc==OP_SeekLt) ){
-        rc = sqlite3BtreePrevious(u.bc.pC->pCursor, &u.bc.res);
-        if( rc!=SQLITE_OK ) goto abort_due_to_error;
-        u.bc.pC->rowidIsValid = 0;
-      }else{
-        /* u.bc.res might be negative because the table is empty.  Check to
-        ** see if this is the case.
-        */
-        u.bc.res = sqlite3BtreeEof(u.bc.pC->pCursor);
-      }
-    }
-    assert( pOp->p2>0 );
-    if( u.bc.res ){
-      pc = pOp->p2 - 1;
+    if( res==0 ){
+      pC->rowidIsValid = 1;
+      pC->lastRowid = iKey;
     }
   }else{
-    /* This happens when attempting to open the sqlite3_master table
-    ** for read access returns SQLITE_EMPTY. In this case always
-    ** take the jump (since there are no records in the table).
+    nField = pOp->p4.i;
+    assert( pOp->p4type==P4_INT32 );
+    assert( nField>0 );
+    r.pKeyInfo = pC->pKeyInfo;
+    r.nField = (u16)nField;
+
+    /* The next line of code computes as follows, only faster:
+    **   if( oc==OP_SeekGT || oc==OP_SeekLE ){
+    **     r.default_rc = -1;
+    **   }else{
+    **     r.default_rc = +1;
+    **   }
     */
+    r.default_rc = ((1 & (oc - OP_SeekLT)) ? -1 : +1);
+    assert( oc!=OP_SeekGT || r.default_rc==-1 );
+    assert( oc!=OP_SeekLE || r.default_rc==-1 );
+    assert( oc!=OP_SeekGE || r.default_rc==+1 );
+    assert( oc!=OP_SeekLT || r.default_rc==+1 );
+
+    r.aMem = &aMem[pOp->p3];
+#ifdef SQLITE_DEBUG
+    { int i; for(i=0; i<r.nField; i++) assert( memIsValid(&r.aMem[i]) ); }
+#endif
+    ExpandBlob(r.aMem);
+    rc = sqlite3BtreeMovetoUnpacked(pC->pCursor, &r, 0, 0, &res);
+    if( rc!=SQLITE_OK ){
+      goto abort_due_to_error;
+    }
+    pC->rowidIsValid = 0;
+  }
+  pC->deferredMoveto = 0;
+  pC->cacheStatus = CACHE_STALE;
+#ifdef SQLITE_TEST
+  sqlite3_search_count++;
+#endif
+  if( oc>=OP_SeekGE ){  assert( oc==OP_SeekGE || oc==OP_SeekGT );
+    if( res<0 || (res==0 && oc==OP_SeekGT) ){
+      res = 0;
+      rc = sqlite3BtreeNext(pC->pCursor, &res);
+      if( rc!=SQLITE_OK ) goto abort_due_to_error;
+      pC->rowidIsValid = 0;
+    }else{
+      res = 0;
+    }
+  }else{
+    assert( oc==OP_SeekLT || oc==OP_SeekLE );
+    if( res>0 || (res==0 && oc==OP_SeekLT) ){
+      res = 0;
+      rc = sqlite3BtreePrevious(pC->pCursor, &res);
+      if( rc!=SQLITE_OK ) goto abort_due_to_error;
+      pC->rowidIsValid = 0;
+    }else{
+      /* res might be negative because the table is empty.  Check to
+      ** see if this is the case.
+      */
+      res = sqlite3BtreeEof(pC->pCursor);
+    }
+  }
+  assert( pOp->p2>0 );
+  VdbeBranchTaken(res!=0,2);
+  if( res ){
     pc = pOp->p2 - 1;
   }
   break;
 }
 
 /* Opcode: Seek P1 P2 * * *
+** Synopsis:  intkey=r[P2]
 **
 ** P1 is an open table cursor and P2 is a rowid integer.  Arrange
 ** for P1 to move so that it points to the rowid given by P2.
@@ -68957,26 +71148,24 @@ case OP_SeekGt: {       /* jump, in3 */
 ** occur, no unnecessary I/O happens.
 */
 case OP_Seek: {    /* in2 */
-#if 0  /* local variables moved into u.bd */
   VdbeCursor *pC;
-#endif /* local variables moved into u.bd */
 
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  u.bd.pC = p->apCsr[pOp->p1];
-  assert( u.bd.pC!=0 );
-  if( ALWAYS(u.bd.pC->pCursor!=0) ){
-    assert( u.bd.pC->isTable );
-    u.bd.pC->nullRow = 0;
-    pIn2 = &aMem[pOp->p2];
-    u.bd.pC->movetoTarget = sqlite3VdbeIntValue(pIn2);
-    u.bd.pC->rowidIsValid = 0;
-    u.bd.pC->deferredMoveto = 1;
-  }
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  assert( pC->pCursor!=0 );
+  assert( pC->isTable );
+  pC->nullRow = 0;
+  pIn2 = &aMem[pOp->p2];
+  pC->movetoTarget = sqlite3VdbeIntValue(pIn2);
+  pC->rowidIsValid = 0;
+  pC->deferredMoveto = 1;
   break;
 }
   
 
 /* Opcode: Found P1 P2 P3 P4 *
+** Synopsis: key=r[P3@P4]
 **
 ** If P4==0 then register P3 holds a blob constructed by MakeRecord.  If
 ** P4>0 then register P3 is the first of P4 registers that form an unpacked
@@ -68985,8 +71174,11 @@ case OP_Seek: {    /* in2 */
 ** Cursor P1 is on an index btree.  If the record identified by P3 and P4
 ** is a prefix of any entry in P1 then a jump is made to P2 and
 ** P1 is left pointing at the matching entry.
+**
+** See also: NotFound, NoConflict, NotExists. SeekGe
 */
 /* Opcode: NotFound P1 P2 P3 P4 *
+** Synopsis: key=r[P3@P4]
 **
 ** If P4==0 then register P3 holds a blob constructed by MakeRecord.  If
 ** P4>0 then register P3 is the first of P4 registers that form an unpacked
@@ -68998,216 +71190,154 @@ case OP_Seek: {    /* in2 */
 ** falls through to the next instruction and P1 is left pointing at the
 ** matching entry.
 **
-** See also: Found, NotExists, IsUnique
+** See also: Found, NotExists, NoConflict
 */
+/* Opcode: NoConflict P1 P2 P3 P4 *
+** Synopsis: key=r[P3@P4]
+**
+** If P4==0 then register P3 holds a blob constructed by MakeRecord.  If
+** P4>0 then register P3 is the first of P4 registers that form an unpacked
+** record.
+** 
+** Cursor P1 is on an index btree.  If the record identified by P3 and P4
+** contains any NULL value, jump immediately to P2.  If all terms of the
+** record are not-NULL then a check is done to determine if any row in the
+** P1 index btree has a matching key prefix.  If there are no matches, jump
+** immediately to P2.  If there is a match, fall through and leave the P1
+** cursor pointing to the matching row.
+**
+** This opcode is similar to OP_NotFound with the exceptions that the
+** branch is always taken if any part of the search key input is NULL.
+**
+** See also: NotFound, Found, NotExists
+*/
+case OP_NoConflict:     /* jump, in3 */
 case OP_NotFound:       /* jump, in3 */
 case OP_Found: {        /* jump, in3 */
-#if 0  /* local variables moved into u.be */
   int alreadyExists;
+  int ii;
   VdbeCursor *pC;
   int res;
   char *pFree;
   UnpackedRecord *pIdxKey;
   UnpackedRecord r;
-  char aTempRec[ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*3 + 7];
-#endif /* local variables moved into u.be */
+  char aTempRec[ROUND8(sizeof(UnpackedRecord)) + sizeof(Mem)*4 + 7];
 
 #ifdef SQLITE_TEST
-  sqlite3_found_count++;
+  if( pOp->opcode!=OP_NoConflict ) sqlite3_found_count++;
 #endif
 
-  u.be.alreadyExists = 0;
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
   assert( pOp->p4type==P4_INT32 );
-  u.be.pC = p->apCsr[pOp->p1];
-  assert( u.be.pC!=0 );
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
   pIn3 = &aMem[pOp->p3];
-  if( ALWAYS(u.be.pC->pCursor!=0) ){
-
-    assert( u.be.pC->isTable==0 );
-    if( pOp->p4.i>0 ){
-      u.be.r.pKeyInfo = u.be.pC->pKeyInfo;
-      u.be.r.nField = (u16)pOp->p4.i;
-      u.be.r.aMem = pIn3;
+  assert( pC->pCursor!=0 );
+  assert( pC->isTable==0 );
+  pFree = 0;  /* Not needed.  Only used to suppress a compiler warning. */
+  if( pOp->p4.i>0 ){
+    r.pKeyInfo = pC->pKeyInfo;
+    r.nField = (u16)pOp->p4.i;
+    r.aMem = pIn3;
+    for(ii=0; ii<r.nField; ii++){
+      assert( memIsValid(&r.aMem[ii]) );
+      ExpandBlob(&r.aMem[ii]);
 #ifdef SQLITE_DEBUG
-      { int i; for(i=0; i<u.be.r.nField; i++) assert( memIsValid(&u.be.r.aMem[i]) ); }
+      if( ii ) REGISTER_TRACE(pOp->p3+ii, &r.aMem[ii]);
 #endif
-      u.be.r.flags = UNPACKED_PREFIX_MATCH;
-      u.be.pIdxKey = &u.be.r;
-    }else{
-      u.be.pIdxKey = sqlite3VdbeAllocUnpackedRecord(
-          u.be.pC->pKeyInfo, u.be.aTempRec, sizeof(u.be.aTempRec), &u.be.pFree
-      );
-      if( u.be.pIdxKey==0 ) goto no_mem;
-      assert( pIn3->flags & MEM_Blob );
-      assert( (pIn3->flags & MEM_Zero)==0 );  /* zeroblobs already expanded */
-      sqlite3VdbeRecordUnpack(u.be.pC->pKeyInfo, pIn3->n, pIn3->z, u.be.pIdxKey);
-      u.be.pIdxKey->flags |= UNPACKED_PREFIX_MATCH;
     }
-    rc = sqlite3BtreeMovetoUnpacked(u.be.pC->pCursor, u.be.pIdxKey, 0, 0, &u.be.res);
-    if( pOp->p4.i==0 ){
-      sqlite3DbFree(db, u.be.pFree);
-    }
-    if( rc!=SQLITE_OK ){
-      break;
-    }
-    u.be.alreadyExists = (u.be.res==0);
-    u.be.pC->deferredMoveto = 0;
-    u.be.pC->cacheStatus = CACHE_STALE;
-  }
-  if( pOp->opcode==OP_Found ){
-    if( u.be.alreadyExists ) pc = pOp->p2 - 1;
+    pIdxKey = &r;
   }else{
-    if( !u.be.alreadyExists ) pc = pOp->p2 - 1;
+    pIdxKey = sqlite3VdbeAllocUnpackedRecord(
+        pC->pKeyInfo, aTempRec, sizeof(aTempRec), &pFree
+    ); 
+    if( pIdxKey==0 ) goto no_mem;
+    assert( pIn3->flags & MEM_Blob );
+    assert( (pIn3->flags & MEM_Zero)==0 );  /* zeroblobs already expanded */
+    sqlite3VdbeRecordUnpack(pC->pKeyInfo, pIn3->n, pIn3->z, pIdxKey);
   }
-  break;
-}
-
-/* Opcode: IsUnique P1 P2 P3 P4 *
-**
-** Cursor P1 is open on an index b-tree - that is to say, a btree which
-** no data and where the key are records generated by OP_MakeRecord with
-** the list field being the integer ROWID of the entry that the index
-** entry refers to.
-**
-** The P3 register contains an integer record number. Call this record 
-** number R. Register P4 is the first in a set of N contiguous registers
-** that make up an unpacked index key that can be used with cursor P1.
-** The value of N can be inferred from the cursor. N includes the rowid
-** value appended to the end of the index record. This rowid value may
-** or may not be the same as R.
-**
-** If any of the N registers beginning with register P4 contains a NULL
-** value, jump immediately to P2.
-**
-** Otherwise, this instruction checks if cursor P1 contains an entry
-** where the first (N-1) fields match but the rowid value at the end
-** of the index entry is not R. If there is no such entry, control jumps
-** to instruction P2. Otherwise, the rowid of the conflicting index
-** entry is copied to register P3 and control falls through to the next
-** instruction.
-**
-** See also: NotFound, NotExists, Found
-*/
-case OP_IsUnique: {        /* jump, in3 */
-#if 0  /* local variables moved into u.bf */
-  u16 ii;
-  VdbeCursor *pCx;
-  BtCursor *pCrsr;
-  u16 nField;
-  Mem *aMx;
-  UnpackedRecord r;                  /* B-Tree index search key */
-  i64 R;                             /* Rowid stored in register P3 */
-#endif /* local variables moved into u.bf */
-
-  pIn3 = &aMem[pOp->p3];
-  u.bf.aMx = &aMem[pOp->p4.i];
-  /* Assert that the values of parameters P1 and P4 are in range. */
-  assert( pOp->p4type==P4_INT32 );
-  assert( pOp->p4.i>0 && pOp->p4.i<=p->nMem );
-  assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-
-  /* Find the index cursor. */
-  u.bf.pCx = p->apCsr[pOp->p1];
-  assert( u.bf.pCx->deferredMoveto==0 );
-  u.bf.pCx->seekResult = 0;
-  u.bf.pCx->cacheStatus = CACHE_STALE;
-  u.bf.pCrsr = u.bf.pCx->pCursor;
-
-  /* If any of the values are NULL, take the jump. */
-  u.bf.nField = u.bf.pCx->pKeyInfo->nField;
-  for(u.bf.ii=0; u.bf.ii<u.bf.nField; u.bf.ii++){
-    if( u.bf.aMx[u.bf.ii].flags & MEM_Null ){
-      pc = pOp->p2 - 1;
-      u.bf.pCrsr = 0;
-      break;
+  pIdxKey->default_rc = 0;
+  if( pOp->opcode==OP_NoConflict ){
+    /* For the OP_NoConflict opcode, take the jump if any of the
+    ** input fields are NULL, since any key with a NULL will not
+    ** conflict */
+    for(ii=0; ii<r.nField; ii++){
+      if( r.aMem[ii].flags & MEM_Null ){
+        pc = pOp->p2 - 1; VdbeBranchTaken(1,2);
+        break;
+      }
     }
   }
-  assert( (u.bf.aMx[u.bf.nField].flags & MEM_Null)==0 );
-
-  if( u.bf.pCrsr!=0 ){
-    /* Populate the index search key. */
-    u.bf.r.pKeyInfo = u.bf.pCx->pKeyInfo;
-    u.bf.r.nField = u.bf.nField + 1;
-    u.bf.r.flags = UNPACKED_PREFIX_SEARCH;
-    u.bf.r.aMem = u.bf.aMx;
-#ifdef SQLITE_DEBUG
-    { int i; for(i=0; i<u.bf.r.nField; i++) assert( memIsValid(&u.bf.r.aMem[i]) ); }
-#endif
-
-    /* Extract the value of u.bf.R from register P3. */
-    sqlite3VdbeMemIntegerify(pIn3);
-    u.bf.R = pIn3->u.i;
-
-    /* Search the B-Tree index. If no conflicting record is found, jump
-    ** to P2. Otherwise, copy the rowid of the conflicting record to
-    ** register P3 and fall through to the next instruction.  */
-    rc = sqlite3BtreeMovetoUnpacked(u.bf.pCrsr, &u.bf.r, 0, 0, &u.bf.pCx->seekResult);
-    if( (u.bf.r.flags & UNPACKED_PREFIX_SEARCH) || u.bf.r.rowid==u.bf.R ){
-      pc = pOp->p2 - 1;
-    }else{
-      pIn3->u.i = u.bf.r.rowid;
-    }
+  rc = sqlite3BtreeMovetoUnpacked(pC->pCursor, pIdxKey, 0, 0, &res);
+  if( pOp->p4.i==0 ){
+    sqlite3DbFree(db, pFree);
+  }
+  if( rc!=SQLITE_OK ){
+    break;
+  }
+  pC->seekResult = res;
+  alreadyExists = (res==0);
+  pC->nullRow = 1-alreadyExists;
+  pC->deferredMoveto = 0;
+  pC->cacheStatus = CACHE_STALE;
+  if( pOp->opcode==OP_Found ){
+    VdbeBranchTaken(alreadyExists!=0,2);
+    if( alreadyExists ) pc = pOp->p2 - 1;
+  }else{
+    VdbeBranchTaken(alreadyExists==0,2);
+    if( !alreadyExists ) pc = pOp->p2 - 1;
   }
   break;
 }
 
 /* Opcode: NotExists P1 P2 P3 * *
+** Synopsis: intkey=r[P3]
 **
-** Use the content of register P3 as an integer key.  If a record 
-** with that key does not exist in table of P1, then jump to P2. 
-** If the record does exist, then fall through.  The cursor is left 
-** pointing to the record if it exists.
+** P1 is the index of a cursor open on an SQL table btree (with integer
+** keys).  P3 is an integer rowid.  If P1 does not contain a record with
+** rowid P3 then jump immediately to P2.  If P1 does contain a record
+** with rowid P3 then leave the cursor pointing at that record and fall
+** through to the next instruction.
 **
-** The difference between this operation and NotFound is that this
-** operation assumes the key is an integer and that P1 is a table whereas
-** NotFound assumes key is a blob constructed from MakeRecord and
-** P1 is an index.
+** The OP_NotFound opcode performs the same operation on index btrees
+** (with arbitrary multi-value keys).
 **
-** See also: Found, NotFound, IsUnique
+** See also: Found, NotFound, NoConflict
 */
 case OP_NotExists: {        /* jump, in3 */
-#if 0  /* local variables moved into u.bg */
   VdbeCursor *pC;
   BtCursor *pCrsr;
   int res;
   u64 iKey;
-#endif /* local variables moved into u.bg */
 
   pIn3 = &aMem[pOp->p3];
   assert( pIn3->flags & MEM_Int );
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  u.bg.pC = p->apCsr[pOp->p1];
-  assert( u.bg.pC!=0 );
-  assert( u.bg.pC->isTable );
-  assert( u.bg.pC->pseudoTableReg==0 );
-  u.bg.pCrsr = u.bg.pC->pCursor;
-  if( ALWAYS(u.bg.pCrsr!=0) ){
-    u.bg.res = 0;
-    u.bg.iKey = pIn3->u.i;
-    rc = sqlite3BtreeMovetoUnpacked(u.bg.pCrsr, 0, u.bg.iKey, 0, &u.bg.res);
-    u.bg.pC->lastRowid = pIn3->u.i;
-    u.bg.pC->rowidIsValid = u.bg.res==0 ?1:0;
-    u.bg.pC->nullRow = 0;
-    u.bg.pC->cacheStatus = CACHE_STALE;
-    u.bg.pC->deferredMoveto = 0;
-    if( u.bg.res!=0 ){
-      pc = pOp->p2 - 1;
-      assert( u.bg.pC->rowidIsValid==0 );
-    }
-    u.bg.pC->seekResult = u.bg.res;
-  }else{
-    /* This happens when an attempt to open a read cursor on the
-    ** sqlite_master table returns SQLITE_EMPTY.
-    */
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  assert( pC->isTable );
+  assert( pC->pseudoTableReg==0 );
+  pCrsr = pC->pCursor;
+  assert( pCrsr!=0 );
+  res = 0;
+  iKey = pIn3->u.i;
+  rc = sqlite3BtreeMovetoUnpacked(pCrsr, 0, iKey, 0, &res);
+  pC->lastRowid = pIn3->u.i;
+  pC->rowidIsValid = res==0 ?1:0;
+  pC->nullRow = 0;
+  pC->cacheStatus = CACHE_STALE;
+  pC->deferredMoveto = 0;
+  VdbeBranchTaken(res!=0,2);
+  if( res!=0 ){
     pc = pOp->p2 - 1;
-    assert( u.bg.pC->rowidIsValid==0 );
-    u.bg.pC->seekResult = 0;
+    assert( pC->rowidIsValid==0 );
   }
+  pC->seekResult = res;
   break;
 }
 
 /* Opcode: Sequence P1 P2 * * *
+** Synopsis: r[P2]=cursor[P1].ctr++
 **
 ** Find the next available sequence number for cursor P1.
 ** Write the sequence number into register P2.
@@ -69223,6 +71353,7 @@ case OP_Sequence: {           /* out2-prerelease */
 
 
 /* Opcode: NewRowid P1 P2 P3 * *
+** Synopsis: r[P2]=rowid
 **
 ** Get a new integer record number (a.k.a "rowid") used as the key to a table.
 ** The record number is not previously used as a key in the database
@@ -69237,21 +71368,19 @@ case OP_Sequence: {           /* out2-prerelease */
 ** AUTOINCREMENT feature.
 */
 case OP_NewRowid: {           /* out2-prerelease */
-#if 0  /* local variables moved into u.bh */
   i64 v;                 /* The new rowid */
   VdbeCursor *pC;        /* Cursor of table to get the new rowid */
   int res;               /* Result of an sqlite3BtreeLast() */
   int cnt;               /* Counter to limit the number of searches */
   Mem *pMem;             /* Register holding largest rowid for AUTOINCREMENT */
   VdbeFrame *pFrame;     /* Root frame of VDBE */
-#endif /* local variables moved into u.bh */
 
-  u.bh.v = 0;
-  u.bh.res = 0;
+  v = 0;
+  res = 0;
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  u.bh.pC = p->apCsr[pOp->p1];
-  assert( u.bh.pC!=0 );
-  if( NEVER(u.bh.pC->pCursor==0) ){
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  if( NEVER(pC->pCursor==0) ){
     /* The zero initialization above is all that is needed */
   }else{
     /* The next rowid or record number (different terms for the same
@@ -69267,7 +71396,7 @@ case OP_NewRowid: {           /* out2-prerelease */
     ** succeeded.  If the random rowid does exist, we select a new one
     ** and try again, up to 100 times.
     */
-    assert( u.bh.pC->isTable );
+    assert( pC->isTable );
 
 #ifdef SQLITE_32BIT_ROWID
 #   define MAX_ROWID 0x7fffffff
@@ -69279,61 +71408,56 @@ case OP_NewRowid: {           /* out2-prerelease */
 #   define MAX_ROWID  (i64)( (((u64)0x7fffffff)<<32) | (u64)0xffffffff )
 #endif
 
-    if( !u.bh.pC->useRandomRowid ){
-      u.bh.v = sqlite3BtreeGetCachedRowid(u.bh.pC->pCursor);
-      if( u.bh.v==0 ){
-        rc = sqlite3BtreeLast(u.bh.pC->pCursor, &u.bh.res);
-        if( rc!=SQLITE_OK ){
-          goto abort_due_to_error;
-        }
-        if( u.bh.res ){
-          u.bh.v = 1;   /* IMP: R-61914-48074 */
+    if( !pC->useRandomRowid ){
+      rc = sqlite3BtreeLast(pC->pCursor, &res);
+      if( rc!=SQLITE_OK ){
+        goto abort_due_to_error;
+      }
+      if( res ){
+        v = 1;   /* IMP: R-61914-48074 */
+      }else{
+        assert( sqlite3BtreeCursorIsValid(pC->pCursor) );
+        rc = sqlite3BtreeKeySize(pC->pCursor, &v);
+        assert( rc==SQLITE_OK );   /* Cannot fail following BtreeLast() */
+        if( v>=MAX_ROWID ){
+          pC->useRandomRowid = 1;
         }else{
-          assert( sqlite3BtreeCursorIsValid(u.bh.pC->pCursor) );
-          rc = sqlite3BtreeKeySize(u.bh.pC->pCursor, &u.bh.v);
-          assert( rc==SQLITE_OK );   /* Cannot fail following BtreeLast() */
-          if( u.bh.v>=MAX_ROWID ){
-            u.bh.pC->useRandomRowid = 1;
-          }else{
-            u.bh.v++;   /* IMP: R-29538-34987 */
-          }
+          v++;   /* IMP: R-29538-34987 */
         }
       }
+    }
 
 #ifndef SQLITE_OMIT_AUTOINCREMENT
-      if( pOp->p3 ){
+    if( pOp->p3 ){
+      /* Assert that P3 is a valid memory cell. */
+      assert( pOp->p3>0 );
+      if( p->pFrame ){
+        for(pFrame=p->pFrame; pFrame->pParent; pFrame=pFrame->pParent);
         /* Assert that P3 is a valid memory cell. */
-        assert( pOp->p3>0 );
-        if( p->pFrame ){
-          for(u.bh.pFrame=p->pFrame; u.bh.pFrame->pParent; u.bh.pFrame=u.bh.pFrame->pParent);
-          /* Assert that P3 is a valid memory cell. */
-          assert( pOp->p3<=u.bh.pFrame->nMem );
-          u.bh.pMem = &u.bh.pFrame->aMem[pOp->p3];
-        }else{
-          /* Assert that P3 is a valid memory cell. */
-          assert( pOp->p3<=p->nMem );
-          u.bh.pMem = &aMem[pOp->p3];
-          memAboutToChange(p, u.bh.pMem);
-        }
-        assert( memIsValid(u.bh.pMem) );
-
-        REGISTER_TRACE(pOp->p3, u.bh.pMem);
-        sqlite3VdbeMemIntegerify(u.bh.pMem);
-        assert( (u.bh.pMem->flags & MEM_Int)!=0 );  /* mem(P3) holds an integer */
-        if( u.bh.pMem->u.i==MAX_ROWID || u.bh.pC->useRandomRowid ){
-          rc = SQLITE_FULL;   /* IMP: R-12275-61338 */
-          goto abort_due_to_error;
-        }
-        if( u.bh.v<u.bh.pMem->u.i+1 ){
-          u.bh.v = u.bh.pMem->u.i + 1;
-        }
-        u.bh.pMem->u.i = u.bh.v;
+        assert( pOp->p3<=pFrame->nMem );
+        pMem = &pFrame->aMem[pOp->p3];
+      }else{
+        /* Assert that P3 is a valid memory cell. */
+        assert( pOp->p3<=(p->nMem-p->nCursor) );
+        pMem = &aMem[pOp->p3];
+        memAboutToChange(p, pMem);
       }
-#endif
+      assert( memIsValid(pMem) );
 
-      sqlite3BtreeSetCachedRowid(u.bh.pC->pCursor, u.bh.v<MAX_ROWID ? u.bh.v+1 : 0);
+      REGISTER_TRACE(pOp->p3, pMem);
+      sqlite3VdbeMemIntegerify(pMem);
+      assert( (pMem->flags & MEM_Int)!=0 );  /* mem(P3) holds an integer */
+      if( pMem->u.i==MAX_ROWID || pC->useRandomRowid ){
+        rc = SQLITE_FULL;   /* IMP: R-12275-61338 */
+        goto abort_due_to_error;
+      }
+      if( v<pMem->u.i+1 ){
+        v = pMem->u.i + 1;
+      }
+      pMem->u.i = v;
     }
-    if( u.bh.pC->useRandomRowid ){
+#endif
+    if( pC->useRandomRowid ){
       /* IMPLEMENTATION-OF: R-07677-41881 If the largest ROWID is equal to the
       ** largest possible integer (9223372036854775807) then the database
       ** engine starts picking positive candidate ROWIDs at random until
@@ -69341,39 +71465,40 @@ case OP_NewRowid: {           /* out2-prerelease */
       assert( pOp->p3==0 );  /* We cannot be in random rowid mode if this is
                              ** an AUTOINCREMENT table. */
       /* on the first attempt, simply do one more than previous */
-      u.bh.v = lastRowid;
-      u.bh.v &= (MAX_ROWID>>1); /* ensure doesn't go negative */
-      u.bh.v++; /* ensure non-zero */
-      u.bh.cnt = 0;
-      while(   ((rc = sqlite3BtreeMovetoUnpacked(u.bh.pC->pCursor, 0, (u64)u.bh.v,
-                                                 0, &u.bh.res))==SQLITE_OK)
-            && (u.bh.res==0)
-            && (++u.bh.cnt<100)){
+      v = lastRowid;
+      v &= (MAX_ROWID>>1); /* ensure doesn't go negative */
+      v++; /* ensure non-zero */
+      cnt = 0;
+      while(   ((rc = sqlite3BtreeMovetoUnpacked(pC->pCursor, 0, (u64)v,
+                                                 0, &res))==SQLITE_OK)
+            && (res==0)
+            && (++cnt<100)){
         /* collision - try another random rowid */
-        sqlite3_randomness(sizeof(u.bh.v), &u.bh.v);
-        if( u.bh.cnt<5 ){
+        sqlite3_randomness(sizeof(v), &v);
+        if( cnt<5 ){
           /* try "small" random rowids for the initial attempts */
-          u.bh.v &= 0xffffff;
+          v &= 0xffffff;
         }else{
-          u.bh.v &= (MAX_ROWID>>1); /* ensure doesn't go negative */
+          v &= (MAX_ROWID>>1); /* ensure doesn't go negative */
         }
-        u.bh.v++; /* ensure non-zero */
+        v++; /* ensure non-zero */
       }
-      if( rc==SQLITE_OK && u.bh.res==0 ){
+      if( rc==SQLITE_OK && res==0 ){
         rc = SQLITE_FULL;   /* IMP: R-38219-53002 */
         goto abort_due_to_error;
       }
-      assert( u.bh.v>0 );  /* EV: R-40812-03570 */
+      assert( v>0 );  /* EV: R-40812-03570 */
     }
-    u.bh.pC->rowidIsValid = 0;
-    u.bh.pC->deferredMoveto = 0;
-    u.bh.pC->cacheStatus = CACHE_STALE;
+    pC->rowidIsValid = 0;
+    pC->deferredMoveto = 0;
+    pC->cacheStatus = CACHE_STALE;
   }
-  pOut->u.i = u.bh.v;
+  pOut->u.i = v;
   break;
 }
 
 /* Opcode: Insert P1 P2 P3 P4 P5
+** Synopsis: intkey=r[P3] data=r[P2]
 **
 ** Write an entry into the table of cursor P1.  A new entry is
 ** created if it doesn't already exist or the data for an existing
@@ -69413,13 +71538,13 @@ case OP_NewRowid: {           /* out2-prerelease */
 ** for indices is OP_IdxInsert.
 */
 /* Opcode: InsertInt P1 P2 P3 P4 P5
+** Synopsis:  intkey=P3 data=r[P2]
 **
 ** This works exactly like OP_Insert except that the key is the
 ** integer value P3, not the value of the integer stored in register P3.
 */
 case OP_Insert: 
 case OP_InsertInt: {
-#if 0  /* local variables moved into u.bi */
   Mem *pData;       /* MEM cell holding data for the record to be inserted */
   Mem *pKey;        /* MEM cell holding key  for the record */
   i64 iKey;         /* The integer ROWID or key for the record to be inserted */
@@ -69429,60 +71554,58 @@ case OP_InsertInt: {
   const char *zDb;  /* database name - used by the update hook */
   const char *zTbl; /* Table name - used by the opdate hook */
   int op;           /* Opcode for update hook: SQLITE_UPDATE or SQLITE_INSERT */
-#endif /* local variables moved into u.bi */
 
-  u.bi.pData = &aMem[pOp->p2];
+  pData = &aMem[pOp->p2];
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  assert( memIsValid(u.bi.pData) );
-  u.bi.pC = p->apCsr[pOp->p1];
-  assert( u.bi.pC!=0 );
-  assert( u.bi.pC->pCursor!=0 );
-  assert( u.bi.pC->pseudoTableReg==0 );
-  assert( u.bi.pC->isTable );
-  REGISTER_TRACE(pOp->p2, u.bi.pData);
+  assert( memIsValid(pData) );
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  assert( pC->pCursor!=0 );
+  assert( pC->pseudoTableReg==0 );
+  assert( pC->isTable );
+  REGISTER_TRACE(pOp->p2, pData);
 
   if( pOp->opcode==OP_Insert ){
-    u.bi.pKey = &aMem[pOp->p3];
-    assert( u.bi.pKey->flags & MEM_Int );
-    assert( memIsValid(u.bi.pKey) );
-    REGISTER_TRACE(pOp->p3, u.bi.pKey);
-    u.bi.iKey = u.bi.pKey->u.i;
+    pKey = &aMem[pOp->p3];
+    assert( pKey->flags & MEM_Int );
+    assert( memIsValid(pKey) );
+    REGISTER_TRACE(pOp->p3, pKey);
+    iKey = pKey->u.i;
   }else{
     assert( pOp->opcode==OP_InsertInt );
-    u.bi.iKey = pOp->p3;
+    iKey = pOp->p3;
   }
 
   if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++;
-  if( pOp->p5 & OPFLAG_LASTROWID ) db->lastRowid = lastRowid = u.bi.iKey;
-  if( u.bi.pData->flags & MEM_Null ){
-    u.bi.pData->z = 0;
-    u.bi.pData->n = 0;
+  if( pOp->p5 & OPFLAG_LASTROWID ) db->lastRowid = lastRowid = iKey;
+  if( pData->flags & MEM_Null ){
+    pData->z = 0;
+    pData->n = 0;
   }else{
-    assert( u.bi.pData->flags & (MEM_Blob|MEM_Str) );
+    assert( pData->flags & (MEM_Blob|MEM_Str) );
   }
-  u.bi.seekResult = ((pOp->p5 & OPFLAG_USESEEKRESULT) ? u.bi.pC->seekResult : 0);
-  if( u.bi.pData->flags & MEM_Zero ){
-    u.bi.nZero = u.bi.pData->u.nZero;
+  seekResult = ((pOp->p5 & OPFLAG_USESEEKRESULT) ? pC->seekResult : 0);
+  if( pData->flags & MEM_Zero ){
+    nZero = pData->u.nZero;
   }else{
-    u.bi.nZero = 0;
+    nZero = 0;
   }
-  sqlite3BtreeSetCachedRowid(u.bi.pC->pCursor, 0);
-  rc = sqlite3BtreeInsert(u.bi.pC->pCursor, 0, u.bi.iKey,
-                          u.bi.pData->z, u.bi.pData->n, u.bi.nZero,
-                          pOp->p5 & OPFLAG_APPEND, u.bi.seekResult
+  rc = sqlite3BtreeInsert(pC->pCursor, 0, iKey,
+                          pData->z, pData->n, nZero,
+                          (pOp->p5 & OPFLAG_APPEND)!=0, seekResult
   );
-  u.bi.pC->rowidIsValid = 0;
-  u.bi.pC->deferredMoveto = 0;
-  u.bi.pC->cacheStatus = CACHE_STALE;
+  pC->rowidIsValid = 0;
+  pC->deferredMoveto = 0;
+  pC->cacheStatus = CACHE_STALE;
 
   /* Invoke the update-hook if required. */
   if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p4.z ){
-    u.bi.zDb = db->aDb[u.bi.pC->iDb].zName;
-    u.bi.zTbl = pOp->p4.z;
-    u.bi.op = ((pOp->p5 & OPFLAG_ISUPDATE) ? SQLITE_UPDATE : SQLITE_INSERT);
-    assert( u.bi.pC->isTable );
-    db->xUpdateCallback(db->pUpdateArg, u.bi.op, u.bi.zDb, u.bi.zTbl, u.bi.iKey);
-    assert( u.bi.pC->iDb>=0 );
+    zDb = db->aDb[pC->iDb].zName;
+    zTbl = pOp->p4.z;
+    op = ((pOp->p5 & OPFLAG_ISUPDATE) ? SQLITE_UPDATE : SQLITE_INSERT);
+    assert( pC->isTable );
+    db->xUpdateCallback(db->pUpdateArg, op, zDb, zTbl, iKey);
+    assert( pC->iDb>=0 );
   }
   break;
 }
@@ -69508,47 +71631,34 @@ case OP_InsertInt: {
 ** using OP_NotFound prior to invoking this opcode.
 */
 case OP_Delete: {
-#if 0  /* local variables moved into u.bj */
   i64 iKey;
   VdbeCursor *pC;
-#endif /* local variables moved into u.bj */
 
-  u.bj.iKey = 0;
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  u.bj.pC = p->apCsr[pOp->p1];
-  assert( u.bj.pC!=0 );
-  assert( u.bj.pC->pCursor!=0 );  /* Only valid for real tables, no pseudotables */
-
-  /* If the update-hook will be invoked, set u.bj.iKey to the rowid of the
-  ** row being deleted.
-  */
-  if( db->xUpdateCallback && pOp->p4.z ){
-    assert( u.bj.pC->isTable );
-    assert( u.bj.pC->rowidIsValid );  /* lastRowid set by previous OP_NotFound */
-    u.bj.iKey = u.bj.pC->lastRowid;
-  }
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  assert( pC->pCursor!=0 );  /* Only valid for real tables, no pseudotables */
+  iKey = pC->lastRowid;      /* Only used for the update hook */
 
   /* The OP_Delete opcode always follows an OP_NotExists or OP_Last or
   ** OP_Column on the same table without any intervening operations that
-  ** might move or invalidate the cursor.  Hence cursor u.bj.pC is always pointing
+  ** might move or invalidate the cursor.  Hence cursor pC is always pointing
   ** to the row to be deleted and the sqlite3VdbeCursorMoveto() operation
   ** below is always a no-op and cannot fail.  We will run it anyhow, though,
   ** to guard against future changes to the code generator.
   **/
-  assert( u.bj.pC->deferredMoveto==0 );
-  rc = sqlite3VdbeCursorMoveto(u.bj.pC);
+  assert( pC->deferredMoveto==0 );
+  rc = sqlite3VdbeCursorMoveto(pC);
   if( NEVER(rc!=SQLITE_OK) ) goto abort_due_to_error;
 
-  sqlite3BtreeSetCachedRowid(u.bj.pC->pCursor, 0);
-  rc = sqlite3BtreeDelete(u.bj.pC->pCursor);
-  u.bj.pC->cacheStatus = CACHE_STALE;
+  rc = sqlite3BtreeDelete(pC->pCursor);
+  pC->cacheStatus = CACHE_STALE;
 
   /* Invoke the update-hook if required. */
-  if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p4.z ){
-    const char *zDb = db->aDb[u.bj.pC->iDb].zName;
-    const char *zTbl = pOp->p4.z;
-    db->xUpdateCallback(db->pUpdateArg, SQLITE_DELETE, zDb, zTbl, u.bj.iKey);
-    assert( u.bj.pC->iDb>=0 );
+  if( rc==SQLITE_OK && db->xUpdateCallback && pOp->p4.z && pC->isTable ){
+    db->xUpdateCallback(db->pUpdateArg, SQLITE_DELETE,
+                        db->aDb[pC->iDb].zName, pOp->p4.z, iKey);
+    assert( pC->iDb>=0 );
   }
   if( pOp->p2 & OPFLAG_NCHANGE ) p->nChange++;
   break;
@@ -69566,46 +71676,57 @@ case OP_ResetCount: {
   break;
 }
 
-/* Opcode: SorterCompare P1 P2 P3
+/* Opcode: SorterCompare P1 P2 P3 P4
+** Synopsis:  if key(P1)!=rtrim(r[P3],P4) goto P2
 **
-** P1 is a sorter cursor. This instruction compares the record blob in 
-** register P3 with the entry that the sorter cursor currently points to.
-** If, excluding the rowid fields at the end, the two records are a match,
-** fall through to the next instruction. Otherwise, jump to instruction P2.
+** P1 is a sorter cursor. This instruction compares a prefix of the
+** the record blob in register P3 against a prefix of the entry that 
+** the sorter cursor currently points to.  The final P4 fields of both
+** the P3 and sorter record are ignored.
+**
+** If either P3 or the sorter contains a NULL in one of their significant
+** fields (not counting the P4 fields at the end which are ignored) then
+** the comparison is assumed to be equal.
+**
+** Fall through to next instruction if the two records compare equal to
+** each other.  Jump to P2 if they are different.
 */
 case OP_SorterCompare: {
-#if 0  /* local variables moved into u.bk */
   VdbeCursor *pC;
   int res;
-#endif /* local variables moved into u.bk */
+  int nIgnore;
 
-  u.bk.pC = p->apCsr[pOp->p1];
-  assert( isSorter(u.bk.pC) );
+  pC = p->apCsr[pOp->p1];
+  assert( isSorter(pC) );
+  assert( pOp->p4type==P4_INT32 );
   pIn3 = &aMem[pOp->p3];
-  rc = sqlite3VdbeSorterCompare(u.bk.pC, pIn3, &u.bk.res);
-  if( u.bk.res ){
+  nIgnore = pOp->p4.i;
+  rc = sqlite3VdbeSorterCompare(pC, pIn3, nIgnore, &res);
+  VdbeBranchTaken(res!=0,2);
+  if( res ){
     pc = pOp->p2-1;
   }
   break;
 };
 
 /* Opcode: SorterData P1 P2 * * *
+** Synopsis: r[P2]=data
 **
 ** Write into register P2 the current sorter data for sorter cursor P1.
 */
 case OP_SorterData: {
-#if 0  /* local variables moved into u.bl */
   VdbeCursor *pC;
-#endif /* local variables moved into u.bl */
 
   pOut = &aMem[pOp->p2];
-  u.bl.pC = p->apCsr[pOp->p1];
-  assert( u.bl.pC->isSorter );
-  rc = sqlite3VdbeSorterRowkey(u.bl.pC, pOut);
+  pC = p->apCsr[pOp->p1];
+  assert( isSorter(pC) );
+  rc = sqlite3VdbeSorterRowkey(pC, pOut);
+  assert( rc!=SQLITE_OK || (pOut->flags & MEM_Blob) );
   break;
 }
 
 /* Opcode: RowData P1 P2 * * *
+** Synopsis: r[P2]=data
 **
 ** Write into register P2 the complete row data for cursor P1.
 ** There is no interpretation of the data.  
@@ -69616,10 +71737,11 @@ case OP_SorterData: {
 ** of a real table, not a pseudo-table.
 */
 /* Opcode: RowKey P1 P2 * * *
+** Synopsis: r[P2]=key
 **
 ** Write into register P2 the complete row key for cursor P1.
 ** There is no interpretation of the data.  
-** The key is copied onto the P3 register exactly as 
+** The key is copied onto the P2 register exactly as 
 ** it is found in the database file.
 **
 ** If the P1 cursor must be pointing to a valid row (not a NULL row)
@@ -69627,69 +71749,69 @@ case OP_SorterData: {
 */
 case OP_RowKey:
 case OP_RowData: {
-#if 0  /* local variables moved into u.bm */
   VdbeCursor *pC;
   BtCursor *pCrsr;
   u32 n;
   i64 n64;
-#endif /* local variables moved into u.bm */
 
   pOut = &aMem[pOp->p2];
   memAboutToChange(p, pOut);
 
   /* Note that RowKey and RowData are really exactly the same instruction */
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  u.bm.pC = p->apCsr[pOp->p1];
-  assert( u.bm.pC->isSorter==0 );
-  assert( u.bm.pC->isTable || pOp->opcode!=OP_RowData );
-  assert( u.bm.pC->isIndex || pOp->opcode==OP_RowData );
-  assert( u.bm.pC!=0 );
-  assert( u.bm.pC->nullRow==0 );
-  assert( u.bm.pC->pseudoTableReg==0 );
-  assert( u.bm.pC->pCursor!=0 );
-  u.bm.pCrsr = u.bm.pC->pCursor;
-  assert( sqlite3BtreeCursorIsValid(u.bm.pCrsr) );
+  pC = p->apCsr[pOp->p1];
+  assert( isSorter(pC)==0 );
+  assert( pC->isTable || pOp->opcode!=OP_RowData );
+  assert( pC->isTable==0 || pOp->opcode==OP_RowData );
+  assert( pC!=0 );
+  assert( pC->nullRow==0 );
+  assert( pC->pseudoTableReg==0 );
+  assert( pC->pCursor!=0 );
+  pCrsr = pC->pCursor;
+  assert( sqlite3BtreeCursorIsValid(pCrsr) );
 
   /* The OP_RowKey and OP_RowData opcodes always follow OP_NotExists or
   ** OP_Rewind/Op_Next with no intervening instructions that might invalidate
   ** the cursor.  Hence the following sqlite3VdbeCursorMoveto() call is always
   ** a no-op and can never fail.  But we leave it in place as a safety.
   */
-  assert( u.bm.pC->deferredMoveto==0 );
-  rc = sqlite3VdbeCursorMoveto(u.bm.pC);
+  assert( pC->deferredMoveto==0 );
+  rc = sqlite3VdbeCursorMoveto(pC);
   if( NEVER(rc!=SQLITE_OK) ) goto abort_due_to_error;
 
-  if( u.bm.pC->isIndex ){
-    assert( !u.bm.pC->isTable );
-    VVA_ONLY(rc =) sqlite3BtreeKeySize(u.bm.pCrsr, &u.bm.n64);
+  if( pC->isTable==0 ){
+    assert( !pC->isTable );
+    VVA_ONLY(rc =) sqlite3BtreeKeySize(pCrsr, &n64);
     assert( rc==SQLITE_OK );    /* True because of CursorMoveto() call above */
-    if( u.bm.n64>db->aLimit[SQLITE_LIMIT_LENGTH] ){
+    if( n64>db->aLimit[SQLITE_LIMIT_LENGTH] ){
       goto too_big;
     }
-    u.bm.n = (u32)u.bm.n64;
+    n = (u32)n64;
   }else{
-    VVA_ONLY(rc =) sqlite3BtreeDataSize(u.bm.pCrsr, &u.bm.n);
+    VVA_ONLY(rc =) sqlite3BtreeDataSize(pCrsr, &n);
     assert( rc==SQLITE_OK );    /* DataSize() cannot fail */
-    if( u.bm.n>(u32)db->aLimit[SQLITE_LIMIT_LENGTH] ){
+    if( n>(u32)db->aLimit[SQLITE_LIMIT_LENGTH] ){
       goto too_big;
     }
   }
-  if( sqlite3VdbeMemGrow(pOut, u.bm.n, 0) ){
+  if( sqlite3VdbeMemGrow(pOut, n, 0) ){
     goto no_mem;
   }
-  pOut->n = u.bm.n;
+  pOut->n = n;
   MemSetTypeFlag(pOut, MEM_Blob);
-  if( u.bm.pC->isIndex ){
-    rc = sqlite3BtreeKey(u.bm.pCrsr, 0, u.bm.n, pOut->z);
+  if( pC->isTable==0 ){
+    rc = sqlite3BtreeKey(pCrsr, 0, n, pOut->z);
   }else{
-    rc = sqlite3BtreeData(u.bm.pCrsr, 0, u.bm.n, pOut->z);
+    rc = sqlite3BtreeData(pCrsr, 0, n, pOut->z);
   }
   pOut->enc = SQLITE_UTF8;  /* In case the blob is ever cast to text */
   UPDATE_MAX_BLOBSIZE(pOut);
+  REGISTER_TRACE(pOp->p2, pOut);
   break;
 }
 
 /* Opcode: Rowid P1 P2 * * *
+** Synopsis: r[P2]=rowid
 **
 ** Store in register P2 an integer which is the key of the table entry that
 ** P1 is currently point to.
@@ -69699,42 +71821,40 @@ case OP_RowData: {
 ** one opcode now works for both table types.
 */
 case OP_Rowid: {                 /* out2-prerelease */
-#if 0  /* local variables moved into u.bn */
   VdbeCursor *pC;
   i64 v;
   sqlite3_vtab *pVtab;
   const sqlite3_module *pModule;
-#endif /* local variables moved into u.bn */
 
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  u.bn.pC = p->apCsr[pOp->p1];
-  assert( u.bn.pC!=0 );
-  assert( u.bn.pC->pseudoTableReg==0 || u.bn.pC->nullRow );
-  if( u.bn.pC->nullRow ){
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  assert( pC->pseudoTableReg==0 || pC->nullRow );
+  if( pC->nullRow ){
     pOut->flags = MEM_Null;
     break;
-  }else if( u.bn.pC->deferredMoveto ){
-    u.bn.v = u.bn.pC->movetoTarget;
+  }else if( pC->deferredMoveto ){
+    v = pC->movetoTarget;
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-  }else if( u.bn.pC->pVtabCursor ){
-    u.bn.pVtab = u.bn.pC->pVtabCursor->pVtab;
-    u.bn.pModule = u.bn.pVtab->pModule;
-    assert( u.bn.pModule->xRowid );
-    rc = u.bn.pModule->xRowid(u.bn.pC->pVtabCursor, &u.bn.v);
-    importVtabErrMsg(p, u.bn.pVtab);
+  }else if( pC->pVtabCursor ){
+    pVtab = pC->pVtabCursor->pVtab;
+    pModule = pVtab->pModule;
+    assert( pModule->xRowid );
+    rc = pModule->xRowid(pC->pVtabCursor, &v);
+    sqlite3VtabImportErrmsg(p, pVtab);
 #endif /* SQLITE_OMIT_VIRTUALTABLE */
   }else{
-    assert( u.bn.pC->pCursor!=0 );
-    rc = sqlite3VdbeCursorMoveto(u.bn.pC);
+    assert( pC->pCursor!=0 );
+    rc = sqlite3VdbeCursorMoveto(pC);
     if( rc ) goto abort_due_to_error;
-    if( u.bn.pC->rowidIsValid ){
-      u.bn.v = u.bn.pC->lastRowid;
+    if( pC->rowidIsValid ){
+      v = pC->lastRowid;
     }else{
-      rc = sqlite3BtreeKeySize(u.bn.pC->pCursor, &u.bn.v);
+      rc = sqlite3BtreeKeySize(pC->pCursor, &v);
       assert( rc==SQLITE_OK );  /* Always so because of CursorMoveto() above */
     }
   }
-  pOut->u.i = u.bn.v;
+  pOut->u.i = v;
   break;
 }
 
@@ -69745,18 +71865,16 @@ case OP_Rowid: {                 /* out2-prerelease */
 ** write a NULL.
 */
 case OP_NullRow: {
-#if 0  /* local variables moved into u.bo */
   VdbeCursor *pC;
-#endif /* local variables moved into u.bo */
 
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  u.bo.pC = p->apCsr[pOp->p1];
-  assert( u.bo.pC!=0 );
-  u.bo.pC->nullRow = 1;
-  u.bo.pC->rowidIsValid = 0;
-  assert( u.bo.pC->pCursor || u.bo.pC->pVtabCursor );
-  if( u.bo.pC->pCursor ){
-    sqlite3BtreeClearCursor(u.bo.pC->pCursor);
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  pC->nullRow = 1;
+  pC->rowidIsValid = 0;
+  pC->cacheStatus = CACHE_STALE;
+  if( pC->pCursor ){
+    sqlite3BtreeClearCursor(pC->pCursor);
   }
   break;
 }
@@ -69770,26 +71888,24 @@ case OP_NullRow: {
 ** to the following instruction.
 */
 case OP_Last: {        /* jump */
-#if 0  /* local variables moved into u.bp */
   VdbeCursor *pC;
   BtCursor *pCrsr;
   int res;
-#endif /* local variables moved into u.bp */
 
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  u.bp.pC = p->apCsr[pOp->p1];
-  assert( u.bp.pC!=0 );
-  u.bp.pCrsr = u.bp.pC->pCursor;
-  u.bp.res = 0;
-  if( ALWAYS(u.bp.pCrsr!=0) ){
-    rc = sqlite3BtreeLast(u.bp.pCrsr, &u.bp.res);
-  }
-  u.bp.pC->nullRow = (u8)u.bp.res;
-  u.bp.pC->deferredMoveto = 0;
-  u.bp.pC->rowidIsValid = 0;
-  u.bp.pC->cacheStatus = CACHE_STALE;
-  if( pOp->p2>0 && u.bp.res ){
-    pc = pOp->p2 - 1;
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  pCrsr = pC->pCursor;
+  res = 0;
+  assert( pCrsr!=0 );
+  rc = sqlite3BtreeLast(pCrsr, &res);
+  pC->nullRow = (u8)res;
+  pC->deferredMoveto = 0;
+  pC->rowidIsValid = 0;
+  pC->cacheStatus = CACHE_STALE;
+  if( pOp->p2>0 ){
+    VdbeBranchTaken(res!=0,2);
+    if( res ) pc = pOp->p2 - 1;
   }
   break;
 }
@@ -69813,7 +71929,7 @@ case OP_Sort: {        /* jump */
   sqlite3_sort_count++;
   sqlite3_search_count--;
 #endif
-  p->aCounter[SQLITE_STMTSTATUS_SORT-1]++;
+  p->aCounter[SQLITE_STMTSTATUS_SORT]++;
   /* Fall through into OP_Rewind */
 }
 /* Opcode: Rewind P1 P2 * * *
@@ -69825,44 +71941,48 @@ case OP_Sort: {        /* jump */
 ** to the following instruction.
 */
 case OP_Rewind: {        /* jump */
-#if 0  /* local variables moved into u.bq */
   VdbeCursor *pC;
   BtCursor *pCrsr;
   int res;
-#endif /* local variables moved into u.bq */
 
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  u.bq.pC = p->apCsr[pOp->p1];
-  assert( u.bq.pC!=0 );
-  assert( u.bq.pC->isSorter==(pOp->opcode==OP_SorterSort) );
-  u.bq.res = 1;
-  if( isSorter(u.bq.pC) ){
-    rc = sqlite3VdbeSorterRewind(db, u.bq.pC, &u.bq.res);
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  assert( isSorter(pC)==(pOp->opcode==OP_SorterSort) );
+  res = 1;
+  if( isSorter(pC) ){
+    rc = sqlite3VdbeSorterRewind(db, pC, &res);
   }else{
-    u.bq.pCrsr = u.bq.pC->pCursor;
-    assert( u.bq.pCrsr );
-    rc = sqlite3BtreeFirst(u.bq.pCrsr, &u.bq.res);
-    u.bq.pC->atFirst = u.bq.res==0 ?1:0;
-    u.bq.pC->deferredMoveto = 0;
-    u.bq.pC->cacheStatus = CACHE_STALE;
-    u.bq.pC->rowidIsValid = 0;
+    pCrsr = pC->pCursor;
+    assert( pCrsr );
+    rc = sqlite3BtreeFirst(pCrsr, &res);
+    pC->deferredMoveto = 0;
+    pC->cacheStatus = CACHE_STALE;
+    pC->rowidIsValid = 0;
   }
-  u.bq.pC->nullRow = (u8)u.bq.res;
+  pC->nullRow = (u8)res;
   assert( pOp->p2>0 && pOp->p2<p->nOp );
-  if( u.bq.res ){
+  VdbeBranchTaken(res!=0,2);
+  if( res ){
     pc = pOp->p2 - 1;
   }
   break;
 }
 
-/* Opcode: Next P1 P2 * P4 P5
+/* Opcode: Next P1 P2 P3 P4 P5
 **
 ** Advance cursor P1 so that it points to the next key/data pair in its
 ** table or index.  If there are no more key/value pairs then fall through
 ** to the following instruction.  But if the cursor advance was successful,
 ** jump immediately to P2.
 **
-** The P1 cursor must be for a real table, not a pseudo-table.
+** The P1 cursor must be for a real table, not a pseudo-table.  P1 must have
+** been opened prior to this opcode or the program will segfault.
+**
+** The P3 value is a hint to the btree implementation. If P3==1, that
+** means P1 is an SQL index and that this instruction could have been
+** omitted if that index had been unique.  P3 is usually 0.  P3 is
+** always either 0 or 1.
 **
 ** P4 is always of type P4_ADVANCE. The function pointer points to
 ** sqlite3BtreeNext().
@@ -69870,16 +71990,27 @@ case OP_Rewind: {        /* jump */
 ** If P5 is positive and the jump is taken, then event counter
 ** number P5-1 in the prepared statement is incremented.
 **
-** See also: Prev
+** See also: Prev, NextIfOpen
 */
-/* Opcode: Prev P1 P2 * * P5
+/* Opcode: NextIfOpen P1 P2 P3 P4 P5
+**
+** This opcode works just like OP_Next except that if cursor P1 is not
+** open it behaves a no-op.
+*/
+/* Opcode: Prev P1 P2 P3 P4 P5
 **
 ** Back up cursor P1 so that it points to the previous key/data pair in its
 ** table or index.  If there is no previous key/value pairs then fall through
 ** to the following instruction.  But if the cursor backup was successful,
 ** jump immediately to P2.
 **
-** The P1 cursor must be for a real table, not a pseudo-table.
+** The P1 cursor must be for a real table, not a pseudo-table.  If P1 is
+** not open then the behavior is undefined.
+**
+** The P3 value is a hint to the btree implementation. If P3==1, that
+** means P1 is an SQL index and that this instruction could have been
+** omitted if that index had been unique.  P3 is usually 0.  P3 is
+** always either 0 or 1.
 **
 ** P4 is always of type P4_ADVANCE. The function pointer points to
 ** sqlite3BtreePrevious().
@@ -69887,47 +72018,59 @@ case OP_Rewind: {        /* jump */
 ** If P5 is positive and the jump is taken, then event counter
 ** number P5-1 in the prepared statement is incremented.
 */
-case OP_SorterNext:    /* jump */
-case OP_Prev:          /* jump */
-case OP_Next: {        /* jump */
-#if 0  /* local variables moved into u.br */
+/* Opcode: PrevIfOpen P1 P2 P3 P4 P5
+**
+** This opcode works just like OP_Prev except that if cursor P1 is not
+** open it behaves a no-op.
+*/
+case OP_SorterNext: {  /* jump */
   VdbeCursor *pC;
   int res;
-#endif /* local variables moved into u.br */
 
-  CHECK_FOR_INTERRUPT;
+  pC = p->apCsr[pOp->p1];
+  assert( isSorter(pC) );
+  res = 0;
+  rc = sqlite3VdbeSorterNext(db, pC, &res);
+  goto next_tail;
+case OP_PrevIfOpen:    /* jump */
+case OP_NextIfOpen:    /* jump */
+  if( p->apCsr[pOp->p1]==0 ) break;
+  /* Fall through */
+case OP_Prev:          /* jump */
+case OP_Next:          /* jump */
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  assert( pOp->p5<=ArraySize(p->aCounter) );
-  u.br.pC = p->apCsr[pOp->p1];
-  if( u.br.pC==0 ){
-    break;  /* See ticket #2273 */
-  }
-  assert( u.br.pC->isSorter==(pOp->opcode==OP_SorterNext) );
-  if( isSorter(u.br.pC) ){
-    assert( pOp->opcode==OP_SorterNext );
-    rc = sqlite3VdbeSorterNext(db, u.br.pC, &u.br.res);
-  }else{
-    u.br.res = 1;
-    assert( u.br.pC->deferredMoveto==0 );
-    assert( u.br.pC->pCursor );
-    assert( pOp->opcode!=OP_Next || pOp->p4.xAdvance==sqlite3BtreeNext );
-    assert( pOp->opcode!=OP_Prev || pOp->p4.xAdvance==sqlite3BtreePrevious );
-    rc = pOp->p4.xAdvance(u.br.pC->pCursor, &u.br.res);
-  }
-  u.br.pC->nullRow = (u8)u.br.res;
-  u.br.pC->cacheStatus = CACHE_STALE;
-  if( u.br.res==0 ){
+  assert( pOp->p5<ArraySize(p->aCounter) );
+  pC = p->apCsr[pOp->p1];
+  res = pOp->p3;
+  assert( pC!=0 );
+  assert( pC->deferredMoveto==0 );
+  assert( pC->pCursor );
+  assert( res==0 || (res==1 && pC->isTable==0) );
+  testcase( res==1 );
+  assert( pOp->opcode!=OP_Next || pOp->p4.xAdvance==sqlite3BtreeNext );
+  assert( pOp->opcode!=OP_Prev || pOp->p4.xAdvance==sqlite3BtreePrevious );
+  assert( pOp->opcode!=OP_NextIfOpen || pOp->p4.xAdvance==sqlite3BtreeNext );
+  assert( pOp->opcode!=OP_PrevIfOpen || pOp->p4.xAdvance==sqlite3BtreePrevious);
+  rc = pOp->p4.xAdvance(pC->pCursor, &res);
+next_tail:
+  pC->cacheStatus = CACHE_STALE;
+  VdbeBranchTaken(res==0,2);
+  if( res==0 ){
+    pC->nullRow = 0;
     pc = pOp->p2 - 1;
-    if( pOp->p5 ) p->aCounter[pOp->p5-1]++;
+    p->aCounter[pOp->p5]++;
 #ifdef SQLITE_TEST
     sqlite3_search_count++;
 #endif
+  }else{
+    pC->nullRow = 1;
   }
-  u.br.pC->rowidIsValid = 0;
-  break;
+  pC->rowidIsValid = 0;
+  goto check_for_interrupt;
 }
 
 /* Opcode: IdxInsert P1 P2 P3 * P5
+** Synopsis: key=r[P2]
 **
 ** Register P2 holds an SQL index key made using the
 ** MakeRecord instructions.  This opcode writes that key
@@ -69936,84 +72079,90 @@ case OP_Next: {        /* jump */
 ** P3 is a flag that provides a hint to the b-tree layer that this
 ** insert is likely to be an append.
 **
+** If P5 has the OPFLAG_NCHANGE bit set, then the change counter is
+** incremented by this instruction.  If the OPFLAG_NCHANGE bit is clear,
+** then the change counter is unchanged.
+**
+** If P5 has the OPFLAG_USESEEKRESULT bit set, then the cursor must have
+** just done a seek to the spot where the new entry is to be inserted.
+** This flag avoids doing an extra seek.
+**
 ** This instruction only works for indices.  The equivalent instruction
 ** for tables is OP_Insert.
 */
 case OP_SorterInsert:       /* in2 */
 case OP_IdxInsert: {        /* in2 */
-#if 0  /* local variables moved into u.bs */
   VdbeCursor *pC;
   BtCursor *pCrsr;
   int nKey;
   const char *zKey;
-#endif /* local variables moved into u.bs */
 
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  u.bs.pC = p->apCsr[pOp->p1];
-  assert( u.bs.pC!=0 );
-  assert( u.bs.pC->isSorter==(pOp->opcode==OP_SorterInsert) );
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  assert( isSorter(pC)==(pOp->opcode==OP_SorterInsert) );
   pIn2 = &aMem[pOp->p2];
   assert( pIn2->flags & MEM_Blob );
-  u.bs.pCrsr = u.bs.pC->pCursor;
-  if( ALWAYS(u.bs.pCrsr!=0) ){
-    assert( u.bs.pC->isTable==0 );
-    rc = ExpandBlob(pIn2);
-    if( rc==SQLITE_OK ){
-      if( isSorter(u.bs.pC) ){
-        rc = sqlite3VdbeSorterWrite(db, u.bs.pC, pIn2);
-      }else{
-        u.bs.nKey = pIn2->n;
-        u.bs.zKey = pIn2->z;
-        rc = sqlite3BtreeInsert(u.bs.pCrsr, u.bs.zKey, u.bs.nKey, "", 0, 0, pOp->p3,
-            ((pOp->p5 & OPFLAG_USESEEKRESULT) ? u.bs.pC->seekResult : 0)
-            );
-        assert( u.bs.pC->deferredMoveto==0 );
-        u.bs.pC->cacheStatus = CACHE_STALE;
-      }
+  pCrsr = pC->pCursor;
+  if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++;
+  assert( pCrsr!=0 );
+  assert( pC->isTable==0 );
+  rc = ExpandBlob(pIn2);
+  if( rc==SQLITE_OK ){
+    if( isSorter(pC) ){
+      rc = sqlite3VdbeSorterWrite(db, pC, pIn2);
+    }else{
+      nKey = pIn2->n;
+      zKey = pIn2->z;
+      rc = sqlite3BtreeInsert(pCrsr, zKey, nKey, "", 0, 0, pOp->p3, 
+          ((pOp->p5 & OPFLAG_USESEEKRESULT) ? pC->seekResult : 0)
+          );
+      assert( pC->deferredMoveto==0 );
+      pC->cacheStatus = CACHE_STALE;
     }
   }
   break;
 }
 
 /* Opcode: IdxDelete P1 P2 P3 * *
+** Synopsis: key=r[P2@P3]
 **
 ** The content of P3 registers starting at register P2 form
 ** an unpacked index key. This opcode removes that entry from the 
 ** index opened by cursor P1.
 */
 case OP_IdxDelete: {
-#if 0  /* local variables moved into u.bt */
   VdbeCursor *pC;
   BtCursor *pCrsr;
   int res;
   UnpackedRecord r;
-#endif /* local variables moved into u.bt */
 
   assert( pOp->p3>0 );
-  assert( pOp->p2>0 && pOp->p2+pOp->p3<=p->nMem+1 );
+  assert( pOp->p2>0 && pOp->p2+pOp->p3<=(p->nMem-p->nCursor)+1 );
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  u.bt.pC = p->apCsr[pOp->p1];
-  assert( u.bt.pC!=0 );
-  u.bt.pCrsr = u.bt.pC->pCursor;
-  if( ALWAYS(u.bt.pCrsr!=0) ){
-    u.bt.r.pKeyInfo = u.bt.pC->pKeyInfo;
-    u.bt.r.nField = (u16)pOp->p3;
-    u.bt.r.flags = 0;
-    u.bt.r.aMem = &aMem[pOp->p2];
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  pCrsr = pC->pCursor;
+  assert( pCrsr!=0 );
+  assert( pOp->p5==0 );
+  r.pKeyInfo = pC->pKeyInfo;
+  r.nField = (u16)pOp->p3;
+  r.default_rc = 0;
+  r.aMem = &aMem[pOp->p2];
 #ifdef SQLITE_DEBUG
-    { int i; for(i=0; i<u.bt.r.nField; i++) assert( memIsValid(&u.bt.r.aMem[i]) ); }
+  { int i; for(i=0; i<r.nField; i++) assert( memIsValid(&r.aMem[i]) ); }
 #endif
-    rc = sqlite3BtreeMovetoUnpacked(u.bt.pCrsr, &u.bt.r, 0, 0, &u.bt.res);
-    if( rc==SQLITE_OK && u.bt.res==0 ){
-      rc = sqlite3BtreeDelete(u.bt.pCrsr);
-    }
-    assert( u.bt.pC->deferredMoveto==0 );
-    u.bt.pC->cacheStatus = CACHE_STALE;
+  rc = sqlite3BtreeMovetoUnpacked(pCrsr, &r, 0, 0, &res);
+  if( rc==SQLITE_OK && res==0 ){
+    rc = sqlite3BtreeDelete(pCrsr);
   }
+  assert( pC->deferredMoveto==0 );
+  pC->cacheStatus = CACHE_STALE;
   break;
 }
 
 /* Opcode: IdxRowid P1 P2 * * *
+** Synopsis: r[P2]=rowid
 **
 ** Write into register P2 an integer which is the last entry in the record at
 ** the end of the index key pointed to by cursor P1.  This integer should be
@@ -70022,97 +72171,118 @@ case OP_IdxDelete: {
 ** See also: Rowid, MakeRecord.
 */
 case OP_IdxRowid: {              /* out2-prerelease */
-#if 0  /* local variables moved into u.bu */
   BtCursor *pCrsr;
   VdbeCursor *pC;
   i64 rowid;
-#endif /* local variables moved into u.bu */
 
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  u.bu.pC = p->apCsr[pOp->p1];
-  assert( u.bu.pC!=0 );
-  u.bu.pCrsr = u.bu.pC->pCursor;
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  pCrsr = pC->pCursor;
+  assert( pCrsr!=0 );
   pOut->flags = MEM_Null;
-  if( ALWAYS(u.bu.pCrsr!=0) ){
-    rc = sqlite3VdbeCursorMoveto(u.bu.pC);
-    if( NEVER(rc) ) goto abort_due_to_error;
-    assert( u.bu.pC->deferredMoveto==0 );
-    assert( u.bu.pC->isTable==0 );
-    if( !u.bu.pC->nullRow ){
-      rc = sqlite3VdbeIdxRowid(db, u.bu.pCrsr, &u.bu.rowid);
-      if( rc!=SQLITE_OK ){
-        goto abort_due_to_error;
-      }
-      pOut->u.i = u.bu.rowid;
-      pOut->flags = MEM_Int;
+  rc = sqlite3VdbeCursorMoveto(pC);
+  if( NEVER(rc) ) goto abort_due_to_error;
+  assert( pC->deferredMoveto==0 );
+  assert( pC->isTable==0 );
+  if( !pC->nullRow ){
+    rowid = 0;  /* Not needed.  Only used to silence a warning. */
+    rc = sqlite3VdbeIdxRowid(db, pCrsr, &rowid);
+    if( rc!=SQLITE_OK ){
+      goto abort_due_to_error;
     }
+    pOut->u.i = rowid;
+    pOut->flags = MEM_Int;
   }
   break;
 }
 
 /* Opcode: IdxGE P1 P2 P3 P4 P5
+** Synopsis: key=r[P3@P4]
 **
 ** The P4 register values beginning with P3 form an unpacked index 
-** key that omits the ROWID.  Compare this key value against the index 
-** that P1 is currently pointing to, ignoring the ROWID on the P1 index.
+** key that omits the PRIMARY KEY.  Compare this key value against the index 
+** that P1 is currently pointing to, ignoring the PRIMARY KEY or ROWID 
+** fields at the end.
 **
 ** If the P1 index entry is greater than or equal to the key value
 ** then jump to P2.  Otherwise fall through to the next instruction.
-**
-** If P5 is non-zero then the key value is increased by an epsilon 
-** prior to the comparison.  This make the opcode work like IdxGT except
-** that if the key from register P3 is a prefix of the key in the cursor,
-** the result is false whereas it would be true with IdxGT.
 */
-/* Opcode: IdxLT P1 P2 P3 P4 P5
+/* Opcode: IdxGT P1 P2 P3 P4 P5
+** Synopsis: key=r[P3@P4]
 **
 ** The P4 register values beginning with P3 form an unpacked index 
-** key that omits the ROWID.  Compare this key value against the index 
-** that P1 is currently pointing to, ignoring the ROWID on the P1 index.
+** key that omits the PRIMARY KEY.  Compare this key value against the index 
+** that P1 is currently pointing to, ignoring the PRIMARY KEY or ROWID 
+** fields at the end.
+**
+** If the P1 index entry is greater than the key value
+** then jump to P2.  Otherwise fall through to the next instruction.
+*/
+/* Opcode: IdxLT P1 P2 P3 P4 P5
+** Synopsis: key=r[P3@P4]
+**
+** The P4 register values beginning with P3 form an unpacked index 
+** key that omits the PRIMARY KEY or ROWID.  Compare this key value against
+** the index that P1 is currently pointing to, ignoring the PRIMARY KEY or
+** ROWID on the P1 index.
 **
 ** If the P1 index entry is less than the key value then jump to P2.
 ** Otherwise fall through to the next instruction.
-**
-** If P5 is non-zero then the key value is increased by an epsilon prior 
-** to the comparison.  This makes the opcode work like IdxLE.
 */
+/* Opcode: IdxLE P1 P2 P3 P4 P5
+** Synopsis: key=r[P3@P4]
+**
+** The P4 register values beginning with P3 form an unpacked index 
+** key that omits the PRIMARY KEY or ROWID.  Compare this key value against
+** the index that P1 is currently pointing to, ignoring the PRIMARY KEY or
+** ROWID on the P1 index.
+**
+** If the P1 index entry is less than or equal to the key value then jump
+** to P2. Otherwise fall through to the next instruction.
+*/
+case OP_IdxLE:          /* jump */
+case OP_IdxGT:          /* jump */
 case OP_IdxLT:          /* jump */
-case OP_IdxGE: {        /* jump */
-#if 0  /* local variables moved into u.bv */
+case OP_IdxGE:  {       /* jump */
   VdbeCursor *pC;
   int res;
   UnpackedRecord r;
-#endif /* local variables moved into u.bv */
 
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
-  u.bv.pC = p->apCsr[pOp->p1];
-  assert( u.bv.pC!=0 );
-  assert( u.bv.pC->isOrdered );
-  if( ALWAYS(u.bv.pC->pCursor!=0) ){
-    assert( u.bv.pC->deferredMoveto==0 );
-    assert( pOp->p5==0 || pOp->p5==1 );
-    assert( pOp->p4type==P4_INT32 );
-    u.bv.r.pKeyInfo = u.bv.pC->pKeyInfo;
-    u.bv.r.nField = (u16)pOp->p4.i;
-    if( pOp->p5 ){
-      u.bv.r.flags = UNPACKED_INCRKEY | UNPACKED_PREFIX_MATCH;
-    }else{
-      u.bv.r.flags = UNPACKED_PREFIX_MATCH;
-    }
-    u.bv.r.aMem = &aMem[pOp->p3];
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  assert( pC->isOrdered );
+  assert( pC->pCursor!=0);
+  assert( pC->deferredMoveto==0 );
+  assert( pOp->p5==0 || pOp->p5==1 );
+  assert( pOp->p4type==P4_INT32 );
+  r.pKeyInfo = pC->pKeyInfo;
+  r.nField = (u16)pOp->p4.i;
+  if( pOp->opcode<OP_IdxLT ){
+    assert( pOp->opcode==OP_IdxLE || pOp->opcode==OP_IdxGT );
+    r.default_rc = -1;
+  }else{
+    assert( pOp->opcode==OP_IdxGE || pOp->opcode==OP_IdxLT );
+    r.default_rc = 0;
+  }
+  r.aMem = &aMem[pOp->p3];
 #ifdef SQLITE_DEBUG
-    { int i; for(i=0; i<u.bv.r.nField; i++) assert( memIsValid(&u.bv.r.aMem[i]) ); }
+  { int i; for(i=0; i<r.nField; i++) assert( memIsValid(&r.aMem[i]) ); }
 #endif
-    rc = sqlite3VdbeIdxKeyCompare(u.bv.pC, &u.bv.r, &u.bv.res);
-    if( pOp->opcode==OP_IdxLT ){
-      u.bv.res = -u.bv.res;
-    }else{
-      assert( pOp->opcode==OP_IdxGE );
-      u.bv.res++;
-    }
-    if( u.bv.res>0 ){
-      pc = pOp->p2 - 1 ;
-    }
+  res = 0;  /* Not needed.  Only used to silence a warning. */
+  rc = sqlite3VdbeIdxKeyCompare(pC, &r, &res);
+  assert( (OP_IdxLE&1)==(OP_IdxLT&1) && (OP_IdxGE&1)==(OP_IdxGT&1) );
+  if( (pOp->opcode&1)==(OP_IdxLT&1) ){
+    assert( pOp->opcode==OP_IdxLE || pOp->opcode==OP_IdxLT );
+    res = -res;
+  }else{
+    assert( pOp->opcode==OP_IdxGE || pOp->opcode==OP_IdxGT );
+    res++;
+  }
+  VdbeBranchTaken(res>0,2);
+  if( res>0 ){
+    pc = pOp->p2 - 1 ;
   }
   break;
 }
@@ -70138,40 +72308,42 @@ case OP_IdxGE: {        /* jump */
 ** See also: Clear
 */
 case OP_Destroy: {     /* out2-prerelease */
-#if 0  /* local variables moved into u.bw */
   int iMoved;
   int iCnt;
   Vdbe *pVdbe;
   int iDb;
-#endif /* local variables moved into u.bw */
 
+  assert( p->readOnly==0 );
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-  u.bw.iCnt = 0;
-  for(u.bw.pVdbe=db->pVdbe; u.bw.pVdbe; u.bw.pVdbe = u.bw.pVdbe->pNext){
-    if( u.bw.pVdbe->magic==VDBE_MAGIC_RUN && u.bw.pVdbe->inVtabMethod<2 && u.bw.pVdbe->pc>=0 ){
-      u.bw.iCnt++;
+  iCnt = 0;
+  for(pVdbe=db->pVdbe; pVdbe; pVdbe = pVdbe->pNext){
+    if( pVdbe->magic==VDBE_MAGIC_RUN && pVdbe->bIsReader 
+     && pVdbe->inVtabMethod<2 && pVdbe->pc>=0 
+    ){
+      iCnt++;
     }
   }
 #else
-  u.bw.iCnt = db->activeVdbeCnt;
+  iCnt = db->nVdbeRead;
 #endif
   pOut->flags = MEM_Null;
-  if( u.bw.iCnt>1 ){
+  if( iCnt>1 ){
     rc = SQLITE_LOCKED;
     p->errorAction = OE_Abort;
   }else{
-    u.bw.iDb = pOp->p3;
-    assert( u.bw.iCnt==1 );
-    assert( (p->btreeMask & (((yDbMask)1)<<u.bw.iDb))!=0 );
-    rc = sqlite3BtreeDropTable(db->aDb[u.bw.iDb].pBt, pOp->p1, &u.bw.iMoved);
+    iDb = pOp->p3;
+    assert( iCnt==1 );
+    assert( (p->btreeMask & (((yDbMask)1)<<iDb))!=0 );
+    iMoved = 0;  /* Not needed.  Only to silence a warning. */
+    rc = sqlite3BtreeDropTable(db->aDb[iDb].pBt, pOp->p1, &iMoved);
     pOut->flags = MEM_Int;
-    pOut->u.i = u.bw.iMoved;
+    pOut->u.i = iMoved;
 #ifndef SQLITE_OMIT_AUTOVACUUM
-    if( rc==SQLITE_OK && u.bw.iMoved!=0 ){
-      sqlite3RootPageMoved(db, u.bw.iDb, u.bw.iMoved, pOp->p1);
+    if( rc==SQLITE_OK && iMoved!=0 ){
+      sqlite3RootPageMoved(db, iDb, iMoved, pOp->p1);
       /* All OP_Destroy operations occur on the same btree */
-      assert( resetSchemaOnFault==0 || resetSchemaOnFault==u.bw.iDb+1 );
-      resetSchemaOnFault = u.bw.iDb+1;
+      assert( resetSchemaOnFault==0 || resetSchemaOnFault==iDb+1 );
+      resetSchemaOnFault = iDb+1;
     }
 #endif
   }
@@ -70197,27 +72369,50 @@ case OP_Destroy: {     /* out2-prerelease */
 ** See also: Destroy
 */
 case OP_Clear: {
-#if 0  /* local variables moved into u.bx */
   int nChange;
-#endif /* local variables moved into u.bx */
-
-  u.bx.nChange = 0;
+ 
+  nChange = 0;
+  assert( p->readOnly==0 );
   assert( (p->btreeMask & (((yDbMask)1)<<pOp->p2))!=0 );
   rc = sqlite3BtreeClearTable(
-      db->aDb[pOp->p2].pBt, pOp->p1, (pOp->p3 ? &u.bx.nChange : 0)
+      db->aDb[pOp->p2].pBt, pOp->p1, (pOp->p3 ? &nChange : 0)
   );
   if( pOp->p3 ){
-    p->nChange += u.bx.nChange;
+    p->nChange += nChange;
     if( pOp->p3>0 ){
       assert( memIsValid(&aMem[pOp->p3]) );
       memAboutToChange(p, &aMem[pOp->p3]);
-      aMem[pOp->p3].u.i += u.bx.nChange;
+      aMem[pOp->p3].u.i += nChange;
     }
   }
   break;
 }
 
+/* Opcode: ResetSorter P1 * * * *
+**
+** Delete all contents from the ephemeral table or sorter
+** that is open on cursor P1.
+**
+** This opcode only works for cursors used for sorting and
+** opened with OP_OpenEphemeral or OP_SorterOpen.
+*/
+case OP_ResetSorter: {
+  VdbeCursor *pC;
+ 
+  assert( pOp->p1>=0 && pOp->p1<p->nCursor );
+  pC = p->apCsr[pOp->p1];
+  assert( pC!=0 );
+  if( pC->pSorter ){
+    sqlite3VdbeSorterReset(db, pC->pSorter);
+  }else{
+    assert( pC->isEphemeral );
+    rc = sqlite3BtreeClearTableOfCursor(pC->pCursor);
+  }
+  break;
+}
+
 /* Opcode: CreateTable P1 P2 * * *
+** Synopsis: r[P2]=root iDb=P1
 **
 ** Allocate a new table in the main database file if P1==0 or in the
 ** auxiliary database file if P1==1 or in an attached database if
@@ -70231,6 +72426,7 @@ case OP_Clear: {
 ** See also: CreateIndex
 */
 /* Opcode: CreateIndex P1 P2 * * *
+** Synopsis: r[P2]=root iDb=P1
 **
 ** Allocate a new index in the main database file if P1==0 or in the
 ** auxiliary database file if P1==1 or in an attached database if
@@ -70241,25 +72437,24 @@ case OP_Clear: {
 */
 case OP_CreateIndex:            /* out2-prerelease */
 case OP_CreateTable: {          /* out2-prerelease */
-#if 0  /* local variables moved into u.by */
   int pgno;
   int flags;
   Db *pDb;
-#endif /* local variables moved into u.by */
 
-  u.by.pgno = 0;
+  pgno = 0;
   assert( pOp->p1>=0 && pOp->p1<db->nDb );
   assert( (p->btreeMask & (((yDbMask)1)<<pOp->p1))!=0 );
-  u.by.pDb = &db->aDb[pOp->p1];
-  assert( u.by.pDb->pBt!=0 );
+  assert( p->readOnly==0 );
+  pDb = &db->aDb[pOp->p1];
+  assert( pDb->pBt!=0 );
   if( pOp->opcode==OP_CreateTable ){
-    /* u.by.flags = BTREE_INTKEY; */
-    u.by.flags = BTREE_INTKEY;
+    /* flags = BTREE_INTKEY; */
+    flags = BTREE_INTKEY;
   }else{
-    u.by.flags = BTREE_BLOBKEY;
+    flags = BTREE_BLOBKEY;
   }
-  rc = sqlite3BtreeCreateTable(u.by.pDb->pBt, &u.by.pgno, u.by.flags);
-  pOut->u.i = u.by.pgno;
+  rc = sqlite3BtreeCreateTable(pDb->pBt, &pgno, flags);
+  pOut->u.i = pgno;
   break;
 }
 
@@ -70272,44 +72467,42 @@ case OP_CreateTable: {          /* out2-prerelease */
 ** then runs the new virtual machine.  It is thus a re-entrant opcode.
 */
 case OP_ParseSchema: {
-#if 0  /* local variables moved into u.bz */
   int iDb;
   const char *zMaster;
   char *zSql;
   InitData initData;
-#endif /* local variables moved into u.bz */
 
   /* Any prepared statement that invokes this opcode will hold mutexes
-  ** on every btree.  This is a prerequisite for invoking
+  ** on every btree.  This is a prerequisite for invoking 
   ** sqlite3InitCallback().
   */
 #ifdef SQLITE_DEBUG
-  for(u.bz.iDb=0; u.bz.iDb<db->nDb; u.bz.iDb++){
-    assert( u.bz.iDb==1 || sqlite3BtreeHoldsMutex(db->aDb[u.bz.iDb].pBt) );
+  for(iDb=0; iDb<db->nDb; iDb++){
+    assert( iDb==1 || sqlite3BtreeHoldsMutex(db->aDb[iDb].pBt) );
   }
 #endif
 
-  u.bz.iDb = pOp->p1;
-  assert( u.bz.iDb>=0 && u.bz.iDb<db->nDb );
-  assert( DbHasProperty(db, u.bz.iDb, DB_SchemaLoaded) );
+  iDb = pOp->p1;
+  assert( iDb>=0 && iDb<db->nDb );
+  assert( DbHasProperty(db, iDb, DB_SchemaLoaded) );
   /* Used to be a conditional */ {
-    u.bz.zMaster = SCHEMA_TABLE(u.bz.iDb);
-    u.bz.initData.db = db;
-    u.bz.initData.iDb = pOp->p1;
-    u.bz.initData.pzErrMsg = &p->zErrMsg;
-    u.bz.zSql = sqlite3MPrintf(db,
+    zMaster = SCHEMA_TABLE(iDb);
+    initData.db = db;
+    initData.iDb = pOp->p1;
+    initData.pzErrMsg = &p->zErrMsg;
+    zSql = sqlite3MPrintf(db,
        "SELECT name, rootpage, sql FROM '%q'.%s WHERE %s ORDER BY rowid",
-       db->aDb[u.bz.iDb].zName, u.bz.zMaster, pOp->p4.z);
-    if( u.bz.zSql==0 ){
+       db->aDb[iDb].zName, zMaster, pOp->p4.z);
+    if( zSql==0 ){
       rc = SQLITE_NOMEM;
     }else{
       assert( db->init.busy==0 );
       db->init.busy = 1;
-      u.bz.initData.rc = SQLITE_OK;
+      initData.rc = SQLITE_OK;
       assert( !db->mallocFailed );
-      rc = sqlite3_exec(db, u.bz.zSql, sqlite3InitCallback, &u.bz.initData, 0);
-      if( rc==SQLITE_OK ) rc = u.bz.initData.rc;
-      sqlite3DbFree(db, u.bz.zSql);
+      rc = sqlite3_exec(db, zSql, sqlite3InitCallback, &initData, 0);
+      if( rc==SQLITE_OK ) rc = initData.rc;
+      sqlite3DbFree(db, zSql);
       db->init.busy = 0;
     }
   }
@@ -70317,7 +72510,7 @@ case OP_ParseSchema: {
   if( rc==SQLITE_NOMEM ){
     goto no_mem;
   }
-  break;
+  break;  
 }
 
 #if !defined(SQLITE_OMIT_ANALYZE)
@@ -70393,41 +72586,40 @@ case OP_DropTrigger: {
 ** This opcode is used to implement the integrity_check pragma.
 */
 case OP_IntegrityCk: {
-#if 0  /* local variables moved into u.ca */
   int nRoot;      /* Number of tables to check.  (Number of root pages.) */
   int *aRoot;     /* Array of rootpage numbers for tables to be checked */
   int j;          /* Loop counter */
   int nErr;       /* Number of errors reported */
   char *z;        /* Text of the error report */
   Mem *pnErr;     /* Register keeping track of errors remaining */
-#endif /* local variables moved into u.ca */
 
-  u.ca.nRoot = pOp->p2;
-  assert( u.ca.nRoot>0 );
-  u.ca.aRoot = sqlite3DbMallocRaw(db, sizeof(int)*(u.ca.nRoot+1) );
-  if( u.ca.aRoot==0 ) goto no_mem;
-  assert( pOp->p3>0 && pOp->p3<=p->nMem );
-  u.ca.pnErr = &aMem[pOp->p3];
-  assert( (u.ca.pnErr->flags & MEM_Int)!=0 );
-  assert( (u.ca.pnErr->flags & (MEM_Str|MEM_Blob))==0 );
+  assert( p->bIsReader );
+  nRoot = pOp->p2;
+  assert( nRoot>0 );
+  aRoot = sqlite3DbMallocRaw(db, sizeof(int)*(nRoot+1) );
+  if( aRoot==0 ) goto no_mem;
+  assert( pOp->p3>0 && pOp->p3<=(p->nMem-p->nCursor) );
+  pnErr = &aMem[pOp->p3];
+  assert( (pnErr->flags & MEM_Int)!=0 );
+  assert( (pnErr->flags & (MEM_Str|MEM_Blob))==0 );
   pIn1 = &aMem[pOp->p1];
-  for(u.ca.j=0; u.ca.j<u.ca.nRoot; u.ca.j++){
-    u.ca.aRoot[u.ca.j] = (int)sqlite3VdbeIntValue(&pIn1[u.ca.j]);
+  for(j=0; j<nRoot; j++){
+    aRoot[j] = (int)sqlite3VdbeIntValue(&pIn1[j]);
   }
-  u.ca.aRoot[u.ca.j] = 0;
+  aRoot[j] = 0;
   assert( pOp->p5<db->nDb );
   assert( (p->btreeMask & (((yDbMask)1)<<pOp->p5))!=0 );
-  u.ca.z = sqlite3BtreeIntegrityCheck(db->aDb[pOp->p5].pBt, u.ca.aRoot, u.ca.nRoot,
-                                 (int)u.ca.pnErr->u.i, &u.ca.nErr);
-  sqlite3DbFree(db, u.ca.aRoot);
-  u.ca.pnErr->u.i -= u.ca.nErr;
+  z = sqlite3BtreeIntegrityCheck(db->aDb[pOp->p5].pBt, aRoot, nRoot,
+                                 (int)pnErr->u.i, &nErr);
+  sqlite3DbFree(db, aRoot);
+  pnErr->u.i -= nErr;
   sqlite3VdbeMemSetNull(pIn1);
-  if( u.ca.nErr==0 ){
-    assert( u.ca.z==0 );
-  }else if( u.ca.z==0 ){
+  if( nErr==0 ){
+    assert( z==0 );
+  }else if( z==0 ){
     goto no_mem;
   }else{
-    sqlite3VdbeMemSetStr(pIn1, u.ca.z, -1, SQLITE_UTF8, sqlite3_free);
+    sqlite3VdbeMemSetStr(pIn1, z, -1, SQLITE_UTF8, sqlite3_free);
   }
   UPDATE_MAX_BLOBSIZE(pIn1);
   sqlite3VdbeChangeEncoding(pIn1, encoding);
@@ -70436,6 +72628,7 @@ case OP_IntegrityCk: {
 #endif /* SQLITE_OMIT_INTEGRITY_CHECK */
 
 /* Opcode: RowSetAdd P1 P2 * * *
+** Synopsis:  rowset(P1)=r[P2]
 **
 ** Insert the integer value held by register P2 into a boolean index
 ** held in register P1.
@@ -70455,31 +72648,33 @@ case OP_RowSetAdd: {       /* in1, in2 */
 }
 
 /* Opcode: RowSetRead P1 P2 P3 * *
+** Synopsis:  r[P3]=rowset(P1)
 **
 ** Extract the smallest value from boolean index P1 and put that value into
 ** register P3.  Or, if boolean index P1 is initially empty, leave P3
 ** unchanged and jump to instruction P2.
 */
 case OP_RowSetRead: {       /* jump, in1, out3 */
-#if 0  /* local variables moved into u.cb */
   i64 val;
-#endif /* local variables moved into u.cb */
-  CHECK_FOR_INTERRUPT;
+
   pIn1 = &aMem[pOp->p1];
-  if( (pIn1->flags & MEM_RowSet)==0
-   || sqlite3RowSetNext(pIn1->u.pRowSet, &u.cb.val)==0
+  if( (pIn1->flags & MEM_RowSet)==0 
+   || sqlite3RowSetNext(pIn1->u.pRowSet, &val)==0
   ){
     /* The boolean index is empty */
     sqlite3VdbeMemSetNull(pIn1);
     pc = pOp->p2 - 1;
+    VdbeBranchTaken(1,2);
   }else{
     /* A value was pulled from the index */
-    sqlite3VdbeMemSetInt64(&aMem[pOp->p3], u.cb.val);
+    sqlite3VdbeMemSetInt64(&aMem[pOp->p3], val);
+    VdbeBranchTaken(0,2);
   }
-  break;
+  goto check_for_interrupt;
 }
 
 /* Opcode: RowSetTest P1 P2 P3 P4
+** Synopsis: if r[P3] in rowset(P1) goto P2
 **
 ** Register P3 is assumed to hold a 64-bit integer value. If register P1
 ** contains a RowSet object and that RowSet object contains
@@ -70503,14 +72698,12 @@ case OP_RowSetRead: {       /* jump, in1, out3 */
 ** inserted as part of some other set).
 */
 case OP_RowSetTest: {                     /* jump, in1, in3 */
-#if 0  /* local variables moved into u.cc */
   int iSet;
   int exists;
-#endif /* local variables moved into u.cc */
 
   pIn1 = &aMem[pOp->p1];
   pIn3 = &aMem[pOp->p3];
-  u.cc.iSet = pOp->p4.i;
+  iSet = pOp->p4.i;
   assert( pIn3->flags&MEM_Int );
 
   /* If there is anything other than a rowset object in memory cell P1,
@@ -70522,17 +72715,16 @@ case OP_RowSetTest: {                     /* jump, in1, in3 */
   }
 
   assert( pOp->p4type==P4_INT32 );
-  assert( u.cc.iSet==-1 || u.cc.iSet>=0 );
-  if( u.cc.iSet ){
-    u.cc.exists = sqlite3RowSetTest(pIn1->u.pRowSet,
-                               (u8)(u.cc.iSet>=0 ? u.cc.iSet & 0xf : 0xff),
-                               pIn3->u.i);
-    if( u.cc.exists ){
+  assert( iSet==-1 || iSet>=0 );
+  if( iSet ){
+    exists = sqlite3RowSetTest(pIn1->u.pRowSet, iSet, pIn3->u.i);
+    VdbeBranchTaken(exists!=0,2);
+    if( exists ){
       pc = pOp->p2 - 1;
       break;
     }
   }
-  if( u.cc.iSet>=0 ){
+  if( iSet>=0 ){
     sqlite3RowSetInsert(pIn1->u.pRowSet, pIn3->u.i);
   }
   break;
@@ -70541,7 +72733,7 @@ case OP_RowSetTest: {                     /* jump, in1, in3 */
 
 #ifndef SQLITE_OMIT_TRIGGER
 
-/* Opcode: Program P1 P2 P3 P4 *
+/* Opcode: Program P1 P2 P3 P4 P5
 **
 ** Execute the trigger program passed as P4 (type P4_SUBPROGRAM). 
 **
@@ -70553,9 +72745,10 @@ case OP_RowSetTest: {                     /* jump, in1, in3 */
 ** memory required by the sub-vdbe at runtime.
 **
 ** P4 is a pointer to the VM containing the trigger program.
+**
+** If P5 is non-zero, then recursive program invocation is enabled.
 */
 case OP_Program: {        /* jump */
-#if 0  /* local variables moved into u.cd */
   int nMem;               /* Number of memory registers for sub-program */
   int nByte;              /* Bytes of runtime space required for sub-program */
   Mem *pRt;               /* Register to allocate runtime space */
@@ -70564,27 +72757,26 @@ case OP_Program: {        /* jump */
   VdbeFrame *pFrame;      /* New vdbe frame to execute in */
   SubProgram *pProgram;   /* Sub-program to execute */
   void *t;                /* Token identifying trigger */
-#endif /* local variables moved into u.cd */
 
-  u.cd.pProgram = pOp->p4.pProgram;
-  u.cd.pRt = &aMem[pOp->p3];
-  assert( u.cd.pProgram->nOp>0 );
-
-  /* If the p5 flag is clear, then recursive invocation of triggers is
+  pProgram = pOp->p4.pProgram;
+  pRt = &aMem[pOp->p3];
+  assert( pProgram->nOp>0 );
+  
+  /* If the p5 flag is clear, then recursive invocation of triggers is 
   ** disabled for backwards compatibility (p5 is set if this sub-program
   ** is really a trigger, not a foreign key action, and the flag set
   ** and cleared by the "PRAGMA recursive_triggers" command is clear).
-  **
-  ** It is recursive invocation of triggers, at the SQL level, that is
-  ** disabled. In some cases a single trigger may generate more than one
-  ** SubProgram (if the trigger may be executed with more than one different
+  ** 
+  ** It is recursive invocation of triggers, at the SQL level, that is 
+  ** disabled. In some cases a single trigger may generate more than one 
+  ** SubProgram (if the trigger may be executed with more than one different 
   ** ON CONFLICT algorithm). SubProgram structures associated with a
-  ** single trigger all have the same value for the SubProgram.token
+  ** single trigger all have the same value for the SubProgram.token 
   ** variable.  */
   if( pOp->p5 ){
-    u.cd.t = u.cd.pProgram->token;
-    for(u.cd.pFrame=p->pFrame; u.cd.pFrame && u.cd.pFrame->token!=u.cd.t; u.cd.pFrame=u.cd.pFrame->pParent);
-    if( u.cd.pFrame ) break;
+    t = pProgram->token;
+    for(pFrame=p->pFrame; pFrame && pFrame->token!=t; pFrame=pFrame->pParent);
+    if( pFrame ) break;
   }
 
   if( p->nFrame>=db->aLimit[SQLITE_LIMIT_TRIGGER_DEPTH] ){
@@ -70593,69 +72785,69 @@ case OP_Program: {        /* jump */
     break;
   }
 
-  /* Register u.cd.pRt is used to store the memory required to save the state
+  /* Register pRt is used to store the memory required to save the state
   ** of the current program, and the memory required at runtime to execute
-  ** the trigger program. If this trigger has been fired before, then u.cd.pRt
+  ** the trigger program. If this trigger has been fired before, then pRt 
   ** is already allocated. Otherwise, it must be initialized.  */
-  if( (u.cd.pRt->flags&MEM_Frame)==0 ){
-    /* SubProgram.nMem is set to the number of memory cells used by the
+  if( (pRt->flags&MEM_Frame)==0 ){
+    /* SubProgram.nMem is set to the number of memory cells used by the 
     ** program stored in SubProgram.aOp. As well as these, one memory
     ** cell is required for each cursor used by the program. Set local
-    ** variable u.cd.nMem (and later, VdbeFrame.nChildMem) to this value.
+    ** variable nMem (and later, VdbeFrame.nChildMem) to this value.
     */
-    u.cd.nMem = u.cd.pProgram->nMem + u.cd.pProgram->nCsr;
-    u.cd.nByte = ROUND8(sizeof(VdbeFrame))
-              + u.cd.nMem * sizeof(Mem)
-              + u.cd.pProgram->nCsr * sizeof(VdbeCursor *)
-              + u.cd.pProgram->nOnce * sizeof(u8);
-    u.cd.pFrame = sqlite3DbMallocZero(db, u.cd.nByte);
-    if( !u.cd.pFrame ){
+    nMem = pProgram->nMem + pProgram->nCsr;
+    nByte = ROUND8(sizeof(VdbeFrame))
+              + nMem * sizeof(Mem)
+              + pProgram->nCsr * sizeof(VdbeCursor *)
+              + pProgram->nOnce * sizeof(u8);
+    pFrame = sqlite3DbMallocZero(db, nByte);
+    if( !pFrame ){
       goto no_mem;
     }
-    sqlite3VdbeMemRelease(u.cd.pRt);
-    u.cd.pRt->flags = MEM_Frame;
-    u.cd.pRt->u.pFrame = u.cd.pFrame;
+    sqlite3VdbeMemRelease(pRt);
+    pRt->flags = MEM_Frame;
+    pRt->u.pFrame = pFrame;
 
-    u.cd.pFrame->v = p;
-    u.cd.pFrame->nChildMem = u.cd.nMem;
-    u.cd.pFrame->nChildCsr = u.cd.pProgram->nCsr;
-    u.cd.pFrame->pc = pc;
-    u.cd.pFrame->aMem = p->aMem;
-    u.cd.pFrame->nMem = p->nMem;
-    u.cd.pFrame->apCsr = p->apCsr;
-    u.cd.pFrame->nCursor = p->nCursor;
-    u.cd.pFrame->aOp = p->aOp;
-    u.cd.pFrame->nOp = p->nOp;
-    u.cd.pFrame->token = u.cd.pProgram->token;
-    u.cd.pFrame->aOnceFlag = p->aOnceFlag;
-    u.cd.pFrame->nOnceFlag = p->nOnceFlag;
+    pFrame->v = p;
+    pFrame->nChildMem = nMem;
+    pFrame->nChildCsr = pProgram->nCsr;
+    pFrame->pc = pc;
+    pFrame->aMem = p->aMem;
+    pFrame->nMem = p->nMem;
+    pFrame->apCsr = p->apCsr;
+    pFrame->nCursor = p->nCursor;
+    pFrame->aOp = p->aOp;
+    pFrame->nOp = p->nOp;
+    pFrame->token = pProgram->token;
+    pFrame->aOnceFlag = p->aOnceFlag;
+    pFrame->nOnceFlag = p->nOnceFlag;
 
-    u.cd.pEnd = &VdbeFrameMem(u.cd.pFrame)[u.cd.pFrame->nChildMem];
-    for(u.cd.pMem=VdbeFrameMem(u.cd.pFrame); u.cd.pMem!=u.cd.pEnd; u.cd.pMem++){
-      u.cd.pMem->flags = MEM_Invalid;
-      u.cd.pMem->db = db;
+    pEnd = &VdbeFrameMem(pFrame)[pFrame->nChildMem];
+    for(pMem=VdbeFrameMem(pFrame); pMem!=pEnd; pMem++){
+      pMem->flags = MEM_Undefined;
+      pMem->db = db;
     }
   }else{
-    u.cd.pFrame = u.cd.pRt->u.pFrame;
-    assert( u.cd.pProgram->nMem+u.cd.pProgram->nCsr==u.cd.pFrame->nChildMem );
-    assert( u.cd.pProgram->nCsr==u.cd.pFrame->nChildCsr );
-    assert( pc==u.cd.pFrame->pc );
+    pFrame = pRt->u.pFrame;
+    assert( pProgram->nMem+pProgram->nCsr==pFrame->nChildMem );
+    assert( pProgram->nCsr==pFrame->nChildCsr );
+    assert( pc==pFrame->pc );
   }
 
   p->nFrame++;
-  u.cd.pFrame->pParent = p->pFrame;
-  u.cd.pFrame->lastRowid = lastRowid;
-  u.cd.pFrame->nChange = p->nChange;
+  pFrame->pParent = p->pFrame;
+  pFrame->lastRowid = lastRowid;
+  pFrame->nChange = p->nChange;
   p->nChange = 0;
-  p->pFrame = u.cd.pFrame;
-  p->aMem = aMem = &VdbeFrameMem(u.cd.pFrame)[-1];
-  p->nMem = u.cd.pFrame->nChildMem;
-  p->nCursor = (u16)u.cd.pFrame->nChildCsr;
+  p->pFrame = pFrame;
+  p->aMem = aMem = &VdbeFrameMem(pFrame)[-1];
+  p->nMem = pFrame->nChildMem;
+  p->nCursor = (u16)pFrame->nChildCsr;
   p->apCsr = (VdbeCursor **)&aMem[p->nMem+1];
-  p->aOp = aOp = u.cd.pProgram->aOp;
-  p->nOp = u.cd.pProgram->nOp;
+  p->aOp = aOp = pProgram->aOp;
+  p->nOp = pProgram->nOp;
   p->aOnceFlag = (u8 *)&p->apCsr[p->nCursor];
-  p->nOnceFlag = u.cd.pProgram->nOnce;
+  p->nOnceFlag = pProgram->nOnce;
   pc = -1;
   memset(p->aOnceFlag, 0, p->nOnceFlag);
 
@@ -70675,13 +72867,11 @@ case OP_Program: {        /* jump */
 ** calling OP_Program instruction.
 */
 case OP_Param: {           /* out2-prerelease */
-#if 0  /* local variables moved into u.ce */
   VdbeFrame *pFrame;
   Mem *pIn;
-#endif /* local variables moved into u.ce */
-  u.ce.pFrame = p->pFrame;
-  u.ce.pIn = &u.ce.pFrame->aMem[pOp->p1 + u.ce.pFrame->aOp[u.ce.pFrame->pc].p1];
-  sqlite3VdbeMemShallowCopy(pOut, u.ce.pIn, MEM_Ephem);
+  pFrame = p->pFrame;
+  pIn = &pFrame->aMem[pOp->p1 + pFrame->aOp[pFrame->pc].p1];   
+  sqlite3VdbeMemShallowCopy(pOut, pIn, MEM_Ephem);
   break;
 }
 
@@ -70689,6 +72879,7 @@ case OP_Param: {           /* out2-prerelease */
 
 #ifndef SQLITE_OMIT_FOREIGN_KEY
 /* Opcode: FkCounter P1 P2 * * *
+** Synopsis: fkctr[P1]+=P2
 **
 ** Increment a "constraint counter" by P2 (P2 may be negative or positive).
 ** If P1 is non-zero, the database constraint counter is incremented 
@@ -70696,7 +72887,9 @@ case OP_Param: {           /* out2-prerelease */
 ** statement counter is incremented (immediate foreign key constraints).
 */
 case OP_FkCounter: {
-  if( pOp->p1 ){
+  if( db->flags & SQLITE_DeferFKs ){
+    db->nDeferredImmCons += pOp->p2;
+  }else if( pOp->p1 ){
     db->nDeferredCons += pOp->p2;
   }else{
     p->nFkConstraint += pOp->p2;
@@ -70705,6 +72898,7 @@ case OP_FkCounter: {
 }
 
 /* Opcode: FkIfZero P1 P2 * * *
+** Synopsis: if fkctr[P1]==0 goto P2
 **
 ** This opcode tests if a foreign key constraint-counter is currently zero.
 ** If so, jump to instruction P2. Otherwise, fall through to the next 
@@ -70717,9 +72911,11 @@ case OP_FkCounter: {
 */
 case OP_FkIfZero: {         /* jump */
   if( pOp->p1 ){
-    if( db->nDeferredCons==0 ) pc = pOp->p2-1;
+    VdbeBranchTaken(db->nDeferredCons==0 && db->nDeferredImmCons==0, 2);
+    if( db->nDeferredCons==0 && db->nDeferredImmCons==0 ) pc = pOp->p2-1;
   }else{
-    if( p->nFkConstraint==0 ) pc = pOp->p2-1;
+    VdbeBranchTaken(p->nFkConstraint==0 && db->nDeferredImmCons==0, 2);
+    if( p->nFkConstraint==0 && db->nDeferredImmCons==0 ) pc = pOp->p2-1;
   }
   break;
 }
@@ -70727,6 +72923,7 @@ case OP_FkIfZero: {         /* jump */
 
 #ifndef SQLITE_OMIT_AUTOINCREMENT
 /* Opcode: MemMax P1 P2 * * *
+** Synopsis: r[P1]=max(r[P1],r[P2])
 **
 ** P1 is a register in the root frame of this VM (the root frame is
 ** different from the current frame if this instruction is being executed
@@ -70737,28 +72934,26 @@ case OP_FkIfZero: {         /* jump */
 ** an integer.
 */
 case OP_MemMax: {        /* in2 */
-#if 0  /* local variables moved into u.cf */
-  Mem *pIn1;
   VdbeFrame *pFrame;
-#endif /* local variables moved into u.cf */
   if( p->pFrame ){
-    for(u.cf.pFrame=p->pFrame; u.cf.pFrame->pParent; u.cf.pFrame=u.cf.pFrame->pParent);
-    u.cf.pIn1 = &u.cf.pFrame->aMem[pOp->p1];
+    for(pFrame=p->pFrame; pFrame->pParent; pFrame=pFrame->pParent);
+    pIn1 = &pFrame->aMem[pOp->p1];
   }else{
-    u.cf.pIn1 = &aMem[pOp->p1];
+    pIn1 = &aMem[pOp->p1];
   }
-  assert( memIsValid(u.cf.pIn1) );
-  sqlite3VdbeMemIntegerify(u.cf.pIn1);
+  assert( memIsValid(pIn1) );
+  sqlite3VdbeMemIntegerify(pIn1);
   pIn2 = &aMem[pOp->p2];
   sqlite3VdbeMemIntegerify(pIn2);
-  if( u.cf.pIn1->u.i<pIn2->u.i){
-    u.cf.pIn1->u.i = pIn2->u.i;
+  if( pIn1->u.i<pIn2->u.i){
+    pIn1->u.i = pIn2->u.i;
   }
   break;
 }
 #endif /* SQLITE_OMIT_AUTOINCREMENT */
 
 /* Opcode: IfPos P1 P2 * * *
+** Synopsis: if r[P1]>0 goto P2
 **
 ** If the value of register P1 is 1 or greater, jump to P2.
 **
@@ -70768,6 +72963,7 @@ case OP_MemMax: {        /* in2 */
 case OP_IfPos: {        /* jump, in1 */
   pIn1 = &aMem[pOp->p1];
   assert( pIn1->flags&MEM_Int );
+  VdbeBranchTaken( pIn1->u.i>0, 2);
   if( pIn1->u.i>0 ){
      pc = pOp->p2 - 1;
   }
@@ -70775,6 +72971,7 @@ case OP_IfPos: {        /* jump, in1 */
 }
 
 /* Opcode: IfNeg P1 P2 * * *
+** Synopsis: if r[P1]<0 goto P2
 **
 ** If the value of register P1 is less than zero, jump to P2. 
 **
@@ -70784,6 +72981,7 @@ case OP_IfPos: {        /* jump, in1 */
 case OP_IfNeg: {        /* jump, in1 */
   pIn1 = &aMem[pOp->p1];
   assert( pIn1->flags&MEM_Int );
+  VdbeBranchTaken(pIn1->u.i<0, 2);
   if( pIn1->u.i<0 ){
      pc = pOp->p2 - 1;
   }
@@ -70791,6 +72989,7 @@ case OP_IfNeg: {        /* jump, in1 */
 }
 
 /* Opcode: IfZero P1 P2 P3 * *
+** Synopsis: r[P1]+=P3, if r[P1]==0 goto P2
 **
 ** The register P1 must contain an integer.  Add literal P3 to the
 ** value in register P1.  If the result is exactly 0, jump to P2. 
@@ -70802,6 +73001,7 @@ case OP_IfZero: {        /* jump, in1 */
   pIn1 = &aMem[pOp->p1];
   assert( pIn1->flags&MEM_Int );
   pIn1->u.i += pOp->p3;
+  VdbeBranchTaken(pIn1->u.i==0, 2);
   if( pIn1->u.i==0 ){
      pc = pOp->p2 - 1;
   }
@@ -70809,6 +73009,7 @@ case OP_IfZero: {        /* jump, in1 */
 }
 
 /* Opcode: AggStep * P2 P3 P4 P5
+** Synopsis: accum=r[P3] step(r[P2@P5])
 **
 ** Execute the step function for an aggregate.  The
 ** function has P5 arguments.   P4 is a pointer to the FuncDef
@@ -70819,61 +73020,59 @@ case OP_IfZero: {        /* jump, in1 */
 ** successors.
 */
 case OP_AggStep: {
-#if 0  /* local variables moved into u.cg */
   int n;
   int i;
   Mem *pMem;
   Mem *pRec;
   sqlite3_context ctx;
   sqlite3_value **apVal;
-#endif /* local variables moved into u.cg */
 
-  u.cg.n = pOp->p5;
-  assert( u.cg.n>=0 );
-  u.cg.pRec = &aMem[pOp->p2];
-  u.cg.apVal = p->apArg;
-  assert( u.cg.apVal || u.cg.n==0 );
-  for(u.cg.i=0; u.cg.i<u.cg.n; u.cg.i++, u.cg.pRec++){
-    assert( memIsValid(u.cg.pRec) );
-    u.cg.apVal[u.cg.i] = u.cg.pRec;
-    memAboutToChange(p, u.cg.pRec);
-    sqlite3VdbeMemStoreType(u.cg.pRec);
+  n = pOp->p5;
+  assert( n>=0 );
+  pRec = &aMem[pOp->p2];
+  apVal = p->apArg;
+  assert( apVal || n==0 );
+  for(i=0; i<n; i++, pRec++){
+    assert( memIsValid(pRec) );
+    apVal[i] = pRec;
+    memAboutToChange(p, pRec);
   }
-  u.cg.ctx.pFunc = pOp->p4.pFunc;
-  assert( pOp->p3>0 && pOp->p3<=p->nMem );
-  u.cg.ctx.pMem = u.cg.pMem = &aMem[pOp->p3];
-  u.cg.pMem->n++;
-  u.cg.ctx.s.flags = MEM_Null;
-  u.cg.ctx.s.z = 0;
-  u.cg.ctx.s.zMalloc = 0;
-  u.cg.ctx.s.xDel = 0;
-  u.cg.ctx.s.db = db;
-  u.cg.ctx.isError = 0;
-  u.cg.ctx.pColl = 0;
-  u.cg.ctx.skipFlag = 0;
-  if( u.cg.ctx.pFunc->flags & SQLITE_FUNC_NEEDCOLL ){
+  ctx.pFunc = pOp->p4.pFunc;
+  assert( pOp->p3>0 && pOp->p3<=(p->nMem-p->nCursor) );
+  ctx.pMem = pMem = &aMem[pOp->p3];
+  pMem->n++;
+  ctx.s.flags = MEM_Null;
+  ctx.s.z = 0;
+  ctx.s.zMalloc = 0;
+  ctx.s.xDel = 0;
+  ctx.s.db = db;
+  ctx.isError = 0;
+  ctx.pColl = 0;
+  ctx.skipFlag = 0;
+  if( ctx.pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL ){
     assert( pOp>p->aOp );
     assert( pOp[-1].p4type==P4_COLLSEQ );
     assert( pOp[-1].opcode==OP_CollSeq );
-    u.cg.ctx.pColl = pOp[-1].p4.pColl;
+    ctx.pColl = pOp[-1].p4.pColl;
   }
-  (u.cg.ctx.pFunc->xStep)(&u.cg.ctx, u.cg.n, u.cg.apVal); /* IMP: R-24505-23230 */
-  if( u.cg.ctx.isError ){
-    sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3_value_text(&u.cg.ctx.s));
-    rc = u.cg.ctx.isError;
+  (ctx.pFunc->xStep)(&ctx, n, apVal); /* IMP: R-24505-23230 */
+  if( ctx.isError ){
+    sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3_value_text(&ctx.s));
+    rc = ctx.isError;
   }
-  if( u.cg.ctx.skipFlag ){
+  if( ctx.skipFlag ){
     assert( pOp[-1].opcode==OP_CollSeq );
-    u.cg.i = pOp[-1].p1;
-    if( u.cg.i ) sqlite3VdbeMemSetInt64(&aMem[u.cg.i], 1);
+    i = pOp[-1].p1;
+    if( i ) sqlite3VdbeMemSetInt64(&aMem[i], 1);
   }
 
-  sqlite3VdbeMemRelease(&u.cg.ctx.s);
+  sqlite3VdbeMemRelease(&ctx.s);
 
   break;
 }
 
 /* Opcode: AggFinal P1 P2 * P4 *
+** Synopsis: accum=r[P1] N=P2
 **
 ** Execute the finalizer function for an aggregate.  P1 is
 ** the memory location that is the accumulator for the aggregate.
@@ -70886,19 +73085,17 @@ case OP_AggStep: {
 ** the step function was not previously called.
 */
 case OP_AggFinal: {
-#if 0  /* local variables moved into u.ch */
   Mem *pMem;
-#endif /* local variables moved into u.ch */
-  assert( pOp->p1>0 && pOp->p1<=p->nMem );
-  u.ch.pMem = &aMem[pOp->p1];
-  assert( (u.ch.pMem->flags & ~(MEM_Null|MEM_Agg))==0 );
-  rc = sqlite3VdbeMemFinalize(u.ch.pMem, pOp->p4.pFunc);
+  assert( pOp->p1>0 && pOp->p1<=(p->nMem-p->nCursor) );
+  pMem = &aMem[pOp->p1];
+  assert( (pMem->flags & ~(MEM_Null|MEM_Agg))==0 );
+  rc = sqlite3VdbeMemFinalize(pMem, pOp->p4.pFunc);
   if( rc ){
-    sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3_value_text(u.ch.pMem));
+    sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3_value_text(pMem));
   }
-  sqlite3VdbeChangeEncoding(u.ch.pMem, encoding);
-  UPDATE_MAX_BLOBSIZE(u.ch.pMem);
-  if( sqlite3VdbeMemTooBig(u.ch.pMem) ){
+  sqlite3VdbeChangeEncoding(pMem, encoding);
+  UPDATE_MAX_BLOBSIZE(pMem);
+  if( sqlite3VdbeMemTooBig(pMem) ){
     goto too_big;
   }
   break;
@@ -70917,32 +73114,31 @@ case OP_AggFinal: {
 ** mem[P3+2] are initialized to -1.
 */
 case OP_Checkpoint: {
-#if 0  /* local variables moved into u.ci */
   int i;                          /* Loop counter */
   int aRes[3];                    /* Results */
   Mem *pMem;                      /* Write results here */
-#endif /* local variables moved into u.ci */
 
-  u.ci.aRes[0] = 0;
-  u.ci.aRes[1] = u.ci.aRes[2] = -1;
+  assert( p->readOnly==0 );
+  aRes[0] = 0;
+  aRes[1] = aRes[2] = -1;
   assert( pOp->p2==SQLITE_CHECKPOINT_PASSIVE
        || pOp->p2==SQLITE_CHECKPOINT_FULL
        || pOp->p2==SQLITE_CHECKPOINT_RESTART
   );
-  rc = sqlite3Checkpoint(db, pOp->p1, pOp->p2, &u.ci.aRes[1], &u.ci.aRes[2]);
+  rc = sqlite3Checkpoint(db, pOp->p1, pOp->p2, &aRes[1], &aRes[2]);
   if( rc==SQLITE_BUSY ){
     rc = SQLITE_OK;
-    u.ci.aRes[0] = 1;
-  }
-  for(u.ci.i=0, u.ci.pMem = &aMem[pOp->p3]; u.ci.i<3; u.ci.i++, u.ci.pMem++){
-    sqlite3VdbeMemSetInt64(u.ci.pMem, (i64)u.ci.aRes[u.ci.i]);
+    aRes[0] = 1;
   }
+  for(i=0, pMem = &aMem[pOp->p3]; i<3; i++, pMem++){
+    sqlite3VdbeMemSetInt64(pMem, (i64)aRes[i]);
+  }    
   break;
 };  
 #endif
 
 #ifndef SQLITE_OMIT_PRAGMA
-/* Opcode: JournalMode P1 P2 P3 * P5
+/* Opcode: JournalMode P1 P2 P3 * *
 **
 ** Change the journal mode of database P1 to P3. P3 must be one of the
 ** PAGER_JOURNALMODE_XXX values. If changing between the various rollback
@@ -70954,7 +73150,6 @@ case OP_Checkpoint: {
 ** Write a string containing the final journal-mode to register P2.
 */
 case OP_JournalMode: {    /* out2-prerelease */
-#if 0  /* local variables moved into u.cj */
   Btree *pBt;                     /* Btree to change journal mode of */
   Pager *pPager;                  /* Pager associated with pBt */
   int eNew;                       /* New journal mode */
@@ -70962,85 +73157,85 @@ case OP_JournalMode: {    /* out2-prerelease */
 #ifndef SQLITE_OMIT_WAL
   const char *zFilename;          /* Name of database file for pPager */
 #endif
-#endif /* local variables moved into u.cj */
 
-  u.cj.eNew = pOp->p3;
-  assert( u.cj.eNew==PAGER_JOURNALMODE_DELETE
-       || u.cj.eNew==PAGER_JOURNALMODE_TRUNCATE
-       || u.cj.eNew==PAGER_JOURNALMODE_PERSIST
-       || u.cj.eNew==PAGER_JOURNALMODE_OFF
-       || u.cj.eNew==PAGER_JOURNALMODE_MEMORY
-       || u.cj.eNew==PAGER_JOURNALMODE_WAL
-       || u.cj.eNew==PAGER_JOURNALMODE_QUERY
+  eNew = pOp->p3;
+  assert( eNew==PAGER_JOURNALMODE_DELETE 
+       || eNew==PAGER_JOURNALMODE_TRUNCATE 
+       || eNew==PAGER_JOURNALMODE_PERSIST 
+       || eNew==PAGER_JOURNALMODE_OFF
+       || eNew==PAGER_JOURNALMODE_MEMORY
+       || eNew==PAGER_JOURNALMODE_WAL
+       || eNew==PAGER_JOURNALMODE_QUERY
   );
   assert( pOp->p1>=0 && pOp->p1<db->nDb );
+  assert( p->readOnly==0 );
 
-  u.cj.pBt = db->aDb[pOp->p1].pBt;
-  u.cj.pPager = sqlite3BtreePager(u.cj.pBt);
-  u.cj.eOld = sqlite3PagerGetJournalMode(u.cj.pPager);
-  if( u.cj.eNew==PAGER_JOURNALMODE_QUERY ) u.cj.eNew = u.cj.eOld;
-  if( !sqlite3PagerOkToChangeJournalMode(u.cj.pPager) ) u.cj.eNew = u.cj.eOld;
+  pBt = db->aDb[pOp->p1].pBt;
+  pPager = sqlite3BtreePager(pBt);
+  eOld = sqlite3PagerGetJournalMode(pPager);
+  if( eNew==PAGER_JOURNALMODE_QUERY ) eNew = eOld;
+  if( !sqlite3PagerOkToChangeJournalMode(pPager) ) eNew = eOld;
 
 #ifndef SQLITE_OMIT_WAL
-  u.cj.zFilename = sqlite3PagerFilename(u.cj.pPager, 1);
+  zFilename = sqlite3PagerFilename(pPager, 1);
 
   /* Do not allow a transition to journal_mode=WAL for a database
-  ** in temporary storage or if the VFS does not support shared memory
+  ** in temporary storage or if the VFS does not support shared memory 
   */
-  if( u.cj.eNew==PAGER_JOURNALMODE_WAL
-   && (sqlite3Strlen30(u.cj.zFilename)==0           /* Temp file */
-       || !sqlite3PagerWalSupported(u.cj.pPager))   /* No shared-memory support */
+  if( eNew==PAGER_JOURNALMODE_WAL
+   && (sqlite3Strlen30(zFilename)==0           /* Temp file */
+       || !sqlite3PagerWalSupported(pPager))   /* No shared-memory support */
   ){
-    u.cj.eNew = u.cj.eOld;
+    eNew = eOld;
   }
 
-  if( (u.cj.eNew!=u.cj.eOld)
-   && (u.cj.eOld==PAGER_JOURNALMODE_WAL || u.cj.eNew==PAGER_JOURNALMODE_WAL)
+  if( (eNew!=eOld)
+   && (eOld==PAGER_JOURNALMODE_WAL || eNew==PAGER_JOURNALMODE_WAL)
   ){
-    if( !db->autoCommit || db->activeVdbeCnt>1 ){
+    if( !db->autoCommit || db->nVdbeRead>1 ){
       rc = SQLITE_ERROR;
-      sqlite3SetString(&p->zErrMsg, db,
+      sqlite3SetString(&p->zErrMsg, db, 
           "cannot change %s wal mode from within a transaction",
-          (u.cj.eNew==PAGER_JOURNALMODE_WAL ? "into" : "out of")
+          (eNew==PAGER_JOURNALMODE_WAL ? "into" : "out of")
       );
       break;
     }else{
-
-      if( u.cj.eOld==PAGER_JOURNALMODE_WAL ){
+ 
+      if( eOld==PAGER_JOURNALMODE_WAL ){
         /* If leaving WAL mode, close the log file. If successful, the call
-        ** to PagerCloseWal() checkpoints and deletes the write-ahead-log
-        ** file. An EXCLUSIVE lock may still be held on the database file
-        ** after a successful return.
+        ** to PagerCloseWal() checkpoints and deletes the write-ahead-log 
+        ** file. An EXCLUSIVE lock may still be held on the database file 
+        ** after a successful return. 
         */
-        rc = sqlite3PagerCloseWal(u.cj.pPager);
+        rc = sqlite3PagerCloseWal(pPager);
         if( rc==SQLITE_OK ){
-          sqlite3PagerSetJournalMode(u.cj.pPager, u.cj.eNew);
+          sqlite3PagerSetJournalMode(pPager, eNew);
         }
-      }else if( u.cj.eOld==PAGER_JOURNALMODE_MEMORY ){
+      }else if( eOld==PAGER_JOURNALMODE_MEMORY ){
         /* Cannot transition directly from MEMORY to WAL.  Use mode OFF
         ** as an intermediate */
-        sqlite3PagerSetJournalMode(u.cj.pPager, PAGER_JOURNALMODE_OFF);
+        sqlite3PagerSetJournalMode(pPager, PAGER_JOURNALMODE_OFF);
       }
-
+  
       /* Open a transaction on the database file. Regardless of the journal
       ** mode, this transaction always uses a rollback journal.
       */
-      assert( sqlite3BtreeIsInTrans(u.cj.pBt)==0 );
+      assert( sqlite3BtreeIsInTrans(pBt)==0 );
       if( rc==SQLITE_OK ){
-        rc = sqlite3BtreeSetVersion(u.cj.pBt, (u.cj.eNew==PAGER_JOURNALMODE_WAL ? 2 : 1));
+        rc = sqlite3BtreeSetVersion(pBt, (eNew==PAGER_JOURNALMODE_WAL ? 2 : 1));
       }
     }
   }
 #endif /* ifndef SQLITE_OMIT_WAL */
 
   if( rc ){
-    u.cj.eNew = u.cj.eOld;
+    eNew = eOld;
   }
-  u.cj.eNew = sqlite3PagerSetJournalMode(u.cj.pPager, u.cj.eNew);
+  eNew = sqlite3PagerSetJournalMode(pPager, eNew);
 
   pOut = &aMem[pOp->p2];
   pOut->flags = MEM_Str|MEM_Static|MEM_Term;
-  pOut->z = (char *)sqlite3JournalModename(u.cj.eNew);
+  pOut->z = (char *)sqlite3JournalModename(eNew);
   pOut->n = sqlite3Strlen30(pOut->z);
   pOut->enc = SQLITE_UTF8;
   sqlite3VdbeChangeEncoding(pOut, encoding);
@@ -71056,6 +73251,7 @@ case OP_JournalMode: {    /* out2-prerelease */
 ** a transaction.
 */
 case OP_Vacuum: {
+  assert( p->readOnly==0 );
   rc = sqlite3RunVacuum(&p->zErrMsg, db);
   break;
 }
@@ -71069,14 +73265,14 @@ case OP_Vacuum: {
 ** P2. Otherwise, fall through to the next instruction.
 */
 case OP_IncrVacuum: {        /* jump */
-#if 0  /* local variables moved into u.ck */
   Btree *pBt;
-#endif /* local variables moved into u.ck */
 
   assert( pOp->p1>=0 && pOp->p1<db->nDb );
   assert( (p->btreeMask & (((yDbMask)1)<<pOp->p1))!=0 );
-  u.ck.pBt = db->aDb[pOp->p1].pBt;
-  rc = sqlite3BtreeIncrVacuum(u.ck.pBt);
+  assert( p->readOnly==0 );
+  pBt = db->aDb[pOp->p1].pBt;
+  rc = sqlite3BtreeIncrVacuum(pBt);
+  VdbeBranchTaken(rc==SQLITE_DONE,2);
   if( rc==SQLITE_DONE ){
     pc = pOp->p2 - 1;
     rc = SQLITE_OK;
@@ -71105,6 +73301,7 @@ case OP_Expire: {
 
 #ifndef SQLITE_OMIT_SHARED_CACHE
 /* Opcode: TableLock P1 P2 P3 P4 *
+** Synopsis: iDb=P1 root=P2 write=P3
 **
 ** Obtain a lock on a particular table. This instruction is only used when
 ** the shared-cache feature is enabled. 
@@ -71146,12 +73343,10 @@ case OP_TableLock: {
 ** code will be set to SQLITE_LOCKED.
 */
 case OP_VBegin: {
-#if 0  /* local variables moved into u.cl */
   VTable *pVTab;
-#endif /* local variables moved into u.cl */
-  u.cl.pVTab = pOp->p4.pVtab;
-  rc = sqlite3VtabBegin(db, u.cl.pVTab);
-  if( u.cl.pVTab ) importVtabErrMsg(p, u.cl.pVTab->pVtab);
+  pVTab = pOp->p4.pVtab;
+  rc = sqlite3VtabBegin(db, pVTab);
+  if( pVTab ) sqlite3VtabImportErrmsg(p, pVTab->pVtab);
   break;
 }
 #endif /* SQLITE_OMIT_VIRTUALTABLE */
@@ -71190,32 +73385,30 @@ case OP_VDestroy: {
 ** table and stores that cursor in P1.
 */
 case OP_VOpen: {
-#if 0  /* local variables moved into u.cm */
   VdbeCursor *pCur;
   sqlite3_vtab_cursor *pVtabCursor;
   sqlite3_vtab *pVtab;
   sqlite3_module *pModule;
-#endif /* local variables moved into u.cm */
 
-  u.cm.pCur = 0;
-  u.cm.pVtabCursor = 0;
-  u.cm.pVtab = pOp->p4.pVtab->pVtab;
-  u.cm.pModule = (sqlite3_module *)u.cm.pVtab->pModule;
-  assert(u.cm.pVtab && u.cm.pModule);
-  rc = u.cm.pModule->xOpen(u.cm.pVtab, &u.cm.pVtabCursor);
-  importVtabErrMsg(p, u.cm.pVtab);
+  assert( p->bIsReader );
+  pCur = 0;
+  pVtabCursor = 0;
+  pVtab = pOp->p4.pVtab->pVtab;
+  pModule = (sqlite3_module *)pVtab->pModule;
+  assert(pVtab && pModule);
+  rc = pModule->xOpen(pVtab, &pVtabCursor);
+  sqlite3VtabImportErrmsg(p, pVtab);
   if( SQLITE_OK==rc ){
     /* Initialize sqlite3_vtab_cursor base class */
-    u.cm.pVtabCursor->pVtab = u.cm.pVtab;
+    pVtabCursor->pVtab = pVtab;
 
     /* Initialize vdbe cursor object */
-    u.cm.pCur = allocateCursor(p, pOp->p1, 0, -1, 0);
-    if( u.cm.pCur ){
-      u.cm.pCur->pVtabCursor = u.cm.pVtabCursor;
-      u.cm.pCur->pModule = u.cm.pVtabCursor->pVtab->pModule;
+    pCur = allocateCursor(p, pOp->p1, 0, -1, 0);
+    if( pCur ){
+      pCur->pVtabCursor = pVtabCursor;
     }else{
       db->mallocFailed = 1;
-      u.cm.pModule->xClose(u.cm.pVtabCursor);
+      pModule->xClose(pVtabCursor);
     }
   }
   break;
@@ -71224,6 +73417,7 @@ case OP_VOpen: {
 
 #ifndef SQLITE_OMIT_VIRTUALTABLE
 /* Opcode: VFilter P1 P2 P3 P4 *
+** Synopsis: iplan=r[P3] zplan='P4'
 **
 ** P1 is a cursor opened using VOpen.  P2 is an address to jump to if
 ** the filtered result set is empty.
@@ -71242,7 +73436,6 @@ case OP_VOpen: {
 ** A jump is made to P2 if the result set after filtering would be empty.
 */
 case OP_VFilter: {   /* jump */
-#if 0  /* local variables moved into u.cn */
   int nArg;
   int iQuery;
   const sqlite3_module *pModule;
@@ -71254,45 +73447,43 @@ case OP_VFilter: {   /* jump */
   int res;
   int i;
   Mem **apArg;
-#endif /* local variables moved into u.cn */
 
-  u.cn.pQuery = &aMem[pOp->p3];
-  u.cn.pArgc = &u.cn.pQuery[1];
-  u.cn.pCur = p->apCsr[pOp->p1];
-  assert( memIsValid(u.cn.pQuery) );
-  REGISTER_TRACE(pOp->p3, u.cn.pQuery);
-  assert( u.cn.pCur->pVtabCursor );
-  u.cn.pVtabCursor = u.cn.pCur->pVtabCursor;
-  u.cn.pVtab = u.cn.pVtabCursor->pVtab;
-  u.cn.pModule = u.cn.pVtab->pModule;
+  pQuery = &aMem[pOp->p3];
+  pArgc = &pQuery[1];
+  pCur = p->apCsr[pOp->p1];
+  assert( memIsValid(pQuery) );
+  REGISTER_TRACE(pOp->p3, pQuery);
+  assert( pCur->pVtabCursor );
+  pVtabCursor = pCur->pVtabCursor;
+  pVtab = pVtabCursor->pVtab;
+  pModule = pVtab->pModule;
 
   /* Grab the index number and argc parameters */
-  assert( (u.cn.pQuery->flags&MEM_Int)!=0 && u.cn.pArgc->flags==MEM_Int );
-  u.cn.nArg = (int)u.cn.pArgc->u.i;
-  u.cn.iQuery = (int)u.cn.pQuery->u.i;
+  assert( (pQuery->flags&MEM_Int)!=0 && pArgc->flags==MEM_Int );
+  nArg = (int)pArgc->u.i;
+  iQuery = (int)pQuery->u.i;
 
   /* Invoke the xFilter method */
   {
-    u.cn.res = 0;
-    u.cn.apArg = p->apArg;
-    for(u.cn.i = 0; u.cn.i<u.cn.nArg; u.cn.i++){
-      u.cn.apArg[u.cn.i] = &u.cn.pArgc[u.cn.i+1];
-      sqlite3VdbeMemStoreType(u.cn.apArg[u.cn.i]);
+    res = 0;
+    apArg = p->apArg;
+    for(i = 0; i<nArg; i++){
+      apArg[i] = &pArgc[i+1];
     }
 
     p->inVtabMethod = 1;
-    rc = u.cn.pModule->xFilter(u.cn.pVtabCursor, u.cn.iQuery, pOp->p4.z, u.cn.nArg, u.cn.apArg);
+    rc = pModule->xFilter(pVtabCursor, iQuery, pOp->p4.z, nArg, apArg);
     p->inVtabMethod = 0;
-    importVtabErrMsg(p, u.cn.pVtab);
+    sqlite3VtabImportErrmsg(p, pVtab);
     if( rc==SQLITE_OK ){
-      u.cn.res = u.cn.pModule->xEof(u.cn.pVtabCursor);
+      res = pModule->xEof(pVtabCursor);
     }
-
-    if( u.cn.res ){
+    VdbeBranchTaken(res!=0,2);
+    if( res ){
       pc = pOp->p2 - 1;
     }
   }
-  u.cn.pCur->nullRow = 0;
+  pCur->nullRow = 0;
 
   break;
 }
@@ -71300,57 +73491,56 @@ case OP_VFilter: {   /* jump */
 
 #ifndef SQLITE_OMIT_VIRTUALTABLE
 /* Opcode: VColumn P1 P2 P3 * *
+** Synopsis: r[P3]=vcolumn(P2)
 **
 ** Store the value of the P2-th column of
 ** the row of the virtual-table that the 
 ** P1 cursor is pointing to into register P3.
 */
 case OP_VColumn: {
-#if 0  /* local variables moved into u.co */
   sqlite3_vtab *pVtab;
   const sqlite3_module *pModule;
   Mem *pDest;
   sqlite3_context sContext;
-#endif /* local variables moved into u.co */
 
   VdbeCursor *pCur = p->apCsr[pOp->p1];
   assert( pCur->pVtabCursor );
-  assert( pOp->p3>0 && pOp->p3<=p->nMem );
-  u.co.pDest = &aMem[pOp->p3];
-  memAboutToChange(p, u.co.pDest);
+  assert( pOp->p3>0 && pOp->p3<=(p->nMem-p->nCursor) );
+  pDest = &aMem[pOp->p3];
+  memAboutToChange(p, pDest);
   if( pCur->nullRow ){
-    sqlite3VdbeMemSetNull(u.co.pDest);
+    sqlite3VdbeMemSetNull(pDest);
     break;
   }
-  u.co.pVtab = pCur->pVtabCursor->pVtab;
-  u.co.pModule = u.co.pVtab->pModule;
-  assert( u.co.pModule->xColumn );
-  memset(&u.co.sContext, 0, sizeof(u.co.sContext));
+  pVtab = pCur->pVtabCursor->pVtab;
+  pModule = pVtab->pModule;
+  assert( pModule->xColumn );
+  memset(&sContext, 0, sizeof(sContext));
 
   /* The output cell may already have a buffer allocated. Move
-  ** the current contents to u.co.sContext.s so in case the user-function
-  ** can use the already allocated buffer instead of allocating a
+  ** the current contents to sContext.s so in case the user-function 
+  ** can use the already allocated buffer instead of allocating a 
   ** new one.
   */
-  sqlite3VdbeMemMove(&u.co.sContext.s, u.co.pDest);
-  MemSetTypeFlag(&u.co.sContext.s, MEM_Null);
+  sqlite3VdbeMemMove(&sContext.s, pDest);
+  MemSetTypeFlag(&sContext.s, MEM_Null);
 
-  rc = u.co.pModule->xColumn(pCur->pVtabCursor, &u.co.sContext, pOp->p2);
-  importVtabErrMsg(p, u.co.pVtab);
-  if( u.co.sContext.isError ){
-    rc = u.co.sContext.isError;
+  rc = pModule->xColumn(pCur->pVtabCursor, &sContext, pOp->p2);
+  sqlite3VtabImportErrmsg(p, pVtab);
+  if( sContext.isError ){
+    rc = sContext.isError;
   }
 
   /* Copy the result of the function to the P3 register. We
   ** do this regardless of whether or not an error occurred to ensure any
-  ** dynamic allocation in u.co.sContext.s (a Mem struct) is  released.
+  ** dynamic allocation in sContext.s (a Mem struct) is  released.
   */
-  sqlite3VdbeChangeEncoding(&u.co.sContext.s, encoding);
-  sqlite3VdbeMemMove(u.co.pDest, &u.co.sContext.s);
-  REGISTER_TRACE(pOp->p3, u.co.pDest);
-  UPDATE_MAX_BLOBSIZE(u.co.pDest);
+  sqlite3VdbeChangeEncoding(&sContext.s, encoding);
+  sqlite3VdbeMemMove(pDest, &sContext.s);
+  REGISTER_TRACE(pOp->p3, pDest);
+  UPDATE_MAX_BLOBSIZE(pDest);
 
-  if( sqlite3VdbeMemTooBig(u.co.pDest) ){
+  if( sqlite3VdbeMemTooBig(pDest) ){
     goto too_big;
   }
   break;
@@ -71365,42 +73555,40 @@ case OP_VColumn: {
 ** the end of its result set, then fall through to the next instruction.
 */
 case OP_VNext: {   /* jump */
-#if 0  /* local variables moved into u.cp */
   sqlite3_vtab *pVtab;
   const sqlite3_module *pModule;
   int res;
   VdbeCursor *pCur;
-#endif /* local variables moved into u.cp */
 
-  u.cp.res = 0;
-  u.cp.pCur = p->apCsr[pOp->p1];
-  assert( u.cp.pCur->pVtabCursor );
-  if( u.cp.pCur->nullRow ){
+  res = 0;
+  pCur = p->apCsr[pOp->p1];
+  assert( pCur->pVtabCursor );
+  if( pCur->nullRow ){
     break;
   }
-  u.cp.pVtab = u.cp.pCur->pVtabCursor->pVtab;
-  u.cp.pModule = u.cp.pVtab->pModule;
-  assert( u.cp.pModule->xNext );
+  pVtab = pCur->pVtabCursor->pVtab;
+  pModule = pVtab->pModule;
+  assert( pModule->xNext );
 
   /* Invoke the xNext() method of the module. There is no way for the
   ** underlying implementation to return an error if one occurs during
-  ** xNext(). Instead, if an error occurs, true is returned (indicating that
+  ** xNext(). Instead, if an error occurs, true is returned (indicating that 
   ** data is available) and the error code returned when xColumn or
   ** some other method is next invoked on the save virtual table cursor.
   */
   p->inVtabMethod = 1;
-  rc = u.cp.pModule->xNext(u.cp.pCur->pVtabCursor);
+  rc = pModule->xNext(pCur->pVtabCursor);
   p->inVtabMethod = 0;
-  importVtabErrMsg(p, u.cp.pVtab);
+  sqlite3VtabImportErrmsg(p, pVtab);
   if( rc==SQLITE_OK ){
-    u.cp.res = u.cp.pModule->xEof(u.cp.pCur->pVtabCursor);
+    res = pModule->xEof(pCur->pVtabCursor);
   }
-
-  if( !u.cp.res ){
+  VdbeBranchTaken(!res,2);
+  if( !res ){
     /* If there is data, jump to P2 */
     pc = pOp->p2 - 1;
   }
-  break;
+  goto check_for_interrupt;
 }
 #endif /* SQLITE_OMIT_VIRTUALTABLE */
 
@@ -71412,24 +73600,23 @@ case OP_VNext: {   /* jump */
 ** in register P1 is passed as the zName argument to the xRename method.
 */
 case OP_VRename: {
-#if 0  /* local variables moved into u.cq */
   sqlite3_vtab *pVtab;
   Mem *pName;
-#endif /* local variables moved into u.cq */
 
-  u.cq.pVtab = pOp->p4.pVtab->pVtab;
-  u.cq.pName = &aMem[pOp->p1];
-  assert( u.cq.pVtab->pModule->xRename );
-  assert( memIsValid(u.cq.pName) );
-  REGISTER_TRACE(pOp->p1, u.cq.pName);
-  assert( u.cq.pName->flags & MEM_Str );
-  testcase( u.cq.pName->enc==SQLITE_UTF8 );
-  testcase( u.cq.pName->enc==SQLITE_UTF16BE );
-  testcase( u.cq.pName->enc==SQLITE_UTF16LE );
-  rc = sqlite3VdbeChangeEncoding(u.cq.pName, SQLITE_UTF8);
+  pVtab = pOp->p4.pVtab->pVtab;
+  pName = &aMem[pOp->p1];
+  assert( pVtab->pModule->xRename );
+  assert( memIsValid(pName) );
+  assert( p->readOnly==0 );
+  REGISTER_TRACE(pOp->p1, pName);
+  assert( pName->flags & MEM_Str );
+  testcase( pName->enc==SQLITE_UTF8 );
+  testcase( pName->enc==SQLITE_UTF16BE );
+  testcase( pName->enc==SQLITE_UTF16LE );
+  rc = sqlite3VdbeChangeEncoding(pName, SQLITE_UTF8);
   if( rc==SQLITE_OK ){
-    rc = u.cq.pVtab->pModule->xRename(u.cq.pVtab, u.cq.pName->z);
-    importVtabErrMsg(p, u.cq.pVtab);
+    rc = pVtab->pModule->xRename(pVtab, pName->z);
+    sqlite3VtabImportErrmsg(p, pVtab);
     p->expired = 0;
   }
   break;
@@ -71437,7 +73624,8 @@ case OP_VRename: {
 #endif
 
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-/* Opcode: VUpdate P1 P2 P3 P4 *
+/* Opcode: VUpdate P1 P2 P3 P4 P5
+** Synopsis: data=r[P3@P2]
 **
 ** P4 is a pointer to a virtual table object, an sqlite3_vtab structure.
 ** This opcode invokes the corresponding xUpdate method. P2 values
@@ -71459,9 +73647,11 @@ case OP_VRename: {
 ** P1 is a boolean flag. If it is set to true and the xUpdate call
 ** is successful, then the value returned by sqlite3_last_insert_rowid() 
 ** is set to the value of the rowid for the row just inserted.
+**
+** P5 is the error actions (OE_Replace, OE_Fail, OE_Ignore, etc) to
+** apply in the case of a constraint failure on an insert or update.
 */
 case OP_VUpdate: {
-#if 0  /* local variables moved into u.cr */
   sqlite3_vtab *pVtab;
   sqlite3_module *pModule;
   int nArg;
@@ -71469,33 +73659,32 @@ case OP_VUpdate: {
   sqlite_int64 rowid;
   Mem **apArg;
   Mem *pX;
-#endif /* local variables moved into u.cr */
 
-  assert( pOp->p2==1        || pOp->p5==OE_Fail   || pOp->p5==OE_Rollback
+  assert( pOp->p2==1        || pOp->p5==OE_Fail   || pOp->p5==OE_Rollback 
        || pOp->p5==OE_Abort || pOp->p5==OE_Ignore || pOp->p5==OE_Replace
   );
-  u.cr.pVtab = pOp->p4.pVtab->pVtab;
-  u.cr.pModule = (sqlite3_module *)u.cr.pVtab->pModule;
-  u.cr.nArg = pOp->p2;
+  assert( p->readOnly==0 );
+  pVtab = pOp->p4.pVtab->pVtab;
+  pModule = (sqlite3_module *)pVtab->pModule;
+  nArg = pOp->p2;
   assert( pOp->p4type==P4_VTAB );
-  if( ALWAYS(u.cr.pModule->xUpdate) ){
+  if( ALWAYS(pModule->xUpdate) ){
     u8 vtabOnConflict = db->vtabOnConflict;
-    u.cr.apArg = p->apArg;
-    u.cr.pX = &aMem[pOp->p3];
-    for(u.cr.i=0; u.cr.i<u.cr.nArg; u.cr.i++){
-      assert( memIsValid(u.cr.pX) );
-      memAboutToChange(p, u.cr.pX);
-      sqlite3VdbeMemStoreType(u.cr.pX);
-      u.cr.apArg[u.cr.i] = u.cr.pX;
-      u.cr.pX++;
+    apArg = p->apArg;
+    pX = &aMem[pOp->p3];
+    for(i=0; i<nArg; i++){
+      assert( memIsValid(pX) );
+      memAboutToChange(p, pX);
+      apArg[i] = pX;
+      pX++;
     }
     db->vtabOnConflict = pOp->p5;
-    rc = u.cr.pModule->xUpdate(u.cr.pVtab, u.cr.nArg, u.cr.apArg, &u.cr.rowid);
+    rc = pModule->xUpdate(pVtab, nArg, apArg, &rowid);
     db->vtabOnConflict = vtabOnConflict;
-    importVtabErrMsg(p, u.cr.pVtab);
+    sqlite3VtabImportErrmsg(p, pVtab);
     if( rc==SQLITE_OK && pOp->p1 ){
-      assert( u.cr.nArg>1 && u.cr.apArg[0] && (u.cr.apArg[0]->flags&MEM_Null) );
-      db->lastRowid = lastRowid = u.cr.rowid;
+      assert( nArg>1 && apArg[0] && (apArg[0]->flags&MEM_Null) );
+      db->lastRowid = lastRowid = rowid;
     }
     if( (rc&0xff)==SQLITE_CONSTRAINT && pOp->p4.pVtab->bConstraint ){
       if( pOp->p5==OE_Ignore ){
@@ -71548,36 +73737,54 @@ case OP_MaxPgcnt: {            /* out2-prerelease */
 #endif
 
 
-#ifndef SQLITE_OMIT_TRACE
-/* Opcode: Trace * * * P4 *
+/* Opcode: Init * P2 * P4 *
+** Synopsis:  Start at P2
+**
+** Programs contain a single instance of this opcode as the very first
+** opcode.
 **
 ** If tracing is enabled (by the sqlite3_trace()) interface, then
 ** the UTF-8 string contained in P4 is emitted on the trace callback.
+** Or if P4 is blank, use the string returned by sqlite3_sql().
+**
+** If P2 is not zero, jump to instruction P2.
 */
-case OP_Trace: {
-#if 0  /* local variables moved into u.cs */
+case OP_Init: {          /* jump */
   char *zTrace;
   char *z;
-#endif /* local variables moved into u.cs */
 
+  if( pOp->p2 ){
+    pc = pOp->p2 - 1;
+  }
+#ifndef SQLITE_OMIT_TRACE
   if( db->xTrace
    && !p->doingRerun
-   && (u.cs.zTrace = (pOp->p4.z ? pOp->p4.z : p->zSql))!=0
+   && (zTrace = (pOp->p4.z ? pOp->p4.z : p->zSql))!=0
   ){
-    u.cs.z = sqlite3VdbeExpandSql(p, u.cs.zTrace);
-    db->xTrace(db->pTraceArg, u.cs.z);
-    sqlite3DbFree(db, u.cs.z);
+    z = sqlite3VdbeExpandSql(p, zTrace);
+    db->xTrace(db->pTraceArg, z);
+    sqlite3DbFree(db, z);
   }
+#ifdef SQLITE_USE_FCNTL_TRACE
+  zTrace = (pOp->p4.z ? pOp->p4.z : p->zSql);
+  if( zTrace ){
+    int i;
+    for(i=0; i<db->nDb; i++){
+      if( (MASKBIT(i) & p->btreeMask)==0 ) continue;
+      sqlite3_file_control(db, db->aDb[i].zName, SQLITE_FCNTL_TRACE, zTrace);
+    }
+  }
+#endif /* SQLITE_USE_FCNTL_TRACE */
 #ifdef SQLITE_DEBUG
   if( (db->flags & SQLITE_SqlTrace)!=0
-   && (u.cs.zTrace = (pOp->p4.z ? pOp->p4.z : p->zSql))!=0
+   && (zTrace = (pOp->p4.z ? pOp->p4.z : p->zSql))!=0
   ){
-    sqlite3DebugPrintf("SQL-trace: %s\n", u.cs.zTrace);
+    sqlite3DebugPrintf("SQL-trace: %s\n", zTrace);
   }
 #endif /* SQLITE_DEBUG */
+#endif /* SQLITE_OMIT_TRACE */
   break;
 }
-#endif
 
 
 /* Opcode: Noop * * * * *
@@ -71606,13 +73813,9 @@ default: {          /* This is really OP_Noop and OP_Explain */
 
 #ifdef VDBE_PROFILE
     {
-      u64 elapsed = sqlite3Hwtime() - start;
-      pOp->cycles += elapsed;
+      u64 endTime = sqlite3Hwtime();
+      if( endTime>start ) pOp->cycles += endTime - start;
       pOp->cnt++;
-#if 0
-        fprintf(stdout, "%10llu ", elapsed);
-        sqlite3VdbePrintOp(stdout, origPc, &aOp[origPc]);
-#endif
     }
 #endif
 
@@ -71625,13 +73828,13 @@ default: {          /* This is really OP_Noop and OP_Explain */
     assert( pc>=-1 && pc<p->nOp );
 
 #ifdef SQLITE_DEBUG
-    if( p->trace ){
-      if( rc!=0 ) fprintf(p->trace,"rc=%d\n",rc);
+    if( db->flags & SQLITE_VdbeTrace ){
+      if( rc!=0 ) printf("rc=%d\n",rc);
       if( pOp->opflags & (OPFLG_OUT2_PRERELEASE|OPFLG_OUT2) ){
-        registerTrace(p->trace, pOp->p2, &aMem[pOp->p2]);
+        registerTrace(pOp->p2, &aMem[pOp->p2]);
       }
       if( pOp->opflags & OPFLG_OUT3 ){
-        registerTrace(p->trace, pOp->p3, &aMem[pOp->p3]);
+        registerTrace(pOp->p3, &aMem[pOp->p3]);
       }
     }
 #endif  /* SQLITE_DEBUG */
@@ -71659,6 +73862,8 @@ default: {          /* This is really OP_Noop and OP_Explain */
   ** top. */
 vdbe_return:
   db->lastRowid = lastRowid;
+  testcase( nVmStep>0 );
+  p->aCounter[SQLITE_STMTSTATUS_VM_STEP] += (int)nVmStep;
   sqlite3VdbeLeave(p);
   return rc;
 
@@ -71700,6 +73905,7 @@ default: {          /* This is really OP_Noop and OP_Explain */
   goto vdbe_error_halt;
 }
 
+
 /************** End of vdbe.c ************************************************/
 /************** Begin file vdbeblob.c ****************************************/
 /*
@@ -71766,7 +73972,8 @@ static int blobSeekToRow(Incrblob *p, sqlite3_int64 iRow, char **pzErr){
 
   rc = sqlite3_step(p->pStmt);
   if( rc==SQLITE_ROW ){
-    u32 type = v->apCsr[0]->aType[p->iCol];
+    VdbeCursor *pC = v->apCsr[0];
+    u32 type = pC->aType[p->iCol];
     if( type<12 ){
       zErr = sqlite3MPrintf(p->db, "cannot open value of type %s",
           type==0?"null": type==7?"real": "integer"
@@ -71775,12 +73982,10 @@ static int blobSeekToRow(Incrblob *p, sqlite3_int64 iRow, char **pzErr){
       sqlite3_finalize(p->pStmt);
       p->pStmt = 0;
     }else{
-      p->iOffset = v->apCsr[0]->aOffset[p->iCol];
+      p->iOffset = pC->aType[p->iCol + pC->nField];
       p->nByte = sqlite3VdbeSerialTypeLen(type);
-      p->pCsr =  v->apCsr[0]->pCursor;
-      sqlite3BtreeEnterCursor(p->pCsr);
-      sqlite3BtreeCacheOverflow(p->pCsr);
-      sqlite3BtreeLeaveCursor(p->pCsr);
+      p->pCsr =  pC->pCursor;
+      sqlite3BtreeIncrblobCursor(p->pCsr);
     }
   }
 
@@ -71834,22 +74039,20 @@ SQLITE_API int sqlite3_blob_open(
   ** which closes the b-tree cursor and (possibly) commits the 
   ** transaction.
   */
+  static const int iLn = VDBE_OFFSET_LINENO(4);
   static const VdbeOpList openBlob[] = {
-    {OP_Transaction, 0, 0, 0},     /* 0: Start a transaction */
-    {OP_VerifyCookie, 0, 0, 0},    /* 1: Check the schema cookie */
-    {OP_TableLock, 0, 0, 0},       /* 2: Acquire a read or write lock */
-
+    /* {OP_Transaction, 0, 0, 0},  // 0: Inserted separately */
+    {OP_TableLock, 0, 0, 0},       /* 1: Acquire a read or write lock */
     /* One of the following two instructions is replaced by an OP_Noop. */
-    {OP_OpenRead, 0, 0, 0},        /* 3: Open cursor 0 for reading */
-    {OP_OpenWrite, 0, 0, 0},       /* 4: Open cursor 0 for read/write */
-
-    {OP_Variable, 1, 1, 1},        /* 5: Push the rowid to the stack */
-    {OP_NotExists, 0, 10, 1},      /* 6: Seek the cursor */
-    {OP_Column, 0, 0, 1},          /* 7  */
-    {OP_ResultRow, 1, 0, 0},       /* 8  */
-    {OP_Goto, 0, 5, 0},            /* 9  */
-    {OP_Close, 0, 0, 0},           /* 10 */
-    {OP_Halt, 0, 0, 0},            /* 11 */
+    {OP_OpenRead, 0, 0, 0},        /* 2: Open cursor 0 for reading */
+    {OP_OpenWrite, 0, 0, 0},       /* 3: Open cursor 0 for read/write */
+    {OP_Variable, 1, 1, 1},        /* 4: Push the rowid to the stack */
+    {OP_NotExists, 0, 10, 1},      /* 5: Seek the cursor */
+    {OP_Column, 0, 0, 1},          /* 6  */
+    {OP_ResultRow, 1, 0, 0},       /* 7  */
+    {OP_Goto, 0, 4, 0},            /* 8  */
+    {OP_Close, 0, 0, 0},           /* 9  */
+    {OP_Halt, 0, 0, 0},            /* 10 */
   };
 
   int rc = SQLITE_OK;
@@ -71880,6 +74083,10 @@ SQLITE_API int sqlite3_blob_open(
       pTab = 0;
       sqlite3ErrorMsg(pParse, "cannot open virtual table: %s", zTable);
     }
+    if( pTab && !HasRowid(pTab) ){
+      pTab = 0;
+      sqlite3ErrorMsg(pParse, "cannot open table without rowid: %s", zTable);
+    }
 #ifndef SQLITE_OMIT_VIEW
     if( pTab && pTab->pSelect ){
       pTab = 0;
@@ -71937,7 +74144,7 @@ SQLITE_API int sqlite3_blob_open(
 #endif
       for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
         int j;
-        for(j=0; j<pIdx->nColumn; j++){
+        for(j=0; j<pIdx->nKeyCol; j++){
           if( pIdx->aiColumn[j]==iCol ){
             zFault = "indexed";
           }
@@ -71952,42 +74159,37 @@ SQLITE_API int sqlite3_blob_open(
       }
     }
 
-    pBlob->pStmt = (sqlite3_stmt *)sqlite3VdbeCreate(db);
+    pBlob->pStmt = (sqlite3_stmt *)sqlite3VdbeCreate(pParse);
     assert( pBlob->pStmt || db->mallocFailed );
     if( pBlob->pStmt ){
       Vdbe *v = (Vdbe *)pBlob->pStmt;
       int iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
 
-      sqlite3VdbeAddOpList(v, sizeof(openBlob)/sizeof(VdbeOpList), openBlob);
 
-
-      /* Configure the OP_Transaction */
-      sqlite3VdbeChangeP1(v, 0, iDb);
-      sqlite3VdbeChangeP2(v, 0, flags);
-
-      /* Configure the OP_VerifyCookie */
-      sqlite3VdbeChangeP1(v, 1, iDb);
-      sqlite3VdbeChangeP2(v, 1, pTab->pSchema->schema_cookie);
-      sqlite3VdbeChangeP3(v, 1, pTab->pSchema->iGeneration);
+      sqlite3VdbeAddOp4Int(v, OP_Transaction, iDb, flags, 
+                           pTab->pSchema->schema_cookie,
+                           pTab->pSchema->iGeneration);
+      sqlite3VdbeChangeP5(v, 1);     
+      sqlite3VdbeAddOpList(v, ArraySize(openBlob), openBlob, iLn);
 
       /* Make sure a mutex is held on the table to be accessed */
       sqlite3VdbeUsesBtree(v, iDb); 
 
       /* Configure the OP_TableLock instruction */
 #ifdef SQLITE_OMIT_SHARED_CACHE
-      sqlite3VdbeChangeToNoop(v, 2);
+      sqlite3VdbeChangeToNoop(v, 1);
 #else
-      sqlite3VdbeChangeP1(v, 2, iDb);
-      sqlite3VdbeChangeP2(v, 2, pTab->tnum);
-      sqlite3VdbeChangeP3(v, 2, flags);
-      sqlite3VdbeChangeP4(v, 2, pTab->zName, P4_TRANSIENT);
+      sqlite3VdbeChangeP1(v, 1, iDb);
+      sqlite3VdbeChangeP2(v, 1, pTab->tnum);
+      sqlite3VdbeChangeP3(v, 1, flags);
+      sqlite3VdbeChangeP4(v, 1, pTab->zName, P4_TRANSIENT);
 #endif
 
       /* Remove either the OP_OpenWrite or OpenRead. Set the P2 
       ** parameter of the other to pTab->tnum.  */
-      sqlite3VdbeChangeToNoop(v, 4 - flags);
-      sqlite3VdbeChangeP2(v, 3 + flags, pTab->tnum);
-      sqlite3VdbeChangeP3(v, 3 + flags, iDb);
+      sqlite3VdbeChangeToNoop(v, 3 - flags);
+      sqlite3VdbeChangeP2(v, 2 + flags, pTab->tnum);
+      sqlite3VdbeChangeP3(v, 2 + flags, iDb);
 
       /* Configure the number of columns. Configure the cursor to
       ** think that the table has one more column than it really
@@ -71996,8 +74198,8 @@ SQLITE_API int sqlite3_blob_open(
       ** we can invoke OP_Column to fill in the vdbe cursors type 
       ** and offset cache without causing any IO.
       */
-      sqlite3VdbeChangeP4(v, 3+flags, SQLITE_INT_TO_PTR(pTab->nCol+1),P4_INT32);
-      sqlite3VdbeChangeP2(v, 7, pTab->nCol);
+      sqlite3VdbeChangeP4(v, 2+flags, SQLITE_INT_TO_PTR(pTab->nCol+1),P4_INT32);
+      sqlite3VdbeChangeP2(v, 6, pTab->nCol);
       if( !db->mallocFailed ){
         pParse->nVar = 1;
         pParse->nMem = 1;
@@ -72026,6 +74228,7 @@ SQLITE_API int sqlite3_blob_open(
   }
   sqlite3Error(db, rc, (zErr ? "%s" : 0), zErr);
   sqlite3DbFree(db, zErr);
+  sqlite3ParserReset(pParse);
   sqlite3StackFree(db, pParse);
   rc = sqlite3ApiExit(db, rc);
   sqlite3_mutex_leave(db->mutex);
@@ -72226,7 +74429,7 @@ typedef struct FileWriter FileWriter;
 ** other key value. If the keys are equal (only possible with two EOF
 ** values), it doesn't matter which index is stored.
 **
-** The (N/4) elements of aTree[] that preceed the final (N/2) described 
+** The (N/4) elements of aTree[] that precede the final (N/2) described 
 ** above contains the index of the smallest of each block of 4 iterators.
 ** And so on. So that aTree[1] contains the index of the iterator that 
 ** currently points to the smallest key value. aTree[0] is unused.
@@ -72522,7 +74725,6 @@ static int vdbeSorterIterInit(
       rc = sqlite3OsRead(
           pSorter->pTemp1, &pIter->aBuffer[iBuf], nRead, iStart
       );
-      assert( rc!=SQLITE_IOERR_SHORT_READ );
     }
 
     if( rc==SQLITE_OK ){
@@ -72558,7 +74760,7 @@ static int vdbeSorterIterInit(
 */
 static void vdbeSorterCompare(
   const VdbeCursor *pCsr,         /* Cursor object (for pKeyInfo) */
-  int bOmitRowid,                 /* Ignore rowid field at end of keys */
+  int nIgnore,                    /* Ignore the last nIgnore fields */
   const void *pKey1, int nKey1,   /* Left side of comparison */
   const void *pKey2, int nKey2,   /* Right side of comparison */
   int *pRes                       /* OUT: Result of comparison */
@@ -72572,8 +74774,8 @@ static void vdbeSorterCompare(
     sqlite3VdbeRecordUnpack(pKeyInfo, nKey2, pKey2, r2);
   }
 
-  if( bOmitRowid ){
-    r2->nField = pKeyInfo->nField;
+  if( nIgnore ){
+    r2->nField = pKeyInfo->nField - nIgnore;
     assert( r2->nField>0 );
     for(i=0; i<r2->nField; i++){
       if( r2->aMem[i].flags & MEM_Null ){
@@ -72581,10 +74783,10 @@ static void vdbeSorterCompare(
         return;
       }
     }
-    r2->flags |= UNPACKED_PREFIX_MATCH;
+    assert( r2->default_rc==0 );
   }
 
-  *pRes = sqlite3VdbeRecordCompare(nKey1, pKey1, r2);
+  *pRes = sqlite3VdbeRecordCompare(nKey1, pKey1, r2, 0);
 }
 
 /*
@@ -72676,23 +74878,40 @@ static void vdbeSorterRecordFree(sqlite3 *db, SorterRecord *pRecord){
   }
 }
 
+/*
+** Reset a sorting cursor back to its original empty state.
+*/
+SQLITE_PRIVATE void sqlite3VdbeSorterReset(sqlite3 *db, VdbeSorter *pSorter){
+  if( pSorter->aIter ){
+    int i;
+    for(i=0; i<pSorter->nTree; i++){
+      vdbeSorterIterZero(db, &pSorter->aIter[i]);
+    }
+    sqlite3DbFree(db, pSorter->aIter);
+    pSorter->aIter = 0;
+  }
+  if( pSorter->pTemp1 ){
+    sqlite3OsCloseFree(pSorter->pTemp1);
+    pSorter->pTemp1 = 0;
+  }
+  vdbeSorterRecordFree(db, pSorter->pRecord);
+  pSorter->pRecord = 0;
+  pSorter->iWriteOff = 0;
+  pSorter->iReadOff = 0;
+  pSorter->nInMemory = 0;
+  pSorter->nTree = 0;
+  pSorter->nPMA = 0;
+  pSorter->aTree = 0;
+}
+
+
 /*
 ** Free any cursor components allocated by sqlite3VdbeSorterXXX routines.
 */
 SQLITE_PRIVATE void sqlite3VdbeSorterClose(sqlite3 *db, VdbeCursor *pCsr){
   VdbeSorter *pSorter = pCsr->pSorter;
   if( pSorter ){
-    if( pSorter->aIter ){
-      int i;
-      for(i=0; i<pSorter->nTree; i++){
-        vdbeSorterIterZero(db, &pSorter->aIter[i]);
-      }
-      sqlite3DbFree(db, pSorter->aIter);
-    }
-    if( pSorter->pTemp1 ){
-      sqlite3OsCloseFree(pSorter->pTemp1);
-    }
-    vdbeSorterRecordFree(db, pSorter->pRecord);
+    sqlite3VdbeSorterReset(db, pSorter);
     sqlite3DbFree(db, pSorter->pUnpacked);
     sqlite3DbFree(db, pSorter);
     pCsr->pSorter = 0;
@@ -73128,14 +75347,55 @@ SQLITE_PRIVATE int sqlite3VdbeSorterNext(sqlite3 *db, const VdbeCursor *pCsr, in
 
   if( pSorter->aTree ){
     int iPrev = pSorter->aTree[1];/* Index of iterator to advance */
-    int i;                        /* Index of aTree[] to recalculate */
-
     rc = vdbeSorterIterNext(db, &pSorter->aIter[iPrev]);
-    for(i=(pSorter->nTree+iPrev)/2; rc==SQLITE_OK && i>0; i=i/2){
-      rc = vdbeSorterDoCompare(pCsr, i);
-    }
+    if( rc==SQLITE_OK ){
+      int i;                      /* Index of aTree[] to recalculate */
+      VdbeSorterIter *pIter1;     /* First iterator to compare */
+      VdbeSorterIter *pIter2;     /* Second iterator to compare */
+      u8 *pKey2;                  /* To pIter2->aKey, or 0 if record cached */
 
-    *pbEof = (pSorter->aIter[pSorter->aTree[1]].pFile==0);
+      /* Find the first two iterators to compare. The one that was just
+      ** advanced (iPrev) and the one next to it in the array.  */
+      pIter1 = &pSorter->aIter[(iPrev & 0xFFFE)];
+      pIter2 = &pSorter->aIter[(iPrev | 0x0001)];
+      pKey2 = pIter2->aKey;
+
+      for(i=(pSorter->nTree+iPrev)/2; i>0; i=i/2){
+        /* Compare pIter1 and pIter2. Store the result in variable iRes. */
+        int iRes;
+        if( pIter1->pFile==0 ){
+          iRes = +1;
+        }else if( pIter2->pFile==0 ){
+          iRes = -1;
+        }else{
+          vdbeSorterCompare(pCsr, 0, 
+              pIter1->aKey, pIter1->nKey, pKey2, pIter2->nKey, &iRes
+          );
+        }
+
+        /* If pIter1 contained the smaller value, set aTree[i] to its index.
+        ** Then set pIter2 to the next iterator to compare to pIter1. In this
+        ** case there is no cache of pIter2 in pSorter->pUnpacked, so set
+        ** pKey2 to point to the record belonging to pIter2.
+        **
+        ** Alternatively, if pIter2 contains the smaller of the two values,
+        ** set aTree[i] to its index and update pIter1. If vdbeSorterCompare()
+        ** was actually called above, then pSorter->pUnpacked now contains
+        ** a value equivalent to pIter2. So set pKey2 to NULL to prevent
+        ** vdbeSorterCompare() from decoding pIter2 again.  */
+        if( iRes<=0 ){
+          pSorter->aTree[i] = (int)(pIter1 - pSorter->aIter);
+          pIter2 = &pSorter->aIter[ pSorter->aTree[i ^ 0x0001] ];
+          pKey2 = pIter2->aKey;
+        }else{
+          if( pIter1->pFile ) pKey2 = 0;
+          pSorter->aTree[i] = (int)(pIter2 - pSorter->aIter);
+          pIter1 = &pSorter->aIter[ pSorter->aTree[i ^ 0x0001] ];
+        }
+
+      }
+      *pbEof = (pSorter->aIter[pSorter->aTree[1]].pFile==0);
+    }
   }else{
     SorterRecord *pFree = pSorter->pRecord;
     pSorter->pRecord = pFree->pNext;
@@ -73199,13 +75459,14 @@ SQLITE_PRIVATE int sqlite3VdbeSorterRowkey(const VdbeCursor *pCsr, Mem *pOut){
 SQLITE_PRIVATE int sqlite3VdbeSorterCompare(
   const VdbeCursor *pCsr,         /* Sorter cursor */
   Mem *pVal,                      /* Value to compare to current sorter key */
+  int nIgnore,                    /* Ignore this many fields at the end */
   int *pRes                       /* OUT: Result of comparison */
 ){
   VdbeSorter *pSorter = pCsr->pSorter;
   void *pKey; int nKey;           /* Sorter key to compare pVal with */
 
   pKey = vdbeSorterRowkey(pSorter, &nKey);
-  vdbeSorterCompare(pCsr, 1, pVal->z, pVal->n, pKey, nKey, pRes);
+  vdbeSorterCompare(pCsr, nIgnore, pVal->z, pVal->n, pKey, nKey, pRes);
   return SQLITE_OK;
 }
 
@@ -73501,12 +75762,6 @@ typedef struct FileChunk FileChunk;
 */
 #define JOURNAL_CHUNKSIZE ((int)(1024-sizeof(FileChunk*)))
 
-/* Macro to find the minimum of two numeric values.
-*/
-#ifndef MIN
-# define MIN(x,y) ((x)<(y)?(x):(y))
-#endif
-
 /*
 ** The rollback journal is composed of a linked list of these structures.
 */
@@ -73776,7 +76031,7 @@ SQLITE_PRIVATE int sqlite3WalkExpr(Walker *pWalker, Expr *pExpr){
   testcase( ExprHasProperty(pExpr, EP_Reduced) );
   rc = pWalker->xExprCallback(pWalker, pExpr);
   if( rc==WRC_Continue
-              && !ExprHasAnyProperty(pExpr,EP_TokenOnly) ){
+              && !ExprHasProperty(pExpr,EP_TokenOnly) ){
     if( sqlite3WalkExpr(pWalker, pExpr->pLeft) ) return WRC_Abort;
     if( sqlite3WalkExpr(pWalker, pExpr->pRight) ) return WRC_Abort;
     if( ExprHasProperty(pExpr, EP_xIsSelect) ){
@@ -73846,9 +76101,12 @@ SQLITE_PRIVATE int sqlite3WalkSelectFrom(Walker *pWalker, Select *p){
 /*
 ** Call sqlite3WalkExpr() for every expression in Select statement p.
 ** Invoke sqlite3WalkSelect() for subqueries in the FROM clause and
-** on the compound select chain, p->pPrior.  Invoke the xSelectCallback()
-** either before or after the walk of expressions and FROM clause, depending
-** on whether pWalker->bSelectDepthFirst is false or true, respectively.
+** on the compound select chain, p->pPrior. 
+**
+** If it is not NULL, the xSelectCallback() callback is invoked before
+** the walk of the expressions and FROM clause. The xSelectCallback2()
+** method, if it is not NULL, is invoked following the walk of the 
+** expressions and FROM clause.
 **
 ** Return WRC_Continue under normal conditions.  Return WRC_Abort if
 ** there is an abort request.
@@ -73858,11 +76116,13 @@ SQLITE_PRIVATE int sqlite3WalkSelectFrom(Walker *pWalker, Select *p){
 */
 SQLITE_PRIVATE int sqlite3WalkSelect(Walker *pWalker, Select *p){
   int rc;
-  if( p==0 || pWalker->xSelectCallback==0 ) return WRC_Continue;
+  if( p==0 || (pWalker->xSelectCallback==0 && pWalker->xSelectCallback2==0) ){
+    return WRC_Continue;
+  }
   rc = WRC_Continue;
   pWalker->walkerDepth++;
   while( p ){
-    if( !pWalker->bSelectDepthFirst ){
+    if( pWalker->xSelectCallback ){
        rc = pWalker->xSelectCallback(pWalker, p);
        if( rc ) break;
     }
@@ -73872,12 +76132,8 @@ SQLITE_PRIVATE int sqlite3WalkSelect(Walker *pWalker, Select *p){
       pWalker->walkerDepth--;
       return WRC_Abort;
     }
-    if( pWalker->bSelectDepthFirst ){
-      rc = pWalker->xSelectCallback(pWalker, p);
-      /* Depth-first search is currently only used for
-      ** selectAddSubqueryTypeInfo() and that routine always returns
-      ** WRC_Continue (0).  So the following branch is never taken. */
-      if( NEVER(rc) ) break;
+    if( pWalker->xSelectCallback2 ){
+      pWalker->xSelectCallback2(pWalker, p);
     }
     p = p->pPrior;
   }
@@ -73943,7 +76199,7 @@ static void incrAggFunctionDepth(Expr *pExpr, int N){
 ** column reference is so that the column reference will be recognized as
 ** usable by indices within the WHERE clause processing logic. 
 **
-** Hack:  The TK_AS operator is inhibited if zType[0]=='G'.  This means
+** The TK_AS operator is inhibited if zType[0]=='G'.  This means
 ** that in a GROUP BY clause, the expression is evaluated twice.  Hence:
 **
 **     SELECT random()%5 AS x, count(*) FROM tab GROUP BY x
@@ -73953,8 +76209,9 @@ static void incrAggFunctionDepth(Expr *pExpr, int N){
 **     SELECT random()%5 AS x, count(*) FROM tab GROUP BY random()%5
 **
 ** The result of random()%5 in the GROUP BY clause is probably different
-** from the result in the result-set.  We might fix this someday.  Or
-** then again, we might not...
+** from the result in the result-set.  On the other hand Standard SQL does
+** not allow the GROUP BY clause to contain references to result-set columns.
+** So this should never come up in well-formed queries.
 **
 ** If the reference is followed by a COLLATE operator, then make sure
 ** the COLLATE operator is preserved.  For example:
@@ -73994,10 +76251,11 @@ static void resolveAlias(
     incrAggFunctionDepth(pDup, nSubquery);
     pDup = sqlite3PExpr(pParse, TK_AS, pDup, 0, 0);
     if( pDup==0 ) return;
-    if( pEList->a[iCol].iAlias==0 ){
-      pEList->a[iCol].iAlias = (u16)(++pParse->nAlias);
+    ExprSetProperty(pDup, EP_Skip);
+    if( pEList->a[iCol].u.x.iAlias==0 ){
+      pEList->a[iCol].u.x.iAlias = (u16)(++pParse->nAlias);
     }
-    pDup->iTable = pEList->a[iCol].iAlias;
+    pDup->iTable = pEList->a[iCol].u.x.iAlias;
   }
   if( pExpr->op==TK_COLLATE ){
     pDup = sqlite3ExprAddCollateString(pParse, pDup, pExpr->u.zToken);
@@ -74016,7 +76274,7 @@ static void resolveAlias(
   if( !ExprHasProperty(pExpr, EP_IntValue) && pExpr->u.zToken!=0 ){
     assert( (pExpr->flags & (EP_Reduced|EP_TokenOnly))==0 );
     pExpr->u.zToken = sqlite3DbStrDup(db, pExpr->u.zToken);
-    pExpr->flags2 |= EP2_MallocedToken;
+    pExpr->flags |= EP_MemToken;
   }
   sqlite3DbFree(db, pDup);
 }
@@ -74112,27 +76370,38 @@ static int lookupName(
   struct SrcList_item *pMatch = 0;  /* The matching pSrcList item */
   NameContext *pTopNC = pNC;        /* First namecontext in the list */
   Schema *pSchema = 0;              /* Schema of the expression */
-  int isTrigger = 0;
+  int isTrigger = 0;                /* True if resolved to a trigger column */
+  Table *pTab = 0;                  /* Table hold the row */
+  Column *pCol;                     /* A column of pTab */
 
   assert( pNC );     /* the name context cannot be NULL. */
   assert( zCol );    /* The Z in X.Y.Z cannot be NULL */
-  assert( !ExprHasAnyProperty(pExpr, EP_TokenOnly|EP_Reduced) );
+  assert( !ExprHasProperty(pExpr, EP_TokenOnly|EP_Reduced) );
 
   /* Initialize the node to no-match */
   pExpr->iTable = -1;
   pExpr->pTab = 0;
-  ExprSetIrreducible(pExpr);
+  ExprSetVVAProperty(pExpr, EP_NoReduce);
 
   /* Translate the schema name in zDb into a pointer to the corresponding
   ** schema.  If not found, pSchema will remain NULL and nothing will match
   ** resulting in an appropriate error message toward the end of this routine
   */
   if( zDb ){
-    for(i=0; i<db->nDb; i++){
-      assert( db->aDb[i].zName );
-      if( sqlite3StrICmp(db->aDb[i].zName,zDb)==0 ){
-        pSchema = db->aDb[i].pSchema;
-        break;
+    testcase( pNC->ncFlags & NC_PartIdx );
+    testcase( pNC->ncFlags & NC_IsCheck );
+    if( (pNC->ncFlags & (NC_PartIdx|NC_IsCheck))!=0 ){
+      /* Silently ignore database qualifiers inside CHECK constraints and partial
+      ** indices.  Do not raise errors because that might break legacy and
+      ** because it does not hurt anything to just ignore the database name. */
+      zDb = 0;
+    }else{
+      for(i=0; i<db->nDb; i++){
+        assert( db->aDb[i].zName );
+        if( sqlite3StrICmp(db->aDb[i].zName,zDb)==0 ){
+          pSchema = db->aDb[i].pSchema;
+          break;
+        }
       }
     }
   }
@@ -74144,9 +76413,6 @@ static int lookupName(
 
     if( pSrcList ){
       for(i=0, pItem=pSrcList->a; i<pSrcList->nSrc; i++, pItem++){
-        Table *pTab;
-        Column *pCol;
-  
         pTab = pItem->pTab;
         assert( pTab!=0 && pTab->zName!=0 );
         assert( pTab->nCol>0 );
@@ -74206,9 +76472,8 @@ static int lookupName(
     /* If we have not already resolved the name, then maybe 
     ** it is a new.* or old.* trigger argument reference
     */
-    if( zDb==0 && zTab!=0 && cnt==0 && pParse->pTriggerTab!=0 ){
+    if( zDb==0 && zTab!=0 && cntTab==0 && pParse->pTriggerTab!=0 ){
       int op = pParse->eTriggerOp;
-      Table *pTab = 0;
       assert( op==TK_DELETE || op==TK_UPDATE || op==TK_INSERT );
       if( op!=TK_DELETE && sqlite3StrICmp("new",zTab) == 0 ){
         pExpr->iTable = 1;
@@ -74216,14 +76481,15 @@ static int lookupName(
       }else if( op!=TK_INSERT && sqlite3StrICmp("old",zTab)==0 ){
         pExpr->iTable = 0;
         pTab = pParse->pTriggerTab;
+      }else{
+        pTab = 0;
       }
 
       if( pTab ){ 
         int iCol;
         pSchema = pTab->pSchema;
         cntTab++;
-        for(iCol=0; iCol<pTab->nCol; iCol++){
-          Column *pCol = &pTab->aCol[iCol];
+        for(iCol=0, pCol=pTab->aCol; iCol<pTab->nCol; iCol++, pCol++){
           if( sqlite3StrICmp(pCol->zName, zCol)==0 ){
             if( iCol==pTab->iPKey ){
               iCol = -1;
@@ -74231,8 +76497,10 @@ static int lookupName(
             break;
           }
         }
-        if( iCol>=pTab->nCol && sqlite3IsRowid(zCol) ){
-          iCol = -1;        /* IMP: R-44911-55124 */
+        if( iCol>=pTab->nCol && sqlite3IsRowid(zCol) && HasRowid(pTab) ){
+          /* IMP: R-24309-18625 */
+          /* IMP: R-44911-55124 */
+          iCol = -1;
         }
         if( iCol<pTab->nCol ){
           cnt++;
@@ -74258,7 +76526,8 @@ static int lookupName(
     /*
     ** Perhaps the name is a reference to the ROWID
     */
-    if( cnt==0 && cntTab==1 && sqlite3IsRowid(zCol) ){
+    if( cnt==0 && cntTab==1 && pMatch && sqlite3IsRowid(zCol)
+     && HasRowid(pMatch->pTab) ){
       cnt = 1;
       pExpr->iColumn = -1;     /* IMP: R-44911-55124 */
       pExpr->affinity = SQLITE_AFF_INTEGER;
@@ -74275,10 +76544,16 @@ static int lookupName(
     ** forms the result set entry ("a+b" in the example) and return immediately.
     ** Note that the expression in the result set should have already been
     ** resolved by the time the WHERE clause is resolved.
+    **
+    ** The ability to use an output result-set column in the WHERE, GROUP BY,
+    ** or HAVING clauses, or as part of a larger expression in the ORDRE BY
+    ** clause is not standard SQL.  This is a (goofy) SQLite extension, that
+    ** is supported for backwards compatibility only.  TO DO: Issue a warning
+    ** on sqlite3_log() whenever the capability is used.
     */
     if( (pEList = pNC->pEList)!=0
      && zTab==0
-     && ((pNC->ncFlags & NC_AsMaybe)==0 || cnt==0)
+     && cnt==0
     ){
       for(j=0; j<pEList->nExpr; j++){
         char *zAs = pEList->a[j].zName;
@@ -74410,6 +76685,52 @@ SQLITE_PRIVATE Expr *sqlite3CreateColumnExpr(sqlite3 *db, SrcList *pSrc, int iSr
   return p;
 }
 
+/*
+** Report an error that an expression is not valid for a partial index WHERE
+** clause.
+*/
+static void notValidPartIdxWhere(
+  Parse *pParse,       /* Leave error message here */
+  NameContext *pNC,    /* The name context */
+  const char *zMsg     /* Type of error */
+){
+  if( (pNC->ncFlags & NC_PartIdx)!=0 ){
+    sqlite3ErrorMsg(pParse, "%s prohibited in partial index WHERE clauses",
+                    zMsg);
+  }
+}
+
+#ifndef SQLITE_OMIT_CHECK
+/*
+** Report an error that an expression is not valid for a CHECK constraint.
+*/
+static void notValidCheckConstraint(
+  Parse *pParse,       /* Leave error message here */
+  NameContext *pNC,    /* The name context */
+  const char *zMsg     /* Type of error */
+){
+  if( (pNC->ncFlags & NC_IsCheck)!=0 ){
+    sqlite3ErrorMsg(pParse,"%s prohibited in CHECK constraints", zMsg);
+  }
+}
+#else
+# define notValidCheckConstraint(P,N,M)
+#endif
+
+/*
+** Expression p should encode a floating point value between 1.0 and 0.0.
+** Return 1024 times this value.  Or return -1 if p is not a floating point
+** value between 1.0 and 0.0.
+*/
+static int exprProbability(Expr *p){
+  double r = -1.0;
+  if( p->op!=TK_FLOAT ) return -1;
+  sqlite3AtoF(p->u.zToken, &r, sqlite3Strlen30(p->u.zToken), SQLITE_UTF8);
+  assert( r>=0.0 );
+  if( r>1.0 ) return -1;
+  return (int)(r*1000.0);
+}
+
 /*
 ** This routine is callback for sqlite3WalkExpr().
 **
@@ -74430,7 +76751,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
   pParse = pNC->pParse;
   assert( pParse==pWalker->pParse );
 
-  if( ExprHasAnyProperty(pExpr, EP_Resolved) ) return WRC_Prune;
+  if( ExprHasProperty(pExpr, EP_Resolved) ) return WRC_Prune;
   ExprSetProperty(pExpr, EP_Resolved);
 #ifndef NDEBUG
   if( pNC->pSrcList && pNC->pSrcList->nAlloc>0 ){
@@ -74494,7 +76815,6 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
 
     /* Resolve function names
     */
-    case TK_CONST_FUNC:
     case TK_FUNCTION: {
       ExprList *pList = pExpr->x.pList;    /* The argument list */
       int n = pList ? pList->nExpr : 0;    /* Number of arguments */
@@ -74507,8 +76827,8 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
       FuncDef *pDef;              /* Information about the function */
       u8 enc = ENC(pParse->db);   /* The database encoding */
 
-      testcase( pExpr->op==TK_CONST_FUNC );
       assert( !ExprHasProperty(pExpr, EP_xIsSelect) );
+      notValidPartIdxWhere(pParse, pNC, "functions");
       zId = pExpr->u.zToken;
       nId = sqlite3Strlen30(zId);
       pDef = sqlite3FindFunction(pParse->db, zId, nId, n, enc, 0);
@@ -74521,6 +76841,23 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
         }
       }else{
         is_agg = pDef->xFunc==0;
+        if( pDef->funcFlags & SQLITE_FUNC_UNLIKELY ){
+          ExprSetProperty(pExpr, EP_Unlikely|EP_Skip);
+          if( n==2 ){
+            pExpr->iTable = exprProbability(pList->a[1].pExpr);
+            if( pExpr->iTable<0 ){
+              sqlite3ErrorMsg(pParse, "second argument to likelihood() must be a "
+                                      "constant between 0.0 and 1.0");
+              pNC->nErr++;
+            }
+          }else{
+            /* EVIDENCE-OF: R-61304-29449 The unlikely(X) function is equivalent to
+            ** likelihood(X, 0.0625).
+            ** EVIDENCE-OF: R-01283-11636 The unlikely(X) function is short-hand for
+            ** likelihood(X,0.0625). */
+            pExpr->iTable = 62;  /* TUNING:  Default 2nd arg to unlikely() is 0.0625 */
+          }             
+        }
       }
 #ifndef SQLITE_OMIT_AUTHORIZATION
       if( pDef ){
@@ -74534,6 +76871,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
           pExpr->op = TK_NULL;
           return WRC_Prune;
         }
+        if( pDef->funcFlags & SQLITE_FUNC_CONSTANT ) ExprSetProperty(pExpr,EP_Constant);
       }
 #endif
       if( is_agg && (pNC->ncFlags & NC_AllowAgg)==0 ){
@@ -74574,11 +76912,8 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
       testcase( pExpr->op==TK_IN );
       if( ExprHasProperty(pExpr, EP_xIsSelect) ){
         int nRef = pNC->nRef;
-#ifndef SQLITE_OMIT_CHECK
-        if( (pNC->ncFlags & NC_IsCheck)!=0 ){
-          sqlite3ErrorMsg(pParse,"subqueries prohibited in CHECK constraints");
-        }
-#endif
+        notValidCheckConstraint(pParse, pNC, "subqueries");
+        notValidPartIdxWhere(pParse, pNC, "subqueries");
         sqlite3WalkSelect(pWalker, pExpr->x.pSelect);
         assert( pNC->nRef>=nRef );
         if( nRef!=pNC->nRef ){
@@ -74587,14 +76922,11 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
       }
       break;
     }
-#ifndef SQLITE_OMIT_CHECK
     case TK_VARIABLE: {
-      if( (pNC->ncFlags & NC_IsCheck)!=0 ){
-        sqlite3ErrorMsg(pParse,"parameters prohibited in CHECK constraints");
-      }
+      notValidCheckConstraint(pParse, pNC, "parameters");
+      notValidPartIdxWhere(pParse, pNC, "parameters");
       break;
     }
-#endif
   }
   return (pParse->nErr || pParse->db->mallocFailed) ? WRC_Abort : WRC_Continue;
 }
@@ -74685,7 +77017,7 @@ static int resolveOrderByTermToExprList(
   ** result-set entry.
   */
   for(i=0; i<pEList->nExpr; i++){
-    if( sqlite3ExprCompare(pEList->a[i].pExpr, pE)<2 ){
+    if( sqlite3ExprCompare(pEList->a[i].pExpr, pE, -1)<2 ){
       return i+1;
     }
   }
@@ -74791,7 +77123,7 @@ static int resolveCompoundOrderBy(
           pItem->pExpr->pLeft = pNew;
         }
         sqlite3ExprDelete(db, pE);
-        pItem->iOrderByCol = (u16)iCol;
+        pItem->u.x.iOrderByCol = (u16)iCol;
         pItem->done = 1;
       }else{
         moreToDo = 1;
@@ -74812,8 +77144,8 @@ static int resolveCompoundOrderBy(
 /*
 ** Check every term in the ORDER BY or GROUP BY clause pOrderBy of
 ** the SELECT statement pSelect.  If any term is reference to a
-** result set expression (as determined by the ExprList.a.iCol field)
-** then convert that term into a copy of the corresponding result set
+** result set expression (as determined by the ExprList.a.u.x.iOrderByCol
+** field) then convert that term into a copy of the corresponding result set
 ** column.
 **
 ** If any errors are detected, add an error message to pParse and
@@ -74840,12 +77172,12 @@ SQLITE_PRIVATE int sqlite3ResolveOrderGroupBy(
   pEList = pSelect->pEList;
   assert( pEList!=0 );  /* sqlite3SelectNew() guarantees this */
   for(i=0, pItem=pOrderBy->a; i<pOrderBy->nExpr; i++, pItem++){
-    if( pItem->iOrderByCol ){
-      if( pItem->iOrderByCol>pEList->nExpr ){
+    if( pItem->u.x.iOrderByCol ){
+      if( pItem->u.x.iOrderByCol>pEList->nExpr ){
         resolveOutOfRangeError(pParse, zType, i+1, pEList->nExpr);
         return 1;
       }
-      resolveAlias(pParse, pEList, pItem->iOrderByCol-1, pItem->pExpr, zType,0);
+      resolveAlias(pParse, pEList, pItem->u.x.iOrderByCol-1, pItem->pExpr, zType,0);
     }
   }
   return 0;
@@ -74860,7 +77192,7 @@ SQLITE_PRIVATE int sqlite3ResolveOrderGroupBy(
 ** If the order-by term is an integer I between 1 and N (where N is the
 ** number of columns in the result set of the SELECT) then the expression
 ** in the resolution is a copy of the I-th result-set expression.  If
-** the order-by term is an identify that corresponds to the AS-name of
+** the order-by term is an identifier that corresponds to the AS-name of
 ** a result-set expression, then the term resolves to a copy of the
 ** result-set expression.  Otherwise, the expression is resolved in
 ** the usual way - using sqlite3ResolveExprNames().
@@ -74886,16 +77218,19 @@ static int resolveOrderGroupBy(
   pParse = pNC->pParse;
   for(i=0, pItem=pOrderBy->a; i<pOrderBy->nExpr; i++, pItem++){
     Expr *pE = pItem->pExpr;
-    iCol = resolveAsName(pParse, pSelect->pEList, pE);
-    if( iCol>0 ){
-      /* If an AS-name match is found, mark this ORDER BY column as being
-      ** a copy of the iCol-th result-set column.  The subsequent call to
-      ** sqlite3ResolveOrderGroupBy() will convert the expression to a
-      ** copy of the iCol-th result-set expression. */
-      pItem->iOrderByCol = (u16)iCol;
-      continue;
+    Expr *pE2 = sqlite3ExprSkipCollate(pE);
+    if( zType[0]!='G' ){
+      iCol = resolveAsName(pParse, pSelect->pEList, pE2);
+      if( iCol>0 ){
+        /* If an AS-name match is found, mark this ORDER BY column as being
+        ** a copy of the iCol-th result-set column.  The subsequent call to
+        ** sqlite3ResolveOrderGroupBy() will convert the expression to a
+        ** copy of the iCol-th result-set expression. */
+        pItem->u.x.iOrderByCol = (u16)iCol;
+        continue;
+      }
     }
-    if( sqlite3ExprIsInteger(sqlite3ExprSkipCollate(pE), &iCol) ){
+    if( sqlite3ExprIsInteger(pE2, &iCol) ){
       /* The ORDER BY term is an integer constant.  Again, set the column
       ** number so that sqlite3ResolveOrderGroupBy() will convert the
       ** order-by term to a copy of the result-set expression */
@@ -74903,18 +77238,18 @@ static int resolveOrderGroupBy(
         resolveOutOfRangeError(pParse, zType, i+1, nResult);
         return 1;
       }
-      pItem->iOrderByCol = (u16)iCol;
+      pItem->u.x.iOrderByCol = (u16)iCol;
       continue;
     }
 
     /* Otherwise, treat the ORDER BY term as an ordinary expression */
-    pItem->iOrderByCol = 0;
+    pItem->u.x.iOrderByCol = 0;
     if( sqlite3ResolveExprNames(pNC, pE) ){
       return 1;
     }
     for(j=0; j<pSelect->pEList->nExpr; j++){
-      if( sqlite3ExprCompare(pE, pSelect->pEList->a[j].pExpr)==0 ){
-        pItem->iOrderByCol = j+1;
+      if( sqlite3ExprCompare(pE, pSelect->pEList->a[j].pExpr, -1)==0 ){
+        pItem->u.x.iOrderByCol = j+1;
       }
     }
   }
@@ -75038,7 +77373,7 @@ static int resolveSelectStep(Walker *pWalker, Select *p){
       return WRC_Abort;
     }
   
-    /* Add the expression list to the name-context before parsing the
+    /* Add the output column list to the name-context before parsing the
     ** other expressions in the SELECT statement. This is so that
     ** expressions in the WHERE clause (etc.) can refer to expressions by
     ** aliases in the result set.
@@ -75047,10 +77382,8 @@ static int resolveSelectStep(Walker *pWalker, Select *p){
     ** re-evaluated for each reference to it.
     */
     sNC.pEList = p->pEList;
-    sNC.ncFlags |= NC_AsMaybe;
     if( sqlite3ResolveExprNames(&sNC, p->pHaving) ) return WRC_Abort;
     if( sqlite3ResolveExprNames(&sNC, p->pWhere) ) return WRC_Abort;
-    sNC.ncFlags &= ~NC_AsMaybe;
 
     /* The ORDER BY and GROUP BY clauses may not refer to terms in
     ** outer queries 
@@ -75220,6 +77553,48 @@ SQLITE_PRIVATE void sqlite3ResolveSelectNames(
   sqlite3WalkSelect(&w, p);
 }
 
+/*
+** Resolve names in expressions that can only reference a single table:
+**
+**    *   CHECK constraints
+**    *   WHERE clauses on partial indices
+**
+** The Expr.iTable value for Expr.op==TK_COLUMN nodes of the expression
+** is set to -1 and the Expr.iColumn value is set to the column number.
+**
+** Any errors cause an error message to be set in pParse.
+*/
+SQLITE_PRIVATE void sqlite3ResolveSelfReference(
+  Parse *pParse,      /* Parsing context */
+  Table *pTab,        /* The table being referenced */
+  int type,           /* NC_IsCheck or NC_PartIdx */
+  Expr *pExpr,        /* Expression to resolve.  May be NULL. */
+  ExprList *pList     /* Expression list to resolve.  May be NUL. */
+){
+  SrcList sSrc;                   /* Fake SrcList for pParse->pNewTable */
+  NameContext sNC;                /* Name context for pParse->pNewTable */
+  int i;                          /* Loop counter */
+
+  assert( type==NC_IsCheck || type==NC_PartIdx );
+  memset(&sNC, 0, sizeof(sNC));
+  memset(&sSrc, 0, sizeof(sSrc));
+  sSrc.nSrc = 1;
+  sSrc.a[0].zName = pTab->zName;
+  sSrc.a[0].pTab = pTab;
+  sSrc.a[0].iCursor = -1;
+  sNC.pParse = pParse;
+  sNC.pSrcList = &sSrc;
+  sNC.ncFlags = type;
+  if( sqlite3ResolveExprNames(&sNC, pExpr) ) return;
+  if( pList ){
+    for(i=0; i<pList->nExpr; i++){
+      if( sqlite3ResolveExprNames(&sNC, pList->a[i].pExpr) ){
+        return;
+      }
+    }
+  }
+}
+
 /************** End of resolve.c *********************************************/
 /************** Begin file expr.c ********************************************/
 /*
@@ -75256,6 +77631,7 @@ SQLITE_PRIVATE void sqlite3ResolveSelectNames(
 SQLITE_PRIVATE char sqlite3ExprAffinity(Expr *pExpr){
   int op;
   pExpr = sqlite3ExprSkipCollate(pExpr);
+  if( pExpr->flags & EP_Generic ) return SQLITE_AFF_NONE;
   op = pExpr->op;
   if( op==TK_SELECT ){
     assert( pExpr->flags&EP_xIsSelect );
@@ -75264,7 +77640,7 @@ SQLITE_PRIVATE char sqlite3ExprAffinity(Expr *pExpr){
 #ifndef SQLITE_OMIT_CAST
   if( op==TK_CAST ){
     assert( !ExprHasProperty(pExpr, EP_IntValue) );
-    return sqlite3AffinityType(pExpr->u.zToken);
+    return sqlite3AffinityType(pExpr->u.zToken, 0);
   }
 #endif
   if( (op==TK_AGG_COLUMN || op==TK_COLUMN || op==TK_REGISTER) 
@@ -75288,12 +77664,16 @@ SQLITE_PRIVATE char sqlite3ExprAffinity(Expr *pExpr){
 ** If a memory allocation error occurs, that fact is recorded in pParse->db
 ** and the pExpr parameter is returned unchanged.
 */
-SQLITE_PRIVATE Expr *sqlite3ExprAddCollateToken(Parse *pParse, Expr *pExpr, Token *pCollName){
+SQLITE_PRIVATE Expr *sqlite3ExprAddCollateToken(
+  Parse *pParse,           /* Parsing context */
+  Expr *pExpr,             /* Add the "COLLATE" clause to this expression */
+  const Token *pCollName   /* Name of collating sequence */
+){
   if( pCollName->n>0 ){
     Expr *pNew = sqlite3ExprAlloc(pParse->db, TK_COLLATE, pCollName, 1);
     if( pNew ){
       pNew->pLeft = pExpr;
-      pNew->flags |= EP_Collate;
+      pNew->flags |= EP_Collate|EP_Skip;
       pExpr = pNew;
     }
   }
@@ -75308,13 +77688,21 @@ SQLITE_PRIVATE Expr *sqlite3ExprAddCollateString(Parse *pParse, Expr *pExpr, con
 }
 
 /*
-** Skip over any TK_COLLATE and/or TK_AS operators at the root of
-** an expression.
+** Skip over any TK_COLLATE or TK_AS operators and any unlikely()
+** or likelihood() function at the root of an expression.
 */
 SQLITE_PRIVATE Expr *sqlite3ExprSkipCollate(Expr *pExpr){
-  while( pExpr && (pExpr->op==TK_COLLATE || pExpr->op==TK_AS) ){
-    pExpr = pExpr->pLeft;
-  }
+  while( pExpr && ExprHasProperty(pExpr, EP_Skip) ){
+    if( ExprHasProperty(pExpr, EP_Unlikely) ){
+      assert( !ExprHasProperty(pExpr, EP_xIsSelect) );
+      assert( pExpr->x.pList->nExpr>0 );
+      assert( pExpr->op==TK_FUNCTION );
+      pExpr = pExpr->x.pList->a[0].pExpr;
+    }else{
+      assert( pExpr->op==TK_COLLATE || pExpr->op==TK_AS );
+      pExpr = pExpr->pLeft;
+    }
+  }   
   return pExpr;
 }
 
@@ -75333,12 +77721,12 @@ SQLITE_PRIVATE CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr){
   Expr *p = pExpr;
   while( p ){
     int op = p->op;
+    if( p->flags & EP_Generic ) break;
     if( op==TK_CAST || op==TK_UPLUS ){
       p = p->pLeft;
       continue;
     }
-    assert( op!=TK_REGISTER || p->op2!=TK_COLLATE );
-    if( op==TK_COLLATE ){
+    if( op==TK_COLLATE || (op==TK_REGISTER && p->op2==TK_COLLATE) ){
       pColl = sqlite3GetCollSeq(pParse, ENC(db), 0, p->u.zToken);
       break;
     }
@@ -75739,16 +78127,25 @@ SQLITE_PRIVATE Expr *sqlite3PExpr(
 }
 
 /*
-** Return 1 if an expression must be FALSE in all cases and 0 if the
-** expression might be true.  This is an optimization.  If is OK to
-** return 0 here even if the expression really is always false (a 
-** false negative).  But it is a bug to return 1 if the expression
-** might be true in some rare circumstances (a false positive.)
+** If the expression is always either TRUE or FALSE (respectively),
+** then return 1.  If one cannot determine the truth value of the
+** expression at compile-time return 0.
+**
+** This is an optimization.  If is OK to return 0 here even if
+** the expression really is always false or false (a false negative).
+** But it is a bug to return 1 if the expression might have different
+** boolean values in different circumstances (a false positive.)
 **
 ** Note that if the expression is part of conditional for a
 ** LEFT JOIN, then we cannot determine at compile-time whether or not
 ** is it true or false, so always return 0.
 */
+static int exprAlwaysTrue(Expr *p){
+  int v = 0;
+  if( ExprHasProperty(p, EP_FromJoin) ) return 0;
+  if( !sqlite3ExprIsInteger(p, &v) ) return 0;
+  return v!=0;
+}
 static int exprAlwaysFalse(Expr *p){
   int v = 0;
   if( ExprHasProperty(p, EP_FromJoin) ) return 0;
@@ -75820,7 +78217,7 @@ SQLITE_PRIVATE void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){
   const char *z;
 
   if( pExpr==0 ) return;
-  assert( !ExprHasAnyProperty(pExpr, EP_IntValue|EP_Reduced|EP_TokenOnly) );
+  assert( !ExprHasProperty(pExpr, EP_IntValue|EP_Reduced|EP_TokenOnly) );
   z = pExpr->u.zToken;
   assert( z!=0 );
   assert( z[0]!=0 );
@@ -75890,12 +78287,12 @@ SQLITE_PRIVATE void sqlite3ExprDelete(sqlite3 *db, Expr *p){
   if( p==0 ) return;
   /* Sanity check: Assert that the IntValue is non-negative if it exists */
   assert( !ExprHasProperty(p, EP_IntValue) || p->u.iValue>=0 );
-  if( !ExprHasAnyProperty(p, EP_TokenOnly) ){
+  if( !ExprHasProperty(p, EP_TokenOnly) ){
+    /* The Expr.x union is never used at the same time as Expr.pRight */
+    assert( p->x.pList==0 || p->pRight==0 );
     sqlite3ExprDelete(db, p->pLeft);
     sqlite3ExprDelete(db, p->pRight);
-    if( !ExprHasProperty(p, EP_Reduced) && (p->flags2 & EP2_MallocedToken)!=0 ){
-      sqlite3DbFree(db, p->u.zToken);
-    }
+    if( ExprHasProperty(p, EP_MemToken) ) sqlite3DbFree(db, p->u.zToken);
     if( ExprHasProperty(p, EP_xIsSelect) ){
       sqlite3SelectDelete(db, p->x.pSelect);
     }else{
@@ -75955,16 +78352,19 @@ static int exprStructSize(Expr *p){
 static int dupedExprStructSize(Expr *p, int flags){
   int nSize;
   assert( flags==EXPRDUP_REDUCE || flags==0 ); /* Only one flag value allowed */
+  assert( EXPR_FULLSIZE<=0xfff );
+  assert( (0xfff & (EP_Reduced|EP_TokenOnly))==0 );
   if( 0==(flags&EXPRDUP_REDUCE) ){
     nSize = EXPR_FULLSIZE;
   }else{
-    assert( !ExprHasAnyProperty(p, EP_TokenOnly|EP_Reduced) );
+    assert( !ExprHasProperty(p, EP_TokenOnly|EP_Reduced) );
     assert( !ExprHasProperty(p, EP_FromJoin) ); 
-    assert( (p->flags2 & EP2_MallocedToken)==0 );
-    assert( (p->flags2 & EP2_Irreducible)==0 );
-    if( p->pLeft || p->pRight || p->x.pList ){
+    assert( !ExprHasProperty(p, EP_MemToken) );
+    assert( !ExprHasProperty(p, EP_NoReduce) );
+    if( p->pLeft || p->x.pList ){
       nSize = EXPR_REDUCEDSIZE | EP_Reduced;
     }else{
+      assert( p->pRight==0 );
       nSize = EXPR_TOKENONLYSIZE | EP_TokenOnly;
     }
   }
@@ -76058,7 +78458,7 @@ static Expr *exprDup(sqlite3 *db, Expr *p, int flags, u8 **pzBuffer){
       }
 
       /* Set the EP_Reduced, EP_TokenOnly, and EP_Static flags appropriately. */
-      pNew->flags &= ~(EP_Reduced|EP_TokenOnly|EP_Static);
+      pNew->flags &= ~(EP_Reduced|EP_TokenOnly|EP_Static|EP_MemToken);
       pNew->flags |= nStructSize & (EP_Reduced|EP_TokenOnly);
       pNew->flags |= staticFlag;
 
@@ -76078,7 +78478,7 @@ static Expr *exprDup(sqlite3 *db, Expr *p, int flags, u8 **pzBuffer){
       }
 
       /* Fill in pNew->pLeft and pNew->pRight. */
-      if( ExprHasAnyProperty(pNew, EP_Reduced|EP_TokenOnly) ){
+      if( ExprHasProperty(pNew, EP_Reduced|EP_TokenOnly) ){
         zAlloc += dupedExprNodeSize(p, flags);
         if( ExprHasProperty(pNew, EP_Reduced) ){
           pNew->pLeft = exprDup(db, p->pLeft, EXPRDUP_REDUCE, &zAlloc);
@@ -76088,8 +78488,7 @@ static Expr *exprDup(sqlite3 *db, Expr *p, int flags, u8 **pzBuffer){
           *pzBuffer = zAlloc;
         }
       }else{
-        pNew->flags2 = 0;
-        if( !ExprHasAnyProperty(p, EP_TokenOnly) ){
+        if( !ExprHasProperty(p, EP_TokenOnly) ){
           pNew->pLeft = sqlite3ExprDup(db, p->pLeft, 0);
           pNew->pRight = sqlite3ExprDup(db, p->pRight, 0);
         }
@@ -76100,6 +78499,33 @@ static Expr *exprDup(sqlite3 *db, Expr *p, int flags, u8 **pzBuffer){
   return pNew;
 }
 
+/*
+** Create and return a deep copy of the object passed as the second 
+** argument. If an OOM condition is encountered, NULL is returned
+** and the db->mallocFailed flag set.
+*/
+#ifndef SQLITE_OMIT_CTE
+static With *withDup(sqlite3 *db, With *p){
+  With *pRet = 0;
+  if( p ){
+    int nByte = sizeof(*p) + sizeof(p->a[0]) * (p->nCte-1);
+    pRet = sqlite3DbMallocZero(db, nByte);
+    if( pRet ){
+      int i;
+      pRet->nCte = p->nCte;
+      for(i=0; i<p->nCte; i++){
+        pRet->a[i].pSelect = sqlite3SelectDup(db, p->a[i].pSelect, 0);
+        pRet->a[i].pCols = sqlite3ExprListDup(db, p->a[i].pCols, 0);
+        pRet->a[i].zName = sqlite3DbStrDup(db, p->a[i].zName);
+      }
+    }
+  }
+  return pRet;
+}
+#else
+# define withDup(x,y) 0
+#endif
+
 /*
 ** The following group of routines make deep copies of expressions,
 ** expression lists, ID lists, and select statements.  The copies can
@@ -76127,7 +78553,6 @@ SQLITE_PRIVATE ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags)
   if( p==0 ) return 0;
   pNew = sqlite3DbMallocRaw(db, sizeof(*pNew) );
   if( pNew==0 ) return 0;
-  pNew->iECursor = 0;
   pNew->nExpr = i = p->nExpr;
   if( (flags & EXPRDUP_REDUCE)==0 ) for(i=1; i<p->nExpr; i+=i){}
   pNew->a = pItem = sqlite3DbMallocRaw(db,  i*sizeof(p->a[0]) );
@@ -76143,8 +78568,8 @@ SQLITE_PRIVATE ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags)
     pItem->zSpan = sqlite3DbStrDup(db, pOldItem->zSpan);
     pItem->sortOrder = pOldItem->sortOrder;
     pItem->done = 0;
-    pItem->iOrderByCol = pOldItem->iOrderByCol;
-    pItem->iAlias = pOldItem->iAlias;
+    pItem->bSpanIsTab = pOldItem->bSpanIsTab;
+    pItem->u = pOldItem->u;
   }
   return pNew;
 }
@@ -76180,6 +78605,7 @@ SQLITE_PRIVATE SrcList *sqlite3SrcListDup(sqlite3 *db, SrcList *p, int flags){
     pNewItem->regReturn = pOldItem->regReturn;
     pNewItem->isCorrelated = pOldItem->isCorrelated;
     pNewItem->viaCoroutine = pOldItem->viaCoroutine;
+    pNewItem->isRecursive = pOldItem->isRecursive;
     pNewItem->zIndex = sqlite3DbStrDup(db, pOldItem->zIndex);
     pNewItem->notIndexed = pOldItem->notIndexed;
     pNewItem->pIndex = pOldItem->pIndex;
@@ -76237,10 +78663,10 @@ SQLITE_PRIVATE Select *sqlite3SelectDup(sqlite3 *db, Select *p, int flags){
   pNew->iLimit = 0;
   pNew->iOffset = 0;
   pNew->selFlags = p->selFlags & ~SF_UsesEphemeral;
-  pNew->pRightmost = 0;
   pNew->addrOpenEphm[0] = -1;
   pNew->addrOpenEphm[1] = -1;
-  pNew->addrOpenEphm[2] = -1;
+  pNew->nSelectRow = p->nSelectRow;
+  pNew->pWith = withDup(db, p->pWith);
   return pNew;
 }
 #else
@@ -76398,16 +78824,19 @@ static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){
   /* If pWalker->u.i is 3 then any term of the expression that comes from
   ** the ON or USING clauses of a join disqualifies the expression
   ** from being considered constant. */
-  if( pWalker->u.i==3 && ExprHasAnyProperty(pExpr, EP_FromJoin) ){
+  if( pWalker->u.i==3 && ExprHasProperty(pExpr, EP_FromJoin) ){
     pWalker->u.i = 0;
     return WRC_Abort;
   }
 
   switch( pExpr->op ){
     /* Consider functions to be constant if all their arguments are constant
-    ** and pWalker->u.i==2 */
+    ** and either pWalker->u.i==2 or the function as the SQLITE_FUNC_CONST
+    ** flag. */
     case TK_FUNCTION:
-      if( pWalker->u.i==2 ) return 0;
+      if( pWalker->u.i==2 || ExprHasProperty(pExpr,EP_Constant) ){
+        return WRC_Continue;
+      }
       /* Fall through */
     case TK_ID:
     case TK_COLUMN:
@@ -76501,6 +78930,7 @@ SQLITE_PRIVATE int sqlite3ExprIsInteger(Expr *p, int *pValue){
     case TK_UMINUS: {
       int v;
       if( sqlite3ExprIsInteger(p->pLeft, &v) ){
+        assert( v!=(-2147483647-1) );
         *pValue = -v;
         rc = 1;
       }
@@ -76541,24 +78971,6 @@ SQLITE_PRIVATE int sqlite3ExprCanBeNull(const Expr *p){
   }
 }
 
-/*
-** Generate an OP_IsNull instruction that tests register iReg and jumps
-** to location iDest if the value in iReg is NULL.  The value in iReg 
-** was computed by pExpr.  If we can look at pExpr at compile-time and
-** determine that it can never generate a NULL, then the OP_IsNull operation
-** can be omitted.
-*/
-SQLITE_PRIVATE void sqlite3ExprCodeIsNullJump(
-  Vdbe *v,            /* The VDBE under construction */
-  const Expr *pExpr,  /* Only generate OP_IsNull if this expr can be NULL */
-  int iReg,           /* Test the value in this register for NULL */
-  int iDest           /* Jump here if the value is null */
-){
-  if( sqlite3ExprCanBeNull(pExpr) ){
-    sqlite3VdbeAddOp2(v, OP_IsNull, iReg, iDest);
-  }
-}
-
 /*
 ** Return TRUE if the given expression is a constant which would be
 ** unchanged by OP_Affinity with the affinity given in the second
@@ -76744,8 +79156,8 @@ SQLITE_PRIVATE int sqlite3FindInIndex(Parse *pParse, Expr *pX, int *prNotFound){
     sqlite3 *db = pParse->db;              /* Database connection */
     Table *pTab;                           /* Table <table>. */
     Expr *pExpr;                           /* Expression <column> */
-    int iCol;                              /* Index of column <column> */
-    int iDb;                               /* Database idx for pTab */
+    i16 iCol;                              /* Index of column <column> */
+    i16 iDb;                               /* Database idx for pTab */
 
     assert( p );                        /* Because of isCandidateForInOpt(p) */
     assert( p->pEList!=0 );             /* Because of isCandidateForInOpt(p) */
@@ -76753,9 +79165,9 @@ SQLITE_PRIVATE int sqlite3FindInIndex(Parse *pParse, Expr *pX, int *prNotFound){
     assert( p->pSrc!=0 );               /* Because of isCandidateForInOpt(p) */
     pTab = p->pSrc->a[0].pTab;
     pExpr = p->pEList->a[0].pExpr;
-    iCol = pExpr->iColumn;
+    iCol = (i16)pExpr->iColumn;
    
-    /* Code an OP_VerifyCookie and OP_TableLock for <table>. */
+    /* Code an OP_Transaction and OP_TableLock for <table>. */
     iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
     sqlite3CodeVerifySchema(pParse, iDb);
     sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
@@ -76766,9 +79178,8 @@ SQLITE_PRIVATE int sqlite3FindInIndex(Parse *pParse, Expr *pX, int *prNotFound){
     */
     assert(v);
     if( iCol<0 ){
-      int iAddr;
-
-      iAddr = sqlite3CodeOnce(pParse);
+      int iAddr = sqlite3CodeOnce(pParse);
+      VdbeCoverage(v);
 
       sqlite3OpenTable(pParse, iTab, iDb, pTab, OP_OpenRead);
       eType = IN_INDEX_ROWID;
@@ -76791,25 +79202,20 @@ SQLITE_PRIVATE int sqlite3FindInIndex(Parse *pParse, Expr *pX, int *prNotFound){
       for(pIdx=pTab->pIndex; pIdx && eType==0 && affinity_ok; pIdx=pIdx->pNext){
         if( (pIdx->aiColumn[0]==iCol)
          && sqlite3FindCollSeq(db, ENC(db), pIdx->azColl[0], 0)==pReq
-         && (!mustBeUnique || (pIdx->nColumn==1 && pIdx->onError!=OE_None))
+         && (!mustBeUnique || (pIdx->nKeyCol==1 && pIdx->onError!=OE_None))
         ){
-          int iAddr;
-          char *pKey;
-  
-          pKey = (char *)sqlite3IndexKeyinfo(pParse, pIdx);
-          iAddr = sqlite3CodeOnce(pParse);
-  
-          sqlite3VdbeAddOp4(v, OP_OpenRead, iTab, pIdx->tnum, iDb,
-                               pKey,P4_KEYINFO_HANDOFF);
+          int iAddr = sqlite3CodeOnce(pParse); VdbeCoverage(v);
+          sqlite3VdbeAddOp3(v, OP_OpenRead, iTab, pIdx->tnum, iDb);
+          sqlite3VdbeSetP4KeyInfo(pParse, pIdx);
           VdbeComment((v, "%s", pIdx->zName));
           assert( IN_INDEX_INDEX_DESC == IN_INDEX_INDEX_ASC+1 );
           eType = IN_INDEX_INDEX_ASC + pIdx->aSortOrder[0];
 
-          sqlite3VdbeJumpHere(v, iAddr);
           if( prNotFound && !pTab->aCol[iCol].notNull ){
             *prNotFound = ++pParse->nMem;
             sqlite3VdbeAddOp2(v, OP_Null, 0, *prNotFound);
           }
+          sqlite3VdbeJumpHere(v, iAddr);
         }
       }
     }
@@ -76819,16 +79225,15 @@ SQLITE_PRIVATE int sqlite3FindInIndex(Parse *pParse, Expr *pX, int *prNotFound){
     /* Could not found an existing table or index to use as the RHS b-tree.
     ** We will have to generate an ephemeral table to do the job.
     */
-    double savedNQueryLoop = pParse->nQueryLoop;
+    u32 savedNQueryLoop = pParse->nQueryLoop;
     int rMayHaveNull = 0;
     eType = IN_INDEX_EPH;
     if( prNotFound ){
       *prNotFound = rMayHaveNull = ++pParse->nMem;
       sqlite3VdbeAddOp2(v, OP_Null, 0, *prNotFound);
     }else{
-      testcase( pParse->nQueryLoop>(double)1 );
-      pParse->nQueryLoop = (double)1;
-      if( pX->pLeft->iColumn<0 && !ExprHasAnyProperty(pX, EP_xIsSelect) ){
+      pParse->nQueryLoop = 0;
+      if( pX->pLeft->iColumn<0 && !ExprHasProperty(pX, EP_xIsSelect) ){
         eType = IN_INDEX_ROWID;
       }
     }
@@ -76869,7 +79274,7 @@ SQLITE_PRIVATE int sqlite3FindInIndex(Parse *pParse, Expr *pX, int *prNotFound){
 **
 ** If rMayHaveNull is zero, that means that the subquery is being used
 ** for membership testing only.  There is no need to initialize any
-** registers to indicate the presense or absence of NULLs on the RHS.
+** registers to indicate the presence or absence of NULLs on the RHS.
 **
 ** For a SELECT or EXISTS operator, return the register that holds the
 ** result.  For IN operators or if an error occurs, the return value is 0.
@@ -76897,8 +79302,8 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(
   ** If all of the above are false, then we can run this code just once
   ** save the results, and reuse the same result on subsequent invocations.
   */
-  if( !ExprHasAnyProperty(pExpr, EP_VarSelect) ){
-    testAddr = sqlite3CodeOnce(pParse);
+  if( !ExprHasProperty(pExpr, EP_VarSelect) ){
+    testAddr = sqlite3CodeOnce(pParse); VdbeCoverage(v);
   }
 
 #ifndef SQLITE_OMIT_EXPLAIN
@@ -76914,10 +79319,9 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(
   switch( pExpr->op ){
     case TK_IN: {
       char affinity;              /* Affinity of the LHS of the IN */
-      KeyInfo keyInfo;            /* Keyinfo for the generated table */
-      static u8 sortOrder = 0;    /* Fake aSortOrder for keyInfo */
       int addr;                   /* Address of OP_OpenEphemeral instruction */
       Expr *pLeft = pExpr->pLeft; /* the LHS of the IN operator */
+      KeyInfo *pKeyInfo = 0;      /* Key information */
 
       if( rMayHaveNull ){
         sqlite3VdbeAddOp2(v, OP_Null, 0, rMayHaveNull);
@@ -76940,10 +79344,7 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(
       */
       pExpr->iTable = pParse->nTab++;
       addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, pExpr->iTable, !isRowid);
-      if( rMayHaveNull==0 ) sqlite3VdbeChangeP5(v, BTREE_UNORDERED);
-      memset(&keyInfo, 0, sizeof(keyInfo));
-      keyInfo.nField = 1;
-      keyInfo.aSortOrder = &sortOrder;
+      pKeyInfo = isRowid ? 0 : sqlite3KeyInfoAlloc(pParse->db, 1, 1);
 
       if( ExprHasProperty(pExpr, EP_xIsSelect) ){
         /* Case 1:     expr IN (SELECT ...)
@@ -76959,14 +79360,18 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(
         dest.affSdst = (u8)affinity;
         assert( (pExpr->iTable&0x0000FFFF)==pExpr->iTable );
         pExpr->x.pSelect->iLimit = 0;
+        testcase( pKeyInfo==0 ); /* Caused by OOM in sqlite3KeyInfoAlloc() */
         if( sqlite3Select(pParse, pExpr->x.pSelect, &dest) ){
+          sqlite3KeyInfoUnref(pKeyInfo);
           return 0;
         }
         pEList = pExpr->x.pSelect->pEList;
-        if( ALWAYS(pEList!=0 && pEList->nExpr>0) ){ 
-          keyInfo.aColl[0] = sqlite3BinaryCompareCollSeq(pParse, pExpr->pLeft,
-              pEList->a[0].pExpr);
-        }
+        assert( pKeyInfo!=0 ); /* OOM will cause exit after sqlite3Select() */
+        assert( pEList!=0 );
+        assert( pEList->nExpr>0 );
+        assert( sqlite3KeyInfoIsWriteable(pKeyInfo) );
+        pKeyInfo->aColl[0] = sqlite3BinaryCompareCollSeq(pParse, pExpr->pLeft,
+                                                         pEList->a[0].pExpr);
       }else if( ALWAYS(pExpr->x.pList!=0) ){
         /* Case 2:     expr IN (exprlist)
         **
@@ -76983,8 +79388,10 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(
         if( !affinity ){
           affinity = SQLITE_AFF_NONE;
         }
-        keyInfo.aColl[0] = sqlite3ExprCollSeq(pParse, pExpr->pLeft);
-        keyInfo.aSortOrder = &sortOrder;
+        if( pKeyInfo ){
+          assert( sqlite3KeyInfoIsWriteable(pKeyInfo) );
+          pKeyInfo->aColl[0] = sqlite3ExprCollSeq(pParse, pExpr->pLeft);
+        }
 
         /* Loop through each expression in <exprlist>. */
         r1 = sqlite3GetTempReg(pParse);
@@ -77012,6 +79419,7 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(
             if( isRowid ){
               sqlite3VdbeAddOp2(v, OP_MustBeInt, r3,
                                 sqlite3VdbeCurrentAddr(v)+2);
+              VdbeCoverage(v);
               sqlite3VdbeAddOp3(v, OP_Insert, pExpr->iTable, r2, r3);
             }else{
               sqlite3VdbeAddOp4(v, OP_MakeRecord, r3, 1, r2, &affinity, 1);
@@ -77023,8 +79431,8 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(
         sqlite3ReleaseTempReg(pParse, r1);
         sqlite3ReleaseTempReg(pParse, r2);
       }
-      if( !isRowid ){
-        sqlite3VdbeChangeP4(v, addr, (void *)&keyInfo, P4_KEYINFO);
+      if( pKeyInfo ){
+        sqlite3VdbeChangeP4(v, addr, (void *)pKeyInfo, P4_KEYINFO);
       }
       break;
     }
@@ -77065,7 +79473,7 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(
         return 0;
       }
       rReg = dest.iSDParm;
-      ExprSetIrreducible(pExpr);
+      ExprSetVVAProperty(pExpr, EP_NoReduce);
       break;
     }
   }
@@ -77073,7 +79481,7 @@ SQLITE_PRIVATE int sqlite3CodeSubselect(
   if( testAddr>=0 ){
     sqlite3VdbeJumpHere(v, testAddr);
   }
-  sqlite3ExprCachePop(pParse, 1);
+  sqlite3ExprCachePop(pParse);
 
   return rReg;
 }
@@ -77135,10 +79543,11 @@ static void sqlite3ExprCodeIN(
   if( destIfNull==destIfFalse ){
     /* Shortcut for the common case where the false and NULL outcomes are
     ** the same. */
-    sqlite3VdbeAddOp2(v, OP_IsNull, r1, destIfNull);
+    sqlite3VdbeAddOp2(v, OP_IsNull, r1, destIfNull); VdbeCoverage(v);
   }else{
-    int addr1 = sqlite3VdbeAddOp1(v, OP_NotNull, r1);
+    int addr1 = sqlite3VdbeAddOp1(v, OP_NotNull, r1); VdbeCoverage(v);
     sqlite3VdbeAddOp2(v, OP_Rewind, pExpr->iTable, destIfFalse);
+    VdbeCoverage(v);
     sqlite3VdbeAddOp2(v, OP_Goto, 0, destIfNull);
     sqlite3VdbeJumpHere(v, addr1);
   }
@@ -77146,8 +79555,9 @@ static void sqlite3ExprCodeIN(
   if( eType==IN_INDEX_ROWID ){
     /* In this case, the RHS is the ROWID of table b-tree
     */
-    sqlite3VdbeAddOp2(v, OP_MustBeInt, r1, destIfFalse);
+    sqlite3VdbeAddOp2(v, OP_MustBeInt, r1, destIfFalse); VdbeCoverage(v);
     sqlite3VdbeAddOp3(v, OP_NotExists, pExpr->iTable, destIfFalse, r1);
+    VdbeCoverage(v);
   }else{
     /* In this case, the RHS is an index b-tree.
     */
@@ -77168,19 +79578,20 @@ static void sqlite3ExprCodeIN(
       ** for this particular IN operator.
       */
       sqlite3VdbeAddOp4Int(v, OP_NotFound, pExpr->iTable, destIfFalse, r1, 1);
-
+      VdbeCoverage(v);
     }else{
       /* In this branch, the RHS of the IN might contain a NULL and
       ** the presence of a NULL on the RHS makes a difference in the
       ** outcome.
       */
-      int j1, j2, j3;
+      int j1, j2;
 
       /* First check to see if the LHS is contained in the RHS.  If so,
       ** then the presence of NULLs in the RHS does not matter, so jump
       ** over all of the code that follows.
       */
       j1 = sqlite3VdbeAddOp4Int(v, OP_Found, pExpr->iTable, 0, r1, 1);
+      VdbeCoverage(v);
 
       /* Here we begin generating code that runs if the LHS is not
       ** contained within the RHS.  Generate additional code that
@@ -77188,18 +79599,15 @@ static void sqlite3ExprCodeIN(
       ** jump to destIfNull.  If there are no NULLs in the RHS then
       ** jump to destIfFalse.
       */
-      j2 = sqlite3VdbeAddOp1(v, OP_NotNull, rRhsHasNull);
-      j3 = sqlite3VdbeAddOp4Int(v, OP_Found, pExpr->iTable, 0, rRhsHasNull, 1);
-      sqlite3VdbeAddOp2(v, OP_Integer, -1, rRhsHasNull);
-      sqlite3VdbeJumpHere(v, j3);
-      sqlite3VdbeAddOp2(v, OP_AddImm, rRhsHasNull, 1);
-      sqlite3VdbeJumpHere(v, j2);
-
-      /* Jump to the appropriate target depending on whether or not
-      ** the RHS contains a NULL
-      */
-      sqlite3VdbeAddOp2(v, OP_If, rRhsHasNull, destIfNull);
+      sqlite3VdbeAddOp2(v, OP_If, rRhsHasNull, destIfNull); VdbeCoverage(v);
+      sqlite3VdbeAddOp2(v, OP_IfNot, rRhsHasNull, destIfFalse); VdbeCoverage(v);
+      j2 = sqlite3VdbeAddOp4Int(v, OP_Found, pExpr->iTable, 0, rRhsHasNull, 1);
+      VdbeCoverage(v);
+      sqlite3VdbeAddOp2(v, OP_Integer, 0, rRhsHasNull);
       sqlite3VdbeAddOp2(v, OP_Goto, 0, destIfFalse);
+      sqlite3VdbeJumpHere(v, j2);
+      sqlite3VdbeAddOp2(v, OP_Integer, 1, rRhsHasNull);
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, destIfNull);
 
       /* The OP_Found at the top of this branch jumps here when true, 
       ** causing the overall IN expression evaluation to fall through.
@@ -77208,7 +79616,7 @@ static void sqlite3ExprCodeIN(
     }
   }
   sqlite3ReleaseTempReg(pParse, r1);
-  sqlite3ExprCachePop(pParse, 1);
+  sqlite3ExprCachePop(pParse);
   VdbeComment((v, "end IN expr"));
 }
 #endif /* SQLITE_OMIT_SUBQUERY */
@@ -77382,19 +79790,28 @@ SQLITE_PRIVATE void sqlite3ExprCacheRemove(Parse *pParse, int iReg, int nReg){
 */
 SQLITE_PRIVATE void sqlite3ExprCachePush(Parse *pParse){
   pParse->iCacheLevel++;
+#ifdef SQLITE_DEBUG
+  if( pParse->db->flags & SQLITE_VdbeAddopTrace ){
+    printf("PUSH to %d\n", pParse->iCacheLevel);
+  }
+#endif
 }
 
 /*
 ** Remove from the column cache any entries that were added since the
-** the previous N Push operations.  In other words, restore the cache
-** to the state it was in N Pushes ago.
+** the previous sqlite3ExprCachePush operation.  In other words, restore
+** the cache to the state it was in prior the most recent Push.
 */
-SQLITE_PRIVATE void sqlite3ExprCachePop(Parse *pParse, int N){
+SQLITE_PRIVATE void sqlite3ExprCachePop(Parse *pParse){
   int i;
   struct yColCache *p;
-  assert( N>0 );
-  assert( pParse->iCacheLevel>=N );
-  pParse->iCacheLevel -= N;
+  assert( pParse->iCacheLevel>=1 );
+  pParse->iCacheLevel--;
+#ifdef SQLITE_DEBUG
+  if( pParse->db->flags & SQLITE_VdbeAddopTrace ){
+    printf("POP  to %d\n", pParse->iCacheLevel);
+  }
+#endif
   for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
     if( p->iReg && p->iLevel>pParse->iCacheLevel ){
       cacheEntryClear(pParse, p);
@@ -77425,15 +79842,19 @@ static void sqlite3ExprCachePinRegister(Parse *pParse, int iReg){
 SQLITE_PRIVATE void sqlite3ExprCodeGetColumnOfTable(
   Vdbe *v,        /* The VDBE under construction */
   Table *pTab,    /* The table containing the value */
-  int iTabCur,    /* The cursor for this table */
+  int iTabCur,    /* The table cursor.  Or the PK cursor for WITHOUT ROWID */
   int iCol,       /* Index of the column to extract */
-  int regOut      /* Extract the valud into this register */
+  int regOut      /* Extract the value into this register */
 ){
   if( iCol<0 || iCol==pTab->iPKey ){
     sqlite3VdbeAddOp2(v, OP_Rowid, iTabCur, regOut);
   }else{
     int op = IsVirtual(pTab) ? OP_VColumn : OP_Column;
-    sqlite3VdbeAddOp3(v, op, iTabCur, iCol, regOut);
+    int x = iCol;
+    if( !HasRowid(pTab) ){
+      x = sqlite3ColumnOfIndex(sqlite3PrimaryKeyIndex(pTab), iCol);
+    }
+    sqlite3VdbeAddOp3(v, op, iTabCur, x, regOut);
   }
   if( iCol>=0 ){
     sqlite3ColumnDefault(v, pTab, iCol, regOut);
@@ -77485,6 +79906,11 @@ SQLITE_PRIVATE void sqlite3ExprCacheClear(Parse *pParse){
   int i;
   struct yColCache *p;
 
+#if SQLITE_DEBUG
+  if( pParse->db->flags & SQLITE_VdbeAddopTrace ){
+    printf("CLEAR\n");
+  }
+#endif
   for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
     if( p->iReg ){
       cacheEntryClear(pParse, p);
@@ -77509,7 +79935,7 @@ SQLITE_PRIVATE void sqlite3ExprCodeMove(Parse *pParse, int iFrom, int iTo, int n
   int i;
   struct yColCache *p;
   assert( iFrom>=iTo+nReg || iFrom+nReg<=iTo );
-  sqlite3VdbeAddOp3(pParse->pVdbe, OP_Move, iFrom, iTo, nReg-1);
+  sqlite3VdbeAddOp3(pParse->pVdbe, OP_Move, iFrom, iTo, nReg);
   for(i=0, p=pParse->aColCache; i<SQLITE_N_COLCACHE; i++, p++){
     int x = p->iReg;
     if( x>=iFrom && x<iFrom+nReg ){
@@ -77537,6 +79963,16 @@ static int usedAsColumnCache(Parse *pParse, int iFrom, int iTo){
 }
 #endif /* SQLITE_DEBUG || SQLITE_COVERAGE_TEST */
 
+/*
+** Convert an expression node to a TK_REGISTER
+*/
+static void exprToRegister(Expr *p, int iReg){
+  p->op2 = p->op;
+  p->op = TK_REGISTER;
+  p->iTable = iReg;
+  ExprClearProperty(p, EP_Skip);
+}
+
 /*
 ** Generate code into the current Vdbe to evaluate the given
 ** expression.  Attempt to store the results in register "target".
@@ -77556,6 +79992,7 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
   int regFree2 = 0;         /* If non-zero free this temporary register */
   int r1, r2, r3, r4;       /* Various register numbers */
   sqlite3 *db = pParse->db; /* The database connection */
+  Expr tempX;               /* Temporary expression node */
 
   assert( target>0 && target<=pParse->nMem );
   if( v==0 ){
@@ -77584,15 +80021,20 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
       /* Otherwise, fall thru into the TK_COLUMN case */
     }
     case TK_COLUMN: {
-      if( pExpr->iTable<0 ){
-        /* This only happens when coding check constraints */
-        assert( pParse->ckBase>0 );
-        inReg = pExpr->iColumn + pParse->ckBase;
-      }else{
-        inReg = sqlite3ExprCodeGetColumn(pParse, pExpr->pTab,
-                                 pExpr->iColumn, pExpr->iTable, target,
-                                 pExpr->op2);
+      int iTab = pExpr->iTable;
+      if( iTab<0 ){
+        if( pParse->ckBase>0 ){
+          /* Generating CHECK constraints or inserting into partial index */
+          inReg = pExpr->iColumn + pParse->ckBase;
+          break;
+        }else{
+          /* Deleting from a partial index */
+          iTab = pParse->iPartIdxTab;
+        }
       }
+      inReg = sqlite3ExprCodeGetColumn(pParse, pExpr->pTab,
+                               pExpr->iColumn, iTab, target,
+                               pExpr->op2);
       break;
     }
     case TK_INTEGER: {
@@ -77657,7 +80099,7 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
       int aff, to_op;
       inReg = sqlite3ExprCodeTarget(pParse, pExpr->pLeft, target);
       assert( !ExprHasProperty(pExpr, EP_IntValue) );
-      aff = sqlite3AffinityType(pExpr->u.zToken);
+      aff = sqlite3AffinityType(pExpr->u.zToken, 0);
       to_op = aff - SQLITE_AFF_TEXT + OP_ToText;
       assert( to_op==OP_ToText    || aff!=SQLITE_AFF_TEXT    );
       assert( to_op==OP_ToBlob    || aff!=SQLITE_AFF_NONE    );
@@ -77685,22 +80127,16 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
     case TK_GE:
     case TK_NE:
     case TK_EQ: {
-      assert( TK_LT==OP_Lt );
-      assert( TK_LE==OP_Le );
-      assert( TK_GT==OP_Gt );
-      assert( TK_GE==OP_Ge );
-      assert( TK_EQ==OP_Eq );
-      assert( TK_NE==OP_Ne );
-      testcase( op==TK_LT );
-      testcase( op==TK_LE );
-      testcase( op==TK_GT );
-      testcase( op==TK_GE );
-      testcase( op==TK_EQ );
-      testcase( op==TK_NE );
       r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
       r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
       codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
                   r1, r2, inReg, SQLITE_STOREP2);
+      assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
+      assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
+      assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
+      assert(TK_GE==OP_Ge); testcase(op==OP_Ge); VdbeCoverageIf(v,op==OP_Ge);
+      assert(TK_EQ==OP_Eq); testcase(op==OP_Eq); VdbeCoverageIf(v,op==OP_Eq);
+      assert(TK_NE==OP_Ne); testcase(op==OP_Ne); VdbeCoverageIf(v,op==OP_Ne);
       testcase( regFree1==0 );
       testcase( regFree2==0 );
       break;
@@ -77714,6 +80150,8 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
       op = (op==TK_IS) ? TK_EQ : TK_NE;
       codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
                   r1, r2, inReg, SQLITE_STOREP2 | SQLITE_NULLEQ);
+      VdbeCoverageIf(v, op==TK_EQ);
+      VdbeCoverageIf(v, op==TK_NE);
       testcase( regFree1==0 );
       testcase( regFree2==0 );
       break;
@@ -77730,28 +80168,17 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
     case TK_LSHIFT:
     case TK_RSHIFT: 
     case TK_CONCAT: {
-      assert( TK_AND==OP_And );
-      assert( TK_OR==OP_Or );
-      assert( TK_PLUS==OP_Add );
-      assert( TK_MINUS==OP_Subtract );
-      assert( TK_REM==OP_Remainder );
-      assert( TK_BITAND==OP_BitAnd );
-      assert( TK_BITOR==OP_BitOr );
-      assert( TK_SLASH==OP_Divide );
-      assert( TK_LSHIFT==OP_ShiftLeft );
-      assert( TK_RSHIFT==OP_ShiftRight );
-      assert( TK_CONCAT==OP_Concat );
-      testcase( op==TK_AND );
-      testcase( op==TK_OR );
-      testcase( op==TK_PLUS );
-      testcase( op==TK_MINUS );
-      testcase( op==TK_REM );
-      testcase( op==TK_BITAND );
-      testcase( op==TK_BITOR );
-      testcase( op==TK_SLASH );
-      testcase( op==TK_LSHIFT );
-      testcase( op==TK_RSHIFT );
-      testcase( op==TK_CONCAT );
+      assert( TK_AND==OP_And );            testcase( op==TK_AND );
+      assert( TK_OR==OP_Or );              testcase( op==TK_OR );
+      assert( TK_PLUS==OP_Add );           testcase( op==TK_PLUS );
+      assert( TK_MINUS==OP_Subtract );     testcase( op==TK_MINUS );
+      assert( TK_REM==OP_Remainder );      testcase( op==TK_REM );
+      assert( TK_BITAND==OP_BitAnd );      testcase( op==TK_BITAND );
+      assert( TK_BITOR==OP_BitOr );        testcase( op==TK_BITOR );
+      assert( TK_SLASH==OP_Divide );       testcase( op==TK_SLASH );
+      assert( TK_LSHIFT==OP_ShiftLeft );   testcase( op==TK_LSHIFT );
+      assert( TK_RSHIFT==OP_ShiftRight );  testcase( op==TK_RSHIFT );
+      assert( TK_CONCAT==OP_Concat );      testcase( op==TK_CONCAT );
       r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
       r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
       sqlite3VdbeAddOp3(v, op, r2, r1, target);
@@ -77770,8 +80197,10 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
         codeReal(v, pLeft->u.zToken, 1, target);
 #endif
       }else{
-        regFree1 = r1 = sqlite3GetTempReg(pParse);
-        sqlite3VdbeAddOp2(v, OP_Integer, 0, r1);
+        tempX.op = TK_INTEGER;
+        tempX.flags = EP_IntValue|EP_TokenOnly;
+        tempX.u.iValue = 0;
+        r1 = sqlite3ExprCodeTemp(pParse, &tempX, &regFree1);
         r2 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree2);
         sqlite3VdbeAddOp3(v, OP_Subtract, r2, r1, target);
         testcase( regFree2==0 );
@@ -77781,10 +80210,8 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
     }
     case TK_BITNOT:
     case TK_NOT: {
-      assert( TK_BITNOT==OP_BitNot );
-      assert( TK_NOT==OP_Not );
-      testcase( op==TK_BITNOT );
-      testcase( op==TK_NOT );
+      assert( TK_BITNOT==OP_BitNot );   testcase( op==TK_BITNOT );
+      assert( TK_NOT==OP_Not );         testcase( op==TK_NOT );
       r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
       testcase( regFree1==0 );
       inReg = target;
@@ -77794,14 +80221,14 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
     case TK_ISNULL:
     case TK_NOTNULL: {
       int addr;
-      assert( TK_ISNULL==OP_IsNull );
-      assert( TK_NOTNULL==OP_NotNull );
-      testcase( op==TK_ISNULL );
-      testcase( op==TK_NOTNULL );
+      assert( TK_ISNULL==OP_IsNull );   testcase( op==TK_ISNULL );
+      assert( TK_NOTNULL==OP_NotNull ); testcase( op==TK_NOTNULL );
       sqlite3VdbeAddOp2(v, OP_Integer, 1, target);
       r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
       testcase( regFree1==0 );
       addr = sqlite3VdbeAddOp1(v, op, r1);
+      VdbeCoverageIf(v, op==TK_ISNULL);
+      VdbeCoverageIf(v, op==TK_NOTNULL);
       sqlite3VdbeAddOp2(v, OP_AddImm, target, -1);
       sqlite3VdbeJumpHere(v, addr);
       break;
@@ -77816,22 +80243,19 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
       }
       break;
     }
-    case TK_CONST_FUNC:
     case TK_FUNCTION: {
       ExprList *pFarg;       /* List of function arguments */
       int nFarg;             /* Number of function arguments */
       FuncDef *pDef;         /* The function definition object */
       int nId;               /* Length of the function name in bytes */
       const char *zId;       /* The function name */
-      int constMask = 0;     /* Mask of function arguments that are constant */
+      u32 constMask = 0;     /* Mask of function arguments that are constant */
       int i;                 /* Loop counter */
       u8 enc = ENC(db);      /* The text encoding used by this database */
       CollSeq *pColl = 0;    /* A collating sequence */
 
       assert( !ExprHasProperty(pExpr, EP_xIsSelect) );
-      testcase( op==TK_CONST_FUNC );
-      testcase( op==TK_FUNCTION );
-      if( ExprHasAnyProperty(pExpr, EP_TokenOnly) ){
+      if( ExprHasProperty(pExpr, EP_TokenOnly) ){
         pFarg = 0;
       }else{
         pFarg = pExpr->x.pList;
@@ -77850,31 +80274,54 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
       ** IFNULL() functions.  This avoids unnecessary evalation of
       ** arguments past the first non-NULL argument.
       */
-      if( pDef->flags & SQLITE_FUNC_COALESCE ){
+      if( pDef->funcFlags & SQLITE_FUNC_COALESCE ){
         int endCoalesce = sqlite3VdbeMakeLabel(v);
         assert( nFarg>=2 );
         sqlite3ExprCode(pParse, pFarg->a[0].pExpr, target);
         for(i=1; i<nFarg; i++){
           sqlite3VdbeAddOp2(v, OP_NotNull, target, endCoalesce);
+          VdbeCoverage(v);
           sqlite3ExprCacheRemove(pParse, target, 1);
           sqlite3ExprCachePush(pParse);
           sqlite3ExprCode(pParse, pFarg->a[i].pExpr, target);
-          sqlite3ExprCachePop(pParse, 1);
+          sqlite3ExprCachePop(pParse);
         }
         sqlite3VdbeResolveLabel(v, endCoalesce);
         break;
       }
 
+      /* The UNLIKELY() function is a no-op.  The result is the value
+      ** of the first argument.
+      */
+      if( pDef->funcFlags & SQLITE_FUNC_UNLIKELY ){
+        assert( nFarg>=1 );
+        sqlite3ExprCode(pParse, pFarg->a[0].pExpr, target);
+        break;
+      }
 
+      for(i=0; i<nFarg; i++){
+        if( i<32 && sqlite3ExprIsConstant(pFarg->a[i].pExpr) ){
+          testcase( i==31 );
+          constMask |= MASKBIT32(i);
+        }
+        if( (pDef->funcFlags & SQLITE_FUNC_NEEDCOLL)!=0 && !pColl ){
+          pColl = sqlite3ExprCollSeq(pParse, pFarg->a[i].pExpr);
+        }
+      }
       if( pFarg ){
-        r1 = sqlite3GetTempRange(pParse, nFarg);
+        if( constMask ){
+          r1 = pParse->nMem+1;
+          pParse->nMem += nFarg;
+        }else{
+          r1 = sqlite3GetTempRange(pParse, nFarg);
+        }
 
         /* For length() and typeof() functions with a column argument,
         ** set the P5 parameter to the OP_Column opcode to OPFLAG_LENGTHARG
         ** or OPFLAG_TYPEOFARG respectively, to avoid unnecessary data
         ** loading.
         */
-        if( (pDef->flags & (SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF))!=0 ){
+        if( (pDef->funcFlags & (SQLITE_FUNC_LENGTH|SQLITE_FUNC_TYPEOF))!=0 ){
           u8 exprOp;
           assert( nFarg==1 );
           assert( pFarg->a[0].pExpr!=0 );
@@ -77882,14 +80329,16 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
           if( exprOp==TK_COLUMN || exprOp==TK_AGG_COLUMN ){
             assert( SQLITE_FUNC_LENGTH==OPFLAG_LENGTHARG );
             assert( SQLITE_FUNC_TYPEOF==OPFLAG_TYPEOFARG );
-            testcase( pDef->flags==SQLITE_FUNC_LENGTH );
-            pFarg->a[0].pExpr->op2 = pDef->flags;
+            testcase( pDef->funcFlags & OPFLAG_LENGTHARG );
+            pFarg->a[0].pExpr->op2 = 
+                  pDef->funcFlags & (OPFLAG_LENGTHARG|OPFLAG_TYPEOFARG);
           }
         }
 
         sqlite3ExprCachePush(pParse);     /* Ticket 2ea2425d34be */
-        sqlite3ExprCodeExprList(pParse, pFarg, r1, 1);
-        sqlite3ExprCachePop(pParse, 1);   /* Ticket 2ea2425d34be */
+        sqlite3ExprCodeExprList(pParse, pFarg, r1,
+                                SQLITE_ECEL_DUP|SQLITE_ECEL_FACTOR);
+        sqlite3ExprCachePop(pParse);      /* Ticket 2ea2425d34be */
       }else{
         r1 = 0;
       }
@@ -77912,22 +80361,14 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
         pDef = sqlite3VtabOverloadFunction(db, pDef, nFarg, pFarg->a[0].pExpr);
       }
 #endif
-      for(i=0; i<nFarg; i++){
-        if( i<32 && sqlite3ExprIsConstant(pFarg->a[i].pExpr) ){
-          constMask |= (1<<i);
-        }
-        if( (pDef->flags & SQLITE_FUNC_NEEDCOLL)!=0 && !pColl ){
-          pColl = sqlite3ExprCollSeq(pParse, pFarg->a[i].pExpr);
-        }
-      }
-      if( pDef->flags & SQLITE_FUNC_NEEDCOLL ){
+      if( pDef->funcFlags & SQLITE_FUNC_NEEDCOLL ){
         if( !pColl ) pColl = db->pDfltColl; 
         sqlite3VdbeAddOp4(v, OP_CollSeq, 0, 0, 0, (char *)pColl, P4_COLLSEQ);
       }
       sqlite3VdbeAddOp4(v, OP_Function, constMask, r1, target,
                         (char*)pDef, P4_FUNCDEF);
       sqlite3VdbeChangeP5(v, (u8)nFarg);
-      if( nFarg ){
+      if( nFarg && constMask==0 ){
         sqlite3ReleaseTempRange(pParse, r1, nFarg);
       }
       break;
@@ -77977,13 +80418,14 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
       r3 = sqlite3GetTempReg(pParse);
       r4 = sqlite3GetTempReg(pParse);
       codeCompare(pParse, pLeft, pRight, OP_Ge,
-                  r1, r2, r3, SQLITE_STOREP2);
+                  r1, r2, r3, SQLITE_STOREP2);  VdbeCoverage(v);
       pLItem++;
       pRight = pLItem->pExpr;
       sqlite3ReleaseTempReg(pParse, regFree2);
       r2 = sqlite3ExprCodeTemp(pParse, pRight, &regFree2);
       testcase( regFree2==0 );
       codeCompare(pParse, pLeft, pRight, OP_Le, r1, r2, r4, SQLITE_STOREP2);
+      VdbeCoverage(v);
       sqlite3VdbeAddOp3(v, OP_And, r3, r4, target);
       sqlite3ReleaseTempReg(pParse, r3);
       sqlite3ReleaseTempReg(pParse, r4);
@@ -78061,9 +80503,9 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
     **        WHEN x=eN THEN rN ELSE y END
     **
     ** X (if it exists) is in pExpr->pLeft.
-    ** Y is in pExpr->pRight.  The Y is also optional.  If there is no
-    ** ELSE clause and no other term matches, then the result of the
-    ** exprssion is NULL.
+    ** Y is in the last element of pExpr->x.pList if pExpr->x.pList->nExpr is
+    ** odd.  The Y is also optional.  If the number of elements in x.pList
+    ** is even, then Y is omitted and the "otherwise" result is NULL.
     ** Ei is in pExpr->pList->a[i*2] and Ri is pExpr->pList->a[i*2+1].
     **
     ** The result of the expression is the Ri for the first matching Ei,
@@ -78078,27 +80520,23 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
       ExprList *pEList;                 /* List of WHEN terms */
       struct ExprList_item *aListelem;  /* Array of WHEN terms */
       Expr opCompare;                   /* The X==Ei expression */
-      Expr cacheX;                      /* Cached expression X */
       Expr *pX;                         /* The X expression */
       Expr *pTest = 0;                  /* X==Ei (form A) or just Ei (form B) */
       VVA_ONLY( int iCacheLevel = pParse->iCacheLevel; )
 
       assert( !ExprHasProperty(pExpr, EP_xIsSelect) && pExpr->x.pList );
-      assert((pExpr->x.pList->nExpr % 2) == 0);
       assert(pExpr->x.pList->nExpr > 0);
       pEList = pExpr->x.pList;
       aListelem = pEList->a;
       nExpr = pEList->nExpr;
       endLabel = sqlite3VdbeMakeLabel(v);
       if( (pX = pExpr->pLeft)!=0 ){
-        cacheX = *pX;
+        tempX = *pX;
         testcase( pX->op==TK_COLUMN );
-        testcase( pX->op==TK_REGISTER );
-        cacheX.iTable = sqlite3ExprCodeTemp(pParse, pX, &regFree1);
+        exprToRegister(&tempX, sqlite3ExprCodeTemp(pParse, pX, &regFree1));
         testcase( regFree1==0 );
-        cacheX.op = TK_REGISTER;
         opCompare.op = TK_EQ;
-        opCompare.pLeft = &cacheX;
+        opCompare.pLeft = &tempX;
         pTest = &opCompare;
         /* Ticket b351d95f9cd5ef17e9d9dbae18f5ca8611190001:
         ** The value in regFree1 might get SCopy-ed into the file result.
@@ -78106,7 +80544,7 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
         ** purposes and possibly overwritten.  */
         regFree1 = 0;
       }
-      for(i=0; i<nExpr; i=i+2){
+      for(i=0; i<nExpr-1; i=i+2){
         sqlite3ExprCachePush(pParse);
         if( pX ){
           assert( pTest!=0 );
@@ -78118,16 +80556,15 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
         testcase( pTest->op==TK_COLUMN );
         sqlite3ExprIfFalse(pParse, pTest, nextCase, SQLITE_JUMPIFNULL);
         testcase( aListelem[i+1].pExpr->op==TK_COLUMN );
-        testcase( aListelem[i+1].pExpr->op==TK_REGISTER );
         sqlite3ExprCode(pParse, aListelem[i+1].pExpr, target);
         sqlite3VdbeAddOp2(v, OP_Goto, 0, endLabel);
-        sqlite3ExprCachePop(pParse, 1);
+        sqlite3ExprCachePop(pParse);
         sqlite3VdbeResolveLabel(v, nextCase);
       }
-      if( pExpr->pRight ){
+      if( (nExpr&1)!=0 ){
         sqlite3ExprCachePush(pParse);
-        sqlite3ExprCode(pParse, pExpr->pRight, target);
-        sqlite3ExprCachePop(pParse, 1);
+        sqlite3ExprCode(pParse, pEList->a[nExpr-1].pExpr, target);
+        sqlite3ExprCachePop(pParse);
       }else{
         sqlite3VdbeAddOp2(v, OP_Null, 0, target);
       }
@@ -78155,9 +80592,10 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
       if( pExpr->affinity==OE_Ignore ){
         sqlite3VdbeAddOp4(
             v, OP_Halt, SQLITE_OK, OE_Ignore, 0, pExpr->u.zToken,0);
+        VdbeCoverage(v);
       }else{
         sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_TRIGGER,
-                              pExpr->affinity, pExpr->u.zToken, 0);
+                              pExpr->affinity, pExpr->u.zToken, 0, 0);
       }
 
       break;
@@ -78169,6 +80607,28 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
   return inReg;
 }
 
+/*
+** Factor out the code of the given expression to initialization time.
+*/
+SQLITE_PRIVATE void sqlite3ExprCodeAtInit(
+  Parse *pParse,    /* Parsing context */
+  Expr *pExpr,      /* The expression to code when the VDBE initializes */
+  int regDest,      /* Store the value in this register */
+  u8 reusable       /* True if this expression is reusable */
+){
+  ExprList *p;
+  assert( ConstFactorOk(pParse) );
+  p = pParse->pConstExpr;
+  pExpr = sqlite3ExprDup(pParse->db, pExpr, 0);
+  p = sqlite3ExprListAppend(pParse, p, pExpr);
+  if( p ){
+     struct ExprList_item *pItem = &p->a[p->nExpr-1];
+     pItem->u.iConstExprReg = regDest;
+     pItem->reusable = reusable;
+  }
+  pParse->pConstExpr = p;
+}
+
 /*
 ** Generate code to evaluate an expression and store the results
 ** into a register.  Return the register number where the results
@@ -78177,15 +80637,40 @@ SQLITE_PRIVATE int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target)
 ** If the register is a temporary register that can be deallocated,
 ** then write its number into *pReg.  If the result register is not
 ** a temporary, then set *pReg to zero.
+**
+** If pExpr is a constant, then this routine might generate this
+** code to fill the register in the initialization section of the
+** VDBE program, in order to factor it out of the evaluation loop.
 */
 SQLITE_PRIVATE int sqlite3ExprCodeTemp(Parse *pParse, Expr *pExpr, int *pReg){
-  int r1 = sqlite3GetTempReg(pParse);
-  int r2 = sqlite3ExprCodeTarget(pParse, pExpr, r1);
-  if( r2==r1 ){
-    *pReg = r1;
+  int r2;
+  pExpr = sqlite3ExprSkipCollate(pExpr);
+  if( ConstFactorOk(pParse)
+   && pExpr->op!=TK_REGISTER
+   && sqlite3ExprIsConstantNotJoin(pExpr)
+  ){
+    ExprList *p = pParse->pConstExpr;
+    int i;
+    *pReg  = 0;
+    if( p ){
+      struct ExprList_item *pItem;
+      for(pItem=p->a, i=p->nExpr; i>0; pItem++, i--){
+        if( pItem->reusable && sqlite3ExprCompare(pItem->pExpr,pExpr,-1)==0 ){
+          return pItem->u.iConstExprReg;
+        }
+      }
+    }
+    r2 = ++pParse->nMem;
+    sqlite3ExprCodeAtInit(pParse, pExpr, r2, 1);
   }else{
-    sqlite3ReleaseTempReg(pParse, r1);
-    *pReg = 0;
+    int r1 = sqlite3GetTempReg(pParse);
+    r2 = sqlite3ExprCodeTarget(pParse, pExpr, r1);
+    if( r2==r1 ){
+      *pReg = r1;
+    }else{
+      sqlite3ReleaseTempReg(pParse, r1);
+      *pReg = 0;
+    }
   }
   return r2;
 }
@@ -78195,7 +80680,7 @@ SQLITE_PRIVATE int sqlite3ExprCodeTemp(Parse *pParse, Expr *pExpr, int *pReg){
 ** results in register target.  The results are guaranteed to appear
 ** in register target.
 */
-SQLITE_PRIVATE int sqlite3ExprCode(Parse *pParse, Expr *pExpr, int target){
+SQLITE_PRIVATE void sqlite3ExprCode(Parse *pParse, Expr *pExpr, int target){
   int inReg;
 
   assert( target>0 && target<=pParse->nMem );
@@ -78208,7 +80693,20 @@ SQLITE_PRIVATE int sqlite3ExprCode(Parse *pParse, Expr *pExpr, int target){
       sqlite3VdbeAddOp2(pParse->pVdbe, OP_SCopy, inReg, target);
     }
   }
-  return target;
+}
+
+/*
+** Generate code that will evaluate expression pExpr and store the
+** results in register target.  The results are guaranteed to appear
+** in register target.  If the expression is constant, then this routine
+** might choose to code the expression at initialization time.
+*/
+SQLITE_PRIVATE void sqlite3ExprCodeFactorable(Parse *pParse, Expr *pExpr, int target){
+  if( pParse->okConstFactor && sqlite3ExprIsConstant(pExpr) ){
+    sqlite3ExprCodeAtInit(pParse, pExpr, target, 0);
+  }else{
+    sqlite3ExprCode(pParse, pExpr, target);
+  }
 }
 
 /*
@@ -78223,26 +80721,16 @@ SQLITE_PRIVATE int sqlite3ExprCode(Parse *pParse, Expr *pExpr, int target){
 ** times.  They are evaluated once and the results of the expression
 ** are reused.
 */
-SQLITE_PRIVATE int sqlite3ExprCodeAndCache(Parse *pParse, Expr *pExpr, int target){
+SQLITE_PRIVATE void sqlite3ExprCodeAndCache(Parse *pParse, Expr *pExpr, int target){
   Vdbe *v = pParse->pVdbe;
-  int inReg;
-  inReg = sqlite3ExprCode(pParse, pExpr, target);
+  int iMem;
+
   assert( target>0 );
-  /* This routine is called for terms to INSERT or UPDATE.  And the only
-  ** other place where expressions can be converted into TK_REGISTER is
-  ** in WHERE clause processing.  So as currently implemented, there is
-  ** no way for a TK_REGISTER to exist here.  But it seems prudent to
-  ** keep the ALWAYS() in case the conditions above change with future
-  ** modifications or enhancements. */
-  if( ALWAYS(pExpr->op!=TK_REGISTER) ){  
-    int iMem;
-    iMem = ++pParse->nMem;
-    sqlite3VdbeAddOp2(v, OP_Copy, inReg, iMem);
-    pExpr->iTable = iMem;
-    pExpr->op2 = pExpr->op;
-    pExpr->op = TK_REGISTER;
-  }
-  return inReg;
+  assert( pExpr->op!=TK_REGISTER );
+  sqlite3ExprCode(pParse, pExpr, target);
+  iMem = ++pParse->nMem;
+  sqlite3VdbeAddOp2(v, OP_Copy, target, iMem);
+  exprToRegister(pExpr, iMem);
 }
 
 #if defined(SQLITE_ENABLE_TREE_EXPLAIN)
@@ -78319,7 +80807,7 @@ SQLITE_PRIVATE void sqlite3ExplainExpr(Vdbe *pOut, Expr *pExpr){
     case TK_CAST: {
       /* Expressions of the form:   CAST(pLeft AS token) */
       const char *zAff = "unk";
-      switch( sqlite3AffinityType(pExpr->u.zToken) ){
+      switch( sqlite3AffinityType(pExpr->u.zToken, 0) ){
         case SQLITE_AFF_TEXT:    zAff = "TEXT";     break;
         case SQLITE_AFF_NONE:    zAff = "NONE";     break;
         case SQLITE_AFF_NUMERIC: zAff = "NUMERIC";  break;
@@ -78367,10 +80855,9 @@ SQLITE_PRIVATE void sqlite3ExplainExpr(Vdbe *pOut, Expr *pExpr){
     }
 
     case TK_AGG_FUNCTION:
-    case TK_CONST_FUNC:
     case TK_FUNCTION: {
       ExprList *pFarg;       /* List of function arguments */
-      if( ExprHasAnyProperty(pExpr, EP_TokenOnly) ){
+      if( ExprHasProperty(pExpr, EP_TokenOnly) ){
         pFarg = 0;
       }else{
         pFarg = pExpr->x.pList;
@@ -78518,166 +81005,51 @@ SQLITE_PRIVATE void sqlite3ExplainExprList(Vdbe *pOut, ExprList *pList){
 }
 #endif /* SQLITE_DEBUG */
 
-/*
-** Return TRUE if pExpr is an constant expression that is appropriate
-** for factoring out of a loop.  Appropriate expressions are:
-**
-**    *  Any expression that evaluates to two or more opcodes.
-**
-**    *  Any OP_Integer, OP_Real, OP_String, OP_Blob, OP_Null, 
-**       or OP_Variable that does not need to be placed in a 
-**       specific register.
-**
-** There is no point in factoring out single-instruction constant
-** expressions that need to be placed in a particular register.  
-** We could factor them out, but then we would end up adding an
-** OP_SCopy instruction to move the value into the correct register
-** later.  We might as well just use the original instruction and
-** avoid the OP_SCopy.
-*/
-static int isAppropriateForFactoring(Expr *p){
-  if( !sqlite3ExprIsConstantNotJoin(p) ){
-    return 0;  /* Only constant expressions are appropriate for factoring */
-  }
-  if( (p->flags & EP_FixedDest)==0 ){
-    return 1;  /* Any constant without a fixed destination is appropriate */
-  }
-  while( p->op==TK_UPLUS ) p = p->pLeft;
-  switch( p->op ){
-#ifndef SQLITE_OMIT_BLOB_LITERAL
-    case TK_BLOB:
-#endif
-    case TK_VARIABLE:
-    case TK_INTEGER:
-    case TK_FLOAT:
-    case TK_NULL:
-    case TK_STRING: {
-      testcase( p->op==TK_BLOB );
-      testcase( p->op==TK_VARIABLE );
-      testcase( p->op==TK_INTEGER );
-      testcase( p->op==TK_FLOAT );
-      testcase( p->op==TK_NULL );
-      testcase( p->op==TK_STRING );
-      /* Single-instruction constants with a fixed destination are
-      ** better done in-line.  If we factor them, they will just end
-      ** up generating an OP_SCopy to move the value to the destination
-      ** register. */
-      return 0;
-    }
-    case TK_UMINUS: {
-      if( p->pLeft->op==TK_FLOAT || p->pLeft->op==TK_INTEGER ){
-        return 0;
-      }
-      break;
-    }
-    default: {
-      break;
-    }
-  }
-  return 1;
-}
-
-/*
-** If pExpr is a constant expression that is appropriate for
-** factoring out of a loop, then evaluate the expression
-** into a register and convert the expression into a TK_REGISTER
-** expression.
-*/
-static int evalConstExpr(Walker *pWalker, Expr *pExpr){
-  Parse *pParse = pWalker->pParse;
-  switch( pExpr->op ){
-    case TK_IN:
-    case TK_REGISTER: {
-      return WRC_Prune;
-    }
-    case TK_COLLATE: {
-      return WRC_Continue;
-    }
-    case TK_FUNCTION:
-    case TK_AGG_FUNCTION:
-    case TK_CONST_FUNC: {
-      /* The arguments to a function have a fixed destination.
-      ** Mark them this way to avoid generated unneeded OP_SCopy
-      ** instructions. 
-      */
-      ExprList *pList = pExpr->x.pList;
-      assert( !ExprHasProperty(pExpr, EP_xIsSelect) );
-      if( pList ){
-        int i = pList->nExpr;
-        struct ExprList_item *pItem = pList->a;
-        for(; i>0; i--, pItem++){
-          if( ALWAYS(pItem->pExpr) ) pItem->pExpr->flags |= EP_FixedDest;
-        }
-      }
-      break;
-    }
-  }
-  if( isAppropriateForFactoring(pExpr) ){
-    int r1 = ++pParse->nMem;
-    int r2 = sqlite3ExprCodeTarget(pParse, pExpr, r1);
-    /* If r2!=r1, it means that register r1 is never used.  That is harmless
-    ** but suboptimal, so we want to know about the situation to fix it.
-    ** Hence the following assert: */
-    assert( r2==r1 );
-    pExpr->op2 = pExpr->op;
-    pExpr->op = TK_REGISTER;
-    pExpr->iTable = r2;
-    return WRC_Prune;
-  }
-  return WRC_Continue;
-}
-
-/*
-** Preevaluate constant subexpressions within pExpr and store the
-** results in registers.  Modify pExpr so that the constant subexpresions
-** are TK_REGISTER opcodes that refer to the precomputed values.
-**
-** This routine is a no-op if the jump to the cookie-check code has
-** already occur.  Since the cookie-check jump is generated prior to
-** any other serious processing, this check ensures that there is no
-** way to accidently bypass the constant initializations.
-**
-** This routine is also a no-op if the SQLITE_FactorOutConst optimization
-** is disabled via the sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS)
-** interface.  This allows test logic to verify that the same answer is
-** obtained for queries regardless of whether or not constants are
-** precomputed into registers or if they are inserted in-line.
-*/
-SQLITE_PRIVATE void sqlite3ExprCodeConstants(Parse *pParse, Expr *pExpr){
-  Walker w;
-  if( pParse->cookieGoto ) return;
-  if( OptimizationDisabled(pParse->db, SQLITE_FactorOutConst) ) return;
-  memset(&w, 0, sizeof(w));
-  w.xExprCallback = evalConstExpr;
-  w.pParse = pParse;
-  sqlite3WalkExpr(&w, pExpr);
-}
-
-
 /*
 ** Generate code that pushes the value of every element of the given
 ** expression list into a sequence of registers beginning at target.
 **
 ** Return the number of elements evaluated.
+**
+** The SQLITE_ECEL_DUP flag prevents the arguments from being
+** filled using OP_SCopy.  OP_Copy must be used instead.
+**
+** The SQLITE_ECEL_FACTOR argument allows constant arguments to be
+** factored out into initialization code.
 */
 SQLITE_PRIVATE int sqlite3ExprCodeExprList(
   Parse *pParse,     /* Parsing context */
   ExprList *pList,   /* The expression list to be coded */
   int target,        /* Where to write results */
-  int doHardCopy     /* Make a hard copy of every element */
+  u8 flags           /* SQLITE_ECEL_* flags */
 ){
   struct ExprList_item *pItem;
   int i, n;
+  u8 copyOp = (flags & SQLITE_ECEL_DUP) ? OP_Copy : OP_SCopy;
   assert( pList!=0 );
   assert( target>0 );
   assert( pParse->pVdbe!=0 );  /* Never gets this far otherwise */
   n = pList->nExpr;
+  if( !ConstFactorOk(pParse) ) flags &= ~SQLITE_ECEL_FACTOR;
   for(pItem=pList->a, i=0; i<n; i++, pItem++){
     Expr *pExpr = pItem->pExpr;
-    int inReg = sqlite3ExprCodeTarget(pParse, pExpr, target+i);
-    if( inReg!=target+i ){
-      sqlite3VdbeAddOp2(pParse->pVdbe, doHardCopy ? OP_Copy : OP_SCopy,
-                        inReg, target+i);
+    if( (flags & SQLITE_ECEL_FACTOR)!=0 && sqlite3ExprIsConstant(pExpr) ){
+      sqlite3ExprCodeAtInit(pParse, pExpr, target+i, 0);
+    }else{
+      int inReg = sqlite3ExprCodeTarget(pParse, pExpr, target+i);
+      if( inReg!=target+i ){
+        VdbeOp *pOp;
+        Vdbe *v = pParse->pVdbe;
+        if( copyOp==OP_Copy
+         && (pOp=sqlite3VdbeGetOp(v, -1))->opcode==OP_Copy
+         && pOp->p1+pOp->p3+1==inReg
+         && pOp->p2+pOp->p3+1==target+i
+        ){
+          pOp->p3++;
+        }else{
+          sqlite3VdbeAddOp2(v, copyOp, inReg, target+i);
+        }
+      }
     }
   }
   return n;
@@ -78719,8 +81091,7 @@ static void exprCodeBetween(
   compRight.op = TK_LE;
   compRight.pLeft = &exprX;
   compRight.pRight = pExpr->x.pList->a[1].pExpr;
-  exprX.iTable = sqlite3ExprCodeTemp(pParse, &exprX, &regFree1);
-  exprX.op = TK_REGISTER;
+  exprToRegister(&exprX, sqlite3ExprCodeTemp(pParse, &exprX, &regFree1));
   if( jumpIfTrue ){
     sqlite3ExprIfTrue(pParse, &exprAnd, dest, jumpIfNull);
   }else{
@@ -78768,17 +81139,19 @@ SQLITE_PRIVATE void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int
     case TK_AND: {
       int d2 = sqlite3VdbeMakeLabel(v);
       testcase( jumpIfNull==0 );
-      sqlite3ExprCachePush(pParse);
       sqlite3ExprIfFalse(pParse, pExpr->pLeft, d2,jumpIfNull^SQLITE_JUMPIFNULL);
+      sqlite3ExprCachePush(pParse);
       sqlite3ExprIfTrue(pParse, pExpr->pRight, dest, jumpIfNull);
       sqlite3VdbeResolveLabel(v, d2);
-      sqlite3ExprCachePop(pParse, 1);
+      sqlite3ExprCachePop(pParse);
       break;
     }
     case TK_OR: {
       testcase( jumpIfNull==0 );
       sqlite3ExprIfTrue(pParse, pExpr->pLeft, dest, jumpIfNull);
+      sqlite3ExprCachePush(pParse);
       sqlite3ExprIfTrue(pParse, pExpr->pRight, dest, jumpIfNull);
+      sqlite3ExprCachePop(pParse);
       break;
     }
     case TK_NOT: {
@@ -78792,23 +81165,17 @@ SQLITE_PRIVATE void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int
     case TK_GE:
     case TK_NE:
     case TK_EQ: {
-      assert( TK_LT==OP_Lt );
-      assert( TK_LE==OP_Le );
-      assert( TK_GT==OP_Gt );
-      assert( TK_GE==OP_Ge );
-      assert( TK_EQ==OP_Eq );
-      assert( TK_NE==OP_Ne );
-      testcase( op==TK_LT );
-      testcase( op==TK_LE );
-      testcase( op==TK_GT );
-      testcase( op==TK_GE );
-      testcase( op==TK_EQ );
-      testcase( op==TK_NE );
       testcase( jumpIfNull==0 );
       r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
       r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
       codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
                   r1, r2, dest, jumpIfNull);
+      assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
+      assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
+      assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
+      assert(TK_GE==OP_Ge); testcase(op==OP_Ge); VdbeCoverageIf(v,op==OP_Ge);
+      assert(TK_EQ==OP_Eq); testcase(op==OP_Eq); VdbeCoverageIf(v,op==OP_Eq);
+      assert(TK_NE==OP_Ne); testcase(op==OP_Ne); VdbeCoverageIf(v,op==OP_Ne);
       testcase( regFree1==0 );
       testcase( regFree2==0 );
       break;
@@ -78822,18 +81189,20 @@ SQLITE_PRIVATE void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int
       op = (op==TK_IS) ? TK_EQ : TK_NE;
       codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
                   r1, r2, dest, SQLITE_NULLEQ);
+      VdbeCoverageIf(v, op==TK_EQ);
+      VdbeCoverageIf(v, op==TK_NE);
       testcase( regFree1==0 );
       testcase( regFree2==0 );
       break;
     }
     case TK_ISNULL:
     case TK_NOTNULL: {
-      assert( TK_ISNULL==OP_IsNull );
-      assert( TK_NOTNULL==OP_NotNull );
-      testcase( op==TK_ISNULL );
-      testcase( op==TK_NOTNULL );
+      assert( TK_ISNULL==OP_IsNull );   testcase( op==TK_ISNULL );
+      assert( TK_NOTNULL==OP_NotNull ); testcase( op==TK_NOTNULL );
       r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
       sqlite3VdbeAddOp2(v, op, r1, dest);
+      VdbeCoverageIf(v, op==TK_ISNULL);
+      VdbeCoverageIf(v, op==TK_NOTNULL);
       testcase( regFree1==0 );
       break;
     }
@@ -78853,10 +81222,17 @@ SQLITE_PRIVATE void sqlite3ExprIfTrue(Parse *pParse, Expr *pExpr, int dest, int
     }
 #endif
     default: {
-      r1 = sqlite3ExprCodeTemp(pParse, pExpr, &regFree1);
-      sqlite3VdbeAddOp3(v, OP_If, r1, dest, jumpIfNull!=0);
-      testcase( regFree1==0 );
-      testcase( jumpIfNull==0 );
+      if( exprAlwaysTrue(pExpr) ){
+        sqlite3VdbeAddOp2(v, OP_Goto, 0, dest);
+      }else if( exprAlwaysFalse(pExpr) ){
+        /* No-op */
+      }else{
+        r1 = sqlite3ExprCodeTemp(pParse, pExpr, &regFree1);
+        sqlite3VdbeAddOp3(v, OP_If, r1, dest, jumpIfNull!=0);
+        VdbeCoverage(v);
+        testcase( regFree1==0 );
+        testcase( jumpIfNull==0 );
+      }
       break;
     }
   }
@@ -78919,17 +81295,19 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int
     case TK_AND: {
       testcase( jumpIfNull==0 );
       sqlite3ExprIfFalse(pParse, pExpr->pLeft, dest, jumpIfNull);
+      sqlite3ExprCachePush(pParse);
       sqlite3ExprIfFalse(pParse, pExpr->pRight, dest, jumpIfNull);
+      sqlite3ExprCachePop(pParse);
       break;
     }
     case TK_OR: {
       int d2 = sqlite3VdbeMakeLabel(v);
       testcase( jumpIfNull==0 );
-      sqlite3ExprCachePush(pParse);
       sqlite3ExprIfTrue(pParse, pExpr->pLeft, d2, jumpIfNull^SQLITE_JUMPIFNULL);
+      sqlite3ExprCachePush(pParse);
       sqlite3ExprIfFalse(pParse, pExpr->pRight, dest, jumpIfNull);
       sqlite3VdbeResolveLabel(v, d2);
-      sqlite3ExprCachePop(pParse, 1);
+      sqlite3ExprCachePop(pParse);
       break;
     }
     case TK_NOT: {
@@ -78943,17 +81321,17 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int
     case TK_GE:
     case TK_NE:
     case TK_EQ: {
-      testcase( op==TK_LT );
-      testcase( op==TK_LE );
-      testcase( op==TK_GT );
-      testcase( op==TK_GE );
-      testcase( op==TK_EQ );
-      testcase( op==TK_NE );
       testcase( jumpIfNull==0 );
       r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
       r2 = sqlite3ExprCodeTemp(pParse, pExpr->pRight, &regFree2);
       codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
                   r1, r2, dest, jumpIfNull);
+      assert(TK_LT==OP_Lt); testcase(op==OP_Lt); VdbeCoverageIf(v,op==OP_Lt);
+      assert(TK_LE==OP_Le); testcase(op==OP_Le); VdbeCoverageIf(v,op==OP_Le);
+      assert(TK_GT==OP_Gt); testcase(op==OP_Gt); VdbeCoverageIf(v,op==OP_Gt);
+      assert(TK_GE==OP_Ge); testcase(op==OP_Ge); VdbeCoverageIf(v,op==OP_Ge);
+      assert(TK_EQ==OP_Eq); testcase(op==OP_Eq); VdbeCoverageIf(v,op==OP_Eq);
+      assert(TK_NE==OP_Ne); testcase(op==OP_Ne); VdbeCoverageIf(v,op==OP_Ne);
       testcase( regFree1==0 );
       testcase( regFree2==0 );
       break;
@@ -78967,16 +81345,18 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int
       op = (pExpr->op==TK_IS) ? TK_NE : TK_EQ;
       codeCompare(pParse, pExpr->pLeft, pExpr->pRight, op,
                   r1, r2, dest, SQLITE_NULLEQ);
+      VdbeCoverageIf(v, op==TK_EQ);
+      VdbeCoverageIf(v, op==TK_NE);
       testcase( regFree1==0 );
       testcase( regFree2==0 );
       break;
     }
     case TK_ISNULL:
     case TK_NOTNULL: {
-      testcase( op==TK_ISNULL );
-      testcase( op==TK_NOTNULL );
       r1 = sqlite3ExprCodeTemp(pParse, pExpr->pLeft, &regFree1);
       sqlite3VdbeAddOp2(v, op, r1, dest);
+      testcase( op==TK_ISNULL );   VdbeCoverageIf(v, op==TK_ISNULL);
+      testcase( op==TK_NOTNULL );  VdbeCoverageIf(v, op==TK_NOTNULL);
       testcase( regFree1==0 );
       break;
     }
@@ -78998,10 +81378,17 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int
     }
 #endif
     default: {
-      r1 = sqlite3ExprCodeTemp(pParse, pExpr, &regFree1);
-      sqlite3VdbeAddOp3(v, OP_IfNot, r1, dest, jumpIfNull!=0);
-      testcase( regFree1==0 );
-      testcase( jumpIfNull==0 );
+      if( exprAlwaysFalse(pExpr) ){
+        sqlite3VdbeAddOp2(v, OP_Goto, 0, dest);
+      }else if( exprAlwaysTrue(pExpr) ){
+        /* no-op */
+      }else{
+        r1 = sqlite3ExprCodeTemp(pParse, pExpr, &regFree1);
+        sqlite3VdbeAddOp3(v, OP_IfNot, r1, dest, jumpIfNull!=0);
+        VdbeCoverage(v);
+        testcase( regFree1==0 );
+        testcase( jumpIfNull==0 );
+      }
       break;
     }
   }
@@ -79015,6 +81402,12 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int
 ** by a COLLATE operator at the top level.  Return 2 if there are differences
 ** other than the top-level COLLATE operator.
 **
+** If any subelement of pB has Expr.iTable==(-1) then it is allowed
+** to compare equal to an equivalent element in pA with Expr.iTable==iTab.
+**
+** The pA side might be using TK_REGISTER.  If that is the case and pB is
+** not using TK_REGISTER but is otherwise equivalent, then still return 0.
+**
 ** Sometimes this routine will return 2 even if the two expressions
 ** really are equivalent.  If we cannot prove that the expressions are
 ** identical, we return 2 just to be safe.  So if this routine
@@ -79025,39 +81418,44 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int
 ** just might result in some slightly slower code.  But returning
 ** an incorrect 0 or 1 could lead to a malfunction.
 */
-SQLITE_PRIVATE int sqlite3ExprCompare(Expr *pA, Expr *pB){
-  if( pA==0||pB==0 ){
+SQLITE_PRIVATE int sqlite3ExprCompare(Expr *pA, Expr *pB, int iTab){
+  u32 combinedFlags;
+  if( pA==0 || pB==0 ){
     return pB==pA ? 0 : 2;
   }
-  assert( !ExprHasAnyProperty(pA, EP_TokenOnly|EP_Reduced) );
-  assert( !ExprHasAnyProperty(pB, EP_TokenOnly|EP_Reduced) );
-  if( ExprHasProperty(pA, EP_xIsSelect) || ExprHasProperty(pB, EP_xIsSelect) ){
+  combinedFlags = pA->flags | pB->flags;
+  if( combinedFlags & EP_IntValue ){
+    if( (pA->flags&pB->flags&EP_IntValue)!=0 && pA->u.iValue==pB->u.iValue ){
+      return 0;
+    }
     return 2;
   }
-  if( (pA->flags & EP_Distinct)!=(pB->flags & EP_Distinct) ) return 2;
   if( pA->op!=pB->op ){
-    if( pA->op==TK_COLLATE && sqlite3ExprCompare(pA->pLeft, pB)<2 ){
+    if( pA->op==TK_COLLATE && sqlite3ExprCompare(pA->pLeft, pB, iTab)<2 ){
       return 1;
     }
-    if( pB->op==TK_COLLATE && sqlite3ExprCompare(pA, pB->pLeft)<2 ){
+    if( pB->op==TK_COLLATE && sqlite3ExprCompare(pA, pB->pLeft, iTab)<2 ){
       return 1;
     }
     return 2;
   }
-  if( sqlite3ExprCompare(pA->pLeft, pB->pLeft) ) return 2;
-  if( sqlite3ExprCompare(pA->pRight, pB->pRight) ) return 2;
-  if( sqlite3ExprListCompare(pA->x.pList, pB->x.pList) ) return 2;
-  if( pA->iTable!=pB->iTable || pA->iColumn!=pB->iColumn ) return 2;
-  if( ExprHasProperty(pA, EP_IntValue) ){
-    if( !ExprHasProperty(pB, EP_IntValue) || pA->u.iValue!=pB->u.iValue ){
-      return 2;
-    }
-  }else if( pA->op!=TK_COLUMN && ALWAYS(pA->op!=TK_AGG_COLUMN) && pA->u.zToken){
-    if( ExprHasProperty(pB, EP_IntValue) || NEVER(pB->u.zToken==0) ) return 2;
+  if( pA->op!=TK_COLUMN && ALWAYS(pA->op!=TK_AGG_COLUMN) && pA->u.zToken ){
     if( strcmp(pA->u.zToken,pB->u.zToken)!=0 ){
       return pA->op==TK_COLLATE ? 1 : 2;
     }
   }
+  if( (pA->flags & EP_Distinct)!=(pB->flags & EP_Distinct) ) return 2;
+  if( ALWAYS((combinedFlags & EP_TokenOnly)==0) ){
+    if( combinedFlags & EP_xIsSelect ) return 2;
+    if( sqlite3ExprCompare(pA->pLeft, pB->pLeft, iTab) ) return 2;
+    if( sqlite3ExprCompare(pA->pRight, pB->pRight, iTab) ) return 2;
+    if( sqlite3ExprListCompare(pA->x.pList, pB->x.pList, iTab) ) return 2;
+    if( ALWAYS((combinedFlags & EP_Reduced)==0) ){
+      if( pA->iColumn!=pB->iColumn ) return 2;
+      if( pA->iTable!=pB->iTable 
+       && (pA->iTable!=iTab || NEVER(pB->iTable>=0)) ) return 2;
+    }
+  }
   return 0;
 }
 
@@ -79065,6 +81463,9 @@ SQLITE_PRIVATE int sqlite3ExprCompare(Expr *pA, Expr *pB){
 ** Compare two ExprList objects.  Return 0 if they are identical and 
 ** non-zero if they differ in any way.
 **
+** If any subelement of pB has Expr.iTable==(-1) then it is allowed
+** to compare equal to an equivalent element in pA with Expr.iTable==iTab.
+**
 ** This routine might return non-zero for equivalent ExprLists.  The
 ** only consequence will be disabled optimizations.  But this routine
 ** must never return 0 if the two ExprList objects are different, or
@@ -79073,7 +81474,7 @@ SQLITE_PRIVATE int sqlite3ExprCompare(Expr *pA, Expr *pB){
 ** Two NULL pointers are considered to be the same.  But a NULL pointer
 ** always differs from a non-NULL pointer.
 */
-SQLITE_PRIVATE int sqlite3ExprListCompare(ExprList *pA, ExprList *pB){
+SQLITE_PRIVATE int sqlite3ExprListCompare(ExprList *pA, ExprList *pB, int iTab){
   int i;
   if( pA==0 && pB==0 ) return 0;
   if( pA==0 || pB==0 ) return 1;
@@ -79082,7 +81483,46 @@ SQLITE_PRIVATE int sqlite3ExprListCompare(ExprList *pA, ExprList *pB){
     Expr *pExprA = pA->a[i].pExpr;
     Expr *pExprB = pB->a[i].pExpr;
     if( pA->a[i].sortOrder!=pB->a[i].sortOrder ) return 1;
-    if( sqlite3ExprCompare(pExprA, pExprB) ) return 1;
+    if( sqlite3ExprCompare(pExprA, pExprB, iTab) ) return 1;
+  }
+  return 0;
+}
+
+/*
+** Return true if we can prove the pE2 will always be true if pE1 is
+** true.  Return false if we cannot complete the proof or if pE2 might
+** be false.  Examples:
+**
+**     pE1: x==5       pE2: x==5             Result: true
+**     pE1: x>0        pE2: x==5             Result: false
+**     pE1: x=21       pE2: x=21 OR y=43     Result: true
+**     pE1: x!=123     pE2: x IS NOT NULL    Result: true
+**     pE1: x!=?1      pE2: x IS NOT NULL    Result: true
+**     pE1: x IS NULL  pE2: x IS NOT NULL    Result: false
+**     pE1: x IS ?2    pE2: x IS NOT NULL    Reuslt: false
+**
+** When comparing TK_COLUMN nodes between pE1 and pE2, if pE2 has
+** Expr.iTable<0 then assume a table number given by iTab.
+**
+** When in doubt, return false.  Returning true might give a performance
+** improvement.  Returning false might cause a performance reduction, but
+** it will always give the correct answer and is hence always safe.
+*/
+SQLITE_PRIVATE int sqlite3ExprImpliesExpr(Expr *pE1, Expr *pE2, int iTab){
+  if( sqlite3ExprCompare(pE1, pE2, iTab)==0 ){
+    return 1;
+  }
+  if( pE2->op==TK_OR
+   && (sqlite3ExprImpliesExpr(pE1, pE2->pLeft, iTab)
+             || sqlite3ExprImpliesExpr(pE1, pE2->pRight, iTab) )
+  ){
+    return 1;
+  }
+  if( pE2->op==TK_NOTNULL
+   && sqlite3ExprCompare(pE1->pLeft, pE2->pLeft, iTab)==0
+   && (pE1->op!=TK_ISNULL && pE1->op!=TK_IS)
+  ){
+    return 1;
   }
   return 0;
 }
@@ -79199,7 +81639,7 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
         struct SrcList_item *pItem = pSrcList->a;
         for(i=0; i<pSrcList->nSrc; i++, pItem++){
           struct AggInfo_col *pCol;
-          assert( !ExprHasAnyProperty(pExpr, EP_TokenOnly|EP_Reduced) );
+          assert( !ExprHasProperty(pExpr, EP_TokenOnly|EP_Reduced) );
           if( pExpr->iTable==pItem->iCursor ){
             /* If we reach this point, it means that pExpr refers to a table
             ** that is in the FROM clause of the aggregate query.  
@@ -79248,7 +81688,7 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
             ** Convert the pExpr to be a TK_AGG_COLUMN referring to that
             ** pAggInfo->aCol[] entry.
             */
-            ExprSetIrreducible(pExpr);
+            ExprSetVVAProperty(pExpr, EP_NoReduce);
             pExpr->pAggInfo = pAggInfo;
             pExpr->op = TK_AGG_COLUMN;
             pExpr->iAgg = (i16)k;
@@ -79267,7 +81707,7 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
         */
         struct AggInfo_func *pItem = pAggInfo->aFunc;
         for(i=0; i<pAggInfo->nFunc; i++, pItem++){
-          if( sqlite3ExprCompare(pItem->pExpr, pExpr)==0 ){
+          if( sqlite3ExprCompare(pItem->pExpr, pExpr, -1)==0 ){
             break;
           }
         }
@@ -79294,8 +81734,8 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
         }
         /* Make pExpr point to the appropriate pAggInfo->aFunc[] entry
         */
-        assert( !ExprHasAnyProperty(pExpr, EP_TokenOnly|EP_Reduced) );
-        ExprSetIrreducible(pExpr);
+        assert( !ExprHasProperty(pExpr, EP_TokenOnly|EP_Reduced) );
+        ExprSetVVAProperty(pExpr, EP_NoReduce);
         pExpr->iAgg = (i16)i;
         pExpr->pAggInfo = pAggInfo;
         return WRC_Prune;
@@ -79492,8 +81932,8 @@ static void renameTableFunc(
       assert( len>0 );
     } while( token!=TK_LP && token!=TK_USING );
 
-    zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", ((u8*)tname.z) - zSql, zSql, 
-       zTableName, tname.z+tname.n);
+    zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", (int)(((u8*)tname.z) - zSql),
+       zSql, zTableName, tname.z+tname.n);
     sqlite3_result_text(context, zRet, -1, SQLITE_DYNAMIC);
   }
 }
@@ -79531,6 +81971,7 @@ static void renameParentFunc(
   int token;                      /* Type of token */
 
   UNUSED_PARAMETER(NotUsed);
+  if( zInput==0 || zOld==0 ) return;
   for(z=zInput; *z; z=z+n){
     n = sqlite3GetToken(z, &token);
     if( token==TK_REFERENCES ){
@@ -79545,7 +81986,7 @@ static void renameParentFunc(
       sqlite3Dequote(zParent);
       if( 0==sqlite3StrICmp((const char *)zOld, zParent) ){
         char *zOut = sqlite3MPrintf(db, "%s%.*s\"%w\"", 
-            (zOutput?zOutput:""), z-zInput, zInput, (const char *)zNew
+            (zOutput?zOutput:""), (int)(z-zInput), zInput, (const char *)zNew
         );
         sqlite3DbFree(db, zOutput);
         zOutput = zOut;
@@ -79631,8 +82072,8 @@ static void renameTriggerFunc(
     /* Variable tname now contains the token that is the old table-name
     ** in the CREATE TRIGGER statement.
     */
-    zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", ((u8*)tname.z) - zSql, zSql, 
-       zTableName, tname.z+tname.n);
+    zRet = sqlite3MPrintf(db, "%.*s\"%w\"%s", (int)(((u8*)tname.z) - zSql),
+       zSql, zTableName, tname.z+tname.n);
     sqlite3_result_text(context, zRet, -1, SQLITE_DYNAMIC);
   }
 }
@@ -79884,7 +82325,7 @@ SQLITE_PRIVATE void sqlite3AlterRenameTable(
   }
 #endif
 
-  /* Begin a transaction and code the VerifyCookie for database iDb. 
+  /* Begin a transaction for database iDb. 
   ** Then modify the schema cookie (since the ALTER TABLE modifies the
   ** schema). Open a statement transaction if the table is a virtual
   ** table.
@@ -80020,6 +82461,7 @@ SQLITE_PRIVATE void sqlite3MinimumFileFormat(Parse *pParse, int iDb, int minForm
     sqlite3VdbeUsesBtree(v, iDb);
     sqlite3VdbeAddOp2(v, OP_Integer, minFormat, r2);
     j1 = sqlite3VdbeAddOp3(v, OP_Ge, r2, 0, r1);
+    sqlite3VdbeChangeP5(v, SQLITE_NOTNULL); VdbeCoverage(v);
     sqlite3VdbeAddOp3(v, OP_SetCookie, iDb, BTREE_FILE_FORMAT, r2);
     sqlite3VdbeJumpHere(v, j1);
     sqlite3ReleaseTempReg(pParse, r1);
@@ -80102,7 +82544,7 @@ SQLITE_PRIVATE void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
   ** can handle (i.e. not CURRENT_TIME etc.)
   */
   if( pDflt ){
-    sqlite3_value *pVal;
+    sqlite3_value *pVal = 0;
     if( sqlite3ValueFromExpr(db, pDflt, SQLITE_UTF8, SQLITE_AFF_NONE, &pVal) ){
       db->mallocFailed = 1;
       return;
@@ -80243,7 +82685,7 @@ SQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
 /************** End of alter.c ***********************************************/
 /************** Begin file analyze.c *****************************************/
 /*
-** 2005 July 8
+** 2005-07-08
 **
 ** The author disclaims copyright to this source code.  In place of
 ** a legal notice, here is a blessing:
@@ -80264,15 +82706,23 @@ SQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
 **    CREATE TABLE sqlite_stat1(tbl, idx, stat);
 **    CREATE TABLE sqlite_stat2(tbl, idx, sampleno, sample);
 **    CREATE TABLE sqlite_stat3(tbl, idx, nEq, nLt, nDLt, sample);
+**    CREATE TABLE sqlite_stat4(tbl, idx, nEq, nLt, nDLt, sample);
 **
 ** Additional tables might be added in future releases of SQLite.
 ** The sqlite_stat2 table is not created or used unless the SQLite version
 ** is between 3.6.18 and 3.7.8, inclusive, and unless SQLite is compiled
 ** with SQLITE_ENABLE_STAT2.  The sqlite_stat2 table is deprecated.
-** The sqlite_stat2 table is superceded by sqlite_stat3, which is only
+** The sqlite_stat2 table is superseded by sqlite_stat3, which is only
 ** created and used by SQLite versions 3.7.9 and later and with
-** SQLITE_ENABLE_STAT3 defined.  The fucntionality of sqlite_stat3
-** is a superset of sqlite_stat2.  
+** SQLITE_ENABLE_STAT3 defined.  The functionality of sqlite_stat3
+** is a superset of sqlite_stat2.  The sqlite_stat4 is an enhanced
+** version of sqlite_stat3 and is only available when compiled with
+** SQLITE_ENABLE_STAT4 and in SQLite versions 3.8.1 and later.  It is
+** not possible to enable both STAT3 and STAT4 at the same time.  If they
+** are both enabled, then STAT4 takes precedence.
+**
+** For most applications, sqlite_stat1 provides all the statisics required
+** for the query planner to make good choices.
 **
 ** Format of sqlite_stat1:
 **
@@ -80280,7 +82730,8 @@ SQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
 ** name in the idx column.  The tbl column is the name of the table to
 ** which the index belongs.  In each such row, the stat column will be
 ** a string consisting of a list of integers.  The first integer in this
-** list is the number of rows in the index and in the table.  The second
+** list is the number of rows in the index.  (This is the same as the
+** number of rows in the table, except for partial indices.)  The second
 ** integer is the average number of rows in the index that have the same
 ** value in the first column of the index.  The third integer is the average
 ** number of rows in the index that have the same value for the first two
@@ -80327,53 +82778,81 @@ SQLITE_PRIVATE void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
 **
 ** Format for sqlite_stat3:
 **
-** The sqlite_stat3 is an enhancement to sqlite_stat2.  A new name is
-** used to avoid compatibility problems.  
+** The sqlite_stat3 format is a subset of sqlite_stat4.  Hence, the
+** sqlite_stat4 format will be described first.  Further information
+** about sqlite_stat3 follows the sqlite_stat4 description.
 **
-** The format of the sqlite_stat3 table is similar to the format of
-** the sqlite_stat2 table.  There are multiple entries for each index.
+** Format for sqlite_stat4:
+**
+** As with sqlite_stat2, the sqlite_stat4 table contains histogram data
+** to aid the query planner in choosing good indices based on the values
+** that indexed columns are compared against in the WHERE clauses of
+** queries.
+**
+** The sqlite_stat4 table contains multiple entries for each index.
 ** The idx column names the index and the tbl column is the table of the
 ** index.  If the idx and tbl columns are the same, then the sample is
-** of the INTEGER PRIMARY KEY.  The sample column is a value taken from
-** the left-most column of the index.  The nEq column is the approximate
-** number of entires in the index whose left-most column exactly matches
-** the sample.  nLt is the approximate number of entires whose left-most
-** column is less than the sample.  The nDLt column is the approximate
-** number of distinct left-most entries in the index that are less than
-** the sample.
+** of the INTEGER PRIMARY KEY.  The sample column is a blob which is the
+** binary encoding of a key from the index.  The nEq column is a
+** list of integers.  The first integer is the approximate number
+** of entries in the index whose left-most column exactly matches
+** the left-most column of the sample.  The second integer in nEq
+** is the approximate number of entries in the index where the
+** first two columns match the first two columns of the sample.
+** And so forth.  nLt is another list of integers that show the approximate
+** number of entries that are strictly less than the sample.  The first
+** integer in nLt contains the number of entries in the index where the
+** left-most column is less than the left-most column of the sample.
+** The K-th integer in the nLt entry is the number of index entries 
+** where the first K columns are less than the first K columns of the
+** sample.  The nDLt column is like nLt except that it contains the 
+** number of distinct entries in the index that are less than the
+** sample.
 **
-** Future versions of SQLite might change to store a string containing
-** multiple integers values in the nDLt column of sqlite_stat3.  The first
-** integer will be the number of prior index entires that are distinct in
-** the left-most column.  The second integer will be the number of prior index
-** entries that are distinct in the first two columns.  The third integer
-** will be the number of prior index entries that are distinct in the first
-** three columns.  And so forth.  With that extension, the nDLt field is
-** similar in function to the sqlite_stat1.stat field.
-**
-** There can be an arbitrary number of sqlite_stat3 entries per index.
-** The ANALYZE command will typically generate sqlite_stat3 tables
+** There can be an arbitrary number of sqlite_stat4 entries per index.
+** The ANALYZE command will typically generate sqlite_stat4 tables
 ** that contain between 10 and 40 samples which are distributed across
 ** the key space, though not uniformly, and which include samples with
-** largest possible nEq values.
+** large nEq values.
+**
+** Format for sqlite_stat3 redux:
+**
+** The sqlite_stat3 table is like sqlite_stat4 except that it only
+** looks at the left-most column of the index.  The sqlite_stat3.sample
+** column contains the actual value of the left-most column instead
+** of a blob encoding of the complete index key as is found in
+** sqlite_stat4.sample.  The nEq, nLt, and nDLt entries of sqlite_stat3
+** all contain just a single integer which is the same as the first
+** integer in the equivalent columns in sqlite_stat4.
 */
 #ifndef SQLITE_OMIT_ANALYZE
 
+#if defined(SQLITE_ENABLE_STAT4)
+# define IsStat4     1
+# define IsStat3     0
+#elif defined(SQLITE_ENABLE_STAT3)
+# define IsStat4     0
+# define IsStat3     1
+#else
+# define IsStat4     0
+# define IsStat3     0
+# undef SQLITE_STAT4_SAMPLES
+# define SQLITE_STAT4_SAMPLES 1
+#endif
+#define IsStat34    (IsStat3+IsStat4)  /* 1 for STAT3 or STAT4. 0 otherwise */
+
 /*
-** This routine generates code that opens the sqlite_stat1 table for
-** writing with cursor iStatCur. If the library was built with the
-** SQLITE_ENABLE_STAT3 macro defined, then the sqlite_stat3 table is
-** opened for writing using cursor (iStatCur+1)
+** This routine generates code that opens the sqlite_statN tables.
+** The sqlite_stat1 table is always relevant.  sqlite_stat2 is now
+** obsolete.  sqlite_stat3 and sqlite_stat4 are only opened when
+** appropriate compile-time options are provided.
 **
-** If the sqlite_stat1 tables does not previously exist, it is created.
-** Similarly, if the sqlite_stat3 table does not exist and the library
-** is compiled with SQLITE_ENABLE_STAT3 defined, it is created. 
+** If the sqlite_statN tables do not previously exist, it is created.
 **
 ** Argument zWhere may be a pointer to a buffer containing a table name,
 ** or it may be a NULL pointer. If it is not NULL, then all entries in
-** the sqlite_stat1 and (if applicable) sqlite_stat3 tables associated
-** with the named table are deleted. If zWhere==0, then code is generated
-** to delete all stat table entries.
+** the sqlite_statN tables associated with the named table are deleted.
+** If zWhere==0, then code is generated to delete all stat table entries.
 */
 static void openStatTable(
   Parse *pParse,          /* Parsing context */
@@ -80387,18 +82866,24 @@ static void openStatTable(
     const char *zCols;
   } aTable[] = {
     { "sqlite_stat1", "tbl,idx,stat" },
-#ifdef SQLITE_ENABLE_STAT3
+#if defined(SQLITE_ENABLE_STAT4)
+    { "sqlite_stat4", "tbl,idx,neq,nlt,ndlt,sample" },
+    { "sqlite_stat3", 0 },
+#elif defined(SQLITE_ENABLE_STAT3)
     { "sqlite_stat3", "tbl,idx,neq,nlt,ndlt,sample" },
+    { "sqlite_stat4", 0 },
+#else
+    { "sqlite_stat3", 0 },
+    { "sqlite_stat4", 0 },
 #endif
   };
-
-  int aRoot[] = {0, 0};
-  u8 aCreateTbl[] = {0, 0};
-
   int i;
   sqlite3 *db = pParse->db;
   Db *pDb;
   Vdbe *v = sqlite3GetVdbe(pParse);
+  int aRoot[ArraySize(aTable)];
+  u8 aCreateTbl[ArraySize(aTable)];
+
   if( v==0 ) return;
   assert( sqlite3BtreeHoldsAllMutexes(db) );
   assert( sqlite3VdbeDb(v)==db );
@@ -80411,258 +82896,712 @@ static void openStatTable(
     const char *zTab = aTable[i].zName;
     Table *pStat;
     if( (pStat = sqlite3FindTable(db, zTab, pDb->zName))==0 ){
-      /* The sqlite_stat[12] table does not exist. Create it. Note that a 
-      ** side-effect of the CREATE TABLE statement is to leave the rootpage 
-      ** of the new table in register pParse->regRoot. This is important 
-      ** because the OpenWrite opcode below will be needing it. */
-      sqlite3NestedParse(pParse,
-          "CREATE TABLE %Q.%s(%s)", pDb->zName, zTab, aTable[i].zCols
-      );
-      aRoot[i] = pParse->regRoot;
-      aCreateTbl[i] = OPFLAG_P2ISREG;
+      if( aTable[i].zCols ){
+        /* The sqlite_statN table does not exist. Create it. Note that a 
+        ** side-effect of the CREATE TABLE statement is to leave the rootpage 
+        ** of the new table in register pParse->regRoot. This is important 
+        ** because the OpenWrite opcode below will be needing it. */
+        sqlite3NestedParse(pParse,
+            "CREATE TABLE %Q.%s(%s)", pDb->zName, zTab, aTable[i].zCols
+        );
+        aRoot[i] = pParse->regRoot;
+        aCreateTbl[i] = OPFLAG_P2ISREG;
+      }
     }else{
       /* The table already exists. If zWhere is not NULL, delete all entries 
       ** associated with the table zWhere. If zWhere is NULL, delete the
       ** entire contents of the table. */
       aRoot[i] = pStat->tnum;
+      aCreateTbl[i] = 0;
       sqlite3TableLock(pParse, iDb, aRoot[i], 1, zTab);
       if( zWhere ){
         sqlite3NestedParse(pParse,
-           "DELETE FROM %Q.%s WHERE %s=%Q", pDb->zName, zTab, zWhereType, zWhere
+           "DELETE FROM %Q.%s WHERE %s=%Q",
+           pDb->zName, zTab, zWhereType, zWhere
         );
       }else{
-        /* The sqlite_stat[12] table already exists.  Delete all rows. */
+        /* The sqlite_stat[134] table already exists.  Delete all rows. */
         sqlite3VdbeAddOp2(v, OP_Clear, aRoot[i], iDb);
       }
     }
   }
 
-  /* Open the sqlite_stat[13] tables for writing. */
-  for(i=0; i<ArraySize(aTable); i++){
-    sqlite3VdbeAddOp3(v, OP_OpenWrite, iStatCur+i, aRoot[i], iDb);
-    sqlite3VdbeChangeP4(v, -1, (char *)3, P4_INT32);
+  /* Open the sqlite_stat[134] tables for writing. */
+  for(i=0; aTable[i].zCols; i++){
+    assert( i<ArraySize(aTable) );
+    sqlite3VdbeAddOp4Int(v, OP_OpenWrite, iStatCur+i, aRoot[i], iDb, 3);
     sqlite3VdbeChangeP5(v, aCreateTbl[i]);
   }
 }
 
 /*
-** Recommended number of samples for sqlite_stat3
+** Recommended number of samples for sqlite_stat4
 */
-#ifndef SQLITE_STAT3_SAMPLES
-# define SQLITE_STAT3_SAMPLES 24
+#ifndef SQLITE_STAT4_SAMPLES
+# define SQLITE_STAT4_SAMPLES 24
 #endif
 
 /*
-** Three SQL functions - stat3_init(), stat3_push(), and stat3_pop() -
+** Three SQL functions - stat_init(), stat_push(), and stat_get() -
 ** share an instance of the following structure to hold their state
 ** information.
 */
-typedef struct Stat3Accum Stat3Accum;
-struct Stat3Accum {
+typedef struct Stat4Accum Stat4Accum;
+typedef struct Stat4Sample Stat4Sample;
+struct Stat4Sample {
+  tRowcnt *anEq;                  /* sqlite_stat4.nEq */
+  tRowcnt *anDLt;                 /* sqlite_stat4.nDLt */
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  tRowcnt *anLt;                  /* sqlite_stat4.nLt */
+  union {
+    i64 iRowid;                     /* Rowid in main table of the key */
+    u8 *aRowid;                     /* Key for WITHOUT ROWID tables */
+  } u;
+  u32 nRowid;                     /* Sizeof aRowid[] */
+  u8 isPSample;                   /* True if a periodic sample */
+  int iCol;                       /* If !isPSample, the reason for inclusion */
+  u32 iHash;                      /* Tiebreaker hash */
+#endif
+};                                                    
+struct Stat4Accum {
   tRowcnt nRow;             /* Number of rows in the entire table */
   tRowcnt nPSample;         /* How often to do a periodic sample */
-  int iMin;                 /* Index of entry with minimum nEq and hash */
+  int nCol;                 /* Number of columns in index + rowid */
   int mxSample;             /* Maximum number of samples to accumulate */
-  int nSample;              /* Current number of samples */
+  Stat4Sample current;      /* Current row as a Stat4Sample */
   u32 iPrn;                 /* Pseudo-random number used for sampling */
-  struct Stat3Sample {
-    i64 iRowid;                /* Rowid in main table of the key */
-    tRowcnt nEq;               /* sqlite_stat3.nEq */
-    tRowcnt nLt;               /* sqlite_stat3.nLt */
-    tRowcnt nDLt;              /* sqlite_stat3.nDLt */
-    u8 isPSample;              /* True if a periodic sample */
-    u32 iHash;                 /* Tiebreaker hash */
-  } *a;                     /* An array of samples */
+  Stat4Sample *aBest;       /* Array of nCol best samples */
+  int iMin;                 /* Index in a[] of entry with minimum score */
+  int nSample;              /* Current number of samples */
+  int iGet;                 /* Index of current sample accessed by stat_get() */
+  Stat4Sample *a;           /* Array of mxSample Stat4Sample objects */
+  sqlite3 *db;              /* Database connection, for malloc() */
 };
 
-#ifdef SQLITE_ENABLE_STAT3
-/*
-** Implementation of the stat3_init(C,S) SQL function.  The two parameters
-** are the number of rows in the table or index (C) and the number of samples
-** to accumulate (S).
-**
-** This routine allocates the Stat3Accum object.
-**
-** The return value is the Stat3Accum object (P).
+/* Reclaim memory used by a Stat4Sample
 */
-static void stat3Init(
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+static void sampleClear(sqlite3 *db, Stat4Sample *p){
+  assert( db!=0 );
+  if( p->nRowid ){
+    sqlite3DbFree(db, p->u.aRowid);
+    p->nRowid = 0;
+  }
+}
+#endif
+
+/* Initialize the BLOB value of a ROWID
+*/
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+static void sampleSetRowid(sqlite3 *db, Stat4Sample *p, int n, const u8 *pData){
+  assert( db!=0 );
+  if( p->nRowid ) sqlite3DbFree(db, p->u.aRowid);
+  p->u.aRowid = sqlite3DbMallocRaw(db, n);
+  if( p->u.aRowid ){
+    p->nRowid = n;
+    memcpy(p->u.aRowid, pData, n);
+  }else{
+    p->nRowid = 0;
+  }
+}
+#endif
+
+/* Initialize the INTEGER value of a ROWID.
+*/
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+static void sampleSetRowidInt64(sqlite3 *db, Stat4Sample *p, i64 iRowid){
+  assert( db!=0 );
+  if( p->nRowid ) sqlite3DbFree(db, p->u.aRowid);
+  p->nRowid = 0;
+  p->u.iRowid = iRowid;
+}
+#endif
+
+
+/*
+** Copy the contents of object (*pFrom) into (*pTo).
+*/
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+static void sampleCopy(Stat4Accum *p, Stat4Sample *pTo, Stat4Sample *pFrom){
+  pTo->isPSample = pFrom->isPSample;
+  pTo->iCol = pFrom->iCol;
+  pTo->iHash = pFrom->iHash;
+  memcpy(pTo->anEq, pFrom->anEq, sizeof(tRowcnt)*p->nCol);
+  memcpy(pTo->anLt, pFrom->anLt, sizeof(tRowcnt)*p->nCol);
+  memcpy(pTo->anDLt, pFrom->anDLt, sizeof(tRowcnt)*p->nCol);
+  if( pFrom->nRowid ){
+    sampleSetRowid(p->db, pTo, pFrom->nRowid, pFrom->u.aRowid);
+  }else{
+    sampleSetRowidInt64(p->db, pTo, pFrom->u.iRowid);
+  }
+}
+#endif
+
+/*
+** Reclaim all memory of a Stat4Accum structure.
+*/
+static void stat4Destructor(void *pOld){
+  Stat4Accum *p = (Stat4Accum*)pOld;
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  int i;
+  for(i=0; i<p->nCol; i++) sampleClear(p->db, p->aBest+i);
+  for(i=0; i<p->mxSample; i++) sampleClear(p->db, p->a+i);
+  sampleClear(p->db, &p->current);
+#endif
+  sqlite3DbFree(p->db, p);
+}
+
+/*
+** Implementation of the stat_init(N,C) SQL function. The two parameters
+** are the number of rows in the table or index (C) and the number of columns
+** in the index (N).  The second argument (C) is only used for STAT3 and STAT4.
+**
+** This routine allocates the Stat4Accum object in heap memory. The return 
+** value is a pointer to the the Stat4Accum object encoded as a blob (i.e. 
+** the size of the blob is sizeof(void*) bytes). 
+*/
+static void statInit(
   sqlite3_context *context,
   int argc,
   sqlite3_value **argv
 ){
-  Stat3Accum *p;
-  tRowcnt nRow;
-  int mxSample;
-  int n;
+  Stat4Accum *p;
+  int nCol;                       /* Number of columns in index being sampled */
+  int nColUp;                     /* nCol rounded up for alignment */
+  int n;                          /* Bytes of space to allocate */
+  sqlite3 *db;                    /* Database connection */
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  int mxSample = SQLITE_STAT4_SAMPLES;
+#endif
 
+  /* Decode the three function arguments */
   UNUSED_PARAMETER(argc);
-  nRow = (tRowcnt)sqlite3_value_int64(argv[0]);
-  mxSample = sqlite3_value_int(argv[1]);
-  n = sizeof(*p) + sizeof(p->a[0])*mxSample;
-  p = sqlite3MallocZero( n );
+  nCol = sqlite3_value_int(argv[0]);
+  assert( nCol>1 );               /* >1 because it includes the rowid column */
+  nColUp = sizeof(tRowcnt)<8 ? (nCol+1)&~1 : nCol;
+
+  /* Allocate the space required for the Stat4Accum object */
+  n = sizeof(*p) 
+    + sizeof(tRowcnt)*nColUp                  /* Stat4Accum.anEq */
+    + sizeof(tRowcnt)*nColUp                  /* Stat4Accum.anDLt */
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+    + sizeof(tRowcnt)*nColUp                  /* Stat4Accum.anLt */
+    + sizeof(Stat4Sample)*(nCol+mxSample)     /* Stat4Accum.aBest[], a[] */
+    + sizeof(tRowcnt)*3*nColUp*(nCol+mxSample)
+#endif
+  ;
+  db = sqlite3_context_db_handle(context);
+  p = sqlite3DbMallocZero(db, n);
   if( p==0 ){
     sqlite3_result_error_nomem(context);
     return;
   }
-  p->a = (struct Stat3Sample*)&p[1];
-  p->nRow = nRow;
-  p->mxSample = mxSample;
-  p->nPSample = p->nRow/(mxSample/3+1) + 1;
-  sqlite3_randomness(sizeof(p->iPrn), &p->iPrn);
-  sqlite3_result_blob(context, p, sizeof(p), sqlite3_free);
+
+  p->db = db;
+  p->nRow = 0;
+  p->nCol = nCol;
+  p->current.anDLt = (tRowcnt*)&p[1];
+  p->current.anEq = &p->current.anDLt[nColUp];
+
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  {
+    u8 *pSpace;                     /* Allocated space not yet assigned */
+    int i;                          /* Used to iterate through p->aSample[] */
+
+    p->iGet = -1;
+    p->mxSample = mxSample;
+    p->nPSample = (tRowcnt)(sqlite3_value_int64(argv[1])/(mxSample/3+1) + 1);
+    p->current.anLt = &p->current.anEq[nColUp];
+    p->iPrn = nCol*0x689e962d ^ sqlite3_value_int(argv[1])*0xd0944565;
+  
+    /* Set up the Stat4Accum.a[] and aBest[] arrays */
+    p->a = (struct Stat4Sample*)&p->current.anLt[nColUp];
+    p->aBest = &p->a[mxSample];
+    pSpace = (u8*)(&p->a[mxSample+nCol]);
+    for(i=0; i<(mxSample+nCol); i++){
+      p->a[i].anEq = (tRowcnt *)pSpace; pSpace += (sizeof(tRowcnt) * nColUp);
+      p->a[i].anLt = (tRowcnt *)pSpace; pSpace += (sizeof(tRowcnt) * nColUp);
+      p->a[i].anDLt = (tRowcnt *)pSpace; pSpace += (sizeof(tRowcnt) * nColUp);
+    }
+    assert( (pSpace - (u8*)p)==n );
+  
+    for(i=0; i<nCol; i++){
+      p->aBest[i].iCol = i;
+    }
+  }
+#endif
+
+  /* Return a pointer to the allocated object to the caller */
+  sqlite3_result_blob(context, p, sizeof(p), stat4Destructor);
 }
-static const FuncDef stat3InitFuncdef = {
-  2,                /* nArg */
-  SQLITE_UTF8,      /* iPrefEnc */
-  0,                /* flags */
-  0,                /* pUserData */
-  0,                /* pNext */
-  stat3Init,        /* xFunc */
-  0,                /* xStep */
-  0,                /* xFinalize */
-  "stat3_init",     /* zName */
-  0,                /* pHash */
-  0                 /* pDestructor */
+static const FuncDef statInitFuncdef = {
+  1+IsStat34,      /* nArg */
+  SQLITE_UTF8,     /* funcFlags */
+  0,               /* pUserData */
+  0,               /* pNext */
+  statInit,        /* xFunc */
+  0,               /* xStep */
+  0,               /* xFinalize */
+  "stat_init",     /* zName */
+  0,               /* pHash */
+  0                /* pDestructor */
 };
 
+#ifdef SQLITE_ENABLE_STAT4
+/*
+** pNew and pOld are both candidate non-periodic samples selected for 
+** the same column (pNew->iCol==pOld->iCol). Ignoring this column and 
+** considering only any trailing columns and the sample hash value, this
+** function returns true if sample pNew is to be preferred over pOld.
+** In other words, if we assume that the cardinalities of the selected
+** column for pNew and pOld are equal, is pNew to be preferred over pOld.
+**
+** This function assumes that for each argument sample, the contents of
+** the anEq[] array from pSample->anEq[pSample->iCol+1] onwards are valid. 
+*/
+static int sampleIsBetterPost(
+  Stat4Accum *pAccum, 
+  Stat4Sample *pNew, 
+  Stat4Sample *pOld
+){
+  int nCol = pAccum->nCol;
+  int i;
+  assert( pNew->iCol==pOld->iCol );
+  for(i=pNew->iCol+1; i<nCol; i++){
+    if( pNew->anEq[i]>pOld->anEq[i] ) return 1;
+    if( pNew->anEq[i]<pOld->anEq[i] ) return 0;
+  }
+  if( pNew->iHash>pOld->iHash ) return 1;
+  return 0;
+}
+#endif
+
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+/*
+** Return true if pNew is to be preferred over pOld.
+**
+** This function assumes that for each argument sample, the contents of
+** the anEq[] array from pSample->anEq[pSample->iCol] onwards are valid. 
+*/
+static int sampleIsBetter(
+  Stat4Accum *pAccum, 
+  Stat4Sample *pNew, 
+  Stat4Sample *pOld
+){
+  tRowcnt nEqNew = pNew->anEq[pNew->iCol];
+  tRowcnt nEqOld = pOld->anEq[pOld->iCol];
+
+  assert( pOld->isPSample==0 && pNew->isPSample==0 );
+  assert( IsStat4 || (pNew->iCol==0 && pOld->iCol==0) );
+
+  if( (nEqNew>nEqOld) ) return 1;
+#ifdef SQLITE_ENABLE_STAT4
+  if( nEqNew==nEqOld ){
+    if( pNew->iCol<pOld->iCol ) return 1;
+    return (pNew->iCol==pOld->iCol && sampleIsBetterPost(pAccum, pNew, pOld));
+  }
+  return 0;
+#else
+  return (nEqNew==nEqOld && pNew->iHash>pOld->iHash);
+#endif
+}
 
 /*
-** Implementation of the stat3_push(nEq,nLt,nDLt,rowid,P) SQL function.  The
-** arguments describe a single key instance.  This routine makes the 
-** decision about whether or not to retain this key for the sqlite_stat3
-** table.
-**
-** The return value is NULL.
+** Copy the contents of sample *pNew into the p->a[] array. If necessary,
+** remove the least desirable sample from p->a[] to make room.
 */
-static void stat3Push(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  Stat3Accum *p = (Stat3Accum*)sqlite3_value_blob(argv[4]);
-  tRowcnt nEq = sqlite3_value_int64(argv[0]);
-  tRowcnt nLt = sqlite3_value_int64(argv[1]);
-  tRowcnt nDLt = sqlite3_value_int64(argv[2]);
-  i64 rowid = sqlite3_value_int64(argv[3]);
-  u8 isPSample = 0;
-  u8 doInsert = 0;
-  int iMin = p->iMin;
-  struct Stat3Sample *pSample;
+static void sampleInsert(Stat4Accum *p, Stat4Sample *pNew, int nEqZero){
+  Stat4Sample *pSample = 0;
   int i;
-  u32 h;
 
-  UNUSED_PARAMETER(context);
-  UNUSED_PARAMETER(argc);
-  if( nEq==0 ) return;
-  h = p->iPrn = p->iPrn*1103515245 + 12345;
-  if( (nLt/p->nPSample)!=((nEq+nLt)/p->nPSample) ){
-    doInsert = isPSample = 1;
-  }else if( p->nSample<p->mxSample ){
-    doInsert = 1;
-  }else{
-    if( nEq>p->a[iMin].nEq || (nEq==p->a[iMin].nEq && h>p->a[iMin].iHash) ){
-      doInsert = 1;
-    }
-  }
-  if( !doInsert ) return;
-  if( p->nSample==p->mxSample ){
-    assert( p->nSample - iMin - 1 >= 0 );
-    memmove(&p->a[iMin], &p->a[iMin+1], sizeof(p->a[0])*(p->nSample-iMin-1));
-    pSample = &p->a[p->nSample-1];
-  }else{
-    pSample = &p->a[p->nSample++];
-  }
-  pSample->iRowid = rowid;
-  pSample->nEq = nEq;
-  pSample->nLt = nLt;
-  pSample->nDLt = nDLt;
-  pSample->iHash = h;
-  pSample->isPSample = isPSample;
+  assert( IsStat4 || nEqZero==0 );
 
-  /* Find the new minimum */
-  if( p->nSample==p->mxSample ){
-    pSample = p->a;
-    i = 0;
-    while( pSample->isPSample ){
-      i++;
-      pSample++;
-      assert( i<p->nSample );
-    }
-    nEq = pSample->nEq;
-    h = pSample->iHash;
-    iMin = i;
-    for(i++, pSample++; i<p->nSample; i++, pSample++){
-      if( pSample->isPSample ) continue;
-      if( pSample->nEq<nEq
-       || (pSample->nEq==nEq && pSample->iHash<h)
-      ){
-        iMin = i;
-        nEq = pSample->nEq;
-        h = pSample->iHash;
+#ifdef SQLITE_ENABLE_STAT4
+  if( pNew->isPSample==0 ){
+    Stat4Sample *pUpgrade = 0;
+    assert( pNew->anEq[pNew->iCol]>0 );
+
+    /* This sample is being added because the prefix that ends in column 
+    ** iCol occurs many times in the table. However, if we have already
+    ** added a sample that shares this prefix, there is no need to add
+    ** this one. Instead, upgrade the priority of the highest priority
+    ** existing sample that shares this prefix.  */
+    for(i=p->nSample-1; i>=0; i--){
+      Stat4Sample *pOld = &p->a[i];
+      if( pOld->anEq[pNew->iCol]==0 ){
+        if( pOld->isPSample ) return;
+        assert( pOld->iCol>pNew->iCol );
+        assert( sampleIsBetter(p, pNew, pOld) );
+        if( pUpgrade==0 || sampleIsBetter(p, pOld, pUpgrade) ){
+          pUpgrade = pOld;
+        }
       }
     }
+    if( pUpgrade ){
+      pUpgrade->iCol = pNew->iCol;
+      pUpgrade->anEq[pUpgrade->iCol] = pNew->anEq[pUpgrade->iCol];
+      goto find_new_min;
+    }
+  }
+#endif
+
+  /* If necessary, remove sample iMin to make room for the new sample. */
+  if( p->nSample>=p->mxSample ){
+    Stat4Sample *pMin = &p->a[p->iMin];
+    tRowcnt *anEq = pMin->anEq;
+    tRowcnt *anLt = pMin->anLt;
+    tRowcnt *anDLt = pMin->anDLt;
+    sampleClear(p->db, pMin);
+    memmove(pMin, &pMin[1], sizeof(p->a[0])*(p->nSample-p->iMin-1));
+    pSample = &p->a[p->nSample-1];
+    pSample->nRowid = 0;
+    pSample->anEq = anEq;
+    pSample->anDLt = anDLt;
+    pSample->anLt = anLt;
+    p->nSample = p->mxSample-1;
+  }
+
+  /* The "rows less-than" for the rowid column must be greater than that
+  ** for the last sample in the p->a[] array. Otherwise, the samples would
+  ** be out of order. */
+#ifdef SQLITE_ENABLE_STAT4
+  assert( p->nSample==0 
+       || pNew->anLt[p->nCol-1] > p->a[p->nSample-1].anLt[p->nCol-1] );
+#endif
+
+  /* Insert the new sample */
+  pSample = &p->a[p->nSample];
+  sampleCopy(p, pSample, pNew);
+  p->nSample++;
+
+  /* Zero the first nEqZero entries in the anEq[] array. */
+  memset(pSample->anEq, 0, sizeof(tRowcnt)*nEqZero);
+
+#ifdef SQLITE_ENABLE_STAT4
+ find_new_min:
+#endif
+  if( p->nSample>=p->mxSample ){
+    int iMin = -1;
+    for(i=0; i<p->mxSample; i++){
+      if( p->a[i].isPSample ) continue;
+      if( iMin<0 || sampleIsBetter(p, &p->a[iMin], &p->a[i]) ){
+        iMin = i;
+      }
+    }
+    assert( iMin>=0 );
     p->iMin = iMin;
   }
 }
-static const FuncDef stat3PushFuncdef = {
-  5,                /* nArg */
-  SQLITE_UTF8,      /* iPrefEnc */
-  0,                /* flags */
-  0,                /* pUserData */
-  0,                /* pNext */
-  stat3Push,        /* xFunc */
-  0,                /* xStep */
-  0,                /* xFinalize */
-  "stat3_push",     /* zName */
-  0,                /* pHash */
-  0                 /* pDestructor */
-};
+#endif /* SQLITE_ENABLE_STAT3_OR_STAT4 */
 
 /*
-** Implementation of the stat3_get(P,N,...) SQL function.  This routine is
-** used to query the results.  Content is returned for the Nth sqlite_stat3
-** row where N is between 0 and S-1 and S is the number of samples.  The
-** value returned depends on the number of arguments.
-**
-**   argc==2    result:  rowid
-**   argc==3    result:  nEq
-**   argc==4    result:  nLt
-**   argc==5    result:  nDLt
+** Field iChng of the index being scanned has changed. So at this point
+** p->current contains a sample that reflects the previous row of the
+** index. The value of anEq[iChng] and subsequent anEq[] elements are
+** correct at this point.
 */
-static void stat3Get(
+static void samplePushPrevious(Stat4Accum *p, int iChng){
+#ifdef SQLITE_ENABLE_STAT4
+  int i;
+
+  /* Check if any samples from the aBest[] array should be pushed
+  ** into IndexSample.a[] at this point.  */
+  for(i=(p->nCol-2); i>=iChng; i--){
+    Stat4Sample *pBest = &p->aBest[i];
+    pBest->anEq[i] = p->current.anEq[i];
+    if( p->nSample<p->mxSample || sampleIsBetter(p, pBest, &p->a[p->iMin]) ){
+      sampleInsert(p, pBest, i);
+    }
+  }
+
+  /* Update the anEq[] fields of any samples already collected. */
+  for(i=p->nSample-1; i>=0; i--){
+    int j;
+    for(j=iChng; j<p->nCol; j++){
+      if( p->a[i].anEq[j]==0 ) p->a[i].anEq[j] = p->current.anEq[j];
+    }
+  }
+#endif
+
+#if defined(SQLITE_ENABLE_STAT3) && !defined(SQLITE_ENABLE_STAT4)
+  if( iChng==0 ){
+    tRowcnt nLt = p->current.anLt[0];
+    tRowcnt nEq = p->current.anEq[0];
+
+    /* Check if this is to be a periodic sample. If so, add it. */
+    if( (nLt/p->nPSample)!=(nLt+nEq)/p->nPSample ){
+      p->current.isPSample = 1;
+      sampleInsert(p, &p->current, 0);
+      p->current.isPSample = 0;
+    }else 
+
+    /* Or if it is a non-periodic sample. Add it in this case too. */
+    if( p->nSample<p->mxSample 
+     || sampleIsBetter(p, &p->current, &p->a[p->iMin]) 
+    ){
+      sampleInsert(p, &p->current, 0);
+    }
+  }
+#endif
+
+#ifndef SQLITE_ENABLE_STAT3_OR_STAT4
+  UNUSED_PARAMETER( p );
+  UNUSED_PARAMETER( iChng );
+#endif
+}
+
+/*
+** Implementation of the stat_push SQL function:  stat_push(P,C,R)
+** Arguments:
+**
+**    P     Pointer to the Stat4Accum object created by stat_init()
+**    C     Index of left-most column to differ from previous row
+**    R     Rowid for the current row.  Might be a key record for
+**          WITHOUT ROWID tables.
+**
+** The SQL function always returns NULL.
+**
+** The R parameter is only used for STAT3 and STAT4
+*/
+static void statPush(
   sqlite3_context *context,
   int argc,
   sqlite3_value **argv
 ){
-  int n = sqlite3_value_int(argv[1]);
-  Stat3Accum *p = (Stat3Accum*)sqlite3_value_blob(argv[0]);
+  int i;
 
-  assert( p!=0 );
-  if( p->nSample<=n ) return;
-  switch( argc ){
-    case 2:  sqlite3_result_int64(context, p->a[n].iRowid); break;
-    case 3:  sqlite3_result_int64(context, p->a[n].nEq);    break;
-    case 4:  sqlite3_result_int64(context, p->a[n].nLt);    break;
-    default: sqlite3_result_int64(context, p->a[n].nDLt);   break;
+  /* The three function arguments */
+  Stat4Accum *p = (Stat4Accum*)sqlite3_value_blob(argv[0]);
+  int iChng = sqlite3_value_int(argv[1]);
+
+  UNUSED_PARAMETER( argc );
+  UNUSED_PARAMETER( context );
+  assert( p->nCol>1 );        /* Includes rowid field */
+  assert( iChng<p->nCol );
+
+  if( p->nRow==0 ){
+    /* This is the first call to this function. Do initialization. */
+    for(i=0; i<p->nCol; i++) p->current.anEq[i] = 1;
+  }else{
+    /* Second and subsequent calls get processed here */
+    samplePushPrevious(p, iChng);
+
+    /* Update anDLt[], anLt[] and anEq[] to reflect the values that apply
+    ** to the current row of the index. */
+    for(i=0; i<iChng; i++){
+      p->current.anEq[i]++;
+    }
+    for(i=iChng; i<p->nCol; i++){
+      p->current.anDLt[i]++;
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+      p->current.anLt[i] += p->current.anEq[i];
+#endif
+      p->current.anEq[i] = 1;
+    }
   }
+  p->nRow++;
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  if( sqlite3_value_type(argv[2])==SQLITE_INTEGER ){
+    sampleSetRowidInt64(p->db, &p->current, sqlite3_value_int64(argv[2]));
+  }else{
+    sampleSetRowid(p->db, &p->current, sqlite3_value_bytes(argv[2]),
+                                       sqlite3_value_blob(argv[2]));
+  }
+  p->current.iHash = p->iPrn = p->iPrn*1103515245 + 12345;
+#endif
+
+#ifdef SQLITE_ENABLE_STAT4
+  {
+    tRowcnt nLt = p->current.anLt[p->nCol-1];
+
+    /* Check if this is to be a periodic sample. If so, add it. */
+    if( (nLt/p->nPSample)!=(nLt+1)/p->nPSample ){
+      p->current.isPSample = 1;
+      p->current.iCol = 0;
+      sampleInsert(p, &p->current, p->nCol-1);
+      p->current.isPSample = 0;
+    }
+
+    /* Update the aBest[] array. */
+    for(i=0; i<(p->nCol-1); i++){
+      p->current.iCol = i;
+      if( i>=iChng || sampleIsBetterPost(p, &p->current, &p->aBest[i]) ){
+        sampleCopy(p, &p->aBest[i], &p->current);
+      }
+    }
+  }
+#endif
 }
-static const FuncDef stat3GetFuncdef = {
-  -1,               /* nArg */
-  SQLITE_UTF8,      /* iPrefEnc */
-  0,                /* flags */
-  0,                /* pUserData */
-  0,                /* pNext */
-  stat3Get,         /* xFunc */
-  0,                /* xStep */
-  0,                /* xFinalize */
-  "stat3_get",     /* zName */
-  0,                /* pHash */
-  0                 /* pDestructor */
+static const FuncDef statPushFuncdef = {
+  2+IsStat34,      /* nArg */
+  SQLITE_UTF8,     /* funcFlags */
+  0,               /* pUserData */
+  0,               /* pNext */
+  statPush,        /* xFunc */
+  0,               /* xStep */
+  0,               /* xFinalize */
+  "stat_push",     /* zName */
+  0,               /* pHash */
+  0                /* pDestructor */
 };
-#endif /* SQLITE_ENABLE_STAT3 */
 
+#define STAT_GET_STAT1 0          /* "stat" column of stat1 table */
+#define STAT_GET_ROWID 1          /* "rowid" column of stat[34] entry */
+#define STAT_GET_NEQ   2          /* "neq" column of stat[34] entry */
+#define STAT_GET_NLT   3          /* "nlt" column of stat[34] entry */
+#define STAT_GET_NDLT  4          /* "ndlt" column of stat[34] entry */
 
+/*
+** Implementation of the stat_get(P,J) SQL function.  This routine is
+** used to query the results.  Content is returned for parameter J
+** which is one of the STAT_GET_xxxx values defined above.
+**
+** If neither STAT3 nor STAT4 are enabled, then J is always
+** STAT_GET_STAT1 and is hence omitted and this routine becomes
+** a one-parameter function, stat_get(P), that always returns the
+** stat1 table entry information.
+*/
+static void statGet(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  Stat4Accum *p = (Stat4Accum*)sqlite3_value_blob(argv[0]);
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  /* STAT3 and STAT4 have a parameter on this routine. */
+  int eCall = sqlite3_value_int(argv[1]);
+  assert( argc==2 );
+  assert( eCall==STAT_GET_STAT1 || eCall==STAT_GET_NEQ 
+       || eCall==STAT_GET_ROWID || eCall==STAT_GET_NLT
+       || eCall==STAT_GET_NDLT 
+  );
+  if( eCall==STAT_GET_STAT1 )
+#else
+  assert( argc==1 );
+#endif
+  {
+    /* Return the value to store in the "stat" column of the sqlite_stat1
+    ** table for this index.
+    **
+    ** The value is a string composed of a list of integers describing 
+    ** the index. The first integer in the list is the total number of 
+    ** entries in the index. There is one additional integer in the list 
+    ** for each indexed column. This additional integer is an estimate of
+    ** the number of rows matched by a stabbing query on the index using
+    ** a key with the corresponding number of fields. In other words,
+    ** if the index is on columns (a,b) and the sqlite_stat1 value is 
+    ** "100 10 2", then SQLite estimates that:
+    **
+    **   * the index contains 100 rows,
+    **   * "WHERE a=?" matches 10 rows, and
+    **   * "WHERE a=? AND b=?" matches 2 rows.
+    **
+    ** If D is the count of distinct values and K is the total number of 
+    ** rows, then each estimate is computed as:
+    **
+    **        I = (K+D-1)/D
+    */
+    char *z;
+    int i;
 
+    char *zRet = sqlite3MallocZero(p->nCol * 25);
+    if( zRet==0 ){
+      sqlite3_result_error_nomem(context);
+      return;
+    }
+
+    sqlite3_snprintf(24, zRet, "%llu", (u64)p->nRow);
+    z = zRet + sqlite3Strlen30(zRet);
+    for(i=0; i<(p->nCol-1); i++){
+      u64 nDistinct = p->current.anDLt[i] + 1;
+      u64 iVal = (p->nRow + nDistinct - 1) / nDistinct;
+      sqlite3_snprintf(24, z, " %llu", iVal);
+      z += sqlite3Strlen30(z);
+      assert( p->current.anEq[i] );
+    }
+    assert( z[0]=='\0' && z>zRet );
+
+    sqlite3_result_text(context, zRet, -1, sqlite3_free);
+  }
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  else if( eCall==STAT_GET_ROWID ){
+    if( p->iGet<0 ){
+      samplePushPrevious(p, 0);
+      p->iGet = 0;
+    }
+    if( p->iGet<p->nSample ){
+      Stat4Sample *pS = p->a + p->iGet;
+      if( pS->nRowid==0 ){
+        sqlite3_result_int64(context, pS->u.iRowid);
+      }else{
+        sqlite3_result_blob(context, pS->u.aRowid, pS->nRowid,
+                            SQLITE_TRANSIENT);
+      }
+    }
+  }else{
+    tRowcnt *aCnt = 0;
+
+    assert( p->iGet<p->nSample );
+    switch( eCall ){
+      case STAT_GET_NEQ:  aCnt = p->a[p->iGet].anEq; break;
+      case STAT_GET_NLT:  aCnt = p->a[p->iGet].anLt; break;
+      default: {
+        aCnt = p->a[p->iGet].anDLt; 
+        p->iGet++;
+        break;
+      }
+    }
+
+    if( IsStat3 ){
+      sqlite3_result_int64(context, (i64)aCnt[0]);
+    }else{
+      char *zRet = sqlite3MallocZero(p->nCol * 25);
+      if( zRet==0 ){
+        sqlite3_result_error_nomem(context);
+      }else{
+        int i;
+        char *z = zRet;
+        for(i=0; i<p->nCol; i++){
+          sqlite3_snprintf(24, z, "%llu ", (u64)aCnt[i]);
+          z += sqlite3Strlen30(z);
+        }
+        assert( z[0]=='\0' && z>zRet );
+        z[-1] = '\0';
+        sqlite3_result_text(context, zRet, -1, sqlite3_free);
+      }
+    }
+  }
+#endif /* SQLITE_ENABLE_STAT3_OR_STAT4 */
+#ifndef SQLITE_DEBUG
+  UNUSED_PARAMETER( argc );
+#endif
+}
+static const FuncDef statGetFuncdef = {
+  1+IsStat34,      /* nArg */
+  SQLITE_UTF8,     /* funcFlags */
+  0,               /* pUserData */
+  0,               /* pNext */
+  statGet,         /* xFunc */
+  0,               /* xStep */
+  0,               /* xFinalize */
+  "stat_get",      /* zName */
+  0,               /* pHash */
+  0                /* pDestructor */
+};
+
+static void callStatGet(Vdbe *v, int regStat4, int iParam, int regOut){
+  assert( regOut!=regStat4 && regOut!=regStat4+1 );
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  sqlite3VdbeAddOp2(v, OP_Integer, iParam, regStat4+1);
+#elif SQLITE_DEBUG
+  assert( iParam==STAT_GET_STAT1 );
+#else
+  UNUSED_PARAMETER( iParam );
+#endif
+  sqlite3VdbeAddOp3(v, OP_Function, 0, regStat4, regOut);
+  sqlite3VdbeChangeP4(v, -1, (char*)&statGetFuncdef, P4_FUNCDEF);
+  sqlite3VdbeChangeP5(v, 1 + IsStat34);
+}
 
 /*
 ** Generate code to do an analysis of all indices associated with
@@ -80673,41 +83612,31 @@ static void analyzeOneTable(
   Table *pTab,     /* Table whose indices are to be analyzed */
   Index *pOnlyIdx, /* If not NULL, only analyze this one index */
   int iStatCur,    /* Index of VdbeCursor that writes the sqlite_stat1 table */
-  int iMem         /* Available memory locations begin here */
+  int iMem,        /* Available memory locations begin here */
+  int iTab         /* Next available cursor */
 ){
   sqlite3 *db = pParse->db;    /* Database handle */
   Index *pIdx;                 /* An index to being analyzed */
   int iIdxCur;                 /* Cursor open on index being analyzed */
+  int iTabCur;                 /* Table cursor */
   Vdbe *v;                     /* The virtual machine being built up */
   int i;                       /* Loop counter */
-  int topOfLoop;               /* The top of the loop */
-  int endOfLoop;               /* The end of the loop */
   int jZeroRows = -1;          /* Jump from here if number of rows is zero */
   int iDb;                     /* Index of database containing pTab */
+  u8 needTableCnt = 1;         /* True to count the table */
+  int regNewRowid = iMem++;    /* Rowid for the inserted record */
+  int regStat4 = iMem++;       /* Register to hold Stat4Accum object */
+  int regChng = iMem++;        /* Index of changed index field */
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  int regRowid = iMem++;       /* Rowid argument passed to stat_push() */
+#endif
+  int regTemp = iMem++;        /* Temporary use register */
   int regTabname = iMem++;     /* Register containing table name */
   int regIdxname = iMem++;     /* Register containing index name */
-  int regStat1 = iMem++;       /* The stat column of sqlite_stat1 */
-#ifdef SQLITE_ENABLE_STAT3
-  int regNumEq = regStat1;     /* Number of instances.  Same as regStat1 */
-  int regNumLt = iMem++;       /* Number of keys less than regSample */
-  int regNumDLt = iMem++;      /* Number of distinct keys less than regSample */
-  int regSample = iMem++;      /* The next sample value */
-  int regRowid = regSample;    /* Rowid of a sample */
-  int regAccum = iMem++;       /* Register to hold Stat3Accum object */
-  int regLoop = iMem++;        /* Loop counter */
-  int regCount = iMem++;       /* Number of rows in the table or index */
-  int regTemp1 = iMem++;       /* Intermediate register */
-  int regTemp2 = iMem++;       /* Intermediate register */
-  int once = 1;                /* One-time initialization */
-  int shortJump = 0;           /* Instruction address */
-  int iTabCur = pParse->nTab++; /* Table cursor */
-#endif
-  int regCol = iMem++;         /* Content of a column in analyzed table */
-  int regRec = iMem++;         /* Register holding completed record */
-  int regTemp = iMem++;        /* Temporary use register */
-  int regNewRowid = iMem++;    /* Rowid for the inserted record */
-
+  int regStat1 = iMem++;       /* Value for the stat column of sqlite_stat1 */
+  int regPrev = iMem;          /* MUST BE LAST (see below) */
 
+  pParse->nMem = MAX(pParse->nMem, iMem);
   v = sqlite3GetVdbe(pParse);
   if( v==0 || NEVER(pTab==0) ){
     return;
@@ -80731,215 +83660,251 @@ static void analyzeOneTable(
   }
 #endif
 
-  /* Establish a read-lock on the table at the shared-cache level. */
+  /* Establish a read-lock on the table at the shared-cache level. 
+  ** Open a read-only cursor on the table. Also allocate a cursor number
+  ** to use for scanning indexes (iIdxCur). No index cursor is opened at
+  ** this time though.  */
   sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
-
-  iIdxCur = pParse->nTab++;
+  iTabCur = iTab++;
+  iIdxCur = iTab++;
+  pParse->nTab = MAX(pParse->nTab, iTab);
+  sqlite3OpenTable(pParse, iTabCur, iDb, pTab, OP_OpenRead);
   sqlite3VdbeAddOp4(v, OP_String8, 0, regTabname, 0, pTab->zName, 0);
+
   for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
-    int nCol;
-    KeyInfo *pKey;
-    int addrIfNot = 0;           /* address of OP_IfNot */
-    int *aChngAddr;              /* Array of jump instruction addresses */
+    int nCol;                     /* Number of columns indexed by pIdx */
+    int *aGotoChng;               /* Array of jump instruction addresses */
+    int addrRewind;               /* Address of "OP_Rewind iIdxCur" */
+    int addrGotoChng0;            /* Address of "Goto addr_chng_0" */
+    int addrNextRow;              /* Address of "next_row:" */
+    const char *zIdxName;         /* Name of the index */
 
     if( pOnlyIdx && pOnlyIdx!=pIdx ) continue;
+    if( pIdx->pPartIdxWhere==0 ) needTableCnt = 0;
     VdbeNoopComment((v, "Begin analysis of %s", pIdx->zName));
-    nCol = pIdx->nColumn;
-    aChngAddr = sqlite3DbMallocRaw(db, sizeof(int)*nCol);
-    if( aChngAddr==0 ) continue;
-    pKey = sqlite3IndexKeyinfo(pParse, pIdx);
-    if( iMem+1+(nCol*2)>pParse->nMem ){
-      pParse->nMem = iMem+1+(nCol*2);
-    }
-
-    /* Open a cursor to the index to be analyzed. */
-    assert( iDb==sqlite3SchemaToIndex(db, pIdx->pSchema) );
-    sqlite3VdbeAddOp4(v, OP_OpenRead, iIdxCur, pIdx->tnum, iDb,
-        (char *)pKey, P4_KEYINFO_HANDOFF);
-    VdbeComment((v, "%s", pIdx->zName));
+    nCol = pIdx->nKeyCol;
+    aGotoChng = sqlite3DbMallocRaw(db, sizeof(int)*(nCol+1));
+    if( aGotoChng==0 ) continue;
 
     /* Populate the register containing the index name. */
-    sqlite3VdbeAddOp4(v, OP_String8, 0, regIdxname, 0, pIdx->zName, 0);
-
-#ifdef SQLITE_ENABLE_STAT3
-    if( once ){
-      once = 0;
-      sqlite3OpenTable(pParse, iTabCur, iDb, pTab, OP_OpenRead);
+    if( IsPrimaryKeyIndex(pIdx) && !HasRowid(pTab) ){
+      zIdxName = pTab->zName;
+    }else{
+      zIdxName = pIdx->zName;
     }
-    sqlite3VdbeAddOp2(v, OP_Count, iIdxCur, regCount);
-    sqlite3VdbeAddOp2(v, OP_Integer, SQLITE_STAT3_SAMPLES, regTemp1);
-    sqlite3VdbeAddOp2(v, OP_Integer, 0, regNumEq);
-    sqlite3VdbeAddOp2(v, OP_Integer, 0, regNumLt);
-    sqlite3VdbeAddOp2(v, OP_Integer, -1, regNumDLt);
-    sqlite3VdbeAddOp3(v, OP_Null, 0, regSample, regAccum);
-    sqlite3VdbeAddOp4(v, OP_Function, 1, regCount, regAccum,
-                      (char*)&stat3InitFuncdef, P4_FUNCDEF);
-    sqlite3VdbeChangeP5(v, 2);
-#endif /* SQLITE_ENABLE_STAT3 */
+    sqlite3VdbeAddOp4(v, OP_String8, 0, regIdxname, 0, zIdxName, 0);
 
-    /* The block of memory cells initialized here is used as follows.
+    /*
+    ** Pseudo-code for loop that calls stat_push():
     **
-    **    iMem:                
-    **        The total number of rows in the table.
+    **   Rewind csr
+    **   if eof(csr) goto end_of_scan;
+    **   regChng = 0
+    **   goto chng_addr_0;
     **
-    **    iMem+1 .. iMem+nCol: 
-    **        Number of distinct entries in index considering the 
-    **        left-most N columns only, where N is between 1 and nCol, 
-    **        inclusive.
+    **  next_row:
+    **   regChng = 0
+    **   if( idx(0) != regPrev(0) ) goto chng_addr_0
+    **   regChng = 1
+    **   if( idx(1) != regPrev(1) ) goto chng_addr_1
+    **   ...
+    **   regChng = N
+    **   goto chng_addr_N
     **
-    **    iMem+nCol+1 .. Mem+2*nCol:  
-    **        Previous value of indexed columns, from left to right.
+    **  chng_addr_0:
+    **   regPrev(0) = idx(0)
+    **  chng_addr_1:
+    **   regPrev(1) = idx(1)
+    **  ...
     **
-    ** Cells iMem through iMem+nCol are initialized to 0. The others are 
-    ** initialized to contain an SQL NULL.
+    **  chng_addr_N:
+    **   regRowid = idx(rowid)
+    **   stat_push(P, regChng, regRowid)
+    **   Next csr
+    **   if !eof(csr) goto next_row;
+    **
+    **  end_of_scan:
     */
-    for(i=0; i<=nCol; i++){
-      sqlite3VdbeAddOp2(v, OP_Integer, 0, iMem+i);
-    }
-    for(i=0; i<nCol; i++){
-      sqlite3VdbeAddOp2(v, OP_Null, 0, iMem+nCol+i+1);
-    }
 
-    /* Start the analysis loop. This loop runs through all the entries in
-    ** the index b-tree.  */
-    endOfLoop = sqlite3VdbeMakeLabel(v);
-    sqlite3VdbeAddOp2(v, OP_Rewind, iIdxCur, endOfLoop);
-    topOfLoop = sqlite3VdbeCurrentAddr(v);
-    sqlite3VdbeAddOp2(v, OP_AddImm, iMem, 1);  /* Increment row counter */
+    /* Make sure there are enough memory cells allocated to accommodate 
+    ** the regPrev array and a trailing rowid (the rowid slot is required
+    ** when building a record to insert into the sample column of 
+    ** the sqlite_stat4 table.  */
+    pParse->nMem = MAX(pParse->nMem, regPrev+nCol);
 
-    for(i=0; i<nCol; i++){
-      CollSeq *pColl;
-      sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, i, regCol);
-      if( i==0 ){
-        /* Always record the very first row */
-        addrIfNot = sqlite3VdbeAddOp1(v, OP_IfNot, iMem+1);
-      }
-      assert( pIdx->azColl!=0 );
-      assert( pIdx->azColl[i]!=0 );
-      pColl = sqlite3LocateCollSeq(pParse, pIdx->azColl[i]);
-      aChngAddr[i] = sqlite3VdbeAddOp4(v, OP_Ne, regCol, 0, iMem+nCol+i+1,
-                                      (char*)pColl, P4_COLLSEQ);
-      sqlite3VdbeChangeP5(v, SQLITE_NULLEQ);
-      VdbeComment((v, "jump if column %d changed", i));
-#ifdef SQLITE_ENABLE_STAT3
-      if( i==0 ){
-        sqlite3VdbeAddOp2(v, OP_AddImm, regNumEq, 1);
-        VdbeComment((v, "incr repeat count"));
-      }
+    /* Open a read-only cursor on the index being analyzed. */
+    assert( iDb==sqlite3SchemaToIndex(db, pIdx->pSchema) );
+    sqlite3VdbeAddOp3(v, OP_OpenRead, iIdxCur, pIdx->tnum, iDb);
+    sqlite3VdbeSetP4KeyInfo(pParse, pIdx);
+    VdbeComment((v, "%s", pIdx->zName));
+
+    /* Invoke the stat_init() function. The arguments are:
+    ** 
+    **    (1) the number of columns in the index including the rowid,
+    **    (2) the number of rows in the index,
+    **
+    ** The second argument is only used for STAT3 and STAT4
+    */
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+    sqlite3VdbeAddOp2(v, OP_Count, iIdxCur, regStat4+2);
 #endif
-    }
-    sqlite3VdbeAddOp2(v, OP_Goto, 0, endOfLoop);
-    for(i=0; i<nCol; i++){
-      sqlite3VdbeJumpHere(v, aChngAddr[i]);  /* Set jump dest for the OP_Ne */
-      if( i==0 ){
-        sqlite3VdbeJumpHere(v, addrIfNot);   /* Jump dest for OP_IfNot */
-#ifdef SQLITE_ENABLE_STAT3
-        sqlite3VdbeAddOp4(v, OP_Function, 1, regNumEq, regTemp2,
-                          (char*)&stat3PushFuncdef, P4_FUNCDEF);
-        sqlite3VdbeChangeP5(v, 5);
-        sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, pIdx->nColumn, regRowid);
-        sqlite3VdbeAddOp3(v, OP_Add, regNumEq, regNumLt, regNumLt);
-        sqlite3VdbeAddOp2(v, OP_AddImm, regNumDLt, 1);
-        sqlite3VdbeAddOp2(v, OP_Integer, 1, regNumEq);
-#endif        
-      }
-      sqlite3VdbeAddOp2(v, OP_AddImm, iMem+i+1, 1);
-      sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, i, iMem+nCol+i+1);
-    }
-    sqlite3DbFree(db, aChngAddr);
+    sqlite3VdbeAddOp2(v, OP_Integer, nCol+1, regStat4+1);
+    sqlite3VdbeAddOp3(v, OP_Function, 0, regStat4+1, regStat4);
+    sqlite3VdbeChangeP4(v, -1, (char*)&statInitFuncdef, P4_FUNCDEF);
+    sqlite3VdbeChangeP5(v, 1+IsStat34);
 
-    /* Always jump here after updating the iMem+1...iMem+1+nCol counters */
-    sqlite3VdbeResolveLabel(v, endOfLoop);
-
-    sqlite3VdbeAddOp2(v, OP_Next, iIdxCur, topOfLoop);
-    sqlite3VdbeAddOp1(v, OP_Close, iIdxCur);
-#ifdef SQLITE_ENABLE_STAT3
-    sqlite3VdbeAddOp4(v, OP_Function, 1, regNumEq, regTemp2,
-                      (char*)&stat3PushFuncdef, P4_FUNCDEF);
-    sqlite3VdbeChangeP5(v, 5);
-    sqlite3VdbeAddOp2(v, OP_Integer, -1, regLoop);
-    shortJump = 
-    sqlite3VdbeAddOp2(v, OP_AddImm, regLoop, 1);
-    sqlite3VdbeAddOp4(v, OP_Function, 1, regAccum, regTemp1,
-                      (char*)&stat3GetFuncdef, P4_FUNCDEF);
-    sqlite3VdbeChangeP5(v, 2);
-    sqlite3VdbeAddOp1(v, OP_IsNull, regTemp1);
-    sqlite3VdbeAddOp3(v, OP_NotExists, iTabCur, shortJump, regTemp1);
-    sqlite3VdbeAddOp3(v, OP_Column, iTabCur, pIdx->aiColumn[0], regSample);
-    sqlite3ColumnDefault(v, pTab, pIdx->aiColumn[0], regSample);
-    sqlite3VdbeAddOp4(v, OP_Function, 1, regAccum, regNumEq,
-                      (char*)&stat3GetFuncdef, P4_FUNCDEF);
-    sqlite3VdbeChangeP5(v, 3);
-    sqlite3VdbeAddOp4(v, OP_Function, 1, regAccum, regNumLt,
-                      (char*)&stat3GetFuncdef, P4_FUNCDEF);
-    sqlite3VdbeChangeP5(v, 4);
-    sqlite3VdbeAddOp4(v, OP_Function, 1, regAccum, regNumDLt,
-                      (char*)&stat3GetFuncdef, P4_FUNCDEF);
-    sqlite3VdbeChangeP5(v, 5);
-    sqlite3VdbeAddOp4(v, OP_MakeRecord, regTabname, 6, regRec, "bbbbbb", 0);
-    sqlite3VdbeAddOp2(v, OP_NewRowid, iStatCur+1, regNewRowid);
-    sqlite3VdbeAddOp3(v, OP_Insert, iStatCur+1, regRec, regNewRowid);
-    sqlite3VdbeAddOp2(v, OP_Goto, 0, shortJump);
-    sqlite3VdbeJumpHere(v, shortJump+2);
-#endif        
-
-    /* Store the results in sqlite_stat1.
+    /* Implementation of the following:
     **
-    ** The result is a single row of the sqlite_stat1 table.  The first
-    ** two columns are the names of the table and index.  The third column
-    ** is a string composed of a list of integer statistics about the
-    ** index.  The first integer in the list is the total number of entries
-    ** in the index.  There is one additional integer in the list for each
-    ** column of the table.  This additional integer is a guess of how many
-    ** rows of the table the index will select.  If D is the count of distinct
-    ** values and K is the total number of rows, then the integer is computed
-    ** as:
+    **   Rewind csr
+    **   if eof(csr) goto end_of_scan;
+    **   regChng = 0
+    **   goto next_push_0;
     **
-    **        I = (K+D-1)/D
-    **
-    ** If K==0 then no entry is made into the sqlite_stat1 table.  
-    ** If K>0 then it is always the case the D>0 so division by zero
-    ** is never possible.
     */
-    sqlite3VdbeAddOp2(v, OP_SCopy, iMem, regStat1);
-    if( jZeroRows<0 ){
-      jZeroRows = sqlite3VdbeAddOp1(v, OP_IfNot, iMem);
-    }
+    addrRewind = sqlite3VdbeAddOp1(v, OP_Rewind, iIdxCur);
+    VdbeCoverage(v);
+    sqlite3VdbeAddOp2(v, OP_Integer, 0, regChng);
+    addrGotoChng0 = sqlite3VdbeAddOp0(v, OP_Goto);
+
+    /*
+    **  next_row:
+    **   regChng = 0
+    **   if( idx(0) != regPrev(0) ) goto chng_addr_0
+    **   regChng = 1
+    **   if( idx(1) != regPrev(1) ) goto chng_addr_1
+    **   ...
+    **   regChng = N
+    **   goto chng_addr_N
+    */
+    addrNextRow = sqlite3VdbeCurrentAddr(v);
     for(i=0; i<nCol; i++){
-      sqlite3VdbeAddOp4(v, OP_String8, 0, regTemp, 0, " ", 0);
-      sqlite3VdbeAddOp3(v, OP_Concat, regTemp, regStat1, regStat1);
-      sqlite3VdbeAddOp3(v, OP_Add, iMem, iMem+i+1, regTemp);
-      sqlite3VdbeAddOp2(v, OP_AddImm, regTemp, -1);
-      sqlite3VdbeAddOp3(v, OP_Divide, iMem+i+1, regTemp, regTemp);
-      sqlite3VdbeAddOp1(v, OP_ToInt, regTemp);
-      sqlite3VdbeAddOp3(v, OP_Concat, regTemp, regStat1, regStat1);
+      char *pColl = (char*)sqlite3LocateCollSeq(pParse, pIdx->azColl[i]);
+      sqlite3VdbeAddOp2(v, OP_Integer, i, regChng);
+      sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, i, regTemp);
+      aGotoChng[i] = 
+      sqlite3VdbeAddOp4(v, OP_Ne, regTemp, 0, regPrev+i, pColl, P4_COLLSEQ);
+      sqlite3VdbeChangeP5(v, SQLITE_NULLEQ);
+      VdbeCoverage(v);
     }
-    sqlite3VdbeAddOp4(v, OP_MakeRecord, regTabname, 3, regRec, "aaa", 0);
+    sqlite3VdbeAddOp2(v, OP_Integer, nCol, regChng);
+    aGotoChng[nCol] = sqlite3VdbeAddOp0(v, OP_Goto);
+
+    /*
+    **  chng_addr_0:
+    **   regPrev(0) = idx(0)
+    **  chng_addr_1:
+    **   regPrev(1) = idx(1)
+    **  ...
+    */
+    sqlite3VdbeJumpHere(v, addrGotoChng0);
+    for(i=0; i<nCol; i++){
+      sqlite3VdbeJumpHere(v, aGotoChng[i]);
+      sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, i, regPrev+i);
+    }
+
+    /*
+    **  chng_addr_N:
+    **   regRowid = idx(rowid)            // STAT34 only
+    **   stat_push(P, regChng, regRowid)  // 3rd parameter STAT34 only
+    **   Next csr
+    **   if !eof(csr) goto next_row;
+    */
+    sqlite3VdbeJumpHere(v, aGotoChng[nCol]);
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+    assert( regRowid==(regStat4+2) );
+    if( HasRowid(pTab) ){
+      sqlite3VdbeAddOp2(v, OP_IdxRowid, iIdxCur, regRowid);
+    }else{
+      Index *pPk = sqlite3PrimaryKeyIndex(pIdx->pTable);
+      int j, k, regKey;
+      regKey = sqlite3GetTempRange(pParse, pPk->nKeyCol);
+      for(j=0; j<pPk->nKeyCol; j++){
+        k = sqlite3ColumnOfIndex(pIdx, pPk->aiColumn[j]);
+        sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, k, regKey+j);
+        VdbeComment((v, "%s", pTab->aCol[pPk->aiColumn[j]].zName));
+      }
+      sqlite3VdbeAddOp3(v, OP_MakeRecord, regKey, pPk->nKeyCol, regRowid);
+      sqlite3ReleaseTempRange(pParse, regKey, pPk->nKeyCol);
+    }
+#endif
+    assert( regChng==(regStat4+1) );
+    sqlite3VdbeAddOp3(v, OP_Function, 1, regStat4, regTemp);
+    sqlite3VdbeChangeP4(v, -1, (char*)&statPushFuncdef, P4_FUNCDEF);
+    sqlite3VdbeChangeP5(v, 2+IsStat34);
+    sqlite3VdbeAddOp2(v, OP_Next, iIdxCur, addrNextRow); VdbeCoverage(v);
+
+    /* Add the entry to the stat1 table. */
+    callStatGet(v, regStat4, STAT_GET_STAT1, regStat1);
+    sqlite3VdbeAddOp4(v, OP_MakeRecord, regTabname, 3, regTemp, "aaa", 0);
     sqlite3VdbeAddOp2(v, OP_NewRowid, iStatCur, regNewRowid);
-    sqlite3VdbeAddOp3(v, OP_Insert, iStatCur, regRec, regNewRowid);
+    sqlite3VdbeAddOp3(v, OP_Insert, iStatCur, regTemp, regNewRowid);
     sqlite3VdbeChangeP5(v, OPFLAG_APPEND);
+
+    /* Add the entries to the stat3 or stat4 table. */
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+    {
+      int regEq = regStat1;
+      int regLt = regStat1+1;
+      int regDLt = regStat1+2;
+      int regSample = regStat1+3;
+      int regCol = regStat1+4;
+      int regSampleRowid = regCol + nCol;
+      int addrNext;
+      int addrIsNull;
+      u8 seekOp = HasRowid(pTab) ? OP_NotExists : OP_NotFound;
+
+      pParse->nMem = MAX(pParse->nMem, regCol+nCol+1);
+
+      addrNext = sqlite3VdbeCurrentAddr(v);
+      callStatGet(v, regStat4, STAT_GET_ROWID, regSampleRowid);
+      addrIsNull = sqlite3VdbeAddOp1(v, OP_IsNull, regSampleRowid);
+      VdbeCoverage(v);
+      callStatGet(v, regStat4, STAT_GET_NEQ, regEq);
+      callStatGet(v, regStat4, STAT_GET_NLT, regLt);
+      callStatGet(v, regStat4, STAT_GET_NDLT, regDLt);
+      sqlite3VdbeAddOp4Int(v, seekOp, iTabCur, addrNext, regSampleRowid, 0);
+      /* We know that the regSampleRowid row exists because it was read by
+      ** the previous loop.  Thus the not-found jump of seekOp will never
+      ** be taken */
+      VdbeCoverageNeverTaken(v);
+#ifdef SQLITE_ENABLE_STAT3
+      sqlite3ExprCodeGetColumnOfTable(v, pTab, iTabCur, 
+                                      pIdx->aiColumn[0], regSample);
+#else
+      for(i=0; i<nCol; i++){
+        i16 iCol = pIdx->aiColumn[i];
+        sqlite3ExprCodeGetColumnOfTable(v, pTab, iTabCur, iCol, regCol+i);
+      }
+      sqlite3VdbeAddOp3(v, OP_MakeRecord, regCol, nCol+1, regSample);
+#endif
+      sqlite3VdbeAddOp3(v, OP_MakeRecord, regTabname, 6, regTemp);
+      sqlite3VdbeAddOp2(v, OP_NewRowid, iStatCur+1, regNewRowid);
+      sqlite3VdbeAddOp3(v, OP_Insert, iStatCur+1, regTemp, regNewRowid);
+      sqlite3VdbeAddOp2(v, OP_Goto, 1, addrNext); /* P1==1 for end-of-loop */
+      sqlite3VdbeJumpHere(v, addrIsNull);
+    }
+#endif /* SQLITE_ENABLE_STAT3_OR_STAT4 */
+
+    /* End of analysis */
+    sqlite3VdbeJumpHere(v, addrRewind);
+    sqlite3DbFree(db, aGotoChng);
   }
 
-  /* If the table has no indices, create a single sqlite_stat1 entry
-  ** containing NULL as the index name and the row count as the content.
+
+  /* Create a single sqlite_stat1 entry containing NULL as the index
+  ** name and the row count as the content.
   */
-  if( pTab->pIndex==0 ){
-    sqlite3VdbeAddOp3(v, OP_OpenRead, iIdxCur, pTab->tnum, iDb);
+  if( pOnlyIdx==0 && needTableCnt ){
     VdbeComment((v, "%s", pTab->zName));
-    sqlite3VdbeAddOp2(v, OP_Count, iIdxCur, regStat1);
-    sqlite3VdbeAddOp1(v, OP_Close, iIdxCur);
-    jZeroRows = sqlite3VdbeAddOp1(v, OP_IfNot, regStat1);
-  }else{
+    sqlite3VdbeAddOp2(v, OP_Count, iTabCur, regStat1);
+    jZeroRows = sqlite3VdbeAddOp1(v, OP_IfNot, regStat1); VdbeCoverage(v);
+    sqlite3VdbeAddOp2(v, OP_Null, 0, regIdxname);
+    sqlite3VdbeAddOp4(v, OP_MakeRecord, regTabname, 3, regTemp, "aaa", 0);
+    sqlite3VdbeAddOp2(v, OP_NewRowid, iStatCur, regNewRowid);
+    sqlite3VdbeAddOp3(v, OP_Insert, iStatCur, regTemp, regNewRowid);
+    sqlite3VdbeChangeP5(v, OPFLAG_APPEND);
     sqlite3VdbeJumpHere(v, jZeroRows);
-    jZeroRows = sqlite3VdbeAddOp0(v, OP_Goto);
   }
-  sqlite3VdbeAddOp2(v, OP_Null, 0, regIdxname);
-  sqlite3VdbeAddOp4(v, OP_MakeRecord, regTabname, 3, regRec, "aaa", 0);
-  sqlite3VdbeAddOp2(v, OP_NewRowid, iStatCur, regNewRowid);
-  sqlite3VdbeAddOp3(v, OP_Insert, iStatCur, regRec, regNewRowid);
-  sqlite3VdbeChangeP5(v, OPFLAG_APPEND);
-  if( pParse->nMem<regRec ) pParse->nMem = regRec;
-  sqlite3VdbeJumpHere(v, jZeroRows);
 }
 
 
@@ -80963,16 +83928,18 @@ static void analyzeDatabase(Parse *pParse, int iDb){
   HashElem *k;
   int iStatCur;
   int iMem;
+  int iTab;
 
   sqlite3BeginWriteOperation(pParse, 0, iDb);
   iStatCur = pParse->nTab;
   pParse->nTab += 3;
   openStatTable(pParse, iDb, iStatCur, 0, 0);
   iMem = pParse->nMem+1;
+  iTab = pParse->nTab;
   assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
   for(k=sqliteHashFirst(&pSchema->tblHash); k; k=sqliteHashNext(k)){
     Table *pTab = (Table*)sqliteHashData(k);
-    analyzeOneTable(pParse, pTab, 0, iStatCur, iMem);
+    analyzeOneTable(pParse, pTab, 0, iStatCur, iMem, iTab);
   }
   loadAnalysis(pParse, iDb);
 }
@@ -80997,7 +83964,7 @@ static void analyzeTable(Parse *pParse, Table *pTab, Index *pOnlyIdx){
   }else{
     openStatTable(pParse, iDb, iStatCur, pTab->zName, "tbl");
   }
-  analyzeOneTable(pParse, pTab, pOnlyIdx, iStatCur, pParse->nMem+1);
+  analyzeOneTable(pParse, pTab, pOnlyIdx, iStatCur,pParse->nMem+1,pParse->nTab);
   loadAnalysis(pParse, iDb);
 }
 
@@ -81080,6 +84047,63 @@ struct analysisInfo {
   const char *zDatabase;
 };
 
+/*
+** The first argument points to a nul-terminated string containing a
+** list of space separated integers. Read the first nOut of these into
+** the array aOut[].
+*/
+static void decodeIntArray(
+  char *zIntArray,       /* String containing int array to decode */
+  int nOut,              /* Number of slots in aOut[] */
+  tRowcnt *aOut,         /* Store integers here */
+  LogEst *aLog,          /* Or, if aOut==0, here */
+  Index *pIndex          /* Handle extra flags for this index, if not NULL */
+){
+  char *z = zIntArray;
+  int c;
+  int i;
+  tRowcnt v;
+
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  if( z==0 ) z = "";
+#else
+  if( NEVER(z==0) ) z = "";
+#endif
+  for(i=0; *z && i<nOut; i++){
+    v = 0;
+    while( (c=z[0])>='0' && c<='9' ){
+      v = v*10 + c - '0';
+      z++;
+    }
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+    if( aOut ){
+      aOut[i] = v;
+    }else
+#else
+    assert( aOut==0 );
+    UNUSED_PARAMETER(aOut);
+#endif
+    {
+      aLog[i] = sqlite3LogEst(v);
+    }
+    if( *z==' ' ) z++;
+  }
+#ifndef SQLITE_ENABLE_STAT3_OR_STAT4
+  assert( pIndex!=0 );
+#else
+  if( pIndex )
+#endif
+  {
+    if( strcmp(z, "unordered")==0 ){
+      pIndex->bUnordered = 1;
+    }else if( sqlite3_strglob("sz=[0-9]*", z)==0 ){
+      int v32 = 0;
+      sqlite3GetInt32(z+3, &v32);
+      pIndex->szIdxRow = sqlite3LogEst(v32);
+    }
+  }
+}
+
 /*
 ** This callback is invoked once for each index when reading the
 ** sqlite_stat1 table.  
@@ -81095,8 +84119,6 @@ static int analysisLoader(void *pData, int argc, char **argv, char **NotUsed){
   analysisInfo *pInfo = (analysisInfo*)pData;
   Index *pIndex;
   Table *pTable;
-  int i, c, n;
-  tRowcnt v;
   const char *z;
 
   assert( argc==3 );
@@ -81109,28 +84131,25 @@ static int analysisLoader(void *pData, int argc, char **argv, char **NotUsed){
   if( pTable==0 ){
     return 0;
   }
-  if( argv[1] ){
-    pIndex = sqlite3FindIndex(pInfo->db, argv[1], pInfo->zDatabase);
-  }else{
+  if( argv[1]==0 ){
     pIndex = 0;
+  }else if( sqlite3_stricmp(argv[0],argv[1])==0 ){
+    pIndex = sqlite3PrimaryKeyIndex(pTable);
+  }else{
+    pIndex = sqlite3FindIndex(pInfo->db, argv[1], pInfo->zDatabase);
   }
-  n = pIndex ? pIndex->nColumn : 0;
   z = argv[2];
-  for(i=0; *z && i<=n; i++){
-    v = 0;
-    while( (c=z[0])>='0' && c<='9' ){
-      v = v*10 + c - '0';
-      z++;
-    }
-    if( i==0 ) pTable->nRowEst = v;
-    if( pIndex==0 ) break;
-    pIndex->aiRowEst[i] = v;
-    if( *z==' ' ) z++;
-    if( strcmp(z, "unordered")==0 ){
-      pIndex->bUnordered = 1;
-      break;
-    }
+
+  if( pIndex ){
+    decodeIntArray((char*)z, pIndex->nKeyCol+1, 0, pIndex->aiRowLogEst, pIndex);
+    if( pIndex->pPartIdxWhere==0 ) pTable->nRowLogEst = pIndex->aiRowLogEst[0];
+  }else{
+    Index fakeIdx;
+    fakeIdx.szIdxRow = pTable->szTabRow;
+    decodeIntArray((char*)z, 1, 0, &pTable->nRowLogEst, &fakeIdx);
+    pTable->szTabRow = fakeIdx.szIdxRow;
   }
+
   return 0;
 }
 
@@ -81139,14 +84158,12 @@ static int analysisLoader(void *pData, int argc, char **argv, char **NotUsed){
 ** and its contents.
 */
 SQLITE_PRIVATE void sqlite3DeleteIndexSamples(sqlite3 *db, Index *pIdx){
-#ifdef SQLITE_ENABLE_STAT3
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
   if( pIdx->aSample ){
     int j;
     for(j=0; j<pIdx->nSample; j++){
       IndexSample *p = &pIdx->aSample[j];
-      if( p->eType==SQLITE_TEXT || p->eType==SQLITE_BLOB ){
-        sqlite3DbFree(db, p->u.z);
-      }
+      sqlite3DbFree(db, p->p);
     }
     sqlite3DbFree(db, pIdx->aSample);
   }
@@ -81157,31 +84174,92 @@ SQLITE_PRIVATE void sqlite3DeleteIndexSamples(sqlite3 *db, Index *pIdx){
 #else
   UNUSED_PARAMETER(db);
   UNUSED_PARAMETER(pIdx);
-#endif
+#endif /* SQLITE_ENABLE_STAT3_OR_STAT4 */
 }
 
-#ifdef SQLITE_ENABLE_STAT3
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
 /*
-** Load content from the sqlite_stat3 table into the Index.aSample[]
-** arrays of all indices.
+** Populate the pIdx->aAvgEq[] array based on the samples currently
+** stored in pIdx->aSample[]. 
 */
-static int loadStat3(sqlite3 *db, const char *zDb){
+static void initAvgEq(Index *pIdx){
+  if( pIdx ){
+    IndexSample *aSample = pIdx->aSample;
+    IndexSample *pFinal = &aSample[pIdx->nSample-1];
+    int iCol;
+    for(iCol=0; iCol<pIdx->nKeyCol; iCol++){
+      int i;                    /* Used to iterate through samples */
+      tRowcnt sumEq = 0;        /* Sum of the nEq values */
+      tRowcnt nSum = 0;         /* Number of terms contributing to sumEq */
+      tRowcnt avgEq = 0;
+      tRowcnt nDLt = pFinal->anDLt[iCol];
+
+      /* Set nSum to the number of distinct (iCol+1) field prefixes that
+      ** occur in the stat4 table for this index before pFinal. Set
+      ** sumEq to the sum of the nEq values for column iCol for the same
+      ** set (adding the value only once where there exist dupicate 
+      ** prefixes).  */
+      for(i=0; i<(pIdx->nSample-1); i++){
+        if( aSample[i].anDLt[iCol]!=aSample[i+1].anDLt[iCol] ){
+          sumEq += aSample[i].anEq[iCol];
+          nSum++;
+        }
+      }
+      if( nDLt>nSum ){
+        avgEq = (pFinal->anLt[iCol] - sumEq)/(nDLt - nSum);
+      }
+      if( avgEq==0 ) avgEq = 1;
+      pIdx->aAvgEq[iCol] = avgEq;
+      if( pIdx->nSampleCol==1 ) break;
+    }
+  }
+}
+
+/*
+** Look up an index by name.  Or, if the name of a WITHOUT ROWID table
+** is supplied instead, find the PRIMARY KEY index for that table.
+*/
+static Index *findIndexOrPrimaryKey(
+  sqlite3 *db,
+  const char *zName,
+  const char *zDb
+){
+  Index *pIdx = sqlite3FindIndex(db, zName, zDb);
+  if( pIdx==0 ){
+    Table *pTab = sqlite3FindTable(db, zName, zDb);
+    if( pTab && !HasRowid(pTab) ) pIdx = sqlite3PrimaryKeyIndex(pTab);
+  }
+  return pIdx;
+}
+
+/*
+** Load the content from either the sqlite_stat4 or sqlite_stat3 table 
+** into the relevant Index.aSample[] arrays.
+**
+** Arguments zSql1 and zSql2 must point to SQL statements that return
+** data equivalent to the following (statements are different for stat3,
+** see the caller of this function for details):
+**
+**    zSql1: SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx
+**    zSql2: SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4
+**
+** where %Q is replaced with the database name before the SQL is executed.
+*/
+static int loadStatTbl(
+  sqlite3 *db,                  /* Database handle */
+  int bStat3,                   /* Assume single column records only */
+  const char *zSql1,            /* SQL statement 1 (see above) */
+  const char *zSql2,            /* SQL statement 2 (see above) */
+  const char *zDb               /* Database name (e.g. "main") */
+){
   int rc;                       /* Result codes from subroutines */
   sqlite3_stmt *pStmt = 0;      /* An SQL statement being run */
   char *zSql;                   /* Text of the SQL statement */
   Index *pPrevIdx = 0;          /* Previous index in the loop */
-  int idx = 0;                  /* slot in pIdx->aSample[] for next sample */
-  int eType;                    /* Datatype of a sample */
   IndexSample *pSample;         /* A slot in pIdx->aSample[] */
 
   assert( db->lookaside.bEnabled==0 );
-  if( !sqlite3FindTable(db, "sqlite_stat3", zDb) ){
-    return SQLITE_OK;
-  }
-
-  zSql = sqlite3MPrintf(db, 
-      "SELECT idx,count(*) FROM %Q.sqlite_stat3"
-      " GROUP BY idx", zDb);
+  zSql = sqlite3MPrintf(db, zSql1, zDb);
   if( !zSql ){
     return SQLITE_NOMEM;
   }
@@ -81190,30 +84268,51 @@ static int loadStat3(sqlite3 *db, const char *zDb){
   if( rc ) return rc;
 
   while( sqlite3_step(pStmt)==SQLITE_ROW ){
+    int nIdxCol = 1;              /* Number of columns in stat4 records */
+    int nAvgCol = 1;              /* Number of entries in Index.aAvgEq */
+
     char *zIndex;   /* Index name */
     Index *pIdx;    /* Pointer to the index object */
     int nSample;    /* Number of samples */
+    int nByte;      /* Bytes of space required */
+    int i;          /* Bytes of space required */
+    tRowcnt *pSpace;
 
     zIndex = (char *)sqlite3_column_text(pStmt, 0);
     if( zIndex==0 ) continue;
     nSample = sqlite3_column_int(pStmt, 1);
-    pIdx = sqlite3FindIndex(db, zIndex, zDb);
-    if( pIdx==0 ) continue;
-    assert( pIdx->nSample==0 );
-    pIdx->nSample = nSample;
-    pIdx->aSample = sqlite3DbMallocZero(db, nSample*sizeof(IndexSample));
-    pIdx->avgEq = pIdx->aiRowEst[1];
+    pIdx = findIndexOrPrimaryKey(db, zIndex, zDb);
+    assert( pIdx==0 || bStat3 || pIdx->nSample==0 );
+    /* Index.nSample is non-zero at this point if data has already been
+    ** loaded from the stat4 table. In this case ignore stat3 data.  */
+    if( pIdx==0 || pIdx->nSample ) continue;
+    if( bStat3==0 ){
+      nIdxCol = pIdx->nKeyCol+1;
+      nAvgCol = pIdx->nKeyCol;
+    }
+    pIdx->nSampleCol = nIdxCol;
+    nByte = sizeof(IndexSample) * nSample;
+    nByte += sizeof(tRowcnt) * nIdxCol * 3 * nSample;
+    nByte += nAvgCol * sizeof(tRowcnt);     /* Space for Index.aAvgEq[] */
+
+    pIdx->aSample = sqlite3DbMallocZero(db, nByte);
     if( pIdx->aSample==0 ){
-      db->mallocFailed = 1;
       sqlite3_finalize(pStmt);
       return SQLITE_NOMEM;
     }
+    pSpace = (tRowcnt*)&pIdx->aSample[nSample];
+    pIdx->aAvgEq = pSpace; pSpace += nAvgCol;
+    for(i=0; i<nSample; i++){
+      pIdx->aSample[i].anEq = pSpace; pSpace += nIdxCol;
+      pIdx->aSample[i].anLt = pSpace; pSpace += nIdxCol;
+      pIdx->aSample[i].anDLt = pSpace; pSpace += nIdxCol;
+    }
+    assert( ((u8*)pSpace)-nByte==(u8*)(pIdx->aSample) );
   }
   rc = sqlite3_finalize(pStmt);
   if( rc ) return rc;
 
-  zSql = sqlite3MPrintf(db, 
-      "SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat3", zDb);
+  zSql = sqlite3MPrintf(db, zSql2, zDb);
   if( !zSql ){
     return SQLITE_NOMEM;
   }
@@ -81222,86 +84321,88 @@ static int loadStat3(sqlite3 *db, const char *zDb){
   if( rc ) return rc;
 
   while( sqlite3_step(pStmt)==SQLITE_ROW ){
-    char *zIndex;   /* Index name */
-    Index *pIdx;    /* Pointer to the index object */
-    int i;          /* Loop counter */
-    tRowcnt sumEq;  /* Sum of the nEq values */
+    char *zIndex;                 /* Index name */
+    Index *pIdx;                  /* Pointer to the index object */
+    int nCol = 1;                 /* Number of columns in index */
 
     zIndex = (char *)sqlite3_column_text(pStmt, 0);
     if( zIndex==0 ) continue;
-    pIdx = sqlite3FindIndex(db, zIndex, zDb);
+    pIdx = findIndexOrPrimaryKey(db, zIndex, zDb);
     if( pIdx==0 ) continue;
-    if( pIdx==pPrevIdx ){
-      idx++;
-    }else{
+    /* This next condition is true if data has already been loaded from 
+    ** the sqlite_stat4 table. In this case ignore stat3 data.  */
+    nCol = pIdx->nSampleCol;
+    if( bStat3 && nCol>1 ) continue;
+    if( pIdx!=pPrevIdx ){
+      initAvgEq(pPrevIdx);
       pPrevIdx = pIdx;
-      idx = 0;
     }
-    assert( idx<pIdx->nSample );
-    pSample = &pIdx->aSample[idx];
-    pSample->nEq = (tRowcnt)sqlite3_column_int64(pStmt, 1);
-    pSample->nLt = (tRowcnt)sqlite3_column_int64(pStmt, 2);
-    pSample->nDLt = (tRowcnt)sqlite3_column_int64(pStmt, 3);
-    if( idx==pIdx->nSample-1 ){
-      if( pSample->nDLt>0 ){
-        for(i=0, sumEq=0; i<=idx-1; i++) sumEq += pIdx->aSample[i].nEq;
-        pIdx->avgEq = (pSample->nLt - sumEq)/pSample->nDLt;
-      }
-      if( pIdx->avgEq<=0 ) pIdx->avgEq = 1;
-    }
-    eType = sqlite3_column_type(pStmt, 4);
-    pSample->eType = (u8)eType;
-    switch( eType ){
-      case SQLITE_INTEGER: {
-        pSample->u.i = sqlite3_column_int64(pStmt, 4);
-        break;
-      }
-      case SQLITE_FLOAT: {
-        pSample->u.r = sqlite3_column_double(pStmt, 4);
-        break;
-      }
-      case SQLITE_NULL: {
-        break;
-      }
-      default: assert( eType==SQLITE_TEXT || eType==SQLITE_BLOB ); {
-        const char *z = (const char *)(
-              (eType==SQLITE_BLOB) ?
-              sqlite3_column_blob(pStmt, 4):
-              sqlite3_column_text(pStmt, 4)
-           );
-        int n = z ? sqlite3_column_bytes(pStmt, 4) : 0;
-        pSample->nByte = n;
-        if( n < 1){
-          pSample->u.z = 0;
-        }else{
-          pSample->u.z = sqlite3DbMallocRaw(db, n);
-          if( pSample->u.z==0 ){
-            db->mallocFailed = 1;
-            sqlite3_finalize(pStmt);
-            return SQLITE_NOMEM;
-          }
-          memcpy(pSample->u.z, z, n);
-        }
-      }
+    pSample = &pIdx->aSample[pIdx->nSample];
+    decodeIntArray((char*)sqlite3_column_text(pStmt,1),nCol,pSample->anEq,0,0);
+    decodeIntArray((char*)sqlite3_column_text(pStmt,2),nCol,pSample->anLt,0,0);
+    decodeIntArray((char*)sqlite3_column_text(pStmt,3),nCol,pSample->anDLt,0,0);
+
+    /* Take a copy of the sample. Add two 0x00 bytes the end of the buffer.
+    ** This is in case the sample record is corrupted. In that case, the
+    ** sqlite3VdbeRecordCompare() may read up to two varints past the
+    ** end of the allocated buffer before it realizes it is dealing with
+    ** a corrupt record. Adding the two 0x00 bytes prevents this from causing
+    ** a buffer overread.  */
+    pSample->n = sqlite3_column_bytes(pStmt, 4);
+    pSample->p = sqlite3DbMallocZero(db, pSample->n + 2);
+    if( pSample->p==0 ){
+      sqlite3_finalize(pStmt);
+      return SQLITE_NOMEM;
     }
+    memcpy(pSample->p, sqlite3_column_blob(pStmt, 4), pSample->n);
+    pIdx->nSample++;
   }
-  return sqlite3_finalize(pStmt);
+  rc = sqlite3_finalize(pStmt);
+  if( rc==SQLITE_OK ) initAvgEq(pPrevIdx);
+  return rc;
 }
-#endif /* SQLITE_ENABLE_STAT3 */
 
 /*
-** Load the content of the sqlite_stat1 and sqlite_stat3 tables. The
+** Load content from the sqlite_stat4 and sqlite_stat3 tables into 
+** the Index.aSample[] arrays of all indices.
+*/
+static int loadStat4(sqlite3 *db, const char *zDb){
+  int rc = SQLITE_OK;             /* Result codes from subroutines */
+
+  assert( db->lookaside.bEnabled==0 );
+  if( sqlite3FindTable(db, "sqlite_stat4", zDb) ){
+    rc = loadStatTbl(db, 0,
+      "SELECT idx,count(*) FROM %Q.sqlite_stat4 GROUP BY idx", 
+      "SELECT idx,neq,nlt,ndlt,sample FROM %Q.sqlite_stat4",
+      zDb
+    );
+  }
+
+  if( rc==SQLITE_OK && sqlite3FindTable(db, "sqlite_stat3", zDb) ){
+    rc = loadStatTbl(db, 1,
+      "SELECT idx,count(*) FROM %Q.sqlite_stat3 GROUP BY idx", 
+      "SELECT idx,neq,nlt,ndlt,sqlite_record(sample) FROM %Q.sqlite_stat3",
+      zDb
+    );
+  }
+
+  return rc;
+}
+#endif /* SQLITE_ENABLE_STAT3_OR_STAT4 */
+
+/*
+** Load the content of the sqlite_stat1 and sqlite_stat3/4 tables. The
 ** contents of sqlite_stat1 are used to populate the Index.aiRowEst[]
-** arrays. The contents of sqlite_stat3 are used to populate the
+** arrays. The contents of sqlite_stat3/4 are used to populate the
 ** Index.aSample[] arrays.
 **
 ** If the sqlite_stat1 table is not present in the database, SQLITE_ERROR
-** is returned. In this case, even if SQLITE_ENABLE_STAT3 was defined 
-** during compilation and the sqlite_stat3 table is present, no data is 
+** is returned. In this case, even if SQLITE_ENABLE_STAT3/4 was defined 
+** during compilation and the sqlite_stat3/4 table is present, no data is 
 ** read from it.
 **
-** If SQLITE_ENABLE_STAT3 was defined during compilation and the 
-** sqlite_stat3 table is not present in the database, SQLITE_ERROR is
+** If SQLITE_ENABLE_STAT3/4 was defined during compilation and the 
+** sqlite_stat4 table is not present in the database, SQLITE_ERROR is
 ** returned. However, in this case, data is read from the sqlite_stat1
 ** table (if it is present) before returning.
 **
@@ -81323,7 +84424,7 @@ SQLITE_PRIVATE int sqlite3AnalysisLoad(sqlite3 *db, int iDb){
   for(i=sqliteHashFirst(&db->aDb[iDb].pSchema->idxHash);i;i=sqliteHashNext(i)){
     Index *pIdx = sqliteHashData(i);
     sqlite3DefaultRowEst(pIdx);
-#ifdef SQLITE_ENABLE_STAT3
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
     sqlite3DeleteIndexSamples(db, pIdx);
     pIdx->aSample = 0;
 #endif
@@ -81347,12 +84448,12 @@ SQLITE_PRIVATE int sqlite3AnalysisLoad(sqlite3 *db, int iDb){
   }
 
 
-  /* Load the statistics from the sqlite_stat3 table. */
-#ifdef SQLITE_ENABLE_STAT3
+  /* Load the statistics from the sqlite_stat4 table. */
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
   if( rc==SQLITE_OK ){
     int lookasideEnabled = db->lookaside.bEnabled;
     db->lookaside.bEnabled = 0;
-    rc = loadStat3(db, sInfo.zDatabase);
+    rc = loadStat4(db, sInfo.zDatabase);
     db->lookaside.bEnabled = lookasideEnabled;
   }
 #endif
@@ -81407,10 +84508,6 @@ static int resolveAttachExpr(NameContext *pName, Expr *pExpr)
   if( pExpr ){
     if( pExpr->op!=TK_ID ){
       rc = sqlite3ResolveExprNames(pName, pExpr);
-      if( rc==SQLITE_OK && !sqlite3ExprIsConstant(pExpr) ){
-        sqlite3ErrorMsg(pName->pParse, "invalid name: \"%s\"", pExpr->u.zToken);
-        return SQLITE_ERROR;
-      }
     }else{
       pExpr->op = TK_STRING;
     }
@@ -81527,6 +84624,9 @@ static void attachFunc(
     sqlite3PagerLockingMode(pPager, db->dfltLockMode);
     sqlite3BtreeSecureDelete(aNew->pBt,
                              sqlite3BtreeSecureDelete(db->aDb[0].pBt,-1) );
+#ifndef SQLITE_OMIT_PAGER_PRAGMAS
+    sqlite3BtreeSetPagerFlags(aNew->pBt, 3 | (db->flags & PAGER_FLAGS_MASK));
+#endif
   }
   aNew->safety_level = 3;
   aNew->zName = sqlite3DbStrDup(db, zName);
@@ -81745,8 +84845,7 @@ static void codeAttach(
 SQLITE_PRIVATE void sqlite3Detach(Parse *pParse, Expr *pDbname){
   static const FuncDef detach_func = {
     1,                /* nArg */
-    SQLITE_UTF8,      /* iPrefEnc */
-    0,                /* flags */
+    SQLITE_UTF8,      /* funcFlags */
     0,                /* pUserData */
     0,                /* pNext */
     detachFunc,       /* xFunc */
@@ -81767,8 +84866,7 @@ SQLITE_PRIVATE void sqlite3Detach(Parse *pParse, Expr *pDbname){
 SQLITE_PRIVATE void sqlite3Attach(Parse *pParse, Expr *p, Expr *pDbname, Expr *pKey){
   static const FuncDef attach_func = {
     3,                /* nArg */
-    SQLITE_UTF8,      /* iPrefEnc */
-    0,                /* flags */
+    SQLITE_UTF8,      /* funcFlags */
     0,                /* pUserData */
     0,                /* pNext */
     attachFunc,       /* xFunc */
@@ -81785,11 +84883,8 @@ SQLITE_PRIVATE void sqlite3Attach(Parse *pParse, Expr *p, Expr *pDbname, Expr *p
 /*
 ** Initialize a DbFixer structure.  This routine must be called prior
 ** to passing the structure to one of the sqliteFixAAAA() routines below.
-**
-** The return value indicates whether or not fixation is required.  TRUE
-** means we do need to fix the database references, FALSE means we do not.
 */
-SQLITE_PRIVATE int sqlite3FixInit(
+SQLITE_PRIVATE void sqlite3FixInit(
   DbFixer *pFix,      /* The fixer to be initialized */
   Parse *pParse,      /* Error messages will be written here */
   int iDb,            /* This is the database that must be used */
@@ -81798,7 +84893,6 @@ SQLITE_PRIVATE int sqlite3FixInit(
 ){
   sqlite3 *db;
 
-  if( NEVER(iDb<0) || iDb==1 ) return 0;
   db = pParse->db;
   assert( db->nDb>iDb );
   pFix->pParse = pParse;
@@ -81806,7 +84900,7 @@ SQLITE_PRIVATE int sqlite3FixInit(
   pFix->pSchema = db->aDb[iDb].pSchema;
   pFix->zType = zType;
   pFix->pName = pName;
-  return 1;
+  pFix->bVarOnly = (iDb==1);
 }
 
 /*
@@ -81834,15 +84928,17 @@ SQLITE_PRIVATE int sqlite3FixSrcList(
   if( NEVER(pList==0) ) return 0;
   zDb = pFix->zDb;
   for(i=0, pItem=pList->a; i<pList->nSrc; i++, pItem++){
-    if( pItem->zDatabase && sqlite3StrICmp(pItem->zDatabase, zDb) ){
-      sqlite3ErrorMsg(pFix->pParse,
-         "%s %T cannot reference objects in database %s",
-         pFix->zType, pFix->pName, pItem->zDatabase);
-      return 1;
+    if( pFix->bVarOnly==0 ){
+      if( pItem->zDatabase && sqlite3StrICmp(pItem->zDatabase, zDb) ){
+        sqlite3ErrorMsg(pFix->pParse,
+            "%s %T cannot reference objects in database %s",
+            pFix->zType, pFix->pName, pItem->zDatabase);
+        return 1;
+      }
+      sqlite3DbFree(pFix->pParse->db, pItem->zDatabase);
+      pItem->zDatabase = 0;
+      pItem->pSchema = pFix->pSchema;
     }
-    sqlite3DbFree(pFix->pParse->db, pItem->zDatabase);
-    pItem->zDatabase = 0;
-    pItem->pSchema = pFix->pSchema;
 #if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_TRIGGER)
     if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1;
     if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1;
@@ -81865,9 +84961,21 @@ SQLITE_PRIVATE int sqlite3FixSelect(
     if( sqlite3FixExpr(pFix, pSelect->pWhere) ){
       return 1;
     }
+    if( sqlite3FixExprList(pFix, pSelect->pGroupBy) ){
+      return 1;
+    }
     if( sqlite3FixExpr(pFix, pSelect->pHaving) ){
       return 1;
     }
+    if( sqlite3FixExprList(pFix, pSelect->pOrderBy) ){
+      return 1;
+    }
+    if( sqlite3FixExpr(pFix, pSelect->pLimit) ){
+      return 1;
+    }
+    if( sqlite3FixExpr(pFix, pSelect->pOffset) ){
+      return 1;
+    }
     pSelect = pSelect->pPrior;
   }
   return 0;
@@ -81877,7 +84985,15 @@ SQLITE_PRIVATE int sqlite3FixExpr(
   Expr *pExpr        /* The expression to be fixed to one database */
 ){
   while( pExpr ){
-    if( ExprHasAnyProperty(pExpr, EP_TokenOnly) ) break;
+    if( pExpr->op==TK_VARIABLE ){
+      if( pFix->pParse->db->init.busy ){
+        pExpr->op = TK_NULL;
+      }else{
+        sqlite3ErrorMsg(pFix->pParse, "%s cannot use variables", pFix->zType);
+        return 1;
+      }
+    }
+    if( ExprHasProperty(pExpr, EP_TokenOnly) ) break;
     if( ExprHasProperty(pExpr, EP_xIsSelect) ){
       if( sqlite3FixSelect(pFix, pExpr->x.pSelect) ) return 1;
     }else{
@@ -82321,6 +85437,7 @@ SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){
   assert( !pParse->isMultiWrite 
        || sqlite3VdbeAssertMayAbort(v, pParse->mayAbort));
   if( v ){
+    while( sqlite3VdbeDeletePriorOpcode(v, OP_Close) ){}
     sqlite3VdbeAddOp0(v, OP_Halt);
 
     /* The cookie mask contains one bit for each database file open.
@@ -82329,30 +85446,29 @@ SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){
     ** transaction on each used database and to verify the schema cookie
     ** on each used database.
     */
-    if( pParse->cookieGoto>0 ){
+    if( db->mallocFailed==0 && (pParse->cookieMask || pParse->pConstExpr) ){
       yDbMask mask;
-      int iDb;
-      sqlite3VdbeJumpHere(v, pParse->cookieGoto-1);
+      int iDb, i;
+      assert( sqlite3VdbeGetOp(v, 0)->opcode==OP_Init );
+      sqlite3VdbeJumpHere(v, 0);
       for(iDb=0, mask=1; iDb<db->nDb; mask<<=1, iDb++){
         if( (mask & pParse->cookieMask)==0 ) continue;
         sqlite3VdbeUsesBtree(v, iDb);
-        sqlite3VdbeAddOp2(v,OP_Transaction, iDb, (mask & pParse->writeMask)!=0);
-        if( db->init.busy==0 ){
-          assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
-          sqlite3VdbeAddOp3(v, OP_VerifyCookie,
-                            iDb, pParse->cookieValue[iDb],
-                            db->aDb[iDb].pSchema->iGeneration);
-        }
+        sqlite3VdbeAddOp4Int(v,
+          OP_Transaction,                    /* Opcode */
+          iDb,                               /* P1 */
+          (mask & pParse->writeMask)!=0,     /* P2 */
+          pParse->cookieValue[iDb],          /* P3 */
+          db->aDb[iDb].pSchema->iGeneration  /* P4 */
+        );
+        if( db->init.busy==0 ) sqlite3VdbeChangeP5(v, 1);
       }
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-      {
-        int i;
-        for(i=0; i<pParse->nVtabLock; i++){
-          char *vtab = (char *)sqlite3GetVTable(db, pParse->apVtabLock[i]);
-          sqlite3VdbeAddOp4(v, OP_VBegin, 0, 0, 0, vtab, P4_VTAB);
-        }
-        pParse->nVtabLock = 0;
+      for(i=0; i<pParse->nVtabLock; i++){
+        char *vtab = (char *)sqlite3GetVTable(db, pParse->apVtabLock[i]);
+        sqlite3VdbeAddOp4(v, OP_VBegin, 0, 0, 0, vtab, P4_VTAB);
       }
+      pParse->nVtabLock = 0;
 #endif
 
       /* Once all the cookies have been verified and transactions opened, 
@@ -82365,8 +85481,17 @@ SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){
       */
       sqlite3AutoincrementBegin(pParse);
 
+      /* Code constant expressions that where factored out of inner loops */
+      if( pParse->pConstExpr ){
+        ExprList *pEL = pParse->pConstExpr;
+        pParse->okConstFactor = 0;
+        for(i=0; i<pEL->nExpr; i++){
+          sqlite3ExprCode(pParse, pEL->a[i].pExpr, pEL->a[i].u.iConstExprReg);
+        }
+      }
+
       /* Finally, jump back to the beginning of the executable code. */
-      sqlite3VdbeAddOp2(v, OP_Goto, 0, pParse->cookieGoto);
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, 1);
     }
   }
 
@@ -82374,10 +85499,6 @@ SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){
   /* Get the VDBE program ready for execution
   */
   if( v && ALWAYS(pParse->nErr==0) && !db->mallocFailed ){
-#ifdef SQLITE_DEBUG
-    FILE *trace = (db->flags & SQLITE_VdbeTrace)!=0 ? stdout : 0;
-    sqlite3VdbeTrace(v, trace);
-#endif
     assert( pParse->iCacheLevel==0 );  /* Disables and re-enables match */
     /* A minimum of one cursor is required if autoincrement is used
     *  See ticket [a696379c1f08866] */
@@ -82393,7 +85514,6 @@ SQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){
   pParse->nSet = 0;
   pParse->nVar = 0;
   pParse->cookieMask = 0;
-  pParse->cookieGoto = 0;
 }
 
 /*
@@ -82563,7 +85683,10 @@ static void freeIndex(sqlite3 *db, Index *p){
 #ifndef SQLITE_OMIT_ANALYZE
   sqlite3DeleteIndexSamples(db, p);
 #endif
+  if( db==0 || db->pnBytesFreed==0 ) sqlite3KeyInfoUnref(p->pKeyInfo);
+  sqlite3ExprDelete(db, p->pPartIdxWhere);
   sqlite3DbFree(db, p->zColAff);
+  if( p->isResized ) sqlite3DbFree(db, p->azColl);
   sqlite3DbFree(db, p);
 }
 
@@ -82821,8 +85944,7 @@ SQLITE_PRIVATE char *sqlite3NameFromToken(sqlite3 *db, Token *pName){
 SQLITE_PRIVATE void sqlite3OpenMasterTable(Parse *p, int iDb){
   Vdbe *v = sqlite3GetVdbe(p);
   sqlite3TableLock(p, iDb, MASTER_ROOT, 1, SCHEMA_TABLE(iDb));
-  sqlite3VdbeAddOp3(v, OP_OpenWrite, 0, MASTER_ROOT, iDb);
-  sqlite3VdbeChangeP4(v, -1, (char *)5, P4_INT32);  /* 5 column table */
+  sqlite3VdbeAddOp4Int(v, OP_OpenWrite, 0, MASTER_ROOT, iDb, 5);
   if( p->nTab==0 ){
     p->nTab = 1;
   }
@@ -82927,6 +86049,27 @@ SQLITE_PRIVATE int sqlite3CheckObjectName(Parse *pParse, const char *zName){
   return SQLITE_OK;
 }
 
+/*
+** Return the PRIMARY KEY index of a table
+*/
+SQLITE_PRIVATE Index *sqlite3PrimaryKeyIndex(Table *pTab){
+  Index *p;
+  for(p=pTab->pIndex; p && !IsPrimaryKeyIndex(p); p=p->pNext){}
+  return p;
+}
+
+/*
+** Return the column of index pIdx that corresponds to table
+** column iCol.  Return -1 if not found.
+*/
+SQLITE_PRIVATE i16 sqlite3ColumnOfIndex(Index *pIdx, i16 iCol){
+  int i;
+  for(i=0; i<pIdx->nColumn; i++){
+    if( iCol==pIdx->aiColumn[i] ) return i;
+  }
+  return -1;
+}
+
 /*
 ** Begin constructing a new table representation in memory.  This is
 ** the first of several action routines that get called in response
@@ -83059,7 +86202,7 @@ SQLITE_PRIVATE void sqlite3StartTable(
   pTable->iPKey = -1;
   pTable->pSchema = db->aDb[iDb].pSchema;
   pTable->nRef = 1;
-  pTable->nRowEst = 1000000;
+  pTable->nRowLogEst = 200; assert( 200==sqlite3LogEst(1048576) );
   assert( pParse->pNewTable==0 );
   pParse->pNewTable = pTable;
 
@@ -83102,7 +86245,7 @@ SQLITE_PRIVATE void sqlite3StartTable(
     reg3 = ++pParse->nMem;
     sqlite3VdbeAddOp3(v, OP_ReadCookie, iDb, reg3, BTREE_FILE_FORMAT);
     sqlite3VdbeUsesBtree(v, iDb);
-    j1 = sqlite3VdbeAddOp1(v, OP_If, reg3);
+    j1 = sqlite3VdbeAddOp1(v, OP_If, reg3); VdbeCoverage(v);
     fileFormat = (db->flags & SQLITE_LegacyFileFmt)!=0 ?
                   1 : SQLITE_MAX_FILE_FORMAT;
     sqlite3VdbeAddOp2(v, OP_Integer, fileFormat, reg3);
@@ -83126,7 +86269,7 @@ SQLITE_PRIVATE void sqlite3StartTable(
     }else
 #endif
     {
-      sqlite3VdbeAddOp2(v, OP_CreateTable, iDb, reg2);
+      pParse->addrCrTab = sqlite3VdbeAddOp2(v, OP_CreateTable, iDb, reg2);
     }
     sqlite3OpenMasterTable(pParse, iDb);
     sqlite3VdbeAddOp2(v, OP_NewRowid, 0, reg1);
@@ -83206,6 +86349,7 @@ SQLITE_PRIVATE void sqlite3AddColumn(Parse *pParse, Token *pName){
   ** be called next to set pCol->affinity correctly.
   */
   pCol->affinity = SQLITE_AFF_NONE;
+  pCol->szEst = 1;
   p->nCol++;
 }
 
@@ -83247,15 +86391,18 @@ SQLITE_PRIVATE void sqlite3AddNotNull(Parse *pParse, int onError){
 ** If none of the substrings in the above table are found,
 ** SQLITE_AFF_NUMERIC is returned.
 */
-SQLITE_PRIVATE char sqlite3AffinityType(const char *zIn){
+SQLITE_PRIVATE char sqlite3AffinityType(const char *zIn, u8 *pszEst){
   u32 h = 0;
   char aff = SQLITE_AFF_NUMERIC;
+  const char *zChar = 0;
 
-  if( zIn ) while( zIn[0] ){
+  if( zIn==0 ) return aff;
+  while( zIn[0] ){
     h = (h<<8) + sqlite3UpperToLower[(*zIn)&0xff];
     zIn++;
     if( h==(('c'<<24)+('h'<<16)+('a'<<8)+'r') ){             /* CHAR */
-      aff = SQLITE_AFF_TEXT; 
+      aff = SQLITE_AFF_TEXT;
+      zChar = zIn;
     }else if( h==(('c'<<24)+('l'<<16)+('o'<<8)+'b') ){       /* CLOB */
       aff = SQLITE_AFF_TEXT;
     }else if( h==(('t'<<24)+('e'<<16)+('x'<<8)+'t') ){       /* TEXT */
@@ -83263,6 +86410,7 @@ SQLITE_PRIVATE char sqlite3AffinityType(const char *zIn){
     }else if( h==(('b'<<24)+('l'<<16)+('o'<<8)+'b')          /* BLOB */
         && (aff==SQLITE_AFF_NUMERIC || aff==SQLITE_AFF_REAL) ){
       aff = SQLITE_AFF_NONE;
+      if( zIn[0]=='(' ) zChar = zIn;
 #ifndef SQLITE_OMIT_FLOATING_POINT
     }else if( h==(('r'<<24)+('e'<<16)+('a'<<8)+'l')          /* REAL */
         && aff==SQLITE_AFF_NUMERIC ){
@@ -83280,6 +86428,28 @@ SQLITE_PRIVATE char sqlite3AffinityType(const char *zIn){
     }
   }
 
+  /* If pszEst is not NULL, store an estimate of the field size.  The
+  ** estimate is scaled so that the size of an integer is 1.  */
+  if( pszEst ){
+    *pszEst = 1;   /* default size is approx 4 bytes */
+    if( aff<=SQLITE_AFF_NONE ){
+      if( zChar ){
+        while( zChar[0] ){
+          if( sqlite3Isdigit(zChar[0]) ){
+            int v = 0;
+            sqlite3GetInt32(zChar, &v);
+            v = v/4 + 1;
+            if( v>255 ) v = 255;
+            *pszEst = v; /* BLOB(k), VARCHAR(k), CHAR(k) -> r=(k/4+1) */
+            break;
+          }
+          zChar++;
+        }
+      }else{
+        *pszEst = 5;   /* BLOB, TEXT, CLOB -> r=5  (approx 20 bytes)*/
+      }
+    }
+  }
   return aff;
 }
 
@@ -83301,7 +86471,7 @@ SQLITE_PRIVATE void sqlite3AddColumnType(Parse *pParse, Token *pType){
   pCol = &p->aCol[p->nCol-1];
   assert( pCol->zType==0 );
   pCol->zType = sqlite3NameFromToken(pParse->db, pType);
-  pCol->affinity = sqlite3AffinityType(pCol->zType);
+  pCol->affinity = sqlite3AffinityType(pCol->zType, &pCol->szEst);
 }
 
 /*
@@ -83367,6 +86537,7 @@ SQLITE_PRIVATE void sqlite3AddPrimaryKey(
   Table *pTab = pParse->pNewTable;
   char *zType = 0;
   int iCol = -1, i;
+  int nTerm;
   if( pTab==0 || IN_DECLARE_VTAB ) goto primary_key_exit;
   if( pTab->tabFlags & TF_HasPrimaryKey ){
     sqlite3ErrorMsg(pParse, 
@@ -83377,38 +86548,43 @@ SQLITE_PRIVATE void sqlite3AddPrimaryKey(
   if( pList==0 ){
     iCol = pTab->nCol - 1;
     pTab->aCol[iCol].colFlags |= COLFLAG_PRIMKEY;
+    zType = pTab->aCol[iCol].zType;
+    nTerm = 1;
   }else{
-    for(i=0; i<pList->nExpr; i++){
+    nTerm = pList->nExpr;
+    for(i=0; i<nTerm; i++){
       for(iCol=0; iCol<pTab->nCol; iCol++){
         if( sqlite3StrICmp(pList->a[i].zName, pTab->aCol[iCol].zName)==0 ){
+          pTab->aCol[iCol].colFlags |= COLFLAG_PRIMKEY;
+          zType = pTab->aCol[iCol].zType;
           break;
         }
       }
-      if( iCol<pTab->nCol ){
-        pTab->aCol[iCol].colFlags |= COLFLAG_PRIMKEY;
-      }
     }
-    if( pList->nExpr>1 ) iCol = -1;
   }
-  if( iCol>=0 && iCol<pTab->nCol ){
-    zType = pTab->aCol[iCol].zType;
-  }
-  if( zType && sqlite3StrICmp(zType, "INTEGER")==0
-        && sortOrder==SQLITE_SO_ASC ){
+  if( nTerm==1
+   && zType && sqlite3StrICmp(zType, "INTEGER")==0
+   && sortOrder==SQLITE_SO_ASC
+  ){
     pTab->iPKey = iCol;
     pTab->keyConf = (u8)onError;
     assert( autoInc==0 || autoInc==1 );
     pTab->tabFlags |= autoInc*TF_Autoincrement;
+    if( pList ) pParse->iPkSortOrder = pList->a[0].sortOrder;
   }else if( autoInc ){
 #ifndef SQLITE_OMIT_AUTOINCREMENT
     sqlite3ErrorMsg(pParse, "AUTOINCREMENT is only allowed on an "
        "INTEGER PRIMARY KEY");
 #endif
   }else{
+    Vdbe *v = pParse->pVdbe;
     Index *p;
-    p = sqlite3CreateIndex(pParse, 0, 0, 0, pList, onError, 0, 0, sortOrder, 0);
+    if( v ) pParse->addrSkipPK = sqlite3VdbeAddOp0(v, OP_Noop);
+    p = sqlite3CreateIndex(pParse, 0, 0, 0, pList, onError, 0,
+                           0, sortOrder, 0);
     if( p ){
-      p->autoIndex = 2;
+      p->idxType = SQLITE_IDXTYPE_PRIMARYKEY;
+      if( v ) sqlite3VdbeJumpHere(v, pParse->addrSkipPK);
     }
     pList = 0;
   }
@@ -83427,7 +86603,10 @@ SQLITE_PRIVATE void sqlite3AddCheckConstraint(
 ){
 #ifndef SQLITE_OMIT_CHECK
   Table *pTab = pParse->pNewTable;
-  if( pTab && !IN_DECLARE_VTAB ){
+  sqlite3 *db = pParse->db;
+  if( pTab && !IN_DECLARE_VTAB
+   && !sqlite3BtreeIsReadonly(db->aDb[db->init.iDb].pBt)
+  ){
     pTab->pCheck = sqlite3ExprListAppend(pParse, pTab->pCheck, pCheckExpr);
     if( pParse->constraintName.n ){
       sqlite3ExprListSetName(pParse, pTab->pCheck, &pParse->constraintName, 1);
@@ -83457,6 +86636,7 @@ SQLITE_PRIVATE void sqlite3AddCollateType(Parse *pParse, Token *pToken){
 
   if( sqlite3LocateCollSeq(pParse, zColl) ){
     Index *pIdx;
+    sqlite3DbFree(db, p->aCol[i].zColl);
     p->aCol[i].zColl = zColl;
   
     /* If the column is declared as "<name> PRIMARY KEY COLLATE <type>",
@@ -83464,7 +86644,7 @@ SQLITE_PRIVATE void sqlite3AddCollateType(Parse *pParse, Token *pToken){
     ** collation type was added. Correct this if it is the case.
     */
     for(pIdx=p->pIndex; pIdx; pIdx=pIdx->pNext){
-      assert( pIdx->nColumn==1 );
+      assert( pIdx->nKeyCol==1 );
       if( pIdx->aiColumn[0]==i ){
         pIdx->azColl[0] = p->aCol[i].zColl;
       }
@@ -83572,10 +86752,10 @@ static void identPut(char *z, int *pIdx, char *zSignedIdent){
   for(j=0; zIdent[j]; j++){
     if( !sqlite3Isalnum(zIdent[j]) && zIdent[j]!='_' ) break;
   }
-  needQuote = sqlite3Isdigit(zIdent[0]) || sqlite3KeywordCode(zIdent, j)!=TK_ID;
-  if( !needQuote ){
-    needQuote = zIdent[j];
-  }
+  needQuote = sqlite3Isdigit(zIdent[0])
+            || sqlite3KeywordCode(zIdent, j)!=TK_ID
+            || zIdent[j]!=0
+            || j==0;
 
   if( needQuote ) z[i++] = '"';
   for(j=0; zIdent[j]; j++){
@@ -83647,7 +86827,7 @@ static char *createTableStmt(sqlite3 *db, Table *p){
     zType = azType[pCol->affinity - SQLITE_AFF_TEXT];
     len = sqlite3Strlen30(zType);
     assert( pCol->affinity==SQLITE_AFF_NONE 
-            || pCol->affinity==sqlite3AffinityType(zType) );
+            || pCol->affinity==sqlite3AffinityType(zType, 0) );
     memcpy(&zStmt[k], zType, len);
     k += len;
     assert( k<=n );
@@ -83656,6 +86836,191 @@ static char *createTableStmt(sqlite3 *db, Table *p){
   return zStmt;
 }
 
+/*
+** Resize an Index object to hold N columns total.  Return SQLITE_OK
+** on success and SQLITE_NOMEM on an OOM error.
+*/
+static int resizeIndexObject(sqlite3 *db, Index *pIdx, int N){
+  char *zExtra;
+  int nByte;
+  if( pIdx->nColumn>=N ) return SQLITE_OK;
+  assert( pIdx->isResized==0 );
+  nByte = (sizeof(char*) + sizeof(i16) + 1)*N;
+  zExtra = sqlite3DbMallocZero(db, nByte);
+  if( zExtra==0 ) return SQLITE_NOMEM;
+  memcpy(zExtra, pIdx->azColl, sizeof(char*)*pIdx->nColumn);
+  pIdx->azColl = (char**)zExtra;
+  zExtra += sizeof(char*)*N;
+  memcpy(zExtra, pIdx->aiColumn, sizeof(i16)*pIdx->nColumn);
+  pIdx->aiColumn = (i16*)zExtra;
+  zExtra += sizeof(i16)*N;
+  memcpy(zExtra, pIdx->aSortOrder, pIdx->nColumn);
+  pIdx->aSortOrder = (u8*)zExtra;
+  pIdx->nColumn = N;
+  pIdx->isResized = 1;
+  return SQLITE_OK;
+}
+
+/*
+** Estimate the total row width for a table.
+*/
+static void estimateTableWidth(Table *pTab){
+  unsigned wTable = 0;
+  const Column *pTabCol;
+  int i;
+  for(i=pTab->nCol, pTabCol=pTab->aCol; i>0; i--, pTabCol++){
+    wTable += pTabCol->szEst;
+  }
+  if( pTab->iPKey<0 ) wTable++;
+  pTab->szTabRow = sqlite3LogEst(wTable*4);
+}
+
+/*
+** Estimate the average size of a row for an index.
+*/
+static void estimateIndexWidth(Index *pIdx){
+  unsigned wIndex = 0;
+  int i;
+  const Column *aCol = pIdx->pTable->aCol;
+  for(i=0; i<pIdx->nColumn; i++){
+    i16 x = pIdx->aiColumn[i];
+    assert( x<pIdx->pTable->nCol );
+    wIndex += x<0 ? 1 : aCol[pIdx->aiColumn[i]].szEst;
+  }
+  pIdx->szIdxRow = sqlite3LogEst(wIndex*4);
+}
+
+/* Return true if value x is found any of the first nCol entries of aiCol[]
+*/
+static int hasColumn(const i16 *aiCol, int nCol, int x){
+  while( nCol-- > 0 ) if( x==*(aiCol++) ) return 1;
+  return 0;
+}
+
+/*
+** This routine runs at the end of parsing a CREATE TABLE statement that
+** has a WITHOUT ROWID clause.  The job of this routine is to convert both
+** internal schema data structures and the generated VDBE code so that they
+** are appropriate for a WITHOUT ROWID table instead of a rowid table.
+** Changes include:
+**
+**     (1)  Convert the OP_CreateTable into an OP_CreateIndex.  There is
+**          no rowid btree for a WITHOUT ROWID.  Instead, the canonical
+**          data storage is a covering index btree.
+**     (2)  Bypass the creation of the sqlite_master table entry
+**          for the PRIMARY KEY as the the primary key index is now
+**          identified by the sqlite_master table entry of the table itself.
+**     (3)  Set the Index.tnum of the PRIMARY KEY Index object in the
+**          schema to the rootpage from the main table.
+**     (4)  Set all columns of the PRIMARY KEY schema object to be NOT NULL.
+**     (5)  Add all table columns to the PRIMARY KEY Index object
+**          so that the PRIMARY KEY is a covering index.  The surplus
+**          columns are part of KeyInfo.nXField and are not used for
+**          sorting or lookup or uniqueness checks.
+**     (6)  Replace the rowid tail on all automatically generated UNIQUE
+**          indices with the PRIMARY KEY columns.
+*/
+static void convertToWithoutRowidTable(Parse *pParse, Table *pTab){
+  Index *pIdx;
+  Index *pPk;
+  int nPk;
+  int i, j;
+  sqlite3 *db = pParse->db;
+  Vdbe *v = pParse->pVdbe;
+
+  /* Convert the OP_CreateTable opcode that would normally create the
+  ** root-page for the table into a OP_CreateIndex opcode.  The index
+  ** created will become the PRIMARY KEY index.
+  */
+  if( pParse->addrCrTab ){
+    assert( v );
+    sqlite3VdbeGetOp(v, pParse->addrCrTab)->opcode = OP_CreateIndex;
+  }
+
+  /* Bypass the creation of the PRIMARY KEY btree and the sqlite_master
+  ** table entry.
+  */
+  if( pParse->addrSkipPK ){
+    assert( v );
+    sqlite3VdbeGetOp(v, pParse->addrSkipPK)->opcode = OP_Goto;
+  }
+
+  /* Locate the PRIMARY KEY index.  Or, if this table was originally
+  ** an INTEGER PRIMARY KEY table, create a new PRIMARY KEY index. 
+  */
+  if( pTab->iPKey>=0 ){
+    ExprList *pList;
+    pList = sqlite3ExprListAppend(pParse, 0, 0);
+    if( pList==0 ) return;
+    pList->a[0].zName = sqlite3DbStrDup(pParse->db,
+                                        pTab->aCol[pTab->iPKey].zName);
+    pList->a[0].sortOrder = pParse->iPkSortOrder;
+    assert( pParse->pNewTable==pTab );
+    pPk = sqlite3CreateIndex(pParse, 0, 0, 0, pList, pTab->keyConf, 0, 0, 0, 0);
+    if( pPk==0 ) return;
+    pPk->idxType = SQLITE_IDXTYPE_PRIMARYKEY;
+    pTab->iPKey = -1;
+  }else{
+    pPk = sqlite3PrimaryKeyIndex(pTab);
+  }
+  pPk->isCovering = 1;
+  assert( pPk!=0 );
+  nPk = pPk->nKeyCol;
+
+  /* Make sure every column of the PRIMARY KEY is NOT NULL */
+  for(i=0; i<nPk; i++){
+    pTab->aCol[pPk->aiColumn[i]].notNull = 1;
+  }
+  pPk->uniqNotNull = 1;
+
+  /* The root page of the PRIMARY KEY is the table root page */
+  pPk->tnum = pTab->tnum;
+
+  /* Update the in-memory representation of all UNIQUE indices by converting
+  ** the final rowid column into one or more columns of the PRIMARY KEY.
+  */
+  for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+    int n;
+    if( IsPrimaryKeyIndex(pIdx) ) continue;
+    for(i=n=0; i<nPk; i++){
+      if( !hasColumn(pIdx->aiColumn, pIdx->nKeyCol, pPk->aiColumn[i]) ) n++;
+    }
+    if( n==0 ){
+      /* This index is a superset of the primary key */
+      pIdx->nColumn = pIdx->nKeyCol;
+      continue;
+    }
+    if( resizeIndexObject(db, pIdx, pIdx->nKeyCol+n) ) return;
+    for(i=0, j=pIdx->nKeyCol; i<nPk; i++){
+      if( !hasColumn(pIdx->aiColumn, pIdx->nKeyCol, pPk->aiColumn[i]) ){
+        pIdx->aiColumn[j] = pPk->aiColumn[i];
+        pIdx->azColl[j] = pPk->azColl[i];
+        j++;
+      }
+    }
+    assert( pIdx->nColumn>=pIdx->nKeyCol+n );
+    assert( pIdx->nColumn>=j );
+  }
+
+  /* Add all table columns to the PRIMARY KEY index
+  */
+  if( nPk<pTab->nCol ){
+    if( resizeIndexObject(db, pPk, pTab->nCol) ) return;
+    for(i=0, j=nPk; i<pTab->nCol; i++){
+      if( !hasColumn(pPk->aiColumn, j, i) ){
+        assert( j<pPk->nColumn );
+        pPk->aiColumn[j] = i;
+        pPk->azColl[j] = "BINARY";
+        j++;
+      }
+    }
+    assert( pPk->nColumn==j );
+    assert( pTab->nCol==j );
+  }else{
+    pPk->nColumn = pTab->nCol;
+  }
+}
+
 /*
 ** This routine is called to report the final ")" that terminates
 ** a CREATE TABLE statement.
@@ -83679,12 +87044,14 @@ static char *createTableStmt(sqlite3 *db, Table *p){
 SQLITE_PRIVATE void sqlite3EndTable(
   Parse *pParse,          /* Parse context */
   Token *pCons,           /* The ',' token after the last column defn. */
-  Token *pEnd,            /* The final ')' token in the CREATE TABLE */
+  Token *pEnd,            /* The ')' before options in the CREATE TABLE */
+  u8 tabOpts,             /* Extra table options. Usually 0. */
   Select *pSelect         /* Select from a "CREATE ... AS SELECT" */
 ){
-  Table *p;
-  sqlite3 *db = pParse->db;
-  int iDb;
+  Table *p;                 /* The new table */
+  sqlite3 *db = pParse->db; /* The database connection */
+  int iDb;                  /* Database in which the table lives */
+  Index *pIdx;              /* An implied index of the table */
 
   if( (pEnd==0 && pSelect==0) || db->mallocFailed ){
     return;
@@ -83694,35 +87061,6 @@ SQLITE_PRIVATE void sqlite3EndTable(
 
   assert( !db->init.busy || !pSelect );
 
-  iDb = sqlite3SchemaToIndex(db, p->pSchema);
-
-#ifndef SQLITE_OMIT_CHECK
-  /* Resolve names in all CHECK constraint expressions.
-  */
-  if( p->pCheck ){
-    SrcList sSrc;                   /* Fake SrcList for pParse->pNewTable */
-    NameContext sNC;                /* Name context for pParse->pNewTable */
-    ExprList *pList;                /* List of all CHECK constraints */
-    int i;                          /* Loop counter */
-
-    memset(&sNC, 0, sizeof(sNC));
-    memset(&sSrc, 0, sizeof(sSrc));
-    sSrc.nSrc = 1;
-    sSrc.a[0].zName = p->zName;
-    sSrc.a[0].pTab = p;
-    sSrc.a[0].iCursor = -1;
-    sNC.pParse = pParse;
-    sNC.pSrcList = &sSrc;
-    sNC.ncFlags = NC_IsCheck;
-    pList = p->pCheck;
-    for(i=0; i<pList->nExpr; i++){
-      if( sqlite3ResolveExprNames(&sNC, pList->a[i].pExpr) ){
-        return;
-      }
-    }
-  }
-#endif /* !defined(SQLITE_OMIT_CHECK) */
-
   /* If the db->init.busy is 1 it means we are reading the SQL off the
   ** "sqlite_master" or "sqlite_temp_master" table on the disk.
   ** So do not write to the disk again.  Extract the root page number
@@ -83733,6 +87071,37 @@ SQLITE_PRIVATE void sqlite3EndTable(
     p->tnum = db->init.newTnum;
   }
 
+  /* Special processing for WITHOUT ROWID Tables */
+  if( tabOpts & TF_WithoutRowid ){
+    if( (p->tabFlags & TF_Autoincrement) ){
+      sqlite3ErrorMsg(pParse,
+          "AUTOINCREMENT not allowed on WITHOUT ROWID tables");
+      return;
+    }
+    if( (p->tabFlags & TF_HasPrimaryKey)==0 ){
+      sqlite3ErrorMsg(pParse, "PRIMARY KEY missing on table %s", p->zName);
+    }else{
+      p->tabFlags |= TF_WithoutRowid;
+      convertToWithoutRowidTable(pParse, p);
+    }
+  }
+
+  iDb = sqlite3SchemaToIndex(db, p->pSchema);
+
+#ifndef SQLITE_OMIT_CHECK
+  /* Resolve names in all CHECK constraint expressions.
+  */
+  if( p->pCheck ){
+    sqlite3ResolveSelfReference(pParse, p, NC_IsCheck, 0, p->pCheck);
+  }
+#endif /* !defined(SQLITE_OMIT_CHECK) */
+
+  /* Estimate the average row size for the table and for all implied indices */
+  estimateTableWidth(p);
+  for(pIdx=p->pIndex; pIdx; pIdx=pIdx->pNext){
+    estimateIndexWidth(pIdx);
+  }
+
   /* If not initializing, then create a record for the new table
   ** in the SQLITE_MASTER table of the database.
   **
@@ -83806,7 +87175,9 @@ SQLITE_PRIVATE void sqlite3EndTable(
     if( pSelect ){
       zStmt = createTableStmt(db, p);
     }else{
-      n = (int)(pEnd->z - pParse->sNameToken.z) + 1;
+      Token *pEnd2 = tabOpts ? &pParse->sLastToken : pEnd;
+      n = (int)(pEnd2->z - pParse->sNameToken.z);
+      if( pEnd2->z[0]!=';' ) n += pEnd2->n;
       zStmt = sqlite3MPrintf(db, 
           "CREATE %s %.*s", zType2, n, pParse->sNameToken.z
       );
@@ -83849,7 +87220,7 @@ SQLITE_PRIVATE void sqlite3EndTable(
 
     /* Reparse everything to update our internal data structures */
     sqlite3VdbeAddParseSchemaOp(v, iDb,
-               sqlite3MPrintf(db, "tbl_name='%q'", p->zName));
+           sqlite3MPrintf(db, "tbl_name='%q' AND type!='trigger'", p->zName));
   }
 
 
@@ -83919,9 +87290,8 @@ SQLITE_PRIVATE void sqlite3CreateView(
   }
   sqlite3TwoPartName(pParse, pName1, pName2, &pName);
   iDb = sqlite3SchemaToIndex(db, p->pSchema);
-  if( sqlite3FixInit(&sFix, pParse, iDb, "view", pName)
-    && sqlite3FixSelect(&sFix, pSelect)
-  ){
+  sqlite3FixInit(&sFix, pParse, iDb, "view", pName);
+  if( sqlite3FixSelect(&sFix, pSelect) ){
     sqlite3SelectDelete(db, pSelect);
     return;
   }
@@ -83955,7 +87325,7 @@ SQLITE_PRIVATE void sqlite3CreateView(
   sEnd.n = 1;
 
   /* Use sqlite3EndTable() to add the view to the SQLITE_MASTER table */
-  sqlite3EndTable(pParse, 0, &sEnd, 0);
+  sqlite3EndTable(pParse, 0, &sEnd, 0, 0);
   return;
 }
 #endif /* SQLITE_OMIT_VIEW */
@@ -84221,7 +87591,7 @@ static void sqlite3ClearStatTables(
 ){
   int i;
   const char *zDbName = pParse->db->aDb[iDb].zName;
-  for(i=1; i<=3; i++){
+  for(i=1; i<=4; i++){
     char zTab[24];
     sqlite3_snprintf(sizeof(zTab),zTab,"sqlite_stat%d",i);
     if( sqlite3FindTable(pParse->db, zTab, zDbName) ){
@@ -84410,8 +87780,8 @@ SQLITE_PRIVATE void sqlite3DropTable(Parse *pParse, SrcList *pName, int isView,
 ** currently under construction.  pFromCol determines which columns
 ** in the current table point to the foreign key.  If pFromCol==0 then
 ** connect the key to the last column inserted.  pTo is the name of
-** the table referred to.  pToCol is a list of tables in the other
-** pTo table that the foreign key points to.  flags contains all
+** the table referred to (a.k.a the "parent" table).  pToCol is a list
+** of tables in the parent pTo table.  flags contains all
 ** information about the conflict resolution algorithms specified
 ** in the ON DELETE, ON UPDATE and ON INSERT clauses.
 **
@@ -84571,6 +87941,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){
   int addr1;                     /* Address of top of loop */
   int addr2;                     /* Address to jump to for next iteration */
   int tnum;                      /* Root page of index */
+  int iPartIdxLabel;             /* Jump to this label to skip a row */
   Vdbe *v;                       /* Generate code into this virtual machine */
   KeyInfo *pKey;                 /* KeyInfo for index */
   int regRecord;                 /* Register holding assemblied index record */
@@ -84593,36 +87964,39 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){
     tnum = memRootPage;
   }else{
     tnum = pIndex->tnum;
-    sqlite3VdbeAddOp2(v, OP_Clear, tnum, iDb);
   }
-  pKey = sqlite3IndexKeyinfo(pParse, pIndex);
-  sqlite3VdbeAddOp4(v, OP_OpenWrite, iIdx, tnum, iDb, 
-                    (char *)pKey, P4_KEYINFO_HANDOFF);
-  sqlite3VdbeChangeP5(v, OPFLAG_BULKCSR|((memRootPage>=0)?OPFLAG_P2ISREG:0));
+  pKey = sqlite3KeyInfoOfIndex(pParse, pIndex);
 
   /* Open the sorter cursor if we are to use one. */
   iSorter = pParse->nTab++;
-  sqlite3VdbeAddOp4(v, OP_SorterOpen, iSorter, 0, 0, (char*)pKey, P4_KEYINFO);
+  sqlite3VdbeAddOp4(v, OP_SorterOpen, iSorter, 0, 0, (char*)
+                    sqlite3KeyInfoRef(pKey), P4_KEYINFO);
 
   /* Open the table. Loop through all rows of the table, inserting index
   ** records into the sorter. */
   sqlite3OpenTable(pParse, iTab, iDb, pTab, OP_OpenRead);
-  addr1 = sqlite3VdbeAddOp2(v, OP_Rewind, iTab, 0);
+  addr1 = sqlite3VdbeAddOp2(v, OP_Rewind, iTab, 0); VdbeCoverage(v);
   regRecord = sqlite3GetTempReg(pParse);
 
-  sqlite3GenerateIndexKey(pParse, pIndex, iTab, regRecord, 1);
+  sqlite3GenerateIndexKey(pParse,pIndex,iTab,regRecord,0,&iPartIdxLabel,0,0);
   sqlite3VdbeAddOp2(v, OP_SorterInsert, iSorter, regRecord);
-  sqlite3VdbeAddOp2(v, OP_Next, iTab, addr1+1);
+  sqlite3ResolvePartIdxLabel(pParse, iPartIdxLabel);
+  sqlite3VdbeAddOp2(v, OP_Next, iTab, addr1+1); VdbeCoverage(v);
   sqlite3VdbeJumpHere(v, addr1);
-  addr1 = sqlite3VdbeAddOp2(v, OP_SorterSort, iSorter, 0);
-  if( pIndex->onError!=OE_None ){
+  if( memRootPage<0 ) sqlite3VdbeAddOp2(v, OP_Clear, tnum, iDb);
+  sqlite3VdbeAddOp4(v, OP_OpenWrite, iIdx, tnum, iDb, 
+                    (char *)pKey, P4_KEYINFO);
+  sqlite3VdbeChangeP5(v, OPFLAG_BULKCSR|((memRootPage>=0)?OPFLAG_P2ISREG:0));
+
+  addr1 = sqlite3VdbeAddOp2(v, OP_SorterSort, iSorter, 0); VdbeCoverage(v);
+  assert( pKey!=0 || db->mallocFailed || pParse->nErr );
+  if( pIndex->onError!=OE_None && pKey!=0 ){
     int j2 = sqlite3VdbeCurrentAddr(v) + 3;
     sqlite3VdbeAddOp2(v, OP_Goto, 0, j2);
     addr2 = sqlite3VdbeCurrentAddr(v);
-    sqlite3VdbeAddOp3(v, OP_SorterCompare, iSorter, j2, regRecord);
-    sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_UNIQUE,
-        OE_Abort, "indexed columns are not unique", P4_STATIC
-    );
+    sqlite3VdbeAddOp4Int(v, OP_SorterCompare, iSorter, j2, regRecord,
+                         pKey->nField - pIndex->nKeyCol); VdbeCoverage(v);
+    sqlite3UniqueConstraint(pParse, OE_Abort, pIndex);
   }else{
     addr2 = sqlite3VdbeCurrentAddr(v);
   }
@@ -84630,7 +88004,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){
   sqlite3VdbeAddOp3(v, OP_IdxInsert, iIdx, regRecord, 1);
   sqlite3VdbeChangeP5(v, OPFLAG_USESEEKRESULT);
   sqlite3ReleaseTempReg(pParse, regRecord);
-  sqlite3VdbeAddOp2(v, OP_SorterNext, iSorter, addr2);
+  sqlite3VdbeAddOp2(v, OP_SorterNext, iSorter, addr2); VdbeCoverage(v);
   sqlite3VdbeJumpHere(v, addr1);
 
   sqlite3VdbeAddOp1(v, OP_Close, iTab);
@@ -84638,6 +88012,41 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){
   sqlite3VdbeAddOp1(v, OP_Close, iSorter);
 }
 
+/*
+** Allocate heap space to hold an Index object with nCol columns.
+**
+** Increase the allocation size to provide an extra nExtra bytes
+** of 8-byte aligned space after the Index object and return a
+** pointer to this extra space in *ppExtra.
+*/
+SQLITE_PRIVATE Index *sqlite3AllocateIndexObject(
+  sqlite3 *db,         /* Database connection */
+  i16 nCol,            /* Total number of columns in the index */
+  int nExtra,          /* Number of bytes of extra space to alloc */
+  char **ppExtra       /* Pointer to the "extra" space */
+){
+  Index *p;            /* Allocated index object */
+  int nByte;           /* Bytes of space for Index object + arrays */
+
+  nByte = ROUND8(sizeof(Index)) +              /* Index structure  */
+          ROUND8(sizeof(char*)*nCol) +         /* Index.azColl     */
+          ROUND8(sizeof(LogEst)*(nCol+1) +     /* Index.aiRowLogEst   */
+                 sizeof(i16)*nCol +            /* Index.aiColumn   */
+                 sizeof(u8)*nCol);             /* Index.aSortOrder */
+  p = sqlite3DbMallocZero(db, nByte + nExtra);
+  if( p ){
+    char *pExtra = ((char*)p)+ROUND8(sizeof(Index));
+    p->azColl = (char**)pExtra;       pExtra += ROUND8(sizeof(char*)*nCol);
+    p->aiRowLogEst = (LogEst*)pExtra; pExtra += sizeof(LogEst)*(nCol+1);
+    p->aiColumn = (i16*)pExtra;       pExtra += sizeof(i16)*nCol;
+    p->aSortOrder = (u8*)pExtra;
+    p->nColumn = nCol;
+    p->nKeyCol = nCol - 1;
+    *ppExtra = ((char*)p) + nByte;
+  }
+  return p;
+}
+
 /*
 ** Create a new index for an SQL table.  pName1.pName2 is the name of the index 
 ** and pTblList is the name of the table that is to be indexed.  Both will 
@@ -84652,7 +88061,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){
 **
 ** If the index is created successfully, return a pointer to the new Index
 ** structure. This is used by sqlite3AddPrimaryKey() to mark the index
-** as the tables primary key (Index.autoIndex==2).
+** as the tables primary key (Index.idxType==SQLITE_IDXTYPE_PRIMARYKEY)
 */
 SQLITE_PRIVATE Index *sqlite3CreateIndex(
   Parse *pParse,     /* All information about this parse */
@@ -84662,7 +88071,7 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
   ExprList *pList,   /* A list of columns to be indexed */
   int onError,       /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */
   Token *pStart,     /* The CREATE token that begins this statement */
-  Token *pEnd,       /* The ")" that closes the CREATE INDEX statement */
+  Expr *pPIWhere,    /* WHERE clause for partial indices */
   int sortOrder,     /* Sort order of primary key when pList==NULL */
   int ifNotExist     /* Omit error if index already exists */
 ){
@@ -84672,7 +88081,6 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
   char *zName = 0;     /* Name of the index */
   int nName;           /* Number of characters in zName */
   int i, j;
-  Token nullId;        /* Fake token for an empty ID list */
   DbFixer sFix;        /* For assigning database names to pTable */
   int sortOrderMask;   /* 1 to honor DESC in index.  0 to ignore. */
   sqlite3 *db = pParse->db;
@@ -84680,11 +88088,12 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
   int iDb;             /* Index of the database that is being written */
   Token *pName = 0;    /* Unqualified name of the index to create */
   struct ExprList_item *pListItem; /* For looping over pList */
-  int nCol;
-  int nExtra = 0;
-  char *zExtra;
+  const Column *pTabCol;           /* A column in the table */
+  int nExtra = 0;                  /* Space allocated for zExtra[] */
+  int nExtraCol;                   /* Number of extra columns needed */
+  char *zExtra = 0;                /* Extra space after the Index object */
+  Index *pPk = 0;      /* PRIMARY KEY index for WITHOUT ROWID tables */
 
-  assert( pStart==0 || pEnd!=0 ); /* pEnd must be non-NULL if pStart is */
   assert( pParse->nErr==0 );      /* Never called with prior errors */
   if( db->mallocFailed || IN_DECLARE_VTAB ){
     goto exit_create_index;
@@ -84720,9 +88129,8 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
     }
 #endif
 
-    if( sqlite3FixInit(&sFix, pParse, iDb, "index", pName) &&
-        sqlite3FixSrcList(&sFix, pTblName)
-    ){
+    sqlite3FixInit(&sFix, pParse, iDb, "index", pName);
+    if( sqlite3FixSrcList(&sFix, pTblName) ){
       /* Because the parser constructs pTblName from a single identifier,
       ** sqlite3FixSrcList can never fail. */
       assert(0);
@@ -84730,7 +88138,13 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
     pTab = sqlite3LocateTableItem(pParse, 0, &pTblName->a[0]);
     assert( db->mallocFailed==0 || pTab==0 );
     if( pTab==0 ) goto exit_create_index;
-    assert( db->aDb[iDb].pSchema==pTab->pSchema );
+    if( iDb==1 && db->aDb[iDb].pSchema!=pTab->pSchema ){
+      sqlite3ErrorMsg(pParse, 
+           "cannot create a TEMP index on non-TEMP table \"%s\"",
+           pTab->zName);
+      goto exit_create_index;
+    }
+    if( !HasRowid(pTab) ) pPk = sqlite3PrimaryKeyIndex(pTab);
   }else{
     assert( pName==0 );
     assert( pStart==0 );
@@ -84826,11 +88240,10 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
   ** So create a fake list to simulate this.
   */
   if( pList==0 ){
-    nullId.z = pTab->aCol[pTab->nCol-1].zName;
-    nullId.n = sqlite3Strlen30((char*)nullId.z);
     pList = sqlite3ExprListAppend(pParse, 0, 0);
     if( pList==0 ) goto exit_create_index;
-    sqlite3ExprListSetName(pParse, pList, &nullId, 0);
+    pList->a[0].zName = sqlite3DbStrDup(pParse->db,
+                                        pTab->aCol[pTab->nCol-1].zName);
     pList->a[0].sortOrder = (u8)sortOrder;
   }
 
@@ -84849,35 +88262,28 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
   ** Allocate the index structure. 
   */
   nName = sqlite3Strlen30(zName);
-  nCol = pList->nExpr;
-  pIndex = sqlite3DbMallocZero(db, 
-      ROUND8(sizeof(Index)) +              /* Index structure  */
-      ROUND8(sizeof(tRowcnt)*(nCol+1)) +   /* Index.aiRowEst   */
-      sizeof(char *)*nCol +                /* Index.azColl     */
-      sizeof(int)*nCol +                   /* Index.aiColumn   */
-      sizeof(u8)*nCol +                    /* Index.aSortOrder */
-      nName + 1 +                          /* Index.zName      */
-      nExtra                               /* Collation sequence names */
-  );
+  nExtraCol = pPk ? pPk->nKeyCol : 1;
+  pIndex = sqlite3AllocateIndexObject(db, pList->nExpr + nExtraCol,
+                                      nName + nExtra + 1, &zExtra);
   if( db->mallocFailed ){
     goto exit_create_index;
   }
-  zExtra = (char*)pIndex;
-  pIndex->aiRowEst = (tRowcnt*)&zExtra[ROUND8(sizeof(Index))];
-  pIndex->azColl = (char**)
-     ((char*)pIndex->aiRowEst + ROUND8(sizeof(tRowcnt)*nCol+1));
-  assert( EIGHT_BYTE_ALIGNMENT(pIndex->aiRowEst) );
+  assert( EIGHT_BYTE_ALIGNMENT(pIndex->aiRowLogEst) );
   assert( EIGHT_BYTE_ALIGNMENT(pIndex->azColl) );
-  pIndex->aiColumn = (int *)(&pIndex->azColl[nCol]);
-  pIndex->aSortOrder = (u8 *)(&pIndex->aiColumn[nCol]);
-  pIndex->zName = (char *)(&pIndex->aSortOrder[nCol]);
-  zExtra = (char *)(&pIndex->zName[nName+1]);
+  pIndex->zName = zExtra;
+  zExtra += nName + 1;
   memcpy(pIndex->zName, zName, nName+1);
   pIndex->pTable = pTab;
-  pIndex->nColumn = pList->nExpr;
   pIndex->onError = (u8)onError;
-  pIndex->autoIndex = (u8)(pName==0);
+  pIndex->uniqNotNull = onError!=OE_None;
+  pIndex->idxType = pName ? SQLITE_IDXTYPE_APPDEF : SQLITE_IDXTYPE_UNIQUE;
   pIndex->pSchema = db->aDb[iDb].pSchema;
+  pIndex->nKeyCol = pList->nExpr;
+  if( pPIWhere ){
+    sqlite3ResolveSelfReference(pParse, pTab, NC_PartIdx, pPIWhere, 0);
+    pIndex->pPartIdxWhere = pPIWhere;
+    pPIWhere = 0;
+  }
   assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
 
   /* Check to see if we should honor DESC requests on index columns
@@ -84900,7 +88306,6 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
   */
   for(i=0, pListItem=pList->a; i<pList->nExpr; i++, pListItem++){
     const char *zColName = pListItem->zName;
-    Column *pTabCol;
     int requestedSortOrder;
     char *zColl;                   /* Collation sequence name */
 
@@ -84913,7 +88318,8 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
       pParse->checkSchema = 1;
       goto exit_create_index;
     }
-    pIndex->aiColumn[i] = j;
+    assert( pTab->nCol<=0x7fff && j<=0x7fff );
+    pIndex->aiColumn[i] = (i16)j;
     if( pListItem->pExpr ){
       int nColl;
       assert( pListItem->pExpr->op==TK_COLLATE );
@@ -84934,8 +88340,27 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
     pIndex->azColl[i] = zColl;
     requestedSortOrder = pListItem->sortOrder & sortOrderMask;
     pIndex->aSortOrder[i] = (u8)requestedSortOrder;
+    if( pTab->aCol[j].notNull==0 ) pIndex->uniqNotNull = 0;
+  }
+  if( pPk ){
+    for(j=0; j<pPk->nKeyCol; j++){
+      int x = pPk->aiColumn[j];
+      if( hasColumn(pIndex->aiColumn, pIndex->nKeyCol, x) ){
+        pIndex->nColumn--; 
+      }else{
+        pIndex->aiColumn[i] = x;
+        pIndex->azColl[i] = pPk->azColl[j];
+        pIndex->aSortOrder[i] = pPk->aSortOrder[j];
+        i++;
+      }
+    }
+    assert( i==pIndex->nColumn );
+  }else{
+    pIndex->aiColumn[i] = -1;
+    pIndex->azColl[i] = "BINARY";
   }
   sqlite3DefaultRowEst(pIndex);
+  if( pParse->pNewTable==0 ) estimateIndexWidth(pIndex);
 
   if( pTab==pParse->pNewTable ){
     /* This routine has been called to create an automatic index as a
@@ -84963,11 +88388,11 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
     for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
       int k;
       assert( pIdx->onError!=OE_None );
-      assert( pIdx->autoIndex );
+      assert( pIdx->idxType!=SQLITE_IDXTYPE_APPDEF );
       assert( pIndex->onError!=OE_None );
 
-      if( pIdx->nColumn!=pIndex->nColumn ) continue;
-      for(k=0; k<pIdx->nColumn; k++){
+      if( pIdx->nKeyCol!=pIndex->nKeyCol ) continue;
+      for(k=0; k<pIdx->nKeyCol; k++){
         const char *z1;
         const char *z2;
         if( pIdx->aiColumn[k]!=pIndex->aiColumn[k] ) break;
@@ -84975,7 +88400,7 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
         z2 = pIndex->azColl[k];
         if( z1!=z2 && sqlite3StrICmp(z1, z2) ) break;
       }
-      if( k==pIdx->nColumn ){
+      if( k==pIdx->nKeyCol ){
         if( pIdx->onError!=pIndex->onError ){
           /* This constraint creates the same index as a previous
           ** constraint specified somewhere in the CREATE TABLE statement.
@@ -85017,22 +88442,20 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
     }
   }
 
-  /* If the db->init.busy is 0 then create the index on disk.  This
-  ** involves writing the index into the master table and filling in the
-  ** index with the current table contents.
+  /* If this is the initial CREATE INDEX statement (or CREATE TABLE if the
+  ** index is an implied index for a UNIQUE or PRIMARY KEY constraint) then
+  ** emit code to allocate the index rootpage on disk and make an entry for
+  ** the index in the sqlite_master table and populate the index with
+  ** content.  But, do not do this if we are simply reading the sqlite_master
+  ** table to parse the schema, or if this index is the PRIMARY KEY index
+  ** of a WITHOUT ROWID table.
   **
-  ** The db->init.busy is 0 when the user first enters a CREATE INDEX 
-  ** command.  db->init.busy is 1 when a database is opened and 
-  ** CREATE INDEX statements are read out of the master table.  In
-  ** the latter case the index already exists on disk, which is why
-  ** we don't want to recreate it.
-  **
-  ** If pTblName==0 it means this index is generated as a primary key
-  ** or UNIQUE constraint of a CREATE TABLE statement.  Since the table
+  ** If pTblName==0 it means this index is generated as an implied PRIMARY KEY
+  ** or UNIQUE index in a CREATE TABLE statement.  Since the table
   ** has just been created, it contains no data and the index initialization
   ** step can be skipped.
   */
-  else{ /* if( db->init.busy==0 ) */
+  else if( pParse->nErr==0 && (HasRowid(pTab) || pTblName!=0) ){
     Vdbe *v;
     char *zStmt;
     int iMem = ++pParse->nMem;
@@ -85050,12 +88473,11 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
     ** the zStmt variable
     */
     if( pStart ){
-      assert( pEnd!=0 );
+      int n = (int)(pParse->sLastToken.z - pName->z) + pParse->sLastToken.n;
+      if( pName->z[n-1]==';' ) n--;
       /* A named index with an explicit CREATE INDEX statement */
       zStmt = sqlite3MPrintf(db, "CREATE%s INDEX %.*s",
-        onError==OE_None ? "" : " UNIQUE",
-        (int)(pEnd->z - pName->z) + 1,
-        pName->z);
+        onError==OE_None ? "" : " UNIQUE", n, pName->z);
     }else{
       /* An automatic index created by a PRIMARY KEY or UNIQUE constraint */
       /* zStmt = sqlite3MPrintf(""); */
@@ -85111,10 +88533,8 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
 
   /* Clean up before exiting */
 exit_create_index:
-  if( pIndex ){
-    sqlite3DbFree(db, pIndex->zColAff);
-    sqlite3DbFree(db, pIndex);
-  }
+  if( pIndex ) freeIndex(db, pIndex);
+  sqlite3ExprDelete(db, pPIWhere);
   sqlite3ExprListDelete(db, pList);
   sqlite3SrcListDelete(db, pTblName);
   sqlite3DbFree(db, zName);
@@ -85129,7 +88549,7 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
 ** Since we do not know, guess 1 million.  aiRowEst[1] is an estimate of the
 ** number of rows in the table that match any particular value of the
 ** first column of the index.  aiRowEst[2] is an estimate of the number
-** of rows that match any particular combiniation of the first 2 columns
+** of rows that match any particular combination of the first 2 columns
 ** of the index.  And so forth.  It must always be the case that
 *
 **           aiRowEst[N]<=aiRowEst[N-1]
@@ -85140,20 +88560,27 @@ SQLITE_PRIVATE Index *sqlite3CreateIndex(
 ** are based on typical values found in actual indices.
 */
 SQLITE_PRIVATE void sqlite3DefaultRowEst(Index *pIdx){
-  tRowcnt *a = pIdx->aiRowEst;
+  /*                10,  9,  8,  7,  6 */
+  LogEst aVal[] = { 33, 32, 30, 28, 26 };
+  LogEst *a = pIdx->aiRowLogEst;
+  int nCopy = MIN(ArraySize(aVal), pIdx->nKeyCol);
   int i;
-  tRowcnt n;
-  assert( a!=0 );
-  a[0] = pIdx->pTable->nRowEst;
-  if( a[0]<10 ) a[0] = 10;
-  n = 10;
-  for(i=1; i<=pIdx->nColumn; i++){
-    a[i] = n;
-    if( n>5 ) n--;
-  }
-  if( pIdx->onError!=OE_None ){
-    a[pIdx->nColumn] = 1;
+
+  /* Set the first entry (number of rows in the index) to the estimated 
+  ** number of rows in the table. Or 10, if the estimated number of rows 
+  ** in the table is less than that.  */
+  a[0] = pIdx->pTable->nRowLogEst;
+  if( a[0]<33 ) a[0] = 33;        assert( 33==sqlite3LogEst(10) );
+
+  /* Estimate that a[1] is 10, a[2] is 9, a[3] is 8, a[4] is 7, a[5] is
+  ** 6 and each subsequent value (if any) is 5.  */
+  memcpy(&a[1], aVal, nCopy*sizeof(LogEst));
+  for(i=nCopy+1; i<=pIdx->nKeyCol; i++){
+    a[i] = 23;                    assert( 23==sqlite3LogEst(5) );
   }
+
+  assert( 0==sqlite3LogEst(1) );
+  if( pIdx->onError!=OE_None ) a[pIdx->nKeyCol] = 0;
 }
 
 /*
@@ -85184,7 +88611,7 @@ SQLITE_PRIVATE void sqlite3DropIndex(Parse *pParse, SrcList *pName, int ifExists
     pParse->checkSchema = 1;
     goto exit_drop_index;
   }
-  if( pIndex->autoIndex ){
+  if( pIndex->idxType!=SQLITE_IDXTYPE_APPDEF ){
     sqlite3ErrorMsg(pParse, "index associated with UNIQUE "
       "or PRIMARY KEY constraint cannot be dropped", 0);
     goto exit_drop_index;
@@ -85353,7 +88780,7 @@ SQLITE_PRIVATE SrcList *sqlite3SrcListEnlarge(
   assert( iStart<=pSrc->nSrc );
 
   /* Allocate additional space if needed */
-  if( pSrc->nSrc+nExtra>pSrc->nAlloc ){
+  if( (u32)pSrc->nSrc+nExtra>pSrc->nAlloc ){
     SrcList *pNew;
     int nAlloc = pSrc->nSrc+nExtra;
     int nGot;
@@ -85365,7 +88792,7 @@ SQLITE_PRIVATE SrcList *sqlite3SrcListEnlarge(
     }
     pSrc = pNew;
     nGot = (sqlite3DbMallocSize(db, pNew) - sizeof(*pSrc))/sizeof(pSrc->a[0])+1;
-    pSrc->nAlloc = (u16)nGot;
+    pSrc->nAlloc = nGot;
   }
 
   /* Move existing slots that come after the newly inserted slots
@@ -85373,7 +88800,7 @@ SQLITE_PRIVATE SrcList *sqlite3SrcListEnlarge(
   for(i=pSrc->nSrc-1; i>=iStart; i--){
     pSrc->a[i+nExtra] = pSrc->a[i];
   }
-  pSrc->nSrc += (i16)nExtra;
+  pSrc->nSrc += nExtra;
 
   /* Zero the newly allocated slots */
   memset(&pSrc->a[iStart], 0, sizeof(pSrc->a[0])*nExtra);
@@ -85705,59 +89132,26 @@ SQLITE_PRIVATE int sqlite3OpenTempDatabase(Parse *pParse){
 }
 
 /*
-** Generate VDBE code that will verify the schema cookie and start
-** a read-transaction for all named database files.
-**
-** It is important that all schema cookies be verified and all
-** read transactions be started before anything else happens in
-** the VDBE program.  But this routine can be called after much other
-** code has been generated.  So here is what we do:
-**
-** The first time this routine is called, we code an OP_Goto that
-** will jump to a subroutine at the end of the program.  Then we
-** record every database that needs its schema verified in the
-** pParse->cookieMask field.  Later, after all other code has been
-** generated, the subroutine that does the cookie verifications and
-** starts the transactions will be coded and the OP_Goto P2 value
-** will be made to point to that subroutine.  The generation of the
-** cookie verification subroutine code happens in sqlite3FinishCoding().
-**
-** If iDb<0 then code the OP_Goto only - don't set flag to verify the
-** schema on any databases.  This can be used to position the OP_Goto
-** early in the code, before we know if any database tables will be used.
+** Record the fact that the schema cookie will need to be verified
+** for database iDb.  The code to actually verify the schema cookie
+** will occur at the end of the top-level VDBE and will be generated
+** later, by sqlite3FinishCoding().
 */
 SQLITE_PRIVATE void sqlite3CodeVerifySchema(Parse *pParse, int iDb){
   Parse *pToplevel = sqlite3ParseToplevel(pParse);
+  sqlite3 *db = pToplevel->db;
+  yDbMask mask;
 
-#ifndef SQLITE_OMIT_TRIGGER
-  if( pToplevel!=pParse ){
-    /* This branch is taken if a trigger is currently being coded. In this
-    ** case, set cookieGoto to a non-zero value to show that this function
-    ** has been called. This is used by the sqlite3ExprCodeConstants()
-    ** function. */
-    pParse->cookieGoto = -1;
-  }
-#endif
-  if( pToplevel->cookieGoto==0 ){
-    Vdbe *v = sqlite3GetVdbe(pToplevel);
-    if( v==0 ) return;  /* This only happens if there was a prior error */
-    pToplevel->cookieGoto = sqlite3VdbeAddOp2(v, OP_Goto, 0, 0)+1;
-  }
-  if( iDb>=0 ){
-    sqlite3 *db = pToplevel->db;
-    yDbMask mask;
-
-    assert( iDb<db->nDb );
-    assert( db->aDb[iDb].pBt!=0 || iDb==1 );
-    assert( iDb<SQLITE_MAX_ATTACHED+2 );
-    assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
-    mask = ((yDbMask)1)<<iDb;
-    if( (pToplevel->cookieMask & mask)==0 ){
-      pToplevel->cookieMask |= mask;
-      pToplevel->cookieValue[iDb] = db->aDb[iDb].pSchema->schema_cookie;
-      if( !OMIT_TEMPDB && iDb==1 ){
-        sqlite3OpenTempDatabase(pToplevel);
-      }
+  assert( iDb>=0 && iDb<db->nDb );
+  assert( db->aDb[iDb].pBt!=0 || iDb==1 );
+  assert( iDb<SQLITE_MAX_ATTACHED+2 );
+  assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
+  mask = ((yDbMask)1)<<iDb;
+  if( (pToplevel->cookieMask & mask)==0 ){
+    pToplevel->cookieMask |= mask;
+    pToplevel->cookieValue[iDb] = db->aDb[iDb].pSchema->schema_cookie;
+    if( !OMIT_TEMPDB && iDb==1 ){
+      sqlite3OpenTempDatabase(pToplevel);
     }
   }
 }
@@ -85840,7 +89234,8 @@ SQLITE_PRIVATE void sqlite3HaltConstraint(
   int errCode,      /* extended error code */
   int onError,      /* Constraint type */
   char *p4,         /* Error message */
-  int p4type        /* P4_STATIC or P4_TRANSIENT */
+  i8 p4type,        /* P4_STATIC or P4_TRANSIENT */
+  u8 p5Errmsg       /* P5_ErrMsg type */
 ){
   Vdbe *v = sqlite3GetVdbe(pParse);
   assert( (errCode&0xff)==SQLITE_CONSTRAINT );
@@ -85848,6 +89243,59 @@ SQLITE_PRIVATE void sqlite3HaltConstraint(
     sqlite3MayAbort(pParse);
   }
   sqlite3VdbeAddOp4(v, OP_Halt, errCode, onError, 0, p4, p4type);
+  if( p5Errmsg ) sqlite3VdbeChangeP5(v, p5Errmsg);
+}
+
+/*
+** Code an OP_Halt due to UNIQUE or PRIMARY KEY constraint violation.
+*/
+SQLITE_PRIVATE void sqlite3UniqueConstraint(
+  Parse *pParse,    /* Parsing context */
+  int onError,      /* Constraint type */
+  Index *pIdx       /* The index that triggers the constraint */
+){
+  char *zErr;
+  int j;
+  StrAccum errMsg;
+  Table *pTab = pIdx->pTable;
+
+  sqlite3StrAccumInit(&errMsg, 0, 0, 200);
+  errMsg.db = pParse->db;
+  for(j=0; j<pIdx->nKeyCol; j++){
+    char *zCol = pTab->aCol[pIdx->aiColumn[j]].zName;
+    if( j ) sqlite3StrAccumAppend(&errMsg, ", ", 2);
+    sqlite3StrAccumAppendAll(&errMsg, pTab->zName);
+    sqlite3StrAccumAppend(&errMsg, ".", 1);
+    sqlite3StrAccumAppendAll(&errMsg, zCol);
+  }
+  zErr = sqlite3StrAccumFinish(&errMsg);
+  sqlite3HaltConstraint(pParse, 
+    IsPrimaryKeyIndex(pIdx) ? SQLITE_CONSTRAINT_PRIMARYKEY 
+                            : SQLITE_CONSTRAINT_UNIQUE,
+    onError, zErr, P4_DYNAMIC, P5_ConstraintUnique);
+}
+
+
+/*
+** Code an OP_Halt due to non-unique rowid.
+*/
+SQLITE_PRIVATE void sqlite3RowidConstraint(
+  Parse *pParse,    /* Parsing context */
+  int onError,      /* Conflict resolution algorithm */
+  Table *pTab       /* The table with the non-unique rowid */ 
+){
+  char *zMsg;
+  int rc;
+  if( pTab->iPKey>=0 ){
+    zMsg = sqlite3MPrintf(pParse->db, "%s.%s", pTab->zName,
+                          pTab->aCol[pTab->iPKey].zName);
+    rc = SQLITE_CONSTRAINT_PRIMARYKEY;
+  }else{
+    zMsg = sqlite3MPrintf(pParse->db, "%s.rowid", pTab->zName);
+    rc = SQLITE_CONSTRAINT_ROWID;
+  }
+  sqlite3HaltConstraint(pParse, rc, onError, zMsg, P4_DYNAMIC,
+                        P5_ConstraintUnique);
 }
 
 /*
@@ -85860,8 +89308,8 @@ static int collationMatch(const char *zColl, Index *pIndex){
   assert( zColl!=0 );
   for(i=0; i<pIndex->nColumn; i++){
     const char *z = pIndex->azColl[i];
-    assert( z!=0 );
-    if( 0==sqlite3StrICmp(z, zColl) ){
+    assert( z!=0 || pIndex->aiColumn[i]<0 );
+    if( pIndex->aiColumn[i]>=0 && 0==sqlite3StrICmp(z, zColl) ){
       return 1;
     }
   }
@@ -85980,42 +89428,122 @@ SQLITE_PRIVATE void sqlite3Reindex(Parse *pParse, Token *pName1, Token *pName2){
 #endif
 
 /*
-** Return a dynamicly allocated KeyInfo structure that can be used
-** with OP_OpenRead or OP_OpenWrite to access database index pIdx.
+** Return a KeyInfo structure that is appropriate for the given Index.
 **
-** If successful, a pointer to the new structure is returned. In this case
-** the caller is responsible for calling sqlite3DbFree(db, ) on the returned 
-** pointer. If an error occurs (out of memory or missing collation 
-** sequence), NULL is returned and the state of pParse updated to reflect
-** the error.
+** The KeyInfo structure for an index is cached in the Index object.
+** So there might be multiple references to the returned pointer.  The
+** caller should not try to modify the KeyInfo object.
+**
+** The caller should invoke sqlite3KeyInfoUnref() on the returned object
+** when it has finished using it.
 */
-SQLITE_PRIVATE KeyInfo *sqlite3IndexKeyinfo(Parse *pParse, Index *pIdx){
-  int i;
-  int nCol = pIdx->nColumn;
-  int nBytes = sizeof(KeyInfo) + (nCol-1)*sizeof(CollSeq*) + nCol;
-  sqlite3 *db = pParse->db;
-  KeyInfo *pKey = (KeyInfo *)sqlite3DbMallocZero(db, nBytes);
-
-  if( pKey ){
-    pKey->db = pParse->db;
-    pKey->aSortOrder = (u8 *)&(pKey->aColl[nCol]);
-    assert( &pKey->aSortOrder[nCol]==&(((u8 *)pKey)[nBytes]) );
-    for(i=0; i<nCol; i++){
-      char *zColl = pIdx->azColl[i];
-      assert( zColl );
-      pKey->aColl[i] = sqlite3LocateCollSeq(pParse, zColl);
-      pKey->aSortOrder[i] = pIdx->aSortOrder[i];
+SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoOfIndex(Parse *pParse, Index *pIdx){
+  if( pParse->nErr ) return 0;
+#ifndef SQLITE_OMIT_SHARED_CACHE
+  if( pIdx->pKeyInfo && pIdx->pKeyInfo->db!=pParse->db ){
+    sqlite3KeyInfoUnref(pIdx->pKeyInfo);
+    pIdx->pKeyInfo = 0;
+  }
+#endif
+  if( pIdx->pKeyInfo==0 ){
+    int i;
+    int nCol = pIdx->nColumn;
+    int nKey = pIdx->nKeyCol;
+    KeyInfo *pKey;
+    if( pIdx->uniqNotNull ){
+      pKey = sqlite3KeyInfoAlloc(pParse->db, nKey, nCol-nKey);
+    }else{
+      pKey = sqlite3KeyInfoAlloc(pParse->db, nCol, 0);
+    }
+    if( pKey ){
+      assert( sqlite3KeyInfoIsWriteable(pKey) );
+      for(i=0; i<nCol; i++){
+        char *zColl = pIdx->azColl[i];
+        assert( zColl!=0 );
+        pKey->aColl[i] = strcmp(zColl,"BINARY")==0 ? 0 :
+                          sqlite3LocateCollSeq(pParse, zColl);
+        pKey->aSortOrder[i] = pIdx->aSortOrder[i];
+      }
+      if( pParse->nErr ){
+        sqlite3KeyInfoUnref(pKey);
+      }else{
+        pIdx->pKeyInfo = pKey;
+      }
+    }
+  }
+  return sqlite3KeyInfoRef(pIdx->pKeyInfo);
+}
+
+#ifndef SQLITE_OMIT_CTE
+/* 
+** This routine is invoked once per CTE by the parser while parsing a 
+** WITH clause. 
+*/
+SQLITE_PRIVATE With *sqlite3WithAdd(
+  Parse *pParse,          /* Parsing context */
+  With *pWith,            /* Existing WITH clause, or NULL */
+  Token *pName,           /* Name of the common-table */
+  ExprList *pArglist,     /* Optional column name list for the table */
+  Select *pQuery          /* Query used to initialize the table */
+){
+  sqlite3 *db = pParse->db;
+  With *pNew;
+  char *zName;
+
+  /* Check that the CTE name is unique within this WITH clause. If
+  ** not, store an error in the Parse structure. */
+  zName = sqlite3NameFromToken(pParse->db, pName);
+  if( zName && pWith ){
+    int i;
+    for(i=0; i<pWith->nCte; i++){
+      if( sqlite3StrICmp(zName, pWith->a[i].zName)==0 ){
+        sqlite3ErrorMsg(pParse, "duplicate WITH table name: %s", zName);
+      }
     }
-    pKey->nField = (u16)nCol;
   }
 
-  if( pParse->nErr ){
-    sqlite3DbFree(db, pKey);
-    pKey = 0;
+  if( pWith ){
+    int nByte = sizeof(*pWith) + (sizeof(pWith->a[1]) * pWith->nCte);
+    pNew = sqlite3DbRealloc(db, pWith, nByte);
+  }else{
+    pNew = sqlite3DbMallocZero(db, sizeof(*pWith));
   }
-  return pKey;
+  assert( zName!=0 || pNew==0 );
+  assert( db->mallocFailed==0 || pNew==0 );
+
+  if( pNew==0 ){
+    sqlite3ExprListDelete(db, pArglist);
+    sqlite3SelectDelete(db, pQuery);
+    sqlite3DbFree(db, zName);
+    pNew = pWith;
+  }else{
+    pNew->a[pNew->nCte].pSelect = pQuery;
+    pNew->a[pNew->nCte].pCols = pArglist;
+    pNew->a[pNew->nCte].zName = zName;
+    pNew->a[pNew->nCte].zErr = 0;
+    pNew->nCte++;
+  }
+
+  return pNew;
 }
 
+/*
+** Free the contents of the With object passed as the second argument.
+*/
+SQLITE_PRIVATE void sqlite3WithDelete(sqlite3 *db, With *pWith){
+  if( pWith ){
+    int i;
+    for(i=0; i<pWith->nCte; i++){
+      struct Cte *pCte = &pWith->a[i];
+      sqlite3ExprListDelete(db, pCte->pCols);
+      sqlite3SelectDelete(db, pCte->pSelect);
+      sqlite3DbFree(db, pCte->zName);
+    }
+    sqlite3DbFree(db, pWith);
+  }
+}
+#endif /* !defined(SQLITE_OMIT_CTE) */
+
 /************** End of build.c ***********************************************/
 /************** Begin file callback.c ****************************************/
 /*
@@ -86289,9 +89817,9 @@ static int matchQuality(
   }
 
   /* Bonus points if the text encoding matches */
-  if( enc==p->iPrefEnc ){
+  if( enc==(p->funcFlags & SQLITE_FUNC_ENCMASK) ){
     match += 2;  /* Exact encoding match */
-  }else if( (enc & p->iPrefEnc & 2)!=0 ){
+  }else if( (enc & p->funcFlags & 2)!=0 ){
     match += 1;  /* Both are UTF16, but with different byte orders */
   }
 
@@ -86376,7 +89904,6 @@ SQLITE_PRIVATE FuncDef *sqlite3FindFunction(
 
   assert( nArg>=(-2) );
   assert( nArg>=(-1) || createFlag==0 );
-  assert( enc==SQLITE_UTF8 || enc==SQLITE_UTF16LE || enc==SQLITE_UTF16BE );
   h = (sqlite3UpperToLower[(u8)zName[0]] + nName) % ArraySize(db->aFunc.a);
 
   /* First search for a match amongst the application-defined functions.
@@ -86425,7 +89952,7 @@ SQLITE_PRIVATE FuncDef *sqlite3FindFunction(
       (pBest = sqlite3DbMallocZero(db, sizeof(*pBest)+nName+1))!=0 ){
     pBest->zName = (char *)&pBest[1];
     pBest->nArg = (u16)nArg;
-    pBest->iPrefEnc = enc;
+    pBest->funcFlags = enc;
     memcpy(pBest->zName, zName, nName);
     pBest->zName[nName] = 0;
     sqlite3FuncDefInsert(&db->aFunc, pBest);
@@ -86596,10 +90123,8 @@ SQLITE_PRIVATE void sqlite3MaterializeView(
   SrcList *pFrom;
   sqlite3 *db = pParse->db;
   int iDb = sqlite3SchemaToIndex(db, pView->pSchema);
-
   pWhere = sqlite3ExprDup(db, pWhere, 0);
   pFrom = sqlite3SrcListAppend(db, 0, 0, 0);
-
   if( pFrom ){
     assert( pFrom->nSrc==1 );
     pFrom->a[0].zName = sqlite3DbStrDup(db, pView->zName);
@@ -86607,10 +90132,7 @@ SQLITE_PRIVATE void sqlite3MaterializeView(
     assert( pFrom->a[0].pOn==0 );
     assert( pFrom->a[0].pUsing==0 );
   }
-
   pSel = sqlite3SelectNew(pParse, 0, pFrom, pWhere, 0, 0, 0, 0, 0, 0);
-  if( pSel ) pSel->selFlags |= SF_Materialize;
-
   sqlite3SelectDestInit(&dest, SRT_EphemTab, iCur);
   sqlite3Select(pParse, pSel, &dest);
   sqlite3SelectDelete(db, pSel);
@@ -86633,7 +90155,7 @@ SQLITE_PRIVATE Expr *sqlite3LimitWhere(
   ExprList *pOrderBy,          /* The ORDER BY clause.  May be null */
   Expr *pLimit,                /* The LIMIT clause.  May be null */
   Expr *pOffset,               /* The OFFSET clause.  May be null */
-  char *zStmtType              /* Either DELETE or UPDATE.  For error messages. */
+  char *zStmtType              /* Either DELETE or UPDATE.  For err msgs. */
 ){
   Expr *pWhereRowid = NULL;    /* WHERE rowid .. */
   Expr *pInClause = NULL;      /* WHERE rowid IN ( select ) */
@@ -86708,7 +90230,8 @@ SQLITE_PRIVATE Expr *sqlite3LimitWhere(
   sqlite3ExprDelete(pParse->db, pOffset);
   return 0;
 }
-#endif /* defined(SQLITE_ENABLE_UPDATE_DELETE_LIMIT) && !defined(SQLITE_OMIT_SUBQUERY) */
+#endif /* defined(SQLITE_ENABLE_UPDATE_DELETE_LIMIT) */
+       /*      && !defined(SQLITE_OMIT_SUBQUERY) */
 
 /*
 ** Generate code for a DELETE FROM statement.
@@ -86725,18 +90248,34 @@ SQLITE_PRIVATE void sqlite3DeleteFrom(
   Vdbe *v;               /* The virtual database engine */
   Table *pTab;           /* The table from which records will be deleted */
   const char *zDb;       /* Name of database holding pTab */
-  int end, addr = 0;     /* A couple addresses of generated code */
   int i;                 /* Loop counter */
   WhereInfo *pWInfo;     /* Information about the WHERE clause */
   Index *pIdx;           /* For looping over indices of the table */
-  int iCur;              /* VDBE Cursor number for pTab */
+  int iTabCur;           /* Cursor number for the table */
+  int iDataCur;          /* VDBE cursor for the canonical data source */
+  int iIdxCur;           /* Cursor number of the first index */
+  int nIdx;              /* Number of indices */
   sqlite3 *db;           /* Main database structure */
   AuthContext sContext;  /* Authorization context */
   NameContext sNC;       /* Name context to resolve expressions in */
   int iDb;               /* Database number */
   int memCnt = -1;       /* Memory cell used for change counting */
   int rcauth;            /* Value returned by authorization callback */
-
+  int okOnePass;         /* True for one-pass algorithm without the FIFO */
+  int aiCurOnePass[2];   /* The write cursors opened by WHERE_ONEPASS */
+  u8 *aToOpen = 0;       /* Open cursor iTabCur+j if aToOpen[j] is true */
+  Index *pPk;            /* The PRIMARY KEY index on the table */
+  int iPk = 0;           /* First of nPk registers holding PRIMARY KEY value */
+  i16 nPk = 1;           /* Number of columns in the PRIMARY KEY */
+  int iKey;              /* Memory cell holding key of row to be deleted */
+  i16 nKey;              /* Number of memory cells in the row key */
+  int iEphCur = 0;       /* Ephemeral table holding all primary key values */
+  int iRowSet = 0;       /* Register for rowset of rows to delete */
+  int addrBypass = 0;    /* Address of jump over the delete logic */
+  int addrLoop = 0;      /* Top of the delete loop */
+  int addrDelete = 0;    /* Jump directly to the delete logic */
+  int addrEphOpen = 0;   /* Instruction to open the Ephermeral table */
+ 
 #ifndef SQLITE_OMIT_TRIGGER
   int isView;                  /* True if attempting to delete from a view */
   Trigger *pTrigger;           /* List of table triggers, if required */
@@ -86791,11 +90330,11 @@ SQLITE_PRIVATE void sqlite3DeleteFrom(
   }
   assert(!isView || pTrigger);
 
-  /* Assign  cursor number to the table and all its indices.
+  /* Assign cursor numbers to the table and all its indices.
   */
   assert( pTabList->nSrc==1 );
-  iCur = pTabList->a[0].iCursor = pParse->nTab++;
-  for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+  iTabCur = pTabList->a[0].iCursor = pParse->nTab++;
+  for(nIdx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdx++){
     pParse->nTab++;
   }
 
@@ -86819,7 +90358,8 @@ SQLITE_PRIVATE void sqlite3DeleteFrom(
   */
 #if !defined(SQLITE_OMIT_VIEW) && !defined(SQLITE_OMIT_TRIGGER)
   if( isView ){
-    sqlite3MaterializeView(pParse, pTab, pWhere, iCur);
+    sqlite3MaterializeView(pParse, pTab, pWhere, iTabCur);
+    iDataCur = iIdxCur = iTabCur;
   }
 #endif
 
@@ -86849,78 +90389,171 @@ SQLITE_PRIVATE void sqlite3DeleteFrom(
    && 0==sqlite3FkRequired(pParse, pTab, 0, 0)
   ){
     assert( !isView );
-    sqlite3VdbeAddOp4(v, OP_Clear, pTab->tnum, iDb, memCnt,
-                      pTab->zName, P4_STATIC);
+    sqlite3TableLock(pParse, iDb, pTab->tnum, 1, pTab->zName);
+    if( HasRowid(pTab) ){
+      sqlite3VdbeAddOp4(v, OP_Clear, pTab->tnum, iDb, memCnt,
+                        pTab->zName, P4_STATIC);
+    }
     for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
       assert( pIdx->pSchema==pTab->pSchema );
       sqlite3VdbeAddOp2(v, OP_Clear, pIdx->tnum, iDb);
     }
   }else
 #endif /* SQLITE_OMIT_TRUNCATE_OPTIMIZATION */
-  /* The usual case: There is a WHERE clause so we have to scan through
-  ** the table and pick which records to delete.
-  */
   {
-    int iRowSet = ++pParse->nMem;   /* Register for rowset of rows to delete */
-    int iRowid = ++pParse->nMem;    /* Used for storing rowid values. */
-    int regRowid;                   /* Actual register containing rowids */
-
-    /* Collect rowids of every row to be deleted.
+    if( HasRowid(pTab) ){
+      /* For a rowid table, initialize the RowSet to an empty set */
+      pPk = 0;
+      nPk = 1;
+      iRowSet = ++pParse->nMem;
+      sqlite3VdbeAddOp2(v, OP_Null, 0, iRowSet);
+    }else{
+      /* For a WITHOUT ROWID table, create an ephermeral table used to
+      ** hold all primary keys for rows to be deleted. */
+      pPk = sqlite3PrimaryKeyIndex(pTab);
+      assert( pPk!=0 );
+      nPk = pPk->nKeyCol;
+      iPk = pParse->nMem+1;
+      pParse->nMem += nPk;
+      iEphCur = pParse->nTab++;
+      addrEphOpen = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, iEphCur, nPk);
+      sqlite3VdbeSetP4KeyInfo(pParse, pPk);
+    }
+  
+    /* Construct a query to find the rowid or primary key for every row
+    ** to be deleted, based on the WHERE clause.
     */
-    sqlite3VdbeAddOp2(v, OP_Null, 0, iRowSet);
-    pWInfo = sqlite3WhereBegin(
-        pParse, pTabList, pWhere, 0, 0, WHERE_DUPLICATES_OK, 0
-    );
+    pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, 0, 0, 
+                               WHERE_ONEPASS_DESIRED|WHERE_DUPLICATES_OK,
+                               iTabCur+1);
     if( pWInfo==0 ) goto delete_from_cleanup;
-    regRowid = sqlite3ExprCodeGetColumn(pParse, pTab, -1, iCur, iRowid, 0);
-    sqlite3VdbeAddOp2(v, OP_RowSetAdd, iRowSet, regRowid);
+    okOnePass = sqlite3WhereOkOnePass(pWInfo, aiCurOnePass);
+  
+    /* Keep track of the number of rows to be deleted */
     if( db->flags & SQLITE_CountRows ){
       sqlite3VdbeAddOp2(v, OP_AddImm, memCnt, 1);
     }
+  
+    /* Extract the rowid or primary key for the current row */
+    if( pPk ){
+      for(i=0; i<nPk; i++){
+        sqlite3ExprCodeGetColumnOfTable(v, pTab, iTabCur,
+                                        pPk->aiColumn[i], iPk+i);
+      }
+      iKey = iPk;
+    }else{
+      iKey = pParse->nMem + 1;
+      iKey = sqlite3ExprCodeGetColumn(pParse, pTab, -1, iTabCur, iKey, 0);
+      if( iKey>pParse->nMem ) pParse->nMem = iKey;
+    }
+  
+    if( okOnePass ){
+      /* For ONEPASS, no need to store the rowid/primary-key.  There is only
+      ** one, so just keep it in its register(s) and fall through to the
+      ** delete code.
+      */
+      nKey = nPk; /* OP_Found will use an unpacked key */
+      aToOpen = sqlite3DbMallocRaw(db, nIdx+2);
+      if( aToOpen==0 ){
+        sqlite3WhereEnd(pWInfo);
+        goto delete_from_cleanup;
+      }
+      memset(aToOpen, 1, nIdx+1);
+      aToOpen[nIdx+1] = 0;
+      if( aiCurOnePass[0]>=0 ) aToOpen[aiCurOnePass[0]-iTabCur] = 0;
+      if( aiCurOnePass[1]>=0 ) aToOpen[aiCurOnePass[1]-iTabCur] = 0;
+      if( addrEphOpen ) sqlite3VdbeChangeToNoop(v, addrEphOpen);
+      addrDelete = sqlite3VdbeAddOp0(v, OP_Goto); /* Jump to DELETE logic */
+    }else if( pPk ){
+      /* Construct a composite key for the row to be deleted and remember it */
+      iKey = ++pParse->nMem;
+      nKey = 0;   /* Zero tells OP_Found to use a composite key */
+      sqlite3VdbeAddOp4(v, OP_MakeRecord, iPk, nPk, iKey,
+                        sqlite3IndexAffinityStr(v, pPk), nPk);
+      sqlite3VdbeAddOp2(v, OP_IdxInsert, iEphCur, iKey);
+    }else{
+      /* Get the rowid of the row to be deleted and remember it in the RowSet */
+      nKey = 1;  /* OP_Seek always uses a single rowid */
+      sqlite3VdbeAddOp2(v, OP_RowSetAdd, iRowSet, iKey);
+    }
+  
+    /* End of the WHERE loop */
     sqlite3WhereEnd(pWInfo);
-
-    /* Delete every item whose key was written to the list during the
-    ** database scan.  We have to delete items after the scan is complete
-    ** because deleting an item can change the scan order.  */
-    end = sqlite3VdbeMakeLabel(v);
-
+    if( okOnePass ){
+      /* Bypass the delete logic below if the WHERE loop found zero rows */
+      addrBypass = sqlite3VdbeMakeLabel(v);
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, addrBypass);
+      sqlite3VdbeJumpHere(v, addrDelete);
+    }
+  
     /* Unless this is a view, open cursors for the table we are 
     ** deleting from and all its indices. If this is a view, then the
     ** only effect this statement has is to fire the INSTEAD OF 
-    ** triggers.  */
+    ** triggers.
+    */
     if( !isView ){
-      sqlite3OpenTableAndIndices(pParse, pTab, iCur, OP_OpenWrite);
+      sqlite3OpenTableAndIndices(pParse, pTab, OP_OpenWrite, iTabCur, aToOpen,
+                                 &iDataCur, &iIdxCur);
+      assert( pPk || iDataCur==iTabCur );
+      assert( pPk || iIdxCur==iDataCur+1 );
     }
-
-    addr = sqlite3VdbeAddOp3(v, OP_RowSetRead, iRowSet, end, iRowid);
-
+  
+    /* Set up a loop over the rowids/primary-keys that were found in the
+    ** where-clause loop above.
+    */
+    if( okOnePass ){
+      /* Just one row.  Hence the top-of-loop is a no-op */
+      assert( nKey==nPk ); /* OP_Found will use an unpacked key */
+      if( aToOpen[iDataCur-iTabCur] ){
+        assert( pPk!=0 );
+        sqlite3VdbeAddOp4Int(v, OP_NotFound, iDataCur, addrBypass, iKey, nKey);
+        VdbeCoverage(v);
+      }
+    }else if( pPk ){
+      addrLoop = sqlite3VdbeAddOp1(v, OP_Rewind, iEphCur); VdbeCoverage(v);
+      sqlite3VdbeAddOp2(v, OP_RowKey, iEphCur, iKey);
+      assert( nKey==0 );  /* OP_Found will use a composite key */
+    }else{
+      addrLoop = sqlite3VdbeAddOp3(v, OP_RowSetRead, iRowSet, 0, iKey);
+      VdbeCoverage(v);
+      assert( nKey==1 );
+    }  
+  
     /* Delete the row */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
     if( IsVirtual(pTab) ){
       const char *pVTab = (const char *)sqlite3GetVTable(db, pTab);
       sqlite3VtabMakeWritable(pParse, pTab);
-      sqlite3VdbeAddOp4(v, OP_VUpdate, 0, 1, iRowid, pVTab, P4_VTAB);
+      sqlite3VdbeAddOp4(v, OP_VUpdate, 0, 1, iKey, pVTab, P4_VTAB);
       sqlite3VdbeChangeP5(v, OE_Abort);
       sqlite3MayAbort(pParse);
     }else
 #endif
     {
       int count = (pParse->nested==0);    /* True to count changes */
-      sqlite3GenerateRowDelete(pParse, pTab, iCur, iRowid, count, pTrigger, OE_Default);
+      sqlite3GenerateRowDelete(pParse, pTab, pTrigger, iDataCur, iIdxCur,
+                               iKey, nKey, count, OE_Default, okOnePass);
     }
-
-    /* End of the delete loop */
-    sqlite3VdbeAddOp2(v, OP_Goto, 0, addr);
-    sqlite3VdbeResolveLabel(v, end);
-
+  
+    /* End of the loop over all rowids/primary-keys. */
+    if( okOnePass ){
+      sqlite3VdbeResolveLabel(v, addrBypass);
+    }else if( pPk ){
+      sqlite3VdbeAddOp2(v, OP_Next, iEphCur, addrLoop+1); VdbeCoverage(v);
+      sqlite3VdbeJumpHere(v, addrLoop);
+    }else{
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, addrLoop);
+      sqlite3VdbeJumpHere(v, addrLoop);
+    }     
+  
     /* Close the cursors open on the table and its indexes. */
     if( !isView && !IsVirtual(pTab) ){
-      for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){
-        sqlite3VdbeAddOp2(v, OP_Close, iCur + i, pIdx->tnum);
+      if( !pPk ) sqlite3VdbeAddOp1(v, OP_Close, iDataCur);
+      for(i=0, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){
+        sqlite3VdbeAddOp1(v, OP_Close, iIdxCur + i);
       }
-      sqlite3VdbeAddOp1(v, OP_Close, iCur);
     }
-  }
+  } /* End non-truncate path */
 
   /* Update the sqlite_sequence table by storing the content of the
   ** maximum rowid counter values recorded while inserting into
@@ -86944,6 +90577,7 @@ SQLITE_PRIVATE void sqlite3DeleteFrom(
   sqlite3AuthContextPop(&sContext);
   sqlite3SrcListDelete(db, pTabList);
   sqlite3ExprDelete(db, pWhere);
+  sqlite3DbFree(db, aToOpen);
   return;
 }
 /* Make sure "isView" and other macros defined above are undefined. Otherwise
@@ -86958,50 +90592,63 @@ SQLITE_PRIVATE void sqlite3DeleteFrom(
 
 /*
 ** This routine generates VDBE code that causes a single row of a
-** single table to be deleted.
+** single table to be deleted.  Both the original table entry and
+** all indices are removed.
 **
-** The VDBE must be in a particular state when this routine is called.
-** These are the requirements:
+** Preconditions:
 **
-**   1.  A read/write cursor pointing to pTab, the table containing the row
-**       to be deleted, must be opened as cursor number $iCur.
+**   1.  iDataCur is an open cursor on the btree that is the canonical data
+**       store for the table.  (This will be either the table itself,
+**       in the case of a rowid table, or the PRIMARY KEY index in the case
+**       of a WITHOUT ROWID table.)
 **
 **   2.  Read/write cursors for all indices of pTab must be open as
-**       cursor number base+i for the i-th index.
+**       cursor number iIdxCur+i for the i-th index.
 **
-**   3.  The record number of the row to be deleted must be stored in
-**       memory cell iRowid.
-**
-** This routine generates code to remove both the table record and all 
-** index entries that point to that record.
+**   3.  The primary key for the row to be deleted must be stored in a
+**       sequence of nPk memory cells starting at iPk.  If nPk==0 that means
+**       that a search record formed from OP_MakeRecord is contained in the
+**       single memory location iPk.
 */
 SQLITE_PRIVATE void sqlite3GenerateRowDelete(
   Parse *pParse,     /* Parsing context */
   Table *pTab,       /* Table containing the row to be deleted */
-  int iCur,          /* Cursor number for the table */
-  int iRowid,        /* Memory cell that contains the rowid to delete */
-  int count,         /* If non-zero, increment the row change counter */
   Trigger *pTrigger, /* List of triggers to (potentially) fire */
-  int onconf         /* Default ON CONFLICT policy for triggers */
+  int iDataCur,      /* Cursor from which column data is extracted */
+  int iIdxCur,       /* First index cursor */
+  int iPk,           /* First memory cell containing the PRIMARY KEY */
+  i16 nPk,           /* Number of PRIMARY KEY memory cells */
+  u8 count,          /* If non-zero, increment the row change counter */
+  u8 onconf,         /* Default ON CONFLICT policy for triggers */
+  u8 bNoSeek         /* iDataCur is already pointing to the row to delete */
 ){
   Vdbe *v = pParse->pVdbe;        /* Vdbe */
   int iOld = 0;                   /* First register in OLD.* array */
   int iLabel;                     /* Label resolved to end of generated code */
+  u8 opSeek;                      /* Seek opcode */
 
   /* Vdbe is guaranteed to have been allocated by this stage. */
   assert( v );
+  VdbeModuleComment((v, "BEGIN: GenRowDel(%d,%d,%d,%d)",
+                         iDataCur, iIdxCur, iPk, (int)nPk));
 
   /* Seek cursor iCur to the row to delete. If this row no longer exists 
   ** (this can happen if a trigger program has already deleted it), do
   ** not attempt to delete it or fire any DELETE triggers.  */
   iLabel = sqlite3VdbeMakeLabel(v);
-  sqlite3VdbeAddOp3(v, OP_NotExists, iCur, iLabel, iRowid);
+  opSeek = HasRowid(pTab) ? OP_NotExists : OP_NotFound;
+  if( !bNoSeek ){
+    sqlite3VdbeAddOp4Int(v, opSeek, iDataCur, iLabel, iPk, nPk);
+    VdbeCoverageIf(v, opSeek==OP_NotExists);
+    VdbeCoverageIf(v, opSeek==OP_NotFound);
+  }
  
   /* If there are any triggers to fire, allocate a range of registers to
   ** use for the old.* references in the triggers.  */
   if( sqlite3FkRequired(pParse, pTab, 0, 0) || pTrigger ){
     u32 mask;                     /* Mask of OLD.* columns in use */
     int iCol;                     /* Iterator used while populating OLD.* */
+    int addrStart;                /* Start of BEFORE trigger programs */
 
     /* TODO: Could use temporary registers here. Also could attempt to
     ** avoid copying the contents of the rowid register.  */
@@ -87014,36 +90661,44 @@ SQLITE_PRIVATE void sqlite3GenerateRowDelete(
 
     /* Populate the OLD.* pseudo-table register array. These values will be 
     ** used by any BEFORE and AFTER triggers that exist.  */
-    sqlite3VdbeAddOp2(v, OP_Copy, iRowid, iOld);
+    sqlite3VdbeAddOp2(v, OP_Copy, iPk, iOld);
     for(iCol=0; iCol<pTab->nCol; iCol++){
-      if( mask==0xffffffff || mask&(1<<iCol) ){
-        sqlite3ExprCodeGetColumnOfTable(v, pTab, iCur, iCol, iOld+iCol+1);
+      testcase( mask!=0xffffffff && iCol==31 );
+      testcase( mask!=0xffffffff && iCol==32 );
+      if( mask==0xffffffff || (iCol<=31 && (mask & MASKBIT32(iCol))!=0) ){
+        sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, iCol, iOld+iCol+1);
       }
     }
 
     /* Invoke BEFORE DELETE trigger programs. */
+    addrStart = sqlite3VdbeCurrentAddr(v);
     sqlite3CodeRowTrigger(pParse, pTrigger, 
         TK_DELETE, 0, TRIGGER_BEFORE, pTab, iOld, onconf, iLabel
     );
 
-    /* Seek the cursor to the row to be deleted again. It may be that
-    ** the BEFORE triggers coded above have already removed the row
-    ** being deleted. Do not attempt to delete the row a second time, and 
-    ** do not fire AFTER triggers.  */
-    sqlite3VdbeAddOp3(v, OP_NotExists, iCur, iLabel, iRowid);
+    /* If any BEFORE triggers were coded, then seek the cursor to the 
+    ** row to be deleted again. It may be that the BEFORE triggers moved
+    ** the cursor or of already deleted the row that the cursor was
+    ** pointing to.
+    */
+    if( addrStart<sqlite3VdbeCurrentAddr(v) ){
+      sqlite3VdbeAddOp4Int(v, opSeek, iDataCur, iLabel, iPk, nPk);
+      VdbeCoverageIf(v, opSeek==OP_NotExists);
+      VdbeCoverageIf(v, opSeek==OP_NotFound);
+    }
 
     /* Do FK processing. This call checks that any FK constraints that
     ** refer to this table (i.e. constraints attached to other tables) 
     ** are not violated by deleting this row.  */
-    sqlite3FkCheck(pParse, pTab, iOld, 0);
+    sqlite3FkCheck(pParse, pTab, iOld, 0, 0, 0);
   }
 
   /* Delete the index and table entries. Skip this step if pTab is really
   ** a view (in which case the only effect of the DELETE statement is to
   ** fire the INSTEAD OF triggers).  */ 
   if( pTab->pSelect==0 ){
-    sqlite3GenerateRowIndexDelete(pParse, pTab, iCur, 0);
-    sqlite3VdbeAddOp2(v, OP_Delete, iCur, (count?OPFLAG_NCHANGE:0));
+    sqlite3GenerateRowIndexDelete(pParse, pTab, iDataCur, iIdxCur, 0);
+    sqlite3VdbeAddOp2(v, OP_Delete, iDataCur, (count?OPFLAG_NCHANGE:0));
     if( count ){
       sqlite3VdbeChangeP4(v, -1, pTab->zName, P4_TRANSIENT);
     }
@@ -87052,7 +90707,7 @@ SQLITE_PRIVATE void sqlite3GenerateRowDelete(
   /* Do any ON CASCADE, SET NULL or SET DEFAULT operations required to
   ** handle rows (possibly in other tables) that refer via a foreign key
   ** to the row just deleted. */ 
-  sqlite3FkActions(pParse, pTab, 0, iOld);
+  sqlite3FkActions(pParse, pTab, 0, iOld, 0, 0);
 
   /* Invoke AFTER DELETE trigger programs. */
   sqlite3CodeRowTrigger(pParse, pTrigger, 
@@ -87063,58 +90718,98 @@ SQLITE_PRIVATE void sqlite3GenerateRowDelete(
   ** trigger programs were invoked. Or if a trigger program throws a 
   ** RAISE(IGNORE) exception.  */
   sqlite3VdbeResolveLabel(v, iLabel);
+  VdbeModuleComment((v, "END: GenRowDel()"));
 }
 
 /*
 ** This routine generates VDBE code that causes the deletion of all
-** index entries associated with a single row of a single table.
+** index entries associated with a single row of a single table, pTab
 **
-** The VDBE must be in a particular state when this routine is called.
-** These are the requirements:
+** Preconditions:
 **
-**   1.  A read/write cursor pointing to pTab, the table containing the row
-**       to be deleted, must be opened as cursor number "iCur".
+**   1.  A read/write cursor "iDataCur" must be open on the canonical storage
+**       btree for the table pTab.  (This will be either the table itself
+**       for rowid tables or to the primary key index for WITHOUT ROWID
+**       tables.)
 **
 **   2.  Read/write cursors for all indices of pTab must be open as
-**       cursor number iCur+i for the i-th index.
+**       cursor number iIdxCur+i for the i-th index.  (The pTab->pIndex
+**       index is the 0-th index.)
 **
-**   3.  The "iCur" cursor must be pointing to the row that is to be
-**       deleted.
+**   3.  The "iDataCur" cursor must be already be positioned on the row
+**       that is to be deleted.
 */
 SQLITE_PRIVATE void sqlite3GenerateRowIndexDelete(
   Parse *pParse,     /* Parsing and code generating context */
   Table *pTab,       /* Table containing the row to be deleted */
-  int iCur,          /* Cursor number for the table */
+  int iDataCur,      /* Cursor of table holding data. */
+  int iIdxCur,       /* First index cursor */
   int *aRegIdx       /* Only delete if aRegIdx!=0 && aRegIdx[i]>0 */
 ){
-  int i;
-  Index *pIdx;
-  int r1;
+  int i;             /* Index loop counter */
+  int r1 = -1;       /* Register holding an index key */
+  int iPartIdxLabel; /* Jump destination for skipping partial index entries */
+  Index *pIdx;       /* Current index */
+  Index *pPrior = 0; /* Prior index */
+  Vdbe *v;           /* The prepared statement under construction */
+  Index *pPk;        /* PRIMARY KEY index, or NULL for rowid tables */
 
-  for(i=1, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){
-    if( aRegIdx!=0 && aRegIdx[i-1]==0 ) continue;
-    r1 = sqlite3GenerateIndexKey(pParse, pIdx, iCur, 0, 0);
-    sqlite3VdbeAddOp3(pParse->pVdbe, OP_IdxDelete, iCur+i, r1,pIdx->nColumn+1);
+  v = pParse->pVdbe;
+  pPk = HasRowid(pTab) ? 0 : sqlite3PrimaryKeyIndex(pTab);
+  for(i=0, pIdx=pTab->pIndex; pIdx; i++, pIdx=pIdx->pNext){
+    assert( iIdxCur+i!=iDataCur || pPk==pIdx );
+    if( aRegIdx!=0 && aRegIdx[i]==0 ) continue;
+    if( pIdx==pPk ) continue;
+    VdbeModuleComment((v, "GenRowIdxDel for %s", pIdx->zName));
+    r1 = sqlite3GenerateIndexKey(pParse, pIdx, iDataCur, 0, 1,
+                                 &iPartIdxLabel, pPrior, r1);
+    sqlite3VdbeAddOp3(v, OP_IdxDelete, iIdxCur+i, r1,
+                      pIdx->uniqNotNull ? pIdx->nKeyCol : pIdx->nColumn);
+    sqlite3ResolvePartIdxLabel(pParse, iPartIdxLabel);
+    pPrior = pIdx;
   }
 }
 
 /*
-** Generate code that will assemble an index key and put it in register
+** Generate code that will assemble an index key and stores it in register
 ** regOut.  The key with be for index pIdx which is an index on pTab.
 ** iCur is the index of a cursor open on the pTab table and pointing to
-** the entry that needs indexing.
+** the entry that needs indexing.  If pTab is a WITHOUT ROWID table, then
+** iCur must be the cursor of the PRIMARY KEY index.
 **
 ** Return a register number which is the first in a block of
 ** registers that holds the elements of the index key.  The
 ** block of registers has already been deallocated by the time
 ** this routine returns.
+**
+** If *piPartIdxLabel is not NULL, fill it in with a label and jump
+** to that label if pIdx is a partial index that should be skipped.
+** The label should be resolved using sqlite3ResolvePartIdxLabel().
+** A partial index should be skipped if its WHERE clause evaluates
+** to false or null.  If pIdx is not a partial index, *piPartIdxLabel
+** will be set to zero which is an empty label that is ignored by
+** sqlite3ResolvePartIdxLabel().
+**
+** The pPrior and regPrior parameters are used to implement a cache to
+** avoid unnecessary register loads.  If pPrior is not NULL, then it is
+** a pointer to a different index for which an index key has just been
+** computed into register regPrior.  If the current pIdx index is generating
+** its key into the same sequence of registers and if pPrior and pIdx share
+** a column in common, then the register corresponding to that column already
+** holds the correct value and the loading of that register is skipped.
+** This optimization is helpful when doing a DELETE or an INTEGRITY_CHECK 
+** on a table with multiple indices, and especially with the ROWID or
+** PRIMARY KEY columns of the index.
 */
 SQLITE_PRIVATE int sqlite3GenerateIndexKey(
-  Parse *pParse,     /* Parsing context */
-  Index *pIdx,       /* The index for which to generate a key */
-  int iCur,          /* Cursor number for the pIdx->pTable table */
-  int regOut,        /* Write the new index key to this register */
-  int doMakeRec      /* Run the OP_MakeRecord instruction if true */
+  Parse *pParse,       /* Parsing context */
+  Index *pIdx,         /* The index for which to generate a key */
+  int iDataCur,        /* Cursor number from which to take column data */
+  int regOut,          /* Put the new key into this register if not 0 */
+  int prefixOnly,      /* Compute only a unique prefix of the key */
+  int *piPartIdxLabel, /* OUT: Jump to this label to skip partial index */
+  Index *pPrior,       /* Previously generated index key */
+  int regPrior         /* Register holding previous generated key */
 ){
   Vdbe *v = pParse->pVdbe;
   int j;
@@ -87122,34 +90817,51 @@ SQLITE_PRIVATE int sqlite3GenerateIndexKey(
   int regBase;
   int nCol;
 
-  nCol = pIdx->nColumn;
-  regBase = sqlite3GetTempRange(pParse, nCol+1);
-  sqlite3VdbeAddOp2(v, OP_Rowid, iCur, regBase+nCol);
+  if( piPartIdxLabel ){
+    if( pIdx->pPartIdxWhere ){
+      *piPartIdxLabel = sqlite3VdbeMakeLabel(v);
+      pParse->iPartIdxTab = iDataCur;
+      sqlite3ExprCachePush(pParse);
+      sqlite3ExprIfFalse(pParse, pIdx->pPartIdxWhere, *piPartIdxLabel, 
+                         SQLITE_JUMPIFNULL);
+    }else{
+      *piPartIdxLabel = 0;
+    }
+  }
+  nCol = (prefixOnly && pIdx->uniqNotNull) ? pIdx->nKeyCol : pIdx->nColumn;
+  regBase = sqlite3GetTempRange(pParse, nCol);
+  if( pPrior && (regBase!=regPrior || pPrior->pPartIdxWhere) ) pPrior = 0;
   for(j=0; j<nCol; j++){
-    int idx = pIdx->aiColumn[j];
-    if( idx==pTab->iPKey ){
-      sqlite3VdbeAddOp2(v, OP_SCopy, regBase+nCol, regBase+j);
-    }else{
-      sqlite3VdbeAddOp3(v, OP_Column, iCur, idx, regBase+j);
-      sqlite3ColumnDefault(v, pTab, idx, -1);
-    }
+    if( pPrior && pPrior->aiColumn[j]==pIdx->aiColumn[j] ) continue;
+    sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, pIdx->aiColumn[j],
+                                    regBase+j);
+    /* If the column affinity is REAL but the number is an integer, then it
+    ** might be stored in the table as an integer (using a compact
+    ** representation) then converted to REAL by an OP_RealAffinity opcode.
+    ** But we are getting ready to store this value back into an index, where
+    ** it should be converted by to INTEGER again.  So omit the OP_RealAffinity
+    ** opcode if it is present */
+    sqlite3VdbeDeletePriorOpcode(v, OP_RealAffinity);
   }
-  if( doMakeRec ){
-    const char *zAff;
-    if( pTab->pSelect
-     || OptimizationDisabled(pParse->db, SQLITE_IdxRealAsInt)
-    ){
-      zAff = 0;
-    }else{
-      zAff = sqlite3IndexAffinityStr(v, pIdx);
-    }
-    sqlite3VdbeAddOp3(v, OP_MakeRecord, regBase, nCol+1, regOut);
-    sqlite3VdbeChangeP4(v, -1, zAff, P4_TRANSIENT);
+  if( regOut ){
+    sqlite3VdbeAddOp3(v, OP_MakeRecord, regBase, nCol, regOut);
   }
-  sqlite3ReleaseTempRange(pParse, regBase, nCol+1);
+  sqlite3ReleaseTempRange(pParse, regBase, nCol);
   return regBase;
 }
 
+/*
+** If a prior call to sqlite3GenerateIndexKey() generated a jump-over label
+** because it was a partial index, then this routine should be called to
+** resolve that label.
+*/
+SQLITE_PRIVATE void sqlite3ResolvePartIdxLabel(Parse *pParse, int iLabel){
+  if( iLabel ){
+    sqlite3VdbeResolveLabel(pParse->pVdbe, iLabel);
+    sqlite3ExprCachePop(pParse);
+  }
+}
+
 /************** End of delete.c **********************************************/
 /************** Begin file func.c ********************************************/
 /*
@@ -87289,9 +91001,9 @@ static void absFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
     case SQLITE_INTEGER: {
       i64 iVal = sqlite3_value_int64(argv[0]);
       if( iVal<0 ){
-        if( (iVal<<1)==0 ){
-          /* IMP: R-35460-15084 If X is the integer -9223372036854775807 then
-          ** abs(X) throws an integer overflow error since there is no
+        if( iVal==SMALLEST_INT64 ){
+          /* IMP: R-31676-45509 If X is the integer -9223372036854775808
+          ** then abs(X) throws an integer overflow error since there is no
           ** equivalent positive 64-bit two complement value. */
           sqlite3_result_error(context, "integer overflow", -1);
           return;
@@ -87370,6 +91082,32 @@ static void instrFunc(
   sqlite3_result_int(context, N);
 }
 
+/*
+** Implementation of the printf() function.
+*/
+static void printfFunc(
+  sqlite3_context *context,
+  int argc,
+  sqlite3_value **argv
+){
+  PrintfArguments x;
+  StrAccum str;
+  const char *zFormat;
+  int n;
+
+  if( argc>=1 && (zFormat = (const char*)sqlite3_value_text(argv[0]))!=0 ){
+    x.nArg = argc-1;
+    x.nUsed = 0;
+    x.apArg = argv+1;
+    sqlite3StrAccumInit(&str, 0, 0, SQLITE_MAX_LENGTH);
+    str.db = sqlite3_context_db_handle(context);
+    sqlite3XPrintf(&str, SQLITE_PRINTF_SQLFUNC, zFormat, &x);
+    n = str.nChar;
+    sqlite3_result_text(context, sqlite3StrAccumFinish(&str), n,
+                        SQLITE_DYNAMIC);
+  }
+}
+
 /*
 ** Implementation of the substr() function.
 **
@@ -87380,7 +91118,7 @@ static void instrFunc(
 **
 ** If p1 is negative, then we begin abs(p1) from the end of x[].
 **
-** If p2 is negative, return the p2 characters preceeding p1.
+** If p2 is negative, return the p2 characters preceding p1.
 */
 static void substrFunc(
   sqlite3_context *context,
@@ -87570,14 +91308,14 @@ static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
 }
 
 /*
-** The COALESCE() and IFNULL() functions are implemented as VDBE code so
-** that unused argument values do not have to be computed.  However, we
-** still need some kind of function implementation for this routines in
-** the function table.  That function implementation will never be called
-** so it doesn't matter what the implementation is.  We might as well use
-** the "version()" function as a substitute.
+** Some functions like COALESCE() and IFNULL() and UNLIKELY() are implemented
+** as VDBE code so that unused argument values do not have to be computed.
+** However, we still need some kind of function implementation for this
+** routines in the function table.  The noopFunc macro provides this.
+** noopFunc will never be called so it doesn't matter what the implementation
+** is.  We might as well use the "version()" function as a substitute.
 */
-#define ifnullFunc versionFunc   /* Substitute function - never called */
+#define noopFunc versionFunc   /* Substitute function - never called */
 
 /*
 ** Implementation of random().  Return a random integer.  
@@ -87696,9 +91434,9 @@ struct compareInfo {
 */
 #if defined(SQLITE_EBCDIC)
 # define sqlite3Utf8Read(A)    (*((*A)++))
-# define GlogUpperToLower(A)   A = sqlite3UpperToLower[A]
+# define GlobUpperToLower(A)   A = sqlite3UpperToLower[A]
 #else
-# define GlogUpperToLower(A)   if( !((A)&~0x7f) ){ A = sqlite3UpperToLower[A]; }
+# define GlobUpperToLower(A)   if( !((A)&~0x7f) ){ A = sqlite3UpperToLower[A]; }
 #endif
 
 static const struct compareInfo globInfo = { '*', '?', '[', 0 };
@@ -87777,11 +91515,11 @@ static int patternCompare(
       }
       while( (c2 = sqlite3Utf8Read(&zString))!=0 ){
         if( noCase ){
-          GlogUpperToLower(c2);
-          GlogUpperToLower(c);
+          GlobUpperToLower(c2);
+          GlobUpperToLower(c);
           while( c2 != 0 && c2 != c ){
             c2 = sqlite3Utf8Read(&zString);
-            GlogUpperToLower(c2);
+            GlobUpperToLower(c2);
           }
         }else{
           while( c2 != 0 && c2 != c ){
@@ -87833,8 +91571,8 @@ static int patternCompare(
     }else{
       c2 = sqlite3Utf8Read(&zString);
       if( noCase ){
-        GlogUpperToLower(c);
-        GlogUpperToLower(c2);
+        GlobUpperToLower(c);
+        GlobUpperToLower(c2);
       }
       if( c!=c2 ){
         return 0;
@@ -88039,10 +91777,6 @@ static const char hexdigits[] = {
 };
 
 /*
-** EXPERIMENTAL - This is not an official function.  The interface may
-** change.  This function may disappear.  Do not write code that depends
-** on this function.
-**
 ** Implementation of the QUOTE() function.  This function takes a single
 ** argument.  If the argument is numeric, the return value is the same as
 ** the argument.  If the argument is NULL, the return value is the string
@@ -88147,7 +91881,7 @@ static void charFunc(
 ){
   unsigned char *z, *zOut;
   int i;
-  zOut = z = sqlite3_malloc( argc*4 );
+  zOut = z = sqlite3_malloc( argc*4+1 );
   if( z==0 ){
     sqlite3_result_error_nomem(context);
     return;
@@ -88231,7 +91965,7 @@ static void zeroblobFunc(
 /*
 ** The replace() function.  Three arguments are all strings: call
 ** them A, B, and C. The result is also a string which is derived
-** from A by replacing every occurance of B with C.  The match
+** from A by replacing every occurrence of B with C.  The match
 ** must be exact.  Collating sequences are not used.
 */
 static void replaceFunc(
@@ -88667,20 +92401,20 @@ static void groupConcatStep(
         zSep = ",";
         nSep = 1;
       }
-      sqlite3StrAccumAppend(pAccum, zSep, nSep);
+      if( nSep ) sqlite3StrAccumAppend(pAccum, zSep, nSep);
     }
     zVal = (char*)sqlite3_value_text(argv[0]);
     nVal = sqlite3_value_bytes(argv[0]);
-    sqlite3StrAccumAppend(pAccum, zVal, nVal);
+    if( zVal ) sqlite3StrAccumAppend(pAccum, zVal, nVal);
   }
 }
 static void groupConcatFinalize(sqlite3_context *context){
   StrAccum *pAccum;
   pAccum = sqlite3_aggregate_context(context, 0);
   if( pAccum ){
-    if( pAccum->tooBig ){
+    if( pAccum->accError==STRACCUM_TOOBIG ){
       sqlite3_result_error_toobig(context);
-    }else if( pAccum->mallocFailed ){
+    }else if( pAccum->accError==STRACCUM_NOMEM ){
       sqlite3_result_error_nomem(context);
     }else{    
       sqlite3_result_text(context, sqlite3StrAccumFinish(pAccum), -1, 
@@ -88710,7 +92444,7 @@ static void setLikeOptFlag(sqlite3 *db, const char *zName, u8 flagVal){
   pDef = sqlite3FindFunction(db, zName, sqlite3Strlen30(zName),
                              2, SQLITE_UTF8, 0);
   if( ALWAYS(pDef) ){
-    pDef->flags = flagVal;
+    pDef->funcFlags |= flagVal;
   }
 }
 
@@ -88754,7 +92488,7 @@ SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocas
   pDef = sqlite3FindFunction(db, pExpr->u.zToken, 
                              sqlite3Strlen30(pExpr->u.zToken),
                              2, SQLITE_UTF8, 0);
-  if( NEVER(pDef==0) || (pDef->flags & SQLITE_FUNC_LIKE)==0 ){
+  if( NEVER(pDef==0) || (pDef->funcFlags & SQLITE_FUNC_LIKE)==0 ){
     return 0;
   }
 
@@ -88766,7 +92500,7 @@ SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocas
   assert( (char*)&likeInfoAlt == (char*)&likeInfoAlt.matchAll );
   assert( &((char*)&likeInfoAlt)[1] == (char*)&likeInfoAlt.matchOne );
   assert( &((char*)&likeInfoAlt)[2] == (char*)&likeInfoAlt.matchSet );
-  *pIsNocase = (pDef->flags & SQLITE_FUNC_CASE)==0;
+  *pIsNocase = (pDef->funcFlags & SQLITE_FUNC_CASE)==0;
   return 1;
 }
 
@@ -88804,6 +92538,7 @@ SQLITE_PRIVATE void sqlite3RegisterGlobalFunctions(void){
     FUNCTION(instr,              2, 0, 0, instrFunc        ),
     FUNCTION(substr,             2, 0, 0, substrFunc       ),
     FUNCTION(substr,             3, 0, 0, substrFunc       ),
+    FUNCTION(printf,            -1, 0, 0, printfFunc       ),
     FUNCTION(unicode,            1, 0, 0, unicodeFunc      ),
     FUNCTION(char,              -1, 0, 0, charFunc         ),
     FUNCTION(abs,                1, 0, 0, absFunc          ),
@@ -88815,11 +92550,13 @@ SQLITE_PRIVATE void sqlite3RegisterGlobalFunctions(void){
     FUNCTION(lower,              1, 0, 0, lowerFunc        ),
     FUNCTION(coalesce,           1, 0, 0, 0                ),
     FUNCTION(coalesce,           0, 0, 0, 0                ),
-    FUNCTION2(coalesce,         -1, 0, 0, ifnullFunc,  SQLITE_FUNC_COALESCE),
+    FUNCTION2(coalesce,         -1, 0, 0, noopFunc,  SQLITE_FUNC_COALESCE),
     FUNCTION(hex,                1, 0, 0, hexFunc          ),
-    FUNCTION2(ifnull,            2, 0, 0, ifnullFunc,  SQLITE_FUNC_COALESCE),
-    FUNCTION(random,             0, 0, 0, randomFunc       ),
-    FUNCTION(randomblob,         1, 0, 0, randomBlob       ),
+    FUNCTION2(ifnull,            2, 0, 0, noopFunc,  SQLITE_FUNC_COALESCE),
+    FUNCTION2(unlikely,          1, 0, 0, noopFunc,  SQLITE_FUNC_UNLIKELY),
+    FUNCTION2(likelihood,        2, 0, 0, noopFunc,  SQLITE_FUNC_UNLIKELY),
+    VFUNCTION(random,            0, 0, 0, randomFunc       ),
+    VFUNCTION(randomblob,        1, 0, 0, randomBlob       ),
     FUNCTION(nullif,             2, 0, 1, nullifFunc       ),
     FUNCTION(sqlite_version,     0, 0, 0, versionFunc      ),
     FUNCTION(sqlite_source_id,   0, 0, 0, sourceidFunc     ),
@@ -88829,9 +92566,9 @@ SQLITE_PRIVATE void sqlite3RegisterGlobalFunctions(void){
     FUNCTION(sqlite_compileoption_get, 1, 0, 0, compileoptiongetFunc  ),
 #endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */
     FUNCTION(quote,              1, 0, 0, quoteFunc        ),
-    FUNCTION(last_insert_rowid,  0, 0, 0, last_insert_rowid),
-    FUNCTION(changes,            0, 0, 0, changes          ),
-    FUNCTION(total_changes,      0, 0, 0, total_changes    ),
+    VFUNCTION(last_insert_rowid, 0, 0, 0, last_insert_rowid),
+    VFUNCTION(changes,           0, 0, 0, changes          ),
+    VFUNCTION(total_changes,     0, 0, 0, total_changes    ),
     FUNCTION(replace,            3, 0, 0, replaceFunc      ),
     FUNCTION(zeroblob,           1, 0, 0, zeroblobFunc     ),
   #ifdef SQLITE_SOUNDEX
@@ -88845,7 +92582,7 @@ SQLITE_PRIVATE void sqlite3RegisterGlobalFunctions(void){
     AGGREGATE(total,             1, 0, 0, sumStep,         totalFinalize    ),
     AGGREGATE(avg,               1, 0, 0, sumStep,         avgFinalize    ),
  /* AGGREGATE(count,             0, 0, 0, countStep,       countFinalize  ), */
-    {0,SQLITE_UTF8,SQLITE_FUNC_COUNT,0,0,0,countStep,countFinalize,"count",0,0},
+    {0,SQLITE_UTF8|SQLITE_FUNC_COUNT,0,0,0,countStep,countFinalize,"count",0,0},
     AGGREGATE(count,             1, 0, 0, countStep,       countFinalize  ),
     AGGREGATE(group_concat,      1, 0, 0, groupConcatStep, groupConcatFinalize),
     AGGREGATE(group_concat,      2, 0, 0, groupConcatStep, groupConcatFinalize),
@@ -88871,6 +92608,9 @@ SQLITE_PRIVATE void sqlite3RegisterGlobalFunctions(void){
 #ifndef SQLITE_OMIT_ALTERTABLE
   sqlite3AlterFunctions();
 #endif
+#if defined(SQLITE_ENABLE_STAT3) || defined(SQLITE_ENABLE_STAT4)
+  sqlite3AnalyzeFunctions();
+#endif
 }
 
 /************** End of func.c ************************************************/
@@ -89101,7 +92841,7 @@ SQLITE_PRIVATE int sqlite3FkLocateIndex(
   }
 
   for(pIdx=pParent->pIndex; pIdx; pIdx=pIdx->pNext){
-    if( pIdx->nColumn==nCol && pIdx->onError!=OE_None ){ 
+    if( pIdx->nKeyCol==nCol && pIdx->onError!=OE_None ){ 
       /* pIdx is a UNIQUE index (or a PRIMARY KEY) and has the right number
       ** of columns. If each indexed column corresponds to a foreign key
       ** column of pFKey, then this index is a winner.  */
@@ -89109,8 +92849,8 @@ SQLITE_PRIVATE int sqlite3FkLocateIndex(
       if( zKey==0 ){
         /* If zKey is NULL, then this foreign key is implicitly mapped to 
         ** the PRIMARY KEY of table pParent. The PRIMARY KEY index may be 
-        ** identified by the test (Index.autoIndex==2).  */
-        if( pIdx->autoIndex==2 ){
+        ** identified by the test.  */
+        if( IsPrimaryKeyIndex(pIdx) ){
           if( aiCol ){
             int i;
             for(i=0; i<nCol; i++) aiCol[i] = pFKey->aCol[i].iFrom;
@@ -89124,7 +92864,7 @@ SQLITE_PRIVATE int sqlite3FkLocateIndex(
         ** the default collation sequences for each column. */
         int i, j;
         for(i=0; i<nCol; i++){
-          int iCol = pIdx->aiColumn[i];     /* Index of column in parent tbl */
+          i16 iCol = pIdx->aiColumn[i];     /* Index of column in parent tbl */
           char *zDfltColl;                  /* Def. collation for column */
           char *zIdxCol;                    /* Name of indexed column */
 
@@ -89216,10 +92956,11 @@ static void fkLookupParent(
   ** search for a matching row in the parent table.  */
   if( nIncr<0 ){
     sqlite3VdbeAddOp2(v, OP_FkIfZero, pFKey->isDeferred, iOk);
+    VdbeCoverage(v);
   }
   for(i=0; i<pFKey->nCol; i++){
     int iReg = aiCol[i] + regData + 1;
-    sqlite3VdbeAddOp2(v, OP_IsNull, iReg, iOk);
+    sqlite3VdbeAddOp2(v, OP_IsNull, iReg, iOk); VdbeCoverage(v);
   }
 
   if( isIgnore==0 ){
@@ -89236,17 +92977,19 @@ static void fkLookupParent(
       ** will have INTEGER affinity applied to it, which may not be correct.  */
       sqlite3VdbeAddOp2(v, OP_SCopy, aiCol[0]+1+regData, regTemp);
       iMustBeInt = sqlite3VdbeAddOp2(v, OP_MustBeInt, regTemp, 0);
+      VdbeCoverage(v);
   
       /* If the parent table is the same as the child table, and we are about
       ** to increment the constraint-counter (i.e. this is an INSERT operation),
       ** then check if the row being inserted matches itself. If so, do not
       ** increment the constraint-counter.  */
       if( pTab==pFKey->pFrom && nIncr==1 ){
-        sqlite3VdbeAddOp3(v, OP_Eq, regData, iOk, regTemp);
+        sqlite3VdbeAddOp3(v, OP_Eq, regData, iOk, regTemp); VdbeCoverage(v);
+        sqlite3VdbeChangeP5(v, SQLITE_NOTNULL);
       }
   
       sqlite3OpenTable(pParse, iCur, iDb, pTab, OP_OpenRead);
-      sqlite3VdbeAddOp3(v, OP_NotExists, iCur, 0, regTemp);
+      sqlite3VdbeAddOp3(v, OP_NotExists, iCur, 0, regTemp); VdbeCoverage(v);
       sqlite3VdbeAddOp2(v, OP_Goto, 0, iOk);
       sqlite3VdbeJumpHere(v, sqlite3VdbeCurrentAddr(v)-2);
       sqlite3VdbeJumpHere(v, iMustBeInt);
@@ -89255,10 +92998,9 @@ static void fkLookupParent(
       int nCol = pFKey->nCol;
       int regTemp = sqlite3GetTempRange(pParse, nCol);
       int regRec = sqlite3GetTempReg(pParse);
-      KeyInfo *pKey = sqlite3IndexKeyinfo(pParse, pIdx);
   
       sqlite3VdbeAddOp3(v, OP_OpenRead, iCur, pIdx->tnum, iDb);
-      sqlite3VdbeChangeP4(v, -1, (char*)pKey, P4_KEYINFO_HANDOFF);
+      sqlite3VdbeSetP4KeyInfo(pParse, pIdx);
       for(i=0; i<nCol; i++){
         sqlite3VdbeAddOp2(v, OP_Copy, aiCol[i]+1+regData, regTemp+i);
       }
@@ -89283,30 +93025,32 @@ static void fkLookupParent(
             /* The parent key is a composite key that includes the IPK column */
             iParent = regData;
           }
-          sqlite3VdbeAddOp3(v, OP_Ne, iChild, iJump, iParent);
+          sqlite3VdbeAddOp3(v, OP_Ne, iChild, iJump, iParent); VdbeCoverage(v);
           sqlite3VdbeChangeP5(v, SQLITE_JUMPIFNULL);
         }
         sqlite3VdbeAddOp2(v, OP_Goto, 0, iOk);
       }
   
-      sqlite3VdbeAddOp3(v, OP_MakeRecord, regTemp, nCol, regRec);
-      sqlite3VdbeChangeP4(v, -1, sqlite3IndexAffinityStr(v,pIdx), P4_TRANSIENT);
-      sqlite3VdbeAddOp4Int(v, OP_Found, iCur, iOk, regRec, 0);
+      sqlite3VdbeAddOp4(v, OP_MakeRecord, regTemp, nCol, regRec,
+                        sqlite3IndexAffinityStr(v,pIdx), nCol);
+      sqlite3VdbeAddOp4Int(v, OP_Found, iCur, iOk, regRec, 0); VdbeCoverage(v);
   
       sqlite3ReleaseTempReg(pParse, regRec);
       sqlite3ReleaseTempRange(pParse, regTemp, nCol);
     }
   }
 
-  if( !pFKey->isDeferred && !pParse->pToplevel && !pParse->isMultiWrite ){
+  if( !pFKey->isDeferred && !(pParse->db->flags & SQLITE_DeferFKs)
+   && !pParse->pToplevel 
+   && !pParse->isMultiWrite 
+  ){
     /* Special case: If this is an INSERT statement that will insert exactly
     ** one row into the table, raise a constraint immediately instead of
     ** incrementing a counter. This is necessary as the VM code is being
     ** generated for will not open a statement transaction.  */
     assert( nIncr==1 );
     sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_FOREIGNKEY,
-        OE_Abort, "foreign key constraint failed", P4_STATIC
-    );
+        OE_Abort, 0, P4_STATIC, P5_ConstraintFK);
   }else{
     if( nIncr>0 && pFKey->isDeferred==0 ){
       sqlite3ParseToplevel(pParse)->mayAbort = 1;
@@ -89318,6 +93062,62 @@ static void fkLookupParent(
   sqlite3VdbeAddOp1(v, OP_Close, iCur);
 }
 
+
+/*
+** Return an Expr object that refers to a memory register corresponding
+** to column iCol of table pTab.
+**
+** regBase is the first of an array of register that contains the data
+** for pTab.  regBase itself holds the rowid.  regBase+1 holds the first
+** column.  regBase+2 holds the second column, and so forth.
+*/
+static Expr *exprTableRegister(
+  Parse *pParse,     /* Parsing and code generating context */
+  Table *pTab,       /* The table whose content is at r[regBase]... */
+  int regBase,       /* Contents of table pTab */
+  i16 iCol           /* Which column of pTab is desired */
+){
+  Expr *pExpr;
+  Column *pCol;
+  const char *zColl;
+  sqlite3 *db = pParse->db;
+
+  pExpr = sqlite3Expr(db, TK_REGISTER, 0);
+  if( pExpr ){
+    if( iCol>=0 && iCol!=pTab->iPKey ){
+      pCol = &pTab->aCol[iCol];
+      pExpr->iTable = regBase + iCol + 1;
+      pExpr->affinity = pCol->affinity;
+      zColl = pCol->zColl;
+      if( zColl==0 ) zColl = db->pDfltColl->zName;
+      pExpr = sqlite3ExprAddCollateString(pParse, pExpr, zColl);
+    }else{
+      pExpr->iTable = regBase;
+      pExpr->affinity = SQLITE_AFF_INTEGER;
+    }
+  }
+  return pExpr;
+}
+
+/*
+** Return an Expr object that refers to column iCol of table pTab which
+** has cursor iCur.
+*/
+static Expr *exprTableColumn(
+  sqlite3 *db,      /* The database connection */
+  Table *pTab,      /* The table whose column is desired */
+  int iCursor,      /* The open cursor on the table */
+  i16 iCol          /* The column that is wanted */
+){
+  Expr *pExpr = sqlite3Expr(db, TK_COLUMN, 0);
+  if( pExpr ){
+    pExpr->pTab = pTab;
+    pExpr->iTable = iCursor;
+    pExpr->iColumn = iCol;
+  }
+  return pExpr;
+}
+
 /*
 ** This function is called to generate code executed when a row is deleted
 ** from the parent table of foreign key constraint pFKey and, if pFKey is 
@@ -89333,13 +93133,13 @@ static void fkLookupParent(
 **   --------------------------------------------------------------------------
 **   DELETE      immediate   Increment the "immediate constraint counter".
 **                           Or, if the ON (UPDATE|DELETE) action is RESTRICT,
-**                           throw a "foreign key constraint failed" exception.
+**                           throw a "FOREIGN KEY constraint failed" exception.
 **
 **   INSERT      immediate   Decrement the "immediate constraint counter".
 **
 **   DELETE      deferred    Increment the "deferred constraint counter".
 **                           Or, if the ON (UPDATE|DELETE) action is RESTRICT,
-**                           throw a "foreign key constraint failed" exception.
+**                           throw a "FOREIGN KEY constraint failed" exception.
 **
 **   INSERT      deferred    Decrement the "deferred constraint counter".
 **
@@ -89348,12 +93148,12 @@ static void fkLookupParent(
 */
 static void fkScanChildren(
   Parse *pParse,                  /* Parse context */
-  SrcList *pSrc,                  /* SrcList containing the table to scan */
-  Table *pTab,
-  Index *pIdx,                    /* Foreign key index */
-  FKey *pFKey,                    /* Foreign key relationship */
+  SrcList *pSrc,                  /* The child table to be scanned */
+  Table *pTab,                    /* The parent table */
+  Index *pIdx,                    /* Index on parent covering the foreign key */
+  FKey *pFKey,                    /* The foreign key linking pSrc to pTab */
   int *aiCol,                     /* Map from pIdx cols to child table cols */
-  int regData,                    /* Referenced table data starts here */
+  int regData,                    /* Parent row data starts here */
   int nIncr                       /* Amount to increment deferred counter by */
 ){
   sqlite3 *db = pParse->db;       /* Database handle */
@@ -89364,10 +93164,14 @@ static void fkScanChildren(
   int iFkIfZero = 0;              /* Address of OP_FkIfZero */
   Vdbe *v = sqlite3GetVdbe(pParse);
 
-  assert( !pIdx || pIdx->pTable==pTab );
+  assert( pIdx==0 || pIdx->pTable==pTab );
+  assert( pIdx==0 || pIdx->nKeyCol==pFKey->nCol );
+  assert( pIdx!=0 || pFKey->nCol==1 );
+  assert( pIdx!=0 || HasRowid(pTab) );
 
   if( nIncr<0 ){
     iFkIfZero = sqlite3VdbeAddOp2(v, OP_FkIfZero, pFKey->isDeferred, 0);
+    VdbeCoverage(v);
   }
 
   /* Create an Expr object representing an SQL expression like:
@@ -89382,29 +93186,11 @@ static void fkScanChildren(
     Expr *pLeft;                  /* Value from parent table row */
     Expr *pRight;                 /* Column ref to child table */
     Expr *pEq;                    /* Expression (pLeft = pRight) */
-    int iCol;                     /* Index of column in child table */ 
+    i16 iCol;                     /* Index of column in child table */ 
     const char *zCol;             /* Name of column in child table */
 
-    pLeft = sqlite3Expr(db, TK_REGISTER, 0);
-    if( pLeft ){
-      /* Set the collation sequence and affinity of the LHS of each TK_EQ
-      ** expression to the parent key column defaults.  */
-      if( pIdx ){
-        Column *pCol;
-        const char *zColl;
-        iCol = pIdx->aiColumn[i];
-        pCol = &pTab->aCol[iCol];
-        if( pTab->iPKey==iCol ) iCol = -1;
-        pLeft->iTable = regData+iCol+1;
-        pLeft->affinity = pCol->affinity;
-        zColl = pCol->zColl;
-        if( zColl==0 ) zColl = db->pDfltColl->zName;
-        pLeft = sqlite3ExprAddCollateString(pParse, pLeft, zColl);
-      }else{
-        pLeft->iTable = regData;
-        pLeft->affinity = SQLITE_AFF_INTEGER;
-      }
-    }
+    iCol = pIdx ? pIdx->aiColumn[i] : -1;
+    pLeft = exprTableRegister(pParse, pTab, regData, iCol);
     iCol = aiCol ? aiCol[i] : pFKey->aCol[0].iFrom;
     assert( iCol>=0 );
     zCol = pFKey->pFrom->aCol[iCol].zName;
@@ -89413,24 +93199,39 @@ static void fkScanChildren(
     pWhere = sqlite3ExprAnd(db, pWhere, pEq);
   }
 
-  /* If the child table is the same as the parent table, and this scan
-  ** is taking place as part of a DELETE operation (operation D.2), omit the
-  ** row being deleted from the scan by adding ($rowid != rowid) to the WHERE 
-  ** clause, where $rowid is the rowid of the row being deleted.  */
+  /* If the child table is the same as the parent table, then add terms
+  ** to the WHERE clause that prevent this entry from being scanned.
+  ** The added WHERE clause terms are like this:
+  **
+  **     $current_rowid!=rowid
+  **     NOT( $current_a==a AND $current_b==b AND ... )
+  **
+  ** The first form is used for rowid tables.  The second form is used
+  ** for WITHOUT ROWID tables.  In the second form, the primary key is
+  ** (a,b,...)
+  */
   if( pTab==pFKey->pFrom && nIncr>0 ){
-    Expr *pEq;                    /* Expression (pLeft = pRight) */
+    Expr *pNe;                    /* Expression (pLeft != pRight) */
     Expr *pLeft;                  /* Value from parent table row */
     Expr *pRight;                 /* Column ref to child table */
-    pLeft = sqlite3Expr(db, TK_REGISTER, 0);
-    pRight = sqlite3Expr(db, TK_COLUMN, 0);
-    if( pLeft && pRight ){
-      pLeft->iTable = regData;
-      pLeft->affinity = SQLITE_AFF_INTEGER;
-      pRight->iTable = pSrc->a[0].iCursor;
-      pRight->iColumn = -1;
+    if( HasRowid(pTab) ){
+      pLeft = exprTableRegister(pParse, pTab, regData, -1);
+      pRight = exprTableColumn(db, pTab, pSrc->a[0].iCursor, -1);
+      pNe = sqlite3PExpr(pParse, TK_NE, pLeft, pRight, 0);
+    }else{
+      Expr *pEq, *pAll = 0;
+      Index *pPk = sqlite3PrimaryKeyIndex(pTab);
+      assert( pIdx!=0 );
+      for(i=0; i<pPk->nKeyCol; i++){
+        i16 iCol = pIdx->aiColumn[i];
+        pLeft = exprTableRegister(pParse, pTab, regData, iCol);
+        pRight = exprTableColumn(db, pTab, pSrc->a[0].iCursor, iCol);
+        pEq = sqlite3PExpr(pParse, TK_EQ, pLeft, pRight, 0);
+        pAll = sqlite3ExprAnd(db, pAll, pEq);
+      }
+      pNe = sqlite3PExpr(pParse, TK_NOT, pAll, 0, 0);
     }
-    pEq = sqlite3PExpr(pParse, TK_NE, pLeft, pRight, 0);
-    pWhere = sqlite3ExprAnd(db, pWhere, pEq);
+    pWhere = sqlite3ExprAnd(db, pWhere, pNe);
   }
 
   /* Resolve the references in the WHERE clause. */
@@ -89460,8 +93261,8 @@ static void fkScanChildren(
 }
 
 /*
-** This function returns a pointer to the head of a linked list of FK
-** constraints for which table pTab is the parent table. For example,
+** This function returns a linked list of FKey objects (connected by
+** FKey.pNextTo) holding all children of table pTab.  For example,
 ** given the following schema:
 **
 **   CREATE TABLE t1(a PRIMARY KEY);
@@ -89529,11 +93330,11 @@ SQLITE_PRIVATE void sqlite3FkDropTable(Parse *pParse, SrcList *pName, Table *pTa
       ** when this statement is run.  */
       FKey *p;
       for(p=pTab->pFKey; p; p=p->pNextFrom){
-        if( p->isDeferred ) break;
+        if( p->isDeferred || (db->flags & SQLITE_DeferFKs) ) break;
       }
       if( !p ) return;
       iSkip = sqlite3VdbeMakeLabel(v);
-      sqlite3VdbeAddOp2(v, OP_FkIfZero, 1, iSkip);
+      sqlite3VdbeAddOp2(v, OP_FkIfZero, 1, iSkip); VdbeCoverage(v);
     }
 
     pParse->disableTriggers = 1;
@@ -89543,11 +93344,18 @@ SQLITE_PRIVATE void sqlite3FkDropTable(Parse *pParse, SrcList *pName, Table *pTa
     /* If the DELETE has generated immediate foreign key constraint 
     ** violations, halt the VDBE and return an error at this point, before
     ** any modifications to the schema are made. This is because statement
-    ** transactions are not able to rollback schema changes.  */
-    sqlite3VdbeAddOp2(v, OP_FkIfZero, 0, sqlite3VdbeCurrentAddr(v)+2);
-    sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_FOREIGNKEY,
-        OE_Abort, "foreign key constraint failed", P4_STATIC
-    );
+    ** transactions are not able to rollback schema changes.  
+    **
+    ** If the SQLITE_DeferFKs flag is set, then this is not required, as
+    ** the statement transaction will not be rolled back even if FK
+    ** constraints are violated.
+    */
+    if( (db->flags & SQLITE_DeferFKs)==0 ){
+      sqlite3VdbeAddOp2(v, OP_FkIfZero, 0, sqlite3VdbeCurrentAddr(v)+2);
+      VdbeCoverage(v);
+      sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_FOREIGNKEY,
+          OE_Abort, 0, P4_STATIC, P5_ConstraintFK);
+    }
 
     if( iSkip ){
       sqlite3VdbeResolveLabel(v, iSkip);
@@ -89555,6 +93363,70 @@ SQLITE_PRIVATE void sqlite3FkDropTable(Parse *pParse, SrcList *pName, Table *pTa
   }
 }
 
+
+/*
+** The second argument points to an FKey object representing a foreign key
+** for which pTab is the child table. An UPDATE statement against pTab
+** is currently being processed. For each column of the table that is 
+** actually updated, the corresponding element in the aChange[] array
+** is zero or greater (if a column is unmodified the corresponding element
+** is set to -1). If the rowid column is modified by the UPDATE statement
+** the bChngRowid argument is non-zero.
+**
+** This function returns true if any of the columns that are part of the
+** child key for FK constraint *p are modified.
+*/
+static int fkChildIsModified(
+  Table *pTab,                    /* Table being updated */
+  FKey *p,                        /* Foreign key for which pTab is the child */
+  int *aChange,                   /* Array indicating modified columns */
+  int bChngRowid                  /* True if rowid is modified by this update */
+){
+  int i;
+  for(i=0; i<p->nCol; i++){
+    int iChildKey = p->aCol[i].iFrom;
+    if( aChange[iChildKey]>=0 ) return 1;
+    if( iChildKey==pTab->iPKey && bChngRowid ) return 1;
+  }
+  return 0;
+}
+
+/*
+** The second argument points to an FKey object representing a foreign key
+** for which pTab is the parent table. An UPDATE statement against pTab
+** is currently being processed. For each column of the table that is 
+** actually updated, the corresponding element in the aChange[] array
+** is zero or greater (if a column is unmodified the corresponding element
+** is set to -1). If the rowid column is modified by the UPDATE statement
+** the bChngRowid argument is non-zero.
+**
+** This function returns true if any of the columns that are part of the
+** parent key for FK constraint *p are modified.
+*/
+static int fkParentIsModified(
+  Table *pTab, 
+  FKey *p, 
+  int *aChange, 
+  int bChngRowid
+){
+  int i;
+  for(i=0; i<p->nCol; i++){
+    char *zKey = p->aCol[i].zCol;
+    int iKey;
+    for(iKey=0; iKey<pTab->nCol; iKey++){
+      if( aChange[iKey]>=0 || (iKey==pTab->iPKey && bChngRowid) ){
+        Column *pCol = &pTab->aCol[iKey];
+        if( zKey ){
+          if( 0==sqlite3StrICmp(pCol->zName, zKey) ) return 1;
+        }else if( pCol->colFlags & COLFLAG_PRIMKEY ){
+          return 1;
+        }
+      }
+    }
+  }
+  return 0;
+}
+
 /*
 ** This function is called when inserting, deleting or updating a row of
 ** table pTab to generate VDBE code to perform foreign key constraint 
@@ -89579,7 +93451,9 @@ SQLITE_PRIVATE void sqlite3FkCheck(
   Parse *pParse,                  /* Parse context */
   Table *pTab,                    /* Row is being deleted from this table */ 
   int regOld,                     /* Previous row data is stored here */
-  int regNew                      /* New row data is stored here */
+  int regNew,                     /* New row data is stored here */
+  int *aChange,                   /* Array indicating UPDATEd columns (or 0) */
+  int bChngRowid                  /* True if rowid is UPDATEd */
 ){
   sqlite3 *db = pParse->db;       /* Database handle */
   FKey *pFKey;                    /* Used to iterate through FKs */
@@ -89607,6 +93481,13 @@ SQLITE_PRIVATE void sqlite3FkCheck(
     int i;
     int isIgnore = 0;
 
+    if( aChange 
+     && sqlite3_stricmp(pTab->zName, pFKey->zTo)!=0
+     && fkChildIsModified(pTab, pFKey, aChange, bChngRowid)==0 
+    ){
+      continue;
+    }
+
     /* Find the parent table of this foreign key. Also find a unique index 
     ** on the parent key columns in the parent table. If either of these 
     ** schema items cannot be located, set an error in pParse and return 
@@ -89631,7 +93512,7 @@ SQLITE_PRIVATE void sqlite3FkCheck(
         int iJump = sqlite3VdbeCurrentAddr(v) + pFKey->nCol + 1;
         for(i=0; i<pFKey->nCol; i++){
           int iReg = pFKey->aCol[i].iFrom + regOld + 1;
-          sqlite3VdbeAddOp2(v, OP_IsNull, iReg, iJump);
+          sqlite3VdbeAddOp2(v, OP_IsNull, iReg, iJump); VdbeCoverage(v);
         }
         sqlite3VdbeAddOp2(v, OP_FkCounter, pFKey->isDeferred, -1);
       }
@@ -89683,13 +93564,20 @@ SQLITE_PRIVATE void sqlite3FkCheck(
     sqlite3DbFree(db, aiFree);
   }
 
-  /* Loop through all the foreign key constraints that refer to this table */
+  /* Loop through all the foreign key constraints that refer to this table.
+  ** (the "child" constraints) */
   for(pFKey = sqlite3FkReferences(pTab); pFKey; pFKey=pFKey->pNextTo){
     Index *pIdx = 0;              /* Foreign key index for pFKey */
     SrcList *pSrc;
     int *aiCol = 0;
 
-    if( !pFKey->isDeferred && !pParse->pToplevel && !pParse->isMultiWrite ){
+    if( aChange && fkParentIsModified(pTab, pFKey, aChange, bChngRowid)==0 ){
+      continue;
+    }
+
+    if( !pFKey->isDeferred && !(db->flags & SQLITE_DeferFKs) 
+     && !pParse->pToplevel && !pParse->isMultiWrite 
+    ){
       assert( regOld==0 && regNew!=0 );
       /* Inserting a single row into a parent table cannot cause an immediate
       ** foreign key violation. So do nothing in this case.  */
@@ -89702,9 +93590,8 @@ SQLITE_PRIVATE void sqlite3FkCheck(
     }
     assert( aiCol || pFKey->nCol==1 );
 
-    /* Create a SrcList structure containing a single table (the table 
-    ** the foreign key that refers to this table is attached to). This
-    ** is required for the sqlite3WhereXXX() interface.  */
+    /* Create a SrcList structure containing the child table.  We need the
+    ** child table as a SrcList for sqlite3WhereBegin() */
     pSrc = sqlite3SrcListAppend(db, 0, 0, 0);
     if( pSrc ){
       struct SrcList_item *pItem = pSrc->a;
@@ -89753,13 +93640,14 @@ SQLITE_PRIVATE u32 sqlite3FkOldmask(
       Index *pIdx = 0;
       sqlite3FkLocateIndex(pParse, pTab, p, &pIdx, 0);
       if( pIdx ){
-        for(i=0; i<pIdx->nColumn; i++) mask |= COLUMN_MASK(pIdx->aiColumn[i]);
+        for(i=0; i<pIdx->nKeyCol; i++) mask |= COLUMN_MASK(pIdx->aiColumn[i]);
       }
     }
   }
   return mask;
 }
 
+
 /*
 ** This function is called before generating code to update or delete a 
 ** row contained in table pTab. If the operation is a DELETE, then
@@ -89789,32 +93677,16 @@ SQLITE_PRIVATE int sqlite3FkRequired(
     }else{
       /* This is an UPDATE. Foreign key processing is only required if the
       ** operation modifies one or more child or parent key columns. */
-      int i;
       FKey *p;
 
       /* Check if any child key columns are being modified. */
       for(p=pTab->pFKey; p; p=p->pNextFrom){
-        for(i=0; i<p->nCol; i++){
-          int iChildKey = p->aCol[i].iFrom;
-          if( aChange[iChildKey]>=0 ) return 1;
-          if( iChildKey==pTab->iPKey && chngRowid ) return 1;
-        }
+        if( fkChildIsModified(pTab, p, aChange, chngRowid) ) return 1;
       }
 
       /* Check if any parent key columns are being modified. */
       for(p=sqlite3FkReferences(pTab); p; p=p->pNextTo){
-        for(i=0; i<p->nCol; i++){
-          char *zKey = p->aCol[i].zCol;
-          int iKey;
-          for(iKey=0; iKey<pTab->nCol; iKey++){
-            Column *pCol = &pTab->aCol[iKey];
-            if( (zKey ? !sqlite3StrICmp(pCol->zName, zKey)
-                      : (pCol->colFlags & COLFLAG_PRIMKEY)!=0) ){
-              if( aChange[iKey]>=0 ) return 1;
-              if( iKey==pTab->iPKey && chngRowid ) return 1;
-            }
-          }
-        }
+        if( fkParentIsModified(pTab, p, aChange, chngRowid) ) return 1;
       }
     }
   }
@@ -89960,7 +93832,7 @@ static Trigger *fkActionTrigger(
 
       tFrom.z = zFrom;
       tFrom.n = nFrom;
-      pRaise = sqlite3Expr(db, TK_RAISE, "foreign key constraint failed");
+      pRaise = sqlite3Expr(db, TK_RAISE, "FOREIGN KEY constraint failed");
       if( pRaise ){
         pRaise->affinity = OE_Abort;
       }
@@ -90040,7 +93912,9 @@ SQLITE_PRIVATE void sqlite3FkActions(
   Parse *pParse,                  /* Parse context */
   Table *pTab,                    /* Table being updated or deleted from */
   ExprList *pChanges,             /* Change-list for UPDATE, NULL for DELETE */
-  int regOld                      /* Address of array containing old row */
+  int regOld,                     /* Address of array containing old row */
+  int *aChange,                   /* Array indicating UPDATEd columns (or 0) */
+  int bChngRowid                  /* True if rowid is UPDATEd */
 ){
   /* If foreign-key support is enabled, iterate through all FKs that 
   ** refer to table pTab. If there is an action associated with the FK 
@@ -90049,9 +93923,11 @@ SQLITE_PRIVATE void sqlite3FkActions(
   if( pParse->db->flags&SQLITE_ForeignKeys ){
     FKey *pFKey;                  /* Iterator variable */
     for(pFKey = sqlite3FkReferences(pTab); pFKey; pFKey=pFKey->pNextTo){
-      Trigger *pAction = fkActionTrigger(pParse, pTab, pFKey, pChanges);
-      if( pAction ){
-        sqlite3CodeRowTriggerDirect(pParse, pAction, pTab, regOld, OE_Abort, 0);
+      if( aChange==0 || fkParentIsModified(pTab, pFKey, aChange, bChngRowid) ){
+        Trigger *pAct = fkActionTrigger(pParse, pTab, pFKey, pChanges);
+        if( pAct ){
+          sqlite3CodeRowTriggerDirect(pParse, pAct, pTab, regOld, OE_Abort, 0);
+        }
       }
     }
   }
@@ -90120,10 +93996,16 @@ SQLITE_PRIVATE void sqlite3FkDelete(sqlite3 *db, Table *pTab){
 */
 
 /*
-** Generate code that will open a table for reading.
+** Generate code that will 
+**
+**   (1) acquire a lock for table pTab then
+**   (2) open pTab as cursor iCur.
+**
+** If pTab is a WITHOUT ROWID table, then it is the PRIMARY KEY index
+** for that table that is actually opened.
 */
 SQLITE_PRIVATE void sqlite3OpenTable(
-  Parse *p,       /* Generate code into this VDBE */
+  Parse *pParse,  /* Generate code into this VDBE */
   int iCur,       /* The cursor number of the table */
   int iDb,        /* The database index in sqlite3.aDb[] */
   Table *pTab,    /* The table to be opened */
@@ -90131,12 +94013,21 @@ SQLITE_PRIVATE void sqlite3OpenTable(
 ){
   Vdbe *v;
   assert( !IsVirtual(pTab) );
-  v = sqlite3GetVdbe(p);
+  v = sqlite3GetVdbe(pParse);
   assert( opcode==OP_OpenWrite || opcode==OP_OpenRead );
-  sqlite3TableLock(p, iDb, pTab->tnum, (opcode==OP_OpenWrite)?1:0, pTab->zName);
-  sqlite3VdbeAddOp3(v, opcode, iCur, pTab->tnum, iDb);
-  sqlite3VdbeChangeP4(v, -1, SQLITE_INT_TO_PTR(pTab->nCol), P4_INT32);
-  VdbeComment((v, "%s", pTab->zName));
+  sqlite3TableLock(pParse, iDb, pTab->tnum, 
+                   (opcode==OP_OpenWrite)?1:0, pTab->zName);
+  if( HasRowid(pTab) ){
+    sqlite3VdbeAddOp4Int(v, opcode, iCur, pTab->tnum, iDb, pTab->nCol);
+    VdbeComment((v, "%s", pTab->zName));
+  }else{
+    Index *pPk = sqlite3PrimaryKeyIndex(pTab);
+    assert( pPk!=0 );
+    assert( pPk->tnum=pTab->tnum );
+    sqlite3VdbeAddOp3(v, opcode, iCur, pPk->tnum, iDb);
+    sqlite3VdbeSetP4KeyInfo(pParse, pPk);
+    VdbeComment((v, "%s", pTab->zName));
+  }
 }
 
 /*
@@ -90172,15 +94063,15 @@ SQLITE_PRIVATE const char *sqlite3IndexAffinityStr(Vdbe *v, Index *pIdx){
     int n;
     Table *pTab = pIdx->pTable;
     sqlite3 *db = sqlite3VdbeDb(v);
-    pIdx->zColAff = (char *)sqlite3DbMallocRaw(0, pIdx->nColumn+2);
+    pIdx->zColAff = (char *)sqlite3DbMallocRaw(0, pIdx->nColumn+1);
     if( !pIdx->zColAff ){
       db->mallocFailed = 1;
       return 0;
     }
     for(n=0; n<pIdx->nColumn; n++){
-      pIdx->zColAff[n] = pTab->aCol[pIdx->aiColumn[n]].affinity;
+      i16 x = pIdx->aiColumn[n];
+      pIdx->zColAff[n] = x<0 ? SQLITE_AFF_INTEGER : pTab->aCol[x].affinity;
     }
-    pIdx->zColAff[n++] = SQLITE_AFF_INTEGER;
     pIdx->zColAff[n] = 0;
   }
  
@@ -90188,10 +94079,16 @@ SQLITE_PRIVATE const char *sqlite3IndexAffinityStr(Vdbe *v, Index *pIdx){
 }
 
 /*
-** Set P4 of the most recently inserted opcode to a column affinity
-** string for table pTab. A column affinity string has one character
-** for each column indexed by the index, according to the affinity of the
-** column:
+** Compute the affinity string for table pTab, if it has not already been
+** computed.  As an optimization, omit trailing SQLITE_AFF_NONE affinities.
+**
+** If the affinity exists (if it is no entirely SQLITE_AFF_NONE values) and
+** if iReg>0 then code an OP_Affinity opcode that will set the affinities
+** for register iReg and following.  Or if affinities exists and iReg==0,
+** then just set the P4 operand of the previous opcode (which should  be
+** an OP_MakeRecord) to the affinity string.
+**
+** A column affinity string has one character per column:
 **
 **  Character      Column affinity
 **  ------------------------------
@@ -90201,19 +94098,11 @@ SQLITE_PRIVATE const char *sqlite3IndexAffinityStr(Vdbe *v, Index *pIdx){
 **  'd'            INTEGER
 **  'e'            REAL
 */
-SQLITE_PRIVATE void sqlite3TableAffinityStr(Vdbe *v, Table *pTab){
-  /* The first time a column affinity string for a particular table
-  ** is required, it is allocated and populated here. It is then 
-  ** stored as a member of the Table structure for subsequent use.
-  **
-  ** The column affinity string will eventually be deleted by
-  ** sqlite3DeleteTable() when the Table structure itself is cleaned up.
-  */
-  if( !pTab->zColAff ){
-    char *zColAff;
-    int i;
+SQLITE_PRIVATE void sqlite3TableAffinity(Vdbe *v, Table *pTab, int iReg){
+  int i;
+  char *zColAff = pTab->zColAff;
+  if( zColAff==0 ){
     sqlite3 *db = sqlite3VdbeDb(v);
-
     zColAff = (char *)sqlite3DbMallocRaw(0, pTab->nCol+1);
     if( !zColAff ){
       db->mallocFailed = 1;
@@ -90223,22 +94112,28 @@ SQLITE_PRIVATE void sqlite3TableAffinityStr(Vdbe *v, Table *pTab){
     for(i=0; i<pTab->nCol; i++){
       zColAff[i] = pTab->aCol[i].affinity;
     }
-    zColAff[pTab->nCol] = '\0';
-
+    do{
+      zColAff[i--] = 0;
+    }while( i>=0 && zColAff[i]==SQLITE_AFF_NONE );
     pTab->zColAff = zColAff;
   }
-
-  sqlite3VdbeChangeP4(v, -1, pTab->zColAff, P4_TRANSIENT);
+  i = sqlite3Strlen30(zColAff);
+  if( i ){
+    if( iReg ){
+      sqlite3VdbeAddOp4(v, OP_Affinity, iReg, i, 0, zColAff, i);
+    }else{
+      sqlite3VdbeChangeP4(v, -1, zColAff, i);
+    }
+  }
 }
 
 /*
 ** Return non-zero if the table pTab in database iDb or any of its indices
-** have been opened at any point in the VDBE program beginning at location
-** iStartAddr throught the end of the program.  This is used to see if 
+** have been opened at any point in the VDBE program. This is used to see if 
 ** a statement of the form  "INSERT INTO <iDb, pTab> SELECT ..." can 
-** run without using temporary table for the results of the SELECT. 
+** run without using a temporary table for the results of the SELECT. 
 */
-static int readsTable(Parse *p, int iStartAddr, int iDb, Table *pTab){
+static int readsTable(Parse *p, int iDb, Table *pTab){
   Vdbe *v = sqlite3GetVdbe(p);
   int i;
   int iEnd = sqlite3VdbeCurrentAddr(v);
@@ -90246,7 +94141,7 @@ static int readsTable(Parse *p, int iStartAddr, int iDb, Table *pTab){
   VTable *pVTab = IsVirtual(pTab) ? sqlite3GetVTable(p->db, pTab) : 0;
 #endif
 
-  for(i=iStartAddr; i<iEnd; i++){
+  for(i=1; i<iEnd; i++){
     VdbeOp *pOp = sqlite3VdbeGetOp(v, i);
     assert( pOp!=0 );
     if( pOp->opcode==OP_OpenRead && pOp->p3==iDb ){
@@ -90347,14 +94242,14 @@ SQLITE_PRIVATE void sqlite3AutoincrementBegin(Parse *pParse){
     sqlite3VdbeAddOp3(v, OP_Null, 0, memId, memId+1);
     addr = sqlite3VdbeCurrentAddr(v);
     sqlite3VdbeAddOp4(v, OP_String8, 0, memId-1, 0, p->pTab->zName, 0);
-    sqlite3VdbeAddOp2(v, OP_Rewind, 0, addr+9);
+    sqlite3VdbeAddOp2(v, OP_Rewind, 0, addr+9); VdbeCoverage(v);
     sqlite3VdbeAddOp3(v, OP_Column, 0, 0, memId);
-    sqlite3VdbeAddOp3(v, OP_Ne, memId-1, addr+7, memId);
+    sqlite3VdbeAddOp3(v, OP_Ne, memId-1, addr+7, memId); VdbeCoverage(v);
     sqlite3VdbeChangeP5(v, SQLITE_JUMPIFNULL);
     sqlite3VdbeAddOp2(v, OP_Rowid, 0, memId+1);
     sqlite3VdbeAddOp3(v, OP_Column, 0, 1, memId);
     sqlite3VdbeAddOp2(v, OP_Goto, 0, addr+9);
-    sqlite3VdbeAddOp2(v, OP_Next, 0, addr+2);
+    sqlite3VdbeAddOp2(v, OP_Next, 0, addr+2); VdbeCoverage(v);
     sqlite3VdbeAddOp2(v, OP_Integer, 0, memId);
     sqlite3VdbeAddOp0(v, OP_Close);
   }
@@ -90389,25 +94284,16 @@ SQLITE_PRIVATE void sqlite3AutoincrementEnd(Parse *pParse){
   assert( v );
   for(p = pParse->pAinc; p; p = p->pNext){
     Db *pDb = &db->aDb[p->iDb];
-    int j1, j2, j3, j4, j5;
+    int j1;
     int iRec;
     int memId = p->regCtr;
 
     iRec = sqlite3GetTempReg(pParse);
     assert( sqlite3SchemaMutexHeld(db, 0, pDb->pSchema) );
     sqlite3OpenTable(pParse, 0, p->iDb, pDb->pSchema->pSeqTab, OP_OpenWrite);
-    j1 = sqlite3VdbeAddOp1(v, OP_NotNull, memId+1);
-    j2 = sqlite3VdbeAddOp0(v, OP_Rewind);
-    j3 = sqlite3VdbeAddOp3(v, OP_Column, 0, 0, iRec);
-    j4 = sqlite3VdbeAddOp3(v, OP_Eq, memId-1, 0, iRec);
-    sqlite3VdbeAddOp2(v, OP_Next, 0, j3);
-    sqlite3VdbeJumpHere(v, j2);
+    j1 = sqlite3VdbeAddOp1(v, OP_NotNull, memId+1); VdbeCoverage(v);
     sqlite3VdbeAddOp2(v, OP_NewRowid, 0, memId+1);
-    j5 = sqlite3VdbeAddOp0(v, OP_Goto);
-    sqlite3VdbeJumpHere(v, j4);
-    sqlite3VdbeAddOp2(v, OP_Rowid, 0, memId+1);
     sqlite3VdbeJumpHere(v, j1);
-    sqlite3VdbeJumpHere(v, j5);
     sqlite3VdbeAddOp3(v, OP_MakeRecord, memId-1, 2, iRec);
     sqlite3VdbeAddOp3(v, OP_Insert, 0, iRec, memId+1);
     sqlite3VdbeChangeP5(v, OPFLAG_APPEND);
@@ -90425,97 +94311,6 @@ SQLITE_PRIVATE void sqlite3AutoincrementEnd(Parse *pParse){
 #endif /* SQLITE_OMIT_AUTOINCREMENT */
 
 
-/*
-** Generate code for a co-routine that will evaluate a subquery one
-** row at a time.
-**
-** The pSelect parameter is the subquery that the co-routine will evaluation.
-** Information about the location of co-routine and the registers it will use
-** is returned by filling in the pDest object.
-**
-** Registers are allocated as follows:
-**
-**   pDest->iSDParm      The register holding the next entry-point of the
-**                       co-routine.  Run the co-routine to its next breakpoint
-**                       by calling "OP_Yield $X" where $X is pDest->iSDParm.
-**
-**   pDest->iSDParm+1    The register holding the "completed" flag for the
-**                       co-routine. This register is 0 if the previous Yield
-**                       generated a new result row, or 1 if the subquery
-**                       has completed.  If the Yield is called again
-**                       after this register becomes 1, then the VDBE will
-**                       halt with an SQLITE_INTERNAL error.
-**
-**   pDest->iSdst        First result register.
-**
-**   pDest->nSdst        Number of result registers.
-**
-** This routine handles all of the register allocation and fills in the
-** pDest structure appropriately.
-**
-** Here is a schematic of the generated code assuming that X is the 
-** co-routine entry-point register reg[pDest->iSDParm], that EOF is the
-** completed flag reg[pDest->iSDParm+1], and R and S are the range of
-** registers that hold the result set, reg[pDest->iSdst] through
-** reg[pDest->iSdst+pDest->nSdst-1]:
-**
-**         X <- A
-**         EOF <- 0
-**         goto B
-**      A: setup for the SELECT
-**         loop rows in the SELECT
-**           load results into registers R..S
-**           yield X
-**         end loop
-**         cleanup after the SELECT
-**         EOF <- 1
-**         yield X
-**         halt-error
-**      B:
-**
-** To use this subroutine, the caller generates code as follows:
-**
-**         [ Co-routine generated by this subroutine, shown above ]
-**      S: yield X
-**         if EOF goto E
-**         if skip this row, goto C
-**         if terminate loop, goto E
-**         deal with this row
-**      C: goto S
-**      E:
-*/
-SQLITE_PRIVATE int sqlite3CodeCoroutine(Parse *pParse, Select *pSelect, SelectDest *pDest){
-  int regYield;       /* Register holding co-routine entry-point */
-  int regEof;         /* Register holding co-routine completion flag */
-  int addrTop;        /* Top of the co-routine */
-  int j1;             /* Jump instruction */
-  int rc;             /* Result code */
-  Vdbe *v;            /* VDBE under construction */
-
-  regYield = ++pParse->nMem;
-  regEof = ++pParse->nMem;
-  v = sqlite3GetVdbe(pParse);
-  addrTop = sqlite3VdbeCurrentAddr(v);
-  sqlite3VdbeAddOp2(v, OP_Integer, addrTop+2, regYield); /* X <- A */
-  VdbeComment((v, "Co-routine entry point"));
-  sqlite3VdbeAddOp2(v, OP_Integer, 0, regEof);           /* EOF <- 0 */
-  VdbeComment((v, "Co-routine completion flag"));
-  sqlite3SelectDestInit(pDest, SRT_Coroutine, regYield);
-  j1 = sqlite3VdbeAddOp2(v, OP_Goto, 0, 0);
-  rc = sqlite3Select(pParse, pSelect, pDest);
-  assert( pParse->nErr==0 || rc );
-  if( pParse->db->mallocFailed && rc==SQLITE_OK ) rc = SQLITE_NOMEM;
-  if( rc ) return rc;
-  sqlite3VdbeAddOp2(v, OP_Integer, 1, regEof);            /* EOF <- 1 */
-  sqlite3VdbeAddOp1(v, OP_Yield, regYield);   /* yield X */
-  sqlite3VdbeAddOp2(v, OP_Halt, SQLITE_INTERNAL, OE_Abort);
-  VdbeComment((v, "End of coroutine"));
-  sqlite3VdbeJumpHere(v, j1);                             /* label B: */
-  return rc;
-}
-
-
-
 /* Forward declaration */
 static int xferOptimization(
   Parse *pParse,        /* Parser context */
@@ -90526,7 +94321,7 @@ static int xferOptimization(
 );
 
 /*
-** This routine is call to handle SQL of the following forms:
+** This routine is called to handle SQL of the following forms:
 **
 **    insert into TABLE (IDLIST) values(EXPRLIST)
 **    insert into TABLE (IDLIST) select
@@ -90541,12 +94336,12 @@ static int xferOptimization(
 ** data for the insert.
 **
 ** The code generated follows one of four templates.  For a simple
-** select with data coming from a VALUES clause, the code executes
+** insert with data coming from a VALUES clause, the code executes
 ** once straight down through.  Pseudo-code follows (we call this
 ** the "1st template"):
 **
 **         open write cursor to <table> and its indices
-**         puts VALUES clause expressions onto the stack
+**         put VALUES clause expressions into registers
 **         write the resulting record into <table>
 **         cleanup
 **
@@ -90578,7 +94373,6 @@ static int xferOptimization(
 ** and the SELECT clause does not read from <table> at any time.
 ** The generated code follows this template:
 **
-**         EOF <- 0
 **         X <- A
 **         goto B
 **      A: setup for the SELECT
@@ -90587,12 +94381,9 @@ static int xferOptimization(
 **           yield X
 **         end loop
 **         cleanup after the SELECT
-**         EOF <- 1
-**         yield X
-**         goto A
+**         end-coroutine X
 **      B: open write cursor to <table> and its indices
-**      C: yield X
-**         if EOF goto D
+**      C: yield X, at EOF goto D
 **         insert the select result into <table> from R..R+n
 **         goto C
 **      D: cleanup
@@ -90603,7 +94394,6 @@ static int xferOptimization(
 ** we have to use a intermediate table to store the results of
 ** the select.  The template is like this:
 **
-**         EOF <- 0
 **         X <- A
 **         goto B
 **      A: setup for the SELECT
@@ -90612,12 +94402,9 @@ static int xferOptimization(
 **           yield X
 **         end loop
 **         cleanup after the SELECT
-**         EOF <- 1
-**         yield X
-**         halt-error
+**         end co-routine R
 **      B: open temp table
-**      L: yield X
-**         if EOF goto M
+**      L: yield X, at EOF goto M
 **         insert row from R..R+n into temp table
 **         goto L
 **      M: open write cursor to <table> and its indices
@@ -90630,7 +94417,6 @@ static int xferOptimization(
 SQLITE_PRIVATE void sqlite3Insert(
   Parse *pParse,        /* Parser context */
   SrcList *pTabList,    /* Name of table into which we are inserting */
-  ExprList *pList,      /* List of values to be inserted */
   Select *pSelect,      /* A SELECT statement to use as the data source */
   IdList *pColumn,      /* Column names corresponding to IDLIST. */
   int onError           /* How to handle constraint errors */
@@ -90644,18 +94430,21 @@ SQLITE_PRIVATE void sqlite3Insert(
   Index *pIdx;          /* For looping over indices of the table */
   int nColumn;          /* Number of columns in the data */
   int nHidden = 0;      /* Number of hidden columns if TABLE is virtual */
-  int baseCur = 0;      /* VDBE Cursor number for pTab */
-  int keyColumn = -1;   /* Column that is the INTEGER PRIMARY KEY */
+  int iDataCur = 0;     /* VDBE cursor that is the main data repository */
+  int iIdxCur = 0;      /* First index cursor */
+  int ipkColumn = -1;   /* Column that is the INTEGER PRIMARY KEY */
   int endOfLoop;        /* Label for the end of the insertion loop */
-  int useTempTable = 0; /* Store SELECT results in intermediate table */
   int srcTab = 0;       /* Data comes from this temporary cursor if >=0 */
   int addrInsTop = 0;   /* Jump to label "D" */
   int addrCont = 0;     /* Top of insert loop. Label "C" in templates 3 and 4 */
-  int addrSelect = 0;   /* Address of coroutine that implements the SELECT */
   SelectDest dest;      /* Destination for SELECT on rhs of INSERT */
   int iDb;              /* Index of database holding TABLE */
   Db *pDb;              /* The database containing table being inserted into */
-  int appendFlag = 0;   /* True if the insert is likely to be an append */
+  u8 useTempTable = 0;  /* Store SELECT results in intermediate table */
+  u8 appendFlag = 0;    /* True if the insert is likely to be an append */
+  u8 withoutRowid;      /* 0 for normal table.  1 for WITHOUT ROWID table */
+  u8 bIdListInOrder = 1; /* True if IDLIST is in table order */
+  ExprList *pList = 0;  /* List of VALUES() to be inserted  */
 
   /* Register allocations */
   int regFromSelect = 0;/* Base register for data coming from SELECT */
@@ -90664,7 +94453,6 @@ SQLITE_PRIVATE void sqlite3Insert(
   int regIns;           /* Block of regs holding rowid+data being inserted */
   int regRowid;         /* registers holding insert rowid */
   int regData;          /* register holding first column to insert */
-  int regEof = 0;       /* Register recording end of SELECT data */
   int *aRegIdx = 0;     /* One register allocated to each index */
 
 #ifndef SQLITE_OMIT_TRIGGER
@@ -90679,6 +94467,17 @@ SQLITE_PRIVATE void sqlite3Insert(
     goto insert_cleanup;
   }
 
+  /* If the Select object is really just a simple VALUES() list with a
+  ** single row values (the common case) then keep that one row of values
+  ** and go ahead and discard the Select object
+  */
+  if( pSelect && (pSelect->selFlags & SF_Values)!=0 && pSelect->pPrior==0 ){
+    pList = pSelect->pEList;
+    pSelect->pEList = 0;
+    sqlite3SelectDelete(db, pSelect);
+    pSelect = 0;
+  }
+
   /* Locate the table into which we will be inserting new information.
   */
   assert( pTabList->nSrc==1 );
@@ -90695,6 +94494,7 @@ SQLITE_PRIVATE void sqlite3Insert(
   if( sqlite3AuthCheck(pParse, SQLITE_INSERT, pTab->zName, 0, zDb) ){
     goto insert_cleanup;
   }
+  withoutRowid = !HasRowid(pTab);
 
   /* Figure out if we have any triggers and if the table being
   ** inserted into is a view
@@ -90714,16 +94514,13 @@ SQLITE_PRIVATE void sqlite3Insert(
   assert( (pTrigger && tmask) || (pTrigger==0 && tmask==0) );
 
   /* If pTab is really a view, make sure it has been initialized.
-  ** ViewGetColumnNames() is a no-op if pTab is not a view (or virtual 
-  ** module table).
+  ** ViewGetColumnNames() is a no-op if pTab is not a view.
   */
   if( sqlite3ViewGetColumnNames(pParse, pTab) ){
     goto insert_cleanup;
   }
 
-  /* Ensure that:
-  *  (a) the table is not read-only, 
-  *  (b) that if it is a view then ON INSERT triggers exist
+  /* Cannot insert into a read-only table.
   */
   if( sqlite3IsReadOnly(pParse, pTab, tmask) ){
     goto insert_cleanup;
@@ -90758,33 +94555,93 @@ SQLITE_PRIVATE void sqlite3Insert(
   */
   regAutoinc = autoIncBegin(pParse, iDb, pTab);
 
+  /* Allocate registers for holding the rowid of the new row,
+  ** the content of the new row, and the assemblied row record.
+  */
+  regRowid = regIns = pParse->nMem+1;
+  pParse->nMem += pTab->nCol + 1;
+  if( IsVirtual(pTab) ){
+    regRowid++;
+    pParse->nMem++;
+  }
+  regData = regRowid+1;
+
+  /* If the INSERT statement included an IDLIST term, then make sure
+  ** all elements of the IDLIST really are columns of the table and 
+  ** remember the column indices.
+  **
+  ** If the table has an INTEGER PRIMARY KEY column and that column
+  ** is named in the IDLIST, then record in the ipkColumn variable
+  ** the index into IDLIST of the primary key column.  ipkColumn is
+  ** the index of the primary key as it appears in IDLIST, not as
+  ** is appears in the original table.  (The index of the INTEGER
+  ** PRIMARY KEY in the original table is pTab->iPKey.)
+  */
+  if( pColumn ){
+    for(i=0; i<pColumn->nId; i++){
+      pColumn->a[i].idx = -1;
+    }
+    for(i=0; i<pColumn->nId; i++){
+      for(j=0; j<pTab->nCol; j++){
+        if( sqlite3StrICmp(pColumn->a[i].zName, pTab->aCol[j].zName)==0 ){
+          pColumn->a[i].idx = j;
+          if( i!=j ) bIdListInOrder = 0;
+          if( j==pTab->iPKey ){
+            ipkColumn = i;  assert( !withoutRowid );
+          }
+          break;
+        }
+      }
+      if( j>=pTab->nCol ){
+        if( sqlite3IsRowid(pColumn->a[i].zName) && !withoutRowid ){
+          ipkColumn = i;
+          bIdListInOrder = 0;
+        }else{
+          sqlite3ErrorMsg(pParse, "table %S has no column named %s",
+              pTabList, 0, pColumn->a[i].zName);
+          pParse->checkSchema = 1;
+          goto insert_cleanup;
+        }
+      }
+    }
+  }
+
   /* Figure out how many columns of data are supplied.  If the data
   ** is coming from a SELECT statement, then generate a co-routine that
   ** produces a single row of the SELECT on each invocation.  The
   ** co-routine is the common header to the 3rd and 4th templates.
   */
   if( pSelect ){
-    /* Data is coming from a SELECT.  Generate a co-routine to run that
-    ** SELECT. */
-    int rc = sqlite3CodeCoroutine(pParse, pSelect, &dest);
-    if( rc ) goto insert_cleanup;
+    /* Data is coming from a SELECT.  Generate a co-routine to run the SELECT */
+    int regYield;       /* Register holding co-routine entry-point */
+    int addrTop;        /* Top of the co-routine */
+    int rc;             /* Result code */
 
-    regEof = dest.iSDParm + 1;
+    regYield = ++pParse->nMem;
+    addrTop = sqlite3VdbeCurrentAddr(v) + 1;
+    sqlite3VdbeAddOp3(v, OP_InitCoroutine, regYield, 0, addrTop);
+    sqlite3SelectDestInit(&dest, SRT_Coroutine, regYield);
+    dest.iSdst = bIdListInOrder ? regData : 0;
+    dest.nSdst = pTab->nCol;
+    rc = sqlite3Select(pParse, pSelect, &dest);
     regFromSelect = dest.iSdst;
+    assert( pParse->nErr==0 || rc );
+    if( rc || db->mallocFailed ) goto insert_cleanup;
+    sqlite3VdbeAddOp1(v, OP_EndCoroutine, regYield);
+    sqlite3VdbeJumpHere(v, addrTop - 1);                       /* label B: */
     assert( pSelect->pEList );
     nColumn = pSelect->pEList->nExpr;
-    assert( dest.nSdst==nColumn );
 
     /* Set useTempTable to TRUE if the result of the SELECT statement
     ** should be written into a temporary table (template 4).  Set to
-    ** FALSE if each* row of the SELECT can be written directly into
+    ** FALSE if each output row of the SELECT can be written directly into
     ** the destination table (template 3).
     **
     ** A temp table must be used if the table being updated is also one
     ** of the tables being read by the SELECT statement.  Also use a 
     ** temp table in the case of row triggers.
     */
-    if( pTrigger || readsTable(pParse, addrSelect, iDb, pTab) ){
+    if( pTrigger || readsTable(pParse, iDb, pTab) ){
       useTempTable = 1;
     }
 
@@ -90794,28 +94651,25 @@ SQLITE_PRIVATE void sqlite3Insert(
       ** here is from the 4th template:
       **
       **      B: open temp table
-      **      L: yield X
-      **         if EOF goto M
+      **      L: yield X, goto M at EOF
       **         insert row from R..R+n into temp table
       **         goto L
       **      M: ...
       */
       int regRec;          /* Register to hold packed record */
       int regTempRowid;    /* Register to hold temp table ROWID */
-      int addrTop;         /* Label "L" */
-      int addrIf;          /* Address of jump to M */
+      int addrL;           /* Label "L" */
 
       srcTab = pParse->nTab++;
       regRec = sqlite3GetTempReg(pParse);
       regTempRowid = sqlite3GetTempReg(pParse);
       sqlite3VdbeAddOp2(v, OP_OpenEphemeral, srcTab, nColumn);
-      addrTop = sqlite3VdbeAddOp1(v, OP_Yield, dest.iSDParm);
-      addrIf = sqlite3VdbeAddOp1(v, OP_If, regEof);
+      addrL = sqlite3VdbeAddOp1(v, OP_Yield, dest.iSDParm); VdbeCoverage(v);
       sqlite3VdbeAddOp3(v, OP_MakeRecord, regFromSelect, nColumn, regRec);
       sqlite3VdbeAddOp2(v, OP_NewRowid, srcTab, regTempRowid);
       sqlite3VdbeAddOp3(v, OP_Insert, srcTab, regRec, regTempRowid);
-      sqlite3VdbeAddOp2(v, OP_Goto, 0, addrTop);
-      sqlite3VdbeJumpHere(v, addrIf);
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, addrL);
+      sqlite3VdbeJumpHere(v, addrL);
       sqlite3ReleaseTempReg(pParse, regRec);
       sqlite3ReleaseTempReg(pParse, regTempRowid);
     }
@@ -90836,6 +94690,14 @@ SQLITE_PRIVATE void sqlite3Insert(
     }
   }
 
+  /* If there is no IDLIST term but the table has an integer primary
+  ** key, the set the ipkColumn variable to the integer primary key 
+  ** column index in the original table definition.
+  */
+  if( pColumn==0 && nColumn>0 ){
+    ipkColumn = pTab->iPKey;
+  }
+
   /* Make sure the number of columns in the source data matches the number
   ** of columns to be inserted into the table.
   */
@@ -90854,52 +94716,6 @@ SQLITE_PRIVATE void sqlite3Insert(
     sqlite3ErrorMsg(pParse, "%d values for %d columns", nColumn, pColumn->nId);
     goto insert_cleanup;
   }
-
-  /* If the INSERT statement included an IDLIST term, then make sure
-  ** all elements of the IDLIST really are columns of the table and 
-  ** remember the column indices.
-  **
-  ** If the table has an INTEGER PRIMARY KEY column and that column
-  ** is named in the IDLIST, then record in the keyColumn variable
-  ** the index into IDLIST of the primary key column.  keyColumn is
-  ** the index of the primary key as it appears in IDLIST, not as
-  ** is appears in the original table.  (The index of the primary
-  ** key in the original table is pTab->iPKey.)
-  */
-  if( pColumn ){
-    for(i=0; i<pColumn->nId; i++){
-      pColumn->a[i].idx = -1;
-    }
-    for(i=0; i<pColumn->nId; i++){
-      for(j=0; j<pTab->nCol; j++){
-        if( sqlite3StrICmp(pColumn->a[i].zName, pTab->aCol[j].zName)==0 ){
-          pColumn->a[i].idx = j;
-          if( j==pTab->iPKey ){
-            keyColumn = i;
-          }
-          break;
-        }
-      }
-      if( j>=pTab->nCol ){
-        if( sqlite3IsRowid(pColumn->a[i].zName) ){
-          keyColumn = i;
-        }else{
-          sqlite3ErrorMsg(pParse, "table %S has no column named %s",
-              pTabList, 0, pColumn->a[i].zName);
-          pParse->checkSchema = 1;
-          goto insert_cleanup;
-        }
-      }
-    }
-  }
-
-  /* If there is no IDLIST term but the table has an integer primary
-  ** key, the set the keyColumn variable to the primary key column index
-  ** in the original table definition.
-  */
-  if( pColumn==0 && nColumn>0 ){
-    keyColumn = pTab->iPKey;
-  }
     
   /* Initialize the count of rows to be inserted
   */
@@ -90911,9 +94727,8 @@ SQLITE_PRIVATE void sqlite3Insert(
   /* If this is not a view, open the table and and all indices */
   if( !isView ){
     int nIdx;
-
-    baseCur = pParse->nTab;
-    nIdx = sqlite3OpenTableAndIndices(pParse, pTab, baseCur, OP_OpenWrite);
+    nIdx = sqlite3OpenTableAndIndices(pParse, pTab, OP_OpenWrite, -1, 0,
+                                      &iDataCur, &iIdxCur);
     aRegIdx = sqlite3DbMallocRaw(db, sizeof(int)*(nIdx+1));
     if( aRegIdx==0 ){
       goto insert_cleanup;
@@ -90928,39 +94743,27 @@ SQLITE_PRIVATE void sqlite3Insert(
     /* This block codes the top of loop only.  The complete loop is the
     ** following pseudocode (template 4):
     **
-    **         rewind temp table
+    **         rewind temp table, if empty goto D
     **      C: loop over rows of intermediate table
     **           transfer values form intermediate table into <table>
     **         end loop
     **      D: ...
     */
-    addrInsTop = sqlite3VdbeAddOp1(v, OP_Rewind, srcTab);
+    addrInsTop = sqlite3VdbeAddOp1(v, OP_Rewind, srcTab); VdbeCoverage(v);
     addrCont = sqlite3VdbeCurrentAddr(v);
   }else if( pSelect ){
     /* This block codes the top of loop only.  The complete loop is the
     ** following pseudocode (template 3):
     **
-    **      C: yield X
-    **         if EOF goto D
+    **      C: yield X, at EOF goto D
     **         insert the select result into <table> from R..R+n
     **         goto C
     **      D: ...
     */
-    addrCont = sqlite3VdbeAddOp1(v, OP_Yield, dest.iSDParm);
-    addrInsTop = sqlite3VdbeAddOp1(v, OP_If, regEof);
+    addrInsTop = addrCont = sqlite3VdbeAddOp1(v, OP_Yield, dest.iSDParm);
+    VdbeCoverage(v);
   }
 
-  /* Allocate registers for holding the rowid of the new row,
-  ** the content of the new row, and the assemblied row record.
-  */
-  regRowid = regIns = pParse->nMem+1;
-  pParse->nMem += pTab->nCol + 1;
-  if( IsVirtual(pTab) ){
-    regRowid++;
-    pParse->nMem++;
-  }
-  regData = regRowid+1;
-
   /* Run the BEFORE and INSTEAD OF triggers, if there are any
   */
   endOfLoop = sqlite3VdbeMakeLabel(v);
@@ -90973,20 +94776,21 @@ SQLITE_PRIVATE void sqlite3Insert(
     ** we do not know what the unique ID will be (because the insert has
     ** not happened yet) so we substitute a rowid of -1
     */
-    if( keyColumn<0 ){
+    if( ipkColumn<0 ){
       sqlite3VdbeAddOp2(v, OP_Integer, -1, regCols);
     }else{
       int j1;
+      assert( !withoutRowid );
       if( useTempTable ){
-        sqlite3VdbeAddOp3(v, OP_Column, srcTab, keyColumn, regCols);
+        sqlite3VdbeAddOp3(v, OP_Column, srcTab, ipkColumn, regCols);
       }else{
         assert( pSelect==0 );  /* Otherwise useTempTable is true */
-        sqlite3ExprCode(pParse, pList->a[keyColumn].pExpr, regCols);
+        sqlite3ExprCode(pParse, pList->a[ipkColumn].pExpr, regCols);
       }
-      j1 = sqlite3VdbeAddOp1(v, OP_NotNull, regCols);
+      j1 = sqlite3VdbeAddOp1(v, OP_NotNull, regCols); VdbeCoverage(v);
       sqlite3VdbeAddOp2(v, OP_Integer, -1, regCols);
       sqlite3VdbeJumpHere(v, j1);
-      sqlite3VdbeAddOp1(v, OP_MustBeInt, regCols);
+      sqlite3VdbeAddOp1(v, OP_MustBeInt, regCols); VdbeCoverage(v);
     }
 
     /* Cannot have triggers on a virtual table. If it were possible,
@@ -91020,8 +94824,7 @@ SQLITE_PRIVATE void sqlite3Insert(
     ** table column affinities.
     */
     if( !isView ){
-      sqlite3VdbeAddOp2(v, OP_Affinity, regCols+1, pTab->nCol);
-      sqlite3TableAffinityStr(v, pTab);
+      sqlite3TableAffinity(v, pTab, regCols+1);
     }
 
     /* Fire BEFORE or INSTEAD OF triggers */
@@ -91031,29 +94834,27 @@ SQLITE_PRIVATE void sqlite3Insert(
     sqlite3ReleaseTempRange(pParse, regCols, pTab->nCol+1);
   }
 
-  /* Push the record number for the new entry onto the stack.  The
-  ** record number is a randomly generate integer created by NewRowid
-  ** except when the table has an INTEGER PRIMARY KEY column, in which
-  ** case the record number is the same as that column. 
+  /* Compute the content of the next row to insert into a range of
+  ** registers beginning at regIns.
   */
   if( !isView ){
     if( IsVirtual(pTab) ){
       /* The row that the VUpdate opcode will delete: none */
       sqlite3VdbeAddOp2(v, OP_Null, 0, regIns);
     }
-    if( keyColumn>=0 ){
+    if( ipkColumn>=0 ){
       if( useTempTable ){
-        sqlite3VdbeAddOp3(v, OP_Column, srcTab, keyColumn, regRowid);
+        sqlite3VdbeAddOp3(v, OP_Column, srcTab, ipkColumn, regRowid);
       }else if( pSelect ){
-        sqlite3VdbeAddOp2(v, OP_SCopy, regFromSelect+keyColumn, regRowid);
+        sqlite3VdbeAddOp2(v, OP_Copy, regFromSelect+ipkColumn, regRowid);
       }else{
         VdbeOp *pOp;
-        sqlite3ExprCode(pParse, pList->a[keyColumn].pExpr, regRowid);
+        sqlite3ExprCode(pParse, pList->a[ipkColumn].pExpr, regRowid);
         pOp = sqlite3VdbeGetOp(v, -1);
         if( ALWAYS(pOp) && pOp->opcode==OP_Null && !IsVirtual(pTab) ){
           appendFlag = 1;
           pOp->opcode = OP_NewRowid;
-          pOp->p1 = baseCur;
+          pOp->p1 = iDataCur;
           pOp->p2 = regRowid;
           pOp->p3 = regAutoinc;
         }
@@ -91064,24 +94865,24 @@ SQLITE_PRIVATE void sqlite3Insert(
       if( !appendFlag ){
         int j1;
         if( !IsVirtual(pTab) ){
-          j1 = sqlite3VdbeAddOp1(v, OP_NotNull, regRowid);
-          sqlite3VdbeAddOp3(v, OP_NewRowid, baseCur, regRowid, regAutoinc);
+          j1 = sqlite3VdbeAddOp1(v, OP_NotNull, regRowid); VdbeCoverage(v);
+          sqlite3VdbeAddOp3(v, OP_NewRowid, iDataCur, regRowid, regAutoinc);
           sqlite3VdbeJumpHere(v, j1);
         }else{
           j1 = sqlite3VdbeCurrentAddr(v);
-          sqlite3VdbeAddOp2(v, OP_IsNull, regRowid, j1+2);
+          sqlite3VdbeAddOp2(v, OP_IsNull, regRowid, j1+2); VdbeCoverage(v);
         }
-        sqlite3VdbeAddOp1(v, OP_MustBeInt, regRowid);
+        sqlite3VdbeAddOp1(v, OP_MustBeInt, regRowid); VdbeCoverage(v);
       }
-    }else if( IsVirtual(pTab) ){
+    }else if( IsVirtual(pTab) || withoutRowid ){
       sqlite3VdbeAddOp2(v, OP_Null, 0, regRowid);
     }else{
-      sqlite3VdbeAddOp3(v, OP_NewRowid, baseCur, regRowid, regAutoinc);
+      sqlite3VdbeAddOp3(v, OP_NewRowid, iDataCur, regRowid, regAutoinc);
       appendFlag = 1;
     }
     autoIncStep(pParse, regAutoinc, regRowid);
 
-    /* Push onto the stack, data for all columns of the new entry, beginning
+    /* Compute data for all columns of the new entry, beginning
     ** with the first column.
     */
     nHidden = 0;
@@ -91089,10 +94890,11 @@ SQLITE_PRIVATE void sqlite3Insert(
       int iRegStore = regRowid+1+i;
       if( i==pTab->iPKey ){
         /* The value of the INTEGER PRIMARY KEY column is always a NULL.
-        ** Whenever this column is read, the record number will be substituted
-        ** in its place.  So will fill this column with a NULL to avoid
-        ** taking up data space with information that will never be used. */
-        sqlite3VdbeAddOp2(v, OP_Null, 0, iRegStore);
+        ** Whenever this column is read, the rowid will be substituted
+        ** in its place.  Hence, fill this column with a NULL to avoid
+        ** taking up data space with information that will never be used.
+        ** As there may be shallow copies of this value, make it a soft-NULL */
+        sqlite3VdbeAddOp1(v, OP_SoftNull, iRegStore);
         continue;
       }
       if( pColumn==0 ){
@@ -91109,11 +94911,13 @@ SQLITE_PRIVATE void sqlite3Insert(
         }
       }
       if( j<0 || nColumn==0 || (pColumn && j>=pColumn->nId) ){
-        sqlite3ExprCode(pParse, pTab->aCol[i].pDflt, iRegStore);
+        sqlite3ExprCodeFactorable(pParse, pTab->aCol[i].pDflt, iRegStore);
       }else if( useTempTable ){
         sqlite3VdbeAddOp3(v, OP_Column, srcTab, j, iRegStore); 
       }else if( pSelect ){
-        sqlite3VdbeAddOp2(v, OP_SCopy, regFromSelect+j, iRegStore);
+        if( regFromSelect!=regData ){
+          sqlite3VdbeAddOp2(v, OP_SCopy, regFromSelect+j, iRegStore);
+        }
       }else{
         sqlite3ExprCode(pParse, pList->a[j].pExpr, iRegStore);
       }
@@ -91133,13 +94937,12 @@ SQLITE_PRIVATE void sqlite3Insert(
 #endif
     {
       int isReplace;    /* Set to true if constraints may cause a replace */
-      sqlite3GenerateConstraintChecks(pParse, pTab, baseCur, regIns, aRegIdx,
-          keyColumn>=0, 0, onError, endOfLoop, &isReplace
-      );
-      sqlite3FkCheck(pParse, pTab, 0, regIns);
-      sqlite3CompleteInsertion(
-          pParse, pTab, baseCur, regIns, aRegIdx, 0, appendFlag, isReplace==0
+      sqlite3GenerateConstraintChecks(pParse, pTab, aRegIdx, iDataCur, iIdxCur,
+          regIns, 0, ipkColumn>=0, onError, endOfLoop, &isReplace
       );
+      sqlite3FkCheck(pParse, pTab, 0, regIns, 0, 0);
+      sqlite3CompleteInsertion(pParse, pTab, iDataCur, iIdxCur,
+                               regIns, aRegIdx, 0, appendFlag, isReplace==0);
     }
   }
 
@@ -91160,7 +94963,7 @@ SQLITE_PRIVATE void sqlite3Insert(
   */
   sqlite3VdbeResolveLabel(v, endOfLoop);
   if( useTempTable ){
-    sqlite3VdbeAddOp2(v, OP_Next, srcTab, addrCont);
+    sqlite3VdbeAddOp2(v, OP_Next, srcTab, addrCont); VdbeCoverage(v);
     sqlite3VdbeJumpHere(v, addrInsTop);
     sqlite3VdbeAddOp1(v, OP_Close, srcTab);
   }else if( pSelect ){
@@ -91170,9 +94973,9 @@ SQLITE_PRIVATE void sqlite3Insert(
 
   if( !IsVirtual(pTab) && !isView ){
     /* Close all tables opened */
-    sqlite3VdbeAddOp1(v, OP_Close, baseCur);
-    for(idx=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, idx++){
-      sqlite3VdbeAddOp1(v, OP_Close, idx+baseCur);
+    if( iDataCur<iIdxCur ) sqlite3VdbeAddOp1(v, OP_Close, iDataCur);
+    for(idx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, idx++){
+      sqlite3VdbeAddOp1(v, OP_Close, idx+iIdxCur);
     }
   }
 
@@ -91217,36 +95020,48 @@ SQLITE_PRIVATE void sqlite3Insert(
  #undef tmask
 #endif
 
-
 /*
-** Generate code to do constraint checks prior to an INSERT or an UPDATE.
+** Generate code to do constraint checks prior to an INSERT or an UPDATE
+** on table pTab.
 **
-** The input is a range of consecutive registers as follows:
+** The regNewData parameter is the first register in a range that contains
+** the data to be inserted or the data after the update.  There will be
+** pTab->nCol+1 registers in this range.  The first register (the one
+** that regNewData points to) will contain the new rowid, or NULL in the
+** case of a WITHOUT ROWID table.  The second register in the range will
+** contain the content of the first table column.  The third register will
+** contain the content of the second table column.  And so forth.
 **
-**    1.  The rowid of the row after the update.
+** The regOldData parameter is similar to regNewData except that it contains
+** the data prior to an UPDATE rather than afterwards.  regOldData is zero
+** for an INSERT.  This routine can distinguish between UPDATE and INSERT by
+** checking regOldData for zero.
 **
-**    2.  The data in the first column of the entry after the update.
+** For an UPDATE, the pkChng boolean is true if the true primary key (the
+** rowid for a normal table or the PRIMARY KEY for a WITHOUT ROWID table)
+** might be modified by the UPDATE.  If pkChng is false, then the key of
+** the iDataCur content table is guaranteed to be unchanged by the UPDATE.
 **
-**    i.  Data from middle columns...
+** For an INSERT, the pkChng boolean indicates whether or not the rowid
+** was explicitly specified as part of the INSERT statement.  If pkChng
+** is zero, it means that the either rowid is computed automatically or
+** that the table is a WITHOUT ROWID table and has no rowid.  On an INSERT,
+** pkChng will only be true if the INSERT statement provides an integer
+** value for either the rowid column or its INTEGER PRIMARY KEY alias.
 **
-**    N.  The data in the last column of the entry after the update.
-**
-** The regRowid parameter is the index of the register containing (1).
-**
-** If isUpdate is true and rowidChng is non-zero, then rowidChng contains
-** the address of a register containing the rowid before the update takes
-** place. isUpdate is true for UPDATEs and false for INSERTs. If isUpdate
-** is false, indicating an INSERT statement, then a non-zero rowidChng 
-** indicates that the rowid was explicitly specified as part of the
-** INSERT statement. If rowidChng is false, it means that  the rowid is
-** computed automatically in an insert or that the rowid value is not 
-** modified by an update.
-**
-** The code generated by this routine store new index entries into
+** The code generated by this routine will store new index entries into
 ** registers identified by aRegIdx[].  No index entry is created for
 ** indices where aRegIdx[i]==0.  The order of indices in aRegIdx[] is
 ** the same as the order of indices on the linked list of indices
-** attached to the table.
+** at pTab->pIndex.
+**
+** The caller must have already opened writeable cursors on the main
+** table and all applicable indices (that is to say, all indices for which
+** aRegIdx[] is not zero).  iDataCur is the cursor for the main table when
+** inserting or updating a rowid table, or the cursor for the PRIMARY KEY
+** index when operating on a WITHOUT ROWID table.  iIdxCur is the cursor
+** for the first index in the pTab->pIndex list.  Cursors for other indices
+** are at iIdxCur+N for the N-th element of the pTab->pIndex list.
 **
 ** This routine also generates code to check constraints.  NOT NULL,
 ** CHECK, and UNIQUE constraints are all checked.  If a constraint fails,
@@ -91256,22 +95071,23 @@ SQLITE_PRIVATE void sqlite3Insert(
 **  Constraint type  Action       What Happens
 **  ---------------  ----------   ----------------------------------------
 **  any              ROLLBACK     The current transaction is rolled back and
-**                                sqlite3_exec() returns immediately with a
+**                                sqlite3_step() returns immediately with a
 **                                return code of SQLITE_CONSTRAINT.
 **
 **  any              ABORT        Back out changes from the current command
 **                                only (do not do a complete rollback) then
-**                                cause sqlite3_exec() to return immediately
+**                                cause sqlite3_step() to return immediately
 **                                with SQLITE_CONSTRAINT.
 **
-**  any              FAIL         Sqlite3_exec() returns immediately with a
+**  any              FAIL         Sqlite3_step() returns immediately with a
 **                                return code of SQLITE_CONSTRAINT.  The
 **                                transaction is not rolled back and any
-**                                prior changes are retained.
+**                                changes to prior rows are retained.
 **
-**  any              IGNORE       The record number and data is popped from
-**                                the stack and there is an immediate jump
-**                                to label ignoreDest.
+**  any              IGNORE       The attempt in insert or update the current
+**                                row is skipped, without throwing an error.
+**                                Processing continues with the next row.
+**                                (There is an immediate jump to ignoreDest.)
 **
 **  NOT NULL         REPLACE      The NULL value is replace by the default
 **                                value for that column.  If the default value
@@ -91286,44 +95102,59 @@ SQLITE_PRIVATE void sqlite3Insert(
 ** Or if overrideError==OE_Default, then the pParse->onError parameter
 ** is used.  Or if pParse->onError==OE_Default then the onError value
 ** for the constraint is used.
-**
-** The calling routine must open a read/write cursor for pTab with
-** cursor number "baseCur".  All indices of pTab must also have open
-** read/write cursors with cursor number baseCur+i for the i-th cursor.
-** Except, if there is no possibility of a REPLACE action then
-** cursors do not need to be open for indices where aRegIdx[i]==0.
 */
 SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
-  Parse *pParse,      /* The parser context */
-  Table *pTab,        /* the table into which we are inserting */
-  int baseCur,        /* Index of a read/write cursor pointing at pTab */
-  int regRowid,       /* Index of the range of input registers */
-  int *aRegIdx,       /* Register used by each index.  0 for unused indices */
-  int rowidChng,      /* True if the rowid might collide with existing entry */
-  int isUpdate,       /* True for UPDATE, False for INSERT */
-  int overrideError,  /* Override onError to this if not OE_Default */
-  int ignoreDest,     /* Jump to this label on an OE_Ignore resolution */
-  int *pbMayReplace   /* OUT: Set to true if constraint may cause a replace */
+  Parse *pParse,       /* The parser context */
+  Table *pTab,         /* The table being inserted or updated */
+  int *aRegIdx,        /* Use register aRegIdx[i] for index i.  0 for unused */
+  int iDataCur,        /* Canonical data cursor (main table or PK index) */
+  int iIdxCur,         /* First index cursor */
+  int regNewData,      /* First register in a range holding values to insert */
+  int regOldData,      /* Previous content.  0 for INSERTs */
+  u8 pkChng,           /* Non-zero if the rowid or PRIMARY KEY changed */
+  u8 overrideError,    /* Override onError to this if not OE_Default */
+  int ignoreDest,      /* Jump to this label on an OE_Ignore resolution */
+  int *pbMayReplace    /* OUT: Set to true if constraint may cause a replace */
 ){
-  int i;              /* loop counter */
-  Vdbe *v;            /* VDBE under constrution */
-  int nCol;           /* Number of columns */
-  int onError;        /* Conflict resolution strategy */
-  int j1;             /* Addresss of jump instruction */
-  int j2 = 0, j3;     /* Addresses of jump instructions */
-  int regData;        /* Register containing first data column */
-  int iCur;           /* Table cursor number */
+  Vdbe *v;             /* VDBE under constrution */
   Index *pIdx;         /* Pointer to one of the indices */
+  Index *pPk = 0;      /* The PRIMARY KEY index */
   sqlite3 *db;         /* Database connection */
+  int i;               /* loop counter */
+  int ix;              /* Index loop counter */
+  int nCol;            /* Number of columns */
+  int onError;         /* Conflict resolution strategy */
+  int j1;              /* Addresss of jump instruction */
   int seenReplace = 0; /* True if REPLACE is used to resolve INT PK conflict */
-  int regOldRowid = (rowidChng && isUpdate) ? rowidChng : regRowid;
+  int nPkField;        /* Number of fields in PRIMARY KEY. 1 for ROWID tables */
+  int ipkTop = 0;      /* Top of the rowid change constraint check */
+  int ipkBottom = 0;   /* Bottom of the rowid change constraint check */
+  u8 isUpdate;         /* True if this is an UPDATE operation */
+  u8 bAffinityDone = 0;  /* True if the OP_Affinity operation has been run */
+  int regRowid = -1;   /* Register holding ROWID value */
 
+  isUpdate = regOldData!=0;
   db = pParse->db;
   v = sqlite3GetVdbe(pParse);
   assert( v!=0 );
   assert( pTab->pSelect==0 );  /* This table is not a VIEW */
   nCol = pTab->nCol;
-  regData = regRowid + 1;
+  
+  /* pPk is the PRIMARY KEY index for WITHOUT ROWID tables and NULL for
+  ** normal rowid tables.  nPkField is the number of key fields in the 
+  ** pPk index or 1 for a rowid table.  In other words, nPkField is the
+  ** number of fields in the true primary key of the table. */
+  if( HasRowid(pTab) ){
+    pPk = 0;
+    nPkField = 1;
+  }else{
+    pPk = sqlite3PrimaryKeyIndex(pTab);
+    nPkField = pPk->nKeyCol;
+  }
+
+  /* Record that this module has started */
+  VdbeModuleComment((v, "BEGIN: GenCnstCks(%d,%d,%d,%d,%d)",
+                     iDataCur, iIdxCur, regNewData, regOldData, pkChng));
 
   /* Test all NOT NULL constraints.
   */
@@ -91346,24 +95177,26 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
     switch( onError ){
       case OE_Abort:
         sqlite3MayAbort(pParse);
+        /* Fall through */
       case OE_Rollback:
       case OE_Fail: {
-        char *zMsg;
-        sqlite3VdbeAddOp3(v, OP_HaltIfNull,
-                          SQLITE_CONSTRAINT_NOTNULL, onError, regData+i);
-        zMsg = sqlite3MPrintf(db, "%s.%s may not be NULL",
-                              pTab->zName, pTab->aCol[i].zName);
-        sqlite3VdbeChangeP4(v, -1, zMsg, P4_DYNAMIC);
+        char *zMsg = sqlite3MPrintf(db, "%s.%s", pTab->zName,
+                                    pTab->aCol[i].zName);
+        sqlite3VdbeAddOp4(v, OP_HaltIfNull, SQLITE_CONSTRAINT_NOTNULL, onError,
+                          regNewData+1+i, zMsg, P4_DYNAMIC);
+        sqlite3VdbeChangeP5(v, P5_ConstraintNotNull);
+        VdbeCoverage(v);
         break;
       }
       case OE_Ignore: {
-        sqlite3VdbeAddOp2(v, OP_IsNull, regData+i, ignoreDest);
+        sqlite3VdbeAddOp2(v, OP_IsNull, regNewData+1+i, ignoreDest);
+        VdbeCoverage(v);
         break;
       }
       default: {
         assert( onError==OE_Replace );
-        j1 = sqlite3VdbeAddOp1(v, OP_NotNull, regData+i);
-        sqlite3ExprCode(pParse, pTab->aCol[i].pDflt, regData+i);
+        j1 = sqlite3VdbeAddOp1(v, OP_NotNull, regNewData+1+i); VdbeCoverage(v);
+        sqlite3ExprCode(pParse, pTab->aCol[i].pDflt, regNewData+1+i);
         sqlite3VdbeJumpHere(v, j1);
         break;
       }
@@ -91375,7 +95208,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
 #ifndef SQLITE_OMIT_CHECK
   if( pTab->pCheck && (db->flags & SQLITE_IgnoreChecks)==0 ){
     ExprList *pCheck = pTab->pCheck;
-    pParse->ckBase = regData;
+    pParse->ckBase = regNewData+1;
     onError = overrideError!=OE_Default ? overrideError : OE_Abort;
     for(i=0; i<pCheck->nExpr; i++){
       int allOk = sqlite3VdbeMakeLabel(v);
@@ -91383,37 +95216,61 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
       if( onError==OE_Ignore ){
         sqlite3VdbeAddOp2(v, OP_Goto, 0, ignoreDest);
       }else{
-        char *zConsName = pCheck->a[i].zName;
+        char *zName = pCheck->a[i].zName;
+        if( zName==0 ) zName = pTab->zName;
         if( onError==OE_Replace ) onError = OE_Abort; /* IMP: R-15569-63625 */
-        if( zConsName ){
-          zConsName = sqlite3MPrintf(db, "constraint %s failed", zConsName);
-        }else{
-          zConsName = 0;
-        }
         sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_CHECK,
-                              onError, zConsName, P4_DYNAMIC);
+                              onError, zName, P4_TRANSIENT,
+                              P5_ConstraintCheck);
       }
       sqlite3VdbeResolveLabel(v, allOk);
     }
   }
 #endif /* !defined(SQLITE_OMIT_CHECK) */
 
-  /* If we have an INTEGER PRIMARY KEY, make sure the primary key
-  ** of the new record does not previously exist.  Except, if this
-  ** is an UPDATE and the primary key is not changing, that is OK.
+  /* If rowid is changing, make sure the new rowid does not previously
+  ** exist in the table.
   */
-  if( rowidChng ){
+  if( pkChng && pPk==0 ){
+    int addrRowidOk = sqlite3VdbeMakeLabel(v);
+
+    /* Figure out what action to take in case of a rowid collision */
     onError = pTab->keyConf;
     if( overrideError!=OE_Default ){
       onError = overrideError;
     }else if( onError==OE_Default ){
       onError = OE_Abort;
     }
-    
+
     if( isUpdate ){
-      j2 = sqlite3VdbeAddOp3(v, OP_Eq, regRowid, 0, rowidChng);
+      /* pkChng!=0 does not mean that the rowid has change, only that
+      ** it might have changed.  Skip the conflict logic below if the rowid
+      ** is unchanged. */
+      sqlite3VdbeAddOp3(v, OP_Eq, regNewData, addrRowidOk, regOldData);
+      sqlite3VdbeChangeP5(v, SQLITE_NOTNULL);
+      VdbeCoverage(v);
     }
-    j3 = sqlite3VdbeAddOp3(v, OP_NotExists, baseCur, 0, regRowid);
+
+    /* If the response to a rowid conflict is REPLACE but the response
+    ** to some other UNIQUE constraint is FAIL or IGNORE, then we need
+    ** to defer the running of the rowid conflict checking until after
+    ** the UNIQUE constraints have run.
+    */
+    if( onError==OE_Replace && overrideError!=OE_Replace ){
+      for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+        if( pIdx->onError==OE_Ignore || pIdx->onError==OE_Fail ){
+          ipkTop = sqlite3VdbeAddOp0(v, OP_Goto);
+          break;
+        }
+      }
+    }
+
+    /* Check to see if the new rowid already exists in the table.  Skip
+    ** the following conflict logic if it does not. */
+    sqlite3VdbeAddOp3(v, OP_NotExists, iDataCur, addrRowidOk, regNewData);
+    VdbeCoverage(v);
+
+    /* Generate code that deals with a rowid collision */
     switch( onError ){
       default: {
         onError = OE_Abort;
@@ -91422,8 +95279,7 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
       case OE_Rollback:
       case OE_Abort:
       case OE_Fail: {
-        sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_PRIMARYKEY,
-           onError, "PRIMARY KEY must be unique", P4_STATIC);
+        sqlite3RowidConstraint(pParse, onError, pTab);
         break;
       }
       case OE_Replace: {
@@ -91455,57 +95311,93 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
         }
         if( pTrigger || sqlite3FkRequired(pParse, pTab, 0, 0) ){
           sqlite3MultiWrite(pParse);
-          sqlite3GenerateRowDelete(
-              pParse, pTab, baseCur, regRowid, 0, pTrigger, OE_Replace
-          );
+          sqlite3GenerateRowDelete(pParse, pTab, pTrigger, iDataCur, iIdxCur,
+                                   regNewData, 1, 0, OE_Replace, 1);
         }else if( pTab->pIndex ){
           sqlite3MultiWrite(pParse);
-          sqlite3GenerateRowIndexDelete(pParse, pTab, baseCur, 0);
+          sqlite3GenerateRowIndexDelete(pParse, pTab, iDataCur, iIdxCur, 0);
         }
         seenReplace = 1;
         break;
       }
       case OE_Ignore: {
-        assert( seenReplace==0 );
+        /*assert( seenReplace==0 );*/
         sqlite3VdbeAddOp2(v, OP_Goto, 0, ignoreDest);
         break;
       }
     }
-    sqlite3VdbeJumpHere(v, j3);
-    if( isUpdate ){
-      sqlite3VdbeJumpHere(v, j2);
+    sqlite3VdbeResolveLabel(v, addrRowidOk);
+    if( ipkTop ){
+      ipkBottom = sqlite3VdbeAddOp0(v, OP_Goto);
+      sqlite3VdbeJumpHere(v, ipkTop);
     }
   }
 
   /* Test all UNIQUE constraints by creating entries for each UNIQUE
   ** index and making sure that duplicate entries do not already exist.
-  ** Add the new records to the indices as we go.
+  ** Compute the revised record entries for indices as we go.
+  **
+  ** This loop also handles the case of the PRIMARY KEY index for a
+  ** WITHOUT ROWID table.
   */
-  for(iCur=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, iCur++){
-    int regIdx;
-    int regR;
+  for(ix=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, ix++){
+    int regIdx;          /* Range of registers hold conent for pIdx */
+    int regR;            /* Range of registers holding conflicting PK */
+    int iThisCur;        /* Cursor for this UNIQUE index */
+    int addrUniqueOk;    /* Jump here if the UNIQUE constraint is satisfied */
 
-    if( aRegIdx[iCur]==0 ) continue;  /* Skip unused indices */
-
-    /* Create a key for accessing the index entry */
-    regIdx = sqlite3GetTempRange(pParse, pIdx->nColumn+1);
-    for(i=0; i<pIdx->nColumn; i++){
-      int idx = pIdx->aiColumn[i];
-      if( idx==pTab->iPKey ){
-        sqlite3VdbeAddOp2(v, OP_SCopy, regRowid, regIdx+i);
-      }else{
-        sqlite3VdbeAddOp2(v, OP_SCopy, regData+idx, regIdx+i);
-      }
+    if( aRegIdx[ix]==0 ) continue;  /* Skip indices that do not change */
+    if( bAffinityDone==0 ){
+      sqlite3TableAffinity(v, pTab, regNewData+1);
+      bAffinityDone = 1;
     }
-    sqlite3VdbeAddOp2(v, OP_SCopy, regRowid, regIdx+i);
-    sqlite3VdbeAddOp3(v, OP_MakeRecord, regIdx, pIdx->nColumn+1, aRegIdx[iCur]);
-    sqlite3VdbeChangeP4(v, -1, sqlite3IndexAffinityStr(v, pIdx), P4_TRANSIENT);
-    sqlite3ExprCacheAffinityChange(pParse, regIdx, pIdx->nColumn+1);
+    iThisCur = iIdxCur+ix;
+    addrUniqueOk = sqlite3VdbeMakeLabel(v);
 
-    /* Find out what action to take in case there is an indexing conflict */
+    /* Skip partial indices for which the WHERE clause is not true */
+    if( pIdx->pPartIdxWhere ){
+      sqlite3VdbeAddOp2(v, OP_Null, 0, aRegIdx[ix]);
+      pParse->ckBase = regNewData+1;
+      sqlite3ExprIfFalse(pParse, pIdx->pPartIdxWhere, addrUniqueOk,
+                         SQLITE_JUMPIFNULL);
+      pParse->ckBase = 0;
+    }
+
+    /* Create a record for this index entry as it should appear after
+    ** the insert or update.  Store that record in the aRegIdx[ix] register
+    */
+    regIdx = sqlite3GetTempRange(pParse, pIdx->nColumn);
+    for(i=0; i<pIdx->nColumn; i++){
+      int iField = pIdx->aiColumn[i];
+      int x;
+      if( iField<0 || iField==pTab->iPKey ){
+        if( regRowid==regIdx+i ) continue; /* ROWID already in regIdx+i */
+        x = regNewData;
+        regRowid =  pIdx->pPartIdxWhere ? -1 : regIdx+i;
+      }else{
+        x = iField + regNewData + 1;
+      }
+      sqlite3VdbeAddOp2(v, OP_SCopy, x, regIdx+i);
+      VdbeComment((v, "%s", iField<0 ? "rowid" : pTab->aCol[iField].zName));
+    }
+    sqlite3VdbeAddOp3(v, OP_MakeRecord, regIdx, pIdx->nColumn, aRegIdx[ix]);
+    VdbeComment((v, "for %s", pIdx->zName));
+    sqlite3ExprCacheAffinityChange(pParse, regIdx, pIdx->nColumn);
+
+    /* In an UPDATE operation, if this index is the PRIMARY KEY index 
+    ** of a WITHOUT ROWID table and there has been no change the
+    ** primary key, then no collision is possible.  The collision detection
+    ** logic below can all be skipped. */
+    if( isUpdate && pPk==pIdx && pkChng==0 ){
+      sqlite3VdbeResolveLabel(v, addrUniqueOk);
+      continue;
+    }
+
+    /* Find out what action to take in case there is a uniqueness conflict */
     onError = pIdx->onError;
     if( onError==OE_None ){ 
-      sqlite3ReleaseTempRange(pParse, regIdx, pIdx->nColumn+1);
+      sqlite3ReleaseTempRange(pParse, regIdx, pIdx->nColumn);
+      sqlite3VdbeResolveLabel(v, addrUniqueOk);
       continue;  /* pIdx is not a UNIQUE index */
     }
     if( overrideError!=OE_Default ){
@@ -91513,18 +95405,64 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
     }else if( onError==OE_Default ){
       onError = OE_Abort;
     }
-    if( seenReplace ){
-      if( onError==OE_Ignore ) onError = OE_Replace;
-      else if( onError==OE_Fail ) onError = OE_Abort;
-    }
     
     /* Check to see if the new index entry will be unique */
-    regR = sqlite3GetTempReg(pParse);
-    sqlite3VdbeAddOp2(v, OP_SCopy, regOldRowid, regR);
-    j3 = sqlite3VdbeAddOp4(v, OP_IsUnique, baseCur+iCur+1, 0,
-                           regR, SQLITE_INT_TO_PTR(regIdx),
-                           P4_INT32);
-    sqlite3ReleaseTempRange(pParse, regIdx, pIdx->nColumn+1);
+    sqlite3VdbeAddOp4Int(v, OP_NoConflict, iThisCur, addrUniqueOk,
+                         regIdx, pIdx->nKeyCol); VdbeCoverage(v);
+
+    /* Generate code to handle collisions */
+    regR = (pIdx==pPk) ? regIdx : sqlite3GetTempRange(pParse, nPkField);
+    if( isUpdate || onError==OE_Replace ){
+      if( HasRowid(pTab) ){
+        sqlite3VdbeAddOp2(v, OP_IdxRowid, iThisCur, regR);
+        /* Conflict only if the rowid of the existing index entry
+        ** is different from old-rowid */
+        if( isUpdate ){
+          sqlite3VdbeAddOp3(v, OP_Eq, regR, addrUniqueOk, regOldData);
+          sqlite3VdbeChangeP5(v, SQLITE_NOTNULL);
+          VdbeCoverage(v);
+        }
+      }else{
+        int x;
+        /* Extract the PRIMARY KEY from the end of the index entry and
+        ** store it in registers regR..regR+nPk-1 */
+        if( pIdx!=pPk ){
+          for(i=0; i<pPk->nKeyCol; i++){
+            x = sqlite3ColumnOfIndex(pIdx, pPk->aiColumn[i]);
+            sqlite3VdbeAddOp3(v, OP_Column, iThisCur, x, regR+i);
+            VdbeComment((v, "%s.%s", pTab->zName,
+                         pTab->aCol[pPk->aiColumn[i]].zName));
+          }
+        }
+        if( isUpdate ){
+          /* If currently processing the PRIMARY KEY of a WITHOUT ROWID 
+          ** table, only conflict if the new PRIMARY KEY values are actually
+          ** different from the old.
+          **
+          ** For a UNIQUE index, only conflict if the PRIMARY KEY values
+          ** of the matched index row are different from the original PRIMARY
+          ** KEY values of this row before the update.  */
+          int addrJump = sqlite3VdbeCurrentAddr(v)+pPk->nKeyCol;
+          int op = OP_Ne;
+          int regCmp = (IsPrimaryKeyIndex(pIdx) ? regIdx : regR);
+  
+          for(i=0; i<pPk->nKeyCol; i++){
+            char *p4 = (char*)sqlite3LocateCollSeq(pParse, pPk->azColl[i]);
+            x = pPk->aiColumn[i];
+            if( i==(pPk->nKeyCol-1) ){
+              addrJump = addrUniqueOk;
+              op = OP_Eq;
+            }
+            sqlite3VdbeAddOp4(v, op, 
+                regOldData+1+x, addrJump, regCmp+i, p4, P4_COLLSEQ
+            );
+            sqlite3VdbeChangeP5(v, SQLITE_NOTNULL);
+            VdbeCoverageIf(v, op==OP_Eq);
+            VdbeCoverageIf(v, op==OP_Ne);
+          }
+        }
+      }
+    }
 
     /* Generate code that executes if the new index entry is not unique */
     assert( onError==OE_Rollback || onError==OE_Abort || onError==OE_Fail
@@ -91533,30 +95471,10 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
       case OE_Rollback:
       case OE_Abort:
       case OE_Fail: {
-        int j;
-        StrAccum errMsg;
-        const char *zSep;
-        char *zErr;
-
-        sqlite3StrAccumInit(&errMsg, 0, 0, 200);
-        errMsg.db = db;
-        zSep = pIdx->nColumn>1 ? "columns " : "column ";
-        for(j=0; j<pIdx->nColumn; j++){
-          char *zCol = pTab->aCol[pIdx->aiColumn[j]].zName;
-          sqlite3StrAccumAppend(&errMsg, zSep, -1);
-          zSep = ", ";
-          sqlite3StrAccumAppend(&errMsg, zCol, -1);
-        }
-        sqlite3StrAccumAppend(&errMsg,
-            pIdx->nColumn>1 ? " are not unique" : " is not unique", -1);
-        zErr = sqlite3StrAccumFinish(&errMsg);
-        sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_UNIQUE,
-                              onError, zErr, 0);
-        sqlite3DbFree(errMsg.db, zErr);
+        sqlite3UniqueConstraint(pParse, onError, pIdx);
         break;
       }
       case OE_Ignore: {
-        assert( seenReplace==0 );
         sqlite3VdbeAddOp2(v, OP_Goto, 0, ignoreDest);
         break;
       }
@@ -91567,26 +95485,29 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
         if( db->flags&SQLITE_RecTriggers ){
           pTrigger = sqlite3TriggersExist(pParse, pTab, TK_DELETE, 0, 0);
         }
-        sqlite3GenerateRowDelete(
-            pParse, pTab, baseCur, regR, 0, pTrigger, OE_Replace
-        );
+        sqlite3GenerateRowDelete(pParse, pTab, pTrigger, iDataCur, iIdxCur,
+                                 regR, nPkField, 0, OE_Replace, pIdx==pPk);
         seenReplace = 1;
         break;
       }
     }
-    sqlite3VdbeJumpHere(v, j3);
-    sqlite3ReleaseTempReg(pParse, regR);
+    sqlite3VdbeResolveLabel(v, addrUniqueOk);
+    sqlite3ReleaseTempRange(pParse, regIdx, pIdx->nColumn);
+    if( regR!=regIdx ) sqlite3ReleaseTempRange(pParse, regR, nPkField);
+  }
+  if( ipkTop ){
+    sqlite3VdbeAddOp2(v, OP_Goto, 0, ipkTop+1);
+    sqlite3VdbeJumpHere(v, ipkBottom);
   }
   
-  if( pbMayReplace ){
-    *pbMayReplace = seenReplace;
-  }
+  *pbMayReplace = seenReplace;
+  VdbeModuleComment((v, "END: GenCnstCks(%d)", seenReplace));
 }
 
 /*
 ** This routine generates code to finish the INSERT or UPDATE operation
 ** that was started by a prior call to sqlite3GenerateConstraintChecks.
-** A consecutive range of registers starting at regRowid contains the
+** A consecutive range of registers starting at regNewData contains the
 ** rowid and the content to be inserted.
 **
 ** The arguments to this routine should be the same as the first six
@@ -91595,36 +95516,46 @@ SQLITE_PRIVATE void sqlite3GenerateConstraintChecks(
 SQLITE_PRIVATE void sqlite3CompleteInsertion(
   Parse *pParse,      /* The parser context */
   Table *pTab,        /* the table into which we are inserting */
-  int baseCur,        /* Index of a read/write cursor pointing at pTab */
-  int regRowid,       /* Range of content */
+  int iDataCur,       /* Cursor of the canonical data source */
+  int iIdxCur,        /* First index cursor */
+  int regNewData,     /* Range of content */
   int *aRegIdx,       /* Register used by each index.  0 for unused indices */
   int isUpdate,       /* True for UPDATE, False for INSERT */
   int appendBias,     /* True if this is likely to be an append */
   int useSeekResult   /* True to set the USESEEKRESULT flag on OP_[Idx]Insert */
 ){
-  int i;
-  Vdbe *v;
-  int nIdx;
-  Index *pIdx;
-  u8 pik_flags;
-  int regData;
-  int regRec;
+  Vdbe *v;            /* Prepared statements under construction */
+  Index *pIdx;        /* An index being inserted or updated */
+  u8 pik_flags;       /* flag values passed to the btree insert */
+  int regData;        /* Content registers (after the rowid) */
+  int regRec;         /* Register holding assemblied record for the table */
+  int i;              /* Loop counter */
+  u8 bAffinityDone = 0; /* True if OP_Affinity has been run already */
 
   v = sqlite3GetVdbe(pParse);
   assert( v!=0 );
   assert( pTab->pSelect==0 );  /* This table is not a VIEW */
-  for(nIdx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdx++){}
-  for(i=nIdx-1; i>=0; i--){
+  for(i=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
     if( aRegIdx[i]==0 ) continue;
-    sqlite3VdbeAddOp2(v, OP_IdxInsert, baseCur+i+1, aRegIdx[i]);
-    if( useSeekResult ){
-      sqlite3VdbeChangeP5(v, OPFLAG_USESEEKRESULT);
+    bAffinityDone = 1;
+    if( pIdx->pPartIdxWhere ){
+      sqlite3VdbeAddOp2(v, OP_IsNull, aRegIdx[i], sqlite3VdbeCurrentAddr(v)+2);
+      VdbeCoverage(v);
     }
+    sqlite3VdbeAddOp2(v, OP_IdxInsert, iIdxCur+i, aRegIdx[i]);
+    pik_flags = 0;
+    if( useSeekResult ) pik_flags = OPFLAG_USESEEKRESULT;
+    if( IsPrimaryKeyIndex(pIdx) && !HasRowid(pTab) ){
+      assert( pParse->nested==0 );
+      pik_flags |= OPFLAG_NCHANGE;
+    }
+    if( pik_flags )  sqlite3VdbeChangeP5(v, pik_flags);
   }
-  regData = regRowid + 1;
+  if( !HasRowid(pTab) ) return;
+  regData = regNewData + 1;
   regRec = sqlite3GetTempReg(pParse);
   sqlite3VdbeAddOp3(v, OP_MakeRecord, regData, pTab->nCol, regRec);
-  sqlite3TableAffinityStr(v, pTab);
+  if( !bAffinityDone ) sqlite3TableAffinity(v, pTab, 0);
   sqlite3ExprCacheAffinityChange(pParse, regData, pTab->nCol);
   if( pParse->nested ){
     pik_flags = 0;
@@ -91638,7 +95569,7 @@ SQLITE_PRIVATE void sqlite3CompleteInsertion(
   if( useSeekResult ){
     pik_flags |= OPFLAG_USESEEKRESULT;
   }
-  sqlite3VdbeAddOp3(v, OP_Insert, baseCur, regRec, regRowid);
+  sqlite3VdbeAddOp3(v, OP_Insert, iDataCur, regRec, regNewData);
   if( !pParse->nested ){
     sqlite3VdbeChangeP4(v, -1, pTab->zName, P4_TRANSIENT);
   }
@@ -91646,39 +95577,71 @@ SQLITE_PRIVATE void sqlite3CompleteInsertion(
 }
 
 /*
-** Generate code that will open cursors for a table and for all
-** indices of that table.  The "baseCur" parameter is the cursor number used
-** for the table.  Indices are opened on subsequent cursors.
+** Allocate cursors for the pTab table and all its indices and generate
+** code to open and initialized those cursors.
 **
-** Return the number of indices on the table.
+** The cursor for the object that contains the complete data (normally
+** the table itself, but the PRIMARY KEY index in the case of a WITHOUT
+** ROWID table) is returned in *piDataCur.  The first index cursor is
+** returned in *piIdxCur.  The number of indices is returned.
+**
+** Use iBase as the first cursor (either the *piDataCur for rowid tables
+** or the first index for WITHOUT ROWID tables) if it is non-negative.
+** If iBase is negative, then allocate the next available cursor.
+**
+** For a rowid table, *piDataCur will be exactly one less than *piIdxCur.
+** For a WITHOUT ROWID table, *piDataCur will be somewhere in the range
+** of *piIdxCurs, depending on where the PRIMARY KEY index appears on the
+** pTab->pIndex list.
 */
 SQLITE_PRIVATE int sqlite3OpenTableAndIndices(
   Parse *pParse,   /* Parsing context */
   Table *pTab,     /* Table to be opened */
-  int baseCur,     /* Cursor number assigned to the table */
-  int op           /* OP_OpenRead or OP_OpenWrite */
+  int op,          /* OP_OpenRead or OP_OpenWrite */
+  int iBase,       /* Use this for the table cursor, if there is one */
+  u8 *aToOpen,     /* If not NULL: boolean for each table and index */
+  int *piDataCur,  /* Write the database source cursor number here */
+  int *piIdxCur    /* Write the first index cursor number here */
 ){
   int i;
   int iDb;
+  int iDataCur;
   Index *pIdx;
   Vdbe *v;
 
-  if( IsVirtual(pTab) ) return 0;
+  assert( op==OP_OpenRead || op==OP_OpenWrite );
+  if( IsVirtual(pTab) ){
+    assert( aToOpen==0 );
+    *piDataCur = 0;
+    *piIdxCur = 1;
+    return 0;
+  }
   iDb = sqlite3SchemaToIndex(pParse->db, pTab->pSchema);
   v = sqlite3GetVdbe(pParse);
   assert( v!=0 );
-  sqlite3OpenTable(pParse, baseCur, iDb, pTab, op);
-  for(i=1, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
-    KeyInfo *pKey = sqlite3IndexKeyinfo(pParse, pIdx);
+  if( iBase<0 ) iBase = pParse->nTab;
+  iDataCur = iBase++;
+  if( piDataCur ) *piDataCur = iDataCur;
+  if( HasRowid(pTab) && (aToOpen==0 || aToOpen[0]) ){
+    sqlite3OpenTable(pParse, iDataCur, iDb, pTab, op);
+  }else{
+    sqlite3TableLock(pParse, iDb, pTab->tnum, op==OP_OpenWrite, pTab->zName);
+  }
+  if( piIdxCur ) *piIdxCur = iBase;
+  for(i=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
+    int iIdxCur = iBase++;
     assert( pIdx->pSchema==pTab->pSchema );
-    sqlite3VdbeAddOp4(v, op, i+baseCur, pIdx->tnum, iDb,
-                      (char*)pKey, P4_KEYINFO_HANDOFF);
-    VdbeComment((v, "%s", pIdx->zName));
+    if( IsPrimaryKeyIndex(pIdx) && !HasRowid(pTab) && piDataCur ){
+      *piDataCur = iIdxCur;
+    }
+    if( aToOpen==0 || aToOpen[i+1] ){
+      sqlite3VdbeAddOp3(v, op, iIdxCur, pIdx->tnum, iDb);
+      sqlite3VdbeSetP4KeyInfo(pParse, pIdx);
+      VdbeComment((v, "%s", pIdx->zName));
+    }
   }
-  if( pParse->nTab<baseCur+i ){
-    pParse->nTab = baseCur+i;
-  }
-  return i-1;
+  if( iBase>pParse->nTab ) pParse->nTab = iBase;
+  return i;
 }
 
 
@@ -91717,18 +95680,19 @@ static int xferCompatibleCollation(const char *z1, const char *z2){
 **    *   The same DESC and ASC markings occurs on all columns
 **    *   The same onError processing (OE_Abort, OE_Ignore, etc)
 **    *   The same collating sequence on each column
+**    *   The index has the exact same WHERE clause
 */
 static int xferCompatibleIndex(Index *pDest, Index *pSrc){
   int i;
   assert( pDest && pSrc );
   assert( pDest->pTable!=pSrc->pTable );
-  if( pDest->nColumn!=pSrc->nColumn ){
+  if( pDest->nKeyCol!=pSrc->nKeyCol ){
     return 0;   /* Different number of columns */
   }
   if( pDest->onError!=pSrc->onError ){
     return 0;   /* Different conflict resolution strategies */
   }
-  for(i=0; i<pSrc->nColumn; i++){
+  for(i=0; i<pSrc->nKeyCol; i++){
     if( pSrc->aiColumn[i]!=pDest->aiColumn[i] ){
       return 0;   /* Different columns indexed */
     }
@@ -91739,6 +95703,9 @@ static int xferCompatibleIndex(Index *pDest, Index *pSrc){
       return 0;   /* Different collating sequences */
     }
   }
+  if( sqlite3ExprCompare(pSrc->pPartIdxWhere, pDest->pPartIdxWhere, -1) ){
+    return 0;     /* Different WHERE clauses */
+  }
 
   /* If no test above fails then the indices must be compatible */
   return 1;
@@ -91784,10 +95751,9 @@ static int xferOptimization(
   int iDbSrc;                      /* The database of pSrc */
   int iSrc, iDest;                 /* Cursors from source and destination */
   int addr1, addr2;                /* Loop addresses */
-  int emptyDestTest;               /* Address of test for empty pDest */
-  int emptySrcTest;                /* Address of test for empty pSrc */
+  int emptyDestTest = 0;           /* Address of test for empty pDest */
+  int emptySrcTest = 0;            /* Address of test for empty pSrc */
   Vdbe *v;                         /* The VDBE we are building */
-  KeyInfo *pKey;                   /* Key information for an index */
   int regAutoinc;                  /* Memory register used by AUTOINC */
   int destHasUniqueIdx = 0;        /* True if pDest has a UNIQUE index */
   int regData, regRowid;           /* Registers holding data and rowid */
@@ -91795,6 +95761,12 @@ static int xferOptimization(
   if( pSelect==0 ){
     return 0;   /* Must be of the form  INSERT INTO ... SELECT ... */
   }
+  if( pParse->pWith || pSelect->pWith ){
+    /* Do not attempt to process this query if there are an WITH clauses
+    ** attached to it. Proceeding may generate a false "no such table: xxx"
+    ** error if pSelect reads from a CTE named "xxx".  */
+    return 0;
+  }
   if( sqlite3TriggerList(pParse, pDest) ){
     return 0;   /* tab1 must not have triggers */
   }
@@ -91857,6 +95829,9 @@ static int xferOptimization(
   if( pSrc==pDest ){
     return 0;   /* tab1 and tab2 may not be the same table */
   }
+  if( HasRowid(pDest)!=HasRowid(pSrc) ){
+    return 0;   /* source and destination must both be WITHOUT ROWID or not */
+  }
 #ifndef SQLITE_OMIT_VIRTUALTABLE
   if( pSrc->tabFlags & TF_Virtual ){
     return 0;   /* tab2 must not be a virtual table */
@@ -91872,15 +95847,24 @@ static int xferOptimization(
     return 0;   /* Both tables must have the same INTEGER PRIMARY KEY */
   }
   for(i=0; i<pDest->nCol; i++){
-    if( pDest->aCol[i].affinity!=pSrc->aCol[i].affinity ){
+    Column *pDestCol = &pDest->aCol[i];
+    Column *pSrcCol = &pSrc->aCol[i];
+    if( pDestCol->affinity!=pSrcCol->affinity ){
       return 0;    /* Affinity must be the same on all columns */
     }
-    if( !xferCompatibleCollation(pDest->aCol[i].zColl, pSrc->aCol[i].zColl) ){
+    if( !xferCompatibleCollation(pDestCol->zColl, pSrcCol->zColl) ){
       return 0;    /* Collating sequence must be the same on all columns */
     }
-    if( pDest->aCol[i].notNull && !pSrc->aCol[i].notNull ){
+    if( pDestCol->notNull && !pSrcCol->notNull ){
       return 0;    /* tab2 must be NOT NULL if tab1 is */
     }
+    /* Default values for second and subsequent columns need to match. */
+    if( i>0
+     && ((pDestCol->zDflt==0)!=(pSrcCol->zDflt==0) 
+         || (pDestCol->zDflt && strcmp(pDestCol->zDflt, pSrcCol->zDflt)!=0))
+    ){
+      return 0;    /* Default values must be the same for all columns */
+    }
   }
   for(pDestIdx=pDest->pIndex; pDestIdx; pDestIdx=pDestIdx->pNext){
     if( pDestIdx->onError!=OE_None ){
@@ -91894,7 +95878,7 @@ static int xferOptimization(
     }
   }
 #ifndef SQLITE_OMIT_CHECK
-  if( pDest->pCheck && sqlite3ExprListCompare(pSrc->pCheck, pDest->pCheck) ){
+  if( pDest->pCheck && sqlite3ExprListCompare(pSrc->pCheck,pDest->pCheck,-1) ){
     return 0;   /* Tables have different CHECK constraints.  Ticket #2252 */
   }
 #endif
@@ -91927,7 +95911,10 @@ static int xferOptimization(
   iSrc = pParse->nTab++;
   iDest = pParse->nTab++;
   regAutoinc = autoIncBegin(pParse, iDbDest, pDest);
+  regData = sqlite3GetTempReg(pParse);
+  regRowid = sqlite3GetTempReg(pParse);
   sqlite3OpenTable(pParse, iDest, iDbDest, pDest, OP_OpenWrite);
+  assert( HasRowid(pDest) || destHasUniqueIdx );
   if( (pDest->iPKey<0 && pDest->pIndex!=0)          /* (1) */
    || destHasUniqueIdx                              /* (2) */
    || (onError!=OE_Abort && onError!=OE_Rollback)   /* (3) */
@@ -91946,60 +95933,60 @@ static int xferOptimization(
     **
     ** (3) onError is something other than OE_Abort and OE_Rollback.
     */
-    addr1 = sqlite3VdbeAddOp2(v, OP_Rewind, iDest, 0);
+    addr1 = sqlite3VdbeAddOp2(v, OP_Rewind, iDest, 0); VdbeCoverage(v);
     emptyDestTest = sqlite3VdbeAddOp2(v, OP_Goto, 0, 0);
     sqlite3VdbeJumpHere(v, addr1);
-  }else{
-    emptyDestTest = 0;
   }
-  sqlite3OpenTable(pParse, iSrc, iDbSrc, pSrc, OP_OpenRead);
-  emptySrcTest = sqlite3VdbeAddOp2(v, OP_Rewind, iSrc, 0);
-  regData = sqlite3GetTempReg(pParse);
-  regRowid = sqlite3GetTempReg(pParse);
-  if( pDest->iPKey>=0 ){
-    addr1 = sqlite3VdbeAddOp2(v, OP_Rowid, iSrc, regRowid);
-    addr2 = sqlite3VdbeAddOp3(v, OP_NotExists, iDest, 0, regRowid);
-    sqlite3HaltConstraint(pParse, SQLITE_CONSTRAINT_PRIMARYKEY,
-        onError, "PRIMARY KEY must be unique", P4_STATIC);
-    sqlite3VdbeJumpHere(v, addr2);
-    autoIncStep(pParse, regAutoinc, regRowid);
-  }else if( pDest->pIndex==0 ){
-    addr1 = sqlite3VdbeAddOp2(v, OP_NewRowid, iDest, regRowid);
+  if( HasRowid(pSrc) ){
+    sqlite3OpenTable(pParse, iSrc, iDbSrc, pSrc, OP_OpenRead);
+    emptySrcTest = sqlite3VdbeAddOp2(v, OP_Rewind, iSrc, 0); VdbeCoverage(v);
+    if( pDest->iPKey>=0 ){
+      addr1 = sqlite3VdbeAddOp2(v, OP_Rowid, iSrc, regRowid);
+      addr2 = sqlite3VdbeAddOp3(v, OP_NotExists, iDest, 0, regRowid);
+      VdbeCoverage(v);
+      sqlite3RowidConstraint(pParse, onError, pDest);
+      sqlite3VdbeJumpHere(v, addr2);
+      autoIncStep(pParse, regAutoinc, regRowid);
+    }else if( pDest->pIndex==0 ){
+      addr1 = sqlite3VdbeAddOp2(v, OP_NewRowid, iDest, regRowid);
+    }else{
+      addr1 = sqlite3VdbeAddOp2(v, OP_Rowid, iSrc, regRowid);
+      assert( (pDest->tabFlags & TF_Autoincrement)==0 );
+    }
+    sqlite3VdbeAddOp2(v, OP_RowData, iSrc, regData);
+    sqlite3VdbeAddOp3(v, OP_Insert, iDest, regData, regRowid);
+    sqlite3VdbeChangeP5(v, OPFLAG_NCHANGE|OPFLAG_LASTROWID|OPFLAG_APPEND);
+    sqlite3VdbeChangeP4(v, -1, pDest->zName, 0);
+    sqlite3VdbeAddOp2(v, OP_Next, iSrc, addr1); VdbeCoverage(v);
+    sqlite3VdbeAddOp2(v, OP_Close, iSrc, 0);
+    sqlite3VdbeAddOp2(v, OP_Close, iDest, 0);
   }else{
-    addr1 = sqlite3VdbeAddOp2(v, OP_Rowid, iSrc, regRowid);
-    assert( (pDest->tabFlags & TF_Autoincrement)==0 );
+    sqlite3TableLock(pParse, iDbDest, pDest->tnum, 1, pDest->zName);
+    sqlite3TableLock(pParse, iDbSrc, pSrc->tnum, 0, pSrc->zName);
   }
-  sqlite3VdbeAddOp2(v, OP_RowData, iSrc, regData);
-  sqlite3VdbeAddOp3(v, OP_Insert, iDest, regData, regRowid);
-  sqlite3VdbeChangeP5(v, OPFLAG_NCHANGE|OPFLAG_LASTROWID|OPFLAG_APPEND);
-  sqlite3VdbeChangeP4(v, -1, pDest->zName, 0);
-  sqlite3VdbeAddOp2(v, OP_Next, iSrc, addr1);
   for(pDestIdx=pDest->pIndex; pDestIdx; pDestIdx=pDestIdx->pNext){
     for(pSrcIdx=pSrc->pIndex; ALWAYS(pSrcIdx); pSrcIdx=pSrcIdx->pNext){
       if( xferCompatibleIndex(pDestIdx, pSrcIdx) ) break;
     }
     assert( pSrcIdx );
-    sqlite3VdbeAddOp2(v, OP_Close, iSrc, 0);
-    sqlite3VdbeAddOp2(v, OP_Close, iDest, 0);
-    pKey = sqlite3IndexKeyinfo(pParse, pSrcIdx);
-    sqlite3VdbeAddOp4(v, OP_OpenRead, iSrc, pSrcIdx->tnum, iDbSrc,
-                      (char*)pKey, P4_KEYINFO_HANDOFF);
+    sqlite3VdbeAddOp3(v, OP_OpenRead, iSrc, pSrcIdx->tnum, iDbSrc);
+    sqlite3VdbeSetP4KeyInfo(pParse, pSrcIdx);
     VdbeComment((v, "%s", pSrcIdx->zName));
-    pKey = sqlite3IndexKeyinfo(pParse, pDestIdx);
-    sqlite3VdbeAddOp4(v, OP_OpenWrite, iDest, pDestIdx->tnum, iDbDest,
-                      (char*)pKey, P4_KEYINFO_HANDOFF);
+    sqlite3VdbeAddOp3(v, OP_OpenWrite, iDest, pDestIdx->tnum, iDbDest);
+    sqlite3VdbeSetP4KeyInfo(pParse, pDestIdx);
+    sqlite3VdbeChangeP5(v, OPFLAG_BULKCSR);
     VdbeComment((v, "%s", pDestIdx->zName));
-    addr1 = sqlite3VdbeAddOp2(v, OP_Rewind, iSrc, 0);
+    addr1 = sqlite3VdbeAddOp2(v, OP_Rewind, iSrc, 0); VdbeCoverage(v);
     sqlite3VdbeAddOp2(v, OP_RowKey, iSrc, regData);
     sqlite3VdbeAddOp3(v, OP_IdxInsert, iDest, regData, 1);
-    sqlite3VdbeAddOp2(v, OP_Next, iSrc, addr1+1);
+    sqlite3VdbeAddOp2(v, OP_Next, iSrc, addr1+1); VdbeCoverage(v);
     sqlite3VdbeJumpHere(v, addr1);
+    sqlite3VdbeAddOp2(v, OP_Close, iSrc, 0);
+    sqlite3VdbeAddOp2(v, OP_Close, iDest, 0);
   }
-  sqlite3VdbeJumpHere(v, emptySrcTest);
+  if( emptySrcTest ) sqlite3VdbeJumpHere(v, emptySrcTest);
   sqlite3ReleaseTempReg(pParse, regRowid);
   sqlite3ReleaseTempReg(pParse, regData);
-  sqlite3VdbeAddOp2(v, OP_Close, iSrc, 0);
-  sqlite3VdbeAddOp2(v, OP_Close, iDest, 0);
   if( emptyDestTest ){
     sqlite3VdbeAddOp2(v, OP_Halt, SQLITE_OK, 0);
     sqlite3VdbeJumpHere(v, emptyDestTest);
@@ -92651,11 +96638,14 @@ struct sqlite3_api_routines {
   ** extension */
 # define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api=0;
 # define SQLITE_EXTENSION_INIT2(v)  sqlite3_api=v;
+# define SQLITE_EXTENSION_INIT3     \
+    extern const sqlite3_api_routines *sqlite3_api;
 #else
   /* This case when the file is being statically linked into the 
   ** application */
 # define SQLITE_EXTENSION_INIT1     /*no-op*/
 # define SQLITE_EXTENSION_INIT2(v)  (void)v; /* unused parameter */
+# define SQLITE_EXTENSION_INIT3     /*no-op*/
 #endif
 
 #endif /* _SQLITE3EXT_H_ */
@@ -93312,6 +97302,35 @@ SQLITE_API int sqlite3_auto_extension(void (*xInit)(void)){
   }
 }
 
+/*
+** Cancel a prior call to sqlite3_auto_extension.  Remove xInit from the
+** set of routines that is invoked for each new database connection, if it
+** is currently on the list.  If xInit is not on the list, then this
+** routine is a no-op.
+**
+** Return 1 if xInit was found on the list and removed.  Return 0 if xInit
+** was not on the list.
+*/
+SQLITE_API int sqlite3_cancel_auto_extension(void (*xInit)(void)){
+#if SQLITE_THREADSAFE
+  sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER);
+#endif
+  int i;
+  int n = 0;
+  wsdAutoextInit;
+  sqlite3_mutex_enter(mutex);
+  for(i=wsdAutoext.nExt-1; i>=0; i--){
+    if( wsdAutoext.aExt[i]==xInit ){
+      wsdAutoext.nExt--;
+      wsdAutoext.aExt[i] = wsdAutoext.aExt[wsdAutoext.nExt];
+      n++;
+      break;
+    }
+  }
+  sqlite3_mutex_leave(mutex);
+  return n;
+}
+
 /*
 ** Reset the automatic extension loading mechanism.
 */
@@ -93388,6 +97407,462 @@ SQLITE_PRIVATE void sqlite3AutoLoadExtensions(sqlite3 *db){
 ** This file contains code used to implement the PRAGMA command.
 */
 
+#if !defined(SQLITE_ENABLE_LOCKING_STYLE)
+#  if defined(__APPLE__)
+#    define SQLITE_ENABLE_LOCKING_STYLE 1
+#  else
+#    define SQLITE_ENABLE_LOCKING_STYLE 0
+#  endif
+#endif
+
+/***************************************************************************
+** The next block of code, including the PragTyp_XXXX macro definitions and
+** the aPragmaName[] object is composed of generated code. DO NOT EDIT.
+**
+** To add new pragmas, edit the code in ../tool/mkpragmatab.tcl and rerun
+** that script.  Then copy/paste the output in place of the following:
+*/
+#define PragTyp_HEADER_VALUE                   0
+#define PragTyp_AUTO_VACUUM                    1
+#define PragTyp_FLAG                           2
+#define PragTyp_BUSY_TIMEOUT                   3
+#define PragTyp_CACHE_SIZE                     4
+#define PragTyp_CASE_SENSITIVE_LIKE            5
+#define PragTyp_COLLATION_LIST                 6
+#define PragTyp_COMPILE_OPTIONS                7
+#define PragTyp_DATA_STORE_DIRECTORY           8
+#define PragTyp_DATABASE_LIST                  9
+#define PragTyp_DEFAULT_CACHE_SIZE            10
+#define PragTyp_ENCODING                      11
+#define PragTyp_FOREIGN_KEY_CHECK             12
+#define PragTyp_FOREIGN_KEY_LIST              13
+#define PragTyp_INCREMENTAL_VACUUM            14
+#define PragTyp_INDEX_INFO                    15
+#define PragTyp_INDEX_LIST                    16
+#define PragTyp_INTEGRITY_CHECK               17
+#define PragTyp_JOURNAL_MODE                  18
+#define PragTyp_JOURNAL_SIZE_LIMIT            19
+#define PragTyp_LOCK_PROXY_FILE               20
+#define PragTyp_LOCKING_MODE                  21
+#define PragTyp_PAGE_COUNT                    22
+#define PragTyp_MMAP_SIZE                     23
+#define PragTyp_PAGE_SIZE                     24
+#define PragTyp_SECURE_DELETE                 25
+#define PragTyp_SHRINK_MEMORY                 26
+#define PragTyp_SOFT_HEAP_LIMIT               27
+#define PragTyp_STATS                         28
+#define PragTyp_SYNCHRONOUS                   29
+#define PragTyp_TABLE_INFO                    30
+#define PragTyp_TEMP_STORE                    31
+#define PragTyp_TEMP_STORE_DIRECTORY          32
+#define PragTyp_WAL_AUTOCHECKPOINT            33
+#define PragTyp_WAL_CHECKPOINT                34
+#define PragTyp_ACTIVATE_EXTENSIONS           35
+#define PragTyp_HEXKEY                        36
+#define PragTyp_KEY                           37
+#define PragTyp_REKEY                         38
+#define PragTyp_LOCK_STATUS                   39
+#define PragTyp_PARSER_TRACE                  40
+#define PragFlag_NeedSchema           0x01
+static const struct sPragmaNames {
+  const char *const zName;  /* Name of pragma */
+  u8 ePragTyp;              /* PragTyp_XXX value */
+  u8 mPragFlag;             /* Zero or more PragFlag_XXX values */
+  u32 iArg;                 /* Extra argument */
+} aPragmaNames[] = {
+#if defined(SQLITE_HAS_CODEC) || defined(SQLITE_ENABLE_CEROD)
+  { /* zName:     */ "activate_extensions",
+    /* ePragTyp:  */ PragTyp_ACTIVATE_EXTENSIONS,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS)
+  { /* zName:     */ "application_id",
+    /* ePragTyp:  */ PragTyp_HEADER_VALUE,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_AUTOVACUUM)
+  { /* zName:     */ "auto_vacuum",
+    /* ePragTyp:  */ PragTyp_AUTO_VACUUM,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+#if !defined(SQLITE_OMIT_AUTOMATIC_INDEX)
+  { /* zName:     */ "automatic_index",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_AutoIndex },
+#endif
+#endif
+  { /* zName:     */ "busy_timeout",
+    /* ePragTyp:  */ PragTyp_BUSY_TIMEOUT,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#if !defined(SQLITE_OMIT_PAGER_PRAGMAS)
+  { /* zName:     */ "cache_size",
+    /* ePragTyp:  */ PragTyp_CACHE_SIZE,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+  { /* zName:     */ "cache_spill",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_CacheSpill },
+#endif
+  { /* zName:     */ "case_sensitive_like",
+    /* ePragTyp:  */ PragTyp_CASE_SENSITIVE_LIKE,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+  { /* zName:     */ "checkpoint_fullfsync",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_CkptFullFSync },
+#endif
+#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS)
+  { /* zName:     */ "collation_list",
+    /* ePragTyp:  */ PragTyp_COLLATION_LIST,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_COMPILEOPTION_DIAGS)
+  { /* zName:     */ "compile_options",
+    /* ePragTyp:  */ PragTyp_COMPILE_OPTIONS,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+  { /* zName:     */ "count_changes",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_CountRows },
+#endif
+#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && SQLITE_OS_WIN
+  { /* zName:     */ "data_store_directory",
+    /* ePragTyp:  */ PragTyp_DATA_STORE_DIRECTORY,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS)
+  { /* zName:     */ "database_list",
+    /* ePragTyp:  */ PragTyp_DATABASE_LIST,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && !defined(SQLITE_OMIT_DEPRECATED)
+  { /* zName:     */ "default_cache_size",
+    /* ePragTyp:  */ PragTyp_DEFAULT_CACHE_SIZE,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+#if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER)
+  { /* zName:     */ "defer_foreign_keys",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_DeferFKs },
+#endif
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+  { /* zName:     */ "empty_result_callbacks",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_NullCallback },
+#endif
+#if !defined(SQLITE_OMIT_UTF16)
+  { /* zName:     */ "encoding",
+    /* ePragTyp:  */ PragTyp_ENCODING,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER)
+  { /* zName:     */ "foreign_key_check",
+    /* ePragTyp:  */ PragTyp_FOREIGN_KEY_CHECK,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FOREIGN_KEY)
+  { /* zName:     */ "foreign_key_list",
+    /* ePragTyp:  */ PragTyp_FOREIGN_KEY_LIST,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+#if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER)
+  { /* zName:     */ "foreign_keys",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_ForeignKeys },
+#endif
+#endif
+#if !defined(SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS)
+  { /* zName:     */ "freelist_count",
+    /* ePragTyp:  */ PragTyp_HEADER_VALUE,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+  { /* zName:     */ "full_column_names",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_FullColNames },
+  { /* zName:     */ "fullfsync",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_FullFSync },
+#endif
+#if defined(SQLITE_HAS_CODEC)
+  { /* zName:     */ "hexkey",
+    /* ePragTyp:  */ PragTyp_HEXKEY,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+  { /* zName:     */ "hexrekey",
+    /* ePragTyp:  */ PragTyp_HEXKEY,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+#if !defined(SQLITE_OMIT_CHECK)
+  { /* zName:     */ "ignore_check_constraints",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_IgnoreChecks },
+#endif
+#endif
+#if !defined(SQLITE_OMIT_AUTOVACUUM)
+  { /* zName:     */ "incremental_vacuum",
+    /* ePragTyp:  */ PragTyp_INCREMENTAL_VACUUM,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS)
+  { /* zName:     */ "index_info",
+    /* ePragTyp:  */ PragTyp_INDEX_INFO,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+  { /* zName:     */ "index_list",
+    /* ePragTyp:  */ PragTyp_INDEX_LIST,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_INTEGRITY_CHECK)
+  { /* zName:     */ "integrity_check",
+    /* ePragTyp:  */ PragTyp_INTEGRITY_CHECK,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_PAGER_PRAGMAS)
+  { /* zName:     */ "journal_mode",
+    /* ePragTyp:  */ PragTyp_JOURNAL_MODE,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+  { /* zName:     */ "journal_size_limit",
+    /* ePragTyp:  */ PragTyp_JOURNAL_SIZE_LIMIT,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if defined(SQLITE_HAS_CODEC)
+  { /* zName:     */ "key",
+    /* ePragTyp:  */ PragTyp_KEY,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+  { /* zName:     */ "legacy_file_format",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_LegacyFileFmt },
+#endif
+#if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && SQLITE_ENABLE_LOCKING_STYLE
+  { /* zName:     */ "lock_proxy_file",
+    /* ePragTyp:  */ PragTyp_LOCK_PROXY_FILE,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
+  { /* zName:     */ "lock_status",
+    /* ePragTyp:  */ PragTyp_LOCK_STATUS,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_PAGER_PRAGMAS)
+  { /* zName:     */ "locking_mode",
+    /* ePragTyp:  */ PragTyp_LOCKING_MODE,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+  { /* zName:     */ "max_page_count",
+    /* ePragTyp:  */ PragTyp_PAGE_COUNT,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+  { /* zName:     */ "mmap_size",
+    /* ePragTyp:  */ PragTyp_MMAP_SIZE,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+  { /* zName:     */ "page_count",
+    /* ePragTyp:  */ PragTyp_PAGE_COUNT,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+  { /* zName:     */ "page_size",
+    /* ePragTyp:  */ PragTyp_PAGE_SIZE,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if defined(SQLITE_DEBUG)
+  { /* zName:     */ "parser_trace",
+    /* ePragTyp:  */ PragTyp_PARSER_TRACE,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+  { /* zName:     */ "query_only",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_QueryOnly },
+#endif
+#if !defined(SQLITE_OMIT_INTEGRITY_CHECK)
+  { /* zName:     */ "quick_check",
+    /* ePragTyp:  */ PragTyp_INTEGRITY_CHECK,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+  { /* zName:     */ "read_uncommitted",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_ReadUncommitted },
+  { /* zName:     */ "recursive_triggers",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_RecTriggers },
+#endif
+#if defined(SQLITE_HAS_CODEC)
+  { /* zName:     */ "rekey",
+    /* ePragTyp:  */ PragTyp_REKEY,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+  { /* zName:     */ "reverse_unordered_selects",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_ReverseOrder },
+#endif
+#if !defined(SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS)
+  { /* zName:     */ "schema_version",
+    /* ePragTyp:  */ PragTyp_HEADER_VALUE,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_PAGER_PRAGMAS)
+  { /* zName:     */ "secure_delete",
+    /* ePragTyp:  */ PragTyp_SECURE_DELETE,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+  { /* zName:     */ "short_column_names",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_ShortColNames },
+#endif
+  { /* zName:     */ "shrink_memory",
+    /* ePragTyp:  */ PragTyp_SHRINK_MEMORY,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+  { /* zName:     */ "soft_heap_limit",
+    /* ePragTyp:  */ PragTyp_SOFT_HEAP_LIMIT,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+#if defined(SQLITE_DEBUG)
+  { /* zName:     */ "sql_trace",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_SqlTrace },
+#endif
+#endif
+#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS)
+  { /* zName:     */ "stats",
+    /* ePragTyp:  */ PragTyp_STATS,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_PAGER_PRAGMAS)
+  { /* zName:     */ "synchronous",
+    /* ePragTyp:  */ PragTyp_SYNCHRONOUS,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_SCHEMA_PRAGMAS)
+  { /* zName:     */ "table_info",
+    /* ePragTyp:  */ PragTyp_TABLE_INFO,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_PAGER_PRAGMAS)
+  { /* zName:     */ "temp_store",
+    /* ePragTyp:  */ PragTyp_TEMP_STORE,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+  { /* zName:     */ "temp_store_directory",
+    /* ePragTyp:  */ PragTyp_TEMP_STORE_DIRECTORY,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS)
+  { /* zName:     */ "user_version",
+    /* ePragTyp:  */ PragTyp_HEADER_VALUE,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+#if defined(SQLITE_DEBUG)
+  { /* zName:     */ "vdbe_addoptrace",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_VdbeAddopTrace },
+  { /* zName:     */ "vdbe_debug",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_SqlTrace|SQLITE_VdbeListing|SQLITE_VdbeTrace },
+  { /* zName:     */ "vdbe_eqp",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_VdbeEQP },
+  { /* zName:     */ "vdbe_listing",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_VdbeListing },
+  { /* zName:     */ "vdbe_trace",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_VdbeTrace },
+#endif
+#endif
+#if !defined(SQLITE_OMIT_WAL)
+  { /* zName:     */ "wal_autocheckpoint",
+    /* ePragTyp:  */ PragTyp_WAL_AUTOCHECKPOINT,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ 0 },
+  { /* zName:     */ "wal_checkpoint",
+    /* ePragTyp:  */ PragTyp_WAL_CHECKPOINT,
+    /* ePragFlag: */ PragFlag_NeedSchema,
+    /* iArg:      */ 0 },
+#endif
+#if !defined(SQLITE_OMIT_FLAG_PRAGMAS)
+  { /* zName:     */ "writable_schema",
+    /* ePragTyp:  */ PragTyp_FLAG,
+    /* ePragFlag: */ 0,
+    /* iArg:      */ SQLITE_WriteSchema|SQLITE_RecoveryMode },
+#endif
+};
+/* Number of pragmas: 56 on by default, 69 total. */
+/* End of the automatically generated pragma table.
+***************************************************************************/
+
 /*
 ** Interpret the given string as a safety level.  Return 0 for OFF,
 ** 1 for ON or NORMAL and 2 for FULL.  Return 1 for an empty or 
@@ -93533,92 +98008,35 @@ static void returnSingleInt(Parse *pParse, const char *zLabel, i64 value){
   sqlite3VdbeAddOp2(v, OP_ResultRow, mem, 1);
 }
 
-#ifndef SQLITE_OMIT_FLAG_PRAGMAS
+
 /*
-** Check to see if zRight and zLeft refer to a pragma that queries
-** or changes one of the flags in db->flags.  Return 1 if so and 0 if not.
-** Also, implement the pragma.
+** Set the safety_level and pager flags for pager iDb.  Or if iDb<0
+** set these values for all pagers.
 */
-static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
-  static const struct sPragmaType {
-    const char *zName;  /* Name of the pragma */
-    int mask;           /* Mask for the db->flags value */
-  } aPragma[] = {
-    { "full_column_names",        SQLITE_FullColNames  },
-    { "short_column_names",       SQLITE_ShortColNames },
-    { "count_changes",            SQLITE_CountRows     },
-    { "empty_result_callbacks",   SQLITE_NullCallback  },
-    { "legacy_file_format",       SQLITE_LegacyFileFmt },
-    { "fullfsync",                SQLITE_FullFSync     },
-    { "checkpoint_fullfsync",     SQLITE_CkptFullFSync },
-    { "reverse_unordered_selects", SQLITE_ReverseOrder  },
-#ifndef SQLITE_OMIT_AUTOMATIC_INDEX
-    { "automatic_index",          SQLITE_AutoIndex     },
-#endif
-#ifdef SQLITE_DEBUG
-    { "sql_trace",                SQLITE_SqlTrace      },
-    { "vdbe_listing",             SQLITE_VdbeListing   },
-    { "vdbe_trace",               SQLITE_VdbeTrace     },
-    { "vdbe_addoptrace",          SQLITE_VdbeAddopTrace},
-    { "vdbe_debug",    SQLITE_SqlTrace | SQLITE_VdbeListing
-                               | SQLITE_VdbeTrace      },
-#endif
-#ifndef SQLITE_OMIT_CHECK
-    { "ignore_check_constraints", SQLITE_IgnoreChecks  },
-#endif
-    /* The following is VERY experimental */
-    { "writable_schema",          SQLITE_WriteSchema|SQLITE_RecoveryMode },
-
-    /* TODO: Maybe it shouldn't be possible to change the ReadUncommitted
-    ** flag if there are any active statements. */
-    { "read_uncommitted",         SQLITE_ReadUncommitted },
-    { "recursive_triggers",       SQLITE_RecTriggers },
-
-    /* This flag may only be set if both foreign-key and trigger support
-    ** are present in the build.  */
-#if !defined(SQLITE_OMIT_FOREIGN_KEY) && !defined(SQLITE_OMIT_TRIGGER)
-    { "foreign_keys",             SQLITE_ForeignKeys },
-#endif
-  };
-  int i;
-  const struct sPragmaType *p;
-  for(i=0, p=aPragma; i<ArraySize(aPragma); i++, p++){
-    if( sqlite3StrICmp(zLeft, p->zName)==0 ){
-      sqlite3 *db = pParse->db;
-      Vdbe *v;
-      v = sqlite3GetVdbe(pParse);
-      assert( v!=0 );  /* Already allocated by sqlite3Pragma() */
-      if( ALWAYS(v) ){
-        if( zRight==0 ){
-          returnSingleInt(pParse, p->zName, (db->flags & p->mask)!=0 );
-        }else{
-          int mask = p->mask;          /* Mask of bits to set or clear. */
-          if( db->autoCommit==0 ){
-            /* Foreign key support may not be enabled or disabled while not
-            ** in auto-commit mode.  */
-            mask &= ~(SQLITE_ForeignKeys);
-          }
-
-          if( sqlite3GetBoolean(zRight, 0) ){
-            db->flags |= mask;
-          }else{
-            db->flags &= ~mask;
-          }
-
-          /* Many of the flag-pragmas modify the code generated by the SQL 
-          ** compiler (eg. count_changes). So add an opcode to expire all
-          ** compiled SQL statements after modifying a pragma value.
-          */
-          sqlite3VdbeAddOp2(v, OP_Expire, 0, 0);
-        }
+#ifndef SQLITE_OMIT_PAGER_PRAGMAS
+static void setAllPagerFlags(sqlite3 *db){
+  if( db->autoCommit ){
+    Db *pDb = db->aDb;
+    int n = db->nDb;
+    assert( SQLITE_FullFSync==PAGER_FULLFSYNC );
+    assert( SQLITE_CkptFullFSync==PAGER_CKPT_FULLFSYNC );
+    assert( SQLITE_CacheSpill==PAGER_CACHESPILL );
+    assert( (PAGER_FULLFSYNC | PAGER_CKPT_FULLFSYNC | PAGER_CACHESPILL)
+             ==  PAGER_FLAGS_MASK );
+    assert( (pDb->safety_level & PAGER_SYNCHRONOUS_MASK)==pDb->safety_level );
+    while( (n--) > 0 ){
+      if( pDb->pBt ){
+        sqlite3BtreeSetPagerFlags(pDb->pBt,
+                 pDb->safety_level | (db->flags & PAGER_FLAGS_MASK) );
       }
-
-      return 1;
+      pDb++;
     }
   }
-  return 0;
 }
-#endif /* SQLITE_OMIT_FLAG_PRAGMAS */
+#else
+# define setAllPagerFlags(X)  /* no-op */
+#endif
+
 
 /*
 ** Return a human-readable name for a constraint resolution action.
@@ -93689,8 +98107,9 @@ SQLITE_PRIVATE void sqlite3Pragma(
   char *zRight = 0;      /* Nul-terminated UTF-8 string <value>, or NULL */
   const char *zDb = 0;   /* The database name */
   Token *pId;            /* Pointer to <id> token */
-  int iDb;               /* Database index for <database> */
   char *aFcntl[4];       /* Argument to SQLITE_FCNTL_PRAGMA */
+  int iDb;               /* Database index for <database> */
+  int lwr, upr, mid;           /* Binary search bounds */
   int rc;                      /* return value form SQLITE_FCNTL_PRAGMA */
   sqlite3 *db = pParse->db;    /* The database connection */
   Db *pDb;                     /* The specific database being pragmaed */
@@ -93746,16 +98165,41 @@ SQLITE_PRIVATE void sqlite3Pragma(
       sqlite3VdbeAddOp2(v, OP_ResultRow, mem, 1);
       sqlite3_free(aFcntl[0]);
     }
-  }else if( rc!=SQLITE_NOTFOUND ){
+    goto pragma_out;
+  }
+  if( rc!=SQLITE_NOTFOUND ){
     if( aFcntl[0] ){
       sqlite3ErrorMsg(pParse, "%s", aFcntl[0]);
       sqlite3_free(aFcntl[0]);
     }
     pParse->nErr++;
     pParse->rc = rc;
-  }else
-                            
- 
+    goto pragma_out;
+  }
+
+  /* Locate the pragma in the lookup table */
+  lwr = 0;
+  upr = ArraySize(aPragmaNames)-1;
+  while( lwr<=upr ){
+    mid = (lwr+upr)/2;
+    rc = sqlite3_stricmp(zLeft, aPragmaNames[mid].zName);
+    if( rc==0 ) break;
+    if( rc<0 ){
+      upr = mid - 1;
+    }else{
+      lwr = mid + 1;
+    }
+  }
+  if( lwr>upr ) goto pragma_out;
+
+  /* Make sure the database schema is loaded if the pragma requires that */
+  if( (aPragmaNames[mid].mPragFlag & PragFlag_NeedSchema)!=0 ){
+    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+  }
+
+  /* Jump to the appropriate pragma handler */
+  switch( aPragmaNames[mid].ePragTyp ){
+  
 #if !defined(SQLITE_OMIT_PAGER_PRAGMAS) && !defined(SQLITE_OMIT_DEPRECATED)
   /*
   **  PRAGMA [database.]default_cache_size
@@ -93773,7 +98217,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** size.  But continue to take the absolute value of the default cache
   ** size of historical compatibility.
   */
-  if( sqlite3StrICmp(zLeft,"default_cache_size")==0 ){
+  case PragTyp_DEFAULT_CACHE_SIZE: {
+    static const int iLn = VDBE_OFFSET_LINENO(2);
     static const VdbeOpList getCacheSize[] = {
       { OP_Transaction, 0, 0,        0},                         /* 0 */
       { OP_ReadCookie,  0, 1,        BTREE_DEFAULT_CACHE_SIZE},  /* 1 */
@@ -93786,13 +98231,12 @@ SQLITE_PRIVATE void sqlite3Pragma(
       { OP_ResultRow,   1, 1,        0},
     };
     int addr;
-    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
     sqlite3VdbeUsesBtree(v, iDb);
     if( !zRight ){
       sqlite3VdbeSetNumCols(v, 1);
       sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "cache_size", SQLITE_STATIC);
       pParse->nMem += 2;
-      addr = sqlite3VdbeAddOpList(v, ArraySize(getCacheSize), getCacheSize);
+      addr = sqlite3VdbeAddOpList(v, ArraySize(getCacheSize), getCacheSize,iLn);
       sqlite3VdbeChangeP1(v, addr, iDb);
       sqlite3VdbeChangeP1(v, addr+1, iDb);
       sqlite3VdbeChangeP1(v, addr+6, SQLITE_DEFAULT_CACHE_SIZE);
@@ -93805,7 +98249,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
       pDb->pSchema->cache_size = size;
       sqlite3BtreeSetCacheSize(pDb->pBt, pDb->pSchema->cache_size);
     }
-  }else
+    break;
+  }
 #endif /* !SQLITE_OMIT_PAGER_PRAGMAS && !SQLITE_OMIT_DEPRECATED */
 
 #if !defined(SQLITE_OMIT_PAGER_PRAGMAS)
@@ -93818,7 +98263,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** database page size value.  The value can only be set if
   ** the database has not yet been created.
   */
-  if( sqlite3StrICmp(zLeft,"page_size")==0 ){
+  case PragTyp_PAGE_SIZE: {
     Btree *pBt = pDb->pBt;
     assert( pBt!=0 );
     if( !zRight ){
@@ -93833,7 +98278,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
         db->mallocFailed = 1;
       }
     }
-  }else
+    break;
+  }
 
   /*
   **  PRAGMA [database.]secure_delete
@@ -93843,7 +98289,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** secure_delete flag.  The second form changes the secure_delete
   ** flag setting and reports thenew value.
   */
-  if( sqlite3StrICmp(zLeft,"secure_delete")==0 ){
+  case PragTyp_SECURE_DELETE: {
     Btree *pBt = pDb->pBt;
     int b = -1;
     assert( pBt!=0 );
@@ -93858,7 +98304,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
     }
     b = sqlite3BtreeSecureDelete(pBt, b);
     returnSingleInt(pParse, "secure_delete", b);
-  }else
+    break;
+  }
 
   /*
   **  PRAGMA [database.]max_page_count
@@ -93877,11 +98324,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
   **
   ** Return the number of pages in the specified database.
   */
-  if( sqlite3StrICmp(zLeft,"page_count")==0
-   || sqlite3StrICmp(zLeft,"max_page_count")==0
-  ){
+  case PragTyp_PAGE_COUNT: {
     int iReg;
-    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
     sqlite3CodeVerifySchema(pParse, iDb);
     iReg = ++pParse->nMem;
     if( sqlite3Tolower(zLeft[0])=='p' ){
@@ -93893,13 +98337,14 @@ SQLITE_PRIVATE void sqlite3Pragma(
     sqlite3VdbeAddOp2(v, OP_ResultRow, iReg, 1);
     sqlite3VdbeSetNumCols(v, 1);
     sqlite3VdbeSetColName(v, 0, COLNAME_NAME, zLeft, SQLITE_TRANSIENT);
-  }else
+    break;
+  }
 
   /*
   **  PRAGMA [database.]locking_mode
   **  PRAGMA [database.]locking_mode = (normal|exclusive)
   */
-  if( sqlite3StrICmp(zLeft,"locking_mode")==0 ){
+  case PragTyp_LOCKING_MODE: {
     const char *zRet = "normal";
     int eMode = getLockingMode(zRight);
 
@@ -93932,7 +98377,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
       eMode = sqlite3PagerLockingMode(pPager, eMode);
     }
 
-    assert(eMode==PAGER_LOCKINGMODE_NORMAL||eMode==PAGER_LOCKINGMODE_EXCLUSIVE);
+    assert( eMode==PAGER_LOCKINGMODE_NORMAL
+            || eMode==PAGER_LOCKINGMODE_EXCLUSIVE );
     if( eMode==PAGER_LOCKINGMODE_EXCLUSIVE ){
       zRet = "exclusive";
     }
@@ -93940,25 +98386,18 @@ SQLITE_PRIVATE void sqlite3Pragma(
     sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "locking_mode", SQLITE_STATIC);
     sqlite3VdbeAddOp4(v, OP_String8, 0, 1, 0, zRet, 0);
     sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 1);
-  }else
+    break;
+  }
 
   /*
   **  PRAGMA [database.]journal_mode
   **  PRAGMA [database.]journal_mode =
   **                      (delete|persist|off|truncate|memory|wal|off)
   */
-  if( sqlite3StrICmp(zLeft,"journal_mode")==0 ){
+  case PragTyp_JOURNAL_MODE: {
     int eMode;        /* One of the PAGER_JOURNALMODE_XXX symbols */
     int ii;           /* Loop counter */
 
-    /* Force the schema to be loaded on all databases.  This causes all
-    ** database files to be opened and the journal_modes set.  This is
-    ** necessary because subsequent processing must know if the databases
-    ** are in WAL mode. */
-    if( sqlite3ReadSchema(pParse) ){
-      goto pragma_out;
-    }
-
     sqlite3VdbeSetNumCols(v, 1);
     sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "journal_mode", SQLITE_STATIC);
 
@@ -93990,7 +98429,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
       }
     }
     sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 1);
-  }else
+    break;
+  }
 
   /*
   **  PRAGMA [database.]journal_size_limit
@@ -93998,16 +98438,17 @@ SQLITE_PRIVATE void sqlite3Pragma(
   **
   ** Get or set the size limit on rollback journal files.
   */
-  if( sqlite3StrICmp(zLeft,"journal_size_limit")==0 ){
+  case PragTyp_JOURNAL_SIZE_LIMIT: {
     Pager *pPager = sqlite3BtreePager(pDb->pBt);
     i64 iLimit = -2;
     if( zRight ){
-      sqlite3Atoi64(zRight, &iLimit, 1000000, SQLITE_UTF8);
+      sqlite3Atoi64(zRight, &iLimit, sqlite3Strlen30(zRight), SQLITE_UTF8);
       if( iLimit<-1 ) iLimit = -1;
     }
     iLimit = sqlite3PagerJournalSizeLimit(pPager, iLimit);
     returnSingleInt(pParse, "journal_size_limit", iLimit);
-  }else
+    break;
+  }
 
 #endif /* SQLITE_OMIT_PAGER_PRAGMAS */
 
@@ -94019,57 +98460,48 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** The value is one of:  0 NONE 1 FULL 2 INCREMENTAL
   */
 #ifndef SQLITE_OMIT_AUTOVACUUM
-  if( sqlite3StrICmp(zLeft,"auto_vacuum")==0 ){
+  case PragTyp_AUTO_VACUUM: {
     Btree *pBt = pDb->pBt;
     assert( pBt!=0 );
-    if( sqlite3ReadSchema(pParse) ){
-      goto pragma_out;
-    }
     if( !zRight ){
-      int auto_vacuum;
-      if( ALWAYS(pBt) ){
-         auto_vacuum = sqlite3BtreeGetAutoVacuum(pBt);
-      }else{
-         auto_vacuum = SQLITE_DEFAULT_AUTOVACUUM;
-      }
-      returnSingleInt(pParse, "auto_vacuum", auto_vacuum);
+      returnSingleInt(pParse, "auto_vacuum", sqlite3BtreeGetAutoVacuum(pBt));
     }else{
       int eAuto = getAutoVacuum(zRight);
       assert( eAuto>=0 && eAuto<=2 );
       db->nextAutovac = (u8)eAuto;
-      if( ALWAYS(eAuto>=0) ){
-        /* Call SetAutoVacuum() to set initialize the internal auto and
-        ** incr-vacuum flags. This is required in case this connection
-        ** creates the database file. It is important that it is created
-        ** as an auto-vacuum capable db.
+      /* Call SetAutoVacuum() to set initialize the internal auto and
+      ** incr-vacuum flags. This is required in case this connection
+      ** creates the database file. It is important that it is created
+      ** as an auto-vacuum capable db.
+      */
+      rc = sqlite3BtreeSetAutoVacuum(pBt, eAuto);
+      if( rc==SQLITE_OK && (eAuto==1 || eAuto==2) ){
+        /* When setting the auto_vacuum mode to either "full" or 
+        ** "incremental", write the value of meta[6] in the database
+        ** file. Before writing to meta[6], check that meta[3] indicates
+        ** that this really is an auto-vacuum capable database.
         */
-        rc = sqlite3BtreeSetAutoVacuum(pBt, eAuto);
-        if( rc==SQLITE_OK && (eAuto==1 || eAuto==2) ){
-          /* When setting the auto_vacuum mode to either "full" or 
-          ** "incremental", write the value of meta[6] in the database
-          ** file. Before writing to meta[6], check that meta[3] indicates
-          ** that this really is an auto-vacuum capable database.
-          */
-          static const VdbeOpList setMeta6[] = {
-            { OP_Transaction,    0,         1,                 0},    /* 0 */
-            { OP_ReadCookie,     0,         1,         BTREE_LARGEST_ROOT_PAGE},
-            { OP_If,             1,         0,                 0},    /* 2 */
-            { OP_Halt,           SQLITE_OK, OE_Abort,          0},    /* 3 */
-            { OP_Integer,        0,         1,                 0},    /* 4 */
-            { OP_SetCookie,      0,         BTREE_INCR_VACUUM, 1},    /* 5 */
-          };
-          int iAddr;
-          iAddr = sqlite3VdbeAddOpList(v, ArraySize(setMeta6), setMeta6);
-          sqlite3VdbeChangeP1(v, iAddr, iDb);
-          sqlite3VdbeChangeP1(v, iAddr+1, iDb);
-          sqlite3VdbeChangeP2(v, iAddr+2, iAddr+4);
-          sqlite3VdbeChangeP1(v, iAddr+4, eAuto-1);
-          sqlite3VdbeChangeP1(v, iAddr+5, iDb);
-          sqlite3VdbeUsesBtree(v, iDb);
-        }
+        static const int iLn = VDBE_OFFSET_LINENO(2);
+        static const VdbeOpList setMeta6[] = {
+          { OP_Transaction,    0,         1,                 0},    /* 0 */
+          { OP_ReadCookie,     0,         1,         BTREE_LARGEST_ROOT_PAGE},
+          { OP_If,             1,         0,                 0},    /* 2 */
+          { OP_Halt,           SQLITE_OK, OE_Abort,          0},    /* 3 */
+          { OP_Integer,        0,         1,                 0},    /* 4 */
+          { OP_SetCookie,      0,         BTREE_INCR_VACUUM, 1},    /* 5 */
+        };
+        int iAddr;
+        iAddr = sqlite3VdbeAddOpList(v, ArraySize(setMeta6), setMeta6, iLn);
+        sqlite3VdbeChangeP1(v, iAddr, iDb);
+        sqlite3VdbeChangeP1(v, iAddr+1, iDb);
+        sqlite3VdbeChangeP2(v, iAddr+2, iAddr+4);
+        sqlite3VdbeChangeP1(v, iAddr+4, eAuto-1);
+        sqlite3VdbeChangeP1(v, iAddr+5, iDb);
+        sqlite3VdbeUsesBtree(v, iDb);
       }
     }
-  }else
+    break;
+  }
 #endif
 
   /*
@@ -94078,22 +98510,20 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** Do N steps of incremental vacuuming on a database.
   */
 #ifndef SQLITE_OMIT_AUTOVACUUM
-  if( sqlite3StrICmp(zLeft,"incremental_vacuum")==0 ){
+  case PragTyp_INCREMENTAL_VACUUM: {
     int iLimit, addr;
-    if( sqlite3ReadSchema(pParse) ){
-      goto pragma_out;
-    }
     if( zRight==0 || !sqlite3GetInt32(zRight, &iLimit) || iLimit<=0 ){
       iLimit = 0x7fffffff;
     }
     sqlite3BeginWriteOperation(pParse, 0, iDb);
     sqlite3VdbeAddOp2(v, OP_Integer, iLimit, 1);
-    addr = sqlite3VdbeAddOp1(v, OP_IncrVacuum, iDb);
+    addr = sqlite3VdbeAddOp1(v, OP_IncrVacuum, iDb); VdbeCoverage(v);
     sqlite3VdbeAddOp1(v, OP_ResultRow, 1);
     sqlite3VdbeAddOp2(v, OP_AddImm, 1, -1);
-    sqlite3VdbeAddOp2(v, OP_IfPos, 1, addr);
+    sqlite3VdbeAddOp2(v, OP_IfPos, 1, addr); VdbeCoverage(v);
     sqlite3VdbeJumpHere(v, addr);
-  }else
+    break;
+  }
 #endif
 
 #ifndef SQLITE_OMIT_PAGER_PRAGMAS
@@ -94108,8 +98538,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** number of pages is adjusted so that the cache uses -N kibibytes
   ** of memory.
   */
-  if( sqlite3StrICmp(zLeft,"cache_size")==0 ){
-    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+  case PragTyp_CACHE_SIZE: {
     assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
     if( !zRight ){
       returnSingleInt(pParse, "cache_size", pDb->pSchema->cache_size);
@@ -94118,7 +98547,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
       pDb->pSchema->cache_size = size;
       sqlite3BtreeSetCacheSize(pDb->pBt, pDb->pSchema->cache_size);
     }
-  }else
+    break;
+  }
 
   /*
   **  PRAGMA [database.]mmap_size(N)
@@ -94134,12 +98564,13 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** as little or as much as it wants.  Except, if N is set to 0 then the
   ** upper layers will never invoke the xFetch interfaces to the VFS.
   */
-  if( sqlite3StrICmp(zLeft,"mmap_size")==0 ){
+  case PragTyp_MMAP_SIZE: {
     sqlite3_int64 sz;
+#if SQLITE_MAX_MMAP_SIZE>0
     assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
     if( zRight ){
       int ii;
-      sqlite3Atoi64(zRight, &sz, 1000, SQLITE_UTF8);
+      sqlite3Atoi64(zRight, &sz, sqlite3Strlen30(zRight), SQLITE_UTF8);
       if( sz<0 ) sz = sqlite3GlobalConfig.szMmap;
       if( pId2->n==0 ) db->szMmap = sz;
       for(ii=db->nDb-1; ii>=0; ii--){
@@ -94149,13 +98580,19 @@ SQLITE_PRIVATE void sqlite3Pragma(
       }
     }
     sz = -1;
-    if( sqlite3_file_control(db,zDb,SQLITE_FCNTL_MMAP_SIZE,&sz)==SQLITE_OK ){
-#if SQLITE_MAX_MMAP_SIZE==0
-      sz = 0;
+    rc = sqlite3_file_control(db, zDb, SQLITE_FCNTL_MMAP_SIZE, &sz);
+#else
+    sz = 0;
+    rc = SQLITE_OK;
 #endif
+    if( rc==SQLITE_OK ){
       returnSingleInt(pParse, "mmap_size", sz);
+    }else if( rc!=SQLITE_NOTFOUND ){
+      pParse->nErr++;
+      pParse->rc = rc;
     }
-  }else
+    break;
+  }
 
   /*
   **   PRAGMA temp_store
@@ -94168,13 +98605,14 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** Note that it is possible for the library compile-time options to
   ** override this setting
   */
-  if( sqlite3StrICmp(zLeft, "temp_store")==0 ){
+  case PragTyp_TEMP_STORE: {
     if( !zRight ){
       returnSingleInt(pParse, "temp_store", db->temp_store);
     }else{
       changeTempStorage(pParse, zRight);
     }
-  }else
+    break;
+  }
 
   /*
   **   PRAGMA temp_store_directory
@@ -94186,7 +98624,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** If temporary directory is changed, then invalidateTempStorage.
   **
   */
-  if( sqlite3StrICmp(zLeft, "temp_store_directory")==0 ){
+  case PragTyp_TEMP_STORE_DIRECTORY: {
     if( !zRight ){
       if( sqlite3_temp_directory ){
         sqlite3VdbeSetNumCols(v, 1);
@@ -94219,7 +98657,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
       }
 #endif /* SQLITE_OMIT_WSD */
     }
-  }else
+    break;
+  }
 
 #if SQLITE_OS_WIN
   /*
@@ -94235,7 +98674,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** by this setting, regardless of its value.
   **
   */
-  if( sqlite3StrICmp(zLeft, "data_store_directory")==0 ){
+  case PragTyp_DATA_STORE_DIRECTORY: {
     if( !zRight ){
       if( sqlite3_data_directory ){
         sqlite3VdbeSetNumCols(v, 1);
@@ -94262,26 +98701,20 @@ SQLITE_PRIVATE void sqlite3Pragma(
       }
 #endif /* SQLITE_OMIT_WSD */
     }
-  }else
+    break;
+  }
 #endif
 
-#if !defined(SQLITE_ENABLE_LOCKING_STYLE)
-#  if defined(__APPLE__)
-#    define SQLITE_ENABLE_LOCKING_STYLE 1
-#  else
-#    define SQLITE_ENABLE_LOCKING_STYLE 0
-#  endif
-#endif
 #if SQLITE_ENABLE_LOCKING_STYLE
   /*
-   **   PRAGMA [database.]lock_proxy_file
-   **   PRAGMA [database.]lock_proxy_file = ":auto:"|"lock_file_path"
-   **
-   ** Return or set the value of the lock_proxy_file flag.  Changing
-   ** the value sets a specific file to be used for database access locks.
-   **
-   */
-  if( sqlite3StrICmp(zLeft, "lock_proxy_file")==0 ){
+  **   PRAGMA [database.]lock_proxy_file
+  **   PRAGMA [database.]lock_proxy_file = ":auto:"|"lock_file_path"
+  **
+  ** Return or set the value of the lock_proxy_file flag.  Changing
+  ** the value sets a specific file to be used for database access locks.
+  **
+  */
+  case PragTyp_LOCK_PROXY_FILE: {
     if( !zRight ){
       Pager *pPager = sqlite3BtreePager(pDb->pBt);
       char *proxy_file_path = NULL;
@@ -94312,7 +98745,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
         goto pragma_out;
       }
     }
-  }else
+    break;
+  }
 #endif /* SQLITE_ENABLE_LOCKING_STYLE */      
     
   /*
@@ -94324,8 +98758,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** default value will be restored the next time the database is
   ** opened.
   */
-  if( sqlite3StrICmp(zLeft,"synchronous")==0 ){
-    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+  case PragTyp_SYNCHRONOUS: {
     if( !zRight ){
       returnSingleInt(pParse, "synchronous", pDb->safety_level-1);
     }else{
@@ -94334,16 +98767,42 @@ SQLITE_PRIVATE void sqlite3Pragma(
             "Safety level may not be changed inside a transaction");
       }else{
         pDb->safety_level = getSafetyLevel(zRight,0,1)+1;
+        setAllPagerFlags(db);
       }
     }
-  }else
+    break;
+  }
 #endif /* SQLITE_OMIT_PAGER_PRAGMAS */
 
 #ifndef SQLITE_OMIT_FLAG_PRAGMAS
-  if( flagPragma(pParse, zLeft, zRight) ){
-    /* The flagPragma() subroutine also generates any necessary code
-    ** there is nothing more to do here */
-  }else
+  case PragTyp_FLAG: {
+    if( zRight==0 ){
+      returnSingleInt(pParse, aPragmaNames[mid].zName,
+                     (db->flags & aPragmaNames[mid].iArg)!=0 );
+    }else{
+      int mask = aPragmaNames[mid].iArg;    /* Mask of bits to set or clear. */
+      if( db->autoCommit==0 ){
+        /* Foreign key support may not be enabled or disabled while not
+        ** in auto-commit mode.  */
+        mask &= ~(SQLITE_ForeignKeys);
+      }
+
+      if( sqlite3GetBoolean(zRight, 0) ){
+        db->flags |= mask;
+      }else{
+        db->flags &= ~mask;
+        if( mask==SQLITE_DeferFKs ) db->nDeferredImmCons = 0;
+      }
+
+      /* Many of the flag-pragmas modify the code generated by the SQL 
+      ** compiler (eg. count_changes). So add an opcode to expire all
+      ** compiled SQL statements after modifying a pragma value.
+      */
+      sqlite3VdbeAddOp2(v, OP_Expire, 0, 0);
+      setAllPagerFlags(db);
+    }
+    break;
+  }
 #endif /* SQLITE_OMIT_FLAG_PRAGMAS */
 
 #ifndef SQLITE_OMIT_SCHEMA_PRAGMAS
@@ -94359,16 +98818,14 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** notnull:    True if 'NOT NULL' is part of column declaration
   ** dflt_value: The default value for the column, if any.
   */
-  if( sqlite3StrICmp(zLeft, "table_info")==0 && zRight ){
+  case PragTyp_TABLE_INFO: if( zRight ){
     Table *pTab;
-    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
     pTab = sqlite3FindTable(db, zRight, zDb);
     if( pTab ){
       int i, k;
       int nHidden = 0;
       Column *pCol;
-      Index *pPk;
-      for(pPk=pTab->pIndex; pPk && pPk->autoIndex!=2; pPk=pPk->pNext){}
+      Index *pPk = sqlite3PrimaryKeyIndex(pTab);
       sqlite3VdbeSetNumCols(v, 6);
       pParse->nMem = 6;
       sqlite3CodeVerifySchema(pParse, iDb);
@@ -94405,12 +98862,44 @@ SQLITE_PRIVATE void sqlite3Pragma(
         sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 6);
       }
     }
-  }else
+  }
+  break;
 
-  if( sqlite3StrICmp(zLeft, "index_info")==0 && zRight ){
+  case PragTyp_STATS: {
+    Index *pIdx;
+    HashElem *i;
+    v = sqlite3GetVdbe(pParse);
+    sqlite3VdbeSetNumCols(v, 4);
+    pParse->nMem = 4;
+    sqlite3CodeVerifySchema(pParse, iDb);
+    sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "table", SQLITE_STATIC);
+    sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "index", SQLITE_STATIC);
+    sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "width", SQLITE_STATIC);
+    sqlite3VdbeSetColName(v, 3, COLNAME_NAME, "height", SQLITE_STATIC);
+    for(i=sqliteHashFirst(&pDb->pSchema->tblHash); i; i=sqliteHashNext(i)){
+      Table *pTab = sqliteHashData(i);
+      sqlite3VdbeAddOp4(v, OP_String8, 0, 1, 0, pTab->zName, 0);
+      sqlite3VdbeAddOp2(v, OP_Null, 0, 2);
+      sqlite3VdbeAddOp2(v, OP_Integer,
+                           (int)sqlite3LogEstToInt(pTab->szTabRow), 3);
+      sqlite3VdbeAddOp2(v, OP_Integer, 
+          (int)sqlite3LogEstToInt(pTab->nRowLogEst), 4);
+      sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 4);
+      for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+        sqlite3VdbeAddOp4(v, OP_String8, 0, 2, 0, pIdx->zName, 0);
+        sqlite3VdbeAddOp2(v, OP_Integer,
+                             (int)sqlite3LogEstToInt(pIdx->szIdxRow), 3);
+        sqlite3VdbeAddOp2(v, OP_Integer, 
+            (int)sqlite3LogEstToInt(pIdx->aiRowLogEst[0]), 4);
+        sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 4);
+      }
+    }
+  }
+  break;
+
+  case PragTyp_INDEX_INFO: if( zRight ){
     Index *pIdx;
     Table *pTab;
-    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
     pIdx = sqlite3FindIndex(db, zRight, zDb);
     if( pIdx ){
       int i;
@@ -94421,8 +98910,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
       sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "seqno", SQLITE_STATIC);
       sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "cid", SQLITE_STATIC);
       sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "name", SQLITE_STATIC);
-      for(i=0; i<pIdx->nColumn; i++){
-        int cnum = pIdx->aiColumn[i];
+      for(i=0; i<pIdx->nKeyCol; i++){
+        i16 cnum = pIdx->aiColumn[i];
         sqlite3VdbeAddOp2(v, OP_Integer, i, 1);
         sqlite3VdbeAddOp2(v, OP_Integer, cnum, 2);
         assert( pTab->nCol>cnum );
@@ -94430,39 +98919,34 @@ SQLITE_PRIVATE void sqlite3Pragma(
         sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 3);
       }
     }
-  }else
+  }
+  break;
 
-  if( sqlite3StrICmp(zLeft, "index_list")==0 && zRight ){
+  case PragTyp_INDEX_LIST: if( zRight ){
     Index *pIdx;
     Table *pTab;
-    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
+    int i;
     pTab = sqlite3FindTable(db, zRight, zDb);
     if( pTab ){
       v = sqlite3GetVdbe(pParse);
-      pIdx = pTab->pIndex;
-      if( pIdx ){
-        int i = 0; 
-        sqlite3VdbeSetNumCols(v, 3);
-        pParse->nMem = 3;
-        sqlite3CodeVerifySchema(pParse, iDb);
-        sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "seq", SQLITE_STATIC);
-        sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "name", SQLITE_STATIC);
-        sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "unique", SQLITE_STATIC);
-        while(pIdx){
-          sqlite3VdbeAddOp2(v, OP_Integer, i, 1);
-          sqlite3VdbeAddOp4(v, OP_String8, 0, 2, 0, pIdx->zName, 0);
-          sqlite3VdbeAddOp2(v, OP_Integer, pIdx->onError!=OE_None, 3);
-          sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 3);
-          ++i;
-          pIdx = pIdx->pNext;
-        }
+      sqlite3VdbeSetNumCols(v, 3);
+      pParse->nMem = 3;
+      sqlite3CodeVerifySchema(pParse, iDb);
+      sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "seq", SQLITE_STATIC);
+      sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "name", SQLITE_STATIC);
+      sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "unique", SQLITE_STATIC);
+      for(pIdx=pTab->pIndex, i=0; pIdx; pIdx=pIdx->pNext, i++){
+        sqlite3VdbeAddOp2(v, OP_Integer, i, 1);
+        sqlite3VdbeAddOp4(v, OP_String8, 0, 2, 0, pIdx->zName, 0);
+        sqlite3VdbeAddOp2(v, OP_Integer, pIdx->onError!=OE_None, 3);
+        sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 3);
       }
     }
-  }else
+  }
+  break;
 
-  if( sqlite3StrICmp(zLeft, "database_list")==0 ){
+  case PragTyp_DATABASE_LIST: {
     int i;
-    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
     sqlite3VdbeSetNumCols(v, 3);
     pParse->nMem = 3;
     sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "seq", SQLITE_STATIC);
@@ -94477,9 +98961,10 @@ SQLITE_PRIVATE void sqlite3Pragma(
            sqlite3BtreeGetFilename(db->aDb[i].pBt), 0);
       sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 3);
     }
-  }else
+  }
+  break;
 
-  if( sqlite3StrICmp(zLeft, "collation_list")==0 ){
+  case PragTyp_COLLATION_LIST: {
     int i = 0;
     HashElem *p;
     sqlite3VdbeSetNumCols(v, 2);
@@ -94492,14 +98977,14 @@ SQLITE_PRIVATE void sqlite3Pragma(
       sqlite3VdbeAddOp4(v, OP_String8, 0, 2, 0, pColl->zName, 0);
       sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 2);
     }
-  }else
+  }
+  break;
 #endif /* SQLITE_OMIT_SCHEMA_PRAGMAS */
 
 #ifndef SQLITE_OMIT_FOREIGN_KEY
-  if( sqlite3StrICmp(zLeft, "foreign_key_list")==0 && zRight ){
+  case PragTyp_FOREIGN_KEY_LIST: if( zRight ){
     FKey *pFK;
     Table *pTab;
-    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
     pTab = sqlite3FindTable(db, zRight, zDb);
     if( pTab ){
       v = sqlite3GetVdbe(pParse);
@@ -94539,12 +99024,13 @@ SQLITE_PRIVATE void sqlite3Pragma(
         }
       }
     }
-  }else
+  }
+  break;
 #endif /* !defined(SQLITE_OMIT_FOREIGN_KEY) */
 
 #ifndef SQLITE_OMIT_FOREIGN_KEY
 #ifndef SQLITE_OMIT_TRIGGER
-  if( sqlite3StrICmp(zLeft, "foreign_key_check")==0 ){
+  case PragTyp_FOREIGN_KEY_CHECK: {
     FKey *pFK;             /* A foreign key constraint */
     Table *pTab;           /* Child table contain "REFERENCES" keyword */
     Table *pParent;        /* Parent table that child points to */
@@ -94560,7 +99046,6 @@ SQLITE_PRIVATE void sqlite3Pragma(
     int addrOk;            /* Jump here if the key is OK */
     int *aiCols;           /* child to parent column mapping */
 
-    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
     regResult = pParse->nMem+1;
     pParse->nMem += 4;
     regKey = ++pParse->nMem;
@@ -94588,8 +99073,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
       sqlite3VdbeAddOp4(v, OP_String8, 0, regResult, 0, pTab->zName,
                         P4_TRANSIENT);
       for(i=1, pFK=pTab->pFKey; pFK; i++, pFK=pFK->pNextFrom){
-        pParent = sqlite3LocateTable(pParse, 0, pFK->zTo, zDb);
-        if( pParent==0 ) break;
+        pParent = sqlite3FindTable(db, pFK->zTo, zDb);
+        if( pParent==0 ) continue;
         pIdx = 0;
         sqlite3TableLock(pParse, iDb, pParent->tnum, 0, pParent->zName);
         x = sqlite3FkLocateIndex(pParse, pParent, pFK, &pIdx, 0);
@@ -94597,51 +99082,54 @@ SQLITE_PRIVATE void sqlite3Pragma(
           if( pIdx==0 ){
             sqlite3OpenTable(pParse, i, iDb, pParent, OP_OpenRead);
           }else{
-            KeyInfo *pKey = sqlite3IndexKeyinfo(pParse, pIdx);
             sqlite3VdbeAddOp3(v, OP_OpenRead, i, pIdx->tnum, iDb);
-            sqlite3VdbeChangeP4(v, -1, (char*)pKey, P4_KEYINFO_HANDOFF);
+            sqlite3VdbeSetP4KeyInfo(pParse, pIdx);
           }
         }else{
           k = 0;
           break;
         }
       }
+      assert( pParse->nErr>0 || pFK==0 );
       if( pFK ) break;
       if( pParse->nTab<i ) pParse->nTab = i;
-      addrTop = sqlite3VdbeAddOp1(v, OP_Rewind, 0);
+      addrTop = sqlite3VdbeAddOp1(v, OP_Rewind, 0); VdbeCoverage(v);
       for(i=1, pFK=pTab->pFKey; pFK; i++, pFK=pFK->pNextFrom){
-        pParent = sqlite3LocateTable(pParse, 0, pFK->zTo, zDb);
-        assert( pParent!=0 );
+        pParent = sqlite3FindTable(db, pFK->zTo, zDb);
         pIdx = 0;
         aiCols = 0;
-        x = sqlite3FkLocateIndex(pParse, pParent, pFK, &pIdx, &aiCols);
-        assert( x==0 );
+        if( pParent ){
+          x = sqlite3FkLocateIndex(pParse, pParent, pFK, &pIdx, &aiCols);
+          assert( x==0 );
+        }
         addrOk = sqlite3VdbeMakeLabel(v);
-        if( pIdx==0 ){
+        if( pParent && pIdx==0 ){
           int iKey = pFK->aCol[0].iFrom;
           assert( iKey>=0 && iKey<pTab->nCol );
           if( iKey!=pTab->iPKey ){
             sqlite3VdbeAddOp3(v, OP_Column, 0, iKey, regRow);
             sqlite3ColumnDefault(v, pTab, iKey, regRow);
-            sqlite3VdbeAddOp2(v, OP_IsNull, regRow, addrOk);
-            sqlite3VdbeAddOp2(v, OP_MustBeInt, regRow,
-               sqlite3VdbeCurrentAddr(v)+3);
+            sqlite3VdbeAddOp2(v, OP_IsNull, regRow, addrOk); VdbeCoverage(v);
+            sqlite3VdbeAddOp2(v, OP_MustBeInt, regRow, 
+               sqlite3VdbeCurrentAddr(v)+3); VdbeCoverage(v);
           }else{
             sqlite3VdbeAddOp2(v, OP_Rowid, 0, regRow);
           }
-          sqlite3VdbeAddOp3(v, OP_NotExists, i, 0, regRow);
+          sqlite3VdbeAddOp3(v, OP_NotExists, i, 0, regRow); VdbeCoverage(v);
           sqlite3VdbeAddOp2(v, OP_Goto, 0, addrOk);
           sqlite3VdbeJumpHere(v, sqlite3VdbeCurrentAddr(v)-2);
         }else{
           for(j=0; j<pFK->nCol; j++){
             sqlite3ExprCodeGetColumnOfTable(v, pTab, 0,
-                            aiCols ? aiCols[j] : pFK->aCol[0].iFrom, regRow+j);
-            sqlite3VdbeAddOp2(v, OP_IsNull, regRow+j, addrOk);
+                            aiCols ? aiCols[j] : pFK->aCol[j].iFrom, regRow+j);
+            sqlite3VdbeAddOp2(v, OP_IsNull, regRow+j, addrOk); VdbeCoverage(v);
+          }
+          if( pParent ){
+            sqlite3VdbeAddOp4(v, OP_MakeRecord, regRow, pFK->nCol, regKey,
+                              sqlite3IndexAffinityStr(v,pIdx), pFK->nCol);
+            sqlite3VdbeAddOp4Int(v, OP_Found, i, addrOk, regKey, 0);
+            VdbeCoverage(v);
           }
-          sqlite3VdbeAddOp3(v, OP_MakeRecord, regRow, pFK->nCol, regKey);
-          sqlite3VdbeChangeP4(v, -1,
-                   sqlite3IndexAffinityStr(v,pIdx), P4_TRANSIENT);
-          sqlite3VdbeAddOp4Int(v, OP_Found, i, addrOk, regKey, 0);
         }
         sqlite3VdbeAddOp2(v, OP_Rowid, 0, regResult+1);
         sqlite3VdbeAddOp4(v, OP_String8, 0, regResult+2, 0, 
@@ -94651,15 +99139,16 @@ SQLITE_PRIVATE void sqlite3Pragma(
         sqlite3VdbeResolveLabel(v, addrOk);
         sqlite3DbFree(db, aiCols);
       }
-      sqlite3VdbeAddOp2(v, OP_Next, 0, addrTop+1);
+      sqlite3VdbeAddOp2(v, OP_Next, 0, addrTop+1); VdbeCoverage(v);
       sqlite3VdbeJumpHere(v, addrTop);
     }
-  }else
+  }
+  break;
 #endif /* !defined(SQLITE_OMIT_TRIGGER) */
 #endif /* !defined(SQLITE_OMIT_FOREIGN_KEY) */
 
 #ifndef NDEBUG
-  if( sqlite3StrICmp(zLeft, "parser_trace")==0 ){
+  case PragTyp_PARSER_TRACE: {
     if( zRight ){
       if( sqlite3GetBoolean(zRight, 0) ){
         sqlite3ParserTrace(stderr, "parser: ");
@@ -94667,36 +99156,37 @@ SQLITE_PRIVATE void sqlite3Pragma(
         sqlite3ParserTrace(0, 0);
       }
     }
-  }else
+  }
+  break;
 #endif
 
   /* Reinstall the LIKE and GLOB functions.  The variant of LIKE
   ** used will be case sensitive or not depending on the RHS.
   */
-  if( sqlite3StrICmp(zLeft, "case_sensitive_like")==0 ){
+  case PragTyp_CASE_SENSITIVE_LIKE: {
     if( zRight ){
       sqlite3RegisterLikeFunctions(db, sqlite3GetBoolean(zRight, 0));
     }
-  }else
+  }
+  break;
 
 #ifndef SQLITE_INTEGRITY_CHECK_ERROR_MAX
 # define SQLITE_INTEGRITY_CHECK_ERROR_MAX 100
 #endif
 
 #ifndef SQLITE_OMIT_INTEGRITY_CHECK
-  /* Pragma "quick_check" is an experimental reduced version of 
+  /* Pragma "quick_check" is reduced version of 
   ** integrity_check designed to detect most database corruption
   ** without most of the overhead of a full integrity-check.
   */
-  if( sqlite3StrICmp(zLeft, "integrity_check")==0
-   || sqlite3StrICmp(zLeft, "quick_check")==0 
-  ){
+  case PragTyp_INTEGRITY_CHECK: {
     int i, j, addr, mxErr;
 
     /* Code that appears at the end of the integrity check.  If no error
     ** messages have been generated, output OK.  Otherwise output the
     ** error message
     */
+    static const int iLn = VDBE_OFFSET_LINENO(2);
     static const VdbeOpList endCode[] = {
       { OP_AddImm,      1, 0,        0},    /* 0 */
       { OP_IfNeg,       1, 0,        0},    /* 1 */
@@ -94720,7 +99210,6 @@ SQLITE_PRIVATE void sqlite3Pragma(
     if( pId2->z==0 ) iDb = -1;
 
     /* Initialize the VDBE program */
-    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
     pParse->nMem = 6;
     sqlite3VdbeSetNumCols(v, 1);
     sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "integrity_check", SQLITE_STATIC);
@@ -94746,6 +99235,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
 
       sqlite3CodeVerifySchema(pParse, i);
       addr = sqlite3VdbeAddOp1(v, OP_IfPos, 1); /* Halt if out of errors */
+      VdbeCoverage(v);
       sqlite3VdbeAddOp2(v, OP_Halt, 0, 0);
       sqlite3VdbeJumpHere(v, addr);
 
@@ -94759,27 +99249,29 @@ SQLITE_PRIVATE void sqlite3Pragma(
       for(x=sqliteHashFirst(pTbls); x; x=sqliteHashNext(x)){
         Table *pTab = sqliteHashData(x);
         Index *pIdx;
-        sqlite3VdbeAddOp2(v, OP_Integer, pTab->tnum, 2+cnt);
-        cnt++;
+        if( HasRowid(pTab) ){
+          sqlite3VdbeAddOp2(v, OP_Integer, pTab->tnum, 2+cnt);
+          VdbeComment((v, "%s", pTab->zName));
+          cnt++;
+        }
         for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
           sqlite3VdbeAddOp2(v, OP_Integer, pIdx->tnum, 2+cnt);
+          VdbeComment((v, "%s", pIdx->zName));
           cnt++;
         }
       }
 
       /* Make sure sufficient number of registers have been allocated */
-      if( pParse->nMem < cnt+4 ){
-        pParse->nMem = cnt+4;
-      }
+      pParse->nMem = MAX( pParse->nMem, cnt+8 );
 
       /* Do the b-tree integrity checks */
       sqlite3VdbeAddOp3(v, OP_IntegrityCk, 2, cnt, 1);
       sqlite3VdbeChangeP5(v, (u8)i);
-      addr = sqlite3VdbeAddOp1(v, OP_IsNull, 2);
+      addr = sqlite3VdbeAddOp1(v, OP_IsNull, 2); VdbeCoverage(v);
       sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0,
          sqlite3MPrintf(db, "*** in database %s ***\n", db->aDb[i].zName),
          P4_DYNAMIC);
-      sqlite3VdbeAddOp2(v, OP_Move, 2, 4);
+      sqlite3VdbeAddOp3(v, OP_Move, 2, 4, 1);
       sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 2);
       sqlite3VdbeAddOp2(v, OP_ResultRow, 2, 1);
       sqlite3VdbeJumpHere(v, addr);
@@ -94788,77 +99280,79 @@ SQLITE_PRIVATE void sqlite3Pragma(
       */
       for(x=sqliteHashFirst(pTbls); x && !isQuick; x=sqliteHashNext(x)){
         Table *pTab = sqliteHashData(x);
-        Index *pIdx;
+        Index *pIdx, *pPk;
+        Index *pPrior = 0;
         int loopTop;
+        int iDataCur, iIdxCur;
+        int r1 = -1;
 
         if( pTab->pIndex==0 ) continue;
+        pPk = HasRowid(pTab) ? 0 : sqlite3PrimaryKeyIndex(pTab);
         addr = sqlite3VdbeAddOp1(v, OP_IfPos, 1);  /* Stop if out of errors */
+        VdbeCoverage(v);
         sqlite3VdbeAddOp2(v, OP_Halt, 0, 0);
         sqlite3VdbeJumpHere(v, addr);
-        sqlite3OpenTableAndIndices(pParse, pTab, 1, OP_OpenRead);
-        sqlite3VdbeAddOp2(v, OP_Integer, 0, 2);  /* reg(2) will count entries */
-        loopTop = sqlite3VdbeAddOp2(v, OP_Rewind, 1, 0);
-        sqlite3VdbeAddOp2(v, OP_AddImm, 2, 1);   /* increment entry count */
+        sqlite3ExprCacheClear(pParse);
+        sqlite3OpenTableAndIndices(pParse, pTab, OP_OpenRead,
+                                   1, 0, &iDataCur, &iIdxCur);
+        sqlite3VdbeAddOp2(v, OP_Integer, 0, 7);
         for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
-          int jmp2;
-          int r1;
-          static const VdbeOpList idxErr[] = {
-            { OP_AddImm,      1, -1,  0},
-            { OP_String8,     0,  3,  0},    /* 1 */
-            { OP_Rowid,       1,  4,  0},
-            { OP_String8,     0,  5,  0},    /* 3 */
-            { OP_String8,     0,  6,  0},    /* 4 */
-            { OP_Concat,      4,  3,  3},
-            { OP_Concat,      5,  3,  3},
-            { OP_Concat,      6,  3,  3},
-            { OP_ResultRow,   3,  1,  0},
-            { OP_IfPos,       1,  0,  0},    /* 9 */
-            { OP_Halt,        0,  0,  0},
-          };
-          r1 = sqlite3GenerateIndexKey(pParse, pIdx, 1, 3, 0);
-          jmp2 = sqlite3VdbeAddOp4Int(v, OP_Found, j+2, 0, r1, pIdx->nColumn+1);
-          addr = sqlite3VdbeAddOpList(v, ArraySize(idxErr), idxErr);
-          sqlite3VdbeChangeP4(v, addr+1, "rowid ", P4_STATIC);
-          sqlite3VdbeChangeP4(v, addr+3, " missing from index ", P4_STATIC);
-          sqlite3VdbeChangeP4(v, addr+4, pIdx->zName, P4_TRANSIENT);
-          sqlite3VdbeJumpHere(v, addr+9);
+          sqlite3VdbeAddOp2(v, OP_Integer, 0, 8+j); /* index entries counter */
+        }
+        pParse->nMem = MAX(pParse->nMem, 8+j);
+        sqlite3VdbeAddOp2(v, OP_Rewind, iDataCur, 0); VdbeCoverage(v);
+        loopTop = sqlite3VdbeAddOp2(v, OP_AddImm, 7, 1);
+        for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
+          int jmp2, jmp3, jmp4;
+          if( pPk==pIdx ) continue;
+          r1 = sqlite3GenerateIndexKey(pParse, pIdx, iDataCur, 0, 0, &jmp3,
+                                       pPrior, r1);
+          pPrior = pIdx;
+          sqlite3VdbeAddOp2(v, OP_AddImm, 8+j, 1);  /* increment entry count */
+          jmp2 = sqlite3VdbeAddOp4Int(v, OP_Found, iIdxCur+j, 0, r1,
+                                      pIdx->nColumn); VdbeCoverage(v);
+          sqlite3VdbeAddOp2(v, OP_AddImm, 1, -1); /* Decrement error limit */
+          sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, "row ", P4_STATIC);
+          sqlite3VdbeAddOp3(v, OP_Concat, 7, 3, 3);
+          sqlite3VdbeAddOp4(v, OP_String8, 0, 4, 0, " missing from index ",
+                            P4_STATIC);
+          sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 3);
+          sqlite3VdbeAddOp4(v, OP_String8, 0, 4, 0, pIdx->zName, P4_TRANSIENT);
+          sqlite3VdbeAddOp3(v, OP_Concat, 4, 3, 3);
+          sqlite3VdbeAddOp2(v, OP_ResultRow, 3, 1);
+          jmp4 = sqlite3VdbeAddOp1(v, OP_IfPos, 1); VdbeCoverage(v);
+          sqlite3VdbeAddOp0(v, OP_Halt);
+          sqlite3VdbeJumpHere(v, jmp4);
           sqlite3VdbeJumpHere(v, jmp2);
+          sqlite3ResolvePartIdxLabel(pParse, jmp3);
         }
-        sqlite3VdbeAddOp2(v, OP_Next, 1, loopTop+1);
-        sqlite3VdbeJumpHere(v, loopTop);
-        for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
-          static const VdbeOpList cntIdx[] = {
-             { OP_Integer,      0,  3,  0},
-             { OP_Rewind,       0,  0,  0},  /* 1 */
-             { OP_AddImm,       3,  1,  0},
-             { OP_Next,         0,  0,  0},  /* 3 */
-             { OP_Eq,           2,  0,  3},  /* 4 */
-             { OP_AddImm,       1, -1,  0},
-             { OP_String8,      0,  2,  0},  /* 6 */
-             { OP_String8,      0,  3,  0},  /* 7 */
-             { OP_Concat,       3,  2,  2},
-             { OP_ResultRow,    2,  1,  0},
-          };
-          addr = sqlite3VdbeAddOp1(v, OP_IfPos, 1);
-          sqlite3VdbeAddOp2(v, OP_Halt, 0, 0);
-          sqlite3VdbeJumpHere(v, addr);
-          addr = sqlite3VdbeAddOpList(v, ArraySize(cntIdx), cntIdx);
-          sqlite3VdbeChangeP1(v, addr+1, j+2);
-          sqlite3VdbeChangeP2(v, addr+1, addr+4);
-          sqlite3VdbeChangeP1(v, addr+3, j+2);
-          sqlite3VdbeChangeP2(v, addr+3, addr+2);
-          sqlite3VdbeJumpHere(v, addr+4);
-          sqlite3VdbeChangeP4(v, addr+6, 
+        sqlite3VdbeAddOp2(v, OP_Next, iDataCur, loopTop); VdbeCoverage(v);
+        sqlite3VdbeJumpHere(v, loopTop-1);
+#ifndef SQLITE_OMIT_BTREECOUNT
+        sqlite3VdbeAddOp4(v, OP_String8, 0, 2, 0, 
                      "wrong # of entries in index ", P4_STATIC);
-          sqlite3VdbeChangeP4(v, addr+7, pIdx->zName, P4_TRANSIENT);
+        for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
+          if( pPk==pIdx ) continue;
+          addr = sqlite3VdbeCurrentAddr(v);
+          sqlite3VdbeAddOp2(v, OP_IfPos, 1, addr+2); VdbeCoverage(v);
+          sqlite3VdbeAddOp2(v, OP_Halt, 0, 0);
+          sqlite3VdbeAddOp2(v, OP_Count, iIdxCur+j, 3);
+          sqlite3VdbeAddOp3(v, OP_Eq, 8+j, addr+8, 3); VdbeCoverage(v);
+          sqlite3VdbeChangeP5(v, SQLITE_NOTNULL);
+          sqlite3VdbeAddOp2(v, OP_AddImm, 1, -1);
+          sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, pIdx->zName, P4_TRANSIENT);
+          sqlite3VdbeAddOp3(v, OP_Concat, 3, 2, 7);
+          sqlite3VdbeAddOp2(v, OP_ResultRow, 7, 1);
         }
+#endif /* SQLITE_OMIT_BTREECOUNT */
       } 
     }
-    addr = sqlite3VdbeAddOpList(v, ArraySize(endCode), endCode);
+    addr = sqlite3VdbeAddOpList(v, ArraySize(endCode), endCode, iLn);
     sqlite3VdbeChangeP2(v, addr, -mxErr);
     sqlite3VdbeJumpHere(v, addr+1);
     sqlite3VdbeChangeP4(v, addr+2, "ok", P4_STATIC);
-  }else
+  }
+  break;
 #endif /* SQLITE_OMIT_INTEGRITY_CHECK */
 
 #ifndef SQLITE_OMIT_UTF16
@@ -94884,7 +99378,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** new database files created using this database handle. It is only
   ** useful if invoked immediately after the main database i
   */
-  if( sqlite3StrICmp(zLeft, "encoding")==0 ){
+  case PragTyp_ENCODING: {
     static const struct EncName {
       char *zName;
       u8 enc;
@@ -94931,7 +99425,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
         }
       }
     }
-  }else
+  }
+  break;
 #endif /* SQLITE_OMIT_UTF16 */
 
 #ifndef SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS
@@ -94965,11 +99460,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** The user-version is not used internally by SQLite. It may be used by
   ** applications for any purpose.
   */
-  if( sqlite3StrICmp(zLeft, "schema_version")==0 
-   || sqlite3StrICmp(zLeft, "user_version")==0 
-   || sqlite3StrICmp(zLeft, "freelist_count")==0 
-   || sqlite3StrICmp(zLeft, "application_id")==0 
-  ){
+  case PragTyp_HEADER_VALUE: {
     int iCookie;   /* Cookie index. 1 for schema-cookie, 6 for user-cookie. */
     sqlite3VdbeUsesBtree(v, iDb);
     switch( zLeft[0] ){
@@ -94994,7 +99485,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
         { OP_Integer,        0,  1,  0},    /* 1 */
         { OP_SetCookie,      0,  0,  1},    /* 2 */
       };
-      int addr = sqlite3VdbeAddOpList(v, ArraySize(setCookie), setCookie);
+      int addr = sqlite3VdbeAddOpList(v, ArraySize(setCookie), setCookie, 0);
       sqlite3VdbeChangeP1(v, addr, iDb);
       sqlite3VdbeChangeP1(v, addr+1, sqlite3Atoi(zRight));
       sqlite3VdbeChangeP1(v, addr+2, iDb);
@@ -95006,14 +99497,15 @@ SQLITE_PRIVATE void sqlite3Pragma(
         { OP_ReadCookie,      0,  1,  0},    /* 1 */
         { OP_ResultRow,       1,  1,  0}
       };
-      int addr = sqlite3VdbeAddOpList(v, ArraySize(readCookie), readCookie);
+      int addr = sqlite3VdbeAddOpList(v, ArraySize(readCookie), readCookie, 0);
       sqlite3VdbeChangeP1(v, addr, iDb);
       sqlite3VdbeChangeP1(v, addr+1, iDb);
       sqlite3VdbeChangeP3(v, addr+1, iCookie);
       sqlite3VdbeSetNumCols(v, 1);
       sqlite3VdbeSetColName(v, 0, COLNAME_NAME, zLeft, SQLITE_TRANSIENT);
     }
-  }else
+  }
+  break;
 #endif /* SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS */
 
 #ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
@@ -95023,7 +99515,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** Return the names of all compile-time options used in this build,
   ** one option per row.
   */
-  if( sqlite3StrICmp(zLeft, "compile_options")==0 ){
+  case PragTyp_COMPILE_OPTIONS: {
     int i = 0;
     const char *zOpt;
     sqlite3VdbeSetNumCols(v, 1);
@@ -95033,7 +99525,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
       sqlite3VdbeAddOp4(v, OP_String8, 0, 1, 0, zOpt, 0);
       sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 1);
     }
-  }else
+  }
+  break;
 #endif /* SQLITE_OMIT_COMPILEOPTION_DIAGS */
 
 #ifndef SQLITE_OMIT_WAL
@@ -95042,7 +99535,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
   **
   ** Checkpoint the database.
   */
-  if( sqlite3StrICmp(zLeft, "wal_checkpoint")==0 ){
+  case PragTyp_WAL_CHECKPOINT: {
     int iBt = (pId2->z?iDb:SQLITE_MAX_ATTACHED);
     int eMode = SQLITE_CHECKPOINT_PASSIVE;
     if( zRight ){
@@ -95052,7 +99545,6 @@ SQLITE_PRIVATE void sqlite3Pragma(
         eMode = SQLITE_CHECKPOINT_RESTART;
       }
     }
-    if( sqlite3ReadSchema(pParse) ) goto pragma_out;
     sqlite3VdbeSetNumCols(v, 3);
     pParse->nMem = 3;
     sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "busy", SQLITE_STATIC);
@@ -95061,7 +99553,8 @@ SQLITE_PRIVATE void sqlite3Pragma(
 
     sqlite3VdbeAddOp3(v, OP_Checkpoint, iBt, eMode, 1);
     sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 3);
-  }else
+  }
+  break;
 
   /*
   **   PRAGMA wal_autocheckpoint
@@ -95071,14 +99564,15 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** after accumulating N frames in the log. Or query for the current value
   ** of N.
   */
-  if( sqlite3StrICmp(zLeft, "wal_autocheckpoint")==0 ){
+  case PragTyp_WAL_AUTOCHECKPOINT: {
     if( zRight ){
       sqlite3_wal_autocheckpoint(db, sqlite3Atoi(zRight));
     }
     returnSingleInt(pParse, "wal_autocheckpoint", 
        db->xWalCallback==sqlite3WalDefaultHook ? 
            SQLITE_PTR_TO_INT(db->pWalArg) : 0);
-  }else
+  }
+  break;
 #endif
 
   /*
@@ -95087,9 +99581,10 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** This pragma attempts to free as much memory as possible from the
   ** current database connection.
   */
-  if( sqlite3StrICmp(zLeft, "shrink_memory")==0 ){
+  case PragTyp_SHRINK_MEMORY: {
     sqlite3_db_release_memory(db);
-  }else
+    break;
+  }
 
   /*
   **   PRAGMA busy_timeout
@@ -95100,18 +99595,36 @@ SQLITE_PRIVATE void sqlite3Pragma(
   ** then 0 is returned.  Setting the busy_timeout to 0 or negative
   ** disables the timeout.
   */
-  if( sqlite3StrICmp(zLeft, "busy_timeout")==0 ){
+  /*case PragTyp_BUSY_TIMEOUT*/ default: {
+    assert( aPragmaNames[mid].ePragTyp==PragTyp_BUSY_TIMEOUT );
     if( zRight ){
       sqlite3_busy_timeout(db, sqlite3Atoi(zRight));
     }
     returnSingleInt(pParse, "timeout",  db->busyTimeout);
-  }else
+    break;
+  }
+
+  /*
+  **   PRAGMA soft_heap_limit
+  **   PRAGMA soft_heap_limit = N
+  **
+  ** Call sqlite3_soft_heap_limit64(N).  Return the result.  If N is omitted,
+  ** use -1.
+  */
+  case PragTyp_SOFT_HEAP_LIMIT: {
+    sqlite3_int64 N;
+    if( zRight && sqlite3Atoi64(zRight, &N, 1000000, SQLITE_UTF8)==SQLITE_OK ){
+      sqlite3_soft_heap_limit64(N);
+    }
+    returnSingleInt(pParse, "soft_heap_limit",  sqlite3_soft_heap_limit64(-1));
+    break;
+  }
 
 #if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
   /*
   ** Report the current state of file logs for all databases
   */
-  if( sqlite3StrICmp(zLeft, "lock_status")==0 ){
+  case PragTyp_LOCK_STATUS: {
     static const char *const azLockName[] = {
       "unlocked", "shared", "reserved", "pending", "exclusive"
     };
@@ -95136,35 +99649,39 @@ SQLITE_PRIVATE void sqlite3Pragma(
       sqlite3VdbeAddOp4(v, OP_String8, 0, 2, 0, zState, P4_STATIC);
       sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 2);
     }
-
-  }else
+    break;
+  }
 #endif
 
 #ifdef SQLITE_HAS_CODEC
-  if( sqlite3StrICmp(zLeft, "key")==0 && zRight ){
-    sqlite3_key(db, zRight, sqlite3Strlen30(zRight));
-  }else
-  if( sqlite3StrICmp(zLeft, "rekey")==0 && zRight ){
-    sqlite3_rekey(db, zRight, sqlite3Strlen30(zRight));
-  }else
-  if( zRight && (sqlite3StrICmp(zLeft, "hexkey")==0 ||
-                 sqlite3StrICmp(zLeft, "hexrekey")==0) ){
-    int i, h1, h2;
-    char zKey[40];
-    for(i=0; (h1 = zRight[i])!=0 && (h2 = zRight[i+1])!=0; i+=2){
-      h1 += 9*(1&(h1>>6));
-      h2 += 9*(1&(h2>>6));
-      zKey[i/2] = (h2 & 0x0f) | ((h1 & 0xf)<<4);
+  case PragTyp_KEY: {
+    if( zRight ) sqlite3_key_v2(db, zDb, zRight, sqlite3Strlen30(zRight));
+    break;
+  }
+  case PragTyp_REKEY: {
+    if( zRight ) sqlite3_rekey_v2(db, zDb, zRight, sqlite3Strlen30(zRight));
+    break;
+  }
+  case PragTyp_HEXKEY: {
+    if( zRight ){
+      u8 iByte;
+      int i;
+      char zKey[40];
+      for(i=0, iByte=0; i<sizeof(zKey)*2 && sqlite3Isxdigit(zRight[i]); i++){
+        iByte = (iByte<<4) + sqlite3HexToInt(zRight[i]);
+        if( (i&1)!=0 ) zKey[i/2] = iByte;
+      }
+      if( (zLeft[3] & 0xf)==0xb ){
+        sqlite3_key_v2(db, zDb, zKey, i/2);
+      }else{
+        sqlite3_rekey_v2(db, zDb, zKey, i/2);
+      }
     }
-    if( (zLeft[3] & 0xf)==0xb ){
-      sqlite3_key(db, zKey, i/2);
-    }else{
-      sqlite3_rekey(db, zKey, i/2);
-    }
-  }else
+    break;
+  }
 #endif
 #if defined(SQLITE_HAS_CODEC) || defined(SQLITE_ENABLE_CEROD)
-  if( sqlite3StrICmp(zLeft, "activate_extensions")==0 && zRight ){
+  case PragTyp_ACTIVATE_EXTENSIONS: if( zRight ){
 #ifdef SQLITE_HAS_CODEC
     if( sqlite3StrNICmp(zRight, "see-", 4)==0 ){
       sqlite3_activate_see(&zRight[4]);
@@ -95175,23 +99692,12 @@ SQLITE_PRIVATE void sqlite3Pragma(
       sqlite3_activate_cerod(&zRight[6]);
     }
 #endif
-  }else
-#endif
-
- 
-  {/* Empty ELSE clause */}
-
-  /*
-  ** Reset the safety level, in case the fullfsync flag or synchronous
-  ** setting changed.
-  */
-#ifndef SQLITE_OMIT_PAGER_PRAGMAS
-  if( db->autoCommit ){
-    sqlite3BtreeSetSafetyLevel(pDb->pBt, pDb->safety_level,
-               (db->flags&SQLITE_FullFSync)!=0,
-               (db->flags&SQLITE_CkptFullFSync)!=0);
   }
+  break;
 #endif
+
+  } /* End of the PRAGMA switch */
+
 pragma_out:
   sqlite3DbFree(db, zLeft);
   sqlite3DbFree(db, zRight);
@@ -95726,6 +100232,17 @@ SQLITE_PRIVATE int sqlite3SchemaToIndex(sqlite3 *db, Schema *pSchema){
   return i;
 }
 
+/*
+** Free all memory allocations in the pParse object
+*/
+SQLITE_PRIVATE void sqlite3ParserReset(Parse *pParse){
+  if( pParse ){
+    sqlite3 *db = pParse->db;
+    sqlite3DbFree(db, pParse->aLabel);
+    sqlite3ExprListDelete(db, pParse->pConstExpr);
+  }
+}
+
 /*
 ** Compile the UTF-8 encoded SQL statement zSql into a statement handle.
 */
@@ -95794,7 +100311,7 @@ static int sqlite3Prepare(
   sqlite3VtabUnlockList(db);
 
   pParse->db = db;
-  pParse->nQueryLoop = (double)1;
+  pParse->nQueryLoop = 0;  /* Logarithmic, so 0 really means 1 */
   if( nBytes>=0 && (nBytes==0 || zSql[nBytes-1]!=0) ){
     char *zSqlCopy;
     int mxLen = db->aLimit[SQLITE_LIMIT_SQL_LENGTH];
@@ -95816,7 +100333,7 @@ static int sqlite3Prepare(
   }else{
     sqlite3RunParser(pParse, zSql, &zErrMsg);
   }
-  assert( 1==(int)pParse->nQueryLoop );
+  assert( 0==pParse->nQueryLoop );
 
   if( db->mallocFailed ){
     pParse->rc = SQLITE_NOMEM;
@@ -95883,6 +100400,7 @@ static int sqlite3Prepare(
 
 end_prepare:
 
+  sqlite3ParserReset(pParse);
   sqlite3StackFree(db, pParse);
   rc = sqlite3ApiExit(db, rc);
   assert( (rc&db->errMask)==rc );
@@ -96012,6 +100530,12 @@ static int sqlite3Prepare16(
   if( !sqlite3SafetyCheckOk(db) ){
     return SQLITE_MISUSE_BKPT;
   }
+  if( nBytes>=0 ){
+    int sz;
+    const char *z = (const char*)zSql;
+    for(sz=0; sz<nBytes && (z[sz]!=0 || z[sz+1]!=0); sz += 2){}
+    nBytes = sz;
+  }
   sqlite3_mutex_enter(db->mutex);
   zSql8 = sqlite3Utf16to8(db, zSql, nBytes, SQLITE_UTF16NATIVE);
   if( zSql8 ){
@@ -96085,6 +100609,34 @@ SQLITE_API int sqlite3_prepare16_v2(
 ** to handle SELECT statements in SQLite.
 */
 
+/*
+** An instance of the following object is used to record information about
+** how to process the DISTINCT keyword, to simplify passing that information
+** into the selectInnerLoop() routine.
+*/
+typedef struct DistinctCtx DistinctCtx;
+struct DistinctCtx {
+  u8 isTnct;      /* True if the DISTINCT keyword is present */
+  u8 eTnctType;   /* One of the WHERE_DISTINCT_* operators */
+  int tabTnct;    /* Ephemeral table used for DISTINCT processing */
+  int addrTnct;   /* Address of OP_OpenEphemeral opcode for tabTnct */
+};
+
+/*
+** An instance of the following object is used to record information about
+** the ORDER BY (or GROUP BY) clause of query is being coded.
+*/
+typedef struct SortCtx SortCtx;
+struct SortCtx {
+  ExprList *pOrderBy;   /* The ORDER BY (or GROUP BY clause) */
+  int nOBSat;           /* Number of ORDER BY terms satisfied by indices */
+  int iECursor;         /* Cursor number for the sorter */
+  int regReturn;        /* Register holding block-output return address */
+  int labelBkOut;       /* Start label for the block-output subroutine */
+  int addrSortIndex;    /* Address of the OP_SorterOpen or OP_OpenEphemeral */
+  u8 sortFlags;         /* Zero or more SORTFLAG_* bits */
+};
+#define SORTFLAG_UseSorter  0x01   /* Use SorterOpen instead of OpenEphemeral */
 
 /*
 ** Delete all the content of a Select structure but do not deallocate
@@ -96100,6 +100652,7 @@ static void clearSelect(sqlite3 *db, Select *p){
   sqlite3SelectDelete(db, p->pPrior);
   sqlite3ExprDelete(db, p->pLimit);
   sqlite3ExprDelete(db, p->pOffset);
+  sqlite3WithDelete(db, p->pWith);
 }
 
 /*
@@ -96157,7 +100710,6 @@ SQLITE_PRIVATE Select *sqlite3SelectNew(
   assert( pOffset==0 || pLimit!=0 );
   pNew->addrOpenEphm[0] = -1;
   pNew->addrOpenEphm[1] = -1;
-  pNew->addrOpenEphm[2] = -1;
   if( db->mallocFailed ) {
     clearSelect(db, pNew);
     if( pNew!=&standin ) sqlite3DbFree(db, pNew);
@@ -96180,7 +100732,15 @@ SQLITE_PRIVATE void sqlite3SelectDelete(sqlite3 *db, Select *p){
 }
 
 /*
-** Given 1 to 3 identifiers preceeding the JOIN keyword, determine the
+** Return a pointer to the right-most SELECT statement in a compound.
+*/
+static Select *findRightmost(Select *p){
+  while( p->pNext ) p = p->pNext;
+  return p;
+}
+
+/*
+** Given 1 to 3 identifiers preceding the JOIN keyword, determine the
 ** type of join.  Return an integer constant that expresses that type
 ** in terms of the following bit values:
 **
@@ -96335,8 +100895,8 @@ static void addWhereTerm(
   pEq = sqlite3PExpr(pParse, TK_EQ, pE1, pE2, 0);
   if( pEq && isOuterJoin ){
     ExprSetProperty(pEq, EP_FromJoin);
-    assert( !ExprHasAnyProperty(pEq, EP_TokenOnly|EP_Reduced) );
-    ExprSetIrreducible(pEq);
+    assert( !ExprHasProperty(pEq, EP_TokenOnly|EP_Reduced) );
+    ExprSetVVAProperty(pEq, EP_NoReduce);
     pEq->iRightJoinTable = (i16)pE2->iTable;
   }
   *ppWhere = sqlite3ExprAnd(db, *ppWhere, pEq);
@@ -96371,8 +100931,8 @@ static void addWhereTerm(
 static void setJoinExpr(Expr *p, int iTable){
   while( p ){
     ExprSetProperty(p, EP_FromJoin);
-    assert( !ExprHasAnyProperty(p, EP_TokenOnly|EP_Reduced) );
-    ExprSetIrreducible(p);
+    assert( !ExprHasProperty(p, EP_TokenOnly|EP_Reduced) );
+    ExprSetVVAProperty(p, EP_NoReduce);
     p->iRightJoinTable = (i16)iTable;
     setJoinExpr(p->pLeft, iTable);
     p = p->pRight;
@@ -96481,34 +101041,73 @@ static int sqliteProcessJoin(Parse *pParse, Select *p){
   return 0;
 }
 
+/* Forward reference */
+static KeyInfo *keyInfoFromExprList(
+  Parse *pParse,       /* Parsing context */
+  ExprList *pList,     /* Form the KeyInfo object from this ExprList */
+  int iStart,          /* Begin with this column of pList */
+  int nExtra           /* Add this many extra columns to the end */
+);
+
 /*
-** Insert code into "v" that will push the record on the top of the
-** stack into the sorter.
+** Insert code into "v" that will push the record in register regData
+** into the sorter.
 */
 static void pushOntoSorter(
   Parse *pParse,         /* Parser context */
-  ExprList *pOrderBy,    /* The ORDER BY clause */
+  SortCtx *pSort,        /* Information about the ORDER BY clause */
   Select *pSelect,       /* The whole SELECT statement */
   int regData            /* Register holding data to be sorted */
 ){
   Vdbe *v = pParse->pVdbe;
-  int nExpr = pOrderBy->nExpr;
-  int regBase = sqlite3GetTempRange(pParse, nExpr+2);
-  int regRecord = sqlite3GetTempReg(pParse);
+  int nExpr = pSort->pOrderBy->nExpr;
+  int regRecord = ++pParse->nMem;
+  int regBase = pParse->nMem+1;
+  int nOBSat = pSort->nOBSat;
   int op;
+
+  pParse->nMem += nExpr+2;        /* nExpr+2 registers allocated at regBase */
   sqlite3ExprCacheClear(pParse);
-  sqlite3ExprCodeExprList(pParse, pOrderBy, regBase, 0);
-  sqlite3VdbeAddOp2(v, OP_Sequence, pOrderBy->iECursor, regBase+nExpr);
+  sqlite3ExprCodeExprList(pParse, pSort->pOrderBy, regBase, 0);
+  sqlite3VdbeAddOp2(v, OP_Sequence, pSort->iECursor, regBase+nExpr);
   sqlite3ExprCodeMove(pParse, regData, regBase+nExpr+1, 1);
-  sqlite3VdbeAddOp3(v, OP_MakeRecord, regBase, nExpr + 2, regRecord);
-  if( pSelect->selFlags & SF_UseSorter ){
+  sqlite3VdbeAddOp3(v, OP_MakeRecord, regBase+nOBSat, nExpr+2-nOBSat,regRecord);
+  if( nOBSat>0 ){
+    int regPrevKey;   /* The first nOBSat columns of the previous row */
+    int addrFirst;    /* Address of the OP_IfNot opcode */
+    int addrJmp;      /* Address of the OP_Jump opcode */
+    VdbeOp *pOp;      /* Opcode that opens the sorter */
+    int nKey;         /* Number of sorting key columns, including OP_Sequence */
+    KeyInfo *pKI;     /* Original KeyInfo on the sorter table */
+
+    regPrevKey = pParse->nMem+1;
+    pParse->nMem += pSort->nOBSat;
+    nKey = nExpr - pSort->nOBSat + 1;
+    addrFirst = sqlite3VdbeAddOp1(v, OP_IfNot, regBase+nExpr); VdbeCoverage(v);
+    sqlite3VdbeAddOp3(v, OP_Compare, regPrevKey, regBase, pSort->nOBSat);
+    pOp = sqlite3VdbeGetOp(v, pSort->addrSortIndex);
+    if( pParse->db->mallocFailed ) return;
+    pOp->p2 = nKey + 1;
+    pKI = pOp->p4.pKeyInfo;
+    memset(pKI->aSortOrder, 0, pKI->nField); /* Makes OP_Jump below testable */
+    sqlite3VdbeChangeP4(v, -1, (char*)pKI, P4_KEYINFO);
+    pOp->p4.pKeyInfo = keyInfoFromExprList(pParse, pSort->pOrderBy, nOBSat, 1);
+    addrJmp = sqlite3VdbeCurrentAddr(v);
+    sqlite3VdbeAddOp3(v, OP_Jump, addrJmp+1, 0, addrJmp+1); VdbeCoverage(v);
+    pSort->labelBkOut = sqlite3VdbeMakeLabel(v);
+    pSort->regReturn = ++pParse->nMem;
+    sqlite3VdbeAddOp2(v, OP_Gosub, pSort->regReturn, pSort->labelBkOut);
+    sqlite3VdbeAddOp1(v, OP_ResetSorter, pSort->iECursor);
+    sqlite3VdbeJumpHere(v, addrFirst);
+    sqlite3VdbeAddOp3(v, OP_Move, regBase, regPrevKey, pSort->nOBSat);
+    sqlite3VdbeJumpHere(v, addrJmp);
+  }
+  if( pSort->sortFlags & SORTFLAG_UseSorter ){
     op = OP_SorterInsert;
   }else{
     op = OP_IdxInsert;
   }
-  sqlite3VdbeAddOp2(v, op, pOrderBy->iECursor, regRecord);
-  sqlite3ReleaseTempReg(pParse, regRecord);
-  sqlite3ReleaseTempRange(pParse, regBase, nExpr+2);
+  sqlite3VdbeAddOp2(v, op, pSort->iECursor, regRecord);
   if( pSelect->iLimit ){
     int addr1, addr2;
     int iLimit;
@@ -96517,12 +101116,12 @@ static void pushOntoSorter(
     }else{
       iLimit = pSelect->iLimit;
     }
-    addr1 = sqlite3VdbeAddOp1(v, OP_IfZero, iLimit);
+    addr1 = sqlite3VdbeAddOp1(v, OP_IfZero, iLimit); VdbeCoverage(v);
     sqlite3VdbeAddOp2(v, OP_AddImm, iLimit, -1);
     addr2 = sqlite3VdbeAddOp0(v, OP_Goto);
     sqlite3VdbeJumpHere(v, addr1);
-    sqlite3VdbeAddOp1(v, OP_Last, pOrderBy->iECursor);
-    sqlite3VdbeAddOp1(v, OP_Delete, pOrderBy->iECursor);
+    sqlite3VdbeAddOp1(v, OP_Last, pSort->iECursor);
+    sqlite3VdbeAddOp1(v, OP_Delete, pSort->iECursor);
     sqlite3VdbeJumpHere(v, addr2);
   }
 }
@@ -96532,13 +101131,13 @@ static void pushOntoSorter(
 */
 static void codeOffset(
   Vdbe *v,          /* Generate code into this VM */
-  Select *p,        /* The SELECT statement being coded */
+  int iOffset,      /* Register holding the offset counter */
   int iContinue     /* Jump here to skip the current record */
 ){
-  if( p->iOffset && iContinue!=0 ){
+  if( iOffset>0 ){
     int addr;
-    sqlite3VdbeAddOp2(v, OP_AddImm, p->iOffset, -1);
-    addr = sqlite3VdbeAddOp1(v, OP_IfNeg, p->iOffset);
+    sqlite3VdbeAddOp2(v, OP_AddImm, iOffset, -1);
+    addr = sqlite3VdbeAddOp1(v, OP_IfNeg, iOffset); VdbeCoverage(v);
     sqlite3VdbeAddOp2(v, OP_Goto, 0, iContinue);
     VdbeComment((v, "skip OFFSET records"));
     sqlite3VdbeJumpHere(v, addr);
@@ -96566,7 +101165,7 @@ static void codeDistinct(
 
   v = pParse->pVdbe;
   r1 = sqlite3GetTempReg(pParse);
-  sqlite3VdbeAddOp4Int(v, OP_Found, iTab, addrRepeat, iMem, N);
+  sqlite3VdbeAddOp4Int(v, OP_Found, iTab, addrRepeat, iMem, N); VdbeCoverage(v);
   sqlite3VdbeAddOp3(v, OP_MakeRecord, iMem, N, r1);
   sqlite3VdbeAddOp2(v, OP_IdxInsert, iTab, r1);
   sqlite3ReleaseTempReg(pParse, r1);
@@ -96596,35 +101195,21 @@ static int checkForMultiColumnSelectError(
 }
 #endif
 
-/*
-** An instance of the following object is used to record information about
-** how to process the DISTINCT keyword, to simplify passing that information
-** into the selectInnerLoop() routine.
-*/
-typedef struct DistinctCtx DistinctCtx;
-struct DistinctCtx {
-  u8 isTnct;      /* True if the DISTINCT keyword is present */
-  u8 eTnctType;   /* One of the WHERE_DISTINCT_* operators */
-  int tabTnct;    /* Ephemeral table used for DISTINCT processing */
-  int addrTnct;   /* Address of OP_OpenEphemeral opcode for tabTnct */
-};
-
 /*
 ** This routine generates the code for the inside of the inner loop
 ** of a SELECT.
 **
-** If srcTab and nColumn are both zero, then the pEList expressions
-** are evaluated in order to get the data for this row.  If nColumn>0
-** then data is pulled from srcTab and pEList is used only to get the
-** datatypes for each column.
+** If srcTab is negative, then the pEList expressions
+** are evaluated in order to get the data for this row.  If srcTab is
+** zero or more, then data is pulled from srcTab and pEList is used only 
+** to get number columns and the datatype for each column.
 */
 static void selectInnerLoop(
   Parse *pParse,          /* The parser context */
   Select *p,              /* The complete select statement being coded */
   ExprList *pEList,       /* List of values being extracted */
   int srcTab,             /* Pull data from this table */
-  int nColumn,            /* Number of columns in the source table */
-  ExprList *pOrderBy,     /* If not NULL, sort results using this key */
+  SortCtx *pSort,         /* If not NULL, info on how to process ORDER BY */
   DistinctCtx *pDistinct, /* If not NULL, info on how to process DISTINCT */
   SelectDest *pDest,      /* How to dispose of the results */
   int iContinue,          /* Jump here to continue with next row */
@@ -96639,48 +101224,49 @@ static void selectInnerLoop(
   int nResultCol;             /* Number of result columns */
 
   assert( v );
-  if( NEVER(v==0) ) return;
   assert( pEList!=0 );
   hasDistinct = pDistinct ? pDistinct->eTnctType : WHERE_DISTINCT_NOOP;
-  if( pOrderBy==0 && !hasDistinct ){
-    codeOffset(v, p, iContinue);
+  if( pSort && pSort->pOrderBy==0 ) pSort = 0;
+  if( pSort==0 && !hasDistinct ){
+    assert( iContinue!=0 );
+    codeOffset(v, p->iOffset, iContinue);
   }
 
   /* Pull the requested columns.
   */
-  if( nColumn>0 ){
-    nResultCol = nColumn;
-  }else{
-    nResultCol = pEList->nExpr;
-  }
+  nResultCol = pEList->nExpr;
+
   if( pDest->iSdst==0 ){
     pDest->iSdst = pParse->nMem+1;
-    pDest->nSdst = nResultCol;
     pParse->nMem += nResultCol;
-  }else{ 
-    assert( pDest->nSdst==nResultCol );
+  }else if( pDest->iSdst+nResultCol > pParse->nMem ){
+    /* This is an error condition that can result, for example, when a SELECT
+    ** on the right-hand side of an INSERT contains more result columns than
+    ** there are columns in the table on the left.  The error will be caught
+    ** and reported later.  But we need to make sure enough memory is allocated
+    ** to avoid other spurious errors in the meantime. */
+    pParse->nMem += nResultCol;
   }
+  pDest->nSdst = nResultCol;
   regResult = pDest->iSdst;
-  if( nColumn>0 ){
-    for(i=0; i<nColumn; i++){
+  if( srcTab>=0 ){
+    for(i=0; i<nResultCol; i++){
       sqlite3VdbeAddOp3(v, OP_Column, srcTab, i, regResult+i);
+      VdbeComment((v, "%s", pEList->a[i].zName));
     }
   }else if( eDest!=SRT_Exists ){
     /* If the destination is an EXISTS(...) expression, the actual
     ** values returned by the SELECT are not required.
     */
-    sqlite3ExprCacheClear(pParse);
-    sqlite3ExprCodeExprList(pParse, pEList, regResult, eDest==SRT_Output);
+    sqlite3ExprCodeExprList(pParse, pEList, regResult,
+                  (eDest==SRT_Output||eDest==SRT_Coroutine)?SQLITE_ECEL_DUP:0);
   }
-  nColumn = nResultCol;
 
   /* If the DISTINCT keyword was present on the SELECT statement
   ** and this row has been seen before, then do not make this row
   ** part of the result.
   */
   if( hasDistinct ){
-    assert( pEList!=0 );
-    assert( pEList->nExpr==nColumn );
     switch( pDistinct->eTnctType ){
       case WHERE_DISTINCT_ORDERED: {
         VdbeOp *pOp;            /* No longer required OpenEphemeral instr. */
@@ -96689,7 +101275,7 @@ static void selectInnerLoop(
 
         /* Allocate space for the previous row */
         regPrev = pParse->nMem+1;
-        pParse->nMem += nColumn;
+        pParse->nMem += nResultCol;
 
         /* Change the OP_OpenEphemeral coded earlier to an OP_Null
         ** sets the MEM_Cleared bit on the first register of the
@@ -96703,19 +101289,21 @@ static void selectInnerLoop(
         pOp->p1 = 1;
         pOp->p2 = regPrev;
 
-        iJump = sqlite3VdbeCurrentAddr(v) + nColumn;
-        for(i=0; i<nColumn; i++){
+        iJump = sqlite3VdbeCurrentAddr(v) + nResultCol;
+        for(i=0; i<nResultCol; i++){
           CollSeq *pColl = sqlite3ExprCollSeq(pParse, pEList->a[i].pExpr);
-          if( i<nColumn-1 ){
+          if( i<nResultCol-1 ){
             sqlite3VdbeAddOp3(v, OP_Ne, regResult+i, iJump, regPrev+i);
+            VdbeCoverage(v);
           }else{
             sqlite3VdbeAddOp3(v, OP_Eq, regResult+i, iContinue, regPrev+i);
-          }
+            VdbeCoverage(v);
+           }
           sqlite3VdbeChangeP4(v, -1, (const char *)pColl, P4_COLLSEQ);
           sqlite3VdbeChangeP5(v, SQLITE_NULLEQ);
         }
         assert( sqlite3VdbeCurrentAddr(v)==iJump );
-        sqlite3VdbeAddOp3(v, OP_Copy, regResult, regPrev, nColumn-1);
+        sqlite3VdbeAddOp3(v, OP_Copy, regResult, regPrev, nResultCol-1);
         break;
       }
 
@@ -96726,12 +101314,12 @@ static void selectInnerLoop(
 
       default: {
         assert( pDistinct->eTnctType==WHERE_DISTINCT_UNORDERED );
-        codeDistinct(pParse, pDistinct->tabTnct, iContinue, nColumn, regResult);
+        codeDistinct(pParse, pDistinct->tabTnct, iContinue, nResultCol, regResult);
         break;
       }
     }
-    if( pOrderBy==0 ){
-      codeOffset(v, p, iContinue);
+    if( pSort==0 ){
+      codeOffset(v, p->iOffset, iContinue);
     }
   }
 
@@ -96743,7 +101331,7 @@ static void selectInnerLoop(
     case SRT_Union: {
       int r1;
       r1 = sqlite3GetTempReg(pParse);
-      sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nColumn, r1);
+      sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nResultCol, r1);
       sqlite3VdbeAddOp2(v, OP_IdxInsert, iParm, r1);
       sqlite3ReleaseTempReg(pParse, r1);
       break;
@@ -96754,21 +101342,36 @@ static void selectInnerLoop(
     ** the temporary table iParm.
     */
     case SRT_Except: {
-      sqlite3VdbeAddOp3(v, OP_IdxDelete, iParm, regResult, nColumn);
+      sqlite3VdbeAddOp3(v, OP_IdxDelete, iParm, regResult, nResultCol);
       break;
     }
-#endif
+#endif /* SQLITE_OMIT_COMPOUND_SELECT */
 
     /* Store the result as data using a unique key.
     */
+    case SRT_Fifo:
+    case SRT_DistFifo:
     case SRT_Table:
     case SRT_EphemTab: {
       int r1 = sqlite3GetTempReg(pParse);
       testcase( eDest==SRT_Table );
       testcase( eDest==SRT_EphemTab );
-      sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nColumn, r1);
-      if( pOrderBy ){
-        pushOntoSorter(pParse, pOrderBy, p, r1);
+      sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nResultCol, r1);
+#ifndef SQLITE_OMIT_CTE
+      if( eDest==SRT_DistFifo ){
+        /* If the destination is DistFifo, then cursor (iParm+1) is open
+        ** on an ephemeral index. If the current row is already present
+        ** in the index, do not write it to the output. If not, add the
+        ** current row to the index and proceed with writing it to the
+        ** output table as well.  */
+        int addr = sqlite3VdbeCurrentAddr(v) + 4;
+        sqlite3VdbeAddOp4Int(v, OP_Found, iParm+1, addr, r1, 0); VdbeCoverage(v);
+        sqlite3VdbeAddOp2(v, OP_IdxInsert, iParm+1, r1);
+        assert( pSort==0 );
+      }
+#endif
+      if( pSort ){
+        pushOntoSorter(pParse, pSort, p, r1);
       }else{
         int r2 = sqlite3GetTempReg(pParse);
         sqlite3VdbeAddOp2(v, OP_NewRowid, iParm, r2);
@@ -96786,15 +101389,15 @@ static void selectInnerLoop(
     ** item into the set table with bogus data.
     */
     case SRT_Set: {
-      assert( nColumn==1 );
+      assert( nResultCol==1 );
       pDest->affSdst =
                   sqlite3CompareAffinity(pEList->a[0].pExpr, pDest->affSdst);
-      if( pOrderBy ){
+      if( pSort ){
         /* At first glance you would think we could optimize out the
         ** ORDER BY in this case since the order of entries in the set
         ** does not matter.  But there might be a LIMIT clause, in which
         ** case the order does matter */
-        pushOntoSorter(pParse, pOrderBy, p, regResult);
+        pushOntoSorter(pParse, pSort, p, regResult);
       }else{
         int r1 = sqlite3GetTempReg(pParse);
         sqlite3VdbeAddOp4(v, OP_MakeRecord, regResult,1,r1, &pDest->affSdst, 1);
@@ -96818,9 +101421,9 @@ static void selectInnerLoop(
     ** of the scan loop.
     */
     case SRT_Mem: {
-      assert( nColumn==1 );
-      if( pOrderBy ){
-        pushOntoSorter(pParse, pOrderBy, p, regResult);
+      assert( nResultCol==1 );
+      if( pSort ){
+        pushOntoSorter(pParse, pSort, p, regResult);
       }else{
         sqlite3ExprCodeMove(pParse, regResult, iParm, 1);
         /* The LIMIT clause will jump out of the loop for us */
@@ -96829,28 +101432,73 @@ static void selectInnerLoop(
     }
 #endif /* #ifndef SQLITE_OMIT_SUBQUERY */
 
-    /* Send the data to the callback function or to a subroutine.  In the
-    ** case of a subroutine, the subroutine itself is responsible for
-    ** popping the data from the stack.
-    */
-    case SRT_Coroutine:
-    case SRT_Output: {
+    case SRT_Coroutine:       /* Send data to a co-routine */
+    case SRT_Output: {        /* Return the results */
       testcase( eDest==SRT_Coroutine );
       testcase( eDest==SRT_Output );
-      if( pOrderBy ){
+      if( pSort ){
         int r1 = sqlite3GetTempReg(pParse);
-        sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nColumn, r1);
-        pushOntoSorter(pParse, pOrderBy, p, r1);
+        sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nResultCol, r1);
+        pushOntoSorter(pParse, pSort, p, r1);
         sqlite3ReleaseTempReg(pParse, r1);
       }else if( eDest==SRT_Coroutine ){
         sqlite3VdbeAddOp1(v, OP_Yield, pDest->iSDParm);
       }else{
-        sqlite3VdbeAddOp2(v, OP_ResultRow, regResult, nColumn);
-        sqlite3ExprCacheAffinityChange(pParse, regResult, nColumn);
+        sqlite3VdbeAddOp2(v, OP_ResultRow, regResult, nResultCol);
+        sqlite3ExprCacheAffinityChange(pParse, regResult, nResultCol);
       }
       break;
     }
 
+#ifndef SQLITE_OMIT_CTE
+    /* Write the results into a priority queue that is order according to
+    ** pDest->pOrderBy (in pSO).  pDest->iSDParm (in iParm) is the cursor for an
+    ** index with pSO->nExpr+2 columns.  Build a key using pSO for the first
+    ** pSO->nExpr columns, then make sure all keys are unique by adding a
+    ** final OP_Sequence column.  The last column is the record as a blob.
+    */
+    case SRT_DistQueue:
+    case SRT_Queue: {
+      int nKey;
+      int r1, r2, r3;
+      int addrTest = 0;
+      ExprList *pSO;
+      pSO = pDest->pOrderBy;
+      assert( pSO );
+      nKey = pSO->nExpr;
+      r1 = sqlite3GetTempReg(pParse);
+      r2 = sqlite3GetTempRange(pParse, nKey+2);
+      r3 = r2+nKey+1;
+      if( eDest==SRT_DistQueue ){
+        /* If the destination is DistQueue, then cursor (iParm+1) is open
+        ** on a second ephemeral index that holds all values every previously
+        ** added to the queue. */
+        addrTest = sqlite3VdbeAddOp4Int(v, OP_Found, iParm+1, 0, 
+                                        regResult, nResultCol);
+        VdbeCoverage(v);
+      }
+      sqlite3VdbeAddOp3(v, OP_MakeRecord, regResult, nResultCol, r3);
+      if( eDest==SRT_DistQueue ){
+        sqlite3VdbeAddOp2(v, OP_IdxInsert, iParm+1, r3);
+        sqlite3VdbeChangeP5(v, OPFLAG_USESEEKRESULT);
+      }
+      for(i=0; i<nKey; i++){
+        sqlite3VdbeAddOp2(v, OP_SCopy,
+                          regResult + pSO->a[i].u.x.iOrderByCol - 1,
+                          r2+i);
+      }
+      sqlite3VdbeAddOp2(v, OP_Sequence, iParm, r2+nKey);
+      sqlite3VdbeAddOp3(v, OP_MakeRecord, r2, nKey+2, r1);
+      sqlite3VdbeAddOp2(v, OP_IdxInsert, iParm, r1);
+      if( addrTest ) sqlite3VdbeJumpHere(v, addrTest);
+      sqlite3ReleaseTempReg(pParse, r1);
+      sqlite3ReleaseTempRange(pParse, r2, nKey+2);
+      break;
+    }
+#endif /* SQLITE_OMIT_CTE */
+
+
+
 #if !defined(SQLITE_OMIT_TRIGGER)
     /* Discard the results.  This is used for SELECT statements inside
     ** the body of a TRIGGER.  The purpose of such selects is to call
@@ -96868,11 +101516,63 @@ static void selectInnerLoop(
   ** there is a sorter, in which case the sorter has already limited
   ** the output for us.
   */
-  if( pOrderBy==0 && p->iLimit ){
-    sqlite3VdbeAddOp3(v, OP_IfZero, p->iLimit, iBreak, -1);
+  if( pSort==0 && p->iLimit ){
+    sqlite3VdbeAddOp3(v, OP_IfZero, p->iLimit, iBreak, -1); VdbeCoverage(v);
   }
 }
 
+/*
+** Allocate a KeyInfo object sufficient for an index of N key columns and
+** X extra columns.
+*/
+SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoAlloc(sqlite3 *db, int N, int X){
+  KeyInfo *p = sqlite3DbMallocZero(0, 
+                   sizeof(KeyInfo) + (N+X)*(sizeof(CollSeq*)+1));
+  if( p ){
+    p->aSortOrder = (u8*)&p->aColl[N+X];
+    p->nField = (u16)N;
+    p->nXField = (u16)X;
+    p->enc = ENC(db);
+    p->db = db;
+    p->nRef = 1;
+  }else{
+    db->mallocFailed = 1;
+  }
+  return p;
+}
+
+/*
+** Deallocate a KeyInfo object
+*/
+SQLITE_PRIVATE void sqlite3KeyInfoUnref(KeyInfo *p){
+  if( p ){
+    assert( p->nRef>0 );
+    p->nRef--;
+    if( p->nRef==0 ) sqlite3DbFree(0, p);
+  }
+}
+
+/*
+** Make a new pointer to a KeyInfo object
+*/
+SQLITE_PRIVATE KeyInfo *sqlite3KeyInfoRef(KeyInfo *p){
+  if( p ){
+    assert( p->nRef>0 );
+    p->nRef++;
+  }
+  return p;
+}
+
+#ifdef SQLITE_DEBUG
+/*
+** Return TRUE if a KeyInfo object can be change.  The KeyInfo object
+** can only be changed if this is just a single reference to the object.
+**
+** This routine is used only inside of assert() statements.
+*/
+SQLITE_PRIVATE int sqlite3KeyInfoIsWriteable(KeyInfo *p){ return p->nRef==1; }
+#endif /* SQLITE_DEBUG */
+
 /*
 ** Given an expression list, generate a KeyInfo structure that records
 ** the collating sequence for each expression in that expression list.
@@ -96885,31 +101585,30 @@ static void selectInnerLoop(
 **
 ** Space to hold the KeyInfo structure is obtain from malloc.  The calling
 ** function is responsible for seeing that this structure is eventually
-** freed.  Add the KeyInfo structure to the P4 field of an opcode using
-** P4_KEYINFO_HANDOFF is the usual way of dealing with this.
+** freed.
 */
-static KeyInfo *keyInfoFromExprList(Parse *pParse, ExprList *pList){
-  sqlite3 *db = pParse->db;
+static KeyInfo *keyInfoFromExprList(
+  Parse *pParse,       /* Parsing context */
+  ExprList *pList,     /* Form the KeyInfo object from this ExprList */
+  int iStart,          /* Begin with this column of pList */
+  int nExtra           /* Add this many extra columns to the end */
+){
   int nExpr;
   KeyInfo *pInfo;
   struct ExprList_item *pItem;
+  sqlite3 *db = pParse->db;
   int i;
 
   nExpr = pList->nExpr;
-  pInfo = sqlite3DbMallocZero(db, sizeof(*pInfo) + nExpr*(sizeof(CollSeq*)+1) );
+  pInfo = sqlite3KeyInfoAlloc(db, nExpr+nExtra-iStart, 1);
   if( pInfo ){
-    pInfo->aSortOrder = (u8*)&pInfo->aColl[nExpr];
-    pInfo->nField = (u16)nExpr;
-    pInfo->enc = ENC(db);
-    pInfo->db = db;
-    for(i=0, pItem=pList->a; i<nExpr; i++, pItem++){
+    assert( sqlite3KeyInfoIsWriteable(pInfo) );
+    for(i=iStart, pItem=pList->a+iStart; i<nExpr; i++, pItem++){
       CollSeq *pColl;
       pColl = sqlite3ExprCollSeq(pParse, pItem->pExpr);
-      if( !pColl ){
-        pColl = db->pDfltColl;
-      }
-      pInfo->aColl[i] = pColl;
-      pInfo->aSortOrder[i] = pItem->sortOrder;
+      if( !pColl ) pColl = db->pDfltColl;
+      pInfo->aColl[i-iStart] = pColl;
+      pInfo->aSortOrder[i-iStart] = pItem->sortOrder;
     }
   }
   return pInfo;
@@ -97011,24 +101710,31 @@ static void explainComposite(
 static void generateSortTail(
   Parse *pParse,    /* Parsing context */
   Select *p,        /* The SELECT statement */
-  Vdbe *v,          /* Generate code into this VDBE */
+  SortCtx *pSort,   /* Information on the ORDER BY clause */
   int nColumn,      /* Number of columns of data */
   SelectDest *pDest /* Write the sorted results here */
 ){
+  Vdbe *v = pParse->pVdbe;                     /* The prepared statement */
   int addrBreak = sqlite3VdbeMakeLabel(v);     /* Jump here to exit loop */
   int addrContinue = sqlite3VdbeMakeLabel(v);  /* Jump here for next cycle */
   int addr;
+  int addrOnce = 0;
   int iTab;
   int pseudoTab = 0;
-  ExprList *pOrderBy = p->pOrderBy;
-
+  ExprList *pOrderBy = pSort->pOrderBy;
   int eDest = pDest->eDest;
   int iParm = pDest->iSDParm;
-
   int regRow;
   int regRowid;
+  int nKey;
 
-  iTab = pOrderBy->iECursor;
+  if( pSort->labelBkOut ){
+    sqlite3VdbeAddOp2(v, OP_Gosub, pSort->regReturn, pSort->labelBkOut);
+    sqlite3VdbeAddOp2(v, OP_Goto, 0, addrBreak);
+    sqlite3VdbeResolveLabel(v, pSort->labelBkOut);
+    addrOnce = sqlite3CodeOnce(pParse); VdbeCoverage(v);
+  }
+  iTab = pSort->iECursor;
   regRow = sqlite3GetTempReg(pParse);
   if( eDest==SRT_Output || eDest==SRT_Coroutine ){
     pseudoTab = pParse->nTab++;
@@ -97037,19 +101743,23 @@ static void generateSortTail(
   }else{
     regRowid = sqlite3GetTempReg(pParse);
   }
-  if( p->selFlags & SF_UseSorter ){
+  nKey = pOrderBy->nExpr - pSort->nOBSat;
+  if( pSort->sortFlags & SORTFLAG_UseSorter ){
     int regSortOut = ++pParse->nMem;
     int ptab2 = pParse->nTab++;
-    sqlite3VdbeAddOp3(v, OP_OpenPseudo, ptab2, regSortOut, pOrderBy->nExpr+2);
+    sqlite3VdbeAddOp3(v, OP_OpenPseudo, ptab2, regSortOut, nKey+2);
+    if( addrOnce ) sqlite3VdbeJumpHere(v, addrOnce);
     addr = 1 + sqlite3VdbeAddOp2(v, OP_SorterSort, iTab, addrBreak);
-    codeOffset(v, p, addrContinue);
+    VdbeCoverage(v);
+    codeOffset(v, p->iOffset, addrContinue);
     sqlite3VdbeAddOp2(v, OP_SorterData, iTab, regSortOut);
-    sqlite3VdbeAddOp3(v, OP_Column, ptab2, pOrderBy->nExpr+1, regRow);
+    sqlite3VdbeAddOp3(v, OP_Column, ptab2, nKey+1, regRow);
     sqlite3VdbeChangeP5(v, OPFLAG_CLEARCACHE);
   }else{
-    addr = 1 + sqlite3VdbeAddOp2(v, OP_Sort, iTab, addrBreak);
-    codeOffset(v, p, addrContinue);
-    sqlite3VdbeAddOp3(v, OP_Column, iTab, pOrderBy->nExpr+1, regRow);
+    if( addrOnce ) sqlite3VdbeJumpHere(v, addrOnce);
+    addr = 1 + sqlite3VdbeAddOp2(v, OP_Sort, iTab, addrBreak); VdbeCoverage(v);
+    codeOffset(v, p->iOffset, addrContinue);
+    sqlite3VdbeAddOp3(v, OP_Column, iTab, nKey+1, regRow);
   }
   switch( eDest ){
     case SRT_Table:
@@ -97104,21 +101814,22 @@ static void generateSortTail(
   /* The bottom of the loop
   */
   sqlite3VdbeResolveLabel(v, addrContinue);
-  if( p->selFlags & SF_UseSorter ){
-    sqlite3VdbeAddOp2(v, OP_SorterNext, iTab, addr);
+  if( pSort->sortFlags & SORTFLAG_UseSorter ){
+    sqlite3VdbeAddOp2(v, OP_SorterNext, iTab, addr); VdbeCoverage(v);
   }else{
-    sqlite3VdbeAddOp2(v, OP_Next, iTab, addr);
+    sqlite3VdbeAddOp2(v, OP_Next, iTab, addr); VdbeCoverage(v);
   }
+  if( pSort->regReturn ) sqlite3VdbeAddOp1(v, OP_Return, pSort->regReturn);
   sqlite3VdbeResolveLabel(v, addrBreak);
-  if( eDest==SRT_Output || eDest==SRT_Coroutine ){
-    sqlite3VdbeAddOp2(v, OP_Close, pseudoTab, 0);
-  }
 }
 
 /*
 ** Return a pointer to a string containing the 'declaration type' of the
 ** expression pExpr. The string may be treated as static by the caller.
 **
+** Also try to estimate the size of the returned value and return that
+** result in *pEstWidth.
+**
 ** The declaration type is the exact datatype definition extracted from the
 ** original CREATE TABLE statement if the expression is a column. The
 ** declaration type for a ROWID field is INTEGER. Exactly when an expression
@@ -97132,21 +101843,36 @@ static void generateSortTail(
 **   SELECT abc FROM (SELECT col AS abc FROM tbl);
 ** 
 ** The declaration type for any expression other than a column is NULL.
+**
+** This routine has either 3 or 6 parameters depending on whether or not
+** the SQLITE_ENABLE_COLUMN_METADATA compile-time option is used.
 */
-static const char *columnType(
+#ifdef SQLITE_ENABLE_COLUMN_METADATA
+# define columnType(A,B,C,D,E,F) columnTypeImpl(A,B,C,D,E,F)
+static const char *columnTypeImpl(
   NameContext *pNC, 
   Expr *pExpr,
-  const char **pzOriginDb,
-  const char **pzOriginTab,
-  const char **pzOriginCol
+  const char **pzOrigDb,
+  const char **pzOrigTab,
+  const char **pzOrigCol,
+  u8 *pEstWidth
 ){
+  char const *zOrigDb = 0;
+  char const *zOrigTab = 0;
+  char const *zOrigCol = 0;
+#else /* if !defined(SQLITE_ENABLE_COLUMN_METADATA) */
+# define columnType(A,B,C,D,E,F) columnTypeImpl(A,B,F)
+static const char *columnTypeImpl(
+  NameContext *pNC, 
+  Expr *pExpr,
+  u8 *pEstWidth
+){
+#endif /* !defined(SQLITE_ENABLE_COLUMN_METADATA) */
   char const *zType = 0;
-  char const *zOriginDb = 0;
-  char const *zOriginTab = 0;
-  char const *zOriginCol = 0;
   int j;
-  if( NEVER(pExpr==0) || pNC->pSrcList==0 ) return 0;
+  u8 estWidth = 1;
 
+  if( NEVER(pExpr==0) || pNC->pSrcList==0 ) return 0;
   switch( pExpr->op ){
     case TK_AGG_COLUMN:
     case TK_COLUMN: {
@@ -97207,25 +101933,35 @@ static const char *columnType(
           sNC.pSrcList = pS->pSrc;
           sNC.pNext = pNC;
           sNC.pParse = pNC->pParse;
-          zType = columnType(&sNC, p, &zOriginDb, &zOriginTab, &zOriginCol); 
+          zType = columnType(&sNC, p,&zOrigDb,&zOrigTab,&zOrigCol, &estWidth); 
         }
-      }else if( ALWAYS(pTab->pSchema) ){
+      }else if( pTab->pSchema ){
         /* A real table */
         assert( !pS );
         if( iCol<0 ) iCol = pTab->iPKey;
         assert( iCol==-1 || (iCol>=0 && iCol<pTab->nCol) );
+#ifdef SQLITE_ENABLE_COLUMN_METADATA
         if( iCol<0 ){
           zType = "INTEGER";
-          zOriginCol = "rowid";
+          zOrigCol = "rowid";
         }else{
           zType = pTab->aCol[iCol].zType;
-          zOriginCol = pTab->aCol[iCol].zName;
+          zOrigCol = pTab->aCol[iCol].zName;
+          estWidth = pTab->aCol[iCol].szEst;
         }
-        zOriginTab = pTab->zName;
+        zOrigTab = pTab->zName;
         if( pNC->pParse ){
           int iDb = sqlite3SchemaToIndex(pNC->pParse->db, pTab->pSchema);
-          zOriginDb = pNC->pParse->db->aDb[iDb].zName;
+          zOrigDb = pNC->pParse->db->aDb[iDb].zName;
         }
+#else
+        if( iCol<0 ){
+          zType = "INTEGER";
+        }else{
+          zType = pTab->aCol[iCol].zType;
+          estWidth = pTab->aCol[iCol].szEst;
+        }
+#endif
       }
       break;
     }
@@ -97242,18 +101978,21 @@ static const char *columnType(
       sNC.pSrcList = pS->pSrc;
       sNC.pNext = pNC;
       sNC.pParse = pNC->pParse;
-      zType = columnType(&sNC, p, &zOriginDb, &zOriginTab, &zOriginCol); 
+      zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol, &estWidth); 
       break;
     }
 #endif
   }
-  
-  if( pzOriginDb ){
-    assert( pzOriginTab && pzOriginCol );
-    *pzOriginDb = zOriginDb;
-    *pzOriginTab = zOriginTab;
-    *pzOriginCol = zOriginCol;
+
+#ifdef SQLITE_ENABLE_COLUMN_METADATA  
+  if( pzOrigDb ){
+    assert( pzOrigTab && pzOrigCol );
+    *pzOrigDb = zOrigDb;
+    *pzOrigTab = zOrigTab;
+    *pzOrigCol = zOrigCol;
   }
+#endif
+  if( pEstWidth ) *pEstWidth = estWidth;
   return zType;
 }
 
@@ -97279,7 +102018,7 @@ static void generateColumnTypes(
     const char *zOrigDb = 0;
     const char *zOrigTab = 0;
     const char *zOrigCol = 0;
-    zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol);
+    zType = columnType(&sNC, p, &zOrigDb, &zOrigTab, &zOrigCol, 0);
 
     /* The vdbe must make its own copy of the column-type and other 
     ** column specific strings, in case the schema is reset before this
@@ -97289,11 +102028,11 @@ static void generateColumnTypes(
     sqlite3VdbeSetColName(v, i, COLNAME_TABLE, zOrigTab, SQLITE_TRANSIENT);
     sqlite3VdbeSetColName(v, i, COLNAME_COLUMN, zOrigCol, SQLITE_TRANSIENT);
 #else
-    zType = columnType(&sNC, p, 0, 0, 0);
+    zType = columnType(&sNC, p, 0, 0, 0, 0);
 #endif
     sqlite3VdbeSetColName(v, i, COLNAME_DECLTYPE, zType, SQLITE_TRANSIENT);
   }
-#endif /* SQLITE_OMIT_DECLTYPE */
+#endif /* !defined(SQLITE_OMIT_DECLTYPE) */
 }
 
 /*
@@ -97357,8 +102096,9 @@ static void generateColumnNames(
         sqlite3VdbeSetColName(v, i, COLNAME_NAME, zCol, SQLITE_TRANSIENT);
       }
     }else{
-      sqlite3VdbeSetColName(v, i, COLNAME_NAME, 
-          sqlite3DbStrDup(db, pEList->a[i].zSpan), SQLITE_DYNAMIC);
+      const char *z = pEList->a[i].zSpan;
+      z = z==0 ? sqlite3MPrintf(db, "column%d", i+1) : sqlite3DbStrDup(db, z);
+      sqlite3VdbeSetColName(v, i, COLNAME_NAME, z, SQLITE_DYNAMIC);
     }
   }
   generateColumnTypes(pParse, pTabList, pEList);
@@ -97446,7 +102186,7 @@ static int selectColumnsFromExprList(
         char *zNewName;
         int k;
         for(k=nName-1; k>1 && sqlite3Isdigit(zName[k]); k--){}
-        if( zName[k]==':' ) nName = k;
+        if( k>=0 && zName[k]==':' ) nName = k;
         zName[nName] = 0;
         zNewName = sqlite3MPrintf(db, "%s:%d", zName, ++cnt);
         sqlite3DbFree(db, zName);
@@ -97482,8 +102222,7 @@ static int selectColumnsFromExprList(
 */
 static void selectAddColumnTypeAndCollation(
   Parse *pParse,        /* Parsing contexts */
-  int nCol,             /* Number of columns */
-  Column *aCol,         /* List of columns */
+  Table *pTab,          /* Add column type information to this table */
   Select *pSelect       /* SELECT used to determine types and collations */
 ){
   sqlite3 *db = pParse->db;
@@ -97493,17 +102232,19 @@ static void selectAddColumnTypeAndCollation(
   int i;
   Expr *p;
   struct ExprList_item *a;
+  u64 szAll = 0;
 
   assert( pSelect!=0 );
   assert( (pSelect->selFlags & SF_Resolved)!=0 );
-  assert( nCol==pSelect->pEList->nExpr || db->mallocFailed );
+  assert( pTab->nCol==pSelect->pEList->nExpr || db->mallocFailed );
   if( db->mallocFailed ) return;
   memset(&sNC, 0, sizeof(sNC));
   sNC.pSrcList = pSelect->pSrc;
   a = pSelect->pEList->a;
-  for(i=0, pCol=aCol; i<nCol; i++, pCol++){
+  for(i=0, pCol=pTab->aCol; i<pTab->nCol; i++, pCol++){
     p = a[i].pExpr;
-    pCol->zType = sqlite3DbStrDup(db, columnType(&sNC, p, 0, 0, 0));
+    pCol->zType = sqlite3DbStrDup(db, columnType(&sNC, p,0,0,0, &pCol->szEst));
+    szAll += pCol->szEst;
     pCol->affinity = sqlite3ExprAffinity(p);
     if( pCol->affinity==0 ) pCol->affinity = SQLITE_AFF_NONE;
     pColl = sqlite3ExprCollSeq(pParse, p);
@@ -97511,6 +102252,7 @@ static void selectAddColumnTypeAndCollation(
       pCol->zColl = sqlite3DbStrDup(db, pColl->zName);
     }
   }
+  pTab->szTabRow = sqlite3LogEst(szAll*4);
 }
 
 /*
@@ -97538,9 +102280,9 @@ SQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse *pParse, Select *pSelect){
   assert( db->lookaside.bEnabled==0 );
   pTab->nRef = 1;
   pTab->zName = 0;
-  pTab->nRowEst = 1000000;
+  pTab->nRowLogEst = 200; assert( 200==sqlite3LogEst(1048576) );
   selectColumnsFromExprList(pParse, pSelect->pEList, &pTab->nCol, &pTab->aCol);
-  selectAddColumnTypeAndCollation(pParse, pTab->nCol, pTab->aCol, pSelect);
+  selectAddColumnTypeAndCollation(pParse, pTab, pSelect);
   pTab->iPKey = -1;
   if( db->mallocFailed ){
     sqlite3DeleteTable(db, pTab);
@@ -97556,12 +102298,14 @@ SQLITE_PRIVATE Table *sqlite3ResultSetOfSelect(Parse *pParse, Select *pSelect){
 SQLITE_PRIVATE Vdbe *sqlite3GetVdbe(Parse *pParse){
   Vdbe *v = pParse->pVdbe;
   if( v==0 ){
-    v = pParse->pVdbe = sqlite3VdbeCreate(pParse->db);
-#ifndef SQLITE_OMIT_TRACE
-    if( v ){
-      sqlite3VdbeAddOp0(v, OP_Trace);
+    v = pParse->pVdbe = sqlite3VdbeCreate(pParse);
+    if( v ) sqlite3VdbeAddOp0(v, OP_Init);
+    if( pParse->pToplevel==0
+     && OptimizationEnabled(pParse->db,SQLITE_FactorOutConst)
+    ){
+      pParse->okConstFactor = 1;
     }
-#endif
+
   }
   return v;
 }
@@ -97578,8 +102322,13 @@ SQLITE_PRIVATE Vdbe *sqlite3GetVdbe(Parse *pParse){
 **
 ** This routine changes the values of iLimit and iOffset only if
 ** a limit or offset is defined by pLimit and pOffset.  iLimit and
-** iOffset should have been preset to appropriate default values
-** (usually but not always -1) prior to calling this routine.
+** iOffset should have been preset to appropriate default values (zero)
+** prior to calling this routine.
+**
+** The iOffset register (if it exists) is initialized to the value
+** of the OFFSET.  The iLimit register is initialized to LIMIT.  Register
+** iOffset+1 is initialized to LIMIT+OFFSET.
+**
 ** Only if pLimit!=0 or pOffset!=0 do the limit registers get
 ** redefined.  The UNION ALL operator uses this property to force
 ** the reuse of the same limit and offset registers across multiple
@@ -97594,7 +102343,7 @@ static void computeLimitRegisters(Parse *pParse, Select *p, int iBreak){
 
   /* 
   ** "LIMIT -1" always shows all rows.  There is some
-  ** contraversy about what the correct behavior should be.
+  ** controversy about what the correct behavior should be.
   ** The current implementation interprets "LIMIT 0" to mean
   ** no rows.
   */
@@ -97603,33 +102352,33 @@ static void computeLimitRegisters(Parse *pParse, Select *p, int iBreak){
   if( p->pLimit ){
     p->iLimit = iLimit = ++pParse->nMem;
     v = sqlite3GetVdbe(pParse);
-    if( NEVER(v==0) ) return;  /* VDBE should have already been allocated */
+    assert( v!=0 );
     if( sqlite3ExprIsInteger(p->pLimit, &n) ){
       sqlite3VdbeAddOp2(v, OP_Integer, n, iLimit);
       VdbeComment((v, "LIMIT counter"));
       if( n==0 ){
         sqlite3VdbeAddOp2(v, OP_Goto, 0, iBreak);
-      }else{
-        if( p->nSelectRow > (double)n ) p->nSelectRow = (double)n;
+      }else if( n>=0 && p->nSelectRow>(u64)n ){
+        p->nSelectRow = n;
       }
     }else{
       sqlite3ExprCode(pParse, p->pLimit, iLimit);
-      sqlite3VdbeAddOp1(v, OP_MustBeInt, iLimit);
+      sqlite3VdbeAddOp1(v, OP_MustBeInt, iLimit); VdbeCoverage(v);
       VdbeComment((v, "LIMIT counter"));
-      sqlite3VdbeAddOp2(v, OP_IfZero, iLimit, iBreak);
+      sqlite3VdbeAddOp2(v, OP_IfZero, iLimit, iBreak); VdbeCoverage(v);
     }
     if( p->pOffset ){
       p->iOffset = iOffset = ++pParse->nMem;
       pParse->nMem++;   /* Allocate an extra register for limit+offset */
       sqlite3ExprCode(pParse, p->pOffset, iOffset);
-      sqlite3VdbeAddOp1(v, OP_MustBeInt, iOffset);
+      sqlite3VdbeAddOp1(v, OP_MustBeInt, iOffset); VdbeCoverage(v);
       VdbeComment((v, "OFFSET counter"));
-      addr1 = sqlite3VdbeAddOp1(v, OP_IfPos, iOffset);
+      addr1 = sqlite3VdbeAddOp1(v, OP_IfPos, iOffset); VdbeCoverage(v);
       sqlite3VdbeAddOp2(v, OP_Integer, 0, iOffset);
       sqlite3VdbeJumpHere(v, addr1);
       sqlite3VdbeAddOp3(v, OP_Add, iLimit, iOffset, iOffset+1);
       VdbeComment((v, "LIMIT+OFFSET"));
-      addr1 = sqlite3VdbeAddOp1(v, OP_IfPos, iLimit);
+      addr1 = sqlite3VdbeAddOp1(v, OP_IfPos, iLimit); VdbeCoverage(v);
       sqlite3VdbeAddOp2(v, OP_Integer, -1, iOffset+1);
       sqlite3VdbeJumpHere(v, addr1);
     }
@@ -97658,9 +102407,210 @@ static CollSeq *multiSelectCollSeq(Parse *pParse, Select *p, int iCol){
   }
   return pRet;
 }
-#endif /* SQLITE_OMIT_COMPOUND_SELECT */
 
-/* Forward reference */
+/*
+** The select statement passed as the second parameter is a compound SELECT
+** with an ORDER BY clause. This function allocates and returns a KeyInfo
+** structure suitable for implementing the ORDER BY.
+**
+** Space to hold the KeyInfo structure is obtained from malloc. The calling
+** function is responsible for ensuring that this structure is eventually
+** freed.
+*/
+static KeyInfo *multiSelectOrderByKeyInfo(Parse *pParse, Select *p, int nExtra){
+  ExprList *pOrderBy = p->pOrderBy;
+  int nOrderBy = p->pOrderBy->nExpr;
+  sqlite3 *db = pParse->db;
+  KeyInfo *pRet = sqlite3KeyInfoAlloc(db, nOrderBy+nExtra, 1);
+  if( pRet ){
+    int i;
+    for(i=0; i<nOrderBy; i++){
+      struct ExprList_item *pItem = &pOrderBy->a[i];
+      Expr *pTerm = pItem->pExpr;
+      CollSeq *pColl;
+
+      if( pTerm->flags & EP_Collate ){
+        pColl = sqlite3ExprCollSeq(pParse, pTerm);
+      }else{
+        pColl = multiSelectCollSeq(pParse, p, pItem->u.x.iOrderByCol-1);
+        if( pColl==0 ) pColl = db->pDfltColl;
+        pOrderBy->a[i].pExpr =
+          sqlite3ExprAddCollateString(pParse, pTerm, pColl->zName);
+      }
+      assert( sqlite3KeyInfoIsWriteable(pRet) );
+      pRet->aColl[i] = pColl;
+      pRet->aSortOrder[i] = pOrderBy->a[i].sortOrder;
+    }
+  }
+
+  return pRet;
+}
+
+#ifndef SQLITE_OMIT_CTE
+/*
+** This routine generates VDBE code to compute the content of a WITH RECURSIVE
+** query of the form:
+**
+**   <recursive-table> AS (<setup-query> UNION [ALL] <recursive-query>)
+**                         \___________/             \_______________/
+**                           p->pPrior                      p
+**
+**
+** There is exactly one reference to the recursive-table in the FROM clause
+** of recursive-query, marked with the SrcList->a[].isRecursive flag.
+**
+** The setup-query runs once to generate an initial set of rows that go
+** into a Queue table.  Rows are extracted from the Queue table one by
+** one.  Each row extracted from Queue is output to pDest.  Then the single
+** extracted row (now in the iCurrent table) becomes the content of the
+** recursive-table for a recursive-query run.  The output of the recursive-query
+** is added back into the Queue table.  Then another row is extracted from Queue
+** and the iteration continues until the Queue table is empty.
+**
+** If the compound query operator is UNION then no duplicate rows are ever
+** inserted into the Queue table.  The iDistinct table keeps a copy of all rows
+** that have ever been inserted into Queue and causes duplicates to be
+** discarded.  If the operator is UNION ALL, then duplicates are allowed.
+** 
+** If the query has an ORDER BY, then entries in the Queue table are kept in
+** ORDER BY order and the first entry is extracted for each cycle.  Without
+** an ORDER BY, the Queue table is just a FIFO.
+**
+** If a LIMIT clause is provided, then the iteration stops after LIMIT rows
+** have been output to pDest.  A LIMIT of zero means to output no rows and a
+** negative LIMIT means to output all rows.  If there is also an OFFSET clause
+** with a positive value, then the first OFFSET outputs are discarded rather
+** than being sent to pDest.  The LIMIT count does not begin until after OFFSET
+** rows have been skipped.
+*/
+static void generateWithRecursiveQuery(
+  Parse *pParse,        /* Parsing context */
+  Select *p,            /* The recursive SELECT to be coded */
+  SelectDest *pDest     /* What to do with query results */
+){
+  SrcList *pSrc = p->pSrc;      /* The FROM clause of the recursive query */
+  int nCol = p->pEList->nExpr;  /* Number of columns in the recursive table */
+  Vdbe *v = pParse->pVdbe;      /* The prepared statement under construction */
+  Select *pSetup = p->pPrior;   /* The setup query */
+  int addrTop;                  /* Top of the loop */
+  int addrCont, addrBreak;      /* CONTINUE and BREAK addresses */
+  int iCurrent = 0;             /* The Current table */
+  int regCurrent;               /* Register holding Current table */
+  int iQueue;                   /* The Queue table */
+  int iDistinct = 0;            /* To ensure unique results if UNION */
+  int eDest = SRT_Fifo;         /* How to write to Queue */
+  SelectDest destQueue;         /* SelectDest targetting the Queue table */
+  int i;                        /* Loop counter */
+  int rc;                       /* Result code */
+  ExprList *pOrderBy;           /* The ORDER BY clause */
+  Expr *pLimit, *pOffset;       /* Saved LIMIT and OFFSET */
+  int regLimit, regOffset;      /* Registers used by LIMIT and OFFSET */
+
+  /* Obtain authorization to do a recursive query */
+  if( sqlite3AuthCheck(pParse, SQLITE_RECURSIVE, 0, 0, 0) ) return;
+
+  /* Process the LIMIT and OFFSET clauses, if they exist */
+  addrBreak = sqlite3VdbeMakeLabel(v);
+  computeLimitRegisters(pParse, p, addrBreak);
+  pLimit = p->pLimit;
+  pOffset = p->pOffset;
+  regLimit = p->iLimit;
+  regOffset = p->iOffset;
+  p->pLimit = p->pOffset = 0;
+  p->iLimit = p->iOffset = 0;
+  pOrderBy = p->pOrderBy;
+
+  /* Locate the cursor number of the Current table */
+  for(i=0; ALWAYS(i<pSrc->nSrc); i++){
+    if( pSrc->a[i].isRecursive ){
+      iCurrent = pSrc->a[i].iCursor;
+      break;
+    }
+  }
+
+  /* Allocate cursors numbers for Queue and Distinct.  The cursor number for
+  ** the Distinct table must be exactly one greater than Queue in order
+  ** for the SRT_DistFifo and SRT_DistQueue destinations to work. */
+  iQueue = pParse->nTab++;
+  if( p->op==TK_UNION ){
+    eDest = pOrderBy ? SRT_DistQueue : SRT_DistFifo;
+    iDistinct = pParse->nTab++;
+  }else{
+    eDest = pOrderBy ? SRT_Queue : SRT_Fifo;
+  }
+  sqlite3SelectDestInit(&destQueue, eDest, iQueue);
+
+  /* Allocate cursors for Current, Queue, and Distinct. */
+  regCurrent = ++pParse->nMem;
+  sqlite3VdbeAddOp3(v, OP_OpenPseudo, iCurrent, regCurrent, nCol);
+  if( pOrderBy ){
+    KeyInfo *pKeyInfo = multiSelectOrderByKeyInfo(pParse, p, 1);
+    sqlite3VdbeAddOp4(v, OP_OpenEphemeral, iQueue, pOrderBy->nExpr+2, 0,
+                      (char*)pKeyInfo, P4_KEYINFO);
+    destQueue.pOrderBy = pOrderBy;
+  }else{
+    sqlite3VdbeAddOp2(v, OP_OpenEphemeral, iQueue, nCol);
+  }
+  VdbeComment((v, "Queue table"));
+  if( iDistinct ){
+    p->addrOpenEphm[0] = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, iDistinct, 0);
+    p->selFlags |= SF_UsesEphemeral;
+  }
+
+  /* Detach the ORDER BY clause from the compound SELECT */
+  p->pOrderBy = 0;
+
+  /* Store the results of the setup-query in Queue. */
+  pSetup->pNext = 0;
+  rc = sqlite3Select(pParse, pSetup, &destQueue);
+  pSetup->pNext = p;
+  if( rc ) goto end_of_recursive_query;
+
+  /* Find the next row in the Queue and output that row */
+  addrTop = sqlite3VdbeAddOp2(v, OP_Rewind, iQueue, addrBreak); VdbeCoverage(v);
+
+  /* Transfer the next row in Queue over to Current */
+  sqlite3VdbeAddOp1(v, OP_NullRow, iCurrent); /* To reset column cache */
+  if( pOrderBy ){
+    sqlite3VdbeAddOp3(v, OP_Column, iQueue, pOrderBy->nExpr+1, regCurrent);
+  }else{
+    sqlite3VdbeAddOp2(v, OP_RowData, iQueue, regCurrent);
+  }
+  sqlite3VdbeAddOp1(v, OP_Delete, iQueue);
+
+  /* Output the single row in Current */
+  addrCont = sqlite3VdbeMakeLabel(v);
+  codeOffset(v, regOffset, addrCont);
+  selectInnerLoop(pParse, p, p->pEList, iCurrent,
+      0, 0, pDest, addrCont, addrBreak);
+  if( regLimit ){
+    sqlite3VdbeAddOp3(v, OP_IfZero, regLimit, addrBreak, -1);
+    VdbeCoverage(v);
+  }
+  sqlite3VdbeResolveLabel(v, addrCont);
+
+  /* Execute the recursive SELECT taking the single row in Current as
+  ** the value for the recursive-table. Store the results in the Queue.
+  */
+  p->pPrior = 0;
+  sqlite3Select(pParse, p, &destQueue);
+  assert( p->pPrior==0 );
+  p->pPrior = pSetup;
+
+  /* Keep running the loop until the Queue is empty */
+  sqlite3VdbeAddOp2(v, OP_Goto, 0, addrTop);
+  sqlite3VdbeResolveLabel(v, addrBreak);
+
+end_of_recursive_query:
+  sqlite3ExprListDelete(pParse->db, p->pOrderBy);
+  p->pOrderBy = pOrderBy;
+  p->pLimit = pLimit;
+  p->pOffset = pOffset;
+  return;
+}
+#endif /* SQLITE_OMIT_CTE */
+
+/* Forward references */
 static int multiSelectOrderBy(
   Parse *pParse,        /* Parsing context */
   Select *p,            /* The right-most of SELECTs to be coded */
@@ -97668,7 +102618,6 @@ static int multiSelectOrderBy(
 );
 
 
-#ifndef SQLITE_OMIT_COMPOUND_SELECT
 /*
 ** This routine is called to process a compound query form from
 ** two or more separate queries using UNION, UNION ALL, EXCEPT, or
@@ -97712,18 +102661,17 @@ static int multiSelect(
   Select *pDelete = 0;  /* Chain of simple selects to delete */
   sqlite3 *db;          /* Database connection */
 #ifndef SQLITE_OMIT_EXPLAIN
-  int iSub1;            /* EQP id of left-hand query */
-  int iSub2;            /* EQP id of right-hand query */
+  int iSub1 = 0;        /* EQP id of left-hand query */
+  int iSub2 = 0;        /* EQP id of right-hand query */
 #endif
 
   /* Make sure there is no ORDER BY or LIMIT clause on prior SELECTs.  Only
   ** the last (right-most) SELECT in the series may have an ORDER BY or LIMIT.
   */
   assert( p && p->pPrior );  /* Calling function guarantees this much */
+  assert( (p->selFlags & SF_Recursive)==0 || p->op==TK_ALL || p->op==TK_UNION );
   db = pParse->db;
   pPrior = p->pPrior;
-  assert( pPrior->pRightmost!=pPrior );
-  assert( pPrior->pRightmost==p->pRightmost );
   dest = *pDest;
   if( pPrior->pOrderBy ){
     sqlite3ErrorMsg(pParse,"ORDER BY clause should come after %s not before",
@@ -97765,11 +102713,17 @@ static int multiSelect(
     goto multi_select_end;
   }
 
+#ifndef SQLITE_OMIT_CTE
+  if( p->selFlags & SF_Recursive ){
+    generateWithRecursiveQuery(pParse, p, &dest);
+  }else
+#endif
+
   /* Compound SELECTs that have an ORDER BY clause are handled separately.
   */
   if( p->pOrderBy ){
     return multiSelectOrderBy(pParse, p, pDest);
-  }
+  }else
 
   /* Generate code for the left and right SELECT statements.
   */
@@ -97793,7 +102747,7 @@ static int multiSelect(
       p->iLimit = pPrior->iLimit;
       p->iOffset = pPrior->iOffset;
       if( p->iLimit ){
-        addr = sqlite3VdbeAddOp1(v, OP_IfZero, p->iLimit);
+        addr = sqlite3VdbeAddOp1(v, OP_IfZero, p->iLimit); VdbeCoverage(v);
         VdbeComment((v, "Jump ahead if LIMIT reached"));
       }
       explainSetInteger(iSub2, pParse->iNextSelectId);
@@ -97804,9 +102758,9 @@ static int multiSelect(
       p->nSelectRow += pPrior->nSelectRow;
       if( pPrior->pLimit
        && sqlite3ExprIsInteger(pPrior->pLimit, &nLimit)
-       && p->nSelectRow > (double)nLimit 
+       && nLimit>0 && p->nSelectRow > (u64)nLimit 
       ){
-        p->nSelectRow = (double)nLimit;
+        p->nSelectRow = nLimit;
       }
       if( addr ){
         sqlite3VdbeJumpHere(v, addr);
@@ -97825,12 +102779,10 @@ static int multiSelect(
       testcase( p->op==TK_EXCEPT );
       testcase( p->op==TK_UNION );
       priorOp = SRT_Union;
-      if( dest.eDest==priorOp && ALWAYS(!p->pLimit &&!p->pOffset) ){
+      if( dest.eDest==priorOp ){
         /* We can reuse a temporary table generated by a SELECT to our
         ** right.
         */
-        assert( p->pRightmost!=p );  /* Can only happen for leftward elements
-                                     ** of a 3-way or more compound */
         assert( p->pLimit==0 );      /* Not allowed on leftward elements */
         assert( p->pOffset==0 );     /* Not allowed on leftward elements */
         unionTab = dest.iSDParm;
@@ -97843,7 +102795,7 @@ static int multiSelect(
         addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, unionTab, 0);
         assert( p->addrOpenEphm[0] == -1 );
         p->addrOpenEphm[0] = addr;
-        p->pRightmost->selFlags |= SF_UsesEphemeral;
+        findRightmost(p)->selFlags |= SF_UsesEphemeral;
         assert( p->pEList );
       }
 
@@ -97902,12 +102854,12 @@ static int multiSelect(
         iBreak = sqlite3VdbeMakeLabel(v);
         iCont = sqlite3VdbeMakeLabel(v);
         computeLimitRegisters(pParse, p, iBreak);
-        sqlite3VdbeAddOp2(v, OP_Rewind, unionTab, iBreak);
+        sqlite3VdbeAddOp2(v, OP_Rewind, unionTab, iBreak); VdbeCoverage(v);
         iStart = sqlite3VdbeCurrentAddr(v);
-        selectInnerLoop(pParse, p, p->pEList, unionTab, p->pEList->nExpr,
+        selectInnerLoop(pParse, p, p->pEList, unionTab,
                         0, 0, &dest, iCont, iBreak);
         sqlite3VdbeResolveLabel(v, iCont);
-        sqlite3VdbeAddOp2(v, OP_Next, unionTab, iStart);
+        sqlite3VdbeAddOp2(v, OP_Next, unionTab, iStart); VdbeCoverage(v);
         sqlite3VdbeResolveLabel(v, iBreak);
         sqlite3VdbeAddOp2(v, OP_Close, unionTab, 0);
       }
@@ -97932,7 +102884,7 @@ static int multiSelect(
       addr = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, tab1, 0);
       assert( p->addrOpenEphm[0] == -1 );
       p->addrOpenEphm[0] = addr;
-      p->pRightmost->selFlags |= SF_UsesEphemeral;
+      findRightmost(p)->selFlags |= SF_UsesEphemeral;
       assert( p->pEList );
 
       /* Code the SELECTs to our left into temporary table "tab1".
@@ -97977,15 +102929,15 @@ static int multiSelect(
       iBreak = sqlite3VdbeMakeLabel(v);
       iCont = sqlite3VdbeMakeLabel(v);
       computeLimitRegisters(pParse, p, iBreak);
-      sqlite3VdbeAddOp2(v, OP_Rewind, tab1, iBreak);
+      sqlite3VdbeAddOp2(v, OP_Rewind, tab1, iBreak); VdbeCoverage(v);
       r1 = sqlite3GetTempReg(pParse);
       iStart = sqlite3VdbeAddOp2(v, OP_RowKey, tab1, r1);
-      sqlite3VdbeAddOp4Int(v, OP_NotFound, tab2, iCont, r1, 0);
+      sqlite3VdbeAddOp4Int(v, OP_NotFound, tab2, iCont, r1, 0); VdbeCoverage(v);
       sqlite3ReleaseTempReg(pParse, r1);
-      selectInnerLoop(pParse, p, p->pEList, tab1, p->pEList->nExpr,
+      selectInnerLoop(pParse, p, p->pEList, tab1,
                       0, 0, &dest, iCont, iBreak);
       sqlite3VdbeResolveLabel(v, iCont);
-      sqlite3VdbeAddOp2(v, OP_Next, tab1, iStart);
+      sqlite3VdbeAddOp2(v, OP_Next, tab1, iStart); VdbeCoverage(v);
       sqlite3VdbeResolveLabel(v, iBreak);
       sqlite3VdbeAddOp2(v, OP_Close, tab2, 0);
       sqlite3VdbeAddOp2(v, OP_Close, tab1, 0);
@@ -98011,25 +102963,19 @@ static int multiSelect(
     CollSeq **apColl;             /* For looping through pKeyInfo->aColl[] */
     int nCol;                     /* Number of columns in result set */
 
-    assert( p->pRightmost==p );
+    assert( p->pNext==0 );
     nCol = p->pEList->nExpr;
-    pKeyInfo = sqlite3DbMallocZero(db,
-                       sizeof(*pKeyInfo)+nCol*(sizeof(CollSeq*) + 1));
+    pKeyInfo = sqlite3KeyInfoAlloc(db, nCol, 1);
     if( !pKeyInfo ){
       rc = SQLITE_NOMEM;
       goto multi_select_end;
     }
-
-    pKeyInfo->enc = ENC(db);
-    pKeyInfo->nField = (u16)nCol;
-
     for(i=0, apColl=pKeyInfo->aColl; i<nCol; i++, apColl++){
       *apColl = multiSelectCollSeq(pParse, p, i);
       if( 0==*apColl ){
         *apColl = db->pDfltColl;
       }
     }
-    pKeyInfo->aSortOrder = (u8*)apColl;
 
     for(pLoop=p; pLoop; pLoop=pLoop->pPrior){
       for(i=0; i<2; i++){
@@ -98041,11 +102987,12 @@ static int multiSelect(
           break;
         }
         sqlite3VdbeChangeP2(v, addr, nCol);
-        sqlite3VdbeChangeP4(v, addr, (char*)pKeyInfo, P4_KEYINFO);
+        sqlite3VdbeChangeP4(v, addr, (char*)sqlite3KeyInfoRef(pKeyInfo),
+                            P4_KEYINFO);
         pLoop->addrOpenEphm[i] = -1;
       }
     }
-    sqlite3DbFree(db, pKeyInfo);
+    sqlite3KeyInfoUnref(pKeyInfo);
   }
 
 multi_select_end:
@@ -98084,7 +103031,6 @@ static int generateOutputSubroutine(
   int regReturn,          /* The return address register */
   int regPrev,            /* Previous result register.  No uniqueness if 0 */
   KeyInfo *pKeyInfo,      /* For comparing with previous entry */
-  int p4type,             /* The p4 type for pKeyInfo */
   int iBreak              /* Jump here if we hit the LIMIT */
 ){
   Vdbe *v = pParse->pVdbe;
@@ -98098,10 +103044,10 @@ static int generateOutputSubroutine(
   */
   if( regPrev ){
     int j1, j2;
-    j1 = sqlite3VdbeAddOp1(v, OP_IfNot, regPrev);
+    j1 = sqlite3VdbeAddOp1(v, OP_IfNot, regPrev); VdbeCoverage(v);
     j2 = sqlite3VdbeAddOp4(v, OP_Compare, pIn->iSdst, regPrev+1, pIn->nSdst,
-                              (char*)pKeyInfo, p4type);
-    sqlite3VdbeAddOp3(v, OP_Jump, j2+2, iContinue, j2+2);
+                              (char*)sqlite3KeyInfoRef(pKeyInfo), P4_KEYINFO);
+    sqlite3VdbeAddOp3(v, OP_Jump, j2+2, iContinue, j2+2); VdbeCoverage(v);
     sqlite3VdbeJumpHere(v, j1);
     sqlite3VdbeAddOp3(v, OP_Copy, pIn->iSdst, regPrev+1, pIn->nSdst-1);
     sqlite3VdbeAddOp2(v, OP_Integer, 1, regPrev);
@@ -98110,7 +103056,7 @@ static int generateOutputSubroutine(
 
   /* Suppress the first OFFSET entries if there is an OFFSET clause
   */
-  codeOffset(v, p, iContinue);
+  codeOffset(v, p->iOffset, iContinue);
 
   switch( pDest->eDest ){
     /* Store the result as data using a unique key.
@@ -98202,7 +103148,7 @@ static int generateOutputSubroutine(
   /* Jump to the end of the loop if the LIMIT is reached.
   */
   if( p->iLimit ){
-    sqlite3VdbeAddOp3(v, OP_IfZero, p->iLimit, iBreak, -1);
+    sqlite3VdbeAddOp3(v, OP_IfZero, p->iLimit, iBreak, -1); VdbeCoverage(v);
   }
 
   /* Generate the subroutine return
@@ -98310,9 +103256,7 @@ static int multiSelectOrderBy(
   SelectDest destA;     /* Destination for coroutine A */
   SelectDest destB;     /* Destination for coroutine B */
   int regAddrA;         /* Address register for select-A coroutine */
-  int regEofA;          /* Flag to indicate when select-A is complete */
   int regAddrB;         /* Address register for select-B coroutine */
-  int regEofB;          /* Flag to indicate when select-B is complete */
   int addrSelectA;      /* Address of the select-A coroutine */
   int addrSelectB;      /* Address of the select-B coroutine */
   int regOutA;          /* Address register for the output-A subroutine */
@@ -98320,6 +103264,7 @@ static int multiSelectOrderBy(
   int addrOutA;         /* Address of the output-A subroutine */
   int addrOutB = 0;     /* Address of the output-B subroutine */
   int addrEofA;         /* Address of the select-A-exhausted subroutine */
+  int addrEofA_noB;     /* Alternate addrEofA if B is uninitialized */
   int addrEofB;         /* Address of the select-B-exhausted subroutine */
   int addrAltB;         /* Address of the A<B subroutine */
   int addrAeqB;         /* Address of the A==B subroutine */
@@ -98370,8 +103315,8 @@ static int multiSelectOrderBy(
     for(i=1; db->mallocFailed==0 && i<=p->pEList->nExpr; i++){
       struct ExprList_item *pItem;
       for(j=0, pItem=pOrderBy->a; j<nOrderBy; j++, pItem++){
-        assert( pItem->iOrderByCol>0 );
-        if( pItem->iOrderByCol==i ) break;
+        assert( pItem->u.x.iOrderByCol>0 );
+        if( pItem->u.x.iOrderByCol==i ) break;
       }
       if( j==nOrderBy ){
         Expr *pNew = sqlite3Expr(db, TK_INTEGER, 0);
@@ -98379,7 +103324,7 @@ static int multiSelectOrderBy(
         pNew->flags |= EP_IntValue;
         pNew->u.iValue = i;
         pOrderBy = sqlite3ExprListAppend(pParse, pOrderBy, pNew);
-        if( pOrderBy ) pOrderBy->a[nOrderBy++].iOrderByCol = (u16)i;
+        if( pOrderBy ) pOrderBy->a[nOrderBy++].u.x.iOrderByCol = (u16)i;
       }
     }
   }
@@ -98395,30 +103340,11 @@ static int multiSelectOrderBy(
   if( aPermute ){
     struct ExprList_item *pItem;
     for(i=0, pItem=pOrderBy->a; i<nOrderBy; i++, pItem++){
-      assert( pItem->iOrderByCol>0  && pItem->iOrderByCol<=p->pEList->nExpr );
-      aPermute[i] = pItem->iOrderByCol - 1;
-    }
-    pKeyMerge =
-      sqlite3DbMallocRaw(db, sizeof(*pKeyMerge)+nOrderBy*(sizeof(CollSeq*)+1));
-    if( pKeyMerge ){
-      pKeyMerge->aSortOrder = (u8*)&pKeyMerge->aColl[nOrderBy];
-      pKeyMerge->nField = (u16)nOrderBy;
-      pKeyMerge->enc = ENC(db);
-      for(i=0; i<nOrderBy; i++){
-        CollSeq *pColl;
-        Expr *pTerm = pOrderBy->a[i].pExpr;
-        if( pTerm->flags & EP_Collate ){
-          pColl = sqlite3ExprCollSeq(pParse, pTerm);
-        }else{
-          pColl = multiSelectCollSeq(pParse, p, aPermute[i]);
-          if( pColl==0 ) pColl = db->pDfltColl;
-          pOrderBy->a[i].pExpr =
-             sqlite3ExprAddCollateString(pParse, pTerm, pColl->zName);
-        }
-        pKeyMerge->aColl[i] = pColl;
-        pKeyMerge->aSortOrder[i] = pOrderBy->a[i].sortOrder;
-      }
+      assert( pItem->u.x.iOrderByCol>0
+          && pItem->u.x.iOrderByCol<=p->pEList->nExpr );
+      aPermute[i] = pItem->u.x.iOrderByCol - 1;
     }
+    pKeyMerge = multiSelectOrderByKeyInfo(pParse, p, 1);
   }else{
     pKeyMerge = 0;
   }
@@ -98440,12 +103366,9 @@ static int multiSelectOrderBy(
     regPrev = pParse->nMem+1;
     pParse->nMem += nExpr+1;
     sqlite3VdbeAddOp2(v, OP_Integer, 0, regPrev);
-    pKeyDup = sqlite3DbMallocZero(db,
-                  sizeof(*pKeyDup) + nExpr*(sizeof(CollSeq*)+1) );
+    pKeyDup = sqlite3KeyInfoAlloc(db, nExpr, 1);
     if( pKeyDup ){
-      pKeyDup->aSortOrder = (u8*)&pKeyDup->aColl[nExpr];
-      pKeyDup->nField = (u16)nExpr;
-      pKeyDup->enc = ENC(db);
+      assert( sqlite3KeyInfoIsWriteable(pKeyDup) );
       for(i=0; i<nExpr; i++){
         pKeyDup->aColl[i] = multiSelectCollSeq(pParse, p, i);
         pKeyDup->aSortOrder[i] = 0;
@@ -98456,6 +103379,7 @@ static int multiSelectOrderBy(
   /* Separate the left and the right query from one another
   */
   p->pPrior = 0;
+  pPrior->pNext = 0;
   sqlite3ResolveOrderGroupBy(pParse, p, p->pOrderBy, "ORDER");
   if( pPrior->pPrior==0 ){
     sqlite3ResolveOrderGroupBy(pParse, pPrior, pPrior->pOrderBy, "ORDER");
@@ -98478,37 +103402,30 @@ static int multiSelectOrderBy(
   p->pOffset = 0;
 
   regAddrA = ++pParse->nMem;
-  regEofA = ++pParse->nMem;
   regAddrB = ++pParse->nMem;
-  regEofB = ++pParse->nMem;
   regOutA = ++pParse->nMem;
   regOutB = ++pParse->nMem;
   sqlite3SelectDestInit(&destA, SRT_Coroutine, regAddrA);
   sqlite3SelectDestInit(&destB, SRT_Coroutine, regAddrB);
 
-  /* Jump past the various subroutines and coroutines to the main
-  ** merge loop
-  */
-  j1 = sqlite3VdbeAddOp0(v, OP_Goto);
-  addrSelectA = sqlite3VdbeCurrentAddr(v);
-
-
   /* Generate a coroutine to evaluate the SELECT statement to the
   ** left of the compound operator - the "A" select.
   */
-  VdbeNoopComment((v, "Begin coroutine for left SELECT"));
+  addrSelectA = sqlite3VdbeCurrentAddr(v) + 1;
+  j1 = sqlite3VdbeAddOp3(v, OP_InitCoroutine, regAddrA, 0, addrSelectA);
+  VdbeComment((v, "left SELECT"));
   pPrior->iLimit = regLimitA;
   explainSetInteger(iSub1, pParse->iNextSelectId);
   sqlite3Select(pParse, pPrior, &destA);
-  sqlite3VdbeAddOp2(v, OP_Integer, 1, regEofA);
-  sqlite3VdbeAddOp1(v, OP_Yield, regAddrA);
-  VdbeNoopComment((v, "End coroutine for left SELECT"));
+  sqlite3VdbeAddOp1(v, OP_EndCoroutine, regAddrA);
+  sqlite3VdbeJumpHere(v, j1);
 
   /* Generate a coroutine to evaluate the SELECT statement on 
   ** the right - the "B" select
   */
-  addrSelectB = sqlite3VdbeCurrentAddr(v);
-  VdbeNoopComment((v, "Begin coroutine for right SELECT"));
+  addrSelectB = sqlite3VdbeCurrentAddr(v) + 1;
+  j1 = sqlite3VdbeAddOp3(v, OP_InitCoroutine, regAddrB, 0, addrSelectB);
+  VdbeComment((v, "right SELECT"));
   savedLimit = p->iLimit;
   savedOffset = p->iOffset;
   p->iLimit = regLimitB;
@@ -98517,9 +103434,7 @@ static int multiSelectOrderBy(
   sqlite3Select(pParse, p, &destB);
   p->iLimit = savedLimit;
   p->iOffset = savedOffset;
-  sqlite3VdbeAddOp2(v, OP_Integer, 1, regEofB);
-  sqlite3VdbeAddOp1(v, OP_Yield, regAddrB);
-  VdbeNoopComment((v, "End coroutine for right SELECT"));
+  sqlite3VdbeAddOp1(v, OP_EndCoroutine, regAddrB);
 
   /* Generate a subroutine that outputs the current row of the A
   ** select as the next output row of the compound select.
@@ -98527,7 +103442,7 @@ static int multiSelectOrderBy(
   VdbeNoopComment((v, "Output routine for A"));
   addrOutA = generateOutputSubroutine(pParse,
                  p, &destA, pDest, regOutA,
-                 regPrev, pKeyDup, P4_KEYINFO_HANDOFF, labelEnd);
+                 regPrev, pKeyDup, labelEnd);
   
   /* Generate a subroutine that outputs the current row of the B
   ** select as the next output row of the compound select.
@@ -98536,19 +103451,20 @@ static int multiSelectOrderBy(
     VdbeNoopComment((v, "Output routine for B"));
     addrOutB = generateOutputSubroutine(pParse,
                  p, &destB, pDest, regOutB,
-                 regPrev, pKeyDup, P4_KEYINFO_STATIC, labelEnd);
+                 regPrev, pKeyDup, labelEnd);
   }
+  sqlite3KeyInfoUnref(pKeyDup);
 
   /* Generate a subroutine to run when the results from select A
   ** are exhausted and only data in select B remains.
   */
-  VdbeNoopComment((v, "eof-A subroutine"));
   if( op==TK_EXCEPT || op==TK_INTERSECT ){
-    addrEofA = sqlite3VdbeAddOp2(v, OP_Goto, 0, labelEnd);
+    addrEofA_noB = addrEofA = labelEnd;
   }else{  
-    addrEofA = sqlite3VdbeAddOp2(v, OP_If, regEofB, labelEnd);
-    sqlite3VdbeAddOp2(v, OP_Gosub, regOutB, addrOutB);
-    sqlite3VdbeAddOp1(v, OP_Yield, regAddrB);
+    VdbeNoopComment((v, "eof-A subroutine"));
+    addrEofA = sqlite3VdbeAddOp2(v, OP_Gosub, regOutB, addrOutB);
+    addrEofA_noB = sqlite3VdbeAddOp2(v, OP_Yield, regAddrB, labelEnd);
+                                     VdbeCoverage(v);
     sqlite3VdbeAddOp2(v, OP_Goto, 0, addrEofA);
     p->nSelectRow += pPrior->nSelectRow;
   }
@@ -98561,9 +103477,8 @@ static int multiSelectOrderBy(
     if( p->nSelectRow > pPrior->nSelectRow ) p->nSelectRow = pPrior->nSelectRow;
   }else{  
     VdbeNoopComment((v, "eof-B subroutine"));
-    addrEofB = sqlite3VdbeAddOp2(v, OP_If, regEofA, labelEnd);
-    sqlite3VdbeAddOp2(v, OP_Gosub, regOutA, addrOutA);
-    sqlite3VdbeAddOp1(v, OP_Yield, regAddrA);
+    addrEofB = sqlite3VdbeAddOp2(v, OP_Gosub, regOutA, addrOutA);
+    sqlite3VdbeAddOp2(v, OP_Yield, regAddrA, labelEnd); VdbeCoverage(v);
     sqlite3VdbeAddOp2(v, OP_Goto, 0, addrEofB);
   }
 
@@ -98571,8 +103486,7 @@ static int multiSelectOrderBy(
   */
   VdbeNoopComment((v, "A-lt-B subroutine"));
   addrAltB = sqlite3VdbeAddOp2(v, OP_Gosub, regOutA, addrOutA);
-  sqlite3VdbeAddOp1(v, OP_Yield, regAddrA);
-  sqlite3VdbeAddOp2(v, OP_If, regEofA, addrEofA);
+  sqlite3VdbeAddOp2(v, OP_Yield, regAddrA, addrEofA); VdbeCoverage(v);
   sqlite3VdbeAddOp2(v, OP_Goto, 0, labelCmpr);
 
   /* Generate code to handle the case of A==B
@@ -98585,8 +103499,7 @@ static int multiSelectOrderBy(
   }else{
     VdbeNoopComment((v, "A-eq-B subroutine"));
     addrAeqB =
-    sqlite3VdbeAddOp1(v, OP_Yield, regAddrA);
-    sqlite3VdbeAddOp2(v, OP_If, regEofA, addrEofA);
+    sqlite3VdbeAddOp2(v, OP_Yield, regAddrA, addrEofA); VdbeCoverage(v);
     sqlite3VdbeAddOp2(v, OP_Goto, 0, labelCmpr);
   }
 
@@ -98597,28 +103510,23 @@ static int multiSelectOrderBy(
   if( op==TK_ALL || op==TK_UNION ){
     sqlite3VdbeAddOp2(v, OP_Gosub, regOutB, addrOutB);
   }
-  sqlite3VdbeAddOp1(v, OP_Yield, regAddrB);
-  sqlite3VdbeAddOp2(v, OP_If, regEofB, addrEofB);
+  sqlite3VdbeAddOp2(v, OP_Yield, regAddrB, addrEofB); VdbeCoverage(v);
   sqlite3VdbeAddOp2(v, OP_Goto, 0, labelCmpr);
 
   /* This code runs once to initialize everything.
   */
   sqlite3VdbeJumpHere(v, j1);
-  sqlite3VdbeAddOp2(v, OP_Integer, 0, regEofA);
-  sqlite3VdbeAddOp2(v, OP_Integer, 0, regEofB);
-  sqlite3VdbeAddOp2(v, OP_Gosub, regAddrA, addrSelectA);
-  sqlite3VdbeAddOp2(v, OP_Gosub, regAddrB, addrSelectB);
-  sqlite3VdbeAddOp2(v, OP_If, regEofA, addrEofA);
-  sqlite3VdbeAddOp2(v, OP_If, regEofB, addrEofB);
+  sqlite3VdbeAddOp2(v, OP_Yield, regAddrA, addrEofA_noB); VdbeCoverage(v);
+  sqlite3VdbeAddOp2(v, OP_Yield, regAddrB, addrEofB); VdbeCoverage(v);
 
   /* Implement the main merge loop
   */
   sqlite3VdbeResolveLabel(v, labelCmpr);
   sqlite3VdbeAddOp4(v, OP_Permutation, 0, 0, 0, (char*)aPermute, P4_INTARRAY);
   sqlite3VdbeAddOp4(v, OP_Compare, destA.iSdst, destB.iSdst, nOrderBy,
-                         (char*)pKeyMerge, P4_KEYINFO_HANDOFF);
+                         (char*)pKeyMerge, P4_KEYINFO);
   sqlite3VdbeChangeP5(v, OPFLAG_PERMUTE);
-  sqlite3VdbeAddOp3(v, OP_Jump, addrAltB, addrAeqB, addrAgtB);
+  sqlite3VdbeAddOp3(v, OP_Jump, addrAltB, addrAeqB, addrAgtB); VdbeCoverage(v);
 
   /* Jump to the this point in order to terminate the query.
   */
@@ -98638,6 +103546,7 @@ static int multiSelectOrderBy(
     sqlite3SelectDelete(db, p->pPrior);
   }
   p->pPrior = pPrior;
+  pPrior->pNext = p;
 
   /*** TBD:  Insert subroutine calls to close cursors on incomplete
   **** subqueries ****/
@@ -98843,6 +103752,14 @@ static void substSelect(
 **  (21)  The subquery does not use LIMIT or the outer query is not
 **        DISTINCT.  (See ticket [752e1646fc]).
 **
+**  (22)  The subquery is not a recursive CTE.
+**
+**  (23)  The parent is not a recursive CTE, or the sub-query is not a
+**        compound query. This restriction is because transforming the
+**        parent to a compound query confuses the code that handles
+**        recursive queries in multiSelect().
+**
+**
 ** In this routine, the "p" parameter is a pointer to the outer query.
 ** The subquery is p->pSrc->a[iFrom].  isAgg is true if the outer query
 ** uses aggregates and subqueryIsAgg is true if the subquery uses aggregates.
@@ -98895,7 +103812,7 @@ static int flattenSubquery(
   ** and (14). */
   if( pSub->pLimit && p->pLimit ) return 0;              /* Restriction (13) */
   if( pSub->pOffset ) return 0;                          /* Restriction (14) */
-  if( p->pRightmost && pSub->pLimit ){
+  if( (p->selFlags & SF_Compound)!=0 && pSub->pLimit ){
     return 0;                                            /* Restriction (15) */
   }
   if( pSubSrc->nSrc==0 ) return 0;                       /* Restriction (7)  */
@@ -98914,6 +103831,8 @@ static int flattenSubquery(
   if( pSub->pLimit && (p->selFlags & SF_Distinct)!=0 ){
      return 0;         /* Restriction (21) */
   }
+  if( pSub->selFlags & SF_Recursive ) return 0;          /* Restriction (22)  */
+  if( (p->selFlags & SF_Recursive) && pSub->pPrior ) return 0;       /* (23)  */
 
   /* OBSOLETE COMMENT 1:
   ** Restriction 3:  If the subquery is a join, make sure the subquery is 
@@ -98981,7 +103900,7 @@ static int flattenSubquery(
     if( p->pOrderBy ){
       int ii;
       for(ii=0; ii<p->pOrderBy->nExpr; ii++){
-        if( p->pOrderBy->a[ii].iOrderByCol==0 ) return 0;
+        if( p->pOrderBy->a[ii].u.x.iOrderByCol==0 ) return 0;
       }
     }
   }
@@ -99044,14 +103963,14 @@ static int flattenSubquery(
     p->pOrderBy = pOrderBy;
     p->pSrc = pSrc;
     p->op = TK_ALL;
-    p->pRightmost = 0;
     if( pNew==0 ){
-      pNew = pPrior;
+      p->pPrior = pPrior;
     }else{
       pNew->pPrior = pPrior;
-      pNew->pRightmost = 0;
+      if( pPrior ) pPrior->pNext = pNew;
+      pNew->pNext = p;
+      p->pPrior = pNew;
     }
-    p->pPrior = pNew;
     if( db->mallocFailed ) return 1;
   }
 
@@ -99300,7 +104219,7 @@ static Table *isSimpleCount(Select *p, AggInfo *pAggInfo){
   if( IsVirtual(pTab) ) return 0;
   if( pExpr->op!=TK_AGG_FUNCTION ) return 0;
   if( NEVER(pAggInfo->nFunc==0) ) return 0;
-  if( (pAggInfo->aFunc[0].pFunc->flags&SQLITE_FUNC_COUNT)==0 ) return 0;
+  if( (pAggInfo->aFunc[0].pFunc->funcFlags&SQLITE_FUNC_COUNT)==0 ) return 0;
   if( pExpr->flags&EP_Distinct ) return 0;
 
   return pTab;
@@ -99390,11 +104309,207 @@ static int convertCompoundSelectToSubquery(Walker *pWalker, Select *p){
   pNew->pHaving = 0;
   pNew->pOrderBy = 0;
   p->pPrior = 0;
+  p->pNext = 0;
+  p->selFlags &= ~SF_Compound;
+  assert( pNew->pPrior!=0 );
+  pNew->pPrior->pNext = pNew;
   pNew->pLimit = 0;
   pNew->pOffset = 0;
   return WRC_Continue;
 }
 
+#ifndef SQLITE_OMIT_CTE
+/*
+** Argument pWith (which may be NULL) points to a linked list of nested 
+** WITH contexts, from inner to outermost. If the table identified by 
+** FROM clause element pItem is really a common-table-expression (CTE) 
+** then return a pointer to the CTE definition for that table. Otherwise
+** return NULL.
+**
+** If a non-NULL value is returned, set *ppContext to point to the With
+** object that the returned CTE belongs to.
+*/
+static struct Cte *searchWith(
+  With *pWith,                    /* Current outermost WITH clause */
+  struct SrcList_item *pItem,     /* FROM clause element to resolve */
+  With **ppContext                /* OUT: WITH clause return value belongs to */
+){
+  const char *zName;
+  if( pItem->zDatabase==0 && (zName = pItem->zName)!=0 ){
+    With *p;
+    for(p=pWith; p; p=p->pOuter){
+      int i;
+      for(i=0; i<p->nCte; i++){
+        if( sqlite3StrICmp(zName, p->a[i].zName)==0 ){
+          *ppContext = p;
+          return &p->a[i];
+        }
+      }
+    }
+  }
+  return 0;
+}
+
+/* The code generator maintains a stack of active WITH clauses
+** with the inner-most WITH clause being at the top of the stack.
+**
+** This routine pushes the WITH clause passed as the second argument
+** onto the top of the stack. If argument bFree is true, then this
+** WITH clause will never be popped from the stack. In this case it
+** should be freed along with the Parse object. In other cases, when
+** bFree==0, the With object will be freed along with the SELECT 
+** statement with which it is associated.
+*/
+SQLITE_PRIVATE void sqlite3WithPush(Parse *pParse, With *pWith, u8 bFree){
+  assert( bFree==0 || pParse->pWith==0 );
+  if( pWith ){
+    pWith->pOuter = pParse->pWith;
+    pParse->pWith = pWith;
+    pParse->bFreeWith = bFree;
+  }
+}
+
+/*
+** This function checks if argument pFrom refers to a CTE declared by 
+** a WITH clause on the stack currently maintained by the parser. And,
+** if currently processing a CTE expression, if it is a recursive
+** reference to the current CTE.
+**
+** If pFrom falls into either of the two categories above, pFrom->pTab
+** and other fields are populated accordingly. The caller should check
+** (pFrom->pTab!=0) to determine whether or not a successful match
+** was found.
+**
+** Whether or not a match is found, SQLITE_OK is returned if no error
+** occurs. If an error does occur, an error message is stored in the
+** parser and some error code other than SQLITE_OK returned.
+*/
+static int withExpand(
+  Walker *pWalker, 
+  struct SrcList_item *pFrom
+){
+  Parse *pParse = pWalker->pParse;
+  sqlite3 *db = pParse->db;
+  struct Cte *pCte;               /* Matched CTE (or NULL if no match) */
+  With *pWith;                    /* WITH clause that pCte belongs to */
+
+  assert( pFrom->pTab==0 );
+
+  pCte = searchWith(pParse->pWith, pFrom, &pWith);
+  if( pCte ){
+    Table *pTab;
+    ExprList *pEList;
+    Select *pSel;
+    Select *pLeft;                /* Left-most SELECT statement */
+    int bMayRecursive;            /* True if compound joined by UNION [ALL] */
+    With *pSavedWith;             /* Initial value of pParse->pWith */
+
+    /* If pCte->zErr is non-NULL at this point, then this is an illegal
+    ** recursive reference to CTE pCte. Leave an error in pParse and return
+    ** early. If pCte->zErr is NULL, then this is not a recursive reference.
+    ** In this case, proceed.  */
+    if( pCte->zErr ){
+      sqlite3ErrorMsg(pParse, pCte->zErr, pCte->zName);
+      return SQLITE_ERROR;
+    }
+
+    assert( pFrom->pTab==0 );
+    pFrom->pTab = pTab = sqlite3DbMallocZero(db, sizeof(Table));
+    if( pTab==0 ) return WRC_Abort;
+    pTab->nRef = 1;
+    pTab->zName = sqlite3DbStrDup(db, pCte->zName);
+    pTab->iPKey = -1;
+    pTab->nRowLogEst = 200; assert( 200==sqlite3LogEst(1048576) );
+    pTab->tabFlags |= TF_Ephemeral;
+    pFrom->pSelect = sqlite3SelectDup(db, pCte->pSelect, 0);
+    if( db->mallocFailed ) return SQLITE_NOMEM;
+    assert( pFrom->pSelect );
+
+    /* Check if this is a recursive CTE. */
+    pSel = pFrom->pSelect;
+    bMayRecursive = ( pSel->op==TK_ALL || pSel->op==TK_UNION );
+    if( bMayRecursive ){
+      int i;
+      SrcList *pSrc = pFrom->pSelect->pSrc;
+      for(i=0; i<pSrc->nSrc; i++){
+        struct SrcList_item *pItem = &pSrc->a[i];
+        if( pItem->zDatabase==0 
+         && pItem->zName!=0 
+         && 0==sqlite3StrICmp(pItem->zName, pCte->zName)
+          ){
+          pItem->pTab = pTab;
+          pItem->isRecursive = 1;
+          pTab->nRef++;
+          pSel->selFlags |= SF_Recursive;
+        }
+      }
+    }
+
+    /* Only one recursive reference is permitted. */ 
+    if( pTab->nRef>2 ){
+      sqlite3ErrorMsg(
+          pParse, "multiple references to recursive table: %s", pCte->zName
+      );
+      return SQLITE_ERROR;
+    }
+    assert( pTab->nRef==1 || ((pSel->selFlags&SF_Recursive) && pTab->nRef==2 ));
+
+    pCte->zErr = "circular reference: %s";
+    pSavedWith = pParse->pWith;
+    pParse->pWith = pWith;
+    sqlite3WalkSelect(pWalker, bMayRecursive ? pSel->pPrior : pSel);
+
+    for(pLeft=pSel; pLeft->pPrior; pLeft=pLeft->pPrior);
+    pEList = pLeft->pEList;
+    if( pCte->pCols ){
+      if( pEList->nExpr!=pCte->pCols->nExpr ){
+        sqlite3ErrorMsg(pParse, "table %s has %d values for %d columns",
+            pCte->zName, pEList->nExpr, pCte->pCols->nExpr
+        );
+        pParse->pWith = pSavedWith;
+        return SQLITE_ERROR;
+      }
+      pEList = pCte->pCols;
+    }
+
+    selectColumnsFromExprList(pParse, pEList, &pTab->nCol, &pTab->aCol);
+    if( bMayRecursive ){
+      if( pSel->selFlags & SF_Recursive ){
+        pCte->zErr = "multiple recursive references: %s";
+      }else{
+        pCte->zErr = "recursive reference in a subquery: %s";
+      }
+      sqlite3WalkSelect(pWalker, pSel);
+    }
+    pCte->zErr = 0;
+    pParse->pWith = pSavedWith;
+  }
+
+  return SQLITE_OK;
+}
+#endif
+
+#ifndef SQLITE_OMIT_CTE
+/*
+** If the SELECT passed as the second argument has an associated WITH 
+** clause, pop it from the stack stored as part of the Parse object.
+**
+** This function is used as the xSelectCallback2() callback by
+** sqlite3SelectExpand() when walking a SELECT tree to resolve table
+** names and other FROM clause elements. 
+*/
+static void selectPopWith(Walker *pWalker, Select *p){
+  Parse *pParse = pWalker->pParse;
+  With *pWith = findRightmost(p)->pWith;
+  if( pWith!=0 ){
+    assert( pParse->pWith==pWith );
+    pParse->pWith = pWith->pOuter;
+  }
+}
+#else
+#define selectPopWith 0
+#endif
+
 /*
 ** This routine is a Walker callback for "expanding" a SELECT statement.
 ** "Expanding" means to do the following:
@@ -99438,6 +104553,7 @@ static int selectExpander(Walker *pWalker, Select *p){
   }
   pTabList = p->pSrc;
   pEList = p->pEList;
+  sqlite3WithPush(pParse, findRightmost(p)->pWith, 0);
 
   /* Make sure cursor numbers have been assigned to all entries in
   ** the FROM clause of the SELECT statement.
@@ -99450,12 +104566,21 @@ static int selectExpander(Walker *pWalker, Select *p){
   */
   for(i=0, pFrom=pTabList->a; i<pTabList->nSrc; i++, pFrom++){
     Table *pTab;
+    assert( pFrom->isRecursive==0 || pFrom->pTab );
+    if( pFrom->isRecursive ) continue;
     if( pFrom->pTab!=0 ){
       /* This statement has already been prepared.  There is no need
       ** to go further. */
       assert( i==0 );
+#ifndef SQLITE_OMIT_CTE
+      selectPopWith(pWalker, p);
+#endif
       return WRC_Prune;
     }
+#ifndef SQLITE_OMIT_CTE
+    if( withExpand(pWalker, pFrom) ) return WRC_Abort;
+    if( pFrom->pTab ) {} else
+#endif
     if( pFrom->zName==0 ){
 #ifndef SQLITE_OMIT_SUBQUERY
       Select *pSel = pFrom->pSelect;
@@ -99466,11 +104591,11 @@ static int selectExpander(Walker *pWalker, Select *p){
       pFrom->pTab = pTab = sqlite3DbMallocZero(db, sizeof(Table));
       if( pTab==0 ) return WRC_Abort;
       pTab->nRef = 1;
-      pTab->zName = sqlite3MPrintf(db, "sqlite_subquery_%p_", (void*)pTab);
+      pTab->zName = sqlite3MPrintf(db, "sqlite_sq_%p", (void*)pTab);
       while( pSel->pPrior ){ pSel = pSel->pPrior; }
       selectColumnsFromExprList(pParse, pSel->pEList, &pTab->nCol, &pTab->aCol);
       pTab->iPKey = -1;
-      pTab->nRowEst = 1000000;
+      pTab->nRowLogEst = 200; assert( 200==sqlite3LogEst(1048576) );
       pTab->tabFlags |= TF_Ephemeral;
 #endif
     }else{
@@ -99711,11 +104836,14 @@ static int exprWalkNoop(Walker *NotUsed, Expr *NotUsed2){
 static void sqlite3SelectExpand(Parse *pParse, Select *pSelect){
   Walker w;
   memset(&w, 0, sizeof(w));
-  w.xSelectCallback = convertCompoundSelectToSubquery;
   w.xExprCallback = exprWalkNoop;
   w.pParse = pParse;
-  sqlite3WalkSelect(&w, pSelect);
+  if( pParse->hasCompound ){
+    w.xSelectCallback = convertCompoundSelectToSubquery;
+    sqlite3WalkSelect(&w, pSelect);
+  }
   w.xSelectCallback = selectExpander;
+  w.xSelectCallback2 = selectPopWith;
   sqlite3WalkSelect(&w, pSelect);
 }
 
@@ -99734,7 +104862,7 @@ static void sqlite3SelectExpand(Parse *pParse, Select *pSelect){
 ** at that point because identifiers had not yet been resolved.  This
 ** routine is called after identifier resolution.
 */
-static int selectAddSubqueryTypeInfo(Walker *pWalker, Select *p){
+static void selectAddSubqueryTypeInfo(Walker *pWalker, Select *p){
   Parse *pParse;
   int i;
   SrcList *pTabList;
@@ -99750,13 +104878,13 @@ static int selectAddSubqueryTypeInfo(Walker *pWalker, Select *p){
       if( ALWAYS(pTab!=0) && (pTab->tabFlags & TF_Ephemeral)!=0 ){
         /* A sub-query in the FROM clause of a SELECT */
         Select *pSel = pFrom->pSelect;
-        assert( pSel );
-        while( pSel->pPrior ) pSel = pSel->pPrior;
-        selectAddColumnTypeAndCollation(pParse, pTab->nCol, pTab->aCol, pSel);
+        if( pSel ){
+          while( pSel->pPrior ) pSel = pSel->pPrior;
+          selectAddColumnTypeAndCollation(pParse, pTab, pSel);
+        }
       }
     }
   }
-  return WRC_Continue;
 }
 #endif
 
@@ -99772,10 +104900,9 @@ static void sqlite3SelectAddTypeInfo(Parse *pParse, Select *pSelect){
 #ifndef SQLITE_OMIT_SUBQUERY
   Walker w;
   memset(&w, 0, sizeof(w));
-  w.xSelectCallback = selectAddSubqueryTypeInfo;
+  w.xSelectCallback2 = selectAddSubqueryTypeInfo;
   w.xExprCallback = exprWalkNoop;
   w.pParse = pParse;
-  w.bSelectDepthFirst = 1;
   sqlite3WalkSelect(&w, pSelect);
 #endif
 }
@@ -99822,14 +104949,23 @@ static void resetAccumulator(Parse *pParse, AggInfo *pAggInfo){
   Vdbe *v = pParse->pVdbe;
   int i;
   struct AggInfo_func *pFunc;
-  if( pAggInfo->nFunc+pAggInfo->nColumn==0 ){
-    return;
-  }
+  int nReg = pAggInfo->nFunc + pAggInfo->nColumn;
+  if( nReg==0 ) return;
+#ifdef SQLITE_DEBUG
+  /* Verify that all AggInfo registers are within the range specified by
+  ** AggInfo.mnReg..AggInfo.mxReg */
+  assert( nReg==pAggInfo->mxReg-pAggInfo->mnReg+1 );
   for(i=0; i<pAggInfo->nColumn; i++){
-    sqlite3VdbeAddOp2(v, OP_Null, 0, pAggInfo->aCol[i].iMem);
+    assert( pAggInfo->aCol[i].iMem>=pAggInfo->mnReg
+         && pAggInfo->aCol[i].iMem<=pAggInfo->mxReg );
   }
+  for(i=0; i<pAggInfo->nFunc; i++){
+    assert( pAggInfo->aFunc[i].iMem>=pAggInfo->mnReg
+         && pAggInfo->aFunc[i].iMem<=pAggInfo->mxReg );
+  }
+#endif
+  sqlite3VdbeAddOp3(v, OP_Null, 0, pAggInfo->mnReg, pAggInfo->mxReg);
   for(pFunc=pAggInfo->aFunc, i=0; i<pAggInfo->nFunc; i++, pFunc++){
-    sqlite3VdbeAddOp2(v, OP_Null, 0, pFunc->iMem);
     if( pFunc->iDistinct>=0 ){
       Expr *pE = pFunc->pExpr;
       assert( !ExprHasProperty(pE, EP_xIsSelect) );
@@ -99838,9 +104974,9 @@ static void resetAccumulator(Parse *pParse, AggInfo *pAggInfo){
            "argument");
         pFunc->iDistinct = -1;
       }else{
-        KeyInfo *pKeyInfo = keyInfoFromExprList(pParse, pE->x.pList);
+        KeyInfo *pKeyInfo = keyInfoFromExprList(pParse, pE->x.pList, 0, 0);
         sqlite3VdbeAddOp4(v, OP_OpenEphemeral, pFunc->iDistinct, 0, 0,
-                          (char*)pKeyInfo, P4_KEYINFO_HANDOFF);
+                          (char*)pKeyInfo, P4_KEYINFO);
       }
     }
   }
@@ -99875,7 +105011,6 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
   struct AggInfo_col *pC;
 
   pAggInfo->directMode = 1;
-  sqlite3ExprCacheClear(pParse);
   for(i=0, pF=pAggInfo->aFunc; i<pAggInfo->nFunc; i++, pF++){
     int nArg;
     int addrNext = 0;
@@ -99885,7 +105020,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
     if( pList ){
       nArg = pList->nExpr;
       regAgg = sqlite3GetTempRange(pParse, nArg);
-      sqlite3ExprCodeExprList(pParse, pList, regAgg, 1);
+      sqlite3ExprCodeExprList(pParse, pList, regAgg, SQLITE_ECEL_DUP);
     }else{
       nArg = 0;
       regAgg = 0;
@@ -99895,7 +105030,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
       assert( nArg==1 );
       codeDistinct(pParse, pF->iDistinct, addrNext, 1, regAgg);
     }
-    if( pF->pFunc->flags & SQLITE_FUNC_NEEDCOLL ){
+    if( pF->pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL ){
       CollSeq *pColl = 0;
       struct ExprList_item *pItem;
       int j;
@@ -99931,7 +105066,7 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
   ** values to an OP_Copy.
   */
   if( regHit ){
-    addrHitTest = sqlite3VdbeAddOp1(v, OP_If, regHit);
+    addrHitTest = sqlite3VdbeAddOp1(v, OP_If, regHit); VdbeCoverage(v);
   }
   sqlite3ExprCacheClear(pParse);
   for(i=0, pC=pAggInfo->aCol; i<pAggInfo->nAccumulator; i++, pC++){
@@ -99955,11 +105090,11 @@ static void explainSimpleCount(
   Index *pIdx                     /* Index used to optimize scan, or NULL */
 ){
   if( pParse->explain==2 ){
-    char *zEqp = sqlite3MPrintf(pParse->db, "SCAN TABLE %s %s%s(~%d rows)",
-        pTab->zName, 
-        pIdx ? "USING COVERING INDEX " : "",
-        pIdx ? pIdx->zName : "",
-        pTab->nRowEst
+    int bCover = (pIdx!=0 && (HasRowid(pTab) || !IsPrimaryKeyIndex(pIdx)));
+    char *zEqp = sqlite3MPrintf(pParse->db, "SCAN TABLE %s%s%s",
+        pTab->zName,
+        bCover ? " USING COVERING INDEX " : "",
+        bCover ? pIdx->zName : ""
     );
     sqlite3VdbeAddOp4(
         pParse->pVdbe, OP_Explain, pParse->iSelectId, 0, 0, zEqp, P4_DYNAMIC
@@ -99973,50 +105108,8 @@ static void explainSimpleCount(
 /*
 ** Generate code for the SELECT statement given in the p argument.  
 **
-** The results are distributed in various ways depending on the
-** contents of the SelectDest structure pointed to by argument pDest
-** as follows:
-**
-**     pDest->eDest    Result
-**     ------------    -------------------------------------------
-**     SRT_Output      Generate a row of output (using the OP_ResultRow
-**                     opcode) for each row in the result set.
-**
-**     SRT_Mem         Only valid if the result is a single column.
-**                     Store the first column of the first result row
-**                     in register pDest->iSDParm then abandon the rest
-**                     of the query.  This destination implies "LIMIT 1".
-**
-**     SRT_Set         The result must be a single column.  Store each
-**                     row of result as the key in table pDest->iSDParm. 
-**                     Apply the affinity pDest->affSdst before storing
-**                     results.  Used to implement "IN (SELECT ...)".
-**
-**     SRT_Union       Store results as a key in a temporary table 
-**                     identified by pDest->iSDParm.
-**
-**     SRT_Except      Remove results from the temporary table pDest->iSDParm.
-**
-**     SRT_Table       Store results in temporary table pDest->iSDParm.
-**                     This is like SRT_EphemTab except that the table
-**                     is assumed to already be open.
-**
-**     SRT_EphemTab    Create an temporary table pDest->iSDParm and store
-**                     the result there. The cursor is left open after
-**                     returning.  This is like SRT_Table except that
-**                     this destination uses OP_OpenEphemeral to create
-**                     the table first.
-**
-**     SRT_Coroutine   Generate a co-routine that returns a new row of
-**                     results each time it is invoked.  The entry point
-**                     of the co-routine is stored in register pDest->iSDParm.
-**
-**     SRT_Exists      Store a 1 in memory cell pDest->iSDParm if the result
-**                     set is not empty.
-**
-**     SRT_Discard     Throw the results away.  This is used by SELECT
-**                     statements within triggers whose only purpose is
-**                     the side-effects of functions.
+** The results are returned according to the SelectDest structure.
+** See comments in sqliteInt.h for further information.
 **
 ** This routine returns the number of errors.  If any errors are
 ** encountered, then an appropriate error message is left in
@@ -100037,12 +105130,11 @@ SQLITE_PRIVATE int sqlite3Select(
   ExprList *pEList;      /* List of columns to extract. */
   SrcList *pTabList;     /* List of tables to select from */
   Expr *pWhere;          /* The WHERE clause.  May be NULL */
-  ExprList *pOrderBy;    /* The ORDER BY clause.  May be NULL */
   ExprList *pGroupBy;    /* The GROUP BY clause.  May be NULL */
   Expr *pHaving;         /* The HAVING clause.  May be NULL */
   int rc = 1;            /* Value to return from this function */
-  int addrSortIndex;     /* Address of an OP_OpenEphemeral instruction */
   DistinctCtx sDistinct; /* Info on how to code the DISTINCT keyword */
+  SortCtx sSort;         /* Info on how to code the ORDER BY clause */
   AggInfo sAggInfo;      /* Information used by aggregate queries */
   int iEnd;              /* Address of the end of the query */
   sqlite3 *db;           /* The database connection */
@@ -100059,9 +105151,15 @@ SQLITE_PRIVATE int sqlite3Select(
   if( sqlite3AuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1;
   memset(&sAggInfo, 0, sizeof(sAggInfo));
 
+  assert( p->pOrderBy==0 || pDest->eDest!=SRT_DistFifo );
+  assert( p->pOrderBy==0 || pDest->eDest!=SRT_Fifo );
+  assert( p->pOrderBy==0 || pDest->eDest!=SRT_DistQueue );
+  assert( p->pOrderBy==0 || pDest->eDest!=SRT_Queue );
   if( IgnorableOrderby(pDest) ){
     assert(pDest->eDest==SRT_Exists || pDest->eDest==SRT_Union || 
-           pDest->eDest==SRT_Except || pDest->eDest==SRT_Discard);
+           pDest->eDest==SRT_Except || pDest->eDest==SRT_Discard ||
+           pDest->eDest==SRT_Queue  || pDest->eDest==SRT_DistFifo ||
+           pDest->eDest==SRT_DistQueue || pDest->eDest==SRT_Fifo);
     /* If ORDER BY makes no difference in the output then neither does
     ** DISTINCT so it can be removed too. */
     sqlite3ExprListDelete(db, p->pOrderBy);
@@ -100069,7 +105167,8 @@ SQLITE_PRIVATE int sqlite3Select(
     p->selFlags &= ~SF_Distinct;
   }
   sqlite3SelectPrep(pParse, p, 0);
-  pOrderBy = p->pOrderBy;
+  memset(&sSort, 0, sizeof(sSort));
+  sSort.pOrderBy = p->pOrderBy;
   pTabList = p->pSrc;
   pEList = p->pEList;
   if( pParse->nErr || db->mallocFailed ){
@@ -100117,7 +105216,7 @@ SQLITE_PRIVATE int sqlite3Select(
     }
 
     /* Increment Parse.nHeight by the height of the largest expression
-    ** tree refered to by this, the parent select. The child select
+    ** tree referred to by this, the parent select. The child select
     ** may contain expression trees of at most
     ** (SQLITE_MAX_EXPR_DEPTH-Parse.nHeight) height. This is a bit
     ** more conservative than necessary, but much easier than enforcing
@@ -100133,42 +105232,24 @@ SQLITE_PRIVATE int sqlite3Select(
         p->selFlags |= SF_Aggregate;
       }
       i = -1;
-    }else if( pTabList->nSrc==1 && (p->selFlags & SF_Materialize)==0
-      && OptimizationEnabled(db, SQLITE_SubqCoroutine)
+    }else if( pTabList->nSrc==1
+           && OptimizationEnabled(db, SQLITE_SubqCoroutine)
     ){
       /* Implement a co-routine that will return a single row of the result
       ** set on each invocation.
       */
-      int addrTop;
-      int addrEof;
+      int addrTop = sqlite3VdbeCurrentAddr(v)+1;
       pItem->regReturn = ++pParse->nMem;
-      addrEof = ++pParse->nMem;
-      /* Before coding the OP_Goto to jump to the start of the main routine,
-      ** ensure that the jump to the verify-schema routine has already
-      ** been coded. Otherwise, the verify-schema would likely be coded as 
-      ** part of the co-routine. If the main routine then accessed the 
-      ** database before invoking the co-routine for the first time (for 
-      ** example to initialize a LIMIT register from a sub-select), it would 
-      ** be doing so without having verified the schema version and obtained 
-      ** the required db locks. See ticket d6b36be38.  */
-      sqlite3CodeVerifySchema(pParse, -1);
-      sqlite3VdbeAddOp0(v, OP_Goto);
-      addrTop = sqlite3VdbeAddOp1(v, OP_OpenPseudo, pItem->iCursor);
-      sqlite3VdbeChangeP5(v, 1);
-      VdbeComment((v, "coroutine for %s", pItem->pTab->zName));
+      sqlite3VdbeAddOp3(v, OP_InitCoroutine, pItem->regReturn, 0, addrTop);
+      VdbeComment((v, "%s", pItem->pTab->zName));
       pItem->addrFillSub = addrTop;
-      sqlite3VdbeAddOp2(v, OP_Integer, 0, addrEof);
-      sqlite3VdbeChangeP5(v, 1);
       sqlite3SelectDestInit(&dest, SRT_Coroutine, pItem->regReturn);
       explainSetInteger(pItem->iSelectId, (u8)pParse->iNextSelectId);
       sqlite3Select(pParse, pSub, &dest);
-      pItem->pTab->nRowEst = (unsigned)pSub->nSelectRow;
+      pItem->pTab->nRowLogEst = sqlite3LogEst(pSub->nSelectRow);
       pItem->viaCoroutine = 1;
-      sqlite3VdbeChangeP2(v, addrTop, dest.iSdst);
-      sqlite3VdbeChangeP3(v, addrTop, dest.nSdst);
-      sqlite3VdbeAddOp2(v, OP_Integer, 1, addrEof);
-      sqlite3VdbeAddOp1(v, OP_Yield, pItem->regReturn);
-      VdbeComment((v, "end %s", pItem->pTab->zName));
+      pItem->regResult = dest.iSdst;
+      sqlite3VdbeAddOp1(v, OP_EndCoroutine, pItem->regReturn);
       sqlite3VdbeJumpHere(v, addrTop-1);
       sqlite3ClearTempRegCache(pParse);
     }else{
@@ -100184,17 +105265,19 @@ SQLITE_PRIVATE int sqlite3Select(
       pItem->regReturn = ++pParse->nMem;
       topAddr = sqlite3VdbeAddOp2(v, OP_Integer, 0, pItem->regReturn);
       pItem->addrFillSub = topAddr+1;
-      VdbeNoopComment((v, "materialize %s", pItem->pTab->zName));
       if( pItem->isCorrelated==0 ){
         /* If the subquery is not correlated and if we are not inside of
         ** a trigger, then we only need to compute the value of the subquery
         ** once. */
-        onceAddr = sqlite3CodeOnce(pParse);
+        onceAddr = sqlite3CodeOnce(pParse); VdbeCoverage(v);
+        VdbeComment((v, "materialize \"%s\"", pItem->pTab->zName));
+      }else{
+        VdbeNoopComment((v, "materialize \"%s\"", pItem->pTab->zName));
       }
       sqlite3SelectDestInit(&dest, SRT_EphemTab, pItem->iCursor);
       explainSetInteger(pItem->iSelectId, (u8)pParse->iNextSelectId);
       sqlite3Select(pParse, pSub, &dest);
-      pItem->pTab->nRowEst = (unsigned)pSub->nSelectRow;
+      pItem->pTab->nRowLogEst = sqlite3LogEst(pSub->nSelectRow);
       if( onceAddr ) sqlite3VdbeJumpHere(v, onceAddr);
       retAddr = sqlite3VdbeAddOp1(v, OP_Return, pItem->regReturn);
       VdbeComment((v, "end %s", pItem->pTab->zName));
@@ -100207,7 +105290,7 @@ SQLITE_PRIVATE int sqlite3Select(
     pParse->nHeight -= sqlite3SelectExprHeight(p);
     pTabList = p->pSrc;
     if( !IgnorableOrderby(pDest) ){
-      pOrderBy = p->pOrderBy;
+      sSort.pOrderBy = p->pOrderBy;
     }
   }
   pEList = p->pEList;
@@ -100221,39 +105304,12 @@ SQLITE_PRIVATE int sqlite3Select(
   /* If there is are a sequence of queries, do the earlier ones first.
   */
   if( p->pPrior ){
-    if( p->pRightmost==0 ){
-      Select *pLoop, *pRight = 0;
-      int cnt = 0;
-      int mxSelect;
-      for(pLoop=p; pLoop; pLoop=pLoop->pPrior, cnt++){
-        pLoop->pRightmost = p;
-        pLoop->pNext = pRight;
-        pRight = pLoop;
-      }
-      mxSelect = db->aLimit[SQLITE_LIMIT_COMPOUND_SELECT];
-      if( mxSelect && cnt>mxSelect ){
-        sqlite3ErrorMsg(pParse, "too many terms in compound SELECT");
-        goto select_end;
-      }
-    }
     rc = multiSelect(pParse, p, pDest);
     explainSetInteger(pParse->iSelectId, iRestoreSelectId);
     return rc;
   }
 #endif
 
-  /* If there is both a GROUP BY and an ORDER BY clause and they are
-  ** identical, then disable the ORDER BY clause since the GROUP BY
-  ** will cause elements to come out in the correct order.  This is
-  ** an optimization - the correct answer should result regardless.
-  ** Use the SQLITE_GroupByOrder flag with SQLITE_TESTCTRL_OPTIMIZER
-  ** to disable this optimization for testing purposes.
-  */
-  if( sqlite3ExprListCompare(p->pGroupBy, pOrderBy)==0
-         && OptimizationEnabled(db, SQLITE_GroupByOrder) ){
-    pOrderBy = 0;
-  }
-
   /* If the query is DISTINCT with an ORDER BY but is not an aggregate, and 
   ** if the select-list is the same as the ORDER BY list, then this query
   ** can be rewritten as a GROUP BY. In other words, this:
@@ -100270,12 +105326,12 @@ SQLITE_PRIVATE int sqlite3Select(
   ** BY and DISTINCT, and an index or separate temp-table for the other.
   */
   if( (p->selFlags & (SF_Distinct|SF_Aggregate))==SF_Distinct 
-   && sqlite3ExprListCompare(pOrderBy, p->pEList)==0
+   && sqlite3ExprListCompare(sSort.pOrderBy, p->pEList, -1)==0
   ){
     p->selFlags &= ~SF_Distinct;
     p->pGroupBy = sqlite3ExprListDup(db, p->pEList, 0);
     pGroupBy = p->pGroupBy;
-    pOrderBy = 0;
+    sSort.pOrderBy = 0;
     /* Notice that even thought SF_Distinct has been cleared from p->selFlags,
     ** the sDistinct.isTnct is still set.  Hence, isTnct represents the
     ** original setting of the SF_Distinct flag, not the current setting */
@@ -100289,16 +105345,16 @@ SQLITE_PRIVATE int sqlite3Select(
   ** we figure out that the sorting index is not needed.  The addrSortIndex
   ** variable is used to facilitate that change.
   */
-  if( pOrderBy ){
+  if( sSort.pOrderBy ){
     KeyInfo *pKeyInfo;
-    pKeyInfo = keyInfoFromExprList(pParse, pOrderBy);
-    pOrderBy->iECursor = pParse->nTab++;
-    p->addrOpenEphm[2] = addrSortIndex =
+    pKeyInfo = keyInfoFromExprList(pParse, sSort.pOrderBy, 0, 0);
+    sSort.iECursor = pParse->nTab++;
+    sSort.addrSortIndex =
       sqlite3VdbeAddOp4(v, OP_OpenEphemeral,
-                           pOrderBy->iECursor, pOrderBy->nExpr+2, 0,
-                           (char*)pKeyInfo, P4_KEYINFO_HANDOFF);
+                           sSort.iECursor, sSort.pOrderBy->nExpr+2, 0,
+                           (char*)pKeyInfo, P4_KEYINFO);
   }else{
-    addrSortIndex = -1;
+    sSort.addrSortIndex = -1;
   }
 
   /* If the output is destined for a temporary table, open that table.
@@ -100310,11 +105366,11 @@ SQLITE_PRIVATE int sqlite3Select(
   /* Set the limiter.
   */
   iEnd = sqlite3VdbeMakeLabel(v);
-  p->nSelectRow = (double)LARGEST_INT64;
+  p->nSelectRow = LARGEST_INT64;
   computeLimitRegisters(pParse, p, iEnd);
-  if( p->iLimit==0 && addrSortIndex>=0 ){
-    sqlite3VdbeGetOp(v, addrSortIndex)->opcode = OP_SorterOpen;
-    p->selFlags |= SF_UseSorter;
+  if( p->iLimit==0 && sSort.addrSortIndex>=0 ){
+    sqlite3VdbeGetOp(v, sSort.addrSortIndex)->opcode = OP_SorterOpen;
+    sSort.sortFlags |= SORTFLAG_UseSorter;
   }
 
   /* Open a virtual index to use for the distinct set.
@@ -100323,8 +105379,8 @@ SQLITE_PRIVATE int sqlite3Select(
     sDistinct.tabTnct = pParse->nTab++;
     sDistinct.addrTnct = sqlite3VdbeAddOp4(v, OP_OpenEphemeral,
                                 sDistinct.tabTnct, 0, 0,
-                                (char*)keyInfoFromExprList(pParse, p->pEList),
-                                P4_KEYINFO_HANDOFF);
+                                (char*)keyInfoFromExprList(pParse, p->pEList,0,0),
+                                P4_KEYINFO);
     sqlite3VdbeChangeP5(v, BTREE_UNORDERED);
     sDistinct.eTnctType = WHERE_DISTINCT_UNORDERED;
   }else{
@@ -100333,27 +105389,37 @@ SQLITE_PRIVATE int sqlite3Select(
 
   if( !isAgg && pGroupBy==0 ){
     /* No aggregate functions and no GROUP BY clause */
-    ExprList *pDist = (sDistinct.isTnct ? p->pEList : 0);
+    u16 wctrlFlags = (sDistinct.isTnct ? WHERE_WANT_DISTINCT : 0);
 
     /* Begin the database scan. */
-    pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pOrderBy, pDist, 0,0);
+    pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, sSort.pOrderBy,
+                               p->pEList, wctrlFlags, 0);
     if( pWInfo==0 ) goto select_end;
-    if( pWInfo->nRowOut < p->nSelectRow ) p->nSelectRow = pWInfo->nRowOut;
-    if( pWInfo->eDistinct ) sDistinct.eTnctType = pWInfo->eDistinct;
-    if( pOrderBy && pWInfo->nOBSat==pOrderBy->nExpr ) pOrderBy = 0;
+    if( sqlite3WhereOutputRowCount(pWInfo) < p->nSelectRow ){
+      p->nSelectRow = sqlite3WhereOutputRowCount(pWInfo);
+    }
+    if( sDistinct.isTnct && sqlite3WhereIsDistinct(pWInfo) ){
+      sDistinct.eTnctType = sqlite3WhereIsDistinct(pWInfo);
+    }
+    if( sSort.pOrderBy ){
+      sSort.nOBSat = sqlite3WhereIsOrdered(pWInfo);
+      if( sSort.nOBSat==sSort.pOrderBy->nExpr ){
+        sSort.pOrderBy = 0;
+      }
+    }
 
     /* If sorting index that was created by a prior OP_OpenEphemeral 
     ** instruction ended up not being needed, then change the OP_OpenEphemeral
     ** into an OP_Noop.
     */
-    if( addrSortIndex>=0 && pOrderBy==0 ){
-      sqlite3VdbeChangeToNoop(v, addrSortIndex);
-      p->addrOpenEphm[2] = -1;
+    if( sSort.addrSortIndex>=0 && sSort.pOrderBy==0 ){
+      sqlite3VdbeChangeToNoop(v, sSort.addrSortIndex);
     }
 
     /* Use the standard inner loop. */
-    selectInnerLoop(pParse, p, pEList, 0, 0, pOrderBy, &sDistinct, pDest,
-                    pWInfo->iContinue, pWInfo->iBreak);
+    selectInnerLoop(pParse, p, pEList, -1, &sSort, &sDistinct, pDest,
+                    sqlite3WhereContinueLabel(pWInfo),
+                    sqlite3WhereBreakLabel(pWInfo));
 
     /* End the database scan loop.
     */
@@ -100372,6 +105438,7 @@ SQLITE_PRIVATE int sqlite3Select(
     int addrEnd;        /* End of processing for this SELECT */
     int sortPTab = 0;   /* Pseudotable used to decode sorting results */
     int sortOut = 0;    /* Output register from the sorter */
+    int orderByGrp = 0; /* True if the GROUP BY and ORDER BY are the same */
 
     /* Remove any and all aliases between the result set and the
     ** GROUP BY clause.
@@ -100381,16 +105448,28 @@ SQLITE_PRIVATE int sqlite3Select(
       struct ExprList_item *pItem;  /* For looping over expression in a list */
 
       for(k=p->pEList->nExpr, pItem=p->pEList->a; k>0; k--, pItem++){
-        pItem->iAlias = 0;
+        pItem->u.x.iAlias = 0;
       }
       for(k=pGroupBy->nExpr, pItem=pGroupBy->a; k>0; k--, pItem++){
-        pItem->iAlias = 0;
+        pItem->u.x.iAlias = 0;
       }
-      if( p->nSelectRow>(double)100 ) p->nSelectRow = (double)100;
+      if( p->nSelectRow>100 ) p->nSelectRow = 100;
     }else{
-      p->nSelectRow = (double)1;
+      p->nSelectRow = 1;
     }
 
+
+    /* If there is both a GROUP BY and an ORDER BY clause and they are
+    ** identical, then it may be possible to disable the ORDER BY clause 
+    ** on the grounds that the GROUP BY will cause elements to come out 
+    ** in the correct order. It also may not - the GROUP BY may use a
+    ** database index that causes rows to be grouped together as required
+    ** but not actually sorted. Either way, record the fact that the
+    ** ORDER BY and GROUP BY clauses are the same by setting the orderByGrp
+    ** variable.  */
+    if( sqlite3ExprListCompare(pGroupBy, sSort.pOrderBy, -1)==0 ){
+      orderByGrp = 1;
+    }
  
     /* Create a label to jump to when we want to abort the query */
     addrEnd = sqlite3VdbeMakeLabel(v);
@@ -100403,10 +105482,11 @@ SQLITE_PRIVATE int sqlite3Select(
     sNC.pParse = pParse;
     sNC.pSrcList = pTabList;
     sNC.pAggInfo = &sAggInfo;
+    sAggInfo.mnReg = pParse->nMem+1;
     sAggInfo.nSortingColumn = pGroupBy ? pGroupBy->nExpr+1 : 0;
     sAggInfo.pGroupBy = pGroupBy;
     sqlite3ExprAnalyzeAggList(&sNC, pEList);
-    sqlite3ExprAnalyzeAggList(&sNC, pOrderBy);
+    sqlite3ExprAnalyzeAggList(&sNC, sSort.pOrderBy);
     if( pHaving ){
       sqlite3ExprAnalyzeAggregates(&sNC, pHaving);
     }
@@ -100417,6 +105497,7 @@ SQLITE_PRIVATE int sqlite3Select(
       sqlite3ExprAnalyzeAggList(&sNC, sAggInfo.aFunc[i].pExpr->x.pList);
       sNC.ncFlags &= ~NC_InAggFunc;
     }
+    sAggInfo.mxReg = pParse->nMem;
     if( db->mallocFailed ) goto select_end;
 
     /* Processing for aggregates with GROUP BY is very different and
@@ -100439,10 +105520,10 @@ SQLITE_PRIVATE int sqlite3Select(
       ** will be converted into a Noop.  
       */
       sAggInfo.sortingIdx = pParse->nTab++;
-      pKeyInfo = keyInfoFromExprList(pParse, pGroupBy);
+      pKeyInfo = keyInfoFromExprList(pParse, pGroupBy, 0, 0);
       addrSortingIdx = sqlite3VdbeAddOp4(v, OP_SorterOpen, 
           sAggInfo.sortingIdx, sAggInfo.nSortingColumn, 
-          0, (char*)pKeyInfo, P4_KEYINFO_HANDOFF);
+          0, (char*)pKeyInfo, P4_KEYINFO);
 
       /* Initialize memory locations used by GROUP BY aggregate processing
       */
@@ -100468,9 +105549,11 @@ SQLITE_PRIVATE int sqlite3Select(
       ** in the right order to begin with.
       */
       sqlite3VdbeAddOp2(v, OP_Gosub, regReset, addrReset);
-      pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pGroupBy, 0, 0, 0);
+      pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pGroupBy, 0,
+          WHERE_GROUPBY | (orderByGrp ? WHERE_SORTBYGROUP : 0), 0
+      );
       if( pWInfo==0 ) goto select_end;
-      if( pWInfo->nOBSat==pGroupBy->nExpr ){
+      if( sqlite3WhereIsOrdered(pWInfo)==pGroupBy->nExpr ){
         /* The optimizer is able to deliver rows in group by order so
         ** we do not have to sort.  The OP_OpenEphemeral table will be
         ** cancelled later because we still need to use the pKeyInfo
@@ -100530,9 +105613,24 @@ SQLITE_PRIVATE int sqlite3Select(
         sortOut = sqlite3GetTempReg(pParse);
         sqlite3VdbeAddOp3(v, OP_OpenPseudo, sortPTab, sortOut, nCol);
         sqlite3VdbeAddOp2(v, OP_SorterSort, sAggInfo.sortingIdx, addrEnd);
-        VdbeComment((v, "GROUP BY sort"));
+        VdbeComment((v, "GROUP BY sort")); VdbeCoverage(v);
         sAggInfo.useSortingIdx = 1;
         sqlite3ExprCacheClear(pParse);
+
+      }
+
+      /* If the index or temporary table used by the GROUP BY sort
+      ** will naturally deliver rows in the order required by the ORDER BY
+      ** clause, cancel the ephemeral table open coded earlier.
+      **
+      ** This is an optimization - the correct answer should result regardless.
+      ** Use the SQLITE_GroupByOrder flag with SQLITE_TESTCTRL_OPTIMIZER to 
+      ** disable this optimization for testing purposes.  */
+      if( orderByGrp && OptimizationEnabled(db, SQLITE_GroupByOrder) 
+       && (groupBySort || sqlite3WhereIsSorted(pWInfo))
+      ){
+        sSort.pOrderBy = 0;
+        sqlite3VdbeChangeToNoop(v, sSort.addrSortIndex);
       }
 
       /* Evaluate the current GROUP BY terms and store in b0, b1, b2...
@@ -100555,9 +105653,9 @@ SQLITE_PRIVATE int sqlite3Select(
         }
       }
       sqlite3VdbeAddOp4(v, OP_Compare, iAMem, iBMem, pGroupBy->nExpr,
-                          (char*)pKeyInfo, P4_KEYINFO);
+                          (char*)sqlite3KeyInfoRef(pKeyInfo), P4_KEYINFO);
       j1 = sqlite3VdbeCurrentAddr(v);
-      sqlite3VdbeAddOp3(v, OP_Jump, j1+1, 0, j1+1);
+      sqlite3VdbeAddOp3(v, OP_Jump, j1+1, 0, j1+1); VdbeCoverage(v);
 
       /* Generate code that runs whenever the GROUP BY changes.
       ** Changes in the GROUP BY are detected by the previous code
@@ -100571,7 +105669,7 @@ SQLITE_PRIVATE int sqlite3Select(
       sqlite3ExprCodeMove(pParse, iBMem, iAMem, pGroupBy->nExpr);
       sqlite3VdbeAddOp2(v, OP_Gosub, regOutputRow, addrOutputRow);
       VdbeComment((v, "output one row"));
-      sqlite3VdbeAddOp2(v, OP_IfPos, iAbortFlag, addrEnd);
+      sqlite3VdbeAddOp2(v, OP_IfPos, iAbortFlag, addrEnd); VdbeCoverage(v);
       VdbeComment((v, "check abort flag"));
       sqlite3VdbeAddOp2(v, OP_Gosub, regReset, addrReset);
       VdbeComment((v, "reset accumulator"));
@@ -100588,6 +105686,7 @@ SQLITE_PRIVATE int sqlite3Select(
       */
       if( groupBySort ){
         sqlite3VdbeAddOp2(v, OP_SorterNext, sAggInfo.sortingIdx, addrTopOfLoop);
+        VdbeCoverage(v);
       }else{
         sqlite3WhereEnd(pWInfo);
         sqlite3VdbeChangeToNoop(v, addrSortingIdx);
@@ -100615,12 +105714,12 @@ SQLITE_PRIVATE int sqlite3Select(
       sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
       sqlite3VdbeResolveLabel(v, addrOutputRow);
       addrOutputRow = sqlite3VdbeCurrentAddr(v);
-      sqlite3VdbeAddOp2(v, OP_IfPos, iUseFlag, addrOutputRow+2);
+      sqlite3VdbeAddOp2(v, OP_IfPos, iUseFlag, addrOutputRow+2); VdbeCoverage(v);
       VdbeComment((v, "Groupby result generator entry point"));
       sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
       finalizeAggFunctions(pParse, &sAggInfo);
       sqlite3ExprIfFalse(pParse, pHaving, addrOutputRow+1, SQLITE_JUMPIFNULL);
-      selectInnerLoop(pParse, p, p->pEList, 0, 0, pOrderBy,
+      selectInnerLoop(pParse, p, p->pEList, -1, &sSort,
                       &sDistinct, pDest,
                       addrOutputRow+1, addrSetAbort);
       sqlite3VdbeAddOp1(v, OP_Return, regOutputRow);
@@ -100661,33 +105760,34 @@ SQLITE_PRIVATE int sqlite3Select(
         sqlite3CodeVerifySchema(pParse, iDb);
         sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
 
-        /* Search for the index that has the least amount of columns. If
-        ** there is such an index, and it has less columns than the table
-        ** does, then we can assume that it consumes less space on disk and
-        ** will therefore be cheaper to scan to determine the query result.
-        ** In this case set iRoot to the root page number of the index b-tree
-        ** and pKeyInfo to the KeyInfo structure required to navigate the
-        ** index.
+        /* Search for the index that has the lowest scan cost.
         **
         ** (2011-04-15) Do not do a full scan of an unordered index.
         **
+        ** (2013-10-03) Do not count the entries in a partial index.
+        **
         ** In practice the KeyInfo structure will not be used. It is only 
         ** passed to keep OP_OpenRead happy.
         */
+        if( !HasRowid(pTab) ) pBest = sqlite3PrimaryKeyIndex(pTab);
         for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
-          if( pIdx->bUnordered==0 && (!pBest || pIdx->nColumn<pBest->nColumn) ){
+          if( pIdx->bUnordered==0
+           && pIdx->szIdxRow<pTab->szTabRow
+           && pIdx->pPartIdxWhere==0
+           && (!pBest || pIdx->szIdxRow<pBest->szIdxRow)
+          ){
             pBest = pIdx;
           }
         }
-        if( pBest && pBest->nColumn<pTab->nCol ){
+        if( pBest ){
           iRoot = pBest->tnum;
-          pKeyInfo = sqlite3IndexKeyinfo(pParse, pBest);
+          pKeyInfo = sqlite3KeyInfoOfIndex(pParse, pBest);
         }
 
         /* Open a read-only cursor, execute the OP_Count, close the cursor. */
-        sqlite3VdbeAddOp3(v, OP_OpenRead, iCsr, iRoot, iDb);
+        sqlite3VdbeAddOp4Int(v, OP_OpenRead, iCsr, iRoot, iDb, 1);
         if( pKeyInfo ){
-          sqlite3VdbeChangeP4(v, -1, (char *)pKeyInfo, P4_KEYINFO_HANDOFF);
+          sqlite3VdbeChangeP4(v, -1, (char *)pKeyInfo, P4_KEYINFO);
         }
         sqlite3VdbeAddOp2(v, OP_Count, iCsr, sAggInfo.aFunc[0].iMem);
         sqlite3VdbeAddOp1(v, OP_Close, iCsr);
@@ -100751,8 +105851,8 @@ SQLITE_PRIVATE int sqlite3Select(
         }
         updateAccumulator(pParse, &sAggInfo);
         assert( pMinMax==0 || pMinMax->nExpr==1 );
-        if( pWInfo->nOBSat>0 ){
-          sqlite3VdbeAddOp2(v, OP_Goto, 0, pWInfo->iBreak);
+        if( sqlite3WhereIsOrdered(pWInfo)>0 ){
+          sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3WhereBreakLabel(pWInfo));
           VdbeComment((v, "%s() by index",
                 (flag==WHERE_ORDERBY_MIN?"min":"max")));
         }
@@ -100760,9 +105860,9 @@ SQLITE_PRIVATE int sqlite3Select(
         finalizeAggFunctions(pParse, &sAggInfo);
       }
 
-      pOrderBy = 0;
+      sSort.pOrderBy = 0;
       sqlite3ExprIfFalse(pParse, pHaving, addrEnd, SQLITE_JUMPIFNULL);
-      selectInnerLoop(pParse, p, p->pEList, 0, 0, 0, 0, 
+      selectInnerLoop(pParse, p, p->pEList, -1, 0, 0, 
                       pDest, addrEnd, addrEnd);
       sqlite3ExprListDelete(db, pDel);
     }
@@ -100777,9 +105877,9 @@ SQLITE_PRIVATE int sqlite3Select(
   /* If there is an ORDER BY clause, then we need to sort the results
   ** and send them to the callback one by one.
   */
-  if( pOrderBy ){
-    explainTempTable(pParse, "ORDER BY");
-    generateSortTail(pParse, p, v, pEList->nExpr, pDest);
+  if( sSort.pOrderBy ){
+    explainTempTable(pParse, sSort.nOBSat>0 ? "RIGHT PART OF ORDER BY":"ORDER BY");
+    generateSortTail(pParse, p, &sSort, pEList->nExpr, pDest);
   }
 
   /* Jump here to skip this query
@@ -100887,10 +105987,6 @@ SQLITE_PRIVATE void sqlite3ExplainSelect(Vdbe *pVdbe, Select *p){
     sqlite3ExplainPrintf(pVdbe, "(null-select)");
     return;
   }
-  while( p->pPrior ){
-    p->pPrior->pNext = p;
-    p = p->pPrior;
-  }
   sqlite3ExplainPush(pVdbe);
   while( p ){
     explainOneSelect(pVdbe, p);
@@ -101257,8 +106353,8 @@ SQLITE_PRIVATE void sqlite3BeginTrigger(
   /* Ensure the table name matches database name and that the table exists */
   if( db->mallocFailed ) goto trigger_cleanup;
   assert( pTableName->nSrc==1 );
-  if( sqlite3FixInit(&sFix, pParse, iDb, "trigger", pName) && 
-      sqlite3FixSrcList(&sFix, pTableName) ){
+  sqlite3FixInit(&sFix, pParse, iDb, "trigger", pName);
+  if( sqlite3FixSrcList(&sFix, pTableName) ){
     goto trigger_cleanup;
   }
   pTab = sqlite3SrcListLookup(pParse, pTableName);
@@ -101400,8 +106496,10 @@ SQLITE_PRIVATE void sqlite3FinishTrigger(
   }
   nameToken.z = pTrig->zName;
   nameToken.n = sqlite3Strlen30(nameToken.z);
-  if( sqlite3FixInit(&sFix, pParse, iDb, "trigger", &nameToken) 
-          && sqlite3FixTriggerStep(&sFix, pTrig->step_list) ){
+  sqlite3FixInit(&sFix, pParse, iDb, "trigger", &nameToken);
+  if( sqlite3FixTriggerStep(&sFix, pTrig->step_list) 
+   || sqlite3FixExpr(&sFix, pTrig->pWhen) 
+  ){
     goto triggerfinish_cleanup;
   }
 
@@ -101504,25 +106602,21 @@ SQLITE_PRIVATE TriggerStep *sqlite3TriggerInsertStep(
   sqlite3 *db,        /* The database connection */
   Token *pTableName,  /* Name of the table into which we insert */
   IdList *pColumn,    /* List of columns in pTableName to insert into */
-  ExprList *pEList,   /* The VALUE clause: a list of values to be inserted */
   Select *pSelect,    /* A SELECT statement that supplies values */
   u8 orconf           /* The conflict algorithm (OE_Abort, OE_Replace, etc.) */
 ){
   TriggerStep *pTriggerStep;
 
-  assert(pEList == 0 || pSelect == 0);
-  assert(pEList != 0 || pSelect != 0 || db->mallocFailed);
+  assert(pSelect != 0 || db->mallocFailed);
 
   pTriggerStep = triggerStepAllocate(db, TK_INSERT, pTableName);
   if( pTriggerStep ){
     pTriggerStep->pSelect = sqlite3SelectDup(db, pSelect, EXPRDUP_REDUCE);
     pTriggerStep->pIdList = pColumn;
-    pTriggerStep->pExprList = sqlite3ExprListDup(db, pEList, EXPRDUP_REDUCE);
     pTriggerStep->orconf = orconf;
   }else{
     sqlite3IdListDelete(db, pColumn);
   }
-  sqlite3ExprListDelete(db, pEList);
   sqlite3SelectDelete(db, pSelect);
 
   return pTriggerStep;
@@ -101677,6 +106771,7 @@ SQLITE_PRIVATE void sqlite3DropTriggerPtr(Parse *pParse, Trigger *pTrigger){
   assert( pTable!=0 );
   if( (v = sqlite3GetVdbe(pParse))!=0 ){
     int base;
+    static const int iLn = VDBE_OFFSET_LINENO(2);
     static const VdbeOpList dropTrigger[] = {
       { OP_Rewind,     0, ADDR(9),  0},
       { OP_String8,    0, 1,        0}, /* 1 */
@@ -101691,7 +106786,7 @@ SQLITE_PRIVATE void sqlite3DropTriggerPtr(Parse *pParse, Trigger *pTrigger){
 
     sqlite3BeginWriteOperation(pParse, 0, iDb);
     sqlite3OpenMasterTable(pParse, iDb);
-    base = sqlite3VdbeAddOpList(v,  ArraySize(dropTrigger), dropTrigger);
+    base = sqlite3VdbeAddOpList(v,  ArraySize(dropTrigger), dropTrigger, iLn);
     sqlite3VdbeChangeP4(v, base+1, pTrigger->zName, P4_TRANSIENT);
     sqlite3VdbeChangeP4(v, base+4, "trigger", P4_STATIC);
     sqlite3ChangeCookie(pParse, iDb);
@@ -101837,15 +106932,7 @@ static int codeTriggerProgram(
     **   INSERT OR IGNORE INTO t1 ... ;  -- insert into t2 uses IGNORE policy
     */
     pParse->eOrconf = (orconf==OE_Default)?pStep->orconf:(u8)orconf;
-
-    /* Clear the cookieGoto flag. When coding triggers, the cookieGoto 
-    ** variable is used as a flag to indicate to sqlite3ExprCodeConstants()
-    ** that it is not safe to refactor constants (this happens after the
-    ** start of the first loop in the SQL statement is coded - at that 
-    ** point code may be conditionally executed, so it is no longer safe to 
-    ** initialize constant register values).  */
-    assert( pParse->cookieGoto==0 || pParse->cookieGoto==-1 );
-    pParse->cookieGoto = 0;
+    assert( pParse->okConstFactor==0 );
 
     switch( pStep->op ){
       case TK_UPDATE: {
@@ -101860,7 +106947,6 @@ static int codeTriggerProgram(
       case TK_INSERT: {
         sqlite3Insert(pParse, 
           targetSrcList(pParse, pStep),
-          sqlite3ExprListDup(db, pStep->pExprList, 0), 
           sqlite3SelectDup(db, pStep->pSelect, 0), 
           sqlite3IdListDup(db, pStep->pIdList), 
           pParse->eOrconf
@@ -101891,7 +106977,7 @@ static int codeTriggerProgram(
   return 0;
 }
 
-#ifdef SQLITE_DEBUG
+#ifdef SQLITE_ENABLE_EXPLAIN_COMMENTS
 /*
 ** This function is used to add VdbeComment() annotations to a VDBE
 ** program. It is not used in production code, only for debugging.
@@ -102031,6 +107117,7 @@ static TriggerPrg *codeRowTrigger(
 
   assert( !pSubParse->pAinc       && !pSubParse->pZombieTab );
   assert( !pSubParse->pTriggerPrg && !pSubParse->nMaxArg );
+  sqlite3ParserReset(pSubParse);
   sqlite3StackFree(db, pSubParse);
 
   return pPrg;
@@ -102111,7 +107198,7 @@ SQLITE_PRIVATE void sqlite3CodeRowTriggerDirect(
 /*
 ** This is called to code the required FOR EACH ROW triggers for an operation
 ** on table pTab. The operation to code triggers for (INSERT, UPDATE or DELETE)
-** is given by the op paramater. The tr_tm parameter determines whether the
+** is given by the op parameter. The tr_tm parameter determines whether the
 ** BEFORE or AFTER triggers are coded. If the operation is an UPDATE, then
 ** parameter pChanges is passed the list of columns being modified.
 **
@@ -102305,7 +107392,7 @@ static void updateVirtualTable(
 SQLITE_PRIVATE void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i, int iReg){
   assert( pTab!=0 );
   if( !pTab->pSelect ){
-    sqlite3_value *pValue;
+    sqlite3_value *pValue = 0;
     u8 enc = ENC(sqlite3VdbeDb(v));
     Column *pCol = &pTab->aCol[i];
     VdbeComment((v, "%s.%s", pTab->zName, pCol->zName));
@@ -102316,7 +107403,7 @@ SQLITE_PRIVATE void sqlite3ColumnDefault(Vdbe *v, Table *pTab, int i, int iReg){
       sqlite3VdbeChangeP4(v, -1, (const char *)pValue, P4_MEM);
     }
 #ifndef SQLITE_OMIT_FLOATING_POINT
-    if( iReg>=0 && pTab->aCol[i].affinity==SQLITE_AFF_REAL ){
+    if( pTab->aCol[i].affinity==SQLITE_AFF_REAL ){
       sqlite3VdbeAddOp1(v, OP_RealAffinity, iReg);
     }
 #endif
@@ -102339,25 +107426,32 @@ SQLITE_PRIVATE void sqlite3Update(
 ){
   int i, j;              /* Loop counters */
   Table *pTab;           /* The table to be updated */
-  int addr = 0;          /* VDBE instruction address of the start of the loop */
+  int addrTop = 0;       /* VDBE instruction address of the start of the loop */
   WhereInfo *pWInfo;     /* Information about the WHERE clause */
   Vdbe *v;               /* The virtual database engine */
   Index *pIdx;           /* For looping over indices */
+  Index *pPk;            /* The PRIMARY KEY index for WITHOUT ROWID tables */
   int nIdx;              /* Number of indices that need updating */
-  int iCur;              /* VDBE Cursor number of pTab */
+  int iBaseCur;          /* Base cursor number */
+  int iDataCur;          /* Cursor for the canonical data btree */
+  int iIdxCur;           /* Cursor for the first index */
   sqlite3 *db;           /* The database structure */
   int *aRegIdx = 0;      /* One register assigned to each index to be updated */
   int *aXRef = 0;        /* aXRef[i] is the index in pChanges->a[] of the
                          ** an expression for the i-th column of the table.
                          ** aXRef[i]==-1 if the i-th column is not changed. */
-  int chngRowid;         /* True if the record number is being changed */
+  u8 *aToOpen;           /* 1 for tables and indices to be opened */
+  u8 chngPk;             /* PRIMARY KEY changed in a WITHOUT ROWID table */
+  u8 chngRowid;          /* Rowid changed in a normal table */
+  u8 chngKey;            /* Either chngPk or chngRowid */
   Expr *pRowidExpr = 0;  /* Expression defining the new record number */
-  int openAll = 0;       /* True if all indices need to be opened */
   AuthContext sContext;  /* The authorization context */
   NameContext sNC;       /* The name-context to resolve expressions in */
   int iDb;               /* Database containing the table being updated */
   int okOnePass;         /* True for one-pass algorithm without the FIFO */
   int hasFK;             /* True if foreign key processing is required */
+  int labelBreak;        /* Jump here to break out of UPDATE loop */
+  int labelContinue;     /* Jump here to continue next step of UPDATE loop */
 
 #ifndef SQLITE_OMIT_TRIGGER
   int isView;            /* True when updating a view (INSTEAD OF trigger) */
@@ -102365,6 +107459,9 @@ SQLITE_PRIVATE void sqlite3Update(
   int tmask;             /* Mask of TRIGGER_BEFORE|TRIGGER_AFTER */
 #endif
   int newmask;           /* Mask of NEW.* columns accessed by BEFORE triggers */
+  int iEph = 0;          /* Ephemeral table holding all primary key values */
+  int nKey = 0;          /* Number of elements in regKey for WITHOUT ROWID */
+  int aiCurOnePass[2];   /* The write cursors opened by WHERE_ONEPASS */
 
   /* Register Allocations */
   int regRowCount = 0;   /* A count of rows changed */
@@ -102373,6 +107470,7 @@ SQLITE_PRIVATE void sqlite3Update(
   int regNew;            /* Content of the NEW.* table in triggers */
   int regOld = 0;        /* Content of OLD.* table in triggers */
   int regRowSet = 0;     /* Rowset of rows to be updated */
+  int regKey = 0;        /* composite PRIMARY KEY value */
 
   memset(&sContext, 0, sizeof(sContext));
   db = pParse->db;
@@ -102410,20 +107508,34 @@ SQLITE_PRIVATE void sqlite3Update(
   if( sqlite3IsReadOnly(pParse, pTab, tmask) ){
     goto update_cleanup;
   }
-  aXRef = sqlite3DbMallocRaw(db, sizeof(int) * pTab->nCol );
-  if( aXRef==0 ) goto update_cleanup;
-  for(i=0; i<pTab->nCol; i++) aXRef[i] = -1;
 
   /* Allocate a cursors for the main database table and for all indices.
   ** The index cursors might not be used, but if they are used they
   ** need to occur right after the database cursor.  So go ahead and
   ** allocate enough space, just in case.
   */
-  pTabList->a[0].iCursor = iCur = pParse->nTab++;
-  for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+  pTabList->a[0].iCursor = iBaseCur = iDataCur = pParse->nTab++;
+  iIdxCur = iDataCur+1;
+  pPk = HasRowid(pTab) ? 0 : sqlite3PrimaryKeyIndex(pTab);
+  for(nIdx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdx++){
+    if( IsPrimaryKeyIndex(pIdx) && pPk!=0 ){
+      iDataCur = pParse->nTab;
+      pTabList->a[0].iCursor = iDataCur;
+    }
     pParse->nTab++;
   }
 
+  /* Allocate space for aXRef[], aRegIdx[], and aToOpen[].  
+  ** Initialize aXRef[] and aToOpen[] to their default values.
+  */
+  aXRef = sqlite3DbMallocRaw(db, sizeof(int) * (pTab->nCol+nIdx) + nIdx+2 );
+  if( aXRef==0 ) goto update_cleanup;
+  aRegIdx = aXRef+pTab->nCol;
+  aToOpen = (u8*)(aRegIdx+nIdx);
+  memset(aToOpen, 1, nIdx+1);
+  aToOpen[nIdx+1] = 0;
+  for(i=0; i<pTab->nCol; i++) aXRef[i] = -1;
+
   /* Initialize the name-context */
   memset(&sNC, 0, sizeof(sNC));
   sNC.pParse = pParse;
@@ -102435,7 +107547,7 @@ SQLITE_PRIVATE void sqlite3Update(
   ** column to be updated, make sure we have authorization to change
   ** that column.
   */
-  chngRowid = 0;
+  chngRowid = chngPk = 0;
   for(i=0; i<pChanges->nExpr; i++){
     if( sqlite3ResolveExprNames(&sNC, pChanges->a[i].pExpr) ){
       goto update_cleanup;
@@ -102445,13 +107557,15 @@ SQLITE_PRIVATE void sqlite3Update(
         if( j==pTab->iPKey ){
           chngRowid = 1;
           pRowidExpr = pChanges->a[i].pExpr;
+        }else if( pPk && (pTab->aCol[j].colFlags & COLFLAG_PRIMKEY)!=0 ){
+          chngPk = 1;
         }
         aXRef[j] = i;
         break;
       }
     }
     if( j>=pTab->nCol ){
-      if( sqlite3IsRowid(pChanges->a[i].zName) ){
+      if( pPk==0 && sqlite3IsRowid(pChanges->a[i].zName) ){
         j = -1;
         chngRowid = 1;
         pRowidExpr = pChanges->a[i].pExpr;
@@ -102475,32 +107589,36 @@ SQLITE_PRIVATE void sqlite3Update(
     }
 #endif
   }
+  assert( (chngRowid & chngPk)==0 );
+  assert( chngRowid==0 || chngRowid==1 );
+  assert( chngPk==0 || chngPk==1 );
+  chngKey = chngRowid + chngPk;
 
-  hasFK = sqlite3FkRequired(pParse, pTab, aXRef, chngRowid);
-
-  /* Allocate memory for the array aRegIdx[].  There is one entry in the
-  ** array for each index associated with table being updated.  Fill in
-  ** the value with a register number for indices that are to be used
-  ** and with zero for unused indices.
+  /* The SET expressions are not actually used inside the WHERE loop.
+  ** So reset the colUsed mask
+  */
+  pTabList->a[0].colUsed = 0;
+
+  hasFK = sqlite3FkRequired(pParse, pTab, aXRef, chngKey);
+
+  /* There is one entry in the aRegIdx[] array for each index on the table
+  ** being updated.  Fill in aRegIdx[] with a register number that will hold
+  ** the key for accessing each index.  
   */
-  for(nIdx=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, nIdx++){}
-  if( nIdx>0 ){
-    aRegIdx = sqlite3DbMallocRaw(db, sizeof(Index*) * nIdx );
-    if( aRegIdx==0 ) goto update_cleanup;
-  }
   for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
     int reg;
-    if( hasFK || chngRowid ){
+    if( chngKey || hasFK || pIdx->pPartIdxWhere || pIdx==pPk ){
       reg = ++pParse->nMem;
     }else{
       reg = 0;
-      for(i=0; i<pIdx->nColumn; i++){
+      for(i=0; i<pIdx->nKeyCol; i++){
         if( aXRef[pIdx->aiColumn[i]]>=0 ){
           reg = ++pParse->nMem;
           break;
         }
       }
     }
+    if( reg==0 ) aToOpen[j+1] = 0;
     aRegIdx[j] = reg;
   }
 
@@ -102524,11 +107642,11 @@ SQLITE_PRIVATE void sqlite3Update(
   /* Allocate required registers. */
   regRowSet = ++pParse->nMem;
   regOldRowid = regNewRowid = ++pParse->nMem;
-  if( pTrigger || hasFK ){
+  if( chngPk || pTrigger || hasFK ){
     regOld = pParse->nMem + 1;
     pParse->nMem += pTab->nCol;
   }
-  if( chngRowid || pTrigger || hasFK ){
+  if( chngKey || pTrigger || hasFK ){
     regNewRowid = ++pParse->nMem;
   }
   regNew = pParse->nMem + 1;
@@ -102544,7 +107662,7 @@ SQLITE_PRIVATE void sqlite3Update(
   */
 #if !defined(SQLITE_OMIT_VIEW) && !defined(SQLITE_OMIT_TRIGGER)
   if( isView ){
-    sqlite3MaterializeView(pParse, pTab, pWhere, iCur);
+    sqlite3MaterializeView(pParse, pTab, pWhere, iDataCur);
   }
 #endif
 
@@ -102557,24 +107675,58 @@ SQLITE_PRIVATE void sqlite3Update(
 
   /* Begin the database scan
   */
-  sqlite3VdbeAddOp3(v, OP_Null, 0, regRowSet, regOldRowid);
-  pWInfo = sqlite3WhereBegin(
-      pParse, pTabList, pWhere, 0, 0, WHERE_ONEPASS_DESIRED, 0
-  );
-  if( pWInfo==0 ) goto update_cleanup;
-  okOnePass = pWInfo->okOnePass;
+  if( HasRowid(pTab) ){
+    sqlite3VdbeAddOp3(v, OP_Null, 0, regRowSet, regOldRowid);
+    pWInfo = sqlite3WhereBegin(
+        pParse, pTabList, pWhere, 0, 0, WHERE_ONEPASS_DESIRED, iIdxCur
+    );
+    if( pWInfo==0 ) goto update_cleanup;
+    okOnePass = sqlite3WhereOkOnePass(pWInfo, aiCurOnePass);
+  
+    /* Remember the rowid of every item to be updated.
+    */
+    sqlite3VdbeAddOp2(v, OP_Rowid, iDataCur, regOldRowid);
+    if( !okOnePass ){
+      sqlite3VdbeAddOp2(v, OP_RowSetAdd, regRowSet, regOldRowid);
+    }
+  
+    /* End the database scan loop.
+    */
+    sqlite3WhereEnd(pWInfo);
+  }else{
+    int iPk;         /* First of nPk memory cells holding PRIMARY KEY value */
+    i16 nPk;         /* Number of components of the PRIMARY KEY */
+    int addrOpen;    /* Address of the OpenEphemeral instruction */
 
-  /* Remember the rowid of every item to be updated.
-  */
-  sqlite3VdbeAddOp2(v, OP_Rowid, iCur, regOldRowid);
-  if( !okOnePass ){
-    sqlite3VdbeAddOp2(v, OP_RowSetAdd, regRowSet, regOldRowid);
+    assert( pPk!=0 );
+    nPk = pPk->nKeyCol;
+    iPk = pParse->nMem+1;
+    pParse->nMem += nPk;
+    regKey = ++pParse->nMem;
+    iEph = pParse->nTab++;
+    sqlite3VdbeAddOp2(v, OP_Null, 0, iPk);
+    addrOpen = sqlite3VdbeAddOp2(v, OP_OpenEphemeral, iEph, nPk);
+    sqlite3VdbeSetP4KeyInfo(pParse, pPk);
+    pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, 0, 0, 
+                               WHERE_ONEPASS_DESIRED, iIdxCur);
+    if( pWInfo==0 ) goto update_cleanup;
+    okOnePass = sqlite3WhereOkOnePass(pWInfo, aiCurOnePass);
+    for(i=0; i<nPk; i++){
+      sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, pPk->aiColumn[i],
+                                      iPk+i);
+    }
+    if( okOnePass ){
+      sqlite3VdbeChangeToNoop(v, addrOpen);
+      nKey = nPk;
+      regKey = iPk;
+    }else{
+      sqlite3VdbeAddOp4(v, OP_MakeRecord, iPk, nPk, regKey,
+                        sqlite3IndexAffinityStr(v, pPk), nPk);
+      sqlite3VdbeAddOp2(v, OP_IdxInsert, iEph, regKey);
+    }
+    sqlite3WhereEnd(pWInfo);
   }
 
-  /* End the database scan loop.
-  */
-  sqlite3WhereEnd(pWInfo);
-
   /* Initialize the count of updated rows
   */
   if( (db->flags & SQLITE_CountRows) && !pParse->pTriggerTab ){
@@ -102582,6 +107734,7 @@ SQLITE_PRIVATE void sqlite3Update(
     sqlite3VdbeAddOp2(v, OP_Integer, 0, regRowCount);
   }
 
+  labelBreak = sqlite3VdbeMakeLabel(v);
   if( !isView ){
     /* 
     ** Open every index that needs updating.  Note that if any
@@ -102589,68 +107742,77 @@ SQLITE_PRIVATE void sqlite3Update(
     ** action, then we need to open all indices because we might need
     ** to be deleting some records.
     */
-    if( !okOnePass ) sqlite3OpenTable(pParse, iCur, iDb, pTab, OP_OpenWrite); 
     if( onError==OE_Replace ){
-      openAll = 1;
+      memset(aToOpen, 1, nIdx+1);
     }else{
-      openAll = 0;
       for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
         if( pIdx->onError==OE_Replace ){
-          openAll = 1;
+          memset(aToOpen, 1, nIdx+1);
           break;
         }
       }
     }
-    for(i=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
-      assert( aRegIdx );
-      if( openAll || aRegIdx[i]>0 ){
-        KeyInfo *pKey = sqlite3IndexKeyinfo(pParse, pIdx);
-        sqlite3VdbeAddOp4(v, OP_OpenWrite, iCur+i+1, pIdx->tnum, iDb,
-                       (char*)pKey, P4_KEYINFO_HANDOFF);
-        assert( pParse->nTab>iCur+i+1 );
-      }
+    if( okOnePass ){
+      if( aiCurOnePass[0]>=0 ) aToOpen[aiCurOnePass[0]-iBaseCur] = 0;
+      if( aiCurOnePass[1]>=0 ) aToOpen[aiCurOnePass[1]-iBaseCur] = 0;
     }
+    sqlite3OpenTableAndIndices(pParse, pTab, OP_OpenWrite, iBaseCur, aToOpen,
+                               0, 0);
   }
 
   /* Top of the update loop */
   if( okOnePass ){
-    int a1 = sqlite3VdbeAddOp1(v, OP_NotNull, regOldRowid);
-    addr = sqlite3VdbeAddOp0(v, OP_Goto);
-    sqlite3VdbeJumpHere(v, a1);
+    if( aToOpen[iDataCur-iBaseCur] ){
+      assert( pPk!=0 );
+      sqlite3VdbeAddOp4Int(v, OP_NotFound, iDataCur, labelBreak, regKey, nKey);
+      VdbeCoverageNeverTaken(v);
+    }
+    labelContinue = labelBreak;
+    sqlite3VdbeAddOp2(v, OP_IsNull, pPk ? regKey : regOldRowid, labelBreak);
+    VdbeCoverage(v);
+  }else if( pPk ){
+    labelContinue = sqlite3VdbeMakeLabel(v);
+    sqlite3VdbeAddOp2(v, OP_Rewind, iEph, labelBreak); VdbeCoverage(v);
+    addrTop = sqlite3VdbeAddOp2(v, OP_RowKey, iEph, regKey);
+    sqlite3VdbeAddOp4Int(v, OP_NotFound, iDataCur, labelContinue, regKey, 0);
+    VdbeCoverage(v);
   }else{
-    addr = sqlite3VdbeAddOp3(v, OP_RowSetRead, regRowSet, 0, regOldRowid);
+    labelContinue = sqlite3VdbeAddOp3(v, OP_RowSetRead, regRowSet, labelBreak,
+                             regOldRowid);
+    VdbeCoverage(v);
+    sqlite3VdbeAddOp3(v, OP_NotExists, iDataCur, labelContinue, regOldRowid);
+    VdbeCoverage(v);
   }
 
-  /* Make cursor iCur point to the record that is being updated. If
-  ** this record does not exist for some reason (deleted by a trigger,
-  ** for example, then jump to the next iteration of the RowSet loop.  */
-  sqlite3VdbeAddOp3(v, OP_NotExists, iCur, addr, regOldRowid);
-
   /* If the record number will change, set register regNewRowid to
   ** contain the new value. If the record number is not being modified,
   ** then regNewRowid is the same register as regOldRowid, which is
   ** already populated.  */
-  assert( chngRowid || pTrigger || hasFK || regOldRowid==regNewRowid );
+  assert( chngKey || pTrigger || hasFK || regOldRowid==regNewRowid );
   if( chngRowid ){
     sqlite3ExprCode(pParse, pRowidExpr, regNewRowid);
-    sqlite3VdbeAddOp1(v, OP_MustBeInt, regNewRowid);
+    sqlite3VdbeAddOp1(v, OP_MustBeInt, regNewRowid); VdbeCoverage(v);
   }
 
-  /* If there are triggers on this table, populate an array of registers 
-  ** with the required old.* column data.  */
-  if( hasFK || pTrigger ){
+  /* Compute the old pre-UPDATE content of the row being changed, if that
+  ** information is needed */
+  if( chngPk || hasFK || pTrigger ){
     u32 oldmask = (hasFK ? sqlite3FkOldmask(pParse, pTab) : 0);
     oldmask |= sqlite3TriggerColmask(pParse, 
         pTrigger, pChanges, 0, TRIGGER_BEFORE|TRIGGER_AFTER, pTab, onError
     );
     for(i=0; i<pTab->nCol; i++){
-      if( aXRef[i]<0 || oldmask==0xffffffff || (i<32 && (oldmask & (1<<i))) ){
-        sqlite3ExprCodeGetColumnOfTable(v, pTab, iCur, i, regOld+i);
+      if( oldmask==0xffffffff
+       || (i<32 && (oldmask & MASKBIT32(i))!=0)
+       || (pTab->aCol[i].colFlags & COLFLAG_PRIMKEY)!=0
+      ){
+        testcase(  oldmask!=0xffffffff && i==31 );
+        sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, i, regOld+i);
       }else{
         sqlite3VdbeAddOp2(v, OP_Null, 0, regOld+i);
       }
     }
-    if( chngRowid==0 ){
+    if( chngRowid==0 && pPk==0 ){
       sqlite3VdbeAddOp2(v, OP_Copy, regOldRowid, regNewRowid);
     }
   }
@@ -102671,15 +107833,15 @@ SQLITE_PRIVATE void sqlite3Update(
   newmask = sqlite3TriggerColmask(
       pParse, pTrigger, pChanges, 1, TRIGGER_BEFORE, pTab, onError
   );
-  sqlite3VdbeAddOp3(v, OP_Null, 0, regNew, regNew+pTab->nCol-1);
+  /*sqlite3VdbeAddOp3(v, OP_Null, 0, regNew, regNew+pTab->nCol-1);*/
   for(i=0; i<pTab->nCol; i++){
     if( i==pTab->iPKey ){
-      /*sqlite3VdbeAddOp2(v, OP_Null, 0, regNew+i);*/
+      sqlite3VdbeAddOp2(v, OP_Null, 0, regNew+i);
     }else{
       j = aXRef[i];
       if( j>=0 ){
         sqlite3ExprCode(pParse, pChanges->a[j].pExpr, regNew+i);
-      }else if( 0==(tmask&TRIGGER_BEFORE) || i>31 || (newmask&(1<<i)) ){
+      }else if( 0==(tmask&TRIGGER_BEFORE) || i>31 || (newmask & MASKBIT32(i)) ){
         /* This branch loads the value of a column that will not be changed 
         ** into a register. This is done if there are no BEFORE triggers, or
         ** if there are one or more BEFORE triggers that use this value via
@@ -102687,8 +107849,9 @@ SQLITE_PRIVATE void sqlite3Update(
         */
         testcase( i==31 );
         testcase( i==32 );
-        sqlite3VdbeAddOp3(v, OP_Column, iCur, i, regNew+i);
-        sqlite3ColumnDefault(v, pTab, i, regNew+i);
+        sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, i, regNew+i);
+      }else{
+        sqlite3VdbeAddOp2(v, OP_Null, 0, regNew+i);
       }
     }
   }
@@ -102697,10 +107860,9 @@ SQLITE_PRIVATE void sqlite3Update(
   ** verified. One could argue that this is wrong.
   */
   if( tmask&TRIGGER_BEFORE ){
-    sqlite3VdbeAddOp2(v, OP_Affinity, regNew, pTab->nCol);
-    sqlite3TableAffinityStr(v, pTab);
+    sqlite3TableAffinity(v, pTab, regNew);
     sqlite3CodeRowTrigger(pParse, pTrigger, TK_UPDATE, pChanges, 
-        TRIGGER_BEFORE, pTab, regOldRowid, onError, addr);
+        TRIGGER_BEFORE, pTab, regOldRowid, onError, labelContinue);
 
     /* The row-trigger may have deleted the row being updated. In this
     ** case, jump to the next row. No updates or AFTER triggers are 
@@ -102708,7 +107870,13 @@ SQLITE_PRIVATE void sqlite3Update(
     ** is deleted or renamed by a BEFORE trigger - is left undefined in the
     ** documentation.
     */
-    sqlite3VdbeAddOp3(v, OP_NotExists, iCur, addr, regOldRowid);
+    if( pPk ){
+      sqlite3VdbeAddOp4Int(v, OP_NotFound, iDataCur, labelContinue,regKey,nKey);
+      VdbeCoverage(v);
+    }else{
+      sqlite3VdbeAddOp3(v, OP_NotExists, iDataCur, labelContinue, regOldRowid);
+      VdbeCoverage(v);
+    }
 
     /* If it did not delete it, the row-trigger may still have modified 
     ** some of the columns of the row being updated. Load the values for 
@@ -102717,46 +107885,57 @@ SQLITE_PRIVATE void sqlite3Update(
     */
     for(i=0; i<pTab->nCol; i++){
       if( aXRef[i]<0 && i!=pTab->iPKey ){
-        sqlite3VdbeAddOp3(v, OP_Column, iCur, i, regNew+i);
-        sqlite3ColumnDefault(v, pTab, i, regNew+i);
+        sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, i, regNew+i);
       }
     }
   }
 
   if( !isView ){
-    int j1;                       /* Address of jump instruction */
+    int j1 = 0;           /* Address of jump instruction */
+    int bReplace = 0;     /* True if REPLACE conflict resolution might happen */
 
     /* Do constraint checks. */
-    sqlite3GenerateConstraintChecks(pParse, pTab, iCur, regNewRowid,
-        aRegIdx, (chngRowid?regOldRowid:0), 1, onError, addr, 0);
+    assert( regOldRowid>0 );
+    sqlite3GenerateConstraintChecks(pParse, pTab, aRegIdx, iDataCur, iIdxCur,
+        regNewRowid, regOldRowid, chngKey, onError, labelContinue, &bReplace);
 
     /* Do FK constraint checks. */
     if( hasFK ){
-      sqlite3FkCheck(pParse, pTab, regOldRowid, 0);
+      sqlite3FkCheck(pParse, pTab, regOldRowid, 0, aXRef, chngKey);
     }
 
     /* Delete the index entries associated with the current record.  */
-    j1 = sqlite3VdbeAddOp3(v, OP_NotExists, iCur, 0, regOldRowid);
-    sqlite3GenerateRowIndexDelete(pParse, pTab, iCur, aRegIdx);
+    if( bReplace || chngKey ){
+      if( pPk ){
+        j1 = sqlite3VdbeAddOp4Int(v, OP_NotFound, iDataCur, 0, regKey, nKey);
+      }else{
+        j1 = sqlite3VdbeAddOp3(v, OP_NotExists, iDataCur, 0, regOldRowid);
+      }
+      VdbeCoverageNeverTaken(v);
+    }
+    sqlite3GenerateRowIndexDelete(pParse, pTab, iDataCur, iIdxCur, aRegIdx);
   
     /* If changing the record number, delete the old record.  */
-    if( hasFK || chngRowid ){
-      sqlite3VdbeAddOp2(v, OP_Delete, iCur, 0);
+    if( hasFK || chngKey || pPk!=0 ){
+      sqlite3VdbeAddOp2(v, OP_Delete, iDataCur, 0);
+    }
+    if( bReplace || chngKey ){
+      sqlite3VdbeJumpHere(v, j1);
     }
-    sqlite3VdbeJumpHere(v, j1);
 
     if( hasFK ){
-      sqlite3FkCheck(pParse, pTab, 0, regNewRowid);
+      sqlite3FkCheck(pParse, pTab, 0, regNewRowid, aXRef, chngKey);
     }
   
     /* Insert the new index entries and the new record. */
-    sqlite3CompleteInsertion(pParse, pTab, iCur, regNewRowid, aRegIdx, 1, 0, 0);
+    sqlite3CompleteInsertion(pParse, pTab, iDataCur, iIdxCur,
+                             regNewRowid, aRegIdx, 1, 0, 0);
 
     /* Do any ON CASCADE, SET NULL or SET DEFAULT operations required to
     ** handle rows (possibly in other tables) that refer via a foreign key
     ** to the row just updated. */ 
     if( hasFK ){
-      sqlite3FkActions(pParse, pTab, pChanges, regOldRowid);
+      sqlite3FkActions(pParse, pTab, pChanges, regOldRowid, aXRef, chngKey);
     }
   }
 
@@ -102767,22 +107946,29 @@ SQLITE_PRIVATE void sqlite3Update(
   }
 
   sqlite3CodeRowTrigger(pParse, pTrigger, TK_UPDATE, pChanges, 
-      TRIGGER_AFTER, pTab, regOldRowid, onError, addr);
+      TRIGGER_AFTER, pTab, regOldRowid, onError, labelContinue);
 
   /* Repeat the above with the next record to be updated, until
   ** all record selected by the WHERE clause have been updated.
   */
-  sqlite3VdbeAddOp2(v, OP_Goto, 0, addr);
-  sqlite3VdbeJumpHere(v, addr);
+  if( okOnePass ){
+    /* Nothing to do at end-of-loop for a single-pass */
+  }else if( pPk ){
+    sqlite3VdbeResolveLabel(v, labelContinue);
+    sqlite3VdbeAddOp2(v, OP_Next, iEph, addrTop); VdbeCoverage(v);
+  }else{
+    sqlite3VdbeAddOp2(v, OP_Goto, 0, labelContinue);
+  }
+  sqlite3VdbeResolveLabel(v, labelBreak);
 
   /* Close all tables */
   for(i=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, i++){
     assert( aRegIdx );
-    if( openAll || aRegIdx[i]>0 ){
-      sqlite3VdbeAddOp2(v, OP_Close, iCur+i+1, 0);
+    if( aToOpen[i+1] ){
+      sqlite3VdbeAddOp2(v, OP_Close, iIdxCur+i, 0);
     }
   }
-  sqlite3VdbeAddOp2(v, OP_Close, iCur, 0);
+  if( iDataCur<iIdxCur ) sqlite3VdbeAddOp2(v, OP_Close, iDataCur, 0);
 
   /* Update the sqlite_sequence table by storing the content of the
   ** maximum rowid counter values recorded while inserting into
@@ -102805,8 +107991,7 @@ SQLITE_PRIVATE void sqlite3Update(
 
 update_cleanup:
   sqlite3AuthContextPop(&sContext);
-  sqlite3DbFree(db, aRegIdx);
-  sqlite3DbFree(db, aXRef);
+  sqlite3DbFree(db, aXRef); /* Also frees aRegIdx[] and aToOpen[] */
   sqlite3SrcListDelete(db, pTabList);
   sqlite3ExprListDelete(db, pChanges);
   sqlite3ExprDelete(db, pWhere);
@@ -102899,7 +108084,7 @@ static void updateVirtualTable(
   /* Generate code to scan the ephemeral table and call VUpdate. */
   iReg = ++pParse->nMem;
   pParse->nMem += pTab->nCol+1;
-  addr = sqlite3VdbeAddOp2(v, OP_Rewind, ephemTab, 0);
+  addr = sqlite3VdbeAddOp2(v, OP_Rewind, ephemTab, 0); VdbeCoverage(v);
   sqlite3VdbeAddOp3(v, OP_Column,  ephemTab, 0, iReg);
   sqlite3VdbeAddOp3(v, OP_Column, ephemTab, (pRowid?1:0), iReg+1);
   for(i=0; i<pTab->nCol; i++){
@@ -102909,7 +108094,7 @@ static void updateVirtualTable(
   sqlite3VdbeAddOp4(v, OP_VUpdate, 0, pTab->nCol+2, iReg, pVTab, P4_VTAB);
   sqlite3VdbeChangeP5(v, onError==OE_Default ? OE_Abort : onError);
   sqlite3MayAbort(pParse);
-  sqlite3VdbeAddOp2(v, OP_Next, ephemTab, addr+1);
+  sqlite3VdbeAddOp2(v, OP_Next, ephemTab, addr+1); VdbeCoverage(v);
   sqlite3VdbeJumpHere(v, addr);
   sqlite3VdbeAddOp2(v, OP_Close, ephemTab, 0);
 
@@ -102992,14 +108177,34 @@ static int execExecSql(sqlite3 *db, char **pzErrMsg, const char *zSql){
 }
 
 /*
-** The non-standard VACUUM command is used to clean up the database,
+** The VACUUM command is used to clean up the database,
 ** collapse free space, etc.  It is modelled after the VACUUM command
-** in PostgreSQL.
+** in PostgreSQL.  The VACUUM command works as follows:
 **
-** In version 1.0.x of SQLite, the VACUUM command would call
-** gdbm_reorganize() on all the database tables.  But beginning
-** with 2.0.0, SQLite no longer uses GDBM so this command has
-** become a no-op.
+**   (1)  Create a new transient database file
+**   (2)  Copy all content from the database being vacuumed into
+**        the new transient database file
+**   (3)  Copy content from the transient database back into the
+**        original database.
+**
+** The transient database requires temporary disk space approximately
+** equal to the size of the original database.  The copy operation of
+** step (3) requires additional temporary disk space approximately equal
+** to the size of the original database for the rollback journal.
+** Hence, temporary disk space that is approximately 2x the size of the
+** orginal database is required.  Every page of the database is written
+** approximately 3 times:  Once for step (2) and twice for step (3).
+** Two writes per page are required in step (3) because the original
+** database content must be written into the rollback journal prior to
+** overwriting the database with the vacuumed content.
+**
+** Only 1x temporary space and only 1x writes would be required if
+** the copy of step (3) were replace by deleting the original database
+** and renaming the transient database as the original.  But that will
+** not work if other processes are attached to the original database.
+** And a power loss in between deleting the original and renaming the
+** transient would cause the database file to appear to be deleted
+** following reboot.
 */
 SQLITE_PRIVATE void sqlite3Vacuum(Parse *pParse){
   Vdbe *v = sqlite3GetVdbe(pParse);
@@ -103031,7 +108236,7 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){
     sqlite3SetString(pzErrMsg, db, "cannot VACUUM from within a transaction");
     return SQLITE_ERROR;
   }
-  if( db->activeVdbeCnt>1 ){
+  if( db->nVdbeActive>1 ){
     sqlite3SetString(pzErrMsg, db,"cannot VACUUM - SQL statements in progress");
     return SQLITE_ERROR;
   }
@@ -103134,7 +108339,7 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){
   rc = execExecSql(db, pzErrMsg,
       "SELECT 'CREATE TABLE vacuum_db.' || substr(sql,14) "
       "  FROM sqlite_master WHERE type='table' AND name!='sqlite_sequence'"
-      "   AND rootpage>0"
+      "   AND coalesce(rootpage,1)>0"
   );
   if( rc!=SQLITE_OK ) goto end_of_vacuum;
   rc = execExecSql(db, pzErrMsg,
@@ -103155,7 +108360,7 @@ SQLITE_PRIVATE int sqlite3RunVacuum(char **pzErrMsg, sqlite3 *db){
       "|| ' SELECT * FROM main.' || quote(name) || ';'"
       "FROM main.sqlite_master "
       "WHERE type = 'table' AND name!='sqlite_sequence' "
-      "  AND rootpage>0"
+      "  AND coalesce(rootpage,1)>0"
   );
   if( rc!=SQLITE_OK ) goto end_of_vacuum;
 
@@ -104009,6 +109214,7 @@ SQLITE_API int sqlite3_declare_vtab(sqlite3 *db, const char *zCreateTable){
       sqlite3VdbeFinalize(pParse->pVdbe);
     }
     sqlite3DeleteTable(db, pParse->pNewTable);
+    sqlite3ParserReset(pParse);
     sqlite3StackFree(db, pParse);
   }
 
@@ -104081,10 +109287,9 @@ static void callFinaliser(sqlite3 *db, int offset){
 ** array. Return the error code for the first error that occurs, or
 ** SQLITE_OK if all xSync operations are successful.
 **
-** Set *pzErrmsg to point to a buffer that should be released using 
-** sqlite3DbFree() containing an error message, if one is available.
+** If an error message is available, leave it in p->zErrMsg.
 */
-SQLITE_PRIVATE int sqlite3VtabSync(sqlite3 *db, char **pzErrmsg){
+SQLITE_PRIVATE int sqlite3VtabSync(sqlite3 *db, Vdbe *p){
   int i;
   int rc = SQLITE_OK;
   VTable **aVTrans = db->aVTrans;
@@ -104095,9 +109300,7 @@ SQLITE_PRIVATE int sqlite3VtabSync(sqlite3 *db, char **pzErrmsg){
     sqlite3_vtab *pVtab = aVTrans[i]->pVtab;
     if( pVtab && (x = pVtab->pModule->xSync)!=0 ){
       rc = x(pVtab);
-      sqlite3DbFree(db, *pzErrmsg);
-      *pzErrmsg = sqlite3DbStrDup(db, pVtab->zErrMsg);
-      sqlite3_free(pVtab->zErrMsg);
+      sqlite3VtabImportErrmsg(p, pVtab);
     }
   }
   db->aVTrans = aVTrans;
@@ -104287,7 +109490,7 @@ SQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction(
   memcpy(pNew->zName, pDef->zName, sqlite3Strlen30(pDef->zName)+1);
   pNew->xFunc = xFunc;
   pNew->pUserData = pArg;
-  pNew->flags |= SQLITE_FUNC_EPHEM;
+  pNew->funcFlags |= SQLITE_FUNC_EPHEM;
   return pNew;
 }
 
@@ -104389,7 +109592,24 @@ SQLITE_API int sqlite3_vtab_config(sqlite3 *db, int op, ...){
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 */
-
+/************** Include whereInt.h in the middle of where.c ******************/
+/************** Begin file whereInt.h ****************************************/
+/*
+** 2013-11-12
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+** This file contains structure and macro definitions for the query
+** planner logic in "where.c".  These definitions are broken out into
+** a separate source file for easier editing.
+*/
 
 /*
 ** Trace output macros
@@ -104399,18 +109619,169 @@ SQLITE_API int sqlite3_vtab_config(sqlite3 *db, int op, ...){
 #endif
 #if defined(SQLITE_DEBUG) \
     && (defined(SQLITE_TEST) || defined(SQLITE_ENABLE_WHERETRACE))
-# define WHERETRACE(X)  if(sqlite3WhereTrace) sqlite3DebugPrintf X
+# define WHERETRACE(K,X)  if(sqlite3WhereTrace&(K)) sqlite3DebugPrintf X
+# define WHERETRACE_ENABLED 1
 #else
-# define WHERETRACE(X)
+# define WHERETRACE(K,X)
 #endif
 
-/* Forward reference
+/* Forward references
 */
 typedef struct WhereClause WhereClause;
 typedef struct WhereMaskSet WhereMaskSet;
 typedef struct WhereOrInfo WhereOrInfo;
 typedef struct WhereAndInfo WhereAndInfo;
-typedef struct WhereCost WhereCost;
+typedef struct WhereLevel WhereLevel;
+typedef struct WhereLoop WhereLoop;
+typedef struct WherePath WherePath;
+typedef struct WhereTerm WhereTerm;
+typedef struct WhereLoopBuilder WhereLoopBuilder;
+typedef struct WhereScan WhereScan;
+typedef struct WhereOrCost WhereOrCost;
+typedef struct WhereOrSet WhereOrSet;
+
+/*
+** This object contains information needed to implement a single nested
+** loop in WHERE clause.
+**
+** Contrast this object with WhereLoop.  This object describes the
+** implementation of the loop.  WhereLoop describes the algorithm.
+** This object contains a pointer to the WhereLoop algorithm as one of
+** its elements.
+**
+** The WhereInfo object contains a single instance of this object for
+** each term in the FROM clause (which is to say, for each of the
+** nested loops as implemented).  The order of WhereLevel objects determines
+** the loop nested order, with WhereInfo.a[0] being the outer loop and
+** WhereInfo.a[WhereInfo.nLevel-1] being the inner loop.
+*/
+struct WhereLevel {
+  int iLeftJoin;        /* Memory cell used to implement LEFT OUTER JOIN */
+  int iTabCur;          /* The VDBE cursor used to access the table */
+  int iIdxCur;          /* The VDBE cursor used to access pIdx */
+  int addrBrk;          /* Jump here to break out of the loop */
+  int addrNxt;          /* Jump here to start the next IN combination */
+  int addrSkip;         /* Jump here for next iteration of skip-scan */
+  int addrCont;         /* Jump here to continue with the next loop cycle */
+  int addrFirst;        /* First instruction of interior of the loop */
+  int addrBody;         /* Beginning of the body of this loop */
+  u8 iFrom;             /* Which entry in the FROM clause */
+  u8 op, p3, p5;        /* Opcode, P3 & P5 of the opcode that ends the loop */
+  int p1, p2;           /* Operands of the opcode used to ends the loop */
+  union {               /* Information that depends on pWLoop->wsFlags */
+    struct {
+      int nIn;              /* Number of entries in aInLoop[] */
+      struct InLoop {
+        int iCur;              /* The VDBE cursor used by this IN operator */
+        int addrInTop;         /* Top of the IN loop */
+        u8 eEndLoopOp;         /* IN Loop terminator. OP_Next or OP_Prev */
+      } *aInLoop;           /* Information about each nested IN operator */
+    } in;                 /* Used when pWLoop->wsFlags&WHERE_IN_ABLE */
+    Index *pCovidx;       /* Possible covering index for WHERE_MULTI_OR */
+  } u;
+  struct WhereLoop *pWLoop;  /* The selected WhereLoop object */
+  Bitmask notReady;          /* FROM entries not usable at this level */
+};
+
+/*
+** Each instance of this object represents an algorithm for evaluating one
+** term of a join.  Every term of the FROM clause will have at least
+** one corresponding WhereLoop object (unless INDEXED BY constraints
+** prevent a query solution - which is an error) and many terms of the
+** FROM clause will have multiple WhereLoop objects, each describing a
+** potential way of implementing that FROM-clause term, together with
+** dependencies and cost estimates for using the chosen algorithm.
+**
+** Query planning consists of building up a collection of these WhereLoop
+** objects, then computing a particular sequence of WhereLoop objects, with
+** one WhereLoop object per FROM clause term, that satisfy all dependencies
+** and that minimize the overall cost.
+*/
+struct WhereLoop {
+  Bitmask prereq;       /* Bitmask of other loops that must run first */
+  Bitmask maskSelf;     /* Bitmask identifying table iTab */
+#ifdef SQLITE_DEBUG
+  char cId;             /* Symbolic ID of this loop for debugging use */
+#endif
+  u8 iTab;              /* Position in FROM clause of table for this loop */
+  u8 iSortIdx;          /* Sorting index number.  0==None */
+  LogEst rSetup;        /* One-time setup cost (ex: create transient index) */
+  LogEst rRun;          /* Cost of running each loop */
+  LogEst nOut;          /* Estimated number of output rows */
+  union {
+    struct {               /* Information for internal btree tables */
+      u16 nEq;               /* Number of equality constraints */
+      u16 nSkip;             /* Number of initial index columns to skip */
+      Index *pIndex;         /* Index used, or NULL */
+    } btree;
+    struct {               /* Information for virtual tables */
+      int idxNum;            /* Index number */
+      u8 needFree;           /* True if sqlite3_free(idxStr) is needed */
+      i8 isOrdered;          /* True if satisfies ORDER BY */
+      u16 omitMask;          /* Terms that may be omitted */
+      char *idxStr;          /* Index identifier string */
+    } vtab;
+  } u;
+  u32 wsFlags;          /* WHERE_* flags describing the plan */
+  u16 nLTerm;           /* Number of entries in aLTerm[] */
+  /**** whereLoopXfer() copies fields above ***********************/
+# define WHERE_LOOP_XFER_SZ offsetof(WhereLoop,nLSlot)
+  u16 nLSlot;           /* Number of slots allocated for aLTerm[] */
+  WhereTerm **aLTerm;   /* WhereTerms used */
+  WhereLoop *pNextLoop; /* Next WhereLoop object in the WhereClause */
+  WhereTerm *aLTermSpace[4];  /* Initial aLTerm[] space */
+};
+
+/* This object holds the prerequisites and the cost of running a
+** subquery on one operand of an OR operator in the WHERE clause.
+** See WhereOrSet for additional information 
+*/
+struct WhereOrCost {
+  Bitmask prereq;     /* Prerequisites */
+  LogEst rRun;        /* Cost of running this subquery */
+  LogEst nOut;        /* Number of outputs for this subquery */
+};
+
+/* The WhereOrSet object holds a set of possible WhereOrCosts that
+** correspond to the subquery(s) of OR-clause processing.  Only the
+** best N_OR_COST elements are retained.
+*/
+#define N_OR_COST 3
+struct WhereOrSet {
+  u16 n;                      /* Number of valid a[] entries */
+  WhereOrCost a[N_OR_COST];   /* Set of best costs */
+};
+
+
+/* Forward declaration of methods */
+static int whereLoopResize(sqlite3*, WhereLoop*, int);
+
+/*
+** Each instance of this object holds a sequence of WhereLoop objects
+** that implement some or all of a query plan.
+**
+** Think of each WhereLoop object as a node in a graph with arcs
+** showing dependencies and costs for travelling between nodes.  (That is
+** not a completely accurate description because WhereLoop costs are a
+** vector, not a scalar, and because dependencies are many-to-one, not
+** one-to-one as are graph nodes.  But it is a useful visualization aid.)
+** Then a WherePath object is a path through the graph that visits some
+** or all of the WhereLoop objects once.
+**
+** The "solver" works by creating the N best WherePath objects of length
+** 1.  Then using those as a basis to compute the N best WherePath objects
+** of length 2.  And so forth until the length of WherePaths equals the
+** number of nodes in the FROM clause.  The best (lowest cost) WherePath
+** at the end is the choosen query plan.
+*/
+struct WherePath {
+  Bitmask maskLoop;     /* Bitmask of all WhereLoop objects in this path */
+  Bitmask revLoop;      /* aLoop[]s that should be reversed for ORDER BY */
+  LogEst nRow;          /* Estimated number of rows generated by this path */
+  LogEst rCost;         /* Total cost of this path */
+  i8 isOrdered;         /* No. of ORDER BY terms satisfied. -1 for unknown */
+  WhereLoop **aLoop;    /* Array of WhereLoop objects implementing this path */
+};
 
 /*
 ** The query generator uses an array of instances of this structure to
@@ -104438,9 +109809,9 @@ typedef struct WhereCost WhereCost;
 **
 **         (t1.X <op> <expr>) OR (t1.Y <op> <expr>) OR ....
 **
-** In this second case, wtFlag as the TERM_ORINFO set and eOperator==WO_OR
+** In this second case, wtFlag has the TERM_ORINFO bit set and eOperator==WO_OR
 ** and the WhereTerm.u.pOrInfo field points to auxiliary information that
-** is collected about the
+** is collected about the OR clause.
 **
 ** If a term in the WHERE clause does not match either of the two previous
 ** categories, then eOperator==0.  The WhereTerm.pExpr field is still set
@@ -104463,7 +109834,6 @@ typedef struct WhereCost WhereCost;
 ** in prereqRight and prereqAll.  The default is 64 bits, hence SQLite
 ** is only able to process joins with 64 or fewer tables.
 */
-typedef struct WhereTerm WhereTerm;
 struct WhereTerm {
   Expr *pExpr;            /* Pointer to the subexpression that is this term */
   int iParent;            /* Disable pWC->a[iParent] when this term disabled */
@@ -104473,6 +109843,7 @@ struct WhereTerm {
     WhereOrInfo *pOrInfo;   /* Extra information if (eOperator & WO_OR)!=0 */
     WhereAndInfo *pAndInfo; /* Extra information if (eOperator& WO_AND)!=0 */
   } u;
+  LogEst truthProb;       /* Probability of truth for this expression */
   u16 eOperator;          /* A WO_xx value describing <op> */
   u8 wtFlags;             /* TERM_xxx bit flags.  See below */
   u8 nChild;              /* Number of children that must disable us */
@@ -104491,12 +109862,28 @@ struct WhereTerm {
 #define TERM_ORINFO     0x10   /* Need to free the WhereTerm.u.pOrInfo object */
 #define TERM_ANDINFO    0x20   /* Need to free the WhereTerm.u.pAndInfo obj */
 #define TERM_OR_OK      0x40   /* Used during OR-clause processing */
-#ifdef SQLITE_ENABLE_STAT3
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
 #  define TERM_VNULL    0x80   /* Manufactured x>NULL or x<=NULL term */
 #else
 #  define TERM_VNULL    0x00   /* Disabled if not using stat3 */
 #endif
 
+/*
+** An instance of the WhereScan object is used as an iterator for locating
+** terms in the WHERE clause that are useful to the query planner.
+*/
+struct WhereScan {
+  WhereClause *pOrigWC;      /* Original, innermost WhereClause */
+  WhereClause *pWC;          /* WhereClause currently being scanned */
+  char *zCollName;           /* Required collating sequence, if not NULL */
+  char idxaff;               /* Must match this affinity, if zCollName!=NULL */
+  unsigned char nEquiv;      /* Number of entries in aEquiv[] */
+  unsigned char iEquiv;      /* Next unused slot in aEquiv[] */
+  u32 opMask;                /* Acceptable operators */
+  int k;                     /* Resume scanning at this->pWC->a[this->k] */
+  int aEquiv[22];            /* Cursor,Column pairs for equivalence classes */
+};
+
 /*
 ** An instance of the following structure holds all information about a
 ** WHERE clause.  Mostly this is a container for one or more WhereTerms.
@@ -104510,11 +109897,9 @@ struct WhereTerm {
 ** subclauses points to the WhereClause object for the whole clause.
 */
 struct WhereClause {
-  Parse *pParse;           /* The parser context */
-  WhereMaskSet *pMaskSet;  /* Mapping of table cursor numbers to bitmasks */
+  WhereInfo *pWInfo;       /* WHERE clause processing context */
   WhereClause *pOuter;     /* Outer conjunction */
   u8 op;                   /* Split operator.  TK_AND or TK_OR */
-  u16 wctrlFlags;          /* Might include WHERE_AND_ONLY */
   int nTerm;               /* Number of terms */
   int nSlot;               /* Number of entries in a[] */
   WhereTerm *a;            /* Each a[] describes a term of the WHERE cluase */
@@ -104574,19 +109959,61 @@ struct WhereMaskSet {
 };
 
 /*
-** A WhereCost object records a lookup strategy and the estimated
-** cost of pursuing that strategy.
+** This object is a convenience wrapper holding all information needed
+** to construct WhereLoop objects for a particular query.
 */
-struct WhereCost {
-  WherePlan plan;    /* The lookup strategy */
-  double rCost;      /* Overall cost of pursuing this search strategy */
-  Bitmask used;      /* Bitmask of cursors used by this plan */
+struct WhereLoopBuilder {
+  WhereInfo *pWInfo;        /* Information about this WHERE */
+  WhereClause *pWC;         /* WHERE clause terms */
+  ExprList *pOrderBy;       /* ORDER BY clause */
+  WhereLoop *pNew;          /* Template WhereLoop */
+  WhereOrSet *pOrSet;       /* Record best loops here, if not NULL */
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  UnpackedRecord *pRec;     /* Probe for stat4 (if required) */
+  int nRecValid;            /* Number of valid fields currently in pRec */
+#endif
 };
 
 /*
-** Bitmasks for the operators that indices are able to exploit.  An
+** The WHERE clause processing routine has two halves.  The
+** first part does the start of the WHERE loop and the second
+** half does the tail of the WHERE loop.  An instance of
+** this structure is returned by the first half and passed
+** into the second half to give some continuity.
+**
+** An instance of this object holds the complete state of the query
+** planner.
+*/
+struct WhereInfo {
+  Parse *pParse;            /* Parsing and code generating context */
+  SrcList *pTabList;        /* List of tables in the join */
+  ExprList *pOrderBy;       /* The ORDER BY clause or NULL */
+  ExprList *pResultSet;     /* Result set. DISTINCT operates on these */
+  WhereLoop *pLoops;        /* List of all WhereLoop objects */
+  Bitmask revMask;          /* Mask of ORDER BY terms that need reversing */
+  LogEst nRowOut;           /* Estimated number of output rows */
+  u16 wctrlFlags;           /* Flags originally passed to sqlite3WhereBegin() */
+  i8 nOBSat;                /* Number of ORDER BY terms satisfied by indices */
+  u8 sorted;                /* True if really sorted (not just grouped) */
+  u8 okOnePass;             /* Ok to use one-pass algorithm for UPDATE/DELETE */
+  u8 untestedTerms;         /* Not all WHERE terms resolved by outer loop */
+  u8 eDistinct;             /* One of the WHERE_DISTINCT_* values below */
+  u8 nLevel;                /* Number of nested loop */
+  int iTop;                 /* The very beginning of the WHERE loop */
+  int iContinue;            /* Jump here to continue with next record */
+  int iBreak;               /* Jump here to break out of the loop */
+  int savedNQueryLoop;      /* pParse->nQueryLoop outside the WHERE loop */
+  int aiCurOnePass[2];      /* OP_OpenWrite cursors for the ONEPASS opt */
+  WhereMaskSet sMaskSet;    /* Map cursor numbers to bitmasks */
+  WhereClause sWC;          /* Decomposition of the WHERE clause */
+  WhereLevel a[1];          /* Information about each nest loop in WHERE */
+};
+
+/*
+** Bitmasks for the operators on WhereTerm objects.  These are all
+** operators that are of interest to the query planner.  An
 ** OR-ed combination of these values can be used when searching for
-** terms in the where clause.
+** particular WhereTerms within a WhereClause.
 */
 #define WO_IN     0x001
 #define WO_EQ     0x002
@@ -104605,74 +110032,138 @@ struct WhereCost {
 #define WO_SINGLE 0x0ff       /* Mask of all non-compound WO_* values */
 
 /*
-** Value for wsFlags returned by bestIndex() and stored in
-** WhereLevel.wsFlags.  These flags determine which search
-** strategies are appropriate.
+** These are definitions of bits in the WhereLoop.wsFlags field.
+** The particular combination of bits in each WhereLoop help to
+** determine the algorithm that WhereLoop represents.
+*/
+#define WHERE_COLUMN_EQ    0x00000001  /* x=EXPR */
+#define WHERE_COLUMN_RANGE 0x00000002  /* x<EXPR and/or x>EXPR */
+#define WHERE_COLUMN_IN    0x00000004  /* x IN (...) */
+#define WHERE_COLUMN_NULL  0x00000008  /* x IS NULL */
+#define WHERE_CONSTRAINT   0x0000000f  /* Any of the WHERE_COLUMN_xxx values */
+#define WHERE_TOP_LIMIT    0x00000010  /* x<EXPR or x<=EXPR constraint */
+#define WHERE_BTM_LIMIT    0x00000020  /* x>EXPR or x>=EXPR constraint */
+#define WHERE_BOTH_LIMIT   0x00000030  /* Both x>EXPR and x<EXPR */
+#define WHERE_IDX_ONLY     0x00000040  /* Use index only - omit table */
+#define WHERE_IPK          0x00000100  /* x is the INTEGER PRIMARY KEY */
+#define WHERE_INDEXED      0x00000200  /* WhereLoop.u.btree.pIndex is valid */
+#define WHERE_VIRTUALTABLE 0x00000400  /* WhereLoop.u.vtab is valid */
+#define WHERE_IN_ABLE      0x00000800  /* Able to support an IN operator */
+#define WHERE_ONEROW       0x00001000  /* Selects no more than one row */
+#define WHERE_MULTI_OR     0x00002000  /* OR using multiple indices */
+#define WHERE_AUTO_INDEX   0x00004000  /* Uses an ephemeral index */
+#define WHERE_SKIPSCAN     0x00008000  /* Uses the skip-scan algorithm */
+#define WHERE_UNQ_WANTED   0x00010000  /* WHERE_ONEROW would have been helpful*/
+
+/************** End of whereInt.h ********************************************/
+/************** Continuing where we left off in where.c **********************/
+
+/*
+** Return the estimated number of output rows from a WHERE clause
+*/
+SQLITE_PRIVATE u64 sqlite3WhereOutputRowCount(WhereInfo *pWInfo){
+  return sqlite3LogEstToInt(pWInfo->nRowOut);
+}
+
+/*
+** Return one of the WHERE_DISTINCT_xxxxx values to indicate how this
+** WHERE clause returns outputs for DISTINCT processing.
+*/
+SQLITE_PRIVATE int sqlite3WhereIsDistinct(WhereInfo *pWInfo){
+  return pWInfo->eDistinct;
+}
+
+/*
+** Return TRUE if the WHERE clause returns rows in ORDER BY order.
+** Return FALSE if the output needs to be sorted.
+*/
+SQLITE_PRIVATE int sqlite3WhereIsOrdered(WhereInfo *pWInfo){
+  return pWInfo->nOBSat;
+}
+
+/*
+** Return the VDBE address or label to jump to in order to continue
+** immediately with the next row of a WHERE clause.
+*/
+SQLITE_PRIVATE int sqlite3WhereContinueLabel(WhereInfo *pWInfo){
+  assert( pWInfo->iContinue!=0 );
+  return pWInfo->iContinue;
+}
+
+/*
+** Return the VDBE address or label to jump to in order to break
+** out of a WHERE loop.
+*/
+SQLITE_PRIVATE int sqlite3WhereBreakLabel(WhereInfo *pWInfo){
+  return pWInfo->iBreak;
+}
+
+/*
+** Return TRUE if an UPDATE or DELETE statement can operate directly on
+** the rowids returned by a WHERE clause.  Return FALSE if doing an
+** UPDATE or DELETE might change subsequent WHERE clause results.
 **
-** The least significant 12 bits is reserved as a mask for WO_ values above.
-** The WhereLevel.wsFlags field is usually set to WO_IN|WO_EQ|WO_ISNULL.
-** But if the table is the right table of a left join, WhereLevel.wsFlags
-** is set to WO_IN|WO_EQ.  The WhereLevel.wsFlags field can then be used as
-** the "op" parameter to findTerm when we are resolving equality constraints.
-** ISNULL constraints will then not be used on the right table of a left
-** join.  Tickets #2177 and #2189.
+** If the ONEPASS optimization is used (if this routine returns true)
+** then also write the indices of open cursors used by ONEPASS
+** into aiCur[0] and aiCur[1].  iaCur[0] gets the cursor of the data
+** table and iaCur[1] gets the cursor used by an auxiliary index.
+** Either value may be -1, indicating that cursor is not used.
+** Any cursors returned will have been opened for writing.
+**
+** aiCur[0] and aiCur[1] both get -1 if the where-clause logic is
+** unable to use the ONEPASS optimization.
 */
-#define WHERE_ROWID_EQ     0x00001000  /* rowid=EXPR or rowid IN (...) */
-#define WHERE_ROWID_RANGE  0x00002000  /* rowid<EXPR and/or rowid>EXPR */
-#define WHERE_COLUMN_EQ    0x00010000  /* x=EXPR or x IN (...) or x IS NULL */
-#define WHERE_COLUMN_RANGE 0x00020000  /* x<EXPR and/or x>EXPR */
-#define WHERE_COLUMN_IN    0x00040000  /* x IN (...) */
-#define WHERE_COLUMN_NULL  0x00080000  /* x IS NULL */
-#define WHERE_INDEXED      0x000f0000  /* Anything that uses an index */
-#define WHERE_NOT_FULLSCAN 0x100f3000  /* Does not do a full table scan */
-#define WHERE_IN_ABLE      0x080f1000  /* Able to support an IN operator */
-#define WHERE_TOP_LIMIT    0x00100000  /* x<EXPR or x<=EXPR constraint */
-#define WHERE_BTM_LIMIT    0x00200000  /* x>EXPR or x>=EXPR constraint */
-#define WHERE_BOTH_LIMIT   0x00300000  /* Both x>EXPR and x<EXPR */
-#define WHERE_IDX_ONLY     0x00400000  /* Use index only - omit table */
-#define WHERE_ORDERED      0x00800000  /* Output will appear in correct order */
-#define WHERE_REVERSE      0x01000000  /* Scan in reverse order */
-#define WHERE_UNIQUE       0x02000000  /* Selects no more than one row */
-#define WHERE_ALL_UNIQUE   0x04000000  /* This and all prior have one row */
-#define WHERE_OB_UNIQUE    0x00004000  /* Values in ORDER BY columns are 
-                                       ** different for every output row */
-#define WHERE_VIRTUALTABLE 0x08000000  /* Use virtual-table processing */
-#define WHERE_MULTI_OR     0x10000000  /* OR using multiple indices */
-#define WHERE_TEMP_INDEX   0x20000000  /* Uses an ephemeral index */
-#define WHERE_DISTINCT     0x40000000  /* Correct order for DISTINCT */
-#define WHERE_COVER_SCAN   0x80000000  /* Full scan of a covering index */
+SQLITE_PRIVATE int sqlite3WhereOkOnePass(WhereInfo *pWInfo, int *aiCur){
+  memcpy(aiCur, pWInfo->aiCurOnePass, sizeof(int)*2);
+  return pWInfo->okOnePass;
+}
 
 /*
-** This module contains many separate subroutines that work together to
-** find the best indices to use for accessing a particular table in a query.
-** An instance of the following structure holds context information about the
-** index search so that it can be more easily passed between the various
-** routines.
+** Move the content of pSrc into pDest
 */
-typedef struct WhereBestIdx WhereBestIdx;
-struct WhereBestIdx {
-  Parse *pParse;                  /* Parser context */
-  WhereClause *pWC;               /* The WHERE clause */
-  struct SrcList_item *pSrc;      /* The FROM clause term to search */
-  Bitmask notReady;               /* Mask of cursors not available */
-  Bitmask notValid;               /* Cursors not available for any purpose */
-  ExprList *pOrderBy;             /* The ORDER BY clause */
-  ExprList *pDistinct;            /* The select-list if query is DISTINCT */
-  sqlite3_index_info **ppIdxInfo; /* Index information passed to xBestIndex */
-  int i, n;                       /* Which loop is being coded; # of loops */
-  WhereLevel *aLevel;             /* Info about outer loops */
-  WhereCost cost;                 /* Lowest cost query plan */
-};
+static void whereOrMove(WhereOrSet *pDest, WhereOrSet *pSrc){
+  pDest->n = pSrc->n;
+  memcpy(pDest->a, pSrc->a, pDest->n*sizeof(pDest->a[0]));
+}
 
 /*
-** Return TRUE if the probe cost is less than the baseline cost
+** Try to insert a new prerequisite/cost entry into the WhereOrSet pSet.
+**
+** The new entry might overwrite an existing entry, or it might be
+** appended, or it might be discarded.  Do whatever is the right thing
+** so that pSet keeps the N_OR_COST best entries seen so far.
 */
-static int compareCost(const WhereCost *pProbe, const WhereCost *pBaseline){
-  if( pProbe->rCost<pBaseline->rCost ) return 1;
-  if( pProbe->rCost>pBaseline->rCost ) return 0;
-  if( pProbe->plan.nOBSat>pBaseline->plan.nOBSat ) return 1;
-  if( pProbe->plan.nRow<pBaseline->plan.nRow ) return 1;
-  return 0;
+static int whereOrInsert(
+  WhereOrSet *pSet,      /* The WhereOrSet to be updated */
+  Bitmask prereq,        /* Prerequisites of the new entry */
+  LogEst rRun,           /* Run-cost of the new entry */
+  LogEst nOut            /* Number of outputs for the new entry */
+){
+  u16 i;
+  WhereOrCost *p;
+  for(i=pSet->n, p=pSet->a; i>0; i--, p++){
+    if( rRun<=p->rRun && (prereq & p->prereq)==prereq ){
+      goto whereOrInsert_done;
+    }
+    if( p->rRun<=rRun && (p->prereq & prereq)==p->prereq ){
+      return 0;
+    }
+  }
+  if( pSet->n<N_OR_COST ){
+    p = &pSet->a[pSet->n++];
+    p->nOut = nOut;
+  }else{
+    p = pSet->a;
+    for(i=1; i<pSet->n; i++){
+      if( p->rRun>pSet->a[i].rRun ) p = pSet->a + i;
+    }
+    if( p->rRun<=rRun ) return 0;
+  }
+whereOrInsert_done:
+  p->prereq = prereq;
+  p->rRun = rRun;
+  if( p->nOut>nOut ) p->nOut = nOut;
+  return 1;
 }
 
 /*
@@ -104680,17 +110171,13 @@ static int compareCost(const WhereCost *pProbe, const WhereCost *pBaseline){
 */
 static void whereClauseInit(
   WhereClause *pWC,        /* The WhereClause to be initialized */
-  Parse *pParse,           /* The parsing context */
-  WhereMaskSet *pMaskSet,  /* Mapping from table cursor numbers to bitmasks */
-  u16 wctrlFlags           /* Might include WHERE_AND_ONLY */
+  WhereInfo *pWInfo        /* The WHERE processing context */
 ){
-  pWC->pParse = pParse;
-  pWC->pMaskSet = pMaskSet;
+  pWC->pWInfo = pWInfo;
   pWC->pOuter = 0;
   pWC->nTerm = 0;
   pWC->nSlot = ArraySize(pWC->aStatic);
   pWC->a = pWC->aStatic;
-  pWC->wctrlFlags = wctrlFlags;
 }
 
 /* Forward reference */
@@ -104719,7 +110206,7 @@ static void whereAndInfoDelete(sqlite3 *db, WhereAndInfo *p){
 static void whereClauseClear(WhereClause *pWC){
   int i;
   WhereTerm *a;
-  sqlite3 *db = pWC->pParse->db;
+  sqlite3 *db = pWC->pWInfo->pParse->db;
   for(i=pWC->nTerm-1, a=pWC->a; i>=0; i--, a++){
     if( a->wtFlags & TERM_DYNAMIC ){
       sqlite3ExprDelete(db, a->pExpr);
@@ -104757,10 +110244,10 @@ static void whereClauseClear(WhereClause *pWC){
 static int whereClauseInsert(WhereClause *pWC, Expr *p, u8 wtFlags){
   WhereTerm *pTerm;
   int idx;
-  testcase( wtFlags & TERM_VIRTUAL );  /* EV: R-00211-15100 */
+  testcase( wtFlags & TERM_VIRTUAL );
   if( pWC->nTerm>=pWC->nSlot ){
     WhereTerm *pOld = pWC->a;
-    sqlite3 *db = pWC->pParse->db;
+    sqlite3 *db = pWC->pWInfo->pParse->db;
     pWC->a = sqlite3DbMallocRaw(db, sizeof(pWC->a[0])*pWC->nSlot*2 );
     if( pWC->a==0 ){
       if( wtFlags & TERM_DYNAMIC ){
@@ -104776,6 +110263,11 @@ static int whereClauseInsert(WhereClause *pWC, Expr *p, u8 wtFlags){
     pWC->nSlot = sqlite3DbMallocSize(db, pWC->a)/sizeof(pWC->a[0]);
   }
   pTerm = &pWC->a[idx = pWC->nTerm++];
+  if( p && ExprHasProperty(p, EP_Unlikely) ){
+    pTerm->truthProb = sqlite3LogEst(p->iTable) - 99;
+  }else{
+    pTerm->truthProb = 1;
+  }
   pTerm->pExpr = sqlite3ExprSkipCollate(p);
   pTerm->wtFlags = wtFlags;
   pTerm->pWC = pWC;
@@ -104800,8 +110292,8 @@ static int whereClauseInsert(WhereClause *pWC, Expr *p, u8 wtFlags){
 ** the WhereClause.a[] array.  The slot[] array grows as needed to contain
 ** all terms of the WHERE clause.
 */
-static void whereSplit(WhereClause *pWC, Expr *pExpr, int op){
-  pWC->op = (u8)op;
+static void whereSplit(WhereClause *pWC, Expr *pExpr, u8 op){
+  pWC->op = op;
   if( pExpr==0 ) return;
   if( pExpr->op!=op ){
     whereClauseInsert(pWC, pExpr, 0);
@@ -104812,9 +110304,9 @@ static void whereSplit(WhereClause *pWC, Expr *pExpr, int op){
 }
 
 /*
-** Initialize an expression mask set (a WhereMaskSet object)
+** Initialize a WhereMaskSet object
 */
-#define initMaskSet(P)  memset(P, 0, sizeof(*P))
+#define initMaskSet(P)  (P)->n=0
 
 /*
 ** Return the bitmask for the given cursor number.  Return 0 if
@@ -104825,7 +110317,7 @@ static Bitmask getMask(WhereMaskSet *pMaskSet, int iCursor){
   assert( pMaskSet->n<=(int)sizeof(Bitmask)*8 );
   for(i=0; i<pMaskSet->n; i++){
     if( pMaskSet->ix[i]==iCursor ){
-      return ((Bitmask)1)<<i;
+      return MASKBIT(i);
     }
   }
   return 0;
@@ -104845,18 +110337,9 @@ static void createMask(WhereMaskSet *pMaskSet, int iCursor){
 }
 
 /*
-** This routine walks (recursively) an expression tree and generates
+** These routines walk (recursively) an expression tree and generate
 ** a bitmask indicating which tables are used in that expression
 ** tree.
-**
-** In order for this routine to work, the calling function must have
-** previously invoked sqlite3ResolveExprNames() on the expression.  See
-** the header comment on that routine for additional information.
-** The sqlite3ResolveExprNames() routines looks for column names and
-** sets their opcodes to TK_COLUMN and their Expr.iTable fields to
-** the VDBE cursor number of the table.  This routine just has to
-** translate the cursor numbers into bitmask values and OR all
-** the bitmasks together.
 */
 static Bitmask exprListTableUsage(WhereMaskSet*, ExprList*);
 static Bitmask exprSelectTableUsage(WhereMaskSet*, Select*);
@@ -104910,14 +110393,7 @@ static Bitmask exprSelectTableUsage(WhereMaskSet *pMaskSet, Select *pS){
 /*
 ** Return TRUE if the given operator is one of the operators that is
 ** allowed for an indexable WHERE clause term.  The allowed operators are
-** "=", "<", ">", "<=", ">=", and "IN".
-**
-** IMPLEMENTATION-OF: R-59926-26393 To be usable by an index a term must be
-** of one of the following forms: column = expression column > expression
-** column >= expression column < expression column <= expression
-** expression = column expression > column expression >= column
-** expression < column expression <= column column IN
-** (expression-list) column IN (subquery) column IS NULL
+** "=", "<", ">", "<=", ">=", "IN", and "IS NULL"
 */
 static int allowedOp(int op){
   assert( TK_GT>TK_EQ && TK_GT<TK_GE );
@@ -104937,10 +110413,9 @@ static int allowedOp(int op){
 ** are converted into "Y op X".
 **
 ** If left/right precedence rules come into play when determining the
-** collating
-** side of the comparison, it remains associated with the same side after
-** the commutation. So "Y collate NOCASE op X" becomes 
-** "X op Y". This is because any collation sequence on
+** collating sequence, then COLLATE operators are adjusted to ensure
+** that the collating sequence does not change.  For example:
+** "Y collate NOCASE op X" becomes "X op Y" because any collation sequence on
 ** the left hand side of a comparison overrides any collation sequence 
 ** attached to the right. For the same reason the EP_Collate flag
 ** is not commuted.
@@ -104997,6 +110472,133 @@ static u16 operatorMask(int op){
   return c;
 }
 
+/*
+** Advance to the next WhereTerm that matches according to the criteria
+** established when the pScan object was initialized by whereScanInit().
+** Return NULL if there are no more matching WhereTerms.
+*/
+static WhereTerm *whereScanNext(WhereScan *pScan){
+  int iCur;            /* The cursor on the LHS of the term */
+  int iColumn;         /* The column on the LHS of the term.  -1 for IPK */
+  Expr *pX;            /* An expression being tested */
+  WhereClause *pWC;    /* Shorthand for pScan->pWC */
+  WhereTerm *pTerm;    /* The term being tested */
+  int k = pScan->k;    /* Where to start scanning */
+
+  while( pScan->iEquiv<=pScan->nEquiv ){
+    iCur = pScan->aEquiv[pScan->iEquiv-2];
+    iColumn = pScan->aEquiv[pScan->iEquiv-1];
+    while( (pWC = pScan->pWC)!=0 ){
+      for(pTerm=pWC->a+k; k<pWC->nTerm; k++, pTerm++){
+        if( pTerm->leftCursor==iCur
+         && pTerm->u.leftColumn==iColumn
+         && (pScan->iEquiv<=2 || !ExprHasProperty(pTerm->pExpr, EP_FromJoin))
+        ){
+          if( (pTerm->eOperator & WO_EQUIV)!=0
+           && pScan->nEquiv<ArraySize(pScan->aEquiv)
+          ){
+            int j;
+            pX = sqlite3ExprSkipCollate(pTerm->pExpr->pRight);
+            assert( pX->op==TK_COLUMN );
+            for(j=0; j<pScan->nEquiv; j+=2){
+              if( pScan->aEquiv[j]==pX->iTable
+               && pScan->aEquiv[j+1]==pX->iColumn ){
+                  break;
+              }
+            }
+            if( j==pScan->nEquiv ){
+              pScan->aEquiv[j] = pX->iTable;
+              pScan->aEquiv[j+1] = pX->iColumn;
+              pScan->nEquiv += 2;
+            }
+          }
+          if( (pTerm->eOperator & pScan->opMask)!=0 ){
+            /* Verify the affinity and collating sequence match */
+            if( pScan->zCollName && (pTerm->eOperator & WO_ISNULL)==0 ){
+              CollSeq *pColl;
+              Parse *pParse = pWC->pWInfo->pParse;
+              pX = pTerm->pExpr;
+              if( !sqlite3IndexAffinityOk(pX, pScan->idxaff) ){
+                continue;
+              }
+              assert(pX->pLeft);
+              pColl = sqlite3BinaryCompareCollSeq(pParse,
+                                                  pX->pLeft, pX->pRight);
+              if( pColl==0 ) pColl = pParse->db->pDfltColl;
+              if( sqlite3StrICmp(pColl->zName, pScan->zCollName) ){
+                continue;
+              }
+            }
+            if( (pTerm->eOperator & WO_EQ)!=0
+             && (pX = pTerm->pExpr->pRight)->op==TK_COLUMN
+             && pX->iTable==pScan->aEquiv[0]
+             && pX->iColumn==pScan->aEquiv[1]
+            ){
+              continue;
+            }
+            pScan->k = k+1;
+            return pTerm;
+          }
+        }
+      }
+      pScan->pWC = pScan->pWC->pOuter;
+      k = 0;
+    }
+    pScan->pWC = pScan->pOrigWC;
+    k = 0;
+    pScan->iEquiv += 2;
+  }
+  return 0;
+}
+
+/*
+** Initialize a WHERE clause scanner object.  Return a pointer to the
+** first match.  Return NULL if there are no matches.
+**
+** The scanner will be searching the WHERE clause pWC.  It will look
+** for terms of the form "X <op> <expr>" where X is column iColumn of table
+** iCur.  The <op> must be one of the operators described by opMask.
+**
+** If the search is for X and the WHERE clause contains terms of the
+** form X=Y then this routine might also return terms of the form
+** "Y <op> <expr>".  The number of levels of transitivity is limited,
+** but is enough to handle most commonly occurring SQL statements.
+**
+** If X is not the INTEGER PRIMARY KEY then X must be compatible with
+** index pIdx.
+*/
+static WhereTerm *whereScanInit(
+  WhereScan *pScan,       /* The WhereScan object being initialized */
+  WhereClause *pWC,       /* The WHERE clause to be scanned */
+  int iCur,               /* Cursor to scan for */
+  int iColumn,            /* Column to scan for */
+  u32 opMask,             /* Operator(s) to scan for */
+  Index *pIdx             /* Must be compatible with this index */
+){
+  int j;
+
+  /* memset(pScan, 0, sizeof(*pScan)); */
+  pScan->pOrigWC = pWC;
+  pScan->pWC = pWC;
+  if( pIdx && iColumn>=0 ){
+    pScan->idxaff = pIdx->pTable->aCol[iColumn].affinity;
+    for(j=0; pIdx->aiColumn[j]!=iColumn; j++){
+      if( NEVER(j>=pIdx->nKeyCol) ) return 0;
+    }
+    pScan->zCollName = pIdx->azColl[j];
+  }else{
+    pScan->idxaff = 0;
+    pScan->zCollName = 0;
+  }
+  pScan->opMask = opMask;
+  pScan->k = 0;
+  pScan->aEquiv[0] = iCur;
+  pScan->aEquiv[1] = iColumn;
+  pScan->nEquiv = 2;
+  pScan->iEquiv = 2;
+  return whereScanNext(pScan);
+}
+
 /*
 ** Search for a term in the WHERE clause that is of the form "X <op> <expr>"
 ** where X is a reference to the iColumn of table iCur and <op> is one of
@@ -105028,84 +110630,20 @@ static WhereTerm *findTerm(
   u32 op,               /* Mask of WO_xx values describing operator */
   Index *pIdx           /* Must be compatible with this index, if not NULL */
 ){
-  WhereTerm *pTerm;            /* Term being examined as possible result */
-  WhereTerm *pResult = 0;      /* The answer to return */
-  WhereClause *pWCOrig = pWC;  /* Original pWC value */
-  int j, k;                    /* Loop counters */
-  Expr *pX;                /* Pointer to an expression */
-  Parse *pParse;           /* Parsing context */
-  int iOrigCol = iColumn;  /* Original value of iColumn */
-  int nEquiv = 2;          /* Number of entires in aEquiv[] */
-  int iEquiv = 2;          /* Number of entries of aEquiv[] processed so far */
-  int aEquiv[22];          /* iCur,iColumn and up to 10 other equivalents */
+  WhereTerm *pResult = 0;
+  WhereTerm *p;
+  WhereScan scan;
 
-  assert( iCur>=0 );
-  aEquiv[0] = iCur;
-  aEquiv[1] = iColumn;
-  for(;;){
-    for(pWC=pWCOrig; pWC; pWC=pWC->pOuter){
-      for(pTerm=pWC->a, k=pWC->nTerm; k; k--, pTerm++){
-        if( pTerm->leftCursor==iCur
-          && pTerm->u.leftColumn==iColumn
-        ){
-          if( (pTerm->prereqRight & notReady)==0
-           && (pTerm->eOperator & op & WO_ALL)!=0
-          ){
-            if( iOrigCol>=0 && pIdx && (pTerm->eOperator & WO_ISNULL)==0 ){
-              CollSeq *pColl;
-              char idxaff;
-      
-              pX = pTerm->pExpr;
-              pParse = pWC->pParse;
-              idxaff = pIdx->pTable->aCol[iOrigCol].affinity;
-              if( !sqlite3IndexAffinityOk(pX, idxaff) ){
-                continue;
-              }
-      
-              /* Figure out the collation sequence required from an index for
-              ** it to be useful for optimising expression pX. Store this
-              ** value in variable pColl.
-              */
-              assert(pX->pLeft);
-              pColl = sqlite3BinaryCompareCollSeq(pParse,pX->pLeft,pX->pRight);
-              if( pColl==0 ) pColl = pParse->db->pDfltColl;
-      
-              for(j=0; pIdx->aiColumn[j]!=iOrigCol; j++){
-                if( NEVER(j>=pIdx->nColumn) ) return 0;
-              }
-              if( sqlite3StrICmp(pColl->zName, pIdx->azColl[j]) ){
-                continue;
-              }
-            }
-            if( pTerm->prereqRight==0 && (pTerm->eOperator&WO_EQ)!=0 ){
-              pResult = pTerm;
-              goto findTerm_success;
-            }else if( pResult==0 ){
-              pResult = pTerm;
-            }
-          }
-          if( (pTerm->eOperator & WO_EQUIV)!=0
-           && nEquiv<ArraySize(aEquiv)
-          ){
-            pX = sqlite3ExprSkipCollate(pTerm->pExpr->pRight);
-            assert( pX->op==TK_COLUMN );
-            for(j=0; j<nEquiv; j+=2){
-              if( aEquiv[j]==pX->iTable && aEquiv[j+1]==pX->iColumn ) break;
-            }
-            if( j==nEquiv ){
-              aEquiv[j] = pX->iTable;
-              aEquiv[j+1] = pX->iColumn;
-              nEquiv += 2;
-            }
-          }
-        }
+  p = whereScanInit(&scan, pWC, iCur, iColumn, op, pIdx);
+  while( p ){
+    if( (p->prereqRight & notReady)==0 ){
+      if( p->prereqRight==0 && (p->eOperator&WO_EQ)!=0 ){
+        return p;
       }
+      if( pResult==0 ) pResult = p;
     }
-    if( iEquiv>=nEquiv ) break;
-    iCur = aEquiv[iEquiv++];
-    iColumn = aEquiv[iEquiv++];
+    p = whereScanNext(&scan);
   }
-findTerm_success:
   return pResult;
 }
 
@@ -105114,8 +110652,6 @@ static void exprAnalyze(SrcList*, WhereClause*, int);
 
 /*
 ** Call exprAnalyze on all terms in a WHERE clause.  
-**
-**
 */
 static void exprAnalyzeAll(
   SrcList *pTabList,       /* the FROM clause */
@@ -105171,15 +110707,12 @@ static int isLikeOrGlob(
   }
   assert( pLeft->iColumn!=(-1) ); /* Because IPK never has AFF_TEXT */
 
-  pRight = pList->a[0].pExpr;
+  pRight = sqlite3ExprSkipCollate(pList->a[0].pExpr);
   op = pRight->op;
-  if( op==TK_REGISTER ){
-    op = pRight->op2;
-  }
   if( op==TK_VARIABLE ){
     Vdbe *pReprepare = pParse->pReprepare;
     int iCol = pRight->iColumn;
-    pVal = sqlite3VdbeGetValue(pReprepare, iCol, SQLITE_AFF_NONE);
+    pVal = sqlite3VdbeGetBoundValue(pReprepare, iCol, SQLITE_AFF_NONE);
     if( pVal && sqlite3_value_type(pVal)==SQLITE_TEXT ){
       z = (char *)sqlite3_value_text(pVal);
     }
@@ -105261,8 +110794,10 @@ static int isMatchOfColumn(
 ** a join, then transfer the appropriate markings over to derived.
 */
 static void transferJoinMarkings(Expr *pDerived, Expr *pBase){
-  pDerived->flags |= pBase->flags & EP_FromJoin;
-  pDerived->iRightJoinTable = pBase->iRightJoinTable;
+  if( pDerived ){
+    pDerived->flags |= pBase->flags & EP_FromJoin;
+    pDerived->iRightJoinTable = pBase->iRightJoinTable;
+  }
 }
 
 #if !defined(SQLITE_OMIT_OR_OPTIMIZATION) && !defined(SQLITE_OMIT_SUBQUERY)
@@ -105321,10 +110856,10 @@ static void transferJoinMarkings(Expr *pDerived, Expr *pBase){
 ** From another point of view, "indexable" means that the subterm could
 ** potentially be used with an index if an appropriate index exists.
 ** This analysis does not consider whether or not the index exists; that
-** is something the bestIndex() routine will determine.  This analysis
-** only looks at whether subterms appropriate for indexing exist.
+** is decided elsewhere.  This analysis only looks at whether subterms
+** appropriate for indexing exist.
 **
-** All examples A through E above all satisfy case 2.  But if a term
+** All examples A through E above satisfy case 2.  But if a term
 ** also statisfies case 1 (such as B) we know that the optimizer will
 ** always prefer case 1, so in that case we pretend that case 2 is not
 ** satisfied.
@@ -105347,11 +110882,11 @@ static void exprAnalyzeOrTerm(
   WhereClause *pWC,         /* the complete WHERE clause */
   int idxTerm               /* Index of the OR-term to be analyzed */
 ){
-  Parse *pParse = pWC->pParse;            /* Parser context */
+  WhereInfo *pWInfo = pWC->pWInfo;        /* WHERE clause processing context */
+  Parse *pParse = pWInfo->pParse;         /* Parser context */
   sqlite3 *db = pParse->db;               /* Database connection */
   WhereTerm *pTerm = &pWC->a[idxTerm];    /* The term to be analyzed */
   Expr *pExpr = pTerm->pExpr;             /* The expression of the term */
-  WhereMaskSet *pMaskSet = pWC->pMaskSet; /* Table use masks */
   int i;                                  /* Loop counters */
   WhereClause *pOrWc;       /* Breakup of pTerm into subterms */
   WhereTerm *pOrTerm;       /* A Sub-term within the pOrWc */
@@ -105370,7 +110905,7 @@ static void exprAnalyzeOrTerm(
   if( pOrInfo==0 ) return;
   pTerm->wtFlags |= TERM_ORINFO;
   pOrWc = &pOrInfo->wc;
-  whereClauseInit(pOrWc, pWC->pParse, pMaskSet, pWC->wctrlFlags);
+  whereClauseInit(pOrWc, pWInfo);
   whereSplit(pOrWc, pExpr, TK_OR);
   exprAnalyzeAll(pSrc, pOrWc);
   if( db->mallocFailed ) return;
@@ -105396,7 +110931,7 @@ static void exprAnalyzeOrTerm(
         pOrTerm->wtFlags |= TERM_ANDINFO;
         pOrTerm->eOperator = WO_AND;
         pAndWC = &pAndInfo->wc;
-        whereClauseInit(pAndWC, pWC->pParse, pMaskSet, pWC->wctrlFlags);
+        whereClauseInit(pAndWC, pWC->pWInfo);
         whereSplit(pAndWC, pOrTerm->pExpr, TK_AND);
         exprAnalyzeAll(pSrc, pAndWC);
         pAndWC->pOuter = pWC;
@@ -105405,7 +110940,7 @@ static void exprAnalyzeOrTerm(
           for(j=0, pAndTerm=pAndWC->a; j<pAndWC->nTerm; j++, pAndTerm++){
             assert( pAndTerm->pExpr );
             if( allowedOp(pAndTerm->pExpr->op) ){
-              b |= getMask(pMaskSet, pAndTerm->leftCursor);
+              b |= getMask(&pWInfo->sMaskSet, pAndTerm->leftCursor);
             }
           }
         }
@@ -105416,10 +110951,10 @@ static void exprAnalyzeOrTerm(
       ** corresponding TERM_VIRTUAL term */
     }else{
       Bitmask b;
-      b = getMask(pMaskSet, pOrTerm->leftCursor);
+      b = getMask(&pWInfo->sMaskSet, pOrTerm->leftCursor);
       if( pOrTerm->wtFlags & TERM_VIRTUAL ){
         WhereTerm *pOther = &pOrWc->a[pOrTerm->iParent];
-        b |= getMask(pMaskSet, pOther->leftCursor);
+        b |= getMask(&pWInfo->sMaskSet, pOther->leftCursor);
       }
       indexable &= b;
       if( (pOrTerm->eOperator & WO_EQ)==0 ){
@@ -105481,7 +111016,7 @@ static void exprAnalyzeOrTerm(
           assert( j==1 );
           continue;
         }
-        if( (chngToIN & getMask(pMaskSet, pOrTerm->leftCursor))==0 ){
+        if( (chngToIN & getMask(&pWInfo->sMaskSet, pOrTerm->leftCursor))==0 ){
           /* This term must be of the form t1.a==t2.b where t2 is in the
           ** chngToIN set but t1 is not.  This term will be either preceeded
           ** or follwed by an inverted copy (t2.b==t1.a).  Skip this term 
@@ -105500,7 +111035,7 @@ static void exprAnalyzeOrTerm(
         ** on the second iteration */
         assert( j==1 );
         assert( IsPowerOfTwo(chngToIN) );
-        assert( chngToIN==getMask(pMaskSet, iCursor) );
+        assert( chngToIN==getMask(&pWInfo->sMaskSet, iCursor) );
         break;
       }
       testcase( j==1 );
@@ -105534,8 +111069,6 @@ static void exprAnalyzeOrTerm(
     /* At this point, okToChngToIN is true if original pTerm satisfies
     ** case 1.  In that case, construct a new virtual term that is 
     ** pTerm converted into an IN operator.
-    **
-    ** EV: R-00211-15100
     */
     if( okToChngToIN ){
       Expr *pDup;            /* A transient duplicate expression */
@@ -105549,7 +111082,7 @@ static void exprAnalyzeOrTerm(
         assert( pOrTerm->leftCursor==iCursor );
         assert( pOrTerm->u.leftColumn==iColumn );
         pDup = sqlite3ExprDup(db, pOrTerm->pExpr->pRight, 0);
-        pList = sqlite3ExprListAppend(pWC->pParse, pList, pDup);
+        pList = sqlite3ExprListAppend(pWInfo->pParse, pList, pDup);
         pLeft = pOrTerm->pExpr->pLeft;
       }
       assert( pLeft!=0 );
@@ -105598,6 +111131,7 @@ static void exprAnalyze(
   WhereClause *pWC,         /* the WHERE clause */
   int idxTerm               /* Index of the term to be analyzed */
 ){
+  WhereInfo *pWInfo = pWC->pWInfo; /* WHERE clause processing context */
   WhereTerm *pTerm;                /* The term to be analyzed */
   WhereMaskSet *pMaskSet;          /* Set of table index masks */
   Expr *pExpr;                     /* The expression to be analyzed */
@@ -105608,14 +111142,14 @@ static void exprAnalyze(
   int isComplete = 0;              /* RHS of LIKE/GLOB ends with wildcard */
   int noCase = 0;                  /* LIKE/GLOB distinguishes case */
   int op;                          /* Top-level operator.  pExpr->op */
-  Parse *pParse = pWC->pParse;     /* Parsing context */
+  Parse *pParse = pWInfo->pParse;  /* Parsing context */
   sqlite3 *db = pParse->db;        /* Database connection */
 
   if( db->mallocFailed ){
     return;
   }
   pTerm = &pWC->a[idxTerm];
-  pMaskSet = pWC->pMaskSet;
+  pMaskSet = &pWInfo->sMaskSet;
   pExpr = pTerm->pExpr;
   assert( pExpr->op!=TK_AS && pExpr->op!=TK_COLLATE );
   prereqLeft = exprTableUsage(pMaskSet, pExpr->pLeft);
@@ -105720,6 +111254,7 @@ static void exprAnalyze(
       pNewExpr = sqlite3PExpr(pParse, ops[i], 
                              sqlite3ExprDup(db, pExpr->pLeft, 0),
                              sqlite3ExprDup(db, pList->a[i].pExpr, 0), 0);
+      transferJoinMarkings(pNewExpr, pExpr);
       idxNew = whereClauseInsert(pWC, pNewExpr, TERM_VIRTUAL|TERM_DYNAMIC);
       testcase( idxNew==0 );
       exprAnalyze(pSrc, pWC, idxNew);
@@ -105776,9 +111311,7 @@ static void exprAnalyze(
         ** inequality.  To avoid this, make sure to also run the full
         ** LIKE on all candidate expressions by clearing the isComplete flag
         */
-        if( c=='A'-1 ) isComplete = 0;   /* EV: R-64339-08207 */
-
-
+        if( c=='A'-1 ) isComplete = 0;
         c = sqlite3UpperToLower[c];
       }
       *pC = c + 1;
@@ -105789,6 +111322,7 @@ static void exprAnalyze(
     pNewExpr1 = sqlite3PExpr(pParse, TK_GE, 
            sqlite3ExprAddCollateToken(pParse,pNewExpr1,&sCollSeqName),
            pStr1, 0);
+    transferJoinMarkings(pNewExpr1, pExpr);
     idxNew1 = whereClauseInsert(pWC, pNewExpr1, TERM_VIRTUAL|TERM_DYNAMIC);
     testcase( idxNew1==0 );
     exprAnalyze(pSrc, pWC, idxNew1);
@@ -105796,6 +111330,7 @@ static void exprAnalyze(
     pNewExpr2 = sqlite3PExpr(pParse, TK_LT,
            sqlite3ExprAddCollateToken(pParse,pNewExpr2,&sCollSeqName),
            pStr2, 0);
+    transferJoinMarkings(pNewExpr2, pExpr);
     idxNew2 = whereClauseInsert(pWC, pNewExpr2, TERM_VIRTUAL|TERM_DYNAMIC);
     testcase( idxNew2==0 );
     exprAnalyze(pSrc, pWC, idxNew2);
@@ -105845,7 +111380,7 @@ static void exprAnalyze(
   }
 #endif /* SQLITE_OMIT_VIRTUALTABLE */
 
-#ifdef SQLITE_ENABLE_STAT3
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
   /* When sqlite_stat3 histogram data is available an operator of the
   ** form "x IS NOT NULL" can sometimes be evaluated more efficiently
   ** as "x>NULL" if x is not an INTEGER PRIMARY KEY.  So construct a
@@ -105859,6 +111394,7 @@ static void exprAnalyze(
   if( pExpr->op==TK_NOTNULL
    && pExpr->pLeft->op==TK_COLUMN
    && pExpr->pLeft->iColumn>=0
+   && OptimizationEnabled(db, SQLITE_Stat3)
   ){
     Expr *pNewExpr;
     Expr *pLeft = pExpr->pLeft;
@@ -105884,7 +111420,7 @@ static void exprAnalyze(
       pNewTerm->prereqAll = pTerm->prereqAll;
     }
   }
-#endif /* SQLITE_ENABLE_STAT */
+#endif /* SQLITE_ENABLE_STAT3_OR_STAT4 */
 
   /* Prevent ON clause terms of a LEFT JOIN from being used to drive
   ** an index for tables to the left of the join.
@@ -105893,11 +111429,8 @@ static void exprAnalyze(
 }
 
 /*
-** This function searches the expression list passed as the second argument
-** for an expression of type TK_COLUMN that refers to the same column and
-** uses the same collation sequence as the iCol'th column of index pIdx.
-** Argument iBase is the cursor number used for the table that pIdx refers
-** to.
+** This function searches pList for a entry that matches the iCol-th column
+** of index pIdx.
 **
 ** If such an expression is found, its index in pList->a[] is returned. If
 ** no expression is found, -1 is returned.
@@ -105928,77 +111461,18 @@ static int findIndexCol(
   return -1;
 }
 
-/*
-** This routine determines if pIdx can be used to assist in processing a
-** DISTINCT qualifier. In other words, it tests whether or not using this
-** index for the outer loop guarantees that rows with equal values for
-** all expressions in the pDistinct list are delivered grouped together.
-**
-** For example, the query 
-**
-**   SELECT DISTINCT a, b, c FROM tbl WHERE a = ?
-**
-** can benefit from any index on columns "b" and "c".
-*/
-static int isDistinctIndex(
-  Parse *pParse,                  /* Parsing context */
-  WhereClause *pWC,               /* The WHERE clause */
-  Index *pIdx,                    /* The index being considered */
-  int base,                       /* Cursor number for the table pIdx is on */
-  ExprList *pDistinct,            /* The DISTINCT expressions */
-  int nEqCol                      /* Number of index columns with == */
-){
-  Bitmask mask = 0;               /* Mask of unaccounted for pDistinct exprs */
-  int i;                          /* Iterator variable */
-
-  assert( pDistinct!=0 );
-  if( pIdx->zName==0 || pDistinct->nExpr>=BMS ) return 0;
-  testcase( pDistinct->nExpr==BMS-1 );
-
-  /* Loop through all the expressions in the distinct list. If any of them
-  ** are not simple column references, return early. Otherwise, test if the
-  ** WHERE clause contains a "col=X" clause. If it does, the expression
-  ** can be ignored. If it does not, and the column does not belong to the
-  ** same table as index pIdx, return early. Finally, if there is no
-  ** matching "col=X" expression and the column is on the same table as pIdx,
-  ** set the corresponding bit in variable mask.
-  */
-  for(i=0; i<pDistinct->nExpr; i++){
-    WhereTerm *pTerm;
-    Expr *p = sqlite3ExprSkipCollate(pDistinct->a[i].pExpr);
-    if( p->op!=TK_COLUMN ) return 0;
-    pTerm = findTerm(pWC, p->iTable, p->iColumn, ~(Bitmask)0, WO_EQ, 0);
-    if( pTerm ){
-      Expr *pX = pTerm->pExpr;
-      CollSeq *p1 = sqlite3BinaryCompareCollSeq(pParse, pX->pLeft, pX->pRight);
-      CollSeq *p2 = sqlite3ExprCollSeq(pParse, p);
-      if( p1==p2 ) continue;
-    }
-    if( p->iTable!=base ) return 0;
-    mask |= (((Bitmask)1) << i);
-  }
-
-  for(i=nEqCol; mask && i<pIdx->nColumn; i++){
-    int iExpr = findIndexCol(pParse, pDistinct, base, pIdx, i);
-    if( iExpr<0 ) break;
-    mask &= ~(((Bitmask)1) << iExpr);
-  }
-
-  return (mask==0);
-}
-
-
 /*
 ** Return true if the DISTINCT expression-list passed as the third argument
-** is redundant. A DISTINCT list is redundant if the database contains a
-** UNIQUE index that guarantees that the result of the query will be distinct
-** anyway.
+** is redundant.
+**
+** A DISTINCT list is redundant if the database contains some subset of
+** columns that are unique and non-null.
 */
 static int isDistinctRedundant(
-  Parse *pParse,
-  SrcList *pTabList,
-  WhereClause *pWC,
-  ExprList *pDistinct
+  Parse *pParse,            /* Parsing context */
+  SrcList *pTabList,        /* The FROM clause */
+  WhereClause *pWC,         /* The WHERE clause */
+  ExprList *pDistinct       /* The result set that needs to be DISTINCT */
 ){
   Table *pTab;
   Index *pIdx;
@@ -106036,16 +111510,16 @@ static int isDistinctRedundant(
   */
   for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
     if( pIdx->onError==OE_None ) continue;
-    for(i=0; i<pIdx->nColumn; i++){
-      int iCol = pIdx->aiColumn[i];
+    for(i=0; i<pIdx->nKeyCol; i++){
+      i16 iCol = pIdx->aiColumn[i];
       if( 0==findTerm(pWC, iBase, iCol, ~(Bitmask)0, WO_EQ, pIdx) ){
         int iIdxCol = findIndexCol(pParse, pDistinct, iBase, pIdx, i);
-        if( iIdxCol<0 || pTab->aCol[pIdx->aiColumn[i]].notNull==0 ){
+        if( iIdxCol<0 || pTab->aCol[iCol].notNull==0 ){
           break;
         }
       }
     }
-    if( i==pIdx->nColumn ){
+    if( i==pIdx->nKeyCol ){
       /* This index implies that the DISTINCT qualifier is redundant. */
       return 1;
     }
@@ -106054,21 +111528,13 @@ static int isDistinctRedundant(
   return 0;
 }
 
+
 /*
-** Prepare a crude estimate of the logarithm of the input value.
-** The results need not be exact.  This is only used for estimating
-** the total cost of performing operations with O(logN) or O(NlogN)
-** complexity.  Because N is just a guess, it is no great tragedy if
-** logN is a little off.
+** Estimate the logarithm of the input value to base 2.
 */
-static double estLog(double N){
-  double logN = 1;
-  double x = 10;
-  while( N>x ){
-    logN += 1;
-    x *= 10;
-  }
-  return logN;
+static LogEst estLog(LogEst N){
+  LogEst x = sqlite3LogEst(N);
+  return x>33 ? x - 33 : 0;
 }
 
 /*
@@ -106077,7 +111543,7 @@ static double estLog(double N){
 ** SQLITE_TEST or SQLITE_DEBUG are defined, then these routines
 ** are no-ops.
 */
-#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_DEBUG)
+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(WHERETRACE_ENABLED)
 static void TRACE_IDX_INPUTS(sqlite3_index_info *p){
   int i;
   if( !sqlite3WhereTrace ) return;
@@ -106109,113 +111575,13 @@ static void TRACE_IDX_OUTPUTS(sqlite3_index_info *p){
   sqlite3DebugPrintf("  idxStr=%s\n", p->idxStr);
   sqlite3DebugPrintf("  orderByConsumed=%d\n", p->orderByConsumed);
   sqlite3DebugPrintf("  estimatedCost=%g\n", p->estimatedCost);
+  sqlite3DebugPrintf("  estimatedRows=%lld\n", p->estimatedRows);
 }
 #else
 #define TRACE_IDX_INPUTS(A)
 #define TRACE_IDX_OUTPUTS(A)
 #endif
 
-/* 
-** Required because bestIndex() is called by bestOrClauseIndex() 
-*/
-static void bestIndex(WhereBestIdx*);
-
-/*
-** This routine attempts to find an scanning strategy that can be used 
-** to optimize an 'OR' expression that is part of a WHERE clause. 
-**
-** The table associated with FROM clause term pSrc may be either a
-** regular B-Tree table or a virtual table.
-*/
-static void bestOrClauseIndex(WhereBestIdx *p){
-#ifndef SQLITE_OMIT_OR_OPTIMIZATION
-  WhereClause *pWC = p->pWC;           /* The WHERE clause */
-  struct SrcList_item *pSrc = p->pSrc; /* The FROM clause term to search */
-  const int iCur = pSrc->iCursor;      /* The cursor of the table  */
-  const Bitmask maskSrc = getMask(pWC->pMaskSet, iCur);  /* Bitmask for pSrc */
-  WhereTerm * const pWCEnd = &pWC->a[pWC->nTerm];        /* End of pWC->a[] */
-  WhereTerm *pTerm;                    /* A single term of the WHERE clause */
-
-  /* The OR-clause optimization is disallowed if the INDEXED BY or
-  ** NOT INDEXED clauses are used or if the WHERE_AND_ONLY bit is set. */
-  if( pSrc->notIndexed || pSrc->pIndex!=0 ){
-    return;
-  }
-  if( pWC->wctrlFlags & WHERE_AND_ONLY ){
-    return;
-  }
-
-  /* Search the WHERE clause terms for a usable WO_OR term. */
-  for(pTerm=pWC->a; pTerm<pWCEnd; pTerm++){
-    if( (pTerm->eOperator & WO_OR)!=0
-     && ((pTerm->prereqAll & ~maskSrc) & p->notReady)==0
-     && (pTerm->u.pOrInfo->indexable & maskSrc)!=0 
-    ){
-      WhereClause * const pOrWC = &pTerm->u.pOrInfo->wc;
-      WhereTerm * const pOrWCEnd = &pOrWC->a[pOrWC->nTerm];
-      WhereTerm *pOrTerm;
-      int flags = WHERE_MULTI_OR;
-      double rTotal = 0;
-      double nRow = 0;
-      Bitmask used = 0;
-      WhereBestIdx sBOI;
-
-      sBOI = *p;
-      sBOI.pOrderBy = 0;
-      sBOI.pDistinct = 0;
-      sBOI.ppIdxInfo = 0;
-      for(pOrTerm=pOrWC->a; pOrTerm<pOrWCEnd; pOrTerm++){
-        WHERETRACE(("... Multi-index OR testing for term %d of %d....\n", 
-          (pOrTerm - pOrWC->a), (pTerm - pWC->a)
-        ));
-        if( (pOrTerm->eOperator& WO_AND)!=0 ){
-          sBOI.pWC = &pOrTerm->u.pAndInfo->wc;
-          bestIndex(&sBOI);
-        }else if( pOrTerm->leftCursor==iCur ){
-          WhereClause tempWC;
-          tempWC.pParse = pWC->pParse;
-          tempWC.pMaskSet = pWC->pMaskSet;
-          tempWC.pOuter = pWC;
-          tempWC.op = TK_AND;
-          tempWC.a = pOrTerm;
-          tempWC.wctrlFlags = 0;
-          tempWC.nTerm = 1;
-          sBOI.pWC = &tempWC;
-          bestIndex(&sBOI);
-        }else{
-          continue;
-        }
-        rTotal += sBOI.cost.rCost;
-        nRow += sBOI.cost.plan.nRow;
-        used |= sBOI.cost.used;
-        if( rTotal>=p->cost.rCost ) break;
-      }
-
-      /* If there is an ORDER BY clause, increase the scan cost to account 
-      ** for the cost of the sort. */
-      if( p->pOrderBy!=0 ){
-        WHERETRACE(("... sorting increases OR cost %.9g to %.9g\n",
-                    rTotal, rTotal+nRow*estLog(nRow)));
-        rTotal += nRow*estLog(nRow);
-      }
-
-      /* If the cost of scanning using this OR term for optimization is
-      ** less than the current cost stored in pCost, replace the contents
-      ** of pCost. */
-      WHERETRACE(("... multi-index OR cost=%.9g nrow=%.9g\n", rTotal, nRow));
-      if( rTotal<p->cost.rCost ){
-        p->cost.rCost = rTotal;
-        p->cost.used = used;
-        p->cost.plan.nRow = nRow;
-        p->cost.plan.nOBSat = p->i ? p->aLevel[p->i-1].plan.nOBSat : 0;
-        p->cost.plan.wsFlags = flags;
-        p->cost.plan.u.pTerm = pTerm;
-      }
-    }
-  }
-#endif /* SQLITE_OMIT_OR_OPTIMIZATION */
-}
-
 #ifndef SQLITE_OMIT_AUTOMATIC_INDEX
 /*
 ** Return TRUE if the WHERE clause term pTerm is of a form where it
@@ -106231,88 +111597,13 @@ static int termCanDriveIndex(
   if( pTerm->leftCursor!=pSrc->iCursor ) return 0;
   if( (pTerm->eOperator & WO_EQ)==0 ) return 0;
   if( (pTerm->prereqRight & notReady)!=0 ) return 0;
+  if( pTerm->u.leftColumn<0 ) return 0;
   aff = pSrc->pTab->aCol[pTerm->u.leftColumn].affinity;
   if( !sqlite3IndexAffinityOk(pTerm->pExpr, aff) ) return 0;
   return 1;
 }
 #endif
 
-#ifndef SQLITE_OMIT_AUTOMATIC_INDEX
-/*
-** If the query plan for pSrc specified in pCost is a full table scan
-** and indexing is allows (if there is no NOT INDEXED clause) and it
-** possible to construct a transient index that would perform better
-** than a full table scan even when the cost of constructing the index
-** is taken into account, then alter the query plan to use the
-** transient index.
-*/
-static void bestAutomaticIndex(WhereBestIdx *p){
-  Parse *pParse = p->pParse;            /* The parsing context */
-  WhereClause *pWC = p->pWC;            /* The WHERE clause */
-  struct SrcList_item *pSrc = p->pSrc;  /* The FROM clause term to search */
-  double nTableRow;                     /* Rows in the input table */
-  double logN;                          /* log(nTableRow) */
-  double costTempIdx;         /* per-query cost of the transient index */
-  WhereTerm *pTerm;           /* A single term of the WHERE clause */
-  WhereTerm *pWCEnd;          /* End of pWC->a[] */
-  Table *pTable;              /* Table tht might be indexed */
-
-  if( pParse->nQueryLoop<=(double)1 ){
-    /* There is no point in building an automatic index for a single scan */
-    return;
-  }
-  if( (pParse->db->flags & SQLITE_AutoIndex)==0 ){
-    /* Automatic indices are disabled at run-time */
-    return;
-  }
-  if( (p->cost.plan.wsFlags & WHERE_NOT_FULLSCAN)!=0
-   && (p->cost.plan.wsFlags & WHERE_COVER_SCAN)==0
-  ){
-    /* We already have some kind of index in use for this query. */
-    return;
-  }
-  if( pSrc->viaCoroutine ){
-    /* Cannot index a co-routine */
-    return;
-  }
-  if( pSrc->notIndexed ){
-    /* The NOT INDEXED clause appears in the SQL. */
-    return;
-  }
-  if( pSrc->isCorrelated ){
-    /* The source is a correlated sub-query. No point in indexing it. */
-    return;
-  }
-
-  assert( pParse->nQueryLoop >= (double)1 );
-  pTable = pSrc->pTab;
-  nTableRow = pTable->nRowEst;
-  logN = estLog(nTableRow);
-  costTempIdx = 2*logN*(nTableRow/pParse->nQueryLoop + 1);
-  if( costTempIdx>=p->cost.rCost ){
-    /* The cost of creating the transient table would be greater than
-    ** doing the full table scan */
-    return;
-  }
-
-  /* Search for any equality comparison term */
-  pWCEnd = &pWC->a[pWC->nTerm];
-  for(pTerm=pWC->a; pTerm<pWCEnd; pTerm++){
-    if( termCanDriveIndex(pTerm, pSrc, p->notReady) ){
-      WHERETRACE(("auto-index reduces cost from %.1f to %.1f\n",
-                    p->cost.rCost, costTempIdx));
-      p->cost.rCost = costTempIdx;
-      p->cost.plan.nRow = logN + 1;
-      p->cost.plan.wsFlags = WHERE_TEMP_INDEX;
-      p->cost.used = pTerm->prereqRight;
-      break;
-    }
-  }
-}
-#else
-# define bestAutomaticIndex(A)  /* no-op */
-#endif /* SQLITE_OMIT_AUTOMATIC_INDEX */
-
 
 #ifndef SQLITE_OMIT_AUTOMATIC_INDEX
 /*
@@ -106327,50 +111618,61 @@ static void constructAutomaticIndex(
   Bitmask notReady,           /* Mask of cursors that are not available */
   WhereLevel *pLevel          /* Write new index here */
 ){
-  int nColumn;                /* Number of columns in the constructed index */
+  int nKeyCol;                /* Number of columns in the constructed index */
   WhereTerm *pTerm;           /* A single term of the WHERE clause */
   WhereTerm *pWCEnd;          /* End of pWC->a[] */
-  int nByte;                  /* Byte of memory needed for pIdx */
   Index *pIdx;                /* Object describing the transient index */
   Vdbe *v;                    /* Prepared statement under construction */
   int addrInit;               /* Address of the initialization bypass jump */
   Table *pTable;              /* The table being indexed */
-  KeyInfo *pKeyinfo;          /* Key information for the index */   
   int addrTop;                /* Top of the index fill loop */
   int regRecord;              /* Register holding an index record */
   int n;                      /* Column counter */
   int i;                      /* Loop counter */
   int mxBitCol;               /* Maximum column in pSrc->colUsed */
   CollSeq *pColl;             /* Collating sequence to on a column */
+  WhereLoop *pLoop;           /* The Loop object */
+  char *zNotUsed;             /* Extra space on the end of pIdx */
   Bitmask idxCols;            /* Bitmap of columns used for indexing */
   Bitmask extraCols;          /* Bitmap of additional columns */
+  u8 sentWarning = 0;         /* True if a warnning has been issued */
 
   /* Generate code to skip over the creation and initialization of the
   ** transient index on 2nd and subsequent iterations of the loop. */
   v = pParse->pVdbe;
   assert( v!=0 );
-  addrInit = sqlite3CodeOnce(pParse);
+  addrInit = sqlite3CodeOnce(pParse); VdbeCoverage(v);
 
   /* Count the number of columns that will be added to the index
   ** and used to match WHERE clause constraints */
-  nColumn = 0;
+  nKeyCol = 0;
   pTable = pSrc->pTab;
   pWCEnd = &pWC->a[pWC->nTerm];
+  pLoop = pLevel->pWLoop;
   idxCols = 0;
   for(pTerm=pWC->a; pTerm<pWCEnd; pTerm++){
     if( termCanDriveIndex(pTerm, pSrc, notReady) ){
       int iCol = pTerm->u.leftColumn;
-      Bitmask cMask = iCol>=BMS ? ((Bitmask)1)<<(BMS-1) : ((Bitmask)1)<<iCol;
+      Bitmask cMask = iCol>=BMS ? MASKBIT(BMS-1) : MASKBIT(iCol);
       testcase( iCol==BMS );
       testcase( iCol==BMS-1 );
+      if( !sentWarning ){
+        sqlite3_log(SQLITE_WARNING_AUTOINDEX,
+            "automatic index on %s(%s)", pTable->zName,
+            pTable->aCol[iCol].zName);
+        sentWarning = 1;
+      }
       if( (idxCols & cMask)==0 ){
-        nColumn++;
+        if( whereLoopResize(pParse->db, pLoop, nKeyCol+1) ) return;
+        pLoop->aLTerm[nKeyCol++] = pTerm;
         idxCols |= cMask;
       }
     }
   }
-  assert( nColumn>0 );
-  pLevel->plan.nEq = nColumn;
+  assert( nKeyCol>0 );
+  pLoop->u.btree.nEq = pLoop->nLTerm = nKeyCol;
+  pLoop->wsFlags = WHERE_COLUMN_EQ | WHERE_IDX_ONLY | WHERE_INDEXED
+                     | WHERE_AUTO_INDEX;
 
   /* Count the number of additional columns needed to create a
   ** covering index.  A "covering index" is an index that contains all
@@ -106380,38 +111682,32 @@ static void constructAutomaticIndex(
   ** original table changes and the index and table cannot both be used
   ** if they go out of sync.
   */
-  extraCols = pSrc->colUsed & (~idxCols | (((Bitmask)1)<<(BMS-1)));
+  extraCols = pSrc->colUsed & (~idxCols | MASKBIT(BMS-1));
   mxBitCol = (pTable->nCol >= BMS-1) ? BMS-1 : pTable->nCol;
   testcase( pTable->nCol==BMS-1 );
   testcase( pTable->nCol==BMS-2 );
   for(i=0; i<mxBitCol; i++){
-    if( extraCols & (((Bitmask)1)<<i) ) nColumn++;
+    if( extraCols & MASKBIT(i) ) nKeyCol++;
   }
-  if( pSrc->colUsed & (((Bitmask)1)<<(BMS-1)) ){
-    nColumn += pTable->nCol - BMS + 1;
+  if( pSrc->colUsed & MASKBIT(BMS-1) ){
+    nKeyCol += pTable->nCol - BMS + 1;
   }
-  pLevel->plan.wsFlags |= WHERE_COLUMN_EQ | WHERE_IDX_ONLY | WO_EQ;
+  pLoop->wsFlags |= WHERE_COLUMN_EQ | WHERE_IDX_ONLY;
 
   /* Construct the Index object to describe this index */
-  nByte = sizeof(Index);
-  nByte += nColumn*sizeof(int);     /* Index.aiColumn */
-  nByte += nColumn*sizeof(char*);   /* Index.azColl */
-  nByte += nColumn;                 /* Index.aSortOrder */
-  pIdx = sqlite3DbMallocZero(pParse->db, nByte);
+  pIdx = sqlite3AllocateIndexObject(pParse->db, nKeyCol+1, 0, &zNotUsed);
   if( pIdx==0 ) return;
-  pLevel->plan.u.pIdx = pIdx;
-  pIdx->azColl = (char**)&pIdx[1];
-  pIdx->aiColumn = (int*)&pIdx->azColl[nColumn];
-  pIdx->aSortOrder = (u8*)&pIdx->aiColumn[nColumn];
+  pLoop->u.btree.pIndex = pIdx;
   pIdx->zName = "auto-index";
-  pIdx->nColumn = nColumn;
   pIdx->pTable = pTable;
   n = 0;
   idxCols = 0;
   for(pTerm=pWC->a; pTerm<pWCEnd; pTerm++){
     if( termCanDriveIndex(pTerm, pSrc, notReady) ){
       int iCol = pTerm->u.leftColumn;
-      Bitmask cMask = iCol>=BMS ? ((Bitmask)1)<<(BMS-1) : ((Bitmask)1)<<iCol;
+      Bitmask cMask = iCol>=BMS ? MASKBIT(BMS-1) : MASKBIT(iCol);
+      testcase( iCol==BMS-1 );
+      testcase( iCol==BMS );
       if( (idxCols & cMask)==0 ){
         Expr *pX = pTerm->pExpr;
         idxCols |= cMask;
@@ -106422,40 +111718,42 @@ static void constructAutomaticIndex(
       }
     }
   }
-  assert( (u32)n==pLevel->plan.nEq );
+  assert( (u32)n==pLoop->u.btree.nEq );
 
   /* Add additional columns needed to make the automatic index into
   ** a covering index */
   for(i=0; i<mxBitCol; i++){
-    if( extraCols & (((Bitmask)1)<<i) ){
+    if( extraCols & MASKBIT(i) ){
       pIdx->aiColumn[n] = i;
       pIdx->azColl[n] = "BINARY";
       n++;
     }
   }
-  if( pSrc->colUsed & (((Bitmask)1)<<(BMS-1)) ){
+  if( pSrc->colUsed & MASKBIT(BMS-1) ){
     for(i=BMS-1; i<pTable->nCol; i++){
       pIdx->aiColumn[n] = i;
       pIdx->azColl[n] = "BINARY";
       n++;
     }
   }
-  assert( n==nColumn );
+  assert( n==nKeyCol );
+  pIdx->aiColumn[n] = -1;
+  pIdx->azColl[n] = "BINARY";
 
   /* Create the automatic index */
-  pKeyinfo = sqlite3IndexKeyinfo(pParse, pIdx);
   assert( pLevel->iIdxCur>=0 );
-  sqlite3VdbeAddOp4(v, OP_OpenAutoindex, pLevel->iIdxCur, nColumn+1, 0,
-                    (char*)pKeyinfo, P4_KEYINFO_HANDOFF);
+  pLevel->iIdxCur = pParse->nTab++;
+  sqlite3VdbeAddOp2(v, OP_OpenAutoindex, pLevel->iIdxCur, nKeyCol+1);
+  sqlite3VdbeSetP4KeyInfo(pParse, pIdx);
   VdbeComment((v, "for %s", pTable->zName));
 
   /* Fill the automatic index with content */
-  addrTop = sqlite3VdbeAddOp1(v, OP_Rewind, pLevel->iTabCur);
+  addrTop = sqlite3VdbeAddOp1(v, OP_Rewind, pLevel->iTabCur); VdbeCoverage(v);
   regRecord = sqlite3GetTempReg(pParse);
-  sqlite3GenerateIndexKey(pParse, pIdx, pLevel->iTabCur, regRecord, 1);
+  sqlite3GenerateIndexKey(pParse, pIdx, pLevel->iTabCur, regRecord, 0, 0, 0, 0);
   sqlite3VdbeAddOp2(v, OP_IdxInsert, pLevel->iIdxCur, regRecord);
   sqlite3VdbeChangeP5(v, OPFLAG_USESEEKRESULT);
-  sqlite3VdbeAddOp2(v, OP_Next, pLevel->iTabCur, addrTop+1);
+  sqlite3VdbeAddOp2(v, OP_Next, pLevel->iTabCur, addrTop+1); VdbeCoverage(v);
   sqlite3VdbeChangeP5(v, SQLITE_STMTSTATUS_AUTOINDEX);
   sqlite3VdbeJumpHere(v, addrTop);
   sqlite3ReleaseTempReg(pParse, regRecord);
@@ -106471,11 +111769,12 @@ static void constructAutomaticIndex(
 ** responsibility of the caller to eventually release the structure
 ** by passing the pointer returned by this function to sqlite3_free().
 */
-static sqlite3_index_info *allocateIndexInfo(WhereBestIdx *p){
-  Parse *pParse = p->pParse; 
-  WhereClause *pWC = p->pWC;
-  struct SrcList_item *pSrc = p->pSrc;
-  ExprList *pOrderBy = p->pOrderBy;
+static sqlite3_index_info *allocateIndexInfo(
+  Parse *pParse,
+  WhereClause *pWC,
+  struct SrcList_item *pSrc,
+  ExprList *pOrderBy
+){
   int i, j;
   int nTerm;
   struct sqlite3_index_constraint *pIdxCons;
@@ -106485,8 +111784,6 @@ static sqlite3_index_info *allocateIndexInfo(WhereBestIdx *p){
   int nOrderBy;
   sqlite3_index_info *pIdxInfo;
 
-  WHERETRACE(("Recomputing index info for %s...\n", pSrc->pTab->zName));
-
   /* Count the number of possible WHERE clause constraints referring
   ** to this virtual table */
   for(i=nTerm=0, pTerm=pWC->a; i<pWC->nTerm; i++, pTerm++){
@@ -106494,7 +111791,8 @@ static sqlite3_index_info *allocateIndexInfo(WhereBestIdx *p){
     assert( IsPowerOfTwo(pTerm->eOperator & ~WO_EQUIV) );
     testcase( pTerm->eOperator & WO_IN );
     testcase( pTerm->eOperator & WO_ISNULL );
-    if( pTerm->eOperator & (WO_ISNULL) ) continue;
+    testcase( pTerm->eOperator & WO_ALL );
+    if( (pTerm->eOperator & ~(WO_ISNULL|WO_EQUIV))==0 ) continue;
     if( pTerm->wtFlags & TERM_VNULL ) continue;
     nTerm++;
   }
@@ -106522,7 +111820,6 @@ static sqlite3_index_info *allocateIndexInfo(WhereBestIdx *p){
                            + sizeof(*pIdxOrderBy)*nOrderBy );
   if( pIdxInfo==0 ){
     sqlite3ErrorMsg(pParse, "out of memory");
-    /* (double)0 In case of SQLITE_OMIT_FLOATING_POINT... */
     return 0;
   }
 
@@ -106547,7 +111844,8 @@ static sqlite3_index_info *allocateIndexInfo(WhereBestIdx *p){
     assert( IsPowerOfTwo(pTerm->eOperator & ~WO_EQUIV) );
     testcase( pTerm->eOperator & WO_IN );
     testcase( pTerm->eOperator & WO_ISNULL );
-    if( pTerm->eOperator & (WO_ISNULL) ) continue;
+    testcase( pTerm->eOperator & WO_ALL );
+    if( (pTerm->eOperator & ~(WO_ISNULL|WO_EQUIV))==0 ) continue;
     if( pTerm->wtFlags & TERM_VNULL ) continue;
     pIdxCons[j].iColumn = pTerm->u.leftColumn;
     pIdxCons[j].iTermOffset = i;
@@ -106578,8 +111876,8 @@ static sqlite3_index_info *allocateIndexInfo(WhereBestIdx *p){
 /*
 ** The table object reference passed as the second argument to this function
 ** must represent a virtual table. This function invokes the xBestIndex()
-** method of the virtual table with the sqlite3_index_info pointer passed
-** as the argument.
+** method of the virtual table with the sqlite3_index_info object that
+** comes in as the 3rd argument to this function.
 **
 ** If an error occurs, pParse is populated with an error message and a
 ** non-zero value is returned. Otherwise, 0 is returned and the output
@@ -106594,7 +111892,6 @@ static int vtabBestIndex(Parse *pParse, Table *pTab, sqlite3_index_info *p){
   int i;
   int rc;
 
-  WHERETRACE(("xBestIndex for %s\n", pTab->zName));
   TRACE_IDX_INPUTS(p);
   rc = pVtab->pModule->xBestIndex(pVtab, p);
   TRACE_IDX_OUTPUTS(p);
@@ -106620,209 +111917,10 @@ static int vtabBestIndex(Parse *pParse, Table *pTab, sqlite3_index_info *p){
 
   return pParse->nErr;
 }
+#endif /* !defined(SQLITE_OMIT_VIRTUALTABLE) */
 
 
-/*
-** Compute the best index for a virtual table.
-**
-** The best index is computed by the xBestIndex method of the virtual
-** table module.  This routine is really just a wrapper that sets up
-** the sqlite3_index_info structure that is used to communicate with
-** xBestIndex.
-**
-** In a join, this routine might be called multiple times for the
-** same virtual table.  The sqlite3_index_info structure is created
-** and initialized on the first invocation and reused on all subsequent
-** invocations.  The sqlite3_index_info structure is also used when
-** code is generated to access the virtual table.  The whereInfoDelete() 
-** routine takes care of freeing the sqlite3_index_info structure after
-** everybody has finished with it.
-*/
-static void bestVirtualIndex(WhereBestIdx *p){
-  Parse *pParse = p->pParse;      /* The parsing context */
-  WhereClause *pWC = p->pWC;      /* The WHERE clause */
-  struct SrcList_item *pSrc = p->pSrc; /* The FROM clause term to search */
-  Table *pTab = pSrc->pTab;
-  sqlite3_index_info *pIdxInfo;
-  struct sqlite3_index_constraint *pIdxCons;
-  struct sqlite3_index_constraint_usage *pUsage;
-  WhereTerm *pTerm;
-  int i, j;
-  int nOrderBy;
-  int bAllowIN;                   /* Allow IN optimizations */
-  double rCost;
-
-  /* Make sure wsFlags is initialized to some sane value. Otherwise, if the 
-  ** malloc in allocateIndexInfo() fails and this function returns leaving
-  ** wsFlags in an uninitialized state, the caller may behave unpredictably.
-  */
-  memset(&p->cost, 0, sizeof(p->cost));
-  p->cost.plan.wsFlags = WHERE_VIRTUALTABLE;
-
-  /* If the sqlite3_index_info structure has not been previously
-  ** allocated and initialized, then allocate and initialize it now.
-  */
-  pIdxInfo = *p->ppIdxInfo;
-  if( pIdxInfo==0 ){
-    *p->ppIdxInfo = pIdxInfo = allocateIndexInfo(p);
-  }
-  if( pIdxInfo==0 ){
-    return;
-  }
-
-  /* At this point, the sqlite3_index_info structure that pIdxInfo points
-  ** to will have been initialized, either during the current invocation or
-  ** during some prior invocation.  Now we just have to customize the
-  ** details of pIdxInfo for the current invocation and pass it to
-  ** xBestIndex.
-  */
-
-  /* The module name must be defined. Also, by this point there must
-  ** be a pointer to an sqlite3_vtab structure. Otherwise
-  ** sqlite3ViewGetColumnNames() would have picked up the error. 
-  */
-  assert( pTab->azModuleArg && pTab->azModuleArg[0] );
-  assert( sqlite3GetVTable(pParse->db, pTab) );
-
-  /* Try once or twice.  On the first attempt, allow IN optimizations.
-  ** If an IN optimization is accepted by the virtual table xBestIndex
-  ** method, but the  pInfo->aConstrainUsage.omit flag is not set, then
-  ** the query will not work because it might allow duplicate rows in
-  ** output.  In that case, run the xBestIndex method a second time
-  ** without the IN constraints.  Usually this loop only runs once.
-  ** The loop will exit using a "break" statement.
-  */
-  for(bAllowIN=1; 1; bAllowIN--){
-    assert( bAllowIN==0 || bAllowIN==1 );
-
-    /* Set the aConstraint[].usable fields and initialize all 
-    ** output variables to zero.
-    **
-    ** aConstraint[].usable is true for constraints where the right-hand
-    ** side contains only references to tables to the left of the current
-    ** table.  In other words, if the constraint is of the form:
-    **
-    **           column = expr
-    **
-    ** and we are evaluating a join, then the constraint on column is 
-    ** only valid if all tables referenced in expr occur to the left
-    ** of the table containing column.
-    **
-    ** The aConstraints[] array contains entries for all constraints
-    ** on the current table.  That way we only have to compute it once
-    ** even though we might try to pick the best index multiple times.
-    ** For each attempt at picking an index, the order of tables in the
-    ** join might be different so we have to recompute the usable flag
-    ** each time.
-    */
-    pIdxCons = *(struct sqlite3_index_constraint**)&pIdxInfo->aConstraint;
-    pUsage = pIdxInfo->aConstraintUsage;
-    for(i=0; i<pIdxInfo->nConstraint; i++, pIdxCons++){
-      j = pIdxCons->iTermOffset;
-      pTerm = &pWC->a[j];
-      if( (pTerm->prereqRight&p->notReady)==0
-       && (bAllowIN || (pTerm->eOperator & WO_IN)==0)
-      ){
-        pIdxCons->usable = 1;
-      }else{
-        pIdxCons->usable = 0;
-      }
-    }
-    memset(pUsage, 0, sizeof(pUsage[0])*pIdxInfo->nConstraint);
-    if( pIdxInfo->needToFreeIdxStr ){
-      sqlite3_free(pIdxInfo->idxStr);
-    }
-    pIdxInfo->idxStr = 0;
-    pIdxInfo->idxNum = 0;
-    pIdxInfo->needToFreeIdxStr = 0;
-    pIdxInfo->orderByConsumed = 0;
-    /* ((double)2) In case of SQLITE_OMIT_FLOATING_POINT... */
-    pIdxInfo->estimatedCost = SQLITE_BIG_DBL / ((double)2);
-    nOrderBy = pIdxInfo->nOrderBy;
-    if( !p->pOrderBy ){
-      pIdxInfo->nOrderBy = 0;
-    }
-  
-    if( vtabBestIndex(pParse, pTab, pIdxInfo) ){
-      return;
-    }
-  
-    pIdxCons = *(struct sqlite3_index_constraint**)&pIdxInfo->aConstraint;
-    for(i=0; i<pIdxInfo->nConstraint; i++, pIdxCons++){
-      if( pUsage[i].argvIndex>0 ){
-        j = pIdxCons->iTermOffset;
-        pTerm = &pWC->a[j];
-        p->cost.used |= pTerm->prereqRight;
-        if( (pTerm->eOperator & WO_IN)!=0 ){
-          if( pUsage[i].omit==0 ){
-            /* Do not attempt to use an IN constraint if the virtual table
-            ** says that the equivalent EQ constraint cannot be safely omitted.
-            ** If we do attempt to use such a constraint, some rows might be
-            ** repeated in the output. */
-            break;
-          }
-          /* A virtual table that is constrained by an IN clause may not
-          ** consume the ORDER BY clause because (1) the order of IN terms
-          ** is not necessarily related to the order of output terms and
-          ** (2) Multiple outputs from a single IN value will not merge
-          ** together.  */
-          pIdxInfo->orderByConsumed = 0;
-        }
-      }
-    }
-    if( i>=pIdxInfo->nConstraint ) break;
-  }
-
-  /* The orderByConsumed signal is only valid if all outer loops collectively
-  ** generate just a single row of output.
-  */
-  if( pIdxInfo->orderByConsumed ){
-    for(i=0; i<p->i; i++){
-      if( (p->aLevel[i].plan.wsFlags & WHERE_UNIQUE)==0 ){
-        pIdxInfo->orderByConsumed = 0;
-      }
-    }
-  }
-  
-  /* If there is an ORDER BY clause, and the selected virtual table index
-  ** does not satisfy it, increase the cost of the scan accordingly. This
-  ** matches the processing for non-virtual tables in bestBtreeIndex().
-  */
-  rCost = pIdxInfo->estimatedCost;
-  if( p->pOrderBy && pIdxInfo->orderByConsumed==0 ){
-    rCost += estLog(rCost)*rCost;
-  }
-
-  /* The cost is not allowed to be larger than SQLITE_BIG_DBL (the
-  ** inital value of lowestCost in this loop. If it is, then the
-  ** (cost<lowestCost) test below will never be true.
-  ** 
-  ** Use "(double)2" instead of "2.0" in case OMIT_FLOATING_POINT 
-  ** is defined.
-  */
-  if( (SQLITE_BIG_DBL/((double)2))<rCost ){
-    p->cost.rCost = (SQLITE_BIG_DBL/((double)2));
-  }else{
-    p->cost.rCost = rCost;
-  }
-  p->cost.plan.u.pVtabIdx = pIdxInfo;
-  if( pIdxInfo->orderByConsumed ){
-    p->cost.plan.wsFlags |= WHERE_ORDERED;
-    p->cost.plan.nOBSat = nOrderBy;
-  }else{
-    p->cost.plan.nOBSat = p->i ? p->aLevel[p->i-1].plan.nOBSat : 0;
-  }
-  p->cost.plan.nEq = 0;
-  pIdxInfo->nOrderBy = nOrderBy;
-
-  /* Try to find a more efficient access pattern by using multiple indexes
-  ** to optimize an OR expression within the WHERE clause. 
-  */
-  bestOrClauseIndex(p);
-}
-#endif /* SQLITE_OMIT_VIRTUALTABLE */
-
-#ifdef SQLITE_ENABLE_STAT3
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
 /*
 ** Estimate the location of a particular key among all keys in an
 ** index.  Store the results in aStat as follows:
@@ -106832,140 +111930,76 @@ static void bestVirtualIndex(WhereBestIdx *p){
 **
 ** Return SQLITE_OK on success.
 */
-static int whereKeyStats(
+static void whereKeyStats(
   Parse *pParse,              /* Database connection */
   Index *pIdx,                /* Index to consider domain of */
-  sqlite3_value *pVal,        /* Value to consider */
+  UnpackedRecord *pRec,       /* Vector of values to consider */
   int roundUp,                /* Round up if true.  Round down if false */
   tRowcnt *aStat              /* OUT: stats written here */
 ){
-  tRowcnt n;
-  IndexSample *aSample;
-  int i, eType;
-  int isEq = 0;
-  i64 v;
-  double r, rS;
+  IndexSample *aSample = pIdx->aSample;
+  int iCol;                   /* Index of required stats in anEq[] etc. */
+  int iMin = 0;               /* Smallest sample not yet tested */
+  int i = pIdx->nSample;      /* Smallest sample larger than or equal to pRec */
+  int iTest;                  /* Next sample to test */
+  int res;                    /* Result of comparison operation */
 
-  assert( roundUp==0 || roundUp==1 );
-  assert( pIdx->nSample>0 );
-  if( pVal==0 ) return SQLITE_ERROR;
-  n = pIdx->aiRowEst[0];
-  aSample = pIdx->aSample;
-  eType = sqlite3_value_type(pVal);
-
-  if( eType==SQLITE_INTEGER ){
-    v = sqlite3_value_int64(pVal);
-    r = (i64)v;
-    for(i=0; i<pIdx->nSample; i++){
-      if( aSample[i].eType==SQLITE_NULL ) continue;
-      if( aSample[i].eType>=SQLITE_TEXT ) break;
-      if( aSample[i].eType==SQLITE_INTEGER ){
-        if( aSample[i].u.i>=v ){
-          isEq = aSample[i].u.i==v;
-          break;
-        }
-      }else{
-        assert( aSample[i].eType==SQLITE_FLOAT );
-        if( aSample[i].u.r>=r ){
-          isEq = aSample[i].u.r==r;
-          break;
-        }
-      }
-    }
-  }else if( eType==SQLITE_FLOAT ){
-    r = sqlite3_value_double(pVal);
-    for(i=0; i<pIdx->nSample; i++){
-      if( aSample[i].eType==SQLITE_NULL ) continue;
-      if( aSample[i].eType>=SQLITE_TEXT ) break;
-      if( aSample[i].eType==SQLITE_FLOAT ){
-        rS = aSample[i].u.r;
-      }else{
-        rS = aSample[i].u.i;
-      }
-      if( rS>=r ){
-        isEq = rS==r;
-        break;
-      }
-    }
-  }else if( eType==SQLITE_NULL ){
-    i = 0;
-    if( aSample[0].eType==SQLITE_NULL ) isEq = 1;
-  }else{
-    assert( eType==SQLITE_TEXT || eType==SQLITE_BLOB );
-    for(i=0; i<pIdx->nSample; i++){
-      if( aSample[i].eType==SQLITE_TEXT || aSample[i].eType==SQLITE_BLOB ){
-        break;
-      }
-    }
-    if( i<pIdx->nSample ){      
-      sqlite3 *db = pParse->db;
-      CollSeq *pColl;
-      const u8 *z;
-      if( eType==SQLITE_BLOB ){
-        z = (const u8 *)sqlite3_value_blob(pVal);
-        pColl = db->pDfltColl;
-        assert( pColl->enc==SQLITE_UTF8 );
-      }else{
-        pColl = sqlite3GetCollSeq(pParse, SQLITE_UTF8, 0, *pIdx->azColl);
-        if( pColl==0 ){
-          return SQLITE_ERROR;
-        }
-        z = (const u8 *)sqlite3ValueText(pVal, pColl->enc);
-        if( !z ){
-          return SQLITE_NOMEM;
-        }
-        assert( z && pColl && pColl->xCmp );
-      }
-      n = sqlite3ValueBytes(pVal, pColl->enc);
-  
-      for(; i<pIdx->nSample; i++){
-        int c;
-        int eSampletype = aSample[i].eType;
-        if( eSampletype<eType ) continue;
-        if( eSampletype!=eType ) break;
-#ifndef SQLITE_OMIT_UTF16
-        if( pColl->enc!=SQLITE_UTF8 ){
-          int nSample;
-          char *zSample = sqlite3Utf8to16(
-              db, pColl->enc, aSample[i].u.z, aSample[i].nByte, &nSample
-          );
-          if( !zSample ){
-            assert( db->mallocFailed );
-            return SQLITE_NOMEM;
-          }
-          c = pColl->xCmp(pColl->pUser, nSample, zSample, n, z);
-          sqlite3DbFree(db, zSample);
-        }else
+#ifndef SQLITE_DEBUG
+  UNUSED_PARAMETER( pParse );
 #endif
-        {
-          c = pColl->xCmp(pColl->pUser, aSample[i].nByte, aSample[i].u.z, n, z);
-        }
-        if( c>=0 ){
-          if( c==0 ) isEq = 1;
-          break;
-        }
-      }
+  assert( pRec!=0 );
+  iCol = pRec->nField - 1;
+  assert( pIdx->nSample>0 );
+  assert( pRec->nField>0 && iCol<pIdx->nSampleCol );
+  do{
+    iTest = (iMin+i)/2;
+    res = sqlite3VdbeRecordCompare(aSample[iTest].n, aSample[iTest].p, pRec, 0);
+    if( res<0 ){
+      iMin = iTest+1;
+    }else{
+      i = iTest;
     }
+  }while( res && iMin<i );
+
+#ifdef SQLITE_DEBUG
+  /* The following assert statements check that the binary search code
+  ** above found the right answer. This block serves no purpose other
+  ** than to invoke the asserts.  */
+  if( res==0 ){
+    /* If (res==0) is true, then sample $i must be equal to pRec */
+    assert( i<pIdx->nSample );
+    assert( 0==sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec, 0)
+         || pParse->db->mallocFailed );
+  }else{
+    /* Otherwise, pRec must be smaller than sample $i and larger than
+    ** sample ($i-1).  */
+    assert( i==pIdx->nSample 
+         || sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec, 0)>0
+         || pParse->db->mallocFailed );
+    assert( i==0
+         || sqlite3VdbeRecordCompare(aSample[i-1].n, aSample[i-1].p, pRec, 0)<0
+         || pParse->db->mallocFailed );
   }
+#endif /* ifdef SQLITE_DEBUG */
 
   /* At this point, aSample[i] is the first sample that is greater than
   ** or equal to pVal.  Or if i==pIdx->nSample, then all samples are less
-  ** than pVal.  If aSample[i]==pVal, then isEq==1.
+  ** than pVal.  If aSample[i]==pVal, then res==0.
   */
-  if( isEq ){
-    assert( i<pIdx->nSample );
-    aStat[0] = aSample[i].nLt;
-    aStat[1] = aSample[i].nEq;
+  if( res==0 ){
+    aStat[0] = aSample[i].anLt[iCol];
+    aStat[1] = aSample[i].anEq[iCol];
   }else{
     tRowcnt iLower, iUpper, iGap;
     if( i==0 ){
       iLower = 0;
-      iUpper = aSample[0].nLt;
+      iUpper = aSample[0].anLt[iCol];
     }else{
-      iUpper = i>=pIdx->nSample ? n : aSample[i].nLt;
-      iLower = aSample[i-1].nEq + aSample[i-1].nLt;
+      i64 nRow0 = sqlite3LogEstToInt(pIdx->aiRowLogEst[0]);
+      iUpper = i>=pIdx->nSample ? nRow0 : aSample[i].anLt[iCol];
+      iLower = aSample[i-1].anEq[iCol] + aSample[i-1].anLt[iCol];
     }
-    aStat[1] = pIdx->avgEq;
+    aStat[1] = (pIdx->nKeyCol>iCol ? pIdx->aAvgEq[iCol] : 1);
     if( iLower>=iUpper ){
       iGap = 0;
     }else{
@@ -106978,44 +112012,31 @@ static int whereKeyStats(
     }
     aStat[0] = iLower + iGap;
   }
-  return SQLITE_OK;
 }
-#endif /* SQLITE_ENABLE_STAT3 */
+#endif /* SQLITE_ENABLE_STAT3_OR_STAT4 */
 
 /*
-** If expression pExpr represents a literal value, set *pp to point to
-** an sqlite3_value structure containing the same value, with affinity
-** aff applied to it, before returning. It is the responsibility of the 
-** caller to eventually release this structure by passing it to 
-** sqlite3ValueFree().
+** If it is not NULL, pTerm is a term that provides an upper or lower
+** bound on a range scan. Without considering pTerm, it is estimated 
+** that the scan will visit nNew rows. This function returns the number
+** estimated to be visited after taking pTerm into account.
 **
-** If the current parse is a recompile (sqlite3Reprepare()) and pExpr
-** is an SQL variable that currently has a non-NULL value bound to it,
-** create an sqlite3_value structure containing this value, again with
-** affinity aff applied to it, instead.
-**
-** If neither of the above apply, set *pp to NULL.
-**
-** If an error occurs, return an error code. Otherwise, SQLITE_OK.
+** If the user explicitly specified a likelihood() value for this term,
+** then the return value is the likelihood multiplied by the number of
+** input rows. Otherwise, this function assumes that an "IS NOT NULL" term
+** has a likelihood of 0.50, and any other term a likelihood of 0.25.
 */
-#ifdef SQLITE_ENABLE_STAT3
-static int valueFromExpr(
-  Parse *pParse, 
-  Expr *pExpr, 
-  u8 aff, 
-  sqlite3_value **pp
-){
-  if( pExpr->op==TK_VARIABLE
-   || (pExpr->op==TK_REGISTER && pExpr->op2==TK_VARIABLE)
-  ){
-    int iVar = pExpr->iColumn;
-    sqlite3VdbeSetVarmask(pParse->pVdbe, iVar);
-    *pp = sqlite3VdbeGetValue(pParse->pReprepare, iVar, aff);
-    return SQLITE_OK;
+static LogEst whereRangeAdjust(WhereTerm *pTerm, LogEst nNew){
+  LogEst nRet = nNew;
+  if( pTerm ){
+    if( pTerm->truthProb<=0 ){
+      nRet += pTerm->truthProb;
+    }else if( (pTerm->wtFlags & TERM_VNULL)==0 ){
+      nRet -= 20;        assert( 20==sqlite3LogEst(4) );
+    }
   }
-  return sqlite3ValueFromExpr(pParse->db, pExpr, SQLITE_UTF8, aff, pp);
+  return nRet;
 }
-#endif
 
 /*
 ** This function is used to estimate the number of rows that will be visited
@@ -107032,97 +112053,162 @@ static int valueFromExpr(
 ** If either of the upper or lower bound is not present, then NULL is passed in
 ** place of the corresponding WhereTerm.
 **
-** The nEq parameter is passed the index of the index column subject to the
-** range constraint. Or, equivalently, the number of equality constraints
-** optimized by the proposed index scan. For example, assuming index p is
-** on t1(a, b), and the SQL query is:
+** The value in (pBuilder->pNew->u.btree.nEq) is the index of the index
+** column subject to the range constraint. Or, equivalently, the number of
+** equality constraints optimized by the proposed index scan. For example,
+** assuming index p is on t1(a, b), and the SQL query is:
 **
 **   ... FROM t1 WHERE a = ? AND b > ? AND b < ? ...
 **
-** then nEq should be passed the value 1 (as the range restricted column,
-** b, is the second left-most column of the index). Or, if the query is:
+** then nEq is set to 1 (as the range restricted column, b, is the second 
+** left-most column of the index). Or, if the query is:
 **
 **   ... FROM t1 WHERE a > ? AND a < ? ...
 **
-** then nEq should be passed 0.
+** then nEq is set to 0.
 **
-** The returned value is an integer divisor to reduce the estimated
-** search space.  A return value of 1 means that range constraints are
-** no help at all.  A return value of 2 means range constraints are
-** expected to reduce the search space by half.  And so forth...
-**
-** In the absence of sqlite_stat3 ANALYZE data, each range inequality
-** reduces the search space by a factor of 4.  Hence a single constraint (x>?)
-** results in a return of 4 and a range constraint (x>? AND x<?) results
-** in a return of 16.
+** When this function is called, *pnOut is set to the sqlite3LogEst() of the
+** number of rows that the index scan is expected to visit without 
+** considering the range constraints. If nEq is 0, this is the number of 
+** rows in the index. Assuming no error occurs, *pnOut is adjusted (reduced)
+** to account for the range contraints pLower and pUpper.
+** 
+** In the absence of sqlite_stat4 ANALYZE data, or if such data cannot be
+** used, each range inequality reduces the search space by a factor of 4. 
+** Hence a pair of constraints (x>? AND x<?) reduces the expected number of
+** rows visited by a factor of 16.
 */
 static int whereRangeScanEst(
   Parse *pParse,       /* Parsing & code generating context */
-  Index *p,            /* The index containing the range-compared column; "x" */
-  int nEq,             /* index into p->aCol[] of the range-compared column */
+  WhereLoopBuilder *pBuilder,
   WhereTerm *pLower,   /* Lower bound on the range. ex: "x>123" Might be NULL */
   WhereTerm *pUpper,   /* Upper bound on the range. ex: "x<455" Might be NULL */
-  double *pRangeDiv   /* OUT: Reduce search space by this divisor */
+  WhereLoop *pLoop     /* Modify the .nOut and maybe .rRun fields */
 ){
   int rc = SQLITE_OK;
+  int nOut = pLoop->nOut;
+  LogEst nNew;
 
-#ifdef SQLITE_ENABLE_STAT3
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+  Index *p = pLoop->u.btree.pIndex;
+  int nEq = pLoop->u.btree.nEq;
 
-  if( nEq==0 && p->nSample ){
-    sqlite3_value *pRangeVal;
-    tRowcnt iLower = 0;
-    tRowcnt iUpper = p->aiRowEst[0];
+  if( p->nSample>0
+   && nEq==pBuilder->nRecValid
+   && nEq<p->nSampleCol
+   && OptimizationEnabled(pParse->db, SQLITE_Stat3) 
+  ){
+    UnpackedRecord *pRec = pBuilder->pRec;
     tRowcnt a[2];
-    u8 aff = p->pTable->aCol[p->aiColumn[0]].affinity;
+    u8 aff;
 
+    /* Variable iLower will be set to the estimate of the number of rows in 
+    ** the index that are less than the lower bound of the range query. The
+    ** lower bound being the concatenation of $P and $L, where $P is the
+    ** key-prefix formed by the nEq values matched against the nEq left-most
+    ** columns of the index, and $L is the value in pLower.
+    **
+    ** Or, if pLower is NULL or $L cannot be extracted from it (because it
+    ** is not a simple variable or literal value), the lower bound of the
+    ** range is $P. Due to a quirk in the way whereKeyStats() works, even
+    ** if $L is available, whereKeyStats() is called for both ($P) and 
+    ** ($P:$L) and the larger of the two returned values used.
+    **
+    ** Similarly, iUpper is to be set to the estimate of the number of rows
+    ** less than the upper bound of the range query. Where the upper bound
+    ** is either ($P) or ($P:$U). Again, even if $U is available, both values
+    ** of iUpper are requested of whereKeyStats() and the smaller used.
+    */
+    tRowcnt iLower;
+    tRowcnt iUpper;
+
+    if( nEq==p->nKeyCol ){
+      aff = SQLITE_AFF_INTEGER;
+    }else{
+      aff = p->pTable->aCol[p->aiColumn[nEq]].affinity;
+    }
+    /* Determine iLower and iUpper using ($P) only. */
+    if( nEq==0 ){
+      iLower = 0;
+      iUpper = sqlite3LogEstToInt(p->aiRowLogEst[0]);
+    }else{
+      /* Note: this call could be optimized away - since the same values must 
+      ** have been requested when testing key $P in whereEqualScanEst().  */
+      whereKeyStats(pParse, p, pRec, 0, a);
+      iLower = a[0];
+      iUpper = a[0] + a[1];
+    }
+
+    /* If possible, improve on the iLower estimate using ($P:$L). */
     if( pLower ){
+      int bOk;                    /* True if value is extracted from pExpr */
       Expr *pExpr = pLower->pExpr->pRight;
-      rc = valueFromExpr(pParse, pExpr, aff, &pRangeVal);
       assert( (pLower->eOperator & (WO_GT|WO_GE))!=0 );
-      if( rc==SQLITE_OK
-       && whereKeyStats(pParse, p, pRangeVal, 0, a)==SQLITE_OK
-      ){
-        iLower = a[0];
-        if( (pLower->eOperator & WO_GT)!=0 ) iLower += a[1];
+      rc = sqlite3Stat4ProbeSetValue(pParse, p, &pRec, pExpr, aff, nEq, &bOk);
+      if( rc==SQLITE_OK && bOk ){
+        tRowcnt iNew;
+        whereKeyStats(pParse, p, pRec, 0, a);
+        iNew = a[0] + ((pLower->eOperator & WO_GT) ? a[1] : 0);
+        if( iNew>iLower ) iLower = iNew;
+        nOut--;
       }
-      sqlite3ValueFree(pRangeVal);
     }
-    if( rc==SQLITE_OK && pUpper ){
+
+    /* If possible, improve on the iUpper estimate using ($P:$U). */
+    if( pUpper ){
+      int bOk;                    /* True if value is extracted from pExpr */
       Expr *pExpr = pUpper->pExpr->pRight;
-      rc = valueFromExpr(pParse, pExpr, aff, &pRangeVal);
       assert( (pUpper->eOperator & (WO_LT|WO_LE))!=0 );
-      if( rc==SQLITE_OK
-       && whereKeyStats(pParse, p, pRangeVal, 1, a)==SQLITE_OK
-      ){
-        iUpper = a[0];
-        if( (pUpper->eOperator & WO_LE)!=0 ) iUpper += a[1];
+      rc = sqlite3Stat4ProbeSetValue(pParse, p, &pRec, pExpr, aff, nEq, &bOk);
+      if( rc==SQLITE_OK && bOk ){
+        tRowcnt iNew;
+        whereKeyStats(pParse, p, pRec, 1, a);
+        iNew = a[0] + ((pUpper->eOperator & WO_LE) ? a[1] : 0);
+        if( iNew<iUpper ) iUpper = iNew;
+        nOut--;
       }
-      sqlite3ValueFree(pRangeVal);
     }
+
+    pBuilder->pRec = pRec;
     if( rc==SQLITE_OK ){
-      if( iUpper<=iLower ){
-        *pRangeDiv = (double)p->aiRowEst[0];
+      if( iUpper>iLower ){
+        nNew = sqlite3LogEst(iUpper - iLower);
       }else{
-        *pRangeDiv = (double)p->aiRowEst[0]/(double)(iUpper - iLower);
+        nNew = 10;        assert( 10==sqlite3LogEst(2) );
       }
-      WHERETRACE(("range scan regions: %u..%u  div=%g\n",
-                  (u32)iLower, (u32)iUpper, *pRangeDiv));
+      if( nNew<nOut ){
+        nOut = nNew;
+      }
+      pLoop->nOut = (LogEst)nOut;
+      WHERETRACE(0x10, ("range scan regions: %u..%u  est=%d\n",
+                         (u32)iLower, (u32)iUpper, nOut));
       return SQLITE_OK;
     }
   }
 #else
   UNUSED_PARAMETER(pParse);
-  UNUSED_PARAMETER(p);
-  UNUSED_PARAMETER(nEq);
+  UNUSED_PARAMETER(pBuilder);
 #endif
   assert( pLower || pUpper );
-  *pRangeDiv = (double)1;
-  if( pLower && (pLower->wtFlags & TERM_VNULL)==0 ) *pRangeDiv *= (double)4;
-  if( pUpper ) *pRangeDiv *= (double)4;
+  assert( pUpper==0 || (pUpper->wtFlags & TERM_VNULL)==0 );
+  nNew = whereRangeAdjust(pLower, nOut);
+  nNew = whereRangeAdjust(pUpper, nNew);
+
+  /* TUNING: If there is both an upper and lower limit, assume the range is
+  ** reduced by an additional 75%. This means that, by default, an open-ended
+  ** range query (e.g. col > ?) is assumed to match 1/4 of the rows in the
+  ** index. While a closed range (e.g. col BETWEEN ? AND ?) is estimated to
+  ** match 1/64 of the index. */ 
+  if( pLower && pUpper ) nNew -= 20;
+
+  nOut -= (pLower!=0) + (pUpper!=0);
+  if( nNew<10 ) nNew = 10;
+  if( nNew<nOut ) nOut = nNew;
+  pLoop->nOut = (LogEst)nOut;
   return rc;
 }
 
-#ifdef SQLITE_ENABLE_STAT3
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
 /*
 ** Estimate the number of rows that will be returned based on
 ** an equality constraint x=VALUE and where that VALUE occurs in
@@ -107142,37 +112228,53 @@ static int whereRangeScanEst(
 */
 static int whereEqualScanEst(
   Parse *pParse,       /* Parsing & code generating context */
-  Index *p,            /* The index whose left-most column is pTerm */
+  WhereLoopBuilder *pBuilder,
   Expr *pExpr,         /* Expression for VALUE in the x=VALUE constraint */
-  double *pnRow        /* Write the revised row estimate here */
+  tRowcnt *pnRow       /* Write the revised row estimate here */
 ){
-  sqlite3_value *pRhs = 0;  /* VALUE on right-hand side of pTerm */
+  Index *p = pBuilder->pNew->u.btree.pIndex;
+  int nEq = pBuilder->pNew->u.btree.nEq;
+  UnpackedRecord *pRec = pBuilder->pRec;
   u8 aff;                   /* Column affinity */
   int rc;                   /* Subfunction return code */
   tRowcnt a[2];             /* Statistics */
+  int bOk;
 
+  assert( nEq>=1 );
+  assert( nEq<=(p->nKeyCol+1) );
   assert( p->aSample!=0 );
   assert( p->nSample>0 );
-  aff = p->pTable->aCol[p->aiColumn[0]].affinity;
-  if( pExpr ){
-    rc = valueFromExpr(pParse, pExpr, aff, &pRhs);
-    if( rc ) goto whereEqualScanEst_cancel;
-  }else{
-    pRhs = sqlite3ValueNew(pParse->db);
+  assert( pBuilder->nRecValid<nEq );
+
+  /* If values are not available for all fields of the index to the left
+  ** of this one, no estimate can be made. Return SQLITE_NOTFOUND. */
+  if( pBuilder->nRecValid<(nEq-1) ){
+    return SQLITE_NOTFOUND;
   }
-  if( pRhs==0 ) return SQLITE_NOTFOUND;
-  rc = whereKeyStats(pParse, p, pRhs, 0, a);
-  if( rc==SQLITE_OK ){
-    WHERETRACE(("equality scan regions: %d\n", (int)a[1]));
-    *pnRow = a[1];
+
+  /* This is an optimization only. The call to sqlite3Stat4ProbeSetValue()
+  ** below would return the same value.  */
+  if( nEq>p->nKeyCol ){
+    *pnRow = 1;
+    return SQLITE_OK;
   }
-whereEqualScanEst_cancel:
-  sqlite3ValueFree(pRhs);
+
+  aff = p->pTable->aCol[p->aiColumn[nEq-1]].affinity;
+  rc = sqlite3Stat4ProbeSetValue(pParse, p, &pRec, pExpr, aff, nEq-1, &bOk);
+  pBuilder->pRec = pRec;
+  if( rc!=SQLITE_OK ) return rc;
+  if( bOk==0 ) return SQLITE_NOTFOUND;
+  pBuilder->nRecValid = nEq;
+
+  whereKeyStats(pParse, p, pRec, 0, a);
+  WHERETRACE(0x10,("equality scan regions: %d\n", (int)a[1]));
+  *pnRow = a[1];
+  
   return rc;
 }
-#endif /* defined(SQLITE_ENABLE_STAT3) */
+#endif /* SQLITE_ENABLE_STAT3_OR_STAT4 */
 
-#ifdef SQLITE_ENABLE_STAT3
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
 /*
 ** Estimate the number of rows that will be returned based on
 ** an IN constraint where the right-hand side of the IN operator
@@ -107191,902 +112293,35 @@ static int whereEqualScanEst(
 */
 static int whereInScanEst(
   Parse *pParse,       /* Parsing & code generating context */
-  Index *p,            /* The index whose left-most column is pTerm */
+  WhereLoopBuilder *pBuilder,
   ExprList *pList,     /* The value list on the RHS of "x IN (v1,v2,v3,...)" */
-  double *pnRow        /* Write the revised row estimate here */
+  tRowcnt *pnRow       /* Write the revised row estimate here */
 ){
-  int rc = SQLITE_OK;         /* Subfunction return code */
-  double nEst;                /* Number of rows for a single term */
-  double nRowEst = (double)0; /* New estimate of the number of rows */
-  int i;                      /* Loop counter */
+  Index *p = pBuilder->pNew->u.btree.pIndex;
+  i64 nRow0 = sqlite3LogEstToInt(p->aiRowLogEst[0]);
+  int nRecValid = pBuilder->nRecValid;
+  int rc = SQLITE_OK;     /* Subfunction return code */
+  tRowcnt nEst;           /* Number of rows for a single term */
+  tRowcnt nRowEst = 0;    /* New estimate of the number of rows */
+  int i;                  /* Loop counter */
 
   assert( p->aSample!=0 );
   for(i=0; rc==SQLITE_OK && i<pList->nExpr; i++){
-    nEst = p->aiRowEst[0];
-    rc = whereEqualScanEst(pParse, p, pList->a[i].pExpr, &nEst);
+    nEst = nRow0;
+    rc = whereEqualScanEst(pParse, pBuilder, pList->a[i].pExpr, &nEst);
     nRowEst += nEst;
+    pBuilder->nRecValid = nRecValid;
   }
+
   if( rc==SQLITE_OK ){
-    if( nRowEst > p->aiRowEst[0] ) nRowEst = p->aiRowEst[0];
+    if( nRowEst > nRow0 ) nRowEst = nRow0;
     *pnRow = nRowEst;
-    WHERETRACE(("IN row estimate: est=%g\n", nRowEst));
+    WHERETRACE(0x10,("IN row estimate: est=%g\n", nRowEst));
   }
+  assert( pBuilder->nRecValid==nRecValid );
   return rc;
 }
-#endif /* defined(SQLITE_ENABLE_STAT3) */
-
-/*
-** Check to see if column iCol of the table with cursor iTab will appear
-** in sorted order according to the current query plan.
-**
-** Return values:
-**
-**    0   iCol is not ordered
-**    1   iCol has only a single value
-**    2   iCol is in ASC order
-**    3   iCol is in DESC order
-*/
-static int isOrderedColumn(
-  WhereBestIdx *p,
-  int iTab,
-  int iCol
-){
-  int i, j;
-  WhereLevel *pLevel = &p->aLevel[p->i-1];
-  Index *pIdx;
-  u8 sortOrder;
-  for(i=p->i-1; i>=0; i--, pLevel--){
-    if( pLevel->iTabCur!=iTab ) continue;
-    if( (pLevel->plan.wsFlags & WHERE_ALL_UNIQUE)!=0 ){
-      return 1;
-    }
-    assert( (pLevel->plan.wsFlags & WHERE_ORDERED)!=0 );
-    if( (pIdx = pLevel->plan.u.pIdx)!=0 ){
-      if( iCol<0 ){
-        sortOrder = 0;
-        testcase( (pLevel->plan.wsFlags & WHERE_REVERSE)!=0 );
-      }else{
-        int n = pIdx->nColumn;
-        for(j=0; j<n; j++){
-          if( iCol==pIdx->aiColumn[j] ) break;
-        }
-        if( j>=n ) return 0;
-        sortOrder = pIdx->aSortOrder[j];
-        testcase( (pLevel->plan.wsFlags & WHERE_REVERSE)!=0 );
-      }
-    }else{
-      if( iCol!=(-1) ) return 0;
-      sortOrder = 0;
-      testcase( (pLevel->plan.wsFlags & WHERE_REVERSE)!=0 );
-    }
-    if( (pLevel->plan.wsFlags & WHERE_REVERSE)!=0 ){
-      assert( sortOrder==0 || sortOrder==1 );
-      testcase( sortOrder==1 );
-      sortOrder = 1 - sortOrder;
-    }
-    return sortOrder+2;
-  }
-  return 0;
-}
-
-/*
-** This routine decides if pIdx can be used to satisfy the ORDER BY
-** clause, either in whole or in part.  The return value is the 
-** cumulative number of terms in the ORDER BY clause that are satisfied
-** by the index pIdx and other indices in outer loops.
-**
-** The table being queried has a cursor number of "base".  pIdx is the
-** index that is postulated for use to access the table.
-**
-** The *pbRev value is set to 0 order 1 depending on whether or not
-** pIdx should be run in the forward order or in reverse order.
-*/
-static int isSortingIndex(
-  WhereBestIdx *p,    /* Best index search context */
-  Index *pIdx,        /* The index we are testing */
-  int base,           /* Cursor number for the table to be sorted */
-  int *pbRev,         /* Set to 1 for reverse-order scan of pIdx */
-  int *pbObUnique     /* ORDER BY column values will different in every row */
-){
-  int i;                        /* Number of pIdx terms used */
-  int j;                        /* Number of ORDER BY terms satisfied */
-  int sortOrder = 2;            /* 0: forward.  1: backward.  2: unknown */
-  int nTerm;                    /* Number of ORDER BY terms */
-  struct ExprList_item *pOBItem;/* A term of the ORDER BY clause */
-  Table *pTab = pIdx->pTable;   /* Table that owns index pIdx */
-  ExprList *pOrderBy;           /* The ORDER BY clause */
-  Parse *pParse = p->pParse;    /* Parser context */
-  sqlite3 *db = pParse->db;     /* Database connection */
-  int nPriorSat;                /* ORDER BY terms satisfied by outer loops */
-  int seenRowid = 0;            /* True if an ORDER BY rowid term is seen */
-  int uniqueNotNull;            /* pIdx is UNIQUE with all terms are NOT NULL */
-  int outerObUnique;            /* Outer loops generate different values in
-                                ** every row for the ORDER BY columns */
-
-  if( p->i==0 ){
-    nPriorSat = 0;
-    outerObUnique = 1;
-  }else{
-    u32 wsFlags = p->aLevel[p->i-1].plan.wsFlags;
-    nPriorSat = p->aLevel[p->i-1].plan.nOBSat;
-    if( (wsFlags & WHERE_ORDERED)==0 ){
-      /* This loop cannot be ordered unless the next outer loop is
-      ** also ordered */
-      return nPriorSat;
-    }
-    if( OptimizationDisabled(db, SQLITE_OrderByIdxJoin) ){
-      /* Only look at the outer-most loop if the OrderByIdxJoin
-      ** optimization is disabled */
-      return nPriorSat;
-    }
-    testcase( wsFlags & WHERE_OB_UNIQUE );
-    testcase( wsFlags & WHERE_ALL_UNIQUE );
-    outerObUnique = (wsFlags & (WHERE_OB_UNIQUE|WHERE_ALL_UNIQUE))!=0;
-  }
-  pOrderBy = p->pOrderBy;
-  assert( pOrderBy!=0 );
-  if( pIdx->bUnordered ){
-    /* Hash indices (indicated by the "unordered" tag on sqlite_stat1) cannot
-    ** be used for sorting */
-    return nPriorSat;
-  }
-  nTerm = pOrderBy->nExpr;
-  uniqueNotNull = pIdx->onError!=OE_None;
-  assert( nTerm>0 );
-
-  /* Argument pIdx must either point to a 'real' named index structure, 
-  ** or an index structure allocated on the stack by bestBtreeIndex() to
-  ** represent the rowid index that is part of every table.  */
-  assert( pIdx->zName || (pIdx->nColumn==1 && pIdx->aiColumn[0]==-1) );
-
-  /* Match terms of the ORDER BY clause against columns of
-  ** the index.
-  **
-  ** Note that indices have pIdx->nColumn regular columns plus
-  ** one additional column containing the rowid.  The rowid column
-  ** of the index is also allowed to match against the ORDER BY
-  ** clause.
-  */
-  j = nPriorSat;
-  for(i=0,pOBItem=&pOrderBy->a[j]; j<nTerm && i<=pIdx->nColumn; i++){
-    Expr *pOBExpr;          /* The expression of the ORDER BY pOBItem */
-    CollSeq *pColl;         /* The collating sequence of pOBExpr */
-    int termSortOrder;      /* Sort order for this term */
-    int iColumn;            /* The i-th column of the index.  -1 for rowid */
-    int iSortOrder;         /* 1 for DESC, 0 for ASC on the i-th index term */
-    int isEq;               /* Subject to an == or IS NULL constraint */
-    int isMatch;            /* ORDER BY term matches the index term */
-    const char *zColl;      /* Name of collating sequence for i-th index term */
-    WhereTerm *pConstraint; /* A constraint in the WHERE clause */
-
-    /* If the next term of the ORDER BY clause refers to anything other than
-    ** a column in the "base" table, then this index will not be of any
-    ** further use in handling the ORDER BY. */
-    pOBExpr = sqlite3ExprSkipCollate(pOBItem->pExpr);
-    if( pOBExpr->op!=TK_COLUMN || pOBExpr->iTable!=base ){
-      break;
-    }
-
-    /* Find column number and collating sequence for the next entry
-    ** in the index */
-    if( pIdx->zName && i<pIdx->nColumn ){
-      iColumn = pIdx->aiColumn[i];
-      if( iColumn==pIdx->pTable->iPKey ){
-        iColumn = -1;
-      }
-      iSortOrder = pIdx->aSortOrder[i];
-      zColl = pIdx->azColl[i];
-      assert( zColl!=0 );
-    }else{
-      iColumn = -1;
-      iSortOrder = 0;
-      zColl = 0;
-    }
-
-    /* Check to see if the column number and collating sequence of the
-    ** index match the column number and collating sequence of the ORDER BY
-    ** clause entry.  Set isMatch to 1 if they both match. */
-    if( pOBExpr->iColumn==iColumn ){
-      if( zColl ){
-        pColl = sqlite3ExprCollSeq(pParse, pOBItem->pExpr);
-        if( !pColl ) pColl = db->pDfltColl;
-        isMatch = sqlite3StrICmp(pColl->zName, zColl)==0;
-      }else{
-        isMatch = 1;
-      }
-    }else{
-      isMatch = 0;
-    }
-
-    /* termSortOrder is 0 or 1 for whether or not the access loop should
-    ** run forward or backwards (respectively) in order to satisfy this 
-    ** term of the ORDER BY clause. */
-    assert( pOBItem->sortOrder==0 || pOBItem->sortOrder==1 );
-    assert( iSortOrder==0 || iSortOrder==1 );
-    termSortOrder = iSortOrder ^ pOBItem->sortOrder;
-
-    /* If X is the column in the index and ORDER BY clause, check to see
-    ** if there are any X= or X IS NULL constraints in the WHERE clause. */
-    pConstraint = findTerm(p->pWC, base, iColumn, p->notReady,
-                           WO_EQ|WO_ISNULL|WO_IN, pIdx);
-    if( pConstraint==0 ){
-      isEq = 0;
-    }else if( (pConstraint->eOperator & WO_IN)!=0 ){
-      isEq = 0;
-    }else if( (pConstraint->eOperator & WO_ISNULL)!=0 ){
-      uniqueNotNull = 0;
-      isEq = 1;  /* "X IS NULL" means X has only a single value */
-    }else if( pConstraint->prereqRight==0 ){
-      isEq = 1;  /* Constraint "X=constant" means X has only a single value */
-    }else{
-      Expr *pRight = pConstraint->pExpr->pRight;
-      if( pRight->op==TK_COLUMN ){
-        WHERETRACE(("       .. isOrderedColumn(tab=%d,col=%d)",
-                    pRight->iTable, pRight->iColumn));
-        isEq = isOrderedColumn(p, pRight->iTable, pRight->iColumn);
-        WHERETRACE((" -> isEq=%d\n", isEq));
-
-        /* If the constraint is of the form X=Y where Y is an ordered value
-        ** in an outer loop, then make sure the sort order of Y matches the
-        ** sort order required for X. */
-        if( isMatch && isEq>=2 && isEq!=pOBItem->sortOrder+2 ){
-          testcase( isEq==2 );
-          testcase( isEq==3 );
-          break;
-        }
-      }else{
-        isEq = 0;  /* "X=expr" places no ordering constraints on X */
-      }
-    }
-    if( !isMatch ){
-      if( isEq==0 ){
-        break;
-      }else{
-        continue;
-      }
-    }else if( isEq!=1 ){
-      if( sortOrder==2 ){
-        sortOrder = termSortOrder;
-      }else if( termSortOrder!=sortOrder ){
-        break;
-      }
-    }
-    j++;
-    pOBItem++;
-    if( iColumn<0 ){
-      seenRowid = 1;
-      break;
-    }else if( pTab->aCol[iColumn].notNull==0 && isEq!=1 ){
-      testcase( isEq==0 );
-      testcase( isEq==2 );
-      testcase( isEq==3 );
-      uniqueNotNull = 0;
-    }
-  }
-  if( seenRowid ){
-    uniqueNotNull = 1;
-  }else if( uniqueNotNull==0 || i<pIdx->nColumn ){
-    uniqueNotNull = 0;
-  }
-
-  /* If we have not found at least one ORDER BY term that matches the
-  ** index, then show no progress. */
-  if( pOBItem==&pOrderBy->a[nPriorSat] ) return nPriorSat;
-
-  /* Either the outer queries must generate rows where there are no two
-  ** rows with the same values in all ORDER BY columns, or else this
-  ** loop must generate just a single row of output.  Example:  Suppose
-  ** the outer loops generate A=1 and A=1, and this loop generates B=3
-  ** and B=4.  Then without the following test, ORDER BY A,B would 
-  ** generate the wrong order output: 1,3 1,4 1,3 1,4
-  */
-  if( outerObUnique==0 && uniqueNotNull==0 ) return nPriorSat;
-  *pbObUnique = uniqueNotNull;
-
-  /* Return the necessary scan order back to the caller */
-  *pbRev = sortOrder & 1;
-
-  /* If there was an "ORDER BY rowid" term that matched, or it is only
-  ** possible for a single row from this table to match, then skip over
-  ** any additional ORDER BY terms dealing with this table.
-  */
-  if( uniqueNotNull ){
-    /* Advance j over additional ORDER BY terms associated with base */
-    WhereMaskSet *pMS = p->pWC->pMaskSet;
-    Bitmask m = ~getMask(pMS, base);
-    while( j<nTerm && (exprTableUsage(pMS, pOrderBy->a[j].pExpr)&m)==0 ){
-      j++;
-    }
-  }
-  return j;
-}
-
-/*
-** Find the best query plan for accessing a particular table.  Write the
-** best query plan and its cost into the p->cost.
-**
-** The lowest cost plan wins.  The cost is an estimate of the amount of
-** CPU and disk I/O needed to process the requested result.
-** Factors that influence cost include:
-**
-**    *  The estimated number of rows that will be retrieved.  (The
-**       fewer the better.)
-**
-**    *  Whether or not sorting must occur.
-**
-**    *  Whether or not there must be separate lookups in the
-**       index and in the main table.
-**
-** If there was an INDEXED BY clause (pSrc->pIndex) attached to the table in
-** the SQL statement, then this function only considers plans using the 
-** named index. If no such plan is found, then the returned cost is
-** SQLITE_BIG_DBL. If a plan is found that uses the named index, 
-** then the cost is calculated in the usual way.
-**
-** If a NOT INDEXED clause was attached to the table 
-** in the SELECT statement, then no indexes are considered. However, the 
-** selected plan may still take advantage of the built-in rowid primary key
-** index.
-*/
-static void bestBtreeIndex(WhereBestIdx *p){
-  Parse *pParse = p->pParse;  /* The parsing context */
-  WhereClause *pWC = p->pWC;  /* The WHERE clause */
-  struct SrcList_item *pSrc = p->pSrc; /* The FROM clause term to search */
-  int iCur = pSrc->iCursor;   /* The cursor of the table to be accessed */
-  Index *pProbe;              /* An index we are evaluating */
-  Index *pIdx;                /* Copy of pProbe, or zero for IPK index */
-  int eqTermMask;             /* Current mask of valid equality operators */
-  int idxEqTermMask;          /* Index mask of valid equality operators */
-  Index sPk;                  /* A fake index object for the primary key */
-  tRowcnt aiRowEstPk[2];      /* The aiRowEst[] value for the sPk index */
-  int aiColumnPk = -1;        /* The aColumn[] value for the sPk index */
-  int wsFlagMask;             /* Allowed flags in p->cost.plan.wsFlag */
-  int nPriorSat;              /* ORDER BY terms satisfied by outer loops */
-  int nOrderBy;               /* Number of ORDER BY terms */
-  char bSortInit;             /* Initializer for bSort in inner loop */
-  char bDistInit;             /* Initializer for bDist in inner loop */
-
-
-  /* Initialize the cost to a worst-case value */
-  memset(&p->cost, 0, sizeof(p->cost));
-  p->cost.rCost = SQLITE_BIG_DBL;
-
-  /* If the pSrc table is the right table of a LEFT JOIN then we may not
-  ** use an index to satisfy IS NULL constraints on that table.  This is
-  ** because columns might end up being NULL if the table does not match -
-  ** a circumstance which the index cannot help us discover.  Ticket #2177.
-  */
-  if( pSrc->jointype & JT_LEFT ){
-    idxEqTermMask = WO_EQ|WO_IN;
-  }else{
-    idxEqTermMask = WO_EQ|WO_IN|WO_ISNULL;
-  }
-
-  if( pSrc->pIndex ){
-    /* An INDEXED BY clause specifies a particular index to use */
-    pIdx = pProbe = pSrc->pIndex;
-    wsFlagMask = ~(WHERE_ROWID_EQ|WHERE_ROWID_RANGE);
-    eqTermMask = idxEqTermMask;
-  }else{
-    /* There is no INDEXED BY clause.  Create a fake Index object in local
-    ** variable sPk to represent the rowid primary key index.  Make this
-    ** fake index the first in a chain of Index objects with all of the real
-    ** indices to follow */
-    Index *pFirst;                  /* First of real indices on the table */
-    memset(&sPk, 0, sizeof(Index));
-    sPk.nColumn = 1;
-    sPk.aiColumn = &aiColumnPk;
-    sPk.aiRowEst = aiRowEstPk;
-    sPk.onError = OE_Replace;
-    sPk.pTable = pSrc->pTab;
-    aiRowEstPk[0] = pSrc->pTab->nRowEst;
-    aiRowEstPk[1] = 1;
-    pFirst = pSrc->pTab->pIndex;
-    if( pSrc->notIndexed==0 ){
-      /* The real indices of the table are only considered if the
-      ** NOT INDEXED qualifier is omitted from the FROM clause */
-      sPk.pNext = pFirst;
-    }
-    pProbe = &sPk;
-    wsFlagMask = ~(
-        WHERE_COLUMN_IN|WHERE_COLUMN_EQ|WHERE_COLUMN_NULL|WHERE_COLUMN_RANGE
-    );
-    eqTermMask = WO_EQ|WO_IN;
-    pIdx = 0;
-  }
-
-  nOrderBy = p->pOrderBy ? p->pOrderBy->nExpr : 0;
-  if( p->i ){
-    nPriorSat = p->aLevel[p->i-1].plan.nOBSat;
-    bSortInit = nPriorSat<nOrderBy;
-    bDistInit = 0;
-  }else{
-    nPriorSat = 0;
-    bSortInit = nOrderBy>0;
-    bDistInit = p->pDistinct!=0;
-  }
-
-  /* Loop over all indices looking for the best one to use
-  */
-  for(; pProbe; pIdx=pProbe=pProbe->pNext){
-    const tRowcnt * const aiRowEst = pProbe->aiRowEst;
-    WhereCost pc;               /* Cost of using pProbe */
-    double log10N = (double)1;  /* base-10 logarithm of nRow (inexact) */
-
-    /* The following variables are populated based on the properties of
-    ** index being evaluated. They are then used to determine the expected
-    ** cost and number of rows returned.
-    **
-    **  pc.plan.nEq: 
-    **    Number of equality terms that can be implemented using the index.
-    **    In other words, the number of initial fields in the index that
-    **    are used in == or IN or NOT NULL constraints of the WHERE clause.
-    **
-    **  nInMul:  
-    **    The "in-multiplier". This is an estimate of how many seek operations 
-    **    SQLite must perform on the index in question. For example, if the 
-    **    WHERE clause is:
-    **
-    **      WHERE a IN (1, 2, 3) AND b IN (4, 5, 6)
-    **
-    **    SQLite must perform 9 lookups on an index on (a, b), so nInMul is 
-    **    set to 9. Given the same schema and either of the following WHERE 
-    **    clauses:
-    **
-    **      WHERE a =  1
-    **      WHERE a >= 2
-    **
-    **    nInMul is set to 1.
-    **
-    **    If there exists a WHERE term of the form "x IN (SELECT ...)", then 
-    **    the sub-select is assumed to return 25 rows for the purposes of 
-    **    determining nInMul.
-    **
-    **  bInEst:  
-    **    Set to true if there was at least one "x IN (SELECT ...)" term used 
-    **    in determining the value of nInMul.  Note that the RHS of the
-    **    IN operator must be a SELECT, not a value list, for this variable
-    **    to be true.
-    **
-    **  rangeDiv:
-    **    An estimate of a divisor by which to reduce the search space due
-    **    to inequality constraints.  In the absence of sqlite_stat3 ANALYZE
-    **    data, a single inequality reduces the search space to 1/4rd its
-    **    original size (rangeDiv==4).  Two inequalities reduce the search
-    **    space to 1/16th of its original size (rangeDiv==16).
-    **
-    **  bSort:   
-    **    Boolean. True if there is an ORDER BY clause that will require an 
-    **    external sort (i.e. scanning the index being evaluated will not 
-    **    correctly order records).
-    **
-    **  bDist:
-    **    Boolean. True if there is a DISTINCT clause that will require an 
-    **    external btree.
-    **
-    **  bLookup: 
-    **    Boolean. True if a table lookup is required for each index entry
-    **    visited.  In other words, true if this is not a covering index.
-    **    This is always false for the rowid primary key index of a table.
-    **    For other indexes, it is true unless all the columns of the table
-    **    used by the SELECT statement are present in the index (such an
-    **    index is sometimes described as a covering index).
-    **    For example, given the index on (a, b), the second of the following 
-    **    two queries requires table b-tree lookups in order to find the value
-    **    of column c, but the first does not because columns a and b are
-    **    both available in the index.
-    **
-    **             SELECT a, b    FROM tbl WHERE a = 1;
-    **             SELECT a, b, c FROM tbl WHERE a = 1;
-    */
-    int bInEst = 0;               /* True if "x IN (SELECT...)" seen */
-    int nInMul = 1;               /* Number of distinct equalities to lookup */
-    double rangeDiv = (double)1;  /* Estimated reduction in search space */
-    int nBound = 0;               /* Number of range constraints seen */
-    char bSort = bSortInit;       /* True if external sort required */
-    char bDist = bDistInit;       /* True if index cannot help with DISTINCT */
-    char bLookup = 0;             /* True if not a covering index */
-    WhereTerm *pTerm;             /* A single term of the WHERE clause */
-#ifdef SQLITE_ENABLE_STAT3
-    WhereTerm *pFirstTerm = 0;    /* First term matching the index */
-#endif
-
-    WHERETRACE((
-      "   %s(%s):\n",
-      pSrc->pTab->zName, (pIdx ? pIdx->zName : "ipk")
-    ));
-    memset(&pc, 0, sizeof(pc));
-    pc.plan.nOBSat = nPriorSat;
-
-    /* Determine the values of pc.plan.nEq and nInMul */
-    for(pc.plan.nEq=0; pc.plan.nEq<pProbe->nColumn; pc.plan.nEq++){
-      int j = pProbe->aiColumn[pc.plan.nEq];
-      pTerm = findTerm(pWC, iCur, j, p->notReady, eqTermMask, pIdx);
-      if( pTerm==0 ) break;
-      pc.plan.wsFlags |= (WHERE_COLUMN_EQ|WHERE_ROWID_EQ);
-      testcase( pTerm->pWC!=pWC );
-      if( pTerm->eOperator & WO_IN ){
-        Expr *pExpr = pTerm->pExpr;
-        pc.plan.wsFlags |= WHERE_COLUMN_IN;
-        if( ExprHasProperty(pExpr, EP_xIsSelect) ){
-          /* "x IN (SELECT ...)":  Assume the SELECT returns 25 rows */
-          nInMul *= 25;
-          bInEst = 1;
-        }else if( ALWAYS(pExpr->x.pList && pExpr->x.pList->nExpr) ){
-          /* "x IN (value, value, ...)" */
-          nInMul *= pExpr->x.pList->nExpr;
-        }
-      }else if( pTerm->eOperator & WO_ISNULL ){
-        pc.plan.wsFlags |= WHERE_COLUMN_NULL;
-      }
-#ifdef SQLITE_ENABLE_STAT3
-      if( pc.plan.nEq==0 && pProbe->aSample ) pFirstTerm = pTerm;
-#endif
-      pc.used |= pTerm->prereqRight;
-    }
- 
-    /* If the index being considered is UNIQUE, and there is an equality 
-    ** constraint for all columns in the index, then this search will find
-    ** at most a single row. In this case set the WHERE_UNIQUE flag to 
-    ** indicate this to the caller.
-    **
-    ** Otherwise, if the search may find more than one row, test to see if
-    ** there is a range constraint on indexed column (pc.plan.nEq+1) that
-    ** can be optimized using the index. 
-    */
-    if( pc.plan.nEq==pProbe->nColumn && pProbe->onError!=OE_None ){
-      testcase( pc.plan.wsFlags & WHERE_COLUMN_IN );
-      testcase( pc.plan.wsFlags & WHERE_COLUMN_NULL );
-      if( (pc.plan.wsFlags & (WHERE_COLUMN_IN|WHERE_COLUMN_NULL))==0 ){
-        pc.plan.wsFlags |= WHERE_UNIQUE;
-        if( p->i==0 || (p->aLevel[p->i-1].plan.wsFlags & WHERE_ALL_UNIQUE)!=0 ){
-          pc.plan.wsFlags |= WHERE_ALL_UNIQUE;
-        }
-      }
-    }else if( pProbe->bUnordered==0 ){
-      int j;
-      j = (pc.plan.nEq==pProbe->nColumn ? -1 : pProbe->aiColumn[pc.plan.nEq]);
-      if( findTerm(pWC, iCur, j, p->notReady, WO_LT|WO_LE|WO_GT|WO_GE, pIdx) ){
-        WhereTerm *pTop, *pBtm;
-        pTop = findTerm(pWC, iCur, j, p->notReady, WO_LT|WO_LE, pIdx);
-        pBtm = findTerm(pWC, iCur, j, p->notReady, WO_GT|WO_GE, pIdx);
-        whereRangeScanEst(pParse, pProbe, pc.plan.nEq, pBtm, pTop, &rangeDiv);
-        if( pTop ){
-          nBound = 1;
-          pc.plan.wsFlags |= WHERE_TOP_LIMIT;
-          pc.used |= pTop->prereqRight;
-          testcase( pTop->pWC!=pWC );
-        }
-        if( pBtm ){
-          nBound++;
-          pc.plan.wsFlags |= WHERE_BTM_LIMIT;
-          pc.used |= pBtm->prereqRight;
-          testcase( pBtm->pWC!=pWC );
-        }
-        pc.plan.wsFlags |= (WHERE_COLUMN_RANGE|WHERE_ROWID_RANGE);
-      }
-    }
-
-    /* If there is an ORDER BY clause and the index being considered will
-    ** naturally scan rows in the required order, set the appropriate flags
-    ** in pc.plan.wsFlags. Otherwise, if there is an ORDER BY clause but
-    ** the index will scan rows in a different order, set the bSort
-    ** variable.  */
-    if( bSort && (pSrc->jointype & JT_LEFT)==0 ){
-      int bRev = 2;
-      int bObUnique = 0;
-      WHERETRACE(("      --> before isSortIndex: nPriorSat=%d\n",nPriorSat));
-      pc.plan.nOBSat = isSortingIndex(p, pProbe, iCur, &bRev, &bObUnique);
-      WHERETRACE(("      --> after  isSortIndex: bRev=%d bObU=%d nOBSat=%d\n",
-                  bRev, bObUnique, pc.plan.nOBSat));
-      if( nPriorSat<pc.plan.nOBSat || (pc.plan.wsFlags & WHERE_ALL_UNIQUE)!=0 ){
-        pc.plan.wsFlags |= WHERE_ORDERED;
-        if( bObUnique ) pc.plan.wsFlags |= WHERE_OB_UNIQUE;
-      }
-      if( nOrderBy==pc.plan.nOBSat ){
-        bSort = 0;
-        pc.plan.wsFlags |= WHERE_ROWID_RANGE|WHERE_COLUMN_RANGE;
-      }
-      if( bRev & 1 ) pc.plan.wsFlags |= WHERE_REVERSE;
-    }
-
-    /* If there is a DISTINCT qualifier and this index will scan rows in
-    ** order of the DISTINCT expressions, clear bDist and set the appropriate
-    ** flags in pc.plan.wsFlags. */
-    if( bDist
-     && isDistinctIndex(pParse, pWC, pProbe, iCur, p->pDistinct, pc.plan.nEq)
-     && (pc.plan.wsFlags & WHERE_COLUMN_IN)==0
-    ){
-      bDist = 0;
-      pc.plan.wsFlags |= WHERE_ROWID_RANGE|WHERE_COLUMN_RANGE|WHERE_DISTINCT;
-    }
-
-    /* If currently calculating the cost of using an index (not the IPK
-    ** index), determine if all required column data may be obtained without 
-    ** using the main table (i.e. if the index is a covering
-    ** index for this query). If it is, set the WHERE_IDX_ONLY flag in
-    ** pc.plan.wsFlags. Otherwise, set the bLookup variable to true.  */
-    if( pIdx ){
-      Bitmask m = pSrc->colUsed;
-      int j;
-      for(j=0; j<pIdx->nColumn; j++){
-        int x = pIdx->aiColumn[j];
-        if( x<BMS-1 ){
-          m &= ~(((Bitmask)1)<<x);
-        }
-      }
-      if( m==0 ){
-        pc.plan.wsFlags |= WHERE_IDX_ONLY;
-      }else{
-        bLookup = 1;
-      }
-    }
-
-    /*
-    ** Estimate the number of rows of output.  For an "x IN (SELECT...)"
-    ** constraint, do not let the estimate exceed half the rows in the table.
-    */
-    pc.plan.nRow = (double)(aiRowEst[pc.plan.nEq] * nInMul);
-    if( bInEst && pc.plan.nRow*2>aiRowEst[0] ){
-      pc.plan.nRow = aiRowEst[0]/2;
-      nInMul = (int)(pc.plan.nRow / aiRowEst[pc.plan.nEq]);
-    }
-
-#ifdef SQLITE_ENABLE_STAT3
-    /* If the constraint is of the form x=VALUE or x IN (E1,E2,...)
-    ** and we do not think that values of x are unique and if histogram
-    ** data is available for column x, then it might be possible
-    ** to get a better estimate on the number of rows based on
-    ** VALUE and how common that value is according to the histogram.
-    */
-    if( pc.plan.nRow>(double)1 && pc.plan.nEq==1
-     && pFirstTerm!=0 && aiRowEst[1]>1 ){
-      assert( (pFirstTerm->eOperator & (WO_EQ|WO_ISNULL|WO_IN))!=0 );
-      if( pFirstTerm->eOperator & (WO_EQ|WO_ISNULL) ){
-        testcase( pFirstTerm->eOperator & WO_EQ );
-        testcase( pFirstTerm->eOperator & WO_EQUIV );
-        testcase( pFirstTerm->eOperator & WO_ISNULL );
-        whereEqualScanEst(pParse, pProbe, pFirstTerm->pExpr->pRight,
-                          &pc.plan.nRow);
-      }else if( bInEst==0 ){
-        assert( pFirstTerm->eOperator & WO_IN );
-        whereInScanEst(pParse, pProbe, pFirstTerm->pExpr->x.pList,
-                       &pc.plan.nRow);
-      }
-    }
-#endif /* SQLITE_ENABLE_STAT3 */
-
-    /* Adjust the number of output rows and downward to reflect rows
-    ** that are excluded by range constraints.
-    */
-    pc.plan.nRow = pc.plan.nRow/rangeDiv;
-    if( pc.plan.nRow<1 ) pc.plan.nRow = 1;
-
-    /* Experiments run on real SQLite databases show that the time needed
-    ** to do a binary search to locate a row in a table or index is roughly
-    ** log10(N) times the time to move from one row to the next row within
-    ** a table or index.  The actual times can vary, with the size of
-    ** records being an important factor.  Both moves and searches are
-    ** slower with larger records, presumably because fewer records fit
-    ** on one page and hence more pages have to be fetched.
-    **
-    ** The ANALYZE command and the sqlite_stat1 and sqlite_stat3 tables do
-    ** not give us data on the relative sizes of table and index records.
-    ** So this computation assumes table records are about twice as big
-    ** as index records
-    */
-    if( (pc.plan.wsFlags&~(WHERE_REVERSE|WHERE_ORDERED|WHERE_OB_UNIQUE))
-                                                              ==WHERE_IDX_ONLY
-     && (pWC->wctrlFlags & WHERE_ONEPASS_DESIRED)==0
-     && sqlite3GlobalConfig.bUseCis
-     && OptimizationEnabled(pParse->db, SQLITE_CoverIdxScan)
-    ){
-      /* This index is not useful for indexing, but it is a covering index.
-      ** A full-scan of the index might be a little faster than a full-scan
-      ** of the table, so give this case a cost slightly less than a table
-      ** scan. */
-      pc.rCost = aiRowEst[0]*3 + pProbe->nColumn;
-      pc.plan.wsFlags |= WHERE_COVER_SCAN|WHERE_COLUMN_RANGE;
-    }else if( (pc.plan.wsFlags & WHERE_NOT_FULLSCAN)==0 ){
-      /* The cost of a full table scan is a number of move operations equal
-      ** to the number of rows in the table.
-      **
-      ** We add an additional 4x penalty to full table scans.  This causes
-      ** the cost function to err on the side of choosing an index over
-      ** choosing a full scan.  This 4x full-scan penalty is an arguable
-      ** decision and one which we expect to revisit in the future.  But
-      ** it seems to be working well enough at the moment.
-      */
-      pc.rCost = aiRowEst[0]*4;
-      pc.plan.wsFlags &= ~WHERE_IDX_ONLY;
-      if( pIdx ){
-        pc.plan.wsFlags &= ~WHERE_ORDERED;
-        pc.plan.nOBSat = nPriorSat;
-      }
-    }else{
-      log10N = estLog(aiRowEst[0]);
-      pc.rCost = pc.plan.nRow;
-      if( pIdx ){
-        if( bLookup ){
-          /* For an index lookup followed by a table lookup:
-          **    nInMul index searches to find the start of each index range
-          **  + nRow steps through the index
-          **  + nRow table searches to lookup the table entry using the rowid
-          */
-          pc.rCost += (nInMul + pc.plan.nRow)*log10N;
-        }else{
-          /* For a covering index:
-          **     nInMul index searches to find the initial entry 
-          **   + nRow steps through the index
-          */
-          pc.rCost += nInMul*log10N;
-        }
-      }else{
-        /* For a rowid primary key lookup:
-        **    nInMult table searches to find the initial entry for each range
-        **  + nRow steps through the table
-        */
-        pc.rCost += nInMul*log10N;
-      }
-    }
-
-    /* Add in the estimated cost of sorting the result.  Actual experimental
-    ** measurements of sorting performance in SQLite show that sorting time
-    ** adds C*N*log10(N) to the cost, where N is the number of rows to be 
-    ** sorted and C is a factor between 1.95 and 4.3.  We will split the
-    ** difference and select C of 3.0.
-    */
-    if( bSort ){
-      double m = estLog(pc.plan.nRow*(nOrderBy - pc.plan.nOBSat)/nOrderBy);
-      m *= (double)(pc.plan.nOBSat ? 2 : 3);
-      pc.rCost += pc.plan.nRow*m;
-    }
-    if( bDist ){
-      pc.rCost += pc.plan.nRow*estLog(pc.plan.nRow)*3;
-    }
-
-    /**** Cost of using this index has now been computed ****/
-
-    /* If there are additional constraints on this table that cannot
-    ** be used with the current index, but which might lower the number
-    ** of output rows, adjust the nRow value accordingly.  This only 
-    ** matters if the current index is the least costly, so do not bother
-    ** with this step if we already know this index will not be chosen.
-    ** Also, never reduce the output row count below 2 using this step.
-    **
-    ** It is critical that the notValid mask be used here instead of
-    ** the notReady mask.  When computing an "optimal" index, the notReady
-    ** mask will only have one bit set - the bit for the current table.
-    ** The notValid mask, on the other hand, always has all bits set for
-    ** tables that are not in outer loops.  If notReady is used here instead
-    ** of notValid, then a optimal index that depends on inner joins loops
-    ** might be selected even when there exists an optimal index that has
-    ** no such dependency.
-    */
-    if( pc.plan.nRow>2 && pc.rCost<=p->cost.rCost ){
-      int k;                       /* Loop counter */
-      int nSkipEq = pc.plan.nEq;   /* Number of == constraints to skip */
-      int nSkipRange = nBound;     /* Number of < constraints to skip */
-      Bitmask thisTab;             /* Bitmap for pSrc */
-
-      thisTab = getMask(pWC->pMaskSet, iCur);
-      for(pTerm=pWC->a, k=pWC->nTerm; pc.plan.nRow>2 && k; k--, pTerm++){
-        if( pTerm->wtFlags & TERM_VIRTUAL ) continue;
-        if( (pTerm->prereqAll & p->notValid)!=thisTab ) continue;
-        if( pTerm->eOperator & (WO_EQ|WO_IN|WO_ISNULL) ){
-          if( nSkipEq ){
-            /* Ignore the first pc.plan.nEq equality matches since the index
-            ** has already accounted for these */
-            nSkipEq--;
-          }else{
-            /* Assume each additional equality match reduces the result
-            ** set size by a factor of 10 */
-            pc.plan.nRow /= 10;
-          }
-        }else if( pTerm->eOperator & (WO_LT|WO_LE|WO_GT|WO_GE) ){
-          if( nSkipRange ){
-            /* Ignore the first nSkipRange range constraints since the index
-            ** has already accounted for these */
-            nSkipRange--;
-          }else{
-            /* Assume each additional range constraint reduces the result
-            ** set size by a factor of 3.  Indexed range constraints reduce
-            ** the search space by a larger factor: 4.  We make indexed range
-            ** more selective intentionally because of the subjective 
-            ** observation that indexed range constraints really are more
-            ** selective in practice, on average. */
-            pc.plan.nRow /= 3;
-          }
-        }else if( (pTerm->eOperator & WO_NOOP)==0 ){
-          /* Any other expression lowers the output row count by half */
-          pc.plan.nRow /= 2;
-        }
-      }
-      if( pc.plan.nRow<2 ) pc.plan.nRow = 2;
-    }
-
-
-    WHERETRACE((
-      "      nEq=%d nInMul=%d rangeDiv=%d bSort=%d bLookup=%d wsFlags=0x%08x\n"
-      "      notReady=0x%llx log10N=%.1f nRow=%.1f cost=%.1f\n"
-      "      used=0x%llx nOBSat=%d\n",
-      pc.plan.nEq, nInMul, (int)rangeDiv, bSort, bLookup, pc.plan.wsFlags,
-      p->notReady, log10N, pc.plan.nRow, pc.rCost, pc.used,
-      pc.plan.nOBSat
-    ));
-
-    /* If this index is the best we have seen so far, then record this
-    ** index and its cost in the p->cost structure.
-    */
-    if( (!pIdx || pc.plan.wsFlags) && compareCost(&pc, &p->cost) ){
-      p->cost = pc;
-      p->cost.plan.wsFlags &= wsFlagMask;
-      p->cost.plan.u.pIdx = pIdx;
-    }
-
-    /* If there was an INDEXED BY clause, then only that one index is
-    ** considered. */
-    if( pSrc->pIndex ) break;
-
-    /* Reset masks for the next index in the loop */
-    wsFlagMask = ~(WHERE_ROWID_EQ|WHERE_ROWID_RANGE);
-    eqTermMask = idxEqTermMask;
-  }
-
-  /* If there is no ORDER BY clause and the SQLITE_ReverseOrder flag
-  ** is set, then reverse the order that the index will be scanned
-  ** in. This is used for application testing, to help find cases
-  ** where application behavior depends on the (undefined) order that
-  ** SQLite outputs rows in in the absence of an ORDER BY clause.  */
-  if( !p->pOrderBy && pParse->db->flags & SQLITE_ReverseOrder ){
-    p->cost.plan.wsFlags |= WHERE_REVERSE;
-  }
-
-  assert( p->pOrderBy || (p->cost.plan.wsFlags&WHERE_ORDERED)==0 );
-  assert( p->cost.plan.u.pIdx==0 || (p->cost.plan.wsFlags&WHERE_ROWID_EQ)==0 );
-  assert( pSrc->pIndex==0 
-       || p->cost.plan.u.pIdx==0 
-       || p->cost.plan.u.pIdx==pSrc->pIndex 
-  );
-
-  WHERETRACE(("   best index is %s cost=%.1f\n",
-         p->cost.plan.u.pIdx ? p->cost.plan.u.pIdx->zName : "ipk",
-         p->cost.rCost));
-  
-  bestOrClauseIndex(p);
-  bestAutomaticIndex(p);
-  p->cost.plan.wsFlags |= eqTermMask;
-}
-
-/*
-** Find the query plan for accessing table pSrc->pTab. Write the
-** best query plan and its cost into the WhereCost object supplied 
-** as the last parameter. This function may calculate the cost of
-** both real and virtual table scans.
-**
-** This function does not take ORDER BY or DISTINCT into account.  Nor
-** does it remember the virtual table query plan.  All it does is compute
-** the cost while determining if an OR optimization is applicable.  The
-** details will be reconsidered later if the optimization is found to be
-** applicable.
-*/
-static void bestIndex(WhereBestIdx *p){
-#ifndef SQLITE_OMIT_VIRTUALTABLE
-  if( IsVirtual(p->pSrc->pTab) ){
-    sqlite3_index_info *pIdxInfo = 0;
-    p->ppIdxInfo = &pIdxInfo;
-    bestVirtualIndex(p);
-    assert( pIdxInfo!=0 || p->pParse->db->mallocFailed );
-    if( pIdxInfo && pIdxInfo->needToFreeIdxStr ){
-      sqlite3_free(pIdxInfo->idxStr);
-    }
-    sqlite3DbFree(p->pParse->db, pIdxInfo);
-  }else
-#endif
-  {
-    bestBtreeIndex(p);
-  }
-}
+#endif /* SQLITE_ENABLE_STAT3_OR_STAT4 */
 
 /*
 ** Disable a term in the WHERE clause.  Except, do not disable the term
@@ -108103,9 +112338,6 @@ static void bestIndex(WhereBestIdx *p){
 ** in the ON clause.  The term is disabled in (3) because it is not part
 ** of a LEFT OUTER JOIN.  In (1), the term is not disabled.
 **
-** IMPLEMENTATION-OF: R-24597-58655 No tests are done for terms that are
-** completely satisfied by indices.
-**
 ** Disabling a term causes that term to not be tested in the inner loop
 ** of the join.  Disabling is an optimization.  When terms are satisfied
 ** by indices, we disable them to prevent redundant tests in the inner
@@ -108118,6 +112350,7 @@ static void disableTerm(WhereLevel *pLevel, WhereTerm *pTerm){
   if( pTerm
       && (pTerm->wtFlags & TERM_CODED)==0
       && (pLevel->iLeftJoin==0 || ExprHasProperty(pTerm->pExpr, EP_FromJoin))
+      && (pLevel->notReady & pTerm->prereqAll)==0
   ){
     pTerm->wtFlags |= TERM_CODED;
     if( pTerm->iParent>=0 ){
@@ -108185,6 +112418,7 @@ static int codeEqualityTerm(
   WhereTerm *pTerm,   /* The term of the WHERE clause to be coded */
   WhereLevel *pLevel, /* The level of the FROM clause we are working on */
   int iEq,            /* Index of the equality term within this level */
+  int bRev,           /* True for reverse-order IN operations */
   int iTarget         /* Attempt to leave results in this register */
 ){
   Expr *pX = pTerm->pExpr;
@@ -108202,14 +112436,13 @@ static int codeEqualityTerm(
     int eType;
     int iTab;
     struct InLoop *pIn;
-    u8 bRev = (pLevel->plan.wsFlags & WHERE_REVERSE)!=0;
+    WhereLoop *pLoop = pLevel->pWLoop;
 
-    if( (pLevel->plan.wsFlags & WHERE_INDEXED)!=0 
-      && pLevel->plan.u.pIdx->aSortOrder[iEq]
+    if( (pLoop->wsFlags & WHERE_VIRTUALTABLE)==0
+      && pLoop->u.btree.pIndex!=0
+      && pLoop->u.btree.pIndex->aSortOrder[iEq]
     ){
       testcase( iEq==0 );
-      testcase( iEq==pLevel->plan.u.pIdx->nColumn-1 );
-      testcase( iEq>0 && iEq+1<pLevel->plan.u.pIdx->nColumn );
       testcase( bRev );
       bRev = !bRev;
     }
@@ -108222,7 +112455,10 @@ static int codeEqualityTerm(
     }
     iTab = pX->iTable;
     sqlite3VdbeAddOp2(v, bRev ? OP_Last : OP_Rewind, iTab, 0);
-    assert( pLevel->plan.wsFlags & WHERE_IN_ABLE );
+    VdbeCoverageIf(v, bRev);
+    VdbeCoverageIf(v, !bRev);
+    assert( (pLoop->wsFlags & WHERE_MULTI_OR)==0 );
+    pLoop->wsFlags |= WHERE_IN_ABLE;
     if( pLevel->u.in.nIn==0 ){
       pLevel->addrNxt = sqlite3VdbeMakeLabel(v);
     }
@@ -108239,8 +112475,8 @@ static int codeEqualityTerm(
       }else{
         pIn->addrInTop = sqlite3VdbeAddOp3(v, OP_Column, iTab, 0, iReg);
       }
-      pIn->eEndLoopOp = bRev ? OP_Prev : OP_Next;
-      sqlite3VdbeAddOp1(v, OP_IsNull, iReg);
+      pIn->eEndLoopOp = bRev ? OP_PrevIfOpen : OP_NextIfOpen;
+      sqlite3VdbeAddOp1(v, OP_IsNull, iReg); VdbeCoverage(v);
     }else{
       pLevel->u.in.nIn = 0;
     }
@@ -108252,7 +112488,7 @@ static int codeEqualityTerm(
 
 /*
 ** Generate code that will evaluate all == and IN constraints for an
-** index.
+** index scan.
 **
 ** For example, consider table t1(a,b,c,d,e,f) with index i1(a,b,c).
 ** Suppose the WHERE clause is this:  a==5 AND b IN (1,2,3) AND c>5 AND c<10
@@ -108267,9 +112503,15 @@ static int codeEqualityTerm(
 ** The only thing it does is allocate the pLevel->iMem memory cell and
 ** compute the affinity string.
 **
-** This routine always allocates at least one memory cell and returns
-** the index of that memory cell. The code that
-** calls this routine will use that memory cell to store the termination
+** The nExtraReg parameter is 0 or 1.  It is 0 if all WHERE clause constraints
+** are == or IN and are covered by the nEq.  nExtraReg is 1 if there is
+** an inequality constraint (such as the "c>=5 AND c<10" in the example) that
+** occurs after the nEq quality constraints.
+**
+** This routine allocates a range of nEq+nExtraReg memory cells and returns
+** the index of the first memory cell in that range. The code that
+** calls this routine will use that memory range to store keys for
+** start and termination conditions of the loop.
 ** key value of the loop.  If one or more IN operators appear, then
 ** this routine allocates an additional nEq memory cells for internal
 ** use.
@@ -108292,29 +112534,33 @@ static int codeEqualityTerm(
 static int codeAllEqualityTerms(
   Parse *pParse,        /* Parsing context */
   WhereLevel *pLevel,   /* Which nested loop of the FROM we are coding */
-  WhereClause *pWC,     /* The WHERE clause */
-  Bitmask notReady,     /* Which parts of FROM have not yet been coded */
+  int bRev,             /* Reverse the order of IN operators */
   int nExtraReg,        /* Number of extra registers to allocate */
   char **pzAff          /* OUT: Set to point to affinity string */
 ){
-  int nEq = pLevel->plan.nEq;   /* The number of == or IN constraints to code */
+  u16 nEq;                      /* The number of == or IN constraints to code */
+  u16 nSkip;                    /* Number of left-most columns to skip */
   Vdbe *v = pParse->pVdbe;      /* The vm under construction */
   Index *pIdx;                  /* The index being used for this loop */
-  int iCur = pLevel->iTabCur;   /* The cursor of the table */
   WhereTerm *pTerm;             /* A single constraint term */
+  WhereLoop *pLoop;             /* The WhereLoop object */
   int j;                        /* Loop counter */
   int regBase;                  /* Base register */
   int nReg;                     /* Number of registers to allocate */
   char *zAff;                   /* Affinity string to return */
 
   /* This module is only called on query plans that use an index. */
-  assert( pLevel->plan.wsFlags & WHERE_INDEXED );
-  pIdx = pLevel->plan.u.pIdx;
+  pLoop = pLevel->pWLoop;
+  assert( (pLoop->wsFlags & WHERE_VIRTUALTABLE)==0 );
+  nEq = pLoop->u.btree.nEq;
+  nSkip = pLoop->u.btree.nSkip;
+  pIdx = pLoop->u.btree.pIndex;
+  assert( pIdx!=0 );
 
   /* Figure out how many memory cells we will need then allocate them.
   */
   regBase = pParse->nMem + 1;
-  nReg = pLevel->plan.nEq + nExtraReg;
+  nReg = pLoop->u.btree.nEq + nExtraReg;
   pParse->nMem += nReg;
 
   zAff = sqlite3DbStrDup(pParse->db, sqlite3IndexAffinityStr(v, pIdx));
@@ -108322,19 +112568,37 @@ static int codeAllEqualityTerms(
     pParse->db->mallocFailed = 1;
   }
 
+  if( nSkip ){
+    int iIdxCur = pLevel->iIdxCur;
+    sqlite3VdbeAddOp1(v, (bRev?OP_Last:OP_Rewind), iIdxCur);
+    VdbeCoverageIf(v, bRev==0);
+    VdbeCoverageIf(v, bRev!=0);
+    VdbeComment((v, "begin skip-scan on %s", pIdx->zName));
+    j = sqlite3VdbeAddOp0(v, OP_Goto);
+    pLevel->addrSkip = sqlite3VdbeAddOp4Int(v, (bRev?OP_SeekLT:OP_SeekGT),
+                            iIdxCur, 0, regBase, nSkip);
+    VdbeCoverageIf(v, bRev==0);
+    VdbeCoverageIf(v, bRev!=0);
+    sqlite3VdbeJumpHere(v, j);
+    for(j=0; j<nSkip; j++){
+      sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, j, regBase+j);
+      assert( pIdx->aiColumn[j]>=0 );
+      VdbeComment((v, "%s", pIdx->pTable->aCol[pIdx->aiColumn[j]].zName));
+    }
+  }    
+
   /* Evaluate the equality constraints
   */
-  assert( pIdx->nColumn>=nEq );
-  for(j=0; j<nEq; j++){
+  assert( zAff==0 || (int)strlen(zAff)>=nEq );
+  for(j=nSkip; j<nEq; j++){
     int r1;
-    int k = pIdx->aiColumn[j];
-    pTerm = findTerm(pWC, iCur, k, notReady, pLevel->plan.wsFlags, pIdx);
-    if( pTerm==0 ) break;
-    /* The following true for indices with redundant columns. 
+    pTerm = pLoop->aLTerm[j];
+    assert( pTerm!=0 );
+    /* The following testcase is true for indices with redundant columns. 
     ** Ex: CREATE INDEX i1 ON t1(a,b,a); SELECT * FROM t1 WHERE a=0 AND b=0; */
     testcase( (pTerm->wtFlags & TERM_CODED)!=0 );
-    testcase( pTerm->wtFlags & TERM_VIRTUAL ); /* EV: R-30575-11662 */
-    r1 = codeEqualityTerm(pParse, pTerm, pLevel, j, regBase+j);
+    testcase( pTerm->wtFlags & TERM_VIRTUAL );
+    r1 = codeEqualityTerm(pParse, pTerm, pLevel, j, bRev, regBase+j);
     if( r1!=regBase+j ){
       if( nReg==1 ){
         sqlite3ReleaseTempReg(pParse, regBase);
@@ -108347,7 +112611,10 @@ static int codeAllEqualityTerms(
     testcase( pTerm->eOperator & WO_IN );
     if( (pTerm->eOperator & (WO_ISNULL|WO_IN))==0 ){
       Expr *pRight = pTerm->pExpr->pRight;
-      sqlite3ExprCodeIsNullJump(v, pRight, regBase+j, pLevel->addrBrk);
+      if( sqlite3ExprCanBeNull(pRight) ){
+        sqlite3VdbeAddOp2(v, OP_IsNull, regBase+j, pLevel->addrBrk);
+        VdbeCoverage(v);
+      }
       if( zAff ){
         if( sqlite3CompareAffinity(pRight, zAff[j])==SQLITE_AFF_NONE ){
           zAff[j] = SQLITE_AFF_NONE;
@@ -108378,7 +112645,7 @@ static void explainAppendTerm(
   const char *zOp             /* Name of the operator */
 ){
   if( iTerm ) sqlite3StrAccumAppend(pStr, " AND ", 5);
-  sqlite3StrAccumAppend(pStr, zColumn, -1);
+  sqlite3StrAccumAppendAll(pStr, zColumn);
   sqlite3StrAccumAppend(pStr, zOp, 1);
   sqlite3StrAccumAppend(pStr, "?", 1);
 }
@@ -108402,32 +112669,40 @@ static void explainAppendTerm(
 ** It is the responsibility of the caller to free the buffer when it is
 ** no longer required.
 */
-static char *explainIndexRange(sqlite3 *db, WhereLevel *pLevel, Table *pTab){
-  WherePlan *pPlan = &pLevel->plan;
-  Index *pIndex = pPlan->u.pIdx;
-  int nEq = pPlan->nEq;
+static char *explainIndexRange(sqlite3 *db, WhereLoop *pLoop, Table *pTab){
+  Index *pIndex = pLoop->u.btree.pIndex;
+  u16 nEq = pLoop->u.btree.nEq;
+  u16 nSkip = pLoop->u.btree.nSkip;
   int i, j;
   Column *aCol = pTab->aCol;
-  int *aiColumn = pIndex->aiColumn;
+  i16 *aiColumn = pIndex->aiColumn;
   StrAccum txt;
 
-  if( nEq==0 && (pPlan->wsFlags & (WHERE_BTM_LIMIT|WHERE_TOP_LIMIT))==0 ){
+  if( nEq==0 && (pLoop->wsFlags & (WHERE_BTM_LIMIT|WHERE_TOP_LIMIT))==0 ){
     return 0;
   }
   sqlite3StrAccumInit(&txt, 0, 0, SQLITE_MAX_LENGTH);
   txt.db = db;
   sqlite3StrAccumAppend(&txt, " (", 2);
   for(i=0; i<nEq; i++){
-    explainAppendTerm(&txt, i, aCol[aiColumn[i]].zName, "=");
+    char *z = (i==pIndex->nKeyCol ) ? "rowid" : aCol[aiColumn[i]].zName;
+    if( i>=nSkip ){
+      explainAppendTerm(&txt, i, z, "=");
+    }else{
+      if( i ) sqlite3StrAccumAppend(&txt, " AND ", 5);
+      sqlite3StrAccumAppend(&txt, "ANY(", 4);
+      sqlite3StrAccumAppendAll(&txt, z);
+      sqlite3StrAccumAppend(&txt, ")", 1);
+    }
   }
 
   j = i;
-  if( pPlan->wsFlags&WHERE_BTM_LIMIT ){
-    char *z = (j==pIndex->nColumn ) ? "rowid" : aCol[aiColumn[j]].zName;
+  if( pLoop->wsFlags&WHERE_BTM_LIMIT ){
+    char *z = (j==pIndex->nKeyCol ) ? "rowid" : aCol[aiColumn[j]].zName;
     explainAppendTerm(&txt, i++, z, ">");
   }
-  if( pPlan->wsFlags&WHERE_TOP_LIMIT ){
-    char *z = (j==pIndex->nColumn ) ? "rowid" : aCol[aiColumn[j]].zName;
+  if( pLoop->wsFlags&WHERE_TOP_LIMIT ){
+    char *z = (j==pIndex->nKeyCol ) ? "rowid" : aCol[aiColumn[j]].zName;
     explainAppendTerm(&txt, i, z, "<");
   }
   sqlite3StrAccumAppend(&txt, ")", 1);
@@ -108448,21 +112723,26 @@ static void explainOneScan(
   int iFrom,                      /* Value for "from" column of output */
   u16 wctrlFlags                  /* Flags passed to sqlite3WhereBegin() */
 ){
-  if( pParse->explain==2 ){
-    u32 flags = pLevel->plan.wsFlags;
+#ifndef SQLITE_DEBUG
+  if( pParse->explain==2 )
+#endif
+  {
     struct SrcList_item *pItem = &pTabList->a[pLevel->iFrom];
     Vdbe *v = pParse->pVdbe;      /* VM being constructed */
     sqlite3 *db = pParse->db;     /* Database handle */
     char *zMsg;                   /* Text to add to EQP output */
-    sqlite3_int64 nRow;           /* Expected number of rows visited by scan */
     int iId = pParse->iSelectId;  /* Select id (left-most output column) */
     int isSearch;                 /* True for a SEARCH. False for SCAN. */
+    WhereLoop *pLoop;             /* The controlling WhereLoop object */
+    u32 flags;                    /* Flags that describe this loop */
 
+    pLoop = pLevel->pWLoop;
+    flags = pLoop->wsFlags;
     if( (flags&WHERE_MULTI_OR) || (wctrlFlags&WHERE_ONETABLE_ONLY) ) return;
 
-    isSearch = (pLevel->plan.nEq>0)
-             || (flags&(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT))!=0
-             || (wctrlFlags&(WHERE_ORDERBY_MIN|WHERE_ORDERBY_MAX));
+    isSearch = (flags&(WHERE_BTM_LIMIT|WHERE_TOP_LIMIT))!=0
+            || ((flags&WHERE_VIRTUALTABLE)==0 && (pLoop->u.btree.nEq>0))
+            || (wctrlFlags&(WHERE_ORDERBY_MIN|WHERE_ORDERBY_MAX));
 
     zMsg = sqlite3MPrintf(db, "%s", isSearch?"SEARCH":"SCAN");
     if( pItem->pSelect ){
@@ -108474,43 +112754,44 @@ static void explainOneScan(
     if( pItem->zAlias ){
       zMsg = sqlite3MAppendf(db, zMsg, "%s AS %s", zMsg, pItem->zAlias);
     }
-    if( (flags & WHERE_INDEXED)!=0 ){
-      char *zWhere = explainIndexRange(db, pLevel, pItem->pTab);
-      zMsg = sqlite3MAppendf(db, zMsg, "%s USING %s%sINDEX%s%s%s", zMsg, 
-          ((flags & WHERE_TEMP_INDEX)?"AUTOMATIC ":""),
-          ((flags & WHERE_IDX_ONLY)?"COVERING ":""),
-          ((flags & WHERE_TEMP_INDEX)?"":" "),
-          ((flags & WHERE_TEMP_INDEX)?"": pLevel->plan.u.pIdx->zName),
-          zWhere
-      );
+    if( (flags & (WHERE_IPK|WHERE_VIRTUALTABLE))==0
+     && ALWAYS(pLoop->u.btree.pIndex!=0)
+    ){
+      const char *zFmt;
+      Index *pIdx = pLoop->u.btree.pIndex;
+      char *zWhere = explainIndexRange(db, pLoop, pItem->pTab);
+      assert( !(flags&WHERE_AUTO_INDEX) || (flags&WHERE_IDX_ONLY) );
+      if( !HasRowid(pItem->pTab) && IsPrimaryKeyIndex(pIdx) ){
+        zFmt = zWhere ? "%s USING PRIMARY KEY%.0s%s" : "%s%.0s%s";
+      }else if( flags & WHERE_AUTO_INDEX ){
+        zFmt = "%s USING AUTOMATIC COVERING INDEX%.0s%s";
+      }else if( flags & WHERE_IDX_ONLY ){
+        zFmt = "%s USING COVERING INDEX %s%s";
+      }else{
+        zFmt = "%s USING INDEX %s%s";
+      }
+      zMsg = sqlite3MAppendf(db, zMsg, zFmt, zMsg, pIdx->zName, zWhere);
       sqlite3DbFree(db, zWhere);
-    }else if( flags & (WHERE_ROWID_EQ|WHERE_ROWID_RANGE) ){
+    }else if( (flags & WHERE_IPK)!=0 && (flags & WHERE_CONSTRAINT)!=0 ){
       zMsg = sqlite3MAppendf(db, zMsg, "%s USING INTEGER PRIMARY KEY", zMsg);
 
-      if( flags&WHERE_ROWID_EQ ){
+      if( flags&(WHERE_COLUMN_EQ|WHERE_COLUMN_IN) ){
         zMsg = sqlite3MAppendf(db, zMsg, "%s (rowid=?)", zMsg);
       }else if( (flags&WHERE_BOTH_LIMIT)==WHERE_BOTH_LIMIT ){
         zMsg = sqlite3MAppendf(db, zMsg, "%s (rowid>? AND rowid<?)", zMsg);
       }else if( flags&WHERE_BTM_LIMIT ){
         zMsg = sqlite3MAppendf(db, zMsg, "%s (rowid>?)", zMsg);
-      }else if( flags&WHERE_TOP_LIMIT ){
+      }else if( ALWAYS(flags&WHERE_TOP_LIMIT) ){
         zMsg = sqlite3MAppendf(db, zMsg, "%s (rowid<?)", zMsg);
       }
     }
 #ifndef SQLITE_OMIT_VIRTUALTABLE
     else if( (flags & WHERE_VIRTUALTABLE)!=0 ){
-      sqlite3_index_info *pVtabIdx = pLevel->plan.u.pVtabIdx;
       zMsg = sqlite3MAppendf(db, zMsg, "%s VIRTUAL TABLE INDEX %d:%s", zMsg,
-                  pVtabIdx->idxNum, pVtabIdx->idxStr);
+                  pLoop->u.vtab.idxNum, pLoop->u.vtab.idxStr);
     }
 #endif
-    if( wctrlFlags&(WHERE_ORDERBY_MIN|WHERE_ORDERBY_MAX) ){
-      testcase( wctrlFlags & WHERE_ORDERBY_MIN );
-      nRow = 1;
-    }else{
-      nRow = (sqlite3_int64)pLevel->plan.nRow;
-    }
-    zMsg = sqlite3MAppendf(db, zMsg, "%s (~%lld rows)", zMsg, nRow);
+    zMsg = sqlite3MAppendf(db, zMsg, "%s", zMsg);
     sqlite3VdbeAddOp4(v, OP_Explain, iId, iLevel, iFrom, zMsg, P4_DYNAMIC);
   }
 }
@@ -108526,7 +112807,6 @@ static void explainOneScan(
 static Bitmask codeOneLoopStart(
   WhereInfo *pWInfo,   /* Complete information about the WHERE clause */
   int iLevel,          /* Which level of pWInfo->a[] should be coded */
-  u16 wctrlFlags,      /* One of the WHERE_* flags defined in sqliteInt.h */
   Bitmask notReady     /* Which tables are currently available */
 ){
   int j, k;            /* Loop counters */
@@ -108535,27 +112815,31 @@ static Bitmask codeOneLoopStart(
   int omitTable;       /* True if we use the index only */
   int bRev;            /* True if we need to scan in reverse order */
   WhereLevel *pLevel;  /* The where level to be coded */
+  WhereLoop *pLoop;    /* The WhereLoop object being coded */
   WhereClause *pWC;    /* Decomposition of the entire WHERE clause */
   WhereTerm *pTerm;               /* A WHERE clause term */
   Parse *pParse;                  /* Parsing context */
+  sqlite3 *db;                    /* Database connection */
   Vdbe *v;                        /* The prepared stmt under constructions */
   struct SrcList_item *pTabItem;  /* FROM clause term being coded */
   int addrBrk;                    /* Jump here to break out of the loop */
   int addrCont;                   /* Jump here to continue with next cycle */
   int iRowidReg = 0;        /* Rowid is stored in this register, if not zero */
   int iReleaseReg = 0;      /* Temp register to free before returning */
-  Bitmask newNotReady;      /* Return value */
 
   pParse = pWInfo->pParse;
   v = pParse->pVdbe;
-  pWC = pWInfo->pWC;
+  pWC = &pWInfo->sWC;
+  db = pParse->db;
   pLevel = &pWInfo->a[iLevel];
+  pLoop = pLevel->pWLoop;
   pTabItem = &pWInfo->pTabList->a[pLevel->iFrom];
   iCur = pTabItem->iCursor;
-  bRev = (pLevel->plan.wsFlags & WHERE_REVERSE)!=0;
-  omitTable = (pLevel->plan.wsFlags & WHERE_IDX_ONLY)!=0 
-           && (wctrlFlags & WHERE_FORCE_TABLE)==0;
-  VdbeNoopComment((v, "Begin Join Loop %d", iLevel));
+  pLevel->notReady = notReady & ~getMask(&pWInfo->sMaskSet, iCur);
+  bRev = (pWInfo->revMask>>iLevel)&1;
+  omitTable = (pLoop->wsFlags & WHERE_IDX_ONLY)!=0 
+           && (pWInfo->wctrlFlags & WHERE_FORCE_TABLE)==0;
+  VdbeModuleComment((v, "Begin WHERE-loop%d: %s",iLevel,pTabItem->pTab->zName));
 
   /* Create labels for the "break" and "continue" instructions
   ** for the current loop.  Jump to addrBrk to break out of a loop.
@@ -108583,87 +112867,85 @@ static Bitmask codeOneLoopStart(
   /* Special case of a FROM clause subquery implemented as a co-routine */
   if( pTabItem->viaCoroutine ){
     int regYield = pTabItem->regReturn;
-    sqlite3VdbeAddOp2(v, OP_Integer, pTabItem->addrFillSub-1, regYield);
-    pLevel->p2 =  sqlite3VdbeAddOp1(v, OP_Yield, regYield);
-    VdbeComment((v, "next row of co-routine %s", pTabItem->pTab->zName));
-    sqlite3VdbeAddOp2(v, OP_If, regYield+1, addrBrk);
+    sqlite3VdbeAddOp3(v, OP_InitCoroutine, regYield, 0, pTabItem->addrFillSub);
+    pLevel->p2 =  sqlite3VdbeAddOp2(v, OP_Yield, regYield, addrBrk);
+    VdbeCoverage(v);
+    VdbeComment((v, "next row of \"%s\"", pTabItem->pTab->zName));
     pLevel->op = OP_Goto;
   }else
 
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-  if(  (pLevel->plan.wsFlags & WHERE_VIRTUALTABLE)!=0 ){
-    /* Case 0:  The table is a virtual-table.  Use the VFilter and VNext
+  if(  (pLoop->wsFlags & WHERE_VIRTUALTABLE)!=0 ){
+    /* Case 1:  The table is a virtual-table.  Use the VFilter and VNext
     **          to access the data.
     */
     int iReg;   /* P3 Value for OP_VFilter */
     int addrNotFound;
-    sqlite3_index_info *pVtabIdx = pLevel->plan.u.pVtabIdx;
-    int nConstraint = pVtabIdx->nConstraint;
-    struct sqlite3_index_constraint_usage *aUsage =
-                                                pVtabIdx->aConstraintUsage;
-    const struct sqlite3_index_constraint *aConstraint =
-                                                pVtabIdx->aConstraint;
+    int nConstraint = pLoop->nLTerm;
 
     sqlite3ExprCachePush(pParse);
     iReg = sqlite3GetTempRange(pParse, nConstraint+2);
     addrNotFound = pLevel->addrBrk;
-    for(j=1; j<=nConstraint; j++){
-      for(k=0; k<nConstraint; k++){
-        if( aUsage[k].argvIndex==j ){
-          int iTarget = iReg+j+1;
-          pTerm = &pWC->a[aConstraint[k].iTermOffset];
-          if( pTerm->eOperator & WO_IN ){
-            codeEqualityTerm(pParse, pTerm, pLevel, k, iTarget);
-            addrNotFound = pLevel->addrNxt;
-          }else{
-            sqlite3ExprCode(pParse, pTerm->pExpr->pRight, iTarget);
-          }
-          break;
-        }
-      }
-      if( k==nConstraint ) break;
-    }
-    sqlite3VdbeAddOp2(v, OP_Integer, pVtabIdx->idxNum, iReg);
-    sqlite3VdbeAddOp2(v, OP_Integer, j-1, iReg+1);
-    sqlite3VdbeAddOp4(v, OP_VFilter, iCur, addrNotFound, iReg, pVtabIdx->idxStr,
-                      pVtabIdx->needToFreeIdxStr ? P4_MPRINTF : P4_STATIC);
-    pVtabIdx->needToFreeIdxStr = 0;
     for(j=0; j<nConstraint; j++){
-      if( aUsage[j].omit ){
-        int iTerm = aConstraint[j].iTermOffset;
-        disableTerm(pLevel, &pWC->a[iTerm]);
+      int iTarget = iReg+j+2;
+      pTerm = pLoop->aLTerm[j];
+      if( pTerm==0 ) continue;
+      if( pTerm->eOperator & WO_IN ){
+        codeEqualityTerm(pParse, pTerm, pLevel, j, bRev, iTarget);
+        addrNotFound = pLevel->addrNxt;
+      }else{
+        sqlite3ExprCode(pParse, pTerm->pExpr->pRight, iTarget);
+      }
+    }
+    sqlite3VdbeAddOp2(v, OP_Integer, pLoop->u.vtab.idxNum, iReg);
+    sqlite3VdbeAddOp2(v, OP_Integer, nConstraint, iReg+1);
+    sqlite3VdbeAddOp4(v, OP_VFilter, iCur, addrNotFound, iReg,
+                      pLoop->u.vtab.idxStr,
+                      pLoop->u.vtab.needFree ? P4_MPRINTF : P4_STATIC);
+    VdbeCoverage(v);
+    pLoop->u.vtab.needFree = 0;
+    for(j=0; j<nConstraint && j<16; j++){
+      if( (pLoop->u.vtab.omitMask>>j)&1 ){
+        disableTerm(pLevel, pLoop->aLTerm[j]);
       }
     }
     pLevel->op = OP_VNext;
     pLevel->p1 = iCur;
     pLevel->p2 = sqlite3VdbeCurrentAddr(v);
     sqlite3ReleaseTempRange(pParse, iReg, nConstraint+2);
-    sqlite3ExprCachePop(pParse, 1);
+    sqlite3ExprCachePop(pParse);
   }else
 #endif /* SQLITE_OMIT_VIRTUALTABLE */
 
-  if( pLevel->plan.wsFlags & WHERE_ROWID_EQ ){
-    /* Case 1:  We can directly reference a single row using an
+  if( (pLoop->wsFlags & WHERE_IPK)!=0
+   && (pLoop->wsFlags & (WHERE_COLUMN_IN|WHERE_COLUMN_EQ))!=0
+  ){
+    /* Case 2:  We can directly reference a single row using an
     **          equality comparison against the ROWID field.  Or
     **          we reference multiple rows using a "rowid IN (...)"
     **          construct.
     */
-    iReleaseReg = sqlite3GetTempReg(pParse);
-    pTerm = findTerm(pWC, iCur, -1, notReady, WO_EQ|WO_IN, 0);
+    assert( pLoop->u.btree.nEq==1 );
+    pTerm = pLoop->aLTerm[0];
     assert( pTerm!=0 );
     assert( pTerm->pExpr!=0 );
     assert( omitTable==0 );
-    testcase( pTerm->wtFlags & TERM_VIRTUAL ); /* EV: R-30575-11662 */
-    iRowidReg = codeEqualityTerm(pParse, pTerm, pLevel, 0, iReleaseReg);
+    testcase( pTerm->wtFlags & TERM_VIRTUAL );
+    iReleaseReg = ++pParse->nMem;
+    iRowidReg = codeEqualityTerm(pParse, pTerm, pLevel, 0, bRev, iReleaseReg);
+    if( iRowidReg!=iReleaseReg ) sqlite3ReleaseTempReg(pParse, iReleaseReg);
     addrNxt = pLevel->addrNxt;
-    sqlite3VdbeAddOp2(v, OP_MustBeInt, iRowidReg, addrNxt);
+    sqlite3VdbeAddOp2(v, OP_MustBeInt, iRowidReg, addrNxt); VdbeCoverage(v);
     sqlite3VdbeAddOp3(v, OP_NotExists, iCur, addrNxt, iRowidReg);
+    VdbeCoverage(v);
     sqlite3ExprCacheAffinityChange(pParse, iRowidReg, 1);
     sqlite3ExprCacheStore(pParse, iCur, -1, iRowidReg);
     VdbeComment((v, "pk"));
     pLevel->op = OP_Noop;
-  }else if( pLevel->plan.wsFlags & WHERE_ROWID_RANGE ){
-    /* Case 2:  We have an inequality comparison against the ROWID field.
+  }else if( (pLoop->wsFlags & WHERE_IPK)!=0
+         && (pLoop->wsFlags & WHERE_COLUMN_RANGE)!=0
+  ){
+    /* Case 3:  We have an inequality comparison against the ROWID field.
     */
     int testOp = OP_Noop;
     int start;
@@ -108671,8 +112953,11 @@ static Bitmask codeOneLoopStart(
     WhereTerm *pStart, *pEnd;
 
     assert( omitTable==0 );
-    pStart = findTerm(pWC, iCur, -1, notReady, WO_GT|WO_GE, 0);
-    pEnd = findTerm(pWC, iCur, -1, notReady, WO_LT|WO_LE, 0);
+    j = 0;
+    pStart = pEnd = 0;
+    if( pLoop->wsFlags & WHERE_BTM_LIMIT ) pStart = pLoop->aLTerm[j++];
+    if( pLoop->wsFlags & WHERE_TOP_LIMIT ) pEnd = pLoop->aLTerm[j++];
+    assert( pStart!=0 || pEnd!=0 );
     if( bRev ){
       pTerm = pStart;
       pStart = pEnd;
@@ -108686,34 +112971,42 @@ static Bitmask codeOneLoopStart(
       ** seek opcodes.  It depends on a particular ordering of TK_xx
       */
       const u8 aMoveOp[] = {
-           /* TK_GT */  OP_SeekGt,
-           /* TK_LE */  OP_SeekLe,
-           /* TK_LT */  OP_SeekLt,
-           /* TK_GE */  OP_SeekGe
+           /* TK_GT */  OP_SeekGT,
+           /* TK_LE */  OP_SeekLE,
+           /* TK_LT */  OP_SeekLT,
+           /* TK_GE */  OP_SeekGE
       };
       assert( TK_LE==TK_GT+1 );      /* Make sure the ordering.. */
       assert( TK_LT==TK_GT+2 );      /*  ... of the TK_xx values... */
       assert( TK_GE==TK_GT+3 );      /*  ... is correcct. */
 
-      testcase( pStart->wtFlags & TERM_VIRTUAL ); /* EV: R-30575-11662 */
+      assert( (pStart->wtFlags & TERM_VNULL)==0 );
+      testcase( pStart->wtFlags & TERM_VIRTUAL );
       pX = pStart->pExpr;
       assert( pX!=0 );
-      assert( pStart->leftCursor==iCur );
+      testcase( pStart->leftCursor!=iCur ); /* transitive constraints */
       r1 = sqlite3ExprCodeTemp(pParse, pX->pRight, &rTemp);
       sqlite3VdbeAddOp3(v, aMoveOp[pX->op-TK_GT], iCur, addrBrk, r1);
       VdbeComment((v, "pk"));
+      VdbeCoverageIf(v, pX->op==TK_GT);
+      VdbeCoverageIf(v, pX->op==TK_LE);
+      VdbeCoverageIf(v, pX->op==TK_LT);
+      VdbeCoverageIf(v, pX->op==TK_GE);
       sqlite3ExprCacheAffinityChange(pParse, r1, 1);
       sqlite3ReleaseTempReg(pParse, rTemp);
       disableTerm(pLevel, pStart);
     }else{
       sqlite3VdbeAddOp2(v, bRev ? OP_Last : OP_Rewind, iCur, addrBrk);
+      VdbeCoverageIf(v, bRev==0);
+      VdbeCoverageIf(v, bRev!=0);
     }
     if( pEnd ){
       Expr *pX;
       pX = pEnd->pExpr;
       assert( pX!=0 );
-      assert( pEnd->leftCursor==iCur );
-      testcase( pEnd->wtFlags & TERM_VIRTUAL ); /* EV: R-30575-11662 */
+      assert( (pEnd->wtFlags & TERM_VNULL)==0 );
+      testcase( pEnd->leftCursor!=iCur ); /* Transitive constraints */
+      testcase( pEnd->wtFlags & TERM_VIRTUAL );
       memEndValue = ++pParse->nMem;
       sqlite3ExprCode(pParse, pX->pRight, memEndValue);
       if( pX->op==TK_LT || pX->op==TK_GT ){
@@ -108727,20 +113020,20 @@ static Bitmask codeOneLoopStart(
     pLevel->op = bRev ? OP_Prev : OP_Next;
     pLevel->p1 = iCur;
     pLevel->p2 = start;
-    if( pStart==0 && pEnd==0 ){
-      pLevel->p5 = SQLITE_STMTSTATUS_FULLSCAN_STEP;
-    }else{
-      assert( pLevel->p5==0 );
-    }
+    assert( pLevel->p5==0 );
     if( testOp!=OP_Noop ){
-      iRowidReg = iReleaseReg = sqlite3GetTempReg(pParse);
+      iRowidReg = ++pParse->nMem;
       sqlite3VdbeAddOp2(v, OP_Rowid, iCur, iRowidReg);
       sqlite3ExprCacheStore(pParse, iCur, -1, iRowidReg);
       sqlite3VdbeAddOp3(v, testOp, memEndValue, addrBrk, iRowidReg);
+      VdbeCoverageIf(v, testOp==OP_Le);
+      VdbeCoverageIf(v, testOp==OP_Lt);
+      VdbeCoverageIf(v, testOp==OP_Ge);
+      VdbeCoverageIf(v, testOp==OP_Gt);
       sqlite3VdbeChangeP5(v, SQLITE_AFF_NUMERIC | SQLITE_JUMPIFNULL);
     }
-  }else if( pLevel->plan.wsFlags & (WHERE_COLUMN_RANGE|WHERE_COLUMN_EQ) ){
-    /* Case 3: A scan using an index.
+  }else if( pLoop->wsFlags & WHERE_INDEXED ){
+    /* Case 4: A scan using an index.
     **
     **         The WHERE clause may contain zero or more equality 
     **         terms ("==" or "IN" operators) that refer to the N
@@ -108776,20 +113069,19 @@ static Bitmask codeOneLoopStart(
       0,
       OP_Rewind,           /* 2: (!start_constraints && startEq &&  !bRev) */
       OP_Last,             /* 3: (!start_constraints && startEq &&   bRev) */
-      OP_SeekGt,           /* 4: (start_constraints  && !startEq && !bRev) */
-      OP_SeekLt,           /* 5: (start_constraints  && !startEq &&  bRev) */
-      OP_SeekGe,           /* 6: (start_constraints  &&  startEq && !bRev) */
-      OP_SeekLe            /* 7: (start_constraints  &&  startEq &&  bRev) */
+      OP_SeekGT,           /* 4: (start_constraints  && !startEq && !bRev) */
+      OP_SeekLT,           /* 5: (start_constraints  && !startEq &&  bRev) */
+      OP_SeekGE,           /* 6: (start_constraints  &&  startEq && !bRev) */
+      OP_SeekLE            /* 7: (start_constraints  &&  startEq &&  bRev) */
     };
     static const u8 aEndOp[] = {
-      OP_Noop,             /* 0: (!end_constraints) */
-      OP_IdxGE,            /* 1: (end_constraints && !bRev) */
-      OP_IdxLT             /* 2: (end_constraints && bRev) */
+      OP_IdxGE,            /* 0: (end_constraints && !bRev && !endEq) */
+      OP_IdxGT,            /* 1: (end_constraints && !bRev &&  endEq) */
+      OP_IdxLE,            /* 2: (end_constraints &&  bRev && !endEq) */
+      OP_IdxLT,            /* 3: (end_constraints &&  bRev &&  endEq) */
     };
-    int nEq = pLevel->plan.nEq;  /* Number of == or IN terms */
-    int isMinQuery = 0;          /* If this is an optimized SELECT min(x).. */
+    u16 nEq = pLoop->u.btree.nEq;     /* Number of == or IN terms */
     int regBase;                 /* Base register holding constraint values */
-    int r1;                      /* Temp register */
     WhereTerm *pRangeStart = 0;  /* Inequality constraint at range start */
     WhereTerm *pRangeEnd = 0;    /* Inequality constraint at range end */
     int startEq;                 /* True if range start uses ==, >= or <= */
@@ -108801,11 +113093,13 @@ static Bitmask codeOneLoopStart(
     int nExtraReg = 0;           /* Number of extra registers needed */
     int op;                      /* Instruction opcode */
     char *zStartAff;             /* Affinity for start of range constraint */
-    char *zEndAff;               /* Affinity for end of range constraint */
+    char cEndAff = 0;            /* Affinity for end of range constraint */
+    u8 bSeekPastNull = 0;        /* True to seek past initial nulls */
+    u8 bStopAtNull = 0;          /* Add condition to terminate at NULLs */
 
-    pIdx = pLevel->plan.u.pIdx;
+    pIdx = pLoop->u.btree.pIndex;
     iIdxCur = pLevel->iIdxCur;
-    k = (nEq==pIdx->nColumn ? -1 : pIdx->aiColumn[nEq]);
+    assert( nEq>=pLoop->u.btree.nSkip );
 
     /* If this loop satisfies a sort order (pOrderBy) request that 
     ** was passed to this function to implement a "SELECT min(x) ..." 
@@ -108815,52 +113109,62 @@ static Bitmask codeOneLoopStart(
     ** the first one after the nEq equality constraints in the index,
     ** this requires some special handling.
     */
-    if( (wctrlFlags&WHERE_ORDERBY_MIN)!=0
-     && (pLevel->plan.wsFlags&WHERE_ORDERED)
-     && (pIdx->nColumn>nEq)
+    assert( pWInfo->pOrderBy==0
+         || pWInfo->pOrderBy->nExpr==1
+         || (pWInfo->wctrlFlags&WHERE_ORDERBY_MIN)==0 );
+    if( (pWInfo->wctrlFlags&WHERE_ORDERBY_MIN)!=0
+     && pWInfo->nOBSat>0
+     && (pIdx->nKeyCol>nEq)
     ){
-      /* assert( pOrderBy->nExpr==1 ); */
-      /* assert( pOrderBy->a[0].pExpr->iColumn==pIdx->aiColumn[nEq] ); */
-      isMinQuery = 1;
+      assert( pLoop->u.btree.nSkip==0 );
+      bSeekPastNull = 1;
       nExtraReg = 1;
     }
 
     /* Find any inequality constraint terms for the start and end 
     ** of the range. 
     */
-    if( pLevel->plan.wsFlags & WHERE_TOP_LIMIT ){
-      pRangeEnd = findTerm(pWC, iCur, k, notReady, (WO_LT|WO_LE), pIdx);
+    j = nEq;
+    if( pLoop->wsFlags & WHERE_BTM_LIMIT ){
+      pRangeStart = pLoop->aLTerm[j++];
       nExtraReg = 1;
     }
-    if( pLevel->plan.wsFlags & WHERE_BTM_LIMIT ){
-      pRangeStart = findTerm(pWC, iCur, k, notReady, (WO_GT|WO_GE), pIdx);
+    if( pLoop->wsFlags & WHERE_TOP_LIMIT ){
+      pRangeEnd = pLoop->aLTerm[j++];
       nExtraReg = 1;
+      if( pRangeStart==0
+       && (j = pIdx->aiColumn[nEq])>=0 
+       && pIdx->pTable->aCol[j].notNull==0
+      ){
+        bSeekPastNull = 1;
+      }
     }
+    assert( pRangeEnd==0 || (pRangeEnd->wtFlags & TERM_VNULL)==0 );
 
     /* Generate code to evaluate all constraint terms using == or IN
     ** and store the values of those terms in an array of registers
     ** starting at regBase.
     */
-    regBase = codeAllEqualityTerms(
-        pParse, pLevel, pWC, notReady, nExtraReg, &zStartAff
-    );
-    zEndAff = sqlite3DbStrDup(pParse->db, zStartAff);
+    regBase = codeAllEqualityTerms(pParse,pLevel,bRev,nExtraReg,&zStartAff);
+    assert( zStartAff==0 || sqlite3Strlen30(zStartAff)>=nEq );
+    if( zStartAff ) cEndAff = zStartAff[nEq];
     addrNxt = pLevel->addrNxt;
 
     /* If we are doing a reverse order scan on an ascending index, or
     ** a forward order scan on a descending index, interchange the 
     ** start and end terms (pRangeStart and pRangeEnd).
     */
-    if( (nEq<pIdx->nColumn && bRev==(pIdx->aSortOrder[nEq]==SQLITE_SO_ASC))
-     || (bRev && pIdx->nColumn==nEq)
+    if( (nEq<pIdx->nKeyCol && bRev==(pIdx->aSortOrder[nEq]==SQLITE_SO_ASC))
+     || (bRev && pIdx->nKeyCol==nEq)
     ){
       SWAP(WhereTerm *, pRangeEnd, pRangeStart);
+      SWAP(u8, bSeekPastNull, bStopAtNull);
     }
 
-    testcase( pRangeStart && pRangeStart->eOperator & WO_LE );
-    testcase( pRangeStart && pRangeStart->eOperator & WO_GE );
-    testcase( pRangeEnd && pRangeEnd->eOperator & WO_LE );
-    testcase( pRangeEnd && pRangeEnd->eOperator & WO_GE );
+    testcase( pRangeStart && (pRangeStart->eOperator & WO_LE)!=0 );
+    testcase( pRangeStart && (pRangeStart->eOperator & WO_GE)!=0 );
+    testcase( pRangeEnd && (pRangeEnd->eOperator & WO_LE)!=0 );
+    testcase( pRangeEnd && (pRangeEnd->eOperator & WO_GE)!=0 );
     startEq = !pRangeStart || pRangeStart->eOperator & (WO_LE|WO_GE);
     endEq =   !pRangeEnd || pRangeEnd->eOperator & (WO_LE|WO_GE);
     start_constraints = pRangeStart || nEq>0;
@@ -108870,8 +113174,11 @@ static Bitmask codeOneLoopStart(
     if( pRangeStart ){
       Expr *pRight = pRangeStart->pExpr->pRight;
       sqlite3ExprCode(pParse, pRight, regBase+nEq);
-      if( (pRangeStart->wtFlags & TERM_VNULL)==0 ){
-        sqlite3ExprCodeIsNullJump(v, pRight, regBase+nEq, addrNxt);
+      if( (pRangeStart->wtFlags & TERM_VNULL)==0
+       && sqlite3ExprCanBeNull(pRight)
+      ){
+        sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, addrNxt);
+        VdbeCoverage(v);
       }
       if( zStartAff ){
         if( sqlite3CompareAffinity(pRight, zStartAff[nEq])==SQLITE_AFF_NONE){
@@ -108885,23 +113192,24 @@ static Bitmask codeOneLoopStart(
         }
       }  
       nConstraint++;
-      testcase( pRangeStart->wtFlags & TERM_VIRTUAL ); /* EV: R-30575-11662 */
-    }else if( isMinQuery ){
+      testcase( pRangeStart->wtFlags & TERM_VIRTUAL );
+    }else if( bSeekPastNull ){
       sqlite3VdbeAddOp2(v, OP_Null, 0, regBase+nEq);
       nConstraint++;
       startEq = 0;
       start_constraints = 1;
     }
-    codeApplyAffinity(pParse, regBase, nConstraint, zStartAff);
+    codeApplyAffinity(pParse, regBase, nConstraint - bSeekPastNull, zStartAff);
     op = aStartOp[(start_constraints<<2) + (startEq<<1) + bRev];
     assert( op!=0 );
-    testcase( op==OP_Rewind );
-    testcase( op==OP_Last );
-    testcase( op==OP_SeekGt );
-    testcase( op==OP_SeekGe );
-    testcase( op==OP_SeekLe );
-    testcase( op==OP_SeekLt );
     sqlite3VdbeAddOp4Int(v, op, iIdxCur, addrNxt, regBase, nConstraint);
+    VdbeCoverage(v);
+    VdbeCoverageIf(v, op==OP_Rewind);  testcase( op==OP_Rewind );
+    VdbeCoverageIf(v, op==OP_Last);    testcase( op==OP_Last );
+    VdbeCoverageIf(v, op==OP_SeekGT);  testcase( op==OP_SeekGT );
+    VdbeCoverageIf(v, op==OP_SeekGE);  testcase( op==OP_SeekGE );
+    VdbeCoverageIf(v, op==OP_SeekLE);  testcase( op==OP_SeekLE );
+    VdbeCoverageIf(v, op==OP_SeekLT);  testcase( op==OP_SeekLT );
 
     /* Load the value for the inequality constraint at the end of the
     ** range (if any).
@@ -108911,67 +113219,64 @@ static Bitmask codeOneLoopStart(
       Expr *pRight = pRangeEnd->pExpr->pRight;
       sqlite3ExprCacheRemove(pParse, regBase+nEq, 1);
       sqlite3ExprCode(pParse, pRight, regBase+nEq);
-      if( (pRangeEnd->wtFlags & TERM_VNULL)==0 ){
-        sqlite3ExprCodeIsNullJump(v, pRight, regBase+nEq, addrNxt);
+      if( (pRangeEnd->wtFlags & TERM_VNULL)==0
+       && sqlite3ExprCanBeNull(pRight)
+      ){
+        sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, addrNxt);
+        VdbeCoverage(v);
+      }
+      if( sqlite3CompareAffinity(pRight, cEndAff)!=SQLITE_AFF_NONE
+       && !sqlite3ExprNeedsNoAffinityChange(pRight, cEndAff)
+      ){
+        codeApplyAffinity(pParse, regBase+nEq, 1, &cEndAff);
       }
-      if( zEndAff ){
-        if( sqlite3CompareAffinity(pRight, zEndAff[nEq])==SQLITE_AFF_NONE){
-          /* Since the comparison is to be performed with no conversions
-          ** applied to the operands, set the affinity to apply to pRight to 
-          ** SQLITE_AFF_NONE.  */
-          zEndAff[nEq] = SQLITE_AFF_NONE;
-        }
-        if( sqlite3ExprNeedsNoAffinityChange(pRight, zEndAff[nEq]) ){
-          zEndAff[nEq] = SQLITE_AFF_NONE;
-        }
-      }  
-      codeApplyAffinity(pParse, regBase, nEq+1, zEndAff);
       nConstraint++;
-      testcase( pRangeEnd->wtFlags & TERM_VIRTUAL ); /* EV: R-30575-11662 */
+      testcase( pRangeEnd->wtFlags & TERM_VIRTUAL );
+    }else if( bStopAtNull ){
+      sqlite3VdbeAddOp2(v, OP_Null, 0, regBase+nEq);
+      endEq = 0;
+      nConstraint++;
     }
-    sqlite3DbFree(pParse->db, zStartAff);
-    sqlite3DbFree(pParse->db, zEndAff);
+    sqlite3DbFree(db, zStartAff);
 
     /* Top of the loop body */
     pLevel->p2 = sqlite3VdbeCurrentAddr(v);
 
     /* Check if the index cursor is past the end of the range. */
-    op = aEndOp[(pRangeEnd || nEq) * (1 + bRev)];
-    testcase( op==OP_Noop );
-    testcase( op==OP_IdxGE );
-    testcase( op==OP_IdxLT );
-    if( op!=OP_Noop ){
+    if( nConstraint ){
+      op = aEndOp[bRev*2 + endEq];
       sqlite3VdbeAddOp4Int(v, op, iIdxCur, addrNxt, regBase, nConstraint);
-      sqlite3VdbeChangeP5(v, endEq!=bRev ?1:0);
+      testcase( op==OP_IdxGT );  VdbeCoverageIf(v, op==OP_IdxGT );
+      testcase( op==OP_IdxGE );  VdbeCoverageIf(v, op==OP_IdxGE );
+      testcase( op==OP_IdxLT );  VdbeCoverageIf(v, op==OP_IdxLT );
+      testcase( op==OP_IdxLE );  VdbeCoverageIf(v, op==OP_IdxLE );
     }
 
-    /* If there are inequality constraints, check that the value
-    ** of the table column that the inequality contrains is not NULL.
-    ** If it is, jump to the next iteration of the loop.
-    */
-    r1 = sqlite3GetTempReg(pParse);
-    testcase( pLevel->plan.wsFlags & WHERE_BTM_LIMIT );
-    testcase( pLevel->plan.wsFlags & WHERE_TOP_LIMIT );
-    if( (pLevel->plan.wsFlags & (WHERE_BTM_LIMIT|WHERE_TOP_LIMIT))!=0 ){
-      sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, nEq, r1);
-      sqlite3VdbeAddOp2(v, OP_IsNull, r1, addrCont);
-    }
-    sqlite3ReleaseTempReg(pParse, r1);
-
     /* Seek the table cursor, if required */
     disableTerm(pLevel, pRangeStart);
     disableTerm(pLevel, pRangeEnd);
-    if( !omitTable ){
-      iRowidReg = iReleaseReg = sqlite3GetTempReg(pParse);
+    if( omitTable ){
+      /* pIdx is a covering index.  No need to access the main table. */
+    }else if( HasRowid(pIdx->pTable) ){
+      iRowidReg = ++pParse->nMem;
       sqlite3VdbeAddOp2(v, OP_IdxRowid, iIdxCur, iRowidReg);
       sqlite3ExprCacheStore(pParse, iCur, -1, iRowidReg);
       sqlite3VdbeAddOp2(v, OP_Seek, iCur, iRowidReg);  /* Deferred seek */
+    }else if( iCur!=iIdxCur ){
+      Index *pPk = sqlite3PrimaryKeyIndex(pIdx->pTable);
+      iRowidReg = sqlite3GetTempRange(pParse, pPk->nKeyCol);
+      for(j=0; j<pPk->nKeyCol; j++){
+        k = sqlite3ColumnOfIndex(pIdx, pPk->aiColumn[j]);
+        sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, k, iRowidReg+j);
+      }
+      sqlite3VdbeAddOp4Int(v, OP_NotFound, iCur, addrCont,
+                           iRowidReg, pPk->nKeyCol); VdbeCoverage(v);
     }
 
     /* Record the instruction used to terminate the loop. Disable 
     ** WHERE clause terms made redundant by the index range scan.
     */
-    if( pLevel->plan.wsFlags & WHERE_UNIQUE ){
+    if( pLoop->wsFlags & WHERE_ONEROW ){
       pLevel->op = OP_Noop;
     }else if( bRev ){
       pLevel->op = OP_Prev;
@@ -108979,7 +113284,8 @@ static Bitmask codeOneLoopStart(
       pLevel->op = OP_Next;
     }
     pLevel->p1 = iIdxCur;
-    if( pLevel->plan.wsFlags & WHERE_COVER_SCAN ){
+    pLevel->p3 = (pLoop->wsFlags&WHERE_UNQ_WANTED)!=0 ? 1:0;
+    if( (pLoop->wsFlags & WHERE_CONSTRAINT)==0 ){
       pLevel->p5 = SQLITE_STMTSTATUS_FULLSCAN_STEP;
     }else{
       assert( pLevel->p5==0 );
@@ -108987,8 +113293,8 @@ static Bitmask codeOneLoopStart(
   }else
 
 #ifndef SQLITE_OMIT_OR_OPTIMIZATION
-  if( pLevel->plan.wsFlags & WHERE_MULTI_OR ){
-    /* Case 4:  Two or more separately indexed terms connected by OR
+  if( pLoop->wsFlags & WHERE_MULTI_OR ){
+    /* Case 5:  Two or more separately indexed terms connected by OR
     **
     ** Example:
     **
@@ -109026,6 +113332,10 @@ static Bitmask codeOneLoopStart(
     **
     **       B: <after the loop>
     **
+    ** Added 2014-05-26: If the table is a WITHOUT ROWID table, then
+    ** use an ephermeral index instead of a RowSet to record the primary
+    ** keys of the rows we have already seen.
+    **
     */
     WhereClause *pOrWc;    /* The OR-clause broken out into subterms */
     SrcList *pOrTab;       /* Shortened table list or OR-clause generation */
@@ -109040,8 +113350,9 @@ static Bitmask codeOneLoopStart(
     int untestedTerms = 0;             /* Some terms not completely tested */
     int ii;                            /* Loop counter */
     Expr *pAndExpr = 0;                /* An ".. AND (...)" expression */
+    Table *pTab = pTabItem->pTab;
    
-    pTerm = pLevel->plan.u.pTerm;
+    pTerm = pLoop->aLTerm[0];
     assert( pTerm!=0 );
     assert( pTerm->eOperator & WO_OR );
     assert( (pTerm->wtFlags & TERM_ORINFO)!=0 );
@@ -109057,10 +113368,10 @@ static Bitmask codeOneLoopStart(
       int nNotReady;                 /* The number of notReady tables */
       struct SrcList_item *origSrc;     /* Original list of tables */
       nNotReady = pWInfo->nLevel - iLevel - 1;
-      pOrTab = sqlite3StackAllocRaw(pParse->db,
+      pOrTab = sqlite3StackAllocRaw(db,
                             sizeof(*pOrTab)+ nNotReady*sizeof(pOrTab->a[0]));
       if( pOrTab==0 ) return notReady;
-      pOrTab->nAlloc = (i16)(nNotReady + 1);
+      pOrTab->nAlloc = (u8)(nNotReady + 1);
       pOrTab->nSrc = pOrTab->nAlloc;
       memcpy(pOrTab->a, pTabItem, sizeof(*pTabItem));
       origSrc = pWInfo->pTabList->a;
@@ -109072,7 +113383,8 @@ static Bitmask codeOneLoopStart(
     }
 
     /* Initialize the rowset register to contain NULL. An SQL NULL is 
-    ** equivalent to an empty rowset.
+    ** equivalent to an empty rowset.  Or, create an ephermeral index
+    ** capable of holding primary keys in the case of a WITHOUT ROWID.
     **
     ** Also initialize regReturn to contain the address of the instruction 
     ** immediately following the OP_Return at the bottom of the loop. This
@@ -109082,10 +113394,17 @@ static Bitmask codeOneLoopStart(
     ** fall through to the next instruction, just as an OP_Next does if
     ** called on an uninitialized cursor.
     */
-    if( (wctrlFlags & WHERE_DUPLICATES_OK)==0 ){
-      regRowset = ++pParse->nMem;
+    if( (pWInfo->wctrlFlags & WHERE_DUPLICATES_OK)==0 ){
+      if( HasRowid(pTab) ){
+        regRowset = ++pParse->nMem;
+        sqlite3VdbeAddOp2(v, OP_Null, 0, regRowset);
+      }else{
+        Index *pPk = sqlite3PrimaryKeyIndex(pTab);
+        regRowset = pParse->nTab++;
+        sqlite3VdbeAddOp2(v, OP_OpenEphemeral, regRowset, pPk->nKeyCol);
+        sqlite3VdbeSetP4KeyInfo(pParse, pPk);
+      }
       regRowid = ++pParse->nMem;
-      sqlite3VdbeAddOp2(v, OP_Null, 0, regRowset);
     }
     iRetInit = sqlite3VdbeAddOp2(v, OP_Integer, 0, regReturn);
 
@@ -109107,22 +113426,30 @@ static Bitmask codeOneLoopStart(
       int iTerm;
       for(iTerm=0; iTerm<pWC->nTerm; iTerm++){
         Expr *pExpr = pWC->a[iTerm].pExpr;
+        if( &pWC->a[iTerm] == pTerm ) continue;
         if( ExprHasProperty(pExpr, EP_FromJoin) ) continue;
-        if( pWC->a[iTerm].wtFlags & (TERM_VIRTUAL|TERM_ORINFO) ) continue;
+        testcase( pWC->a[iTerm].wtFlags & TERM_ORINFO );
+        testcase( pWC->a[iTerm].wtFlags & TERM_VIRTUAL );
+        if( pWC->a[iTerm].wtFlags & (TERM_ORINFO|TERM_VIRTUAL) ) continue;
         if( (pWC->a[iTerm].eOperator & WO_ALL)==0 ) continue;
-        pExpr = sqlite3ExprDup(pParse->db, pExpr, 0);
-        pAndExpr = sqlite3ExprAnd(pParse->db, pAndExpr, pExpr);
+        pExpr = sqlite3ExprDup(db, pExpr, 0);
+        pAndExpr = sqlite3ExprAnd(db, pAndExpr, pExpr);
       }
       if( pAndExpr ){
         pAndExpr = sqlite3PExpr(pParse, TK_AND, 0, pAndExpr, 0);
       }
     }
 
+    /* Run a separate WHERE clause for each term of the OR clause.  After
+    ** eliminating duplicates from other WHERE clauses, the action for each
+    ** sub-WHERE clause is to to invoke the main loop body as a subroutine.
+    */
     for(ii=0; ii<pOrWc->nTerm; ii++){
       WhereTerm *pOrTerm = &pOrWc->a[ii];
       if( pOrTerm->leftCursor==iCur || (pOrTerm->eOperator & WO_AND)!=0 ){
-        WhereInfo *pSubWInfo;          /* Info for single OR-term scan */
-        Expr *pOrExpr = pOrTerm->pExpr;
+        WhereInfo *pSubWInfo;           /* Info for single OR-term scan */
+        Expr *pOrExpr = pOrTerm->pExpr; /* Current OR clause term */
+        int j1 = 0;                     /* Address of jump operation */
         if( pAndExpr && !ExprHasProperty(pOrExpr, EP_FromJoin) ){
           pAndExpr->pLeft = pOrExpr;
           pOrExpr = pAndExpr;
@@ -109131,22 +113458,69 @@ static Bitmask codeOneLoopStart(
         pSubWInfo = sqlite3WhereBegin(pParse, pOrTab, pOrExpr, 0, 0,
                         WHERE_OMIT_OPEN_CLOSE | WHERE_AND_ONLY |
                         WHERE_FORCE_TABLE | WHERE_ONETABLE_ONLY, iCovCur);
-        assert( pSubWInfo || pParse->nErr || pParse->db->mallocFailed );
+        assert( pSubWInfo || pParse->nErr || db->mallocFailed );
         if( pSubWInfo ){
-          WhereLevel *pLvl;
+          WhereLoop *pSubLoop;
           explainOneScan(
               pParse, pOrTab, &pSubWInfo->a[0], iLevel, pLevel->iFrom, 0
           );
-          if( (wctrlFlags & WHERE_DUPLICATES_OK)==0 ){
-            int iSet = ((ii==pOrWc->nTerm-1)?-1:ii);
+          /* This is the sub-WHERE clause body.  First skip over
+          ** duplicate rows from prior sub-WHERE clauses, and record the
+          ** rowid (or PRIMARY KEY) for the current row so that the same
+          ** row will be skipped in subsequent sub-WHERE clauses.
+          */
+          if( (pWInfo->wctrlFlags & WHERE_DUPLICATES_OK)==0 ){
             int r;
-            r = sqlite3ExprCodeGetColumn(pParse, pTabItem->pTab, -1, iCur, 
-                                         regRowid, 0);
-            sqlite3VdbeAddOp4Int(v, OP_RowSetTest, regRowset,
-                                 sqlite3VdbeCurrentAddr(v)+2, r, iSet);
+            int iSet = ((ii==pOrWc->nTerm-1)?-1:ii);
+            if( HasRowid(pTab) ){
+              r = sqlite3ExprCodeGetColumn(pParse, pTab, -1, iCur, regRowid, 0);
+              j1 = sqlite3VdbeAddOp4Int(v, OP_RowSetTest, regRowset, 0, r,iSet);
+              VdbeCoverage(v);
+            }else{
+              Index *pPk = sqlite3PrimaryKeyIndex(pTab);
+              int nPk = pPk->nKeyCol;
+              int iPk;
+
+              /* Read the PK into an array of temp registers. */
+              r = sqlite3GetTempRange(pParse, nPk);
+              for(iPk=0; iPk<nPk; iPk++){
+                int iCol = pPk->aiColumn[iPk];
+                sqlite3ExprCodeGetColumn(pParse, pTab, iCol, iCur, r+iPk, 0);
+              }
+
+              /* Check if the temp table already contains this key. If so,
+              ** the row has already been included in the result set and
+              ** can be ignored (by jumping past the Gosub below). Otherwise,
+              ** insert the key into the temp table and proceed with processing
+              ** the row.
+              **
+              ** Use some of the same optimizations as OP_RowSetTest: If iSet
+              ** is zero, assume that the key cannot already be present in
+              ** the temp table. And if iSet is -1, assume that there is no 
+              ** need to insert the key into the temp table, as it will never 
+              ** be tested for.  */ 
+              if( iSet ){
+                j1 = sqlite3VdbeAddOp4Int(v, OP_Found, regRowset, 0, r, nPk);
+                VdbeCoverage(v);
+              }
+              if( iSet>=0 ){
+                sqlite3VdbeAddOp3(v, OP_MakeRecord, r, nPk, regRowid);
+                sqlite3VdbeAddOp3(v, OP_IdxInsert, regRowset, regRowid, 0);
+                if( iSet ) sqlite3VdbeChangeP5(v, OPFLAG_USESEEKRESULT);
+              }
+
+              /* Release the array of temp registers */
+              sqlite3ReleaseTempRange(pParse, r, nPk);
+            }
           }
+
+          /* Invoke the main loop body as a subroutine */
           sqlite3VdbeAddOp2(v, OP_Gosub, regReturn, iLoopBody);
 
+          /* Jump here (skipping the main loop body subroutine) if the
+          ** current sub-WHERE row is a duplicate from prior sub-WHEREs. */
+          if( j1 ) sqlite3VdbeJumpHere(v, j1);
+
           /* The pSubWInfo->untestedTerms flag means that this OR term
           ** contained one or more AND term from a notReady table.  The
           ** terms from the notReady table could not be tested and will
@@ -109166,13 +113540,14 @@ static Bitmask codeOneLoopStart(
           ** pCov to NULL to indicate that no candidate covering index will 
           ** be available.
           */
-          pLvl = &pSubWInfo->a[0];
-          if( (pLvl->plan.wsFlags & WHERE_INDEXED)!=0
-           && (pLvl->plan.wsFlags & WHERE_TEMP_INDEX)==0
-           && (ii==0 || pLvl->plan.u.pIdx==pCov)
+          pSubLoop = pSubWInfo->a[0].pWLoop;
+          assert( (pSubLoop->wsFlags & WHERE_AUTO_INDEX)==0 );
+          if( (pSubLoop->wsFlags & WHERE_INDEXED)!=0
+           && (ii==0 || pSubLoop->u.btree.pIndex==pCov)
+           && (HasRowid(pTab) || !IsPrimaryKeyIndex(pSubLoop->u.btree.pIndex))
           ){
-            assert( pLvl->iIdxCur==iCovCur );
-            pCov = pLvl->plan.u.pIdx;
+            assert( pSubWInfo->a[0].iIdxCur==iCovCur );
+            pCov = pSubLoop->u.btree.pIndex;
           }else{
             pCov = 0;
           }
@@ -109186,45 +113561,47 @@ static Bitmask codeOneLoopStart(
     if( pCov ) pLevel->iIdxCur = iCovCur;
     if( pAndExpr ){
       pAndExpr->pLeft = 0;
-      sqlite3ExprDelete(pParse->db, pAndExpr);
+      sqlite3ExprDelete(db, pAndExpr);
     }
     sqlite3VdbeChangeP1(v, iRetInit, sqlite3VdbeCurrentAddr(v));
     sqlite3VdbeAddOp2(v, OP_Goto, 0, pLevel->addrBrk);
     sqlite3VdbeResolveLabel(v, iLoopBody);
 
-    if( pWInfo->nLevel>1 ) sqlite3StackFree(pParse->db, pOrTab);
+    if( pWInfo->nLevel>1 ) sqlite3StackFree(db, pOrTab);
     if( !untestedTerms ) disableTerm(pLevel, pTerm);
   }else
 #endif /* SQLITE_OMIT_OR_OPTIMIZATION */
 
   {
-    /* Case 5:  There is no usable index.  We must do a complete
+    /* Case 6:  There is no usable index.  We must do a complete
     **          scan of the entire table.
     */
     static const u8 aStep[] = { OP_Next, OP_Prev };
     static const u8 aStart[] = { OP_Rewind, OP_Last };
     assert( bRev==0 || bRev==1 );
-    assert( omitTable==0 );
-    pLevel->op = aStep[bRev];
-    pLevel->p1 = iCur;
-    pLevel->p2 = 1 + sqlite3VdbeAddOp2(v, aStart[bRev], iCur, addrBrk);
-    pLevel->p5 = SQLITE_STMTSTATUS_FULLSCAN_STEP;
+    if( pTabItem->isRecursive ){
+      /* Tables marked isRecursive have only a single row that is stored in
+      ** a pseudo-cursor.  No need to Rewind or Next such cursors. */
+      pLevel->op = OP_Noop;
+    }else{
+      pLevel->op = aStep[bRev];
+      pLevel->p1 = iCur;
+      pLevel->p2 = 1 + sqlite3VdbeAddOp2(v, aStart[bRev], iCur, addrBrk);
+      VdbeCoverageIf(v, bRev==0);
+      VdbeCoverageIf(v, bRev!=0);
+      pLevel->p5 = SQLITE_STMTSTATUS_FULLSCAN_STEP;
+    }
   }
-  newNotReady = notReady & ~getMask(pWC->pMaskSet, iCur);
 
   /* Insert code to test every subexpression that can be completely
   ** computed using the current set of tables.
-  **
-  ** IMPLEMENTATION-OF: R-49525-50935 Terms that cannot be satisfied through
-  ** the use of indices become tests that are evaluated against each row of
-  ** the relevant input tables.
   */
   for(pTerm=pWC->a, j=pWC->nTerm; j>0; j--, pTerm++){
     Expr *pE;
-    testcase( pTerm->wtFlags & TERM_VIRTUAL ); /* IMP: R-30575-11662 */
+    testcase( pTerm->wtFlags & TERM_VIRTUAL );
     testcase( pTerm->wtFlags & TERM_CODED );
     if( pTerm->wtFlags & (TERM_VIRTUAL|TERM_CODED) ) continue;
-    if( (pTerm->prereqAll & newNotReady)!=0 ){
+    if( (pTerm->prereqAll & pLevel->notReady)!=0 ){
       testcase( pWInfo->untestedTerms==0
                && (pWInfo->wctrlFlags & WHERE_ONETABLE_ONLY)!=0 );
       pWInfo->untestedTerms = 1;
@@ -109248,22 +113625,28 @@ static Bitmask codeOneLoopStart(
   ** the implied "t1.a=123" constraint.
   */
   for(pTerm=pWC->a, j=pWC->nTerm; j>0; j--, pTerm++){
-    Expr *pE;
+    Expr *pE, *pEAlt;
     WhereTerm *pAlt;
-    Expr sEq;
     if( pTerm->wtFlags & (TERM_VIRTUAL|TERM_CODED) ) continue;
     if( pTerm->eOperator!=(WO_EQUIV|WO_EQ) ) continue;
     if( pTerm->leftCursor!=iCur ) continue;
+    if( pLevel->iLeftJoin ) continue;
     pE = pTerm->pExpr;
     assert( !ExprHasProperty(pE, EP_FromJoin) );
-    assert( (pTerm->prereqRight & newNotReady)!=0 );
+    assert( (pTerm->prereqRight & pLevel->notReady)!=0 );
     pAlt = findTerm(pWC, iCur, pTerm->u.leftColumn, notReady, WO_EQ|WO_IN, 0);
     if( pAlt==0 ) continue;
     if( pAlt->wtFlags & (TERM_CODED) ) continue;
-    VdbeNoopComment((v, "begin transitive constraint"));
-    sEq = *pAlt->pExpr;
-    sEq.pLeft = pE->pLeft;
-    sqlite3ExprIfFalse(pParse, &sEq, addrCont, SQLITE_JUMPIFNULL);
+    testcase( pAlt->eOperator & WO_EQ );
+    testcase( pAlt->eOperator & WO_IN );
+    VdbeModuleComment((v, "begin transitive constraint"));
+    pEAlt = sqlite3StackAllocRaw(db, sizeof(*pEAlt));
+    if( pEAlt ){
+      *pEAlt = *pAlt->pExpr;
+      pEAlt->pLeft = pE->pLeft;
+      sqlite3ExprIfFalse(pParse, pEAlt, addrCont, SQLITE_JUMPIFNULL);
+      sqlite3StackFree(db, pEAlt);
+    }
   }
 
   /* For a LEFT OUTER JOIN, generate code that will record the fact that
@@ -109275,10 +113658,10 @@ static Bitmask codeOneLoopStart(
     VdbeComment((v, "record LEFT JOIN hit"));
     sqlite3ExprCacheClear(pParse);
     for(pTerm=pWC->a, j=0; j<pWC->nTerm; j++, pTerm++){
-      testcase( pTerm->wtFlags & TERM_VIRTUAL );  /* IMP: R-30575-11662 */
+      testcase( pTerm->wtFlags & TERM_VIRTUAL );
       testcase( pTerm->wtFlags & TERM_CODED );
       if( pTerm->wtFlags & (TERM_VIRTUAL|TERM_CODED) ) continue;
-      if( (pTerm->prereqAll & newNotReady)!=0 ){
+      if( (pTerm->prereqAll & pLevel->notReady)!=0 ){
         assert( pWInfo->untestedTerms );
         continue;
       }
@@ -109287,52 +113670,2020 @@ static Bitmask codeOneLoopStart(
       pTerm->wtFlags |= TERM_CODED;
     }
   }
-  sqlite3ReleaseTempReg(pParse, iReleaseReg);
 
-  return newNotReady;
+  return pLevel->notReady;
 }
 
-#if defined(SQLITE_TEST)
+#if defined(WHERETRACE_ENABLED) && defined(SQLITE_ENABLE_TREE_EXPLAIN)
 /*
-** The following variable holds a text description of query plan generated
-** by the most recent call to sqlite3WhereBegin().  Each call to WhereBegin
-** overwrites the previous.  This information is used for testing and
-** analysis only.
+** Generate "Explanation" text for a WhereTerm.
 */
-SQLITE_API char sqlite3_query_plan[BMS*2*40];  /* Text of the join */
-static int nQPlan = 0;              /* Next free slow in _query_plan[] */
+static void whereExplainTerm(Vdbe *v, WhereTerm *pTerm){
+  char zType[4];
+  memcpy(zType, "...", 4);
+  if( pTerm->wtFlags & TERM_VIRTUAL ) zType[0] = 'V';
+  if( pTerm->eOperator & WO_EQUIV  ) zType[1] = 'E';
+  if( ExprHasProperty(pTerm->pExpr, EP_FromJoin) ) zType[2] = 'L';
+  sqlite3ExplainPrintf(v, "%s ", zType);
+  sqlite3ExplainExpr(v, pTerm->pExpr);
+}
+#endif /* WHERETRACE_ENABLED && SQLITE_ENABLE_TREE_EXPLAIN */
 
-#endif /* SQLITE_TEST */
 
+#ifdef WHERETRACE_ENABLED
+/*
+** Print a WhereLoop object for debugging purposes
+*/
+static void whereLoopPrint(WhereLoop *p, WhereClause *pWC){
+  WhereInfo *pWInfo = pWC->pWInfo;
+  int nb = 1+(pWInfo->pTabList->nSrc+7)/8;
+  struct SrcList_item *pItem = pWInfo->pTabList->a + p->iTab;
+  Table *pTab = pItem->pTab;
+  sqlite3DebugPrintf("%c%2d.%0*llx.%0*llx", p->cId,
+                     p->iTab, nb, p->maskSelf, nb, p->prereq);
+  sqlite3DebugPrintf(" %12s",
+                     pItem->zAlias ? pItem->zAlias : pTab->zName);
+  if( (p->wsFlags & WHERE_VIRTUALTABLE)==0 ){
+     const char *zName;
+     if( p->u.btree.pIndex && (zName = p->u.btree.pIndex->zName)!=0 ){
+      if( strncmp(zName, "sqlite_autoindex_", 17)==0 ){
+        int i = sqlite3Strlen30(zName) - 1;
+        while( zName[i]!='_' ) i--;
+        zName += i;
+      }
+      sqlite3DebugPrintf(".%-16s %2d", zName, p->u.btree.nEq);
+    }else{
+      sqlite3DebugPrintf("%20s","");
+    }
+  }else{
+    char *z;
+    if( p->u.vtab.idxStr ){
+      z = sqlite3_mprintf("(%d,\"%s\",%x)",
+                p->u.vtab.idxNum, p->u.vtab.idxStr, p->u.vtab.omitMask);
+    }else{
+      z = sqlite3_mprintf("(%d,%x)", p->u.vtab.idxNum, p->u.vtab.omitMask);
+    }
+    sqlite3DebugPrintf(" %-19s", z);
+    sqlite3_free(z);
+  }
+  sqlite3DebugPrintf(" f %04x N %d", p->wsFlags, p->nLTerm);
+  sqlite3DebugPrintf(" cost %d,%d,%d\n", p->rSetup, p->rRun, p->nOut);
+#ifdef SQLITE_ENABLE_TREE_EXPLAIN
+  /* If the 0x100 bit of wheretracing is set, then show all of the constraint
+  ** expressions in the WhereLoop.aLTerm[] array.
+  */
+  if( p->nLTerm && (sqlite3WhereTrace & 0x100)!=0 ){  /* WHERETRACE 0x100 */
+    int i;
+    Vdbe *v = pWInfo->pParse->pVdbe;
+    sqlite3ExplainBegin(v);
+    for(i=0; i<p->nLTerm; i++){
+      WhereTerm *pTerm = p->aLTerm[i];
+      if( pTerm==0 ) continue;
+      sqlite3ExplainPrintf(v, "  (%d) #%-2d ", i+1, (int)(pTerm-pWC->a));
+      sqlite3ExplainPush(v);
+      whereExplainTerm(v, pTerm);
+      sqlite3ExplainPop(v);
+      sqlite3ExplainNL(v);
+    }
+    sqlite3ExplainFinish(v);
+    sqlite3DebugPrintf("%s", sqlite3VdbeExplanation(v));
+  }
+#endif
+}
+#endif
+
+/*
+** Convert bulk memory into a valid WhereLoop that can be passed
+** to whereLoopClear harmlessly.
+*/
+static void whereLoopInit(WhereLoop *p){
+  p->aLTerm = p->aLTermSpace;
+  p->nLTerm = 0;
+  p->nLSlot = ArraySize(p->aLTermSpace);
+  p->wsFlags = 0;
+}
+
+/*
+** Clear the WhereLoop.u union.  Leave WhereLoop.pLTerm intact.
+*/
+static void whereLoopClearUnion(sqlite3 *db, WhereLoop *p){
+  if( p->wsFlags & (WHERE_VIRTUALTABLE|WHERE_AUTO_INDEX) ){
+    if( (p->wsFlags & WHERE_VIRTUALTABLE)!=0 && p->u.vtab.needFree ){
+      sqlite3_free(p->u.vtab.idxStr);
+      p->u.vtab.needFree = 0;
+      p->u.vtab.idxStr = 0;
+    }else if( (p->wsFlags & WHERE_AUTO_INDEX)!=0 && p->u.btree.pIndex!=0 ){
+      sqlite3DbFree(db, p->u.btree.pIndex->zColAff);
+      sqlite3KeyInfoUnref(p->u.btree.pIndex->pKeyInfo);
+      sqlite3DbFree(db, p->u.btree.pIndex);
+      p->u.btree.pIndex = 0;
+    }
+  }
+}
+
+/*
+** Deallocate internal memory used by a WhereLoop object
+*/
+static void whereLoopClear(sqlite3 *db, WhereLoop *p){
+  if( p->aLTerm!=p->aLTermSpace ) sqlite3DbFree(db, p->aLTerm);
+  whereLoopClearUnion(db, p);
+  whereLoopInit(p);
+}
+
+/*
+** Increase the memory allocation for pLoop->aLTerm[] to be at least n.
+*/
+static int whereLoopResize(sqlite3 *db, WhereLoop *p, int n){
+  WhereTerm **paNew;
+  if( p->nLSlot>=n ) return SQLITE_OK;
+  n = (n+7)&~7;
+  paNew = sqlite3DbMallocRaw(db, sizeof(p->aLTerm[0])*n);
+  if( paNew==0 ) return SQLITE_NOMEM;
+  memcpy(paNew, p->aLTerm, sizeof(p->aLTerm[0])*p->nLSlot);
+  if( p->aLTerm!=p->aLTermSpace ) sqlite3DbFree(db, p->aLTerm);
+  p->aLTerm = paNew;
+  p->nLSlot = n;
+  return SQLITE_OK;
+}
+
+/*
+** Transfer content from the second pLoop into the first.
+*/
+static int whereLoopXfer(sqlite3 *db, WhereLoop *pTo, WhereLoop *pFrom){
+  whereLoopClearUnion(db, pTo);
+  if( whereLoopResize(db, pTo, pFrom->nLTerm) ){
+    memset(&pTo->u, 0, sizeof(pTo->u));
+    return SQLITE_NOMEM;
+  }
+  memcpy(pTo, pFrom, WHERE_LOOP_XFER_SZ);
+  memcpy(pTo->aLTerm, pFrom->aLTerm, pTo->nLTerm*sizeof(pTo->aLTerm[0]));
+  if( pFrom->wsFlags & WHERE_VIRTUALTABLE ){
+    pFrom->u.vtab.needFree = 0;
+  }else if( (pFrom->wsFlags & WHERE_AUTO_INDEX)!=0 ){
+    pFrom->u.btree.pIndex = 0;
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Delete a WhereLoop object
+*/
+static void whereLoopDelete(sqlite3 *db, WhereLoop *p){
+  whereLoopClear(db, p);
+  sqlite3DbFree(db, p);
+}
 
 /*
 ** Free a WhereInfo structure
 */
 static void whereInfoFree(sqlite3 *db, WhereInfo *pWInfo){
   if( ALWAYS(pWInfo) ){
-    int i;
-    for(i=0; i<pWInfo->nLevel; i++){
-      sqlite3_index_info *pInfo = pWInfo->a[i].pIdxInfo;
-      if( pInfo ){
-        /* assert( pInfo->needToFreeIdxStr==0 || db->mallocFailed ); */
-        if( pInfo->needToFreeIdxStr ){
-          sqlite3_free(pInfo->idxStr);
-        }
-        sqlite3DbFree(db, pInfo);
-      }
-      if( pWInfo->a[i].plan.wsFlags & WHERE_TEMP_INDEX ){
-        Index *pIdx = pWInfo->a[i].plan.u.pIdx;
-        if( pIdx ){
-          sqlite3DbFree(db, pIdx->zColAff);
-          sqlite3DbFree(db, pIdx);
-        }
-      }
+    whereClauseClear(&pWInfo->sWC);
+    while( pWInfo->pLoops ){
+      WhereLoop *p = pWInfo->pLoops;
+      pWInfo->pLoops = p->pNextLoop;
+      whereLoopDelete(db, p);
     }
-    whereClauseClear(pWInfo->pWC);
     sqlite3DbFree(db, pWInfo);
   }
 }
 
+/*
+** Return TRUE if both of the following are true:
+**
+**   (1)  X has the same or lower cost that Y
+**   (2)  X is a proper subset of Y
+**
+** By "proper subset" we mean that X uses fewer WHERE clause terms
+** than Y and that every WHERE clause term used by X is also used
+** by Y.
+**
+** If X is a proper subset of Y then Y is a better choice and ought
+** to have a lower cost.  This routine returns TRUE when that cost 
+** relationship is inverted and needs to be adjusted.
+*/
+static int whereLoopCheaperProperSubset(
+  const WhereLoop *pX,       /* First WhereLoop to compare */
+  const WhereLoop *pY        /* Compare against this WhereLoop */
+){
+  int i, j;
+  if( pX->nLTerm >= pY->nLTerm ) return 0; /* X is not a subset of Y */
+  if( pX->rRun >= pY->rRun ){
+    if( pX->rRun > pY->rRun ) return 0;    /* X costs more than Y */
+    if( pX->nOut > pY->nOut ) return 0;    /* X costs more than Y */
+  }
+  for(i=pX->nLTerm-1; i>=0; i--){
+    for(j=pY->nLTerm-1; j>=0; j--){
+      if( pY->aLTerm[j]==pX->aLTerm[i] ) break;
+    }
+    if( j<0 ) return 0;  /* X not a subset of Y since term X[i] not used by Y */
+  }
+  return 1;  /* All conditions meet */
+}
+
+/*
+** Try to adjust the cost of WhereLoop pTemplate upwards or downwards so
+** that:
+**
+**   (1) pTemplate costs less than any other WhereLoops that are a proper
+**       subset of pTemplate
+**
+**   (2) pTemplate costs more than any other WhereLoops for which pTemplate
+**       is a proper subset.
+**
+** To say "WhereLoop X is a proper subset of Y" means that X uses fewer
+** WHERE clause terms than Y and that every WHERE clause term used by X is
+** also used by Y.
+**
+** This adjustment is omitted for SKIPSCAN loops.  In a SKIPSCAN loop, the
+** WhereLoop.nLTerm field is not an accurate measure of the number of WHERE
+** clause terms covered, since some of the first nLTerm entries in aLTerm[]
+** will be NULL (because they are skipped).  That makes it more difficult
+** to compare the loops.  We could add extra code to do the comparison, and
+** perhaps we will someday.  But SKIPSCAN is sufficiently uncommon, and this
+** adjustment is sufficient minor, that it is very difficult to construct
+** a test case where the extra code would improve the query plan.  Better
+** to avoid the added complexity and just omit cost adjustments to SKIPSCAN
+** loops.
+*/
+static void whereLoopAdjustCost(const WhereLoop *p, WhereLoop *pTemplate){
+  if( (pTemplate->wsFlags & WHERE_INDEXED)==0 ) return;
+  if( (pTemplate->wsFlags & WHERE_SKIPSCAN)!=0 ) return;
+  for(; p; p=p->pNextLoop){
+    if( p->iTab!=pTemplate->iTab ) continue;
+    if( (p->wsFlags & WHERE_INDEXED)==0 ) continue;
+    if( (p->wsFlags & WHERE_SKIPSCAN)!=0 ) continue;
+    if( whereLoopCheaperProperSubset(p, pTemplate) ){
+      /* Adjust pTemplate cost downward so that it is cheaper than its 
+      ** subset p */
+      pTemplate->rRun = p->rRun;
+      pTemplate->nOut = p->nOut - 1;
+    }else if( whereLoopCheaperProperSubset(pTemplate, p) ){
+      /* Adjust pTemplate cost upward so that it is costlier than p since
+      ** pTemplate is a proper subset of p */
+      pTemplate->rRun = p->rRun;
+      pTemplate->nOut = p->nOut + 1;
+    }
+  }
+}
+
+/*
+** Search the list of WhereLoops in *ppPrev looking for one that can be
+** supplanted by pTemplate.
+**
+** Return NULL if the WhereLoop list contains an entry that can supplant
+** pTemplate, in other words if pTemplate does not belong on the list.
+**
+** If pX is a WhereLoop that pTemplate can supplant, then return the
+** link that points to pX.
+**
+** If pTemplate cannot supplant any existing element of the list but needs
+** to be added to the list, then return a pointer to the tail of the list.
+*/
+static WhereLoop **whereLoopFindLesser(
+  WhereLoop **ppPrev,
+  const WhereLoop *pTemplate
+){
+  WhereLoop *p;
+  for(p=(*ppPrev); p; ppPrev=&p->pNextLoop, p=*ppPrev){
+    if( p->iTab!=pTemplate->iTab || p->iSortIdx!=pTemplate->iSortIdx ){
+      /* If either the iTab or iSortIdx values for two WhereLoop are different
+      ** then those WhereLoops need to be considered separately.  Neither is
+      ** a candidate to replace the other. */
+      continue;
+    }
+    /* In the current implementation, the rSetup value is either zero
+    ** or the cost of building an automatic index (NlogN) and the NlogN
+    ** is the same for compatible WhereLoops. */
+    assert( p->rSetup==0 || pTemplate->rSetup==0 
+                 || p->rSetup==pTemplate->rSetup );
+
+    /* whereLoopAddBtree() always generates and inserts the automatic index
+    ** case first.  Hence compatible candidate WhereLoops never have a larger
+    ** rSetup. Call this SETUP-INVARIANT */
+    assert( p->rSetup>=pTemplate->rSetup );
+
+    /* If existing WhereLoop p is better than pTemplate, pTemplate can be
+    ** discarded.  WhereLoop p is better if:
+    **   (1)  p has no more dependencies than pTemplate, and
+    **   (2)  p has an equal or lower cost than pTemplate
+    */
+    if( (p->prereq & pTemplate->prereq)==p->prereq    /* (1)  */
+     && p->rSetup<=pTemplate->rSetup                  /* (2a) */
+     && p->rRun<=pTemplate->rRun                      /* (2b) */
+     && p->nOut<=pTemplate->nOut                      /* (2c) */
+    ){
+      return 0;  /* Discard pTemplate */
+    }
+
+    /* If pTemplate is always better than p, then cause p to be overwritten
+    ** with pTemplate.  pTemplate is better than p if:
+    **   (1)  pTemplate has no more dependences than p, and
+    **   (2)  pTemplate has an equal or lower cost than p.
+    */
+    if( (p->prereq & pTemplate->prereq)==pTemplate->prereq   /* (1)  */
+     && p->rRun>=pTemplate->rRun                             /* (2a) */
+     && p->nOut>=pTemplate->nOut                             /* (2b) */
+    ){
+      assert( p->rSetup>=pTemplate->rSetup ); /* SETUP-INVARIANT above */
+      break;   /* Cause p to be overwritten by pTemplate */
+    }
+  }
+  return ppPrev;
+}
+
+/*
+** Insert or replace a WhereLoop entry using the template supplied.
+**
+** An existing WhereLoop entry might be overwritten if the new template
+** is better and has fewer dependencies.  Or the template will be ignored
+** and no insert will occur if an existing WhereLoop is faster and has
+** fewer dependencies than the template.  Otherwise a new WhereLoop is
+** added based on the template.
+**
+** If pBuilder->pOrSet is not NULL then we care about only the
+** prerequisites and rRun and nOut costs of the N best loops.  That
+** information is gathered in the pBuilder->pOrSet object.  This special
+** processing mode is used only for OR clause processing.
+**
+** When accumulating multiple loops (when pBuilder->pOrSet is NULL) we
+** still might overwrite similar loops with the new template if the
+** new template is better.  Loops may be overwritten if the following 
+** conditions are met:
+**
+**    (1)  They have the same iTab.
+**    (2)  They have the same iSortIdx.
+**    (3)  The template has same or fewer dependencies than the current loop
+**    (4)  The template has the same or lower cost than the current loop
+*/
+static int whereLoopInsert(WhereLoopBuilder *pBuilder, WhereLoop *pTemplate){
+  WhereLoop **ppPrev, *p;
+  WhereInfo *pWInfo = pBuilder->pWInfo;
+  sqlite3 *db = pWInfo->pParse->db;
+
+  /* If pBuilder->pOrSet is defined, then only keep track of the costs
+  ** and prereqs.
+  */
+  if( pBuilder->pOrSet!=0 ){
+#if WHERETRACE_ENABLED
+    u16 n = pBuilder->pOrSet->n;
+    int x =
+#endif
+    whereOrInsert(pBuilder->pOrSet, pTemplate->prereq, pTemplate->rRun,
+                                    pTemplate->nOut);
+#if WHERETRACE_ENABLED /* 0x8 */
+    if( sqlite3WhereTrace & 0x8 ){
+      sqlite3DebugPrintf(x?"   or-%d:  ":"   or-X:  ", n);
+      whereLoopPrint(pTemplate, pBuilder->pWC);
+    }
+#endif
+    return SQLITE_OK;
+  }
+
+  /* Look for an existing WhereLoop to replace with pTemplate
+  */
+  whereLoopAdjustCost(pWInfo->pLoops, pTemplate);
+  ppPrev = whereLoopFindLesser(&pWInfo->pLoops, pTemplate);
+
+  if( ppPrev==0 ){
+    /* There already exists a WhereLoop on the list that is better
+    ** than pTemplate, so just ignore pTemplate */
+#if WHERETRACE_ENABLED /* 0x8 */
+    if( sqlite3WhereTrace & 0x8 ){
+      sqlite3DebugPrintf("ins-noop: ");
+      whereLoopPrint(pTemplate, pBuilder->pWC);
+    }
+#endif
+    return SQLITE_OK;  
+  }else{
+    p = *ppPrev;
+  }
+
+  /* If we reach this point it means that either p[] should be overwritten
+  ** with pTemplate[] if p[] exists, or if p==NULL then allocate a new
+  ** WhereLoop and insert it.
+  */
+#if WHERETRACE_ENABLED /* 0x8 */
+  if( sqlite3WhereTrace & 0x8 ){
+    if( p!=0 ){
+      sqlite3DebugPrintf("ins-del:  ");
+      whereLoopPrint(p, pBuilder->pWC);
+    }
+    sqlite3DebugPrintf("ins-new:  ");
+    whereLoopPrint(pTemplate, pBuilder->pWC);
+  }
+#endif
+  if( p==0 ){
+    /* Allocate a new WhereLoop to add to the end of the list */
+    *ppPrev = p = sqlite3DbMallocRaw(db, sizeof(WhereLoop));
+    if( p==0 ) return SQLITE_NOMEM;
+    whereLoopInit(p);
+    p->pNextLoop = 0;
+  }else{
+    /* We will be overwriting WhereLoop p[].  But before we do, first
+    ** go through the rest of the list and delete any other entries besides
+    ** p[] that are also supplated by pTemplate */
+    WhereLoop **ppTail = &p->pNextLoop;
+    WhereLoop *pToDel;
+    while( *ppTail ){
+      ppTail = whereLoopFindLesser(ppTail, pTemplate);
+      if( NEVER(ppTail==0) ) break;
+      pToDel = *ppTail;
+      if( pToDel==0 ) break;
+      *ppTail = pToDel->pNextLoop;
+#if WHERETRACE_ENABLED /* 0x8 */
+      if( sqlite3WhereTrace & 0x8 ){
+        sqlite3DebugPrintf("ins-del: ");
+        whereLoopPrint(pToDel, pBuilder->pWC);
+      }
+#endif
+      whereLoopDelete(db, pToDel);
+    }
+  }
+  whereLoopXfer(db, p, pTemplate);
+  if( (p->wsFlags & WHERE_VIRTUALTABLE)==0 ){
+    Index *pIndex = p->u.btree.pIndex;
+    if( pIndex && pIndex->tnum==0 ){
+      p->u.btree.pIndex = 0;
+    }
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Adjust the WhereLoop.nOut value downward to account for terms of the
+** WHERE clause that reference the loop but which are not used by an
+** index.
+**
+** In the current implementation, the first extra WHERE clause term reduces
+** the number of output rows by a factor of 10 and each additional term
+** reduces the number of output rows by sqrt(2).
+*/
+static void whereLoopOutputAdjust(WhereClause *pWC, WhereLoop *pLoop){
+  WhereTerm *pTerm, *pX;
+  Bitmask notAllowed = ~(pLoop->prereq|pLoop->maskSelf);
+  int i, j;
+
+  if( !OptimizationEnabled(pWC->pWInfo->pParse->db, SQLITE_AdjustOutEst) ){
+    return;
+  }
+  for(i=pWC->nTerm, pTerm=pWC->a; i>0; i--, pTerm++){
+    if( (pTerm->wtFlags & TERM_VIRTUAL)!=0 ) break;
+    if( (pTerm->prereqAll & pLoop->maskSelf)==0 ) continue;
+    if( (pTerm->prereqAll & notAllowed)!=0 ) continue;
+    for(j=pLoop->nLTerm-1; j>=0; j--){
+      pX = pLoop->aLTerm[j];
+      if( pX==0 ) continue;
+      if( pX==pTerm ) break;
+      if( pX->iParent>=0 && (&pWC->a[pX->iParent])==pTerm ) break;
+    }
+    if( j<0 ){
+      pLoop->nOut += (pTerm->truthProb<=0 ? pTerm->truthProb : -1);
+    }
+  }
+}
+
+/*
+** We have so far matched pBuilder->pNew->u.btree.nEq terms of the 
+** index pIndex. Try to match one more.
+**
+** When this function is called, pBuilder->pNew->nOut contains the 
+** number of rows expected to be visited by filtering using the nEq 
+** terms only. If it is modified, this value is restored before this 
+** function returns.
+**
+** If pProbe->tnum==0, that means pIndex is a fake index used for the
+** INTEGER PRIMARY KEY.
+*/
+static int whereLoopAddBtreeIndex(
+  WhereLoopBuilder *pBuilder,     /* The WhereLoop factory */
+  struct SrcList_item *pSrc,      /* FROM clause term being analyzed */
+  Index *pProbe,                  /* An index on pSrc */
+  LogEst nInMul                   /* log(Number of iterations due to IN) */
+){
+  WhereInfo *pWInfo = pBuilder->pWInfo;  /* WHERE analyse context */
+  Parse *pParse = pWInfo->pParse;        /* Parsing context */
+  sqlite3 *db = pParse->db;       /* Database connection malloc context */
+  WhereLoop *pNew;                /* Template WhereLoop under construction */
+  WhereTerm *pTerm;               /* A WhereTerm under consideration */
+  int opMask;                     /* Valid operators for constraints */
+  WhereScan scan;                 /* Iterator for WHERE terms */
+  Bitmask saved_prereq;           /* Original value of pNew->prereq */
+  u16 saved_nLTerm;               /* Original value of pNew->nLTerm */
+  u16 saved_nEq;                  /* Original value of pNew->u.btree.nEq */
+  u16 saved_nSkip;                /* Original value of pNew->u.btree.nSkip */
+  u32 saved_wsFlags;              /* Original value of pNew->wsFlags */
+  LogEst saved_nOut;              /* Original value of pNew->nOut */
+  int iCol;                       /* Index of the column in the table */
+  int rc = SQLITE_OK;             /* Return code */
+  LogEst rLogSize;                /* Logarithm of table size */
+  WhereTerm *pTop = 0, *pBtm = 0; /* Top and bottom range constraints */
+
+  pNew = pBuilder->pNew;
+  if( db->mallocFailed ) return SQLITE_NOMEM;
+
+  assert( (pNew->wsFlags & WHERE_VIRTUALTABLE)==0 );
+  assert( (pNew->wsFlags & WHERE_TOP_LIMIT)==0 );
+  if( pNew->wsFlags & WHERE_BTM_LIMIT ){
+    opMask = WO_LT|WO_LE;
+  }else if( pProbe->tnum<=0 || (pSrc->jointype & JT_LEFT)!=0 ){
+    opMask = WO_EQ|WO_IN|WO_GT|WO_GE|WO_LT|WO_LE;
+  }else{
+    opMask = WO_EQ|WO_IN|WO_ISNULL|WO_GT|WO_GE|WO_LT|WO_LE;
+  }
+  if( pProbe->bUnordered ) opMask &= ~(WO_GT|WO_GE|WO_LT|WO_LE);
+
+  assert( pNew->u.btree.nEq<=pProbe->nKeyCol );
+  if( pNew->u.btree.nEq < pProbe->nKeyCol ){
+    iCol = pProbe->aiColumn[pNew->u.btree.nEq];
+  }else{
+    iCol = -1;
+  }
+  pTerm = whereScanInit(&scan, pBuilder->pWC, pSrc->iCursor, iCol,
+                        opMask, pProbe);
+  saved_nEq = pNew->u.btree.nEq;
+  saved_nSkip = pNew->u.btree.nSkip;
+  saved_nLTerm = pNew->nLTerm;
+  saved_wsFlags = pNew->wsFlags;
+  saved_prereq = pNew->prereq;
+  saved_nOut = pNew->nOut;
+  pNew->rSetup = 0;
+  rLogSize = estLog(pProbe->aiRowLogEst[0]);
+
+  /* Consider using a skip-scan if there are no WHERE clause constraints
+  ** available for the left-most terms of the index, and if the average
+  ** number of repeats in the left-most terms is at least 18. 
+  **
+  ** The magic number 18 is selected on the basis that scanning 17 rows
+  ** is almost always quicker than an index seek (even though if the index
+  ** contains fewer than 2^17 rows we assume otherwise in other parts of
+  ** the code). And, even if it is not, it should not be too much slower. 
+  ** On the other hand, the extra seeks could end up being significantly
+  ** more expensive.  */
+  assert( 42==sqlite3LogEst(18) );
+  if( pTerm==0
+   && saved_nEq==saved_nSkip
+   && saved_nEq+1<pProbe->nKeyCol
+   && pProbe->aiRowLogEst[saved_nEq+1]>=42  /* TUNING: Minimum for skip-scan */
+   && (rc = whereLoopResize(db, pNew, pNew->nLTerm+1))==SQLITE_OK
+  ){
+    LogEst nIter;
+    pNew->u.btree.nEq++;
+    pNew->u.btree.nSkip++;
+    pNew->aLTerm[pNew->nLTerm++] = 0;
+    pNew->wsFlags |= WHERE_SKIPSCAN;
+    nIter = pProbe->aiRowLogEst[saved_nEq] - pProbe->aiRowLogEst[saved_nEq+1];
+    pNew->nOut -= nIter;
+    whereLoopAddBtreeIndex(pBuilder, pSrc, pProbe, nIter + nInMul);
+    pNew->nOut = saved_nOut;
+  }
+  for(; rc==SQLITE_OK && pTerm!=0; pTerm = whereScanNext(&scan)){
+    u16 eOp = pTerm->eOperator;   /* Shorthand for pTerm->eOperator */
+    LogEst rCostIdx;
+    LogEst nOutUnadjusted;        /* nOut before IN() and WHERE adjustments */
+    int nIn = 0;
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+    int nRecValid = pBuilder->nRecValid;
+#endif
+    if( (eOp==WO_ISNULL || (pTerm->wtFlags&TERM_VNULL)!=0)
+     && (iCol<0 || pSrc->pTab->aCol[iCol].notNull)
+    ){
+      continue; /* ignore IS [NOT] NULL constraints on NOT NULL columns */
+    }
+    if( pTerm->prereqRight & pNew->maskSelf ) continue;
+
+    pNew->wsFlags = saved_wsFlags;
+    pNew->u.btree.nEq = saved_nEq;
+    pNew->nLTerm = saved_nLTerm;
+    if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
+    pNew->aLTerm[pNew->nLTerm++] = pTerm;
+    pNew->prereq = (saved_prereq | pTerm->prereqRight) & ~pNew->maskSelf;
+
+    assert( nInMul==0
+        || (pNew->wsFlags & WHERE_COLUMN_NULL)!=0 
+        || (pNew->wsFlags & WHERE_COLUMN_IN)!=0 
+        || (pNew->wsFlags & WHERE_SKIPSCAN)!=0 
+    );
+
+    if( eOp & WO_IN ){
+      Expr *pExpr = pTerm->pExpr;
+      pNew->wsFlags |= WHERE_COLUMN_IN;
+      if( ExprHasProperty(pExpr, EP_xIsSelect) ){
+        /* "x IN (SELECT ...)":  TUNING: the SELECT returns 25 rows */
+        nIn = 46;  assert( 46==sqlite3LogEst(25) );
+      }else if( ALWAYS(pExpr->x.pList && pExpr->x.pList->nExpr) ){
+        /* "x IN (value, value, ...)" */
+        nIn = sqlite3LogEst(pExpr->x.pList->nExpr);
+      }
+      assert( nIn>0 );  /* RHS always has 2 or more terms...  The parser
+                        ** changes "x IN (?)" into "x=?". */
+
+    }else if( eOp & (WO_EQ) ){
+      pNew->wsFlags |= WHERE_COLUMN_EQ;
+      if( iCol<0 || (nInMul==0 && pNew->u.btree.nEq==pProbe->nKeyCol-1) ){
+        if( iCol>=0 && pProbe->onError==OE_None ){
+          pNew->wsFlags |= WHERE_UNQ_WANTED;
+        }else{
+          pNew->wsFlags |= WHERE_ONEROW;
+        }
+      }
+    }else if( eOp & WO_ISNULL ){
+      pNew->wsFlags |= WHERE_COLUMN_NULL;
+    }else if( eOp & (WO_GT|WO_GE) ){
+      testcase( eOp & WO_GT );
+      testcase( eOp & WO_GE );
+      pNew->wsFlags |= WHERE_COLUMN_RANGE|WHERE_BTM_LIMIT;
+      pBtm = pTerm;
+      pTop = 0;
+    }else{
+      assert( eOp & (WO_LT|WO_LE) );
+      testcase( eOp & WO_LT );
+      testcase( eOp & WO_LE );
+      pNew->wsFlags |= WHERE_COLUMN_RANGE|WHERE_TOP_LIMIT;
+      pTop = pTerm;
+      pBtm = (pNew->wsFlags & WHERE_BTM_LIMIT)!=0 ?
+                     pNew->aLTerm[pNew->nLTerm-2] : 0;
+    }
+
+    /* At this point pNew->nOut is set to the number of rows expected to
+    ** be visited by the index scan before considering term pTerm, or the
+    ** values of nIn and nInMul. In other words, assuming that all 
+    ** "x IN(...)" terms are replaced with "x = ?". This block updates
+    ** the value of pNew->nOut to account for pTerm (but not nIn/nInMul).  */
+    assert( pNew->nOut==saved_nOut );
+    if( pNew->wsFlags & WHERE_COLUMN_RANGE ){
+      /* Adjust nOut using stat3/stat4 data. Or, if there is no stat3/stat4
+      ** data, using some other estimate.  */
+      whereRangeScanEst(pParse, pBuilder, pBtm, pTop, pNew);
+    }else{
+      int nEq = ++pNew->u.btree.nEq;
+      assert( eOp & (WO_ISNULL|WO_EQ|WO_IN) );
+
+      assert( pNew->nOut==saved_nOut );
+      if( pTerm->truthProb<=0 && iCol>=0 ){
+        assert( (eOp & WO_IN) || nIn==0 );
+        testcase( eOp & WO_IN );
+        pNew->nOut += pTerm->truthProb;
+        pNew->nOut -= nIn;
+      }else{
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+        tRowcnt nOut = 0;
+        if( nInMul==0 
+         && pProbe->nSample 
+         && pNew->u.btree.nEq<=pProbe->nSampleCol
+         && OptimizationEnabled(db, SQLITE_Stat3) 
+         && ((eOp & WO_IN)==0 || !ExprHasProperty(pTerm->pExpr, EP_xIsSelect))
+        ){
+          Expr *pExpr = pTerm->pExpr;
+          if( (eOp & (WO_EQ|WO_ISNULL))!=0 ){
+            testcase( eOp & WO_EQ );
+            testcase( eOp & WO_ISNULL );
+            rc = whereEqualScanEst(pParse, pBuilder, pExpr->pRight, &nOut);
+          }else{
+            rc = whereInScanEst(pParse, pBuilder, pExpr->x.pList, &nOut);
+          }
+          assert( rc!=SQLITE_OK || nOut>0 );
+          if( rc==SQLITE_NOTFOUND ) rc = SQLITE_OK;
+          if( rc!=SQLITE_OK ) break;          /* Jump out of the pTerm loop */
+          if( nOut ){
+            pNew->nOut = sqlite3LogEst(nOut);
+            if( pNew->nOut>saved_nOut ) pNew->nOut = saved_nOut;
+            pNew->nOut -= nIn;
+          }
+        }
+        if( nOut==0 )
+#endif
+        {
+          pNew->nOut += (pProbe->aiRowLogEst[nEq] - pProbe->aiRowLogEst[nEq-1]);
+          if( eOp & WO_ISNULL ){
+            /* TUNING: If there is no likelihood() value, assume that a 
+            ** "col IS NULL" expression matches twice as many rows 
+            ** as (col=?). */
+            pNew->nOut += 10;
+          }
+        }
+      }
+    }
+
+    /* Set rCostIdx to the cost of visiting selected rows in index. Add
+    ** it to pNew->rRun, which is currently set to the cost of the index
+    ** seek only. Then, if this is a non-covering index, add the cost of
+    ** visiting the rows in the main table.  */
+    rCostIdx = pNew->nOut + 1 + (15*pProbe->szIdxRow)/pSrc->pTab->szTabRow;
+    pNew->rRun = sqlite3LogEstAdd(rLogSize, rCostIdx);
+    if( (pNew->wsFlags & (WHERE_IDX_ONLY|WHERE_IPK))==0 ){
+      pNew->rRun = sqlite3LogEstAdd(pNew->rRun, pNew->nOut + 16);
+    }
+
+    nOutUnadjusted = pNew->nOut;
+    pNew->rRun += nInMul + nIn;
+    pNew->nOut += nInMul + nIn;
+    whereLoopOutputAdjust(pBuilder->pWC, pNew);
+    rc = whereLoopInsert(pBuilder, pNew);
+
+    if( pNew->wsFlags & WHERE_COLUMN_RANGE ){
+      pNew->nOut = saved_nOut;
+    }else{
+      pNew->nOut = nOutUnadjusted;
+    }
+
+    if( (pNew->wsFlags & WHERE_TOP_LIMIT)==0
+     && pNew->u.btree.nEq<(pProbe->nKeyCol + (pProbe->zName!=0))
+    ){
+      whereLoopAddBtreeIndex(pBuilder, pSrc, pProbe, nInMul+nIn);
+    }
+    pNew->nOut = saved_nOut;
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+    pBuilder->nRecValid = nRecValid;
+#endif
+  }
+  pNew->prereq = saved_prereq;
+  pNew->u.btree.nEq = saved_nEq;
+  pNew->u.btree.nSkip = saved_nSkip;
+  pNew->wsFlags = saved_wsFlags;
+  pNew->nOut = saved_nOut;
+  pNew->nLTerm = saved_nLTerm;
+  return rc;
+}
+
+/*
+** Return True if it is possible that pIndex might be useful in
+** implementing the ORDER BY clause in pBuilder.
+**
+** Return False if pBuilder does not contain an ORDER BY clause or
+** if there is no way for pIndex to be useful in implementing that
+** ORDER BY clause.
+*/
+static int indexMightHelpWithOrderBy(
+  WhereLoopBuilder *pBuilder,
+  Index *pIndex,
+  int iCursor
+){
+  ExprList *pOB;
+  int ii, jj;
+
+  if( pIndex->bUnordered ) return 0;
+  if( (pOB = pBuilder->pWInfo->pOrderBy)==0 ) return 0;
+  for(ii=0; ii<pOB->nExpr; ii++){
+    Expr *pExpr = sqlite3ExprSkipCollate(pOB->a[ii].pExpr);
+    if( pExpr->op!=TK_COLUMN ) return 0;
+    if( pExpr->iTable==iCursor ){
+      for(jj=0; jj<pIndex->nKeyCol; jj++){
+        if( pExpr->iColumn==pIndex->aiColumn[jj] ) return 1;
+      }
+    }
+  }
+  return 0;
+}
+
+/*
+** Return a bitmask where 1s indicate that the corresponding column of
+** the table is used by an index.  Only the first 63 columns are considered.
+*/
+static Bitmask columnsInIndex(Index *pIdx){
+  Bitmask m = 0;
+  int j;
+  for(j=pIdx->nColumn-1; j>=0; j--){
+    int x = pIdx->aiColumn[j];
+    if( x>=0 ){
+      testcase( x==BMS-1 );
+      testcase( x==BMS-2 );
+      if( x<BMS-1 ) m |= MASKBIT(x);
+    }
+  }
+  return m;
+}
+
+/* Check to see if a partial index with pPartIndexWhere can be used
+** in the current query.  Return true if it can be and false if not.
+*/
+static int whereUsablePartialIndex(int iTab, WhereClause *pWC, Expr *pWhere){
+  int i;
+  WhereTerm *pTerm;
+  for(i=0, pTerm=pWC->a; i<pWC->nTerm; i++, pTerm++){
+    if( sqlite3ExprImpliesExpr(pTerm->pExpr, pWhere, iTab) ) return 1;
+  }
+  return 0;
+}
+
+/*
+** Add all WhereLoop objects for a single table of the join where the table
+** is idenfied by pBuilder->pNew->iTab.  That table is guaranteed to be
+** a b-tree table, not a virtual table.
+**
+** The costs (WhereLoop.rRun) of the b-tree loops added by this function
+** are calculated as follows:
+**
+** For a full scan, assuming the table (or index) contains nRow rows:
+**
+**     cost = nRow * 3.0                    // full-table scan
+**     cost = nRow * K                      // scan of covering index
+**     cost = nRow * (K+3.0)                // scan of non-covering index
+**
+** where K is a value between 1.1 and 3.0 set based on the relative 
+** estimated average size of the index and table records.
+**
+** For an index scan, where nVisit is the number of index rows visited
+** by the scan, and nSeek is the number of seek operations required on 
+** the index b-tree:
+**
+**     cost = nSeek * (log(nRow) + K * nVisit)          // covering index
+**     cost = nSeek * (log(nRow) + (K+3.0) * nVisit)    // non-covering index
+**
+** Normally, nSeek is 1. nSeek values greater than 1 come about if the 
+** WHERE clause includes "x IN (....)" terms used in place of "x=?". Or when 
+** implicit "x IN (SELECT x FROM tbl)" terms are added for skip-scans.
+*/
+static int whereLoopAddBtree(
+  WhereLoopBuilder *pBuilder, /* WHERE clause information */
+  Bitmask mExtra              /* Extra prerequesites for using this table */
+){
+  WhereInfo *pWInfo;          /* WHERE analysis context */
+  Index *pProbe;              /* An index we are evaluating */
+  Index sPk;                  /* A fake index object for the primary key */
+  LogEst aiRowEstPk[2];       /* The aiRowLogEst[] value for the sPk index */
+  i16 aiColumnPk = -1;        /* The aColumn[] value for the sPk index */
+  SrcList *pTabList;          /* The FROM clause */
+  struct SrcList_item *pSrc;  /* The FROM clause btree term to add */
+  WhereLoop *pNew;            /* Template WhereLoop object */
+  int rc = SQLITE_OK;         /* Return code */
+  int iSortIdx = 1;           /* Index number */
+  int b;                      /* A boolean value */
+  LogEst rSize;               /* number of rows in the table */
+  LogEst rLogSize;            /* Logarithm of the number of rows in the table */
+  WhereClause *pWC;           /* The parsed WHERE clause */
+  Table *pTab;                /* Table being queried */
+  
+  pNew = pBuilder->pNew;
+  pWInfo = pBuilder->pWInfo;
+  pTabList = pWInfo->pTabList;
+  pSrc = pTabList->a + pNew->iTab;
+  pTab = pSrc->pTab;
+  pWC = pBuilder->pWC;
+  assert( !IsVirtual(pSrc->pTab) );
+
+  if( pSrc->pIndex ){
+    /* An INDEXED BY clause specifies a particular index to use */
+    pProbe = pSrc->pIndex;
+  }else if( !HasRowid(pTab) ){
+    pProbe = pTab->pIndex;
+  }else{
+    /* There is no INDEXED BY clause.  Create a fake Index object in local
+    ** variable sPk to represent the rowid primary key index.  Make this
+    ** fake index the first in a chain of Index objects with all of the real
+    ** indices to follow */
+    Index *pFirst;                  /* First of real indices on the table */
+    memset(&sPk, 0, sizeof(Index));
+    sPk.nKeyCol = 1;
+    sPk.aiColumn = &aiColumnPk;
+    sPk.aiRowLogEst = aiRowEstPk;
+    sPk.onError = OE_Replace;
+    sPk.pTable = pTab;
+    sPk.szIdxRow = pTab->szTabRow;
+    aiRowEstPk[0] = pTab->nRowLogEst;
+    aiRowEstPk[1] = 0;
+    pFirst = pSrc->pTab->pIndex;
+    if( pSrc->notIndexed==0 ){
+      /* The real indices of the table are only considered if the
+      ** NOT INDEXED qualifier is omitted from the FROM clause */
+      sPk.pNext = pFirst;
+    }
+    pProbe = &sPk;
+  }
+  rSize = pTab->nRowLogEst;
+  rLogSize = estLog(rSize);
+
+#ifndef SQLITE_OMIT_AUTOMATIC_INDEX
+  /* Automatic indexes */
+  if( !pBuilder->pOrSet
+   && (pWInfo->pParse->db->flags & SQLITE_AutoIndex)!=0
+   && pSrc->pIndex==0
+   && !pSrc->viaCoroutine
+   && !pSrc->notIndexed
+   && HasRowid(pTab)
+   && !pSrc->isCorrelated
+   && !pSrc->isRecursive
+  ){
+    /* Generate auto-index WhereLoops */
+    WhereTerm *pTerm;
+    WhereTerm *pWCEnd = pWC->a + pWC->nTerm;
+    for(pTerm=pWC->a; rc==SQLITE_OK && pTerm<pWCEnd; pTerm++){
+      if( pTerm->prereqRight & pNew->maskSelf ) continue;
+      if( termCanDriveIndex(pTerm, pSrc, 0) ){
+        pNew->u.btree.nEq = 1;
+        pNew->u.btree.nSkip = 0;
+        pNew->u.btree.pIndex = 0;
+        pNew->nLTerm = 1;
+        pNew->aLTerm[0] = pTerm;
+        /* TUNING: One-time cost for computing the automatic index is
+        ** approximately 7*N*log2(N) where N is the number of rows in
+        ** the table being indexed. */
+        pNew->rSetup = rLogSize + rSize + 28;  assert( 28==sqlite3LogEst(7) );
+        /* TUNING: Each index lookup yields 20 rows in the table.  This
+        ** is more than the usual guess of 10 rows, since we have no way
+        ** of knowning how selective the index will ultimately be.  It would
+        ** not be unreasonable to make this value much larger. */
+        pNew->nOut = 43;  assert( 43==sqlite3LogEst(20) );
+        pNew->rRun = sqlite3LogEstAdd(rLogSize,pNew->nOut);
+        pNew->wsFlags = WHERE_AUTO_INDEX;
+        pNew->prereq = mExtra | pTerm->prereqRight;
+        rc = whereLoopInsert(pBuilder, pNew);
+      }
+    }
+  }
+#endif /* SQLITE_OMIT_AUTOMATIC_INDEX */
+
+  /* Loop over all indices
+  */
+  for(; rc==SQLITE_OK && pProbe; pProbe=pProbe->pNext, iSortIdx++){
+    if( pProbe->pPartIdxWhere!=0
+     && !whereUsablePartialIndex(pNew->iTab, pWC, pProbe->pPartIdxWhere) ){
+      continue;  /* Partial index inappropriate for this query */
+    }
+    rSize = pProbe->aiRowLogEst[0];
+    pNew->u.btree.nEq = 0;
+    pNew->u.btree.nSkip = 0;
+    pNew->nLTerm = 0;
+    pNew->iSortIdx = 0;
+    pNew->rSetup = 0;
+    pNew->prereq = mExtra;
+    pNew->nOut = rSize;
+    pNew->u.btree.pIndex = pProbe;
+    b = indexMightHelpWithOrderBy(pBuilder, pProbe, pSrc->iCursor);
+    /* The ONEPASS_DESIRED flags never occurs together with ORDER BY */
+    assert( (pWInfo->wctrlFlags & WHERE_ONEPASS_DESIRED)==0 || b==0 );
+    if( pProbe->tnum<=0 ){
+      /* Integer primary key index */
+      pNew->wsFlags = WHERE_IPK;
+
+      /* Full table scan */
+      pNew->iSortIdx = b ? iSortIdx : 0;
+      /* TUNING: Cost of full table scan is (N*3.0). */
+      pNew->rRun = rSize + 16;
+      whereLoopOutputAdjust(pWC, pNew);
+      rc = whereLoopInsert(pBuilder, pNew);
+      pNew->nOut = rSize;
+      if( rc ) break;
+    }else{
+      Bitmask m;
+      if( pProbe->isCovering ){
+        pNew->wsFlags = WHERE_IDX_ONLY | WHERE_INDEXED;
+        m = 0;
+      }else{
+        m = pSrc->colUsed & ~columnsInIndex(pProbe);
+        pNew->wsFlags = (m==0) ? (WHERE_IDX_ONLY|WHERE_INDEXED) : WHERE_INDEXED;
+      }
+
+      /* Full scan via index */
+      if( b
+       || !HasRowid(pTab)
+       || ( m==0
+         && pProbe->bUnordered==0
+         && (pProbe->szIdxRow<pTab->szTabRow)
+         && (pWInfo->wctrlFlags & WHERE_ONEPASS_DESIRED)==0
+         && sqlite3GlobalConfig.bUseCis
+         && OptimizationEnabled(pWInfo->pParse->db, SQLITE_CoverIdxScan)
+          )
+      ){
+        pNew->iSortIdx = b ? iSortIdx : 0;
+
+        /* The cost of visiting the index rows is N*K, where K is
+        ** between 1.1 and 3.0, depending on the relative sizes of the
+        ** index and table rows. If this is a non-covering index scan,
+        ** also add the cost of visiting table rows (N*3.0).  */
+        pNew->rRun = rSize + 1 + (15*pProbe->szIdxRow)/pTab->szTabRow;
+        if( m!=0 ){
+          pNew->rRun = sqlite3LogEstAdd(pNew->rRun, rSize+16);
+        }
+
+        whereLoopOutputAdjust(pWC, pNew);
+        rc = whereLoopInsert(pBuilder, pNew);
+        pNew->nOut = rSize;
+        if( rc ) break;
+      }
+    }
+
+    rc = whereLoopAddBtreeIndex(pBuilder, pSrc, pProbe, 0);
+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
+    sqlite3Stat4ProbeFree(pBuilder->pRec);
+    pBuilder->nRecValid = 0;
+    pBuilder->pRec = 0;
+#endif
+
+    /* If there was an INDEXED BY clause, then only that one index is
+    ** considered. */
+    if( pSrc->pIndex ) break;
+  }
+  return rc;
+}
+
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+/*
+** Add all WhereLoop objects for a table of the join identified by
+** pBuilder->pNew->iTab.  That table is guaranteed to be a virtual table.
+*/
+static int whereLoopAddVirtual(
+  WhereLoopBuilder *pBuilder,  /* WHERE clause information */
+  Bitmask mExtra
+){
+  WhereInfo *pWInfo;           /* WHERE analysis context */
+  Parse *pParse;               /* The parsing context */
+  WhereClause *pWC;            /* The WHERE clause */
+  struct SrcList_item *pSrc;   /* The FROM clause term to search */
+  Table *pTab;
+  sqlite3 *db;
+  sqlite3_index_info *pIdxInfo;
+  struct sqlite3_index_constraint *pIdxCons;
+  struct sqlite3_index_constraint_usage *pUsage;
+  WhereTerm *pTerm;
+  int i, j;
+  int iTerm, mxTerm;
+  int nConstraint;
+  int seenIn = 0;              /* True if an IN operator is seen */
+  int seenVar = 0;             /* True if a non-constant constraint is seen */
+  int iPhase;                  /* 0: const w/o IN, 1: const, 2: no IN,  2: IN */
+  WhereLoop *pNew;
+  int rc = SQLITE_OK;
+
+  pWInfo = pBuilder->pWInfo;
+  pParse = pWInfo->pParse;
+  db = pParse->db;
+  pWC = pBuilder->pWC;
+  pNew = pBuilder->pNew;
+  pSrc = &pWInfo->pTabList->a[pNew->iTab];
+  pTab = pSrc->pTab;
+  assert( IsVirtual(pTab) );
+  pIdxInfo = allocateIndexInfo(pParse, pWC, pSrc, pBuilder->pOrderBy);
+  if( pIdxInfo==0 ) return SQLITE_NOMEM;
+  pNew->prereq = 0;
+  pNew->rSetup = 0;
+  pNew->wsFlags = WHERE_VIRTUALTABLE;
+  pNew->nLTerm = 0;
+  pNew->u.vtab.needFree = 0;
+  pUsage = pIdxInfo->aConstraintUsage;
+  nConstraint = pIdxInfo->nConstraint;
+  if( whereLoopResize(db, pNew, nConstraint) ){
+    sqlite3DbFree(db, pIdxInfo);
+    return SQLITE_NOMEM;
+  }
+
+  for(iPhase=0; iPhase<=3; iPhase++){
+    if( !seenIn && (iPhase&1)!=0 ){
+      iPhase++;
+      if( iPhase>3 ) break;
+    }
+    if( !seenVar && iPhase>1 ) break;
+    pIdxCons = *(struct sqlite3_index_constraint**)&pIdxInfo->aConstraint;
+    for(i=0; i<pIdxInfo->nConstraint; i++, pIdxCons++){
+      j = pIdxCons->iTermOffset;
+      pTerm = &pWC->a[j];
+      switch( iPhase ){
+        case 0:    /* Constants without IN operator */
+          pIdxCons->usable = 0;
+          if( (pTerm->eOperator & WO_IN)!=0 ){
+            seenIn = 1;
+          }
+          if( pTerm->prereqRight!=0 ){
+            seenVar = 1;
+          }else if( (pTerm->eOperator & WO_IN)==0 ){
+            pIdxCons->usable = 1;
+          }
+          break;
+        case 1:    /* Constants with IN operators */
+          assert( seenIn );
+          pIdxCons->usable = (pTerm->prereqRight==0);
+          break;
+        case 2:    /* Variables without IN */
+          assert( seenVar );
+          pIdxCons->usable = (pTerm->eOperator & WO_IN)==0;
+          break;
+        default:   /* Variables with IN */
+          assert( seenVar && seenIn );
+          pIdxCons->usable = 1;
+          break;
+      }
+    }
+    memset(pUsage, 0, sizeof(pUsage[0])*pIdxInfo->nConstraint);
+    if( pIdxInfo->needToFreeIdxStr ) sqlite3_free(pIdxInfo->idxStr);
+    pIdxInfo->idxStr = 0;
+    pIdxInfo->idxNum = 0;
+    pIdxInfo->needToFreeIdxStr = 0;
+    pIdxInfo->orderByConsumed = 0;
+    pIdxInfo->estimatedCost = SQLITE_BIG_DBL / (double)2;
+    pIdxInfo->estimatedRows = 25;
+    rc = vtabBestIndex(pParse, pTab, pIdxInfo);
+    if( rc ) goto whereLoopAddVtab_exit;
+    pIdxCons = *(struct sqlite3_index_constraint**)&pIdxInfo->aConstraint;
+    pNew->prereq = mExtra;
+    mxTerm = -1;
+    assert( pNew->nLSlot>=nConstraint );
+    for(i=0; i<nConstraint; i++) pNew->aLTerm[i] = 0;
+    pNew->u.vtab.omitMask = 0;
+    for(i=0; i<nConstraint; i++, pIdxCons++){
+      if( (iTerm = pUsage[i].argvIndex - 1)>=0 ){
+        j = pIdxCons->iTermOffset;
+        if( iTerm>=nConstraint
+         || j<0
+         || j>=pWC->nTerm
+         || pNew->aLTerm[iTerm]!=0
+        ){
+          rc = SQLITE_ERROR;
+          sqlite3ErrorMsg(pParse, "%s.xBestIndex() malfunction", pTab->zName);
+          goto whereLoopAddVtab_exit;
+        }
+        testcase( iTerm==nConstraint-1 );
+        testcase( j==0 );
+        testcase( j==pWC->nTerm-1 );
+        pTerm = &pWC->a[j];
+        pNew->prereq |= pTerm->prereqRight;
+        assert( iTerm<pNew->nLSlot );
+        pNew->aLTerm[iTerm] = pTerm;
+        if( iTerm>mxTerm ) mxTerm = iTerm;
+        testcase( iTerm==15 );
+        testcase( iTerm==16 );
+        if( iTerm<16 && pUsage[i].omit ) pNew->u.vtab.omitMask |= 1<<iTerm;
+        if( (pTerm->eOperator & WO_IN)!=0 ){
+          if( pUsage[i].omit==0 ){
+            /* Do not attempt to use an IN constraint if the virtual table
+            ** says that the equivalent EQ constraint cannot be safely omitted.
+            ** If we do attempt to use such a constraint, some rows might be
+            ** repeated in the output. */
+            break;
+          }
+          /* A virtual table that is constrained by an IN clause may not
+          ** consume the ORDER BY clause because (1) the order of IN terms
+          ** is not necessarily related to the order of output terms and
+          ** (2) Multiple outputs from a single IN value will not merge
+          ** together.  */
+          pIdxInfo->orderByConsumed = 0;
+        }
+      }
+    }
+    if( i>=nConstraint ){
+      pNew->nLTerm = mxTerm+1;
+      assert( pNew->nLTerm<=pNew->nLSlot );
+      pNew->u.vtab.idxNum = pIdxInfo->idxNum;
+      pNew->u.vtab.needFree = pIdxInfo->needToFreeIdxStr;
+      pIdxInfo->needToFreeIdxStr = 0;
+      pNew->u.vtab.idxStr = pIdxInfo->idxStr;
+      pNew->u.vtab.isOrdered = (i8)(pIdxInfo->orderByConsumed ?
+                                      pIdxInfo->nOrderBy : 0);
+      pNew->rSetup = 0;
+      pNew->rRun = sqlite3LogEstFromDouble(pIdxInfo->estimatedCost);
+      pNew->nOut = sqlite3LogEst(pIdxInfo->estimatedRows);
+      whereLoopInsert(pBuilder, pNew);
+      if( pNew->u.vtab.needFree ){
+        sqlite3_free(pNew->u.vtab.idxStr);
+        pNew->u.vtab.needFree = 0;
+      }
+    }
+  }  
+
+whereLoopAddVtab_exit:
+  if( pIdxInfo->needToFreeIdxStr ) sqlite3_free(pIdxInfo->idxStr);
+  sqlite3DbFree(db, pIdxInfo);
+  return rc;
+}
+#endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+/*
+** Add WhereLoop entries to handle OR terms.  This works for either
+** btrees or virtual tables.
+*/
+static int whereLoopAddOr(WhereLoopBuilder *pBuilder, Bitmask mExtra){
+  WhereInfo *pWInfo = pBuilder->pWInfo;
+  WhereClause *pWC;
+  WhereLoop *pNew;
+  WhereTerm *pTerm, *pWCEnd;
+  int rc = SQLITE_OK;
+  int iCur;
+  WhereClause tempWC;
+  WhereLoopBuilder sSubBuild;
+  WhereOrSet sSum, sCur;
+  struct SrcList_item *pItem;
+  
+  pWC = pBuilder->pWC;
+  if( pWInfo->wctrlFlags & WHERE_AND_ONLY ) return SQLITE_OK;
+  pWCEnd = pWC->a + pWC->nTerm;
+  pNew = pBuilder->pNew;
+  memset(&sSum, 0, sizeof(sSum));
+  pItem = pWInfo->pTabList->a + pNew->iTab;
+  iCur = pItem->iCursor;
+
+  for(pTerm=pWC->a; pTerm<pWCEnd && rc==SQLITE_OK; pTerm++){
+    if( (pTerm->eOperator & WO_OR)!=0
+     && (pTerm->u.pOrInfo->indexable & pNew->maskSelf)!=0 
+    ){
+      WhereClause * const pOrWC = &pTerm->u.pOrInfo->wc;
+      WhereTerm * const pOrWCEnd = &pOrWC->a[pOrWC->nTerm];
+      WhereTerm *pOrTerm;
+      int once = 1;
+      int i, j;
+    
+      sSubBuild = *pBuilder;
+      sSubBuild.pOrderBy = 0;
+      sSubBuild.pOrSet = &sCur;
+
+      for(pOrTerm=pOrWC->a; pOrTerm<pOrWCEnd; pOrTerm++){
+        if( (pOrTerm->eOperator & WO_AND)!=0 ){
+          sSubBuild.pWC = &pOrTerm->u.pAndInfo->wc;
+        }else if( pOrTerm->leftCursor==iCur ){
+          tempWC.pWInfo = pWC->pWInfo;
+          tempWC.pOuter = pWC;
+          tempWC.op = TK_AND;
+          tempWC.nTerm = 1;
+          tempWC.a = pOrTerm;
+          sSubBuild.pWC = &tempWC;
+        }else{
+          continue;
+        }
+        sCur.n = 0;
+#ifndef SQLITE_OMIT_VIRTUALTABLE
+        if( IsVirtual(pItem->pTab) ){
+          rc = whereLoopAddVirtual(&sSubBuild, mExtra);
+        }else
+#endif
+        {
+          rc = whereLoopAddBtree(&sSubBuild, mExtra);
+        }
+        assert( rc==SQLITE_OK || sCur.n==0 );
+        if( sCur.n==0 ){
+          sSum.n = 0;
+          break;
+        }else if( once ){
+          whereOrMove(&sSum, &sCur);
+          once = 0;
+        }else{
+          WhereOrSet sPrev;
+          whereOrMove(&sPrev, &sSum);
+          sSum.n = 0;
+          for(i=0; i<sPrev.n; i++){
+            for(j=0; j<sCur.n; j++){
+              whereOrInsert(&sSum, sPrev.a[i].prereq | sCur.a[j].prereq,
+                            sqlite3LogEstAdd(sPrev.a[i].rRun, sCur.a[j].rRun),
+                            sqlite3LogEstAdd(sPrev.a[i].nOut, sCur.a[j].nOut));
+            }
+          }
+        }
+      }
+      pNew->nLTerm = 1;
+      pNew->aLTerm[0] = pTerm;
+      pNew->wsFlags = WHERE_MULTI_OR;
+      pNew->rSetup = 0;
+      pNew->iSortIdx = 0;
+      memset(&pNew->u, 0, sizeof(pNew->u));
+      for(i=0; rc==SQLITE_OK && i<sSum.n; i++){
+        /* TUNING: Currently sSum.a[i].rRun is set to the sum of the costs
+        ** of all sub-scans required by the OR-scan. However, due to rounding
+        ** errors, it may be that the cost of the OR-scan is equal to its
+        ** most expensive sub-scan. Add the smallest possible penalty 
+        ** (equivalent to multiplying the cost by 1.07) to ensure that 
+        ** this does not happen. Otherwise, for WHERE clauses such as the
+        ** following where there is an index on "y":
+        **
+        **     WHERE likelihood(x=?, 0.99) OR y=?
+        **
+        ** the planner may elect to "OR" together a full-table scan and an
+        ** index lookup. And other similarly odd results.  */
+        pNew->rRun = sSum.a[i].rRun + 1;
+        pNew->nOut = sSum.a[i].nOut;
+        pNew->prereq = sSum.a[i].prereq;
+        rc = whereLoopInsert(pBuilder, pNew);
+      }
+    }
+  }
+  return rc;
+}
+
+/*
+** Add all WhereLoop objects for all tables 
+*/
+static int whereLoopAddAll(WhereLoopBuilder *pBuilder){
+  WhereInfo *pWInfo = pBuilder->pWInfo;
+  Bitmask mExtra = 0;
+  Bitmask mPrior = 0;
+  int iTab;
+  SrcList *pTabList = pWInfo->pTabList;
+  struct SrcList_item *pItem;
+  sqlite3 *db = pWInfo->pParse->db;
+  int nTabList = pWInfo->nLevel;
+  int rc = SQLITE_OK;
+  u8 priorJoinType = 0;
+  WhereLoop *pNew;
+
+  /* Loop over the tables in the join, from left to right */
+  pNew = pBuilder->pNew;
+  whereLoopInit(pNew);
+  for(iTab=0, pItem=pTabList->a; iTab<nTabList; iTab++, pItem++){
+    pNew->iTab = iTab;
+    pNew->maskSelf = getMask(&pWInfo->sMaskSet, pItem->iCursor);
+    if( ((pItem->jointype|priorJoinType) & (JT_LEFT|JT_CROSS))!=0 ){
+      mExtra = mPrior;
+    }
+    priorJoinType = pItem->jointype;
+    if( IsVirtual(pItem->pTab) ){
+      rc = whereLoopAddVirtual(pBuilder, mExtra);
+    }else{
+      rc = whereLoopAddBtree(pBuilder, mExtra);
+    }
+    if( rc==SQLITE_OK ){
+      rc = whereLoopAddOr(pBuilder, mExtra);
+    }
+    mPrior |= pNew->maskSelf;
+    if( rc || db->mallocFailed ) break;
+  }
+  whereLoopClear(db, pNew);
+  return rc;
+}
+
+/*
+** Examine a WherePath (with the addition of the extra WhereLoop of the 5th
+** parameters) to see if it outputs rows in the requested ORDER BY
+** (or GROUP BY) without requiring a separate sort operation.  Return N:
+** 
+**   N>0:   N terms of the ORDER BY clause are satisfied
+**   N==0:  No terms of the ORDER BY clause are satisfied
+**   N<0:   Unknown yet how many terms of ORDER BY might be satisfied.   
+**
+** Note that processing for WHERE_GROUPBY and WHERE_DISTINCTBY is not as
+** strict.  With GROUP BY and DISTINCT the only requirement is that
+** equivalent rows appear immediately adjacent to one another.  GROUP BY
+** and DISTINCT do not require rows to appear in any particular order as long
+** as equivelent rows are grouped together.  Thus for GROUP BY and DISTINCT
+** the pOrderBy terms can be matched in any order.  With ORDER BY, the 
+** pOrderBy terms must be matched in strict left-to-right order.
+*/
+static i8 wherePathSatisfiesOrderBy(
+  WhereInfo *pWInfo,    /* The WHERE clause */
+  ExprList *pOrderBy,   /* ORDER BY or GROUP BY or DISTINCT clause to check */
+  WherePath *pPath,     /* The WherePath to check */
+  u16 wctrlFlags,       /* Might contain WHERE_GROUPBY or WHERE_DISTINCTBY */
+  u16 nLoop,            /* Number of entries in pPath->aLoop[] */
+  WhereLoop *pLast,     /* Add this WhereLoop to the end of pPath->aLoop[] */
+  Bitmask *pRevMask     /* OUT: Mask of WhereLoops to run in reverse order */
+){
+  u8 revSet;            /* True if rev is known */
+  u8 rev;               /* Composite sort order */
+  u8 revIdx;            /* Index sort order */
+  u8 isOrderDistinct;   /* All prior WhereLoops are order-distinct */
+  u8 distinctColumns;   /* True if the loop has UNIQUE NOT NULL columns */
+  u8 isMatch;           /* iColumn matches a term of the ORDER BY clause */
+  u16 nKeyCol;          /* Number of key columns in pIndex */
+  u16 nColumn;          /* Total number of ordered columns in the index */
+  u16 nOrderBy;         /* Number terms in the ORDER BY clause */
+  int iLoop;            /* Index of WhereLoop in pPath being processed */
+  int i, j;             /* Loop counters */
+  int iCur;             /* Cursor number for current WhereLoop */
+  int iColumn;          /* A column number within table iCur */
+  WhereLoop *pLoop = 0; /* Current WhereLoop being processed. */
+  WhereTerm *pTerm;     /* A single term of the WHERE clause */
+  Expr *pOBExpr;        /* An expression from the ORDER BY clause */
+  CollSeq *pColl;       /* COLLATE function from an ORDER BY clause term */
+  Index *pIndex;        /* The index associated with pLoop */
+  sqlite3 *db = pWInfo->pParse->db;  /* Database connection */
+  Bitmask obSat = 0;    /* Mask of ORDER BY terms satisfied so far */
+  Bitmask obDone;       /* Mask of all ORDER BY terms */
+  Bitmask orderDistinctMask;  /* Mask of all well-ordered loops */
+  Bitmask ready;              /* Mask of inner loops */
+
+  /*
+  ** We say the WhereLoop is "one-row" if it generates no more than one
+  ** row of output.  A WhereLoop is one-row if all of the following are true:
+  **  (a) All index columns match with WHERE_COLUMN_EQ.
+  **  (b) The index is unique
+  ** Any WhereLoop with an WHERE_COLUMN_EQ constraint on the rowid is one-row.
+  ** Every one-row WhereLoop will have the WHERE_ONEROW bit set in wsFlags.
+  **
+  ** We say the WhereLoop is "order-distinct" if the set of columns from
+  ** that WhereLoop that are in the ORDER BY clause are different for every
+  ** row of the WhereLoop.  Every one-row WhereLoop is automatically
+  ** order-distinct.   A WhereLoop that has no columns in the ORDER BY clause
+  ** is not order-distinct. To be order-distinct is not quite the same as being
+  ** UNIQUE since a UNIQUE column or index can have multiple rows that 
+  ** are NULL and NULL values are equivalent for the purpose of order-distinct.
+  ** To be order-distinct, the columns must be UNIQUE and NOT NULL.
+  **
+  ** The rowid for a table is always UNIQUE and NOT NULL so whenever the
+  ** rowid appears in the ORDER BY clause, the corresponding WhereLoop is
+  ** automatically order-distinct.
+  */
+
+  assert( pOrderBy!=0 );
+  if( nLoop && OptimizationDisabled(db, SQLITE_OrderByIdxJoin) ) return 0;
+
+  nOrderBy = pOrderBy->nExpr;
+  testcase( nOrderBy==BMS-1 );
+  if( nOrderBy>BMS-1 ) return 0;  /* Cannot optimize overly large ORDER BYs */
+  isOrderDistinct = 1;
+  obDone = MASKBIT(nOrderBy)-1;
+  orderDistinctMask = 0;
+  ready = 0;
+  for(iLoop=0; isOrderDistinct && obSat<obDone && iLoop<=nLoop; iLoop++){
+    if( iLoop>0 ) ready |= pLoop->maskSelf;
+    pLoop = iLoop<nLoop ? pPath->aLoop[iLoop] : pLast;
+    if( pLoop->wsFlags & WHERE_VIRTUALTABLE ){
+      if( pLoop->u.vtab.isOrdered ) obSat = obDone;
+      break;
+    }
+    iCur = pWInfo->pTabList->a[pLoop->iTab].iCursor;
+
+    /* Mark off any ORDER BY term X that is a column in the table of
+    ** the current loop for which there is term in the WHERE
+    ** clause of the form X IS NULL or X=? that reference only outer
+    ** loops.
+    */
+    for(i=0; i<nOrderBy; i++){
+      if( MASKBIT(i) & obSat ) continue;
+      pOBExpr = sqlite3ExprSkipCollate(pOrderBy->a[i].pExpr);
+      if( pOBExpr->op!=TK_COLUMN ) continue;
+      if( pOBExpr->iTable!=iCur ) continue;
+      pTerm = findTerm(&pWInfo->sWC, iCur, pOBExpr->iColumn,
+                       ~ready, WO_EQ|WO_ISNULL, 0);
+      if( pTerm==0 ) continue;
+      if( (pTerm->eOperator&WO_EQ)!=0 && pOBExpr->iColumn>=0 ){
+        const char *z1, *z2;
+        pColl = sqlite3ExprCollSeq(pWInfo->pParse, pOrderBy->a[i].pExpr);
+        if( !pColl ) pColl = db->pDfltColl;
+        z1 = pColl->zName;
+        pColl = sqlite3ExprCollSeq(pWInfo->pParse, pTerm->pExpr);
+        if( !pColl ) pColl = db->pDfltColl;
+        z2 = pColl->zName;
+        if( sqlite3StrICmp(z1, z2)!=0 ) continue;
+      }
+      obSat |= MASKBIT(i);
+    }
+
+    if( (pLoop->wsFlags & WHERE_ONEROW)==0 ){
+      if( pLoop->wsFlags & WHERE_IPK ){
+        pIndex = 0;
+        nKeyCol = 0;
+        nColumn = 1;
+      }else if( (pIndex = pLoop->u.btree.pIndex)==0 || pIndex->bUnordered ){
+        return 0;
+      }else{
+        nKeyCol = pIndex->nKeyCol;
+        nColumn = pIndex->nColumn;
+        assert( nColumn==nKeyCol+1 || !HasRowid(pIndex->pTable) );
+        assert( pIndex->aiColumn[nColumn-1]==(-1) || !HasRowid(pIndex->pTable));
+        isOrderDistinct = pIndex->onError!=OE_None;
+      }
+
+      /* Loop through all columns of the index and deal with the ones
+      ** that are not constrained by == or IN.
+      */
+      rev = revSet = 0;
+      distinctColumns = 0;
+      for(j=0; j<nColumn; j++){
+        u8 bOnce;   /* True to run the ORDER BY search loop */
+
+        /* Skip over == and IS NULL terms */
+        if( j<pLoop->u.btree.nEq
+         && pLoop->u.btree.nSkip==0
+         && ((i = pLoop->aLTerm[j]->eOperator) & (WO_EQ|WO_ISNULL))!=0
+        ){
+          if( i & WO_ISNULL ){
+            testcase( isOrderDistinct );
+            isOrderDistinct = 0;
+          }
+          continue;  
+        }
+
+        /* Get the column number in the table (iColumn) and sort order
+        ** (revIdx) for the j-th column of the index.
+        */
+        if( pIndex ){
+          iColumn = pIndex->aiColumn[j];
+          revIdx = pIndex->aSortOrder[j];
+          if( iColumn==pIndex->pTable->iPKey ) iColumn = -1;
+        }else{
+          iColumn = -1;
+          revIdx = 0;
+        }
+
+        /* An unconstrained column that might be NULL means that this
+        ** WhereLoop is not well-ordered
+        */
+        if( isOrderDistinct
+         && iColumn>=0
+         && j>=pLoop->u.btree.nEq
+         && pIndex->pTable->aCol[iColumn].notNull==0
+        ){
+          isOrderDistinct = 0;
+        }
+
+        /* Find the ORDER BY term that corresponds to the j-th column
+        ** of the index and mark that ORDER BY term off 
+        */
+        bOnce = 1;
+        isMatch = 0;
+        for(i=0; bOnce && i<nOrderBy; i++){
+          if( MASKBIT(i) & obSat ) continue;
+          pOBExpr = sqlite3ExprSkipCollate(pOrderBy->a[i].pExpr);
+          testcase( wctrlFlags & WHERE_GROUPBY );
+          testcase( wctrlFlags & WHERE_DISTINCTBY );
+          if( (wctrlFlags & (WHERE_GROUPBY|WHERE_DISTINCTBY))==0 ) bOnce = 0;
+          if( pOBExpr->op!=TK_COLUMN ) continue;
+          if( pOBExpr->iTable!=iCur ) continue;
+          if( pOBExpr->iColumn!=iColumn ) continue;
+          if( iColumn>=0 ){
+            pColl = sqlite3ExprCollSeq(pWInfo->pParse, pOrderBy->a[i].pExpr);
+            if( !pColl ) pColl = db->pDfltColl;
+            if( sqlite3StrICmp(pColl->zName, pIndex->azColl[j])!=0 ) continue;
+          }
+          isMatch = 1;
+          break;
+        }
+        if( isMatch && (pWInfo->wctrlFlags & WHERE_GROUPBY)==0 ){
+          /* Make sure the sort order is compatible in an ORDER BY clause.
+          ** Sort order is irrelevant for a GROUP BY clause. */
+          if( revSet ){
+            if( (rev ^ revIdx)!=pOrderBy->a[i].sortOrder ) isMatch = 0;
+          }else{
+            rev = revIdx ^ pOrderBy->a[i].sortOrder;
+            if( rev ) *pRevMask |= MASKBIT(iLoop);
+            revSet = 1;
+          }
+        }
+        if( isMatch ){
+          if( iColumn<0 ){
+            testcase( distinctColumns==0 );
+            distinctColumns = 1;
+          }
+          obSat |= MASKBIT(i);
+        }else{
+          /* No match found */
+          if( j==0 || j<nKeyCol ){
+            testcase( isOrderDistinct!=0 );
+            isOrderDistinct = 0;
+          }
+          break;
+        }
+      } /* end Loop over all index columns */
+      if( distinctColumns ){
+        testcase( isOrderDistinct==0 );
+        isOrderDistinct = 1;
+      }
+    } /* end-if not one-row */
+
+    /* Mark off any other ORDER BY terms that reference pLoop */
+    if( isOrderDistinct ){
+      orderDistinctMask |= pLoop->maskSelf;
+      for(i=0; i<nOrderBy; i++){
+        Expr *p;
+        Bitmask mTerm;
+        if( MASKBIT(i) & obSat ) continue;
+        p = pOrderBy->a[i].pExpr;
+        mTerm = exprTableUsage(&pWInfo->sMaskSet,p);
+        if( mTerm==0 && !sqlite3ExprIsConstant(p) ) continue;
+        if( (mTerm&~orderDistinctMask)==0 ){
+          obSat |= MASKBIT(i);
+        }
+      }
+    }
+  } /* End the loop over all WhereLoops from outer-most down to inner-most */
+  if( obSat==obDone ) return (i8)nOrderBy;
+  if( !isOrderDistinct ){
+    for(i=nOrderBy-1; i>0; i--){
+      Bitmask m = MASKBIT(i) - 1;
+      if( (obSat&m)==m ) return i;
+    }
+    return 0;
+  }
+  return -1;
+}
+
+
+/*
+** If the WHERE_GROUPBY flag is set in the mask passed to sqlite3WhereBegin(),
+** the planner assumes that the specified pOrderBy list is actually a GROUP
+** BY clause - and so any order that groups rows as required satisfies the
+** request.
+**
+** Normally, in this case it is not possible for the caller to determine
+** whether or not the rows are really being delivered in sorted order, or
+** just in some other order that provides the required grouping. However,
+** if the WHERE_SORTBYGROUP flag is also passed to sqlite3WhereBegin(), then
+** this function may be called on the returned WhereInfo object. It returns
+** true if the rows really will be sorted in the specified order, or false
+** otherwise.
+**
+** For example, assuming:
+**
+**   CREATE INDEX i1 ON t1(x, Y);
+**
+** then
+**
+**   SELECT * FROM t1 GROUP BY x,y ORDER BY x,y;   -- IsSorted()==1
+**   SELECT * FROM t1 GROUP BY y,x ORDER BY y,x;   -- IsSorted()==0
+*/
+SQLITE_PRIVATE int sqlite3WhereIsSorted(WhereInfo *pWInfo){
+  assert( pWInfo->wctrlFlags & WHERE_GROUPBY );
+  assert( pWInfo->wctrlFlags & WHERE_SORTBYGROUP );
+  return pWInfo->sorted;
+}
+
+#ifdef WHERETRACE_ENABLED
+/* For debugging use only: */
+static const char *wherePathName(WherePath *pPath, int nLoop, WhereLoop *pLast){
+  static char zName[65];
+  int i;
+  for(i=0; i<nLoop; i++){ zName[i] = pPath->aLoop[i]->cId; }
+  if( pLast ) zName[i++] = pLast->cId;
+  zName[i] = 0;
+  return zName;
+}
+#endif
+
+/*
+** Given the list of WhereLoop objects at pWInfo->pLoops, this routine
+** attempts to find the lowest cost path that visits each WhereLoop
+** once.  This path is then loaded into the pWInfo->a[].pWLoop fields.
+**
+** Assume that the total number of output rows that will need to be sorted
+** will be nRowEst (in the 10*log2 representation).  Or, ignore sorting
+** costs if nRowEst==0.
+**
+** Return SQLITE_OK on success or SQLITE_NOMEM of a memory allocation
+** error occurs.
+*/
+static int wherePathSolver(WhereInfo *pWInfo, LogEst nRowEst){
+  int mxChoice;             /* Maximum number of simultaneous paths tracked */
+  int nLoop;                /* Number of terms in the join */
+  Parse *pParse;            /* Parsing context */
+  sqlite3 *db;              /* The database connection */
+  int iLoop;                /* Loop counter over the terms of the join */
+  int ii, jj;               /* Loop counters */
+  int mxI = 0;              /* Index of next entry to replace */
+  int nOrderBy;             /* Number of ORDER BY clause terms */
+  LogEst rCost;             /* Cost of a path */
+  LogEst nOut;              /* Number of outputs */
+  LogEst mxCost = 0;        /* Maximum cost of a set of paths */
+  LogEst mxOut = 0;         /* Maximum nOut value on the set of paths */
+  int nTo, nFrom;           /* Number of valid entries in aTo[] and aFrom[] */
+  WherePath *aFrom;         /* All nFrom paths at the previous level */
+  WherePath *aTo;           /* The nTo best paths at the current level */
+  WherePath *pFrom;         /* An element of aFrom[] that we are working on */
+  WherePath *pTo;           /* An element of aTo[] that we are working on */
+  WhereLoop *pWLoop;        /* One of the WhereLoop objects */
+  WhereLoop **pX;           /* Used to divy up the pSpace memory */
+  char *pSpace;             /* Temporary memory used by this routine */
+
+  pParse = pWInfo->pParse;
+  db = pParse->db;
+  nLoop = pWInfo->nLevel;
+  /* TUNING: For simple queries, only the best path is tracked.
+  ** For 2-way joins, the 5 best paths are followed.
+  ** For joins of 3 or more tables, track the 10 best paths */
+  mxChoice = (nLoop<=1) ? 1 : (nLoop==2 ? 5 : 10);
+  assert( nLoop<=pWInfo->pTabList->nSrc );
+  WHERETRACE(0x002, ("---- begin solver\n"));
+
+  /* Allocate and initialize space for aTo and aFrom */
+  ii = (sizeof(WherePath)+sizeof(WhereLoop*)*nLoop)*mxChoice*2;
+  pSpace = sqlite3DbMallocRaw(db, ii);
+  if( pSpace==0 ) return SQLITE_NOMEM;
+  aTo = (WherePath*)pSpace;
+  aFrom = aTo+mxChoice;
+  memset(aFrom, 0, sizeof(aFrom[0]));
+  pX = (WhereLoop**)(aFrom+mxChoice);
+  for(ii=mxChoice*2, pFrom=aTo; ii>0; ii--, pFrom++, pX += nLoop){
+    pFrom->aLoop = pX;
+  }
+
+  /* Seed the search with a single WherePath containing zero WhereLoops.
+  **
+  ** TUNING: Do not let the number of iterations go above 25.  If the cost
+  ** of computing an automatic index is not paid back within the first 25
+  ** rows, then do not use the automatic index. */
+  aFrom[0].nRow = MIN(pParse->nQueryLoop, 46);  assert( 46==sqlite3LogEst(25) );
+  nFrom = 1;
+
+  /* Precompute the cost of sorting the final result set, if the caller
+  ** to sqlite3WhereBegin() was concerned about sorting */
+  if( pWInfo->pOrderBy==0 || nRowEst==0 ){
+    aFrom[0].isOrdered = 0;
+    nOrderBy = 0;
+  }else{
+    aFrom[0].isOrdered = nLoop>0 ? -1 : 1;
+    nOrderBy = pWInfo->pOrderBy->nExpr;
+  }
+
+  /* Compute successively longer WherePaths using the previous generation
+  ** of WherePaths as the basis for the next.  Keep track of the mxChoice
+  ** best paths at each generation */
+  for(iLoop=0; iLoop<nLoop; iLoop++){
+    nTo = 0;
+    for(ii=0, pFrom=aFrom; ii<nFrom; ii++, pFrom++){
+      for(pWLoop=pWInfo->pLoops; pWLoop; pWLoop=pWLoop->pNextLoop){
+        Bitmask maskNew;
+        Bitmask revMask = 0;
+        i8 isOrdered = pFrom->isOrdered;
+        if( (pWLoop->prereq & ~pFrom->maskLoop)!=0 ) continue;
+        if( (pWLoop->maskSelf & pFrom->maskLoop)!=0 ) continue;
+        /* At this point, pWLoop is a candidate to be the next loop. 
+        ** Compute its cost */
+        rCost = sqlite3LogEstAdd(pWLoop->rSetup,pWLoop->rRun + pFrom->nRow);
+        rCost = sqlite3LogEstAdd(rCost, pFrom->rCost);
+        nOut = pFrom->nRow + pWLoop->nOut;
+        maskNew = pFrom->maskLoop | pWLoop->maskSelf;
+        if( isOrdered<0 ){
+          isOrdered = wherePathSatisfiesOrderBy(pWInfo,
+                       pWInfo->pOrderBy, pFrom, pWInfo->wctrlFlags,
+                       iLoop, pWLoop, &revMask);
+          if( isOrdered>=0 && isOrdered<nOrderBy ){
+            /* TUNING: Estimated cost of a full external sort, where N is 
+            ** the number of rows to sort is:
+            **
+            **   cost = (3.0 * N * log(N)).
+            ** 
+            ** Or, if the order-by clause has X terms but only the last Y 
+            ** terms are out of order, then block-sorting will reduce the 
+            ** sorting cost to:
+            **
+            **   cost = (3.0 * N * log(N)) * (Y/X)
+            **
+            ** The (Y/X) term is implemented using stack variable rScale
+            ** below.  */
+            LogEst rScale, rSortCost;
+            assert( nOrderBy>0 && 66==sqlite3LogEst(100) );
+            rScale = sqlite3LogEst((nOrderBy-isOrdered)*100/nOrderBy) - 66;
+            rSortCost = nRowEst + estLog(nRowEst) + rScale + 16;
+
+            /* TUNING: The cost of implementing DISTINCT using a B-TREE is
+            ** similar but with a larger constant of proportionality. 
+            ** Multiply by an additional factor of 3.0.  */
+            if( pWInfo->wctrlFlags & WHERE_WANT_DISTINCT ){
+              rSortCost += 16;
+            }
+            WHERETRACE(0x002,
+               ("---- sort cost=%-3d (%d/%d) increases cost %3d to %-3d\n",
+                rSortCost, (nOrderBy-isOrdered), nOrderBy, rCost,
+                sqlite3LogEstAdd(rCost,rSortCost)));
+            rCost = sqlite3LogEstAdd(rCost, rSortCost);
+          }
+        }else{
+          revMask = pFrom->revLoop;
+        }
+        /* Check to see if pWLoop should be added to the mxChoice best so far */
+        for(jj=0, pTo=aTo; jj<nTo; jj++, pTo++){
+          if( pTo->maskLoop==maskNew
+           && ((pTo->isOrdered^isOrdered)&80)==0
+           && ((pTo->rCost<=rCost && pTo->nRow<=nOut) ||
+                (pTo->rCost>=rCost && pTo->nRow>=nOut))
+          ){
+            testcase( jj==nTo-1 );
+            break;
+          }
+        }
+        if( jj>=nTo ){
+          if( nTo>=mxChoice && rCost>=mxCost ){
+#ifdef WHERETRACE_ENABLED /* 0x4 */
+            if( sqlite3WhereTrace&0x4 ){
+              sqlite3DebugPrintf("Skip   %s cost=%-3d,%3d order=%c\n",
+                  wherePathName(pFrom, iLoop, pWLoop), rCost, nOut,
+                  isOrdered>=0 ? isOrdered+'0' : '?');
+            }
+#endif
+            continue;
+          }
+          /* Add a new Path to the aTo[] set */
+          if( nTo<mxChoice ){
+            /* Increase the size of the aTo set by one */
+            jj = nTo++;
+          }else{
+            /* New path replaces the prior worst to keep count below mxChoice */
+            jj = mxI;
+          }
+          pTo = &aTo[jj];
+#ifdef WHERETRACE_ENABLED /* 0x4 */
+          if( sqlite3WhereTrace&0x4 ){
+            sqlite3DebugPrintf("New    %s cost=%-3d,%3d order=%c\n",
+                wherePathName(pFrom, iLoop, pWLoop), rCost, nOut,
+                isOrdered>=0 ? isOrdered+'0' : '?');
+          }
+#endif
+        }else{
+          if( pTo->rCost<=rCost && pTo->nRow<=nOut ){
+#ifdef WHERETRACE_ENABLED /* 0x4 */
+            if( sqlite3WhereTrace&0x4 ){
+              sqlite3DebugPrintf(
+                  "Skip   %s cost=%-3d,%3d order=%c",
+                  wherePathName(pFrom, iLoop, pWLoop), rCost, nOut,
+                  isOrdered>=0 ? isOrdered+'0' : '?');
+              sqlite3DebugPrintf("   vs %s cost=%-3d,%d order=%c\n",
+                  wherePathName(pTo, iLoop+1, 0), pTo->rCost, pTo->nRow,
+                  pTo->isOrdered>=0 ? pTo->isOrdered+'0' : '?');
+            }
+#endif
+            testcase( pTo->rCost==rCost );
+            continue;
+          }
+          testcase( pTo->rCost==rCost+1 );
+          /* A new and better score for a previously created equivalent path */
+#ifdef WHERETRACE_ENABLED /* 0x4 */
+          if( sqlite3WhereTrace&0x4 ){
+            sqlite3DebugPrintf(
+                "Update %s cost=%-3d,%3d order=%c",
+                wherePathName(pFrom, iLoop, pWLoop), rCost, nOut,
+                isOrdered>=0 ? isOrdered+'0' : '?');
+            sqlite3DebugPrintf("  was %s cost=%-3d,%3d order=%c\n",
+                wherePathName(pTo, iLoop+1, 0), pTo->rCost, pTo->nRow,
+                pTo->isOrdered>=0 ? pTo->isOrdered+'0' : '?');
+          }
+#endif
+        }
+        /* pWLoop is a winner.  Add it to the set of best so far */
+        pTo->maskLoop = pFrom->maskLoop | pWLoop->maskSelf;
+        pTo->revLoop = revMask;
+        pTo->nRow = nOut;
+        pTo->rCost = rCost;
+        pTo->isOrdered = isOrdered;
+        memcpy(pTo->aLoop, pFrom->aLoop, sizeof(WhereLoop*)*iLoop);
+        pTo->aLoop[iLoop] = pWLoop;
+        if( nTo>=mxChoice ){
+          mxI = 0;
+          mxCost = aTo[0].rCost;
+          mxOut = aTo[0].nRow;
+          for(jj=1, pTo=&aTo[1]; jj<mxChoice; jj++, pTo++){
+            if( pTo->rCost>mxCost || (pTo->rCost==mxCost && pTo->nRow>mxOut) ){
+              mxCost = pTo->rCost;
+              mxOut = pTo->nRow;
+              mxI = jj;
+            }
+          }
+        }
+      }
+    }
+
+#ifdef WHERETRACE_ENABLED  /* >=2 */
+    if( sqlite3WhereTrace>=2 ){
+      sqlite3DebugPrintf("---- after round %d ----\n", iLoop);
+      for(ii=0, pTo=aTo; ii<nTo; ii++, pTo++){
+        sqlite3DebugPrintf(" %s cost=%-3d nrow=%-3d order=%c",
+           wherePathName(pTo, iLoop+1, 0), pTo->rCost, pTo->nRow,
+           pTo->isOrdered>=0 ? (pTo->isOrdered+'0') : '?');
+        if( pTo->isOrdered>0 ){
+          sqlite3DebugPrintf(" rev=0x%llx\n", pTo->revLoop);
+        }else{
+          sqlite3DebugPrintf("\n");
+        }
+      }
+    }
+#endif
+
+    /* Swap the roles of aFrom and aTo for the next generation */
+    pFrom = aTo;
+    aTo = aFrom;
+    aFrom = pFrom;
+    nFrom = nTo;
+  }
+
+  if( nFrom==0 ){
+    sqlite3ErrorMsg(pParse, "no query solution");
+    sqlite3DbFree(db, pSpace);
+    return SQLITE_ERROR;
+  }
+  
+  /* Find the lowest cost path.  pFrom will be left pointing to that path */
+  pFrom = aFrom;
+  for(ii=1; ii<nFrom; ii++){
+    if( pFrom->rCost>aFrom[ii].rCost ) pFrom = &aFrom[ii];
+  }
+  assert( pWInfo->nLevel==nLoop );
+  /* Load the lowest cost path into pWInfo */
+  for(iLoop=0; iLoop<nLoop; iLoop++){
+    WhereLevel *pLevel = pWInfo->a + iLoop;
+    pLevel->pWLoop = pWLoop = pFrom->aLoop[iLoop];
+    pLevel->iFrom = pWLoop->iTab;
+    pLevel->iTabCur = pWInfo->pTabList->a[pLevel->iFrom].iCursor;
+  }
+  if( (pWInfo->wctrlFlags & WHERE_WANT_DISTINCT)!=0
+   && (pWInfo->wctrlFlags & WHERE_DISTINCTBY)==0
+   && pWInfo->eDistinct==WHERE_DISTINCT_NOOP
+   && nRowEst
+  ){
+    Bitmask notUsed;
+    int rc = wherePathSatisfiesOrderBy(pWInfo, pWInfo->pResultSet, pFrom,
+                 WHERE_DISTINCTBY, nLoop-1, pFrom->aLoop[nLoop-1], &notUsed);
+    if( rc==pWInfo->pResultSet->nExpr ){
+      pWInfo->eDistinct = WHERE_DISTINCT_ORDERED;
+    }
+  }
+  if( pWInfo->pOrderBy ){
+    if( pWInfo->wctrlFlags & WHERE_DISTINCTBY ){
+      if( pFrom->isOrdered==pWInfo->pOrderBy->nExpr ){
+        pWInfo->eDistinct = WHERE_DISTINCT_ORDERED;
+      }
+    }else{
+      pWInfo->nOBSat = pFrom->isOrdered;
+      if( pWInfo->nOBSat<0 ) pWInfo->nOBSat = 0;
+      pWInfo->revMask = pFrom->revLoop;
+    }
+    if( (pWInfo->wctrlFlags & WHERE_SORTBYGROUP)
+        && pWInfo->nOBSat==pWInfo->pOrderBy->nExpr
+    ){
+      Bitmask notUsed = 0;
+      int nOrder = wherePathSatisfiesOrderBy(pWInfo, pWInfo->pOrderBy, 
+          pFrom, 0, nLoop-1, pFrom->aLoop[nLoop-1], &notUsed
+      );
+      assert( pWInfo->sorted==0 );
+      pWInfo->sorted = (nOrder==pWInfo->pOrderBy->nExpr);
+    }
+  }
+
+
+  pWInfo->nRowOut = pFrom->nRow;
+
+  /* Free temporary memory and return success */
+  sqlite3DbFree(db, pSpace);
+  return SQLITE_OK;
+}
+
+/*
+** Most queries use only a single table (they are not joins) and have
+** simple == constraints against indexed fields.  This routine attempts
+** to plan those simple cases using much less ceremony than the
+** general-purpose query planner, and thereby yield faster sqlite3_prepare()
+** times for the common case.
+**
+** Return non-zero on success, if this query can be handled by this
+** no-frills query planner.  Return zero if this query needs the 
+** general-purpose query planner.
+*/
+static int whereShortCut(WhereLoopBuilder *pBuilder){
+  WhereInfo *pWInfo;
+  struct SrcList_item *pItem;
+  WhereClause *pWC;
+  WhereTerm *pTerm;
+  WhereLoop *pLoop;
+  int iCur;
+  int j;
+  Table *pTab;
+  Index *pIdx;
+  
+  pWInfo = pBuilder->pWInfo;
+  if( pWInfo->wctrlFlags & WHERE_FORCE_TABLE ) return 0;
+  assert( pWInfo->pTabList->nSrc>=1 );
+  pItem = pWInfo->pTabList->a;
+  pTab = pItem->pTab;
+  if( IsVirtual(pTab) ) return 0;
+  if( pItem->zIndex ) return 0;
+  iCur = pItem->iCursor;
+  pWC = &pWInfo->sWC;
+  pLoop = pBuilder->pNew;
+  pLoop->wsFlags = 0;
+  pLoop->u.btree.nSkip = 0;
+  pTerm = findTerm(pWC, iCur, -1, 0, WO_EQ, 0);
+  if( pTerm ){
+    pLoop->wsFlags = WHERE_COLUMN_EQ|WHERE_IPK|WHERE_ONEROW;
+    pLoop->aLTerm[0] = pTerm;
+    pLoop->nLTerm = 1;
+    pLoop->u.btree.nEq = 1;
+    /* TUNING: Cost of a rowid lookup is 10 */
+    pLoop->rRun = 33;  /* 33==sqlite3LogEst(10) */
+  }else{
+    for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+      assert( pLoop->aLTermSpace==pLoop->aLTerm );
+      assert( ArraySize(pLoop->aLTermSpace)==4 );
+      if( pIdx->onError==OE_None 
+       || pIdx->pPartIdxWhere!=0 
+       || pIdx->nKeyCol>ArraySize(pLoop->aLTermSpace) 
+      ) continue;
+      for(j=0; j<pIdx->nKeyCol; j++){
+        pTerm = findTerm(pWC, iCur, pIdx->aiColumn[j], 0, WO_EQ, pIdx);
+        if( pTerm==0 ) break;
+        pLoop->aLTerm[j] = pTerm;
+      }
+      if( j!=pIdx->nKeyCol ) continue;
+      pLoop->wsFlags = WHERE_COLUMN_EQ|WHERE_ONEROW|WHERE_INDEXED;
+      if( pIdx->isCovering || (pItem->colUsed & ~columnsInIndex(pIdx))==0 ){
+        pLoop->wsFlags |= WHERE_IDX_ONLY;
+      }
+      pLoop->nLTerm = j;
+      pLoop->u.btree.nEq = j;
+      pLoop->u.btree.pIndex = pIdx;
+      /* TUNING: Cost of a unique index lookup is 15 */
+      pLoop->rRun = 39;  /* 39==sqlite3LogEst(15) */
+      break;
+    }
+  }
+  if( pLoop->wsFlags ){
+    pLoop->nOut = (LogEst)1;
+    pWInfo->a[0].pWLoop = pLoop;
+    pLoop->maskSelf = getMask(&pWInfo->sMaskSet, iCur);
+    pWInfo->a[0].iTabCur = iCur;
+    pWInfo->nRowOut = 1;
+    if( pWInfo->pOrderBy ) pWInfo->nOBSat =  pWInfo->pOrderBy->nExpr;
+    if( pWInfo->wctrlFlags & WHERE_WANT_DISTINCT ){
+      pWInfo->eDistinct = WHERE_DISTINCT_UNIQUE;
+    }
+#ifdef SQLITE_DEBUG
+    pLoop->cId = '0';
+#endif
+    return 1;
+  }
+  return 0;
+}
 
 /*
 ** Generate the beginning of the loop used for WHERE clause processing.
@@ -109409,25 +115760,25 @@ static void whereInfoFree(sqlite3 *db, WhereInfo *pWInfo){
 **
 ** ORDER BY CLAUSE PROCESSING
 **
-** pOrderBy is a pointer to the ORDER BY clause of a SELECT statement,
+** pOrderBy is a pointer to the ORDER BY clause (or the GROUP BY clause
+** if the WHERE_GROUPBY flag is set in wctrlFlags) of a SELECT statement
 ** if there is one.  If there is no ORDER BY clause or if this routine
 ** is called from an UPDATE or DELETE statement, then pOrderBy is NULL.
 **
-** If an index can be used so that the natural output order of the table
-** scan is correct for the ORDER BY clause, then that index is used and
-** the returned WhereInfo.nOBSat field is set to pOrderBy->nExpr.  This
-** is an optimization that prevents an unnecessary sort of the result set
-** if an index appropriate for the ORDER BY clause already exists.
-**
-** If the where clause loops cannot be arranged to provide the correct
-** output order, then WhereInfo.nOBSat is 0.
+** The iIdxCur parameter is the cursor number of an index.  If 
+** WHERE_ONETABLE_ONLY is set, iIdxCur is the cursor number of an index
+** to use for OR clause processing.  The WHERE clause should use this
+** specific cursor.  If WHERE_ONEPASS_DESIRED is set, then iIdxCur is
+** the first cursor in an array of cursors for all indices.  iIdxCur should
+** be used to compute the appropriate cursor depending on which index is
+** used.
 */
 SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
   Parse *pParse,        /* The parser context */
-  SrcList *pTabList,    /* A list of all tables to be scanned */
+  SrcList *pTabList,    /* FROM clause: A list of all tables to be scanned */
   Expr *pWhere,         /* The WHERE clause */
-  ExprList *pOrderBy,   /* An ORDER BY clause, or NULL */
-  ExprList *pDistinct,  /* The select-list for DISTINCT queries - or NULL */
+  ExprList *pOrderBy,   /* An ORDER BY (or GROUP BY) clause, or NULL */
+  ExprList *pResultSet, /* Result set of the query */
   u16 wctrlFlags,       /* One of the WHERE_* flags defined in sqliteInt.h */
   int iIdxCur           /* If WHERE_ONETABLE_ONLY is set, index cursor number */
 ){
@@ -109436,18 +115787,29 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
   WhereInfo *pWInfo;         /* Will become the return value of this function */
   Vdbe *v = pParse->pVdbe;   /* The virtual database engine */
   Bitmask notReady;          /* Cursors that are not yet positioned */
-  WhereBestIdx sWBI;         /* Best index search context */
+  WhereLoopBuilder sWLB;     /* The WhereLoop builder */
   WhereMaskSet *pMaskSet;    /* The expression mask set */
   WhereLevel *pLevel;        /* A single level in pWInfo->a[] */
-  int iFrom;                 /* First unused FROM clause element */
-  int andFlags;              /* AND-ed combination of all pWC->a[].wtFlags */
+  WhereLoop *pLoop;          /* Pointer to a single WhereLoop object */
   int ii;                    /* Loop counter */
   sqlite3 *db;               /* Database connection */
+  int rc;                    /* Return code */
 
 
   /* Variable initialization */
-  memset(&sWBI, 0, sizeof(sWBI));
-  sWBI.pParse = pParse;
+  db = pParse->db;
+  memset(&sWLB, 0, sizeof(sWLB));
+
+  /* An ORDER/GROUP BY clause of more than 63 terms cannot be optimized */
+  testcase( pOrderBy && pOrderBy->nExpr==BMS-1 );
+  if( pOrderBy && pOrderBy->nExpr>=BMS ) pOrderBy = 0;
+  sWLB.pOrderBy = pOrderBy;
+
+  /* Disable the DISTINCT optimization if SQLITE_DistinctOpt is set via
+  ** sqlite3_test_ctrl(SQLITE_TESTCTRL_OPTIMIZATIONS,...) */
+  if( OptimizationDisabled(db, SQLITE_DistinctOpt) ){
+    wctrlFlags &= ~WHERE_WANT_DISTINCT;
+  }
 
   /* The number of tables in the FROM clause is limited by the number of
   ** bits in a Bitmask 
@@ -109472,46 +115834,57 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
   ** field (type Bitmask) it must be aligned on an 8-byte boundary on
   ** some architectures. Hence the ROUND8() below.
   */
-  db = pParse->db;
   nByteWInfo = ROUND8(sizeof(WhereInfo)+(nTabList-1)*sizeof(WhereLevel));
-  pWInfo = sqlite3DbMallocZero(db, 
-      nByteWInfo + 
-      sizeof(WhereClause) +
-      sizeof(WhereMaskSet)
-  );
+  pWInfo = sqlite3DbMallocZero(db, nByteWInfo + sizeof(WhereLoop));
   if( db->mallocFailed ){
     sqlite3DbFree(db, pWInfo);
     pWInfo = 0;
     goto whereBeginError;
   }
+  pWInfo->aiCurOnePass[0] = pWInfo->aiCurOnePass[1] = -1;
   pWInfo->nLevel = nTabList;
   pWInfo->pParse = pParse;
   pWInfo->pTabList = pTabList;
-  pWInfo->iBreak = sqlite3VdbeMakeLabel(v);
-  pWInfo->pWC = sWBI.pWC = (WhereClause *)&((u8 *)pWInfo)[nByteWInfo];
+  pWInfo->pOrderBy = pOrderBy;
+  pWInfo->pResultSet = pResultSet;
+  pWInfo->iBreak = pWInfo->iContinue = sqlite3VdbeMakeLabel(v);
   pWInfo->wctrlFlags = wctrlFlags;
   pWInfo->savedNQueryLoop = pParse->nQueryLoop;
-  pMaskSet = (WhereMaskSet*)&sWBI.pWC[1];
-  sWBI.aLevel = pWInfo->a;
-
-  /* Disable the DISTINCT optimization if SQLITE_DistinctOpt is set via
-  ** sqlite3_test_ctrl(SQLITE_TESTCTRL_OPTIMIZATIONS,...) */
-  if( OptimizationDisabled(db, SQLITE_DistinctOpt) ) pDistinct = 0;
+  pMaskSet = &pWInfo->sMaskSet;
+  sWLB.pWInfo = pWInfo;
+  sWLB.pWC = &pWInfo->sWC;
+  sWLB.pNew = (WhereLoop*)(((char*)pWInfo)+nByteWInfo);
+  assert( EIGHT_BYTE_ALIGNMENT(sWLB.pNew) );
+  whereLoopInit(sWLB.pNew);
+#ifdef SQLITE_DEBUG
+  sWLB.pNew->cId = '*';
+#endif
 
   /* Split the WHERE clause into separate subexpressions where each
   ** subexpression is separated by an AND operator.
   */
   initMaskSet(pMaskSet);
-  whereClauseInit(sWBI.pWC, pParse, pMaskSet, wctrlFlags);
-  sqlite3ExprCodeConstants(pParse, pWhere);
-  whereSplit(sWBI.pWC, pWhere, TK_AND);   /* IMP: R-15842-53296 */
+  whereClauseInit(&pWInfo->sWC, pWInfo);
+  whereSplit(&pWInfo->sWC, pWhere, TK_AND);
     
   /* Special case: a WHERE clause that is constant.  Evaluate the
   ** expression and either jump over all of the code or fall thru.
   */
-  if( pWhere && (nTabList==0 || sqlite3ExprIsConstantNotJoin(pWhere)) ){
-    sqlite3ExprIfFalse(pParse, pWhere, pWInfo->iBreak, SQLITE_JUMPIFNULL);
-    pWhere = 0;
+  for(ii=0; ii<sWLB.pWC->nTerm; ii++){
+    if( nTabList==0 || sqlite3ExprIsConstantNotJoin(sWLB.pWC->a[ii].pExpr) ){
+      sqlite3ExprIfFalse(pParse, sWLB.pWC->a[ii].pExpr, pWInfo->iBreak,
+                         SQLITE_JUMPIFNULL);
+      sWLB.pWC->a[ii].wtFlags |= TERM_CODED;
+    }
+  }
+
+  /* Special case: No FROM clause
+  */
+  if( nTabList==0 ){
+    if( pOrderBy ) pWInfo->nOBSat = pOrderBy->nExpr;
+    if( wctrlFlags & WHERE_WANT_DISTINCT ){
+      pWInfo->eDistinct = WHERE_DISTINCT_UNIQUE;
+    }
   }
 
   /* Assign a bit from the bitmask to every term in the FROM clause.
@@ -109549,306 +115922,151 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
   ** want to analyze these virtual terms, so start analyzing at the end
   ** and work forward so that the added virtual terms are never processed.
   */
-  exprAnalyzeAll(pTabList, sWBI.pWC);
+  exprAnalyzeAll(pTabList, &pWInfo->sWC);
   if( db->mallocFailed ){
     goto whereBeginError;
   }
 
-  /* Check if the DISTINCT qualifier, if there is one, is redundant. 
-  ** If it is, then set pDistinct to NULL and WhereInfo.eDistinct to
-  ** WHERE_DISTINCT_UNIQUE to tell the caller to ignore the DISTINCT.
-  */
-  if( pDistinct && isDistinctRedundant(pParse, pTabList, sWBI.pWC, pDistinct) ){
-    pDistinct = 0;
-    pWInfo->eDistinct = WHERE_DISTINCT_UNIQUE;
+  if( wctrlFlags & WHERE_WANT_DISTINCT ){
+    if( isDistinctRedundant(pParse, pTabList, &pWInfo->sWC, pResultSet) ){
+      /* The DISTINCT marking is pointless.  Ignore it. */
+      pWInfo->eDistinct = WHERE_DISTINCT_UNIQUE;
+    }else if( pOrderBy==0 ){
+      /* Try to ORDER BY the result set to make distinct processing easier */
+      pWInfo->wctrlFlags |= WHERE_DISTINCTBY;
+      pWInfo->pOrderBy = pResultSet;
+    }
   }
 
-  /* Chose the best index to use for each table in the FROM clause.
-  **
-  ** This loop fills in the following fields:
-  **
-  **   pWInfo->a[].pIdx      The index to use for this level of the loop.
-  **   pWInfo->a[].wsFlags   WHERE_xxx flags associated with pIdx
-  **   pWInfo->a[].nEq       The number of == and IN constraints
-  **   pWInfo->a[].iFrom     Which term of the FROM clause is being coded
-  **   pWInfo->a[].iTabCur   The VDBE cursor for the database table
-  **   pWInfo->a[].iIdxCur   The VDBE cursor for the index
-  **   pWInfo->a[].pTerm     When wsFlags==WO_OR, the OR-clause term
-  **
-  ** This loop also figures out the nesting order of tables in the FROM
-  ** clause.
-  */
-  sWBI.notValid = ~(Bitmask)0;
-  sWBI.pOrderBy = pOrderBy;
-  sWBI.n = nTabList;
-  sWBI.pDistinct = pDistinct;
-  andFlags = ~0;
-  WHERETRACE(("*** Optimizer Start ***\n"));
-  for(sWBI.i=iFrom=0, pLevel=pWInfo->a; sWBI.i<nTabList; sWBI.i++, pLevel++){
-    WhereCost bestPlan;         /* Most efficient plan seen so far */
-    Index *pIdx;                /* Index for FROM table at pTabItem */
-    int j;                      /* For looping over FROM tables */
-    int bestJ = -1;             /* The value of j */
-    Bitmask m;                  /* Bitmask value for j or bestJ */
-    int isOptimal;              /* Iterator for optimal/non-optimal search */
-    int ckOptimal;              /* Do the optimal scan check */
-    int nUnconstrained;         /* Number tables without INDEXED BY */
-    Bitmask notIndexed;         /* Mask of tables that cannot use an index */
-
-    memset(&bestPlan, 0, sizeof(bestPlan));
-    bestPlan.rCost = SQLITE_BIG_DBL;
-    WHERETRACE(("*** Begin search for loop %d ***\n", sWBI.i));
-
-    /* Loop through the remaining entries in the FROM clause to find the
-    ** next nested loop. The loop tests all FROM clause entries
-    ** either once or twice. 
-    **
-    ** The first test is always performed if there are two or more entries
-    ** remaining and never performed if there is only one FROM clause entry
-    ** to choose from.  The first test looks for an "optimal" scan.  In
-    ** this context an optimal scan is one that uses the same strategy
-    ** for the given FROM clause entry as would be selected if the entry
-    ** were used as the innermost nested loop.  In other words, a table
-    ** is chosen such that the cost of running that table cannot be reduced
-    ** by waiting for other tables to run first.  This "optimal" test works
-    ** by first assuming that the FROM clause is on the inner loop and finding
-    ** its query plan, then checking to see if that query plan uses any
-    ** other FROM clause terms that are sWBI.notValid.  If no notValid terms
-    ** are used then the "optimal" query plan works.
-    **
-    ** Note that the WhereCost.nRow parameter for an optimal scan might
-    ** not be as small as it would be if the table really were the innermost
-    ** join.  The nRow value can be reduced by WHERE clause constraints
-    ** that do not use indices.  But this nRow reduction only happens if the
-    ** table really is the innermost join.  
-    **
-    ** The second loop iteration is only performed if no optimal scan
-    ** strategies were found by the first iteration. This second iteration
-    ** is used to search for the lowest cost scan overall.
-    **
-    ** Without the optimal scan step (the first iteration) a suboptimal
-    ** plan might be chosen for queries like this:
-    **   
-    **   CREATE TABLE t1(a, b); 
-    **   CREATE TABLE t2(c, d);
-    **   SELECT * FROM t2, t1 WHERE t2.rowid = t1.a;
-    **
-    ** The best strategy is to iterate through table t1 first. However it
-    ** is not possible to determine this with a simple greedy algorithm.
-    ** Since the cost of a linear scan through table t2 is the same 
-    ** as the cost of a linear scan through table t1, a simple greedy 
-    ** algorithm may choose to use t2 for the outer loop, which is a much
-    ** costlier approach.
-    */
-    nUnconstrained = 0;
-    notIndexed = 0;
-
-    /* The optimal scan check only occurs if there are two or more tables
-    ** available to be reordered */
-    if( iFrom==nTabList-1 ){
-      ckOptimal = 0;  /* Common case of just one table in the FROM clause */
-    }else{
-      ckOptimal = -1;
-      for(j=iFrom, sWBI.pSrc=&pTabList->a[j]; j<nTabList; j++, sWBI.pSrc++){
-        m = getMask(pMaskSet, sWBI.pSrc->iCursor);
-        if( (m & sWBI.notValid)==0 ){
-          if( j==iFrom ) iFrom++;
-          continue;
-        }
-        if( j>iFrom && (sWBI.pSrc->jointype & (JT_LEFT|JT_CROSS))!=0 ) break;
-        if( ++ckOptimal ) break;
-        if( (sWBI.pSrc->jointype & JT_LEFT)!=0 ) break;
-      }
+  /* Construct the WhereLoop objects */
+  WHERETRACE(0xffff,("*** Optimizer Start ***\n"));
+  /* Display all terms of the WHERE clause */
+#if defined(WHERETRACE_ENABLED) && defined(SQLITE_ENABLE_TREE_EXPLAIN)
+  if( sqlite3WhereTrace & 0x100 ){
+    int i;
+    Vdbe *v = pParse->pVdbe;
+    sqlite3ExplainBegin(v);
+    for(i=0; i<sWLB.pWC->nTerm; i++){
+      sqlite3ExplainPrintf(v, "#%-2d ", i);
+      sqlite3ExplainPush(v);
+      whereExplainTerm(v, &sWLB.pWC->a[i]);
+      sqlite3ExplainPop(v);
+      sqlite3ExplainNL(v);
     }
-    assert( ckOptimal==0 || ckOptimal==1 );
-
-    for(isOptimal=ckOptimal; isOptimal>=0 && bestJ<0; isOptimal--){
-      for(j=iFrom, sWBI.pSrc=&pTabList->a[j]; j<nTabList; j++, sWBI.pSrc++){
-        if( j>iFrom && (sWBI.pSrc->jointype & (JT_LEFT|JT_CROSS))!=0 ){
-          /* This break and one like it in the ckOptimal computation loop
-          ** above prevent table reordering across LEFT and CROSS JOINs.
-          ** The LEFT JOIN case is necessary for correctness.  The prohibition
-          ** against reordering across a CROSS JOIN is an SQLite feature that
-          ** allows the developer to control table reordering */
-          break;
-        }
-        m = getMask(pMaskSet, sWBI.pSrc->iCursor);
-        if( (m & sWBI.notValid)==0 ){
-          assert( j>iFrom );
-          continue;
-        }
-        sWBI.notReady = (isOptimal ? m : sWBI.notValid);
-        if( sWBI.pSrc->pIndex==0 ) nUnconstrained++;
-  
-        WHERETRACE(("   === trying table %d (%s) with isOptimal=%d ===\n",
-                    j, sWBI.pSrc->pTab->zName, isOptimal));
-        assert( sWBI.pSrc->pTab );
-#ifndef SQLITE_OMIT_VIRTUALTABLE
-        if( IsVirtual(sWBI.pSrc->pTab) ){
-          sWBI.ppIdxInfo = &pWInfo->a[j].pIdxInfo;
-          bestVirtualIndex(&sWBI);
-        }else 
+    sqlite3ExplainFinish(v);
+    sqlite3DebugPrintf("%s", sqlite3VdbeExplanation(v));
+  }
 #endif
-        {
-          bestBtreeIndex(&sWBI);
-        }
-        assert( isOptimal || (sWBI.cost.used&sWBI.notValid)==0 );
-
-        /* If an INDEXED BY clause is present, then the plan must use that
-        ** index if it uses any index at all */
-        assert( sWBI.pSrc->pIndex==0 
-                  || (sWBI.cost.plan.wsFlags & WHERE_NOT_FULLSCAN)==0
-                  || sWBI.cost.plan.u.pIdx==sWBI.pSrc->pIndex );
-
-        if( isOptimal && (sWBI.cost.plan.wsFlags & WHERE_NOT_FULLSCAN)==0 ){
-          notIndexed |= m;
-        }
-        if( isOptimal ){
-          pWInfo->a[j].rOptCost = sWBI.cost.rCost;
-        }else if( ckOptimal ){
-          /* If two or more tables have nearly the same outer loop cost, but
-          ** very different inner loop (optimal) cost, we want to choose
-          ** for the outer loop that table which benefits the least from
-          ** being in the inner loop.  The following code scales the 
-          ** outer loop cost estimate to accomplish that. */
-          WHERETRACE(("   scaling cost from %.1f to %.1f\n",
-                      sWBI.cost.rCost,
-                      sWBI.cost.rCost/pWInfo->a[j].rOptCost));
-          sWBI.cost.rCost /= pWInfo->a[j].rOptCost;
-        }
-
-        /* Conditions under which this table becomes the best so far:
-        **
-        **   (1) The table must not depend on other tables that have not
-        **       yet run.  (In other words, it must not depend on tables
-        **       in inner loops.)
-        **
-        **   (2) (This rule was removed on 2012-11-09.  The scaling of the
-        **       cost using the optimal scan cost made this rule obsolete.)
-        **
-        **   (3) All tables have an INDEXED BY clause or this table lacks an
-        **       INDEXED BY clause or this table uses the specific
-        **       index specified by its INDEXED BY clause.  This rule ensures
-        **       that a best-so-far is always selected even if an impossible
-        **       combination of INDEXED BY clauses are given.  The error
-        **       will be detected and relayed back to the application later.
-        **       The NEVER() comes about because rule (2) above prevents
-        **       An indexable full-table-scan from reaching rule (3).
-        **
-        **   (4) The plan cost must be lower than prior plans, where "cost"
-        **       is defined by the compareCost() function above. 
-        */
-        if( (sWBI.cost.used&sWBI.notValid)==0                    /* (1) */
-            && (nUnconstrained==0 || sWBI.pSrc->pIndex==0        /* (3) */
-                || NEVER((sWBI.cost.plan.wsFlags & WHERE_NOT_FULLSCAN)!=0))
-            && (bestJ<0 || compareCost(&sWBI.cost, &bestPlan))   /* (4) */
-        ){
-          WHERETRACE(("   === table %d (%s) is best so far\n"
-                      "       cost=%.1f, nRow=%.1f, nOBSat=%d, wsFlags=%08x\n",
-                      j, sWBI.pSrc->pTab->zName,
-                      sWBI.cost.rCost, sWBI.cost.plan.nRow,
-                      sWBI.cost.plan.nOBSat, sWBI.cost.plan.wsFlags));
-          bestPlan = sWBI.cost;
-          bestJ = j;
-        }
-
-        /* In a join like "w JOIN x LEFT JOIN y JOIN z"  make sure that
-        ** table y (and not table z) is always the next inner loop inside
-        ** of table x. */
-        if( (sWBI.pSrc->jointype & JT_LEFT)!=0 ) break;
+  if( nTabList!=1 || whereShortCut(&sWLB)==0 ){
+    rc = whereLoopAddAll(&sWLB);
+    if( rc ) goto whereBeginError;
+  
+    /* Display all of the WhereLoop objects if wheretrace is enabled */
+#ifdef WHERETRACE_ENABLED /* !=0 */
+    if( sqlite3WhereTrace ){
+      WhereLoop *p;
+      int i;
+      static char zLabel[] = "0123456789abcdefghijklmnopqrstuvwyxz"
+                                       "ABCDEFGHIJKLMNOPQRSTUVWYXZ";
+      for(p=pWInfo->pLoops, i=0; p; p=p->pNextLoop, i++){
+        p->cId = zLabel[i%sizeof(zLabel)];
+        whereLoopPrint(p, sWLB.pWC);
       }
     }
-    assert( bestJ>=0 );
-    assert( sWBI.notValid & getMask(pMaskSet, pTabList->a[bestJ].iCursor) );
-    assert( bestJ==iFrom || (pTabList->a[iFrom].jointype & JT_LEFT)==0 );
-    testcase( bestJ>iFrom && (pTabList->a[iFrom].jointype & JT_CROSS)!=0 );
-    testcase( bestJ>iFrom && bestJ<nTabList-1
-                          && (pTabList->a[bestJ+1].jointype & JT_LEFT)!=0 );
-    WHERETRACE(("*** Optimizer selects table %d (%s) for loop %d with:\n"
-                "    cost=%.1f, nRow=%.1f, nOBSat=%d, wsFlags=0x%08x\n",
-                bestJ, pTabList->a[bestJ].pTab->zName,
-                pLevel-pWInfo->a, bestPlan.rCost, bestPlan.plan.nRow,
-                bestPlan.plan.nOBSat, bestPlan.plan.wsFlags));
-    if( (bestPlan.plan.wsFlags & WHERE_DISTINCT)!=0 ){
-      assert( pWInfo->eDistinct==0 );
-      pWInfo->eDistinct = WHERE_DISTINCT_ORDERED;
-    }
-    andFlags &= bestPlan.plan.wsFlags;
-    pLevel->plan = bestPlan.plan;
-    pLevel->iTabCur = pTabList->a[bestJ].iCursor;
-    testcase( bestPlan.plan.wsFlags & WHERE_INDEXED );
-    testcase( bestPlan.plan.wsFlags & WHERE_TEMP_INDEX );
-    if( bestPlan.plan.wsFlags & (WHERE_INDEXED|WHERE_TEMP_INDEX) ){
-      if( (wctrlFlags & WHERE_ONETABLE_ONLY) 
-       && (bestPlan.plan.wsFlags & WHERE_TEMP_INDEX)==0 
-      ){
-        pLevel->iIdxCur = iIdxCur;
-      }else{
-        pLevel->iIdxCur = pParse->nTab++;
-      }
-    }else{
-      pLevel->iIdxCur = -1;
-    }
-    sWBI.notValid &= ~getMask(pMaskSet, pTabList->a[bestJ].iCursor);
-    pLevel->iFrom = (u8)bestJ;
-    if( bestPlan.plan.nRow>=(double)1 ){
-      pParse->nQueryLoop *= bestPlan.plan.nRow;
-    }
-
-    /* Check that if the table scanned by this loop iteration had an
-    ** INDEXED BY clause attached to it, that the named index is being
-    ** used for the scan. If not, then query compilation has failed.
-    ** Return an error.
-    */
-    pIdx = pTabList->a[bestJ].pIndex;
-    if( pIdx ){
-      if( (bestPlan.plan.wsFlags & WHERE_INDEXED)==0 ){
-        sqlite3ErrorMsg(pParse, "cannot use index: %s", pIdx->zName);
-        goto whereBeginError;
-      }else{
-        /* If an INDEXED BY clause is used, the bestIndex() function is
-        ** guaranteed to find the index specified in the INDEXED BY clause
-        ** if it find an index at all. */
-        assert( bestPlan.plan.u.pIdx==pIdx );
-      }
+#endif
+  
+    wherePathSolver(pWInfo, 0);
+    if( db->mallocFailed ) goto whereBeginError;
+    if( pWInfo->pOrderBy ){
+       wherePathSolver(pWInfo, pWInfo->nRowOut+1);
+       if( db->mallocFailed ) goto whereBeginError;
     }
   }
-  WHERETRACE(("*** Optimizer Finished ***\n"));
-  if( pParse->nErr || db->mallocFailed ){
+  if( pWInfo->pOrderBy==0 && (db->flags & SQLITE_ReverseOrder)!=0 ){
+     pWInfo->revMask = (Bitmask)(-1);
+  }
+  if( pParse->nErr || NEVER(db->mallocFailed) ){
     goto whereBeginError;
   }
-  if( nTabList ){
-    pLevel--;
-    pWInfo->nOBSat = pLevel->plan.nOBSat;
-  }else{
-    pWInfo->nOBSat = 0;
+#ifdef WHERETRACE_ENABLED /* !=0 */
+  if( sqlite3WhereTrace ){
+    int ii;
+    sqlite3DebugPrintf("---- Solution nRow=%d", pWInfo->nRowOut);
+    if( pWInfo->nOBSat>0 ){
+      sqlite3DebugPrintf(" ORDERBY=%d,0x%llx", pWInfo->nOBSat, pWInfo->revMask);
+    }
+    switch( pWInfo->eDistinct ){
+      case WHERE_DISTINCT_UNIQUE: {
+        sqlite3DebugPrintf("  DISTINCT=unique");
+        break;
+      }
+      case WHERE_DISTINCT_ORDERED: {
+        sqlite3DebugPrintf("  DISTINCT=ordered");
+        break;
+      }
+      case WHERE_DISTINCT_UNORDERED: {
+        sqlite3DebugPrintf("  DISTINCT=unordered");
+        break;
+      }
+    }
+    sqlite3DebugPrintf("\n");
+    for(ii=0; ii<pWInfo->nLevel; ii++){
+      whereLoopPrint(pWInfo->a[ii].pWLoop, sWLB.pWC);
+    }
   }
-
-  /* If the total query only selects a single row, then the ORDER BY
-  ** clause is irrelevant.
-  */
-  if( (andFlags & WHERE_UNIQUE)!=0 && pOrderBy ){
-    assert( nTabList==0 || (pLevel->plan.wsFlags & WHERE_ALL_UNIQUE)!=0 );
-    pWInfo->nOBSat = pOrderBy->nExpr;
+#endif
+  /* Attempt to omit tables from the join that do not effect the result */
+  if( pWInfo->nLevel>=2
+   && pResultSet!=0
+   && OptimizationEnabled(db, SQLITE_OmitNoopJoin)
+  ){
+    Bitmask tabUsed = exprListTableUsage(pMaskSet, pResultSet);
+    if( sWLB.pOrderBy ) tabUsed |= exprListTableUsage(pMaskSet, sWLB.pOrderBy);
+    while( pWInfo->nLevel>=2 ){
+      WhereTerm *pTerm, *pEnd;
+      pLoop = pWInfo->a[pWInfo->nLevel-1].pWLoop;
+      if( (pWInfo->pTabList->a[pLoop->iTab].jointype & JT_LEFT)==0 ) break;
+      if( (wctrlFlags & WHERE_WANT_DISTINCT)==0
+       && (pLoop->wsFlags & WHERE_ONEROW)==0
+      ){
+        break;
+      }
+      if( (tabUsed & pLoop->maskSelf)!=0 ) break;
+      pEnd = sWLB.pWC->a + sWLB.pWC->nTerm;
+      for(pTerm=sWLB.pWC->a; pTerm<pEnd; pTerm++){
+        if( (pTerm->prereqAll & pLoop->maskSelf)!=0
+         && !ExprHasProperty(pTerm->pExpr, EP_FromJoin)
+        ){
+          break;
+        }
+      }
+      if( pTerm<pEnd ) break;
+      WHERETRACE(0xffff, ("-> drop loop %c not used\n", pLoop->cId));
+      pWInfo->nLevel--;
+      nTabList--;
+    }
   }
+  WHERETRACE(0xffff,("*** Optimizer Finished ***\n"));
+  pWInfo->pParse->nQueryLoop += pWInfo->nRowOut;
 
   /* If the caller is an UPDATE or DELETE statement that is requesting
   ** to use a one-pass algorithm, determine if this is appropriate.
-  ** The one-pass algorithm only works if the WHERE clause constraints
+  ** The one-pass algorithm only works if the WHERE clause constrains
   ** the statement to update a single row.
   */
   assert( (wctrlFlags & WHERE_ONEPASS_DESIRED)==0 || pWInfo->nLevel==1 );
-  if( (wctrlFlags & WHERE_ONEPASS_DESIRED)!=0 && (andFlags & WHERE_UNIQUE)!=0 ){
+  if( (wctrlFlags & WHERE_ONEPASS_DESIRED)!=0 
+   && (pWInfo->a[0].pWLoop->wsFlags & WHERE_ONEROW)!=0 ){
     pWInfo->okOnePass = 1;
-    pWInfo->a[0].plan.wsFlags &= ~WHERE_IDX_ONLY;
+    if( HasRowid(pTabList->a[0].pTab) ){
+      pWInfo->a[0].pWLoop->wsFlags &= ~WHERE_IDX_ONLY;
+    }
   }
 
   /* Open all tables in the pTabList and any indices selected for
   ** searching those tables.
   */
-  sqlite3CodeVerifySchema(pParse, -1); /* Insert the cookie verifier Goto */
   notReady = ~(Bitmask)0;
-  pWInfo->nRowOut = (double)1;
   for(ii=0, pLevel=pWInfo->a; ii<nTabList; ii++, pLevel++){
     Table *pTab;     /* Table to open */
     int iDb;         /* Index of database containing table/index */
@@ -109856,13 +116074,13 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
 
     pTabItem = &pTabList->a[pLevel->iFrom];
     pTab = pTabItem->pTab;
-    pWInfo->nRowOut *= pLevel->plan.nRow;
     iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+    pLoop = pLevel->pWLoop;
     if( (pTab->tabFlags & TF_Ephemeral)!=0 || pTab->pSelect ){
       /* Do nothing */
     }else
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-    if( (pLevel->plan.wsFlags & WHERE_VIRTUALTABLE)!=0 ){
+    if( (pLoop->wsFlags & WHERE_VIRTUALTABLE)!=0 ){
       const char *pVTab = (const char *)sqlite3GetVTable(db, pTab);
       int iCur = pTabItem->iCursor;
       sqlite3VdbeAddOp4(v, OP_VOpen, iCur, 0, 0, pVTab, P4_VTAB);
@@ -109870,13 +116088,18 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
       /* noop */
     }else
 #endif
-    if( (pLevel->plan.wsFlags & WHERE_IDX_ONLY)==0
+    if( (pLoop->wsFlags & WHERE_IDX_ONLY)==0
          && (wctrlFlags & WHERE_OMIT_OPEN_CLOSE)==0 ){
-      int op = pWInfo->okOnePass ? OP_OpenWrite : OP_OpenRead;
+      int op = OP_OpenRead;
+      if( pWInfo->okOnePass ){
+        op = OP_OpenWrite;
+        pWInfo->aiCurOnePass[0] = pTabItem->iCursor;
+      };
       sqlite3OpenTable(pParse, pTabItem->iCursor, iDb, pTab, op);
-      testcase( pTab->nCol==BMS-1 );
-      testcase( pTab->nCol==BMS );
-      if( !pWInfo->okOnePass && pTab->nCol<BMS ){
+      assert( pTabItem->iCursor==pLevel->iTabCur );
+      testcase( !pWInfo->okOnePass && pTab->nCol==BMS-1 );
+      testcase( !pWInfo->okOnePass && pTab->nCol==BMS );
+      if( !pWInfo->okOnePass && pTab->nCol<BMS && HasRowid(pTab) ){
         Bitmask b = pTabItem->colUsed;
         int n = 0;
         for(; b; b=b>>1, n++){}
@@ -109887,23 +116110,45 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
     }else{
       sqlite3TableLock(pParse, iDb, pTab->tnum, 0, pTab->zName);
     }
-#ifndef SQLITE_OMIT_AUTOMATIC_INDEX
-    if( (pLevel->plan.wsFlags & WHERE_TEMP_INDEX)!=0 ){
-      constructAutomaticIndex(pParse, sWBI.pWC, pTabItem, notReady, pLevel);
-    }else
-#endif
-    if( (pLevel->plan.wsFlags & WHERE_INDEXED)!=0 ){
-      Index *pIx = pLevel->plan.u.pIdx;
-      KeyInfo *pKey = sqlite3IndexKeyinfo(pParse, pIx);
-      int iIndexCur = pLevel->iIdxCur;
+    if( pLoop->wsFlags & WHERE_INDEXED ){
+      Index *pIx = pLoop->u.btree.pIndex;
+      int iIndexCur;
+      int op = OP_OpenRead;
+      /* iIdxCur is always set if to a positive value if ONEPASS is possible */
+      assert( iIdxCur!=0 || (pWInfo->wctrlFlags & WHERE_ONEPASS_DESIRED)==0 );
+      if( !HasRowid(pTab) && IsPrimaryKeyIndex(pIx)
+       && (wctrlFlags & WHERE_ONETABLE_ONLY)!=0
+      ){
+        /* This is one term of an OR-optimization using the PRIMARY KEY of a
+        ** WITHOUT ROWID table.  No need for a separate index */
+        iIndexCur = pLevel->iTabCur;
+        op = 0;
+      }else if( pWInfo->okOnePass ){
+        Index *pJ = pTabItem->pTab->pIndex;
+        iIndexCur = iIdxCur;
+        assert( wctrlFlags & WHERE_ONEPASS_DESIRED );
+        while( ALWAYS(pJ) && pJ!=pIx ){
+          iIndexCur++;
+          pJ = pJ->pNext;
+        }
+        op = OP_OpenWrite;
+        pWInfo->aiCurOnePass[1] = iIndexCur;
+      }else if( iIdxCur && (wctrlFlags & WHERE_ONETABLE_ONLY)!=0 ){
+        iIndexCur = iIdxCur;
+      }else{
+        iIndexCur = pParse->nTab++;
+      }
+      pLevel->iIdxCur = iIndexCur;
       assert( pIx->pSchema==pTab->pSchema );
       assert( iIndexCur>=0 );
-      sqlite3VdbeAddOp4(v, OP_OpenRead, iIndexCur, pIx->tnum, iDb,
-                        (char*)pKey, P4_KEYINFO_HANDOFF);
-      VdbeComment((v, "%s", pIx->zName));
+      if( op ){
+        sqlite3VdbeAddOp3(v, op, iIndexCur, pIx->tnum, iDb);
+        sqlite3VdbeSetP4KeyInfo(pParse, pIx);
+        VdbeComment((v, "%s", pIx->zName));
+      }
     }
-    sqlite3CodeVerifySchema(pParse, iDb);
-    notReady &= ~getMask(sWBI.pWC->pMaskSet, pTabItem->iCursor);
+    if( iDb>=0 ) sqlite3CodeVerifySchema(pParse, iDb);
+    notReady &= ~getMask(&pWInfo->sMaskSet, pTabItem->iCursor);
   }
   pWInfo->iTop = sqlite3VdbeCurrentAddr(v);
   if( db->mallocFailed ) goto whereBeginError;
@@ -109915,67 +116160,21 @@ SQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
   notReady = ~(Bitmask)0;
   for(ii=0; ii<nTabList; ii++){
     pLevel = &pWInfo->a[ii];
+#ifndef SQLITE_OMIT_AUTOMATIC_INDEX
+    if( (pLevel->pWLoop->wsFlags & WHERE_AUTO_INDEX)!=0 ){
+      constructAutomaticIndex(pParse, &pWInfo->sWC,
+                &pTabList->a[pLevel->iFrom], notReady, pLevel);
+      if( db->mallocFailed ) goto whereBeginError;
+    }
+#endif
     explainOneScan(pParse, pTabList, pLevel, ii, pLevel->iFrom, wctrlFlags);
-    notReady = codeOneLoopStart(pWInfo, ii, wctrlFlags, notReady);
+    pLevel->addrBody = sqlite3VdbeCurrentAddr(v);
+    notReady = codeOneLoopStart(pWInfo, ii, notReady);
     pWInfo->iContinue = pLevel->addrCont;
   }
 
-#ifdef SQLITE_TEST  /* For testing and debugging use only */
-  /* Record in the query plan information about the current table
-  ** and the index used to access it (if any).  If the table itself
-  ** is not used, its name is just '{}'.  If no index is used
-  ** the index is listed as "{}".  If the primary key is used the
-  ** index name is '*'.
-  */
-  for(ii=0; ii<nTabList; ii++){
-    char *z;
-    int n;
-    int w;
-    struct SrcList_item *pTabItem;
-
-    pLevel = &pWInfo->a[ii];
-    w = pLevel->plan.wsFlags;
-    pTabItem = &pTabList->a[pLevel->iFrom];
-    z = pTabItem->zAlias;
-    if( z==0 ) z = pTabItem->pTab->zName;
-    n = sqlite3Strlen30(z);
-    if( n+nQPlan < sizeof(sqlite3_query_plan)-10 ){
-      if( (w & WHERE_IDX_ONLY)!=0 && (w & WHERE_COVER_SCAN)==0 ){
-        memcpy(&sqlite3_query_plan[nQPlan], "{}", 2);
-        nQPlan += 2;
-      }else{
-        memcpy(&sqlite3_query_plan[nQPlan], z, n);
-        nQPlan += n;
-      }
-      sqlite3_query_plan[nQPlan++] = ' ';
-    }
-    testcase( w & WHERE_ROWID_EQ );
-    testcase( w & WHERE_ROWID_RANGE );
-    if( w & (WHERE_ROWID_EQ|WHERE_ROWID_RANGE) ){
-      memcpy(&sqlite3_query_plan[nQPlan], "* ", 2);
-      nQPlan += 2;
-    }else if( (w & WHERE_INDEXED)!=0 && (w & WHERE_COVER_SCAN)==0 ){
-      n = sqlite3Strlen30(pLevel->plan.u.pIdx->zName);
-      if( n+nQPlan < sizeof(sqlite3_query_plan)-2 ){
-        memcpy(&sqlite3_query_plan[nQPlan], pLevel->plan.u.pIdx->zName, n);
-        nQPlan += n;
-        sqlite3_query_plan[nQPlan++] = ' ';
-      }
-    }else{
-      memcpy(&sqlite3_query_plan[nQPlan], "{} ", 3);
-      nQPlan += 3;
-    }
-  }
-  while( nQPlan>0 && sqlite3_query_plan[nQPlan-1]==' ' ){
-    sqlite3_query_plan[--nQPlan] = 0;
-  }
-  sqlite3_query_plan[nQPlan] = 0;
-  nQPlan = 0;
-#endif /* SQLITE_TEST // Testing and debugging use only */
-
-  /* Record the continuation address in the WhereInfo structure.  Then
-  ** clean up and return.
-  */
+  /* Done. */
+  VdbeModuleComment((v, "Begin WHERE-core"));
   return pWInfo;
 
   /* Jump here if malloc fails */
@@ -109996,40 +116195,56 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
   Vdbe *v = pParse->pVdbe;
   int i;
   WhereLevel *pLevel;
+  WhereLoop *pLoop;
   SrcList *pTabList = pWInfo->pTabList;
   sqlite3 *db = pParse->db;
 
   /* Generate loop termination code.
   */
+  VdbeModuleComment((v, "End WHERE-core"));
   sqlite3ExprCacheClear(pParse);
   for(i=pWInfo->nLevel-1; i>=0; i--){
+    int addr;
     pLevel = &pWInfo->a[i];
+    pLoop = pLevel->pWLoop;
     sqlite3VdbeResolveLabel(v, pLevel->addrCont);
     if( pLevel->op!=OP_Noop ){
-      sqlite3VdbeAddOp2(v, pLevel->op, pLevel->p1, pLevel->p2);
+      sqlite3VdbeAddOp3(v, pLevel->op, pLevel->p1, pLevel->p2, pLevel->p3);
       sqlite3VdbeChangeP5(v, pLevel->p5);
+      VdbeCoverage(v);
+      VdbeCoverageIf(v, pLevel->op==OP_Next);
+      VdbeCoverageIf(v, pLevel->op==OP_Prev);
+      VdbeCoverageIf(v, pLevel->op==OP_VNext);
     }
-    if( pLevel->plan.wsFlags & WHERE_IN_ABLE && pLevel->u.in.nIn>0 ){
+    if( pLoop->wsFlags & WHERE_IN_ABLE && pLevel->u.in.nIn>0 ){
       struct InLoop *pIn;
       int j;
       sqlite3VdbeResolveLabel(v, pLevel->addrNxt);
       for(j=pLevel->u.in.nIn, pIn=&pLevel->u.in.aInLoop[j-1]; j>0; j--, pIn--){
         sqlite3VdbeJumpHere(v, pIn->addrInTop+1);
         sqlite3VdbeAddOp2(v, pIn->eEndLoopOp, pIn->iCur, pIn->addrInTop);
+        VdbeCoverage(v);
+        VdbeCoverageIf(v, pIn->eEndLoopOp==OP_PrevIfOpen);
+        VdbeCoverageIf(v, pIn->eEndLoopOp==OP_NextIfOpen);
         sqlite3VdbeJumpHere(v, pIn->addrInTop-1);
       }
       sqlite3DbFree(db, pLevel->u.in.aInLoop);
     }
     sqlite3VdbeResolveLabel(v, pLevel->addrBrk);
+    if( pLevel->addrSkip ){
+      sqlite3VdbeAddOp2(v, OP_Goto, 0, pLevel->addrSkip);
+      VdbeComment((v, "next skip-scan on %s", pLoop->u.btree.pIndex->zName));
+      sqlite3VdbeJumpHere(v, pLevel->addrSkip);
+      sqlite3VdbeJumpHere(v, pLevel->addrSkip-2);
+    }
     if( pLevel->iLeftJoin ){
-      int addr;
-      addr = sqlite3VdbeAddOp1(v, OP_IfPos, pLevel->iLeftJoin);
-      assert( (pLevel->plan.wsFlags & WHERE_IDX_ONLY)==0
-           || (pLevel->plan.wsFlags & WHERE_INDEXED)!=0 );
-      if( (pLevel->plan.wsFlags & WHERE_IDX_ONLY)==0 ){
+      addr = sqlite3VdbeAddOp1(v, OP_IfPos, pLevel->iLeftJoin); VdbeCoverage(v);
+      assert( (pLoop->wsFlags & WHERE_IDX_ONLY)==0
+           || (pLoop->wsFlags & WHERE_INDEXED)!=0 );
+      if( (pLoop->wsFlags & WHERE_IDX_ONLY)==0 ){
         sqlite3VdbeAddOp1(v, OP_NullRow, pTabList->a[i].iCursor);
       }
-      if( pLevel->iIdxCur>=0 ){
+      if( pLoop->wsFlags & WHERE_INDEXED ){
         sqlite3VdbeAddOp1(v, OP_NullRow, pLevel->iIdxCur);
       }
       if( pLevel->op==OP_Return ){
@@ -110039,6 +116254,8 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
       }
       sqlite3VdbeJumpHere(v, addr);
     }
+    VdbeModuleComment((v, "End WHERE-loop%d: %s", i,
+                     pWInfo->pTabList->a[pLevel->iFrom].pTab->zName));
   }
 
   /* The "break" point is here, just past the end of the outer loop.
@@ -110046,33 +116263,65 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
   */
   sqlite3VdbeResolveLabel(v, pWInfo->iBreak);
 
-  /* Close all of the cursors that were opened by sqlite3WhereBegin.
-  */
-  assert( pWInfo->nLevel==1 || pWInfo->nLevel==pTabList->nSrc );
+  assert( pWInfo->nLevel<=pTabList->nSrc );
   for(i=0, pLevel=pWInfo->a; i<pWInfo->nLevel; i++, pLevel++){
+    int k, last;
+    VdbeOp *pOp;
     Index *pIdx = 0;
     struct SrcList_item *pTabItem = &pTabList->a[pLevel->iFrom];
     Table *pTab = pTabItem->pTab;
     assert( pTab!=0 );
+    pLoop = pLevel->pWLoop;
+
+    /* For a co-routine, change all OP_Column references to the table of
+    ** the co-routine into OP_SCopy of result contained in a register.
+    ** OP_Rowid becomes OP_Null.
+    */
+    if( pTabItem->viaCoroutine && !db->mallocFailed ){
+      last = sqlite3VdbeCurrentAddr(v);
+      k = pLevel->addrBody;
+      pOp = sqlite3VdbeGetOp(v, k);
+      for(; k<last; k++, pOp++){
+        if( pOp->p1!=pLevel->iTabCur ) continue;
+        if( pOp->opcode==OP_Column ){
+          pOp->opcode = OP_Copy;
+          pOp->p1 = pOp->p2 + pTabItem->regResult;
+          pOp->p2 = pOp->p3;
+          pOp->p3 = 0;
+        }else if( pOp->opcode==OP_Rowid ){
+          pOp->opcode = OP_Null;
+          pOp->p1 = 0;
+          pOp->p3 = 0;
+        }
+      }
+      continue;
+    }
+
+    /* Close all of the cursors that were opened by sqlite3WhereBegin.
+    ** Except, do not close cursors that will be reused by the OR optimization
+    ** (WHERE_OMIT_OPEN_CLOSE).  And do not close the OP_OpenWrite cursors
+    ** created for the ONEPASS optimization.
+    */
     if( (pTab->tabFlags & TF_Ephemeral)==0
      && pTab->pSelect==0
      && (pWInfo->wctrlFlags & WHERE_OMIT_OPEN_CLOSE)==0
     ){
-      int ws = pLevel->plan.wsFlags;
+      int ws = pLoop->wsFlags;
       if( !pWInfo->okOnePass && (ws & WHERE_IDX_ONLY)==0 ){
         sqlite3VdbeAddOp1(v, OP_Close, pTabItem->iCursor);
       }
-      if( (ws & WHERE_INDEXED)!=0 && (ws & WHERE_TEMP_INDEX)==0 ){
+      if( (ws & WHERE_INDEXED)!=0
+       && (ws & (WHERE_IPK|WHERE_AUTO_INDEX))==0 
+       && pLevel->iIdxCur!=pWInfo->aiCurOnePass[1]
+      ){
         sqlite3VdbeAddOp1(v, OP_Close, pLevel->iIdxCur);
       }
     }
 
-    /* If this scan uses an index, make code substitutions to read data
-    ** from the index in preference to the table. Sometimes, this means
-    ** the table need never be read from. This is a performance boost,
-    ** as the vdbe level waits until the table is read before actually
-    ** seeking the table cursor to the record corresponding to the current
-    ** position in the index.
+    /* If this scan uses an index, make VDBE code substitutions to read data
+    ** from the index instead of from the table where possible.  In some cases
+    ** this optimization prevents the table from ever being read, which can
+    ** yield a significant performance boost.
     ** 
     ** Calls to the code generator in between sqlite3WhereBegin and
     ** sqlite3WhereEnd will have created code that references the table
@@ -110080,29 +116329,30 @@ SQLITE_PRIVATE void sqlite3WhereEnd(WhereInfo *pWInfo){
     ** that reference the table and converts them into opcodes that
     ** reference the index.
     */
-    if( pLevel->plan.wsFlags & WHERE_INDEXED ){
-      pIdx = pLevel->plan.u.pIdx;
-    }else if( pLevel->plan.wsFlags & WHERE_MULTI_OR ){
+    if( pLoop->wsFlags & (WHERE_INDEXED|WHERE_IDX_ONLY) ){
+      pIdx = pLoop->u.btree.pIndex;
+    }else if( pLoop->wsFlags & WHERE_MULTI_OR ){
       pIdx = pLevel->u.pCovidx;
     }
-    if( pIdx && !db->mallocFailed){
-      int k, j, last;
-      VdbeOp *pOp;
-
-      pOp = sqlite3VdbeGetOp(v, pWInfo->iTop);
+    if( pIdx && !db->mallocFailed ){
       last = sqlite3VdbeCurrentAddr(v);
-      for(k=pWInfo->iTop; k<last; k++, pOp++){
+      k = pLevel->addrBody;
+      pOp = sqlite3VdbeGetOp(v, k);
+      for(; k<last; k++, pOp++){
         if( pOp->p1!=pLevel->iTabCur ) continue;
         if( pOp->opcode==OP_Column ){
-          for(j=0; j<pIdx->nColumn; j++){
-            if( pOp->p2==pIdx->aiColumn[j] ){
-              pOp->p2 = j;
-              pOp->p1 = pLevel->iIdxCur;
-              break;
-            }
+          int x = pOp->p2;
+          assert( pIdx->pTable==pTab );
+          if( !HasRowid(pTab) ){
+            Index *pPk = sqlite3PrimaryKeyIndex(pTab);
+            x = pPk->aiColumn[x];
           }
-          assert( (pLevel->plan.wsFlags & WHERE_IDX_ONLY)==0
-               || j<pIdx->nColumn );
+          x = sqlite3ColumnOfIndex(pIdx, x);
+          if( x>=0 ){
+            pOp->p2 = x;
+            pOp->p1 = pLevel->iIdxCur;
+          }
+          assert( (pLoop->wsFlags & WHERE_IDX_ONLY)==0 || x>=0 );
         }else if( pOp->opcode==OP_Rowid ){
           pOp->p1 = pLevel->iIdxCur;
           pOp->opcode = OP_IdxRowid;
@@ -110179,14 +116429,6 @@ struct TrigEvent { int a; IdList * b; };
 */
 struct AttachKey { int type;  Token key; };
 
-/*
-** One or more VALUES claues
-*/
-struct ValueList {
-  ExprList *pList;
-  Select *pSelect;
-};
-
 
   /* This is a utility routine used to set the ExprSpan.zStart and
   ** ExprSpan.zEnd values of pOut so that the span covers the complete
@@ -110310,28 +116552,28 @@ struct ValueList {
 **                       defined, then do no error processing.
 */
 #define YYCODETYPE unsigned char
-#define YYNOCODE 251
+#define YYNOCODE 254
 #define YYACTIONTYPE unsigned short int
-#define YYWILDCARD 67
+#define YYWILDCARD 70
 #define sqlite3ParserTOKENTYPE Token
 typedef union {
   int yyinit;
   sqlite3ParserTOKENTYPE yy0;
-  struct LimitVal yy64;
-  Expr* yy122;
-  Select* yy159;
-  IdList* yy180;
-  struct {int value; int mask;} yy207;
-  u8 yy258;
-  u16 yy305;
-  struct LikeOp yy318;
-  TriggerStep* yy327;
-  ExprSpan yy342;
-  SrcList* yy347;
-  int yy392;
-  struct TrigEvent yy410;
-  ExprList* yy442;
-  struct ValueList yy487;
+  Select* yy3;
+  ExprList* yy14;
+  With* yy59;
+  SrcList* yy65;
+  struct LikeOp yy96;
+  Expr* yy132;
+  u8 yy186;
+  int yy328;
+  ExprSpan yy346;
+  struct TrigEvent yy378;
+  u16 yy381;
+  IdList* yy408;
+  struct {int value; int mask;} yy429;
+  TriggerStep* yy473;
+  struct LimitVal yy476;
 } YYMINORTYPE;
 #ifndef YYSTACKDEPTH
 #define YYSTACKDEPTH 100
@@ -110340,7 +116582,7 @@ typedef union {
 #define sqlite3ParserARG_PDECL ,Parse *pParse
 #define sqlite3ParserARG_FETCH Parse *pParse = yypParser->pParse
 #define sqlite3ParserARG_STORE yypParser->pParse = pParse
-#define YYNSTATE 627
+#define YYNSTATE 642
 #define YYNRULE 327
 #define YYFALLBACK 1
 #define YY_NO_ACTION      (YYNSTATE+YYNRULE+2)
@@ -110411,474 +116653,463 @@ static const YYMINORTYPE yyzerominor = { 0 };
 **                     shifting non-terminals after a reduce.
 **  yy_default[]       Default action for each state.
 */
-#define YY_ACTTAB_COUNT (1564)
+#define YY_ACTTAB_COUNT (1497)
 static const YYACTIONTYPE yy_action[] = {
- /*     0 */   309,  955,  184,  417,    2,  171,  624,  594,   56,   56,
- /*    10 */    56,   56,   49,   54,   54,   54,   54,   53,   53,   52,
- /*    20 */    52,   52,   51,  233,  620,  619,  298,  620,  619,  234,
- /*    30 */   587,  581,   56,   56,   56,   56,   19,   54,   54,   54,
- /*    40 */    54,   53,   53,   52,   52,   52,   51,  233,  605,   57,
- /*    50 */    58,   48,  579,  578,  580,  580,   55,   55,   56,   56,
- /*    60 */    56,   56,  541,   54,   54,   54,   54,   53,   53,   52,
- /*    70 */    52,   52,   51,  233,  309,  594,  325,  196,  195,  194,
- /*    80 */    33,   54,   54,   54,   54,   53,   53,   52,   52,   52,
- /*    90 */    51,  233,  617,  616,  165,  617,  616,  380,  377,  376,
- /*   100 */   407,  532,  576,  576,  587,  581,  303,  422,  375,   59,
- /*   110 */    53,   53,   52,   52,   52,   51,  233,   50,   47,  146,
- /*   120 */   574,  545,   65,   57,   58,   48,  579,  578,  580,  580,
- /*   130 */    55,   55,   56,   56,   56,   56,  213,   54,   54,   54,
- /*   140 */    54,   53,   53,   52,   52,   52,   51,  233,  309,  223,
- /*   150 */   539,  420,  170,  176,  138,  280,  383,  275,  382,  168,
- /*   160 */   489,  551,  409,  668,  620,  619,  271,  438,  409,  438,
- /*   170 */   550,  604,   67,  482,  507,  618,  599,  412,  587,  581,
- /*   180 */   600,  483,  618,  412,  618,  598,   91,  439,  440,  439,
- /*   190 */   335,  598,   73,  669,  222,  266,  480,   57,   58,   48,
- /*   200 */   579,  578,  580,  580,   55,   55,   56,   56,   56,   56,
- /*   210 */   670,   54,   54,   54,   54,   53,   53,   52,   52,   52,
- /*   220 */    51,  233,  309,  279,  232,  231,    1,  132,  200,  385,
- /*   230 */   620,  619,  617,  616,  278,  435,  289,  563,  175,  262,
- /*   240 */   409,  264,  437,  497,  436,  166,  441,  568,  336,  568,
- /*   250 */   201,  537,  587,  581,  599,  412,  165,  594,  600,  380,
- /*   260 */   377,  376,  597,  598,   92,  523,  618,  569,  569,  592,
- /*   270 */   375,   57,   58,   48,  579,  578,  580,  580,   55,   55,
- /*   280 */    56,   56,   56,   56,  597,   54,   54,   54,   54,   53,
- /*   290 */    53,   52,   52,   52,   51,  233,  309,  463,  617,  616,
- /*   300 */   590,  590,  590,  174,  272,  396,  409,  272,  409,  548,
- /*   310 */   397,  620,  619,   68,  326,  620,  619,  620,  619,  618,
- /*   320 */   546,  412,  618,  412,  471,  594,  587,  581,  472,  598,
- /*   330 */    92,  598,   92,   52,   52,   52,   51,  233,  513,  512,
- /*   340 */   206,  322,  363,  464,  221,   57,   58,   48,  579,  578,
- /*   350 */   580,  580,   55,   55,   56,   56,   56,   56,  529,   54,
- /*   360 */    54,   54,   54,   53,   53,   52,   52,   52,   51,  233,
- /*   370 */   309,  396,  409,  396,  597,  372,  386,  530,  347,  617,
- /*   380 */   616,  575,  202,  617,  616,  617,  616,  412,  620,  619,
- /*   390 */   145,  255,  346,  254,  577,  598,   74,  351,   45,  489,
- /*   400 */   587,  581,  235,  189,  464,  544,  167,  296,  187,  469,
- /*   410 */   479,   67,   62,   39,  618,  546,  597,  345,  573,   57,
- /*   420 */    58,   48,  579,  578,  580,  580,   55,   55,   56,   56,
- /*   430 */    56,   56,    6,   54,   54,   54,   54,   53,   53,   52,
- /*   440 */    52,   52,   51,  233,  309,  562,  558,  407,  528,  576,
- /*   450 */   576,  344,  255,  346,  254,  182,  617,  616,  503,  504,
- /*   460 */   314,  409,  557,  235,  166,  271,  409,  352,  564,  181,
- /*   470 */   407,  546,  576,  576,  587,  581,  412,  537,  556,  561,
- /*   480 */   517,  412,  618,  249,  598,   16,    7,   36,  467,  598,
- /*   490 */    92,  516,  618,   57,   58,   48,  579,  578,  580,  580,
- /*   500 */    55,   55,   56,   56,   56,   56,  541,   54,   54,   54,
- /*   510 */    54,   53,   53,   52,   52,   52,   51,  233,  309,  327,
- /*   520 */   572,  571,  525,  558,  560,  394,  871,  246,  409,  248,
- /*   530 */   171,  392,  594,  219,  407,  409,  576,  576,  502,  557,
- /*   540 */   364,  145,  510,  412,  407,  229,  576,  576,  587,  581,
- /*   550 */   412,  598,   92,  381,  269,  556,  166,  400,  598,   69,
- /*   560 */   501,  419,  945,  199,  945,  198,  546,   57,   58,   48,
- /*   570 */   579,  578,  580,  580,   55,   55,   56,   56,   56,   56,
- /*   580 */   568,   54,   54,   54,   54,   53,   53,   52,   52,   52,
- /*   590 */    51,  233,  309,  317,  419,  944,  508,  944,  308,  597,
- /*   600 */   594,  565,  490,  212,  173,  247,  423,  615,  614,  613,
- /*   610 */   323,  197,  143,  405,  572,  571,  489,   66,   50,   47,
- /*   620 */   146,  594,  587,  581,  232,  231,  559,  427,   67,  555,
- /*   630 */    15,  618,  186,  543,  303,  421,   35,  206,  432,  423,
- /*   640 */   552,   57,   58,   48,  579,  578,  580,  580,   55,   55,
- /*   650 */    56,   56,   56,   56,  205,   54,   54,   54,   54,   53,
- /*   660 */    53,   52,   52,   52,   51,  233,  309,  569,  569,  260,
- /*   670 */   268,  597,   12,  373,  568,  166,  409,  313,  409,  420,
- /*   680 */   409,  473,  473,  365,  618,   50,   47,  146,  597,  594,
- /*   690 */   468,  412,  166,  412,  351,  412,  587,  581,   32,  598,
- /*   700 */    94,  598,   97,  598,   95,  627,  625,  329,  142,   50,
- /*   710 */    47,  146,  333,  349,  358,   57,   58,   48,  579,  578,
- /*   720 */   580,  580,   55,   55,   56,   56,   56,   56,  409,   54,
- /*   730 */    54,   54,   54,   53,   53,   52,   52,   52,   51,  233,
- /*   740 */   309,  409,  388,  412,  409,   22,  565,  404,  212,  362,
- /*   750 */   389,  598,  104,  359,  409,  156,  412,  409,  603,  412,
- /*   760 */   537,  331,  569,  569,  598,  103,  493,  598,  105,  412,
- /*   770 */   587,  581,  412,  260,  549,  618,   11,  598,  106,  521,
- /*   780 */   598,  133,  169,  457,  456,  170,   35,  601,  618,   57,
- /*   790 */    58,   48,  579,  578,  580,  580,   55,   55,   56,   56,
- /*   800 */    56,   56,  409,   54,   54,   54,   54,   53,   53,   52,
- /*   810 */    52,   52,   51,  233,  309,  409,  259,  412,  409,   50,
- /*   820 */    47,  146,  357,  318,  355,  598,  134,  527,  352,  337,
- /*   830 */   412,  409,  356,  412,  357,  409,  357,  618,  598,   98,
- /*   840 */   129,  598,  102,  618,  587,  581,  412,   21,  235,  618,
- /*   850 */   412,  618,  211,  143,  598,  101,   30,  167,  598,   93,
- /*   860 */   350,  535,  203,   57,   58,   48,  579,  578,  580,  580,
- /*   870 */    55,   55,   56,   56,   56,   56,  409,   54,   54,   54,
- /*   880 */    54,   53,   53,   52,   52,   52,   51,  233,  309,  409,
- /*   890 */   526,  412,  409,  425,  215,  305,  597,  551,  141,  598,
- /*   900 */   100,   40,  409,   38,  412,  409,  550,  412,  409,  228,
- /*   910 */   220,  314,  598,   77,  500,  598,   96,  412,  587,  581,
- /*   920 */   412,  338,  253,  412,  218,  598,  137,  379,  598,  136,
- /*   930 */    28,  598,  135,  270,  715,  210,  481,   57,   58,   48,
- /*   940 */   579,  578,  580,  580,   55,   55,   56,   56,   56,   56,
- /*   950 */   409,   54,   54,   54,   54,   53,   53,   52,   52,   52,
- /*   960 */    51,  233,  309,  409,  272,  412,  409,  315,  147,  597,
- /*   970 */   272,  626,    2,  598,   76,  209,  409,  127,  412,  618,
- /*   980 */   126,  412,  409,  621,  235,  618,  598,   90,  374,  598,
- /*   990 */    89,  412,  587,  581,   27,  260,  350,  412,  618,  598,
- /*  1000 */    75,  321,  541,  541,  125,  598,   88,  320,  278,  597,
- /*  1010 */   618,   57,   46,   48,  579,  578,  580,  580,   55,   55,
- /*  1020 */    56,   56,   56,   56,  409,   54,   54,   54,   54,   53,
- /*  1030 */    53,   52,   52,   52,   51,  233,  309,  409,  450,  412,
- /*  1040 */   164,  284,  282,  272,  609,  424,  304,  598,   87,  370,
- /*  1050 */   409,  477,  412,  409,  608,  409,  607,  602,  618,  618,
- /*  1060 */   598,   99,  586,  585,  122,  412,  587,  581,  412,  618,
- /*  1070 */   412,  618,  618,  598,   86,  366,  598,   17,  598,   85,
- /*  1080 */   319,  185,  519,  518,  583,  582,   58,   48,  579,  578,
- /*  1090 */   580,  580,   55,   55,   56,   56,   56,   56,  409,   54,
- /*  1100 */    54,   54,   54,   53,   53,   52,   52,   52,   51,  233,
- /*  1110 */   309,  584,  409,  412,  409,  260,  260,  260,  408,  591,
- /*  1120 */   474,  598,   84,  170,  409,  466,  518,  412,  121,  412,
- /*  1130 */   618,  618,  618,  618,  618,  598,   83,  598,   72,  412,
- /*  1140 */   587,  581,   51,  233,  625,  329,  470,  598,   71,  257,
- /*  1150 */   159,  120,   14,  462,  157,  158,  117,  260,  448,  447,
- /*  1160 */   446,   48,  579,  578,  580,  580,   55,   55,   56,   56,
- /*  1170 */    56,   56,  618,   54,   54,   54,   54,   53,   53,   52,
- /*  1180 */    52,   52,   51,  233,   44,  403,  260,    3,  409,  459,
- /*  1190 */   260,  413,  619,  118,  398,   10,   25,   24,  554,  348,
- /*  1200 */   217,  618,  406,  412,  409,  618,    4,   44,  403,  618,
- /*  1210 */     3,  598,   82,  618,  413,  619,  455,  542,  115,  412,
- /*  1220 */   538,  401,  536,  274,  506,  406,  251,  598,   81,  216,
- /*  1230 */   273,  563,  618,  243,  453,  618,  154,  618,  618,  618,
- /*  1240 */   449,  416,  623,  110,  401,  618,  409,  236,   64,  123,
- /*  1250 */   487,   41,   42,  531,  563,  204,  409,  267,   43,  411,
- /*  1260 */   410,  412,  265,  592,  108,  618,  107,  434,  332,  598,
- /*  1270 */    80,  412,  618,  263,   41,   42,  443,  618,  409,  598,
- /*  1280 */    70,   43,  411,  410,  433,  261,  592,  149,  618,  597,
- /*  1290 */   256,  237,  188,  412,  590,  590,  590,  589,  588,   13,
- /*  1300 */   618,  598,   18,  328,  235,  618,   44,  403,  360,    3,
- /*  1310 */   418,  461,  339,  413,  619,  227,  124,  590,  590,  590,
- /*  1320 */   589,  588,   13,  618,  406,  409,  618,  409,  139,   34,
- /*  1330 */   403,  387,    3,  148,  622,  312,  413,  619,  311,  330,
- /*  1340 */   412,  460,  412,  401,  180,  353,  412,  406,  598,   79,
- /*  1350 */   598,   78,  250,  563,  598,    9,  618,  612,  611,  610,
- /*  1360 */   618,    8,  452,  442,  242,  415,  401,  618,  239,  235,
- /*  1370 */   179,  238,  428,   41,   42,  288,  563,  618,  618,  618,
- /*  1380 */    43,  411,  410,  618,  144,  592,  618,  618,  177,   61,
- /*  1390 */   618,  596,  391,  620,  619,  287,   41,   42,  414,  618,
- /*  1400 */   293,   30,  393,   43,  411,  410,  292,  618,  592,   31,
- /*  1410 */   618,  395,  291,   60,  230,   37,  590,  590,  590,  589,
- /*  1420 */   588,   13,  214,  553,  183,  290,  172,  301,  300,  299,
- /*  1430 */   178,  297,  595,  563,  451,   29,  285,  390,  540,  590,
- /*  1440 */   590,  590,  589,  588,   13,  283,  520,  534,  150,  533,
- /*  1450 */   241,  281,  384,  192,  191,  324,  515,  514,  276,  240,
- /*  1460 */   510,  523,  307,  511,  128,  592,  509,  225,  226,  486,
- /*  1470 */   485,  224,  152,  491,  464,  306,  484,  163,  153,  371,
- /*  1480 */   478,  151,  162,  258,  369,  161,  367,  208,  475,  476,
- /*  1490 */    26,  160,  465,  140,  361,  131,  590,  590,  590,  116,
- /*  1500 */   119,  454,  343,  155,  114,  342,  113,  112,  445,  111,
- /*  1510 */   130,  109,  431,  316,  426,  430,   23,  429,   20,  606,
- /*  1520 */   190,  507,  255,  341,  244,   63,  294,  593,  310,  570,
- /*  1530 */   277,  402,  354,  235,  567,  496,  495,  492,  494,  302,
- /*  1540 */   458,  378,  286,  245,  566,    5,  252,  547,  193,  444,
- /*  1550 */   233,  340,  207,  524,  368,  505,  334,  522,  499,  399,
- /*  1560 */   295,  498,  956,  488,
+ /*     0 */   306,  212,  432,  955,  639,  191,  955,  295,  559,   88,
+ /*    10 */    88,   88,   88,   81,   86,   86,   86,   86,   85,   85,
+ /*    20 */    84,   84,   84,   83,  330,  185,  184,  183,  635,  635,
+ /*    30 */   292,  606,  606,   88,   88,   88,   88,  683,   86,   86,
+ /*    40 */    86,   86,   85,   85,   84,   84,   84,   83,  330,   16,
+ /*    50 */   436,  597,   89,   90,   80,  600,  599,  601,  601,   87,
+ /*    60 */    87,   88,   88,   88,   88,  684,   86,   86,   86,   86,
+ /*    70 */    85,   85,   84,   84,   84,   83,  330,  306,  559,   84,
+ /*    80 */    84,   84,   83,  330,   65,   86,   86,   86,   86,   85,
+ /*    90 */    85,   84,   84,   84,   83,  330,  635,  635,  634,  633,
+ /*   100 */   182,  682,  550,  379,  376,  375,   17,  322,  606,  606,
+ /*   110 */   371,  198,  479,   91,  374,   82,   79,  165,   85,   85,
+ /*   120 */    84,   84,   84,   83,  330,  598,  635,  635,  107,   89,
+ /*   130 */    90,   80,  600,  599,  601,  601,   87,   87,   88,   88,
+ /*   140 */    88,   88,  186,   86,   86,   86,   86,   85,   85,   84,
+ /*   150 */    84,   84,   83,  330,  306,  594,  594,  142,  328,  327,
+ /*   160 */   484,  249,  344,  238,  635,  635,  634,  633,  585,  448,
+ /*   170 */   526,  525,  229,  388,    1,  394,  450,  584,  449,  635,
+ /*   180 */   635,  635,  635,  319,  395,  606,  606,  199,  157,  273,
+ /*   190 */   382,  268,  381,  187,  635,  635,  634,  633,  311,  555,
+ /*   200 */   266,  593,  593,  266,  347,  588,   89,   90,   80,  600,
+ /*   210 */   599,  601,  601,   87,   87,   88,   88,   88,   88,  478,
+ /*   220 */    86,   86,   86,   86,   85,   85,   84,   84,   84,   83,
+ /*   230 */   330,  306,  272,  536,  634,  633,  146,  610,  197,  310,
+ /*   240 */   575,  182,  482,  271,  379,  376,  375,  506,   21,  634,
+ /*   250 */   633,  634,  633,  635,  635,  374,  611,  574,  548,  440,
+ /*   260 */   111,  563,  606,  606,  634,  633,  324,  479,  608,  608,
+ /*   270 */   608,  300,  435,  573,  119,  407,  210,  162,  562,  883,
+ /*   280 */   592,  592,  306,   89,   90,   80,  600,  599,  601,  601,
+ /*   290 */    87,   87,   88,   88,   88,   88,  506,   86,   86,   86,
+ /*   300 */    86,   85,   85,   84,   84,   84,   83,  330,  620,  111,
+ /*   310 */   635,  635,  361,  606,  606,  358,  249,  349,  248,  433,
+ /*   320 */   243,  479,  586,  634,  633,  195,  611,   93,  119,  221,
+ /*   330 */   575,  497,  534,  534,   89,   90,   80,  600,  599,  601,
+ /*   340 */   601,   87,   87,   88,   88,   88,   88,  574,   86,   86,
+ /*   350 */    86,   86,   85,   85,   84,   84,   84,   83,  330,  306,
+ /*   360 */    77,  429,  638,  573,  589,  530,  240,  230,  242,  105,
+ /*   370 */   249,  349,  248,  515,  588,  208,  460,  529,  564,  173,
+ /*   380 */   634,  633,  970,  144,  430,    2,  424,  228,  380,  557,
+ /*   390 */   606,  606,  190,  153,  159,  158,  514,   51,  632,  631,
+ /*   400 */   630,   71,  536,  432,  954,  196,  610,  954,  614,   45,
+ /*   410 */    18,   89,   90,   80,  600,  599,  601,  601,   87,   87,
+ /*   420 */    88,   88,   88,   88,  261,   86,   86,   86,   86,   85,
+ /*   430 */    85,   84,   84,   84,   83,  330,  306,  608,  608,  608,
+ /*   440 */   542,  424,  402,  385,  241,  506,  451,  320,  211,  543,
+ /*   450 */   164,  436,  386,  293,  451,  587,  108,  496,  111,  334,
+ /*   460 */   391,  591,  424,  614,   27,  452,  453,  606,  606,   72,
+ /*   470 */   257,   70,  259,  452,  339,  342,  564,  582,   68,  415,
+ /*   480 */   469,  328,  327,   62,  614,   45,  110,  393,   89,   90,
+ /*   490 */    80,  600,  599,  601,  601,   87,   87,   88,   88,   88,
+ /*   500 */    88,  152,   86,   86,   86,   86,   85,   85,   84,   84,
+ /*   510 */    84,   83,  330,  306,  110,  499,  520,  538,  402,  389,
+ /*   520 */   424,  110,  566,  500,  593,  593,  454,   82,   79,  165,
+ /*   530 */   424,  591,  384,  564,  340,  615,  188,  162,  424,  350,
+ /*   540 */   616,  424,  614,   44,  606,  606,  445,  582,  300,  434,
+ /*   550 */   151,   19,  614,    9,  568,  580,  348,  615,  469,  567,
+ /*   560 */   614,   26,  616,  614,   45,   89,   90,   80,  600,  599,
+ /*   570 */   601,  601,   87,   87,   88,   88,   88,   88,  411,   86,
+ /*   580 */    86,   86,   86,   85,   85,   84,   84,   84,   83,  330,
+ /*   590 */   306,  579,  110,  578,  521,  282,  433,  398,  400,  255,
+ /*   600 */   486,   82,   79,  165,  487,  164,   82,   79,  165,  488,
+ /*   610 */   488,  364,  387,  424,  544,  544,  509,  350,  362,  155,
+ /*   620 */   191,  606,  606,  559,  642,  640,  333,   82,   79,  165,
+ /*   630 */   305,  564,  507,  312,  357,  614,   45,  329,  596,  595,
+ /*   640 */   194,  337,   89,   90,   80,  600,  599,  601,  601,   87,
+ /*   650 */    87,   88,   88,   88,   88,  424,   86,   86,   86,   86,
+ /*   660 */    85,   85,   84,   84,   84,   83,  330,  306,   20,  323,
+ /*   670 */   150,  263,  211,  543,  421,  596,  595,  614,   22,  424,
+ /*   680 */   193,  424,  284,  424,  391,  424,  509,  424,  577,  424,
+ /*   690 */   186,  335,  424,  559,  424,  313,  120,  546,  606,  606,
+ /*   700 */    67,  614,   47,  614,   50,  614,   48,  614,  100,  614,
+ /*   710 */    99,  614,  101,  576,  614,  102,  614,  109,  326,   89,
+ /*   720 */    90,   80,  600,  599,  601,  601,   87,   87,   88,   88,
+ /*   730 */    88,   88,  424,   86,   86,   86,   86,   85,   85,   84,
+ /*   740 */    84,   84,   83,  330,  306,  424,  311,  424,  585,   54,
+ /*   750 */   424,  516,  517,  590,  614,  112,  424,  584,  424,  572,
+ /*   760 */   424,  195,  424,  571,  424,   67,  424,  614,   94,  614,
+ /*   770 */    98,  424,  614,   97,  264,  606,  606,  195,  614,   46,
+ /*   780 */   614,   96,  614,   30,  614,   49,  614,  115,  614,  114,
+ /*   790 */   418,  229,  388,  614,  113,  306,   89,   90,   80,  600,
+ /*   800 */   599,  601,  601,   87,   87,   88,   88,   88,   88,  424,
+ /*   810 */    86,   86,   86,   86,   85,   85,   84,   84,   84,   83,
+ /*   820 */   330,  119,  424,  590,  110,  372,  606,  606,  195,   53,
+ /*   830 */   250,  614,   29,  195,  472,  438,  729,  190,  302,  498,
+ /*   840 */    14,  523,  641,    2,  614,   43,  306,   89,   90,   80,
+ /*   850 */   600,  599,  601,  601,   87,   87,   88,   88,   88,   88,
+ /*   860 */   424,   86,   86,   86,   86,   85,   85,   84,   84,   84,
+ /*   870 */    83,  330,  424,  613,  964,  964,  354,  606,  606,  420,
+ /*   880 */   312,   64,  614,   42,  391,  355,  283,  437,  301,  255,
+ /*   890 */   414,  410,  495,  492,  614,   28,  471,  306,   89,   90,
+ /*   900 */    80,  600,  599,  601,  601,   87,   87,   88,   88,   88,
+ /*   910 */    88,  424,   86,   86,   86,   86,   85,   85,   84,   84,
+ /*   920 */    84,   83,  330,  424,  110,  110,  110,  110,  606,  606,
+ /*   930 */   110,  254,   13,  614,   41,  532,  531,  283,  481,  531,
+ /*   940 */   457,  284,  119,  561,  356,  614,   40,  284,  306,   89,
+ /*   950 */    78,   80,  600,  599,  601,  601,   87,   87,   88,   88,
+ /*   960 */    88,   88,  424,   86,   86,   86,   86,   85,   85,   84,
+ /*   970 */    84,   84,   83,  330,  110,  424,  341,  220,  555,  606,
+ /*   980 */   606,  351,  555,  318,  614,   95,  413,  255,   83,  330,
+ /*   990 */   284,  284,  255,  640,  333,  356,  255,  614,   39,  306,
+ /*  1000 */   356,   90,   80,  600,  599,  601,  601,   87,   87,   88,
+ /*  1010 */    88,   88,   88,  424,   86,   86,   86,   86,   85,   85,
+ /*  1020 */    84,   84,   84,   83,  330,  424,  317,  316,  141,  465,
+ /*  1030 */   606,  606,  219,  619,  463,  614,   10,  417,  462,  255,
+ /*  1040 */   189,  510,  553,  351,  207,  363,  161,  614,   38,  315,
+ /*  1050 */   218,  255,  255,   80,  600,  599,  601,  601,   87,   87,
+ /*  1060 */    88,   88,   88,   88,  424,   86,   86,   86,   86,   85,
+ /*  1070 */    85,   84,   84,   84,   83,  330,   76,  419,  255,    3,
+ /*  1080 */   878,  461,  424,  247,  331,  331,  614,   37,  217,   76,
+ /*  1090 */   419,  390,    3,  216,  215,  422,    4,  331,  331,  424,
+ /*  1100 */   547,   12,  424,  545,  614,   36,  424,  541,  422,  424,
+ /*  1110 */   540,  424,  214,  424,  408,  424,  539,  403,  605,  605,
+ /*  1120 */   237,  614,   25,  119,  614,   24,  588,  408,  614,   45,
+ /*  1130 */   118,  614,   35,  614,   34,  614,   33,  614,   23,  588,
+ /*  1140 */    60,  223,  603,  602,  513,  378,   73,   74,  140,  139,
+ /*  1150 */   424,  110,  265,   75,  426,  425,   59,  424,  610,   73,
+ /*  1160 */    74,  549,  402,  404,  424,  373,   75,  426,  425,  604,
+ /*  1170 */   138,  610,  614,   11,  392,   76,  419,  181,    3,  614,
+ /*  1180 */    32,  271,  369,  331,  331,  493,  614,   31,  149,  608,
+ /*  1190 */   608,  608,  607,   15,  422,  365,  614,    8,  137,  489,
+ /*  1200 */   136,  190,  608,  608,  608,  607,   15,  485,  176,  135,
+ /*  1210 */     7,  252,  477,  408,  174,  133,  175,  474,   57,   56,
+ /*  1220 */   132,  130,  119,   76,  419,  588,    3,  468,  245,  464,
+ /*  1230 */   171,  331,  331,  125,  123,  456,  447,  122,  446,  104,
+ /*  1240 */   336,  231,  422,  166,  154,   73,   74,  332,  116,  431,
+ /*  1250 */   121,  309,   75,  426,  425,  222,  106,  610,  308,  637,
+ /*  1260 */   204,  408,  629,  627,  628,    6,  200,  428,  427,  290,
+ /*  1270 */   203,  622,  201,  588,   62,   63,  289,   66,  419,  399,
+ /*  1280 */     3,  401,  288,   92,  143,  331,  331,  287,  608,  608,
+ /*  1290 */   608,  607,   15,   73,   74,  227,  422,  325,   69,  416,
+ /*  1300 */    75,  426,  425,  612,  412,  610,  192,   61,  569,  209,
+ /*  1310 */   396,  226,  278,  225,  383,  408,  527,  558,  276,  533,
+ /*  1320 */   552,  528,  321,  523,  370,  508,  180,  588,  494,  179,
+ /*  1330 */   366,  117,  253,  269,  522,  503,  608,  608,  608,  607,
+ /*  1340 */    15,  551,  502,   58,  274,  524,  178,   73,   74,  304,
+ /*  1350 */   501,  368,  303,  206,   75,  426,  425,  491,  360,  610,
+ /*  1360 */   213,  177,  483,  131,  345,  298,  297,  296,  202,  294,
+ /*  1370 */   480,  490,  466,  134,  172,  129,  444,  346,  470,  128,
+ /*  1380 */   314,  459,  103,  127,  126,  148,  124,  167,  443,  235,
+ /*  1390 */   608,  608,  608,  607,   15,  442,  439,  623,  234,  299,
+ /*  1400 */   145,  583,  291,  377,  581,  160,  119,  156,  270,  636,
+ /*  1410 */   971,  169,  279,  626,  520,  625,  473,  624,  170,  621,
+ /*  1420 */   618,  119,  168,   55,  409,  423,  537,  609,  286,  285,
+ /*  1430 */   405,  570,  560,  556,    5,   52,  458,  554,  147,  267,
+ /*  1440 */   519,  504,  518,  406,  262,  239,  260,  512,  343,  511,
+ /*  1450 */   258,  353,  565,  256,  224,  251,  359,  277,  275,  476,
+ /*  1460 */   475,  246,  352,  244,  467,  455,  236,  233,  232,  307,
+ /*  1470 */   441,  281,  205,  163,  397,  280,  535,  505,  330,  617,
+ /*  1480 */   971,  971,  971,  971,  367,  971,  971,  971,  971,  971,
+ /*  1490 */   971,  971,  971,  971,  971,  971,  338,
 };
 static const YYCODETYPE yy_lookahead[] = {
- /*     0 */    19,  142,  143,  144,  145,   24,    1,   26,   77,   78,
- /*    10 */    79,   80,   81,   82,   83,   84,   85,   86,   87,   88,
- /*    20 */    89,   90,   91,   92,   26,   27,   15,   26,   27,  197,
- /*    30 */    49,   50,   77,   78,   79,   80,  204,   82,   83,   84,
- /*    40 */    85,   86,   87,   88,   89,   90,   91,   92,   23,   68,
- /*    50 */    69,   70,   71,   72,   73,   74,   75,   76,   77,   78,
- /*    60 */    79,   80,  166,   82,   83,   84,   85,   86,   87,   88,
- /*    70 */    89,   90,   91,   92,   19,   94,   19,  105,  106,  107,
- /*    80 */    25,   82,   83,   84,   85,   86,   87,   88,   89,   90,
- /*    90 */    91,   92,   94,   95,   96,   94,   95,   99,  100,  101,
- /*   100 */   112,  205,  114,  115,   49,   50,   22,   23,  110,   54,
- /*   110 */    86,   87,   88,   89,   90,   91,   92,  221,  222,  223,
- /*   120 */    23,  120,   25,   68,   69,   70,   71,   72,   73,   74,
- /*   130 */    75,   76,   77,   78,   79,   80,   22,   82,   83,   84,
- /*   140 */    85,   86,   87,   88,   89,   90,   91,   92,   19,   92,
- /*   150 */    23,   67,   25,   96,   97,   98,   99,  100,  101,  102,
- /*   160 */   150,   32,  150,  118,   26,   27,  109,  150,  150,  150,
- /*   170 */    41,  161,  162,  180,  181,  165,  113,  165,   49,   50,
- /*   180 */   117,  188,  165,  165,  165,  173,  174,  170,  171,  170,
- /*   190 */   171,  173,  174,  118,  184,   16,  186,   68,   69,   70,
- /*   200 */    71,   72,   73,   74,   75,   76,   77,   78,   79,   80,
- /*   210 */   118,   82,   83,   84,   85,   86,   87,   88,   89,   90,
- /*   220 */    91,   92,   19,   98,   86,   87,   22,   24,  160,   88,
- /*   230 */    26,   27,   94,   95,  109,   97,  224,   66,  118,   60,
- /*   240 */   150,   62,  104,   23,  106,   25,  229,  230,  229,  230,
- /*   250 */   160,  150,   49,   50,  113,  165,   96,   26,  117,   99,
- /*   260 */   100,  101,  194,  173,  174,   94,  165,  129,  130,   98,
- /*   270 */   110,   68,   69,   70,   71,   72,   73,   74,   75,   76,
- /*   280 */    77,   78,   79,   80,  194,   82,   83,   84,   85,   86,
- /*   290 */    87,   88,   89,   90,   91,   92,   19,   11,   94,   95,
- /*   300 */   129,  130,  131,  118,  150,  215,  150,  150,  150,   25,
- /*   310 */   220,   26,   27,   22,  213,   26,   27,   26,   27,  165,
- /*   320 */    25,  165,  165,  165,   30,   94,   49,   50,   34,  173,
- /*   330 */   174,  173,  174,   88,   89,   90,   91,   92,    7,    8,
- /*   340 */   160,  187,   48,   57,  187,   68,   69,   70,   71,   72,
- /*   350 */    73,   74,   75,   76,   77,   78,   79,   80,   23,   82,
- /*   360 */    83,   84,   85,   86,   87,   88,   89,   90,   91,   92,
- /*   370 */    19,  215,  150,  215,  194,   19,  220,   88,  220,   94,
- /*   380 */    95,   23,  160,   94,   95,   94,   95,  165,   26,   27,
- /*   390 */    95,  105,  106,  107,  113,  173,  174,  217,   22,  150,
- /*   400 */    49,   50,  116,  119,   57,  120,   50,  158,   22,   21,
- /*   410 */   161,  162,  232,  136,  165,  120,  194,  237,   23,   68,
- /*   420 */    69,   70,   71,   72,   73,   74,   75,   76,   77,   78,
- /*   430 */    79,   80,   22,   82,   83,   84,   85,   86,   87,   88,
- /*   440 */    89,   90,   91,   92,   19,   23,   12,  112,   23,  114,
- /*   450 */   115,   63,  105,  106,  107,   23,   94,   95,   97,   98,
- /*   460 */   104,  150,   28,  116,   25,  109,  150,  150,   23,   23,
- /*   470 */   112,   25,  114,  115,   49,   50,  165,  150,   44,   11,
- /*   480 */    46,  165,  165,   16,  173,  174,   76,  136,  100,  173,
- /*   490 */   174,   57,  165,   68,   69,   70,   71,   72,   73,   74,
- /*   500 */    75,   76,   77,   78,   79,   80,  166,   82,   83,   84,
- /*   510 */    85,   86,   87,   88,   89,   90,   91,   92,   19,  169,
- /*   520 */   170,  171,   23,   12,   23,  214,  138,   60,  150,   62,
- /*   530 */    24,  215,   26,  216,  112,  150,  114,  115,   36,   28,
- /*   540 */   213,   95,  103,  165,  112,  205,  114,  115,   49,   50,
- /*   550 */   165,  173,  174,   51,   23,   44,   25,   46,  173,  174,
- /*   560 */    58,   22,   23,   22,   25,  160,  120,   68,   69,   70,
- /*   570 */    71,   72,   73,   74,   75,   76,   77,   78,   79,   80,
- /*   580 */   230,   82,   83,   84,   85,   86,   87,   88,   89,   90,
- /*   590 */    91,   92,   19,  215,   22,   23,   23,   25,  163,  194,
- /*   600 */    94,  166,  167,  168,   25,  138,   67,    7,    8,    9,
- /*   610 */   108,  206,  207,  169,  170,  171,  150,   22,  221,  222,
- /*   620 */   223,   26,   49,   50,   86,   87,   23,  161,  162,   23,
- /*   630 */    22,  165,   24,  120,   22,   23,   25,  160,  241,   67,
- /*   640 */   176,   68,   69,   70,   71,   72,   73,   74,   75,   76,
- /*   650 */    77,   78,   79,   80,  160,   82,   83,   84,   85,   86,
- /*   660 */    87,   88,   89,   90,   91,   92,   19,  129,  130,  150,
- /*   670 */    23,  194,   35,   23,  230,   25,  150,  155,  150,   67,
- /*   680 */   150,  105,  106,  107,  165,  221,  222,  223,  194,   94,
- /*   690 */    23,  165,   25,  165,  217,  165,   49,   50,   25,  173,
- /*   700 */   174,  173,  174,  173,  174,    0,    1,    2,  118,  221,
- /*   710 */   222,  223,  193,  219,  237,   68,   69,   70,   71,   72,
- /*   720 */    73,   74,   75,   76,   77,   78,   79,   80,  150,   82,
- /*   730 */    83,   84,   85,   86,   87,   88,   89,   90,   91,   92,
- /*   740 */    19,  150,   19,  165,  150,   24,  166,  167,  168,  227,
- /*   750 */    27,  173,  174,  231,  150,   25,  165,  150,  172,  165,
- /*   760 */   150,  242,  129,  130,  173,  174,  180,  173,  174,  165,
- /*   770 */    49,   50,  165,  150,  176,  165,   35,  173,  174,  165,
- /*   780 */   173,  174,   35,   23,   23,   25,   25,  173,  165,   68,
- /*   790 */    69,   70,   71,   72,   73,   74,   75,   76,   77,   78,
- /*   800 */    79,   80,  150,   82,   83,   84,   85,   86,   87,   88,
- /*   810 */    89,   90,   91,   92,   19,  150,  193,  165,  150,  221,
- /*   820 */   222,  223,  150,  213,   19,  173,  174,   23,  150,   97,
- /*   830 */   165,  150,   27,  165,  150,  150,  150,  165,  173,  174,
- /*   840 */    22,  173,  174,  165,   49,   50,  165,   52,  116,  165,
- /*   850 */   165,  165,  206,  207,  173,  174,  126,   50,  173,  174,
- /*   860 */   128,   27,  160,   68,   69,   70,   71,   72,   73,   74,
- /*   870 */    75,   76,   77,   78,   79,   80,  150,   82,   83,   84,
- /*   880 */    85,   86,   87,   88,   89,   90,   91,   92,   19,  150,
- /*   890 */    23,  165,  150,   23,  216,   25,  194,   32,   39,  173,
- /*   900 */   174,  135,  150,  137,  165,  150,   41,  165,  150,   52,
- /*   910 */   238,  104,  173,  174,   29,  173,  174,  165,   49,   50,
- /*   920 */   165,  219,  238,  165,  238,  173,  174,   52,  173,  174,
- /*   930 */    22,  173,  174,   23,   23,  160,   25,   68,   69,   70,
- /*   940 */    71,   72,   73,   74,   75,   76,   77,   78,   79,   80,
- /*   950 */   150,   82,   83,   84,   85,   86,   87,   88,   89,   90,
- /*   960 */    91,   92,   19,  150,  150,  165,  150,  245,  246,  194,
- /*   970 */   150,  144,  145,  173,  174,  160,  150,   22,  165,  165,
- /*   980 */    22,  165,  150,  150,  116,  165,  173,  174,   52,  173,
- /*   990 */   174,  165,   49,   50,   22,  150,  128,  165,  165,  173,
- /*  1000 */   174,  187,  166,  166,   22,  173,  174,  187,  109,  194,
- /*  1010 */   165,   68,   69,   70,   71,   72,   73,   74,   75,   76,
- /*  1020 */    77,   78,   79,   80,  150,   82,   83,   84,   85,   86,
- /*  1030 */    87,   88,   89,   90,   91,   92,   19,  150,  193,  165,
- /*  1040 */   102,  205,  205,  150,  150,  247,  248,  173,  174,   19,
- /*  1050 */   150,   20,  165,  150,  150,  150,  150,  150,  165,  165,
- /*  1060 */   173,  174,   49,   50,  104,  165,   49,   50,  165,  165,
- /*  1070 */   165,  165,  165,  173,  174,   43,  173,  174,  173,  174,
- /*  1080 */   187,   24,  190,  191,   71,   72,   69,   70,   71,   72,
- /*  1090 */    73,   74,   75,   76,   77,   78,   79,   80,  150,   82,
- /*  1100 */    83,   84,   85,   86,   87,   88,   89,   90,   91,   92,
- /*  1110 */    19,   98,  150,  165,  150,  150,  150,  150,  150,  150,
- /*  1120 */    59,  173,  174,   25,  150,  190,  191,  165,   53,  165,
- /*  1130 */   165,  165,  165,  165,  165,  173,  174,  173,  174,  165,
- /*  1140 */    49,   50,   91,   92,    1,    2,   53,  173,  174,  138,
- /*  1150 */   104,   22,    5,    1,   35,  118,  127,  150,  193,  193,
- /*  1160 */   193,   70,   71,   72,   73,   74,   75,   76,   77,   78,
- /*  1170 */    79,   80,  165,   82,   83,   84,   85,   86,   87,   88,
- /*  1180 */    89,   90,   91,   92,   19,   20,  150,   22,  150,   27,
- /*  1190 */   150,   26,   27,  108,  150,   22,   76,   76,  150,   25,
- /*  1200 */   193,  165,   37,  165,  150,  165,   22,   19,   20,  165,
- /*  1210 */    22,  173,  174,  165,   26,   27,   23,  150,  119,  165,
- /*  1220 */   150,   56,  150,  150,  150,   37,   16,  173,  174,  193,
- /*  1230 */   150,   66,  165,  193,    1,  165,  121,  165,  165,  165,
- /*  1240 */    20,  146,  147,  119,   56,  165,  150,  152,   16,  154,
- /*  1250 */   150,   86,   87,   88,   66,  160,  150,  150,   93,   94,
- /*  1260 */    95,  165,  150,   98,  108,  165,  127,   23,   65,  173,
- /*  1270 */   174,  165,  165,  150,   86,   87,  128,  165,  150,  173,
- /*  1280 */   174,   93,   94,   95,   23,  150,   98,   15,  165,  194,
- /*  1290 */   150,  140,   22,  165,  129,  130,  131,  132,  133,  134,
- /*  1300 */   165,  173,  174,    3,  116,  165,   19,   20,  150,   22,
- /*  1310 */     4,  150,  217,   26,   27,  179,  179,  129,  130,  131,
- /*  1320 */   132,  133,  134,  165,   37,  150,  165,  150,  164,   19,
- /*  1330 */    20,  150,   22,  246,  149,  249,   26,   27,  249,  244,
- /*  1340 */   165,  150,  165,   56,    6,  150,  165,   37,  173,  174,
- /*  1350 */   173,  174,  150,   66,  173,  174,  165,  149,  149,   13,
- /*  1360 */   165,   25,  150,  150,  150,  149,   56,  165,  150,  116,
- /*  1370 */   151,  150,  150,   86,   87,  150,   66,  165,  165,  165,
- /*  1380 */    93,   94,   95,  165,  150,   98,  165,  165,  151,   22,
- /*  1390 */   165,  194,  150,   26,   27,  150,   86,   87,  159,  165,
- /*  1400 */   199,  126,  123,   93,   94,   95,  200,  165,   98,  124,
- /*  1410 */   165,  122,  201,  125,  225,  135,  129,  130,  131,  132,
- /*  1420 */   133,  134,    5,  157,  157,  202,  118,   10,   11,   12,
- /*  1430 */    13,   14,  203,   66,   17,  104,  210,  121,  211,  129,
- /*  1440 */   130,  131,  132,  133,  134,  210,  175,  211,   31,  211,
- /*  1450 */    33,  210,  104,   86,   87,   47,  175,  183,  175,   42,
- /*  1460 */   103,   94,  178,  177,   22,   98,  175,   92,  228,  175,
- /*  1470 */   175,  228,   55,  183,   57,  178,  175,  156,   61,   18,
- /*  1480 */   157,   64,  156,  235,  157,  156,   45,  157,  236,  157,
- /*  1490 */   135,  156,  189,   68,  157,  218,  129,  130,  131,   22,
- /*  1500 */   189,  199,  157,  156,  192,   18,  192,  192,  199,  192,
- /*  1510 */   218,  189,   40,  157,   38,  157,  240,  157,  240,  153,
- /*  1520 */   196,  181,  105,  106,  107,  243,  198,  166,  111,  230,
- /*  1530 */   176,  226,  239,  116,  230,  176,  166,  166,  176,  148,
- /*  1540 */   199,  177,  209,  209,  166,  196,  239,  208,  185,  199,
- /*  1550 */    92,  209,  233,  173,  234,  182,  139,  173,  182,  191,
- /*  1560 */   195,  182,  250,  186,
+ /*     0 */    19,   22,   22,   23,    1,   24,   26,   15,   27,   80,
+ /*    10 */    81,   82,   83,   84,   85,   86,   87,   88,   89,   90,
+ /*    20 */    91,   92,   93,   94,   95,  108,  109,  110,   27,   28,
+ /*    30 */    23,   50,   51,   80,   81,   82,   83,  122,   85,   86,
+ /*    40 */    87,   88,   89,   90,   91,   92,   93,   94,   95,   22,
+ /*    50 */    70,   23,   71,   72,   73,   74,   75,   76,   77,   78,
+ /*    60 */    79,   80,   81,   82,   83,  122,   85,   86,   87,   88,
+ /*    70 */    89,   90,   91,   92,   93,   94,   95,   19,   97,   91,
+ /*    80 */    92,   93,   94,   95,   26,   85,   86,   87,   88,   89,
+ /*    90 */    90,   91,   92,   93,   94,   95,   27,   28,   97,   98,
+ /*   100 */    99,  122,  211,  102,  103,  104,   79,   19,   50,   51,
+ /*   110 */    19,  122,   59,   55,  113,  224,  225,  226,   89,   90,
+ /*   120 */    91,   92,   93,   94,   95,   23,   27,   28,   26,   71,
+ /*   130 */    72,   73,   74,   75,   76,   77,   78,   79,   80,   81,
+ /*   140 */    82,   83,   51,   85,   86,   87,   88,   89,   90,   91,
+ /*   150 */    92,   93,   94,   95,   19,  132,  133,   58,   89,   90,
+ /*   160 */    21,  108,  109,  110,   27,   28,   97,   98,   33,  100,
+ /*   170 */     7,    8,  119,  120,   22,   19,  107,   42,  109,   27,
+ /*   180 */    28,   27,   28,   95,   28,   50,   51,   99,  100,  101,
+ /*   190 */   102,  103,  104,  105,   27,   28,   97,   98,  107,  152,
+ /*   200 */   112,  132,  133,  112,   65,   69,   71,   72,   73,   74,
+ /*   210 */    75,   76,   77,   78,   79,   80,   81,   82,   83,   11,
+ /*   220 */    85,   86,   87,   88,   89,   90,   91,   92,   93,   94,
+ /*   230 */    95,   19,  101,   97,   97,   98,   24,  101,  122,  157,
+ /*   240 */    12,   99,  103,  112,  102,  103,  104,  152,   22,   97,
+ /*   250 */    98,   97,   98,   27,   28,  113,   27,   29,   91,  164,
+ /*   260 */   165,  124,   50,   51,   97,   98,  219,   59,  132,  133,
+ /*   270 */   134,   22,   23,   45,   66,   47,  212,  213,  124,  140,
+ /*   280 */   132,  133,   19,   71,   72,   73,   74,   75,   76,   77,
+ /*   290 */    78,   79,   80,   81,   82,   83,  152,   85,   86,   87,
+ /*   300 */    88,   89,   90,   91,   92,   93,   94,   95,  164,  165,
+ /*   310 */    27,   28,  230,   50,   51,  233,  108,  109,  110,   70,
+ /*   320 */    16,   59,   23,   97,   98,   26,   97,   22,   66,  185,
+ /*   330 */    12,  187,   27,   28,   71,   72,   73,   74,   75,   76,
+ /*   340 */    77,   78,   79,   80,   81,   82,   83,   29,   85,   86,
+ /*   350 */    87,   88,   89,   90,   91,   92,   93,   94,   95,   19,
+ /*   360 */    22,  148,  149,   45,   23,   47,   62,  154,   64,  156,
+ /*   370 */   108,  109,  110,   37,   69,   23,  163,   59,   26,   26,
+ /*   380 */    97,   98,  144,  145,  146,  147,  152,  200,   52,   23,
+ /*   390 */    50,   51,   26,   22,   89,   90,   60,  210,    7,    8,
+ /*   400 */     9,  138,   97,   22,   23,   26,  101,   26,  174,  175,
+ /*   410 */   197,   71,   72,   73,   74,   75,   76,   77,   78,   79,
+ /*   420 */    80,   81,   82,   83,   16,   85,   86,   87,   88,   89,
+ /*   430 */    90,   91,   92,   93,   94,   95,   19,  132,  133,  134,
+ /*   440 */    23,  152,  208,  209,  140,  152,  152,  111,  195,  196,
+ /*   450 */    98,   70,  163,  160,  152,   23,   22,  164,  165,  246,
+ /*   460 */   207,   27,  152,  174,  175,  171,  172,   50,   51,  137,
+ /*   470 */    62,  139,   64,  171,  172,  222,  124,   27,  138,   24,
+ /*   480 */   163,   89,   90,  130,  174,  175,  197,  163,   71,   72,
+ /*   490 */    73,   74,   75,   76,   77,   78,   79,   80,   81,   82,
+ /*   500 */    83,   22,   85,   86,   87,   88,   89,   90,   91,   92,
+ /*   510 */    93,   94,   95,   19,  197,  181,  182,   23,  208,  209,
+ /*   520 */   152,  197,   26,  189,  132,  133,  232,  224,  225,  226,
+ /*   530 */   152,   97,   91,   26,  232,  116,  212,  213,  152,  222,
+ /*   540 */   121,  152,  174,  175,   50,   51,  243,   97,   22,   23,
+ /*   550 */    22,  234,  174,  175,  177,   23,  239,  116,  163,  177,
+ /*   560 */   174,  175,  121,  174,  175,   71,   72,   73,   74,   75,
+ /*   570 */    76,   77,   78,   79,   80,   81,   82,   83,   24,   85,
+ /*   580 */    86,   87,   88,   89,   90,   91,   92,   93,   94,   95,
+ /*   590 */    19,   23,  197,   11,   23,  227,   70,  208,  220,  152,
+ /*   600 */    31,  224,  225,  226,   35,   98,  224,  225,  226,  108,
+ /*   610 */   109,  110,  115,  152,  117,  118,   27,  222,   49,  123,
+ /*   620 */    24,   50,   51,   27,    0,    1,    2,  224,  225,  226,
+ /*   630 */   166,  124,  168,  169,  239,  174,  175,  170,  171,  172,
+ /*   640 */    22,  194,   71,   72,   73,   74,   75,   76,   77,   78,
+ /*   650 */    79,   80,   81,   82,   83,  152,   85,   86,   87,   88,
+ /*   660 */    89,   90,   91,   92,   93,   94,   95,   19,   22,  208,
+ /*   670 */    24,   23,  195,  196,  170,  171,  172,  174,  175,  152,
+ /*   680 */    26,  152,  152,  152,  207,  152,   97,  152,   23,  152,
+ /*   690 */    51,  244,  152,   97,  152,  247,  248,   23,   50,   51,
+ /*   700 */    26,  174,  175,  174,  175,  174,  175,  174,  175,  174,
+ /*   710 */   175,  174,  175,   23,  174,  175,  174,  175,  188,   71,
+ /*   720 */    72,   73,   74,   75,   76,   77,   78,   79,   80,   81,
+ /*   730 */    82,   83,  152,   85,   86,   87,   88,   89,   90,   91,
+ /*   740 */    92,   93,   94,   95,   19,  152,  107,  152,   33,   24,
+ /*   750 */   152,  100,  101,   27,  174,  175,  152,   42,  152,   23,
+ /*   760 */   152,   26,  152,   23,  152,   26,  152,  174,  175,  174,
+ /*   770 */   175,  152,  174,  175,   23,   50,   51,   26,  174,  175,
+ /*   780 */   174,  175,  174,  175,  174,  175,  174,  175,  174,  175,
+ /*   790 */   163,  119,  120,  174,  175,   19,   71,   72,   73,   74,
+ /*   800 */    75,   76,   77,   78,   79,   80,   81,   82,   83,  152,
+ /*   810 */    85,   86,   87,   88,   89,   90,   91,   92,   93,   94,
+ /*   820 */    95,   66,  152,   97,  197,   23,   50,   51,   26,   53,
+ /*   830 */    23,  174,  175,   26,   23,   23,   23,   26,   26,   26,
+ /*   840 */    36,  106,  146,  147,  174,  175,   19,   71,   72,   73,
+ /*   850 */    74,   75,   76,   77,   78,   79,   80,   81,   82,   83,
+ /*   860 */   152,   85,   86,   87,   88,   89,   90,   91,   92,   93,
+ /*   870 */    94,   95,  152,  196,  119,  120,   19,   50,   51,  168,
+ /*   880 */   169,   26,  174,  175,  207,   28,  152,  249,  250,  152,
+ /*   890 */   163,  163,  163,  163,  174,  175,  163,   19,   71,   72,
+ /*   900 */    73,   74,   75,   76,   77,   78,   79,   80,   81,   82,
+ /*   910 */    83,  152,   85,   86,   87,   88,   89,   90,   91,   92,
+ /*   920 */    93,   94,   95,  152,  197,  197,  197,  197,   50,   51,
+ /*   930 */   197,  194,   36,  174,  175,  191,  192,  152,  191,  192,
+ /*   940 */   163,  152,   66,  124,  152,  174,  175,  152,   19,   71,
+ /*   950 */    72,   73,   74,   75,   76,   77,   78,   79,   80,   81,
+ /*   960 */    82,   83,  152,   85,   86,   87,   88,   89,   90,   91,
+ /*   970 */    92,   93,   94,   95,  197,  152,  100,  188,  152,   50,
+ /*   980 */    51,  152,  152,  188,  174,  175,  252,  152,   94,   95,
+ /*   990 */   152,  152,  152,    1,    2,  152,  152,  174,  175,   19,
+ /*  1000 */   152,   72,   73,   74,   75,   76,   77,   78,   79,   80,
+ /*  1010 */    81,   82,   83,  152,   85,   86,   87,   88,   89,   90,
+ /*  1020 */    91,   92,   93,   94,   95,  152,  188,  188,   22,  194,
+ /*  1030 */    50,   51,  240,  173,  194,  174,  175,  252,  194,  152,
+ /*  1040 */    36,  181,   28,  152,   23,  219,  122,  174,  175,  219,
+ /*  1050 */   221,  152,  152,   73,   74,   75,   76,   77,   78,   79,
+ /*  1060 */    80,   81,   82,   83,  152,   85,   86,   87,   88,   89,
+ /*  1070 */    90,   91,   92,   93,   94,   95,   19,   20,  152,   22,
+ /*  1080 */    23,  194,  152,  240,   27,   28,  174,  175,  240,   19,
+ /*  1090 */    20,   26,   22,  194,  194,   38,   22,   27,   28,  152,
+ /*  1100 */    23,   22,  152,  116,  174,  175,  152,   23,   38,  152,
+ /*  1110 */    23,  152,  221,  152,   57,  152,   23,  163,   50,   51,
+ /*  1120 */   194,  174,  175,   66,  174,  175,   69,   57,  174,  175,
+ /*  1130 */    40,  174,  175,  174,  175,  174,  175,  174,  175,   69,
+ /*  1140 */    22,   53,   74,   75,   30,   53,   89,   90,   22,   22,
+ /*  1150 */   152,  197,   23,   96,   97,   98,   22,  152,  101,   89,
+ /*  1160 */    90,   91,  208,  209,  152,   53,   96,   97,   98,  101,
+ /*  1170 */    22,  101,  174,  175,  152,   19,   20,  105,   22,  174,
+ /*  1180 */   175,  112,   19,   27,   28,   20,  174,  175,   24,  132,
+ /*  1190 */   133,  134,  135,  136,   38,   44,  174,  175,  107,   61,
+ /*  1200 */    54,   26,  132,  133,  134,  135,  136,   54,  107,   22,
+ /*  1210 */     5,  140,    1,   57,   36,  111,  122,   28,   79,   79,
+ /*  1220 */   131,  123,   66,   19,   20,   69,   22,    1,   16,   20,
+ /*  1230 */   125,   27,   28,  123,  111,  120,   23,  131,   23,   16,
+ /*  1240 */    68,  142,   38,   15,   22,   89,   90,    3,  167,    4,
+ /*  1250 */   248,  251,   96,   97,   98,  180,  180,  101,  251,  151,
+ /*  1260 */     6,   57,  151,   13,  151,   26,   25,  151,  161,  202,
+ /*  1270 */   153,  162,  153,   69,  130,  128,  203,   19,   20,  127,
+ /*  1280 */    22,  126,  204,  129,   22,   27,   28,  205,  132,  133,
+ /*  1290 */   134,  135,  136,   89,   90,  231,   38,   95,  137,  179,
+ /*  1300 */    96,   97,   98,  206,  179,  101,  122,  107,  159,  159,
+ /*  1310 */   125,  231,  216,  228,  107,   57,  184,  217,  216,  176,
+ /*  1320 */   217,  176,   48,  106,   18,  184,  158,   69,  159,  158,
+ /*  1330 */    46,   71,  237,  176,  176,  176,  132,  133,  134,  135,
+ /*  1340 */   136,  217,  176,  137,  216,  178,  158,   89,   90,  179,
+ /*  1350 */   176,  159,  179,  159,   96,   97,   98,  159,  159,  101,
+ /*  1360 */     5,  158,  202,   22,   18,   10,   11,   12,   13,   14,
+ /*  1370 */   190,  238,   17,  190,  158,  193,   41,  159,  202,  193,
+ /*  1380 */   159,  202,  245,  193,  193,  223,  190,   32,  159,   34,
+ /*  1390 */   132,  133,  134,  135,  136,  159,   39,  155,   43,  150,
+ /*  1400 */   223,  177,  201,  178,  177,  186,   66,  199,  177,  152,
+ /*  1410 */   253,   56,  215,  152,  182,  152,  202,  152,   63,  152,
+ /*  1420 */   152,   66,   67,  242,  229,  152,  174,  152,  152,  152,
+ /*  1430 */   152,  152,  152,  152,  199,  242,  202,  152,  198,  152,
+ /*  1440 */   152,  152,  183,  192,  152,  215,  152,  183,  215,  183,
+ /*  1450 */   152,  241,  214,  152,  211,  152,  152,  211,  211,  152,
+ /*  1460 */   152,  241,  152,  152,  152,  152,  152,  152,  152,  114,
+ /*  1470 */   152,  152,  235,  152,  152,  152,  174,  187,   95,  174,
+ /*  1480 */   253,  253,  253,  253,  236,  253,  253,  253,  253,  253,
+ /*  1490 */   253,  253,  253,  253,  253,  253,  141,
 };
-#define YY_SHIFT_USE_DFLT (-70)
-#define YY_SHIFT_COUNT (416)
-#define YY_SHIFT_MIN   (-69)
-#define YY_SHIFT_MAX   (1487)
+#define YY_SHIFT_USE_DFLT (-86)
+#define YY_SHIFT_COUNT (429)
+#define YY_SHIFT_MIN   (-85)
+#define YY_SHIFT_MAX   (1383)
 static const short yy_shift_ofst[] = {
- /*     0 */  1143, 1188, 1417, 1188, 1287, 1287,  138,  138,   -2,  -19,
- /*    10 */  1287, 1287, 1287, 1287,  347,  362,  129,  129,  795, 1165,
- /*    20 */  1287, 1287, 1287, 1287, 1287, 1287, 1287, 1287, 1287, 1287,
- /*    30 */  1287, 1287, 1287, 1287, 1287, 1287, 1287, 1287, 1287, 1287,
- /*    40 */  1287, 1287, 1287, 1287, 1287, 1287, 1287, 1287, 1310, 1287,
- /*    50 */  1287, 1287, 1287, 1287, 1287, 1287, 1287, 1287, 1287, 1287,
- /*    60 */  1287, 1287,  286,  362,  362,  538,  538,  231, 1253,   55,
- /*    70 */   721,  647,  573,  499,  425,  351,  277,  203,  869,  869,
- /*    80 */   869,  869,  869,  869,  869,  869,  869,  869,  869,  869,
- /*    90 */   869,  869,  869,  943,  869, 1017, 1091, 1091,  -69,  -45,
- /*   100 */   -45,  -45,  -45,  -45,   -1,   24,  245,  362,  362,  362,
- /*   110 */   362,  362,  362,  362,  362,  362,  362,  362,  362,  362,
- /*   120 */   362,  362,  362,  388,  356,  362,  362,  362,  362,  362,
- /*   130 */   732,  868,  231, 1051, 1458,  -70,  -70,  -70, 1367,   57,
- /*   140 */   434,  434,  289,  291,  285,    1,  204,  572,  539,  362,
- /*   150 */   362,  362,  362,  362,  362,  362,  362,  362,  362,  362,
- /*   160 */   362,  362,  362,  362,  362,  362,  362,  362,  362,  362,
- /*   170 */   362,  362,  362,  362,  362,  362,  362,  362,  362,  362,
- /*   180 */   362,  506,  506,  506,  705, 1253, 1253, 1253,  -70,  -70,
- /*   190 */   -70,  171,  171,  160,  502,  502,  502,  446,  432,  511,
- /*   200 */   422,  358,  335,  -12,  -12,  -12,  -12,  576,  294,  -12,
- /*   210 */   -12,  295,  595,  141,  600,  730,  723,  723,  805,  730,
- /*   220 */   805,  439,  911,  231,  865,  231,  865,  807,  865,  723,
- /*   230 */   766,  633,  633,  231,  284,   63,  608, 1476, 1308, 1308,
- /*   240 */  1472, 1472, 1308, 1477, 1425, 1275, 1487, 1487, 1487, 1487,
- /*   250 */  1308, 1461, 1275, 1477, 1425, 1425, 1308, 1461, 1355, 1441,
- /*   260 */  1308, 1308, 1461, 1308, 1461, 1308, 1461, 1442, 1348, 1348,
- /*   270 */  1348, 1408, 1375, 1375, 1442, 1348, 1357, 1348, 1408, 1348,
- /*   280 */  1348, 1316, 1331, 1316, 1331, 1316, 1331, 1308, 1308, 1280,
- /*   290 */  1288, 1289, 1285, 1279, 1275, 1253, 1336, 1346, 1346, 1338,
- /*   300 */  1338, 1338, 1338,  -70,  -70,  -70,  -70,  -70,  -70, 1013,
- /*   310 */   467,  612,   84,  179,  -28,  870,  410,  761,  760,  667,
- /*   320 */   650,  531,  220,  361,  331,  125,  127,   97, 1306, 1300,
- /*   330 */  1270, 1151, 1272, 1203, 1232, 1261, 1244, 1148, 1174, 1139,
- /*   340 */  1156, 1124, 1220, 1115, 1210, 1233, 1099, 1193, 1184, 1174,
- /*   350 */  1173, 1029, 1121, 1120, 1085, 1162, 1119, 1037, 1152, 1147,
- /*   360 */  1129, 1046, 1011, 1093, 1098, 1075, 1061, 1032,  960, 1057,
- /*   370 */  1031, 1030,  899,  938,  982,  936,  972,  958,  910,  955,
- /*   380 */   875,  885,  908,  857,  859,  867,  804,  590,  834,  747,
- /*   390 */   818,  513,  611,  741,  673,  637,  611,  606,  603,  579,
- /*   400 */   501,  541,  468,  386,  445,  395,  376,  281,  185,  120,
- /*   410 */    92,   75,   45,  114,   25,   11,    5,
+ /*     0 */   992, 1057, 1355, 1156, 1204, 1204,    1,  262,  -19,  135,
+ /*    10 */   135,  776, 1204, 1204, 1204, 1204,   69,   69,   53,  208,
+ /*    20 */   283,  755,   58,  725,  648,  571,  494,  417,  340,  263,
+ /*    30 */   212,  827,  827,  827,  827,  827,  827,  827,  827,  827,
+ /*    40 */   827,  827,  827,  827,  827,  827,  878,  827,  929,  980,
+ /*    50 */   980, 1070, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204,
+ /*    60 */  1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204,
+ /*    70 */  1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204,
+ /*    80 */  1258, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204,
+ /*    90 */  1204, 1204, 1204, 1204,  -71,  -47,  -47,  -47,  -47,  -47,
+ /*   100 */     0,   29,  -12,  283,  283,  139,   91,  392,  392,  894,
+ /*   110 */   672,  726, 1383,  -86,  -86,  -86,   88,  318,  318,   99,
+ /*   120 */   381,  -20,  283,  283,  283,  283,  283,  283,  283,  283,
+ /*   130 */   283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+ /*   140 */   283,  283,  283,  283,  624,  876,  726,  672, 1340, 1340,
+ /*   150 */  1340, 1340, 1340, 1340,  -86,  -86,  -86,  305,  136,  136,
+ /*   160 */   142,  167,  226,  154,  137,  152,  283,  283,  283,  283,
+ /*   170 */   283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+ /*   180 */   283,  283,  283,  336,  336,  336,  283,  283,  352,  283,
+ /*   190 */   283,  283,  283,  283,  228,  283,  283,  283,  283,  283,
+ /*   200 */   283,  283,  283,  283,  283,  501,  569,  596,  596,  596,
+ /*   210 */   507,  497,  441,  391,  353,  156,  156,  857,  353,  857,
+ /*   220 */   735,  813,  639,  715,  156,  332,  715,  715,  496,  419,
+ /*   230 */   646, 1357, 1184, 1184, 1335, 1335, 1184, 1341, 1260, 1144,
+ /*   240 */  1346, 1346, 1346, 1346, 1184, 1306, 1144, 1341, 1260, 1260,
+ /*   250 */  1144, 1184, 1306, 1206, 1284, 1184, 1184, 1306, 1184, 1306,
+ /*   260 */  1184, 1306, 1262, 1207, 1207, 1207, 1274, 1262, 1207, 1217,
+ /*   270 */  1207, 1274, 1207, 1207, 1185, 1200, 1185, 1200, 1185, 1200,
+ /*   280 */  1184, 1184, 1161, 1262, 1202, 1202, 1262, 1154, 1155, 1147,
+ /*   290 */  1152, 1144, 1241, 1239, 1250, 1250, 1254, 1254, 1254, 1254,
+ /*   300 */   -86,  -86,  -86,  -86,  -86,  -86, 1068,  304,  526,  249,
+ /*   310 */   408,  -83,  434,  812,   27,  811,  807,  802,  751,  589,
+ /*   320 */   651,  163,  131,  674,  366,  450,  299,  148,   23,  102,
+ /*   330 */   229,  -21, 1245, 1244, 1222, 1099, 1228, 1172, 1223, 1215,
+ /*   340 */  1213, 1115, 1106, 1123, 1110, 1209, 1105, 1212, 1226, 1098,
+ /*   350 */  1089, 1140, 1139, 1104, 1189, 1178, 1094, 1211, 1205, 1187,
+ /*   360 */  1101, 1071, 1153, 1175, 1146, 1138, 1151, 1091, 1164, 1165,
+ /*   370 */  1163, 1069, 1072, 1148, 1112, 1134, 1127, 1129, 1126, 1092,
+ /*   380 */  1114, 1118, 1088, 1090, 1093, 1087, 1084,  987, 1079, 1077,
+ /*   390 */  1074, 1065,  924, 1021, 1014, 1004, 1006,  819,  739,  896,
+ /*   400 */   855,  804,  739,  740,  736,  690,  654,  665,  618,  582,
+ /*   410 */   568,  528,  554,  379,  532,  479,  455,  379,  432,  371,
+ /*   420 */   341,   28,  338,  116,  -11,  -57,  -85,    7,   -8,    3,
 };
-#define YY_REDUCE_USE_DFLT (-169)
-#define YY_REDUCE_COUNT (308)
-#define YY_REDUCE_MIN   (-168)
-#define YY_REDUCE_MAX   (1391)
+#define YY_REDUCE_USE_DFLT (-110)
+#define YY_REDUCE_COUNT (305)
+#define YY_REDUCE_MIN   (-109)
+#define YY_REDUCE_MAX   (1323)
 static const short yy_reduce_ofst[] = {
- /*     0 */  -141,   90, 1095,  222,  158,  156,   19,   17,   10, -104,
- /*    10 */   378,  316,  311,   12,  180,  249,  598,  464,  397, 1181,
- /*    20 */  1177, 1175, 1128, 1106, 1096, 1054, 1038,  974,  964,  962,
- /*    30 */   948,  905,  903,  900,  887,  874,  832,  826,  816,  813,
- /*    40 */   800,  758,  755,  752,  742,  739,  726,  685,  681,  668,
- /*    50 */   665,  652,  607,  604,  594,  591,  578,  530,  528,  526,
- /*    60 */   385,   18,  477,  466,  519,  444,  350,  435,  405,  488,
- /*    70 */   488,  488,  488,  488,  488,  488,  488,  488,  488,  488,
- /*    80 */   488,  488,  488,  488,  488,  488,  488,  488,  488,  488,
- /*    90 */   488,  488,  488,  488,  488,  488,  488,  488,  488,  488,
- /*   100 */   488,  488,  488,  488,  488,  488,  488, 1040,  678, 1036,
- /*   110 */  1007,  967,  966,  965,  845,  686,  610,  684,  317,  672,
- /*   120 */   893,  327,  623,  522,   -7,  820,  814,  157,  154,  101,
- /*   130 */   702,  494,  580,  488,  488,  488,  488,  488,  614,  586,
- /*   140 */   935,  892,  968, 1245, 1242, 1234, 1225,  798,  798, 1222,
- /*   150 */  1221, 1218, 1214, 1213, 1212, 1202, 1195, 1191, 1161, 1158,
- /*   160 */  1140, 1135, 1123, 1112, 1107, 1100, 1080, 1074, 1073, 1072,
- /*   170 */  1070, 1067, 1048, 1044,  969,  968,  907,  906,  904,  894,
- /*   180 */   833,  837,  836,  340,  827,  815,  775,   68,  722,  646,
- /*   190 */  -168, 1384, 1380, 1377, 1379, 1376, 1373, 1339, 1365, 1368,
- /*   200 */  1365, 1365, 1365, 1365, 1365, 1365, 1365, 1320, 1319, 1365,
- /*   210 */  1365, 1339, 1378, 1349, 1391, 1350, 1342, 1334, 1307, 1341,
- /*   220 */  1293, 1364, 1363, 1371, 1362, 1370, 1359, 1340, 1354, 1333,
- /*   230 */  1305, 1304, 1299, 1361, 1328, 1324, 1366, 1282, 1360, 1358,
- /*   240 */  1278, 1276, 1356, 1292, 1322, 1309, 1317, 1315, 1314, 1312,
- /*   250 */  1345, 1347, 1302, 1277, 1311, 1303, 1337, 1335, 1252, 1248,
- /*   260 */  1332, 1330, 1329, 1327, 1326, 1323, 1321, 1297, 1301, 1295,
- /*   270 */  1294, 1290, 1243, 1240, 1284, 1291, 1286, 1283, 1274, 1281,
- /*   280 */  1271, 1238, 1241, 1236, 1235, 1227, 1226, 1267, 1266, 1189,
- /*   290 */  1229, 1223, 1211, 1206, 1201, 1197, 1239, 1237, 1219, 1216,
- /*   300 */  1209, 1208, 1185, 1089, 1086, 1087, 1137, 1136, 1164,
+ /*     0 */   238,  954,  213,  289,  310,  234,  144,  317, -109,  382,
+ /*    10 */   377,  303,  461,  389,  378,  368,  302,  294,  253,  395,
+ /*    20 */   293,  324,  403,  403,  403,  403,  403,  403,  403,  403,
+ /*    30 */   403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
+ /*    40 */   403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
+ /*    50 */   403, 1022, 1012, 1005,  998,  963,  961,  959,  957,  950,
+ /*    60 */   947,  930,  912,  873,  861,  823,  810,  771,  759,  720,
+ /*    70 */   708,  670,  657,  619,  614,  612,  610,  608,  606,  604,
+ /*    80 */   598,  595,  593,  580,  542,  540,  537,  535,  533,  531,
+ /*    90 */   529,  527,  503,  386,  403,  403,  403,  403,  403,  403,
+ /*   100 */   403,  403,  403,   95,  447,   82,  334,  504,  467,  403,
+ /*   110 */   477,  464,  403,  403,  403,  403,  860,  747,  744,  785,
+ /*   120 */   638,  638,  926,  891,  900,  899,  887,  844,  840,  835,
+ /*   130 */   848,  830,  843,  829,  792,  839,  826,  737,  838,  795,
+ /*   140 */   789,   47,  734,  530,  696,  777,  711,  677,  733,  730,
+ /*   150 */   729,  728,  727,  627,  448,   64,  187, 1305, 1302, 1252,
+ /*   160 */  1290, 1273, 1323, 1322, 1321, 1319, 1318, 1316, 1315, 1314,
+ /*   170 */  1313, 1312, 1311, 1310, 1308, 1307, 1304, 1303, 1301, 1298,
+ /*   180 */  1294, 1292, 1289, 1266, 1264, 1259, 1288, 1287, 1238, 1285,
+ /*   190 */  1281, 1280, 1279, 1278, 1251, 1277, 1276, 1275, 1273, 1268,
+ /*   200 */  1267, 1265, 1263, 1261, 1257, 1248, 1237, 1247, 1246, 1243,
+ /*   210 */  1238, 1240, 1235, 1249, 1234, 1233, 1230, 1220, 1214, 1210,
+ /*   220 */  1225, 1219, 1232, 1231, 1197, 1195, 1227, 1224, 1201, 1208,
+ /*   230 */  1242, 1137, 1236, 1229, 1193, 1181, 1221, 1177, 1196, 1179,
+ /*   240 */  1191, 1190, 1186, 1182, 1218, 1216, 1176, 1162, 1183, 1180,
+ /*   250 */  1160, 1199, 1203, 1133, 1095, 1198, 1194, 1188, 1192, 1171,
+ /*   260 */  1169, 1168, 1173, 1174, 1166, 1159, 1141, 1170, 1158, 1167,
+ /*   270 */  1157, 1132, 1145, 1143, 1124, 1128, 1103, 1102, 1100, 1096,
+ /*   280 */  1150, 1149, 1085, 1125, 1080, 1064, 1120, 1097, 1082, 1078,
+ /*   290 */  1073, 1067, 1109, 1107, 1119, 1117, 1116, 1113, 1111, 1108,
+ /*   300 */  1007, 1000, 1002, 1076, 1075, 1081,
 };
 static const YYACTIONTYPE yy_default[] = {
- /*     0 */   632,  866,  954,  954,  866,  866,  954,  954,  954,  756,
- /*    10 */   954,  954,  954,  864,  954,  954,  784,  784,  928,  954,
- /*    20 */   954,  954,  954,  954,  954,  954,  954,  954,  954,  954,
- /*    30 */   954,  954,  954,  954,  954,  954,  954,  954,  954,  954,
- /*    40 */   954,  954,  954,  954,  954,  954,  954,  954,  954,  954,
- /*    50 */   954,  954,  954,  954,  954,  954,  954,  954,  954,  954,
- /*    60 */   954,  954,  954,  954,  954,  954,  954,  671,  760,  790,
- /*    70 */   954,  954,  954,  954,  954,  954,  954,  954,  927,  929,
- /*    80 */   798,  797,  907,  771,  795,  788,  792,  867,  860,  861,
- /*    90 */   859,  863,  868,  954,  791,  827,  844,  826,  838,  843,
- /*   100 */   850,  842,  839,  829,  828,  830,  831,  954,  954,  954,
- /*   110 */   954,  954,  954,  954,  954,  954,  954,  954,  954,  954,
- /*   120 */   954,  954,  954,  658,  725,  954,  954,  954,  954,  954,
- /*   130 */   954,  954,  954,  832,  833,  847,  846,  845,  954,  663,
- /*   140 */   954,  954,  954,  954,  954,  954,  954,  954,  954,  954,
- /*   150 */   934,  932,  954,  879,  954,  954,  954,  954,  954,  954,
- /*   160 */   954,  954,  954,  954,  954,  954,  954,  954,  954,  954,
- /*   170 */   954,  954,  954,  954,  954,  954,  954,  954,  954,  954,
- /*   180 */   638,  756,  756,  756,  632,  954,  954,  954,  946,  760,
- /*   190 */   750,  954,  954,  954,  954,  954,  954,  954,  954,  954,
- /*   200 */   954,  954,  954,  800,  739,  917,  919,  954,  900,  737,
- /*   210 */   660,  758,  673,  748,  640,  794,  773,  773,  912,  794,
- /*   220 */   912,  696,  719,  954,  784,  954,  784,  693,  784,  773,
- /*   230 */   862,  954,  954,  954,  757,  748,  954,  939,  764,  764,
- /*   240 */   931,  931,  764,  806,  729,  794,  736,  736,  736,  736,
- /*   250 */   764,  655,  794,  806,  729,  729,  764,  655,  906,  904,
- /*   260 */   764,  764,  655,  764,  655,  764,  655,  872,  727,  727,
- /*   270 */   727,  711,  876,  876,  872,  727,  696,  727,  711,  727,
- /*   280 */   727,  777,  772,  777,  772,  777,  772,  764,  764,  954,
- /*   290 */   789,  778,  787,  785,  794,  954,  714,  648,  648,  637,
- /*   300 */   637,  637,  637,  951,  951,  946,  698,  698,  681,  954,
- /*   310 */   954,  954,  954,  954,  954,  954,  881,  954,  954,  954,
- /*   320 */   954,  954,  954,  954,  954,  954,  954,  954,  954,  633,
- /*   330 */   941,  954,  954,  938,  954,  954,  954,  954,  799,  954,
- /*   340 */   954,  954,  954,  954,  954,  954,  954,  954,  954,  916,
- /*   350 */   954,  954,  954,  954,  954,  954,  954,  910,  954,  954,
- /*   360 */   954,  954,  954,  954,  903,  902,  954,  954,  954,  954,
- /*   370 */   954,  954,  954,  954,  954,  954,  954,  954,  954,  954,
- /*   380 */   954,  954,  954,  954,  954,  954,  954,  954,  954,  954,
- /*   390 */   954,  954,  786,  954,  779,  954,  865,  954,  954,  954,
- /*   400 */   954,  954,  954,  954,  954,  954,  954,  742,  815,  954,
- /*   410 */   814,  818,  813,  665,  954,  646,  954,  629,  634,  950,
- /*   420 */   953,  952,  949,  948,  947,  942,  940,  937,  936,  935,
- /*   430 */   933,  930,  926,  885,  883,  890,  889,  888,  887,  886,
- /*   440 */   884,  882,  880,  801,  796,  793,  925,  878,  738,  735,
- /*   450 */   734,  654,  943,  909,  918,  805,  804,  807,  915,  914,
- /*   460 */   913,  911,  908,  895,  803,  802,  730,  870,  869,  657,
- /*   470 */   899,  898,  897,  901,  905,  896,  766,  656,  653,  662,
- /*   480 */   717,  718,  726,  724,  723,  722,  721,  720,  716,  664,
- /*   490 */   672,  710,  695,  694,  875,  877,  874,  873,  703,  702,
- /*   500 */   708,  707,  706,  705,  704,  701,  700,  699,  692,  691,
- /*   510 */   697,  690,  713,  712,  709,  689,  733,  732,  731,  728,
- /*   520 */   688,  687,  686,  818,  685,  684,  824,  823,  811,  854,
- /*   530 */   753,  752,  751,  763,  762,  775,  774,  809,  808,  776,
- /*   540 */   761,  755,  754,  770,  769,  768,  767,  759,  749,  781,
- /*   550 */   783,  782,  780,  856,  765,  853,  924,  923,  922,  921,
- /*   560 */   920,  858,  857,  825,  822,  676,  677,  893,  892,  894,
- /*   570 */   891,  679,  678,  675,  674,  855,  744,  743,  851,  848,
- /*   580 */   840,  836,  852,  849,  841,  837,  835,  834,  820,  819,
- /*   590 */   817,  816,  812,  821,  667,  745,  741,  740,  810,  747,
- /*   600 */   746,  683,  682,  680,  661,  659,  652,  650,  649,  651,
- /*   610 */   647,  645,  644,  643,  642,  641,  670,  669,  668,  666,
- /*   620 */   665,  639,  636,  635,  631,  630,  628,
+ /*     0 */   647,  964,  964,  964,  878,  878,  969,  964,  774,  802,
+ /*    10 */   802,  938,  969,  969,  969,  876,  969,  969,  969,  964,
+ /*    20 */   969,  778,  808,  969,  969,  969,  969,  969,  969,  969,
+ /*    30 */   969,  937,  939,  816,  815,  918,  789,  813,  806,  810,
+ /*    40 */   879,  872,  873,  871,  875,  880,  969,  809,  841,  856,
+ /*    50 */   840,  969,  969,  969,  969,  969,  969,  969,  969,  969,
+ /*    60 */   969,  969,  969,  969,  969,  969,  969,  969,  969,  969,
+ /*    70 */   969,  969,  969,  969,  969,  969,  969,  969,  969,  969,
+ /*    80 */   969,  969,  969,  969,  969,  969,  969,  969,  969,  969,
+ /*    90 */   969,  969,  969,  969,  850,  855,  862,  854,  851,  843,
+ /*   100 */   842,  844,  845,  969,  969,  673,  739,  969,  969,  846,
+ /*   110 */   969,  685,  847,  859,  858,  857,  680,  969,  969,  969,
+ /*   120 */   969,  969,  969,  969,  969,  969,  969,  969,  969,  969,
+ /*   130 */   969,  969,  969,  969,  969,  969,  969,  969,  969,  969,
+ /*   140 */   969,  969,  969,  969,  647,  964,  969,  969,  964,  964,
+ /*   150 */   964,  964,  964,  964,  956,  778,  768,  969,  969,  969,
+ /*   160 */   969,  969,  969,  969,  969,  969,  969,  944,  942,  969,
+ /*   170 */   891,  969,  969,  969,  969,  969,  969,  969,  969,  969,
+ /*   180 */   969,  969,  969,  969,  969,  969,  969,  969,  969,  969,
+ /*   190 */   969,  969,  969,  969,  969,  969,  969,  969,  969,  969,
+ /*   200 */   969,  969,  969,  969,  653,  969,  911,  774,  774,  774,
+ /*   210 */   776,  754,  766,  655,  812,  791,  791,  923,  812,  923,
+ /*   220 */   710,  733,  707,  802,  791,  874,  802,  802,  775,  766,
+ /*   230 */   969,  949,  782,  782,  941,  941,  782,  821,  743,  812,
+ /*   240 */   750,  750,  750,  750,  782,  670,  812,  821,  743,  743,
+ /*   250 */   812,  782,  670,  917,  915,  782,  782,  670,  782,  670,
+ /*   260 */   782,  670,  884,  741,  741,  741,  725,  884,  741,  710,
+ /*   270 */   741,  725,  741,  741,  795,  790,  795,  790,  795,  790,
+ /*   280 */   782,  782,  969,  884,  888,  888,  884,  807,  796,  805,
+ /*   290 */   803,  812,  676,  728,  663,  663,  652,  652,  652,  652,
+ /*   300 */   961,  961,  956,  712,  712,  695,  969,  969,  969,  969,
+ /*   310 */   969,  969,  687,  969,  893,  969,  969,  969,  969,  969,
+ /*   320 */   969,  969,  969,  969,  969,  969,  969,  969,  969,  969,
+ /*   330 */   969,  828,  969,  648,  951,  969,  969,  948,  969,  969,
+ /*   340 */   969,  969,  969,  969,  969,  969,  969,  969,  969,  969,
+ /*   350 */   969,  969,  969,  969,  969,  969,  921,  969,  969,  969,
+ /*   360 */   969,  969,  969,  914,  913,  969,  969,  969,  969,  969,
+ /*   370 */   969,  969,  969,  969,  969,  969,  969,  969,  969,  969,
+ /*   380 */   969,  969,  969,  969,  969,  969,  969,  757,  969,  969,
+ /*   390 */   969,  761,  969,  969,  969,  969,  969,  969,  804,  969,
+ /*   400 */   797,  969,  877,  969,  969,  969,  969,  969,  969,  969,
+ /*   410 */   969,  969,  969,  966,  969,  969,  969,  965,  969,  969,
+ /*   420 */   969,  969,  969,  830,  969,  829,  833,  969,  661,  969,
+ /*   430 */   644,  649,  960,  963,  962,  959,  958,  957,  952,  950,
+ /*   440 */   947,  946,  945,  943,  940,  936,  897,  895,  902,  901,
+ /*   450 */   900,  899,  898,  896,  894,  892,  818,  817,  814,  811,
+ /*   460 */   753,  935,  890,  752,  749,  748,  669,  953,  920,  929,
+ /*   470 */   928,  927,  822,  926,  925,  924,  922,  919,  906,  820,
+ /*   480 */   819,  744,  882,  881,  672,  910,  909,  908,  912,  916,
+ /*   490 */   907,  784,  751,  671,  668,  675,  679,  731,  732,  740,
+ /*   500 */   738,  737,  736,  735,  734,  730,  681,  686,  724,  709,
+ /*   510 */   708,  717,  716,  722,  721,  720,  719,  718,  715,  714,
+ /*   520 */   713,  706,  705,  711,  704,  727,  726,  723,  703,  747,
+ /*   530 */   746,  745,  742,  702,  701,  700,  833,  699,  698,  838,
+ /*   540 */   837,  866,  826,  755,  759,  758,  762,  763,  771,  770,
+ /*   550 */   769,  780,  781,  793,  792,  824,  823,  794,  779,  773,
+ /*   560 */   772,  788,  787,  786,  785,  777,  767,  799,  798,  868,
+ /*   570 */   783,  867,  865,  934,  933,  932,  931,  930,  870,  967,
+ /*   580 */   968,  887,  889,  886,  801,  800,  885,  869,  839,  836,
+ /*   590 */   690,  691,  905,  904,  903,  693,  692,  689,  688,  863,
+ /*   600 */   860,  852,  864,  861,  853,  849,  848,  834,  832,  831,
+ /*   610 */   827,  835,  760,  756,  825,  765,  764,  697,  696,  694,
+ /*   620 */   678,  677,  674,  667,  665,  664,  666,  662,  660,  659,
+ /*   630 */   658,  657,  656,  684,  683,  682,  654,  651,  650,  646,
+ /*   640 */   645,  643,
 };
 
 /* The next table maps tokens into fallback tokens.  If a construct
@@ -110895,71 +117126,74 @@ static const YYACTIONTYPE yy_default[] = {
 static const YYCODETYPE yyFallback[] = {
     0,  /*          $ => nothing */
     0,  /*       SEMI => nothing */
-   26,  /*    EXPLAIN => ID */
-   26,  /*      QUERY => ID */
-   26,  /*       PLAN => ID */
-   26,  /*      BEGIN => ID */
+   27,  /*    EXPLAIN => ID */
+   27,  /*      QUERY => ID */
+   27,  /*       PLAN => ID */
+   27,  /*      BEGIN => ID */
     0,  /* TRANSACTION => nothing */
-   26,  /*   DEFERRED => ID */
-   26,  /*  IMMEDIATE => ID */
-   26,  /*  EXCLUSIVE => ID */
+   27,  /*   DEFERRED => ID */
+   27,  /*  IMMEDIATE => ID */
+   27,  /*  EXCLUSIVE => ID */
     0,  /*     COMMIT => nothing */
-   26,  /*        END => ID */
-   26,  /*   ROLLBACK => ID */
-   26,  /*  SAVEPOINT => ID */
-   26,  /*    RELEASE => ID */
+   27,  /*        END => ID */
+   27,  /*   ROLLBACK => ID */
+   27,  /*  SAVEPOINT => ID */
+   27,  /*    RELEASE => ID */
     0,  /*         TO => nothing */
     0,  /*      TABLE => nothing */
     0,  /*     CREATE => nothing */
-   26,  /*         IF => ID */
+   27,  /*         IF => ID */
     0,  /*        NOT => nothing */
     0,  /*     EXISTS => nothing */
-   26,  /*       TEMP => ID */
+   27,  /*       TEMP => ID */
     0,  /*         LP => nothing */
     0,  /*         RP => nothing */
     0,  /*         AS => nothing */
+   27,  /*    WITHOUT => ID */
     0,  /*      COMMA => nothing */
     0,  /*         ID => nothing */
     0,  /*    INDEXED => nothing */
-   26,  /*      ABORT => ID */
-   26,  /*     ACTION => ID */
-   26,  /*      AFTER => ID */
-   26,  /*    ANALYZE => ID */
-   26,  /*        ASC => ID */
-   26,  /*     ATTACH => ID */
-   26,  /*     BEFORE => ID */
-   26,  /*         BY => ID */
-   26,  /*    CASCADE => ID */
-   26,  /*       CAST => ID */
-   26,  /*   COLUMNKW => ID */
-   26,  /*   CONFLICT => ID */
-   26,  /*   DATABASE => ID */
-   26,  /*       DESC => ID */
-   26,  /*     DETACH => ID */
-   26,  /*       EACH => ID */
-   26,  /*       FAIL => ID */
-   26,  /*        FOR => ID */
-   26,  /*     IGNORE => ID */
-   26,  /*  INITIALLY => ID */
-   26,  /*    INSTEAD => ID */
-   26,  /*    LIKE_KW => ID */
-   26,  /*      MATCH => ID */
-   26,  /*         NO => ID */
-   26,  /*        KEY => ID */
-   26,  /*         OF => ID */
-   26,  /*     OFFSET => ID */
-   26,  /*     PRAGMA => ID */
-   26,  /*      RAISE => ID */
-   26,  /*    REPLACE => ID */
-   26,  /*   RESTRICT => ID */
-   26,  /*        ROW => ID */
-   26,  /*    TRIGGER => ID */
-   26,  /*     VACUUM => ID */
-   26,  /*       VIEW => ID */
-   26,  /*    VIRTUAL => ID */
-   26,  /*    REINDEX => ID */
-   26,  /*     RENAME => ID */
-   26,  /*   CTIME_KW => ID */
+   27,  /*      ABORT => ID */
+   27,  /*     ACTION => ID */
+   27,  /*      AFTER => ID */
+   27,  /*    ANALYZE => ID */
+   27,  /*        ASC => ID */
+   27,  /*     ATTACH => ID */
+   27,  /*     BEFORE => ID */
+   27,  /*         BY => ID */
+   27,  /*    CASCADE => ID */
+   27,  /*       CAST => ID */
+   27,  /*   COLUMNKW => ID */
+   27,  /*   CONFLICT => ID */
+   27,  /*   DATABASE => ID */
+   27,  /*       DESC => ID */
+   27,  /*     DETACH => ID */
+   27,  /*       EACH => ID */
+   27,  /*       FAIL => ID */
+   27,  /*        FOR => ID */
+   27,  /*     IGNORE => ID */
+   27,  /*  INITIALLY => ID */
+   27,  /*    INSTEAD => ID */
+   27,  /*    LIKE_KW => ID */
+   27,  /*      MATCH => ID */
+   27,  /*         NO => ID */
+   27,  /*        KEY => ID */
+   27,  /*         OF => ID */
+   27,  /*     OFFSET => ID */
+   27,  /*     PRAGMA => ID */
+   27,  /*      RAISE => ID */
+   27,  /*  RECURSIVE => ID */
+   27,  /*    REPLACE => ID */
+   27,  /*   RESTRICT => ID */
+   27,  /*        ROW => ID */
+   27,  /*    TRIGGER => ID */
+   27,  /*     VACUUM => ID */
+   27,  /*       VIEW => ID */
+   27,  /*    VIRTUAL => ID */
+   27,  /*       WITH => ID */
+   27,  /*    REINDEX => ID */
+   27,  /*     RENAME => ID */
+   27,  /*   CTIME_KW => ID */
 };
 #endif /* YYFALLBACK */
 
@@ -111044,63 +117278,64 @@ static const char *const yyTokenName[] = {
   "ROLLBACK",      "SAVEPOINT",     "RELEASE",       "TO",          
   "TABLE",         "CREATE",        "IF",            "NOT",         
   "EXISTS",        "TEMP",          "LP",            "RP",          
-  "AS",            "COMMA",         "ID",            "INDEXED",     
-  "ABORT",         "ACTION",        "AFTER",         "ANALYZE",     
-  "ASC",           "ATTACH",        "BEFORE",        "BY",          
-  "CASCADE",       "CAST",          "COLUMNKW",      "CONFLICT",    
-  "DATABASE",      "DESC",          "DETACH",        "EACH",        
-  "FAIL",          "FOR",           "IGNORE",        "INITIALLY",   
-  "INSTEAD",       "LIKE_KW",       "MATCH",         "NO",          
-  "KEY",           "OF",            "OFFSET",        "PRAGMA",      
-  "RAISE",         "REPLACE",       "RESTRICT",      "ROW",         
-  "TRIGGER",       "VACUUM",        "VIEW",          "VIRTUAL",     
-  "REINDEX",       "RENAME",        "CTIME_KW",      "ANY",         
-  "OR",            "AND",           "IS",            "BETWEEN",     
-  "IN",            "ISNULL",        "NOTNULL",       "NE",          
-  "EQ",            "GT",            "LE",            "LT",          
-  "GE",            "ESCAPE",        "BITAND",        "BITOR",       
-  "LSHIFT",        "RSHIFT",        "PLUS",          "MINUS",       
-  "STAR",          "SLASH",         "REM",           "CONCAT",      
-  "COLLATE",       "BITNOT",        "STRING",        "JOIN_KW",     
-  "CONSTRAINT",    "DEFAULT",       "NULL",          "PRIMARY",     
-  "UNIQUE",        "CHECK",         "REFERENCES",    "AUTOINCR",    
-  "ON",            "INSERT",        "DELETE",        "UPDATE",      
-  "SET",           "DEFERRABLE",    "FOREIGN",       "DROP",        
-  "UNION",         "ALL",           "EXCEPT",        "INTERSECT",   
-  "SELECT",        "DISTINCT",      "DOT",           "FROM",        
+  "AS",            "WITHOUT",       "COMMA",         "ID",          
+  "INDEXED",       "ABORT",         "ACTION",        "AFTER",       
+  "ANALYZE",       "ASC",           "ATTACH",        "BEFORE",      
+  "BY",            "CASCADE",       "CAST",          "COLUMNKW",    
+  "CONFLICT",      "DATABASE",      "DESC",          "DETACH",      
+  "EACH",          "FAIL",          "FOR",           "IGNORE",      
+  "INITIALLY",     "INSTEAD",       "LIKE_KW",       "MATCH",       
+  "NO",            "KEY",           "OF",            "OFFSET",      
+  "PRAGMA",        "RAISE",         "RECURSIVE",     "REPLACE",     
+  "RESTRICT",      "ROW",           "TRIGGER",       "VACUUM",      
+  "VIEW",          "VIRTUAL",       "WITH",          "REINDEX",     
+  "RENAME",        "CTIME_KW",      "ANY",           "OR",          
+  "AND",           "IS",            "BETWEEN",       "IN",          
+  "ISNULL",        "NOTNULL",       "NE",            "EQ",          
+  "GT",            "LE",            "LT",            "GE",          
+  "ESCAPE",        "BITAND",        "BITOR",         "LSHIFT",      
+  "RSHIFT",        "PLUS",          "MINUS",         "STAR",        
+  "SLASH",         "REM",           "CONCAT",        "COLLATE",     
+  "BITNOT",        "STRING",        "JOIN_KW",       "CONSTRAINT",  
+  "DEFAULT",       "NULL",          "PRIMARY",       "UNIQUE",      
+  "CHECK",         "REFERENCES",    "AUTOINCR",      "ON",          
+  "INSERT",        "DELETE",        "UPDATE",        "SET",         
+  "DEFERRABLE",    "FOREIGN",       "DROP",          "UNION",       
+  "ALL",           "EXCEPT",        "INTERSECT",     "SELECT",      
+  "VALUES",        "DISTINCT",      "DOT",           "FROM",        
   "JOIN",          "USING",         "ORDER",         "GROUP",       
   "HAVING",        "LIMIT",         "WHERE",         "INTO",        
-  "VALUES",        "INTEGER",       "FLOAT",         "BLOB",        
-  "REGISTER",      "VARIABLE",      "CASE",          "WHEN",        
-  "THEN",          "ELSE",          "INDEX",         "ALTER",       
-  "ADD",           "error",         "input",         "cmdlist",     
-  "ecmd",          "explain",       "cmdx",          "cmd",         
-  "transtype",     "trans_opt",     "nm",            "savepoint_opt",
-  "create_table",  "create_table_args",  "createkw",      "temp",        
-  "ifnotexists",   "dbnm",          "columnlist",    "conslist_opt",
-  "select",        "column",        "columnid",      "type",        
-  "carglist",      "id",            "ids",           "typetoken",   
-  "typename",      "signed",        "plus_num",      "minus_num",   
-  "ccons",         "term",          "expr",          "onconf",      
-  "sortorder",     "autoinc",       "idxlist_opt",   "refargs",     
-  "defer_subclause",  "refarg",        "refact",        "init_deferred_pred_opt",
-  "conslist",      "tconscomma",    "tcons",         "idxlist",     
-  "defer_subclause_opt",  "orconf",        "resolvetype",   "raisetype",   
-  "ifexists",      "fullname",      "oneselect",     "multiselect_op",
-  "distinct",      "selcollist",    "from",          "where_opt",   
-  "groupby_opt",   "having_opt",    "orderby_opt",   "limit_opt",   
-  "sclp",          "as",            "seltablist",    "stl_prefix",  
-  "joinop",        "indexed_opt",   "on_opt",        "using_opt",   
-  "joinop2",       "inscollist",    "sortlist",      "nexprlist",   
-  "setlist",       "insert_cmd",    "inscollist_opt",  "valuelist",   
-  "exprlist",      "likeop",        "between_op",    "in_op",       
-  "case_operand",  "case_exprlist",  "case_else",     "uniqueflag",  
-  "collate",       "nmnum",         "number",        "trigger_decl",
-  "trigger_cmd_list",  "trigger_time",  "trigger_event",  "foreach_clause",
-  "when_clause",   "trigger_cmd",   "trnm",          "tridxby",     
-  "database_kw_opt",  "key_opt",       "add_column_fullname",  "kwcolumn_opt",
-  "create_vtab",   "vtabarglist",   "vtabarg",       "vtabargtoken",
-  "lp",            "anylist",     
+  "INTEGER",       "FLOAT",         "BLOB",          "VARIABLE",    
+  "CASE",          "WHEN",          "THEN",          "ELSE",        
+  "INDEX",         "ALTER",         "ADD",           "error",       
+  "input",         "cmdlist",       "ecmd",          "explain",     
+  "cmdx",          "cmd",           "transtype",     "trans_opt",   
+  "nm",            "savepoint_opt",  "create_table",  "create_table_args",
+  "createkw",      "temp",          "ifnotexists",   "dbnm",        
+  "columnlist",    "conslist_opt",  "table_options",  "select",      
+  "column",        "columnid",      "type",          "carglist",    
+  "typetoken",     "typename",      "signed",        "plus_num",    
+  "minus_num",     "ccons",         "term",          "expr",        
+  "onconf",        "sortorder",     "autoinc",       "idxlist_opt", 
+  "refargs",       "defer_subclause",  "refarg",        "refact",      
+  "init_deferred_pred_opt",  "conslist",      "tconscomma",    "tcons",       
+  "idxlist",       "defer_subclause_opt",  "orconf",        "resolvetype", 
+  "raisetype",     "ifexists",      "fullname",      "selectnowith",
+  "oneselect",     "with",          "multiselect_op",  "distinct",    
+  "selcollist",    "from",          "where_opt",     "groupby_opt", 
+  "having_opt",    "orderby_opt",   "limit_opt",     "values",      
+  "nexprlist",     "exprlist",      "sclp",          "as",          
+  "seltablist",    "stl_prefix",    "joinop",        "indexed_opt", 
+  "on_opt",        "using_opt",     "joinop2",       "idlist",      
+  "sortlist",      "setlist",       "insert_cmd",    "inscollist_opt",
+  "likeop",        "between_op",    "in_op",         "case_operand",
+  "case_exprlist",  "case_else",     "uniqueflag",    "collate",     
+  "nmnum",         "trigger_decl",  "trigger_cmd_list",  "trigger_time",
+  "trigger_event",  "foreach_clause",  "when_clause",   "trigger_cmd", 
+  "trnm",          "tridxby",       "database_kw_opt",  "key_opt",     
+  "add_column_fullname",  "kwcolumn_opt",  "create_vtab",   "vtabarglist", 
+  "vtabarg",       "vtabargtoken",  "lp",            "anylist",     
+  "wqlist",      
 };
 #endif /* NDEBUG */
 
@@ -111140,301 +117375,301 @@ static const char *const yyRuleName[] = {
  /*  29 */ "ifnotexists ::= IF NOT EXISTS",
  /*  30 */ "temp ::= TEMP",
  /*  31 */ "temp ::=",
- /*  32 */ "create_table_args ::= LP columnlist conslist_opt RP",
+ /*  32 */ "create_table_args ::= LP columnlist conslist_opt RP table_options",
  /*  33 */ "create_table_args ::= AS select",
- /*  34 */ "columnlist ::= columnlist COMMA column",
- /*  35 */ "columnlist ::= column",
- /*  36 */ "column ::= columnid type carglist",
- /*  37 */ "columnid ::= nm",
- /*  38 */ "id ::= ID",
- /*  39 */ "id ::= INDEXED",
- /*  40 */ "ids ::= ID|STRING",
- /*  41 */ "nm ::= id",
- /*  42 */ "nm ::= STRING",
- /*  43 */ "nm ::= JOIN_KW",
- /*  44 */ "type ::=",
- /*  45 */ "type ::= typetoken",
- /*  46 */ "typetoken ::= typename",
- /*  47 */ "typetoken ::= typename LP signed RP",
- /*  48 */ "typetoken ::= typename LP signed COMMA signed RP",
- /*  49 */ "typename ::= ids",
- /*  50 */ "typename ::= typename ids",
- /*  51 */ "signed ::= plus_num",
- /*  52 */ "signed ::= minus_num",
- /*  53 */ "carglist ::= carglist ccons",
- /*  54 */ "carglist ::=",
- /*  55 */ "ccons ::= CONSTRAINT nm",
- /*  56 */ "ccons ::= DEFAULT term",
- /*  57 */ "ccons ::= DEFAULT LP expr RP",
- /*  58 */ "ccons ::= DEFAULT PLUS term",
- /*  59 */ "ccons ::= DEFAULT MINUS term",
- /*  60 */ "ccons ::= DEFAULT id",
- /*  61 */ "ccons ::= NULL onconf",
- /*  62 */ "ccons ::= NOT NULL onconf",
- /*  63 */ "ccons ::= PRIMARY KEY sortorder onconf autoinc",
- /*  64 */ "ccons ::= UNIQUE onconf",
- /*  65 */ "ccons ::= CHECK LP expr RP",
- /*  66 */ "ccons ::= REFERENCES nm idxlist_opt refargs",
- /*  67 */ "ccons ::= defer_subclause",
- /*  68 */ "ccons ::= COLLATE ids",
- /*  69 */ "autoinc ::=",
- /*  70 */ "autoinc ::= AUTOINCR",
- /*  71 */ "refargs ::=",
- /*  72 */ "refargs ::= refargs refarg",
- /*  73 */ "refarg ::= MATCH nm",
- /*  74 */ "refarg ::= ON INSERT refact",
- /*  75 */ "refarg ::= ON DELETE refact",
- /*  76 */ "refarg ::= ON UPDATE refact",
- /*  77 */ "refact ::= SET NULL",
- /*  78 */ "refact ::= SET DEFAULT",
- /*  79 */ "refact ::= CASCADE",
- /*  80 */ "refact ::= RESTRICT",
- /*  81 */ "refact ::= NO ACTION",
- /*  82 */ "defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt",
- /*  83 */ "defer_subclause ::= DEFERRABLE init_deferred_pred_opt",
- /*  84 */ "init_deferred_pred_opt ::=",
- /*  85 */ "init_deferred_pred_opt ::= INITIALLY DEFERRED",
- /*  86 */ "init_deferred_pred_opt ::= INITIALLY IMMEDIATE",
- /*  87 */ "conslist_opt ::=",
- /*  88 */ "conslist_opt ::= COMMA conslist",
- /*  89 */ "conslist ::= conslist tconscomma tcons",
- /*  90 */ "conslist ::= tcons",
- /*  91 */ "tconscomma ::= COMMA",
- /*  92 */ "tconscomma ::=",
- /*  93 */ "tcons ::= CONSTRAINT nm",
- /*  94 */ "tcons ::= PRIMARY KEY LP idxlist autoinc RP onconf",
- /*  95 */ "tcons ::= UNIQUE LP idxlist RP onconf",
- /*  96 */ "tcons ::= CHECK LP expr RP onconf",
- /*  97 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt",
- /*  98 */ "defer_subclause_opt ::=",
- /*  99 */ "defer_subclause_opt ::= defer_subclause",
- /* 100 */ "onconf ::=",
- /* 101 */ "onconf ::= ON CONFLICT resolvetype",
- /* 102 */ "orconf ::=",
- /* 103 */ "orconf ::= OR resolvetype",
- /* 104 */ "resolvetype ::= raisetype",
- /* 105 */ "resolvetype ::= IGNORE",
- /* 106 */ "resolvetype ::= REPLACE",
- /* 107 */ "cmd ::= DROP TABLE ifexists fullname",
- /* 108 */ "ifexists ::= IF EXISTS",
- /* 109 */ "ifexists ::=",
- /* 110 */ "cmd ::= createkw temp VIEW ifnotexists nm dbnm AS select",
- /* 111 */ "cmd ::= DROP VIEW ifexists fullname",
- /* 112 */ "cmd ::= select",
- /* 113 */ "select ::= oneselect",
- /* 114 */ "select ::= select multiselect_op oneselect",
+ /*  34 */ "table_options ::=",
+ /*  35 */ "table_options ::= WITHOUT nm",
+ /*  36 */ "columnlist ::= columnlist COMMA column",
+ /*  37 */ "columnlist ::= column",
+ /*  38 */ "column ::= columnid type carglist",
+ /*  39 */ "columnid ::= nm",
+ /*  40 */ "nm ::= ID|INDEXED",
+ /*  41 */ "nm ::= STRING",
+ /*  42 */ "nm ::= JOIN_KW",
+ /*  43 */ "type ::=",
+ /*  44 */ "type ::= typetoken",
+ /*  45 */ "typetoken ::= typename",
+ /*  46 */ "typetoken ::= typename LP signed RP",
+ /*  47 */ "typetoken ::= typename LP signed COMMA signed RP",
+ /*  48 */ "typename ::= ID|STRING",
+ /*  49 */ "typename ::= typename ID|STRING",
+ /*  50 */ "signed ::= plus_num",
+ /*  51 */ "signed ::= minus_num",
+ /*  52 */ "carglist ::= carglist ccons",
+ /*  53 */ "carglist ::=",
+ /*  54 */ "ccons ::= CONSTRAINT nm",
+ /*  55 */ "ccons ::= DEFAULT term",
+ /*  56 */ "ccons ::= DEFAULT LP expr RP",
+ /*  57 */ "ccons ::= DEFAULT PLUS term",
+ /*  58 */ "ccons ::= DEFAULT MINUS term",
+ /*  59 */ "ccons ::= DEFAULT ID|INDEXED",
+ /*  60 */ "ccons ::= NULL onconf",
+ /*  61 */ "ccons ::= NOT NULL onconf",
+ /*  62 */ "ccons ::= PRIMARY KEY sortorder onconf autoinc",
+ /*  63 */ "ccons ::= UNIQUE onconf",
+ /*  64 */ "ccons ::= CHECK LP expr RP",
+ /*  65 */ "ccons ::= REFERENCES nm idxlist_opt refargs",
+ /*  66 */ "ccons ::= defer_subclause",
+ /*  67 */ "ccons ::= COLLATE ID|STRING",
+ /*  68 */ "autoinc ::=",
+ /*  69 */ "autoinc ::= AUTOINCR",
+ /*  70 */ "refargs ::=",
+ /*  71 */ "refargs ::= refargs refarg",
+ /*  72 */ "refarg ::= MATCH nm",
+ /*  73 */ "refarg ::= ON INSERT refact",
+ /*  74 */ "refarg ::= ON DELETE refact",
+ /*  75 */ "refarg ::= ON UPDATE refact",
+ /*  76 */ "refact ::= SET NULL",
+ /*  77 */ "refact ::= SET DEFAULT",
+ /*  78 */ "refact ::= CASCADE",
+ /*  79 */ "refact ::= RESTRICT",
+ /*  80 */ "refact ::= NO ACTION",
+ /*  81 */ "defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt",
+ /*  82 */ "defer_subclause ::= DEFERRABLE init_deferred_pred_opt",
+ /*  83 */ "init_deferred_pred_opt ::=",
+ /*  84 */ "init_deferred_pred_opt ::= INITIALLY DEFERRED",
+ /*  85 */ "init_deferred_pred_opt ::= INITIALLY IMMEDIATE",
+ /*  86 */ "conslist_opt ::=",
+ /*  87 */ "conslist_opt ::= COMMA conslist",
+ /*  88 */ "conslist ::= conslist tconscomma tcons",
+ /*  89 */ "conslist ::= tcons",
+ /*  90 */ "tconscomma ::= COMMA",
+ /*  91 */ "tconscomma ::=",
+ /*  92 */ "tcons ::= CONSTRAINT nm",
+ /*  93 */ "tcons ::= PRIMARY KEY LP idxlist autoinc RP onconf",
+ /*  94 */ "tcons ::= UNIQUE LP idxlist RP onconf",
+ /*  95 */ "tcons ::= CHECK LP expr RP onconf",
+ /*  96 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt",
+ /*  97 */ "defer_subclause_opt ::=",
+ /*  98 */ "defer_subclause_opt ::= defer_subclause",
+ /*  99 */ "onconf ::=",
+ /* 100 */ "onconf ::= ON CONFLICT resolvetype",
+ /* 101 */ "orconf ::=",
+ /* 102 */ "orconf ::= OR resolvetype",
+ /* 103 */ "resolvetype ::= raisetype",
+ /* 104 */ "resolvetype ::= IGNORE",
+ /* 105 */ "resolvetype ::= REPLACE",
+ /* 106 */ "cmd ::= DROP TABLE ifexists fullname",
+ /* 107 */ "ifexists ::= IF EXISTS",
+ /* 108 */ "ifexists ::=",
+ /* 109 */ "cmd ::= createkw temp VIEW ifnotexists nm dbnm AS select",
+ /* 110 */ "cmd ::= DROP VIEW ifexists fullname",
+ /* 111 */ "cmd ::= select",
+ /* 112 */ "select ::= with selectnowith",
+ /* 113 */ "selectnowith ::= oneselect",
+ /* 114 */ "selectnowith ::= selectnowith multiselect_op oneselect",
  /* 115 */ "multiselect_op ::= UNION",
  /* 116 */ "multiselect_op ::= UNION ALL",
  /* 117 */ "multiselect_op ::= EXCEPT|INTERSECT",
  /* 118 */ "oneselect ::= SELECT distinct selcollist from where_opt groupby_opt having_opt orderby_opt limit_opt",
- /* 119 */ "distinct ::= DISTINCT",
- /* 120 */ "distinct ::= ALL",
- /* 121 */ "distinct ::=",
- /* 122 */ "sclp ::= selcollist COMMA",
- /* 123 */ "sclp ::=",
- /* 124 */ "selcollist ::= sclp expr as",
- /* 125 */ "selcollist ::= sclp STAR",
- /* 126 */ "selcollist ::= sclp nm DOT STAR",
- /* 127 */ "as ::= AS nm",
- /* 128 */ "as ::= ids",
- /* 129 */ "as ::=",
- /* 130 */ "from ::=",
- /* 131 */ "from ::= FROM seltablist",
- /* 132 */ "stl_prefix ::= seltablist joinop",
- /* 133 */ "stl_prefix ::=",
- /* 134 */ "seltablist ::= stl_prefix nm dbnm as indexed_opt on_opt using_opt",
- /* 135 */ "seltablist ::= stl_prefix LP select RP as on_opt using_opt",
- /* 136 */ "seltablist ::= stl_prefix LP seltablist RP as on_opt using_opt",
- /* 137 */ "dbnm ::=",
- /* 138 */ "dbnm ::= DOT nm",
- /* 139 */ "fullname ::= nm dbnm",
- /* 140 */ "joinop ::= COMMA|JOIN",
- /* 141 */ "joinop ::= JOIN_KW JOIN",
- /* 142 */ "joinop ::= JOIN_KW nm JOIN",
- /* 143 */ "joinop ::= JOIN_KW nm nm JOIN",
- /* 144 */ "on_opt ::= ON expr",
- /* 145 */ "on_opt ::=",
- /* 146 */ "indexed_opt ::=",
- /* 147 */ "indexed_opt ::= INDEXED BY nm",
- /* 148 */ "indexed_opt ::= NOT INDEXED",
- /* 149 */ "using_opt ::= USING LP inscollist RP",
- /* 150 */ "using_opt ::=",
- /* 151 */ "orderby_opt ::=",
- /* 152 */ "orderby_opt ::= ORDER BY sortlist",
- /* 153 */ "sortlist ::= sortlist COMMA expr sortorder",
- /* 154 */ "sortlist ::= expr sortorder",
- /* 155 */ "sortorder ::= ASC",
- /* 156 */ "sortorder ::= DESC",
- /* 157 */ "sortorder ::=",
- /* 158 */ "groupby_opt ::=",
- /* 159 */ "groupby_opt ::= GROUP BY nexprlist",
- /* 160 */ "having_opt ::=",
- /* 161 */ "having_opt ::= HAVING expr",
- /* 162 */ "limit_opt ::=",
- /* 163 */ "limit_opt ::= LIMIT expr",
- /* 164 */ "limit_opt ::= LIMIT expr OFFSET expr",
- /* 165 */ "limit_opt ::= LIMIT expr COMMA expr",
- /* 166 */ "cmd ::= DELETE FROM fullname indexed_opt where_opt",
- /* 167 */ "where_opt ::=",
- /* 168 */ "where_opt ::= WHERE expr",
- /* 169 */ "cmd ::= UPDATE orconf fullname indexed_opt SET setlist where_opt",
- /* 170 */ "setlist ::= setlist COMMA nm EQ expr",
- /* 171 */ "setlist ::= nm EQ expr",
- /* 172 */ "cmd ::= insert_cmd INTO fullname inscollist_opt valuelist",
- /* 173 */ "cmd ::= insert_cmd INTO fullname inscollist_opt select",
- /* 174 */ "cmd ::= insert_cmd INTO fullname inscollist_opt DEFAULT VALUES",
- /* 175 */ "insert_cmd ::= INSERT orconf",
- /* 176 */ "insert_cmd ::= REPLACE",
- /* 177 */ "valuelist ::= VALUES LP nexprlist RP",
- /* 178 */ "valuelist ::= valuelist COMMA LP exprlist RP",
+ /* 119 */ "oneselect ::= values",
+ /* 120 */ "values ::= VALUES LP nexprlist RP",
+ /* 121 */ "values ::= values COMMA LP exprlist RP",
+ /* 122 */ "distinct ::= DISTINCT",
+ /* 123 */ "distinct ::= ALL",
+ /* 124 */ "distinct ::=",
+ /* 125 */ "sclp ::= selcollist COMMA",
+ /* 126 */ "sclp ::=",
+ /* 127 */ "selcollist ::= sclp expr as",
+ /* 128 */ "selcollist ::= sclp STAR",
+ /* 129 */ "selcollist ::= sclp nm DOT STAR",
+ /* 130 */ "as ::= AS nm",
+ /* 131 */ "as ::= ID|STRING",
+ /* 132 */ "as ::=",
+ /* 133 */ "from ::=",
+ /* 134 */ "from ::= FROM seltablist",
+ /* 135 */ "stl_prefix ::= seltablist joinop",
+ /* 136 */ "stl_prefix ::=",
+ /* 137 */ "seltablist ::= stl_prefix nm dbnm as indexed_opt on_opt using_opt",
+ /* 138 */ "seltablist ::= stl_prefix LP select RP as on_opt using_opt",
+ /* 139 */ "seltablist ::= stl_prefix LP seltablist RP as on_opt using_opt",
+ /* 140 */ "dbnm ::=",
+ /* 141 */ "dbnm ::= DOT nm",
+ /* 142 */ "fullname ::= nm dbnm",
+ /* 143 */ "joinop ::= COMMA|JOIN",
+ /* 144 */ "joinop ::= JOIN_KW JOIN",
+ /* 145 */ "joinop ::= JOIN_KW nm JOIN",
+ /* 146 */ "joinop ::= JOIN_KW nm nm JOIN",
+ /* 147 */ "on_opt ::= ON expr",
+ /* 148 */ "on_opt ::=",
+ /* 149 */ "indexed_opt ::=",
+ /* 150 */ "indexed_opt ::= INDEXED BY nm",
+ /* 151 */ "indexed_opt ::= NOT INDEXED",
+ /* 152 */ "using_opt ::= USING LP idlist RP",
+ /* 153 */ "using_opt ::=",
+ /* 154 */ "orderby_opt ::=",
+ /* 155 */ "orderby_opt ::= ORDER BY sortlist",
+ /* 156 */ "sortlist ::= sortlist COMMA expr sortorder",
+ /* 157 */ "sortlist ::= expr sortorder",
+ /* 158 */ "sortorder ::= ASC",
+ /* 159 */ "sortorder ::= DESC",
+ /* 160 */ "sortorder ::=",
+ /* 161 */ "groupby_opt ::=",
+ /* 162 */ "groupby_opt ::= GROUP BY nexprlist",
+ /* 163 */ "having_opt ::=",
+ /* 164 */ "having_opt ::= HAVING expr",
+ /* 165 */ "limit_opt ::=",
+ /* 166 */ "limit_opt ::= LIMIT expr",
+ /* 167 */ "limit_opt ::= LIMIT expr OFFSET expr",
+ /* 168 */ "limit_opt ::= LIMIT expr COMMA expr",
+ /* 169 */ "cmd ::= with DELETE FROM fullname indexed_opt where_opt",
+ /* 170 */ "where_opt ::=",
+ /* 171 */ "where_opt ::= WHERE expr",
+ /* 172 */ "cmd ::= with UPDATE orconf fullname indexed_opt SET setlist where_opt",
+ /* 173 */ "setlist ::= setlist COMMA nm EQ expr",
+ /* 174 */ "setlist ::= nm EQ expr",
+ /* 175 */ "cmd ::= with insert_cmd INTO fullname inscollist_opt select",
+ /* 176 */ "cmd ::= with insert_cmd INTO fullname inscollist_opt DEFAULT VALUES",
+ /* 177 */ "insert_cmd ::= INSERT orconf",
+ /* 178 */ "insert_cmd ::= REPLACE",
  /* 179 */ "inscollist_opt ::=",
- /* 180 */ "inscollist_opt ::= LP inscollist RP",
- /* 181 */ "inscollist ::= inscollist COMMA nm",
- /* 182 */ "inscollist ::= nm",
+ /* 180 */ "inscollist_opt ::= LP idlist RP",
+ /* 181 */ "idlist ::= idlist COMMA nm",
+ /* 182 */ "idlist ::= nm",
  /* 183 */ "expr ::= term",
  /* 184 */ "expr ::= LP expr RP",
  /* 185 */ "term ::= NULL",
- /* 186 */ "expr ::= id",
+ /* 186 */ "expr ::= ID|INDEXED",
  /* 187 */ "expr ::= JOIN_KW",
  /* 188 */ "expr ::= nm DOT nm",
  /* 189 */ "expr ::= nm DOT nm DOT nm",
  /* 190 */ "term ::= INTEGER|FLOAT|BLOB",
  /* 191 */ "term ::= STRING",
- /* 192 */ "expr ::= REGISTER",
- /* 193 */ "expr ::= VARIABLE",
- /* 194 */ "expr ::= expr COLLATE ids",
- /* 195 */ "expr ::= CAST LP expr AS typetoken RP",
- /* 196 */ "expr ::= ID LP distinct exprlist RP",
- /* 197 */ "expr ::= ID LP STAR RP",
- /* 198 */ "term ::= CTIME_KW",
- /* 199 */ "expr ::= expr AND expr",
- /* 200 */ "expr ::= expr OR expr",
- /* 201 */ "expr ::= expr LT|GT|GE|LE expr",
- /* 202 */ "expr ::= expr EQ|NE expr",
- /* 203 */ "expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr",
- /* 204 */ "expr ::= expr PLUS|MINUS expr",
- /* 205 */ "expr ::= expr STAR|SLASH|REM expr",
- /* 206 */ "expr ::= expr CONCAT expr",
- /* 207 */ "likeop ::= LIKE_KW",
- /* 208 */ "likeop ::= NOT LIKE_KW",
- /* 209 */ "likeop ::= MATCH",
- /* 210 */ "likeop ::= NOT MATCH",
- /* 211 */ "expr ::= expr likeop expr",
- /* 212 */ "expr ::= expr likeop expr ESCAPE expr",
- /* 213 */ "expr ::= expr ISNULL|NOTNULL",
- /* 214 */ "expr ::= expr NOT NULL",
- /* 215 */ "expr ::= expr IS expr",
- /* 216 */ "expr ::= expr IS NOT expr",
- /* 217 */ "expr ::= NOT expr",
- /* 218 */ "expr ::= BITNOT expr",
- /* 219 */ "expr ::= MINUS expr",
- /* 220 */ "expr ::= PLUS expr",
- /* 221 */ "between_op ::= BETWEEN",
- /* 222 */ "between_op ::= NOT BETWEEN",
- /* 223 */ "expr ::= expr between_op expr AND expr",
- /* 224 */ "in_op ::= IN",
- /* 225 */ "in_op ::= NOT IN",
- /* 226 */ "expr ::= expr in_op LP exprlist RP",
- /* 227 */ "expr ::= LP select RP",
- /* 228 */ "expr ::= expr in_op LP select RP",
- /* 229 */ "expr ::= expr in_op nm dbnm",
- /* 230 */ "expr ::= EXISTS LP select RP",
- /* 231 */ "expr ::= CASE case_operand case_exprlist case_else END",
- /* 232 */ "case_exprlist ::= case_exprlist WHEN expr THEN expr",
- /* 233 */ "case_exprlist ::= WHEN expr THEN expr",
- /* 234 */ "case_else ::= ELSE expr",
- /* 235 */ "case_else ::=",
- /* 236 */ "case_operand ::= expr",
- /* 237 */ "case_operand ::=",
- /* 238 */ "exprlist ::= nexprlist",
- /* 239 */ "exprlist ::=",
- /* 240 */ "nexprlist ::= nexprlist COMMA expr",
- /* 241 */ "nexprlist ::= expr",
- /* 242 */ "cmd ::= createkw uniqueflag INDEX ifnotexists nm dbnm ON nm LP idxlist RP",
- /* 243 */ "uniqueflag ::= UNIQUE",
- /* 244 */ "uniqueflag ::=",
- /* 245 */ "idxlist_opt ::=",
- /* 246 */ "idxlist_opt ::= LP idxlist RP",
- /* 247 */ "idxlist ::= idxlist COMMA nm collate sortorder",
- /* 248 */ "idxlist ::= nm collate sortorder",
- /* 249 */ "collate ::=",
- /* 250 */ "collate ::= COLLATE ids",
- /* 251 */ "cmd ::= DROP INDEX ifexists fullname",
- /* 252 */ "cmd ::= VACUUM",
- /* 253 */ "cmd ::= VACUUM nm",
- /* 254 */ "cmd ::= PRAGMA nm dbnm",
- /* 255 */ "cmd ::= PRAGMA nm dbnm EQ nmnum",
- /* 256 */ "cmd ::= PRAGMA nm dbnm LP nmnum RP",
- /* 257 */ "cmd ::= PRAGMA nm dbnm EQ minus_num",
- /* 258 */ "cmd ::= PRAGMA nm dbnm LP minus_num RP",
- /* 259 */ "nmnum ::= plus_num",
- /* 260 */ "nmnum ::= nm",
- /* 261 */ "nmnum ::= ON",
- /* 262 */ "nmnum ::= DELETE",
- /* 263 */ "nmnum ::= DEFAULT",
- /* 264 */ "plus_num ::= PLUS number",
- /* 265 */ "plus_num ::= number",
- /* 266 */ "minus_num ::= MINUS number",
- /* 267 */ "number ::= INTEGER|FLOAT",
- /* 268 */ "cmd ::= createkw trigger_decl BEGIN trigger_cmd_list END",
- /* 269 */ "trigger_decl ::= temp TRIGGER ifnotexists nm dbnm trigger_time trigger_event ON fullname foreach_clause when_clause",
- /* 270 */ "trigger_time ::= BEFORE",
- /* 271 */ "trigger_time ::= AFTER",
- /* 272 */ "trigger_time ::= INSTEAD OF",
- /* 273 */ "trigger_time ::=",
- /* 274 */ "trigger_event ::= DELETE|INSERT",
- /* 275 */ "trigger_event ::= UPDATE",
- /* 276 */ "trigger_event ::= UPDATE OF inscollist",
- /* 277 */ "foreach_clause ::=",
- /* 278 */ "foreach_clause ::= FOR EACH ROW",
- /* 279 */ "when_clause ::=",
- /* 280 */ "when_clause ::= WHEN expr",
- /* 281 */ "trigger_cmd_list ::= trigger_cmd_list trigger_cmd SEMI",
- /* 282 */ "trigger_cmd_list ::= trigger_cmd SEMI",
- /* 283 */ "trnm ::= nm",
- /* 284 */ "trnm ::= nm DOT nm",
- /* 285 */ "tridxby ::=",
- /* 286 */ "tridxby ::= INDEXED BY nm",
- /* 287 */ "tridxby ::= NOT INDEXED",
- /* 288 */ "trigger_cmd ::= UPDATE orconf trnm tridxby SET setlist where_opt",
- /* 289 */ "trigger_cmd ::= insert_cmd INTO trnm inscollist_opt valuelist",
- /* 290 */ "trigger_cmd ::= insert_cmd INTO trnm inscollist_opt select",
- /* 291 */ "trigger_cmd ::= DELETE FROM trnm tridxby where_opt",
- /* 292 */ "trigger_cmd ::= select",
- /* 293 */ "expr ::= RAISE LP IGNORE RP",
- /* 294 */ "expr ::= RAISE LP raisetype COMMA nm RP",
- /* 295 */ "raisetype ::= ROLLBACK",
- /* 296 */ "raisetype ::= ABORT",
- /* 297 */ "raisetype ::= FAIL",
- /* 298 */ "cmd ::= DROP TRIGGER ifexists fullname",
- /* 299 */ "cmd ::= ATTACH database_kw_opt expr AS expr key_opt",
- /* 300 */ "cmd ::= DETACH database_kw_opt expr",
- /* 301 */ "key_opt ::=",
- /* 302 */ "key_opt ::= KEY expr",
- /* 303 */ "database_kw_opt ::= DATABASE",
- /* 304 */ "database_kw_opt ::=",
- /* 305 */ "cmd ::= REINDEX",
- /* 306 */ "cmd ::= REINDEX nm dbnm",
- /* 307 */ "cmd ::= ANALYZE",
- /* 308 */ "cmd ::= ANALYZE nm dbnm",
- /* 309 */ "cmd ::= ALTER TABLE fullname RENAME TO nm",
- /* 310 */ "cmd ::= ALTER TABLE add_column_fullname ADD kwcolumn_opt column",
- /* 311 */ "add_column_fullname ::= fullname",
- /* 312 */ "kwcolumn_opt ::=",
- /* 313 */ "kwcolumn_opt ::= COLUMNKW",
- /* 314 */ "cmd ::= create_vtab",
- /* 315 */ "cmd ::= create_vtab LP vtabarglist RP",
- /* 316 */ "create_vtab ::= createkw VIRTUAL TABLE ifnotexists nm dbnm USING nm",
- /* 317 */ "vtabarglist ::= vtabarg",
- /* 318 */ "vtabarglist ::= vtabarglist COMMA vtabarg",
- /* 319 */ "vtabarg ::=",
- /* 320 */ "vtabarg ::= vtabarg vtabargtoken",
- /* 321 */ "vtabargtoken ::= ANY",
- /* 322 */ "vtabargtoken ::= lp anylist RP",
- /* 323 */ "lp ::= LP",
- /* 324 */ "anylist ::=",
- /* 325 */ "anylist ::= anylist LP anylist RP",
- /* 326 */ "anylist ::= anylist ANY",
+ /* 192 */ "expr ::= VARIABLE",
+ /* 193 */ "expr ::= expr COLLATE ID|STRING",
+ /* 194 */ "expr ::= CAST LP expr AS typetoken RP",
+ /* 195 */ "expr ::= ID|INDEXED LP distinct exprlist RP",
+ /* 196 */ "expr ::= ID|INDEXED LP STAR RP",
+ /* 197 */ "term ::= CTIME_KW",
+ /* 198 */ "expr ::= expr AND expr",
+ /* 199 */ "expr ::= expr OR expr",
+ /* 200 */ "expr ::= expr LT|GT|GE|LE expr",
+ /* 201 */ "expr ::= expr EQ|NE expr",
+ /* 202 */ "expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr",
+ /* 203 */ "expr ::= expr PLUS|MINUS expr",
+ /* 204 */ "expr ::= expr STAR|SLASH|REM expr",
+ /* 205 */ "expr ::= expr CONCAT expr",
+ /* 206 */ "likeop ::= LIKE_KW|MATCH",
+ /* 207 */ "likeop ::= NOT LIKE_KW|MATCH",
+ /* 208 */ "expr ::= expr likeop expr",
+ /* 209 */ "expr ::= expr likeop expr ESCAPE expr",
+ /* 210 */ "expr ::= expr ISNULL|NOTNULL",
+ /* 211 */ "expr ::= expr NOT NULL",
+ /* 212 */ "expr ::= expr IS expr",
+ /* 213 */ "expr ::= expr IS NOT expr",
+ /* 214 */ "expr ::= NOT expr",
+ /* 215 */ "expr ::= BITNOT expr",
+ /* 216 */ "expr ::= MINUS expr",
+ /* 217 */ "expr ::= PLUS expr",
+ /* 218 */ "between_op ::= BETWEEN",
+ /* 219 */ "between_op ::= NOT BETWEEN",
+ /* 220 */ "expr ::= expr between_op expr AND expr",
+ /* 221 */ "in_op ::= IN",
+ /* 222 */ "in_op ::= NOT IN",
+ /* 223 */ "expr ::= expr in_op LP exprlist RP",
+ /* 224 */ "expr ::= LP select RP",
+ /* 225 */ "expr ::= expr in_op LP select RP",
+ /* 226 */ "expr ::= expr in_op nm dbnm",
+ /* 227 */ "expr ::= EXISTS LP select RP",
+ /* 228 */ "expr ::= CASE case_operand case_exprlist case_else END",
+ /* 229 */ "case_exprlist ::= case_exprlist WHEN expr THEN expr",
+ /* 230 */ "case_exprlist ::= WHEN expr THEN expr",
+ /* 231 */ "case_else ::= ELSE expr",
+ /* 232 */ "case_else ::=",
+ /* 233 */ "case_operand ::= expr",
+ /* 234 */ "case_operand ::=",
+ /* 235 */ "exprlist ::= nexprlist",
+ /* 236 */ "exprlist ::=",
+ /* 237 */ "nexprlist ::= nexprlist COMMA expr",
+ /* 238 */ "nexprlist ::= expr",
+ /* 239 */ "cmd ::= createkw uniqueflag INDEX ifnotexists nm dbnm ON nm LP idxlist RP where_opt",
+ /* 240 */ "uniqueflag ::= UNIQUE",
+ /* 241 */ "uniqueflag ::=",
+ /* 242 */ "idxlist_opt ::=",
+ /* 243 */ "idxlist_opt ::= LP idxlist RP",
+ /* 244 */ "idxlist ::= idxlist COMMA nm collate sortorder",
+ /* 245 */ "idxlist ::= nm collate sortorder",
+ /* 246 */ "collate ::=",
+ /* 247 */ "collate ::= COLLATE ID|STRING",
+ /* 248 */ "cmd ::= DROP INDEX ifexists fullname",
+ /* 249 */ "cmd ::= VACUUM",
+ /* 250 */ "cmd ::= VACUUM nm",
+ /* 251 */ "cmd ::= PRAGMA nm dbnm",
+ /* 252 */ "cmd ::= PRAGMA nm dbnm EQ nmnum",
+ /* 253 */ "cmd ::= PRAGMA nm dbnm LP nmnum RP",
+ /* 254 */ "cmd ::= PRAGMA nm dbnm EQ minus_num",
+ /* 255 */ "cmd ::= PRAGMA nm dbnm LP minus_num RP",
+ /* 256 */ "nmnum ::= plus_num",
+ /* 257 */ "nmnum ::= nm",
+ /* 258 */ "nmnum ::= ON",
+ /* 259 */ "nmnum ::= DELETE",
+ /* 260 */ "nmnum ::= DEFAULT",
+ /* 261 */ "plus_num ::= PLUS INTEGER|FLOAT",
+ /* 262 */ "plus_num ::= INTEGER|FLOAT",
+ /* 263 */ "minus_num ::= MINUS INTEGER|FLOAT",
+ /* 264 */ "cmd ::= createkw trigger_decl BEGIN trigger_cmd_list END",
+ /* 265 */ "trigger_decl ::= temp TRIGGER ifnotexists nm dbnm trigger_time trigger_event ON fullname foreach_clause when_clause",
+ /* 266 */ "trigger_time ::= BEFORE",
+ /* 267 */ "trigger_time ::= AFTER",
+ /* 268 */ "trigger_time ::= INSTEAD OF",
+ /* 269 */ "trigger_time ::=",
+ /* 270 */ "trigger_event ::= DELETE|INSERT",
+ /* 271 */ "trigger_event ::= UPDATE",
+ /* 272 */ "trigger_event ::= UPDATE OF idlist",
+ /* 273 */ "foreach_clause ::=",
+ /* 274 */ "foreach_clause ::= FOR EACH ROW",
+ /* 275 */ "when_clause ::=",
+ /* 276 */ "when_clause ::= WHEN expr",
+ /* 277 */ "trigger_cmd_list ::= trigger_cmd_list trigger_cmd SEMI",
+ /* 278 */ "trigger_cmd_list ::= trigger_cmd SEMI",
+ /* 279 */ "trnm ::= nm",
+ /* 280 */ "trnm ::= nm DOT nm",
+ /* 281 */ "tridxby ::=",
+ /* 282 */ "tridxby ::= INDEXED BY nm",
+ /* 283 */ "tridxby ::= NOT INDEXED",
+ /* 284 */ "trigger_cmd ::= UPDATE orconf trnm tridxby SET setlist where_opt",
+ /* 285 */ "trigger_cmd ::= insert_cmd INTO trnm inscollist_opt select",
+ /* 286 */ "trigger_cmd ::= DELETE FROM trnm tridxby where_opt",
+ /* 287 */ "trigger_cmd ::= select",
+ /* 288 */ "expr ::= RAISE LP IGNORE RP",
+ /* 289 */ "expr ::= RAISE LP raisetype COMMA nm RP",
+ /* 290 */ "raisetype ::= ROLLBACK",
+ /* 291 */ "raisetype ::= ABORT",
+ /* 292 */ "raisetype ::= FAIL",
+ /* 293 */ "cmd ::= DROP TRIGGER ifexists fullname",
+ /* 294 */ "cmd ::= ATTACH database_kw_opt expr AS expr key_opt",
+ /* 295 */ "cmd ::= DETACH database_kw_opt expr",
+ /* 296 */ "key_opt ::=",
+ /* 297 */ "key_opt ::= KEY expr",
+ /* 298 */ "database_kw_opt ::= DATABASE",
+ /* 299 */ "database_kw_opt ::=",
+ /* 300 */ "cmd ::= REINDEX",
+ /* 301 */ "cmd ::= REINDEX nm dbnm",
+ /* 302 */ "cmd ::= ANALYZE",
+ /* 303 */ "cmd ::= ANALYZE nm dbnm",
+ /* 304 */ "cmd ::= ALTER TABLE fullname RENAME TO nm",
+ /* 305 */ "cmd ::= ALTER TABLE add_column_fullname ADD kwcolumn_opt column",
+ /* 306 */ "add_column_fullname ::= fullname",
+ /* 307 */ "kwcolumn_opt ::=",
+ /* 308 */ "kwcolumn_opt ::= COLUMNKW",
+ /* 309 */ "cmd ::= create_vtab",
+ /* 310 */ "cmd ::= create_vtab LP vtabarglist RP",
+ /* 311 */ "create_vtab ::= createkw VIRTUAL TABLE ifnotexists nm dbnm USING nm",
+ /* 312 */ "vtabarglist ::= vtabarg",
+ /* 313 */ "vtabarglist ::= vtabarglist COMMA vtabarg",
+ /* 314 */ "vtabarg ::=",
+ /* 315 */ "vtabarg ::= vtabarg vtabargtoken",
+ /* 316 */ "vtabargtoken ::= ANY",
+ /* 317 */ "vtabargtoken ::= lp anylist RP",
+ /* 318 */ "lp ::= LP",
+ /* 319 */ "anylist ::=",
+ /* 320 */ "anylist ::= anylist LP anylist RP",
+ /* 321 */ "anylist ::= anylist ANY",
+ /* 322 */ "with ::=",
+ /* 323 */ "with ::= WITH wqlist",
+ /* 324 */ "with ::= WITH RECURSIVE wqlist",
+ /* 325 */ "wqlist ::= nm idxlist_opt AS LP select RP",
+ /* 326 */ "wqlist ::= wqlist COMMA nm idxlist_opt AS LP select RP",
 };
 #endif /* NDEBUG */
 
@@ -111513,76 +117748,76 @@ static void yy_destructor(
     ** which appear on the RHS of the rule, but which are not used
     ** inside the C code.
     */
-    case 160: /* select */
-    case 194: /* oneselect */
+    case 163: /* select */
+    case 195: /* selectnowith */
+    case 196: /* oneselect */
+    case 207: /* values */
 {
-sqlite3SelectDelete(pParse->db, (yypminor->yy159));
+sqlite3SelectDelete(pParse->db, (yypminor->yy3));
 }
       break;
-    case 173: /* term */
-    case 174: /* expr */
+    case 174: /* term */
+    case 175: /* expr */
 {
-sqlite3ExprDelete(pParse->db, (yypminor->yy342).pExpr);
+sqlite3ExprDelete(pParse->db, (yypminor->yy346).pExpr);
 }
       break;
-    case 178: /* idxlist_opt */
-    case 187: /* idxlist */
-    case 197: /* selcollist */
-    case 200: /* groupby_opt */
-    case 202: /* orderby_opt */
-    case 204: /* sclp */
-    case 214: /* sortlist */
-    case 215: /* nexprlist */
-    case 216: /* setlist */
-    case 220: /* exprlist */
-    case 225: /* case_exprlist */
+    case 179: /* idxlist_opt */
+    case 188: /* idxlist */
+    case 200: /* selcollist */
+    case 203: /* groupby_opt */
+    case 205: /* orderby_opt */
+    case 208: /* nexprlist */
+    case 209: /* exprlist */
+    case 210: /* sclp */
+    case 220: /* sortlist */
+    case 221: /* setlist */
+    case 228: /* case_exprlist */
 {
-sqlite3ExprListDelete(pParse->db, (yypminor->yy442));
+sqlite3ExprListDelete(pParse->db, (yypminor->yy14));
 }
       break;
-    case 193: /* fullname */
-    case 198: /* from */
-    case 206: /* seltablist */
-    case 207: /* stl_prefix */
+    case 194: /* fullname */
+    case 201: /* from */
+    case 212: /* seltablist */
+    case 213: /* stl_prefix */
 {
-sqlite3SrcListDelete(pParse->db, (yypminor->yy347));
+sqlite3SrcListDelete(pParse->db, (yypminor->yy65));
 }
       break;
-    case 199: /* where_opt */
-    case 201: /* having_opt */
-    case 210: /* on_opt */
-    case 224: /* case_operand */
-    case 226: /* case_else */
-    case 236: /* when_clause */
-    case 241: /* key_opt */
+    case 197: /* with */
+    case 252: /* wqlist */
 {
-sqlite3ExprDelete(pParse->db, (yypminor->yy122));
+sqlite3WithDelete(pParse->db, (yypminor->yy59));
 }
       break;
-    case 211: /* using_opt */
-    case 213: /* inscollist */
-    case 218: /* inscollist_opt */
+    case 202: /* where_opt */
+    case 204: /* having_opt */
+    case 216: /* on_opt */
+    case 227: /* case_operand */
+    case 229: /* case_else */
+    case 238: /* when_clause */
+    case 243: /* key_opt */
 {
-sqlite3IdListDelete(pParse->db, (yypminor->yy180));
+sqlite3ExprDelete(pParse->db, (yypminor->yy132));
 }
       break;
-    case 219: /* valuelist */
+    case 217: /* using_opt */
+    case 219: /* idlist */
+    case 223: /* inscollist_opt */
 {
-
-  sqlite3ExprListDelete(pParse->db, (yypminor->yy487).pList);
-  sqlite3SelectDelete(pParse->db, (yypminor->yy487).pSelect);
-
+sqlite3IdListDelete(pParse->db, (yypminor->yy408));
 }
       break;
-    case 232: /* trigger_cmd_list */
-    case 237: /* trigger_cmd */
+    case 234: /* trigger_cmd_list */
+    case 239: /* trigger_cmd */
 {
-sqlite3DeleteTriggerStep(pParse->db, (yypminor->yy327));
+sqlite3DeleteTriggerStep(pParse->db, (yypminor->yy473));
 }
       break;
-    case 234: /* trigger_event */
+    case 236: /* trigger_event */
 {
-sqlite3IdListDelete(pParse->db, (yypminor->yy410).b);
+sqlite3IdListDelete(pParse->db, (yypminor->yy378).b);
 }
       break;
     default:  break;   /* If no destructor action specified: do nothing */
@@ -111827,333 +118062,333 @@ static const struct {
   YYCODETYPE lhs;         /* Symbol on the left-hand side of the rule */
   unsigned char nrhs;     /* Number of right-hand side symbols in the rule */
 } yyRuleInfo[] = {
-  { 142, 1 },
-  { 143, 2 },
-  { 143, 1 },
   { 144, 1 },
-  { 144, 3 },
-  { 145, 0 },
+  { 145, 2 },
   { 145, 1 },
-  { 145, 3 },
   { 146, 1 },
-  { 147, 3 },
-  { 149, 0 },
-  { 149, 1 },
-  { 149, 2 },
-  { 148, 0 },
-  { 148, 1 },
-  { 148, 1 },
-  { 148, 1 },
-  { 147, 2 },
-  { 147, 2 },
-  { 147, 2 },
-  { 151, 1 },
-  { 151, 0 },
-  { 147, 2 },
-  { 147, 3 },
-  { 147, 5 },
-  { 147, 2 },
-  { 152, 6 },
-  { 154, 1 },
-  { 156, 0 },
-  { 156, 3 },
-  { 155, 1 },
-  { 155, 0 },
-  { 153, 4 },
-  { 153, 2 },
-  { 158, 3 },
-  { 158, 1 },
-  { 161, 3 },
-  { 162, 1 },
-  { 165, 1 },
-  { 165, 1 },
-  { 166, 1 },
-  { 150, 1 },
-  { 150, 1 },
-  { 150, 1 },
-  { 163, 0 },
-  { 163, 1 },
-  { 167, 1 },
-  { 167, 4 },
-  { 167, 6 },
-  { 168, 1 },
-  { 168, 2 },
-  { 169, 1 },
-  { 169, 1 },
-  { 164, 2 },
-  { 164, 0 },
-  { 172, 2 },
-  { 172, 2 },
-  { 172, 4 },
-  { 172, 3 },
-  { 172, 3 },
-  { 172, 2 },
-  { 172, 2 },
-  { 172, 3 },
-  { 172, 5 },
-  { 172, 2 },
-  { 172, 4 },
-  { 172, 4 },
-  { 172, 1 },
-  { 172, 2 },
-  { 177, 0 },
-  { 177, 1 },
-  { 179, 0 },
-  { 179, 2 },
-  { 181, 2 },
-  { 181, 3 },
-  { 181, 3 },
-  { 181, 3 },
-  { 182, 2 },
-  { 182, 2 },
-  { 182, 1 },
-  { 182, 1 },
-  { 182, 2 },
-  { 180, 3 },
-  { 180, 2 },
-  { 183, 0 },
-  { 183, 2 },
-  { 183, 2 },
-  { 159, 0 },
-  { 159, 2 },
-  { 184, 3 },
-  { 184, 1 },
-  { 185, 1 },
-  { 185, 0 },
-  { 186, 2 },
-  { 186, 7 },
-  { 186, 5 },
-  { 186, 5 },
-  { 186, 10 },
-  { 188, 0 },
-  { 188, 1 },
-  { 175, 0 },
-  { 175, 3 },
-  { 189, 0 },
-  { 189, 2 },
-  { 190, 1 },
-  { 190, 1 },
-  { 190, 1 },
-  { 147, 4 },
-  { 192, 2 },
-  { 192, 0 },
-  { 147, 8 },
-  { 147, 4 },
+  { 146, 3 },
+  { 147, 0 },
   { 147, 1 },
-  { 160, 1 },
-  { 160, 3 },
-  { 195, 1 },
-  { 195, 2 },
-  { 195, 1 },
-  { 194, 9 },
-  { 196, 1 },
-  { 196, 1 },
-  { 196, 0 },
-  { 204, 2 },
-  { 204, 0 },
-  { 197, 3 },
-  { 197, 2 },
-  { 197, 4 },
-  { 205, 2 },
-  { 205, 1 },
-  { 205, 0 },
-  { 198, 0 },
-  { 198, 2 },
-  { 207, 2 },
-  { 207, 0 },
-  { 206, 7 },
-  { 206, 7 },
-  { 206, 7 },
+  { 147, 3 },
+  { 148, 1 },
+  { 149, 3 },
+  { 151, 0 },
+  { 151, 1 },
+  { 151, 2 },
+  { 150, 0 },
+  { 150, 1 },
+  { 150, 1 },
+  { 150, 1 },
+  { 149, 2 },
+  { 149, 2 },
+  { 149, 2 },
+  { 153, 1 },
+  { 153, 0 },
+  { 149, 2 },
+  { 149, 3 },
+  { 149, 5 },
+  { 149, 2 },
+  { 154, 6 },
+  { 156, 1 },
+  { 158, 0 },
+  { 158, 3 },
+  { 157, 1 },
   { 157, 0 },
-  { 157, 2 },
+  { 155, 5 },
+  { 155, 2 },
+  { 162, 0 },
+  { 162, 2 },
+  { 160, 3 },
+  { 160, 1 },
+  { 164, 3 },
+  { 165, 1 },
+  { 152, 1 },
+  { 152, 1 },
+  { 152, 1 },
+  { 166, 0 },
+  { 166, 1 },
+  { 168, 1 },
+  { 168, 4 },
+  { 168, 6 },
+  { 169, 1 },
+  { 169, 2 },
+  { 170, 1 },
+  { 170, 1 },
+  { 167, 2 },
+  { 167, 0 },
+  { 173, 2 },
+  { 173, 2 },
+  { 173, 4 },
+  { 173, 3 },
+  { 173, 3 },
+  { 173, 2 },
+  { 173, 2 },
+  { 173, 3 },
+  { 173, 5 },
+  { 173, 2 },
+  { 173, 4 },
+  { 173, 4 },
+  { 173, 1 },
+  { 173, 2 },
+  { 178, 0 },
+  { 178, 1 },
+  { 180, 0 },
+  { 180, 2 },
+  { 182, 2 },
+  { 182, 3 },
+  { 182, 3 },
+  { 182, 3 },
+  { 183, 2 },
+  { 183, 2 },
+  { 183, 1 },
+  { 183, 1 },
+  { 183, 2 },
+  { 181, 3 },
+  { 181, 2 },
+  { 184, 0 },
+  { 184, 2 },
+  { 184, 2 },
+  { 161, 0 },
+  { 161, 2 },
+  { 185, 3 },
+  { 185, 1 },
+  { 186, 1 },
+  { 186, 0 },
+  { 187, 2 },
+  { 187, 7 },
+  { 187, 5 },
+  { 187, 5 },
+  { 187, 10 },
+  { 189, 0 },
+  { 189, 1 },
+  { 176, 0 },
+  { 176, 3 },
+  { 190, 0 },
+  { 190, 2 },
+  { 191, 1 },
+  { 191, 1 },
+  { 191, 1 },
+  { 149, 4 },
   { 193, 2 },
-  { 208, 1 },
-  { 208, 2 },
-  { 208, 3 },
-  { 208, 4 },
+  { 193, 0 },
+  { 149, 8 },
+  { 149, 4 },
+  { 149, 1 },
+  { 163, 2 },
+  { 195, 1 },
+  { 195, 3 },
+  { 198, 1 },
+  { 198, 2 },
+  { 198, 1 },
+  { 196, 9 },
+  { 196, 1 },
+  { 207, 4 },
+  { 207, 5 },
+  { 199, 1 },
+  { 199, 1 },
+  { 199, 0 },
   { 210, 2 },
   { 210, 0 },
-  { 209, 0 },
-  { 209, 3 },
-  { 209, 2 },
-  { 211, 4 },
-  { 211, 0 },
-  { 202, 0 },
-  { 202, 3 },
-  { 214, 4 },
-  { 214, 2 },
-  { 176, 1 },
-  { 176, 1 },
-  { 176, 0 },
-  { 200, 0 },
   { 200, 3 },
+  { 200, 2 },
+  { 200, 4 },
+  { 211, 2 },
+  { 211, 1 },
+  { 211, 0 },
   { 201, 0 },
   { 201, 2 },
-  { 203, 0 },
-  { 203, 2 },
-  { 203, 4 },
-  { 203, 4 },
-  { 147, 5 },
-  { 199, 0 },
-  { 199, 2 },
-  { 147, 7 },
-  { 216, 5 },
-  { 216, 3 },
-  { 147, 5 },
-  { 147, 5 },
-  { 147, 6 },
-  { 217, 2 },
-  { 217, 1 },
-  { 219, 4 },
-  { 219, 5 },
-  { 218, 0 },
-  { 218, 3 },
-  { 213, 3 },
-  { 213, 1 },
-  { 174, 1 },
-  { 174, 3 },
-  { 173, 1 },
-  { 174, 1 },
-  { 174, 1 },
-  { 174, 3 },
-  { 174, 5 },
-  { 173, 1 },
-  { 173, 1 },
-  { 174, 1 },
-  { 174, 1 },
-  { 174, 3 },
-  { 174, 6 },
-  { 174, 5 },
-  { 174, 4 },
-  { 173, 1 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 3 },
-  { 221, 1 },
-  { 221, 2 },
-  { 221, 1 },
-  { 221, 2 },
-  { 174, 3 },
-  { 174, 5 },
-  { 174, 2 },
-  { 174, 3 },
-  { 174, 3 },
-  { 174, 4 },
-  { 174, 2 },
-  { 174, 2 },
-  { 174, 2 },
-  { 174, 2 },
-  { 222, 1 },
-  { 222, 2 },
-  { 174, 5 },
-  { 223, 1 },
-  { 223, 2 },
-  { 174, 5 },
-  { 174, 3 },
-  { 174, 5 },
-  { 174, 4 },
-  { 174, 4 },
-  { 174, 5 },
-  { 225, 5 },
-  { 225, 4 },
-  { 226, 2 },
-  { 226, 0 },
-  { 224, 1 },
-  { 224, 0 },
-  { 220, 1 },
-  { 220, 0 },
+  { 213, 2 },
+  { 213, 0 },
+  { 212, 7 },
+  { 212, 7 },
+  { 212, 7 },
+  { 159, 0 },
+  { 159, 2 },
+  { 194, 2 },
+  { 214, 1 },
+  { 214, 2 },
+  { 214, 3 },
+  { 214, 4 },
+  { 216, 2 },
+  { 216, 0 },
+  { 215, 0 },
   { 215, 3 },
-  { 215, 1 },
-  { 147, 11 },
+  { 215, 2 },
+  { 217, 4 },
+  { 217, 0 },
+  { 205, 0 },
+  { 205, 3 },
+  { 220, 4 },
+  { 220, 2 },
+  { 177, 1 },
+  { 177, 1 },
+  { 177, 0 },
+  { 203, 0 },
+  { 203, 3 },
+  { 204, 0 },
+  { 204, 2 },
+  { 206, 0 },
+  { 206, 2 },
+  { 206, 4 },
+  { 206, 4 },
+  { 149, 6 },
+  { 202, 0 },
+  { 202, 2 },
+  { 149, 8 },
+  { 221, 5 },
+  { 221, 3 },
+  { 149, 6 },
+  { 149, 7 },
+  { 222, 2 },
+  { 222, 1 },
+  { 223, 0 },
+  { 223, 3 },
+  { 219, 3 },
+  { 219, 1 },
+  { 175, 1 },
+  { 175, 3 },
+  { 174, 1 },
+  { 175, 1 },
+  { 175, 1 },
+  { 175, 3 },
+  { 175, 5 },
+  { 174, 1 },
+  { 174, 1 },
+  { 175, 1 },
+  { 175, 3 },
+  { 175, 6 },
+  { 175, 5 },
+  { 175, 4 },
+  { 174, 1 },
+  { 175, 3 },
+  { 175, 3 },
+  { 175, 3 },
+  { 175, 3 },
+  { 175, 3 },
+  { 175, 3 },
+  { 175, 3 },
+  { 175, 3 },
+  { 224, 1 },
+  { 224, 2 },
+  { 175, 3 },
+  { 175, 5 },
+  { 175, 2 },
+  { 175, 3 },
+  { 175, 3 },
+  { 175, 4 },
+  { 175, 2 },
+  { 175, 2 },
+  { 175, 2 },
+  { 175, 2 },
+  { 225, 1 },
+  { 225, 2 },
+  { 175, 5 },
+  { 226, 1 },
+  { 226, 2 },
+  { 175, 5 },
+  { 175, 3 },
+  { 175, 5 },
+  { 175, 4 },
+  { 175, 4 },
+  { 175, 5 },
+  { 228, 5 },
+  { 228, 4 },
+  { 229, 2 },
+  { 229, 0 },
   { 227, 1 },
   { 227, 0 },
-  { 178, 0 },
-  { 178, 3 },
-  { 187, 5 },
-  { 187, 3 },
-  { 228, 0 },
-  { 228, 2 },
-  { 147, 4 },
-  { 147, 1 },
-  { 147, 2 },
-  { 147, 3 },
-  { 147, 5 },
-  { 147, 6 },
-  { 147, 5 },
-  { 147, 6 },
-  { 229, 1 },
-  { 229, 1 },
-  { 229, 1 },
-  { 229, 1 },
-  { 229, 1 },
-  { 170, 2 },
-  { 170, 1 },
-  { 171, 2 },
+  { 209, 1 },
+  { 209, 0 },
+  { 208, 3 },
+  { 208, 1 },
+  { 149, 12 },
   { 230, 1 },
-  { 147, 5 },
-  { 231, 11 },
-  { 233, 1 },
-  { 233, 1 },
-  { 233, 2 },
-  { 233, 0 },
-  { 234, 1 },
-  { 234, 1 },
-  { 234, 3 },
+  { 230, 0 },
+  { 179, 0 },
+  { 179, 3 },
+  { 188, 5 },
+  { 188, 3 },
+  { 231, 0 },
+  { 231, 2 },
+  { 149, 4 },
+  { 149, 1 },
+  { 149, 2 },
+  { 149, 3 },
+  { 149, 5 },
+  { 149, 6 },
+  { 149, 5 },
+  { 149, 6 },
+  { 232, 1 },
+  { 232, 1 },
+  { 232, 1 },
+  { 232, 1 },
+  { 232, 1 },
+  { 171, 2 },
+  { 171, 1 },
+  { 172, 2 },
+  { 149, 5 },
+  { 233, 11 },
+  { 235, 1 },
+  { 235, 1 },
+  { 235, 2 },
   { 235, 0 },
-  { 235, 3 },
-  { 236, 0 },
-  { 236, 2 },
-  { 232, 3 },
-  { 232, 2 },
-  { 238, 1 },
-  { 238, 3 },
-  { 239, 0 },
-  { 239, 3 },
-  { 239, 2 },
-  { 237, 7 },
-  { 237, 5 },
-  { 237, 5 },
-  { 237, 5 },
-  { 237, 1 },
-  { 174, 4 },
-  { 174, 6 },
-  { 191, 1 },
-  { 191, 1 },
-  { 191, 1 },
-  { 147, 4 },
-  { 147, 6 },
-  { 147, 3 },
-  { 241, 0 },
-  { 241, 2 },
+  { 236, 1 },
+  { 236, 1 },
+  { 236, 3 },
+  { 237, 0 },
+  { 237, 3 },
+  { 238, 0 },
+  { 238, 2 },
+  { 234, 3 },
+  { 234, 2 },
   { 240, 1 },
-  { 240, 0 },
-  { 147, 1 },
-  { 147, 3 },
-  { 147, 1 },
-  { 147, 3 },
-  { 147, 6 },
-  { 147, 6 },
-  { 242, 1 },
+  { 240, 3 },
+  { 241, 0 },
+  { 241, 3 },
+  { 241, 2 },
+  { 239, 7 },
+  { 239, 5 },
+  { 239, 5 },
+  { 239, 1 },
+  { 175, 4 },
+  { 175, 6 },
+  { 192, 1 },
+  { 192, 1 },
+  { 192, 1 },
+  { 149, 4 },
+  { 149, 6 },
+  { 149, 3 },
   { 243, 0 },
-  { 243, 1 },
-  { 147, 1 },
-  { 147, 4 },
-  { 244, 8 },
+  { 243, 2 },
+  { 242, 1 },
+  { 242, 0 },
+  { 149, 1 },
+  { 149, 3 },
+  { 149, 1 },
+  { 149, 3 },
+  { 149, 6 },
+  { 149, 6 },
+  { 244, 1 },
+  { 245, 0 },
   { 245, 1 },
-  { 245, 3 },
-  { 246, 0 },
-  { 246, 2 },
+  { 149, 1 },
+  { 149, 4 },
+  { 246, 8 },
   { 247, 1 },
   { 247, 3 },
-  { 248, 1 },
-  { 249, 0 },
-  { 249, 4 },
-  { 249, 2 },
+  { 248, 0 },
+  { 248, 2 },
+  { 249, 1 },
+  { 249, 3 },
+  { 250, 1 },
+  { 251, 0 },
+  { 251, 4 },
+  { 251, 2 },
+  { 197, 0 },
+  { 197, 2 },
+  { 197, 3 },
+  { 252, 6 },
+  { 252, 8 },
 };
 
 static void yy_accept(yyParser*);  /* Forward Declaration */
@@ -112221,17 +118456,17 @@ static void yy_reduce(
 { sqlite3FinishCoding(pParse); }
         break;
       case 9: /* cmd ::= BEGIN transtype trans_opt */
-{sqlite3BeginTransaction(pParse, yymsp[-1].minor.yy392);}
+{sqlite3BeginTransaction(pParse, yymsp[-1].minor.yy328);}
         break;
       case 13: /* transtype ::= */
-{yygotominor.yy392 = TK_DEFERRED;}
+{yygotominor.yy328 = TK_DEFERRED;}
         break;
       case 14: /* transtype ::= DEFERRED */
       case 15: /* transtype ::= IMMEDIATE */ yytestcase(yyruleno==15);
       case 16: /* transtype ::= EXCLUSIVE */ yytestcase(yyruleno==16);
       case 115: /* multiselect_op ::= UNION */ yytestcase(yyruleno==115);
       case 117: /* multiselect_op ::= EXCEPT|INTERSECT */ yytestcase(yyruleno==117);
-{yygotominor.yy392 = yymsp[0].major;}
+{yygotominor.yy328 = yymsp[0].major;}
         break;
       case 17: /* cmd ::= COMMIT trans_opt */
       case 18: /* cmd ::= END trans_opt */ yytestcase(yyruleno==18);
@@ -112257,7 +118492,7 @@ static void yy_reduce(
         break;
       case 26: /* create_table ::= createkw temp TABLE ifnotexists nm dbnm */
 {
-   sqlite3StartTable(pParse,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0,yymsp[-4].minor.yy392,0,0,yymsp[-2].minor.yy392);
+   sqlite3StartTable(pParse,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0,yymsp[-4].minor.yy328,0,0,yymsp[-2].minor.yy328);
 }
         break;
       case 27: /* createkw ::= CREATE */
@@ -112268,532 +118503,569 @@ static void yy_reduce(
         break;
       case 28: /* ifnotexists ::= */
       case 31: /* temp ::= */ yytestcase(yyruleno==31);
-      case 69: /* autoinc ::= */ yytestcase(yyruleno==69);
-      case 82: /* defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt */ yytestcase(yyruleno==82);
-      case 84: /* init_deferred_pred_opt ::= */ yytestcase(yyruleno==84);
-      case 86: /* init_deferred_pred_opt ::= INITIALLY IMMEDIATE */ yytestcase(yyruleno==86);
-      case 98: /* defer_subclause_opt ::= */ yytestcase(yyruleno==98);
-      case 109: /* ifexists ::= */ yytestcase(yyruleno==109);
-      case 221: /* between_op ::= BETWEEN */ yytestcase(yyruleno==221);
-      case 224: /* in_op ::= IN */ yytestcase(yyruleno==224);
-{yygotominor.yy392 = 0;}
+      case 68: /* autoinc ::= */ yytestcase(yyruleno==68);
+      case 81: /* defer_subclause ::= NOT DEFERRABLE init_deferred_pred_opt */ yytestcase(yyruleno==81);
+      case 83: /* init_deferred_pred_opt ::= */ yytestcase(yyruleno==83);
+      case 85: /* init_deferred_pred_opt ::= INITIALLY IMMEDIATE */ yytestcase(yyruleno==85);
+      case 97: /* defer_subclause_opt ::= */ yytestcase(yyruleno==97);
+      case 108: /* ifexists ::= */ yytestcase(yyruleno==108);
+      case 218: /* between_op ::= BETWEEN */ yytestcase(yyruleno==218);
+      case 221: /* in_op ::= IN */ yytestcase(yyruleno==221);
+{yygotominor.yy328 = 0;}
         break;
       case 29: /* ifnotexists ::= IF NOT EXISTS */
       case 30: /* temp ::= TEMP */ yytestcase(yyruleno==30);
-      case 70: /* autoinc ::= AUTOINCR */ yytestcase(yyruleno==70);
-      case 85: /* init_deferred_pred_opt ::= INITIALLY DEFERRED */ yytestcase(yyruleno==85);
-      case 108: /* ifexists ::= IF EXISTS */ yytestcase(yyruleno==108);
-      case 222: /* between_op ::= NOT BETWEEN */ yytestcase(yyruleno==222);
-      case 225: /* in_op ::= NOT IN */ yytestcase(yyruleno==225);
-{yygotominor.yy392 = 1;}
+      case 69: /* autoinc ::= AUTOINCR */ yytestcase(yyruleno==69);
+      case 84: /* init_deferred_pred_opt ::= INITIALLY DEFERRED */ yytestcase(yyruleno==84);
+      case 107: /* ifexists ::= IF EXISTS */ yytestcase(yyruleno==107);
+      case 219: /* between_op ::= NOT BETWEEN */ yytestcase(yyruleno==219);
+      case 222: /* in_op ::= NOT IN */ yytestcase(yyruleno==222);
+{yygotominor.yy328 = 1;}
         break;
-      case 32: /* create_table_args ::= LP columnlist conslist_opt RP */
+      case 32: /* create_table_args ::= LP columnlist conslist_opt RP table_options */
 {
-  sqlite3EndTable(pParse,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0,0);
+  sqlite3EndTable(pParse,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0,yymsp[0].minor.yy186,0);
 }
         break;
       case 33: /* create_table_args ::= AS select */
 {
-  sqlite3EndTable(pParse,0,0,yymsp[0].minor.yy159);
-  sqlite3SelectDelete(pParse->db, yymsp[0].minor.yy159);
+  sqlite3EndTable(pParse,0,0,0,yymsp[0].minor.yy3);
+  sqlite3SelectDelete(pParse->db, yymsp[0].minor.yy3);
 }
         break;
-      case 36: /* column ::= columnid type carglist */
+      case 34: /* table_options ::= */
+{yygotominor.yy186 = 0;}
+        break;
+      case 35: /* table_options ::= WITHOUT nm */
+{
+  if( yymsp[0].minor.yy0.n==5 && sqlite3_strnicmp(yymsp[0].minor.yy0.z,"rowid",5)==0 ){
+    yygotominor.yy186 = TF_WithoutRowid;
+  }else{
+    yygotominor.yy186 = 0;
+    sqlite3ErrorMsg(pParse, "unknown table option: %.*s", yymsp[0].minor.yy0.n, yymsp[0].minor.yy0.z);
+  }
+}
+        break;
+      case 38: /* column ::= columnid type carglist */
 {
   yygotominor.yy0.z = yymsp[-2].minor.yy0.z;
   yygotominor.yy0.n = (int)(pParse->sLastToken.z-yymsp[-2].minor.yy0.z) + pParse->sLastToken.n;
 }
         break;
-      case 37: /* columnid ::= nm */
+      case 39: /* columnid ::= nm */
 {
   sqlite3AddColumn(pParse,&yymsp[0].minor.yy0);
   yygotominor.yy0 = yymsp[0].minor.yy0;
   pParse->constraintName.n = 0;
 }
         break;
-      case 38: /* id ::= ID */
-      case 39: /* id ::= INDEXED */ yytestcase(yyruleno==39);
-      case 40: /* ids ::= ID|STRING */ yytestcase(yyruleno==40);
-      case 41: /* nm ::= id */ yytestcase(yyruleno==41);
-      case 42: /* nm ::= STRING */ yytestcase(yyruleno==42);
-      case 43: /* nm ::= JOIN_KW */ yytestcase(yyruleno==43);
-      case 46: /* typetoken ::= typename */ yytestcase(yyruleno==46);
-      case 49: /* typename ::= ids */ yytestcase(yyruleno==49);
-      case 127: /* as ::= AS nm */ yytestcase(yyruleno==127);
-      case 128: /* as ::= ids */ yytestcase(yyruleno==128);
-      case 138: /* dbnm ::= DOT nm */ yytestcase(yyruleno==138);
-      case 147: /* indexed_opt ::= INDEXED BY nm */ yytestcase(yyruleno==147);
-      case 250: /* collate ::= COLLATE ids */ yytestcase(yyruleno==250);
-      case 259: /* nmnum ::= plus_num */ yytestcase(yyruleno==259);
-      case 260: /* nmnum ::= nm */ yytestcase(yyruleno==260);
-      case 261: /* nmnum ::= ON */ yytestcase(yyruleno==261);
-      case 262: /* nmnum ::= DELETE */ yytestcase(yyruleno==262);
-      case 263: /* nmnum ::= DEFAULT */ yytestcase(yyruleno==263);
-      case 264: /* plus_num ::= PLUS number */ yytestcase(yyruleno==264);
-      case 265: /* plus_num ::= number */ yytestcase(yyruleno==265);
-      case 266: /* minus_num ::= MINUS number */ yytestcase(yyruleno==266);
-      case 267: /* number ::= INTEGER|FLOAT */ yytestcase(yyruleno==267);
-      case 283: /* trnm ::= nm */ yytestcase(yyruleno==283);
+      case 40: /* nm ::= ID|INDEXED */
+      case 41: /* nm ::= STRING */ yytestcase(yyruleno==41);
+      case 42: /* nm ::= JOIN_KW */ yytestcase(yyruleno==42);
+      case 45: /* typetoken ::= typename */ yytestcase(yyruleno==45);
+      case 48: /* typename ::= ID|STRING */ yytestcase(yyruleno==48);
+      case 130: /* as ::= AS nm */ yytestcase(yyruleno==130);
+      case 131: /* as ::= ID|STRING */ yytestcase(yyruleno==131);
+      case 141: /* dbnm ::= DOT nm */ yytestcase(yyruleno==141);
+      case 150: /* indexed_opt ::= INDEXED BY nm */ yytestcase(yyruleno==150);
+      case 247: /* collate ::= COLLATE ID|STRING */ yytestcase(yyruleno==247);
+      case 256: /* nmnum ::= plus_num */ yytestcase(yyruleno==256);
+      case 257: /* nmnum ::= nm */ yytestcase(yyruleno==257);
+      case 258: /* nmnum ::= ON */ yytestcase(yyruleno==258);
+      case 259: /* nmnum ::= DELETE */ yytestcase(yyruleno==259);
+      case 260: /* nmnum ::= DEFAULT */ yytestcase(yyruleno==260);
+      case 261: /* plus_num ::= PLUS INTEGER|FLOAT */ yytestcase(yyruleno==261);
+      case 262: /* plus_num ::= INTEGER|FLOAT */ yytestcase(yyruleno==262);
+      case 263: /* minus_num ::= MINUS INTEGER|FLOAT */ yytestcase(yyruleno==263);
+      case 279: /* trnm ::= nm */ yytestcase(yyruleno==279);
 {yygotominor.yy0 = yymsp[0].minor.yy0;}
         break;
-      case 45: /* type ::= typetoken */
+      case 44: /* type ::= typetoken */
 {sqlite3AddColumnType(pParse,&yymsp[0].minor.yy0);}
         break;
-      case 47: /* typetoken ::= typename LP signed RP */
+      case 46: /* typetoken ::= typename LP signed RP */
 {
   yygotominor.yy0.z = yymsp[-3].minor.yy0.z;
   yygotominor.yy0.n = (int)(&yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n] - yymsp[-3].minor.yy0.z);
 }
         break;
-      case 48: /* typetoken ::= typename LP signed COMMA signed RP */
+      case 47: /* typetoken ::= typename LP signed COMMA signed RP */
 {
   yygotominor.yy0.z = yymsp[-5].minor.yy0.z;
   yygotominor.yy0.n = (int)(&yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n] - yymsp[-5].minor.yy0.z);
 }
         break;
-      case 50: /* typename ::= typename ids */
+      case 49: /* typename ::= typename ID|STRING */
 {yygotominor.yy0.z=yymsp[-1].minor.yy0.z; yygotominor.yy0.n=yymsp[0].minor.yy0.n+(int)(yymsp[0].minor.yy0.z-yymsp[-1].minor.yy0.z);}
         break;
-      case 55: /* ccons ::= CONSTRAINT nm */
-      case 93: /* tcons ::= CONSTRAINT nm */ yytestcase(yyruleno==93);
+      case 54: /* ccons ::= CONSTRAINT nm */
+      case 92: /* tcons ::= CONSTRAINT nm */ yytestcase(yyruleno==92);
 {pParse->constraintName = yymsp[0].minor.yy0;}
         break;
-      case 56: /* ccons ::= DEFAULT term */
-      case 58: /* ccons ::= DEFAULT PLUS term */ yytestcase(yyruleno==58);
-{sqlite3AddDefaultValue(pParse,&yymsp[0].minor.yy342);}
+      case 55: /* ccons ::= DEFAULT term */
+      case 57: /* ccons ::= DEFAULT PLUS term */ yytestcase(yyruleno==57);
+{sqlite3AddDefaultValue(pParse,&yymsp[0].minor.yy346);}
         break;
-      case 57: /* ccons ::= DEFAULT LP expr RP */
-{sqlite3AddDefaultValue(pParse,&yymsp[-1].minor.yy342);}
+      case 56: /* ccons ::= DEFAULT LP expr RP */
+{sqlite3AddDefaultValue(pParse,&yymsp[-1].minor.yy346);}
         break;
-      case 59: /* ccons ::= DEFAULT MINUS term */
+      case 58: /* ccons ::= DEFAULT MINUS term */
 {
   ExprSpan v;
-  v.pExpr = sqlite3PExpr(pParse, TK_UMINUS, yymsp[0].minor.yy342.pExpr, 0, 0);
+  v.pExpr = sqlite3PExpr(pParse, TK_UMINUS, yymsp[0].minor.yy346.pExpr, 0, 0);
   v.zStart = yymsp[-1].minor.yy0.z;
-  v.zEnd = yymsp[0].minor.yy342.zEnd;
+  v.zEnd = yymsp[0].minor.yy346.zEnd;
   sqlite3AddDefaultValue(pParse,&v);
 }
         break;
-      case 60: /* ccons ::= DEFAULT id */
+      case 59: /* ccons ::= DEFAULT ID|INDEXED */
 {
   ExprSpan v;
   spanExpr(&v, pParse, TK_STRING, &yymsp[0].minor.yy0);
   sqlite3AddDefaultValue(pParse,&v);
 }
         break;
-      case 62: /* ccons ::= NOT NULL onconf */
-{sqlite3AddNotNull(pParse, yymsp[0].minor.yy392);}
+      case 61: /* ccons ::= NOT NULL onconf */
+{sqlite3AddNotNull(pParse, yymsp[0].minor.yy328);}
         break;
-      case 63: /* ccons ::= PRIMARY KEY sortorder onconf autoinc */
-{sqlite3AddPrimaryKey(pParse,0,yymsp[-1].minor.yy392,yymsp[0].minor.yy392,yymsp[-2].minor.yy392);}
+      case 62: /* ccons ::= PRIMARY KEY sortorder onconf autoinc */
+{sqlite3AddPrimaryKey(pParse,0,yymsp[-1].minor.yy328,yymsp[0].minor.yy328,yymsp[-2].minor.yy328);}
         break;
-      case 64: /* ccons ::= UNIQUE onconf */
-{sqlite3CreateIndex(pParse,0,0,0,0,yymsp[0].minor.yy392,0,0,0,0);}
+      case 63: /* ccons ::= UNIQUE onconf */
+{sqlite3CreateIndex(pParse,0,0,0,0,yymsp[0].minor.yy328,0,0,0,0);}
         break;
-      case 65: /* ccons ::= CHECK LP expr RP */
-{sqlite3AddCheckConstraint(pParse,yymsp[-1].minor.yy342.pExpr);}
+      case 64: /* ccons ::= CHECK LP expr RP */
+{sqlite3AddCheckConstraint(pParse,yymsp[-1].minor.yy346.pExpr);}
         break;
-      case 66: /* ccons ::= REFERENCES nm idxlist_opt refargs */
-{sqlite3CreateForeignKey(pParse,0,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy442,yymsp[0].minor.yy392);}
+      case 65: /* ccons ::= REFERENCES nm idxlist_opt refargs */
+{sqlite3CreateForeignKey(pParse,0,&yymsp[-2].minor.yy0,yymsp[-1].minor.yy14,yymsp[0].minor.yy328);}
         break;
-      case 67: /* ccons ::= defer_subclause */
-{sqlite3DeferForeignKey(pParse,yymsp[0].minor.yy392);}
+      case 66: /* ccons ::= defer_subclause */
+{sqlite3DeferForeignKey(pParse,yymsp[0].minor.yy328);}
         break;
-      case 68: /* ccons ::= COLLATE ids */
+      case 67: /* ccons ::= COLLATE ID|STRING */
 {sqlite3AddCollateType(pParse, &yymsp[0].minor.yy0);}
         break;
-      case 71: /* refargs ::= */
-{ yygotominor.yy392 = OE_None*0x0101; /* EV: R-19803-45884 */}
+      case 70: /* refargs ::= */
+{ yygotominor.yy328 = OE_None*0x0101; /* EV: R-19803-45884 */}
         break;
-      case 72: /* refargs ::= refargs refarg */
-{ yygotominor.yy392 = (yymsp[-1].minor.yy392 & ~yymsp[0].minor.yy207.mask) | yymsp[0].minor.yy207.value; }
+      case 71: /* refargs ::= refargs refarg */
+{ yygotominor.yy328 = (yymsp[-1].minor.yy328 & ~yymsp[0].minor.yy429.mask) | yymsp[0].minor.yy429.value; }
         break;
-      case 73: /* refarg ::= MATCH nm */
-      case 74: /* refarg ::= ON INSERT refact */ yytestcase(yyruleno==74);
-{ yygotominor.yy207.value = 0;     yygotominor.yy207.mask = 0x000000; }
+      case 72: /* refarg ::= MATCH nm */
+      case 73: /* refarg ::= ON INSERT refact */ yytestcase(yyruleno==73);
+{ yygotominor.yy429.value = 0;     yygotominor.yy429.mask = 0x000000; }
         break;
-      case 75: /* refarg ::= ON DELETE refact */
-{ yygotominor.yy207.value = yymsp[0].minor.yy392;     yygotominor.yy207.mask = 0x0000ff; }
+      case 74: /* refarg ::= ON DELETE refact */
+{ yygotominor.yy429.value = yymsp[0].minor.yy328;     yygotominor.yy429.mask = 0x0000ff; }
         break;
-      case 76: /* refarg ::= ON UPDATE refact */
-{ yygotominor.yy207.value = yymsp[0].minor.yy392<<8;  yygotominor.yy207.mask = 0x00ff00; }
+      case 75: /* refarg ::= ON UPDATE refact */
+{ yygotominor.yy429.value = yymsp[0].minor.yy328<<8;  yygotominor.yy429.mask = 0x00ff00; }
         break;
-      case 77: /* refact ::= SET NULL */
-{ yygotominor.yy392 = OE_SetNull;  /* EV: R-33326-45252 */}
+      case 76: /* refact ::= SET NULL */
+{ yygotominor.yy328 = OE_SetNull;  /* EV: R-33326-45252 */}
         break;
-      case 78: /* refact ::= SET DEFAULT */
-{ yygotominor.yy392 = OE_SetDflt;  /* EV: R-33326-45252 */}
+      case 77: /* refact ::= SET DEFAULT */
+{ yygotominor.yy328 = OE_SetDflt;  /* EV: R-33326-45252 */}
         break;
-      case 79: /* refact ::= CASCADE */
-{ yygotominor.yy392 = OE_Cascade;  /* EV: R-33326-45252 */}
+      case 78: /* refact ::= CASCADE */
+{ yygotominor.yy328 = OE_Cascade;  /* EV: R-33326-45252 */}
         break;
-      case 80: /* refact ::= RESTRICT */
-{ yygotominor.yy392 = OE_Restrict; /* EV: R-33326-45252 */}
+      case 79: /* refact ::= RESTRICT */
+{ yygotominor.yy328 = OE_Restrict; /* EV: R-33326-45252 */}
         break;
-      case 81: /* refact ::= NO ACTION */
-{ yygotominor.yy392 = OE_None;     /* EV: R-33326-45252 */}
+      case 80: /* refact ::= NO ACTION */
+{ yygotominor.yy328 = OE_None;     /* EV: R-33326-45252 */}
         break;
-      case 83: /* defer_subclause ::= DEFERRABLE init_deferred_pred_opt */
-      case 99: /* defer_subclause_opt ::= defer_subclause */ yytestcase(yyruleno==99);
-      case 101: /* onconf ::= ON CONFLICT resolvetype */ yytestcase(yyruleno==101);
-      case 104: /* resolvetype ::= raisetype */ yytestcase(yyruleno==104);
-{yygotominor.yy392 = yymsp[0].minor.yy392;}
+      case 82: /* defer_subclause ::= DEFERRABLE init_deferred_pred_opt */
+      case 98: /* defer_subclause_opt ::= defer_subclause */ yytestcase(yyruleno==98);
+      case 100: /* onconf ::= ON CONFLICT resolvetype */ yytestcase(yyruleno==100);
+      case 103: /* resolvetype ::= raisetype */ yytestcase(yyruleno==103);
+{yygotominor.yy328 = yymsp[0].minor.yy328;}
         break;
-      case 87: /* conslist_opt ::= */
+      case 86: /* conslist_opt ::= */
 {yygotominor.yy0.n = 0; yygotominor.yy0.z = 0;}
         break;
-      case 88: /* conslist_opt ::= COMMA conslist */
+      case 87: /* conslist_opt ::= COMMA conslist */
 {yygotominor.yy0 = yymsp[-1].minor.yy0;}
         break;
-      case 91: /* tconscomma ::= COMMA */
+      case 90: /* tconscomma ::= COMMA */
 {pParse->constraintName.n = 0;}
         break;
-      case 94: /* tcons ::= PRIMARY KEY LP idxlist autoinc RP onconf */
-{sqlite3AddPrimaryKey(pParse,yymsp[-3].minor.yy442,yymsp[0].minor.yy392,yymsp[-2].minor.yy392,0);}
+      case 93: /* tcons ::= PRIMARY KEY LP idxlist autoinc RP onconf */
+{sqlite3AddPrimaryKey(pParse,yymsp[-3].minor.yy14,yymsp[0].minor.yy328,yymsp[-2].minor.yy328,0);}
         break;
-      case 95: /* tcons ::= UNIQUE LP idxlist RP onconf */
-{sqlite3CreateIndex(pParse,0,0,0,yymsp[-2].minor.yy442,yymsp[0].minor.yy392,0,0,0,0);}
+      case 94: /* tcons ::= UNIQUE LP idxlist RP onconf */
+{sqlite3CreateIndex(pParse,0,0,0,yymsp[-2].minor.yy14,yymsp[0].minor.yy328,0,0,0,0);}
         break;
-      case 96: /* tcons ::= CHECK LP expr RP onconf */
-{sqlite3AddCheckConstraint(pParse,yymsp[-2].minor.yy342.pExpr);}
+      case 95: /* tcons ::= CHECK LP expr RP onconf */
+{sqlite3AddCheckConstraint(pParse,yymsp[-2].minor.yy346.pExpr);}
         break;
-      case 97: /* tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt */
+      case 96: /* tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt */
 {
-    sqlite3CreateForeignKey(pParse, yymsp[-6].minor.yy442, &yymsp[-3].minor.yy0, yymsp[-2].minor.yy442, yymsp[-1].minor.yy392);
-    sqlite3DeferForeignKey(pParse, yymsp[0].minor.yy392);
+    sqlite3CreateForeignKey(pParse, yymsp[-6].minor.yy14, &yymsp[-3].minor.yy0, yymsp[-2].minor.yy14, yymsp[-1].minor.yy328);
+    sqlite3DeferForeignKey(pParse, yymsp[0].minor.yy328);
 }
         break;
-      case 100: /* onconf ::= */
-{yygotominor.yy392 = OE_Default;}
+      case 99: /* onconf ::= */
+{yygotominor.yy328 = OE_Default;}
         break;
-      case 102: /* orconf ::= */
-{yygotominor.yy258 = OE_Default;}
+      case 101: /* orconf ::= */
+{yygotominor.yy186 = OE_Default;}
         break;
-      case 103: /* orconf ::= OR resolvetype */
-{yygotominor.yy258 = (u8)yymsp[0].minor.yy392;}
+      case 102: /* orconf ::= OR resolvetype */
+{yygotominor.yy186 = (u8)yymsp[0].minor.yy328;}
         break;
-      case 105: /* resolvetype ::= IGNORE */
-{yygotominor.yy392 = OE_Ignore;}
+      case 104: /* resolvetype ::= IGNORE */
+{yygotominor.yy328 = OE_Ignore;}
         break;
-      case 106: /* resolvetype ::= REPLACE */
-{yygotominor.yy392 = OE_Replace;}
+      case 105: /* resolvetype ::= REPLACE */
+{yygotominor.yy328 = OE_Replace;}
         break;
-      case 107: /* cmd ::= DROP TABLE ifexists fullname */
+      case 106: /* cmd ::= DROP TABLE ifexists fullname */
 {
-  sqlite3DropTable(pParse, yymsp[0].minor.yy347, 0, yymsp[-1].minor.yy392);
+  sqlite3DropTable(pParse, yymsp[0].minor.yy65, 0, yymsp[-1].minor.yy328);
 }
         break;
-      case 110: /* cmd ::= createkw temp VIEW ifnotexists nm dbnm AS select */
+      case 109: /* cmd ::= createkw temp VIEW ifnotexists nm dbnm AS select */
 {
-  sqlite3CreateView(pParse, &yymsp[-7].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-2].minor.yy0, yymsp[0].minor.yy159, yymsp[-6].minor.yy392, yymsp[-4].minor.yy392);
+  sqlite3CreateView(pParse, &yymsp[-7].minor.yy0, &yymsp[-3].minor.yy0, &yymsp[-2].minor.yy0, yymsp[0].minor.yy3, yymsp[-6].minor.yy328, yymsp[-4].minor.yy328);
 }
         break;
-      case 111: /* cmd ::= DROP VIEW ifexists fullname */
+      case 110: /* cmd ::= DROP VIEW ifexists fullname */
 {
-  sqlite3DropTable(pParse, yymsp[0].minor.yy347, 1, yymsp[-1].minor.yy392);
+  sqlite3DropTable(pParse, yymsp[0].minor.yy65, 1, yymsp[-1].minor.yy328);
 }
         break;
-      case 112: /* cmd ::= select */
+      case 111: /* cmd ::= select */
 {
-  SelectDest dest = {SRT_Output, 0, 0, 0, 0};
-  sqlite3Select(pParse, yymsp[0].minor.yy159, &dest);
+  SelectDest dest = {SRT_Output, 0, 0, 0, 0, 0};
+  sqlite3Select(pParse, yymsp[0].minor.yy3, &dest);
   sqlite3ExplainBegin(pParse->pVdbe);
-  sqlite3ExplainSelect(pParse->pVdbe, yymsp[0].minor.yy159);
+  sqlite3ExplainSelect(pParse->pVdbe, yymsp[0].minor.yy3);
   sqlite3ExplainFinish(pParse->pVdbe);
-  sqlite3SelectDelete(pParse->db, yymsp[0].minor.yy159);
+  sqlite3SelectDelete(pParse->db, yymsp[0].minor.yy3);
 }
         break;
-      case 113: /* select ::= oneselect */
-{yygotominor.yy159 = yymsp[0].minor.yy159;}
-        break;
-      case 114: /* select ::= select multiselect_op oneselect */
+      case 112: /* select ::= with selectnowith */
 {
-  if( yymsp[0].minor.yy159 ){
-    yymsp[0].minor.yy159->op = (u8)yymsp[-1].minor.yy392;
-    yymsp[0].minor.yy159->pPrior = yymsp[-2].minor.yy159;
+  Select *p = yymsp[0].minor.yy3, *pNext, *pLoop;
+  if( p ){
+    int cnt = 0, mxSelect;
+    p->pWith = yymsp[-1].minor.yy59;
+    if( p->pPrior ){
+      pNext = 0;
+      for(pLoop=p; pLoop; pNext=pLoop, pLoop=pLoop->pPrior, cnt++){
+        pLoop->pNext = pNext;
+        pLoop->selFlags |= SF_Compound;
+      }
+      mxSelect = pParse->db->aLimit[SQLITE_LIMIT_COMPOUND_SELECT];
+      if( mxSelect && cnt>mxSelect ){
+        sqlite3ErrorMsg(pParse, "too many terms in compound SELECT");
+      }
+    }
   }else{
-    sqlite3SelectDelete(pParse->db, yymsp[-2].minor.yy159);
+    sqlite3WithDelete(pParse->db, yymsp[-1].minor.yy59);
   }
-  yygotominor.yy159 = yymsp[0].minor.yy159;
+  yygotominor.yy3 = p;
+}
+        break;
+      case 113: /* selectnowith ::= oneselect */
+      case 119: /* oneselect ::= values */ yytestcase(yyruleno==119);
+{yygotominor.yy3 = yymsp[0].minor.yy3;}
+        break;
+      case 114: /* selectnowith ::= selectnowith multiselect_op oneselect */
+{
+  Select *pRhs = yymsp[0].minor.yy3;
+  if( pRhs && pRhs->pPrior ){
+    SrcList *pFrom;
+    Token x;
+    x.n = 0;
+    pFrom = sqlite3SrcListAppendFromTerm(pParse,0,0,0,&x,pRhs,0,0);
+    pRhs = sqlite3SelectNew(pParse,0,pFrom,0,0,0,0,0,0,0);
+  }
+  if( pRhs ){
+    pRhs->op = (u8)yymsp[-1].minor.yy328;
+    pRhs->pPrior = yymsp[-2].minor.yy3;
+    if( yymsp[-1].minor.yy328!=TK_ALL ) pParse->hasCompound = 1;
+  }else{
+    sqlite3SelectDelete(pParse->db, yymsp[-2].minor.yy3);
+  }
+  yygotominor.yy3 = pRhs;
 }
         break;
       case 116: /* multiselect_op ::= UNION ALL */
-{yygotominor.yy392 = TK_ALL;}
+{yygotominor.yy328 = TK_ALL;}
         break;
       case 118: /* oneselect ::= SELECT distinct selcollist from where_opt groupby_opt having_opt orderby_opt limit_opt */
 {
-  yygotominor.yy159 = sqlite3SelectNew(pParse,yymsp[-6].minor.yy442,yymsp[-5].minor.yy347,yymsp[-4].minor.yy122,yymsp[-3].minor.yy442,yymsp[-2].minor.yy122,yymsp[-1].minor.yy442,yymsp[-7].minor.yy305,yymsp[0].minor.yy64.pLimit,yymsp[0].minor.yy64.pOffset);
+  yygotominor.yy3 = sqlite3SelectNew(pParse,yymsp[-6].minor.yy14,yymsp[-5].minor.yy65,yymsp[-4].minor.yy132,yymsp[-3].minor.yy14,yymsp[-2].minor.yy132,yymsp[-1].minor.yy14,yymsp[-7].minor.yy381,yymsp[0].minor.yy476.pLimit,yymsp[0].minor.yy476.pOffset);
 }
         break;
-      case 119: /* distinct ::= DISTINCT */
-{yygotominor.yy305 = SF_Distinct;}
-        break;
-      case 120: /* distinct ::= ALL */
-      case 121: /* distinct ::= */ yytestcase(yyruleno==121);
-{yygotominor.yy305 = 0;}
-        break;
-      case 122: /* sclp ::= selcollist COMMA */
-      case 246: /* idxlist_opt ::= LP idxlist RP */ yytestcase(yyruleno==246);
-{yygotominor.yy442 = yymsp[-1].minor.yy442;}
-        break;
-      case 123: /* sclp ::= */
-      case 151: /* orderby_opt ::= */ yytestcase(yyruleno==151);
-      case 158: /* groupby_opt ::= */ yytestcase(yyruleno==158);
-      case 239: /* exprlist ::= */ yytestcase(yyruleno==239);
-      case 245: /* idxlist_opt ::= */ yytestcase(yyruleno==245);
-{yygotominor.yy442 = 0;}
-        break;
-      case 124: /* selcollist ::= sclp expr as */
+      case 120: /* values ::= VALUES LP nexprlist RP */
 {
-   yygotominor.yy442 = sqlite3ExprListAppend(pParse, yymsp[-2].minor.yy442, yymsp[-1].minor.yy342.pExpr);
-   if( yymsp[0].minor.yy0.n>0 ) sqlite3ExprListSetName(pParse, yygotominor.yy442, &yymsp[0].minor.yy0, 1);
-   sqlite3ExprListSetSpan(pParse,yygotominor.yy442,&yymsp[-1].minor.yy342);
+  yygotominor.yy3 = sqlite3SelectNew(pParse,yymsp[-1].minor.yy14,0,0,0,0,0,SF_Values,0,0);
 }
         break;
-      case 125: /* selcollist ::= sclp STAR */
+      case 121: /* values ::= values COMMA LP exprlist RP */
+{
+  Select *pRight = sqlite3SelectNew(pParse,yymsp[-1].minor.yy14,0,0,0,0,0,SF_Values,0,0);
+  if( pRight ){
+    pRight->op = TK_ALL;
+    pRight->pPrior = yymsp[-4].minor.yy3;
+    yygotominor.yy3 = pRight;
+  }else{
+    yygotominor.yy3 = yymsp[-4].minor.yy3;
+  }
+}
+        break;
+      case 122: /* distinct ::= DISTINCT */
+{yygotominor.yy381 = SF_Distinct;}
+        break;
+      case 123: /* distinct ::= ALL */
+      case 124: /* distinct ::= */ yytestcase(yyruleno==124);
+{yygotominor.yy381 = 0;}
+        break;
+      case 125: /* sclp ::= selcollist COMMA */
+      case 243: /* idxlist_opt ::= LP idxlist RP */ yytestcase(yyruleno==243);
+{yygotominor.yy14 = yymsp[-1].minor.yy14;}
+        break;
+      case 126: /* sclp ::= */
+      case 154: /* orderby_opt ::= */ yytestcase(yyruleno==154);
+      case 161: /* groupby_opt ::= */ yytestcase(yyruleno==161);
+      case 236: /* exprlist ::= */ yytestcase(yyruleno==236);
+      case 242: /* idxlist_opt ::= */ yytestcase(yyruleno==242);
+{yygotominor.yy14 = 0;}
+        break;
+      case 127: /* selcollist ::= sclp expr as */
+{
+   yygotominor.yy14 = sqlite3ExprListAppend(pParse, yymsp[-2].minor.yy14, yymsp[-1].minor.yy346.pExpr);
+   if( yymsp[0].minor.yy0.n>0 ) sqlite3ExprListSetName(pParse, yygotominor.yy14, &yymsp[0].minor.yy0, 1);
+   sqlite3ExprListSetSpan(pParse,yygotominor.yy14,&yymsp[-1].minor.yy346);
+}
+        break;
+      case 128: /* selcollist ::= sclp STAR */
 {
   Expr *p = sqlite3Expr(pParse->db, TK_ALL, 0);
-  yygotominor.yy442 = sqlite3ExprListAppend(pParse, yymsp[-1].minor.yy442, p);
+  yygotominor.yy14 = sqlite3ExprListAppend(pParse, yymsp[-1].minor.yy14, p);
 }
         break;
-      case 126: /* selcollist ::= sclp nm DOT STAR */
+      case 129: /* selcollist ::= sclp nm DOT STAR */
 {
   Expr *pRight = sqlite3PExpr(pParse, TK_ALL, 0, 0, &yymsp[0].minor.yy0);
   Expr *pLeft = sqlite3PExpr(pParse, TK_ID, 0, 0, &yymsp[-2].minor.yy0);
   Expr *pDot = sqlite3PExpr(pParse, TK_DOT, pLeft, pRight, 0);
-  yygotominor.yy442 = sqlite3ExprListAppend(pParse,yymsp[-3].minor.yy442, pDot);
+  yygotominor.yy14 = sqlite3ExprListAppend(pParse,yymsp[-3].minor.yy14, pDot);
 }
         break;
-      case 129: /* as ::= */
+      case 132: /* as ::= */
 {yygotominor.yy0.n = 0;}
         break;
-      case 130: /* from ::= */
-{yygotominor.yy347 = sqlite3DbMallocZero(pParse->db, sizeof(*yygotominor.yy347));}
+      case 133: /* from ::= */
+{yygotominor.yy65 = sqlite3DbMallocZero(pParse->db, sizeof(*yygotominor.yy65));}
         break;
-      case 131: /* from ::= FROM seltablist */
+      case 134: /* from ::= FROM seltablist */
 {
-  yygotominor.yy347 = yymsp[0].minor.yy347;
-  sqlite3SrcListShiftJoinType(yygotominor.yy347);
+  yygotominor.yy65 = yymsp[0].minor.yy65;
+  sqlite3SrcListShiftJoinType(yygotominor.yy65);
 }
         break;
-      case 132: /* stl_prefix ::= seltablist joinop */
+      case 135: /* stl_prefix ::= seltablist joinop */
 {
-   yygotominor.yy347 = yymsp[-1].minor.yy347;
-   if( ALWAYS(yygotominor.yy347 && yygotominor.yy347->nSrc>0) ) yygotominor.yy347->a[yygotominor.yy347->nSrc-1].jointype = (u8)yymsp[0].minor.yy392;
+   yygotominor.yy65 = yymsp[-1].minor.yy65;
+   if( ALWAYS(yygotominor.yy65 && yygotominor.yy65->nSrc>0) ) yygotominor.yy65->a[yygotominor.yy65->nSrc-1].jointype = (u8)yymsp[0].minor.yy328;
 }
         break;
-      case 133: /* stl_prefix ::= */
-{yygotominor.yy347 = 0;}
+      case 136: /* stl_prefix ::= */
+{yygotominor.yy65 = 0;}
         break;
-      case 134: /* seltablist ::= stl_prefix nm dbnm as indexed_opt on_opt using_opt */
+      case 137: /* seltablist ::= stl_prefix nm dbnm as indexed_opt on_opt using_opt */
 {
-  yygotominor.yy347 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-6].minor.yy347,&yymsp[-5].minor.yy0,&yymsp[-4].minor.yy0,&yymsp[-3].minor.yy0,0,yymsp[-1].minor.yy122,yymsp[0].minor.yy180);
-  sqlite3SrcListIndexedBy(pParse, yygotominor.yy347, &yymsp[-2].minor.yy0);
+  yygotominor.yy65 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-6].minor.yy65,&yymsp[-5].minor.yy0,&yymsp[-4].minor.yy0,&yymsp[-3].minor.yy0,0,yymsp[-1].minor.yy132,yymsp[0].minor.yy408);
+  sqlite3SrcListIndexedBy(pParse, yygotominor.yy65, &yymsp[-2].minor.yy0);
 }
         break;
-      case 135: /* seltablist ::= stl_prefix LP select RP as on_opt using_opt */
+      case 138: /* seltablist ::= stl_prefix LP select RP as on_opt using_opt */
 {
-    yygotominor.yy347 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-6].minor.yy347,0,0,&yymsp[-2].minor.yy0,yymsp[-4].minor.yy159,yymsp[-1].minor.yy122,yymsp[0].minor.yy180);
+    yygotominor.yy65 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-6].minor.yy65,0,0,&yymsp[-2].minor.yy0,yymsp[-4].minor.yy3,yymsp[-1].minor.yy132,yymsp[0].minor.yy408);
   }
         break;
-      case 136: /* seltablist ::= stl_prefix LP seltablist RP as on_opt using_opt */
+      case 139: /* seltablist ::= stl_prefix LP seltablist RP as on_opt using_opt */
 {
-    if( yymsp[-6].minor.yy347==0 && yymsp[-2].minor.yy0.n==0 && yymsp[-1].minor.yy122==0 && yymsp[0].minor.yy180==0 ){
-      yygotominor.yy347 = yymsp[-4].minor.yy347;
-    }else if( yymsp[-4].minor.yy347->nSrc==1 ){
-      yygotominor.yy347 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-6].minor.yy347,0,0,&yymsp[-2].minor.yy0,0,yymsp[-1].minor.yy122,yymsp[0].minor.yy180);
-      if( yygotominor.yy347 ){
-        struct SrcList_item *pNew = &yygotominor.yy347->a[yygotominor.yy347->nSrc-1];
-        struct SrcList_item *pOld = yymsp[-4].minor.yy347->a;
+    if( yymsp[-6].minor.yy65==0 && yymsp[-2].minor.yy0.n==0 && yymsp[-1].minor.yy132==0 && yymsp[0].minor.yy408==0 ){
+      yygotominor.yy65 = yymsp[-4].minor.yy65;
+    }else if( yymsp[-4].minor.yy65->nSrc==1 ){
+      yygotominor.yy65 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-6].minor.yy65,0,0,&yymsp[-2].minor.yy0,0,yymsp[-1].minor.yy132,yymsp[0].minor.yy408);
+      if( yygotominor.yy65 ){
+        struct SrcList_item *pNew = &yygotominor.yy65->a[yygotominor.yy65->nSrc-1];
+        struct SrcList_item *pOld = yymsp[-4].minor.yy65->a;
         pNew->zName = pOld->zName;
         pNew->zDatabase = pOld->zDatabase;
         pNew->pSelect = pOld->pSelect;
         pOld->zName = pOld->zDatabase = 0;
         pOld->pSelect = 0;
       }
-      sqlite3SrcListDelete(pParse->db, yymsp[-4].minor.yy347);
+      sqlite3SrcListDelete(pParse->db, yymsp[-4].minor.yy65);
     }else{
       Select *pSubquery;
-      sqlite3SrcListShiftJoinType(yymsp[-4].minor.yy347);
-      pSubquery = sqlite3SelectNew(pParse,0,yymsp[-4].minor.yy347,0,0,0,0,SF_NestedFrom,0,0);
-      yygotominor.yy347 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-6].minor.yy347,0,0,&yymsp[-2].minor.yy0,pSubquery,yymsp[-1].minor.yy122,yymsp[0].minor.yy180);
+      sqlite3SrcListShiftJoinType(yymsp[-4].minor.yy65);
+      pSubquery = sqlite3SelectNew(pParse,0,yymsp[-4].minor.yy65,0,0,0,0,SF_NestedFrom,0,0);
+      yygotominor.yy65 = sqlite3SrcListAppendFromTerm(pParse,yymsp[-6].minor.yy65,0,0,&yymsp[-2].minor.yy0,pSubquery,yymsp[-1].minor.yy132,yymsp[0].minor.yy408);
     }
   }
         break;
-      case 137: /* dbnm ::= */
-      case 146: /* indexed_opt ::= */ yytestcase(yyruleno==146);
+      case 140: /* dbnm ::= */
+      case 149: /* indexed_opt ::= */ yytestcase(yyruleno==149);
 {yygotominor.yy0.z=0; yygotominor.yy0.n=0;}
         break;
-      case 139: /* fullname ::= nm dbnm */
-{yygotominor.yy347 = sqlite3SrcListAppend(pParse->db,0,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
+      case 142: /* fullname ::= nm dbnm */
+{yygotominor.yy65 = sqlite3SrcListAppend(pParse->db,0,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);}
         break;
-      case 140: /* joinop ::= COMMA|JOIN */
-{ yygotominor.yy392 = JT_INNER; }
+      case 143: /* joinop ::= COMMA|JOIN */
+{ yygotominor.yy328 = JT_INNER; }
         break;
-      case 141: /* joinop ::= JOIN_KW JOIN */
-{ yygotominor.yy392 = sqlite3JoinType(pParse,&yymsp[-1].minor.yy0,0,0); }
+      case 144: /* joinop ::= JOIN_KW JOIN */
+{ yygotominor.yy328 = sqlite3JoinType(pParse,&yymsp[-1].minor.yy0,0,0); }
         break;
-      case 142: /* joinop ::= JOIN_KW nm JOIN */
-{ yygotominor.yy392 = sqlite3JoinType(pParse,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0,0); }
+      case 145: /* joinop ::= JOIN_KW nm JOIN */
+{ yygotominor.yy328 = sqlite3JoinType(pParse,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0,0); }
         break;
-      case 143: /* joinop ::= JOIN_KW nm nm JOIN */
-{ yygotominor.yy392 = sqlite3JoinType(pParse,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0); }
+      case 146: /* joinop ::= JOIN_KW nm nm JOIN */
+{ yygotominor.yy328 = sqlite3JoinType(pParse,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,&yymsp[-1].minor.yy0); }
         break;
-      case 144: /* on_opt ::= ON expr */
-      case 161: /* having_opt ::= HAVING expr */ yytestcase(yyruleno==161);
-      case 168: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==168);
-      case 234: /* case_else ::= ELSE expr */ yytestcase(yyruleno==234);
-      case 236: /* case_operand ::= expr */ yytestcase(yyruleno==236);
-{yygotominor.yy122 = yymsp[0].minor.yy342.pExpr;}
+      case 147: /* on_opt ::= ON expr */
+      case 164: /* having_opt ::= HAVING expr */ yytestcase(yyruleno==164);
+      case 171: /* where_opt ::= WHERE expr */ yytestcase(yyruleno==171);
+      case 231: /* case_else ::= ELSE expr */ yytestcase(yyruleno==231);
+      case 233: /* case_operand ::= expr */ yytestcase(yyruleno==233);
+{yygotominor.yy132 = yymsp[0].minor.yy346.pExpr;}
         break;
-      case 145: /* on_opt ::= */
-      case 160: /* having_opt ::= */ yytestcase(yyruleno==160);
-      case 167: /* where_opt ::= */ yytestcase(yyruleno==167);
-      case 235: /* case_else ::= */ yytestcase(yyruleno==235);
-      case 237: /* case_operand ::= */ yytestcase(yyruleno==237);
-{yygotominor.yy122 = 0;}
+      case 148: /* on_opt ::= */
+      case 163: /* having_opt ::= */ yytestcase(yyruleno==163);
+      case 170: /* where_opt ::= */ yytestcase(yyruleno==170);
+      case 232: /* case_else ::= */ yytestcase(yyruleno==232);
+      case 234: /* case_operand ::= */ yytestcase(yyruleno==234);
+{yygotominor.yy132 = 0;}
         break;
-      case 148: /* indexed_opt ::= NOT INDEXED */
+      case 151: /* indexed_opt ::= NOT INDEXED */
 {yygotominor.yy0.z=0; yygotominor.yy0.n=1;}
         break;
-      case 149: /* using_opt ::= USING LP inscollist RP */
-      case 180: /* inscollist_opt ::= LP inscollist RP */ yytestcase(yyruleno==180);
-{yygotominor.yy180 = yymsp[-1].minor.yy180;}
+      case 152: /* using_opt ::= USING LP idlist RP */
+      case 180: /* inscollist_opt ::= LP idlist RP */ yytestcase(yyruleno==180);
+{yygotominor.yy408 = yymsp[-1].minor.yy408;}
         break;
-      case 150: /* using_opt ::= */
+      case 153: /* using_opt ::= */
       case 179: /* inscollist_opt ::= */ yytestcase(yyruleno==179);
-{yygotominor.yy180 = 0;}
+{yygotominor.yy408 = 0;}
         break;
-      case 152: /* orderby_opt ::= ORDER BY sortlist */
-      case 159: /* groupby_opt ::= GROUP BY nexprlist */ yytestcase(yyruleno==159);
-      case 238: /* exprlist ::= nexprlist */ yytestcase(yyruleno==238);
-{yygotominor.yy442 = yymsp[0].minor.yy442;}
+      case 155: /* orderby_opt ::= ORDER BY sortlist */
+      case 162: /* groupby_opt ::= GROUP BY nexprlist */ yytestcase(yyruleno==162);
+      case 235: /* exprlist ::= nexprlist */ yytestcase(yyruleno==235);
+{yygotominor.yy14 = yymsp[0].minor.yy14;}
         break;
-      case 153: /* sortlist ::= sortlist COMMA expr sortorder */
+      case 156: /* sortlist ::= sortlist COMMA expr sortorder */
 {
-  yygotominor.yy442 = sqlite3ExprListAppend(pParse,yymsp[-3].minor.yy442,yymsp[-1].minor.yy342.pExpr);
-  if( yygotominor.yy442 ) yygotominor.yy442->a[yygotominor.yy442->nExpr-1].sortOrder = (u8)yymsp[0].minor.yy392;
+  yygotominor.yy14 = sqlite3ExprListAppend(pParse,yymsp[-3].minor.yy14,yymsp[-1].minor.yy346.pExpr);
+  if( yygotominor.yy14 ) yygotominor.yy14->a[yygotominor.yy14->nExpr-1].sortOrder = (u8)yymsp[0].minor.yy328;
 }
         break;
-      case 154: /* sortlist ::= expr sortorder */
+      case 157: /* sortlist ::= expr sortorder */
 {
-  yygotominor.yy442 = sqlite3ExprListAppend(pParse,0,yymsp[-1].minor.yy342.pExpr);
-  if( yygotominor.yy442 && ALWAYS(yygotominor.yy442->a) ) yygotominor.yy442->a[0].sortOrder = (u8)yymsp[0].minor.yy392;
+  yygotominor.yy14 = sqlite3ExprListAppend(pParse,0,yymsp[-1].minor.yy346.pExpr);
+  if( yygotominor.yy14 && ALWAYS(yygotominor.yy14->a) ) yygotominor.yy14->a[0].sortOrder = (u8)yymsp[0].minor.yy328;
 }
         break;
-      case 155: /* sortorder ::= ASC */
-      case 157: /* sortorder ::= */ yytestcase(yyruleno==157);
-{yygotominor.yy392 = SQLITE_SO_ASC;}
+      case 158: /* sortorder ::= ASC */
+      case 160: /* sortorder ::= */ yytestcase(yyruleno==160);
+{yygotominor.yy328 = SQLITE_SO_ASC;}
         break;
-      case 156: /* sortorder ::= DESC */
-{yygotominor.yy392 = SQLITE_SO_DESC;}
+      case 159: /* sortorder ::= DESC */
+{yygotominor.yy328 = SQLITE_SO_DESC;}
         break;
-      case 162: /* limit_opt ::= */
-{yygotominor.yy64.pLimit = 0; yygotominor.yy64.pOffset = 0;}
+      case 165: /* limit_opt ::= */
+{yygotominor.yy476.pLimit = 0; yygotominor.yy476.pOffset = 0;}
         break;
-      case 163: /* limit_opt ::= LIMIT expr */
-{yygotominor.yy64.pLimit = yymsp[0].minor.yy342.pExpr; yygotominor.yy64.pOffset = 0;}
+      case 166: /* limit_opt ::= LIMIT expr */
+{yygotominor.yy476.pLimit = yymsp[0].minor.yy346.pExpr; yygotominor.yy476.pOffset = 0;}
         break;
-      case 164: /* limit_opt ::= LIMIT expr OFFSET expr */
-{yygotominor.yy64.pLimit = yymsp[-2].minor.yy342.pExpr; yygotominor.yy64.pOffset = yymsp[0].minor.yy342.pExpr;}
+      case 167: /* limit_opt ::= LIMIT expr OFFSET expr */
+{yygotominor.yy476.pLimit = yymsp[-2].minor.yy346.pExpr; yygotominor.yy476.pOffset = yymsp[0].minor.yy346.pExpr;}
         break;
-      case 165: /* limit_opt ::= LIMIT expr COMMA expr */
-{yygotominor.yy64.pOffset = yymsp[-2].minor.yy342.pExpr; yygotominor.yy64.pLimit = yymsp[0].minor.yy342.pExpr;}
+      case 168: /* limit_opt ::= LIMIT expr COMMA expr */
+{yygotominor.yy476.pOffset = yymsp[-2].minor.yy346.pExpr; yygotominor.yy476.pLimit = yymsp[0].minor.yy346.pExpr;}
         break;
-      case 166: /* cmd ::= DELETE FROM fullname indexed_opt where_opt */
+      case 169: /* cmd ::= with DELETE FROM fullname indexed_opt where_opt */
 {
-  sqlite3SrcListIndexedBy(pParse, yymsp[-2].minor.yy347, &yymsp[-1].minor.yy0);
-  sqlite3DeleteFrom(pParse,yymsp[-2].minor.yy347,yymsp[0].minor.yy122);
+  sqlite3WithPush(pParse, yymsp[-5].minor.yy59, 1);
+  sqlite3SrcListIndexedBy(pParse, yymsp[-2].minor.yy65, &yymsp[-1].minor.yy0);
+  sqlite3DeleteFrom(pParse,yymsp[-2].minor.yy65,yymsp[0].minor.yy132);
 }
         break;
-      case 169: /* cmd ::= UPDATE orconf fullname indexed_opt SET setlist where_opt */
+      case 172: /* cmd ::= with UPDATE orconf fullname indexed_opt SET setlist where_opt */
 {
-  sqlite3SrcListIndexedBy(pParse, yymsp[-4].minor.yy347, &yymsp[-3].minor.yy0);
-  sqlite3ExprListCheckLength(pParse,yymsp[-1].minor.yy442,"set list"); 
-  sqlite3Update(pParse,yymsp[-4].minor.yy347,yymsp[-1].minor.yy442,yymsp[0].minor.yy122,yymsp[-5].minor.yy258);
+  sqlite3WithPush(pParse, yymsp[-7].minor.yy59, 1);
+  sqlite3SrcListIndexedBy(pParse, yymsp[-4].minor.yy65, &yymsp[-3].minor.yy0);
+  sqlite3ExprListCheckLength(pParse,yymsp[-1].minor.yy14,"set list"); 
+  sqlite3Update(pParse,yymsp[-4].minor.yy65,yymsp[-1].minor.yy14,yymsp[0].minor.yy132,yymsp[-5].minor.yy186);
 }
         break;
-      case 170: /* setlist ::= setlist COMMA nm EQ expr */
+      case 173: /* setlist ::= setlist COMMA nm EQ expr */
 {
-  yygotominor.yy442 = sqlite3ExprListAppend(pParse, yymsp[-4].minor.yy442, yymsp[0].minor.yy342.pExpr);
-  sqlite3ExprListSetName(pParse, yygotominor.yy442, &yymsp[-2].minor.yy0, 1);
+  yygotominor.yy14 = sqlite3ExprListAppend(pParse, yymsp[-4].minor.yy14, yymsp[0].minor.yy346.pExpr);
+  sqlite3ExprListSetName(pParse, yygotominor.yy14, &yymsp[-2].minor.yy0, 1);
 }
         break;
-      case 171: /* setlist ::= nm EQ expr */
+      case 174: /* setlist ::= nm EQ expr */
 {
-  yygotominor.yy442 = sqlite3ExprListAppend(pParse, 0, yymsp[0].minor.yy342.pExpr);
-  sqlite3ExprListSetName(pParse, yygotominor.yy442, &yymsp[-2].minor.yy0, 1);
+  yygotominor.yy14 = sqlite3ExprListAppend(pParse, 0, yymsp[0].minor.yy346.pExpr);
+  sqlite3ExprListSetName(pParse, yygotominor.yy14, &yymsp[-2].minor.yy0, 1);
 }
         break;
-      case 172: /* cmd ::= insert_cmd INTO fullname inscollist_opt valuelist */
-{sqlite3Insert(pParse, yymsp[-2].minor.yy347, yymsp[0].minor.yy487.pList, yymsp[0].minor.yy487.pSelect, yymsp[-1].minor.yy180, yymsp[-4].minor.yy258);}
-        break;
-      case 173: /* cmd ::= insert_cmd INTO fullname inscollist_opt select */
-{sqlite3Insert(pParse, yymsp[-2].minor.yy347, 0, yymsp[0].minor.yy159, yymsp[-1].minor.yy180, yymsp[-4].minor.yy258);}
-        break;
-      case 174: /* cmd ::= insert_cmd INTO fullname inscollist_opt DEFAULT VALUES */
-{sqlite3Insert(pParse, yymsp[-3].minor.yy347, 0, 0, yymsp[-2].minor.yy180, yymsp[-5].minor.yy258);}
-        break;
-      case 175: /* insert_cmd ::= INSERT orconf */
-{yygotominor.yy258 = yymsp[0].minor.yy258;}
-        break;
-      case 176: /* insert_cmd ::= REPLACE */
-{yygotominor.yy258 = OE_Replace;}
-        break;
-      case 177: /* valuelist ::= VALUES LP nexprlist RP */
+      case 175: /* cmd ::= with insert_cmd INTO fullname inscollist_opt select */
 {
-  yygotominor.yy487.pList = yymsp[-1].minor.yy442;
-  yygotominor.yy487.pSelect = 0;
+  sqlite3WithPush(pParse, yymsp[-5].minor.yy59, 1);
+  sqlite3Insert(pParse, yymsp[-2].minor.yy65, yymsp[0].minor.yy3, yymsp[-1].minor.yy408, yymsp[-4].minor.yy186);
 }
         break;
-      case 178: /* valuelist ::= valuelist COMMA LP exprlist RP */
+      case 176: /* cmd ::= with insert_cmd INTO fullname inscollist_opt DEFAULT VALUES */
 {
-  Select *pRight = sqlite3SelectNew(pParse, yymsp[-1].minor.yy442, 0, 0, 0, 0, 0, 0, 0, 0);
-  if( yymsp[-4].minor.yy487.pList ){
-    yymsp[-4].minor.yy487.pSelect = sqlite3SelectNew(pParse, yymsp[-4].minor.yy487.pList, 0, 0, 0, 0, 0, 0, 0, 0);
-    yymsp[-4].minor.yy487.pList = 0;
-  }
-  yygotominor.yy487.pList = 0;
-  if( yymsp[-4].minor.yy487.pSelect==0 || pRight==0 ){
-    sqlite3SelectDelete(pParse->db, pRight);
-    sqlite3SelectDelete(pParse->db, yymsp[-4].minor.yy487.pSelect);
-    yygotominor.yy487.pSelect = 0;
-  }else{
-    pRight->op = TK_ALL;
-    pRight->pPrior = yymsp[-4].minor.yy487.pSelect;
-    pRight->selFlags |= SF_Values;
-    pRight->pPrior->selFlags |= SF_Values;
-    yygotominor.yy487.pSelect = pRight;
-  }
+  sqlite3WithPush(pParse, yymsp[-6].minor.yy59, 1);
+  sqlite3Insert(pParse, yymsp[-3].minor.yy65, 0, yymsp[-2].minor.yy408, yymsp[-5].minor.yy186);
 }
         break;
-      case 181: /* inscollist ::= inscollist COMMA nm */
-{yygotominor.yy180 = sqlite3IdListAppend(pParse->db,yymsp[-2].minor.yy180,&yymsp[0].minor.yy0);}
+      case 177: /* insert_cmd ::= INSERT orconf */
+{yygotominor.yy186 = yymsp[0].minor.yy186;}
         break;
-      case 182: /* inscollist ::= nm */
-{yygotominor.yy180 = sqlite3IdListAppend(pParse->db,0,&yymsp[0].minor.yy0);}
+      case 178: /* insert_cmd ::= REPLACE */
+{yygotominor.yy186 = OE_Replace;}
+        break;
+      case 181: /* idlist ::= idlist COMMA nm */
+{yygotominor.yy408 = sqlite3IdListAppend(pParse->db,yymsp[-2].minor.yy408,&yymsp[0].minor.yy0);}
+        break;
+      case 182: /* idlist ::= nm */
+{yygotominor.yy408 = sqlite3IdListAppend(pParse->db,0,&yymsp[0].minor.yy0);}
         break;
       case 183: /* expr ::= term */
-{yygotominor.yy342 = yymsp[0].minor.yy342;}
+{yygotominor.yy346 = yymsp[0].minor.yy346;}
         break;
       case 184: /* expr ::= LP expr RP */
-{yygotominor.yy342.pExpr = yymsp[-1].minor.yy342.pExpr; spanSet(&yygotominor.yy342,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0);}
+{yygotominor.yy346.pExpr = yymsp[-1].minor.yy346.pExpr; spanSet(&yygotominor.yy346,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0);}
         break;
       case 185: /* term ::= NULL */
       case 190: /* term ::= INTEGER|FLOAT|BLOB */ yytestcase(yyruleno==190);
       case 191: /* term ::= STRING */ yytestcase(yyruleno==191);
-{spanExpr(&yygotominor.yy342, pParse, yymsp[0].major, &yymsp[0].minor.yy0);}
+{spanExpr(&yygotominor.yy346, pParse, yymsp[0].major, &yymsp[0].minor.yy0);}
         break;
-      case 186: /* expr ::= id */
+      case 186: /* expr ::= ID|INDEXED */
       case 187: /* expr ::= JOIN_KW */ yytestcase(yyruleno==187);
-{spanExpr(&yygotominor.yy342, pParse, TK_ID, &yymsp[0].minor.yy0);}
+{spanExpr(&yygotominor.yy346, pParse, TK_ID, &yymsp[0].minor.yy0);}
         break;
       case 188: /* expr ::= nm DOT nm */
 {
   Expr *temp1 = sqlite3PExpr(pParse, TK_ID, 0, 0, &yymsp[-2].minor.yy0);
   Expr *temp2 = sqlite3PExpr(pParse, TK_ID, 0, 0, &yymsp[0].minor.yy0);
-  yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_DOT, temp1, temp2, 0);
-  spanSet(&yygotominor.yy342,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0);
+  yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_DOT, temp1, temp2, 0);
+  spanSet(&yygotominor.yy346,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0);
 }
         break;
       case 189: /* expr ::= nm DOT nm DOT nm */
@@ -112802,163 +119074,154 @@ static void yy_reduce(
   Expr *temp2 = sqlite3PExpr(pParse, TK_ID, 0, 0, &yymsp[-2].minor.yy0);
   Expr *temp3 = sqlite3PExpr(pParse, TK_ID, 0, 0, &yymsp[0].minor.yy0);
   Expr *temp4 = sqlite3PExpr(pParse, TK_DOT, temp2, temp3, 0);
-  yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_DOT, temp1, temp4, 0);
-  spanSet(&yygotominor.yy342,&yymsp[-4].minor.yy0,&yymsp[0].minor.yy0);
+  yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_DOT, temp1, temp4, 0);
+  spanSet(&yygotominor.yy346,&yymsp[-4].minor.yy0,&yymsp[0].minor.yy0);
 }
         break;
-      case 192: /* expr ::= REGISTER */
+      case 192: /* expr ::= VARIABLE */
 {
-  /* When doing a nested parse, one can include terms in an expression
-  ** that look like this:   #1 #2 ...  These terms refer to registers
-  ** in the virtual machine.  #N is the N-th register. */
-  if( pParse->nested==0 ){
-    sqlite3ErrorMsg(pParse, "near \"%T\": syntax error", &yymsp[0].minor.yy0);
-    yygotominor.yy342.pExpr = 0;
+  if( yymsp[0].minor.yy0.n>=2 && yymsp[0].minor.yy0.z[0]=='#' && sqlite3Isdigit(yymsp[0].minor.yy0.z[1]) ){
+    /* When doing a nested parse, one can include terms in an expression
+    ** that look like this:   #1 #2 ...  These terms refer to registers
+    ** in the virtual machine.  #N is the N-th register. */
+    if( pParse->nested==0 ){
+      sqlite3ErrorMsg(pParse, "near \"%T\": syntax error", &yymsp[0].minor.yy0);
+      yygotominor.yy346.pExpr = 0;
+    }else{
+      yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_REGISTER, 0, 0, &yymsp[0].minor.yy0);
+      if( yygotominor.yy346.pExpr ) sqlite3GetInt32(&yymsp[0].minor.yy0.z[1], &yygotominor.yy346.pExpr->iTable);
+    }
   }else{
-    yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_REGISTER, 0, 0, &yymsp[0].minor.yy0);
-    if( yygotominor.yy342.pExpr ) sqlite3GetInt32(&yymsp[0].minor.yy0.z[1], &yygotominor.yy342.pExpr->iTable);
+    spanExpr(&yygotominor.yy346, pParse, TK_VARIABLE, &yymsp[0].minor.yy0);
+    sqlite3ExprAssignVarNumber(pParse, yygotominor.yy346.pExpr);
   }
-  spanSet(&yygotominor.yy342, &yymsp[0].minor.yy0, &yymsp[0].minor.yy0);
+  spanSet(&yygotominor.yy346, &yymsp[0].minor.yy0, &yymsp[0].minor.yy0);
 }
         break;
-      case 193: /* expr ::= VARIABLE */
+      case 193: /* expr ::= expr COLLATE ID|STRING */
 {
-  spanExpr(&yygotominor.yy342, pParse, TK_VARIABLE, &yymsp[0].minor.yy0);
-  sqlite3ExprAssignVarNumber(pParse, yygotominor.yy342.pExpr);
-  spanSet(&yygotominor.yy342, &yymsp[0].minor.yy0, &yymsp[0].minor.yy0);
+  yygotominor.yy346.pExpr = sqlite3ExprAddCollateToken(pParse, yymsp[-2].minor.yy346.pExpr, &yymsp[0].minor.yy0);
+  yygotominor.yy346.zStart = yymsp[-2].minor.yy346.zStart;
+  yygotominor.yy346.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
 }
         break;
-      case 194: /* expr ::= expr COLLATE ids */
+      case 194: /* expr ::= CAST LP expr AS typetoken RP */
 {
-  yygotominor.yy342.pExpr = sqlite3ExprAddCollateToken(pParse, yymsp[-2].minor.yy342.pExpr, &yymsp[0].minor.yy0);
-  yygotominor.yy342.zStart = yymsp[-2].minor.yy342.zStart;
-  yygotominor.yy342.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
+  yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_CAST, yymsp[-3].minor.yy346.pExpr, 0, &yymsp[-1].minor.yy0);
+  spanSet(&yygotominor.yy346,&yymsp[-5].minor.yy0,&yymsp[0].minor.yy0);
 }
         break;
-      case 195: /* expr ::= CAST LP expr AS typetoken RP */
+      case 195: /* expr ::= ID|INDEXED LP distinct exprlist RP */
 {
-  yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_CAST, yymsp[-3].minor.yy342.pExpr, 0, &yymsp[-1].minor.yy0);
-  spanSet(&yygotominor.yy342,&yymsp[-5].minor.yy0,&yymsp[0].minor.yy0);
-}
-        break;
-      case 196: /* expr ::= ID LP distinct exprlist RP */
-{
-  if( yymsp[-1].minor.yy442 && yymsp[-1].minor.yy442->nExpr>pParse->db->aLimit[SQLITE_LIMIT_FUNCTION_ARG] ){
+  if( yymsp[-1].minor.yy14 && yymsp[-1].minor.yy14->nExpr>pParse->db->aLimit[SQLITE_LIMIT_FUNCTION_ARG] ){
     sqlite3ErrorMsg(pParse, "too many arguments on function %T", &yymsp[-4].minor.yy0);
   }
-  yygotominor.yy342.pExpr = sqlite3ExprFunction(pParse, yymsp[-1].minor.yy442, &yymsp[-4].minor.yy0);
-  spanSet(&yygotominor.yy342,&yymsp[-4].minor.yy0,&yymsp[0].minor.yy0);
-  if( yymsp[-2].minor.yy305 && yygotominor.yy342.pExpr ){
-    yygotominor.yy342.pExpr->flags |= EP_Distinct;
+  yygotominor.yy346.pExpr = sqlite3ExprFunction(pParse, yymsp[-1].minor.yy14, &yymsp[-4].minor.yy0);
+  spanSet(&yygotominor.yy346,&yymsp[-4].minor.yy0,&yymsp[0].minor.yy0);
+  if( yymsp[-2].minor.yy381 && yygotominor.yy346.pExpr ){
+    yygotominor.yy346.pExpr->flags |= EP_Distinct;
   }
 }
         break;
-      case 197: /* expr ::= ID LP STAR RP */
+      case 196: /* expr ::= ID|INDEXED LP STAR RP */
 {
-  yygotominor.yy342.pExpr = sqlite3ExprFunction(pParse, 0, &yymsp[-3].minor.yy0);
-  spanSet(&yygotominor.yy342,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);
+  yygotominor.yy346.pExpr = sqlite3ExprFunction(pParse, 0, &yymsp[-3].minor.yy0);
+  spanSet(&yygotominor.yy346,&yymsp[-3].minor.yy0,&yymsp[0].minor.yy0);
 }
         break;
-      case 198: /* term ::= CTIME_KW */
+      case 197: /* term ::= CTIME_KW */
 {
-  /* The CURRENT_TIME, CURRENT_DATE, and CURRENT_TIMESTAMP values are
-  ** treated as functions that return constants */
-  yygotominor.yy342.pExpr = sqlite3ExprFunction(pParse, 0,&yymsp[0].minor.yy0);
-  if( yygotominor.yy342.pExpr ){
-    yygotominor.yy342.pExpr->op = TK_CONST_FUNC;  
-  }
-  spanSet(&yygotominor.yy342, &yymsp[0].minor.yy0, &yymsp[0].minor.yy0);
+  yygotominor.yy346.pExpr = sqlite3ExprFunction(pParse, 0, &yymsp[0].minor.yy0);
+  spanSet(&yygotominor.yy346, &yymsp[0].minor.yy0, &yymsp[0].minor.yy0);
 }
         break;
-      case 199: /* expr ::= expr AND expr */
-      case 200: /* expr ::= expr OR expr */ yytestcase(yyruleno==200);
-      case 201: /* expr ::= expr LT|GT|GE|LE expr */ yytestcase(yyruleno==201);
-      case 202: /* expr ::= expr EQ|NE expr */ yytestcase(yyruleno==202);
-      case 203: /* expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr */ yytestcase(yyruleno==203);
-      case 204: /* expr ::= expr PLUS|MINUS expr */ yytestcase(yyruleno==204);
-      case 205: /* expr ::= expr STAR|SLASH|REM expr */ yytestcase(yyruleno==205);
-      case 206: /* expr ::= expr CONCAT expr */ yytestcase(yyruleno==206);
-{spanBinaryExpr(&yygotominor.yy342,pParse,yymsp[-1].major,&yymsp[-2].minor.yy342,&yymsp[0].minor.yy342);}
+      case 198: /* expr ::= expr AND expr */
+      case 199: /* expr ::= expr OR expr */ yytestcase(yyruleno==199);
+      case 200: /* expr ::= expr LT|GT|GE|LE expr */ yytestcase(yyruleno==200);
+      case 201: /* expr ::= expr EQ|NE expr */ yytestcase(yyruleno==201);
+      case 202: /* expr ::= expr BITAND|BITOR|LSHIFT|RSHIFT expr */ yytestcase(yyruleno==202);
+      case 203: /* expr ::= expr PLUS|MINUS expr */ yytestcase(yyruleno==203);
+      case 204: /* expr ::= expr STAR|SLASH|REM expr */ yytestcase(yyruleno==204);
+      case 205: /* expr ::= expr CONCAT expr */ yytestcase(yyruleno==205);
+{spanBinaryExpr(&yygotominor.yy346,pParse,yymsp[-1].major,&yymsp[-2].minor.yy346,&yymsp[0].minor.yy346);}
         break;
-      case 207: /* likeop ::= LIKE_KW */
-      case 209: /* likeop ::= MATCH */ yytestcase(yyruleno==209);
-{yygotominor.yy318.eOperator = yymsp[0].minor.yy0; yygotominor.yy318.bNot = 0;}
+      case 206: /* likeop ::= LIKE_KW|MATCH */
+{yygotominor.yy96.eOperator = yymsp[0].minor.yy0; yygotominor.yy96.bNot = 0;}
         break;
-      case 208: /* likeop ::= NOT LIKE_KW */
-      case 210: /* likeop ::= NOT MATCH */ yytestcase(yyruleno==210);
-{yygotominor.yy318.eOperator = yymsp[0].minor.yy0; yygotominor.yy318.bNot = 1;}
+      case 207: /* likeop ::= NOT LIKE_KW|MATCH */
+{yygotominor.yy96.eOperator = yymsp[0].minor.yy0; yygotominor.yy96.bNot = 1;}
         break;
-      case 211: /* expr ::= expr likeop expr */
+      case 208: /* expr ::= expr likeop expr */
 {
   ExprList *pList;
-  pList = sqlite3ExprListAppend(pParse,0, yymsp[0].minor.yy342.pExpr);
-  pList = sqlite3ExprListAppend(pParse,pList, yymsp[-2].minor.yy342.pExpr);
-  yygotominor.yy342.pExpr = sqlite3ExprFunction(pParse, pList, &yymsp[-1].minor.yy318.eOperator);
-  if( yymsp[-1].minor.yy318.bNot ) yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy342.pExpr, 0, 0);
-  yygotominor.yy342.zStart = yymsp[-2].minor.yy342.zStart;
-  yygotominor.yy342.zEnd = yymsp[0].minor.yy342.zEnd;
-  if( yygotominor.yy342.pExpr ) yygotominor.yy342.pExpr->flags |= EP_InfixFunc;
+  pList = sqlite3ExprListAppend(pParse,0, yymsp[0].minor.yy346.pExpr);
+  pList = sqlite3ExprListAppend(pParse,pList, yymsp[-2].minor.yy346.pExpr);
+  yygotominor.yy346.pExpr = sqlite3ExprFunction(pParse, pList, &yymsp[-1].minor.yy96.eOperator);
+  if( yymsp[-1].minor.yy96.bNot ) yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy346.pExpr, 0, 0);
+  yygotominor.yy346.zStart = yymsp[-2].minor.yy346.zStart;
+  yygotominor.yy346.zEnd = yymsp[0].minor.yy346.zEnd;
+  if( yygotominor.yy346.pExpr ) yygotominor.yy346.pExpr->flags |= EP_InfixFunc;
 }
         break;
-      case 212: /* expr ::= expr likeop expr ESCAPE expr */
+      case 209: /* expr ::= expr likeop expr ESCAPE expr */
 {
   ExprList *pList;
-  pList = sqlite3ExprListAppend(pParse,0, yymsp[-2].minor.yy342.pExpr);
-  pList = sqlite3ExprListAppend(pParse,pList, yymsp[-4].minor.yy342.pExpr);
-  pList = sqlite3ExprListAppend(pParse,pList, yymsp[0].minor.yy342.pExpr);
-  yygotominor.yy342.pExpr = sqlite3ExprFunction(pParse, pList, &yymsp[-3].minor.yy318.eOperator);
-  if( yymsp[-3].minor.yy318.bNot ) yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy342.pExpr, 0, 0);
-  yygotominor.yy342.zStart = yymsp[-4].minor.yy342.zStart;
-  yygotominor.yy342.zEnd = yymsp[0].minor.yy342.zEnd;
-  if( yygotominor.yy342.pExpr ) yygotominor.yy342.pExpr->flags |= EP_InfixFunc;
+  pList = sqlite3ExprListAppend(pParse,0, yymsp[-2].minor.yy346.pExpr);
+  pList = sqlite3ExprListAppend(pParse,pList, yymsp[-4].minor.yy346.pExpr);
+  pList = sqlite3ExprListAppend(pParse,pList, yymsp[0].minor.yy346.pExpr);
+  yygotominor.yy346.pExpr = sqlite3ExprFunction(pParse, pList, &yymsp[-3].minor.yy96.eOperator);
+  if( yymsp[-3].minor.yy96.bNot ) yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy346.pExpr, 0, 0);
+  yygotominor.yy346.zStart = yymsp[-4].minor.yy346.zStart;
+  yygotominor.yy346.zEnd = yymsp[0].minor.yy346.zEnd;
+  if( yygotominor.yy346.pExpr ) yygotominor.yy346.pExpr->flags |= EP_InfixFunc;
 }
         break;
-      case 213: /* expr ::= expr ISNULL|NOTNULL */
-{spanUnaryPostfix(&yygotominor.yy342,pParse,yymsp[0].major,&yymsp[-1].minor.yy342,&yymsp[0].minor.yy0);}
+      case 210: /* expr ::= expr ISNULL|NOTNULL */
+{spanUnaryPostfix(&yygotominor.yy346,pParse,yymsp[0].major,&yymsp[-1].minor.yy346,&yymsp[0].minor.yy0);}
         break;
-      case 214: /* expr ::= expr NOT NULL */
-{spanUnaryPostfix(&yygotominor.yy342,pParse,TK_NOTNULL,&yymsp[-2].minor.yy342,&yymsp[0].minor.yy0);}
+      case 211: /* expr ::= expr NOT NULL */
+{spanUnaryPostfix(&yygotominor.yy346,pParse,TK_NOTNULL,&yymsp[-2].minor.yy346,&yymsp[0].minor.yy0);}
         break;
-      case 215: /* expr ::= expr IS expr */
+      case 212: /* expr ::= expr IS expr */
 {
-  spanBinaryExpr(&yygotominor.yy342,pParse,TK_IS,&yymsp[-2].minor.yy342,&yymsp[0].minor.yy342);
-  binaryToUnaryIfNull(pParse, yymsp[0].minor.yy342.pExpr, yygotominor.yy342.pExpr, TK_ISNULL);
+  spanBinaryExpr(&yygotominor.yy346,pParse,TK_IS,&yymsp[-2].minor.yy346,&yymsp[0].minor.yy346);
+  binaryToUnaryIfNull(pParse, yymsp[0].minor.yy346.pExpr, yygotominor.yy346.pExpr, TK_ISNULL);
 }
         break;
-      case 216: /* expr ::= expr IS NOT expr */
+      case 213: /* expr ::= expr IS NOT expr */
 {
-  spanBinaryExpr(&yygotominor.yy342,pParse,TK_ISNOT,&yymsp[-3].minor.yy342,&yymsp[0].minor.yy342);
-  binaryToUnaryIfNull(pParse, yymsp[0].minor.yy342.pExpr, yygotominor.yy342.pExpr, TK_NOTNULL);
+  spanBinaryExpr(&yygotominor.yy346,pParse,TK_ISNOT,&yymsp[-3].minor.yy346,&yymsp[0].minor.yy346);
+  binaryToUnaryIfNull(pParse, yymsp[0].minor.yy346.pExpr, yygotominor.yy346.pExpr, TK_NOTNULL);
 }
         break;
-      case 217: /* expr ::= NOT expr */
-      case 218: /* expr ::= BITNOT expr */ yytestcase(yyruleno==218);
-{spanUnaryPrefix(&yygotominor.yy342,pParse,yymsp[-1].major,&yymsp[0].minor.yy342,&yymsp[-1].minor.yy0);}
+      case 214: /* expr ::= NOT expr */
+      case 215: /* expr ::= BITNOT expr */ yytestcase(yyruleno==215);
+{spanUnaryPrefix(&yygotominor.yy346,pParse,yymsp[-1].major,&yymsp[0].minor.yy346,&yymsp[-1].minor.yy0);}
         break;
-      case 219: /* expr ::= MINUS expr */
-{spanUnaryPrefix(&yygotominor.yy342,pParse,TK_UMINUS,&yymsp[0].minor.yy342,&yymsp[-1].minor.yy0);}
+      case 216: /* expr ::= MINUS expr */
+{spanUnaryPrefix(&yygotominor.yy346,pParse,TK_UMINUS,&yymsp[0].minor.yy346,&yymsp[-1].minor.yy0);}
         break;
-      case 220: /* expr ::= PLUS expr */
-{spanUnaryPrefix(&yygotominor.yy342,pParse,TK_UPLUS,&yymsp[0].minor.yy342,&yymsp[-1].minor.yy0);}
+      case 217: /* expr ::= PLUS expr */
+{spanUnaryPrefix(&yygotominor.yy346,pParse,TK_UPLUS,&yymsp[0].minor.yy346,&yymsp[-1].minor.yy0);}
         break;
-      case 223: /* expr ::= expr between_op expr AND expr */
+      case 220: /* expr ::= expr between_op expr AND expr */
 {
-  ExprList *pList = sqlite3ExprListAppend(pParse,0, yymsp[-2].minor.yy342.pExpr);
-  pList = sqlite3ExprListAppend(pParse,pList, yymsp[0].minor.yy342.pExpr);
-  yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_BETWEEN, yymsp[-4].minor.yy342.pExpr, 0, 0);
-  if( yygotominor.yy342.pExpr ){
-    yygotominor.yy342.pExpr->x.pList = pList;
+  ExprList *pList = sqlite3ExprListAppend(pParse,0, yymsp[-2].minor.yy346.pExpr);
+  pList = sqlite3ExprListAppend(pParse,pList, yymsp[0].minor.yy346.pExpr);
+  yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_BETWEEN, yymsp[-4].minor.yy346.pExpr, 0, 0);
+  if( yygotominor.yy346.pExpr ){
+    yygotominor.yy346.pExpr->x.pList = pList;
   }else{
     sqlite3ExprListDelete(pParse->db, pList);
   } 
-  if( yymsp[-3].minor.yy392 ) yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy342.pExpr, 0, 0);
-  yygotominor.yy342.zStart = yymsp[-4].minor.yy342.zStart;
-  yygotominor.yy342.zEnd = yymsp[0].minor.yy342.zEnd;
+  if( yymsp[-3].minor.yy328 ) yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy346.pExpr, 0, 0);
+  yygotominor.yy346.zStart = yymsp[-4].minor.yy346.zStart;
+  yygotominor.yy346.zEnd = yymsp[0].minor.yy346.zEnd;
 }
         break;
-      case 226: /* expr ::= expr in_op LP exprlist RP */
+      case 223: /* expr ::= expr in_op LP exprlist RP */
 {
-    if( yymsp[-1].minor.yy442==0 ){
+    if( yymsp[-1].minor.yy14==0 ){
       /* Expressions of the form
       **
       **      expr1 IN ()
@@ -112967,224 +119230,252 @@ static void yy_reduce(
       ** simplify to constants 0 (false) and 1 (true), respectively,
       ** regardless of the value of expr1.
       */
-      yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_INTEGER, 0, 0, &sqlite3IntTokens[yymsp[-3].minor.yy392]);
-      sqlite3ExprDelete(pParse->db, yymsp[-4].minor.yy342.pExpr);
-    }else{
-      yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_IN, yymsp[-4].minor.yy342.pExpr, 0, 0);
-      if( yygotominor.yy342.pExpr ){
-        yygotominor.yy342.pExpr->x.pList = yymsp[-1].minor.yy442;
-        sqlite3ExprSetHeight(pParse, yygotominor.yy342.pExpr);
-      }else{
-        sqlite3ExprListDelete(pParse->db, yymsp[-1].minor.yy442);
+      yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_INTEGER, 0, 0, &sqlite3IntTokens[yymsp[-3].minor.yy328]);
+      sqlite3ExprDelete(pParse->db, yymsp[-4].minor.yy346.pExpr);
+    }else if( yymsp[-1].minor.yy14->nExpr==1 ){
+      /* Expressions of the form:
+      **
+      **      expr1 IN (?1)
+      **      expr1 NOT IN (?2)
+      **
+      ** with exactly one value on the RHS can be simplified to something
+      ** like this:
+      **
+      **      expr1 == ?1
+      **      expr1 <> ?2
+      **
+      ** But, the RHS of the == or <> is marked with the EP_Generic flag
+      ** so that it may not contribute to the computation of comparison
+      ** affinity or the collating sequence to use for comparison.  Otherwise,
+      ** the semantics would be subtly different from IN or NOT IN.
+      */
+      Expr *pRHS = yymsp[-1].minor.yy14->a[0].pExpr;
+      yymsp[-1].minor.yy14->a[0].pExpr = 0;
+      sqlite3ExprListDelete(pParse->db, yymsp[-1].minor.yy14);
+      /* pRHS cannot be NULL because a malloc error would have been detected
+      ** before now and control would have never reached this point */
+      if( ALWAYS(pRHS) ){
+        pRHS->flags &= ~EP_Collate;
+        pRHS->flags |= EP_Generic;
       }
-      if( yymsp[-3].minor.yy392 ) yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy342.pExpr, 0, 0);
-    }
-    yygotominor.yy342.zStart = yymsp[-4].minor.yy342.zStart;
-    yygotominor.yy342.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
-  }
-        break;
-      case 227: /* expr ::= LP select RP */
-{
-    yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_SELECT, 0, 0, 0);
-    if( yygotominor.yy342.pExpr ){
-      yygotominor.yy342.pExpr->x.pSelect = yymsp[-1].minor.yy159;
-      ExprSetProperty(yygotominor.yy342.pExpr, EP_xIsSelect);
-      sqlite3ExprSetHeight(pParse, yygotominor.yy342.pExpr);
+      yygotominor.yy346.pExpr = sqlite3PExpr(pParse, yymsp[-3].minor.yy328 ? TK_NE : TK_EQ, yymsp[-4].minor.yy346.pExpr, pRHS, 0);
     }else{
-      sqlite3SelectDelete(pParse->db, yymsp[-1].minor.yy159);
+      yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_IN, yymsp[-4].minor.yy346.pExpr, 0, 0);
+      if( yygotominor.yy346.pExpr ){
+        yygotominor.yy346.pExpr->x.pList = yymsp[-1].minor.yy14;
+        sqlite3ExprSetHeight(pParse, yygotominor.yy346.pExpr);
+      }else{
+        sqlite3ExprListDelete(pParse->db, yymsp[-1].minor.yy14);
+      }
+      if( yymsp[-3].minor.yy328 ) yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy346.pExpr, 0, 0);
     }
-    yygotominor.yy342.zStart = yymsp[-2].minor.yy0.z;
-    yygotominor.yy342.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
+    yygotominor.yy346.zStart = yymsp[-4].minor.yy346.zStart;
+    yygotominor.yy346.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
   }
         break;
-      case 228: /* expr ::= expr in_op LP select RP */
+      case 224: /* expr ::= LP select RP */
 {
-    yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_IN, yymsp[-4].minor.yy342.pExpr, 0, 0);
-    if( yygotominor.yy342.pExpr ){
-      yygotominor.yy342.pExpr->x.pSelect = yymsp[-1].minor.yy159;
-      ExprSetProperty(yygotominor.yy342.pExpr, EP_xIsSelect);
-      sqlite3ExprSetHeight(pParse, yygotominor.yy342.pExpr);
+    yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_SELECT, 0, 0, 0);
+    if( yygotominor.yy346.pExpr ){
+      yygotominor.yy346.pExpr->x.pSelect = yymsp[-1].minor.yy3;
+      ExprSetProperty(yygotominor.yy346.pExpr, EP_xIsSelect);
+      sqlite3ExprSetHeight(pParse, yygotominor.yy346.pExpr);
     }else{
-      sqlite3SelectDelete(pParse->db, yymsp[-1].minor.yy159);
+      sqlite3SelectDelete(pParse->db, yymsp[-1].minor.yy3);
     }
-    if( yymsp[-3].minor.yy392 ) yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy342.pExpr, 0, 0);
-    yygotominor.yy342.zStart = yymsp[-4].minor.yy342.zStart;
-    yygotominor.yy342.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
+    yygotominor.yy346.zStart = yymsp[-2].minor.yy0.z;
+    yygotominor.yy346.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
   }
         break;
-      case 229: /* expr ::= expr in_op nm dbnm */
+      case 225: /* expr ::= expr in_op LP select RP */
+{
+    yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_IN, yymsp[-4].minor.yy346.pExpr, 0, 0);
+    if( yygotominor.yy346.pExpr ){
+      yygotominor.yy346.pExpr->x.pSelect = yymsp[-1].minor.yy3;
+      ExprSetProperty(yygotominor.yy346.pExpr, EP_xIsSelect);
+      sqlite3ExprSetHeight(pParse, yygotominor.yy346.pExpr);
+    }else{
+      sqlite3SelectDelete(pParse->db, yymsp[-1].minor.yy3);
+    }
+    if( yymsp[-3].minor.yy328 ) yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy346.pExpr, 0, 0);
+    yygotominor.yy346.zStart = yymsp[-4].minor.yy346.zStart;
+    yygotominor.yy346.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
+  }
+        break;
+      case 226: /* expr ::= expr in_op nm dbnm */
 {
     SrcList *pSrc = sqlite3SrcListAppend(pParse->db, 0,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0);
-    yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_IN, yymsp[-3].minor.yy342.pExpr, 0, 0);
-    if( yygotominor.yy342.pExpr ){
-      yygotominor.yy342.pExpr->x.pSelect = sqlite3SelectNew(pParse, 0,pSrc,0,0,0,0,0,0,0);
-      ExprSetProperty(yygotominor.yy342.pExpr, EP_xIsSelect);
-      sqlite3ExprSetHeight(pParse, yygotominor.yy342.pExpr);
+    yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_IN, yymsp[-3].minor.yy346.pExpr, 0, 0);
+    if( yygotominor.yy346.pExpr ){
+      yygotominor.yy346.pExpr->x.pSelect = sqlite3SelectNew(pParse, 0,pSrc,0,0,0,0,0,0,0);
+      ExprSetProperty(yygotominor.yy346.pExpr, EP_xIsSelect);
+      sqlite3ExprSetHeight(pParse, yygotominor.yy346.pExpr);
     }else{
       sqlite3SrcListDelete(pParse->db, pSrc);
     }
-    if( yymsp[-2].minor.yy392 ) yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy342.pExpr, 0, 0);
-    yygotominor.yy342.zStart = yymsp[-3].minor.yy342.zStart;
-    yygotominor.yy342.zEnd = yymsp[0].minor.yy0.z ? &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n] : &yymsp[-1].minor.yy0.z[yymsp[-1].minor.yy0.n];
+    if( yymsp[-2].minor.yy328 ) yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_NOT, yygotominor.yy346.pExpr, 0, 0);
+    yygotominor.yy346.zStart = yymsp[-3].minor.yy346.zStart;
+    yygotominor.yy346.zEnd = yymsp[0].minor.yy0.z ? &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n] : &yymsp[-1].minor.yy0.z[yymsp[-1].minor.yy0.n];
   }
         break;
-      case 230: /* expr ::= EXISTS LP select RP */
+      case 227: /* expr ::= EXISTS LP select RP */
 {
-    Expr *p = yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_EXISTS, 0, 0, 0);
+    Expr *p = yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_EXISTS, 0, 0, 0);
     if( p ){
-      p->x.pSelect = yymsp[-1].minor.yy159;
+      p->x.pSelect = yymsp[-1].minor.yy3;
       ExprSetProperty(p, EP_xIsSelect);
       sqlite3ExprSetHeight(pParse, p);
     }else{
-      sqlite3SelectDelete(pParse->db, yymsp[-1].minor.yy159);
+      sqlite3SelectDelete(pParse->db, yymsp[-1].minor.yy3);
     }
-    yygotominor.yy342.zStart = yymsp[-3].minor.yy0.z;
-    yygotominor.yy342.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
+    yygotominor.yy346.zStart = yymsp[-3].minor.yy0.z;
+    yygotominor.yy346.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
   }
         break;
-      case 231: /* expr ::= CASE case_operand case_exprlist case_else END */
+      case 228: /* expr ::= CASE case_operand case_exprlist case_else END */
 {
-  yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_CASE, yymsp[-3].minor.yy122, yymsp[-1].minor.yy122, 0);
-  if( yygotominor.yy342.pExpr ){
-    yygotominor.yy342.pExpr->x.pList = yymsp[-2].minor.yy442;
-    sqlite3ExprSetHeight(pParse, yygotominor.yy342.pExpr);
+  yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_CASE, yymsp[-3].minor.yy132, 0, 0);
+  if( yygotominor.yy346.pExpr ){
+    yygotominor.yy346.pExpr->x.pList = yymsp[-1].minor.yy132 ? sqlite3ExprListAppend(pParse,yymsp[-2].minor.yy14,yymsp[-1].minor.yy132) : yymsp[-2].minor.yy14;
+    sqlite3ExprSetHeight(pParse, yygotominor.yy346.pExpr);
   }else{
-    sqlite3ExprListDelete(pParse->db, yymsp[-2].minor.yy442);
+    sqlite3ExprListDelete(pParse->db, yymsp[-2].minor.yy14);
+    sqlite3ExprDelete(pParse->db, yymsp[-1].minor.yy132);
   }
-  yygotominor.yy342.zStart = yymsp[-4].minor.yy0.z;
-  yygotominor.yy342.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
+  yygotominor.yy346.zStart = yymsp[-4].minor.yy0.z;
+  yygotominor.yy346.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
 }
         break;
-      case 232: /* case_exprlist ::= case_exprlist WHEN expr THEN expr */
+      case 229: /* case_exprlist ::= case_exprlist WHEN expr THEN expr */
 {
-  yygotominor.yy442 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy442, yymsp[-2].minor.yy342.pExpr);
-  yygotominor.yy442 = sqlite3ExprListAppend(pParse,yygotominor.yy442, yymsp[0].minor.yy342.pExpr);
+  yygotominor.yy14 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy14, yymsp[-2].minor.yy346.pExpr);
+  yygotominor.yy14 = sqlite3ExprListAppend(pParse,yygotominor.yy14, yymsp[0].minor.yy346.pExpr);
 }
         break;
-      case 233: /* case_exprlist ::= WHEN expr THEN expr */
+      case 230: /* case_exprlist ::= WHEN expr THEN expr */
 {
-  yygotominor.yy442 = sqlite3ExprListAppend(pParse,0, yymsp[-2].minor.yy342.pExpr);
-  yygotominor.yy442 = sqlite3ExprListAppend(pParse,yygotominor.yy442, yymsp[0].minor.yy342.pExpr);
+  yygotominor.yy14 = sqlite3ExprListAppend(pParse,0, yymsp[-2].minor.yy346.pExpr);
+  yygotominor.yy14 = sqlite3ExprListAppend(pParse,yygotominor.yy14, yymsp[0].minor.yy346.pExpr);
 }
         break;
-      case 240: /* nexprlist ::= nexprlist COMMA expr */
-{yygotominor.yy442 = sqlite3ExprListAppend(pParse,yymsp[-2].minor.yy442,yymsp[0].minor.yy342.pExpr);}
+      case 237: /* nexprlist ::= nexprlist COMMA expr */
+{yygotominor.yy14 = sqlite3ExprListAppend(pParse,yymsp[-2].minor.yy14,yymsp[0].minor.yy346.pExpr);}
         break;
-      case 241: /* nexprlist ::= expr */
-{yygotominor.yy442 = sqlite3ExprListAppend(pParse,0,yymsp[0].minor.yy342.pExpr);}
+      case 238: /* nexprlist ::= expr */
+{yygotominor.yy14 = sqlite3ExprListAppend(pParse,0,yymsp[0].minor.yy346.pExpr);}
         break;
-      case 242: /* cmd ::= createkw uniqueflag INDEX ifnotexists nm dbnm ON nm LP idxlist RP */
+      case 239: /* cmd ::= createkw uniqueflag INDEX ifnotexists nm dbnm ON nm LP idxlist RP where_opt */
 {
-  sqlite3CreateIndex(pParse, &yymsp[-6].minor.yy0, &yymsp[-5].minor.yy0, 
-                     sqlite3SrcListAppend(pParse->db,0,&yymsp[-3].minor.yy0,0), yymsp[-1].minor.yy442, yymsp[-9].minor.yy392,
-                      &yymsp[-10].minor.yy0, &yymsp[0].minor.yy0, SQLITE_SO_ASC, yymsp[-7].minor.yy392);
+  sqlite3CreateIndex(pParse, &yymsp[-7].minor.yy0, &yymsp[-6].minor.yy0, 
+                     sqlite3SrcListAppend(pParse->db,0,&yymsp[-4].minor.yy0,0), yymsp[-2].minor.yy14, yymsp[-10].minor.yy328,
+                      &yymsp[-11].minor.yy0, yymsp[0].minor.yy132, SQLITE_SO_ASC, yymsp[-8].minor.yy328);
 }
         break;
-      case 243: /* uniqueflag ::= UNIQUE */
-      case 296: /* raisetype ::= ABORT */ yytestcase(yyruleno==296);
-{yygotominor.yy392 = OE_Abort;}
+      case 240: /* uniqueflag ::= UNIQUE */
+      case 291: /* raisetype ::= ABORT */ yytestcase(yyruleno==291);
+{yygotominor.yy328 = OE_Abort;}
         break;
-      case 244: /* uniqueflag ::= */
-{yygotominor.yy392 = OE_None;}
+      case 241: /* uniqueflag ::= */
+{yygotominor.yy328 = OE_None;}
         break;
-      case 247: /* idxlist ::= idxlist COMMA nm collate sortorder */
+      case 244: /* idxlist ::= idxlist COMMA nm collate sortorder */
 {
   Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &yymsp[-1].minor.yy0);
-  yygotominor.yy442 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy442, p);
-  sqlite3ExprListSetName(pParse,yygotominor.yy442,&yymsp[-2].minor.yy0,1);
-  sqlite3ExprListCheckLength(pParse, yygotominor.yy442, "index");
-  if( yygotominor.yy442 ) yygotominor.yy442->a[yygotominor.yy442->nExpr-1].sortOrder = (u8)yymsp[0].minor.yy392;
+  yygotominor.yy14 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy14, p);
+  sqlite3ExprListSetName(pParse,yygotominor.yy14,&yymsp[-2].minor.yy0,1);
+  sqlite3ExprListCheckLength(pParse, yygotominor.yy14, "index");
+  if( yygotominor.yy14 ) yygotominor.yy14->a[yygotominor.yy14->nExpr-1].sortOrder = (u8)yymsp[0].minor.yy328;
 }
         break;
-      case 248: /* idxlist ::= nm collate sortorder */
+      case 245: /* idxlist ::= nm collate sortorder */
 {
   Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &yymsp[-1].minor.yy0);
-  yygotominor.yy442 = sqlite3ExprListAppend(pParse,0, p);
-  sqlite3ExprListSetName(pParse, yygotominor.yy442, &yymsp[-2].minor.yy0, 1);
-  sqlite3ExprListCheckLength(pParse, yygotominor.yy442, "index");
-  if( yygotominor.yy442 ) yygotominor.yy442->a[yygotominor.yy442->nExpr-1].sortOrder = (u8)yymsp[0].minor.yy392;
+  yygotominor.yy14 = sqlite3ExprListAppend(pParse,0, p);
+  sqlite3ExprListSetName(pParse, yygotominor.yy14, &yymsp[-2].minor.yy0, 1);
+  sqlite3ExprListCheckLength(pParse, yygotominor.yy14, "index");
+  if( yygotominor.yy14 ) yygotominor.yy14->a[yygotominor.yy14->nExpr-1].sortOrder = (u8)yymsp[0].minor.yy328;
 }
         break;
-      case 249: /* collate ::= */
+      case 246: /* collate ::= */
 {yygotominor.yy0.z = 0; yygotominor.yy0.n = 0;}
         break;
-      case 251: /* cmd ::= DROP INDEX ifexists fullname */
-{sqlite3DropIndex(pParse, yymsp[0].minor.yy347, yymsp[-1].minor.yy392);}
+      case 248: /* cmd ::= DROP INDEX ifexists fullname */
+{sqlite3DropIndex(pParse, yymsp[0].minor.yy65, yymsp[-1].minor.yy328);}
         break;
-      case 252: /* cmd ::= VACUUM */
-      case 253: /* cmd ::= VACUUM nm */ yytestcase(yyruleno==253);
+      case 249: /* cmd ::= VACUUM */
+      case 250: /* cmd ::= VACUUM nm */ yytestcase(yyruleno==250);
 {sqlite3Vacuum(pParse);}
         break;
-      case 254: /* cmd ::= PRAGMA nm dbnm */
+      case 251: /* cmd ::= PRAGMA nm dbnm */
 {sqlite3Pragma(pParse,&yymsp[-1].minor.yy0,&yymsp[0].minor.yy0,0,0);}
         break;
-      case 255: /* cmd ::= PRAGMA nm dbnm EQ nmnum */
+      case 252: /* cmd ::= PRAGMA nm dbnm EQ nmnum */
 {sqlite3Pragma(pParse,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0,0);}
         break;
-      case 256: /* cmd ::= PRAGMA nm dbnm LP nmnum RP */
+      case 253: /* cmd ::= PRAGMA nm dbnm LP nmnum RP */
 {sqlite3Pragma(pParse,&yymsp[-4].minor.yy0,&yymsp[-3].minor.yy0,&yymsp[-1].minor.yy0,0);}
         break;
-      case 257: /* cmd ::= PRAGMA nm dbnm EQ minus_num */
+      case 254: /* cmd ::= PRAGMA nm dbnm EQ minus_num */
 {sqlite3Pragma(pParse,&yymsp[-3].minor.yy0,&yymsp[-2].minor.yy0,&yymsp[0].minor.yy0,1);}
         break;
-      case 258: /* cmd ::= PRAGMA nm dbnm LP minus_num RP */
+      case 255: /* cmd ::= PRAGMA nm dbnm LP minus_num RP */
 {sqlite3Pragma(pParse,&yymsp[-4].minor.yy0,&yymsp[-3].minor.yy0,&yymsp[-1].minor.yy0,1);}
         break;
-      case 268: /* cmd ::= createkw trigger_decl BEGIN trigger_cmd_list END */
+      case 264: /* cmd ::= createkw trigger_decl BEGIN trigger_cmd_list END */
 {
   Token all;
   all.z = yymsp[-3].minor.yy0.z;
   all.n = (int)(yymsp[0].minor.yy0.z - yymsp[-3].minor.yy0.z) + yymsp[0].minor.yy0.n;
-  sqlite3FinishTrigger(pParse, yymsp[-1].minor.yy327, &all);
+  sqlite3FinishTrigger(pParse, yymsp[-1].minor.yy473, &all);
 }
         break;
-      case 269: /* trigger_decl ::= temp TRIGGER ifnotexists nm dbnm trigger_time trigger_event ON fullname foreach_clause when_clause */
+      case 265: /* trigger_decl ::= temp TRIGGER ifnotexists nm dbnm trigger_time trigger_event ON fullname foreach_clause when_clause */
 {
-  sqlite3BeginTrigger(pParse, &yymsp[-7].minor.yy0, &yymsp[-6].minor.yy0, yymsp[-5].minor.yy392, yymsp[-4].minor.yy410.a, yymsp[-4].minor.yy410.b, yymsp[-2].minor.yy347, yymsp[0].minor.yy122, yymsp[-10].minor.yy392, yymsp[-8].minor.yy392);
+  sqlite3BeginTrigger(pParse, &yymsp[-7].minor.yy0, &yymsp[-6].minor.yy0, yymsp[-5].minor.yy328, yymsp[-4].minor.yy378.a, yymsp[-4].minor.yy378.b, yymsp[-2].minor.yy65, yymsp[0].minor.yy132, yymsp[-10].minor.yy328, yymsp[-8].minor.yy328);
   yygotominor.yy0 = (yymsp[-6].minor.yy0.n==0?yymsp[-7].minor.yy0:yymsp[-6].minor.yy0);
 }
         break;
-      case 270: /* trigger_time ::= BEFORE */
-      case 273: /* trigger_time ::= */ yytestcase(yyruleno==273);
-{ yygotominor.yy392 = TK_BEFORE; }
+      case 266: /* trigger_time ::= BEFORE */
+      case 269: /* trigger_time ::= */ yytestcase(yyruleno==269);
+{ yygotominor.yy328 = TK_BEFORE; }
         break;
-      case 271: /* trigger_time ::= AFTER */
-{ yygotominor.yy392 = TK_AFTER;  }
+      case 267: /* trigger_time ::= AFTER */
+{ yygotominor.yy328 = TK_AFTER;  }
         break;
-      case 272: /* trigger_time ::= INSTEAD OF */
-{ yygotominor.yy392 = TK_INSTEAD;}
+      case 268: /* trigger_time ::= INSTEAD OF */
+{ yygotominor.yy328 = TK_INSTEAD;}
         break;
-      case 274: /* trigger_event ::= DELETE|INSERT */
-      case 275: /* trigger_event ::= UPDATE */ yytestcase(yyruleno==275);
-{yygotominor.yy410.a = yymsp[0].major; yygotominor.yy410.b = 0;}
+      case 270: /* trigger_event ::= DELETE|INSERT */
+      case 271: /* trigger_event ::= UPDATE */ yytestcase(yyruleno==271);
+{yygotominor.yy378.a = yymsp[0].major; yygotominor.yy378.b = 0;}
         break;
-      case 276: /* trigger_event ::= UPDATE OF inscollist */
-{yygotominor.yy410.a = TK_UPDATE; yygotominor.yy410.b = yymsp[0].minor.yy180;}
+      case 272: /* trigger_event ::= UPDATE OF idlist */
+{yygotominor.yy378.a = TK_UPDATE; yygotominor.yy378.b = yymsp[0].minor.yy408;}
         break;
-      case 279: /* when_clause ::= */
-      case 301: /* key_opt ::= */ yytestcase(yyruleno==301);
-{ yygotominor.yy122 = 0; }
+      case 275: /* when_clause ::= */
+      case 296: /* key_opt ::= */ yytestcase(yyruleno==296);
+{ yygotominor.yy132 = 0; }
         break;
-      case 280: /* when_clause ::= WHEN expr */
-      case 302: /* key_opt ::= KEY expr */ yytestcase(yyruleno==302);
-{ yygotominor.yy122 = yymsp[0].minor.yy342.pExpr; }
+      case 276: /* when_clause ::= WHEN expr */
+      case 297: /* key_opt ::= KEY expr */ yytestcase(yyruleno==297);
+{ yygotominor.yy132 = yymsp[0].minor.yy346.pExpr; }
         break;
-      case 281: /* trigger_cmd_list ::= trigger_cmd_list trigger_cmd SEMI */
+      case 277: /* trigger_cmd_list ::= trigger_cmd_list trigger_cmd SEMI */
 {
-  assert( yymsp[-2].minor.yy327!=0 );
-  yymsp[-2].minor.yy327->pLast->pNext = yymsp[-1].minor.yy327;
-  yymsp[-2].minor.yy327->pLast = yymsp[-1].minor.yy327;
-  yygotominor.yy327 = yymsp[-2].minor.yy327;
+  assert( yymsp[-2].minor.yy473!=0 );
+  yymsp[-2].minor.yy473->pLast->pNext = yymsp[-1].minor.yy473;
+  yymsp[-2].minor.yy473->pLast = yymsp[-1].minor.yy473;
+  yygotominor.yy473 = yymsp[-2].minor.yy473;
 }
         break;
-      case 282: /* trigger_cmd_list ::= trigger_cmd SEMI */
+      case 278: /* trigger_cmd_list ::= trigger_cmd SEMI */
 { 
-  assert( yymsp[-1].minor.yy327!=0 );
-  yymsp[-1].minor.yy327->pLast = yymsp[-1].minor.yy327;
-  yygotominor.yy327 = yymsp[-1].minor.yy327;
+  assert( yymsp[-1].minor.yy473!=0 );
+  yymsp[-1].minor.yy473->pLast = yymsp[-1].minor.yy473;
+  yygotominor.yy473 = yymsp[-1].minor.yy473;
 }
         break;
-      case 284: /* trnm ::= nm DOT nm */
+      case 280: /* trnm ::= nm DOT nm */
 {
   yygotominor.yy0 = yymsp[0].minor.yy0;
   sqlite3ErrorMsg(pParse, 
@@ -113192,123 +119483,137 @@ static void yy_reduce(
         "statements within triggers");
 }
         break;
-      case 286: /* tridxby ::= INDEXED BY nm */
+      case 282: /* tridxby ::= INDEXED BY nm */
 {
   sqlite3ErrorMsg(pParse,
         "the INDEXED BY clause is not allowed on UPDATE or DELETE statements "
         "within triggers");
 }
         break;
-      case 287: /* tridxby ::= NOT INDEXED */
+      case 283: /* tridxby ::= NOT INDEXED */
 {
   sqlite3ErrorMsg(pParse,
         "the NOT INDEXED clause is not allowed on UPDATE or DELETE statements "
         "within triggers");
 }
         break;
-      case 288: /* trigger_cmd ::= UPDATE orconf trnm tridxby SET setlist where_opt */
-{ yygotominor.yy327 = sqlite3TriggerUpdateStep(pParse->db, &yymsp[-4].minor.yy0, yymsp[-1].minor.yy442, yymsp[0].minor.yy122, yymsp[-5].minor.yy258); }
+      case 284: /* trigger_cmd ::= UPDATE orconf trnm tridxby SET setlist where_opt */
+{ yygotominor.yy473 = sqlite3TriggerUpdateStep(pParse->db, &yymsp[-4].minor.yy0, yymsp[-1].minor.yy14, yymsp[0].minor.yy132, yymsp[-5].minor.yy186); }
         break;
-      case 289: /* trigger_cmd ::= insert_cmd INTO trnm inscollist_opt valuelist */
-{yygotominor.yy327 = sqlite3TriggerInsertStep(pParse->db, &yymsp[-2].minor.yy0, yymsp[-1].minor.yy180, yymsp[0].minor.yy487.pList, yymsp[0].minor.yy487.pSelect, yymsp[-4].minor.yy258);}
+      case 285: /* trigger_cmd ::= insert_cmd INTO trnm inscollist_opt select */
+{yygotominor.yy473 = sqlite3TriggerInsertStep(pParse->db, &yymsp[-2].minor.yy0, yymsp[-1].minor.yy408, yymsp[0].minor.yy3, yymsp[-4].minor.yy186);}
         break;
-      case 290: /* trigger_cmd ::= insert_cmd INTO trnm inscollist_opt select */
-{yygotominor.yy327 = sqlite3TriggerInsertStep(pParse->db, &yymsp[-2].minor.yy0, yymsp[-1].minor.yy180, 0, yymsp[0].minor.yy159, yymsp[-4].minor.yy258);}
+      case 286: /* trigger_cmd ::= DELETE FROM trnm tridxby where_opt */
+{yygotominor.yy473 = sqlite3TriggerDeleteStep(pParse->db, &yymsp[-2].minor.yy0, yymsp[0].minor.yy132);}
         break;
-      case 291: /* trigger_cmd ::= DELETE FROM trnm tridxby where_opt */
-{yygotominor.yy327 = sqlite3TriggerDeleteStep(pParse->db, &yymsp[-2].minor.yy0, yymsp[0].minor.yy122);}
+      case 287: /* trigger_cmd ::= select */
+{yygotominor.yy473 = sqlite3TriggerSelectStep(pParse->db, yymsp[0].minor.yy3); }
         break;
-      case 292: /* trigger_cmd ::= select */
-{yygotominor.yy327 = sqlite3TriggerSelectStep(pParse->db, yymsp[0].minor.yy159); }
-        break;
-      case 293: /* expr ::= RAISE LP IGNORE RP */
+      case 288: /* expr ::= RAISE LP IGNORE RP */
 {
-  yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_RAISE, 0, 0, 0); 
-  if( yygotominor.yy342.pExpr ){
-    yygotominor.yy342.pExpr->affinity = OE_Ignore;
+  yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_RAISE, 0, 0, 0); 
+  if( yygotominor.yy346.pExpr ){
+    yygotominor.yy346.pExpr->affinity = OE_Ignore;
   }
-  yygotominor.yy342.zStart = yymsp[-3].minor.yy0.z;
-  yygotominor.yy342.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
+  yygotominor.yy346.zStart = yymsp[-3].minor.yy0.z;
+  yygotominor.yy346.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
 }
         break;
-      case 294: /* expr ::= RAISE LP raisetype COMMA nm RP */
+      case 289: /* expr ::= RAISE LP raisetype COMMA nm RP */
 {
-  yygotominor.yy342.pExpr = sqlite3PExpr(pParse, TK_RAISE, 0, 0, &yymsp[-1].minor.yy0); 
-  if( yygotominor.yy342.pExpr ) {
-    yygotominor.yy342.pExpr->affinity = (char)yymsp[-3].minor.yy392;
+  yygotominor.yy346.pExpr = sqlite3PExpr(pParse, TK_RAISE, 0, 0, &yymsp[-1].minor.yy0); 
+  if( yygotominor.yy346.pExpr ) {
+    yygotominor.yy346.pExpr->affinity = (char)yymsp[-3].minor.yy328;
   }
-  yygotominor.yy342.zStart = yymsp[-5].minor.yy0.z;
-  yygotominor.yy342.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
+  yygotominor.yy346.zStart = yymsp[-5].minor.yy0.z;
+  yygotominor.yy346.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
 }
         break;
-      case 295: /* raisetype ::= ROLLBACK */
-{yygotominor.yy392 = OE_Rollback;}
+      case 290: /* raisetype ::= ROLLBACK */
+{yygotominor.yy328 = OE_Rollback;}
         break;
-      case 297: /* raisetype ::= FAIL */
-{yygotominor.yy392 = OE_Fail;}
+      case 292: /* raisetype ::= FAIL */
+{yygotominor.yy328 = OE_Fail;}
         break;
-      case 298: /* cmd ::= DROP TRIGGER ifexists fullname */
+      case 293: /* cmd ::= DROP TRIGGER ifexists fullname */
 {
-  sqlite3DropTrigger(pParse,yymsp[0].minor.yy347,yymsp[-1].minor.yy392);
+  sqlite3DropTrigger(pParse,yymsp[0].minor.yy65,yymsp[-1].minor.yy328);
 }
         break;
-      case 299: /* cmd ::= ATTACH database_kw_opt expr AS expr key_opt */
+      case 294: /* cmd ::= ATTACH database_kw_opt expr AS expr key_opt */
 {
-  sqlite3Attach(pParse, yymsp[-3].minor.yy342.pExpr, yymsp[-1].minor.yy342.pExpr, yymsp[0].minor.yy122);
+  sqlite3Attach(pParse, yymsp[-3].minor.yy346.pExpr, yymsp[-1].minor.yy346.pExpr, yymsp[0].minor.yy132);
 }
         break;
-      case 300: /* cmd ::= DETACH database_kw_opt expr */
+      case 295: /* cmd ::= DETACH database_kw_opt expr */
 {
-  sqlite3Detach(pParse, yymsp[0].minor.yy342.pExpr);
+  sqlite3Detach(pParse, yymsp[0].minor.yy346.pExpr);
 }
         break;
-      case 305: /* cmd ::= REINDEX */
+      case 300: /* cmd ::= REINDEX */
 {sqlite3Reindex(pParse, 0, 0);}
         break;
-      case 306: /* cmd ::= REINDEX nm dbnm */
+      case 301: /* cmd ::= REINDEX nm dbnm */
 {sqlite3Reindex(pParse, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0);}
         break;
-      case 307: /* cmd ::= ANALYZE */
+      case 302: /* cmd ::= ANALYZE */
 {sqlite3Analyze(pParse, 0, 0);}
         break;
-      case 308: /* cmd ::= ANALYZE nm dbnm */
+      case 303: /* cmd ::= ANALYZE nm dbnm */
 {sqlite3Analyze(pParse, &yymsp[-1].minor.yy0, &yymsp[0].minor.yy0);}
         break;
-      case 309: /* cmd ::= ALTER TABLE fullname RENAME TO nm */
+      case 304: /* cmd ::= ALTER TABLE fullname RENAME TO nm */
 {
-  sqlite3AlterRenameTable(pParse,yymsp[-3].minor.yy347,&yymsp[0].minor.yy0);
+  sqlite3AlterRenameTable(pParse,yymsp[-3].minor.yy65,&yymsp[0].minor.yy0);
 }
         break;
-      case 310: /* cmd ::= ALTER TABLE add_column_fullname ADD kwcolumn_opt column */
+      case 305: /* cmd ::= ALTER TABLE add_column_fullname ADD kwcolumn_opt column */
 {
   sqlite3AlterFinishAddColumn(pParse, &yymsp[0].minor.yy0);
 }
         break;
-      case 311: /* add_column_fullname ::= fullname */
+      case 306: /* add_column_fullname ::= fullname */
 {
   pParse->db->lookaside.bEnabled = 0;
-  sqlite3AlterBeginAddColumn(pParse, yymsp[0].minor.yy347);
+  sqlite3AlterBeginAddColumn(pParse, yymsp[0].minor.yy65);
 }
         break;
-      case 314: /* cmd ::= create_vtab */
+      case 309: /* cmd ::= create_vtab */
 {sqlite3VtabFinishParse(pParse,0);}
         break;
-      case 315: /* cmd ::= create_vtab LP vtabarglist RP */
+      case 310: /* cmd ::= create_vtab LP vtabarglist RP */
 {sqlite3VtabFinishParse(pParse,&yymsp[0].minor.yy0);}
         break;
-      case 316: /* create_vtab ::= createkw VIRTUAL TABLE ifnotexists nm dbnm USING nm */
+      case 311: /* create_vtab ::= createkw VIRTUAL TABLE ifnotexists nm dbnm USING nm */
 {
-    sqlite3VtabBeginParse(pParse, &yymsp[-3].minor.yy0, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-4].minor.yy392);
+    sqlite3VtabBeginParse(pParse, &yymsp[-3].minor.yy0, &yymsp[-2].minor.yy0, &yymsp[0].minor.yy0, yymsp[-4].minor.yy328);
 }
         break;
-      case 319: /* vtabarg ::= */
+      case 314: /* vtabarg ::= */
 {sqlite3VtabArgInit(pParse);}
         break;
-      case 321: /* vtabargtoken ::= ANY */
-      case 322: /* vtabargtoken ::= lp anylist RP */ yytestcase(yyruleno==322);
-      case 323: /* lp ::= LP */ yytestcase(yyruleno==323);
+      case 316: /* vtabargtoken ::= ANY */
+      case 317: /* vtabargtoken ::= lp anylist RP */ yytestcase(yyruleno==317);
+      case 318: /* lp ::= LP */ yytestcase(yyruleno==318);
 {sqlite3VtabArgExtend(pParse,&yymsp[0].minor.yy0);}
         break;
+      case 322: /* with ::= */
+{yygotominor.yy59 = 0;}
+        break;
+      case 323: /* with ::= WITH wqlist */
+      case 324: /* with ::= WITH RECURSIVE wqlist */ yytestcase(yyruleno==324);
+{ yygotominor.yy59 = yymsp[0].minor.yy59; }
+        break;
+      case 325: /* wqlist ::= nm idxlist_opt AS LP select RP */
+{
+  yygotominor.yy59 = sqlite3WithAdd(pParse, 0, &yymsp[-5].minor.yy0, yymsp[-4].minor.yy14, yymsp[-1].minor.yy3);
+}
+        break;
+      case 326: /* wqlist ::= wqlist COMMA nm idxlist_opt AS LP select RP */
+{
+  yygotominor.yy59 = sqlite3WithAdd(pParse, yymsp[-7].minor.yy59, &yymsp[-5].minor.yy0, yymsp[-4].minor.yy14, yymsp[-1].minor.yy3);
+}
+        break;
       default:
       /* (0) input ::= cmdlist */ yytestcase(yyruleno==0);
       /* (1) cmdlist ::= cmdlist ecmd */ yytestcase(yyruleno==1);
@@ -113321,30 +119626,30 @@ static void yy_reduce(
       /* (20) savepoint_opt ::= SAVEPOINT */ yytestcase(yyruleno==20);
       /* (21) savepoint_opt ::= */ yytestcase(yyruleno==21);
       /* (25) cmd ::= create_table create_table_args */ yytestcase(yyruleno==25);
-      /* (34) columnlist ::= columnlist COMMA column */ yytestcase(yyruleno==34);
-      /* (35) columnlist ::= column */ yytestcase(yyruleno==35);
-      /* (44) type ::= */ yytestcase(yyruleno==44);
-      /* (51) signed ::= plus_num */ yytestcase(yyruleno==51);
-      /* (52) signed ::= minus_num */ yytestcase(yyruleno==52);
-      /* (53) carglist ::= carglist ccons */ yytestcase(yyruleno==53);
-      /* (54) carglist ::= */ yytestcase(yyruleno==54);
-      /* (61) ccons ::= NULL onconf */ yytestcase(yyruleno==61);
-      /* (89) conslist ::= conslist tconscomma tcons */ yytestcase(yyruleno==89);
-      /* (90) conslist ::= tcons */ yytestcase(yyruleno==90);
-      /* (92) tconscomma ::= */ yytestcase(yyruleno==92);
-      /* (277) foreach_clause ::= */ yytestcase(yyruleno==277);
-      /* (278) foreach_clause ::= FOR EACH ROW */ yytestcase(yyruleno==278);
-      /* (285) tridxby ::= */ yytestcase(yyruleno==285);
-      /* (303) database_kw_opt ::= DATABASE */ yytestcase(yyruleno==303);
-      /* (304) database_kw_opt ::= */ yytestcase(yyruleno==304);
-      /* (312) kwcolumn_opt ::= */ yytestcase(yyruleno==312);
-      /* (313) kwcolumn_opt ::= COLUMNKW */ yytestcase(yyruleno==313);
-      /* (317) vtabarglist ::= vtabarg */ yytestcase(yyruleno==317);
-      /* (318) vtabarglist ::= vtabarglist COMMA vtabarg */ yytestcase(yyruleno==318);
-      /* (320) vtabarg ::= vtabarg vtabargtoken */ yytestcase(yyruleno==320);
-      /* (324) anylist ::= */ yytestcase(yyruleno==324);
-      /* (325) anylist ::= anylist LP anylist RP */ yytestcase(yyruleno==325);
-      /* (326) anylist ::= anylist ANY */ yytestcase(yyruleno==326);
+      /* (36) columnlist ::= columnlist COMMA column */ yytestcase(yyruleno==36);
+      /* (37) columnlist ::= column */ yytestcase(yyruleno==37);
+      /* (43) type ::= */ yytestcase(yyruleno==43);
+      /* (50) signed ::= plus_num */ yytestcase(yyruleno==50);
+      /* (51) signed ::= minus_num */ yytestcase(yyruleno==51);
+      /* (52) carglist ::= carglist ccons */ yytestcase(yyruleno==52);
+      /* (53) carglist ::= */ yytestcase(yyruleno==53);
+      /* (60) ccons ::= NULL onconf */ yytestcase(yyruleno==60);
+      /* (88) conslist ::= conslist tconscomma tcons */ yytestcase(yyruleno==88);
+      /* (89) conslist ::= tcons */ yytestcase(yyruleno==89);
+      /* (91) tconscomma ::= */ yytestcase(yyruleno==91);
+      /* (273) foreach_clause ::= */ yytestcase(yyruleno==273);
+      /* (274) foreach_clause ::= FOR EACH ROW */ yytestcase(yyruleno==274);
+      /* (281) tridxby ::= */ yytestcase(yyruleno==281);
+      /* (298) database_kw_opt ::= DATABASE */ yytestcase(yyruleno==298);
+      /* (299) database_kw_opt ::= */ yytestcase(yyruleno==299);
+      /* (307) kwcolumn_opt ::= */ yytestcase(yyruleno==307);
+      /* (308) kwcolumn_opt ::= COLUMNKW */ yytestcase(yyruleno==308);
+      /* (312) vtabarglist ::= vtabarg */ yytestcase(yyruleno==312);
+      /* (313) vtabarglist ::= vtabarglist COMMA vtabarg */ yytestcase(yyruleno==313);
+      /* (315) vtabarg ::= vtabarg vtabargtoken */ yytestcase(yyruleno==315);
+      /* (319) anylist ::= */ yytestcase(yyruleno==319);
+      /* (320) anylist ::= anylist LP anylist RP */ yytestcase(yyruleno==320);
+      /* (321) anylist ::= anylist ANY */ yytestcase(yyruleno==321);
         break;
   };
   assert( yyruleno>=0 && yyruleno<sizeof(yyRuleInfo)/sizeof(yyRuleInfo[0]) );
@@ -113683,20 +119988,20 @@ const unsigned char ebcdicToAscii[] = {
 ** is substantially reduced.  This is important for embedded applications
 ** on platforms with limited memory.
 */
-/* Hash score: 175 */
+/* Hash score: 182 */
 static int keywordCode(const char *z, int n){
-  /* zText[] encodes 811 bytes of keywords in 541 bytes */
+  /* zText[] encodes 834 bytes of keywords in 554 bytes */
   /*   REINDEXEDESCAPEACHECKEYBEFOREIGNOREGEXPLAINSTEADDATABASELECT       */
   /*   ABLEFTHENDEFERRABLELSEXCEPTRANSACTIONATURALTERAISEXCLUSIVE         */
   /*   XISTSAVEPOINTERSECTRIGGEREFERENCESCONSTRAINTOFFSETEMPORARY         */
-  /*   UNIQUERYATTACHAVINGROUPDATEBEGINNERELEASEBETWEENOTNULLIKE          */
-  /*   CASCADELETECASECOLLATECREATECURRENT_DATEDETACHIMMEDIATEJOIN        */
-  /*   SERTMATCHPLANALYZEPRAGMABORTVALUESVIRTUALIMITWHENWHERENAME         */
-  /*   AFTEREPLACEANDEFAULTAUTOINCREMENTCASTCOLUMNCOMMITCONFLICTCROSS     */
-  /*   CURRENT_TIMESTAMPRIMARYDEFERREDISTINCTDROPFAILFROMFULLGLOBYIF      */
-  /*   ISNULLORDERESTRICTOUTERIGHTROLLBACKROWUNIONUSINGVACUUMVIEW         */
-  /*   INITIALLY                                                          */
-  static const char zText[540] = {
+  /*   UNIQUERYWITHOUTERELEASEATTACHAVINGROUPDATEBEGINNERECURSIVE         */
+  /*   BETWEENOTNULLIKECASCADELETECASECOLLATECREATECURRENT_DATEDETACH     */
+  /*   IMMEDIATEJOINSERTMATCHPLANALYZEPRAGMABORTVALUESVIRTUALIMITWHEN     */
+  /*   WHERENAMEAFTEREPLACEANDEFAULTAUTOINCREMENTCASTCOLUMNCOMMIT         */
+  /*   CONFLICTCROSSCURRENT_TIMESTAMPRIMARYDEFERREDISTINCTDROPFAIL        */
+  /*   FROMFULLGLOBYIFISNULLORDERESTRICTRIGHTROLLBACKROWUNIONUSING        */
+  /*   VACUUMVIEWINITIALLY                                                */
+  static const char zText[553] = {
     'R','E','I','N','D','E','X','E','D','E','S','C','A','P','E','A','C','H',
     'E','C','K','E','Y','B','E','F','O','R','E','I','G','N','O','R','E','G',
     'E','X','P','L','A','I','N','S','T','E','A','D','D','A','T','A','B','A',
@@ -113707,76 +120012,77 @@ static int keywordCode(const char *z, int n){
     'P','O','I','N','T','E','R','S','E','C','T','R','I','G','G','E','R','E',
     'F','E','R','E','N','C','E','S','C','O','N','S','T','R','A','I','N','T',
     'O','F','F','S','E','T','E','M','P','O','R','A','R','Y','U','N','I','Q',
-    'U','E','R','Y','A','T','T','A','C','H','A','V','I','N','G','R','O','U',
-    'P','D','A','T','E','B','E','G','I','N','N','E','R','E','L','E','A','S',
-    'E','B','E','T','W','E','E','N','O','T','N','U','L','L','I','K','E','C',
-    'A','S','C','A','D','E','L','E','T','E','C','A','S','E','C','O','L','L',
-    'A','T','E','C','R','E','A','T','E','C','U','R','R','E','N','T','_','D',
-    'A','T','E','D','E','T','A','C','H','I','M','M','E','D','I','A','T','E',
-    'J','O','I','N','S','E','R','T','M','A','T','C','H','P','L','A','N','A',
-    'L','Y','Z','E','P','R','A','G','M','A','B','O','R','T','V','A','L','U',
-    'E','S','V','I','R','T','U','A','L','I','M','I','T','W','H','E','N','W',
-    'H','E','R','E','N','A','M','E','A','F','T','E','R','E','P','L','A','C',
-    'E','A','N','D','E','F','A','U','L','T','A','U','T','O','I','N','C','R',
-    'E','M','E','N','T','C','A','S','T','C','O','L','U','M','N','C','O','M',
-    'M','I','T','C','O','N','F','L','I','C','T','C','R','O','S','S','C','U',
-    'R','R','E','N','T','_','T','I','M','E','S','T','A','M','P','R','I','M',
-    'A','R','Y','D','E','F','E','R','R','E','D','I','S','T','I','N','C','T',
-    'D','R','O','P','F','A','I','L','F','R','O','M','F','U','L','L','G','L',
-    'O','B','Y','I','F','I','S','N','U','L','L','O','R','D','E','R','E','S',
-    'T','R','I','C','T','O','U','T','E','R','I','G','H','T','R','O','L','L',
-    'B','A','C','K','R','O','W','U','N','I','O','N','U','S','I','N','G','V',
-    'A','C','U','U','M','V','I','E','W','I','N','I','T','I','A','L','L','Y',
+    'U','E','R','Y','W','I','T','H','O','U','T','E','R','E','L','E','A','S',
+    'E','A','T','T','A','C','H','A','V','I','N','G','R','O','U','P','D','A',
+    'T','E','B','E','G','I','N','N','E','R','E','C','U','R','S','I','V','E',
+    'B','E','T','W','E','E','N','O','T','N','U','L','L','I','K','E','C','A',
+    'S','C','A','D','E','L','E','T','E','C','A','S','E','C','O','L','L','A',
+    'T','E','C','R','E','A','T','E','C','U','R','R','E','N','T','_','D','A',
+    'T','E','D','E','T','A','C','H','I','M','M','E','D','I','A','T','E','J',
+    'O','I','N','S','E','R','T','M','A','T','C','H','P','L','A','N','A','L',
+    'Y','Z','E','P','R','A','G','M','A','B','O','R','T','V','A','L','U','E',
+    'S','V','I','R','T','U','A','L','I','M','I','T','W','H','E','N','W','H',
+    'E','R','E','N','A','M','E','A','F','T','E','R','E','P','L','A','C','E',
+    'A','N','D','E','F','A','U','L','T','A','U','T','O','I','N','C','R','E',
+    'M','E','N','T','C','A','S','T','C','O','L','U','M','N','C','O','M','M',
+    'I','T','C','O','N','F','L','I','C','T','C','R','O','S','S','C','U','R',
+    'R','E','N','T','_','T','I','M','E','S','T','A','M','P','R','I','M','A',
+    'R','Y','D','E','F','E','R','R','E','D','I','S','T','I','N','C','T','D',
+    'R','O','P','F','A','I','L','F','R','O','M','F','U','L','L','G','L','O',
+    'B','Y','I','F','I','S','N','U','L','L','O','R','D','E','R','E','S','T',
+    'R','I','C','T','R','I','G','H','T','R','O','L','L','B','A','C','K','R',
+    'O','W','U','N','I','O','N','U','S','I','N','G','V','A','C','U','U','M',
+    'V','I','E','W','I','N','I','T','I','A','L','L','Y',
   };
   static const unsigned char aHash[127] = {
-      72, 101, 114,  70,   0,  45,   0,   0,  78,   0,  73,   0,   0,
-      42,  12,  74,  15,   0, 113,  81,  50, 108,   0,  19,   0,   0,
-     118,   0, 116, 111,   0,  22,  89,   0,   9,   0,   0,  66,  67,
-       0,  65,   6,   0,  48,  86,  98,   0, 115,  97,   0,   0,  44,
-       0,  99,  24,   0,  17,   0, 119,  49,  23,   0,   5, 106,  25,
-      92,   0,   0, 121, 102,  56, 120,  53,  28,  51,   0,  87,   0,
-      96,  26,   0,  95,   0,   0,   0,  91,  88,  93,  84, 105,  14,
-      39, 104,   0,  77,   0,  18,  85, 107,  32,   0, 117,  76, 109,
-      58,  46,  80,   0,   0,  90,  40,   0, 112,   0,  36,   0,   0,
-      29,   0,  82,  59,  60,   0,  20,  57,   0,  52,
+      76, 105, 117,  74,   0,  45,   0,   0,  82,   0,  77,   0,   0,
+      42,  12,  78,  15,   0, 116,  85,  54, 112,   0,  19,   0,   0,
+     121,   0, 119, 115,   0,  22,  93,   0,   9,   0,   0,  70,  71,
+       0,  69,   6,   0,  48,  90, 102,   0, 118, 101,   0,   0,  44,
+       0, 103,  24,   0,  17,   0, 122,  53,  23,   0,   5, 110,  25,
+      96,   0,   0, 124, 106,  60, 123,  57,  28,  55,   0,  91,   0,
+     100,  26,   0,  99,   0,   0,   0,  95,  92,  97,  88, 109,  14,
+      39, 108,   0,  81,   0,  18,  89, 111,  32,   0, 120,  80, 113,
+      62,  46,  84,   0,   0,  94,  40,  59, 114,   0,  36,   0,   0,
+      29,   0,  86,  63,  64,   0,  20,  61,   0,  56,
   };
-  static const unsigned char aNext[121] = {
+  static const unsigned char aNext[124] = {
        0,   0,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,   0,
        0,   2,   0,   0,   0,   0,   0,   0,  13,   0,   0,   0,   0,
        0,   7,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-       0,   0,   0,   0,  33,   0,  21,   0,   0,   0,  43,   3,  47,
-       0,   0,   0,   0,  30,   0,  54,   0,  38,   0,   0,   0,   1,
-      62,   0,   0,  63,   0,  41,   0,   0,   0,   0,   0,   0,   0,
-      61,   0,   0,   0,   0,  31,  55,  16,  34,  10,   0,   0,   0,
-       0,   0,   0,   0,  11,  68,  75,   0,   8,   0, 100,  94,   0,
-     103,   0,  83,   0,  71,   0,   0, 110,  27,  37,  69,  79,   0,
-      35,  64,   0,   0,
+       0,   0,   0,   0,  33,   0,  21,   0,   0,   0,   0,   0,  50,
+       0,  43,   3,  47,   0,   0,   0,   0,  30,   0,  58,   0,  38,
+       0,   0,   0,   1,  66,   0,   0,  67,   0,  41,   0,   0,   0,
+       0,   0,   0,  49,  65,   0,   0,   0,   0,  31,  52,  16,  34,
+      10,   0,   0,   0,   0,   0,   0,   0,  11,  72,  79,   0,   8,
+       0, 104,  98,   0, 107,   0,  87,   0,  75,  51,   0,  27,  37,
+      73,  83,   0,  35,  68,   0,   0,
   };
-  static const unsigned char aLen[121] = {
+  static const unsigned char aLen[124] = {
        7,   7,   5,   4,   6,   4,   5,   3,   6,   7,   3,   6,   6,
        7,   7,   3,   8,   2,   6,   5,   4,   4,   3,  10,   4,   6,
       11,   6,   2,   7,   5,   5,   9,   6,   9,   9,   7,  10,  10,
-       4,   6,   2,   3,   9,   4,   2,   6,   5,   6,   6,   5,   6,
-       5,   5,   7,   7,   7,   3,   2,   4,   4,   7,   3,   6,   4,
-       7,   6,  12,   6,   9,   4,   6,   5,   4,   7,   6,   5,   6,
-       7,   5,   4,   5,   6,   5,   7,   3,   7,  13,   2,   2,   4,
-       6,   6,   8,   5,  17,  12,   7,   8,   8,   2,   4,   4,   4,
-       4,   4,   2,   2,   6,   5,   8,   5,   5,   8,   3,   5,   5,
-       6,   4,   9,   3,
+       4,   6,   2,   3,   9,   4,   2,   6,   5,   7,   4,   5,   7,
+       6,   6,   5,   6,   5,   5,   9,   7,   7,   3,   2,   4,   4,
+       7,   3,   6,   4,   7,   6,  12,   6,   9,   4,   6,   5,   4,
+       7,   6,   5,   6,   7,   5,   4,   5,   6,   5,   7,   3,   7,
+      13,   2,   2,   4,   6,   6,   8,   5,  17,  12,   7,   8,   8,
+       2,   4,   4,   4,   4,   4,   2,   2,   6,   5,   8,   5,   8,
+       3,   5,   5,   6,   4,   9,   3,
   };
-  static const unsigned short int aOffset[121] = {
+  static const unsigned short int aOffset[124] = {
        0,   2,   2,   8,   9,  14,  16,  20,  23,  25,  25,  29,  33,
       36,  41,  46,  48,  53,  54,  59,  62,  65,  67,  69,  78,  81,
       86,  91,  95,  96, 101, 105, 109, 117, 122, 128, 136, 142, 152,
-     159, 162, 162, 165, 167, 167, 171, 176, 179, 184, 189, 194, 197,
-     203, 206, 210, 217, 223, 223, 223, 226, 229, 233, 234, 238, 244,
-     248, 255, 261, 273, 279, 288, 290, 296, 301, 303, 310, 315, 320,
-     326, 332, 337, 341, 344, 350, 354, 361, 363, 370, 372, 374, 383,
-     387, 393, 399, 407, 412, 412, 428, 435, 442, 443, 450, 454, 458,
-     462, 466, 469, 471, 473, 479, 483, 491, 495, 500, 508, 511, 516,
-     521, 527, 531, 536,
+     159, 162, 162, 165, 167, 167, 171, 176, 179, 184, 184, 188, 192,
+     199, 204, 209, 212, 218, 221, 225, 234, 240, 240, 240, 243, 246,
+     250, 251, 255, 261, 265, 272, 278, 290, 296, 305, 307, 313, 318,
+     320, 327, 332, 337, 343, 349, 354, 358, 361, 367, 371, 378, 380,
+     387, 389, 391, 400, 404, 410, 416, 424, 429, 429, 445, 452, 459,
+     460, 467, 471, 475, 479, 483, 486, 488, 490, 496, 500, 508, 513,
+     521, 524, 529, 534, 540, 544, 549,
   };
-  static const unsigned char aCode[121] = {
+  static const unsigned char aCode[124] = {
     TK_REINDEX,    TK_INDEXED,    TK_INDEX,      TK_DESC,       TK_ESCAPE,     
     TK_EACH,       TK_CHECK,      TK_KEY,        TK_BEFORE,     TK_FOREIGN,    
     TK_FOR,        TK_IGNORE,     TK_LIKE_KW,    TK_EXPLAIN,    TK_INSTEAD,    
@@ -113786,22 +120092,22 @@ static int keywordCode(const char *z, int n){
     TK_ALTER,      TK_RAISE,      TK_EXCLUSIVE,  TK_EXISTS,     TK_SAVEPOINT,  
     TK_INTERSECT,  TK_TRIGGER,    TK_REFERENCES, TK_CONSTRAINT, TK_INTO,       
     TK_OFFSET,     TK_OF,         TK_SET,        TK_TEMP,       TK_TEMP,       
-    TK_OR,         TK_UNIQUE,     TK_QUERY,      TK_ATTACH,     TK_HAVING,     
-    TK_GROUP,      TK_UPDATE,     TK_BEGIN,      TK_JOIN_KW,    TK_RELEASE,    
-    TK_BETWEEN,    TK_NOTNULL,    TK_NOT,        TK_NO,         TK_NULL,       
-    TK_LIKE_KW,    TK_CASCADE,    TK_ASC,        TK_DELETE,     TK_CASE,       
-    TK_COLLATE,    TK_CREATE,     TK_CTIME_KW,   TK_DETACH,     TK_IMMEDIATE,  
-    TK_JOIN,       TK_INSERT,     TK_MATCH,      TK_PLAN,       TK_ANALYZE,    
-    TK_PRAGMA,     TK_ABORT,      TK_VALUES,     TK_VIRTUAL,    TK_LIMIT,      
-    TK_WHEN,       TK_WHERE,      TK_RENAME,     TK_AFTER,      TK_REPLACE,    
-    TK_AND,        TK_DEFAULT,    TK_AUTOINCR,   TK_TO,         TK_IN,         
-    TK_CAST,       TK_COLUMNKW,   TK_COMMIT,     TK_CONFLICT,   TK_JOIN_KW,    
-    TK_CTIME_KW,   TK_CTIME_KW,   TK_PRIMARY,    TK_DEFERRED,   TK_DISTINCT,   
-    TK_IS,         TK_DROP,       TK_FAIL,       TK_FROM,       TK_JOIN_KW,    
-    TK_LIKE_KW,    TK_BY,         TK_IF,         TK_ISNULL,     TK_ORDER,      
-    TK_RESTRICT,   TK_JOIN_KW,    TK_JOIN_KW,    TK_ROLLBACK,   TK_ROW,        
-    TK_UNION,      TK_USING,      TK_VACUUM,     TK_VIEW,       TK_INITIALLY,  
-    TK_ALL,        
+    TK_OR,         TK_UNIQUE,     TK_QUERY,      TK_WITHOUT,    TK_WITH,       
+    TK_JOIN_KW,    TK_RELEASE,    TK_ATTACH,     TK_HAVING,     TK_GROUP,      
+    TK_UPDATE,     TK_BEGIN,      TK_JOIN_KW,    TK_RECURSIVE,  TK_BETWEEN,    
+    TK_NOTNULL,    TK_NOT,        TK_NO,         TK_NULL,       TK_LIKE_KW,    
+    TK_CASCADE,    TK_ASC,        TK_DELETE,     TK_CASE,       TK_COLLATE,    
+    TK_CREATE,     TK_CTIME_KW,   TK_DETACH,     TK_IMMEDIATE,  TK_JOIN,       
+    TK_INSERT,     TK_MATCH,      TK_PLAN,       TK_ANALYZE,    TK_PRAGMA,     
+    TK_ABORT,      TK_VALUES,     TK_VIRTUAL,    TK_LIMIT,      TK_WHEN,       
+    TK_WHERE,      TK_RENAME,     TK_AFTER,      TK_REPLACE,    TK_AND,        
+    TK_DEFAULT,    TK_AUTOINCR,   TK_TO,         TK_IN,         TK_CAST,       
+    TK_COLUMNKW,   TK_COMMIT,     TK_CONFLICT,   TK_JOIN_KW,    TK_CTIME_KW,   
+    TK_CTIME_KW,   TK_PRIMARY,    TK_DEFERRED,   TK_DISTINCT,   TK_IS,         
+    TK_DROP,       TK_FAIL,       TK_FROM,       TK_JOIN_KW,    TK_LIKE_KW,    
+    TK_BY,         TK_IF,         TK_ISNULL,     TK_ORDER,      TK_RESTRICT,   
+    TK_JOIN_KW,    TK_ROLLBACK,   TK_ROW,        TK_UNION,      TK_USING,      
+    TK_VACUUM,     TK_VIEW,       TK_INITIALLY,  TK_ALL,        
   };
   int h, i;
   if( n<2 ) return TK_ID;
@@ -113858,79 +120164,82 @@ static int keywordCode(const char *z, int n){
       testcase( i==45 ); /* OR */
       testcase( i==46 ); /* UNIQUE */
       testcase( i==47 ); /* QUERY */
-      testcase( i==48 ); /* ATTACH */
-      testcase( i==49 ); /* HAVING */
-      testcase( i==50 ); /* GROUP */
-      testcase( i==51 ); /* UPDATE */
-      testcase( i==52 ); /* BEGIN */
-      testcase( i==53 ); /* INNER */
-      testcase( i==54 ); /* RELEASE */
-      testcase( i==55 ); /* BETWEEN */
-      testcase( i==56 ); /* NOTNULL */
-      testcase( i==57 ); /* NOT */
-      testcase( i==58 ); /* NO */
-      testcase( i==59 ); /* NULL */
-      testcase( i==60 ); /* LIKE */
-      testcase( i==61 ); /* CASCADE */
-      testcase( i==62 ); /* ASC */
-      testcase( i==63 ); /* DELETE */
-      testcase( i==64 ); /* CASE */
-      testcase( i==65 ); /* COLLATE */
-      testcase( i==66 ); /* CREATE */
-      testcase( i==67 ); /* CURRENT_DATE */
-      testcase( i==68 ); /* DETACH */
-      testcase( i==69 ); /* IMMEDIATE */
-      testcase( i==70 ); /* JOIN */
-      testcase( i==71 ); /* INSERT */
-      testcase( i==72 ); /* MATCH */
-      testcase( i==73 ); /* PLAN */
-      testcase( i==74 ); /* ANALYZE */
-      testcase( i==75 ); /* PRAGMA */
-      testcase( i==76 ); /* ABORT */
-      testcase( i==77 ); /* VALUES */
-      testcase( i==78 ); /* VIRTUAL */
-      testcase( i==79 ); /* LIMIT */
-      testcase( i==80 ); /* WHEN */
-      testcase( i==81 ); /* WHERE */
-      testcase( i==82 ); /* RENAME */
-      testcase( i==83 ); /* AFTER */
-      testcase( i==84 ); /* REPLACE */
-      testcase( i==85 ); /* AND */
-      testcase( i==86 ); /* DEFAULT */
-      testcase( i==87 ); /* AUTOINCREMENT */
-      testcase( i==88 ); /* TO */
-      testcase( i==89 ); /* IN */
-      testcase( i==90 ); /* CAST */
-      testcase( i==91 ); /* COLUMN */
-      testcase( i==92 ); /* COMMIT */
-      testcase( i==93 ); /* CONFLICT */
-      testcase( i==94 ); /* CROSS */
-      testcase( i==95 ); /* CURRENT_TIMESTAMP */
-      testcase( i==96 ); /* CURRENT_TIME */
-      testcase( i==97 ); /* PRIMARY */
-      testcase( i==98 ); /* DEFERRED */
-      testcase( i==99 ); /* DISTINCT */
-      testcase( i==100 ); /* IS */
-      testcase( i==101 ); /* DROP */
-      testcase( i==102 ); /* FAIL */
-      testcase( i==103 ); /* FROM */
-      testcase( i==104 ); /* FULL */
-      testcase( i==105 ); /* GLOB */
-      testcase( i==106 ); /* BY */
-      testcase( i==107 ); /* IF */
-      testcase( i==108 ); /* ISNULL */
-      testcase( i==109 ); /* ORDER */
-      testcase( i==110 ); /* RESTRICT */
-      testcase( i==111 ); /* OUTER */
-      testcase( i==112 ); /* RIGHT */
-      testcase( i==113 ); /* ROLLBACK */
-      testcase( i==114 ); /* ROW */
-      testcase( i==115 ); /* UNION */
-      testcase( i==116 ); /* USING */
-      testcase( i==117 ); /* VACUUM */
-      testcase( i==118 ); /* VIEW */
-      testcase( i==119 ); /* INITIALLY */
-      testcase( i==120 ); /* ALL */
+      testcase( i==48 ); /* WITHOUT */
+      testcase( i==49 ); /* WITH */
+      testcase( i==50 ); /* OUTER */
+      testcase( i==51 ); /* RELEASE */
+      testcase( i==52 ); /* ATTACH */
+      testcase( i==53 ); /* HAVING */
+      testcase( i==54 ); /* GROUP */
+      testcase( i==55 ); /* UPDATE */
+      testcase( i==56 ); /* BEGIN */
+      testcase( i==57 ); /* INNER */
+      testcase( i==58 ); /* RECURSIVE */
+      testcase( i==59 ); /* BETWEEN */
+      testcase( i==60 ); /* NOTNULL */
+      testcase( i==61 ); /* NOT */
+      testcase( i==62 ); /* NO */
+      testcase( i==63 ); /* NULL */
+      testcase( i==64 ); /* LIKE */
+      testcase( i==65 ); /* CASCADE */
+      testcase( i==66 ); /* ASC */
+      testcase( i==67 ); /* DELETE */
+      testcase( i==68 ); /* CASE */
+      testcase( i==69 ); /* COLLATE */
+      testcase( i==70 ); /* CREATE */
+      testcase( i==71 ); /* CURRENT_DATE */
+      testcase( i==72 ); /* DETACH */
+      testcase( i==73 ); /* IMMEDIATE */
+      testcase( i==74 ); /* JOIN */
+      testcase( i==75 ); /* INSERT */
+      testcase( i==76 ); /* MATCH */
+      testcase( i==77 ); /* PLAN */
+      testcase( i==78 ); /* ANALYZE */
+      testcase( i==79 ); /* PRAGMA */
+      testcase( i==80 ); /* ABORT */
+      testcase( i==81 ); /* VALUES */
+      testcase( i==82 ); /* VIRTUAL */
+      testcase( i==83 ); /* LIMIT */
+      testcase( i==84 ); /* WHEN */
+      testcase( i==85 ); /* WHERE */
+      testcase( i==86 ); /* RENAME */
+      testcase( i==87 ); /* AFTER */
+      testcase( i==88 ); /* REPLACE */
+      testcase( i==89 ); /* AND */
+      testcase( i==90 ); /* DEFAULT */
+      testcase( i==91 ); /* AUTOINCREMENT */
+      testcase( i==92 ); /* TO */
+      testcase( i==93 ); /* IN */
+      testcase( i==94 ); /* CAST */
+      testcase( i==95 ); /* COLUMN */
+      testcase( i==96 ); /* COMMIT */
+      testcase( i==97 ); /* CONFLICT */
+      testcase( i==98 ); /* CROSS */
+      testcase( i==99 ); /* CURRENT_TIMESTAMP */
+      testcase( i==100 ); /* CURRENT_TIME */
+      testcase( i==101 ); /* PRIMARY */
+      testcase( i==102 ); /* DEFERRED */
+      testcase( i==103 ); /* DISTINCT */
+      testcase( i==104 ); /* IS */
+      testcase( i==105 ); /* DROP */
+      testcase( i==106 ); /* FAIL */
+      testcase( i==107 ); /* FROM */
+      testcase( i==108 ); /* FULL */
+      testcase( i==109 ); /* GLOB */
+      testcase( i==110 ); /* BY */
+      testcase( i==111 ); /* IF */
+      testcase( i==112 ); /* ISNULL */
+      testcase( i==113 ); /* ORDER */
+      testcase( i==114 ); /* RESTRICT */
+      testcase( i==115 ); /* RIGHT */
+      testcase( i==116 ); /* ROLLBACK */
+      testcase( i==117 ); /* ROW */
+      testcase( i==118 ); /* UNION */
+      testcase( i==119 ); /* USING */
+      testcase( i==120 ); /* VACUUM */
+      testcase( i==121 ); /* VIEW */
+      testcase( i==122 ); /* INITIALLY */
+      testcase( i==123 ); /* ALL */
       return aCode[i];
     }
   }
@@ -113939,7 +120248,7 @@ static int keywordCode(const char *z, int n){
 SQLITE_PRIVATE int sqlite3KeywordCode(const unsigned char *z, int n){
   return keywordCode((char*)z, n);
 }
-#define SQLITE_N_KEYWORD 121
+#define SQLITE_N_KEYWORD 124
 
 /************** End of keywordhash.h *****************************************/
 /************** Continuing where we left off in tokenize.c *******************/
@@ -114003,7 +120312,6 @@ SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){
     }
     case '-': {
       if( z[1]=='-' ){
-        /* IMP: R-50417-27976 -- syntax diagram for comments */
         for(i=2; (c=z[i])!=0 && c!='\n'; i++){}
         *tokenType = TK_SPACE;   /* IMP: R-22934-25134 */
         return i;
@@ -114036,7 +120344,6 @@ SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){
         *tokenType = TK_SLASH;
         return 1;
       }
-      /* IMP: R-50417-27976 -- syntax diagram for comments */
       for(i=3, c=z[2]; (c!='*' || z[i]!='/') && (c=z[i])!=0; i++){}
       if( c ) i++;
       *tokenType = TK_SPACE;   /* IMP: R-22934-25134 */
@@ -114185,24 +120492,15 @@ SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *z, int *tokenType){
       for(i=1; sqlite3Isdigit(z[i]); i++){}
       return i;
     }
-    case '#': {
-      for(i=1; sqlite3Isdigit(z[i]); i++){}
-      if( i>1 ){
-        /* Parameters of the form #NNN (where NNN is a number) are used
-        ** internally by sqlite3NestedParse.  */
-        *tokenType = TK_REGISTER;
-        return i;
-      }
-      /* Fall through into the next case if the '#' is not followed by
-      ** a digit. Try to match #AAAA where AAAA is a parameter name. */
-    }
 #ifndef SQLITE_OMIT_TCL_VARIABLE
     case '$':
 #endif
     case '@':  /* For compatibility with MS SQL Server */
+    case '#':
     case ':': {
       int n = 0;
-      testcase( z[0]=='$' );  testcase( z[0]=='@' );  testcase( z[0]==':' );
+      testcase( z[0]=='$' );  testcase( z[0]=='@' );
+      testcase( z[0]==':' );  testcase( z[0]=='#' );
       *tokenType = TK_VARIABLE;
       for(i=1; (c=z[i])!=0; i++){
         if( IdChar(c) ){
@@ -114276,7 +120574,7 @@ SQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzEr
 
 
   mxSqlLen = db->aLimit[SQLITE_LIMIT_SQL_LENGTH];
-  if( db->activeVdbeCnt==0 ){
+  if( db->nVdbeActive==0 ){
     db->u1.isInterrupted = 0;
   }
   pParse->rc = SQLITE_OK;
@@ -114385,10 +120683,10 @@ SQLITE_PRIVATE int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzEr
     sqlite3DeleteTable(db, pParse->pNewTable);
   }
 
+  if( pParse->bFreeWith ) sqlite3WithDelete(db, pParse->pWith);
   sqlite3DeleteTrigger(db, pParse->pNewTrigger);
   for(i=pParse->nzVar-1; i>=0; i--) sqlite3DbFree(db, pParse->azVar[i]);
   sqlite3DbFree(db, pParse->azVar);
-  sqlite3DbFree(db, pParse->aAlias);
   while( pParse->pAinc ){
     AutoincInfo *p = pParse->pAinc;
     pParse->pAinc = p->pNext;
@@ -114898,6 +121196,9 @@ SQLITE_API char *sqlite3_data_directory = 0;
 SQLITE_API int sqlite3_initialize(void){
   MUTEX_LOGIC( sqlite3_mutex *pMaster; )       /* The main static mutex */
   int rc;                                      /* Result code */
+#ifdef SQLITE_EXTRA_INIT
+  int bRunExtraInit = 0;                       /* Extra initialization needed */
+#endif
 
 #ifdef SQLITE_OMIT_WSD
   rc = sqlite3_wsd_init(4096, 24);
@@ -114913,13 +121214,6 @@ SQLITE_API int sqlite3_initialize(void){
   */
   if( sqlite3GlobalConfig.isInit ) return SQLITE_OK;
 
-#ifdef SQLITE_ENABLE_SQLLOG
-  {
-    extern void sqlite3_init_sqllog(void);
-    sqlite3_init_sqllog();
-  }
-#endif
-
   /* Make sure the mutex subsystem is initialized.  If unable to 
   ** initialize the mutex subsystem, return early with the error.
   ** If the system is so sick that we are unable to allocate a mutex,
@@ -114995,6 +121289,9 @@ SQLITE_API int sqlite3_initialize(void){
       sqlite3PCacheBufferSetup( sqlite3GlobalConfig.pPage, 
           sqlite3GlobalConfig.szPage, sqlite3GlobalConfig.nPage);
       sqlite3GlobalConfig.isInit = 1;
+#ifdef SQLITE_EXTRA_INIT
+      bRunExtraInit = 1;
+#endif
     }
     sqlite3GlobalConfig.inProgress = 0;
   }
@@ -115035,7 +121332,7 @@ SQLITE_API int sqlite3_initialize(void){
   ** compile-time option.
   */
 #ifdef SQLITE_EXTRA_INIT
-  if( rc==SQLITE_OK && sqlite3GlobalConfig.isInit ){
+  if( bRunExtraInit ){
     int SQLITE_EXTRA_INIT(const char*);
     rc = SQLITE_EXTRA_INIT(0);
   }
@@ -115223,8 +121520,8 @@ SQLITE_API int sqlite3_config(int op, ...){
         memset(&sqlite3GlobalConfig.m, 0, sizeof(sqlite3GlobalConfig.m));
       }else{
         /* The heap pointer is not NULL, then install one of the
-        ** mem5.c/mem3.c methods. If neither ENABLE_MEMSYS3 nor
-        ** ENABLE_MEMSYS5 is defined, return an error.
+        ** mem5.c/mem3.c methods.  The enclosing #if guarantees at
+        ** least one of these methods is currently enabled.
         */
 #ifdef SQLITE_ENABLE_MEMSYS3
         sqlite3GlobalConfig.m = *sqlite3MemGetMemsys3();
@@ -115243,7 +121540,7 @@ SQLITE_API int sqlite3_config(int op, ...){
       break;
     }
     
-    /* Record a pointer to the logger funcction and its first argument.
+    /* Record a pointer to the logger function and its first argument.
     ** The default is NULL.  Logging is disabled if the function pointer is
     ** NULL.
     */
@@ -115290,6 +121587,13 @@ SQLITE_API int sqlite3_config(int op, ...){
       break;
     }
 
+#if SQLITE_OS_WIN && defined(SQLITE_WIN32_MALLOC)
+    case SQLITE_CONFIG_WIN32_HEAPSIZE: {
+      sqlite3GlobalConfig.nHeap = va_arg(ap, int);
+      break;
+    }
+#endif
+
     default: {
       rc = SQLITE_ERROR;
       break;
@@ -115356,7 +121660,8 @@ static int setupLookaside(sqlite3 *db, void *pBuf, int sz, int cnt){
     db->lookaside.bEnabled = 1;
     db->lookaside.bMalloced = pBuf==0 ?1:0;
   }else{
-    db->lookaside.pEnd = 0;
+    db->lookaside.pStart = db;
+    db->lookaside.pEnd = db;
     db->lookaside.bEnabled = 0;
     db->lookaside.bMalloced = 0;
   }
@@ -115482,7 +121787,7 @@ static int binCollFunc(
 /*
 ** Another built-in collating sequence: NOCASE. 
 **
-** This collating sequence is intended to be used for "case independant
+** This collating sequence is intended to be used for "case independent
 ** comparison". SQLite's knowledge of upper and lower case equivalents
 ** extends only to the 26 characters used in the English language.
 **
@@ -115574,6 +121879,7 @@ static void disconnectAllVtab(sqlite3 *db){
       }
     }
   }
+  sqlite3VtabUnlockList(db);
   sqlite3BtreeLeaveAll(db);
 #else
   UNUSED_PARAMETER(db);
@@ -115754,9 +122060,7 @@ SQLITE_PRIVATE void sqlite3LeaveMutexAndCloseZombie(sqlite3 *db){
 #endif
 
   sqlite3Error(db, SQLITE_OK, 0); /* Deallocates any cached error strings. */
-  if( db->pErr ){
-    sqlite3ValueFree(db->pErr);
-  }
+  sqlite3ValueFree(db->pErr);
   sqlite3CloseExtensions(db);
 
   db->magic = SQLITE_MAGIC_ERROR;
@@ -115805,7 +122109,6 @@ SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3 *db, int tripCode){
         inTrans = 1;
       }
       sqlite3BtreeRollback(p, tripCode);
-      db->aDb[i].inTrans = 0;
     }
   }
   sqlite3VtabRollback(db);
@@ -115819,6 +122122,8 @@ SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3 *db, int tripCode){
 
   /* Any deferred constraint violations have now been resolved. */
   db->nDeferredCons = 0;
+  db->nDeferredImmCons = 0;
+  db->flags &= ~SQLITE_DeferFKs;
 
   /* If one has been configured, invoke the rollback-hook callback */
   if( db->xRollbackCallback && (inTrans || !db->autoCommit) ){
@@ -115830,8 +122135,7 @@ SQLITE_PRIVATE void sqlite3RollbackAll(sqlite3 *db, int tripCode){
 ** Return a static string containing the name corresponding to the error code
 ** specified in the argument.
 */
-#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST) || \
-    defined(SQLITE_DEBUG_OS_TRACE)
+#if defined(SQLITE_TEST)
 SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
   const char *zName = 0;
   int i, origRc = rc;
@@ -115845,6 +122149,7 @@ SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
       case SQLITE_ABORT_ROLLBACK:     zName = "SQLITE_ABORT_ROLLBACK";    break;
       case SQLITE_BUSY:               zName = "SQLITE_BUSY";              break;
       case SQLITE_BUSY_RECOVERY:      zName = "SQLITE_BUSY_RECOVERY";     break;
+      case SQLITE_BUSY_SNAPSHOT:      zName = "SQLITE_BUSY_SNAPSHOT";     break;
       case SQLITE_LOCKED:             zName = "SQLITE_LOCKED";            break;
       case SQLITE_LOCKED_SHAREDCACHE: zName = "SQLITE_LOCKED_SHAREDCACHE";break;
       case SQLITE_NOMEM:              zName = "SQLITE_NOMEM";             break;
@@ -115852,6 +122157,7 @@ SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
       case SQLITE_READONLY_RECOVERY:  zName = "SQLITE_READONLY_RECOVERY"; break;
       case SQLITE_READONLY_CANTLOCK:  zName = "SQLITE_READONLY_CANTLOCK"; break;
       case SQLITE_READONLY_ROLLBACK:  zName = "SQLITE_READONLY_ROLLBACK"; break;
+      case SQLITE_READONLY_DBMOVED:   zName = "SQLITE_READONLY_DBMOVED";  break;
       case SQLITE_INTERRUPT:          zName = "SQLITE_INTERRUPT";         break;
       case SQLITE_IOERR:              zName = "SQLITE_IOERR";             break;
       case SQLITE_IOERR_READ:         zName = "SQLITE_IOERR_READ";        break;
@@ -115879,6 +122185,8 @@ SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
       case SQLITE_IOERR_SEEK:         zName = "SQLITE_IOERR_SEEK";        break;
       case SQLITE_IOERR_DELETE_NOENT: zName = "SQLITE_IOERR_DELETE_NOENT";break;
       case SQLITE_IOERR_MMAP:         zName = "SQLITE_IOERR_MMAP";        break;
+      case SQLITE_IOERR_GETTEMPPATH:  zName = "SQLITE_IOERR_GETTEMPPATH"; break;
+      case SQLITE_IOERR_CONVPATH:     zName = "SQLITE_IOERR_CONVPATH";    break;
       case SQLITE_CORRUPT:            zName = "SQLITE_CORRUPT";           break;
       case SQLITE_CORRUPT_VTAB:       zName = "SQLITE_CORRUPT_VTAB";      break;
       case SQLITE_NOTFOUND:           zName = "SQLITE_NOTFOUND";          break;
@@ -115887,6 +122195,7 @@ SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
       case SQLITE_CANTOPEN_NOTEMPDIR: zName = "SQLITE_CANTOPEN_NOTEMPDIR";break;
       case SQLITE_CANTOPEN_ISDIR:     zName = "SQLITE_CANTOPEN_ISDIR";    break;
       case SQLITE_CANTOPEN_FULLPATH:  zName = "SQLITE_CANTOPEN_FULLPATH"; break;
+      case SQLITE_CANTOPEN_CONVPATH:  zName = "SQLITE_CANTOPEN_CONVPATH"; break;
       case SQLITE_PROTOCOL:           zName = "SQLITE_PROTOCOL";          break;
       case SQLITE_EMPTY:              zName = "SQLITE_EMPTY";             break;
       case SQLITE_SCHEMA:             zName = "SQLITE_SCHEMA";            break;
@@ -115905,6 +122214,7 @@ SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
       case SQLITE_CONSTRAINT_VTAB:    zName = "SQLITE_CONSTRAINT_VTAB";   break;
       case SQLITE_CONSTRAINT_FUNCTION:
                                 zName = "SQLITE_CONSTRAINT_FUNCTION";     break;
+      case SQLITE_CONSTRAINT_ROWID:   zName = "SQLITE_CONSTRAINT_ROWID";  break;
       case SQLITE_MISMATCH:           zName = "SQLITE_MISMATCH";          break;
       case SQLITE_MISUSE:             zName = "SQLITE_MISUSE";            break;
       case SQLITE_NOLFS:              zName = "SQLITE_NOLFS";             break;
@@ -115918,6 +122228,7 @@ SQLITE_PRIVATE const char *sqlite3ErrName(int rc){
       case SQLITE_NOTICE_RECOVER_ROLLBACK:
                                 zName = "SQLITE_NOTICE_RECOVER_ROLLBACK"; break;
       case SQLITE_WARNING:            zName = "SQLITE_WARNING";           break;
+      case SQLITE_WARNING_AUTOINDEX:  zName = "SQLITE_WARNING_AUTOINDEX"; break;
       case SQLITE_DONE:               zName = "SQLITE_DONE";              break;
     }
   }
@@ -116078,7 +122389,7 @@ SQLITE_API void sqlite3_progress_handler(
   sqlite3_mutex_enter(db->mutex);
   if( nOps>0 ){
     db->xProgress = xProgress;
-    db->nProgressOps = nOps;
+    db->nProgressOps = (unsigned)nOps;
     db->pProgressArg = pArg;
   }else{
     db->xProgress = 0;
@@ -116131,6 +122442,7 @@ SQLITE_PRIVATE int sqlite3CreateFunc(
 ){
   FuncDef *p;
   int nName;
+  int extraFlags;
 
   assert( sqlite3_mutex_held(db->mutex) );
   if( zFunctionName==0 ||
@@ -116141,6 +122453,10 @@ SQLITE_PRIVATE int sqlite3CreateFunc(
       (255<(nName = sqlite3Strlen30( zFunctionName))) ){
     return SQLITE_MISUSE_BKPT;
   }
+
+  assert( SQLITE_FUNC_CONSTANT==SQLITE_DETERMINISTIC );
+  extraFlags = enc &  SQLITE_DETERMINISTIC;
+  enc &= (SQLITE_FUNC_ENCMASK|SQLITE_ANY);
   
 #ifndef SQLITE_OMIT_UTF16
   /* If SQLITE_UTF16 is specified as the encoding type, transform this
@@ -116154,10 +122470,10 @@ SQLITE_PRIVATE int sqlite3CreateFunc(
     enc = SQLITE_UTF16NATIVE;
   }else if( enc==SQLITE_ANY ){
     int rc;
-    rc = sqlite3CreateFunc(db, zFunctionName, nArg, SQLITE_UTF8,
+    rc = sqlite3CreateFunc(db, zFunctionName, nArg, SQLITE_UTF8|extraFlags,
          pUserData, xFunc, xStep, xFinal, pDestructor);
     if( rc==SQLITE_OK ){
-      rc = sqlite3CreateFunc(db, zFunctionName, nArg, SQLITE_UTF16LE,
+      rc = sqlite3CreateFunc(db, zFunctionName, nArg, SQLITE_UTF16LE|extraFlags,
           pUserData, xFunc, xStep, xFinal, pDestructor);
     }
     if( rc!=SQLITE_OK ){
@@ -116175,8 +122491,8 @@ SQLITE_PRIVATE int sqlite3CreateFunc(
   ** operation to continue but invalidate all precompiled statements.
   */
   p = sqlite3FindFunction(db, zFunctionName, nName, nArg, (u8)enc, 0);
-  if( p && p->iPrefEnc==enc && p->nArg==nArg ){
-    if( db->activeVdbeCnt ){
+  if( p && (p->funcFlags & SQLITE_FUNC_ENCMASK)==enc && p->nArg==nArg ){
+    if( db->nVdbeActive ){
       sqlite3Error(db, SQLITE_BUSY, 
         "unable to delete/modify user-function due to active statements");
       assert( !db->mallocFailed );
@@ -116200,7 +122516,8 @@ SQLITE_PRIVATE int sqlite3CreateFunc(
     pDestructor->nRef++;
   }
   p->pDestructor = pDestructor;
-  p->flags = 0;
+  p->funcFlags = (p->funcFlags & SQLITE_FUNC_ENCMASK) | extraFlags;
+  testcase( p->funcFlags & SQLITE_DETERMINISTIC );
   p->xFunc = xFunc;
   p->xStep = xStep;
   p->xFinalize = xFinal;
@@ -116630,6 +122947,7 @@ SQLITE_API const char *sqlite3_errmsg(sqlite3 *db){
   if( db->mallocFailed ){
     z = sqlite3ErrStr(SQLITE_NOMEM);
   }else{
+    testcase( db->pErr==0 );
     z = (char*)sqlite3_value_text(db->pErr);
     assert( !db->mallocFailed );
     if( z==0 ){
@@ -116671,8 +122989,7 @@ SQLITE_API const void *sqlite3_errmsg16(sqlite3 *db){
   }else{
     z = sqlite3_value_text16(db->pErr);
     if( z==0 ){
-      sqlite3ValueSetStr(db->pErr, -1, sqlite3ErrStr(db->errCode),
-           SQLITE_UTF8, SQLITE_STATIC);
+      sqlite3Error(db, db->errCode, sqlite3ErrStr(db->errCode));
       z = sqlite3_value_text16(db->pErr);
     }
     /* A malloc() may have failed within the call to sqlite3_value_text16()
@@ -116719,6 +123036,32 @@ SQLITE_API const char *sqlite3_errstr(int rc){
   return sqlite3ErrStr(rc);
 }
 
+/*
+** Invalidate all cached KeyInfo objects for database connection "db"
+*/
+static void invalidateCachedKeyInfo(sqlite3 *db){
+  Db *pDb;                    /* A single database */
+  int iDb;                    /* The database index number */
+  HashElem *k;                /* For looping over tables in pDb */
+  Table *pTab;                /* A table in the database */
+  Index *pIdx;                /* Each index */
+
+  for(iDb=0, pDb=db->aDb; iDb<db->nDb; iDb++, pDb++){
+    if( pDb->pBt==0 ) continue;
+    sqlite3BtreeEnter(pDb->pBt);
+    for(k=sqliteHashFirst(&pDb->pSchema->tblHash);  k; k=sqliteHashNext(k)){
+      pTab = (Table*)sqliteHashData(k);
+      for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
+        if( pIdx->pKeyInfo && pIdx->pKeyInfo->db==db ){
+          sqlite3KeyInfoUnref(pIdx->pKeyInfo);
+          pIdx->pKeyInfo = 0;
+        }
+      }
+    }
+    sqlite3BtreeLeave(pDb->pBt);
+  }
+}
+
 /*
 ** Create a new collating function for database "db".  The name is zName
 ** and the encoding is enc.
@@ -116757,12 +123100,13 @@ static int createCollation(
   */
   pColl = sqlite3FindCollSeq(db, (u8)enc2, zName, 0);
   if( pColl && pColl->xCmp ){
-    if( db->activeVdbeCnt ){
+    if( db->nVdbeActive ){
       sqlite3Error(db, SQLITE_BUSY, 
         "unable to delete/modify collation sequence due to active statements");
       return SQLITE_BUSY;
     }
     sqlite3ExpirePreparedStatements(db);
+    invalidateCachedKeyInfo(db);
 
     /* If collation sequence pColl was created directly by a call to
     ** sqlite3_create_collation, and not generated by synthCollSeq(),
@@ -116955,20 +123299,20 @@ SQLITE_PRIVATE int sqlite3ParseUri(
     zFile = sqlite3_malloc(nByte);
     if( !zFile ) return SQLITE_NOMEM;
 
+    iIn = 5;
+#ifndef SQLITE_ALLOW_URI_AUTHORITY
     /* Discard the scheme and authority segments of the URI. */
     if( zUri[5]=='/' && zUri[6]=='/' ){
       iIn = 7;
       while( zUri[iIn] && zUri[iIn]!='/' ) iIn++;
-
       if( iIn!=7 && (iIn!=16 || memcmp("localhost", &zUri[7], 9)) ){
         *pzErrMsg = sqlite3_mprintf("invalid uri authority: %.*s", 
             iIn-7, &zUri[7]);
         rc = SQLITE_ERROR;
         goto parse_uri_out;
       }
-    }else{
-      iIn = 5;
     }
+#endif
 
     /* Copy the filename and any query parameters into the zFile buffer. 
     ** Decode %HH escape codes along the way. 
@@ -117232,7 +123576,10 @@ static int openDatabase(
   db->nextAutovac = -1;
   db->szMmap = sqlite3GlobalConfig.szMmap;
   db->nextPagesize = 0;
-  db->flags |= SQLITE_ShortColNames | SQLITE_AutoIndex | SQLITE_EnableTrigger
+  db->flags |= SQLITE_ShortColNames | SQLITE_EnableTrigger | SQLITE_CacheSpill
+#if !defined(SQLITE_DEFAULT_AUTOMATIC_INDEX) || SQLITE_DEFAULT_AUTOMATIC_INDEX
+                 | SQLITE_AutoIndex
+#endif
 #if SQLITE_DEFAULT_FILE_FORMAT<4
                  | SQLITE_LegacyFileFmt
 #endif
@@ -117356,8 +123703,6 @@ static int openDatabase(
   }
 #endif
 
-  sqlite3Error(db, rc, 0);
-
   /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking
   ** mode.  -DSQLITE_DEFAULT_LOCKING_MODE=0 make NORMAL the default locking
   ** mode.  Doing nothing at all also makes NORMAL the default.
@@ -117368,6 +123713,8 @@ static int openDatabase(
                           SQLITE_DEFAULT_LOCKING_MODE);
 #endif
 
+  if( rc ) sqlite3Error(db, rc, 0);
+
   /* Enable the lookaside-malloc subsystem */
   setupLookaside(db, 0, sqlite3GlobalConfig.szLookaside,
                         sqlite3GlobalConfig.nLookaside);
@@ -117572,8 +123919,6 @@ SQLITE_API int sqlite3_global_recover(void){
 ** mode.  Return TRUE if it is and FALSE if not.  Autocommit mode is on
 ** by default.  Autocommit is disabled by a BEGIN statement and reenabled
 ** by the next COMMIT or ROLLBACK.
-**
-******* THIS IS AN EXPERIMENTAL API AND IS SUBJECT TO CHANGE ******
 */
 SQLITE_API int sqlite3_get_autocommit(sqlite3 *db){
   return db->autoCommit;
@@ -117829,7 +124174,7 @@ SQLITE_API int sqlite3_test_control(int op, ...){
     ** to the xRandomness method of the default VFS.
     */
     case SQLITE_TESTCTRL_PRNG_RESET: {
-      sqlite3PrngResetState();
+      sqlite3_randomness(0,0);
       break;
     }
 
@@ -117848,6 +124193,28 @@ SQLITE_API int sqlite3_test_control(int op, ...){
       break;
     }
 
+    /*
+    **  sqlite3_test_control(FAULT_INSTALL, xCallback)
+    **
+    ** Arrange to invoke xCallback() whenever sqlite3FaultSim() is called,
+    ** if xCallback is not NULL.
+    **
+    ** As a test of the fault simulator mechanism itself, sqlite3FaultSim(0)
+    ** is called immediately after installing the new callback and the return
+    ** value from sqlite3FaultSim(0) becomes the return from
+    ** sqlite3_test_control().
+    */
+    case SQLITE_TESTCTRL_FAULT_INSTALL: {
+      /* MSVC is picky about pulling func ptrs from va lists.
+      ** http://support.microsoft.com/kb/47961
+      ** sqlite3Config.xTestCallback = va_arg(ap, int(*)(int));
+      */
+      typedef int(*TESTCALLBACKFUNC_t)(int);
+      sqlite3Config.xTestCallback = va_arg(ap, TESTCALLBACKFUNC_t);
+      rc = sqlite3FaultSim(0);
+      break;
+    }
+
     /*
     **  sqlite3_test_control(BENIGN_MALLOC_HOOKS, xBegin, xEnd)
     **
@@ -117939,6 +124306,22 @@ SQLITE_API int sqlite3_test_control(int op, ...){
       break;
     }
 
+    /*
+    **   sqlite3_test_control(SQLITE_TESTCTRL_BYTEORDER);
+    **
+    ** The integer returned reveals the byte-order of the computer on which
+    ** SQLite is running:
+    **
+    **       1     big-endian,    determined at run-time
+    **      10     little-endian, determined at run-time
+    **  432101     big-endian,    determined at compile-time
+    **  123410     little-endian, determined at compile-time
+    */ 
+    case SQLITE_TESTCTRL_BYTEORDER: {
+      rc = SQLITE_BYTEORDER*100 + SQLITE_LITTLEENDIAN*10 + SQLITE_BIGENDIAN;
+      break;
+    }
+
     /*   sqlite3_test_control(SQLITE_TESTCTRL_RESERVE, sqlite3 *db, int N)
     **
     ** Set the nReserve size to N for the main database on the database
@@ -118029,6 +124412,34 @@ SQLITE_API int sqlite3_test_control(int op, ...){
     }
 #endif
 
+    /*   sqlite3_test_control(SQLITE_TESTCTRL_NEVER_CORRUPT, int);
+    **
+    ** Set or clear a flag that indicates that the database file is always well-
+    ** formed and never corrupt.  This flag is clear by default, indicating that
+    ** database files might have arbitrary corruption.  Setting the flag during
+    ** testing causes certain assert() statements in the code to be activated
+    ** that demonstrat invariants on well-formed database files.
+    */
+    case SQLITE_TESTCTRL_NEVER_CORRUPT: {
+      sqlite3GlobalConfig.neverCorrupt = va_arg(ap, int);
+      break;
+    }
+
+
+    /*   sqlite3_test_control(SQLITE_TESTCTRL_VDBE_COVERAGE, xCallback, ptr);
+    **
+    ** Set the VDBE coverage callback function to xCallback with context 
+    ** pointer ptr.
+    */
+    case SQLITE_TESTCTRL_VDBE_COVERAGE: {
+#ifdef SQLITE_VDBE_COVERAGE
+      typedef void (*branch_callback)(void*,int,u8,u8);
+      sqlite3GlobalConfig.xVdbeBranch = va_arg(ap,branch_callback);
+      sqlite3GlobalConfig.pVdbeBranchArg = va_arg(ap,void*);
+#endif
+      break;
+    }
+
   }
   va_end(ap);
 #endif /* SQLITE_OMIT_BUILTIN_TEST */
@@ -118113,7 +124524,7 @@ SQLITE_API const char *sqlite3_db_filename(sqlite3 *db, const char *zDbName){
 */
 SQLITE_API int sqlite3_db_readonly(sqlite3 *db, const char *zDbName){
   Btree *pBt = sqlite3DbNameToBtree(db, zDbName);
-  return pBt ? sqlite3PagerIsreadonly(sqlite3BtreePager(pBt)) : -1;
+  return pBt ? sqlite3BtreeIsReadonly(pBt) : -1;
 }
 
 /************** End of main.c ************************************************/
@@ -118776,7 +125187,7 @@ SQLITE_PRIVATE void sqlite3ConnectionClosed(sqlite3 *db){
 
 /* If not building as part of the core, include sqlite3ext.h. */
 #ifndef SQLITE_CORE
-SQLITE_API extern const sqlite3_api_routines *sqlite3_api;
+SQLITE_EXTENSION_INIT3
 #endif
 
 /************** Include fts3_tokenizer.h in the middle of fts3Int.h **********/
@@ -119062,6 +125473,18 @@ SQLITE_PRIVATE Fts3HashElem *sqlite3Fts3HashFindElem(const Fts3Hash *, const voi
 /************** End of fts3_hash.h *******************************************/
 /************** Continuing where we left off in fts3Int.h ********************/
 
+/*
+** This constant determines the maximum depth of an FTS expression tree
+** that the library will create and use. FTS uses recursion to perform 
+** various operations on the query tree, so the disadvantage of a large
+** limit is that it may allow very large queries to use large amounts
+** of stack space (perhaps causing a stack overflow).
+*/
+#ifndef SQLITE_FTS3_MAX_EXPR_DEPTH
+# define SQLITE_FTS3_MAX_EXPR_DEPTH 12
+#endif
+
+
 /*
 ** This constant controls how often segments are merged. Once there are
 ** FTS3_MERGE_COUNT segments of level N, they are merged into a single
@@ -119217,23 +125640,24 @@ struct Fts3Table {
   const char *zName;              /* virtual table name */
   int nColumn;                    /* number of named columns in virtual table */
   char **azColumn;                /* column names.  malloced */
+  u8 *abNotindexed;               /* True for 'notindexed' columns */
   sqlite3_tokenizer *pTokenizer;  /* tokenizer for inserts and queries */
   char *zContentTbl;              /* content=xxx option, or NULL */
   char *zLanguageid;              /* languageid=xxx option, or NULL */
-  u8 bAutoincrmerge;              /* True if automerge=1 */
+  int nAutoincrmerge;             /* Value configured by 'automerge' */
   u32 nLeafAdd;                   /* Number of leaf blocks added this trans */
 
   /* Precompiled statements used by the implementation. Each of these 
   ** statements is run and reset within a single virtual table API call. 
   */
-  sqlite3_stmt *aStmt[37];
+  sqlite3_stmt *aStmt[40];
 
   char *zReadExprlist;
   char *zWriteExprlist;
 
   int nNodeSize;                  /* Soft limit for node size */
   u8 bFts4;                       /* True for FTS4, false for FTS3 */
-  u8 bHasStat;                    /* True if %_stat table exists */
+  u8 bHasStat;                    /* True if %_stat table exists (2==unknown) */
   u8 bHasDocsize;                 /* True if %_docsize table exists */
   u8 bDescIdx;                    /* True if doclists are in reverse order */
   u8 bIgnoreSavepoint;            /* True to ignore xSavepoint invocations */
@@ -119277,6 +125701,12 @@ struct Fts3Table {
   int inTransaction;     /* True after xBegin but before xCommit/xRollback */
   int mxSavepoint;       /* Largest valid xSavepoint integer */
 #endif
+
+#ifdef SQLITE_TEST
+  /* True to disable the incremental doclist optimization. This is controled
+  ** by special insert command 'test-no-incr-doclist'.  */
+  int bNoIncrDoclist;
+#endif
 };
 
 /*
@@ -119302,7 +125732,8 @@ struct Fts3Cursor {
   int eEvalmode;                  /* An FTS3_EVAL_XX constant */
   int nRowAvg;                    /* Average size of database rows, in pages */
   sqlite3_int64 nDoc;             /* Documents in table */
-
+  i64 iMinDocid;                  /* Minimum docid to return */
+  i64 iMaxDocid;                  /* Maximum docid to return */
   int isMatchinfoNeeded;          /* True when aMatchinfo[] needs filling in */
   u32 *aMatchinfo;                /* Information about most recent match */
   int nMatchinfo;                 /* Number of elements in aMatchinfo[] */
@@ -119332,6 +125763,15 @@ struct Fts3Cursor {
 #define FTS3_DOCID_SEARCH    1    /* Lookup by rowid on %_content table */
 #define FTS3_FULLTEXT_SEARCH 2    /* Full-text index search */
 
+/*
+** The lower 16-bits of the sqlite3_index_info.idxNum value set by
+** the xBestIndex() method contains the Fts3Cursor.eSearch value described
+** above. The upper 16-bits contain a combination of the following
+** bits, used to describe extra constraints on full-text searches.
+*/
+#define FTS3_HAVE_LANGID    0x00010000      /* languageid=? */
+#define FTS3_HAVE_DOCID_GE  0x00020000      /* docid>=? */
+#define FTS3_HAVE_DOCID_LE  0x00040000      /* docid<=? */
 
 struct Fts3Doclist {
   char *aAll;                    /* Array containing doclist (or NULL) */
@@ -119444,7 +125884,6 @@ SQLITE_PRIVATE int sqlite3Fts3SegReaderPending(
   Fts3Table*,int,const char*,int,int,Fts3SegReader**);
 SQLITE_PRIVATE void sqlite3Fts3SegReaderFree(Fts3SegReader *);
 SQLITE_PRIVATE int sqlite3Fts3AllSegdirs(Fts3Table*, int, int, int, sqlite3_stmt **);
-SQLITE_PRIVATE int sqlite3Fts3ReadLock(Fts3Table *);
 SQLITE_PRIVATE int sqlite3Fts3ReadBlock(Fts3Table*, sqlite3_int64, char **, int*, int*);
 
 SQLITE_PRIVATE int sqlite3Fts3SelectDoctotal(Fts3Table *, sqlite3_stmt **);
@@ -119519,6 +125958,10 @@ struct Fts3MultiSegReader {
 
 SQLITE_PRIVATE int sqlite3Fts3Incrmerge(Fts3Table*,int,int);
 
+#define fts3GetVarint32(p, piVal) (                                           \
+  (*(u8*)(p)&0x80) ? sqlite3Fts3GetVarint32(p, piVal) : (*piVal=*(u8*)(p), 1) \
+)
+
 /* fts3.c */
 SQLITE_PRIVATE int sqlite3Fts3PutVarint(char *, sqlite3_int64);
 SQLITE_PRIVATE int sqlite3Fts3GetVarint(const char *, sqlite_int64 *);
@@ -119626,21 +126069,37 @@ SQLITE_PRIVATE int sqlite3Fts3PutVarint(char *p, sqlite_int64 v){
   return (int) (q - (unsigned char *)p);
 }
 
+#define GETVARINT_STEP(v, ptr, shift, mask1, mask2, var, ret) \
+  v = (v & mask1) | ( (*ptr++) << shift );                    \
+  if( (v & mask2)==0 ){ var = v; return ret; }
+#define GETVARINT_INIT(v, ptr, shift, mask1, mask2, var, ret) \
+  v = (*ptr++);                                               \
+  if( (v & mask2)==0 ){ var = v; return ret; }
+
 /* 
 ** Read a 64-bit variable-length integer from memory starting at p[0].
 ** Return the number of bytes read, or 0 on error.
 ** The value is stored in *v.
 */
 SQLITE_PRIVATE int sqlite3Fts3GetVarint(const char *p, sqlite_int64 *v){
-  const unsigned char *q = (const unsigned char *) p;
-  sqlite_uint64 x = 0, y = 1;
-  while( (*q&0x80)==0x80 && q-(unsigned char *)p<FTS3_VARINT_MAX ){
-    x += y * (*q++ & 0x7f);
-    y <<= 7;
+  const char *pStart = p;
+  u32 a;
+  u64 b;
+  int shift;
+
+  GETVARINT_INIT(a, p, 0,  0x00,     0x80, *v, 1);
+  GETVARINT_STEP(a, p, 7,  0x7F,     0x4000, *v, 2);
+  GETVARINT_STEP(a, p, 14, 0x3FFF,   0x200000, *v, 3);
+  GETVARINT_STEP(a, p, 21, 0x1FFFFF, 0x10000000, *v, 4);
+  b = (a & 0x0FFFFFFF );
+
+  for(shift=28; shift<=63; shift+=7){
+    u64 c = *p++;
+    b += (c&0x7F) << shift;
+    if( (c & 0x80)==0 ) break;
   }
-  x += y * (*q++);
-  *v = (sqlite_int64) x;
-  return (int) (q - (unsigned char *)p);
+  *v = b;
+  return (int)(p - pStart);
 }
 
 /*
@@ -119648,10 +126107,21 @@ SQLITE_PRIVATE int sqlite3Fts3GetVarint(const char *p, sqlite_int64 *v){
 ** 32-bit integer before it is returned.
 */
 SQLITE_PRIVATE int sqlite3Fts3GetVarint32(const char *p, int *pi){
- sqlite_int64 i;
- int ret = sqlite3Fts3GetVarint(p, &i);
- *pi = (int) i;
- return ret;
+  u32 a;
+
+#ifndef fts3GetVarint32
+  GETVARINT_INIT(a, p, 0,  0x00,     0x80, *pi, 1);
+#else
+  a = (*p++);
+  assert( a & 0x80 );
+#endif
+
+  GETVARINT_STEP(a, p, 7,  0x7F,     0x4000, *pi, 2);
+  GETVARINT_STEP(a, p, 14, 0x3FFF,   0x200000, *pi, 3);
+  GETVARINT_STEP(a, p, 21, 0x1FFFFF, 0x10000000, *pi, 4);
+  a = (a & 0x0FFFFFFF );
+  *pi = (int)(a | ((u32)(*p & 0x0F) << 28));
+  return 5;
 }
 
 /*
@@ -120377,6 +126847,8 @@ static int fts3InitVtab(
   char *zUncompress = 0;          /* uncompress=? parameter (or NULL) */
   char *zContent = 0;             /* content=? parameter (or NULL) */
   char *zLanguageid = 0;          /* languageid=? parameter (or NULL) */
+  char **azNotindexed = 0;        /* The set of notindexed= columns */
+  int nNotindexed = 0;            /* Size of azNotindexed[] array */
 
   assert( strlen(argv[0])==4 );
   assert( (sqlite3_strnicmp(argv[0], "fts4", 4)==0 && isFts4)
@@ -120386,9 +126858,19 @@ static int fts3InitVtab(
   nDb = (int)strlen(argv[1]) + 1;
   nName = (int)strlen(argv[2]) + 1;
 
-  aCol = (const char **)sqlite3_malloc(sizeof(const char *) * (argc-2) );
-  if( !aCol ) return SQLITE_NOMEM;
-  memset((void *)aCol, 0, sizeof(const char *) * (argc-2));
+  nByte = sizeof(const char *) * (argc-2);
+  aCol = (const char **)sqlite3_malloc(nByte);
+  if( aCol ){
+    memset((void*)aCol, 0, nByte);
+    azNotindexed = (char **)sqlite3_malloc(nByte);
+  }
+  if( azNotindexed ){
+    memset(azNotindexed, 0, nByte);
+  }
+  if( !aCol || !azNotindexed ){
+    rc = SQLITE_NOMEM;
+    goto fts3_init_out;
+  }
 
   /* Loop through all of the arguments passed by the user to the FTS3/4
   ** module (i.e. all the column names and special arguments). This loop
@@ -120427,7 +126909,8 @@ static int fts3InitVtab(
         { "uncompress", 10 },     /* 3 -> UNCOMPRESS */
         { "order",       5 },     /* 4 -> ORDER */
         { "content",     7 },     /* 5 -> CONTENT */
-        { "languageid", 10 }      /* 6 -> LANGUAGEID */
+        { "languageid", 10 },     /* 6 -> LANGUAGEID */
+        { "notindexed", 10 }      /* 7 -> NOTINDEXED */
       };
 
       int iOpt;
@@ -120493,6 +126976,11 @@ static int fts3InitVtab(
               zLanguageid = zVal;
               zVal = 0;
               break;
+
+            case 7:              /* NOTINDEXED */
+              azNotindexed[nNotindexed++] = zVal;
+              zVal = 0;
+              break;
           }
         }
         sqlite3_free(zVal);
@@ -120564,6 +127052,7 @@ static int fts3InitVtab(
   nByte = sizeof(Fts3Table) +                  /* Fts3Table */
           nCol * sizeof(char *) +              /* azColumn */
           nIndex * sizeof(struct Fts3Index) +  /* aIndex */
+          nCol * sizeof(u8) +                  /* abNotindexed */
           nName +                              /* zName */
           nDb +                                /* zDb */
           nString;                             /* Space for azColumn strings */
@@ -120583,7 +127072,7 @@ static int fts3InitVtab(
   p->bHasStat = isFts4;
   p->bFts4 = isFts4;
   p->bDescIdx = bDescIdx;
-  p->bAutoincrmerge = 0xff;   /* 0xff means setting unknown */
+  p->nAutoincrmerge = 0xff;   /* 0xff means setting unknown */
   p->zContentTbl = zContent;
   p->zLanguageid = zLanguageid;
   zContent = 0;
@@ -120597,9 +127086,10 @@ static int fts3InitVtab(
   for(i=0; i<nIndex; i++){
     fts3HashInit(&p->aIndex[i].hPending, FTS3_HASH_STRING, 1);
   }
+  p->abNotindexed = (u8 *)&p->aIndex[nIndex];
 
   /* Fill in the zName and zDb fields of the vtab structure. */
-  zCsr = (char *)&p->aIndex[nIndex];
+  zCsr = (char *)&p->abNotindexed[nCol];
   p->zName = zCsr;
   memcpy(zCsr, argv[2], nName);
   zCsr += nName;
@@ -120620,7 +127110,28 @@ static int fts3InitVtab(
     assert( zCsr <= &((char *)p)[nByte] );
   }
 
-  if( (zCompress==0)!=(zUncompress==0) ){
+  /* Fill in the abNotindexed array */
+  for(iCol=0; iCol<nCol; iCol++){
+    int n = (int)strlen(p->azColumn[iCol]);
+    for(i=0; i<nNotindexed; i++){
+      char *zNot = azNotindexed[i];
+      if( zNot && n==(int)strlen(zNot)
+       && 0==sqlite3_strnicmp(p->azColumn[iCol], zNot, n) 
+      ){
+        p->abNotindexed[iCol] = 1;
+        sqlite3_free(zNot);
+        azNotindexed[i] = 0;
+      }
+    }
+  }
+  for(i=0; i<nNotindexed; i++){
+    if( azNotindexed[i] ){
+      *pzErr = sqlite3_mprintf("no such column: %s", azNotindexed[i]);
+      rc = SQLITE_ERROR;
+    }
+  }
+
+  if( rc==SQLITE_OK && (zCompress==0)!=(zUncompress==0) ){
     char const *zMiss = (zCompress==0 ? "compress" : "uncompress");
     rc = SQLITE_ERROR;
     *pzErr = sqlite3_mprintf("missing %s parameter in fts4 constructor", zMiss);
@@ -120640,10 +127151,7 @@ static int fts3InitVtab(
   ** addition of a %_stat table so that it can use incremental merge.
   */
   if( !isFts4 && !isCreate ){
-    int rc2 = SQLITE_OK;
-    fts3DbExec(&rc2, db, "SELECT 1 FROM %Q.'%q_stat' WHERE id=2",
-               p->zDb, p->zName);
-    if( rc2==SQLITE_OK ) p->bHasStat = 1;
+    p->bHasStat = 2;
   }
 
   /* Figure out the page-size for the database. This is required in order to
@@ -120661,7 +127169,9 @@ static int fts3InitVtab(
   sqlite3_free(zUncompress);
   sqlite3_free(zContent);
   sqlite3_free(zLanguageid);
+  for(i=0; i<nNotindexed; i++) sqlite3_free(azNotindexed[i]);
   sqlite3_free((void *)aCol);
+  sqlite3_free((void *)azNotindexed);
   if( rc!=SQLITE_OK ){
     if( p ){
       fts3DisconnectMethod((sqlite3_vtab *)p);
@@ -120700,6 +127210,19 @@ static int fts3CreateMethod(
   return fts3InitVtab(1, db, pAux, argc, argv, ppVtab, pzErr);
 }
 
+/*
+** Set the pIdxInfo->estimatedRows variable to nRow. Unless this
+** extension is currently being used by a version of SQLite too old to
+** support estimatedRows. In that case this function is a no-op.
+*/
+static void fts3SetEstimatedRows(sqlite3_index_info *pIdxInfo, i64 nRow){
+#if SQLITE_VERSION_NUMBER>=3008002
+  if( sqlite3_libversion_number()>=3008002 ){
+    pIdxInfo->estimatedRows = nRow;
+  }
+#endif
+}
+
 /* 
 ** Implementation of the xBestIndex method for FTS3 tables. There
 ** are three possible strategies, in order of preference:
@@ -120712,23 +127235,40 @@ static int fts3BestIndexMethod(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
   Fts3Table *p = (Fts3Table *)pVTab;
   int i;                          /* Iterator variable */
   int iCons = -1;                 /* Index of constraint to use */
+
   int iLangidCons = -1;           /* Index of langid=x constraint, if present */
+  int iDocidGe = -1;              /* Index of docid>=x constraint, if present */
+  int iDocidLe = -1;              /* Index of docid<=x constraint, if present */
+  int iIdx;
 
   /* By default use a full table scan. This is an expensive option,
   ** so search through the constraints to see if a more efficient 
   ** strategy is possible.
   */
   pInfo->idxNum = FTS3_FULLSCAN_SEARCH;
-  pInfo->estimatedCost = 500000;
+  pInfo->estimatedCost = 5000000;
   for(i=0; i<pInfo->nConstraint; i++){
+    int bDocid;                 /* True if this constraint is on docid */
     struct sqlite3_index_constraint *pCons = &pInfo->aConstraint[i];
-    if( pCons->usable==0 ) continue;
+    if( pCons->usable==0 ){
+      if( pCons->op==SQLITE_INDEX_CONSTRAINT_MATCH ){
+        /* There exists an unusable MATCH constraint. This means that if
+        ** the planner does elect to use the results of this call as part
+        ** of the overall query plan the user will see an "unable to use
+        ** function MATCH in the requested context" error. To discourage
+        ** this, return a very high cost here.  */
+        pInfo->idxNum = FTS3_FULLSCAN_SEARCH;
+        pInfo->estimatedCost = 1e50;
+        fts3SetEstimatedRows(pInfo, ((sqlite3_int64)1) << 50);
+        return SQLITE_OK;
+      }
+      continue;
+    }
+
+    bDocid = (pCons->iColumn<0 || pCons->iColumn==p->nColumn+1);
 
     /* A direct lookup on the rowid or docid column. Assign a cost of 1.0. */
-    if( iCons<0 
-     && pCons->op==SQLITE_INDEX_CONSTRAINT_EQ 
-     && (pCons->iColumn<0 || pCons->iColumn==p->nColumn+1 )
-    ){
+    if( iCons<0 && pCons->op==SQLITE_INDEX_CONSTRAINT_EQ && bDocid ){
       pInfo->idxNum = FTS3_DOCID_SEARCH;
       pInfo->estimatedCost = 1.0;
       iCons = i;
@@ -120757,14 +127297,38 @@ static int fts3BestIndexMethod(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
     ){
       iLangidCons = i;
     }
+
+    if( bDocid ){
+      switch( pCons->op ){
+        case SQLITE_INDEX_CONSTRAINT_GE:
+        case SQLITE_INDEX_CONSTRAINT_GT:
+          iDocidGe = i;
+          break;
+
+        case SQLITE_INDEX_CONSTRAINT_LE:
+        case SQLITE_INDEX_CONSTRAINT_LT:
+          iDocidLe = i;
+          break;
+      }
+    }
   }
 
+  iIdx = 1;
   if( iCons>=0 ){
-    pInfo->aConstraintUsage[iCons].argvIndex = 1;
+    pInfo->aConstraintUsage[iCons].argvIndex = iIdx++;
     pInfo->aConstraintUsage[iCons].omit = 1;
   } 
   if( iLangidCons>=0 ){
-    pInfo->aConstraintUsage[iLangidCons].argvIndex = 2;
+    pInfo->idxNum |= FTS3_HAVE_LANGID;
+    pInfo->aConstraintUsage[iLangidCons].argvIndex = iIdx++;
+  } 
+  if( iDocidGe>=0 ){
+    pInfo->idxNum |= FTS3_HAVE_DOCID_GE;
+    pInfo->aConstraintUsage[iDocidGe].argvIndex = iIdx++;
+  } 
+  if( iDocidLe>=0 ){
+    pInfo->idxNum |= FTS3_HAVE_DOCID_LE;
+    pInfo->aConstraintUsage[iDocidLe].argvIndex = iIdx++;
   } 
 
   /* Regardless of the strategy selected, FTS can deliver rows in rowid (or
@@ -120942,10 +127506,10 @@ static int fts3ScanInteriorNode(
     /* Load the next term on the node into zBuffer. Use realloc() to expand
     ** the size of zBuffer if required.  */
     if( !isFirstTerm ){
-      zCsr += sqlite3Fts3GetVarint32(zCsr, &nPrefix);
+      zCsr += fts3GetVarint32(zCsr, &nPrefix);
     }
     isFirstTerm = 0;
-    zCsr += sqlite3Fts3GetVarint32(zCsr, &nSuffix);
+    zCsr += fts3GetVarint32(zCsr, &nSuffix);
     
     if( nPrefix<0 || nSuffix<0 || &zCsr[nSuffix]>zEnd ){
       rc = FTS_CORRUPT_VTAB;
@@ -121033,7 +127597,7 @@ static int fts3SelectLeaf(
 
   assert( piLeaf || piLeaf2 );
 
-  sqlite3Fts3GetVarint32(zNode, &iHeight);
+  fts3GetVarint32(zNode, &iHeight);
   rc = fts3ScanInteriorNode(zTerm, nTerm, zNode, nNode, piLeaf, piLeaf2);
   assert( !piLeaf2 || !piLeaf || rc!=SQLITE_OK || (*piLeaf<=*piLeaf2) );
 
@@ -121235,11 +127799,11 @@ static void fts3PoslistMerge(
     int iCol1;         /* The current column index in pp1 */
     int iCol2;         /* The current column index in pp2 */
 
-    if( *p1==POS_COLUMN ) sqlite3Fts3GetVarint32(&p1[1], &iCol1);
+    if( *p1==POS_COLUMN ) fts3GetVarint32(&p1[1], &iCol1);
     else if( *p1==POS_END ) iCol1 = POSITION_LIST_END;
     else iCol1 = 0;
 
-    if( *p2==POS_COLUMN ) sqlite3Fts3GetVarint32(&p2[1], &iCol2);
+    if( *p2==POS_COLUMN ) fts3GetVarint32(&p2[1], &iCol2);
     else if( *p2==POS_END ) iCol2 = POSITION_LIST_END;
     else iCol2 = 0;
 
@@ -121332,11 +127896,11 @@ static int fts3PoslistPhraseMerge(
   assert( p!=0 && *p1!=0 && *p2!=0 );
   if( *p1==POS_COLUMN ){ 
     p1++;
-    p1 += sqlite3Fts3GetVarint32(p1, &iCol1);
+    p1 += fts3GetVarint32(p1, &iCol1);
   }
   if( *p2==POS_COLUMN ){ 
     p2++;
-    p2 += sqlite3Fts3GetVarint32(p2, &iCol2);
+    p2 += fts3GetVarint32(p2, &iCol2);
   }
 
   while( 1 ){
@@ -121386,9 +127950,9 @@ static int fts3PoslistPhraseMerge(
       if( 0==*p1 || 0==*p2 ) break;
 
       p1++;
-      p1 += sqlite3Fts3GetVarint32(p1, &iCol1);
+      p1 += fts3GetVarint32(p1, &iCol1);
       p2++;
-      p2 += sqlite3Fts3GetVarint32(p2, &iCol2);
+      p2 += fts3GetVarint32(p2, &iCol2);
     }
 
     /* Advance pointer p1 or p2 (whichever corresponds to the smaller of
@@ -121400,12 +127964,12 @@ static int fts3PoslistPhraseMerge(
       fts3ColumnlistCopy(0, &p1);
       if( 0==*p1 ) break;
       p1++;
-      p1 += sqlite3Fts3GetVarint32(p1, &iCol1);
+      p1 += fts3GetVarint32(p1, &iCol1);
     }else{
       fts3ColumnlistCopy(0, &p2);
       if( 0==*p2 ) break;
       p2++;
-      p2 += sqlite3Fts3GetVarint32(p2, &iCol2);
+      p2 += fts3GetVarint32(p2, &iCol2);
     }
   }
 
@@ -122211,6 +128775,33 @@ static int fts3NextMethod(sqlite3_vtab_cursor *pCursor){
   return rc;
 }
 
+/*
+** The following are copied from sqliteInt.h.
+**
+** Constants for the largest and smallest possible 64-bit signed integers.
+** These macros are designed to work correctly on both 32-bit and 64-bit
+** compilers.
+*/
+#ifndef SQLITE_AMALGAMATION
+# define LARGEST_INT64  (0xffffffff|(((sqlite3_int64)0x7fffffff)<<32))
+# define SMALLEST_INT64 (((sqlite3_int64)-1) - LARGEST_INT64)
+#endif
+
+/*
+** If the numeric type of argument pVal is "integer", then return it
+** converted to a 64-bit signed integer. Otherwise, return a copy of
+** the second parameter, iDefault.
+*/
+static sqlite3_int64 fts3DocidRange(sqlite3_value *pVal, i64 iDefault){
+  if( pVal ){
+    int eType = sqlite3_value_numeric_type(pVal);
+    if( eType==SQLITE_INTEGER ){
+      return sqlite3_value_int64(pVal);
+    }
+  }
+  return iDefault;
+}
+
 /*
 ** This is the xFilter interface for the virtual table.  See
 ** the virtual table xFilter method documentation for additional
@@ -122236,40 +128827,58 @@ static int fts3FilterMethod(
 ){
   int rc;
   char *zSql;                     /* SQL statement used to access %_content */
+  int eSearch;
   Fts3Table *p = (Fts3Table *)pCursor->pVtab;
   Fts3Cursor *pCsr = (Fts3Cursor *)pCursor;
 
+  sqlite3_value *pCons = 0;       /* The MATCH or rowid constraint, if any */
+  sqlite3_value *pLangid = 0;     /* The "langid = ?" constraint, if any */
+  sqlite3_value *pDocidGe = 0;    /* The "docid >= ?" constraint, if any */
+  sqlite3_value *pDocidLe = 0;    /* The "docid <= ?" constraint, if any */
+  int iIdx;
+
   UNUSED_PARAMETER(idxStr);
   UNUSED_PARAMETER(nVal);
 
-  assert( idxNum>=0 && idxNum<=(FTS3_FULLTEXT_SEARCH+p->nColumn) );
-  assert( nVal==0 || nVal==1 || nVal==2 );
-  assert( (nVal==0)==(idxNum==FTS3_FULLSCAN_SEARCH) );
+  eSearch = (idxNum & 0x0000FFFF);
+  assert( eSearch>=0 && eSearch<=(FTS3_FULLTEXT_SEARCH+p->nColumn) );
   assert( p->pSegments==0 );
 
+  /* Collect arguments into local variables */
+  iIdx = 0;
+  if( eSearch!=FTS3_FULLSCAN_SEARCH ) pCons = apVal[iIdx++];
+  if( idxNum & FTS3_HAVE_LANGID ) pLangid = apVal[iIdx++];
+  if( idxNum & FTS3_HAVE_DOCID_GE ) pDocidGe = apVal[iIdx++];
+  if( idxNum & FTS3_HAVE_DOCID_LE ) pDocidLe = apVal[iIdx++];
+  assert( iIdx==nVal );
+
   /* In case the cursor has been used before, clear it now. */
   sqlite3_finalize(pCsr->pStmt);
   sqlite3_free(pCsr->aDoclist);
   sqlite3Fts3ExprFree(pCsr->pExpr);
   memset(&pCursor[1], 0, sizeof(Fts3Cursor)-sizeof(sqlite3_vtab_cursor));
 
+  /* Set the lower and upper bounds on docids to return */
+  pCsr->iMinDocid = fts3DocidRange(pDocidGe, SMALLEST_INT64);
+  pCsr->iMaxDocid = fts3DocidRange(pDocidLe, LARGEST_INT64);
+
   if( idxStr ){
     pCsr->bDesc = (idxStr[0]=='D');
   }else{
     pCsr->bDesc = p->bDescIdx;
   }
-  pCsr->eSearch = (i16)idxNum;
+  pCsr->eSearch = (i16)eSearch;
 
-  if( idxNum!=FTS3_DOCID_SEARCH && idxNum!=FTS3_FULLSCAN_SEARCH ){
-    int iCol = idxNum-FTS3_FULLTEXT_SEARCH;
-    const char *zQuery = (const char *)sqlite3_value_text(apVal[0]);
+  if( eSearch!=FTS3_DOCID_SEARCH && eSearch!=FTS3_FULLSCAN_SEARCH ){
+    int iCol = eSearch-FTS3_FULLTEXT_SEARCH;
+    const char *zQuery = (const char *)sqlite3_value_text(pCons);
 
-    if( zQuery==0 && sqlite3_value_type(apVal[0])!=SQLITE_NULL ){
+    if( zQuery==0 && sqlite3_value_type(pCons)!=SQLITE_NULL ){
       return SQLITE_NOMEM;
     }
 
     pCsr->iLangid = 0;
-    if( nVal==2 ) pCsr->iLangid = sqlite3_value_int(apVal[1]);
+    if( pLangid ) pCsr->iLangid = sqlite3_value_int(pLangid);
 
     assert( p->base.zErrMsg==0 );
     rc = sqlite3Fts3ExprParse(p->pTokenizer, pCsr->iLangid,
@@ -122280,11 +128889,7 @@ static int fts3FilterMethod(
       return rc;
     }
 
-    rc = sqlite3Fts3ReadLock(p);
-    if( rc!=SQLITE_OK ) return rc;
-
     rc = fts3EvalStart(pCsr);
-
     sqlite3Fts3SegmentsClose(p);
     if( rc!=SQLITE_OK ) return rc;
     pCsr->pNextId = pCsr->aDoclist;
@@ -122296,7 +128901,7 @@ static int fts3FilterMethod(
   ** full-text query or docid lookup, the statement retrieves a single
   ** row by docid.
   */
-  if( idxNum==FTS3_FULLSCAN_SEARCH ){
+  if( eSearch==FTS3_FULLSCAN_SEARCH ){
     zSql = sqlite3_mprintf(
         "SELECT %s ORDER BY rowid %s",
         p->zReadExprlist, (pCsr->bDesc ? "DESC" : "ASC")
@@ -122307,10 +128912,10 @@ static int fts3FilterMethod(
     }else{
       rc = SQLITE_NOMEM;
     }
-  }else if( idxNum==FTS3_DOCID_SEARCH ){
+  }else if( eSearch==FTS3_DOCID_SEARCH ){
     rc = fts3CursorSeekStmt(pCsr, &pCsr->pStmt);
     if( rc==SQLITE_OK ){
-      rc = sqlite3_bind_value(pCsr->pStmt, 1, apVal[0]);
+      rc = sqlite3_bind_value(pCsr->pStmt, 1, pCons);
     }
   }
   if( rc!=SQLITE_OK ) return rc;
@@ -122438,7 +129043,10 @@ static int fts3SyncMethod(sqlite3_vtab *pVtab){
   Fts3Table *p = (Fts3Table*)pVtab;
   int rc = sqlite3Fts3PendingTermsFlush(p);
 
-  if( rc==SQLITE_OK && p->bAutoincrmerge==1 && p->nLeafAdd>(nMinMerge/16) ){
+  if( rc==SQLITE_OK 
+   && p->nLeafAdd>(nMinMerge/16) 
+   && p->nAutoincrmerge && p->nAutoincrmerge!=0xff
+  ){
     int mxLevel = 0;              /* Maximum relative level value in db */
     int A;                        /* Incr-merge parameter A */
 
@@ -122446,14 +129054,41 @@ static int fts3SyncMethod(sqlite3_vtab *pVtab){
     assert( rc==SQLITE_OK || mxLevel==0 );
     A = p->nLeafAdd * mxLevel;
     A += (A/2);
-    if( A>(int)nMinMerge ) rc = sqlite3Fts3Incrmerge(p, A, 8);
+    if( A>(int)nMinMerge ) rc = sqlite3Fts3Incrmerge(p, A, p->nAutoincrmerge);
   }
   sqlite3Fts3SegmentsClose(p);
   return rc;
 }
 
 /*
-** Implementation of xBegin() method. This is a no-op.
+** If it is currently unknown whether or not the FTS table has an %_stat
+** table (if p->bHasStat==2), attempt to determine this (set p->bHasStat
+** to 0 or 1). Return SQLITE_OK if successful, or an SQLite error code
+** if an error occurs.
+*/
+static int fts3SetHasStat(Fts3Table *p){
+  int rc = SQLITE_OK;
+  if( p->bHasStat==2 ){
+    const char *zFmt ="SELECT 1 FROM %Q.sqlite_master WHERE tbl_name='%q_stat'";
+    char *zSql = sqlite3_mprintf(zFmt, p->zDb, p->zName);
+    if( zSql ){
+      sqlite3_stmt *pStmt = 0;
+      rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
+      if( rc==SQLITE_OK ){
+        int bHasStat = (sqlite3_step(pStmt)==SQLITE_ROW);
+        rc = sqlite3_finalize(pStmt);
+        if( rc==SQLITE_OK ) p->bHasStat = bHasStat;
+      }
+      sqlite3_free(zSql);
+    }else{
+      rc = SQLITE_NOMEM;
+    }
+  }
+  return rc;
+}
+
+/*
+** Implementation of xBegin() method. 
 */
 static int fts3BeginMethod(sqlite3_vtab *pVtab){
   Fts3Table *p = (Fts3Table*)pVtab;
@@ -122464,7 +129099,7 @@ static int fts3BeginMethod(sqlite3_vtab *pVtab){
   TESTONLY( p->inTransaction = 1 );
   TESTONLY( p->mxSavepoint = -1; );
   p->nLeafAdd = 0;
-  return SQLITE_OK;
+  return fts3SetHasStat(p);
 }
 
 /*
@@ -122713,6 +129348,10 @@ static int fts3RenameMethod(
   sqlite3 *db = p->db;            /* Database connection */
   int rc;                         /* Return Code */
 
+  /* At this point it must be known if the %_stat table exists or not.
+  ** So bHasStat may not be 2.  */
+  rc = fts3SetHasStat(p);
+  
   /* As it happens, the pending terms table is always empty here. This is
   ** because an "ALTER TABLE RENAME TABLE" statement inside a transaction 
   ** always opens a savepoint transaction. And the xSavepoint() method 
@@ -122720,7 +129359,9 @@ static int fts3RenameMethod(
   ** PendingTermsFlush() in in case that changes.
   */
   assert( p->nPendingData==0 );
-  rc = sqlite3Fts3PendingTermsFlush(p);
+  if( rc==SQLITE_OK ){
+    rc = sqlite3Fts3PendingTermsFlush(p);
+  }
 
   if( p->zContentTbl==0 ){
     fts3DbExec(&rc, db,
@@ -123201,6 +129842,12 @@ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Phrase *pPhrase){
   return SQLITE_OK;
 }
 
+/*
+** Maximum number of tokens a phrase may have to be considered for the
+** incremental doclists strategy.
+*/
+#define MAX_INCR_PHRASE_TOKENS 4
+
 /*
 ** This function is called for each Fts3Phrase in a full-text query 
 ** expression to initialize the mechanism for returning rows. Once this
@@ -123214,23 +129861,43 @@ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Phrase *pPhrase){
 ** SQLITE_OK is returned if no error occurs, otherwise an SQLite error code.
 */
 static int fts3EvalPhraseStart(Fts3Cursor *pCsr, int bOptOk, Fts3Phrase *p){
-  int rc;                         /* Error code */
-  Fts3PhraseToken *pFirst = &p->aToken[0];
   Fts3Table *pTab = (Fts3Table *)pCsr->base.pVtab;
+  int rc = SQLITE_OK;             /* Error code */
+  int i;
 
-  if( pCsr->bDesc==pTab->bDescIdx 
-   && bOptOk==1 
-   && p->nToken==1 
-   && pFirst->pSegcsr 
-   && pFirst->pSegcsr->bLookup 
-   && pFirst->bFirst==0
-  ){
+  /* Determine if doclists may be loaded from disk incrementally. This is
+  ** possible if the bOptOk argument is true, the FTS doclists will be
+  ** scanned in forward order, and the phrase consists of 
+  ** MAX_INCR_PHRASE_TOKENS or fewer tokens, none of which are are "^first"
+  ** tokens or prefix tokens that cannot use a prefix-index.  */
+  int bHaveIncr = 0;
+  int bIncrOk = (bOptOk 
+   && pCsr->bDesc==pTab->bDescIdx 
+   && p->nToken<=MAX_INCR_PHRASE_TOKENS && p->nToken>0
+   && p->nToken<=MAX_INCR_PHRASE_TOKENS && p->nToken>0
+#ifdef SQLITE_TEST
+   && pTab->bNoIncrDoclist==0
+#endif
+  );
+  for(i=0; bIncrOk==1 && i<p->nToken; i++){
+    Fts3PhraseToken *pToken = &p->aToken[i];
+    if( pToken->bFirst || (pToken->pSegcsr!=0 && !pToken->pSegcsr->bLookup) ){
+      bIncrOk = 0;
+    }
+    if( pToken->pSegcsr ) bHaveIncr = 1;
+  }
+
+  if( bIncrOk && bHaveIncr ){
     /* Use the incremental approach. */
     int iCol = (p->iColumn >= pTab->nColumn ? -1 : p->iColumn);
-    rc = sqlite3Fts3MsrIncrStart(
-        pTab, pFirst->pSegcsr, iCol, pFirst->z, pFirst->n);
+    for(i=0; rc==SQLITE_OK && i<p->nToken; i++){
+      Fts3PhraseToken *pToken = &p->aToken[i];
+      Fts3MultiSegReader *pSegcsr = pToken->pSegcsr;
+      if( pSegcsr ){
+        rc = sqlite3Fts3MsrIncrStart(pTab, pSegcsr, iCol, pToken->z, pToken->n);
+      }
+    }
     p->bIncr = 1;
-
   }else{
     /* Load the full doclist for the phrase into memory. */
     rc = fts3EvalPhraseLoad(pCsr, p);
@@ -123339,6 +130006,216 @@ SQLITE_PRIVATE void sqlite3Fts3DoclistNext(
   *ppIter = p;
 }
 
+/*
+** Advance the iterator pDL to the next entry in pDL->aAll/nAll. Set *pbEof
+** to true if EOF is reached.
+*/
+static void fts3EvalDlPhraseNext(
+  Fts3Table *pTab,
+  Fts3Doclist *pDL,
+  u8 *pbEof
+){
+  char *pIter;                            /* Used to iterate through aAll */
+  char *pEnd = &pDL->aAll[pDL->nAll];     /* 1 byte past end of aAll */
+ 
+  if( pDL->pNextDocid ){
+    pIter = pDL->pNextDocid;
+  }else{
+    pIter = pDL->aAll;
+  }
+
+  if( pIter>=pEnd ){
+    /* We have already reached the end of this doclist. EOF. */
+    *pbEof = 1;
+  }else{
+    sqlite3_int64 iDelta;
+    pIter += sqlite3Fts3GetVarint(pIter, &iDelta);
+    if( pTab->bDescIdx==0 || pDL->pNextDocid==0 ){
+      pDL->iDocid += iDelta;
+    }else{
+      pDL->iDocid -= iDelta;
+    }
+    pDL->pList = pIter;
+    fts3PoslistCopy(0, &pIter);
+    pDL->nList = (int)(pIter - pDL->pList);
+
+    /* pIter now points just past the 0x00 that terminates the position-
+    ** list for document pDL->iDocid. However, if this position-list was
+    ** edited in place by fts3EvalNearTrim(), then pIter may not actually
+    ** point to the start of the next docid value. The following line deals
+    ** with this case by advancing pIter past the zero-padding added by
+    ** fts3EvalNearTrim().  */
+    while( pIter<pEnd && *pIter==0 ) pIter++;
+
+    pDL->pNextDocid = pIter;
+    assert( pIter>=&pDL->aAll[pDL->nAll] || *pIter );
+    *pbEof = 0;
+  }
+}
+
+/*
+** Helper type used by fts3EvalIncrPhraseNext() and incrPhraseTokenNext().
+*/
+typedef struct TokenDoclist TokenDoclist;
+struct TokenDoclist {
+  int bIgnore;
+  sqlite3_int64 iDocid;
+  char *pList;
+  int nList;
+};
+
+/*
+** Token pToken is an incrementally loaded token that is part of a 
+** multi-token phrase. Advance it to the next matching document in the
+** database and populate output variable *p with the details of the new
+** entry. Or, if the iterator has reached EOF, set *pbEof to true.
+**
+** If an error occurs, return an SQLite error code. Otherwise, return 
+** SQLITE_OK.
+*/
+static int incrPhraseTokenNext(
+  Fts3Table *pTab,                /* Virtual table handle */
+  Fts3Phrase *pPhrase,            /* Phrase to advance token of */
+  int iToken,                     /* Specific token to advance */
+  TokenDoclist *p,                /* OUT: Docid and doclist for new entry */
+  u8 *pbEof                       /* OUT: True if iterator is at EOF */
+){
+  int rc = SQLITE_OK;
+
+  if( pPhrase->iDoclistToken==iToken ){
+    assert( p->bIgnore==0 );
+    assert( pPhrase->aToken[iToken].pSegcsr==0 );
+    fts3EvalDlPhraseNext(pTab, &pPhrase->doclist, pbEof);
+    p->pList = pPhrase->doclist.pList;
+    p->nList = pPhrase->doclist.nList;
+    p->iDocid = pPhrase->doclist.iDocid;
+  }else{
+    Fts3PhraseToken *pToken = &pPhrase->aToken[iToken];
+    assert( pToken->pDeferred==0 );
+    assert( pToken->pSegcsr || pPhrase->iDoclistToken>=0 );
+    if( pToken->pSegcsr ){
+      assert( p->bIgnore==0 );
+      rc = sqlite3Fts3MsrIncrNext(
+          pTab, pToken->pSegcsr, &p->iDocid, &p->pList, &p->nList
+      );
+      if( p->pList==0 ) *pbEof = 1;
+    }else{
+      p->bIgnore = 1;
+    }
+  }
+
+  return rc;
+}
+
+
+/*
+** The phrase iterator passed as the second argument:
+**
+**   * features at least one token that uses an incremental doclist, and 
+**
+**   * does not contain any deferred tokens.
+**
+** Advance it to the next matching documnent in the database and populate
+** the Fts3Doclist.pList and nList fields. 
+**
+** If there is no "next" entry and no error occurs, then *pbEof is set to
+** 1 before returning. Otherwise, if no error occurs and the iterator is
+** successfully advanced, *pbEof is set to 0.
+**
+** If an error occurs, return an SQLite error code. Otherwise, return 
+** SQLITE_OK.
+*/
+static int fts3EvalIncrPhraseNext(
+  Fts3Cursor *pCsr,               /* FTS Cursor handle */
+  Fts3Phrase *p,                  /* Phrase object to advance to next docid */
+  u8 *pbEof                       /* OUT: Set to 1 if EOF */
+){
+  int rc = SQLITE_OK;
+  Fts3Doclist *pDL = &p->doclist;
+  Fts3Table *pTab = (Fts3Table *)pCsr->base.pVtab;
+  u8 bEof = 0;
+
+  /* This is only called if it is guaranteed that the phrase has at least
+  ** one incremental token. In which case the bIncr flag is set. */
+  assert( p->bIncr==1 );
+
+  if( p->nToken==1 && p->bIncr ){
+    rc = sqlite3Fts3MsrIncrNext(pTab, p->aToken[0].pSegcsr, 
+        &pDL->iDocid, &pDL->pList, &pDL->nList
+    );
+    if( pDL->pList==0 ) bEof = 1;
+  }else{
+    int bDescDoclist = pCsr->bDesc;
+    struct TokenDoclist a[MAX_INCR_PHRASE_TOKENS];
+
+    memset(a, 0, sizeof(a));
+    assert( p->nToken<=MAX_INCR_PHRASE_TOKENS );
+    assert( p->iDoclistToken<MAX_INCR_PHRASE_TOKENS );
+
+    while( bEof==0 ){
+      int bMaxSet = 0;
+      sqlite3_int64 iMax = 0;     /* Largest docid for all iterators */
+      int i;                      /* Used to iterate through tokens */
+
+      /* Advance the iterator for each token in the phrase once. */
+      for(i=0; rc==SQLITE_OK && i<p->nToken && bEof==0; i++){
+        rc = incrPhraseTokenNext(pTab, p, i, &a[i], &bEof);
+        if( a[i].bIgnore==0 && (bMaxSet==0 || DOCID_CMP(iMax, a[i].iDocid)<0) ){
+          iMax = a[i].iDocid;
+          bMaxSet = 1;
+        }
+      }
+      assert( rc!=SQLITE_OK || a[p->nToken-1].bIgnore==0 );
+      assert( rc!=SQLITE_OK || bMaxSet );
+
+      /* Keep advancing iterators until they all point to the same document */
+      for(i=0; i<p->nToken; i++){
+        while( rc==SQLITE_OK && bEof==0 
+            && a[i].bIgnore==0 && DOCID_CMP(a[i].iDocid, iMax)<0 
+        ){
+          rc = incrPhraseTokenNext(pTab, p, i, &a[i], &bEof);
+          if( DOCID_CMP(a[i].iDocid, iMax)>0 ){
+            iMax = a[i].iDocid;
+            i = 0;
+          }
+        }
+      }
+
+      /* Check if the current entries really are a phrase match */
+      if( bEof==0 ){
+        int nList = 0;
+        int nByte = a[p->nToken-1].nList;
+        char *aDoclist = sqlite3_malloc(nByte+1);
+        if( !aDoclist ) return SQLITE_NOMEM;
+        memcpy(aDoclist, a[p->nToken-1].pList, nByte+1);
+
+        for(i=0; i<(p->nToken-1); i++){
+          if( a[i].bIgnore==0 ){
+            char *pL = a[i].pList;
+            char *pR = aDoclist;
+            char *pOut = aDoclist;
+            int nDist = p->nToken-1-i;
+            int res = fts3PoslistPhraseMerge(&pOut, nDist, 0, 1, &pL, &pR);
+            if( res==0 ) break;
+            nList = (int)(pOut - aDoclist);
+          }
+        }
+        if( i==(p->nToken-1) ){
+          pDL->iDocid = iMax;
+          pDL->pList = aDoclist;
+          pDL->nList = nList;
+          pDL->bFreeList = 1;
+          break;
+        }
+        sqlite3_free(aDoclist);
+      }
+    }
+  }
+
+  *pbEof = bEof;
+  return rc;
+}
+
 /*
 ** Attempt to move the phrase iterator to point to the next matching docid. 
 ** If an error occurs, return an SQLite error code. Otherwise, return 
@@ -123358,55 +130235,14 @@ static int fts3EvalPhraseNext(
   Fts3Table *pTab = (Fts3Table *)pCsr->base.pVtab;
 
   if( p->bIncr ){
-    assert( p->nToken==1 );
-    assert( pDL->pNextDocid==0 );
-    rc = sqlite3Fts3MsrIncrNext(pTab, p->aToken[0].pSegcsr, 
-        &pDL->iDocid, &pDL->pList, &pDL->nList
-    );
-    if( rc==SQLITE_OK && !pDL->pList ){
-      *pbEof = 1;
-    }
+    rc = fts3EvalIncrPhraseNext(pCsr, p, pbEof);
   }else if( pCsr->bDesc!=pTab->bDescIdx && pDL->nAll ){
     sqlite3Fts3DoclistPrev(pTab->bDescIdx, pDL->aAll, pDL->nAll, 
         &pDL->pNextDocid, &pDL->iDocid, &pDL->nList, pbEof
     );
     pDL->pList = pDL->pNextDocid;
   }else{
-    char *pIter;                            /* Used to iterate through aAll */
-    char *pEnd = &pDL->aAll[pDL->nAll];     /* 1 byte past end of aAll */
-    if( pDL->pNextDocid ){
-      pIter = pDL->pNextDocid;
-    }else{
-      pIter = pDL->aAll;
-    }
-
-    if( pIter>=pEnd ){
-      /* We have already reached the end of this doclist. EOF. */
-      *pbEof = 1;
-    }else{
-      sqlite3_int64 iDelta;
-      pIter += sqlite3Fts3GetVarint(pIter, &iDelta);
-      if( pTab->bDescIdx==0 || pDL->pNextDocid==0 ){
-        pDL->iDocid += iDelta;
-      }else{
-        pDL->iDocid -= iDelta;
-      }
-      pDL->pList = pIter;
-      fts3PoslistCopy(0, &pIter);
-      pDL->nList = (int)(pIter - pDL->pList);
-
-      /* pIter now points just past the 0x00 that terminates the position-
-      ** list for document pDL->iDocid. However, if this position-list was
-      ** edited in place by fts3EvalNearTrim(), then pIter may not actually
-      ** point to the start of the next docid value. The following line deals
-      ** with this case by advancing pIter past the zero-padding added by
-      ** fts3EvalNearTrim().  */
-      while( pIter<pEnd && *pIter==0 ) pIter++;
-
-      pDL->pNextDocid = pIter;
-      assert( pIter>=&pDL->aAll[pDL->nAll] || *pIter );
-      *pbEof = 0;
-    }
+    fts3EvalDlPhraseNext(pTab, pDL, pbEof);
   }
 
   return rc;
@@ -123431,7 +130267,6 @@ static int fts3EvalPhraseNext(
 static void fts3EvalStartReaders(
   Fts3Cursor *pCsr,               /* FTS Cursor handle */
   Fts3Expr *pExpr,                /* Expression to initialize phrases in */
-  int bOptOk,                     /* True to enable incremental loading */
   int *pRc                        /* IN/OUT: Error code */
 ){
   if( pExpr && SQLITE_OK==*pRc ){
@@ -123442,10 +130277,10 @@ static void fts3EvalStartReaders(
         if( pExpr->pPhrase->aToken[i].pDeferred==0 ) break;
       }
       pExpr->bDeferred = (i==nToken);
-      *pRc = fts3EvalPhraseStart(pCsr, bOptOk, pExpr->pPhrase);
+      *pRc = fts3EvalPhraseStart(pCsr, 1, pExpr->pPhrase);
     }else{
-      fts3EvalStartReaders(pCsr, pExpr->pLeft, bOptOk, pRc);
-      fts3EvalStartReaders(pCsr, pExpr->pRight, bOptOk, pRc);
+      fts3EvalStartReaders(pCsr, pExpr->pLeft, pRc);
+      fts3EvalStartReaders(pCsr, pExpr->pRight, pRc);
       pExpr->bDeferred = (pExpr->pLeft->bDeferred && pExpr->pRight->bDeferred);
     }
   }
@@ -123687,7 +130522,7 @@ static int fts3EvalSelectDeferred(
       ** overflowing the 32-bit integer it is stored in. */
       if( ii<12 ) nLoad4 = nLoad4*4;
 
-      if( ii==0 || pTC->pPhrase->nToken>1 ){
+      if( ii==0 || (pTC->pPhrase->nToken>1 && ii!=nToken-1) ){
         /* Either this is the cheapest token in the entire query, or it is
         ** part of a multi-token phrase. Either way, the entire doclist will
         ** (eventually) be loaded into memory. It may as well be now. */
@@ -123767,7 +130602,7 @@ static int fts3EvalStart(Fts3Cursor *pCsr){
   }
 #endif
 
-  fts3EvalStartReaders(pCsr, pCsr->pExpr, 1, &rc);
+  fts3EvalStartReaders(pCsr, pCsr->pExpr, &rc);
   return rc;
 }
 
@@ -124250,6 +131085,16 @@ static int fts3EvalNext(Fts3Cursor *pCsr){
       pCsr->iPrevId = pExpr->iDocid;
     }while( pCsr->isEof==0 && fts3EvalTestDeferredAndNear(pCsr, &rc) );
   }
+
+  /* Check if the cursor is past the end of the docid range specified
+  ** by Fts3Cursor.iMinDocid/iMaxDocid. If so, set the EOF flag.  */
+  if( rc==SQLITE_OK && (
+        (pCsr->bDesc==0 && pCsr->iPrevId>pCsr->iMaxDocid)
+     || (pCsr->bDesc!=0 && pCsr->iPrevId<pCsr->iMinDocid)
+  )){
+    pCsr->isEof = 1;
+  }
+
   return rc;
 }
 
@@ -124273,12 +131118,16 @@ static void fts3EvalRestart(
     if( pPhrase ){
       fts3EvalInvalidatePoslist(pPhrase);
       if( pPhrase->bIncr ){
-        assert( pPhrase->nToken==1 );
-        assert( pPhrase->aToken[0].pSegcsr );
-        sqlite3Fts3MsrIncrRestart(pPhrase->aToken[0].pSegcsr);
+        int i;
+        for(i=0; i<pPhrase->nToken; i++){
+          Fts3PhraseToken *pToken = &pPhrase->aToken[i];
+          assert( pToken->pDeferred==0 );
+          if( pToken->pSegcsr ){
+            sqlite3Fts3MsrIncrRestart(pToken->pSegcsr);
+          }
+        }
         *pRc = fts3EvalPhraseStart(pCsr, 0, pPhrase);
       }
-
       pPhrase->doclist.pNextDocid = 0;
       pPhrase->doclist.iDocid = 0;
     }
@@ -124323,7 +131172,7 @@ static void fts3EvalUpdateCounts(Fts3Expr *pExpr){
         pExpr->aMI[iCol*3 + 2] += (iCnt>0);
         if( *p==0x00 ) break;
         p++;
-        p += sqlite3Fts3GetVarint32(p, &iCol);
+        p += fts3GetVarint32(p, &iCol);
       }
     }
 
@@ -124527,15 +131376,23 @@ SQLITE_PRIVATE int sqlite3Fts3EvalPhrasePoslist(
   pIter = pPhrase->doclist.pList;
   if( iDocid!=pCsr->iPrevId || pExpr->bEof ){
     int bDescDoclist = pTab->bDescIdx;      /* For DOCID_CMP macro */
+    int iMul;                     /* +1 if csr dir matches index dir, else -1 */
     int bOr = 0;
     u8 bEof = 0;
-    Fts3Expr *p;
+    u8 bTreeEof = 0;
+    Fts3Expr *p;                  /* Used to iterate from pExpr to root */
+    Fts3Expr *pNear;              /* Most senior NEAR ancestor (or pExpr) */
 
     /* Check if this phrase descends from an OR expression node. If not, 
     ** return NULL. Otherwise, the entry that corresponds to docid 
-    ** pCsr->iPrevId may lie earlier in the doclist buffer. */
+    ** pCsr->iPrevId may lie earlier in the doclist buffer. Or, if the
+    ** tree that the node is part of has been marked as EOF, but the node
+    ** itself is not EOF, then it may point to an earlier entry. */
+    pNear = pExpr;
     for(p=pExpr->pParent; p; p=p->pParent){
       if( p->eType==FTSQUERY_OR ) bOr = 1;
+      if( p->eType==FTSQUERY_NEAR ) pNear = p;
+      if( p->bEof ) bTreeEof = 1;
     }
     if( bOr==0 ) return SQLITE_OK;
 
@@ -124554,29 +131411,59 @@ SQLITE_PRIVATE int sqlite3Fts3EvalPhrasePoslist(
       assert( rc!=SQLITE_OK || pPhrase->bIncr==0 );
       if( rc!=SQLITE_OK ) return rc;
     }
-
-    if( pExpr->bEof ){
-      pIter = 0;
-      iDocid = 0;
+    
+    iMul = ((pCsr->bDesc==bDescDoclist) ? 1 : -1);
+    while( bTreeEof==1 
+        && pNear->bEof==0
+        && (DOCID_CMP(pNear->iDocid, pCsr->iPrevId) * iMul)<0
+    ){
+      int rc = SQLITE_OK;
+      fts3EvalNextRow(pCsr, pExpr, &rc);
+      if( rc!=SQLITE_OK ) return rc;
+      iDocid = pExpr->iDocid;
+      pIter = pPhrase->doclist.pList;
     }
+
     bEof = (pPhrase->doclist.nAll==0);
     assert( bDescDoclist==0 || bDescDoclist==1 );
     assert( pCsr->bDesc==0 || pCsr->bDesc==1 );
 
-    if( pCsr->bDesc==bDescDoclist ){
-      int dummy;
-      while( (pIter==0 || DOCID_CMP(iDocid, pCsr->iPrevId)>0 ) && bEof==0 ){
-        sqlite3Fts3DoclistPrev(
-            bDescDoclist, pPhrase->doclist.aAll, pPhrase->doclist.nAll, 
-            &pIter, &iDocid, &dummy, &bEof
-        );
-      }
-    }else{
-      while( (pIter==0 || DOCID_CMP(iDocid, pCsr->iPrevId)<0 ) && bEof==0 ){
-        sqlite3Fts3DoclistNext(
-            bDescDoclist, pPhrase->doclist.aAll, pPhrase->doclist.nAll, 
-            &pIter, &iDocid, &bEof
-        );
+    if( bEof==0 ){
+      if( pCsr->bDesc==bDescDoclist ){
+        int dummy;
+        if( pNear->bEof ){
+          /* This expression is already at EOF. So position it to point to the
+          ** last entry in the doclist at pPhrase->doclist.aAll[]. Variable
+          ** iDocid is already set for this entry, so all that is required is
+          ** to set pIter to point to the first byte of the last position-list
+          ** in the doclist. 
+          **
+          ** It would also be correct to set pIter and iDocid to zero. In
+          ** this case, the first call to sqltie3Fts4DoclistPrev() below
+          ** would also move the iterator to point to the last entry in the 
+          ** doclist. However, this is expensive, as to do so it has to 
+          ** iterate through the entire doclist from start to finish (since
+          ** it does not know the docid for the last entry).  */
+          pIter = &pPhrase->doclist.aAll[pPhrase->doclist.nAll-1];
+          fts3ReversePoslist(pPhrase->doclist.aAll, &pIter);
+        }
+        while( (pIter==0 || DOCID_CMP(iDocid, pCsr->iPrevId)>0 ) && bEof==0 ){
+          sqlite3Fts3DoclistPrev(
+              bDescDoclist, pPhrase->doclist.aAll, pPhrase->doclist.nAll, 
+              &pIter, &iDocid, &dummy, &bEof
+          );
+        }
+      }else{
+        if( pNear->bEof ){
+          pIter = 0;
+          iDocid = 0;
+        }
+        while( (pIter==0 || DOCID_CMP(iDocid, pCsr->iPrevId)<0 ) && bEof==0 ){
+          sqlite3Fts3DoclistNext(
+              bDescDoclist, pPhrase->doclist.aAll, pPhrase->doclist.nAll, 
+              &pIter, &iDocid, &bEof
+          );
+        }
       }
     }
 
@@ -124586,7 +131473,7 @@ SQLITE_PRIVATE int sqlite3Fts3EvalPhrasePoslist(
 
   if( *pIter==0x01 ){
     pIter++;
-    pIter += sqlite3Fts3GetVarint32(pIter, &iThis);
+    pIter += fts3GetVarint32(pIter, &iThis);
   }else{
     iThis = 0;
   }
@@ -124594,7 +131481,7 @@ SQLITE_PRIVATE int sqlite3Fts3EvalPhrasePoslist(
     fts3ColumnlistCopy(0, &pIter);
     if( *pIter==0x00 ) return 0;
     pIter++;
-    pIter += sqlite3Fts3GetVarint32(pIter, &iThis);
+    pIter += fts3GetVarint32(pIter, &iThis);
   }
 
   *ppOut = ((iCol==iThis)?pIter:0);
@@ -124635,7 +131522,10 @@ SQLITE_PRIVATE int sqlite3Fts3Corrupt(){
 /*
 ** Initialize API pointer table, if required.
 */
-SQLITE_API int sqlite3_extension_init(
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+SQLITE_API int sqlite3_fts3_init(
   sqlite3 *db, 
   char **pzErrMsg,
   const sqlite3_api_routines *pApi
@@ -124681,6 +131571,7 @@ struct Fts3auxCursor {
   Fts3SegFilter filter;
   char *zStop;
   int nStop;                      /* Byte-length of string zStop */
+  int iLangid;                    /* Language id to query */
   int isEof;                      /* True if cursor is at EOF */
   sqlite3_int64 iRowid;           /* Current rowid */
 
@@ -124695,7 +131586,8 @@ struct Fts3auxCursor {
 /*
 ** Schema of the terms table.
 */
-#define FTS3_TERMS_SCHEMA "CREATE TABLE x(term, col, documents, occurrences)"
+#define FTS3_AUX_SCHEMA \
+  "CREATE TABLE x(term, col, documents, occurrences, languageid HIDDEN)"
 
 /*
 ** This function does all the work for both the xConnect and xCreate methods.
@@ -124742,7 +131634,7 @@ static int fts3auxConnectMethod(
   }
   nFts3 = (int)strlen(zFts3);
 
-  rc = sqlite3_declare_vtab(db, FTS3_TERMS_SCHEMA);
+  rc = sqlite3_declare_vtab(db, FTS3_AUX_SCHEMA);
   if( rc!=SQLITE_OK ) return rc;
 
   nByte = sizeof(Fts3auxTable) + sizeof(Fts3Table) + nDb + nFts3 + 2;
@@ -124802,6 +131694,8 @@ static int fts3auxBestIndexMethod(
   int iEq = -1;
   int iGe = -1;
   int iLe = -1;
+  int iLangid = -1;
+  int iNext = 1;                  /* Next free argvIndex value */
 
   UNUSED_PARAMETER(pVTab);
 
@@ -124813,36 +131707,48 @@ static int fts3auxBestIndexMethod(
     pInfo->orderByConsumed = 1;
   }
 
-  /* Search for equality and range constraints on the "term" column. */
+  /* Search for equality and range constraints on the "term" column. 
+  ** And equality constraints on the hidden "languageid" column. */
   for(i=0; i<pInfo->nConstraint; i++){
-    if( pInfo->aConstraint[i].usable && pInfo->aConstraint[i].iColumn==0 ){
+    if( pInfo->aConstraint[i].usable ){
       int op = pInfo->aConstraint[i].op;
-      if( op==SQLITE_INDEX_CONSTRAINT_EQ ) iEq = i;
-      if( op==SQLITE_INDEX_CONSTRAINT_LT ) iLe = i;
-      if( op==SQLITE_INDEX_CONSTRAINT_LE ) iLe = i;
-      if( op==SQLITE_INDEX_CONSTRAINT_GT ) iGe = i;
-      if( op==SQLITE_INDEX_CONSTRAINT_GE ) iGe = i;
+      int iCol = pInfo->aConstraint[i].iColumn;
+
+      if( iCol==0 ){
+        if( op==SQLITE_INDEX_CONSTRAINT_EQ ) iEq = i;
+        if( op==SQLITE_INDEX_CONSTRAINT_LT ) iLe = i;
+        if( op==SQLITE_INDEX_CONSTRAINT_LE ) iLe = i;
+        if( op==SQLITE_INDEX_CONSTRAINT_GT ) iGe = i;
+        if( op==SQLITE_INDEX_CONSTRAINT_GE ) iGe = i;
+      }
+      if( iCol==4 ){
+        if( op==SQLITE_INDEX_CONSTRAINT_EQ ) iLangid = i;
+      }
     }
   }
 
   if( iEq>=0 ){
     pInfo->idxNum = FTS4AUX_EQ_CONSTRAINT;
-    pInfo->aConstraintUsage[iEq].argvIndex = 1;
+    pInfo->aConstraintUsage[iEq].argvIndex = iNext++;
     pInfo->estimatedCost = 5;
   }else{
     pInfo->idxNum = 0;
     pInfo->estimatedCost = 20000;
     if( iGe>=0 ){
       pInfo->idxNum += FTS4AUX_GE_CONSTRAINT;
-      pInfo->aConstraintUsage[iGe].argvIndex = 1;
+      pInfo->aConstraintUsage[iGe].argvIndex = iNext++;
       pInfo->estimatedCost /= 2;
     }
     if( iLe>=0 ){
       pInfo->idxNum += FTS4AUX_LE_CONSTRAINT;
-      pInfo->aConstraintUsage[iLe].argvIndex = 1 + (iGe>=0);
+      pInfo->aConstraintUsage[iLe].argvIndex = iNext++;
       pInfo->estimatedCost /= 2;
     }
   }
+  if( iLangid>=0 ){
+    pInfo->aConstraintUsage[iLangid].argvIndex = iNext++;
+    pInfo->estimatedCost--;
+  }
 
   return SQLITE_OK;
 }
@@ -125002,7 +131908,14 @@ static int fts3auxFilterMethod(
   Fts3auxCursor *pCsr = (Fts3auxCursor *)pCursor;
   Fts3Table *pFts3 = ((Fts3auxTable *)pCursor->pVtab)->pFts3Tab;
   int rc;
-  int isScan;
+  int isScan = 0;
+  int iLangVal = 0;               /* Language id to query */
+
+  int iEq = -1;                   /* Index of term=? value in apVal */
+  int iGe = -1;                   /* Index of term>=? value in apVal */
+  int iLe = -1;                   /* Index of term<=? value in apVal */
+  int iLangid = -1;               /* Index of languageid=? value in apVal */
+  int iNext = 0;
 
   UNUSED_PARAMETER(nVal);
   UNUSED_PARAMETER(idxStr);
@@ -125012,7 +131925,21 @@ static int fts3auxFilterMethod(
        || idxNum==FTS4AUX_LE_CONSTRAINT || idxNum==FTS4AUX_GE_CONSTRAINT
        || idxNum==(FTS4AUX_LE_CONSTRAINT|FTS4AUX_GE_CONSTRAINT)
   );
-  isScan = (idxNum!=FTS4AUX_EQ_CONSTRAINT);
+
+  if( idxNum==FTS4AUX_EQ_CONSTRAINT ){
+    iEq = iNext++;
+  }else{
+    isScan = 1;
+    if( idxNum & FTS4AUX_GE_CONSTRAINT ){
+      iGe = iNext++;
+    }
+    if( idxNum & FTS4AUX_LE_CONSTRAINT ){
+      iLe = iNext++;
+    }
+  }
+  if( iNext<nVal ){
+    iLangid = iNext++;
+  }
 
   /* In case this cursor is being reused, close and zero it. */
   testcase(pCsr->filter.zTerm);
@@ -125024,22 +131951,35 @@ static int fts3auxFilterMethod(
   pCsr->filter.flags = FTS3_SEGMENT_REQUIRE_POS|FTS3_SEGMENT_IGNORE_EMPTY;
   if( isScan ) pCsr->filter.flags |= FTS3_SEGMENT_SCAN;
 
-  if( idxNum&(FTS4AUX_EQ_CONSTRAINT|FTS4AUX_GE_CONSTRAINT) ){
+  if( iEq>=0 || iGe>=0 ){
     const unsigned char *zStr = sqlite3_value_text(apVal[0]);
+    assert( (iEq==0 && iGe==-1) || (iEq==-1 && iGe==0) );
     if( zStr ){
       pCsr->filter.zTerm = sqlite3_mprintf("%s", zStr);
       pCsr->filter.nTerm = sqlite3_value_bytes(apVal[0]);
       if( pCsr->filter.zTerm==0 ) return SQLITE_NOMEM;
     }
   }
-  if( idxNum&FTS4AUX_LE_CONSTRAINT ){
-    int iIdx = (idxNum&FTS4AUX_GE_CONSTRAINT) ? 1 : 0;
-    pCsr->zStop = sqlite3_mprintf("%s", sqlite3_value_text(apVal[iIdx]));
-    pCsr->nStop = sqlite3_value_bytes(apVal[iIdx]);
+
+  if( iLe>=0 ){
+    pCsr->zStop = sqlite3_mprintf("%s", sqlite3_value_text(apVal[iLe]));
+    pCsr->nStop = sqlite3_value_bytes(apVal[iLe]);
     if( pCsr->zStop==0 ) return SQLITE_NOMEM;
   }
+  
+  if( iLangid>=0 ){
+    iLangVal = sqlite3_value_int(apVal[iLangid]);
 
-  rc = sqlite3Fts3SegReaderCursor(pFts3, 0, 0, FTS3_SEGCURSOR_ALL,
+    /* If the user specified a negative value for the languageid, use zero
+    ** instead. This works, as the "languageid=?" constraint will also
+    ** be tested by the VDBE layer. The test will always be false (since
+    ** this module will not return a row with a negative languageid), and
+    ** so the overall query will return zero rows.  */
+    if( iLangVal<0 ) iLangVal = 0;
+  }
+  pCsr->iLangid = iLangVal;
+
+  rc = sqlite3Fts3SegReaderCursor(pFts3, iLangVal, 0, FTS3_SEGCURSOR_ALL,
       pCsr->filter.zTerm, pCsr->filter.nTerm, 0, isScan, &pCsr->csr
   );
   if( rc==SQLITE_OK ){
@@ -125063,24 +132003,37 @@ static int fts3auxEofMethod(sqlite3_vtab_cursor *pCursor){
 */
 static int fts3auxColumnMethod(
   sqlite3_vtab_cursor *pCursor,   /* Cursor to retrieve value from */
-  sqlite3_context *pContext,      /* Context for sqlite3_result_xxx() calls */
+  sqlite3_context *pCtx,          /* Context for sqlite3_result_xxx() calls */
   int iCol                        /* Index of column to read value from */
 ){
   Fts3auxCursor *p = (Fts3auxCursor *)pCursor;
 
   assert( p->isEof==0 );
-  if( iCol==0 ){        /* Column "term" */
-    sqlite3_result_text(pContext, p->csr.zTerm, p->csr.nTerm, SQLITE_TRANSIENT);
-  }else if( iCol==1 ){  /* Column "col" */
-    if( p->iCol ){
-      sqlite3_result_int(pContext, p->iCol-1);
-    }else{
-      sqlite3_result_text(pContext, "*", -1, SQLITE_STATIC);
-    }
-  }else if( iCol==2 ){  /* Column "documents" */
-    sqlite3_result_int64(pContext, p->aStat[p->iCol].nDoc);
-  }else{                /* Column "occurrences" */
-    sqlite3_result_int64(pContext, p->aStat[p->iCol].nOcc);
+  switch( iCol ){
+    case 0: /* term */
+      sqlite3_result_text(pCtx, p->csr.zTerm, p->csr.nTerm, SQLITE_TRANSIENT);
+      break;
+
+    case 1: /* col */
+      if( p->iCol ){
+        sqlite3_result_int(pCtx, p->iCol-1);
+      }else{
+        sqlite3_result_text(pCtx, "*", -1, SQLITE_STATIC);
+      }
+      break;
+
+    case 2: /* documents */
+      sqlite3_result_int64(pCtx, p->aStat[p->iCol].nDoc);
+      break;
+
+    case 3: /* occurrences */
+      sqlite3_result_int64(pCtx, p->aStat[p->iCol].nOcc);
+      break;
+
+    default: /* languageid */
+      assert( iCol==4 );
+      sqlite3_result_int(pCtx, p->iLangid);
+      break;
   }
 
   return SQLITE_OK;
@@ -125294,6 +132247,11 @@ SQLITE_PRIVATE int sqlite3Fts3OpenTokenizer(
   return rc;
 }
 
+/*
+** Function getNextNode(), which is called by fts3ExprParse(), may itself
+** call fts3ExprParse(). So this forward declaration is required.
+*/
+static int fts3ExprParse(ParseContext *, const char *, int, Fts3Expr **, int *);
 
 /*
 ** Extract the next token from buffer z (length n) using the tokenizer
@@ -125319,9 +132277,16 @@ static int getNextToken(
   int rc;
   sqlite3_tokenizer_cursor *pCursor;
   Fts3Expr *pRet = 0;
-  int nConsumed = 0;
+  int i = 0;
 
-  rc = sqlite3Fts3OpenTokenizer(pTokenizer, pParse->iLangid, z, n, &pCursor);
+  /* Set variable i to the maximum number of bytes of input to tokenize. */
+  for(i=0; i<n; i++){
+    if( sqlite3_fts3_enable_parentheses && (z[i]=='(' || z[i]==')') ) break;
+    if( z[i]=='*' || z[i]=='"' ) break;
+  }
+
+  *pnConsumed = i;
+  rc = sqlite3Fts3OpenTokenizer(pTokenizer, pParse->iLangid, z, i, &pCursor);
   if( rc==SQLITE_OK ){
     const char *zToken;
     int nToken = 0, iStart = 0, iEnd = 0, iPosition = 0;
@@ -125362,13 +132327,14 @@ static int getNextToken(
         }
 
       }
-      nConsumed = iEnd;
+      *pnConsumed = iEnd;
+    }else if( i && rc==SQLITE_DONE ){
+      rc = SQLITE_OK;
     }
 
     pModule->xClose(pCursor);
   }
   
-  *pnConsumed = nConsumed;
   *ppExpr = pRet;
   return rc;
 }
@@ -125508,12 +132474,6 @@ static int getNextString(
   return SQLITE_NOMEM;
 }
 
-/*
-** Function getNextNode(), which is called by fts3ExprParse(), may itself
-** call fts3ExprParse(). So this forward declaration is required.
-*/
-static int fts3ExprParse(ParseContext *, const char *, int, Fts3Expr **, int *);
-
 /*
 ** The output variable *ppExpr is populated with an allocated Fts3Expr 
 ** structure, or set to 0 if the end of the input buffer is reached.
@@ -125610,27 +132570,6 @@ static int getNextNode(
     }
   }
 
-  /* Check for an open bracket. */
-  if( sqlite3_fts3_enable_parentheses ){
-    if( *zInput=='(' ){
-      int nConsumed;
-      pParse->nNest++;
-      rc = fts3ExprParse(pParse, &zInput[1], nInput-1, ppExpr, &nConsumed);
-      if( rc==SQLITE_OK && !*ppExpr ){
-        rc = SQLITE_DONE;
-      }
-      *pnConsumed = (int)((zInput - z) + 1 + nConsumed);
-      return rc;
-    }
-  
-    /* Check for a close bracket. */
-    if( *zInput==')' ){
-      pParse->nNest--;
-      *pnConsumed = (int)((zInput - z) + 1);
-      return SQLITE_DONE;
-    }
-  }
-
   /* See if we are dealing with a quoted phrase. If this is the case, then
   ** search for the closing quote and pass the whole string to getNextString()
   ** for processing. This is easy to do, as fts3 has no syntax for escaping
@@ -125645,6 +132584,21 @@ static int getNextNode(
     return getNextString(pParse, &zInput[1], ii-1, ppExpr);
   }
 
+  if( sqlite3_fts3_enable_parentheses ){
+    if( *zInput=='(' ){
+      int nConsumed = 0;
+      pParse->nNest++;
+      rc = fts3ExprParse(pParse, zInput+1, nInput-1, ppExpr, &nConsumed);
+      if( rc==SQLITE_OK && !*ppExpr ){ rc = SQLITE_DONE; }
+      *pnConsumed = (int)(zInput - z) + 1 + nConsumed;
+      return rc;
+    }else if( *zInput==')' ){
+      pParse->nNest--;
+      *pnConsumed = (int)((zInput - z) + 1);
+      *ppExpr = 0;
+      return SQLITE_DONE;
+    }
+  }
 
   /* If control flows to this point, this must be a regular token, or 
   ** the end of the input. Read a regular token using the sqlite3_tokenizer
@@ -125763,96 +132717,100 @@ static int fts3ExprParse(
   while( rc==SQLITE_OK ){
     Fts3Expr *p = 0;
     int nByte = 0;
+
     rc = getNextNode(pParse, zIn, nIn, &p, &nByte);
+    assert( nByte>0 || (rc!=SQLITE_OK && p==0) );
     if( rc==SQLITE_OK ){
-      int isPhrase;
+      if( p ){
+        int isPhrase;
 
-      if( !sqlite3_fts3_enable_parentheses 
-       && p->eType==FTSQUERY_PHRASE && pParse->isNot 
-      ){
-        /* Create an implicit NOT operator. */
-        Fts3Expr *pNot = fts3MallocZero(sizeof(Fts3Expr));
-        if( !pNot ){
-          sqlite3Fts3ExprFree(p);
-          rc = SQLITE_NOMEM;
-          goto exprparse_out;
-        }
-        pNot->eType = FTSQUERY_NOT;
-        pNot->pRight = p;
-        p->pParent = pNot;
-        if( pNotBranch ){
-          pNot->pLeft = pNotBranch;
-          pNotBranch->pParent = pNot;
-        }
-        pNotBranch = pNot;
-        p = pPrev;
-      }else{
-        int eType = p->eType;
-        isPhrase = (eType==FTSQUERY_PHRASE || p->pLeft);
-
-        /* The isRequirePhrase variable is set to true if a phrase or
-        ** an expression contained in parenthesis is required. If a
-        ** binary operator (AND, OR, NOT or NEAR) is encounted when
-        ** isRequirePhrase is set, this is a syntax error.
-        */
-        if( !isPhrase && isRequirePhrase ){
-          sqlite3Fts3ExprFree(p);
-          rc = SQLITE_ERROR;
-          goto exprparse_out;
-        }
-  
-        if( isPhrase && !isRequirePhrase ){
-          /* Insert an implicit AND operator. */
-          Fts3Expr *pAnd;
-          assert( pRet && pPrev );
-          pAnd = fts3MallocZero(sizeof(Fts3Expr));
-          if( !pAnd ){
+        if( !sqlite3_fts3_enable_parentheses 
+            && p->eType==FTSQUERY_PHRASE && pParse->isNot 
+        ){
+          /* Create an implicit NOT operator. */
+          Fts3Expr *pNot = fts3MallocZero(sizeof(Fts3Expr));
+          if( !pNot ){
             sqlite3Fts3ExprFree(p);
             rc = SQLITE_NOMEM;
             goto exprparse_out;
           }
-          pAnd->eType = FTSQUERY_AND;
-          insertBinaryOperator(&pRet, pPrev, pAnd);
-          pPrev = pAnd;
-        }
+          pNot->eType = FTSQUERY_NOT;
+          pNot->pRight = p;
+          p->pParent = pNot;
+          if( pNotBranch ){
+            pNot->pLeft = pNotBranch;
+            pNotBranch->pParent = pNot;
+          }
+          pNotBranch = pNot;
+          p = pPrev;
+        }else{
+          int eType = p->eType;
+          isPhrase = (eType==FTSQUERY_PHRASE || p->pLeft);
 
-        /* This test catches attempts to make either operand of a NEAR
-        ** operator something other than a phrase. For example, either of
-        ** the following:
-        **
-        **    (bracketed expression) NEAR phrase
-        **    phrase NEAR (bracketed expression)
-        **
-        ** Return an error in either case.
-        */
-        if( pPrev && (
+          /* The isRequirePhrase variable is set to true if a phrase or
+          ** an expression contained in parenthesis is required. If a
+          ** binary operator (AND, OR, NOT or NEAR) is encounted when
+          ** isRequirePhrase is set, this is a syntax error.
+          */
+          if( !isPhrase && isRequirePhrase ){
+            sqlite3Fts3ExprFree(p);
+            rc = SQLITE_ERROR;
+            goto exprparse_out;
+          }
+
+          if( isPhrase && !isRequirePhrase ){
+            /* Insert an implicit AND operator. */
+            Fts3Expr *pAnd;
+            assert( pRet && pPrev );
+            pAnd = fts3MallocZero(sizeof(Fts3Expr));
+            if( !pAnd ){
+              sqlite3Fts3ExprFree(p);
+              rc = SQLITE_NOMEM;
+              goto exprparse_out;
+            }
+            pAnd->eType = FTSQUERY_AND;
+            insertBinaryOperator(&pRet, pPrev, pAnd);
+            pPrev = pAnd;
+          }
+
+          /* This test catches attempts to make either operand of a NEAR
+           ** operator something other than a phrase. For example, either of
+           ** the following:
+           **
+           **    (bracketed expression) NEAR phrase
+           **    phrase NEAR (bracketed expression)
+           **
+           ** Return an error in either case.
+           */
+          if( pPrev && (
             (eType==FTSQUERY_NEAR && !isPhrase && pPrev->eType!=FTSQUERY_PHRASE)
          || (eType!=FTSQUERY_PHRASE && isPhrase && pPrev->eType==FTSQUERY_NEAR)
-        )){
-          sqlite3Fts3ExprFree(p);
-          rc = SQLITE_ERROR;
-          goto exprparse_out;
-        }
-  
-        if( isPhrase ){
-          if( pRet ){
-            assert( pPrev && pPrev->pLeft && pPrev->pRight==0 );
-            pPrev->pRight = p;
-            p->pParent = pPrev;
-          }else{
-            pRet = p;
+          )){
+            sqlite3Fts3ExprFree(p);
+            rc = SQLITE_ERROR;
+            goto exprparse_out;
           }
-        }else{
-          insertBinaryOperator(&pRet, pPrev, p);
+
+          if( isPhrase ){
+            if( pRet ){
+              assert( pPrev && pPrev->pLeft && pPrev->pRight==0 );
+              pPrev->pRight = p;
+              p->pParent = pPrev;
+            }else{
+              pRet = p;
+            }
+          }else{
+            insertBinaryOperator(&pRet, pPrev, p);
+          }
+          isRequirePhrase = !isPhrase;
         }
-        isRequirePhrase = !isPhrase;
+        pPrev = p;
       }
       assert( nByte>0 );
     }
     assert( rc!=SQLITE_OK || (nByte>0 && nByte<=nIn) );
     nIn -= nByte;
     zIn += nByte;
-    pPrev = p;
   }
 
   if( rc==SQLITE_DONE && pRet && isRequirePhrase ){
@@ -126139,17 +133097,16 @@ SQLITE_PRIVATE int sqlite3Fts3ExprParse(
   Fts3Expr **ppExpr,                  /* OUT: Parsed query structure */
   char **pzErr                        /* OUT: Error message (sqlite3_malloc) */
 ){
-  static const int MAX_EXPR_DEPTH = 12;
   int rc = fts3ExprParseUnbalanced(
       pTokenizer, iLangid, azCol, bFts4, nCol, iDefaultCol, z, n, ppExpr
   );
   
   /* Rebalance the expression. And check that its depth does not exceed
-  ** MAX_EXPR_DEPTH.  */
+  ** SQLITE_FTS3_MAX_EXPR_DEPTH.  */
   if( rc==SQLITE_OK && *ppExpr ){
-    rc = fts3ExprBalance(ppExpr, MAX_EXPR_DEPTH);
+    rc = fts3ExprBalance(ppExpr, SQLITE_FTS3_MAX_EXPR_DEPTH);
     if( rc==SQLITE_OK ){
-      rc = fts3ExprCheckDepth(*ppExpr, MAX_EXPR_DEPTH);
+      rc = fts3ExprCheckDepth(*ppExpr, SQLITE_FTS3_MAX_EXPR_DEPTH);
     }
   }
 
@@ -126158,7 +133115,8 @@ SQLITE_PRIVATE int sqlite3Fts3ExprParse(
     *ppExpr = 0;
     if( rc==SQLITE_TOOBIG ){
       *pzErr = sqlite3_mprintf(
-          "FTS expression tree is too large (maximum depth %d)", MAX_EXPR_DEPTH
+          "FTS expression tree is too large (maximum depth %d)", 
+          SQLITE_FTS3_MAX_EXPR_DEPTH
       );
       rc = SQLITE_ERROR;
     }else if( rc==SQLITE_ERROR ){
@@ -126514,13 +133472,13 @@ SQLITE_PRIVATE void sqlite3Fts3HashClear(Fts3Hash *pH){
 */
 static int fts3StrHash(const void *pKey, int nKey){
   const char *z = (const char *)pKey;
-  int h = 0;
+  unsigned h = 0;
   if( nKey<=0 ) nKey = (int) strlen(z);
   while( nKey > 0  ){
     h = (h<<3) ^ h ^ *z++;
     nKey--;
   }
-  return h & 0x7fffffff;
+  return (int)(h & 0x7fffffff);
 }
 static int fts3StrCompare(const void *pKey1, int n1, const void *pKey2, int n2){
   if( n1!=n2 ) return 1;
@@ -127205,12 +134163,14 @@ static void porter_stemmer(const char *zIn, int nIn, char *zOut, int *pnOut){
   /* Step 2 */
   switch( z[1] ){
    case 'a':
-     stem(&z, "lanoita", "ate", m_gt_0) ||
-     stem(&z, "lanoit", "tion", m_gt_0);
+     if( !stem(&z, "lanoita", "ate", m_gt_0) ){
+       stem(&z, "lanoit", "tion", m_gt_0);
+     }
      break;
    case 'c':
-     stem(&z, "icne", "ence", m_gt_0) ||
-     stem(&z, "icna", "ance", m_gt_0);
+     if( !stem(&z, "icne", "ence", m_gt_0) ){
+       stem(&z, "icna", "ance", m_gt_0);
+     }
      break;
    case 'e':
      stem(&z, "rezi", "ize", m_gt_0);
@@ -127219,43 +134179,54 @@ static void porter_stemmer(const char *zIn, int nIn, char *zOut, int *pnOut){
      stem(&z, "igol", "log", m_gt_0);
      break;
    case 'l':
-     stem(&z, "ilb", "ble", m_gt_0) ||
-     stem(&z, "illa", "al", m_gt_0) ||
-     stem(&z, "iltne", "ent", m_gt_0) ||
-     stem(&z, "ile", "e", m_gt_0) ||
-     stem(&z, "ilsuo", "ous", m_gt_0);
+     if( !stem(&z, "ilb", "ble", m_gt_0) 
+      && !stem(&z, "illa", "al", m_gt_0)
+      && !stem(&z, "iltne", "ent", m_gt_0)
+      && !stem(&z, "ile", "e", m_gt_0)
+     ){
+       stem(&z, "ilsuo", "ous", m_gt_0);
+     }
      break;
    case 'o':
-     stem(&z, "noitazi", "ize", m_gt_0) ||
-     stem(&z, "noita", "ate", m_gt_0) ||
-     stem(&z, "rota", "ate", m_gt_0);
+     if( !stem(&z, "noitazi", "ize", m_gt_0)
+      && !stem(&z, "noita", "ate", m_gt_0)
+     ){
+       stem(&z, "rota", "ate", m_gt_0);
+     }
      break;
    case 's':
-     stem(&z, "msila", "al", m_gt_0) ||
-     stem(&z, "ssenevi", "ive", m_gt_0) ||
-     stem(&z, "ssenluf", "ful", m_gt_0) ||
-     stem(&z, "ssensuo", "ous", m_gt_0);
+     if( !stem(&z, "msila", "al", m_gt_0)
+      && !stem(&z, "ssenevi", "ive", m_gt_0)
+      && !stem(&z, "ssenluf", "ful", m_gt_0)
+     ){
+       stem(&z, "ssensuo", "ous", m_gt_0);
+     }
      break;
    case 't':
-     stem(&z, "itila", "al", m_gt_0) ||
-     stem(&z, "itivi", "ive", m_gt_0) ||
-     stem(&z, "itilib", "ble", m_gt_0);
+     if( !stem(&z, "itila", "al", m_gt_0)
+      && !stem(&z, "itivi", "ive", m_gt_0)
+     ){
+       stem(&z, "itilib", "ble", m_gt_0);
+     }
      break;
   }
 
   /* Step 3 */
   switch( z[0] ){
    case 'e':
-     stem(&z, "etaci", "ic", m_gt_0) ||
-     stem(&z, "evita", "", m_gt_0)   ||
-     stem(&z, "ezila", "al", m_gt_0);
+     if( !stem(&z, "etaci", "ic", m_gt_0)
+      && !stem(&z, "evita", "", m_gt_0)
+     ){
+       stem(&z, "ezila", "al", m_gt_0);
+     }
      break;
    case 'i':
      stem(&z, "itici", "ic", m_gt_0);
      break;
    case 'l':
-     stem(&z, "laci", "ic", m_gt_0) ||
-     stem(&z, "luf", "", m_gt_0);
+     if( !stem(&z, "laci", "ic", m_gt_0) ){
+       stem(&z, "luf", "", m_gt_0);
+     }
      break;
    case 's':
      stem(&z, "ssen", "", m_gt_0);
@@ -127296,9 +134267,11 @@ static void porter_stemmer(const char *zIn, int nIn, char *zOut, int *pnOut){
            z += 3;
          }
        }else if( z[2]=='e' ){
-         stem(&z, "tneme", "", m_gt_1) ||
-         stem(&z, "tnem", "", m_gt_1) ||
-         stem(&z, "tne", "", m_gt_1);
+         if( !stem(&z, "tneme", "", m_gt_1)
+          && !stem(&z, "tnem", "", m_gt_1)
+         ){
+           stem(&z, "tne", "", m_gt_1);
+         }
        }
      }
      break;
@@ -127317,8 +134290,9 @@ static void porter_stemmer(const char *zIn, int nIn, char *zOut, int *pnOut){
      }
      break;
    case 't':
-     stem(&z, "eta", "", m_gt_1) ||
-     stem(&z, "iti", "", m_gt_1);
+     if( !stem(&z, "eta", "", m_gt_1) ){
+       stem(&z, "iti", "", m_gt_1);
+     }
      break;
    case 'u':
      if( z[0]=='s' && z[2]=='o' && m_gt_1(z+3) ){
@@ -127653,7 +134627,7 @@ SQLITE_PRIVATE int sqlite3Fts3InitTokenizer(
 
 #ifdef SQLITE_TEST
 
-/* #include <tcl.h> */
+#include <tcl.h>
 /* #include <string.h> */
 
 /*
@@ -128824,6 +135798,7 @@ struct SegmentWriter {
   int nSize;                      /* Size of allocation at aData */
   int nData;                      /* Bytes of data in aData */
   char *aData;                    /* Pointer to block from malloc() */
+  i64 nLeafData;                  /* Number of bytes of leaf data written */
 };
 
 /*
@@ -128899,6 +135874,10 @@ struct SegmentNode {
 #define SQL_SELECT_INDEXES            35
 #define SQL_SELECT_MXLEVEL            36
 
+#define SQL_SELECT_LEVEL_RANGE2       37
+#define SQL_UPDATE_LEVEL_IDX          38
+#define SQL_UPDATE_LEVEL              39
+
 /*
 ** This function is used to obtain an SQLite prepared statement handle
 ** for the statement identified by the second argument. If successful,
@@ -129000,7 +135979,18 @@ static int fts3SqlStmt(
 
 /* SQL_SELECT_MXLEVEL
 **   Return the largest relative level in the FTS index or indexes.  */
-/* 36 */  "SELECT max( level %% 1024 ) FROM %Q.'%q_segdir'"
+/* 36 */  "SELECT max( level %% 1024 ) FROM %Q.'%q_segdir'",
+
+          /* Return segments in order from oldest to newest.*/ 
+/* 37 */  "SELECT level, idx, end_block "
+            "FROM %Q.'%q_segdir' WHERE level BETWEEN ? AND ? "
+            "ORDER BY level DESC, idx ASC",
+
+          /* Update statements used while promoting segments */
+/* 38 */  "UPDATE OR FAIL %Q.'%q_segdir' SET level=-1,idx=? "
+            "WHERE level=? AND idx=?",
+/* 39 */  "UPDATE OR FAIL %Q.'%q_segdir' SET level=? WHERE level=-1"
+
   };
   int rc = SQLITE_OK;
   sqlite3_stmt *pStmt;
@@ -129120,37 +136110,30 @@ static void fts3SqlExec(
 
 
 /*
-** This function ensures that the caller has obtained a shared-cache
-** table-lock on the %_content table. This is required before reading
-** data from the fts3 table. If this lock is not acquired first, then
-** the caller may end up holding read-locks on the %_segments and %_segdir
-** tables, but no read-lock on the %_content table. If this happens 
-** a second connection will be able to write to the fts3 table, but
-** attempting to commit those writes might return SQLITE_LOCKED or
-** SQLITE_LOCKED_SHAREDCACHE (because the commit attempts to obtain 
-** write-locks on the %_segments and %_segdir ** tables). 
+** This function ensures that the caller has obtained an exclusive 
+** shared-cache table-lock on the %_segdir table. This is required before 
+** writing data to the fts3 table. If this lock is not acquired first, then
+** the caller may end up attempting to take this lock as part of committing
+** a transaction, causing SQLite to return SQLITE_LOCKED or 
+** LOCKED_SHAREDCACHEto a COMMIT command.
 **
-** We try to avoid this because if FTS3 returns any error when committing
-** a transaction, the whole transaction will be rolled back. And this is
-** not what users expect when they get SQLITE_LOCKED_SHAREDCACHE. It can
-** still happen if the user reads data directly from the %_segments or
-** %_segdir tables instead of going through FTS3 though.
-**
-** This reasoning does not apply to a content=xxx table.
+** It is best to avoid this because if FTS3 returns any error when 
+** committing a transaction, the whole transaction will be rolled back. 
+** And this is not what users expect when they get SQLITE_LOCKED_SHAREDCACHE. 
+** It can still happen if the user locks the underlying tables directly 
+** instead of accessing them via FTS.
 */
-SQLITE_PRIVATE int sqlite3Fts3ReadLock(Fts3Table *p){
-  int rc;                         /* Return code */
-  sqlite3_stmt *pStmt;            /* Statement used to obtain lock */
-
-  if( p->zContentTbl==0 ){
-    rc = fts3SqlStmt(p, SQL_SELECT_CONTENT_BY_ROWID, &pStmt, 0);
+static int fts3Writelock(Fts3Table *p){
+  int rc = SQLITE_OK;
+  
+  if( p->nPendingData==0 ){
+    sqlite3_stmt *pStmt;
+    rc = fts3SqlStmt(p, SQL_DELETE_SEGDIR_LEVEL, &pStmt, 0);
     if( rc==SQLITE_OK ){
       sqlite3_bind_null(pStmt, 1);
       sqlite3_step(pStmt);
       rc = sqlite3_reset(pStmt);
     }
-  }else{
-    rc = SQLITE_OK;
   }
 
   return rc;
@@ -129538,12 +136521,15 @@ static int fts3InsertTerms(
 ){
   int i;                          /* Iterator variable */
   for(i=2; i<p->nColumn+2; i++){
-    const char *zText = (const char *)sqlite3_value_text(apVal[i]);
-    int rc = fts3PendingTermsAdd(p, iLangid, zText, i-2, &aSz[i-2]);
-    if( rc!=SQLITE_OK ){
-      return rc;
+    int iCol = i-2;
+    if( p->abNotindexed[iCol]==0 ){
+      const char *zText = (const char *)sqlite3_value_text(apVal[i]);
+      int rc = fts3PendingTermsAdd(p, iLangid, zText, iCol, &aSz[iCol]);
+      if( rc!=SQLITE_OK ){
+        return rc;
+      }
+      aSz[p->nColumn] += sqlite3_value_bytes(apVal[i]);
     }
-    aSz[p->nColumn] += sqlite3_value_bytes(apVal[i]);
   }
   return SQLITE_OK;
 }
@@ -129690,9 +136676,12 @@ static void fts3DeleteTerms(
       int iLangid = langidFromSelect(p, pSelect);
       rc = fts3PendingTermsDocid(p, iLangid, sqlite3_column_int64(pSelect, 0));
       for(i=1; rc==SQLITE_OK && i<=p->nColumn; i++){
-        const char *zText = (const char *)sqlite3_column_text(pSelect, i);
-        rc = fts3PendingTermsAdd(p, iLangid, zText, -1, &aSz[i-1]);
-        aSz[p->nColumn] += sqlite3_column_bytes(pSelect, i);
+        int iCol = i-1;
+        if( p->abNotindexed[iCol]==0 ){
+          const char *zText = (const char *)sqlite3_column_text(pSelect, i);
+          rc = fts3PendingTermsAdd(p, iLangid, zText, -1, &aSz[iCol]);
+          aSz[p->nColumn] += sqlite3_column_bytes(pSelect, i);
+        }
       }
       if( rc!=SQLITE_OK ){
         sqlite3_reset(pSelect);
@@ -129976,8 +136965,8 @@ static int fts3SegReaderNext(
   
   /* Because of the FTS3_NODE_PADDING bytes of padding, the following is 
   ** safe (no risk of overread) even if the node data is corrupted. */
-  pNext += sqlite3Fts3GetVarint32(pNext, &nPrefix);
-  pNext += sqlite3Fts3GetVarint32(pNext, &nSuffix);
+  pNext += fts3GetVarint32(pNext, &nPrefix);
+  pNext += fts3GetVarint32(pNext, &nSuffix);
   if( nPrefix<0 || nSuffix<=0 
    || &pNext[nSuffix]>&pReader->aNode[pReader->nNode] 
   ){
@@ -130000,7 +136989,7 @@ static int fts3SegReaderNext(
   memcpy(&pReader->zTerm[nPrefix], pNext, nSuffix);
   pReader->nTerm = nPrefix+nSuffix;
   pNext += nSuffix;
-  pNext += sqlite3Fts3GetVarint32(pNext, &pReader->nDoclist);
+  pNext += fts3GetVarint32(pNext, &pReader->nDoclist);
   pReader->aDoclist = pNext;
   pReader->pOffsetList = 0;
 
@@ -130093,7 +137082,7 @@ static int fts3SegReaderNextDocid(
       /* The following line of code (and the "p++" below the while() loop) is
       ** normally all that is required to move pointer p to the desired 
       ** position. The exception is if this node is being loaded from disk
-      ** incrementally and pointer "p" now points to the first byte passed
+      ** incrementally and pointer "p" now points to the first byte past
       ** the populated part of pReader->aNode[].
       */
       while( *p | c ) c = *p++ & 0x80;
@@ -130542,6 +137531,7 @@ static int fts3WriteSegdir(
   sqlite3_int64 iStartBlock,      /* Value for "start_block" field */
   sqlite3_int64 iLeafEndBlock,    /* Value for "leaves_end_block" field */
   sqlite3_int64 iEndBlock,        /* Value for "end_block" field */
+  sqlite3_int64 nLeafData,        /* Bytes of leaf data in segment */
   char *zRoot,                    /* Blob value for "root" field */
   int nRoot                       /* Number of bytes in buffer zRoot */
 ){
@@ -130552,7 +137542,13 @@ static int fts3WriteSegdir(
     sqlite3_bind_int(pStmt, 2, iIdx);
     sqlite3_bind_int64(pStmt, 3, iStartBlock);
     sqlite3_bind_int64(pStmt, 4, iLeafEndBlock);
-    sqlite3_bind_int64(pStmt, 5, iEndBlock);
+    if( nLeafData==0 ){
+      sqlite3_bind_int64(pStmt, 5, iEndBlock);
+    }else{
+      char *zEnd = sqlite3_mprintf("%lld %lld", iEndBlock, nLeafData);
+      if( !zEnd ) return SQLITE_NOMEM;
+      sqlite3_bind_text(pStmt, 5, zEnd, -1, sqlite3_free);
+    }
     sqlite3_bind_blob(pStmt, 6, zRoot, nRoot, SQLITE_STATIC);
     sqlite3_step(pStmt);
     rc = sqlite3_reset(pStmt);
@@ -130878,6 +137874,9 @@ static int fts3SegWriterAdd(
       nDoclist;                             /* Doclist data */
   }
 
+  /* Increase the total number of bytes written to account for the new entry. */
+  pWriter->nLeafData += nReq;
+
   /* If the buffer currently allocated is too small for this entry, realloc
   ** the buffer to make it large enough.
   */
@@ -130949,13 +137948,13 @@ static int fts3SegWriterFlush(
           pWriter->iFirst, pWriter->iFree, &iLast, &zRoot, &nRoot);
     }
     if( rc==SQLITE_OK ){
-      rc = fts3WriteSegdir(
-          p, iLevel, iIdx, pWriter->iFirst, iLastLeaf, iLast, zRoot, nRoot);
+      rc = fts3WriteSegdir(p, iLevel, iIdx, 
+          pWriter->iFirst, iLastLeaf, iLast, pWriter->nLeafData, zRoot, nRoot);
     }
   }else{
     /* The entire tree fits on the root node. Write it to the segdir table. */
-    rc = fts3WriteSegdir(
-        p, iLevel, iIdx, 0, 0, 0, pWriter->aData, pWriter->nData);
+    rc = fts3WriteSegdir(p, iLevel, iIdx, 
+        0, 0, 0, pWriter->nLeafData, pWriter->aData, pWriter->nData);
   }
   p->nLeafAdd++;
   return rc;
@@ -131039,6 +138038,37 @@ static int fts3SegmentMaxLevel(
   return sqlite3_reset(pStmt);
 }
 
+/*
+** iAbsLevel is an absolute level that may be assumed to exist within
+** the database. This function checks if it is the largest level number
+** within its index. Assuming no error occurs, *pbMax is set to 1 if
+** iAbsLevel is indeed the largest level, or 0 otherwise, and SQLITE_OK
+** is returned. If an error occurs, an error code is returned and the
+** final value of *pbMax is undefined.
+*/
+static int fts3SegmentIsMaxLevel(Fts3Table *p, i64 iAbsLevel, int *pbMax){
+
+  /* Set pStmt to the compiled version of:
+  **
+  **   SELECT max(level) FROM %Q.'%q_segdir' WHERE level BETWEEN ? AND ?
+  **
+  ** (1024 is actually the value of macro FTS3_SEGDIR_PREFIXLEVEL_STR).
+  */
+  sqlite3_stmt *pStmt;
+  int rc = fts3SqlStmt(p, SQL_SELECT_SEGDIR_MAX_LEVEL, &pStmt, 0);
+  if( rc!=SQLITE_OK ) return rc;
+  sqlite3_bind_int64(pStmt, 1, iAbsLevel+1);
+  sqlite3_bind_int64(pStmt, 2, 
+      ((iAbsLevel/FTS3_SEGDIR_MAXLEVEL)+1) * FTS3_SEGDIR_MAXLEVEL
+  );
+
+  *pbMax = 0;
+  if( SQLITE_ROW==sqlite3_step(pStmt) ){
+    *pbMax = sqlite3_column_type(pStmt, 0)==SQLITE_NULL;
+  }
+  return sqlite3_reset(pStmt);
+}
+
 /*
 ** Delete all entries in the %_segments table associated with the segment
 ** opened with seg-reader pSeg. This function does not affect the contents
@@ -131161,7 +138191,7 @@ static void fts3ColumnFilter(
       break;
     }
     p = &pList[1];
-    p += sqlite3Fts3GetVarint32(p, &iCurrent);
+    p += fts3GetVarint32(p, &iCurrent);
   }
 
   if( bZero && &pList[nList]!=pEnd ){
@@ -131480,8 +138510,8 @@ SQLITE_PRIVATE int sqlite3Fts3SegReaderStep(
       fts3SegReaderSort(apSegment, nMerge, nMerge, xCmp);
       while( apSegment[0]->pOffsetList ){
         int j;                    /* Number of segments that share a docid */
-        char *pList;
-        int nList;
+        char *pList = 0;
+        int nList = 0;
         int nByte;
         sqlite3_int64 iDocid = apSegment[0]->iDocid;
         fts3SegReaderNextDocid(p, apSegment[0], &pList, &nList);
@@ -131574,6 +138604,140 @@ SQLITE_PRIVATE void sqlite3Fts3SegReaderFinish(
   }
 }
 
+/*
+** Decode the "end_block" field, selected by column iCol of the SELECT 
+** statement passed as the first argument. 
+**
+** The "end_block" field may contain either an integer, or a text field
+** containing the text representation of two non-negative integers separated 
+** by one or more space (0x20) characters. In the first case, set *piEndBlock 
+** to the integer value and *pnByte to zero before returning. In the second, 
+** set *piEndBlock to the first value and *pnByte to the second.
+*/
+static void fts3ReadEndBlockField(
+  sqlite3_stmt *pStmt, 
+  int iCol, 
+  i64 *piEndBlock,
+  i64 *pnByte
+){
+  const unsigned char *zText = sqlite3_column_text(pStmt, iCol);
+  if( zText ){
+    int i;
+    int iMul = 1;
+    i64 iVal = 0;
+    for(i=0; zText[i]>='0' && zText[i]<='9'; i++){
+      iVal = iVal*10 + (zText[i] - '0');
+    }
+    *piEndBlock = iVal;
+    while( zText[i]==' ' ) i++;
+    iVal = 0;
+    if( zText[i]=='-' ){
+      i++;
+      iMul = -1;
+    }
+    for(/* no-op */; zText[i]>='0' && zText[i]<='9'; i++){
+      iVal = iVal*10 + (zText[i] - '0');
+    }
+    *pnByte = (iVal * (i64)iMul);
+  }
+}
+
+
+/*
+** A segment of size nByte bytes has just been written to absolute level
+** iAbsLevel. Promote any segments that should be promoted as a result.
+*/
+static int fts3PromoteSegments(
+  Fts3Table *p,                   /* FTS table handle */
+  sqlite3_int64 iAbsLevel,        /* Absolute level just updated */
+  sqlite3_int64 nByte             /* Size of new segment at iAbsLevel */
+){
+  int rc = SQLITE_OK;
+  sqlite3_stmt *pRange;
+
+  rc = fts3SqlStmt(p, SQL_SELECT_LEVEL_RANGE2, &pRange, 0);
+
+  if( rc==SQLITE_OK ){
+    int bOk = 0;
+    i64 iLast = (iAbsLevel/FTS3_SEGDIR_MAXLEVEL + 1) * FTS3_SEGDIR_MAXLEVEL - 1;
+    i64 nLimit = (nByte*3)/2;
+
+    /* Loop through all entries in the %_segdir table corresponding to 
+    ** segments in this index on levels greater than iAbsLevel. If there is
+    ** at least one such segment, and it is possible to determine that all 
+    ** such segments are smaller than nLimit bytes in size, they will be 
+    ** promoted to level iAbsLevel.  */
+    sqlite3_bind_int64(pRange, 1, iAbsLevel+1);
+    sqlite3_bind_int64(pRange, 2, iLast);
+    while( SQLITE_ROW==sqlite3_step(pRange) ){
+      i64 nSize = 0, dummy;
+      fts3ReadEndBlockField(pRange, 2, &dummy, &nSize);
+      if( nSize<=0 || nSize>nLimit ){
+        /* If nSize==0, then the %_segdir.end_block field does not not 
+        ** contain a size value. This happens if it was written by an
+        ** old version of FTS. In this case it is not possible to determine
+        ** the size of the segment, and so segment promotion does not
+        ** take place.  */
+        bOk = 0;
+        break;
+      }
+      bOk = 1;
+    }
+    rc = sqlite3_reset(pRange);
+
+    if( bOk ){
+      int iIdx = 0;
+      sqlite3_stmt *pUpdate1;
+      sqlite3_stmt *pUpdate2;
+
+      if( rc==SQLITE_OK ){
+        rc = fts3SqlStmt(p, SQL_UPDATE_LEVEL_IDX, &pUpdate1, 0);
+      }
+      if( rc==SQLITE_OK ){
+        rc = fts3SqlStmt(p, SQL_UPDATE_LEVEL, &pUpdate2, 0);
+      }
+
+      if( rc==SQLITE_OK ){
+
+        /* Loop through all %_segdir entries for segments in this index with
+        ** levels equal to or greater than iAbsLevel. As each entry is visited,
+        ** updated it to set (level = -1) and (idx = N), where N is 0 for the
+        ** oldest segment in the range, 1 for the next oldest, and so on.
+        **
+        ** In other words, move all segments being promoted to level -1,
+        ** setting the "idx" fields as appropriate to keep them in the same
+        ** order. The contents of level -1 (which is never used, except
+        ** transiently here), will be moved back to level iAbsLevel below.  */
+        sqlite3_bind_int64(pRange, 1, iAbsLevel);
+        while( SQLITE_ROW==sqlite3_step(pRange) ){
+          sqlite3_bind_int(pUpdate1, 1, iIdx++);
+          sqlite3_bind_int(pUpdate1, 2, sqlite3_column_int(pRange, 0));
+          sqlite3_bind_int(pUpdate1, 3, sqlite3_column_int(pRange, 1));
+          sqlite3_step(pUpdate1);
+          rc = sqlite3_reset(pUpdate1);
+          if( rc!=SQLITE_OK ){
+            sqlite3_reset(pRange);
+            break;
+          }
+        }
+      }
+      if( rc==SQLITE_OK ){
+        rc = sqlite3_reset(pRange);
+      }
+
+      /* Move level -1 to level iAbsLevel */
+      if( rc==SQLITE_OK ){
+        sqlite3_bind_int64(pUpdate2, 1, iAbsLevel);
+        sqlite3_step(pUpdate2);
+        rc = sqlite3_reset(pUpdate2);
+      }
+    }
+  }
+
+
+  return rc;
+}
+
 /*
 ** Merge all level iLevel segments in the database into a single 
 ** iLevel+1 segment. Or, if iLevel<0, merge all segments into a
@@ -131598,6 +138762,7 @@ static int fts3SegmentMerge(
   Fts3SegFilter filter;           /* Segment term filter condition */
   Fts3MultiSegReader csr;         /* Cursor to iterate through level(s) */
   int bIgnoreEmpty = 0;           /* True to ignore empty segments */
+  i64 iMaxLevel = 0;              /* Max level number for this index/langid */
 
   assert( iLevel==FTS3_SEGCURSOR_ALL
        || iLevel==FTS3_SEGCURSOR_PENDING
@@ -131609,6 +138774,11 @@ static int fts3SegmentMerge(
   rc = sqlite3Fts3SegReaderCursor(p, iLangid, iIndex, iLevel, 0, 0, 1, 0, &csr);
   if( rc!=SQLITE_OK || csr.nSegment==0 ) goto finished;
 
+  if( iLevel!=FTS3_SEGCURSOR_PENDING ){
+    rc = fts3SegmentMaxLevel(p, iLangid, iIndex, &iMaxLevel);
+    if( rc!=SQLITE_OK ) goto finished;
+  }
+
   if( iLevel==FTS3_SEGCURSOR_ALL ){
     /* This call is to merge all segments in the database to a single
     ** segment. The level of the new segment is equal to the numerically
@@ -131618,21 +138788,21 @@ static int fts3SegmentMerge(
       rc = SQLITE_DONE;
       goto finished;
     }
-    rc = fts3SegmentMaxLevel(p, iLangid, iIndex, &iNewLevel);
+    iNewLevel = iMaxLevel;
     bIgnoreEmpty = 1;
 
-  }else if( iLevel==FTS3_SEGCURSOR_PENDING ){
-    iNewLevel = getAbsoluteLevel(p, iLangid, iIndex, 0);
-    rc = fts3AllocateSegdirIdx(p, iLangid, iIndex, 0, &iIdx);
   }else{
     /* This call is to merge all segments at level iLevel. find the next
     ** available segment index at level iLevel+1. The call to
     ** fts3AllocateSegdirIdx() will merge the segments at level iLevel+1 to 
     ** a single iLevel+2 segment if necessary.  */
-    rc = fts3AllocateSegdirIdx(p, iLangid, iIndex, iLevel+1, &iIdx);
+    assert( FTS3_SEGCURSOR_PENDING==-1 );
     iNewLevel = getAbsoluteLevel(p, iLangid, iIndex, iLevel+1);
+    rc = fts3AllocateSegdirIdx(p, iLangid, iIndex, iLevel+1, &iIdx);
+    bIgnoreEmpty = (iLevel!=FTS3_SEGCURSOR_PENDING) && (iNewLevel>iMaxLevel);
   }
   if( rc!=SQLITE_OK ) goto finished;
+
   assert( csr.nSegment>0 );
   assert( iNewLevel>=getAbsoluteLevel(p, iLangid, iIndex, 0) );
   assert( iNewLevel<getAbsoluteLevel(p, iLangid, iIndex,FTS3_SEGDIR_MAXLEVEL) );
@@ -131649,7 +138819,7 @@ static int fts3SegmentMerge(
         csr.zTerm, csr.nTerm, csr.aDoclist, csr.nDoclist);
   }
   if( rc!=SQLITE_OK ) goto finished;
-  assert( pWriter );
+  assert( pWriter || bIgnoreEmpty );
 
   if( iLevel!=FTS3_SEGCURSOR_PENDING ){
     rc = fts3DeleteSegdir(
@@ -131657,7 +138827,14 @@ static int fts3SegmentMerge(
     );
     if( rc!=SQLITE_OK ) goto finished;
   }
-  rc = fts3SegWriterFlush(p, pWriter, iNewLevel, iIdx);
+  if( pWriter ){
+    rc = fts3SegWriterFlush(p, pWriter, iNewLevel, iIdx);
+    if( rc==SQLITE_OK ){
+      if( iLevel==FTS3_SEGCURSOR_PENDING || iNewLevel<iMaxLevel ){
+        rc = fts3PromoteSegments(p, iNewLevel, pWriter->nLeafData);
+      }
+    }
+  }
 
  finished:
   fts3SegWriterFree(pWriter);
@@ -131667,7 +138844,7 @@ static int fts3SegmentMerge(
 
 
 /* 
-** Flush the contents of pendingTerms to level 0 segments.
+** Flush the contents of pendingTerms to level 0 segments. 
 */
 SQLITE_PRIVATE int sqlite3Fts3PendingTermsFlush(Fts3Table *p){
   int rc = SQLITE_OK;
@@ -131683,14 +138860,19 @@ SQLITE_PRIVATE int sqlite3Fts3PendingTermsFlush(Fts3Table *p){
   ** estimate the number of leaf blocks of content to be written
   */
   if( rc==SQLITE_OK && p->bHasStat
-   && p->bAutoincrmerge==0xff && p->nLeafAdd>0
+   && p->nAutoincrmerge==0xff && p->nLeafAdd>0
   ){
     sqlite3_stmt *pStmt = 0;
     rc = fts3SqlStmt(p, SQL_SELECT_STAT, &pStmt, 0);
     if( rc==SQLITE_OK ){
       sqlite3_bind_int(pStmt, 1, FTS_STAT_AUTOINCRMERGE);
       rc = sqlite3_step(pStmt);
-      p->bAutoincrmerge = (rc==SQLITE_ROW && sqlite3_column_int(pStmt, 0));
+      if( rc==SQLITE_ROW ){
+        p->nAutoincrmerge = sqlite3_column_int(pStmt, 0);
+        if( p->nAutoincrmerge==1 ) p->nAutoincrmerge = 8;
+      }else if( rc==SQLITE_DONE ){
+        p->nAutoincrmerge = 0;
+      }
       rc = sqlite3_reset(pStmt);
     }
   }
@@ -131934,9 +139116,11 @@ static int fts3DoRebuild(Fts3Table *p){
       rc = fts3PendingTermsDocid(p, iLangid, sqlite3_column_int64(pStmt, 0));
       memset(aSz, 0, sizeof(aSz[0]) * (p->nColumn+1));
       for(iCol=0; rc==SQLITE_OK && iCol<p->nColumn; iCol++){
-        const char *z = (const char *) sqlite3_column_text(pStmt, iCol+1);
-        rc = fts3PendingTermsAdd(p, iLangid, z, iCol, &aSz[iCol]);
-        aSz[p->nColumn] += sqlite3_column_bytes(pStmt, iCol+1);
+        if( p->abNotindexed[iCol]==0 ){
+          const char *z = (const char *) sqlite3_column_text(pStmt, iCol+1);
+          rc = fts3PendingTermsAdd(p, iLangid, z, iCol, &aSz[iCol]);
+          aSz[p->nColumn] += sqlite3_column_bytes(pStmt, iCol+1);
+        }
       }
       if( p->bHasDocsize ){
         fts3InsertDocsize(&rc, p, aSz);
@@ -132056,6 +139240,8 @@ struct IncrmergeWriter {
   int iIdx;                       /* Index of *output* segment in iAbsLevel+1 */
   sqlite3_int64 iStart;           /* Block number of first allocated block */
   sqlite3_int64 iEnd;             /* Block number of last allocated block */
+  sqlite3_int64 nLeafData;        /* Bytes of leaf page data so far */
+  u8 bNoLeafData;                 /* If true, store 0 for segment size */
   NodeWriter aNodeWriter[FTS_MAX_APPENDABLE_HEIGHT];
 };
 
@@ -132124,9 +139310,9 @@ static int nodeReaderNext(NodeReader *p){
     p->aNode = 0;
   }else{
     if( bFirst==0 ){
-      p->iOff += sqlite3Fts3GetVarint32(&p->aNode[p->iOff], &nPrefix);
+      p->iOff += fts3GetVarint32(&p->aNode[p->iOff], &nPrefix);
     }
-    p->iOff += sqlite3Fts3GetVarint32(&p->aNode[p->iOff], &nSuffix);
+    p->iOff += fts3GetVarint32(&p->aNode[p->iOff], &nSuffix);
 
     blobGrowBuffer(&p->term, nPrefix+nSuffix, &rc);
     if( rc==SQLITE_OK ){
@@ -132134,7 +139320,7 @@ static int nodeReaderNext(NodeReader *p){
       p->term.n = nPrefix+nSuffix;
       p->iOff += nSuffix;
       if( p->iChild==0 ){
-        p->iOff += sqlite3Fts3GetVarint32(&p->aNode[p->iOff], &p->nDoclist);
+        p->iOff += fts3GetVarint32(&p->aNode[p->iOff], &p->nDoclist);
         p->aDoclist = &p->aNode[p->iOff];
         p->iOff += p->nDoclist;
       }
@@ -132394,8 +139580,8 @@ static int fts3IncrmergeAppend(
     nSpace += sqlite3Fts3VarintLen(nDoclist) + nDoclist;
   }
 
+  pWriter->nLeafData += nSpace;
   blobGrowBuffer(&pLeaf->block, pLeaf->block.n + nSpace, &rc);
-
   if( rc==SQLITE_OK ){
     if( pLeaf->block.n==0 ){
       pLeaf->block.n = 1;
@@ -132494,6 +139680,7 @@ static void fts3IncrmergeRelease(
         pWriter->iStart,                    /* start_block */
         pWriter->aNodeWriter[0].iBlock,     /* leaves_end_block */
         pWriter->iEnd,                      /* end_block */
+        (pWriter->bNoLeafData==0 ? pWriter->nLeafData : 0),   /* end_block */
         pRoot->block.a, pRoot->block.n      /* root */
     );
   }
@@ -132595,7 +139782,11 @@ static int fts3IncrmergeLoad(
     if( sqlite3_step(pSelect)==SQLITE_ROW ){
       iStart = sqlite3_column_int64(pSelect, 1);
       iLeafEnd = sqlite3_column_int64(pSelect, 2);
-      iEnd = sqlite3_column_int64(pSelect, 3);
+      fts3ReadEndBlockField(pSelect, 3, &iEnd, &pWriter->nLeafData);
+      if( pWriter->nLeafData<0 ){
+        pWriter->nLeafData = pWriter->nLeafData * -1;
+      }
+      pWriter->bNoLeafData = (pWriter->nLeafData==0);
       nRoot = sqlite3_column_bytes(pSelect, 4);
       aRoot = sqlite3_column_blob(pSelect, 4);
     }else{
@@ -133186,7 +140377,7 @@ static int fts3IncrmergeHintPop(Blob *pHint, i64 *piAbsLevel, int *pnInput){
 
   pHint->n = i;
   i += sqlite3Fts3GetVarint(&pHint->a[i], piAbsLevel);
-  i += sqlite3Fts3GetVarint32(&pHint->a[i], pnInput);
+  i += fts3GetVarint32(&pHint->a[i], pnInput);
   if( i!=nHint ) return SQLITE_CORRUPT_VTAB;
 
   return SQLITE_OK;
@@ -133196,11 +140387,11 @@ static int fts3IncrmergeHintPop(Blob *pHint, i64 *piAbsLevel, int *pnInput){
 /*
 ** Attempt an incremental merge that writes nMerge leaf blocks.
 **
-** Incremental merges happen nMin segments at a time. The two
-** segments to be merged are the nMin oldest segments (the ones with
-** the smallest indexes) in the highest level that contains at least
-** nMin segments. Multiple merges might occur in an attempt to write the 
-** quota of nMerge leaf blocks.
+** Incremental merges happen nMin segments at a time. The segments 
+** to be merged are the nMin oldest segments (the ones with the smallest 
+** values for the _segdir.idx field) in the highest level that contains 
+** at least nMin segments. Multiple merges might occur in an attempt to 
+** write the quota of nMerge leaf blocks.
 */
 SQLITE_PRIVATE int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){
   int rc;                         /* Return code */
@@ -133225,6 +140416,7 @@ SQLITE_PRIVATE int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){
     const i64 nMod = FTS3_SEGDIR_MAXLEVEL * p->nIndex;
     sqlite3_stmt *pFindLevel = 0; /* SQL used to determine iAbsLevel */
     int bUseHint = 0;             /* True if attempting to append */
+    int iIdx = 0;                 /* Largest idx in level (iAbsLevel+1) */
 
     /* Search the %_segdir table for the absolute level with the smallest
     ** relative level number that contains at least nMin segments, if any.
@@ -133278,6 +140470,19 @@ SQLITE_PRIVATE int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){
     ** to start work on some other level.  */
     memset(pWriter, 0, nAlloc);
     pFilter->flags = FTS3_SEGMENT_REQUIRE_POS;
+
+    if( rc==SQLITE_OK ){
+      rc = fts3IncrmergeOutputIdx(p, iAbsLevel, &iIdx);
+      assert( bUseHint==1 || bUseHint==0 );
+      if( iIdx==0 || (bUseHint && iIdx==1) ){
+        int bIgnore = 0;
+        rc = fts3SegmentIsMaxLevel(p, iAbsLevel+1, &bIgnore);
+        if( bIgnore ){
+          pFilter->flags |= FTS3_SEGMENT_IGNORE_EMPTY;
+        }
+      }
+    }
+
     if( rc==SQLITE_OK ){
       rc = fts3IncrmergeCsr(p, iAbsLevel, nSeg, pCsr);
     }
@@ -133285,16 +140490,12 @@ SQLITE_PRIVATE int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){
      && SQLITE_OK==(rc = sqlite3Fts3SegReaderStart(p, pCsr, pFilter))
      && SQLITE_ROW==(rc = sqlite3Fts3SegReaderStep(p, pCsr))
     ){
-      int iIdx = 0;               /* Largest idx in level (iAbsLevel+1) */
-      rc = fts3IncrmergeOutputIdx(p, iAbsLevel, &iIdx);
-      if( rc==SQLITE_OK ){
-        if( bUseHint && iIdx>0 ){
-          const char *zKey = pCsr->zTerm;
-          int nKey = pCsr->nTerm;
-          rc = fts3IncrmergeLoad(p, iAbsLevel, iIdx-1, zKey, nKey, pWriter);
-        }else{
-          rc = fts3IncrmergeWriter(p, iAbsLevel, iIdx, pCsr, pWriter);
-        }
+      if( bUseHint && iIdx>0 ){
+        const char *zKey = pCsr->zTerm;
+        int nKey = pCsr->nTerm;
+        rc = fts3IncrmergeLoad(p, iAbsLevel, iIdx-1, zKey, nKey, pWriter);
+      }else{
+        rc = fts3IncrmergeWriter(p, iAbsLevel, iIdx, pCsr, pWriter);
       }
 
       if( rc==SQLITE_OK && pWriter->nLeafEst ){
@@ -133316,7 +140517,13 @@ SQLITE_PRIVATE int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){
         }
       }
 
+      if( nSeg!=0 ){
+        pWriter->nLeafData = pWriter->nLeafData * -1;
+      }
       fts3IncrmergeRelease(p, pWriter, &rc);
+      if( nSeg==0 && pWriter->bNoLeafData==0 ){
+        fts3PromoteSegments(p, iAbsLevel+1, pWriter->nLeafData);
+      }
     }
 
     sqlite3Fts3SegReaderFinish(pCsr);
@@ -133403,16 +140610,19 @@ static int fts3DoAutoincrmerge(
 ){
   int rc = SQLITE_OK;
   sqlite3_stmt *pStmt = 0;
-  p->bAutoincrmerge = fts3Getint(&zParam)!=0;
+  p->nAutoincrmerge = fts3Getint(&zParam);
+  if( p->nAutoincrmerge==1 || p->nAutoincrmerge>FTS3_MERGE_COUNT ){
+    p->nAutoincrmerge = 8;
+  }
   if( !p->bHasStat ){
     assert( p->bFts4==0 );
     sqlite3Fts3CreateStatTable(&rc, p);
     if( rc ) return rc;
   }
   rc = fts3SqlStmt(p, SQL_REPLACE_STAT, &pStmt, 0);
-  if( rc ) return rc;;
+  if( rc ) return rc;
   sqlite3_bind_int(pStmt, 1, FTS_STAT_AUTOINCRMERGE);
-  sqlite3_bind_int(pStmt, 2, p->bAutoincrmerge);
+  sqlite3_bind_int(pStmt, 2, p->nAutoincrmerge);
   sqlite3_step(pStmt);
   rc = sqlite3_reset(pStmt);
   return rc;
@@ -133680,6 +140890,9 @@ static int fts3SpecialInsert(Fts3Table *p, sqlite3_value *pVal){
   }else if( nVal>11 && 0==sqlite3_strnicmp(zVal, "maxpending=", 9) ){
     p->nMaxPendingData = atoi(&zVal[11]);
     rc = SQLITE_OK;
+  }else if( nVal>21 && 0==sqlite3_strnicmp(zVal, "test-no-incr-doclist=", 21) ){
+    p->bNoIncrDoclist = atoi(&zVal[21]);
+    rc = SQLITE_OK;
 #endif
   }else{
     rc = SQLITE_ERROR;
@@ -133739,32 +140952,34 @@ SQLITE_PRIVATE int sqlite3Fts3CacheDeferredDoclists(Fts3Cursor *pCsr){
     iDocid = sqlite3_column_int64(pCsr->pStmt, 0);
   
     for(i=0; i<p->nColumn && rc==SQLITE_OK; i++){
-      const char *zText = (const char *)sqlite3_column_text(pCsr->pStmt, i+1);
-      sqlite3_tokenizer_cursor *pTC = 0;
-  
-      rc = sqlite3Fts3OpenTokenizer(pT, pCsr->iLangid, zText, -1, &pTC);
-      while( rc==SQLITE_OK ){
-        char const *zToken;       /* Buffer containing token */
-        int nToken = 0;           /* Number of bytes in token */
-        int iDum1 = 0, iDum2 = 0; /* Dummy variables */
-        int iPos = 0;             /* Position of token in zText */
-  
-        rc = pModule->xNext(pTC, &zToken, &nToken, &iDum1, &iDum2, &iPos);
-        for(pDef=pCsr->pDeferred; pDef && rc==SQLITE_OK; pDef=pDef->pNext){
-          Fts3PhraseToken *pPT = pDef->pToken;
-          if( (pDef->iCol>=p->nColumn || pDef->iCol==i)
-           && (pPT->bFirst==0 || iPos==0)
-           && (pPT->n==nToken || (pPT->isPrefix && pPT->n<nToken))
-           && (0==memcmp(zToken, pPT->z, pPT->n))
-          ){
-            fts3PendingListAppend(&pDef->pList, iDocid, i, iPos, &rc);
+      if( p->abNotindexed[i]==0 ){
+        const char *zText = (const char *)sqlite3_column_text(pCsr->pStmt, i+1);
+        sqlite3_tokenizer_cursor *pTC = 0;
+
+        rc = sqlite3Fts3OpenTokenizer(pT, pCsr->iLangid, zText, -1, &pTC);
+        while( rc==SQLITE_OK ){
+          char const *zToken;       /* Buffer containing token */
+          int nToken = 0;           /* Number of bytes in token */
+          int iDum1 = 0, iDum2 = 0; /* Dummy variables */
+          int iPos = 0;             /* Position of token in zText */
+
+          rc = pModule->xNext(pTC, &zToken, &nToken, &iDum1, &iDum2, &iPos);
+          for(pDef=pCsr->pDeferred; pDef && rc==SQLITE_OK; pDef=pDef->pNext){
+            Fts3PhraseToken *pPT = pDef->pToken;
+            if( (pDef->iCol>=p->nColumn || pDef->iCol==i)
+                && (pPT->bFirst==0 || iPos==0)
+                && (pPT->n==nToken || (pPT->isPrefix && pPT->n<nToken))
+                && (0==memcmp(zToken, pPT->z, pPT->n))
+              ){
+              fts3PendingListAppend(&pDef->pList, iDocid, i, iPos, &rc);
+            }
           }
         }
+        if( pTC ) pModule->xClose(pTC);
+        if( rc==SQLITE_DONE ) rc = SQLITE_OK;
       }
-      if( pTC ) pModule->xClose(pTC);
-      if( rc==SQLITE_DONE ) rc = SQLITE_OK;
     }
-  
+
     for(pDef=pCsr->pDeferred; pDef && rc==SQLITE_OK; pDef=pDef->pNext){
       if( pDef->pList ){
         rc = fts3PendingListAppendVarint(&pDef->pList, 0);
@@ -133896,6 +141111,10 @@ SQLITE_PRIVATE int sqlite3Fts3UpdateMethod(
   int nChng = 0;                  /* Net change in number of documents */
   int bInsertDone = 0;
 
+  /* At this point it must be known if the %_stat table exists or not.
+  ** So bHasStat may not be 2.  */
+  assert( p->bHasStat==0 || p->bHasStat==1 );
+
   assert( p->pSegments==0 );
   assert( 
       nArg==1                     /* DELETE operations */
@@ -133928,6 +141147,9 @@ SQLITE_PRIVATE int sqlite3Fts3UpdateMethod(
   aSzIns = &aSzDel[p->nColumn+1];
   memset(aSzDel, 0, sizeof(aSzDel[0])*(p->nColumn+1)*2);
 
+  rc = fts3Writelock(p);
+  if( rc!=SQLITE_OK ) goto update_out;
+
   /* If this is an INSERT operation, or an UPDATE that modifies the rowid
   ** value, then this operation requires constraint handling.
   **
@@ -134171,7 +141393,7 @@ struct StrBuffer {
 */
 static void fts3GetDeltaPosition(char **pp, int *piPos){
   int iVal;
-  *pp += sqlite3Fts3GetVarint32(*pp, &iVal);
+  *pp += fts3GetVarint32(*pp, &iVal);
   *piPos += (iVal-2);
 }
 
@@ -134547,6 +141769,7 @@ static int fts3StringAppend(
     pStr->z = zNew;
     pStr->nAlloc = nAlloc;
   }
+  assert( pStr->z!=0 && (pStr->nAlloc >= pStr->n+nAppend+1) );
 
   /* Append the data to the string buffer. */
   memcpy(&pStr->z[pStr->n], zAppend, nAppend);
@@ -136061,28 +143284,27 @@ SQLITE_PRIVATE int sqlite3FtsUnicodeIsalnum(int c){
     0x02A97004, 0x02A9DC03, 0x02A9EC01, 0x02AAC001, 0x02AAC803,
     0x02AADC02, 0x02AAF802, 0x02AB0401, 0x02AB7802, 0x02ABAC07,
     0x02ABD402, 0x02AF8C0B, 0x03600001, 0x036DFC02, 0x036FFC02,
-    0x037FFC02, 0x03E3FC01, 0x03EC7801, 0x03ECA401, 0x03EEC810,
-    0x03F4F802, 0x03F7F002, 0x03F8001A, 0x03F88007, 0x03F8C023,
-    0x03F95013, 0x03F9A004, 0x03FBFC01, 0x03FC040F, 0x03FC6807,
-    0x03FCEC06, 0x03FD6C0B, 0x03FF8007, 0x03FFA007, 0x03FFE405,
-    0x04040003, 0x0404DC09, 0x0405E411, 0x0406400C, 0x0407402E,
-    0x040E7C01, 0x040F4001, 0x04215C01, 0x04247C01, 0x0424FC01,
-    0x04280403, 0x04281402, 0x04283004, 0x0428E003, 0x0428FC01,
-    0x04294009, 0x0429FC01, 0x042CE407, 0x04400003, 0x0440E016,
-    0x04420003, 0x0442C012, 0x04440003, 0x04449C0E, 0x04450004,
-    0x04460003, 0x0446CC0E, 0x04471404, 0x045AAC0D, 0x0491C004,
-    0x05BD442E, 0x05BE3C04, 0x074000F6, 0x07440027, 0x0744A4B5,
-    0x07480046, 0x074C0057, 0x075B0401, 0x075B6C01, 0x075BEC01,
-    0x075C5401, 0x075CD401, 0x075D3C01, 0x075DBC01, 0x075E2401,
-    0x075EA401, 0x075F0C01, 0x07BBC002, 0x07C0002C, 0x07C0C064,
-    0x07C2800F, 0x07C2C40E, 0x07C3040F, 0x07C3440F, 0x07C4401F,
-    0x07C4C03C, 0x07C5C02B, 0x07C7981D, 0x07C8402B, 0x07C90009,
-    0x07C94002, 0x07CC0021, 0x07CCC006, 0x07CCDC46, 0x07CE0014,
-    0x07CE8025, 0x07CF1805, 0x07CF8011, 0x07D0003F, 0x07D10001,
-    0x07D108B6, 0x07D3E404, 0x07D4003E, 0x07D50004, 0x07D54018,
-    0x07D7EC46, 0x07D9140B, 0x07DA0046, 0x07DC0074, 0x38000401,
-    0x38008060, 0x380400F0, 0x3C000001, 0x3FFFF401, 0x40000001,
-    0x43FFF401,
+    0x037FFC01, 0x03EC7801, 0x03ECA401, 0x03EEC810, 0x03F4F802,
+    0x03F7F002, 0x03F8001A, 0x03F88007, 0x03F8C023, 0x03F95013,
+    0x03F9A004, 0x03FBFC01, 0x03FC040F, 0x03FC6807, 0x03FCEC06,
+    0x03FD6C0B, 0x03FF8007, 0x03FFA007, 0x03FFE405, 0x04040003,
+    0x0404DC09, 0x0405E411, 0x0406400C, 0x0407402E, 0x040E7C01,
+    0x040F4001, 0x04215C01, 0x04247C01, 0x0424FC01, 0x04280403,
+    0x04281402, 0x04283004, 0x0428E003, 0x0428FC01, 0x04294009,
+    0x0429FC01, 0x042CE407, 0x04400003, 0x0440E016, 0x04420003,
+    0x0442C012, 0x04440003, 0x04449C0E, 0x04450004, 0x04460003,
+    0x0446CC0E, 0x04471404, 0x045AAC0D, 0x0491C004, 0x05BD442E,
+    0x05BE3C04, 0x074000F6, 0x07440027, 0x0744A4B5, 0x07480046,
+    0x074C0057, 0x075B0401, 0x075B6C01, 0x075BEC01, 0x075C5401,
+    0x075CD401, 0x075D3C01, 0x075DBC01, 0x075E2401, 0x075EA401,
+    0x075F0C01, 0x07BBC002, 0x07C0002C, 0x07C0C064, 0x07C2800F,
+    0x07C2C40E, 0x07C3040F, 0x07C3440F, 0x07C4401F, 0x07C4C03C,
+    0x07C5C02B, 0x07C7981D, 0x07C8402B, 0x07C90009, 0x07C94002,
+    0x07CC0021, 0x07CCC006, 0x07CCDC46, 0x07CE0014, 0x07CE8025,
+    0x07CF1805, 0x07CF8011, 0x07D0003F, 0x07D10001, 0x07D108B6,
+    0x07D3E404, 0x07D4003E, 0x07D50004, 0x07D54018, 0x07D7EC46,
+    0x07D9140B, 0x07DA0046, 0x07DC0074, 0x38000401, 0x38008060,
+    0x380400F0,
   };
   static const unsigned int aAscii[4] = {
     0xFFFFFFFF, 0xFC00FFFF, 0xF8000001, 0xF8000001,
@@ -136383,48 +143605,6 @@ SQLITE_PRIVATE int sqlite3FtsUnicodeFold(int c, int bRemoveDiacritic){
 
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_RTREE)
 
-/*
-** This file contains an implementation of a couple of different variants
-** of the r-tree algorithm. See the README file for further details. The 
-** same data-structure is used for all, but the algorithms for insert and
-** delete operations vary. The variants used are selected at compile time 
-** by defining the following symbols:
-*/
-
-/* Either, both or none of the following may be set to activate 
-** r*tree variant algorithms.
-*/
-#define VARIANT_RSTARTREE_CHOOSESUBTREE 0
-#define VARIANT_RSTARTREE_REINSERT      1
-
-/* 
-** Exactly one of the following must be set to 1.
-*/
-#define VARIANT_GUTTMAN_QUADRATIC_SPLIT 0
-#define VARIANT_GUTTMAN_LINEAR_SPLIT    0
-#define VARIANT_RSTARTREE_SPLIT         1
-
-#define VARIANT_GUTTMAN_SPLIT \
-        (VARIANT_GUTTMAN_LINEAR_SPLIT||VARIANT_GUTTMAN_QUADRATIC_SPLIT)
-
-#if VARIANT_GUTTMAN_QUADRATIC_SPLIT
-  #define PickNext QuadraticPickNext
-  #define PickSeeds QuadraticPickSeeds
-  #define AssignCells splitNodeGuttman
-#endif
-#if VARIANT_GUTTMAN_LINEAR_SPLIT
-  #define PickNext LinearPickNext
-  #define PickSeeds LinearPickSeeds
-  #define AssignCells splitNodeGuttman
-#endif
-#if VARIANT_RSTARTREE_SPLIT
-  #define AssignCells splitNodeStartree
-#endif
-
-#if !defined(NDEBUG) && !defined(SQLITE_DEBUG) 
-# define NDEBUG 1
-#endif
-
 #ifndef SQLITE_CORE
   SQLITE_EXTENSION_INIT1
 #else
@@ -136432,11 +143612,13 @@ SQLITE_PRIVATE int sqlite3FtsUnicodeFold(int c, int bRemoveDiacritic){
 
 /* #include <string.h> */
 /* #include <assert.h> */
+/* #include <stdio.h> */
 
 #ifndef SQLITE_AMALGAMATION
 #include "sqlite3rtree.h"
 typedef sqlite3_int64 i64;
 typedef unsigned char u8;
+typedef unsigned short u16;
 typedef unsigned int u32;
 #endif
 
@@ -136454,6 +143636,7 @@ typedef struct RtreeConstraint RtreeConstraint;
 typedef struct RtreeMatchArg RtreeMatchArg;
 typedef struct RtreeGeomCallback RtreeGeomCallback;
 typedef union RtreeCoord RtreeCoord;
+typedef struct RtreeSearchPoint RtreeSearchPoint;
 
 /* The rtree may have between 1 and RTREE_MAX_DIMENSIONS dimensions. */
 #define RTREE_MAX_DIMENSIONS 5
@@ -136462,22 +143645,33 @@ typedef union RtreeCoord RtreeCoord;
 ** ever contain very many entries, so a fixed number of buckets is 
 ** used.
 */
-#define HASHSIZE 128
+#define HASHSIZE 97
+
+/* The xBestIndex method of this virtual table requires an estimate of
+** the number of rows in the virtual table to calculate the costs of
+** various strategies. If possible, this estimate is loaded from the
+** sqlite_stat1 table (with RTREE_MIN_ROWEST as a hard-coded minimum).
+** Otherwise, if no sqlite_stat1 entry is available, use 
+** RTREE_DEFAULT_ROWEST.
+*/
+#define RTREE_DEFAULT_ROWEST 1048576
+#define RTREE_MIN_ROWEST         100
 
 /* 
 ** An rtree virtual-table object.
 */
 struct Rtree {
-  sqlite3_vtab base;
+  sqlite3_vtab base;          /* Base class.  Must be first */
   sqlite3 *db;                /* Host database connection */
   int iNodeSize;              /* Size in bytes of each node in the node table */
-  int nDim;                   /* Number of dimensions */
-  int nBytesPerCell;          /* Bytes consumed per cell */
+  u8 nDim;                    /* Number of dimensions */
+  u8 eCoordType;              /* RTREE_COORD_REAL32 or RTREE_COORD_INT32 */
+  u8 nBytesPerCell;           /* Bytes consumed per cell */
   int iDepth;                 /* Current depth of the r-tree structure */
   char *zDb;                  /* Name of database containing r-tree table */
   char *zName;                /* Name of r-tree table */ 
-  RtreeNode *aHash[HASHSIZE]; /* Hash table of in-memory nodes. */ 
   int nBusy;                  /* Current number of users of this structure */
+  i64 nRowEst;                /* Estimated number of rows in this table */
 
   /* List of nodes removed during a CondenseTree operation. List is
   ** linked together via the pointer normally used for hash chains -
@@ -136502,10 +143696,10 @@ struct Rtree {
   sqlite3_stmt *pWriteParent;
   sqlite3_stmt *pDeleteParent;
 
-  int eCoordType;
+  RtreeNode *aHash[HASHSIZE]; /* Hash table of in-memory nodes. */ 
 };
 
-/* Possible values for eCoordType: */
+/* Possible values for Rtree.eCoordType: */
 #define RTREE_COORD_REAL32 0
 #define RTREE_COORD_INT32  1
 
@@ -136517,11 +143711,30 @@ struct Rtree {
 #ifdef SQLITE_RTREE_INT_ONLY
   typedef sqlite3_int64 RtreeDValue;       /* High accuracy coordinate */
   typedef int RtreeValue;                  /* Low accuracy coordinate */
+# define RTREE_ZERO 0
 #else
   typedef double RtreeDValue;              /* High accuracy coordinate */
   typedef float RtreeValue;                /* Low accuracy coordinate */
+# define RTREE_ZERO 0.0
 #endif
 
+/*
+** When doing a search of an r-tree, instances of the following structure
+** record intermediate results from the tree walk.
+**
+** The id is always a node-id.  For iLevel>=1 the id is the node-id of
+** the node that the RtreeSearchPoint represents.  When iLevel==0, however,
+** the id is of the parent node and the cell that RtreeSearchPoint
+** represents is the iCell-th entry in the parent node.
+*/
+struct RtreeSearchPoint {
+  RtreeDValue rScore;    /* The score for this node.  Smallest goes first. */
+  sqlite3_int64 id;      /* Node ID */
+  u8 iLevel;             /* 0=entries.  1=leaf node.  2+ for higher */
+  u8 eWithin;            /* PARTLY_WITHIN or FULLY_WITHIN */
+  u8 iCell;              /* Cell index within the node */
+};
+
 /*
 ** The minimum number of cells allowed for a node is a third of the 
 ** maximum. In Gutman's notation:
@@ -136544,21 +143757,44 @@ struct Rtree {
 */
 #define RTREE_MAX_DEPTH 40
 
+
+/*
+** Number of entries in the cursor RtreeNode cache.  The first entry is
+** used to cache the RtreeNode for RtreeCursor.sPoint.  The remaining
+** entries cache the RtreeNode for the first elements of the priority queue.
+*/
+#define RTREE_CACHE_SZ  5
+
 /* 
 ** An rtree cursor object.
 */
 struct RtreeCursor {
-  sqlite3_vtab_cursor base;
-  RtreeNode *pNode;                 /* Node cursor is currently pointing at */
-  int iCell;                        /* Index of current cell in pNode */
+  sqlite3_vtab_cursor base;         /* Base class.  Must be first */
+  u8 atEOF;                         /* True if at end of search */
+  u8 bPoint;                        /* True if sPoint is valid */
   int iStrategy;                    /* Copy of idxNum search parameter */
   int nConstraint;                  /* Number of entries in aConstraint */
   RtreeConstraint *aConstraint;     /* Search constraints. */
+  int nPointAlloc;                  /* Number of slots allocated for aPoint[] */
+  int nPoint;                       /* Number of slots used in aPoint[] */
+  int mxLevel;                      /* iLevel value for root of the tree */
+  RtreeSearchPoint *aPoint;         /* Priority queue for search points */
+  RtreeSearchPoint sPoint;          /* Cached next search point */
+  RtreeNode *aNode[RTREE_CACHE_SZ]; /* Rtree node cache */
+  u32 anQueue[RTREE_MAX_DEPTH+1];   /* Number of queued entries by iLevel */
 };
 
+/* Return the Rtree of a RtreeCursor */
+#define RTREE_OF_CURSOR(X)   ((Rtree*)((X)->base.pVtab))
+
+/*
+** A coordinate can be either a floating point number or a integer.  All
+** coordinates within a single R-Tree are always of the same time.
+*/
 union RtreeCoord {
-  RtreeValue f;
-  int i;
+  RtreeValue f;      /* Floating point value */
+  int i;             /* Integer value */
+  u32 u;             /* Unsigned for byte-order conversions */
 };
 
 /*
@@ -136583,38 +143819,67 @@ union RtreeCoord {
 struct RtreeConstraint {
   int iCoord;                     /* Index of constrained coordinate */
   int op;                         /* Constraining operation */
-  RtreeDValue rValue;             /* Constraint value. */
-  int (*xGeom)(sqlite3_rtree_geometry*, int, RtreeDValue*, int*);
-  sqlite3_rtree_geometry *pGeom;  /* Constraint callback argument for a MATCH */
+  union {
+    RtreeDValue rValue;             /* Constraint value. */
+    int (*xGeom)(sqlite3_rtree_geometry*,int,RtreeDValue*,int*);
+    int (*xQueryFunc)(sqlite3_rtree_query_info*);
+  } u;
+  sqlite3_rtree_query_info *pInfo;  /* xGeom and xQueryFunc argument */
 };
 
 /* Possible values for RtreeConstraint.op */
-#define RTREE_EQ    0x41
-#define RTREE_LE    0x42
-#define RTREE_LT    0x43
-#define RTREE_GE    0x44
-#define RTREE_GT    0x45
-#define RTREE_MATCH 0x46
+#define RTREE_EQ    0x41  /* A */
+#define RTREE_LE    0x42  /* B */
+#define RTREE_LT    0x43  /* C */
+#define RTREE_GE    0x44  /* D */
+#define RTREE_GT    0x45  /* E */
+#define RTREE_MATCH 0x46  /* F: Old-style sqlite3_rtree_geometry_callback() */
+#define RTREE_QUERY 0x47  /* G: New-style sqlite3_rtree_query_callback() */
+
 
 /* 
 ** An rtree structure node.
 */
 struct RtreeNode {
-  RtreeNode *pParent;               /* Parent node */
-  i64 iNode;
-  int nRef;
-  int isDirty;
-  u8 *zData;
-  RtreeNode *pNext;                 /* Next node in this hash chain */
+  RtreeNode *pParent;         /* Parent node */
+  i64 iNode;                  /* The node number */
+  int nRef;                   /* Number of references to this node */
+  int isDirty;                /* True if the node needs to be written to disk */
+  u8 *zData;                  /* Content of the node, as should be on disk */
+  RtreeNode *pNext;           /* Next node in this hash collision chain */
 };
+
+/* Return the number of cells in a node  */
 #define NCELL(pNode) readInt16(&(pNode)->zData[2])
 
 /* 
-** Structure to store a deserialized rtree record.
+** A single cell from a node, deserialized
 */
 struct RtreeCell {
-  i64 iRowid;
-  RtreeCoord aCoord[RTREE_MAX_DIMENSIONS*2];
+  i64 iRowid;                                 /* Node or entry ID */
+  RtreeCoord aCoord[RTREE_MAX_DIMENSIONS*2];  /* Bounding box coordinates */
+};
+
+
+/*
+** This object becomes the sqlite3_user_data() for the SQL functions
+** that are created by sqlite3_rtree_geometry_callback() and
+** sqlite3_rtree_query_callback() and which appear on the right of MATCH
+** operators in order to constrain a search.
+**
+** xGeom and xQueryFunc are the callback functions.  Exactly one of 
+** xGeom and xQueryFunc fields is non-NULL, depending on whether the
+** SQL function was created using sqlite3_rtree_geometry_callback() or
+** sqlite3_rtree_query_callback().
+** 
+** This object is deleted automatically by the destructor mechanism in
+** sqlite3_create_function_v2().
+*/
+struct RtreeGeomCallback {
+  int (*xGeom)(sqlite3_rtree_geometry*, int, RtreeDValue*, int*);
+  int (*xQueryFunc)(sqlite3_rtree_query_info*);
+  void (*xDestructor)(void*);
+  void *pContext;
 };
 
 
@@ -136626,29 +143891,16 @@ struct RtreeCell {
 #define RTREE_GEOMETRY_MAGIC 0x891245AB
 
 /*
-** An instance of this structure must be supplied as a blob argument to
-** the right-hand-side of an SQL MATCH operator used to constrain an
-** r-tree query.
+** An instance of this structure (in the form of a BLOB) is returned by
+** the SQL functions that sqlite3_rtree_geometry_callback() and
+** sqlite3_rtree_query_callback() create, and is read as the right-hand
+** operand to the MATCH operator of an R-Tree.
 */
 struct RtreeMatchArg {
-  u32 magic;                      /* Always RTREE_GEOMETRY_MAGIC */
-  int (*xGeom)(sqlite3_rtree_geometry *, int, RtreeDValue*, int *);
-  void *pContext;
-  int nParam;
-  RtreeDValue aParam[1];
-};
-
-/*
-** When a geometry callback is created (see sqlite3_rtree_geometry_callback),
-** a single instance of the following structure is allocated. It is used
-** as the context for the user-function created by by s_r_g_c(). The object
-** is eventually deleted by the destructor mechanism provided by
-** sqlite3_create_function_v2() (which is called by s_r_g_c() to create
-** the geometry callback function).
-*/
-struct RtreeGeomCallback {
-  int (*xGeom)(sqlite3_rtree_geometry*, int, RtreeDValue*, int*);
-  void *pContext;
+  u32 magic;                  /* Always RTREE_GEOMETRY_MAGIC */
+  RtreeGeomCallback cb;       /* Info about the callback functions */
+  int nParam;                 /* Number of parameters to the SQL function */
+  RtreeDValue aParam[1];      /* Values for parameters to the SQL function */
 };
 
 #ifndef MAX
@@ -136742,10 +143994,7 @@ static void nodeZero(Rtree *pRtree, RtreeNode *p){
 ** in the Rtree.aHash table.
 */
 static int nodeHash(i64 iNode){
-  return (
-    (iNode>>56) ^ (iNode>>48) ^ (iNode>>40) ^ (iNode>>32) ^ 
-    (iNode>>24) ^ (iNode>>16) ^ (iNode>> 8) ^ (iNode>> 0)
-  ) % HASHSIZE;
+  return iNode % HASHSIZE;
 }
 
 /*
@@ -136805,8 +144054,7 @@ static RtreeNode *nodeNew(Rtree *pRtree, RtreeNode *pParent){
 /*
 ** Obtain a reference to an r-tree node.
 */
-static int
-nodeAcquire(
+static int nodeAcquire(
   Rtree *pRtree,             /* R-tree structure */
   i64 iNode,                 /* Node number to load */
   RtreeNode *pParent,        /* Either the parent node or NULL */
@@ -136895,10 +144143,10 @@ nodeAcquire(
 ** Overwrite cell iCell of node pNode with the contents of pCell.
 */
 static void nodeOverwriteCell(
-  Rtree *pRtree, 
-  RtreeNode *pNode,  
-  RtreeCell *pCell, 
-  int iCell
+  Rtree *pRtree,             /* The overall R-Tree */
+  RtreeNode *pNode,          /* The node into which the cell is to be written */
+  RtreeCell *pCell,          /* The cell to write */
+  int iCell                  /* Index into pNode into which pCell is written */
 ){
   int ii;
   u8 *p = &pNode->zData[4 + pRtree->nBytesPerCell*iCell];
@@ -136910,7 +144158,7 @@ static void nodeOverwriteCell(
 }
 
 /*
-** Remove cell the cell with index iCell from node pNode.
+** Remove the cell with index iCell from node pNode.
 */
 static void nodeDeleteCell(Rtree *pRtree, RtreeNode *pNode, int iCell){
   u8 *pDst = &pNode->zData[4 + pRtree->nBytesPerCell*iCell];
@@ -136927,11 +144175,10 @@ static void nodeDeleteCell(Rtree *pRtree, RtreeNode *pNode, int iCell){
 **
 ** If there is not enough free space in pNode, return SQLITE_FULL.
 */
-static int
-nodeInsertCell(
-  Rtree *pRtree, 
-  RtreeNode *pNode, 
-  RtreeCell *pCell 
+static int nodeInsertCell(
+  Rtree *pRtree,                /* The overall R-Tree */
+  RtreeNode *pNode,             /* Write new cell into this node */
+  RtreeCell *pCell              /* The cell to be inserted */
 ){
   int nCell;                    /* Current number of cells in pNode */
   int nMaxCell;                 /* Maximum number of cells for pNode */
@@ -136952,8 +144199,7 @@ nodeInsertCell(
 /*
 ** If the node is dirty, write it out to the database.
 */
-static int
-nodeWrite(Rtree *pRtree, RtreeNode *pNode){
+static int nodeWrite(Rtree *pRtree, RtreeNode *pNode){
   int rc = SQLITE_OK;
   if( pNode->isDirty ){
     sqlite3_stmt *p = pRtree->pWriteNode;
@@ -136978,8 +144224,7 @@ nodeWrite(Rtree *pRtree, RtreeNode *pNode){
 ** Release a reference to a node. If the node is dirty and the reference
 ** count drops to zero, the node data is written to the database.
 */
-static int
-nodeRelease(Rtree *pRtree, RtreeNode *pNode){
+static int nodeRelease(Rtree *pRtree, RtreeNode *pNode){
   int rc = SQLITE_OK;
   if( pNode ){
     assert( pNode->nRef>0 );
@@ -137007,9 +144252,9 @@ nodeRelease(Rtree *pRtree, RtreeNode *pNode){
 ** an internal node, then the 64-bit integer is a child page number.
 */
 static i64 nodeGetRowid(
-  Rtree *pRtree, 
-  RtreeNode *pNode, 
-  int iCell
+  Rtree *pRtree,       /* The overall R-Tree */
+  RtreeNode *pNode,    /* The node from which to extract the ID */
+  int iCell            /* The cell index from which to extract the ID */
 ){
   assert( iCell<NCELL(pNode) );
   return readInt64(&pNode->zData[4 + pRtree->nBytesPerCell*iCell]);
@@ -137019,11 +144264,11 @@ static i64 nodeGetRowid(
 ** Return coordinate iCoord from cell iCell in node pNode.
 */
 static void nodeGetCoord(
-  Rtree *pRtree, 
-  RtreeNode *pNode, 
-  int iCell,
-  int iCoord,
-  RtreeCoord *pCoord           /* Space to write result to */
+  Rtree *pRtree,               /* The overall R-Tree */
+  RtreeNode *pNode,            /* The node from which to extract a coordinate */
+  int iCell,                   /* The index of the cell within the node */
+  int iCoord,                  /* Which coordinate to extract */
+  RtreeCoord *pCoord           /* OUT: Space to write result to */
 ){
   readCoord(&pNode->zData[12 + pRtree->nBytesPerCell*iCell + 4*iCoord], pCoord);
 }
@@ -137033,15 +144278,20 @@ static void nodeGetCoord(
 ** to by pCell with the results.
 */
 static void nodeGetCell(
-  Rtree *pRtree, 
-  RtreeNode *pNode, 
-  int iCell,
-  RtreeCell *pCell
+  Rtree *pRtree,               /* The overall R-Tree */
+  RtreeNode *pNode,            /* The node containing the cell to be read */
+  int iCell,                   /* Index of the cell within the node */
+  RtreeCell *pCell             /* OUT: Write the cell contents here */
 ){
-  int ii;
+  u8 *pData;
+  u8 *pEnd;
+  RtreeCoord *pCoord;
   pCell->iRowid = nodeGetRowid(pRtree, pNode, iCell);
-  for(ii=0; ii<pRtree->nDim*2; ii++){
-    nodeGetCoord(pRtree, pNode, iCell, ii, &pCell->aCoord[ii]);
+  pData = pNode->zData + (12 + pRtree->nBytesPerCell*iCell);
+  pEnd = pData + pRtree->nDim*8;
+  pCoord = pCell->aCoord;
+  for(; pData<pEnd; pData+=4, pCoord++){
+    readCoord(pData, pCoord);
   }
 }
 
@@ -137167,10 +144417,10 @@ static void freeCursorConstraints(RtreeCursor *pCsr){
   if( pCsr->aConstraint ){
     int i;                        /* Used to iterate through constraint array */
     for(i=0; i<pCsr->nConstraint; i++){
-      sqlite3_rtree_geometry *pGeom = pCsr->aConstraint[i].pGeom;
-      if( pGeom ){
-        if( pGeom->xDelUser ) pGeom->xDelUser(pGeom->pUser);
-        sqlite3_free(pGeom);
+      sqlite3_rtree_query_info *pInfo = pCsr->aConstraint[i].pInfo;
+      if( pInfo ){
+        if( pInfo->xDelUser ) pInfo->xDelUser(pInfo->pUser);
+        sqlite3_free(pInfo);
       }
     }
     sqlite3_free(pCsr->aConstraint);
@@ -137183,12 +144433,13 @@ static void freeCursorConstraints(RtreeCursor *pCsr){
 */
 static int rtreeClose(sqlite3_vtab_cursor *cur){
   Rtree *pRtree = (Rtree *)(cur->pVtab);
-  int rc;
+  int ii;
   RtreeCursor *pCsr = (RtreeCursor *)cur;
   freeCursorConstraints(pCsr);
-  rc = nodeRelease(pRtree, pCsr->pNode);
+  sqlite3_free(pCsr->aPoint);
+  for(ii=0; ii<RTREE_CACHE_SZ; ii++) nodeRelease(pRtree, pCsr->aNode[ii]);
   sqlite3_free(pCsr);
-  return rc;
+  return SQLITE_OK;
 }
 
 /*
@@ -137199,196 +144450,166 @@ static int rtreeClose(sqlite3_vtab_cursor *cur){
 */
 static int rtreeEof(sqlite3_vtab_cursor *cur){
   RtreeCursor *pCsr = (RtreeCursor *)cur;
-  return (pCsr->pNode==0);
+  return pCsr->atEOF;
 }
 
 /*
-** The r-tree constraint passed as the second argument to this function is
-** guaranteed to be a MATCH constraint.
-*/
-static int testRtreeGeom(
-  Rtree *pRtree,                  /* R-Tree object */
-  RtreeConstraint *pConstraint,   /* MATCH constraint to test */
-  RtreeCell *pCell,               /* Cell to test */
-  int *pbRes                      /* OUT: Test result */
-){
-  int i;
-  RtreeDValue aCoord[RTREE_MAX_DIMENSIONS*2];
-  int nCoord = pRtree->nDim*2;
-
-  assert( pConstraint->op==RTREE_MATCH );
-  assert( pConstraint->pGeom );
-
-  for(i=0; i<nCoord; i++){
-    aCoord[i] = DCOORD(pCell->aCoord[i]);
-  }
-  return pConstraint->xGeom(pConstraint->pGeom, nCoord, aCoord, pbRes);
-}
-
-/* 
-** Cursor pCursor currently points to a cell in a non-leaf page.
-** Set *pbEof to true if the sub-tree headed by the cell is filtered
-** (excluded) by the constraints in the pCursor->aConstraint[] 
-** array, or false otherwise.
+** Convert raw bits from the on-disk RTree record into a coordinate value.
+** The on-disk format is big-endian and needs to be converted for little-
+** endian platforms.  The on-disk record stores integer coordinates if
+** eInt is true and it stores 32-bit floating point records if eInt is
+** false.  a[] is the four bytes of the on-disk record to be decoded.
+** Store the results in "r".
 **
-** Return SQLITE_OK if successful or an SQLite error code if an error
-** occurs within a geometry callback.
+** There are three versions of this macro, one each for little-endian and
+** big-endian processors and a third generic implementation.  The endian-
+** specific implementations are much faster and are preferred if the
+** processor endianness is known at compile-time.  The SQLITE_BYTEORDER
+** macro is part of sqliteInt.h and hence the endian-specific
+** implementation will only be used if this module is compiled as part
+** of the amalgamation.
 */
-static int testRtreeCell(Rtree *pRtree, RtreeCursor *pCursor, int *pbEof){
-  RtreeCell cell;
-  int ii;
-  int bRes = 0;
-  int rc = SQLITE_OK;
-
-  nodeGetCell(pRtree, pCursor->pNode, pCursor->iCell, &cell);
-  for(ii=0; bRes==0 && ii<pCursor->nConstraint; ii++){
-    RtreeConstraint *p = &pCursor->aConstraint[ii];
-    RtreeDValue cell_min = DCOORD(cell.aCoord[(p->iCoord>>1)*2]);
-    RtreeDValue cell_max = DCOORD(cell.aCoord[(p->iCoord>>1)*2+1]);
-
-    assert(p->op==RTREE_LE || p->op==RTREE_LT || p->op==RTREE_GE 
-        || p->op==RTREE_GT || p->op==RTREE_EQ || p->op==RTREE_MATCH
-    );
-
-    switch( p->op ){
-      case RTREE_LE: case RTREE_LT: 
-        bRes = p->rValue<cell_min; 
-        break;
-
-      case RTREE_GE: case RTREE_GT: 
-        bRes = p->rValue>cell_max; 
-        break;
-
-      case RTREE_EQ:
-        bRes = (p->rValue>cell_max || p->rValue<cell_min);
-        break;
-
-      default: {
-        assert( p->op==RTREE_MATCH );
-        rc = testRtreeGeom(pRtree, p, &cell, &bRes);
-        bRes = !bRes;
-        break;
-      }
-    }
-  }
-
-  *pbEof = bRes;
-  return rc;
+#if defined(SQLITE_BYTEORDER) && SQLITE_BYTEORDER==1234
+#define RTREE_DECODE_COORD(eInt, a, r) {                        \
+    RtreeCoord c;    /* Coordinate decoded */                   \
+    memcpy(&c.u,a,4);                                           \
+    c.u = ((c.u>>24)&0xff)|((c.u>>8)&0xff00)|                   \
+          ((c.u&0xff)<<24)|((c.u&0xff00)<<8);                   \
+    r = eInt ? (sqlite3_rtree_dbl)c.i : (sqlite3_rtree_dbl)c.f; \
 }
-
-/* 
-** Test if the cell that cursor pCursor currently points to
-** would be filtered (excluded) by the constraints in the 
-** pCursor->aConstraint[] array. If so, set *pbEof to true before
-** returning. If the cell is not filtered (excluded) by the constraints,
-** set pbEof to zero.
-**
-** Return SQLITE_OK if successful or an SQLite error code if an error
-** occurs within a geometry callback.
-**
-** This function assumes that the cell is part of a leaf node.
-*/
-static int testRtreeEntry(Rtree *pRtree, RtreeCursor *pCursor, int *pbEof){
-  RtreeCell cell;
-  int ii;
-  *pbEof = 0;
-
-  nodeGetCell(pRtree, pCursor->pNode, pCursor->iCell, &cell);
-  for(ii=0; ii<pCursor->nConstraint; ii++){
-    RtreeConstraint *p = &pCursor->aConstraint[ii];
-    RtreeDValue coord = DCOORD(cell.aCoord[p->iCoord]);
-    int res;
-    assert(p->op==RTREE_LE || p->op==RTREE_LT || p->op==RTREE_GE 
-        || p->op==RTREE_GT || p->op==RTREE_EQ || p->op==RTREE_MATCH
-    );
-    switch( p->op ){
-      case RTREE_LE: res = (coord<=p->rValue); break;
-      case RTREE_LT: res = (coord<p->rValue);  break;
-      case RTREE_GE: res = (coord>=p->rValue); break;
-      case RTREE_GT: res = (coord>p->rValue);  break;
-      case RTREE_EQ: res = (coord==p->rValue); break;
-      default: {
-        int rc;
-        assert( p->op==RTREE_MATCH );
-        rc = testRtreeGeom(pRtree, p, &cell, &res);
-        if( rc!=SQLITE_OK ){
-          return rc;
-        }
-        break;
-      }
-    }
-
-    if( !res ){
-      *pbEof = 1;
-      return SQLITE_OK;
-    }
-  }
-
-  return SQLITE_OK;
+#elif defined(SQLITE_BYTEORDER) && SQLITE_BYTEORDER==4321
+#define RTREE_DECODE_COORD(eInt, a, r) {                        \
+    RtreeCoord c;    /* Coordinate decoded */                   \
+    memcpy(&c.u,a,4);                                           \
+    r = eInt ? (sqlite3_rtree_dbl)c.i : (sqlite3_rtree_dbl)c.f; \
 }
+#else
+#define RTREE_DECODE_COORD(eInt, a, r) {                        \
+    RtreeCoord c;    /* Coordinate decoded */                   \
+    c.u = ((u32)a[0]<<24) + ((u32)a[1]<<16)                     \
+           +((u32)a[2]<<8) + a[3];                              \
+    r = eInt ? (sqlite3_rtree_dbl)c.i : (sqlite3_rtree_dbl)c.f; \
+}
+#endif
 
 /*
-** Cursor pCursor currently points at a node that heads a sub-tree of
-** height iHeight (if iHeight==0, then the node is a leaf). Descend
-** to point to the left-most cell of the sub-tree that matches the 
-** configured constraints.
+** Check the RTree node or entry given by pCellData and p against the MATCH
+** constraint pConstraint.  
 */
-static int descendToCell(
-  Rtree *pRtree, 
-  RtreeCursor *pCursor, 
-  int iHeight,
-  int *pEof                 /* OUT: Set to true if cannot descend */
+static int rtreeCallbackConstraint(
+  RtreeConstraint *pConstraint,  /* The constraint to test */
+  int eInt,                      /* True if RTree holding integer coordinates */
+  u8 *pCellData,                 /* Raw cell content */
+  RtreeSearchPoint *pSearch,     /* Container of this cell */
+  sqlite3_rtree_dbl *prScore,    /* OUT: score for the cell */
+  int *peWithin                  /* OUT: visibility of the cell */
 ){
-  int isEof;
-  int rc;
-  int ii;
-  RtreeNode *pChild;
-  sqlite3_int64 iRowid;
+  int i;                                                /* Loop counter */
+  sqlite3_rtree_query_info *pInfo = pConstraint->pInfo; /* Callback info */
+  int nCoord = pInfo->nCoord;                           /* No. of coordinates */
+  int rc;                                             /* Callback return code */
+  sqlite3_rtree_dbl aCoord[RTREE_MAX_DIMENSIONS*2];   /* Decoded coordinates */
 
-  RtreeNode *pSavedNode = pCursor->pNode;
-  int iSavedCell = pCursor->iCell;
+  assert( pConstraint->op==RTREE_MATCH || pConstraint->op==RTREE_QUERY );
+  assert( nCoord==2 || nCoord==4 || nCoord==6 || nCoord==8 || nCoord==10 );
 
-  assert( iHeight>=0 );
-
-  if( iHeight==0 ){
-    rc = testRtreeEntry(pRtree, pCursor, &isEof);
+  if( pConstraint->op==RTREE_QUERY && pSearch->iLevel==1 ){
+    pInfo->iRowid = readInt64(pCellData);
+  }
+  pCellData += 8;
+  for(i=0; i<nCoord; i++, pCellData += 4){
+    RTREE_DECODE_COORD(eInt, pCellData, aCoord[i]);
+  }
+  if( pConstraint->op==RTREE_MATCH ){
+    rc = pConstraint->u.xGeom((sqlite3_rtree_geometry*)pInfo,
+                              nCoord, aCoord, &i);
+    if( i==0 ) *peWithin = NOT_WITHIN;
+    *prScore = RTREE_ZERO;
   }else{
-    rc = testRtreeCell(pRtree, pCursor, &isEof);
-  }
-  if( rc!=SQLITE_OK || isEof || iHeight==0 ){
-    goto descend_to_cell_out;
-  }
-
-  iRowid = nodeGetRowid(pRtree, pCursor->pNode, pCursor->iCell);
-  rc = nodeAcquire(pRtree, iRowid, pCursor->pNode, &pChild);
-  if( rc!=SQLITE_OK ){
-    goto descend_to_cell_out;
-  }
-
-  nodeRelease(pRtree, pCursor->pNode);
-  pCursor->pNode = pChild;
-  isEof = 1;
-  for(ii=0; isEof && ii<NCELL(pChild); ii++){
-    pCursor->iCell = ii;
-    rc = descendToCell(pRtree, pCursor, iHeight-1, &isEof);
-    if( rc!=SQLITE_OK ){
-      goto descend_to_cell_out;
+    pInfo->aCoord = aCoord;
+    pInfo->iLevel = pSearch->iLevel - 1;
+    pInfo->rScore = pInfo->rParentScore = pSearch->rScore;
+    pInfo->eWithin = pInfo->eParentWithin = pSearch->eWithin;
+    rc = pConstraint->u.xQueryFunc(pInfo);
+    if( pInfo->eWithin<*peWithin ) *peWithin = pInfo->eWithin;
+    if( pInfo->rScore<*prScore || *prScore<RTREE_ZERO ){
+      *prScore = pInfo->rScore;
     }
   }
-
-  if( isEof ){
-    assert( pCursor->pNode==pChild );
-    nodeReference(pSavedNode);
-    nodeRelease(pRtree, pChild);
-    pCursor->pNode = pSavedNode;
-    pCursor->iCell = iSavedCell;
-  }
-
-descend_to_cell_out:
-  *pEof = isEof;
   return rc;
 }
 
+/* 
+** Check the internal RTree node given by pCellData against constraint p.
+** If this constraint cannot be satisfied by any child within the node,
+** set *peWithin to NOT_WITHIN.
+*/
+static void rtreeNonleafConstraint(
+  RtreeConstraint *p,        /* The constraint to test */
+  int eInt,                  /* True if RTree holds integer coordinates */
+  u8 *pCellData,             /* Raw cell content as appears on disk */
+  int *peWithin              /* Adjust downward, as appropriate */
+){
+  sqlite3_rtree_dbl val;     /* Coordinate value convert to a double */
+
+  /* p->iCoord might point to either a lower or upper bound coordinate
+  ** in a coordinate pair.  But make pCellData point to the lower bound.
+  */
+  pCellData += 8 + 4*(p->iCoord&0xfe);
+
+  assert(p->op==RTREE_LE || p->op==RTREE_LT || p->op==RTREE_GE 
+      || p->op==RTREE_GT || p->op==RTREE_EQ );
+  switch( p->op ){
+    case RTREE_LE:
+    case RTREE_LT:
+    case RTREE_EQ:
+      RTREE_DECODE_COORD(eInt, pCellData, val);
+      /* val now holds the lower bound of the coordinate pair */
+      if( p->u.rValue>=val ) return;
+      if( p->op!=RTREE_EQ ) break;  /* RTREE_LE and RTREE_LT end here */
+      /* Fall through for the RTREE_EQ case */
+
+    default: /* RTREE_GT or RTREE_GE,  or fallthrough of RTREE_EQ */
+      pCellData += 4;
+      RTREE_DECODE_COORD(eInt, pCellData, val);
+      /* val now holds the upper bound of the coordinate pair */
+      if( p->u.rValue<=val ) return;
+  }
+  *peWithin = NOT_WITHIN;
+}
+
+/*
+** Check the leaf RTree cell given by pCellData against constraint p.
+** If this constraint is not satisfied, set *peWithin to NOT_WITHIN.
+** If the constraint is satisfied, leave *peWithin unchanged.
+**
+** The constraint is of the form:  xN op $val
+**
+** The op is given by p->op.  The xN is p->iCoord-th coordinate in
+** pCellData.  $val is given by p->u.rValue.
+*/
+static void rtreeLeafConstraint(
+  RtreeConstraint *p,        /* The constraint to test */
+  int eInt,                  /* True if RTree holds integer coordinates */
+  u8 *pCellData,             /* Raw cell content as appears on disk */
+  int *peWithin              /* Adjust downward, as appropriate */
+){
+  RtreeDValue xN;      /* Coordinate value converted to a double */
+
+  assert(p->op==RTREE_LE || p->op==RTREE_LT || p->op==RTREE_GE 
+      || p->op==RTREE_GT || p->op==RTREE_EQ );
+  pCellData += 8 + p->iCoord*4;
+  RTREE_DECODE_COORD(eInt, pCellData, xN);
+  switch( p->op ){
+    case RTREE_LE: if( xN <= p->u.rValue ) return;  break;
+    case RTREE_LT: if( xN <  p->u.rValue ) return;  break;
+    case RTREE_GE: if( xN >= p->u.rValue ) return;  break;
+    case RTREE_GT: if( xN >  p->u.rValue ) return;  break;
+    default:       if( xN == p->u.rValue ) return;  break;
+  }
+  *peWithin = NOT_WITHIN;
+}
+
 /*
 ** One of the cells in node pNode is guaranteed to have a 64-bit 
 ** integer value equal to iRowid. Return the index of this cell.
@@ -137401,6 +144622,7 @@ static int nodeRowidIndex(
 ){
   int ii;
   int nCell = NCELL(pNode);
+  assert( nCell<200 );
   for(ii=0; ii<nCell; ii++){
     if( nodeGetRowid(pRtree, pNode, ii)==iRowid ){
       *piIndex = ii;
@@ -137423,48 +144645,302 @@ static int nodeParentIndex(Rtree *pRtree, RtreeNode *pNode, int *piIndex){
   return SQLITE_OK;
 }
 
+/*
+** Compare two search points.  Return negative, zero, or positive if the first
+** is less than, equal to, or greater than the second.
+**
+** The rScore is the primary key.  Smaller rScore values come first.
+** If the rScore is a tie, then use iLevel as the tie breaker with smaller
+** iLevel values coming first.  In this way, if rScore is the same for all
+** SearchPoints, then iLevel becomes the deciding factor and the result
+** is a depth-first search, which is the desired default behavior.
+*/
+static int rtreeSearchPointCompare(
+  const RtreeSearchPoint *pA,
+  const RtreeSearchPoint *pB
+){
+  if( pA->rScore<pB->rScore ) return -1;
+  if( pA->rScore>pB->rScore ) return +1;
+  if( pA->iLevel<pB->iLevel ) return -1;
+  if( pA->iLevel>pB->iLevel ) return +1;
+  return 0;
+}
+
+/*
+** Interchange to search points in a cursor.
+*/
+static void rtreeSearchPointSwap(RtreeCursor *p, int i, int j){
+  RtreeSearchPoint t = p->aPoint[i];
+  assert( i<j );
+  p->aPoint[i] = p->aPoint[j];
+  p->aPoint[j] = t;
+  i++; j++;
+  if( i<RTREE_CACHE_SZ ){
+    if( j>=RTREE_CACHE_SZ ){
+      nodeRelease(RTREE_OF_CURSOR(p), p->aNode[i]);
+      p->aNode[i] = 0;
+    }else{
+      RtreeNode *pTemp = p->aNode[i];
+      p->aNode[i] = p->aNode[j];
+      p->aNode[j] = pTemp;
+    }
+  }
+}
+
+/*
+** Return the search point with the lowest current score.
+*/
+static RtreeSearchPoint *rtreeSearchPointFirst(RtreeCursor *pCur){
+  return pCur->bPoint ? &pCur->sPoint : pCur->nPoint ? pCur->aPoint : 0;
+}
+
+/*
+** Get the RtreeNode for the search point with the lowest score.
+*/
+static RtreeNode *rtreeNodeOfFirstSearchPoint(RtreeCursor *pCur, int *pRC){
+  sqlite3_int64 id;
+  int ii = 1 - pCur->bPoint;
+  assert( ii==0 || ii==1 );
+  assert( pCur->bPoint || pCur->nPoint );
+  if( pCur->aNode[ii]==0 ){
+    assert( pRC!=0 );
+    id = ii ? pCur->aPoint[0].id : pCur->sPoint.id;
+    *pRC = nodeAcquire(RTREE_OF_CURSOR(pCur), id, 0, &pCur->aNode[ii]);
+  }
+  return pCur->aNode[ii];
+}
+
+/*
+** Push a new element onto the priority queue
+*/
+static RtreeSearchPoint *rtreeEnqueue(
+  RtreeCursor *pCur,    /* The cursor */
+  RtreeDValue rScore,   /* Score for the new search point */
+  u8 iLevel             /* Level for the new search point */
+){
+  int i, j;
+  RtreeSearchPoint *pNew;
+  if( pCur->nPoint>=pCur->nPointAlloc ){
+    int nNew = pCur->nPointAlloc*2 + 8;
+    pNew = sqlite3_realloc(pCur->aPoint, nNew*sizeof(pCur->aPoint[0]));
+    if( pNew==0 ) return 0;
+    pCur->aPoint = pNew;
+    pCur->nPointAlloc = nNew;
+  }
+  i = pCur->nPoint++;
+  pNew = pCur->aPoint + i;
+  pNew->rScore = rScore;
+  pNew->iLevel = iLevel;
+  assert( iLevel>=0 && iLevel<=RTREE_MAX_DEPTH );
+  while( i>0 ){
+    RtreeSearchPoint *pParent;
+    j = (i-1)/2;
+    pParent = pCur->aPoint + j;
+    if( rtreeSearchPointCompare(pNew, pParent)>=0 ) break;
+    rtreeSearchPointSwap(pCur, j, i);
+    i = j;
+    pNew = pParent;
+  }
+  return pNew;
+}
+
+/*
+** Allocate a new RtreeSearchPoint and return a pointer to it.  Return
+** NULL if malloc fails.
+*/
+static RtreeSearchPoint *rtreeSearchPointNew(
+  RtreeCursor *pCur,    /* The cursor */
+  RtreeDValue rScore,   /* Score for the new search point */
+  u8 iLevel             /* Level for the new search point */
+){
+  RtreeSearchPoint *pNew, *pFirst;
+  pFirst = rtreeSearchPointFirst(pCur);
+  pCur->anQueue[iLevel]++;
+  if( pFirst==0
+   || pFirst->rScore>rScore 
+   || (pFirst->rScore==rScore && pFirst->iLevel>iLevel)
+  ){
+    if( pCur->bPoint ){
+      int ii;
+      pNew = rtreeEnqueue(pCur, rScore, iLevel);
+      if( pNew==0 ) return 0;
+      ii = (int)(pNew - pCur->aPoint) + 1;
+      if( ii<RTREE_CACHE_SZ ){
+        assert( pCur->aNode[ii]==0 );
+        pCur->aNode[ii] = pCur->aNode[0];
+       }else{
+        nodeRelease(RTREE_OF_CURSOR(pCur), pCur->aNode[0]);
+      }
+      pCur->aNode[0] = 0;
+      *pNew = pCur->sPoint;
+    }
+    pCur->sPoint.rScore = rScore;
+    pCur->sPoint.iLevel = iLevel;
+    pCur->bPoint = 1;
+    return &pCur->sPoint;
+  }else{
+    return rtreeEnqueue(pCur, rScore, iLevel);
+  }
+}
+
+#if 0
+/* Tracing routines for the RtreeSearchPoint queue */
+static void tracePoint(RtreeSearchPoint *p, int idx, RtreeCursor *pCur){
+  if( idx<0 ){ printf(" s"); }else{ printf("%2d", idx); }
+  printf(" %d.%05lld.%02d %g %d",
+    p->iLevel, p->id, p->iCell, p->rScore, p->eWithin
+  );
+  idx++;
+  if( idx<RTREE_CACHE_SZ ){
+    printf(" %p\n", pCur->aNode[idx]);
+  }else{
+    printf("\n");
+  }
+}
+static void traceQueue(RtreeCursor *pCur, const char *zPrefix){
+  int ii;
+  printf("=== %9s ", zPrefix);
+  if( pCur->bPoint ){
+    tracePoint(&pCur->sPoint, -1, pCur);
+  }
+  for(ii=0; ii<pCur->nPoint; ii++){
+    if( ii>0 || pCur->bPoint ) printf("              ");
+    tracePoint(&pCur->aPoint[ii], ii, pCur);
+  }
+}
+# define RTREE_QUEUE_TRACE(A,B) traceQueue(A,B)
+#else
+# define RTREE_QUEUE_TRACE(A,B)   /* no-op */
+#endif
+
+/* Remove the search point with the lowest current score.
+*/
+static void rtreeSearchPointPop(RtreeCursor *p){
+  int i, j, k, n;
+  i = 1 - p->bPoint;
+  assert( i==0 || i==1 );
+  if( p->aNode[i] ){
+    nodeRelease(RTREE_OF_CURSOR(p), p->aNode[i]);
+    p->aNode[i] = 0;
+  }
+  if( p->bPoint ){
+    p->anQueue[p->sPoint.iLevel]--;
+    p->bPoint = 0;
+  }else if( p->nPoint ){
+    p->anQueue[p->aPoint[0].iLevel]--;
+    n = --p->nPoint;
+    p->aPoint[0] = p->aPoint[n];
+    if( n<RTREE_CACHE_SZ-1 ){
+      p->aNode[1] = p->aNode[n+1];
+      p->aNode[n+1] = 0;
+    }
+    i = 0;
+    while( (j = i*2+1)<n ){
+      k = j+1;
+      if( k<n && rtreeSearchPointCompare(&p->aPoint[k], &p->aPoint[j])<0 ){
+        if( rtreeSearchPointCompare(&p->aPoint[k], &p->aPoint[i])<0 ){
+          rtreeSearchPointSwap(p, i, k);
+          i = k;
+        }else{
+          break;
+        }
+      }else{
+        if( rtreeSearchPointCompare(&p->aPoint[j], &p->aPoint[i])<0 ){
+          rtreeSearchPointSwap(p, i, j);
+          i = j;
+        }else{
+          break;
+        }
+      }
+    }
+  }
+}
+
+
+/*
+** Continue the search on cursor pCur until the front of the queue
+** contains an entry suitable for returning as a result-set row,
+** or until the RtreeSearchPoint queue is empty, indicating that the
+** query has completed.
+*/
+static int rtreeStepToLeaf(RtreeCursor *pCur){
+  RtreeSearchPoint *p;
+  Rtree *pRtree = RTREE_OF_CURSOR(pCur);
+  RtreeNode *pNode;
+  int eWithin;
+  int rc = SQLITE_OK;
+  int nCell;
+  int nConstraint = pCur->nConstraint;
+  int ii;
+  int eInt;
+  RtreeSearchPoint x;
+
+  eInt = pRtree->eCoordType==RTREE_COORD_INT32;
+  while( (p = rtreeSearchPointFirst(pCur))!=0 && p->iLevel>0 ){
+    pNode = rtreeNodeOfFirstSearchPoint(pCur, &rc);
+    if( rc ) return rc;
+    nCell = NCELL(pNode);
+    assert( nCell<200 );
+    while( p->iCell<nCell ){
+      sqlite3_rtree_dbl rScore = (sqlite3_rtree_dbl)-1;
+      u8 *pCellData = pNode->zData + (4+pRtree->nBytesPerCell*p->iCell);
+      eWithin = FULLY_WITHIN;
+      for(ii=0; ii<nConstraint; ii++){
+        RtreeConstraint *pConstraint = pCur->aConstraint + ii;
+        if( pConstraint->op>=RTREE_MATCH ){
+          rc = rtreeCallbackConstraint(pConstraint, eInt, pCellData, p,
+                                       &rScore, &eWithin);
+          if( rc ) return rc;
+        }else if( p->iLevel==1 ){
+          rtreeLeafConstraint(pConstraint, eInt, pCellData, &eWithin);
+        }else{
+          rtreeNonleafConstraint(pConstraint, eInt, pCellData, &eWithin);
+        }
+        if( eWithin==NOT_WITHIN ) break;
+      }
+      p->iCell++;
+      if( eWithin==NOT_WITHIN ) continue;
+      x.iLevel = p->iLevel - 1;
+      if( x.iLevel ){
+        x.id = readInt64(pCellData);
+        x.iCell = 0;
+      }else{
+        x.id = p->id;
+        x.iCell = p->iCell - 1;
+      }
+      if( p->iCell>=nCell ){
+        RTREE_QUEUE_TRACE(pCur, "POP-S:");
+        rtreeSearchPointPop(pCur);
+      }
+      if( rScore<RTREE_ZERO ) rScore = RTREE_ZERO;
+      p = rtreeSearchPointNew(pCur, rScore, x.iLevel);
+      if( p==0 ) return SQLITE_NOMEM;
+      p->eWithin = eWithin;
+      p->id = x.id;
+      p->iCell = x.iCell;
+      RTREE_QUEUE_TRACE(pCur, "PUSH-S:");
+      break;
+    }
+    if( p->iCell>=nCell ){
+      RTREE_QUEUE_TRACE(pCur, "POP-Se:");
+      rtreeSearchPointPop(pCur);
+    }
+  }
+  pCur->atEOF = p==0;
+  return SQLITE_OK;
+}
+
 /* 
 ** Rtree virtual table module xNext method.
 */
 static int rtreeNext(sqlite3_vtab_cursor *pVtabCursor){
-  Rtree *pRtree = (Rtree *)(pVtabCursor->pVtab);
   RtreeCursor *pCsr = (RtreeCursor *)pVtabCursor;
   int rc = SQLITE_OK;
 
-  /* RtreeCursor.pNode must not be NULL. If is is NULL, then this cursor is
-  ** already at EOF. It is against the rules to call the xNext() method of
-  ** a cursor that has already reached EOF.
-  */
-  assert( pCsr->pNode );
-
-  if( pCsr->iStrategy==1 ){
-    /* This "scan" is a direct lookup by rowid. There is no next entry. */
-    nodeRelease(pRtree, pCsr->pNode);
-    pCsr->pNode = 0;
-  }else{
-    /* Move to the next entry that matches the configured constraints. */
-    int iHeight = 0;
-    while( pCsr->pNode ){
-      RtreeNode *pNode = pCsr->pNode;
-      int nCell = NCELL(pNode);
-      for(pCsr->iCell++; pCsr->iCell<nCell; pCsr->iCell++){
-        int isEof;
-        rc = descendToCell(pRtree, pCsr, iHeight, &isEof);
-        if( rc!=SQLITE_OK || !isEof ){
-          return rc;
-        }
-      }
-      pCsr->pNode = pNode->pParent;
-      rc = nodeParentIndex(pRtree, pNode, &pCsr->iCell);
-      if( rc!=SQLITE_OK ){
-        return rc;
-      }
-      nodeReference(pCsr->pNode);
-      nodeRelease(pRtree, pNode);
-      iHeight++;
-    }
-  }
-
+  /* Move to the next entry that matches the configured constraints. */
+  RTREE_QUEUE_TRACE(pCsr, "POP-Nx:");
+  rtreeSearchPointPop(pCsr);
+  rc = rtreeStepToLeaf(pCsr);
   return rc;
 }
 
@@ -137472,13 +144948,14 @@ static int rtreeNext(sqlite3_vtab_cursor *pVtabCursor){
 ** Rtree virtual table module xRowid method.
 */
 static int rtreeRowid(sqlite3_vtab_cursor *pVtabCursor, sqlite_int64 *pRowid){
-  Rtree *pRtree = (Rtree *)pVtabCursor->pVtab;
   RtreeCursor *pCsr = (RtreeCursor *)pVtabCursor;
-
-  assert(pCsr->pNode);
-  *pRowid = nodeGetRowid(pRtree, pCsr->pNode, pCsr->iCell);
-
-  return SQLITE_OK;
+  RtreeSearchPoint *p = rtreeSearchPointFirst(pCsr);
+  int rc = SQLITE_OK;
+  RtreeNode *pNode = rtreeNodeOfFirstSearchPoint(pCsr, &rc);
+  if( rc==SQLITE_OK && p ){
+    *pRowid = nodeGetRowid(RTREE_OF_CURSOR(pCsr), pNode, p->iCell);
+  }
+  return rc;
 }
 
 /* 
@@ -137487,13 +144964,18 @@ static int rtreeRowid(sqlite3_vtab_cursor *pVtabCursor, sqlite_int64 *pRowid){
 static int rtreeColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){
   Rtree *pRtree = (Rtree *)cur->pVtab;
   RtreeCursor *pCsr = (RtreeCursor *)cur;
+  RtreeSearchPoint *p = rtreeSearchPointFirst(pCsr);
+  RtreeCoord c;
+  int rc = SQLITE_OK;
+  RtreeNode *pNode = rtreeNodeOfFirstSearchPoint(pCsr, &rc);
 
+  if( rc ) return rc;
+  if( p==0 ) return SQLITE_OK;
   if( i==0 ){
-    i64 iRowid = nodeGetRowid(pRtree, pCsr->pNode, pCsr->iCell);
-    sqlite3_result_int64(ctx, iRowid);
+    sqlite3_result_int64(ctx, nodeGetRowid(pRtree, pNode, p->iCell));
   }else{
-    RtreeCoord c;
-    nodeGetCoord(pRtree, pCsr->pNode, pCsr->iCell, i-1, &c);
+    if( rc ) return rc;
+    nodeGetCoord(pRtree, pNode, p->iCell, i-1, &c);
 #ifndef SQLITE_RTREE_INT_ONLY
     if( pRtree->eCoordType==RTREE_COORD_REAL32 ){
       sqlite3_result_double(ctx, c.f);
@@ -137504,7 +144986,6 @@ static int rtreeColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){
       sqlite3_result_int(ctx, c.i);
     }
   }
-
   return SQLITE_OK;
 }
 
@@ -137515,12 +144996,18 @@ static int rtreeColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){
 ** *ppLeaf to 0 and return SQLITE_OK. If an error occurs, set *ppLeaf
 ** to zero and return an SQLite error code.
 */
-static int findLeafNode(Rtree *pRtree, i64 iRowid, RtreeNode **ppLeaf){
+static int findLeafNode(
+  Rtree *pRtree,              /* RTree to search */
+  i64 iRowid,                 /* The rowid searching for */
+  RtreeNode **ppLeaf,         /* Write the node here */
+  sqlite3_int64 *piNode       /* Write the node-id here */
+){
   int rc;
   *ppLeaf = 0;
   sqlite3_bind_int64(pRtree->pReadRowid, 1, iRowid);
   if( sqlite3_step(pRtree->pReadRowid)==SQLITE_ROW ){
     i64 iNode = sqlite3_column_int64(pRtree->pReadRowid, 0);
+    if( piNode ) *piNode = iNode;
     rc = nodeAcquire(pRtree, iNode, 0, ppLeaf);
     sqlite3_reset(pRtree->pReadRowid);
   }else{
@@ -137536,9 +145023,10 @@ static int findLeafNode(Rtree *pRtree, i64 iRowid, RtreeNode **ppLeaf){
 ** operator.
 */
 static int deserializeGeometry(sqlite3_value *pValue, RtreeConstraint *pCons){
-  RtreeMatchArg *p;
-  sqlite3_rtree_geometry *pGeom;
-  int nBlob;
+  RtreeMatchArg *pBlob;              /* BLOB returned by geometry function */
+  sqlite3_rtree_query_info *pInfo;   /* Callback information */
+  int nBlob;                         /* Size of the geometry function blob */
+  int nExpected;                     /* Expected size of the BLOB */
 
   /* Check that value is actually a blob. */
   if( sqlite3_value_type(pValue)!=SQLITE_BLOB ) return SQLITE_ERROR;
@@ -137551,27 +145039,29 @@ static int deserializeGeometry(sqlite3_value *pValue, RtreeConstraint *pCons){
     return SQLITE_ERROR;
   }
 
-  pGeom = (sqlite3_rtree_geometry *)sqlite3_malloc(
-      sizeof(sqlite3_rtree_geometry) + nBlob
-  );
-  if( !pGeom ) return SQLITE_NOMEM;
-  memset(pGeom, 0, sizeof(sqlite3_rtree_geometry));
-  p = (RtreeMatchArg *)&pGeom[1];
+  pInfo = (sqlite3_rtree_query_info*)sqlite3_malloc( sizeof(*pInfo)+nBlob );
+  if( !pInfo ) return SQLITE_NOMEM;
+  memset(pInfo, 0, sizeof(*pInfo));
+  pBlob = (RtreeMatchArg*)&pInfo[1];
 
-  memcpy(p, sqlite3_value_blob(pValue), nBlob);
-  if( p->magic!=RTREE_GEOMETRY_MAGIC 
-   || nBlob!=(int)(sizeof(RtreeMatchArg) + (p->nParam-1)*sizeof(RtreeDValue))
-  ){
-    sqlite3_free(pGeom);
+  memcpy(pBlob, sqlite3_value_blob(pValue), nBlob);
+  nExpected = (int)(sizeof(RtreeMatchArg) +
+                    (pBlob->nParam-1)*sizeof(RtreeDValue));
+  if( pBlob->magic!=RTREE_GEOMETRY_MAGIC || nBlob!=nExpected ){
+    sqlite3_free(pInfo);
     return SQLITE_ERROR;
   }
+  pInfo->pContext = pBlob->cb.pContext;
+  pInfo->nParam = pBlob->nParam;
+  pInfo->aParam = pBlob->aParam;
 
-  pGeom->pContext = p->pContext;
-  pGeom->nParam = p->nParam;
-  pGeom->aParam = p->aParam;
-
-  pCons->xGeom = p->xGeom;
-  pCons->pGeom = pGeom;
+  if( pBlob->cb.xGeom ){
+    pCons->u.xGeom = pBlob->cb.xGeom;
+  }else{
+    pCons->op = RTREE_QUERY;
+    pCons->u.xQueryFunc = pBlob->cb.xQueryFunc;
+  }
+  pCons->pInfo = pInfo;
   return SQLITE_OK;
 }
 
@@ -137585,10 +145075,10 @@ static int rtreeFilter(
 ){
   Rtree *pRtree = (Rtree *)pVtabCursor->pVtab;
   RtreeCursor *pCsr = (RtreeCursor *)pVtabCursor;
-
   RtreeNode *pRoot = 0;
   int ii;
   int rc = SQLITE_OK;
+  int iCell = 0;
 
   rtreeReference(pRtree);
 
@@ -137598,31 +145088,42 @@ static int rtreeFilter(
   if( idxNum==1 ){
     /* Special case - lookup by rowid. */
     RtreeNode *pLeaf;        /* Leaf on which the required cell resides */
+    RtreeSearchPoint *p;     /* Search point for the the leaf */
     i64 iRowid = sqlite3_value_int64(argv[0]);
-    rc = findLeafNode(pRtree, iRowid, &pLeaf);
-    pCsr->pNode = pLeaf; 
-    if( pLeaf ){
-      assert( rc==SQLITE_OK );
-      rc = nodeRowidIndex(pRtree, pLeaf, iRowid, &pCsr->iCell);
+    i64 iNode = 0;
+    rc = findLeafNode(pRtree, iRowid, &pLeaf, &iNode);
+    if( rc==SQLITE_OK && pLeaf!=0 ){
+      p = rtreeSearchPointNew(pCsr, RTREE_ZERO, 0);
+      assert( p!=0 );  /* Always returns pCsr->sPoint */
+      pCsr->aNode[0] = pLeaf;
+      p->id = iNode;
+      p->eWithin = PARTLY_WITHIN;
+      rc = nodeRowidIndex(pRtree, pLeaf, iRowid, &iCell);
+      p->iCell = iCell;
+      RTREE_QUEUE_TRACE(pCsr, "PUSH-F1:");
+    }else{
+      pCsr->atEOF = 1;
     }
   }else{
     /* Normal case - r-tree scan. Set up the RtreeCursor.aConstraint array 
     ** with the configured constraints. 
     */
-    if( argc>0 ){
+    rc = nodeAcquire(pRtree, 1, 0, &pRoot);
+    if( rc==SQLITE_OK && argc>0 ){
       pCsr->aConstraint = sqlite3_malloc(sizeof(RtreeConstraint)*argc);
       pCsr->nConstraint = argc;
       if( !pCsr->aConstraint ){
         rc = SQLITE_NOMEM;
       }else{
         memset(pCsr->aConstraint, 0, sizeof(RtreeConstraint)*argc);
+        memset(pCsr->anQueue, 0, sizeof(u32)*(pRtree->iDepth + 1));
         assert( (idxStr==0 && argc==0)
                 || (idxStr && (int)strlen(idxStr)==argc*2) );
         for(ii=0; ii<argc; ii++){
           RtreeConstraint *p = &pCsr->aConstraint[ii];
           p->op = idxStr[ii*2];
-          p->iCoord = idxStr[ii*2+1]-'a';
-          if( p->op==RTREE_MATCH ){
+          p->iCoord = idxStr[ii*2+1]-'0';
+          if( p->op>=RTREE_MATCH ){
             /* A MATCH operator. The right-hand-side must be a blob that
             ** can be cast into an RtreeMatchArg object. One created using
             ** an sqlite3_rtree_geometry_callback() SQL user function.
@@ -137631,45 +145132,52 @@ static int rtreeFilter(
             if( rc!=SQLITE_OK ){
               break;
             }
+            p->pInfo->nCoord = pRtree->nDim*2;
+            p->pInfo->anQueue = pCsr->anQueue;
+            p->pInfo->mxLevel = pRtree->iDepth + 1;
           }else{
 #ifdef SQLITE_RTREE_INT_ONLY
-            p->rValue = sqlite3_value_int64(argv[ii]);
+            p->u.rValue = sqlite3_value_int64(argv[ii]);
 #else
-            p->rValue = sqlite3_value_double(argv[ii]);
+            p->u.rValue = sqlite3_value_double(argv[ii]);
 #endif
           }
         }
       }
     }
-  
     if( rc==SQLITE_OK ){
-      pCsr->pNode = 0;
-      rc = nodeAcquire(pRtree, 1, 0, &pRoot);
-    }
-    if( rc==SQLITE_OK ){
-      int isEof = 1;
-      int nCell = NCELL(pRoot);
-      pCsr->pNode = pRoot;
-      for(pCsr->iCell=0; rc==SQLITE_OK && pCsr->iCell<nCell; pCsr->iCell++){
-        assert( pCsr->pNode==pRoot );
-        rc = descendToCell(pRtree, pCsr, pRtree->iDepth, &isEof);
-        if( !isEof ){
-          break;
-        }
-      }
-      if( rc==SQLITE_OK && isEof ){
-        assert( pCsr->pNode==pRoot );
-        nodeRelease(pRtree, pRoot);
-        pCsr->pNode = 0;
-      }
-      assert( rc!=SQLITE_OK || !pCsr->pNode || pCsr->iCell<NCELL(pCsr->pNode) );
+      RtreeSearchPoint *pNew;
+      pNew = rtreeSearchPointNew(pCsr, RTREE_ZERO, pRtree->iDepth+1);
+      if( pNew==0 ) return SQLITE_NOMEM;
+      pNew->id = 1;
+      pNew->iCell = 0;
+      pNew->eWithin = PARTLY_WITHIN;
+      assert( pCsr->bPoint==1 );
+      pCsr->aNode[0] = pRoot;
+      pRoot = 0;
+      RTREE_QUEUE_TRACE(pCsr, "PUSH-Fm:");
+      rc = rtreeStepToLeaf(pCsr);
     }
   }
 
+  nodeRelease(pRtree, pRoot);
   rtreeRelease(pRtree);
   return rc;
 }
 
+/*
+** Set the pIdxInfo->estimatedRows variable to nRow. Unless this
+** extension is currently being used by a version of SQLite too old to
+** support estimatedRows. In that case this function is a no-op.
+*/
+static void setEstimatedRows(sqlite3_index_info *pIdxInfo, i64 nRow){
+#if SQLITE_VERSION_NUMBER>=3008002
+  if( sqlite3_libversion_number()>=3008002 ){
+    pIdxInfo->estimatedRows = nRow;
+  }
+#endif
+}
+
 /*
 ** Rtree virtual table module xBestIndex method. There are three
 ** table scan strategies to choose from (in order from most to 
@@ -137705,13 +145213,14 @@ static int rtreeFilter(
 ** is 'a', the second from the left 'b' etc.
 */
 static int rtreeBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
+  Rtree *pRtree = (Rtree*)tab;
   int rc = SQLITE_OK;
   int ii;
+  i64 nRow;                       /* Estimated rows returned by this scan */
 
   int iIdx = 0;
   char zIdxStr[RTREE_MAX_DIMENSIONS*8+1];
   memset(zIdxStr, 0, sizeof(zIdxStr));
-  UNUSED_PARAMETER(tab);
 
   assert( pIdxInfo->idxStr==0 );
   for(ii=0; ii<pIdxInfo->nConstraint && iIdx<(int)(sizeof(zIdxStr)-1); ii++){
@@ -137731,9 +145240,11 @@ static int rtreeBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
       /* This strategy involves a two rowid lookups on an B-Tree structures
       ** and then a linear search of an R-Tree node. This should be 
       ** considered almost as quick as a direct rowid lookup (for which 
-      ** sqlite uses an internal cost of 0.0).
+      ** sqlite uses an internal cost of 0.0). It is expected to return
+      ** a single row.
       */ 
-      pIdxInfo->estimatedCost = 10.0;
+      pIdxInfo->estimatedCost = 30.0;
+      setEstimatedRows(pIdxInfo, 1);
       return SQLITE_OK;
     }
 
@@ -137751,7 +145262,7 @@ static int rtreeBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
           break;
       }
       zIdxStr[iIdx++] = op;
-      zIdxStr[iIdx++] = p->iColumn - 1 + 'a';
+      zIdxStr[iIdx++] = p->iColumn - 1 + '0';
       pIdxInfo->aConstraintUsage[ii].argvIndex = (iIdx/2);
       pIdxInfo->aConstraintUsage[ii].omit = 1;
     }
@@ -137762,8 +145273,11 @@ static int rtreeBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
   if( iIdx>0 && 0==(pIdxInfo->idxStr = sqlite3_mprintf("%s", zIdxStr)) ){
     return SQLITE_NOMEM;
   }
-  assert( iIdx>=0 );
-  pIdxInfo->estimatedCost = (2000000.0 / (double)(iIdx + 1));
+
+  nRow = pRtree->nRowEst / (iIdx + 1);
+  pIdxInfo->estimatedCost = (double)6.0 * (double)nRow;
+  setEstimatedRows(pIdxInfo, nRow);
+
   return rc;
 }
 
@@ -137841,62 +145355,32 @@ static RtreeDValue cellGrowth(Rtree *pRtree, RtreeCell *p, RtreeCell *pCell){
   return (cellArea(pRtree, &cell)-area);
 }
 
-#if VARIANT_RSTARTREE_CHOOSESUBTREE || VARIANT_RSTARTREE_SPLIT
 static RtreeDValue cellOverlap(
   Rtree *pRtree, 
   RtreeCell *p, 
   RtreeCell *aCell, 
-  int nCell, 
-  int iExclude
+  int nCell
 ){
   int ii;
-  RtreeDValue overlap = 0.0;
+  RtreeDValue overlap = RTREE_ZERO;
   for(ii=0; ii<nCell; ii++){
-#if VARIANT_RSTARTREE_CHOOSESUBTREE
-    if( ii!=iExclude )
-#else
-    assert( iExclude==-1 );
-    UNUSED_PARAMETER(iExclude);
-#endif
-    {
-      int jj;
-      RtreeDValue o = (RtreeDValue)1;
-      for(jj=0; jj<(pRtree->nDim*2); jj+=2){
-        RtreeDValue x1, x2;
-
-        x1 = MAX(DCOORD(p->aCoord[jj]), DCOORD(aCell[ii].aCoord[jj]));
-        x2 = MIN(DCOORD(p->aCoord[jj+1]), DCOORD(aCell[ii].aCoord[jj+1]));
-
-        if( x2<x1 ){
-          o = 0.0;
-          break;
-        }else{
-          o = o * (x2-x1);
-        }
+    int jj;
+    RtreeDValue o = (RtreeDValue)1;
+    for(jj=0; jj<(pRtree->nDim*2); jj+=2){
+      RtreeDValue x1, x2;
+      x1 = MAX(DCOORD(p->aCoord[jj]), DCOORD(aCell[ii].aCoord[jj]));
+      x2 = MIN(DCOORD(p->aCoord[jj+1]), DCOORD(aCell[ii].aCoord[jj+1]));
+      if( x2<x1 ){
+        o = (RtreeDValue)0;
+        break;
+      }else{
+        o = o * (x2-x1);
       }
-      overlap += o;
     }
+    overlap += o;
   }
   return overlap;
 }
-#endif
-
-#if VARIANT_RSTARTREE_CHOOSESUBTREE
-static RtreeDValue cellOverlapEnlargement(
-  Rtree *pRtree, 
-  RtreeCell *p, 
-  RtreeCell *pInsert, 
-  RtreeCell *aCell, 
-  int nCell, 
-  int iExclude
-){
-  RtreeDValue before, after;
-  before = cellOverlap(pRtree, p, aCell, nCell, iExclude);
-  cellUnion(pRtree, p, pInsert);
-  after = cellOverlap(pRtree, p, aCell, nCell, iExclude);
-  return (after-before);
-}
-#endif
 
 
 /*
@@ -137918,12 +145402,8 @@ static int ChooseLeaf(
     int iCell;
     sqlite3_int64 iBest = 0;
 
-    RtreeDValue fMinGrowth = 0.0;
-    RtreeDValue fMinArea = 0.0;
-#if VARIANT_RSTARTREE_CHOOSESUBTREE
-    RtreeDValue fMinOverlap = 0.0;
-    RtreeDValue overlap;
-#endif
+    RtreeDValue fMinGrowth = RTREE_ZERO;
+    RtreeDValue fMinArea = RTREE_ZERO;
 
     int nCell = NCELL(pNode);
     RtreeCell cell;
@@ -137931,22 +145411,6 @@ static int ChooseLeaf(
 
     RtreeCell *aCell = 0;
 
-#if VARIANT_RSTARTREE_CHOOSESUBTREE
-    if( ii==(pRtree->iDepth-1) ){
-      int jj;
-      aCell = sqlite3_malloc(sizeof(RtreeCell)*nCell);
-      if( !aCell ){
-        rc = SQLITE_NOMEM;
-        nodeRelease(pRtree, pNode);
-        pNode = 0;
-        continue;
-      }
-      for(jj=0; jj<nCell; jj++){
-        nodeGetCell(pRtree, pNode, jj, &aCell[jj]);
-      }
-    }
-#endif
-
     /* Select the child node which will be enlarged the least if pCell
     ** is inserted into it. Resolve ties by choosing the entry with
     ** the smallest area.
@@ -137958,26 +145422,9 @@ static int ChooseLeaf(
       nodeGetCell(pRtree, pNode, iCell, &cell);
       growth = cellGrowth(pRtree, &cell, pCell);
       area = cellArea(pRtree, &cell);
-
-#if VARIANT_RSTARTREE_CHOOSESUBTREE
-      if( ii==(pRtree->iDepth-1) ){
-        overlap = cellOverlapEnlargement(pRtree,&cell,pCell,aCell,nCell,iCell);
-      }else{
-        overlap = 0.0;
-      }
-      if( (iCell==0) 
-       || (overlap<fMinOverlap) 
-       || (overlap==fMinOverlap && growth<fMinGrowth)
-       || (overlap==fMinOverlap && growth==fMinGrowth && area<fMinArea)
-      ){
-        bBest = 1;
-        fMinOverlap = overlap;
-      }
-#else
       if( iCell==0||growth<fMinGrowth||(growth==fMinGrowth && area<fMinArea) ){
         bBest = 1;
       }
-#endif
       if( bBest ){
         fMinGrowth = growth;
         fMinArea = area;
@@ -138048,155 +145495,6 @@ static int parentWrite(Rtree *pRtree, sqlite3_int64 iNode, sqlite3_int64 iPar){
 
 static int rtreeInsertCell(Rtree *, RtreeNode *, RtreeCell *, int);
 
-#if VARIANT_GUTTMAN_LINEAR_SPLIT
-/*
-** Implementation of the linear variant of the PickNext() function from
-** Guttman[84].
-*/
-static RtreeCell *LinearPickNext(
-  Rtree *pRtree,
-  RtreeCell *aCell, 
-  int nCell, 
-  RtreeCell *pLeftBox, 
-  RtreeCell *pRightBox,
-  int *aiUsed
-){
-  int ii;
-  for(ii=0; aiUsed[ii]; ii++);
-  aiUsed[ii] = 1;
-  return &aCell[ii];
-}
-
-/*
-** Implementation of the linear variant of the PickSeeds() function from
-** Guttman[84].
-*/
-static void LinearPickSeeds(
-  Rtree *pRtree,
-  RtreeCell *aCell, 
-  int nCell, 
-  int *piLeftSeed, 
-  int *piRightSeed
-){
-  int i;
-  int iLeftSeed = 0;
-  int iRightSeed = 1;
-  RtreeDValue maxNormalInnerWidth = (RtreeDValue)0;
-
-  /* Pick two "seed" cells from the array of cells. The algorithm used
-  ** here is the LinearPickSeeds algorithm from Gutman[1984]. The 
-  ** indices of the two seed cells in the array are stored in local
-  ** variables iLeftSeek and iRightSeed.
-  */
-  for(i=0; i<pRtree->nDim; i++){
-    RtreeDValue x1 = DCOORD(aCell[0].aCoord[i*2]);
-    RtreeDValue x2 = DCOORD(aCell[0].aCoord[i*2+1]);
-    RtreeDValue x3 = x1;
-    RtreeDValue x4 = x2;
-    int jj;
-
-    int iCellLeft = 0;
-    int iCellRight = 0;
-
-    for(jj=1; jj<nCell; jj++){
-      RtreeDValue left = DCOORD(aCell[jj].aCoord[i*2]);
-      RtreeDValue right = DCOORD(aCell[jj].aCoord[i*2+1]);
-
-      if( left<x1 ) x1 = left;
-      if( right>x4 ) x4 = right;
-      if( left>x3 ){
-        x3 = left;
-        iCellRight = jj;
-      }
-      if( right<x2 ){
-        x2 = right;
-        iCellLeft = jj;
-      }
-    }
-
-    if( x4!=x1 ){
-      RtreeDValue normalwidth = (x3 - x2) / (x4 - x1);
-      if( normalwidth>maxNormalInnerWidth ){
-        iLeftSeed = iCellLeft;
-        iRightSeed = iCellRight;
-      }
-    }
-  }
-
-  *piLeftSeed = iLeftSeed;
-  *piRightSeed = iRightSeed;
-}
-#endif /* VARIANT_GUTTMAN_LINEAR_SPLIT */
-
-#if VARIANT_GUTTMAN_QUADRATIC_SPLIT
-/*
-** Implementation of the quadratic variant of the PickNext() function from
-** Guttman[84].
-*/
-static RtreeCell *QuadraticPickNext(
-  Rtree *pRtree,
-  RtreeCell *aCell, 
-  int nCell, 
-  RtreeCell *pLeftBox, 
-  RtreeCell *pRightBox,
-  int *aiUsed
-){
-  #define FABS(a) ((a)<0.0?-1.0*(a):(a))
-
-  int iSelect = -1;
-  RtreeDValue fDiff;
-  int ii;
-  for(ii=0; ii<nCell; ii++){
-    if( aiUsed[ii]==0 ){
-      RtreeDValue left = cellGrowth(pRtree, pLeftBox, &aCell[ii]);
-      RtreeDValue right = cellGrowth(pRtree, pLeftBox, &aCell[ii]);
-      RtreeDValue diff = FABS(right-left);
-      if( iSelect<0 || diff>fDiff ){
-        fDiff = diff;
-        iSelect = ii;
-      }
-    }
-  }
-  aiUsed[iSelect] = 1;
-  return &aCell[iSelect];
-}
-
-/*
-** Implementation of the quadratic variant of the PickSeeds() function from
-** Guttman[84].
-*/
-static void QuadraticPickSeeds(
-  Rtree *pRtree,
-  RtreeCell *aCell, 
-  int nCell, 
-  int *piLeftSeed, 
-  int *piRightSeed
-){
-  int ii;
-  int jj;
-
-  int iLeftSeed = 0;
-  int iRightSeed = 1;
-  RtreeDValue fWaste = 0.0;
-
-  for(ii=0; ii<nCell; ii++){
-    for(jj=ii+1; jj<nCell; jj++){
-      RtreeDValue right = cellArea(pRtree, &aCell[jj]);
-      RtreeDValue growth = cellGrowth(pRtree, &aCell[ii], &aCell[jj]);
-      RtreeDValue waste = growth - right;
-
-      if( waste>fWaste ){
-        iLeftSeed = ii;
-        iRightSeed = jj;
-        fWaste = waste;
-      }
-    }
-  }
-
-  *piLeftSeed = iLeftSeed;
-  *piRightSeed = iRightSeed;
-}
-#endif /* VARIANT_GUTTMAN_QUADRATIC_SPLIT */
 
 /*
 ** Arguments aIdx, aDistance and aSpare all point to arrays of size
@@ -138337,7 +145635,6 @@ static void SortByDimension(
   }
 }
 
-#if VARIANT_RSTARTREE_SPLIT
 /*
 ** Implementation of the R*-tree variant of SplitNode from Beckman[1990].
 */
@@ -138356,7 +145653,7 @@ static int splitNodeStartree(
 
   int iBestDim = 0;
   int iBestSplit = 0;
-  RtreeDValue fBestMargin = 0.0;
+  RtreeDValue fBestMargin = RTREE_ZERO;
 
   int nByte = (pRtree->nDim+1)*(sizeof(int*)+nCell*sizeof(int));
 
@@ -138377,9 +145674,9 @@ static int splitNodeStartree(
   }
 
   for(ii=0; ii<pRtree->nDim; ii++){
-    RtreeDValue margin = 0.0;
-    RtreeDValue fBestOverlap = 0.0;
-    RtreeDValue fBestArea = 0.0;
+    RtreeDValue margin = RTREE_ZERO;
+    RtreeDValue fBestOverlap = RTREE_ZERO;
+    RtreeDValue fBestArea = RTREE_ZERO;
     int iBestLeft = 0;
     int nLeft;
 
@@ -138405,7 +145702,7 @@ static int splitNodeStartree(
       }
       margin += cellMargin(pRtree, &left);
       margin += cellMargin(pRtree, &right);
-      overlap = cellOverlap(pRtree, &left, &right, 1, -1);
+      overlap = cellOverlap(pRtree, &left, &right, 1);
       area = cellArea(pRtree, &left) + cellArea(pRtree, &right);
       if( (nLeft==RTREE_MINCELLS(pRtree))
        || (overlap<fBestOverlap)
@@ -138437,63 +145734,7 @@ static int splitNodeStartree(
   sqlite3_free(aaSorted);
   return SQLITE_OK;
 }
-#endif
 
-#if VARIANT_GUTTMAN_SPLIT
-/*
-** Implementation of the regular R-tree SplitNode from Guttman[1984].
-*/
-static int splitNodeGuttman(
-  Rtree *pRtree,
-  RtreeCell *aCell,
-  int nCell,
-  RtreeNode *pLeft,
-  RtreeNode *pRight,
-  RtreeCell *pBboxLeft,
-  RtreeCell *pBboxRight
-){
-  int iLeftSeed = 0;
-  int iRightSeed = 1;
-  int *aiUsed;
-  int i;
-
-  aiUsed = sqlite3_malloc(sizeof(int)*nCell);
-  if( !aiUsed ){
-    return SQLITE_NOMEM;
-  }
-  memset(aiUsed, 0, sizeof(int)*nCell);
-
-  PickSeeds(pRtree, aCell, nCell, &iLeftSeed, &iRightSeed);
-
-  memcpy(pBboxLeft, &aCell[iLeftSeed], sizeof(RtreeCell));
-  memcpy(pBboxRight, &aCell[iRightSeed], sizeof(RtreeCell));
-  nodeInsertCell(pRtree, pLeft, &aCell[iLeftSeed]);
-  nodeInsertCell(pRtree, pRight, &aCell[iRightSeed]);
-  aiUsed[iLeftSeed] = 1;
-  aiUsed[iRightSeed] = 1;
-
-  for(i=nCell-2; i>0; i--){
-    RtreeCell *pNext;
-    pNext = PickNext(pRtree, aCell, nCell, pBboxLeft, pBboxRight, aiUsed);
-    RtreeDValue diff =  
-      cellGrowth(pRtree, pBboxLeft, pNext) - 
-      cellGrowth(pRtree, pBboxRight, pNext)
-    ;
-    if( (RTREE_MINCELLS(pRtree)-NCELL(pRight)==i)
-     || (diff>0.0 && (RTREE_MINCELLS(pRtree)-NCELL(pLeft)!=i))
-    ){
-      nodeInsertCell(pRtree, pRight, pNext);
-      cellUnion(pRtree, pBboxRight, pNext);
-    }else{
-      nodeInsertCell(pRtree, pLeft, pNext);
-      cellUnion(pRtree, pBboxLeft, pNext);
-    }
-  }
-
-  sqlite3_free(aiUsed);
-  return SQLITE_OK;
-}
-#endif
 
 static int updateMapping(
   Rtree *pRtree, 
@@ -138571,7 +145812,8 @@ static int SplitNode(
   memset(pLeft->zData, 0, pRtree->iNodeSize);
   memset(pRight->zData, 0, pRtree->iNodeSize);
 
-  rc = AssignCells(pRtree, aCell, nCell, pLeft, pRight, &leftbbox, &rightbbox);
+  rc = splitNodeStartree(pRtree, aCell, nCell, pLeft, pRight,
+                         &leftbbox, &rightbbox);
   if( rc!=SQLITE_OK ){
     goto splitnode_out;
   }
@@ -138854,7 +146096,7 @@ static int Reinsert(
   }
 
   for(ii=0; ii<nCell; ii++){
-    aDistance[ii] = 0.0;
+    aDistance[ii] = RTREE_ZERO;
     for(iDim=0; iDim<pRtree->nDim; iDim++){
       RtreeDValue coord = (DCOORD(aCell[ii].aCoord[iDim*2+1]) - 
                                DCOORD(aCell[ii].aCoord[iDim*2]));
@@ -138920,16 +146162,12 @@ static int rtreeInsertCell(
     }
   }
   if( nodeInsertCell(pRtree, pNode, pCell) ){
-#if VARIANT_RSTARTREE_REINSERT
     if( iHeight<=pRtree->iReinsertHeight || pNode->iNode==1){
       rc = SplitNode(pRtree, pNode, pCell, iHeight);
     }else{
       pRtree->iReinsertHeight = iHeight;
       rc = Reinsert(pRtree, pNode, pCell, iHeight);
     }
-#else
-    rc = SplitNode(pRtree, pNode, pCell, iHeight);
-#endif
   }else{
     rc = AdjustTree(pRtree, pNode, pCell);
     if( rc==SQLITE_OK ){
@@ -138999,7 +146237,7 @@ static int rtreeDeleteRowid(Rtree *pRtree, sqlite3_int64 iDelete){
   ** about to be deleted. 
   */
   if( rc==SQLITE_OK ){
-    rc = findLeafNode(pRtree, iDelete, &pLeaf);
+    rc = findLeafNode(pRtree, iDelete, &pLeaf, 0);
   }
 
   /* Delete the cell in question from the leaf node. */
@@ -139238,6 +146476,43 @@ static int rtreeRename(sqlite3_vtab *pVtab, const char *zNewName){
   return rc;
 }
 
+/*
+** This function populates the pRtree->nRowEst variable with an estimate
+** of the number of rows in the virtual table. If possible, this is based
+** on sqlite_stat1 data. Otherwise, use RTREE_DEFAULT_ROWEST.
+*/
+static int rtreeQueryStat1(sqlite3 *db, Rtree *pRtree){
+  const char *zFmt = "SELECT stat FROM %Q.sqlite_stat1 WHERE tbl = '%q_rowid'";
+  char *zSql;
+  sqlite3_stmt *p;
+  int rc;
+  i64 nRow = 0;
+
+  zSql = sqlite3_mprintf(zFmt, pRtree->zDb, pRtree->zName);
+  if( zSql==0 ){
+    rc = SQLITE_NOMEM;
+  }else{
+    rc = sqlite3_prepare_v2(db, zSql, -1, &p, 0);
+    if( rc==SQLITE_OK ){
+      if( sqlite3_step(p)==SQLITE_ROW ) nRow = sqlite3_column_int64(p, 0);
+      rc = sqlite3_finalize(p);
+    }else if( rc!=SQLITE_NOMEM ){
+      rc = SQLITE_OK;
+    }
+
+    if( rc==SQLITE_OK ){
+      if( nRow==0 ){
+        pRtree->nRowEst = RTREE_DEFAULT_ROWEST;
+      }else{
+        pRtree->nRowEst = MAX(nRow, RTREE_MIN_ROWEST);
+      }
+    }
+    sqlite3_free(zSql);
+  }
+
+  return rc;
+}
+
 static sqlite3_module rtreeModule = {
   0,                          /* iVersion */
   rtreeCreate,                /* xCreate - create a table */
@@ -139299,7 +146574,8 @@ static int rtreeSqlInit(
     char *zCreate = sqlite3_mprintf(
 "CREATE TABLE \"%w\".\"%w_node\"(nodeno INTEGER PRIMARY KEY, data BLOB);"
 "CREATE TABLE \"%w\".\"%w_rowid\"(rowid INTEGER PRIMARY KEY, nodeno INTEGER);"
-"CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY, parentnode INTEGER);"
+"CREATE TABLE \"%w\".\"%w_parent\"(nodeno INTEGER PRIMARY KEY,"
+                                  " parentnode INTEGER);"
 "INSERT INTO '%q'.'%q_node' VALUES(1, zeroblob(%d))",
       zDb, zPrefix, zDb, zPrefix, zDb, zPrefix, zDb, zPrefix, pRtree->iNodeSize
     );
@@ -139323,6 +146599,7 @@ static int rtreeSqlInit(
   appStmt[7] = &pRtree->pWriteParent;
   appStmt[8] = &pRtree->pDeleteParent;
 
+  rc = rtreeQueryStat1(db, pRtree);
   for(i=0; i<N_STATEMENT && rc==SQLITE_OK; i++){
     char *zSql = sqlite3_mprintf(azSql[i], zDb, zPrefix);
     if( zSql ){
@@ -139500,6 +146777,8 @@ static int rtreeInit(
   if( rc==SQLITE_OK ){
     *ppVtab = (sqlite3_vtab *)pRtree;
   }else{
+    assert( *ppVtab==0 );
+    assert( pRtree->nBusy==1 );
     rtreeRelease(pRtree);
   }
   return rc;
@@ -139510,10 +146789,10 @@ static int rtreeInit(
 ** Implementation of a scalar function that decodes r-tree nodes to
 ** human readable strings. This can be used for debugging and analysis.
 **
-** The scalar function takes two arguments, a blob of data containing
-** an r-tree node, and the number of dimensions the r-tree indexes.
-** For a two-dimensional r-tree structure called "rt", to deserialize
-** all nodes, a statement like:
+** The scalar function takes two arguments: (1) the number of dimensions
+** to the rtree (between 1 and 5, inclusive) and (2) a blob of data containing
+** an r-tree node.  For a two-dimensional r-tree structure called "rt", to
+** deserialize all nodes, a statement like:
 **
 **   SELECT rtreenode(2, data) FROM rt_node;
 **
@@ -139546,7 +146825,7 @@ static void rtreenode(sqlite3_context *ctx, int nArg, sqlite3_value **apArg){
     nCell = (int)strlen(zCell);
     for(jj=0; jj<tree.nDim*2; jj++){
 #ifndef SQLITE_RTREE_INT_ONLY
-      sqlite3_snprintf(512-nCell,&zCell[nCell], " %f",
+      sqlite3_snprintf(512-nCell,&zCell[nCell], " %g",
                        (double)cell.aCoord[jj].f);
 #else
       sqlite3_snprintf(512-nCell,&zCell[nCell], " %d",
@@ -139567,6 +146846,15 @@ static void rtreenode(sqlite3_context *ctx, int nArg, sqlite3_value **apArg){
   sqlite3_result_text(ctx, zText, -1, sqlite3_free);
 }
 
+/* This routine implements an SQL function that returns the "depth" parameter
+** from the front of a blob that is an r-tree node.  For example:
+**
+**     SELECT rtreedepth(data) FROM rt_node WHERE nodeno=1;
+**
+** The depth value is 0 for all nodes other than the root node, and the root
+** node always has nodeno=1, so the example above is the primary use for this
+** routine.  This routine is intended for testing and analysis only.
+*/
 static void rtreedepth(sqlite3_context *ctx, int nArg, sqlite3_value **apArg){
   UNUSED_PARAMETER(nArg);
   if( sqlite3_value_type(apArg[0])!=SQLITE_BLOB 
@@ -139609,22 +146897,31 @@ SQLITE_PRIVATE int sqlite3RtreeInit(sqlite3 *db){
 }
 
 /*
-** A version of sqlite3_free() that can be used as a callback. This is used
-** in two places - as the destructor for the blob value returned by the
-** invocation of a geometry function, and as the destructor for the geometry
-** functions themselves.
+** This routine deletes the RtreeGeomCallback object that was attached
+** one of the SQL functions create by sqlite3_rtree_geometry_callback()
+** or sqlite3_rtree_query_callback().  In other words, this routine is the
+** destructor for an RtreeGeomCallback objecct.  This routine is called when
+** the corresponding SQL function is deleted.
 */
-static void doSqlite3Free(void *p){
+static void rtreeFreeCallback(void *p){
+  RtreeGeomCallback *pInfo = (RtreeGeomCallback*)p;
+  if( pInfo->xDestructor ) pInfo->xDestructor(pInfo->pContext);
   sqlite3_free(p);
 }
 
 /*
-** Each call to sqlite3_rtree_geometry_callback() creates an ordinary SQLite
-** scalar user function. This C function is the callback used for all such
-** registered SQL functions.
+** Each call to sqlite3_rtree_geometry_callback() or
+** sqlite3_rtree_query_callback() creates an ordinary SQLite
+** scalar function that is implemented by this routine.
 **
-** The scalar user functions return a blob that is interpreted by r-tree
-** table MATCH operators.
+** All this function does is construct an RtreeMatchArg object that
+** contains the geometry-checking callback routines and a list of
+** parameters to this function, then return that RtreeMatchArg object
+** as a BLOB.
+**
+** The R-Tree MATCH operator will read the returned BLOB, deserialize
+** the RtreeMatchArg object, and use the RtreeMatchArg object to figure
+** out which elements of the R-Tree should be returned by the query.
 */
 static void geomCallback(sqlite3_context *ctx, int nArg, sqlite3_value **aArg){
   RtreeGeomCallback *pGeomCtx = (RtreeGeomCallback *)sqlite3_user_data(ctx);
@@ -139638,8 +146935,7 @@ static void geomCallback(sqlite3_context *ctx, int nArg, sqlite3_value **aArg){
   }else{
     int i;
     pBlob->magic = RTREE_GEOMETRY_MAGIC;
-    pBlob->xGeom = pGeomCtx->xGeom;
-    pBlob->pContext = pGeomCtx->pContext;
+    pBlob->cb = pGeomCtx[0];
     pBlob->nParam = nArg;
     for(i=0; i<nArg; i++){
 #ifdef SQLITE_RTREE_INT_ONLY
@@ -139648,7 +146944,7 @@ static void geomCallback(sqlite3_context *ctx, int nArg, sqlite3_value **aArg){
       pBlob->aParam[i] = sqlite3_value_double(aArg[i]);
 #endif
     }
-    sqlite3_result_blob(ctx, pBlob, nBlob, doSqlite3Free);
+    sqlite3_result_blob(ctx, pBlob, nBlob, sqlite3_free);
   }
 }
 
@@ -139656,10 +146952,10 @@ static void geomCallback(sqlite3_context *ctx, int nArg, sqlite3_value **aArg){
 ** Register a new geometry function for use with the r-tree MATCH operator.
 */
 SQLITE_API int sqlite3_rtree_geometry_callback(
-  sqlite3 *db,
-  const char *zGeom,
-  int (*xGeom)(sqlite3_rtree_geometry *, int, RtreeDValue *, int *),
-  void *pContext
+  sqlite3 *db,                  /* Register SQL function on this connection */
+  const char *zGeom,            /* Name of the new SQL function */
+  int (*xGeom)(sqlite3_rtree_geometry*,int,RtreeDValue*,int*), /* Callback */
+  void *pContext                /* Extra data associated with the callback */
 ){
   RtreeGeomCallback *pGeomCtx;      /* Context object for new user-function */
 
@@ -139667,17 +146963,44 @@ SQLITE_API int sqlite3_rtree_geometry_callback(
   pGeomCtx = (RtreeGeomCallback *)sqlite3_malloc(sizeof(RtreeGeomCallback));
   if( !pGeomCtx ) return SQLITE_NOMEM;
   pGeomCtx->xGeom = xGeom;
+  pGeomCtx->xQueryFunc = 0;
+  pGeomCtx->xDestructor = 0;
   pGeomCtx->pContext = pContext;
-
-  /* Create the new user-function. Register a destructor function to delete
-  ** the context object when it is no longer required.  */
   return sqlite3_create_function_v2(db, zGeom, -1, SQLITE_ANY, 
-      (void *)pGeomCtx, geomCallback, 0, 0, doSqlite3Free
+      (void *)pGeomCtx, geomCallback, 0, 0, rtreeFreeCallback
+  );
+}
+
+/*
+** Register a new 2nd-generation geometry function for use with the
+** r-tree MATCH operator.
+*/
+SQLITE_API int sqlite3_rtree_query_callback(
+  sqlite3 *db,                 /* Register SQL function on this connection */
+  const char *zQueryFunc,      /* Name of new SQL function */
+  int (*xQueryFunc)(sqlite3_rtree_query_info*), /* Callback */
+  void *pContext,              /* Extra data passed into the callback */
+  void (*xDestructor)(void*)   /* Destructor for the extra data */
+){
+  RtreeGeomCallback *pGeomCtx;      /* Context object for new user-function */
+
+  /* Allocate and populate the context object. */
+  pGeomCtx = (RtreeGeomCallback *)sqlite3_malloc(sizeof(RtreeGeomCallback));
+  if( !pGeomCtx ) return SQLITE_NOMEM;
+  pGeomCtx->xGeom = 0;
+  pGeomCtx->xQueryFunc = xQueryFunc;
+  pGeomCtx->xDestructor = xDestructor;
+  pGeomCtx->pContext = pContext;
+  return sqlite3_create_function_v2(db, zQueryFunc, -1, SQLITE_ANY, 
+      (void *)pGeomCtx, geomCallback, 0, 0, rtreeFreeCallback
   );
 }
 
 #if !SQLITE_CORE
-SQLITE_API int sqlite3_extension_init(
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+SQLITE_API int sqlite3_rtree_init(
   sqlite3 *db,
   char **pzErrMsg,
   const sqlite3_api_routines *pApi
@@ -139715,7 +147038,7 @@ SQLITE_API int sqlite3_extension_init(
 **   * Implementations of the SQL scalar upper() and lower() functions
 **     for case mapping.
 **
-**   * Integration of ICU and SQLite collation seqences.
+**   * Integration of ICU and SQLite collation sequences.
 **
 **   * An implementation of the LIKE operator that uses ICU to 
 **     provide case-independent matching.
@@ -140179,7 +147502,10 @@ SQLITE_PRIVATE int sqlite3IcuInit(sqlite3 *db){
 }
 
 #if !SQLITE_CORE
-SQLITE_API int sqlite3_extension_init(
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+SQLITE_API int sqlite3_icu_init(
   sqlite3 *db, 
   char **pzErrMsg,
   const sqlite3_api_routines *pApi
diff --git a/contrib/sqlite3/sqlite3.h b/contrib/sqlite3/sqlite3.h
index e3988382871d..e86d83fa6728 100644
--- a/contrib/sqlite3/sqlite3.h
+++ b/contrib/sqlite3/sqlite3.h
@@ -107,9 +107,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.7.17"
-#define SQLITE_VERSION_NUMBER 3007017
-#define SQLITE_SOURCE_ID      "2013-05-20 00:56:22 118a3b35693b134d56ebd780123b7fd6f1497668"
+#define SQLITE_VERSION        "3.8.5"
+#define SQLITE_VERSION_NUMBER 3008005
+#define SQLITE_SOURCE_ID      "2014-06-04 14:06:34 b1ed4f2a34ba66c29b130f8d13e9092758019212"
 
 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@@ -370,7 +370,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**);
 ** <ul>
 ** <li> The application must insure that the 1st parameter to sqlite3_exec()
 **      is a valid and open [database connection].
-** <li> The application must not close [database connection] specified by
+** <li> The application must not close the [database connection] specified by
 **      the 1st parameter to sqlite3_exec() while sqlite3_exec() is running.
 ** <li> The application must not modify the SQL statement text passed into
 **      the 2nd parameter of sqlite3_exec() while sqlite3_exec() is running.
@@ -447,7 +447,7 @@ SQLITE_API int sqlite3_exec(
 ** [sqlite3_extended_result_codes()] API.
 **
 ** Some of the available extended result codes are listed here.
-** One may expect the number of extended result codes will be expand
+** One may expect the number of extended result codes will increase
 ** over time.  Software that uses extended result codes should expect
 ** to see new result codes in future releases of SQLite.
 **
@@ -478,15 +478,20 @@ SQLITE_API int sqlite3_exec(
 #define SQLITE_IOERR_SEEK              (SQLITE_IOERR | (22<<8))
 #define SQLITE_IOERR_DELETE_NOENT      (SQLITE_IOERR | (23<<8))
 #define SQLITE_IOERR_MMAP              (SQLITE_IOERR | (24<<8))
+#define SQLITE_IOERR_GETTEMPPATH       (SQLITE_IOERR | (25<<8))
+#define SQLITE_IOERR_CONVPATH          (SQLITE_IOERR | (26<<8))
 #define SQLITE_LOCKED_SHAREDCACHE      (SQLITE_LOCKED |  (1<<8))
 #define SQLITE_BUSY_RECOVERY           (SQLITE_BUSY   |  (1<<8))
+#define SQLITE_BUSY_SNAPSHOT           (SQLITE_BUSY   |  (2<<8))
 #define SQLITE_CANTOPEN_NOTEMPDIR      (SQLITE_CANTOPEN | (1<<8))
 #define SQLITE_CANTOPEN_ISDIR          (SQLITE_CANTOPEN | (2<<8))
 #define SQLITE_CANTOPEN_FULLPATH       (SQLITE_CANTOPEN | (3<<8))
+#define SQLITE_CANTOPEN_CONVPATH       (SQLITE_CANTOPEN | (4<<8))
 #define SQLITE_CORRUPT_VTAB            (SQLITE_CORRUPT | (1<<8))
 #define SQLITE_READONLY_RECOVERY       (SQLITE_READONLY | (1<<8))
 #define SQLITE_READONLY_CANTLOCK       (SQLITE_READONLY | (2<<8))
 #define SQLITE_READONLY_ROLLBACK       (SQLITE_READONLY | (3<<8))
+#define SQLITE_READONLY_DBMOVED        (SQLITE_READONLY | (4<<8))
 #define SQLITE_ABORT_ROLLBACK          (SQLITE_ABORT | (2<<8))
 #define SQLITE_CONSTRAINT_CHECK        (SQLITE_CONSTRAINT | (1<<8))
 #define SQLITE_CONSTRAINT_COMMITHOOK   (SQLITE_CONSTRAINT | (2<<8))
@@ -497,8 +502,10 @@ SQLITE_API int sqlite3_exec(
 #define SQLITE_CONSTRAINT_TRIGGER      (SQLITE_CONSTRAINT | (7<<8))
 #define SQLITE_CONSTRAINT_UNIQUE       (SQLITE_CONSTRAINT | (8<<8))
 #define SQLITE_CONSTRAINT_VTAB         (SQLITE_CONSTRAINT | (9<<8))
+#define SQLITE_CONSTRAINT_ROWID        (SQLITE_CONSTRAINT |(10<<8))
 #define SQLITE_NOTICE_RECOVER_WAL      (SQLITE_NOTICE | (1<<8))
 #define SQLITE_NOTICE_RECOVER_ROLLBACK (SQLITE_NOTICE | (2<<8))
+#define SQLITE_WARNING_AUTOINDEX       (SQLITE_WARNING | (1<<8))
 
 /*
 ** CAPI3REF: Flags For File Open Operations
@@ -552,7 +559,11 @@ SQLITE_API int sqlite3_exec(
 ** after reboot following a crash or power loss, the only bytes in a
 ** file that were written at the application level might have changed
 ** and that adjacent bytes, even bytes within the same sector are
-** guaranteed to be unchanged.
+** guaranteed to be unchanged.  The SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN
+** flag indicate that a file cannot be deleted when open.  The
+** SQLITE_IOCAP_IMMUTABLE flag indicates that the file is on
+** read-only media and cannot be changed even by processes with
+** elevated privileges.
 */
 #define SQLITE_IOCAP_ATOMIC                 0x00000001
 #define SQLITE_IOCAP_ATOMIC512              0x00000002
@@ -567,6 +578,7 @@ SQLITE_API int sqlite3_exec(
 #define SQLITE_IOCAP_SEQUENTIAL             0x00000400
 #define SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN  0x00000800
 #define SQLITE_IOCAP_POWERSAFE_OVERWRITE    0x00001000
+#define SQLITE_IOCAP_IMMUTABLE              0x00002000
 
 /*
 ** CAPI3REF: File Locking Levels
@@ -783,15 +795,29 @@ struct sqlite3_io_methods {
 ** additional information.
 **
 ** <li>[[SQLITE_FCNTL_SYNC_OMITTED]]
-** ^(The [SQLITE_FCNTL_SYNC_OMITTED] opcode is generated internally by
-** SQLite and sent to all VFSes in place of a call to the xSync method
-** when the database connection has [PRAGMA synchronous] set to OFF.)^
-** Some specialized VFSes need this signal in order to operate correctly
-** when [PRAGMA synchronous | PRAGMA synchronous=OFF] is set, but most 
-** VFSes do not need this signal and should silently ignore this opcode.
-** Applications should not call [sqlite3_file_control()] with this
-** opcode as doing so may disrupt the operation of the specialized VFSes
-** that do require it.  
+** No longer in use.
+**
+** <li>[[SQLITE_FCNTL_SYNC]]
+** The [SQLITE_FCNTL_SYNC] opcode is generated internally by SQLite and
+** sent to the VFS immediately before the xSync method is invoked on a
+** database file descriptor. Or, if the xSync method is not invoked 
+** because the user has configured SQLite with 
+** [PRAGMA synchronous | PRAGMA synchronous=OFF] it is invoked in place 
+** of the xSync method. In most cases, the pointer argument passed with
+** this file-control is NULL. However, if the database file is being synced
+** as part of a multi-database commit, the argument points to a nul-terminated
+** string containing the transactions master-journal file name. VFSes that 
+** do not need this signal should silently ignore this opcode. Applications 
+** should not call [sqlite3_file_control()] with this opcode as doing so may 
+** disrupt the operation of the specialized VFSes that do require it.  
+**
+** <li>[[SQLITE_FCNTL_COMMIT_PHASETWO]]
+** The [SQLITE_FCNTL_COMMIT_PHASETWO] opcode is generated internally by SQLite
+** and sent to the VFS after a transaction has been committed immediately
+** but before the database is unlocked. VFSes that do not need this signal
+** should silently ignore this opcode. Applications should not call
+** [sqlite3_file_control()] with this opcode as doing so may disrupt the 
+** operation of the specialized VFSes that do require it.  
 **
 ** <li>[[SQLITE_FCNTL_WIN32_AV_RETRY]]
 ** ^The [SQLITE_FCNTL_WIN32_AV_RETRY] opcode is used to configure automatic
@@ -907,6 +933,26 @@ struct sqlite3_io_methods {
 ** can be queried by passing in a pointer to a negative number.  This
 ** file-control is used internally to implement [PRAGMA mmap_size].
 **
+** <li>[[SQLITE_FCNTL_TRACE]]
+** The [SQLITE_FCNTL_TRACE] file control provides advisory information
+** to the VFS about what the higher layers of the SQLite stack are doing.
+** This file control is used by some VFS activity tracing [shims].
+** The argument is a zero-terminated string.  Higher layers in the
+** SQLite stack may generate instances of this file control if
+** the [SQLITE_USE_FCNTL_TRACE] compile-time option is enabled.
+**
+** <li>[[SQLITE_FCNTL_HAS_MOVED]]
+** The [SQLITE_FCNTL_HAS_MOVED] file control interprets its argument as a
+** pointer to an integer and it writes a boolean into that integer depending
+** on whether or not the file has been renamed, moved, or deleted since it
+** was first opened.
+**
+** <li>[[SQLITE_FCNTL_WIN32_SET_HANDLE]]
+** The [SQLITE_FCNTL_WIN32_SET_HANDLE] opcode is used for debugging.  This
+** opcode causes the xFileControl method to swap the file handle with the one
+** pointed to by the pArg argument.  This capability is used during testing
+** and only needs to be supported when SQLITE_TEST is defined.
+**
 ** </ul>
 */
 #define SQLITE_FCNTL_LOCKSTATE               1
@@ -926,6 +972,11 @@ struct sqlite3_io_methods {
 #define SQLITE_FCNTL_BUSYHANDLER            15
 #define SQLITE_FCNTL_TEMPFILENAME           16
 #define SQLITE_FCNTL_MMAP_SIZE              18
+#define SQLITE_FCNTL_TRACE                  19
+#define SQLITE_FCNTL_HAS_MOVED              20
+#define SQLITE_FCNTL_SYNC                   21
+#define SQLITE_FCNTL_COMMIT_PHASETWO        22
+#define SQLITE_FCNTL_WIN32_SET_HANDLE       23
 
 /*
 ** CAPI3REF: Mutex Handle
@@ -1370,7 +1421,7 @@ SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...);
 ** or [sqlite3_realloc()] first calls xRoundup.  If xRoundup returns 0, 
 ** that causes the corresponding memory allocation to fail.
 **
-** The xInit method initializes the memory allocator.  (For example,
+** The xInit method initializes the memory allocator.  For example,
 ** it might allocate any require mutexes or initialize internal data
 ** structures.  The xShutdown method is invoked (indirectly) by
 ** [sqlite3_shutdown()] and should deallocate any resources acquired
@@ -1612,27 +1663,27 @@ struct sqlite3_mem_methods {
 ** function must be threadsafe. </dd>
 **
 ** [[SQLITE_CONFIG_URI]] <dt>SQLITE_CONFIG_URI
-** <dd> This option takes a single argument of type int. If non-zero, then
+** <dd>^(This option takes a single argument of type int. If non-zero, then
 ** URI handling is globally enabled. If the parameter is zero, then URI handling
-** is globally disabled. If URI handling is globally enabled, all filenames
+** is globally disabled.)^ ^If URI handling is globally enabled, all filenames
 ** passed to [sqlite3_open()], [sqlite3_open_v2()], [sqlite3_open16()] or
 ** specified as part of [ATTACH] commands are interpreted as URIs, regardless
 ** of whether or not the [SQLITE_OPEN_URI] flag is set when the database
-** connection is opened. If it is globally disabled, filenames are
+** connection is opened. ^If it is globally disabled, filenames are
 ** only interpreted as URIs if the SQLITE_OPEN_URI flag is set when the
-** database connection is opened. By default, URI handling is globally
+** database connection is opened. ^(By default, URI handling is globally
 ** disabled. The default value may be changed by compiling with the
-** [SQLITE_USE_URI] symbol defined.
+** [SQLITE_USE_URI] symbol defined.)^
 **
 ** [[SQLITE_CONFIG_COVERING_INDEX_SCAN]] <dt>SQLITE_CONFIG_COVERING_INDEX_SCAN
-** <dd> This option takes a single integer argument which is interpreted as
+** <dd>^This option takes a single integer argument which is interpreted as
 ** a boolean in order to enable or disable the use of covering indices for
-** full table scans in the query optimizer.  The default setting is determined
+** full table scans in the query optimizer.  ^The default setting is determined
 ** by the [SQLITE_ALLOW_COVERING_INDEX_SCAN] compile-time option, or is "on"
 ** if that compile-time option is omitted.
 ** The ability to disable the use of covering indices for full table scans
 ** is because some incorrectly coded legacy applications might malfunction
-** malfunction when the optimization is enabled.  Providing the ability to
+** when the optimization is enabled.  Providing the ability to
 ** disable the optimization allows the older, buggy application code to work
 ** without change even with newer versions of SQLite.
 **
@@ -1661,17 +1712,24 @@ struct sqlite3_mem_methods {
 **
 ** [[SQLITE_CONFIG_MMAP_SIZE]]
 ** <dt>SQLITE_CONFIG_MMAP_SIZE
-** <dd>SQLITE_CONFIG_MMAP_SIZE takes two 64-bit integer (sqlite3_int64) values
+** <dd>^SQLITE_CONFIG_MMAP_SIZE takes two 64-bit integer (sqlite3_int64) values
 ** that are the default mmap size limit (the default setting for
 ** [PRAGMA mmap_size]) and the maximum allowed mmap size limit.
-** The default setting can be overridden by each database connection using
+** ^The default setting can be overridden by each database connection using
 ** either the [PRAGMA mmap_size] command, or by using the
-** [SQLITE_FCNTL_MMAP_SIZE] file control.  The maximum allowed mmap size
+** [SQLITE_FCNTL_MMAP_SIZE] file control.  ^(The maximum allowed mmap size
 ** cannot be changed at run-time.  Nor may the maximum allowed mmap size
 ** exceed the compile-time maximum mmap size set by the
-** [SQLITE_MAX_MMAP_SIZE] compile-time option.  
-** If either argument to this option is negative, then that argument is
+** [SQLITE_MAX_MMAP_SIZE] compile-time option.)^
+** ^If either argument to this option is negative, then that argument is
 ** changed to its compile-time default.
+**
+** [[SQLITE_CONFIG_WIN32_HEAPSIZE]]
+** <dt>SQLITE_CONFIG_WIN32_HEAPSIZE
+** <dd>^This option is only available if SQLite is compiled for Windows
+** with the [SQLITE_WIN32_MALLOC] pre-processor macro defined.
+** SQLITE_CONFIG_WIN32_HEAPSIZE takes a 32-bit unsigned integer value
+** that specifies the maximum size of the created heap.
 ** </dl>
 */
 #define SQLITE_CONFIG_SINGLETHREAD  1  /* nil */
@@ -1696,6 +1754,7 @@ struct sqlite3_mem_methods {
 #define SQLITE_CONFIG_COVERING_INDEX_SCAN 20  /* int */
 #define SQLITE_CONFIG_SQLLOG       21  /* xSqllog, void* */
 #define SQLITE_CONFIG_MMAP_SIZE    22  /* sqlite3_int64, sqlite3_int64 */
+#define SQLITE_CONFIG_WIN32_HEAPSIZE      23  /* int nByte */
 
 /*
 ** CAPI3REF: Database Connection Configuration Options
@@ -1772,19 +1831,21 @@ SQLITE_API int sqlite3_extended_result_codes(sqlite3*, int onoff);
 /*
 ** CAPI3REF: Last Insert Rowid
 **
-** ^Each entry in an SQLite table has a unique 64-bit signed
+** ^Each entry in most SQLite tables (except for [WITHOUT ROWID] tables)
+** has a unique 64-bit signed
 ** integer key called the [ROWID | "rowid"]. ^The rowid is always available
 ** as an undeclared column named ROWID, OID, or _ROWID_ as long as those
 ** names are not also used by explicitly declared columns. ^If
 ** the table has a column of type [INTEGER PRIMARY KEY] then that column
 ** is another alias for the rowid.
 **
-** ^This routine returns the [rowid] of the most recent
-** successful [INSERT] into the database from the [database connection]
-** in the first argument.  ^As of SQLite version 3.7.7, this routines
-** records the last insert rowid of both ordinary tables and [virtual tables].
-** ^If no successful [INSERT]s
-** have ever occurred on that database connection, zero is returned.
+** ^The sqlite3_last_insert_rowid(D) interface returns the [rowid] of the 
+** most recent successful [INSERT] into a rowid table or [virtual table]
+** on database connection D.
+** ^Inserts into [WITHOUT ROWID] tables are not recorded.
+** ^If no successful [INSERT]s into rowid tables
+** have ever occurred on the database connection D, 
+** then sqlite3_last_insert_rowid(D) returns zero.
 **
 ** ^(If an [INSERT] occurs within a trigger or within a [virtual table]
 ** method, then this routine will return the [rowid] of the inserted
@@ -2350,11 +2411,13 @@ SQLITE_API sqlite3_int64 sqlite3_memory_highwater(int resetFlag);
 ** applications to access the same PRNG for other purposes.
 **
 ** ^A call to this routine stores N bytes of randomness into buffer P.
+** ^If N is less than one, then P can be a NULL pointer.
 **
-** ^The first time this routine is invoked (either internally or by
-** the application) the PRNG is seeded using randomness obtained
-** from the xRandomness method of the default [sqlite3_vfs] object.
-** ^On all subsequent invocations, the pseudo-randomness is generated
+** ^If this routine has not been previously called or if the previous
+** call had N less than one, then the PRNG is seeded using randomness
+** obtained from the xRandomness method of the default [sqlite3_vfs] object.
+** ^If the previous call to this routine had an N of 1 or more then
+** the pseudo-randomness is generated
 ** internally and without recourse to the [sqlite3_vfs] xRandomness
 ** method.
 */
@@ -2514,6 +2577,7 @@ SQLITE_API int sqlite3_set_authorizer(
 #define SQLITE_FUNCTION             31   /* NULL            Function Name   */
 #define SQLITE_SAVEPOINT            32   /* Operation       Savepoint Name  */
 #define SQLITE_COPY                  0   /* No longer used */
+#define SQLITE_RECURSIVE            33   /* NULL            NULL            */
 
 /*
 ** CAPI3REF: Tracing And Profiling Functions
@@ -2557,9 +2621,10 @@ SQLITE_API SQLITE_EXPERIMENTAL void *sqlite3_profile(sqlite3*,
 ** interface is to keep a GUI updated during a large query.
 **
 ** ^The parameter P is passed through as the only parameter to the 
-** callback function X.  ^The parameter N is the number of 
+** callback function X.  ^The parameter N is the approximate number of 
 ** [virtual machine instructions] that are evaluated between successive
-** invocations of the callback X.
+** invocations of the callback X.  ^If N is less than one then the progress
+** handler is disabled.
 **
 ** ^Only a single progress handler may be defined at one time per
 ** [database connection]; setting a new progress handler cancels the
@@ -2725,6 +2790,30 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 **     ^If sqlite3_open_v2() is used and the "cache" parameter is present in
 **     a URI filename, its value overrides any behavior requested by setting
 **     SQLITE_OPEN_PRIVATECACHE or SQLITE_OPEN_SHAREDCACHE flag.
+**
+**  <li> <b>psow</b>: ^The psow parameter may be "true" (or "on" or "yes" or
+**     "1") or "false" (or "off" or "no" or "0") to indicate that the
+**     [powersafe overwrite] property does or does not apply to the
+**     storage media on which the database file resides.  ^The psow query
+**     parameter only works for the built-in unix and Windows VFSes.
+**
+**  <li> <b>nolock</b>: ^The nolock parameter is a boolean query parameter
+**     which if set disables file locking in rollback journal modes.  This
+**     is useful for accessing a database on a filesystem that does not
+**     support locking.  Caution:  Database corruption might result if two
+**     or more processes write to the same database and any one of those
+**     processes uses nolock=1.
+**
+**  <li> <b>immutable</b>: ^The immutable parameter is a boolean query
+**     parameter that indicates that the database file is stored on
+**     read-only media.  ^When immutable is set, SQLite assumes that the
+**     database file cannot be changed, even by a process with higher
+**     privilege, and so the database is opened read-only and all locking
+**     and change detection is disabled.  Caution: Setting the immutable
+**     property on a database file that does in fact change can result
+**     in incorrect query results and/or [SQLITE_CORRUPT] errors.
+**     See also: [SQLITE_IOCAP_IMMUTABLE].
+**       
 ** </ul>
 **
 ** ^Specifying an unknown parameter in the query component of a URI is not an
@@ -2754,8 +2843,9 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 **          Open file "data.db" in the current directory for read-only access.
 **          Regardless of whether or not shared-cache mode is enabled by
 **          default, use a private cache.
-** <tr><td> file:/home/fred/data.db?vfs=unix-nolock <td>
-**          Open file "/home/fred/data.db". Use the special VFS "unix-nolock".
+** <tr><td> file:/home/fred/data.db?vfs=unix-dotfile <td>
+**          Open file "/home/fred/data.db". Use the special VFS "unix-dotfile"
+**          that uses dot-files in place of posix advisory locking.
 ** <tr><td> file:data.db?mode=readonly <td> 
 **          An error. "readonly" is not a valid option for the "mode" parameter.
 ** </table>
@@ -3093,7 +3183,6 @@ SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
 ** choice of query plan if the parameter is the left-hand side of a [LIKE]
 ** or [GLOB] operator or if the parameter is compared to an indexed column
 ** and the [SQLITE_ENABLE_STAT3] compile-time option is enabled.
-** the 
 ** </li>
 ** </ol>
 */
@@ -3755,19 +3844,19 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);
 **
 ** <tr><td>  NULL    <td> INTEGER   <td> Result is 0
 ** <tr><td>  NULL    <td>  FLOAT    <td> Result is 0.0
-** <tr><td>  NULL    <td>   TEXT    <td> Result is NULL pointer
-** <tr><td>  NULL    <td>   BLOB    <td> Result is NULL pointer
+** <tr><td>  NULL    <td>   TEXT    <td> Result is a NULL pointer
+** <tr><td>  NULL    <td>   BLOB    <td> Result is a NULL pointer
 ** <tr><td> INTEGER  <td>  FLOAT    <td> Convert from integer to float
 ** <tr><td> INTEGER  <td>   TEXT    <td> ASCII rendering of the integer
 ** <tr><td> INTEGER  <td>   BLOB    <td> Same as INTEGER->TEXT
-** <tr><td>  FLOAT   <td> INTEGER   <td> Convert from float to integer
+** <tr><td>  FLOAT   <td> INTEGER   <td> [CAST] to INTEGER
 ** <tr><td>  FLOAT   <td>   TEXT    <td> ASCII rendering of the float
-** <tr><td>  FLOAT   <td>   BLOB    <td> Same as FLOAT->TEXT
-** <tr><td>  TEXT    <td> INTEGER   <td> Use atoi()
-** <tr><td>  TEXT    <td>  FLOAT    <td> Use atof()
+** <tr><td>  FLOAT   <td>   BLOB    <td> [CAST] to BLOB
+** <tr><td>  TEXT    <td> INTEGER   <td> [CAST] to INTEGER
+** <tr><td>  TEXT    <td>  FLOAT    <td> [CAST] to REAL
 ** <tr><td>  TEXT    <td>   BLOB    <td> No change
-** <tr><td>  BLOB    <td> INTEGER   <td> Convert to TEXT then use atoi()
-** <tr><td>  BLOB    <td>  FLOAT    <td> Convert to TEXT then use atof()
+** <tr><td>  BLOB    <td> INTEGER   <td> [CAST] to INTEGER
+** <tr><td>  BLOB    <td>  FLOAT    <td> [CAST] to REAL
 ** <tr><td>  BLOB    <td>   TEXT    <td> Add a zero terminator if needed
 ** </table>
 ** </blockquote>)^
@@ -3823,7 +3912,7 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);
 ** described above, or until [sqlite3_step()] or [sqlite3_reset()] or
 ** [sqlite3_finalize()] is called.  ^The memory space used to hold strings
 ** and BLOBs is freed automatically.  Do <b>not</b> pass the pointers returned
-** [sqlite3_column_blob()], [sqlite3_column_text()], etc. into
+** from [sqlite3_column_blob()], [sqlite3_column_text()], etc. into
 ** [sqlite3_free()].
 **
 ** ^(If a memory allocation error occurs during the evaluation of any
@@ -3932,15 +4021,24 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
 **
 ** ^The fourth parameter, eTextRep, specifies what
 ** [SQLITE_UTF8 | text encoding] this SQL function prefers for
-** its parameters.  Every SQL function implementation must be able to work
-** with UTF-8, UTF-16le, or UTF-16be.  But some implementations may be
-** more efficient with one encoding than another.  ^An application may
-** invoke sqlite3_create_function() or sqlite3_create_function16() multiple
-** times with the same function but with different values of eTextRep.
+** its parameters.  The application should set this parameter to
+** [SQLITE_UTF16LE] if the function implementation invokes 
+** [sqlite3_value_text16le()] on an input, or [SQLITE_UTF16BE] if the
+** implementation invokes [sqlite3_value_text16be()] on an input, or
+** [SQLITE_UTF16] if [sqlite3_value_text16()] is used, or [SQLITE_UTF8]
+** otherwise.  ^The same SQL function may be registered multiple times using
+** different preferred text encodings, with different implementations for
+** each encoding.
 ** ^When multiple implementations of the same function are available, SQLite
 ** will pick the one that involves the least amount of data conversion.
-** If there is only a single implementation which does not care what text
-** encoding is used, then the fourth argument should be [SQLITE_ANY].
+**
+** ^The fourth parameter may optionally be ORed with [SQLITE_DETERMINISTIC]
+** to signal that the function will always return the same result given
+** the same inputs within a single SQL statement.  Most SQL functions are
+** deterministic.  The built-in [random()] SQL function is an example of a
+** function that is not deterministic.  The SQLite query planner is able to
+** perform additional optimizations on deterministic functions, so use
+** of the [SQLITE_DETERMINISTIC] flag is recommended where possible.
 **
 ** ^(The fifth parameter is an arbitrary pointer.  The implementation of the
 ** function can gain access to this pointer using [sqlite3_user_data()].)^
@@ -4026,9 +4124,19 @@ SQLITE_API int sqlite3_create_function_v2(
 #define SQLITE_UTF16LE        2
 #define SQLITE_UTF16BE        3
 #define SQLITE_UTF16          4    /* Use native byte order */
-#define SQLITE_ANY            5    /* sqlite3_create_function only */
+#define SQLITE_ANY            5    /* Deprecated */
 #define SQLITE_UTF16_ALIGNED  8    /* sqlite3_create_collation only */
 
+/*
+** CAPI3REF: Function Flags
+**
+** These constants may be ORed together with the 
+** [SQLITE_UTF8 | preferred text encoding] as the fourth argument
+** to [sqlite3_create_function()], [sqlite3_create_function16()], or
+** [sqlite3_create_function_v2()].
+*/
+#define SQLITE_DETERMINISTIC    0x800
+
 /*
 ** CAPI3REF: Deprecated Functions
 ** DEPRECATED
@@ -4179,41 +4287,49 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*);
 /*
 ** CAPI3REF: Function Auxiliary Data
 **
-** The following two functions may be used by scalar SQL functions to
+** These functions may be used by (non-aggregate) SQL functions to
 ** associate metadata with argument values. If the same value is passed to
 ** multiple invocations of the same SQL function during query execution, under
-** some circumstances the associated metadata may be preserved. This may
-** be used, for example, to add a regular-expression matching scalar
-** function. The compiled version of the regular expression is stored as
-** metadata associated with the SQL value passed as the regular expression
-** pattern.  The compiled regular expression can be reused on multiple
-** invocations of the same function so that the original pattern string
-** does not need to be recompiled on each invocation.
+** some circumstances the associated metadata may be preserved.  An example
+** of where this might be useful is in a regular-expression matching
+** function. The compiled version of the regular expression can be stored as
+** metadata associated with the pattern string.  
+** Then as long as the pattern string remains the same,
+** the compiled regular expression can be reused on multiple
+** invocations of the same function.
 **
 ** ^The sqlite3_get_auxdata() interface returns a pointer to the metadata
 ** associated by the sqlite3_set_auxdata() function with the Nth argument
-** value to the application-defined function. ^If no metadata has been ever
-** been set for the Nth argument of the function, or if the corresponding
-** function parameter has changed since the meta-data was set,
-** then sqlite3_get_auxdata() returns a NULL pointer.
+** value to the application-defined function. ^If there is no metadata
+** associated with the function argument, this sqlite3_get_auxdata() interface
+** returns a NULL pointer.
 **
-** ^The sqlite3_set_auxdata() interface saves the metadata
-** pointed to by its 3rd parameter as the metadata for the N-th
-** argument of the application-defined function.  Subsequent
-** calls to sqlite3_get_auxdata() might return this data, if it has
-** not been destroyed.
-** ^If it is not NULL, SQLite will invoke the destructor
-** function given by the 4th parameter to sqlite3_set_auxdata() on
-** the metadata when the corresponding function parameter changes
-** or when the SQL statement completes, whichever comes first.
+** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as metadata for the N-th
+** argument of the application-defined function.  ^Subsequent
+** calls to sqlite3_get_auxdata(C,N) return P from the most recent
+** sqlite3_set_auxdata(C,N,P,X) call if the metadata is still valid or
+** NULL if the metadata has been discarded.
+** ^After each call to sqlite3_set_auxdata(C,N,P,X) where X is not NULL,
+** SQLite will invoke the destructor function X with parameter P exactly
+** once, when the metadata is discarded.
+** SQLite is free to discard the metadata at any time, including: <ul>
+** <li> when the corresponding function parameter changes, or
+** <li> when [sqlite3_reset()] or [sqlite3_finalize()] is called for the
+**      SQL statement, or
+** <li> when sqlite3_set_auxdata() is invoked again on the same parameter, or
+** <li> during the original sqlite3_set_auxdata() call when a memory 
+**      allocation error occurs. </ul>)^
 **
-** SQLite is free to call the destructor and drop metadata on any
-** parameter of any function at any time.  ^The only guarantee is that
-** the destructor will be called before the metadata is dropped.
+** Note the last bullet in particular.  The destructor X in 
+** sqlite3_set_auxdata(C,N,P,X) might be called immediately, before the
+** sqlite3_set_auxdata() interface even returns.  Hence sqlite3_set_auxdata()
+** should be called near the end of the function implementation and the
+** function implementation should not make any use of P after
+** sqlite3_set_auxdata() has been called.
 **
 ** ^(In practice, metadata is preserved between function calls for
-** expressions that are constant at compile time. This includes literal
-** values and [parameters].)^
+** function parameters that are compile-time constants, including literal
+** values and [parameters] and expressions composed from the same.)^
 **
 ** These routines must be called from the same thread in which
 ** the SQL function is running.
@@ -4518,6 +4634,11 @@ SQLITE_API int sqlite3_key(
   sqlite3 *db,                   /* Database to be rekeyed */
   const void *pKey, int nKey     /* The key */
 );
+SQLITE_API int sqlite3_key_v2(
+  sqlite3 *db,                   /* Database to be rekeyed */
+  const char *zDbName,           /* Name of the database */
+  const void *pKey, int nKey     /* The key */
+);
 
 /*
 ** Change the key on an open database.  If the current database is not
@@ -4531,6 +4652,11 @@ SQLITE_API int sqlite3_rekey(
   sqlite3 *db,                   /* Database to be rekeyed */
   const void *pKey, int nKey     /* The new key */
 );
+SQLITE_API int sqlite3_rekey_v2(
+  sqlite3 *db,                   /* Database to be rekeyed */
+  const char *zDbName,           /* Name of the database */
+  const void *pKey, int nKey     /* The new key */
+);
 
 /*
 ** Specify the activation key for a SEE database.  Unless 
@@ -4782,12 +4908,13 @@ SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
 **
 ** ^The sqlite3_update_hook() interface registers a callback function
 ** with the [database connection] identified by the first argument
-** to be invoked whenever a row is updated, inserted or deleted.
+** to be invoked whenever a row is updated, inserted or deleted in
+** a rowid table.
 ** ^Any callback set by a previous call to this function
 ** for the same database connection is overridden.
 **
 ** ^The second argument is a pointer to the function to invoke when a
-** row is updated, inserted or deleted.
+** row is updated, inserted or deleted in a rowid table.
 ** ^The first argument to the callback is a copy of the third argument
 ** to sqlite3_update_hook().
 ** ^The second callback argument is one of [SQLITE_INSERT], [SQLITE_DELETE],
@@ -4800,6 +4927,7 @@ SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
 **
 ** ^(The update hook is not invoked when internal system tables are
 ** modified (i.e. sqlite_master and sqlite_sequence).)^
+** ^The update hook is not invoked when [WITHOUT ROWID] tables are modified.
 **
 ** ^In the current implementation, the update hook
 ** is not invoked when duplication rows are deleted because of an
@@ -4881,8 +5009,8 @@ SQLITE_API int sqlite3_release_memory(int);
 **
 ** ^The sqlite3_db_release_memory(D) interface attempts to free as much heap
 ** memory as possible from database connection D. Unlike the
-** [sqlite3_release_memory()] interface, this interface is effect even
-** when then [SQLITE_ENABLE_MEMORY_MANAGEMENT] compile-time option is
+** [sqlite3_release_memory()] interface, this interface is in effect even
+** when the [SQLITE_ENABLE_MEMORY_MANAGEMENT] compile-time option is
 ** omitted.
 **
 ** See also: [sqlite3_release_memory()]
@@ -5116,10 +5244,23 @@ SQLITE_API int sqlite3_enable_load_extension(sqlite3 *db, int onoff);
 ** on the list of automatic extensions is a harmless no-op. ^No entry point
 ** will be called more than once for each database connection that is opened.
 **
-** See also: [sqlite3_reset_auto_extension()].
+** See also: [sqlite3_reset_auto_extension()]
+** and [sqlite3_cancel_auto_extension()]
 */
 SQLITE_API int sqlite3_auto_extension(void (*xEntryPoint)(void));
 
+/*
+** CAPI3REF: Cancel Automatic Extension Loading
+**
+** ^The [sqlite3_cancel_auto_extension(X)] interface unregisters the
+** initialization routine X that was registered using a prior call to
+** [sqlite3_auto_extension(X)].  ^The [sqlite3_cancel_auto_extension(X)]
+** routine returns 1 if initialization routine X was successfully 
+** unregistered and it returns 0 if X was not on the list of initialization
+** routines.
+*/
+SQLITE_API int sqlite3_cancel_auto_extension(void (*xEntryPoint)(void));
+
 /*
 ** CAPI3REF: Reset Automatic Extension Loading
 **
@@ -5244,10 +5385,22 @@ struct sqlite3_module {
 ** the correct order to satisfy the ORDER BY clause so that no separate
 ** sorting step is required.
 **
-** ^The estimatedCost value is an estimate of the cost of doing the
-** particular lookup.  A full scan of a table with N entries should have
-** a cost of N.  A binary search of a table of N entries should have a
-** cost of approximately log(N).
+** ^The estimatedCost value is an estimate of the cost of a particular
+** strategy. A cost of N indicates that the cost of the strategy is similar
+** to a linear scan of an SQLite table with N rows. A cost of log(N) 
+** indicates that the expense of the operation is similar to that of a
+** binary search on a unique indexed field of an SQLite table with N rows.
+**
+** ^The estimatedRows value is an estimate of the number of rows that
+** will be returned by the strategy.
+**
+** IMPORTANT: The estimatedRows field was added to the sqlite3_index_info
+** structure for SQLite version 3.8.2. If a virtual table extension is
+** used with an SQLite version earlier than 3.8.2, the results of attempting 
+** to read or write the estimatedRows field are undefined (but are likely 
+** to included crashing the application). The estimatedRows field should
+** therefore only be used if [sqlite3_libversion_number()] returns a
+** value greater than or equal to 3008002.
 */
 struct sqlite3_index_info {
   /* Inputs */
@@ -5272,7 +5425,9 @@ struct sqlite3_index_info {
   char *idxStr;              /* String, possibly obtained from sqlite3_malloc */
   int needToFreeIdxStr;      /* Free idxStr using sqlite3_free() if true */
   int orderByConsumed;       /* True if output is already ordered */
-  double estimatedCost;      /* Estimated cost of using this index */
+  double estimatedCost;           /* Estimated cost of using this index */
+  /* Fields below are only available in SQLite 3.8.2 and later */
+  sqlite3_int64 estimatedRows;    /* Estimated number of rows returned */
 };
 
 /*
@@ -5476,6 +5631,9 @@ typedef struct sqlite3_blob sqlite3_blob;
 ** interface.  Use the [UPDATE] SQL command to change the size of a
 ** blob.
 **
+** ^The [sqlite3_blob_open()] interface will fail for a [WITHOUT ROWID]
+** table.  Incremental BLOB I/O is not possible on [WITHOUT ROWID] tables.
+**
 ** ^The [sqlite3_bind_zeroblob()] and [sqlite3_result_zeroblob()] interfaces
 ** and the built-in [zeroblob] SQL function can be used, if desired,
 ** to create an empty, zero-filled blob in which to read or write using
@@ -5999,7 +6157,10 @@ SQLITE_API int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_SCRATCHMALLOC           17
 #define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
 #define SQLITE_TESTCTRL_EXPLAIN_STMT            19
-#define SQLITE_TESTCTRL_LAST                    19
+#define SQLITE_TESTCTRL_NEVER_CORRUPT           20
+#define SQLITE_TESTCTRL_VDBE_COVERAGE           21
+#define SQLITE_TESTCTRL_BYTEORDER               22
+#define SQLITE_TESTCTRL_LAST                    22
 
 /*
 ** CAPI3REF: SQLite Runtime Status
@@ -6232,6 +6393,12 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r
 ** on subsequent SQLITE_DBSTATUS_CACHE_WRITE requests is undefined.)^ ^The
 ** highwater mark associated with SQLITE_DBSTATUS_CACHE_WRITE is always 0.
 ** </dd>
+**
+** [[SQLITE_DBSTATUS_DEFERRED_FKS]] ^(<dt>SQLITE_DBSTATUS_DEFERRED_FKS</dt>
+** <dd>This parameter returns zero for the current value if and only if
+** all foreign key constraints (deferred or immediate) have been
+** resolved.)^  ^The highwater mark is always 0.
+** </dd>
 ** </dl>
 */
 #define SQLITE_DBSTATUS_LOOKASIDE_USED       0
@@ -6244,7 +6411,8 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r
 #define SQLITE_DBSTATUS_CACHE_HIT            7
 #define SQLITE_DBSTATUS_CACHE_MISS           8
 #define SQLITE_DBSTATUS_CACHE_WRITE          9
-#define SQLITE_DBSTATUS_MAX                  9   /* Largest defined DBSTATUS */
+#define SQLITE_DBSTATUS_DEFERRED_FKS        10
+#define SQLITE_DBSTATUS_MAX                 10   /* Largest defined DBSTATUS */
 
 
 /*
@@ -6298,11 +6466,21 @@ SQLITE_API int sqlite3_stmt_status(sqlite3_stmt*, int op,int resetFlg);
 ** A non-zero value in this counter may indicate an opportunity to
 ** improvement performance by adding permanent indices that do not
 ** need to be reinitialized each time the statement is run.</dd>
+**
+** [[SQLITE_STMTSTATUS_VM_STEP]] <dt>SQLITE_STMTSTATUS_VM_STEP</dt>
+** <dd>^This is the number of virtual machine operations executed
+** by the prepared statement if that number is less than or equal
+** to 2147483647.  The number of virtual machine operations can be 
+** used as a proxy for the total work done by the prepared statement.
+** If the number of virtual machine operations exceeds 2147483647
+** then the value returned by this statement status code is undefined.
+** </dd>
 ** </dl>
 */
 #define SQLITE_STMTSTATUS_FULLSCAN_STEP     1
 #define SQLITE_STMTSTATUS_SORT              2
 #define SQLITE_STMTSTATUS_AUTOINDEX         3
+#define SQLITE_STMTSTATUS_VM_STEP           4
 
 /*
 ** CAPI3REF: Custom Page Cache Object
@@ -7181,7 +7359,7 @@ SQLITE_API int sqlite3_vtab_on_conflict(sqlite3 *);
 #ifdef __cplusplus
 }  /* End of the 'extern "C"' block */
 #endif
-#endif
+#endif /* _SQLITE3_H_ */
 
 /*
 ** 2010 August 30
@@ -7205,6 +7383,16 @@ extern "C" {
 #endif
 
 typedef struct sqlite3_rtree_geometry sqlite3_rtree_geometry;
+typedef struct sqlite3_rtree_query_info sqlite3_rtree_query_info;
+
+/* The double-precision datatype used by RTree depends on the
+** SQLITE_RTREE_INT_ONLY compile-time option.
+*/
+#ifdef SQLITE_RTREE_INT_ONLY
+  typedef sqlite3_int64 sqlite3_rtree_dbl;
+#else
+  typedef double sqlite3_rtree_dbl;
+#endif
 
 /*
 ** Register a geometry callback named zGeom that can be used as part of an
@@ -7215,11 +7403,7 @@ typedef struct sqlite3_rtree_geometry sqlite3_rtree_geometry;
 SQLITE_API int sqlite3_rtree_geometry_callback(
   sqlite3 *db,
   const char *zGeom,
-#ifdef SQLITE_RTREE_INT_ONLY
-  int (*xGeom)(sqlite3_rtree_geometry*, int n, sqlite3_int64 *a, int *pRes),
-#else
-  int (*xGeom)(sqlite3_rtree_geometry*, int n, double *a, int *pRes),
-#endif
+  int (*xGeom)(sqlite3_rtree_geometry*, int, sqlite3_rtree_dbl*,int*),
   void *pContext
 );
 
@@ -7231,11 +7415,60 @@ SQLITE_API int sqlite3_rtree_geometry_callback(
 struct sqlite3_rtree_geometry {
   void *pContext;                 /* Copy of pContext passed to s_r_g_c() */
   int nParam;                     /* Size of array aParam[] */
-  double *aParam;                 /* Parameters passed to SQL geom function */
+  sqlite3_rtree_dbl *aParam;      /* Parameters passed to SQL geom function */
   void *pUser;                    /* Callback implementation user data */
   void (*xDelUser)(void *);       /* Called by SQLite to clean up pUser */
 };
 
+/*
+** Register a 2nd-generation geometry callback named zScore that can be 
+** used as part of an R-Tree geometry query as follows:
+**
+**   SELECT ... FROM <rtree> WHERE <rtree col> MATCH $zQueryFunc(... params ...)
+*/
+SQLITE_API int sqlite3_rtree_query_callback(
+  sqlite3 *db,
+  const char *zQueryFunc,
+  int (*xQueryFunc)(sqlite3_rtree_query_info*),
+  void *pContext,
+  void (*xDestructor)(void*)
+);
+
+
+/*
+** A pointer to a structure of the following type is passed as the 
+** argument to scored geometry callback registered using
+** sqlite3_rtree_query_callback().
+**
+** Note that the first 5 fields of this structure are identical to
+** sqlite3_rtree_geometry.  This structure is a subclass of
+** sqlite3_rtree_geometry.
+*/
+struct sqlite3_rtree_query_info {
+  void *pContext;                   /* pContext from when function registered */
+  int nParam;                       /* Number of function parameters */
+  sqlite3_rtree_dbl *aParam;        /* value of function parameters */
+  void *pUser;                      /* callback can use this, if desired */
+  void (*xDelUser)(void*);          /* function to free pUser */
+  sqlite3_rtree_dbl *aCoord;        /* Coordinates of node or entry to check */
+  unsigned int *anQueue;            /* Number of pending entries in the queue */
+  int nCoord;                       /* Number of coordinates */
+  int iLevel;                       /* Level of current node or entry */
+  int mxLevel;                      /* The largest iLevel value in the tree */
+  sqlite3_int64 iRowid;             /* Rowid for current entry */
+  sqlite3_rtree_dbl rParentScore;   /* Score of parent node */
+  int eParentWithin;                /* Visibility of parent node */
+  int eWithin;                      /* OUT: Visiblity */
+  sqlite3_rtree_dbl rScore;         /* OUT: Write the score here */
+};
+
+/*
+** Allowed values for sqlite3_rtree_query.eWithin and .eParentWithin.
+*/
+#define NOT_WITHIN       0   /* Object completely outside of query region */
+#define PARTLY_WITHIN    1   /* Object partially overlaps query region */
+#define FULLY_WITHIN     2   /* Object fully contained within query region */
+
 
 #ifdef __cplusplus
 }  /* end of the 'extern "C"' block */
diff --git a/contrib/sqlite3/sqlite3ext.h b/contrib/sqlite3/sqlite3ext.h
index 928bb3bad9dd..ecf93f62f6cd 100644
--- a/contrib/sqlite3/sqlite3ext.h
+++ b/contrib/sqlite3/sqlite3ext.h
@@ -474,11 +474,14 @@ struct sqlite3_api_routines {
   ** extension */
 # define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api=0;
 # define SQLITE_EXTENSION_INIT2(v)  sqlite3_api=v;
+# define SQLITE_EXTENSION_INIT3     \
+    extern const sqlite3_api_routines *sqlite3_api;
 #else
   /* This case when the file is being statically linked into the 
   ** application */
 # define SQLITE_EXTENSION_INIT1     /*no-op*/
 # define SQLITE_EXTENSION_INIT2(v)  (void)v; /* unused parameter */
+# define SQLITE_EXTENSION_INIT3     /*no-op*/
 #endif
 
 #endif /* _SQLITE3EXT_H_ */
diff --git a/contrib/subversion/CHANGES b/contrib/subversion/CHANGES
index f10874794683..616caec3fb9d 100644
--- a/contrib/subversion/CHANGES
+++ b/contrib/subversion/CHANGES
@@ -1,3 +1,45 @@
+Version 1.8.10
+(11 Aug 2014, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.10
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * guard against md5 hash collisions when finding cached credentials
+        (r1550691, r1550772, r1600909)
+    * ra_serf: properly match wildcards in SSL certs. (r1615211, 1615219)
+    * ra_serf: ignore the CommonName in SSL certs where there are Subject Alt
+        Names (r1565531, r1566503, r1568349, r1568361)
+    * ra_serf: fix a URI escaping bug that prevented deleting locked paths
+        (r1594223, r1553501, r1553556, r1559197, issue #3674)
+    * rm: Display the proper URL when deleting a URL in the commit log editor
+        (r1591123)
+    * log: Fix another instance of broken pipe error (r1596866, issue #3014)
+    * copy: Properly handle props not present or excluded on cross wc copy
+        (r1589184, r1589188)
+    * copy: Fix copying parents of locally deleted nodes between wcs
+        (r1589460, r1589486)
+    * externals: Properly delete ancestor directories of externals when
+        removing the external by changing svn:externals. (r1600311, 1600315,
+        r1600323, r1600393)
+    * ra_serf: fix memory lifetime of some hash values (r1606009)
+
+  - Server-side bugfixes:
+    * fsfs: omit config file when creating pre-1.5 format repos (r1547454,
+        r1561703)
+
+ Developer-visible changes:
+  - General:
+    * fix improper linking when serf is in the same prefix as existing svn
+        libraries. (r1609004)
+    * use proper intermediate directory when building with VS 2003-2008
+        (r1595431)
+    * support generating VS 2013 and later project files.
+
+  - Bindings:
+    * ruby: removing warning about Ruby 1.9 support being new. (r1593992)
+    * python: fix notify_func callbacks (r1594794, r1594814, r1594834, r1595061)
+
+
 Version 1.8.9
 (07 May 2014, from /branches/1.8.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.8.9
@@ -687,6 +729,24 @@ 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.18
+(11 Aug 2014, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.18
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * guard against md5 hash collisions when finding cached credentials
+        (r1550691, r1550772, r1600909)
+    * ra_serf: properly match wildcards in SSL certs. (r1615211, 1615219)
+    * ra_serf: ignore the CommonName in SSL certs where there are Subject Alt
+        Names (r1565531, r1566503, r1568349)
+
+ Developer-visible changes:
+  - General:
+    * fix ocassional failure in checkout_tests.py test 12. (r1496127)
+    * disable building ZLib's assembly optimizations on Windows.
+
+
 Version 1.7.17
 (07 May 2014, from /branches/1.7.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.7.17
diff --git a/contrib/subversion/build-outputs.mk b/contrib/subversion/build-outputs.mk
index 6d73c30bc8d6..3126b3f7fdd6 100644
--- a/contrib/subversion/build-outputs.mk
+++ b/contrib/subversion/build-outputs.mk
@@ -2231,7 +2231,7 @@ subversion/libsvn_ra_serf/serf.lo: subversion/libsvn_ra_serf/serf.c subversion/i
 
 subversion/libsvn_ra_serf/update.lo: subversion/libsvn_ra_serf/update.c subversion/include/private/svn_dav_protocol.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_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_base64.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_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_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_serf/util.lo: subversion/libsvn_ra_serf/util.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_dav_protocol.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_ra_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_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_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_serf/util.lo: subversion/libsvn_ra_serf/util.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_cert.h subversion/include/private/svn_dav_protocol.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_ra_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_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_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_serf/util_error.lo: subversion/libsvn_ra_serf/util_error.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_error_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_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/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h
 
@@ -2329,7 +2329,7 @@ subversion/libsvn_subr/debug.lo: subversion/libsvn_subr/debug.c subversion/inclu
 
 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
+subversion/libsvn_subr/dirent_uri.lo: subversion/libsvn_subr/dirent_uri.c subversion/include/private/svn_cert.h 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
 
 subversion/libsvn_subr/dso.lo: subversion/libsvn_subr/dso.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.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_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
 
@@ -2781,7 +2781,7 @@ subversion/tests/libsvn_subr/config-test.lo: subversion/tests/libsvn_subr/config
 
 subversion/tests/libsvn_subr/crypto-test.lo: subversion/tests/libsvn_subr/crypto-test.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_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/crypto.h subversion/tests/svn_test.h
 
-subversion/tests/libsvn_subr/dirent_uri-test.lo: subversion/tests/libsvn_subr/dirent_uri-test.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_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h
+subversion/tests/libsvn_subr/dirent_uri-test.lo: subversion/tests/libsvn_subr/dirent_uri-test.c subversion/include/private/svn_cert.h 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_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h
 
 subversion/tests/libsvn_subr/error-code-test.lo: subversion/tests/libsvn_subr/error-code-test.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_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h
 
diff --git a/contrib/subversion/build.conf b/contrib/subversion/build.conf
index 74defd02b66d..356163a2d2d8 100644
--- a/contrib/subversion/build.conf
+++ b/contrib/subversion/build.conf
@@ -342,6 +342,7 @@ msvc-export =
         private\svn_temp_serializer.h private\svn_io_private.h
         private\svn_string_private.h private\svn_magic.h
         private\svn_subr_private.h private\svn_mutex.h private\svn_named_atomic.h
+        private\svn_cert.h
 
 # Working copy management lib
 [libsvn_wc]
diff --git a/contrib/subversion/configure b/contrib/subversion/configure
index 3010dc7a878b..445251bdf75b 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.9.
+# Generated by GNU Autoconf 2.69 for subversion 1.8.10.
 #
 # 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.9'
-PACKAGE_STRING='subversion 1.8.9'
+PACKAGE_VERSION='1.8.10'
+PACKAGE_STRING='subversion 1.8.10'
 PACKAGE_BUGREPORT='http://subversion.apache.org/'
 PACKAGE_URL=''
 
@@ -1457,7 +1457,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.9 to adapt to many kinds of systems.
+\`configure' configures subversion 1.8.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1523,7 +1523,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of subversion 1.8.9:";;
+     short | recursive ) echo "Configuration of subversion 1.8.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1737,7 +1737,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-subversion configure 1.8.9
+subversion configure 1.8.10
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2281,7 +2281,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.9, which was
+It was created by subversion $as_me 1.8.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2661,8 +2661,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.9" >&5
-$as_echo "$as_me: Configuring Subversion 1.8.9" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.8.10" >&5
+$as_echo "$as_me: Configuring Subversion 1.8.10" >&6;}
 
 abs_srcdir="`cd $srcdir && pwd`"
 
@@ -5285,7 +5285,26 @@ if test "x$ac_cv_header_serf_h" = xyes; then :
 _ACEOF
 
       save_ldflags="$LDFLAGS"
-      LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
+      LDFLAGS="$LDFLAGS `
+  input_flags="-L$serf_prefix/lib"
+  output_flags=""
+  filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
+  for flag in $input_flags; do
+    filter="no"
+    for dir in $filtered_dirs; do
+      if test "$flag" = "-L$dir" || test "$flag" = "-L$dir/"; then
+        filter="yes"
+        break
+      fi
+    done
+    if test "$filter" = "no"; then
+      output_flags="$output_flags $flag"
+    fi
+  done
+  if test -n "$output_flags"; then
+    printf "%s" "${output_flags# }"
+  fi
+`"
       as_ac_Lib=`$as_echo "ac_cv_lib_$serf_major''_serf_context_create" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for serf_context_create in -l$serf_major" >&5
 $as_echo_n "checking for serf_context_create in -l$serf_major... " >&6; }
@@ -5369,7 +5388,26 @@ done
       SVN_SERF_LIBS="$serf_prefix/lib/lib$serf_major.la"
     else
       SVN_SERF_LIBS="-l$serf_major"
-      LDFLAGS="$LDFLAGS -L$serf_prefix/lib"
+      LDFLAGS="$LDFLAGS `
+  input_flags="-L$serf_prefix/lib"
+  output_flags=""
+  filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
+  for flag in $input_flags; do
+    filter="no"
+    for dir in $filtered_dirs; do
+      if test "$flag" = "-L$dir" || test "$flag" = "-L$dir/"; then
+        filter="yes"
+        break
+      fi
+    done
+    if test "$filter" = "no"; then
+      output_flags="$output_flags $flag"
+    fi
+  done
+  if test -n "$output_flags"; then
+    printf "%s" "${output_flags# }"
+  fi
+`"
     fi
   fi
 
@@ -18002,7 +18040,26 @@ if test "${with_berkeley_db+set}" = set; then :
         done
         SVN_DB_INCLUDES="${SVN_DB_INCLUDES## }"
         for l in `echo "$withval" | $SED -e "s/.*:[^:]*:\([^:]*\):.*/\1/"`; do
-          LDFLAGS="$LDFLAGS -L$l"
+          LDFLAGS="$LDFLAGS `
+  input_flags="-L$l"
+  output_flags=""
+  filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
+  for flag in $input_flags; do
+    filter="no"
+    for dir in $filtered_dirs; do
+      if test "$flag" = "-L$dir" || test "$flag" = "-L$dir/"; then
+        filter="yes"
+        break
+      fi
+    done
+    if test "$filter" = "no"; then
+      output_flags="$output_flags $flag"
+    fi
+  done
+  if test -n "$output_flags"; then
+    printf "%s" "${output_flags# }"
+  fi
+`"
         done
         SVN_DB_LIBS=""
         for l in `echo "$withval" | $SED -e "s/.*:\([^:]*\)/\1/"`; do
@@ -22728,12 +22785,6 @@ $as_echo "$svn_cv_ruby_teeny" >&6; }
 $as_echo "$as_me: WARNING: The detected Ruby is between 1.9 and 1.9.3" >&2;}
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Only 1.8.x and 1.9.3 releases are supported at this time" >&5
 $as_echo "$as_me: WARNING: Only 1.8.x and 1.9.3 releases are supported at this time" >&2;}
-    elif test \(  "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "9" -a "$RUBY_TEENY" -eq "3" \); then
-      #Warn about 1.9.3 support
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WARNING: The detected Ruby is 1.9.3" >&5
-$as_echo "$as_me: WARNING: WARNING: The detected Ruby is 1.9.3" >&2;}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WARNING: Only 1.8.x releases are fully supported, 1.9.3 support is new" >&5
-$as_echo "$as_me: WARNING: WARNING: Only 1.8.x releases are fully supported, 1.9.3 support is new" >&2;}
     fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -25746,7 +25797,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.9, which was
+This file was extended by subversion $as_me 1.8.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25812,7 +25863,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.9
+subversion config.status 1.8.10
 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 f7d2264a9b89..955ba254f87c 100644
--- a/contrib/subversion/configure.ac
+++ b/contrib/subversion/configure.ac
@@ -1280,10 +1280,6 @@ if test "$RUBY" != "none"; then
       RUBY="none"
       AC_MSG_WARN([The detected Ruby is between 1.9 and 1.9.3])
       AC_MSG_WARN([Only 1.8.x and 1.9.3 releases are supported at this time])
-    elif test \(  "$RUBY_MAJOR" -eq "1" -a "$RUBY_MINOR" -eq "9" -a "$RUBY_TEENY" -eq "3" \); then
-      #Warn about 1.9.3 support
-      AC_MSG_WARN([WARNING: The detected Ruby is 1.9.3])
-      AC_MSG_WARN([WARNING: Only 1.8.x releases are fully supported, 1.9.3 support is new])
     fi
   else
     AC_MSG_RESULT([no])
diff --git a/contrib/subversion/get-deps.sh b/contrib/subversion/get-deps.sh
index 0c0be8cc175d..912547c836ec 100755
--- a/contrib/subversion/get-deps.sh
+++ b/contrib/subversion/get-deps.sh
@@ -33,11 +33,11 @@
 
 APR_VERSION=${APR_VERSION:-"1.4.6"}
 APU_VERSION=${APU_VERSION:-"1.5.1"}
-SERF_VERSION=${SERF_VERSION:-"1.2.1"}
+SERF_VERSION=${SERF_VERSION:-"1.3.4"}
 ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
 SQLITE_VERSION=${SQLITE_VERSION:-"3.7.15.1"}
 GTEST_VERSION=${GTEST_VERSION:-"1.6.0"}
-HTTPD_VERSION=${HTTPD_VERSION:-"2.4.6"}
+HTTPD_VERSION=${HTTPD_VERSION:-"2.4.10"}
 APR_ICONV_VERSION=${APR_ICONV_VERSION:-"1.2.1"}
 
 APR=apr-${APR_VERSION}
@@ -57,7 +57,7 @@ TEMPDIR=$BASEDIR/temp
 
 HTTP_FETCH=
 [ -z "$HTTP_FETCH" ] && type wget  >/dev/null 2>&1 && HTTP_FETCH="wget -q -nc"
-[ -z "$HTTP_FETCH" ] && type curl  >/dev/null 2>&1 && HTTP_FETCH="curl -sO"
+[ -z "$HTTP_FETCH" ] && type curl  >/dev/null 2>&1 && HTTP_FETCH="curl -sOL"
 [ -z "$HTTP_FETCH" ] && type fetch >/dev/null 2>&1 && HTTP_FETCH="fetch -q"
 
 # Need this uncommented if any of the specific versions of the ASF tarballs to
@@ -89,7 +89,7 @@ get_serf() {
     test -d $BASEDIR/serf && return
 
     cd $TEMPDIR
-    $HTTP_FETCH http://serf.googlecode.com/files/$SERF.tar.bz2
+    $HTTP_FETCH http://serf.googlecode.com/svn/src_releases/$SERF.tar.bz2
     cd $BASEDIR
 
     bzip2 -dc $TEMPDIR/$SERF.tar.bz2 | tar -xf -
@@ -101,7 +101,7 @@ get_zlib() {
     test -d $BASEDIR/zlib && return
 
     cd $TEMPDIR
-    $HTTP_FETCH http://www.zlib.net/$ZLIB.tar.gz
+    $HTTP_FETCH http://sourceforge.net/projects/libpng/files/zlib/$ZLIB_VERSION/$ZLIB.tar.gz
     cd $BASEDIR
 
     gzip -dc $TEMPDIR/$ZLIB.tar.gz | tar -xf -
diff --git a/contrib/subversion/subversion/include/private/svn_cert.h b/contrib/subversion/subversion/include/private/svn_cert.h
new file mode 100644
index 000000000000..32e32a01f7d9
--- /dev/null
+++ b/contrib/subversion/subversion/include/private/svn_cert.h
@@ -0,0 +1,68 @@
+/**
+ * @copyright
+ * ====================================================================
+ *    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.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file svn_cert.h
+ * @brief Implementation of certificate validation functions
+ */
+
+#ifndef SVN_CERT_H
+#define SVN_CERT_H
+
+#include <apr.h>
+
+#include "svn_types.h"
+#include "svn_string.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+
+/* Return TRUE iff @a pattern matches @a hostname as defined
+ * by the matching rules of RFC 6125.  In the context of RFC
+ * 6125 the pattern is the domain name portion of the presented
+ * identifier (which comes from the Common Name or a DNSName
+ * portion of the subjectAltName of an X.509 certificate) and
+ * the hostname is the source domain (i.e. the host portion
+ * of the URI the user entered).
+ *
+ * @note With respect to wildcards we only support matching
+ * wildcards in the left-most label and as the only character
+ * in the left-most label (i.e. we support RFC 6125 § 6.4.3
+ * Rule 1 and 2 but not the optional Rule 3).  This may change
+ * in the future.
+ *
+ * @note Subversion does not at current support internationalized
+ * domain names.  Both values are presumed to be in NR-LDH label
+ * or A-label form (see RFC 5890 for the definition).
+ *
+ * @since New in 1.9.
+ */
+svn_boolean_t
+svn_cert__match_dns_identity(svn_string_t *pattern, svn_string_t *hostname);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* SVN_CERT_H */
diff --git a/contrib/subversion/subversion/include/svn_version.h b/contrib/subversion/subversion/include/svn_version.h
index ee97c88a2f05..8788fa56ea0a 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      9
+#define SVN_VER_PATCH      10
 
 
 /** @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        " (r1591380)"
+#define SVN_VER_TAG        " (r1615264)"
 
 
 /** 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   1591380
+#define SVN_VER_REVISION   1615264
 
 
 /* Version strings composed from the above definitions. */
diff --git a/contrib/subversion/subversion/libsvn_client/delete.c b/contrib/subversion/subversion/libsvn_client/delete.c
index 2f4ee664f335..803b70c1fb23 100644
--- a/contrib/subversion/subversion/libsvn_client/delete.c
+++ b/contrib/subversion/subversion/libsvn_client/delete.c
@@ -193,7 +193,7 @@ path_driver_cb_func(void **dir_baton,
 
 static svn_error_t *
 single_repos_delete(svn_ra_session_t *ra_session,
-                    const char *repos_root,
+                    const char *base_uri,
                     const apr_array_header_t *relpaths,
                     const apr_hash_t *revprop_table,
                     svn_commit_callback2_t commit_callback,
@@ -221,7 +221,7 @@ single_repos_delete(svn_ra_session_t *ra_session,
           const char *relpath = APR_ARRAY_IDX(relpaths, i, const char *);
 
           item = svn_client_commit_item3_create(pool);
-          item->url = svn_path_url_add_component2(repos_root, relpath, pool);
+          item->url = svn_path_url_add_component2(base_uri, relpath, pool);
           item->state_flags = SVN_CLIENT_COMMIT_ITEM_DELETE;
           APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
         }
@@ -361,7 +361,6 @@ delete_urls_multi_repos(const apr_array_header_t *uris,
   iterpool = svn_pool_create(pool);
   for (hi = apr_hash_first(pool, deletables); hi; hi = apr_hash_next(hi))
     {
-      const char *repos_root = svn__apr_hash_index_key(hi);
       struct repos_deletables_t *repos_deletables = svn__apr_hash_index_val(hi);
       const char *base_uri;
       apr_array_header_t *target_relpaths;
@@ -398,7 +397,7 @@ delete_urls_multi_repos(const apr_array_header_t *uris,
         }
 
       SVN_ERR(svn_ra_reparent(repos_deletables->ra_session, base_uri, pool));
-      SVN_ERR(single_repos_delete(repos_deletables->ra_session, repos_root,
+      SVN_ERR(single_repos_delete(repos_deletables->ra_session, base_uri,
                                   target_relpaths,
                                   revprop_table, commit_callback,
                                   commit_baton, ctx, iterpool));
diff --git a/contrib/subversion/subversion/libsvn_client/externals.c b/contrib/subversion/subversion/libsvn_client/externals.c
index e572dc7b3f00..8c08f405279e 100644
--- a/contrib/subversion/subversion/libsvn_client/externals.c
+++ b/contrib/subversion/subversion/libsvn_client/externals.c
@@ -1017,19 +1017,30 @@ svn_client__handle_externals(apr_hash_t *externals_new,
 
         parent_abspath = svn_dirent_dirname(parent_abspath, iterpool);
         SVN_ERR(svn_wc_read_kind2(&kind, ctx->wc_ctx, parent_abspath,
-                                  TRUE, FALSE, iterpool));
+                                  FALSE /* show_deleted*/,
+                                  FALSE /* show_hidden */,
+                                  iterpool));
         if (kind == svn_node_none)
           {
             svn_error_t *err;
 
             err = svn_io_dir_remove_nonrecursive(parent_abspath, iterpool);
-            if (err && APR_STATUS_IS_ENOTEMPTY(err->apr_err))
+            if (err)
               {
-                svn_error_clear(err);
-                break;
+                if (APR_STATUS_IS_ENOTEMPTY(err->apr_err))
+                  {
+                    svn_error_clear(err);
+                    break; /* No parents to delete */
+                  }
+                else if (APR_STATUS_IS_ENOENT(err->apr_err)
+                         || APR_STATUS_IS_ENOTDIR(err->apr_err))
+                  {
+                    svn_error_clear(err);
+                    /* Fall through; parent dir might be unversioned */
+                  }
+                else
+                  return svn_error_trace(err);
               }
-            else
-              SVN_ERR(err);
           }
       } while (strcmp(parent_abspath, defining_abspath) != 0);
     }
diff --git a/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c b/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
index 372455d2d735..89816a8bcb6f 100644
--- a/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
+++ b/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
@@ -8877,7 +8877,12 @@ svn_fs_fs__create(svn_fs_t *fs,
 
   SVN_ERR(write_revision_zero(fs));
 
-  SVN_ERR(write_config(fs, pool));
+  /* Create the fsfs.conf file if supported.  Older server versions would
+     simply ignore the file but that might result in a different behavior
+     than with the later releases.  Also, hotcopy would ignore, i.e. not
+     copy, a fsfs.conf with old formats. */
+  if (ffd->format >= SVN_FS_FS__MIN_CONFIG_FILE)
+    SVN_ERR(write_config(fs, pool));
 
   SVN_ERR(read_config(ffd, fs->path, pool));
 
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 5e1510784800..0c9b821fec4b 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.9/subversion/libsvn_fs_fs/token-map.h.
+/* This file is automatically generated from rep-cache-db.sql and .dist_sandbox/subversion-1.8.10/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_serf/commit.c b/contrib/subversion/subversion/libsvn_ra_serf/commit.c
index 4950ac48911a..1f9f1cc99f06 100644
--- a/contrib/subversion/subversion/libsvn_ra_serf/commit.c
+++ b/contrib/subversion/subversion/libsvn_ra_serf/commit.c
@@ -99,14 +99,11 @@ typedef struct proppatch_context_t {
 } proppatch_context_t;
 
 typedef struct delete_context_t {
-  const char *path;
+  const char *relpath;
 
   svn_revnum_t revision;
 
-  const char *lock_token;
-  apr_hash_t *lock_token_hash;
-  svn_boolean_t keep_locks;
-
+  commit_context_t *commit;
 } delete_context_t;
 
 /* Represents a directory. */
@@ -149,7 +146,6 @@ typedef struct dir_context_t {
   /* The checked-out working resource for this directory.  May be NULL; if so
      call checkout_dir() first.  */
   const char *working_url;
-
 } dir_context_t;
 
 /* Represents a file to be committed. */
@@ -1077,6 +1073,96 @@ setup_copy_file_headers(serf_bucket_t *headers,
   return SVN_NO_ERROR;
 }
 
+static svn_error_t *
+setup_if_header_recursive(svn_boolean_t *added,
+                          serf_bucket_t *headers,
+                          commit_context_t *commit_ctx,
+                          const char *rq_relpath,
+                          apr_pool_t *pool)
+{
+  svn_stringbuf_t *sb = NULL;
+  apr_hash_index_t *hi;
+  apr_pool_t *iterpool = NULL;
+
+  if (!commit_ctx->lock_tokens)
+    {
+      *added = FALSE;
+      return SVN_NO_ERROR;
+    }
+
+  /* We try to create a directory, so within the Subversion world that
+     would imply that there is nothing here, but mod_dav_svn still sees
+     locks on the old nodes here as in DAV it is perfectly legal to lock
+     something that is not there...
+
+     Let's make mod_dav, mod_dav_svn and the DAV RFC happy by providing
+     the locks we know of with the request */
+
+  for (hi = apr_hash_first(pool, commit_ctx->lock_tokens);
+       hi;
+       hi = apr_hash_next(hi))
+    {
+      const char *relpath = svn__apr_hash_index_key(hi);
+      apr_uri_t uri;
+
+      if (!svn_relpath_skip_ancestor(rq_relpath, relpath))
+        continue;
+      else if (svn_hash_gets(commit_ctx->deleted_entries, relpath))
+        {
+          /* When a path is already explicit deleted then its lock
+             will be removed by mod_dav. But mod_dav doesn't remove
+             locks on descendants */
+          continue;
+        }
+
+      if (!iterpool)
+        iterpool = svn_pool_create(pool);
+      else
+        svn_pool_clear(iterpool);
+
+      if (sb == NULL)
+        sb = svn_stringbuf_create("", pool);
+      else
+        svn_stringbuf_appendbyte(sb, ' ');
+
+      uri = commit_ctx->session->session_url;
+      uri.path = (char *)svn_path_url_add_component2(uri.path, relpath,
+                                                    iterpool);
+
+      svn_stringbuf_appendbyte(sb, '<');
+      svn_stringbuf_appendcstr(sb, apr_uri_unparse(iterpool, &uri, 0));
+      svn_stringbuf_appendcstr(sb, "> (<");
+      svn_stringbuf_appendcstr(sb, svn__apr_hash_index_val(hi));
+      svn_stringbuf_appendcstr(sb, ">)");
+    }
+
+  if (iterpool)
+    svn_pool_destroy(iterpool);
+
+  if (sb)
+    {
+      serf_bucket_headers_set(headers, "If", sb->data);
+      *added = TRUE;
+    }
+  else
+    *added = FALSE;
+
+  return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+setup_add_dir_common_headers(serf_bucket_t *headers,
+                             void *baton,
+                             apr_pool_t *pool)
+{
+  dir_context_t *dir = baton;
+  svn_boolean_t added;
+
+  return svn_error_trace(
+      setup_if_header_recursive(&added, headers, dir->commit, dir->relpath,
+                                pool));
+}
+
 static svn_error_t *
 setup_copy_dir_headers(serf_bucket_t *headers,
                        void *baton,
@@ -1109,7 +1195,7 @@ setup_copy_dir_headers(serf_bucket_t *headers,
   /* Implicitly checkout this dir now. */
   dir->working_url = apr_pstrdup(dir->pool, uri.path);
 
-  return SVN_NO_ERROR;
+  return svn_error_trace(setup_add_dir_common_headers(headers, baton, pool));
 }
 
 static svn_error_t *
@@ -1117,51 +1203,19 @@ setup_delete_headers(serf_bucket_t *headers,
                      void *baton,
                      apr_pool_t *pool)
 {
-  delete_context_t *ctx = baton;
+  delete_context_t *del = baton;
+  svn_boolean_t added;
 
   serf_bucket_headers_set(headers, SVN_DAV_VERSION_NAME_HEADER,
-                          apr_ltoa(pool, ctx->revision));
+                          apr_ltoa(pool, del->revision));
 
-  if (ctx->lock_token_hash)
-    {
-      ctx->lock_token = svn_hash_gets(ctx->lock_token_hash, ctx->path);
+  SVN_ERR(setup_if_header_recursive(&added, headers, del->commit,
+                                    del->relpath, pool));
 
-      if (ctx->lock_token)
-        {
-          const char *token_header;
+  if (added && del->commit->keep_locks)
+    serf_bucket_headers_setn(headers, SVN_DAV_OPTIONS_HEADER,
+                                      SVN_DAV_OPTION_KEEP_LOCKS);
 
-          token_header = apr_pstrcat(pool, "<", ctx->path, "> (<",
-                                     ctx->lock_token, ">)", (char *)NULL);
-
-          serf_bucket_headers_set(headers, "If", token_header);
-
-          if (ctx->keep_locks)
-            serf_bucket_headers_setn(headers, SVN_DAV_OPTIONS_HEADER,
-                                     SVN_DAV_OPTION_KEEP_LOCKS);
-        }
-    }
-
-  return SVN_NO_ERROR;
-}
-
-/* Implements svn_ra_serf__request_body_delegate_t */
-static svn_error_t *
-create_delete_body(serf_bucket_t **body_bkt,
-                   void *baton,
-                   serf_bucket_alloc_t *alloc,
-                   apr_pool_t *pool)
-{
-  delete_context_t *ctx = baton;
-  serf_bucket_t *body;
-
-  body = serf_bucket_aggregate_create(alloc);
-
-  svn_ra_serf__add_xml_header_buckets(body, alloc);
-
-  svn_ra_serf__merge_lock_token_list(ctx->lock_token_hash, ctx->path,
-                                     body, alloc, pool);
-
-  *body_bkt = body;
   return SVN_NO_ERROR;
 }
 
@@ -1541,7 +1595,6 @@ delete_entry(const char *path,
   delete_context_t *delete_ctx;
   svn_ra_serf__handler_t *handler;
   const char *delete_target;
-  svn_error_t *err;
 
   if (USING_HTTPV2_COMMIT_SUPPORT(dir->commit))
     {
@@ -1560,10 +1613,9 @@ delete_entry(const char *path,
 
   /* DELETE our entry */
   delete_ctx = apr_pcalloc(pool, sizeof(*delete_ctx));
-  delete_ctx->path = apr_pstrdup(pool, path);
+  delete_ctx->relpath = apr_pstrdup(pool, path);
   delete_ctx->revision = revision;
-  delete_ctx->lock_token_hash = dir->commit->lock_tokens;
-  delete_ctx->keep_locks = dir->commit->keep_locks;
+  delete_ctx->commit = dir->commit;
 
   handler = apr_pcalloc(pool, sizeof(*handler));
   handler->handler_pool = pool;
@@ -1579,30 +1631,7 @@ delete_entry(const char *path,
   handler->method = "DELETE";
   handler->path = delete_target;
 
-  err = svn_ra_serf__context_run_one(handler, pool);
-
-  if (err &&
-      (err->apr_err == SVN_ERR_FS_BAD_LOCK_TOKEN ||
-       err->apr_err == SVN_ERR_FS_NO_LOCK_TOKEN ||
-       err->apr_err == SVN_ERR_FS_LOCK_OWNER_MISMATCH ||
-       err->apr_err == SVN_ERR_FS_PATH_ALREADY_LOCKED))
-    {
-      svn_error_clear(err);
-
-      /* An error has been registered on the connection. Reset the thing
-         so that we can use it again.  */
-      serf_connection_reset(handler->conn->conn);
-
-      handler->body_delegate = create_delete_body;
-      handler->body_delegate_baton = delete_ctx;
-      handler->body_type = "text/xml";
-
-      SVN_ERR(svn_ra_serf__context_run_one(handler, pool));
-    }
-  else if (err)
-    {
-      return err;
-    }
+  SVN_ERR(svn_ra_serf__context_run_one(handler, pool));
 
   /* 204 No Content: item successfully deleted */
   if (handler->sline.code != 204)
@@ -1673,6 +1702,9 @@ add_directory(const char *path,
     {
       handler->method = "MKCOL";
       handler->path = mkcol_target;
+
+      handler->header_delegate = setup_add_dir_common_headers;
+      handler->header_delegate_baton = dir;
     }
   else
     {
@@ -2341,7 +2373,8 @@ svn_ra_serf__get_commit_editor(svn_ra_session_t *ra_session,
   ctx->callback = callback;
   ctx->callback_baton = callback_baton;
 
-  ctx->lock_tokens = lock_tokens;
+  ctx->lock_tokens = (lock_tokens && apr_hash_count(lock_tokens))
+                       ? lock_tokens : NULL;
   ctx->keep_locks = keep_locks;
 
   ctx->deleted_entries = apr_hash_make(ctx->pool);
diff --git a/contrib/subversion/subversion/libsvn_ra_serf/options.c b/contrib/subversion/subversion/libsvn_ra_serf/options.c
index a3c2fb95c881..f61ee87142c6 100644
--- a/contrib/subversion/subversion/libsvn_ra_serf/options.c
+++ b/contrib/subversion/subversion/libsvn_ra_serf/options.c
@@ -302,7 +302,7 @@ capabilities_headers_iterator_callback(void *baton,
           /* May contain multiple values, separated by commas. */
           int i;
           apr_array_header_t *vals = svn_cstring_split(val, ",", TRUE,
-                                                       opt_ctx->pool);
+                                                       session->pool);
 
           for (i = 0; i < vals->nelts; i++)
             {
diff --git a/contrib/subversion/subversion/libsvn_ra_serf/util.c b/contrib/subversion/subversion/libsvn_ra_serf/util.c
index 60fa3c44af17..8f6c1bb5d4fa 100644
--- a/contrib/subversion/subversion/libsvn_ra_serf/util.c
+++ b/contrib/subversion/subversion/libsvn_ra_serf/util.c
@@ -28,7 +28,6 @@
 #define APR_WANT_STRFUNC
 #include <apr.h>
 #include <apr_want.h>
-#include <apr_fnmatch.h>
 
 #include <serf.h>
 #include <serf_bucket_types.h>
@@ -49,6 +48,7 @@
 #include "private/svn_fspath.h"
 #include "private/svn_subr_private.h"
 #include "private/svn_auth_private.h"
+#include "private/svn_cert.h"
 
 #include "ra_serf.h"
 
@@ -274,7 +274,6 @@ ssl_server_cert(void *baton, int failures,
   apr_hash_t *subject = NULL;
   apr_hash_t *serf_cert = NULL;
   void *creds;
-  int found_matching_hostname = 0;
 
   svn_failures = (ssl_convert_serf_failures(failures)
       | conn->server_cert_failures);
@@ -286,26 +285,37 @@ ssl_server_cert(void *baton, int failures,
       ### This should really be handled by serf, which should pass an error
           for this case, but that has backwards compatibility issues. */
       apr_array_header_t *san;
+      svn_boolean_t found_san_entry = FALSE;
+      svn_boolean_t found_matching_hostname = FALSE;
+      svn_string_t *actual_hostname =
+          svn_string_create(conn->session->session_url.hostname, scratch_pool);
 
       serf_cert = serf_ssl_cert_certificate(cert, scratch_pool);
 
       san = svn_hash_gets(serf_cert, "subjectAltName");
       /* Try to find matching server name via subjectAltName first... */
-      if (san) {
+      if (san)
+        {
           int i;
-          for (i = 0; i < san->nelts; i++) {
+          found_san_entry = san->nelts > 0;
+          for (i = 0; i < san->nelts; i++)
+            {
               const char *s = APR_ARRAY_IDX(san, i, const char*);
-              if (apr_fnmatch(s, conn->session->session_url.hostname,
-                  APR_FNM_PERIOD | APR_FNM_CASE_BLIND) == APR_SUCCESS)
-              {
-                  found_matching_hostname = 1;
-                  break;
-              }
-          }
-      }
+              svn_string_t *cert_hostname = svn_string_create(s, scratch_pool);
 
-      /* Match server certificate CN with the hostname of the server */
-      if (!found_matching_hostname)
+              if (svn_cert__match_dns_identity(cert_hostname, actual_hostname))
+                {
+                  found_matching_hostname = TRUE;
+                  break;
+                }
+            }
+        }
+
+      /* Match server certificate CN with the hostname of the server iff
+       * we didn't find any subjectAltName fields and try to match them.
+       * Per RFC 2818 they are authoritative if present and CommonName
+       * should be ignored. */
+      if (!found_matching_hostname && !found_san_entry)
         {
           const char *hostname = NULL;
 
@@ -314,13 +324,20 @@ ssl_server_cert(void *baton, int failures,
           if (subject)
             hostname = svn_hash_gets(subject, "CN");
 
-          if (!hostname
-              || apr_fnmatch(hostname, conn->session->session_url.hostname,
-                             APR_FNM_PERIOD | APR_FNM_CASE_BLIND) != APR_SUCCESS)
-          {
-              svn_failures |= SVN_AUTH_SSL_CNMISMATCH;
-          }
-      }
+          if (hostname)
+            {
+              svn_string_t *cert_hostname = svn_string_create(hostname,
+                                                              scratch_pool);
+
+              if (svn_cert__match_dns_identity(cert_hostname, actual_hostname))
+                {
+                  found_matching_hostname = TRUE;
+                }
+            }
+        }
+
+      if (!found_matching_hostname)
+        svn_failures |= SVN_AUTH_SSL_CNMISMATCH;
     }
 
   if (!svn_failures)
diff --git a/contrib/subversion/subversion/libsvn_subr/config_auth.c b/contrib/subversion/subversion/libsvn_subr/config_auth.c
index 091e4e84abcd..ed26a58cb362 100644
--- a/contrib/subversion/subversion/libsvn_subr/config_auth.c
+++ b/contrib/subversion/subversion/libsvn_subr/config_auth.c
@@ -94,6 +94,7 @@ svn_config_read_auth_data(apr_hash_t **hash,
   if (kind == svn_node_file)
     {
       svn_stream_t *stream;
+      svn_string_t *stored_realm;
 
       SVN_ERR_W(svn_stream_open_readonly(&stream, auth_path, pool, pool),
                 _("Unable to open auth file for reading"));
@@ -104,6 +105,11 @@ svn_config_read_auth_data(apr_hash_t **hash,
                 apr_psprintf(pool, _("Error parsing '%s'"),
                              svn_dirent_local_style(auth_path, pool)));
 
+      stored_realm = svn_hash_gets(*hash, SVN_CONFIG_REALMSTRING_KEY);
+
+      if (!stored_realm || strcmp(stored_realm->data, realmstring) != 0)
+        *hash = NULL; /* Hash collision, or somebody tampering with storage */
+
       SVN_ERR(svn_stream_close(stream));
     }
 
diff --git a/contrib/subversion/subversion/libsvn_subr/dirent_uri.c b/contrib/subversion/subversion/libsvn_subr/dirent_uri.c
index 4801f8c8e114..6886a3e7550e 100644
--- a/contrib/subversion/subversion/libsvn_subr/dirent_uri.c
+++ b/contrib/subversion/subversion/libsvn_subr/dirent_uri.c
@@ -38,6 +38,7 @@
 
 #include "dirent_uri.h"
 #include "private/svn_fspath.h"
+#include "private/svn_cert.h"
 
 /* The canonical empty path.  Can this be changed?  Well, change the empty
    test below and the path library will work, not so sure about the fs/wc
@@ -2597,3 +2598,81 @@ svn_urlpath__canonicalize(const char *uri,
     }
   return uri;
 }
+
+
+/* -------------- The cert API (see private/svn_cert.h) ------------- */
+
+svn_boolean_t
+svn_cert__match_dns_identity(svn_string_t *pattern, svn_string_t *hostname)
+{
+  apr_size_t pattern_pos = 0, hostname_pos = 0;
+
+  /* support leading wildcards that composed of the only character in the
+   * left-most label. */
+  if (pattern->len >= 2 &&
+      pattern->data[pattern_pos] == '*' &&
+      pattern->data[pattern_pos + 1] == '.')
+    {
+      while (hostname_pos < hostname->len &&
+             hostname->data[hostname_pos] != '.')
+        {
+          hostname_pos++;
+        }
+      /* Assume that the wildcard must match something.  Rule 2 says
+       * that *.example.com should not match example.com.  If the wildcard
+       * ends up not matching anything then it matches .example.com which
+       * seems to be essentially the same as just example.com */
+      if (hostname_pos == 0)
+        return FALSE;
+
+      pattern_pos++;
+    }
+
+  while (pattern_pos < pattern->len && hostname_pos < hostname->len)
+    {
+      char pattern_c = pattern->data[pattern_pos];
+      char hostname_c = hostname->data[hostname_pos];
+
+      /* fold case as described in RFC 4343.
+       * Note: We actually convert to lowercase, since our URI
+       * canonicalization code converts to lowercase and generally
+       * most certs are issued with lowercase DNS names, meaning
+       * this avoids the fold operation in most cases.  The RFC
+       * suggests the opposite transformation, but doesn't require
+       * any specific implementation in any case.  It is critical
+       * that this folding be locale independent so you can't use
+       * tolower(). */
+      pattern_c = canonicalize_to_lower(pattern_c);
+      hostname_c = canonicalize_to_lower(hostname_c);
+
+      if (pattern_c != hostname_c)
+        {
+          /* doesn't match */
+          return FALSE;
+        }
+      else
+        {
+          /* characters match so skip both */
+          pattern_pos++;
+          hostname_pos++;
+        }
+    }
+
+  /* ignore a trailing period on the hostname since this has no effect on the
+   * security of the matching.  See the following for the long explanation as
+   * to why:
+   * https://bugzilla.mozilla.org/show_bug.cgi?id=134402#c28
+   */
+  if (pattern_pos == pattern->len &&
+      hostname_pos == hostname->len - 1 &&
+      hostname->data[hostname_pos] == '.')
+    hostname_pos++;
+
+  if (pattern_pos != pattern->len || hostname_pos != hostname->len)
+    {
+      /* end didn't match */
+      return FALSE;
+    }
+
+  return TRUE;
+}
diff --git a/contrib/subversion/subversion/libsvn_subr/internal_statements.h b/contrib/subversion/subversion/libsvn_subr/internal_statements.h
index 4fa938932ecc..58616f4c450f 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.9/subversion/libsvn_subr/token-map.h.
+/* This file is automatically generated from internal_statements.sql and .dist_sandbox/subversion-1.8.10/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/opt.c b/contrib/subversion/subversion/libsvn_subr/opt.c
index e499089c4170..d91a2ef379f9 100644
--- a/contrib/subversion/subversion/libsvn_subr/opt.c
+++ b/contrib/subversion/subversion/libsvn_subr/opt.c
@@ -417,7 +417,9 @@ svn_opt_subcommand_help3(const char *subcommand,
                               _("\"%s\": unknown command.\n\n"), subcommand);
 
   if (err) {
-    svn_handle_error2(err, stderr, FALSE, "svn: ");
+    /* Issue #3014: Don't print anything on broken pipes. */
+    if (err->apr_err != SVN_ERR_IO_PIPE_WRITE_ERROR)
+      svn_handle_error2(err, stderr, FALSE, "svn: ");
     svn_error_clear(err);
   }
 }
diff --git a/contrib/subversion/subversion/libsvn_wc/wc-checks.h b/contrib/subversion/subversion/libsvn_wc/wc-checks.h
index 9fd40bd9fad9..43a006645426 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.9/subversion/libsvn_wc/token-map.h.
+/* This file is automatically generated from wc-checks.sql and .dist_sandbox/subversion-1.8.10/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 e39db8ab6ba1..b24f24ff3fbc 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.9/subversion/libsvn_wc/token-map.h.
+/* This file is automatically generated from wc-metadata.sql and .dist_sandbox/subversion-1.8.10/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 3fc6b2fe0f5f..2508bcf256e2 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.9/subversion/libsvn_wc/token-map.h.
+/* This file is automatically generated from wc-queries.sql and .dist_sandbox/subversion-1.8.10/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
diff --git a/contrib/subversion/subversion/libsvn_wc/wc_db.c b/contrib/subversion/subversion/libsvn_wc/wc_db.c
index 81056c9a4a6a..ed59d4cf6456 100644
--- a/contrib/subversion/subversion/libsvn_wc/wc_db.c
+++ b/contrib/subversion/subversion/libsvn_wc/wc_db.c
@@ -3815,8 +3815,15 @@ cross_db_copy(svn_wc__db_wcroot_t *src_wcroot,
                     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
                     src_wcroot, src_relpath, scratch_pool, scratch_pool));
 
-  SVN_ERR(db_read_pristine_props(&props, src_wcroot, src_relpath, FALSE,
-                                 scratch_pool, scratch_pool));
+  if (dst_status != svn_wc__db_status_not_present
+      && dst_status != svn_wc__db_status_excluded
+      && dst_status != svn_wc__db_status_server_excluded)
+    {
+      SVN_ERR(db_read_pristine_props(&props, src_wcroot, src_relpath, FALSE,
+                                     scratch_pool, scratch_pool));
+    }
+  else
+    props = NULL;
 
   blank_iwb(&iwb);
   iwb.presence = dst_status;
@@ -5131,6 +5138,17 @@ db_op_copy_shadowed_layer(svn_wc__db_wcroot_t *src_wcroot,
                                     scratch_pool));
     }
 
+  if (dst_presence == svn_wc__db_status_not_present)
+    {
+      /* Don't create descendants of a not present node! */
+
+      /* This code is currently still triggered by copying deleted nodes
+         between separate working copies. See ### comment above. */
+
+      svn_pool_destroy(iterpool);
+      return SVN_NO_ERROR;
+    }
+
   SVN_ERR(gather_repo_children(&children, src_wcroot, src_relpath,
                                src_op_depth, scratch_pool, iterpool));
 
diff --git a/contrib/subversion/subversion/svn/util.c b/contrib/subversion/subversion/svn/util.c
index 91291a013b61..2353df6a8580 100644
--- a/contrib/subversion/subversion/svn/util.c
+++ b/contrib/subversion/subversion/svn/util.c
@@ -419,7 +419,7 @@ svn_cl__get_log_message(const char **log_msg,
   svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX);
   svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
   svn_stringbuf_appendcstr(default_msg, "> Description of fields to fill in above:                     76 columns --|" APR_EOL_STR);
-  svn_stringbuf_appendcstr(default_msg, "> PR:            If a GNATS PR is affected by the change." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> PR:            If a Bugzilla PR is affected by the change." APR_EOL_STR);
   svn_stringbuf_appendcstr(default_msg, "> Submitted by:  If someone else sent in the change." APR_EOL_STR);
   svn_stringbuf_appendcstr(default_msg, "> Reviewed by:   If someone else reviewed your modification." APR_EOL_STR);
   svn_stringbuf_appendcstr(default_msg, "> Approved by:   If you needed approval for this commit." APR_EOL_STR);
diff --git a/contrib/tzdata/africa b/contrib/tzdata/africa
index 83bff2eccaf3..90f773578f2c 100644
--- a/contrib/tzdata/africa
+++ b/contrib/tzdata/africa
@@ -239,13 +239,13 @@ Rule	Egypt	1990	1994	-	May	 1	1:00	1:00	S
 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
 # </a>
 Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
-Rule	Egypt	1995	2005	-	Sep	lastThu	23:00s	0	-
+Rule	Egypt	1995	2005	-	Sep	lastThu	24:00	0	-
 # From Steffen Thorsen (2006-09-19):
 # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
 # Egypt will turn back clocks by one hour at the midnight of Thursday
 # after observing the daylight saving time since May.
 # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
-Rule	Egypt	2006	only	-	Sep	21	23:00s	0	-
+Rule	Egypt	2006	only	-	Sep	21	24:00	0	-
 # From Dirk Losch (2007-08-14):
 # I received a mail from an airline which says that the daylight
 # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
@@ -254,7 +254,7 @@ Rule	Egypt	2006	only	-	Sep	21	23:00s	0	-
 # http://www.timeanddate.com/worldclock/city.html?n=53
 # From Steffen Thorsen (2007-09-04): The official information...:
 # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
-Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s	0	-
+Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	0	-
 # From Abdelrahman Hassan (2007-09-06):
 # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
 # than the year of the Gregorian calendar, Ramadan shifts earlier each
@@ -342,46 +342,77 @@ Rule	Egypt	2007	only	-	Sep	Thu>=1	23:00s	0	-
 # From Gunther Vermier (2015-05-13):
 # our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
 
-# From Paul Eggert (2014-05-13):
+# From Imed Chihi (2014-06-04):
+# We have finally "located" a precise official reference about the DST changes
+# in Egypt.  The Ministers Cabinet decision is explained at
+# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
+# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
+# translates into: "With regard to daylight saving time, it is scheduled to
+# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
+# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
+# and re-established again at the end of the month of Ramadan, at twelve
+# o'clock on the evening of Thursday, 31 JUL 2014."  This statement has been
+# reproduced by other (more accessible) sites[, e.g.,]...
+# http://elgornal.net/news/news.aspx?id=4699258
+
+# From Paul Eggert (2014-06-04):
 # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
 # the change is because of blackouts in Cairo, even though Ahram Online (cited
-# above) says DST had no affect on electricity consumption.  The AP story says
-# DST will not be observed during Ramadan.  There is no information about when
-# DST will end.  See:
+# above) says DST had no affect on electricity consumption.  There is
+# no information about when DST will end this fall.  See:
 # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
 #
-# For now, guess that later transitions will use 2010's rules, and that
-# Egypt will agree with Morocco (see below) about the date Ramadan starts and
-# ends, though (unlike Morocco) it will switch at 00:00 standard time.  In
-# Egypt the spring-forward transitions are removed for 2020-2022, when the
-# guessed spring-forward date falls during the estimated Ramadan, and all
-# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
-# outside the guessed daylight-saving time.  Ramadan intrudes on the guessed
-# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
-
-Rule	Egypt	2008	only	-	Aug	lastThu	23:00s	0	-
-Rule	Egypt	2009	only	-	Aug	20	23:00s	0	-
-Rule	Egypt	2010	only	-	Aug	11	0:00	0	-
-Rule	Egypt	2010	only	-	Sep	10	0:00	1:00	S
-Rule	Egypt	2010	only	-	Sep	lastThu	23:00s	0	-
+# For now, guess that later spring and fall transitions will use
+# 2010's rules, and guess that Egypt will switch to standard time at
+# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
+# first Friday after Ramadan.  To implement this,
+# transition dates for 2015 through 2037 were determined by running
+# the following program under GNU Emacs 24.3, with the results integrated
+# by hand into the table below.  Ramadan again intrudes on the guessed
+# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
+# (let ((islamic-year 1436))
+#   (while (< islamic-year 1460)
+#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
+#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
+#           (friday 5))
+#       (while (/= friday (mod a 7))
+#         (setq a (1- a)))
+#       (while (/= friday (mod b 7))
+#         (setq b (1+ b)))
+#       (setq a (1- a))
+#       (setq b (1- b))
+#       (setq a (calendar-gregorian-from-absolute a))
+#       (setq b (calendar-gregorian-from-absolute b))
+#       (insert
+#        (format
+#         (concat "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n"
+#                 "Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n")
+#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+#     (setq islamic-year (+ 1 islamic-year))))
+Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
+Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
+Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
+Rule	Egypt	2010	only	-	Sep	 9	24:00	1:00	S
+Rule	Egypt	2010	only	-	Sep	lastThu	24:00	0	-
 Rule	Egypt	2014	only	-	May	15	24:00	1:00	S
-Rule	Egypt	2014	only	-	Jun	29	 0:00s	0	-
-Rule	Egypt	2014	only	-	Jul	29	 0:00s	1:00	S
-Rule	Egypt	2014	max	-	Sep	lastThu	23:00s	0	-
+Rule	Egypt	2014	only	-	Jun	26	24:00	0	-
+Rule	Egypt	2014	only	-	Jul	31	24:00	1:00	S
+Rule	Egypt	2014	max	-	Sep	lastThu	24:00	0	-
 Rule	Egypt	2015	2019	-	Apr	lastFri	 0:00s	1:00	S
-Rule	Egypt	2015	only	-	Jun	18	 0:00s	0	-
-Rule	Egypt	2015	only	-	Jul	18	 0:00s	1:00	S
-Rule	Egypt	2016	only	-	Jun	 7	 0:00s	0	-
-Rule	Egypt	2016	only	-	Jul	 7	 0:00s	1:00	S
-Rule	Egypt	2017	only	-	May	27	 0:00s	0	-
-Rule	Egypt	2017	only	-	Jun	26	 0:00s	1:00	S
-Rule	Egypt	2018	only	-	May	16	 0:00s	0	-
-Rule	Egypt	2018	only	-	Jun	15	 0:00s	1:00	S
-Rule	Egypt	2019	only	-	May	 6	 0:00s	0	-
-Rule	Egypt	2019	only	-	Jun	 5	 0:00s	1:00	S
-Rule	Egypt	2020	only	-	May	24	 0:00s	1:00	S
-Rule	Egypt	2021	only	-	May	13	 0:00s	1:00	S
-Rule	Egypt	2022	only	-	May	 3	 0:00s	1:00	S
+Rule	Egypt	2015	only	-	Jun	11	24:00	0	-
+Rule	Egypt	2015	only	-	Jul	23	24:00	1:00	S
+Rule	Egypt	2016	only	-	Jun	 2	24:00	0	-
+Rule	Egypt	2016	only	-	Jul	 7	24:00	1:00	S
+Rule	Egypt	2017	only	-	May	25	24:00	0	-
+Rule	Egypt	2017	only	-	Jun	29	24:00	1:00	S
+Rule	Egypt	2018	only	-	May	10	24:00	0	-
+Rule	Egypt	2018	only	-	Jun	14	24:00	1:00	S
+Rule	Egypt	2019	only	-	May	 2	24:00	0	-
+Rule	Egypt	2019	only	-	Jun	 6	24:00	1:00	S
+Rule	Egypt	2020	only	-	May	28	24:00	1:00	S
+Rule	Egypt	2021	only	-	May	13	24:00	1:00	S
+Rule	Egypt	2022	only	-	May	 5	24:00	1:00	S
 Rule	Egypt	2023	max	-	Apr	lastFri	 0:00s	1:00	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -914,39 +945,36 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
 # From Sebastien Willemijns (2014-03-18):
 # http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
 
-# From Paul Eggert (2014-03-19):
-# To estimate what the Moroccan government will do in future years,
-# 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 1461)
-#     (let ((a
-#	     (calendar-gregorian-from-absolute
-#	      (calendar-islamic-to-absolute (list 9 1 islamic-year))))
-#	    (b
-#	     (calendar-gregorian-from-absolute
-#	      (calendar-islamic-to-absolute (list 10 1 islamic-year)))))
-#	(insert
-#	 (format
-#	  (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n"
-#		  "Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n")
-#	  (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
-#	  (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
+# From Milamber Space Network (2014-06-05):
+# The Moroccan government has recently announced that the country will return
+# to standard time at 03:00 on Saturday, June 28, 2014 local time....  DST
+# will resume again at 02:00 on Saturday, August 2, 2014....
+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
+
+# From Paul Eggert (2014-06-05):
+# For now, guess that later spring and fall transitions will use 2014's rules,
+# and guess that Morocco will switch to standard time at 03:00 the last
+# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after
+# Ramadan.  To implement this, transition dates for 2015 through 2037 were
+# determined by running the following program under GNU Emacs 24.3, with the
+# results integrated by hand into the table below.
+# (let ((islamic-year 1436))
+#   (while (< islamic-year 1460)
+#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
+#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
+#           (saturday 6))
+#       (while (/= saturday (mod (setq a (1- a)) 7)))
+#       (while (/= saturday (mod b 7))
+#         (setq b (1+ b)))
+#       (setq a (calendar-gregorian-from-absolute a))
+#       (setq b (calendar-gregorian-from-absolute b))
+#       (insert
+#        (format
+#         (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t0\t-\n"
+#                 "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t1:00\tS\n")
+#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
+#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
 #     (setq islamic-year (+ 1 islamic-year))))
-#
-# 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
 
@@ -968,46 +996,44 @@ Rule	Morocco	1978	only	-	Aug	 4	 0:00	0	-
 Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:00	S
 Rule	Morocco	2008	only	-	Sep	 1	 0:00	0	-
 Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:00	S
-Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
+Rule	Morocco	2009	only	-	Aug	21	 0:00	0	-
 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	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	-
-Rule	Morocco	2015	only	-	Jul	 18	 2:00	1:00	S
-Rule	Morocco	2016	only	-	Jun	  7	 3:00	0	-
-Rule	Morocco	2016	only	-	Jul	  7	 2:00	1:00	S
-Rule	Morocco	2017	only	-	May	 27	 3:00	0	-
-Rule	Morocco	2017	only	-	Jun	 26	 2:00	1:00	S
-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	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	-
+Rule	Morocco	2011	only	-	Jul	31	 0	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	max	-	Oct	lastSun	 3:00	0	-
+Rule	Morocco	2014	2022	-	Mar	lastSun	 2:00	1:00	S
+Rule	Morocco	2014	only	-	Jun	28	 3:00	0	-
+Rule	Morocco	2014	only	-	Aug	 2	 2:00	1:00	S
+Rule	Morocco	2015	only	-	Jun	13	 3:00	0	-
+Rule	Morocco	2015	only	-	Jul	18	 2:00	1:00	S
+Rule	Morocco	2016	only	-	Jun	 4	 3:00	0	-
+Rule	Morocco	2016	only	-	Jul	 9	 2:00	1:00	S
+Rule	Morocco	2017	only	-	May	20	 3:00	0	-
+Rule	Morocco	2017	only	-	Jul	 1	 2:00	1:00	S
+Rule	Morocco	2018	only	-	May	12	 3:00	0	-
+Rule	Morocco	2018	only	-	Jun	16	 2:00	1:00	S
+Rule	Morocco	2019	only	-	May	 4	 3:00	0	-
+Rule	Morocco	2019	only	-	Jun	 8	 2:00	1:00	S
+Rule	Morocco	2020	only	-	Apr	18	 3:00	0	-
+Rule	Morocco	2020	only	-	May	30	 2:00	1:00	S
+Rule	Morocco	2021	only	-	Apr	10	 3:00	0	-
+Rule	Morocco	2021	only	-	May	15	 2:00	1:00	S
+Rule	Morocco	2022	only	-	Apr	 2	 3:00	0	-
+Rule	Morocco	2022	only	-	May	 7	 2:00	1:00	S
+Rule	Morocco	2023	only	-	Apr	22	 2:00	1:00	S
+Rule	Morocco	2024	only	-	Apr	13	 2:00	1:00	S
+Rule	Morocco	2025	only	-	Apr	 5	 2:00	1:00	S
+Rule	Morocco	2026	max	-	Mar	lastSun	 2:00	1:00	S
+Rule	Morocco	2035	only	-	Oct	27	 3:00	0	-
+Rule	Morocco	2036	only	-	Oct	18	 3:00	0	-
+Rule	Morocco	2037	only	-	Oct	10	 3:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
diff --git a/contrib/tzdata/australasia b/contrib/tzdata/australasia
index a61c184fcf4e..2a8297b01faa 100644
--- a/contrib/tzdata/australasia
+++ b/contrib/tzdata/australasia
@@ -250,24 +250,14 @@ Zone Antarctica/Macquarie 0	-	zzz	1899 Nov
 Zone Indian/Christmas	7:02:52 -	LMT	1895 Feb
 			7:00	-	CXT	# Christmas Island Time
 
-# Cook Is
-# From Shanks & Pottenger:
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Cook	1978	only	-	Nov	12	0:00	0:30	HS
-Rule	Cook	1979	1991	-	Mar	Sun>=1	0:00	0	-
-Rule	Cook	1979	1990	-	Oct	lastSun	0:00	0:30	HS
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901		# Avarua
-			-10:30	-	CKT	1978 Nov 12	# Cook Is Time
-			-10:00	Cook	CK%sT
-
-# Cocos
+# Cocos (Keeling) Is
 # These islands were ruled by the Ross family from about 1830 to 1978.
 # We don't know when standard time was introduced; for now, we guess 1900.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Indian/Cocos	6:27:40	-	LMT	1900
 			6:30	-	CCT	# Cocos Islands Time
 
+
 # Fiji
 
 # Milne gives 11:55:44 for Suva.
@@ -473,7 +463,8 @@ Rule	NZ	1934	1940	-	Apr	lastSun	2:00	0	M
 Rule	NZ	1934	1940	-	Sep	lastSun	2:00	0:30	S
 Rule	NZ	1946	only	-	Jan	 1	0:00	0	S
 # Since 1957 Chatham has been 45 minutes ahead of NZ, but there's no
-# convenient notation for this so we must duplicate the Rule lines.
+# convenient single notation for the date and time of this transition
+# so we must duplicate the Rule lines.
 Rule	NZ	1974	only	-	Nov	Sun>=1	2:00s	1:00	D
 Rule	Chatham	1974	only	-	Nov	Sun>=1	2:45s	1:00	D
 Rule	NZ	1975	only	-	Feb	lastSun	2:00s	0	S
@@ -511,6 +502,17 @@ Link Pacific/Auckland Antarctica/McMurdo
 # previously whalers, sealers, pastoralists, and scientific personnel wintered
 # was probably like Pacific/Auckland
 
+# Cook Is
+# From Shanks & Pottenger:
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Cook	1978	only	-	Nov	12	0:00	0:30	HS
+Rule	Cook	1979	1991	-	Mar	Sun>=1	0:00	0	-
+Rule	Cook	1979	1990	-	Oct	lastSun	0:00	0:30	HS
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901		# Avarua
+			-10:30	-	CKT	1978 Nov 12	# Cook Is Time
+			-10:00	Cook	CK%sT
+
 ###############################################################################
 
 
diff --git a/contrib/tzdata/europe b/contrib/tzdata/europe
index bfc596a9d4b3..7ae96ffc9311 100644
--- a/contrib/tzdata/europe
+++ b/contrib/tzdata/europe
@@ -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 (2006-03-22):
+# From Paul Eggert (2014-05-31):
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
 # San Diego: ACS Publications, Inc. (2003).
@@ -17,6 +17,9 @@
 # published semiannually.  Law sent in several helpful summaries
 # of the IATA's data after 1990.
 #
+# A reliable and entertaining source about time zones is
+# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+#
 # Except where otherwise noted, Shanks & Pottenger is the source for
 # entries through 1991, and IATA SSIM is the source for entries afterwards.
 #
@@ -26,9 +29,9 @@
 #	Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated),
 #	which I found in the UCLA library.
 #
-#	<a href="http://www.pettswoodvillage.co.uk/Daylight_Savings_William_Willett.pdf">
 #	William Willett, The Waste of Daylight, 19th edition
-#	</a> (1914-03)
+#	<http://cs.ucla.edu/~eggert/The-Waste-of-Daylight-19th.pdf>
+#	[PDF] (1914-03)
 #
 #	Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
 #	<http://www.jstor.org/stable/1774359>.  He writes:
@@ -58,10 +61,7 @@
 #        1:00       CET CEST CEMT Central Europe
 #        1:00:14    SET           Swedish (1879-1899)*
 #        2:00       EET EEST      Eastern Europe
-#        3:00       MSK MSD       Moscow
-#
-# A reliable and entertaining source about time zones, especially in Britain,
-# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+#        3:00       MSK MSD  MSM* Moscow
 
 # From Peter Ilieve (1994-12-04),
 # The original six [EU members]: Belgium, France, (West) Germany, Italy,
@@ -558,11 +558,11 @@ Rule	Russia	1917	only	-	Dec	28	 0:00	0	MMT	# Moscow Mean Time
 Rule	Russia	1918	only	-	May	31	22:00	2:00	MDST	# Moscow Double Summer Time
 Rule	Russia	1918	only	-	Sep	16	 1:00	1:00	MST
 Rule	Russia	1919	only	-	May	31	23:00	2:00	MDST
-Rule	Russia	1919	only	-	Jul	 1	 2:00	1:00	S
-Rule	Russia	1919	only	-	Aug	16	 0:00	0	-
-Rule	Russia	1921	only	-	Feb	14	23:00	1:00	S
-Rule	Russia	1921	only	-	Mar	20	23:00	2:00	M # Midsummer
-Rule	Russia	1921	only	-	Sep	 1	 0:00	1:00	S
+Rule	Russia	1919	only	-	Jul	 1	 2:00	1:00	MSD
+Rule	Russia	1919	only	-	Aug	16	 0:00	0	MSK
+Rule	Russia	1921	only	-	Feb	14	23:00	1:00	MSD
+Rule	Russia	1921	only	-	Mar	20	23:00	2:00	MSM # Midsummer
+Rule	Russia	1921	only	-	Sep	 1	 0:00	1:00	MSD
 Rule	Russia	1921	only	-	Oct	 1	 0:00	0	-
 # Act No.925 of the Council of Ministers of the USSR (1980-10-24):
 Rule	Russia	1981	1984	-	Apr	 1	 0:00	1:00	S
@@ -2217,6 +2217,7 @@ Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
 Zone Europe/Moscow	 2:30:20 -	LMT	1880
 			 2:30	-	MMT	1916 Jul  3 # Moscow Mean Time
 			 2:30:48 Russia	%s	1919 Jul  1 2:00
+			 3:00	Russia	%s	1921 Oct
 			 3:00	Russia	MSK/MSD	1922 Oct
 			 2:00	-	EET	1930 Jun 21
 			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
@@ -2375,7 +2376,7 @@ Zone Asia/Yakutsk	 8:38:40 -	LMT	1919 Dec 15
 Zone Asia/Vladivostok	 8:47:44 -	LMT	1922 Nov 15
 			 9:00	-	VLAT	1930 Jun 21 # Vladivostok Time
 			10:00	Russia	VLA%sT	1991 Mar 31 2:00s
-			 9:00	Russia	VLA%sST	1992 Jan 19 2:00s
+			 9:00	Russia	VLA%sT	1992 Jan 19 2:00s
 			10:00	Russia	VLA%sT	2011 Mar 27 2:00s
 			11:00	-	VLAT
 
diff --git a/contrib/tzdata/northamerica b/contrib/tzdata/northamerica
index d51a7e1d6bdc..9660a46d22a9 100644
--- a/contrib/tzdata/northamerica
+++ b/contrib/tzdata/northamerica
@@ -1019,9 +1019,9 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 #	Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated),
 #	which I found in the UCLA library.
 #
-#	<a href="http://www.pettswoodvillage.co.uk/Daylight_Savings_William_Willett.pdf">
 #	William Willett, The Waste of Daylight, 19th edition
-#	</a> (1914-03)
+#	<http://cs.ucla.edu/~eggert/The-Waste-of-Daylight-19th.pdf>
+#	[PDF] (1914-03)
 #
 #	Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
 #	<http://www.jstor.org/stable/1774359>.
diff --git a/contrib/unbound/doc/example.conf.in b/contrib/unbound/doc/example.conf.in
index c13fbae045ef..9e91d1f8919b 100644
--- a/contrib/unbound/doc/example.conf.in
+++ b/contrib/unbound/doc/example.conf.in
@@ -437,7 +437,14 @@ server:
 	# the amount of memory to use for the negative cache (used for DLV).
 	# plain value in bytes or you can append k, m or G. default is "1Mb". 
 	# neg-cache-size: 1m
-
+	
+	# if unbound is running service for the local host then it is useful
+	# to perform lan-wide lookups to the upstream, and unblock the
+	# long list of local-zones above.  If this unbound is a dns server
+	# for a network of computers, disabled is better and stops information
+	# leakage of local lan information.
+	# unblock-lan-zones: no
+	
 	# By default, for a number of zones a small default 'nothing here'
 	# reply is built-in.  Query traffic is thus blocked.  If you
 	# wish to serve such zone you can unblock them by uncommenting one
diff --git a/contrib/unbound/doc/unbound.conf.5 b/contrib/unbound/doc/unbound.conf.5
index 6a8d6a6757ea..a106733c4304 100644
--- a/contrib/unbound/doc/unbound.conf.5
+++ b/contrib/unbound/doc/unbound.conf.5
@@ -778,6 +778,17 @@ Number of bytes size of the aggressive negative cache. Default is 1 megabyte.
 A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes
 or gigabytes (1024*1024 bytes in a megabyte).
 .TP
+.B unblock\-lan\-zones: \fI<yesno>
+Default is disabled.  If enabled, then for private address space,
+the reverse lookups are no longer filtered.  This allows unbound when
+running as dns service on a host where it provides service for that host,
+to put out all of the queries for the 'lan' upstream.  When enabled,
+only localhost, 127.0.0.1 reverse and ::1 reverse zones are configured
+with default local zones.  Disable the option when unbound is running
+as a (DHCP-) DNS network resolver for a group of machines, where such
+lookups should be filtered (RFC compliance), this also stops potential
+data leakage about the local network to the upstream DNS servers.
+.TP
 .B local\-zone: \fI<zone> <type>
 Configure a local zone. The type determines the answer to give if
 there is no match from local\-data. The types are deny, refuse, static,
diff --git a/contrib/unbound/doc/unbound.conf.5.in b/contrib/unbound/doc/unbound.conf.5.in
index 75967e1b8cb3..aadd0daa0ee5 100644
--- a/contrib/unbound/doc/unbound.conf.5.in
+++ b/contrib/unbound/doc/unbound.conf.5.in
@@ -778,6 +778,17 @@ Number of bytes size of the aggressive negative cache. Default is 1 megabyte.
 A plain number is in bytes, append 'k', 'm' or 'g' for kilobytes, megabytes
 or gigabytes (1024*1024 bytes in a megabyte).
 .TP
+.B unblock\-lan\-zones: \fI<yesno>
+Default is disabled.  If enabled, then for private address space,
+the reverse lookups are no longer filtered.  This allows unbound when
+running as dns service on a host where it provides service for that host,
+to put out all of the queries for the 'lan' upstream.  When enabled,
+only localhost, 127.0.0.1 reverse and ::1 reverse zones are configured
+with default local zones.  Disable the option when unbound is running
+as a (DHCP-) DNS network resolver for a group of machines, where such
+lookups should be filtered (RFC compliance), this also stops potential
+data leakage about the local network to the upstream DNS servers.
+.TP
 .B local\-zone: \fI<zone> <type>
 Configure a local zone. The type determines the answer to give if
 there is no match from local\-data. The types are deny, refuse, static,
diff --git a/contrib/unbound/freebsd-configure.sh b/contrib/unbound/freebsd-configure.sh
index 46dc53a30742..c8852e7fee18 100755
--- a/contrib/unbound/freebsd-configure.sh
+++ b/contrib/unbound/freebsd-configure.sh
@@ -32,13 +32,6 @@ autoheader
 	--with-run-dir=/var/unbound \
 	--with-username=unbound
 
-# Regenerate the configuration parser
-{
-cat <<EOF
-#include "config.h"
-#include "util/configyyrename.h"
-EOF
-/usr/bin/flex -L -t util/configlexer.lex
-} >util/configlexer.c
-
-/usr/bin/yacc -d -o util/configparser.c util/configparser.y
+# Don't try to provide bogus memory usage statistics based on sbrk(2).
+sed -n -i.orig -e '/HAVE_SBRK/!p' config.status
+./config.status config.h
diff --git a/contrib/unbound/services/localzone.c b/contrib/unbound/services/localzone.c
index ac889799b430..a1688e1c6d0c 100644
--- a/contrib/unbound/services/localzone.c
+++ b/contrib/unbound/services/localzone.c
@@ -594,6 +594,8 @@ lz_enter_defaults(struct local_zones* zones, struct config_file* cfg)
 
 	/* this list of zones is from RFC 6303 */
 
+	/* block localhost level zones, first, later the LAN zones */
+
 	/* localhost. zone */
 	if(!lz_exists(zones, "localhost.") &&
 		!lz_nodefault(cfg, "localhost.")) {
@@ -650,6 +652,14 @@ lz_enter_defaults(struct local_zones* zones, struct config_file* cfg)
 		}
 		lock_rw_unlock(&z->lock);
 	}
+
+	/* if unblock lan-zones, then do not add the zones below.
+	 * we do add the zones above, about 127.0.0.1, because localhost is
+	 * not on the lan. */
+	if(cfg->unblock_lan_zones)
+		return 1;
+
+	/* block LAN level zones */
 	if (	!add_as112_default(zones, cfg, "10.in-addr.arpa.") ||
 		!add_as112_default(zones, cfg, "16.172.in-addr.arpa.") ||
 		!add_as112_default(zones, cfg, "17.172.in-addr.arpa.") ||
diff --git a/contrib/unbound/util/config_file.c b/contrib/unbound/util/config_file.c
index 346610945ab6..f8341ccecb2a 100644
--- a/contrib/unbound/util/config_file.c
+++ b/contrib/unbound/util/config_file.c
@@ -48,7 +48,7 @@
 #include "util/log.h"
 #include "util/configyyrename.h"
 #include "util/config_file.h"
-#include "util/configparser.h"
+#include "configparser.h"
 #include "util/net_help.h"
 #include "util/data/msgparse.h"
 #include "util/module.h"
@@ -191,6 +191,7 @@ config_create(void)
 	cfg->local_zones = NULL;
 	cfg->local_zones_nodefault = NULL;
 	cfg->local_data = NULL;
+	cfg->unblock_lan_zones = 0;
 	cfg->python_script = NULL;
 	cfg->remote_control_enable = 0;
 	cfg->control_ifs = NULL;
@@ -414,6 +415,7 @@ int config_set_option(struct config_file* cfg, const char* opt,
 	else S_YNO("minimal-responses:", minimal_responses)
 	else S_YNO("rrset-roundrobin:", rrset_roundrobin)
 	else S_STRLIST("local-data:", local_data)
+	else S_YNO("unblock-lan-zones:", unblock_lan_zones)
 	else S_YNO("control-enable:", remote_control_enable)
 	else S_STRLIST("control-interface:", control_ifs)
 	else S_NUMBER_NONZERO("control-port:", control_port)
@@ -678,6 +680,7 @@ config_get_option(struct config_file* cfg, const char* opt,
 	else O_UNS(opt, "val-override-date", val_date_override)
 	else O_YNO(opt, "minimal-responses", minimal_responses)
 	else O_YNO(opt, "rrset-roundrobin", rrset_roundrobin)
+	else O_YNO(opt, "unblock-lan-zones", unblock_lan_zones)
 	else O_DEC(opt, "max-udp-size", max_udp_size)
 	else O_STR(opt, "python-script", python_script)
 	else O_DEC(opt, "val-sig-skew-min", val_sig_skew_min)
diff --git a/contrib/unbound/util/config_file.h b/contrib/unbound/util/config_file.h
index 8515eefda423..f041df1051e6 100644
--- a/contrib/unbound/util/config_file.h
+++ b/contrib/unbound/util/config_file.h
@@ -273,6 +273,8 @@ struct config_file {
 	struct config_strlist* local_zones_nodefault;
 	/** local data RRs configged */
 	struct config_strlist* local_data;
+	/** unblock lan zones (reverse lookups for 10/8 and so on) */
+	int unblock_lan_zones;
 
 	/** remote control section. enable toggle. */
 	int remote_control_enable;
diff --git a/contrib/unbound/util/configlexer.c b/contrib/unbound/util/configlexer.c
deleted file mode 100644
index 723a0431d660..000000000000
--- a/contrib/unbound/util/configlexer.c
+++ /dev/null
@@ -1,3614 +0,0 @@
-#include "config.h"
-#include "util/configyyrename.h"
-
-#line 3 "<stdout>"
-
-#define  YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 37
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-#if defined(__FreeBSD__)
-#ifndef __STDC_LIMIT_MACROS
-#define	__STDC_LIMIT_MACROS
-#endif
-#include <sys/cdefs.h>
-#include <stdint.h>
-#else
-#define	__dead2
-#endif
-
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined(__FreeBSD__) || \
-    (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-
-#endif /* ! C99 */
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN (yy_start) = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START (((yy_start) - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin  )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE 16384
-#endif
-
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-extern yy_size_t yyleng;
-
-extern FILE *yyin, *yyout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
-		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, (yytext_ptr)  )
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	yy_size_t yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-
-	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
-#define yy_current_buffer YY_CURRENT_BUFFER
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void yyrestart (FILE *input_file  );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
-
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
-
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
-
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len  );
-
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-/* Begin user sect3 */
-
-typedef unsigned char YY_CHAR;
-
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-
-typedef int yy_state_type;
-
-extern int yylineno;
-
-int yylineno = 1;
-
-extern char *yytext;
-#define yytext_ptr yytext
-
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  ) __dead2;
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	(yytext_ptr) -= (yy_more_len); \
-	yyleng = (size_t) (yy_cp - (yytext_ptr)); \
-	(yy_hold_char) = *yy_cp; \
-	*yy_cp = '\0'; \
-	(yy_c_buf_p) = yy_cp;
-
-#define YY_NUM_RULES 146
-#define YY_END_OF_BUFFER 147
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_accept[1383] =
-    {   0,
-        1,    1,  128,  128,  132,  132,  136,  136,  140,  140,
-        1,    1,  147,  144,    1,  126,  126,  145,    2,  145,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  128,
-      129,  129,  130,  145,  132,  133,  133,  134,  145,  139,
-      136,  137,  137,  138,  145,  140,  141,  141,  142,  145,
-      143,  127,    2,  131,  145,  143,  144,    0,    1,    2,
-        2,    2,    2,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  128,    0,  132,    0,  139,    0,  136,  140,    0,
-      143,    0,    2,    2,  143,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      143,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  143,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,   65,  144,  144,
-
-      144,  144,  144,    6,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  143,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  143,
-      144,  144,  144,  144,   29,  144,  144,  144,  144,  144,
-      144,   12,   13,  144,   15,   14,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  121,  144,  144,  144,  144,  144,    3,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  143,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  135,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-       32,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-       33,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,   80,  135,
-
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,   79,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,   63,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,   20,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,   30,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-
-      144,  144,  144,  144,  144,  144,   31,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,   22,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,   26,  144,   27,  144,  144,  144,   66,  144,
-       67,  144,   64,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,    5,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-
-      144,   82,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,   23,  144,  144,  144,  144,
-      107,  106,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,   34,  144,  144,  144,  144,  144,  144,  144,  144,
-       69,   68,  144,  144,  144,  144,  144,  144,  103,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,   50,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-
-       54,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  105,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,    4,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      100,  144,  144,  144,  144,  144,  144,  144,  115,  101,
-      144,   21,  144,  144,  144,  144,   71,  144,   72,   70,
-      144,  144,  144,  144,  144,  144,   78,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  102,  144,  144,  144,
-
-      144,  125,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,   62,  144,  144,  144,  144,  144,  144,
-      144,  144,   28,  144,  144,   17,  144,  144,  144,   16,
-      144,   87,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,   41,   42,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,   73,  144,  144,  144,
-      144,  144,   77,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,   81,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  120,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-
-      144,  144,  144,  144,  144,   91,  144,   95,  144,  144,
-      144,  144,   76,  144,  144,  113,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,   94,
-      144,  144,  144,  144,   43,   44,  144,   49,   96,  144,
-      108,  104,  144,  144,   37,  144,   98,  144,  144,  144,
-      144,  144,    7,  144,   61,  112,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-       83,  144,  144,  122,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,  144,  144,   97,  144,   36,   38,
-
-      144,  144,  144,  144,  144,   60,  144,  144,  144,  144,
-      116,   18,   19,  144,  144,  144,  144,  144,  144,   58,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  118,
-      144,  144,   35,  144,  144,  144,  144,  144,  144,   11,
-      144,  144,  144,  144,  144,  144,  144,   10,  144,  144,
-       39,  144,  124,  117,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  144,   90,   89,  144,  119,  114,  144,
-      144,  144,  144,  144,  144,  144,  144,  144,  144,   45,
-      144,  123,  144,  144,  144,  144,   40,  144,  144,  144,
-       84,   86,  144,  144,  144,   88,  144,  144,  144,  144,
-
-      144,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-       24,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      144,  144,  144,  111,  144,  144,  144,  144,  144,  144,
-      144,   25,  144,    9,  144,  144,  109,   51,  144,  144,
-      144,   93,  144,   74,  144,  144,  144,   53,   57,   52,
-      144,   46,  144,    8,  144,  144,   92,  144,  144,  144,
-       56,  144,   47,  144,  110,  144,  144,   85,   75,   55,
-       48,  144,  144,  144,  144,   59,  144,  144,  144,  144,
-       99,    0
-    } ;
-
-static yyconst flex_int32_t yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    5,    6,    1,    1,    1,    7,    1,
-        1,    1,    1,    1,    8,    1,    1,    1,    1,    1,
-        9,   10,    1,   11,    1,    1,    1,   12,    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,
-        1,   13,    1,    1,    1,    1,   14,   15,   16,   17,
-
-       18,   19,   20,   21,   22,   23,   24,   25,   26,   27,
-       28,   29,   30,   31,   32,   33,   34,   35,   36,   37,
-       38,   39,    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,    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,    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,    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,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst flex_int32_t yy_meta[40] =
-    {   0,
-        1,    2,    3,    4,    5,    1,    6,    1,    1,    1,
-        1,    7,    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
-    } ;
-
-static yyconst flex_int16_t yy_base[1397] =
-    {   0,
-        0,    0,   37,   40,   44,   51,   63,   75,   56,   68,
-       87,  108, 2653, 2569,   50, 2760, 2760, 2760,  129,   94,
-       70,  104,  122,   90,   92,  115,  126,   95,   84,  132,
-      135,  138,   50,  146,  148,  157,  167,  160,  151, 2566,
-     2760, 2760, 2760,   70, 2404, 2760, 2760, 2760,   42, 2139,
-     1931, 2760, 2760, 2760,  189, 1601, 2760, 2760, 2760,  195,
-     1479, 2760,  199, 2760,  203,  111,  635,  209,  120,    0,
-      220,    0,    0,  103,  141,  149,  202,  189,  182,  204,
-      206,  210,  218,  215,  217,  221,  222,  223,  225,  228,
-      235,  248,  165,  244,  247,  233,  245,  252,  246,  251,
-
-      258,  260,  261,  262,  267,  263,  270,  271,  158,  274,
-      276,  280,  277,  278,  282,  286,  283,   49,  287,  291,
-      288,  588,  304,  558,  307,  386,  316,  354,  297,  320,
-      236,  324,  328,    0,  321,  309,  330,  323,  226,  326,
-      327,  334,  331,  337,  348,  339,  342,  344,  333,  346,
-      353,  345,  351,  355,  354,  360,  363,  371,  373,  379,
-      375,  382,  383,  381,  380,  392,  393,  399,  400,  396,
-      402,  384,  405,  385,  406,  397,  409,  410,  413,  418,
-      421,  419,  420,  417,  428,  425,  426,  438,  445,  430,
-      431,  434,  442,  446,  447,  448,  451,  454,  455,  457,
-
-      458,  464,  461,  466,  467,  468,  473,  476,  474,  478,
-      484,  490,  475,  483,  486,  487,  491,  493,  494,  496,
-      502,  503,  504,  505,  509,  499,  510,  512,  526,  514,
-      527,  515,  519,  531,  537,  533,  541,  539,  543,  549,
-      545,  546,  547,  548,  553,  555,  561,  566,  557,  559,
-      567,  570,  568,  590,  560,  576,  577,  580,  586,  583,
-      596,  587,  595,  597,  613,  594,  611,  615,  619,  618,
-      584,  621,  622,  624,  517,  623,  628,  630,  631,  627,
-      629,  634,  649,  645,  646,  648,  647,  654,  661,  657,
-      658,  659,  662,  663,  665,  668,  672, 2760,  674,  669,
-
-      676,  677,  679, 2760,  680,  681,  682,  683,  685,  692,
-      694,  695,  697,  698,  699,  703,  704,  705,  725,  707,
-      706,  716,  709,  734,  713,  736,  715,  728,  732,  723,
-      739,  743,  710,  744,  745,  746,  754,  752,  753,  755,
-      757,  758,  762,  766,  765,  772,  773,  777,  779,  787,
-      784,  789,  790,  781,  791,  793,  799,  800,  798,  792,
-      806,  805,  795,  808,  813,  807,  822,  815,  818,  819,
-      826,  827,  828,  830,  829,  837,  836,  835,  844,  834,
-      843,  848,  849,  850,  851,  860,  857,  858,  863,  869,
-      870,  865,  871,  874,  875,  876,  877,  878,  879,  883,
-
-      885,  886,  894,  880,  890,  896,  902,  904,  887,  905,
-      908,  909,  910,  911,  919,  912,  921,  913,  923,  926,
-      929,  934,  925,  935, 2760,  945,  939,  941,  933,  759,
-      927, 2760, 2760,  947, 2760, 2760,  948,  949,  950,  961,
-      965,  958,  952,  960,  959,  974,  968,  978,  966,  986,
-      988,  971,  980,  982,  989,  992,  990,  994,  998,  996,
-     1004, 1007, 1006, 1008, 1010, 1011, 1013, 1015, 1016, 1022,
-     1017, 1029, 1026, 2760, 1027, 1028, 1032, 1034, 1035, 2760,
-     1036, 1039, 1037, 1040, 1041, 1047, 1043, 1050, 1048, 1051,
-     1053, 1055, 1059, 1056, 1061, 1073, 1074, 1064, 1072, 1077,
-
-     1071, 1079, 1086, 1085, 1087, 1089, 1095, 1091, 1094, 1097,
-     1098, 1099, 1100, 1101, 1104, 1126, 1106, 1107, 1108, 1109,
-     1114, 1115, 1116, 1117, 1132, 1138, 1140, 1120, 1141, 1147,
-     1149, 1143, 1152, 1150, 1156, 1157, 2760, 1163, 1159, 1160,
-     1165, 1167, 1168, 1112, 1170, 1171, 1173, 1174, 1175, 1182,
-     2760, 1180, 1183, 1181, 1185, 1186, 1192, 1194, 1204, 1200,
-     2760, 1207, 1208, 1210, 1211, 1198, 1214, 1215, 1216, 1219,
-     1222, 1223, 1225, 1230, 1232, 1220, 1234, 1227, 1233, 1235,
-     1240, 1242, 1243, 1244, 1246, 1250, 1256, 1259, 1257, 1264,
-     1258, 1260, 1266, 1269, 1267, 1270, 1268, 1271, 2760,  175,
-
-     1275, 1273, 1280, 1281, 1291, 1290, 1283, 1284, 1294, 1292,
-     1293, 1282, 1303, 1304, 1305, 1306, 1309, 1310, 1312, 1313,
-     1316, 1318, 1319, 1320, 1321, 1323, 1324, 1329, 1326, 1327,
-     1330, 2760, 1343, 1336, 1337, 1346, 1348, 1356, 1349, 1352,
-     1354, 1362, 1358, 1364, 1367, 1360, 1370, 1371, 1373, 1374,
-     1380, 1382, 1378, 1381, 1384, 1386, 2760, 1390, 1388, 1389,
-     1391, 1395, 1396, 1399, 1401, 1406, 1409, 1410, 1412, 2760,
-     1415, 1416, 1417, 1423, 1420, 1427, 1424, 1433, 1428, 1430,
-     1434, 1438, 1437, 1439, 1444, 2760, 1446, 1452, 1449, 1458,
-     1450, 1456, 1457, 1461, 1462, 1463, 1469, 1465, 1467, 1466,
-
-     1470, 1472, 1473, 1476, 1474, 1478, 2760, 1496, 1477, 1481,
-     1488, 1489, 1480, 1501, 1490, 1502, 1504, 1509, 1506, 1510,
-     1512, 1511, 1513, 1514, 1517, 1520, 1522, 1528, 1534, 1535,
-     1536, 2760, 1539, 1540, 1527, 1542, 1549, 1547, 1550, 1551,
-     1552, 1553, 1554, 1562, 1555, 1556, 1558, 1563, 1559, 1564,
-     1565, 1566, 1571, 1579, 1568, 1584, 1586, 1588, 1589, 1591,
-     1590, 1597, 2760, 1596, 2760, 1598, 1599, 1607, 2760, 1605,
-     2760, 1609, 2760, 1612, 1616, 1611, 1613, 1618, 1619, 1621,
-     1622, 1624, 1627, 1628, 1629, 1631, 1630, 2760, 1636, 1632,
-     1640, 1637, 1643, 1644, 1645, 1648, 1656, 1652, 1655, 1659,
-
-     1660, 2760, 1662, 1661, 1665, 1675, 1673, 1671, 1676, 1677,
-     1678, 1679, 1680, 1682, 1687, 1688, 1684, 1690, 1691, 1696,
-     1694, 1698, 1699, 1700, 1701, 2760, 1703, 1709, 1712, 1711,
-     2760, 2760, 1714, 1723, 1725, 1715, 1728, 1717, 1729, 1733,
-     1739, 1744, 1732, 1735, 1740, 1745, 1746, 1747, 1749, 1751,
-     1754, 2760, 1760, 1756, 1762, 1763, 1753, 1766, 1764, 1775,
-     2760, 2760, 1768, 1770, 1779, 1780, 1782, 1785, 2760, 1781,
-     1786, 1787, 1788, 1789, 1791, 1795, 1796, 1805, 1802, 1807,
-     1808, 1814, 1810, 1806, 1815, 1813, 1826, 2760, 1823, 1828,
-     1834, 1817, 1830, 1831, 1836, 1833, 1840, 1842, 1848, 1844,
-
-     2760, 1850, 1837, 1857, 1846, 1859, 1860, 1867, 1854, 1856,
-     1863, 1864, 1865, 1870, 1872, 1874, 1877, 2760, 1878, 1880,
-     1881, 1882, 1885, 1888, 1890, 1892, 1893, 2760, 1895, 1904,
-     1901, 1903, 1906, 1902, 1908, 1911, 1912, 1913, 1915, 1916,
-     1919, 1924, 1925, 1934, 1926, 1929, 1940, 1938, 1949, 1950,
-     1939, 1957, 1942, 1955, 1946, 1953, 1961, 1960, 1967, 1963,
-     2760, 1965, 1970, 1972, 1973, 1976, 1974, 1977, 2760, 2760,
-     1983, 2760, 1984, 1987, 1988, 1989, 2760, 1991, 2760, 2760,
-     1992, 1999, 1993, 2000, 1964, 2003, 2760, 2004, 2007, 2008,
-     2012, 2013, 2014, 2016, 2015, 2017, 2760, 2018, 2019, 2020,
-
-     2022, 2760, 2029, 2035, 2024, 2036, 2040, 2039, 2046, 2045,
-     2032, 2053, 2049, 2760, 2047, 2055, 2057, 2058, 2059, 2060,
-     2064, 2065, 2760, 2067, 2074, 2760, 2075, 2061, 2076, 2760,
-     2078, 2760, 2080, 2082, 2085, 2090, 2087, 2098, 2083, 2091,
-     2099, 2093, 2101, 2103, 2760, 2760, 2105, 2109, 2112, 2110,
-     2115, 2117, 2116, 2118, 2119, 2124, 2760, 2125, 2127, 2126,
-     2128, 2129, 2760, 2133, 2134, 2135, 2138, 2141, 2153, 2155,
-     2144, 2159, 2161, 2156, 2163, 2165, 2166, 2760, 2167, 2169,
-     2170, 2174, 2176, 2130, 2177, 2181, 2179, 2171, 2184, 2760,
-     2187, 2188, 2191, 2193, 2195, 2196, 2198, 2199, 2200, 2203,
-
-     2204, 2206, 2209, 2210, 2213, 2760, 2211, 2760, 2216, 2226,
-     2229, 2232, 2760, 2220, 2222, 2760, 2236, 2237, 2244, 2245,
-     2247, 2252, 2248, 2238, 2255, 2240, 2256, 2262, 2263, 2760,
-     2230, 2265, 2264, 2266, 2760, 2760, 2273, 2760, 2760, 2276,
-     2760, 2760, 2277, 2279, 2760, 2281, 2760, 2288, 2284, 2271,
-     2267, 2286, 2760, 2293, 2760, 2760, 2290, 2294, 2297, 2298,
-     2300, 2302, 2305, 2306, 2307, 2308, 2309, 2310, 2312, 2314,
-     2315, 2228, 2316, 2317, 2319, 2323, 2326, 2328, 2329, 2339,
-     2760, 2327, 2340, 2760, 2347, 2342, 2335, 2331, 2348, 2352,
-     2353, 2355, 2361, 2358, 2357, 2359, 2760, 2362, 2760, 2760,
-
-     2360, 2364, 2370, 2363, 2365, 2760, 2375, 2371, 2385, 2387,
-     2760, 2760, 2760, 2388, 2377, 2382, 2392, 2393, 2394, 2760,
-     2395, 2396, 2400, 2403, 2407, 2409, 2416, 2413, 2415, 2760,
-     2417, 2419, 2760, 2420, 2421, 2424, 2426, 2427, 2429, 2760,
-     2425, 2430, 2437, 2432, 2440, 2442, 2443, 2760, 2445, 2446,
-     2760, 2452, 2760, 2760, 2447, 2455, 2457, 2462, 2464, 2453,
-     2458, 2470, 2469, 2473, 2760, 2760, 2474, 2760, 2760, 2466,
-     2475, 2476, 2478, 2481, 2482, 2484, 2486, 2489, 2488, 2760,
-     2490, 2760, 2491, 2500, 2492, 2494, 2760, 2501, 2502, 2505,
-     2760, 2760, 2506, 2515, 2513, 2760, 2518, 2517, 2519, 2520,
-
-     2525, 2527, 2521, 2528, 2531, 2529, 2507, 2532, 2541, 2543,
-     2760, 2545, 2542, 2546, 2550, 2553, 2554, 2555, 2556, 2558,
-     2559, 2561, 2563, 2760, 2564, 2565, 2575, 2580, 2584, 2572,
-     2586, 2760, 2587, 2760, 2590, 2591, 2760, 2760, 2592, 2594,
-     2597, 2760, 2598, 2760, 2581, 2605, 2595, 2760, 2760, 2760,
-     2607, 2760, 2608, 2760, 2610, 2611, 2760, 2613, 2615, 2617,
-     2760, 2619, 2760, 2621, 2760, 2622, 2623, 2760, 2760, 2760,
-     2760, 2625, 2627, 2633, 2628, 2760, 2630, 2635, 2636, 2639,
-     2760, 2760, 2668, 2675, 2682, 2689, 2696,   94, 2703, 2710,
-     2717, 2724, 2731, 2738, 2745, 2752
-
-    } ;
-
-static yyconst flex_int16_t yy_def[1397] =
-    {   0,
-     1382,    1, 1383, 1383, 1384, 1384, 1385, 1385, 1386, 1386,
-     1387, 1387, 1382, 1388, 1382, 1382, 1382, 1382, 1389, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1390,
-     1382, 1382, 1382, 1390, 1391, 1382, 1382, 1382, 1391, 1392,
-     1382, 1382, 1382, 1382, 1392, 1393, 1382, 1382, 1382, 1393,
-     1394, 1382, 1395, 1382, 1394, 1394, 1388, 1388, 1382, 1396,
-     1389, 1396, 1389, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1390, 1390, 1391, 1391, 1392, 1392, 1382, 1393, 1393,
-     1394, 1394, 1395, 1395, 1394, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1394, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1394, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388,
-
-     1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1394, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1394,
-     1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388,
-     1388, 1382, 1382, 1388, 1382, 1382, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1382,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1394,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1394,
-
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-
-     1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1382, 1388, 1382, 1388, 1388, 1388, 1382, 1388,
-     1382, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-
-     1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388,
-     1382, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1382, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-
-     1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1382,
-     1388, 1382, 1388, 1388, 1388, 1388, 1382, 1388, 1382, 1382,
-     1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388,
-
-     1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1382, 1388, 1388, 1382, 1388, 1388, 1388, 1382,
-     1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1382, 1382, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388,
-     1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-
-     1388, 1388, 1388, 1388, 1388, 1382, 1388, 1382, 1388, 1388,
-     1388, 1388, 1382, 1388, 1388, 1382, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382,
-     1388, 1388, 1388, 1388, 1382, 1382, 1388, 1382, 1382, 1388,
-     1382, 1382, 1388, 1388, 1382, 1388, 1382, 1388, 1388, 1388,
-     1388, 1388, 1382, 1388, 1382, 1382, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1382, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1382, 1382,
-
-     1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388,
-     1382, 1382, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1382,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382,
-     1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388, 1382,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382, 1388, 1388,
-     1382, 1388, 1382, 1382, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1388, 1382, 1382, 1388, 1382, 1382, 1388,
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1382,
-     1388, 1382, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388,
-     1382, 1382, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388,
-
-     1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1382, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388, 1388, 1388,
-     1388, 1382, 1388, 1382, 1388, 1388, 1382, 1382, 1388, 1388,
-     1388, 1382, 1388, 1382, 1388, 1388, 1388, 1382, 1382, 1382,
-     1388, 1382, 1388, 1382, 1388, 1388, 1382, 1388, 1388, 1388,
-     1382, 1388, 1382, 1388, 1382, 1388, 1388, 1382, 1382, 1382,
-     1382, 1388, 1388, 1388, 1388, 1382, 1388, 1388, 1388, 1388,
-     1382,    0, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382,
-     1382, 1382, 1382, 1382, 1382, 1382
-
-    } ;
-
-static yyconst flex_int16_t yy_nxt[2800] =
-    {   0,
-       14,   15,   16,   17,   18,   19,   18,   14,   14,   14,
-       14,   18,   20,   21,   14,   22,   23,   24,   25,   14,
-       26,   27,   28,   29,   30,   31,   32,   33,   34,   14,
-       35,   36,   37,   38,   39,   14,   14,   14,   14,   41,
-       42,   43,   41,   42,   43,  124,   46,   47,  124,   44,
-       48,   69,   44,   46,   47,   70,   49,   48,   57,   58,
-       59,   68,   68,   49,   51,   52,   53,   54,   60,   18,
-       57,   58,   59,  122,  122,   55,   51,   52,   53,   54,
-       60,   18,   68,  103,  187,   74,   75,   55,   15,   16,
-       17,   62,   63,   64,   67,   67,   68,   67,   67,   65,
-
-       67,   94,   68,   76,   68,   67,   84,   68,   66,   15,
-       16,   17,   62,   63,   64,   68,   68,   77,  136,   86,
-       65,   69,   93,  132,   78,   70,   85,   68,   87,   66,
-       72,   79,   72,   72,   68,   72,   88,  135,   68,   80,
-       72,   73,   89,   81,   68,   90,   82,   68,   96,   83,
-       68,  100,   91,   68,   92,  101,   97,  137,   68,   95,
-       68,   68,   98,   68,  120,  108,   99,  104,  121,   68,
-       68,  102,   68,  105,  111,  109,  106,   68,  110,   68,
-      115,  138,  116,  107,  112,  177,  118,  132,  113,  114,
-      126,  119,  126,  126,   68,  126,  158,  117,  129,  129,
-
-       72,   68,   72,   72,  131,   72,  131,  131,  141,  131,
-       67,  134,   67,   67,   68,   67,   68,  139,   68,  140,
-       67,   72,   68,   72,   72,  145,   72,   68,  142,   68,
-       68,   72,   73,   68,   68,   68,  143,   68,   68,  151,
-       68,  147,  152,  146,  144,   68,  195,   68,  132,  148,
-      154,  149,  150,  155,  153,  157,   68,   68,   68,   68,
-       68,  159,  161,   68,   68,  166,  162,  156,  165,  163,
-       68,  164,   68,   68,   68,   68,  167,  168,  171,   68,
-      173,  160,   68,   68,  174,  169,   68,  180,   68,   68,
-       68,  182,   68,  170,   68,   68,  176,  172,   68,   68,
-
-       68,  181,  175,   68,  188,  178,  179,  122,  122,  130,
-      124,  183,  184,  124,  185,  189,  186,  126,  190,  126,
-      126,   68,  126,  129,  129,  131,  192,  131,  131,   72,
-      131,   72,   72,  132,   72,   68,  191,  193,   68,   68,
-      134,  198,   68,   68,  201,   68,   68,  199,  200,   68,
-      194,   68,  207,  196,   68,  128,   68,   68,   68,  197,
-       68,  209,  211,   68,  202,   68,   68,   68,  210,  203,
-      212,  213,   68,  208,  204,   68,  219,  218,  214,  215,
-      205,  206,  216,   68,  217,   68,  222,   68,  223,  224,
-      226,   68,   68,   68,   68,   68,   68,   68,  127,  229,
-
-      225,  221,  227,  220,   68,   68,  231,  232,   68,   68,
-      230,   68,   68,  228,   68,  233,  235,   68,   68,  237,
-      234,   68,   68,  236,  239,   68,  238,  241,  245,   68,
-       68,   68,   68,   68,  247,  249,  248,   68,   68,  251,
-       68,  240,   68,  132,  255,  252,   68,  242,  243,  244,
-       68,  246,  254,  260,   68,  257,  250,   68,   68,   68,
-       68,  256,  259,   68,  261,  258,   68,   68,  253,   68,
-       68,  267,  266,   68,  264,  262,   68,  268,   68,   68,
-       68,  263,  271,  274,  272,   68,   68,   68,   68,  269,
-       68,  276,  265,  270,  273,   68,   68,  278,   68,   68,
-
-      275,  277,   68,   68,  283,   68,   68,  279,   68,  287,
-      285,   68,  282,  280,   68,   68,   68,   68,  288,  281,
-      286,   68,   68,  284,   68,  298,   68,   68,  289,   68,
-      292,   68,  293,  355,  290,  294,  295,  291,   68,   68,
-      296,  297,  299,   68,  300,   68,  302,  301,  304,   68,
-      305,   68,  303,   68,  306,   68,  309,   68,   68,   68,
-       68,   68,  312,  311,  313,   68,  307,   68,  319,   68,
-      125,   68,   68,   68,  314,  308,  318,  310,   68,   68,
-       68,  315,   68,  320,  316,  324,  317,  334,   68,  132,
-      321,  322,   68,  323,  326,   68,   68,  335,   68,   68,
-
-      123,  325,   68,  340,  327,  328,   68,   68,   68,   68,
-      336,  337,  351,  338,  329,  339,  330,  331,  332,  341,
-      344,  333,  342,   68,  343,   68,  345,   68,  348,  349,
-       68,   68,  347,   68,   68,   68,   68,  346,  354,   68,
-       68,   68,   68,   68,  361,  362,   68,   68,  353,  352,
-      350,  358,  360,  356,  357,  363,  364,   68,   68,   68,
-       68,   68,  366,  365,  359,  367,   68,  369,  370,   68,
-       68,   68,  368,   68,   68,   68,  375,   68,  374,  372,
-       68,   68,  376,  373,   68,  378,   68,  379,   68,   68,
-      371,   68,   68,   68,   68,   68,  381,   68,  382,  389,
-
-      387,  377,  380,  383,   68,  388,   68,   68,  386,   68,
-       68,   68,  384,  385,  393,   68,   68,   68,   68,   68,
-      395,   68,   68,  405,  390,   68,  394,   68,   68,  391,
-      392,  417,  396,  406,  404,   68,  397,   68,  398,  403,
-       68,  407,  411,  399,   68,  400,   68,  408,   68,  410,
-      409,   68,  412,  401,  414,   68,   68,   68,  132,  413,
-      416,  421,  420,  402,   68,   68,   68,   68,  425,   68,
-       68,   68,  419,  415,   68,  418,  422,   68,   68,  520,
-      424,  428,  426,  423,   68,   68,  427,  430,  432,   68,
-      433,   68,  429,   68,  434,  435,   68,  437,  431,   68,
-
-      436,   68,   68,   68,   68,   68,  441,   68,  439,  440,
-       68,   68,   68,  445,  438,  443,  442,   68,   68,   68,
-       68,  447,  446,  448,  444,   68,  451,   68,  449,  453,
-       68,   68,  450,  455,   68,  456,  454,  452,   68,   68,
-       68,   68,   68,  458,  463,  460,   68,   68,   68,   68,
-      465,  467,  459,  462,  464,   68,   68,  457,  461,  466,
-       68,   68,   68,   68,  475,  471,  470,  473,  472,   68,
-       68,  474,   68,  468,  469,   68,  479,   68,  477,  476,
-      480,   68,   68,   68,  481,  483,   68,   68,   68,   68,
-       68,   68,   68,  478,  488,   68,  482,   68,   68,   68,
-
-      489,  493,   68,  495,  484,  485,   68,  486,   68,  487,
-      490,  494,  496,  492,   68,  491,   68,   68,  499,  497,
-       68,   68,   68,   68,   68,   68,  502,  501,  504,  503,
-      500,   68,  498,   68,  508,   68,  505,   68,  132,   68,
-      507,   68,  506,  510,  511,   68,   68,   68,  514,  509,
-      512,   68,  516,   68,  521,  517,  515,   68,  513,   68,
-       68,   68,   68,  519,   68,  518,  525,  524,  526,  523,
-       68,   68,   68,   68,  536,  533,  522,   68,   68,  527,
-       68,  528,  534,   68,  529,  537,   68,  538,  543,  530,
-       68,  539,   68,  540,   68,  531,  532,  535,   68,  541,
-
-       68,   68,   68,  542,   68,  547,   68,  551,   68,  546,
-       68,  552,  544,  545,  553,  550,   68,  548,   68,   68,
-       68,  554,   68,   68,  549,   68,  555,   68,   68,   68,
-      556,  557,  559,  561,   68,  560,  563,  562,   68,   68,
-       68,   68,  565,  558,   68,  567,   68,   68,   68,   68,
-      569,   68,   68,   68,  566,   68,  572,  564,  570,   68,
-       68,  568,   68,   68,  577,   68,  578,   68,   68,  571,
-      573,   68,  574,   68,  581,  575,   68,  583,  579,  576,
-      586,  582,  580,   68,   68,   68,   68,  585,  584,   68,
-      587,   68,  592,  593,  590,  588,  589,   68,   68,   68,
-
-      594,   68,  597,   68,  591,  599,   68,   68,  600,  132,
-       68,   68,   68,   68,  596,  602,   68,  595,   68,   68,
-       68,   68,  611,  598,   68,  601,   68,   68,   68,   68,
-      605,  603,   68,  640,  612,  618,  614,  604,   68,  619,
-      615,  606,  617,  607,   68,  613,  625,  608,  616,  609,
-       68,  620,   68,   68,  610,   68,  621,  624,  622,   68,
-      627,   68,   68,  629,   68,  626,  628,  632,   68,   68,
-      634,   68,   68,  633,  635,   68,  623,   68,  630,   68,
-       68,  631,   68,   68,  638,   68,   68,   68,  642,  646,
-      637,  636,   68,   68,   68,   68,  645,   68,   68,  639,
-
-      644,  641,  650,  651,   68,  643,   68,  655,  649,  652,
-       68,  647,   68,  648,  656,  653,   68,  654,  657,   68,
-       68,  658,   68,   68,  659,  660,   68,   68,   68,  663,
-      662,   68,   68,  665,   68,   68,  666,   68,  661,   68,
-      667,  670,   68,  669,   68,   68,   68,   68,  664,  673,
-      672,  668,   68,  671,   68,   68,   68,  674,   68,  678,
-      679,  681,   68,  683,  675,  677,  684,  676,   68,   68,
-       68,   68,   68,  682,  680,  686,   68,  690,   68,   68,
-       68,   68,   68,   68,  685,   68,  688,   68,  698,  687,
-      689,  692,   68,   68,   68,   68,   68,  691,  699,  693,
-
-      696,  695,   68,   68,   68,   68,   68,  700,  694,  701,
-      702,  703,  697,  706,  707,   68,   68,   68,   68,  704,
-      705,   68,   68,  710,   68,   68,  709,  712,   68,  714,
-       68,   68,   68,   68,  708,   68,   68,  715,   68,   68,
-      711,   68,   68,  713,  718,  716,  717,  722,   68,   68,
-      726,  725,  719,  723,  721,   68,  720,  728,   68,  724,
-       68,   68,  727,  731,   68,  730,   68,  732,   68,  736,
-       68,  737,   68,  740,   68,  735,   68,  734,  729,   68,
-      733,  738,   68,   68,  739,   68,   68,  745,  742,  746,
-       68,  741,   68,   68,   68,  747,   68,  748,   68,  743,
-
-       68,   68,   68,   68,  744,  749,  754,   68,   68,  753,
-      750,   68,  751,   68,  752,  755,  759,  757,   68,  756,
-      763,   68,   68,  765,   68,  760,  758,   68,   68,   68,
-      766,  761,   68,  767,  769,   68,   68,  764,  771,   68,
-       68,  772,   68,  762,  773,   68,   68,  775,  768,   68,
-       68,   68,  770,  781,  776,  777,   68,  779,   68,  782,
-      774,   68,   68,  780,   68,  784,  783,  778,   68,   68,
-       68,  785,  788,   68,   68,   68,  791,   68,   68,   68,
-      787,   68,   68,  795,   68,   68,   68,  786,   68,   68,
-       68,  132,   68,   68,  789,  800,  794,  792,  790,  793,
-
-       68,   68,   68,  801,  796,  805,  798,  802,   68,  799,
-      797,  804,  807,   68,   68,  803,   68,  808,   68,  806,
-      809,   68,   68,   68,   68,   68,   68,  814,  816,   68,
-      811,  815,   68,  810,   68,  818,  812,  813,  820,   68,
-       68,  823,  824,  817,  819,  822,   68,   68,   68,  825,
-      826,   68,   68,  828,   68,  821,  830,  827,  832,   68,
-      831,   68,   68,   68,   68,   68,   68,   68,   68,  838,
-       68,   68,  837,  829,   68,   68,   68,   68,   68,  846,
-       68,  833,  834,   68,  836,  843,  839,  840,  847,  841,
-      835,   68,  845,  849,  842,  848,   68,  844,   68,  852,
-
-       68,   68,   68,   68,  856,  850,  853,  854,   68,   68,
-       68,   68,  859,  130,  860,  858,  861,   68,  851,   68,
-      862,   68,  855,   68,   68,   68,  857,  863,   68,  864,
-       68,   68,  869,   68,   68,  867,   68,  871,  865,   68,
-       68,   68,   68,   68,   68,  874,  868,  876,   68,   68,
-      866,  873,   68,  879,  870,   68,   68,   68,  878,  883,
-       68,  872,  875,  885,   68,  884,  877,   68,   68,  880,
-      888,   68,   68,   68,   68,  881,  882,   68,  889,  890,
-      892,  887,  893,   68,  886,   68,  894,   68,   68,   68,
-       68,   68,   68,  901,   68,  898,   68,  900,  891,   68,
-
-       68,  895,   68,   68,  902,  909,   68,  896,   68,  897,
-       68,   68,   68,   68,  899,   68,  904,  906,  903,  908,
-      907,   68,  905,   68,   68,  918,   68,   68,  914,   68,
-      913,  910,  911,  915,  912,   68,  916,   68,  919,  917,
-       68,   68,  920,  921,   68,   68,  927,   68,  923,  922,
-      924,   68,   68,  925,  926,  928,   68,   68,   68,   68,
-      930,   68,  935,   68,  929,   68,   68,  938,   68,  940,
-      931,  932,   68,  943,   68,   68,   68,  934,   68,  936,
-       68,  941,   68,  933,  937,  942,  939,   68,  947,  944,
-      945,   68,   68,   68,   68,  948,  946,   68,   68,   68,
-
-       68,   68,  954,   68,  955,  956,  957,   68,   68,  949,
-      951,  950,  958,  953,   68,  952,  961,   68,   68,   68,
-       68,  965,   68,  960,  969,   68,   68,   68,  962,   68,
-      959,  963,  964,  968,  966,   68,  967,  970,   68,  972,
-       68,  973,   68,   68,  971,   68,   68,  977,   68,   68,
-      974,  979,   68,  980,   68,  981,   68,  983,   68,  982,
-       68,  975,   68,  976,  985,  978,   68,  984,   68,   68,
-      987,   68,   68,  988,  989,   68,   68,   68,  990,   68,
-      991,  997,   68,  986,   68,  992,   68,  999,  993,   68,
-       68, 1002,   68,   68,   68,  994,  995,   68,  996, 1001,
-
-       68, 1004,   68, 1007,   68,   68, 1005,   68, 1003, 1000,
-      998, 1011, 1010,   68,   68,   68,   68, 1014,   68, 1015,
-       68, 1009, 1013,   68,   68,   68, 1006,   68,   68, 1016,
-     1008,   68,  128, 1012, 1021, 1023,   68,   68,   68, 1018,
-     1022,   68, 1020, 1017, 1019, 1026,   68, 1029, 1024, 1030,
-       68,   68,   68, 1025,   68, 1028, 1031, 1033,   68, 1027,
-     1032,   68,   68, 1034, 1035,   68, 1036,   68, 1040,   68,
-     1038, 1037,   68,   68, 1042,   68,   68,   68, 1062,   68,
-     1044, 1045,   68, 1046,   68,   68,   68, 1043,   68,   68,
-     1039, 1047, 1049, 1048, 1041,   68,   68, 1052, 1050,   68,
-
-       68,   68, 1057,   68,   68,   68, 1059, 1051, 1053, 1055,
-     1056,   68,   68, 1061, 1063,   68,   68, 1054, 1058,   68,
-       68, 1066, 1060, 1064,   68,   68,   68,   68,   68,   68,
-       68,   68,   68, 1074,   68, 1073,   68, 1068, 1069, 1065,
-     1070,   68, 1071, 1076,   68, 1067, 1078,   68,   68, 1072,
-     1075,   68,   68, 1080, 1081, 1077, 1082,   68,   68,   68,
-     1086,   68, 1079, 1083, 1085,   68, 1087,   68, 1090,   68,
-       68,   68,   68,   68, 1094, 1084,   68,   68, 1088,   68,
-     1092, 1089, 1091, 1093, 1097, 1095,   68,   68,   68, 1096,
-       68, 1098,   68, 1100,   68,   68, 1102,   68, 1103,   68,
-
-     1099, 1106,   68,   68, 1101,   68, 1105, 1110, 1107, 1108,
-       68,   68, 1113,   68, 1109,   68, 1111,   68, 1112, 1104,
-     1116,   68,   68, 1114,   68, 1117, 1115,   68,   68,   68,
-       68,   68, 1119, 1120, 1118, 1122,   68,   68,   68,   68,
-       68,   68,   68, 1121, 1130,   68,   68,   68, 1149, 1131,
-       68,  127, 1128,   68, 1134, 1124,   68, 1123, 1126, 1127,
-     1132, 1125, 1129, 1133, 1135,   68, 1136,   68,   68, 1137,
-     1138,   68, 1139,   68, 1141,   68, 1142,   68,   68,   68,
-     1145,   68,   68,   68, 1144, 1147,   68, 1140,   68,   68,
-     1153,   68, 1150,   68, 1151, 1155,   68, 1143, 1156,   68,
-
-       68, 1146, 1154,   68, 1158,   68, 1148,   68,   68, 1152,
-       68,   68,   68, 1161, 1159,   68,   68, 1169,   68, 1160,
-     1165,   68,   68,   68, 1163,   68, 1157, 1167,   68, 1170,
-     1168, 1166,   68, 1164,   68, 1162, 1174, 1172,   68, 1173,
-       68,   68,   68, 1171,   68, 1175, 1178, 1177,   68,   68,
-       68, 1179,   68, 1176, 1180, 1181,   68,   68, 1192,   68,
-       68, 1182, 1183, 1184,   68, 1185, 1222,   68,   68, 1190,
-     1186, 1187, 1188, 1189,   68,   68,   68,   68,   68,   68,
-     1195, 1191, 1193,   68, 1194,   68, 1196, 1197,   68,   68,
-     1199,   68, 1200,   68, 1198, 1201,   68, 1202,   68, 1203,
-
-       68, 1204,   68, 1205, 1206,   68,   68, 1207, 1208,   68,
-       68, 1211,   68, 1212,   68, 1210, 1213,   68,   68,   68,
-       68,   68,   68, 1209,   68, 1220,   68,   68,   68,   68,
-     1214,   68, 1216, 1217, 1218,   68, 1221, 1215,   68,   68,
-       68,   68, 1224,   68, 1219, 1228, 1229,   68, 1223, 1226,
-     1230,   68,   68, 1232,   68, 1225, 1227, 1231, 1233,   68,
-       68, 1236, 1235, 1234,   68,   68, 1240,   68, 1241,   68,
-       68,   68,   68,   68,   68,   68,   68,   68, 1237, 1247,
-     1238, 1248,   68,   68, 1239, 1242, 1251,   68, 1243,   68,
-     1249, 1244, 1246, 1245,   68, 1250, 1253,   68, 1254,   68,
-
-       68, 1255, 1252, 1257,   68,   68,   68,   68,   68, 1258,
-     1259, 1256,   68, 1262, 1260,   68,  125, 1263, 1265,   68,
-     1266,   68, 1261, 1267, 1268,   68, 1269,   68,   68,   68,
-     1264,   68,   68,   68, 1270, 1272,   68,   68,   68,   68,
-     1276,   68,   68, 1271,   68, 1274, 1273, 1275, 1280,   68,
-     1277, 1282,   68, 1281,   68,   68, 1278,   68,   68,   68,
-     1284, 1279, 1283, 1287,   68,   68, 1285,   68, 1289,   68,
-       68, 1286, 1290, 1291,   68, 1292,   68, 1295,   68, 1288,
-     1296,   68,   68, 1293, 1294,   68,   68,   68,   68, 1297,
-       68, 1302, 1298,   68,   68, 1300,   68, 1299,   68, 1304,
-
-       68,   68,   68,   68,   68, 1309,   68, 1301, 1312, 1303,
-     1307, 1311,   68,   68,   68, 1313, 1305,   68,   68,   68,
-     1308, 1310, 1314, 1317, 1306,   68, 1315,   68, 1318,   68,
-       68,   68,   68,   68, 1319, 1320, 1324,   68, 1321,   68,
-       68,   68, 1316,   68,   68, 1330, 1329, 1323, 1325, 1326,
-     1322, 1328, 1332,   68,   68,   68, 1334,   68,   68, 1327,
-     1333, 1337,   68, 1331, 1338,   68,   68,   68,   68, 1342,
-       68,   68, 1344,   68, 1335,   68,   68,   68,  123, 1340,
-     1336,   68, 1347, 1343,   68, 1339, 1348,   68, 1341, 1351,
-     1346, 1349,   68,   68, 1345, 1350,   68, 1352,   68,   68,
-
-     1353, 1354,   68,   68,   68, 1357,   68,   68, 1355,   68,
-       68, 1362, 1356, 1360, 1358, 1359, 1361,   68, 1363,   68,
-       68, 1365,   68,   68, 1364,   68, 1368,   68, 1369,   68,
-     1370,   68, 1371,   68,   68,   68, 1373,   68, 1366,   68,
-       68, 1374,   68, 1367, 1376,   68, 1372,   68,   68, 1377,
-     1381,   68, 1382, 1382, 1382, 1382, 1382, 1378, 1382, 1375,
-     1382, 1379, 1382, 1382, 1382, 1382, 1382, 1380,   40,   40,
-       40,   40,   40,   40,   40,   45,   45,   45,   45,   45,
-       45,   45,   50,   50,   50,   50,   50,   50,   50,   56,
-       56,   56,   56,   56,   56,   56,   61,   61,   61,   61,
-
-       61,   61,   61,   71,   71, 1382,   71,   71,   71,   71,
-      122,  122, 1382, 1382, 1382,  122,  122,  124,  124, 1382,
-     1382,  124, 1382,  124,  126, 1382, 1382, 1382, 1382, 1382,
-      126,  129,  129, 1382, 1382, 1382,  129,  129,  131, 1382,
-     1382, 1382, 1382, 1382,  131,  133,  133, 1382,  133,  133,
-      133,  133,   72,   72, 1382,   72,   72,   72,   72,   13,
-     1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382,
-     1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382,
-     1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382,
-     1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382
-
-    } ;
-
-static yyconst flex_int16_t yy_chk[2800] =
-    {   0,
-        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,    1,    1,    1,    1,    1,    1,    1,    3,
-        3,    3,    4,    4,    4,   49,    5,    5,   49,    3,
-        5,   15,    4,    6,    6,   15,    5,    6,    9,    9,
-        9,  118,   33,    6,    7,    7,    7,    7,    9,    7,
-       10,   10,   10,   44,   44,    7,    8,    8,    8,    8,
-       10,    8,   21,   33,  118,   21,   21,    8,   11,   11,
-       11,   11,   11,   11, 1388,   20,   29,   20,   20,   11,
-
-       20,   29,   24,   21,   25,   20,   24,   28,   11,   12,
-       12,   12,   12,   12,   12,   74,   22,   22,   74,   25,
-       12,   69,   28,   66,   22,   69,   24,   26,   26,   12,
-       19,   22,   19,   19,   23,   19,   26,   66,   27,   23,
-       19,   19,   27,   23,   30,   27,   23,   31,   31,   23,
-       32,   32,   27,   75,   27,   32,   31,   75,   34,   30,
-       35,   76,   31,   39,   39,   35,   31,   34,   39,   36,
-      109,   32,   38,   34,   36,   35,   34,   93,   35,   37,
-       37,   76,   37,   34,   36,  109,   38,  600,   36,   36,
-       55,   38,   55,   55,   79,   55,   93,   37,   60,   60,
-
-       63,   78,   63,   63,   65,   63,   65,   65,   79,   65,
-       68,   63,   68,   68,   77,   68,   80,   77,   81,   78,
-       68,   71,   82,   71,   71,   83,   71,   84,   80,   85,
-       83,   71,   71,   86,   87,   88,   81,   89,  139,   88,
-       90,   84,   89,   83,   82,   96,  139,   91,  131,   85,
-       91,   86,   87,   91,   90,   92,   94,   97,   99,   95,
-       92,   94,   95,  100,   98,   99,   95,   91,   98,   96,
-      101,   97,  102,  103,  104,  106,  100,  101,  104,  105,
-      106,   94,  107,  108,  106,  102,  110,  112,  111,  113,
-      114,  114,  112,  103,  115,  117,  108,  105,  116,  119,
-
-      121,  113,  107,  120,  119,  110,  111,  123,  123,  129,
-      125,  114,  115,  125,  116,  120,  117,  127,  121,  127,
-      127,  136,  127,  130,  130,  132,  136,  132,  132,  133,
-      132,  133,  133,  135,  133,  138,  135,  137,  140,  141,
-      133,  142,  137,  143,  144,  149,  142,  142,  143,  144,
-      138,  146,  146,  140,  147,  128,  148,  152,  150,  141,
-      145,  148,  150,  153,  145,  151,  155,  154,  149,  145,
-      151,  152,  156,  147,  145,  157,  157,  156,  153,  154,
-      145,  145,  154,  158,  155,  159,  160,  161,  161,  162,
-      163,  160,  165,  164,  162,  163,  172,  174,  126,  166,
-
-      162,  159,  164,  158,  166,  167,  168,  169,  170,  176,
-      167,  168,  169,  165,  171,  170,  172,  173,  175,  174,
-      171,  177,  178,  173,  176,  179,  175,  178,  181,  184,
-      180,  182,  183,  181,  183,  185,  184,  186,  187,  187,
-      185,  177,  190,  191,  190,  188,  192,  179,  180,  180,
-      188,  182,  189,  194,  193,  191,  186,  189,  194,  195,
-      196,  190,  193,  197,  195,  192,  198,  199,  188,  200,
-      201,  201,  200,  203,  198,  196,  202,  202,  204,  205,
-      206,  197,  205,  208,  206,  207,  209,  213,  208,  203,
-      210,  210,  199,  204,  207,  214,  211,  212,  215,  216,
-
-      209,  211,  212,  217,  217,  218,  219,  213,  220,  221,
-      219,  226,  216,  214,  221,  222,  223,  224,  222,  215,
-      220,  225,  227,  218,  228,  230,  230,  232,  223,  275,
-      225,  233,  226,  275,  224,  227,  228,  224,  229,  231,
-      229,  229,  231,  234,  232,  236,  233,  232,  235,  235,
-      236,  238,  234,  237,  237,  239,  240,  241,  242,  243,
-      244,  240,  243,  242,  243,  245,  238,  246,  247,  249,
-      124,  250,  255,  247,  244,  239,  246,  241,  248,  251,
-      253,  245,  252,  248,  245,  252,  245,  255,  256,  257,
-      249,  250,  258,  251,  253,  260,  271,  256,  259,  262,
-
-      122,  252,  254,  261,  254,  254,  266,  263,  261,  264,
-      257,  258,  271,  259,  254,  260,  254,  254,  254,  262,
-      265,  254,  263,  267,  264,  265,  266,  268,  269,  269,
-      270,  269,  268,  272,  273,  276,  274,  267,  274,  280,
-      277,  281,  278,  279,  280,  281,  282,   67,  273,  272,
-      270,  278,  279,  276,  277,  282,  283,  284,  285,  287,
-      286,  283,  285,  284,  278,  286,  288,  288,  289,  290,
-      291,  292,  287,  289,  293,  294,  294,  295,  293,  291,
-      296,  300,  295,  292,  297,  297,  299,  299,  301,  302,
-      290,  303,  305,  306,  307,  308,  301,  309,  302,  310,
-
-      308,  296,  300,  303,  310,  309,  311,  312,  307,  313,
-      314,  315,  305,  306,  314,  316,  317,  318,  321,  320,
-      316,  323,  333,  322,  311,  325,  315,  327,  322,  312,
-      313,  333,  317,  322,  321,  330,  318,  319,  319,  320,
-      328,  323,  327,  319,  329,  319,  324,  324,  326,  326,
-      325,  331,  328,  319,  330,  332,  334,  335,  336,  329,
-      332,  337,  336,  319,  338,  339,  337,  340,  341,  341,
-      342,  430,  335,  331,  343,  334,  338,  345,  344,  430,
-      340,  344,  342,  339,  346,  347,  343,  346,  348,  348,
-      349,  349,  345,  354,  350,  351,  351,  353,  347,  350,
-
-      352,  352,  353,  355,  360,  356,  357,  363,  355,  356,
-      359,  357,  358,  361,  354,  359,  358,  362,  361,  366,
-      364,  363,  362,  364,  360,  365,  365,  368,  364,  367,
-      369,  370,  364,  369,  367,  370,  368,  366,  371,  372,
-      373,  375,  374,  371,  376,  373,  380,  378,  377,  376,
-      378,  380,  372,  375,  377,  381,  379,  370,  374,  379,
-      382,  383,  384,  385,  387,  384,  383,  386,  385,  387,
-      388,  386,  386,  381,  382,  389,  390,  392,  389,  388,
-      390,  390,  391,  393,  391,  393,  394,  395,  396,  397,
-      398,  399,  404,  389,  398,  400,  392,  401,  402,  409,
-
-      399,  403,  405,  405,  394,  395,  403,  396,  406,  397,
-      400,  404,  406,  402,  407,  401,  408,  410,  409,  407,
-      411,  412,  413,  414,  416,  418,  412,  411,  414,  413,
-      410,  415,  408,  417,  418,  419,  415,  423,  420,  431,
-      417,  421,  416,  420,  421,  429,  422,  424,  424,  419,
-      422,  427,  426,  428,  431,  427,  424,  426,  423,  434,
-      437,  438,  439,  429,  443,  428,  439,  438,  440,  437,
-      442,  445,  444,  440,  445,  442,  434,  441,  449,  441,
-      447,  441,  443,  452,  441,  446,  446,  447,  452,  441,
-      448,  448,  453,  449,  454,  441,  441,  444,  450,  450,
-
-      451,  455,  457,  451,  456,  456,  458,  460,  460,  455,
-      459,  461,  453,  454,  462,  459,  461,  457,  463,  462,
-      464,  463,  465,  466,  458,  467,  464,  468,  469,  471,
-      465,  466,  468,  470,  470,  469,  472,  471,  473,  475,
-      476,  472,  475,  467,  477,  477,  478,  479,  481,  483,
-      479,  482,  484,  485,  476,  487,  482,  473,  479,  486,
-      489,  478,  488,  490,  487,  491,  488,  492,  494,  481,
-      483,  493,  484,  495,  491,  485,  498,  493,  489,  486,
-      496,  492,  490,  501,  499,  496,  497,  495,  494,  500,
-      497,  502,  502,  503,  500,  498,  499,  504,  503,  505,
-
-      504,  506,  507,  508,  501,  509,  509,  507,  510,  510,
-      511,  512,  513,  514,  506,  512,  515,  505,  517,  518,
-      519,  520,  517,  508,  544,  511,  521,  522,  523,  524,
-      515,  513,  528,  544,  518,  524,  520,  514,  516,  525,
-      521,  516,  523,  516,  525,  519,  528,  516,  522,  516,
-      526,  526,  527,  529,  516,  532,  526,  527,  526,  530,
-      530,  531,  534,  532,  533,  529,  531,  535,  535,  536,
-      538,  539,  540,  536,  539,  538,  526,  541,  533,  542,
-      543,  534,  545,  546,  542,  547,  548,  549,  546,  550,
-      541,  540,  552,  554,  550,  553,  549,  555,  556,  543,
-
-      548,  545,  555,  556,  557,  547,  558,  560,  554,  557,
-      566,  552,  560,  553,  562,  558,  559,  559,  562,  562,
-      563,  563,  564,  565,  563,  564,  567,  568,  569,  567,
-      566,  570,  576,  569,  571,  572,  570,  573,  565,  578,
-      571,  574,  574,  573,  575,  579,  577,  580,  568,  577,
-      576,  572,  581,  575,  582,  583,  584,  578,  585,  582,
-      583,  585,  586,  587,  579,  581,  588,  580,  587,  589,
-      591,  588,  592,  586,  584,  590,  590,  594,  593,  595,
-      597,  594,  596,  598,  589,  602,  592,  601,  604,  591,
-      593,  596,  603,  604,  612,  607,  608,  595,  605,  597,
-
-      602,  601,  606,  605,  610,  611,  609,  606,  598,  607,
-      608,  609,  603,  612,  613,  613,  614,  615,  616,  610,
-      611,  617,  618,  616,  619,  620,  615,  618,  621,  620,
-      622,  623,  624,  625,  614,  626,  627,  621,  629,  630,
-      617,  628,  631,  619,  624,  622,  623,  628,  634,  635,
-      633,  631,  625,  629,  627,  633,  626,  635,  636,  630,
-      637,  639,  634,  638,  640,  637,  641,  638,  638,  642,
-      643,  643,  646,  646,  642,  641,  644,  640,  636,  645,
-      639,  644,  647,  648,  645,  649,  650,  651,  648,  652,
-      653,  647,  651,  654,  652,  653,  655,  654,  656,  649,
-
-      659,  660,  658,  661,  650,  655,  658,  662,  663,  656,
-      655,  664,  655,  665,  655,  659,  663,  661,  666,  660,
-      667,  667,  668,  669,  669,  664,  662,  671,  672,  673,
-      671,  665,  675,  672,  674,  674,  677,  668,  676,  676,
-      679,  677,  680,  666,  678,  678,  681,  680,  673,  683,
-      682,  684,  675,  687,  681,  682,  685,  684,  687,  688,
-      679,  689,  691,  685,  688,  690,  689,  683,  692,  693,
-      690,  691,  694,  694,  695,  696,  697,  698,  700,  699,
-      693,  697,  701,  701,  702,  703,  705,  692,  704,  709,
-      706,   61,  713,  710,  695,  706,  700,  698,  696,  699,
-
-      711,  712,  715,  708,  702,  711,  704,  708,  708,  705,
-      703,  710,  713,  714,  716,  709,  717,  714,  719,  712,
-      715,  718,  720,  722,  721,  723,  724,  720,  722,  725,
-      717,  721,  726,  716,  727,  724,  718,  719,  726,  735,
-      728,  729,  730,  723,  725,  728,  729,  730,  731,  731,
-      733,  733,  734,  735,  736,  727,  737,  734,  738,  738,
-      737,  737,  739,  740,  741,  742,  743,  745,  746,  744,
-      747,  749,  743,  736,  744,  748,  750,  751,  752,  752,
-      755,  739,  740,  753,  742,  749,  745,  746,  753,  747,
-      741,  754,  751,  755,  748,  754,  756,  750,  757,  758,
-
-      758,  759,  761,  760,  762,  756,  759,  760,  764,  762,
-      766,  767,  767,   56,  768,  766,  770,  770,  757,  768,
-      772,  772,  761,  776,  774,  777,  764,  774,  775,  775,
-      778,  779,  780,  780,  781,  778,  782,  782,  776,  783,
-      784,  785,  787,  786,  790,  785,  779,  787,  789,  792,
-      777,  784,  791,  791,  781,  793,  794,  795,  790,  795,
-      796,  783,  786,  797,  798,  796,  789,  799,  797,  792,
-      800,  800,  801,  804,  803,  793,  794,  805,  801,  803,
-      805,  799,  806,  808,  798,  807,  807,  806,  809,  810,
-      811,  812,  813,  814,  814,  811,  817,  813,  804,  815,
-
-      816,  808,  818,  819,  815,  822,  821,  809,  820,  810,
-      822,  823,  824,  825,  812,  827,  817,  819,  816,  821,
-      820,  828,  818,  830,  829,  833,  833,  836,  828,  838,
-      827,  823,  824,  829,  825,  834,  829,  835,  834,  830,
-      837,  839,  835,  836,  843,  840,  841,  844,  838,  837,
-      839,  841,  845,  839,  840,  842,  842,  846,  847,  848,
-      844,  849,  849,  850,  843,  857,  851,  853,  854,  855,
-      845,  846,  853,  858,  855,  856,  859,  848,  858,  850,
-      863,  856,  864,  847,  851,  857,  854,  860,  863,  859,
-      860,  865,  866,  870,  867,  864,  860,  868,  871,  872,
-
-      873,  874,  871,  875,  872,  873,  874,  876,  877,  865,
-      867,  866,  875,  870,  879,  868,  878,  878,  884,  880,
-      881,  882,  883,  877,  886,  886,  882,  885,  879,  892,
-      876,  880,  881,  885,  883,  889,  884,  887,  887,  890,
-      890,  891,  893,  894,  889,  896,  891,  895,  895,  903,
-      892,  897,  897,  898,  898,  899,  900,  902,  905,  900,
-      899,  893,  902,  894,  904,  896,  909,  903,  910,  904,
-      906,  906,  907,  907,  908,  911,  912,  913,  909,  908,
-      909,  914,  914,  905,  915,  909,  916,  916,  910,  917,
-      919,  920,  920,  921,  922,  911,  912,  923,  913,  919,
-
-      924,  922,  925,  925,  926,  927,  923,  929,  921,  917,
-      915,  930,  929,  931,  934,  932,  930,  933,  933,  934,
-      935,  927,  932,  936,  937,  938,  924,  939,  940,  935,
-      926,  941,   51,  931,  940,  942,  942,  943,  945,  937,
-      941,  946,  939,  936,  938,  944,  944,  947,  943,  948,
-      948,  951,  947,  943,  953,  946,  949,  950,  955,  945,
-      949,  949,  950,  951,  952,  956,  953,  954,  957,  952,
-      955,  954,  958,  957,  959,  960,  985,  962,  985,  959,
-      962,  963,  963,  964,  964,  965,  967,  960,  966,  968,
-      956,  965,  967,  966,  958,  971,  973,  973,  968,  974,
-
-      975,  976,  978,  978,  981,  983,  982,  971,  973,  975,
-      976,  982,  984,  984,  986,  986,  988,  974,  981,  989,
-      990,  990,  983,  988,  991,  992,  993,  995,  994,  996,
-      998,  999, 1000,  999, 1001,  998, 1005,  992,  993,  989,
-      994, 1003,  995, 1001, 1011,  991, 1004, 1004, 1006,  996,
-     1000, 1008, 1007, 1006, 1007, 1003, 1008, 1010, 1009, 1015,
-     1012, 1013, 1005, 1009, 1011, 1012, 1013, 1016, 1017, 1017,
-     1018, 1019, 1020, 1028, 1020, 1010, 1021, 1022, 1015, 1024,
-     1019, 1016, 1018, 1019, 1024, 1021, 1025, 1027, 1029, 1022,
-     1031, 1025, 1033, 1028, 1034, 1039, 1031, 1035, 1033, 1037,
-
-     1027, 1036, 1036, 1040, 1029, 1042, 1035, 1040, 1037, 1038,
-     1038, 1041, 1043, 1043, 1039, 1044, 1041, 1047, 1042, 1034,
-     1048, 1048, 1050, 1044, 1049, 1049, 1047, 1051, 1053, 1052,
-     1054, 1055, 1051, 1052, 1050, 1054, 1056, 1058, 1060, 1059,
-     1061, 1062, 1084, 1053, 1064, 1064, 1065, 1066, 1084, 1065,
-     1067,   50, 1061, 1068, 1068, 1056, 1071, 1055, 1059, 1060,
-     1066, 1058, 1062, 1067, 1069, 1069, 1070, 1070, 1074, 1071,
-     1072, 1072, 1073, 1073, 1075, 1075, 1076, 1076, 1077, 1079,
-     1080, 1080, 1081, 1088, 1079, 1082, 1082, 1074, 1083, 1085,
-     1087, 1087, 1085, 1086, 1086, 1089, 1089, 1077, 1091, 1091,
-
-     1092, 1081, 1088, 1093, 1093, 1094, 1083, 1095, 1096, 1086,
-     1097, 1098, 1099, 1096, 1094, 1100, 1101, 1104, 1102, 1095,
-     1100, 1103, 1104, 1107, 1098, 1105, 1092, 1102, 1109, 1105,
-     1103, 1101, 1114, 1099, 1115, 1097, 1111, 1109, 1110, 1110,
-     1172, 1111, 1131, 1107, 1112, 1112, 1115, 1114, 1117, 1118,
-     1124, 1117, 1126, 1112, 1118, 1119, 1119, 1120, 1131, 1121,
-     1123, 1120, 1121, 1122, 1122, 1123, 1172, 1125, 1127, 1128,
-     1124, 1125, 1126, 1127, 1128, 1129, 1133, 1132, 1134, 1151,
-     1134, 1129, 1132, 1150, 1133, 1137, 1137, 1140, 1140, 1143,
-     1144, 1144, 1146, 1146, 1143, 1148, 1149, 1149, 1152, 1150,
-
-     1148, 1151, 1157, 1152, 1154, 1154, 1158, 1157, 1158, 1159,
-     1160, 1161, 1161, 1162, 1162, 1160, 1163, 1163, 1164, 1165,
-     1166, 1167, 1168, 1159, 1169, 1170, 1170, 1171, 1173, 1174,
-     1164, 1175, 1166, 1167, 1168, 1176, 1171, 1165, 1177, 1182,
-     1178, 1179, 1174, 1188, 1169, 1178, 1179, 1187, 1173, 1176,
-     1180, 1180, 1183, 1183, 1186, 1175, 1177, 1182, 1185, 1185,
-     1189, 1188, 1187, 1186, 1190, 1191, 1192, 1192, 1193, 1195,
-     1194, 1196, 1201, 1193, 1198, 1204, 1202, 1205, 1189, 1202,
-     1190, 1203, 1203, 1208, 1191, 1194, 1207, 1207, 1195, 1215,
-     1204, 1196, 1201, 1198, 1216, 1205, 1209, 1209, 1210, 1210,
-
-     1214, 1214, 1208, 1216, 1217, 1218, 1219, 1221, 1222, 1217,
-     1218, 1215, 1223, 1222, 1219, 1224,   45, 1223, 1225, 1225,
-     1226, 1226, 1221, 1227, 1228, 1228, 1229, 1229, 1227, 1231,
-     1224, 1232, 1234, 1235, 1231, 1234, 1236, 1241, 1237, 1238,
-     1238, 1239, 1242, 1232, 1244, 1236, 1235, 1237, 1243, 1243,
-     1239, 1245, 1245, 1244, 1246, 1247, 1241, 1249, 1250, 1255,
-     1247, 1242, 1246, 1252, 1252, 1260, 1249, 1256, 1256, 1257,
-     1261, 1250, 1257, 1258, 1258, 1259, 1259, 1262, 1270, 1255,
-     1263, 1263, 1262, 1260, 1261, 1264, 1267, 1271, 1272, 1264,
-     1273, 1273, 1267, 1274, 1275, 1271, 1276, 1270, 1277, 1275,
-
-     1279, 1278, 1281, 1283, 1285, 1281, 1286, 1272, 1285, 1274,
-     1278, 1284, 1284, 1288, 1289, 1286, 1276, 1290, 1293, 1307,
-     1279, 1283, 1288, 1293, 1277, 1295, 1289, 1294, 1294, 1298,
-     1297, 1299, 1300, 1303, 1295, 1297, 1301, 1301, 1298, 1302,
-     1304, 1306, 1290, 1305, 1308, 1307, 1306, 1300, 1302, 1303,
-     1299, 1305, 1309, 1309, 1313, 1310, 1312, 1312, 1314, 1304,
-     1310, 1315, 1315, 1308, 1316, 1316, 1317, 1318, 1319, 1320,
-     1320, 1321, 1322, 1322, 1313, 1323, 1325, 1326,   40, 1318,
-     1314,   14, 1326, 1321, 1330, 1317, 1327, 1327, 1319, 1330,
-     1325, 1328, 1328, 1345, 1323, 1329, 1329, 1331, 1331, 1333,
-
-     1333, 1335, 1335, 1336, 1339, 1340, 1340, 1347, 1336, 1341,
-     1343, 1347, 1339, 1345, 1341, 1343, 1346, 1346, 1351, 1351,
-     1353, 1355, 1355, 1356, 1353, 1358, 1359, 1359, 1360, 1360,
-     1362, 1362, 1364, 1364, 1366, 1367, 1367, 1372, 1356, 1373,
-     1375, 1372, 1377, 1358, 1374, 1374, 1366, 1378, 1379, 1375,
-     1380, 1380,   13,    0,    0,    0,    0, 1377,    0, 1373,
-        0, 1378,    0,    0,    0,    0,    0, 1379, 1383, 1383,
-     1383, 1383, 1383, 1383, 1383, 1384, 1384, 1384, 1384, 1384,
-     1384, 1384, 1385, 1385, 1385, 1385, 1385, 1385, 1385, 1386,
-     1386, 1386, 1386, 1386, 1386, 1386, 1387, 1387, 1387, 1387,
-
-     1387, 1387, 1387, 1389, 1389,    0, 1389, 1389, 1389, 1389,
-     1390, 1390,    0,    0,    0, 1390, 1390, 1391, 1391,    0,
-        0, 1391,    0, 1391, 1392,    0,    0,    0,    0,    0,
-     1392, 1393, 1393,    0,    0,    0, 1393, 1393, 1394,    0,
-        0,    0,    0,    0, 1394, 1395, 1395,    0, 1395, 1395,
-     1395, 1395, 1396, 1396,    0, 1396, 1396, 1396, 1396, 1382,
-     1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382,
-     1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382,
-     1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382,
-     1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382, 1382
-
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-static int yy_more_flag = 0;
-static int yy_more_len = 0;
-#define yymore() ((yy_more_flag) = 1)
-#define YY_MORE_ADJ (yy_more_len)
-#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-/*
- * configlexer.lex - lexical analyzer for unbound config file
- *
- * Copyright (c) 2001-2006, NLnet Labs. All rights reserved
- *
- * See LICENSE for the license.
- *
- */
-
-#include <ctype.h>
-#include <string.h>
-#include <strings.h>
-#ifdef HAVE_GLOB_H
-# include <glob.h>
-#endif
-
-#include "util/config_file.h"
-#include "util/configparser.h"
-void ub_c_error(const char *message);
-
-#if 0
-#define LEXOUT(s)  printf s /* used ONLY when debugging */
-#else
-#define LEXOUT(s)
-#endif
-
-/** avoid warning in about fwrite return value */
-#define ECHO ub_c_error_msg("syntax error at text: %s", yytext)
-
-/** A parser variable, this is a statement in the config file which is
- * of the form variable: value1 value2 ...  nargs is the number of values. */
-#define YDVAR(nargs, var) \
-	num_args=(nargs); \
-	LEXOUT(("v(%s%d) ", yytext, num_args)); \
-	if(num_args > 0) { BEGIN(val); } \
-	return (var);
-
-struct inc_state {
-	char* filename;
-	int line;
-	YY_BUFFER_STATE buffer;
-	struct inc_state* next;
-};
-static struct inc_state* config_include_stack = NULL;
-static int inc_depth = 0;
-static int inc_prev = 0;
-static int num_args = 0;
-
-void init_cfg_parse(void)
-{
-	config_include_stack = NULL;
-	inc_depth = 0;
-	inc_prev = 0;
-	num_args = 0;
-}
-
-static void config_start_include(const char* filename)
-{
-	FILE *input;
-	struct inc_state* s;
-	char* nm;
-	if(inc_depth++ > 100000) {
-		ub_c_error_msg("too many include files");
-		return;
-	}
-	if(strlen(filename) == 0) {
-		ub_c_error_msg("empty include file name");
-		return;
-	}
-	s = (struct inc_state*)malloc(sizeof(*s));
-	if(!s) {
-		ub_c_error_msg("include %s: malloc failure", filename);
-		return;
-	}
-	if(cfg_parser->chroot && strncmp(filename, cfg_parser->chroot,
-		strlen(cfg_parser->chroot)) == 0) {
-		filename += strlen(cfg_parser->chroot);
-	}
-	nm = strdup(filename);
-	if(!nm) {
-		ub_c_error_msg("include %s: strdup failure", filename);
-		free(s);
-		return;
-	}
-	input = fopen(filename, "r");
-	if(!input) {
-		ub_c_error_msg("cannot open include file '%s': %s",
-			filename, strerror(errno));
-		free(s);
-		free(nm);
-		return;
-	}
-	LEXOUT(("switch_to_include_file(%s)\n", filename));
-	s->filename = cfg_parser->filename;
-	s->line = cfg_parser->line;
-	s->buffer = YY_CURRENT_BUFFER;
-	s->next = config_include_stack;
-	config_include_stack = s;
-	cfg_parser->filename = nm;
-	cfg_parser->line = 1;
-	yy_switch_to_buffer(yy_create_buffer(input,YY_BUF_SIZE));
-}
-
-static void config_start_include_glob(const char* filename)
-{
-
-	/* check for wildcards */
-#ifdef HAVE_GLOB
-	glob_t g;
-	size_t i;
-	int r, flags;
-	if(!(!strchr(filename, '*') && !strchr(filename, '?') && !strchr(filename, '[') &&
-		!strchr(filename, '{') && !strchr(filename, '~'))) {
-		flags = 0
-#ifdef GLOB_ERR
-			| GLOB_ERR
-#endif
-#ifdef GLOB_NOSORT
-			| GLOB_NOSORT
-#endif
-#ifdef GLOB_BRACE
-			| GLOB_BRACE
-#endif
-#ifdef GLOB_TILDE
-			| GLOB_TILDE
-#endif
-		;
-		memset(&g, 0, sizeof(g));
-		r = glob(filename, flags, NULL, &g);
-		if(r) {
-			/* some error */
-			globfree(&g);
-			if(r == GLOB_NOMATCH)
-				return; /* no matches for pattern */
-			config_start_include(filename); /* let original deal with it */
-			return;
-		}
-		/* process files found, if any */
-		for(i=0; i<(size_t)g.gl_pathc; i++) {
-			config_start_include(g.gl_pathv[i]);
-		}
-		globfree(&g);
-		return;
-	}
-#endif /* HAVE_GLOB */
-
-	config_start_include(filename);
-}
-
-static void config_end_include(void)
-{
-	struct inc_state* s = config_include_stack;
-	--inc_depth;
-	if(!s) return;
-	free(cfg_parser->filename);
-	cfg_parser->filename = s->filename;
-	cfg_parser->line = s->line;
-	yy_delete_buffer(YY_CURRENT_BUFFER);
-	yy_switch_to_buffer(s->buffer);
-	config_include_stack = s->next;
-	free(s);
-}
-
-#ifndef yy_set_bol /* compat definition, for flex 2.4.6 */
-#define yy_set_bol(at_bol) \
-        { \
-	        if ( ! yy_current_buffer ) \
-	                yy_current_buffer = yy_create_buffer(yyin,YY_BUF_SIZE ); \
-	        yy_current_buffer->yy_ch_buf[0] = ((at_bol)?'\n':' '); \
-        }
-#endif
-
-#define YY_NO_INPUT 1
-#ifndef YY_NO_UNPUT
-#define YY_NO_UNPUT 1
-#endif
-#ifndef YY_NO_INPUT
-#define YY_NO_INPUT 1
-#endif
-
-#define INITIAL 0
-#define quotedstring 1
-#define singlequotedstr 2
-#define include 3
-#define include_quoted 4
-#define val 5
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-static int yy_init_globals (void );
-
-/* Accessor methods to globals.
-   These are made visible to non-reentrant scanners for convenience. */
-
-int yylex_destroy (void );
-
-int yyget_debug (void );
-
-void yyset_debug (int debug_flag  );
-
-YY_EXTRA_TYPE yyget_extra (void );
-
-void yyset_extra (YY_EXTRA_TYPE user_defined  );
-
-FILE *yyget_in (void );
-
-void yyset_in  (FILE * in_str  );
-
-FILE *yyget_out (void );
-
-void yyset_out  (FILE * out_str  );
-
-yy_size_t yyget_leng (void );
-
-char *yyget_text (void );
-
-int yyget_lineno (void );
-
-void yyset_lineno (int line_number  );
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap (void );
-#else
-extern int yywrap (void );
-#endif
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
-#endif
-
-#ifndef YY_NO_INPUT
-
-#ifdef __cplusplus
-static int yyinput (void );
-#else
-static int input (void );
-#endif
-
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		size_t n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(yyin); \
-			} \
-		}\
-\
-
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* end tables serialization structures and prototypes */
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int yylex (void);
-
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
-	yy_state_type yy_current_state;
-	char *yy_cp, *yy_bp;
-	int yy_act;
-    
-	if ( !(yy_init) )
-		{
-		(yy_init) = 1;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! (yy_start) )
-			(yy_start) = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer(yyin,YY_BUF_SIZE );
-		}
-
-		yy_load_buffer_state( );
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		(yy_more_len) = 0;
-		if ( (yy_more_flag) )
-			{
-			(yy_more_len) = (yy_c_buf_p) - (yytext_ptr);
-			(yy_more_flag) = 0;
-			}
-		yy_cp = (yy_c_buf_p);
-
-		/* Support of yytext. */
-		*yy_cp = (yy_hold_char);
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = (yy_start);
-yy_match:
-		do
-			{
-			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
-			if ( yy_accept[yy_current_state] )
-				{
-				(yy_last_accepting_state) = yy_current_state;
-				(yy_last_accepting_cpos) = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 1383 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 2760 );
-
-yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
-			yy_act = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-do_action:	/* This label is used only to access EOF actions. */
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = (yy_hold_char);
-			yy_cp = (yy_last_accepting_cpos);
-			yy_current_state = (yy_last_accepting_state);
-			goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-{ 
-	LEXOUT(("SP ")); /* ignore */ }
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-{ 
-	/* note that flex makes the longest match and '.' is any but not nl */
-	LEXOUT(("comment(%s) ", yytext)); /* ignore */ }
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-{ YDVAR(0, VAR_SERVER) }
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_NUM_THREADS) }
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_VERBOSITY) }
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_PORT) }
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_OUTGOING_RANGE) }
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_OUTGOING_PORT_PERMIT) }
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_OUTGOING_PORT_AVOID) }
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_OUTGOING_NUM_TCP) }
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_INCOMING_NUM_TCP) }
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_DO_IP4) }
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_DO_IP6) }
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_DO_UDP) }
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_DO_TCP) }
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_TCP_UPSTREAM) }
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_SSL_UPSTREAM) }
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_SSL_SERVICE_KEY) }
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_SSL_SERVICE_PEM) }
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_SSL_PORT) }
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_DO_DAEMONIZE) }
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_INTERFACE) }
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_INTERFACE) }
-	YY_BREAK
-case 24:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_OUTGOING_INTERFACE) }
-	YY_BREAK
-case 25:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_INTERFACE_AUTOMATIC) }
-	YY_BREAK
-case 26:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_SO_RCVBUF) }
-	YY_BREAK
-case 27:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_SO_SNDBUF) }
-	YY_BREAK
-case 28:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_SO_REUSEPORT) }
-	YY_BREAK
-case 29:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_CHROOT) }
-	YY_BREAK
-case 30:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_USERNAME) }
-	YY_BREAK
-case 31:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_DIRECTORY) }
-	YY_BREAK
-case 32:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_LOGFILE) }
-	YY_BREAK
-case 33:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_PIDFILE) }
-	YY_BREAK
-case 34:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_ROOT_HINTS) }
-	YY_BREAK
-case 35:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_EDNS_BUFFER_SIZE) }
-	YY_BREAK
-case 36:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_MSG_BUFFER_SIZE) }
-	YY_BREAK
-case 37:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_MSG_CACHE_SIZE) }
-	YY_BREAK
-case 38:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_MSG_CACHE_SLABS) }
-	YY_BREAK
-case 39:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_RRSET_CACHE_SIZE) }
-	YY_BREAK
-case 40:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_RRSET_CACHE_SLABS) }
-	YY_BREAK
-case 41:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_CACHE_MAX_TTL) }
-	YY_BREAK
-case 42:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_CACHE_MIN_TTL) }
-	YY_BREAK
-case 43:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_INFRA_HOST_TTL) }
-	YY_BREAK
-case 44:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_INFRA_LAME_TTL) }
-	YY_BREAK
-case 45:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_INFRA_CACHE_SLABS) }
-	YY_BREAK
-case 46:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_INFRA_CACHE_NUMHOSTS) }
-	YY_BREAK
-case 47:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_INFRA_CACHE_LAME_SIZE) }
-	YY_BREAK
-case 48:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_NUM_QUERIES_PER_THREAD) }
-	YY_BREAK
-case 49:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_JOSTLE_TIMEOUT) }
-	YY_BREAK
-case 50:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_DELAY_CLOSE) }
-	YY_BREAK
-case 51:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_TARGET_FETCH_POLICY) }
-	YY_BREAK
-case 52:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_HARDEN_SHORT_BUFSIZE) }
-	YY_BREAK
-case 53:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_HARDEN_LARGE_QUERIES) }
-	YY_BREAK
-case 54:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_HARDEN_GLUE) }
-	YY_BREAK
-case 55:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_HARDEN_DNSSEC_STRIPPED) }
-	YY_BREAK
-case 56:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_HARDEN_BELOW_NXDOMAIN) }
-	YY_BREAK
-case 57:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_HARDEN_REFERRAL_PATH) }
-	YY_BREAK
-case 58:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_USE_CAPS_FOR_ID) }
-	YY_BREAK
-case 59:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_UNWANTED_REPLY_THRESHOLD) }
-	YY_BREAK
-case 60:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_PRIVATE_ADDRESS) }
-	YY_BREAK
-case 61:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
-	YY_BREAK
-case 62:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_PREFETCH_KEY) }
-	YY_BREAK
-case 63:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_PREFETCH) }
-	YY_BREAK
-case 64:
-YY_RULE_SETUP
-{ YDVAR(0, VAR_STUB_ZONE) }
-	YY_BREAK
-case 65:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_NAME) }
-	YY_BREAK
-case 66:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_STUB_ADDR) }
-	YY_BREAK
-case 67:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_STUB_HOST) }
-	YY_BREAK
-case 68:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_STUB_PRIME) }
-	YY_BREAK
-case 69:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_STUB_FIRST) }
-	YY_BREAK
-case 70:
-YY_RULE_SETUP
-{ YDVAR(0, VAR_FORWARD_ZONE) }
-	YY_BREAK
-case 71:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_FORWARD_ADDR) }
-	YY_BREAK
-case 72:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_FORWARD_HOST) }
-	YY_BREAK
-case 73:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_FORWARD_FIRST) }
-	YY_BREAK
-case 74:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_DO_NOT_QUERY_ADDRESS) }
-	YY_BREAK
-case 75:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_DO_NOT_QUERY_LOCALHOST) }
-	YY_BREAK
-case 76:
-YY_RULE_SETUP
-{ YDVAR(2, VAR_ACCESS_CONTROL) }
-	YY_BREAK
-case 77:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_HIDE_IDENTITY) }
-	YY_BREAK
-case 78:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_HIDE_VERSION) }
-	YY_BREAK
-case 79:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_IDENTITY) }
-	YY_BREAK
-case 80:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_VERSION) }
-	YY_BREAK
-case 81:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_MODULE_CONF) }
-	YY_BREAK
-case 82:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_DLV_ANCHOR) }
-	YY_BREAK
-case 83:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_DLV_ANCHOR_FILE) }
-	YY_BREAK
-case 84:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_TRUST_ANCHOR_FILE) }
-	YY_BREAK
-case 85:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_AUTO_TRUST_ANCHOR_FILE) }
-	YY_BREAK
-case 86:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_TRUSTED_KEYS_FILE) }
-	YY_BREAK
-case 87:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_TRUST_ANCHOR) }
-	YY_BREAK
-case 88:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_VAL_OVERRIDE_DATE) }
-	YY_BREAK
-case 89:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MIN) }
-	YY_BREAK
-case 90:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_VAL_SIG_SKEW_MAX) }
-	YY_BREAK
-case 91:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_BOGUS_TTL) }
-	YY_BREAK
-case 92:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_VAL_CLEAN_ADDITIONAL) }
-	YY_BREAK
-case 93:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_VAL_PERMISSIVE_MODE) }
-	YY_BREAK
-case 94:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_IGNORE_CD_FLAG) }
-	YY_BREAK
-case 95:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_VAL_LOG_LEVEL) }
-	YY_BREAK
-case 96:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_KEY_CACHE_SIZE) }
-	YY_BREAK
-case 97:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_KEY_CACHE_SLABS) }
-	YY_BREAK
-case 98:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_NEG_CACHE_SIZE) }
-	YY_BREAK
-case 99:
-YY_RULE_SETUP
-{ 
-				  YDVAR(1, VAR_VAL_NSEC3_KEYSIZE_ITERATIONS) }
-	YY_BREAK
-case 100:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_ADD_HOLDDOWN) }
-	YY_BREAK
-case 101:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_DEL_HOLDDOWN) }
-	YY_BREAK
-case 102:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_KEEP_MISSING) }
-	YY_BREAK
-case 103:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_USE_SYSLOG) }
-	YY_BREAK
-case 104:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_LOG_TIME_ASCII) }
-	YY_BREAK
-case 105:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_LOG_QUERIES) }
-	YY_BREAK
-case 106:
-YY_RULE_SETUP
-{ YDVAR(2, VAR_LOCAL_ZONE) }
-	YY_BREAK
-case 107:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_LOCAL_DATA) }
-	YY_BREAK
-case 108:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
-	YY_BREAK
-case 109:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
-	YY_BREAK
-case 110:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
-	YY_BREAK
-case 111:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
-	YY_BREAK
-case 112:
-YY_RULE_SETUP
-{ YDVAR(0, VAR_REMOTE_CONTROL) }
-	YY_BREAK
-case 113:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_CONTROL_ENABLE) }
-	YY_BREAK
-case 114:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_CONTROL_INTERFACE) }
-	YY_BREAK
-case 115:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_CONTROL_PORT) }
-	YY_BREAK
-case 116:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_SERVER_KEY_FILE) }
-	YY_BREAK
-case 117:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_SERVER_CERT_FILE) }
-	YY_BREAK
-case 118:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_CONTROL_KEY_FILE) }
-	YY_BREAK
-case 119:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_CONTROL_CERT_FILE) }
-	YY_BREAK
-case 120:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_PYTHON_SCRIPT) }
-	YY_BREAK
-case 121:
-YY_RULE_SETUP
-{ YDVAR(0, VAR_PYTHON) }
-	YY_BREAK
-case 122:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_DOMAIN_INSECURE) }
-	YY_BREAK
-case 123:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_MINIMAL_RESPONSES) }
-	YY_BREAK
-case 124:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_RRSET_ROUNDROBIN) }
-	YY_BREAK
-case 125:
-YY_RULE_SETUP
-{ YDVAR(1, VAR_MAX_UDP_SIZE) }
-	YY_BREAK
-case 126:
-/* rule 126 can match eol */
-YY_RULE_SETUP
-{ LEXOUT(("NL\n")); cfg_parser->line++; }
-	YY_BREAK
-/* Quoted strings. Strip leading and ending quotes */
-case 127:
-YY_RULE_SETUP
-{ BEGIN(quotedstring); LEXOUT(("QS ")); }
-	YY_BREAK
-case YY_STATE_EOF(quotedstring):
-{
-        yyerror("EOF inside quoted string");
-	if(--num_args == 0) { BEGIN(INITIAL); }
-	else		    { BEGIN(val); }
-}
-	YY_BREAK
-case 128:
-YY_RULE_SETUP
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
-case 129:
-/* rule 129 can match eol */
-YY_RULE_SETUP
-{ yyerror("newline inside quoted string, no end \""); 
-			  cfg_parser->line++; BEGIN(INITIAL); }
-	YY_BREAK
-case 130:
-YY_RULE_SETUP
-{
-        LEXOUT(("QE "));
-	if(--num_args == 0) { BEGIN(INITIAL); }
-	else		    { BEGIN(val); }
-        yytext[yyleng - 1] = '\0';
-	yylval.str = strdup(yytext);
-	if(!yylval.str)
-		yyerror("out of memory");
-        return STRING_ARG;
-}
-	YY_BREAK
-/* Single Quoted strings. Strip leading and ending quotes */
-case 131:
-YY_RULE_SETUP
-{ BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
-	YY_BREAK
-case YY_STATE_EOF(singlequotedstr):
-{
-        yyerror("EOF inside quoted string");
-	if(--num_args == 0) { BEGIN(INITIAL); }
-	else		    { BEGIN(val); }
-}
-	YY_BREAK
-case 132:
-YY_RULE_SETUP
-{ LEXOUT(("STR(%s) ", yytext)); yymore(); }
-	YY_BREAK
-case 133:
-/* rule 133 can match eol */
-YY_RULE_SETUP
-{ yyerror("newline inside quoted string, no end '"); 
-			     cfg_parser->line++; BEGIN(INITIAL); }
-	YY_BREAK
-case 134:
-YY_RULE_SETUP
-{
-        LEXOUT(("SQE "));
-	if(--num_args == 0) { BEGIN(INITIAL); }
-	else		    { BEGIN(val); }
-        yytext[yyleng - 1] = '\0';
-	yylval.str = strdup(yytext);
-	if(!yylval.str)
-		yyerror("out of memory");
-        return STRING_ARG;
-}
-	YY_BREAK
-/* include: directive */
-case 135:
-YY_RULE_SETUP
-{ 
-	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
-	YY_BREAK
-case YY_STATE_EOF(include):
-{
-        yyerror("EOF inside include directive");
-        BEGIN(inc_prev);
-}
-	YY_BREAK
-case 136:
-YY_RULE_SETUP
-{ LEXOUT(("ISP ")); /* ignore */ }
-	YY_BREAK
-case 137:
-/* rule 137 can match eol */
-YY_RULE_SETUP
-{ LEXOUT(("NL\n")); cfg_parser->line++;}
-	YY_BREAK
-case 138:
-YY_RULE_SETUP
-{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
-	YY_BREAK
-case 139:
-YY_RULE_SETUP
-{
-	LEXOUT(("Iunquotedstr(%s) ", yytext));
-	config_start_include_glob(yytext);
-	BEGIN(inc_prev);
-}
-	YY_BREAK
-case YY_STATE_EOF(include_quoted):
-{
-        yyerror("EOF inside quoted string");
-        BEGIN(inc_prev);
-}
-	YY_BREAK
-case 140:
-YY_RULE_SETUP
-{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
-	YY_BREAK
-case 141:
-/* rule 141 can match eol */
-YY_RULE_SETUP
-{ yyerror("newline before \" in include name"); 
-				  cfg_parser->line++; BEGIN(inc_prev); }
-	YY_BREAK
-case 142:
-YY_RULE_SETUP
-{
-	LEXOUT(("IQE "));
-	yytext[yyleng - 1] = '\0';
-	config_start_include_glob(yytext);
-	BEGIN(inc_prev);
-}
-	YY_BREAK
-case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(val):
-{
-	LEXOUT(("LEXEOF "));
-	yy_set_bol(1); /* Set beginning of line, so "^" rules match.  */
-	if (!config_include_stack) {
-		yyterminate();
-	} else {
-		fclose(yyin);
-		config_end_include();
-	}
-}
-	YY_BREAK
-case 143:
-YY_RULE_SETUP
-{ LEXOUT(("unquotedstr(%s) ", yytext)); 
-			if(--num_args == 0) { BEGIN(INITIAL); }
-			yylval.str = strdup(yytext); return STRING_ARG; }
-	YY_BREAK
-case 144:
-YY_RULE_SETUP
-{
-	ub_c_error_msg("unknown keyword '%s'", yytext);
-	}
-	YY_BREAK
-case 145:
-YY_RULE_SETUP
-{
-	ub_c_error_msg("stray '%s'", yytext);
-	}
-	YY_BREAK
-case 146:
-YY_RULE_SETUP
-ECHO;
-	YY_BREAK
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = (yy_hold_char);
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state(  );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++(yy_c_buf_p);
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = (yy_c_buf_p);
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer(  ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				(yy_did_buffer_switch_on_eof) = 0;
-
-				if ( yywrap( ) )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				(yy_c_buf_p) =
-					(yytext_ptr) + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				(yy_c_buf_p) =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-} /* end of yylex */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (void)
-{
-    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	char *source = (yytext_ptr);
-	int number_to_move, i;
-	int ret_val;
-
-	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
-	else
-		{
-			yy_size_t num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
-
-			int yy_c_buf_p_offset =
-				(int) ((yy_c_buf_p) - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				yy_size_t new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-						number_to_move - 1;
-
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
-
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	if ( (yy_n_chars) == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart(yyin  );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-	}
-
-	(yy_n_chars) += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-
-	return ret_val;
-}
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-    static yy_state_type yy_get_previous_state (void)
-{
-	yy_state_type yy_current_state;
-	char *yy_cp;
-    
-	yy_current_state = (yy_start);
-
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
-		{
-		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			(yy_last_accepting_state) = yy_current_state;
-			(yy_last_accepting_cpos) = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 1383 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-}
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
-{
-	int yy_is_jam;
-    	char *yy_cp = (yy_c_buf_p);
-
-	YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		(yy_last_accepting_state) = yy_current_state;
-		(yy_last_accepting_cpos) = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 1383 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 1382);
-
-		return yy_is_jam ? 0 : yy_current_state;
-}
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-    static int yyinput (void)
-#else
-    static int input  (void)
-#endif
-
-{
-	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
-
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-			/* This was really a NUL. */
-			*(yy_c_buf_p) = '\0';
-
-		else
-			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
-			++(yy_c_buf_p);
-
-			switch ( yy_get_next_buffer(  ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart(yyin );
-
-					/*FALLTHROUGH*/
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap( ) )
-						return EOF;
-
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					(yy_c_buf_p) = (yytext_ptr) + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve yytext */
-	(yy_hold_char) = *++(yy_c_buf_p);
-
-	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * 
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void yyrestart  (FILE * input_file )
-{
-    
-	if ( ! YY_CURRENT_BUFFER ){
-        yyensure_buffer_stack ();
-		YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer(yyin,YY_BUF_SIZE );
-	}
-
-	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-	yy_load_buffer_state( );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * 
- */
-    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
-{
-    
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		yypop_buffer_state();
-	 *		yypush_buffer_state(new_buffer);
-     */
-	yyensure_buffer_stack ();
-	if ( YY_CURRENT_BUFFER == new_buffer )
-		return;
-
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state( );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-static void yy_load_buffer_state  (void)
-{
-    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	(yy_hold_char) = *(yy_c_buf_p);
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
-{
-	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer(b,file );
-
-	return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * 
- */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
-{
-    
-	if ( ! b )
-		return;
-
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yyfree((void *) b->yy_ch_buf  );
-
-	yyfree((void *) b  );
-}
-
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
- */
-    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
-
-{
-	int oerrno = errno;
-    
-	yy_flush_buffer(b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-    /* If b is the current buffer, then yy_init_buffer was _probably_
-     * called from yyrestart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-
-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
-	errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
- */
-    void yy_flush_buffer (YY_BUFFER_STATE  b )
-{
-    	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == YY_CURRENT_BUFFER )
-		yy_load_buffer_state( );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  
- */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
-    	if (new_buffer == NULL)
-		return;
-
-	yyensure_buffer_stack();
-
-	/* This block is copied from yy_switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		(yy_buffer_stack_top)++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from yy_switch_to_buffer. */
-	yy_load_buffer_state( );
-	(yy_did_buffer_switch_on_eof) = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  
- */
-void yypop_buffer_state (void)
-{
-    	if (!YY_CURRENT_BUFFER)
-		return;
-
-	yy_delete_buffer(YY_CURRENT_BUFFER );
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if ((yy_buffer_stack_top) > 0)
-		--(yy_buffer_stack_top);
-
-	if (YY_CURRENT_BUFFER) {
-		yy_load_buffer_state( );
-		(yy_did_buffer_switch_on_eof) = 1;
-	}
-}
-
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void yyensure_buffer_stack (void)
-{
-	yy_size_t num_to_alloc;
-    
-	if (!(yy_buffer_stack)) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
-         */
-		num_to_alloc = 1;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-								  
-		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		(yy_buffer_stack_max) = num_to_alloc;
-		(yy_buffer_stack_top) = 0;
-		return;
-	}
-
-	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
-								((yy_buffer_stack),
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
-		/* zero only the new slots.*/
-		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-		(yy_buffer_stack_max) = num_to_alloc;
-	}
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
-{
-	YY_BUFFER_STATE b;
-    
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer(b  );
-
-	return b;
-}
-
-/** Setup the input buffer state to scan a string. The next call to yylex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
-{
-    
-	return yy_scan_bytes(yystr,strlen(yystr) );
-}
-
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
- * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
-{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	yy_size_t i;
-    
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) yyalloc(n  );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < _yybytes_len; ++i )
-		buf[i] = yybytes[i];
-
-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer(buf,n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-}
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-static void yy_fatal_error (yyconst char* msg )
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		yytext[yyleng] = (yy_hold_char); \
-		(yy_c_buf_p) = yytext + yyless_macro_arg; \
-		(yy_hold_char) = *(yy_c_buf_p); \
-		*(yy_c_buf_p) = '\0'; \
-		yyleng = yyless_macro_arg; \
-		} \
-	while ( 0 )
-
-/* Accessor  methods (get/set functions) to struct members. */
-
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-        
-    return yylineno;
-}
-
-/** Get the input stream.
- * 
- */
-FILE *yyget_in  (void)
-{
-        return yyin;
-}
-
-/** Get the output stream.
- * 
- */
-FILE *yyget_out  (void)
-{
-        return yyout;
-}
-
-/** Get the length of the current token.
- * 
- */
-yy_size_t yyget_leng  (void)
-{
-        return yyleng;
-}
-
-/** Get the current token.
- * 
- */
-
-char *yyget_text  (void)
-{
-        return yytext;
-}
-
-/** Set the current line number.
- * @param line_number
- * 
- */
-void yyset_lineno (int  line_number )
-{
-    
-    yylineno = line_number;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * 
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE *  in_str )
-{
-        yyin = in_str ;
-}
-
-void yyset_out (FILE *  out_str )
-{
-        yyout = out_str ;
-}
-
-int yyget_debug  (void)
-{
-        return yy_flex_debug;
-}
-
-void yyset_debug (int  bdebug )
-{
-        yy_flex_debug = bdebug ;
-}
-
-static int yy_init_globals (void)
-{
-        /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from yylex_destroy(), so don't allocate here.
-     */
-
-    (yy_buffer_stack) = 0;
-    (yy_buffer_stack_top) = 0;
-    (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = (char *) 0;
-    (yy_init) = 0;
-    (yy_start) = 0;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
-    yyin = stdin;
-    yyout = stdout;
-#else
-    yyin = (FILE *) 0;
-    yyout = (FILE *) 0;
-#endif
-
-    /* For future reference: Set errno on error, since we are called by
-     * yylex_init()
-     */
-    return 0;
-}
-
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (void)
-{
-    
-    /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		yy_delete_buffer(YY_CURRENT_BUFFER  );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		yypop_buffer_state();
-	}
-
-	/* Destroy the stack itself. */
-	yyfree((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
-
-    /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * yylex() is called, initialization will occur. */
-    yy_init_globals( );
-
-    return 0;
-}
-
-/*
- * Internal utility routines.
- */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-	int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-}
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
-	int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-}
-#endif
-
-void *yyalloc (yy_size_t  size )
-{
-	return (void *) malloc( size );
-}
-
-void *yyrealloc  (void * ptr, yy_size_t  size )
-{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-}
-
-void yyfree (void * ptr )
-{
-	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
-
diff --git a/contrib/unbound/util/configlexer.lex b/contrib/unbound/util/configlexer.lex
index b36c8af88427..6c22609c0d94 100644
--- a/contrib/unbound/util/configlexer.lex
+++ b/contrib/unbound/util/configlexer.lex
@@ -8,6 +8,8 @@
  *
  */
 
+#include "config.h"
+
 #include <ctype.h>
 #include <string.h>
 #include <strings.h>
@@ -16,7 +18,7 @@
 #endif
 
 #include "util/config_file.h"
-#include "util/configparser.h"
+#include "configparser.h"
 void ub_c_error(const char *message);
 
 #if 0
@@ -26,13 +28,13 @@ void ub_c_error(const char *message);
 #endif
 
 /** avoid warning in about fwrite return value */
-#define ECHO ub_c_error_msg("syntax error at text: %s", yytext)
+#define ECHO ub_c_error_msg("syntax error at text: %s", ub_c_text)
 
 /** A parser variable, this is a statement in the config file which is
  * of the form variable: value1 value2 ...  nargs is the number of values. */
 #define YDVAR(nargs, var) \
 	num_args=(nargs); \
-	LEXOUT(("v(%s%d) ", yytext, num_args)); \
+	LEXOUT(("v(%s%d) ", ub_c_text, num_args)); \
 	if(num_args > 0) { BEGIN(val); } \
 	return (var);
 
@@ -166,7 +168,7 @@ static void config_end_include(void)
 #define yy_set_bol(at_bol) \
         { \
 	        if ( ! yy_current_buffer ) \
-	                yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
+	                yy_current_buffer = yy_create_buffer( ub_c_in, YY_BUF_SIZE ); \
 	        yy_current_buffer->yy_ch_buf[0] = ((at_bol)?'\n':' '); \
         }
 #endif
@@ -200,7 +202,7 @@ SQANY     [^\'\n\r\\]|\\.
 	LEXOUT(("SP ")); /* ignore */ }
 <INITIAL,val>{SPACE}*{COMMENT}.*	{ 
 	/* note that flex makes the longest match and '.' is any but not nl */
-	LEXOUT(("comment(%s) ", yytext)); /* ignore */ }
+	LEXOUT(("comment(%s) ", ub_c_text)); /* ignore */ }
 server{COLON}			{ YDVAR(0, VAR_SERVER) }
 num-threads{COLON}		{ YDVAR(1, VAR_NUM_THREADS) }
 verbosity{COLON}		{ YDVAR(1, VAR_VERBOSITY) }
@@ -308,6 +310,7 @@ log-queries{COLON}		{ YDVAR(1, VAR_LOG_QUERIES) }
 local-zone{COLON}		{ YDVAR(2, VAR_LOCAL_ZONE) }
 local-data{COLON}		{ YDVAR(1, VAR_LOCAL_DATA) }
 local-data-ptr{COLON}		{ YDVAR(1, VAR_LOCAL_DATA_PTR) }
+unblock-lan-zones{COLON}	{ YDVAR(1, VAR_UNBLOCK_LAN_ZONES) }
 statistics-interval{COLON}	{ YDVAR(1, VAR_STATISTICS_INTERVAL) }
 statistics-cumulative{COLON}	{ YDVAR(1, VAR_STATISTICS_CUMULATIVE) }
 extended-statistics{COLON}	{ YDVAR(1, VAR_EXTENDED_STATISTICS) }
@@ -330,71 +333,71 @@ max-udp-size{COLON}		{ YDVAR(1, VAR_MAX_UDP_SIZE) }
 	/* Quoted strings. Strip leading and ending quotes */
 <val>\"			{ BEGIN(quotedstring); LEXOUT(("QS ")); }
 <quotedstring><<EOF>>   {
-        yyerror("EOF inside quoted string");
+        ub_c_error("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
-<quotedstring>{DQANY}*  { LEXOUT(("STR(%s) ", yytext)); yymore(); }
-<quotedstring>{NEWLINE} { yyerror("newline inside quoted string, no end \""); 
+<quotedstring>{DQANY}*  { LEXOUT(("STR(%s) ", ub_c_text)); yymore(); }
+<quotedstring>{NEWLINE} { ub_c_error("newline inside quoted string, no end \""); 
 			  cfg_parser->line++; BEGIN(INITIAL); }
 <quotedstring>\" {
         LEXOUT(("QE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
-        yytext[yyleng - 1] = '\0';
-	yylval.str = strdup(yytext);
-	if(!yylval.str)
-		yyerror("out of memory");
+        ub_c_text[ub_c_leng - 1] = '\0';
+	ub_c_lval.str = strdup(ub_c_text);
+	if(!ub_c_lval.str)
+		ub_c_error("out of memory");
         return STRING_ARG;
 }
 
 	/* Single Quoted strings. Strip leading and ending quotes */
 <val>\'			{ BEGIN(singlequotedstr); LEXOUT(("SQS ")); }
 <singlequotedstr><<EOF>>   {
-        yyerror("EOF inside quoted string");
+        ub_c_error("EOF inside quoted string");
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
 }
-<singlequotedstr>{SQANY}*  { LEXOUT(("STR(%s) ", yytext)); yymore(); }
-<singlequotedstr>{NEWLINE} { yyerror("newline inside quoted string, no end '"); 
+<singlequotedstr>{SQANY}*  { LEXOUT(("STR(%s) ", ub_c_text)); yymore(); }
+<singlequotedstr>{NEWLINE} { ub_c_error("newline inside quoted string, no end '"); 
 			     cfg_parser->line++; BEGIN(INITIAL); }
 <singlequotedstr>\' {
         LEXOUT(("SQE "));
 	if(--num_args == 0) { BEGIN(INITIAL); }
 	else		    { BEGIN(val); }
-        yytext[yyleng - 1] = '\0';
-	yylval.str = strdup(yytext);
-	if(!yylval.str)
-		yyerror("out of memory");
+        ub_c_text[ub_c_leng - 1] = '\0';
+	ub_c_lval.str = strdup(ub_c_text);
+	if(!ub_c_lval.str)
+		ub_c_error("out of memory");
         return STRING_ARG;
 }
 
 	/* include: directive */
 <INITIAL,val>include{COLON}	{ 
-	LEXOUT(("v(%s) ", yytext)); inc_prev = YYSTATE; BEGIN(include); }
+	LEXOUT(("v(%s) ", ub_c_text)); inc_prev = YYSTATE; BEGIN(include); }
 <include><<EOF>>	{
-        yyerror("EOF inside include directive");
+        ub_c_error("EOF inside include directive");
         BEGIN(inc_prev);
 }
 <include>{SPACE}*	{ LEXOUT(("ISP ")); /* ignore */ }
 <include>{NEWLINE}	{ LEXOUT(("NL\n")); cfg_parser->line++;}
 <include>\"		{ LEXOUT(("IQS ")); BEGIN(include_quoted); }
 <include>{UNQUOTEDLETTER}*	{
-	LEXOUT(("Iunquotedstr(%s) ", yytext));
-	config_start_include_glob(yytext);
+	LEXOUT(("Iunquotedstr(%s) ", ub_c_text));
+	config_start_include_glob(ub_c_text);
 	BEGIN(inc_prev);
 }
 <include_quoted><<EOF>>	{
-        yyerror("EOF inside quoted string");
+        ub_c_error("EOF inside quoted string");
         BEGIN(inc_prev);
 }
-<include_quoted>{DQANY}*	{ LEXOUT(("ISTR(%s) ", yytext)); yymore(); }
-<include_quoted>{NEWLINE}	{ yyerror("newline before \" in include name"); 
+<include_quoted>{DQANY}*	{ LEXOUT(("ISTR(%s) ", ub_c_text)); yymore(); }
+<include_quoted>{NEWLINE}	{ ub_c_error("newline before \" in include name"); 
 				  cfg_parser->line++; BEGIN(inc_prev); }
 <include_quoted>\"	{
 	LEXOUT(("IQE "));
-	yytext[yyleng - 1] = '\0';
-	config_start_include_glob(yytext);
+	ub_c_text[ub_c_leng - 1] = '\0';
+	config_start_include_glob(ub_c_text);
 	BEGIN(inc_prev);
 }
 <INITIAL,val><<EOF>>	{
@@ -403,21 +406,21 @@ max-udp-size{COLON}		{ YDVAR(1, VAR_MAX_UDP_SIZE) }
 	if (!config_include_stack) {
 		yyterminate();
 	} else {
-		fclose(yyin);
+		fclose(ub_c_in);
 		config_end_include();
 	}
 }
 
-<val>{UNQUOTEDLETTER}*	{ LEXOUT(("unquotedstr(%s) ", yytext)); 
+<val>{UNQUOTEDLETTER}*	{ LEXOUT(("unquotedstr(%s) ", ub_c_text)); 
 			if(--num_args == 0) { BEGIN(INITIAL); }
-			yylval.str = strdup(yytext); return STRING_ARG; }
+			ub_c_lval.str = strdup(ub_c_text); return STRING_ARG; }
 
 {UNQUOTEDLETTER_NOCOLON}*	{
-	ub_c_error_msg("unknown keyword '%s'", yytext);
+	ub_c_error_msg("unknown keyword '%s'", ub_c_text);
 	}
 
 <*>.	{
-	ub_c_error_msg("stray '%s'", yytext);
+	ub_c_error_msg("stray '%s'", ub_c_text);
 	}
 
 %%
diff --git a/contrib/unbound/util/configparser.c b/contrib/unbound/util/configparser.c
deleted file mode 100644
index f2db7c903017..000000000000
--- a/contrib/unbound/util/configparser.c
+++ /dev/null
@@ -1,2376 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 39 "util/configparser.y"
-#include "config.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "util/configyyrename.h"
-#include "util/config_file.h"
-#include "util/net_help.h"
-
-int ub_c_lex(void);
-void ub_c_error(const char *message);
-
-/* these need to be global, otherwise they cannot be used inside yacc */
-extern struct config_parser_state* cfg_parser;
-
-#if 0
-#define OUTYY(s)  printf s /* used ONLY when debugging */
-#else
-#define OUTYY(s)
-#endif
-
-#line 64 "util/configparser.y"
-#ifdef YYSTYPE
-#undef  YYSTYPE_IS_DECLARED
-#define YYSTYPE_IS_DECLARED 1
-#endif
-#ifndef YYSTYPE_IS_DECLARED
-#define YYSTYPE_IS_DECLARED 1
-typedef union {
-	char*	str;
-} YYSTYPE;
-#endif /* !YYSTYPE_IS_DECLARED */
-#line 54 "util/configparser.c"
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define SPACE 257
-#define LETTER 258
-#define NEWLINE 259
-#define COMMENT 260
-#define COLON 261
-#define ANY 262
-#define ZONESTR 263
-#define STRING_ARG 264
-#define VAR_SERVER 265
-#define VAR_VERBOSITY 266
-#define VAR_NUM_THREADS 267
-#define VAR_PORT 268
-#define VAR_OUTGOING_RANGE 269
-#define VAR_INTERFACE 270
-#define VAR_DO_IP4 271
-#define VAR_DO_IP6 272
-#define VAR_DO_UDP 273
-#define VAR_DO_TCP 274
-#define VAR_CHROOT 275
-#define VAR_USERNAME 276
-#define VAR_DIRECTORY 277
-#define VAR_LOGFILE 278
-#define VAR_PIDFILE 279
-#define VAR_MSG_CACHE_SIZE 280
-#define VAR_MSG_CACHE_SLABS 281
-#define VAR_NUM_QUERIES_PER_THREAD 282
-#define VAR_RRSET_CACHE_SIZE 283
-#define VAR_RRSET_CACHE_SLABS 284
-#define VAR_OUTGOING_NUM_TCP 285
-#define VAR_INFRA_HOST_TTL 286
-#define VAR_INFRA_LAME_TTL 287
-#define VAR_INFRA_CACHE_SLABS 288
-#define VAR_INFRA_CACHE_NUMHOSTS 289
-#define VAR_INFRA_CACHE_LAME_SIZE 290
-#define VAR_NAME 291
-#define VAR_STUB_ZONE 292
-#define VAR_STUB_HOST 293
-#define VAR_STUB_ADDR 294
-#define VAR_TARGET_FETCH_POLICY 295
-#define VAR_HARDEN_SHORT_BUFSIZE 296
-#define VAR_HARDEN_LARGE_QUERIES 297
-#define VAR_FORWARD_ZONE 298
-#define VAR_FORWARD_HOST 299
-#define VAR_FORWARD_ADDR 300
-#define VAR_DO_NOT_QUERY_ADDRESS 301
-#define VAR_HIDE_IDENTITY 302
-#define VAR_HIDE_VERSION 303
-#define VAR_IDENTITY 304
-#define VAR_VERSION 305
-#define VAR_HARDEN_GLUE 306
-#define VAR_MODULE_CONF 307
-#define VAR_TRUST_ANCHOR_FILE 308
-#define VAR_TRUST_ANCHOR 309
-#define VAR_VAL_OVERRIDE_DATE 310
-#define VAR_BOGUS_TTL 311
-#define VAR_VAL_CLEAN_ADDITIONAL 312
-#define VAR_VAL_PERMISSIVE_MODE 313
-#define VAR_INCOMING_NUM_TCP 314
-#define VAR_MSG_BUFFER_SIZE 315
-#define VAR_KEY_CACHE_SIZE 316
-#define VAR_KEY_CACHE_SLABS 317
-#define VAR_TRUSTED_KEYS_FILE 318
-#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 319
-#define VAR_USE_SYSLOG 320
-#define VAR_OUTGOING_INTERFACE 321
-#define VAR_ROOT_HINTS 322
-#define VAR_DO_NOT_QUERY_LOCALHOST 323
-#define VAR_CACHE_MAX_TTL 324
-#define VAR_HARDEN_DNSSEC_STRIPPED 325
-#define VAR_ACCESS_CONTROL 326
-#define VAR_LOCAL_ZONE 327
-#define VAR_LOCAL_DATA 328
-#define VAR_INTERFACE_AUTOMATIC 329
-#define VAR_STATISTICS_INTERVAL 330
-#define VAR_DO_DAEMONIZE 331
-#define VAR_USE_CAPS_FOR_ID 332
-#define VAR_STATISTICS_CUMULATIVE 333
-#define VAR_OUTGOING_PORT_PERMIT 334
-#define VAR_OUTGOING_PORT_AVOID 335
-#define VAR_DLV_ANCHOR_FILE 336
-#define VAR_DLV_ANCHOR 337
-#define VAR_NEG_CACHE_SIZE 338
-#define VAR_HARDEN_REFERRAL_PATH 339
-#define VAR_PRIVATE_ADDRESS 340
-#define VAR_PRIVATE_DOMAIN 341
-#define VAR_REMOTE_CONTROL 342
-#define VAR_CONTROL_ENABLE 343
-#define VAR_CONTROL_INTERFACE 344
-#define VAR_CONTROL_PORT 345
-#define VAR_SERVER_KEY_FILE 346
-#define VAR_SERVER_CERT_FILE 347
-#define VAR_CONTROL_KEY_FILE 348
-#define VAR_CONTROL_CERT_FILE 349
-#define VAR_EXTENDED_STATISTICS 350
-#define VAR_LOCAL_DATA_PTR 351
-#define VAR_JOSTLE_TIMEOUT 352
-#define VAR_STUB_PRIME 353
-#define VAR_UNWANTED_REPLY_THRESHOLD 354
-#define VAR_LOG_TIME_ASCII 355
-#define VAR_DOMAIN_INSECURE 356
-#define VAR_PYTHON 357
-#define VAR_PYTHON_SCRIPT 358
-#define VAR_VAL_SIG_SKEW_MIN 359
-#define VAR_VAL_SIG_SKEW_MAX 360
-#define VAR_CACHE_MIN_TTL 361
-#define VAR_VAL_LOG_LEVEL 362
-#define VAR_AUTO_TRUST_ANCHOR_FILE 363
-#define VAR_KEEP_MISSING 364
-#define VAR_ADD_HOLDDOWN 365
-#define VAR_DEL_HOLDDOWN 366
-#define VAR_SO_RCVBUF 367
-#define VAR_EDNS_BUFFER_SIZE 368
-#define VAR_PREFETCH 369
-#define VAR_PREFETCH_KEY 370
-#define VAR_SO_SNDBUF 371
-#define VAR_SO_REUSEPORT 372
-#define VAR_HARDEN_BELOW_NXDOMAIN 373
-#define VAR_IGNORE_CD_FLAG 374
-#define VAR_LOG_QUERIES 375
-#define VAR_TCP_UPSTREAM 376
-#define VAR_SSL_UPSTREAM 377
-#define VAR_SSL_SERVICE_KEY 378
-#define VAR_SSL_SERVICE_PEM 379
-#define VAR_SSL_PORT 380
-#define VAR_FORWARD_FIRST 381
-#define VAR_STUB_FIRST 382
-#define VAR_MINIMAL_RESPONSES 383
-#define VAR_RRSET_ROUNDROBIN 384
-#define VAR_MAX_UDP_SIZE 385
-#define VAR_DELAY_CLOSE 386
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    0,    1,    1,    1,    1,    1,    2,    3,    3,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,    4,    5,    5,  114,  114,  114,  114,  114,    6,
-    7,    7,  120,  120,  120,  120,   13,   14,   70,   73,
-   82,   15,   21,   61,   16,   74,   75,   32,   54,   69,
-   17,   18,   19,   20,  104,  105,  106,  107,  108,   71,
-   60,   86,  103,   22,   23,   24,   25,   26,   62,   76,
-   77,   92,   48,   58,   49,   87,   42,   43,   44,   45,
-   96,  100,  112,   97,   55,   27,   28,   29,   84,  113,
-   30,   31,   33,   34,   36,   37,   35,   38,   39,   40,
-   46,   65,  101,   79,   72,   80,   81,   98,   99,   85,
-   41,   63,   66,   47,   50,   88,   89,   64,   90,   51,
-   52,   53,  102,   91,   59,   93,   94,   95,   56,   57,
-   78,   67,   68,   83,  109,  110,  111,  115,  116,  117,
-  119,  118,  121,  122,  123,  124,   10,   11,   11,  125,
-  125,  125,  125,  125,  125,  125,  126,  128,  127,  129,
-  130,  131,  132,    8,    9,    9,  133,  134,
-};
-static const short yylen[] = {                            2,
-    0,    2,    2,    2,    2,    2,    2,    1,    2,    0,
-    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,    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,    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,    1,    1,    1,    1,
-    1,    1,    2,    0,    1,    1,    1,    1,    1,    1,
-    2,    0,    1,    1,    1,    1,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    3,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    3,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    1,    2,    0,    1,
-    1,    1,    1,    1,    1,    1,    2,    2,    2,    2,
-    2,    2,    2,    1,    2,    0,    1,    2,
-};
-static const short yydefred[] = {                         1,
-    0,    8,  112,  120,  237,  254,    2,   10,  114,  122,
-  256,  239,    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,    0,    0,    0,    0,    9,   11,
-   12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
-   22,   23,   24,   25,   26,   27,   28,   29,   30,   31,
-   32,   33,   34,   35,   36,   37,   38,   39,   40,   41,
-   42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
-   52,   53,   54,   55,   56,   57,   58,   59,   60,   61,
-   62,   63,   64,   65,   66,   67,   68,   69,   70,   71,
-   72,   73,   74,   75,   76,   77,   78,   79,   80,   81,
-   82,   83,   84,   85,   86,   87,   88,   89,   90,   91,
-   92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
-  102,  103,  104,  105,  106,  107,  108,  109,  110,  111,
-    0,    0,    0,    0,    0,  113,  115,  116,  117,  118,
-  119,    0,    0,    0,    0,  121,  123,  124,  125,  126,
-    0,  255,  257,    0,    0,    0,    0,    0,    0,    0,
-  238,  240,  241,  242,  243,  244,  245,  246,  128,  127,
-  132,  135,  133,  141,  142,  143,  144,  154,  155,  156,
-  157,  158,  176,  177,  178,  181,  182,  138,  183,  184,
-  187,  185,  186,  188,  189,  190,  201,  167,  168,  169,
-  170,  191,  204,  163,  165,  205,  210,  211,  212,  139,
-  175,  219,  220,  164,  215,  151,  134,  159,  202,  208,
-  192,    0,    0,  223,  140,  129,  150,  195,  130,  136,
-  137,  160,  161,  221,  194,  196,  197,  131,  224,  179,
-  200,  152,  166,  206,  207,  209,  214,  162,  218,  216,
-  217,  171,  174,  198,  199,  172,  173,  193,  213,  153,
-  145,  146,  147,  148,  149,  225,  226,  227,  180,  228,
-  229,  230,  232,  231,  233,  234,  235,  236,  258,  247,
-  249,  248,  250,  251,  252,  253,  203,  222,
-};
-static const short yydgoto[] = {                          1,
-    7,    8,   13,    9,   14,   10,   15,   11,   16,   12,
-   17,  119,  120,  121,  122,  123,  124,  125,  126,  127,
-  128,  129,  130,  131,  132,  133,  134,  135,  136,  137,
-  138,  139,  140,  141,  142,  143,  144,  145,  146,  147,
-  148,  149,  150,  151,  152,  153,  154,  155,  156,  157,
-  158,  159,  160,  161,  162,  163,  164,  165,  166,  167,
-  168,  169,  170,  171,  172,  173,  174,  175,  176,  177,
-  178,  179,  180,  181,  182,  183,  184,  185,  186,  187,
-  188,  189,  190,  191,  192,  193,  194,  195,  196,  197,
-  198,  199,  200,  201,  202,  203,  204,  205,  206,  207,
-  208,  209,  210,  211,  212,  213,  214,  215,  216,  217,
-  218,  219,  220,  226,  227,  228,  229,  230,  231,  236,
-  237,  238,  239,  240,  251,  252,  253,  254,  255,  256,
-  257,  258,  242,  243,
-};
-static const short yysindex[] = {                         0,
- -144,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0, -260, -209, -202, -358, -216, -233, -232, -231,
- -230, -226, -225, -224, -181, -178, -177, -176, -171, -142,
- -130, -129, -128, -127, -126, -125, -124, -123, -122, -121,
- -119, -118, -117, -115, -114, -113, -112, -111, -109, -108,
- -107, -106, -105, -104, -103, -102, -101, -100,  -99,  -98,
-  -97,  -96,  -95,  -94,  -93,  -92,  -90,  -89,  -88,  -87,
-  -86,  -84,  -83,  -82,  -81,  -80,  -79,  -78,  -77,  -76,
-  -75,  -74,  -73,  -72,  -71,  -70,  -69,  -68,  -67,  -65,
-  -64,  -63,  -62,  -61,  -60,  -59,  -58,  -57,  -56,  -55,
-  -54,  -53,  -52,  -50,  -49,  -48,  -47,  -46,  -45,  -44,
-  -43,  -42,  -41,  -40,  -39,  -38,  -37,  -36,    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,
-  -35,  -34,  -33,  -32,  -31,    0,    0,    0,    0,    0,
-    0,  -30,  -29,  -28,  -27,    0,    0,    0,    0,    0,
-  -26,    0,    0,  -25,  -24,  -23,  -22,  -21,  -20,  -19,
-    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,  -18,  -17,    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,
-};
-static const short yyrindex[] = {                         0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    1,    2,    3,    4,    5,    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,    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,    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,    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,
-};
-static const short yygindex[] = {                         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,    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,
-};
-#define YYTABLESIZE 362
-static const short yytable[] = {                        241,
-    3,    4,    5,    6,    7,   18,   19,   20,   21,   22,
-   23,   24,   25,   26,   27,   28,   29,   30,   31,   32,
-   33,   34,   35,   36,   37,   38,   39,   40,   41,   42,
-  259,  260,  261,  262,   43,   44,   45,  263,  264,  265,
-   46,   47,   48,   49,   50,   51,   52,   53,   54,   55,
-   56,   57,   58,   59,   60,   61,   62,   63,   64,   65,
-   66,   67,   68,   69,   70,   71,   72,   73,   74,   75,
-   76,   77,   78,   79,   80,   81,   82,   83,   84,   85,
-   86,  221,  266,  222,  223,  267,  268,  269,  232,   87,
-   88,   89,  270,   90,   91,   92,  233,  234,   93,   94,
-   95,   96,   97,   98,   99,  100,  101,  102,  103,  104,
-  105,  106,  107,  108,  109,  110,  111,  112,  113,  114,
-    2,  271,  115,  116,  117,  118,  244,  245,  246,  247,
-  248,  249,  250,  272,  273,  274,  275,  276,  277,  278,
-  279,  280,  281,  224,  282,  283,  284,    3,  285,  286,
-  287,  288,  289,    4,  290,  291,  292,  293,  294,  295,
-  296,  297,  298,  299,  300,  301,  302,  303,  304,  305,
-  306,  307,  225,  308,  309,  310,  311,  312,  235,  313,
-  314,  315,  316,  317,  318,  319,  320,  321,  322,  323,
-  324,  325,  326,  327,  328,  329,  330,    5,  331,  332,
-  333,  334,  335,  336,  337,  338,  339,  340,  341,  342,
-  343,  344,    6,  345,  346,  347,  348,  349,  350,  351,
-  352,  353,  354,  355,  356,  357,  358,  359,  360,  361,
-  362,  363,  364,  365,  366,  367,  368,  369,  370,  371,
-  372,  373,  374,  375,  376,  377,  378,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    3,    4,    5,    6,    7,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    3,    4,    5,    6,    7,    0,    3,    4,
-    5,    6,    7,    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,    3,    4,    5,    6,    7,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    3,    4,    5,
-    6,    7,
-};
-static const short yycheck[] = {                        358,
-    0,    0,    0,    0,    0,  266,  267,  268,  269,  270,
-  271,  272,  273,  274,  275,  276,  277,  278,  279,  280,
-  281,  282,  283,  284,  285,  286,  287,  288,  289,  290,
-  264,  264,  264,  264,  295,  296,  297,  264,  264,  264,
-  301,  302,  303,  304,  305,  306,  307,  308,  309,  310,
-  311,  312,  313,  314,  315,  316,  317,  318,  319,  320,
-  321,  322,  323,  324,  325,  326,  327,  328,  329,  330,
-  331,  332,  333,  334,  335,  336,  337,  338,  339,  340,
-  341,  291,  264,  293,  294,  264,  264,  264,  291,  350,
-  351,  352,  264,  354,  355,  356,  299,  300,  359,  360,
-  361,  362,  363,  364,  365,  366,  367,  368,  369,  370,
-  371,  372,  373,  374,  375,  376,  377,  378,  379,  380,
-  265,  264,  383,  384,  385,  386,  343,  344,  345,  346,
-  347,  348,  349,  264,  264,  264,  264,  264,  264,  264,
-  264,  264,  264,  353,  264,  264,  264,  292,  264,  264,
-  264,  264,  264,  298,  264,  264,  264,  264,  264,  264,
-  264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
-  264,  264,  382,  264,  264,  264,  264,  264,  381,  264,
-  264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
-  264,  264,  264,  264,  264,  264,  264,  342,  264,  264,
-  264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
-  264,  264,  357,  264,  264,  264,  264,  264,  264,  264,
-  264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
-  264,  264,  264,  264,  264,  264,  264,  264,  264,  264,
-  264,  264,  264,  264,  264,  264,  264,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  265,  265,  265,  265,  265,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  292,  292,  292,  292,  292,   -1,  298,  298,
-  298,  298,  298,   -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,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  342,  342,  342,  342,  342,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  357,  357,  357,
-  357,  357,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 386
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file",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,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,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,"SPACE","LETTER","NEWLINE",
-"COMMENT","COLON","ANY","ZONESTR","STRING_ARG","VAR_SERVER","VAR_VERBOSITY",
-"VAR_NUM_THREADS","VAR_PORT","VAR_OUTGOING_RANGE","VAR_INTERFACE","VAR_DO_IP4",
-"VAR_DO_IP6","VAR_DO_UDP","VAR_DO_TCP","VAR_CHROOT","VAR_USERNAME",
-"VAR_DIRECTORY","VAR_LOGFILE","VAR_PIDFILE","VAR_MSG_CACHE_SIZE",
-"VAR_MSG_CACHE_SLABS","VAR_NUM_QUERIES_PER_THREAD","VAR_RRSET_CACHE_SIZE",
-"VAR_RRSET_CACHE_SLABS","VAR_OUTGOING_NUM_TCP","VAR_INFRA_HOST_TTL",
-"VAR_INFRA_LAME_TTL","VAR_INFRA_CACHE_SLABS","VAR_INFRA_CACHE_NUMHOSTS",
-"VAR_INFRA_CACHE_LAME_SIZE","VAR_NAME","VAR_STUB_ZONE","VAR_STUB_HOST",
-"VAR_STUB_ADDR","VAR_TARGET_FETCH_POLICY","VAR_HARDEN_SHORT_BUFSIZE",
-"VAR_HARDEN_LARGE_QUERIES","VAR_FORWARD_ZONE","VAR_FORWARD_HOST",
-"VAR_FORWARD_ADDR","VAR_DO_NOT_QUERY_ADDRESS","VAR_HIDE_IDENTITY",
-"VAR_HIDE_VERSION","VAR_IDENTITY","VAR_VERSION","VAR_HARDEN_GLUE",
-"VAR_MODULE_CONF","VAR_TRUST_ANCHOR_FILE","VAR_TRUST_ANCHOR",
-"VAR_VAL_OVERRIDE_DATE","VAR_BOGUS_TTL","VAR_VAL_CLEAN_ADDITIONAL",
-"VAR_VAL_PERMISSIVE_MODE","VAR_INCOMING_NUM_TCP","VAR_MSG_BUFFER_SIZE",
-"VAR_KEY_CACHE_SIZE","VAR_KEY_CACHE_SLABS","VAR_TRUSTED_KEYS_FILE",
-"VAR_VAL_NSEC3_KEYSIZE_ITERATIONS","VAR_USE_SYSLOG","VAR_OUTGOING_INTERFACE",
-"VAR_ROOT_HINTS","VAR_DO_NOT_QUERY_LOCALHOST","VAR_CACHE_MAX_TTL",
-"VAR_HARDEN_DNSSEC_STRIPPED","VAR_ACCESS_CONTROL","VAR_LOCAL_ZONE",
-"VAR_LOCAL_DATA","VAR_INTERFACE_AUTOMATIC","VAR_STATISTICS_INTERVAL",
-"VAR_DO_DAEMONIZE","VAR_USE_CAPS_FOR_ID","VAR_STATISTICS_CUMULATIVE",
-"VAR_OUTGOING_PORT_PERMIT","VAR_OUTGOING_PORT_AVOID","VAR_DLV_ANCHOR_FILE",
-"VAR_DLV_ANCHOR","VAR_NEG_CACHE_SIZE","VAR_HARDEN_REFERRAL_PATH",
-"VAR_PRIVATE_ADDRESS","VAR_PRIVATE_DOMAIN","VAR_REMOTE_CONTROL",
-"VAR_CONTROL_ENABLE","VAR_CONTROL_INTERFACE","VAR_CONTROL_PORT",
-"VAR_SERVER_KEY_FILE","VAR_SERVER_CERT_FILE","VAR_CONTROL_KEY_FILE",
-"VAR_CONTROL_CERT_FILE","VAR_EXTENDED_STATISTICS","VAR_LOCAL_DATA_PTR",
-"VAR_JOSTLE_TIMEOUT","VAR_STUB_PRIME","VAR_UNWANTED_REPLY_THRESHOLD",
-"VAR_LOG_TIME_ASCII","VAR_DOMAIN_INSECURE","VAR_PYTHON","VAR_PYTHON_SCRIPT",
-"VAR_VAL_SIG_SKEW_MIN","VAR_VAL_SIG_SKEW_MAX","VAR_CACHE_MIN_TTL",
-"VAR_VAL_LOG_LEVEL","VAR_AUTO_TRUST_ANCHOR_FILE","VAR_KEEP_MISSING",
-"VAR_ADD_HOLDDOWN","VAR_DEL_HOLDDOWN","VAR_SO_RCVBUF","VAR_EDNS_BUFFER_SIZE",
-"VAR_PREFETCH","VAR_PREFETCH_KEY","VAR_SO_SNDBUF","VAR_SO_REUSEPORT",
-"VAR_HARDEN_BELOW_NXDOMAIN","VAR_IGNORE_CD_FLAG","VAR_LOG_QUERIES",
-"VAR_TCP_UPSTREAM","VAR_SSL_UPSTREAM","VAR_SSL_SERVICE_KEY",
-"VAR_SSL_SERVICE_PEM","VAR_SSL_PORT","VAR_FORWARD_FIRST","VAR_STUB_FIRST",
-"VAR_MINIMAL_RESPONSES","VAR_RRSET_ROUNDROBIN","VAR_MAX_UDP_SIZE",
-"VAR_DELAY_CLOSE",
-};
-static const char *yyrule[] = {
-"$accept : toplevelvars",
-"toplevelvars :",
-"toplevelvars : toplevelvars toplevelvar",
-"toplevelvar : serverstart contents_server",
-"toplevelvar : stubstart contents_stub",
-"toplevelvar : forwardstart contents_forward",
-"toplevelvar : pythonstart contents_py",
-"toplevelvar : rcstart contents_rc",
-"serverstart : VAR_SERVER",
-"contents_server : contents_server content_server",
-"contents_server :",
-"content_server : server_num_threads",
-"content_server : server_verbosity",
-"content_server : server_port",
-"content_server : server_outgoing_range",
-"content_server : server_do_ip4",
-"content_server : server_do_ip6",
-"content_server : server_do_udp",
-"content_server : server_do_tcp",
-"content_server : server_interface",
-"content_server : server_chroot",
-"content_server : server_username",
-"content_server : server_directory",
-"content_server : server_logfile",
-"content_server : server_pidfile",
-"content_server : server_msg_cache_size",
-"content_server : server_msg_cache_slabs",
-"content_server : server_num_queries_per_thread",
-"content_server : server_rrset_cache_size",
-"content_server : server_rrset_cache_slabs",
-"content_server : server_outgoing_num_tcp",
-"content_server : server_infra_host_ttl",
-"content_server : server_infra_lame_ttl",
-"content_server : server_infra_cache_slabs",
-"content_server : server_infra_cache_numhosts",
-"content_server : server_infra_cache_lame_size",
-"content_server : server_target_fetch_policy",
-"content_server : server_harden_short_bufsize",
-"content_server : server_harden_large_queries",
-"content_server : server_do_not_query_address",
-"content_server : server_hide_identity",
-"content_server : server_hide_version",
-"content_server : server_identity",
-"content_server : server_version",
-"content_server : server_harden_glue",
-"content_server : server_module_conf",
-"content_server : server_trust_anchor_file",
-"content_server : server_trust_anchor",
-"content_server : server_val_override_date",
-"content_server : server_bogus_ttl",
-"content_server : server_val_clean_additional",
-"content_server : server_val_permissive_mode",
-"content_server : server_incoming_num_tcp",
-"content_server : server_msg_buffer_size",
-"content_server : server_key_cache_size",
-"content_server : server_key_cache_slabs",
-"content_server : server_trusted_keys_file",
-"content_server : server_val_nsec3_keysize_iterations",
-"content_server : server_use_syslog",
-"content_server : server_outgoing_interface",
-"content_server : server_root_hints",
-"content_server : server_do_not_query_localhost",
-"content_server : server_cache_max_ttl",
-"content_server : server_harden_dnssec_stripped",
-"content_server : server_access_control",
-"content_server : server_local_zone",
-"content_server : server_local_data",
-"content_server : server_interface_automatic",
-"content_server : server_statistics_interval",
-"content_server : server_do_daemonize",
-"content_server : server_use_caps_for_id",
-"content_server : server_statistics_cumulative",
-"content_server : server_outgoing_port_permit",
-"content_server : server_outgoing_port_avoid",
-"content_server : server_dlv_anchor_file",
-"content_server : server_dlv_anchor",
-"content_server : server_neg_cache_size",
-"content_server : server_harden_referral_path",
-"content_server : server_private_address",
-"content_server : server_private_domain",
-"content_server : server_extended_statistics",
-"content_server : server_local_data_ptr",
-"content_server : server_jostle_timeout",
-"content_server : server_unwanted_reply_threshold",
-"content_server : server_log_time_ascii",
-"content_server : server_domain_insecure",
-"content_server : server_val_sig_skew_min",
-"content_server : server_val_sig_skew_max",
-"content_server : server_cache_min_ttl",
-"content_server : server_val_log_level",
-"content_server : server_auto_trust_anchor_file",
-"content_server : server_add_holddown",
-"content_server : server_del_holddown",
-"content_server : server_keep_missing",
-"content_server : server_so_rcvbuf",
-"content_server : server_edns_buffer_size",
-"content_server : server_prefetch",
-"content_server : server_prefetch_key",
-"content_server : server_so_sndbuf",
-"content_server : server_harden_below_nxdomain",
-"content_server : server_ignore_cd_flag",
-"content_server : server_log_queries",
-"content_server : server_tcp_upstream",
-"content_server : server_ssl_upstream",
-"content_server : server_ssl_service_key",
-"content_server : server_ssl_service_pem",
-"content_server : server_ssl_port",
-"content_server : server_minimal_responses",
-"content_server : server_rrset_roundrobin",
-"content_server : server_max_udp_size",
-"content_server : server_so_reuseport",
-"content_server : server_delay_close",
-"stubstart : VAR_STUB_ZONE",
-"contents_stub : contents_stub content_stub",
-"contents_stub :",
-"content_stub : stub_name",
-"content_stub : stub_host",
-"content_stub : stub_addr",
-"content_stub : stub_prime",
-"content_stub : stub_first",
-"forwardstart : VAR_FORWARD_ZONE",
-"contents_forward : contents_forward content_forward",
-"contents_forward :",
-"content_forward : forward_name",
-"content_forward : forward_host",
-"content_forward : forward_addr",
-"content_forward : forward_first",
-"server_num_threads : VAR_NUM_THREADS STRING_ARG",
-"server_verbosity : VAR_VERBOSITY STRING_ARG",
-"server_statistics_interval : VAR_STATISTICS_INTERVAL STRING_ARG",
-"server_statistics_cumulative : VAR_STATISTICS_CUMULATIVE STRING_ARG",
-"server_extended_statistics : VAR_EXTENDED_STATISTICS STRING_ARG",
-"server_port : VAR_PORT STRING_ARG",
-"server_interface : VAR_INTERFACE STRING_ARG",
-"server_outgoing_interface : VAR_OUTGOING_INTERFACE STRING_ARG",
-"server_outgoing_range : VAR_OUTGOING_RANGE STRING_ARG",
-"server_outgoing_port_permit : VAR_OUTGOING_PORT_PERMIT STRING_ARG",
-"server_outgoing_port_avoid : VAR_OUTGOING_PORT_AVOID STRING_ARG",
-"server_outgoing_num_tcp : VAR_OUTGOING_NUM_TCP STRING_ARG",
-"server_incoming_num_tcp : VAR_INCOMING_NUM_TCP STRING_ARG",
-"server_interface_automatic : VAR_INTERFACE_AUTOMATIC STRING_ARG",
-"server_do_ip4 : VAR_DO_IP4 STRING_ARG",
-"server_do_ip6 : VAR_DO_IP6 STRING_ARG",
-"server_do_udp : VAR_DO_UDP STRING_ARG",
-"server_do_tcp : VAR_DO_TCP STRING_ARG",
-"server_tcp_upstream : VAR_TCP_UPSTREAM STRING_ARG",
-"server_ssl_upstream : VAR_SSL_UPSTREAM STRING_ARG",
-"server_ssl_service_key : VAR_SSL_SERVICE_KEY STRING_ARG",
-"server_ssl_service_pem : VAR_SSL_SERVICE_PEM STRING_ARG",
-"server_ssl_port : VAR_SSL_PORT STRING_ARG",
-"server_do_daemonize : VAR_DO_DAEMONIZE STRING_ARG",
-"server_use_syslog : VAR_USE_SYSLOG STRING_ARG",
-"server_log_time_ascii : VAR_LOG_TIME_ASCII STRING_ARG",
-"server_log_queries : VAR_LOG_QUERIES STRING_ARG",
-"server_chroot : VAR_CHROOT STRING_ARG",
-"server_username : VAR_USERNAME STRING_ARG",
-"server_directory : VAR_DIRECTORY STRING_ARG",
-"server_logfile : VAR_LOGFILE STRING_ARG",
-"server_pidfile : VAR_PIDFILE STRING_ARG",
-"server_root_hints : VAR_ROOT_HINTS STRING_ARG",
-"server_dlv_anchor_file : VAR_DLV_ANCHOR_FILE STRING_ARG",
-"server_dlv_anchor : VAR_DLV_ANCHOR STRING_ARG",
-"server_auto_trust_anchor_file : VAR_AUTO_TRUST_ANCHOR_FILE STRING_ARG",
-"server_trust_anchor_file : VAR_TRUST_ANCHOR_FILE STRING_ARG",
-"server_trusted_keys_file : VAR_TRUSTED_KEYS_FILE STRING_ARG",
-"server_trust_anchor : VAR_TRUST_ANCHOR STRING_ARG",
-"server_domain_insecure : VAR_DOMAIN_INSECURE STRING_ARG",
-"server_hide_identity : VAR_HIDE_IDENTITY STRING_ARG",
-"server_hide_version : VAR_HIDE_VERSION STRING_ARG",
-"server_identity : VAR_IDENTITY STRING_ARG",
-"server_version : VAR_VERSION STRING_ARG",
-"server_so_rcvbuf : VAR_SO_RCVBUF STRING_ARG",
-"server_so_sndbuf : VAR_SO_SNDBUF STRING_ARG",
-"server_so_reuseport : VAR_SO_REUSEPORT STRING_ARG",
-"server_edns_buffer_size : VAR_EDNS_BUFFER_SIZE STRING_ARG",
-"server_msg_buffer_size : VAR_MSG_BUFFER_SIZE STRING_ARG",
-"server_msg_cache_size : VAR_MSG_CACHE_SIZE STRING_ARG",
-"server_msg_cache_slabs : VAR_MSG_CACHE_SLABS STRING_ARG",
-"server_num_queries_per_thread : VAR_NUM_QUERIES_PER_THREAD STRING_ARG",
-"server_jostle_timeout : VAR_JOSTLE_TIMEOUT STRING_ARG",
-"server_delay_close : VAR_DELAY_CLOSE STRING_ARG",
-"server_rrset_cache_size : VAR_RRSET_CACHE_SIZE STRING_ARG",
-"server_rrset_cache_slabs : VAR_RRSET_CACHE_SLABS STRING_ARG",
-"server_infra_host_ttl : VAR_INFRA_HOST_TTL STRING_ARG",
-"server_infra_lame_ttl : VAR_INFRA_LAME_TTL STRING_ARG",
-"server_infra_cache_numhosts : VAR_INFRA_CACHE_NUMHOSTS STRING_ARG",
-"server_infra_cache_lame_size : VAR_INFRA_CACHE_LAME_SIZE STRING_ARG",
-"server_infra_cache_slabs : VAR_INFRA_CACHE_SLABS STRING_ARG",
-"server_target_fetch_policy : VAR_TARGET_FETCH_POLICY STRING_ARG",
-"server_harden_short_bufsize : VAR_HARDEN_SHORT_BUFSIZE STRING_ARG",
-"server_harden_large_queries : VAR_HARDEN_LARGE_QUERIES STRING_ARG",
-"server_harden_glue : VAR_HARDEN_GLUE STRING_ARG",
-"server_harden_dnssec_stripped : VAR_HARDEN_DNSSEC_STRIPPED STRING_ARG",
-"server_harden_below_nxdomain : VAR_HARDEN_BELOW_NXDOMAIN STRING_ARG",
-"server_harden_referral_path : VAR_HARDEN_REFERRAL_PATH STRING_ARG",
-"server_use_caps_for_id : VAR_USE_CAPS_FOR_ID STRING_ARG",
-"server_private_address : VAR_PRIVATE_ADDRESS STRING_ARG",
-"server_private_domain : VAR_PRIVATE_DOMAIN STRING_ARG",
-"server_prefetch : VAR_PREFETCH STRING_ARG",
-"server_prefetch_key : VAR_PREFETCH_KEY STRING_ARG",
-"server_unwanted_reply_threshold : VAR_UNWANTED_REPLY_THRESHOLD STRING_ARG",
-"server_do_not_query_address : VAR_DO_NOT_QUERY_ADDRESS STRING_ARG",
-"server_do_not_query_localhost : VAR_DO_NOT_QUERY_LOCALHOST STRING_ARG",
-"server_access_control : VAR_ACCESS_CONTROL STRING_ARG STRING_ARG",
-"server_module_conf : VAR_MODULE_CONF STRING_ARG",
-"server_val_override_date : VAR_VAL_OVERRIDE_DATE STRING_ARG",
-"server_val_sig_skew_min : VAR_VAL_SIG_SKEW_MIN STRING_ARG",
-"server_val_sig_skew_max : VAR_VAL_SIG_SKEW_MAX STRING_ARG",
-"server_cache_max_ttl : VAR_CACHE_MAX_TTL STRING_ARG",
-"server_cache_min_ttl : VAR_CACHE_MIN_TTL STRING_ARG",
-"server_bogus_ttl : VAR_BOGUS_TTL STRING_ARG",
-"server_val_clean_additional : VAR_VAL_CLEAN_ADDITIONAL STRING_ARG",
-"server_val_permissive_mode : VAR_VAL_PERMISSIVE_MODE STRING_ARG",
-"server_ignore_cd_flag : VAR_IGNORE_CD_FLAG STRING_ARG",
-"server_val_log_level : VAR_VAL_LOG_LEVEL STRING_ARG",
-"server_val_nsec3_keysize_iterations : VAR_VAL_NSEC3_KEYSIZE_ITERATIONS STRING_ARG",
-"server_add_holddown : VAR_ADD_HOLDDOWN STRING_ARG",
-"server_del_holddown : VAR_DEL_HOLDDOWN STRING_ARG",
-"server_keep_missing : VAR_KEEP_MISSING STRING_ARG",
-"server_key_cache_size : VAR_KEY_CACHE_SIZE STRING_ARG",
-"server_key_cache_slabs : VAR_KEY_CACHE_SLABS STRING_ARG",
-"server_neg_cache_size : VAR_NEG_CACHE_SIZE STRING_ARG",
-"server_local_zone : VAR_LOCAL_ZONE STRING_ARG STRING_ARG",
-"server_local_data : VAR_LOCAL_DATA STRING_ARG",
-"server_local_data_ptr : VAR_LOCAL_DATA_PTR STRING_ARG",
-"server_minimal_responses : VAR_MINIMAL_RESPONSES STRING_ARG",
-"server_rrset_roundrobin : VAR_RRSET_ROUNDROBIN STRING_ARG",
-"server_max_udp_size : VAR_MAX_UDP_SIZE STRING_ARG",
-"stub_name : VAR_NAME STRING_ARG",
-"stub_host : VAR_STUB_HOST STRING_ARG",
-"stub_addr : VAR_STUB_ADDR STRING_ARG",
-"stub_first : VAR_STUB_FIRST STRING_ARG",
-"stub_prime : VAR_STUB_PRIME STRING_ARG",
-"forward_name : VAR_NAME STRING_ARG",
-"forward_host : VAR_FORWARD_HOST STRING_ARG",
-"forward_addr : VAR_FORWARD_ADDR STRING_ARG",
-"forward_first : VAR_FORWARD_FIRST STRING_ARG",
-"rcstart : VAR_REMOTE_CONTROL",
-"contents_rc : contents_rc content_rc",
-"contents_rc :",
-"content_rc : rc_control_enable",
-"content_rc : rc_control_interface",
-"content_rc : rc_control_port",
-"content_rc : rc_server_key_file",
-"content_rc : rc_server_cert_file",
-"content_rc : rc_control_key_file",
-"content_rc : rc_control_cert_file",
-"rc_control_enable : VAR_CONTROL_ENABLE STRING_ARG",
-"rc_control_port : VAR_CONTROL_PORT STRING_ARG",
-"rc_control_interface : VAR_CONTROL_INTERFACE STRING_ARG",
-"rc_server_key_file : VAR_SERVER_KEY_FILE STRING_ARG",
-"rc_server_cert_file : VAR_SERVER_CERT_FILE STRING_ARG",
-"rc_control_key_file : VAR_CONTROL_KEY_FILE STRING_ARG",
-"rc_control_cert_file : VAR_CONTROL_CERT_FILE STRING_ARG",
-"pythonstart : VAR_PYTHON",
-"contents_py : contents_py content_py",
-"contents_py :",
-"content_py : py_script",
-"py_script : VAR_PYTHON_SCRIPT STRING_ARG",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
-#endif
-#endif
-
-#define YYINITSTACKSIZE 500
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 1308 "util/configparser.y"
-
-/* parse helper routines could be here */
-#line 859 "util/configparser.c"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-case 8:
-#line 119 "util/configparser.y"
-	{ 
-		OUTYY(("\nP(server:)\n")); 
-	}
-break;
-case 112:
-#line 169 "util/configparser.y"
-	{
-		struct config_stub* s;
-		OUTYY(("\nP(stub_zone:)\n")); 
-		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
-		if(s) {
-			s->next = cfg_parser->cfg->stubs;
-			cfg_parser->cfg->stubs = s;
-		} else 
-			yyerror("out of memory");
-	}
-break;
-case 120:
-#line 185 "util/configparser.y"
-	{
-		struct config_stub* s;
-		OUTYY(("\nP(forward_zone:)\n")); 
-		s = (struct config_stub*)calloc(1, sizeof(struct config_stub));
-		if(s) {
-			s->next = cfg_parser->cfg->forwards;
-			cfg_parser->cfg->forwards = s;
-		} else 
-			yyerror("out of memory");
-	}
-break;
-case 127:
-#line 201 "util/configparser.y"
-	{ 
-		OUTYY(("P(server_num_threads:%s)\n", yystack.l_mark[0].str)); 
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->num_threads = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 128:
-#line 210 "util/configparser.y"
-	{ 
-		OUTYY(("P(server_verbosity:%s)\n", yystack.l_mark[0].str)); 
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->verbosity = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 129:
-#line 219 "util/configparser.y"
-	{ 
-		OUTYY(("P(server_statistics_interval:%s)\n", yystack.l_mark[0].str)); 
-		if(strcmp(yystack.l_mark[0].str, "") == 0 || strcmp(yystack.l_mark[0].str, "0") == 0)
-			cfg_parser->cfg->stat_interval = 0;
-		else if(atoi(yystack.l_mark[0].str) == 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->stat_interval = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 130:
-#line 230 "util/configparser.y"
-	{
-		OUTYY(("P(server_statistics_cumulative:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->stat_cumulative = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 131:
-#line 239 "util/configparser.y"
-	{
-		OUTYY(("P(server_extended_statistics:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->stat_extended = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 132:
-#line 248 "util/configparser.y"
-	{
-		OUTYY(("P(server_port:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0)
-			yyerror("port number expected");
-		else cfg_parser->cfg->port = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 133:
-#line 257 "util/configparser.y"
-	{
-		OUTYY(("P(server_interface:%s)\n", yystack.l_mark[0].str));
-		if(cfg_parser->cfg->num_ifs == 0)
-			cfg_parser->cfg->ifs = calloc(1, sizeof(char*));
-		else 	cfg_parser->cfg->ifs = realloc(cfg_parser->cfg->ifs,
-				(cfg_parser->cfg->num_ifs+1)*sizeof(char*));
-		if(!cfg_parser->cfg->ifs)
-			yyerror("out of memory");
-		else
-			cfg_parser->cfg->ifs[cfg_parser->cfg->num_ifs++] = yystack.l_mark[0].str;
-	}
-break;
-case 134:
-#line 270 "util/configparser.y"
-	{
-		OUTYY(("P(server_outgoing_interface:%s)\n", yystack.l_mark[0].str));
-		if(cfg_parser->cfg->num_out_ifs == 0)
-			cfg_parser->cfg->out_ifs = calloc(1, sizeof(char*));
-		else 	cfg_parser->cfg->out_ifs = realloc(
-			cfg_parser->cfg->out_ifs, 
-			(cfg_parser->cfg->num_out_ifs+1)*sizeof(char*));
-		if(!cfg_parser->cfg->out_ifs)
-			yyerror("out of memory");
-		else
-			cfg_parser->cfg->out_ifs[
-				cfg_parser->cfg->num_out_ifs++] = yystack.l_mark[0].str;
-	}
-break;
-case 135:
-#line 285 "util/configparser.y"
-	{
-		OUTYY(("P(server_outgoing_range:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->outgoing_num_ports = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 136:
-#line 294 "util/configparser.y"
-	{
-		OUTYY(("P(server_outgoing_port_permit:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_mark_ports(yystack.l_mark[0].str, 1, 
-			cfg_parser->cfg->outgoing_avail_ports, 65536))
-			yyerror("port number or range (\"low-high\") expected");
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 137:
-#line 303 "util/configparser.y"
-	{
-		OUTYY(("P(server_outgoing_port_avoid:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_mark_ports(yystack.l_mark[0].str, 0, 
-			cfg_parser->cfg->outgoing_avail_ports, 65536))
-			yyerror("port number or range (\"low-high\") expected");
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 138:
-#line 312 "util/configparser.y"
-	{
-		OUTYY(("P(server_outgoing_num_tcp:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->outgoing_num_tcp = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 139:
-#line 321 "util/configparser.y"
-	{
-		OUTYY(("P(server_incoming_num_tcp:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->incoming_num_tcp = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 140:
-#line 330 "util/configparser.y"
-	{
-		OUTYY(("P(server_interface_automatic:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->if_automatic = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 141:
-#line 339 "util/configparser.y"
-	{
-		OUTYY(("P(server_do_ip4:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->do_ip4 = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 142:
-#line 348 "util/configparser.y"
-	{
-		OUTYY(("P(server_do_ip6:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->do_ip6 = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 143:
-#line 357 "util/configparser.y"
-	{
-		OUTYY(("P(server_do_udp:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->do_udp = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 144:
-#line 366 "util/configparser.y"
-	{
-		OUTYY(("P(server_do_tcp:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->do_tcp = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 145:
-#line 375 "util/configparser.y"
-	{
-		OUTYY(("P(server_tcp_upstream:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->tcp_upstream = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 146:
-#line 384 "util/configparser.y"
-	{
-		OUTYY(("P(server_ssl_upstream:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->ssl_upstream = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 147:
-#line 393 "util/configparser.y"
-	{
-		OUTYY(("P(server_ssl_service_key:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->ssl_service_key);
-		cfg_parser->cfg->ssl_service_key = yystack.l_mark[0].str;
-	}
-break;
-case 148:
-#line 400 "util/configparser.y"
-	{
-		OUTYY(("P(server_ssl_service_pem:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->ssl_service_pem);
-		cfg_parser->cfg->ssl_service_pem = yystack.l_mark[0].str;
-	}
-break;
-case 149:
-#line 407 "util/configparser.y"
-	{
-		OUTYY(("P(server_ssl_port:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0)
-			yyerror("port number expected");
-		else cfg_parser->cfg->ssl_port = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 150:
-#line 416 "util/configparser.y"
-	{
-		OUTYY(("P(server_do_daemonize:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->do_daemonize = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 151:
-#line 425 "util/configparser.y"
-	{
-		OUTYY(("P(server_use_syslog:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->use_syslog = (strcmp(yystack.l_mark[0].str, "yes")==0);
-#if !defined(HAVE_SYSLOG_H) && !defined(UB_ON_WINDOWS)
-		if(strcmp(yystack.l_mark[0].str, "yes") == 0)
-			yyerror("no syslog services are available. "
-				"(reconfigure and compile to add)");
-#endif
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 152:
-#line 439 "util/configparser.y"
-	{
-		OUTYY(("P(server_log_time_ascii:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->log_time_ascii = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 153:
-#line 448 "util/configparser.y"
-	{
-		OUTYY(("P(server_log_queries:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->log_queries = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 154:
-#line 457 "util/configparser.y"
-	{
-		OUTYY(("P(server_chroot:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->chrootdir);
-		cfg_parser->cfg->chrootdir = yystack.l_mark[0].str;
-	}
-break;
-case 155:
-#line 464 "util/configparser.y"
-	{
-		OUTYY(("P(server_username:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->username);
-		cfg_parser->cfg->username = yystack.l_mark[0].str;
-	}
-break;
-case 156:
-#line 471 "util/configparser.y"
-	{
-		OUTYY(("P(server_directory:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->directory);
-		cfg_parser->cfg->directory = yystack.l_mark[0].str;
-	}
-break;
-case 157:
-#line 478 "util/configparser.y"
-	{
-		OUTYY(("P(server_logfile:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->logfile);
-		cfg_parser->cfg->logfile = yystack.l_mark[0].str;
-		cfg_parser->cfg->use_syslog = 0;
-	}
-break;
-case 158:
-#line 486 "util/configparser.y"
-	{
-		OUTYY(("P(server_pidfile:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->pidfile);
-		cfg_parser->cfg->pidfile = yystack.l_mark[0].str;
-	}
-break;
-case 159:
-#line 493 "util/configparser.y"
-	{
-		OUTYY(("P(server_root_hints:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->root_hints, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 160:
-#line 500 "util/configparser.y"
-	{
-		OUTYY(("P(server_dlv_anchor_file:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->dlv_anchor_file);
-		cfg_parser->cfg->dlv_anchor_file = yystack.l_mark[0].str;
-	}
-break;
-case 161:
-#line 507 "util/configparser.y"
-	{
-		OUTYY(("P(server_dlv_anchor:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->dlv_anchor_list, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 162:
-#line 514 "util/configparser.y"
-	{
-		OUTYY(("P(server_auto_trust_anchor_file:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->
-			auto_trust_anchor_file_list, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 163:
-#line 522 "util/configparser.y"
-	{
-		OUTYY(("P(server_trust_anchor_file:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->
-			trust_anchor_file_list, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 164:
-#line 530 "util/configparser.y"
-	{
-		OUTYY(("P(server_trusted_keys_file:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->
-			trusted_keys_file_list, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 165:
-#line 538 "util/configparser.y"
-	{
-		OUTYY(("P(server_trust_anchor:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->trust_anchor_list, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 166:
-#line 545 "util/configparser.y"
-	{
-		OUTYY(("P(server_domain_insecure:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->domain_insecure, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 167:
-#line 552 "util/configparser.y"
-	{
-		OUTYY(("P(server_hide_identity:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->hide_identity = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 168:
-#line 561 "util/configparser.y"
-	{
-		OUTYY(("P(server_hide_version:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->hide_version = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 169:
-#line 570 "util/configparser.y"
-	{
-		OUTYY(("P(server_identity:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->identity);
-		cfg_parser->cfg->identity = yystack.l_mark[0].str;
-	}
-break;
-case 170:
-#line 577 "util/configparser.y"
-	{
-		OUTYY(("P(server_version:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->version);
-		cfg_parser->cfg->version = yystack.l_mark[0].str;
-	}
-break;
-case 171:
-#line 584 "util/configparser.y"
-	{
-		OUTYY(("P(server_so_rcvbuf:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->so_rcvbuf))
-			yyerror("buffer size expected");
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 172:
-#line 592 "util/configparser.y"
-	{
-		OUTYY(("P(server_so_sndbuf:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->so_sndbuf))
-			yyerror("buffer size expected");
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 173:
-#line 600 "util/configparser.y"
-	{
-        OUTYY(("P(server_so_reuseport:%s)\n", yystack.l_mark[0].str));
-        if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-            yyerror("expected yes or no.");
-        else cfg_parser->cfg->so_reuseport =
-            (strcmp(yystack.l_mark[0].str, "yes")==0);
-        free(yystack.l_mark[0].str);
-    }
-break;
-case 174:
-#line 610 "util/configparser.y"
-	{
-		OUTYY(("P(server_edns_buffer_size:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0)
-			yyerror("number expected");
-		else if (atoi(yystack.l_mark[0].str) < 12)
-			yyerror("edns buffer size too small");
-		else if (atoi(yystack.l_mark[0].str) > 65535)
-			cfg_parser->cfg->edns_buffer_size = 65535;
-		else cfg_parser->cfg->edns_buffer_size = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 175:
-#line 623 "util/configparser.y"
-	{
-		OUTYY(("P(server_msg_buffer_size:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0)
-			yyerror("number expected");
-		else if (atoi(yystack.l_mark[0].str) < 4096)
-			yyerror("message buffer size too small (use 4096)");
-		else cfg_parser->cfg->msg_buffer_size = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 176:
-#line 634 "util/configparser.y"
-	{
-		OUTYY(("P(server_msg_cache_size:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->msg_cache_size))
-			yyerror("memory size expected");
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 177:
-#line 642 "util/configparser.y"
-	{
-		OUTYY(("P(server_msg_cache_slabs:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0)
-			yyerror("number expected");
-		else {
-			cfg_parser->cfg->msg_cache_slabs = atoi(yystack.l_mark[0].str);
-			if(!is_pow2(cfg_parser->cfg->msg_cache_slabs))
-				yyerror("must be a power of 2");
-		}
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 178:
-#line 655 "util/configparser.y"
-	{
-		OUTYY(("P(server_num_queries_per_thread:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->num_queries_per_thread = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 179:
-#line 664 "util/configparser.y"
-	{
-		OUTYY(("P(server_jostle_timeout:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->jostle_time = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 180:
-#line 673 "util/configparser.y"
-	{
-		OUTYY(("P(server_delay_close:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->delay_close = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 181:
-#line 682 "util/configparser.y"
-	{
-		OUTYY(("P(server_rrset_cache_size:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->rrset_cache_size))
-			yyerror("memory size expected");
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 182:
-#line 690 "util/configparser.y"
-	{
-		OUTYY(("P(server_rrset_cache_slabs:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0)
-			yyerror("number expected");
-		else {
-			cfg_parser->cfg->rrset_cache_slabs = atoi(yystack.l_mark[0].str);
-			if(!is_pow2(cfg_parser->cfg->rrset_cache_slabs))
-				yyerror("must be a power of 2");
-		}
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 183:
-#line 703 "util/configparser.y"
-	{
-		OUTYY(("P(server_infra_host_ttl:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->host_ttl = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 184:
-#line 712 "util/configparser.y"
-	{
-		OUTYY(("P(server_infra_lame_ttl:%s)\n", yystack.l_mark[0].str));
-		verbose(VERB_DETAIL, "ignored infra-lame-ttl: %s (option "
-			"removed, use infra-host-ttl)", yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 185:
-#line 720 "util/configparser.y"
-	{
-		OUTYY(("P(server_infra_cache_numhosts:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->infra_cache_numhosts = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 186:
-#line 729 "util/configparser.y"
-	{
-		OUTYY(("P(server_infra_cache_lame_size:%s)\n", yystack.l_mark[0].str));
-		verbose(VERB_DETAIL, "ignored infra-cache-lame-size: %s "
-			"(option removed, use infra-cache-numhosts)", yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 187:
-#line 737 "util/configparser.y"
-	{
-		OUTYY(("P(server_infra_cache_slabs:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0)
-			yyerror("number expected");
-		else {
-			cfg_parser->cfg->infra_cache_slabs = atoi(yystack.l_mark[0].str);
-			if(!is_pow2(cfg_parser->cfg->infra_cache_slabs))
-				yyerror("must be a power of 2");
-		}
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 188:
-#line 750 "util/configparser.y"
-	{
-		OUTYY(("P(server_target_fetch_policy:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->target_fetch_policy);
-		cfg_parser->cfg->target_fetch_policy = yystack.l_mark[0].str;
-	}
-break;
-case 189:
-#line 757 "util/configparser.y"
-	{
-		OUTYY(("P(server_harden_short_bufsize:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->harden_short_bufsize = 
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 190:
-#line 767 "util/configparser.y"
-	{
-		OUTYY(("P(server_harden_large_queries:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->harden_large_queries = 
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 191:
-#line 777 "util/configparser.y"
-	{
-		OUTYY(("P(server_harden_glue:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->harden_glue = 
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 192:
-#line 787 "util/configparser.y"
-	{
-		OUTYY(("P(server_harden_dnssec_stripped:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->harden_dnssec_stripped = 
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 193:
-#line 797 "util/configparser.y"
-	{
-		OUTYY(("P(server_harden_below_nxdomain:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->harden_below_nxdomain = 
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 194:
-#line 807 "util/configparser.y"
-	{
-		OUTYY(("P(server_harden_referral_path:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->harden_referral_path = 
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 195:
-#line 817 "util/configparser.y"
-	{
-		OUTYY(("P(server_use_caps_for_id:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->use_caps_bits_for_id = 
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 196:
-#line 827 "util/configparser.y"
-	{
-		OUTYY(("P(server_private_address:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->private_address, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 197:
-#line 834 "util/configparser.y"
-	{
-		OUTYY(("P(server_private_domain:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->private_domain, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 198:
-#line 841 "util/configparser.y"
-	{
-		OUTYY(("P(server_prefetch:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->prefetch = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 199:
-#line 850 "util/configparser.y"
-	{
-		OUTYY(("P(server_prefetch_key:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->prefetch_key = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 200:
-#line 859 "util/configparser.y"
-	{
-		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->unwanted_threshold = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 201:
-#line 868 "util/configparser.y"
-	{
-		OUTYY(("P(server_do_not_query_address:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->donotqueryaddrs, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 202:
-#line 875 "util/configparser.y"
-	{
-		OUTYY(("P(server_do_not_query_localhost:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->donotquery_localhost = 
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 203:
-#line 885 "util/configparser.y"
-	{
-		OUTYY(("P(server_access_control:%s %s)\n", yystack.l_mark[-1].str, yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "deny")!=0 && strcmp(yystack.l_mark[0].str, "refuse")!=0 &&
-			strcmp(yystack.l_mark[0].str, "deny_non_local")!=0 &&
-			strcmp(yystack.l_mark[0].str, "refuse_non_local")!=0 &&
-			strcmp(yystack.l_mark[0].str, "allow")!=0 && 
-			strcmp(yystack.l_mark[0].str, "allow_snoop")!=0) {
-			yyerror("expected deny, refuse, deny_non_local, "
-				"refuse_non_local, allow or allow_snoop "
-				"in access control action");
-		} else {
-			if(!cfg_str2list_insert(&cfg_parser->cfg->acls, yystack.l_mark[-1].str, yystack.l_mark[0].str))
-				fatal_exit("out of memory adding acl");
-		}
-	}
-break;
-case 204:
-#line 902 "util/configparser.y"
-	{
-		OUTYY(("P(server_module_conf:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->module_conf);
-		cfg_parser->cfg->module_conf = yystack.l_mark[0].str;
-	}
-break;
-case 205:
-#line 909 "util/configparser.y"
-	{
-		OUTYY(("P(server_val_override_date:%s)\n", yystack.l_mark[0].str));
-		if(strlen(yystack.l_mark[0].str) == 0 || strcmp(yystack.l_mark[0].str, "0") == 0) {
-			cfg_parser->cfg->val_date_override = 0;
-		} else if(strlen(yystack.l_mark[0].str) == 14) {
-			cfg_parser->cfg->val_date_override = 
-				cfg_convert_timeval(yystack.l_mark[0].str);
-			if(!cfg_parser->cfg->val_date_override)
-				yyerror("bad date/time specification");
-		} else {
-			if(atoi(yystack.l_mark[0].str) == 0)
-				yyerror("number expected");
-			cfg_parser->cfg->val_date_override = atoi(yystack.l_mark[0].str);
-		}
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 206:
-#line 927 "util/configparser.y"
-	{
-		OUTYY(("P(server_val_sig_skew_min:%s)\n", yystack.l_mark[0].str));
-		if(strlen(yystack.l_mark[0].str) == 0 || strcmp(yystack.l_mark[0].str, "0") == 0) {
-			cfg_parser->cfg->val_sig_skew_min = 0;
-		} else {
-			cfg_parser->cfg->val_sig_skew_min = atoi(yystack.l_mark[0].str);
-			if(!cfg_parser->cfg->val_sig_skew_min)
-				yyerror("number expected");
-		}
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 207:
-#line 940 "util/configparser.y"
-	{
-		OUTYY(("P(server_val_sig_skew_max:%s)\n", yystack.l_mark[0].str));
-		if(strlen(yystack.l_mark[0].str) == 0 || strcmp(yystack.l_mark[0].str, "0") == 0) {
-			cfg_parser->cfg->val_sig_skew_max = 0;
-		} else {
-			cfg_parser->cfg->val_sig_skew_max = atoi(yystack.l_mark[0].str);
-			if(!cfg_parser->cfg->val_sig_skew_max)
-				yyerror("number expected");
-		}
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 208:
-#line 953 "util/configparser.y"
-	{
-		OUTYY(("P(server_cache_max_ttl:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->max_ttl = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 209:
-#line 962 "util/configparser.y"
-	{
-		OUTYY(("P(server_cache_min_ttl:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->min_ttl = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 210:
-#line 971 "util/configparser.y"
-	{
-		OUTYY(("P(server_bogus_ttl:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->bogus_ttl = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 211:
-#line 980 "util/configparser.y"
-	{
-		OUTYY(("P(server_val_clean_additional:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->val_clean_additional = 
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 212:
-#line 990 "util/configparser.y"
-	{
-		OUTYY(("P(server_val_permissive_mode:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->val_permissive_mode = 
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 213:
-#line 1000 "util/configparser.y"
-	{
-		OUTYY(("P(server_ignore_cd_flag:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->ignore_cd = (strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 214:
-#line 1009 "util/configparser.y"
-	{
-		OUTYY(("P(server_val_log_level:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->val_log_level = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 215:
-#line 1018 "util/configparser.y"
-	{
-		OUTYY(("P(server_val_nsec3_keysize_iterations:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->val_nsec3_key_iterations);
-		cfg_parser->cfg->val_nsec3_key_iterations = yystack.l_mark[0].str;
-	}
-break;
-case 216:
-#line 1025 "util/configparser.y"
-	{
-		OUTYY(("P(server_add_holddown:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->add_holddown = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 217:
-#line 1034 "util/configparser.y"
-	{
-		OUTYY(("P(server_del_holddown:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->del_holddown = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 218:
-#line 1043 "util/configparser.y"
-	{
-		OUTYY(("P(server_keep_missing:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0 && strcmp(yystack.l_mark[0].str, "0") != 0)
-			yyerror("number expected");
-		else cfg_parser->cfg->keep_missing = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 219:
-#line 1052 "util/configparser.y"
-	{
-		OUTYY(("P(server_key_cache_size:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->key_cache_size))
-			yyerror("memory size expected");
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 220:
-#line 1060 "util/configparser.y"
-	{
-		OUTYY(("P(server_key_cache_slabs:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0)
-			yyerror("number expected");
-		else {
-			cfg_parser->cfg->key_cache_slabs = atoi(yystack.l_mark[0].str);
-			if(!is_pow2(cfg_parser->cfg->key_cache_slabs))
-				yyerror("must be a power of 2");
-		}
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 221:
-#line 1073 "util/configparser.y"
-	{
-		OUTYY(("P(server_neg_cache_size:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_parse_memsize(yystack.l_mark[0].str, &cfg_parser->cfg->neg_cache_size))
-			yyerror("memory size expected");
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 222:
-#line 1081 "util/configparser.y"
-	{
-		OUTYY(("P(server_local_zone:%s %s)\n", yystack.l_mark[-1].str, yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "static")!=0 && strcmp(yystack.l_mark[0].str, "deny")!=0 &&
-		   strcmp(yystack.l_mark[0].str, "refuse")!=0 && strcmp(yystack.l_mark[0].str, "redirect")!=0 &&
-		   strcmp(yystack.l_mark[0].str, "transparent")!=0 && strcmp(yystack.l_mark[0].str, "nodefault")!=0
-		   && strcmp(yystack.l_mark[0].str, "typetransparent")!=0)
-			yyerror("local-zone type: expected static, deny, "
-				"refuse, redirect, transparent, "
-				"typetransparent or nodefault");
-		else if(strcmp(yystack.l_mark[0].str, "nodefault")==0) {
-			if(!cfg_strlist_insert(&cfg_parser->cfg->
-				local_zones_nodefault, yystack.l_mark[-1].str))
-				fatal_exit("out of memory adding local-zone");
-			free(yystack.l_mark[0].str);
-		} else {
-			if(!cfg_str2list_insert(&cfg_parser->cfg->local_zones, 
-				yystack.l_mark[-1].str, yystack.l_mark[0].str))
-				fatal_exit("out of memory adding local-zone");
-		}
-	}
-break;
-case 223:
-#line 1103 "util/configparser.y"
-	{
-		OUTYY(("P(server_local_data:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->local_data, yystack.l_mark[0].str))
-			fatal_exit("out of memory adding local-data");
-	}
-break;
-case 224:
-#line 1110 "util/configparser.y"
-	{
-		char* ptr;
-		OUTYY(("P(server_local_data_ptr:%s)\n", yystack.l_mark[0].str));
-		ptr = cfg_ptr_reverse(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-		if(ptr) {
-			if(!cfg_strlist_insert(&cfg_parser->cfg->
-				local_data, ptr))
-				fatal_exit("out of memory adding local-data");
-		} else {
-			yyerror("local-data-ptr could not be reversed");
-		}
-	}
-break;
-case 225:
-#line 1125 "util/configparser.y"
-	{
-		OUTYY(("P(server_minimal_responses:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->minimal_responses =
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 226:
-#line 1135 "util/configparser.y"
-	{
-		OUTYY(("P(server_rrset_roundrobin:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->rrset_roundrobin =
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 227:
-#line 1145 "util/configparser.y"
-	{
-		OUTYY(("P(server_max_udp_size:%s)\n", yystack.l_mark[0].str));
-		cfg_parser->cfg->max_udp_size = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 228:
-#line 1152 "util/configparser.y"
-	{
-		OUTYY(("P(name:%s)\n", yystack.l_mark[0].str));
-		if(cfg_parser->cfg->stubs->name)
-			yyerror("stub name override, there must be one name "
-				"for one stub-zone");
-		free(cfg_parser->cfg->stubs->name);
-		cfg_parser->cfg->stubs->name = yystack.l_mark[0].str;
-	}
-break;
-case 229:
-#line 1162 "util/configparser.y"
-	{
-		OUTYY(("P(stub-host:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->hosts, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 230:
-#line 1169 "util/configparser.y"
-	{
-		OUTYY(("P(stub-addr:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->stubs->addrs, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 231:
-#line 1176 "util/configparser.y"
-	{
-		OUTYY(("P(stub-first:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->stubs->isfirst=(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 232:
-#line 1185 "util/configparser.y"
-	{
-		OUTYY(("P(stub-prime:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->stubs->isprime = 
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 233:
-#line 1195 "util/configparser.y"
-	{
-		OUTYY(("P(name:%s)\n", yystack.l_mark[0].str));
-		if(cfg_parser->cfg->forwards->name)
-			yyerror("forward name override, there must be one "
-				"name for one forward-zone");
-		free(cfg_parser->cfg->forwards->name);
-		cfg_parser->cfg->forwards->name = yystack.l_mark[0].str;
-	}
-break;
-case 234:
-#line 1205 "util/configparser.y"
-	{
-		OUTYY(("P(forward-host:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->hosts, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 235:
-#line 1212 "util/configparser.y"
-	{
-		OUTYY(("P(forward-addr:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->forwards->addrs, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 236:
-#line 1219 "util/configparser.y"
-	{
-		OUTYY(("P(forward-first:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->forwards->isfirst=(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 237:
-#line 1228 "util/configparser.y"
-	{ 
-		OUTYY(("\nP(remote-control:)\n")); 
-	}
-break;
-case 247:
-#line 1239 "util/configparser.y"
-	{
-		OUTYY(("P(control_enable:%s)\n", yystack.l_mark[0].str));
-		if(strcmp(yystack.l_mark[0].str, "yes") != 0 && strcmp(yystack.l_mark[0].str, "no") != 0)
-			yyerror("expected yes or no.");
-		else cfg_parser->cfg->remote_control_enable = 
-			(strcmp(yystack.l_mark[0].str, "yes")==0);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 248:
-#line 1249 "util/configparser.y"
-	{
-		OUTYY(("P(control_port:%s)\n", yystack.l_mark[0].str));
-		if(atoi(yystack.l_mark[0].str) == 0)
-			yyerror("control port number expected");
-		else cfg_parser->cfg->control_port = atoi(yystack.l_mark[0].str);
-		free(yystack.l_mark[0].str);
-	}
-break;
-case 249:
-#line 1258 "util/configparser.y"
-	{
-		OUTYY(("P(control_interface:%s)\n", yystack.l_mark[0].str));
-		if(!cfg_strlist_insert(&cfg_parser->cfg->control_ifs, yystack.l_mark[0].str))
-			yyerror("out of memory");
-	}
-break;
-case 250:
-#line 1265 "util/configparser.y"
-	{
-		OUTYY(("P(rc_server_key_file:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->server_key_file);
-		cfg_parser->cfg->server_key_file = yystack.l_mark[0].str;
-	}
-break;
-case 251:
-#line 1272 "util/configparser.y"
-	{
-		OUTYY(("P(rc_server_cert_file:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->server_cert_file);
-		cfg_parser->cfg->server_cert_file = yystack.l_mark[0].str;
-	}
-break;
-case 252:
-#line 1279 "util/configparser.y"
-	{
-		OUTYY(("P(rc_control_key_file:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->control_key_file);
-		cfg_parser->cfg->control_key_file = yystack.l_mark[0].str;
-	}
-break;
-case 253:
-#line 1286 "util/configparser.y"
-	{
-		OUTYY(("P(rc_control_cert_file:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->control_cert_file);
-		cfg_parser->cfg->control_cert_file = yystack.l_mark[0].str;
-	}
-break;
-case 254:
-#line 1293 "util/configparser.y"
-	{ 
-		OUTYY(("\nP(python:)\n")); 
-	}
-break;
-case 258:
-#line 1302 "util/configparser.y"
-	{
-		OUTYY(("P(python-script:%s)\n", yystack.l_mark[0].str));
-		free(cfg_parser->cfg->python_script);
-		cfg_parser->cfg->python_script = yystack.l_mark[0].str;
-	}
-break;
-#line 2315 "util/configparser.c"
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = 0;
-                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-                if (!yys) yys = "illegal-symbol";
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/contrib/unbound/util/configparser.h b/contrib/unbound/util/configparser.h
deleted file mode 100644
index 2c4956166d00..000000000000
--- a/contrib/unbound/util/configparser.h
+++ /dev/null
@@ -1,141 +0,0 @@
-#define SPACE 257
-#define LETTER 258
-#define NEWLINE 259
-#define COMMENT 260
-#define COLON 261
-#define ANY 262
-#define ZONESTR 263
-#define STRING_ARG 264
-#define VAR_SERVER 265
-#define VAR_VERBOSITY 266
-#define VAR_NUM_THREADS 267
-#define VAR_PORT 268
-#define VAR_OUTGOING_RANGE 269
-#define VAR_INTERFACE 270
-#define VAR_DO_IP4 271
-#define VAR_DO_IP6 272
-#define VAR_DO_UDP 273
-#define VAR_DO_TCP 274
-#define VAR_CHROOT 275
-#define VAR_USERNAME 276
-#define VAR_DIRECTORY 277
-#define VAR_LOGFILE 278
-#define VAR_PIDFILE 279
-#define VAR_MSG_CACHE_SIZE 280
-#define VAR_MSG_CACHE_SLABS 281
-#define VAR_NUM_QUERIES_PER_THREAD 282
-#define VAR_RRSET_CACHE_SIZE 283
-#define VAR_RRSET_CACHE_SLABS 284
-#define VAR_OUTGOING_NUM_TCP 285
-#define VAR_INFRA_HOST_TTL 286
-#define VAR_INFRA_LAME_TTL 287
-#define VAR_INFRA_CACHE_SLABS 288
-#define VAR_INFRA_CACHE_NUMHOSTS 289
-#define VAR_INFRA_CACHE_LAME_SIZE 290
-#define VAR_NAME 291
-#define VAR_STUB_ZONE 292
-#define VAR_STUB_HOST 293
-#define VAR_STUB_ADDR 294
-#define VAR_TARGET_FETCH_POLICY 295
-#define VAR_HARDEN_SHORT_BUFSIZE 296
-#define VAR_HARDEN_LARGE_QUERIES 297
-#define VAR_FORWARD_ZONE 298
-#define VAR_FORWARD_HOST 299
-#define VAR_FORWARD_ADDR 300
-#define VAR_DO_NOT_QUERY_ADDRESS 301
-#define VAR_HIDE_IDENTITY 302
-#define VAR_HIDE_VERSION 303
-#define VAR_IDENTITY 304
-#define VAR_VERSION 305
-#define VAR_HARDEN_GLUE 306
-#define VAR_MODULE_CONF 307
-#define VAR_TRUST_ANCHOR_FILE 308
-#define VAR_TRUST_ANCHOR 309
-#define VAR_VAL_OVERRIDE_DATE 310
-#define VAR_BOGUS_TTL 311
-#define VAR_VAL_CLEAN_ADDITIONAL 312
-#define VAR_VAL_PERMISSIVE_MODE 313
-#define VAR_INCOMING_NUM_TCP 314
-#define VAR_MSG_BUFFER_SIZE 315
-#define VAR_KEY_CACHE_SIZE 316
-#define VAR_KEY_CACHE_SLABS 317
-#define VAR_TRUSTED_KEYS_FILE 318
-#define VAR_VAL_NSEC3_KEYSIZE_ITERATIONS 319
-#define VAR_USE_SYSLOG 320
-#define VAR_OUTGOING_INTERFACE 321
-#define VAR_ROOT_HINTS 322
-#define VAR_DO_NOT_QUERY_LOCALHOST 323
-#define VAR_CACHE_MAX_TTL 324
-#define VAR_HARDEN_DNSSEC_STRIPPED 325
-#define VAR_ACCESS_CONTROL 326
-#define VAR_LOCAL_ZONE 327
-#define VAR_LOCAL_DATA 328
-#define VAR_INTERFACE_AUTOMATIC 329
-#define VAR_STATISTICS_INTERVAL 330
-#define VAR_DO_DAEMONIZE 331
-#define VAR_USE_CAPS_FOR_ID 332
-#define VAR_STATISTICS_CUMULATIVE 333
-#define VAR_OUTGOING_PORT_PERMIT 334
-#define VAR_OUTGOING_PORT_AVOID 335
-#define VAR_DLV_ANCHOR_FILE 336
-#define VAR_DLV_ANCHOR 337
-#define VAR_NEG_CACHE_SIZE 338
-#define VAR_HARDEN_REFERRAL_PATH 339
-#define VAR_PRIVATE_ADDRESS 340
-#define VAR_PRIVATE_DOMAIN 341
-#define VAR_REMOTE_CONTROL 342
-#define VAR_CONTROL_ENABLE 343
-#define VAR_CONTROL_INTERFACE 344
-#define VAR_CONTROL_PORT 345
-#define VAR_SERVER_KEY_FILE 346
-#define VAR_SERVER_CERT_FILE 347
-#define VAR_CONTROL_KEY_FILE 348
-#define VAR_CONTROL_CERT_FILE 349
-#define VAR_EXTENDED_STATISTICS 350
-#define VAR_LOCAL_DATA_PTR 351
-#define VAR_JOSTLE_TIMEOUT 352
-#define VAR_STUB_PRIME 353
-#define VAR_UNWANTED_REPLY_THRESHOLD 354
-#define VAR_LOG_TIME_ASCII 355
-#define VAR_DOMAIN_INSECURE 356
-#define VAR_PYTHON 357
-#define VAR_PYTHON_SCRIPT 358
-#define VAR_VAL_SIG_SKEW_MIN 359
-#define VAR_VAL_SIG_SKEW_MAX 360
-#define VAR_CACHE_MIN_TTL 361
-#define VAR_VAL_LOG_LEVEL 362
-#define VAR_AUTO_TRUST_ANCHOR_FILE 363
-#define VAR_KEEP_MISSING 364
-#define VAR_ADD_HOLDDOWN 365
-#define VAR_DEL_HOLDDOWN 366
-#define VAR_SO_RCVBUF 367
-#define VAR_EDNS_BUFFER_SIZE 368
-#define VAR_PREFETCH 369
-#define VAR_PREFETCH_KEY 370
-#define VAR_SO_SNDBUF 371
-#define VAR_SO_REUSEPORT 372
-#define VAR_HARDEN_BELOW_NXDOMAIN 373
-#define VAR_IGNORE_CD_FLAG 374
-#define VAR_LOG_QUERIES 375
-#define VAR_TCP_UPSTREAM 376
-#define VAR_SSL_UPSTREAM 377
-#define VAR_SSL_SERVICE_KEY 378
-#define VAR_SSL_SERVICE_PEM 379
-#define VAR_SSL_PORT 380
-#define VAR_FORWARD_FIRST 381
-#define VAR_STUB_FIRST 382
-#define VAR_MINIMAL_RESPONSES 383
-#define VAR_RRSET_ROUNDROBIN 384
-#define VAR_MAX_UDP_SIZE 385
-#define VAR_DELAY_CLOSE 386
-#ifdef YYSTYPE
-#undef  YYSTYPE_IS_DECLARED
-#define YYSTYPE_IS_DECLARED 1
-#endif
-#ifndef YYSTYPE_IS_DECLARED
-#define YYSTYPE_IS_DECLARED 1
-typedef union {
-	char*	str;
-} YYSTYPE;
-#endif /* !YYSTYPE_IS_DECLARED */
-extern YYSTYPE yylval;
diff --git a/contrib/unbound/util/configparser.y b/contrib/unbound/util/configparser.y
index 74b5b79ee83a..f119507f2891 100644
--- a/contrib/unbound/util/configparser.y
+++ b/contrib/unbound/util/configparser.y
@@ -44,7 +44,6 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "util/configyyrename.h"
 #include "util/config_file.h"
 #include "util/net_help.h"
 
@@ -105,7 +104,7 @@ extern struct config_parser_state* cfg_parser;
 %token VAR_IGNORE_CD_FLAG VAR_LOG_QUERIES VAR_TCP_UPSTREAM VAR_SSL_UPSTREAM
 %token VAR_SSL_SERVICE_KEY VAR_SSL_SERVICE_PEM VAR_SSL_PORT VAR_FORWARD_FIRST
 %token VAR_STUB_FIRST VAR_MINIMAL_RESPONSES VAR_RRSET_ROUNDROBIN
-%token VAR_MAX_UDP_SIZE VAR_DELAY_CLOSE
+%token VAR_MAX_UDP_SIZE VAR_DELAY_CLOSE VAR_UNBLOCK_LAN_ZONES
 
 %%
 toplevelvars: /* empty */ | toplevelvars toplevelvar ;
@@ -163,7 +162,7 @@ content_server: server_num_threads | server_verbosity | server_port |
 	server_log_queries | server_tcp_upstream | server_ssl_upstream |
 	server_ssl_service_key | server_ssl_service_pem | server_ssl_port |
 	server_minimal_responses | server_rrset_roundrobin | server_max_udp_size |
-    server_so_reuseport | server_delay_close
+	server_so_reuseport | server_delay_close | server_unblock_lan_zones
 	;
 stubstart: VAR_STUB_ZONE
 	{
@@ -678,6 +677,16 @@ server_delay_close: VAR_DELAY_CLOSE STRING_ARG
 		free($2);
 	}
 	;
+server_unblock_lan_zones: VAR_UNBLOCK_LAN_ZONES STRING_ARG
+	{
+		OUTYY(("P(server_unblock_lan_zones:%s)\n", $2));
+		if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
+			yyerror("expected yes or no.");
+		else cfg_parser->cfg->unblock_lan_zones = 
+			(strcmp($2, "yes")==0);
+		free($2);
+	}
+	;
 server_rrset_cache_size: VAR_RRSET_CACHE_SIZE STRING_ARG
 	{
 		OUTYY(("P(server_rrset_cache_size:%s)\n", $2));
diff --git a/contrib/wpa/src/utils/os_unix.c b/contrib/wpa/src/utils/os_unix.c
index 23a93becea43..fea511bdff3f 100644
--- a/contrib/wpa/src/utils/os_unix.c
+++ b/contrib/wpa/src/utils/os_unix.c
@@ -153,16 +153,40 @@ static int os_daemon(int nochdir, int noclose)
 #endif /* __APPLE__ */
 
 
+#ifdef __FreeBSD__
+#include <err.h>
+#include <libutil.h>
+#include <stdint.h>
+#endif /* __FreeBSD__ */
+
 int os_daemonize(const char *pid_file)
 {
 #if defined(__uClinux__) || defined(__sun__)
 	return -1;
 #else /* defined(__uClinux__) || defined(__sun__) */
+#ifdef __FreeBSD__
+	pid_t otherpid;
+	struct pidfh *pfh;
+
+	pfh = pidfile_open(pid_file, 0600, &otherpid);
+	if (pfh == NULL) {
+		if (errno == EEXIST) {
+			errx(1, "Daemon already running, pid: %jd.",
+			    (intmax_t)otherpid);
+		}
+		warn("Cannot open or create pidfile.");
+	}
+#endif /* __FreeBSD__ */
+
 	if (os_daemon(0, 0)) {
 		perror("daemon");
+#ifdef __FreeBSD__
+		pidfile_remove(pfh);
+#endif /* __FreeBSD__ */
 		return -1;
 	}
 
+#ifndef __FreeBSD__
 	if (pid_file) {
 		FILE *f = fopen(pid_file, "w");
 		if (f) {
@@ -170,6 +194,9 @@ int os_daemonize(const char *pid_file)
 			fclose(f);
 		}
 	}
+#else /* __FreeBSD__ */
+	pidfile_write(pfh);
+#endif /* __FreeBSD__ */
 
 	return -0;
 #endif /* defined(__uClinux__) || defined(__sun__) */
diff --git a/crypto/openssl/CHANGES b/crypto/openssl/CHANGES
index d161ecaf2953..064c1d9ded48 100644
--- a/crypto/openssl/CHANGES
+++ b/crypto/openssl/CHANGES
@@ -2,6 +2,92 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 1.0.1h and 1.0.1i [6 Aug 2014]
+
+  *) Fix SRP buffer overrun vulnerability. Invalid parameters passed to the
+     SRP code can be overrun an internal buffer. Add sanity check that
+     g, A, B < N to SRP code.
+
+     Thanks to Sean Devlin and Watson Ladd of Cryptography Services, NCC
+     Group for discovering this issue.
+     (CVE-2014-3512)
+     [Steve Henson]
+
+  *) A flaw in the OpenSSL SSL/TLS server code causes the server to negotiate
+     TLS 1.0 instead of higher protocol versions when the ClientHello message
+     is badly fragmented. This allows a man-in-the-middle attacker to force a
+     downgrade to TLS 1.0 even if both the server and the client support a
+     higher protocol version, by modifying the client's TLS records.
+
+     Thanks to David Benjamin and Adam Langley (Google) for discovering and
+     researching this issue.
+     (CVE-2014-3511)
+     [David Benjamin]
+
+  *) OpenSSL DTLS clients enabling anonymous (EC)DH ciphersuites are subject
+     to a denial of service attack. A malicious server can crash the client
+     with a null pointer dereference (read) by specifying an anonymous (EC)DH
+     ciphersuite and sending carefully crafted handshake messages.
+
+     Thanks to Felix Gr�bert (Google) for discovering and researching this
+     issue.
+     (CVE-2014-3510)
+     [Emilia K�sper]
+
+  *) By sending carefully crafted DTLS packets an attacker could cause openssl
+     to leak memory. This can be exploited through a Denial of Service attack.
+     Thanks to Adam Langley for discovering and researching this issue.
+     (CVE-2014-3507)
+     [Adam Langley]
+
+  *) An attacker can force openssl to consume large amounts of memory whilst
+     processing DTLS handshake messages. This can be exploited through a
+     Denial of Service attack.
+     Thanks to Adam Langley for discovering and researching this issue.
+     (CVE-2014-3506)
+     [Adam Langley]
+
+  *) An attacker can force an error condition which causes openssl to crash
+     whilst processing DTLS packets due to memory being freed twice. This
+     can be exploited through a Denial of Service attack.
+     Thanks to Adam Langley and Wan-Teh Chang for discovering and researching
+     this issue.
+     (CVE-2014-3505)
+     [Adam Langley]
+
+  *) If a multithreaded client connects to a malicious server using a resumed
+     session and the server sends an ec point format extension it could write
+     up to 255 bytes to freed memory.
+
+     Thanks to Gabor Tyukasz (LogMeIn Inc) for discovering and researching this
+     issue.
+     (CVE-2014-3509)
+     [Gabor Tyukasz]
+
+  *) A malicious server can crash an OpenSSL client with a null pointer
+     dereference (read) by specifying an SRP ciphersuite even though it was not
+     properly negotiated with the client. This can be exploited through a
+     Denial of Service attack.
+
+     Thanks to Joonas Kuorilehto and Riku Hietam�ki (Codenomicon) for
+     discovering and researching this issue.
+     (CVE-2014-5139)
+     [Steve Henson]
+
+  *) A flaw in OBJ_obj2txt may cause pretty printing functions such as
+     X509_name_oneline, X509_name_print_ex et al. to leak some information
+     from the stack. Applications may be affected if they echo pretty printing
+     output to the attacker.
+
+     Thanks to Ivan Fratric (Google) for discovering this issue.
+     (CVE-2014-3508)
+     [Emilia K�sper, and Steve Henson]
+
+  *) Fix ec_GFp_simple_points_make_affine (thus, EC_POINTs_mul etc.)
+     for corner cases. (Certain input points at infinity could lead to
+     bogus results, with non-infinity inputs mapped to infinity too.)
+     [Bodo Moeller]
+
  Changes between 1.0.1g and 1.0.1h [5 Jun 2014]
 
   *) Fix for SSL/TLS MITM flaw. An attacker using a carefully crafted
diff --git a/crypto/openssl/Configure b/crypto/openssl/Configure
index de78469b9f62..36844b7b2f7a 100755
--- a/crypto/openssl/Configure
+++ b/crypto/openssl/Configure
@@ -720,6 +720,7 @@ my %disabled = ( # "what"         => "comment" [or special keyword "experimental
 		 "sctp"       => "default",
 		 "shared"         => "default",
 		 "store"	  => "experimental",
+		 "unit-test"	  => "default",
 		 "zlib"           => "default",
 		 "zlib-dynamic"   => "default"
 	       );
@@ -727,7 +728,7 @@ my @experimental = ();
 
 # This is what $depflags will look like with the above defaults
 # (we need this to see if we should advise the user to run "make depend"):
-my $default_depflags = " -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE";
+my $default_depflags = " -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST";
 
 # Explicit "no-..." options will be collected in %disabled along with the defaults.
 # To remove something from %disabled, use "enable-foo" (unless it's experimental).
diff --git a/crypto/openssl/FAQ b/crypto/openssl/FAQ
index 59d135396edc..f8ea604273a5 100644
--- a/crypto/openssl/FAQ
+++ b/crypto/openssl/FAQ
@@ -113,11 +113,6 @@ that came with the version of OpenSSL you are using. The pod format
 documentation is included in each OpenSSL distribution under the docs
 directory.
 
-For information on parts of libcrypto that are not yet documented, you
-might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's
-predecessor, at <URL: http://www.columbia.edu/~ariel/ssleay/>.  Much
-of this still applies to OpenSSL.
-
 There is some documentation about certificate extensions and PKCS#12
 in doc/openssl.txt
 
diff --git a/crypto/openssl/Makefile b/crypto/openssl/Makefile
index f5e7823f85cc..998c032004d9 100644
--- a/crypto/openssl/Makefile
+++ b/crypto/openssl/Makefile
@@ -4,7 +4,7 @@
 ## Makefile for OpenSSL
 ##
 
-VERSION=1.0.1h
+VERSION=1.0.1i
 MAJOR=1
 MINOR=0.1
 SHLIB_VERSION_NUMBER=1.0.0
@@ -13,7 +13,7 @@ SHLIB_MAJOR=1
 SHLIB_MINOR=0.0
 SHLIB_EXT=
 PLATFORM=dist
-OPTIONS= no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-store no-zlib no-zlib-dynamic static-engine
+OPTIONS= no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-store no-unit-test no-zlib no-zlib-dynamic static-engine
 CONFIGURE_ARGS=dist
 SHLIB_TARGET=
 
@@ -61,7 +61,7 @@ OPENSSLDIR=/usr/local/ssl
 
 CC= cc
 CFLAG= -O
-DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE
+DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE -DOPENSSL_NO_UNIT_TEST
 PEX_LIBS= 
 EX_LIBS= 
 EXE_EXT= 
diff --git a/crypto/openssl/NEWS b/crypto/openssl/NEWS
index d0620414ab04..8b2be4bb2474 100644
--- a/crypto/openssl/NEWS
+++ b/crypto/openssl/NEWS
@@ -5,10 +5,23 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
+  Major changes between OpenSSL 1.0.1h and OpenSSL 1.0.1i [6 Aug 2014]
+
+      o Fix for CVE-2014-3512
+      o Fix for CVE-2014-3511
+      o Fix for CVE-2014-3510
+      o Fix for CVE-2014-3507
+      o Fix for CVE-2014-3506
+      o Fix for CVE-2014-3505
+      o Fix for CVE-2014-3509
+      o Fix for CVE-2014-5139
+      o Fix for CVE-2014-3508
+
   Major changes between OpenSSL 1.0.1g and OpenSSL 1.0.1h [5 Jun 2014]
 
       o Fix for CVE-2014-0224
       o Fix for CVE-2014-0221
+      o Fix for CVE-2014-0198
       o Fix for CVE-2014-0195
       o Fix for CVE-2014-3470
       o Fix for CVE-2010-5298
diff --git a/crypto/openssl/README b/crypto/openssl/README
index 95c5cd247800..b2cf1ce1b49c 100644
--- a/crypto/openssl/README
+++ b/crypto/openssl/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.1h 5 Jun 2014
+ OpenSSL 1.0.1i 6 Aug 2014
 
  Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/crypto/openssl/apps/apps.c b/crypto/openssl/apps/apps.c
index b76db10a5e5b..3e18289a4b5b 100644
--- a/crypto/openssl/apps/apps.c
+++ b/crypto/openssl/apps/apps.c
@@ -390,6 +390,8 @@ int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[])
 		{
 		arg->count=20;
 		arg->data=(char **)OPENSSL_malloc(sizeof(char *)*arg->count);
+		if (arg->data == NULL)
+			return 0;
 		}
 	for (i=0; i<arg->count; i++)
 		arg->data[i]=NULL;
@@ -1542,6 +1544,8 @@ char *make_config_name()
 
 	len=strlen(t)+strlen(OPENSSL_CONF)+2;
 	p=OPENSSL_malloc(len);
+	if (p == NULL)
+		return NULL;
 	BUF_strlcpy(p,t,len);
 #ifndef OPENSSL_SYS_VMS
 	BUF_strlcat(p,"/",len);
diff --git a/crypto/openssl/apps/ca.c b/crypto/openssl/apps/ca.c
index 1cf50e00294d..9c25026ac0b2 100644
--- a/crypto/openssl/apps/ca.c
+++ b/crypto/openssl/apps/ca.c
@@ -1620,12 +1620,14 @@ static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
 		{
 		ok=0;
 		BIO_printf(bio_err,"Signature verification problems....\n");
+		ERR_print_errors(bio_err);
 		goto err;
 		}
 	if (i == 0)
 		{
 		ok=0;
 		BIO_printf(bio_err,"Signature did not match the certificate request\n");
+		ERR_print_errors(bio_err);
 		goto err;
 		}
 	else
@@ -2777,6 +2779,9 @@ char *make_revocation_str(int rev_type, char *rev_arg)
 
 	revtm = X509_gmtime_adj(NULL, 0);
 
+	if (!revtm)
+		return NULL;
+
 	i = revtm->length + 1;
 
 	if (reason) i += strlen(reason) + 1;
diff --git a/crypto/openssl/apps/ciphers.c b/crypto/openssl/apps/ciphers.c
index 5f2b73970080..93dce1c40b4a 100644
--- a/crypto/openssl/apps/ciphers.c
+++ b/crypto/openssl/apps/ciphers.c
@@ -96,13 +96,7 @@ int MAIN(int argc, char **argv)
 	char buf[512];
 	BIO *STDout=NULL;
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
 	meth=SSLv23_server_method();
-#elif !defined(OPENSSL_NO_SSL3)
-	meth=SSLv3_server_method();
-#elif !defined(OPENSSL_NO_SSL2)
-	meth=SSLv2_server_method();
-#endif
 
 	apps_startup();
 
diff --git a/crypto/openssl/apps/crl2p7.c b/crypto/openssl/apps/crl2p7.c
index bbc83774dbee..42c6886b83f8 100644
--- a/crypto/openssl/apps/crl2p7.c
+++ b/crypto/openssl/apps/crl2p7.c
@@ -141,7 +141,13 @@ int MAIN(int argc, char **argv)
 			{
 			if (--argc < 1) goto bad;
 			if(!certflst) certflst = sk_OPENSSL_STRING_new_null();
-			sk_OPENSSL_STRING_push(certflst,*(++argv));
+			if (!certflst)
+				goto end;
+			if (!sk_OPENSSL_STRING_push(certflst,*(++argv)))
+				{
+				sk_OPENSSL_STRING_free(certflst);
+				goto end;
+				}
 			}
 		else
 			{
diff --git a/crypto/openssl/apps/enc.c b/crypto/openssl/apps/enc.c
index 19ea3df9409e..c8cb021224e6 100644
--- a/crypto/openssl/apps/enc.c
+++ b/crypto/openssl/apps/enc.c
@@ -67,7 +67,9 @@
 #include <openssl/x509.h>
 #include <openssl/rand.h>
 #include <openssl/pem.h>
+#ifndef OPENSSL_NO_COMP
 #include <openssl/comp.h>
+#endif
 #include <ctype.h>
 
 int set_hex(char *in,unsigned char *out,int size);
@@ -337,6 +339,12 @@ int MAIN(int argc, char **argv)
 		goto end;
 		}
 
+	if (cipher && (EVP_CIPHER_mode(cipher) == EVP_CIPH_XTS_MODE))
+		{
+		BIO_printf(bio_err, "Ciphers in XTS mode are not supported by the enc utility\n");
+		goto end;
+		}
+
 	if (md && (dgst=EVP_get_digestbyname(md)) == NULL)
 		{
 		BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);
diff --git a/crypto/openssl/apps/ocsp.c b/crypto/openssl/apps/ocsp.c
index 767f12c621c5..04263ffd927f 100644
--- a/crypto/openssl/apps/ocsp.c
+++ b/crypto/openssl/apps/ocsp.c
@@ -1419,7 +1419,7 @@ OCSP_RESPONSE *process_responder(BIO *err, OCSP_REQUEST *req,
 		}
 	resp = query_responder(err, cbio, path, headers, req, req_timeout);
 	if (!resp)
-		BIO_printf(bio_err, "Error querying OCSP responsder\n");
+		BIO_printf(bio_err, "Error querying OCSP responder\n");
 	end:
 	if (cbio)
 		BIO_free_all(cbio);
diff --git a/crypto/openssl/apps/progs.h b/crypto/openssl/apps/progs.h
index 949e78066b78..d79b974ad159 100644
--- a/crypto/openssl/apps/progs.h
+++ b/crypto/openssl/apps/progs.h
@@ -107,16 +107,16 @@ FUNCTION functions[] = {
 	{FUNC_TYPE_GENERAL,"gendsa",gendsa_main},
 #endif
 	{FUNC_TYPE_GENERAL,"genpkey",genpkey_main},
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(OPENSSL_NO_SOCK)
 	{FUNC_TYPE_GENERAL,"s_server",s_server_main},
 #endif
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(OPENSSL_NO_SOCK)
 	{FUNC_TYPE_GENERAL,"s_client",s_client_main},
 #endif
 #ifndef OPENSSL_NO_SPEED
 	{FUNC_TYPE_GENERAL,"speed",speed_main},
 #endif
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(OPENSSL_NO_SOCK)
 	{FUNC_TYPE_GENERAL,"s_time",s_time_main},
 #endif
 	{FUNC_TYPE_GENERAL,"version",version_main},
@@ -126,7 +126,7 @@ FUNCTION functions[] = {
 #endif
 	{FUNC_TYPE_GENERAL,"crl2pkcs7",crl2pkcs7_main},
 	{FUNC_TYPE_GENERAL,"sess_id",sess_id_main},
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(OPENSSL_NO_SOCK)
 	{FUNC_TYPE_GENERAL,"ciphers",ciphers_main},
 #endif
 	{FUNC_TYPE_GENERAL,"nseq",nseq_main},
diff --git a/crypto/openssl/apps/progs.pl b/crypto/openssl/apps/progs.pl
index 39ca8f71fbbc..fa6258cf5e13 100644
--- a/crypto/openssl/apps/progs.pl
+++ b/crypto/openssl/apps/progs.pl
@@ -32,7 +32,7 @@ foreach (@ARGV)
 	push(@files,$_);
 	$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";
 	if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))
-		{ print "#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))\n${str}#endif\n"; } 
+		{ print "#if !defined(OPENSSL_NO_SOCK)\n${str}#endif\n"; } 
 	elsif ( ($_ =~ /^speed$/))
 		{ print "#ifndef OPENSSL_NO_SPEED\n${str}#endif\n"; }
 	elsif ( ($_ =~ /^engine$/))
diff --git a/crypto/openssl/apps/s_client.c b/crypto/openssl/apps/s_client.c
index 3ba66056038a..4625467d9903 100644
--- a/crypto/openssl/apps/s_client.c
+++ b/crypto/openssl/apps/s_client.c
@@ -290,6 +290,7 @@ static void sc_usage(void)
 	BIO_printf(bio_err," -connect host:port - who to connect to (default is %s:%s)\n",SSL_HOST_NAME,PORT_STR);
 
 	BIO_printf(bio_err," -verify arg   - turn on peer certificate verification\n");
+	BIO_printf(bio_err," -verify_return_error - return verification errors\n");
 	BIO_printf(bio_err," -cert arg     - certificate file to use, PEM format assumed\n");
 	BIO_printf(bio_err," -certform arg - certificate format (PEM or DER) PEM default\n");
 	BIO_printf(bio_err," -key arg      - Private key file to use, in cert file if\n");
@@ -300,6 +301,7 @@ static void sc_usage(void)
 	BIO_printf(bio_err," -CAfile arg   - PEM format file of CA's\n");
 	BIO_printf(bio_err," -reconnect    - Drop and re-make the connection with the same Session-ID\n");
 	BIO_printf(bio_err," -pause        - sleep(1) after each read(2) and write(2) system call\n");
+	BIO_printf(bio_err," -prexit       - print session information even on connection failure\n");
 	BIO_printf(bio_err," -showcerts    - show all certificates in the chain\n");
 	BIO_printf(bio_err," -debug        - extra output\n");
 #ifdef WATT32
diff --git a/crypto/openssl/apps/s_server.c b/crypto/openssl/apps/s_server.c
index 8198d7f0653e..fe7ad8823207 100644
--- a/crypto/openssl/apps/s_server.c
+++ b/crypto/openssl/apps/s_server.c
@@ -463,6 +463,7 @@ static void sv_usage(void)
 	BIO_printf(bio_err," -context arg  - set session ID context\n");
 	BIO_printf(bio_err," -verify arg   - turn on peer certificate verification\n");
 	BIO_printf(bio_err," -Verify arg   - turn on peer certificate verification, must have a cert.\n");
+	BIO_printf(bio_err," -verify_return_error - return verification errors\n");
 	BIO_printf(bio_err," -cert arg     - certificate file to use\n");
 	BIO_printf(bio_err,"                 (default is %s)\n",TEST_CERT);
 	BIO_printf(bio_err," -crl_check    - check the peer certificate has not been revoked by its CA.\n" \
@@ -534,6 +535,7 @@ static void sv_usage(void)
 	BIO_printf(bio_err," -no_ecdhe     - Disable ephemeral ECDH\n");
 #endif
 	BIO_printf(bio_err," -bugs         - Turn on SSL bug compatibility\n");
+	BIO_printf(bio_err," -hack         - workaround for early Netscape code\n");
 	BIO_printf(bio_err," -www          - Respond to a 'GET /' with a status page\n");
 	BIO_printf(bio_err," -WWW          - Respond to a 'GET /<path> HTTP/1.0' with file ./<path>\n");
 	BIO_printf(bio_err," -HTTP         - Respond to a 'GET /<path> HTTP/1.0' with file ./<path>\n");
@@ -562,6 +564,10 @@ static void sv_usage(void)
 #endif
 	BIO_printf(bio_err," -keymatexport label   - Export keying material using label\n");
 	BIO_printf(bio_err," -keymatexportlen len  - Export len bytes of keying material (default 20)\n");
+	BIO_printf(bio_err," -status           - respond to certificate status requests\n");
+	BIO_printf(bio_err," -status_verbose   - enable status request verbose printout\n");
+	BIO_printf(bio_err," -status_timeout n - status request responder timeout\n");
+	BIO_printf(bio_err," -status_url URL   - status request fallback URL\n");
 	}
 
 static int local_argc=0;
@@ -739,7 +745,7 @@ static int MS_CALLBACK ssl_servername_cb(SSL *s, int *ad, void *arg)
 	
 	if (servername)
 		{
-    		if (strcmp(servername,p->servername)) 
+    		if (strcasecmp(servername,p->servername)) 
 			return p->extension_error;
 		if (ctx2)
 			{
@@ -1356,6 +1362,14 @@ int MAIN(int argc, char *argv[])
 		sv_usage();
 		goto end;
 		}
+#ifndef OPENSSL_NO_DTLS1
+	if (www && socket_type == SOCK_DGRAM)
+		{
+		BIO_printf(bio_err,
+				"Can't use -HTTP, -www or -WWW with DTLS\n");
+		goto end;
+		}
+#endif
 
 #if !defined(OPENSSL_NO_JPAKE) && !defined(OPENSSL_NO_PSK)
 	if (jpake_secret)
diff --git a/crypto/openssl/crypto/asn1/a_object.c b/crypto/openssl/crypto/asn1/a_object.c
index 3978c9150d8c..77b2768967e3 100644
--- a/crypto/openssl/crypto/asn1/a_object.c
+++ b/crypto/openssl/crypto/asn1/a_object.c
@@ -283,17 +283,29 @@ ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
 	ASN1err(ASN1_F_D2I_ASN1_OBJECT,i);
 	return(NULL);
 }
+
 ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
 	     long len)
 	{
 	ASN1_OBJECT *ret=NULL;
 	const unsigned char *p;
 	unsigned char *data;
-	int i;
-	/* Sanity check OID encoding: can't have leading 0x80 in
-	 * subidentifiers, see: X.690 8.19.2
+	int i, length;
+
+	/* Sanity check OID encoding.
+	 * Need at least one content octet.
+	 * MSB must be clear in the last octet.
+	 * can't have leading 0x80 in subidentifiers, see: X.690 8.19.2
 	 */
-	for (i = 0, p = *pp; i < len; i++, p++)
+	if (len <= 0 || len > INT_MAX || pp == NULL || (p = *pp) == NULL ||
+	    p[len - 1] & 0x80)
+		{
+		ASN1err(ASN1_F_C2I_ASN1_OBJECT,ASN1_R_INVALID_OBJECT_ENCODING);
+		return NULL;
+		}
+	/* Now 0 < len <= INT_MAX, so the cast is safe. */
+	length = (int)len;
+	for (i = 0; i < length; i++, p++)
 		{
 		if (*p == 0x80 && (!i || !(p[-1] & 0x80)))
 			{
@@ -316,23 +328,23 @@ ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
 	data = (unsigned char *)ret->data;
 	ret->data = NULL;
 	/* once detached we can change it */
-	if ((data == NULL) || (ret->length < len))
+	if ((data == NULL) || (ret->length < length))
 		{
 		ret->length=0;
 		if (data != NULL) OPENSSL_free(data);
-		data=(unsigned char *)OPENSSL_malloc(len ? (int)len : 1);
+		data=(unsigned char *)OPENSSL_malloc(length);
 		if (data == NULL)
 			{ i=ERR_R_MALLOC_FAILURE; goto err; }
 		ret->flags|=ASN1_OBJECT_FLAG_DYNAMIC_DATA;
 		}
-	memcpy(data,p,(int)len);
+	memcpy(data,p,length);
 	/* reattach data to object, after which it remains const */
 	ret->data  =data;
-	ret->length=(int)len;
+	ret->length=length;
 	ret->sn=NULL;
 	ret->ln=NULL;
 	/* ret->flags=ASN1_OBJECT_FLAG_DYNAMIC; we know it is dynamic */
-	p+=len;
+	p+=length;
 
 	if (a != NULL) (*a)=ret;
 	*pp=p;
diff --git a/crypto/openssl/crypto/asn1/a_utctm.c b/crypto/openssl/crypto/asn1/a_utctm.c
index 072e23659233..bbdc9b3222ab 100644
--- a/crypto/openssl/crypto/asn1/a_utctm.c
+++ b/crypto/openssl/crypto/asn1/a_utctm.c
@@ -196,24 +196,29 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
 	struct tm *ts;
 	struct tm data;
 	size_t len = 20;
+	int free_s = 0;
 
 	if (s == NULL)
+		{
+		free_s = 1;
 		s=M_ASN1_UTCTIME_new();
+		}
 	if (s == NULL)
-		return(NULL);
+		goto err;
+
 
 	ts=OPENSSL_gmtime(&t, &data);
 	if (ts == NULL)
-		return(NULL);
+		goto err;
 
 	if (offset_day || offset_sec)
 		{ 
 		if (!OPENSSL_gmtime_adj(ts, offset_day, offset_sec))
-			return NULL;
+			goto err;
 		}
 
 	if((ts->tm_year < 50) || (ts->tm_year >= 150))
-		return NULL;
+		goto err;
 
 	p=(char *)s->data;
 	if ((p == NULL) || ((size_t)s->length < len))
@@ -222,7 +227,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
 		if (p == NULL)
 			{
 			ASN1err(ASN1_F_ASN1_UTCTIME_ADJ,ERR_R_MALLOC_FAILURE);
-			return(NULL);
+			goto err;
 			}
 		if (s->data != NULL)
 			OPENSSL_free(s->data);
@@ -237,6 +242,10 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
 	ebcdic2ascii(s->data, s->data, s->length);
 #endif
 	return(s);
+	err:
+	if (free_s && s)
+		M_ASN1_UTCTIME_free(s);
+	return NULL;
 	}
 
 
@@ -261,6 +270,11 @@ int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
 	t -= offset*60; /* FIXME: may overflow in extreme cases */
 
 	tm = OPENSSL_gmtime(&t, &data);
+	/* NB: -1, 0, 1 already valid return values so use -2 to
+	 * indicate error.
+	 */
+	if (tm == NULL)
+		return -2;
 	
 #define return_cmp(a,b) if ((a)<(b)) return -1; else if ((a)>(b)) return 1
 	year = g2(s->data);
diff --git a/crypto/openssl/crypto/asn1/ameth_lib.c b/crypto/openssl/crypto/asn1/ameth_lib.c
index a19e058fca69..ef153d461599 100644
--- a/crypto/openssl/crypto/asn1/ameth_lib.c
+++ b/crypto/openssl/crypto/asn1/ameth_lib.c
@@ -258,7 +258,12 @@ int EVP_PKEY_asn1_add_alias(int to, int from)
 	if (!ameth)
 		return 0;
 	ameth->pkey_base_id = to;
-	return EVP_PKEY_asn1_add0(ameth);
+	if (!EVP_PKEY_asn1_add0(ameth))
+		{
+		EVP_PKEY_asn1_free(ameth);
+		return 0;
+		}
+	return 1;
 	}
 
 int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags,
diff --git a/crypto/openssl/crypto/asn1/asn1_lib.c b/crypto/openssl/crypto/asn1/asn1_lib.c
index 1bcb44aee203..fa04b08ed6e4 100644
--- a/crypto/openssl/crypto/asn1/asn1_lib.c
+++ b/crypto/openssl/crypto/asn1/asn1_lib.c
@@ -131,6 +131,9 @@ int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
 	*pclass=xclass;
 	if (!asn1_get_length(&p,&inf,plength,(int)max)) goto err;
 
+	if (inf && !(ret & V_ASN1_CONSTRUCTED))
+		goto err;
+
 #if 0
 	fprintf(stderr,"p=%d + *plength=%ld > omax=%ld + *pp=%d  (%d > %d)\n", 
 		(int)p,*plength,omax,(int)*pp,(int)(p+ *plength),
diff --git a/crypto/openssl/crypto/asn1/asn_mime.c b/crypto/openssl/crypto/asn1/asn_mime.c
index 54a704a969ea..13d003bce3cd 100644
--- a/crypto/openssl/crypto/asn1/asn_mime.c
+++ b/crypto/openssl/crypto/asn1/asn_mime.c
@@ -667,6 +667,8 @@ static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio)
 	int len, state, save_state = 0;
 
 	headers = sk_MIME_HEADER_new(mime_hdr_cmp);
+	if (!headers)
+		return NULL;
 	while ((len = BIO_gets(bio, linebuf, MAX_SMLEN)) > 0) {
 	/* If whitespace at line start then continuation line */
 	if(mhdr && isspace((unsigned char)linebuf[0])) state = MIME_NAME;
diff --git a/crypto/openssl/crypto/asn1/asn_pack.c b/crypto/openssl/crypto/asn1/asn_pack.c
index ad738217d778..00dbf5ad3c0a 100644
--- a/crypto/openssl/crypto/asn1/asn_pack.c
+++ b/crypto/openssl/crypto/asn1/asn_pack.c
@@ -134,15 +134,23 @@ ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d, ASN1_STRING **oct)
 		
 	if (!(octmp->length = i2d(obj, NULL))) {
 		ASN1err(ASN1_F_ASN1_PACK_STRING,ASN1_R_ENCODE_ERROR);
-		return NULL;
+		goto err;
 	}
 	if (!(p = OPENSSL_malloc (octmp->length))) {
 		ASN1err(ASN1_F_ASN1_PACK_STRING,ERR_R_MALLOC_FAILURE);
-		return NULL;
+		goto err;
 	}
 	octmp->data = p;
 	i2d (obj, &p);
 	return octmp;
+	err:
+	if (!oct || !*oct)
+		{
+		ASN1_STRING_free(octmp);
+		if (oct)
+			*oct = NULL;
+		}
+	return NULL;
 }
 
 #endif
diff --git a/crypto/openssl/crypto/asn1/bio_asn1.c b/crypto/openssl/crypto/asn1/bio_asn1.c
index dc7efd551c05..bca4eebf6d3f 100644
--- a/crypto/openssl/crypto/asn1/bio_asn1.c
+++ b/crypto/openssl/crypto/asn1/bio_asn1.c
@@ -154,7 +154,10 @@ static int asn1_bio_new(BIO *b)
 	if (!ctx)
 		return 0;
 	if (!asn1_bio_init(ctx, DEFAULT_ASN1_BUF_SIZE))
+		{
+		OPENSSL_free(ctx);
 		return 0;
+		}
 	b->init = 1;
 	b->ptr = (char *)ctx;
 	b->flags = 0;
diff --git a/crypto/openssl/crypto/asn1/charmap.pl b/crypto/openssl/crypto/asn1/charmap.pl
index 2875c5986728..25ebf2c205d0 100644
--- a/crypto/openssl/crypto/asn1/charmap.pl
+++ b/crypto/openssl/crypto/asn1/charmap.pl
@@ -1,5 +1,8 @@
 #!/usr/local/bin/perl -w
 
+# Written by Dr Stephen N Henson (steve@openssl.org).
+# Licensed under the terms of the OpenSSL license.
+
 use strict;
 
 my ($i, @arr);
diff --git a/crypto/openssl/crypto/asn1/evp_asn1.c b/crypto/openssl/crypto/asn1/evp_asn1.c
index f3d9804860ec..1b9445973e49 100644
--- a/crypto/openssl/crypto/asn1/evp_asn1.c
+++ b/crypto/openssl/crypto/asn1/evp_asn1.c
@@ -66,7 +66,11 @@ int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len)
 	ASN1_STRING *os;
 
 	if ((os=M_ASN1_OCTET_STRING_new()) == NULL) return(0);
-	if (!M_ASN1_OCTET_STRING_set(os,data,len)) return(0);
+	if (!M_ASN1_OCTET_STRING_set(os,data,len))
+		{
+		M_ASN1_OCTET_STRING_free(os);
+		return 0;
+		}
 	ASN1_TYPE_set(a,V_ASN1_OCTET_STRING,os);
 	return(1);
 	}
diff --git a/crypto/openssl/crypto/asn1/t_x509.c b/crypto/openssl/crypto/asn1/t_x509.c
index edbb39a02f7a..8e961f5e7d59 100644
--- a/crypto/openssl/crypto/asn1/t_x509.c
+++ b/crypto/openssl/crypto/asn1/t_x509.c
@@ -475,6 +475,8 @@ int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
 	l=80-2-obase;
 
 	b=X509_NAME_oneline(name,NULL,0);
+	if (!b)
+		return 0;
 	if (!*b)
 		{
 		OPENSSL_free(b);
diff --git a/crypto/openssl/crypto/asn1/tasn_enc.c b/crypto/openssl/crypto/asn1/tasn_enc.c
index 936ad1f767c6..1390e5e6aef7 100644
--- a/crypto/openssl/crypto/asn1/tasn_enc.c
+++ b/crypto/openssl/crypto/asn1/tasn_enc.c
@@ -453,9 +453,14 @@ static int asn1_set_seq_out(STACK_OF(ASN1_VALUE) *sk, unsigned char **out,
 			{
 			derlst = OPENSSL_malloc(sk_ASN1_VALUE_num(sk)
 						* sizeof(*derlst));
-			tmpdat = OPENSSL_malloc(skcontlen);
-			if (!derlst || !tmpdat)
+			if (!derlst)
 				return 0;
+			tmpdat = OPENSSL_malloc(skcontlen);
+			if (!tmpdat)
+				{
+				OPENSSL_free(derlst);
+				return 0;
+				}
 			}
 		}
 	/* If not sorting just output each item */
diff --git a/crypto/openssl/crypto/asn1/x_crl.c b/crypto/openssl/crypto/asn1/x_crl.c
index c51c690ba9d3..3f03efbe6047 100644
--- a/crypto/openssl/crypto/asn1/x_crl.c
+++ b/crypto/openssl/crypto/asn1/x_crl.c
@@ -270,6 +270,7 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 				{
 				/* We handle IDP and deltas */
 				if ((nid == NID_issuing_distribution_point)
+					|| (nid == NID_authority_key_identifier)
 					|| (nid == NID_delta_crl))
 					break;;
 				crl->flags |= EXFLAG_CRITICAL;
diff --git a/crypto/openssl/crypto/bio/bio_lib.c b/crypto/openssl/crypto/bio/bio_lib.c
index 9c9646afa8a2..4793a453e4af 100644
--- a/crypto/openssl/crypto/bio/bio_lib.c
+++ b/crypto/openssl/crypto/bio/bio_lib.c
@@ -132,8 +132,8 @@ int BIO_free(BIO *a)
 
 	CRYPTO_free_ex_data(CRYPTO_EX_INDEX_BIO, a, &a->ex_data);
 
-	if ((a->method == NULL) || (a->method->destroy == NULL)) return(1);
-	a->method->destroy(a);
+	if ((a->method != NULL) && (a->method->destroy != NULL))
+		a->method->destroy(a);
 	OPENSSL_free(a);
 	return(1);
 	}
diff --git a/crypto/openssl/crypto/bn/bn_exp.c b/crypto/openssl/crypto/bn/bn_exp.c
index 2abf6fd67871..5e7eb3373ffd 100644
--- a/crypto/openssl/crypto/bn/bn_exp.c
+++ b/crypto/openssl/crypto/bn/bn_exp.c
@@ -680,7 +680,7 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
 
     /* Dedicated window==4 case improves 512-bit RSA sign by ~15%, but as
      * 512-bit RSA is hardly relevant, we omit it to spare size... */ 
-    if (window==5)
+    if (window==5 && top>1)
 	{
 	void bn_mul_mont_gather5(BN_ULONG *rp,const BN_ULONG *ap,
 			const void *table,const BN_ULONG *np,
diff --git a/crypto/openssl/crypto/bn/bn_lib.c b/crypto/openssl/crypto/bn/bn_lib.c
index 5461e6ee7dbe..d5a211e288b6 100644
--- a/crypto/openssl/crypto/bn/bn_lib.c
+++ b/crypto/openssl/crypto/bn/bn_lib.c
@@ -320,6 +320,15 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words)
 		BNerr(BN_F_BN_EXPAND_INTERNAL,ERR_R_MALLOC_FAILURE);
 		return(NULL);
 		}
+#ifdef PURIFY
+	/* Valgrind complains in BN_consttime_swap because we process the whole
+	 * array even if it's not initialised yet. This doesn't matter in that
+	 * function - what's important is constant time operation (we're not
+	 * actually going to use the data)
+	*/
+	memset(a, 0, sizeof(BN_ULONG)*words);
+#endif
+
 #if 1
 	B=b->d;
 	/* Check if the previous number needs to be copied */
diff --git a/crypto/openssl/crypto/bn/bn_sqr.c b/crypto/openssl/crypto/bn/bn_sqr.c
index 270d0cd348b9..65bbf165d0e2 100644
--- a/crypto/openssl/crypto/bn/bn_sqr.c
+++ b/crypto/openssl/crypto/bn/bn_sqr.c
@@ -77,6 +77,7 @@ int BN_sqr(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
 	if (al <= 0)
 		{
 		r->top=0;
+		r->neg = 0;
 		return 1;
 		}
 
diff --git a/crypto/openssl/crypto/cms/cms_pwri.c b/crypto/openssl/crypto/cms/cms_pwri.c
index b79612a12df4..71f2ddb49695 100644
--- a/crypto/openssl/crypto/cms/cms_pwri.c
+++ b/crypto/openssl/crypto/cms/cms_pwri.c
@@ -93,9 +93,10 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
 	X509_ALGOR *encalg = NULL;
 	unsigned char iv[EVP_MAX_IV_LENGTH];
 	int ivlen;
+
 	env = cms_get0_enveloped(cms);
 	if (!env)
-		goto err;
+		return NULL;
 
 	if (wrap_nid <= 0)
 		wrap_nid = NID_id_alg_PWRI_KEK;
diff --git a/crypto/openssl/crypto/conf/conf_def.c b/crypto/openssl/crypto/conf/conf_def.c
index cf951320af8e..f0b27687395f 100644
--- a/crypto/openssl/crypto/conf/conf_def.c
+++ b/crypto/openssl/crypto/conf/conf_def.c
@@ -321,7 +321,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
 			p=eat_ws(conf, end);
 			if (*p != ']')
 				{
-				if (*p != '\0')
+				if (*p != '\0' && ss != p)
 					{
 					ss=p;
 					goto again;
diff --git a/crypto/openssl/crypto/ec/ec_lib.c b/crypto/openssl/crypto/ec/ec_lib.c
index de9a0cc2b37e..e2c4741b5b77 100644
--- a/crypto/openssl/crypto/ec/ec_lib.c
+++ b/crypto/openssl/crypto/ec/ec_lib.c
@@ -942,7 +942,7 @@ int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX *
 
 int EC_POINT_invert(const EC_GROUP *group, EC_POINT *a, BN_CTX *ctx)
 	{
-	if (group->meth->dbl == 0)
+	if (group->meth->invert == 0)
 		{
 		ECerr(EC_F_EC_POINT_INVERT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
 		return 0;
diff --git a/crypto/openssl/crypto/ec/ecp_smpl.c b/crypto/openssl/crypto/ec/ecp_smpl.c
index 7cbb321f9aae..ef5285477a2a 100644
--- a/crypto/openssl/crypto/ec/ecp_smpl.c
+++ b/crypto/openssl/crypto/ec/ecp_smpl.c
@@ -1181,9 +1181,8 @@ int ec_GFp_simple_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ct
 int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx)
 	{
 	BN_CTX *new_ctx = NULL;
-	BIGNUM *tmp0, *tmp1;
-	size_t pow2 = 0;
-	BIGNUM **heap = NULL;
+	BIGNUM *tmp, *tmp_Z;
+	BIGNUM **prod_Z = NULL;
 	size_t i;
 	int ret = 0;
 
@@ -1198,124 +1197,104 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT
 		}
 
 	BN_CTX_start(ctx);
-	tmp0 = BN_CTX_get(ctx);
-	tmp1 = BN_CTX_get(ctx);
-	if (tmp0  == NULL || tmp1 == NULL) goto err;
+	tmp = BN_CTX_get(ctx);
+	tmp_Z = BN_CTX_get(ctx);
+	if (tmp == NULL || tmp_Z == NULL) goto err;
 
-	/* Before converting the individual points, compute inverses of all Z values.
-	 * Modular inversion is rather slow, but luckily we can do with a single
-	 * explicit inversion, plus about 3 multiplications per input value.
-	 */
-
-	pow2 = 1;
-	while (num > pow2)
-		pow2 <<= 1;
-	/* Now pow2 is the smallest power of 2 satifsying pow2 >= num.
-	 * We need twice that. */
-	pow2 <<= 1;
-
-	heap = OPENSSL_malloc(pow2 * sizeof heap[0]);
-	if (heap == NULL) goto err;
-	
-	/* The array is used as a binary tree, exactly as in heapsort:
-	 *
-	 *                               heap[1]
-	 *                 heap[2]                     heap[3]
-	 *          heap[4]       heap[5]       heap[6]       heap[7]
-	 *   heap[8]heap[9] heap[10]heap[11] heap[12]heap[13] heap[14] heap[15]
-	 *
-	 * We put the Z's in the last line;
-	 * then we set each other node to the product of its two child-nodes (where
-	 * empty or 0 entries are treated as ones);
-	 * then we invert heap[1];
-	 * then we invert each other node by replacing it by the product of its
-	 * parent (after inversion) and its sibling (before inversion).
-	 */
-	heap[0] = NULL;
-	for (i = pow2/2 - 1; i > 0; i--)
-		heap[i] = NULL;
+	prod_Z = OPENSSL_malloc(num * sizeof prod_Z[0]);
+	if (prod_Z == NULL) goto err;
 	for (i = 0; i < num; i++)
-		heap[pow2/2 + i] = &points[i]->Z;
-	for (i = pow2/2 + num; i < pow2; i++)
-		heap[i] = NULL;
-	
-	/* set each node to the product of its children */
-	for (i = pow2/2 - 1; i > 0; i--)
 		{
-		heap[i] = BN_new();
-		if (heap[i] == NULL) goto err;
-		
-		if (heap[2*i] != NULL)
-			{
-			if ((heap[2*i + 1] == NULL) || BN_is_zero(heap[2*i + 1]))
-				{
-				if (!BN_copy(heap[i], heap[2*i])) goto err;
-				}
-			else
-				{
-				if (BN_is_zero(heap[2*i]))
-					{
-					if (!BN_copy(heap[i], heap[2*i + 1])) goto err;
-					}
-				else
-					{
-					if (!group->meth->field_mul(group, heap[i],
-						heap[2*i], heap[2*i + 1], ctx)) goto err;
-					}
-				}
-			}
+		prod_Z[i] = BN_new();
+		if (prod_Z[i] == NULL) goto err;
 		}
 
-	/* invert heap[1] */
-	if (!BN_is_zero(heap[1]))
-		{
-		if (!BN_mod_inverse(heap[1], heap[1], &group->field, ctx))
-			{
-			ECerr(EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE, ERR_R_BN_LIB);
-			goto err;
-			}
-		}
-	if (group->meth->field_encode != 0)
-		{
-		/* in the Montgomery case, we just turned  R*H  (representing H)
-		 * into  1/(R*H),  but we need  R*(1/H)  (representing 1/H);
-		 * i.e. we have need to multiply by the Montgomery factor twice */
-		if (!group->meth->field_encode(group, heap[1], heap[1], ctx)) goto err;
-		if (!group->meth->field_encode(group, heap[1], heap[1], ctx)) goto err;
-		}
+	/* Set each prod_Z[i] to the product of points[0]->Z .. points[i]->Z,
+	 * skipping any zero-valued inputs (pretend that they're 1). */
 
-	/* set other heap[i]'s to their inverses */
-	for (i = 2; i < pow2/2 + num; i += 2)
+	if (!BN_is_zero(&points[0]->Z))
 		{
-		/* i is even */
-		if ((heap[i + 1] != NULL) && !BN_is_zero(heap[i + 1]))
+		if (!BN_copy(prod_Z[0], &points[0]->Z)) goto err;
+		}
+	else
+		{
+		if (group->meth->field_set_to_one != 0)
 			{
-			if (!group->meth->field_mul(group, tmp0, heap[i/2], heap[i + 1], ctx)) goto err;
-			if (!group->meth->field_mul(group, tmp1, heap[i/2], heap[i], ctx)) goto err;
-			if (!BN_copy(heap[i], tmp0)) goto err;
-			if (!BN_copy(heap[i + 1], tmp1)) goto err;
+			if (!group->meth->field_set_to_one(group, prod_Z[0], ctx)) goto err;
 			}
 		else
 			{
-			if (!BN_copy(heap[i], heap[i/2])) goto err;
+			if (!BN_one(prod_Z[0])) goto err;
 			}
 		}
 
-	/* we have replaced all non-zero Z's by their inverses, now fix up all the points */
+	for (i = 1; i < num; i++)
+		{
+		if (!BN_is_zero(&points[i]->Z))
+			{
+			if (!group->meth->field_mul(group, prod_Z[i], prod_Z[i - 1], &points[i]->Z, ctx)) goto err;
+			}
+		else
+			{
+			if (!BN_copy(prod_Z[i], prod_Z[i - 1])) goto err;
+			}
+		}
+
+	/* Now use a single explicit inversion to replace every
+	 * non-zero points[i]->Z by its inverse. */
+
+	if (!BN_mod_inverse(tmp, prod_Z[num - 1], &group->field, ctx))
+		{
+		ECerr(EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE, ERR_R_BN_LIB);
+		goto err;
+		}
+	if (group->meth->field_encode != 0)
+		{
+		/* In the Montgomery case, we just turned  R*H  (representing H)
+		 * into  1/(R*H),  but we need  R*(1/H)  (representing 1/H);
+		 * i.e. we need to multiply by the Montgomery factor twice. */
+		if (!group->meth->field_encode(group, tmp, tmp, ctx)) goto err;
+		if (!group->meth->field_encode(group, tmp, tmp, ctx)) goto err;
+		}
+
+	for (i = num - 1; i > 0; --i)
+		{
+		/* Loop invariant: tmp is the product of the inverses of
+		 * points[0]->Z .. points[i]->Z (zero-valued inputs skipped). */
+		if (!BN_is_zero(&points[i]->Z))
+			{
+			/* Set tmp_Z to the inverse of points[i]->Z (as product
+			 * of Z inverses 0 .. i, Z values 0 .. i - 1). */
+			if (!group->meth->field_mul(group, tmp_Z, prod_Z[i - 1], tmp, ctx)) goto err;
+			/* Update tmp to satisfy the loop invariant for i - 1. */
+			if (!group->meth->field_mul(group, tmp, tmp, &points[i]->Z, ctx)) goto err;
+			/* Replace points[i]->Z by its inverse. */
+			if (!BN_copy(&points[i]->Z, tmp_Z)) goto err;
+			}
+		}
+
+	if (!BN_is_zero(&points[0]->Z))
+		{
+		/* Replace points[0]->Z by its inverse. */
+		if (!BN_copy(&points[0]->Z, tmp)) goto err;
+		}
+
+	/* Finally, fix up the X and Y coordinates for all points. */
+
 	for (i = 0; i < num; i++)
 		{
 		EC_POINT *p = points[i];
-		
+
 		if (!BN_is_zero(&p->Z))
 			{
 			/* turn  (X, Y, 1/Z)  into  (X/Z^2, Y/Z^3, 1) */
 
-			if (!group->meth->field_sqr(group, tmp1, &p->Z, ctx)) goto err;
-			if (!group->meth->field_mul(group, &p->X, &p->X, tmp1, ctx)) goto err;
+			if (!group->meth->field_sqr(group, tmp, &p->Z, ctx)) goto err;
+			if (!group->meth->field_mul(group, &p->X, &p->X, tmp, ctx)) goto err;
+
+			if (!group->meth->field_mul(group, tmp, tmp, &p->Z, ctx)) goto err;
+			if (!group->meth->field_mul(group, &p->Y, &p->Y, tmp, ctx)) goto err;
 
-			if (!group->meth->field_mul(group, tmp1, tmp1, &p->Z, ctx)) goto err;
-			if (!group->meth->field_mul(group, &p->Y, &p->Y, tmp1, ctx)) goto err;
-		
 			if (group->meth->field_set_to_one != 0)
 				{
 				if (!group->meth->field_set_to_one(group, &p->Z, ctx)) goto err;
@@ -1329,20 +1308,19 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT
 		}
 
 	ret = 1;
-		
+
  err:
 	BN_CTX_end(ctx);
 	if (new_ctx != NULL)
 		BN_CTX_free(new_ctx);
-	if (heap != NULL)
+	if (prod_Z != NULL)
 		{
-		/* heap[pow2/2] .. heap[pow2-1] have not been allocated locally! */
-		for (i = pow2/2 - 1; i > 0; i--)
+		for (i = 0; i < num; i++)
 			{
-			if (heap[i] != NULL)
-				BN_clear_free(heap[i]);
+			if (prod_Z[i] != NULL)
+				BN_clear_free(prod_Z[i]);
 			}
-		OPENSSL_free(heap);
+		OPENSSL_free(prod_Z);
 		}
 	return ret;
 	}
diff --git a/crypto/openssl/crypto/ec/ectest.c b/crypto/openssl/crypto/ec/ectest.c
index 102eaa9b2326..82c8c8bfb119 100644
--- a/crypto/openssl/crypto/ec/ectest.c
+++ b/crypto/openssl/crypto/ec/ectest.c
@@ -199,6 +199,7 @@ static void group_order_tests(EC_GROUP *group)
 	EC_POINT *P = EC_POINT_new(group);
 	EC_POINT *Q = EC_POINT_new(group);
 	BN_CTX *ctx = BN_CTX_new();
+	int i;
 
 	n1 = BN_new(); n2 = BN_new(); order = BN_new();
 	fprintf(stdout, "verify group order ...");
@@ -212,21 +213,55 @@ static void group_order_tests(EC_GROUP *group)
 	if (!EC_POINT_mul(group, Q, order, NULL, NULL, ctx)) ABORT;
 	if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
 	fprintf(stdout, " ok\n");
-	fprintf(stdout, "long/negative scalar tests ... ");
-	if (!BN_one(n1)) ABORT;
-	/* n1 = 1 - order */
-	if (!BN_sub(n1, n1, order)) ABORT;
-	if(!EC_POINT_mul(group, Q, NULL, P, n1, ctx)) ABORT;
-	if (0 != EC_POINT_cmp(group, Q, P, ctx)) ABORT;
-	/* n2 = 1 + order */
-	if (!BN_add(n2, order, BN_value_one())) ABORT;
-	if(!EC_POINT_mul(group, Q, NULL, P, n2, ctx)) ABORT;
-	if (0 != EC_POINT_cmp(group, Q, P, ctx)) ABORT;
-	/* n2 = (1 - order) * (1 + order) */
-	if (!BN_mul(n2, n1, n2, ctx)) ABORT;
-	if(!EC_POINT_mul(group, Q, NULL, P, n2, ctx)) ABORT;
-	if (0 != EC_POINT_cmp(group, Q, P, ctx)) ABORT;
+	fprintf(stdout, "long/negative scalar tests ");
+        for (i = 1; i <= 2; i++)
+		{
+		const BIGNUM *scalars[6];
+		const EC_POINT *points[6];
+
+		fprintf(stdout, i == 1 ?
+			"allowing precomputation ... " :
+			"without precomputation ... ");
+		if (!BN_set_word(n1, i)) ABORT;
+		/* If i == 1, P will be the predefined generator for which
+		 * EC_GROUP_precompute_mult has set up precomputation. */
+		if (!EC_POINT_mul(group, P, n1, NULL, NULL, ctx)) ABORT;
+
+		if (!BN_one(n1)) ABORT;
+		/* n1 = 1 - order */
+		if (!BN_sub(n1, n1, order)) ABORT;
+		if (!EC_POINT_mul(group, Q, NULL, P, n1, ctx)) ABORT;
+		if (0 != EC_POINT_cmp(group, Q, P, ctx)) ABORT;
+
+		/* n2 = 1 + order */
+		if (!BN_add(n2, order, BN_value_one())) ABORT;
+		if (!EC_POINT_mul(group, Q, NULL, P, n2, ctx)) ABORT;
+		if (0 != EC_POINT_cmp(group, Q, P, ctx)) ABORT;
+
+		/* n2 = (1 - order) * (1 + order) = 1 - order^2 */
+		if (!BN_mul(n2, n1, n2, ctx)) ABORT;
+		if (!EC_POINT_mul(group, Q, NULL, P, n2, ctx)) ABORT;
+		if (0 != EC_POINT_cmp(group, Q, P, ctx)) ABORT;
+
+		/* n2 = order^2 - 1 */
+		BN_set_negative(n2, 0);
+		if (!EC_POINT_mul(group, Q, NULL, P, n2, ctx)) ABORT;
+		/* Add P to verify the result. */
+		if (!EC_POINT_add(group, Q, Q, P, ctx)) ABORT;
+		if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
+
+		/* Exercise EC_POINTs_mul, including corner cases. */
+		scalars[0] = n1; points[0] = Q; /* => infinity */
+		scalars[1] = n2; points[1] = P; /* => -P */
+		scalars[2] = n1; points[2] = Q; /* => infinity */
+		scalars[3] = n2; points[3] = Q; /* => infinity */
+		scalars[4] = n1; points[4] = P; /* => P */
+		scalars[5] = n2; points[5] = Q; /* => infinity */
+		if (!EC_POINTs_mul(group, Q, NULL, 5, points, scalars, ctx)) ABORT;
+		if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
+		}
 	fprintf(stdout, "ok\n");
+
 	EC_POINT_free(P);
 	EC_POINT_free(Q);
 	BN_free(n1);
diff --git a/crypto/openssl/crypto/evp/e_aes.c b/crypto/openssl/crypto/evp/e_aes.c
index c7869b69efe2..07bf83a608d8 100644
--- a/crypto/openssl/crypto/evp/e_aes.c
+++ b/crypto/openssl/crypto/evp/e_aes.c
@@ -808,6 +808,28 @@ static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 		/* Extra padding: tag appended to record */
 		return EVP_GCM_TLS_TAG_LEN;
 
+	case EVP_CTRL_COPY:
+		{
+			EVP_CIPHER_CTX *out = ptr;
+			EVP_AES_GCM_CTX *gctx_out = out->cipher_data;
+			if (gctx->gcm.key)
+				{
+				if (gctx->gcm.key != &gctx->ks)
+					return 0;
+				gctx_out->gcm.key = &gctx_out->ks;
+				}
+			if (gctx->iv == c->iv)
+				gctx_out->iv = out->iv;
+			else
+			{
+				gctx_out->iv = OPENSSL_malloc(gctx->ivlen);
+				if (!gctx_out->iv)
+					return 0;
+				memcpy(gctx_out->iv, gctx->iv, gctx->ivlen);
+			}
+			return 1;
+		}
+
 	default:
 		return -1;
 
@@ -1032,7 +1054,8 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
 #define CUSTOM_FLAGS	(EVP_CIPH_FLAG_DEFAULT_ASN1 \
 		| EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
-		| EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT)
+		| EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
+		| EVP_CIPH_CUSTOM_COPY)
 
 BLOCK_CIPHER_custom(NID_aes,128,1,12,gcm,GCM,
 		EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS)
@@ -1044,7 +1067,25 @@ BLOCK_CIPHER_custom(NID_aes,256,1,12,gcm,GCM,
 static int aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 	{
 	EVP_AES_XTS_CTX *xctx = c->cipher_data;
-	if (type != EVP_CTRL_INIT)
+	if (type == EVP_CTRL_COPY)
+		{
+		EVP_CIPHER_CTX *out = ptr;
+		EVP_AES_XTS_CTX *xctx_out = out->cipher_data;
+		if (xctx->xts.key1)
+			{
+			if (xctx->xts.key1 != &xctx->ks1)
+				return 0;
+			xctx_out->xts.key1 = &xctx_out->ks1;
+			}
+		if (xctx->xts.key2)
+			{
+			if (xctx->xts.key2 != &xctx->ks2)
+				return 0;
+			xctx_out->xts.key2 = &xctx_out->ks2;
+			}
+		return 1;
+		}
+	else if (type != EVP_CTRL_INIT)
 		return -1;
 	/* key1 and key2 are used as an indicator both key and IV are set */
 	xctx->xts.key1 = NULL;
@@ -1153,7 +1194,8 @@ static int aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 #define aes_xts_cleanup NULL
 
 #define XTS_FLAGS	(EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV \
-			 | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT)
+			 | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT \
+			 | EVP_CIPH_CUSTOM_COPY)
 
 BLOCK_CIPHER_custom(NID_aes,128,1,16,xts,XTS,EVP_CIPH_FLAG_FIPS|XTS_FLAGS)
 BLOCK_CIPHER_custom(NID_aes,256,1,16,xts,XTS,EVP_CIPH_FLAG_FIPS|XTS_FLAGS)
@@ -1203,6 +1245,19 @@ static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 		cctx->len_set = 0;
 		return 1;
 
+	case EVP_CTRL_COPY:
+		{
+			EVP_CIPHER_CTX *out = ptr;
+			EVP_AES_CCM_CTX *cctx_out = out->cipher_data;
+			if (cctx->ccm.key)
+				{
+				if (cctx->ccm.key != &cctx->ks)
+					return 0;
+				cctx_out->ccm.key = &cctx_out->ks;
+				}
+			return 1;
+		}
+
 	default:
 		return -1;
 
diff --git a/crypto/openssl/crypto/evp/evp_pbe.c b/crypto/openssl/crypto/evp/evp_pbe.c
index f8c32d825e79..596969594863 100644
--- a/crypto/openssl/crypto/evp/evp_pbe.c
+++ b/crypto/openssl/crypto/evp/evp_pbe.c
@@ -259,7 +259,7 @@ int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
 	{
 	int cipher_nid, md_nid;
 	if (cipher)
-		cipher_nid = EVP_CIPHER_type(cipher);
+		cipher_nid = EVP_CIPHER_nid(cipher);
 	else
 		cipher_nid = -1;
 	if (md)
diff --git a/crypto/openssl/crypto/idea/ideatest.c b/crypto/openssl/crypto/idea/ideatest.c
index e6ffc7025e75..d509f8116ede 100644
--- a/crypto/openssl/crypto/idea/ideatest.c
+++ b/crypto/openssl/crypto/idea/ideatest.c
@@ -199,10 +199,10 @@ static int cfb64_test(unsigned char *cfb_cipher)
                 }
         memcpy(cfb_tmp,cfb_iv,8);
         n=0;
-        idea_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)17,&eks,
+        idea_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)13,&eks,
                 cfb_tmp,&n,IDEA_DECRYPT);
-        idea_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]),
-                (long)CFB_TEST_SIZE-17,&dks,
+        idea_cfb64_encrypt(&(cfb_buf1[13]),&(cfb_buf2[13]),
+                (long)CFB_TEST_SIZE-13,&eks,
                 cfb_tmp,&n,IDEA_DECRYPT);
         if (memcmp(plain,cfb_buf2,CFB_TEST_SIZE) != 0)
                 {
diff --git a/crypto/openssl/crypto/objects/obj_dat.c b/crypto/openssl/crypto/objects/obj_dat.c
index 8a342ba3eb3e..0b2f44241b54 100644
--- a/crypto/openssl/crypto/objects/obj_dat.c
+++ b/crypto/openssl/crypto/objects/obj_dat.c
@@ -471,11 +471,12 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
 	const unsigned char *p;
 	char tbuf[DECIMAL_SIZE(i)+DECIMAL_SIZE(l)+2];
 
-	if ((a == NULL) || (a->data == NULL)) {
-		buf[0]='\0';
-		return(0);
-	}
+	/* Ensure that, at every state, |buf| is NUL-terminated. */
+	if (buf && buf_len > 0)
+		buf[0] = '\0';
 
+	if ((a == NULL) || (a->data == NULL))
+		return(0);
 
 	if (!no_name && (nid=OBJ_obj2nid(a)) != NID_undef)
 		{
@@ -554,9 +555,10 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
 				i=(int)(l/40);
 				l-=(long)(i*40);
 				}
-			if (buf && (buf_len > 0))
+			if (buf && (buf_len > 1))
 				{
 				*buf++ = i + '0';
+				*buf = '\0';
 				buf_len--;
 				}
 			n++;
@@ -571,9 +573,10 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
 			i = strlen(bndec);
 			if (buf)
 				{
-				if (buf_len > 0)
+				if (buf_len > 1)
 					{
 					*buf++ = '.';
+					*buf = '\0';
 					buf_len--;
 					}
 				BUF_strlcpy(buf,bndec,buf_len);
@@ -807,4 +810,3 @@ int OBJ_create(const char *oid, const char *sn, const char *ln)
 	OPENSSL_free(buf);
 	return(ok);
 	}
-
diff --git a/crypto/openssl/crypto/objects/obj_dat.h b/crypto/openssl/crypto/objects/obj_dat.h
index d404ad07c981..bc69665bc582 100644
--- a/crypto/openssl/crypto/objects/obj_dat.h
+++ b/crypto/openssl/crypto/objects/obj_dat.h
@@ -67,1908 +67,1901 @@
 #define NUM_LN 913
 #define NUM_OBJ 857
 
-static const unsigned char lvalues[5980]={
-0x00,                                        /* [  0] OBJ_undef */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  1] OBJ_rsadsi */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  7] OBJ_pkcs */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02,     /* [ 14] OBJ_md2 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x05,     /* [ 22] OBJ_md5 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x04,     /* [ 30] OBJ_rc4 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,/* [ 38] OBJ_rsaEncryption */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x02,/* [ 47] OBJ_md2WithRSAEncryption */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x04,/* [ 56] OBJ_md5WithRSAEncryption */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x01,/* [ 65] OBJ_pbeWithMD2AndDES_CBC */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x03,/* [ 74] OBJ_pbeWithMD5AndDES_CBC */
-0x55,                                        /* [ 83] OBJ_X500 */
-0x55,0x04,                                   /* [ 84] OBJ_X509 */
-0x55,0x04,0x03,                              /* [ 86] OBJ_commonName */
-0x55,0x04,0x06,                              /* [ 89] OBJ_countryName */
-0x55,0x04,0x07,                              /* [ 92] OBJ_localityName */
-0x55,0x04,0x08,                              /* [ 95] OBJ_stateOrProvinceName */
-0x55,0x04,0x0A,                              /* [ 98] OBJ_organizationName */
-0x55,0x04,0x0B,                              /* [101] OBJ_organizationalUnitName */
-0x55,0x08,0x01,0x01,                         /* [104] OBJ_rsa */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,     /* [108] OBJ_pkcs7 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x01,/* [116] OBJ_pkcs7_data */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x02,/* [125] OBJ_pkcs7_signed */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x03,/* [134] OBJ_pkcs7_enveloped */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x04,/* [143] OBJ_pkcs7_signedAndEnveloped */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x05,/* [152] OBJ_pkcs7_digest */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x06,/* [161] OBJ_pkcs7_encrypted */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x03,     /* [170] OBJ_pkcs3 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x03,0x01,/* [178] OBJ_dhKeyAgreement */
-0x2B,0x0E,0x03,0x02,0x06,                    /* [187] OBJ_des_ecb */
-0x2B,0x0E,0x03,0x02,0x09,                    /* [192] OBJ_des_cfb64 */
-0x2B,0x0E,0x03,0x02,0x07,                    /* [197] OBJ_des_cbc */
-0x2B,0x0E,0x03,0x02,0x11,                    /* [202] OBJ_des_ede_ecb */
-0x2B,0x06,0x01,0x04,0x01,0x81,0x3C,0x07,0x01,0x01,0x02,/* [207] OBJ_idea_cbc */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x02,     /* [218] OBJ_rc2_cbc */
-0x2B,0x0E,0x03,0x02,0x12,                    /* [226] OBJ_sha */
-0x2B,0x0E,0x03,0x02,0x0F,                    /* [231] OBJ_shaWithRSAEncryption */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x07,     /* [236] OBJ_des_ede3_cbc */
-0x2B,0x0E,0x03,0x02,0x08,                    /* [244] OBJ_des_ofb64 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,     /* [249] OBJ_pkcs9 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x01,/* [257] OBJ_pkcs9_emailAddress */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x02,/* [266] OBJ_pkcs9_unstructuredName */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x03,/* [275] OBJ_pkcs9_contentType */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x04,/* [284] OBJ_pkcs9_messageDigest */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x05,/* [293] OBJ_pkcs9_signingTime */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x06,/* [302] OBJ_pkcs9_countersignature */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x07,/* [311] OBJ_pkcs9_challengePassword */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x08,/* [320] OBJ_pkcs9_unstructuredAddress */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x09,/* [329] OBJ_pkcs9_extCertAttributes */
-0x60,0x86,0x48,0x01,0x86,0xF8,0x42,          /* [338] OBJ_netscape */
-0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,     /* [345] OBJ_netscape_cert_extension */
-0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x02,     /* [353] OBJ_netscape_data_type */
-0x2B,0x0E,0x03,0x02,0x1A,                    /* [361] OBJ_sha1 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,/* [366] OBJ_sha1WithRSAEncryption */
-0x2B,0x0E,0x03,0x02,0x0D,                    /* [375] OBJ_dsaWithSHA */
-0x2B,0x0E,0x03,0x02,0x0C,                    /* [380] OBJ_dsa_2 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0B,/* [385] OBJ_pbeWithSHA1AndRC2_CBC */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0C,/* [394] OBJ_id_pbkdf2 */
-0x2B,0x0E,0x03,0x02,0x1B,                    /* [403] OBJ_dsaWithSHA1_2 */
-0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x01,/* [408] OBJ_netscape_cert_type */
-0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x02,/* [417] OBJ_netscape_base_url */
-0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x03,/* [426] OBJ_netscape_revocation_url */
-0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x04,/* [435] OBJ_netscape_ca_revocation_url */
-0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x07,/* [444] OBJ_netscape_renewal_url */
-0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x08,/* [453] OBJ_netscape_ca_policy_url */
-0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x0C,/* [462] OBJ_netscape_ssl_server_name */
-0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x0D,/* [471] OBJ_netscape_comment */
-0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x02,0x05,/* [480] OBJ_netscape_cert_sequence */
-0x55,0x1D,                                   /* [489] OBJ_id_ce */
-0x55,0x1D,0x0E,                              /* [491] OBJ_subject_key_identifier */
-0x55,0x1D,0x0F,                              /* [494] OBJ_key_usage */
-0x55,0x1D,0x10,                              /* [497] OBJ_private_key_usage_period */
-0x55,0x1D,0x11,                              /* [500] OBJ_subject_alt_name */
-0x55,0x1D,0x12,                              /* [503] OBJ_issuer_alt_name */
-0x55,0x1D,0x13,                              /* [506] OBJ_basic_constraints */
-0x55,0x1D,0x14,                              /* [509] OBJ_crl_number */
-0x55,0x1D,0x20,                              /* [512] OBJ_certificate_policies */
-0x55,0x1D,0x23,                              /* [515] OBJ_authority_key_identifier */
-0x2B,0x06,0x01,0x04,0x01,0x97,0x55,0x01,0x02,/* [518] OBJ_bf_cbc */
-0x55,0x08,0x03,0x65,                         /* [527] OBJ_mdc2 */
-0x55,0x08,0x03,0x64,                         /* [531] OBJ_mdc2WithRSA */
-0x55,0x04,0x2A,                              /* [535] OBJ_givenName */
-0x55,0x04,0x04,                              /* [538] OBJ_surname */
-0x55,0x04,0x2B,                              /* [541] OBJ_initials */
-0x55,0x1D,0x1F,                              /* [544] OBJ_crl_distribution_points */
-0x2B,0x0E,0x03,0x02,0x03,                    /* [547] OBJ_md5WithRSA */
-0x55,0x04,0x05,                              /* [552] OBJ_serialNumber */
-0x55,0x04,0x0C,                              /* [555] OBJ_title */
-0x55,0x04,0x0D,                              /* [558] OBJ_description */
-0x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x0A,/* [561] OBJ_cast5_cbc */
-0x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x0C,/* [570] OBJ_pbeWithMD5AndCast5_CBC */
-0x2A,0x86,0x48,0xCE,0x38,0x04,0x03,          /* [579] OBJ_dsaWithSHA1 */
-0x2B,0x0E,0x03,0x02,0x1D,                    /* [586] OBJ_sha1WithRSA */
-0x2A,0x86,0x48,0xCE,0x38,0x04,0x01,          /* [591] OBJ_dsa */
-0x2B,0x24,0x03,0x02,0x01,                    /* [598] OBJ_ripemd160 */
-0x2B,0x24,0x03,0x03,0x01,0x02,               /* [603] OBJ_ripemd160WithRSA */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x08,     /* [609] OBJ_rc5_cbc */
-0x29,0x01,0x01,0x85,0x1A,0x01,               /* [617] OBJ_rle_compression */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x08,/* [623] OBJ_zlib_compression */
-0x55,0x1D,0x25,                              /* [634] OBJ_ext_key_usage */
-0x2B,0x06,0x01,0x05,0x05,0x07,               /* [637] OBJ_id_pkix */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x03,          /* [643] OBJ_id_kp */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x01,     /* [650] OBJ_server_auth */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x02,     /* [658] OBJ_client_auth */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x03,     /* [666] OBJ_code_sign */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x04,     /* [674] OBJ_email_protect */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x08,     /* [682] OBJ_time_stamp */
-0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x15,/* [690] OBJ_ms_code_ind */
-0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x16,/* [700] OBJ_ms_code_com */
-0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x01,/* [710] OBJ_ms_ctl_sign */
-0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x03,/* [720] OBJ_ms_sgc */
-0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x04,/* [730] OBJ_ms_efs */
-0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x04,0x01,/* [740] OBJ_ns_sgc */
-0x55,0x1D,0x1B,                              /* [749] OBJ_delta_crl */
-0x55,0x1D,0x15,                              /* [752] OBJ_crl_reason */
-0x55,0x1D,0x18,                              /* [755] OBJ_invalidity_date */
-0x2B,0x65,0x01,0x04,0x01,                    /* [758] OBJ_sxnet */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x01,/* [763] OBJ_pbe_WithSHA1And128BitRC4 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x02,/* [773] OBJ_pbe_WithSHA1And40BitRC4 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x03,/* [783] OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x04,/* [793] OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x05,/* [803] OBJ_pbe_WithSHA1And128BitRC2_CBC */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x06,/* [813] OBJ_pbe_WithSHA1And40BitRC2_CBC */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x01,/* [823] OBJ_keyBag */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x02,/* [834] OBJ_pkcs8ShroudedKeyBag */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x03,/* [845] OBJ_certBag */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x04,/* [856] OBJ_crlBag */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x05,/* [867] OBJ_secretBag */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x06,/* [878] OBJ_safeContentsBag */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x14,/* [889] OBJ_friendlyName */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x15,/* [898] OBJ_localKeyID */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x16,0x01,/* [907] OBJ_x509Certificate */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x16,0x02,/* [917] OBJ_sdsiCertificate */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x17,0x01,/* [927] OBJ_x509Crl */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0D,/* [937] OBJ_pbes2 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0E,/* [946] OBJ_pbmac1 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x07,     /* [955] OBJ_hmacWithSHA1 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x01,     /* [963] OBJ_id_qt_cps */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x02,     /* [971] OBJ_id_qt_unotice */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x0F,/* [979] OBJ_SMIMECapabilities */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x04,/* [988] OBJ_pbeWithMD2AndRC2_CBC */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x06,/* [997] OBJ_pbeWithMD5AndRC2_CBC */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0A,/* [1006] OBJ_pbeWithSHA1AndDES_CBC */
-0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x0E,/* [1015] OBJ_ms_ext_req */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x0E,/* [1025] OBJ_ext_req */
-0x55,0x04,0x29,                              /* [1034] OBJ_name */
-0x55,0x04,0x2E,                              /* [1037] OBJ_dnQualifier */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,          /* [1040] OBJ_id_pe */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,          /* [1047] OBJ_id_ad */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x01,     /* [1054] OBJ_info_access */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,     /* [1062] OBJ_ad_OCSP */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x02,     /* [1070] OBJ_ad_ca_issuers */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x09,     /* [1078] OBJ_OCSP_sign */
-0x28,                                        /* [1086] OBJ_iso */
-0x2A,                                        /* [1087] OBJ_member_body */
-0x2A,0x86,0x48,                              /* [1088] OBJ_ISO_US */
-0x2A,0x86,0x48,0xCE,0x38,                    /* [1091] OBJ_X9_57 */
-0x2A,0x86,0x48,0xCE,0x38,0x04,               /* [1096] OBJ_X9cm */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,     /* [1102] OBJ_pkcs1 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,     /* [1110] OBJ_pkcs5 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,/* [1118] OBJ_SMIME */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,/* [1127] OBJ_id_smime_mod */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,/* [1137] OBJ_id_smime_ct */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,/* [1147] OBJ_id_smime_aa */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,/* [1157] OBJ_id_smime_alg */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x04,/* [1167] OBJ_id_smime_cd */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,/* [1177] OBJ_id_smime_spq */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,/* [1187] OBJ_id_smime_cti */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x01,/* [1197] OBJ_id_smime_mod_cms */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x02,/* [1208] OBJ_id_smime_mod_ess */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x03,/* [1219] OBJ_id_smime_mod_oid */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x04,/* [1230] OBJ_id_smime_mod_msg_v3 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x05,/* [1241] OBJ_id_smime_mod_ets_eSignature_88 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x06,/* [1252] OBJ_id_smime_mod_ets_eSignature_97 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x07,/* [1263] OBJ_id_smime_mod_ets_eSigPolicy_88 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x08,/* [1274] OBJ_id_smime_mod_ets_eSigPolicy_97 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x01,/* [1285] OBJ_id_smime_ct_receipt */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x02,/* [1296] OBJ_id_smime_ct_authData */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x03,/* [1307] OBJ_id_smime_ct_publishCert */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x04,/* [1318] OBJ_id_smime_ct_TSTInfo */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x05,/* [1329] OBJ_id_smime_ct_TDTInfo */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x06,/* [1340] OBJ_id_smime_ct_contentInfo */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x07,/* [1351] OBJ_id_smime_ct_DVCSRequestData */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x08,/* [1362] OBJ_id_smime_ct_DVCSResponseData */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x01,/* [1373] OBJ_id_smime_aa_receiptRequest */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x02,/* [1384] OBJ_id_smime_aa_securityLabel */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x03,/* [1395] OBJ_id_smime_aa_mlExpandHistory */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x04,/* [1406] OBJ_id_smime_aa_contentHint */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x05,/* [1417] OBJ_id_smime_aa_msgSigDigest */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x06,/* [1428] OBJ_id_smime_aa_encapContentType */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x07,/* [1439] OBJ_id_smime_aa_contentIdentifier */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x08,/* [1450] OBJ_id_smime_aa_macValue */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x09,/* [1461] OBJ_id_smime_aa_equivalentLabels */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0A,/* [1472] OBJ_id_smime_aa_contentReference */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0B,/* [1483] OBJ_id_smime_aa_encrypKeyPref */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0C,/* [1494] OBJ_id_smime_aa_signingCertificate */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0D,/* [1505] OBJ_id_smime_aa_smimeEncryptCerts */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0E,/* [1516] OBJ_id_smime_aa_timeStampToken */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0F,/* [1527] OBJ_id_smime_aa_ets_sigPolicyId */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x10,/* [1538] OBJ_id_smime_aa_ets_commitmentType */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x11,/* [1549] OBJ_id_smime_aa_ets_signerLocation */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x12,/* [1560] OBJ_id_smime_aa_ets_signerAttr */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x13,/* [1571] OBJ_id_smime_aa_ets_otherSigCert */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x14,/* [1582] OBJ_id_smime_aa_ets_contentTimestamp */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x15,/* [1593] OBJ_id_smime_aa_ets_CertificateRefs */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x16,/* [1604] OBJ_id_smime_aa_ets_RevocationRefs */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x17,/* [1615] OBJ_id_smime_aa_ets_certValues */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x18,/* [1626] OBJ_id_smime_aa_ets_revocationValues */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x19,/* [1637] OBJ_id_smime_aa_ets_escTimeStamp */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1A,/* [1648] OBJ_id_smime_aa_ets_certCRLTimestamp */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1B,/* [1659] OBJ_id_smime_aa_ets_archiveTimeStamp */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1C,/* [1670] OBJ_id_smime_aa_signatureType */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1D,/* [1681] OBJ_id_smime_aa_dvcs_dvc */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x01,/* [1692] OBJ_id_smime_alg_ESDHwith3DES */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x02,/* [1703] OBJ_id_smime_alg_ESDHwithRC2 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x03,/* [1714] OBJ_id_smime_alg_3DESwrap */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x04,/* [1725] OBJ_id_smime_alg_RC2wrap */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x05,/* [1736] OBJ_id_smime_alg_ESDH */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x06,/* [1747] OBJ_id_smime_alg_CMS3DESwrap */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x07,/* [1758] OBJ_id_smime_alg_CMSRC2wrap */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x04,0x01,/* [1769] OBJ_id_smime_cd_ldap */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,0x01,/* [1780] OBJ_id_smime_spq_ets_sqt_uri */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,0x02,/* [1791] OBJ_id_smime_spq_ets_sqt_unotice */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x01,/* [1802] OBJ_id_smime_cti_ets_proofOfOrigin */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x02,/* [1813] OBJ_id_smime_cti_ets_proofOfReceipt */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x03,/* [1824] OBJ_id_smime_cti_ets_proofOfDelivery */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x04,/* [1835] OBJ_id_smime_cti_ets_proofOfSender */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x05,/* [1846] OBJ_id_smime_cti_ets_proofOfApproval */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x06,/* [1857] OBJ_id_smime_cti_ets_proofOfCreation */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x04,     /* [1868] OBJ_md4 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,          /* [1876] OBJ_id_pkix_mod */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x02,          /* [1883] OBJ_id_qt */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,          /* [1890] OBJ_id_it */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x05,          /* [1897] OBJ_id_pkip */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x06,          /* [1904] OBJ_id_alg */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,          /* [1911] OBJ_id_cmc */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x08,          /* [1918] OBJ_id_on */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x09,          /* [1925] OBJ_id_pda */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,          /* [1932] OBJ_id_aca */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x0B,          /* [1939] OBJ_id_qcs */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x0C,          /* [1946] OBJ_id_cct */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x01,     /* [1953] OBJ_id_pkix1_explicit_88 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x02,     /* [1961] OBJ_id_pkix1_implicit_88 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x03,     /* [1969] OBJ_id_pkix1_explicit_93 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x04,     /* [1977] OBJ_id_pkix1_implicit_93 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x05,     /* [1985] OBJ_id_mod_crmf */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x06,     /* [1993] OBJ_id_mod_cmc */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x07,     /* [2001] OBJ_id_mod_kea_profile_88 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x08,     /* [2009] OBJ_id_mod_kea_profile_93 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x09,     /* [2017] OBJ_id_mod_cmp */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0A,     /* [2025] OBJ_id_mod_qualified_cert_88 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0B,     /* [2033] OBJ_id_mod_qualified_cert_93 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0C,     /* [2041] OBJ_id_mod_attribute_cert */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0D,     /* [2049] OBJ_id_mod_timestamp_protocol */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0E,     /* [2057] OBJ_id_mod_ocsp */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0F,     /* [2065] OBJ_id_mod_dvcs */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x10,     /* [2073] OBJ_id_mod_cmp2000 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x02,     /* [2081] OBJ_biometricInfo */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x03,     /* [2089] OBJ_qcStatements */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x04,     /* [2097] OBJ_ac_auditEntity */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x05,     /* [2105] OBJ_ac_targeting */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x06,     /* [2113] OBJ_aaControls */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x07,     /* [2121] OBJ_sbgp_ipAddrBlock */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x08,     /* [2129] OBJ_sbgp_autonomousSysNum */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x09,     /* [2137] OBJ_sbgp_routerIdentifier */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x03,     /* [2145] OBJ_textNotice */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x05,     /* [2153] OBJ_ipsecEndSystem */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x06,     /* [2161] OBJ_ipsecTunnel */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x07,     /* [2169] OBJ_ipsecUser */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x0A,     /* [2177] OBJ_dvcs */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x01,     /* [2185] OBJ_id_it_caProtEncCert */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x02,     /* [2193] OBJ_id_it_signKeyPairTypes */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x03,     /* [2201] OBJ_id_it_encKeyPairTypes */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x04,     /* [2209] OBJ_id_it_preferredSymmAlg */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x05,     /* [2217] OBJ_id_it_caKeyUpdateInfo */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x06,     /* [2225] OBJ_id_it_currentCRL */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x07,     /* [2233] OBJ_id_it_unsupportedOIDs */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x08,     /* [2241] OBJ_id_it_subscriptionRequest */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x09,     /* [2249] OBJ_id_it_subscriptionResponse */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0A,     /* [2257] OBJ_id_it_keyPairParamReq */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0B,     /* [2265] OBJ_id_it_keyPairParamRep */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0C,     /* [2273] OBJ_id_it_revPassphrase */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0D,     /* [2281] OBJ_id_it_implicitConfirm */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0E,     /* [2289] OBJ_id_it_confirmWaitTime */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0F,     /* [2297] OBJ_id_it_origPKIMessage */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,     /* [2305] OBJ_id_regCtrl */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02,     /* [2313] OBJ_id_regInfo */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x01,/* [2321] OBJ_id_regCtrl_regToken */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x02,/* [2330] OBJ_id_regCtrl_authenticator */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x03,/* [2339] OBJ_id_regCtrl_pkiPublicationInfo */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x04,/* [2348] OBJ_id_regCtrl_pkiArchiveOptions */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x05,/* [2357] OBJ_id_regCtrl_oldCertID */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x06,/* [2366] OBJ_id_regCtrl_protocolEncrKey */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02,0x01,/* [2375] OBJ_id_regInfo_utf8Pairs */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02,0x02,/* [2384] OBJ_id_regInfo_certReq */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x01,     /* [2393] OBJ_id_alg_des40 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x02,     /* [2401] OBJ_id_alg_noSignature */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x03,     /* [2409] OBJ_id_alg_dh_sig_hmac_sha1 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x04,     /* [2417] OBJ_id_alg_dh_pop */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x01,     /* [2425] OBJ_id_cmc_statusInfo */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x02,     /* [2433] OBJ_id_cmc_identification */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x03,     /* [2441] OBJ_id_cmc_identityProof */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x04,     /* [2449] OBJ_id_cmc_dataReturn */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x05,     /* [2457] OBJ_id_cmc_transactionId */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x06,     /* [2465] OBJ_id_cmc_senderNonce */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x07,     /* [2473] OBJ_id_cmc_recipientNonce */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x08,     /* [2481] OBJ_id_cmc_addExtensions */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x09,     /* [2489] OBJ_id_cmc_encryptedPOP */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0A,     /* [2497] OBJ_id_cmc_decryptedPOP */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0B,     /* [2505] OBJ_id_cmc_lraPOPWitness */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0F,     /* [2513] OBJ_id_cmc_getCert */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x10,     /* [2521] OBJ_id_cmc_getCRL */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x11,     /* [2529] OBJ_id_cmc_revokeRequest */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x12,     /* [2537] OBJ_id_cmc_regInfo */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x13,     /* [2545] OBJ_id_cmc_responseInfo */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x15,     /* [2553] OBJ_id_cmc_queryPending */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x16,     /* [2561] OBJ_id_cmc_popLinkRandom */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x17,     /* [2569] OBJ_id_cmc_popLinkWitness */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x18,     /* [2577] OBJ_id_cmc_confirmCertAcceptance */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x08,0x01,     /* [2585] OBJ_id_on_personalData */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x01,     /* [2593] OBJ_id_pda_dateOfBirth */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x02,     /* [2601] OBJ_id_pda_placeOfBirth */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x03,     /* [2609] OBJ_id_pda_gender */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x04,     /* [2617] OBJ_id_pda_countryOfCitizenship */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x05,     /* [2625] OBJ_id_pda_countryOfResidence */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x01,     /* [2633] OBJ_id_aca_authenticationInfo */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x02,     /* [2641] OBJ_id_aca_accessIdentity */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x03,     /* [2649] OBJ_id_aca_chargingIdentity */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x04,     /* [2657] OBJ_id_aca_group */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x05,     /* [2665] OBJ_id_aca_role */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x0B,0x01,     /* [2673] OBJ_id_qcs_pkixQCSyntax_v1 */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x01,     /* [2681] OBJ_id_cct_crs */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x02,     /* [2689] OBJ_id_cct_PKIData */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x03,     /* [2697] OBJ_id_cct_PKIResponse */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x03,     /* [2705] OBJ_ad_timeStamping */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x04,     /* [2713] OBJ_ad_dvcs */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x01,/* [2721] OBJ_id_pkix_OCSP_basic */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x02,/* [2730] OBJ_id_pkix_OCSP_Nonce */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x03,/* [2739] OBJ_id_pkix_OCSP_CrlID */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x04,/* [2748] OBJ_id_pkix_OCSP_acceptableResponses */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x05,/* [2757] OBJ_id_pkix_OCSP_noCheck */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x06,/* [2766] OBJ_id_pkix_OCSP_archiveCutoff */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x07,/* [2775] OBJ_id_pkix_OCSP_serviceLocator */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x08,/* [2784] OBJ_id_pkix_OCSP_extendedStatus */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x09,/* [2793] OBJ_id_pkix_OCSP_valid */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x0A,/* [2802] OBJ_id_pkix_OCSP_path */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x0B,/* [2811] OBJ_id_pkix_OCSP_trustRoot */
-0x2B,0x0E,0x03,0x02,                         /* [2820] OBJ_algorithm */
-0x2B,0x0E,0x03,0x02,0x0B,                    /* [2824] OBJ_rsaSignature */
-0x55,0x08,                                   /* [2829] OBJ_X500algorithms */
-0x2B,                                        /* [2831] OBJ_org */
-0x2B,0x06,                                   /* [2832] OBJ_dod */
-0x2B,0x06,0x01,                              /* [2834] OBJ_iana */
-0x2B,0x06,0x01,0x01,                         /* [2837] OBJ_Directory */
-0x2B,0x06,0x01,0x02,                         /* [2841] OBJ_Management */
-0x2B,0x06,0x01,0x03,                         /* [2845] OBJ_Experimental */
-0x2B,0x06,0x01,0x04,                         /* [2849] OBJ_Private */
-0x2B,0x06,0x01,0x05,                         /* [2853] OBJ_Security */
-0x2B,0x06,0x01,0x06,                         /* [2857] OBJ_SNMPv2 */
-0x2B,0x06,0x01,0x07,                         /* [2861] OBJ_Mail */
-0x2B,0x06,0x01,0x04,0x01,                    /* [2865] OBJ_Enterprises */
-0x2B,0x06,0x01,0x04,0x01,0x8B,0x3A,0x82,0x58,/* [2870] OBJ_dcObject */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x19,/* [2879] OBJ_domainComponent */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0D,/* [2889] OBJ_Domain */
-0x00,                                        /* [2899] OBJ_joint_iso_ccitt */
-0x55,0x01,0x05,                              /* [2900] OBJ_selected_attribute_types */
-0x55,0x01,0x05,0x37,                         /* [2903] OBJ_clearance */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x03,/* [2907] OBJ_md4WithRSAEncryption */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0A,     /* [2916] OBJ_ac_proxying */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0B,     /* [2924] OBJ_sinfo_access */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x06,     /* [2932] OBJ_id_aca_encAttrs */
-0x55,0x04,0x48,                              /* [2940] OBJ_role */
-0x55,0x1D,0x24,                              /* [2943] OBJ_policy_constraints */
-0x55,0x1D,0x37,                              /* [2946] OBJ_target_information */
-0x55,0x1D,0x38,                              /* [2949] OBJ_no_rev_avail */
-0x00,                                        /* [2952] OBJ_ccitt */
-0x2A,0x86,0x48,0xCE,0x3D,                    /* [2953] OBJ_ansi_X9_62 */
-0x2A,0x86,0x48,0xCE,0x3D,0x01,0x01,          /* [2958] OBJ_X9_62_prime_field */
-0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,          /* [2965] OBJ_X9_62_characteristic_two_field */
-0x2A,0x86,0x48,0xCE,0x3D,0x02,0x01,          /* [2972] OBJ_X9_62_id_ecPublicKey */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x01,     /* [2979] OBJ_X9_62_prime192v1 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x02,     /* [2987] OBJ_X9_62_prime192v2 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x03,     /* [2995] OBJ_X9_62_prime192v3 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x04,     /* [3003] OBJ_X9_62_prime239v1 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x05,     /* [3011] OBJ_X9_62_prime239v2 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x06,     /* [3019] OBJ_X9_62_prime239v3 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x07,     /* [3027] OBJ_X9_62_prime256v1 */
-0x2A,0x86,0x48,0xCE,0x3D,0x04,0x01,          /* [3035] OBJ_ecdsa_with_SHA1 */
-0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x11,0x01,/* [3042] OBJ_ms_csp_name */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x01,/* [3051] OBJ_aes_128_ecb */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x02,/* [3060] OBJ_aes_128_cbc */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x03,/* [3069] OBJ_aes_128_ofb128 */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x04,/* [3078] OBJ_aes_128_cfb128 */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x15,/* [3087] OBJ_aes_192_ecb */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x16,/* [3096] OBJ_aes_192_cbc */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x17,/* [3105] OBJ_aes_192_ofb128 */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x18,/* [3114] OBJ_aes_192_cfb128 */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x29,/* [3123] OBJ_aes_256_ecb */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2A,/* [3132] OBJ_aes_256_cbc */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2B,/* [3141] OBJ_aes_256_ofb128 */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2C,/* [3150] OBJ_aes_256_cfb128 */
-0x55,0x1D,0x17,                              /* [3159] OBJ_hold_instruction_code */
-0x2A,0x86,0x48,0xCE,0x38,0x02,0x01,          /* [3162] OBJ_hold_instruction_none */
-0x2A,0x86,0x48,0xCE,0x38,0x02,0x02,          /* [3169] OBJ_hold_instruction_call_issuer */
-0x2A,0x86,0x48,0xCE,0x38,0x02,0x03,          /* [3176] OBJ_hold_instruction_reject */
-0x09,                                        /* [3183] OBJ_data */
-0x09,0x92,0x26,                              /* [3184] OBJ_pss */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,          /* [3187] OBJ_ucl */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,     /* [3194] OBJ_pilot */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,/* [3202] OBJ_pilotAttributeType */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,/* [3211] OBJ_pilotAttributeSyntax */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,/* [3220] OBJ_pilotObjectClass */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x0A,/* [3229] OBJ_pilotGroups */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,0x04,/* [3238] OBJ_iA5StringSyntax */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,0x05,/* [3248] OBJ_caseIgnoreIA5StringSyntax */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x03,/* [3258] OBJ_pilotObject */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x04,/* [3268] OBJ_pilotPerson */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x05,/* [3278] OBJ_account */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x06,/* [3288] OBJ_document */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x07,/* [3298] OBJ_room */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x09,/* [3308] OBJ_documentSeries */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0E,/* [3318] OBJ_rFC822localPart */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0F,/* [3328] OBJ_dNSDomain */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x11,/* [3338] OBJ_domainRelatedObject */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x12,/* [3348] OBJ_friendlyCountry */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x13,/* [3358] OBJ_simpleSecurityObject */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x14,/* [3368] OBJ_pilotOrganization */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x15,/* [3378] OBJ_pilotDSA */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x16,/* [3388] OBJ_qualityLabelledData */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x01,/* [3398] OBJ_userId */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x02,/* [3408] OBJ_textEncodedORAddress */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x03,/* [3418] OBJ_rfc822Mailbox */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x04,/* [3428] OBJ_info */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x05,/* [3438] OBJ_favouriteDrink */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x06,/* [3448] OBJ_roomNumber */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x07,/* [3458] OBJ_photo */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x08,/* [3468] OBJ_userClass */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x09,/* [3478] OBJ_host */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0A,/* [3488] OBJ_manager */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0B,/* [3498] OBJ_documentIdentifier */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0C,/* [3508] OBJ_documentTitle */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0D,/* [3518] OBJ_documentVersion */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0E,/* [3528] OBJ_documentAuthor */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0F,/* [3538] OBJ_documentLocation */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x14,/* [3548] OBJ_homeTelephoneNumber */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x15,/* [3558] OBJ_secretary */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x16,/* [3568] OBJ_otherMailbox */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x17,/* [3578] OBJ_lastModifiedTime */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x18,/* [3588] OBJ_lastModifiedBy */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1A,/* [3598] OBJ_aRecord */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1B,/* [3608] OBJ_pilotAttributeType27 */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1C,/* [3618] OBJ_mXRecord */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1D,/* [3628] OBJ_nSRecord */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1E,/* [3638] OBJ_sOARecord */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1F,/* [3648] OBJ_cNAMERecord */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x25,/* [3658] OBJ_associatedDomain */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x26,/* [3668] OBJ_associatedName */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x27,/* [3678] OBJ_homePostalAddress */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x28,/* [3688] OBJ_personalTitle */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x29,/* [3698] OBJ_mobileTelephoneNumber */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2A,/* [3708] OBJ_pagerTelephoneNumber */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2B,/* [3718] OBJ_friendlyCountryName */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2D,/* [3728] OBJ_organizationalStatus */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2E,/* [3738] OBJ_janetMailbox */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2F,/* [3748] OBJ_mailPreferenceOption */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x30,/* [3758] OBJ_buildingName */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x31,/* [3768] OBJ_dSAQuality */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x32,/* [3778] OBJ_singleLevelQuality */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x33,/* [3788] OBJ_subtreeMinimumQuality */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x34,/* [3798] OBJ_subtreeMaximumQuality */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x35,/* [3808] OBJ_personalSignature */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x36,/* [3818] OBJ_dITRedirect */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x37,/* [3828] OBJ_audio */
-0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x38,/* [3838] OBJ_documentPublisher */
-0x55,0x04,0x2D,                              /* [3848] OBJ_x500UniqueIdentifier */
-0x2B,0x06,0x01,0x07,0x01,                    /* [3851] OBJ_mime_mhs */
-0x2B,0x06,0x01,0x07,0x01,0x01,               /* [3856] OBJ_mime_mhs_headings */
-0x2B,0x06,0x01,0x07,0x01,0x02,               /* [3862] OBJ_mime_mhs_bodies */
-0x2B,0x06,0x01,0x07,0x01,0x01,0x01,          /* [3868] OBJ_id_hex_partial_message */
-0x2B,0x06,0x01,0x07,0x01,0x01,0x02,          /* [3875] OBJ_id_hex_multipart_message */
-0x55,0x04,0x2C,                              /* [3882] OBJ_generationQualifier */
-0x55,0x04,0x41,                              /* [3885] OBJ_pseudonym */
-0x67,0x2A,                                   /* [3888] OBJ_id_set */
-0x67,0x2A,0x00,                              /* [3890] OBJ_set_ctype */
-0x67,0x2A,0x01,                              /* [3893] OBJ_set_msgExt */
-0x67,0x2A,0x03,                              /* [3896] OBJ_set_attr */
-0x67,0x2A,0x05,                              /* [3899] OBJ_set_policy */
-0x67,0x2A,0x07,                              /* [3902] OBJ_set_certExt */
-0x67,0x2A,0x08,                              /* [3905] OBJ_set_brand */
-0x67,0x2A,0x00,0x00,                         /* [3908] OBJ_setct_PANData */
-0x67,0x2A,0x00,0x01,                         /* [3912] OBJ_setct_PANToken */
-0x67,0x2A,0x00,0x02,                         /* [3916] OBJ_setct_PANOnly */
-0x67,0x2A,0x00,0x03,                         /* [3920] OBJ_setct_OIData */
-0x67,0x2A,0x00,0x04,                         /* [3924] OBJ_setct_PI */
-0x67,0x2A,0x00,0x05,                         /* [3928] OBJ_setct_PIData */
-0x67,0x2A,0x00,0x06,                         /* [3932] OBJ_setct_PIDataUnsigned */
-0x67,0x2A,0x00,0x07,                         /* [3936] OBJ_setct_HODInput */
-0x67,0x2A,0x00,0x08,                         /* [3940] OBJ_setct_AuthResBaggage */
-0x67,0x2A,0x00,0x09,                         /* [3944] OBJ_setct_AuthRevReqBaggage */
-0x67,0x2A,0x00,0x0A,                         /* [3948] OBJ_setct_AuthRevResBaggage */
-0x67,0x2A,0x00,0x0B,                         /* [3952] OBJ_setct_CapTokenSeq */
-0x67,0x2A,0x00,0x0C,                         /* [3956] OBJ_setct_PInitResData */
-0x67,0x2A,0x00,0x0D,                         /* [3960] OBJ_setct_PI_TBS */
-0x67,0x2A,0x00,0x0E,                         /* [3964] OBJ_setct_PResData */
-0x67,0x2A,0x00,0x10,                         /* [3968] OBJ_setct_AuthReqTBS */
-0x67,0x2A,0x00,0x11,                         /* [3972] OBJ_setct_AuthResTBS */
-0x67,0x2A,0x00,0x12,                         /* [3976] OBJ_setct_AuthResTBSX */
-0x67,0x2A,0x00,0x13,                         /* [3980] OBJ_setct_AuthTokenTBS */
-0x67,0x2A,0x00,0x14,                         /* [3984] OBJ_setct_CapTokenData */
-0x67,0x2A,0x00,0x15,                         /* [3988] OBJ_setct_CapTokenTBS */
-0x67,0x2A,0x00,0x16,                         /* [3992] OBJ_setct_AcqCardCodeMsg */
-0x67,0x2A,0x00,0x17,                         /* [3996] OBJ_setct_AuthRevReqTBS */
-0x67,0x2A,0x00,0x18,                         /* [4000] OBJ_setct_AuthRevResData */
-0x67,0x2A,0x00,0x19,                         /* [4004] OBJ_setct_AuthRevResTBS */
-0x67,0x2A,0x00,0x1A,                         /* [4008] OBJ_setct_CapReqTBS */
-0x67,0x2A,0x00,0x1B,                         /* [4012] OBJ_setct_CapReqTBSX */
-0x67,0x2A,0x00,0x1C,                         /* [4016] OBJ_setct_CapResData */
-0x67,0x2A,0x00,0x1D,                         /* [4020] OBJ_setct_CapRevReqTBS */
-0x67,0x2A,0x00,0x1E,                         /* [4024] OBJ_setct_CapRevReqTBSX */
-0x67,0x2A,0x00,0x1F,                         /* [4028] OBJ_setct_CapRevResData */
-0x67,0x2A,0x00,0x20,                         /* [4032] OBJ_setct_CredReqTBS */
-0x67,0x2A,0x00,0x21,                         /* [4036] OBJ_setct_CredReqTBSX */
-0x67,0x2A,0x00,0x22,                         /* [4040] OBJ_setct_CredResData */
-0x67,0x2A,0x00,0x23,                         /* [4044] OBJ_setct_CredRevReqTBS */
-0x67,0x2A,0x00,0x24,                         /* [4048] OBJ_setct_CredRevReqTBSX */
-0x67,0x2A,0x00,0x25,                         /* [4052] OBJ_setct_CredRevResData */
-0x67,0x2A,0x00,0x26,                         /* [4056] OBJ_setct_PCertReqData */
-0x67,0x2A,0x00,0x27,                         /* [4060] OBJ_setct_PCertResTBS */
-0x67,0x2A,0x00,0x28,                         /* [4064] OBJ_setct_BatchAdminReqData */
-0x67,0x2A,0x00,0x29,                         /* [4068] OBJ_setct_BatchAdminResData */
-0x67,0x2A,0x00,0x2A,                         /* [4072] OBJ_setct_CardCInitResTBS */
-0x67,0x2A,0x00,0x2B,                         /* [4076] OBJ_setct_MeAqCInitResTBS */
-0x67,0x2A,0x00,0x2C,                         /* [4080] OBJ_setct_RegFormResTBS */
-0x67,0x2A,0x00,0x2D,                         /* [4084] OBJ_setct_CertReqData */
-0x67,0x2A,0x00,0x2E,                         /* [4088] OBJ_setct_CertReqTBS */
-0x67,0x2A,0x00,0x2F,                         /* [4092] OBJ_setct_CertResData */
-0x67,0x2A,0x00,0x30,                         /* [4096] OBJ_setct_CertInqReqTBS */
-0x67,0x2A,0x00,0x31,                         /* [4100] OBJ_setct_ErrorTBS */
-0x67,0x2A,0x00,0x32,                         /* [4104] OBJ_setct_PIDualSignedTBE */
-0x67,0x2A,0x00,0x33,                         /* [4108] OBJ_setct_PIUnsignedTBE */
-0x67,0x2A,0x00,0x34,                         /* [4112] OBJ_setct_AuthReqTBE */
-0x67,0x2A,0x00,0x35,                         /* [4116] OBJ_setct_AuthResTBE */
-0x67,0x2A,0x00,0x36,                         /* [4120] OBJ_setct_AuthResTBEX */
-0x67,0x2A,0x00,0x37,                         /* [4124] OBJ_setct_AuthTokenTBE */
-0x67,0x2A,0x00,0x38,                         /* [4128] OBJ_setct_CapTokenTBE */
-0x67,0x2A,0x00,0x39,                         /* [4132] OBJ_setct_CapTokenTBEX */
-0x67,0x2A,0x00,0x3A,                         /* [4136] OBJ_setct_AcqCardCodeMsgTBE */
-0x67,0x2A,0x00,0x3B,                         /* [4140] OBJ_setct_AuthRevReqTBE */
-0x67,0x2A,0x00,0x3C,                         /* [4144] OBJ_setct_AuthRevResTBE */
-0x67,0x2A,0x00,0x3D,                         /* [4148] OBJ_setct_AuthRevResTBEB */
-0x67,0x2A,0x00,0x3E,                         /* [4152] OBJ_setct_CapReqTBE */
-0x67,0x2A,0x00,0x3F,                         /* [4156] OBJ_setct_CapReqTBEX */
-0x67,0x2A,0x00,0x40,                         /* [4160] OBJ_setct_CapResTBE */
-0x67,0x2A,0x00,0x41,                         /* [4164] OBJ_setct_CapRevReqTBE */
-0x67,0x2A,0x00,0x42,                         /* [4168] OBJ_setct_CapRevReqTBEX */
-0x67,0x2A,0x00,0x43,                         /* [4172] OBJ_setct_CapRevResTBE */
-0x67,0x2A,0x00,0x44,                         /* [4176] OBJ_setct_CredReqTBE */
-0x67,0x2A,0x00,0x45,                         /* [4180] OBJ_setct_CredReqTBEX */
-0x67,0x2A,0x00,0x46,                         /* [4184] OBJ_setct_CredResTBE */
-0x67,0x2A,0x00,0x47,                         /* [4188] OBJ_setct_CredRevReqTBE */
-0x67,0x2A,0x00,0x48,                         /* [4192] OBJ_setct_CredRevReqTBEX */
-0x67,0x2A,0x00,0x49,                         /* [4196] OBJ_setct_CredRevResTBE */
-0x67,0x2A,0x00,0x4A,                         /* [4200] OBJ_setct_BatchAdminReqTBE */
-0x67,0x2A,0x00,0x4B,                         /* [4204] OBJ_setct_BatchAdminResTBE */
-0x67,0x2A,0x00,0x4C,                         /* [4208] OBJ_setct_RegFormReqTBE */
-0x67,0x2A,0x00,0x4D,                         /* [4212] OBJ_setct_CertReqTBE */
-0x67,0x2A,0x00,0x4E,                         /* [4216] OBJ_setct_CertReqTBEX */
-0x67,0x2A,0x00,0x4F,                         /* [4220] OBJ_setct_CertResTBE */
-0x67,0x2A,0x00,0x50,                         /* [4224] OBJ_setct_CRLNotificationTBS */
-0x67,0x2A,0x00,0x51,                         /* [4228] OBJ_setct_CRLNotificationResTBS */
-0x67,0x2A,0x00,0x52,                         /* [4232] OBJ_setct_BCIDistributionTBS */
-0x67,0x2A,0x01,0x01,                         /* [4236] OBJ_setext_genCrypt */
-0x67,0x2A,0x01,0x03,                         /* [4240] OBJ_setext_miAuth */
-0x67,0x2A,0x01,0x04,                         /* [4244] OBJ_setext_pinSecure */
-0x67,0x2A,0x01,0x05,                         /* [4248] OBJ_setext_pinAny */
-0x67,0x2A,0x01,0x07,                         /* [4252] OBJ_setext_track2 */
-0x67,0x2A,0x01,0x08,                         /* [4256] OBJ_setext_cv */
-0x67,0x2A,0x05,0x00,                         /* [4260] OBJ_set_policy_root */
-0x67,0x2A,0x07,0x00,                         /* [4264] OBJ_setCext_hashedRoot */
-0x67,0x2A,0x07,0x01,                         /* [4268] OBJ_setCext_certType */
-0x67,0x2A,0x07,0x02,                         /* [4272] OBJ_setCext_merchData */
-0x67,0x2A,0x07,0x03,                         /* [4276] OBJ_setCext_cCertRequired */
-0x67,0x2A,0x07,0x04,                         /* [4280] OBJ_setCext_tunneling */
-0x67,0x2A,0x07,0x05,                         /* [4284] OBJ_setCext_setExt */
-0x67,0x2A,0x07,0x06,                         /* [4288] OBJ_setCext_setQualf */
-0x67,0x2A,0x07,0x07,                         /* [4292] OBJ_setCext_PGWYcapabilities */
-0x67,0x2A,0x07,0x08,                         /* [4296] OBJ_setCext_TokenIdentifier */
-0x67,0x2A,0x07,0x09,                         /* [4300] OBJ_setCext_Track2Data */
-0x67,0x2A,0x07,0x0A,                         /* [4304] OBJ_setCext_TokenType */
-0x67,0x2A,0x07,0x0B,                         /* [4308] OBJ_setCext_IssuerCapabilities */
-0x67,0x2A,0x03,0x00,                         /* [4312] OBJ_setAttr_Cert */
-0x67,0x2A,0x03,0x01,                         /* [4316] OBJ_setAttr_PGWYcap */
-0x67,0x2A,0x03,0x02,                         /* [4320] OBJ_setAttr_TokenType */
-0x67,0x2A,0x03,0x03,                         /* [4324] OBJ_setAttr_IssCap */
-0x67,0x2A,0x03,0x00,0x00,                    /* [4328] OBJ_set_rootKeyThumb */
-0x67,0x2A,0x03,0x00,0x01,                    /* [4333] OBJ_set_addPolicy */
-0x67,0x2A,0x03,0x02,0x01,                    /* [4338] OBJ_setAttr_Token_EMV */
-0x67,0x2A,0x03,0x02,0x02,                    /* [4343] OBJ_setAttr_Token_B0Prime */
-0x67,0x2A,0x03,0x03,0x03,                    /* [4348] OBJ_setAttr_IssCap_CVM */
-0x67,0x2A,0x03,0x03,0x04,                    /* [4353] OBJ_setAttr_IssCap_T2 */
-0x67,0x2A,0x03,0x03,0x05,                    /* [4358] OBJ_setAttr_IssCap_Sig */
-0x67,0x2A,0x03,0x03,0x03,0x01,               /* [4363] OBJ_setAttr_GenCryptgrm */
-0x67,0x2A,0x03,0x03,0x04,0x01,               /* [4369] OBJ_setAttr_T2Enc */
-0x67,0x2A,0x03,0x03,0x04,0x02,               /* [4375] OBJ_setAttr_T2cleartxt */
-0x67,0x2A,0x03,0x03,0x05,0x01,               /* [4381] OBJ_setAttr_TokICCsig */
-0x67,0x2A,0x03,0x03,0x05,0x02,               /* [4387] OBJ_setAttr_SecDevSig */
-0x67,0x2A,0x08,0x01,                         /* [4393] OBJ_set_brand_IATA_ATA */
-0x67,0x2A,0x08,0x1E,                         /* [4397] OBJ_set_brand_Diners */
-0x67,0x2A,0x08,0x22,                         /* [4401] OBJ_set_brand_AmericanExpress */
-0x67,0x2A,0x08,0x23,                         /* [4405] OBJ_set_brand_JCB */
-0x67,0x2A,0x08,0x04,                         /* [4409] OBJ_set_brand_Visa */
-0x67,0x2A,0x08,0x05,                         /* [4413] OBJ_set_brand_MasterCard */
-0x67,0x2A,0x08,0xAE,0x7B,                    /* [4417] OBJ_set_brand_Novus */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x0A,     /* [4422] OBJ_des_cdmf */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x06,/* [4430] OBJ_rsaOAEPEncryptionSET */
-0x00,                                        /* [4439] OBJ_itu_t */
-0x50,                                        /* [4440] OBJ_joint_iso_itu_t */
-0x67,                                        /* [4441] OBJ_international_organizations */
-0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x02,/* [4442] OBJ_ms_smartcard_login */
-0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x03,/* [4452] OBJ_ms_upn */
-0x55,0x04,0x09,                              /* [4462] OBJ_streetAddress */
-0x55,0x04,0x11,                              /* [4465] OBJ_postalCode */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x15,          /* [4468] OBJ_id_ppl */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0E,     /* [4475] OBJ_proxyCertInfo */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x00,     /* [4483] OBJ_id_ppl_anyLanguage */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x01,     /* [4491] OBJ_id_ppl_inheritAll */
-0x55,0x1D,0x1E,                              /* [4499] OBJ_name_constraints */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x02,     /* [4502] OBJ_Independent */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,/* [4510] OBJ_sha256WithRSAEncryption */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0C,/* [4519] OBJ_sha384WithRSAEncryption */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0D,/* [4528] OBJ_sha512WithRSAEncryption */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0E,/* [4537] OBJ_sha224WithRSAEncryption */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x01,/* [4546] OBJ_sha256 */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x02,/* [4555] OBJ_sha384 */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x03,/* [4564] OBJ_sha512 */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x04,/* [4573] OBJ_sha224 */
-0x2B,                                        /* [4582] OBJ_identified_organization */
-0x2B,0x81,0x04,                              /* [4583] OBJ_certicom_arc */
-0x67,0x2B,                                   /* [4586] OBJ_wap */
-0x67,0x2B,0x01,                              /* [4588] OBJ_wap_wsg */
-0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,     /* [4591] OBJ_X9_62_id_characteristic_two_basis */
-0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x01,/* [4599] OBJ_X9_62_onBasis */
-0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x02,/* [4608] OBJ_X9_62_tpBasis */
-0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x03,/* [4617] OBJ_X9_62_ppBasis */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x01,     /* [4626] OBJ_X9_62_c2pnb163v1 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x02,     /* [4634] OBJ_X9_62_c2pnb163v2 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x03,     /* [4642] OBJ_X9_62_c2pnb163v3 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x04,     /* [4650] OBJ_X9_62_c2pnb176v1 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x05,     /* [4658] OBJ_X9_62_c2tnb191v1 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x06,     /* [4666] OBJ_X9_62_c2tnb191v2 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x07,     /* [4674] OBJ_X9_62_c2tnb191v3 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x08,     /* [4682] OBJ_X9_62_c2onb191v4 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x09,     /* [4690] OBJ_X9_62_c2onb191v5 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0A,     /* [4698] OBJ_X9_62_c2pnb208w1 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0B,     /* [4706] OBJ_X9_62_c2tnb239v1 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0C,     /* [4714] OBJ_X9_62_c2tnb239v2 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0D,     /* [4722] OBJ_X9_62_c2tnb239v3 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0E,     /* [4730] OBJ_X9_62_c2onb239v4 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0F,     /* [4738] OBJ_X9_62_c2onb239v5 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x10,     /* [4746] OBJ_X9_62_c2pnb272w1 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x11,     /* [4754] OBJ_X9_62_c2pnb304w1 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x12,     /* [4762] OBJ_X9_62_c2tnb359v1 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x13,     /* [4770] OBJ_X9_62_c2pnb368w1 */
-0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x14,     /* [4778] OBJ_X9_62_c2tnb431r1 */
-0x2B,0x81,0x04,0x00,0x06,                    /* [4786] OBJ_secp112r1 */
-0x2B,0x81,0x04,0x00,0x07,                    /* [4791] OBJ_secp112r2 */
-0x2B,0x81,0x04,0x00,0x1C,                    /* [4796] OBJ_secp128r1 */
-0x2B,0x81,0x04,0x00,0x1D,                    /* [4801] OBJ_secp128r2 */
-0x2B,0x81,0x04,0x00,0x09,                    /* [4806] OBJ_secp160k1 */
-0x2B,0x81,0x04,0x00,0x08,                    /* [4811] OBJ_secp160r1 */
-0x2B,0x81,0x04,0x00,0x1E,                    /* [4816] OBJ_secp160r2 */
-0x2B,0x81,0x04,0x00,0x1F,                    /* [4821] OBJ_secp192k1 */
-0x2B,0x81,0x04,0x00,0x20,                    /* [4826] OBJ_secp224k1 */
-0x2B,0x81,0x04,0x00,0x21,                    /* [4831] OBJ_secp224r1 */
-0x2B,0x81,0x04,0x00,0x0A,                    /* [4836] OBJ_secp256k1 */
-0x2B,0x81,0x04,0x00,0x22,                    /* [4841] OBJ_secp384r1 */
-0x2B,0x81,0x04,0x00,0x23,                    /* [4846] OBJ_secp521r1 */
-0x2B,0x81,0x04,0x00,0x04,                    /* [4851] OBJ_sect113r1 */
-0x2B,0x81,0x04,0x00,0x05,                    /* [4856] OBJ_sect113r2 */
-0x2B,0x81,0x04,0x00,0x16,                    /* [4861] OBJ_sect131r1 */
-0x2B,0x81,0x04,0x00,0x17,                    /* [4866] OBJ_sect131r2 */
-0x2B,0x81,0x04,0x00,0x01,                    /* [4871] OBJ_sect163k1 */
-0x2B,0x81,0x04,0x00,0x02,                    /* [4876] OBJ_sect163r1 */
-0x2B,0x81,0x04,0x00,0x0F,                    /* [4881] OBJ_sect163r2 */
-0x2B,0x81,0x04,0x00,0x18,                    /* [4886] OBJ_sect193r1 */
-0x2B,0x81,0x04,0x00,0x19,                    /* [4891] OBJ_sect193r2 */
-0x2B,0x81,0x04,0x00,0x1A,                    /* [4896] OBJ_sect233k1 */
-0x2B,0x81,0x04,0x00,0x1B,                    /* [4901] OBJ_sect233r1 */
-0x2B,0x81,0x04,0x00,0x03,                    /* [4906] OBJ_sect239k1 */
-0x2B,0x81,0x04,0x00,0x10,                    /* [4911] OBJ_sect283k1 */
-0x2B,0x81,0x04,0x00,0x11,                    /* [4916] OBJ_sect283r1 */
-0x2B,0x81,0x04,0x00,0x24,                    /* [4921] OBJ_sect409k1 */
-0x2B,0x81,0x04,0x00,0x25,                    /* [4926] OBJ_sect409r1 */
-0x2B,0x81,0x04,0x00,0x26,                    /* [4931] OBJ_sect571k1 */
-0x2B,0x81,0x04,0x00,0x27,                    /* [4936] OBJ_sect571r1 */
-0x67,0x2B,0x01,0x04,0x01,                    /* [4941] OBJ_wap_wsg_idm_ecid_wtls1 */
-0x67,0x2B,0x01,0x04,0x03,                    /* [4946] OBJ_wap_wsg_idm_ecid_wtls3 */
-0x67,0x2B,0x01,0x04,0x04,                    /* [4951] OBJ_wap_wsg_idm_ecid_wtls4 */
-0x67,0x2B,0x01,0x04,0x05,                    /* [4956] OBJ_wap_wsg_idm_ecid_wtls5 */
-0x67,0x2B,0x01,0x04,0x06,                    /* [4961] OBJ_wap_wsg_idm_ecid_wtls6 */
-0x67,0x2B,0x01,0x04,0x07,                    /* [4966] OBJ_wap_wsg_idm_ecid_wtls7 */
-0x67,0x2B,0x01,0x04,0x08,                    /* [4971] OBJ_wap_wsg_idm_ecid_wtls8 */
-0x67,0x2B,0x01,0x04,0x09,                    /* [4976] OBJ_wap_wsg_idm_ecid_wtls9 */
-0x67,0x2B,0x01,0x04,0x0A,                    /* [4981] OBJ_wap_wsg_idm_ecid_wtls10 */
-0x67,0x2B,0x01,0x04,0x0B,                    /* [4986] OBJ_wap_wsg_idm_ecid_wtls11 */
-0x67,0x2B,0x01,0x04,0x0C,                    /* [4991] OBJ_wap_wsg_idm_ecid_wtls12 */
-0x55,0x1D,0x20,0x00,                         /* [4996] OBJ_any_policy */
-0x55,0x1D,0x21,                              /* [5000] OBJ_policy_mappings */
-0x55,0x1D,0x36,                              /* [5003] OBJ_inhibit_any_policy */
-0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x01,0x02,/* [5006] OBJ_camellia_128_cbc */
-0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x01,0x03,/* [5017] OBJ_camellia_192_cbc */
-0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x01,0x04,/* [5028] OBJ_camellia_256_cbc */
-0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x01,     /* [5039] OBJ_camellia_128_ecb */
-0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x15,     /* [5047] OBJ_camellia_192_ecb */
-0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x29,     /* [5055] OBJ_camellia_256_ecb */
-0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x04,     /* [5063] OBJ_camellia_128_cfb128 */
-0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x18,     /* [5071] OBJ_camellia_192_cfb128 */
-0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x2C,     /* [5079] OBJ_camellia_256_cfb128 */
-0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x03,     /* [5087] OBJ_camellia_128_ofb128 */
-0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x17,     /* [5095] OBJ_camellia_192_ofb128 */
-0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x2B,     /* [5103] OBJ_camellia_256_ofb128 */
-0x55,0x1D,0x09,                              /* [5111] OBJ_subject_directory_attributes */
-0x55,0x1D,0x1C,                              /* [5114] OBJ_issuing_distribution_point */
-0x55,0x1D,0x1D,                              /* [5117] OBJ_certificate_issuer */
-0x2A,0x83,0x1A,0x8C,0x9A,0x44,               /* [5120] OBJ_kisa */
-0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x03,     /* [5126] OBJ_seed_ecb */
-0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x04,     /* [5134] OBJ_seed_cbc */
-0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x06,     /* [5142] OBJ_seed_ofb128 */
-0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x05,     /* [5150] OBJ_seed_cfb128 */
-0x2B,0x06,0x01,0x05,0x05,0x08,0x01,0x01,     /* [5158] OBJ_hmac_md5 */
-0x2B,0x06,0x01,0x05,0x05,0x08,0x01,0x02,     /* [5166] OBJ_hmac_sha1 */
-0x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x0D,/* [5174] OBJ_id_PasswordBasedMAC */
-0x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x1E,/* [5183] OBJ_id_DHBasedMac */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x10,     /* [5192] OBJ_id_it_suppLangTags */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x05,     /* [5200] OBJ_caRepository */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x09,/* [5208] OBJ_id_smime_ct_compressedData */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x1B,/* [5219] OBJ_id_ct_asciiTextWithCRLF */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x05,/* [5230] OBJ_id_aes128_wrap */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x19,/* [5239] OBJ_id_aes192_wrap */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2D,/* [5248] OBJ_id_aes256_wrap */
-0x2A,0x86,0x48,0xCE,0x3D,0x04,0x02,          /* [5257] OBJ_ecdsa_with_Recommended */
-0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,          /* [5264] OBJ_ecdsa_with_Specified */
-0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x01,     /* [5271] OBJ_ecdsa_with_SHA224 */
-0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x02,     /* [5279] OBJ_ecdsa_with_SHA256 */
-0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x03,     /* [5287] OBJ_ecdsa_with_SHA384 */
-0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x04,     /* [5295] OBJ_ecdsa_with_SHA512 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x06,     /* [5303] OBJ_hmacWithMD5 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x08,     /* [5311] OBJ_hmacWithSHA224 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x09,     /* [5319] OBJ_hmacWithSHA256 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x0A,     /* [5327] OBJ_hmacWithSHA384 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x0B,     /* [5335] OBJ_hmacWithSHA512 */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x01,/* [5343] OBJ_dsa_with_SHA224 */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x02,/* [5352] OBJ_dsa_with_SHA256 */
-0x28,0xCF,0x06,0x03,0x00,0x37,               /* [5361] OBJ_whirlpool */
-0x2A,0x85,0x03,0x02,0x02,                    /* [5367] OBJ_cryptopro */
-0x2A,0x85,0x03,0x02,0x09,                    /* [5372] OBJ_cryptocom */
-0x2A,0x85,0x03,0x02,0x02,0x03,               /* [5377] OBJ_id_GostR3411_94_with_GostR3410_2001 */
-0x2A,0x85,0x03,0x02,0x02,0x04,               /* [5383] OBJ_id_GostR3411_94_with_GostR3410_94 */
-0x2A,0x85,0x03,0x02,0x02,0x09,               /* [5389] OBJ_id_GostR3411_94 */
-0x2A,0x85,0x03,0x02,0x02,0x0A,               /* [5395] OBJ_id_HMACGostR3411_94 */
-0x2A,0x85,0x03,0x02,0x02,0x13,               /* [5401] OBJ_id_GostR3410_2001 */
-0x2A,0x85,0x03,0x02,0x02,0x14,               /* [5407] OBJ_id_GostR3410_94 */
-0x2A,0x85,0x03,0x02,0x02,0x15,               /* [5413] OBJ_id_Gost28147_89 */
-0x2A,0x85,0x03,0x02,0x02,0x16,               /* [5419] OBJ_id_Gost28147_89_MAC */
-0x2A,0x85,0x03,0x02,0x02,0x17,               /* [5425] OBJ_id_GostR3411_94_prf */
-0x2A,0x85,0x03,0x02,0x02,0x62,               /* [5431] OBJ_id_GostR3410_2001DH */
-0x2A,0x85,0x03,0x02,0x02,0x63,               /* [5437] OBJ_id_GostR3410_94DH */
-0x2A,0x85,0x03,0x02,0x02,0x0E,0x01,          /* [5443] OBJ_id_Gost28147_89_CryptoPro_KeyMeshing */
-0x2A,0x85,0x03,0x02,0x02,0x0E,0x00,          /* [5450] OBJ_id_Gost28147_89_None_KeyMeshing */
-0x2A,0x85,0x03,0x02,0x02,0x1E,0x00,          /* [5457] OBJ_id_GostR3411_94_TestParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x1E,0x01,          /* [5464] OBJ_id_GostR3411_94_CryptoProParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x1F,0x00,          /* [5471] OBJ_id_Gost28147_89_TestParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x1F,0x01,          /* [5478] OBJ_id_Gost28147_89_CryptoPro_A_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x1F,0x02,          /* [5485] OBJ_id_Gost28147_89_CryptoPro_B_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x1F,0x03,          /* [5492] OBJ_id_Gost28147_89_CryptoPro_C_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x1F,0x04,          /* [5499] OBJ_id_Gost28147_89_CryptoPro_D_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x1F,0x05,          /* [5506] OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x1F,0x06,          /* [5513] OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x1F,0x07,          /* [5520] OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x20,0x00,          /* [5527] OBJ_id_GostR3410_94_TestParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x20,0x02,          /* [5534] OBJ_id_GostR3410_94_CryptoPro_A_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x20,0x03,          /* [5541] OBJ_id_GostR3410_94_CryptoPro_B_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x20,0x04,          /* [5548] OBJ_id_GostR3410_94_CryptoPro_C_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x20,0x05,          /* [5555] OBJ_id_GostR3410_94_CryptoPro_D_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x21,0x01,          /* [5562] OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x21,0x02,          /* [5569] OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x21,0x03,          /* [5576] OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x23,0x00,          /* [5583] OBJ_id_GostR3410_2001_TestParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x23,0x01,          /* [5590] OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x23,0x02,          /* [5597] OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x23,0x03,          /* [5604] OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x24,0x00,          /* [5611] OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x24,0x01,          /* [5618] OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet */
-0x2A,0x85,0x03,0x02,0x02,0x14,0x01,          /* [5625] OBJ_id_GostR3410_94_a */
-0x2A,0x85,0x03,0x02,0x02,0x14,0x02,          /* [5632] OBJ_id_GostR3410_94_aBis */
-0x2A,0x85,0x03,0x02,0x02,0x14,0x03,          /* [5639] OBJ_id_GostR3410_94_b */
-0x2A,0x85,0x03,0x02,0x02,0x14,0x04,          /* [5646] OBJ_id_GostR3410_94_bBis */
-0x2A,0x85,0x03,0x02,0x09,0x01,0x06,0x01,     /* [5653] OBJ_id_Gost28147_89_cc */
-0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x03,     /* [5661] OBJ_id_GostR3410_94_cc */
-0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x04,     /* [5669] OBJ_id_GostR3410_2001_cc */
-0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x03,     /* [5677] OBJ_id_GostR3411_94_with_GostR3410_94_cc */
-0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x04,     /* [5685] OBJ_id_GostR3411_94_with_GostR3410_2001_cc */
-0x2A,0x85,0x03,0x02,0x09,0x01,0x08,0x01,     /* [5693] OBJ_id_GostR3410_2001_ParamSet_cc */
-0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x11,0x02,/* [5701] OBJ_LocalKeySet */
-0x55,0x1D,0x2E,                              /* [5710] OBJ_freshest_crl */
-0x2B,0x06,0x01,0x05,0x05,0x07,0x08,0x03,     /* [5713] OBJ_id_on_permanentIdentifier */
-0x55,0x04,0x0E,                              /* [5721] OBJ_searchGuide */
-0x55,0x04,0x0F,                              /* [5724] OBJ_businessCategory */
-0x55,0x04,0x10,                              /* [5727] OBJ_postalAddress */
-0x55,0x04,0x12,                              /* [5730] OBJ_postOfficeBox */
-0x55,0x04,0x13,                              /* [5733] OBJ_physicalDeliveryOfficeName */
-0x55,0x04,0x14,                              /* [5736] OBJ_telephoneNumber */
-0x55,0x04,0x15,                              /* [5739] OBJ_telexNumber */
-0x55,0x04,0x16,                              /* [5742] OBJ_teletexTerminalIdentifier */
-0x55,0x04,0x17,                              /* [5745] OBJ_facsimileTelephoneNumber */
-0x55,0x04,0x18,                              /* [5748] OBJ_x121Address */
-0x55,0x04,0x19,                              /* [5751] OBJ_internationaliSDNNumber */
-0x55,0x04,0x1A,                              /* [5754] OBJ_registeredAddress */
-0x55,0x04,0x1B,                              /* [5757] OBJ_destinationIndicator */
-0x55,0x04,0x1C,                              /* [5760] OBJ_preferredDeliveryMethod */
-0x55,0x04,0x1D,                              /* [5763] OBJ_presentationAddress */
-0x55,0x04,0x1E,                              /* [5766] OBJ_supportedApplicationContext */
-0x55,0x04,0x1F,                              /* [5769] OBJ_member */
-0x55,0x04,0x20,                              /* [5772] OBJ_owner */
-0x55,0x04,0x21,                              /* [5775] OBJ_roleOccupant */
-0x55,0x04,0x22,                              /* [5778] OBJ_seeAlso */
-0x55,0x04,0x23,                              /* [5781] OBJ_userPassword */
-0x55,0x04,0x24,                              /* [5784] OBJ_userCertificate */
-0x55,0x04,0x25,                              /* [5787] OBJ_cACertificate */
-0x55,0x04,0x26,                              /* [5790] OBJ_authorityRevocationList */
-0x55,0x04,0x27,                              /* [5793] OBJ_certificateRevocationList */
-0x55,0x04,0x28,                              /* [5796] OBJ_crossCertificatePair */
-0x55,0x04,0x2F,                              /* [5799] OBJ_enhancedSearchGuide */
-0x55,0x04,0x30,                              /* [5802] OBJ_protocolInformation */
-0x55,0x04,0x31,                              /* [5805] OBJ_distinguishedName */
-0x55,0x04,0x32,                              /* [5808] OBJ_uniqueMember */
-0x55,0x04,0x33,                              /* [5811] OBJ_houseIdentifier */
-0x55,0x04,0x34,                              /* [5814] OBJ_supportedAlgorithms */
-0x55,0x04,0x35,                              /* [5817] OBJ_deltaRevocationList */
-0x55,0x04,0x36,                              /* [5820] OBJ_dmdName */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x09,/* [5823] OBJ_id_alg_PWRI_KEK */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x06,/* [5834] OBJ_aes_128_gcm */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x07,/* [5843] OBJ_aes_128_ccm */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x08,/* [5852] OBJ_id_aes128_wrap_pad */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1A,/* [5861] OBJ_aes_192_gcm */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1B,/* [5870] OBJ_aes_192_ccm */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1C,/* [5879] OBJ_id_aes192_wrap_pad */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2E,/* [5888] OBJ_aes_256_gcm */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2F,/* [5897] OBJ_aes_256_ccm */
-0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x30,/* [5906] OBJ_id_aes256_wrap_pad */
-0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x02,/* [5915] OBJ_id_camellia128_wrap */
-0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x03,/* [5926] OBJ_id_camellia192_wrap */
-0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x04,/* [5937] OBJ_id_camellia256_wrap */
-0x55,0x1D,0x25,0x00,                         /* [5948] OBJ_anyExtendedKeyUsage */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x08,/* [5952] OBJ_mgf1 */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0A,/* [5961] OBJ_rsassaPss */
-0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x07,/* [5970] OBJ_rsaesOaep */
+static const unsigned char lvalues[5974]={
+0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  0] OBJ_rsadsi */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  6] OBJ_pkcs */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02,     /* [ 13] OBJ_md2 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x05,     /* [ 21] OBJ_md5 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x04,     /* [ 29] OBJ_rc4 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,/* [ 37] OBJ_rsaEncryption */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x02,/* [ 46] OBJ_md2WithRSAEncryption */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x04,/* [ 55] OBJ_md5WithRSAEncryption */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x01,/* [ 64] OBJ_pbeWithMD2AndDES_CBC */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x03,/* [ 73] OBJ_pbeWithMD5AndDES_CBC */
+0x55,                                        /* [ 82] OBJ_X500 */
+0x55,0x04,                                   /* [ 83] OBJ_X509 */
+0x55,0x04,0x03,                              /* [ 85] OBJ_commonName */
+0x55,0x04,0x06,                              /* [ 88] OBJ_countryName */
+0x55,0x04,0x07,                              /* [ 91] OBJ_localityName */
+0x55,0x04,0x08,                              /* [ 94] OBJ_stateOrProvinceName */
+0x55,0x04,0x0A,                              /* [ 97] OBJ_organizationName */
+0x55,0x04,0x0B,                              /* [100] OBJ_organizationalUnitName */
+0x55,0x08,0x01,0x01,                         /* [103] OBJ_rsa */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,     /* [107] OBJ_pkcs7 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x01,/* [115] OBJ_pkcs7_data */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x02,/* [124] OBJ_pkcs7_signed */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x03,/* [133] OBJ_pkcs7_enveloped */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x04,/* [142] OBJ_pkcs7_signedAndEnveloped */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x05,/* [151] OBJ_pkcs7_digest */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x06,/* [160] OBJ_pkcs7_encrypted */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x03,     /* [169] OBJ_pkcs3 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x03,0x01,/* [177] OBJ_dhKeyAgreement */
+0x2B,0x0E,0x03,0x02,0x06,                    /* [186] OBJ_des_ecb */
+0x2B,0x0E,0x03,0x02,0x09,                    /* [191] OBJ_des_cfb64 */
+0x2B,0x0E,0x03,0x02,0x07,                    /* [196] OBJ_des_cbc */
+0x2B,0x0E,0x03,0x02,0x11,                    /* [201] OBJ_des_ede_ecb */
+0x2B,0x06,0x01,0x04,0x01,0x81,0x3C,0x07,0x01,0x01,0x02,/* [206] OBJ_idea_cbc */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x02,     /* [217] OBJ_rc2_cbc */
+0x2B,0x0E,0x03,0x02,0x12,                    /* [225] OBJ_sha */
+0x2B,0x0E,0x03,0x02,0x0F,                    /* [230] OBJ_shaWithRSAEncryption */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x07,     /* [235] OBJ_des_ede3_cbc */
+0x2B,0x0E,0x03,0x02,0x08,                    /* [243] OBJ_des_ofb64 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,     /* [248] OBJ_pkcs9 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x01,/* [256] OBJ_pkcs9_emailAddress */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x02,/* [265] OBJ_pkcs9_unstructuredName */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x03,/* [274] OBJ_pkcs9_contentType */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x04,/* [283] OBJ_pkcs9_messageDigest */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x05,/* [292] OBJ_pkcs9_signingTime */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x06,/* [301] OBJ_pkcs9_countersignature */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x07,/* [310] OBJ_pkcs9_challengePassword */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x08,/* [319] OBJ_pkcs9_unstructuredAddress */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x09,/* [328] OBJ_pkcs9_extCertAttributes */
+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,          /* [337] OBJ_netscape */
+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,     /* [344] OBJ_netscape_cert_extension */
+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x02,     /* [352] OBJ_netscape_data_type */
+0x2B,0x0E,0x03,0x02,0x1A,                    /* [360] OBJ_sha1 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,/* [365] OBJ_sha1WithRSAEncryption */
+0x2B,0x0E,0x03,0x02,0x0D,                    /* [374] OBJ_dsaWithSHA */
+0x2B,0x0E,0x03,0x02,0x0C,                    /* [379] OBJ_dsa_2 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0B,/* [384] OBJ_pbeWithSHA1AndRC2_CBC */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0C,/* [393] OBJ_id_pbkdf2 */
+0x2B,0x0E,0x03,0x02,0x1B,                    /* [402] OBJ_dsaWithSHA1_2 */
+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x01,/* [407] OBJ_netscape_cert_type */
+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x02,/* [416] OBJ_netscape_base_url */
+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x03,/* [425] OBJ_netscape_revocation_url */
+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x04,/* [434] OBJ_netscape_ca_revocation_url */
+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x07,/* [443] OBJ_netscape_renewal_url */
+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x08,/* [452] OBJ_netscape_ca_policy_url */
+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x0C,/* [461] OBJ_netscape_ssl_server_name */
+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x01,0x0D,/* [470] OBJ_netscape_comment */
+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x02,0x05,/* [479] OBJ_netscape_cert_sequence */
+0x55,0x1D,                                   /* [488] OBJ_id_ce */
+0x55,0x1D,0x0E,                              /* [490] OBJ_subject_key_identifier */
+0x55,0x1D,0x0F,                              /* [493] OBJ_key_usage */
+0x55,0x1D,0x10,                              /* [496] OBJ_private_key_usage_period */
+0x55,0x1D,0x11,                              /* [499] OBJ_subject_alt_name */
+0x55,0x1D,0x12,                              /* [502] OBJ_issuer_alt_name */
+0x55,0x1D,0x13,                              /* [505] OBJ_basic_constraints */
+0x55,0x1D,0x14,                              /* [508] OBJ_crl_number */
+0x55,0x1D,0x20,                              /* [511] OBJ_certificate_policies */
+0x55,0x1D,0x23,                              /* [514] OBJ_authority_key_identifier */
+0x2B,0x06,0x01,0x04,0x01,0x97,0x55,0x01,0x02,/* [517] OBJ_bf_cbc */
+0x55,0x08,0x03,0x65,                         /* [526] OBJ_mdc2 */
+0x55,0x08,0x03,0x64,                         /* [530] OBJ_mdc2WithRSA */
+0x55,0x04,0x2A,                              /* [534] OBJ_givenName */
+0x55,0x04,0x04,                              /* [537] OBJ_surname */
+0x55,0x04,0x2B,                              /* [540] OBJ_initials */
+0x55,0x1D,0x1F,                              /* [543] OBJ_crl_distribution_points */
+0x2B,0x0E,0x03,0x02,0x03,                    /* [546] OBJ_md5WithRSA */
+0x55,0x04,0x05,                              /* [551] OBJ_serialNumber */
+0x55,0x04,0x0C,                              /* [554] OBJ_title */
+0x55,0x04,0x0D,                              /* [557] OBJ_description */
+0x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x0A,/* [560] OBJ_cast5_cbc */
+0x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x0C,/* [569] OBJ_pbeWithMD5AndCast5_CBC */
+0x2A,0x86,0x48,0xCE,0x38,0x04,0x03,          /* [578] OBJ_dsaWithSHA1 */
+0x2B,0x0E,0x03,0x02,0x1D,                    /* [585] OBJ_sha1WithRSA */
+0x2A,0x86,0x48,0xCE,0x38,0x04,0x01,          /* [590] OBJ_dsa */
+0x2B,0x24,0x03,0x02,0x01,                    /* [597] OBJ_ripemd160 */
+0x2B,0x24,0x03,0x03,0x01,0x02,               /* [602] OBJ_ripemd160WithRSA */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x08,     /* [608] OBJ_rc5_cbc */
+0x29,0x01,0x01,0x85,0x1A,0x01,               /* [616] OBJ_rle_compression */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x08,/* [622] OBJ_zlib_compression */
+0x55,0x1D,0x25,                              /* [633] OBJ_ext_key_usage */
+0x2B,0x06,0x01,0x05,0x05,0x07,               /* [636] OBJ_id_pkix */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,          /* [642] OBJ_id_kp */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x01,     /* [649] OBJ_server_auth */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x02,     /* [657] OBJ_client_auth */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x03,     /* [665] OBJ_code_sign */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x04,     /* [673] OBJ_email_protect */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x08,     /* [681] OBJ_time_stamp */
+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x15,/* [689] OBJ_ms_code_ind */
+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x16,/* [699] OBJ_ms_code_com */
+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x01,/* [709] OBJ_ms_ctl_sign */
+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x03,/* [719] OBJ_ms_sgc */
+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x0A,0x03,0x04,/* [729] OBJ_ms_efs */
+0x60,0x86,0x48,0x01,0x86,0xF8,0x42,0x04,0x01,/* [739] OBJ_ns_sgc */
+0x55,0x1D,0x1B,                              /* [748] OBJ_delta_crl */
+0x55,0x1D,0x15,                              /* [751] OBJ_crl_reason */
+0x55,0x1D,0x18,                              /* [754] OBJ_invalidity_date */
+0x2B,0x65,0x01,0x04,0x01,                    /* [757] OBJ_sxnet */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x01,/* [762] OBJ_pbe_WithSHA1And128BitRC4 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x02,/* [772] OBJ_pbe_WithSHA1And40BitRC4 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x03,/* [782] OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x04,/* [792] OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x05,/* [802] OBJ_pbe_WithSHA1And128BitRC2_CBC */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x01,0x06,/* [812] OBJ_pbe_WithSHA1And40BitRC2_CBC */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x01,/* [822] OBJ_keyBag */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x02,/* [833] OBJ_pkcs8ShroudedKeyBag */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x03,/* [844] OBJ_certBag */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x04,/* [855] OBJ_crlBag */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x05,/* [866] OBJ_secretBag */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x0C,0x0A,0x01,0x06,/* [877] OBJ_safeContentsBag */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x14,/* [888] OBJ_friendlyName */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x15,/* [897] OBJ_localKeyID */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x16,0x01,/* [906] OBJ_x509Certificate */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x16,0x02,/* [916] OBJ_sdsiCertificate */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x17,0x01,/* [926] OBJ_x509Crl */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0D,/* [936] OBJ_pbes2 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0E,/* [945] OBJ_pbmac1 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x07,     /* [954] OBJ_hmacWithSHA1 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x01,     /* [962] OBJ_id_qt_cps */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x02,     /* [970] OBJ_id_qt_unotice */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x0F,/* [978] OBJ_SMIMECapabilities */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x04,/* [987] OBJ_pbeWithMD2AndRC2_CBC */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x06,/* [996] OBJ_pbeWithMD5AndRC2_CBC */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,0x0A,/* [1005] OBJ_pbeWithSHA1AndDES_CBC */
+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x02,0x01,0x0E,/* [1014] OBJ_ms_ext_req */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x0E,/* [1024] OBJ_ext_req */
+0x55,0x04,0x29,                              /* [1033] OBJ_name */
+0x55,0x04,0x2E,                              /* [1036] OBJ_dnQualifier */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,          /* [1039] OBJ_id_pe */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,          /* [1046] OBJ_id_ad */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x01,     /* [1053] OBJ_info_access */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,     /* [1061] OBJ_ad_OCSP */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x02,     /* [1069] OBJ_ad_ca_issuers */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x09,     /* [1077] OBJ_OCSP_sign */
+0x2A,                                        /* [1085] OBJ_member_body */
+0x2A,0x86,0x48,                              /* [1086] OBJ_ISO_US */
+0x2A,0x86,0x48,0xCE,0x38,                    /* [1089] OBJ_X9_57 */
+0x2A,0x86,0x48,0xCE,0x38,0x04,               /* [1094] OBJ_X9cm */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,     /* [1100] OBJ_pkcs1 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x05,     /* [1108] OBJ_pkcs5 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,/* [1116] OBJ_SMIME */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,/* [1125] OBJ_id_smime_mod */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,/* [1135] OBJ_id_smime_ct */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,/* [1145] OBJ_id_smime_aa */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,/* [1155] OBJ_id_smime_alg */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x04,/* [1165] OBJ_id_smime_cd */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,/* [1175] OBJ_id_smime_spq */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,/* [1185] OBJ_id_smime_cti */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x01,/* [1195] OBJ_id_smime_mod_cms */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x02,/* [1206] OBJ_id_smime_mod_ess */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x03,/* [1217] OBJ_id_smime_mod_oid */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x04,/* [1228] OBJ_id_smime_mod_msg_v3 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x05,/* [1239] OBJ_id_smime_mod_ets_eSignature_88 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x06,/* [1250] OBJ_id_smime_mod_ets_eSignature_97 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x07,/* [1261] OBJ_id_smime_mod_ets_eSigPolicy_88 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x00,0x08,/* [1272] OBJ_id_smime_mod_ets_eSigPolicy_97 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x01,/* [1283] OBJ_id_smime_ct_receipt */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x02,/* [1294] OBJ_id_smime_ct_authData */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x03,/* [1305] OBJ_id_smime_ct_publishCert */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x04,/* [1316] OBJ_id_smime_ct_TSTInfo */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x05,/* [1327] OBJ_id_smime_ct_TDTInfo */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x06,/* [1338] OBJ_id_smime_ct_contentInfo */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x07,/* [1349] OBJ_id_smime_ct_DVCSRequestData */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x08,/* [1360] OBJ_id_smime_ct_DVCSResponseData */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x01,/* [1371] OBJ_id_smime_aa_receiptRequest */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x02,/* [1382] OBJ_id_smime_aa_securityLabel */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x03,/* [1393] OBJ_id_smime_aa_mlExpandHistory */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x04,/* [1404] OBJ_id_smime_aa_contentHint */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x05,/* [1415] OBJ_id_smime_aa_msgSigDigest */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x06,/* [1426] OBJ_id_smime_aa_encapContentType */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x07,/* [1437] OBJ_id_smime_aa_contentIdentifier */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x08,/* [1448] OBJ_id_smime_aa_macValue */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x09,/* [1459] OBJ_id_smime_aa_equivalentLabels */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0A,/* [1470] OBJ_id_smime_aa_contentReference */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0B,/* [1481] OBJ_id_smime_aa_encrypKeyPref */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0C,/* [1492] OBJ_id_smime_aa_signingCertificate */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0D,/* [1503] OBJ_id_smime_aa_smimeEncryptCerts */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0E,/* [1514] OBJ_id_smime_aa_timeStampToken */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x0F,/* [1525] OBJ_id_smime_aa_ets_sigPolicyId */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x10,/* [1536] OBJ_id_smime_aa_ets_commitmentType */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x11,/* [1547] OBJ_id_smime_aa_ets_signerLocation */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x12,/* [1558] OBJ_id_smime_aa_ets_signerAttr */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x13,/* [1569] OBJ_id_smime_aa_ets_otherSigCert */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x14,/* [1580] OBJ_id_smime_aa_ets_contentTimestamp */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x15,/* [1591] OBJ_id_smime_aa_ets_CertificateRefs */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x16,/* [1602] OBJ_id_smime_aa_ets_RevocationRefs */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x17,/* [1613] OBJ_id_smime_aa_ets_certValues */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x18,/* [1624] OBJ_id_smime_aa_ets_revocationValues */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x19,/* [1635] OBJ_id_smime_aa_ets_escTimeStamp */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1A,/* [1646] OBJ_id_smime_aa_ets_certCRLTimestamp */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1B,/* [1657] OBJ_id_smime_aa_ets_archiveTimeStamp */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1C,/* [1668] OBJ_id_smime_aa_signatureType */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x02,0x1D,/* [1679] OBJ_id_smime_aa_dvcs_dvc */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x01,/* [1690] OBJ_id_smime_alg_ESDHwith3DES */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x02,/* [1701] OBJ_id_smime_alg_ESDHwithRC2 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x03,/* [1712] OBJ_id_smime_alg_3DESwrap */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x04,/* [1723] OBJ_id_smime_alg_RC2wrap */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x05,/* [1734] OBJ_id_smime_alg_ESDH */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x06,/* [1745] OBJ_id_smime_alg_CMS3DESwrap */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x07,/* [1756] OBJ_id_smime_alg_CMSRC2wrap */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x04,0x01,/* [1767] OBJ_id_smime_cd_ldap */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,0x01,/* [1778] OBJ_id_smime_spq_ets_sqt_uri */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x05,0x02,/* [1789] OBJ_id_smime_spq_ets_sqt_unotice */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x01,/* [1800] OBJ_id_smime_cti_ets_proofOfOrigin */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x02,/* [1811] OBJ_id_smime_cti_ets_proofOfReceipt */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x03,/* [1822] OBJ_id_smime_cti_ets_proofOfDelivery */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x04,/* [1833] OBJ_id_smime_cti_ets_proofOfSender */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x05,/* [1844] OBJ_id_smime_cti_ets_proofOfApproval */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x06,0x06,/* [1855] OBJ_id_smime_cti_ets_proofOfCreation */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x04,     /* [1866] OBJ_md4 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,          /* [1874] OBJ_id_pkix_mod */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x02,          /* [1881] OBJ_id_qt */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,          /* [1888] OBJ_id_it */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,          /* [1895] OBJ_id_pkip */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x06,          /* [1902] OBJ_id_alg */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,          /* [1909] OBJ_id_cmc */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x08,          /* [1916] OBJ_id_on */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x09,          /* [1923] OBJ_id_pda */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,          /* [1930] OBJ_id_aca */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x0B,          /* [1937] OBJ_id_qcs */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x0C,          /* [1944] OBJ_id_cct */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x01,     /* [1951] OBJ_id_pkix1_explicit_88 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x02,     /* [1959] OBJ_id_pkix1_implicit_88 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x03,     /* [1967] OBJ_id_pkix1_explicit_93 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x04,     /* [1975] OBJ_id_pkix1_implicit_93 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x05,     /* [1983] OBJ_id_mod_crmf */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x06,     /* [1991] OBJ_id_mod_cmc */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x07,     /* [1999] OBJ_id_mod_kea_profile_88 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x08,     /* [2007] OBJ_id_mod_kea_profile_93 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x09,     /* [2015] OBJ_id_mod_cmp */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0A,     /* [2023] OBJ_id_mod_qualified_cert_88 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0B,     /* [2031] OBJ_id_mod_qualified_cert_93 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0C,     /* [2039] OBJ_id_mod_attribute_cert */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0D,     /* [2047] OBJ_id_mod_timestamp_protocol */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0E,     /* [2055] OBJ_id_mod_ocsp */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x0F,     /* [2063] OBJ_id_mod_dvcs */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x00,0x10,     /* [2071] OBJ_id_mod_cmp2000 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x02,     /* [2079] OBJ_biometricInfo */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x03,     /* [2087] OBJ_qcStatements */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x04,     /* [2095] OBJ_ac_auditEntity */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x05,     /* [2103] OBJ_ac_targeting */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x06,     /* [2111] OBJ_aaControls */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x07,     /* [2119] OBJ_sbgp_ipAddrBlock */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x08,     /* [2127] OBJ_sbgp_autonomousSysNum */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x09,     /* [2135] OBJ_sbgp_routerIdentifier */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x03,     /* [2143] OBJ_textNotice */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x05,     /* [2151] OBJ_ipsecEndSystem */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x06,     /* [2159] OBJ_ipsecTunnel */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x07,     /* [2167] OBJ_ipsecUser */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x03,0x0A,     /* [2175] OBJ_dvcs */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x01,     /* [2183] OBJ_id_it_caProtEncCert */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x02,     /* [2191] OBJ_id_it_signKeyPairTypes */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x03,     /* [2199] OBJ_id_it_encKeyPairTypes */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x04,     /* [2207] OBJ_id_it_preferredSymmAlg */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x05,     /* [2215] OBJ_id_it_caKeyUpdateInfo */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x06,     /* [2223] OBJ_id_it_currentCRL */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x07,     /* [2231] OBJ_id_it_unsupportedOIDs */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x08,     /* [2239] OBJ_id_it_subscriptionRequest */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x09,     /* [2247] OBJ_id_it_subscriptionResponse */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0A,     /* [2255] OBJ_id_it_keyPairParamReq */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0B,     /* [2263] OBJ_id_it_keyPairParamRep */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0C,     /* [2271] OBJ_id_it_revPassphrase */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0D,     /* [2279] OBJ_id_it_implicitConfirm */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0E,     /* [2287] OBJ_id_it_confirmWaitTime */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x0F,     /* [2295] OBJ_id_it_origPKIMessage */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,     /* [2303] OBJ_id_regCtrl */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02,     /* [2311] OBJ_id_regInfo */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x01,/* [2319] OBJ_id_regCtrl_regToken */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x02,/* [2328] OBJ_id_regCtrl_authenticator */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x03,/* [2337] OBJ_id_regCtrl_pkiPublicationInfo */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x04,/* [2346] OBJ_id_regCtrl_pkiArchiveOptions */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x05,/* [2355] OBJ_id_regCtrl_oldCertID */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x01,0x06,/* [2364] OBJ_id_regCtrl_protocolEncrKey */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02,0x01,/* [2373] OBJ_id_regInfo_utf8Pairs */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x05,0x02,0x02,/* [2382] OBJ_id_regInfo_certReq */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x01,     /* [2391] OBJ_id_alg_des40 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x02,     /* [2399] OBJ_id_alg_noSignature */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x03,     /* [2407] OBJ_id_alg_dh_sig_hmac_sha1 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x06,0x04,     /* [2415] OBJ_id_alg_dh_pop */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x01,     /* [2423] OBJ_id_cmc_statusInfo */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x02,     /* [2431] OBJ_id_cmc_identification */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x03,     /* [2439] OBJ_id_cmc_identityProof */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x04,     /* [2447] OBJ_id_cmc_dataReturn */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x05,     /* [2455] OBJ_id_cmc_transactionId */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x06,     /* [2463] OBJ_id_cmc_senderNonce */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x07,     /* [2471] OBJ_id_cmc_recipientNonce */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x08,     /* [2479] OBJ_id_cmc_addExtensions */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x09,     /* [2487] OBJ_id_cmc_encryptedPOP */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0A,     /* [2495] OBJ_id_cmc_decryptedPOP */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0B,     /* [2503] OBJ_id_cmc_lraPOPWitness */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x0F,     /* [2511] OBJ_id_cmc_getCert */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x10,     /* [2519] OBJ_id_cmc_getCRL */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x11,     /* [2527] OBJ_id_cmc_revokeRequest */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x12,     /* [2535] OBJ_id_cmc_regInfo */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x13,     /* [2543] OBJ_id_cmc_responseInfo */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x15,     /* [2551] OBJ_id_cmc_queryPending */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x16,     /* [2559] OBJ_id_cmc_popLinkRandom */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x17,     /* [2567] OBJ_id_cmc_popLinkWitness */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x07,0x18,     /* [2575] OBJ_id_cmc_confirmCertAcceptance */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x08,0x01,     /* [2583] OBJ_id_on_personalData */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x01,     /* [2591] OBJ_id_pda_dateOfBirth */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x02,     /* [2599] OBJ_id_pda_placeOfBirth */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x03,     /* [2607] OBJ_id_pda_gender */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x04,     /* [2615] OBJ_id_pda_countryOfCitizenship */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x09,0x05,     /* [2623] OBJ_id_pda_countryOfResidence */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x01,     /* [2631] OBJ_id_aca_authenticationInfo */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x02,     /* [2639] OBJ_id_aca_accessIdentity */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x03,     /* [2647] OBJ_id_aca_chargingIdentity */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x04,     /* [2655] OBJ_id_aca_group */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x05,     /* [2663] OBJ_id_aca_role */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x0B,0x01,     /* [2671] OBJ_id_qcs_pkixQCSyntax_v1 */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x01,     /* [2679] OBJ_id_cct_crs */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x02,     /* [2687] OBJ_id_cct_PKIData */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x0C,0x03,     /* [2695] OBJ_id_cct_PKIResponse */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x03,     /* [2703] OBJ_ad_timeStamping */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x04,     /* [2711] OBJ_ad_dvcs */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x01,/* [2719] OBJ_id_pkix_OCSP_basic */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x02,/* [2728] OBJ_id_pkix_OCSP_Nonce */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x03,/* [2737] OBJ_id_pkix_OCSP_CrlID */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x04,/* [2746] OBJ_id_pkix_OCSP_acceptableResponses */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x05,/* [2755] OBJ_id_pkix_OCSP_noCheck */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x06,/* [2764] OBJ_id_pkix_OCSP_archiveCutoff */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x07,/* [2773] OBJ_id_pkix_OCSP_serviceLocator */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x08,/* [2782] OBJ_id_pkix_OCSP_extendedStatus */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x09,/* [2791] OBJ_id_pkix_OCSP_valid */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x0A,/* [2800] OBJ_id_pkix_OCSP_path */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x01,0x0B,/* [2809] OBJ_id_pkix_OCSP_trustRoot */
+0x2B,0x0E,0x03,0x02,                         /* [2818] OBJ_algorithm */
+0x2B,0x0E,0x03,0x02,0x0B,                    /* [2822] OBJ_rsaSignature */
+0x55,0x08,                                   /* [2827] OBJ_X500algorithms */
+0x2B,                                        /* [2829] OBJ_org */
+0x2B,0x06,                                   /* [2830] OBJ_dod */
+0x2B,0x06,0x01,                              /* [2832] OBJ_iana */
+0x2B,0x06,0x01,0x01,                         /* [2835] OBJ_Directory */
+0x2B,0x06,0x01,0x02,                         /* [2839] OBJ_Management */
+0x2B,0x06,0x01,0x03,                         /* [2843] OBJ_Experimental */
+0x2B,0x06,0x01,0x04,                         /* [2847] OBJ_Private */
+0x2B,0x06,0x01,0x05,                         /* [2851] OBJ_Security */
+0x2B,0x06,0x01,0x06,                         /* [2855] OBJ_SNMPv2 */
+0x2B,0x06,0x01,0x07,                         /* [2859] OBJ_Mail */
+0x2B,0x06,0x01,0x04,0x01,                    /* [2863] OBJ_Enterprises */
+0x2B,0x06,0x01,0x04,0x01,0x8B,0x3A,0x82,0x58,/* [2868] OBJ_dcObject */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x19,/* [2877] OBJ_domainComponent */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0D,/* [2887] OBJ_Domain */
+0x55,0x01,0x05,                              /* [2897] OBJ_selected_attribute_types */
+0x55,0x01,0x05,0x37,                         /* [2900] OBJ_clearance */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x03,/* [2904] OBJ_md4WithRSAEncryption */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0A,     /* [2913] OBJ_ac_proxying */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0B,     /* [2921] OBJ_sinfo_access */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x0A,0x06,     /* [2929] OBJ_id_aca_encAttrs */
+0x55,0x04,0x48,                              /* [2937] OBJ_role */
+0x55,0x1D,0x24,                              /* [2940] OBJ_policy_constraints */
+0x55,0x1D,0x37,                              /* [2943] OBJ_target_information */
+0x55,0x1D,0x38,                              /* [2946] OBJ_no_rev_avail */
+0x2A,0x86,0x48,0xCE,0x3D,                    /* [2949] OBJ_ansi_X9_62 */
+0x2A,0x86,0x48,0xCE,0x3D,0x01,0x01,          /* [2954] OBJ_X9_62_prime_field */
+0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,          /* [2961] OBJ_X9_62_characteristic_two_field */
+0x2A,0x86,0x48,0xCE,0x3D,0x02,0x01,          /* [2968] OBJ_X9_62_id_ecPublicKey */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x01,     /* [2975] OBJ_X9_62_prime192v1 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x02,     /* [2983] OBJ_X9_62_prime192v2 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x03,     /* [2991] OBJ_X9_62_prime192v3 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x04,     /* [2999] OBJ_X9_62_prime239v1 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x05,     /* [3007] OBJ_X9_62_prime239v2 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x06,     /* [3015] OBJ_X9_62_prime239v3 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x01,0x07,     /* [3023] OBJ_X9_62_prime256v1 */
+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x01,          /* [3031] OBJ_ecdsa_with_SHA1 */
+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x11,0x01,/* [3038] OBJ_ms_csp_name */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x01,/* [3047] OBJ_aes_128_ecb */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x02,/* [3056] OBJ_aes_128_cbc */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x03,/* [3065] OBJ_aes_128_ofb128 */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x04,/* [3074] OBJ_aes_128_cfb128 */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x15,/* [3083] OBJ_aes_192_ecb */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x16,/* [3092] OBJ_aes_192_cbc */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x17,/* [3101] OBJ_aes_192_ofb128 */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x18,/* [3110] OBJ_aes_192_cfb128 */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x29,/* [3119] OBJ_aes_256_ecb */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2A,/* [3128] OBJ_aes_256_cbc */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2B,/* [3137] OBJ_aes_256_ofb128 */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2C,/* [3146] OBJ_aes_256_cfb128 */
+0x55,0x1D,0x17,                              /* [3155] OBJ_hold_instruction_code */
+0x2A,0x86,0x48,0xCE,0x38,0x02,0x01,          /* [3158] OBJ_hold_instruction_none */
+0x2A,0x86,0x48,0xCE,0x38,0x02,0x02,          /* [3165] OBJ_hold_instruction_call_issuer */
+0x2A,0x86,0x48,0xCE,0x38,0x02,0x03,          /* [3172] OBJ_hold_instruction_reject */
+0x09,                                        /* [3179] OBJ_data */
+0x09,0x92,0x26,                              /* [3180] OBJ_pss */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,          /* [3183] OBJ_ucl */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,     /* [3190] OBJ_pilot */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,/* [3198] OBJ_pilotAttributeType */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,/* [3207] OBJ_pilotAttributeSyntax */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,/* [3216] OBJ_pilotObjectClass */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x0A,/* [3225] OBJ_pilotGroups */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,0x04,/* [3234] OBJ_iA5StringSyntax */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x03,0x05,/* [3244] OBJ_caseIgnoreIA5StringSyntax */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x03,/* [3254] OBJ_pilotObject */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x04,/* [3264] OBJ_pilotPerson */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x05,/* [3274] OBJ_account */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x06,/* [3284] OBJ_document */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x07,/* [3294] OBJ_room */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x09,/* [3304] OBJ_documentSeries */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0E,/* [3314] OBJ_rFC822localPart */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x0F,/* [3324] OBJ_dNSDomain */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x11,/* [3334] OBJ_domainRelatedObject */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x12,/* [3344] OBJ_friendlyCountry */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x13,/* [3354] OBJ_simpleSecurityObject */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x14,/* [3364] OBJ_pilotOrganization */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x15,/* [3374] OBJ_pilotDSA */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x04,0x16,/* [3384] OBJ_qualityLabelledData */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x01,/* [3394] OBJ_userId */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x02,/* [3404] OBJ_textEncodedORAddress */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x03,/* [3414] OBJ_rfc822Mailbox */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x04,/* [3424] OBJ_info */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x05,/* [3434] OBJ_favouriteDrink */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x06,/* [3444] OBJ_roomNumber */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x07,/* [3454] OBJ_photo */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x08,/* [3464] OBJ_userClass */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x09,/* [3474] OBJ_host */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0A,/* [3484] OBJ_manager */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0B,/* [3494] OBJ_documentIdentifier */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0C,/* [3504] OBJ_documentTitle */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0D,/* [3514] OBJ_documentVersion */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0E,/* [3524] OBJ_documentAuthor */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x0F,/* [3534] OBJ_documentLocation */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x14,/* [3544] OBJ_homeTelephoneNumber */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x15,/* [3554] OBJ_secretary */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x16,/* [3564] OBJ_otherMailbox */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x17,/* [3574] OBJ_lastModifiedTime */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x18,/* [3584] OBJ_lastModifiedBy */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1A,/* [3594] OBJ_aRecord */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1B,/* [3604] OBJ_pilotAttributeType27 */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1C,/* [3614] OBJ_mXRecord */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1D,/* [3624] OBJ_nSRecord */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1E,/* [3634] OBJ_sOARecord */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x1F,/* [3644] OBJ_cNAMERecord */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x25,/* [3654] OBJ_associatedDomain */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x26,/* [3664] OBJ_associatedName */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x27,/* [3674] OBJ_homePostalAddress */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x28,/* [3684] OBJ_personalTitle */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x29,/* [3694] OBJ_mobileTelephoneNumber */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2A,/* [3704] OBJ_pagerTelephoneNumber */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2B,/* [3714] OBJ_friendlyCountryName */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2D,/* [3724] OBJ_organizationalStatus */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2E,/* [3734] OBJ_janetMailbox */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x2F,/* [3744] OBJ_mailPreferenceOption */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x30,/* [3754] OBJ_buildingName */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x31,/* [3764] OBJ_dSAQuality */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x32,/* [3774] OBJ_singleLevelQuality */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x33,/* [3784] OBJ_subtreeMinimumQuality */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x34,/* [3794] OBJ_subtreeMaximumQuality */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x35,/* [3804] OBJ_personalSignature */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x36,/* [3814] OBJ_dITRedirect */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x37,/* [3824] OBJ_audio */
+0x09,0x92,0x26,0x89,0x93,0xF2,0x2C,0x64,0x01,0x38,/* [3834] OBJ_documentPublisher */
+0x55,0x04,0x2D,                              /* [3844] OBJ_x500UniqueIdentifier */
+0x2B,0x06,0x01,0x07,0x01,                    /* [3847] OBJ_mime_mhs */
+0x2B,0x06,0x01,0x07,0x01,0x01,               /* [3852] OBJ_mime_mhs_headings */
+0x2B,0x06,0x01,0x07,0x01,0x02,               /* [3858] OBJ_mime_mhs_bodies */
+0x2B,0x06,0x01,0x07,0x01,0x01,0x01,          /* [3864] OBJ_id_hex_partial_message */
+0x2B,0x06,0x01,0x07,0x01,0x01,0x02,          /* [3871] OBJ_id_hex_multipart_message */
+0x55,0x04,0x2C,                              /* [3878] OBJ_generationQualifier */
+0x55,0x04,0x41,                              /* [3881] OBJ_pseudonym */
+0x67,0x2A,                                   /* [3884] OBJ_id_set */
+0x67,0x2A,0x00,                              /* [3886] OBJ_set_ctype */
+0x67,0x2A,0x01,                              /* [3889] OBJ_set_msgExt */
+0x67,0x2A,0x03,                              /* [3892] OBJ_set_attr */
+0x67,0x2A,0x05,                              /* [3895] OBJ_set_policy */
+0x67,0x2A,0x07,                              /* [3898] OBJ_set_certExt */
+0x67,0x2A,0x08,                              /* [3901] OBJ_set_brand */
+0x67,0x2A,0x00,0x00,                         /* [3904] OBJ_setct_PANData */
+0x67,0x2A,0x00,0x01,                         /* [3908] OBJ_setct_PANToken */
+0x67,0x2A,0x00,0x02,                         /* [3912] OBJ_setct_PANOnly */
+0x67,0x2A,0x00,0x03,                         /* [3916] OBJ_setct_OIData */
+0x67,0x2A,0x00,0x04,                         /* [3920] OBJ_setct_PI */
+0x67,0x2A,0x00,0x05,                         /* [3924] OBJ_setct_PIData */
+0x67,0x2A,0x00,0x06,                         /* [3928] OBJ_setct_PIDataUnsigned */
+0x67,0x2A,0x00,0x07,                         /* [3932] OBJ_setct_HODInput */
+0x67,0x2A,0x00,0x08,                         /* [3936] OBJ_setct_AuthResBaggage */
+0x67,0x2A,0x00,0x09,                         /* [3940] OBJ_setct_AuthRevReqBaggage */
+0x67,0x2A,0x00,0x0A,                         /* [3944] OBJ_setct_AuthRevResBaggage */
+0x67,0x2A,0x00,0x0B,                         /* [3948] OBJ_setct_CapTokenSeq */
+0x67,0x2A,0x00,0x0C,                         /* [3952] OBJ_setct_PInitResData */
+0x67,0x2A,0x00,0x0D,                         /* [3956] OBJ_setct_PI_TBS */
+0x67,0x2A,0x00,0x0E,                         /* [3960] OBJ_setct_PResData */
+0x67,0x2A,0x00,0x10,                         /* [3964] OBJ_setct_AuthReqTBS */
+0x67,0x2A,0x00,0x11,                         /* [3968] OBJ_setct_AuthResTBS */
+0x67,0x2A,0x00,0x12,                         /* [3972] OBJ_setct_AuthResTBSX */
+0x67,0x2A,0x00,0x13,                         /* [3976] OBJ_setct_AuthTokenTBS */
+0x67,0x2A,0x00,0x14,                         /* [3980] OBJ_setct_CapTokenData */
+0x67,0x2A,0x00,0x15,                         /* [3984] OBJ_setct_CapTokenTBS */
+0x67,0x2A,0x00,0x16,                         /* [3988] OBJ_setct_AcqCardCodeMsg */
+0x67,0x2A,0x00,0x17,                         /* [3992] OBJ_setct_AuthRevReqTBS */
+0x67,0x2A,0x00,0x18,                         /* [3996] OBJ_setct_AuthRevResData */
+0x67,0x2A,0x00,0x19,                         /* [4000] OBJ_setct_AuthRevResTBS */
+0x67,0x2A,0x00,0x1A,                         /* [4004] OBJ_setct_CapReqTBS */
+0x67,0x2A,0x00,0x1B,                         /* [4008] OBJ_setct_CapReqTBSX */
+0x67,0x2A,0x00,0x1C,                         /* [4012] OBJ_setct_CapResData */
+0x67,0x2A,0x00,0x1D,                         /* [4016] OBJ_setct_CapRevReqTBS */
+0x67,0x2A,0x00,0x1E,                         /* [4020] OBJ_setct_CapRevReqTBSX */
+0x67,0x2A,0x00,0x1F,                         /* [4024] OBJ_setct_CapRevResData */
+0x67,0x2A,0x00,0x20,                         /* [4028] OBJ_setct_CredReqTBS */
+0x67,0x2A,0x00,0x21,                         /* [4032] OBJ_setct_CredReqTBSX */
+0x67,0x2A,0x00,0x22,                         /* [4036] OBJ_setct_CredResData */
+0x67,0x2A,0x00,0x23,                         /* [4040] OBJ_setct_CredRevReqTBS */
+0x67,0x2A,0x00,0x24,                         /* [4044] OBJ_setct_CredRevReqTBSX */
+0x67,0x2A,0x00,0x25,                         /* [4048] OBJ_setct_CredRevResData */
+0x67,0x2A,0x00,0x26,                         /* [4052] OBJ_setct_PCertReqData */
+0x67,0x2A,0x00,0x27,                         /* [4056] OBJ_setct_PCertResTBS */
+0x67,0x2A,0x00,0x28,                         /* [4060] OBJ_setct_BatchAdminReqData */
+0x67,0x2A,0x00,0x29,                         /* [4064] OBJ_setct_BatchAdminResData */
+0x67,0x2A,0x00,0x2A,                         /* [4068] OBJ_setct_CardCInitResTBS */
+0x67,0x2A,0x00,0x2B,                         /* [4072] OBJ_setct_MeAqCInitResTBS */
+0x67,0x2A,0x00,0x2C,                         /* [4076] OBJ_setct_RegFormResTBS */
+0x67,0x2A,0x00,0x2D,                         /* [4080] OBJ_setct_CertReqData */
+0x67,0x2A,0x00,0x2E,                         /* [4084] OBJ_setct_CertReqTBS */
+0x67,0x2A,0x00,0x2F,                         /* [4088] OBJ_setct_CertResData */
+0x67,0x2A,0x00,0x30,                         /* [4092] OBJ_setct_CertInqReqTBS */
+0x67,0x2A,0x00,0x31,                         /* [4096] OBJ_setct_ErrorTBS */
+0x67,0x2A,0x00,0x32,                         /* [4100] OBJ_setct_PIDualSignedTBE */
+0x67,0x2A,0x00,0x33,                         /* [4104] OBJ_setct_PIUnsignedTBE */
+0x67,0x2A,0x00,0x34,                         /* [4108] OBJ_setct_AuthReqTBE */
+0x67,0x2A,0x00,0x35,                         /* [4112] OBJ_setct_AuthResTBE */
+0x67,0x2A,0x00,0x36,                         /* [4116] OBJ_setct_AuthResTBEX */
+0x67,0x2A,0x00,0x37,                         /* [4120] OBJ_setct_AuthTokenTBE */
+0x67,0x2A,0x00,0x38,                         /* [4124] OBJ_setct_CapTokenTBE */
+0x67,0x2A,0x00,0x39,                         /* [4128] OBJ_setct_CapTokenTBEX */
+0x67,0x2A,0x00,0x3A,                         /* [4132] OBJ_setct_AcqCardCodeMsgTBE */
+0x67,0x2A,0x00,0x3B,                         /* [4136] OBJ_setct_AuthRevReqTBE */
+0x67,0x2A,0x00,0x3C,                         /* [4140] OBJ_setct_AuthRevResTBE */
+0x67,0x2A,0x00,0x3D,                         /* [4144] OBJ_setct_AuthRevResTBEB */
+0x67,0x2A,0x00,0x3E,                         /* [4148] OBJ_setct_CapReqTBE */
+0x67,0x2A,0x00,0x3F,                         /* [4152] OBJ_setct_CapReqTBEX */
+0x67,0x2A,0x00,0x40,                         /* [4156] OBJ_setct_CapResTBE */
+0x67,0x2A,0x00,0x41,                         /* [4160] OBJ_setct_CapRevReqTBE */
+0x67,0x2A,0x00,0x42,                         /* [4164] OBJ_setct_CapRevReqTBEX */
+0x67,0x2A,0x00,0x43,                         /* [4168] OBJ_setct_CapRevResTBE */
+0x67,0x2A,0x00,0x44,                         /* [4172] OBJ_setct_CredReqTBE */
+0x67,0x2A,0x00,0x45,                         /* [4176] OBJ_setct_CredReqTBEX */
+0x67,0x2A,0x00,0x46,                         /* [4180] OBJ_setct_CredResTBE */
+0x67,0x2A,0x00,0x47,                         /* [4184] OBJ_setct_CredRevReqTBE */
+0x67,0x2A,0x00,0x48,                         /* [4188] OBJ_setct_CredRevReqTBEX */
+0x67,0x2A,0x00,0x49,                         /* [4192] OBJ_setct_CredRevResTBE */
+0x67,0x2A,0x00,0x4A,                         /* [4196] OBJ_setct_BatchAdminReqTBE */
+0x67,0x2A,0x00,0x4B,                         /* [4200] OBJ_setct_BatchAdminResTBE */
+0x67,0x2A,0x00,0x4C,                         /* [4204] OBJ_setct_RegFormReqTBE */
+0x67,0x2A,0x00,0x4D,                         /* [4208] OBJ_setct_CertReqTBE */
+0x67,0x2A,0x00,0x4E,                         /* [4212] OBJ_setct_CertReqTBEX */
+0x67,0x2A,0x00,0x4F,                         /* [4216] OBJ_setct_CertResTBE */
+0x67,0x2A,0x00,0x50,                         /* [4220] OBJ_setct_CRLNotificationTBS */
+0x67,0x2A,0x00,0x51,                         /* [4224] OBJ_setct_CRLNotificationResTBS */
+0x67,0x2A,0x00,0x52,                         /* [4228] OBJ_setct_BCIDistributionTBS */
+0x67,0x2A,0x01,0x01,                         /* [4232] OBJ_setext_genCrypt */
+0x67,0x2A,0x01,0x03,                         /* [4236] OBJ_setext_miAuth */
+0x67,0x2A,0x01,0x04,                         /* [4240] OBJ_setext_pinSecure */
+0x67,0x2A,0x01,0x05,                         /* [4244] OBJ_setext_pinAny */
+0x67,0x2A,0x01,0x07,                         /* [4248] OBJ_setext_track2 */
+0x67,0x2A,0x01,0x08,                         /* [4252] OBJ_setext_cv */
+0x67,0x2A,0x05,0x00,                         /* [4256] OBJ_set_policy_root */
+0x67,0x2A,0x07,0x00,                         /* [4260] OBJ_setCext_hashedRoot */
+0x67,0x2A,0x07,0x01,                         /* [4264] OBJ_setCext_certType */
+0x67,0x2A,0x07,0x02,                         /* [4268] OBJ_setCext_merchData */
+0x67,0x2A,0x07,0x03,                         /* [4272] OBJ_setCext_cCertRequired */
+0x67,0x2A,0x07,0x04,                         /* [4276] OBJ_setCext_tunneling */
+0x67,0x2A,0x07,0x05,                         /* [4280] OBJ_setCext_setExt */
+0x67,0x2A,0x07,0x06,                         /* [4284] OBJ_setCext_setQualf */
+0x67,0x2A,0x07,0x07,                         /* [4288] OBJ_setCext_PGWYcapabilities */
+0x67,0x2A,0x07,0x08,                         /* [4292] OBJ_setCext_TokenIdentifier */
+0x67,0x2A,0x07,0x09,                         /* [4296] OBJ_setCext_Track2Data */
+0x67,0x2A,0x07,0x0A,                         /* [4300] OBJ_setCext_TokenType */
+0x67,0x2A,0x07,0x0B,                         /* [4304] OBJ_setCext_IssuerCapabilities */
+0x67,0x2A,0x03,0x00,                         /* [4308] OBJ_setAttr_Cert */
+0x67,0x2A,0x03,0x01,                         /* [4312] OBJ_setAttr_PGWYcap */
+0x67,0x2A,0x03,0x02,                         /* [4316] OBJ_setAttr_TokenType */
+0x67,0x2A,0x03,0x03,                         /* [4320] OBJ_setAttr_IssCap */
+0x67,0x2A,0x03,0x00,0x00,                    /* [4324] OBJ_set_rootKeyThumb */
+0x67,0x2A,0x03,0x00,0x01,                    /* [4329] OBJ_set_addPolicy */
+0x67,0x2A,0x03,0x02,0x01,                    /* [4334] OBJ_setAttr_Token_EMV */
+0x67,0x2A,0x03,0x02,0x02,                    /* [4339] OBJ_setAttr_Token_B0Prime */
+0x67,0x2A,0x03,0x03,0x03,                    /* [4344] OBJ_setAttr_IssCap_CVM */
+0x67,0x2A,0x03,0x03,0x04,                    /* [4349] OBJ_setAttr_IssCap_T2 */
+0x67,0x2A,0x03,0x03,0x05,                    /* [4354] OBJ_setAttr_IssCap_Sig */
+0x67,0x2A,0x03,0x03,0x03,0x01,               /* [4359] OBJ_setAttr_GenCryptgrm */
+0x67,0x2A,0x03,0x03,0x04,0x01,               /* [4365] OBJ_setAttr_T2Enc */
+0x67,0x2A,0x03,0x03,0x04,0x02,               /* [4371] OBJ_setAttr_T2cleartxt */
+0x67,0x2A,0x03,0x03,0x05,0x01,               /* [4377] OBJ_setAttr_TokICCsig */
+0x67,0x2A,0x03,0x03,0x05,0x02,               /* [4383] OBJ_setAttr_SecDevSig */
+0x67,0x2A,0x08,0x01,                         /* [4389] OBJ_set_brand_IATA_ATA */
+0x67,0x2A,0x08,0x1E,                         /* [4393] OBJ_set_brand_Diners */
+0x67,0x2A,0x08,0x22,                         /* [4397] OBJ_set_brand_AmericanExpress */
+0x67,0x2A,0x08,0x23,                         /* [4401] OBJ_set_brand_JCB */
+0x67,0x2A,0x08,0x04,                         /* [4405] OBJ_set_brand_Visa */
+0x67,0x2A,0x08,0x05,                         /* [4409] OBJ_set_brand_MasterCard */
+0x67,0x2A,0x08,0xAE,0x7B,                    /* [4413] OBJ_set_brand_Novus */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x03,0x0A,     /* [4418] OBJ_des_cdmf */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x06,/* [4426] OBJ_rsaOAEPEncryptionSET */
+0x67,                                        /* [4435] OBJ_international_organizations */
+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x02,/* [4436] OBJ_ms_smartcard_login */
+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x14,0x02,0x03,/* [4446] OBJ_ms_upn */
+0x55,0x04,0x09,                              /* [4456] OBJ_streetAddress */
+0x55,0x04,0x11,                              /* [4459] OBJ_postalCode */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x15,          /* [4462] OBJ_id_ppl */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x01,0x0E,     /* [4469] OBJ_proxyCertInfo */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x00,     /* [4477] OBJ_id_ppl_anyLanguage */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x01,     /* [4485] OBJ_id_ppl_inheritAll */
+0x55,0x1D,0x1E,                              /* [4493] OBJ_name_constraints */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x15,0x02,     /* [4496] OBJ_Independent */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,/* [4504] OBJ_sha256WithRSAEncryption */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0C,/* [4513] OBJ_sha384WithRSAEncryption */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0D,/* [4522] OBJ_sha512WithRSAEncryption */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0E,/* [4531] OBJ_sha224WithRSAEncryption */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x01,/* [4540] OBJ_sha256 */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x02,/* [4549] OBJ_sha384 */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x03,/* [4558] OBJ_sha512 */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x02,0x04,/* [4567] OBJ_sha224 */
+0x2B,                                        /* [4576] OBJ_identified_organization */
+0x2B,0x81,0x04,                              /* [4577] OBJ_certicom_arc */
+0x67,0x2B,                                   /* [4580] OBJ_wap */
+0x67,0x2B,0x01,                              /* [4582] OBJ_wap_wsg */
+0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,     /* [4585] OBJ_X9_62_id_characteristic_two_basis */
+0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x01,/* [4593] OBJ_X9_62_onBasis */
+0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x02,/* [4602] OBJ_X9_62_tpBasis */
+0x2A,0x86,0x48,0xCE,0x3D,0x01,0x02,0x03,0x03,/* [4611] OBJ_X9_62_ppBasis */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x01,     /* [4620] OBJ_X9_62_c2pnb163v1 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x02,     /* [4628] OBJ_X9_62_c2pnb163v2 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x03,     /* [4636] OBJ_X9_62_c2pnb163v3 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x04,     /* [4644] OBJ_X9_62_c2pnb176v1 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x05,     /* [4652] OBJ_X9_62_c2tnb191v1 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x06,     /* [4660] OBJ_X9_62_c2tnb191v2 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x07,     /* [4668] OBJ_X9_62_c2tnb191v3 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x08,     /* [4676] OBJ_X9_62_c2onb191v4 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x09,     /* [4684] OBJ_X9_62_c2onb191v5 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0A,     /* [4692] OBJ_X9_62_c2pnb208w1 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0B,     /* [4700] OBJ_X9_62_c2tnb239v1 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0C,     /* [4708] OBJ_X9_62_c2tnb239v2 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0D,     /* [4716] OBJ_X9_62_c2tnb239v3 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0E,     /* [4724] OBJ_X9_62_c2onb239v4 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x0F,     /* [4732] OBJ_X9_62_c2onb239v5 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x10,     /* [4740] OBJ_X9_62_c2pnb272w1 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x11,     /* [4748] OBJ_X9_62_c2pnb304w1 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x12,     /* [4756] OBJ_X9_62_c2tnb359v1 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x13,     /* [4764] OBJ_X9_62_c2pnb368w1 */
+0x2A,0x86,0x48,0xCE,0x3D,0x03,0x00,0x14,     /* [4772] OBJ_X9_62_c2tnb431r1 */
+0x2B,0x81,0x04,0x00,0x06,                    /* [4780] OBJ_secp112r1 */
+0x2B,0x81,0x04,0x00,0x07,                    /* [4785] OBJ_secp112r2 */
+0x2B,0x81,0x04,0x00,0x1C,                    /* [4790] OBJ_secp128r1 */
+0x2B,0x81,0x04,0x00,0x1D,                    /* [4795] OBJ_secp128r2 */
+0x2B,0x81,0x04,0x00,0x09,                    /* [4800] OBJ_secp160k1 */
+0x2B,0x81,0x04,0x00,0x08,                    /* [4805] OBJ_secp160r1 */
+0x2B,0x81,0x04,0x00,0x1E,                    /* [4810] OBJ_secp160r2 */
+0x2B,0x81,0x04,0x00,0x1F,                    /* [4815] OBJ_secp192k1 */
+0x2B,0x81,0x04,0x00,0x20,                    /* [4820] OBJ_secp224k1 */
+0x2B,0x81,0x04,0x00,0x21,                    /* [4825] OBJ_secp224r1 */
+0x2B,0x81,0x04,0x00,0x0A,                    /* [4830] OBJ_secp256k1 */
+0x2B,0x81,0x04,0x00,0x22,                    /* [4835] OBJ_secp384r1 */
+0x2B,0x81,0x04,0x00,0x23,                    /* [4840] OBJ_secp521r1 */
+0x2B,0x81,0x04,0x00,0x04,                    /* [4845] OBJ_sect113r1 */
+0x2B,0x81,0x04,0x00,0x05,                    /* [4850] OBJ_sect113r2 */
+0x2B,0x81,0x04,0x00,0x16,                    /* [4855] OBJ_sect131r1 */
+0x2B,0x81,0x04,0x00,0x17,                    /* [4860] OBJ_sect131r2 */
+0x2B,0x81,0x04,0x00,0x01,                    /* [4865] OBJ_sect163k1 */
+0x2B,0x81,0x04,0x00,0x02,                    /* [4870] OBJ_sect163r1 */
+0x2B,0x81,0x04,0x00,0x0F,                    /* [4875] OBJ_sect163r2 */
+0x2B,0x81,0x04,0x00,0x18,                    /* [4880] OBJ_sect193r1 */
+0x2B,0x81,0x04,0x00,0x19,                    /* [4885] OBJ_sect193r2 */
+0x2B,0x81,0x04,0x00,0x1A,                    /* [4890] OBJ_sect233k1 */
+0x2B,0x81,0x04,0x00,0x1B,                    /* [4895] OBJ_sect233r1 */
+0x2B,0x81,0x04,0x00,0x03,                    /* [4900] OBJ_sect239k1 */
+0x2B,0x81,0x04,0x00,0x10,                    /* [4905] OBJ_sect283k1 */
+0x2B,0x81,0x04,0x00,0x11,                    /* [4910] OBJ_sect283r1 */
+0x2B,0x81,0x04,0x00,0x24,                    /* [4915] OBJ_sect409k1 */
+0x2B,0x81,0x04,0x00,0x25,                    /* [4920] OBJ_sect409r1 */
+0x2B,0x81,0x04,0x00,0x26,                    /* [4925] OBJ_sect571k1 */
+0x2B,0x81,0x04,0x00,0x27,                    /* [4930] OBJ_sect571r1 */
+0x67,0x2B,0x01,0x04,0x01,                    /* [4935] OBJ_wap_wsg_idm_ecid_wtls1 */
+0x67,0x2B,0x01,0x04,0x03,                    /* [4940] OBJ_wap_wsg_idm_ecid_wtls3 */
+0x67,0x2B,0x01,0x04,0x04,                    /* [4945] OBJ_wap_wsg_idm_ecid_wtls4 */
+0x67,0x2B,0x01,0x04,0x05,                    /* [4950] OBJ_wap_wsg_idm_ecid_wtls5 */
+0x67,0x2B,0x01,0x04,0x06,                    /* [4955] OBJ_wap_wsg_idm_ecid_wtls6 */
+0x67,0x2B,0x01,0x04,0x07,                    /* [4960] OBJ_wap_wsg_idm_ecid_wtls7 */
+0x67,0x2B,0x01,0x04,0x08,                    /* [4965] OBJ_wap_wsg_idm_ecid_wtls8 */
+0x67,0x2B,0x01,0x04,0x09,                    /* [4970] OBJ_wap_wsg_idm_ecid_wtls9 */
+0x67,0x2B,0x01,0x04,0x0A,                    /* [4975] OBJ_wap_wsg_idm_ecid_wtls10 */
+0x67,0x2B,0x01,0x04,0x0B,                    /* [4980] OBJ_wap_wsg_idm_ecid_wtls11 */
+0x67,0x2B,0x01,0x04,0x0C,                    /* [4985] OBJ_wap_wsg_idm_ecid_wtls12 */
+0x55,0x1D,0x20,0x00,                         /* [4990] OBJ_any_policy */
+0x55,0x1D,0x21,                              /* [4994] OBJ_policy_mappings */
+0x55,0x1D,0x36,                              /* [4997] OBJ_inhibit_any_policy */
+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x01,0x02,/* [5000] OBJ_camellia_128_cbc */
+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x01,0x03,/* [5011] OBJ_camellia_192_cbc */
+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x01,0x04,/* [5022] OBJ_camellia_256_cbc */
+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x01,     /* [5033] OBJ_camellia_128_ecb */
+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x15,     /* [5041] OBJ_camellia_192_ecb */
+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x29,     /* [5049] OBJ_camellia_256_ecb */
+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x04,     /* [5057] OBJ_camellia_128_cfb128 */
+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x18,     /* [5065] OBJ_camellia_192_cfb128 */
+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x2C,     /* [5073] OBJ_camellia_256_cfb128 */
+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x03,     /* [5081] OBJ_camellia_128_ofb128 */
+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x17,     /* [5089] OBJ_camellia_192_ofb128 */
+0x03,0xA2,0x31,0x05,0x03,0x01,0x09,0x2B,     /* [5097] OBJ_camellia_256_ofb128 */
+0x55,0x1D,0x09,                              /* [5105] OBJ_subject_directory_attributes */
+0x55,0x1D,0x1C,                              /* [5108] OBJ_issuing_distribution_point */
+0x55,0x1D,0x1D,                              /* [5111] OBJ_certificate_issuer */
+0x2A,0x83,0x1A,0x8C,0x9A,0x44,               /* [5114] OBJ_kisa */
+0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x03,     /* [5120] OBJ_seed_ecb */
+0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x04,     /* [5128] OBJ_seed_cbc */
+0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x06,     /* [5136] OBJ_seed_ofb128 */
+0x2A,0x83,0x1A,0x8C,0x9A,0x44,0x01,0x05,     /* [5144] OBJ_seed_cfb128 */
+0x2B,0x06,0x01,0x05,0x05,0x08,0x01,0x01,     /* [5152] OBJ_hmac_md5 */
+0x2B,0x06,0x01,0x05,0x05,0x08,0x01,0x02,     /* [5160] OBJ_hmac_sha1 */
+0x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x0D,/* [5168] OBJ_id_PasswordBasedMAC */
+0x2A,0x86,0x48,0x86,0xF6,0x7D,0x07,0x42,0x1E,/* [5177] OBJ_id_DHBasedMac */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x04,0x10,     /* [5186] OBJ_id_it_suppLangTags */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x05,     /* [5194] OBJ_caRepository */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x09,/* [5202] OBJ_id_smime_ct_compressedData */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x01,0x1B,/* [5213] OBJ_id_ct_asciiTextWithCRLF */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x05,/* [5224] OBJ_id_aes128_wrap */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x19,/* [5233] OBJ_id_aes192_wrap */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2D,/* [5242] OBJ_id_aes256_wrap */
+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x02,          /* [5251] OBJ_ecdsa_with_Recommended */
+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,          /* [5258] OBJ_ecdsa_with_Specified */
+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x01,     /* [5265] OBJ_ecdsa_with_SHA224 */
+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x02,     /* [5273] OBJ_ecdsa_with_SHA256 */
+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x03,     /* [5281] OBJ_ecdsa_with_SHA384 */
+0x2A,0x86,0x48,0xCE,0x3D,0x04,0x03,0x04,     /* [5289] OBJ_ecdsa_with_SHA512 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x06,     /* [5297] OBJ_hmacWithMD5 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x08,     /* [5305] OBJ_hmacWithSHA224 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x09,     /* [5313] OBJ_hmacWithSHA256 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x0A,     /* [5321] OBJ_hmacWithSHA384 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x0B,     /* [5329] OBJ_hmacWithSHA512 */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x01,/* [5337] OBJ_dsa_with_SHA224 */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x03,0x02,/* [5346] OBJ_dsa_with_SHA256 */
+0x28,0xCF,0x06,0x03,0x00,0x37,               /* [5355] OBJ_whirlpool */
+0x2A,0x85,0x03,0x02,0x02,                    /* [5361] OBJ_cryptopro */
+0x2A,0x85,0x03,0x02,0x09,                    /* [5366] OBJ_cryptocom */
+0x2A,0x85,0x03,0x02,0x02,0x03,               /* [5371] OBJ_id_GostR3411_94_with_GostR3410_2001 */
+0x2A,0x85,0x03,0x02,0x02,0x04,               /* [5377] OBJ_id_GostR3411_94_with_GostR3410_94 */
+0x2A,0x85,0x03,0x02,0x02,0x09,               /* [5383] OBJ_id_GostR3411_94 */
+0x2A,0x85,0x03,0x02,0x02,0x0A,               /* [5389] OBJ_id_HMACGostR3411_94 */
+0x2A,0x85,0x03,0x02,0x02,0x13,               /* [5395] OBJ_id_GostR3410_2001 */
+0x2A,0x85,0x03,0x02,0x02,0x14,               /* [5401] OBJ_id_GostR3410_94 */
+0x2A,0x85,0x03,0x02,0x02,0x15,               /* [5407] OBJ_id_Gost28147_89 */
+0x2A,0x85,0x03,0x02,0x02,0x16,               /* [5413] OBJ_id_Gost28147_89_MAC */
+0x2A,0x85,0x03,0x02,0x02,0x17,               /* [5419] OBJ_id_GostR3411_94_prf */
+0x2A,0x85,0x03,0x02,0x02,0x62,               /* [5425] OBJ_id_GostR3410_2001DH */
+0x2A,0x85,0x03,0x02,0x02,0x63,               /* [5431] OBJ_id_GostR3410_94DH */
+0x2A,0x85,0x03,0x02,0x02,0x0E,0x01,          /* [5437] OBJ_id_Gost28147_89_CryptoPro_KeyMeshing */
+0x2A,0x85,0x03,0x02,0x02,0x0E,0x00,          /* [5444] OBJ_id_Gost28147_89_None_KeyMeshing */
+0x2A,0x85,0x03,0x02,0x02,0x1E,0x00,          /* [5451] OBJ_id_GostR3411_94_TestParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1E,0x01,          /* [5458] OBJ_id_GostR3411_94_CryptoProParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x00,          /* [5465] OBJ_id_Gost28147_89_TestParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x01,          /* [5472] OBJ_id_Gost28147_89_CryptoPro_A_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x02,          /* [5479] OBJ_id_Gost28147_89_CryptoPro_B_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x03,          /* [5486] OBJ_id_Gost28147_89_CryptoPro_C_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x04,          /* [5493] OBJ_id_Gost28147_89_CryptoPro_D_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x05,          /* [5500] OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x06,          /* [5507] OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x1F,0x07,          /* [5514] OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x20,0x00,          /* [5521] OBJ_id_GostR3410_94_TestParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x20,0x02,          /* [5528] OBJ_id_GostR3410_94_CryptoPro_A_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x20,0x03,          /* [5535] OBJ_id_GostR3410_94_CryptoPro_B_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x20,0x04,          /* [5542] OBJ_id_GostR3410_94_CryptoPro_C_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x20,0x05,          /* [5549] OBJ_id_GostR3410_94_CryptoPro_D_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x21,0x01,          /* [5556] OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x21,0x02,          /* [5563] OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x21,0x03,          /* [5570] OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x23,0x00,          /* [5577] OBJ_id_GostR3410_2001_TestParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x23,0x01,          /* [5584] OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x23,0x02,          /* [5591] OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x23,0x03,          /* [5598] OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x24,0x00,          /* [5605] OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x24,0x01,          /* [5612] OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet */
+0x2A,0x85,0x03,0x02,0x02,0x14,0x01,          /* [5619] OBJ_id_GostR3410_94_a */
+0x2A,0x85,0x03,0x02,0x02,0x14,0x02,          /* [5626] OBJ_id_GostR3410_94_aBis */
+0x2A,0x85,0x03,0x02,0x02,0x14,0x03,          /* [5633] OBJ_id_GostR3410_94_b */
+0x2A,0x85,0x03,0x02,0x02,0x14,0x04,          /* [5640] OBJ_id_GostR3410_94_bBis */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x06,0x01,     /* [5647] OBJ_id_Gost28147_89_cc */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x03,     /* [5655] OBJ_id_GostR3410_94_cc */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x05,0x04,     /* [5663] OBJ_id_GostR3410_2001_cc */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x03,     /* [5671] OBJ_id_GostR3411_94_with_GostR3410_94_cc */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x03,0x04,     /* [5679] OBJ_id_GostR3411_94_with_GostR3410_2001_cc */
+0x2A,0x85,0x03,0x02,0x09,0x01,0x08,0x01,     /* [5687] OBJ_id_GostR3410_2001_ParamSet_cc */
+0x2B,0x06,0x01,0x04,0x01,0x82,0x37,0x11,0x02,/* [5695] OBJ_LocalKeySet */
+0x55,0x1D,0x2E,                              /* [5704] OBJ_freshest_crl */
+0x2B,0x06,0x01,0x05,0x05,0x07,0x08,0x03,     /* [5707] OBJ_id_on_permanentIdentifier */
+0x55,0x04,0x0E,                              /* [5715] OBJ_searchGuide */
+0x55,0x04,0x0F,                              /* [5718] OBJ_businessCategory */
+0x55,0x04,0x10,                              /* [5721] OBJ_postalAddress */
+0x55,0x04,0x12,                              /* [5724] OBJ_postOfficeBox */
+0x55,0x04,0x13,                              /* [5727] OBJ_physicalDeliveryOfficeName */
+0x55,0x04,0x14,                              /* [5730] OBJ_telephoneNumber */
+0x55,0x04,0x15,                              /* [5733] OBJ_telexNumber */
+0x55,0x04,0x16,                              /* [5736] OBJ_teletexTerminalIdentifier */
+0x55,0x04,0x17,                              /* [5739] OBJ_facsimileTelephoneNumber */
+0x55,0x04,0x18,                              /* [5742] OBJ_x121Address */
+0x55,0x04,0x19,                              /* [5745] OBJ_internationaliSDNNumber */
+0x55,0x04,0x1A,                              /* [5748] OBJ_registeredAddress */
+0x55,0x04,0x1B,                              /* [5751] OBJ_destinationIndicator */
+0x55,0x04,0x1C,                              /* [5754] OBJ_preferredDeliveryMethod */
+0x55,0x04,0x1D,                              /* [5757] OBJ_presentationAddress */
+0x55,0x04,0x1E,                              /* [5760] OBJ_supportedApplicationContext */
+0x55,0x04,0x1F,                              /* [5763] OBJ_member */
+0x55,0x04,0x20,                              /* [5766] OBJ_owner */
+0x55,0x04,0x21,                              /* [5769] OBJ_roleOccupant */
+0x55,0x04,0x22,                              /* [5772] OBJ_seeAlso */
+0x55,0x04,0x23,                              /* [5775] OBJ_userPassword */
+0x55,0x04,0x24,                              /* [5778] OBJ_userCertificate */
+0x55,0x04,0x25,                              /* [5781] OBJ_cACertificate */
+0x55,0x04,0x26,                              /* [5784] OBJ_authorityRevocationList */
+0x55,0x04,0x27,                              /* [5787] OBJ_certificateRevocationList */
+0x55,0x04,0x28,                              /* [5790] OBJ_crossCertificatePair */
+0x55,0x04,0x2F,                              /* [5793] OBJ_enhancedSearchGuide */
+0x55,0x04,0x30,                              /* [5796] OBJ_protocolInformation */
+0x55,0x04,0x31,                              /* [5799] OBJ_distinguishedName */
+0x55,0x04,0x32,                              /* [5802] OBJ_uniqueMember */
+0x55,0x04,0x33,                              /* [5805] OBJ_houseIdentifier */
+0x55,0x04,0x34,                              /* [5808] OBJ_supportedAlgorithms */
+0x55,0x04,0x35,                              /* [5811] OBJ_deltaRevocationList */
+0x55,0x04,0x36,                              /* [5814] OBJ_dmdName */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x09,/* [5817] OBJ_id_alg_PWRI_KEK */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x06,/* [5828] OBJ_aes_128_gcm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x07,/* [5837] OBJ_aes_128_ccm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x08,/* [5846] OBJ_id_aes128_wrap_pad */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1A,/* [5855] OBJ_aes_192_gcm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1B,/* [5864] OBJ_aes_192_ccm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1C,/* [5873] OBJ_id_aes192_wrap_pad */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2E,/* [5882] OBJ_aes_256_gcm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2F,/* [5891] OBJ_aes_256_ccm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x30,/* [5900] OBJ_id_aes256_wrap_pad */
+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x02,/* [5909] OBJ_id_camellia128_wrap */
+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x03,/* [5920] OBJ_id_camellia192_wrap */
+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x04,/* [5931] OBJ_id_camellia256_wrap */
+0x55,0x1D,0x25,0x00,                         /* [5942] OBJ_anyExtendedKeyUsage */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x08,/* [5946] OBJ_mgf1 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0A,/* [5955] OBJ_rsassaPss */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x07,/* [5964] OBJ_rsaesOaep */
 };
 
 static const ASN1_OBJECT nid_objs[NUM_NID]={
-{"UNDEF","undefined",NID_undef,1,&(lvalues[0]),0},
-{"rsadsi","RSA Data Security, Inc.",NID_rsadsi,6,&(lvalues[1]),0},
-{"pkcs","RSA Data Security, Inc. PKCS",NID_pkcs,7,&(lvalues[7]),0},
-{"MD2","md2",NID_md2,8,&(lvalues[14]),0},
-{"MD5","md5",NID_md5,8,&(lvalues[22]),0},
-{"RC4","rc4",NID_rc4,8,&(lvalues[30]),0},
-{"rsaEncryption","rsaEncryption",NID_rsaEncryption,9,&(lvalues[38]),0},
+{"UNDEF","undefined",NID_undef,0,NULL,0},
+{"rsadsi","RSA Data Security, Inc.",NID_rsadsi,6,&(lvalues[0]),0},
+{"pkcs","RSA Data Security, Inc. PKCS",NID_pkcs,7,&(lvalues[6]),0},
+{"MD2","md2",NID_md2,8,&(lvalues[13]),0},
+{"MD5","md5",NID_md5,8,&(lvalues[21]),0},
+{"RC4","rc4",NID_rc4,8,&(lvalues[29]),0},
+{"rsaEncryption","rsaEncryption",NID_rsaEncryption,9,&(lvalues[37]),0},
 {"RSA-MD2","md2WithRSAEncryption",NID_md2WithRSAEncryption,9,
-	&(lvalues[47]),0},
+	&(lvalues[46]),0},
 {"RSA-MD5","md5WithRSAEncryption",NID_md5WithRSAEncryption,9,
-	&(lvalues[56]),0},
+	&(lvalues[55]),0},
 {"PBE-MD2-DES","pbeWithMD2AndDES-CBC",NID_pbeWithMD2AndDES_CBC,9,
-	&(lvalues[65]),0},
+	&(lvalues[64]),0},
 {"PBE-MD5-DES","pbeWithMD5AndDES-CBC",NID_pbeWithMD5AndDES_CBC,9,
-	&(lvalues[74]),0},
-{"X500","directory services (X.500)",NID_X500,1,&(lvalues[83]),0},
-{"X509","X509",NID_X509,2,&(lvalues[84]),0},
-{"CN","commonName",NID_commonName,3,&(lvalues[86]),0},
-{"C","countryName",NID_countryName,3,&(lvalues[89]),0},
-{"L","localityName",NID_localityName,3,&(lvalues[92]),0},
-{"ST","stateOrProvinceName",NID_stateOrProvinceName,3,&(lvalues[95]),0},
-{"O","organizationName",NID_organizationName,3,&(lvalues[98]),0},
+	&(lvalues[73]),0},
+{"X500","directory services (X.500)",NID_X500,1,&(lvalues[82]),0},
+{"X509","X509",NID_X509,2,&(lvalues[83]),0},
+{"CN","commonName",NID_commonName,3,&(lvalues[85]),0},
+{"C","countryName",NID_countryName,3,&(lvalues[88]),0},
+{"L","localityName",NID_localityName,3,&(lvalues[91]),0},
+{"ST","stateOrProvinceName",NID_stateOrProvinceName,3,&(lvalues[94]),0},
+{"O","organizationName",NID_organizationName,3,&(lvalues[97]),0},
 {"OU","organizationalUnitName",NID_organizationalUnitName,3,
-	&(lvalues[101]),0},
-{"RSA","rsa",NID_rsa,4,&(lvalues[104]),0},
-{"pkcs7","pkcs7",NID_pkcs7,8,&(lvalues[108]),0},
-{"pkcs7-data","pkcs7-data",NID_pkcs7_data,9,&(lvalues[116]),0},
+	&(lvalues[100]),0},
+{"RSA","rsa",NID_rsa,4,&(lvalues[103]),0},
+{"pkcs7","pkcs7",NID_pkcs7,8,&(lvalues[107]),0},
+{"pkcs7-data","pkcs7-data",NID_pkcs7_data,9,&(lvalues[115]),0},
 {"pkcs7-signedData","pkcs7-signedData",NID_pkcs7_signed,9,
-	&(lvalues[125]),0},
+	&(lvalues[124]),0},
 {"pkcs7-envelopedData","pkcs7-envelopedData",NID_pkcs7_enveloped,9,
-	&(lvalues[134]),0},
+	&(lvalues[133]),0},
 {"pkcs7-signedAndEnvelopedData","pkcs7-signedAndEnvelopedData",
-	NID_pkcs7_signedAndEnveloped,9,&(lvalues[143]),0},
+	NID_pkcs7_signedAndEnveloped,9,&(lvalues[142]),0},
 {"pkcs7-digestData","pkcs7-digestData",NID_pkcs7_digest,9,
-	&(lvalues[152]),0},
+	&(lvalues[151]),0},
 {"pkcs7-encryptedData","pkcs7-encryptedData",NID_pkcs7_encrypted,9,
-	&(lvalues[161]),0},
-{"pkcs3","pkcs3",NID_pkcs3,8,&(lvalues[170]),0},
+	&(lvalues[160]),0},
+{"pkcs3","pkcs3",NID_pkcs3,8,&(lvalues[169]),0},
 {"dhKeyAgreement","dhKeyAgreement",NID_dhKeyAgreement,9,
-	&(lvalues[178]),0},
-{"DES-ECB","des-ecb",NID_des_ecb,5,&(lvalues[187]),0},
-{"DES-CFB","des-cfb",NID_des_cfb64,5,&(lvalues[192]),0},
-{"DES-CBC","des-cbc",NID_des_cbc,5,&(lvalues[197]),0},
-{"DES-EDE","des-ede",NID_des_ede_ecb,5,&(lvalues[202]),0},
+	&(lvalues[177]),0},
+{"DES-ECB","des-ecb",NID_des_ecb,5,&(lvalues[186]),0},
+{"DES-CFB","des-cfb",NID_des_cfb64,5,&(lvalues[191]),0},
+{"DES-CBC","des-cbc",NID_des_cbc,5,&(lvalues[196]),0},
+{"DES-EDE","des-ede",NID_des_ede_ecb,5,&(lvalues[201]),0},
 {"DES-EDE3","des-ede3",NID_des_ede3_ecb,0,NULL,0},
-{"IDEA-CBC","idea-cbc",NID_idea_cbc,11,&(lvalues[207]),0},
+{"IDEA-CBC","idea-cbc",NID_idea_cbc,11,&(lvalues[206]),0},
 {"IDEA-CFB","idea-cfb",NID_idea_cfb64,0,NULL,0},
 {"IDEA-ECB","idea-ecb",NID_idea_ecb,0,NULL,0},
-{"RC2-CBC","rc2-cbc",NID_rc2_cbc,8,&(lvalues[218]),0},
+{"RC2-CBC","rc2-cbc",NID_rc2_cbc,8,&(lvalues[217]),0},
 {"RC2-ECB","rc2-ecb",NID_rc2_ecb,0,NULL,0},
 {"RC2-CFB","rc2-cfb",NID_rc2_cfb64,0,NULL,0},
 {"RC2-OFB","rc2-ofb",NID_rc2_ofb64,0,NULL,0},
-{"SHA","sha",NID_sha,5,&(lvalues[226]),0},
+{"SHA","sha",NID_sha,5,&(lvalues[225]),0},
 {"RSA-SHA","shaWithRSAEncryption",NID_shaWithRSAEncryption,5,
-	&(lvalues[231]),0},
+	&(lvalues[230]),0},
 {"DES-EDE-CBC","des-ede-cbc",NID_des_ede_cbc,0,NULL,0},
-{"DES-EDE3-CBC","des-ede3-cbc",NID_des_ede3_cbc,8,&(lvalues[236]),0},
-{"DES-OFB","des-ofb",NID_des_ofb64,5,&(lvalues[244]),0},
+{"DES-EDE3-CBC","des-ede3-cbc",NID_des_ede3_cbc,8,&(lvalues[235]),0},
+{"DES-OFB","des-ofb",NID_des_ofb64,5,&(lvalues[243]),0},
 {"IDEA-OFB","idea-ofb",NID_idea_ofb64,0,NULL,0},
-{"pkcs9","pkcs9",NID_pkcs9,8,&(lvalues[249]),0},
+{"pkcs9","pkcs9",NID_pkcs9,8,&(lvalues[248]),0},
 {"emailAddress","emailAddress",NID_pkcs9_emailAddress,9,
-	&(lvalues[257]),0},
+	&(lvalues[256]),0},
 {"unstructuredName","unstructuredName",NID_pkcs9_unstructuredName,9,
-	&(lvalues[266]),0},
-{"contentType","contentType",NID_pkcs9_contentType,9,&(lvalues[275]),0},
+	&(lvalues[265]),0},
+{"contentType","contentType",NID_pkcs9_contentType,9,&(lvalues[274]),0},
 {"messageDigest","messageDigest",NID_pkcs9_messageDigest,9,
-	&(lvalues[284]),0},
-{"signingTime","signingTime",NID_pkcs9_signingTime,9,&(lvalues[293]),0},
+	&(lvalues[283]),0},
+{"signingTime","signingTime",NID_pkcs9_signingTime,9,&(lvalues[292]),0},
 {"countersignature","countersignature",NID_pkcs9_countersignature,9,
-	&(lvalues[302]),0},
+	&(lvalues[301]),0},
 {"challengePassword","challengePassword",NID_pkcs9_challengePassword,
-	9,&(lvalues[311]),0},
+	9,&(lvalues[310]),0},
 {"unstructuredAddress","unstructuredAddress",
-	NID_pkcs9_unstructuredAddress,9,&(lvalues[320]),0},
+	NID_pkcs9_unstructuredAddress,9,&(lvalues[319]),0},
 {"extendedCertificateAttributes","extendedCertificateAttributes",
-	NID_pkcs9_extCertAttributes,9,&(lvalues[329]),0},
+	NID_pkcs9_extCertAttributes,9,&(lvalues[328]),0},
 {"Netscape","Netscape Communications Corp.",NID_netscape,7,
-	&(lvalues[338]),0},
+	&(lvalues[337]),0},
 {"nsCertExt","Netscape Certificate Extension",
-	NID_netscape_cert_extension,8,&(lvalues[345]),0},
+	NID_netscape_cert_extension,8,&(lvalues[344]),0},
 {"nsDataType","Netscape Data Type",NID_netscape_data_type,8,
-	&(lvalues[353]),0},
+	&(lvalues[352]),0},
 {"DES-EDE-CFB","des-ede-cfb",NID_des_ede_cfb64,0,NULL,0},
 {"DES-EDE3-CFB","des-ede3-cfb",NID_des_ede3_cfb64,0,NULL,0},
 {"DES-EDE-OFB","des-ede-ofb",NID_des_ede_ofb64,0,NULL,0},
 {"DES-EDE3-OFB","des-ede3-ofb",NID_des_ede3_ofb64,0,NULL,0},
-{"SHA1","sha1",NID_sha1,5,&(lvalues[361]),0},
+{"SHA1","sha1",NID_sha1,5,&(lvalues[360]),0},
 {"RSA-SHA1","sha1WithRSAEncryption",NID_sha1WithRSAEncryption,9,
-	&(lvalues[366]),0},
-{"DSA-SHA","dsaWithSHA",NID_dsaWithSHA,5,&(lvalues[375]),0},
-{"DSA-old","dsaEncryption-old",NID_dsa_2,5,&(lvalues[380]),0},
+	&(lvalues[365]),0},
+{"DSA-SHA","dsaWithSHA",NID_dsaWithSHA,5,&(lvalues[374]),0},
+{"DSA-old","dsaEncryption-old",NID_dsa_2,5,&(lvalues[379]),0},
 {"PBE-SHA1-RC2-64","pbeWithSHA1AndRC2-CBC",NID_pbeWithSHA1AndRC2_CBC,
-	9,&(lvalues[385]),0},
-{"PBKDF2","PBKDF2",NID_id_pbkdf2,9,&(lvalues[394]),0},
-{"DSA-SHA1-old","dsaWithSHA1-old",NID_dsaWithSHA1_2,5,&(lvalues[403]),0},
+	9,&(lvalues[384]),0},
+{"PBKDF2","PBKDF2",NID_id_pbkdf2,9,&(lvalues[393]),0},
+{"DSA-SHA1-old","dsaWithSHA1-old",NID_dsaWithSHA1_2,5,&(lvalues[402]),0},
 {"nsCertType","Netscape Cert Type",NID_netscape_cert_type,9,
-	&(lvalues[408]),0},
+	&(lvalues[407]),0},
 {"nsBaseUrl","Netscape Base Url",NID_netscape_base_url,9,
-	&(lvalues[417]),0},
+	&(lvalues[416]),0},
 {"nsRevocationUrl","Netscape Revocation Url",
-	NID_netscape_revocation_url,9,&(lvalues[426]),0},
+	NID_netscape_revocation_url,9,&(lvalues[425]),0},
 {"nsCaRevocationUrl","Netscape CA Revocation Url",
-	NID_netscape_ca_revocation_url,9,&(lvalues[435]),0},
+	NID_netscape_ca_revocation_url,9,&(lvalues[434]),0},
 {"nsRenewalUrl","Netscape Renewal Url",NID_netscape_renewal_url,9,
-	&(lvalues[444]),0},
+	&(lvalues[443]),0},
 {"nsCaPolicyUrl","Netscape CA Policy Url",NID_netscape_ca_policy_url,
-	9,&(lvalues[453]),0},
+	9,&(lvalues[452]),0},
 {"nsSslServerName","Netscape SSL Server Name",
-	NID_netscape_ssl_server_name,9,&(lvalues[462]),0},
-{"nsComment","Netscape Comment",NID_netscape_comment,9,&(lvalues[471]),0},
+	NID_netscape_ssl_server_name,9,&(lvalues[461]),0},
+{"nsComment","Netscape Comment",NID_netscape_comment,9,&(lvalues[470]),0},
 {"nsCertSequence","Netscape Certificate Sequence",
-	NID_netscape_cert_sequence,9,&(lvalues[480]),0},
+	NID_netscape_cert_sequence,9,&(lvalues[479]),0},
 {"DESX-CBC","desx-cbc",NID_desx_cbc,0,NULL,0},
-{"id-ce","id-ce",NID_id_ce,2,&(lvalues[489]),0},
+{"id-ce","id-ce",NID_id_ce,2,&(lvalues[488]),0},
 {"subjectKeyIdentifier","X509v3 Subject Key Identifier",
-	NID_subject_key_identifier,3,&(lvalues[491]),0},
-{"keyUsage","X509v3 Key Usage",NID_key_usage,3,&(lvalues[494]),0},
+	NID_subject_key_identifier,3,&(lvalues[490]),0},
+{"keyUsage","X509v3 Key Usage",NID_key_usage,3,&(lvalues[493]),0},
 {"privateKeyUsagePeriod","X509v3 Private Key Usage Period",
-	NID_private_key_usage_period,3,&(lvalues[497]),0},
+	NID_private_key_usage_period,3,&(lvalues[496]),0},
 {"subjectAltName","X509v3 Subject Alternative Name",
-	NID_subject_alt_name,3,&(lvalues[500]),0},
+	NID_subject_alt_name,3,&(lvalues[499]),0},
 {"issuerAltName","X509v3 Issuer Alternative Name",NID_issuer_alt_name,
-	3,&(lvalues[503]),0},
+	3,&(lvalues[502]),0},
 {"basicConstraints","X509v3 Basic Constraints",NID_basic_constraints,
-	3,&(lvalues[506]),0},
-{"crlNumber","X509v3 CRL Number",NID_crl_number,3,&(lvalues[509]),0},
+	3,&(lvalues[505]),0},
+{"crlNumber","X509v3 CRL Number",NID_crl_number,3,&(lvalues[508]),0},
 {"certificatePolicies","X509v3 Certificate Policies",
-	NID_certificate_policies,3,&(lvalues[512]),0},
+	NID_certificate_policies,3,&(lvalues[511]),0},
 {"authorityKeyIdentifier","X509v3 Authority Key Identifier",
-	NID_authority_key_identifier,3,&(lvalues[515]),0},
-{"BF-CBC","bf-cbc",NID_bf_cbc,9,&(lvalues[518]),0},
+	NID_authority_key_identifier,3,&(lvalues[514]),0},
+{"BF-CBC","bf-cbc",NID_bf_cbc,9,&(lvalues[517]),0},
 {"BF-ECB","bf-ecb",NID_bf_ecb,0,NULL,0},
 {"BF-CFB","bf-cfb",NID_bf_cfb64,0,NULL,0},
 {"BF-OFB","bf-ofb",NID_bf_ofb64,0,NULL,0},
-{"MDC2","mdc2",NID_mdc2,4,&(lvalues[527]),0},
-{"RSA-MDC2","mdc2WithRSA",NID_mdc2WithRSA,4,&(lvalues[531]),0},
+{"MDC2","mdc2",NID_mdc2,4,&(lvalues[526]),0},
+{"RSA-MDC2","mdc2WithRSA",NID_mdc2WithRSA,4,&(lvalues[530]),0},
 {"RC4-40","rc4-40",NID_rc4_40,0,NULL,0},
 {"RC2-40-CBC","rc2-40-cbc",NID_rc2_40_cbc,0,NULL,0},
-{"GN","givenName",NID_givenName,3,&(lvalues[535]),0},
-{"SN","surname",NID_surname,3,&(lvalues[538]),0},
-{"initials","initials",NID_initials,3,&(lvalues[541]),0},
+{"GN","givenName",NID_givenName,3,&(lvalues[534]),0},
+{"SN","surname",NID_surname,3,&(lvalues[537]),0},
+{"initials","initials",NID_initials,3,&(lvalues[540]),0},
 {NULL,NULL,NID_undef,0,NULL,0},
 {"crlDistributionPoints","X509v3 CRL Distribution Points",
-	NID_crl_distribution_points,3,&(lvalues[544]),0},
-{"RSA-NP-MD5","md5WithRSA",NID_md5WithRSA,5,&(lvalues[547]),0},
-{"serialNumber","serialNumber",NID_serialNumber,3,&(lvalues[552]),0},
-{"title","title",NID_title,3,&(lvalues[555]),0},
-{"description","description",NID_description,3,&(lvalues[558]),0},
-{"CAST5-CBC","cast5-cbc",NID_cast5_cbc,9,&(lvalues[561]),0},
+	NID_crl_distribution_points,3,&(lvalues[543]),0},
+{"RSA-NP-MD5","md5WithRSA",NID_md5WithRSA,5,&(lvalues[546]),0},
+{"serialNumber","serialNumber",NID_serialNumber,3,&(lvalues[551]),0},
+{"title","title",NID_title,3,&(lvalues[554]),0},
+{"description","description",NID_description,3,&(lvalues[557]),0},
+{"CAST5-CBC","cast5-cbc",NID_cast5_cbc,9,&(lvalues[560]),0},
 {"CAST5-ECB","cast5-ecb",NID_cast5_ecb,0,NULL,0},
 {"CAST5-CFB","cast5-cfb",NID_cast5_cfb64,0,NULL,0},
 {"CAST5-OFB","cast5-ofb",NID_cast5_ofb64,0,NULL,0},
 {"pbeWithMD5AndCast5CBC","pbeWithMD5AndCast5CBC",
-	NID_pbeWithMD5AndCast5_CBC,9,&(lvalues[570]),0},
-{"DSA-SHA1","dsaWithSHA1",NID_dsaWithSHA1,7,&(lvalues[579]),0},
+	NID_pbeWithMD5AndCast5_CBC,9,&(lvalues[569]),0},
+{"DSA-SHA1","dsaWithSHA1",NID_dsaWithSHA1,7,&(lvalues[578]),0},
 {"MD5-SHA1","md5-sha1",NID_md5_sha1,0,NULL,0},
-{"RSA-SHA1-2","sha1WithRSA",NID_sha1WithRSA,5,&(lvalues[586]),0},
-{"DSA","dsaEncryption",NID_dsa,7,&(lvalues[591]),0},
-{"RIPEMD160","ripemd160",NID_ripemd160,5,&(lvalues[598]),0},
+{"RSA-SHA1-2","sha1WithRSA",NID_sha1WithRSA,5,&(lvalues[585]),0},
+{"DSA","dsaEncryption",NID_dsa,7,&(lvalues[590]),0},
+{"RIPEMD160","ripemd160",NID_ripemd160,5,&(lvalues[597]),0},
 {NULL,NULL,NID_undef,0,NULL,0},
 {"RSA-RIPEMD160","ripemd160WithRSA",NID_ripemd160WithRSA,6,
-	&(lvalues[603]),0},
-{"RC5-CBC","rc5-cbc",NID_rc5_cbc,8,&(lvalues[609]),0},
+	&(lvalues[602]),0},
+{"RC5-CBC","rc5-cbc",NID_rc5_cbc,8,&(lvalues[608]),0},
 {"RC5-ECB","rc5-ecb",NID_rc5_ecb,0,NULL,0},
 {"RC5-CFB","rc5-cfb",NID_rc5_cfb64,0,NULL,0},
 {"RC5-OFB","rc5-ofb",NID_rc5_ofb64,0,NULL,0},
-{"RLE","run length compression",NID_rle_compression,6,&(lvalues[617]),0},
-{"ZLIB","zlib compression",NID_zlib_compression,11,&(lvalues[623]),0},
+{"RLE","run length compression",NID_rle_compression,6,&(lvalues[616]),0},
+{"ZLIB","zlib compression",NID_zlib_compression,11,&(lvalues[622]),0},
 {"extendedKeyUsage","X509v3 Extended Key Usage",NID_ext_key_usage,3,
-	&(lvalues[634]),0},
-{"PKIX","PKIX",NID_id_pkix,6,&(lvalues[637]),0},
-{"id-kp","id-kp",NID_id_kp,7,&(lvalues[643]),0},
+	&(lvalues[633]),0},
+{"PKIX","PKIX",NID_id_pkix,6,&(lvalues[636]),0},
+{"id-kp","id-kp",NID_id_kp,7,&(lvalues[642]),0},
 {"serverAuth","TLS Web Server Authentication",NID_server_auth,8,
-	&(lvalues[650]),0},
+	&(lvalues[649]),0},
 {"clientAuth","TLS Web Client Authentication",NID_client_auth,8,
-	&(lvalues[658]),0},
-{"codeSigning","Code Signing",NID_code_sign,8,&(lvalues[666]),0},
+	&(lvalues[657]),0},
+{"codeSigning","Code Signing",NID_code_sign,8,&(lvalues[665]),0},
 {"emailProtection","E-mail Protection",NID_email_protect,8,
-	&(lvalues[674]),0},
-{"timeStamping","Time Stamping",NID_time_stamp,8,&(lvalues[682]),0},
+	&(lvalues[673]),0},
+{"timeStamping","Time Stamping",NID_time_stamp,8,&(lvalues[681]),0},
 {"msCodeInd","Microsoft Individual Code Signing",NID_ms_code_ind,10,
-	&(lvalues[690]),0},
+	&(lvalues[689]),0},
 {"msCodeCom","Microsoft Commercial Code Signing",NID_ms_code_com,10,
-	&(lvalues[700]),0},
+	&(lvalues[699]),0},
 {"msCTLSign","Microsoft Trust List Signing",NID_ms_ctl_sign,10,
-	&(lvalues[710]),0},
-{"msSGC","Microsoft Server Gated Crypto",NID_ms_sgc,10,&(lvalues[720]),0},
+	&(lvalues[709]),0},
+{"msSGC","Microsoft Server Gated Crypto",NID_ms_sgc,10,&(lvalues[719]),0},
 {"msEFS","Microsoft Encrypted File System",NID_ms_efs,10,
-	&(lvalues[730]),0},
-{"nsSGC","Netscape Server Gated Crypto",NID_ns_sgc,9,&(lvalues[740]),0},
+	&(lvalues[729]),0},
+{"nsSGC","Netscape Server Gated Crypto",NID_ns_sgc,9,&(lvalues[739]),0},
 {"deltaCRL","X509v3 Delta CRL Indicator",NID_delta_crl,3,
-	&(lvalues[749]),0},
-{"CRLReason","X509v3 CRL Reason Code",NID_crl_reason,3,&(lvalues[752]),0},
+	&(lvalues[748]),0},
+{"CRLReason","X509v3 CRL Reason Code",NID_crl_reason,3,&(lvalues[751]),0},
 {"invalidityDate","Invalidity Date",NID_invalidity_date,3,
-	&(lvalues[755]),0},
-{"SXNetID","Strong Extranet ID",NID_sxnet,5,&(lvalues[758]),0},
+	&(lvalues[754]),0},
+{"SXNetID","Strong Extranet ID",NID_sxnet,5,&(lvalues[757]),0},
 {"PBE-SHA1-RC4-128","pbeWithSHA1And128BitRC4",
-	NID_pbe_WithSHA1And128BitRC4,10,&(lvalues[763]),0},
+	NID_pbe_WithSHA1And128BitRC4,10,&(lvalues[762]),0},
 {"PBE-SHA1-RC4-40","pbeWithSHA1And40BitRC4",
-	NID_pbe_WithSHA1And40BitRC4,10,&(lvalues[773]),0},
+	NID_pbe_WithSHA1And40BitRC4,10,&(lvalues[772]),0},
 {"PBE-SHA1-3DES","pbeWithSHA1And3-KeyTripleDES-CBC",
-	NID_pbe_WithSHA1And3_Key_TripleDES_CBC,10,&(lvalues[783]),0},
+	NID_pbe_WithSHA1And3_Key_TripleDES_CBC,10,&(lvalues[782]),0},
 {"PBE-SHA1-2DES","pbeWithSHA1And2-KeyTripleDES-CBC",
-	NID_pbe_WithSHA1And2_Key_TripleDES_CBC,10,&(lvalues[793]),0},
+	NID_pbe_WithSHA1And2_Key_TripleDES_CBC,10,&(lvalues[792]),0},
 {"PBE-SHA1-RC2-128","pbeWithSHA1And128BitRC2-CBC",
-	NID_pbe_WithSHA1And128BitRC2_CBC,10,&(lvalues[803]),0},
+	NID_pbe_WithSHA1And128BitRC2_CBC,10,&(lvalues[802]),0},
 {"PBE-SHA1-RC2-40","pbeWithSHA1And40BitRC2-CBC",
-	NID_pbe_WithSHA1And40BitRC2_CBC,10,&(lvalues[813]),0},
-{"keyBag","keyBag",NID_keyBag,11,&(lvalues[823]),0},
+	NID_pbe_WithSHA1And40BitRC2_CBC,10,&(lvalues[812]),0},
+{"keyBag","keyBag",NID_keyBag,11,&(lvalues[822]),0},
 {"pkcs8ShroudedKeyBag","pkcs8ShroudedKeyBag",NID_pkcs8ShroudedKeyBag,
-	11,&(lvalues[834]),0},
-{"certBag","certBag",NID_certBag,11,&(lvalues[845]),0},
-{"crlBag","crlBag",NID_crlBag,11,&(lvalues[856]),0},
-{"secretBag","secretBag",NID_secretBag,11,&(lvalues[867]),0},
+	11,&(lvalues[833]),0},
+{"certBag","certBag",NID_certBag,11,&(lvalues[844]),0},
+{"crlBag","crlBag",NID_crlBag,11,&(lvalues[855]),0},
+{"secretBag","secretBag",NID_secretBag,11,&(lvalues[866]),0},
 {"safeContentsBag","safeContentsBag",NID_safeContentsBag,11,
-	&(lvalues[878]),0},
-{"friendlyName","friendlyName",NID_friendlyName,9,&(lvalues[889]),0},
-{"localKeyID","localKeyID",NID_localKeyID,9,&(lvalues[898]),0},
+	&(lvalues[877]),0},
+{"friendlyName","friendlyName",NID_friendlyName,9,&(lvalues[888]),0},
+{"localKeyID","localKeyID",NID_localKeyID,9,&(lvalues[897]),0},
 {"x509Certificate","x509Certificate",NID_x509Certificate,10,
-	&(lvalues[907]),0},
+	&(lvalues[906]),0},
 {"sdsiCertificate","sdsiCertificate",NID_sdsiCertificate,10,
-	&(lvalues[917]),0},
-{"x509Crl","x509Crl",NID_x509Crl,10,&(lvalues[927]),0},
-{"PBES2","PBES2",NID_pbes2,9,&(lvalues[937]),0},
-{"PBMAC1","PBMAC1",NID_pbmac1,9,&(lvalues[946]),0},
-{"hmacWithSHA1","hmacWithSHA1",NID_hmacWithSHA1,8,&(lvalues[955]),0},
-{"id-qt-cps","Policy Qualifier CPS",NID_id_qt_cps,8,&(lvalues[963]),0},
+	&(lvalues[916]),0},
+{"x509Crl","x509Crl",NID_x509Crl,10,&(lvalues[926]),0},
+{"PBES2","PBES2",NID_pbes2,9,&(lvalues[936]),0},
+{"PBMAC1","PBMAC1",NID_pbmac1,9,&(lvalues[945]),0},
+{"hmacWithSHA1","hmacWithSHA1",NID_hmacWithSHA1,8,&(lvalues[954]),0},
+{"id-qt-cps","Policy Qualifier CPS",NID_id_qt_cps,8,&(lvalues[962]),0},
 {"id-qt-unotice","Policy Qualifier User Notice",NID_id_qt_unotice,8,
-	&(lvalues[971]),0},
+	&(lvalues[970]),0},
 {"RC2-64-CBC","rc2-64-cbc",NID_rc2_64_cbc,0,NULL,0},
 {"SMIME-CAPS","S/MIME Capabilities",NID_SMIMECapabilities,9,
-	&(lvalues[979]),0},
+	&(lvalues[978]),0},
 {"PBE-MD2-RC2-64","pbeWithMD2AndRC2-CBC",NID_pbeWithMD2AndRC2_CBC,9,
-	&(lvalues[988]),0},
+	&(lvalues[987]),0},
 {"PBE-MD5-RC2-64","pbeWithMD5AndRC2-CBC",NID_pbeWithMD5AndRC2_CBC,9,
-	&(lvalues[997]),0},
+	&(lvalues[996]),0},
 {"PBE-SHA1-DES","pbeWithSHA1AndDES-CBC",NID_pbeWithSHA1AndDES_CBC,9,
-	&(lvalues[1006]),0},
+	&(lvalues[1005]),0},
 {"msExtReq","Microsoft Extension Request",NID_ms_ext_req,10,
-	&(lvalues[1015]),0},
-{"extReq","Extension Request",NID_ext_req,9,&(lvalues[1025]),0},
-{"name","name",NID_name,3,&(lvalues[1034]),0},
-{"dnQualifier","dnQualifier",NID_dnQualifier,3,&(lvalues[1037]),0},
-{"id-pe","id-pe",NID_id_pe,7,&(lvalues[1040]),0},
-{"id-ad","id-ad",NID_id_ad,7,&(lvalues[1047]),0},
+	&(lvalues[1014]),0},
+{"extReq","Extension Request",NID_ext_req,9,&(lvalues[1024]),0},
+{"name","name",NID_name,3,&(lvalues[1033]),0},
+{"dnQualifier","dnQualifier",NID_dnQualifier,3,&(lvalues[1036]),0},
+{"id-pe","id-pe",NID_id_pe,7,&(lvalues[1039]),0},
+{"id-ad","id-ad",NID_id_ad,7,&(lvalues[1046]),0},
 {"authorityInfoAccess","Authority Information Access",NID_info_access,
-	8,&(lvalues[1054]),0},
-{"OCSP","OCSP",NID_ad_OCSP,8,&(lvalues[1062]),0},
-{"caIssuers","CA Issuers",NID_ad_ca_issuers,8,&(lvalues[1070]),0},
-{"OCSPSigning","OCSP Signing",NID_OCSP_sign,8,&(lvalues[1078]),0},
-{"ISO","iso",NID_iso,1,&(lvalues[1086]),0},
-{"member-body","ISO Member Body",NID_member_body,1,&(lvalues[1087]),0},
-{"ISO-US","ISO US Member Body",NID_ISO_US,3,&(lvalues[1088]),0},
-{"X9-57","X9.57",NID_X9_57,5,&(lvalues[1091]),0},
-{"X9cm","X9.57 CM ?",NID_X9cm,6,&(lvalues[1096]),0},
-{"pkcs1","pkcs1",NID_pkcs1,8,&(lvalues[1102]),0},
-{"pkcs5","pkcs5",NID_pkcs5,8,&(lvalues[1110]),0},
-{"SMIME","S/MIME",NID_SMIME,9,&(lvalues[1118]),0},
-{"id-smime-mod","id-smime-mod",NID_id_smime_mod,10,&(lvalues[1127]),0},
-{"id-smime-ct","id-smime-ct",NID_id_smime_ct,10,&(lvalues[1137]),0},
-{"id-smime-aa","id-smime-aa",NID_id_smime_aa,10,&(lvalues[1147]),0},
-{"id-smime-alg","id-smime-alg",NID_id_smime_alg,10,&(lvalues[1157]),0},
-{"id-smime-cd","id-smime-cd",NID_id_smime_cd,10,&(lvalues[1167]),0},
-{"id-smime-spq","id-smime-spq",NID_id_smime_spq,10,&(lvalues[1177]),0},
-{"id-smime-cti","id-smime-cti",NID_id_smime_cti,10,&(lvalues[1187]),0},
+	8,&(lvalues[1053]),0},
+{"OCSP","OCSP",NID_ad_OCSP,8,&(lvalues[1061]),0},
+{"caIssuers","CA Issuers",NID_ad_ca_issuers,8,&(lvalues[1069]),0},
+{"OCSPSigning","OCSP Signing",NID_OCSP_sign,8,&(lvalues[1077]),0},
+{"ISO","iso",NID_iso,0,NULL,0},
+{"member-body","ISO Member Body",NID_member_body,1,&(lvalues[1085]),0},
+{"ISO-US","ISO US Member Body",NID_ISO_US,3,&(lvalues[1086]),0},
+{"X9-57","X9.57",NID_X9_57,5,&(lvalues[1089]),0},
+{"X9cm","X9.57 CM ?",NID_X9cm,6,&(lvalues[1094]),0},
+{"pkcs1","pkcs1",NID_pkcs1,8,&(lvalues[1100]),0},
+{"pkcs5","pkcs5",NID_pkcs5,8,&(lvalues[1108]),0},
+{"SMIME","S/MIME",NID_SMIME,9,&(lvalues[1116]),0},
+{"id-smime-mod","id-smime-mod",NID_id_smime_mod,10,&(lvalues[1125]),0},
+{"id-smime-ct","id-smime-ct",NID_id_smime_ct,10,&(lvalues[1135]),0},
+{"id-smime-aa","id-smime-aa",NID_id_smime_aa,10,&(lvalues[1145]),0},
+{"id-smime-alg","id-smime-alg",NID_id_smime_alg,10,&(lvalues[1155]),0},
+{"id-smime-cd","id-smime-cd",NID_id_smime_cd,10,&(lvalues[1165]),0},
+{"id-smime-spq","id-smime-spq",NID_id_smime_spq,10,&(lvalues[1175]),0},
+{"id-smime-cti","id-smime-cti",NID_id_smime_cti,10,&(lvalues[1185]),0},
 {"id-smime-mod-cms","id-smime-mod-cms",NID_id_smime_mod_cms,11,
-	&(lvalues[1197]),0},
+	&(lvalues[1195]),0},
 {"id-smime-mod-ess","id-smime-mod-ess",NID_id_smime_mod_ess,11,
-	&(lvalues[1208]),0},
+	&(lvalues[1206]),0},
 {"id-smime-mod-oid","id-smime-mod-oid",NID_id_smime_mod_oid,11,
-	&(lvalues[1219]),0},
+	&(lvalues[1217]),0},
 {"id-smime-mod-msg-v3","id-smime-mod-msg-v3",NID_id_smime_mod_msg_v3,
-	11,&(lvalues[1230]),0},
+	11,&(lvalues[1228]),0},
 {"id-smime-mod-ets-eSignature-88","id-smime-mod-ets-eSignature-88",
-	NID_id_smime_mod_ets_eSignature_88,11,&(lvalues[1241]),0},
+	NID_id_smime_mod_ets_eSignature_88,11,&(lvalues[1239]),0},
 {"id-smime-mod-ets-eSignature-97","id-smime-mod-ets-eSignature-97",
-	NID_id_smime_mod_ets_eSignature_97,11,&(lvalues[1252]),0},
+	NID_id_smime_mod_ets_eSignature_97,11,&(lvalues[1250]),0},
 {"id-smime-mod-ets-eSigPolicy-88","id-smime-mod-ets-eSigPolicy-88",
-	NID_id_smime_mod_ets_eSigPolicy_88,11,&(lvalues[1263]),0},
+	NID_id_smime_mod_ets_eSigPolicy_88,11,&(lvalues[1261]),0},
 {"id-smime-mod-ets-eSigPolicy-97","id-smime-mod-ets-eSigPolicy-97",
-	NID_id_smime_mod_ets_eSigPolicy_97,11,&(lvalues[1274]),0},
+	NID_id_smime_mod_ets_eSigPolicy_97,11,&(lvalues[1272]),0},
 {"id-smime-ct-receipt","id-smime-ct-receipt",NID_id_smime_ct_receipt,
-	11,&(lvalues[1285]),0},
+	11,&(lvalues[1283]),0},
 {"id-smime-ct-authData","id-smime-ct-authData",
-	NID_id_smime_ct_authData,11,&(lvalues[1296]),0},
+	NID_id_smime_ct_authData,11,&(lvalues[1294]),0},
 {"id-smime-ct-publishCert","id-smime-ct-publishCert",
-	NID_id_smime_ct_publishCert,11,&(lvalues[1307]),0},
+	NID_id_smime_ct_publishCert,11,&(lvalues[1305]),0},
 {"id-smime-ct-TSTInfo","id-smime-ct-TSTInfo",NID_id_smime_ct_TSTInfo,
-	11,&(lvalues[1318]),0},
+	11,&(lvalues[1316]),0},
 {"id-smime-ct-TDTInfo","id-smime-ct-TDTInfo",NID_id_smime_ct_TDTInfo,
-	11,&(lvalues[1329]),0},
+	11,&(lvalues[1327]),0},
 {"id-smime-ct-contentInfo","id-smime-ct-contentInfo",
-	NID_id_smime_ct_contentInfo,11,&(lvalues[1340]),0},
+	NID_id_smime_ct_contentInfo,11,&(lvalues[1338]),0},
 {"id-smime-ct-DVCSRequestData","id-smime-ct-DVCSRequestData",
-	NID_id_smime_ct_DVCSRequestData,11,&(lvalues[1351]),0},
+	NID_id_smime_ct_DVCSRequestData,11,&(lvalues[1349]),0},
 {"id-smime-ct-DVCSResponseData","id-smime-ct-DVCSResponseData",
-	NID_id_smime_ct_DVCSResponseData,11,&(lvalues[1362]),0},
+	NID_id_smime_ct_DVCSResponseData,11,&(lvalues[1360]),0},
 {"id-smime-aa-receiptRequest","id-smime-aa-receiptRequest",
-	NID_id_smime_aa_receiptRequest,11,&(lvalues[1373]),0},
+	NID_id_smime_aa_receiptRequest,11,&(lvalues[1371]),0},
 {"id-smime-aa-securityLabel","id-smime-aa-securityLabel",
-	NID_id_smime_aa_securityLabel,11,&(lvalues[1384]),0},
+	NID_id_smime_aa_securityLabel,11,&(lvalues[1382]),0},
 {"id-smime-aa-mlExpandHistory","id-smime-aa-mlExpandHistory",
-	NID_id_smime_aa_mlExpandHistory,11,&(lvalues[1395]),0},
+	NID_id_smime_aa_mlExpandHistory,11,&(lvalues[1393]),0},
 {"id-smime-aa-contentHint","id-smime-aa-contentHint",
-	NID_id_smime_aa_contentHint,11,&(lvalues[1406]),0},
+	NID_id_smime_aa_contentHint,11,&(lvalues[1404]),0},
 {"id-smime-aa-msgSigDigest","id-smime-aa-msgSigDigest",
-	NID_id_smime_aa_msgSigDigest,11,&(lvalues[1417]),0},
+	NID_id_smime_aa_msgSigDigest,11,&(lvalues[1415]),0},
 {"id-smime-aa-encapContentType","id-smime-aa-encapContentType",
-	NID_id_smime_aa_encapContentType,11,&(lvalues[1428]),0},
+	NID_id_smime_aa_encapContentType,11,&(lvalues[1426]),0},
 {"id-smime-aa-contentIdentifier","id-smime-aa-contentIdentifier",
-	NID_id_smime_aa_contentIdentifier,11,&(lvalues[1439]),0},
+	NID_id_smime_aa_contentIdentifier,11,&(lvalues[1437]),0},
 {"id-smime-aa-macValue","id-smime-aa-macValue",
-	NID_id_smime_aa_macValue,11,&(lvalues[1450]),0},
+	NID_id_smime_aa_macValue,11,&(lvalues[1448]),0},
 {"id-smime-aa-equivalentLabels","id-smime-aa-equivalentLabels",
-	NID_id_smime_aa_equivalentLabels,11,&(lvalues[1461]),0},
+	NID_id_smime_aa_equivalentLabels,11,&(lvalues[1459]),0},
 {"id-smime-aa-contentReference","id-smime-aa-contentReference",
-	NID_id_smime_aa_contentReference,11,&(lvalues[1472]),0},
+	NID_id_smime_aa_contentReference,11,&(lvalues[1470]),0},
 {"id-smime-aa-encrypKeyPref","id-smime-aa-encrypKeyPref",
-	NID_id_smime_aa_encrypKeyPref,11,&(lvalues[1483]),0},
+	NID_id_smime_aa_encrypKeyPref,11,&(lvalues[1481]),0},
 {"id-smime-aa-signingCertificate","id-smime-aa-signingCertificate",
-	NID_id_smime_aa_signingCertificate,11,&(lvalues[1494]),0},
+	NID_id_smime_aa_signingCertificate,11,&(lvalues[1492]),0},
 {"id-smime-aa-smimeEncryptCerts","id-smime-aa-smimeEncryptCerts",
-	NID_id_smime_aa_smimeEncryptCerts,11,&(lvalues[1505]),0},
+	NID_id_smime_aa_smimeEncryptCerts,11,&(lvalues[1503]),0},
 {"id-smime-aa-timeStampToken","id-smime-aa-timeStampToken",
-	NID_id_smime_aa_timeStampToken,11,&(lvalues[1516]),0},
+	NID_id_smime_aa_timeStampToken,11,&(lvalues[1514]),0},
 {"id-smime-aa-ets-sigPolicyId","id-smime-aa-ets-sigPolicyId",
-	NID_id_smime_aa_ets_sigPolicyId,11,&(lvalues[1527]),0},
+	NID_id_smime_aa_ets_sigPolicyId,11,&(lvalues[1525]),0},
 {"id-smime-aa-ets-commitmentType","id-smime-aa-ets-commitmentType",
-	NID_id_smime_aa_ets_commitmentType,11,&(lvalues[1538]),0},
+	NID_id_smime_aa_ets_commitmentType,11,&(lvalues[1536]),0},
 {"id-smime-aa-ets-signerLocation","id-smime-aa-ets-signerLocation",
-	NID_id_smime_aa_ets_signerLocation,11,&(lvalues[1549]),0},
+	NID_id_smime_aa_ets_signerLocation,11,&(lvalues[1547]),0},
 {"id-smime-aa-ets-signerAttr","id-smime-aa-ets-signerAttr",
-	NID_id_smime_aa_ets_signerAttr,11,&(lvalues[1560]),0},
+	NID_id_smime_aa_ets_signerAttr,11,&(lvalues[1558]),0},
 {"id-smime-aa-ets-otherSigCert","id-smime-aa-ets-otherSigCert",
-	NID_id_smime_aa_ets_otherSigCert,11,&(lvalues[1571]),0},
+	NID_id_smime_aa_ets_otherSigCert,11,&(lvalues[1569]),0},
 {"id-smime-aa-ets-contentTimestamp",
 	"id-smime-aa-ets-contentTimestamp",
-	NID_id_smime_aa_ets_contentTimestamp,11,&(lvalues[1582]),0},
+	NID_id_smime_aa_ets_contentTimestamp,11,&(lvalues[1580]),0},
 {"id-smime-aa-ets-CertificateRefs","id-smime-aa-ets-CertificateRefs",
-	NID_id_smime_aa_ets_CertificateRefs,11,&(lvalues[1593]),0},
+	NID_id_smime_aa_ets_CertificateRefs,11,&(lvalues[1591]),0},
 {"id-smime-aa-ets-RevocationRefs","id-smime-aa-ets-RevocationRefs",
-	NID_id_smime_aa_ets_RevocationRefs,11,&(lvalues[1604]),0},
+	NID_id_smime_aa_ets_RevocationRefs,11,&(lvalues[1602]),0},
 {"id-smime-aa-ets-certValues","id-smime-aa-ets-certValues",
-	NID_id_smime_aa_ets_certValues,11,&(lvalues[1615]),0},
+	NID_id_smime_aa_ets_certValues,11,&(lvalues[1613]),0},
 {"id-smime-aa-ets-revocationValues",
 	"id-smime-aa-ets-revocationValues",
-	NID_id_smime_aa_ets_revocationValues,11,&(lvalues[1626]),0},
+	NID_id_smime_aa_ets_revocationValues,11,&(lvalues[1624]),0},
 {"id-smime-aa-ets-escTimeStamp","id-smime-aa-ets-escTimeStamp",
-	NID_id_smime_aa_ets_escTimeStamp,11,&(lvalues[1637]),0},
+	NID_id_smime_aa_ets_escTimeStamp,11,&(lvalues[1635]),0},
 {"id-smime-aa-ets-certCRLTimestamp",
 	"id-smime-aa-ets-certCRLTimestamp",
-	NID_id_smime_aa_ets_certCRLTimestamp,11,&(lvalues[1648]),0},
+	NID_id_smime_aa_ets_certCRLTimestamp,11,&(lvalues[1646]),0},
 {"id-smime-aa-ets-archiveTimeStamp",
 	"id-smime-aa-ets-archiveTimeStamp",
-	NID_id_smime_aa_ets_archiveTimeStamp,11,&(lvalues[1659]),0},
+	NID_id_smime_aa_ets_archiveTimeStamp,11,&(lvalues[1657]),0},
 {"id-smime-aa-signatureType","id-smime-aa-signatureType",
-	NID_id_smime_aa_signatureType,11,&(lvalues[1670]),0},
+	NID_id_smime_aa_signatureType,11,&(lvalues[1668]),0},
 {"id-smime-aa-dvcs-dvc","id-smime-aa-dvcs-dvc",
-	NID_id_smime_aa_dvcs_dvc,11,&(lvalues[1681]),0},
+	NID_id_smime_aa_dvcs_dvc,11,&(lvalues[1679]),0},
 {"id-smime-alg-ESDHwith3DES","id-smime-alg-ESDHwith3DES",
-	NID_id_smime_alg_ESDHwith3DES,11,&(lvalues[1692]),0},
+	NID_id_smime_alg_ESDHwith3DES,11,&(lvalues[1690]),0},
 {"id-smime-alg-ESDHwithRC2","id-smime-alg-ESDHwithRC2",
-	NID_id_smime_alg_ESDHwithRC2,11,&(lvalues[1703]),0},
+	NID_id_smime_alg_ESDHwithRC2,11,&(lvalues[1701]),0},
 {"id-smime-alg-3DESwrap","id-smime-alg-3DESwrap",
-	NID_id_smime_alg_3DESwrap,11,&(lvalues[1714]),0},
+	NID_id_smime_alg_3DESwrap,11,&(lvalues[1712]),0},
 {"id-smime-alg-RC2wrap","id-smime-alg-RC2wrap",
-	NID_id_smime_alg_RC2wrap,11,&(lvalues[1725]),0},
+	NID_id_smime_alg_RC2wrap,11,&(lvalues[1723]),0},
 {"id-smime-alg-ESDH","id-smime-alg-ESDH",NID_id_smime_alg_ESDH,11,
-	&(lvalues[1736]),0},
+	&(lvalues[1734]),0},
 {"id-smime-alg-CMS3DESwrap","id-smime-alg-CMS3DESwrap",
-	NID_id_smime_alg_CMS3DESwrap,11,&(lvalues[1747]),0},
+	NID_id_smime_alg_CMS3DESwrap,11,&(lvalues[1745]),0},
 {"id-smime-alg-CMSRC2wrap","id-smime-alg-CMSRC2wrap",
-	NID_id_smime_alg_CMSRC2wrap,11,&(lvalues[1758]),0},
+	NID_id_smime_alg_CMSRC2wrap,11,&(lvalues[1756]),0},
 {"id-smime-cd-ldap","id-smime-cd-ldap",NID_id_smime_cd_ldap,11,
-	&(lvalues[1769]),0},
+	&(lvalues[1767]),0},
 {"id-smime-spq-ets-sqt-uri","id-smime-spq-ets-sqt-uri",
-	NID_id_smime_spq_ets_sqt_uri,11,&(lvalues[1780]),0},
+	NID_id_smime_spq_ets_sqt_uri,11,&(lvalues[1778]),0},
 {"id-smime-spq-ets-sqt-unotice","id-smime-spq-ets-sqt-unotice",
-	NID_id_smime_spq_ets_sqt_unotice,11,&(lvalues[1791]),0},
+	NID_id_smime_spq_ets_sqt_unotice,11,&(lvalues[1789]),0},
 {"id-smime-cti-ets-proofOfOrigin","id-smime-cti-ets-proofOfOrigin",
-	NID_id_smime_cti_ets_proofOfOrigin,11,&(lvalues[1802]),0},
+	NID_id_smime_cti_ets_proofOfOrigin,11,&(lvalues[1800]),0},
 {"id-smime-cti-ets-proofOfReceipt","id-smime-cti-ets-proofOfReceipt",
-	NID_id_smime_cti_ets_proofOfReceipt,11,&(lvalues[1813]),0},
+	NID_id_smime_cti_ets_proofOfReceipt,11,&(lvalues[1811]),0},
 {"id-smime-cti-ets-proofOfDelivery",
 	"id-smime-cti-ets-proofOfDelivery",
-	NID_id_smime_cti_ets_proofOfDelivery,11,&(lvalues[1824]),0},
+	NID_id_smime_cti_ets_proofOfDelivery,11,&(lvalues[1822]),0},
 {"id-smime-cti-ets-proofOfSender","id-smime-cti-ets-proofOfSender",
-	NID_id_smime_cti_ets_proofOfSender,11,&(lvalues[1835]),0},
+	NID_id_smime_cti_ets_proofOfSender,11,&(lvalues[1833]),0},
 {"id-smime-cti-ets-proofOfApproval",
 	"id-smime-cti-ets-proofOfApproval",
-	NID_id_smime_cti_ets_proofOfApproval,11,&(lvalues[1846]),0},
+	NID_id_smime_cti_ets_proofOfApproval,11,&(lvalues[1844]),0},
 {"id-smime-cti-ets-proofOfCreation",
 	"id-smime-cti-ets-proofOfCreation",
-	NID_id_smime_cti_ets_proofOfCreation,11,&(lvalues[1857]),0},
-{"MD4","md4",NID_md4,8,&(lvalues[1868]),0},
-{"id-pkix-mod","id-pkix-mod",NID_id_pkix_mod,7,&(lvalues[1876]),0},
-{"id-qt","id-qt",NID_id_qt,7,&(lvalues[1883]),0},
-{"id-it","id-it",NID_id_it,7,&(lvalues[1890]),0},
-{"id-pkip","id-pkip",NID_id_pkip,7,&(lvalues[1897]),0},
-{"id-alg","id-alg",NID_id_alg,7,&(lvalues[1904]),0},
-{"id-cmc","id-cmc",NID_id_cmc,7,&(lvalues[1911]),0},
-{"id-on","id-on",NID_id_on,7,&(lvalues[1918]),0},
-{"id-pda","id-pda",NID_id_pda,7,&(lvalues[1925]),0},
-{"id-aca","id-aca",NID_id_aca,7,&(lvalues[1932]),0},
-{"id-qcs","id-qcs",NID_id_qcs,7,&(lvalues[1939]),0},
-{"id-cct","id-cct",NID_id_cct,7,&(lvalues[1946]),0},
+	NID_id_smime_cti_ets_proofOfCreation,11,&(lvalues[1855]),0},
+{"MD4","md4",NID_md4,8,&(lvalues[1866]),0},
+{"id-pkix-mod","id-pkix-mod",NID_id_pkix_mod,7,&(lvalues[1874]),0},
+{"id-qt","id-qt",NID_id_qt,7,&(lvalues[1881]),0},
+{"id-it","id-it",NID_id_it,7,&(lvalues[1888]),0},
+{"id-pkip","id-pkip",NID_id_pkip,7,&(lvalues[1895]),0},
+{"id-alg","id-alg",NID_id_alg,7,&(lvalues[1902]),0},
+{"id-cmc","id-cmc",NID_id_cmc,7,&(lvalues[1909]),0},
+{"id-on","id-on",NID_id_on,7,&(lvalues[1916]),0},
+{"id-pda","id-pda",NID_id_pda,7,&(lvalues[1923]),0},
+{"id-aca","id-aca",NID_id_aca,7,&(lvalues[1930]),0},
+{"id-qcs","id-qcs",NID_id_qcs,7,&(lvalues[1937]),0},
+{"id-cct","id-cct",NID_id_cct,7,&(lvalues[1944]),0},
 {"id-pkix1-explicit-88","id-pkix1-explicit-88",
-	NID_id_pkix1_explicit_88,8,&(lvalues[1953]),0},
+	NID_id_pkix1_explicit_88,8,&(lvalues[1951]),0},
 {"id-pkix1-implicit-88","id-pkix1-implicit-88",
-	NID_id_pkix1_implicit_88,8,&(lvalues[1961]),0},
+	NID_id_pkix1_implicit_88,8,&(lvalues[1959]),0},
 {"id-pkix1-explicit-93","id-pkix1-explicit-93",
-	NID_id_pkix1_explicit_93,8,&(lvalues[1969]),0},
+	NID_id_pkix1_explicit_93,8,&(lvalues[1967]),0},
 {"id-pkix1-implicit-93","id-pkix1-implicit-93",
-	NID_id_pkix1_implicit_93,8,&(lvalues[1977]),0},
-{"id-mod-crmf","id-mod-crmf",NID_id_mod_crmf,8,&(lvalues[1985]),0},
-{"id-mod-cmc","id-mod-cmc",NID_id_mod_cmc,8,&(lvalues[1993]),0},
+	NID_id_pkix1_implicit_93,8,&(lvalues[1975]),0},
+{"id-mod-crmf","id-mod-crmf",NID_id_mod_crmf,8,&(lvalues[1983]),0},
+{"id-mod-cmc","id-mod-cmc",NID_id_mod_cmc,8,&(lvalues[1991]),0},
 {"id-mod-kea-profile-88","id-mod-kea-profile-88",
-	NID_id_mod_kea_profile_88,8,&(lvalues[2001]),0},
+	NID_id_mod_kea_profile_88,8,&(lvalues[1999]),0},
 {"id-mod-kea-profile-93","id-mod-kea-profile-93",
-	NID_id_mod_kea_profile_93,8,&(lvalues[2009]),0},
-{"id-mod-cmp","id-mod-cmp",NID_id_mod_cmp,8,&(lvalues[2017]),0},
+	NID_id_mod_kea_profile_93,8,&(lvalues[2007]),0},
+{"id-mod-cmp","id-mod-cmp",NID_id_mod_cmp,8,&(lvalues[2015]),0},
 {"id-mod-qualified-cert-88","id-mod-qualified-cert-88",
-	NID_id_mod_qualified_cert_88,8,&(lvalues[2025]),0},
+	NID_id_mod_qualified_cert_88,8,&(lvalues[2023]),0},
 {"id-mod-qualified-cert-93","id-mod-qualified-cert-93",
-	NID_id_mod_qualified_cert_93,8,&(lvalues[2033]),0},
+	NID_id_mod_qualified_cert_93,8,&(lvalues[2031]),0},
 {"id-mod-attribute-cert","id-mod-attribute-cert",
-	NID_id_mod_attribute_cert,8,&(lvalues[2041]),0},
+	NID_id_mod_attribute_cert,8,&(lvalues[2039]),0},
 {"id-mod-timestamp-protocol","id-mod-timestamp-protocol",
-	NID_id_mod_timestamp_protocol,8,&(lvalues[2049]),0},
-{"id-mod-ocsp","id-mod-ocsp",NID_id_mod_ocsp,8,&(lvalues[2057]),0},
-{"id-mod-dvcs","id-mod-dvcs",NID_id_mod_dvcs,8,&(lvalues[2065]),0},
+	NID_id_mod_timestamp_protocol,8,&(lvalues[2047]),0},
+{"id-mod-ocsp","id-mod-ocsp",NID_id_mod_ocsp,8,&(lvalues[2055]),0},
+{"id-mod-dvcs","id-mod-dvcs",NID_id_mod_dvcs,8,&(lvalues[2063]),0},
 {"id-mod-cmp2000","id-mod-cmp2000",NID_id_mod_cmp2000,8,
-	&(lvalues[2073]),0},
-{"biometricInfo","Biometric Info",NID_biometricInfo,8,&(lvalues[2081]),0},
-{"qcStatements","qcStatements",NID_qcStatements,8,&(lvalues[2089]),0},
+	&(lvalues[2071]),0},
+{"biometricInfo","Biometric Info",NID_biometricInfo,8,&(lvalues[2079]),0},
+{"qcStatements","qcStatements",NID_qcStatements,8,&(lvalues[2087]),0},
 {"ac-auditEntity","ac-auditEntity",NID_ac_auditEntity,8,
-	&(lvalues[2097]),0},
-{"ac-targeting","ac-targeting",NID_ac_targeting,8,&(lvalues[2105]),0},
-{"aaControls","aaControls",NID_aaControls,8,&(lvalues[2113]),0},
+	&(lvalues[2095]),0},
+{"ac-targeting","ac-targeting",NID_ac_targeting,8,&(lvalues[2103]),0},
+{"aaControls","aaControls",NID_aaControls,8,&(lvalues[2111]),0},
 {"sbgp-ipAddrBlock","sbgp-ipAddrBlock",NID_sbgp_ipAddrBlock,8,
-	&(lvalues[2121]),0},
+	&(lvalues[2119]),0},
 {"sbgp-autonomousSysNum","sbgp-autonomousSysNum",
-	NID_sbgp_autonomousSysNum,8,&(lvalues[2129]),0},
+	NID_sbgp_autonomousSysNum,8,&(lvalues[2127]),0},
 {"sbgp-routerIdentifier","sbgp-routerIdentifier",
-	NID_sbgp_routerIdentifier,8,&(lvalues[2137]),0},
-{"textNotice","textNotice",NID_textNotice,8,&(lvalues[2145]),0},
+	NID_sbgp_routerIdentifier,8,&(lvalues[2135]),0},
+{"textNotice","textNotice",NID_textNotice,8,&(lvalues[2143]),0},
 {"ipsecEndSystem","IPSec End System",NID_ipsecEndSystem,8,
-	&(lvalues[2153]),0},
-{"ipsecTunnel","IPSec Tunnel",NID_ipsecTunnel,8,&(lvalues[2161]),0},
-{"ipsecUser","IPSec User",NID_ipsecUser,8,&(lvalues[2169]),0},
-{"DVCS","dvcs",NID_dvcs,8,&(lvalues[2177]),0},
+	&(lvalues[2151]),0},
+{"ipsecTunnel","IPSec Tunnel",NID_ipsecTunnel,8,&(lvalues[2159]),0},
+{"ipsecUser","IPSec User",NID_ipsecUser,8,&(lvalues[2167]),0},
+{"DVCS","dvcs",NID_dvcs,8,&(lvalues[2175]),0},
 {"id-it-caProtEncCert","id-it-caProtEncCert",NID_id_it_caProtEncCert,
-	8,&(lvalues[2185]),0},
+	8,&(lvalues[2183]),0},
 {"id-it-signKeyPairTypes","id-it-signKeyPairTypes",
-	NID_id_it_signKeyPairTypes,8,&(lvalues[2193]),0},
+	NID_id_it_signKeyPairTypes,8,&(lvalues[2191]),0},
 {"id-it-encKeyPairTypes","id-it-encKeyPairTypes",
-	NID_id_it_encKeyPairTypes,8,&(lvalues[2201]),0},
+	NID_id_it_encKeyPairTypes,8,&(lvalues[2199]),0},
 {"id-it-preferredSymmAlg","id-it-preferredSymmAlg",
-	NID_id_it_preferredSymmAlg,8,&(lvalues[2209]),0},
+	NID_id_it_preferredSymmAlg,8,&(lvalues[2207]),0},
 {"id-it-caKeyUpdateInfo","id-it-caKeyUpdateInfo",
-	NID_id_it_caKeyUpdateInfo,8,&(lvalues[2217]),0},
+	NID_id_it_caKeyUpdateInfo,8,&(lvalues[2215]),0},
 {"id-it-currentCRL","id-it-currentCRL",NID_id_it_currentCRL,8,
-	&(lvalues[2225]),0},
+	&(lvalues[2223]),0},
 {"id-it-unsupportedOIDs","id-it-unsupportedOIDs",
-	NID_id_it_unsupportedOIDs,8,&(lvalues[2233]),0},
+	NID_id_it_unsupportedOIDs,8,&(lvalues[2231]),0},
 {"id-it-subscriptionRequest","id-it-subscriptionRequest",
-	NID_id_it_subscriptionRequest,8,&(lvalues[2241]),0},
+	NID_id_it_subscriptionRequest,8,&(lvalues[2239]),0},
 {"id-it-subscriptionResponse","id-it-subscriptionResponse",
-	NID_id_it_subscriptionResponse,8,&(lvalues[2249]),0},
+	NID_id_it_subscriptionResponse,8,&(lvalues[2247]),0},
 {"id-it-keyPairParamReq","id-it-keyPairParamReq",
-	NID_id_it_keyPairParamReq,8,&(lvalues[2257]),0},
+	NID_id_it_keyPairParamReq,8,&(lvalues[2255]),0},
 {"id-it-keyPairParamRep","id-it-keyPairParamRep",
-	NID_id_it_keyPairParamRep,8,&(lvalues[2265]),0},
+	NID_id_it_keyPairParamRep,8,&(lvalues[2263]),0},
 {"id-it-revPassphrase","id-it-revPassphrase",NID_id_it_revPassphrase,
-	8,&(lvalues[2273]),0},
+	8,&(lvalues[2271]),0},
 {"id-it-implicitConfirm","id-it-implicitConfirm",
-	NID_id_it_implicitConfirm,8,&(lvalues[2281]),0},
+	NID_id_it_implicitConfirm,8,&(lvalues[2279]),0},
 {"id-it-confirmWaitTime","id-it-confirmWaitTime",
-	NID_id_it_confirmWaitTime,8,&(lvalues[2289]),0},
+	NID_id_it_confirmWaitTime,8,&(lvalues[2287]),0},
 {"id-it-origPKIMessage","id-it-origPKIMessage",
-	NID_id_it_origPKIMessage,8,&(lvalues[2297]),0},
-{"id-regCtrl","id-regCtrl",NID_id_regCtrl,8,&(lvalues[2305]),0},
-{"id-regInfo","id-regInfo",NID_id_regInfo,8,&(lvalues[2313]),0},
+	NID_id_it_origPKIMessage,8,&(lvalues[2295]),0},
+{"id-regCtrl","id-regCtrl",NID_id_regCtrl,8,&(lvalues[2303]),0},
+{"id-regInfo","id-regInfo",NID_id_regInfo,8,&(lvalues[2311]),0},
 {"id-regCtrl-regToken","id-regCtrl-regToken",NID_id_regCtrl_regToken,
-	9,&(lvalues[2321]),0},
+	9,&(lvalues[2319]),0},
 {"id-regCtrl-authenticator","id-regCtrl-authenticator",
-	NID_id_regCtrl_authenticator,9,&(lvalues[2330]),0},
+	NID_id_regCtrl_authenticator,9,&(lvalues[2328]),0},
 {"id-regCtrl-pkiPublicationInfo","id-regCtrl-pkiPublicationInfo",
-	NID_id_regCtrl_pkiPublicationInfo,9,&(lvalues[2339]),0},
+	NID_id_regCtrl_pkiPublicationInfo,9,&(lvalues[2337]),0},
 {"id-regCtrl-pkiArchiveOptions","id-regCtrl-pkiArchiveOptions",
-	NID_id_regCtrl_pkiArchiveOptions,9,&(lvalues[2348]),0},
+	NID_id_regCtrl_pkiArchiveOptions,9,&(lvalues[2346]),0},
 {"id-regCtrl-oldCertID","id-regCtrl-oldCertID",
-	NID_id_regCtrl_oldCertID,9,&(lvalues[2357]),0},
+	NID_id_regCtrl_oldCertID,9,&(lvalues[2355]),0},
 {"id-regCtrl-protocolEncrKey","id-regCtrl-protocolEncrKey",
-	NID_id_regCtrl_protocolEncrKey,9,&(lvalues[2366]),0},
+	NID_id_regCtrl_protocolEncrKey,9,&(lvalues[2364]),0},
 {"id-regInfo-utf8Pairs","id-regInfo-utf8Pairs",
-	NID_id_regInfo_utf8Pairs,9,&(lvalues[2375]),0},
+	NID_id_regInfo_utf8Pairs,9,&(lvalues[2373]),0},
 {"id-regInfo-certReq","id-regInfo-certReq",NID_id_regInfo_certReq,9,
-	&(lvalues[2384]),0},
-{"id-alg-des40","id-alg-des40",NID_id_alg_des40,8,&(lvalues[2393]),0},
+	&(lvalues[2382]),0},
+{"id-alg-des40","id-alg-des40",NID_id_alg_des40,8,&(lvalues[2391]),0},
 {"id-alg-noSignature","id-alg-noSignature",NID_id_alg_noSignature,8,
-	&(lvalues[2401]),0},
+	&(lvalues[2399]),0},
 {"id-alg-dh-sig-hmac-sha1","id-alg-dh-sig-hmac-sha1",
-	NID_id_alg_dh_sig_hmac_sha1,8,&(lvalues[2409]),0},
-{"id-alg-dh-pop","id-alg-dh-pop",NID_id_alg_dh_pop,8,&(lvalues[2417]),0},
+	NID_id_alg_dh_sig_hmac_sha1,8,&(lvalues[2407]),0},
+{"id-alg-dh-pop","id-alg-dh-pop",NID_id_alg_dh_pop,8,&(lvalues[2415]),0},
 {"id-cmc-statusInfo","id-cmc-statusInfo",NID_id_cmc_statusInfo,8,
-	&(lvalues[2425]),0},
+	&(lvalues[2423]),0},
 {"id-cmc-identification","id-cmc-identification",
-	NID_id_cmc_identification,8,&(lvalues[2433]),0},
+	NID_id_cmc_identification,8,&(lvalues[2431]),0},
 {"id-cmc-identityProof","id-cmc-identityProof",
-	NID_id_cmc_identityProof,8,&(lvalues[2441]),0},
+	NID_id_cmc_identityProof,8,&(lvalues[2439]),0},
 {"id-cmc-dataReturn","id-cmc-dataReturn",NID_id_cmc_dataReturn,8,
-	&(lvalues[2449]),0},
+	&(lvalues[2447]),0},
 {"id-cmc-transactionId","id-cmc-transactionId",
-	NID_id_cmc_transactionId,8,&(lvalues[2457]),0},
+	NID_id_cmc_transactionId,8,&(lvalues[2455]),0},
 {"id-cmc-senderNonce","id-cmc-senderNonce",NID_id_cmc_senderNonce,8,
-	&(lvalues[2465]),0},
+	&(lvalues[2463]),0},
 {"id-cmc-recipientNonce","id-cmc-recipientNonce",
-	NID_id_cmc_recipientNonce,8,&(lvalues[2473]),0},
+	NID_id_cmc_recipientNonce,8,&(lvalues[2471]),0},
 {"id-cmc-addExtensions","id-cmc-addExtensions",
-	NID_id_cmc_addExtensions,8,&(lvalues[2481]),0},
+	NID_id_cmc_addExtensions,8,&(lvalues[2479]),0},
 {"id-cmc-encryptedPOP","id-cmc-encryptedPOP",NID_id_cmc_encryptedPOP,
-	8,&(lvalues[2489]),0},
+	8,&(lvalues[2487]),0},
 {"id-cmc-decryptedPOP","id-cmc-decryptedPOP",NID_id_cmc_decryptedPOP,
-	8,&(lvalues[2497]),0},
+	8,&(lvalues[2495]),0},
 {"id-cmc-lraPOPWitness","id-cmc-lraPOPWitness",
-	NID_id_cmc_lraPOPWitness,8,&(lvalues[2505]),0},
+	NID_id_cmc_lraPOPWitness,8,&(lvalues[2503]),0},
 {"id-cmc-getCert","id-cmc-getCert",NID_id_cmc_getCert,8,
-	&(lvalues[2513]),0},
-{"id-cmc-getCRL","id-cmc-getCRL",NID_id_cmc_getCRL,8,&(lvalues[2521]),0},
+	&(lvalues[2511]),0},
+{"id-cmc-getCRL","id-cmc-getCRL",NID_id_cmc_getCRL,8,&(lvalues[2519]),0},
 {"id-cmc-revokeRequest","id-cmc-revokeRequest",
-	NID_id_cmc_revokeRequest,8,&(lvalues[2529]),0},
+	NID_id_cmc_revokeRequest,8,&(lvalues[2527]),0},
 {"id-cmc-regInfo","id-cmc-regInfo",NID_id_cmc_regInfo,8,
-	&(lvalues[2537]),0},
+	&(lvalues[2535]),0},
 {"id-cmc-responseInfo","id-cmc-responseInfo",NID_id_cmc_responseInfo,
-	8,&(lvalues[2545]),0},
+	8,&(lvalues[2543]),0},
 {"id-cmc-queryPending","id-cmc-queryPending",NID_id_cmc_queryPending,
-	8,&(lvalues[2553]),0},
+	8,&(lvalues[2551]),0},
 {"id-cmc-popLinkRandom","id-cmc-popLinkRandom",
-	NID_id_cmc_popLinkRandom,8,&(lvalues[2561]),0},
+	NID_id_cmc_popLinkRandom,8,&(lvalues[2559]),0},
 {"id-cmc-popLinkWitness","id-cmc-popLinkWitness",
-	NID_id_cmc_popLinkWitness,8,&(lvalues[2569]),0},
+	NID_id_cmc_popLinkWitness,8,&(lvalues[2567]),0},
 {"id-cmc-confirmCertAcceptance","id-cmc-confirmCertAcceptance",
-	NID_id_cmc_confirmCertAcceptance,8,&(lvalues[2577]),0},
+	NID_id_cmc_confirmCertAcceptance,8,&(lvalues[2575]),0},
 {"id-on-personalData","id-on-personalData",NID_id_on_personalData,8,
-	&(lvalues[2585]),0},
+	&(lvalues[2583]),0},
 {"id-pda-dateOfBirth","id-pda-dateOfBirth",NID_id_pda_dateOfBirth,8,
-	&(lvalues[2593]),0},
+	&(lvalues[2591]),0},
 {"id-pda-placeOfBirth","id-pda-placeOfBirth",NID_id_pda_placeOfBirth,
-	8,&(lvalues[2601]),0},
+	8,&(lvalues[2599]),0},
 {NULL,NULL,NID_undef,0,NULL,0},
-{"id-pda-gender","id-pda-gender",NID_id_pda_gender,8,&(lvalues[2609]),0},
+{"id-pda-gender","id-pda-gender",NID_id_pda_gender,8,&(lvalues[2607]),0},
 {"id-pda-countryOfCitizenship","id-pda-countryOfCitizenship",
-	NID_id_pda_countryOfCitizenship,8,&(lvalues[2617]),0},
+	NID_id_pda_countryOfCitizenship,8,&(lvalues[2615]),0},
 {"id-pda-countryOfResidence","id-pda-countryOfResidence",
-	NID_id_pda_countryOfResidence,8,&(lvalues[2625]),0},
+	NID_id_pda_countryOfResidence,8,&(lvalues[2623]),0},
 {"id-aca-authenticationInfo","id-aca-authenticationInfo",
-	NID_id_aca_authenticationInfo,8,&(lvalues[2633]),0},
+	NID_id_aca_authenticationInfo,8,&(lvalues[2631]),0},
 {"id-aca-accessIdentity","id-aca-accessIdentity",
-	NID_id_aca_accessIdentity,8,&(lvalues[2641]),0},
+	NID_id_aca_accessIdentity,8,&(lvalues[2639]),0},
 {"id-aca-chargingIdentity","id-aca-chargingIdentity",
-	NID_id_aca_chargingIdentity,8,&(lvalues[2649]),0},
-{"id-aca-group","id-aca-group",NID_id_aca_group,8,&(lvalues[2657]),0},
-{"id-aca-role","id-aca-role",NID_id_aca_role,8,&(lvalues[2665]),0},
+	NID_id_aca_chargingIdentity,8,&(lvalues[2647]),0},
+{"id-aca-group","id-aca-group",NID_id_aca_group,8,&(lvalues[2655]),0},
+{"id-aca-role","id-aca-role",NID_id_aca_role,8,&(lvalues[2663]),0},
 {"id-qcs-pkixQCSyntax-v1","id-qcs-pkixQCSyntax-v1",
-	NID_id_qcs_pkixQCSyntax_v1,8,&(lvalues[2673]),0},
-{"id-cct-crs","id-cct-crs",NID_id_cct_crs,8,&(lvalues[2681]),0},
+	NID_id_qcs_pkixQCSyntax_v1,8,&(lvalues[2671]),0},
+{"id-cct-crs","id-cct-crs",NID_id_cct_crs,8,&(lvalues[2679]),0},
 {"id-cct-PKIData","id-cct-PKIData",NID_id_cct_PKIData,8,
-	&(lvalues[2689]),0},
+	&(lvalues[2687]),0},
 {"id-cct-PKIResponse","id-cct-PKIResponse",NID_id_cct_PKIResponse,8,
-	&(lvalues[2697]),0},
+	&(lvalues[2695]),0},
 {"ad_timestamping","AD Time Stamping",NID_ad_timeStamping,8,
-	&(lvalues[2705]),0},
-{"AD_DVCS","ad dvcs",NID_ad_dvcs,8,&(lvalues[2713]),0},
+	&(lvalues[2703]),0},
+{"AD_DVCS","ad dvcs",NID_ad_dvcs,8,&(lvalues[2711]),0},
 {"basicOCSPResponse","Basic OCSP Response",NID_id_pkix_OCSP_basic,9,
-	&(lvalues[2721]),0},
-{"Nonce","OCSP Nonce",NID_id_pkix_OCSP_Nonce,9,&(lvalues[2730]),0},
-{"CrlID","OCSP CRL ID",NID_id_pkix_OCSP_CrlID,9,&(lvalues[2739]),0},
+	&(lvalues[2719]),0},
+{"Nonce","OCSP Nonce",NID_id_pkix_OCSP_Nonce,9,&(lvalues[2728]),0},
+{"CrlID","OCSP CRL ID",NID_id_pkix_OCSP_CrlID,9,&(lvalues[2737]),0},
 {"acceptableResponses","Acceptable OCSP Responses",
-	NID_id_pkix_OCSP_acceptableResponses,9,&(lvalues[2748]),0},
-{"noCheck","OCSP No Check",NID_id_pkix_OCSP_noCheck,9,&(lvalues[2757]),0},
+	NID_id_pkix_OCSP_acceptableResponses,9,&(lvalues[2746]),0},
+{"noCheck","OCSP No Check",NID_id_pkix_OCSP_noCheck,9,&(lvalues[2755]),0},
 {"archiveCutoff","OCSP Archive Cutoff",NID_id_pkix_OCSP_archiveCutoff,
-	9,&(lvalues[2766]),0},
+	9,&(lvalues[2764]),0},
 {"serviceLocator","OCSP Service Locator",
-	NID_id_pkix_OCSP_serviceLocator,9,&(lvalues[2775]),0},
+	NID_id_pkix_OCSP_serviceLocator,9,&(lvalues[2773]),0},
 {"extendedStatus","Extended OCSP Status",
-	NID_id_pkix_OCSP_extendedStatus,9,&(lvalues[2784]),0},
-{"valid","valid",NID_id_pkix_OCSP_valid,9,&(lvalues[2793]),0},
-{"path","path",NID_id_pkix_OCSP_path,9,&(lvalues[2802]),0},
+	NID_id_pkix_OCSP_extendedStatus,9,&(lvalues[2782]),0},
+{"valid","valid",NID_id_pkix_OCSP_valid,9,&(lvalues[2791]),0},
+{"path","path",NID_id_pkix_OCSP_path,9,&(lvalues[2800]),0},
 {"trustRoot","Trust Root",NID_id_pkix_OCSP_trustRoot,9,
-	&(lvalues[2811]),0},
-{"algorithm","algorithm",NID_algorithm,4,&(lvalues[2820]),0},
-{"rsaSignature","rsaSignature",NID_rsaSignature,5,&(lvalues[2824]),0},
+	&(lvalues[2809]),0},
+{"algorithm","algorithm",NID_algorithm,4,&(lvalues[2818]),0},
+{"rsaSignature","rsaSignature",NID_rsaSignature,5,&(lvalues[2822]),0},
 {"X500algorithms","directory services - algorithms",
-	NID_X500algorithms,2,&(lvalues[2829]),0},
-{"ORG","org",NID_org,1,&(lvalues[2831]),0},
-{"DOD","dod",NID_dod,2,&(lvalues[2832]),0},
-{"IANA","iana",NID_iana,3,&(lvalues[2834]),0},
-{"directory","Directory",NID_Directory,4,&(lvalues[2837]),0},
-{"mgmt","Management",NID_Management,4,&(lvalues[2841]),0},
-{"experimental","Experimental",NID_Experimental,4,&(lvalues[2845]),0},
-{"private","Private",NID_Private,4,&(lvalues[2849]),0},
-{"security","Security",NID_Security,4,&(lvalues[2853]),0},
-{"snmpv2","SNMPv2",NID_SNMPv2,4,&(lvalues[2857]),0},
-{"Mail","Mail",NID_Mail,4,&(lvalues[2861]),0},
-{"enterprises","Enterprises",NID_Enterprises,5,&(lvalues[2865]),0},
-{"dcobject","dcObject",NID_dcObject,9,&(lvalues[2870]),0},
-{"DC","domainComponent",NID_domainComponent,10,&(lvalues[2879]),0},
-{"domain","Domain",NID_Domain,10,&(lvalues[2889]),0},
-{"NULL","NULL",NID_joint_iso_ccitt,1,&(lvalues[2899]),0},
+	NID_X500algorithms,2,&(lvalues[2827]),0},
+{"ORG","org",NID_org,1,&(lvalues[2829]),0},
+{"DOD","dod",NID_dod,2,&(lvalues[2830]),0},
+{"IANA","iana",NID_iana,3,&(lvalues[2832]),0},
+{"directory","Directory",NID_Directory,4,&(lvalues[2835]),0},
+{"mgmt","Management",NID_Management,4,&(lvalues[2839]),0},
+{"experimental","Experimental",NID_Experimental,4,&(lvalues[2843]),0},
+{"private","Private",NID_Private,4,&(lvalues[2847]),0},
+{"security","Security",NID_Security,4,&(lvalues[2851]),0},
+{"snmpv2","SNMPv2",NID_SNMPv2,4,&(lvalues[2855]),0},
+{"Mail","Mail",NID_Mail,4,&(lvalues[2859]),0},
+{"enterprises","Enterprises",NID_Enterprises,5,&(lvalues[2863]),0},
+{"dcobject","dcObject",NID_dcObject,9,&(lvalues[2868]),0},
+{"DC","domainComponent",NID_domainComponent,10,&(lvalues[2877]),0},
+{"domain","Domain",NID_Domain,10,&(lvalues[2887]),0},
+{"NULL","NULL",NID_joint_iso_ccitt,0,NULL,0},
 {"selected-attribute-types","Selected Attribute Types",
-	NID_selected_attribute_types,3,&(lvalues[2900]),0},
-{"clearance","clearance",NID_clearance,4,&(lvalues[2903]),0},
+	NID_selected_attribute_types,3,&(lvalues[2897]),0},
+{"clearance","clearance",NID_clearance,4,&(lvalues[2900]),0},
 {"RSA-MD4","md4WithRSAEncryption",NID_md4WithRSAEncryption,9,
-	&(lvalues[2907]),0},
-{"ac-proxying","ac-proxying",NID_ac_proxying,8,&(lvalues[2916]),0},
+	&(lvalues[2904]),0},
+{"ac-proxying","ac-proxying",NID_ac_proxying,8,&(lvalues[2913]),0},
 {"subjectInfoAccess","Subject Information Access",NID_sinfo_access,8,
-	&(lvalues[2924]),0},
+	&(lvalues[2921]),0},
 {"id-aca-encAttrs","id-aca-encAttrs",NID_id_aca_encAttrs,8,
-	&(lvalues[2932]),0},
-{"role","role",NID_role,3,&(lvalues[2940]),0},
+	&(lvalues[2929]),0},
+{"role","role",NID_role,3,&(lvalues[2937]),0},
 {"policyConstraints","X509v3 Policy Constraints",
-	NID_policy_constraints,3,&(lvalues[2943]),0},
+	NID_policy_constraints,3,&(lvalues[2940]),0},
 {"targetInformation","X509v3 AC Targeting",NID_target_information,3,
-	&(lvalues[2946]),0},
+	&(lvalues[2943]),0},
 {"noRevAvail","X509v3 No Revocation Available",NID_no_rev_avail,3,
-	&(lvalues[2949]),0},
-{"NULL","NULL",NID_ccitt,1,&(lvalues[2952]),0},
-{"ansi-X9-62","ANSI X9.62",NID_ansi_X9_62,5,&(lvalues[2953]),0},
-{"prime-field","prime-field",NID_X9_62_prime_field,7,&(lvalues[2958]),0},
+	&(lvalues[2946]),0},
+{"NULL","NULL",NID_ccitt,0,NULL,0},
+{"ansi-X9-62","ANSI X9.62",NID_ansi_X9_62,5,&(lvalues[2949]),0},
+{"prime-field","prime-field",NID_X9_62_prime_field,7,&(lvalues[2954]),0},
 {"characteristic-two-field","characteristic-two-field",
-	NID_X9_62_characteristic_two_field,7,&(lvalues[2965]),0},
+	NID_X9_62_characteristic_two_field,7,&(lvalues[2961]),0},
 {"id-ecPublicKey","id-ecPublicKey",NID_X9_62_id_ecPublicKey,7,
-	&(lvalues[2972]),0},
-{"prime192v1","prime192v1",NID_X9_62_prime192v1,8,&(lvalues[2979]),0},
-{"prime192v2","prime192v2",NID_X9_62_prime192v2,8,&(lvalues[2987]),0},
-{"prime192v3","prime192v3",NID_X9_62_prime192v3,8,&(lvalues[2995]),0},
-{"prime239v1","prime239v1",NID_X9_62_prime239v1,8,&(lvalues[3003]),0},
-{"prime239v2","prime239v2",NID_X9_62_prime239v2,8,&(lvalues[3011]),0},
-{"prime239v3","prime239v3",NID_X9_62_prime239v3,8,&(lvalues[3019]),0},
-{"prime256v1","prime256v1",NID_X9_62_prime256v1,8,&(lvalues[3027]),0},
+	&(lvalues[2968]),0},
+{"prime192v1","prime192v1",NID_X9_62_prime192v1,8,&(lvalues[2975]),0},
+{"prime192v2","prime192v2",NID_X9_62_prime192v2,8,&(lvalues[2983]),0},
+{"prime192v3","prime192v3",NID_X9_62_prime192v3,8,&(lvalues[2991]),0},
+{"prime239v1","prime239v1",NID_X9_62_prime239v1,8,&(lvalues[2999]),0},
+{"prime239v2","prime239v2",NID_X9_62_prime239v2,8,&(lvalues[3007]),0},
+{"prime239v3","prime239v3",NID_X9_62_prime239v3,8,&(lvalues[3015]),0},
+{"prime256v1","prime256v1",NID_X9_62_prime256v1,8,&(lvalues[3023]),0},
 {"ecdsa-with-SHA1","ecdsa-with-SHA1",NID_ecdsa_with_SHA1,7,
-	&(lvalues[3035]),0},
-{"CSPName","Microsoft CSP Name",NID_ms_csp_name,9,&(lvalues[3042]),0},
-{"AES-128-ECB","aes-128-ecb",NID_aes_128_ecb,9,&(lvalues[3051]),0},
-{"AES-128-CBC","aes-128-cbc",NID_aes_128_cbc,9,&(lvalues[3060]),0},
-{"AES-128-OFB","aes-128-ofb",NID_aes_128_ofb128,9,&(lvalues[3069]),0},
-{"AES-128-CFB","aes-128-cfb",NID_aes_128_cfb128,9,&(lvalues[3078]),0},
-{"AES-192-ECB","aes-192-ecb",NID_aes_192_ecb,9,&(lvalues[3087]),0},
-{"AES-192-CBC","aes-192-cbc",NID_aes_192_cbc,9,&(lvalues[3096]),0},
-{"AES-192-OFB","aes-192-ofb",NID_aes_192_ofb128,9,&(lvalues[3105]),0},
-{"AES-192-CFB","aes-192-cfb",NID_aes_192_cfb128,9,&(lvalues[3114]),0},
-{"AES-256-ECB","aes-256-ecb",NID_aes_256_ecb,9,&(lvalues[3123]),0},
-{"AES-256-CBC","aes-256-cbc",NID_aes_256_cbc,9,&(lvalues[3132]),0},
-{"AES-256-OFB","aes-256-ofb",NID_aes_256_ofb128,9,&(lvalues[3141]),0},
-{"AES-256-CFB","aes-256-cfb",NID_aes_256_cfb128,9,&(lvalues[3150]),0},
+	&(lvalues[3031]),0},
+{"CSPName","Microsoft CSP Name",NID_ms_csp_name,9,&(lvalues[3038]),0},
+{"AES-128-ECB","aes-128-ecb",NID_aes_128_ecb,9,&(lvalues[3047]),0},
+{"AES-128-CBC","aes-128-cbc",NID_aes_128_cbc,9,&(lvalues[3056]),0},
+{"AES-128-OFB","aes-128-ofb",NID_aes_128_ofb128,9,&(lvalues[3065]),0},
+{"AES-128-CFB","aes-128-cfb",NID_aes_128_cfb128,9,&(lvalues[3074]),0},
+{"AES-192-ECB","aes-192-ecb",NID_aes_192_ecb,9,&(lvalues[3083]),0},
+{"AES-192-CBC","aes-192-cbc",NID_aes_192_cbc,9,&(lvalues[3092]),0},
+{"AES-192-OFB","aes-192-ofb",NID_aes_192_ofb128,9,&(lvalues[3101]),0},
+{"AES-192-CFB","aes-192-cfb",NID_aes_192_cfb128,9,&(lvalues[3110]),0},
+{"AES-256-ECB","aes-256-ecb",NID_aes_256_ecb,9,&(lvalues[3119]),0},
+{"AES-256-CBC","aes-256-cbc",NID_aes_256_cbc,9,&(lvalues[3128]),0},
+{"AES-256-OFB","aes-256-ofb",NID_aes_256_ofb128,9,&(lvalues[3137]),0},
+{"AES-256-CFB","aes-256-cfb",NID_aes_256_cfb128,9,&(lvalues[3146]),0},
 {"holdInstructionCode","Hold Instruction Code",
-	NID_hold_instruction_code,3,&(lvalues[3159]),0},
+	NID_hold_instruction_code,3,&(lvalues[3155]),0},
 {"holdInstructionNone","Hold Instruction None",
-	NID_hold_instruction_none,7,&(lvalues[3162]),0},
+	NID_hold_instruction_none,7,&(lvalues[3158]),0},
 {"holdInstructionCallIssuer","Hold Instruction Call Issuer",
-	NID_hold_instruction_call_issuer,7,&(lvalues[3169]),0},
+	NID_hold_instruction_call_issuer,7,&(lvalues[3165]),0},
 {"holdInstructionReject","Hold Instruction Reject",
-	NID_hold_instruction_reject,7,&(lvalues[3176]),0},
-{"data","data",NID_data,1,&(lvalues[3183]),0},
-{"pss","pss",NID_pss,3,&(lvalues[3184]),0},
-{"ucl","ucl",NID_ucl,7,&(lvalues[3187]),0},
-{"pilot","pilot",NID_pilot,8,&(lvalues[3194]),0},
+	NID_hold_instruction_reject,7,&(lvalues[3172]),0},
+{"data","data",NID_data,1,&(lvalues[3179]),0},
+{"pss","pss",NID_pss,3,&(lvalues[3180]),0},
+{"ucl","ucl",NID_ucl,7,&(lvalues[3183]),0},
+{"pilot","pilot",NID_pilot,8,&(lvalues[3190]),0},
 {"pilotAttributeType","pilotAttributeType",NID_pilotAttributeType,9,
-	&(lvalues[3202]),0},
+	&(lvalues[3198]),0},
 {"pilotAttributeSyntax","pilotAttributeSyntax",
-	NID_pilotAttributeSyntax,9,&(lvalues[3211]),0},
+	NID_pilotAttributeSyntax,9,&(lvalues[3207]),0},
 {"pilotObjectClass","pilotObjectClass",NID_pilotObjectClass,9,
-	&(lvalues[3220]),0},
-{"pilotGroups","pilotGroups",NID_pilotGroups,9,&(lvalues[3229]),0},
+	&(lvalues[3216]),0},
+{"pilotGroups","pilotGroups",NID_pilotGroups,9,&(lvalues[3225]),0},
 {"iA5StringSyntax","iA5StringSyntax",NID_iA5StringSyntax,10,
-	&(lvalues[3238]),0},
+	&(lvalues[3234]),0},
 {"caseIgnoreIA5StringSyntax","caseIgnoreIA5StringSyntax",
-	NID_caseIgnoreIA5StringSyntax,10,&(lvalues[3248]),0},
-{"pilotObject","pilotObject",NID_pilotObject,10,&(lvalues[3258]),0},
-{"pilotPerson","pilotPerson",NID_pilotPerson,10,&(lvalues[3268]),0},
-{"account","account",NID_account,10,&(lvalues[3278]),0},
-{"document","document",NID_document,10,&(lvalues[3288]),0},
-{"room","room",NID_room,10,&(lvalues[3298]),0},
+	NID_caseIgnoreIA5StringSyntax,10,&(lvalues[3244]),0},
+{"pilotObject","pilotObject",NID_pilotObject,10,&(lvalues[3254]),0},
+{"pilotPerson","pilotPerson",NID_pilotPerson,10,&(lvalues[3264]),0},
+{"account","account",NID_account,10,&(lvalues[3274]),0},
+{"document","document",NID_document,10,&(lvalues[3284]),0},
+{"room","room",NID_room,10,&(lvalues[3294]),0},
 {"documentSeries","documentSeries",NID_documentSeries,10,
-	&(lvalues[3308]),0},
+	&(lvalues[3304]),0},
 {"rFC822localPart","rFC822localPart",NID_rFC822localPart,10,
-	&(lvalues[3318]),0},
-{"dNSDomain","dNSDomain",NID_dNSDomain,10,&(lvalues[3328]),0},
+	&(lvalues[3314]),0},
+{"dNSDomain","dNSDomain",NID_dNSDomain,10,&(lvalues[3324]),0},
 {"domainRelatedObject","domainRelatedObject",NID_domainRelatedObject,
-	10,&(lvalues[3338]),0},
+	10,&(lvalues[3334]),0},
 {"friendlyCountry","friendlyCountry",NID_friendlyCountry,10,
-	&(lvalues[3348]),0},
+	&(lvalues[3344]),0},
 {"simpleSecurityObject","simpleSecurityObject",
-	NID_simpleSecurityObject,10,&(lvalues[3358]),0},
+	NID_simpleSecurityObject,10,&(lvalues[3354]),0},
 {"pilotOrganization","pilotOrganization",NID_pilotOrganization,10,
-	&(lvalues[3368]),0},
-{"pilotDSA","pilotDSA",NID_pilotDSA,10,&(lvalues[3378]),0},
+	&(lvalues[3364]),0},
+{"pilotDSA","pilotDSA",NID_pilotDSA,10,&(lvalues[3374]),0},
 {"qualityLabelledData","qualityLabelledData",NID_qualityLabelledData,
-	10,&(lvalues[3388]),0},
-{"UID","userId",NID_userId,10,&(lvalues[3398]),0},
+	10,&(lvalues[3384]),0},
+{"UID","userId",NID_userId,10,&(lvalues[3394]),0},
 {"textEncodedORAddress","textEncodedORAddress",
-	NID_textEncodedORAddress,10,&(lvalues[3408]),0},
-{"mail","rfc822Mailbox",NID_rfc822Mailbox,10,&(lvalues[3418]),0},
-{"info","info",NID_info,10,&(lvalues[3428]),0},
+	NID_textEncodedORAddress,10,&(lvalues[3404]),0},
+{"mail","rfc822Mailbox",NID_rfc822Mailbox,10,&(lvalues[3414]),0},
+{"info","info",NID_info,10,&(lvalues[3424]),0},
 {"favouriteDrink","favouriteDrink",NID_favouriteDrink,10,
-	&(lvalues[3438]),0},
-{"roomNumber","roomNumber",NID_roomNumber,10,&(lvalues[3448]),0},
-{"photo","photo",NID_photo,10,&(lvalues[3458]),0},
-{"userClass","userClass",NID_userClass,10,&(lvalues[3468]),0},
-{"host","host",NID_host,10,&(lvalues[3478]),0},
-{"manager","manager",NID_manager,10,&(lvalues[3488]),0},
+	&(lvalues[3434]),0},
+{"roomNumber","roomNumber",NID_roomNumber,10,&(lvalues[3444]),0},
+{"photo","photo",NID_photo,10,&(lvalues[3454]),0},
+{"userClass","userClass",NID_userClass,10,&(lvalues[3464]),0},
+{"host","host",NID_host,10,&(lvalues[3474]),0},
+{"manager","manager",NID_manager,10,&(lvalues[3484]),0},
 {"documentIdentifier","documentIdentifier",NID_documentIdentifier,10,
-	&(lvalues[3498]),0},
-{"documentTitle","documentTitle",NID_documentTitle,10,&(lvalues[3508]),0},
+	&(lvalues[3494]),0},
+{"documentTitle","documentTitle",NID_documentTitle,10,&(lvalues[3504]),0},
 {"documentVersion","documentVersion",NID_documentVersion,10,
-	&(lvalues[3518]),0},
+	&(lvalues[3514]),0},
 {"documentAuthor","documentAuthor",NID_documentAuthor,10,
-	&(lvalues[3528]),0},
+	&(lvalues[3524]),0},
 {"documentLocation","documentLocation",NID_documentLocation,10,
-	&(lvalues[3538]),0},
+	&(lvalues[3534]),0},
 {"homeTelephoneNumber","homeTelephoneNumber",NID_homeTelephoneNumber,
-	10,&(lvalues[3548]),0},
-{"secretary","secretary",NID_secretary,10,&(lvalues[3558]),0},
-{"otherMailbox","otherMailbox",NID_otherMailbox,10,&(lvalues[3568]),0},
+	10,&(lvalues[3544]),0},
+{"secretary","secretary",NID_secretary,10,&(lvalues[3554]),0},
+{"otherMailbox","otherMailbox",NID_otherMailbox,10,&(lvalues[3564]),0},
 {"lastModifiedTime","lastModifiedTime",NID_lastModifiedTime,10,
-	&(lvalues[3578]),0},
+	&(lvalues[3574]),0},
 {"lastModifiedBy","lastModifiedBy",NID_lastModifiedBy,10,
-	&(lvalues[3588]),0},
-{"aRecord","aRecord",NID_aRecord,10,&(lvalues[3598]),0},
+	&(lvalues[3584]),0},
+{"aRecord","aRecord",NID_aRecord,10,&(lvalues[3594]),0},
 {"pilotAttributeType27","pilotAttributeType27",
-	NID_pilotAttributeType27,10,&(lvalues[3608]),0},
-{"mXRecord","mXRecord",NID_mXRecord,10,&(lvalues[3618]),0},
-{"nSRecord","nSRecord",NID_nSRecord,10,&(lvalues[3628]),0},
-{"sOARecord","sOARecord",NID_sOARecord,10,&(lvalues[3638]),0},
-{"cNAMERecord","cNAMERecord",NID_cNAMERecord,10,&(lvalues[3648]),0},
+	NID_pilotAttributeType27,10,&(lvalues[3604]),0},
+{"mXRecord","mXRecord",NID_mXRecord,10,&(lvalues[3614]),0},
+{"nSRecord","nSRecord",NID_nSRecord,10,&(lvalues[3624]),0},
+{"sOARecord","sOARecord",NID_sOARecord,10,&(lvalues[3634]),0},
+{"cNAMERecord","cNAMERecord",NID_cNAMERecord,10,&(lvalues[3644]),0},
 {"associatedDomain","associatedDomain",NID_associatedDomain,10,
-	&(lvalues[3658]),0},
+	&(lvalues[3654]),0},
 {"associatedName","associatedName",NID_associatedName,10,
-	&(lvalues[3668]),0},
+	&(lvalues[3664]),0},
 {"homePostalAddress","homePostalAddress",NID_homePostalAddress,10,
-	&(lvalues[3678]),0},
-{"personalTitle","personalTitle",NID_personalTitle,10,&(lvalues[3688]),0},
+	&(lvalues[3674]),0},
+{"personalTitle","personalTitle",NID_personalTitle,10,&(lvalues[3684]),0},
 {"mobileTelephoneNumber","mobileTelephoneNumber",
-	NID_mobileTelephoneNumber,10,&(lvalues[3698]),0},
+	NID_mobileTelephoneNumber,10,&(lvalues[3694]),0},
 {"pagerTelephoneNumber","pagerTelephoneNumber",
-	NID_pagerTelephoneNumber,10,&(lvalues[3708]),0},
+	NID_pagerTelephoneNumber,10,&(lvalues[3704]),0},
 {"friendlyCountryName","friendlyCountryName",NID_friendlyCountryName,
-	10,&(lvalues[3718]),0},
+	10,&(lvalues[3714]),0},
 {"organizationalStatus","organizationalStatus",
-	NID_organizationalStatus,10,&(lvalues[3728]),0},
-{"janetMailbox","janetMailbox",NID_janetMailbox,10,&(lvalues[3738]),0},
+	NID_organizationalStatus,10,&(lvalues[3724]),0},
+{"janetMailbox","janetMailbox",NID_janetMailbox,10,&(lvalues[3734]),0},
 {"mailPreferenceOption","mailPreferenceOption",
-	NID_mailPreferenceOption,10,&(lvalues[3748]),0},
-{"buildingName","buildingName",NID_buildingName,10,&(lvalues[3758]),0},
-{"dSAQuality","dSAQuality",NID_dSAQuality,10,&(lvalues[3768]),0},
+	NID_mailPreferenceOption,10,&(lvalues[3744]),0},
+{"buildingName","buildingName",NID_buildingName,10,&(lvalues[3754]),0},
+{"dSAQuality","dSAQuality",NID_dSAQuality,10,&(lvalues[3764]),0},
 {"singleLevelQuality","singleLevelQuality",NID_singleLevelQuality,10,
-	&(lvalues[3778]),0},
+	&(lvalues[3774]),0},
 {"subtreeMinimumQuality","subtreeMinimumQuality",
-	NID_subtreeMinimumQuality,10,&(lvalues[3788]),0},
+	NID_subtreeMinimumQuality,10,&(lvalues[3784]),0},
 {"subtreeMaximumQuality","subtreeMaximumQuality",
-	NID_subtreeMaximumQuality,10,&(lvalues[3798]),0},
+	NID_subtreeMaximumQuality,10,&(lvalues[3794]),0},
 {"personalSignature","personalSignature",NID_personalSignature,10,
-	&(lvalues[3808]),0},
-{"dITRedirect","dITRedirect",NID_dITRedirect,10,&(lvalues[3818]),0},
-{"audio","audio",NID_audio,10,&(lvalues[3828]),0},
+	&(lvalues[3804]),0},
+{"dITRedirect","dITRedirect",NID_dITRedirect,10,&(lvalues[3814]),0},
+{"audio","audio",NID_audio,10,&(lvalues[3824]),0},
 {"documentPublisher","documentPublisher",NID_documentPublisher,10,
-	&(lvalues[3838]),0},
+	&(lvalues[3834]),0},
 {"x500UniqueIdentifier","x500UniqueIdentifier",
-	NID_x500UniqueIdentifier,3,&(lvalues[3848]),0},
-{"mime-mhs","MIME MHS",NID_mime_mhs,5,&(lvalues[3851]),0},
+	NID_x500UniqueIdentifier,3,&(lvalues[3844]),0},
+{"mime-mhs","MIME MHS",NID_mime_mhs,5,&(lvalues[3847]),0},
 {"mime-mhs-headings","mime-mhs-headings",NID_mime_mhs_headings,6,
-	&(lvalues[3856]),0},
+	&(lvalues[3852]),0},
 {"mime-mhs-bodies","mime-mhs-bodies",NID_mime_mhs_bodies,6,
-	&(lvalues[3862]),0},
+	&(lvalues[3858]),0},
 {"id-hex-partial-message","id-hex-partial-message",
-	NID_id_hex_partial_message,7,&(lvalues[3868]),0},
+	NID_id_hex_partial_message,7,&(lvalues[3864]),0},
 {"id-hex-multipart-message","id-hex-multipart-message",
-	NID_id_hex_multipart_message,7,&(lvalues[3875]),0},
+	NID_id_hex_multipart_message,7,&(lvalues[3871]),0},
 {"generationQualifier","generationQualifier",NID_generationQualifier,
-	3,&(lvalues[3882]),0},
-{"pseudonym","pseudonym",NID_pseudonym,3,&(lvalues[3885]),0},
+	3,&(lvalues[3878]),0},
+{"pseudonym","pseudonym",NID_pseudonym,3,&(lvalues[3881]),0},
 {NULL,NULL,NID_undef,0,NULL,0},
 {"id-set","Secure Electronic Transactions",NID_id_set,2,
-	&(lvalues[3888]),0},
-{"set-ctype","content types",NID_set_ctype,3,&(lvalues[3890]),0},
-{"set-msgExt","message extensions",NID_set_msgExt,3,&(lvalues[3893]),0},
-{"set-attr","set-attr",NID_set_attr,3,&(lvalues[3896]),0},
-{"set-policy","set-policy",NID_set_policy,3,&(lvalues[3899]),0},
+	&(lvalues[3884]),0},
+{"set-ctype","content types",NID_set_ctype,3,&(lvalues[3886]),0},
+{"set-msgExt","message extensions",NID_set_msgExt,3,&(lvalues[3889]),0},
+{"set-attr","set-attr",NID_set_attr,3,&(lvalues[3892]),0},
+{"set-policy","set-policy",NID_set_policy,3,&(lvalues[3895]),0},
 {"set-certExt","certificate extensions",NID_set_certExt,3,
-	&(lvalues[3902]),0},
-{"set-brand","set-brand",NID_set_brand,3,&(lvalues[3905]),0},
-{"setct-PANData","setct-PANData",NID_setct_PANData,4,&(lvalues[3908]),0},
+	&(lvalues[3898]),0},
+{"set-brand","set-brand",NID_set_brand,3,&(lvalues[3901]),0},
+{"setct-PANData","setct-PANData",NID_setct_PANData,4,&(lvalues[3904]),0},
 {"setct-PANToken","setct-PANToken",NID_setct_PANToken,4,
-	&(lvalues[3912]),0},
-{"setct-PANOnly","setct-PANOnly",NID_setct_PANOnly,4,&(lvalues[3916]),0},
-{"setct-OIData","setct-OIData",NID_setct_OIData,4,&(lvalues[3920]),0},
-{"setct-PI","setct-PI",NID_setct_PI,4,&(lvalues[3924]),0},
-{"setct-PIData","setct-PIData",NID_setct_PIData,4,&(lvalues[3928]),0},
+	&(lvalues[3908]),0},
+{"setct-PANOnly","setct-PANOnly",NID_setct_PANOnly,4,&(lvalues[3912]),0},
+{"setct-OIData","setct-OIData",NID_setct_OIData,4,&(lvalues[3916]),0},
+{"setct-PI","setct-PI",NID_setct_PI,4,&(lvalues[3920]),0},
+{"setct-PIData","setct-PIData",NID_setct_PIData,4,&(lvalues[3924]),0},
 {"setct-PIDataUnsigned","setct-PIDataUnsigned",
-	NID_setct_PIDataUnsigned,4,&(lvalues[3932]),0},
+	NID_setct_PIDataUnsigned,4,&(lvalues[3928]),0},
 {"setct-HODInput","setct-HODInput",NID_setct_HODInput,4,
-	&(lvalues[3936]),0},
+	&(lvalues[3932]),0},
 {"setct-AuthResBaggage","setct-AuthResBaggage",
-	NID_setct_AuthResBaggage,4,&(lvalues[3940]),0},
+	NID_setct_AuthResBaggage,4,&(lvalues[3936]),0},
 {"setct-AuthRevReqBaggage","setct-AuthRevReqBaggage",
-	NID_setct_AuthRevReqBaggage,4,&(lvalues[3944]),0},
+	NID_setct_AuthRevReqBaggage,4,&(lvalues[3940]),0},
 {"setct-AuthRevResBaggage","setct-AuthRevResBaggage",
-	NID_setct_AuthRevResBaggage,4,&(lvalues[3948]),0},
+	NID_setct_AuthRevResBaggage,4,&(lvalues[3944]),0},
 {"setct-CapTokenSeq","setct-CapTokenSeq",NID_setct_CapTokenSeq,4,
-	&(lvalues[3952]),0},
+	&(lvalues[3948]),0},
 {"setct-PInitResData","setct-PInitResData",NID_setct_PInitResData,4,
-	&(lvalues[3956]),0},
-{"setct-PI-TBS","setct-PI-TBS",NID_setct_PI_TBS,4,&(lvalues[3960]),0},
+	&(lvalues[3952]),0},
+{"setct-PI-TBS","setct-PI-TBS",NID_setct_PI_TBS,4,&(lvalues[3956]),0},
 {"setct-PResData","setct-PResData",NID_setct_PResData,4,
-	&(lvalues[3964]),0},
+	&(lvalues[3960]),0},
 {"setct-AuthReqTBS","setct-AuthReqTBS",NID_setct_AuthReqTBS,4,
-	&(lvalues[3968]),0},
+	&(lvalues[3964]),0},
 {"setct-AuthResTBS","setct-AuthResTBS",NID_setct_AuthResTBS,4,
-	&(lvalues[3972]),0},
+	&(lvalues[3968]),0},
 {"setct-AuthResTBSX","setct-AuthResTBSX",NID_setct_AuthResTBSX,4,
-	&(lvalues[3976]),0},
+	&(lvalues[3972]),0},
 {"setct-AuthTokenTBS","setct-AuthTokenTBS",NID_setct_AuthTokenTBS,4,
-	&(lvalues[3980]),0},
+	&(lvalues[3976]),0},
 {"setct-CapTokenData","setct-CapTokenData",NID_setct_CapTokenData,4,
-	&(lvalues[3984]),0},
+	&(lvalues[3980]),0},
 {"setct-CapTokenTBS","setct-CapTokenTBS",NID_setct_CapTokenTBS,4,
-	&(lvalues[3988]),0},
+	&(lvalues[3984]),0},
 {"setct-AcqCardCodeMsg","setct-AcqCardCodeMsg",
-	NID_setct_AcqCardCodeMsg,4,&(lvalues[3992]),0},
+	NID_setct_AcqCardCodeMsg,4,&(lvalues[3988]),0},
 {"setct-AuthRevReqTBS","setct-AuthRevReqTBS",NID_setct_AuthRevReqTBS,
-	4,&(lvalues[3996]),0},
+	4,&(lvalues[3992]),0},
 {"setct-AuthRevResData","setct-AuthRevResData",
-	NID_setct_AuthRevResData,4,&(lvalues[4000]),0},
+	NID_setct_AuthRevResData,4,&(lvalues[3996]),0},
 {"setct-AuthRevResTBS","setct-AuthRevResTBS",NID_setct_AuthRevResTBS,
-	4,&(lvalues[4004]),0},
+	4,&(lvalues[4000]),0},
 {"setct-CapReqTBS","setct-CapReqTBS",NID_setct_CapReqTBS,4,
-	&(lvalues[4008]),0},
+	&(lvalues[4004]),0},
 {"setct-CapReqTBSX","setct-CapReqTBSX",NID_setct_CapReqTBSX,4,
-	&(lvalues[4012]),0},
+	&(lvalues[4008]),0},
 {"setct-CapResData","setct-CapResData",NID_setct_CapResData,4,
-	&(lvalues[4016]),0},
+	&(lvalues[4012]),0},
 {"setct-CapRevReqTBS","setct-CapRevReqTBS",NID_setct_CapRevReqTBS,4,
-	&(lvalues[4020]),0},
+	&(lvalues[4016]),0},
 {"setct-CapRevReqTBSX","setct-CapRevReqTBSX",NID_setct_CapRevReqTBSX,
-	4,&(lvalues[4024]),0},
+	4,&(lvalues[4020]),0},
 {"setct-CapRevResData","setct-CapRevResData",NID_setct_CapRevResData,
-	4,&(lvalues[4028]),0},
+	4,&(lvalues[4024]),0},
 {"setct-CredReqTBS","setct-CredReqTBS",NID_setct_CredReqTBS,4,
-	&(lvalues[4032]),0},
+	&(lvalues[4028]),0},
 {"setct-CredReqTBSX","setct-CredReqTBSX",NID_setct_CredReqTBSX,4,
-	&(lvalues[4036]),0},
+	&(lvalues[4032]),0},
 {"setct-CredResData","setct-CredResData",NID_setct_CredResData,4,
-	&(lvalues[4040]),0},
+	&(lvalues[4036]),0},
 {"setct-CredRevReqTBS","setct-CredRevReqTBS",NID_setct_CredRevReqTBS,
-	4,&(lvalues[4044]),0},
+	4,&(lvalues[4040]),0},
 {"setct-CredRevReqTBSX","setct-CredRevReqTBSX",
-	NID_setct_CredRevReqTBSX,4,&(lvalues[4048]),0},
+	NID_setct_CredRevReqTBSX,4,&(lvalues[4044]),0},
 {"setct-CredRevResData","setct-CredRevResData",
-	NID_setct_CredRevResData,4,&(lvalues[4052]),0},
+	NID_setct_CredRevResData,4,&(lvalues[4048]),0},
 {"setct-PCertReqData","setct-PCertReqData",NID_setct_PCertReqData,4,
-	&(lvalues[4056]),0},
+	&(lvalues[4052]),0},
 {"setct-PCertResTBS","setct-PCertResTBS",NID_setct_PCertResTBS,4,
-	&(lvalues[4060]),0},
+	&(lvalues[4056]),0},
 {"setct-BatchAdminReqData","setct-BatchAdminReqData",
-	NID_setct_BatchAdminReqData,4,&(lvalues[4064]),0},
+	NID_setct_BatchAdminReqData,4,&(lvalues[4060]),0},
 {"setct-BatchAdminResData","setct-BatchAdminResData",
-	NID_setct_BatchAdminResData,4,&(lvalues[4068]),0},
+	NID_setct_BatchAdminResData,4,&(lvalues[4064]),0},
 {"setct-CardCInitResTBS","setct-CardCInitResTBS",
-	NID_setct_CardCInitResTBS,4,&(lvalues[4072]),0},
+	NID_setct_CardCInitResTBS,4,&(lvalues[4068]),0},
 {"setct-MeAqCInitResTBS","setct-MeAqCInitResTBS",
-	NID_setct_MeAqCInitResTBS,4,&(lvalues[4076]),0},
+	NID_setct_MeAqCInitResTBS,4,&(lvalues[4072]),0},
 {"setct-RegFormResTBS","setct-RegFormResTBS",NID_setct_RegFormResTBS,
-	4,&(lvalues[4080]),0},
+	4,&(lvalues[4076]),0},
 {"setct-CertReqData","setct-CertReqData",NID_setct_CertReqData,4,
-	&(lvalues[4084]),0},
+	&(lvalues[4080]),0},
 {"setct-CertReqTBS","setct-CertReqTBS",NID_setct_CertReqTBS,4,
-	&(lvalues[4088]),0},
+	&(lvalues[4084]),0},
 {"setct-CertResData","setct-CertResData",NID_setct_CertResData,4,
-	&(lvalues[4092]),0},
+	&(lvalues[4088]),0},
 {"setct-CertInqReqTBS","setct-CertInqReqTBS",NID_setct_CertInqReqTBS,
-	4,&(lvalues[4096]),0},
+	4,&(lvalues[4092]),0},
 {"setct-ErrorTBS","setct-ErrorTBS",NID_setct_ErrorTBS,4,
-	&(lvalues[4100]),0},
+	&(lvalues[4096]),0},
 {"setct-PIDualSignedTBE","setct-PIDualSignedTBE",
-	NID_setct_PIDualSignedTBE,4,&(lvalues[4104]),0},
+	NID_setct_PIDualSignedTBE,4,&(lvalues[4100]),0},
 {"setct-PIUnsignedTBE","setct-PIUnsignedTBE",NID_setct_PIUnsignedTBE,
-	4,&(lvalues[4108]),0},
+	4,&(lvalues[4104]),0},
 {"setct-AuthReqTBE","setct-AuthReqTBE",NID_setct_AuthReqTBE,4,
-	&(lvalues[4112]),0},
+	&(lvalues[4108]),0},
 {"setct-AuthResTBE","setct-AuthResTBE",NID_setct_AuthResTBE,4,
-	&(lvalues[4116]),0},
+	&(lvalues[4112]),0},
 {"setct-AuthResTBEX","setct-AuthResTBEX",NID_setct_AuthResTBEX,4,
-	&(lvalues[4120]),0},
+	&(lvalues[4116]),0},
 {"setct-AuthTokenTBE","setct-AuthTokenTBE",NID_setct_AuthTokenTBE,4,
-	&(lvalues[4124]),0},
+	&(lvalues[4120]),0},
 {"setct-CapTokenTBE","setct-CapTokenTBE",NID_setct_CapTokenTBE,4,
-	&(lvalues[4128]),0},
+	&(lvalues[4124]),0},
 {"setct-CapTokenTBEX","setct-CapTokenTBEX",NID_setct_CapTokenTBEX,4,
-	&(lvalues[4132]),0},
+	&(lvalues[4128]),0},
 {"setct-AcqCardCodeMsgTBE","setct-AcqCardCodeMsgTBE",
-	NID_setct_AcqCardCodeMsgTBE,4,&(lvalues[4136]),0},
+	NID_setct_AcqCardCodeMsgTBE,4,&(lvalues[4132]),0},
 {"setct-AuthRevReqTBE","setct-AuthRevReqTBE",NID_setct_AuthRevReqTBE,
-	4,&(lvalues[4140]),0},
+	4,&(lvalues[4136]),0},
 {"setct-AuthRevResTBE","setct-AuthRevResTBE",NID_setct_AuthRevResTBE,
-	4,&(lvalues[4144]),0},
+	4,&(lvalues[4140]),0},
 {"setct-AuthRevResTBEB","setct-AuthRevResTBEB",
-	NID_setct_AuthRevResTBEB,4,&(lvalues[4148]),0},
+	NID_setct_AuthRevResTBEB,4,&(lvalues[4144]),0},
 {"setct-CapReqTBE","setct-CapReqTBE",NID_setct_CapReqTBE,4,
-	&(lvalues[4152]),0},
+	&(lvalues[4148]),0},
 {"setct-CapReqTBEX","setct-CapReqTBEX",NID_setct_CapReqTBEX,4,
-	&(lvalues[4156]),0},
+	&(lvalues[4152]),0},
 {"setct-CapResTBE","setct-CapResTBE",NID_setct_CapResTBE,4,
-	&(lvalues[4160]),0},
+	&(lvalues[4156]),0},
 {"setct-CapRevReqTBE","setct-CapRevReqTBE",NID_setct_CapRevReqTBE,4,
-	&(lvalues[4164]),0},
+	&(lvalues[4160]),0},
 {"setct-CapRevReqTBEX","setct-CapRevReqTBEX",NID_setct_CapRevReqTBEX,
-	4,&(lvalues[4168]),0},
+	4,&(lvalues[4164]),0},
 {"setct-CapRevResTBE","setct-CapRevResTBE",NID_setct_CapRevResTBE,4,
-	&(lvalues[4172]),0},
+	&(lvalues[4168]),0},
 {"setct-CredReqTBE","setct-CredReqTBE",NID_setct_CredReqTBE,4,
-	&(lvalues[4176]),0},
+	&(lvalues[4172]),0},
 {"setct-CredReqTBEX","setct-CredReqTBEX",NID_setct_CredReqTBEX,4,
-	&(lvalues[4180]),0},
+	&(lvalues[4176]),0},
 {"setct-CredResTBE","setct-CredResTBE",NID_setct_CredResTBE,4,
-	&(lvalues[4184]),0},
+	&(lvalues[4180]),0},
 {"setct-CredRevReqTBE","setct-CredRevReqTBE",NID_setct_CredRevReqTBE,
-	4,&(lvalues[4188]),0},
+	4,&(lvalues[4184]),0},
 {"setct-CredRevReqTBEX","setct-CredRevReqTBEX",
-	NID_setct_CredRevReqTBEX,4,&(lvalues[4192]),0},
+	NID_setct_CredRevReqTBEX,4,&(lvalues[4188]),0},
 {"setct-CredRevResTBE","setct-CredRevResTBE",NID_setct_CredRevResTBE,
-	4,&(lvalues[4196]),0},
+	4,&(lvalues[4192]),0},
 {"setct-BatchAdminReqTBE","setct-BatchAdminReqTBE",
-	NID_setct_BatchAdminReqTBE,4,&(lvalues[4200]),0},
+	NID_setct_BatchAdminReqTBE,4,&(lvalues[4196]),0},
 {"setct-BatchAdminResTBE","setct-BatchAdminResTBE",
-	NID_setct_BatchAdminResTBE,4,&(lvalues[4204]),0},
+	NID_setct_BatchAdminResTBE,4,&(lvalues[4200]),0},
 {"setct-RegFormReqTBE","setct-RegFormReqTBE",NID_setct_RegFormReqTBE,
-	4,&(lvalues[4208]),0},
+	4,&(lvalues[4204]),0},
 {"setct-CertReqTBE","setct-CertReqTBE",NID_setct_CertReqTBE,4,
-	&(lvalues[4212]),0},
+	&(lvalues[4208]),0},
 {"setct-CertReqTBEX","setct-CertReqTBEX",NID_setct_CertReqTBEX,4,
-	&(lvalues[4216]),0},
+	&(lvalues[4212]),0},
 {"setct-CertResTBE","setct-CertResTBE",NID_setct_CertResTBE,4,
-	&(lvalues[4220]),0},
+	&(lvalues[4216]),0},
 {"setct-CRLNotificationTBS","setct-CRLNotificationTBS",
-	NID_setct_CRLNotificationTBS,4,&(lvalues[4224]),0},
+	NID_setct_CRLNotificationTBS,4,&(lvalues[4220]),0},
 {"setct-CRLNotificationResTBS","setct-CRLNotificationResTBS",
-	NID_setct_CRLNotificationResTBS,4,&(lvalues[4228]),0},
+	NID_setct_CRLNotificationResTBS,4,&(lvalues[4224]),0},
 {"setct-BCIDistributionTBS","setct-BCIDistributionTBS",
-	NID_setct_BCIDistributionTBS,4,&(lvalues[4232]),0},
+	NID_setct_BCIDistributionTBS,4,&(lvalues[4228]),0},
 {"setext-genCrypt","generic cryptogram",NID_setext_genCrypt,4,
-	&(lvalues[4236]),0},
+	&(lvalues[4232]),0},
 {"setext-miAuth","merchant initiated auth",NID_setext_miAuth,4,
-	&(lvalues[4240]),0},
+	&(lvalues[4236]),0},
 {"setext-pinSecure","setext-pinSecure",NID_setext_pinSecure,4,
-	&(lvalues[4244]),0},
-{"setext-pinAny","setext-pinAny",NID_setext_pinAny,4,&(lvalues[4248]),0},
-{"setext-track2","setext-track2",NID_setext_track2,4,&(lvalues[4252]),0},
+	&(lvalues[4240]),0},
+{"setext-pinAny","setext-pinAny",NID_setext_pinAny,4,&(lvalues[4244]),0},
+{"setext-track2","setext-track2",NID_setext_track2,4,&(lvalues[4248]),0},
 {"setext-cv","additional verification",NID_setext_cv,4,
-	&(lvalues[4256]),0},
+	&(lvalues[4252]),0},
 {"set-policy-root","set-policy-root",NID_set_policy_root,4,
-	&(lvalues[4260]),0},
+	&(lvalues[4256]),0},
 {"setCext-hashedRoot","setCext-hashedRoot",NID_setCext_hashedRoot,4,
-	&(lvalues[4264]),0},
+	&(lvalues[4260]),0},
 {"setCext-certType","setCext-certType",NID_setCext_certType,4,
-	&(lvalues[4268]),0},
+	&(lvalues[4264]),0},
 {"setCext-merchData","setCext-merchData",NID_setCext_merchData,4,
-	&(lvalues[4272]),0},
+	&(lvalues[4268]),0},
 {"setCext-cCertRequired","setCext-cCertRequired",
-	NID_setCext_cCertRequired,4,&(lvalues[4276]),0},
+	NID_setCext_cCertRequired,4,&(lvalues[4272]),0},
 {"setCext-tunneling","setCext-tunneling",NID_setCext_tunneling,4,
-	&(lvalues[4280]),0},
+	&(lvalues[4276]),0},
 {"setCext-setExt","setCext-setExt",NID_setCext_setExt,4,
-	&(lvalues[4284]),0},
+	&(lvalues[4280]),0},
 {"setCext-setQualf","setCext-setQualf",NID_setCext_setQualf,4,
-	&(lvalues[4288]),0},
+	&(lvalues[4284]),0},
 {"setCext-PGWYcapabilities","setCext-PGWYcapabilities",
-	NID_setCext_PGWYcapabilities,4,&(lvalues[4292]),0},
+	NID_setCext_PGWYcapabilities,4,&(lvalues[4288]),0},
 {"setCext-TokenIdentifier","setCext-TokenIdentifier",
-	NID_setCext_TokenIdentifier,4,&(lvalues[4296]),0},
+	NID_setCext_TokenIdentifier,4,&(lvalues[4292]),0},
 {"setCext-Track2Data","setCext-Track2Data",NID_setCext_Track2Data,4,
-	&(lvalues[4300]),0},
+	&(lvalues[4296]),0},
 {"setCext-TokenType","setCext-TokenType",NID_setCext_TokenType,4,
-	&(lvalues[4304]),0},
+	&(lvalues[4300]),0},
 {"setCext-IssuerCapabilities","setCext-IssuerCapabilities",
-	NID_setCext_IssuerCapabilities,4,&(lvalues[4308]),0},
-{"setAttr-Cert","setAttr-Cert",NID_setAttr_Cert,4,&(lvalues[4312]),0},
+	NID_setCext_IssuerCapabilities,4,&(lvalues[4304]),0},
+{"setAttr-Cert","setAttr-Cert",NID_setAttr_Cert,4,&(lvalues[4308]),0},
 {"setAttr-PGWYcap","payment gateway capabilities",NID_setAttr_PGWYcap,
-	4,&(lvalues[4316]),0},
+	4,&(lvalues[4312]),0},
 {"setAttr-TokenType","setAttr-TokenType",NID_setAttr_TokenType,4,
-	&(lvalues[4320]),0},
+	&(lvalues[4316]),0},
 {"setAttr-IssCap","issuer capabilities",NID_setAttr_IssCap,4,
-	&(lvalues[4324]),0},
+	&(lvalues[4320]),0},
 {"set-rootKeyThumb","set-rootKeyThumb",NID_set_rootKeyThumb,5,
-	&(lvalues[4328]),0},
-{"set-addPolicy","set-addPolicy",NID_set_addPolicy,5,&(lvalues[4333]),0},
+	&(lvalues[4324]),0},
+{"set-addPolicy","set-addPolicy",NID_set_addPolicy,5,&(lvalues[4329]),0},
 {"setAttr-Token-EMV","setAttr-Token-EMV",NID_setAttr_Token_EMV,5,
-	&(lvalues[4338]),0},
+	&(lvalues[4334]),0},
 {"setAttr-Token-B0Prime","setAttr-Token-B0Prime",
-	NID_setAttr_Token_B0Prime,5,&(lvalues[4343]),0},
+	NID_setAttr_Token_B0Prime,5,&(lvalues[4339]),0},
 {"setAttr-IssCap-CVM","setAttr-IssCap-CVM",NID_setAttr_IssCap_CVM,5,
-	&(lvalues[4348]),0},
+	&(lvalues[4344]),0},
 {"setAttr-IssCap-T2","setAttr-IssCap-T2",NID_setAttr_IssCap_T2,5,
-	&(lvalues[4353]),0},
+	&(lvalues[4349]),0},
 {"setAttr-IssCap-Sig","setAttr-IssCap-Sig",NID_setAttr_IssCap_Sig,5,
-	&(lvalues[4358]),0},
+	&(lvalues[4354]),0},
 {"setAttr-GenCryptgrm","generate cryptogram",NID_setAttr_GenCryptgrm,
-	6,&(lvalues[4363]),0},
+	6,&(lvalues[4359]),0},
 {"setAttr-T2Enc","encrypted track 2",NID_setAttr_T2Enc,6,
-	&(lvalues[4369]),0},
+	&(lvalues[4365]),0},
 {"setAttr-T2cleartxt","cleartext track 2",NID_setAttr_T2cleartxt,6,
-	&(lvalues[4375]),0},
+	&(lvalues[4371]),0},
 {"setAttr-TokICCsig","ICC or token signature",NID_setAttr_TokICCsig,6,
-	&(lvalues[4381]),0},
+	&(lvalues[4377]),0},
 {"setAttr-SecDevSig","secure device signature",NID_setAttr_SecDevSig,
-	6,&(lvalues[4387]),0},
+	6,&(lvalues[4383]),0},
 {"set-brand-IATA-ATA","set-brand-IATA-ATA",NID_set_brand_IATA_ATA,4,
-	&(lvalues[4393]),0},
+	&(lvalues[4389]),0},
 {"set-brand-Diners","set-brand-Diners",NID_set_brand_Diners,4,
-	&(lvalues[4397]),0},
+	&(lvalues[4393]),0},
 {"set-brand-AmericanExpress","set-brand-AmericanExpress",
-	NID_set_brand_AmericanExpress,4,&(lvalues[4401]),0},
-{"set-brand-JCB","set-brand-JCB",NID_set_brand_JCB,4,&(lvalues[4405]),0},
+	NID_set_brand_AmericanExpress,4,&(lvalues[4397]),0},
+{"set-brand-JCB","set-brand-JCB",NID_set_brand_JCB,4,&(lvalues[4401]),0},
 {"set-brand-Visa","set-brand-Visa",NID_set_brand_Visa,4,
-	&(lvalues[4409]),0},
+	&(lvalues[4405]),0},
 {"set-brand-MasterCard","set-brand-MasterCard",
-	NID_set_brand_MasterCard,4,&(lvalues[4413]),0},
+	NID_set_brand_MasterCard,4,&(lvalues[4409]),0},
 {"set-brand-Novus","set-brand-Novus",NID_set_brand_Novus,5,
-	&(lvalues[4417]),0},
-{"DES-CDMF","des-cdmf",NID_des_cdmf,8,&(lvalues[4422]),0},
+	&(lvalues[4413]),0},
+{"DES-CDMF","des-cdmf",NID_des_cdmf,8,&(lvalues[4418]),0},
 {"rsaOAEPEncryptionSET","rsaOAEPEncryptionSET",
-	NID_rsaOAEPEncryptionSET,9,&(lvalues[4430]),0},
-{"ITU-T","itu-t",NID_itu_t,1,&(lvalues[4439]),0},
-{"JOINT-ISO-ITU-T","joint-iso-itu-t",NID_joint_iso_itu_t,1,
-	&(lvalues[4440]),0},
+	NID_rsaOAEPEncryptionSET,9,&(lvalues[4426]),0},
+{"ITU-T","itu-t",NID_itu_t,0,NULL,0},
+{"JOINT-ISO-ITU-T","joint-iso-itu-t",NID_joint_iso_itu_t,0,NULL,0},
 {"international-organizations","International Organizations",
-	NID_international_organizations,1,&(lvalues[4441]),0},
+	NID_international_organizations,1,&(lvalues[4435]),0},
 {"msSmartcardLogin","Microsoft Smartcardlogin",NID_ms_smartcard_login,
-	10,&(lvalues[4442]),0},
+	10,&(lvalues[4436]),0},
 {"msUPN","Microsoft Universal Principal Name",NID_ms_upn,10,
-	&(lvalues[4452]),0},
+	&(lvalues[4446]),0},
 {"AES-128-CFB1","aes-128-cfb1",NID_aes_128_cfb1,0,NULL,0},
 {"AES-192-CFB1","aes-192-cfb1",NID_aes_192_cfb1,0,NULL,0},
 {"AES-256-CFB1","aes-256-cfb1",NID_aes_256_cfb1,0,NULL,0},
@@ -1979,138 +1972,138 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={
 {"DES-CFB8","des-cfb8",NID_des_cfb8,0,NULL,0},
 {"DES-EDE3-CFB1","des-ede3-cfb1",NID_des_ede3_cfb1,0,NULL,0},
 {"DES-EDE3-CFB8","des-ede3-cfb8",NID_des_ede3_cfb8,0,NULL,0},
-{"street","streetAddress",NID_streetAddress,3,&(lvalues[4462]),0},
-{"postalCode","postalCode",NID_postalCode,3,&(lvalues[4465]),0},
-{"id-ppl","id-ppl",NID_id_ppl,7,&(lvalues[4468]),0},
+{"street","streetAddress",NID_streetAddress,3,&(lvalues[4456]),0},
+{"postalCode","postalCode",NID_postalCode,3,&(lvalues[4459]),0},
+{"id-ppl","id-ppl",NID_id_ppl,7,&(lvalues[4462]),0},
 {"proxyCertInfo","Proxy Certificate Information",NID_proxyCertInfo,8,
-	&(lvalues[4475]),0},
+	&(lvalues[4469]),0},
 {"id-ppl-anyLanguage","Any language",NID_id_ppl_anyLanguage,8,
-	&(lvalues[4483]),0},
+	&(lvalues[4477]),0},
 {"id-ppl-inheritAll","Inherit all",NID_id_ppl_inheritAll,8,
-	&(lvalues[4491]),0},
+	&(lvalues[4485]),0},
 {"nameConstraints","X509v3 Name Constraints",NID_name_constraints,3,
-	&(lvalues[4499]),0},
-{"id-ppl-independent","Independent",NID_Independent,8,&(lvalues[4502]),0},
+	&(lvalues[4493]),0},
+{"id-ppl-independent","Independent",NID_Independent,8,&(lvalues[4496]),0},
 {"RSA-SHA256","sha256WithRSAEncryption",NID_sha256WithRSAEncryption,9,
-	&(lvalues[4510]),0},
+	&(lvalues[4504]),0},
 {"RSA-SHA384","sha384WithRSAEncryption",NID_sha384WithRSAEncryption,9,
-	&(lvalues[4519]),0},
+	&(lvalues[4513]),0},
 {"RSA-SHA512","sha512WithRSAEncryption",NID_sha512WithRSAEncryption,9,
-	&(lvalues[4528]),0},
+	&(lvalues[4522]),0},
 {"RSA-SHA224","sha224WithRSAEncryption",NID_sha224WithRSAEncryption,9,
-	&(lvalues[4537]),0},
-{"SHA256","sha256",NID_sha256,9,&(lvalues[4546]),0},
-{"SHA384","sha384",NID_sha384,9,&(lvalues[4555]),0},
-{"SHA512","sha512",NID_sha512,9,&(lvalues[4564]),0},
-{"SHA224","sha224",NID_sha224,9,&(lvalues[4573]),0},
+	&(lvalues[4531]),0},
+{"SHA256","sha256",NID_sha256,9,&(lvalues[4540]),0},
+{"SHA384","sha384",NID_sha384,9,&(lvalues[4549]),0},
+{"SHA512","sha512",NID_sha512,9,&(lvalues[4558]),0},
+{"SHA224","sha224",NID_sha224,9,&(lvalues[4567]),0},
 {"identified-organization","identified-organization",
-	NID_identified_organization,1,&(lvalues[4582]),0},
-{"certicom-arc","certicom-arc",NID_certicom_arc,3,&(lvalues[4583]),0},
-{"wap","wap",NID_wap,2,&(lvalues[4586]),0},
-{"wap-wsg","wap-wsg",NID_wap_wsg,3,&(lvalues[4588]),0},
+	NID_identified_organization,1,&(lvalues[4576]),0},
+{"certicom-arc","certicom-arc",NID_certicom_arc,3,&(lvalues[4577]),0},
+{"wap","wap",NID_wap,2,&(lvalues[4580]),0},
+{"wap-wsg","wap-wsg",NID_wap_wsg,3,&(lvalues[4582]),0},
 {"id-characteristic-two-basis","id-characteristic-two-basis",
-	NID_X9_62_id_characteristic_two_basis,8,&(lvalues[4591]),0},
-{"onBasis","onBasis",NID_X9_62_onBasis,9,&(lvalues[4599]),0},
-{"tpBasis","tpBasis",NID_X9_62_tpBasis,9,&(lvalues[4608]),0},
-{"ppBasis","ppBasis",NID_X9_62_ppBasis,9,&(lvalues[4617]),0},
-{"c2pnb163v1","c2pnb163v1",NID_X9_62_c2pnb163v1,8,&(lvalues[4626]),0},
-{"c2pnb163v2","c2pnb163v2",NID_X9_62_c2pnb163v2,8,&(lvalues[4634]),0},
-{"c2pnb163v3","c2pnb163v3",NID_X9_62_c2pnb163v3,8,&(lvalues[4642]),0},
-{"c2pnb176v1","c2pnb176v1",NID_X9_62_c2pnb176v1,8,&(lvalues[4650]),0},
-{"c2tnb191v1","c2tnb191v1",NID_X9_62_c2tnb191v1,8,&(lvalues[4658]),0},
-{"c2tnb191v2","c2tnb191v2",NID_X9_62_c2tnb191v2,8,&(lvalues[4666]),0},
-{"c2tnb191v3","c2tnb191v3",NID_X9_62_c2tnb191v3,8,&(lvalues[4674]),0},
-{"c2onb191v4","c2onb191v4",NID_X9_62_c2onb191v4,8,&(lvalues[4682]),0},
-{"c2onb191v5","c2onb191v5",NID_X9_62_c2onb191v5,8,&(lvalues[4690]),0},
-{"c2pnb208w1","c2pnb208w1",NID_X9_62_c2pnb208w1,8,&(lvalues[4698]),0},
-{"c2tnb239v1","c2tnb239v1",NID_X9_62_c2tnb239v1,8,&(lvalues[4706]),0},
-{"c2tnb239v2","c2tnb239v2",NID_X9_62_c2tnb239v2,8,&(lvalues[4714]),0},
-{"c2tnb239v3","c2tnb239v3",NID_X9_62_c2tnb239v3,8,&(lvalues[4722]),0},
-{"c2onb239v4","c2onb239v4",NID_X9_62_c2onb239v4,8,&(lvalues[4730]),0},
-{"c2onb239v5","c2onb239v5",NID_X9_62_c2onb239v5,8,&(lvalues[4738]),0},
-{"c2pnb272w1","c2pnb272w1",NID_X9_62_c2pnb272w1,8,&(lvalues[4746]),0},
-{"c2pnb304w1","c2pnb304w1",NID_X9_62_c2pnb304w1,8,&(lvalues[4754]),0},
-{"c2tnb359v1","c2tnb359v1",NID_X9_62_c2tnb359v1,8,&(lvalues[4762]),0},
-{"c2pnb368w1","c2pnb368w1",NID_X9_62_c2pnb368w1,8,&(lvalues[4770]),0},
-{"c2tnb431r1","c2tnb431r1",NID_X9_62_c2tnb431r1,8,&(lvalues[4778]),0},
-{"secp112r1","secp112r1",NID_secp112r1,5,&(lvalues[4786]),0},
-{"secp112r2","secp112r2",NID_secp112r2,5,&(lvalues[4791]),0},
-{"secp128r1","secp128r1",NID_secp128r1,5,&(lvalues[4796]),0},
-{"secp128r2","secp128r2",NID_secp128r2,5,&(lvalues[4801]),0},
-{"secp160k1","secp160k1",NID_secp160k1,5,&(lvalues[4806]),0},
-{"secp160r1","secp160r1",NID_secp160r1,5,&(lvalues[4811]),0},
-{"secp160r2","secp160r2",NID_secp160r2,5,&(lvalues[4816]),0},
-{"secp192k1","secp192k1",NID_secp192k1,5,&(lvalues[4821]),0},
-{"secp224k1","secp224k1",NID_secp224k1,5,&(lvalues[4826]),0},
-{"secp224r1","secp224r1",NID_secp224r1,5,&(lvalues[4831]),0},
-{"secp256k1","secp256k1",NID_secp256k1,5,&(lvalues[4836]),0},
-{"secp384r1","secp384r1",NID_secp384r1,5,&(lvalues[4841]),0},
-{"secp521r1","secp521r1",NID_secp521r1,5,&(lvalues[4846]),0},
-{"sect113r1","sect113r1",NID_sect113r1,5,&(lvalues[4851]),0},
-{"sect113r2","sect113r2",NID_sect113r2,5,&(lvalues[4856]),0},
-{"sect131r1","sect131r1",NID_sect131r1,5,&(lvalues[4861]),0},
-{"sect131r2","sect131r2",NID_sect131r2,5,&(lvalues[4866]),0},
-{"sect163k1","sect163k1",NID_sect163k1,5,&(lvalues[4871]),0},
-{"sect163r1","sect163r1",NID_sect163r1,5,&(lvalues[4876]),0},
-{"sect163r2","sect163r2",NID_sect163r2,5,&(lvalues[4881]),0},
-{"sect193r1","sect193r1",NID_sect193r1,5,&(lvalues[4886]),0},
-{"sect193r2","sect193r2",NID_sect193r2,5,&(lvalues[4891]),0},
-{"sect233k1","sect233k1",NID_sect233k1,5,&(lvalues[4896]),0},
-{"sect233r1","sect233r1",NID_sect233r1,5,&(lvalues[4901]),0},
-{"sect239k1","sect239k1",NID_sect239k1,5,&(lvalues[4906]),0},
-{"sect283k1","sect283k1",NID_sect283k1,5,&(lvalues[4911]),0},
-{"sect283r1","sect283r1",NID_sect283r1,5,&(lvalues[4916]),0},
-{"sect409k1","sect409k1",NID_sect409k1,5,&(lvalues[4921]),0},
-{"sect409r1","sect409r1",NID_sect409r1,5,&(lvalues[4926]),0},
-{"sect571k1","sect571k1",NID_sect571k1,5,&(lvalues[4931]),0},
-{"sect571r1","sect571r1",NID_sect571r1,5,&(lvalues[4936]),0},
+	NID_X9_62_id_characteristic_two_basis,8,&(lvalues[4585]),0},
+{"onBasis","onBasis",NID_X9_62_onBasis,9,&(lvalues[4593]),0},
+{"tpBasis","tpBasis",NID_X9_62_tpBasis,9,&(lvalues[4602]),0},
+{"ppBasis","ppBasis",NID_X9_62_ppBasis,9,&(lvalues[4611]),0},
+{"c2pnb163v1","c2pnb163v1",NID_X9_62_c2pnb163v1,8,&(lvalues[4620]),0},
+{"c2pnb163v2","c2pnb163v2",NID_X9_62_c2pnb163v2,8,&(lvalues[4628]),0},
+{"c2pnb163v3","c2pnb163v3",NID_X9_62_c2pnb163v3,8,&(lvalues[4636]),0},
+{"c2pnb176v1","c2pnb176v1",NID_X9_62_c2pnb176v1,8,&(lvalues[4644]),0},
+{"c2tnb191v1","c2tnb191v1",NID_X9_62_c2tnb191v1,8,&(lvalues[4652]),0},
+{"c2tnb191v2","c2tnb191v2",NID_X9_62_c2tnb191v2,8,&(lvalues[4660]),0},
+{"c2tnb191v3","c2tnb191v3",NID_X9_62_c2tnb191v3,8,&(lvalues[4668]),0},
+{"c2onb191v4","c2onb191v4",NID_X9_62_c2onb191v4,8,&(lvalues[4676]),0},
+{"c2onb191v5","c2onb191v5",NID_X9_62_c2onb191v5,8,&(lvalues[4684]),0},
+{"c2pnb208w1","c2pnb208w1",NID_X9_62_c2pnb208w1,8,&(lvalues[4692]),0},
+{"c2tnb239v1","c2tnb239v1",NID_X9_62_c2tnb239v1,8,&(lvalues[4700]),0},
+{"c2tnb239v2","c2tnb239v2",NID_X9_62_c2tnb239v2,8,&(lvalues[4708]),0},
+{"c2tnb239v3","c2tnb239v3",NID_X9_62_c2tnb239v3,8,&(lvalues[4716]),0},
+{"c2onb239v4","c2onb239v4",NID_X9_62_c2onb239v4,8,&(lvalues[4724]),0},
+{"c2onb239v5","c2onb239v5",NID_X9_62_c2onb239v5,8,&(lvalues[4732]),0},
+{"c2pnb272w1","c2pnb272w1",NID_X9_62_c2pnb272w1,8,&(lvalues[4740]),0},
+{"c2pnb304w1","c2pnb304w1",NID_X9_62_c2pnb304w1,8,&(lvalues[4748]),0},
+{"c2tnb359v1","c2tnb359v1",NID_X9_62_c2tnb359v1,8,&(lvalues[4756]),0},
+{"c2pnb368w1","c2pnb368w1",NID_X9_62_c2pnb368w1,8,&(lvalues[4764]),0},
+{"c2tnb431r1","c2tnb431r1",NID_X9_62_c2tnb431r1,8,&(lvalues[4772]),0},
+{"secp112r1","secp112r1",NID_secp112r1,5,&(lvalues[4780]),0},
+{"secp112r2","secp112r2",NID_secp112r2,5,&(lvalues[4785]),0},
+{"secp128r1","secp128r1",NID_secp128r1,5,&(lvalues[4790]),0},
+{"secp128r2","secp128r2",NID_secp128r2,5,&(lvalues[4795]),0},
+{"secp160k1","secp160k1",NID_secp160k1,5,&(lvalues[4800]),0},
+{"secp160r1","secp160r1",NID_secp160r1,5,&(lvalues[4805]),0},
+{"secp160r2","secp160r2",NID_secp160r2,5,&(lvalues[4810]),0},
+{"secp192k1","secp192k1",NID_secp192k1,5,&(lvalues[4815]),0},
+{"secp224k1","secp224k1",NID_secp224k1,5,&(lvalues[4820]),0},
+{"secp224r1","secp224r1",NID_secp224r1,5,&(lvalues[4825]),0},
+{"secp256k1","secp256k1",NID_secp256k1,5,&(lvalues[4830]),0},
+{"secp384r1","secp384r1",NID_secp384r1,5,&(lvalues[4835]),0},
+{"secp521r1","secp521r1",NID_secp521r1,5,&(lvalues[4840]),0},
+{"sect113r1","sect113r1",NID_sect113r1,5,&(lvalues[4845]),0},
+{"sect113r2","sect113r2",NID_sect113r2,5,&(lvalues[4850]),0},
+{"sect131r1","sect131r1",NID_sect131r1,5,&(lvalues[4855]),0},
+{"sect131r2","sect131r2",NID_sect131r2,5,&(lvalues[4860]),0},
+{"sect163k1","sect163k1",NID_sect163k1,5,&(lvalues[4865]),0},
+{"sect163r1","sect163r1",NID_sect163r1,5,&(lvalues[4870]),0},
+{"sect163r2","sect163r2",NID_sect163r2,5,&(lvalues[4875]),0},
+{"sect193r1","sect193r1",NID_sect193r1,5,&(lvalues[4880]),0},
+{"sect193r2","sect193r2",NID_sect193r2,5,&(lvalues[4885]),0},
+{"sect233k1","sect233k1",NID_sect233k1,5,&(lvalues[4890]),0},
+{"sect233r1","sect233r1",NID_sect233r1,5,&(lvalues[4895]),0},
+{"sect239k1","sect239k1",NID_sect239k1,5,&(lvalues[4900]),0},
+{"sect283k1","sect283k1",NID_sect283k1,5,&(lvalues[4905]),0},
+{"sect283r1","sect283r1",NID_sect283r1,5,&(lvalues[4910]),0},
+{"sect409k1","sect409k1",NID_sect409k1,5,&(lvalues[4915]),0},
+{"sect409r1","sect409r1",NID_sect409r1,5,&(lvalues[4920]),0},
+{"sect571k1","sect571k1",NID_sect571k1,5,&(lvalues[4925]),0},
+{"sect571r1","sect571r1",NID_sect571r1,5,&(lvalues[4930]),0},
 {"wap-wsg-idm-ecid-wtls1","wap-wsg-idm-ecid-wtls1",
-	NID_wap_wsg_idm_ecid_wtls1,5,&(lvalues[4941]),0},
+	NID_wap_wsg_idm_ecid_wtls1,5,&(lvalues[4935]),0},
 {"wap-wsg-idm-ecid-wtls3","wap-wsg-idm-ecid-wtls3",
-	NID_wap_wsg_idm_ecid_wtls3,5,&(lvalues[4946]),0},
+	NID_wap_wsg_idm_ecid_wtls3,5,&(lvalues[4940]),0},
 {"wap-wsg-idm-ecid-wtls4","wap-wsg-idm-ecid-wtls4",
-	NID_wap_wsg_idm_ecid_wtls4,5,&(lvalues[4951]),0},
+	NID_wap_wsg_idm_ecid_wtls4,5,&(lvalues[4945]),0},
 {"wap-wsg-idm-ecid-wtls5","wap-wsg-idm-ecid-wtls5",
-	NID_wap_wsg_idm_ecid_wtls5,5,&(lvalues[4956]),0},
+	NID_wap_wsg_idm_ecid_wtls5,5,&(lvalues[4950]),0},
 {"wap-wsg-idm-ecid-wtls6","wap-wsg-idm-ecid-wtls6",
-	NID_wap_wsg_idm_ecid_wtls6,5,&(lvalues[4961]),0},
+	NID_wap_wsg_idm_ecid_wtls6,5,&(lvalues[4955]),0},
 {"wap-wsg-idm-ecid-wtls7","wap-wsg-idm-ecid-wtls7",
-	NID_wap_wsg_idm_ecid_wtls7,5,&(lvalues[4966]),0},
+	NID_wap_wsg_idm_ecid_wtls7,5,&(lvalues[4960]),0},
 {"wap-wsg-idm-ecid-wtls8","wap-wsg-idm-ecid-wtls8",
-	NID_wap_wsg_idm_ecid_wtls8,5,&(lvalues[4971]),0},
+	NID_wap_wsg_idm_ecid_wtls8,5,&(lvalues[4965]),0},
 {"wap-wsg-idm-ecid-wtls9","wap-wsg-idm-ecid-wtls9",
-	NID_wap_wsg_idm_ecid_wtls9,5,&(lvalues[4976]),0},
+	NID_wap_wsg_idm_ecid_wtls9,5,&(lvalues[4970]),0},
 {"wap-wsg-idm-ecid-wtls10","wap-wsg-idm-ecid-wtls10",
-	NID_wap_wsg_idm_ecid_wtls10,5,&(lvalues[4981]),0},
+	NID_wap_wsg_idm_ecid_wtls10,5,&(lvalues[4975]),0},
 {"wap-wsg-idm-ecid-wtls11","wap-wsg-idm-ecid-wtls11",
-	NID_wap_wsg_idm_ecid_wtls11,5,&(lvalues[4986]),0},
+	NID_wap_wsg_idm_ecid_wtls11,5,&(lvalues[4980]),0},
 {"wap-wsg-idm-ecid-wtls12","wap-wsg-idm-ecid-wtls12",
-	NID_wap_wsg_idm_ecid_wtls12,5,&(lvalues[4991]),0},
-{"anyPolicy","X509v3 Any Policy",NID_any_policy,4,&(lvalues[4996]),0},
+	NID_wap_wsg_idm_ecid_wtls12,5,&(lvalues[4985]),0},
+{"anyPolicy","X509v3 Any Policy",NID_any_policy,4,&(lvalues[4990]),0},
 {"policyMappings","X509v3 Policy Mappings",NID_policy_mappings,3,
-	&(lvalues[5000]),0},
+	&(lvalues[4994]),0},
 {"inhibitAnyPolicy","X509v3 Inhibit Any Policy",
-	NID_inhibit_any_policy,3,&(lvalues[5003]),0},
+	NID_inhibit_any_policy,3,&(lvalues[4997]),0},
 {"Oakley-EC2N-3","ipsec3",NID_ipsec3,0,NULL,0},
 {"Oakley-EC2N-4","ipsec4",NID_ipsec4,0,NULL,0},
 {"CAMELLIA-128-CBC","camellia-128-cbc",NID_camellia_128_cbc,11,
-	&(lvalues[5006]),0},
+	&(lvalues[5000]),0},
 {"CAMELLIA-192-CBC","camellia-192-cbc",NID_camellia_192_cbc,11,
-	&(lvalues[5017]),0},
+	&(lvalues[5011]),0},
 {"CAMELLIA-256-CBC","camellia-256-cbc",NID_camellia_256_cbc,11,
-	&(lvalues[5028]),0},
+	&(lvalues[5022]),0},
 {"CAMELLIA-128-ECB","camellia-128-ecb",NID_camellia_128_ecb,8,
-	&(lvalues[5039]),0},
+	&(lvalues[5033]),0},
 {"CAMELLIA-192-ECB","camellia-192-ecb",NID_camellia_192_ecb,8,
-	&(lvalues[5047]),0},
+	&(lvalues[5041]),0},
 {"CAMELLIA-256-ECB","camellia-256-ecb",NID_camellia_256_ecb,8,
-	&(lvalues[5055]),0},
+	&(lvalues[5049]),0},
 {"CAMELLIA-128-CFB","camellia-128-cfb",NID_camellia_128_cfb128,8,
-	&(lvalues[5063]),0},
+	&(lvalues[5057]),0},
 {"CAMELLIA-192-CFB","camellia-192-cfb",NID_camellia_192_cfb128,8,
-	&(lvalues[5071]),0},
+	&(lvalues[5065]),0},
 {"CAMELLIA-256-CFB","camellia-256-cfb",NID_camellia_256_cfb128,8,
-	&(lvalues[5079]),0},
+	&(lvalues[5073]),0},
 {"CAMELLIA-128-CFB1","camellia-128-cfb1",NID_camellia_128_cfb1,0,NULL,0},
 {"CAMELLIA-192-CFB1","camellia-192-cfb1",NID_camellia_192_cfb1,0,NULL,0},
 {"CAMELLIA-256-CFB1","camellia-256-cfb1",NID_camellia_256_cfb1,0,NULL,0},
@@ -2118,284 +2111,284 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={
 {"CAMELLIA-192-CFB8","camellia-192-cfb8",NID_camellia_192_cfb8,0,NULL,0},
 {"CAMELLIA-256-CFB8","camellia-256-cfb8",NID_camellia_256_cfb8,0,NULL,0},
 {"CAMELLIA-128-OFB","camellia-128-ofb",NID_camellia_128_ofb128,8,
-	&(lvalues[5087]),0},
+	&(lvalues[5081]),0},
 {"CAMELLIA-192-OFB","camellia-192-ofb",NID_camellia_192_ofb128,8,
-	&(lvalues[5095]),0},
+	&(lvalues[5089]),0},
 {"CAMELLIA-256-OFB","camellia-256-ofb",NID_camellia_256_ofb128,8,
-	&(lvalues[5103]),0},
+	&(lvalues[5097]),0},
 {"subjectDirectoryAttributes","X509v3 Subject Directory Attributes",
-	NID_subject_directory_attributes,3,&(lvalues[5111]),0},
+	NID_subject_directory_attributes,3,&(lvalues[5105]),0},
 {"issuingDistributionPoint","X509v3 Issuing Distrubution Point",
-	NID_issuing_distribution_point,3,&(lvalues[5114]),0},
+	NID_issuing_distribution_point,3,&(lvalues[5108]),0},
 {"certificateIssuer","X509v3 Certificate Issuer",
-	NID_certificate_issuer,3,&(lvalues[5117]),0},
+	NID_certificate_issuer,3,&(lvalues[5111]),0},
 {NULL,NULL,NID_undef,0,NULL,0},
-{"KISA","kisa",NID_kisa,6,&(lvalues[5120]),0},
+{"KISA","kisa",NID_kisa,6,&(lvalues[5114]),0},
 {NULL,NULL,NID_undef,0,NULL,0},
 {NULL,NULL,NID_undef,0,NULL,0},
-{"SEED-ECB","seed-ecb",NID_seed_ecb,8,&(lvalues[5126]),0},
-{"SEED-CBC","seed-cbc",NID_seed_cbc,8,&(lvalues[5134]),0},
-{"SEED-OFB","seed-ofb",NID_seed_ofb128,8,&(lvalues[5142]),0},
-{"SEED-CFB","seed-cfb",NID_seed_cfb128,8,&(lvalues[5150]),0},
-{"HMAC-MD5","hmac-md5",NID_hmac_md5,8,&(lvalues[5158]),0},
-{"HMAC-SHA1","hmac-sha1",NID_hmac_sha1,8,&(lvalues[5166]),0},
+{"SEED-ECB","seed-ecb",NID_seed_ecb,8,&(lvalues[5120]),0},
+{"SEED-CBC","seed-cbc",NID_seed_cbc,8,&(lvalues[5128]),0},
+{"SEED-OFB","seed-ofb",NID_seed_ofb128,8,&(lvalues[5136]),0},
+{"SEED-CFB","seed-cfb",NID_seed_cfb128,8,&(lvalues[5144]),0},
+{"HMAC-MD5","hmac-md5",NID_hmac_md5,8,&(lvalues[5152]),0},
+{"HMAC-SHA1","hmac-sha1",NID_hmac_sha1,8,&(lvalues[5160]),0},
 {"id-PasswordBasedMAC","password based MAC",NID_id_PasswordBasedMAC,9,
-	&(lvalues[5174]),0},
+	&(lvalues[5168]),0},
 {"id-DHBasedMac","Diffie-Hellman based MAC",NID_id_DHBasedMac,9,
-	&(lvalues[5183]),0},
+	&(lvalues[5177]),0},
 {"id-it-suppLangTags","id-it-suppLangTags",NID_id_it_suppLangTags,8,
-	&(lvalues[5192]),0},
-{"caRepository","CA Repository",NID_caRepository,8,&(lvalues[5200]),0},
+	&(lvalues[5186]),0},
+{"caRepository","CA Repository",NID_caRepository,8,&(lvalues[5194]),0},
 {"id-smime-ct-compressedData","id-smime-ct-compressedData",
-	NID_id_smime_ct_compressedData,11,&(lvalues[5208]),0},
+	NID_id_smime_ct_compressedData,11,&(lvalues[5202]),0},
 {"id-ct-asciiTextWithCRLF","id-ct-asciiTextWithCRLF",
-	NID_id_ct_asciiTextWithCRLF,11,&(lvalues[5219]),0},
+	NID_id_ct_asciiTextWithCRLF,11,&(lvalues[5213]),0},
 {"id-aes128-wrap","id-aes128-wrap",NID_id_aes128_wrap,9,
-	&(lvalues[5230]),0},
+	&(lvalues[5224]),0},
 {"id-aes192-wrap","id-aes192-wrap",NID_id_aes192_wrap,9,
-	&(lvalues[5239]),0},
+	&(lvalues[5233]),0},
 {"id-aes256-wrap","id-aes256-wrap",NID_id_aes256_wrap,9,
-	&(lvalues[5248]),0},
+	&(lvalues[5242]),0},
 {"ecdsa-with-Recommended","ecdsa-with-Recommended",
-	NID_ecdsa_with_Recommended,7,&(lvalues[5257]),0},
+	NID_ecdsa_with_Recommended,7,&(lvalues[5251]),0},
 {"ecdsa-with-Specified","ecdsa-with-Specified",
-	NID_ecdsa_with_Specified,7,&(lvalues[5264]),0},
+	NID_ecdsa_with_Specified,7,&(lvalues[5258]),0},
 {"ecdsa-with-SHA224","ecdsa-with-SHA224",NID_ecdsa_with_SHA224,8,
-	&(lvalues[5271]),0},
+	&(lvalues[5265]),0},
 {"ecdsa-with-SHA256","ecdsa-with-SHA256",NID_ecdsa_with_SHA256,8,
-	&(lvalues[5279]),0},
+	&(lvalues[5273]),0},
 {"ecdsa-with-SHA384","ecdsa-with-SHA384",NID_ecdsa_with_SHA384,8,
-	&(lvalues[5287]),0},
+	&(lvalues[5281]),0},
 {"ecdsa-with-SHA512","ecdsa-with-SHA512",NID_ecdsa_with_SHA512,8,
-	&(lvalues[5295]),0},
-{"hmacWithMD5","hmacWithMD5",NID_hmacWithMD5,8,&(lvalues[5303]),0},
+	&(lvalues[5289]),0},
+{"hmacWithMD5","hmacWithMD5",NID_hmacWithMD5,8,&(lvalues[5297]),0},
 {"hmacWithSHA224","hmacWithSHA224",NID_hmacWithSHA224,8,
-	&(lvalues[5311]),0},
+	&(lvalues[5305]),0},
 {"hmacWithSHA256","hmacWithSHA256",NID_hmacWithSHA256,8,
-	&(lvalues[5319]),0},
+	&(lvalues[5313]),0},
 {"hmacWithSHA384","hmacWithSHA384",NID_hmacWithSHA384,8,
-	&(lvalues[5327]),0},
+	&(lvalues[5321]),0},
 {"hmacWithSHA512","hmacWithSHA512",NID_hmacWithSHA512,8,
-	&(lvalues[5335]),0},
+	&(lvalues[5329]),0},
 {"dsa_with_SHA224","dsa_with_SHA224",NID_dsa_with_SHA224,9,
-	&(lvalues[5343]),0},
+	&(lvalues[5337]),0},
 {"dsa_with_SHA256","dsa_with_SHA256",NID_dsa_with_SHA256,9,
-	&(lvalues[5352]),0},
-{"whirlpool","whirlpool",NID_whirlpool,6,&(lvalues[5361]),0},
-{"cryptopro","cryptopro",NID_cryptopro,5,&(lvalues[5367]),0},
-{"cryptocom","cryptocom",NID_cryptocom,5,&(lvalues[5372]),0},
+	&(lvalues[5346]),0},
+{"whirlpool","whirlpool",NID_whirlpool,6,&(lvalues[5355]),0},
+{"cryptopro","cryptopro",NID_cryptopro,5,&(lvalues[5361]),0},
+{"cryptocom","cryptocom",NID_cryptocom,5,&(lvalues[5366]),0},
 {"id-GostR3411-94-with-GostR3410-2001",
 	"GOST R 34.11-94 with GOST R 34.10-2001",
-	NID_id_GostR3411_94_with_GostR3410_2001,6,&(lvalues[5377]),0},
+	NID_id_GostR3411_94_with_GostR3410_2001,6,&(lvalues[5371]),0},
 {"id-GostR3411-94-with-GostR3410-94",
 	"GOST R 34.11-94 with GOST R 34.10-94",
-	NID_id_GostR3411_94_with_GostR3410_94,6,&(lvalues[5383]),0},
-{"md_gost94","GOST R 34.11-94",NID_id_GostR3411_94,6,&(lvalues[5389]),0},
+	NID_id_GostR3411_94_with_GostR3410_94,6,&(lvalues[5377]),0},
+{"md_gost94","GOST R 34.11-94",NID_id_GostR3411_94,6,&(lvalues[5383]),0},
 {"id-HMACGostR3411-94","HMAC GOST 34.11-94",NID_id_HMACGostR3411_94,6,
-	&(lvalues[5395]),0},
+	&(lvalues[5389]),0},
 {"gost2001","GOST R 34.10-2001",NID_id_GostR3410_2001,6,
-	&(lvalues[5401]),0},
-{"gost94","GOST R 34.10-94",NID_id_GostR3410_94,6,&(lvalues[5407]),0},
-{"gost89","GOST 28147-89",NID_id_Gost28147_89,6,&(lvalues[5413]),0},
+	&(lvalues[5395]),0},
+{"gost94","GOST R 34.10-94",NID_id_GostR3410_94,6,&(lvalues[5401]),0},
+{"gost89","GOST 28147-89",NID_id_Gost28147_89,6,&(lvalues[5407]),0},
 {"gost89-cnt","gost89-cnt",NID_gost89_cnt,0,NULL,0},
 {"gost-mac","GOST 28147-89 MAC",NID_id_Gost28147_89_MAC,6,
-	&(lvalues[5419]),0},
+	&(lvalues[5413]),0},
 {"prf-gostr3411-94","GOST R 34.11-94 PRF",NID_id_GostR3411_94_prf,6,
-	&(lvalues[5425]),0},
+	&(lvalues[5419]),0},
 {"id-GostR3410-2001DH","GOST R 34.10-2001 DH",NID_id_GostR3410_2001DH,
-	6,&(lvalues[5431]),0},
+	6,&(lvalues[5425]),0},
 {"id-GostR3410-94DH","GOST R 34.10-94 DH",NID_id_GostR3410_94DH,6,
-	&(lvalues[5437]),0},
+	&(lvalues[5431]),0},
 {"id-Gost28147-89-CryptoPro-KeyMeshing",
 	"id-Gost28147-89-CryptoPro-KeyMeshing",
-	NID_id_Gost28147_89_CryptoPro_KeyMeshing,7,&(lvalues[5443]),0},
+	NID_id_Gost28147_89_CryptoPro_KeyMeshing,7,&(lvalues[5437]),0},
 {"id-Gost28147-89-None-KeyMeshing","id-Gost28147-89-None-KeyMeshing",
-	NID_id_Gost28147_89_None_KeyMeshing,7,&(lvalues[5450]),0},
+	NID_id_Gost28147_89_None_KeyMeshing,7,&(lvalues[5444]),0},
 {"id-GostR3411-94-TestParamSet","id-GostR3411-94-TestParamSet",
-	NID_id_GostR3411_94_TestParamSet,7,&(lvalues[5457]),0},
+	NID_id_GostR3411_94_TestParamSet,7,&(lvalues[5451]),0},
 {"id-GostR3411-94-CryptoProParamSet",
 	"id-GostR3411-94-CryptoProParamSet",
-	NID_id_GostR3411_94_CryptoProParamSet,7,&(lvalues[5464]),0},
+	NID_id_GostR3411_94_CryptoProParamSet,7,&(lvalues[5458]),0},
 {"id-Gost28147-89-TestParamSet","id-Gost28147-89-TestParamSet",
-	NID_id_Gost28147_89_TestParamSet,7,&(lvalues[5471]),0},
+	NID_id_Gost28147_89_TestParamSet,7,&(lvalues[5465]),0},
 {"id-Gost28147-89-CryptoPro-A-ParamSet",
 	"id-Gost28147-89-CryptoPro-A-ParamSet",
-	NID_id_Gost28147_89_CryptoPro_A_ParamSet,7,&(lvalues[5478]),0},
+	NID_id_Gost28147_89_CryptoPro_A_ParamSet,7,&(lvalues[5472]),0},
 {"id-Gost28147-89-CryptoPro-B-ParamSet",
 	"id-Gost28147-89-CryptoPro-B-ParamSet",
-	NID_id_Gost28147_89_CryptoPro_B_ParamSet,7,&(lvalues[5485]),0},
+	NID_id_Gost28147_89_CryptoPro_B_ParamSet,7,&(lvalues[5479]),0},
 {"id-Gost28147-89-CryptoPro-C-ParamSet",
 	"id-Gost28147-89-CryptoPro-C-ParamSet",
-	NID_id_Gost28147_89_CryptoPro_C_ParamSet,7,&(lvalues[5492]),0},
+	NID_id_Gost28147_89_CryptoPro_C_ParamSet,7,&(lvalues[5486]),0},
 {"id-Gost28147-89-CryptoPro-D-ParamSet",
 	"id-Gost28147-89-CryptoPro-D-ParamSet",
-	NID_id_Gost28147_89_CryptoPro_D_ParamSet,7,&(lvalues[5499]),0},
+	NID_id_Gost28147_89_CryptoPro_D_ParamSet,7,&(lvalues[5493]),0},
 {"id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet",
 	"id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet",
-	NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet,7,&(lvalues[5506]),
+	NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet,7,&(lvalues[5500]),
 	0},
 {"id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet",
 	"id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet",
-	NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet,7,&(lvalues[5513]),
+	NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet,7,&(lvalues[5507]),
 	0},
 {"id-Gost28147-89-CryptoPro-RIC-1-ParamSet",
 	"id-Gost28147-89-CryptoPro-RIC-1-ParamSet",
-	NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet,7,&(lvalues[5520]),0},
+	NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet,7,&(lvalues[5514]),0},
 {"id-GostR3410-94-TestParamSet","id-GostR3410-94-TestParamSet",
-	NID_id_GostR3410_94_TestParamSet,7,&(lvalues[5527]),0},
+	NID_id_GostR3410_94_TestParamSet,7,&(lvalues[5521]),0},
 {"id-GostR3410-94-CryptoPro-A-ParamSet",
 	"id-GostR3410-94-CryptoPro-A-ParamSet",
-	NID_id_GostR3410_94_CryptoPro_A_ParamSet,7,&(lvalues[5534]),0},
+	NID_id_GostR3410_94_CryptoPro_A_ParamSet,7,&(lvalues[5528]),0},
 {"id-GostR3410-94-CryptoPro-B-ParamSet",
 	"id-GostR3410-94-CryptoPro-B-ParamSet",
-	NID_id_GostR3410_94_CryptoPro_B_ParamSet,7,&(lvalues[5541]),0},
+	NID_id_GostR3410_94_CryptoPro_B_ParamSet,7,&(lvalues[5535]),0},
 {"id-GostR3410-94-CryptoPro-C-ParamSet",
 	"id-GostR3410-94-CryptoPro-C-ParamSet",
-	NID_id_GostR3410_94_CryptoPro_C_ParamSet,7,&(lvalues[5548]),0},
+	NID_id_GostR3410_94_CryptoPro_C_ParamSet,7,&(lvalues[5542]),0},
 {"id-GostR3410-94-CryptoPro-D-ParamSet",
 	"id-GostR3410-94-CryptoPro-D-ParamSet",
-	NID_id_GostR3410_94_CryptoPro_D_ParamSet,7,&(lvalues[5555]),0},
+	NID_id_GostR3410_94_CryptoPro_D_ParamSet,7,&(lvalues[5549]),0},
 {"id-GostR3410-94-CryptoPro-XchA-ParamSet",
 	"id-GostR3410-94-CryptoPro-XchA-ParamSet",
-	NID_id_GostR3410_94_CryptoPro_XchA_ParamSet,7,&(lvalues[5562]),0},
+	NID_id_GostR3410_94_CryptoPro_XchA_ParamSet,7,&(lvalues[5556]),0},
 {"id-GostR3410-94-CryptoPro-XchB-ParamSet",
 	"id-GostR3410-94-CryptoPro-XchB-ParamSet",
-	NID_id_GostR3410_94_CryptoPro_XchB_ParamSet,7,&(lvalues[5569]),0},
+	NID_id_GostR3410_94_CryptoPro_XchB_ParamSet,7,&(lvalues[5563]),0},
 {"id-GostR3410-94-CryptoPro-XchC-ParamSet",
 	"id-GostR3410-94-CryptoPro-XchC-ParamSet",
-	NID_id_GostR3410_94_CryptoPro_XchC_ParamSet,7,&(lvalues[5576]),0},
+	NID_id_GostR3410_94_CryptoPro_XchC_ParamSet,7,&(lvalues[5570]),0},
 {"id-GostR3410-2001-TestParamSet","id-GostR3410-2001-TestParamSet",
-	NID_id_GostR3410_2001_TestParamSet,7,&(lvalues[5583]),0},
+	NID_id_GostR3410_2001_TestParamSet,7,&(lvalues[5577]),0},
 {"id-GostR3410-2001-CryptoPro-A-ParamSet",
 	"id-GostR3410-2001-CryptoPro-A-ParamSet",
-	NID_id_GostR3410_2001_CryptoPro_A_ParamSet,7,&(lvalues[5590]),0},
+	NID_id_GostR3410_2001_CryptoPro_A_ParamSet,7,&(lvalues[5584]),0},
 {"id-GostR3410-2001-CryptoPro-B-ParamSet",
 	"id-GostR3410-2001-CryptoPro-B-ParamSet",
-	NID_id_GostR3410_2001_CryptoPro_B_ParamSet,7,&(lvalues[5597]),0},
+	NID_id_GostR3410_2001_CryptoPro_B_ParamSet,7,&(lvalues[5591]),0},
 {"id-GostR3410-2001-CryptoPro-C-ParamSet",
 	"id-GostR3410-2001-CryptoPro-C-ParamSet",
-	NID_id_GostR3410_2001_CryptoPro_C_ParamSet,7,&(lvalues[5604]),0},
+	NID_id_GostR3410_2001_CryptoPro_C_ParamSet,7,&(lvalues[5598]),0},
 {"id-GostR3410-2001-CryptoPro-XchA-ParamSet",
 	"id-GostR3410-2001-CryptoPro-XchA-ParamSet",
-	NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet,7,&(lvalues[5611]),0},
+	NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet,7,&(lvalues[5605]),0},
 	
 {"id-GostR3410-2001-CryptoPro-XchB-ParamSet",
 	"id-GostR3410-2001-CryptoPro-XchB-ParamSet",
-	NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet,7,&(lvalues[5618]),0},
+	NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet,7,&(lvalues[5612]),0},
 	
 {"id-GostR3410-94-a","id-GostR3410-94-a",NID_id_GostR3410_94_a,7,
-	&(lvalues[5625]),0},
+	&(lvalues[5619]),0},
 {"id-GostR3410-94-aBis","id-GostR3410-94-aBis",
-	NID_id_GostR3410_94_aBis,7,&(lvalues[5632]),0},
+	NID_id_GostR3410_94_aBis,7,&(lvalues[5626]),0},
 {"id-GostR3410-94-b","id-GostR3410-94-b",NID_id_GostR3410_94_b,7,
-	&(lvalues[5639]),0},
+	&(lvalues[5633]),0},
 {"id-GostR3410-94-bBis","id-GostR3410-94-bBis",
-	NID_id_GostR3410_94_bBis,7,&(lvalues[5646]),0},
+	NID_id_GostR3410_94_bBis,7,&(lvalues[5640]),0},
 {"id-Gost28147-89-cc","GOST 28147-89 Cryptocom ParamSet",
-	NID_id_Gost28147_89_cc,8,&(lvalues[5653]),0},
+	NID_id_Gost28147_89_cc,8,&(lvalues[5647]),0},
 {"gost94cc","GOST 34.10-94 Cryptocom",NID_id_GostR3410_94_cc,8,
-	&(lvalues[5661]),0},
+	&(lvalues[5655]),0},
 {"gost2001cc","GOST 34.10-2001 Cryptocom",NID_id_GostR3410_2001_cc,8,
-	&(lvalues[5669]),0},
+	&(lvalues[5663]),0},
 {"id-GostR3411-94-with-GostR3410-94-cc",
 	"GOST R 34.11-94 with GOST R 34.10-94 Cryptocom",
-	NID_id_GostR3411_94_with_GostR3410_94_cc,8,&(lvalues[5677]),0},
+	NID_id_GostR3411_94_with_GostR3410_94_cc,8,&(lvalues[5671]),0},
 {"id-GostR3411-94-with-GostR3410-2001-cc",
 	"GOST R 34.11-94 with GOST R 34.10-2001 Cryptocom",
-	NID_id_GostR3411_94_with_GostR3410_2001_cc,8,&(lvalues[5685]),0},
+	NID_id_GostR3411_94_with_GostR3410_2001_cc,8,&(lvalues[5679]),0},
 {"id-GostR3410-2001-ParamSet-cc",
 	"GOST R 3410-2001 Parameter Set Cryptocom",
-	NID_id_GostR3410_2001_ParamSet_cc,8,&(lvalues[5693]),0},
+	NID_id_GostR3410_2001_ParamSet_cc,8,&(lvalues[5687]),0},
 {"HMAC","hmac",NID_hmac,0,NULL,0},
 {"LocalKeySet","Microsoft Local Key set",NID_LocalKeySet,9,
-	&(lvalues[5701]),0},
+	&(lvalues[5695]),0},
 {"freshestCRL","X509v3 Freshest CRL",NID_freshest_crl,3,
-	&(lvalues[5710]),0},
+	&(lvalues[5704]),0},
 {"id-on-permanentIdentifier","Permanent Identifier",
-	NID_id_on_permanentIdentifier,8,&(lvalues[5713]),0},
-{"searchGuide","searchGuide",NID_searchGuide,3,&(lvalues[5721]),0},
+	NID_id_on_permanentIdentifier,8,&(lvalues[5707]),0},
+{"searchGuide","searchGuide",NID_searchGuide,3,&(lvalues[5715]),0},
 {"businessCategory","businessCategory",NID_businessCategory,3,
-	&(lvalues[5724]),0},
-{"postalAddress","postalAddress",NID_postalAddress,3,&(lvalues[5727]),0},
-{"postOfficeBox","postOfficeBox",NID_postOfficeBox,3,&(lvalues[5730]),0},
+	&(lvalues[5718]),0},
+{"postalAddress","postalAddress",NID_postalAddress,3,&(lvalues[5721]),0},
+{"postOfficeBox","postOfficeBox",NID_postOfficeBox,3,&(lvalues[5724]),0},
 {"physicalDeliveryOfficeName","physicalDeliveryOfficeName",
-	NID_physicalDeliveryOfficeName,3,&(lvalues[5733]),0},
+	NID_physicalDeliveryOfficeName,3,&(lvalues[5727]),0},
 {"telephoneNumber","telephoneNumber",NID_telephoneNumber,3,
-	&(lvalues[5736]),0},
-{"telexNumber","telexNumber",NID_telexNumber,3,&(lvalues[5739]),0},
+	&(lvalues[5730]),0},
+{"telexNumber","telexNumber",NID_telexNumber,3,&(lvalues[5733]),0},
 {"teletexTerminalIdentifier","teletexTerminalIdentifier",
-	NID_teletexTerminalIdentifier,3,&(lvalues[5742]),0},
+	NID_teletexTerminalIdentifier,3,&(lvalues[5736]),0},
 {"facsimileTelephoneNumber","facsimileTelephoneNumber",
-	NID_facsimileTelephoneNumber,3,&(lvalues[5745]),0},
-{"x121Address","x121Address",NID_x121Address,3,&(lvalues[5748]),0},
+	NID_facsimileTelephoneNumber,3,&(lvalues[5739]),0},
+{"x121Address","x121Address",NID_x121Address,3,&(lvalues[5742]),0},
 {"internationaliSDNNumber","internationaliSDNNumber",
-	NID_internationaliSDNNumber,3,&(lvalues[5751]),0},
+	NID_internationaliSDNNumber,3,&(lvalues[5745]),0},
 {"registeredAddress","registeredAddress",NID_registeredAddress,3,
-	&(lvalues[5754]),0},
+	&(lvalues[5748]),0},
 {"destinationIndicator","destinationIndicator",
-	NID_destinationIndicator,3,&(lvalues[5757]),0},
+	NID_destinationIndicator,3,&(lvalues[5751]),0},
 {"preferredDeliveryMethod","preferredDeliveryMethod",
-	NID_preferredDeliveryMethod,3,&(lvalues[5760]),0},
+	NID_preferredDeliveryMethod,3,&(lvalues[5754]),0},
 {"presentationAddress","presentationAddress",NID_presentationAddress,
-	3,&(lvalues[5763]),0},
+	3,&(lvalues[5757]),0},
 {"supportedApplicationContext","supportedApplicationContext",
-	NID_supportedApplicationContext,3,&(lvalues[5766]),0},
-{"member","member",NID_member,3,&(lvalues[5769]),0},
-{"owner","owner",NID_owner,3,&(lvalues[5772]),0},
-{"roleOccupant","roleOccupant",NID_roleOccupant,3,&(lvalues[5775]),0},
-{"seeAlso","seeAlso",NID_seeAlso,3,&(lvalues[5778]),0},
-{"userPassword","userPassword",NID_userPassword,3,&(lvalues[5781]),0},
+	NID_supportedApplicationContext,3,&(lvalues[5760]),0},
+{"member","member",NID_member,3,&(lvalues[5763]),0},
+{"owner","owner",NID_owner,3,&(lvalues[5766]),0},
+{"roleOccupant","roleOccupant",NID_roleOccupant,3,&(lvalues[5769]),0},
+{"seeAlso","seeAlso",NID_seeAlso,3,&(lvalues[5772]),0},
+{"userPassword","userPassword",NID_userPassword,3,&(lvalues[5775]),0},
 {"userCertificate","userCertificate",NID_userCertificate,3,
-	&(lvalues[5784]),0},
-{"cACertificate","cACertificate",NID_cACertificate,3,&(lvalues[5787]),0},
+	&(lvalues[5778]),0},
+{"cACertificate","cACertificate",NID_cACertificate,3,&(lvalues[5781]),0},
 {"authorityRevocationList","authorityRevocationList",
-	NID_authorityRevocationList,3,&(lvalues[5790]),0},
+	NID_authorityRevocationList,3,&(lvalues[5784]),0},
 {"certificateRevocationList","certificateRevocationList",
-	NID_certificateRevocationList,3,&(lvalues[5793]),0},
+	NID_certificateRevocationList,3,&(lvalues[5787]),0},
 {"crossCertificatePair","crossCertificatePair",
-	NID_crossCertificatePair,3,&(lvalues[5796]),0},
+	NID_crossCertificatePair,3,&(lvalues[5790]),0},
 {"enhancedSearchGuide","enhancedSearchGuide",NID_enhancedSearchGuide,
-	3,&(lvalues[5799]),0},
+	3,&(lvalues[5793]),0},
 {"protocolInformation","protocolInformation",NID_protocolInformation,
-	3,&(lvalues[5802]),0},
+	3,&(lvalues[5796]),0},
 {"distinguishedName","distinguishedName",NID_distinguishedName,3,
-	&(lvalues[5805]),0},
-{"uniqueMember","uniqueMember",NID_uniqueMember,3,&(lvalues[5808]),0},
+	&(lvalues[5799]),0},
+{"uniqueMember","uniqueMember",NID_uniqueMember,3,&(lvalues[5802]),0},
 {"houseIdentifier","houseIdentifier",NID_houseIdentifier,3,
-	&(lvalues[5811]),0},
+	&(lvalues[5805]),0},
 {"supportedAlgorithms","supportedAlgorithms",NID_supportedAlgorithms,
-	3,&(lvalues[5814]),0},
+	3,&(lvalues[5808]),0},
 {"deltaRevocationList","deltaRevocationList",NID_deltaRevocationList,
-	3,&(lvalues[5817]),0},
-{"dmdName","dmdName",NID_dmdName,3,&(lvalues[5820]),0},
+	3,&(lvalues[5811]),0},
+{"dmdName","dmdName",NID_dmdName,3,&(lvalues[5814]),0},
 {"id-alg-PWRI-KEK","id-alg-PWRI-KEK",NID_id_alg_PWRI_KEK,11,
-	&(lvalues[5823]),0},
+	&(lvalues[5817]),0},
 {"CMAC","cmac",NID_cmac,0,NULL,0},
-{"id-aes128-GCM","aes-128-gcm",NID_aes_128_gcm,9,&(lvalues[5834]),0},
-{"id-aes128-CCM","aes-128-ccm",NID_aes_128_ccm,9,&(lvalues[5843]),0},
+{"id-aes128-GCM","aes-128-gcm",NID_aes_128_gcm,9,&(lvalues[5828]),0},
+{"id-aes128-CCM","aes-128-ccm",NID_aes_128_ccm,9,&(lvalues[5837]),0},
 {"id-aes128-wrap-pad","id-aes128-wrap-pad",NID_id_aes128_wrap_pad,9,
-	&(lvalues[5852]),0},
-{"id-aes192-GCM","aes-192-gcm",NID_aes_192_gcm,9,&(lvalues[5861]),0},
-{"id-aes192-CCM","aes-192-ccm",NID_aes_192_ccm,9,&(lvalues[5870]),0},
+	&(lvalues[5846]),0},
+{"id-aes192-GCM","aes-192-gcm",NID_aes_192_gcm,9,&(lvalues[5855]),0},
+{"id-aes192-CCM","aes-192-ccm",NID_aes_192_ccm,9,&(lvalues[5864]),0},
 {"id-aes192-wrap-pad","id-aes192-wrap-pad",NID_id_aes192_wrap_pad,9,
-	&(lvalues[5879]),0},
-{"id-aes256-GCM","aes-256-gcm",NID_aes_256_gcm,9,&(lvalues[5888]),0},
-{"id-aes256-CCM","aes-256-ccm",NID_aes_256_ccm,9,&(lvalues[5897]),0},
+	&(lvalues[5873]),0},
+{"id-aes256-GCM","aes-256-gcm",NID_aes_256_gcm,9,&(lvalues[5882]),0},
+{"id-aes256-CCM","aes-256-ccm",NID_aes_256_ccm,9,&(lvalues[5891]),0},
 {"id-aes256-wrap-pad","id-aes256-wrap-pad",NID_id_aes256_wrap_pad,9,
-	&(lvalues[5906]),0},
+	&(lvalues[5900]),0},
 {"AES-128-CTR","aes-128-ctr",NID_aes_128_ctr,0,NULL,0},
 {"AES-192-CTR","aes-192-ctr",NID_aes_192_ctr,0,NULL,0},
 {"AES-256-CTR","aes-256-ctr",NID_aes_256_ctr,0,NULL,0},
 {"id-camellia128-wrap","id-camellia128-wrap",NID_id_camellia128_wrap,
-	11,&(lvalues[5915]),0},
+	11,&(lvalues[5909]),0},
 {"id-camellia192-wrap","id-camellia192-wrap",NID_id_camellia192_wrap,
-	11,&(lvalues[5926]),0},
+	11,&(lvalues[5920]),0},
 {"id-camellia256-wrap","id-camellia256-wrap",NID_id_camellia256_wrap,
-	11,&(lvalues[5937]),0},
+	11,&(lvalues[5931]),0},
 {"anyExtendedKeyUsage","Any Extended Key Usage",
-	NID_anyExtendedKeyUsage,4,&(lvalues[5948]),0},
-{"MGF1","mgf1",NID_mgf1,9,&(lvalues[5952]),0},
-{"RSASSA-PSS","rsassaPss",NID_rsassaPss,9,&(lvalues[5961]),0},
+	NID_anyExtendedKeyUsage,4,&(lvalues[5942]),0},
+{"MGF1","mgf1",NID_mgf1,9,&(lvalues[5946]),0},
+{"RSASSA-PSS","rsassaPss",NID_rsassaPss,9,&(lvalues[5955]),0},
 {"AES-128-XTS","aes-128-xts",NID_aes_128_xts,0,NULL,0},
 {"AES-256-XTS","aes-256-xts",NID_aes_256_xts,0,NULL,0},
 {"RC4-HMAC-MD5","rc4-hmac-md5",NID_rc4_hmac_md5,0,NULL,0},
@@ -2405,7 +2398,7 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={
 	NID_aes_192_cbc_hmac_sha1,0,NULL,0},
 {"AES-256-CBC-HMAC-SHA1","aes-256-cbc-hmac-sha1",
 	NID_aes_256_cbc_hmac_sha1,0,NULL,0},
-{"RSAES-OAEP","rsaesOaep",NID_rsaesOaep,9,&(lvalues[5970]),0},
+{"RSAES-OAEP","rsaesOaep",NID_rsaesOaep,9,&(lvalues[5964]),0},
 };
 
 static const unsigned int sn_objs[NUM_SN]={
@@ -4242,15 +4235,15 @@ static const unsigned int ln_objs[NUM_LN]={
 
 static const unsigned int obj_objs[NUM_OBJ]={
  0,	/* OBJ_undef                        0 */
+181,	/* OBJ_iso                          1 */
 393,	/* OBJ_joint_iso_ccitt              OBJ_joint_iso_itu_t */
 404,	/* OBJ_ccitt                        OBJ_itu_t */
 645,	/* OBJ_itu_t                        0 */
+646,	/* OBJ_joint_iso_itu_t              2 */
 434,	/* OBJ_data                         0 9 */
-181,	/* OBJ_iso                          1 */
 182,	/* OBJ_member_body                  1 2 */
 379,	/* OBJ_org                          1 3 */
 676,	/* OBJ_identified_organization      1 3 */
-646,	/* OBJ_joint_iso_itu_t              2 */
 11,	/* OBJ_X500                         2 5 */
 647,	/* OBJ_international_organizations  2 23 */
 380,	/* OBJ_dod                          1 3 6 */
diff --git a/crypto/openssl/crypto/objects/obj_dat.pl b/crypto/openssl/crypto/objects/obj_dat.pl
index c67f71c3277b..86bcefb97af1 100644
--- a/crypto/openssl/crypto/objects/obj_dat.pl
+++ b/crypto/openssl/crypto/objects/obj_dat.pl
@@ -115,7 +115,7 @@ for ($i=0; $i<$n; $i++)
 		$out.="\"$sn\"";
 		$out.=","."\"$ln\"";
 		$out.=",NID_$nid{$i},";
-		if (defined($obj{$nid{$i}}))
+		if (defined($obj{$nid{$i}}) && $objd{$obj{$nid{$i}}} =~ /,/)
 			{
 			$v=$objd{$obj{$nid{$i}}};
 			$v =~ s/L//g;
diff --git a/crypto/openssl/crypto/ocsp/ocsp_ht.c b/crypto/openssl/crypto/ocsp/ocsp_ht.c
index af5fc16691d4..09eb855d4a08 100644
--- a/crypto/openssl/crypto/ocsp/ocsp_ht.c
+++ b/crypto/openssl/crypto/ocsp/ocsp_ht.c
@@ -158,6 +158,8 @@ OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req,
 
 	OCSP_REQ_CTX *rctx;
 	rctx = OPENSSL_malloc(sizeof(OCSP_REQ_CTX));
+	if (!rctx)
+		return NULL;
 	rctx->state = OHS_ERROR;
 	rctx->mem = BIO_new(BIO_s_mem());
 	rctx->io = io;
@@ -167,18 +169,21 @@ OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req,
 	else
 		rctx->iobuflen = OCSP_MAX_LINE_LEN;
 	rctx->iobuf = OPENSSL_malloc(rctx->iobuflen);
-	if (!rctx->iobuf)
-		return 0;
+	if (!rctx->mem || !rctx->iobuf)
+		goto err;
 	if (!path)
 		path = "/";
 
         if (BIO_printf(rctx->mem, post_hdr, path) <= 0)
-		return 0;
+		goto err;
 
 	if (req && !OCSP_REQ_CTX_set1_req(rctx, req))
-		return 0;
+		goto err;
 
 	return rctx;
+	err:
+	OCSP_REQ_CTX_free(rctx);
+	return NULL;
 	}
 
 /* Parse the HTTP response. This will look like this:
@@ -490,6 +495,9 @@ OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req)
 
 	ctx = OCSP_sendreq_new(b, path, req, -1);
 
+	if (!ctx)
+		return NULL;
+
 	do
 		{
 		rv = OCSP_sendreq_nbio(&resp, ctx);
diff --git a/crypto/openssl/crypto/ocsp/ocsp_lib.c b/crypto/openssl/crypto/ocsp/ocsp_lib.c
index a94dc838eecb..5061c0578baa 100644
--- a/crypto/openssl/crypto/ocsp/ocsp_lib.c
+++ b/crypto/openssl/crypto/ocsp/ocsp_lib.c
@@ -222,8 +222,19 @@ int OCSP_parse_url(char *url, char **phost, char **pport, char **ppath, int *pss
 
 	if (!*ppath) goto mem_err;
 
+	p = host;
+	if(host[0] == '[')
+		{
+		/* ipv6 literal */
+		host++;
+		p = strchr(host, ']');
+		if(!p) goto parse_err;
+		*p = '\0';
+		p++;
+		}
+
 	/* Look for optional ':' for port number */
-	if ((p = strchr(host, ':')))
+	if ((p = strchr(p, ':')))
 		{
 		*p = 0;
 		port = p + 1;
diff --git a/crypto/openssl/crypto/opensslconf.h b/crypto/openssl/crypto/opensslconf.h
index b18f4da49661..57abb87d9bc6 100644
--- a/crypto/openssl/crypto/opensslconf.h
+++ b/crypto/openssl/crypto/opensslconf.h
@@ -32,6 +32,9 @@
 #ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
 #endif
+#ifndef OPENSSL_NO_UNIT_TEST
+# define OPENSSL_NO_UNIT_TEST
+#endif
 
 #endif /* OPENSSL_DOING_MAKEDEPEND */
 
@@ -71,6 +74,9 @@
 # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
 #  define NO_STORE
 # endif
+# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
+#  define NO_UNIT_TEST
+# endif
 #endif
 
 /* crypto/opensslconf.h.in */
diff --git a/crypto/openssl/crypto/opensslv.h b/crypto/openssl/crypto/opensslv.h
index f998f988e3f9..e03bece35450 100644
--- a/crypto/openssl/crypto/opensslv.h
+++ b/crypto/openssl/crypto/opensslv.h
@@ -25,11 +25,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER	0x1000108fL
+#define OPENSSL_VERSION_NUMBER	0x1000109fL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1h-fips 5 Jun 2014"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1i-fips 6 Aug 2014"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1h-freebsd 5 Jun 2014"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1i-freebsd 6 Aug 2014"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 
diff --git a/crypto/openssl/crypto/pem/pvkfmt.c b/crypto/openssl/crypto/pem/pvkfmt.c
index b1bf71a5daad..ae89f8281a82 100644
--- a/crypto/openssl/crypto/pem/pvkfmt.c
+++ b/crypto/openssl/crypto/pem/pvkfmt.c
@@ -759,6 +759,11 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in,
 		/* Copy BLOBHEADER across, decrypt rest */
 		memcpy(enctmp, p, 8);
 		p += 8;
+		if (keylen < 8)
+			{
+			PEMerr(PEM_F_DO_PVK_BODY, PEM_R_PVK_TOO_SHORT);
+			return NULL;
+			}
 		inlen = keylen - 8;
 		q = enctmp + 8;
 		if (!EVP_DecryptInit_ex(&cctx, EVP_rc4(), NULL, keybuf, NULL))
diff --git a/crypto/openssl/crypto/pkcs7/Makefile b/crypto/openssl/crypto/pkcs7/Makefile
index 56dc6823d123..effe05fc043d 100644
--- a/crypto/openssl/crypto/pkcs7/Makefile
+++ b/crypto/openssl/crypto/pkcs7/Makefile
@@ -39,20 +39,6 @@ test:
 
 all:	lib
 
-testapps: enc dec sign verify
-
-enc: enc.o lib
-	$(CC) $(CFLAGS) -o enc enc.o $(PEX_LIBS) $(LIB) $(EX_LIBS)
-
-dec: dec.o lib
-	$(CC) $(CFLAGS) -o dec dec.o $(PEX_LIBS) $(LIB) $(EX_LIBS)
-
-sign: sign.o lib
-	$(CC) $(CFLAGS) -o sign sign.o $(PEX_LIBS) $(LIB) $(EX_LIBS)
-
-verify: verify.o example.o lib
-	$(CC) $(CFLAGS) -o verify verify.o $(PEX_LIBS) example.o $(LIB) $(EX_LIBS)
-
 lib:	$(LIBOBJ)
 	$(AR) $(LIB) $(LIBOBJ)
 	$(RANLIB) $(LIB) || echo Never mind.
diff --git a/crypto/openssl/crypto/pkcs7/bio_ber.c b/crypto/openssl/crypto/pkcs7/bio_ber.c
deleted file mode 100644
index 31973fcd1fc5..000000000000
--- a/crypto/openssl/crypto/pkcs7/bio_ber.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/* crypto/evp/bio_ber.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <errno.h>
-#include "cryptlib.h"
-#include <openssl/buffer.h>
-#include <openssl/evp.h>
-
-static int ber_write(BIO *h,char *buf,int num);
-static int ber_read(BIO *h,char *buf,int size);
-/*static int ber_puts(BIO *h,char *str); */
-/*static int ber_gets(BIO *h,char *str,int size); */
-static long ber_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int ber_new(BIO *h);
-static int ber_free(BIO *data);
-static long ber_callback_ctrl(BIO *h,int cmd,void *(*fp)());
-#define BER_BUF_SIZE	(32)
-
-/* This is used to hold the state of the BER objects being read. */
-typedef struct ber_struct
-	{
-	int tag;
-	int class;
-	long length;
-	int inf;
-	int num_left;
-	int depth;
-	} BER_CTX;
-
-typedef struct bio_ber_struct
-	{
-	int tag;
-	int class;
-	long length;
-	int inf;
-
-	/* most of the following are used when doing non-blocking IO */
-	/* reading */
-	long num_left;	/* number of bytes still to read/write in block */
-	int depth;	/* used with indefinite encoding. */
-	int finished;	/* No more read data */
-
-	/* writting */ 
-	char *w_addr;
-	int w_offset;
-	int w_left;
-
-	int buf_len;
-	int buf_off;
-	unsigned char buf[BER_BUF_SIZE];
-	} BIO_BER_CTX;
-
-static BIO_METHOD methods_ber=
-	{
-	BIO_TYPE_CIPHER,"cipher",
-	ber_write,
-	ber_read,
-	NULL, /* ber_puts, */
-	NULL, /* ber_gets, */
-	ber_ctrl,
-	ber_new,
-	ber_free,
-	ber_callback_ctrl,
-	};
-
-BIO_METHOD *BIO_f_ber(void)
-	{
-	return(&methods_ber);
-	}
-
-static int ber_new(BIO *bi)
-	{
-	BIO_BER_CTX *ctx;
-
-	ctx=(BIO_BER_CTX *)OPENSSL_malloc(sizeof(BIO_BER_CTX));
-	if (ctx == NULL) return(0);
-
-	memset((char *)ctx,0,sizeof(BIO_BER_CTX));
-
-	bi->init=0;
-	bi->ptr=(char *)ctx;
-	bi->flags=0;
-	return(1);
-	}
-
-static int ber_free(BIO *a)
-	{
-	BIO_BER_CTX *b;
-
-	if (a == NULL) return(0);
-	b=(BIO_BER_CTX *)a->ptr;
-	OPENSSL_cleanse(a->ptr,sizeof(BIO_BER_CTX));
-	OPENSSL_free(a->ptr);
-	a->ptr=NULL;
-	a->init=0;
-	a->flags=0;
-	return(1);
-	}
-
-int bio_ber_get_header(BIO *bio, BIO_BER_CTX *ctx)
-	{
-	char buf[64];
-	int i,j,n;
-	int ret;
-	unsigned char *p;
-	unsigned long length
-	int tag;
-	int class;
-	long max;
-
-	BIO_clear_retry_flags(b);
-
-	/* Pack the buffer down if there is a hole at the front */
-	if (ctx->buf_off != 0)
-		{
-		p=ctx->buf;
-		j=ctx->buf_off;
-		n=ctx->buf_len-j;
-		for (i=0; i<n; i++)
-			{
-			p[0]=p[j];
-			p++;
-			}
-		ctx->buf_len-j;
-		ctx->buf_off=0;
-		}
-
-	/* If there is more room, read some more data */
-	i=BER_BUF_SIZE-ctx->buf_len;
-	if (i)
-		{
-		i=BIO_read(bio->next_bio,&(ctx->buf[ctx->buf_len]),i);
-		if (i <= 0)
-			{
-			BIO_copy_next_retry(b);
-			return(i);
-			}
-		else
-			ctx->buf_len+=i;
-		}
-
-	max=ctx->buf_len;
-	p=ctx->buf;
-	ret=ASN1_get_object(&p,&length,&tag,&class,max);
-
-	if (ret & 0x80)
-		{
-		if ((ctx->buf_len < BER_BUF_SIZE) &&
-			(ERR_GET_REASON(ERR_peek_error()) == ASN1_R_TOO_LONG))
-			{
-			ERR_clear_error(); /* clear the error */
-			BIO_set_retry_read(b);
-			}
-		return(-1);
-		}
-
-	/* We have no error, we have a header, so make use of it */
-
-	if ((ctx->tag  >= 0) && (ctx->tag != tag))
-		{
-		BIOerr(BIO_F_BIO_BER_GET_HEADER,BIO_R_TAG_MISMATCH);
-		sprintf(buf,"tag=%d, got %d",ctx->tag,tag);
-		ERR_add_error_data(1,buf);
-		return(-1);
-		}
-	if (ret & 0x01)
-	if (ret & V_ASN1_CONSTRUCTED)
-	}
-	
-static int ber_read(BIO *b, char *out, int outl)
-	{
-	int ret=0,i,n;
-	BIO_BER_CTX *ctx;
-
-	BIO_clear_retry_flags(b);
-
-	if (out == NULL) return(0);
-	ctx=(BIO_BER_CTX *)b->ptr;
-
-	if ((ctx == NULL) || (b->next_bio == NULL)) return(0);
-
-	if (ctx->finished) return(0);
-
-again:
-	/* First see if we are half way through reading a block */
-	if (ctx->num_left > 0)
-		{
-		if (ctx->num_left < outl)
-			n=ctx->num_left;
-		else
-			n=outl;
-		i=BIO_read(b->next_bio,out,n);
-		if (i <= 0)
-			{
-			BIO_copy_next_retry(b);
-			return(i);
-			}
-		ctx->num_left-=i;
-		outl-=i;
-		ret+=i;
-		if (ctx->num_left <= 0)
-			{
-			ctx->depth--;
-			if (ctx->depth <= 0)
-				ctx->finished=1;
-			}
-		if (outl <= 0)
-			return(ret);
-		else
-			goto again;
-		}
-	else	/* we need to read another BER header */
-		{
-		}
-	}
-
-static int ber_write(BIO *b, char *in, int inl)
-	{
-	int ret=0,n,i;
-	BIO_ENC_CTX *ctx;
-
-	ctx=(BIO_ENC_CTX *)b->ptr;
-	ret=inl;
-
-	BIO_clear_retry_flags(b);
-	n=ctx->buf_len-ctx->buf_off;
-	while (n > 0)
-		{
-		i=BIO_write(b->next_bio,&(ctx->buf[ctx->buf_off]),n);
-		if (i <= 0)
-			{
-			BIO_copy_next_retry(b);
-			return(i);
-			}
-		ctx->buf_off+=i;
-		n-=i;
-		}
-	/* at this point all pending data has been written */
-
-	if ((in == NULL) || (inl <= 0)) return(0);
-
-	ctx->buf_off=0;
-	while (inl > 0)
-		{
-		n=(inl > ENC_BLOCK_SIZE)?ENC_BLOCK_SIZE:inl;
-		EVP_CipherUpdate(&(ctx->cipher),
-			(unsigned char *)ctx->buf,&ctx->buf_len,
-			(unsigned char *)in,n);
-		inl-=n;
-		in+=n;
-
-		ctx->buf_off=0;
-		n=ctx->buf_len;
-		while (n > 0)
-			{
-			i=BIO_write(b->next_bio,&(ctx->buf[ctx->buf_off]),n);
-			if (i <= 0)
-				{
-				BIO_copy_next_retry(b);
-				return(i);
-				}
-			n-=i;
-			ctx->buf_off+=i;
-			}
-		ctx->buf_len=0;
-		ctx->buf_off=0;
-		}
-	BIO_copy_next_retry(b);
-	return(ret);
-	}
-
-static long ber_ctrl(BIO *b, int cmd, long num, char *ptr)
-	{
-	BIO *dbio;
-	BIO_ENC_CTX *ctx,*dctx;
-	long ret=1;
-	int i;
-
-	ctx=(BIO_ENC_CTX *)b->ptr;
-
-	switch (cmd)
-		{
-	case BIO_CTRL_RESET:
-		ctx->ok=1;
-		ctx->finished=0;
-		EVP_CipherInit_ex(&(ctx->cipher),NULL,NULL,NULL,NULL,
-			ctx->cipher.berrypt);
-		ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-		break;
-	case BIO_CTRL_EOF:	/* More to read */
-		if (ctx->cont <= 0)
-			ret=1;
-		else
-			ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-		break;
-	case BIO_CTRL_WPENDING:
-		ret=ctx->buf_len-ctx->buf_off;
-		if (ret <= 0)
-			ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-		break;
-	case BIO_CTRL_PENDING: /* More to read in buffer */
-		ret=ctx->buf_len-ctx->buf_off;
-		if (ret <= 0)
-			ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-		break;
-	case BIO_CTRL_FLUSH:
-		/* do a final write */
-again:
-		while (ctx->buf_len != ctx->buf_off)
-			{
-			i=ber_write(b,NULL,0);
-			if (i < 0)
-				{
-				ret=i;
-				break;
-				}
-			}
-
-		if (!ctx->finished)
-			{
-			ctx->finished=1;
-			ctx->buf_off=0;
-			ret=EVP_CipherFinal_ex(&(ctx->cipher),
-				(unsigned char *)ctx->buf,
-				&(ctx->buf_len));
-			ctx->ok=(int)ret;
-			if (ret <= 0) break;
-
-			/* push out the bytes */
-			goto again;
-			}
-		
-		/* Finally flush the underlying BIO */
-		ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-		break;
-	case BIO_C_GET_CIPHER_STATUS:
-		ret=(long)ctx->ok;
-		break;
-	case BIO_C_DO_STATE_MACHINE:
-		BIO_clear_retry_flags(b);
-		ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-		BIO_copy_next_retry(b);
-		break;
-
-	case BIO_CTRL_DUP:
-		dbio=(BIO *)ptr;
-		dctx=(BIO_ENC_CTX *)dbio->ptr;
-		memcpy(&(dctx->cipher),&(ctx->cipher),sizeof(ctx->cipher));
-		dbio->init=1;
-		break;
-	default:
-		ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
-		break;
-		}
-	return(ret);
-	}
-
-static long ber_callback_ctrl(BIO *b, int cmd, void *(*fp)())
-	{
-	long ret=1;
-
-	if (b->next_bio == NULL) return(0);
-	switch (cmd)
-		{
-	default:
-		ret=BIO_callback_ctrl(b->next_bio,cmd,fp);
-		break;
-		}
-	return(ret);
-	}
-
-/*
-void BIO_set_cipher_ctx(b,c)
-BIO *b;
-EVP_CIPHER_ctx *c;
-	{
-	if (b == NULL) return;
-
-	if ((b->callback != NULL) &&
-		(b->callback(b,BIO_CB_CTRL,(char *)c,BIO_CTRL_SET,e,0L) <= 0))
-		return;
-
-	b->init=1;
-	ctx=(BIO_ENC_CTX *)b->ptr;
-	memcpy(ctx->cipher,c,sizeof(EVP_CIPHER_CTX));
-	
-	if (b->callback != NULL)
-		b->callback(b,BIO_CB_CTRL,(char *)c,BIO_CTRL_SET,e,1L);
-	}
-*/
-
-void BIO_set_cipher(BIO *b, EVP_CIPHER *c, unsigned char *k, unsigned char *i,
-	     int e)
-	{
-	BIO_ENC_CTX *ctx;
-
-	if (b == NULL) return;
-
-	if ((b->callback != NULL) &&
-		(b->callback(b,BIO_CB_CTRL,(char *)c,BIO_CTRL_SET,e,0L) <= 0))
-		return;
-
-	b->init=1;
-	ctx=(BIO_ENC_CTX *)b->ptr;
-	EVP_CipherInit_ex(&(ctx->cipher),c,NULL,k,i,e);
-	
-	if (b->callback != NULL)
-		b->callback(b,BIO_CB_CTRL,(char *)c,BIO_CTRL_SET,e,1L);
-	}
-
diff --git a/crypto/openssl/crypto/pkcs7/dec.c b/crypto/openssl/crypto/pkcs7/dec.c
deleted file mode 100644
index 6752ec568a91..000000000000
--- a/crypto/openssl/crypto/pkcs7/dec.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/* crypto/pkcs7/verify.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <openssl/bio.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/err.h>
-#include <openssl/asn1.h>
-
-int verify_callback(int ok, X509_STORE_CTX *ctx);
-
-BIO *bio_err=NULL;
-
-int main(argc,argv)
-int argc;
-char *argv[];
-	{
-	char *keyfile=NULL;
-	BIO *in;
-	EVP_PKEY *pkey;
-	X509 *x509;
-	PKCS7 *p7;
-	PKCS7_SIGNER_INFO *si;
-	X509_STORE_CTX cert_ctx;
-	X509_STORE *cert_store=NULL;
-	BIO *data,*detached=NULL,*p7bio=NULL;
-	char buf[1024*4];
-	unsigned char *pp;
-	int i,printit=0;
-	STACK_OF(PKCS7_SIGNER_INFO) *sk;
-
-	OpenSSL_add_all_algorithms();
-	bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
-
-	data=BIO_new(BIO_s_file());
-	pp=NULL;
-	while (argc > 1)
-		{
-		argc--;
-		argv++;
-		if (strcmp(argv[0],"-p") == 0)
-			{
-			printit=1;
-			}
-		else if ((strcmp(argv[0],"-k") == 0) && (argc >= 2)) {
-			keyfile = argv[1];
-			argc-=1;
-			argv+=1;
-		} else if ((strcmp(argv[0],"-d") == 0) && (argc >= 2))
-			{
-			detached=BIO_new(BIO_s_file());
-			if (!BIO_read_filename(detached,argv[1]))
-				goto err;
-			argc-=1;
-			argv+=1;
-			}
-		else break;
-		}
-
-	 if (!BIO_read_filename(data,argv[0])) goto err; 
-
-	if(!keyfile) {
-		fprintf(stderr, "No private key file specified\n");
-		goto err;
-	}
-
-        if ((in=BIO_new_file(keyfile,"r")) == NULL) goto err;
-        if ((x509=PEM_read_bio_X509(in,NULL,NULL,NULL)) == NULL) goto err;
-        BIO_reset(in);
-        if ((pkey=PEM_read_bio_PrivateKey(in,NULL,NULL,NULL)) == NULL)
-		goto err;
-        BIO_free(in);
-
-	if (pp == NULL)
-		BIO_set_fp(data,stdin,BIO_NOCLOSE);
-
-
-	/* Load the PKCS7 object from a file */
-	if ((p7=PEM_read_bio_PKCS7(data,NULL,NULL,NULL)) == NULL) goto err;
-
-
-
-	/* This stuff is being setup for certificate verification.
-	 * When using SSL, it could be replaced with a 
-	 * cert_stre=SSL_CTX_get_cert_store(ssl_ctx); */
-	cert_store=X509_STORE_new();
-	X509_STORE_set_default_paths(cert_store);
-	X509_STORE_load_locations(cert_store,NULL,"../../certs");
-	X509_STORE_set_verify_cb_func(cert_store,verify_callback);
-
-	ERR_clear_error();
-
-	/* We need to process the data */
-	/* We cannot support detached encryption */
-	p7bio=PKCS7_dataDecode(p7,pkey,detached,x509);
-
-	if (p7bio == NULL)
-		{
-		printf("problems decoding\n");
-		goto err;
-		}
-
-	/* We now have to 'read' from p7bio to calculate digests etc. */
-	for (;;)
-		{
-		i=BIO_read(p7bio,buf,sizeof(buf));
-		/* print it? */
-		if (i <= 0) break;
-		fwrite(buf,1, i, stdout);
-		}
-
-	/* We can now verify signatures */
-	sk=PKCS7_get_signer_info(p7);
-	if (sk == NULL)
-		{
-		fprintf(stderr, "there are no signatures on this data\n");
-		}
-	else
-		{
-		/* Ok, first we need to, for each subject entry,
-		 * see if we can verify */
-		ERR_clear_error();
-		for (i=0; i<sk_PKCS7_SIGNER_INFO_num(sk); i++)
-			{
-			si=sk_PKCS7_SIGNER_INFO_value(sk,i);
-			i=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si);
-			if (i <= 0)
-				goto err;
-			else
-				fprintf(stderr,"Signature verified\n");
-			}
-		}
-	X509_STORE_free(cert_store);
-
-	exit(0);
-err:
-	ERR_load_crypto_strings();
-	ERR_print_errors_fp(stderr);
-	exit(1);
-	}
-
-/* should be X509 * but we can just have them as char *. */
-int verify_callback(int ok, X509_STORE_CTX *ctx)
-	{
-	char buf[256];
-	X509 *err_cert;
-	int err,depth;
-
-	err_cert=X509_STORE_CTX_get_current_cert(ctx);
-	err=	X509_STORE_CTX_get_error(ctx);
-	depth=	X509_STORE_CTX_get_error_depth(ctx);
-
-	X509_NAME_oneline(X509_get_subject_name(err_cert),buf,256);
-	BIO_printf(bio_err,"depth=%d %s\n",depth,buf);
-	if (!ok)
-		{
-		BIO_printf(bio_err,"verify error:num=%d:%s\n",err,
-			X509_verify_cert_error_string(err));
-		if (depth < 6)
-			{
-			ok=1;
-			X509_STORE_CTX_set_error(ctx,X509_V_OK);
-			}
-		else
-			{
-			ok=0;
-			X509_STORE_CTX_set_error(ctx,X509_V_ERR_CERT_CHAIN_TOO_LONG);
-			}
-		}
-	switch (ctx->error)
-		{
-	case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
-		X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert),buf,256);
-		BIO_printf(bio_err,"issuer= %s\n",buf);
-		break;
-	case X509_V_ERR_CERT_NOT_YET_VALID:
-	case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
-		BIO_printf(bio_err,"notBefore=");
-		ASN1_UTCTIME_print(bio_err,X509_get_notBefore(ctx->current_cert));
-		BIO_printf(bio_err,"\n");
-		break;
-	case X509_V_ERR_CERT_HAS_EXPIRED:
-	case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
-		BIO_printf(bio_err,"notAfter=");
-		ASN1_UTCTIME_print(bio_err,X509_get_notAfter(ctx->current_cert));
-		BIO_printf(bio_err,"\n");
-		break;
-		}
-	BIO_printf(bio_err,"verify return:%d\n",ok);
-	return(ok);
-	}
diff --git a/crypto/openssl/crypto/pkcs7/des.pem b/crypto/openssl/crypto/pkcs7/des.pem
deleted file mode 100644
index 62d1657e3e79..000000000000
--- a/crypto/openssl/crypto/pkcs7/des.pem
+++ /dev/null
@@ -1,15 +0,0 @@
-
-MIAGCSqGSIb3DQEHA6CAMIACAQAxggHmMIHwAgEAMIGZMIGSMQswCQYDVQQGEwJBVTETMBEG
-A1UECBMKUXVlZW5zbGFuZDERMA8GA1UEBxMIQnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0c29m
-dCBQdHkgTHRkMSIwIAYDVQQLExlERU1PTlNUUkFUSU9OIEFORCBURVNUSU5HMRswGQYDVQQD
-ExJERU1PIFpFUk8gVkFMVUUgQ0ECAgR+MA0GCSqGSIb3DQEBAQUABEC2vXI1xQDW6lUHM3zQ
-/9uBEBOO5A3TtkrklAXq7v01gsIC21t52qSk36REXY+slhNZ0OQ349tgkTsoETHFLoEwMIHw
-AgEAMIGZMIGSMQswCQYDVQQGEwJBVTETMBEGA1UECBMKUXVlZW5zbGFuZDERMA8GA1UEBxMI
-QnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0c29mdCBQdHkgTHRkMSIwIAYDVQQLExlERU1PTlNU
-UkFUSU9OIEFORCBURVNUSU5HMRswGQYDVQQDExJERU1PIFpFUk8gVkFMVUUgQ0ECAgR9MA0G
-CSqGSIb3DQEBAQUABEB8ujxbabxXUYJhopuDm3oDq4JNqX6Io4p3ro+ShqfIndsXTZ1v5a2N
-WtLLCWlHn/habjBwZ/DgQgcKASbZ7QxNMIAGCSqGSIb3DQEHATAaBggqhkiG9w0DAjAOAgIA
-oAQIbsL5v1wX98KggAQoAaJ4WHm68fXY1WE5OIjfVBIDpO1K+i8dmKhjnAjrjoyZ9Bwc8rDL
-lgQg4CXb805h5xl+GfvSwUaHJayte1m2mcOhs3J2YyqbQ+MEIMIiJQccmhO3oDKm36CFvYR8
-5PjpclVcZyX2ngbwPFMnBAgy0clOAE6UKAAAAAAAAAAAAAA=
-
diff --git a/crypto/openssl/crypto/pkcs7/doc b/crypto/openssl/crypto/pkcs7/doc
deleted file mode 100644
index d2e8b7b2a3df..000000000000
--- a/crypto/openssl/crypto/pkcs7/doc
+++ /dev/null
@@ -1,24 +0,0 @@
-int PKCS7_set_content_type(PKCS7 *p7, int type);
-Call to set the type of PKCS7 object we are working on
-
-int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
-	EVP_MD *dgst);
-Use this to setup a signer info
-There will also be functions to add signed and unsigned attributes.
-
-int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *p7i);
-Add a signer info to the content.
-
-int PKCS7_add_certificae(PKCS7 *p7, X509 *x509);
-int PKCS7_add_crl(PKCS7 *p7, X509_CRL *x509);
-
-----
-
-p7=PKCS7_new();
-PKCS7_set_content_type(p7,NID_pkcs7_signed);
-
-signer=PKCS7_SINGNER_INFO_new();
-PKCS7_SIGNER_INFO_set(signer,x509,pkey,EVP_md5());
-PKCS7_add_signer(py,signer);
-
-we are now setup.
diff --git a/crypto/openssl/crypto/pkcs7/enc.c b/crypto/openssl/crypto/pkcs7/enc.c
deleted file mode 100644
index 7417f8a4e00b..000000000000
--- a/crypto/openssl/crypto/pkcs7/enc.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* crypto/pkcs7/enc.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-#include <stdio.h>
-#include <string.h>
-#include <openssl/bio.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/err.h>
-
-int main(argc,argv)
-int argc;
-char *argv[];
-	{
-	X509 *x509;
-	PKCS7 *p7;
-	BIO *in;
-	BIO *data,*p7bio;
-	char buf[1024*4];
-	int i;
-	int nodetach=1;
-	char *keyfile = NULL;
-	const EVP_CIPHER *cipher=NULL;
-	STACK_OF(X509) *recips=NULL;
-
-	OpenSSL_add_all_algorithms();
-
-	data=BIO_new(BIO_s_file());
-	while(argc > 1)
-		{
-		if (strcmp(argv[1],"-nd") == 0)
-			{
-			nodetach=1;
-			argv++; argc--;
-			}
-		else if ((strcmp(argv[1],"-c") == 0) && (argc >= 2)) {
-			if(!(cipher = EVP_get_cipherbyname(argv[2]))) {
-				fprintf(stderr, "Unknown cipher %s\n", argv[2]);
-				goto err;
-			}
-			argc-=2;
-			argv+=2;
-		} else if ((strcmp(argv[1],"-k") == 0) && (argc >= 2)) {
-			keyfile = argv[2];
-			argc-=2;
-			argv+=2;
-			if (!(in=BIO_new_file(keyfile,"r"))) goto err;
-			if (!(x509=PEM_read_bio_X509(in,NULL,NULL,NULL)))
-				goto err;
-			if(!recips) recips = sk_X509_new_null();
-			sk_X509_push(recips, x509);
-			BIO_free(in);
-		} else break;
-	}
-
-	if(!recips) {
-		fprintf(stderr, "No recipients\n");
-		goto err;
-	}
-
-	if (!BIO_read_filename(data,argv[1])) goto err;
-
-	p7=PKCS7_new();
-#if 0
-	BIO_reset(in);
-	if ((pkey=PEM_read_bio_PrivateKey(in,NULL,NULL)) == NULL) goto err;
-	BIO_free(in);
-	PKCS7_set_type(p7,NID_pkcs7_signedAndEnveloped);
-	 
-	if (PKCS7_add_signature(p7,x509,pkey,EVP_sha1()) == NULL) goto err;
-	/* we may want to add more */
-	PKCS7_add_certificate(p7,x509);
-#else
-	PKCS7_set_type(p7,NID_pkcs7_enveloped);
-#endif
-	if(!cipher)	{
-#ifndef OPENSSL_NO_DES
-		cipher = EVP_des_ede3_cbc();
-#else
-		fprintf(stderr, "No cipher selected\n");
-		goto err;
-#endif
-	}
-
-	if (!PKCS7_set_cipher(p7,cipher)) goto err;
-	for(i = 0; i < sk_X509_num(recips); i++) {
-		if (!PKCS7_add_recipient(p7,sk_X509_value(recips, i))) goto err;
-	}
-	sk_X509_pop_free(recips, X509_free);
-
-	/* Set the content of the signed to 'data' */
-	/* PKCS7_content_new(p7,NID_pkcs7_data); not used in envelope */
-
-	/* could be used, but not in this version :-)
-	if (!nodetach) PKCS7_set_detached(p7,1);
-	*/
-
-	if ((p7bio=PKCS7_dataInit(p7,NULL)) == NULL) goto err;
-
-	for (;;)
-		{
-		i=BIO_read(data,buf,sizeof(buf));
-		if (i <= 0) break;
-		BIO_write(p7bio,buf,i);
-		}
-	BIO_flush(p7bio);
-
-	if (!PKCS7_dataFinal(p7,p7bio)) goto err;
-	BIO_free(p7bio);
-
-	PEM_write_PKCS7(stdout,p7);
-	PKCS7_free(p7);
-
-	exit(0);
-err:
-	ERR_load_crypto_strings();
-	ERR_print_errors_fp(stderr);
-	exit(1);
-	}
-
diff --git a/crypto/openssl/crypto/pkcs7/es1.pem b/crypto/openssl/crypto/pkcs7/es1.pem
deleted file mode 100644
index 47112a238fd2..000000000000
--- a/crypto/openssl/crypto/pkcs7/es1.pem
+++ /dev/null
@@ -1,66 +0,0 @@
------BEGIN PKCS7-----
-MIAGCSqGSIb3DQEHA6CAMIACAQAxggHmMIHwAgEAMIGZMIGSMQswCQYDVQQGEwJBVTETMBEG
-A1UECBMKUXVlZW5zbGFuZDERMA8GA1UEBxMIQnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0c29m
-dCBQdHkgTHRkMSIwIAYDVQQLExlERU1PTlNUUkFUSU9OIEFORCBURVNUSU5HMRswGQYDVQQD
-ExJERU1PIFpFUk8gVkFMVUUgQ0ECAgRuMA0GCSqGSIb3DQEBAQUABEDWak0y/5XZJhQJeCLo
-KECcHXkTEbjzYkYNHIinbiPmRK4QbNfs9z2mA3z/c2ykQ4eAqFR2jyNrUMN/+I5XEiv6MIHw
-AgEAMIGZMIGSMQswCQYDVQQGEwJBVTETMBEGA1UECBMKUXVlZW5zbGFuZDERMA8GA1UEBxMI
-QnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0c29mdCBQdHkgTHRkMSIwIAYDVQQLExlERU1PTlNU
-UkFUSU9OIEFORCBURVNUSU5HMRswGQYDVQQDExJERU1PIFpFUk8gVkFMVUUgQ0ECAgR9MA0G
-CSqGSIb3DQEBAQUABEAWg9+KgtCjc77Jdj1Ve4wGgHjVHbbSYEA1ZqKFDoi15vSr9hfpHmC4
-ycZzcRo16JkTfolefiHZzmyjVz94vSN6MIAGCSqGSIb3DQEHATAaBggqhkiG9w0DAjAOAgIA
-oAQI7X4Tk4mcbV6ggASBsHl1mCaJ3RhXWlNPCgCRU53d7M5x6TDZRkvwdtdvW96m1lupT03F
-XtonkBqk7oMkH7kGfs5/REQOPjx0QE2Ixmgt1W3szum82EZwA7pZNppcraK7W/odw/7bYZO+
-II3HPmRklE2N9qiu1LPaPUsnYogkO6SennyeL5tZ382vBweL/8pnG0qsbT1OBb65v+llnsjT
-pa1T/p+fIx/iJJGE6K9fYFokC6gXLQ6ozXRdOu5oBDB8mPCYYvAqKycidM/MrGGUkpEtS4f0
-lS31PwQi5YTim8Ig3/TOwVpPX32i46FTuEIEIMHkD/OvpfwCCzXUHHJnKnKUAUvIsSY3vGBs
-8ezpUDfBBBj9LHDy32hZ2tQilkDefP5VM2LLdrWgamYEgfiyITQvn08Ul5lQOQxbFKBheFq5
-otCCN4MR+w5eq12xQu6y+f9z0159ag2ru87D0lLtUtXXtCELbO1nUkT2sJ0k/iDs9TOXr6Cx
-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
------END PKCS7-----
diff --git a/crypto/openssl/crypto/pkcs7/example.c b/crypto/openssl/crypto/pkcs7/example.c
deleted file mode 100644
index 2953d04b5c90..000000000000
--- a/crypto/openssl/crypto/pkcs7/example.c
+++ /dev/null
@@ -1,329 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <openssl/pkcs7.h>
-#include <openssl/asn1_mac.h>
-#include <openssl/x509.h>
-
-int add_signed_time(PKCS7_SIGNER_INFO *si)
-	{
-	ASN1_UTCTIME *sign_time;
-
-	/* The last parameter is the amount to add/subtract from the current
-	 * time (in seconds) */
-	sign_time=X509_gmtime_adj(NULL,0);
-	PKCS7_add_signed_attribute(si,NID_pkcs9_signingTime,
-		V_ASN1_UTCTIME,(char *)sign_time);
-	return(1);
-	}
-
-ASN1_UTCTIME *get_signed_time(PKCS7_SIGNER_INFO *si)
-	{
-	ASN1_TYPE *so;
-
-	so=PKCS7_get_signed_attribute(si,NID_pkcs9_signingTime);
-	if (so->type == V_ASN1_UTCTIME)
-	    return so->value.utctime;
-	return NULL;
-	}
-	
-static int signed_string_nid= -1;
-
-void add_signed_string(PKCS7_SIGNER_INFO *si, char *str)
-	{
-	ASN1_OCTET_STRING *os;
-
-	/* To a an object of OID 1.2.3.4.5, which is an octet string */
-	if (signed_string_nid == -1)
-		signed_string_nid=
-			OBJ_create("1.2.3.4.5","OID_example","Our example OID");
-	os=ASN1_OCTET_STRING_new();
-	ASN1_OCTET_STRING_set(os,(unsigned char*)str,strlen(str));
-	/* When we add, we do not free */
-	PKCS7_add_signed_attribute(si,signed_string_nid,
-		V_ASN1_OCTET_STRING,(char *)os);
-	}
-
-int get_signed_string(PKCS7_SIGNER_INFO *si, char *buf, int len)
-	{
-	ASN1_TYPE *so;
-	ASN1_OCTET_STRING *os;
-	int i;
-
-	if (signed_string_nid == -1)
-		signed_string_nid=
-			OBJ_create("1.2.3.4.5","OID_example","Our example OID");
-	/* To retrieve */
-	so=PKCS7_get_signed_attribute(si,signed_string_nid);
-	if (so != NULL)
-		{
-		if (so->type == V_ASN1_OCTET_STRING)
-			{
-			os=so->value.octet_string;
-			i=os->length;
-			if ((i+1) > len)
-				i=len-1;
-			memcpy(buf,os->data,i);
-			return(i);
-			}
-		}
-	return(0);
-	}
-
-static int signed_seq2string_nid= -1;
-/* ########################################### */
-int add_signed_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2)
-	{
-	/* To add an object of OID 1.9.999, which is a sequence containing
-	 * 2 octet strings */
-	unsigned char *p;
-	ASN1_OCTET_STRING *os1,*os2;
-	ASN1_STRING *seq;
-	unsigned char *data;
-	int i,total;
-
-	if (signed_seq2string_nid == -1)
-		signed_seq2string_nid=
-			OBJ_create("1.9.9999","OID_example","Our example OID");
-
-	os1=ASN1_OCTET_STRING_new();
-	os2=ASN1_OCTET_STRING_new();
-	ASN1_OCTET_STRING_set(os1,(unsigned char*)str1,strlen(str1));
-	ASN1_OCTET_STRING_set(os2,(unsigned char*)str1,strlen(str1));
-	i =i2d_ASN1_OCTET_STRING(os1,NULL);
-	i+=i2d_ASN1_OCTET_STRING(os2,NULL);
-	total=ASN1_object_size(1,i,V_ASN1_SEQUENCE);
-
-	data=malloc(total);
-	p=data;
-	ASN1_put_object(&p,1,i,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
-	i2d_ASN1_OCTET_STRING(os1,&p);
-	i2d_ASN1_OCTET_STRING(os2,&p);
-
-	seq=ASN1_STRING_new();
-	ASN1_STRING_set(seq,data,total);
-	free(data);
-	ASN1_OCTET_STRING_free(os1);
-	ASN1_OCTET_STRING_free(os2);
-
-	PKCS7_add_signed_attribute(si,signed_seq2string_nid,
-		V_ASN1_SEQUENCE,(char *)seq);
-	return(1);
-	}
-
-/* For this case, I will malloc the return strings */
-int get_signed_seq2string(PKCS7_SIGNER_INFO *si, char **str1, char **str2)
-	{
-	ASN1_TYPE *so;
-
-	if (signed_seq2string_nid == -1)
-		signed_seq2string_nid=
-			OBJ_create("1.9.9999","OID_example","Our example OID");
-	/* To retrieve */
-	so=PKCS7_get_signed_attribute(si,signed_seq2string_nid);
-	if (so && (so->type == V_ASN1_SEQUENCE))
-		{
-		ASN1_const_CTX c;
-		ASN1_STRING *s;
-		long length;
-		ASN1_OCTET_STRING *os1,*os2;
-
-		s=so->value.sequence;
-		c.p=ASN1_STRING_data(s);
-		c.max=c.p+ASN1_STRING_length(s);
-		if (!asn1_GetSequence(&c,&length)) goto err;
-		/* Length is the length of the seqence */
-
-		c.q=c.p;
-		if ((os1=d2i_ASN1_OCTET_STRING(NULL,&c.p,c.slen)) == NULL) 
-			goto err;
-		c.slen-=(c.p-c.q);
-
-		c.q=c.p;
-		if ((os2=d2i_ASN1_OCTET_STRING(NULL,&c.p,c.slen)) == NULL) 
-			goto err;
-		c.slen-=(c.p-c.q);
-
-		if (!asn1_const_Finish(&c)) goto err;
-		*str1=malloc(os1->length+1);
-		*str2=malloc(os2->length+1);
-		memcpy(*str1,os1->data,os1->length);
-		memcpy(*str2,os2->data,os2->length);
-		(*str1)[os1->length]='\0';
-		(*str2)[os2->length]='\0';
-		ASN1_OCTET_STRING_free(os1);
-		ASN1_OCTET_STRING_free(os2);
-		return(1);
-		}
-err:
-	return(0);
-	}
-
-
-/* #######################################
- * THE OTHER WAY TO DO THINGS
- * #######################################
- */
-X509_ATTRIBUTE *create_time(void)
-	{
-	ASN1_UTCTIME *sign_time;
-	X509_ATTRIBUTE *ret;
-
-	/* The last parameter is the amount to add/subtract from the current
-	 * time (in seconds) */
-	sign_time=X509_gmtime_adj(NULL,0);
-	ret=X509_ATTRIBUTE_create(NID_pkcs9_signingTime,
-		V_ASN1_UTCTIME,(char *)sign_time);
-	return(ret);
-	}
-
-ASN1_UTCTIME *sk_get_time(STACK_OF(X509_ATTRIBUTE) *sk)
-	{
-	ASN1_TYPE *so;
-	PKCS7_SIGNER_INFO si;
-
-	si.auth_attr=sk;
-	so=PKCS7_get_signed_attribute(&si,NID_pkcs9_signingTime);
-	if (so->type == V_ASN1_UTCTIME)
-	    return so->value.utctime;
-	return NULL;
-	}
-	
-X509_ATTRIBUTE *create_string(char *str)
-	{
-	ASN1_OCTET_STRING *os;
-	X509_ATTRIBUTE *ret;
-
-	/* To a an object of OID 1.2.3.4.5, which is an octet string */
-	if (signed_string_nid == -1)
-		signed_string_nid=
-			OBJ_create("1.2.3.4.5","OID_example","Our example OID");
-	os=ASN1_OCTET_STRING_new();
-	ASN1_OCTET_STRING_set(os,(unsigned char*)str,strlen(str));
-	/* When we add, we do not free */
-	ret=X509_ATTRIBUTE_create(signed_string_nid,
-		V_ASN1_OCTET_STRING,(char *)os);
-	return(ret);
-	}
-
-int sk_get_string(STACK_OF(X509_ATTRIBUTE) *sk, char *buf, int len)
-	{
-	ASN1_TYPE *so;
-	ASN1_OCTET_STRING *os;
-	int i;
-	PKCS7_SIGNER_INFO si;
-
-	si.auth_attr=sk;
-
-	if (signed_string_nid == -1)
-		signed_string_nid=
-			OBJ_create("1.2.3.4.5","OID_example","Our example OID");
-	/* To retrieve */
-	so=PKCS7_get_signed_attribute(&si,signed_string_nid);
-	if (so != NULL)
-		{
-		if (so->type == V_ASN1_OCTET_STRING)
-			{
-			os=so->value.octet_string;
-			i=os->length;
-			if ((i+1) > len)
-				i=len-1;
-			memcpy(buf,os->data,i);
-			return(i);
-			}
-		}
-	return(0);
-	}
-
-X509_ATTRIBUTE *add_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2)
-	{
-	/* To add an object of OID 1.9.999, which is a sequence containing
-	 * 2 octet strings */
-	unsigned char *p;
-	ASN1_OCTET_STRING *os1,*os2;
-	ASN1_STRING *seq;
-	X509_ATTRIBUTE *ret;
-	unsigned char *data;
-	int i,total;
-
-	if (signed_seq2string_nid == -1)
-		signed_seq2string_nid=
-			OBJ_create("1.9.9999","OID_example","Our example OID");
-
-	os1=ASN1_OCTET_STRING_new();
-	os2=ASN1_OCTET_STRING_new();
-	ASN1_OCTET_STRING_set(os1,(unsigned char*)str1,strlen(str1));
-	ASN1_OCTET_STRING_set(os2,(unsigned char*)str1,strlen(str1));
-	i =i2d_ASN1_OCTET_STRING(os1,NULL);
-	i+=i2d_ASN1_OCTET_STRING(os2,NULL);
-	total=ASN1_object_size(1,i,V_ASN1_SEQUENCE);
-
-	data=malloc(total);
-	p=data;
-	ASN1_put_object(&p,1,i,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
-	i2d_ASN1_OCTET_STRING(os1,&p);
-	i2d_ASN1_OCTET_STRING(os2,&p);
-
-	seq=ASN1_STRING_new();
-	ASN1_STRING_set(seq,data,total);
-	free(data);
-	ASN1_OCTET_STRING_free(os1);
-	ASN1_OCTET_STRING_free(os2);
-
-	ret=X509_ATTRIBUTE_create(signed_seq2string_nid,
-		V_ASN1_SEQUENCE,(char *)seq);
-	return(ret);
-	}
-
-/* For this case, I will malloc the return strings */
-int sk_get_seq2string(STACK_OF(X509_ATTRIBUTE) *sk, char **str1, char **str2)
-	{
-	ASN1_TYPE *so;
-	PKCS7_SIGNER_INFO si;
-
-	if (signed_seq2string_nid == -1)
-		signed_seq2string_nid=
-			OBJ_create("1.9.9999","OID_example","Our example OID");
-
-	si.auth_attr=sk;
-	/* To retrieve */
-	so=PKCS7_get_signed_attribute(&si,signed_seq2string_nid);
-	if (so->type == V_ASN1_SEQUENCE)
-		{
-		ASN1_const_CTX c;
-		ASN1_STRING *s;
-		long length;
-		ASN1_OCTET_STRING *os1,*os2;
-
-		s=so->value.sequence;
-		c.p=ASN1_STRING_data(s);
-		c.max=c.p+ASN1_STRING_length(s);
-		if (!asn1_GetSequence(&c,&length)) goto err;
-		/* Length is the length of the seqence */
-
-		c.q=c.p;
-		if ((os1=d2i_ASN1_OCTET_STRING(NULL,&c.p,c.slen)) == NULL) 
-			goto err;
-		c.slen-=(c.p-c.q);
-
-		c.q=c.p;
-		if ((os2=d2i_ASN1_OCTET_STRING(NULL,&c.p,c.slen)) == NULL) 
-			goto err;
-		c.slen-=(c.p-c.q);
-
-		if (!asn1_const_Finish(&c)) goto err;
-		*str1=malloc(os1->length+1);
-		*str2=malloc(os2->length+1);
-		memcpy(*str1,os1->data,os1->length);
-		memcpy(*str2,os2->data,os2->length);
-		(*str1)[os1->length]='\0';
-		(*str2)[os2->length]='\0';
-		ASN1_OCTET_STRING_free(os1);
-		ASN1_OCTET_STRING_free(os2);
-		return(1);
-		}
-err:
-	return(0);
-	}
-
-
diff --git a/crypto/openssl/crypto/pkcs7/info.pem b/crypto/openssl/crypto/pkcs7/info.pem
deleted file mode 100644
index 989baf87096a..000000000000
--- a/crypto/openssl/crypto/pkcs7/info.pem
+++ /dev/null
@@ -1,57 +0,0 @@
-issuer :/C=AU/SP=Queensland/L=Brisbane/O=Cryptsoft Pty Ltd/OU=DEMONSTRATION AND TESTING/CN=DEMO ZERO VALUE CA
-subject:/C=AU/SP=Queensland/L=Brisbane/O=Cryptsoft Pty Ltd/OU=SMIME 003/CN=Information/Email=info@cryptsoft.com
-serial :047D
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1149 (0x47d)
-        Signature Algorithm: md5withRSAEncryption
-        Issuer: C=AU, SP=Queensland, L=Brisbane, O=Cryptsoft Pty Ltd, OU=DEMONSTRATION AND TESTING, CN=DEMO ZERO VALUE CA
-        Validity
-            Not Before: May 13 05:40:58 1998 GMT
-            Not After : May 12 05:40:58 2000 GMT
-        Subject: C=AU, SP=Queensland, L=Brisbane, O=Cryptsoft Pty Ltd, OU=SMIME 003, CN=Information/Email=info@cryptsoft.com
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Modulus:
-                    00:ad:e7:23:89:ee:0d:87:b7:9c:32:44:4b:95:81:
-                    73:dd:22:80:4b:2d:c5:60:b8:fe:1e:18:63:ef:dc:
-                    89:89:22:df:95:3c:7a:db:3d:9a:06:a8:08:d6:29:
-                    fd:ef:41:09:91:ed:bc:ad:98:f9:f6:28:90:62:6f:
-                    e7:e7:0c:4d:0b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            Netscape Comment: 
-                Generated with SSLeay
-    Signature Algorithm: md5withRSAEncryption
-        52:15:ea:88:f4:f0:f9:0b:ef:ce:d5:f8:83:40:61:16:5e:55:
-        f9:ce:2d:d1:8b:31:5c:03:c6:2d:10:7c:61:d5:5c:0a:42:97:
-        d1:fd:65:b6:b6:84:a5:39:ec:46:ec:fc:e0:0d:d9:22:da:1b:
-        50:74:ad:92:cb:4e:90:e5:fa:7d
-
------BEGIN CERTIFICATE-----
-MIICTDCCAfagAwIBAgICBH0wDQYJKoZIhvcNAQEEBQAwgZIxCzAJBgNVBAYTAkFV
-MRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UE
-ChMRQ3J5cHRzb2Z0IFB0eSBMdGQxIjAgBgNVBAsTGURFTU9OU1RSQVRJT04gQU5E
-IFRFU1RJTkcxGzAZBgNVBAMTEkRFTU8gWkVSTyBWQUxVRSBDQTAeFw05ODA1MTMw
-NTQwNThaFw0wMDA1MTIwNTQwNThaMIGeMQswCQYDVQQGEwJBVTETMBEGA1UECBMK
-UXVlZW5zbGFuZDERMA8GA1UEBxMIQnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0c29m
-dCBQdHkgTHRkMRIwEAYDVQQLEwlTTUlNRSAwMDMxFDASBgNVBAMTC0luZm9ybWF0
-aW9uMSEwHwYJKoZIhvcNAQkBFhJpbmZvQGNyeXB0c29mdC5jb20wXDANBgkqhkiG
-9w0BAQEFAANLADBIAkEArecjie4Nh7ecMkRLlYFz3SKASy3FYLj+Hhhj79yJiSLf
-lTx62z2aBqgI1in970EJke28rZj59iiQYm/n5wxNCwIDAQABoygwJjAkBglghkgB
-hvhCAQ0EFxYVR2VuZXJhdGVkIHdpdGggU1NMZWF5MA0GCSqGSIb3DQEBBAUAA0EA
-UhXqiPTw+QvvztX4g0BhFl5V+c4t0YsxXAPGLRB8YdVcCkKX0f1ltraEpTnsRuz8
-4A3ZItobUHStkstOkOX6fQ==
------END CERTIFICATE-----
-
------BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAK3nI4nuDYe3nDJES5WBc90igEstxWC4/h4YY+/ciYki35U8ets9
-mgaoCNYp/e9BCZHtvK2Y+fYokGJv5+cMTQsCAwEAAQJBAIHpvXvqEcOEoDRRHuIG
-fkcB4jPHcr9KE9TpxabH6xs9beN6OJnkePXAHwaz5MnUgSnbpOKq+cw8miKjXwe/
-zVECIQDVLwncT2lRmXarEYHzb+q/0uaSvKhWKKt3kJasLNTrAwIhANDUc/ghut29
-p3jJYjurzUKuG774/5eLjPLsxPPIZzNZAiA/10hSq41UnGqHLEUIS9m2/EeEZe7b
-bm567dfRU9OnVQIgDo8ROrZXSchEGbaog5J5r/Fle83uO8l93R3GqVxKXZkCIFfk
-IPD5PIYQAyyod3hyKKza7ZP4CGY4oOfZetbkSGGG
------END RSA PRIVATE KEY-----
diff --git a/crypto/openssl/crypto/pkcs7/infokey.pem b/crypto/openssl/crypto/pkcs7/infokey.pem
deleted file mode 100644
index 1e2acc954d2a..000000000000
--- a/crypto/openssl/crypto/pkcs7/infokey.pem
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAK3nI4nuDYe3nDJES5WBc90igEstxWC4/h4YY+/ciYki35U8ets9
-mgaoCNYp/e9BCZHtvK2Y+fYokGJv5+cMTQsCAwEAAQJBAIHpvXvqEcOEoDRRHuIG
-fkcB4jPHcr9KE9TpxabH6xs9beN6OJnkePXAHwaz5MnUgSnbpOKq+cw8miKjXwe/
-zVECIQDVLwncT2lRmXarEYHzb+q/0uaSvKhWKKt3kJasLNTrAwIhANDUc/ghut29
-p3jJYjurzUKuG774/5eLjPLsxPPIZzNZAiA/10hSq41UnGqHLEUIS9m2/EeEZe7b
-bm567dfRU9OnVQIgDo8ROrZXSchEGbaog5J5r/Fle83uO8l93R3GqVxKXZkCIFfk
-IPD5PIYQAyyod3hyKKza7ZP4CGY4oOfZetbkSGGG
------END RSA PRIVATE KEY-----
diff --git a/crypto/openssl/crypto/pkcs7/p7/a1 b/crypto/openssl/crypto/pkcs7/p7/a1
deleted file mode 100644
index 56ca94376265..000000000000
--- a/crypto/openssl/crypto/pkcs7/p7/a1
+++ /dev/null
@@ -1,2 +0,0 @@
-j,H>_��_�D�zE�L�	VJ��觬���E3��Y�x%_�k
-3�)DLSc�8%�M
\ No newline at end of file
diff --git a/crypto/openssl/crypto/pkcs7/p7/a2 b/crypto/openssl/crypto/pkcs7/p7/a2
deleted file mode 100644
index 23d8fb5e93b9..000000000000
--- a/crypto/openssl/crypto/pkcs7/p7/a2
+++ /dev/null
@@ -1 +0,0 @@
-k~@a�,N�M͹�	
<O( KP�騠�K�>��U�o_�
Bqrm�?٠t?t��ρ�Id2��
\ No newline at end of file
diff --git a/crypto/openssl/crypto/pkcs7/p7/cert.p7c b/crypto/openssl/crypto/pkcs7/p7/cert.p7c
deleted file mode 100644
index 2b75ec05f7d8..000000000000
Binary files a/crypto/openssl/crypto/pkcs7/p7/cert.p7c and /dev/null differ
diff --git a/crypto/openssl/crypto/pkcs7/p7/smime.p7m b/crypto/openssl/crypto/pkcs7/p7/smime.p7m
deleted file mode 100644
index 2b6e6f82ba3f..000000000000
Binary files a/crypto/openssl/crypto/pkcs7/p7/smime.p7m and /dev/null differ
diff --git a/crypto/openssl/crypto/pkcs7/p7/smime.p7s b/crypto/openssl/crypto/pkcs7/p7/smime.p7s
deleted file mode 100644
index 2b5d4fb0e3b6..000000000000
Binary files a/crypto/openssl/crypto/pkcs7/p7/smime.p7s and /dev/null differ
diff --git a/crypto/openssl/crypto/pkcs7/server.pem b/crypto/openssl/crypto/pkcs7/server.pem
deleted file mode 100644
index 750aac209468..000000000000
--- a/crypto/openssl/crypto/pkcs7/server.pem
+++ /dev/null
@@ -1,24 +0,0 @@
-issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test CA (1024 bit)
-subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Server test cert (512 bit)
------BEGIN CERTIFICATE-----
-MIIB6TCCAVICAQAwDQYJKoZIhvcNAQEEBQAwWzELMAkGA1UEBhMCQVUxEzARBgNV
-BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRswGQYD
-VQQDExJUZXN0IENBICgxMDI0IGJpdCkwHhcNOTcwNjA5MTM1NzQ2WhcNOTgwNjA5
-MTM1NzQ2WjBjMQswCQYDVQQGEwJBVTETMBEGA1UECBMKUXVlZW5zbGFuZDEaMBgG
-A1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxIzAhBgNVBAMTGlNlcnZlciB0ZXN0IGNl
-cnQgKDUxMiBiaXQpMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ+zw4Qnlf8SMVIP
-Fe9GEcStgOY2Ww/dgNdhjeD8ckUJNP5VZkVDTGiXav6ooKXfX3j/7tdkuD8Ey2//
-Kv7+ue0CAwEAATANBgkqhkiG9w0BAQQFAAOBgQB4TMR2CvacKE9wAsu9jyCX8YiW
-mgCM+YoP6kt4Zkj2z5IRfm7WrycKsnpnOR+tGeqAjkCeZ6/36o9l91RvPnN1VJ/i
-xQv2df0KFeMr00IkDdTNAdIWqFkSsZTAY2QAdgenb7MB1joejquYzO2DQIO7+wpH
-irObpESxAZLySCmPPg==
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIIBPAIBAAJBAJ+zw4Qnlf8SMVIPFe9GEcStgOY2Ww/dgNdhjeD8ckUJNP5VZkVD
-TGiXav6ooKXfX3j/7tdkuD8Ey2//Kv7+ue0CAwEAAQJAN6W31vDEP2DjdqhzCDDu
-OA4NACqoiFqyblo7yc2tM4h4xMbC3Yx5UKMN9ZkCtX0gzrz6DyF47bdKcWBzNWCj
-gQIhANEoojVt7hq+SQ6MCN6FTAysGgQf56Q3TYoJMoWvdiXVAiEAw3e3rc+VJpOz
-rHuDo6bgpjUAAXM+v3fcpsfZSNO6V7kCIQCtbVjanpUwvZkMI9by02oUk9taki3b
-PzPfAfNPYAbCJQIhAJXNQDWyqwn/lGmR11cqY2y9nZ1+5w3yHGatLrcDnQHxAiEA
-vnlEGo8K85u+KwIOimM48ZG8oTk7iFdkqLJR1utT3aU=
------END RSA PRIVATE KEY-----
diff --git a/crypto/openssl/crypto/pkcs7/sign.c b/crypto/openssl/crypto/pkcs7/sign.c
deleted file mode 100644
index 8b59885f7ea1..000000000000
--- a/crypto/openssl/crypto/pkcs7/sign.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* crypto/pkcs7/sign.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-#include <stdio.h>
-#include <string.h>
-#include <openssl/bio.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/err.h>
-
-int main(argc,argv)
-int argc;
-char *argv[];
-	{
-	X509 *x509;
-	EVP_PKEY *pkey;
-	PKCS7 *p7;
-	PKCS7_SIGNER_INFO *si;
-	BIO *in;
-	BIO *data,*p7bio;
-	char buf[1024*4];
-	int i;
-	int nodetach=0;
-
-#ifndef OPENSSL_NO_MD2
-	EVP_add_digest(EVP_md2());
-#endif
-#ifndef OPENSSL_NO_MD5
-	EVP_add_digest(EVP_md5());
-#endif
-#ifndef OPENSSL_NO_SHA1
-	EVP_add_digest(EVP_sha1());
-#endif
-#ifndef OPENSSL_NO_MDC2
-	EVP_add_digest(EVP_mdc2());
-#endif
-
-	data=BIO_new(BIO_s_file());
-again:
-	if (argc > 1)
-		{
-		if (strcmp(argv[1],"-nd") == 0)
-			{
-			nodetach=1;
-			argv++; argc--;
-			goto again;
-			}
-		if (!BIO_read_filename(data,argv[1]))
-			goto err;
-		}
-	else
-		BIO_set_fp(data,stdin,BIO_NOCLOSE);
-
-	if ((in=BIO_new_file("server.pem","r")) == NULL) goto err;
-	if ((x509=PEM_read_bio_X509(in,NULL,NULL,NULL)) == NULL) goto err;
-	BIO_reset(in);
-	if ((pkey=PEM_read_bio_PrivateKey(in,NULL,NULL,NULL)) == NULL) goto err;
-	BIO_free(in);
-
-	p7=PKCS7_new();
-	PKCS7_set_type(p7,NID_pkcs7_signed);
-	 
-	si=PKCS7_add_signature(p7,x509,pkey,EVP_sha1());
-	if (si == NULL) goto err;
-
-	/* If you do this then you get signing time automatically added */
-	PKCS7_add_signed_attribute(si, NID_pkcs9_contentType, V_ASN1_OBJECT,
-						OBJ_nid2obj(NID_pkcs7_data));
-
-	/* we may want to add more */
-	PKCS7_add_certificate(p7,x509);
-
-	/* Set the content of the signed to 'data' */
-	PKCS7_content_new(p7,NID_pkcs7_data);
-
-	if (!nodetach)
-		PKCS7_set_detached(p7,1);
-
-	if ((p7bio=PKCS7_dataInit(p7,NULL)) == NULL) goto err;
-
-	for (;;)
-		{
-		i=BIO_read(data,buf,sizeof(buf));
-		if (i <= 0) break;
-		BIO_write(p7bio,buf,i);
-		}
-
-	if (!PKCS7_dataFinal(p7,p7bio)) goto err;
-	BIO_free(p7bio);
-
-	PEM_write_PKCS7(stdout,p7);
-	PKCS7_free(p7);
-
-	exit(0);
-err:
-	ERR_load_crypto_strings();
-	ERR_print_errors_fp(stderr);
-	exit(1);
-	}
-
diff --git a/crypto/openssl/crypto/pkcs7/t/3des.pem b/crypto/openssl/crypto/pkcs7/t/3des.pem
deleted file mode 100644
index b2b5081a10ec..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/3des.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PKCS7-----
-MIAGCSqGSIb3DQEHA6CAMIACAQAxggHmMIHwAgEAMIGZMIGSMQswCQYDVQQGEwJBVTETMBEG
-A1UECBMKUXVlZW5zbGFuZDERMA8GA1UEBxMIQnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0c29m
-dCBQdHkgTHRkMSIwIAYDVQQLExlERU1PTlNUUkFUSU9OIEFORCBURVNUSU5HMRswGQYDVQQD
-ExJERU1PIFpFUk8gVkFMVUUgQ0ECAgR+MA0GCSqGSIb3DQEBAQUABEC2vXI1xQDW6lUHM3zQ
-/9uBEBOO5A3TtkrklAXq7v01gsIC21t52qSk36REXY+slhNZ0OQ349tgkTsoETHFLoEwMIHw
-AgEAMIGZMIGSMQswCQYDVQQGEwJBVTETMBEGA1UECBMKUXVlZW5zbGFuZDERMA8GA1UEBxMI
-QnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0c29mdCBQdHkgTHRkMSIwIAYDVQQLExlERU1PTlNU
-UkFUSU9OIEFORCBURVNUSU5HMRswGQYDVQQDExJERU1PIFpFUk8gVkFMVUUgQ0ECAgR9MA0G
-CSqGSIb3DQEBAQUABEB8ujxbabxXUYJhopuDm3oDq4JNqX6Io4p3ro+ShqfIndsXTZ1v5a2N
-WtLLCWlHn/habjBwZ/DgQgcKASbZ7QxNMIAGCSqGSIb3DQEHATAaBggqhkiG9w0DAjAOAgIA
-oAQIbsL5v1wX98KggAQoAaJ4WHm68fXY1WE5OIjfVBIDpO1K+i8dmKhjnAjrjoyZ9Bwc8rDL
-lgQg4CXb805h5xl+GfvSwUaHJayte1m2mcOhs3J2YyqbQ+MEIMIiJQccmhO3oDKm36CFvYR8
-5PjpclVcZyX2ngbwPFMnBAgy0clOAE6UKAAAAAAAAAAAAAA=
------END PKCS7-----
-
diff --git a/crypto/openssl/crypto/pkcs7/t/3dess.pem b/crypto/openssl/crypto/pkcs7/t/3dess.pem
deleted file mode 100644
index 23f013516a51..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/3dess.pem
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN PKCS7-----
-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
-9CWR6g==
------END PKCS7-----
diff --git a/crypto/openssl/crypto/pkcs7/t/c.pem b/crypto/openssl/crypto/pkcs7/t/c.pem
deleted file mode 100644
index a4b55e321a5c..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/c.pem
+++ /dev/null
@@ -1,48 +0,0 @@
-issuer :/C=AU/SP=Queensland/L=Brisbane/O=Cryptsoft Pty Ltd/OU=DEMONSTRATION AND TESTING/CN=DEMO ZERO VALUE CA
-subject:/C=AU/SP=Queensland/L=Brisbane/O=Cryptsoft Pty Ltd/OU=SMIME 003/CN=Information/Email=info@cryptsoft.com
-serial :047D
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1149 (0x47d)
-        Signature Algorithm: md5withRSAEncryption
-        Issuer: C=AU, SP=Queensland, L=Brisbane, O=Cryptsoft Pty Ltd, OU=DEMONSTRATION AND TESTING, CN=DEMO ZERO VALUE CA
-        Validity
-            Not Before: May 13 05:40:58 1998 GMT
-            Not After : May 12 05:40:58 2000 GMT
-        Subject: C=AU, SP=Queensland, L=Brisbane, O=Cryptsoft Pty Ltd, OU=SMIME 003, CN=Information/Email=info@cryptsoft.com
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Modulus:
-                    00:ad:e7:23:89:ee:0d:87:b7:9c:32:44:4b:95:81:
-                    73:dd:22:80:4b:2d:c5:60:b8:fe:1e:18:63:ef:dc:
-                    89:89:22:df:95:3c:7a:db:3d:9a:06:a8:08:d6:29:
-                    fd:ef:41:09:91:ed:bc:ad:98:f9:f6:28:90:62:6f:
-                    e7:e7:0c:4d:0b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            Netscape Comment: 
-                Generated with SSLeay
-    Signature Algorithm: md5withRSAEncryption
-        52:15:ea:88:f4:f0:f9:0b:ef:ce:d5:f8:83:40:61:16:5e:55:
-        f9:ce:2d:d1:8b:31:5c:03:c6:2d:10:7c:61:d5:5c:0a:42:97:
-        d1:fd:65:b6:b6:84:a5:39:ec:46:ec:fc:e0:0d:d9:22:da:1b:
-        50:74:ad:92:cb:4e:90:e5:fa:7d
-
------BEGIN CERTIFICATE-----
-MIICTDCCAfagAwIBAgICBH0wDQYJKoZIhvcNAQEEBQAwgZIxCzAJBgNVBAYTAkFV
-MRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UE
-ChMRQ3J5cHRzb2Z0IFB0eSBMdGQxIjAgBgNVBAsTGURFTU9OU1RSQVRJT04gQU5E
-IFRFU1RJTkcxGzAZBgNVBAMTEkRFTU8gWkVSTyBWQUxVRSBDQTAeFw05ODA1MTMw
-NTQwNThaFw0wMDA1MTIwNTQwNThaMIGeMQswCQYDVQQGEwJBVTETMBEGA1UECBMK
-UXVlZW5zbGFuZDERMA8GA1UEBxMIQnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0c29m
-dCBQdHkgTHRkMRIwEAYDVQQLEwlTTUlNRSAwMDMxFDASBgNVBAMTC0luZm9ybWF0
-aW9uMSEwHwYJKoZIhvcNAQkBFhJpbmZvQGNyeXB0c29mdC5jb20wXDANBgkqhkiG
-9w0BAQEFAANLADBIAkEArecjie4Nh7ecMkRLlYFz3SKASy3FYLj+Hhhj79yJiSLf
-lTx62z2aBqgI1in970EJke28rZj59iiQYm/n5wxNCwIDAQABoygwJjAkBglghkgB
-hvhCAQ0EFxYVR2VuZXJhdGVkIHdpdGggU1NMZWF5MA0GCSqGSIb3DQEBBAUAA0EA
-UhXqiPTw+QvvztX4g0BhFl5V+c4t0YsxXAPGLRB8YdVcCkKX0f1ltraEpTnsRuz8
-4A3ZItobUHStkstOkOX6fQ==
------END CERTIFICATE-----
-
diff --git a/crypto/openssl/crypto/pkcs7/t/ff b/crypto/openssl/crypto/pkcs7/t/ff
deleted file mode 100644
index 23f013516a51..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/ff
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN PKCS7-----
-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
-9CWR6g==
------END PKCS7-----
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-e b/crypto/openssl/crypto/pkcs7/t/msie-e
deleted file mode 100644
index aafae69fc9d8..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/msie-e
+++ /dev/null
@@ -1,20 +0,0 @@
-
-MIAGCSqGSIb3DQEHA6CAMIACAQAxggHCMIHMAgEAMHYwYjERMA8GA1UEBxMISW50ZXJuZXQxFzAV
-BgNVBAoTDlZlcmlTaWduLCBJbmMuMTQwMgYDVQQLEytWZXJpU2lnbiBDbGFzcyAxIENBIC0gSW5k
-aXZpZHVhbCBTdWJzY3JpYmVyAhBgQJiC3qfbCbjdj5INYLnKMA0GCSqGSIb3DQEBAQUABECMzu8y
-wQ/qZbO8cAGMRBF+mPruv3+Dvb9aWNZ2k8njUgqF6mcdhVB2MkGcsG3memRXJBixvMYWVkU3qK4Z
-VuKsMIHwAgEAMIGZMIGSMQswCQYDVQQGEwJBVTETMBEGA1UECBMKUXVlZW5zbGFuZDERMA8GA1UE
-BxMIQnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0c29mdCBQdHkgTHRkMSIwIAYDVQQLExlERU1PTlNU
-UkFUSU9OIEFORCBURVNUSU5HMRswGQYDVQQDExJERU1PIFpFUk8gVkFMVUUgQ0ECAgRuMA0GCSqG
-SIb3DQEBAQUABEBcWwYFHJbJGhiztt7lzue3Lc9CH5WAbyR+2BZ3uv+JxZfRs1PuaWPOwRa0Vgs3
-YwSJoRfxQj2Gk0wFqG1qt6d1MIAGCSqGSIb3DQEHATAaBggqhkiG9w0DAjAOAgIAoAQI8vRlP/Nx
-2iSggASCAZhR5srxyspy7DfomRJ9ff8eMCtaNwEoEx7G25PZRonC57hBvGoScLtEPU3Wp9FEbPN7
-oJESeC+AqMTyTLNy8aQsyC5s53E9UkoIvg62ekYZBbXZqXsrxx4PhiiX3NH8GVh42phB0Chjw0nK
-HZeRDmxGY3Cmk+J+l0uVKxbNIfJIKOguLBnhqmnKH/PrnzDt591u0ULy2aTLqRm+4/1Yat/QPb6J
-eoKGwNPBbS9ogBdrCNCp9ZFg3Xar2AtQHzyTQIfYeH3SRQUpKmRm5U5o9p5emgEdT+ZfJm/J4tSH
-OmbgAFsbHQakA4MBZ4J5qfDJhOA2g5lWk1hIeu5Dn/AaLRZd0yz3oY0Ieo/erPWx/bCqtBzYbMe9
-qSFTedKlbc9EGe3opOTdBZVzK8KH3w3zsy5luxKdOUG59YYb5F1IZiWGiDyuo/HuacX+griu5LeD
-bEzOtZnko+TZXvWIko30fD79j3T4MRRhWXbgj2HKza+4vJ0mzcC/1+GPsJjAEAA/JgIEDU4w6/DI
-/HQHhLAO3G+9xKD7MvmrzkoAAAAAAAAAAAAA
-
-
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-e.pem b/crypto/openssl/crypto/pkcs7/t/msie-e.pem
deleted file mode 100644
index a2a5e24e7426..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/msie-e.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN PKCS7-----
-MIAGCSqGSIb3DQEHA6CAMIIDkAIBADGCAcIwgcwCAQAwdjBiMREwDwYDVQQHEwhJ
-bnRlcm5ldDEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNDAyBgNVBAsTK1ZlcmlT
-aWduIENsYXNzIDEgQ0EgLSBJbmRpdmlkdWFsIFN1YnNjcmliZXICEGBAmILep9sJ
-uN2Pkg1gucowDQYJKoZIhvcNAQEBBQAEQIzO7zLBD+pls7xwAYxEEX6Y+u6/f4O9
-v1pY1naTyeNSCoXqZx2FUHYyQZywbeZ6ZFckGLG8xhZWRTeorhlW4qwwgfACAQAw
-gZkwgZIxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQH
-EwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRzb2Z0IFB0eSBMdGQxIjAgBgNVBAsT
-GURFTU9OU1RSQVRJT04gQU5EIFRFU1RJTkcxGzAZBgNVBAMTEkRFTU8gWkVSTyBW
-QUxVRSBDQQICBG4wDQYJKoZIhvcNAQEBBQAEQFxbBgUclskaGLO23uXO57ctz0If
-lYBvJH7YFne6/4nFl9GzU+5pY87BFrRWCzdjBImhF/FCPYaTTAWobWq3p3UwggHD
-BgkqhkiG9w0BBwEwGgYIKoZIhvcNAwIwDgICAKAECPL0ZT/zcdokgIIBmFHmyvHK
-ynLsN+iZEn19/x4wK1o3ASgTHsbbk9lGicLnuEG8ahJwu0Q9Tdan0URs83ugkRJ4
-L4CoxPJMs3LxpCzILmzncT1SSgi+DrZ6RhkFtdmpeyvHHg+GKJfc0fwZWHjamEHQ
-KGPDScodl5EObEZjcKaT4n6XS5UrFs0h8kgo6C4sGeGqacof8+ufMO3n3W7RQvLZ
-pMupGb7j/Vhq39A9vol6gobA08FtL2iAF2sI0Kn1kWDddqvYC1AfPJNAh9h4fdJF
-BSkqZGblTmj2nl6aAR1P5l8mb8ni1Ic6ZuAAWxsdBqQDgwFngnmp8MmE4DaDmVaT
-WEh67kOf8BotFl3TLPehjQh6j96s9bH9sKq0HNhsx72pIVN50qVtz0QZ7eik5N0F
-lXMrwoffDfOzLmW7Ep05Qbn1hhvkXUhmJYaIPK6j8e5pxf6CuK7kt4NsTM61meSj
-5Nle9YiSjfR8Pv2PdPgxFGFZduCPYcrNr7i8nSbNwL/X4Y+wmMAQAD8mAgQNTjDr
-8Mj8dAeEsA7cb73EoPsy+avOSgAAAAA=
------END PKCS7-----
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-enc-01 b/crypto/openssl/crypto/pkcs7/t/msie-enc-01
deleted file mode 100644
index 2c93ab646268..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/msie-enc-01
+++ /dev/null
@@ -1,62 +0,0 @@
-
-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
-AAAAAAAAAAAA
-
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-enc-01.pem b/crypto/openssl/crypto/pkcs7/t/msie-enc-01.pem
deleted file mode 100644
index 9abf00b2f245..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/msie-enc-01.pem
+++ /dev/null
@@ -1,66 +0,0 @@
------BEGIN PKCS7-----
-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
-6RLfsTyyPgJi0GsAAAAA
------END PKCS7-----
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-enc-02 b/crypto/openssl/crypto/pkcs7/t/msie-enc-02
deleted file mode 100644
index 70170559651f..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/msie-enc-02
+++ /dev/null
@@ -1,90 +0,0 @@
-
-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
-rZgAAAAAAAAAAAAA
-
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-enc-02.pem b/crypto/openssl/crypto/pkcs7/t/msie-enc-02.pem
deleted file mode 100644
index 279c5d830b07..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/msie-enc-02.pem
+++ /dev/null
@@ -1,106 +0,0 @@
------BEGIN PKCS7-----
-MIAGCSqGSIb3DQEHA6CAMIITQAIBADGCAcIwgcwCAQAwdjBiMREwDwYDVQQHEwhJ
-bnRlcm5ldDEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNDAyBgNVBAsTK1ZlcmlT
-aWduIENsYXNzIDEgQ0EgLSBJbmRpdmlkdWFsIFN1YnNjcmliZXICEGBAmILep9sJ
-uN2Pkg1gucowDQYJKoZIhvcNAQEBBQAEQAKvi2eRLO+jdoiUd8ksZt+iQ0JXoWN0
-M/W9CEv6R1c42pwUIR/1F4RMK9oeyUiv9Z6lzmPaGNmx6XOCoueszVkwgfACAQAw
-gZkwgZIxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQH
-EwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRzb2Z0IFB0eSBMdGQxIjAgBgNVBAsT
-GURFTU9OU1RSQVRJT04gQU5EIFRFU1RJTkcxGzAZBgNVBAMTEkRFTU8gWkVSTyBW
-QUxVRSBDQQICBG4wDQYJKoZIhvcNAQEBBQAEQFqcHEo69ShGfcOIVjnmWXLZM+7Y
-K/50j8YuvNbqq+dQxk9YY8ZpSU/JYsxmtcnEZdlSJEkpMHAO73V+eh1QQr0wghFz
-BgkqhkiG9w0BBwEwGgYIKoZIhvcNAwIwDgICAKAECJsSmRA1jxLjgIIRSIGLVtf+
-pzeB6oXJ9GlfsnIij+DgIOvrYaXC9qywAaUg7zMnln9QMgiih5XpBLgPg5Y/KYp3
-RZeHBwkjTIFwlNYSjE0PbsszsJYUmkDTsCjFUJEdM4+Cbv3g3Kct5w1Q6pVMXJLg
-JG4uFUY8CTScVkb9ETbIy3HisCRKJWA57ERLvCr/Fa6gNJKa5Mw1A5Nsp+QQqp0U
-uQz93raAPbCdqmHu8qQ88rzbB1k/ysXedRQLlzhqFs2hryD7kHe0gX8nPdlkre8Y
-tTQhY76LtbjnV2drXcyCUMONc56KQ2VcuxB0BWjSeyN8a75/rpt6wmiM/PKw0D4g
-RmXqA1ZR62X2WKbhKqvG5tQTF1LauZeddeYS4Rb8cLt2VMB5irkKWrHmJ3qyWELY
-Lah6AzDDdcf3LEfDo6rO9djqlU8RJwS0ExAuBooVBP6bZJG1tNUUbtxBydQ4PJUH
-UhulBMXUMd545fVb8d+lZnKbx3OS2LpILJ66Yeao7jTrEOIgxUq0c6ozzqcQe4Ax
-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
-FK2YAAAAAA==
------END PKCS7-----
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-s-a-e b/crypto/openssl/crypto/pkcs7/t/msie-s-a-e
deleted file mode 100644
index 0067794d7081..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/msie-s-a-e
+++ /dev/null
@@ -1,91 +0,0 @@
-
-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
-5ify04ua9/t8SGrYZPm/l3MkAAAAAAAAAAAAAA==
-
-
diff --git a/crypto/openssl/crypto/pkcs7/t/msie-s-a-e.pem b/crypto/openssl/crypto/pkcs7/t/msie-s-a-e.pem
deleted file mode 100644
index 55dbd8f80bdd..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/msie-s-a-e.pem
+++ /dev/null
@@ -1,106 +0,0 @@
------BEGIN PKCS7-----
-MIAGCSqGSIb3DQEHA6CAMIITUAIBADGCAcIwgcwCAQAwdjBiMREwDwYDVQQHEwhJ
-bnRlcm5ldDEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNDAyBgNVBAsTK1ZlcmlT
-aWduIENsYXNzIDEgQ0EgLSBJbmRpdmlkdWFsIFN1YnNjcmliZXICEGBAmILep9sJ
-uN2Pkg1gucowDQYJKoZIhvcNAQEBBQAEQKOxxpIbRTb31+qIQCBOpMVAGnwCLrPO
-OXnntxVveTrPhBnsJuoGNJcCMtuHl7tLkd38WsVwOfGXUprTqFpUcY8wgfACAQAw
-gZkwgZIxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQH
-EwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRzb2Z0IFB0eSBMdGQxIjAgBgNVBAsT
-GURFTU9OU1RSQVRJT04gQU5EIFRFU1RJTkcxGzAZBgNVBAMTEkRFTU8gWkVSTyBW
-QUxVRSBDQQICBG4wDQYJKoZIhvcNAQEBBQAEQKzIddnXFqK/RRBG86ZVixoXfwAv
-ZdfvnDFsKzPn/A6DuDdE/hqJxnFpHiwGiDR/YbWj2ib+G74DSshgX8vj8ZQwghGD
-BgkqhkiG9w0BBwEwGgYIKoZIhvcNAwIwDgICAKAECLKM0K58I3HNgIIRWBDP8s+g
-l7/6JhZ5PBJ5vPpD1R4pnNDZRabsYu0Qzezdz1IK+maTAhF0SEuNZoEkzIgOIvu3
-UjW8x/2KcHwteABwgRiSk1JyNLwRED0RtvuJ40pIGDvDsHwBMcXEtKUMAOpGChms
-HUK1+B/GKancSDFOCeG3JCFnFdbuQFDIVHC6amWslc6ntqVs/sii2Gs4qdzDfQgl
-PV/A/FY0wi0j2O5cXRQJtZVKM/MYGjj5c1cy9Q7oymU5ATP/LARD0Tw5kBB7HVnD
-2qrmmmxcHakyxhXmwskaKS6Qxgqq6LPdgr603onxqEtwNSz5UbCq9mLXuCkFOVsQ
-/5mZcmmc7re3XJMQHRXkBlxEpZQ6HOUIEzlhRqCo2hhymyZK84rptjORQo6vNakM
-IC0Zn8O+6Xl1NlmbGzZakz6LJ4dczE7eG7LwrVus9Oq3V/WweG6rWMPV5d51oKMi
-BRb2pXXy80BAKh/9hvpP/V/HO1/+MPuk8tAn7ssmQoIAQcZxqLOmgqqFhy21oSEu
-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
-7OYn8tOLmvf7fEhq2GT5v5dzJAAAAAA=
------END PKCS7-----
diff --git a/crypto/openssl/crypto/pkcs7/t/nav-smime b/crypto/openssl/crypto/pkcs7/t/nav-smime
deleted file mode 100644
index 6ee4b597a145..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/nav-smime
+++ /dev/null
@@ -1,157 +0,0 @@
-From angela@c2.net.au Thu May 14 13:32:27 1998
-X-UIDL: 83c94dd550e54329bf9571b72038b8c8
-Return-Path: angela@c2.net.au
-Received: from cryptsoft.com (play.cryptsoft.com [203.56.44.3]) by pandora.cryptsoft.com (8.8.3/8.7.3) with ESMTP id NAA27838 for <tjh@cryptsoft.com>; Thu, 14 May 1998 13:32:26 +1000 (EST)
-Message-ID: <355A6779.4B63E64C@cryptsoft.com>
-Date: Thu, 14 May 1998 13:39:37 +1000
-From: Angela van Lent <angela@c2.net.au>
-X-Mailer: Mozilla 4.03 [en] (Win95; U)
-MIME-Version: 1.0
-To: tjh@cryptsoft.com
-Subject: signed
-Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg=sha1; boundary="------------ms9A58844C95949ECC78A1C54C"
-Content-Length: 2604
-Status: OR
-
-This is a cryptographically signed message in MIME format.
-
---------------ms9A58844C95949ECC78A1C54C
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-
-signed body
-
---------------ms9A58844C95949ECC78A1C54C
-Content-Type: application/x-pkcs7-signature; name="smime.p7s"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="smime.p7s"
-Content-Description: S/MIME Cryptographic Signature
-
-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
-9CWR6g==
---------------ms9A58844C95949ECC78A1C54C--
-
-
-From angela@c2.net.au Thu May 14 13:33:16 1998
-X-UIDL: 8f076c44ff7c5967fd5b00c4588a8731
-Return-Path: angela@c2.net.au
-Received: from cryptsoft.com (play.cryptsoft.com [203.56.44.3]) by pandora.cryptsoft.com (8.8.3/8.7.3) with ESMTP id NAA27847 for <tjh@cryptsoft.com>; Thu, 14 May 1998 13:33:15 +1000 (EST)
-Message-ID: <355A67AB.2AF38806@cryptsoft.com>
-Date: Thu, 14 May 1998 13:40:27 +1000
-From: Angela van Lent <angela@c2.net.au>
-X-Mailer: Mozilla 4.03 [en] (Win95; U)
-MIME-Version: 1.0
-To: tjh@cryptsoft.com
-Subject: signed
-Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg=sha1; boundary="------------msD7863B84BD61E02C407F2F5E"
-Content-Length: 2679
-Status: OR
-
-This is a cryptographically signed message in MIME format.
-
---------------msD7863B84BD61E02C407F2F5E
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-
-signed body 2
-
---------------msD7863B84BD61E02C407F2F5E
-Content-Type: application/x-pkcs7-signature; name="smime.p7s"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="smime.p7s"
-Content-Description: S/MIME Cryptographic Signature
-
-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
-Zp8SSVVY
---------------msD7863B84BD61E02C407F2F5E--
-
-
-From angela@c2.net.au Thu May 14 14:05:32 1998
-X-UIDL: a7d629b4b9acacaee8b39371b860a32a
-Return-Path: angela@c2.net.au
-Received: from cryptsoft.com (play.cryptsoft.com [203.56.44.3]) by pandora.cryptsoft.com (8.8.3/8.7.3) with ESMTP id OAA28033 for <tjh@cryptsoft.com>; Thu, 14 May 1998 14:05:32 +1000 (EST)
-Message-ID: <355A6F3B.AC385981@cryptsoft.com>
-Date: Thu, 14 May 1998 14:12:43 +1000
-From: Angela van Lent <angela@c2.net.au>
-X-Mailer: Mozilla 4.03 [en] (Win95; U)
-MIME-Version: 1.0
-To: tjh@cryptsoft.com
-Subject: encrypted
-Content-Type: application/x-pkcs7-mime; name="smime.p7m"
-Content-Transfer-Encoding: base64
-Content-Disposition: attachment; filename="smime.p7m"
-Content-Description: S/MIME Encrypted Message
-Content-Length: 905
-Status: OR
-
-MIAGCSqGSIb3DQEHA6CAMIACAQAxggHmMIHwAgEAMIGZMIGSMQswCQYDVQQGEwJBVTETMBEG
-A1UECBMKUXVlZW5zbGFuZDERMA8GA1UEBxMIQnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0c29m
-dCBQdHkgTHRkMSIwIAYDVQQLExlERU1PTlNUUkFUSU9OIEFORCBURVNUSU5HMRswGQYDVQQD
-ExJERU1PIFpFUk8gVkFMVUUgQ0ECAgR+MA0GCSqGSIb3DQEBAQUABEA92N29Yk39RUY2tIVd
-exGT2MFX3J6H8LB8aDRJjw7843ALgJ5zXpM5+f80QkAWwEN2A6Pl3VxiCeKLi435zXVyMIHw
-AgEAMIGZMIGSMQswCQYDVQQGEwJBVTETMBEGA1UECBMKUXVlZW5zbGFuZDERMA8GA1UEBxMI
-QnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0c29mdCBQdHkgTHRkMSIwIAYDVQQLExlERU1PTlNU
-UkFUSU9OIEFORCBURVNUSU5HMRswGQYDVQQDExJERU1PIFpFUk8gVkFMVUUgQ0ECAgRuMA0G
-CSqGSIb3DQEBAQUABECR9IfyHtvnjFmZ8B2oUCEs1vxMsG0u1kxKE4RMPFyDqDCEARq7zXMg
-nzSUI7Wgv5USSKDqcLRJeW+jvYURv/nJMIAGCSqGSIb3DQEHATAaBggqhkiG9w0DAjAOAgIA
-oAQIrLqrij2ZMpeggAQoibtn6reRZWuWk5Iv5IAhgitr8EYE4w4ySQ7EMB6mTlBoFpccUMWX
-BwQgQn1UoWCvYAlhDzURdbui64Dc0rS2wtj+kE/InS6y25EEEPe4NUKaF8/UlE+lo3LtILQE
-CL3uV8k7m0iqAAAAAAAAAAAAAA==
-
diff --git a/crypto/openssl/crypto/pkcs7/t/s.pem b/crypto/openssl/crypto/pkcs7/t/s.pem
deleted file mode 100644
index 4fa925b1824a..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/s.pem
+++ /dev/null
@@ -1,57 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAK3nI4nuDYe3nDJES5WBc90igEstxWC4/h4YY+/ciYki35U8ets9
-mgaoCNYp/e9BCZHtvK2Y+fYokGJv5+cMTQsCAwEAAQJBAIHpvXvqEcOEoDRRHuIG
-fkcB4jPHcr9KE9TpxabH6xs9beN6OJnkePXAHwaz5MnUgSnbpOKq+cw8miKjXwe/
-zVECIQDVLwncT2lRmXarEYHzb+q/0uaSvKhWKKt3kJasLNTrAwIhANDUc/ghut29
-p3jJYjurzUKuG774/5eLjPLsxPPIZzNZAiA/10hSq41UnGqHLEUIS9m2/EeEZe7b
-bm567dfRU9OnVQIgDo8ROrZXSchEGbaog5J5r/Fle83uO8l93R3GqVxKXZkCIFfk
-IPD5PIYQAyyod3hyKKza7ZP4CGY4oOfZetbkSGGG
------END RSA PRIVATE KEY-----
-issuer :/C=AU/SP=Queensland/L=Brisbane/O=Cryptsoft Pty Ltd/OU=DEMONSTRATION AND TESTING/CN=DEMO ZERO VALUE CA
-subject:/C=AU/SP=Queensland/L=Brisbane/O=Cryptsoft Pty Ltd/OU=SMIME 003/CN=Information/Email=info@cryptsoft.com
-serial :047D
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1149 (0x47d)
-        Signature Algorithm: md5withRSAEncryption
-        Issuer: C=AU, SP=Queensland, L=Brisbane, O=Cryptsoft Pty Ltd, OU=DEMONSTRATION AND TESTING, CN=DEMO ZERO VALUE CA
-        Validity
-            Not Before: May 13 05:40:58 1998 GMT
-            Not After : May 12 05:40:58 2000 GMT
-        Subject: C=AU, SP=Queensland, L=Brisbane, O=Cryptsoft Pty Ltd, OU=SMIME 003, CN=Information/Email=info@cryptsoft.com
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Modulus:
-                    00:ad:e7:23:89:ee:0d:87:b7:9c:32:44:4b:95:81:
-                    73:dd:22:80:4b:2d:c5:60:b8:fe:1e:18:63:ef:dc:
-                    89:89:22:df:95:3c:7a:db:3d:9a:06:a8:08:d6:29:
-                    fd:ef:41:09:91:ed:bc:ad:98:f9:f6:28:90:62:6f:
-                    e7:e7:0c:4d:0b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            Netscape Comment: 
-                Generated with SSLeay
-    Signature Algorithm: md5withRSAEncryption
-        52:15:ea:88:f4:f0:f9:0b:ef:ce:d5:f8:83:40:61:16:5e:55:
-        f9:ce:2d:d1:8b:31:5c:03:c6:2d:10:7c:61:d5:5c:0a:42:97:
-        d1:fd:65:b6:b6:84:a5:39:ec:46:ec:fc:e0:0d:d9:22:da:1b:
-        50:74:ad:92:cb:4e:90:e5:fa:7d
-
------BEGIN CERTIFICATE-----
-MIICTDCCAfagAwIBAgICBH0wDQYJKoZIhvcNAQEEBQAwgZIxCzAJBgNVBAYTAkFV
-MRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UE
-ChMRQ3J5cHRzb2Z0IFB0eSBMdGQxIjAgBgNVBAsTGURFTU9OU1RSQVRJT04gQU5E
-IFRFU1RJTkcxGzAZBgNVBAMTEkRFTU8gWkVSTyBWQUxVRSBDQTAeFw05ODA1MTMw
-NTQwNThaFw0wMDA1MTIwNTQwNThaMIGeMQswCQYDVQQGEwJBVTETMBEGA1UECBMK
-UXVlZW5zbGFuZDERMA8GA1UEBxMIQnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0c29m
-dCBQdHkgTHRkMRIwEAYDVQQLEwlTTUlNRSAwMDMxFDASBgNVBAMTC0luZm9ybWF0
-aW9uMSEwHwYJKoZIhvcNAQkBFhJpbmZvQGNyeXB0c29mdC5jb20wXDANBgkqhkiG
-9w0BAQEFAANLADBIAkEArecjie4Nh7ecMkRLlYFz3SKASy3FYLj+Hhhj79yJiSLf
-lTx62z2aBqgI1in970EJke28rZj59iiQYm/n5wxNCwIDAQABoygwJjAkBglghkgB
-hvhCAQ0EFxYVR2VuZXJhdGVkIHdpdGggU1NMZWF5MA0GCSqGSIb3DQEBBAUAA0EA
-UhXqiPTw+QvvztX4g0BhFl5V+c4t0YsxXAPGLRB8YdVcCkKX0f1ltraEpTnsRuz8
-4A3ZItobUHStkstOkOX6fQ==
------END CERTIFICATE-----
-
diff --git a/crypto/openssl/crypto/pkcs7/t/server.pem b/crypto/openssl/crypto/pkcs7/t/server.pem
deleted file mode 100644
index 989baf87096a..000000000000
--- a/crypto/openssl/crypto/pkcs7/t/server.pem
+++ /dev/null
@@ -1,57 +0,0 @@
-issuer :/C=AU/SP=Queensland/L=Brisbane/O=Cryptsoft Pty Ltd/OU=DEMONSTRATION AND TESTING/CN=DEMO ZERO VALUE CA
-subject:/C=AU/SP=Queensland/L=Brisbane/O=Cryptsoft Pty Ltd/OU=SMIME 003/CN=Information/Email=info@cryptsoft.com
-serial :047D
-
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1149 (0x47d)
-        Signature Algorithm: md5withRSAEncryption
-        Issuer: C=AU, SP=Queensland, L=Brisbane, O=Cryptsoft Pty Ltd, OU=DEMONSTRATION AND TESTING, CN=DEMO ZERO VALUE CA
-        Validity
-            Not Before: May 13 05:40:58 1998 GMT
-            Not After : May 12 05:40:58 2000 GMT
-        Subject: C=AU, SP=Queensland, L=Brisbane, O=Cryptsoft Pty Ltd, OU=SMIME 003, CN=Information/Email=info@cryptsoft.com
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Modulus:
-                    00:ad:e7:23:89:ee:0d:87:b7:9c:32:44:4b:95:81:
-                    73:dd:22:80:4b:2d:c5:60:b8:fe:1e:18:63:ef:dc:
-                    89:89:22:df:95:3c:7a:db:3d:9a:06:a8:08:d6:29:
-                    fd:ef:41:09:91:ed:bc:ad:98:f9:f6:28:90:62:6f:
-                    e7:e7:0c:4d:0b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            Netscape Comment: 
-                Generated with SSLeay
-    Signature Algorithm: md5withRSAEncryption
-        52:15:ea:88:f4:f0:f9:0b:ef:ce:d5:f8:83:40:61:16:5e:55:
-        f9:ce:2d:d1:8b:31:5c:03:c6:2d:10:7c:61:d5:5c:0a:42:97:
-        d1:fd:65:b6:b6:84:a5:39:ec:46:ec:fc:e0:0d:d9:22:da:1b:
-        50:74:ad:92:cb:4e:90:e5:fa:7d
-
------BEGIN CERTIFICATE-----
-MIICTDCCAfagAwIBAgICBH0wDQYJKoZIhvcNAQEEBQAwgZIxCzAJBgNVBAYTAkFV
-MRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UE
-ChMRQ3J5cHRzb2Z0IFB0eSBMdGQxIjAgBgNVBAsTGURFTU9OU1RSQVRJT04gQU5E
-IFRFU1RJTkcxGzAZBgNVBAMTEkRFTU8gWkVSTyBWQUxVRSBDQTAeFw05ODA1MTMw
-NTQwNThaFw0wMDA1MTIwNTQwNThaMIGeMQswCQYDVQQGEwJBVTETMBEGA1UECBMK
-UXVlZW5zbGFuZDERMA8GA1UEBxMIQnJpc2JhbmUxGjAYBgNVBAoTEUNyeXB0c29m
-dCBQdHkgTHRkMRIwEAYDVQQLEwlTTUlNRSAwMDMxFDASBgNVBAMTC0luZm9ybWF0
-aW9uMSEwHwYJKoZIhvcNAQkBFhJpbmZvQGNyeXB0c29mdC5jb20wXDANBgkqhkiG
-9w0BAQEFAANLADBIAkEArecjie4Nh7ecMkRLlYFz3SKASy3FYLj+Hhhj79yJiSLf
-lTx62z2aBqgI1in970EJke28rZj59iiQYm/n5wxNCwIDAQABoygwJjAkBglghkgB
-hvhCAQ0EFxYVR2VuZXJhdGVkIHdpdGggU1NMZWF5MA0GCSqGSIb3DQEBBAUAA0EA
-UhXqiPTw+QvvztX4g0BhFl5V+c4t0YsxXAPGLRB8YdVcCkKX0f1ltraEpTnsRuz8
-4A3ZItobUHStkstOkOX6fQ==
------END CERTIFICATE-----
-
------BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAK3nI4nuDYe3nDJES5WBc90igEstxWC4/h4YY+/ciYki35U8ets9
-mgaoCNYp/e9BCZHtvK2Y+fYokGJv5+cMTQsCAwEAAQJBAIHpvXvqEcOEoDRRHuIG
-fkcB4jPHcr9KE9TpxabH6xs9beN6OJnkePXAHwaz5MnUgSnbpOKq+cw8miKjXwe/
-zVECIQDVLwncT2lRmXarEYHzb+q/0uaSvKhWKKt3kJasLNTrAwIhANDUc/ghut29
-p3jJYjurzUKuG774/5eLjPLsxPPIZzNZAiA/10hSq41UnGqHLEUIS9m2/EeEZe7b
-bm567dfRU9OnVQIgDo8ROrZXSchEGbaog5J5r/Fle83uO8l93R3GqVxKXZkCIFfk
-IPD5PIYQAyyod3hyKKza7ZP4CGY4oOfZetbkSGGG
------END RSA PRIVATE KEY-----
diff --git a/crypto/openssl/crypto/pkcs7/verify.c b/crypto/openssl/crypto/pkcs7/verify.c
deleted file mode 100644
index b40f26032ec6..000000000000
--- a/crypto/openssl/crypto/pkcs7/verify.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/* crypto/pkcs7/verify.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-#include <stdio.h>
-#include <string.h>
-#include <openssl/bio.h>
-#include <openssl/asn1.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/err.h>
-#include "example.h"
-
-int verify_callback(int ok, X509_STORE_CTX *ctx);
-
-BIO *bio_err=NULL;
-BIO *bio_out=NULL;
-
-int main(argc,argv)
-int argc;
-char *argv[];
-	{
-	PKCS7 *p7;
-	PKCS7_SIGNER_INFO *si;
-	X509_STORE_CTX cert_ctx;
-	X509_STORE *cert_store=NULL;
-	BIO *data,*detached=NULL,*p7bio=NULL;
-	char buf[1024*4];
-	char *pp;
-	int i,printit=0;
-	STACK_OF(PKCS7_SIGNER_INFO) *sk;
-
-	bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
-	bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
-#ifndef OPENSSL_NO_MD2
-	EVP_add_digest(EVP_md2());
-#endif
-#ifndef OPENSSL_NO_MD5
-	EVP_add_digest(EVP_md5());
-#endif
-#ifndef OPENSSL_NO_SHA1
-	EVP_add_digest(EVP_sha1());
-#endif
-#ifndef OPENSSL_NO_MDC2
-	EVP_add_digest(EVP_mdc2());
-#endif
-
-	data=BIO_new(BIO_s_file());
-
-	pp=NULL;
-	while (argc > 1)
-		{
-		argc--;
-		argv++;
-		if (strcmp(argv[0],"-p") == 0)
-			{
-			printit=1;
-			}
-		else if ((strcmp(argv[0],"-d") == 0) && (argc >= 2))
-			{
-			detached=BIO_new(BIO_s_file());
-			if (!BIO_read_filename(detached,argv[1]))
-				goto err;
-			argc--;
-			argv++;
-			}
-		else
-			{
-			pp=argv[0];
-			if (!BIO_read_filename(data,argv[0]))
-				goto err;
-			}
-		}
-
-	if (pp == NULL)
-		BIO_set_fp(data,stdin,BIO_NOCLOSE);
-
-
-	/* Load the PKCS7 object from a file */
-	if ((p7=PEM_read_bio_PKCS7(data,NULL,NULL,NULL)) == NULL) goto err;
-
-	/* This stuff is being setup for certificate verification.
-	 * When using SSL, it could be replaced with a 
-	 * cert_stre=SSL_CTX_get_cert_store(ssl_ctx); */
-	cert_store=X509_STORE_new();
-	X509_STORE_set_default_paths(cert_store);
-	X509_STORE_load_locations(cert_store,NULL,"../../certs");
-	X509_STORE_set_verify_cb_func(cert_store,verify_callback);
-
-	ERR_clear_error();
-
-	/* We need to process the data */
-	if ((PKCS7_get_detached(p7) || detached))
-		{
-		if (detached == NULL)
-			{
-			printf("no data to verify the signature on\n");
-			exit(1);
-			}
-		else
-			p7bio=PKCS7_dataInit(p7,detached);
-		}
-	else
-		{
-		p7bio=PKCS7_dataInit(p7,NULL);
-		}
-
-	/* We now have to 'read' from p7bio to calculate digests etc. */
-	for (;;)
-		{
-		i=BIO_read(p7bio,buf,sizeof(buf));
-		/* print it? */
-		if (i <= 0) break;
-		}
-
-	/* We can now verify signatures */
-	sk=PKCS7_get_signer_info(p7);
-	if (sk == NULL)
-		{
-		printf("there are no signatures on this data\n");
-		exit(1);
-		}
-
-	/* Ok, first we need to, for each subject entry, see if we can verify */
-	for (i=0; i<sk_PKCS7_SIGNER_INFO_num(sk); i++)
-		{
-		ASN1_UTCTIME *tm;
-		char *str1,*str2;
-		int rc;
-
-		si=sk_PKCS7_SIGNER_INFO_value(sk,i);
-		rc=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si);
-		if (rc <= 0)
-			goto err;
-		printf("signer info\n");
-		if ((tm=get_signed_time(si)) != NULL)
-			{
-			BIO_printf(bio_out,"Signed time:");
-			ASN1_UTCTIME_print(bio_out,tm);
-			ASN1_UTCTIME_free(tm);
-			BIO_printf(bio_out,"\n");
-			}
-		if (get_signed_seq2string(si,&str1,&str2))
-			{
-			BIO_printf(bio_out,"String 1 is %s\n",str1);
-			BIO_printf(bio_out,"String 2 is %s\n",str2);
-			}
-
-		}
-
-	X509_STORE_free(cert_store);
-
-	printf("done\n");
-	exit(0);
-err:
-	ERR_load_crypto_strings();
-	ERR_print_errors_fp(stderr);
-	exit(1);
-	}
-
-/* should be X509 * but we can just have them as char *. */
-int verify_callback(int ok, X509_STORE_CTX *ctx)
-	{
-	char buf[256];
-	X509 *err_cert;
-	int err,depth;
-
-	err_cert=X509_STORE_CTX_get_current_cert(ctx);
-	err=	X509_STORE_CTX_get_error(ctx);
-	depth=	X509_STORE_CTX_get_error_depth(ctx);
-
-	X509_NAME_oneline(X509_get_subject_name(err_cert),buf,256);
-	BIO_printf(bio_err,"depth=%d %s\n",depth,buf);
-	if (!ok)
-		{
-		BIO_printf(bio_err,"verify error:num=%d:%s\n",err,
-			X509_verify_cert_error_string(err));
-		if (depth < 6)
-			{
-			ok=1;
-			X509_STORE_CTX_set_error(ctx,X509_V_OK);
-			}
-		else
-			{
-			ok=0;
-			X509_STORE_CTX_set_error(ctx,X509_V_ERR_CERT_CHAIN_TOO_LONG);
-			}
-		}
-	switch (ctx->error)
-		{
-	case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
-		X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert),buf,256);
-		BIO_printf(bio_err,"issuer= %s\n",buf);
-		break;
-	case X509_V_ERR_CERT_NOT_YET_VALID:
-	case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
-		BIO_printf(bio_err,"notBefore=");
-		ASN1_UTCTIME_print(bio_err,X509_get_notBefore(ctx->current_cert));
-		BIO_printf(bio_err,"\n");
-		break;
-	case X509_V_ERR_CERT_HAS_EXPIRED:
-	case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
-		BIO_printf(bio_err,"notAfter=");
-		ASN1_UTCTIME_print(bio_err,X509_get_notAfter(ctx->current_cert));
-		BIO_printf(bio_err,"\n");
-		break;
-		}
-	BIO_printf(bio_err,"verify return:%d\n",ok);
-	return(ok);
-	}
diff --git a/crypto/openssl/crypto/rand/md_rand.c b/crypto/openssl/crypto/rand/md_rand.c
index aee1c30b0a9b..888b4eb8dd0b 100644
--- a/crypto/openssl/crypto/rand/md_rand.c
+++ b/crypto/openssl/crypto/rand/md_rand.c
@@ -159,7 +159,6 @@ const char RAND_version[]="RAND" OPENSSL_VERSION_PTEXT;
 static void ssleay_rand_cleanup(void);
 static void ssleay_rand_seed(const void *buf, int num);
 static void ssleay_rand_add(const void *buf, int num, double add_entropy);
-static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo);
 static int ssleay_rand_nopseudo_bytes(unsigned char *buf, int num);
 static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num);
 static int ssleay_rand_status(void);
@@ -334,7 +333,7 @@ static void ssleay_rand_seed(const void *buf, int num)
 	ssleay_rand_add(buf, num, (double)num);
 	}
 
-static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo)
+int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo, int lock)
 	{
 	static volatile int stirred_pool = 0;
 	int i,j,k,st_num,st_idx;
@@ -383,10 +382,7 @@ static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo)
 	 * are fed into the hash function and the results are kept in the
 	 * global 'md'.
 	 */
-#ifdef OPENSSL_FIPS
-	/* NB: in FIPS mode we are already under a lock */
-	if (!FIPS_mode())
-#endif
+	if (lock)
 		CRYPTO_w_lock(CRYPTO_LOCK_RAND);
 
 	/* prevent ssleay_rand_bytes() from trying to obtain the lock again */
@@ -466,9 +462,7 @@ static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo)
 
 	/* before unlocking, we must clear 'crypto_lock_rand' */
 	crypto_lock_rand = 0;
-#ifdef OPENSSL_FIPS
-	if (!FIPS_mode())
-#endif
+	if (lock)
 		CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
 
 	while (num > 0)
@@ -521,15 +515,11 @@ static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo)
 	MD_Init(&m);
 	MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c));
 	MD_Update(&m,local_md,MD_DIGEST_LENGTH);
-#ifdef OPENSSL_FIPS
-	if (!FIPS_mode())
-#endif
+	if (lock)
 		CRYPTO_w_lock(CRYPTO_LOCK_RAND);
 	MD_Update(&m,md,MD_DIGEST_LENGTH);
 	MD_Final(&m,md);
-#ifdef OPENSSL_FIPS
-	if (!FIPS_mode())
-#endif
+	if (lock)
 		CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
 
 	EVP_MD_CTX_cleanup(&m);
@@ -548,14 +538,14 @@ static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo)
 
 static int ssleay_rand_nopseudo_bytes(unsigned char *buf, int num)
 	{
-	return ssleay_rand_bytes(buf, num, 0);
+	return ssleay_rand_bytes(buf, num, 0, 1);
 	}
 
 /* pseudo-random bytes that are guaranteed to be unique but not
    unpredictable */
 static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num) 
 	{
-	return ssleay_rand_bytes(buf, num, 1);
+	return ssleay_rand_bytes(buf, num, 1, 1);
 	}
 
 static int ssleay_rand_status(void)
diff --git a/crypto/openssl/crypto/rand/rand_lcl.h b/crypto/openssl/crypto/rand/rand_lcl.h
index 618a8ec899ce..0fabf8dc5d90 100644
--- a/crypto/openssl/crypto/rand/rand_lcl.h
+++ b/crypto/openssl/crypto/rand/rand_lcl.h
@@ -154,5 +154,6 @@
 #define	MD(a,b,c)		EVP_Digest(a,b,c,NULL,EVP_md2(), NULL)
 #endif
 
+int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo, int lock);
 
 #endif
diff --git a/crypto/openssl/crypto/rand/rand_lib.c b/crypto/openssl/crypto/rand/rand_lib.c
index 5ac0e14caf00..239a1cde8189 100644
--- a/crypto/openssl/crypto/rand/rand_lib.c
+++ b/crypto/openssl/crypto/rand/rand_lib.c
@@ -68,6 +68,7 @@
 #ifdef OPENSSL_FIPS
 #include <openssl/fips.h>
 #include <openssl/fips_rand.h>
+#include "rand_lcl.h"
 #endif
 
 #ifndef OPENSSL_NO_ENGINE
@@ -199,7 +200,7 @@ static size_t drbg_get_entropy(DRBG_CTX *ctx, unsigned char **pout,
 	*pout = OPENSSL_malloc(min_len);
 	if (!*pout)
 		return 0;
-	if (RAND_SSLeay()->bytes(*pout, min_len) <= 0)
+	if (ssleay_rand_bytes(*pout, min_len, 0, 0) <= 0)
 		{
 		OPENSSL_free(*pout);
 		*pout = NULL;
diff --git a/crypto/openssl/crypto/rand/randfile.c b/crypto/openssl/crypto/rand/randfile.c
index 7f1428072d27..14ba69d4c694 100644
--- a/crypto/openssl/crypto/rand/randfile.c
+++ b/crypto/openssl/crypto/rand/randfile.c
@@ -79,6 +79,7 @@
 #endif
 #ifndef OPENSSL_NO_POSIX_IO
 # include <sys/stat.h>
+# include <fcntl.h>
 #endif
 
 #ifdef _WIN32
diff --git a/crypto/openssl/crypto/rsa/rsa_eay.c b/crypto/openssl/crypto/rsa/rsa_eay.c
index 88ee2cb557f0..aa810459a136 100644
--- a/crypto/openssl/crypto/rsa/rsa_eay.c
+++ b/crypto/openssl/crypto/rsa/rsa_eay.c
@@ -459,7 +459,7 @@ static int RSA_eay_private_encrypt(int flen, const unsigned char *from,
 	if (padding == RSA_X931_PADDING)
 		{
 		BN_sub(f, rsa->n, ret);
-		if (BN_cmp(ret, f))
+		if (BN_cmp(ret, f) > 0)
 			res = f;
 		else
 			res = ret;
diff --git a/crypto/openssl/crypto/srp/srp_lib.c b/crypto/openssl/crypto/srp/srp_lib.c
index 7c1dcc5111cf..83d417a3084d 100644
--- a/crypto/openssl/crypto/srp/srp_lib.c
+++ b/crypto/openssl/crypto/srp/srp_lib.c
@@ -89,6 +89,9 @@ static BIGNUM *srp_Calc_k(BIGNUM *N, BIGNUM *g)
 	int longg ;
 	int longN = BN_num_bytes(N);
 
+	if (BN_ucmp(g, N) >= 0)
+		return NULL;
+
 	if ((tmp = OPENSSL_malloc(longN)) == NULL)
 		return NULL;
 	BN_bn2bin(N,tmp) ;
@@ -121,6 +124,9 @@ BIGNUM *SRP_Calc_u(BIGNUM *A, BIGNUM *B, BIGNUM *N)
 	if ((A == NULL) ||(B == NULL) || (N == NULL))
 		return NULL;
 
+	if (BN_ucmp(A, N) >= 0 || BN_ucmp(B, N) >= 0)
+		return NULL;
+
 	longN= BN_num_bytes(N);
 
 	if ((cAB = OPENSSL_malloc(2*longN)) == NULL) 
diff --git a/crypto/openssl/crypto/ui/ui_lib.c b/crypto/openssl/crypto/ui/ui_lib.c
index a8abc270642a..167da002d24c 100644
--- a/crypto/openssl/crypto/ui/ui_lib.c
+++ b/crypto/openssl/crypto/ui/ui_lib.c
@@ -916,9 +916,9 @@ int UI_set_result(UI *ui, UI_STRING *uis, const char *result)
 				break;
 				}
 			}
+		}
 	default:
 		break;
 		}
-		}
 	return 0;
 	}
diff --git a/crypto/openssl/doc/apps/asn1parse.pod b/crypto/openssl/doc/apps/asn1parse.pod
index f7bb92621168..76a765daf95b 100644
--- a/crypto/openssl/doc/apps/asn1parse.pod
+++ b/crypto/openssl/doc/apps/asn1parse.pod
@@ -15,6 +15,8 @@ B<openssl> B<asn1parse>
 [B<-length number>]
 [B<-i>]
 [B<-oid filename>]
+[B<-dump>]
+[B<-dlimit num>]
 [B<-strparse offset>]
 [B<-genstr string>]
 [B<-genconf file>]
@@ -64,6 +66,14 @@ indents the output according to the "depth" of the structures.
 a file containing additional OBJECT IDENTIFIERs (OIDs). The format of this
 file is described in the NOTES section below.
 
+=item B<-dump>
+
+dump unknown data in hex format.
+
+=item B<-dlimit num>
+
+like B<-dump>, but only the first B<num> bytes are output.
+
 =item B<-strparse offset>
 
 parse the contents octets of the ASN.1 object starting at B<offset>. This
diff --git a/crypto/openssl/doc/apps/ca.pod b/crypto/openssl/doc/apps/ca.pod
index bcf4959f383a..f600f553b1a7 100644
--- a/crypto/openssl/doc/apps/ca.pod
+++ b/crypto/openssl/doc/apps/ca.pod
@@ -13,6 +13,8 @@ B<openssl> B<ca>
 [B<-name section>]
 [B<-gencrl>]
 [B<-revoke file>]
+[B<-status serial>]
+[B<-updatedb>]
 [B<-crl_reason reason>]
 [B<-crl_hold instruction>]
 [B<-crl_compromise time>]
@@ -26,6 +28,7 @@ B<openssl> B<ca>
 [B<-md arg>]
 [B<-policy arg>]
 [B<-keyfile arg>]
+[B<-keyform PEM|DER>]
 [B<-key arg>]
 [B<-passin arg>]
 [B<-cert file>]
@@ -83,7 +86,7 @@ a single self signed certificate to be signed by the CA.
 
 a file containing a single Netscape signed public key and challenge
 and additional field values to be signed by the CA. See the B<SPKAC FORMAT>
-section for information on the required format.
+section for information on the required input and output format.
 
 =item B<-infiles>
 
@@ -94,7 +97,7 @@ are assumed to be the names of files containing certificate requests.
 
 the output file to output certificates to. The default is standard
 output. The certificate details will also be printed out to this
-file.
+file in PEM format (except that B<-spkac> outputs DER format).
 
 =item B<-outdir directory>
 
@@ -110,6 +113,11 @@ the CA certificate file.
 
 the private key to sign requests with.
 
+=item B<-keyform PEM|DER>
+
+the format of the data in the private key file.
+The default is PEM.
+
 =item B<-key password>
 
 the password used to encrypt the private key. Since on some
@@ -267,6 +275,15 @@ the number of hours before the next CRL is due.
 
 a filename containing a certificate to revoke.
 
+=item B<-status serial>
+
+displays the revocation status of the certificate with the specified
+serial number and exits.
+
+=item B<-updatedb>
+
+Updates the database index to purge expired certificates.
+
 =item B<-crl_reason reason>
 
 revocation reason, where B<reason> is one of: B<unspecified>, B<keyCompromise>,
@@ -499,6 +516,10 @@ the SPKAC and also the required DN components as name value pairs.
 If you need to include the same component twice then it can be
 preceded by a number and a '.'.
 
+When processing SPKAC format, the output is DER if the B<-out>
+flag is used, but PEM format if sending to stdout or the B<-outdir>
+flag is used.
+
 =head1 EXAMPLES
 
 Note: these examples assume that the B<ca> directory structure is
diff --git a/crypto/openssl/doc/apps/ciphers.pod b/crypto/openssl/doc/apps/ciphers.pod
index f44aa00a2fdb..6086d0a7154f 100644
--- a/crypto/openssl/doc/apps/ciphers.pod
+++ b/crypto/openssl/doc/apps/ciphers.pod
@@ -36,7 +36,7 @@ SSL v2 and for SSL v3/TLS v1.
 
 =item B<-V>
 
-Like B<-V>, but include cipher suite codes in output (hex format).
+Like B<-v>, but include cipher suite codes in output (hex format).
 
 =item B<-ssl3>
 
@@ -116,8 +116,8 @@ specified.
 =item B<COMPLEMENTOFDEFAULT>
 
 the ciphers included in B<ALL>, but not enabled by default. Currently
-this is B<ADH>. Note that this rule does not cover B<eNULL>, which is
-not included by B<ALL> (use B<COMPLEMENTOFALL> if necessary).
+this is B<ADH> and B<AECDH>. Note that this rule does not cover B<eNULL>,
+which is not included by B<ALL> (use B<COMPLEMENTOFALL> if necessary).
 
 =item B<ALL>
 
@@ -165,21 +165,58 @@ included.
 =item B<aNULL>
 
 the cipher suites offering no authentication. This is currently the anonymous
-DH algorithms. These cipher suites are vulnerable to a "man in the middle"
-attack and so their use is normally discouraged.
+DH algorithms and anonymous ECDH algorithms. These cipher suites are vulnerable
+to a "man in the middle" attack and so their use is normally discouraged.
 
 =item B<kRSA>, B<RSA>
 
 cipher suites using RSA key exchange.
 
-=item B<kEDH>
-
-cipher suites using ephemeral DH key agreement.
-
-=item B<kDHr>, B<kDHd>
+=item B<kDHr>, B<kDHd>, B<kDH>
 
 cipher suites using DH key agreement and DH certificates signed by CAs with RSA
-and DSS keys respectively. Not implemented.
+and DSS keys or either respectively. Not implemented.
+
+=item B<kEDH>
+
+cipher suites using ephemeral DH key agreement, including anonymous cipher
+suites.
+
+=item B<EDH>
+
+cipher suites using authenticated ephemeral DH key agreement.
+
+=item B<ADH>
+
+anonymous DH cipher suites, note that this does not include anonymous Elliptic
+Curve DH (ECDH) cipher suites.
+
+=item B<DH>
+
+cipher suites using DH, including anonymous DH, ephemeral DH and fixed DH.
+
+=item B<kECDHr>, B<kECDHe>, B<kECDH>
+
+cipher suites using fixed ECDH key agreement signed by CAs with RSA and ECDSA
+keys or either respectively.
+
+=item B<kEECDH>
+
+cipher suites using ephemeral ECDH key agreement, including anonymous
+cipher suites.
+
+=item B<EECDHE>
+
+cipher suites using authenticated ephemeral ECDH key agreement.
+
+=item B<AECDH>
+
+anonymous Elliptic Curve Diffie Hellman cipher suites.
+
+=item B<ECDH>
+
+cipher suites using ECDH key exchange, including anonymous, ephemeral and
+fixed ECDH.
 
 =item B<aRSA>
 
@@ -194,30 +231,39 @@ cipher suites using DSS authentication, i.e. the certificates carry DSS keys.
 cipher suites effectively using DH authentication, i.e. the certificates carry
 DH keys.  Not implemented.
 
+=item B<aECDH>
+
+cipher suites effectively using ECDH authentication, i.e. the certificates
+carry ECDH keys.
+
+=item B<aECDSA>, B<ECDSA>
+
+cipher suites using ECDSA authentication, i.e. the certificates carry ECDSA
+keys.
+
 =item B<kFZA>, B<aFZA>, B<eFZA>, B<FZA>
 
 ciphers suites using FORTEZZA key exchange, authentication, encryption or all
 FORTEZZA algorithms. Not implemented.
 
-=item B<TLSv1>, B<SSLv3>, B<SSLv2>
+=item B<TLSv1.2>, B<TLSv1>, B<SSLv3>, B<SSLv2>
 
-TLS v1.0, SSL v3.0 or SSL v2.0 cipher suites respectively.
+TLS v1.2, TLS v1.0, SSL v3.0 or SSL v2.0 cipher suites respectively. Note:
+there are no ciphersuites specific to TLS v1.1.
 
-=item B<DH>
+=item B<AES128>, B<AES256>, B<AES>
 
-cipher suites using DH, including anonymous DH.
+cipher suites using 128 bit AES, 256 bit AES or either 128 or 256 bit AES.
 
-=item B<ADH>
+=item B<AESGCM>
 
-anonymous DH cipher suites.
+AES in Galois Counter Mode (GCM): these ciphersuites are only supported
+in TLS v1.2.
 
-=item B<AES>
+=item B<CAMELLIA128>, B<CAMELLIA256>, B<CAMELLIA>
 
-cipher suites using AES.
-
-=item B<CAMELLIA>
-
-cipher suites using Camellia.
+cipher suites using 128 bit CAMELLIA, 256 bit CAMELLIA or either 128 or 256 bit
+CAMELLIA.
 
 =item B<3DES>
 
@@ -251,6 +297,10 @@ cipher suites using MD5.
 
 cipher suites using SHA1.
 
+=item B<SHA256>, B<SHA384>
+
+ciphersuites using SHA256 or SHA384.
+
 =item B<aGOST> 
 
 cipher suites using GOST R 34.10 (either 2001 or 94) for authenticaction
@@ -277,6 +327,9 @@ cipher suites, using HMAC based on GOST R 34.11-94.
 
 cipher suites using GOST 28147-89 MAC B<instead of> HMAC.
 
+=item B<PSK>
+
+cipher suites using pre-shared keys (PSK).
 
 =back
 
@@ -423,7 +476,100 @@ Note: these ciphers can also be used in SSL v3.
  TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA  EXP1024-DHE-DSS-RC4-SHA
  TLS_DHE_DSS_WITH_RC4_128_SHA            DHE-DSS-RC4-SHA
 
-=head2 SSL v2.0 cipher suites.
+=head2 Elliptic curve cipher suites.
+
+ TLS_ECDH_RSA_WITH_NULL_SHA              ECDH-RSA-NULL-SHA
+ TLS_ECDH_RSA_WITH_RC4_128_SHA           ECDH-RSA-RC4-SHA
+ TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA      ECDH-RSA-DES-CBC3-SHA
+ TLS_ECDH_RSA_WITH_AES_128_CBC_SHA       ECDH-RSA-AES128-SHA
+ TLS_ECDH_RSA_WITH_AES_256_CBC_SHA       ECDH-RSA-AES256-SHA
+
+ TLS_ECDH_ECDSA_WITH_NULL_SHA            ECDH-ECDSA-NULL-SHA
+ TLS_ECDH_ECDSA_WITH_RC4_128_SHA         ECDH-ECDSA-RC4-SHA
+ TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA    ECDH-ECDSA-DES-CBC3-SHA
+ TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA     ECDH-ECDSA-AES128-SHA
+ TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA     ECDH-ECDSA-AES256-SHA
+
+ TLS_ECDHE_RSA_WITH_NULL_SHA             ECDHE-RSA-NULL-SHA
+ TLS_ECDHE_RSA_WITH_RC4_128_SHA          ECDHE-RSA-RC4-SHA
+ TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA     ECDHE-RSA-DES-CBC3-SHA
+ TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA      ECDHE-RSA-AES128-SHA
+ TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA      ECDHE-RSA-AES256-SHA
+
+ TLS_ECDHE_ECDSA_WITH_NULL_SHA           ECDHE-ECDSA-NULL-SHA
+ TLS_ECDHE_ECDSA_WITH_RC4_128_SHA        ECDHE-ECDSA-RC4-SHA
+ TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA   ECDHE-ECDSA-DES-CBC3-SHA
+ TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA    ECDHE-ECDSA-AES128-SHA
+ TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA    ECDHE-ECDSA-AES256-SHA
+
+ TLS_ECDH_anon_WITH_NULL_SHA             AECDH-NULL-SHA
+ TLS_ECDH_anon_WITH_RC4_128_SHA          AECDH-RC4-SHA
+ TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA     AECDH-DES-CBC3-SHA
+ TLS_ECDH_anon_WITH_AES_128_CBC_SHA      AECDH-AES128-SHA
+ TLS_ECDH_anon_WITH_AES_256_CBC_SHA      AECDH-AES256-SHA
+
+=head2 TLS v1.2 cipher suites
+
+ TLS_RSA_WITH_NULL_SHA256                  NULL-SHA256
+
+ TLS_RSA_WITH_AES_128_CBC_SHA256           AES128-SHA256
+ TLS_RSA_WITH_AES_256_CBC_SHA256           AES256-SHA256
+ TLS_RSA_WITH_AES_128_GCM_SHA256           AES128-GCM-SHA256
+ TLS_RSA_WITH_AES_256_GCM_SHA384           AES256-GCM-SHA384
+
+ TLS_DH_RSA_WITH_AES_128_CBC_SHA256        Not implemented.
+ TLS_DH_RSA_WITH_AES_256_CBC_SHA256        Not implemented.
+ TLS_DH_RSA_WITH_AES_128_GCM_SHA256        Not implemented.
+ TLS_DH_RSA_WITH_AES_256_GCM_SHA384        Not implemented.
+
+ TLS_DH_DSS_WITH_AES_128_CBC_SHA256        Not implemented.
+ TLS_DH_DSS_WITH_AES_256_CBC_SHA256        Not implemented.
+ TLS_DH_DSS_WITH_AES_128_GCM_SHA256        Not implemented.
+ TLS_DH_DSS_WITH_AES_256_GCM_SHA384        Not implemented.
+
+ TLS_DHE_RSA_WITH_AES_128_CBC_SHA256       DHE-RSA-AES128-SHA256
+ TLS_DHE_RSA_WITH_AES_256_CBC_SHA256       DHE-RSA-AES256-SHA256
+ TLS_DHE_RSA_WITH_AES_128_GCM_SHA256       DHE-RSA-AES128-GCM-SHA256
+ TLS_DHE_RSA_WITH_AES_256_GCM_SHA384       DHE-RSA-AES256-GCM-SHA384
+
+ TLS_DHE_DSS_WITH_AES_128_CBC_SHA256       DHE-DSS-AES128-SHA256
+ TLS_DHE_DSS_WITH_AES_256_CBC_SHA256       DHE-DSS-AES256-SHA256
+ TLS_DHE_DSS_WITH_AES_128_GCM_SHA256       DHE-DSS-AES128-GCM-SHA256
+ TLS_DHE_DSS_WITH_AES_256_GCM_SHA384       DHE-DSS-AES256-GCM-SHA384
+
+ TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256      ECDH-RSA-AES128-SHA256
+ TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384      ECDH-RSA-AES256-SHA384
+ TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256      ECDH-RSA-AES128-GCM-SHA256
+ TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384      ECDH-RSA-AES256-GCM-SHA384
+
+ TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256    ECDH-ECDSA-AES128-SHA256
+ TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384    ECDH-ECDSA-AES256-SHA384
+ TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256    ECDH-ECDSA-AES128-GCM-SHA256
+ TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384    ECDH-ECDSA-AES256-GCM-SHA384
+
+ TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256     ECDHE-RSA-AES128-SHA256
+ TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384     ECDHE-RSA-AES256-SHA384
+ TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256     ECDHE-RSA-AES128-GCM-SHA256
+ TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384     ECDHE-RSA-AES256-GCM-SHA384
+
+ TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256   ECDHE-ECDSA-AES128-SHA256
+ TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384   ECDHE-ECDSA-AES256-SHA384
+ TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256   ECDHE-ECDSA-AES128-GCM-SHA256
+ TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384   ECDHE-ECDSA-AES256-GCM-SHA384
+
+ TLS_DH_anon_WITH_AES_128_CBC_SHA256       ADH-AES128-SHA256
+ TLS_DH_anon_WITH_AES_256_CBC_SHA256       ADH-AES256-SHA256
+ TLS_DH_anon_WITH_AES_128_GCM_SHA256       ADH-AES128-GCM-SHA256
+ TLS_DH_anon_WITH_AES_256_GCM_SHA384       ADH-AES256-GCM-SHA384
+
+=head2 Pre shared keying (PSK) cipheruites
+
+ TLS_PSK_WITH_RC4_128_SHA                  PSK-RC4-SHA
+ TLS_PSK_WITH_3DES_EDE_CBC_SHA             PSK-3DES-EDE-CBC-SHA
+ TLS_PSK_WITH_AES_128_CBC_SHA              PSK-AES128-CBC-SHA
+ TLS_PSK_WITH_AES_256_CBC_SHA              PSK-AES256-CBC-SHA
+
+=head2 Deprecated SSL v2.0 cipher suites.
 
  SSL_CK_RC4_128_WITH_MD5                 RC4-MD5
  SSL_CK_RC4_128_EXPORT40_WITH_MD5        EXP-RC4-MD5
@@ -452,6 +598,11 @@ strength:
 
  openssl ciphers -v 'ALL:!ADH:@STRENGTH'
 
+Include all ciphers except ones with no encryption (eNULL) or no
+authentication (aNULL):
+
+ openssl ciphers -v 'ALL:!aNULL'
+
 Include only 3DES ciphers and then place RSA ciphers last:
 
  openssl ciphers -v '3DES:+RSA'
diff --git a/crypto/openssl/doc/apps/cms.pod b/crypto/openssl/doc/apps/cms.pod
index a76b3e0fd1c9..75b698834a28 100644
--- a/crypto/openssl/doc/apps/cms.pod
+++ b/crypto/openssl/doc/apps/cms.pod
@@ -143,7 +143,7 @@ output an error.
 
 =item B<-EncryptedData_encrypt>
 
-Encrypt suppled content using supplied symmetric key and algorithm using a CMS
+Encrypt content using supplied symmetric key and algorithm using a CMS
 B<EncrytedData> type and output the content.
 
 =item B<-sign_receipt>
diff --git a/crypto/openssl/doc/apps/crl.pod b/crypto/openssl/doc/apps/crl.pod
index 1ad76a5f8c13..044a9da91545 100644
--- a/crypto/openssl/doc/apps/crl.pod
+++ b/crypto/openssl/doc/apps/crl.pod
@@ -12,6 +12,7 @@ B<openssl> B<crl>
 [B<-text>]
 [B<-in filename>]
 [B<-out filename>]
+[B<-nameopt option>]
 [B<-noout>]
 [B<-hash>]
 [B<-issuer>]
@@ -53,6 +54,11 @@ default.
 
 print out the CRL in text form.
 
+=item B<-nameopt option>
+
+option which determines how the subject or issuer names are displayed. See
+the description of B<-nameopt> in L<x509(1)|x509(1)>.
+
 =item B<-noout>
 
 don't output the encoded version of the CRL.
diff --git a/crypto/openssl/doc/apps/dhparam.pod b/crypto/openssl/doc/apps/dhparam.pod
index 9edb4ff4e1dd..6e27cf5c1516 100644
--- a/crypto/openssl/doc/apps/dhparam.pod
+++ b/crypto/openssl/doc/apps/dhparam.pod
@@ -12,6 +12,7 @@ B<openssl dhparam>
 [B<-in> I<filename>]
 [B<-out> I<filename>]
 [B<-dsaparam>]
+[B<-check>]
 [B<-noout>]
 [B<-text>]
 [B<-C>]
@@ -64,6 +65,10 @@ exchange more efficient.  Beware that with such DSA-style DH
 parameters, a fresh DH key should be created for each use to
 avoid small-subgroup attacks that may be possible otherwise.
 
+=item B<-check>
+
+check if the parameters are valid primes and generator.
+
 =item B<-2>, B<-5>
 
 The generator to use, either 2 or 5. 2 is the default. If present then the
diff --git a/crypto/openssl/doc/apps/dsa.pod b/crypto/openssl/doc/apps/dsa.pod
index ddbc9327fabd..8bf6cc9dcad6 100644
--- a/crypto/openssl/doc/apps/dsa.pod
+++ b/crypto/openssl/doc/apps/dsa.pod
@@ -13,6 +13,12 @@ B<openssl> B<dsa>
 [B<-passin arg>]
 [B<-out filename>]
 [B<-passout arg>]
+[B<-aes128>]
+[B<-aes192>]
+[B<-aes256>]
+[B<-camellia128>]
+[B<-camellia192>]
+[B<-camellia256>]
 [B<-des>]
 [B<-des3>]
 [B<-idea>]
@@ -74,10 +80,10 @@ filename.
 the output file password source. For more information about the format of B<arg>
 see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
 
-=item B<-des|-des3|-idea>
+=item B<-aes128|-aes192|-aes256|-camellia128|-camellia192|-camellia256|-des|-des3|-idea>
 
-These options encrypt the private key with the DES, triple DES, or the 
-IDEA ciphers respectively before outputting it. A pass phrase is prompted for.
+These options encrypt the private key with the specified
+cipher before outputting it. A pass phrase is prompted for.
 If none of these options is specified the key is written in plain text. This
 means that using the B<dsa> utility to read in an encrypted key with no
 encryption option can be used to remove the pass phrase from a key, or by
diff --git a/crypto/openssl/doc/apps/ecparam.pod b/crypto/openssl/doc/apps/ecparam.pod
index 788c074d7b45..88e9d1e83d02 100644
--- a/crypto/openssl/doc/apps/ecparam.pod
+++ b/crypto/openssl/doc/apps/ecparam.pod
@@ -16,7 +16,7 @@ B<openssl ecparam>
 [B<-C>]
 [B<-check>]
 [B<-name arg>]
-[B<-list_curve>]
+[B<-list_curves>]
 [B<-conv_form arg>]
 [B<-param_enc arg>]
 [B<-no_seed>]
diff --git a/crypto/openssl/doc/apps/gendsa.pod b/crypto/openssl/doc/apps/gendsa.pod
index 8c7f114ca08a..d9f56be890f8 100644
--- a/crypto/openssl/doc/apps/gendsa.pod
+++ b/crypto/openssl/doc/apps/gendsa.pod
@@ -8,6 +8,12 @@ gendsa - generate a DSA private key from a set of parameters
 
 B<openssl> B<gendsa>
 [B<-out filename>]
+[B<-aes128>]
+[B<-aes192>]
+[B<-aes256>]
+[B<-camellia128>]
+[B<-camellia192>]
+[B<-camellia256>]
 [B<-des>]
 [B<-des3>]
 [B<-idea>]
@@ -24,10 +30,10 @@ The B<gendsa> command generates a DSA private key from a DSA parameter file
 
 =over 4
 
-=item B<-des|-des3|-idea>
+=item B<-aes128|-aes192|-aes256|-camellia128|-camellia192|-camellia256|-des|-des3|-idea>
 
-These options encrypt the private key with the DES, triple DES, or the 
-IDEA ciphers respectively before outputting it. A pass phrase is prompted for.
+These options encrypt the private key with specified
+cipher before outputting it. A pass phrase is prompted for.
 If none of these options is specified no encryption is used.
 
 =item B<-rand file(s)>
diff --git a/crypto/openssl/doc/apps/genrsa.pod b/crypto/openssl/doc/apps/genrsa.pod
index 7dcac2a779f8..cb03d09b95eb 100644
--- a/crypto/openssl/doc/apps/genrsa.pod
+++ b/crypto/openssl/doc/apps/genrsa.pod
@@ -9,6 +9,18 @@ genrsa - generate an RSA private key
 B<openssl> B<genrsa>
 [B<-out filename>]
 [B<-passout arg>]
+[B<-aes128>]
+[B<-aes128>]
+[B<-aes192>]
+[B<-aes256>]
+[B<-camellia128>]
+[B<-camellia192>]
+[B<-camellia256>]
+[B<-aes192>]
+[B<-aes256>]
+[B<-camellia128>]
+[B<-camellia192>]
+[B<-camellia256>]
 [B<-des>]
 [B<-des3>]
 [B<-idea>]
@@ -36,10 +48,10 @@ used.
 the output file password source. For more information about the format of B<arg>
 see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
 
-=item B<-des|-des3|-idea>
+=item B<-aes128|-aes192|-aes256|-camellia128|-camellia192|-camellia256|-des|-des3|-idea>
 
-These options encrypt the private key with the DES, triple DES, or the 
-IDEA ciphers respectively before outputting it. If none of these options is
+These options encrypt the private key with specified
+cipher before outputting it. If none of these options is
 specified no encryption is used. If encryption is used a pass phrase is prompted
 for if it is not supplied via the B<-passout> argument.
 
diff --git a/crypto/openssl/doc/apps/rsa.pod b/crypto/openssl/doc/apps/rsa.pod
index d7d784d52bbe..21cbf8ee009b 100644
--- a/crypto/openssl/doc/apps/rsa.pod
+++ b/crypto/openssl/doc/apps/rsa.pod
@@ -15,6 +15,12 @@ B<openssl> B<rsa>
 [B<-out filename>]
 [B<-passout arg>]
 [B<-sgckey>]
+[B<-aes128>]
+[B<-aes192>]
+[B<-aes256>]
+[B<-camellia128>]
+[B<-camellia192>]
+[B<-camellia256>]
 [B<-des>]
 [B<-des3>]
 [B<-idea>]
@@ -82,10 +88,10 @@ see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
 use the modified NET algorithm used with some versions of Microsoft IIS and SGC
 keys.
 
-=item B<-des|-des3|-idea>
+=item B<-aes128|-aes192|-aes256|-camellia128|-camellia192|-camellia256|-des|-des3|-idea>
 
-These options encrypt the private key with the DES, triple DES, or the 
-IDEA ciphers respectively before outputting it. A pass phrase is prompted for.
+These options encrypt the private key with the specified
+cipher before outputting it. A pass phrase is prompted for.
 If none of these options is specified the key is written in plain text. This
 means that using the B<rsa> utility to read in an encrypted key with no
 encryption option can be used to remove the pass phrase from a key, or by
diff --git a/crypto/openssl/doc/apps/s_client.pod b/crypto/openssl/doc/apps/s_client.pod
index 3215b2e8c96f..b021c730c02a 100644
--- a/crypto/openssl/doc/apps/s_client.pod
+++ b/crypto/openssl/doc/apps/s_client.pod
@@ -9,6 +9,7 @@ s_client - SSL/TLS client program
 
 B<openssl> B<s_client>
 [B<-connect host:port>]
+[B<-servername name>]
 [B<-verify depth>]
 [B<-verify_return_error>]
 [B<-cert filename>]
@@ -28,6 +29,7 @@ B<openssl> B<s_client>
 [B<-nbio>]
 [B<-crlf>]
 [B<-ign_eof>]
+[B<-no_ign_eof>]
 [B<-quiet>]
 [B<-ssl2>]
 [B<-ssl3>]
@@ -37,6 +39,7 @@ B<openssl> B<s_client>
 [B<-no_tls1>]
 [B<-bugs>]
 [B<-cipher cipherlist>]
+[B<-serverpref>]
 [B<-starttls protocol>]
 [B<-engine id>]
 [B<-tlsextdebug>]
@@ -44,6 +47,8 @@ B<openssl> B<s_client>
 [B<-sess_out filename>]
 [B<-sess_in filename>]
 [B<-rand file(s)>]
+[B<-status>]
+[B<-nextprotoneg protocols>]
 
 =head1 DESCRIPTION
 
@@ -60,6 +65,10 @@ SSL servers.
 This specifies the host and optional port to connect to. If not specified
 then an attempt is made to connect to the local host on port 4433.
 
+=item B<-servername name>
+
+Set the TLS SNI (Server Name Indication) extension in the ClientHello message.
+
 =item B<-cert certname>
 
 The certificate to use, if one is requested by the server. The default is
@@ -172,6 +181,11 @@ input.
 inhibit printing of session and certificate information.  This implicitly
 turns on B<-ign_eof> as well.
 
+=item B<-no_ign_eof>
+
+shut down the connection when end of file is reached in the input.
+Can be used to override the implicit B<-ign_eof> after B<-quiet>.
+
 =item B<-psk_identity identity>
 
 Use the PSK identity B<identity> when using a PSK cipher suite.
@@ -205,6 +219,10 @@ the server determines which cipher suite is used it should take the first
 supported cipher in the list sent by the client. See the B<ciphers>
 command for more information.
 
+=item B<-serverpref>
+
+use the server's cipher preferences; only used for SSLV2.
+
 =item B<-starttls protocol>
 
 send the protocol-specific message(s) to switch to TLS for communication.
@@ -243,6 +261,22 @@ Multiple files can be specified separated by a OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.
 
+=item B<-status>
+
+sends a certificate status request to the server (OCSP stapling). The server
+response (if any) is printed out.
+
+=item B<-nextprotoneg protocols>
+
+enable Next Protocol Negotiation TLS extension and provide a list of
+comma-separated protocol names that the client should advertise
+support for. The list should contain most wanted protocols first.
+Protocol names are printable ASCII strings, for example "http/1.1" or
+"spdy/3".
+Empty list of protocols is treated specially and will cause the client to
+advertise support for the TLS extension but disconnect just after
+reciving ServerHello with a list of server supported protocols.
+
 =back
 
 =head1 CONNECTED COMMANDS
diff --git a/crypto/openssl/doc/apps/s_server.pod b/crypto/openssl/doc/apps/s_server.pod
index f9b9ca5326d9..2105b603b7ba 100644
--- a/crypto/openssl/doc/apps/s_server.pod
+++ b/crypto/openssl/doc/apps/s_server.pod
@@ -35,6 +35,7 @@ B<openssl> B<s_server>
 [B<-CAfile filename>]
 [B<-nocert>]
 [B<-cipher cipherlist>]
+[B<-serverpref>]
 [B<-quiet>]
 [B<-no_tmp_rsa>]
 [B<-ssl2>]
@@ -55,6 +56,11 @@ B<openssl> B<s_server>
 [B<-no_ticket>]
 [B<-id_prefix arg>]
 [B<-rand file(s)>]
+[B<-status>]
+[B<-status_verbose>]
+[B<-status_timeout nsec>]
+[B<-status_url url>]
+[B<-nextprotoneg protocols>]
 
 =head1 DESCRIPTION
 
@@ -150,6 +156,9 @@ the client. With the B<-verify> option a certificate is requested but the
 client does not have to send one, with the B<-Verify> option the client
 must supply a certificate or an error occurs.
 
+If the ciphersuite cannot request a client certificate (for example an
+anonymous ciphersuite or PSK) this option has no effect.
+
 =item B<-crl_check>, B<-crl_check_all>
 
 Check the peer certificate has not been revoked by its CA.
@@ -231,6 +240,10 @@ also included in the server list is used. Because the client specifies
 the preference order, the order of the server cipherlist irrelevant. See
 the B<ciphers> command for more information.
 
+=item B<-serverpref>
+
+use the server's cipher preferences, rather than the client's preferences.
+
 =item B<-tlsextdebug>
 
 print out a hex dump of any TLS extensions received from the server.
@@ -282,6 +295,33 @@ Multiple files can be specified separated by a OS-dependent character.
 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
 all others.
 
+=item B<-status>
+
+enables certificate status request support (aka OCSP stapling).
+
+=item B<-status_verbose>
+
+enables certificate status request support (aka OCSP stapling) and gives
+a verbose printout of the OCSP response.
+
+=item B<-status_timeout nsec>
+
+sets the timeout for OCSP response to B<nsec> seconds.
+
+=item B<-status_url url>
+
+sets a fallback responder URL to use if no responder URL is present in the
+server certificate. Without this option an error is returned if the server
+certificate does not contain a responder address.
+
+=item B<-nextprotoneg protocols>
+
+enable Next Protocol Negotiation TLS extension and provide a
+comma-separated list of supported protocol names.
+The list should contain most wanted protocols first.
+Protocol names are printable ASCII strings, for example "http/1.1" or
+"spdy/3".
+
 =back
 
 =head1 CONNECTED COMMANDS
diff --git a/crypto/openssl/doc/apps/verify.pod b/crypto/openssl/doc/apps/verify.pod
index f35d4029506a..0c8e4926ccff 100644
--- a/crypto/openssl/doc/apps/verify.pod
+++ b/crypto/openssl/doc/apps/verify.pod
@@ -48,7 +48,6 @@ of the B<x509> utility). Under Unix the B<c_rehash> script will automatically
 create symbolic links to a directory of certificates.
 
 =item B<-CAfile file>
-
 A file of trusted certificates. The file should contain multiple certificates
 in PEM format concatenated together.
 
diff --git a/crypto/openssl/doc/apps/x509.pod b/crypto/openssl/doc/apps/x509.pod
index b3c3fcc33b65..878a7c3711ea 100644
--- a/crypto/openssl/doc/apps/x509.pod
+++ b/crypto/openssl/doc/apps/x509.pod
@@ -19,6 +19,7 @@ B<openssl> B<x509>
 [B<-hash>]
 [B<-subject_hash>]
 [B<-issuer_hash>]
+[B<-ocspid>]
 [B<-subject>]
 [B<-issuer>]
 [B<-nameopt option>]
@@ -28,6 +29,7 @@ B<openssl> B<x509>
 [B<-enddate>]
 [B<-purpose>]
 [B<-dates>]
+[B<-checkend num>]
 [B<-modulus>]
 [B<-pubkey>]
 [B<-fingerprint>]
@@ -42,6 +44,7 @@ B<openssl> B<x509>
 [B<-days arg>]
 [B<-set_serial n>]
 [B<-signkey filename>]
+[B<-passin arg>]
 [B<-x509toreq>]
 [B<-req>]
 [B<-CA filename>]
@@ -49,6 +52,7 @@ B<openssl> B<x509>
 [B<-CAcreateserial>]
 [B<-CAserial filename>]
 [B<-text>]
+[B<-certopt option>]
 [B<-C>]
 [B<-md2|-md5|-sha1|-mdc2>]
 [B<-clrext>]
@@ -159,6 +163,10 @@ name.
 
 outputs the "hash" of the certificate issuer name.
 
+=item B<-ocspid>
+
+outputs the OCSP hash values for the subject name and public key.
+
 =item B<-hash>
 
 synonym for "-subject_hash" for backward compatibility reasons.
@@ -208,6 +216,11 @@ prints out the expiry date of the certificate, that is the notAfter date.
 
 prints out the start and expiry dates of a certificate.
 
+=item B<-checkend arg>
+
+checks if the certificate expires within the next B<arg> seconds and exits
+non-zero if yes it will expire or zero if not.
+
 =item B<-fingerprint>
 
 prints out the digest of the DER encoded version of the whole certificate
@@ -313,6 +326,11 @@ If the input is a certificate request then a self signed certificate
 is created using the supplied private key using the subject name in
 the request.
 
+=item B<-passin arg>
+
+the key password source. For more information about the format of B<arg>
+see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
+
 =item B<-clrext>
 
 delete any extensions from a certificate. This option is used when a
@@ -468,7 +486,7 @@ using the format \UXXXX for 16 bits and \WXXXXXXXX for 32 bits.
 Also if this option is off any UTF8Strings will be converted to their
 character form first.
 
-=item B<no_type>
+=item B<ignore_type>
 
 this option does not attempt to interpret multibyte characters in any
 way. That is their content octets are merely dumped as though one octet
diff --git a/crypto/openssl/doc/apps/x509v3_config.pod b/crypto/openssl/doc/apps/x509v3_config.pod
index 13ff85b17cb1..c82cea1da24e 100644
--- a/crypto/openssl/doc/apps/x509v3_config.pod
+++ b/crypto/openssl/doc/apps/x509v3_config.pod
@@ -174,7 +174,7 @@ The IP address used in the B<IP> options can be in either IPv4 or IPv6 format.
 
 The value of B<dirName> should point to a section containing the distinguished
 name to use as a set of name value pairs. Multi values AVAs can be formed by
-preceeding the name with a B<+> character.
+prefacing the name with a B<+> character.
 
 otherName can include arbitrary data associated with an OID: the value
 should be the OID followed by a semicolon and the content in standard
diff --git a/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod b/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod
index 542fd1579ab8..bfa0a04ff974 100644
--- a/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod
+++ b/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod
@@ -61,7 +61,7 @@ Encode the B<NULL> type, the B<value> string must not be present.
 =item B<INTEGER>, B<INT>
 
 Encodes an ASN1 B<INTEGER> type. The B<value> string represents
-the value of the integer, it can be preceeded by a minus sign and
+the value of the integer, it can be prefaced by a minus sign and
 is normally interpreted as a decimal value unless the prefix B<0x>
 is included.
 
diff --git a/crypto/openssl/doc/crypto/BIO_f_base64.pod b/crypto/openssl/doc/crypto/BIO_f_base64.pod
index 438af3b6b66c..d1d7bf0bd066 100644
--- a/crypto/openssl/doc/crypto/BIO_f_base64.pod
+++ b/crypto/openssl/doc/crypto/BIO_f_base64.pod
@@ -46,11 +46,11 @@ to standard output:
 
  b64 = BIO_new(BIO_f_base64());
  bio = BIO_new_fp(stdout, BIO_NOCLOSE);
- bio = BIO_push(b64, bio);
- BIO_write(bio, message, strlen(message));
- BIO_flush(bio);
+ BIO_push(b64, bio);
+ BIO_write(b64, message, strlen(message));
+ BIO_flush(b64);
 
- BIO_free_all(bio);
+ BIO_free_all(b64);
 
 Read Base64 encoded data from standard input and write the decoded
 data to standard output:
@@ -62,11 +62,12 @@ data to standard output:
  b64 = BIO_new(BIO_f_base64());
  bio = BIO_new_fp(stdin, BIO_NOCLOSE);
  bio_out = BIO_new_fp(stdout, BIO_NOCLOSE);
- bio = BIO_push(b64, bio);
- while((inlen = BIO_read(bio, inbuf, 512)) > 0) 
+ BIO_push(b64, bio);
+ while((inlen = BIO_read(b64, inbuf, 512)) > 0) 
 	BIO_write(bio_out, inbuf, inlen);
 
- BIO_free_all(bio);
+ BIO_flush(bio_out);
+ BIO_free_all(b64);
 
 =head1 BUGS
 
diff --git a/crypto/openssl/doc/crypto/BIO_push.pod b/crypto/openssl/doc/crypto/BIO_push.pod
index 8af1d3c09751..8a2657cd588c 100644
--- a/crypto/openssl/doc/crypto/BIO_push.pod
+++ b/crypto/openssl/doc/crypto/BIO_push.pod
@@ -40,7 +40,7 @@ If the call:
 
  BIO_push(b64, f);
 
-is made then the new chain will be B<b64-chain>. After making the calls
+is made then the new chain will be B<b64-f>. After making the calls
 
  BIO_push(md2, b64);
  BIO_push(md1, md2);
diff --git a/crypto/openssl/doc/crypto/ERR_get_error.pod b/crypto/openssl/doc/crypto/ERR_get_error.pod
index 828ecf529b2e..01e196c95fda 100644
--- a/crypto/openssl/doc/crypto/ERR_get_error.pod
+++ b/crypto/openssl/doc/crypto/ERR_get_error.pod
@@ -49,10 +49,10 @@ additionally store the file name and line number where
 the error occurred in *B<file> and *B<line>, unless these are B<NULL>.
 
 ERR_get_error_line_data(), ERR_peek_error_line_data() and
-ERR_get_last_error_line_data() store additional data and flags
+ERR_peek_last_error_line_data() store additional data and flags
 associated with the error code in *B<data>
 and *B<flags>, unless these are B<NULL>. *B<data> contains a string
-if *B<flags>&B<ERR_TXT_STRING> is true. 
+if *B<flags>&B<ERR_TXT_STRING> is true.
 
 An application B<MUST NOT> free the *B<data> pointer (or any other pointers
 returned by these functions) with OPENSSL_free() as freeing is handled
diff --git a/crypto/openssl/doc/crypto/EVP_DigestInit.pod b/crypto/openssl/doc/crypto/EVP_DigestInit.pod
index 367691cc7aed..310c65eb3705 100644
--- a/crypto/openssl/doc/crypto/EVP_DigestInit.pod
+++ b/crypto/openssl/doc/crypto/EVP_DigestInit.pod
@@ -161,9 +161,8 @@ EVP_MD_CTX_copy_ex() returns 1 if successful or 0 for failure.
 EVP_MD_type(), EVP_MD_pkey_type() and EVP_MD_type() return the NID of the
 corresponding OBJECT IDENTIFIER or NID_undef if none exists.
 
-EVP_MD_size(), EVP_MD_block_size(), EVP_MD_CTX_size(e), EVP_MD_size(),
-EVP_MD_CTX_block_size()	and EVP_MD_block_size() return the digest or block
-size in bytes.
+EVP_MD_size(), EVP_MD_block_size(), EVP_MD_CTX_size() and
+EVP_MD_CTX_block_size() return the digest or block size in bytes.
 
 EVP_md_null(), EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_dss(),
 EVP_dss1(), EVP_mdc2() and EVP_ripemd160() return pointers to the
diff --git a/crypto/openssl/doc/crypto/EVP_EncryptInit.pod b/crypto/openssl/doc/crypto/EVP_EncryptInit.pod
index 1c4bf184a1b0..d11e054e48b3 100644
--- a/crypto/openssl/doc/crypto/EVP_EncryptInit.pod
+++ b/crypto/openssl/doc/crypto/EVP_EncryptInit.pod
@@ -344,7 +344,10 @@ bits and 12 rounds.
 
 Where possible the B<EVP> interface to symmetric ciphers should be used in
 preference to the low level interfaces. This is because the code then becomes
-transparent to the cipher used and much more flexible.
+transparent to the cipher used and much more flexible. Additionally, the
+B<EVP> interface will ensure the use of platform specific cryptographic
+acceleration such as AES-NI (the low level interfaces do not provide the
+guarantee).
 
 PKCS padding works by adding B<n> padding bytes of value B<n> to make the total 
 length of the encrypted data a multiple of the block size. Padding is always
diff --git a/crypto/openssl/doc/crypto/EVP_SignInit.pod b/crypto/openssl/doc/crypto/EVP_SignInit.pod
index 620a623ab620..14ecc775af6a 100644
--- a/crypto/openssl/doc/crypto/EVP_SignInit.pod
+++ b/crypto/openssl/doc/crypto/EVP_SignInit.pod
@@ -30,9 +30,11 @@ signature context B<ctx>. This function can be called several times on the
 same B<ctx> to include additional data.
 
 EVP_SignFinal() signs the data in B<ctx> using the private key B<pkey> and
-places the signature in B<sig>. The number of bytes of data written (i.e. the
-length of the signature) will be written to the integer at B<s>, at most
-EVP_PKEY_size(pkey) bytes will be written. 
+places the signature in B<sig>. B<sig> must be at least EVP_PKEY_size(pkey)
+bytes in size. B<s> is an OUT paramter, and not used as an IN parameter.
+The number of bytes of data written (i.e. the length of the signature)
+will be written to the integer at B<s>, at most EVP_PKEY_size(pkey) bytes
+will be written.
 
 EVP_SignInit() initializes a signing context B<ctx> to use the default
 implementation of digest B<type>.
diff --git a/crypto/openssl/doc/crypto/RSA_set_method.pod b/crypto/openssl/doc/crypto/RSA_set_method.pod
index 2c963d7e5bba..0ef078118651 100644
--- a/crypto/openssl/doc/crypto/RSA_set_method.pod
+++ b/crypto/openssl/doc/crypto/RSA_set_method.pod
@@ -125,14 +125,18 @@ the default method is used.
      /* sign. For backward compatibility, this is used only
       * if (flags & RSA_FLAG_SIGN_VER)
       */
-	int (*rsa_sign)(int type, unsigned char *m, unsigned int m_len,
-           unsigned char *sigret, unsigned int *siglen, RSA *rsa);
-
+	int (*rsa_sign)(int type,
+		const unsigned char *m, unsigned int m_length,
+		unsigned char *sigret, unsigned int *siglen, const RSA *rsa);
      /* verify. For backward compatibility, this is used only
       * if (flags & RSA_FLAG_SIGN_VER)
       */
-	int (*rsa_verify)(int type, unsigned char *m, unsigned int m_len,
-           unsigned char *sigbuf, unsigned int siglen, RSA *rsa);
+	int (*rsa_verify)(int dtype,
+		const unsigned char *m, unsigned int m_length,
+		const unsigned char *sigbuf, unsigned int siglen,
+								const RSA *rsa);
+     /* keygen. If NULL builtin RSA key generation will be used */
+	int (*rsa_keygen)(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
 
  } RSA_METHOD;
 
diff --git a/crypto/openssl/doc/crypto/RSA_sign.pod b/crypto/openssl/doc/crypto/RSA_sign.pod
index 8553be8e99b6..fc16b1f4f806 100644
--- a/crypto/openssl/doc/crypto/RSA_sign.pod
+++ b/crypto/openssl/doc/crypto/RSA_sign.pod
@@ -20,6 +20,10 @@ RSA_sign() signs the message digest B<m> of size B<m_len> using the
 private key B<rsa> as specified in PKCS #1 v2.0. It stores the
 signature in B<sigret> and the signature size in B<siglen>. B<sigret>
 must point to RSA_size(B<rsa>) bytes of memory.
+Note that PKCS #1 adds meta-data, placing limits on the size of the
+key that can be used.
+See L<RSA_private_encrypt(3)|RSA_private_encrypt(3)> for lower-level
+operations.
 
 B<type> denotes the message digest algorithm that was used to generate
 B<m>. It usually is one of B<NID_sha1>, B<NID_ripemd160> and B<NID_md5>;
diff --git a/crypto/openssl/doc/crypto/des.pod b/crypto/openssl/doc/crypto/des.pod
index 6f0cf1cc5e5f..e1add56b5e81 100644
--- a/crypto/openssl/doc/crypto/des.pod
+++ b/crypto/openssl/doc/crypto/des.pod
@@ -135,9 +135,8 @@ depend on a global variable.
 
 DES_set_odd_parity() sets the parity of the passed I<key> to odd.
 
-DES_is_weak_key() returns 1 is the passed key is a weak key, 0 if it
-is ok.  The probability that a randomly generated key is weak is
-1/2^52, so it is not really worth checking for them.
+DES_is_weak_key() returns 1 if the passed key is a weak key, 0 if it
+is ok.  
 
 The following routines mostly operate on an input and output stream of
 I<DES_cblock>s.
@@ -181,7 +180,7 @@ of 24 bytes.  This is much better than CBC DES.
 
 DES_ede3_cbc_encrypt() implements outer triple CBC DES encryption with
 three keys. This means that each DES operation inside the CBC mode is
-really an C<C=E(ks3,D(ks2,E(ks1,M)))>.  This mode is used by SSL.
+an C<C=E(ks3,D(ks2,E(ks1,M)))>.  This mode is used by SSL.
 
 The DES_ede2_cbc_encrypt() macro implements two-key Triple-DES by
 reusing I<ks1> for the final encryption.  C<C=E(ks1,D(ks2,E(ks1,M)))>.
diff --git a/crypto/openssl/doc/crypto/err.pod b/crypto/openssl/doc/crypto/err.pod
index 6f729554d2a9..4a5dc6935cc7 100644
--- a/crypto/openssl/doc/crypto/err.pod
+++ b/crypto/openssl/doc/crypto/err.pod
@@ -171,7 +171,6 @@ ERR_get_string_table(void) respectively.
 
 =head1 SEE ALSO
 
-L<CRYPTO_set_id_callback(3)|CRYPTO_set_id_callback(3)>,
 L<CRYPTO_set_locking_callback(3)|CRYPTO_set_locking_callback(3)>,
 L<ERR_get_error(3)|ERR_get_error(3)>,
 L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>,
diff --git a/crypto/openssl/doc/crypto/pem.pod b/crypto/openssl/doc/crypto/pem.pod
index 54414a3f6f37..21e9fe3b98a9 100644
--- a/crypto/openssl/doc/crypto/pem.pod
+++ b/crypto/openssl/doc/crypto/pem.pod
@@ -450,9 +450,9 @@ byte B<salt> encoded as a set of hexadecimal digits.
 
 After this is the base64 encoded encrypted data.
 
-The encryption key is determined using EVP_bytestokey(), using B<salt> and an
+The encryption key is determined using EVP_BytesToKey(), using B<salt> and an
 iteration count of 1. The IV used is the value of B<salt> and *not* the IV
-returned by EVP_bytestokey().
+returned by EVP_BytesToKey().
 
 =head1 BUGS
 
@@ -474,3 +474,7 @@ The read routines return either a pointer to the structure read or NULL
 if an error occurred.
 
 The write routines return 1 for success or 0 for failure.
+
+=head1 SEE ALSO
+
+L<EVP_get_cipherbyname(3)|EVP_get_cipherbyname>, L<EVP_BytesToKey(3)|EVP_BytesToKey(3)>
diff --git a/crypto/openssl/doc/crypto/ui.pod b/crypto/openssl/doc/crypto/ui.pod
index 6df68d604a82..04f8e9c360a8 100644
--- a/crypto/openssl/doc/crypto/ui.pod
+++ b/crypto/openssl/doc/crypto/ui.pod
@@ -119,7 +119,7 @@ verification will fail.
 UI_add_input_boolean() adds a prompt to the UI that's supposed to be answered
 in a boolean way, with a single character for yes and a different character
 for no.  A set of characters that can be used to cancel the prompt is given
-as well.  The prompt itself is really divided in two, one part being the
+as well.  The prompt itself is divided in two, one part being the
 descriptive text (given through the I<prompt> argument) and one describing
 the possible answers (given through the I<action_desc> argument).
 
diff --git a/crypto/openssl/doc/fingerprints.txt b/crypto/openssl/doc/fingerprints.txt
index 4030c81fa500..373e90d0a1e7 100644
--- a/crypto/openssl/doc/fingerprints.txt
+++ b/crypto/openssl/doc/fingerprints.txt
@@ -4,12 +4,11 @@ OpenSSL releases are signed with PGP/GnuPG keys.  You can find the
 signatures in separate files in the same location you find the
 distributions themselves.  The normal file name is the same as the
 distribution file, with '.asc' added.  For example, the signature for
-the distribution of OpenSSL 0.9.7f, openssl-0.9.7f.tar.gz, is found in
-the file openssl-0.9.7f.tar.gz.asc.
+the distribution of OpenSSL 1.0.1h, openssl-1.0.1h.tar.gz, is found in
+the file openssl-1.0.1h.tar.gz.asc.
 
 The following is the list of fingerprints for the keys that are
-currently in use (have been used since summer 2004) to sign OpenSSL
-distributions:
+currently in use to sign OpenSSL distributions:
 
 pub   1024D/F709453B 2003-10-20
       Key fingerprint = C4CA B749 C34F 7F4C C04F  DAC9 A7AF 9E78 F709 453B
@@ -34,10 +33,6 @@ uid                  Mark Cox <mjc@redhat.com>
 uid                  Mark Cox <mark@awe.com>
 uid                  Mark Cox <mjc@apache.org>
 
-pub   1024R/26BB437D 1997-04-28
-      Key fingerprint = 00 C9 21 8E D1 AB 70 37  DD 67 A2 3A 0A 6F 8D A5
-uid                  Ralf S. Engelschall <rse@engelschall.com>
-
 pub   1024R/9C58A66D 1997-04-03
       Key fingerprint = 13 D0 B8 9D 37 30 C3 ED  AC 9C 24 7D 45 8C 17 67
 uid                  jaenicke@openssl.org
@@ -62,3 +57,7 @@ uid                  Bodo Moeller <3moeller@informatik.uni-hamburg.de>
 uid                  Bodo Moeller <Bodo_Moeller@public.uni-hamburg.de>
 uid                  Bodo Moeller <3moeller@rzdspc5.informatik.uni-hamburg.de>
 
+pub   2048R/0E604491 2013-04-30            
+      Key fingerprint = 8657 ABB2 60F0 56B1 E519 0839 D9C4 D26D 0E60 4491
+uid                  Matt Caswell <frodo@baggins.org>
+
diff --git a/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod b/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod
index eb772b55de4a..2e113be6065c 100644
--- a/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod
+++ b/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod
@@ -23,8 +23,12 @@ SSL_CIPHER_get_bits() returns the number of secret bits used for B<cipher>. If
 B<alg_bits> is not NULL, it contains the number of bits processed by the
 chosen algorithm. If B<cipher> is NULL, 0 is returned.
 
-SSL_CIPHER_get_version() returns the protocol version for B<cipher>, currently
-"SSLv2", "SSLv3", or "TLSv1". If B<cipher> is NULL, "(NONE)" is returned.
+SSL_CIPHER_get_version() returns string which indicates the SSL/TLS protocol
+version that first defined the cipher.
+This is currently B<SSLv2> or B<TLSv1/SSLv3>.
+In some cases it should possibly return "TLSv1.2" but does not;
+use SSL_CIPHER_description() instead.
+If B<cipher> is NULL, "(NONE)" is returned.
 
 SSL_CIPHER_description() returns a textual description of the cipher used
 into the buffer B<buf> of length B<len> provided. B<len> must be at least
@@ -52,7 +56,8 @@ Textual representation of the cipher name.
 
 =item <protocol version>
 
-Protocol version: B<SSLv2>, B<SSLv3>. The TLSv1 ciphers are flagged with SSLv3.
+Protocol version: B<SSLv2>, B<SSLv3>, B<TLSv1.2>. The TLSv1.0 ciphers are
+flagged with SSLv3. No new ciphers were added by TLSv1.1.
 
 =item Kx=<key exchange>
 
@@ -91,6 +96,10 @@ Some examples for the output of SSL_CIPHER_description():
  RC4-MD5                 SSLv3 Kx=RSA      Au=RSA  Enc=RC4(128)  Mac=MD5
  EXP-RC4-MD5             SSLv3 Kx=RSA(512) Au=RSA  Enc=RC4(40)   Mac=MD5  export
 
+A comp[lete list can be retrieved by invoking the following command:
+
+ openssl ciphers -v ALL
+
 =head1 BUGS
 
 If SSL_CIPHER_description() is called with B<cipher> being NULL, the
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod b/crypto/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod
index ee28f5ccc3a3..5955ee1cb415 100644
--- a/crypto/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod
+++ b/crypto/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod
@@ -24,6 +24,16 @@ the library will try to complete the chain from the available CA
 certificates in the trusted CA storage, see
 L<SSL_CTX_load_verify_locations(3)|SSL_CTX_load_verify_locations(3)>.
 
+The B<x509> certificate provided to SSL_CTX_add_extra_chain_cert() will be freed by the library when the B<SSL_CTX> is destroyed. An application B<should not> free the B<x509> object.
+
+=head1 RESTRICTIONS
+
+Only one set of extra chain certificates can be specified per SSL_CTX
+structure. Different chains for different certificates (for example if both
+RSA and DSA certificates are specified by the same server) or different SSL
+structures with the same parent SSL_CTX cannot be specified using this
+function.
+
 =head1 RETURN VALUES
 
 SSL_CTX_add_extra_chain_cert() returns 1 on success. Check out the
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_add_session.pod b/crypto/openssl/doc/ssl/SSL_CTX_add_session.pod
index 8e0abd36cd68..c660a18fc2a1 100644
--- a/crypto/openssl/doc/ssl/SSL_CTX_add_session.pod
+++ b/crypto/openssl/doc/ssl/SSL_CTX_add_session.pod
@@ -41,7 +41,7 @@ If a server SSL_CTX is configured with the SSL_SESS_CACHE_NO_INTERNAL_STORE
 flag then the internal cache will not be populated automatically by new
 sessions negotiated by the SSL/TLS implementation, even though the internal
 cache will be searched automatically for session-resume requests (the
-latter can be surpressed by SSL_SESS_CACHE_NO_INTERNAL_LOOKUP). So the
+latter can be suppressed by SSL_SESS_CACHE_NO_INTERNAL_LOOKUP). So the
 application can use SSL_CTX_add_session() directly to have full control
 over the sessions that can be resumed if desired.
 
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_new.pod b/crypto/openssl/doc/ssl/SSL_CTX_new.pod
index 73e8c47f9a2e..491ac8c172cb 100644
--- a/crypto/openssl/doc/ssl/SSL_CTX_new.pod
+++ b/crypto/openssl/doc/ssl/SSL_CTX_new.pod
@@ -51,22 +51,36 @@ SSLv3 client hello messages.
 
 =item SSLv23_method(void), SSLv23_server_method(void), SSLv23_client_method(void)
 
-A TLS/SSL connection established with these methods will understand the SSLv2,
-SSLv3, and TLSv1 protocol. A client will send out SSLv2 client hello messages
-and will indicate that it also understands SSLv3 and TLSv1. A server will
-understand SSLv2, SSLv3, and TLSv1 client hello messages. This is the best
-choice when compatibility is a concern.
+A TLS/SSL connection established with these methods may understand the SSLv2,
+SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols.
+
+If the cipher list does not contain any SSLv2 ciphersuites (the default
+cipher list does not) or extensions are required (for example server name)
+a client will send out TLSv1 client hello messages including extensions and
+will indicate that it also understands TLSv1.1, TLSv1.2 and permits a
+fallback to SSLv3. A server will support SSLv3, TLSv1, TLSv1.1 and TLSv1.2
+protocols. This is the best choice when compatibility is a concern.
+
+If any SSLv2 ciphersuites are included in the cipher list and no extensions
+are required then SSLv2 compatible client hellos will be used by clients and
+SSLv2 will be accepted by servers. This is B<not> recommended due to the
+insecurity of SSLv2 and the limited nature of the SSLv2 client hello
+prohibiting the use of extensions.
 
 =back
 
 The list of protocols available can later be limited using the SSL_OP_NO_SSLv2,
-SSL_OP_NO_SSLv3, SSL_OP_NO_TLSv1 options of the B<SSL_CTX_set_options()> or
-B<SSL_set_options()> functions. Using these options it is possible to choose
-e.g. SSLv23_server_method() and be able to negotiate with all possible
-clients, but to only allow newer protocols like SSLv3 or TLSv1.
+SSL_OP_NO_SSLv3, SSL_OP_NO_TLSv1, SSL_OP_NO_TLSv1_1 and SSL_OP_NO_TLSv1_2
+options of the SSL_CTX_set_options() or SSL_set_options() functions.
+Using these options it is possible to choose e.g. SSLv23_server_method() and
+be able to negotiate with all possible clients, but to only allow newer
+protocols like TLSv1, TLSv1.1 or TLS v1.2.
+
+Applications which never want to support SSLv2 (even is the cipher string
+is configured to use SSLv2 ciphersuites) can set SSL_OP_NO_SSLv2.
 
 SSL_CTX_new() initializes the list of ciphers, the session cache setting,
-the callbacks, the keys and certificates, and the options to its default
+the callbacks, the keys and certificates and the options to its default
 values.
 
 =head1 RETURN VALUES
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_cipher_list.pod b/crypto/openssl/doc/ssl/SSL_CTX_set_cipher_list.pod
index ed64f6415702..bd4df4abd461 100644
--- a/crypto/openssl/doc/ssl/SSL_CTX_set_cipher_list.pod
+++ b/crypto/openssl/doc/ssl/SSL_CTX_set_cipher_list.pod
@@ -54,6 +54,10 @@ of 512 bits and the server is not configured to use temporary RSA
 keys), the "no shared cipher" (SSL_R_NO_SHARED_CIPHER) error is generated
 and the handshake will fail.
 
+If the cipher list does not contain any SSLv2 cipher suites (this is the
+default) then SSLv2 is effectively disabled and neither clients nor servers
+will attempt to use SSLv2.
+
 =head1 RETURN VALUES
 
 SSL_CTX_set_cipher_list() and SSL_set_cipher_list() return 1 if any cipher
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_client_CA_list.pod b/crypto/openssl/doc/ssl/SSL_CTX_set_client_CA_list.pod
index 5e97392668a2..4965385e97ae 100644
--- a/crypto/openssl/doc/ssl/SSL_CTX_set_client_CA_list.pod
+++ b/crypto/openssl/doc/ssl/SSL_CTX_set_client_CA_list.pod
@@ -35,7 +35,7 @@ the chosen B<ssl>, overriding the setting valid for B<ssl>'s SSL_CTX object.
 =head1 NOTES
 
 When a TLS/SSL server requests a client certificate (see
-B<SSL_CTX_set_verify_options()>), it sends a list of CAs, for which
+B<SSL_CTX_set_verify(3)>), it sends a list of CAs, for which
 it will accept certificates, to the client.
 
 This list must explicitly be set using SSL_CTX_set_client_CA_list() for
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod b/crypto/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod
index 3465b5c7bbaf..d0df69a9bc18 100644
--- a/crypto/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod
+++ b/crypto/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod
@@ -29,7 +29,7 @@ using the B<x509> and B<pkey> arguments and "1" must be returned. The
 certificate will be installed into B<ssl>, see the NOTES and BUGS sections.
 If no certificate should be set, "0" has to be returned and no certificate
 will be sent. A negative return value will suspend the handshake and the
-handshake function will return immediatly. L<SSL_get_error(3)|SSL_get_error(3)>
+handshake function will return immediately. L<SSL_get_error(3)|SSL_get_error(3)>
 will return SSL_ERROR_WANT_X509_LOOKUP to indicate, that the handshake was
 suspended. The next call to the handshake function will again lead to the call
 of client_cert_cb(). It is the job of the client_cert_cb() to store information
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod b/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod
index d8866927a262..6e6b5e6d8082 100644
--- a/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod
+++ b/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod
@@ -256,7 +256,7 @@ Connections and renegotiation are always permitted by OpenSSL implementations.
 
 =head2 Unpatched client and patched OpenSSL server
 
-The initial connection suceeds but client renegotiation is denied by the
+The initial connection succeeds but client renegotiation is denied by the
 server with a B<no_renegotiation> warning alert if TLS v1.0 is used or a fatal
 B<handshake_failure> alert in SSL v3.0.
 
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod b/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod
new file mode 100644
index 000000000000..da0dd0f597e4
--- /dev/null
+++ b/crypto/openssl/doc/ssl/SSL_CTX_set_tlsext_ticket_key_cb.pod
@@ -0,0 +1,195 @@
+=pod
+
+=head1 NAME
+
+SSL_CTX_set_tlsext_ticket_key_cb - set a callback for session ticket processing
+
+=head1 SYNOPSIS
+
+ #include <openssl/tls1.h>
+
+ long SSL_CTX_set_tlsext_ticket_key_cb(SSL_CTX sslctx,
+        int (*cb)(SSL *s, unsigned char key_name[16],
+	          unsigned char iv[EVP_MAX_IV_LENGTH],
+		  EVP_CIPHER_CTX *ctx, HMAC_CTX *hctx, int enc));
+
+=head1 DESCRIPTION
+
+SSL_CTX_set_tlsext_ticket_key_cb() sets a callback fuction I<cb> for handling 
+session tickets for the ssl context I<sslctx>. Session tickets, defined in 
+RFC5077 provide an enhanced session resumption capability where the server
+implementation is not required to maintain per session state. It only applies
+to TLS and there is no SSLv3 implementation.
+
+The callback is available when the OpenSSL library was built without 
+I<OPENSSL_NO_TLSEXT> being defined.
+
+The callback function I<cb> will be called for every client instigated TLS
+session when session ticket extension is presented in the TLS hello
+message. It is the responsibility of this function to create or retrieve the
+cryptographic parameters and to maintain their state.
+
+The OpenSSL library uses your callback function to help implement a common TLS 
+ticket construction state according to RFC5077 Section 4 such that per session
+state is unnecessary and a small set of cryptographic variables needs to be 
+maintained by the callback function implementation.
+
+In order to reuse a session, a TLS client must send the a session ticket
+extension to the server. The client can only send exactly one session ticket.
+The server, through the callback function, either agrees to reuse the session
+ticket information or it starts a full TLS handshake to create a new session
+ticket.
+
+Before the callback function is started I<ctx> and I<hctx> have been 
+initialised with EVP_CIPHER_CTX_init and HMAC_CTX_init respectively.
+
+For new sessions tickets, when the client doesn't present a session ticket, or
+an attempted retreival of the ticket failed, or a renew option was indicated,
+the callback function will be called with I<enc> equal to 1. The OpenSSL
+library expects that the function will set an arbitary I<name>, initialize
+I<iv>, and set the cipher context I<ctx> and the hash context I<hctx>.
+
+The I<name> is 16 characters long and is used as a key identifier.
+
+The I<iv> length is the length of the IV of the corresponding cipher. The
+maximum IV length is L<EVP_MAX_IV_LENGTH> bytes defined in B<evp.h>.
+
+The initialization vector I<iv> should be a random value. The cipher context 
+I<ctx> should use the initialisation vector I<iv>. The cipher context can be 
+set using L<EVP_EncryptInit_ex>. The hmac context can be set using L<HMAC_Init_ex>.
+
+When the client presents a session ticket, the callback function with be called 
+with I<enc> set to 0 indicating that the I<cb> function should retreive a set
+of parameters. In this case I<name> and I<iv> have already been parsed out of
+the session ticket. The OpenSSL library expects that the I<name> will be used
+to retrieve a cryptographic parameters and that the cryptographic context
+I<ctx> will be set with the retreived parameters and the initialization vector
+I<iv>. using a function like L<EVP_DecryptInit_ex>. The I<hctx> needs to be set
+using L<HMAC_Init_ex>.
+
+If the I<name> is still valid but a renewal of the ticket is required the
+callback function should return 2. The library will call the callback again
+with an arguement of enc equal to 1 to set the new ticket.
+
+The return value of the I<cb> function is used by OpenSSL to determine what
+further processing will occur. The following return values have meaning:
+
+=over 4
+
+=item Z<>2
+
+This indicates that the I<ctx> and I<hctx> have been set and the session can 
+continue on those parameters. Additionally it indicates that the session
+ticket is in a renewal period and should be replaced. The OpenSSL library will
+call I<cb> again with an enc argument of 1 to set the new ticket (see RFC5077
+3.3 paragraph 2).
+
+=item Z<>1
+
+This indicates that the I<ctx> and I<hctx> have been set and the session can 
+continue on those parameters.
+
+=item Z<>0
+
+This indicates that it was not possible to set/retrieve a session ticket and 
+the SSL/TLS session will continue by by negiotationing a set of cryptographic
+parameters or using the alternate SSL/TLS resumption mechanism, session ids.
+
+If called with enc equal to 0 the library will call the I<cb> again to get
+a new set of parameters.
+
+=item less than 0
+
+This indicates an error.
+
+=back
+
+=head1 NOTES
+
+Session resumption shortcuts the TLS so that the client certificate
+negiotation don't occur. It makes up for this by storing client certificate
+an all other negotiated state information encrypted within the ticket. In a
+resumed session the applications will have all this state information available
+exactly as if a full negiotation had occured.
+
+If an attacker can obtain the key used to encrypt a session ticket, they can
+obtain the master secret for any ticket using that key and decrypt any traffic
+using that session: even if the ciphersuite supports forward secrecy. As
+a result applications may wish to use multiple keys and avoid using long term
+keys stored in files.
+
+Applications can use longer keys to maintain a consistent level of security.
+For example if a ciphersuite uses 256 bit ciphers but only a 128 bit ticket key
+the overall security is only 128 bits because breaking the ticket key will
+enable an attacker to obtain the session keys.
+
+=head1 EXAMPLES
+
+Reference Implemention:
+  SSL_CTX_set_tlsext_ticket_key_cb(SSL,ssl_tlsext_ticket_key_cb);
+  ....
+
+  static int ssl_tlsext_ticket_key_cb(SSL *s, unsigned char key_name[16], unsigned char *iv, EVP_CIPHER_CTX *ctx, HMAC_CTX *hctx, int enc)
+  {
+      if (enc) { /* create new session */
+          if (RAND_bytes(iv, EVP_MAX_IV_LENGTH) ) {
+              return -1; /* insufficient random */
+          }
+  
+          key = currentkey(); /* something that you need to implement */
+          if ( !key ) {
+              /* current key doesn't exist or isn't valid */
+              key = createkey(); /* something that you need to implement.
+                                   * createkey needs to initialise, a name,
+                                   * an aes_key, a hmac_key and optionally
+                                   * an expire time. */
+              if ( !key ) { /* key couldn't be created */
+                  return 0;
+              }
+          }
+          memcpy(key_name, key->name, 16);
+  
+          EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->aes_key, iv);
+          HMAC_Init_ex(&hctx, key->hmac_key, 16, EVP_sha256(), NULL);
+  
+          return 1;
+  
+      } else { /* retrieve session */
+          key = findkey(name);
+  
+          if  (!key || key->expire < now() ) {
+              return 0;
+          }
+  
+          HMAC_Init_ex(&hctx, key->hmac_key, 16, EVP_sha256(), NULL);
+          EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key->aes_key, iv );
+
+          if (key->expire < ( now() - RENEW_TIME ) ) {
+              /* return 2 - this session will get a new ticket even though the current is still valid */
+              return 2;
+          }
+          return 1;
+  
+      }
+  }
+
+
+
+=head1 RETURN VALUES
+
+returns 0 to indicate the callback function was set.
+
+=head1 SEE ALSO
+
+L<ssl(3)|ssl(3)>, L<SSL_set_session(3)|SSL_set_session(3)>,
+L<SSL_session_reused(3)|SSL_session_reused(3)>,
+L<SSL_CTX_add_session(3)|SSL_CTX_add_session(3)>,
+L<SSL_CTX_sess_number(3)|SSL_CTX_sess_number(3)>,
+L<SSL_CTX_sess_set_get_cb(3)|SSL_CTX_sess_set_get_cb(3)>,
+L<SSL_CTX_set_session_id_context(3)|SSL_CTX_set_session_id_context(3)>,
+
+=head1 HISTORY
+
+This function was introduced in OpenSSL 0.9.8h
+
+=cut
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod b/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
index 29d1f8a6fbfe..b34c68aba343 100644
--- a/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
+++ b/crypto/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod
@@ -12,12 +12,10 @@ SSL_CTX_set_tmp_dh_callback, SSL_CTX_set_tmp_dh, SSL_set_tmp_dh_callback, SSL_se
             DH *(*tmp_dh_callback)(SSL *ssl, int is_export, int keylength));
  long SSL_CTX_set_tmp_dh(SSL_CTX *ctx, DH *dh);
 
- void SSL_set_tmp_dh_callback(SSL_CTX *ctx,
+ void SSL_set_tmp_dh_callback(SSL *ctx,
             DH *(*tmp_dh_callback)(SSL *ssl, int is_export, int keylength));
  long SSL_set_tmp_dh(SSL *ssl, DH *dh)
 
- DH *(*tmp_dh_callback)(SSL *ssl, int is_export, int keylength));
-
 =head1 DESCRIPTION
 
 SSL_CTX_set_tmp_dh_callback() sets the callback function for B<ctx> to be
@@ -81,7 +79,7 @@ instead (see L<dhparam(1)|dhparam(1)>), but in this case SSL_OP_SINGLE_DH_USE
 is mandatory.
 
 Application authors may compile in DH parameters. Files dh512.pem,
-dh1024.pem, dh2048.pem, and dh4096 in the 'apps' directory of current
+dh1024.pem, dh2048.pem, and dh4096.pem in the 'apps' directory of current
 version of the OpenSSL distribution contain the 'SKIP' DH parameters,
 which use safe primes and were generated verifiably pseudo-randomly.
 These files can be converted into C code using the B<-C> option of the
diff --git a/crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod b/crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod
index 6fd6c0321551..b6ba6bb51cad 100644
--- a/crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod
+++ b/crypto/openssl/doc/ssl/SSL_CTX_set_verify.pod
@@ -109,8 +109,8 @@ certificates would not be present, most likely a
 X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY will be issued.
 The depth count is "level 0:peer certificate", "level 1: CA certificate",
 "level 2: higher level CA certificate", and so on. Setting the maximum
-depth to 2 allows the levels 0, 1, and 2. The default depth limit is 9,
-allowing for the peer certificate and additional 9 CA certificates.
+depth to 2 allows the levels 0, 1, and 2. The default depth limit is 100,
+allowing for the peer certificate and additional 100 CA certificates.
 
 The B<verify_callback> function is used to control the behaviour when the
 SSL_VERIFY_PEER flag is set. It must be supplied by the application and
diff --git a/crypto/openssl/doc/ssl/SSL_get_version.pod b/crypto/openssl/doc/ssl/SSL_get_version.pod
index cc271db2c534..9ae6f2550858 100644
--- a/crypto/openssl/doc/ssl/SSL_get_version.pod
+++ b/crypto/openssl/doc/ssl/SSL_get_version.pod
@@ -12,12 +12,12 @@ SSL_get_version - get the protocol version of a connection.
 
 =head1 DESCRIPTION
 
-SSL_get_cipher_version() returns the name of the protocol used for the
+SSL_get_version() returns the name of the protocol used for the
 connection B<ssl>.
 
 =head1 RETURN VALUES
 
-The following strings can occur:
+The following strings can be returned:
 
 =over 4
 
@@ -31,7 +31,15 @@ The connection uses the SSLv3 protocol.
 
 =item TLSv1
 
-The connection uses the TLSv1 protocol.
+The connection uses the TLSv1.0 protocol.
+
+=item TLSv1.1
+
+The connection uses the TLSv1.1 protocol.
+
+=item TLSv1.2
+
+The connection uses the TLSv1.2 protocol.
 
 =item unknown
 
diff --git a/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod b/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod
index 81d276477f9f..bce06e23b619 100644
--- a/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod
+++ b/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod
@@ -48,6 +48,16 @@ known limit on the size of the created ASN1 representation, so the necessary
 amount of space should be obtained by first calling i2d_SSL_SESSION() with
 B<pp=NULL>, and obtain the size needed, then allocate the memory and
 call i2d_SSL_SESSION() again.
+Note that this will advance the value contained in B<*pp> so it is necessary
+to save a copy of the original allocation.
+For example:
+ int i,j;
+ char *p, *temp;
+ i = i2d_SSL_SESSION(sess, NULL);
+ p = temp = malloc(i);
+ j = i2d_SSL_SESSION(sess, &temp);
+ assert(i == j);
+ assert(p+i == temp);
 
 =head1 RETURN VALUES
 
diff --git a/crypto/openssl/ssl/Makefile b/crypto/openssl/ssl/Makefile
index 0045d8983022..bffd928f5153 100644
--- a/crypto/openssl/ssl/Makefile
+++ b/crypto/openssl/ssl/Makefile
@@ -30,7 +30,7 @@ LIBSRC=	\
 	ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \
 	ssl_ciph.c ssl_stat.c ssl_rsa.c \
 	ssl_asn1.c ssl_txt.c ssl_algs.c \
-	bio_ssl.c ssl_err.c kssl.c tls_srp.c t1_reneg.c
+	bio_ssl.c ssl_err.c kssl.c tls_srp.c t1_reneg.c ssl_utst.c
 LIBOBJ= \
 	s2_meth.o  s2_srvr.o  s2_clnt.o  s2_lib.o  s2_enc.o s2_pkt.o \
 	s3_meth.o  s3_srvr.o  s3_clnt.o  s3_lib.o  s3_enc.o s3_pkt.o s3_both.o s3_cbc.o \
@@ -41,7 +41,7 @@ LIBOBJ= \
 	ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o \
 	ssl_ciph.o ssl_stat.o ssl_rsa.o \
 	ssl_asn1.o ssl_txt.o ssl_algs.o \
-	bio_ssl.o ssl_err.o kssl.o tls_srp.o t1_reneg.o
+	bio_ssl.o ssl_err.o kssl.o tls_srp.o t1_reneg.o ssl_utst.o
 
 SRC= $(LIBSRC)
 
@@ -915,6 +915,26 @@ ssl_txt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 ssl_txt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
 ssl_txt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
 ssl_txt.o: ssl_txt.c
+ssl_utst.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+ssl_utst.o: ../include/openssl/buffer.h ../include/openssl/comp.h
+ssl_utst.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
+ssl_utst.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
+ssl_utst.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
+ssl_utst.o: ../include/openssl/ecdsa.h ../include/openssl/err.h
+ssl_utst.o: ../include/openssl/evp.h ../include/openssl/hmac.h
+ssl_utst.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
+ssl_utst.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+ssl_utst.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+ssl_utst.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+ssl_utst.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+ssl_utst.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
+ssl_utst.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+ssl_utst.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+ssl_utst.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ssl_utst.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ssl_utst.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+ssl_utst.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
+ssl_utst.o: ssl_utst.c
 t1_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 t1_clnt.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 t1_clnt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
diff --git a/crypto/openssl/ssl/d1_both.c b/crypto/openssl/ssl/d1_both.c
index 04aa23107ec5..89cdca806480 100644
--- a/crypto/openssl/ssl/d1_both.c
+++ b/crypto/openssl/ssl/d1_both.c
@@ -587,29 +587,32 @@ dtls1_retrieve_buffered_fragment(SSL *s, long max, int *ok)
 		return 0;
 	}
 
+/* dtls1_max_handshake_message_len returns the maximum number of bytes
+ * permitted in a DTLS handshake message for |s|. The minimum is 16KB, but may
+ * be greater if the maximum certificate list size requires it. */
+static unsigned long dtls1_max_handshake_message_len(const SSL *s)
+	{
+	unsigned long max_len = DTLS1_HM_HEADER_LENGTH + SSL3_RT_MAX_ENCRYPTED_LENGTH;
+	if (max_len < (unsigned long)s->max_cert_list)
+		return s->max_cert_list;
+	return max_len;
+	}
 
 static int
-dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
+dtls1_reassemble_fragment(SSL *s, const struct hm_header_st* msg_hdr, int *ok)
 	{
 	hm_fragment *frag = NULL;
 	pitem *item = NULL;
 	int i = -1, is_complete;
 	unsigned char seq64be[8];
-	unsigned long frag_len = msg_hdr->frag_len, max_len;
+	unsigned long frag_len = msg_hdr->frag_len;
 
-	if ((msg_hdr->frag_off+frag_len) > msg_hdr->msg_len)
+	if ((msg_hdr->frag_off+frag_len) > msg_hdr->msg_len ||
+	    msg_hdr->msg_len > dtls1_max_handshake_message_len(s))
 		goto err;
 
-	/* Determine maximum allowed message size. Depends on (user set)
-	 * maximum certificate length, but 16k is minimum.
-	 */
-	if (DTLS1_HM_HEADER_LENGTH + SSL3_RT_MAX_ENCRYPTED_LENGTH < s->max_cert_list)
-		max_len = s->max_cert_list;
-	else
-		max_len = DTLS1_HM_HEADER_LENGTH + SSL3_RT_MAX_ENCRYPTED_LENGTH;
-
-	if ((msg_hdr->frag_off+frag_len) > max_len)
-		goto err;
+	if (frag_len == 0)
+		return DTLS1_HM_FRAGMENT_RETRY;
 
 	/* Try to find item in queue */
 	memset(seq64be,0,sizeof(seq64be));
@@ -639,7 +642,8 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 
 
 	/* If message is already reassembled, this must be a
-	 * retransmit and can be dropped.
+	 * retransmit and can be dropped. In this case item != NULL and so frag
+	 * does not need to be freed.
 	 */
 	if (frag->reassembly == NULL)
 		{
@@ -659,7 +663,9 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 	/* read the body of the fragment (header has already been read */
 	i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,
 		frag->fragment + msg_hdr->frag_off,frag_len,0);
-	if (i<=0 || (unsigned long)i!=frag_len)
+	if ((unsigned long)i!=frag_len)
+		i=-1;
+	if (i<=0)
 		goto err;
 
 	RSMBLY_BITMASK_MARK(frag->reassembly, (long)msg_hdr->frag_off,
@@ -676,10 +682,6 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 
 	if (item == NULL)
 		{
-		memset(seq64be,0,sizeof(seq64be));
-		seq64be[6] = (unsigned char)(msg_hdr->seq>>8);
-		seq64be[7] = (unsigned char)(msg_hdr->seq);
-
 		item = pitem_new(seq64be, frag);
 		if (item == NULL)
 			{
@@ -687,21 +689,25 @@ dtls1_reassemble_fragment(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 			goto err;
 			}
 
-		pqueue_insert(s->d1->buffered_messages, item);
+		item = pqueue_insert(s->d1->buffered_messages, item);
+		/* pqueue_insert fails iff a duplicate item is inserted.
+		 * However, |item| cannot be a duplicate. If it were,
+		 * |pqueue_find|, above, would have returned it and control
+		 * would never have reached this branch. */
+		OPENSSL_assert(item != NULL);
 		}
 
 	return DTLS1_HM_FRAGMENT_RETRY;
 
 err:
-	if (frag != NULL) dtls1_hm_fragment_free(frag);
-	if (item != NULL) OPENSSL_free(item);
+	if (frag != NULL && item == NULL) dtls1_hm_fragment_free(frag);
 	*ok = 0;
 	return i;
 	}
 
 
 static int
-dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
+dtls1_process_out_of_seq_message(SSL *s, const struct hm_header_st* msg_hdr, int *ok)
 {
 	int i=-1;
 	hm_fragment *frag = NULL;
@@ -721,7 +727,7 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 	/* If we already have an entry and this one is a fragment,
 	 * don't discard it and rather try to reassemble it.
 	 */
-	if (item != NULL && frag_len < msg_hdr->msg_len)
+	if (item != NULL && frag_len != msg_hdr->msg_len)
 		item = NULL;
 
 	/* Discard the message if sequence number was already there, is
@@ -746,9 +752,12 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 		}
 	else
 		{
-		if (frag_len && frag_len < msg_hdr->msg_len)
+		if (frag_len != msg_hdr->msg_len)
 			return dtls1_reassemble_fragment(s, msg_hdr, ok);
 
+		if (frag_len > dtls1_max_handshake_message_len(s))
+			goto err;
+
 		frag = dtls1_hm_fragment_new(frag_len, 0);
 		if ( frag == NULL)
 			goto err;
@@ -760,26 +769,31 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
 			/* read the body of the fragment (header has already been read */
 			i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,
 				frag->fragment,frag_len,0);
-			if (i<=0 || (unsigned long)i!=frag_len)
+			if ((unsigned long)i!=frag_len)
+				i = -1;
+			if (i<=0)
 				goto err;
 			}
 
-		memset(seq64be,0,sizeof(seq64be));
-		seq64be[6] = (unsigned char)(msg_hdr->seq>>8);
-		seq64be[7] = (unsigned char)(msg_hdr->seq);
-
 		item = pitem_new(seq64be, frag);
 		if ( item == NULL)
 			goto err;
 
-		pqueue_insert(s->d1->buffered_messages, item);
+		item = pqueue_insert(s->d1->buffered_messages, item);
+		/* pqueue_insert fails iff a duplicate item is inserted.
+		 * However, |item| cannot be a duplicate. If it were,
+		 * |pqueue_find|, above, would have returned it. Then, either
+		 * |frag_len| != |msg_hdr->msg_len| in which case |item| is set
+		 * to NULL and it will have been processed with
+		 * |dtls1_reassemble_fragment|, above, or the record will have
+		 * been discarded. */
+		OPENSSL_assert(item != NULL);
 		}
 
 	return DTLS1_HM_FRAGMENT_RETRY;
 
 err:
-	if ( frag != NULL) dtls1_hm_fragment_free(frag);
-	if ( item != NULL) OPENSSL_free(item);
+	if (frag != NULL && item == NULL) dtls1_hm_fragment_free(frag);
 	*ok = 0;
 	return i;
 	}
@@ -1180,6 +1194,8 @@ dtls1_buffer_message(SSL *s, int is_ccs)
 	OPENSSL_assert(s->init_off == 0);
 
 	frag = dtls1_hm_fragment_new(s->init_num, 0);
+	if (!frag)
+		return 0;
 
 	memcpy(frag->fragment, s->init_buf->data, s->init_num);
 
diff --git a/crypto/openssl/ssl/d1_clnt.c b/crypto/openssl/ssl/d1_clnt.c
index 48e5e06bdeb4..fd6562c114dc 100644
--- a/crypto/openssl/ssl/d1_clnt.c
+++ b/crypto/openssl/ssl/d1_clnt.c
@@ -876,12 +876,18 @@ int dtls1_client_hello(SSL *s)
 		*(p++)=0; /* Add the NULL method */
 
 #ifndef OPENSSL_NO_TLSEXT
+		/* TLS extensions*/
+		if (ssl_prepare_clienthello_tlsext(s) <= 0)
+			{
+			SSLerr(SSL_F_DTLS1_CLIENT_HELLO,SSL_R_CLIENTHELLO_TLSEXT);
+			goto err;
+			}
 		if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL)
 			{
 			SSLerr(SSL_F_DTLS1_CLIENT_HELLO,ERR_R_INTERNAL_ERROR);
 			goto err;
 			}
-#endif		
+#endif
 
 		l=(p-d);
 		d=buf;
@@ -990,6 +996,13 @@ int dtls1_send_client_key_exchange(SSL *s)
 			RSA *rsa;
 			unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
 
+			if (s->session->sess_cert == NULL)
+				{
+				/* We should always have a server certificate with SSL_kRSA. */
+				SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+				goto err;
+				}
+
 			if (s->session->sess_cert->peer_rsa_tmp != NULL)
 				rsa=s->session->sess_cert->peer_rsa_tmp;
 			else
@@ -1180,6 +1193,13 @@ int dtls1_send_client_key_exchange(SSL *s)
 			{
 			DH *dh_srvr,*dh_clnt;
 
+			if (s->session->sess_cert == NULL)
+				{
+				ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
+				SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
+				goto err;
+				}
+
 			if (s->session->sess_cert->peer_dh_tmp != NULL)
 				dh_srvr=s->session->sess_cert->peer_dh_tmp;
 			else
@@ -1239,6 +1259,13 @@ int dtls1_send_client_key_exchange(SSL *s)
 			int ecdh_clnt_cert = 0;
 			int field_size = 0;
 
+			if (s->session->sess_cert == NULL)
+				{
+				ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_UNEXPECTED_MESSAGE);
+				SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNEXPECTED_MESSAGE);
+				goto err;
+				}
+
 			/* Did we send out the client's
 			 * ECDH share for use in premaster
 			 * computation as part of client certificate?
@@ -1714,5 +1741,3 @@ int dtls1_send_client_certificate(SSL *s)
 	/* SSL3_ST_CW_CERT_D */
 	return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
 	}
-
-
diff --git a/crypto/openssl/ssl/d1_srvr.c b/crypto/openssl/ssl/d1_srvr.c
index 1384ab0cbf17..4b8ba3e452f3 100644
--- a/crypto/openssl/ssl/d1_srvr.c
+++ b/crypto/openssl/ssl/d1_srvr.c
@@ -598,10 +598,11 @@ int dtls1_accept(SSL *s)
 				s->state = SSL3_ST_SR_CLNT_HELLO_C;
 				}
 			else {
-				/* could be sent for a DH cert, even if we
-				 * have not asked for it :-) */
-				ret=ssl3_get_client_certificate(s);
-				if (ret <= 0) goto end;
+				if (s->s3->tmp.cert_request)
+					{
+					ret=ssl3_get_client_certificate(s);
+					if (ret <= 0) goto end;
+					}
 				s->init_num=0;
 				s->state=SSL3_ST_SR_KEY_EXCH_A;
 			}
@@ -980,6 +981,11 @@ int dtls1_send_server_hello(SSL *s)
 #endif
 
 #ifndef OPENSSL_NO_TLSEXT
+		if (ssl_prepare_serverhello_tlsext(s) <= 0)
+			{
+			SSLerr(SSL_F_DTLS1_SEND_SERVER_HELLO,SSL_R_SERVERHELLO_TLSEXT);
+			return -1;
+			}
 		if ((p = ssl_add_serverhello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL)
 			{
 			SSLerr(SSL_F_DTLS1_SEND_SERVER_HELLO,ERR_R_INTERNAL_ERROR);
diff --git a/crypto/openssl/ssl/heartbeat_test.c b/crypto/openssl/ssl/heartbeat_test.c
index d8cc559981c4..de9d39761ef8 100644
--- a/crypto/openssl/ssl/heartbeat_test.c
+++ b/crypto/openssl/ssl/heartbeat_test.c
@@ -38,13 +38,17 @@
  * http://mike-bland.com/tags/heartbleed.html
  */
 
+#define OPENSSL_UNIT_TEST
+
+#include "../test/testutil.h"
+
 #include "../ssl/ssl_locl.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#if !defined(OPENSSL_NO_HEARTBEATS) && !defined(OPENSSL_SYS_WINDOWS)
+#if !defined(OPENSSL_NO_HEARTBEATS) && !defined(OPENSSL_NO_UNIT_TEST)
 
 /* As per https://tools.ietf.org/html/rfc6520#section-4 */
 #define MIN_PADDING_SIZE	16
@@ -263,13 +267,10 @@ static int honest_payload_size(unsigned char payload_buf[])
 	}
 
 #define SETUP_HEARTBEAT_TEST_FIXTURE(type)\
-	HEARTBEAT_TEST_FIXTURE fixture = set_up_##type(__func__);\
-	int result = 0
+  SETUP_TEST_FIXTURE(HEARTBEAT_TEST_FIXTURE, set_up_##type)
 
 #define EXECUTE_HEARTBEAT_TEST()\
-	if (execute_heartbeat(fixture) != 0) result = 1;\
-	tear_down(fixture);\
-	return result
+  EXECUTE_TEST(execute_heartbeat, tear_down)
 
 static int test_dtls1_not_bleeding()
 	{
diff --git a/crypto/openssl/ssl/s23_lib.c b/crypto/openssl/ssl/s23_lib.c
index 3bf728318a4c..f3c29d1dde61 100644
--- a/crypto/openssl/ssl/s23_lib.c
+++ b/crypto/openssl/ssl/s23_lib.c
@@ -107,6 +107,13 @@ int ssl23_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p)
 	long l;
 
 	/* We can write SSLv2 and SSLv3 ciphers */
+	/* but no ECC ciphers */
+	if (c->algorithm_mkey == SSL_kECDHr ||
+		c->algorithm_mkey == SSL_kECDHe ||
+		c->algorithm_mkey == SSL_kEECDH ||
+		c->algorithm_auth == SSL_aECDH ||
+		c->algorithm_auth == SSL_aECDSA)
+		return 0;
 	if (p != NULL)
 		{
 		l=c->id;
diff --git a/crypto/openssl/ssl/s23_srvr.c b/crypto/openssl/ssl/s23_srvr.c
index 48778490135e..2901a6bd0104 100644
--- a/crypto/openssl/ssl/s23_srvr.c
+++ b/crypto/openssl/ssl/s23_srvr.c
@@ -348,23 +348,19 @@ int ssl23_get_client_hello(SSL *s)
 			 * Client Hello message, this would be difficult, and we'd have
 			 * to read more records to find out.
 			 * No known SSL 3.0 client fragments ClientHello like this,
-			 * so we simply assume TLS 1.0 to avoid protocol version downgrade
-			 * attacks. */
+			 * so we simply reject such connections to avoid
+			 * protocol version downgrade attacks. */
 			if (p[3] == 0 && p[4] < 6)
 				{
-#if 0
 				SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_RECORD_TOO_SMALL);
 				goto err;
-#else
-				v[1] = TLS1_VERSION_MINOR;
-#endif
 				}
 			/* if major version number > 3 set minor to a value
 			 * which will use the highest version 3 we support.
 			 * If TLS 2.0 ever appears we will need to revise
 			 * this....
 			 */
-			else if (p[9] > SSL3_VERSION_MAJOR)
+			if (p[9] > SSL3_VERSION_MAJOR)
 				v[1]=0xff;
 			else
 				v[1]=p[10]; /* minor version according to client_version */
@@ -444,14 +440,34 @@ int ssl23_get_client_hello(SSL *s)
 		v[0] = p[3]; /* == SSL3_VERSION_MAJOR */
 		v[1] = p[4];
 
+		/* An SSLv3/TLSv1 backwards-compatible CLIENT-HELLO in an SSLv2
+		 * header is sent directly on the wire, not wrapped as a TLS
+		 * record. It's format is:
+		 * Byte  Content
+		 * 0-1   msg_length
+		 * 2     msg_type
+		 * 3-4   version
+		 * 5-6   cipher_spec_length
+		 * 7-8   session_id_length
+		 * 9-10  challenge_length
+		 * ...   ...
+		 */
 		n=((p[0]&0x7f)<<8)|p[1];
 		if (n > (1024*4))
 			{
 			SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_RECORD_TOO_LARGE);
 			goto err;
 			}
+		if (n < 9)
+			{
+			SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_RECORD_LENGTH_MISMATCH);
+			goto err;
+			}
 
 		j=ssl23_read_bytes(s,n+2);
+		/* We previously read 11 bytes, so if j > 0, we must have
+		 * j == n+2 == s->packet_length. We have at least 11 valid
+		 * packet bytes. */
 		if (j <= 0) return(j);
 
 		ssl3_finish_mac(s, s->packet+2, s->packet_length-2);
diff --git a/crypto/openssl/ssl/s2_lib.c b/crypto/openssl/ssl/s2_lib.c
index 991460410910..c0bdae549639 100644
--- a/crypto/openssl/ssl/s2_lib.c
+++ b/crypto/openssl/ssl/s2_lib.c
@@ -250,7 +250,7 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl2_ciphers[]={
 	SSL_SSLV2,
 	SSL_NOT_EXP|SSL_HIGH,
 	0,
-	168,
+	112,
 	168,
 	},
 
diff --git a/crypto/openssl/ssl/s3_clnt.c b/crypto/openssl/ssl/s3_clnt.c
index 0457af878917..ea0c82de479a 100644
--- a/crypto/openssl/ssl/s3_clnt.c
+++ b/crypto/openssl/ssl/s3_clnt.c
@@ -510,6 +510,7 @@ int ssl3_connect(SSL *s)
 				s->method->ssl3_enc->client_finished_label,
 				s->method->ssl3_enc->client_finished_label_len);
 			if (ret <= 0) goto end;
+			s->s3->flags |= SSL3_FLAGS_CCS_OK;
 			s->state=SSL3_ST_CW_FLUSH;
 
 			/* clear flags */
@@ -901,6 +902,7 @@ int ssl3_get_server_hello(SSL *s)
 			{
 			s->session->cipher = pref_cipher ?
 				pref_cipher : ssl_get_cipher_by_char(s, p+j);
+	    		s->s3->flags |= SSL3_FLAGS_CCS_OK;
 			}
 		}
 #endif /* OPENSSL_NO_TLSEXT */
@@ -952,6 +954,15 @@ int ssl3_get_server_hello(SSL *s)
 		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_CIPHER_RETURNED);
 		goto f_err;
 		}
+#ifndef OPENSSL_NO_SRP
+	if (((c->algorithm_mkey & SSL_kSRP) || (c->algorithm_auth & SSL_aSRP)) &&
+		    !(s->srp_ctx.srp_Mask & SSL_kSRP))
+		{
+		al=SSL_AD_ILLEGAL_PARAMETER;
+		SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_CIPHER_RETURNED);
+		goto f_err;
+		}
+#endif /* OPENSSL_NO_SRP */
 	p+=ssl_put_cipher_by_char(s,NULL,NULL);
 
 	sk=ssl_get_ciphers_by_id(s);
@@ -1458,6 +1469,12 @@ int ssl3_get_key_exchange(SSL *s)
 		p+=i;
 		n-=param_len;
 
+		if (!srp_verify_server_param(s, &al))
+			{
+			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_PARAMETERS);
+			goto f_err;
+			}
+
 /* We must check if there is a certificate */
 #ifndef OPENSSL_NO_RSA
 		if (alg_a & SSL_aRSA)
@@ -2251,6 +2268,13 @@ int ssl3_send_client_key_exchange(SSL *s)
 			RSA *rsa;
 			unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
 
+			if (s->session->sess_cert == NULL)
+				{
+				/* We should always have a server certificate with SSL_kRSA. */
+				SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+				goto err;
+				}
+
 			if (s->session->sess_cert->peer_rsa_tmp != NULL)
 				rsa=s->session->sess_cert->peer_rsa_tmp;
 			else
diff --git a/crypto/openssl/ssl/s3_enc.c b/crypto/openssl/ssl/s3_enc.c
index e3cd4f062c5a..996267725ebe 100644
--- a/crypto/openssl/ssl/s3_enc.c
+++ b/crypto/openssl/ssl/s3_enc.c
@@ -642,10 +642,18 @@ int ssl3_cert_verify_mac(SSL *s, int md_nid, unsigned char *p)
 int ssl3_final_finish_mac(SSL *s, 
 	     const char *sender, int len, unsigned char *p)
 	{
-	int ret;
+	int ret, sha1len;
 	ret=ssl3_handshake_mac(s,NID_md5,sender,len,p);
+	if(ret == 0)
+		return 0;
+
 	p+=ret;
-	ret+=ssl3_handshake_mac(s,NID_sha1,sender,len,p);
+
+	sha1len=ssl3_handshake_mac(s,NID_sha1,sender,len,p);
+	if(sha1len == 0)
+		return 0;
+
+	ret+=sha1len;
 	return(ret);
 	}
 static int ssl3_handshake_mac(SSL *s, int md_nid,
diff --git a/crypto/openssl/ssl/s3_lib.c b/crypto/openssl/ssl/s3_lib.c
index c4ef2738d7b1..4835bef1a7c6 100644
--- a/crypto/openssl/ssl/s3_lib.c
+++ b/crypto/openssl/ssl/s3_lib.c
@@ -328,7 +328,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -377,7 +377,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -425,7 +425,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -474,7 +474,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -522,7 +522,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -602,7 +602,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -687,7 +687,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -751,7 +751,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_SSLV3,
 	SSL_NOT_EXP|SSL_HIGH,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -1685,7 +1685,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -2062,7 +2062,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -2142,7 +2142,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -2222,7 +2222,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -2302,7 +2302,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -2382,7 +2382,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -2426,13 +2426,13 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
 	TLS1_CK_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
 	SSL_kSRP,
-	SSL_aNULL,
+	SSL_aSRP,
 	SSL_3DES,
 	SSL_SHA1,
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -2448,7 +2448,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -2464,7 +2464,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	SSL_TLSV1,
 	SSL_NOT_EXP|SSL_HIGH,
 	SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
-	168,
+	112,
 	168,
 	},
 
@@ -2474,7 +2474,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	TLS1_TXT_SRP_SHA_WITH_AES_128_CBC_SHA,
 	TLS1_CK_SRP_SHA_WITH_AES_128_CBC_SHA,
 	SSL_kSRP,
-	SSL_aNULL,
+	SSL_aSRP,
 	SSL_AES128,
 	SSL_SHA1,
 	SSL_TLSV1,
@@ -2522,7 +2522,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 	TLS1_TXT_SRP_SHA_WITH_AES_256_CBC_SHA,
 	TLS1_CK_SRP_SHA_WITH_AES_256_CBC_SHA,
 	SSL_kSRP,
-	SSL_aNULL,
+	SSL_aSRP,
 	SSL_AES256,
 	SSL_SHA1,
 	SSL_TLSV1,
diff --git a/crypto/openssl/ssl/s3_pkt.c b/crypto/openssl/ssl/s3_pkt.c
index 59011e39c67e..eff7356a3148 100644
--- a/crypto/openssl/ssl/s3_pkt.c
+++ b/crypto/openssl/ssl/s3_pkt.c
@@ -968,7 +968,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
 		if (!ssl3_setup_read_buffer(s))
 			return(-1);
 
-	if ((type && (type != SSL3_RT_APPLICATION_DATA) && (type != SSL3_RT_HANDSHAKE) && type) ||
+	if ((type && (type != SSL3_RT_APPLICATION_DATA) && (type != SSL3_RT_HANDSHAKE)) ||
 	    (peek && (type != SSL3_RT_APPLICATION_DATA)))
 		{
 		SSLerr(SSL_F_SSL3_READ_BYTES, ERR_R_INTERNAL_ERROR);
diff --git a/crypto/openssl/ssl/s3_srvr.c b/crypto/openssl/ssl/s3_srvr.c
index 503bed3fe0b4..2867501287c1 100644
--- a/crypto/openssl/ssl/s3_srvr.c
+++ b/crypto/openssl/ssl/s3_srvr.c
@@ -2795,6 +2795,13 @@ int ssl3_get_client_key_exchange(SSL *s)
 				SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,ERR_R_BN_LIB);
 				goto err;
 				}
+			if (BN_ucmp(s->srp_ctx.A, s->srp_ctx.N) >= 0
+				|| BN_is_zero(s->srp_ctx.A))
+				{
+				al=SSL_AD_ILLEGAL_PARAMETER;
+				SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_SRP_PARAMETERS);
+				goto f_err;
+				}
 			if (s->session->srp_username != NULL)
 				OPENSSL_free(s->session->srp_username);
 			s->session->srp_username = BUF_strdup(s->srp_ctx.login);
@@ -2918,7 +2925,7 @@ int ssl3_get_cert_verify(SSL *s)
 		SSL3_ST_SR_CERT_VRFY_A,
 		SSL3_ST_SR_CERT_VRFY_B,
 		-1,
-		516, /* Enough for 4096 bit RSA key with TLS v1.2 */
+		SSL3_RT_MAX_PLAIN_LENGTH,
 		&ok);
 
 	if (!ok) return((int)n);
diff --git a/crypto/openssl/ssl/ssl.h b/crypto/openssl/ssl/ssl.h
index 4c1242c9d20c..b73da5ee1e10 100644
--- a/crypto/openssl/ssl/ssl.h
+++ b/crypto/openssl/ssl/ssl.h
@@ -264,6 +264,7 @@ extern "C" {
 #define SSL_TXT_aGOST94	"aGOST94"
 #define SSL_TXT_aGOST01 "aGOST01"
 #define SSL_TXT_aGOST  "aGOST"
+#define SSL_TXT_aSRP            "aSRP"
 
 #define	SSL_TXT_DSS		"DSS"
 #define SSL_TXT_DH		"DH"
@@ -2055,6 +2056,10 @@ int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secre
 void SSL_set_debug(SSL *s, int debug);
 int SSL_cache_hit(SSL *s);
 
+#ifndef OPENSSL_NO_UNIT_TEST
+const struct openssl_ssl_test_functions *SSL_test_functions(void);
+#endif
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
@@ -2320,6 +2325,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_R_BAD_SRP_B_LENGTH				 348
 #define SSL_R_BAD_SRP_G_LENGTH				 349
 #define SSL_R_BAD_SRP_N_LENGTH				 350
+#define SSL_R_BAD_SRP_PARAMETERS			 371
 #define SSL_R_BAD_SRP_S_LENGTH				 351
 #define SSL_R_BAD_SRTP_MKI_VALUE			 352
 #define SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST		 353
diff --git a/crypto/openssl/ssl/ssl_ciph.c b/crypto/openssl/ssl/ssl_ciph.c
index 0aba8e048c58..8188ff5d95c1 100644
--- a/crypto/openssl/ssl/ssl_ciph.c
+++ b/crypto/openssl/ssl/ssl_ciph.c
@@ -270,6 +270,7 @@ static const SSL_CIPHER cipher_aliases[]={
 	{0,SSL_TXT_aGOST94,0,0,SSL_aGOST94,0,0,0,0,0,0,0},
 	{0,SSL_TXT_aGOST01,0,0,SSL_aGOST01,0,0,0,0,0,0,0},
 	{0,SSL_TXT_aGOST,0,0,SSL_aGOST94|SSL_aGOST01,0,0,0,0,0,0,0},
+	{0,SSL_TXT_aSRP,0,    0,SSL_aSRP,  0,0,0,0,0,0,0},
 
 	/* aliases combining key exchange and server authentication */
 	{0,SSL_TXT_EDH,0,     SSL_kEDH,~SSL_aNULL,0,0,0,0,0,0,0},
@@ -562,7 +563,7 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
 		break;
 		}
 
-	if ((i < 0) || (i > SSL_ENC_NUM_IDX))
+	if ((i < 0) || (i >= SSL_ENC_NUM_IDX))
 		*enc=NULL;
 	else
 		{
@@ -596,7 +597,7 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
 		i= -1;
 		break;
 		}
-	if ((i < 0) || (i > SSL_MD_NUM_IDX))
+	if ((i < 0) || (i >= SSL_MD_NUM_IDX))
 	{
 		*md=NULL; 
 		if (mac_pkey_type!=NULL) *mac_pkey_type = NID_undef;
@@ -925,7 +926,7 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
 		int rule, int strength_bits,
 		CIPHER_ORDER **head_p, CIPHER_ORDER **tail_p)
 	{
-	CIPHER_ORDER *head, *tail, *curr, *curr2, *last;
+	CIPHER_ORDER *head, *tail, *curr, *next, *last;
 	const SSL_CIPHER *cp;
 	int reverse = 0;
 
@@ -942,21 +943,25 @@ static void ssl_cipher_apply_rule(unsigned long cipher_id,
 
 	if (reverse)
 		{
-		curr = tail;
+		next = tail;
 		last = head;
 		}
 	else
 		{
-		curr = head;
+		next = head;
 		last = tail;
 		}
 
-	curr2 = curr;
+	curr = NULL;
 	for (;;)
 		{
-		if ((curr == NULL) || (curr == last)) break;
-		curr = curr2;
-		curr2 = reverse ? curr->prev : curr->next;
+		if (curr == last) break;
+
+		curr = next;
+
+		if (curr == NULL) break;
+
+		next = reverse ? curr->prev : curr->next;
 
 		cp = curr->cipher;
 
@@ -1598,6 +1603,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
 	case SSL_kSRP:
 		kx="SRP";
 		break;
+	case SSL_kGOST:
+		kx="GOST";
+		break;
 	default:
 		kx="unknown";
 		}
@@ -1628,6 +1636,15 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
 	case SSL_aPSK:
 		au="PSK";
 		break;
+	case SSL_aSRP:
+		au="SRP";
+		break;
+	case SSL_aGOST94:
+		au="GOST94";
+		break;
+	case SSL_aGOST01:
+		au="GOST01";
+		break;
 	default:
 		au="unknown";
 		break;
@@ -1675,6 +1692,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
 	case SSL_SEED:
 		enc="SEED(128)";
 		break;
+	case SSL_eGOST2814789CNT:
+		enc="GOST89(256)";
+		break;
 	default:
 		enc="unknown";
 		break;
@@ -1697,6 +1717,12 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
 	case SSL_AEAD:
 		mac="AEAD";
 		break;
+	case SSL_GOST89MAC:
+		mac="GOST89";
+		break;
+	case SSL_GOST94:
+		mac="GOST94";
+		break;
 	default:
 		mac="unknown";
 		break;
diff --git a/crypto/openssl/ssl/ssl_err.c b/crypto/openssl/ssl/ssl_err.c
index 49ab43e0e528..d2f0dec71b3a 100644
--- a/crypto/openssl/ssl/ssl_err.c
+++ b/crypto/openssl/ssl/ssl_err.c
@@ -329,6 +329,7 @@ static ERR_STRING_DATA SSL_str_reasons[]=
 {ERR_REASON(SSL_R_BAD_SRP_B_LENGTH)      ,"bad srp b length"},
 {ERR_REASON(SSL_R_BAD_SRP_G_LENGTH)      ,"bad srp g length"},
 {ERR_REASON(SSL_R_BAD_SRP_N_LENGTH)      ,"bad srp n length"},
+{ERR_REASON(SSL_R_BAD_SRP_PARAMETERS)    ,"bad srp parameters"},
 {ERR_REASON(SSL_R_BAD_SRP_S_LENGTH)      ,"bad srp s length"},
 {ERR_REASON(SSL_R_BAD_SRTP_MKI_VALUE)    ,"bad srtp mki value"},
 {ERR_REASON(SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST),"bad srtp protection profile list"},
diff --git a/crypto/openssl/ssl/ssl_lib.c b/crypto/openssl/ssl/ssl_lib.c
index ef6258ca9f06..82a2c801292c 100644
--- a/crypto/openssl/ssl/ssl_lib.c
+++ b/crypto/openssl/ssl/ssl_lib.c
@@ -1406,6 +1406,11 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p,
 		    s->psk_client_callback == NULL)
 			continue;
 #endif /* OPENSSL_NO_PSK */
+#ifndef OPENSSL_NO_SRP
+		if (((c->algorithm_mkey & SSL_kSRP) || (c->algorithm_auth & SSL_aSRP)) &&
+		    !(s->srp_ctx.srp_Mask & SSL_kSRP))
+		    continue;
+#endif /* OPENSSL_NO_SRP */
 		j = put_cb ? put_cb(c,p) : ssl_put_cipher_by_char(s,c,p);
 		p+=j;
 		}
diff --git a/crypto/openssl/ssl/ssl_locl.h b/crypto/openssl/ssl/ssl_locl.h
index e48590774815..98888d2df373 100644
--- a/crypto/openssl/ssl/ssl_locl.h
+++ b/crypto/openssl/ssl/ssl_locl.h
@@ -311,6 +311,7 @@
 #define SSL_aPSK                0x00000080L /* PSK auth */
 #define SSL_aGOST94				0x00000100L /* GOST R 34.10-94 signature auth */
 #define SSL_aGOST01 			0x00000200L /* GOST R 34.10-2001 signature auth */
+#define SSL_aSRP 		0x00000400L /* SRP auth */
 
 
 /* Bits for algorithm_enc (symmetric encryption) */
@@ -809,6 +810,16 @@ const SSL_METHOD *func_name(void)  \
 	return &func_name##_data; \
 	}
 
+struct openssl_ssl_test_functions
+	{
+	int (*p_ssl_init_wbio_buffer)(SSL *s, int push);
+	int (*p_ssl3_setup_buffers)(SSL *s);
+	int (*p_tls1_process_heartbeat)(SSL *s);
+	int (*p_dtls1_process_heartbeat)(SSL *s);
+	};
+
+#ifndef OPENSSL_UNIT_TEST
+
 void ssl_clear_cipher_ctx(SSL *s);
 int ssl_clear_bad_session(SSL *s);
 CERT *ssl_cert_new(void);
@@ -1095,8 +1106,8 @@ int tls1_ec_nid2curve_id(int nid);
 #endif /* OPENSSL_NO_EC */
 
 #ifndef OPENSSL_NO_TLSEXT
-unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit); 
-unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit); 
+unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf, unsigned char *limit); 
+unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf, unsigned char *limit); 
 int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **data, unsigned char *d, int n, int *al);
 int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **data, unsigned char *d, int n, int *al);
 int ssl_prepare_clienthello_tlsext(SSL *s);
@@ -1174,4 +1185,14 @@ void tls_fips_digest_extra(
 	const EVP_CIPHER_CTX *cipher_ctx, EVP_MD_CTX *mac_ctx,
 	const unsigned char *data, size_t data_len, size_t orig_len);
 
+int srp_verify_server_param(SSL *s, int *al);
+
+#else
+
+#define ssl_init_wbio_buffer SSL_test_functions()->p_ssl_init_wbio_buffer
+#define ssl3_setup_buffers SSL_test_functions()->p_ssl3_setup_buffers
+#define tls1_process_heartbeat SSL_test_functions()->p_tls1_process_heartbeat
+#define dtls1_process_heartbeat SSL_test_functions()->p_dtls1_process_heartbeat
+
+#endif
 #endif
diff --git a/crypto/openssl/ssl/ssl_stat.c b/crypto/openssl/ssl/ssl_stat.c
index 144b81e55fe4..c5a15ce54824 100644
--- a/crypto/openssl/ssl/ssl_stat.c
+++ b/crypto/openssl/ssl/ssl_stat.c
@@ -212,7 +212,6 @@ case SSL3_ST_SR_CERT_VRFY_A:	str="SSLv3 read certificate verify A"; break;
 case SSL3_ST_SR_CERT_VRFY_B:	str="SSLv3 read certificate verify B"; break;
 #endif
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
 /* SSLv2/v3 compatibility states */
 /* client */
 case SSL23_ST_CW_CLNT_HELLO_A:	str="SSLv2/v3 write client hello A"; break;
@@ -222,7 +221,6 @@ case SSL23_ST_CR_SRVR_HELLO_B:	str="SSLv2/v3 read server hello B"; break;
 /* server */
 case SSL23_ST_SR_CLNT_HELLO_A:	str="SSLv2/v3 read client hello A"; break;
 case SSL23_ST_SR_CLNT_HELLO_B:	str="SSLv2/v3 read client hello B"; break;
-#endif
 
 /* DTLS */
 case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A: str="DTLS1 read hello verify request A"; break;
@@ -366,7 +364,6 @@ case SSL3_ST_SR_CERT_VRFY_A:			str="3RCV_A"; break;
 case SSL3_ST_SR_CERT_VRFY_B:			str="3RCV_B"; break;
 #endif
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
 /* SSLv2/v3 compatibility states */
 /* client */
 case SSL23_ST_CW_CLNT_HELLO_A:			str="23WCHA"; break;
@@ -376,7 +373,7 @@ case SSL23_ST_CR_SRVR_HELLO_B:			str="23RSHA"; break;
 /* server */
 case SSL23_ST_SR_CLNT_HELLO_A:			str="23RCHA"; break;
 case SSL23_ST_SR_CLNT_HELLO_B:			str="23RCHB"; break;
-#endif
+
 /* DTLS */
 case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A: str="DRCHVA"; break;
 case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B: str="DRCHVB"; break;
diff --git a/crypto/openssl/crypto/pkcs7/example.h b/crypto/openssl/ssl/ssl_utst.c
similarity index 82%
rename from crypto/openssl/crypto/pkcs7/example.h
rename to crypto/openssl/ssl/ssl_utst.c
index 96167de188d6..3679bc3c2309 100644
--- a/crypto/openssl/crypto/pkcs7/example.h
+++ b/crypto/openssl/ssl/ssl_utst.c
@@ -1,5 +1,9 @@
+/* ssl_utst.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2014 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -46,12 +50,24 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ====================================================================
  *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
  */
 
-int add_signed_time(PKCS7_SIGNER_INFO *si);
-ASN1_UTCTIME *get_signed_time(PKCS7_SIGNER_INFO *si);
-int get_signed_seq2string(PKCS7_SIGNER_INFO *si, char **str1, char **str2);
+#include "ssl_locl.h"
+
+#ifndef OPENSSL_NO_UNIT_TEST
+
+
+static const struct openssl_ssl_test_functions ssl_test_functions =
+	{
+	ssl_init_wbio_buffer,
+	ssl3_setup_buffers,
+	tls1_process_heartbeat,
+	dtls1_process_heartbeat
+	};
+
+const struct openssl_ssl_test_functions *SSL_test_functions(void)
+	{
+	return &ssl_test_functions;
+	}
+
+#endif
diff --git a/crypto/openssl/ssl/t1_enc.c b/crypto/openssl/ssl/t1_enc.c
index ac8c1539968b..1427484a325b 100644
--- a/crypto/openssl/ssl/t1_enc.c
+++ b/crypto/openssl/ssl/t1_enc.c
@@ -1128,7 +1128,7 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
 	int rv;
 
 #ifdef KSSL_DEBUG
-	printf ("tls1_export_keying_material(%p,%p,%d,%s,%d,%p,%d)\n", s, out, olen, label, llen, p, plen);
+	printf ("tls1_export_keying_material(%p,%p,%d,%s,%d,%p,%d)\n", s, out, olen, label, llen, context, contextlen);
 #endif	/* KSSL_DEBUG */
 
 	buff = OPENSSL_malloc(olen);
diff --git a/crypto/openssl/ssl/t1_lib.c b/crypto/openssl/ssl/t1_lib.c
index 3b8d5153eb6f..022a4fb289e3 100644
--- a/crypto/openssl/ssl/t1_lib.c
+++ b/crypto/openssl/ssl/t1_lib.c
@@ -352,15 +352,16 @@ int tls12_get_req_sig_algs(SSL *s, unsigned char *p)
 	return (int)slen;
 	}
 
-unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
+unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf, unsigned char *limit)
 	{
 	int extdatalen=0;
-	unsigned char *ret = p;
+	unsigned char *orig = buf;
+	unsigned char *ret = buf;
 
 	/* don't add extensions for SSLv3 unless doing secure renegotiation */
 	if (s->client_version == SSL3_VERSION
 					&& !s->s3->send_connection_binding)
-		return p;
+		return orig;
 
 	ret+=2;
 
@@ -409,7 +410,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
               return NULL;
               }
 
-          if((limit - p - 4 - el) < 0) return NULL;
+          if((limit - ret - 4 - el) < 0) return NULL;
           
           s2n(TLSEXT_TYPE_renegotiate,ret);
           s2n(el,ret);
@@ -452,8 +453,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
 #endif
 
 #ifndef OPENSSL_NO_EC
-	if (s->tlsext_ecpointformatlist != NULL &&
-	    s->version != DTLS1_VERSION)
+	if (s->tlsext_ecpointformatlist != NULL)
 		{
 		/* Add TLS extension ECPointFormats to the ClientHello message */
 		long lenmax; 
@@ -472,8 +472,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
 		memcpy(ret, s->tlsext_ecpointformatlist, s->tlsext_ecpointformatlist_length);
 		ret+=s->tlsext_ecpointformatlist_length;
 		}
-	if (s->tlsext_ellipticcurvelist != NULL &&
-	    s->version != DTLS1_VERSION)
+	if (s->tlsext_ellipticcurvelist != NULL)
 		{
 		/* Add TLS extension EllipticCurves to the ClientHello message */
 		long lenmax; 
@@ -650,7 +649,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
 
                 ssl_add_clienthello_use_srtp_ext(s, 0, &el, 0);
                 
-                if((limit - p - 4 - el) < 0) return NULL;
+                if((limit - ret - 4 - el) < 0) return NULL;
 
                 s2n(TLSEXT_TYPE_use_srtp,ret);
                 s2n(el,ret);
@@ -693,24 +692,25 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
 			}
 		}
 
-	if ((extdatalen = ret-p-2)== 0) 
-		return p;
+	if ((extdatalen = ret-orig-2)== 0) 
+		return orig;
 
-	s2n(extdatalen,p);
+	s2n(extdatalen, orig);
 	return ret;
 	}
 
-unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
+unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf, unsigned char *limit)
 	{
 	int extdatalen=0;
-	unsigned char *ret = p;
+	unsigned char *orig = buf;
+	unsigned char *ret = buf;
 #ifndef OPENSSL_NO_NEXTPROTONEG
 	int next_proto_neg_seen;
 #endif
 
 	/* don't add extensions for SSLv3, unless doing secure renegotiation */
 	if (s->version == SSL3_VERSION && !s->s3->send_connection_binding)
-		return p;
+		return orig;
 	
 	ret+=2;
 	if (ret>=limit) return NULL; /* this really never occurs, but ... */
@@ -733,7 +733,7 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha
               return NULL;
               }
 
-          if((limit - p - 4 - el) < 0) return NULL;
+          if((limit - ret - 4 - el) < 0) return NULL;
           
           s2n(TLSEXT_TYPE_renegotiate,ret);
           s2n(el,ret);
@@ -748,8 +748,7 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha
         }
 
 #ifndef OPENSSL_NO_EC
-	if (s->tlsext_ecpointformatlist != NULL &&
-	    s->version != DTLS1_VERSION)
+	if (s->tlsext_ecpointformatlist != NULL)
 		{
 		/* Add TLS extension ECPointFormats to the ServerHello message */
 		long lenmax; 
@@ -813,7 +812,7 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha
 
                 ssl_add_serverhello_use_srtp_ext(s, 0, &el, 0);
                 
-                if((limit - p - 4 - el) < 0) return NULL;
+                if((limit - ret - 4 - el) < 0) return NULL;
 
                 s2n(TLSEXT_TYPE_use_srtp,ret);
                 s2n(el,ret);
@@ -884,10 +883,10 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha
 		}
 #endif
 
-	if ((extdatalen = ret-p-2)== 0) 
-		return p;
+	if ((extdatalen = ret-orig-2)== 0) 
+		return orig;
 
-	s2n(extdatalen,p);
+	s2n(extdatalen, orig);
 	return ret;
 	}
 
@@ -1152,8 +1151,7 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
 #endif
 
 #ifndef OPENSSL_NO_EC
-		else if (type == TLSEXT_TYPE_ec_point_formats &&
-	             s->version != DTLS1_VERSION)
+		else if (type == TLSEXT_TYPE_ec_point_formats)
 			{
 			unsigned char *sdata = data;
 			int ecpointformatlist_length = *(sdata++);
@@ -1187,8 +1185,7 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
 			fprintf(stderr,"\n");
 #endif
 			}
-		else if (type == TLSEXT_TYPE_elliptic_curves &&
-	             s->version != DTLS1_VERSION)
+		else if (type == TLSEXT_TYPE_elliptic_curves)
 			{
 			unsigned char *sdata = data;
 			int ellipticcurvelist_length = (*(sdata++) << 8);
@@ -1547,8 +1544,7 @@ int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
 			}
 
 #ifndef OPENSSL_NO_EC
-		else if (type == TLSEXT_TYPE_ec_point_formats &&
-	             s->version != DTLS1_VERSION)
+		else if (type == TLSEXT_TYPE_ec_point_formats)
 			{
 			unsigned char *sdata = data;
 			int ecpointformatlist_length = *(sdata++);
@@ -1559,15 +1555,18 @@ int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
 				*al = TLS1_AD_DECODE_ERROR;
 				return 0;
 				}
-			s->session->tlsext_ecpointformatlist_length = 0;
-			if (s->session->tlsext_ecpointformatlist != NULL) OPENSSL_free(s->session->tlsext_ecpointformatlist);
-			if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
+			if (!s->hit)
 				{
-				*al = TLS1_AD_INTERNAL_ERROR;
-				return 0;
+				s->session->tlsext_ecpointformatlist_length = 0;
+				if (s->session->tlsext_ecpointformatlist != NULL) OPENSSL_free(s->session->tlsext_ecpointformatlist);
+				if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
+					{
+					*al = TLS1_AD_INTERNAL_ERROR;
+					return 0;
+					}
+				s->session->tlsext_ecpointformatlist_length = ecpointformatlist_length;
+				memcpy(s->session->tlsext_ecpointformatlist, sdata, ecpointformatlist_length);
 				}
-			s->session->tlsext_ecpointformatlist_length = ecpointformatlist_length;
-			memcpy(s->session->tlsext_ecpointformatlist, sdata, ecpointformatlist_length);
 #if 0
 			fprintf(stderr,"ssl_parse_serverhello_tlsext s->session->tlsext_ecpointformatlist ");
 			sdata = s->session->tlsext_ecpointformatlist;
@@ -2361,7 +2360,11 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen,
 		}
 	EVP_DecryptUpdate(&ctx, sdec, &slen, p, eticklen);
 	if (EVP_DecryptFinal(&ctx, sdec + slen, &mlen) <= 0)
+		{
+		EVP_CIPHER_CTX_cleanup(&ctx);
+		OPENSSL_free(sdec);
 		return 2;
+		}
 	slen += mlen;
 	EVP_CIPHER_CTX_cleanup(&ctx);
 	p = sdec;
diff --git a/crypto/openssl/ssl/tls_srp.c b/crypto/openssl/ssl/tls_srp.c
index 2315a7c0a2e9..e7368a8f6bc2 100644
--- a/crypto/openssl/ssl/tls_srp.c
+++ b/crypto/openssl/ssl/tls_srp.c
@@ -408,17 +408,47 @@ int SRP_generate_client_master_secret(SSL *s,unsigned char *master_key)
 	return ret;
 	}
 
+int srp_verify_server_param(SSL *s, int *al)
+	{
+	SRP_CTX *srp = &s->srp_ctx;
+	/* Sanity check parameters: we can quickly check B % N == 0
+	 * by checking B != 0 since B < N
+	 */
+	if (BN_ucmp(srp->g, srp->N) >=0 || BN_ucmp(srp->B, srp->N) >= 0
+		|| BN_is_zero(srp->B))
+		{
+		*al = SSL3_AD_ILLEGAL_PARAMETER;
+		return 0;
+		}
+
+	if (BN_num_bits(srp->N) < srp->strength)
+		{
+		*al = TLS1_AD_INSUFFICIENT_SECURITY;
+		return 0;
+		}
+
+	if (srp->SRP_verify_param_callback)
+		{
+		if (srp->SRP_verify_param_callback(s, srp->SRP_cb_arg) <= 0)
+			{
+			*al = TLS1_AD_INSUFFICIENT_SECURITY;
+			return 0;
+			}
+		}
+	else if(!SRP_check_known_gN_param(srp->g, srp->N))
+		{
+		*al = TLS1_AD_INSUFFICIENT_SECURITY;
+		return 0;
+		}
+
+	return 1;
+	}
+	
+
 int SRP_Calc_A_param(SSL *s)
 	{
 	unsigned char rnd[SSL_MAX_MASTER_KEY_LENGTH];
 
-	if (BN_num_bits(s->srp_ctx.N) < s->srp_ctx.strength)
-		return -1;
-
-	if (s->srp_ctx.SRP_verify_param_callback ==NULL && 
-		!SRP_check_known_gN_param(s->srp_ctx.g,s->srp_ctx.N))
-		return -1 ;
-
 	RAND_bytes(rnd, sizeof(rnd));
 	s->srp_ctx.a = BN_bin2bn(rnd, sizeof(rnd), s->srp_ctx.a);
 	OPENSSL_cleanse(rnd, sizeof(rnd));
@@ -426,10 +456,6 @@ int SRP_Calc_A_param(SSL *s)
 	if (!(s->srp_ctx.A = SRP_Calc_A(s->srp_ctx.a,s->srp_ctx.N,s->srp_ctx.g)))
 		return -1;
 
-	/* We can have a callback to verify SRP param!! */
-	if (s->srp_ctx.SRP_verify_param_callback !=NULL) 
-		return s->srp_ctx.SRP_verify_param_callback(s,s->srp_ctx.SRP_cb_arg);
-
 	return 1;
 	}
 
diff --git a/crypto/openssl/util/mk1mf.pl b/crypto/openssl/util/mk1mf.pl
index 72fa089f6b92..bcd00ba9436a 100755
--- a/crypto/openssl/util/mk1mf.pl
+++ b/crypto/openssl/util/mk1mf.pl
@@ -1150,6 +1150,7 @@ sub read_options
 		"no-montasm" => 0,
 		"no-shared" => 0,
 		"no-store" => 0,
+		"no-unit-test" => 0,
 		"no-zlib" => 0,
 		"no-zlib-dynamic" => 0,
 		"fips" => \$fips
diff --git a/crypto/openssl/util/mkdef.pl b/crypto/openssl/util/mkdef.pl
index 9a8c7b87d1af..79d4de896281 100755
--- a/crypto/openssl/util/mkdef.pl
+++ b/crypto/openssl/util/mkdef.pl
@@ -116,7 +116,9 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
 			 # Hide SSL internals
 			 "SSL_INTERN",
 			 # SCTP
-			 "SCTP");
+		 	 "SCTP",
+			 # Unit testing
+		 	 "UNIT_TEST");
 
 my $options="";
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -137,6 +139,7 @@ my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated;
 my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
 my $no_jpake; my $no_srp; my $no_ssl2; my $no_ec2m; my $no_nistp_gcc; 
 my $no_nextprotoneg; my $no_sctp;
+my $no_unit_test;
 
 my $fips;
 
@@ -235,6 +238,7 @@ foreach (@ARGV, split(/ /, $options))
 	elsif (/^no-jpake$/)	{ $no_jpake=1; }
 	elsif (/^no-srp$/)	{ $no_srp=1; }
 	elsif (/^no-sctp$/)	{ $no_sctp=1; }
+	elsif (/^no-unit-test$/){ $no_unit_test=1; }
 	}
 
 
@@ -1205,6 +1209,7 @@ sub is_valid
 			if ($keyword eq "JPAKE" && $no_jpake) { return 0; }
 			if ($keyword eq "SRP" && $no_srp) { return 0; }
 			if ($keyword eq "SCTP" && $no_sctp) { return 0; }
+			if ($keyword eq "UNIT_TEST" && $no_unit_test) { return 0; }
 			if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
 
 			# Nothing recognise as true
diff --git a/crypto/openssl/util/mkerr.pl b/crypto/openssl/util/mkerr.pl
index aec401c77318..ee23a8291242 100644
--- a/crypto/openssl/util/mkerr.pl
+++ b/crypto/openssl/util/mkerr.pl
@@ -787,7 +787,7 @@ foreach (keys %rcodes) {
 	push (@runref, $_) unless exists $urcodes{$_};
 }
 
-if($debug && defined(@funref) ) {
+if($debug && @funref) {
 	print STDERR "The following function codes were not referenced:\n";
 	foreach(sort @funref)
 	{
@@ -795,7 +795,7 @@ if($debug && defined(@funref) ) {
 	}
 }
 
-if($debug && defined(@runref) ) {
+if($debug && @runref) {
 	print STDERR "The following reason codes were not referenced:\n";
 	foreach(sort @runref)
 	{
diff --git a/crypto/openssl/util/ssleay.num b/crypto/openssl/util/ssleay.num
index 37655bc40a83..1c05a3c4cbf7 100644
--- a/crypto/openssl/util/ssleay.num
+++ b/crypto/openssl/util/ssleay.num
@@ -181,6 +181,7 @@ SSL_get_verify_depth                    229	EXIST::FUNCTION:
 SSL_CTX_set_session_id_context          231	EXIST::FUNCTION:
 SSL_CTX_set_cert_verify_callback        232	EXIST:!VMS:FUNCTION:
 SSL_CTX_set_cert_verify_cb              232	EXIST:VMS:FUNCTION:
+SSL_test_functions                      233	EXIST::FUNCTION:UNIT_TEST
 SSL_CTX_set_default_passwd_cb_userdata  235	EXIST:!VMS:FUNCTION:
 SSL_CTX_set_def_passwd_cb_ud            235	EXIST:VMS:FUNCTION:
 SSL_set_purpose                         236	EXIST::FUNCTION:
diff --git a/etc/Makefile b/etc/Makefile
index 4f1636bcb58d..3387e60d6f02 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -240,7 +240,6 @@ distribution:
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
 	${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
 	${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
-	${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall
 	${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
 	${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt
 	${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index aa19b3031e56..da0e419545e0 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -610,7 +610,8 @@ clear_tmp_X="YES" 	# Clear and recreate X11-related directories in /tmp
 ldconfig_insecure="NO"	# Set to YES to disable ldconfig security checks
 ldconfig_paths="/usr/lib/compat /usr/local/lib /usr/local/lib/compat/pkg"
 			# shared library search paths
-ldconfig32_paths="/usr/lib32" # 32-bit compatibility shared library search paths
+ldconfig32_paths="/usr/lib32 /usr/lib32/compat"
+			# 32-bit compatibility shared library search paths
 ldconfig_paths_aout="/usr/lib/compat/aout /usr/local/lib/aout"
 			# a.out shared library search paths
 ldconfig_local_dirs="/usr/local/libdata/ldconfig"
diff --git a/etc/etc.amd64/ttys b/etc/etc.amd64/ttys
index ead05afb3c30..8268df3e994d 100644
--- a/etc/etc.amd64/ttys
+++ b/etc/etc.amd64/ttys
@@ -41,7 +41,7 @@ ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyu0	"/usr/libexec/getty std.9600"	vt100	onifconsole secure
+ttyu0	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
 ttyu1	"/usr/libexec/getty std.9600"	dialup	off secure
 ttyu2	"/usr/libexec/getty std.9600"	dialup	off secure
 ttyu3	"/usr/libexec/getty std.9600"	dialup	off secure
diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys
index ead05afb3c30..8268df3e994d 100644
--- a/etc/etc.i386/ttys
+++ b/etc/etc.i386/ttys
@@ -41,7 +41,7 @@ ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyu0	"/usr/libexec/getty std.9600"	vt100	onifconsole secure
+ttyu0	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
 ttyu1	"/usr/libexec/getty std.9600"	dialup	off secure
 ttyu2	"/usr/libexec/getty std.9600"	dialup	off secure
 ttyu3	"/usr/libexec/getty std.9600"	dialup	off secure
diff --git a/etc/etc.ia64/ttys b/etc/etc.ia64/ttys
deleted file mode 100644
index 6ddc77759cac..000000000000
--- a/etc/etc.ia64/ttys
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# $FreeBSD$
-#	@(#)ttys	5.1 (Berkeley) 4/17/89
-#
-# This file specifies various information about terminals on the system.
-# It is used by several different programs.  Common entries for the
-# various columns include:
-#
-# name  The name of the terminal device.
-#
-# getty The program to start running on the terminal.  Typically a
-#       getty program, as the name implies.  Other common entries
-#       include none, when no getty is needed, and xdm, to start the
-#       X Window System.
-#
-# type The initial terminal type for this port.  For hardwired
-#      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically xterm.
-#      Other common values include dialup for incoming modem ports, and
-#      unknown when the terminal type cannot be predetermined.
-#
-# status Must be on or off.  If on, init will run the getty program on
-#        the specified port.  If the word "secure" appears, this tty
-#        allows root login.
-#
-# name	getty				type	status		comments
-#
-# If console is marked "insecure", then init will ask for the root password
-# when going to single-user mode.
-console	none				unknown	off secure
-#
-ttyv0	"/usr/libexec/getty Pc"		xterm	off secure
-# Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		xterm	off secure
-ttyv2	"/usr/libexec/getty Pc"		xterm	off secure
-ttyv3	"/usr/libexec/getty Pc"		xterm	off secure
-ttyv4	"/usr/libexec/getty Pc"		xterm	off secure
-ttyv5	"/usr/libexec/getty Pc"		xterm	off secure
-ttyv6	"/usr/libexec/getty Pc"		xterm	off secure
-ttyv7	"/usr/libexec/getty Pc"		xterm	off secure
-ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
-# Serial terminals. The 'dialup' keyword identifies dialin lines to login,
-# fingerd etc.
-ttyu0	"/usr/libexec/getty 3wire"	vt100	on  secure
-ttyu1	"/usr/libexec/getty 3wire"	vt100	on  secure
-ttyu2	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyu3	"/usr/libexec/getty std.9600"	dialup	off secure
-# Dumb console
-dcons	"/usr/libexec/getty std.9600"	vt100	off secure
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 6b44bb40b105..44620132499a 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -34,8 +34,6 @@
         ..
         dma
         ..
-        gnats
-        ..
         gss
         ..
         mail
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 6425f5c515a2..3c561bba4079 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -21,6 +21,8 @@
     ..
     tests
         bin
+            chown
+            ..
             date
             ..
             mv
@@ -83,6 +85,12 @@
             ..
             libcrypt
             ..
+            libmp
+            ..
+            libnv
+            ..
+            libutil
+            ..
         ..
         libexec
             atf
@@ -91,6 +99,8 @@
                 atf-sh
                 ..
             ..
+            rtld-elf
+            ..
         ..
         sbin
             dhclient
@@ -253,6 +263,8 @@
             ..
             truncate
             ..
+            units
+            ..
             uudecode
             ..
             uuencode
@@ -260,6 +272,8 @@
             xargs
             ..
             yacc
+                yacc
+                ..
             ..
         ..
         usr.sbin
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 9c7071148559..084850014d04 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -301,8 +301,6 @@
             ..
             csh
             ..
-            cvsup
-            ..
             diskless
             ..
             dma
diff --git a/etc/network.subr b/etc/network.subr
index f841872a045b..f67622d51efd 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1058,7 +1058,7 @@ ifalias_af_common_handler()
 	# Process the last component if any.
 	if [ -n "$_tmpargs}" ]; then
 		case $_tmpargs in
-		${_af}\ *[0-9][a-f][A-F]-*)
+		${_af}\ *[0-9a-fA-F]-*)
 			ifalias_af_common_handler $_if $_af $_action \
 			`ifalias_expand_addr $_af $_action ${_tmpargs#${_af}\ }`
 		;;
@@ -1077,7 +1077,7 @@ ifalias_af_common_handler()
 ifalias_af_common()
 {
 	local _ret _if _af _action alias ifconfig_args _aliasn _c _tmpargs _iaf
-	local _punct=".-/+"
+	local _vif _punct=".-/+"
 
 	_ret=1
 	_aliasn=
@@ -1086,11 +1086,11 @@ ifalias_af_common()
 	_action=$3
 
 	# Normalize $_if before using it in a pattern to list_vars()
-	ltr "$_if" "$_punct" "_" _if
+	ltr "$_if" "$_punct" "_" _vif
 
 	# ifconfig_IF_aliasN which starts with $_af
-	for alias in `list_vars ifconfig_${_if}_alias[0-9]\* |
-		sort_lite -nk1.$((9+${#_if}+7))`
+	for alias in `list_vars ifconfig_${_vif}_alias[0-9]\* |
+		sort_lite -nk1.$((9+${#_vif}+7))`
 	do
 		eval ifconfig_args=\"\$$alias\"
 		_iaf=
@@ -1118,8 +1118,8 @@ ifalias_af_common()
 	# backward compatibility: ipv6_ifconfig_IF_aliasN.
 	case $_af in
 	inet6)
-		for alias in `list_vars ipv6_ifconfig_${_if}_alias[0-9]\* |
-			sort_lite -nk1.$((14+${#_if}+7))`
+		for alias in `list_vars ipv6_ifconfig_${_vif}_alias[0-9]\* |
+			sort_lite -nk1.$((14+${#_vif}+7))`
 		do
 			eval ifconfig_args=\"\$$alias\"
 			case ${_action}:"${ifconfig_args}" in
@@ -1129,7 +1129,7 @@ ifalias_af_common()
 			alias:*)
 				_aliasn="${_aliasn} inet6 ${ifconfig_args}"
 				warn "\$${alias} is obsolete. " \
-				    "Use ifconfig_$1_aliasN instead."
+				    "Use ifconfig_${_vif}_aliasN instead."
 			;;
 			esac
 		done
diff --git a/games/fortune/datfiles/fortunes b/games/fortune/datfiles/fortunes
index 790c39ee07a9..d7fecf4e2ccb 100644
--- a/games/fortune/datfiles/fortunes
+++ b/games/fortune/datfiles/fortunes
@@ -570,7 +570,7 @@ writing.  Always pick on the correct idiom.  The adverb always follows
 the verb.  Last but not least, avoid cliches like the plague; seek
 viable alternatives.
 %
-	      1/2
+	      1/3
 	 /\(3)
 	 |     2			  1/3
 	 |    z dz cos(3 * PI / 9) = ln (e   )
@@ -578,7 +578,7 @@ viable alternatives.
 	\/ 1
 
 The integral of z squared, dz
-From 1 to the square root of 3
+From 1 to the cube root of 3
 	Times the cosine
 	Of 3 PI over nine
 Is the log of the cube root of e
diff --git a/games/fortune/datfiles/freebsd-tips b/games/fortune/datfiles/freebsd-tips
index 5f9dd49eda3b..b984d100e906 100644
--- a/games/fortune/datfiles/freebsd-tips
+++ b/games/fortune/datfiles/freebsd-tips
@@ -231,10 +231,10 @@ is running FreeBSD at the time) to quickly find files based on name only.
 To erase a line you've written at the command prompt, use "Ctrl-U".
 		-- Dru <genesis@istar.ca>
 %
-To find out the hostname associated with an IP address, use
+To find the hostname associated with an IP address, use
 
-	dig -x IP_address
-		-- Dru <genesis@istar.ca>
+	drill -x IP_address
+		-- Allan Jude <allanjude@freebsd.org>
 %
 To obtain a neat PostScript rendering of a manual page, use ``-t'' switch
 of the man(1) utility: ``man -t <topic>''.  For example:
diff --git a/games/fortune/fortune/pathnames.h b/games/fortune/fortune/pathnames.h
index d777c6d38445..149b3e8d56b4 100644
--- a/games/fortune/fortune/pathnames.h
+++ b/games/fortune/fortune/pathnames.h
@@ -30,4 +30,5 @@
  *	$FreeBSD$
  */
 
-#define	FORTDIR		"/usr/share/games/fortune"
+#define	FORTDIR		"/usr/share/games/fortune:" \
+			"/usr/local/share/games/fortune"
diff --git a/games/grdc/Makefile b/games/grdc/Makefile
index 6b1d6ee8034a..73d395ae33df 100644
--- a/games/grdc/Makefile
+++ b/games/grdc/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	grdc
 MAN=	grdc.6
-DPADD=	${LIBNCURSES}
-LDADD=	-lncurses
+DPADD=	${LIBNCURSESW}
+LDADD=	-lncursesw
 
 .include <bsd.prog.mk>
diff --git a/games/morse/morse.6 b/games/morse/morse.6
index f0d30d7299f0..94645bbf5c7f 100644
--- a/games/morse/morse.6
+++ b/games/morse/morse.6
@@ -177,7 +177,7 @@ device file
 Sound support for
 .Nm
 added by
-.An Lyndon Nerenberg (VE6BBM) Aq lyndon@orthanc.ca .
+.An Lyndon Nerenberg (VE6BBM) Aq Mt lyndon@orthanc.ca .
 .Pp
 Ability to key an external device added by
 .An J\(:org Wunsch
diff --git a/games/random/random.6 b/games/random/random.6
index 54815766956c..bd38ba628ebb 100644
--- a/games/random/random.6
+++ b/games/random/random.6
@@ -117,7 +117,7 @@ instead of newlines.
 .Sh HISTORY
 The
 functionality to randomizing lines and words was added in 2003 by
-.An "Sean Chittenden" Aq seanc@FreeBSD.org .
+.An Sean Chittenden Aq Mt seanc@FreeBSD.org .
 .Sh BUGS
 No index is used when printing out tokens from the list which
 makes it rather slow for large files (10MB+).
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 2651eef5abdb..373c2805fd66 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -14,7 +14,7 @@ SUBDIR+= tests
 
 # libsupc++ uses libstdc++ headers, although 'make includes' should
 # have taken care of that already.
-.if ${MK_GNUCXX} != "no" && ${MK_CXX} != "no"
+.if ${MK_GNUCXX} != "no"
 SUBDIR+= libstdc++ libsupc++
 .endif
 
diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile
index 6ab5e87a1de4..dee77dfe5349 100644
--- a/gnu/lib/csu/Makefile
+++ b/gnu/lib/csu/Makefile
@@ -28,13 +28,6 @@ MKDEP=		-DCRT_BEGIN
 CFLAGS+=	-DTARGET_ARM_EABI
 .endif
 
-.if ${MACHINE_CPUARCH} == "ia64"
-BEGINSRC=	crtbegin.asm
-ENDSRC=		crtend.asm
-CFLAGS+=	-x assembler-with-cpp	# Ugly hack
-CFLAGS+=	-include osreldate.h
-.undef SRCS				# hack for 'make depend'
-.endif
 .if ${MACHINE_CPUARCH} == "powerpc"
 TGTOBJS=	crtsavres.o
 SRCS+=		crtsavres.asm
@@ -73,7 +66,7 @@ crtendS.o:	${ENDSRC}
 
 CLEANFILES+=	tm.h tconfig.h options.h optionlist cs-tconfig.h cs-tm.h
 tm.h tconfig.h options.h: ${CCDIR}/cc_tools/Makefile
-	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
+	(cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET})
 
 realinstall:
 .for file in ${OBJS} ${SOBJS} ${TGTOBJS}
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 11af4305edbb..f0e48349a7f5 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -137,17 +137,6 @@ LIB2FUNCS_EXTRA+= fixdfdi.c fixunssfsi.c
 .endif
 .endif
 
-.if ${TARGET_CPUARCH} == "ia64"
-#	from config/ia64/t-ia64
-LIB1ASMSRC   = lib1funcs.asm
-LIB1ASMFUNCS = __divxf3 __divdf3 __divsf3 \
-	__divdi3 __moddi3 __udivdi3 __umoddi3 \
-	__divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \
-	__nonlocal_goto __restore_stack_nonlocal __trampoline \
-	_fixtfdi _fixunstfdi _floatditf
-LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c
-.endif
-
 .if ${TARGET_ARCH} == "powerpc"
 #	from config/rs6000/t-ppccomm
 LIB2FUNCS_EXTRA = tramp.asm
@@ -317,7 +306,7 @@ ${_src:R:S/$/.So/}: ${_src} ${COMMONHDRS}
 # Generated headers
 #
 ${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
-	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
+	(cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET})
 
 CLEANFILES += ${COMMONHDRS}
 CLEANFILES += cs-*.h option*
diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile
index 5292f9f8d53f..e2b80744cf5f 100644
--- a/gnu/lib/libgcov/Makefile
+++ b/gnu/lib/libgcov/Makefile
@@ -46,7 +46,7 @@ COMMONHDRS=	tm.h tconfig.h gcov-iov.h options.h
 CLEANFILES+=	${COMMONHDRS} cs-tm.h cs-tconfig.h options.h optionlist
 
 ${COMMONHDRS}: ${.CURDIR}/../../usr.bin/cc/cc_tools/Makefile
-	${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET}
+	(cd ${.CURDIR}; ${MAKE} -f ${.ALLSRC} MFILE=${.ALLSRC} GCCDIR=${GCCDIR} ${.TARGET})
 
 ${OBJS} beforedepend: ${COMMONHDRS}
 
diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile
index 637dcc8a5733..c2bfa6697312 100644
--- a/gnu/lib/libreadline/Makefile
+++ b/gnu/lib/libreadline/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR = history readline
+SUBDIR = readline
 
 .include <bsd.subdir.mk>
diff --git a/gnu/lib/libreadline/history/Makefile b/gnu/lib/libreadline/history/Makefile
deleted file mode 100644
index 16028728db2f..000000000000
--- a/gnu/lib/libreadline/history/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= doc
-
-LIB=    history
-MAN=    rlhistory.3
-
-SRCS= $(HISTSRC) xmalloc.c
-
-rlhistory.3: doc/history.3
-	cp -f ${.ALLSRC} ${.TARGET}
-
-CLEANFILES+= rlhistory.3
-
-.include <bsd.lib.mk>
diff --git a/gnu/lib/libreadline/history/doc/Makefile b/gnu/lib/libreadline/history/doc/Makefile
deleted file mode 100644
index 4b050e75ad92..000000000000
--- a/gnu/lib/libreadline/history/doc/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
-
-INFO = history
-
-INFOSECTION= "Programming & development tools."
-INFOENTRY_history= "* History: (history).		The GNU History library."
-
-history.info: history.texi hstech.texi hsuser.texi version.texi fdl.texi
-
-.include <bsd.info.mk>
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index fab4aa230513..f09e9432a5fa 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
-SUBDIR= doc
-
 LIB=    readline
-MAN=    doc/readline.3
-SHLIBDIR?=	/lib
+INTERNALLIB=	yes
+NO_MAN=	yes
 
 TILDESRC= tilde.c
 SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
@@ -15,13 +13,17 @@ SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
 INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
 		   rlstdc.h rlconf.h rltypedefs.h
 
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
+CFLAGS+=	-I${.OBJDIR}/..
+SRCDIR=	${.CURDIR}/../../../../contrib/libreadline
 
-INCSDIR=${INCLUDEDIR}/readline
-
-.for hdr in ${INSTALLED_HEADERS}
-INCS+=	${SRCDIR}/${hdr}
+.for _h in ${INSTALLED_HEADERS}
+CLEANFILES+=	${_h}
+DPSRCS+=	${.OBJDIR}/${_h}
+${.OBJDIR}/${_h}:	${SRCDIR}/${_h}
+	${INSTALL} ${.ALLSRC} ${.TARGET}
 .endfor
 
+DPADD=	${LIBTERMCAPW}
+LDADD=	-ltermcapw
+
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libreadline/readline/doc/Makefile b/gnu/lib/libreadline/readline/doc/Makefile
deleted file mode 100644
index 70289718f5e9..000000000000
--- a/gnu/lib/libreadline/readline/doc/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
-
-INFO = readline rluserman
-
-INFOSECTION= "Programming & development tools."
-INFOENTRY_readline= "* Readline: (readline).		The GNU Readline library"
-INFOENTRY_rluserman= "* Readline: (readline).       The GNU readline library API"
-
-CLEANFILES += readline.texi
-
-readline.info: rlman.texi rluser.texi rltech.texi version.texi fdl.texi
-
-readline.texi: rlman.texi
-	cp -f ${SRCDIR}/rlman.texi ${.TARGET}
-
-rluserman.info: rluserman.texi version.texi rluser.texi fdl.texi
-
-.include <bsd.info.mk>
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 76330699dffa..7b1482d53593 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -14,7 +14,6 @@ SUBDIR= ${_binutils} \
 	${_groff} \
 	${_rcs} \
 	sdiff \
-	send-pr \
 	${_tests} \
 	${_texinfo}
 
diff --git a/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h b/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h
deleted file mode 100644
index a0a6360d68e0..000000000000
--- a/gnu/usr.bin/binutils/as/ia64-freebsd/targ-cpu.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $FreeBSD$ */
-
-#include "tc-ia64.h"
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 81a46d5d21b0..6c59945808a2 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -5,10 +5,6 @@
 
 .PATH: ${SRCDIR}/ld
 
-.if ${TARGET_ARCH} == "ia64"
-CFLAGS+= -O1
-.endif
-
 PROG=	ld
 SCRIPTDIR= /usr/libdata/ldscripts
 SRCS+=	ldcref.c \
diff --git a/gnu/usr.bin/binutils/ld/Makefile.ia64 b/gnu/usr.bin/binutils/ld/Makefile.ia64
deleted file mode 100644
index 50a7bb63a63b..000000000000
--- a/gnu/usr.bin/binutils/ld/Makefile.ia64
+++ /dev/null
@@ -1,24 +0,0 @@
-# $FreeBSD$
-
-NATIVE_EMULATION= elf64_ia64_fbsd
-
-SRCS+=		e${NATIVE_EMULATION}.c
-CLEANFILES+=	e${NATIVE_EMULATION}.c
-e${NATIVE_EMULATION}.c: ${.CURDIR}/${NATIVE_EMULATION}.sh emultempl/elf32.em \
-    scripttempl/elf.sc genscripts.sh stringify.sed
-	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSEARCHPATH} \
-	    ${TOOLS_PREFIX}/usr \
-	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
-	    ${NATIVE_EMULATION} "" no ${NATIVE_EMULATION} ${TARGET_TUPLE} \
-	    ${.CURDIR}/${NATIVE_EMULATION}.sh
-
-#XXX	EMS+=	eelf64_ia64
-
-SRCS+=	eelf64_ia64.c
-CLEANFILES+=	eelf64_ia64.c
-eelf64_ia64.c: emulparams/elf64_ia64.sh emultempl/elf32.em \
-    scripttempl/elf.sc genscripts.sh stringify.sed
-	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSEARCHPATH} \
-	    ${TOOLS_PREFIX}/usr \
-	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
-	    elf64_ia64 "" no elf64_ia64 ${TARGET_TUPLE}
diff --git a/gnu/usr.bin/binutils/ld/elf64_ia64_fbsd.sh b/gnu/usr.bin/binutils/ld/elf64_ia64_fbsd.sh
deleted file mode 100644
index 213b494736f5..000000000000
--- a/gnu/usr.bin/binutils/ld/elf64_ia64_fbsd.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-. ${srcdir}/emulparams/elf64_ia64.sh
-TEXT_START_ADDR="0x0000000100000000"
-unset DATA_ADDR
-unset SMALL_DATA_CTOR
-unset SMALL_DATA_DTOR
-. ${srcdir}/emulparams/elf_fbsd.sh
-OUTPUT_FORMAT="elf64-ia64-freebsd"
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 1493ccf07e8e..a24dd045bec5 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -42,7 +42,7 @@ SRCS+=	archive.c \
 	targets.c \
 	targmatch.h \
 	tekhex.c
-.if (${TARGET_ARCH} == "ia64" || ${TARGET_ARCH} == "sparc64")
+.if ${TARGET_ARCH} == "sparc64"
 WARNS?=	2
 .endif
 CFLAGS+= -D_GNU_SOURCE
@@ -84,7 +84,7 @@ bfdver.h: Makefile
 	echo '#define BFD_VERSION	217500000'	> ${.TARGET}
 	echo '#define BFD_VERSION_DATE	20070703'	>> ${.TARGET}
 	echo '#define BFD_VERSION_STRING ${VERSION}'	>> ${.TARGET}
-	echo '#define REPORT_BUGS_TO "<http://www.freebsd.org/send-pr.html>"' >> ${.TARGET}
+	echo '#define REPORT_BUGS_TO "<http://www.freebsd.org/support.html>"' >> ${.TARGET}
 
 targmatch.h: targmatch.sed config.bfd
 	sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.ia64 b/gnu/usr.bin/binutils/libbfd/Makefile.ia64
deleted file mode 100644
index 2e489bcc62e5..000000000000
--- a/gnu/usr.bin/binutils/libbfd/Makefile.ia64
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-
-DEFAULT_VECTOR=	bfd_elf64_ia64_freebsd_vec
-
-SRCS+=	cofflink.c \
-	cpu-ia64.c \
-	efi-app-ia64.c \
-	elf32.c \
-	elf32-gen.c \
-	elf32-target.h \
-	elf64.c \
-	elf64-gen.c \
-	elf64-ia64.c \
-	elf64-target.h \
-	elflink.c \
-	pepigen.c \
-	pex64igen.c
-
-VECS+=	${DEFAULT_VECTOR} \
-	bfd_efi_app_ia64_vec \
-	bfd_elf64_ia64_little_vec \
-	bfd_elf64_ia64_big_vec \
-	bfd_elf64_little_generic_vec bfd_elf64_big_generic_vec \
-	bfd_elf32_little_generic_vec bfd_elf32_big_generic_vec
-
-CLEANFILES+=	elf64-ia64.c pepigen.c pex64igen.c
-
-elf64-ia64.c: elfxx-ia64.c
-	sed -e s/NN/64/g ${.ALLSRC} > ${.TARGET}
-
-pepigen.c: peXXigen.c
-	sed -e s/XX/pep/g ${.ALLSRC} > ${.TARGET}
-
-pex64igen.c: peXXigen.c
-	sed -e s/XX/pex64/g ${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/binutils/libbfd/bfd.h b/gnu/usr.bin/binutils/libbfd/bfd.h
index c9dfef54ae26..f65123351d7c 100644
--- a/gnu/usr.bin/binutils/libbfd/bfd.h
+++ b/gnu/usr.bin/binutils/libbfd/bfd.h
@@ -85,7 +85,7 @@ extern "C" {
 #define BFD_HOST_64BIT_LONG 0
 #define BFD_HOST_64_BIT long long
 #define BFD_HOST_U_64_BIT unsigned long long
-#elif defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__ia64__)
+#elif defined(__alpha__) || defined(__sparc64__) || defined(__amd64__)
 #define BFD_HOST_64BIT_LONG 1
 #define BFD_HOST_64_BIT long
 #define BFD_HOST_U_64_BIT unsigned long
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.ia64 b/gnu/usr.bin/binutils/libopcodes/Makefile.ia64
deleted file mode 100644
index 98198cdea109..000000000000
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.ia64
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-SRCS+=	ia64-dis.c ia64-opc.c
-CFLAGS+= -DARCH_ia64
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index 313aaf2da84f..8191ea412a4b 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -12,12 +12,7 @@ SUBDIR+= cpp
 .endif
 
 .if ${MK_CXX} != "no"
-.if ${MK_GNUCXX} != "no"
-SUBDIR+= cc1plus c++ 
-.endif
-# This should be moved into the above block once c++filt from elftoolchain or
-# similar is provided.
-SUBDIR+= c++filt
+SUBDIR+= cc1plus c++ c++filt
 .endif
 
 .if ${MK_GCOV} != "no"
diff --git a/gnu/usr.bin/cc/Makefile.tgt b/gnu/usr.bin/cc/Makefile.tgt
index 48cc774291f3..ee5a7946452c 100644
--- a/gnu/usr.bin/cc/Makefile.tgt
+++ b/gnu/usr.bin/cc/Makefile.tgt
@@ -11,9 +11,6 @@ TARGET_CPUARCH=${MACHINE_CPUARCH}
 TARGET_ARCH?=	${MACHINE_ARCH}
 GCC_CPU=${TARGET_CPUARCH:C/amd64/i386/:C/powerpc/rs6000/:C/sparc64/sparc/}
 
-.if ${TARGET_ARCH} == "ia64"
-TARGET_CPU_DEFAULT= MASK_GNU_AS|MASK_GNU_LD
-.endif
 .if ${TARGET_ARCH} == "sparc64"
 TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc
 .endif
diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile
index c48975e8f307..48060ecc7750 100644
--- a/gnu/usr.bin/cc/include/Makefile
+++ b/gnu/usr.bin/cc/include/Makefile
@@ -12,8 +12,6 @@ INCSDIR=${INCLUDEDIR}/gcc/${GCCVER}
 INCS=	ammintrin.h emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h \
 	tmmintrin.h xmmintrin.h mm_malloc.h
 INCS+=	wmmintrin.h __wmmintrin_aes.h __wmmintrin_pclmul.h
-.elif ${TARGET_ARCH} == "ia64"
-INCS=	ia64intrin.h
 .elif ${TARGET_ARCH} == "arm"
 INCS=	mmintrin.h
 .elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc
index 6679022a1bde..c5057ca9c2e1 100644
--- a/gnu/usr.bin/gdb/Makefile.inc
+++ b/gnu/usr.bin/gdb/Makefile.inc
@@ -15,6 +15,7 @@ CNTRB_RL= ${CNTRB_ROOT}/libreadline
 OBJ_ROOT= ${.OBJDIR}/../..
 OBJ_BU= ${OBJ_ROOT}/binutils
 OBJ_GDB= ${OBJ_ROOT}/gdb
+OBJ_RL= ${OBJ_ROOT}/../lib/libreadline/readline
 
 # These assignments duplicate much of the functionality of
 # MACHINE_CPUARCH, but there's no easy way to export make functions...
@@ -46,6 +47,7 @@ CFLAGS+= -I${CNTRB_GDB}/gdb/config
 CFLAGS+= -I${CNTRB_BU}/include
 CFLAGS+= -I${CNTRB_GDB}/include
 CFLAGS+= -I${CNTRB_BU}/bfd
+CFLAGS+= -I${OBJ_RL}/..
 
 GENSRCS+= nm.h tm.h
 
diff --git a/gnu/usr.bin/gdb/arch/ia64/Makefile b/gnu/usr.bin/gdb/arch/ia64/Makefile
deleted file mode 100644
index 2fe489999cd5..000000000000
--- a/gnu/usr.bin/gdb/arch/ia64/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-.if !defined(GDB_CROSS_DEBUGGER)
-LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c
-LIBSRCS+= ia64-fbsd-nat.c
-.endif
-LIBSRCS+= solib.c solib-svr4.c
-LIBSRCS+= ia64-fbsd-tdep.c ia64-tdep.c
-
-nm.h:
-	echo '#include "ia64/nm-fbsd.h"' > ${.TARGET}
-
-tm.h:
-	echo '#include "ia64/tm-fbsd.h"' > ${.TARGET}
diff --git a/gnu/usr.bin/gdb/arch/ia64/config.h b/gnu/usr.bin/gdb/arch/ia64/config.h
deleted file mode 100644
index 4cc29f9e7363..000000000000
--- a/gnu/usr.bin/gdb/arch/ia64/config.h
+++ /dev/null
@@ -1,550 +0,0 @@
-/* $FreeBSD$ */
-
-/* config.h.  Generated automatically by configure.  */
-/* config.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
-
-/* Define if using alloca.c.  */
-/* #undef C_ALLOCA */
-
-/* Define to empty if the keyword does not work.  */
-/* #undef const */
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define if you have alloca, as a function or macro.  */
-#define HAVE_ALLOCA 1
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define if the `long double' type works.  */
-#define HAVE_LONG_DOUBLE 1
-
-/* Define if you have a working `mmap' system call.  */
-#define HAVE_MMAP 1
-
-/* Define if you have <vfork.h>.  */
-/* #undef HAVE_VFORK_H */
-
-/* Define as __inline if that's what the C compiler calls it.  */
-/* #undef inline */
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-/* #undef off_t */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
-
-/* Define if you need to in order for stat and other things to work.  */
-/* #undef _POSIX_SOURCE */
-
-/* Define as the return type of signal handlers (int or void).  */
-#define RETSIGTYPE void
-
-/* Define if the `setpgrp' function takes no argument.  */
-/* #undef SETPGRP_VOID */
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-/* #undef size_t */
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-/* #undef STACK_DIRECTION */
-
-/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define vfork as fork if vfork does not work.  */
-/* #undef vfork */
-
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-/* Define if your struct reg has r_fs.  */
-/* #undef HAVE_STRUCT_REG_R_FS */
-
-/* Define if your struct stat has st_blocks.  */
-#define HAVE_STRUCT_STAT_ST_BLOCKS 1
-
-/* Define if your struct reg has r_gs.  */
-/* #undef HAVE_STRUCT_REG_R_GS */
-
-/* Define if <link.h> exists and defines struct link_map which has
-   members with an ``l_'' prefix.  (For Solaris, SVR4, and
-   SVR4-like systems.) */
-#define HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS 1
-
-/* Define if <link.h> exists and defines struct link_map which has
-  members with an ``lm_'' prefix.  (For SunOS.)  */
-/* #undef HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS */
-
-/* Define if <link.h> exists and defines a struct so_map which has
-  members with an ``som_'' prefix.  (Found on older *BSD systems.)  */
-/* #undef HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS */
-
-/* Define if <sys/link.h> has struct link_map32 */
-/* #undef HAVE_STRUCT_LINK_MAP32 */
-
-/* Define if <sys/link.h> has link_map32 (solaris sparc-64 target) */
-/* #undef _SYSCALL32 */
-
-/* Define if the prfpregset_t type is broken. */
-/* #undef PRFPREGSET_T_BROKEN */
-
-/* Define if you want to use new multi-fd /proc interface
-   (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros). */
-/* #undef NEW_PROC_API */
-
-/* Define if ioctl argument PIOCSET is available. */
-/* #undef HAVE_PROCFS_PIOCSET */
-
-/* Define if the `long long' type works.  */
-#define CC_HAS_LONG_LONG 1
-
-/* Define if the "ll" format works to print long long ints. */
-#define PRINTF_HAS_LONG_LONG 1
-
-/* Define if the "%Lg" format works to print long doubles. */
-#define PRINTF_HAS_LONG_DOUBLE 1
-
-/* Define if the "%Lg" format works to scan long doubles. */
-#define SCANF_HAS_LONG_DOUBLE 1
-
-/* Define if using Solaris thread debugging.  */
-/* #undef HAVE_THREAD_DB_LIB */
-
-/* Define on a GNU/Linux system to work around problems in sys/procfs.h.  */
-/* #undef START_INFERIOR_TRAPS_EXPECTED */
-/* #undef sys_quotactl */
-
-/* Define if you have HPUX threads */
-/* #undef HAVE_HPUX_THREAD_SUPPORT */
-
-/* Define if <proc_service.h> on solaris uses int instead of
-   size_t, and assorted other type changes. */
-/* #undef PROC_SERVICE_IS_OLD */
-
-/* Define if the simulator is being linked in.  */
-#define WITH_SIM 1
-
-/* Set to true if the save_state_t structure is present */
-/* #undef HAVE_STRUCT_SAVE_STATE_T */
-
-/* Set to true if the save_state_t structure has the ss_wide member */
-/* #undef HAVE_STRUCT_MEMBER_SS_WIDE */
-
-/* Define if <sys/ptrace.h> defines the PTRACE_GETREGS request.  */
-/* #undef HAVE_PTRACE_GETREGS */
-
-/* Define if <sys/ptrace.h> defines the PTRACE_GETFPXREGS request.  */
-/* #undef HAVE_PTRACE_GETFPXREGS */
-
-/* Define if <sys/ptrace.h> defines the PT_GETDBREGS request.  */
-#define HAVE_PT_GETDBREGS 1
-
-/* Define if <sys/ptrace.h> defines the PT_GETXMMREGS request.  */
-/* #undef HAVE_PT_GETXMMREGS */
-
-/* Define if libunwind library is being used.  */
-/* #undef HAVE_LIBUNWIND */
-
-/* hostfile */
-/* #undef GDB_XM_FILE */
-
-/* targetfile */
-#define GDB_TM_FILE config/ia64/tm-fbsd.h
-
-/* nativefile */
-#ifndef CROSS_DEBUGGER
-#define GDB_NM_FILE config/ia64/nm-fbsd.h
-#endif
-
-/* Define to 1 so <sys/proc.h> gets a definition of anon_hdl.  Works
-   around a <sys/proc.h> problem on IRIX 5.  */
-#ifndef _KMEMUSER
-/* #undef _KMEMUSER */
-#endif
-
-/* Define if you have the __argz_count function.  */
-/* #undef HAVE___ARGZ_COUNT */
-
-/* Define if you have the __argz_next function.  */
-/* #undef HAVE___ARGZ_NEXT */
-
-/* Define if you have the __argz_stringify function.  */
-/* #undef HAVE___ARGZ_STRINGIFY */
-
-/* Define if you have the _mcleanup function.  */
-#define HAVE__MCLEANUP 1
-
-/* Define if you have the canonicalize_file_name function.  */
-/* #undef HAVE_CANONICALIZE_FILE_NAME */
-
-/* Define if you have the dcgettext function.  */
-/* #undef HAVE_DCGETTEXT */
-
-/* Define if you have the getcwd function.  */
-#define HAVE_GETCWD 1
-
-/* Define if you have the getpagesize function.  */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if you have the monstartup function.  */
-#define HAVE_MONSTARTUP 1
-
-/* Define if you have the munmap function.  */
-#define HAVE_MUNMAP 1
-
-/* Define if you have the poll function.  */
-#define HAVE_POLL 1
-
-/* Define if you have the pread64 function.  */
-/* #undef HAVE_PREAD64 */
-
-/* Define if you have the putenv function.  */
-#define HAVE_PUTENV 1
-
-/* Define if you have the realpath function.  */
-#define HAVE_REALPATH 1
-
-/* Define if you have the sbrk function.  */
-#define HAVE_SBRK 1
-
-/* Define if you have the setenv function.  */
-#define HAVE_SETENV 1
-
-/* Define if you have the setlocale function.  */
-#define HAVE_SETLOCALE 1
-
-/* Define if you have the setpgid function.  */
-#define HAVE_SETPGID 1
-
-/* Define if you have the setpgrp function.  */
-#define HAVE_SETPGRP 1
-
-/* Define if you have the sigaction function.  */
-#define HAVE_SIGACTION 1
-
-/* Define if you have the sigprocmask function.  */
-#define HAVE_SIGPROCMASK 1
-
-/* Define if you have the sigsetmask function.  */
-#define HAVE_SIGSETMASK 1
-
-/* Define if you have the socketpair function.  */
-#define HAVE_SOCKETPAIR 1
-
-/* Define if you have the stpcpy function.  */
-#define HAVE_STPCPY 1
-
-/* Define if you have the strcasecmp function.  */
-#define HAVE_STRCASECMP 1
-
-/* Define if you have the strchr function.  */
-#define HAVE_STRCHR 1
-
-/* Define if you have the syscall function.  */
-#define HAVE_SYSCALL 1
-
-/* Define if you have the <argz.h> header file.  */
-/* #undef HAVE_ARGZ_H */
-
-/* Define if you have the <ctype.h> header file.  */
-#define HAVE_CTYPE_H 1
-
-/* Define if you have the <curses.h> header file.  */
-#define HAVE_CURSES_H 1
-
-/* Define if you have the <dirent.h> header file.  */
-#define HAVE_DIRENT_H 1
-
-/* Define if you have the <libunwind-ia64.h> header file.  */
-/* #undef HAVE_LIBUNWIND_IA64_H */
-
-/* Define if you have the <libunwind.h> header file.  */
-/* #undef HAVE_LIBUNWIND_H */
-
-/* Define if you have the <limits.h> header file.  */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <link.h> header file.  */
-#define HAVE_LINK_H 1
-
-/* Define if you have the <locale.h> header file.  */
-#define HAVE_LOCALE_H 1
-
-/* Define if you have the <machine/reg.h> header file.  */
-#define HAVE_MACHINE_REG_H 1
-
-/* Define if you have the <malloc.h> header file.  */
-/* #undef HAVE_MALLOC_H */
-
-/* Define if you have the <memory.h> header file.  */
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the <ncurses.h> header file.  */
-#define HAVE_NCURSES_H 1
-
-/* Define if you have the <ndir.h> header file.  */
-/* #undef HAVE_NDIR_H */
-
-/* Define if you have the <nl_types.h> header file.  */
-#define HAVE_NL_TYPES_H 1
-
-/* Define if you have the <nlist.h> header file.  */
-#define HAVE_NLIST_H 1
-
-/* Define if you have the <poll.h> header file.  */
-#define HAVE_POLL_H 1
-
-/* Define if you have the <proc_service.h> header file.  */
-/* #undef HAVE_PROC_SERVICE_H */
-
-/* Define if you have the <ptrace.h> header file.  */
-/* #undef HAVE_PTRACE_H */
-
-/* Define if you have the <sgtty.h> header file.  */
-#define HAVE_SGTTY_H 1
-
-/* Define if you have the <stddef.h> header file.  */
-#define HAVE_STDDEF_H 1
-
-/* Define if you have the <stdint.h> header file.  */
-#define HAVE_STDINT_H 1
-
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <strings.h> header file.  */
-#define HAVE_STRINGS_H 1
-
-/* Define if you have the <sys/debugreg.h> header file.  */
-/* #undef HAVE_SYS_DEBUGREG_H */
-
-/* Define if you have the <sys/dir.h> header file.  */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define if you have the <sys/fault.h> header file.  */
-/* #undef HAVE_SYS_FAULT_H */
-
-/* Define if you have the <sys/file.h> header file.  */
-#define HAVE_SYS_FILE_H 1
-
-/* Define if you have the <sys/filio.h> header file.  */
-#define HAVE_SYS_FILIO_H 1
-
-/* Define if you have the <sys/ioctl.h> header file.  */
-#define HAVE_SYS_IOCTL_H 1
-
-/* Define if you have the <sys/ndir.h> header file.  */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define if you have the <sys/param.h> header file.  */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define if you have the <sys/poll.h> header file.  */
-#define HAVE_SYS_POLL_H 1
-
-/* Define if you have the <sys/proc.h> header file.  */
-#define HAVE_SYS_PROC_H 1
-
-/* Define if you have the <sys/procfs.h> header file.  */
-#define HAVE_SYS_PROCFS_H 1
-
-/* Define if you have the <sys/ptrace.h> header file.  */
-#define HAVE_SYS_PTRACE_H 1
-
-/* Define if you have the <sys/reg.h> header file.  */
-/* #undef HAVE_SYS_REG_H */
-
-/* Define if you have the <sys/select.h> header file.  */
-#define HAVE_SYS_SELECT_H 1
-
-/* Define if you have the <sys/syscall.h> header file.  */
-#define HAVE_SYS_SYSCALL_H 1
-
-/* Define if you have the <sys/user.h> header file.  */
-#define HAVE_SYS_USER_H 1
-
-/* Define if you have the <sys/wait.h> header file.  */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define if you have the <term.h> header file.  */
-#define HAVE_TERM_H 1
-
-/* Define if you have the <termio.h> header file.  */
-/* #undef HAVE_TERMIO_H */
-
-/* Define if you have the <termios.h> header file.  */
-#define HAVE_TERMIOS_H 1
-
-/* Define if you have the <thread_db.h> header file.  */
-/* #undef HAVE_THREAD_DB_H */
-
-/* Define if you have the <time.h> header file.  */
-#define HAVE_TIME_H 1
-
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-
-/* Define if you have the <values.h> header file.  */
-/* #undef HAVE_VALUES_H */
-
-/* Define if you have the <wait.h> header file.  */
-/* #undef HAVE_WAIT_H */
-
-/* Define if you have the dl library (-ldl).  */
-/* #undef HAVE_LIBDL */
-
-/* Define if you have the m library (-lm).  */
-#define HAVE_LIBM 1
-
-/* Define if you have the w library (-lw).  */
-/* #undef HAVE_LIBW */
-
-/* Define if you have the stpcpy function */
-#define HAVE_STPCPY 1
-
-/* Define if your locale.h file contains LC_MESSAGES. */
-#define HAVE_LC_MESSAGES 1
-
-/* Define to 1 if NLS is requested */
-/* #undef ENABLE_NLS */
-
-/* Define as 1 if you have gettext and don't want to use GNU gettext. */
-/* #undef HAVE_GETTEXT */
-
-/* Name of this package.  */
-#define PACKAGE "gdb"
-
-/* Define to BFD's default architecture.  */
-#define DEFAULT_BFD_ARCH bfd_ia64_arch
-
-/* Define to BFD's default target vector.  */
-#define DEFAULT_BFD_VEC bfd_elf64_ia64_little_vec
-
-/* Define to 1 if your system has the _etext variable.  */
-#define HAVE__ETEXT 1
-
-/* Define to 1 to avoid a clash between <widec.h> and <wchar.h> on
-   Solaris 2.[78] when using GCC.  */
-/* #undef _MSE_INT_H */
-
-/* Define to 1 if we found this declaration otherwise define to 0. */
-#define HAVE_DECL_GETOPT 0
-
-/* Define if sigsetjmp is available.  */
-#define HAVE_SIGSETJMP 1
-
-/* Define to 1 if the regex included in libiberty should be used. */
-#define USE_INCLUDED_REGEX 1
-
-/* Define to 1 if your system has struct reg in <machine/reg.h>. */
-#define HAVE_STRUCT_REG 1
-
-/* Define if <stdint.h> provides the uintptr_t type. */
-#define HAVE_UINTPTR_T 1
-
-/* Define if malloc is not declared in system header files. */
-/* #undef NEED_DECLARATION_MALLOC */
-
-/* Define if realloc is not declared in system header files. */
-/* #undef NEED_DECLARATION_REALLOC */
-
-/* Define if free is not declared in system header files. */
-/* #undef NEED_DECLARATION_FREE */
-
-/* Define if strerror is not declared in system header files. */
-/* #undef NEED_DECLARATION_STRERROR */
-
-/* Define if strdup is not declared in system header files. */
-/* #undef NEED_DECLARATION_STRDUP */
-
-/* Define if strstr is not declared in system header files. */
-/* #undef NEED_DECLARATION_STRSTR */
-
-/* Define if canonicalize_file_name is not declared in system header files. */
-#define NEED_DECLARATION_CANONICALIZE_FILE_NAME 1
-
-/* Define if <sys/procfs.h> has pstatus_t. */
-/* #undef HAVE_PSTATUS_T */
-
-/* Define if <sys/procfs.h> has prrun_t. */
-/* #undef HAVE_PRRUN_T */
-
-/* Define if <sys/procfs.h> has gregset_t. */
-#define HAVE_GREGSET_T 1
-
-/* Define if <sys/procfs.h> has fpregset_t. */
-#define HAVE_FPREGSET_T 1
-
-/* Define if <sys/procfs.h> has prgregset_t. */
-#define HAVE_PRGREGSET_T 1
-
-/* Define if <sys/procfs.h> has prfpregset_t. */
-#define HAVE_PRFPREGSET_T 1
-
-/* Define if <sys/procfs.h> has prgregset32_t. */
-/* #undef HAVE_PRGREGSET32_T */
-
-/* Define if <sys/procfs.h> has prfpregset32_t. */
-/* #undef HAVE_PRFPREGSET32_T */
-
-/* Define if <sys/procfs.h> has lwpid_t. */
-#define HAVE_LWPID_T 1
-
-/* Define if <sys/procfs.h> has psaddr_t. */
-#define HAVE_PSADDR_T 1
-
-/* Define if <sys/procfs.h> has prsysent_t. */
-/* #undef HAVE_PRSYSENT_T */
-
-/* Define if <sys/procfs.h> has pr_sigset_t. */
-/* #undef HAVE_PR_SIGSET_T */
-
-/* Define if <sys/procfs.h> has pr_sigaction64_t. */
-/* #undef HAVE_PR_SIGACTION64_T */
-
-/* Define if <sys/procfs.h> has pr_siginfo64_t. */
-/* #undef HAVE_PR_SIGINFO64_T */
-
-/* Define if <thread_db.h> has the TD_NOTALLOC error code. */
-/* #undef THREAD_DB_HAS_TD_NOTALLOC */
-
-/* Define if we can use the tkill syscall. */
-/* #undef HAVE_TKILL_SYSCALL */
-
-/* Define to the default OS ABI for this configuration. */
-/* #undef GDB_OSABI_DEFAULT */
-
-/* Define to be a string naming the default host character set. */
-#define GDB_DEFAULT_HOST_CHARSET "ISO-8859-1"
-
-/* Define if you have the iconv() function. */
-/* #undef HAVE_ICONV */
-
-/* Define as const if the declaration of iconv() needs const. */
-/* #undef ICONV_CONST */
-
diff --git a/gnu/usr.bin/gdb/arch/ia64/init.c b/gnu/usr.bin/gdb/arch/ia64/init.c
deleted file mode 100644
index ee383e9c96f6..000000000000
--- a/gnu/usr.bin/gdb/arch/ia64/init.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/* $FreeBSD$ */
-
-/* Do not modify this file.  */
-/* It is created automatically by the Makefile.  */
-#include "defs.h"      /* For initialize_file_ftype.  */
-#include "call-cmds.h" /* For initialize_all_files.  */
-extern initialize_file_ftype _initialize_gdbtypes;
-extern initialize_file_ftype _initialize_corelow;
-extern initialize_file_ftype _initialize_ia64_fbsd_tdep;
-extern initialize_file_ftype _initialize_ia64_tdep;
-extern initialize_file_ftype _initialize_solib;
-extern initialize_file_ftype _initialize_svr4_solib;
-extern initialize_file_ftype _initialize_ser_hardwire;
-extern initialize_file_ftype _initialize_ser_pipe;
-extern initialize_file_ftype _initialize_ser_tcp;
-extern initialize_file_ftype _initialize_fbsd_proc;
-extern initialize_file_ftype _initialize_gcore;
-extern initialize_file_ftype _initialize_thread_db;
-extern initialize_file_ftype _initialize_ia64_fbsd_nat;
-extern initialize_file_ftype _initialize_kernel_u_addr;
-extern initialize_file_ftype _initialize_infptrace;
-extern initialize_file_ftype _initialize_inftarg;
-extern initialize_file_ftype _initialize_remote;
-extern initialize_file_ftype _initialize_dcache;
-extern initialize_file_ftype _initialize_sr_support;
-extern initialize_file_ftype _initialize_tracepoint;
-extern initialize_file_ftype _initialize_ax_gdb;
-extern initialize_file_ftype _initialize_annotate;
-extern initialize_file_ftype _initialize_auxv;
-extern initialize_file_ftype _initialize_breakpoint;
-extern initialize_file_ftype _initialize_regcache;
-extern initialize_file_ftype _initialize_charset;
-extern initialize_file_ftype _initialize_dummy_frame;
-extern initialize_file_ftype _initialize_source;
-extern initialize_file_ftype _initialize_values;
-extern initialize_file_ftype _initialize_valops;
-extern initialize_file_ftype _initialize_valarith;
-extern initialize_file_ftype _initialize_valprint;
-extern initialize_file_ftype _initialize_printcmd;
-extern initialize_file_ftype _initialize_symtab;
-extern initialize_file_ftype _initialize_symfile;
-extern initialize_file_ftype _initialize_symmisc;
-extern initialize_file_ftype _initialize_infcall;
-extern initialize_file_ftype _initialize_infcmd;
-extern initialize_file_ftype _initialize_infrun;
-extern initialize_file_ftype _initialize_stack;
-extern initialize_file_ftype _initialize_thread;
-extern initialize_file_ftype _initialize_interpreter;
-extern initialize_file_ftype _initialize_macrocmd;
-extern initialize_file_ftype _initialize_gdbarch;
-extern initialize_file_ftype _initialize_gdbarch_utils;
-extern initialize_file_ftype _initialize_gdb_osabi;
-extern initialize_file_ftype _initialize_copying;
-extern initialize_file_ftype _initialize_mem;
-extern initialize_file_ftype _initialize_parse;
-extern initialize_file_ftype _initialize_language;
-extern initialize_file_ftype _initialize_frame_reg;
-extern initialize_file_ftype _initialize_signals;
-extern initialize_file_ftype _initialize_kod;
-extern initialize_file_ftype _initialize_gdb_events;
-extern initialize_file_ftype _initialize_exec;
-extern initialize_file_ftype _initialize_maint_cmds;
-extern initialize_file_ftype _initialize_demangler;
-extern initialize_file_ftype _initialize_dbxread;
-extern initialize_file_ftype _initialize_coffread;
-extern initialize_file_ftype _initialize_elfread;
-extern initialize_file_ftype _initialize_mipsread;
-extern initialize_file_ftype _initialize_stabsread;
-extern initialize_file_ftype _initialize_core;
-extern initialize_file_ftype _initialize_dwarf2_frame;
-extern initialize_file_ftype _initialize_c_language;
-extern initialize_file_ftype _initialize_f_language;
-extern initialize_file_ftype _initialize_objc_language;
-extern initialize_file_ftype _initialize_ui_out;
-extern initialize_file_ftype _initialize_cli_out;
-extern initialize_file_ftype _initialize_varobj;
-extern initialize_file_ftype _initialize_java_language;
-extern initialize_file_ftype _initialize_m2_language;
-extern initialize_file_ftype _initialize_pascal_language;
-extern initialize_file_ftype _initialize_pascal_valprint;
-extern initialize_file_ftype _initialize_scheme_language;
-extern initialize_file_ftype _initialize_complaints;
-extern initialize_file_ftype _initialize_typeprint;
-extern initialize_file_ftype _initialize_cp_valprint;
-extern initialize_file_ftype _initialize_f_valprint;
-extern initialize_file_ftype _initialize_nlmread;
-extern initialize_file_ftype _initialize_serial;
-extern initialize_file_ftype _initialize_mdebugread;
-extern initialize_file_ftype _initialize_user_regs;
-extern initialize_file_ftype _initialize_frame;
-extern initialize_file_ftype _initialize_frame_unwind;
-extern initialize_file_ftype _initialize_frame_base;
-extern initialize_file_ftype _initialize_gnu_v2_abi;
-extern initialize_file_ftype _initialize_gnu_v3_abi;
-extern initialize_file_ftype _initialize_hpacc_abi;
-extern initialize_file_ftype _initialize_cp_abi;
-extern initialize_file_ftype _initialize_cp_support;
-extern initialize_file_ftype _initialize_cp_namespace;
-extern initialize_file_ftype _initialize_reggroup;
-extern initialize_file_ftype _initialize_inflow;
-extern initialize_file_ftype _initialize_cli_dump;
-extern initialize_file_ftype _initialize_cli_logging;
-extern initialize_file_ftype _initialize_cli_interp;
-extern initialize_file_ftype _initialize_mi_out;
-extern initialize_file_ftype _initialize_mi_cmds;
-extern initialize_file_ftype _initialize_mi_cmd_env;
-extern initialize_file_ftype _initialize_mi_interp;
-extern initialize_file_ftype _initialize_mi_main;
-extern initialize_file_ftype _initialize_tui_hooks;
-extern initialize_file_ftype _initialize_tui_interp;
-extern initialize_file_ftype _initialize_tui_layout;
-extern initialize_file_ftype _initialize_tui_out;
-extern initialize_file_ftype _initialize_tui_regs;
-extern initialize_file_ftype _initialize_tui_stack;
-extern initialize_file_ftype _initialize_tui_win;
-void
-initialize_all_files (void)
-{
-  _initialize_gdbtypes ();
-  _initialize_corelow ();
-  _initialize_ia64_fbsd_tdep ();
-  _initialize_ia64_tdep ();
-  _initialize_solib ();
-  _initialize_svr4_solib ();
-  _initialize_ser_hardwire ();
-  _initialize_ser_pipe ();
-  _initialize_ser_tcp ();
-#ifndef CROSS_DEBUGGER
-  _initialize_fbsd_proc ();
-  _initialize_gcore ();
-  _initialize_thread_db ();
-  _initialize_ia64_fbsd_nat ();
-  _initialize_kernel_u_addr ();
-  _initialize_infptrace ();
-  _initialize_inftarg ();
-#endif
-  _initialize_remote ();
-  _initialize_dcache ();
-  _initialize_sr_support ();
-  _initialize_tracepoint ();
-  _initialize_ax_gdb ();
-  _initialize_annotate ();
-  _initialize_auxv ();
-  _initialize_breakpoint ();
-  _initialize_regcache ();
-  _initialize_charset ();
-  _initialize_dummy_frame ();
-  _initialize_source ();
-  _initialize_values ();
-  _initialize_valops ();
-  _initialize_valarith ();
-  _initialize_valprint ();
-  _initialize_printcmd ();
-  _initialize_symtab ();
-  _initialize_symfile ();
-  _initialize_symmisc ();
-  _initialize_infcall ();
-  _initialize_infcmd ();
-  _initialize_infrun ();
-  _initialize_stack ();
-  _initialize_thread ();
-  _initialize_interpreter ();
-  _initialize_macrocmd ();
-  _initialize_gdbarch ();
-  _initialize_gdbarch_utils ();
-  _initialize_gdb_osabi ();
-  _initialize_copying ();
-  _initialize_mem ();
-  _initialize_parse ();
-  _initialize_language ();
-  _initialize_frame_reg ();
-  _initialize_signals ();
-  _initialize_kod ();
-  _initialize_gdb_events ();
-  _initialize_exec ();
-  _initialize_maint_cmds ();
-  _initialize_demangler ();
-  _initialize_dbxread ();
-  _initialize_coffread ();
-  _initialize_elfread ();
-  _initialize_mipsread ();
-  _initialize_stabsread ();
-  _initialize_core ();
-  _initialize_dwarf2_frame ();
-  _initialize_c_language ();
-  _initialize_f_language ();
-  _initialize_objc_language ();
-  _initialize_ui_out ();
-  _initialize_cli_out ();
-  _initialize_varobj ();
-  _initialize_java_language ();
-  _initialize_m2_language ();
-  _initialize_pascal_language ();
-  _initialize_pascal_valprint ();
-  _initialize_scheme_language ();
-  _initialize_complaints ();
-  _initialize_typeprint ();
-  _initialize_cp_valprint ();
-  _initialize_f_valprint ();
-  _initialize_nlmread ();
-  _initialize_serial ();
-  _initialize_mdebugread ();
-  _initialize_user_regs ();
-  _initialize_frame ();
-  _initialize_frame_unwind ();
-  _initialize_frame_base ();
-  _initialize_gnu_v2_abi ();
-  _initialize_gnu_v3_abi ();
-  _initialize_hpacc_abi ();
-  _initialize_cp_abi ();
-  _initialize_cp_support ();
-  _initialize_cp_namespace ();
-  _initialize_reggroup ();
-  _initialize_inflow ();
-  _initialize_cli_dump ();
-  _initialize_cli_logging ();
-  _initialize_cli_interp ();
-  _initialize_mi_out ();
-  _initialize_mi_cmds ();
-  _initialize_mi_cmd_env ();
-  _initialize_mi_interp ();
-  _initialize_mi_main ();
-  _initialize_tui_hooks ();
-  _initialize_tui_interp ();
-  _initialize_tui_layout ();
-  _initialize_tui_out ();
-  _initialize_tui_regs ();
-  _initialize_tui_stack ();
-  _initialize_tui_win ();
-}
diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index 23a30729de05..cf23804cb53f 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -11,8 +11,8 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 # global symbols visible.
 LDFLAGS+= -Wl,-E
 
-DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
-LDADD=	${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex
+DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX}
+LDADD=	${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex
 
 NO_PIE=	yes
 
diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile b/gnu/usr.bin/gdb/gdbtui/Makefile
index d3651b488421..16701738a659 100644
--- a/gnu/usr.bin/gdb/gdbtui/Makefile
+++ b/gnu/usr.bin/gdb/gdbtui/Makefile
@@ -12,8 +12,8 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 # global symbols visible.
 LDFLAGS+= -Wl,-E
 
-DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
-LDADD=	${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex
+DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX}
+LDADD=	${GDBLIBS} ${BULIBS} -lm ${LDREADLINE} -ltermcapw -lgnuregex
 
 NO_PIE=	yes
 
diff --git a/gnu/usr.bin/gdb/kgdb/Makefile b/gnu/usr.bin/gdb/kgdb/Makefile
index 9543ad0d3f42..076b7cddde32 100644
--- a/gnu/usr.bin/gdb/kgdb/Makefile
+++ b/gnu/usr.bin/gdb/kgdb/Makefile
@@ -8,9 +8,9 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \
 	${OBJ_BU}/libiberty/libiberty.a
 GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 
-DPADD=	${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} \
+DPADD=	${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \
 	${LIBGNUREGEX}
-LDADD=	${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm -lreadline -ltermcap \
+LDADD=	${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LDREADLINE} -ltermcapw \
 	-lgnuregex
 
 .if defined(GDB_CROSS_DEBUGGER)
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_ia64.c b/gnu/usr.bin/gdb/kgdb/trgt_ia64.c
deleted file mode 100644
index 6ba800bd0144..000000000000
--- a/gnu/usr.bin/gdb/kgdb/trgt_ia64.c
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 2004 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 AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED 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 BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) 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>
-#ifdef CROSS_DEBUGGER
-#include <sys/ia64/include/_regset.h>
-#include <sys/ia64/include/frame.h>
-#include <sys/ia64/include/md_var.h>
-#include <sys/ia64/include/pcb.h>
-#else
-#include <machine/frame.h>
-#include <machine/md_var.h>
-#include <machine/pcb.h>
-#endif
-#include <err.h>
-#include <kvm.h>
-#include <string.h>
-
-#include <defs.h>
-#include <target.h>
-#include <gdbthread.h>
-#include <inferior.h>
-#include <regcache.h>
-#include <frame-unwind.h>
-#include <ia64-tdep.h>
-
-#include "kgdb.h"
-
-CORE_ADDR
-kgdb_trgt_core_pcb(u_int cpuid)
-{
-	CORE_ADDR addr;
-	char *expr;
-
-	asprintf(&expr, "&cpuid_to_pcpu[%d]->pc_md.pcb", cpuid);
-	addr = kgdb_parse(expr);
-	free(expr);
-	return (addr);
-}
-
-void
-kgdb_trgt_fetch_registers(int regno __unused)
-{
-	struct kthr *kt;
-	struct pcb pcb;
-	uint64_t r;
-
-	kt = kgdb_thr_lookup_tid(ptid_get_pid(inferior_ptid));
-	if (kt == NULL)
-		return;
-	if (kvm_read(kvm, kt->pcb, &pcb, sizeof(pcb)) != sizeof(pcb)) {
-		warnx("kvm_read: %s", kvm_geterr(kvm));
-		memset(&pcb, 0, sizeof(pcb));
-	}
-
-	/* Registers 0-127: general registers. */
-	supply_register(IA64_GR1_REGNUM, (char *)&pcb.pcb_special.gp);
-	supply_register(IA64_GR4_REGNUM, (char *)&pcb.pcb_preserved.gr4);
-	supply_register(IA64_GR5_REGNUM, (char *)&pcb.pcb_preserved.gr5);
-	supply_register(IA64_GR6_REGNUM, (char *)&pcb.pcb_preserved.gr6);
-	supply_register(IA64_GR7_REGNUM, (char *)&pcb.pcb_preserved.gr7);
-	supply_register(IA64_GR12_REGNUM, (char *)&pcb.pcb_special.sp);
-	supply_register(IA64_GR12_REGNUM+1, (char *)&pcb.pcb_special.tp);
-
-	/* Registers 128-255: floating-point registers. */
-	supply_register(IA64_FR2_REGNUM, (char *)&pcb.pcb_preserved_fp.fr2);
-	supply_register(IA64_FR2_REGNUM+1, (char *)&pcb.pcb_preserved_fp.fr3);
-	supply_register(IA64_FR2_REGNUM+2, (char *)&pcb.pcb_preserved_fp.fr4);
-	supply_register(IA64_FR2_REGNUM+3, (char *)&pcb.pcb_preserved_fp.fr5);
-	supply_register(IA64_FR16_REGNUM, (char *)&pcb.pcb_preserved_fp.fr16);
-	supply_register(IA64_FR16_REGNUM+1, (char*)&pcb.pcb_preserved_fp.fr17);
-	supply_register(IA64_FR16_REGNUM+2, (char*)&pcb.pcb_preserved_fp.fr18);
-	supply_register(IA64_FR16_REGNUM+3, (char*)&pcb.pcb_preserved_fp.fr19);
-	supply_register(IA64_FR16_REGNUM+4, (char*)&pcb.pcb_preserved_fp.fr20);
-	supply_register(IA64_FR16_REGNUM+5, (char*)&pcb.pcb_preserved_fp.fr21);
-	supply_register(IA64_FR16_REGNUM+6, (char*)&pcb.pcb_preserved_fp.fr22);
-	supply_register(IA64_FR16_REGNUM+7, (char*)&pcb.pcb_preserved_fp.fr23);
-	supply_register(IA64_FR16_REGNUM+8, (char*)&pcb.pcb_preserved_fp.fr24);
-	supply_register(IA64_FR16_REGNUM+9, (char*)&pcb.pcb_preserved_fp.fr25);
-	supply_register(IA64_FR16_REGNUM+10,(char*)&pcb.pcb_preserved_fp.fr26);
-	supply_register(IA64_FR16_REGNUM+11,(char*)&pcb.pcb_preserved_fp.fr27);
-	supply_register(IA64_FR16_REGNUM+12,(char*)&pcb.pcb_preserved_fp.fr28);
-	supply_register(IA64_FR16_REGNUM+13,(char*)&pcb.pcb_preserved_fp.fr29);
-	supply_register(IA64_FR16_REGNUM+14,(char*)&pcb.pcb_preserved_fp.fr30);
-	supply_register(IA64_FR16_REGNUM+15,(char*)&pcb.pcb_preserved_fp.fr31);
-
-	/* Registers 320-327: branch registers. */
-	if (pcb.pcb_special.__spare == ~0UL)
-		supply_register(IA64_BR0_REGNUM, (char *)&pcb.pcb_special.rp);
-	supply_register(IA64_BR1_REGNUM, (char *)&pcb.pcb_preserved.br1);
-	supply_register(IA64_BR2_REGNUM, (char *)&pcb.pcb_preserved.br2);
-	supply_register(IA64_BR3_REGNUM, (char *)&pcb.pcb_preserved.br3);
-	supply_register(IA64_BR4_REGNUM, (char *)&pcb.pcb_preserved.br4);
-	supply_register(IA64_BR5_REGNUM, (char *)&pcb.pcb_preserved.br5);
-
-	/* Registers 328-333: misc. other registers. */
-	supply_register(IA64_PR_REGNUM, (char *)&pcb.pcb_special.pr);
-	if (pcb.pcb_special.__spare == ~0UL) {
-		r = pcb.pcb_special.iip + ((pcb.pcb_special.psr >> 41) & 3);
-		supply_register(IA64_IP_REGNUM, (char *)&r);
-		supply_register(IA64_CFM_REGNUM, (char *)&pcb.pcb_special.cfm);
-	} else {
-		supply_register(IA64_IP_REGNUM, (char *)&pcb.pcb_special.rp);
-		supply_register(IA64_CFM_REGNUM, (char *)&pcb.pcb_special.pfs);
-	}
-
-	/* Registers 334-461: application registers. */
-	supply_register(IA64_RSC_REGNUM, (char *)&pcb.pcb_special.rsc);
-	r = pcb.pcb_special.bspstore;
-	if (pcb.pcb_special.__spare == ~0UL)
-		r += pcb.pcb_special.ndirty;
-	else
-		r = ia64_bsp_adjust(r, IA64_CFM_SOF(pcb.pcb_special.pfs) -
-		    IA64_CFM_SOL(pcb.pcb_special.pfs));
-	supply_register(IA64_BSP_REGNUM, (char *)&r);
-	supply_register(IA64_BSPSTORE_REGNUM, (char *)&r);
-	supply_register(IA64_RNAT_REGNUM, (char *)&pcb.pcb_special.rnat);
-	supply_register(IA64_UNAT_REGNUM, (char *)&pcb.pcb_special.unat);
-	supply_register(IA64_FPSR_REGNUM, (char *)&pcb.pcb_special.fpsr);
-	if (pcb.pcb_special.__spare == ~0UL)
-		supply_register(IA64_PFS_REGNUM, (char *)&pcb.pcb_special.pfs);
-	supply_register(IA64_LC_REGNUM, (char *)&pcb.pcb_preserved.lc);
-}
-
-void
-kgdb_trgt_store_registers(int regno __unused)
-{
-	fprintf_unfiltered(gdb_stderr, "XXX: %s\n", __func__);
-}
-
-void
-kgdb_trgt_new_objfile(struct objfile *objfile)
-{
-}
-
-struct kgdb_frame_cache {
-	CORE_ADDR	bsp;
-	CORE_ADDR	ip;
-	CORE_ADDR	sp;
-	CORE_ADDR	saved_bsp;
-};
-
-#define	SPECIAL(x)	offsetof(struct trapframe, tf_special)		\
-			+ offsetof(struct _special, x)
-#define	SCRATCH(x)	offsetof(struct trapframe, tf_scratch)		\
-			+ offsetof(struct _caller_saved, x)
-#define	SCRATCH_FP(x)	offsetof(struct trapframe, tf_scratch_fp)	\
-			+ offsetof(struct _caller_saved_fp, x)
-
-static int kgdb_trgt_frame_ofs_gr[32] = {
-	-1,					/* gr0 */
-	SPECIAL(gp),
-	SCRATCH(gr2),   SCRATCH(gr3),
-	-1, -1, -1, -1,				/* gr4-gr7 */
-	SCRATCH(gr8),   SCRATCH(gr9),   SCRATCH(gr10),  SCRATCH(gr11),
-	SPECIAL(sp),    SPECIAL(tp),
-	SCRATCH(gr14),  SCRATCH(gr15),  SCRATCH(gr16),  SCRATCH(gr17),
-	SCRATCH(gr18),  SCRATCH(gr19),  SCRATCH(gr20),  SCRATCH(gr21),
-	SCRATCH(gr22),  SCRATCH(gr23),  SCRATCH(gr24),  SCRATCH(gr25),
-	SCRATCH(gr26),  SCRATCH(gr27),  SCRATCH(gr28),  SCRATCH(gr29),
-	SCRATCH(gr30),  SCRATCH(gr31)
-};
-
-static int kgdb_trgt_frame_ofs_fr[32] = {
-	-1,					/* fr0: constant 0.0 */
-	-1,					/* fr1: constant 1.0 */
-	-1, -1, -1, -1,				/* fr2-fr5 */
-	SCRATCH_FP(fr6), SCRATCH_FP(fr7), SCRATCH_FP(fr8), SCRATCH_FP(fr9),
-	SCRATCH_FP(fr10), SCRATCH_FP(fr11), SCRATCH_FP(fr12), SCRATCH_FP(fr13),
-	SCRATCH_FP(fr14), SCRATCH_FP(fr15)
-};
-
-static int kgdb_trgt_frame_ofs_br[8] = {
-        SPECIAL(rp),
-	-1, -1, -1, -1, -1,			/* br1-br5 */
-	SCRATCH(br6), SCRATCH(br7)
-};
-
-static int kgdb_trgt_frame_ofs_ar[49] = {
-	/* ar0-ar15 */
-	SPECIAL(rsc),
-	-1,					/* ar.bsp */
-	SPECIAL(bspstore), SPECIAL(rnat),
-	-1, -1, -1, -1, -1,			/* ar20-ar24 */
-	SCRATCH(csd), SCRATCH(ssd),
-	-1, -1, -1, -1, -1,			/* ar27-ar31 */
-	SCRATCH(ccv),
-	-1, -1, -1,				/* ar33-ar35 */
-	SPECIAL(unat),
-	-1, -1, -1,				/* ar37-ar39 */
-	SPECIAL(fpsr),
-	-1, -1, -1, -1, -1, -1, -1,		/* ar41-ar47 */
-	-1, -1, -1, -1, -1, -1, -1, -1,		/* ar48-ar55 */
-	-1, -1, -1, -1, -1, -1, -1, -1,		/* ar56-ar63 */
-	SPECIAL(pfs)
-};
-
-static struct kgdb_frame_cache *
-kgdb_trgt_frame_cache(struct frame_info *next_frame, void **this_cache)
-{
-	char buf[MAX_REGISTER_SIZE];
-	struct kgdb_frame_cache *cache;
-
-	cache = *this_cache;
-	if (cache == NULL) {
-		cache = FRAME_OBSTACK_ZALLOC(struct kgdb_frame_cache);
-		*this_cache = cache;
-		frame_unwind_register(next_frame, IA64_BSP_REGNUM, buf);
-		cache->bsp = extract_unsigned_integer(buf,
-		    register_size(current_gdbarch, IA64_BSP_REGNUM));
-		cache->ip = frame_func_unwind(next_frame);
-		frame_unwind_register(next_frame, SP_REGNUM, buf);
-		cache->sp = extract_unsigned_integer(buf,
-		    register_size(current_gdbarch, SP_REGNUM));
-	}
-	return (cache);
-}
-
-static void
-kgdb_trgt_trapframe_this_id(struct frame_info *next_frame, void **this_cache,
-    struct frame_id *this_id)
-{
-	struct kgdb_frame_cache *cache;
-
-	cache = kgdb_trgt_frame_cache(next_frame, this_cache);
-	*this_id = frame_id_build_special(cache->sp, cache->ip, cache->bsp);
-}
-
-static void
-kgdb_trgt_trapframe_prev_register(struct frame_info *next_frame,
-    void **this_cache, int regnum, int *optimizedp, enum lval_type *lvalp,
-    CORE_ADDR *addrp, int *realnump, void *valuep)
-{
-	char buf[MAX_REGISTER_SIZE];
-	char dummy_valuep[MAX_REGISTER_SIZE];
-	struct kgdb_frame_cache *cache;
-	CORE_ADDR bsp;
-	int ofs, regsz;
-
-	regsz = register_size(current_gdbarch, regnum);
-
-	if (valuep == NULL)
-		valuep = dummy_valuep;
-	memset(valuep, 0, regsz);
-	*optimizedp = 0;
-	*addrp = 0;
-	*lvalp = not_lval;
-	*realnump = -1;
-
-	cache = kgdb_trgt_frame_cache(next_frame, this_cache);
-
-	if (regnum == IA64_BSP_REGNUM) {
-		if (cache->saved_bsp == 0) {
-			target_read_memory(cache->sp + 16 + SPECIAL(bspstore),
-			    buf, regsz);
-			bsp = extract_unsigned_integer(buf, regsz);
-			target_read_memory(cache->sp + 16 + SPECIAL(ndirty),
-			    buf, regsz);
-			bsp += extract_unsigned_integer(buf, regsz);
-			cache->saved_bsp = bsp;
-		}
-		store_unsigned_integer(valuep, regsz, cache->saved_bsp);
-		return;
-	}
-	if (regnum == IA64_PR_REGNUM)
-		ofs = SPECIAL(pr);
-	else if (regnum == IA64_IP_REGNUM)
-		ofs = SPECIAL(iip);
-	else if (regnum == IA64_PSR_REGNUM)
-		ofs = SPECIAL(psr);
-	else if (regnum == IA64_CFM_REGNUM)
-		ofs = SPECIAL(cfm);
-	else if (regnum >= IA64_GR0_REGNUM && regnum <= IA64_GR31_REGNUM)
-		ofs = kgdb_trgt_frame_ofs_gr[regnum - IA64_GR0_REGNUM];
-	else if (regnum >= IA64_FR0_REGNUM && regnum <= IA64_FR15_REGNUM)
-		ofs = kgdb_trgt_frame_ofs_fr[regnum - IA64_FR0_REGNUM];
-	else if (regnum >= IA64_BR0_REGNUM && regnum <= IA64_BR7_REGNUM)
-		ofs = kgdb_trgt_frame_ofs_br[regnum - IA64_BR0_REGNUM];
-	else if (regnum >= IA64_RSC_REGNUM && regnum <= IA64_PFS_REGNUM)
-		ofs = kgdb_trgt_frame_ofs_ar[regnum - IA64_RSC_REGNUM];
-	else
-		ofs = -1;
-	if (ofs == -1)
-		return;
-
-	*addrp = cache->sp + 16 + ofs;
-	*lvalp = lval_memory;
-	target_read_memory(*addrp, valuep, regsz);
-}
-
-static const struct frame_unwind kgdb_trgt_trapframe_unwind = {
-        UNKNOWN_FRAME,
-        &kgdb_trgt_trapframe_this_id,
-        &kgdb_trgt_trapframe_prev_register
-};
-
-const struct frame_unwind *
-kgdb_trgt_trapframe_sniffer(struct frame_info *next_frame)
-{
-	char *pname;
-	CORE_ADDR ip;
-
-	ip = frame_func_unwind(next_frame);
-	pname = NULL;
-	find_pc_partial_function(ip, &pname, NULL, NULL);
-	if (pname == NULL)
-		return (NULL);
-	if (strncmp(pname, "ivt_", 4) == 0)
-		return (&kgdb_trgt_trapframe_unwind);
-	/* printf("%s: %lx =%s\n", __func__, ip, pname); */
-	return (NULL);
-}
diff --git a/gnu/usr.bin/send-pr/COPYING b/gnu/usr.bin/send-pr/COPYING
deleted file mode 100644
index 515b6d333429..000000000000
--- a/gnu/usr.bin/send-pr/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-he GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    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 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile
deleted file mode 100644
index f17db49acca5..000000000000
--- a/gnu/usr.bin/send-pr/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD$
-#
-# Makefile for building a standalone send-pr.
-#
-
-SCRIPTS=	send-pr
-MAN=		send-pr.1
-SUBMITTERS=	current-users
-RELEASE=	`uname -rsm`
-CLEANFILES+=	send-pr send-pr.el
-
-SUBDIR+= doc
-
-LINKS=	${BINDIR}/send-pr ${BINDIR}/sendbug
-MLINKS=	send-pr.1 sendbug.1
-
-send-pr:	send-pr.sh Makefile
-	sed -e 's,@DATADIR@,/etc,g' \
-	    -e 's/@DEFAULT_RELEASE@/$(RELEASE)/g' \
-	    -e 's/^SUBMITTER=.*/SUBMITTER=$(SUBMITTERS)/' \
-	    ${.ALLSRC:N*Makefile} > ${.TARGET}
-
-send-pr.el:	send-pr-el.in Makefile
-	default_release=`uname -rsm`; \
-	sed -e 's,@DATADIR@,/etc,g' \
-	    -e "s/@DEFAULT_RELEASE@/$${default_release}/g" \
-	    -e 's/"unknown"/"$(SUBMITTERS)"/g' \
-	    ${.ALLSRC:N*Makefile} > ${.TARGET}
-
-# called from /usr/src/etc/Makefile 
-etc-gnats-freefall:
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0644 \
-		${.CURDIR}/categories  ${DESTDIR}/etc/gnats/freefall
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/send-pr/README b/gnu/usr.bin/send-pr/README
deleted file mode 100644
index b479179555fb..000000000000
--- a/gnu/usr.bin/send-pr/README
+++ /dev/null
@@ -1,43 +0,0 @@
-	send-pr - sends bug reports to a central support site
-
-`send-pr' uses electronic mail to submit support questions and
-software bugs to a central site.  No piece of software is perfect, and
-software organizations understand this `send-pr' is designed to allow
-users who have problems to submit reports of these problems to sites
-responsible for supporting the software in question, in a defined form
-which can be read by an electronically managed database.
-
-`send-pr' is part of a suite of programs known collectively as GNATS,
-an acronym for Problem Report Management System.  GNATS consists of
-several programs which, used in concert, formulate and partially
-administer a database of Problem Reports, or PRs, at a central support
-site.  A PR goes through several states in its lifetime; GNATS tracks
-the PR and all information associated with it through each state and
-finally acts as an archive for PRs which have been resolved.
-
-The same engine can be used to submit bugs to any number of support
-sites by setting up aliases for each of them; `send-pr' error-checks
-each PR as it is sent to be sure that the category specified matches a
-category supported by the site in question.
-
-`send-pr' invokes an editor on a problem report template (after trying
-to fill in some fields with reasonable default values).  When you exit
-the editor, `send-pr' sends the completed form to the support site.
-At the support site, the PR is assigned a unique number and is stored
-in the GNATS database according to its category and customer-id.  GNATS
-automatically replies with an acknowledgement, citing the category and
-the PR number.
-
-See the Texinfo file `send-pr.texi' or the Info file `send-pr.info'
-for detailed installation and usage information.
-
-See the file MANIFEST for a list of the files which should have
-accompanied this distribution.
-
-See `send-pr.texi', `send-pr.info', or the file INSTALL for the
-installation procedure for `send-pr'.
-
-
-Copyright (c) 1993, Free Software Foundation, Inc.  
-See the file COPYING for copyright information concerning this
-distribution and all its components.
diff --git a/gnu/usr.bin/send-pr/categories b/gnu/usr.bin/send-pr/categories
deleted file mode 100644
index da511e74291e..000000000000
--- a/gnu/usr.bin/send-pr/categories
+++ /dev/null
@@ -1,21 +0,0 @@
-# $FreeBSD$
-advocacy
-alpha
-amd64
-arm
-bin
-conf
-docs
-gnu
-i386
-ia64
-java
-kern
-misc
-ports
-powerpc
-sparc64
-standards
-threads
-usb
-www
diff --git a/gnu/usr.bin/send-pr/doc/Makefile b/gnu/usr.bin/send-pr/doc/Makefile
deleted file mode 100644
index 1de70644842b..000000000000
--- a/gnu/usr.bin/send-pr/doc/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-INFO = send-pr
-INFOSECTION="System Utilities"
-
-.include <bsd.info.mk>
diff --git a/gnu/usr.bin/send-pr/doc/categ.texi b/gnu/usr.bin/send-pr/doc/categ.texi
deleted file mode 100644
index fe84918c917f..000000000000
--- a/gnu/usr.bin/send-pr/doc/categ.texi
+++ /dev/null
@@ -1,125 +0,0 @@
-@c $FreeBSD$
-
-@node Valid Categories
-@unnumberedsec Valid Categories
-@cindex valid categories
-@cindex example of a list of valid categories
-
-@table @code
-@item bfd
-@sc{gnu} binary file descriptor library.
-
-@item bifrabulator
-This one doesn't actually exist.
-
-@item binutils
-@sc{gnu} utilities for binary files (@code{ar}, @code{nm}, @code{size}@dots{}).
-
-@item bison
-@sc{gnu} parser generator.
-
-@item byacc
-Free parser generator.
-
-@item config
-Cygnus Solutions Software configuration and installation.
-
-@item cvs
-Concurrent Version System.
-
-@item diff
-@sc{gnu} @code{diff} program.
-
-@item doc
-Documentation and manuals.
-
-@item emacs
-@sc{gnu} Emacs editor and related functions.
-
-@item flex
-@sc{gnu} lexical analyzer.
-
-@item g++
-@sc{gnu} C++ compiler.
-
-@item gas
-@sc{gnu} assembler.
-
-@item gcc
-@sc{gnu} C compiler.
-
-@item gdb
-@sc{gnu} source code debugger.
-
-@item glob
-The filename globbing functions.
-
-@item gprof
-@sc{gnu} profiler.
-
-@item grep
-@sc{gnu} @code{grep} program.
-
-@item info
-@sc{gnu} @code{info} hypertext reader.
-
-@item ispell
-@sc{gnu} spelling checker.
-
-@item kerberos
-Kerberos authentication system.
-
-@item ld
-@sc{gnu} linker.
-
-@item libc
-Cygnus Solutions C Support Library.
-
-@item libg++
-@sc{gnu} C++ class library.
-
-@item libiberty
-@sc{gnu} @samp{libiberty} library.
-
-@item libm
-Cygnus Solutions C Math Library.
-
-@item make
-@sc{gnu} @code{make} program.
-
-@item makeinfo
-@sc{gnu} utility to build Info files from Texinfo documents.
-
-@item mas
-@sc{gnu} Motorola syntax assembler.
-
-@item newlib
-Cygnus Solutions C Support and Math Libraries.
-
-@item patch
-@sc{gnu} bug patch program.
-
-@item gnats
-@sc{gnu} Problem Report Management System.
-
-@item rcs
-Revision Control System.
-
-@item readline
-@sc{gnu} @code{readline} library.
-
-@item send-pr
-@sc{gnu} Problem Report submitting program.
-
-@item test
-Category to use when testing @code{send-pr}.
-
-@item texindex
-@sc{gnu} documentation indexing utility.
-
-@item texinfo
-@sc{gnu} documentation macros.
-
-@item other
-Anything which is not covered by the above categories.
-@end table
diff --git a/gnu/usr.bin/send-pr/doc/fields.texi b/gnu/usr.bin/send-pr/doc/fields.texi
deleted file mode 100644
index 0cce6424dc4b..000000000000
--- a/gnu/usr.bin/send-pr/doc/fields.texi
+++ /dev/null
@@ -1,522 +0,0 @@
-@c $FreeBSD$
-
-@node Fields
-@section Problem Report format
-@cindex Problem Report format
-@cindex format
-@cindex database similarities
-@cindex fields
-
-The format of a PR is designed to reflect the nature of @sc{gnats} as a
-database.  Information is arranged into @dfn{fields}, and kept in
-individual records (Problem Reports).
-
-A Problem Report contains two different types of fields: @dfn{Mail
-Header} fields, which are used by the mail handler for delivery, and
-@dfn{Problem Report} fields, which contain information relevant to the
-Problem Report and its submitter.  A Problem Report is essentially a
-specially formatted electronic mail message.
-
-Problem Report fields are denoted by a keyword which begins with
-@samp{>} and ends with @samp{:}, as in @samp{>Confidential:}.  Fields
-belong to one of three data types:
-
-@table @asis
-@cindex Problem Report data types
-@cindex @emph{Enumerated} data types
-@item @sc{Enumerated}
-One of a specific set of values, which vary according to the field.  The
-value for each keyword must be on the same line as the keyword.  These
-values are not configurable (yet).
-
-@ifset SENDPR
-For each @sc{Enumerated} keyword, the possible choices are listed in the
-@code{send-pr} template as a comment.
-@end ifset
-The following fields are @sc{Enumerated} format; see the descriptions of
-fields below for explanations of each field in detail:
-
-@smallexample
-@group
->Confidential:   >Severity:       >Priority:
->Class:          >State:          >Number:
-@end group
-@end smallexample
-
-@cindex @emph{Text} data types
-@item @sc{Text}
-One single line of text which must begin and end on the same line (i.e.,
-before a newline) as the keyword.  See the descriptions of fields below
-for explanations of each field in detail.  The following fields are
-@sc{Text} format:
-
-@smallexample
-@group
->Submitter-Id:   >Originator:     >Synopsis:
->Category:       >Release:        >Responsible:
->Arrival-Date:
-@end group
-@end smallexample
-
-@cindex @emph{MultiText} data types
-@item @sc{MultiText}
-Text of any length may occur in this field.  @sc{MultiText} may span
-multiple lines and may also include blank lines.  A @sc{MultiText} field
-ends only when another keyword appears.  See the descriptions of fields
-below for explanations of each field in detail.  
-
-The following fields are @sc{MultiText} format:
-
-@smallexample
-@group
->Organization:   >Environment:    >Description:
->How-To-Repeat:  >Fix:            >Audit-Trail:
->Unformatted:
-@end group
-@end smallexample
-
-@end table
-
-@ifclear SENDPR
-@subheading Example Problem Report
-@end ifclear
-
-The following is an example Problem Report.  Mail headers are at the
-top, followed by @sc{gnats} fields, which begin with @samp{>} and end
-with @samp{:}.  The @samp{Subject:} line in the mail header and the
-@samp{>Synopsis:} field are usually duplicates of each other.
-
-@cindex sample Problem Report
-@cindex example Problem Report
-@cindex Problem Report template
-@cartouche
-@smallexample
-@group
-Message-Id:  @var{message-id}
-Date:        @var{date}
-From:        @var{address}
-Reply-To:    @var{address}
-To:          @var{bug-address}
-Subject:     @var{subject}
-
->Number:       @var{gnats-id}
->Category:     @var{category}
->Synopsis:     @var{synopsis}
->Confidential: yes @emph{or} no
->Severity:     critical, serious, @emph{or} non-critical
->Priority:     high, medium @emph{or} low
->Responsible:  @var{responsible}
->State:        open, analyzed, suspended, feedback, @emph{or} closed
->Class:        sw-bug, doc-bug, change-request, support, 
-@ifset SENDPR
-@emph{or} duplicate
-@end ifset
-@ifclear SENDPR
-duplicate, @emph{or} mistaken
-@end ifclear
->Submitter-Id: @var{submitter-id}
->Arrival-Date: @var{date}
->Originator:   @var{name}
->Organization: @var{organization}
->Release:      @var{release}
->Environment:
-   @var{environment}
->Description:
-   @var{description}
->How-To-Repeat:
-   @var{how-to-repeat}
->Fix:
-   @var{fix}
->Audit-Trail:
-@var{appended-messages@dots{}}
-State-Changed-From-To: @var{from}-@var{to}
-State-Changed-When: @var{date}
-State-Changed-Why:
-   @var{reason}
-Responsible-Changed-From-To: @var{from}-@var{to}
-Responsible-Changed-When: @var{date}
-Responsible-Changed-Why:
-   @var{reason}
->Unformatted:
-   @var{miscellaneous}
-@end group
-@end smallexample
-@end cartouche
-
-@menu
-* Mail header fields::
-* Problem Report fields::
-@end menu
-
-@c ----------------------
-@node Mail header fields
-@subsection Mail header fields
-@cindex mail header fields
-@cindex Internet standard RFC-822
-
-A Problem Report may contain any mail header field described in the
-Internet standard RFC-822.  However, only the fields which identify the
-sender and the subject are required by @code{send-pr}:
-
-@table @code
-@cindex @code{To:} header
-@item To:
-The preconfigured mail address for the Support Site where the PR is to
-be sent, automatically supplied by @code{send-pr}.
-
-@cindex @code{Subject:} header
-@item Subject:
-A terse description of the problem.  This field normally contains the
-same information as the @samp{>Synopsis:} field.
-
-@cindex @code{From:} header
-@item From:
-Usually supplied automatically by the originator's mailer; should
-contain the originator's electronic mail address.
-
-@cindex @code{Reply-To:} header
-@item Reply-To:
-A return address to which electronic replies can be sent; in most cases,
-the same address as the @code{From:} field.
-@end table
-
-@ifclear SENDPR
-@cindex @code{Received-By:} headers
-One of the configurable options for @sc{gnats} is whether or not to
-retain @w{@samp{Received-By:}} headers, which often consume a lot of
-space and are not often used.  @xref{Local configuration,,Changing your
-local configuration}.
-@end ifclear
-
-@c ----------------------
-@node Problem Report fields
-@subsection Problem Report fields
-@cindex GNATS database fields
-@cindex field format
-
-@c FIXME - this node is loooooooooooooooong...
-
-@subheading Field descriptions
-
-The following fields are present whenever a PR is submitted via the
-program @code{send-pr}.  @sc{gnats} adds additional fields when the PR
-arrives at the Support Site; explanations of them follow this list.
-
-@cindex fields - list
-@cindex GNATS fields - list
-@table @code
-@cindex @code{Submitter-Id} field
-@cindex @code{>Submitter-Id:}
-@item >Submitter-Id:
-(@sc{Text}) A unique identification code assigned by the Support Site.
-It is used to identify all Problem Reports coming from a particular
-site.  (Submitters without a value for this field can invoke
-@code{send-pr} with the @samp{--request-id} option to apply for one from
-the support organization.  Problem Reports from those not affiliated
-with the support organization should use the default value of @samp{net}
-for this field.)
-
-@cindex @code{Originator} field
-@cindex @code{>Originator:}
-@item >Originator:
-(@sc{Text}) Originator's real name.  The default is the value of the
-originator's environment variable @code{NAME}.
-
-@cindex @code{>Organization:}
-@cindex @code{Organization} field
-@item >Organization:
-(@sc{MultiText}) The originator's organization.  The default value is 
-set with the variable @w{@code{DEFAULT_ORGANIZATION}} in the
-@ifclear SENDPR
-@file{config} file (@pxref{config file,,The @code{config} file}).
-@end ifclear
-@ifset SENDPR
-@code{send-pr} shell script.
-@end ifset
-
-@cindex @code{Confidential} field
-@cindex @code{>Confidential:}
-@cindex confidentiality in PRs
-@cindex PR confidentiality
-@item >Confidential:
-(@sc{Enumerated}) Use of this field depends on the originator's
-relationship with the support organization; contractual agreements often
-have provisions for preserving confidentiality.  Conversely, a lack of a
-contract often means that any data provided will not be considered
-confidential.  Submitters should be advised to contact the support
-organization directly if this is an issue.
-
-If the originator's relationship to the support organization provides
-for confidentiality, then if the value of this field is @samp{yes} the
-support organization treats the PR as confidential; any code samples
-provided are not made publicly available (e.g., in regression test
-suites).  The default value is @samp{no}.
-
-@cindex @code{Synopsis} field
-@cindex @code{>Synopsis:}
-@item >Synopsis:
-(@sc{Text}) One-line summary of the problem.  @w{@code{send-pr}} copies
-this information to the @samp{Subject:} line when you submit a Problem
-Report.
-
-@cindex @code{Severity} field
-@cindex @code{>Severity:}
-@item >Severity:
-(@sc{Enumerated}) The severity of the problem.  Accepted values include:
-
-@table @code
-@cindex @emph{critical} severity problems
-@item critical  
-The product, component or concept is completely non-operational or some
-essential functionality is missing.  No workaround is known.
-
-@cindex @emph{serious} severity problems
-@item serious
-The product, component or concept is not working properly or significant
-functionality is missing.  Problems that would otherwise be considered
-@samp{critical} are rated @samp{serious} when a workaround is known.
-
-@cindex @emph{non-critical} severity problems
-@item non-critical
-The product, component or concept is working in general, but lacks
-features, has irritating behavior, does something wrong, or doesn't
-match its documentation.
-@end table
-@noindent
-The default value is @samp{serious}.
-@sp 1
-
-@cindex @code{Priority} field
-@cindex @code{>Priority:}
-@item >Priority:
-(@sc{Enumerated}) How soon the originator requires a solution.  Accepted
-values include:
-
-@table @code
-@cindex @emph{high} priority problems
-@item high
-A solution is needed as soon as possible.
-
-@cindex @emph{medium} priority problems
-@item medium
-The problem should be solved in the next release.
-
-@cindex @emph{low} priority problems
-@item low
-The problem should be solved in a future release.
-@end table
-@noindent
-The default value is @samp{medium}.
-@sp 1
-
-@cindex @code{Category} field
-@cindex @code{>Category:}
-@item >Category:
-(@sc{Text}) The name of the product, component or concept where
-the problem lies.  The values for this field are defined by the Support
-Site. 
-@ifclear SENDPR
-@xref{categories file,,The @code{categories} file}, for details.
-@end ifclear
-
-@cindex @code{Class} field
-@cindex @code{>Class:}
-@item >Class:
-(@sc{Enumerated}) The class of a problem can be one of the following:
-
-@table @code
-@cindex @emph{sw-bug} class
-@item sw-bug
-A general product problem.  (@samp{sw} stands for ``software''.)
-
-@cindex @emph{doc-bug} class
-@item doc-bug
-A problem with the documentation.
-
-@cindex @emph{change-request} class
-@item change-request
-A request for a change in behavior, etc.
-
-@cindex @emph{support} class
-@item support
-A support problem or question.
-
-@cindex @emph{duplicate} class
-@item duplicate (@var{pr-number})
-Duplicate PR.  @var{pr-number} should be the number of the original PR.
-
-@ifclear SENDPR
-@cindex @emph{mistaken} class
-@item mistaken  
-No problem, user error or misunderstanding.  This value is valid only at
-the Support Site.
-@end ifclear
-@end table
-
-@noindent
-The default is @samp{sw-bug}.
-@sp 1
-
-@cindex @code{Release} field
-@cindex @code{>Release:}
-@item >Release:
-(@sc{Text}) Release or version number of the product, component or
-concept.
-
-@cindex @code{Environment} field
-@cindex @code{>Environment:}
-@item >Environment:
-(@sc{MultiText}) Description of the environment where the problem occured:
-machine architecture, operating system, host and target types,
-libraries, pathnames, etc.
-
-@cindex @code{Description} field
-@cindex @code{>Description:}
-@item >Description:
-(@sc{MultiText}) Precise description of the problem.
-
-@cindex @code{How-To-Repeat} field
-@cindex @code{>How-To-Repeat:}
-@item >How-To-Repeat:
-(@sc{MultiText}) Example code, input, or activities to reproduce the
-problem.  The support organization uses example code both to reproduce
-the problem and to test whether the problem is fixed.  Include all
-preconditions, inputs, outputs, conditions after the problem, and
-symptoms.  Any additional important information should be included.
-Include all the details that would be necessary for someone else to
-recreate the problem reported, however obvious.  Sometimes seemingly
-arbitrary or obvious information can point the way toward a solution.
-See also @ref{Helpful hints,,Helpful hints}.
-
-@cindex @code{Fix} field
-@cindex @code{>Fix:}
-@item >Fix:
-(@sc{MultiText}) A description of a solution to the problem, or a patch
-which solves the problem.  (This field is most often filled in at the
-Support Site; we provide it to the submitter in case she has solved the
-problem.)
-
-@end table
-
-@noindent
-@sc{gnats} adds the following fields when the PR arrives at the Support
-Site:
-
-@table @code
-@cindex @code{Number} field
-@cindex @code{>Number:}
-@item >Number:
-(@sc{Enumerated}) The incremental identification number for this PR.
-@ifclear SENDPR
-This is included in the automated reply to the submitter (if that
-feature of @sc{gnats} is activated; @pxref{Local configuration,,Changing
-your local configuration}).  It is also included in the copy of the PR
-that is sent to the maintainer.
-@end ifclear
-
-The @samp{>Number:} field is often paired with the @samp{>Category:}
-field as
-
-@smallexample
-@var{category}/@var{number}
-@end smallexample
-
-@noindent
-in subsequent email messages.  This is for historical reasons, as well
-as because Problem Reports are stored in subdirectories which are named
-by category.
-
-@cindex @code{State} field
-@cindex @code{>State:}
-@item >State:
-(@sc{Enumerated}) The current state of the PR.  Accepted values are:
-
-@table @code
-@item open
-The PR has been filed and the responsible person notified.
-
-@item analyzed
-The responsible person has analyzed the problem.
-
-@item feedback
-The problem has been solved, and the originator has been given a patch
-or other fix.
-
-@item closed
-The changes have been integrated, documented, and tested, and the
-originator has confirmed that the solution works.
-
-@item suspended
-Work on the problem has been postponed.
-@end table
-
-@noindent
-The initial state of a PR is @samp{open}.  @xref{States,,States of
-Problem Reports}.
-
-@cindex @code{Responsible} field
-@cindex @code{>Responsible:}
-@item >Responsible:
-(@sc{Text}) The person responsible for this category.
-@ifclear SENDPR
-@sc{gnats} retrieves this information from the @file{categories} file
-(@pxref{categories file,,The @code{categories} file}).
-@end ifclear
-
-@cindex @code{>Arrival-Date:}
-@cindex @code{Arrival-Date} field
-@item >Arrival-Date:
-(@sc{Text}) The time that this PR was received by @sc{gnats}.  The date
-is provided automatically by @sc{gnats}.
-
-@cindex @code{>Audit-Trail:}
-@cindex @code{Audit-Trail} field
-@item >Audit-Trail:
-(@sc{MultiText}) Tracks related electronic mail as well as changes in
-the @samp{>State:} and @samp{>Responsible:} fields with the sub-fields:
-
-@table @code
-@cindex @code{State-Changed-<From>-<To>:} in @code{>Audit-Trail:}
-@item @w{State-Changed-<From>-<To>: @var{oldstate}>-<@var{newstate}}
-The old and new @samp{>State:} field values.
-
-@cindex @code{Responsible-Changed-<From>-<To>:} in @code{>Audit-Trail:}
-@item @w{Responsible-Changed-<From>-<To>: @var{oldresp}>-<@var{newresp}}
-The old and new @samp{>Responsible:} field values.
-
-@cindex @code{State-Changed-By:} in @code{>Audit-Trail:}
-@cindex @code{Responsible-Changed-By:} in @code{>Audit-Trail:}
-@item State-Changed-By: @var{name}
-@itemx Responsible-Changed-By: @var{name}
-The name of the maintainer who effected the change.
-
-@cindex @code{State-Changed-When:} in @code{>Audit-Trail:}
-@cindex @code{Responsible-Changed-When:} in @code{>Audit-Trail:}
-@item State-Changed-When: @var{timestamp}
-@itemx Responsible-Changed-When: @var{timestamp}
-The time the change was made.
-
-@cindex @code{State-Changed-Why:} in @code{>Audit-Trail:}
-@cindex @code{Responsible-Changed-Why:} in @code{>Audit-Trail:}
-@item State-Changed-Why: @var{reason@dots{}}
-@itemx Responsible-Changed-Why: @var{reason@dots{}}
-The reason for the change.
-@end table
-
-@cindex subsequent mail
-@cindex other mail
-@cindex appending PRs
-@cindex saving related mail
-@cindex related mail
-@noindent
-The @samp{>Audit-Trail:} field also contains any mail messages received
-by @sc{gnats} related to this PR, in the order received.
-
-@cindex @code{>Unformatted:}
-@cindex @code{Unformatted} field
-@item
- >Unformatted:
-(@sc{MultiText}) Any random text found outside the fields in the
-original Problem Report.
-@end table
-
diff --git a/gnu/usr.bin/send-pr/doc/s-usage.texi b/gnu/usr.bin/send-pr/doc/s-usage.texi
deleted file mode 100644
index 5c9006b200af..000000000000
--- a/gnu/usr.bin/send-pr/doc/s-usage.texi
+++ /dev/null
@@ -1,570 +0,0 @@
-@c $FreeBSD$
-
-@c This is the usage section for send-pr.  It is called as 
-@c chapter (Invoking send-pr) by send-pr.texi, and also as
-@c section (Submitting Problem Reports) by gnats.texi (chapter/section
-@c identifiers are adjusted accordingly)
-
-@c FIXME!  This still seems jumbled...
-
-You can invoke @code{send-pr} from a shell prompt, or from within
-@sc{gnu} Emacs using @w{@samp{M-x send-pr}}.
-
-@menu
-* using send-pr::             Creating new Problem Reports
-* send-pr in Emacs::          Using send-pr from within Emacs
-* send-pr from the shell::    Invoking send-pr from the shell
-* Submitting via e-mail::     Submitting a Problem Report via direct e-mail
-* Helpful hints::
-@end menu
-
-@node using send-pr
-@section Creating new Problem Reports
-
-@c FIXME - this is a long node
-Invoking @code{send-pr} presents a PR @dfn{template} with a number of
-fields already filled in.  Complete the template as thoroughly as
-possible to make a useful bug report.  Submit only one bug with each PR.
-
-@cindex template
-A template consists of three sections:
-
-@table @dfn
-@item Comments
-The top several lines of a blank template consist of a series of
-comments that provide some basic instructions for completing the Problem
-Report, as well as a list of valid entries for the @samp{>Category:}
-field.  These comments are all preceded by the string @samp{SEND-PR:}
-and are erased automatically when the PR is submitted.  The
-instructional comments within @samp{<} and @samp{>} are also removed.
-(Only these comments are removed; lines you provide that happen to have
-those characters in them, such as examples of shell-level redirection,
-are not affected.)
-
-@item Mail Header
-@code{send-pr} creates a standard mail header.  @code{send-pr} completes
-all fields except the @samp{Subject:} line with default values.
-(@xref{Fields,,Problem Report format}.)
-
-@item @sc{gnats} fields
-These are the informational fields that @sc{gnats} uses to route your
-Problem Report to the responsible party for further action.  They should
-be filled out as completely as possible.  (@xref{Fields,,Problem Report
-format}.  Also see @ref{Helpful hints,,Helpful hints}.)
-@end table
-
-@ifset SENDPR
-@noindent
-For examples of a Problem Report template and complete Problem Report,
-see @ref{An Example}.
-@end ifset
-
-The default template contains your preconfigured @samp{>Submitter-Id:}.
-@code{send-pr} attempts to determine values for the @samp{>Originator:}
-and @samp{>Organization:} fields (@pxref{Fields,,Problem Report
-format}).  @code{send-pr} will set the @samp{>Originator:} field to
-the value of the @code{NAME} environment variable if it has been set;
-similarly, @samp{>Organization:} will be set to the value of @code{ORGANIZATION}.
-@code{send-pr} also attempts to find out some information
-about your system and architecture, and places this information in the
-@samp{>Environment:} field if it finds any.
-
-You may submit problem reports to different Support Sites from the
-default site by specifying the alternate site when you invoke
-@code{send-pr}.  @xref{send-pr from the shell}.
-Each @code{site} has its own list of categories for
-which it accepts Problem Reports.
-@c FIXME!  This should go in..
-@c For a list of sites to whom @code{send-pr} is configured to send
-@c Problem Reports, type @w{@samp{send-pr -S}}.
-@ifset SENDPR
-(@xref{default site,,Setting a default @var{site}}.)
-@end ifset
-
-@code{send-pr} also provides the mail header section of the template
-with default values in the @samp{To:}, @samp{From:}, and
-@samp{Reply-To:} fields.  The @samp{Subject:} field is empty.
-
-The template begins with a comment section:
-
-@cindex template comment section
-@cindex comment section in the PR template
-@smallexample
-@group
-SEND-PR: -*- send-pr  -*-
-SEND-PR: Lines starting with `SEND-PR' will be removed
-SEND-PR: automatically as well as all comments (the text 
-SEND-PR: below enclosed in `<' and `>').
-SEND-PR: 
-SEND-PR: Please consult the document `Reporting Problems 
-SEND-PR: Using send-pr' if you are not sure how to fill out
-SEND-PR: a problem report.
-SEND-PR:
-SEND-PR: Choose from the following categories:
-@end group
-@end smallexample
-
-@noindent
-and also contains a list of valid @code{>Category:} values for the
-Support Site to whom you are submitting this Problem Report.  One (and
-only one) of these values should be placed in the @code{>Category:}
-field.
-@ifset SENDPR
-A complete sample bug report, from template to completed PR, is shown in
-@ref{An Example}.  For a complete list of valid categories, type
-@w{@samp{send-pr -L}} at your prompt.  @xref{Valid Categories,,Valid
-Categories}, for a sample list of categories, .
-@end ifset
-
-@c FIXME.. this sounds awkward
-The mail header is just below the comment section.  Fill out the
-@samp{Subject:} field, if it is not already completed using the value of
-@samp{>Synopsis:}.  The other mail header fields contain default values.
-
-@cindex mail header section
-@smallexample
-@group
-To: @var{support-site}
-Subject: @emph{complete this field}
-From: @var{your-login}@@@var{your-site}
-Reply-To: @var{your-login}@@@var{your-site}
-X-send-pr-version: send-pr @value{VERSION}
-@end group
-@end smallexample
-
-@noindent
-where @var{support-site} is an alias on your local machine for the
-Support Site you wish to submit this PR to.
-
-The rest of the template contains @sc{gnats} fields.  Each field is
-either automatically completed with valid information (such as your
-@samp{>Submitter-Id:}) or contains a one-line instruction specifying the
-information that field requires in order to be correct.  For example,
-the @samp{>Confidential:} field expects a value of @samp{yes} or
-@samp{no}, and the answer must fit on one line; similarly, the
-@samp{>Synopsis:} field expects a short synopsis of the problem, which
-must also fit on one line.  Fill out the fields as completely as
-possible.  @xref{Helpful hints,,Helpful hints}, for suggestions as to
-what kinds of information to include.
-
-In this example, words in @emph{italics} are filled in with
-pre-configured information:
-
-@cindex @code{send-pr} fields
-@smallexample
-@group
->Submitter-Id: @emph{your submitter-id}
->Originator:   @emph{your name here}
->Organization:  
-    @emph{your organization}
->Confidential:<[ yes | no ] (one line)>
->Synopsis:    <synopsis of the problem (one line)>
->Severity:    <[non-critical | serious | critical](one line)>
->Priority:    <[ low | medium | high ] (one line)>
->Category:    <name of the product (one line)>
->Class:       <[sw-bug | doc-bug | change-request | support]>
->Release:     <release number (one line)>
->Environment:
-         <machine, os, target, libraries (multiple lines)>
-
->Description:
-       <precise description of the problem (multiple lines)>
->How-To-Repeat:
-       <code/input/activities to reproduce (multiple lines)>
->Fix:
-       <how to correct or work around the problem, if known 
-        (multiple lines)>
-@end group
-@end smallexample
-
-@cindex @code{Submitter-Id} field
-@cindex @code{>Submitter-Id:}
-When you finish editing the Problem Report, @code{send-pr} mails it to
-the address named in the @samp{To:} field in the mail header.
-@code{send-pr} checks that the complete form contains a valid
-@samp{>Category:}.
-
-@ifset SENDPR
-Your copy of @code{send-pr} should have already been customized on
-installation to reflect your @samp{>Submitter-Id:}.  (@xref{Installing
-send-pr, , Installing @code{send-pr} on your system}.)  If you don't
-know your @samp{>Submitter-Id:}, you can request it using
-@w{@samp{send-pr --request-id}}.  If your organization is not affiliated
-with the site you send Problem Reports to, a good generic
-@samp{>Submitter-Id:} to use is @samp{net}. @emph{NOTE:} If you are using
-send-pr to send problem reports to the FreeBSD Project, this version of
-send-pr already has a customer ID in it and you do not need to request a
-new one.
-@end ifset
-
-@cindex bad Problem Reports
-@cindex errors
-@cindex invalid Problem Reports
-If your PR has an invalid value in one of the @sc{Enumerated} fields
-(@pxref{Fields,,Problem Report format}), @code{send-pr} places the PR in
-a temporary file named @samp{/tmp/pbad@var{nnnn}} on your machine.
-@var{nnnn} is the process identification number given to your current
-@code{send-pr} session.  If you are running @code{send-pr} from the
-shell, you are prompted as to whether or not you wish to try editing the
-same Problem Report again.  If you are running @code{send-pr} from
-Emacs, the Problem Report is placed in the buffer
-@w{@samp{*send-pr-error*}}; you can edit this file and then submit it
-with
-
-@smallexample
-M-x gnats-submit-pr
-@end smallexample
-
-@cindex subsequent mail
-@cindex other mail
-@cindex appending PRs
-@cindex saving related mail
-@cindex related mail
-Any further mail concerning this Problem Report should be carbon-copied
-to the @sc{gnats} mailing address as well, with the category and
-identification number in the @samp{Subject:} line of the message.
-
-@smallexample
-Subject: Re: PR @var{category}/@var{gnats-id}: @var{original message subject}
-@end smallexample
-
-@noindent
-Messages which arrive with @samp{Subject:} lines of this form are
-automatically appended to the Problem Report in the @samp{>Audit-Trail:}
-field in the order received.
-
-@c ---------------------------------------------------------------
-@node send-pr in Emacs 
-@section Using @code{send-pr} from within Emacs
-@cindex using @code{send-pr} from within Emacs
-@cindex @code{send-pr} within Emacs
-@cindex invoking @code{send-pr} from Emacs
-@cindex interactive interface
-
-You can use an interactive @code{send-pr} interface from within @sc{gnu}
-Emacs to fill out your Problem Report.  We recommend that you
-familiarize yourself with Emacs before using this feature
-(@pxref{Introduction,,Introduction,emacs,GNU Emacs}).
-
-Call @code{send-pr} with @w{@samp{M-x send-pr}}.@footnote{If typing
-@w{@samp{M-x send-pr}} doesn't work, see your system administrator for
-help loading @code{send-pr} into Emacs.}  @code{send-pr} responds with a
-Problem Report template preconfigured for the Support Site from which
-you received @code{send-pr}.  (If you use @code{send-pr} locally, the
-default Support Site is probably your local site.)
-
-You may also submit problem reports to different Support Sites from the
-default site.  To use this feature, invoke @code{send-pr} with
-
-@smallexample
-C-u M-x send-pr
-@end smallexample
-
-@code{send-pr} prompts you for the name of a @var{site}.  @var{site} is
-an alias on your local machine which points to an alternate Support
-Site.
-
-@cindex Emacs
-@code{send-pr} displays the template and prompts you in the minibuffer
-with the line:
-@smallexample
->Category: other
-@end smallexample
-
-@noindent
-Delete the default value @samp{other} @emph{in the minibuffer} and
-replace it with the keyword corresponding to your problem (the list of
-valid categories is in the topmost section of the PR template).  For
-example, if the problem you wish to report has to do with the @sc{gnu} C
-compiler, and your support organization accepts bugs submitted for this
-program under the category @samp{gcc}, delete @samp{other} and then type
-@w{@samp{gcc[@key{RET}]}}.  @code{send-pr} replaces the line
-
-@smallexample
->Category:       <name of the product (one line)>
-@end smallexample
-
-@noindent
-in the template with
-
-@smallexample
->Category:       gcc
-@end smallexample
-
-@noindent
-and moves on to another field.  
-
-@cindex completion in Emacs
-@cindex name completion in Emacs
-@w{@code{send-pr}} provides name completion in the minibuffer.  For
-instance, you can also type @w{@samp{gc[@key{TAB}]}}, and @code{send-pr}
-attempts to complete the entry for you.  Typing @w{@samp{g[@key{TAB}]}}
-may not have the same effect if several possible entries begin with
-@samp{g}.  In that case @code{send-pr} cannot complete the entry because
-it cannot determine whether you mean @samp{gcc} or, for example,
-@samp{gdb}, if both of those are possible categories.
-@w{@code{send-pr}} continues to prompt you for a valid entry until you
-enter one.
-
-@w{@code{send-pr}} prompts you interactively to enter each field for
-which there is a range of specific choices.  If you attempt to enter a
-value which is not in the range of acceptable entries, @code{send-pr}
-responds with @w{@samp{[No match]}} and allows you to change the entry
-until it contains an acceptable value.  This avoids unusable information
-(at least in these fields) and also avoids typographical errors which
-could cause problems later.
-
-@code{send-pr} prompts you for the following fields:
-
-@c FIXME - should these go before the discussion on completion?
-@example
-@group
->Category:
->Confidential: (@emph{default}:  no)
->Severity:     (@emph{default}:  serious)
->Priority:     (@emph{default}:  medium)
->Class:        (@emph{default}:  sw-bug)
->Release:
->Synopsis:     (@emph{this value is copied to @code{Subject:}})
-@end group
-@end example
-
-@noindent
-After you complete these fields, @w{@code{send-pr}} places the cursor in
-the @samp{>Description:} field and displays the message
-
-@smallexample
-To send the problem report use: C-c C-c
-@end smallexample
-
-@noindent
-in the minibuffer.  At this point, edit the file in the main buffer to
-reflect your specific problem, putting relevant information in the
-proper fields.
-@ifset SENDPR
-@xref{An Example}, for a sample Problem Report.
-@end ifset
-
-@w{@samp{send-pr}} provides a few key bindings to make moving
-around in a template buffer more simple:
-
-@table @code
-@item C-c C-f
-@itemx M-x change-field
-Changes the field under the cursor.  @code{edit-pr} prompts you for a
-new value.
-
-@item M-C-b
-@itemx M-x gnats-backward-field
-Moves the cursor to the beginning of the value of the current field.
-
-@item M-C-f
-@itemx M-x gnats-forward-field
-Moves the cursor to the end of the value of the current field.
-
-@item M-p
-@itemx M-x gnats-previous-field
-Moves the cursor back one field to the beginning of the value of the
-previous field.
-
-@item M-n
-@itemx M-x gnats-next-field
-Moves the cursor forward one field to the beginning of the value of the
-next field.
-@end table
-
-@code{send-pr} takes over again when you type @samp{C-c C-c} to send the
-message.  @code{send-pr} reports any errors in a separate buffer, which
-remains in existence until you send the PR properly (or, of course,
-until you explicitly kill the buffer).
-
-For detailed instructions on using Emacs, see
-@ref{Introduction,,,emacs,GNU Emacs}.
-
-@node send-pr from the shell
-@section Invoking @code{send-pr} from the shell
-@cindex command line options
-@cindex invoking @code{send-pr} from the shell
-@cindex shell invocation
-
-@c FIXME!  Add [ -S ] right after [ -L ]...
-@smallexample
-send-pr [ @var{site} ]
-        [ -f @var{problem-report} | --file @var{problem-report} ]
-        [ -t @var{mail-address} | --to @var{mail-address} ]
-        [ --request-id ]
-        [ -L | --list ] [ -P | --print ]
-        [ -V | --version] [ -h | --help ]
-@end smallexample
-
-@var{site} is an alias on your local machine which points to an address
-used by a Support Site.  If this argument is not present, the default
-@var{site} is usually the site which you received @code{send-pr} from,
-or your local site if you use @sc{gnats} locally.
-@ifset SENDPR
-(@xref{default site,,Setting a default @var{site}}.)
-@end ifset
-
-Invoking @code{send-pr} with no options calls the editor named in your
-environment variable @code{EDITOR} on a default PR template.  If the
-environment variable @code{PR_FORM} is set, its value is used as a file
-name which contains a valid template.  If @code{PR_FORM} points to a
-missing or unreadable file, or if the file is empty, @code{send-pr}
-generates an error message and opens the editor on a default template.
-
-@table @code
-@item -f @var{problem-report}
-@itemx --file @var{problem-report}
-Specifies a file, @var{problem-report}, where a completed Problem Report
-already exists.  @code{send-pr} sends the contents of the file without
-invoking an editor.  If @var{problem-report} is @samp{-},
-@w{@code{send-pr}} reads from standard input.
-
-@item -t @var{mail-address}
-@itemx --to @var{mail-address}
-Sends the PR to @var{mail-address}. The default is preset when
-@code{send-pr} is configured.  @emph{This option is not recommended};
-instead, use the argument @var{site} on the command line.
-
-@item -c @var{mail-address}
-@itemx --cc @var{mail-address}
-Places @var{mail-address} in the @code{Cc:} header field of the message
-to be sent.
-
-@item --request-id
-Sends a request for a @code{>Submitter-Id:} to the Support Site.
-
-@cindex listing valid categories
-@item -L
-@itemx --list
-Prints the list of valid @code{>Category:} values on standard output.
-No mail is sent.
-
-@item -s @var{severity}
-@itemx --severity @var{severity}
-@cindex @code{send-pr} fields
-Sets the initial value of the @code{>Severity:} field to @var{severity}.
-
-@ignore
-@item -S
-@itemx --sites
-Displays a list of valid @var{site} values on standard output.  No mail
-is sent.
-@end ignore
-
-@item -P
-@itemx --print
-Displays the PR template.  If the variable @code{PR_FORM} is set in your
-environment, the file it specifies is printed.  If @code{PR_FORM} is not
-set, @code{send-pr} prints the standard blank form.  If the file
-specified by @code{PR_FORM} doesn't exist, @code{send-pr} displays an
-error message.  No mail is sent.
-
-@item -V
-@itemx --version
-Displays the @code{send-pr} version number and a usage summary.  No mail
-is sent.
-
-@item -h
-@itemx --help
-Displays a usage summary for @code{send-pr}.  No mail is sent.
-@end table
-
-@c -------------------------------------------------------------------------
-@node Submitting via e-mail
-@section Submitting a Problem Report via direct e-mail
-@cindex Direct e-mail
-@cindex Submitting a PR via e-mail
-In addition to using @code{send-pr}, there is another way to submit a problem
-report.  You can simply send an e-mail message to the support site.
-
-To do this, look at the address in the @samp{To:} field of the @code{send-pr}
-template.  When you send unformatted e-mail to this address, @sc{gnats}
-processes the message as a new problem report, filling in as many fields from 
-defaults as it can:
-
-@table @code
-@item Synopsis
-The @samp{>Synopsis} field is filled in by the @samp{Subject:} header.
-
-@item Submitter ID
-@sc{gnats} will try to derive the @samp{>Submitter} field from the address
-in the @samp{From:} header.
-
-@item Description
-All of the text in the body of the e-mail message is put into the 
-@samp{>Description} field.  Each line of the text is indented by one space,
-indicating that it is "quoted text" from the sender.
-@end table
-
-Other fields, such as category, version, severity, etc. are set to default
-values (if the @sc{gnats} administrator has set them).
-
-@c --------------------------------------------------------------------------
-@node Helpful hints
-@section Helpful hints
-@cindex helpful hints
-@cindex Using and Porting @sc{gnu} CC
-@cindex effective problem reporting
-@cindex kinds of helpful information
-@cindex information to submit
-@cindex Report all the facts!
-
-There is no orthodox standard for submitting effective bug reports,
-though you might do well to consult the section on submitting bugs for
-@sc{gnu} @code{gcc} in @ref{Bugs, , Reporting Bugs, gcc, Using and
-Porting GNU CC}, by Richard Stallman.  This section contains
-instructions on what kinds of information to include and what kinds of
-mistakes to avoid.
-
-In general, common sense (assuming such an animal exists) dictates the
-kind of information that would be most helpful in tracking down and
-resolving problems in software.  
-@itemize @bullet
-@item 
-Include anything @emph{you} would want to know if you were looking at
-the report from the other end.  There's no need to include every minute
-detail about your environment, although anything that might be different
-from someone else's environment should be included (your path, for
-instance).
-
-@item 
-Narratives are often useful, given a certain degree of restraint.  If a
-person responsible for a bug can see that A was executed, and then B and
-then C, knowing that sequence of events might trigger the realization of
-an intermediate step that was missing, or an extra step that might have
-changed the environment enough to cause a visible problem.  Again,
-restraint is always in order (``I set the build running, went to get a
-cup of coffee (Columbian, cream but no sugar), talked to Sheila on the
-phone, and then THIS happened@dots{}'') but be sure to include anything
-relevant.
-
-@item 
-Richard Stallman writes, ``The fundamental principle of reporting bugs
-usefully is this: @strong{report all the facts}.  If you are not sure
-whether to state a fact or leave it out, state it!''  This holds true
-across all problem reporting systems, for computer software or social
-injustice or motorcycle maintenance.  It is especially important in the
-software field due to the major differences seemingly insignificant
-changes can make (a changed variable, a missing semicolon, etc.).
-
-@item
-Submit only @emph{one} problem with each Problem Report.  If you have
-multiple problems, use multiple PRs.  This aids in tracking each problem
-and also in analyzing the problems associated with a given program.
-
-@item
-It never hurts to do a little research to find out if the bug you've
-found has already been reported.  Most software releases contain lists
-of known bugs in the Release Notes which come with the software; see
-your system administrator if you don't have a copy of these.
-
-@item
-The more closely a PR adheres to the standard format, the less
-interaction is required by a database administrator to route the
-information to the proper place.  Keep in mind that anything that
-requires human interaction also requires time that might be better spent
-in actually fixing the problem.  It is therefore in everyone's best
-interest that the information contained in a PR be as correct as
-possible (in both format and content) at the time of submission.
-@end itemize
diff --git a/gnu/usr.bin/send-pr/doc/send-pr.texi b/gnu/usr.bin/send-pr/doc/send-pr.texi
deleted file mode 100644
index 1abb296d8645..000000000000
--- a/gnu/usr.bin/send-pr/doc/send-pr.texi
+++ /dev/null
@@ -1,658 +0,0 @@
-@c $FreeBSD$
-
-\input texinfo   @c -*-texinfo-*-
-@setfilename send-pr.info
-@settitle Reporting Problems Using send-pr
-
-@setchapternewpage odd
-
-@include version.texi
-@set SENDPR
-
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* send-pr: (send-pr).		Reporting problems--using send-pr
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-
-@ifinfo
-Copyright @copyright{} 1993, 1994, 1995 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-@ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries a copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-
-@end ignore
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that
-the entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions.
-@end ifinfo
-
-@titlepage
-@finalout
-@title Reporting Problems
-@subtitle Using @code{send-pr}, version @value{VERSION}
-@subtitle October 1993
-@author Jeffrey M. Osier
-@author Cygnus Support
-@page
-
-@vskip 0pt plus 1filll
-
-Copyright @copyright{} 1993, 1994, 1995 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that
-the entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions.
-
-@end titlepage
-
-@c ---------------------------------------------------------------
-@node Top
-@top Overview
-@cindex foreword to @code{send-pr}
-@cindex overview to @code{send-pr}
-@cindex introduction to @code{send-pr}
-
-This manual documents @code{send-pr}, 
-@ifinfo
-version @value{VERSION},
-@end ifinfo
-which uses electronic mail to submit support questions and problem
-reports to a central Support Site.  No body of work is perfect, and
-support organizations understand this; @code{send-pr} is designed to
-allow users who have problems to submit reports of these problems to
-sites responsible for supporting the products in question, in a defined
-form which can be read by an electronically managed database.
-
-@cindex GNATS
-@code{send-pr} is part of a suite of programs known collectively as
-@sc{gnats}, the @sc{gnu} Problem Report Management System.  @sc{gnats}
-consists of several programs which, used in concert, formulate and
-partially administer a database of @dfn{Problem Reports}, or @dfn{PRs},
-at a central Support Site.  A PR goes through several states in its
-lifetime; @sc{gnats} tracks the PR and all information associated with it
-through each state and finally acts as an archive for PRs which have
-been @dfn{closed}.
-
-Because @code{send-pr} exists as a shell (@file{/bin/sh}) script and as
-an Elisp file for use with @sc{gnu} Emacs, it can be used from any
-machine on your network which can run a shell script and/or Emacs.
-
-In general, you can use any editor and mailer to submit valid Problem
-Reports, as long as the format required by @sc{gnats} is preserved.
-@code{send-pr} automates the process, however, and ensures that certain
-fields necessary for automatic processing are present.  @code{send-pr}
-is strongly recommended for all initial problem-oriented correspondence
-with your Support Site.  The organization you submit Problem Reports to
-supplies an address to which further information can be sent; the person
-responsible for the category of the problem you report contacts you
-directly.
-
-@menu
-* send-pr in detail::     Details about send-pr and GNATS
-* Invoking send-pr::      Editing and sending PRs
-* An Example::            A working example
-* Installing send-pr::    Installing send-pr on your system
-* Index::
-@end menu
-
-@node send-pr in detail
-@chapter Details about send-pr and GNATS
-
-@cindex details about @code{send-pr}
-@cindex Problem Reports
-A @dfn{Problem Report} is a message that describes a problem you are
-having with a body of work.  @code{send-pr} organizes this message into
-a form which can be understood and automatically processed by @sc{gnats},
-the @sc{gnu} Problem Report Management System.  A Problem Report is
-organized into @dfn{fields} which contain data describing you, your
-organization, and the problem you are announcing (@pxref{Fields,,Problem
-Report format}).  Problem Reports go through several defined states in
-their lifetimes, from @dfn{open} to @dfn{closed} (@pxref{States,,States
-of Problem Reports}).
-
-@menu
-* States::                     States of Problem Reports
-* Fields::                     Problem Report format
-@end menu
-
-@include states.texi
-
-@include fields.texi
-
-@node Invoking send-pr
-@chapter Editing and sending PRs
-@cindex editing and sending PRs
-@cindex sending PRs
-@cindex invoking send-pr
-@cindex using send-pr
-@cindex generating new PRs
-
-@include s-usage.texi
-
-@node An Example
-@chapter An Example
-@cindex an example
-@cindex example PR
-@cindex Cygnus Solutions
-@cindex @sc{gnu} software support
-Cygnus Solutions in Sunnyvale, CA, uses @sc{gnats} and @code{send-pr}
-extensively for their support activities.  As a support company, Cygnus
-finds problem tracking to be a crucial part of everyday business.
-Cygnus supports the @sc{gnu} compiling tools (including @sc{gnats} and
-@code{send-pr}) over several many platforms
-
-With each shipment of the Cygnus Solutions Developer's Kit, customers
-receive the latest version of @code{send-pr}, which contains an
-up-to-date listing of valid categories (values for the @code{>Category:}
-field).  Using these tools, Cygnus' customers can communicate their
-problems to Cygnus effectively and receive automatic confirmation of
-receipt as well as notification of changes in the status of their
-reported problems.  Much of Cygnus' support mechanism relies on
-electronic mail.
-
-As an example, let's pretend we're a customer of Cygnus Solutions, and
-that we're having a problem compiling some of our software using the
-@sc{gnu} C compiler, which Cygnus supports.
-
-Assume that we're getting an error in our @code{bifrabulator} program
-wherein the @samp{prestidigitation} routines don't match with the
-@samp{whatsitsname}.  We've made sure we're following the rules of the
-program and checked the Release Notes from Cygnus and found that the bug
-isn't already known.  In other words, we're pretty sure we've found a
-bug.
-
-@cindex Imaginary Software, Ltd.
-Our first step is to call @code{send-pr}.  It really doesn't matter
-whether we use @code{send-pr} from the shell or from within Emacs.
-Indeed, if we use Emacs as a primary editor, calling @code{send-pr} from
-the shell is likely to start @code{send-pr} in an Emacs buffer anyway.
-So, since our company, @emph{Imaginary Software, Ltd.}, uses @sc{gnu}
-software extensively, we're pretty familiar with Emacs, so from within
-Emacs we type
-@smallexample
-M-x send-pr
-@end smallexample
-@noindent
-and we're greeted with the following screen:
-
-@cindex default PR template
-@cindex example of a default template
-@cindex blank PR template
-@cindex @code{bifrabulator}
-@cartouche
-@smallexample
-SEND-PR: -*- text  -*-
-SEND-PR: Lines starting with `SEND-PR' will be removed 
-SEND-PR: automatically as well as all comments (the text
-SEND-PR: below enclosed in `<' and `>').
-SEND-PR: Please consult the manual if you are not sure
-SEND-PR: how to fill out a problem report.
-SEND-PR:
-SEND-PR: Choose from the following categories:
-SEND-PR:
-SEND-PR:           bfd       binutils  bison       
-SEND-PR: byacc     clib      config    cvs         diff        
-SEND-PR: doc       emacs     flex      g++         gas         
-SEND-PR: gcc       gdb       glob      gprof       grep        
-SEND-PR: info      ispell    kerberos  ld          libg++      
-SEND-PR: libiberty make      makeinfo  mas         newlib      
-SEND-PR: other     patch     rcs       readline    send-pr     
-SEND-PR: test      texindex  texinfo   texinfo.tex 
-SEND-PR: bifrabulator  <---@emph{note: this one is fake}
-SEND-PR:
-To: cygnus-bugs@@cygnus.com 
-Subject: 
-From: jeffrey@@imaginary.com
-Reply-To: jeffrey@@imaginary.com
-X-send-pr-version: send-pr @value{VERSION}
-
->Submitter-Id:  imaginary
->Originator:    Jeffrey Osier
->Organization:  
-Imaginary Software, Ltd.
->Confidential:  <[ yes | no ] (one line)>
->Synopsis:      <synopsis of the problem (one line)>
->Severity:      <[ non-critical | serious | critical ] (one line)>
->Priority:      <[ low | medium | high ] (one line)>
->Category:      <name of the product (one line)>
->Class:         <[sw-bug|doc-bug|change-request|support](oneline)>
->Release:       <release number or tag (one line)>
->Environment:
-         <machine, os, target, libraries (multiple lines)>
-System: SunOS imaginary.com 4.1.1 1 sun4
-Architecture: sun4
-
->Description:
-       <precise description of the problem (multiple lines)>
->How-To-Repeat:
-       <code/input/activities to reproduce (multiple lines)>
->Fix:
-@iftex
-@hrule
-@end iftex
------Emacs: *send-pr*   (send-pr Fill)----All------------------
-@iftex
-@hrule
-@end iftex
->Category: other[]
-@end smallexample
-@end cartouche
-@page
-We know from past experience that we need to set certain information into
-each field, so we compile all the information we know about our problem.
-We have some sample code which we know should work, even though it
-doesn't, so we'll include that.  Below is the completed PR; we send this
-using @kbd{C-c C-c}.  (The comments have been truncated).
-
-@cindex completed Problem Report
-@cindex example of a completed PR
-@cartouche
-@smallexample
-SEND-PR: Lines starting with `SEND-PR' will be removed
-SEND-PR: automatically as well as all comments (the text
-SEND-PR: @dots{}
-SEND-PR:
-To: cygnus-bugs@@cygnus.com 
-Subject: bifrabulator routines don't match
-From: jeffrey@@imaginary.com
-Reply-To: jeffrey@@imaginary.com
-X-send-pr-version: send-pr @value{VERSION}
-
->Submitter-Id:  imaginary
->Originator:    Jeffrey Osier
->Organization:  
-Imaginary Software, Ltd.
->Confidential:  no
->Synopsis:      bifrabulator routines don't match
->Severity:      serious
->Priority:      medium
->Category:      bifrabulator
->Class:         sw-bug
->Release:       progressive-930101
->Environment:   
-System: SunOS imaginary.com 4.1.1 1 sun4
-Architecture: sun4 (SPARC)
-
->Description:
-   the following code I fed into the bifrabulator came back 
-   with a strange error.  apparently, the prestidigitation 
-   routine doesn't match with the whatsitsname in all cases.
-
->How-To-Repeat:
-   call the bifrabulator on the following code.
-   @emph{code sample@dots{}}
-
->Fix:
-@iftex
-@hrule
-@end iftex
------Emacs: *send-pr*   (send-pr Fill)----All------------------
-@iftex
-@hrule
-@end iftex
-To send the problem report use: C-c C-c
-@end smallexample
-@end cartouche
-
-We type @kbd{C-c C-c}, and off it goes.  Now, we depend on Cygnus
-Support to figure out the answer to our problem.
-
-Soon afterward, we get the following message from Cygnus:
-
-@smallexample
-@group
-From: gnats (GNATS management)
-Sender: gnats-admin
-Reply-To: hacker@@cygnus.com
-To: jeffrey@@imaginary.com
-Subject: Re: bifrabulator/1425: routines don't match
-
-Thank you very much for your problem report.
-It has the internal identification: g++/1425.
-The individual assigned to look at your bug is:  hacker
-(F.B. Hacker)
-
-Category: bifrabulator
-Responsible: hacker
-Synopsis: bifrabulator routines don't match
-Arrival-Date: Sat Feb 30 03:12:55 1993
-@end group
-@end smallexample
-
-@noindent
-This is our receipt that the bug has been accepted and forwarded to the
-responsible party.
-
-@noindent
-A while later, we get the analysis:
-
-@smallexample
-@group
-To:  jeffrey@@imaginary.com
-From:  hacker@@cygnus.com
-Subject:  Re: bifrabulator/1425: routines don't match
-Reply-To: hacker@@cygnus.com
-
-Got your message, Jeff.  It seems that the bifrabulator was 
-confusing the prestidigitation routines with the realitychecker
-when lexically parsing the whatsitsname.
-
-I'm working on robustisizing the bifrabulator now.
-
-How about lunch next week?
---
-F.B. Hacker
-Cygnus Solutions, Sunnyvale, CA  408 542 9600
-#include <std-disclaimer.h>
-@end group
-@end smallexample
-
-@noindent
-About the same time, we get another message from Cygnus.
-
-@cindex state change example
-@cindex example of a state change
-@smallexample
-@group
-From: hacker@@cygnus.com
-To:  jeffrey@@imaginary.com
-Subject:  Re: bifrabulator/1425: doesn't match prestidig
-Reply-To:  hacker@@cygnus.com
-
-
-             `F.B. Hacker' changed the state to `analyzed'.
-
-State-Changed-From-To: open-analyzed
-State-Changed-By: hacker
-State-Changed-When: Fri Feb 31 1993 08:59:16 1993
-State-Changed-Why:
-    figured out the problem, working on a patch this afternoon
---
-F.B. Hacker
-Cygnus Solutions, Sunnyvale, CA  408 542 9600
-#include <std-disclaimer.h>
-@end group
-@end smallexample
-
-@noindent
-The bug has now been analyzed, and Cygnus is working on a solution.
-
-@noindent
-Sometime later, we get more mail from F.B.:
-
-@smallexample
-@group
-To:  jeffrey@@imaginary.com
-From:  hacker@@cygnus.com
-Subject:  Re: bifrabulator/1425: routines don't match
-Reply-To: hacker@@cygnus.com
-
-There's a patch now that you can ftp over and check out.
-
-Hey, that joke you sent me was great!  The one about the
-strings walking into a bar...  my boss laughed for an hour!
---
-F.B. Hacker
-Cygnus Solutions, Sunnyvale, CA  408 542 9600
-#include <std-disclaimer.h>
-@end group
-@end smallexample
-@sp 2
-@smallexample
-@group
-From: hacker@@cygnus.com
-To:  jeffrey@@imaginary.com
-Subject:  Re: bifrabulator/1425: doesn't match prestidig
-Reply-To:  hacker@@cygnus.com
-
-
-             `F.B. Hacker' changed the state to `feedback'.
-
-State-Changed-From-To: analyzed-feedback
-State-Changed-By: hacker
-State-Changed-When: Fri Feb 31 1993 23:43:16 1993
-State-Changed-Why:
-    got the patch finished, notified Jeff at Imaginary Software
---
-F.B. Hacker
-Cygnus Solutions, Sunnyvale, CA  408 542 9600
-#include <std-disclaimer.h>
-@end group
-@end smallexample
-
-@noindent
-The bug has gone into @dfn{feedback} status now, until we get the patch,
-install it and test it.  When everything tests well, we can mail F.B.
-back and tell him the bug's been fixed, and he can change the state of
-the PR from @dfn{feedback} to @dfn{closed}.
-
-Following is a list of valid @samp{>Category:} entries that are
-supported by Cygnus.
-
-@menu
-* Valid Categories::
-@end menu
-
-@c FIXME - is this list up to date?
-@include categ.texi
-
-@node Installing send-pr
-@appendix Installing @code{send-pr} on your system
-@cindex installation
-
-If you receive @code{send-pr} as part of a larger software distribution,
-it probably gets installed when the full distribution is installed.  If
-you are using @sc{gnats} at your site as well, you must decide where
-@code{send-pr} sends Problem Reports by default; see @ref{default site,,
-Setting a default @var{site}}.
-
-@menu
-* installation::   installing `send-pr' by itself
-* default site::   setting a default site
-@end menu
-
-@node installation
-@section Installing @code{send-pr} by itself
-@cindex installation procedure
-
-Install @code{send-pr} by following these steps (you may need
-@code{root} access in order to change the @file{aliases} file and to
-install @code{send-pr}):
-
-@itemize @bullet
-@item
-Unpack the distribution into a directory which we refer to as
-@var{srcdir}.
-
-@item
-Edit the file @file{Makefile} to reflect local conventions.
-Specifically, you should edit the variable @samp{prefix} to alter the
-installation location.  The default is @file{/usr/local}.  All files are
-installed under @samp{prefix} (see below).
-
-@item @emph{Run}
-@smallexample
-make all install [ info ] [ install-info ] [ clean ]
-@end smallexample
-
-@noindent
-The targets mean the following:
-
-@table @code
-@item all
-Builds @code{send-pr} and @code{install-sid}
-
-@item install
-Installs the following:
-
-@table @code
-@item install-sid
-@itemx send-pr
-into @file{@var{prefix}/bin}
-
-@item send-pr.1
-into @file{@var{prefix}/man/man1}
-
-@item @var{site}
-the list of valid @var{categories} for the Support Site from which you
-received @code{send-pr}, installed as
-@w{@file{@var{prefix}/share/gnats/@var{site}}}
-
-@item send-pr.el
-into @w{@file{@var{prefix}/share/emacs/lisp}}@footnote{If your main Emacs
-lisp repository is in a different directory from this, substitute that
-directory for @w{@file{@var{prefix}/share/emacs/lisp}}.}
-@end table
-
-@item info (@emph{optional})
-Builds @file{send-pr.info} from @file{send-pr.texi}@*
-@c FIXME - is this still true?
-(@file{send-pr.info} is included with this distribution)
-
-@item install-info (@emph{optional})
-Installs @file{send-pr.info} into @w{@file{@var{prefix}/info}}
-
-@item clean (@emph{optional})
-Removes all intermediary build files that can be rebuilt from source
-code
-@end table
-
-@item
-Run
-
-@smallexample
-install-sid @var{your-sid}
-@end smallexample
-
-@noindent
-where @var{your-sid} is the identification code you received with
-@w{@code{send-pr}}.  @code{send-pr} automatically inserts this value
-into the template field @samp{>Submitter-Id:}.  If you've downloaded
-@code{send-pr} from the Net, use @samp{net} for this value.
-
-@item 
-Place the following line in
-@w{@file{@var{prefix}/share/emacs/lisp/default.el}}, or instruct your
-users to place the following line in their @file{.emacs} files:
-
-@smallexample
-(autoload 'send-pr "send-pr" "Submit a Problem Report." t)
-@end smallexample
-
-@item 
-Create a mail alias for the Support Site from which you received
-@code{send-pr}, and for every site with which you wish to use
-@code{send-pr} to communicate.  Each alias must have a suffix of
-@samp{-gnats}.  The Support Site(s) will provide the correct addresses
-where these aliases should point.  For instance, edit your mail aliases
-file to contain something like:
-
-@smallexample
-# support sites; for use with send-pr
-cygnus-gnats:     bugs@@cygnus.com            # Cygnus Solutions
-bumblebee-gnats:  bumblebugs@@bumblebee.com   # Bumblebee Inc.
-mycompany-gnats:  bugs@@my.company.com (@emph{if you use @sc{gnats} locally})
-@end smallexample
-
-@code{send-pr} automatically searches for these aliases when you type
-
-@smallexample
-send-pr cygnus
-send-pr bumblebee
-send-pr @var{site}@dots{}
-@end smallexample
-
-@noindent
-@code{send-pr} also uses @var{site} to determine the categories of
-problems accepted by the site in question by looking in
-
-@smallexample
-@var{prefix}/share/gnats/@var{site}
-@end smallexample
-
-@end itemize
-
-@node default site
-@section Setting a default @var{site}
-@cindex default @var{site}
-@cindex setting a default @var{site}
-
-@code{send-pr} is capable of sending Problem Reports to any number of
-Support Sites, using mail aliases which have @samp{-gnats} appended them.
-@code{send-pr} automatically appends the suffix, so that when you type
-
-@smallexample
-send-pr @var{site}
-@end smallexample
-
-@noindent
-the Problem Report goes to the address noted in the @file{aliases} file
-as @w{@samp{@var{site}-gnats}}.  You can do this in the Emacs version of
-@code{send-pr} by invoking the program with
-
-@smallexample
-C-u M-x send-pr
-@end smallexample
-
-@noindent
-You are prompted for @var{site}.
-
-@var{site} is also used to error-check the @samp{>Category:} field, as a
-precaution against sending mistaken information (and against sending
-information to the wrong site).
-
-You may also simply type
-
-@smallexample
-send-pr
-@end smallexample
-
-@noindent
-from the shell (or @w{@samp{M-x send-pr}} in Emacs), and the Problem
-Report you generate will be sent to the @var{site}, which is usually the
-site from which you received your distribution of @w{@code{send-pr}}.
-If you use @sc{gnats} at your own organization, the default is usually
-your local address for reporting problems.
-
-To change this, simply edit the file @file{Makefile} before installing
-and change the line 
-
-@smallexample
-GNATS_SITE = @var{site}
-@end smallexample
-
-@noindent
-to reflect the site where you wish to send PRs by default.
-
-@c ---------------------------------------------------------------
-@node Index
-@unnumbered Index
-
-@printindex cp
-
-@c ---------------------------------------------------------------
-@contents
-@bye
diff --git a/gnu/usr.bin/send-pr/doc/states.texi b/gnu/usr.bin/send-pr/doc/states.texi
deleted file mode 100644
index f38405c8f292..000000000000
--- a/gnu/usr.bin/send-pr/doc/states.texi
+++ /dev/null
@@ -1,58 +0,0 @@
-@c $FreeBSD$
-
-@node States
-@section States of Problem Reports
-
-@cindex life-cycle of a Problem Report
-@cindex states of Problem Reports
-@cindex Problem Report states
-@cindex automatic notification
-
-Each PR goes through a defined series of states between origination and
-closure.  The originator of a PR receives notification automatically of
-any state changes.
-
-Unless your site has customized states (see @pxref{states
-file,,,gnats}), @sc{gnats} uses these states:
-
-@table @dfn
-@cindex @emph{open} state
-@cindex initial state (@dfn{open})
-@cindex state---@dfn{open}
-@item open
-The initial state of a Problem Report.  This means the PR has been filed
-and the responsible person(s) notified.
-
-@cindex @emph{analyzed} state
-@cindex state---@dfn{analyzed}
-@item analyzed
-The responsible person has analyzed the problem.  The analysis should
-contain a preliminary evaluation of the problem and an estimate of the
-amount of time and resources necessary to solve the problem.  It should
-also suggest possible workarounds.
-
-@cindex @emph{feedback} state
-@cindex state---@dfn{feedback}
-@item feedback
-The problem has been solved, and the originator has been given a patch
-or other fix.  The PR remains in this state until the originator
-acknowledges that the solution works.
-
-@cindex @emph{closed} state
-@cindex state---@dfn{closed}
-@cindex final state (@dfn{closed})
-@item closed
-A Problem Report is closed (``the bug stops here'') only when any
-changes have been integrated, documented, and tested, and the submitter
-has confirmed the solution.
-
-@cindex @emph{suspended} state
-@cindex state---@dfn{suspended}
-@item suspended
-Work on the problem has been postponed.  This happens if a timely
-solution is not possible or is not cost-effective at the present time.
-The PR continues to exist, though a solution is not being actively
-sought.  If the problem cannot be solved at all, it should be closed
-rather than suspended.
-@end table
-
diff --git a/gnu/usr.bin/send-pr/doc/version.texi b/gnu/usr.bin/send-pr/doc/version.texi
deleted file mode 100644
index bffedc2a60d9..000000000000
--- a/gnu/usr.bin/send-pr/doc/version.texi
+++ /dev/null
@@ -1,3 +0,0 @@
-@c $FreeBSD$
-
-@set VERSION 3.113
diff --git a/gnu/usr.bin/send-pr/install-sid.sh b/gnu/usr.bin/send-pr/install-sid.sh
deleted file mode 100755
index f7f24e5ae922..000000000000
--- a/gnu/usr.bin/send-pr/install-sid.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-# Drop in the SUBMITTER id into a site's installed send-pr script.
-# Copyright (C) 1993 Free Software Foundation, Inc.
-# Contributed by Brendan Kehoe (brendan@cygnus.com), based on a
-# version written by Heinz G. Seidl (hgs@ide.com).
-#
-# This file is part of GNU GNATS.
-#
-# GNU GNATS 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.
-#
-# GNU GNATS 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 GNATS; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-
-COMMAND=`echo $0 | sed -e 's,.*/,,g'`
-USAGE="Usage: $COMMAND [--install-dir=prefix] [--help] [--version] submitter-id"
-
-VERSION=3.2
-
-BINDIR=@BINDIR@
-
-SUBMITTER=
-TEMP=/tmp/sp$$
-
-if [ $# -eq 0 ]; then
-  echo "$USAGE"
-  exit 1
-fi
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -install-dir=*|--install-dir=*|--install-di=*|--install-d=*|--install-=*|--install=*|--instal=*|--insta=*|--inst=*|--ins=*|--in=*|--i=*)
-    I=`echo "$1" | sed 's/-*i[a-z\-]*=//'`
-    BINDIR=$I/bin ;;
-    --version) echo $COMMAND version $VERSION ; exit 1 ;;
-    -*) echo "$USAGE" ; exit 1 ;;
-    *) SUBMITTER=$1 ;;
-  esac
-  shift
-done
-
-path=`echo $0 | sed -e "s;${COMMAND};;"`
-
-[ -z "$path" ] && path=.
-
-if [ -f $BINDIR/send-pr ]; then
-  SPPATH=$BINDIR/send-pr
-elif [ -f $path/send-pr ]; then
-  SPPATH=$path/send-pr
-else
-  echo "$COMMAND: cannot find \`$BINDIR/send-pr' or \`$path/send-pr'" >&2
-  exit 1
-fi
-
-trap 'rm -f $TEMP ; exit 0' 0
-trap 'echo "$COM: Aborting ..."; rm -f $TEMP ; exit 1' 1 2 3 13 15
-
-sed -e "s/^SUBMITTER=.*/SUBMITTER=${SUBMITTER}/" $SPPATH > $TEMP
-
-if grep $SUBMITTER $TEMP > /dev/null; then
-  cp $SPPATH $SPPATH.orig &&
-  rm -f $SPPATH &&
-  cp $TEMP $SPPATH &&
-  chmod a+rx $SPPATH &&
-  rm -f $TEMP $SPPATH.orig ||
-  { echo "$COMMAND: unable to replace send-pr" >&2 ; exit 1; }  
-else
-  echo "$COMMAND: something went wrong when sed-ing the submitter into send-pr" >&2
-  exit 1
-fi
-
-echo "$COMMAND: \`$SUBMITTER' is now the default submitter ID for send-pr"
-
-exit 0
diff --git a/gnu/usr.bin/send-pr/send-pr-el.in b/gnu/usr.bin/send-pr/send-pr-el.in
deleted file mode 100644
index 8195ecbd0dd4..000000000000
--- a/gnu/usr.bin/send-pr/send-pr-el.in
+++ /dev/null
@@ -1,813 +0,0 @@
-;;;; -*-emacs-lisp-*-
-;;;;---------------------------------------------------------------------------
-;;;;    EMACS interface for send-pr (by Heinz G. Seidl)
-;;;;    Slightly hacked by Brendan Kehoe (brendan@cygnus.com).
-;;;;
-;;;;    This file is part of the Problem Report Management System (GNATS)
-;;;;    Copyright 1992, 1993, 1997 Cygnus Support
-;;;;
-;;;;    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 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 Library General Public
-;;;;    License along with this program; if not, write to the Free
-;;;;    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-;;;;
-;;;;---------------------------------------------------------------------------
-;;;;
-;;;;    This file contains the EMACS interface to the Problem Report Management
-;;;;	System (GNATS):
-;;;;
-;;;;		- The `send-pr' command and the `send-pr-mode' for sending 
-;;;;              Problem Reports (PRs).
-;;;;
-;;;;    For more information about how to send a PR see send-pr(1).
-;;;;
-;;;;---------------------------------------------------------------------------
-;;;;
-;;;;	Configuration: the symbol `DEFAULT-RELEASE' can be replaced by
-;;;;	site/release specific strings during the configuration/installation
-;;;;	process.
-;;;;
-;;;;    Install this file in your EMACS library directory.
-;;;;
-;;;;---------------------------------------------------------------------------
-;;;;
-;;;; $FreeBSD$
-
-(provide 'send-pr)
-
-;;;;---------------------------------------------------------------------------
-;;;; Customization: put the following forms into your default.el file
-;;;; (or into your .emacs)
-;;;;---------------------------------------------------------------------------
-
-;(autoload 'send-pr-mode "send-pr"
-;	  "Major mode for sending problem reports." t)
-
-;(autoload 'send-pr "send-pr"
-;	  	  "Command to create and send a problem report." t)
-
-;;;;---------------------------------------------------------------------------
-;;;; End of Customization Section
-;;;;---------------------------------------------------------------------------
-
-(autoload 'server-buffer-done "server")
-(defvar server-buffer-clients nil)
-(defvar mail-self-blind nil)
-(defvar mail-default-reply-to nil)
-
-(defconst send-pr::version "3.113")
-
-(defvar gnats:root "/home/gnats"
-  "*The top of the tree containing the GNATS database.")
-
-;;;;---------------------------------------------------------------------------
-;;;; hooks
-;;;;---------------------------------------------------------------------------
-
-(defvar text-mode-hook nil)   ; we define it here in case it's not defined
-(defvar send-pr-mode-hook text-mode-hook "Called when send-pr is invoked.")
-
-;;;;---------------------------------------------------------------------------
-;;;; Domains and default values for (some of) the Problem Report fields;
-;;;; constants and definitions.
-;;;;---------------------------------------------------------------------------
-
-(defconst gnats::emacs-19p
-  (not (or (and (boundp 'epoch::version) epoch::version)
-	   (string-lessp emacs-version "19")))
-  "Is this emacs v19?")
-
-;;; This has to be here rather than at the bottom of this file with
-;;; the other utility functions because it is used by
-;;; gnats::get-config, which is called when send-pr.el is being
-;;; loaded (see the "defconst" below), before the whole file has been
-;;; loaded.
-
-(defun gnats::find-safe-default-directory (&optional buffer)
-"If the directory referred to by `default-directory' for the current
-buffer (or for optional argument BUFFER) does not exist, set it to the home
-directory of the current user if that exists, or to `/'.
-
-Returns the final value of default-directory in the buffer."
-  (let ((homedir (expand-file-name "~/")))
-    (save-excursion
-      (if buffer (set-buffer buffer))
-      (if (not (file-exists-p default-directory))
-	  (if (file-exists-p homedir)
-	      (setq default-directory homedir)
-	    (setq default-directory "/")))
-      default-directory)))
-
-;;; These may be changed during configuration/installation or by the individual
-;;; user in his/her .emacs file.
-;;;
-(defun gnats::get-config (var)
-  (let ((shell-file-name "/bin/sh")
-	(buf (generate-new-buffer " *GNATS config*"))
-	ret)
-    (save-excursion
-      (set-buffer buf)
-      (shell-command-on-region
-       (point-min) (point-max)
-       (concat ". " gnats:root "/gnats-adm/config; echo $" var ) t)
-      (goto-char (point-min))
-      ; We have to use get-buffer, since shell-command-on-region will wipe
-      ; out the buffer if there's no output from the command.
-      (if (or (not (get-buffer "*Shell Command Output*"))
-	      (looking-at "^\\.:\\|/bin/sh:\\|\n"))
-	  (setq ret nil)
-	(setq ret (buffer-substring (point-min) (- (point-max) 1)))))
-    (if (and ret (string-equal ret "")) (setq ret nil))
-    (kill-buffer buf)
-    ret))
-
-;; const because it must match the script's value
-(defconst send-pr:datadir (or (gnats::get-config "DATADIR") "@DATADIR@")
-  "*Where the `gnats' subdirectory containing category lists lives.")
-
-(defvar send-pr::sites nil
-  "List of GNATS support sites; computed at runtime.")
-(defvar send-pr:default-site
-  (or (gnats::get-config "GNATS_SITE") "freefall")
-  "Default site to send bugs to.")
-(defvar send-pr:::site send-pr:default-site
-  "The site to which a problem report is currently being submitted, or NIL
-if using the default site (buffer local).")
-
-(defvar send-pr:::categories nil
-  "Buffer local list of available categories, derived at runtime from
-send-pr:::site and send-pr::category-alist.")
-(defvar send-pr::category-alist nil
-  "Alist of GNATS support sites and the categories supported at each; computed
-at runtime.")
-
-;;; Ideally we would get all the following values from a central database
-;;; during runtime instead of having them here in the code.
-;;;
-(defconst send-pr::fields
-  (` (("Category" send-pr::set-categories
-       (, (or (gnats::get-config "DEFAULT_CATEGORY") nil)) enum)
-      ("Class" (("sw-bug") ("doc-bug") ("change-request") ("update") ("maintainer-update"))
-       (, (or (gnats::get-config "DEFAULT_CLASS") 0)) enum)
-      ("Confidential" (("yes") ("no"))
-       (, (or (gnats::get-config "DEFAULT_CONFIDENTIAL") 1)) enum)
-      ("Severity" (("non-critical") ("serious") ("critical"))
-       (, (or (gnats::get-config "DEFAULT_SEVERITY") 1)) enum)
-      ("Priority" (("low") ("medium") ("high"))
-       (, (or (gnats::get-config "DEFAULT_PRIORITY") 1)) enum)
-      ("Release" nil
-       (, (or (gnats::get-config "DEFAULT_RELEASE") "@DEFAULT_RELEASE@"))
-       text)
-      ("Submitter-Id" nil
-       (, (or (gnats::get-config "DEFAULT_SUBMITTER") "unknown")) text)
-      ("Synopsis" nil nil text
-       (lambda (a b c) (gnats::set-mail-field "Subject" c)))))
-  "AList, keyed on the name of the field, of:
-1) The field name.
-2) The list of completions.  This can be a list, a function to call, or nil.
-3) The default value.
-4) The type of the field.
-5) A sub-function to call when changed.")
-
-(defvar gnats::fields nil)
-
-(defmacro gnats::push (i l)
-  (` (setq (, l) (cons (,@ (list i l))))))
-
-(defun send-pr::set-categories (&optional arg)
-  "Get the list of categories for the current site out of
-send-pr::category-alist if there or from send-pr if not.  With arg, force
-update."
-  ;;
-  (let ((entry (assoc send-pr:::site send-pr::category-alist)))
-    (or (and entry (null arg))
-	(let ((oldpr (getenv "GNATS_ROOT")) cats)
-	  (send-pr::set-sites arg)
-	  (setenv "GNATS_ROOT" gnats:root)
-	  (setq cats (gnats::get-value-from-shell
-		      "send-pr" "-CL" send-pr:::site))
-	  (setenv "GNATS_ROOT" oldpr)
-	  (if entry (setcdr entry cats)
-	    (setq entry (cons send-pr:::site cats))
-	    (gnats::push entry send-pr::category-alist))))
-    (setq send-pr:::categories (cdr entry))))
-
-(defun send-pr::set-sites (&optional arg)
-  "Get the list of sites (by listing the contents of DATADIR/gnats) and assign
-it to send-pr::sites.  With arg, force update."
-  (or (and (null arg) send-pr::sites)
-      (progn
-	(setq send-pr::sites nil)
-	(mapcar
-	 (function
-	  (lambda (file)
-	    (or (memq t (mapcar (function (lambda (x) (string= x file)))
-				'("." ".." "pr-edit" "pr-addr")))
-		(not (file-readable-p file))
-		(gnats::push (list (file-name-nondirectory file))
-			    send-pr::sites))))
-	 (directory-files (format "%s/gnats" send-pr:datadir) t))
-	(setq send-pr::sites (reverse send-pr::sites)))))
-
-(defconst send-pr::pr-buffer-name "*send-pr*"
-  "Name of the temporary buffer, where the problem report gets composed.")
-
-(defconst send-pr::err-buffer-name "*send-pr-error*"
-  "Name of the temporary buffer, where send-pr error messages appear.")
-
-(defvar send-pr:::err-buffer nil
-  "The error buffer used by the current PR buffer.")
-
-(defvar send-pr:::spawn-to-send nil
-  "Whether or not send-pr-mode should spawn a send-pr process to send the PR.")
-
-(defconst gnats::indent 17 "Indent for formatting the value.")
-
-;;;;---------------------------------------------------------------------------
-;;;; `send-pr' - command for creating and sending of problem reports
-;;;;---------------------------------------------------------------------------
-
-(fset 'send-pr 'send-pr:send-pr)
-(defun send-pr:send-pr (&optional site)
-  "Create a buffer and read in the result of `send-pr -P'.
-When finished with editing the problem report use \\[send-pr:submit-pr]
-to send the PR with `send-pr -b -f -'."
-  ;;
-  (interactive
-   (if current-prefix-arg
-       (list (completing-read "Site: " (send-pr::set-sites 'recheck) nil t
-			      send-pr:default-site))))
-  (or site (setq site send-pr:default-site))
-  (let ((buf (get-buffer send-pr::pr-buffer-name)))
-    (if (or (not buf)
-	    (progn (switch-to-buffer buf)
-		   (cond ((or (not (buffer-modified-p buf))
-			      (y-or-n-p "Erase previous problem report? "))
-			  (erase-buffer) t)
-			 (t nil))))
-	(send-pr::start-up site))))
-
-(defun send-pr::start-up (site)
-  (switch-to-buffer (get-buffer-create send-pr::pr-buffer-name))
-  (setq default-directory (expand-file-name "~/"))
-  (auto-save-mode auto-save-default)
-  (let ((oldpr (getenv "GNATS_ROOT"))
-	(case-fold-search nil))
-    (setenv "GNATS_ROOT" gnats:root)
-    (send-pr::insert-template site)
-    (setenv "GNATS_ROOT" oldpr)
-    (goto-char (point-min))
-    (if (looking-at "send-pr:")
-	(cond ((looking-at "send-pr: .* does not have a categories list")
-	       (setq send-pr::sites nil)
-	       (error "send-pr: the GNATS site %s does not have a categories list" site))
-	      (t (error (buffer-substring (point-min) (point-max)))))
-      (save-excursion
-	;; Clear cruft inserted by bdamaged .cshrcs
-	(goto-char 1)
-	(re-search-forward "^SEND-PR:")
-	(delete-region 1 (match-beginning 0)))))
-  (set-buffer-modified-p nil)
-  (send-pr:send-pr-mode)
-  (setq send-pr:::site site)
-  (setq send-pr:::spawn-to-send t)
-  (send-pr::set-categories)
-  (if (null send-pr:::categories)
-      (progn
-	(and send-pr:::err-buffer (kill-buffer send-pr:::err-buffer))
-	(kill-buffer nil)
-	(message "send-pr: no categories found"))
-    (or (stringp mail-default-reply-to)
-	(setq mail-default-reply-to (getenv "REPLYTO")))
-    (and mail-default-reply-to
-	 (gnats::set-mail-field "Reply-To" mail-default-reply-to))
-    (and mail-self-blind
-	 (gnats::set-mail-field "BCC" (user-login-name)))
-    (mapcar 'send-pr::maybe-change-field send-pr::fields)
-    (gnats::position-on-field "Description")
-    (message (substitute-command-keys
-	      "To send the problem report use: \\[send-pr:submit-pr]"))))
-
-(defvar send-pr::template-alist nil
-  "An alist containing the output of send-pr -P <sitename> for various sites.")
-
-(defun send-pr::insert-template (site)
-  (let ((elt (assoc site send-pr::template-alist)))
-    (if elt
-	(save-excursion (insert (cdr elt)))
-      (call-process "send-pr" nil t nil "-P" site)
-      (save-excursion
-	(setq send-pr::template-alist
-	      (cons (cons site (buffer-substring (point-min) (point-max)))
-		    send-pr::template-alist))))))
-
-(fset 'do-send-pr 'send-pr:submit-pr)	;backward compat
-(defun send-pr:submit-pr ()
-  "Pipe the contents of the buffer *send-pr* to `send-pr -f -.' unless this
-buffer was loaded with emacsclient, in which case save the buffer and exit."
-  ;;
-  (interactive)
-  (cond
-   ((and (boundp 'server-buffer-clients)
-	 server-buffer-clients)
-    (let ((buffer (current-buffer))
-	  (version-control nil) (buffer-backed-up nil))
-      (save-buffer buffer)
-      (kill-buffer buffer)
-      (server-buffer-done buffer)))
-   (send-pr:::spawn-to-send
-    (if (or (buffer-modified-p)
-	    (not send-pr:::sent)
-	    (y-or-n-p "PR already sent; resend? "))
-	(progn
-	  (or (and send-pr:::err-buffer
-		   (buffer-name send-pr:::err-buffer))
-	      (setq send-pr:::err-buffer
-		    (get-buffer-create send-pr::err-buffer-name)))
-	  (let ((err-buffer send-pr:::err-buffer) mesg ok)
-	    (save-excursion (set-buffer err-buffer) (erase-buffer))
-	    (message "running send-pr...")
-	    (let ((oldpr (getenv "GNATS_ROOT")))
-	      (setenv "GNATS_ROOT" gnats:root)
-	      ;; ensure that a final newline is present:
-	      (if (not (equal (char-after (1- (point-max))) ?\n))
-		  (save-excursion (goto-char (point-max))
-				  (insert ?\n)))
-	      (call-process-region (point-min) (point-max) "send-pr"
-				   nil err-buffer nil send-pr:::site
-				   "-b" "-f" "-")
-	      (setenv "GNATS_ROOT" oldpr))
-	    (message "running send-pr...done")
-	    ;; stupidly we cannot check the return value in EMACS 18.57,
-	    ;; thus we need this kluge to find out whether send-pr succeeded.
-	    (if (save-excursion
-		  (set-buffer err-buffer)
-		  (goto-char (point-min))
-		  (setq mesg (buffer-substring (point-min) (- (point-max) 1)))
-		  (search-forward "problem report sent" nil t))
-		(progn (message mesg)
-		       (kill-buffer err-buffer)
-		       (delete-auto-save-file-if-necessary)
-		       (set-buffer-modified-p nil)
-		       (setq send-pr:::sent t)
-		       (bury-buffer))
-	      (pop-to-buffer err-buffer))
-	    ))))
-   (t
-    (save-buffer)
-    (message "Exit emacs to send the PR."))))
-   
-;;;;---------------------------------------------------------------------------
-;;;; send-pr:send-pr-mode mode
-;;;;---------------------------------------------------------------------------
-
-(defvar send-pr-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "\C-c\C-c" 'send-pr:submit-pr)
-    (define-key map "\C-c\C-f" 'gnats:change-field)
-    (define-key map "\M-n" 'gnats:next-field)
-    (define-key map "\M-p" 'gnats:previous-field)
-    (define-key map "\C-\M-f" 'gnats:forward-field)
-    (define-key map "\C-\M-b" 'gnats:backward-field)
-    map)
-  "Keymap for send-pr mode.")
-
-(defconst gnats::keyword "^>\\([-a-zA-Z]+\\):")
-(defconst gnats::before-keyword "[ \t\n\f]*[\n\f]+>\\([-a-zA-Z]+\\):")
-(defconst gnats::after-keyword "^>\\([-a-zA-Z]+\\):[ \t\n\f]+")
-
-(fset 'send-pr-mode 'send-pr:send-pr-mode)
-(defun send-pr:send-pr-mode ()
-  "Major mode for submitting problem reports.
-For information about the form see gnats(1) and send-pr(1).
-Special commands: \\{send-pr-mode-map}
-Turning on send-pr-mode calls the value of the variable send-pr-mode-hook,
-if it is not nil."
-  (interactive)
-  (gnats::patch-exec-path)
-  (put 'send-pr:send-pr-mode 'mode-class 'special)
-  (kill-all-local-variables)
-  (setq major-mode 'send-pr:send-pr-mode)
-  (setq mode-name "send-pr")
-  (use-local-map send-pr-mode-map)
-  (set-syntax-table text-mode-syntax-table)
-  (setq local-abbrev-table text-mode-abbrev-table)
-  (setq buffer-offer-save t)
-  (make-local-variable 'send-pr:::site)
-  (make-local-variable 'send-pr:::categories)
-  (make-local-variable 'send-pr:::err-buffer)
-  (make-local-variable 'send-pr:::spawn-to-send)
-  (make-local-variable 'send-pr:::sent)
-  (setq send-pr:::sent nil)
-  (make-local-variable 'paragraph-separate)
-  (setq paragraph-separate (concat (default-value 'paragraph-separate)
-				   "\\|" gnats::keyword "[ \t\n\f]*$"))
-  (make-local-variable 'paragraph-start)
-  (setq paragraph-start (concat (default-value 'paragraph-start)
-				"\\|" gnats::keyword))
-  (run-hooks 'send-pr-mode-hook)
-  t)
-
-;;;;---------------------------------------------------------------------------
-;;;; Functions to read and replace field values.
-;;;;---------------------------------------------------------------------------
-
-(defun gnats::position-on-field (field &optional quiet)
-  (goto-char (point-min))
-  (if (not (re-search-forward (concat "^>" field ":") nil t))
-      (if quiet
-	  nil
-	(error "Field `>%s:' not found." field))
-    (re-search-forward "[ \t\n\f]*")
-    (if (looking-at gnats::keyword)
-	(backward-char 1))
-    t))
-
-(defun gnats::mail-position-on-field (field)
-  (let (end
-	(case-fold-search t))
-    (goto-char (point-min))
-    (re-search-forward "^$")
-    (setq end (match-beginning 0))
-    (goto-char (point-min))
-    (if (not (re-search-forward (concat "^" field ":") end 'go-to-end))
-	(insert field ": \n")
-      (re-search-forward "[ \t\n\f]*"))
-    (skip-chars-backward "\n")
-    t))
-
-(defun gnats::field-contents (field &optional elem move)
-  (let (pos)
-    (unwind-protect
-	(save-excursion
-	  (if (not (gnats::position-on-field field t))
-	      nil
-	    (setq pos (point-marker))
-	    (if (or (looking-at "<.*>$") (eolp))
-		t
-	      (looking-at ".*$")	; to set match-{beginning,end}
-	      (gnats::nth-word 
-	       (buffer-substring (match-beginning 0) (match-end 0))
-	       elem))))
-      (and move pos (goto-char pos)))))
-
-(defun gnats::functionp (thing)
-  (or (and (symbolp thing) (fboundp thing))
-      (and (listp thing) (eq (car thing) 'lambda))))
-
-(defun gnats::field-values (field)
-  "Return the possible (known) values for field FIELD."
-  (let* ((fields (if (eq major-mode 'gnats:gnats-mode) gnats::fields
-		   send-pr::fields))
-	 (thing (elt (assoc field fields) 1)))
-    (cond ((gnats::functionp thing) (funcall thing))
-	  ((listp thing) thing)
-	  (t (error "ACK")))))
-
-(defun gnats::field-default (field)
-  "Return the default value for field FIELD."
-  (let* ((fields (if (eq major-mode 'gnats:gnats-mode) gnats::fields
-		   send-pr::fields))
-	 (thing (elt (assoc field fields) 2)))
-    (cond ((stringp thing) thing)
-	  ((null thing) "")
-	  ((numberp thing) (car (elt (gnats::field-values field) thing)))
-	  ((gnats::functionp thing)
-	   (funcall thing (gnats::field-contents field)))
-	  ((eq thing t) (gnats::field-contents field))
-	  (t (error "ACK")))))
-
-(defun gnats::field-type (field)
-  "Return the type of field FIELD."
-  (let* ((fields (if (eq major-mode 'gnats:gnats-mode) gnats::fields
-		   send-pr::fields))
-	 (thing (elt (assoc field fields) 3)))
-    thing))
-
-(defun gnats::field-action (field)
-  "Return the extra handling function for field FIELD."
-  (let* ((fields (if (eq major-mode 'gnats:gnats-mode) gnats::fields
-		   send-pr::fields))
-	 (thing (elt (assoc field fields) 4)))
-    (cond ((null thing) 'ignore)
-	  ((gnats::functionp thing) thing)
-	  (t (error "ACK")))))
-
-;;;;---------------------------------------------------------------------------
-;;;; Point movement functions
-;;;;---------------------------------------------------------------------------
-
-(or (fboundp 'defsubst) (fset 'defsubst 'defun))
-
-(defun send-pr::maybe-change-field (field)
-  (setq field (car field))
-  (let ((thing (gnats::field-contents field)))
-    (and thing (eq t thing)
-	 (not (eq 'multi-text (gnats::field-type field)))
-	 (gnats:change-field field))))
-    
-(defun gnats:change-field (&optional field default)
-  "Change the value of the field containing the cursor.  With arg, ask the
-user for the field to change.  From a program, the function takes optional
-arguments of the field to change and the default value to use."
-  (interactive)
-  (or field current-prefix-arg (setq field (gnats::current-field)))
-  (or field
-      (setq field
-	    (completing-read "Field: "
-			     (if (eq major-mode 'gnats:gnats-mode)
-				 gnats::fields
-			       send-pr::fields)
-			     nil t)))
-  (gnats::position-on-field field)
-  (sit-for 0)
-  (let* ((old (gnats::field-contents field))
-	 new)
-    (if (null old)
-	(error "ACK")
-      (if (or (interactive-p) t)
-	  (let ((prompt (concat ">" field ": "))
-		(domain (gnats::field-values field))
-		(type (gnats::field-type field)))
-	    (or default (setq default (gnats::field-default field)))
-	    (setq new
-		  (if (eq type 'enum)
-		      (completing-read prompt domain nil t 
-				       (if gnats::emacs-19p (cons default 0)
-					 default))
-		    (read-string prompt (if gnats::emacs-19p (cons default 1)
-					  default)))))
-	(setq new default))
-      (gnats::set-field field new)
-      (funcall (gnats::field-action field) field old new)
-      new)))
-
-(defun gnats::set-field (field value)
-  (save-excursion
-    (gnats::position-on-field field)
-    (delete-horizontal-space)
-    (looking-at ".*$")
-    (replace-match
-     (concat (make-string (- gnats::indent (length field) 2) ?\40 ) value) t)))
-
-(defun gnats::set-mail-field (field value)
-  (save-excursion
-    (gnats::mail-position-on-field field)
-    (delete-horizontal-space)
-    (looking-at ".*$")
-    (replace-match (concat " " value) t)))
-  
-(defun gnats::before-keyword (&optional where)
-  "Returns t if point is in some white space before a keyword.
-If where is nil, then point is not changed; if where is t then point is moved
-to the beginning of the keyword, otherwise it is moved to the beginning
-of the white space it was in."
-  ;;
-  (if (looking-at gnats::before-keyword)
-      (prog1 t
-	(cond  ((eq where t)
-		(re-search-forward "^>") (backward-char))
-	       ((not (eq where nil))
-		(re-search-backward "[^ \t\n\f]") (forward-char))))
-       nil))
-
-(defun gnats::after-keyword (&optional where)
-  "Returns t if point is in some white space after a keyword.
-If where is nil, then point is not changed; if where is t then point is moved
-to the beginning of the keyword, otherwise it is moved to the end of the white
-space it was in."
-  ;;
-  (if (gnats::looking-after gnats::after-keyword)
-      (prog1 t
-	(cond  ((eq where t)
-		(re-search-backward "^>"))
-	       ((not (eq where nil))
-		(re-search-forward "[^ \t\n\f]") (backward-char))))
-       nil))
-
-(defun gnats::in-keyword (&optional where)
-  "Returns t if point is within a keyword.
-If where is nil, then point is not changed; if where is t then point is moved
-to the beginning of the keyword."
-  ;;
-  (let ((old-point (point-marker)))
-    (beginning-of-line)
-    (cond ((and (looking-at gnats::keyword)
-	       (< old-point (match-end 0)))
-	   (prog1 t
-	     (if (eq where t) 
-		 t
-	       (goto-char old-point))))
-	  (t (goto-char old-point)
-	     nil))))
-
-(defun gnats::forward-bofield ()
-  "Moves point to the beginning of a field. Assumes that point is in the
-keyword." 
-  ;;
-  (if (re-search-forward "[ \t\n\f]+[^ \t\n\f]" (point-max) '-)
-      (backward-char)
-    t))
-
-(defun gnats::backward-eofield ()
-  "Moves point to the end of a field. Assumes point is in the keyword."
-  ;;
-  (if (re-search-backward "[^ \t\n\f][ \t\n\f]+" (point-min) '-)
-      (forward-char)
-    t))
-
-(defun gnats::forward-eofield ()
-  "Moves point to the end of a field. Assumes that point is in the field." 
-  ;;
-  ;; look for the next field
-  (if (re-search-forward gnats::keyword (point-max) '-) 
-      (progn (beginning-of-line) (gnats::backward-eofield))
-  (re-search-backward "[^ \t\n\f][ \t\n\f]*" (point-min) '-)
-  (forward-char)))
-
-(defun gnats::backward-bofield ()
-  "Moves point to the beginning of a field. Assumes that point is in the
-field." 
-  ;;
-  ;;look for previous field
-  (if (re-search-backward gnats::keyword (point-min) '-)
-      (gnats::forward-bofield)
-    t))
-
-
-(defun gnats:forward-field ()
-  "Move point forward to the end of the field or to the beginning of the next
-field."
-  ;;
-  (interactive)
-  (if (or (gnats::before-keyword t) (gnats::in-keyword t)
-	  (gnats::after-keyword t))
-	(gnats::forward-bofield)
-    (gnats::forward-eofield)))
-
-(defun gnats:backward-field ()
-  "Move point backward to the beginning/end of a field."
-  ;;
-  (interactive)
-  (backward-char)
-  (if (or (gnats::before-keyword t) (gnats::in-keyword t)
-	  (gnats::after-keyword t))
-      (gnats::backward-eofield)
-    (gnats::backward-bofield)))
-
-(defun gnats:next-field ()
-  "Move point to the beginning of the next field."
-  ;;
-  (interactive)
-  (if (or (gnats::before-keyword t) (gnats::in-keyword t)
-	  (gnats::after-keyword t))
-      (gnats::forward-bofield)
-    (if (re-search-forward gnats::keyword (point-max) '-)
-	(gnats::forward-bofield)
-      t)))
-
-(defun gnats:previous-field ()
-  "Move point to the beginning of the previous field."
-  ;;
-  (interactive)
-  (backward-char)
-  (if (or (gnats::after-keyword t) (gnats::in-keyword t)
-	  (gnats::before-keyword t))
-      (progn (re-search-backward gnats::keyword (point-min) '-)
-	     (gnats::forward-bofield))
-    (gnats::backward-bofield)))
-
-(defun gnats:beginning-of-field ()
-  "Move point to the beginning of the current field."
-  (interactive)
-  (cond ((gnats::in-keyword t)
-	 (gnats::forward-bofield))
-	((gnats::after-keyword 0))
-	(t
-	 (gnats::backward-bofield))))
-
-(defun gnats::current-field ()
-  (save-excursion
-    (if (cond ((or (gnats::in-keyword t) (gnats::after-keyword t))
-	       (looking-at gnats::keyword))
-	      ((re-search-backward gnats::keyword nil t)))
-	(buffer-substring (match-beginning 1) (match-end 1))
-      nil)))
-
-;;;;---------------------------------------------------------------------------
-;;;; Support functions
-;;;;---------------------------------------------------------------------------
-
-(defun gnats::looking-after (regex)
-  "Returns t if point is after regex."
-  ;;
-  (let* ((old-point (point))
-	 (start (if (eobp)
-		   old-point
-		 (forward-char) (point))))
-    (cond ((re-search-backward regex (point-min) t)
-	   (goto-char old-point)
-	   (cond ((eq (match-end 0) start)
-		  t))))))
-
-(defun gnats::nth-word (string &optional elem)
-  "Returns the elem-th word of the string.
-If elem is nil, then the first wort is returned, if elem is 0 then
-the whole string is returned."
-   ;;
-  (if (integerp elem)
-      (cond ((eq elem 0) string)
-	    ((eq elem 1) (gnats::first-word string))
-	    ((equal string "") "")
-	    ((>= elem 2) 
-	     (let ((i 0) (value ""))
-	       (setq string		; strip leading blanks
-		     (substring string (or (string-match "[^ \t]" string) 0)))
-	       (while (< i elem)
-		 (setq value 
-		       (substring string 0 
-				  (string-match "[ \t]*$\\|[ \t]+" string)))
-		 (setq string 
-		       (substring string (match-end 0)))
-		 (setq i (+ i 1)))
-	       value)))
-    (gnats::first-word string)))
-
-(defun gnats::first-word (string)
-  (setq string 
-	(substring string (or (string-match "[^ \t]" string) 0)))
-  (substring string 0 (string-match "[ \t]*$\\|[ \t]+" string)))
-
-;;;;---------------------------------------------------------------------------
-
-(defun gnats::patch-exec-path ()
-  ;;
-  "Replaces `//' by `/' in `exec-path'."
-  ;;
-  ;(make-local-variable 'exec-path)
-  (let ((err-buffer (get-buffer-create " *gnats::patch-exec-path*"))
-	(ret))
-    (setq exec-path (save-excursion (set-buffer err-buffer)
-				    (prin1 exec-path err-buffer)
-				    (goto-char (point-min))
-				    (while (search-forward "//" nil t)
-				      (replace-match "/" nil t))
-				    (goto-char (point-min))
-				    (setq ret (read err-buffer))
-				    (kill-buffer err-buffer)
-				    ret
-				    ))))
-
-(defun gnats::get-value-from-shell (&rest command)
-  "Execute shell command to get a list of valid values for `variable'."
-  ;;
-  (let ((err-buffer (get-buffer-create " *gnats::get-value-from-shell*")))
-    (save-excursion
-      (set-buffer err-buffer)
-      (unwind-protect
-	  (condition-case var
-	      (progn
-		(apply 'call-process
-		       (car command) nil err-buffer nil (cdr command))
-		(goto-char (point-min))
-		(if (looking-at "[-a-z]+: ")
-		    (error (buffer-substring (point-min) (point-max))))
-		(read err-buffer))
-	    (error nil))
-	(kill-buffer err-buffer)))))
-
-(or (fboundp 'setenv)
-    (defun setenv (variable &optional value)
-      "Set the value of the environment variable named VARIABLE to VALUE.
-VARIABLE should be a string.  VALUE is optional; if not provided or is
-`nil', the environment variable VARIABLE will be removed.  
-This function works by modifying `process-environment'."
-      (interactive "sSet environment variable: \nsSet %s to value: ")
-      (if (string-match "=" variable)
-	  (error "Environment variable name `%s' contains `='" variable)
-	(let ((pattern (concat "\\`" (regexp-quote (concat variable "="))))
-	      (case-fold-search nil)
-	      (scan process-environment))
-	  (while scan
-	    (cond
-	     ((string-match pattern (car scan))
-	      (if (eq nil value)
-		  (setq process-environment (delq (car scan)
-						  process-environment))
-		(setcar scan (concat variable "=" value)))
-	      (setq scan nil))
-	     ((null (setq scan (cdr scan)))
-	      (setq process-environment
-		    (cons (concat variable "=" value)
-			  process-environment)))))))))
-
-;;;; end of send-pr.el
diff --git a/gnu/usr.bin/send-pr/send-pr.1 b/gnu/usr.bin/send-pr/send-pr.1
deleted file mode 100644
index 49fd42b5df99..000000000000
--- a/gnu/usr.bin/send-pr/send-pr.1
+++ /dev/null
@@ -1,355 +0,0 @@
-.\" -*- nroff -*-
-.\" ---------------------------------------------------------------------------
-.\"    man page for send-pr (by Heinz G. Seidl, hgs@cygnus.com)
-.\"    updated Feb 1993 for GNATS 3.00 by Jeffrey Osier, jeffrey@cygnus.com
-.\"
-.\"    This file is part of the Problem Report Management System (GNATS)
-.\"    Copyright 1992 Cygnus Support
-.\"
-.\"    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 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 Library General Public
-.\"    License along with this program; if not, write to the Free
-.\"    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
-.\"
-.\" ---------------------------------------------------------------------------
-.\"
-.\" $FreeBSD$
-.nh
-.TH SEND-PR 1 3.113 "October 2006"
-.SH NAME
-send-pr \- send problem report (PR) to a central support site
-.SH SYNOPSIS
-.B send-pr
-[
-.I site
-]
-[
-.B \-f
-.I problem-report
-]
-[
-.B \-t
-.I mail-address
-]
-.br
-.in +0.8i
-[
-.B \-P
-]
-[
-.B \-L
-]
-[
-.B \-s
-.I severity
-]
-[
-.B \-V
-]
-.br
-[
-.B \-\-version
-]
-[
-.B \-c
-.I address
-]
-[
-.B \-a
-.I file
-]
-.SH DESCRIPTION
-.B send-pr
-is a tool used to submit 
-.I problem reports 
-.\" SITE ADMINISTRATORS - change this if you use a local default
-(PRs) to a central support site.  In most cases the correct 
-.I site
-will be the default.  This argument indicates the support site which
-is responsible for the category of problem involved.  Some sites may
-use a local address as a default.  
-.I site
-values are defined by using the 
-.BR aliases (5).
-.LP
-.B send-pr
-invokes an editor on a problem report template (after trying to fill
-in some fields with reasonable default values).  When you exit the
-editor,
-.B send-pr 
-sends the completed form to the
-.I Problem Report Management System
-(\fBGNATS\fR) at a central support site.  At the support site, the PR
-is assigned a unique number and is stored in the \fBGNATS\fR database
-according to its category and submitter-id.  \fBGNATS\fR automatically
-replies with an acknowledgement, citing the category and the PR
-number.
-.LP
-To ensure that a PR is handled promptly, it should contain
-one of the available \fIcategories\fR to identify the
-problem area.  (Use
-.B `send-pr -L'
-to see a list of categories.)
-.LP
-The more precise your problem description and the more complete your
-information, the faster your support team can solve your problems.
-.LP
-.B send-pr
-depends on a correctly configured mail submission system to work correctly.
-If, for any reason, sending mail is not working, problem reports can be
-submitted over the web, through:
-.IP
-.I http://www.freebsd.org/send-pr.html
-.SH OPTIONS
-.TP
-.BI \-f " problem-report"
-specify a file (\fIproblem-report\fR) which already contains a
-complete problem report.
-.B send-pr
-sends the contents of the file without invoking the editor.  If 
-the value for 
-.I problem-report
-is
-.BR `\|\-\|' ,
-then
-.B send-pr
-reads from standard input.
-.TP
-.BI \-s " severity"
-Give the problem report the severity
-.IR severity .
-.TP
-.BI \-t " mail-address"
-Change mail address at the support site for problem reports.  The
-default 
-.I mail-address
-is the address used for the default 
-.IR site .  
-Use the
-.I site
-argument rather than this option in nearly all cases.
-.TP
-.BI \-c " address"
-Put
-.I address
-in the 
-.B Cc:
-header of the message.
-.TP
-.BI \-a " file"
-Copy the specified
-.I file
-into the
-.B Fix:
-section.
-Binary files are uuencoded.
-.TP
-.B \-P
-print the form specified by the environment variable 
-.B PR_FORM 
-on standard output.  If 
-.B PR_FORM
-is not set, print the standard blank PR template.  No mail is sent.
-.TP
-.B \-L
-print the list of available categories.  No mail is sent.
-.TP
-.B \-V
-Display the 
-.B send-pr
-version number.
-This may also be specified as
-.B \-\-version.
-.LP
-Note: use
-.B send-pr
-to submit problem reports rather than mailing them directly.  Using
-both the template and
-.B send-pr
-itself will help ensure all necessary information will reach the
-support site.
-.SH FREEBSD CATEGORIES
-.TP
-.B advocacy
-This used to be for the advocacy WWW pages.
-Now deprecated in favour of the
-.B www
-category, relevant alternative use of this category is encouraged.
-.TP
-.B alpha
-Alpha processor specific problems.
-.TP
-.B amd64
-AMD64 processor specific problems.
-.TP
-.B arm
-ARM processor specific problems.
-.TP
-.B bin
-Corrections or enhancements to system executables.
-.TP
-.B conf
-Corrections or enhancements to the system configuration files.
-.TP
-.B docs
-Corrections or enhancements to the manpages or other documentation.
-.TP
-.B gnu
-Corrections or enhancements to the GNU contributed software.
-.TP
-.B i386
-Intel x86 processor specific problems.
-.TP
-.B ia64
-Intel ia64 processor specific problems.
-.TP
-.B java
-Problems related to Java.
-.TP
-.B kern
-Changes or enhancements to the architecture independent kernel sources.
-.TP
-.B misc
-Problems that do not fit into any of the other categories.
-.TP
-.B ports
-Corrections or enhancements (including new ports) to the ports collection.
-.TP
-.B powerpc
-PowerPC processor specific problems.
-.TP
-.B sparc64
-SPARC processor specific problems.
-.TP
-.B standards
-Standards conformance issues.
-.TP
-.B threads
-Problems related to threading on FreeBSD.
-.TP
-.B usb
-Problems related to the USB subsystem.
-.TP
-.B www
-Changes or enhancements to the FreeBSD website.
-.SH ENVIRONMENT
-The environment variable 
-.B EDITOR
-specifies the editor to invoke on the template.
-.br
-default:
-.B vi
-.sp
-If the environment variable
-.B MAIL_AGENT
-is set, its value is used as the path + command line arguments of the
-executable to be invoked for sending the problem report (which will be
-provided via standard input).
-.br
-This can be useful if you either use a MTA other than sendmail or need
-to provide additional parameters, such as the envelope sender on
-machines without a valid FQDN.
-.br
-Default value:
-.B /usr/sbin/sendmail -oi -t
-.sp
-If the environment variable 
-.B PR_FORM
-is set, then its value is used as the file name of the template for
-your problem-report editing session.  You can use this to start with a
-partially completed form (for example, a form with the identification
-fields already completed).
-.SH "HOW TO FILL OUT A PROBLEM REPORT"
-Problem reports have to be in a particular form so that a program can
-easily manage them.  Please remember the following guidelines:
-.IP \(bu 3m 
-describe only 
-.B one problem
-with each problem report.
-.IP \(bu 3m
-For follow-up mail, use the same subject line as the one in the automatic
-acknowledgement. It consists of category, PR number and the original synopsis
-line.  This allows the support site to relate several mail messages to a
-particular PR and to record them automatically.
-.IP \(bu 3m 
-Please try to be as accurate as possible in the subject and/or synopsis line.
-.IP \(bu 3m 
-The subject and the synopsis line are not confidential.  This is
-because open-bugs lists are compiled from them.  Avoid confidential
-information there.
-.LP
-See the GNU 
-.B Info 
-file
-.B send-pr.info
-or the document \fIReporting Problems With send-pr\fR\ for detailed
-information on reporting problems
-.SH "HOW TO SUBMIT TEST CASES, CODE, ETC."
-Submit small code samples with the PR.  Contact the support site for
-instructions on submitting larger test cases and problematic source
-code.
-.SH FILES
-.ta \w'/tmp/pbad.XXXXXXXX  'u
-/tmp/pf.XXXXXXXX	copy of PR used in editing session
-.br
-/tmp/pf.XXXXXXXX	copy of empty PR form, for testing purposes
-.br
-/tmp/pr.XXXXXXXX	copy of filled PR form, created on interrupt
-.br
-/tmp/pbad.XXXXXXXX	file for rejected PRs
-.SH EMACS USER INTERFACE
-An Emacs user interface for 
-.B send-pr
-with completion of field values is part of the 
-.B send-pr
-distribution (invoked with
-.BR "M-x send-pr" ).
-See the file
-.B send-pr.info
-or the ASCII file
-.B INSTALL
-in the top level directory of the distribution for configuration and
-installation information.  The Emacs LISP template file is 
-.B send-pr-el.in
-and is installed as
-.BR send-pr.el .
-.SH INSTALLATION AND CONFIGURATION
-See 
-.B send-pr.info
-or
-.B INSTALL
-for installation instructions.
-.SH SEE ALSO
-.I Reporting Problems Using send-pr
-(also installed as the GNU Info file
-.BR send-pr.info ).
-.SH AUTHORS
-Jeffrey Osier, Brendan Kehoe, Jason Merrill, Heinz G. Seidl (Cygnus
-Support)
-.SH COPYING
-Copyright (c) 1992, 1993 Free Software Foundation, Inc.
-.PP
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-.PP
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-.PP
-Permission is granted to copy and distribute translations of this
-manual into another language, under the above conditions for modified
-versions, except that this permission notice may be included in
-translations approved by the Free Software Foundation instead of in
-the original English.
-
diff --git a/gnu/usr.bin/send-pr/send-pr.sh b/gnu/usr.bin/send-pr/send-pr.sh
deleted file mode 100644
index dee0f489e29b..000000000000
--- a/gnu/usr.bin/send-pr/send-pr.sh
+++ /dev/null
@@ -1,591 +0,0 @@
-#!/bin/sh
-# Submit a problem report to a GNATS site.
-# Copyright (C) 1993 Free Software Foundation, Inc.
-# Contributed by Brendan Kehoe (brendan@cygnus.com), based on a
-# version written by Heinz G. Seidl (hgs@cygnus.com).
-#
-# This file is part of GNU GNATS.
-#
-# GNU GNATS 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.
-#
-# GNU GNATS 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 GNATS; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# $FreeBSD$
-
-# The version of this send-pr.
-VERSION=3.114
-
-# The submitter-id for your site.
-# "current-users" is the only allowable value for FreeBSD.
-SUBMITTER="current-users"
-
-# Where the GNATS directory lives, if at all.
-[ -z "$GNATS_ROOT" ] && 
-GNATS_ROOT=
-
-# The default mail address for PR submissions. 
-GNATS_ADDR=FreeBSD-gnats-submit@freebsd.org
-
-# Where the gnats category tree lives.
-DATADIR=@DATADIR@
-
-# If we've been moved around, try using GCC_EXEC_PREFIX.
-[ ! -d $DATADIR/gnats -a -d "$GCC_EXEC_PREFIX" ] && DATADIR="$GCC_EXEC_PREFIX"
-
-# The default release for this host.
-DEFAULT_RELEASE="@DEFAULT_RELEASE@"
-
-# The default organization.
-DEFAULT_ORGANIZATION=
-
-# The default site to look for.
-GNATS_SITE=freefall
-
-# Newer config information?
-[ -f ${GNATS_ROOT}/gnats-adm/config ] && . ${GNATS_ROOT}/gnats-adm/config
-
-# What mailer to use.  This must come after the config file, since it is
-# host-dependent.
-MAIL_AGENT="${MAIL_AGENT:-/usr/sbin/sendmail -oi -t}"
-
-# Path to pw(8)
-PW="/usr/sbin/pw"
-
-ECHON=bsd
-
-if [ $ECHON = bsd ] ; then
-  ECHON1="echo -n"
-  ECHON2=
-elif [ $ECHON = sysv ] ; then
-  ECHON1=echo
-  ECHON2='\c'
-else
-  ECHON1=echo
-  ECHON2=
-fi
-
-#
-
-# find a user name
-if [ "$LOGNAME" = "" ]; then
-	if [ "$USER" != "" ]; then
-		LOGNAME="$USER"
-	else
-		LOGNAME="UNKNOWN"
-	fi
-fi
-
-# Find out the name of the originator of this PR.
-if [ -n "$NAME" ]; then
-  ORIGINATOR="$NAME"
-elif [ -f $HOME/.fullname ]; then
-  ORIGINATOR="`sed -e '1q' $HOME/.fullname`"
-else
-  PTEMP=`mktemp -t p` || exit 1
-  PTEMP2=`mktemp -t p` || exit 1
-  # Must use temp file due to incompatibilities in quoting behavior
-  # and to protect shell metacharacters in the expansion of $LOGNAME
-  $ECHON1 $LOGNAME | awk '{print toupper(substr($1,1,1))substr($1,2)}' > $PTEMP2
-  ICLOGNAME="`cat $PTEMP2`"
-  $PW usershow $LOGNAME | awk -F: '{ print $8 }'    \
-			| sed -e "s/\&/$ICLOGNAME/" \
-			| sed -e 's/,.*//' > $PTEMP
-  ORIGINATOR="`cat $PTEMP`"
-  rm -f "$PTEMP" "$PTEMP2"
-fi
-
-FROM="$ORIGINATOR <$LOGNAME>"
-REPLY_TO="$ORIGINATOR <${REPLY_TO:-${REPLYTO:-$LOGNAME}}>"
-
-if [ -n "$ORGANIZATION" ]; then
-  if [ -f "$ORGANIZATION" ]; then
-    ORGANIZATION="`cat $ORGANIZATION`"
-  fi
-else
-  if [ -n "$DEFAULT_ORGANIZATION" ]; then
-    ORGANIZATION="$DEFAULT_ORGANIZATION"
-  elif [ -f $HOME/.organization ]; then
-    ORGANIZATION="`cat $HOME/.organization`"
-  fi
-fi
-
-# If they don't have a preferred editor set, then use
-if [ -z "$VISUAL" ]; then
-  if [ -z "$EDITOR" ]; then
-    EDIT=vi
-  else
-    EDIT="$EDITOR"
-  fi
-else
-  EDIT="$VISUAL"
-fi
-
-# Find out some information.
-SYSTEM=`( [ -f /bin/uname ] && /bin/uname -a ) || \
-        ( [ -f /usr/bin/uname ] && /usr/bin/uname -a ) || echo ""`
-ARCH=`[ -f /bin/arch ] && /bin/arch`
-MACHINE=`[ -f /bin/machine ] && /bin/machine`
-
-COMMAND=`echo $0 | sed -e 's,.*/,,'`
-USAGE="Usage: $COMMAND [-PVL] [-t address] [-f filename] [-s severity]
-       [-c address] [-a file] [--version]"
-REMOVE=
-BATCH=
-CC=
-SEVERITY_C=
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -r) ;; 		# Ignore for backward compat.
-    -t | --to) if [ $# -eq 1 ]; then echo "$USAGE"; exit 1; fi
-	shift ; GNATS_ADDR="$1"
-	EXPLICIT_GNATS_ADDR=true
-        ;;
-    -f | --file) if [ $# -eq 1 ]; then echo "$USAGE"; exit 1; fi
-	shift ; IN_FILE="$1"
-	if [ "$IN_FILE" != "-" -a ! -r "$IN_FILE" ]; then
-	  echo "$COMMAND: cannot read $IN_FILE"
-	  exit 1
-	fi
-	;;
-    -b | --batch) BATCH=true ;;
-    -c | --cc) if [ $# -eq 1 ]; then echo "$USAGE"; exit 1; fi
-	shift ; CC="$1"
-	;;
-    -s | --severity) if [ $# -eq 1 ]; then echo "$USAGE"; exit 1; fi
-	shift ; SEVERITY_C="$1"
-	;;
-    -p | -P | --print) PRINT=true ;;
-    -L | --list) FORMAT=norm ;;
-    -l | -CL | --lisp) FORMAT=lisp ;;
-    -h | --help) echo "$USAGE"; exit 0 ;;
-    -V | --version) echo "$VERSION"; exit 0 ;;
-    -a | --attach) if [ -z "$2" ]; then
-	  echo "$USAGE" ; exit 1; 
-	fi
-	if [ -e "$2" -a ! -d "$2" ]; then
-	  PRETTY_NAME=`basename $2`
-	  if file $2 | grep "text" >/dev/null 2>/dev/null ; then
-	    ATTACHED_FILES="$ATTACHED_FILES
---- $PRETTY_NAME begins here ---
-`cat \"$2\"`
---- $PRETTY_NAME ends here ---
-"
-	  else
-	    ATTACHED_FILES="$ATTACHED_FILES
-`uuencode \"$PRETTY_NAME\" < \"$2\"`
-"
-	  fi
-	  shift;
-	fi;
-	;;
-    -*) echo "$USAGE" ; exit 1 ;;
-    *) if [ -z "$USER_GNATS_SITE" ]; then
-	 if [ ! -r "$DATADIR/gnats/$1" ]; then
-	   echo "$COMMAND: the GNATS site $1 does not have a categories list."
-	   exit 1
-	 else
-	   # The site name is the alias they'll have to have created.
-	   USER_GNATS_SITE=$1
-	 fi
-       else
-	 echo "$USAGE" ; exit 1
-       fi
-       ;;
- esac
- shift
-done
-
-if [ -n "$USER_GNATS_SITE" ] && [ "$USER_GNATS_SITE" != "$GNATS_SITE" ]; then
-  GNATS_SITE=$USER_GNATS_SITE
-  GNATS_ADDR=$USER_GNATS_SITE-gnats
-fi
-
-if [ "$SUBMITTER" = "unknown" -a -z "$IN_FILE" ]; then
-  SUBMITTER="current-users"
-fi
-
-if [ -r "$DATADIR/gnats/$GNATS_SITE" ]; then
-  CATEGORIES=`grep -v '^#' $DATADIR/gnats/$GNATS_SITE | sort`
-else
-  echo "$COMMAND: could not read $DATADIR/gnats/$GNATS_SITE for categories list."
-  exit 1
-fi
-
-if [ -z "$CATEGORIES" ]; then
-  echo "$COMMAND: the categories list for $GNATS_SITE was empty!"
-  exit 1
-fi
-
-case "$FORMAT" in
-  lisp) echo "$CATEGORIES" | \
-        awk 'BEGIN {printf "( "} {printf "(\"%s\") ",$0} END {printf ")\n"}'
-        exit 0
-        ;;
-  norm) l=`echo "$CATEGORIES" | \
-	awk 'BEGIN {max = 0; } { if (length($0) > max) { max = length($0); } }
-	     END {print max + 1;}'`
-	c=`expr 70 / $l`
-	if [ $c -eq 0 ]; then c=1; fi
-	echo "$CATEGORIES" | \
-        awk 'BEGIN {print "Known categories:"; i = 0 }
-          { printf ("%-'$l'.'$l's", $0); if ((++i % '$c') == 0) { print "" } }
-            END { print ""; }'
-        exit 0
-        ;;
-esac
-
-ORIGINATOR_C='<name of the PR author (one line)>'
-ORGANIZATION_C='<organization of PR author (multiple lines)>'
-CONFIDENTIAL_C='no <FreeBSD PRs are public data>'
-SYNOPSIS_C='<synopsis of the problem (one line)>'
-if [ -z "$SEVERITY_C" ]; then
-  SEVERITY_C='<[ non-critical | serious | critical ] (one line)>'
-fi
-PRIORITY_C='<[ low | medium | high ] (one line)>'
-CATEGORY_C='<choose from the list of categories above (one line)>'
-CLASS_C='<[ sw-bug | doc-bug | change-request | update | maintainer-update ] (one line)>'
-RELEASE_C='<release number or tag (one line)>'
-ENVIRONMENT_C='<machine, os, target, libraries (multiple lines)>'
-DESCRIPTION_C='<precise description of the problem (multiple lines)>'
-HOW_TO_REPEAT_C='<code/input/activities to reproduce the problem (multiple lines)>'
-FIX_C='<how to correct or work around the problem, if known (multiple lines)>'
-
-# Create temporary files, safely
-REF=`mktemp -t pf` || exit 1
-TEMP=`mktemp -t pf` || exit 1
-# Catch some signals. ($xs kludge needed by Sun /bin/sh)
-xs=0
-trap 'rm -f $REF $TEMP; exit $xs' 0
-trap 'SAV=`mktemp -t pr`;echo "$COMMAND: Aborting ... saving unfinished PR into $SAV"; rm -f $REF ; mv $TEMP $SAV; xs=1; exit' 1 2 3 13 15
-
-# If they told us to use a specific file, then do so.
-if [ -n "$IN_FILE" ]; then
-  if [ "$IN_FILE" = "-" ]; then
-    # The PR is coming from the standard input.
-    if [ -n "$EXPLICIT_GNATS_ADDR" ]; then
-      sed -e "s;^[Tt][Oo]:.*;To: $GNATS_ADDR;" > $TEMP
-    else
-      cat > $TEMP
-    fi
-  else
-    # Use the file they named.
-    if [ -n "$EXPLICIT_GNATS_ADDR" ]; then
-      sed -e "s;^[Tt][Oo]:.*;To: $GNATS_ADDR;" $IN_FILE > $TEMP
-    else
-      cat $IN_FILE > $TEMP
-    fi
-  fi
-else
-
-  if [ -n "$PR_FORM" -a -z "$PRINT_INTERN" ]; then
-    # If their PR_FORM points to a bogus entry, then bail.
-    if [ ! -f "$PR_FORM" -o ! -r "$PR_FORM" -o ! -s "$PR_FORM" ]; then
-      echo "$COMMAND: can't seem to read your template file (\`$PR_FORM'), ignoring PR_FORM"
-      sleep 1
-      PRINT_INTERN=bad_prform
-    fi
-  fi
-
-  if [ -n "$PR_FORM" -a -z "$PRINT_INTERN" ]; then
-    cp $PR_FORM $TEMP || 
-      ( echo "$COMMAND: could not copy $PR_FORM" ; xs=1; exit )
-    [ -n "$ATTACHED_FILES" ] && echo "$ATTACHED_FILES" >> $TEMP
-  else
-    for file in $TEMP $REF ; do
-      cat  > $file << '__EOF__'
-SEND-PR: -*- send-pr -*-
-SEND-PR: vim: syntax=sendpr
-SEND-PR:
-SEND-PR: Lines starting with `SEND-PR' will be removed automatically, as
-SEND-PR: will all comments (text enclosed in `<' and `>').
-SEND-PR:
-SEND-PR: Please consult the following URL if you are not sure how to
-SEND-PR: fill out a problem report:
-SEND-PR: http://www.freebsd.org/doc/en/articles/problem-reports/
-SEND-PR:
-SEND-PR: Note that the Synopsis field is mandatory.
-SEND-PR:
-SEND-PR: Please note that (unless you state otherwise) if your report 
-SEND-PR: includes a patch then it will be taken under the same license as 
-SEND-PR: the one on the file(s) you want to change.
-SEND-PR:
-SEND-PR: BE ADVISED THAT FREEBSD PROBLEM REPORTS ARE PUBLIC INFORMATION AND
-SEND-PR: WILL BE PUBLISHED AS-IS ON THE PROJECT'S MAILING LISTS AND WEB SITES.
-SEND-PR: DO NOT SUBMIT ANY INFORMATION YOU DO NOT WANT MADE PUBLIC.
-SEND-PR:
-SEND-PR: If you wish to submit a problem report confidentially, then contact
-SEND-PR: the FreeBSD bugmaster (bugmaster@FreeBSD.org) to arrange for a
-SEND-PR: relevant developer to be contacted.
-SEND-PR:
-SEND-PR: For sensitive security issues, consider contacting the FreeBSD
-SEND-PR: security officer team (security-officer@freebsd.org) directly.
-SEND-PR:
-SEND-PR: Choose from the following categories:
-SEND-PR:
-__EOF__
-
-      # Format the categories so they fit onto lines.
-	l=`echo "$CATEGORIES" | \
-	awk 'BEGIN {max = 0; } { if (length($0) > max) { max = length($0); } }
-	     END {print max + 1;}'`
-	c=`expr 61 / $l`
-	if [ $c -eq 0 ]; then c=1; fi
-	echo "$CATEGORIES" | \
-        awk 'BEGIN {printf "SEND-PR: "; i = 0 }
-          { printf ("%-'$l'.'$l's", $0);
-	    if ((++i % '$c') == 0) { printf "\nSEND-PR: " } }
-            END { printf "\nSEND-PR:\n"; }' >> $file
-
-      cat >> $file << __EOF__
-To: $GNATS_ADDR
-From: $FROM
-Reply-To: $REPLY_TO
-Cc: $CC
-X-send-pr-version: $VERSION
-X-GNATS-Notify: 
-
-
->Submitter-Id:	$SUBMITTER
->Originator:	$ORIGINATOR
->Organization:	${ORGANIZATION-$ORGANIZATION_C}
->Confidential:	$CONFIDENTIAL_C
->Synopsis:	$SYNOPSIS_C
->Severity:	$SEVERITY_C
->Priority:	$PRIORITY_C
->Category:	$CATEGORY_C
->Class:		$CLASS_C
->Release:	${DEFAULT_RELEASE-$RELEASE_C}
->Environment:
-`[ -n "$SYSTEM" ] && echo System: $SYSTEM`
-`[ -n "$ARCH" ] && echo Architecture: $ARCH`
-`[ -n "$MACHINE" ] && echo Machine: $MACHINE`
-	$ENVIRONMENT_C
->Description:
-	$DESCRIPTION_C
->How-To-Repeat:
-	$HOW_TO_REPEAT_C
->Fix:
-
-	$FIX_C
-$ATTACHED_FILES
-
-__EOF__
-
-    done
-  fi
-
-  if [ "$PRINT" = true -o "$PRINT_INTERN" = true ]; then
-    cat $TEMP
-    xs=0; exit
-  fi
-
-  chmod u+w $TEMP
-  eval $EDIT $TEMP
-
-  if cmp -s $REF $TEMP ; then
-    echo "$COMMAND: problem report not filled out, therefore not sent"
-    xs=1; exit
-  fi
-fi
-
-#
-#	Check the enumeration fields
-
-# This is a "sed-subroutine" with one keyword parameter 
-# (with workaround for Sun sed bug)
-#
-SED_CMD='{
-s|||
-s|<.*>||
-s|^[ 	]*||
-s|[ 	]*$||
-p
-q
-}'
-
-
-while true; do
-  CNT=0
-
-  # 1) Confidential
-  #
-  PATTERN=">Confidential:"
-  CONFIDENTIAL=`eval sed -n -e "\"/$PATTERN/$SED_CMD\"" $TEMP`
-  case "$CONFIDENTIAL" in
-    ""|no) CNT=`expr $CNT + 1` ;;
-    *) echo "$COMMAND: \`$CONFIDENTIAL' is not a valid value for \`Confidential'." ;;
-  esac
-  #
-  # 2) Severity
-  #
-  PATTERN=">Severity:"
-  SEVERITY=`eval sed -n -e "\"/$PATTERN/$SED_CMD\"" $TEMP`
-  case "$SEVERITY" in
-    ""|non-critical|serious|critical) CNT=`expr $CNT + 1` ;;
-    *)  echo "$COMMAND: \`$SEVERITY' is not a valid value for \`Severity'."
-  esac
-  #
-  # 3) Priority
-  #
-  PATTERN=">Priority:"
-  PRIORITY=`eval sed -n -e "\"/$PATTERN/$SED_CMD\"" $TEMP`
-  case "$PRIORITY" in
-    ""|low|medium|high) CNT=`expr $CNT + 1` ;;
-    *)  echo "$COMMAND: \`$PRIORITY' is not a valid value for \`Priority'."
-  esac
-  #
-  # 4) Category
-  #
-  PATTERN=">Category:"
-  CATEGORY=`eval sed -n -e "\"/$PATTERN/$SED_CMD\"" $TEMP`
-  FOUND=
-  for C in $CATEGORIES
-  do
-    if [ "$C" = "$CATEGORY" ]; then FOUND=true ; break ; fi
-  done
-  if [ -n "$FOUND" ]; then
-    CNT=`expr $CNT + 1`	
-  else
-    if [ -z "$CATEGORY" ]; then
-      echo "$COMMAND: you must include a Category: field in your report."
-    else
-      echo "$COMMAND: \`$CATEGORY' is not a known category."
-    fi
-  fi
-  #
-  # 5) Class
-  #
-  PATTERN=">Class:"
-  CLASS=`eval sed -n -e "\"/$PATTERN/$SED_CMD\"" $TEMP`
-  case "$CLASS" in
-    ""|sw-bug|doc-bug|change-request|update|maintainer-update) CNT=`expr $CNT + 1` ;;
-    *)  echo "$COMMAND: \`$CLASS' is not a valid value for \`Class'."
-  esac
-  #
-  # 6) Check that synopsis is not empty
-  #
-  if grep "^>Synopsis:[ 	]*${SYNOPSIS_C}\$" $TEMP > /dev/null
-  then
-    echo "$COMMAND: Synopsis must not be empty."
-  else
-    CNT=`expr $CNT + 1`
-  fi
-
-  [ $CNT -lt 6 -a -z "$BATCH" ] && 
-    echo "Errors were found with the problem report."
-
-  while true; do
-    if [ -z "$BATCH" ]; then
-      $ECHON1 "s)end, e)dit or a)bort? $ECHON2"
-      read input
-    else
-      if [ $CNT -eq 6 ]; then
-        input=s
-      else
-        input=a
-      fi
-    fi
-    case "$input" in
-      a*)
-	if [ -z "$BATCH" ]; then
-	  BAD=`mktemp -t pbad`
-	  echo "$COMMAND: the problem report remains in $BAD and is not sent."
-	  mv $TEMP $BAD
-        else
-	  echo "$COMMAND: the problem report is not sent."
-	fi
-	xs=1; exit
-	;;
-      e*)
-        eval $EDIT $TEMP
-	continue 2
-	;;
-      s*)
-        if [ $CNT -lt 6 ]; then
-          if [ -z "$BATCH" ]; then
-            echo "But there are still errors in the problem report!"
-            continue 2
-          else
-            echo "Errors found in PR"
-            exit 1
-          fi
-        fi
-	break 2
-	;;
-    esac
-  done
-done
-
-#
-# Remove the subject field if one is already there.  There's no reason
-# for it to be any different than the synopsis.
-#
-if grep '^Subject:' $TEMP > /dev/null
-then
-  ed -s $TEMP << __EOF__
-/^Subject:/d
-w
-q
-__EOF__
-fi
-
-#
-# Add the subject field with the value of $SYNOPSIS.  We use the To:
-# field as an anchor, which had better be there.
-#
-SYNOPSIS=`grep '^>Synopsis:' $TEMP | sed -e 's/^>Synopsis:[ 	]*//' |
-    sed -e "s;$SYNOPSIS_C;;"`
-ed -s $TEMP << __EOF__
-/^To:/a
-Subject: $SYNOPSIS
-.
-w
-q
-__EOF__
-
-#
-#	Remove comments and send the problem report
-#	(we have to use patterns, where the comment contains regex chars)
-#
-# /^>Originator:/s;$ORIGINATOR;;
-sed  -e "
-/^SEND-PR:/d
-/^>Organization:/,/^>[A-Za-z-]*:/s;$ORGANIZATION_C;;
-/^>Confidential:/s;<.*>;;
-/^>Synopsis:/s;$SYNOPSIS_C;;
-/^>Severity:/s;<.*>;;
-/^>Priority:/s;<.*>;;
-/^>Category:/s;$CATEGORY_C;;
-/^>Class:/s;<.*>;;
-/^>Release:/,/^>[A-Za-z-]*:/s;$RELEASE_C;;
-/^>Environment:/,/^>[A-Za-z-]*:/s;$ENVIRONMENT_C;;
-/^>Description:/,/^>[A-Za-z-]*:/s;$DESCRIPTION_C;;
-/^>How-To-Repeat:/,/^>[A-Za-z-]*:/s;$HOW_TO_REPEAT_C;;
-/^>Fix:/,/^>[A-Za-z-]*:/s;$FIX_C;;
-" $TEMP > $REF
-
-if $MAIL_AGENT < $REF; then
-  echo "$COMMAND: problem report sent"
-  xs=0; exit
-else
-  echo "$COMMAND: mysterious mail failure."
-  if [ -z "$BATCH" ]; then
-    BAD=`mktemp -t pbad`
-    echo "$COMMAND: the problem report remains in $BAD and is not sent."
-    mv $TEMP $BAD
-  else
-    echo "$COMMAND: the problem report is not sent."
-  fi
-  xs=1; exit
-fi
diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile
index a68a1c6efe3f..de95af6ec636 100644
--- a/gnu/usr.bin/texinfo/info/Makefile
+++ b/gnu/usr.bin/texinfo/info/Makefile
@@ -10,8 +10,8 @@ SRCS=	dir.c display.c doc.c dribble.c echo-area.c filesys.c \
 
 CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\"
 
-DPADD=	${LIBTERMCAP} ${LIBTXI}
-LDADD=	-ltermcap ${LIBTXI}
+DPADD=	${LIBTERMCAPW} ${LIBTXI}
+LDADD=	-ltermcapw ${LIBTXI}
 
 NO_PIE=	yes
 
diff --git a/include/Makefile b/include/Makefile
index 4693c2f87438..f046bc16fc41 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -6,11 +6,11 @@
 .include <src.opts.mk>
 
 CLEANFILES= osreldate.h version vers.c
-SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale
+SUBDIR= arpa protocols rpcsvc rpc xlocale
 INCS=	a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
 	db.h \
 	dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
-	fts.h ftw.h getopt.h glob.h grp.h gssapi.h \
+	fts.h ftw.h getopt.h glob.h grp.h \
 	ieeefp.h ifaddrs.h \
 	inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
 	locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \
@@ -67,6 +67,11 @@ _dev_powermac_nvram=	dev/powermac_nvram
 _dev_ieee488=	dev/ieee488
 .endif
 
+.if ${MK_GSSAPI} != "no"
+SUBDIR+=	gssapi
+INCS+=		gssapi.h
+.endif
+
 .if ${MK_HESIOD} != "no"
 INCS+=	hesiod.h
 .endif
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index 9713e7f63580..1078521c47fd 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -51,7 +51,7 @@
 
 /*%
  *	@(#)inet.h	8.1 (Berkeley) 6/2/93
- *	$Id: inet.h,v 1.2.18.1 2005/04/27 05:00:50 sra Exp $
+ *	$Id: inet.h,v 1.3 2005/04/27 04:56:16 sra Exp $
  * $FreeBSD$
  */
 
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 1f5ce4539f24..448edd74a92f 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -1,7 +1,24 @@
+/*
+ * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1996-2003  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and/or 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 ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC 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.
+ */
+
 /*
  * Copyright (c) 1983, 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:
@@ -13,7 +30,7 @@
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -28,24 +45,7 @@
  */
 
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * 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 ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC 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.
- */
-
-/*
- *	$Id: nameser.h,v 1.7.18.2 2008/04/03 23:15:15 marka Exp $
+ *	$Id: nameser.h,v 1.16 2009/03/03 01:52:48 each Exp $
  * $FreeBSD$
  */
 
@@ -68,15 +68,18 @@
  * contains a new enough lib/nameser/ to support the feature you need.
  */
 
-#define __NAMESER	19991006	/*%< New interface version stamp. */
+#define __NAMESER	20090302	/*%< New interface version stamp. */
 /*
  * Define constants based on RFC0883, RFC1034, RFC 1035
  */
 #define NS_PACKETSZ	512	/*%< default UDP packet size */
-#define NS_MAXDNAME	1025	/*%< maximum domain name */
+#define NS_MAXDNAME	1025	/*%< maximum domain name (presentation format)*/
 #define NS_MAXMSG	65535	/*%< maximum message size */
 #define NS_MAXCDNAME	255	/*%< maximum compressed domain name */
 #define NS_MAXLABEL	63	/*%< maximum length of domain label */
+#define NS_MAXLABELS	128	/*%< theoretical max #/labels per domain name */
+#define NS_MAXNNAME	256	/*%< maximum uncompressed (binary) domain name*/
+#define	NS_MAXPADDR	(sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
 #define NS_HFIXEDSZ	12	/*%< #/bytes of fixed data in header */
 #define NS_QFIXEDSZ	4	/*%< #/bytes of fixed data in query */
 #define NS_RRFIXEDSZ	10	/*%< #/bytes of fixed data in r record */
@@ -102,6 +105,18 @@ typedef enum __ns_sect {
 	ns_s_max = 4
 } ns_sect;
 
+/*%
+ * Network name (compressed or not) type.  Equivilent to a pointer when used
+ * in a function prototype.  Can be const'd.
+ */
+typedef u_char ns_nname[NS_MAXNNAME];
+typedef const u_char *ns_nname_ct;
+typedef u_char *ns_nname_t;
+
+struct ns_namemap { ns_nname_ct base; int len; };
+typedef struct ns_namemap *ns_namemap_t;
+typedef const struct ns_namemap *ns_namemap_ct;
+
 /*%
  * This is a message handle.  It is caller allocated and has no dynamic data.
  * This structure is intended to be opaque to all but ns_parse.c, thus the
@@ -116,6 +131,17 @@ typedef struct __ns_msg {
 	const u_char	*_msg_ptr;
 } ns_msg;
 
+/*
+ * This is a newmsg handle, used when constructing new messages with
+ * ns_newmsg_init, et al.
+ */
+struct ns_newmsg {
+	ns_msg		msg;
+	const u_char	*dnptrs[25];
+	const u_char	**lastdnptr;
+};
+typedef struct ns_newmsg ns_newmsg;
+
 /* Private data structure - do not use from outside library. */
 struct _ns_flagdata {  int mask, shift;  };
 extern struct _ns_flagdata _ns_flagdata[];
@@ -140,8 +166,23 @@ typedef	struct __ns_rr {
 	const u_char *	rdata;
 } ns_rr;
 
+/*
+ * Same thing, but using uncompressed network binary names, and real C types.
+ */
+typedef	struct __ns_rr2 {
+	ns_nname	nname;
+	size_t		nnamel;
+	int		type;
+	int		rr_class;
+	u_int		ttl;
+	int		rdlength;
+	const u_char *	rdata;
+} ns_rr2;
+
 /* Accessor macros - this is part of the public interface. */
 #define ns_rr_name(rr)	(((rr).name[0] != '\0') ? (rr).name : ".")
+#define ns_rr_nname(rr)	((const ns_nname_t)(rr).nname)
+#define ns_rr_nnamel(rr) ((rr).nnamel + 0)
 #define ns_rr_type(rr)	((ns_type)((rr).type + 0))
 #define ns_rr_class(rr)	((ns_class)((rr).rr_class + 0))
 #define ns_rr_ttl(rr)	((rr).ttl + 0)
@@ -216,9 +257,9 @@ typedef enum __ns_update_operation {
  * This structure is used for TSIG authenticated messages
  */
 struct ns_tsig_key {
-        char name[NS_MAXDNAME], alg[NS_MAXDNAME];
-        unsigned char *data;
-        int len;
+	char name[NS_MAXDNAME], alg[NS_MAXDNAME];
+	unsigned char *data;
+	int len;
 };
 typedef struct ns_tsig_key ns_tsig_key;
 
@@ -274,7 +315,7 @@ typedef enum __ns_type {
 	ns_t_key = 25,		/*%< Security key. */
 	ns_t_px = 26,		/*%< X.400 mail mapping. */
 	ns_t_gpos = 27,		/*%< Geographical position (withdrawn). */
-	ns_t_aaaa = 28,		/*%< Ip6 Address. */
+	ns_t_aaaa = 28,		/*%< IPv6 Address. */
 	ns_t_loc = 29,		/*%< Location Information. */
 	ns_t_nxt = 30,		/*%< Next domain (security). */
 	ns_t_eid = 31,		/*%< Endpoint identifier. */
@@ -284,11 +325,22 @@ typedef enum __ns_type {
 	ns_t_naptr = 35,	/*%< Naming Authority PoinTeR */
 	ns_t_kx = 36,		/*%< Key Exchange */
 	ns_t_cert = 37,		/*%< Certification record */
-	ns_t_a6 = 38,		/*%< IPv6 address (deprecates AAAA) */
-	ns_t_dname = 39,	/*%< Non-terminal DNAME (for IPv6) */
+	ns_t_a6 = 38,		/*%< IPv6 address (experimental) */
+	ns_t_dname = 39,	/*%< Non-terminal DNAME */
 	ns_t_sink = 40,		/*%< Kitchen sink (experimentatl) */
 	ns_t_opt = 41,		/*%< EDNS0 option (meta-RR) */
 	ns_t_apl = 42,		/*%< Address prefix list (RFC3123) */
+	ns_t_ds = 43,		/*%< Delegation Signer */
+	ns_t_sshfp = 44,	/*%< SSH Fingerprint */
+	ns_t_ipseckey = 45,	/*%< IPSEC Key */
+	ns_t_rrsig = 46,	/*%< RRset Signature */
+	ns_t_nsec = 47,		/*%< Negative security */
+	ns_t_dnskey = 48,	/*%< DNS Key */
+	ns_t_dhcid = 49,	/*%< Dynamic host configuratin identifier */
+	ns_t_nsec3 = 50,	/*%< Negative security type 3 */
+	ns_t_nsec3param = 51,	/*%< Negative security type 3 parameters */
+	ns_t_hip = 55,		/*%< Host Identity Protocol */
+	ns_t_spf = 99,		/*%< Sender Policy Framework */
 	ns_t_tkey = 249,	/*%< Transaction key */
 	ns_t_tsig = 250,	/*%< Transaction signature. */
 	ns_t_ixfr = 251,	/*%< Incremental zone transfer. */
@@ -297,6 +349,7 @@ typedef enum __ns_type {
 	ns_t_maila = 254,	/*%< Transfer mail agent records. */
 	ns_t_any = 255,		/*%< Wildcard match. */
 	ns_t_zxfr = 256,	/*%< BIND-specific, nonstandard. */
+	ns_t_dlv = 32769,	/*%< DNSSEC look-aside validatation. */
 	ns_t_max = 65536
 } ns_type;
 
@@ -475,6 +528,7 @@ typedef enum __ns_cert_types {
 #define ns_initparse		__ns_initparse
 #define ns_skiprr		__ns_skiprr
 #define ns_parserr		__ns_parserr
+#define ns_parserr2		__ns_parserr2
 #define	ns_sprintrr		__ns_sprintrr
 #define	ns_sprintrrf		__ns_sprintrrf
 #define	ns_format_ttl		__ns_format_ttl
@@ -485,12 +539,19 @@ typedef enum __ns_cert_types {
 #define	ns_name_ntol		__ns_name_ntol
 #define	ns_name_ntop		__ns_name_ntop
 #define	ns_name_pton		__ns_name_pton
+#define	ns_name_pton2		__ns_name_pton2
 #define	ns_name_unpack		__ns_name_unpack
+#define	ns_name_unpack2		__ns_name_unpack2
 #define	ns_name_pack		__ns_name_pack
 #define	ns_name_compress	__ns_name_compress
 #define	ns_name_uncompress	__ns_name_uncompress
 #define	ns_name_skip		__ns_name_skip
 #define	ns_name_rollback	__ns_name_rollback
+#define	ns_name_length		__ns_name_length
+#define	ns_name_eq		__ns_name_eq
+#define	ns_name_owned		__ns_name_owned
+#define	ns_name_map		__ns_name_map
+#define	ns_name_labels		__ns_name_labels
 #if 0
 #define	ns_sign			__ns_sign
 #define	ns_sign2		__ns_sign2
@@ -508,6 +569,16 @@ typedef enum __ns_cert_types {
 #endif
 #define	ns_makecanon		__ns_makecanon
 #define	ns_samename		__ns_samename
+#define	ns_newmsg_init		__ns_newmsg_init
+#define	ns_newmsg_copy		__ns_newmsg_copy
+#define	ns_newmsg_id		__ns_newmsg_id
+#define	ns_newmsg_flag		__ns_newmsg_flag
+#define	ns_newmsg_q		__ns_newmsg_q
+#define	ns_newmsg_rr		__ns_newmsg_rr
+#define	ns_newmsg_done		__ns_newmsg_done
+#define	ns_rdata_unpack		__ns_rdata_unpack
+#define	ns_rdata_equal		__ns_rdata_equal
+#define	ns_rdata_refers		__ns_rdata_refers
 
 __BEGIN_DECLS
 int		ns_msg_getflag(ns_msg, int);
@@ -518,6 +589,7 @@ void		ns_put32(u_long, u_char *);
 int		ns_initparse(const u_char *, int, ns_msg *);
 int		ns_skiprr(const u_char *, const u_char *, ns_sect, int);
 int		ns_parserr(ns_msg *, ns_sect, int, ns_rr *);
+int		ns_parserr2(ns_msg *, ns_sect, int, ns_rr2 *);
 int		ns_sprintrr(const ns_msg *, const ns_rr *,
 			    const char *, const char *, char *, size_t);
 int		ns_sprintrrf(const u_char *, size_t, const char *,
@@ -532,8 +604,12 @@ u_int32_t	ns_datetosecs(const char *cp, int *errp);
 int		ns_name_ntol(const u_char *, u_char *, size_t);
 int		ns_name_ntop(const u_char *, char *, size_t);
 int		ns_name_pton(const char *, u_char *, size_t);
+int		ns_name_pton2(const char *, u_char *, size_t, size_t *);
 int		ns_name_unpack(const u_char *, const u_char *,
 			       const u_char *, u_char *, size_t);
+int		ns_name_unpack2(const u_char *, const u_char *,
+				const u_char *, u_char *, size_t,
+				size_t *);
 int		ns_name_pack(const u_char *, u_char *, int,
 			     const u_char **, const u_char **);
 int		ns_name_uncompress(const u_char *, const u_char *,
@@ -543,6 +619,11 @@ int		ns_name_compress(const char *, u_char *, size_t,
 int		ns_name_skip(const u_char **, const u_char *);
 void		ns_name_rollback(const u_char *, const u_char **,
 				 const u_char **);
+ssize_t		ns_name_length(ns_nname_ct, size_t);
+int		ns_name_eq(ns_nname_ct, size_t, ns_nname_ct, size_t);
+int		ns_name_owned(ns_namemap_ct, int, ns_namemap_ct, int);
+int		ns_name_map(ns_nname_ct, size_t, ns_namemap_t, int);
+int		ns_name_labels(ns_nname_ct, size_t);
 #if 0
 int		ns_sign(u_char *, int *, int, int, void *,
 			const u_char *, int, u_char *, int *, time_t);
@@ -570,6 +651,25 @@ int		ns_subdomain(const char *, const char *);
 #endif
 int		ns_makecanon(const char *, char *, size_t);
 int		ns_samename(const char *, const char *);
+int		ns_newmsg_init(u_char *buffer, size_t bufsiz, ns_newmsg *);
+int		ns_newmsg_copy(ns_newmsg *, ns_msg *);
+void		ns_newmsg_id(ns_newmsg *handle, u_int16_t id);
+void		ns_newmsg_flag(ns_newmsg *handle, ns_flag flag, u_int value);
+int		ns_newmsg_q(ns_newmsg *handle, ns_nname_ct qname,
+			    ns_type qtype, ns_class qclass);
+int		ns_newmsg_rr(ns_newmsg *handle, ns_sect sect,
+			     ns_nname_ct name, ns_type type,
+			     ns_class rr_class, u_int32_t ttl,
+			     u_int16_t rdlen, const u_char *rdata);
+size_t		ns_newmsg_done(ns_newmsg *handle);
+ssize_t		ns_rdata_unpack(const u_char *, const u_char *, ns_type,
+				const u_char *, size_t, u_char *, size_t);
+int		ns_rdata_equal(ns_type,
+			       const u_char *, size_t,
+			       const u_char *, size_t);
+int		ns_rdata_refers(ns_type,
+				const u_char *, size_t,
+				const u_char *);
 __END_DECLS
 
 #ifdef BIND_4_COMPAT
diff --git a/include/arpa/nameser_compat.h b/include/arpa/nameser_compat.h
index 91ff176ed13b..eeea8eceda24 100644
--- a/include/arpa/nameser_compat.h
+++ b/include/arpa/nameser_compat.h
@@ -28,7 +28,7 @@
 
 /*%
  *      from nameser.h	8.1 (Berkeley) 6/2/93
- *	$Id: nameser_compat.h,v 1.5.18.3 2006/05/19 02:36:00 marka Exp $
+ *	$Id: nameser_compat.h,v 1.8 2006/05/19 02:33:40 marka Exp $
  * $FreeBSD$
  */
 
diff --git a/include/dirent.h b/include/dirent.h
index c77d844e399b..b894bb845329 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -63,6 +63,7 @@ typedef struct _dirdesc DIR;
 #define DTF_NODUP	0x0002	/* don't return duplicate names */
 #define DTF_REWIND	0x0004	/* rewind after reading union stack */
 #define __DTF_READALL	0x0008	/* everything has been read */
+#define	__DTF_SKIPREAD	0x0010  /* assume internal buffer is populated */
 
 #else /* !__BSD_VISIBLE */
 
diff --git a/include/res_update.h b/include/res_update.h
index f09d3a1a49cd..06f3b3a5dd54 100644
--- a/include/res_update.h
+++ b/include/res_update.h
@@ -16,7 +16,7 @@
  */
 
 /*
- *	$Id: res_update.h,v 1.2.18.1 2005/04/27 05:00:49 sra Exp $
+ *	$Id: res_update.h,v 1.3 2005/04/27 04:56:15 sra Exp $
  * $FreeBSD$
  */
 
diff --git a/include/resolv.h b/include/resolv.h
index 458835b84d76..e3d4fd12a097 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -1,7 +1,24 @@
+/*
+ * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1995-2003  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and/or 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 ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC 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.
+ */
+
 /*
  * Copyright (c) 1983, 1987, 1989
  *    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:
@@ -13,7 +30,7 @@
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -27,26 +44,9 @@
  * SUCH DAMAGE.
  */
 
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * 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 ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC 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.
- */
-
 /*%
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	$Id: resolv.h,v 1.19.18.4 2008/04/03 23:15:15 marka Exp $
+ *	$Id: resolv.h,v 1.30 2009/03/03 01:52:48 each Exp $
  * $FreeBSD$
  */
 
@@ -68,7 +68,7 @@
  * is new enough to contain a certain feature.
  */
 
-#define	__RES	20030124
+#define	__RES	20090302
 
 /*%
  * This used to be defined in res_query.c, now it's in herror.c.
@@ -179,7 +179,7 @@ struct __res_state {
 	u_int	_pad;			/*%< make _u 64 bit aligned */
 	union {
 		/* On an 32-bit arch this means 512b total. */
-		char	pad[72 - 4*sizeof (int) - 2*sizeof (void *)];
+		char	pad[72 - 4*sizeof (int) - 3*sizeof (void *)];
 		struct {
 			u_int16_t		nscount;
 			u_int16_t		nstimes[MAXNS];	/*%< ms. */
@@ -187,6 +187,7 @@ struct __res_state {
 			struct __res_state_ext *ext;	/*%< extension for IPv6 */
 		} _ext;
 	} _u;
+	u_char	*_rnd;			/*%< PRIVATE: random state */
 };
 
 typedef struct __res_state *res_state;
@@ -320,7 +321,7 @@ __END_DECLS
 #if !defined(SHARED_LIBBIND) || defined(LIB)
 /*
  * If libbind is a shared object (well, DLL anyway)
- * these externs break the linker when resolv.h is 
+ * these externs break the linker when resolv.h is
  * included by a lib client (like named)
  * Make them go away if a client is including this
  *
@@ -378,7 +379,9 @@ extern const struct res_sym __p_rcode_syms[];
 #define res_nisourserver	__res_nisourserver
 #define res_ownok		__res_ownok
 #define res_queriesmatch	__res_queriesmatch
+#define res_rndinit		__res_rndinit
 #define res_randomid		__res_randomid
+#define res_nrandomid		__res_nrandomid
 #define sym_ntop		__sym_ntop
 #define sym_ntos		__sym_ntos
 #define sym_ston		__sym_ston
@@ -441,7 +444,9 @@ int		dn_count_labels(const char *);
 int		dn_comp(const char *, u_char *, int, u_char **, u_char **);
 int		dn_expand(const u_char *, const u_char *, const u_char *,
 			  char *, int);
+void		res_rndinit(res_state);
 u_int		res_randomid(void);
+u_int		res_nrandomid(res_state);
 int		res_nameinquery(const char *, int, int, const u_char *,
 				const u_char *);
 int		res_queriesmatch(const u_char *, const u_char *,
diff --git a/include/search.h b/include/search.h
index 4e4606f12720..068c82d3ca61 100644
--- a/include/search.h
+++ b/include/search.h
@@ -1,8 +1,8 @@
 /*-
- * Written by J.T. Conklin <jtc@netbsd.org>
+ * Written by J.T. Conklin <jtc@NetBSD.org>
  * Public domain.
  *
- *	$NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $
+ *	$NetBSD: search.h,v 1.16 2005/02/03 04:39:32 perry Exp $
  * $FreeBSD$
  */
 
@@ -45,6 +45,15 @@ struct que_elem {
 };
 #endif
 
+#if __BSD_VISIBLE
+struct _ENTRY;
+struct hsearch_data {
+	struct _ENTRY *table;
+	size_t size;
+	size_t filled;
+};
+#endif
+
 __BEGIN_DECLS
 int	 hcreate(size_t);
 void	 hdestroy(void);
@@ -61,6 +70,13 @@ void	*tfind(const void *, void * const *,
 	    int (*)(const void *, const void *));
 void	*tsearch(const void *, void **, int (*)(const void *, const void *));
 void	 twalk(const void *, void (*)(const void *, VISIT, int));
+
+#if __BSD_VISIBLE
+int	 hcreate_r(size_t, struct hsearch_data *);
+void	 hdestroy_r(struct hsearch_data *);
+int	 hsearch_r(ENTRY, ACTION, ENTRY **, struct hsearch_data *);
+#endif
+
 __END_DECLS
 
 #endif /* !_SEARCH_H_ */
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index b30ec755d4b7..4128762967a5 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -3,7 +3,7 @@
 LIB=	krb5
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/krb5/version-script.map
-LDADD=	-lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken -lwind -lheimbase -lheimipcc
+LDADD=	-lasn1 -lcom_err -lcrypt -lcrypto -lhx509 -lroken -lwind -lheimbase ${LDHEIMIPCC}
 DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} ${LIBHX509} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC}
 USEPRIVATELIB= heimipcc
 
diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile
index 937d0bf12afc..bc55a1af2293 100644
--- a/kerberos5/libexec/digest-service/Makefile
+++ b/kerberos5/libexec/digest-service/Makefile
@@ -10,7 +10,7 @@ CFLAGS+=	-I${KRB5DIR}/kdc \
 		-I${KRB5DIR}/lib/roken
 DPADD=	${LIBHDB} ${LIBKDC} ${LIBHEIMIPCS} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} \
 	${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS}
-LDADD=	-lhdb -lkdc -lheimipcs -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
+LDADD=	-lhdb -lkdc ${LDHEIMIPCS} -lkrb5 -lroken -lasn1 -lcrypto -lcrypt \
 	${LIBVERS} -lheimntlm
 USEPRIVATELIB= heimipcs
 
diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile
index 003c5104f9c3..8daf95877882 100644
--- a/kerberos5/libexec/kcm/Makefile
+++ b/kerberos5/libexec/kcm/Makefile
@@ -21,7 +21,7 @@ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
 	-I${KRB5DIR}/kcm -I${KRB5DIR}/lib/ipc ${LDAPCFLAGS}
 DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBHEIMNTLM} \
 	${LIBHEIMIPCS} ${LIBCRYPTO} ${LIBCRYPT} ${LIBVERS} ${LDAPDPADD}
-LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lheimntlm -lheimipcs \
+LDADD=	-lhdb -lkrb5 -lroken -lasn1 -lheimntlm ${LDHEIMIPCS} \
 	-lcrypto -lcrypt ${LIBVERS} ${LDAPLDADD}
 USEPRIVATELIB= heimipcs
 LDFLAGS=${LDAPLDFLAGS}
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 91b53a2f563b..b01d78923a8d 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -29,11 +29,11 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
 DPADD=	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} \
 	${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \
 	${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
-	${LIBEDIT} ${LIBNCURSES} ${LDAPDPADD}
+	${LIBEDIT} ${LIBNCURSESW} ${LDAPDPADD}
 LDADD=	-lkadm5clnt -lkadm5srv -lhdb -lkrb5 -lhx509 \
 	${LIBSL} -lroken ${LIBVERS} -lasn1 \
 	-lcrypto -lcrypt -lcom_err \
-	-ledit -lncurses ${LDAPLDADD}
+	-ledit -lncursesw ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
 NO_PIE=	yes
diff --git a/lib/Makefile b/lib/Makefile
index 51abfcadcdb0..a5ab970f014b 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -3,87 +3,47 @@
 
 .include <src.opts.mk>
 
-# To satisfy shared library or ELF linkage when only the libraries being
-# built are visible:
-#
-# csu must be built before all shared libaries for ELF.
-# libc must be built before all other shared libraries.
-# libbsm must be built before libauditd.
-# libcom_err must be built before libpam.
-# libcrypt must be built before libpam.
-# libkvm must be built before libdevstat.
-# libldns must be built before libunbound.
-# msun must be built before libg++ and libstdc++.
-# libmd must be built before libatm, libopie, libradius, and libtacplus.
-# ncurses must be built before libdialog, libedit and libreadline.
-# libnetgraph must be built before libbsnmp/modules/snmp_netgraph.
-# libopie must be built before libpam.
-# libradius must be built before libpam.
-# librpcsvc must be built before libpam.
-# libsbuf must be built before libcam.
-# libtacplus must be built before libpam.
-# libutil must be built before libpam.
-# libypclnt must be built before libpam.
-# libgssapi must be built before librpcsec_gss
-#
-# Otherwise, the SUBDIR list should be in alphabetical order.
-#
-# Except it appears bind needs to be compiled last
+# The SUBDIR_ORDERED list is a small set of libraries which are used by many
+# of the other libraries.  These are built first with a .WAIT between them
+# and the main list to avoid needing a SUBDIR_DEPEND line on every library
+# naming just these few items.
 
 SUBDIR_ORDERED=	${_csu} \
 	.WAIT \
 	libc \
 	libc_nonshared \
-	.WAIT \
-	msun \
-	.WAIT \
-	libbsm \
-	libauditd \
-	libutil \
-	libpjdlog \
-	libnv \
-	${_libcapsicum} \
 	libcompiler_rt \
-	libcrypt \
-	libelf \
-	${_libiconv_modules} \
-	libkvm \
-	${_libldns} \
-	libmd \
-	ncurses \
-	${_libnetgraph} \
-	libradius \
-	librpcsvc \
-	libsbuf \
-	libtacplus \
-	${_libypclnt} \
+	${_libcplusplus} \
 	${_libcxxrt} \
-	${_libcplusplus}
+	libelf \
+	msun
 
-.if ${MK_KERBEROS_SUPPORT} != "no"
-SUBDIR_ORDERED+=	libcom_err
-.endif
+# The main list; please keep these sorted alphabetically.
 
 SUBDIR=	${SUBDIR_ORDERED} \
 	.WAIT \
 	libalias \
 	libarchive \
 	${_libatm} \
+	libauditd \
 	libbegemot \
 	libblocksruntime \
 	${_libbluetooth} \
 	${_libbsnmp} \
 	libbsdstat \
+	libbsm \
 	libbz2 \
 	libcalendar \
 	libcam \
+	${_libcapsicum} \
 	${_libcasper} \
+	${_libcom_err} \
 	libcompat \
+	libcrypt \
 	libdevinfo \
 	libdevstat \
 	libdwarf \
 	libedit \
-	${_libefi} \
 	libexecinfo \
 	libexpat \
 	libfetch \
@@ -91,26 +51,37 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libgpib} \
 	${_libgssapi} \
 	${_librpcsec_gss} \
+	${_libiconv_modules} \
 	libipsec \
 	libjail \
 	libkiconv \
+	libkvm \
+	${_libldns} \
 	liblzma \
 	libmagic \
 	libmandoc \
 	libmemstat \
+	libmd \
 	${_libmilter} \
 	${_libmp} \
 	${_libnandfs} \
 	libnetbsd \
+	${_libnetgraph} \
 	${_libngatm} \
+	libnv \
+	libohash \
 	libopie \
 	libpam \
 	libpcap \
+	libpjdlog \
 	${_libpmc} \
 	${_libproc} \
 	libprocstat \
+	libradius \
+	librpcsvc \
 	librt \
 	${_librtld_db} \
+	libsbuf \
 	${_libsdp} \
 	${_libsm} \
 	${_libsmb} \
@@ -119,6 +90,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libstand \
 	libstdbuf \
 	libstdthreads \
+	libtacplus \
 	${_libtelnet} \
 	${_libthr} \
 	libthread_db \
@@ -129,15 +101,51 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libunbound} \
 	${_libusbhid} \
 	${_libusb} \
+	libutil \
 	${_libvgl} \
 	${_libvmmapi} \
 	libwrap \
 	liby \
+	${_libypclnt} \
 	libz \
+	ncurses \
 	${_atf} \
 	${_clang} \
+	${_cuse} \
 	${_tests}
 
+# Inter-library dependencies.  When the makefile for a library contains LDADD
+# libraries, those libraries should be listed as build order dependencies here.
+
+SUBDIR_DEPEND_libarchive= libz libbz2 libexpat liblzma libmd
+SUBDIR_DEPEND_libatm= libmd
+SUBDIR_DEPEND_libauditdm= libbsm
+SUBDIR_DEPEND_libbsnmp= ${_libnetgraph}
+SUBDIR_DEPEND_libc++= libcxxrt
+SUBDIR_DEPEND_libc= libcompiler_rt
+SUBDIR_DEPEND_libcam= libsbuf
+SUBDIR_DEPEND_libcapsicum= libnv
+SUBDIR_DEPEND_libcasper= libcapsicum libnv libpjdlog
+SUBDIR_DEPEND_libdevstat= libkvm
+SUBDIR_DEPEND_libdiaglog= ncurses
+SUBDIR_DEPEND_libedit= ncurses
+SUBDIR_DEPEND_libg++= msun
+SUBDIR_DEPEND_libgeom= libexpat libsbuf
+SUBDIR_DEPEND_liblibrpcsec_gss= libgssapi
+SUBDIR_DEPEND_libmagic= libz
+SUBDIR_DEPEND_libmemstat= libkvm
+SUBDIR_DEPEND_libopie= libmd
+SUBDIR_DEPEND_libpam= libcrypt libopie libradius librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err} 
+SUBDIR_DEPEND_libpjdlog= libutil
+SUBDIR_DEPEND_libprocstat= libkvm libutil
+SUBDIR_DEPEND_libradius= libmd
+SUBDIR_DEPEND_libreadline= ncurses
+SUBDIR_DEPEND_libsmb= libkiconv
+SUBDIR_DEPEND_libstdc++= msun
+SUBDIR_DEPEND_libtacplus= libmd
+SUBDIR_DEPEND_libulog= libmd
+SUBDIR_DEPEND_libunbound= ${_libldns}
+
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
 _csu=csu/${MACHINE_ARCH}-elf
 .elif exists(${.CURDIR}/csu/${MACHINE_ARCH})
@@ -172,6 +180,10 @@ _libcasper=	libcasper
 _clang=		clang
 .endif
 
+.if ${MK_CUSE} != "no"
+_cuse=		libcuse
+.endif
+
 .if ${MK_GPIB} != "no"
 _libgpib=	libgpib
 .endif
@@ -185,6 +197,10 @@ _librpcsec_gss=	librpcsec_gss
 _libiconv_modules=	libiconv_modules
 .endif
 
+.if ${MK_KERBEROS_SUPPORT} != "no"
+_libcom_err= libcom_err
+.endif
+
 .if ${MK_LDNS} != "no"
 _libldns=	libldns
 .endif
@@ -221,11 +237,6 @@ _librtld_db=	librtld_db
 _libvmmapi=	libvmmapi
 .endif
 
-.if ${MACHINE_CPUARCH} == "ia64"
-_libefi=	libefi
-_libsmb=	libsmb
-.endif
-
 .if ${MACHINE_CPUARCH} == "mips"
 _libproc=	libproc
 _librtld_db=	librtld_db
diff --git a/lib/clang/include/IA64GenAsmWriter.inc b/lib/clang/include/IA64GenAsmWriter.inc
deleted file mode 100644
index dddc7938ed2a..000000000000
--- a/lib/clang/include/IA64GenAsmWriter.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "IA64GenAsmWriter.inc.h"
diff --git a/lib/clang/include/IA64GenDAGISel.inc b/lib/clang/include/IA64GenDAGISel.inc
deleted file mode 100644
index c6ae3dc2af0b..000000000000
--- a/lib/clang/include/IA64GenDAGISel.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "IA64GenDAGISel.inc.h"
diff --git a/lib/clang/include/IA64GenInstrInfo.inc b/lib/clang/include/IA64GenInstrInfo.inc
deleted file mode 100644
index 7fe83f68e8c1..000000000000
--- a/lib/clang/include/IA64GenInstrInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "IA64GenInstrInfo.inc.h"
diff --git a/lib/clang/include/IA64GenRegisterInfo.inc b/lib/clang/include/IA64GenRegisterInfo.inc
deleted file mode 100644
index 89405ed9e6fd..000000000000
--- a/lib/clang/include/IA64GenRegisterInfo.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD$ */
-#include "IA64GenRegisterInfo.inc.h"
diff --git a/lib/csu/i386-elf/Makefile b/lib/csu/i386-elf/Makefile
index de19e93d0890..8a685dcf9a09 100644
--- a/lib/csu/i386-elf/Makefile
+++ b/lib/csu/i386-elf/Makefile
@@ -26,7 +26,7 @@ gcrt1_c.o: gcrt1_c.s
 	${CC} ${ACFLAGS} -c -o ${.TARGET} gcrt1_c.s
 
 gcrt1.o: gcrt1_c.o crt1_s.o
-	${LD} ${LDFLAGS} -o gcrt1.o -r crt1_s.o gcrt1_c.o
+	${LD} ${_LDFLAGS} -o gcrt1.o -r crt1_s.o gcrt1_c.o
 
 crt1_c.s: crt1_c.c
 	${CC} ${CFLAGS} -S -o ${.TARGET} ${.CURDIR}/crt1_c.c
@@ -36,7 +36,7 @@ crt1_c.o: crt1_c.s
 	${CC} ${ACFLAGS} -c -o ${.TARGET} crt1_c.s
 
 crt1.o:	crt1_c.o crt1_s.o
-	${LD} ${LDFLAGS} -o crt1.o -r crt1_s.o crt1_c.o
+	${LD} ${_LDFLAGS} -o crt1.o -r crt1_s.o crt1_c.o
 	objcopy --localize-symbol _start1 crt1.o
 
 Scrt1_c.s: crt1_c.c
@@ -47,7 +47,7 @@ Scrt1_c.o: Scrt1_c.s
 	${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1_c.s
 
 Scrt1.o: Scrt1_c.o crt1_s.o
-	${LD} ${LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o
+	${LD} ${_LDFLAGS} -o Scrt1.o -r crt1_s.o Scrt1_c.o
 	objcopy --localize-symbol _start1 Scrt1.o
 
 .include <bsd.prog.mk>
diff --git a/lib/csu/ia64/Makefile b/lib/csu/ia64/Makefile
deleted file mode 100644
index b12e88822d17..000000000000
--- a/lib/csu/ia64/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../common
-
-SRCS=		crti.S crtn.S
-OBJS=		${SRCS:N*.h:R:S/$/.o/g}
-OBJS+=		crt1.o gcrt1.o Scrt1.o
-
-all: ${OBJS}
-
-CLEANFILES=	${OBJS}
-CLEANFILES+=	crt1_.o gcrt1_.o Scrt1_.o
-CLEANFILES+=	crtbrand.o gcrtbrand.o Scrtbrand.o
-CLEANFILES+=	crtbrand.s gcrtbrand.s Scrtbrand.s
-
-crt1_.o: crt1.S
-	${CC} ${CFLAGS} -c -o ${.TARGET} ${.ALLSRC}
-
-# See the comment in lib/csu/common/crtbrand.c for the reason crtbrand.c is not
-# directly compiled to .o files.
-
-crtbrand.s: crtbrand.c
-	${CC} ${CFLAGS} -S -o ${.TARGET} ${.ALLSRC}
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
-
-crtbrand.o: crtbrand.s
-	${CC} ${ACFLAGS} -c -o ${.TARGET} crtbrand.s
-
-crt1.o: crt1_.o crtbrand.o
-	${LD} ${LDFLAGS} -r -o ${.TARGET} crt1_.o crtbrand.o
-
-gcrt1_.o: crt1.S
-	${CC} ${CFLAGS} -DGCRT -c -o ${.TARGET} ${.ALLSRC}
-
-gcrtbrand.s: crtbrand.c
-	${CC} ${CFLAGS} -DGCRT -S -o ${.TARGET} ${.ALLSRC}
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
-
-gcrtbrand.o: gcrtbrand.s
-	${CC} ${ACFLAGS} -c -o ${.TARGET} gcrtbrand.s
-
-gcrt1.o: gcrt1_.o gcrtbrand.o
-	${LD} ${LDFLAGS} -r -o ${.TARGET} ${.ALLSRC}
-
-Scrt1_.o: crt1.S
-	${CC} ${CFLAGS} -fPIC -DPIC -c -o ${.TARGET} ${.ALLSRC}
-
-Scrtbrand.s: crtbrand.c
-	${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.ALLSRC}
-	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
-
-Scrtbrand.o: Scrtbrand.s
-	${CC} ${ACFLAGS} -c -o ${.TARGET} Scrtbrand.s
-
-Scrt1.o: Scrt1_.o Scrtbrand.o
-	${LD} ${LDFLAGS} -r -o ${.TARGET} ${.ALLSRC}
-
-realinstall:
-	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-	    ${OBJS} ${DESTDIR}${LIBDIR}
-
-.include <bsd.lib.mk>
diff --git a/lib/csu/ia64/crt1.S b/lib/csu/ia64/crt1.S
deleted file mode 100644
index 6ff9cd9171ae..000000000000
--- a/lib/csu/ia64/crt1.S
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2003 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-		.text
-
-/*
- * void _start(char **ap, struct ps_strings *, void (*cleanup)(void));
- */
-#define	AP		in0
-#define	CLEANUP		in2
-
-#define	GP		loc0
-#define	ARGC		loc1
-#define	ARGV		loc2
-#define	ENVP		loc3
-
-		.global		_start
-		.type		_start, @function
-		.proc		_start
-_start:
-		.prologue
-		.save		rp, r0
-		.body
-{		.mlx
-		alloc		r14=ar.pfs,3,4,3,0
-		movl		r15=@gprel(1f)
-}
-1:
-{		.mmi
-		ld4		ARGC=[AP]
-		adds		ARGV=8,AP
-		mov		r16=ip
-		;;
-}
-{		.mmi
-		sub		gp=r16,r15
-		sub		GP=r16,r15
-		shladd		r14=ARGC,3,AP
-		;;
-}
-{		.mii
-		addl		r15=@ltoff(environ),gp
-		cmp4.ge		p6,p7=0,ARGC
-		adds		ENVP=16,r14
-		;;
-}
-{		.mmi
-		ld8		r14=[r15]
-(p7)		ld8		r15=[ARGV]
-		addl		r16=@gprel(__progname),gp
-		;;
-}
-{		.mib
-		st8		[r14]=ENVP
-(p7)		cmp.eq		p6,p0=0,r15
-(p6)		br.dpnt		.L1
-		;;
-}
-		/* Normalize __progname. */
-{		.mmi
-		st8		[r16]=r15
-		ld1		r14=[r15],1
-		nop		0
-		;;
-}
-.L0:
-{		.mib
-		cmp4.eq		p7,p0=0,r14
-		cmp4.eq		p6,p0=0x2f,r14
-(p7)		br.dptk		.L1
-		;;
-}
-{		.mmb
-(p6)		st8		[r16]=r15
-		ld1		r14=[r15],1
-		br.dptk.many	.L0
-}
-.L1:
-{		.mib
-		cmp.ne		p7,p0=0,CLEANUP
-		mov		out0=CLEANUP
-(p7)		br.call.sptk	b0=atexit
-		;;
-}
-{		.mfb
-		mov		gp=GP
-		nop		0
-		br.call.sptk	b0=_init_tls
-}
-#ifdef GCRT
-{		.mmi
-		mov		gp=GP
-		;;
-		addl		r14=@ltoff(@fptr(_mcleanup)),gp
-		nop		0
-		;;
-}
-{		.mfb
-		ld8		out0=[r14]
-		nop		0
-		br.call.sptk	b0=atexit
-		;;
-}
-#endif
-{		.mmi
-		mov		gp=GP
-		;;
-		addl		r14=@ltoff(@fptr(_fini)),gp
-		nop		0
-		;;
-}
-{		.mfb
-		ld8		out0=[r14]
-		nop		0
-		br.call.sptk	b0=atexit
-		;;
-}
-#ifdef GCRT
-{		.mmi
-		mov		gp=GP
-		;;
-		addl		r14=@ltoff(eprol),gp
-		addl		r15=@ltoff(etext),gp
-		;;
-}
-{		.mmb
-		ld8		out0=[r14]
-		ld8		out1=[r15]
-		br.call.sptk	b0=monstartup
-		;;
-}
-#endif
-{		.mfb
-		mov		gp=GP
-		nop		0
-		br.call.sptk	b0=_init
-		;;
-}
-{		.mmi
-		mov		gp=GP
-		mov		out0=ARGC
-		mov		out1=ARGV
-}
-{		.mfb
-		mov		out2=ENVP
-		nop		0
-		br.call.sptk	b0=main
-		;;
-}
-{		.mib
-		mov		gp=GP
-		mov		out0=r8
-		br.call.sptk	b0=exit
-		;;
-}
-		.endp		_start
-
-#ifdef GCRT
-eprol:
-#endif
-
-		.rodata
-.empty:		stringz		""
-
-		.sdata
-		.global		__progname
-		.size		__progname,8
-		.type		__progname,@object
-__progname:	data8		.empty
-
-		.common		environ,8,8
diff --git a/lib/csu/ia64/crti.S b/lib/csu/ia64/crti.S
deleted file mode 100644
index 66ef94849924..000000000000
--- a/lib/csu/ia64/crti.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 2001 Peter Wemm <peter@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 <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * This file (and its companion crtn.S) form the terminators of the
- * .init and .fini sections.
- */
-	.file	"crti.S"
-
-	.section .init,"ax",@progbits
-	.global	_init#
-	.proc	_init#
-_init:
-	.regstk	0,2,0,0
-	.prologue 12,loc0
-	.save	ar.pfs,loc1
-	alloc	loc1=ar.pfs,0,2,0,0
-	mov	loc0=b0			/* Save return addr */
-	.body
-	.endp	_init#
-
-	.section .fini,"ax",@progbits
-	.global	_fini#
-	.proc	_fini#
-_fini:
-	.regstk	0,2,0,0
-	.prologue 12,loc0
-	.save	ar.pfs,loc1
-	alloc	loc1=ar.pfs,0,2,0,0
-	mov	loc0=b0			/* Save return addr */
-	.body
-	.endp	_fini#
diff --git a/lib/csu/ia64/crtn.S b/lib/csu/ia64/crtn.S
deleted file mode 100644
index 681fba38c9b2..000000000000
--- a/lib/csu/ia64/crtn.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 2001 Peter Wemm <peter@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 <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-	.file	"crtn.S"
-
-	.section .init,"ax",@progbits
-	.regstk 0,2,0,0
-	mov	b0=loc0			/* Recover return addr */
-	mov	ar.pfs=loc1
-	br.ret.sptk.many b0
-
-	.section .fini,"ax",@progbits
-	.regstk 0,2,0,0
-	mov	b0=loc0			/* Recover return addr */
-	mov	ar.pfs=loc1
-	br.ret.sptk.many b0
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index bbe03a0bf126..146032991169 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -41,7 +41,7 @@ SHARED_CFLAGS+=	-DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
 .endif
 
 .if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mmips*} != "" || \
-	${MACHINE_ARCH:Msparc64*} != "" || ${MACHINE_ARCH:Mia64*} != ""
+	${MACHINE_ARCH:Msparc64*} != ""
 NO_WCAST_ALIGN=	yes
 .if ${MACHINE_ARCH:M*64*} == ""
 CFLAGS+=	-DPPMD_32BIT
diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h
index bcbad161446d..0df3f917e92d 100644
--- a/lib/libarchive/config_freebsd.h
+++ b/lib/libarchive/config_freebsd.h
@@ -228,15 +228,15 @@
 
 /* FreeBSD defines for archive_hash.h */
 #ifdef WITH_OPENSSL
-#define ARCHIVE_HASH_MD5_OPENSSL 1
-#define ARCHIVE_HASH_RMD160_OPENSSL 1
-#define ARCHIVE_HASH_SHA1_OPENSSL
-#define ARCHIVE_HASH_SHA256_OPENSSL 1
-#define ARCHIVE_HASH_SHA384_OPENSSL 1
-#define ARCHIVE_HASH_SHA512_OPENSSL 1
+#define ARCHIVE_CRYPTO_MD5_OPENSSL 1
+#define ARCHIVE_CRYPTO_RMD160_OPENSSL 1
+#define ARCHIVE_CRYPTO_SHA1_OPENSSL
+#define ARCHIVE_CRYPTO_SHA256_OPENSSL 1
+#define ARCHIVE_CRYPTO_SHA384_OPENSSL 1
+#define ARCHIVE_CRYPTO_SHA512_OPENSSL 1
 #else
-#define ARCHIVE_HASH_MD5_LIBMD 1
-#define ARCHIVE_HASH_SHA1_LIBMD 1
-#define ARCHIVE_HASH_SHA256_LIBMD 1
-#define ARCHIVE_HASH_SHA512_LIBMD 1
+#define ARCHIVE_CRYPTO_MD5_LIBMD 1
+#define ARCHIVE_CRYPTO_SHA1_LIBMD 1
+#define ARCHIVE_CRYPTO_SHA256_LIBMD 1
+#define ARCHIVE_CRYPTO_SHA512_LIBMD 1
 #endif
diff --git a/lib/libbluetooth/bluetooth.3 b/lib/libbluetooth/bluetooth.3
index e011094a18c8..482c73285936 100644
--- a/lib/libbluetooth/bluetooth.3
+++ b/lib/libbluetooth/bluetooth.3
@@ -720,7 +720,7 @@ The function guarantees that the socket,
 passed to the callback function,
 will be bound and connected to the Bluetooth device being enumerated.
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Some of those functions use static data storage;
 if the data is needed for future use, it should be
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 6b84f23c03b0..065642598aec 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -75,12 +75,12 @@ NOASM=
 .include "${LIBC_SRCTOP}/inet/Makefile.inc"
 .include "${LIBC_SRCTOP}/isc/Makefile.inc"
 .include "${LIBC_SRCTOP}/locale/Makefile.inc"
+.include "${LIBC_SRCTOP}/md/Makefile.inc"
 .include "${LIBC_SRCTOP}/nameser/Makefile.inc"
 .include "${LIBC_SRCTOP}/net/Makefile.inc"
 .include "${LIBC_SRCTOP}/nls/Makefile.inc"
 .include "${LIBC_SRCTOP}/posix1e/Makefile.inc"
 .if ${LIBC_ARCH} != "amd64" && \
-    ${LIBC_ARCH} != "ia64" && \
     ${LIBC_ARCH} != "powerpc64" && \
     ${LIBC_ARCH} != "sparc64" && \
     ${MACHINE_ARCH:Mmipsn32*} == "" && \
diff --git a/lib/libc/arm/Symbol.map b/lib/libc/arm/Symbol.map
index a58d443eb3b7..cf65492c3050 100644
--- a/lib/libc/arm/Symbol.map
+++ b/lib/libc/arm/Symbol.map
@@ -37,6 +37,11 @@ FBSD_1.3 {
 	__flt_rounds;
 };
 
+FBSD_1.4 {
+	__gnu_Unwind_Find_exidx;
+	dl_unwind_find_exidx;
+};
+
 FBSDprivate_1.0 {
 	/* PSEUDO syscalls */
 	__sys_getlogin;
diff --git a/lib/libc/arm/aeabi/Makefile.inc b/lib/libc/arm/aeabi/Makefile.inc
index 8f9e19ec2df9..0957c922e2d1 100644
--- a/lib/libc/arm/aeabi/Makefile.inc
+++ b/lib/libc/arm/aeabi/Makefile.inc
@@ -3,7 +3,8 @@
 .PATH: ${LIBC_SRCTOP}/arm/aeabi
 
 SRCS+=	aeabi_atexit.c		\
-	aeabi_unwind_cpp.c
+	aeabi_unwind_cpp.c	\
+	aeabi_unwind_exidx.c
 .if ${MACHINE_ARCH} != "armv6hf"
 SRCS+=	aeabi_double.c		\
 	aeabi_float.c
diff --git a/lib/libc/arm/aeabi/aeabi_unwind_exidx.c b/lib/libc/arm/aeabi/aeabi_unwind_exidx.c
new file mode 100644
index 000000000000..d5af8b3fc6e0
--- /dev/null
+++ b/lib/libc/arm/aeabi/aeabi_unwind_exidx.c
@@ -0,0 +1,104 @@
+/*-
+ * Copyright (c) 2014 Ian Lepore <ian@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <machine/elf.h>
+#include <link.h>
+#include <stddef.h>
+
+/*
+ * ARM EABI unwind helper.
+ *
+ * This finds the exidx section address and size associated with a given code
+ * address.  There are separate implementations for static and dynamic code.
+ *
+ * GCC expects this function to exist as __gnu_Unwind_Find_exidx(), clang and
+ * BSD tools expect it to be dl_unwind_find_exidx().  Both have the same API, so
+ * we set up an alias for GCC.
+ */
+__strong_reference(dl_unwind_find_exidx, __gnu_Unwind_Find_exidx);
+
+/*
+ * Each entry in the exidx section is a pair of 32-bit words.  We don't
+ * interpret the contents of the entries here; this typedef is just a local
+ * convenience for using sizeof() and doing pointer math.
+ */
+typedef struct exidx_entry {
+	uint32_t data[2];
+} exidx_entry;
+
+#ifdef __PIC__
+
+/*
+ * Unwind helper for dynamically linked code.
+ *
+ * This finds the shared object that contains the given address, and returns the
+ * address of the exidx section in that shared object along with the number of
+ * entries in that section, or NULL if it wasn't found.
+ */
+void *
+dl_unwind_find_exidx(const void *pc, int *pcount)
+{
+	const Elf_Phdr *hdr;
+	struct dl_phdr_info info;
+	int i;
+
+	if (_rtld_addr_phdr(pc, &info)) {
+		hdr = info.dlpi_phdr;
+		for (i = 0; i < info.dlpi_phnum; i++, hdr++) {
+			if (hdr->p_type == PT_ARM_EXIDX) {
+				*pcount = hdr->p_memsz / sizeof(exidx_entry);
+				return ((void *)(info.dlpi_addr + hdr->p_vaddr));
+			}
+		}
+	}
+	return (NULL);
+}
+
+#else	/* !__PIC__ */
+
+/*
+ * Unwind helper for statically linked code.
+ *
+ * In a statically linked program, the linker populates a pair of symbols with
+ * the addresses of the start and end of the exidx table, so returning the
+ * address and count of elements is pretty straighforward.
+ */
+void *
+dl_unwind_find_exidx(const void *pc, int *pcount)
+{
+	extern struct exidx_entry __exidx_start;
+	extern struct exidx_entry __exidx_end;
+
+	*pcount = (int)(&__exidx_end - &__exidx_start);
+	return (&__exidx_start);
+}
+
+#endif	/* __PIC__ */
+
diff --git a/lib/libc/capability/cap_rights_init.3 b/lib/libc/capability/cap_rights_init.3
index 464184eaea60..5615de1a6804 100644
--- a/lib/libc/capability/cap_rights_init.3
+++ b/lib/libc/capability/cap_rights_init.3
@@ -237,5 +237,5 @@ Support for capabilities and capabilities mode was developed as part of the
 Project.
 .Sh AUTHORS
 This family of functions was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c
index 59e410bc4386..59c4f7fd1dc7 100644
--- a/lib/libc/gen/arc4random.c
+++ b/lib/libc/gen/arc4random.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arc4random.c,v 1.22 2010/12/22 08:23:42 otto Exp $	*/
+/*	$OpenBSD: arc4random.c,v 1.24 2013/06/11 16:59:50 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996, David Mazieres <dm@uun.org>
@@ -182,8 +182,7 @@ arc4_stir_if_needed(void)
 {
 	pid_t pid = getpid();
 
-	if (arc4_count <= 0 || !rs_initialized || arc4_stir_pid != pid)
-	{
+	if (arc4_count <= 0 || !rs_initialized || arc4_stir_pid != pid) {
 		arc4_stir_pid = pid;
 		arc4_stir();
 	}
@@ -276,18 +275,8 @@ arc4random_uniform(u_int32_t upper_bound)
 	if (upper_bound < 2)
 		return 0;
 
-#if (ULONG_MAX > 0xffffffffUL)
-	min = 0x100000000UL % upper_bound;
-#else
-	/* Calculate (2**32 % upper_bound) avoiding 64-bit math */
-	if (upper_bound > 0x80000000)
-		min = 1 + ~upper_bound;		/* 2**32 - upper_bound */
-	else {
-		/* (2**32 - (x * 2)) % x == 2**32 % x when x <= 2**31 */
-		min = ((0xffffffff - (upper_bound * 2)) + 1) % upper_bound;
-	}
-#endif
-
+	/* 2**32 % x == (2**32 - x) % x */
+	min = -upper_bound % upper_bound;
 	/*
 	 * This could theoretically loop forever but each retry has
 	 * p > 0.5 (worst case, usually far better) of selecting a
diff --git a/lib/libc/gen/cap_rights_get.3 b/lib/libc/gen/cap_rights_get.3
index bc6fb248ec23..f74d1f7aeda5 100644
--- a/lib/libc/gen/cap_rights_get.3
+++ b/lib/libc/gen/cap_rights_get.3
@@ -115,5 +115,5 @@ Support for capabilities and capabilities mode was developed as part of the
 Project.
 .Sh AUTHORS
 This function was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc/gen/cap_sandboxed.3 b/lib/libc/gen/cap_sandboxed.3
index 7019bfb9a3f2..5882ff002789 100644
--- a/lib/libc/gen/cap_sandboxed.3
+++ b/lib/libc/gen/cap_sandboxed.3
@@ -67,5 +67,5 @@ or
 .Xr capsicum 4
 .Sh AUTHORS
 This function was implemented and manual page was written by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc/gen/check_utility_compat.3 b/lib/libc/gen/check_utility_compat.3
index 57638e50ead0..89449a4064bb 100644
--- a/lib/libc/gen/check_utility_compat.3
+++ b/lib/libc/gen/check_utility_compat.3
@@ -86,4 +86,4 @@ function first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Garrett Wollman Aq wollman@FreeBSD.org .
+.An Garrett Wollman Aq Mt wollman@FreeBSD.org .
diff --git a/lib/libc/gen/clock_getcpuclockid.3 b/lib/libc/gen/clock_getcpuclockid.3
index 3d31993ccc2c..ebaa3dc0cc43 100644
--- a/lib/libc/gen/clock_getcpuclockid.3
+++ b/lib/libc/gen/clock_getcpuclockid.3
@@ -92,4 +92,4 @@ The
 function first appeared in
 .Fx 10.0 .
 .Sh AUTHORS
-.An David Xu Aq davidxu@FreeBSD.org
+.An David Xu Aq Mt davidxu@FreeBSD.org
diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/directory.3
index 4573d4513fe2..1e864f8dcbc5 100644
--- a/lib/libc/gen/directory.3
+++ b/lib/libc/gen/directory.3
@@ -28,7 +28,7 @@
 .\"     @(#)directory.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd August 18, 2013
+.Dd July 28, 2014
 .Dt DIRECTORY 3
 .Os
 .Sh NAME
@@ -169,6 +169,10 @@ If the directory is closed and then
 reopened, prior values returned by
 .Fn telldir
 will no longer be valid.
+Values returned by
+.Fn telldir
+are also invalidated by a call to
+.Fn rewinddir .
 .Pp
 The
 .Fn seekdir
@@ -182,13 +186,6 @@ The new position reverts to the one associated with the
 when the
 .Fn telldir
 operation was performed.
-State associated with the token returned by
-.Fn telldir is freed when it is passed to
-.Fn seekdir .
-If you wish return to the same location again,
-then you must create a new token with another
-.Fn telldir
-call.
 .Pp
 The
 .Fn rewinddir
diff --git a/lib/libc/gen/dlinfo.3 b/lib/libc/gen/dlinfo.3
index d00f07467af5..3fc568e0fcc6 100644
--- a/lib/libc/gen/dlinfo.3
+++ b/lib/libc/gen/dlinfo.3
@@ -271,12 +271,9 @@ The
 implementation of the
 .Fn dlinfo
 function was originally written by
-.An Alexey Zelkin
-.Aq phantom@FreeBSD.org
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org
 and later extended and improved by
-.An Alexander Kabaev
-.Aq kan@FreeBSD.org .
+.An Alexander Kabaev Aq Mt kan@FreeBSD.org .
 .Pp
 The manual page for this function was written by
-.An Alexey Zelkin
-.Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/lib/libc/gen/ftok.3 b/lib/libc/gen/ftok.3
index 996b2da41c7b..98f8bad878f8 100644
--- a/lib/libc/gen/ftok.3
+++ b/lib/libc/gen/ftok.3
@@ -73,7 +73,7 @@ The
 function originates with System V and is typically used by programs
 that use the System V IPC routines.
 .Sh AUTHORS
-.An Thorsten Lockert Aq tholo@sigmasoft.com
+.An Thorsten Lockert Aq Mt tholo@sigmasoft.com
 .Sh BUGS
 The returned key is computed based on the device minor number and inode of the
 specified
diff --git a/lib/libc/gen/gen-private.h b/lib/libc/gen/gen-private.h
index e8854ad2d856..d1fab5f31462 100644
--- a/lib/libc/gen/gen-private.h
+++ b/lib/libc/gen/gen-private.h
@@ -48,7 +48,6 @@ struct _dirdesc {
 	char	*dd_buf;	/* data buffer */
 	int	dd_len;		/* size of data buffer */
 	long	dd_seek;	/* magic cookie returned by getdirentries */
-	long	dd_rewind;	/* magic cookie for rewinding */
 	int	dd_flags;	/* flags for readdir */
 	struct pthread_mutex	*dd_lock;	/* lock */
 	struct _telldir *dd_td;	/* telldir position recording */
diff --git a/lib/libc/gen/getpagesizes.3 b/lib/libc/gen/getpagesizes.3
index 854e2f7858fe..52fa866821f2 100644
--- a/lib/libc/gen/getpagesizes.3
+++ b/lib/libc/gen/getpagesizes.3
@@ -96,4 +96,4 @@ implementation that was first released in
 .Fx 7.3 .
 .Sh AUTHORS
 This manual page was written by
-.An Alan L. Cox Aq alc@cs.rice.edu .
+.An Alan L. Cox Aq Mt alc@cs.rice.edu .
diff --git a/lib/libc/gen/getutxent.3 b/lib/libc/gen/getutxent.3
index 2ea09712d8d4..120f4a08b8e1 100644
--- a/lib/libc/gen/getutxent.3
+++ b/lib/libc/gen/getutxent.3
@@ -475,4 +475,4 @@ They replaced the
 .In utmp.h
 interface.
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
index a9eb0af1ba4b..54928e73d60c 100644
--- a/lib/libc/gen/opendir.c
+++ b/lib/libc/gen/opendir.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 #include "gen-private.h"
 #include "telldir.h"
 
-static DIR * __opendir_common(int, int);
+static DIR * __opendir_common(int, int, bool);
 
 /*
  * Open a directory.
@@ -67,18 +67,10 @@ opendir(const char *name)
 DIR *
 fdopendir(int fd)
 {
-	struct stat statb;
 
-	/* Check that fd is associated with a directory. */
-	if (_fstat(fd, &statb) != 0)
-		return (NULL);
-	if (!S_ISDIR(statb.st_mode)) {
-		errno = ENOTDIR;
-		return (NULL);
-	}
 	if (_fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
 		return (NULL);
-	return (__opendir_common(fd, DTF_HIDEW|DTF_NODUP));
+	return (__opendir_common(fd, DTF_HIDEW|DTF_NODUP, true));
 }
 
 DIR *
@@ -88,11 +80,13 @@ __opendir2(const char *name, int flags)
 	DIR *dir;
 	int saved_errno;
 
+	if ((flags & (__DTF_READALL | __DTF_SKIPREAD)) != 0)
+		return (NULL);
 	if ((fd = _open(name,
 	    O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC)) == -1)
 		return (NULL);
 
-	dir = __opendir_common(fd, flags);
+	dir = __opendir_common(fd, flags, false);
 	if (dir == NULL) {
 		saved_errno = errno;
 		_close(fd);
@@ -109,23 +103,196 @@ opendir_compar(const void *p1, const void *p2)
 	    (*(const struct dirent **)p2)->d_name));
 }
 
+/*
+ * For a directory at the top of a unionfs stack, the entire directory's
+ * contents are read and cached locally until the next call to rewinddir().
+ * For the fdopendir() case, the initial seek position must be preserved.
+ * For rewinddir(), the full directory should always be re-read from the
+ * beginning.
+ *
+ * If an error occurs, the existing buffer and state of 'dirp' is left
+ * unchanged.
+ */
+bool
+_filldir(DIR *dirp, bool use_current_pos)
+{
+	struct dirent **dpv;
+	char *buf, *ddptr, *ddeptr;
+	off_t pos;
+	int fd2, incr, len, n, saved_errno, space;
+	
+	len = 0;
+	space = 0;
+	buf = NULL;
+	ddptr = NULL;
+
+	/*
+	 * Use the system page size if that is a multiple of DIRBLKSIZ.
+	 * Hopefully this can be a big win someday by allowing page
+	 * trades to user space to be done by _getdirentries().
+	 */
+	incr = getpagesize();
+	if ((incr % DIRBLKSIZ) != 0) 
+		incr = DIRBLKSIZ;
+
+	/*
+	 * The strategy here is to read all the directory
+	 * entries into a buffer, sort the buffer, and
+	 * remove duplicate entries by setting the inode
+	 * number to zero.
+	 *
+	 * We reopen the directory because _getdirentries()
+	 * on a MNT_UNION mount modifies the open directory,
+	 * making it refer to the lower directory after the
+	 * upper directory's entries are exhausted.
+	 * This would otherwise break software that uses
+	 * the directory descriptor for fchdir or *at
+	 * functions, such as fts.c.
+	 */
+	if ((fd2 = _openat(dirp->dd_fd, ".", O_RDONLY | O_CLOEXEC)) == -1)
+		return (false);
+
+	if (use_current_pos) {
+		pos = lseek(dirp->dd_fd, 0, SEEK_CUR);
+		if (pos == -1 || lseek(fd2, pos, SEEK_SET) == -1) {
+			saved_errno = errno;
+			_close(fd2);
+			errno = saved_errno;
+			return (false);
+		}
+	}
+
+	do {
+		/*
+		 * Always make at least DIRBLKSIZ bytes
+		 * available to _getdirentries
+		 */
+		if (space < DIRBLKSIZ) {
+			space += incr;
+			len += incr;
+			buf = reallocf(buf, len);
+			if (buf == NULL) {
+				saved_errno = errno;
+				_close(fd2);
+				errno = saved_errno;
+				return (false);
+			}
+			ddptr = buf + (len - space);
+		}
+
+		n = _getdirentries(fd2, ddptr, space, &dirp->dd_seek);
+		if (n > 0) {
+			ddptr += n;
+			space -= n;
+		}
+		if (n < 0) {
+			saved_errno = errno;
+			_close(fd2);
+			errno = saved_errno;
+			return (false);
+		}
+	} while (n > 0);
+	_close(fd2);
+
+	ddeptr = ddptr;
+
+	/*
+	 * There is now a buffer full of (possibly) duplicate
+	 * names.
+	 */
+	dirp->dd_buf = buf;
+
+	/*
+	 * Go round this loop twice...
+	 *
+	 * Scan through the buffer, counting entries.
+	 * On the second pass, save pointers to each one.
+	 * Then sort the pointers and remove duplicate names.
+	 */
+	for (dpv = 0;;) {
+		n = 0;
+		ddptr = buf;
+		while (ddptr < ddeptr) {
+			struct dirent *dp;
+
+			dp = (struct dirent *) ddptr;
+			if ((long)dp & 03L)
+				break;
+			if ((dp->d_reclen <= 0) ||
+			    (dp->d_reclen > (ddeptr + 1 - ddptr)))
+				break;
+			ddptr += dp->d_reclen;
+			if (dp->d_fileno) {
+				if (dpv)
+					dpv[n] = dp;
+				n++;
+			}
+		}
+
+		if (dpv) {
+			struct dirent *xp;
+
+			/*
+			 * This sort must be stable.
+			 */
+			mergesort(dpv, n, sizeof(*dpv), opendir_compar);
+
+			dpv[n] = NULL;
+			xp = NULL;
+
+			/*
+			 * Scan through the buffer in sort order,
+			 * zapping the inode number of any
+			 * duplicate names.
+			 */
+			for (n = 0; dpv[n]; n++) {
+				struct dirent *dp = dpv[n];
+
+				if ((xp == NULL) ||
+				    strcmp(dp->d_name, xp->d_name)) {
+					xp = dp;
+				} else {
+					dp->d_fileno = 0;
+				}
+				if (dp->d_type == DT_WHT &&
+				    (dirp->dd_flags & DTF_HIDEW))
+					dp->d_fileno = 0;
+			}
+
+			free(dpv);
+			break;
+		} else {
+			dpv = malloc((n+1) * sizeof(struct dirent *));
+			if (dpv == NULL)
+				break;
+		}
+	}
+
+	dirp->dd_len = len;
+	dirp->dd_size = ddptr - dirp->dd_buf;
+	return (true);
+}
+
+
 /*
  * Common routine for opendir(3), __opendir2(3) and fdopendir(3).
  */
 static DIR *
-__opendir_common(int fd, int flags)
+__opendir_common(int fd, int flags, bool use_current_pos)
 {
 	DIR *dirp;
 	int incr;
 	int saved_errno;
 	int unionstack;
-	int fd2;
-
-	fd2 = -1;
 
 	if ((dirp = malloc(sizeof(DIR) + sizeof(struct _telldir))) == NULL)
 		return (NULL);
 
+	dirp->dd_buf = NULL;
+	dirp->dd_fd = fd;
+	dirp->dd_flags = flags;
+	dirp->dd_loc = 0;
+	dirp->dd_lock = NULL;
 	dirp->dd_td = (struct _telldir *)((char *)dirp + sizeof(DIR));
 	LIST_INIT(&dirp->dd_td->td_locq);
 	dirp->dd_td->td_loccnt = 0;
@@ -154,163 +321,39 @@ __opendir_common(int fd, int flags)
 	}
 
 	if (unionstack) {
-		int len = 0;
-		int space = 0;
-		char *buf = 0;
-		char *ddptr = 0;
-		char *ddeptr;
-		int n;
-		struct dirent **dpv;
-
-		/*
-		 * The strategy here is to read all the directory
-		 * entries into a buffer, sort the buffer, and
-		 * remove duplicate entries by setting the inode
-		 * number to zero.
-		 *
-		 * We reopen the directory because _getdirentries()
-		 * on a MNT_UNION mount modifies the open directory,
-		 * making it refer to the lower directory after the
-		 * upper directory's entries are exhausted.
-		 * This would otherwise break software that uses
-		 * the directory descriptor for fchdir or *at
-		 * functions, such as fts.c.
-		 */
-		if ((fd2 = _openat(fd, ".", O_RDONLY | O_CLOEXEC)) == -1) {
-			saved_errno = errno;
-			free(buf);
-			free(dirp);
-			errno = saved_errno;
-			return (NULL);
-		}
-
-		do {
-			/*
-			 * Always make at least DIRBLKSIZ bytes
-			 * available to _getdirentries
-			 */
-			if (space < DIRBLKSIZ) {
-				space += incr;
-				len += incr;
-				buf = reallocf(buf, len);
-				if (buf == NULL)
-					goto fail;
-				ddptr = buf + (len - space);
-			}
-
-			n = _getdirentries(fd2, ddptr, space, &dirp->dd_seek);
-			if (n > 0) {
-				ddptr += n;
-				space -= n;
-			}
-		} while (n > 0);
-
-		ddeptr = ddptr;
-		flags |= __DTF_READALL;
-
-		_close(fd2);
-		fd2 = -1;
-
-		/*
-		 * There is now a buffer full of (possibly) duplicate
-		 * names.
-		 */
-		dirp->dd_buf = buf;
-
-		/*
-		 * Go round this loop twice...
-		 *
-		 * Scan through the buffer, counting entries.
-		 * On the second pass, save pointers to each one.
-		 * Then sort the pointers and remove duplicate names.
-		 */
-		for (dpv = 0;;) {
-			n = 0;
-			ddptr = buf;
-			while (ddptr < ddeptr) {
-				struct dirent *dp;
-
-				dp = (struct dirent *) ddptr;
-				if ((long)dp & 03L)
-					break;
-				if ((dp->d_reclen <= 0) ||
-				    (dp->d_reclen > (ddeptr + 1 - ddptr)))
-					break;
-				ddptr += dp->d_reclen;
-				if (dp->d_fileno) {
-					if (dpv)
-						dpv[n] = dp;
-					n++;
-				}
-			}
-
-			if (dpv) {
-				struct dirent *xp;
-
-				/*
-				 * This sort must be stable.
-				 */
-				mergesort(dpv, n, sizeof(*dpv),
-				    opendir_compar);
-
-				dpv[n] = NULL;
-				xp = NULL;
-
-				/*
-				 * Scan through the buffer in sort order,
-				 * zapping the inode number of any
-				 * duplicate names.
-				 */
-				for (n = 0; dpv[n]; n++) {
-					struct dirent *dp = dpv[n];
-
-					if ((xp == NULL) ||
-					    strcmp(dp->d_name, xp->d_name)) {
-						xp = dp;
-					} else {
-						dp->d_fileno = 0;
-					}
-					if (dp->d_type == DT_WHT &&
-					    (flags & DTF_HIDEW))
-						dp->d_fileno = 0;
-				}
-
-				free(dpv);
-				break;
-			} else {
-				dpv = malloc((n+1) * sizeof(struct dirent *));
-				if (dpv == NULL)
-					break;
-			}
-		}
-
-		dirp->dd_len = len;
-		dirp->dd_size = ddptr - dirp->dd_buf;
+		if (!_filldir(dirp, use_current_pos))
+			goto fail;
+		dirp->dd_flags |= __DTF_READALL;
 	} else {
 		dirp->dd_len = incr;
-		dirp->dd_size = 0;
 		dirp->dd_buf = malloc(dirp->dd_len);
 		if (dirp->dd_buf == NULL)
 			goto fail;
-		dirp->dd_seek = 0;
+		if (use_current_pos) {
+			/*
+			 * Read the first batch of directory entries
+			 * to prime dd_seek.  This also checks if the
+			 * fd passed to fdopendir() is a directory.
+			 */
+			dirp->dd_size = _getdirentries(dirp->dd_fd,
+			    dirp->dd_buf, dirp->dd_len, &dirp->dd_seek);
+			if (dirp->dd_size < 0) {
+				if (errno == EINVAL)
+					errno = ENOTDIR;
+				goto fail;
+			}
+			dirp->dd_flags |= __DTF_SKIPREAD;
+		} else {
+			dirp->dd_size = 0;
+			dirp->dd_seek = 0;
+		}
 	}
 
-	dirp->dd_loc = 0;
-	dirp->dd_fd = fd;
-	dirp->dd_flags = flags;
-	dirp->dd_lock = NULL;
-
-	/*
-	 * Set up seek point for rewinddir.
-	 */
-	dirp->dd_rewind = telldir(dirp);
-
 	return (dirp);
 
 fail:
 	saved_errno = errno;
-	if (fd2 != -1)
-		_close(fd2);
+	free(dirp->dd_buf);
 	free(dirp);
 	errno = saved_errno;
 	return (NULL);
diff --git a/lib/libc/gen/posix_spawn.3 b/lib/libc/gen/posix_spawn.3
index 73359b44b168..dd5bd2b5ed88 100644
--- a/lib/libc/gen/posix_spawn.3
+++ b/lib/libc/gen/posix_spawn.3
@@ -457,4 +457,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawn_file_actions_addopen.3 b/lib/libc/gen/posix_spawn_file_actions_addopen.3
index 9cd47efb02da..b28f3960ef6b 100644
--- a/lib/libc/gen/posix_spawn_file_actions_addopen.3
+++ b/lib/libc/gen/posix_spawn_file_actions_addopen.3
@@ -200,4 +200,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawn_file_actions_init.3 b/lib/libc/gen/posix_spawn_file_actions_init.3
index d826b8bf4458..eda2a1daa1e9 100644
--- a/lib/libc/gen/posix_spawn_file_actions_init.3
+++ b/lib/libc/gen/posix_spawn_file_actions_init.3
@@ -101,4 +101,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_getflags.3 b/lib/libc/gen/posix_spawnattr_getflags.3
index 4064011f1d0e..b5995cea4a82 100644
--- a/lib/libc/gen/posix_spawnattr_getflags.3
+++ b/lib/libc/gen/posix_spawnattr_getflags.3
@@ -108,4 +108,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_getpgroup.3 b/lib/libc/gen/posix_spawnattr_getpgroup.3
index 5cd51d687ab7..91b3e5cd3d18 100644
--- a/lib/libc/gen/posix_spawnattr_getpgroup.3
+++ b/lib/libc/gen/posix_spawnattr_getpgroup.3
@@ -93,4 +93,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_getschedparam.3 b/lib/libc/gen/posix_spawnattr_getschedparam.3
index 70009b9b4090..a137200bd6ae 100644
--- a/lib/libc/gen/posix_spawnattr_getschedparam.3
+++ b/lib/libc/gen/posix_spawnattr_getschedparam.3
@@ -97,4 +97,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_getschedpolicy.3 b/lib/libc/gen/posix_spawnattr_getschedpolicy.3
index 45c1965408b6..3e79d4b79582 100644
--- a/lib/libc/gen/posix_spawnattr_getschedpolicy.3
+++ b/lib/libc/gen/posix_spawnattr_getschedpolicy.3
@@ -95,4 +95,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_getsigdefault.3 b/lib/libc/gen/posix_spawnattr_getsigdefault.3
index 9e13c3742cf7..88783322ff97 100644
--- a/lib/libc/gen/posix_spawnattr_getsigdefault.3
+++ b/lib/libc/gen/posix_spawnattr_getsigdefault.3
@@ -95,4 +95,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_getsigmask.3 b/lib/libc/gen/posix_spawnattr_getsigmask.3
index 5cee7ec6853e..4f9c014853af 100644
--- a/lib/libc/gen/posix_spawnattr_getsigmask.3
+++ b/lib/libc/gen/posix_spawnattr_getsigmask.3
@@ -95,4 +95,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/posix_spawnattr_init.3 b/lib/libc/gen/posix_spawnattr_init.3
index 66c99cd5afa8..388fe5a49ce9 100644
--- a/lib/libc/gen/posix_spawnattr_init.3
+++ b/lib/libc/gen/posix_spawnattr_init.3
@@ -100,7 +100,7 @@ The
 function will fail if:
 .Bl -tag -width Er
 .It Bq Er ENOMEM
-Insufficient memory exists to initialize the spawn file actions object.
+Insufficient memory exists to initialize the spawn attributes object.
 .El
 .Sh SEE ALSO
 .Xr posix_spawn 3 ,
@@ -120,4 +120,4 @@ and
 functions first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/gen/readdir.c b/lib/libc/gen/readdir.c
index 324870b39ad1..69f59d16087a 100644
--- a/lib/libc/gen/readdir.c
+++ b/lib/libc/gen/readdir.c
@@ -61,12 +61,14 @@ _readdir_unlocked(dirp, skip)
 				return (NULL);
 			dirp->dd_loc = 0;
 		}
-		if (dirp->dd_loc == 0 && !(dirp->dd_flags & __DTF_READALL)) {
+		if (dirp->dd_loc == 0 &&
+		    !(dirp->dd_flags & (__DTF_READALL | __DTF_SKIPREAD))) {
 			dirp->dd_size = _getdirentries(dirp->dd_fd,
 			    dirp->dd_buf, dirp->dd_len, &dirp->dd_seek);
 			if (dirp->dd_size <= 0)
 				return (NULL);
 		}
+		dirp->dd_flags &= ~__DTF_SKIPREAD;
 		dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
 		if ((long)dp & 03L)	/* bogus pointer check */
 			return (NULL);
diff --git a/lib/libc/gen/readpassphrase.c b/lib/libc/gen/readpassphrase.c
index 86c7811d9fb1..95ae725e040c 100644
--- a/lib/libc/gen/readpassphrase.c
+++ b/lib/libc/gen/readpassphrase.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: readpassphrase.c,v 1.23 2010/05/14 13:30:34 millert Exp $	*/
+/*	$OpenBSD: readpassphrase.c,v 1.24 2013/11/24 23:51:29 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2000-2002, 2007, 2010
@@ -122,11 +122,11 @@ readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags)
 		if (p < end) {
 			if ((flags & RPP_SEVENBIT))
 				ch &= 0x7f;
-			if (isalpha(ch)) {
+			if (isalpha((unsigned char)ch)) {
 				if ((flags & RPP_FORCELOWER))
-					ch = (char)tolower(ch);
+					ch = (char)tolower((unsigned char)ch);
 				if ((flags & RPP_FORCEUPPER))
-					ch = (char)toupper(ch);
+					ch = (char)toupper((unsigned char)ch);
 			}
 			*p++ = ch;
 		}
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
index 0eb091a08246..89e717cbfc10 100644
--- a/lib/libc/gen/rewinddir.c
+++ b/lib/libc/gen/rewinddir.c
@@ -33,9 +33,14 @@ static char sccsid[] = "@(#)rewinddir.c	8.1 (Berkeley) 6/8/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "namespace.h"
 #include <sys/types.h>
 #include <dirent.h>
+#include <pthread.h>
+#include <unistd.h>
+#include "un-namespace.h"
 
+#include "libc_private.h"
 #include "gen-private.h"
 #include "telldir.h"
 
@@ -44,6 +49,16 @@ rewinddir(dirp)
 	DIR *dirp;
 {
 
-	_seekdir(dirp, dirp->dd_rewind);
-	dirp->dd_rewind = telldir(dirp);
+	if (__isthreaded)
+		_pthread_mutex_lock(&dirp->dd_lock);
+	if (dirp->dd_flags & __DTF_READALL)
+		_filldir(dirp, false);
+	else if (dirp->dd_seek != 0) {
+		(void) lseek(dirp->dd_fd, 0, SEEK_SET);
+		dirp->dd_seek = 0;
+	}
+	dirp->dd_loc = 0;
+	_reclaim_telldir(dirp);
+	if (__isthreaded)
+		_pthread_mutex_unlock(&dirp->dd_lock);
 }
diff --git a/lib/libc/gen/setproctitle.3 b/lib/libc/gen/setproctitle.3
index 0fefddf3b315..955556e5b205 100644
--- a/lib/libc/gen/setproctitle.3
+++ b/lib/libc/gen/setproctitle.3
@@ -100,11 +100,11 @@ Other operating systems have
 similar functions.
 .Sh AUTHORS
 .An -nosplit
-.An Peter Wemm Aq peter@FreeBSD.org
+.An Peter Wemm Aq Mt peter@FreeBSD.org
 stole the idea from the
 .Sy "Sendmail 8.7.3"
 source code by
-.An Eric Allman Aq eric@sendmail.org .
+.An Eric Allman Aq Mt eric@sendmail.org .
 .Sh BUGS
 Never pass a string with user-supplied data as a format without using
 .Ql %s .
diff --git a/lib/libc/gen/statvfs.3 b/lib/libc/gen/statvfs.3
index f9c7430f6e99..73109bd98342 100644
--- a/lib/libc/gen/statvfs.3
+++ b/lib/libc/gen/statvfs.3
@@ -184,4 +184,4 @@ The
 and
 .Fn fstatvfs
 functions and this manual page were written by
-.An Garrett Wollman Aq wollman@FreeBSD.org .
+.An Garrett Wollman Aq Mt wollman@FreeBSD.org .
diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c
index b7952b107c38..2b3acfb5db74 100644
--- a/lib/libc/gen/sysconf.c
+++ b/lib/libc/gen/sysconf.c
@@ -367,11 +367,17 @@ sysconf(name)
 		 * _POSIX_FILE_LOCKING, so we can't answer this one.
 		 */
 #endif
-#if _POSIX_THREAD_SAFE_FUNCTIONS > -1
+
+	/*
+	 * SUSv4tc1 says the following about _SC_GETGR_R_SIZE_MAX and
+	 * _SC_GETPW_R_SIZE_MAX:
+	 * Note that sysconf(_SC_GETGR_R_SIZE_MAX) may return -1 if
+	 * there is no hard limit on the size of the buffer needed to
+	 * store all the groups returned.
+	 */
 	case _SC_GETGR_R_SIZE_MAX:
 	case _SC_GETPW_R_SIZE_MAX:
-#error "somebody needs to implement this"
-#endif
+		return (-1);
 	case _SC_HOST_NAME_MAX:
 		return (MAXHOSTNAMELEN - 1); /* does not include \0 */
 	case _SC_LOGIN_NAME_MAX:
diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c
index 4954b973a915..d72b500b051c 100644
--- a/lib/libc/gen/telldir.c
+++ b/lib/libc/gen/telldir.c
@@ -46,13 +46,6 @@ __FBSDID("$FreeBSD$");
 #include "gen-private.h"
 #include "telldir.h"
 
-/*
- * The option SINGLEUSE may be defined to say that a telldir
- * cookie may be used only once before it is freed. This option
- * is used to avoid having memory usage grow without bound.
- */
-#define SINGLEUSE
-
 /*
  * return a pointer into a directory
  */
@@ -61,18 +54,31 @@ telldir(dirp)
 	DIR *dirp;
 {
 	struct ddloc *lp;
+	long idx;
 
-	if ((lp = (struct ddloc *)malloc(sizeof(struct ddloc))) == NULL)
-		return (-1);
 	if (__isthreaded)
 		_pthread_mutex_lock(&dirp->dd_lock);
-	lp->loc_index = dirp->dd_td->td_loccnt++;
-	lp->loc_seek = dirp->dd_seek;
-	lp->loc_loc = dirp->dd_loc;
-	LIST_INSERT_HEAD(&dirp->dd_td->td_locq, lp, loc_lqe);
+	LIST_FOREACH(lp, &dirp->dd_td->td_locq, loc_lqe) {
+		if (lp->loc_seek == dirp->dd_seek &&
+		    lp->loc_loc == dirp->dd_loc)
+			break;
+	}
+	if (lp == NULL) {
+		lp = malloc(sizeof(struct ddloc));
+		if (lp == NULL) {
+			if (__isthreaded)
+				_pthread_mutex_unlock(&dirp->dd_lock);
+			return (-1);
+		}
+		lp->loc_index = dirp->dd_td->td_loccnt++;
+		lp->loc_seek = dirp->dd_seek;
+		lp->loc_loc = dirp->dd_loc;
+		LIST_INSERT_HEAD(&dirp->dd_td->td_locq, lp, loc_lqe);
+	}
+	idx = lp->loc_index;
 	if (__isthreaded)
 		_pthread_mutex_unlock(&dirp->dd_lock);
-	return (lp->loc_index);
+	return (idx);
 }
 
 /*
@@ -94,7 +100,7 @@ _seekdir(dirp, loc)
 	if (lp == NULL)
 		return;
 	if (lp->loc_loc == dirp->dd_loc && lp->loc_seek == dirp->dd_seek)
-		goto found;
+		return;
 	(void) lseek(dirp->dd_fd, (off_t)lp->loc_seek, SEEK_SET);
 	dirp->dd_seek = lp->loc_seek;
 	dirp->dd_loc = 0;
@@ -103,11 +109,6 @@ _seekdir(dirp, loc)
 		if (dp == NULL)
 			break;
 	}
-found:
-#ifdef SINGLEUSE
-	LIST_REMOVE(lp, loc_lqe);
-	free((caddr_t)lp);
-#endif
 }
 
 /*
diff --git a/lib/libc/gen/telldir.h b/lib/libc/gen/telldir.h
index ef930d2b80b7..04989bb7b536 100644
--- a/lib/libc/gen/telldir.h
+++ b/lib/libc/gen/telldir.h
@@ -36,6 +36,7 @@
 #define	_TELLDIR_H_
 
 #include <sys/queue.h>
+#include <stdbool.h>
 
 /*
  * One of these structures is malloced to describe the current directory
@@ -59,6 +60,7 @@ struct _telldir {
 	long	td_loccnt;	/* index of entry for sequential readdir's */
 };
 
+bool		_filldir(DIR *, bool);
 struct dirent	*_readdir_unlocked(DIR *, int);
 void 		_reclaim_telldir(DIR *);
 void 		_seekdir(DIR *, long);
diff --git a/lib/libc/gen/tls.c b/lib/libc/gen/tls.c
index 4b083da2ae82..5219418fdc32 100644
--- a/lib/libc/gen/tls.c
+++ b/lib/libc/gen/tls.c
@@ -62,7 +62,7 @@ void _rtld_free_tls(void *tls, size_t tcbsize, size_t tcbalign);
 void *__libc_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign);
 void __libc_free_tls(void *tls, size_t tcbsize, size_t tcbalign);
 
-#if defined(__ia64__) || defined(__amd64__)
+#if defined(__amd64__)
 #define TLS_TCB_ALIGN 16
 #elif defined(__powerpc__) || defined(__i386__) || defined(__arm__) || \
     defined(__sparc64__) || defined(__mips__)
@@ -71,8 +71,7 @@ void __libc_free_tls(void *tls, size_t tcbsize, size_t tcbalign);
 #error TLS_TCB_ALIGN undefined for target architecture
 #endif
 
-#if defined(__arm__) || defined(__ia64__) || defined(__mips__) || \
-    defined(__powerpc__)
+#if defined(__arm__) || defined(__mips__) || defined(__powerpc__)
 #define TLS_VARIANT_I
 #endif
 #if defined(__i386__) || defined(__amd64__) || defined(__sparc64__)
diff --git a/lib/libc/gen/ttyname.3 b/lib/libc/gen/ttyname.3
index 9420bbe8f9e4..9e8a4f099598 100644
--- a/lib/libc/gen/ttyname.3
+++ b/lib/libc/gen/ttyname.3
@@ -28,7 +28,7 @@
 .\"     @(#)ttyname.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd May 14, 2005
+.Dd July 18, 2014
 .Dt TTYNAME 3
 .Os
 .Sh NAME
@@ -76,6 +76,14 @@ function
 takes a buffer and length as arguments to avoid this problem.
 .Sh RETURN VALUES
 The
+.Fn isatty
+function returns 1 if
+.Fa fd
+refers to a terminal type device;
+otherwise, it returns 0 and may set
+.Va errno
+to indicate the error.
+The
 .Fn ttyname
 function
 returns the null terminated name if the device is found and
@@ -89,15 +97,23 @@ The
 function returns 0 if successful.
 Otherwise an error number is returned.
 .Sh ERRORS
-The
-.Fn ttyname_r
-may fail and return the following error codes:
+These functions may fail if:
 .Bl -tag -width Er
-.It Bq Er ENOTTY
+.It Bq Er EBADF
 The
 .Fa fd
 argument
 is not a valid file descriptor.
+.It Bq Er ENOTTY
+The file associated with
+.Fa fd
+is not a terminal.
+.El
+.Pp
+Additionally,
+.Fn ttyname_r
+may fail if:
+.Bl -tag -width Er
 .It Bq Er ERANGE
 The
 .Fa bufsize
diff --git a/lib/libc/ia64/Makefile.inc b/lib/libc/ia64/Makefile.inc
deleted file mode 100644
index 16565c610291..000000000000
--- a/lib/libc/ia64/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-#
-# Machine dependent definitions for the ia64 architecture.
-#
-
-# Long double is 80 bits
-GDTOASRCS+=strtorx.c
-MDSRCS+=machdep_ldisx.c
-SYM_MAPS+=${LIBC_SRCTOP}/ia64/Symbol.map
diff --git a/lib/libc/ia64/SYS.h b/lib/libc/ia64/SYS.h
deleted file mode 100644
index eb019a26bc3b..000000000000
--- a/lib/libc/ia64/SYS.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.5 1997/05/02 18:15:15 kleink Exp $ */
-
-/*
- * Copyright (c) 1994, 1995 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.
- *
- * $FreeBSD$
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-#define	CALLSYS_ERROR(name)					\
-	CALLSYS_NOERROR(name);					\
-	cmp.ne	p6,p0=r0,r10;					\
-(p6)	br.cond.sptk.few .cerror
-
-
-#define	SYSCALL(name)						\
-ENTRY(__sys_ ## name,0);		/* XXX # of args? */	\
-	WEAK_ALIAS(name, __sys_ ## name);			\
-	WEAK_ALIAS(_ ## name, __sys_ ## name);			\
-	CALLSYS_ERROR(name)
-
-#define	SYSCALL_NOERROR(name)					\
-ENTRY(__sys_ ## name,0);		/* XXX # of args? */	\
-	WEAK_ALIAS(name, __sys_ ## name);			\
-	WEAK_ALIAS(_ ## name, __sys_ ## name);			\
-	CALLSYS_NOERROR(name)
-
-#define RSYSCALL(name)						\
-	SYSCALL(name);						\
-	br.ret.sptk.few rp;					\
-END(__sys_ ## name)
-
-#define	PSEUDO(name)						\
-ENTRY(__sys_ ## name,0);	/* XXX # of args? */		\
-	WEAK_ALIAS(_ ## name, __sys_ ## name);			\
-	CALLSYS_ERROR(name);					\
-	br.ret.sptk.few rp;					\
-END(__sys_ ## name);
diff --git a/lib/libc/ia64/Symbol.map b/lib/libc/ia64/Symbol.map
deleted file mode 100644
index 7a31a512f5ca..000000000000
--- a/lib/libc/ia64/Symbol.map
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * $FreeBSD$
- */
-
-/*
- * This only needs to contain symbols that are not listed in
- * symbol maps from other parts of libc (i.e., not found in
- * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
- */
-FBSD_1.0 {
-	/* PSEUDO syscalls */
-	_exit;
-
-	mcount;
-	_setjmp;
-	_longjmp;
-	fabs;
-	__flt_rounds;
-	fpgetmask;
-	fpgetround;
-	fpsetmask;
-	fpsetround;
-	__infinity;
-	__nan;
-	makecontext;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
-	htonl;
-	htons;
-	ntohl;
-	ntohs;
-	vfork;
-	brk;
-	exect;
-	sbrk;
-};
-
-FBSDprivate_1.0 {
-	/* PSEUDO syscalls */
-	__sys_getlogin;
-	_getlogin;
-	__sys_exit;
-
-	_set_tp;
-	__divdf3;
-	__divdi3;
-	__divsf3;
-	__divsi3;
-	__moddi3;
-	__modsi3;
-	__udivdi3;
-	__udivsi3;
-	__umoddi3;
-	__umodsi3;
-	_mcount;
-	___longjmp;
-	__makecontext;
-	__longjmp;
-	signalcontext;
-	__signalcontext;
-	__siglongjmp;
-	_Unwind_FindTableEntry;
-	__sys_vfork;
-	_vfork;
-	_end;
-	minbrk;
-	.cerror;
-	curbrk;
-};
diff --git a/lib/libc/ia64/_fpmath.h b/lib/libc/ia64/_fpmath.h
deleted file mode 100644
index 936ce23b6ef3..000000000000
--- a/lib/libc/ia64/_fpmath.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 2002, 2003 David Schultz <das@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/endian.h>
-
-union IEEEl2bits {
-	long double	e;
-	struct {
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-		unsigned int	manl	:32;
-		unsigned int	manh	:32;
-		unsigned int	exp	:15;
-		unsigned int	sign	:1;
-		unsigned long	junk	:48;
-#else /* _BIG_ENDIAN */
-		unsigned long	junk	:48;
-		unsigned int	sign	:1;
-		unsigned int	exp	:15;
-		unsigned int	manh	:32;
-		unsigned int	manl	:32;
-#endif
-	} bits;
-	struct {
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-		unsigned long	man	:64;
-		unsigned int	expsign	:16;
-		unsigned long	junk	:48;
-#else /* _BIG_ENDIAN */
-		unsigned long	junk	:48;
-		unsigned int	expsign	:16;
-		unsigned long	man	:64;
-#endif
-	} xbits;
-};
-
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#define	LDBL_NBIT	0x80000000
-#define	mask_nbit_l(u)	((u).bits.manh &= ~LDBL_NBIT)
-#else /* _BIG_ENDIAN */
-/*
- * XXX This doesn't look right.  Very few machines have a different
- *     endianness for integers and floating-point, and in nextafterl()
- *     we assume that none do.  If you have an environment for testing
- *     this, please let me know. --das
- */
-#define	LDBL_NBIT	0x80
-#define	mask_nbit_l(u)	((u).bits.manh &= ~LDBL_NBIT)
-#endif
-
-#define	LDBL_MANH_SIZE	32
-#define	LDBL_MANL_SIZE	32
-
-#define	LDBL_TO_ARRAY32(u, a) do {			\
-	(a)[0] = (uint32_t)(u).bits.manl;		\
-	(a)[1] = (uint32_t)(u).bits.manh;		\
-} while (0)
diff --git a/lib/libc/ia64/arith.h b/lib/libc/ia64/arith.h
deleted file mode 100644
index 67265284dbf0..000000000000
--- a/lib/libc/ia64/arith.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * $FreeBSD$
- */
-
-/*
- * NOTE: The definitions in this file must be correct or strtod(3) and
- * floating point formats in printf(3) will break!  The file can be
- * generated by running contrib/gdtoa/arithchk.c on the target
- * architecture.  See contrib/gdtoa/gdtoaimp.h for details.
- */
-
-#include <machine/endian.h>
-
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-
-#define IEEE_8087
-#define Arith_Kind_ASL 1
-#define Long int
-#define Intcast (int)(long)
-#define Double_Align
-#define X64_bit_pointers
-
-#else /* _BYTE_ORDER == _LITTLE_ENDIAN */
-
-#define IEEE_MC68k
-#define Arith_Kind_ASL 2
-#define Long int
-#define Intcast (int)(long)
-#define Double_Align
-#define X64_bit_pointers
-#ifdef gcc_bug	/* XXX Why does arithchk report sudden underflow here? */
-#define Sudden_Underflow
-#endif
-
-#endif
diff --git a/lib/libc/ia64/gd_qnan.h b/lib/libc/ia64/gd_qnan.h
deleted file mode 100644
index 39923860db07..000000000000
--- a/lib/libc/ia64/gd_qnan.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * This file can be generated by compiling and running contrib/gdtoa/qnan.c
- * on the target architecture after arith.h has been generated.
- *
- * $FreeBSD$
- */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ff80000
-#define ld_QNAN0 0x0
-#define ld_QNAN1 0xc0000000
-#define ld_QNAN2 0x7fff
-#define ld_QNAN3 0x0
-#define ldus_QNAN0 0x0
-#define ldus_QNAN1 0x0
-#define ldus_QNAN2 0x0
-#define ldus_QNAN3 0xc000
-#define ldus_QNAN4 0x7fff
diff --git a/lib/libc/ia64/gen/Makefile.inc b/lib/libc/ia64/gen/Makefile.inc
deleted file mode 100644
index 1e3373a6d650..000000000000
--- a/lib/libc/ia64/gen/Makefile.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-SRCS+=	__divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \
-	__udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _mcount.S _set_tp.c \
-	_setjmp.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c fpsetmask.c \
-	fpsetround.c getcontextx.c infinity.c ldexp.c makecontext.c setjmp.S \
-	signalcontext.c sigsetjmp.S
-
-# The following may go away if function _Unwind_FindTableEntry()
-# will be part of GCC.
-SRCS+=	unwind.c
diff --git a/lib/libc/ia64/gen/__divdf3.S b/lib/libc/ia64/gen/__divdf3.S
deleted file mode 100644
index 58425d92dbaa..000000000000
--- a/lib/libc/ia64/gen/__divdf3.S
+++ /dev/null
@@ -1,142 +0,0 @@
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-  .section .text
-
-ENTRY(__divdf3, 0)
-{ .mfi
-  // a is in f8
-  // b is in f9
-
-  // predicate registers used: p6
-  // floating-point registers used: f6, f7, f8, f9, f10, f11
-
-  // load a, the first argument, in f6
-  nop.m 0
-  mov f6=f8
-  nop.i 0
-} { .mfi
-  // load b, the second argument, in f7
-  nop.m 0
-  mov f7=f9
-  nop.i 0;;
-} { .mfi
-
-  // BEGIN DOUBLE PRECISION LATENCY-OPTIMIZED DIVIDE ALGORITHM
-
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s0 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // q0 = a * y0 in f9
-  (p6) fma.s1 f9=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // e0 = 1 - b * y0 in f10
-  (p6) fnma.s1 f10=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // q1 = q0 + e0 * q0 in f9
-  (p6) fma.s1 f9=f10,f9,f9
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f10,f10,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f10,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f9,f9
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // e2 = e1 * e1 in f10
-  (p6) fma.s1 f10=f11,f11,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (10)
-  // q3 = q2 + e2 * q2 in f9
-  (p6) fma.d.s1 f9=f10,f9,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (11)
-  // y3 = y2 + e2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (12)
-  // r0 = a - b * q3 in f6
-  (p6) fnma.d.s1 f6=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (13)
-  // q4 = q3 + r0 * y3 in f8
-  (p6) fma.d.s0 f8=f6,f8,f9
-  nop.i 0;;
-
-  // END DOUBLE PRECISION LATENCY-OPTIMIZED DIVIDE ALGORITHM
-
-} { .mib
-  nop.m 0
-  nop.i 0
-  // return
-  br.ret.sptk b0;;
-}
-
-END(__divdf3)
-
diff --git a/lib/libc/ia64/gen/__divdi3.S b/lib/libc/ia64/gen/__divdi3.S
deleted file mode 100644
index 92e29116f6e2..000000000000
--- a/lib/libc/ia64/gen/__divdi3.S
+++ /dev/null
@@ -1,143 +0,0 @@
-.file "__divdi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-.section .text
-.proc __divdi3#
-.align 32
-.global __divdi3#
-.align 32
-
-// 64-bit signed integer divide
-
-__divdi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mmi
-
-  // 64-BIT SIGNED INTEGER DIVIDE BEGINS HERE
-
-  setf.sig f8=r32
-  setf.sig f9=r33
-  nop.i 0;;
-} { .mfb
-  nop.m 0
-  fcvt.xf f6=f8
-  nop.b 0
-} { .mfb
-  nop.m 0
-  fcvt.xf f7=f9
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // e0 = 1 - b * y0 in f9
-  (p6) fnma.s1 f9=f7,f8,f1
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // q0 = a * y0 in f10
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f9,f9,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // q1 = q0 + e0 * q0 in f10
-  (p6) fma.s1 f10=f9,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f9,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // r2 = a - b * q2 in f10
-  (p6) fnma.s1 f10=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (10)
-  // q3 = q2 + r2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f9
-  nop.i 0;;
-} { .mfb
-  nop.m 0
-  // Step (11)
-  // q = trunc (q3)
-  fcvt.fx.trunc.s1 f8=f8
-  nop.b 0;;
-} { .mmi
-  // quotient will be in r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 64-BIT SIGNED INTEGER DIVIDE ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __divdi3
diff --git a/lib/libc/ia64/gen/__divsf3.S b/lib/libc/ia64/gen/__divsf3.S
deleted file mode 100644
index fe7bcb4d68ee..000000000000
--- a/lib/libc/ia64/gen/__divsf3.S
+++ /dev/null
@@ -1,116 +0,0 @@
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-ENTRY(__divsf3, 0)
-{ .mfi
-  // a is in f8
-  // b is in f9
-
-  // general registers used: r31, r32, r33, r34
-  // predicate registers used: p6
-  // floating-point registers used: f6, f7, f8
-
-  nop.m 0
-  // load a, the first argument, in f6
-  mov f6=f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // load b, the second argument, in f7
-  mov f7=f9
-  nop.i 0;;
-} { .mfi
-
-  // BEGIN SINGLE PRECISION LATENCY-OPTIMIZED DIVIDE ALGORITHM
-
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s0 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // q0 = a * y0 in f6
-  (p6) fma.s1 f6=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // e0 = 1 - b * y0 in f7
-  (p6) fnma.s1 f7=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // q1 = q0 + e0 * q0 in f6
-  (p6) fma.s1 f6=f7,f6,f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // e1 = e0 * e0 in f7
-  (p6) fma.s1 f7=f7,f7,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // q2 = q1 + e1 * q1 in f6
-  (p6) fma.s1 f6=f7,f6,f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // e2 = e1 * e1 in f7
-  (p6) fma.s1 f7=f7,f7,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // q3 = q2 + e2 * q2 in f6
-  (p6) fma.d.s1 f6=f7,f6,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // q3' = q3 in f8
-  (p6) fma.s.s0 f8=f6,f1,f0
-  nop.i 0;;
-
-  // END SINGLE PRECISION LATENCY-OPTIMIZED DIVIDE ALGORITHM
-
-} { .mmb
-  nop.m 0
-  nop.m 0
-  // return
-  br.ret.sptk b0;;
-}
-
-END(__divsf3)
diff --git a/lib/libc/ia64/gen/__divsi3.S b/lib/libc/ia64/gen/__divsi3.S
deleted file mode 100644
index 4c82e32ddcf1..000000000000
--- a/lib/libc/ia64/gen/__divsi3.S
+++ /dev/null
@@ -1,125 +0,0 @@
-.file "__divsi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-.section .text
-
-// 32-bit signed integer divide
-
-.proc __divsi3#
-.align 32
-.global __divsi3#
-.align 32
-
-__divsi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mii
-  nop.m 0
-
-  // 32-BIT SIGNED INTEGER DIVIDE BEGINS HERE
-
-  // general register used:
-  //    r32 - 32-bit signed integer dividend
-  //    r33 - 32-bit signed integer divisor
-  //    r8 - 32-bit signed integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9
-  // predicate registers used: p6
-
-  sxt4 r32=r32
-  sxt4 r33=r33;;
-} { .mmb
-  setf.sig f6=r32
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  fcvt.xf f6=f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xf f7=f7
-  mov r2 = 0x0ffdd;;
-} { .mfi
-  setf.exp f9 = r2
-  // (1) y0
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-}  { .mfi
-  nop.m 0
-  // (2) q0 = a * y0
-  (p6) fma.s1 f6=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (3) e0 = 1 - b * y0
-  (p6) fnma.s1 f7=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (4) q1 = q0 + e0 * q0
-  (p6) fma.s1 f6=f7,f6,f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (5) e1 = e0 * e0 + 2^-34
-  (p6) fma.s1 f7=f7,f7,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (6) q2 = q1 + e1 * q1
-  (p6) fma.s1 f8=f7,f6,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (7) q = trunc(q2)
-  fcvt.fx.trunc.s1 f8=f8
-  nop.i 0;;
-} { .mmi
-  // quotient will be in the least significant 32 bits of r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 32-BIT SIGNED INTEGER DIVIDE ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __divsi3
diff --git a/lib/libc/ia64/gen/__moddi3.S b/lib/libc/ia64/gen/__moddi3.S
deleted file mode 100644
index e15f964c6ff9..000000000000
--- a/lib/libc/ia64/gen/__moddi3.S
+++ /dev/null
@@ -1,160 +0,0 @@
-.file "__moddi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-.section .text
-
-// 64-bit signed integer remainder
-
-.proc __moddi3#
-.align 32
-.global __moddi3#
-.align 32
-
-__moddi3:
-
-{ .mii
-  alloc r31=ar.pfs,3,0,0,0
-  nop.i 0
-  nop.i 0
-} { .mmb
-
-  // 64-BIT SIGNED INTEGER REMAINDER BEGINS HERE
-
-  // general register used:
-  //    r32 - 64-bit signed integer dividend
-  //    r33 - 64-bit signed integer divisor
-  //    r8 - 64-bit signed integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9, f10, f11, f12
-  // predicate registers used: p6
-
-  setf.sig f12=r32  // holds an in integer form
-  setf.sig f7=r33
-  nop.b 0
-} { .mlx
-  nop.m 0
-  //movl r2=0x8000000000000000;;
-  movl r2=0xffffffffffffffff;;
-} { .mfi
-  // get the 2's complement of b
-  sub r33=r0,r33
-  fcvt.xf f6=f12
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xf f7=f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // q0 = a * y0 in f10
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // e0 = 1 - b * y0 in f9
-  (p6) fnma.s1 f9=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // q1 = q0 + e0 * q0 in f10
-  (p6) fma.s1 f10=f9,f10,f10
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f9,f9,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f9,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // r2 = a - b * q2 in f10
-  (p6) fnma.s1 f10=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  setf.sig f7=r33
-  // Step (10)
-  // q3 = q2 + r2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (11) q = trunc(q3)
-  fcvt.fx.trunc.s1 f8=f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (12) r = a + (-b) * q
-  xma.l f8=f8,f7,f12
-  nop.i 0;;
-}  { .mib
-  getf.sig r8=f8
-  nop.i 0
-  nop.b 0
-} 
-
-  // 64-BIT SIGNED INTEGER REMAINDER ENDS HERE
-
-{ .mib
-  nop.m 0
-  nop.i 0
-  br.ret.sptk b0;;
-}
-
-.endp __moddi3
diff --git a/lib/libc/ia64/gen/__modsi3.S b/lib/libc/ia64/gen/__modsi3.S
deleted file mode 100644
index 1939493eff38..000000000000
--- a/lib/libc/ia64/gen/__modsi3.S
+++ /dev/null
@@ -1,132 +0,0 @@
-.file "__modsi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-.section .text
-
-// 32-bit signed integer remainder
-
-.proc __modsi3#
-.align 32
-.global __modsi3#
-.align 32
-
-__modsi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mii
-  nop.m 0
-
-  // 32-BIT SIGNED INTEGER REMAINDER BEGINS HERE
-
-  // general register used:
-  //    r32 - 32-bit signed integer dividend
-  //    r33 - 32-bit signed integer divisor
-  //    r8 - 32-bit signed integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9, f10, f11
-  // predicate registers used: p6
-
-  sxt4 r32=r32
-  sxt4 r33=r33;;
-} { .mmb
-  setf.sig f11=r32
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  // get 2's complement of b
-  sub r33=r0,r33
-  fcvt.xf f6=f11
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xf f7=f7
-  mov r2 = 0x0ffdd;;
-} { .mfi
-  setf.exp f9 = r2
-  // (1) y0
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (2) q0 = a * y0
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (3) e0 = 1 - b * y0
-  (p6) fnma.s1 f8=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  // 2's complement of b
-  setf.sig f7=r33
-  // (4) q1 = q0 + e0 * q0
-  (p6) fma.s1 f10=f8,f10,f10
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (5) e1 = e0 * e0 + 2^-34
-  (p6) fma.s1 f8=f8,f8,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (6) q2 = q1 + e1 * q1
-  (p6) fma.s1 f8=f8,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (7) q = trunc(q2)
-  fcvt.fx.trunc.s1 f8=f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (8) r = a + (-b) * q
-  xma.l f8=f8,f7,f11
-  nop.i 0;;
-}  { .mmi
-  // remainder will be in the least significant 32 bits of r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 32-BIT SIGNED INTEGER REMAINDER ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __modsi3
diff --git a/lib/libc/ia64/gen/__udivdi3.S b/lib/libc/ia64/gen/__udivdi3.S
deleted file mode 100644
index 1233e8aa4105..000000000000
--- a/lib/libc/ia64/gen/__udivdi3.S
+++ /dev/null
@@ -1,144 +0,0 @@
-.file "__udivdi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-.section .text
-.proc __udivdi3#
-.align 32
-.global __udivdi3#
-.align 32
-
-// 64-bit unsigned integer divide
-
-__udivdi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-}
-
-{ .mmi
-
-  // 64-BIT UNSIGNED INTEGER DIVIDE BEGINS HERE
-
-  setf.sig f8=r32
-  setf.sig f9=r33
-  nop.i 0;;
-} { .mfb
-  nop.m 0
-  fma.s1 f6=f8,f1,f0
-  nop.b 0
-} { .mfb
-  nop.m 0
-  fma.s1 f7=f9,f1,f0
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // e0 = 1 - b * y0 in f9
-  (p6) fnma.s1 f9=f7,f8,f1
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // q0 = a * y0 in f10
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f9,f9,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // q1 = q0 + e0 * q0 in f10
-  (p6) fma.s1 f10=f9,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f9,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // r2 = a - b * q2 in f10
-  (p6) fnma.s1 f10=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (10)
-  // q3 = q2 + r2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f9
-  nop.i 0;;
-} { .mfb
-  nop.m 0
-  // (11) q = trunc(q3)
-  fcvt.fxu.trunc.s1 f8=f8
-  nop.b 0;;
-} { .mmi
-  // quotient will be in r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 64-BIT UNSIGNED INTEGER DIVIDE ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __udivdi3
diff --git a/lib/libc/ia64/gen/__udivsi3.S b/lib/libc/ia64/gen/__udivsi3.S
deleted file mode 100644
index 25959b88a922..000000000000
--- a/lib/libc/ia64/gen/__udivsi3.S
+++ /dev/null
@@ -1,125 +0,0 @@
-.file "__udivsi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-.section .text
-
-// 32-bit unsigned integer divide
-
-.proc __udivsi3#
-.align 32
-.global __udivsi3#
-.align 32
-
-__udivsi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mii
-  nop.m 0
-
-  // 32-BIT UNSIGNED INTEGER DIVIDE BEGINS HERE
-
-  // general register used:
-  //    r32 - 32-bit unsigned integer dividend
-  //    r33 - 32-bit unsigned integer divisor
-  //    r8 - 32-bit unsigned integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9
-  // predicate registers used: p6
-
-  zxt4 r32=r32
-  zxt4 r33=r33;;
-} { .mmb
-  setf.sig f6=r32
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  fcvt.xf f6=f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xf f7=f7
-  mov r2 = 0x0ffdd;;
-} { .mfi
-  setf.exp f9 = r2
-  // (1) y0
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (2) q0 = a * y0
-  (p6) fma.s1 f6=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (3) e0 = 1 - b * y0
-  (p6) fnma.s1 f7=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (4) q1 = q0 + e0 * q0
-  (p6) fma.s1 f6=f7,f6,f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (5) e1 = e0 * e0 + 2^-34
-  (p6) fma.s1 f7=f7,f7,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (6) q2 = q1 + e1 * q1
-  (p6) fma.s1 f8=f7,f6,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (7) q = trunc(q2)
-  fcvt.fxu.trunc.s1 f8=f8
-  nop.i 0;;
-} { .mmi
-  // quotient will be in the least significant 32 bits of r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 32-BIT UNSIGNED INTEGER DIVIDE ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __udivsi3
diff --git a/lib/libc/ia64/gen/__umoddi3.S b/lib/libc/ia64/gen/__umoddi3.S
deleted file mode 100644
index 509c62bb687e..000000000000
--- a/lib/libc/ia64/gen/__umoddi3.S
+++ /dev/null
@@ -1,156 +0,0 @@
-.file "__umoddi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-.section .text
-
-  // 64-bit unsigned integer remainder
-
-.proc __umoddi3#
-.align 32
-.global __umoddi3#
-.align 32
-
-__umoddi3:
-
-{ .mii
-  alloc r31=ar.pfs,3,0,0,0
-  nop.i 0
-  nop.i 0
-} { .mmb
-
-  // 64-BIT UNSIGNED INTEGER REMAINDER BEGINS HERE
-
-  // general register used:
-  //    r32 - 64-bit unsigned integer dividend
-  //    r33 - 64-bit unsigned integer divisor
-  //    r8 - 64-bit unsigned integer result
-  // floating-point registers used: f6, f7, f8, f9, f10, f11, f12
-  // predicate registers used: p6
-
-  setf.sig f12=r32  // holds an in integer form
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  // get 2's complement of b
-  sub r33=r0,r33
-  fcvt.xuf.s1 f6=f12
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xuf.s1 f7=f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // q0 = a * y0 in f10
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // e0 = 1 - b * y0 in f9
-  (p6) fnma.s1 f9=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // q1 = q0 + e0 * q0 in f10
-  (p6) fma.s1 f10=f9,f10,f10
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f9,f9,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f9,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // r2 = a - b * q2 in f10
-  (p6) fnma.s1 f10=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  // f7=-b
-  setf.sig f7=r33
-  // Step (10)
-  // q3 = q2 + r2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (11) q = trunc(q3)
-  fcvt.fxu.trunc.s1 f8=f8
-  nop.i 0;;
-}  { .mfi
-  nop.m 0
-  // (12) r = a + (-b) * q
-  xma.l f8=f8,f7,f12
-  nop.i 0;;
-}  { .mib
-  getf.sig r8=f8
-  nop.i 0
-  nop.b 0
-}
-
-  // 64-BIT UNSIGNED INTEGER REMAINDER ENDS HERE
-
-{ .mib
-  nop.m 0
-  nop.i 0
-  br.ret.sptk b0;;
-}
-
-.endp __umoddi3
diff --git a/lib/libc/ia64/gen/__umodsi3.S b/lib/libc/ia64/gen/__umodsi3.S
deleted file mode 100644
index 697db2e5d8c9..000000000000
--- a/lib/libc/ia64/gen/__umodsi3.S
+++ /dev/null
@@ -1,132 +0,0 @@
-.file "__umodsi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-.section .text
-
-// 32-bit unsigned integer remainder
-
-.proc __umodsi3#
-.align 32
-.global __umodsi3#
-.align 32
-
-__umodsi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mii
-  nop.m 0
-
-  // 32-BIT UNSIGNED INTEGER REMAINDER BEGINS HERE
-
-  // general register used:
-  //    r32 - 32-bit unsigned integer dividend
-  //    r33 - 32-bit unsigned integer divisor
-  //    r8 - 32-bit unsigned integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9, f10, f11
-  // predicate registers used: p6
-
-  zxt4 r32=r32
-  zxt4 r33=r33;;
-} { .mmb
-  setf.sig f11=r32
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  fcvt.xf f6=f11
-  nop.i 0
-} { .mfi
-  // get 2's complement of b
-  sub r33=r0,r33
-  fcvt.xf f7=f7
-  mov r2 = 0x0ffdd;;
-} { .mfi
-  setf.exp f9 = r2
-  // (1) y0
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-}  { .mfi
-  nop.m 0
-  // (2) q0 = a * y0
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (3) e0 = 1 - b * y0
-  (p6) fnma.s1 f8=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (4) q1 = q0 + e0 * q0
-  (p6) fma.s1 f10=f8,f10,f10
-  nop.i 0
-} { .mfi
-  // get 2's complement of b
-  setf.sig f7=r33
-  // (5) e1 = e0 * e0 + 2^-34
-  (p6) fma.s1 f8=f8,f8,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (6) q2 = q1 + e1 * q1
-  (p6) fma.s1 f8=f8,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (7) q = trunc(q2)
-  fcvt.fxu.trunc.s1 f8=f8
-  nop.i 0;;
-}  { .mfi
-  nop.m 0
-  // (8) r = a + (-b) * q
-  xma.l f8=f8,f7,f11
-  nop.i 0;;
-}  { .mmi
-  // remainder will be in the least significant 32 bits of r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 32-BIT UNSIGNED INTEGER REMAINDER ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __umodsi3
diff --git a/lib/libc/ia64/gen/_mcount.S b/lib/libc/ia64/gen/_mcount.S
deleted file mode 100644
index d9e9b76845d8..000000000000
--- a/lib/libc/ia64/gen/_mcount.S
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2004 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-	.text
-
-/*
- * Important registers:
- *	r8	structure return address
- *	r15	static link (nested routines)
- *	rp	our return address
- *	in0	caller's ar.pfs
- *	in1	caller's gp
- *	in2	caller's rp
- *	in3	GOT entry
- *	ar.pfs	our pfs
- */
-ENTRY_NOPROFILE(_mcount, 4)
-	alloc		loc0 = ar.pfs, 4, 4, 2, 0
-	mov		loc1 = r8
-	mov		loc2 = rp
-	mov		loc3 = r15
-	;;
-	mov		out0 = in2
-	mov		out1 = rp
-	br.call.sptk	rp = __mcount
-	;;
-1:
-	mov		gp = in1
-	mov		r14 = ip
-	mov		b7 = loc2
-	;;
-	add		r14 = 2f - 1b, r14
-	mov		ar.pfs = loc0
-	mov		rp = in2
-	;;
-	mov		r15 = loc3
-	mov		b7 = r14
-	mov		b6 = loc2
-	mov		r8 = loc1
-	mov		r14 = in0
-	br.ret.sptk	b7
-	;;
-2:
-	mov		ar.pfs = r14
-	br.sptk		b6
-	;;
-END(_mcount)
-
-WEAK_ALIAS(mcount, _mcount)
diff --git a/lib/libc/ia64/gen/_setjmp.S b/lib/libc/ia64/gen/_setjmp.S
deleted file mode 100644
index 3966e836475f..000000000000
--- a/lib/libc/ia64/gen/_setjmp.S
+++ /dev/null
@@ -1,310 +0,0 @@
-//
-// Copyright (c) 1999, 2000
-// Intel Corporation.
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 
-// 1. Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the distribution.
-// 
-// 3. All advertising materials mentioning features or use of this software
-//    must display the following acknowledgement:
-// 
-//    This product includes software developed by Intel Corporation and
-//    its contributors.
-// 
-// 4. Neither the name of Intel Corporation or its contributors may be
-//    used to endorse or promote products derived from this software
-//    without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION AND CONTRIBUTORS ``AS IS''
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED.  IN NO EVENT SHALL INTEL CORPORATION OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-// THE POSSIBILITY OF SUCH DAMAGE.
-// 
-//
-
-//
-// Module Name:
-//
-//  setjmp.s
-//
-// Abstract:
-//
-//  Contains an implementation of setjmp and longjmp for the
-//  IA-64 architecture.
-
-    .file   "setjmp.s"
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#define     LOCORE
-#include    <machine/setjmp.h>
-
-// int _setjmp(struct jmp_buffer *)
-//
-//  Setup a non-local goto.
-//
-// Description:
-//
-//  SetJump stores the current register set in the area pointed to
-//  by "save".  It returns zero.  Subsequent calls to "LongJump" will
-//  restore the registers and return non-zero to the same location.
-//
-// On entry, r32 contains the pointer to the jmp_buffer
-//
-
-ENTRY(_setjmp, 1)
-    add     r10 = J_PREDS, r32  // skip Unats & pfs save area
-    add     r11 = J_BSP, r32
-    //
-    //  save immediate context
-    //
-    mov     r2 = ar.bsp         // save backing store pointer
-    mov     r3 = pr             // save predicates
-    flushrs
-    ;;
-    //
-    // save user Unat register
-    //
-    mov     r16 = ar.lc         // save loop count register
-    mov     r14 = ar.unat       // save user Unat register
-
-    st8     [r10] = r3, J_LC-J_PREDS
-    st8     [r11] = r2, J_R4-J_BSP
-    ;;
-    st8     [r10] = r16, J_R5-J_LC
-    st8     [r32] = r14, J_NATS // Note: Unat at the 
-                                // beginning of the save area
-    mov     r15 = ar.pfs
-    ;;
-    //
-    //  save preserved general registers & NaT's
-    //
-    .mem.offset 0,0
-    st8.spill   [r11] = r4, J_R6-J_R4
-    .mem.offset 8,0
-    st8.spill   [r10] = r5, J_R7-J_R5
-    ;;
-    .mem.offset 16,0
-    st8.spill   [r11] = r6, J_SP-J_R6
-    .mem.offset 24,0
-    st8.spill   [r10] = r7, J_F3-J_R7 
-    ;;
-    st8.spill   [r11] = sp, J_F2-J_SP
-    mov	    r16 = ar.rsc
-    ;;
-    //
-    // save spilled Unat and pfs registers
-    //
-    mov     r2 = ar.unat        // save Unat register after spill
-    mov	ar.rsc = r0
-    ;;
-    st8     [r32] = r2, J_PFS-J_NATS    // save unat for spilled regs
-    mov     r17 = ar.rnat
-    ;;
-    st8     [r32] = r15, J_RNAT-J_PFS	// save pfs
-    mov	    ar.rsc = r16
-    //
-    //  save floating registers 
-    //
-    stf.spill   [r11] = f2, J_F4-J_F2
-    stf.spill   [r10] = f3, J_F5-J_F3 
-    ;;
-    stf.spill   [r11] = f4, J_F16-J_F4
-    stf.spill   [r10] = f5, J_F17-J_F5 
-    ;;
-    stf.spill   [r11] = f16, J_F18-J_F16
-    stf.spill   [r10] = f17, J_F19-J_F17 
-    ;;
-    stf.spill   [r11] = f18, J_F20-J_F18
-    stf.spill   [r10] = f19, J_F21-J_F19 
-    ;;
-    stf.spill   [r11] = f20, J_F22-J_F20
-    stf.spill   [r10] = f21, J_F23-J_F21 
-    ;;
-    stf.spill   [r11] = f22, J_F24-J_F22
-    stf.spill   [r10] = f23, J_F25-J_F23 
-    ;;
-    stf.spill   [r11] = f24, J_F26-J_F24
-    stf.spill   [r10] = f25, J_F27-J_F25 
-    ;;
-    stf.spill   [r11] = f26, J_F28-J_F26
-    stf.spill   [r10] = f27, J_F29-J_F27 
-    ;;
-    stf.spill   [r11] = f28, J_F30-J_F28
-    stf.spill   [r10] = f29, J_F31-J_F29 
-    ;;
-    stf.spill   [r11] = f30, J_FPSR-J_F30
-    stf.spill   [r10] = f31, J_B0-J_F31     // size of f31 + fpsr
-    ;;
-    st8     [r32] = r17
-    //
-    // save FPSR register & branch registers
-    //
-    mov     r2 = ar.fpsr    // save fpsr register
-    mov     r3 = b0 
-    ;;
-    st8     [r11] = r2, J_B1-J_FPSR
-    st8     [r10] = r3, J_B2-J_B0
-    mov     r2 = b1
-    mov     r3 = b2 
-    ;;
-    st8     [r11] = r2, J_B3-J_B1
-    st8     [r10] = r3, J_B4-J_B2
-    mov     r2 = b3
-    mov     r3 = b4 
-    ;;
-    st8     [r11] = r2, J_B5-J_B3
-    st8     [r10] = r3
-    mov     r2 = b5 
-    ;;
-    st8     [r11] = r2
-    ;;
-    //
-    // return
-    //
-    mov     r8 = r0         // return 0 from setjmp
-    mov     ar.unat = r14   // restore unat
-    br.ret.sptk b0
-
-END(_setjmp)
-
-
-//
-// void _longjmp(struct jmp_buffer *, int val)
-//
-//  Perform a non-local goto.
-//
-// Description:
-//
-//  LongJump initializes the register set to the values saved by a
-//  previous 'SetJump' and jumps to the return location saved by that
-//  'SetJump'.  This has the effect of unwinding the stack and returning
-//  for a second time to the 'SetJump'.
-//
-
-	WEAK_ALIAS(_longjmp,___longjmp)
-ENTRY(___longjmp, 2)
-    mov     r14 = ar.rsc        // get user RSC conf
-    mov     r8 = r33            // return value
-    add     r10 = J_PFS, r32    // get address of pfs
-    ;;
-    mov     ar.rsc = r0
-    add     r11 = J_NATS, r32
-    add     r17 = J_RNAT, r32
-    ;;
-    ld8     r15 = [r10], J_BSP-J_PFS    // get pfs
-    ld8     r2 = [r11], J_LC-J_NATS     // get unat for spilled regs
-    mov     r31 = r32
-    ;;
-    loadrs
-    mov     ar.unat = r2
-    cmp.eq  p6,p0=0,r8			// Return value 0?
-    ;;
-    ld8     r16 = [r10], J_PREDS-J_BSP  // get backing store pointer
-    ld8     r17 = [r17]			// ar.rnat
-    mov     ar.pfs = r15
-    ;;
-    mov     ar.bspstore = r16
-(p6) add    r8 = 1, r0
-    ;;
-    mov     ar.rnat = r17
-    mov     ar.rsc = r14        // restore RSC conf
-
-    ld8     r3 = [r11], J_R4-J_LC       // get lc register
-    ld8     r2 = [r10], J_R5-J_PREDS    // get predicates
-    ;;
-    mov     pr = r2, -1
-    mov     ar.lc = r3
-    //
-    //  restore preserved general registers & NaT's
-    //
-    ld8.fill    r4 = [r11], J_R6-J_R4
-    ;;
-    ld8.fill    r5 = [r10], J_R7-J_R5 
-    ld8.fill    r6 = [r11], J_SP-J_R6
-    ;;
-    ld8.fill    r7 = [r10], J_F2-J_R7
-    ld8.fill    sp = [r11], J_F3-J_SP
-    ;;
-    //
-    //  restore floating registers 
-    //
-    ldf.fill    f2 = [r10], J_F4-J_F2
-    ldf.fill    f3 = [r11], J_F5-J_F3 
-    ;;
-    ldf.fill    f4 = [r10], J_F16-J_F4
-    ldf.fill    f5 = [r11], J_F17-J_F5 
-    ;;
-    ldf.fill    f16 = [r10], J_F18-J_F16
-    ldf.fill    f17 = [r11], J_F19-J_F17
-    ;;
-    ldf.fill    f18 = [r10], J_F20-J_F18
-    ldf.fill    f19 = [r11], J_F21-J_F19
-    ;;
-    ldf.fill    f20 = [r10], J_F22-J_F20
-    ldf.fill    f21 = [r11], J_F23-J_F21
-    ;;
-    ldf.fill    f22 = [r10], J_F24-J_F22
-    ldf.fill    f23 = [r11], J_F25-J_F23 
-    ;;
-    ldf.fill    f24 = [r10], J_F26-J_F24
-    ldf.fill    f25 = [r11], J_F27-J_F25
-    ;;
-    ldf.fill    f26 = [r10], J_F28-J_F26
-    ldf.fill    f27 = [r11], J_F29-J_F27
-    ;;
-    ldf.fill    f28 = [r10], J_F30-J_F28
-    ldf.fill    f29 = [r11], J_F31-J_F29 
-    ;;
-    ldf.fill    f30 = [r10], J_FPSR-J_F30
-    ldf.fill    f31 = [r11], J_B0-J_F31 ;;
-
-    //
-    // restore branch registers and fpsr
-    //
-    ld8     r16 = [r10], J_B1-J_FPSR    // get fpsr
-    ld8     r17 = [r11], J_B2-J_B0      // get return pointer
-    ;;
-    mov     ar.fpsr = r16
-    mov     b0 = r17
-    ld8     r2 = [r10], J_B3-J_B1
-    ld8     r3 = [r11], J_B4-J_B2
-    ;;
-    mov     b1 = r2
-    mov     b2 = r3
-    ld8     r2 = [r10], J_B5-J_B3
-    ld8     r3 = [r11]
-    ;;
-    mov     b3 = r2
-    mov     b4 = r3
-    ld8     r2 = [r10]
-    ld8     r21 = [r31]         // get user unat
-    ;;
-    mov     b5 = r2
-    mov     ar.unat = r21
-
-    //
-    // invalidate ALAT
-    //
-    invala ;;
-
-    br.ret.sptk b0
-
-END(___longjmp)
diff --git a/lib/libc/ia64/gen/fabs.S b/lib/libc/ia64/gen/fabs.S
deleted file mode 100644
index 036d49201321..000000000000
--- a/lib/libc/ia64/gen/fabs.S
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-ENTRY(fabs, 1)
-	fabs	fret0=farg0
-	br.ret.sptk.few rp
-END(fabs)
diff --git a/lib/libc/ia64/gen/flt_rounds.c b/lib/libc/ia64/gen/flt_rounds.c
deleted file mode 100644
index d65096545abc..000000000000
--- a/lib/libc/ia64/gen/flt_rounds.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <float.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	3,	/* round to zero */
-	2,	/* round to negative infinity */
-	0	/* round to positive infinity */
-};
-
-int
-__flt_rounds(void)
-{
-	int x;
-
-	__asm("mov %0=ar.fpsr" : "=r" (x));
-        return (map[(x >> 10) & 0x03]);
-}
diff --git a/lib/libc/ia64/gen/fpgetmask.c b/lib/libc/ia64/gen/fpgetmask.c
deleted file mode 100644
index ac166e249388..000000000000
--- a/lib/libc/ia64/gen/fpgetmask.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2001 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_except_t
-fpgetmask(void)
-{
-	u_int64_t fpsr;
-
-	__asm __volatile("mov %0=ar.fpsr" : "=r" (fpsr));
-	return (~fpsr & 0x3d);
-}
diff --git a/lib/libc/ia64/gen/fpsetmask.c b/lib/libc/ia64/gen/fpsetmask.c
deleted file mode 100644
index d959dc6281ab..000000000000
--- a/lib/libc/ia64/gen/fpsetmask.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 2001 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_except_t
-fpsetmask(fp_except_t mask)
-{
-	u_int64_t fpsr;
-	u_int64_t oldmask;
-
-	__asm __volatile("mov %0=ar.fpsr" : "=r" (fpsr));
-	oldmask = ~fpsr & 0x3d;
-	fpsr = (fpsr & ~0x3d) | (~mask & 0x3d);
-	__asm __volatile("mov ar.fpsr=%0" :: "r" (fpsr));
-	return (oldmask);
-}
diff --git a/lib/libc/ia64/gen/fpsetround.c b/lib/libc/ia64/gen/fpsetround.c
deleted file mode 100644
index db2eef1e49c2..000000000000
--- a/lib/libc/ia64/gen/fpsetround.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2003 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$
- */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_rnd_t
-fpsetround(fp_rnd_t rnd)
-{
-	uint64_t fpsr;
-	fp_rnd_t prev;
-
-	__asm __volatile("mov %0=ar.fpsr" : "=r"(fpsr));
-	prev = (fp_rnd_t)((fpsr >> 10) & 3);
-	fpsr = (fpsr & ~0xC00ULL) | ((unsigned int)rnd << 10);
-	__asm __volatile("mov ar.fpsr=%0" :: "r"(fpsr));
-	return (prev);
-}
diff --git a/lib/libc/ia64/gen/getcontextx.c b/lib/libc/ia64/gen/getcontextx.c
deleted file mode 100644
index 54f851384811..000000000000
--- a/lib/libc/ia64/gen/getcontextx.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2011 Konstantin Belousov <kib@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/types.h>
-#include <sys/ucontext.h>
-#include <errno.h>
-#include <stdlib.h>
-
-int
-__getcontextx_size(void)
-{
-
-	return (sizeof(ucontext_t));
-}
-
-int
-__fillcontextx2(char *ctx)
-{
-
-	return (0);
-}
-
-int
-__fillcontextx(char *ctx)
-{
-	ucontext_t *ucp;
-
-	ucp = (ucontext_t *)ctx;
-	return (getcontext(ucp));
-}
-
-__weak_reference(__getcontextx, getcontextx);
-
-ucontext_t *
-__getcontextx(void)
-{
-	char *ctx;
-	int error;
-
-	ctx = malloc(__getcontextx_size());
-	if (ctx == NULL)
-		return (NULL);
-	if (__fillcontextx(ctx) == -1) {
-		error = errno;
-		free(ctx);
-		errno = error;
-		return (NULL);
-	}
-	return ((ucontext_t *)ctx);
-}
diff --git a/lib/libc/ia64/gen/infinity.c b/lib/libc/ia64/gen/infinity.c
deleted file mode 100644
index 1ae92a804d55..000000000000
--- a/lib/libc/ia64/gen/infinity.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: infinity.c,v 1.1 1995/02/10 17:50:23 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 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/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/endian.h>
-#include <math.h>
-
-/* bytes for +Infinity on an ia64 (IEEE double format) */
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-const union __infinity_un __infinity = { { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f } };
-#else /* _BIG_ENDIAN */
-const union __infinity_un __infinity = { { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 } };
-#endif
-
-/* bytes for NaN */
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-const union __nan_un __nan = { { 0, 0, 0xc0, 0xff } };
-#else /* _BIG_ENDIAN */
-const union __nan_un __nan = { { 0xff, 0xc0, 0, 0 } };
-#endif
diff --git a/lib/libc/ia64/gen/makecontext.c b/lib/libc/ia64/gen/makecontext.c
deleted file mode 100644
index bee47f11ce57..000000000000
--- a/lib/libc/ia64/gen/makecontext.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <machine/fpu.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-struct fdesc {
-	uint64_t ip;
-	uint64_t gp;
-};
-
-typedef void (*func_t)(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t,
-    uint64_t, uint64_t, uint64_t);
-
-static __inline uint64_t *
-spill(uint64_t *bsp, uint64_t arg)
-{
-	*bsp++ = arg;
-	if (((intptr_t)bsp & 0x1ff) == 0x1f8)
-		*bsp++ = 0;
-	return (bsp);
-}
-
-static void
-ctx_wrapper(ucontext_t *ucp, func_t func, uint64_t *args)
-{
-
-	(*func)(args[0], args[1], args[2], args[3], args[4], args[5], args[6],
-	    args[7]);
-	if (ucp->uc_link == NULL)
-		exit(0);
-	setcontext((const ucontext_t *)ucp->uc_link);
-	/* should never get here */
-	abort();
-	/* NOTREACHED */
-}
-
-__weak_reference(__makecontext, makecontext);
-
-void
-__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	uint64_t *args, *bsp;
-	va_list ap;
-	int i;
-
-	/*
-	 * Drop the ball completely if something's not right. We only
-	 * support general registers as arguments and not more than 8
-	 * of them. Things get hairy if we need to support FP registers
-	 * (alignment issues) or more than 8 arguments (stack based).
-	 */
-	if (argc < 0 || argc > 8 || ucp == NULL ||
-	    ucp->uc_stack.ss_sp == NULL || (ucp->uc_stack.ss_size & 15) ||
-	    ((intptr_t)ucp->uc_stack.ss_sp & 15) ||
-	    ucp->uc_stack.ss_size < MINSIGSTKSZ)
-		abort();
-
-	/*
-	 * Copy the arguments of function 'func' onto the (memory) stack.
-	 * Always take up space for 8 arguments.
-	 */
-	va_start(ap, argc);
-	args = (uint64_t*)(ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size) - 8;
-	i = 0;
-	while (i < argc)
-		args[i++] = va_arg(ap, uint64_t);
-	while (i < 8)
-		args[i++] = 0;
-	va_end(ap);
-
-	/*
-	 * Push (spill) the arguments of the context wrapper onto the register
-	 * stack. They get loaded by the RSE on a context switch.
-	 */
-	bsp = (uint64_t*)ucp->uc_stack.ss_sp;
-	bsp = spill(bsp, (intptr_t)ucp);
-	bsp = spill(bsp, (intptr_t)func);
-	bsp = spill(bsp, (intptr_t)args);
-
-	/*
-	 * Setup the MD portion of the context.
-	 */
-	memset(&ucp->uc_mcontext, 0, sizeof(ucp->uc_mcontext));
-	ucp->uc_mcontext.mc_special.sp = (intptr_t)args - 16;
-	ucp->uc_mcontext.mc_special.bspstore = (intptr_t)bsp;
-	ucp->uc_mcontext.mc_special.pfs = (3 << 7) | 3;
-	ucp->uc_mcontext.mc_special.rsc = 0xf;
-	ucp->uc_mcontext.mc_special.rp = ((struct fdesc*)ctx_wrapper)->ip;
-	ucp->uc_mcontext.mc_special.gp = ((struct fdesc*)ctx_wrapper)->gp;
-	ucp->uc_mcontext.mc_special.fpsr = IA64_FPSR_DEFAULT;
-}
diff --git a/lib/libc/ia64/gen/setjmp.S b/lib/libc/ia64/gen/setjmp.S
deleted file mode 100644
index a2b56d6af9f0..000000000000
--- a/lib/libc/ia64/gen/setjmp.S
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: setjmp.S,v 1.3 1997/12/05 02:06:27 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 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 <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#define     LOCORE
-#include    <machine/setjmp.h>
-
-/*
- * C library -- setjmp, longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	setjmp(a)
- * by restoring registers from the stack,
- * and the previous signal state.
- */
-
-ENTRY(setjmp, 1)
-	alloc	loc0=ar.pfs,1,2,3,0
-	mov	loc1=rp
-	;;
-	mov	out0=1				// how = SIG_BLOCK
-	mov	out1=0				// set = NULL
-	add	out2=J_SIGSET,in0		// oset = &jb[J_SIGSET]
-	br.call.sptk.few rp=__sys_sigprocmask
-	;;
-	mov	rp=loc1
-	mov	r14=loc0
-	;;
-	alloc	r15=ar.pfs,1,0,0,0		// drop register frame
-	;;
-	mov	ar.pfs=r14			// restore ar.pfs
-	br.sptk.many _setjmp			// finish saving state
-END(setjmp)
-
-	WEAK_ALIAS(longjmp,__longjmp)
-ENTRY(__longjmp, 2)
-	alloc	loc0=ar.pfs,2,2,3,0
-	mov	loc1=rp
-	;; 
-	mov	out0=3				// how = SIG_SETMASK
-	add	out1=J_SIGSET,in0		// set = &jb[J_SIGSET]
-	mov	out2=0				// oset = NULL
-	br.call.sptk.few rp=__sys_sigprocmask
-	;;
-	mov	rp=loc1
-	mov	r14=loc0
-	;;
-	alloc	r15=ar.pfs,2,0,0,0		// drop register frame
-	;;
-	mov	ar.pfs=r14			// restore ar.pfs
-	br.sptk.many _longjmp			// finish restoring state
-END(__longjmp)
diff --git a/lib/libc/ia64/gen/signalcontext.c b/lib/libc/ia64/gen/signalcontext.c
deleted file mode 100644
index b47daf37d9ea..000000000000
--- a/lib/libc/ia64/gen/signalcontext.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <machine/fpu.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-
-struct fdesc {
-	uint64_t ip;
-	uint64_t gp;
-};
-
-typedef void (*handler_t)(uint64_t, uint64_t, uint64_t);
-
-static __inline uint64_t *
-spill(uint64_t *bsp, uint64_t arg)
-{
-	*bsp++ = arg;
-	if (((intptr_t)bsp & 0x1ff) == 0x1f8)
-		*bsp++ = 0;
-	return (bsp);
-}
-
-static void
-ctx_wrapper(ucontext_t *ucp, handler_t func, uint64_t *args)
-{
-
-	(*func)(args[0], args[1], args[2]);
-	if (ucp->uc_link == NULL)
-		exit(0);
-	setcontext((const ucontext_t *)ucp->uc_link);
-	/* should never get here */
-	abort();
-	/* NOTREACHED */
-}
-
-__weak_reference(__signalcontext, signalcontext);
-
-int
-__signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func)
-{
-	uint64_t *args, *bsp;
-	siginfo_t *sig_si;
-	ucontext_t *sig_uc;
-	uint64_t sp;
-
-	/* Bail out if we don't have a valid ucontext pointer. */
-	if (ucp == NULL)
-		abort();
-
-	/*
-	 * Build a signal frame and copy the arguments of signal handler
-	 * 'func' onto the (memory) stack. We only need 3 arguments, but
-	 * we create room for 4 so that we are 16-byte aligned.
-	 */
-	sp = (ucp->uc_mcontext.mc_special.sp - sizeof(ucontext_t)) & ~15UL;
-	sig_uc = (ucontext_t*)sp;
-	bcopy(ucp, sig_uc, sizeof(*sig_uc));
-	sp = (sp - sizeof(siginfo_t)) & ~15UL;
-	sig_si = (siginfo_t*)sp;
-	bzero(sig_si, sizeof(*sig_si));
-	sig_si->si_signo = sig;
-	sp -= 4 * sizeof(uint64_t);
-	args = (uint64_t*)sp;
-	args[0] = sig;
-	args[1] = (intptr_t)sig_si;
-	args[2] = (intptr_t)sig_uc;
-
-	/*
-	 * Push (spill) the arguments of the context wrapper onto the register
-	 * stack. They get loaded by the RSE on a context switch.
-	 */
-	bsp = (uint64_t*)ucp->uc_mcontext.mc_special.bspstore;
-	bsp = spill(bsp, (intptr_t)ucp);
-	bsp = spill(bsp, (intptr_t)func);
-	bsp = spill(bsp, (intptr_t)args);
-
-	/*
-	 * Setup the ucontext of the signal handler.
-	 */
-	memset(&ucp->uc_mcontext, 0, sizeof(ucp->uc_mcontext));
-	ucp->uc_link = sig_uc;
-	sigdelset(&ucp->uc_sigmask, sig);
-	ucp->uc_mcontext.mc_special.sp = (intptr_t)args - 16;
-	ucp->uc_mcontext.mc_special.bspstore = (intptr_t)bsp;
-	ucp->uc_mcontext.mc_special.pfs = (3 << 7) | 3;
-	ucp->uc_mcontext.mc_special.rsc = 0xf;
-	ucp->uc_mcontext.mc_special.rp = ((struct fdesc*)ctx_wrapper)->ip;
-	ucp->uc_mcontext.mc_special.gp = ((struct fdesc*)ctx_wrapper)->gp;
-	ucp->uc_mcontext.mc_special.fpsr = IA64_FPSR_DEFAULT;
-	return (0);
-}
diff --git a/lib/libc/ia64/gen/sigsetjmp.S b/lib/libc/ia64/gen/sigsetjmp.S
deleted file mode 100644
index 9f02a26a5a7a..000000000000
--- a/lib/libc/ia64/gen/sigsetjmp.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: sigsetjmp.S,v 1.2 1996/10/17 03:08:07 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 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 <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#define LOCORE
-#include <machine/setjmp.h>
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *	siglongjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	sigsetjmp(a, mask)
- * by restoring registers from the stack.
- * If `mask' is non-zero, the previous signal
- * state will be restored.
- */
-
-ENTRY(sigsetjmp, 2)
-	add	r14=J_SIGMASK,in0		// place to save mask
-	cmp.ne	p6,p7=0,in1			// save signal state?
-	;;
-	st8	[r14]=in1			// save mask value
-(p6)	br.cond.dptk.many setjmp
-(p7)	br.cond.dpnt.many _setjmp		
-END(sigsetjmp)
-
-	WEAK_ALIAS(siglongjmp,__siglongjmp)
-ENTRY(__siglongjmp, 2)
-	add	r14=J_SIGMASK,in0		// address of mask value
-	;;
-	ld8	r14=[r14]
-	;;
-	cmp.ne	p6,p7=0,r14			// did we save signals?
-(p6)	br.cond.dptk.many longjmp
-(p7)	br.cond.dpnt.many _longjmp		
-END(__siglongjmp)
diff --git a/lib/libc/ia64/gen/unwind.c b/lib/libc/ia64/gen/unwind.c
deleted file mode 100644
index 7afd0eff496e..000000000000
--- a/lib/libc/ia64/gen/unwind.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2002 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$
- */
-
-#include <sys/types.h>
-
-#include <assert.h>
-#include <dlfcn.h>
-#include <stdlib.h>
-
-#include <machine/elf.h>
-
-#ifndef PT_IA_64_UNWIND
-#define PT_IA_64_UNWIND         0x70000001
-#endif
-
-#define	SANITY	0
-
-struct ia64_unwind_entry
-{
-	Elf64_Addr start;
-	Elf64_Addr end;
-	Elf64_Addr descr;
-};
-
-struct ia64_unwind_entry *
-_Unwind_FindTableEntry(const void *pc, unsigned long *pseg, unsigned long *pgp)
-{
-	Dl_info info;
-	Elf_Dyn *dyn;
-	Elf_Ehdr *ehdr;
-	Elf_Phdr *phdr;
-	char *p, *p_top;
-	struct ia64_unwind_entry *unw, *res;
-	register unsigned long gp __asm__("gp");	/* XXX assumes gcc */
-	unsigned long reloc, vaddr;
-	size_t l, m, r;
-
-	if (!dladdr(pc, &info))
-		return NULL;
-
-	ehdr = (Elf_Ehdr*)info.dli_fbase;
-
-#if SANITY
-	assert(IS_ELF(*ehdr));
-	assert(ehdr->e_ident[EI_CLASS] == ELFCLASS64);
-	assert(ehdr->e_ident[EI_DATA] == ELFDATA2LSB);
-	assert(ehdr->e_machine == EM_IA_64);
-#endif
-
-	reloc = (ehdr->e_type == ET_DYN) ? (uintptr_t)info.dli_fbase : 0;
-	*pgp = gp;
-	*pseg = 0UL;
-	res = NULL;
-
-	p = (char*)info.dli_fbase + ehdr->e_phoff;
-	p_top = p + ehdr->e_phnum * ehdr->e_phentsize;
-	while (p < p_top) {
-		phdr = (Elf_Phdr*)p;
-		vaddr = phdr->p_vaddr + reloc;
-
-		switch (phdr->p_type) {
-		case PT_DYNAMIC:
-			dyn = (Elf_Dyn*)vaddr;
-			while (dyn->d_tag != DT_NULL) {
-				if (dyn->d_tag == DT_PLTGOT) {
-					*pgp = dyn->d_un.d_ptr + reloc;
-					break;
-				}
-				dyn++;
-			}
-			break;
-		case PT_LOAD:
-			if (pc >= (void*)vaddr &&
-			    pc < (void*)(vaddr + phdr->p_memsz))
-				*pseg = vaddr;
-			break;
-		case PT_IA_64_UNWIND:
-#if SANITY
-			assert(*pseg != 0UL);
-			assert(res == NULL);
-#endif
-			unw = (struct ia64_unwind_entry*)vaddr;
-			l = 0;
-			r = phdr->p_memsz / sizeof(struct ia64_unwind_entry);
-			while (l < r) {
-				m = (l + r) >> 1;
-				res = unw + m;
-				if (pc < (void*)(res->start + *pseg))
-					r = m;
-				else if (pc >= (void*)(res->end + *pseg))
-					l = m + 1;
-				else
-					break;	/* found */
-			}
-			if (l >= r)
-				res = NULL;
-			break;
-		}
-
-		p += ehdr->e_phentsize;
-	}
-
-	return res;
-}
diff --git a/lib/libc/ia64/string/Makefile.inc b/lib/libc/ia64/string/Makefile.inc
deleted file mode 100644
index 7bbcc8de10e9..000000000000
--- a/lib/libc/ia64/string/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-MDSRCS+=	bcopy.S bzero.S ffs.S memcpy.S memmove.S
diff --git a/lib/libc/ia64/string/bcopy.S b/lib/libc/ia64/string/bcopy.S
deleted file mode 100644
index 34aac1984cf4..000000000000
--- a/lib/libc/ia64/string/bcopy.S
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * Not the fastest bcopy in the world.
- */
-ENTRY(bcopy, 3)
-
-	cmp.le	p6,p0=in2,r0			// bail if len <= 0
-(p6)	br.ret.spnt.few rp
-
-	sub	r14=in1,in0 ;;			// check for overlap
-	cmp.ltu	p6,p0=r14,in2			// dst-src < len
-(p6)	br.cond.spnt.few 5f
-
-	extr.u	r14=in0,0,3			// src & 7
-	extr.u	r15=in1,0,3 ;;			// dst & 7
-	cmp.eq	p6,p0=r14,r15			// different alignment?
-(p6)	br.cond.spnt.few 2f			// branch if same alignment
-
-1:	ld1	r14=[in0],1 ;;			// copy bytewise
-	st1	[in1]=r14,1
-	add	in2=-1,in2 ;;			// len--
-	cmp.ne	p6,p0=r0,in2
-(p6)	br.cond.dptk.few 1b			// loop
-	br.ret.sptk.few rp			// done
-
-2:	cmp.eq	p6,p0=r14,r0			// aligned?
-(p6)	br.cond.sptk.few 4f
-
-3:	ld1	r14=[in0],1 ;;			// copy bytewise
-	st1	[in1]=r14,1
-	extr.u	r15=in0,0,3			// src & 7
-	add	in2=-1,in2 ;;			// len--
-	cmp.eq	p6,p0=r0,in2			// done?
-	cmp.eq	p7,p0=r0,r15 ;;			// aligned now?
-(p6)	br.ret.spnt.few rp			// return if done
-(p7)	br.cond.spnt.few 4f			// go to main copy
-	br.cond.sptk.few 3b			// more bytes to copy
-
-	// At this point, in2 is non-zero
-
-4:	mov	r14=8 ;;
-	cmp.ltu	p6,p0=in2,r14 ;;		// len < 8?
-(p6)	br.cond.spnt.few 1b			// byte copy the end
-	ld8	r15=[in0],8 ;;			// copy word
-	st8	[in1]=r15,8
-	add	in2=-8,in2 ;;			// len -= 8
-	cmp.ne	p6,p0=r0,in2			// done?
-(p6)	br.cond.spnt.few 4b			// again
-
-	br.ret.sptk.few rp			// return
-
-	// Don't bother optimising overlap case
-
-5:	add	in0=in0,in2
-	add	in1=in1,in2 ;;
-	add	in0=-1,in0
-	add	in1=-1,in1 ;;
-
-6:	ld1	r14=[in0],-1 ;;
-	st1	[in1]=r14,-1
-	add	in2=-1,in2 ;;
-	cmp.ne	p6,p0=r0,in2
-(p6)	br.cond.spnt.few 6b
-
-	br.ret.sptk.few rp
-
-END(bcopy)
diff --git a/lib/libc/ia64/string/bzero.S b/lib/libc/ia64/string/bzero.S
deleted file mode 100644
index 0963c36aac80..000000000000
--- a/lib/libc/ia64/string/bzero.S
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-ENTRY(bzero, 2)
-	
-	cmp.le	p6,p0=in1,r0			// bail if len <= 0
-(p6)	br.ret.spnt.few rp
-	;; 
-	mov	r14=ar.lc			// save ar.lc
-
-	cmp.ltu	p6,p0=17,in1			// check for small
-(p6)	br.dptk.few 3f	
-
-1:	add	r15=-1,in1 ;;
-	mov	ar.lc=r15 ;;
-2:	st1	[in0]=r0,1			// zero one byte
-	br.cloop.sptk.few 2b			// loop
-
-	;;
-	mov	ar.lc=r14			// done
-	br.ret.sptk.few rp
-
-	// Zero up to 8byte alignment
-	
-3:	tbit.nz	p6,p0=in0,0 ;;
-(p6)	st1	[in0]=r0,1
-(p6)	add	in1=-1,in1 ;;
-
-	tbit.nz	p6,p0=in0,1 ;;
-(p6)	st2	[in0]=r0,2
-(p6)	add	in1=-2,in1 ;;
-
-	tbit.nz	p6,p0=in0,2 ;;
-(p6)	st4	[in0]=r0,4
-(p6)	add	in1=-4,in1
-
-	;;
-	shr.u	r15=in1,3			// word count
-	extr.u	in1=in1,0,3 ;;			// trailing bytes
-	cmp.eq	p6,p0=r15,r0			// check for zero
-	cmp.ne	p7,p0=in1,r0
-(p6)	br.dpnt.few 1b				// zero last bytes
-
-	add	r15=-1,r15 ;;
-	mov	ar.lc=r15 ;;
-4:	st8	[in0]=r0,8
-	br.cloop.sptk.few 4b 
-
-(p7)	br.dpnt.few 1b				// zero last bytes
-
-	;;
-	mov	ar.lc=r14			// done
-	br.ret.sptk.few rp
-
-END(bzero)
diff --git a/lib/libc/ia64/string/ffs.S b/lib/libc/ia64/string/ffs.S
deleted file mode 100644
index d99d76581341..000000000000
--- a/lib/libc/ia64/string/ffs.S
+++ /dev/null
@@ -1,99 +0,0 @@
-/*	$NetBSD: ffs.S,v 1.3 1996/10/17 03:08:13 cgd Exp $	*/
-
-/*
- * Copyright (c) 1995 Christopher G. Demetriou
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Christopher G. Demetriou
- *	for the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-ENTRY(ffs, 1)
-	sxt4	r14=in0 ;;
-	cmp.eq	p6,p0=r14,r0
-(p6)	br.dpnt.few Lallzero
-	
-	/*
-	 * Initialize return value (ret0), and set up r15 so that it
-	 * contains the mask with only the lowest bit set.
-	 */
-	sub	r15=r0,r14
-	mov	ret0=1 ;;
-	and	r15=r14,r15 ;;
-
-	extr.u	r16=r15,0,8 ;;
-	cmp.ne	p6,p0=r0,r16
-(p6)	br.dptk.few Ldo8
-
-	/*
-	 * If lower 16 bits empty, add 16 to result and use upper 16.
-	 */
-	extr.u	r16=r15,0,16 ;;
-	cmp.ne	p6,p0=r0,r16
-(p6)	br.dptk.few Ldo16
-	extr.u	r15=r15,16,16
-	add	ret0=16,ret0 ;;
-	
-Ldo16:
-	/*
-	 * If lower 8 bits empty, add 8 to result and use upper 8.
-	 */
-	extr.u	r16=r15,0,8 ;;
-	cmp.ne	p6,p0=r0,r16
-(p6)	br.dptk.few Ldo8
-	extr.u	r15=r15,8,24
-	add	ret0=8,ret0 ;;
-
-Ldo8:
-	and	r16=0x0f,r15		/* lower 4 of 8 empty? */
-	and	r17=0x33,r15		/* lower 2 of each 4 empty? */
-	and	r18=0x55,r15 ;;		/* lower 1 of each 2 empty? */
-	cmp.ne	p6,p0=r16,r0
-	cmp.ne	p7,p0=r17,r0
-	cmp.ne	p8,p0=r18,r0
-
-	/* If lower 4 bits empty, add 4 to result. */
-(p6)	br.dptk.few Ldo4
-	add	ret0=4,ret0 ;;
-
-Ldo4:	/* If lower 2 bits of each 4 empty, add 2 to result. */
-(p7)	br.dptk.few Ldo2
-	add	ret0=2,ret0 ;;
-
-Ldo2:	/* If lower bit of each 2 empty, add 1 to result. */
-(p8)	br.dptk.few Ldone
-	add	ret0=1,ret0
-
-Ldone:
-	br.ret.sptk.few rp
-
-Lallzero:
-	mov	ret0=0
-	br.ret.sptk.few rp
-END(ffs)
diff --git a/lib/libc/ia64/string/memcpy.S b/lib/libc/ia64/string/memcpy.S
deleted file mode 100644
index d7557c1f039f..000000000000
--- a/lib/libc/ia64/string/memcpy.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-ENTRY(memcpy,3)
-	mov	r8 = in0
-	mov	in0 = in1
-	;;
-	mov	in1 = r8
-	br.sptk.few bcopy
-END(memcpy)
diff --git a/lib/libc/ia64/string/memmove.S b/lib/libc/ia64/string/memmove.S
deleted file mode 100644
index 19fa8affc399..000000000000
--- a/lib/libc/ia64/string/memmove.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-ENTRY(memmove,3)
-	mov	r8 = in0
-	mov	in0 = in1
-	;;
-	mov	in1 = r8
-	br.sptk.few bcopy
-END(memmove)
diff --git a/lib/libc/ia64/sys/Makefile.inc b/lib/libc/ia64/sys/Makefile.inc
deleted file mode 100644
index b3bacd4cd65e..000000000000
--- a/lib/libc/ia64/sys/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-SRCS+=	__vdso_gettc.c
-
-MDASM+=	Ovfork.S brk.S cerror.S exect.S fork.S getcontext.S pipe.S ptrace.S \
-	sbrk.S setlogin.S sigreturn.S swapcontext.S
-
-# Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
-
-PSEUDO=	_getlogin.o _exit.o
-.if ${MK_SYSCALL_COMPAT} != "no"
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif
diff --git a/lib/libc/ia64/sys/Ovfork.S b/lib/libc/ia64/sys/Ovfork.S
deleted file mode 100644
index 6eb69583f7e9..000000000000
--- a/lib/libc/ia64/sys/Ovfork.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
-SYSCALL(vfork)
-	cmp.ne	p7,p0=ret1,r0		/* ret1!=0 for child */
-	;;
-(p7)	mov	ret0=r0
-	br.ret.sptk.few rp
-END(__sys_vfork)
diff --git a/lib/libc/ia64/sys/__vdso_gettc.c b/lib/libc/ia64/sys/__vdso_gettc.c
deleted file mode 100644
index b99bbc4f3d0f..000000000000
--- a/lib/libc/ia64/sys/__vdso_gettc.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2013 Konstantin Belousov <kib@FreeBSD.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/vdso.h>
-#include <errno.h>
-
-#pragma weak __vdso_gettc
-u_int
-__vdso_gettc(const struct vdso_timehands *th)
-{
-
-	return (0);
-}
-
-#pragma weak __vdso_gettimekeep
-int
-__vdso_gettimekeep(struct vdso_timekeep **tk)
-{
-
-	return (ENOSYS);
-}
diff --git a/lib/libc/ia64/sys/brk.S b/lib/libc/ia64/sys/brk.S
deleted file mode 100644
index fee1728bc0da..000000000000
--- a/lib/libc/ia64/sys/brk.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: brk.S,v 1.4 1996/10/17 03:08:15 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 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 <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
-	.globl	_end
-IMPORT(curbrk, 8)
-
-	.data
-EXPORT(minbrk)
-	.quad	_end
-
-	.text
-ENTRY(brk, 1)
-	add	r14=@ltoff(minbrk),gp ;;
-	ld8	r14=[r14] ;;
-	ld8	r14=[r14] ;;
-	cmp.ltu	p6,p0=r32,r14 ;;
-(p6)	mov	r32=r14 ;;
-	st8	[sp]=r32
-	CALLSYS_ERROR(break)
-	ld8	r15=[sp]
-	add	r14=@ltoff(curbrk),gp ;;
-	ld8	r14=[r14] ;;
-	st8	[r14]=r15
-	mov	ret0=0
-	br.ret.sptk.few rp
-END(brk)
diff --git a/lib/libc/ia64/sys/cerror.S b/lib/libc/ia64/sys/cerror.S
deleted file mode 100644
index ca0b0c735b1b..000000000000
--- a/lib/libc/ia64/sys/cerror.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-
-ENTRY(.cerror, 0)
-	alloc	loc0=ar.pfs,0,3,1,0
-	;;
-	mov	loc1=rp
-	mov	loc2=ret0
-	mov	out0=ret0
-	;;
-	br.call.sptk.few rp=__error
-	st4	[ret0]=loc2
-	;;
-	mov	ret0=-1
-	mov	ar.pfs=loc0
-	mov	rp=loc1
-	;;
-	br.ret.sptk.few rp
-END(.cerror)
diff --git a/lib/libc/ia64/sys/exect.S b/lib/libc/ia64/sys/exect.S
deleted file mode 100644
index 817d3b1b3848..000000000000
--- a/lib/libc/ia64/sys/exect.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: exect.S,v 1.2 1996/10/17 03:08:18 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 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 <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
-ENTRY(exect, 3)
-	CALLSYS_ERROR(execve)
-	br.ret.sptk.few rp
-END(exect)
diff --git a/lib/libc/ia64/sys/fork.S b/lib/libc/ia64/sys/fork.S
deleted file mode 100644
index 5b09f7711820..000000000000
--- a/lib/libc/ia64/sys/fork.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
-SYSCALL(fork)
-	cmp.ne	p7,p0=ret1,r0		/* ret1!=0 for child */
-	;;
-(p7)	mov	ret0=r0
-	br.ret.sptk.few rp
-END(__sys_fork)
diff --git a/lib/libc/ia64/sys/getcontext.S b/lib/libc/ia64/sys/getcontext.S
deleted file mode 100644
index 0ec6f92e4f85..000000000000
--- a/lib/libc/ia64/sys/getcontext.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2003 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
-ENTRY(__sys_getcontext,2)
-	WEAK_ALIAS(getcontext, __sys_getcontext)
-	WEAK_ALIAS(_getcontext, __sys_getcontext)
-	flushrs
-	;;
-	CALLSYS_ERROR(getcontext)
-	br.ret.sptk.few rp
-END(__sys_getcontext)
diff --git a/lib/libc/ia64/sys/pipe.S b/lib/libc/ia64/sys/pipe.S
deleted file mode 100644
index a6413dfd464b..000000000000
--- a/lib/libc/ia64/sys/pipe.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.1 1995/02/10 17:50:35 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 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 <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
-ENTRY(__sys_pipe, 1)
-	WEAK_ALIAS(pipe, __sys_pipe)
-	WEAK_ALIAS(_pipe, __sys_pipe)
-	st8		[sp]=r32
-	CALLSYS_ERROR(pipe)
-	ld8		r14=[sp]
-	;;
-	st4		[r14]=ret0,4
-	;;
-	st4		[r14]=ret1
-	mov		ret0=0
-	br.ret.sptk.few rp
-END(__sys_pipe)
diff --git a/lib/libc/ia64/sys/ptrace.S b/lib/libc/ia64/sys/ptrace.S
deleted file mode 100644
index b6d3abdedda9..000000000000
--- a/lib/libc/ia64/sys/ptrace.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.4 1996/11/08 00:51:24 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 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 <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
-ENTRY(ptrace, 4)
-	add	r14=@ltoff(errno),gp ;;
-	ld8	r14=[r14] ;;
-	st4	[r14]=r0
-	CALLSYS_ERROR(ptrace)
-	br.ret.sptk.few rp
-END(ptrace)
diff --git a/lib/libc/ia64/sys/sbrk.S b/lib/libc/ia64/sys/sbrk.S
deleted file mode 100644
index 98b5ce92c21f..000000000000
--- a/lib/libc/ia64/sys/sbrk.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.4 1996/10/17 03:08:20 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 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 <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
-	.globl	_end
-
-	.data
-EXPORT(curbrk)
-	.quad	_end
-
-	.text
-ENTRY(sbrk, 1)
-	add	r14 = @ltoff(curbrk), gp
-	;;
-	ld8	r14 = [r14]
-	cmp.eq	p6, p0 = r32, r0
-	;;
-	ld8	ret0 = [r14]
-(p6)	br.ret.sptk.few	rp
-	;;
-	add	r32 = ret0, r32
-	;;
-	st8	[sp] = r32
-	CALLSYS_ERROR(break)
-	ld8	r15 = [sp]
-	add	r14 = @ltoff(curbrk), gp
-	;;
-	ld8	r14 = [r14]
-	;;
-	ld8	ret0 = [r14]
-	st8	[r14] = r15
-	br.ret.sptk.few	rp
-END(sbrk)
diff --git a/lib/libc/ia64/sys/setlogin.S b/lib/libc/ia64/sys/setlogin.S
deleted file mode 100644
index 1d29a40664a3..000000000000
--- a/lib/libc/ia64/sys/setlogin.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: setlogin.S,v 1.1 1995/02/10 17:50:39 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 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 <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
-IMPORT(_logname_valid, 4)			/* in getlogin() */
-
-SYSCALL(setlogin)
-	add	r14=@ltoff(_logname_valid),gp ;;
-	ld8	r14=[r14] ;;
-	st4	[r14]=r0			/* clear it */
-	br.ret.sptk.few rp
-END(__sys_setlogin)
diff --git a/lib/libc/ia64/sys/sigreturn.S b/lib/libc/ia64/sys/sigreturn.S
deleted file mode 100644
index 2c7a710a1461..000000000000
--- a/lib/libc/ia64/sys/sigreturn.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/*	$NetBSD: sigreturn.S,v 1.1 1995/02/10 17:50:42 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 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 <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- * However, that doesn't involve any special work on the ia64.
- * (XXX PROFILING)
- */
-
-RSYSCALL(sigreturn)
diff --git a/lib/libc/ia64/sys/swapcontext.S b/lib/libc/ia64/sys/swapcontext.S
deleted file mode 100644
index 210189f6ff4f..000000000000
--- a/lib/libc/ia64/sys/swapcontext.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2003 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "SYS.h"
-
-ENTRY(__sys_swapcontext,2)
-	WEAK_ALIAS(swapcontext, __sys_swapcontext)
-	WEAK_ALIAS(_swapcontext, __sys_swapcontext)
-	flushrs
-	;;
-	CALLSYS_ERROR(swapcontext)
-	br.ret.sptk.few rp
-END(__sys_swapcontext)
diff --git a/lib/libc/iconv/__iconv_get_list.3 b/lib/libc/iconv/__iconv_get_list.3
index 4db88d8faa61..076f4d5b6a1d 100644
--- a/lib/libc/iconv/__iconv_get_list.3
+++ b/lib/libc/iconv/__iconv_get_list.3
@@ -92,4 +92,4 @@ The iconv implementation of the Citrus Project was adopted in
 .Fx 9.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
diff --git a/lib/libc/iconv/bsd_iconv.c b/lib/libc/iconv/bsd_iconv.c
index 40a1a4e88909..f764886d7851 100644
--- a/lib/libc/iconv/bsd_iconv.c
+++ b/lib/libc/iconv/bsd_iconv.c
@@ -83,6 +83,7 @@ __bsd___iconv_open(const char *out, const char *in, struct _citrus_iconv *handle
 	}
 
 	handle->cv_shared->ci_discard_ilseq = strcasestr(out, "//IGNORE");
+	handle->cv_shared->ci_ilseq_invalid = false;
 	handle->cv_shared->ci_hooks = NULL;
 
 	return ((iconv_t)(void *)handle);
@@ -223,7 +224,7 @@ __bsd_iconvlist(int (*do_one) (unsigned int, const char * const *,
 			return;
 		}
 		strlcpy(curkey, list[i], slashpos - list[i] + 1);
-		names[j++] = strdup(curkey);
+		names[j++] = curkey;
 		for (; (i < sz) && (memcmp(curkey, list[i], strlen(curkey)) == 0); i++) {
 			slashpos = strchr(list[i], '/');
 			curitem = (char *)malloc(strlen(slashpos) + 1);
@@ -235,7 +236,7 @@ __bsd_iconvlist(int (*do_one) (unsigned int, const char * const *,
 			if (strcmp(curkey, curitem) == 0) {
 				continue;
 			}
-			names[j++] = strdup(curitem);
+			names[j++] = curitem;
 		}
 		np = (const char * const *)names;
 		do_one(j, np, data);
diff --git a/lib/libc/iconv/citrus_db_factory.c b/lib/libc/iconv/citrus_db_factory.c
index e9823ab04393..691fe4e84351 100644
--- a/lib/libc/iconv/citrus_db_factory.c
+++ b/lib/libc/iconv/citrus_db_factory.c
@@ -270,11 +270,9 @@ _citrus_db_factory_serialize(struct _citrus_db_factory *df, const char *magic,
 		return (0);
 	}
 	/* allocate hash table */
-	depp = malloc(sizeof(*depp) * df->df_num_entries);
+	depp = calloc(df->df_num_entries, sizeof(*depp));
 	if (depp == NULL)
 		return (-1);
-	for (i = 0; i < df->df_num_entries; i++)
-		depp[i] = NULL;
 
 	/* step1: store the entries which are not conflicting */
 	STAILQ_FOREACH(de, &df->df_entries, de_entry) {
diff --git a/lib/libc/iconv/citrus_iconv.c b/lib/libc/iconv/citrus_iconv.c
index df2ed73ffc7f..5c8bf4923668 100644
--- a/lib/libc/iconv/citrus_iconv.c
+++ b/lib/libc/iconv/citrus_iconv.c
@@ -344,9 +344,8 @@ const char
 {
 	char *buf;
 
-	if ((buf = malloc((size_t)PATH_MAX)) == NULL)
+	if ((buf = calloc((size_t)PATH_MAX, sizeof(*buf))) == NULL)
 		return (NULL);
-	memset((void *)buf, 0, (size_t)PATH_MAX);
 	_citrus_esdb_alias(name, buf, (size_t)PATH_MAX);
 	return (buf);
 }
diff --git a/lib/libc/iconv/iconv.3 b/lib/libc/iconv/iconv.3
index 939d4420a153..6692c47d4f7d 100644
--- a/lib/libc/iconv/iconv.3
+++ b/lib/libc/iconv/iconv.3
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd June 16, 2010
+.Dd August 4, 2014
 .Dt ICONV 3
 .Os
 .Sh NAME
@@ -285,7 +285,11 @@ terminates with an incomplete character or shift sequence.
 .Sh SEE ALSO
 .Xr iconv 1 ,
 .Xr mkcsmapper 1 ,
-.Xr mkesdb 1
+.Xr mkesdb 1 ,
+.Xr __iconv_get_list 3 ,
+.Xr iconv_canonicalize 3 ,
+.Xr iconvctl 3 ,
+.Xr iconvlist 3
 .Sh STANDARDS
 The
 .Fn iconv_open ,
diff --git a/lib/libc/iconv/iconv_canonicalize.3 b/lib/libc/iconv/iconv_canonicalize.3
index a5d3e7716623..d98235aabbfd 100644
--- a/lib/libc/iconv/iconv_canonicalize.3
+++ b/lib/libc/iconv/iconv_canonicalize.3
@@ -71,4 +71,4 @@ the GNU implementation and was adopted in
 for compatibility's sake.
 .Sh AUTHORS
 This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
diff --git a/lib/libc/iconv/iconvctl.3 b/lib/libc/iconv/iconvctl.3
index 5728ad3ee5e8..d6bc67f9b98d 100644
--- a/lib/libc/iconv/iconvctl.3
+++ b/lib/libc/iconv/iconvctl.3
@@ -179,7 +179,7 @@ the GNU implementation and was adopted in
 for compatibility's sake.
 .Sh AUTHORS
 This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
 .Sh BUGS
 Transliteration is enabled in this implementation by default, so it
 is impossible by design to turn it off.
diff --git a/lib/libc/iconv/iconvlist.3 b/lib/libc/iconv/iconvlist.3
index ff9ea6b3f0f3..bef609b31362 100644
--- a/lib/libc/iconv/iconvlist.3
+++ b/lib/libc/iconv/iconvlist.3
@@ -90,4 +90,4 @@ the GNU implementation and was adopted in
 for compatibility's sake.
 .Sh AUTHORS
 This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
diff --git a/lib/libc/include/isc/eventlib.h b/lib/libc/include/isc/eventlib.h
index 50038231c852..a4cfdf909226 100644
--- a/lib/libc/include/isc/eventlib.h
+++ b/lib/libc/include/isc/eventlib.h
@@ -1,24 +1,24 @@
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995-1999 by Internet Software Consortium
+ * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1995-1999, 2001, 2003  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or 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 ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC 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.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC 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.
  */
 
 /* eventlib.h - exported interfaces for eventlib
  * vix 09sep95 [initial]
  *
- * $Id: eventlib.h,v 1.3.18.3 2008/01/23 02:12:01 marka Exp $
+ * $Id: eventlib.h,v 1.7 2008/11/14 02:36:51 marka Exp $
  */
 
 #ifndef _EVENTLIB_H
diff --git a/lib/libc/include/isc/list.h b/lib/libc/include/isc/list.h
index fef631b4c9ca..ffd0c511d763 100644
--- a/lib/libc/include/isc/list.h
+++ b/lib/libc/include/isc/list.h
@@ -38,7 +38,8 @@
 	} while (0)
 #define INIT_LINK(elt, link) \
 	INIT_LINK_TYPE(elt, link, void)
-#define LINKED(elt, link) ((void *)((elt)->link.prev) != (void *)(-1))
+#define LINKED(elt, link) ((void *)((elt)->link.prev) != (void *)(-1) && \
+			   (void *)((elt)->link.next) != (void *)(-1))
 
 #define HEAD(list) ((list).head)
 #define TAIL(list) ((list).tail)
diff --git a/lib/libc/include/port_before.h b/lib/libc/include/port_before.h
index 9e7525b59b54..430d23363c87 100644
--- a/lib/libc/include/port_before.h
+++ b/lib/libc/include/port_before.h
@@ -6,6 +6,7 @@
 #define _LIBC		1
 #define DO_PTHREADS	1
 #define USE_POLL	1
+#define HAVE_MD5	1
 
 #define ISC_SOCKLEN_T	socklen_t
 #define ISC_FORMAT_PRINTF(fmt, args) \
diff --git a/lib/libc/inet/inet_addr.c b/lib/libc/inet/inet_addr.c
index e606d345b8b1..9744fb663ea8 100644
--- a/lib/libc/inet/inet_addr.c
+++ b/lib/libc/inet/inet_addr.c
@@ -66,7 +66,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static const char rcsid[] = "$Id: inet_addr.c,v 1.4.18.1 2005/04/27 05:00:52 sra Exp $";
+static const char rcsid[] = "$Id: inet_addr.c,v 1.5 2005/04/27 04:56:19 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/inet/inet_cidr_ntop.c b/lib/libc/inet/inet_cidr_ntop.c
index 645b3cd500ed..33d8ea114202 100644
--- a/lib/libc/inet/inet_cidr_ntop.c
+++ b/lib/libc/inet/inet_cidr_ntop.c
@@ -16,8 +16,10 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.4.18.3 2006/10/11 02:32:47 marka Exp $";
+static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.7 2006/10/11 02:18:18 marka Exp $";
 #endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
diff --git a/lib/libc/inet/inet_cidr_pton.c b/lib/libc/inet/inet_cidr_pton.c
index b0586ff30ffa..a6a5c7d94488 100644
--- a/lib/libc/inet/inet_cidr_pton.c
+++ b/lib/libc/inet/inet_cidr_pton.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_cidr_pton.c,v 1.5.18.1 2005/04/27 05:00:53 sra Exp $";
+static const char rcsid[] = "$Id: inet_cidr_pton.c,v 1.6 2005/04/27 04:56:19 sra Exp $";
 #endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/inet/inet_net_ntop.c b/lib/libc/inet/inet_net_ntop.c
index 867f441af4b0..da7af33e2a21 100644
--- a/lib/libc/inet/inet_net_ntop.c
+++ b/lib/libc/inet/inet_net_ntop.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.3.18.2 2006/06/20 02:51:32 marka Exp $";
+static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.5 2006/06/20 02:50:14 marka Exp $";
 #endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/inet/inet_net_pton.c b/lib/libc/inet/inet_net_pton.c
index 74df38b95d68..fa187591f09b 100644
--- a/lib/libc/inet/inet_net_pton.c
+++ b/lib/libc/inet/inet_net_pton.c
@@ -1,22 +1,22 @@
 /*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
+ * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1996, 1998, 1999, 2001, 2003  Internet Software Consortium.
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or 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 ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC 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.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7.18.2 2008/08/26 04:42:43 marka Exp $";
+static const char rcsid[] = "$Id: inet_net_pton.c,v 1.10 2008/11/14 02:36:51 marka Exp $";
 #endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/inet/inet_neta.c b/lib/libc/inet/inet_neta.c
index 72ac549ffe16..01ad3be44a4a 100644
--- a/lib/libc/inet/inet_neta.c
+++ b/lib/libc/inet/inet_neta.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_neta.c,v 1.2.18.1 2005/04/27 05:00:53 sra Exp $";
+static const char rcsid[] = "$Id: inet_neta.c,v 1.3 2005/04/27 04:56:20 sra Exp $";
 #endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/inet/inet_ntoa.c b/lib/libc/inet/inet_ntoa.c
index f5d69fac583c..d8afd0d57c34 100644
--- a/lib/libc/inet/inet_ntoa.c
+++ b/lib/libc/inet/inet_ntoa.c
@@ -29,7 +29,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: inet_ntoa.c,v 1.1.352.1 2005/04/27 05:00:54 sra Exp $";
+static const char rcsid[] = "$Id: inet_ntoa.c,v 1.2 2005/04/27 04:56:21 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/inet/inet_ntop.c b/lib/libc/inet/inet_ntop.c
index d57e6abbdbfd..ac5ebc4e4e33 100644
--- a/lib/libc/inet/inet_ntop.c
+++ b/lib/libc/inet/inet_ntop.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_ntop.c,v 1.3.18.2 2005/11/03 23:02:22 marka Exp $";
+static const char rcsid[] = "$Id: inet_ntop.c,v 1.5 2005/11/03 22:59:52 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/inet/inet_pton.c b/lib/libc/inet/inet_pton.c
index ae6509900002..04b515f42abf 100644
--- a/lib/libc/inet/inet_pton.c
+++ b/lib/libc/inet/inet_pton.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_pton.c,v 1.3.18.2 2005/07/28 07:38:07 marka Exp $";
+static const char rcsid[] = "$Id: inet_pton.c,v 1.5 2005/07/28 06:51:47 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/inet/nsap_addr.c b/lib/libc/inet/nsap_addr.c
index 29474729b16d..af0180f9ab98 100644
--- a/lib/libc/inet/nsap_addr.c
+++ b/lib/libc/inet/nsap_addr.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: nsap_addr.c,v 1.3.18.2 2005/07/28 07:38:08 marka Exp $";
+static const char rcsid[] = "$Id: nsap_addr.c,v 1.5 2005/07/28 06:51:48 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/isc/ev_streams.c b/lib/libc/isc/ev_streams.c
index 06bdfad57376..1854350ef97b 100644
--- a/lib/libc/isc/ev_streams.c
+++ b/lib/libc/isc/ev_streams.c
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_streams.c,v 1.4.18.1 2005/04/27 05:01:06 sra Exp $";
+static const char rcsid[] = "$Id: ev_streams.c,v 1.5 2005/04/27 04:56:36 sra Exp $";
 #endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/isc/ev_timers.c b/lib/libc/isc/ev_timers.c
index 66fc1861007c..7c25c670ee64 100644
--- a/lib/libc/isc/ev_timers.c
+++ b/lib/libc/isc/ev_timers.c
@@ -20,7 +20,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_timers.c,v 1.5.18.1 2005/04/27 05:01:06 sra Exp $";
+static const char rcsid[] = "$Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp $";
 #endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/isc/eventlib_p.h b/lib/libc/isc/eventlib_p.h
index 951af0038a4c..8620aeb9845e 100644
--- a/lib/libc/isc/eventlib_p.h
+++ b/lib/libc/isc/eventlib_p.h
@@ -19,7 +19,7 @@
  * \brief private interfaces for eventlib
  * \author vix 09sep95 [initial]
  *
- * $Id: eventlib_p.h,v 1.5.18.4 2006/03/10 00:20:08 marka Exp $
+ * $Id: eventlib_p.h,v 1.9 2006/03/09 23:57:56 marka Exp $
  * $FreeBSD$
  */
 
diff --git a/lib/libc/locale/utf8.c b/lib/libc/locale/utf8.c
index cffa241133a5..ce49279cb2d7 100644
--- a/lib/libc/locale/utf8.c
+++ b/lib/libc/locale/utf8.c
@@ -1,4 +1,5 @@
 /*-
+ * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2002-2004 Tim J. Robbins
  * All rights reserved.
  *
@@ -112,13 +113,6 @@ _UTF8_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
 		/* Incomplete multibyte sequence */
 		return ((size_t)-2);
 
-	if (us->want == 0 && ((ch = (unsigned char)*s) & ~0x7f) == 0) {
-		/* Fast path for plain ASCII characters. */
-		if (pwc != NULL)
-			*pwc = ch;
-		return (ch != '\0' ? 1 : 0);
-	}
-
 	if (us->want == 0) {
 		/*
 		 * Determine the number of octets that make up this character
@@ -134,10 +128,12 @@ _UTF8_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
 		 */
 		ch = (unsigned char)*s;
 		if ((ch & 0x80) == 0) {
-			mask = 0x7f;
-			want = 1;
-			lbound = 0;
-		} else if ((ch & 0xe0) == 0xc0) {
+			/* Fast path for plain ASCII characters. */
+			if (pwc != NULL)
+				*pwc = ch;
+			return (ch != '\0' ? 1 : 0);
+		}
+		if ((ch & 0xe0) == 0xc0) {
 			mask = 0x1f;
 			want = 2;
 			lbound = 0x80;
@@ -316,12 +312,6 @@ _UTF8_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
 		/* Reset to initial shift state (no-op) */
 		return (1);
 
-	if ((wc & ~0x7f) == 0) {
-		/* Fast path for plain ASCII characters. */
-		*s = (char)wc;
-		return (1);
-	}
-
 	/*
 	 * Determine the number of octets needed to represent this character.
 	 * We always output the shortest sequence possible. Also specify the
@@ -329,8 +319,9 @@ _UTF8_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
 	 * about the sequence length.
 	 */
 	if ((wc & ~0x7f) == 0) {
-		lead = 0;
-		len = 1;
+		/* Fast path for plain ASCII characters. */
+		*s = (char)wc;
+		return (1);
 	} else if ((wc & ~0x7ff) == 0) {
 		lead = 0xc0;
 		len = 2;
diff --git a/lib/libc/md/Makefile.inc b/lib/libc/md/Makefile.inc
new file mode 100644
index 000000000000..338f64d46c35
--- /dev/null
+++ b/lib/libc/md/Makefile.inc
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+.PATH: ${LIBC_SRCTOP}/../libmd
+
+SRCS+=	md5c.c
diff --git a/lib/libc/mips/arith.h b/lib/libc/mips/arith.h
index 02d6d2e80a95..61f3930f4a89 100644
--- a/lib/libc/mips/arith.h
+++ b/lib/libc/mips/arith.h
@@ -18,9 +18,6 @@
 #define Double_Align
 #else
 /* TODO: Generate these values on a LE machine */
-/* Current values were stolen from ia64 except the
- * Xpointer define.
- */
 #define IEEE_8087
 #define Arith_Kind_ASL 1
 #define Long int
diff --git a/lib/libc/nameser/Symbol.map b/lib/libc/nameser/Symbol.map
index 190a59f3575f..2c4b76e69410 100644
--- a/lib/libc/nameser/Symbol.map
+++ b/lib/libc/nameser/Symbol.map
@@ -29,3 +29,24 @@ FBSD_1.0 {
 	__ns_format_ttl;
 	__ns_parse_ttl;
 };
+
+FBSD_1.4 {
+	__ns_parserr2;
+	__ns_name_pton2;
+	__ns_name_unpack2;
+	__ns_name_length;
+	__ns_name_eq;
+	__ns_name_owned;
+	__ns_name_map;
+	__ns_name_labels;
+	__ns_newmsg_init;
+	__ns_newmsg_copy;
+	__ns_newmsg_id;
+	__ns_newmsg_flag;
+	__ns_newmsg_q;
+	__ns_newmsg_rr;
+	__ns_newmsg_done;
+	__ns_rdata_unpack;
+	__ns_rdata_equal;
+	__ns_rdata_refers;
+};
diff --git a/lib/libc/nameser/ns_name.c b/lib/libc/nameser/ns_name.c
index 31dee3600c06..5b8a8cb2b17c 100644
--- a/lib/libc/nameser/ns_name.c
+++ b/lib/libc/nameser/ns_name.c
@@ -16,8 +16,10 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_name.c,v 1.8.18.2 2005/04/27 05:01:08 sra Exp $";
+static const char rcsid[] = "$Id: ns_name.c,v 1.11 2009/01/23 19:59:16 each Exp $";
 #endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "port_before.h"
 
@@ -121,7 +123,7 @@ ns_name_ntop(const u_char *src, char *dst, size_t dstsiz)
 		}
 		if ((l = labellen(cp - 1)) < 0) {
 			errno = EMSGSIZE; /*%< XXX */
-			return(-1);
+			return (-1);
 		}
 		if (dn + l >= eom) {
 			errno = EMSGSIZE;
@@ -133,12 +135,12 @@ ns_name_ntop(const u_char *src, char *dst, size_t dstsiz)
 			if (n != DNS_LABELTYPE_BITSTRING) {
 				/* XXX: labellen should reject this case */
 				errno = EINVAL;
-				return(-1);
+				return (-1);
 			}
 			if ((m = decode_bitstring(&cp, dn, eom)) < 0)
 			{
 				errno = EMSGSIZE;
-				return(-1);
+				return (-1);
 			}
 			dn += m; 
 			continue;
@@ -197,10 +199,25 @@ ns_name_ntop(const u_char *src, char *dst, size_t dstsiz)
  * notes:
  *\li	Enforces label and domain length limits.
  */
-
 int
-ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
-{
+ns_name_pton(const char *src, u_char *dst, size_t dstsiz) {
+	return (ns_name_pton2(src, dst, dstsiz, NULL));
+}
+
+/*
+ * ns_name_pton2(src, dst, dstsiz, *dstlen)
+ *	Convert a ascii string into an encoded domain name as per RFC1035.
+ * return:
+ *	-1 if it fails
+ *	1 if string was fully qualified
+ *	0 is string was not fully qualified
+ * side effects:
+ *	fills in *dstlen (if non-NULL)
+ * notes:
+ *	Enforces label and domain length limits.
+ */
+int
+ns_name_pton2(const char *src, u_char *dst, size_t dstsiz, size_t *dstlen) {
 	u_char *label, *bp, *eom;
 	int c, n, escaped, e = 0;
 	char *cp;
@@ -215,13 +232,13 @@ ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
 			if (c == '[') { /*%< start a bit string label */
 				if ((cp = strchr(src, ']')) == NULL) {
 					errno = EINVAL; /*%< ??? */
-					return(-1);
+					return (-1);
 				}
 				if ((e = encode_bitsring(&src, cp + 2,
 							 &label, &bp, eom))
 				    != 0) {
 					errno = e;
-					return(-1);
+					return (-1);
 				}
 				escaped = 0;
 				label = bp++;
@@ -229,7 +246,7 @@ ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
 					goto done;
 				else if (c != '.') {
 					errno = EINVAL;
-					return(-1);
+					return	(-1);
 				}
 				continue;
 			}
@@ -281,6 +298,8 @@ ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
 					errno = EMSGSIZE;
 					return (-1);
 				}
+				if (dstlen != NULL)
+					*dstlen = (bp - dst);
 				return (1);
 			}
 			if (c == 0 || *src == '.') {
@@ -318,6 +337,8 @@ ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
 		errno = EMSGSIZE;
 		return (-1);
 	}
+	if (dstlen != NULL)
+		*dstlen = (bp - dst);
 	return (0);
 }
 
@@ -365,7 +386,7 @@ ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz)
 		}
 		for ((void)NULL; l > 0; l--) {
 			c = *cp++;
-			if (isupper(c))
+			if (isascii(c) && isupper(c))
 				*dn++ = tolower(c);
 			else
 				*dn++ = c;
@@ -384,6 +405,21 @@ ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz)
 int
 ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
 	       u_char *dst, size_t dstsiz)
+{
+	return (ns_name_unpack2(msg, eom, src, dst, dstsiz, NULL));
+}
+
+/*
+ * ns_name_unpack2(msg, eom, src, dst, dstsiz, *dstlen)
+ *	Unpack a domain name from a message, source may be compressed.
+ * return:
+ *	-1 if it fails, or consumed octets if it succeeds.
+ * side effect:
+ *	fills in *dstlen (if non-NULL).
+ */
+int
+ns_name_unpack2(const u_char *msg, const u_char *eom, const u_char *src,
+		u_char *dst, size_t dstsiz, size_t *dstlen)
 {
 	const u_char *srcp, *dstlim;
 	u_char *dstp;
@@ -407,7 +443,7 @@ ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
 			/* Limit checks. */
 			if ((l = labellen(srcp - 1)) < 0) {
 				errno = EMSGSIZE;
-				return(-1);
+				return (-1);
 			}
 			if (dstp + l + 1 >= dstlim || srcp + l >= eom) {
 				errno = EMSGSIZE;
@@ -427,11 +463,12 @@ ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
 			}
 			if (len < 0)
 				len = srcp - src + 1;
-			srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff));
-			if (srcp < msg || srcp >= eom) {  /*%< Out of range. */
+			l = ((n & 0x3f) << 8) | (*srcp & 0xff);
+			if (l >= eom - msg) {  /*%< Out of range. */
 				errno = EMSGSIZE;
 				return (-1);
 			}
+			srcp = msg + l;
 			checked += 2;
 			/*
 			 * Check for loops in the compressed name;
@@ -449,7 +486,9 @@ ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
 			return (-1);			/*%< flag error */
 		}
 	}
-	*dstp = '\0';
+	*dstp++ = 0;
+	if (dstlen != NULL)
+		*dstlen = dstp - dst;
 	if (len < 0)
 		len = srcp - src;
 	return (len);
@@ -508,7 +547,7 @@ ns_name_pack(const u_char *src, u_char *dst, int dstsiz,
 		}
 		if ((l0 = labellen(srcp)) < 0) {
 			errno = EINVAL;
-			return(-1);
+			return (-1);
 		}
 		l += l0 + 1;
 		if (l > MAXCDNAME) {
@@ -655,7 +694,7 @@ ns_name_skip(const u_char **ptrptr, const u_char *eom)
 		case NS_TYPE_ELT: /*%< EDNS0 extended label */
 			if ((l = labellen(cp - 1)) < 0) {
 				errno = EMSGSIZE; /*%< XXX */
-				return(-1);
+				return (-1);
 			}
 			cp += l;
 			continue;
@@ -676,6 +715,150 @@ ns_name_skip(const u_char **ptrptr, const u_char *eom)
 	return (0);
 }
 
+/* Find the number of octets an nname takes up, including the root label.
+ * (This is basically ns_name_skip() without compression-pointer support.)
+ * ((NOTE: can only return zero if passed-in namesiz argument is zero.))
+ */
+ssize_t
+ns_name_length(ns_nname_ct nname, size_t namesiz) {
+	ns_nname_ct orig = nname;
+	u_int n;
+
+	while (namesiz-- > 0 && (n = *nname++) != 0) {
+		if ((n & NS_CMPRSFLGS) != 0) {
+			errno = EISDIR;
+			return (-1);
+		}
+		if (n > namesiz) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		nname += n;
+		namesiz -= n;
+	}
+	return (nname - orig);
+}
+
+/* Compare two nname's for equality.  Return -1 on error (setting errno).
+ */
+int
+ns_name_eq(ns_nname_ct a, size_t as, ns_nname_ct b, size_t bs) {
+	ns_nname_ct ae = a + as, be = b + bs;
+	int ac, bc;
+
+	while (ac = *a, bc = *b, ac != 0 && bc != 0) {
+		if ((ac & NS_CMPRSFLGS) != 0 || (bc & NS_CMPRSFLGS) != 0) {
+			errno = EISDIR;
+			return (-1);
+		}
+		if (a + ac >= ae || b + bc >= be) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		if (ac != bc || strncasecmp((const char *) ++a,
+					    (const char *) ++b, ac) != 0)
+			return (0);
+		a += ac, b += bc;
+	}
+	return (ac == 0 && bc == 0);
+}
+
+/* Is domain "A" owned by (at or below) domain "B"?
+ */
+int
+ns_name_owned(ns_namemap_ct a, int an, ns_namemap_ct b, int bn) {
+	/* If A is shorter, it cannot be owned by B. */
+	if (an < bn)
+		return (0);
+
+	/* If they are unequal before the length of the shorter, A cannot... */
+	while (bn > 0) {
+		if (a->len != b->len ||
+		    strncasecmp((const char *) a->base,
+				(const char *) b->base, a->len) != 0)
+			return (0);
+		a++, an--;
+		b++, bn--;
+	}
+
+	/* A might be longer or not, but either way, B owns it. */
+	return (1);
+}
+
+/* Build an array of <base,len> tuples from an nname, top-down order.
+ * Return the number of tuples (labels) thus discovered.
+ */
+int
+ns_name_map(ns_nname_ct nname, size_t namelen, ns_namemap_t map, int mapsize) {
+	u_int n;
+	int l;
+
+	n = *nname++;
+	namelen--;
+
+	/* Root zone? */
+	if (n == 0) {
+		/* Extra data follows name? */
+		if (namelen > 0) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		return (0);
+	}
+
+	/* Compression pointer? */
+	if ((n & NS_CMPRSFLGS) != 0) {
+		errno = EISDIR;
+		return (-1);
+	}
+
+	/* Label too long? */
+	if (n > namelen) {
+		errno = EMSGSIZE;
+		return (-1);
+	}
+
+	/* Recurse to get rest of name done first. */
+	l = ns_name_map(nname + n, namelen - n, map, mapsize);
+	if (l < 0)
+		return (-1);
+
+	/* Too many labels? */
+	if (l >= mapsize) {
+		errno = ENAMETOOLONG;
+		return (-1);
+	}
+
+	/* We're on our way back up-stack, store current map data. */
+	map[l].base = nname;
+	map[l].len = n;
+	return (l + 1);
+}
+
+/* Count the labels in a domain name.  Root counts, so COM. has two.  This
+ * is to make the result comparable to the result of ns_name_map().
+ */
+int
+ns_name_labels(ns_nname_ct nname, size_t namesiz) {
+	int ret = 0;
+	u_int n;
+
+	while (namesiz-- > 0 && (n = *nname++) != 0) {
+		if ((n & NS_CMPRSFLGS) != 0) {
+			errno = EISDIR;
+			return (-1);
+		}
+		if (n > namesiz) {
+			errno = EMSGSIZE;
+			return (-1);
+		}
+		nname += n;
+		namesiz -= n;
+		ret++;
+	}
+	return (ret + 1);
+}
+
 /* Private. */
 
 /*%
@@ -806,7 +989,7 @@ decode_bitstring(const unsigned char **cpp, char *dn, const char *eom)
 	plen = (blen + 3) / 4;
 	plen += sizeof("\\[x/]") + (blen > 99 ? 3 : (blen > 9) ? 2 : 1);
 	if (dn + plen >= eom)
-		return(-1);
+		return (-1);
 
 	cp++;
 	i = SPRINTF((dn, "\\[x"));
@@ -839,12 +1022,12 @@ decode_bitstring(const unsigned char **cpp, char *dn, const char *eom)
 	dn += i;
 
 	*cpp = cp;
-	return(dn - beg);
+	return (dn - beg);
 }
 
 static int
 encode_bitsring(const char **bp, const char *end, unsigned char **labelp,
-	        unsigned char ** dst, unsigned const char *eom)
+		unsigned char ** dst, unsigned const char *eom)
 {
 	int afterslash = 0;
 	const char *cp = *bp;
@@ -858,23 +1041,23 @@ encode_bitsring(const char **bp, const char *end, unsigned char **labelp,
 
 	/* a bitstring must contain at least 2 characters */
 	if (end - cp < 2)
-		return(EINVAL);
+		return (EINVAL);
 
 	/* XXX: currently, only hex strings are supported */
 	if (*cp++ != 'x')
-		return(EINVAL);
+		return (EINVAL);
 	if (!isxdigit((*cp) & 0xff)) /*%< reject '\[x/BLEN]' */
-		return(EINVAL);
+		return (EINVAL);
 
 	for (tp = *dst + 1; cp < end && tp < eom; cp++) {
 		switch((c = *cp)) {
 		case ']':	/*%< end of the bitstring */
 			if (afterslash) {
 				if (beg_blen == NULL)
-					return(EINVAL);
+					return (EINVAL);
 				blen = (int)strtol(beg_blen, &end_blen, 10);
 				if (*end_blen != ']')
-					return(EINVAL);
+					return (EINVAL);
 			}
 			if (count)
 				*tp++ = ((value << 4) & 0xff);
@@ -886,24 +1069,24 @@ encode_bitsring(const char **bp, const char *end, unsigned char **labelp,
 		default:
 			if (afterslash) {
 				if (!isdigit(c&0xff))
-					return(EINVAL);
+					return (EINVAL);
 				if (beg_blen == NULL) {
 					
 					if (c == '0') {
 						/* blen never begings with 0 */
-						return(EINVAL);
+						return (EINVAL);
 					}
 					beg_blen = cp;
 				}
 			} else {
 				if (!isxdigit(c&0xff))
-					return(EINVAL);
+					return (EINVAL);
 				value <<= 4;
 				value += digitvalue[(int)c];
 				count += 4;
 				tbcount += 4;
 				if (tbcount > 256)
-					return(EINVAL);
+					return (EINVAL);
 				if (count == 8) {
 					*tp++ = value;
 					count = 0;
@@ -914,7 +1097,7 @@ encode_bitsring(const char **bp, const char *end, unsigned char **labelp,
 	}
   done:
 	if (cp >= end || tp >= eom)
-		return(EMSGSIZE);
+		return (EMSGSIZE);
 
 	/*
 	 * bit length validation:
@@ -928,10 +1111,10 @@ encode_bitsring(const char **bp, const char *end, unsigned char **labelp,
 		int traillen;
 
 		if (((blen + 3) & ~3) != tbcount)
-			return(EINVAL);
+			return (EINVAL);
 		traillen = tbcount - blen; /*%< between 0 and 3 */
 		if (((value << (8 - traillen)) & 0xff) != 0)
-			return(EINVAL);
+			return (EINVAL);
 	}
 	else
 		blen = tbcount;
@@ -945,7 +1128,7 @@ encode_bitsring(const char **bp, const char *end, unsigned char **labelp,
 	*bp = cp;
 	*dst = tp;
 
-	return(0);
+	return (0);
 }
 
 static int
@@ -956,18 +1139,18 @@ labellen(const u_char *lp)
 
 	if ((l & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
 		/* should be avoided by the caller */
-		return(-1);
+		return (-1);
 	}
 
 	if ((l & NS_CMPRSFLGS) == NS_TYPE_ELT) {
 		if (l == DNS_LABELTYPE_BITSTRING) {
 			if ((bitlen = *(lp + 1)) == 0)
 				bitlen = 256;
-			return((bitlen + 7 ) / 8 + 1);
+			return ((bitlen + 7 ) / 8 + 1);
 		}
-		return(-1);	/*%< unknwon ELT */
+		return (-1);	/*%< unknwon ELT */
 	}
-	return(l);
+	return (l);
 }
 
 /*! \file */
diff --git a/lib/libc/nameser/ns_netint.c b/lib/libc/nameser/ns_netint.c
index b08c58b42326..5ddd5bc6c646 100644
--- a/lib/libc/nameser/ns_netint.c
+++ b/lib/libc/nameser/ns_netint.c
@@ -16,8 +16,10 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_netint.c,v 1.2.18.1 2005/04/27 05:01:08 sra Exp $";
+static const char rcsid[] = "$Id: ns_netint.c,v 1.3 2005/04/27 04:56:40 sra Exp $";
 #endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /* Import. */
 
diff --git a/lib/libc/nameser/ns_parse.c b/lib/libc/nameser/ns_parse.c
index c4658d8633dd..7294c9298b67 100644
--- a/lib/libc/nameser/ns_parse.c
+++ b/lib/libc/nameser/ns_parse.c
@@ -16,8 +16,10 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.4 2007/08/27 03:34:24 marka Exp $";
+static const char rcsid[] = "$Id: ns_parse.c,v 1.10 2009/01/23 19:59:16 each Exp $";
 #endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /* Import. */
 
@@ -47,6 +49,9 @@ static void	setsection(ns_msg *msg, ns_sect sect);
 	do { errno = (err); if (errno == errno) return (-1); } while (0)
 #endif
 
+#define PARSE_FMT_PRESO 0	/* Parse using presentation-format names */
+#define PARSE_FMT_WIRE 1	/* Parse using network-format names */
+
 /* Public. */
 
 /* These need to be in the same order as the nres.h:ns_flag enum. */
@@ -102,7 +107,6 @@ ns_initparse(const u_char *msg, int msglen, ns_msg *handle) {
 	const u_char *eom = msg + msglen;
 	int i;
 
-	memset(handle, 0x5e, sizeof *handle);
 	handle->_msg = msg;
 	handle->_eom = eom;
 	if (msg + NS_INT16SZ > eom)
@@ -194,6 +198,68 @@ ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
 	return (0);
 }
 
+/*
+ * This is identical to the above but uses network-format (uncompressed) names.
+ */
+int
+ns_parserr2(ns_msg *handle, ns_sect section, int rrnum, ns_rr2 *rr) {
+	int b;
+	int tmp;
+
+	/* Make section right. */
+	if ((tmp = section) < 0 || section >= ns_s_max)
+		RETERR(ENODEV);
+	if (section != handle->_sect)
+		setsection(handle, section);
+
+	/* Make rrnum right. */
+	if (rrnum == -1)
+		rrnum = handle->_rrnum;
+	if (rrnum < 0 || rrnum >= handle->_counts[(int)section])
+		RETERR(ENODEV);
+	if (rrnum < handle->_rrnum)
+		setsection(handle, section);
+	if (rrnum > handle->_rrnum) {
+		b = ns_skiprr(handle->_msg_ptr, handle->_eom, section,
+			      rrnum - handle->_rrnum);
+
+		if (b < 0)
+			return (-1);
+		handle->_msg_ptr += b;
+		handle->_rrnum = rrnum;
+	}
+
+	/* Do the parse. */
+	b = ns_name_unpack2(handle->_msg, handle->_eom, handle->_msg_ptr,
+			    rr->nname, NS_MAXNNAME, &rr->nnamel);
+	if (b < 0)
+		return (-1);
+	handle->_msg_ptr += b;
+	if (handle->_msg_ptr + NS_INT16SZ + NS_INT16SZ > handle->_eom)
+		RETERR(EMSGSIZE);
+	NS_GET16(rr->type, handle->_msg_ptr);
+	NS_GET16(rr->rr_class, handle->_msg_ptr);
+	if (section == ns_s_qd) {
+		rr->ttl = 0;
+		rr->rdlength = 0;
+		rr->rdata = NULL;
+	} else {
+		if (handle->_msg_ptr + NS_INT32SZ + NS_INT16SZ > handle->_eom)
+			RETERR(EMSGSIZE);
+		NS_GET32(rr->ttl, handle->_msg_ptr);
+		NS_GET16(rr->rdlength, handle->_msg_ptr);
+		if (handle->_msg_ptr + rr->rdlength > handle->_eom)
+			RETERR(EMSGSIZE);
+		rr->rdata = handle->_msg_ptr;
+		handle->_msg_ptr += rr->rdlength;
+	}
+	if (++handle->_rrnum > handle->_counts[(int)section])
+		setsection(handle, (ns_sect)((int)section + 1));
+
+	/* All done. */
+	return (0);
+}
+
 /* Private. */
 
 static void
diff --git a/lib/libc/nameser/ns_print.c b/lib/libc/nameser/ns_print.c
index 2a463795e34e..c6dee14bcb3d 100644
--- a/lib/libc/nameser/ns_print.c
+++ b/lib/libc/nameser/ns_print.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_print.c,v 1.6.18.4 2005/04/27 05:01:09 sra Exp $";
+static const char rcsid[] = "$Id: ns_print.c,v 1.12 2009/03/03 05:29:58 each Exp $";
 #endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -74,6 +74,9 @@ static int	addtab(size_t len, size_t target, int spaced,
 			return (-1); \
 	} while (0)
 
+static const char base32hex[] =
+        "0123456789ABCDEFGHIJKLMNOPQRSTUV=0123456789abcdefghijklmnopqrstuv";
+
 /* Public. */
 
 /*%
@@ -257,7 +260,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
 
 	case ns_t_mx:
 	case ns_t_afsdb:
-	case ns_t_rt: {
+	case ns_t_rt:
+	case ns_t_kx: {
 		u_int t;
 
 		if (rdlen < (size_t)NS_INT16SZ)
@@ -305,6 +309,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
 		break;
 
 	case ns_t_txt:
+	case ns_t_spf:
 		while (rdata < edata) {
 			T(len = charstr(rdata, edata, &buf, &buflen));
 			if (len == 0)
@@ -451,7 +456,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
 		break;
 	    }
 
-	case ns_t_key: {
+	case ns_t_key:
+	case ns_t_dnskey: {
 		char base64_key[NS_MD5RSA_MAX_BASE64];
 		u_int keyflags, protocol, algorithm, key_id;
 		const char *leader;
@@ -497,7 +503,8 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
 		break;
 	    }
 
-	case ns_t_sig: {
+	case ns_t_sig:
+	case ns_t_rrsig: {
 		char base64_key[NS_MD5RSA_MAX_BASE64];
 		u_int type, algorithm, labels, footprint;
 		const char *leader;
@@ -508,7 +515,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
 			goto formerr;
 
 		/* Type covered, Algorithm, Label count, Original TTL. */
-	        type = ns_get16(rdata);  rdata += NS_INT16SZ;
+		type = ns_get16(rdata);  rdata += NS_INT16SZ;
 		algorithm = *rdata++;
 		labels = *rdata++;
 		t = ns_get32(rdata);  rdata += NS_INT32SZ;
@@ -702,6 +709,344 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
 		break;
 	    }
 
+	case ns_t_ds:
+	case ns_t_dlv:
+	case ns_t_sshfp: {
+		u_int t;
+
+		if (type == ns_t_ds || type == ns_t_dlv) {
+			if (rdlen < 4U) goto formerr;
+			t = ns_get16(rdata);
+			rdata += NS_INT16SZ;
+			len = SPRINTF((tmp, "%u ", t));
+			T(addstr(tmp, len, &buf, &buflen));
+		} else
+			if (rdlen < 2U) goto formerr;
+
+		len = SPRINTF((tmp, "%u ", *rdata));
+		T(addstr(tmp, len, &buf, &buflen));
+		rdata++;
+
+		len = SPRINTF((tmp, "%u ", *rdata));
+		T(addstr(tmp, len, &buf, &buflen));
+		rdata++;
+
+		while (rdata < edata) {
+			len = SPRINTF((tmp, "%02X", *rdata));
+			T(addstr(tmp, len, &buf, &buflen));
+			rdata++;
+		}
+		break;
+	    }
+
+	case ns_t_nsec3:
+	case ns_t_nsec3param: {
+		u_int t, w, l, j, k, c;
+		
+		len = SPRINTF((tmp, "%u ", *rdata));
+		T(addstr(tmp, len, &buf, &buflen));
+		rdata++;
+
+		len = SPRINTF((tmp, "%u ", *rdata));
+		T(addstr(tmp, len, &buf, &buflen));
+		rdata++;
+
+		t = ns_get16(rdata);
+		rdata += NS_INT16SZ;
+		len = SPRINTF((tmp, "%u ", t));
+		T(addstr(tmp, len, &buf, &buflen));
+
+		t = *rdata++;
+		if (t == 0) {
+			T(addstr("-", 1, &buf, &buflen));
+		} else {
+			while (t-- > 0) {
+				len = SPRINTF((tmp, "%02X", *rdata));
+				T(addstr(tmp, len, &buf, &buflen));
+				rdata++;
+			}
+		}
+		if (type == ns_t_nsec3param)
+			break;
+		T(addstr(" ", 1, &buf, &buflen));
+
+		t = *rdata++;
+		while (t > 0) {
+			switch (t) {
+			case 1:
+				tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
+				tmp[1] = base32hex[((rdata[0]<<2)&0x1c)];
+				tmp[2] = tmp[3] = tmp[4] = '=';
+				tmp[5] = tmp[6] = tmp[7] = '=';
+				break;
+			case 2:
+				tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
+				tmp[1] = base32hex[((rdata[0]<<2)&0x1c)|
+						   ((rdata[1]>>6)&0x03)];
+				tmp[2] = base32hex[((rdata[1]>>1)&0x1f)];
+				tmp[3] = base32hex[((rdata[1]<<4)&0x10)];
+				tmp[4] = tmp[5] = tmp[6] = tmp[7] = '=';
+				break;
+			case 3:
+				tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
+				tmp[1] = base32hex[((rdata[0]<<2)&0x1c)|
+						   ((rdata[1]>>6)&0x03)];
+				tmp[2] = base32hex[((rdata[1]>>1)&0x1f)];
+				tmp[3] = base32hex[((rdata[1]<<4)&0x10)|
+						   ((rdata[2]>>4)&0x0f)];
+				tmp[4] = base32hex[((rdata[2]<<1)&0x1e)];
+				tmp[5] = tmp[6] = tmp[7] = '=';
+				break;
+			case 4:
+				tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
+				tmp[1] = base32hex[((rdata[0]<<2)&0x1c)|
+						   ((rdata[1]>>6)&0x03)];
+				tmp[2] = base32hex[((rdata[1]>>1)&0x1f)];
+				tmp[3] = base32hex[((rdata[1]<<4)&0x10)|
+						   ((rdata[2]>>4)&0x0f)];
+				tmp[4] = base32hex[((rdata[2]<<1)&0x1e)|
+						   ((rdata[3]>>7)&0x01)];
+				tmp[5] = base32hex[((rdata[3]>>2)&0x1f)];
+				tmp[6] = base32hex[(rdata[3]<<3)&0x18];
+				tmp[7] = '=';
+				break;
+			default:
+				tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
+				tmp[1] = base32hex[((rdata[0]<<2)&0x1c)|
+						   ((rdata[1]>>6)&0x03)];
+				tmp[2] = base32hex[((rdata[1]>>1)&0x1f)];
+				tmp[3] = base32hex[((rdata[1]<<4)&0x10)|
+						   ((rdata[2]>>4)&0x0f)];
+				tmp[4] = base32hex[((rdata[2]<<1)&0x1e)|
+						   ((rdata[3]>>7)&0x01)];
+				tmp[5] = base32hex[((rdata[3]>>2)&0x1f)];
+				tmp[6] = base32hex[((rdata[3]<<3)&0x18)|
+						   ((rdata[4]>>5)&0x07)];
+				tmp[7] = base32hex[(rdata[4]&0x1f)];
+				break;
+			}
+			T(addstr(tmp, 8, &buf, &buflen));
+			if (t >= 5) {
+				rdata += 5;
+				t -= 5;
+			} else {
+				rdata += t;
+				t -= t;
+			}
+		}
+
+		while (rdata < edata) {
+			w = *rdata++;
+			l = *rdata++;
+			for (j = 0; j < l; j++) {
+				if (rdata[j] == 0)
+					continue;
+				for (k = 0; k < 8; k++) {
+					if ((rdata[j] & (0x80 >> k)) == 0)
+						continue;
+					c = w * 256 + j * 8 + k;
+					len = SPRINTF((tmp, " %s", p_type(c)));
+					T(addstr(tmp, len, &buf, &buflen));
+				}
+			}
+			rdata += l;
+		}
+		break;
+	    }
+
+	case ns_t_nsec: {
+		u_int w, l, j, k, c;
+
+		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
+
+		while (rdata < edata) {
+			w = *rdata++;
+			l = *rdata++;
+			for (j = 0; j < l; j++) {
+				if (rdata[j] == 0)
+					continue;
+				for (k = 0; k < 8; k++) {
+					if ((rdata[j] & (0x80 >> k)) == 0)
+						continue;
+					c = w * 256 + j * 8 + k;
+					len = SPRINTF((tmp, " %s", p_type(c)));
+					T(addstr(tmp, len, &buf, &buflen));
+				}
+			}
+			rdata += l;
+		}
+		break;
+	    }
+
+	case ns_t_dhcid: {
+		int n;
+		unsigned int siz;
+		char base64_dhcid[8192];
+		const char *leader;
+
+		siz = (edata-rdata)*4/3 + 4; /* "+4" accounts for trailing \0 */
+		if (siz > sizeof(base64_dhcid) * 3/4) {
+			const char *str = "record too long to print";
+			T(addstr(str, strlen(str), &buf, &buflen));
+		} else {
+			len = b64_ntop(rdata, edata-rdata, base64_dhcid, siz);
+		
+			if (len < 0)
+				goto formerr;
+
+			else if (len > 15) {
+				T(addstr(" (", 2, &buf, &buflen));
+				leader = "\n\t\t";
+				spaced = 0;
+			}
+			else
+				leader = " ";
+
+			for (n = 0; n < len; n += 48) {
+				T(addstr(leader, strlen(leader),
+					 &buf, &buflen));
+				T(addstr(base64_dhcid + n, MIN(len - n, 48),
+					 &buf, &buflen));
+			}
+			if (len > 15)
+				T(addstr(" )", 2, &buf, &buflen));
+		}
+	}
+
+	case ns_t_ipseckey: {
+		int n;
+		unsigned int siz;
+		char base64_key[8192];
+		const char *leader;
+	
+		if (rdlen < 2)
+			goto formerr;
+
+		switch (rdata[1]) {
+		case 0:
+		case 3:
+			if (rdlen < 3)
+				goto formerr;
+			break;
+		case 1:
+			if (rdlen < 7)
+				goto formerr;
+			break;
+		case 2:
+			if (rdlen < 19)
+				goto formerr;
+			break;
+		default:
+			comment = "unknown IPSECKEY gateway type";
+			goto hexify;
+		}
+
+		len = SPRINTF((tmp, "%u ", *rdata));
+		T(addstr(tmp, len, &buf, &buflen));
+		rdata++;
+
+		len = SPRINTF((tmp, "%u ", *rdata));
+		T(addstr(tmp, len, &buf, &buflen));
+		rdata++;
+		
+		len = SPRINTF((tmp, "%u ", *rdata));
+		T(addstr(tmp, len, &buf, &buflen));
+		rdata++;
+
+		switch (rdata[-2]) {
+		case 0:
+			T(addstr(".", 1, &buf, &buflen));
+			break;
+		case 1:
+			(void) inet_ntop(AF_INET, rdata, buf, buflen);
+			addlen(strlen(buf), &buf, &buflen);
+			rdata += 4;
+			break;
+		case 2:
+			(void) inet_ntop(AF_INET6, rdata, buf, buflen);
+			addlen(strlen(buf), &buf, &buflen);
+			rdata += 16;
+			break;
+		case 3:
+			T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
+			break;
+		}
+
+		if (rdata >= edata)
+			break;
+
+		siz = (edata-rdata)*4/3 + 4; /* "+4" accounts for trailing \0 */
+		if (siz > sizeof(base64_key) * 3/4) {
+			const char *str = "record too long to print";
+			T(addstr(str, strlen(str), &buf, &buflen));
+		} else {
+			len = b64_ntop(rdata, edata-rdata, base64_key, siz);
+
+			if (len < 0)
+				goto formerr;
+
+			else if (len > 15) {
+				T(addstr(" (", 2, &buf, &buflen));
+				leader = "\n\t\t";
+				spaced = 0;
+			}
+			else
+				leader = " ";
+
+			for (n = 0; n < len; n += 48) {
+				T(addstr(leader, strlen(leader),
+					 &buf, &buflen));
+				T(addstr(base64_key + n, MIN(len - n, 48),
+					 &buf, &buflen));
+			}
+			if (len > 15)
+				T(addstr(" )", 2, &buf, &buflen));
+		}
+	}
+
+	case ns_t_hip: {
+		unsigned int i, hip_len, algorithm, key_len;
+		char base64_key[NS_MD5RSA_MAX_BASE64];
+		unsigned int siz;
+		const char *leader = "\n\t\t\t\t\t";
+		
+		hip_len = *rdata++;
+		algorithm = *rdata++;
+		key_len = ns_get16(rdata);
+		rdata += NS_INT16SZ;
+
+		siz = key_len*4/3 + 4; /* "+4" accounts for trailing \0 */
+		if (siz > sizeof(base64_key) * 3/4) {
+			const char *str = "record too long to print";
+			T(addstr(str, strlen(str), &buf, &buflen));
+		} else {
+			len = sprintf(tmp, "( %u ", algorithm);
+			T(addstr(tmp, len, &buf, &buflen));
+
+			for (i = 0; i < hip_len; i++) {
+				len = sprintf(tmp, "%02X", *rdata);
+				T(addstr(tmp, len, &buf, &buflen));
+				rdata++;
+			}
+			T(addstr(leader, strlen(leader), &buf, &buflen));
+
+			len = b64_ntop(rdata, key_len, base64_key, siz);
+			if (len < 0)
+				goto formerr;
+
+			T(addstr(base64_key, len, &buf, &buflen));
+				
+			rdata += key_len;
+			while (rdata < edata) {
+				T(addstr(leader, strlen(leader), &buf, &buflen));
+				T(addname(msg, msglen, &rdata, origin,
+					  &buf, &buflen));
+			}
+			T(addstr(" )", 2, &buf, &buflen));
+		}
+		break;
+	}
+
 	default:
 		comment = "unknown RR type";
 		goto hexify;
diff --git a/lib/libc/nameser/ns_samedomain.c b/lib/libc/nameser/ns_samedomain.c
index 9c43c79e4c6d..4470cd08ed6c 100644
--- a/lib/libc/nameser/ns_samedomain.c
+++ b/lib/libc/nameser/ns_samedomain.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_samedomain.c,v 1.5.18.1 2005/04/27 05:01:09 sra Exp $";
+static const char rcsid[] = "$Id: ns_samedomain.c,v 1.6 2005/04/27 04:56:40 sra Exp $";
 #endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/nameser/ns_ttl.c b/lib/libc/nameser/ns_ttl.c
index 627ddf179598..da7df67bf52f 100644
--- a/lib/libc/nameser/ns_ttl.c
+++ b/lib/libc/nameser/ns_ttl.c
@@ -16,8 +16,10 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_ttl.c,v 1.2.18.2 2005/07/28 07:38:10 marka Exp $";
+static const char rcsid[] = "$Id: ns_ttl.c,v 1.4 2005/07/28 06:51:49 marka Exp $";
 #endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /* Import. */
 
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index 59cbdea47697..c6307afc1d53 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -34,11 +34,13 @@ CFLAGS+=-I${LIBC_SRCTOP}/resolv
 YFLAGS+=-p_nsyy
 LFLAGS+=-P_nsyy
 
-CLEANFILES+=nslexer.c
+CLEANFILES+=nslexer.c nslexer.c.*
 
 nslexer.c: nslexer.l nsparser.h
-	${LEX} ${LFLAGS} -o/dev/stdout ${.IMPSRC} | \
-		sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET}
+	${LEX} ${LFLAGS} -o${.TARGET}.tmp1 ${.IMPSRC}
+	sed -e '/YY_BUF_SIZE/s/16384/1024/' ${.TARGET}.tmp1 >${.TARGET}.tmp2
+	rm -f ${.TARGET}.tmp1
+	mv -f ${.TARGET}.tmp2 ${.TARGET}
 
 MAN+=	byteorder.3 ethers.3 eui64.3 \
 	getaddrinfo.3 gai_strerror.3 gethostbyname.3 \
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
index 00ab7963ff7d..b4c1a33ddff4 100644
--- a/lib/libc/net/getaddrinfo.c
+++ b/lib/libc/net/getaddrinfo.c
@@ -62,12 +62,15 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
+#include <net/if_types.h>
+#include <ifaddrs.h>
 #include <sys/queue.h>
 #ifdef INET6
 #include <net/if_var.h>
 #include <sys/sysctl.h>
 #include <sys/ioctl.h>
-#include <netinet6/in6_var.h>	/* XXX */
+#include <netinet6/in6_var.h>
+#include <netinet6/nd6.h>
 #endif
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
@@ -245,6 +248,9 @@ static int get_portmatch(const struct addrinfo *, const char *);
 static int get_port(struct addrinfo *, const char *, int);
 static const struct afd *find_afd(int);
 static int addrconfig(struct addrinfo *);
+#ifdef INET6
+static int is_ifdisabled(char *);
+#endif
 static void set_source(struct ai_order *, struct policyhead *);
 static int comp_dst(const void *, const void *);
 #ifdef INET6
@@ -1003,7 +1009,8 @@ comp_dst(const void *arg1, const void *arg2)
 	 * We compare the match length in a same AF only.
 	 */
 	if (dst1->aio_ai->ai_addr->sa_family ==
-	    dst2->aio_ai->ai_addr->sa_family) {
+	    dst2->aio_ai->ai_addr->sa_family &&
+	    dst1->aio_ai->ai_addr->sa_family != AF_INET) {
 		if (dst1->aio_matchlen > dst2->aio_matchlen) {
 			return(-1);
 		}
@@ -1525,10 +1532,11 @@ find_afd(int af)
 }
 
 /*
- * post-2553: AI_ADDRCONFIG check.  if we use getipnodeby* as backend, backend
- * will take care of it.
- * the semantics of AI_ADDRCONFIG is not defined well.  we are not sure
- * if the code is right or not.
+ * RFC 3493: AI_ADDRCONFIG check.  Determines which address families are
+ * configured on the local system and correlates with pai->ai_family value.
+ * If an address family is not configured on the system, it will not be
+ * queried for.  For this purpose, loopback addresses are not considered
+ * configured addresses.
  *
  * XXX PF_UNSPEC -> PF_INET6 + PF_INET mapping needs to be in sync with
  * _dns_getaddrinfo.
@@ -1536,38 +1544,80 @@ find_afd(int af)
 static int
 addrconfig(struct addrinfo *pai)
 {
-	int s, af;
+	struct ifaddrs *ifaddrs, *ifa;
+	struct sockaddr_in *sin;
+#ifdef INET6
+	struct sockaddr_in6 *sin6;
+#endif
+	int seen_inet = 0, seen_inet6 = 0;
 
-	/*
-	 * TODO:
-	 * Note that implementation dependent test for address
-	 * configuration should be done everytime called
-	 * (or apropriate interval),
-	 * because addresses will be dynamically assigned or deleted.
-	 */
-	af = pai->ai_family;
-	if (af == AF_UNSPEC) {
-		if ((s = _socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0)) < 0)
-			af = AF_INET;
-		else {
-			_close(s);
-			if ((s = _socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC,
-			    0)) < 0)
-				af = AF_INET6;
-			else
-				_close(s);
+	if (getifaddrs(&ifaddrs) != 0)
+		return (0);
+
+	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
+		if (ifa->ifa_addr == NULL || (ifa->ifa_flags & IFF_UP) == 0)
+			continue;
+		switch (ifa->ifa_addr->sa_family) {
+		case AF_INET:
+			if (seen_inet)
+				continue;
+			sin = (struct sockaddr_in *)(ifa->ifa_addr);
+			if (IN_LOOPBACK(htonl(sin->sin_addr.s_addr)))
+				continue;
+			seen_inet = 1;
+			break;
+#ifdef INET6
+		case AF_INET6:
+			if (seen_inet6)
+				continue;
+			sin6 = (struct sockaddr_in6 *)(ifa->ifa_addr);
+			if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr))
+				continue;
+			if ((ifa->ifa_flags & IFT_LOOP) != 0 &&
+			    IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr))
+				continue;
+			if (is_ifdisabled(ifa->ifa_name))
+				continue;
+			seen_inet6 = 1;
+			break;
+#endif
 		}
 	}
-	if (af != AF_UNSPEC) {
-		if ((s = _socket(af, SOCK_DGRAM | SOCK_CLOEXEC, 0)) < 0)
-			return 0;
-		_close(s);
+	freeifaddrs(ifaddrs);
+
+	switch(pai->ai_family) {
+	case AF_INET6:
+		return (seen_inet6);
+	case AF_INET:
+		return (seen_inet);
+	case AF_UNSPEC:
+		if (seen_inet == seen_inet6)
+			return (seen_inet);
+		pai->ai_family = seen_inet ? AF_INET : AF_INET6;
+		return (1);
 	}
-	pai->ai_family = af;
-	return 1;
+	return (1);
 }
 
 #ifdef INET6
+static int
+is_ifdisabled(char *name)
+{
+	struct in6_ndireq nd;
+	int fd;
+
+	if ((fd = _socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0)) < 0)
+		return (-1);
+	memset(&nd, 0, sizeof(nd));
+	strlcpy(nd.ifname, name, sizeof(nd.ifname));
+	if (_ioctl(fd, SIOCGIFINFO_IN6, &nd) < 0) {
+		_close(fd);
+		return (-1);
+	}
+	_close(fd);
+	return ((nd.ndi.flags & ND6_IFF_IFDISABLED) != 0);
+}
+
 /* convert a string to a scope identifier. XXX: IPv6 specific */
 static int
 ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, u_int32_t *scopeid)
diff --git a/lib/libc/net/linkaddr.c b/lib/libc/net/linkaddr.c
index 86bb7a2955ee..5be6e74114e1 100644
--- a/lib/libc/net/linkaddr.c
+++ b/lib/libc/net/linkaddr.c
@@ -118,7 +118,7 @@ link_addr(addr, sdl)
 	return;
 }
 
-static char hexlist[] = "0123456789abcdef";
+static const char hexlist[] = "0123456789abcdef";
 
 char *
 link_ntoa(sdl)
diff --git a/lib/libc/net/nsdispatch.3 b/lib/libc/net/nsdispatch.3
index 577bce98e451..e08e9bef7cae 100644
--- a/lib/libc/net/nsdispatch.3
+++ b/lib/libc/net/nsdispatch.3
@@ -239,8 +239,7 @@ where it appeared first in
 Support for NSS modules first appeared in
 .Fx 5.1 .
 .Sh AUTHORS
-Luke Mewburn
-.Aq lukem@netbsd.org
+.An Luke Mewburn Aq Mt lukem@netbsd.org
 wrote this freely-distributable name-service switch implementation,
 using ideas from the
 .Tn ULTRIX
diff --git a/lib/libc/net/sctp_sys_calls.c b/lib/libc/net/sctp_sys_calls.c
index a7da95c51271..6a57061a7046 100644
--- a/lib/libc/net/sctp_sys_calls.c
+++ b/lib/libc/net/sctp_sys_calls.c
@@ -350,6 +350,27 @@ sctp_opt_info(int sd, sctp_assoc_t id, int opt, void *arg, socklen_t * size)
 	case SCTP_REMOTE_UDP_ENCAPS_PORT:
 		((struct sctp_udpencaps *)arg)->sue_assoc_id = id;
 		break;
+	case SCTP_ECN_SUPPORTED:
+		((struct sctp_assoc_value *)arg)->assoc_id = id;
+		break;
+	case SCTP_PR_SUPPORTED:
+		((struct sctp_assoc_value *)arg)->assoc_id = id;
+		break;
+	case SCTP_AUTH_SUPPORTED:
+		((struct sctp_assoc_value *)arg)->assoc_id = id;
+		break;
+	case SCTP_ASCONF_SUPPORTED:
+		((struct sctp_assoc_value *)arg)->assoc_id = id;
+		break;
+	case SCTP_RECONFIG_SUPPORTED:
+		((struct sctp_assoc_value *)arg)->assoc_id = id;
+		break;
+	case SCTP_NRSACK_SUPPORTED:
+		((struct sctp_assoc_value *)arg)->assoc_id = id;
+		break;
+	case SCTP_PKTDROP_SUPPORTED:
+		((struct sctp_assoc_value *)arg)->assoc_id = id;
+		break;
 	case SCTP_MAX_BURST:
 		((struct sctp_assoc_value *)arg)->assoc_id = id;
 		break;
@@ -575,6 +596,7 @@ sctp_sendmsg(int s,
 	cmsg->cmsg_type = SCTP_SNDRCV;
 	cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
 	sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
+	memset(sinfo, 0, sizeof(struct sctp_sndrcvinfo));
 	sinfo->sinfo_stream = stream_no;
 	sinfo->sinfo_ssn = 0;
 	sinfo->sinfo_flags = flags;
diff --git a/lib/libc/net/sourcefilter.3 b/lib/libc/net/sourcefilter.3
index 225b0209bd95..a123ff38d68e 100644
--- a/lib/libc/net/sourcefilter.3
+++ b/lib/libc/net/sourcefilter.3
@@ -236,5 +236,4 @@ The
 functions first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
-Bruce M. Simpson
-.Aq bms@FreeBSD.org
+.An Bruce M. Simpson Aq Mt bms@FreeBSD.org
diff --git a/lib/libc/net/sourcefilter.c b/lib/libc/net/sourcefilter.c
index 4d29d9f36e0b..cb64701e6f9e 100644
--- a/lib/libc/net/sourcefilter.c
+++ b/lib/libc/net/sourcefilter.c
@@ -337,7 +337,8 @@ getsourcefilter(int s, uint32_t interface, struct sockaddr *group,
 {
 	struct __msfilterreq	 msfr;
 	sockunion_t		*psu;
-	int			 err, level, nsrcs, optlen, optname;
+	socklen_t		 optlen;
+	int			 err, level, nsrcs, optname;
 
 	if (interface == 0 || group == NULL || numsrc == NULL ||
 	    fmode == NULL) {
diff --git a/lib/libc/posix1e/acl_add_flag_np.3 b/lib/libc/posix1e/acl_add_flag_np.3
index 057de0393ca1..9f7b21e09379 100644
--- a/lib/libc/posix1e/acl_add_flag_np.3
+++ b/lib/libc/posix1e/acl_add_flag_np.3
@@ -94,4 +94,4 @@ function was added in
 The
 .Fn acl_add_flag_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_add_perm.3 b/lib/libc/posix1e/acl_add_perm.3
index 564b83d9a332..c59aac8e41fa 100644
--- a/lib/libc/posix1e/acl_add_perm.3
+++ b/lib/libc/posix1e/acl_add_perm.3
@@ -126,4 +126,4 @@ function was added in
 The
 .Fn acl_add_perm
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_calc_mask.3 b/lib/libc/posix1e/acl_calc_mask.3
index 7bcdb4082e25..1cd3fd7c03c7 100644
--- a/lib/libc/posix1e/acl_calc_mask.3
+++ b/lib/libc/posix1e/acl_calc_mask.3
@@ -95,4 +95,4 @@ function was added in
 The
 .Fn acl_calc_mask
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_clear_flags_np.3 b/lib/libc/posix1e/acl_clear_flags_np.3
index 0780e149d5f0..a3da4815371d 100644
--- a/lib/libc/posix1e/acl_clear_flags_np.3
+++ b/lib/libc/posix1e/acl_clear_flags_np.3
@@ -76,4 +76,4 @@ function was added in
 The
 .Fn acl_clear_flags_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_clear_perms.3 b/lib/libc/posix1e/acl_clear_perms.3
index df82b6c78694..4b055fcf5e64 100644
--- a/lib/libc/posix1e/acl_clear_perms.3
+++ b/lib/libc/posix1e/acl_clear_perms.3
@@ -76,4 +76,4 @@ function was added in
 The
 .Fn acl_clear_perms
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_copy_entry.3 b/lib/libc/posix1e/acl_copy_entry.3
index 586b8227176e..5fd31ed793e6 100644
--- a/lib/libc/posix1e/acl_copy_entry.3
+++ b/lib/libc/posix1e/acl_copy_entry.3
@@ -82,4 +82,4 @@ function was added in
 The
 .Fn acl_copy_entry
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_create_entry.3 b/lib/libc/posix1e/acl_create_entry.3
index 784f6875cf9b..76c14f3f0e91 100644
--- a/lib/libc/posix1e/acl_create_entry.3
+++ b/lib/libc/posix1e/acl_create_entry.3
@@ -95,4 +95,4 @@ function was added in
 The
 .Fn acl_create_entry
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_delete_entry.3 b/lib/libc/posix1e/acl_delete_entry.3
index b1bdc5ac74bd..06bb0ded1ed0 100644
--- a/lib/libc/posix1e/acl_delete_entry.3
+++ b/lib/libc/posix1e/acl_delete_entry.3
@@ -98,4 +98,4 @@ function was added in
 The
 .Fn acl_delete_entry
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_delete_flag_np.3 b/lib/libc/posix1e/acl_delete_flag_np.3
index a288978b8a33..ba7a738394fe 100644
--- a/lib/libc/posix1e/acl_delete_flag_np.3
+++ b/lib/libc/posix1e/acl_delete_flag_np.3
@@ -81,4 +81,4 @@ function was added in
 The
 .Fn acl_delete_flag_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_delete_perm.3 b/lib/libc/posix1e/acl_delete_perm.3
index b6c725058b4a..90f244e147c2 100644
--- a/lib/libc/posix1e/acl_delete_perm.3
+++ b/lib/libc/posix1e/acl_delete_perm.3
@@ -81,4 +81,4 @@ function was added in
 The
 .Fn acl_delete_perm
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_brand_np.3 b/lib/libc/posix1e/acl_get_brand_np.3
index 5caa40c862a9..44b83e23293c 100644
--- a/lib/libc/posix1e/acl_get_brand_np.3
+++ b/lib/libc/posix1e/acl_get_brand_np.3
@@ -83,4 +83,4 @@ function was added in
 The
 .Fn acl_get_brand_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_get_entry.3 b/lib/libc/posix1e/acl_get_entry.3
index 477b735edfb1..88c72db2559a 100644
--- a/lib/libc/posix1e/acl_get_entry.3
+++ b/lib/libc/posix1e/acl_get_entry.3
@@ -142,4 +142,4 @@ function was added in
 The
 .Fn acl_get_entry
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_entry_type_np.3 b/lib/libc/posix1e/acl_get_entry_type_np.3
index eea4b17425c6..6313d0607c7d 100644
--- a/lib/libc/posix1e/acl_get_entry_type_np.3
+++ b/lib/libc/posix1e/acl_get_entry_type_np.3
@@ -77,4 +77,4 @@ function was added in
 The
 .Fn acl_get_entry_type_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_get_flag_np.3 b/lib/libc/posix1e/acl_get_flag_np.3
index b57fd04bc60c..d70ce84427d4 100644
--- a/lib/libc/posix1e/acl_get_flag_np.3
+++ b/lib/libc/posix1e/acl_get_flag_np.3
@@ -91,4 +91,4 @@ function was added in
 The
 .Fn acl_get_flag_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_get_flagset_np.3 b/lib/libc/posix1e/acl_get_flagset_np.3
index 221b93bce91d..fd1c8b2aed35 100644
--- a/lib/libc/posix1e/acl_get_flagset_np.3
+++ b/lib/libc/posix1e/acl_get_flagset_np.3
@@ -80,4 +80,4 @@ function was added in
 The
 .Fn acl_get_flagset_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_get_perm_np.3 b/lib/libc/posix1e/acl_get_perm_np.3
index de1c0b5f9dce..0f4126ecbe64 100644
--- a/lib/libc/posix1e/acl_get_perm_np.3
+++ b/lib/libc/posix1e/acl_get_perm_np.3
@@ -91,4 +91,4 @@ function was added in
 The
 .Fn acl_get_perm_np
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_permset.3 b/lib/libc/posix1e/acl_get_permset.3
index cf93b0a8d3f4..064f71ce45bc 100644
--- a/lib/libc/posix1e/acl_get_permset.3
+++ b/lib/libc/posix1e/acl_get_permset.3
@@ -80,4 +80,4 @@ function was added in
 The
 .Fn acl_get_permset
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_qualifier.3 b/lib/libc/posix1e/acl_get_qualifier.3
index 653a3b4f3279..fcafd2cc3bbb 100644
--- a/lib/libc/posix1e/acl_get_qualifier.3
+++ b/lib/libc/posix1e/acl_get_qualifier.3
@@ -137,4 +137,4 @@ function was added in
 The
 .Fn acl_get_qualifier
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_tag_type.3 b/lib/libc/posix1e/acl_get_tag_type.3
index 4856c5082770..64c57efed732 100644
--- a/lib/libc/posix1e/acl_get_tag_type.3
+++ b/lib/libc/posix1e/acl_get_tag_type.3
@@ -82,4 +82,4 @@ function was added in
 The
 .Fn acl_get_tag_type
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_is_trivial_np.3 b/lib/libc/posix1e/acl_is_trivial_np.3
index 4f5a22cd6dd7..142a76c8f1a8 100644
--- a/lib/libc/posix1e/acl_is_trivial_np.3
+++ b/lib/libc/posix1e/acl_is_trivial_np.3
@@ -82,4 +82,4 @@ The
 function was added in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
diff --git a/lib/libc/posix1e/acl_set_entry_type_np.3 b/lib/libc/posix1e/acl_set_entry_type_np.3
index 648775d4e837..2257b53c3711 100644
--- a/lib/libc/posix1e/acl_set_entry_type_np.3
+++ b/lib/libc/posix1e/acl_set_entry_type_np.3
@@ -91,4 +91,4 @@ function was added in
 The
 .Fn acl_get_entry_type_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_set_flagset_np.3 b/lib/libc/posix1e/acl_set_flagset_np.3
index 386665d4b4cc..3d271c86839d 100644
--- a/lib/libc/posix1e/acl_set_flagset_np.3
+++ b/lib/libc/posix1e/acl_set_flagset_np.3
@@ -82,4 +82,4 @@ function was added in
 The
 .Fn acl_set_flagset_np
 function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_set_permset.3 b/lib/libc/posix1e/acl_set_permset.3
index 0cf658161b80..259aef6b8458 100644
--- a/lib/libc/posix1e/acl_set_permset.3
+++ b/lib/libc/posix1e/acl_set_permset.3
@@ -78,4 +78,4 @@ function was added in
 The
 .Fn acl_set_permset
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_set_qualifier.3 b/lib/libc/posix1e/acl_set_qualifier.3
index 47a60d81121c..26542ce28388 100644
--- a/lib/libc/posix1e/acl_set_qualifier.3
+++ b/lib/libc/posix1e/acl_set_qualifier.3
@@ -88,4 +88,4 @@ function was added in
 The
 .Fn acl_get_qualifier
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_set_tag_type.3 b/lib/libc/posix1e/acl_set_tag_type.3
index 79526a004453..42834c2657d0 100644
--- a/lib/libc/posix1e/acl_set_tag_type.3
+++ b/lib/libc/posix1e/acl_set_tag_type.3
@@ -99,4 +99,4 @@ function was added in
 The
 .Fn acl_set_tag_type
 function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
+.An Chris D. Faulhaber Aq Mt jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_strip_np.3 b/lib/libc/posix1e/acl_strip_np.3
index cc6c65b70fd8..8c1a920a717b 100644
--- a/lib/libc/posix1e/acl_strip_np.3
+++ b/lib/libc/posix1e/acl_strip_np.3
@@ -106,4 +106,4 @@ The
 function was added in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
diff --git a/lib/libc/regex/re_format.7 b/lib/libc/regex/re_format.7
index a2a527da519e..05b14947e45f 100644
--- a/lib/libc/regex/re_format.7
+++ b/lib/libc/regex/re_format.7
@@ -36,7 +36,7 @@
 .\"	@(#)re_format.7	8.3 (Berkeley) 3/20/94
 .\" $FreeBSD$
 .\"
-.Dd March 20, 1994
+.Dd June 30, 2014
 .Dt RE_FORMAT 7
 .Os
 .Sh NAME
@@ -314,6 +314,13 @@ compatible with but not specified by
 .St -p1003.2 ,
 and should be used with
 caution in software intended to be portable to other systems.
+The additional word delimiters  
+.Ql \e<
+and
+.Ql \e> 
+are provided to ease compatibility with traditional
+.Xr svr4 4
+systems but are not portable and should be avoided.
 .Pp
 In the event that an RE could match more than one substring of a given
 string,
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index 55f9c04c6910..a01bb95931bf 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -412,7 +412,17 @@ p_ere_exp(struct parse *p)
 	case '\\':
 		(void)REQUIRE(MORE(), REG_EESCAPE);
 		wc = WGETNEXT();
-		ordinary(p, wc);
+		switch (wc) {
+		case '<':
+			EMIT(OBOW, 0);
+			break;
+		case '>':
+			EMIT(OEOW, 0);
+			break;
+		default:
+			ordinary(p, wc);
+			break;
+		}
 		break;
 	case '{':		/* okay as ordinary except if digit follows */
 		(void)REQUIRE(!MORE() || !isdigit((uch)PEEK()), REG_BADRPT);
@@ -569,6 +579,12 @@ p_simp_re(struct parse *p,
 	case '[':
 		p_bracket(p);
 		break;
+	case BACKSL|'<':
+		EMIT(OBOW, 0);
+		break;
+	case BACKSL|'>':
+		EMIT(OEOW, 0);
+		break;
 	case BACKSL|'{':
 		SETERROR(REG_BADRPT);
 		break;
diff --git a/lib/libc/resolv/Makefile.inc b/lib/libc/resolv/Makefile.inc
index c77a3ab594b5..1a48687c61cd 100644
--- a/lib/libc/resolv/Makefile.inc
+++ b/lib/libc/resolv/Makefile.inc
@@ -8,3 +8,5 @@ SRCS+=	herror.c h_errno.c mtctxres.c res_comp.c res_data.c res_debug.c \
 	res_query.c res_send.c res_state.c res_update.c
 
 SYM_MAPS+= ${LIBC_SRCTOP}/resolv/Symbol.map
+
+CFLAGS+=-I${LIBC_SRCTOP}/../libmd
diff --git a/lib/libc/resolv/Symbol.map b/lib/libc/resolv/Symbol.map
index 211f2c4c734b..170333343cf0 100644
--- a/lib/libc/resolv/Symbol.map
+++ b/lib/libc/resolv/Symbol.map
@@ -105,3 +105,8 @@ FBSD_1.0 {
 	res_send;
 	__res_update;
 };
+
+FBSD_1.4 {
+	__res_rndinit;
+	__res_nrandomid;
+};
diff --git a/lib/libc/resolv/herror.c b/lib/libc/resolv/herror.c
index cb9dd0e524c6..d9876095c39d 100644
--- a/lib/libc/resolv/herror.c
+++ b/lib/libc/resolv/herror.c
@@ -46,7 +46,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: herror.c,v 1.3.18.1 2005/04/27 05:01:09 sra Exp $";
+static const char rcsid[] = "$Id: herror.c,v 1.4 2005/04/27 04:56:41 sra Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/resolv/res_comp.c b/lib/libc/resolv/res_comp.c
index 81bce5e0a4cc..539d974abad6 100644
--- a/lib/libc/resolv/res_comp.c
+++ b/lib/libc/resolv/res_comp.c
@@ -66,7 +66,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_comp.c,v 1.3.18.2 2005/07/28 07:38:11 marka Exp $";
+static const char rcsid[] = "$Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/resolv/res_data.c b/lib/libc/resolv/res_data.c
index 5a1a50c8c84c..f02083863b03 100644
--- a/lib/libc/resolv/res_data.c
+++ b/lib/libc/resolv/res_data.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: res_data.c,v 1.3.18.2 2007/09/14 05:35:47 marka Exp $";
+static const char rcsid[] = "$Id: res_data.c,v 1.7 2008/12/11 09:59:00 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -107,13 +107,6 @@ res_init(void) {
 	if (!(_res.options & RES_INIT))
 		_res.options = RES_DEFAULT;
 
-	/*
-	 * This one used to initialize implicitly to zero, so unless the app
-	 * has set it to something in particular, we can randomize it now.
-	 */
-	if (!_res.id)
-		_res.id = res_randomid();
-
 	return (__res_vinit(&_res, 1));
 }
 
@@ -264,6 +257,16 @@ res_querydomain(const char *name,
 				 answer, anslen));
 }
 
+u_int
+res_randomid(void) {
+	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
+		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
+		return (-1);
+	}
+
+	return (res_nrandomid(&_res));
+}
+
 int
 res_opt(int n0, u_char *buf, int buflen, int anslen)
 {
diff --git a/lib/libc/resolv/res_debug.c b/lib/libc/resolv/res_debug.c
index c2707bb6ca9c..8ab02630f523 100644
--- a/lib/libc/resolv/res_debug.c
+++ b/lib/libc/resolv/res_debug.c
@@ -1,7 +1,24 @@
+/*
+ * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1996-2003  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and/or 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 ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC 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.
+ */
+
 /*
  * Copyright (c) 1985
  *    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:
@@ -13,7 +30,7 @@
  * 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
@@ -29,14 +46,14 @@
 
 /*
  * Portions Copyright (c) 1993 by Digital Equipment 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, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -72,26 +89,9 @@
  * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * 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 ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC 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.
- */
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_debug.c,v 1.10.18.6 2008/04/03 23:15:15 marka Exp $";
+static const char rcsid[] = "$Id: res_debug.c,v 1.19 2009/02/26 11:20:20 tbox Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -327,7 +327,7 @@ res_pquery(const res_state statp, const u_char *msg, int len, FILE *file) {
 		fprintf(file, ", %s: %d",
 			p_section(ns_s_ar, opcode), arcount);
 	}
-	if ((!statp->pfcode) || (statp->pfcode & 
+	if ((!statp->pfcode) || (statp->pfcode &
 		(RES_PRF_HEADX | RES_PRF_HEAD2 | RES_PRF_HEAD1))) {
 		putc('\n',file);
 	}
@@ -494,6 +494,24 @@ const struct res_sym __p_type_syms[] = {
 	{ns_t_nimloc,	"NIMLOC",	"NIMROD locator (unimplemented)"},
 	{ns_t_srv,	"SRV",		"server selection"},
 	{ns_t_atma,	"ATMA",		"ATM address (unimplemented)"},
+	{ns_t_naptr,	"NAPTR",	"naptr"},
+	{ns_t_kx,	"KX",		"key exchange"},
+	{ns_t_cert,	"CERT",		"certificate"},
+	{ns_t_a6,	"A",		"IPv6 address (experminental)"},
+	{ns_t_dname,	"DNAME",	"non-terminal redirection"},
+	{ns_t_opt,	"OPT",		"opt"},
+	{ns_t_apl,	"apl",		"apl"},
+	{ns_t_ds,	"DS",		"delegation signer"},
+	{ns_t_sshfp,	"SSFP",		"SSH fingerprint"},
+	{ns_t_ipseckey,	"IPSECKEY",	"IPSEC key"},
+	{ns_t_rrsig,	"RRSIG",	"rrsig"},
+	{ns_t_nsec,	"NSEC",		"nsec"},
+	{ns_t_dnskey,	"DNSKEY",	"DNS key"},
+	{ns_t_dhcid,	"DHCID",       "dynamic host configuration identifier"},
+	{ns_t_nsec3,	"NSEC3",	"nsec3"},
+	{ns_t_nsec3param, "NSEC3PARAM", "NSEC3 parameters"},
+	{ns_t_hip,	"HIP",		"host identity protocol"},
+	{ns_t_spf,	"SPF",		"sender policy framework"},
 	{ns_t_tkey,	"TKEY",		"tkey"},
 	{ns_t_tsig,	"TSIG",		"transaction signature"},
 	{ns_t_ixfr,	"IXFR",		"incremental zone transfer"},
@@ -509,6 +527,7 @@ const struct res_sym __p_type_syms[] = {
 	{ns_t_sink,	"SINK",		"Kitchen Sink (experimental)"},
 	{ns_t_opt,	"OPT",		"EDNS Options"},
 	{ns_t_any,	"ANY",		"\"any\""},
+	{ns_t_dlv,	"DLV",		"DNSSEC look-aside validation"},
 	{0, 		NULL,		NULL}
 };
 
@@ -936,7 +955,7 @@ loc_aton(ascii, binary)
 		altsign = -1;
 		cp++;
 	}
-    
+
 	if (*cp == '+')
 		cp++;
 
@@ -965,7 +984,7 @@ loc_aton(ascii, binary)
 		goto defaults;
 
 	siz = precsize_aton(&cp);
-	
+
 	while (!isspace((unsigned char)*cp) && (cp < maxcp))	/*%< if trailing garbage or m */
 		cp++;
 
@@ -998,7 +1017,7 @@ loc_aton(ascii, binary)
 	PUTLONG(latit,bcp);
 	PUTLONG(longit,bcp);
 	PUTLONG(alt,bcp);
-    
+
 	return (16);		/*%< size of RR in octets */
 }
 
@@ -1024,7 +1043,7 @@ loc_ntoa(binary, ascii)
 	int32_t latval, longval, altval;
 	u_int32_t templ;
 	u_int8_t sizeval, hpval, vpval, versionval;
-    
+
 	char *sizestr, *hpstr, *vpstr;
 
 	versionval = *cp++;
@@ -1138,7 +1157,7 @@ dn_count_labels(const char *name) {
 }
 
 /*%
- * Make dates expressed in seconds-since-Jan-1-1970 easy to read.  
+ * Make dates expressed in seconds-since-Jan-1-1970 easy to read.
  * SIG records are required to be printed like this, by the Secure DNS RFC.
  */
 char *
@@ -1148,7 +1167,7 @@ p_secstodate (u_long secs) {
 	struct tm *time;
 #ifdef HAVE_TIME_R
 	struct tm res;
-	
+
 	time = gmtime_r(&clock, &res);
 #else
 	time = gmtime(&clock);
diff --git a/lib/libc/resolv/res_findzonecut.c b/lib/libc/resolv/res_findzonecut.c
index 23c1af4f359c..92ed5a3d9188 100644
--- a/lib/libc/resolv/res_findzonecut.c
+++ b/lib/libc/resolv/res_findzonecut.c
@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_findzonecut.c,v 1.7.18.3 2005/10/11 00:25:11 marka Exp $";
+static const char rcsid[] = "$Id: res_findzonecut.c,v 1.10 2005/10/11 00:10:16 marka Exp $";
 #endif /* not lint */
 
 /*
diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c
index 5193c1d739e8..b5444ef364bc 100644
--- a/lib/libc/resolv/res_init.c
+++ b/lib/libc/resolv/res_init.c
@@ -66,7 +66,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
-static const char rcsid[] = "$Id: res_init.c,v 1.16.18.7 2007/07/09 01:52:58 marka Exp $";
+static const char rcsid[] = "$Id: res_init.c,v 1.26 2008/12/11 09:59:00 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -91,6 +91,19 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <netdb.h>
 
+#ifndef HAVE_MD5
+# include "../dst/md5.h"
+#else
+# ifdef SOLARIS2
+#  include <sys/md5.h>
+# elif _LIBC
+# include <md5.h>
+# endif
+#endif
+#ifndef _MD5_H_
+# define _MD5_H_ 1	/*%< make sure we do not include rsaref md5.h file */
+#endif
+
 #include "un-namespace.h"
 
 #include "port_after.h"
@@ -178,9 +191,12 @@ __res_vinit(res_state statp, int preinit) {
 		statp->retrans = RES_TIMEOUT;
 		statp->retry = RES_DFLRETRY;
 		statp->options = RES_DEFAULT;
-		statp->id = res_randomid();
 	}
 
+	statp->_rnd = malloc(16);
+	res_rndinit(statp);
+	statp->id = res_nrandomid(statp);
+
 	memset(u, 0, sizeof(u));
 #ifdef USELOOPBACK
 	u[nserv].sin.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
@@ -715,12 +731,48 @@ net_mask(in)		/*!< XXX - should really use system's version of this  */
 }
 #endif
 
-u_int
-res_randomid(void) {
+static u_char srnd[16];
+
+void
+res_rndinit(res_state statp)
+{
 	struct timeval now;
+	u_int32_t u32;
+	u_int16_t u16;
+	u_char *rnd = statp->_rnd == NULL ? srnd : statp->_rnd;
 
 	gettimeofday(&now, NULL);
-	return (0xffff & (now.tv_sec ^ now.tv_usec ^ getpid()));
+	u32 = now.tv_sec;
+	memcpy(rnd, &u32, 4);
+	u32 = now.tv_usec;
+	memcpy(rnd + 4, &u32, 4);
+	u32 += now.tv_sec;
+	memcpy(rnd + 8, &u32, 4);
+	u16 = getpid();
+	memcpy(rnd + 12, &u16, 2);
+}
+
+u_int
+res_nrandomid(res_state statp) {
+	struct timeval now;
+	u_int16_t u16;
+	MD5_CTX ctx;
+	u_char *rnd = statp->_rnd == NULL ? srnd : statp->_rnd;
+
+	gettimeofday(&now, NULL);
+	u16 = (u_int16_t) (now.tv_sec ^ now.tv_usec);
+	memcpy(rnd + 14, &u16, 2);
+#ifndef HAVE_MD5
+	MD5_Init(&ctx);
+	MD5_Update(&ctx, rnd, 16);
+	MD5_Final(rnd, &ctx);
+#else
+	MD5Init(&ctx);
+	MD5Update(&ctx, rnd, 16);
+	MD5Final(rnd, &ctx);
+#endif
+	memcpy(&u16, rnd + 14, 2);
+	return ((u_int) u16);
 }
 
 /*%
@@ -750,10 +802,15 @@ res_nclose(res_state statp) {
 void
 res_ndestroy(res_state statp) {
 	res_nclose(statp);
-	if (statp->_u._ext.ext != NULL)
+	if (statp->_u._ext.ext != NULL) {
 		free(statp->_u._ext.ext);
+		statp->_u._ext.ext = NULL;
+	}
+	if (statp->_rnd != NULL) {
+		free(statp->_rnd);
+		statp->_rnd = NULL;
+	}
 	statp->options &= ~RES_INIT;
-	statp->_u._ext.ext = NULL;
 }
 
 #ifndef _LIBC
diff --git a/lib/libc/resolv/res_mkquery.c b/lib/libc/resolv/res_mkquery.c
index 7bd9cda55707..b60d8f53e49b 100644
--- a/lib/libc/resolv/res_mkquery.c
+++ b/lib/libc/resolv/res_mkquery.c
@@ -1,7 +1,24 @@
+/*
+ * Portions Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1996, 1997, 1988, 1999, 2001, 2003  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and/or 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 ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC 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.
+ */
+
 /*
  * Copyright (c) 1985, 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:
@@ -13,7 +30,7 @@
  * 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
@@ -29,14 +46,14 @@
 
 /*
  * Portions Copyright (c) 1993 by Digital Equipment 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, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -47,26 +64,9 @@
  * SOFTWARE.
  */
 
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * 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 ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC 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.
- */
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_mkquery.c,v 1.5.18.2 2008/04/03 23:15:15 marka Exp $";
+static const char rcsid[] = "$Id: res_mkquery.c,v 1.10 2008/12/11 09:59:00 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -121,7 +121,8 @@ res_nmkquery(res_state statp,
 		return (-1);
 	memset(buf, 0, HFIXEDSZ);
 	hp = (HEADER *) buf;
-	hp->id = htons(++statp->id);
+	statp->id = res_nrandomid(statp);
+	hp->id = htons(statp->id);
 	hp->opcode = op;
 	hp->rd = (statp->options & RES_RECURSE) != 0U;
 	hp->rcode = NOERROR;
diff --git a/lib/libc/resolv/res_mkupdate.c b/lib/libc/resolv/res_mkupdate.c
index 589c056035fe..00bce4c53ccb 100644
--- a/lib/libc/resolv/res_mkupdate.c
+++ b/lib/libc/resolv/res_mkupdate.c
@@ -22,7 +22,7 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_mkupdate.c,v 1.4.18.4 2005/10/14 05:44:12 marka Exp $";
+static const char rcsid[] = "$Id: res_mkupdate.c,v 1.10 2008/12/11 09:59:00 marka Exp $";
 #endif /* not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -116,7 +116,8 @@ res_nmkupdate(res_state statp, ns_updrec *rrecp_in, u_char *buf, int buflen) {
 		return (-1);
 	memset(buf, 0, HFIXEDSZ);
 	hp = (HEADER *) buf;
-	hp->id = htons(++statp->id);
+	statp->id = res_nrandomid(statp);
+	hp->id = htons(statp->id);
 	hp->opcode = ns_o_update;
 	hp->rcode = NOERROR;
 	cp = buf + HFIXEDSZ;
diff --git a/lib/libc/resolv/res_query.c b/lib/libc/resolv/res_query.c
index 854909ccb136..4ae97f64b12f 100644
--- a/lib/libc/resolv/res_query.c
+++ b/lib/libc/resolv/res_query.c
@@ -1,7 +1,24 @@
+/*
+ * Portions Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1996-2001, 2003  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and/or 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 ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC 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.
+ */
+
 /*
  * Copyright (c) 1988, 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:
@@ -13,7 +30,7 @@
  * 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
@@ -29,14 +46,14 @@
 
 /*
  * Portions Copyright (c) 1993 by Digital Equipment 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, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -47,26 +64,9 @@
  * SOFTWARE.
  */
 
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * 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 ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC 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.
- */
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_query.c,v 1.7.18.2 2008/04/03 23:15:15 marka Exp $";
+static const char rcsid[] = "$Id: res_query.c,v 1.11 2008/11/14 02:36:51 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/lib/libc/resolv/res_send.c b/lib/libc/resolv/res_send.c
index f7c38c51a31f..fd1cd06baff5 100644
--- a/lib/libc/resolv/res_send.c
+++ b/lib/libc/resolv/res_send.c
@@ -1,7 +1,24 @@
+/*
+ * Portions Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 1996-2003  Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and/or 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 ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC 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.
+ */
+
 /*
  * Copyright (c) 1985, 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:
@@ -13,7 +30,7 @@
  * 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
@@ -29,14 +46,14 @@
 
 /*
  * Portions Copyright (c) 1993 by Digital Equipment 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, and that
  * the name of Digital Equipment Corporation not be used in advertising or
  * publicity pertaining to distribution of the document or software without
  * specific, written prior permission.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
  * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -47,26 +64,9 @@
  * SOFTWARE.
  */
 
-/*
- * Copyright (c) 2005 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * 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 ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC 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.
- */
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.9.18.10 2008/01/27 02:06:26 marka Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.22 2009/01/22 23:49:23 tbox Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -353,7 +353,7 @@ res_nsend(res_state statp,
 				if (EXT(statp).nssocks[ns] == -1)
 					continue;
 				peerlen = sizeof(peer);
-				if (_getsockname(EXT(statp).nssocks[ns],
+				if (_getpeername(EXT(statp).nssocks[ns],
 				    (struct sockaddr *)&peer, &peerlen) < 0) {
 					needclose++;
 					break;
@@ -404,7 +404,7 @@ res_nsend(res_state statp,
 		nstime = EXT(statp).nstimes[0];
 		for (ns = 0; ns < lastns; ns++) {
 			if (EXT(statp).ext != NULL)
-                                EXT(statp).ext->nsaddrs[ns] = 
+				EXT(statp).ext->nsaddrs[ns] =
 					EXT(statp).ext->nsaddrs[ns + 1];
 			statp->nsaddr_list[ns] = statp->nsaddr_list[ns + 1];
 			EXT(statp).nssocks[ns] = EXT(statp).nssocks[ns + 1];
@@ -687,12 +687,12 @@ send_vc(res_state statp,
 		/*
 		 * Disable generation of SIGPIPE when writing to a closed
 		 * socket.  Write should return -1 and set errno to EPIPE
-		 * instead. 
+		 * instead.
 		 *
 		 * Push on even if setsockopt(SO_NOSIGPIPE) fails.
 		 */
 		(void)_setsockopt(statp->_vcsock, SOL_SOCKET, SO_NOSIGPIPE, &on,
-			         sizeof(on));
+				 sizeof(on));
 #endif
 		errno = 0;
 		if (_connect(statp->_vcsock, nsap, nsaplen) < 0) {
diff --git a/lib/libc/resolv/res_update.c b/lib/libc/resolv/res_update.c
index a05e26d1f57e..8e866e3edf8b 100644
--- a/lib/libc/resolv/res_update.c
+++ b/lib/libc/resolv/res_update.c
@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_update.c,v 1.12.18.1 2005/04/27 05:01:12 sra Exp $";
+static const char rcsid[] = "$Id: res_update.c,v 1.13 2005/04/27 04:56:43 sra Exp $";
 #endif /* not lint */
 
 /*
diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c
index 456b031dd01b..ef9b45b8b6f1 100644
--- a/lib/libc/stdio/fflush.c
+++ b/lib/libc/stdio/fflush.c
@@ -60,7 +60,7 @@ fflush(FILE *fp)
 
 	/*
 	 * There is disagreement about the correct behaviour of fflush()
-	 * when passed a file which is not open for reading.  According to
+	 * when passed a file which is not open for writing.  According to
 	 * the ISO C standard, the behaviour is undefined.
 	 * Under linux, such an fflush returns success and has no effect;
 	 * under Windows, such an fflush is documented as behaving instead
@@ -68,11 +68,13 @@ fflush(FILE *fp)
 	 * Given that applications may be written with the expectation of
 	 * either of these two behaviours, the only safe (non-astonishing)
 	 * option is to return EBADF and ask that applications be fixed.
+	 * SUSv3 now requires that fflush() returns success on a read-only
+	 * stream.
+	 *
 	 */
-	if ((fp->_flags & (__SWR | __SRW)) == 0) {
-		errno = EBADF;
-		retval = EOF;
-	} else
+	if ((fp->_flags & (__SWR | __SRW)) == 0)
+		retval = 0;
+	else
 		retval = __sflush(fp);
 	FUNLOCKFILE(fp);
 	return (retval);
@@ -89,10 +91,9 @@ __fflush(FILE *fp)
 
 	if (fp == NULL)
 		return (_fwalk(sflush_locked));
-	if ((fp->_flags & (__SWR | __SRW)) == 0) {
-		errno = EBADF;
-		retval = EOF;
-	} else
+	if ((fp->_flags & (__SWR | __SRW)) == 0)
+		retval = 0;
+	else
 		retval = __sflush(fp);
 	return (retval);
 }
@@ -122,6 +123,12 @@ __sflush(FILE *fp)
 	for (; n > 0; n -= t, p += t) {
 		t = _swrite(fp, (char *)p, n);
 		if (t <= 0) {
+			/* Reset _p and _w. */
+			if (p > fp->_p)	/* Some was written. */
+				memmove(fp->_p, p, n);
+			fp->_p += n;
+			if ((fp->_flags & (__SLBF | __SNBF)) == 0)
+				fp->_w -= n;
 			fp->_flags |= __SERR;
 			return (EOF);
 		}
diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c
index 3b8f2c9d1b68..32e57645f56a 100644
--- a/lib/libc/stdio/fputs.c
+++ b/lib/libc/stdio/fputs.c
@@ -55,7 +55,7 @@ fputs(const char * __restrict s, FILE * __restrict fp)
 	struct __siov iov;
 
 	iov.iov_base = (void *)s;
-	iov.iov_len = uio.uio_resid = strlen(s);
+	uio.uio_resid = iov.iov_len = strlen(s);
 	uio.uio_iov = &iov;
 	uio.uio_iovcnt = 1;
 	FLOCKFILE(fp);
diff --git a/lib/libc/stdio/fputws.c b/lib/libc/stdio/fputws.c
index fa8d31784e09..41530673c007 100644
--- a/lib/libc/stdio/fputws.c
+++ b/lib/libc/stdio/fputws.c
@@ -67,7 +67,7 @@ fputws_l(const wchar_t * __restrict ws, FILE * __restrict fp, locale_t locale)
 		    &fp->_mbstate);
 		if (nbytes == (size_t)-1)
 			goto error;
-		iov.iov_len = uio.uio_resid = nbytes;
+		uio.uio_resid = iov.iov_len = nbytes;
 		if (__sfvwrite(fp, &uio) != 0)
 			goto error;
 	} while (wsp != NULL);
diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c
index 0ff83bf96175..4dcd50fbb13d 100644
--- a/lib/libc/stdio/freopen.c
+++ b/lib/libc/stdio/freopen.c
@@ -97,7 +97,7 @@ freopen(const char * __restrict file, const char * __restrict mode,
 		    (dflags & (O_ACCMODE | O_EXEC)) != (oflags & O_ACCMODE)) {
 			fclose(fp);
 			FUNLOCKFILE(fp);
-			errno = EINVAL;
+			errno = EBADF;
 			return (NULL);
 		}
 		if (fp->_flags & __SWR)
@@ -151,6 +151,14 @@ freopen(const char * __restrict file, const char * __restrict mode,
 
 	/* Get a new descriptor to refer to the new file. */
 	f = _open(file, oflags, DEFFILEMODE);
+	/* If out of fd's close the old one and try again. */
+	if (f < 0 && isopen && wantfd > STDERR_FILENO &&
+	    (errno == ENFILE || errno == EMFILE)) {
+		(void) (*fp->_close)(fp->_cookie);
+		isopen = 0;
+		wantfd = -1;
+		f = _open(file, oflags, DEFFILEMODE);
+	}
 	sverrno = errno;
 
 finish:
diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c
index 2c8800ccfe19..745d500513d9 100644
--- a/lib/libc/stdio/ftell.c
+++ b/lib/libc/stdio/ftell.c
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include "namespace.h"
 #include <sys/types.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
 #include "un-namespace.h"
@@ -87,6 +88,7 @@ _ftello(FILE *fp, fpos_t *offset)
 {
 	fpos_t pos;
 	size_t n;
+	int dflags;
 
 	if (fp->_seek == NULL) {
 		errno = ESPIPE;			/* historic practice */
@@ -118,6 +120,22 @@ _ftello(FILE *fp, fpos_t *offset)
 		if (HASUB(fp))
 			pos -= fp->_r;  /* Can be negative at this point. */
 	} else if ((fp->_flags & __SWR) && fp->_p != NULL) {
+		dflags = 0;
+		if (fp->_flags & __SAPP)
+			dflags = O_APPEND;
+		else if (fp->_file != -1 &&
+			 (dflags = _fcntl(fp->_file, F_GETFL)) < 0)
+			return (1);
+		if ((dflags & O_APPEND) &&
+		    (pos = _sseek(fp, (fpos_t)0, SEEK_END)) == -1) {
+			if ((fp->_flags & __SOPT) || __sflush(fp) ||
+			    (pos = _sseek(fp, (fpos_t)0, SEEK_CUR)) == -1)
+				return (1);
+			else {
+				*offset = pos;
+				return (0);
+			}
+		}
 		/*
 		 * Writing.  Any buffered characters cause the
 		 * position to be greater than that in the
diff --git a/lib/libc/stdio/getline.3 b/lib/libc/stdio/getline.3
index 21619995d390..05f07d003e02 100644
--- a/lib/libc/stdio/getline.3
+++ b/lib/libc/stdio/getline.3
@@ -95,6 +95,7 @@ size_t linecap = 0;
 ssize_t linelen;
 while ((linelen = getline(&line, &linecap, fp)) > 0)
 	fwrite(line, linelen, 1, stdout);
+free(line);
 .Ed
 .Sh COMPATIBILITY
 Many application writers used the name
diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c
index c7c1c2fa38c8..c9438515323a 100644
--- a/lib/libc/stdio/gets.c
+++ b/lib/libc/stdio/gets.c
@@ -52,7 +52,7 @@ gets(char *buf)
 	int c;
 	char *s;
 	static int warned;
-	static char w[] =
+	static const char w[] =
 	    "warning: this program uses gets(), which is unsafe.\n";
 
 	FLOCKFILE(stdin);
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 05c30dcfb523..058f9a9f7d67 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -827,14 +827,14 @@ first appeared in the
 .Tn GNU C
 library.
 These were implemented by
-.An Peter Wemm Aq peter@FreeBSD.org
+.An Peter Wemm Aq Mt peter@FreeBSD.org
 in
 .Fx 2.2 ,
 but were later replaced with a different implementation
 from
 .Ox 2.3
 by
-.An Todd C. Miller Aq Todd.Miller@courtesan.com .
+.An Todd C. Miller Aq Mt Todd.Miller@courtesan.com .
 The
 .Fn dprintf
 and
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
index 5ee7fc1c63f0..124afc73d600 100644
--- a/lib/libc/stdio/puts.c
+++ b/lib/libc/stdio/puts.c
@@ -51,12 +51,12 @@ int
 puts(char const *s)
 {
 	int retval;
-	size_t c = strlen(s);
+	size_t c;
 	struct __suio uio;
 	struct __siov iov[2];
 
 	iov[0].iov_base = (void *)s;
-	iov[0].iov_len = c;
+	iov[0].iov_len = c = strlen(s);
 	iov[1].iov_base = "\n";
 	iov[1].iov_len = 1;
 	uio.uio_resid = c + 1;
diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c
index 0360cafc4052..ecd5d095de5e 100644
--- a/lib/libc/stdio/putw.c
+++ b/lib/libc/stdio/putw.c
@@ -50,7 +50,7 @@ putw(int w, FILE *fp)
 	struct __siov iov;
 
 	iov.iov_base = &w;
-	iov.iov_len = uio.uio_resid = sizeof(w);
+	uio.uio_resid = iov.iov_len = sizeof(w);
 	uio.uio_iov = &iov;
 	uio.uio_iovcnt = 1;
 	FLOCKFILE(fp);
diff --git a/lib/libc/stdio/rewind.c b/lib/libc/stdio/rewind.c
index ff4c9072c76b..133e3f43dd0c 100644
--- a/lib/libc/stdio/rewind.c
+++ b/lib/libc/stdio/rewind.c
@@ -53,9 +53,8 @@ rewind(FILE *fp)
 		__sinit();
 
 	FLOCKFILE(fp);
-	if (_fseeko(fp, (off_t)0, SEEK_SET, 1) == 0) {
-		clearerr_unlocked(fp);
+	if (_fseeko(fp, (off_t)0, SEEK_SET, 1) == 0)
 		errno = serrno;
-	}
+	clearerr_unlocked(fp);	/* POSIX: clear stdio error regardless */
 	FUNLOCKFILE(fp);
 }
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
index ea47d36ea14a..e54e8acf00ff 100644
--- a/lib/libc/stdio/vfprintf.c
+++ b/lib/libc/stdio/vfprintf.c
@@ -455,8 +455,10 @@ __vfprintf(FILE *fp, locale_t locale, const char *fmt0, va_list ap)
 		return (__xvprintf(fp, fmt0, ap));
 
 	/* sorry, fprintf(read_only_file, "") returns EOF, not 0 */
-	if (prepwrite(fp) != 0)
+	if (prepwrite(fp) != 0) {
+		errno = EBADF;
 		return (EOF);
+	}
 
 	convbuf = NULL;
 	fmt = (char *)fmt0;
diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c
index 4350c48acafc..b75c504b1e72 100644
--- a/lib/libc/stdio/vfwprintf.c
+++ b/lib/libc/stdio/vfwprintf.c
@@ -531,8 +531,10 @@ __vfwprintf(FILE *fp, locale_t locale, const wchar_t *fmt0, va_list ap)
 
 
 	/* sorry, fwprintf(read_only_file, L"") returns WEOF, not 0 */
-	if (prepwrite(fp) != 0)
+	if (prepwrite(fp) != 0) {
+		errno = EBADF;
 		return (EOF);
+	}
 
 	convbuf = NULL;
 	fmt = (wchar_t *)fmt0;
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c
index 3f697e287a1f..5bc3c4dc3e77 100644
--- a/lib/libc/stdio/wbuf.c
+++ b/lib/libc/stdio/wbuf.c
@@ -36,6 +36,7 @@ static char sccsid[] = "@(#)wbuf.c	8.1 (Berkeley) 6/4/93";
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <errno.h>
 #include <stdio.h>
 #include "local.h"
 
@@ -59,8 +60,10 @@ __swbuf(int c, FILE *fp)
 	 * calls might wrap _w from negative to positive.
 	 */
 	fp->_w = fp->_lbfsize;
-	if (prepwrite(fp) != 0)
+	if (prepwrite(fp) != 0) {
+		errno = EBADF;
 		return (EOF);
+	}
 	c = (unsigned char)c;
 
 	ORIENT(fp, -1);
diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
index 68dda94c5d40..57205a756a97 100644
--- a/lib/libc/stdlib/Makefile.inc
+++ b/lib/libc/stdlib/Makefile.inc
@@ -35,6 +35,7 @@ MLINKS+=exit.3 _Exit.3
 MLINKS+=getenv.3 putenv.3 getenv.3 setenv.3 getenv.3 unsetenv.3
 MLINKS+=getopt_long.3 getopt_long_only.3
 MLINKS+=hcreate.3 hdestroy.3 hcreate.3 hsearch.3
+MLINKS+=hcreate.3 hcreate_r.3 hcreate.3 hdestroy_r.3 hcreate.3 hsearch_r.3
 MLINKS+=insque.3 remque.3
 MLINKS+=lsearch.3 lfind.3
 MLINKS+=ptsname.3 grantpt.3 ptsname.3 unlockpt.3
diff --git a/lib/libc/stdlib/Symbol.map b/lib/libc/stdlib/Symbol.map
index d28a8e9ecbd5..64c0e169dd27 100644
--- a/lib/libc/stdlib/Symbol.map
+++ b/lib/libc/stdlib/Symbol.map
@@ -109,6 +109,9 @@ FBSD_1.4 {
 	heapsort_b;
 	mergesort_b;
 	qsort_b;
+	hcreate_r;
+	hdestroy_r;
+	hsearch_r;
 };
 
 FBSDprivate_1.0 {
diff --git a/lib/libc/stdlib/a64l.3 b/lib/libc/stdlib/a64l.3
index 61fbffdbab33..eadc2f393460 100644
--- a/lib/libc/stdlib/a64l.3
+++ b/lib/libc/stdlib/a64l.3
@@ -181,7 +181,7 @@ functions
 were added to
 .Fx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 Almost all of this manual page came from the
 .Tn POSIX
 standard.
diff --git a/lib/libc/stdlib/getopt.3 b/lib/libc/stdlib/getopt.3
index 03a63abb19c5..6e04e1704712 100644
--- a/lib/libc/stdlib/getopt.3
+++ b/lib/libc/stdlib/getopt.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: getopt.3,v 1.31 2003/09/23 10:26:54 wiz Exp $
+.\"	$NetBSD: getopt.3,v 1.34 2014/06/05 22:09:50 wiz Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -30,7 +30,7 @@
 .\"     @(#)getopt.3	8.5 (Berkeley) 4/27/95
 .\" $FreeBSD$
 .\"
-.Dd April 27, 1995
+.Dd June 5, 2014
 .Dt GETOPT 3
 .Os
 .Sh NAME
@@ -65,6 +65,17 @@ The option string
 may contain the following elements: individual characters, and
 characters followed by a colon to indicate an option argument
 is to follow.
+If an individual character is followed by two colons, then the
+option argument is optional;
+.Va optarg
+is set to the rest of the current
+.Va argv
+word, or
+.Dv NULL
+if there were no more characters in the current word.
+This is a
+.Tn GNU
+extension.
 For example, an option string
 .Li \&"x"
 recognizes an option
diff --git a/lib/libc/stdlib/getopt.c b/lib/libc/stdlib/getopt.c
index b9d2ae31fc64..3929b321dca9 100644
--- a/lib/libc/stdlib/getopt.c
+++ b/lib/libc/stdlib/getopt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getopt.c,v 1.26 2003/08/07 16:43:40 agc Exp $	*/
+/*	$NetBSD: getopt.c,v 1.29 2014/06/05 22:00:22 christos Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -59,10 +59,7 @@ char	*optarg;		/* argument associated with option */
  *	Parse argc/argv argument vector.
  */
 int
-getopt(nargc, nargv, ostr)
-	int nargc;
-	char * const nargv[];
-	const char *ostr;
+getopt(int nargc, char * const nargv[], const char *ostr)
 {
 	static char *place = EMSG;		/* option letter processing */
 	char *oli;				/* option letter list index */
@@ -115,6 +112,12 @@ getopt(nargc, nargv, ostr)
 		   entire next argument. */
 		if (*place)
 			optarg = place;
+		else if (oli[2] == ':')
+			/*
+			 * GNU Extension, for optional arguments if the rest of
+			 * the argument is empty, we return NULL
+			 */
+			optarg = NULL;
 		else if (nargc > ++optind)
 			optarg = nargv[optind];
 		else {
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c
index 9f7f6d5ae733..9534a2aff67e 100644
--- a/lib/libc/stdlib/getopt_long.c
+++ b/lib/libc/stdlib/getopt_long.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getopt_long.c,v 1.22 2006/10/04 21:29:04 jmc Exp $	*/
+/*	$OpenBSD: getopt_long.c,v 1.26 2013/06/08 22:47:56 millert Exp $	*/
 /*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
 
 /*
@@ -248,7 +248,7 @@ parse_long_options(char * const *nargv, const char *options,
 		if (short_too && current_argv_len == 1)
 			continue;
 
-		if (match == -1)        /* first partial match */
+		if (match == -1)	/* first partial match */
 			match = i;
 		else if ((flags & FLAG_LONGONLY) ||
 			 long_options[i].has_arg !=
@@ -359,30 +359,11 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
 {
 	char *oli;				/* option letter list index */
 	int optchar, short_too;
-	int posixly_correct;	/* no static, can be changed on the fly */
+	static int posixly_correct = -1;
 
 	if (options == NULL)
 		return (-1);
 
-	/*
-	 * Disable GNU extensions if POSIXLY_CORRECT is set or options
-	 * string begins with a '+'.
-	 */
-	posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
-#ifdef GNU_COMPATIBLE
-	if (*options == '-')
-		flags |= FLAG_ALLARGS;
-	else if (posixly_correct || *options == '+')
-		flags &= ~FLAG_PERMUTE;
-#else
-	if (posixly_correct || *options == '+')
-		flags &= ~FLAG_PERMUTE;
-	else if (*options == '-')
-		flags |= FLAG_ALLARGS;
-#endif
-	if (*options == '+' || *options == '-')
-		options++;
-
 	/*
 	 * XXX Some GNU programs (like cvs) set optind to 0 instead of
 	 * XXX using optreset.  Work around this braindamage.
@@ -390,6 +371,19 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
 	if (optind == 0)
 		optind = optreset = 1;
 
+	/*
+	 * Disable GNU extensions if POSIXLY_CORRECT is set or options
+	 * string begins with a '+'.
+	 */
+	if (posixly_correct == -1 || optreset)
+		posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
+	if (*options == '-')
+		flags |= FLAG_ALLARGS;
+	else if (posixly_correct || *options == '+')
+		flags &= ~FLAG_PERMUTE;
+	if (*options == '+' || *options == '-')
+		options++;
+
 	optarg = NULL;
 	if (optreset)
 		nonopt_start = nonopt_end = -1;
diff --git a/lib/libc/stdlib/hcreate.3 b/lib/libc/stdlib/hcreate.3
index 2466c9f428a6..2161f9262c8b 100644
--- a/lib/libc/stdlib/hcreate.3
+++ b/lib/libc/stdlib/hcreate.3
@@ -28,11 +28,16 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 6, 2008
+.Dd July 21, 2014
 .Dt HCREATE 3
 .Os
 .Sh NAME
-.Nm hcreate , hdestroy , hsearch
+.Nm hcreate ,
+.Nm hcreate_r ,
+.Nm hdestroy ,
+.Nm hdestroy_r ,
+.Nm hsearch ,
+.Nm hsearch_r
 .Nd manage hash search table
 .Sh LIBRARY
 .Lb libc
@@ -40,16 +45,25 @@
 .In search.h
 .Ft int
 .Fn hcreate "size_t nel"
+.Ft int
+.Fn hcreate_r "size_t nel" "struct hsearch_data *table"
 .Ft void
-.Fn hdestroy void
+.Fn hdestroy "void"
+.Ft void
+.Fn hdestroy_r "struct hsearch_data *table"
 .Ft ENTRY *
 .Fn hsearch "ENTRY item" "ACTION action"
+.Ft int
+.Fn hsearch_r "ENTRY item" "ACTION action" "ENTRY ** itemp" "struct hsearch_data *table"
 .Sh DESCRIPTION
 The
 .Fn hcreate ,
+.Fn hcreate_r ,
 .Fn hdestroy ,
+.Fn hdestroy_r
+.Fn hsearch ,
 and
-.Fn hsearch
+.Fn hsearch_r
 functions manage hash search tables.
 .Pp
 The
@@ -90,7 +104,7 @@ argument is a structure of type
 .Vt ENTRY
 (defined in the
 .In search.h
-header) containing two pointers:
+header) that contains two pointers:
 .Fa item.key
 points to the comparison key (a
 .Vt "char *" ) ,
@@ -136,21 +150,50 @@ is
 and
 .Fn hdestroy
 is called.
+.Pp
+The
+.Fn hcreate_r ,
+.Fn hdestroy_r ,
+and
+.Fn hsearch_r
+functions are re-entrant versions of the above functions that can
+operate on a table supplied by the user.
+The
+.Fn hsearch_r
+function returns
+.Dv 0
+if the action is
+.Dv ENTER
+and the element cannot be created,
+.Dv 1
+otherwise.
+If the element exists or can be created, it will be placed in
+.Fa itemp ,
+otherwise
+.Fa itemp
+will be set to
+.Dv NULL .
 .Sh RETURN VALUES
 The
 .Fn hcreate
-function returns 0 if the table creation failed and the global variable
+and
+.Fn hcreate_r
+functions return 0 if the table creation failed and the global variable
 .Va errno
 is set to indicate the error;
 otherwise, a non-zero value is returned.
 .Pp
 The
 .Fn hdestroy
-function does not return a value.
+and
+.Fn hdestroy_r
+functions return no value.
 .Pp
 The
 .Fn hsearch
-function returns a
+and
+.Fn hsearch_r
+functions return a
 .Dv NULL
 pointer if either the
 .Fa action
@@ -223,15 +266,31 @@ main(void)
 .Sh ERRORS
 The
 .Fn hcreate
-and
+.Fn hcreate_r ,
 .Fn hsearch
-functions may fail if:
+and
+.Fn hsearch_r
+functions will fail if:
 .Bl -tag -width Er
 .It Bq Er ENOMEM
-Insufficient storage space is available.
+Insufficient memory is available.
 .It Bq Er EINVAL
 A table already exists.
 .El
+.Pp
+The
+.Fn hsearch
+and
+.Fn hsearch_r
+functions will also fail if the action is
+.Dv SEARCH
+and the element is not found:
+.Bl -tag -width Er
+.It Bq Er ESRCH
+The
+.Fa item
+given is not found.
+.El
 .Sh SEE ALSO
 .Xr bsearch 3 ,
 .Xr lsearch 3 ,
@@ -254,5 +313,15 @@ and
 .Fn hsearch
 functions first appeared in
 .At V .
+The
+.Fn hcreate_r ,
+.Fn hdestroy_r
+and
+.Fn hsearch_r
+functions are
+.Tn GNU
+extensions.
 .Sh BUGS
-The interface permits the use of only one hash table at a time.
+The original,
+.Pf non- Tn GNU
+interface permits the use of only one hash table at a time.
diff --git a/lib/libc/stdlib/hcreate.c b/lib/libc/stdlib/hcreate.c
index c68fe1b76a52..b3be9b4dc435 100644
--- a/lib/libc/stdlib/hcreate.c
+++ b/lib/libc/stdlib/hcreate.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $ */
+/* $NetBSD: hcreate.c,v 1.7 2011/09/14 23:33:51 christos Exp $ */
 
 /*
  * Copyright (c) 2001 Christopher G. Demetriou
@@ -12,12 +12,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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *          This product includes software developed for the
- *          NetBSD Project.  See http://www.netbsd.org/ for
- *          information about NetBSD.
- * 4. The name of the author may not be used to endorse or promote products
+ * 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
@@ -49,7 +44,7 @@
 #include <sys/cdefs.h>
 #if 0
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $");
+__RCSID("$NetBSD: hcreate.c,v 1.8 2011/09/17 16:54:39 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
 __FBSDID("$FreeBSD$");
@@ -84,20 +79,27 @@ SLIST_HEAD(internal_head, internal_entry);
 /* Default hash function, from db/hash/hash_func.c */
 extern u_int32_t (*__default_hash)(const void *, size_t);
 
-static struct internal_head *htable;
-static size_t htablesize;
+static struct hsearch_data htable;
 
 int
 hcreate(size_t nel)
 {
-	size_t idx;
-	unsigned int p2;
 
 	/* Make sure this is not called when a table already exists. */
-	if (htable != NULL) {
+	if (htable.table != NULL) {
 		errno = EINVAL;
 		return 0;
 	}
+	return hcreate_r(nel, &htable);
+}
+
+int
+hcreate_r(size_t nel, struct hsearch_data *head)
+{
+	struct internal_head *table;
+	size_t idx;
+	unsigned int p2;
+	void *p;
 
 	/* If nel is too small, make it min sized. */
 	if (nel < MIN_BUCKETS)
@@ -115,71 +117,102 @@ hcreate(size_t nel)
 	}
 	
 	/* Allocate the table. */
-	htablesize = nel;
-	htable = malloc(htablesize * sizeof htable[0]);
-	if (htable == NULL) {
+	head->size = nel;
+	head->filled = 0;
+	p = malloc(nel * sizeof table[0]);
+	if (p == NULL) {
 		errno = ENOMEM;
 		return 0;
 	}
+	head->table = p;
+	table = p;
 
 	/* Initialize it. */
-	for (idx = 0; idx < htablesize; idx++)
-		SLIST_INIT(&htable[idx]);
+	for (idx = 0; idx < nel; idx++)
+		SLIST_INIT(&table[idx]);
 
 	return 1;
 }
 
 void
 hdestroy(void)
+{
+	hdestroy_r(&htable);
+}
+
+void
+hdestroy_r(struct hsearch_data *head)
 {
 	struct internal_entry *ie;
 	size_t idx;
+	void *p;
+	struct internal_head *table;
 
-	if (htable == NULL)
+	if (head == NULL)
 		return;
 
-	for (idx = 0; idx < htablesize; idx++) {
-		while (!SLIST_EMPTY(&htable[idx])) {
-			ie = SLIST_FIRST(&htable[idx]);
-			SLIST_REMOVE_HEAD(&htable[idx], link);
-			free(ie->ent.key);
+	p = head->table;
+	head->table = NULL;
+	table = p;
+
+	for (idx = 0; idx < head->size; idx++) {
+		while (!SLIST_EMPTY(&table[idx])) {
+			ie = SLIST_FIRST(&table[idx]);
+			SLIST_REMOVE_HEAD(&table[idx], link);
 			free(ie);
 		}
 	}
-	free(htable);
-	htable = NULL;
+	free(table);
 }
 
 ENTRY *
 hsearch(ENTRY item, ACTION action)
 {
-	struct internal_head *head;
+	ENTRY *ep;
+	(void)hsearch_r(item, action, &ep, &htable);
+	return ep;
+}
+
+int
+hsearch_r(ENTRY item, ACTION action, ENTRY **itemp, struct hsearch_data *head)
+{
+	struct internal_head *table, *chain;
 	struct internal_entry *ie;
 	uint32_t hashval;
 	size_t len;
+	void *p;
+
+	p = head->table;
+	table = p;
 
 	len = strlen(item.key);
 	hashval = (*__default_hash)(item.key, len);
 
-	head = &htable[hashval & (htablesize - 1)];
-	ie = SLIST_FIRST(head);
+	chain = &table[hashval & (head->size - 1)];
+	ie = SLIST_FIRST(chain);
 	while (ie != NULL) {
 		if (strcmp(ie->ent.key, item.key) == 0)
 			break;
 		ie = SLIST_NEXT(ie, link);
 	}
 
-	if (ie != NULL)
-		return &ie->ent;
-	else if (action == FIND)
-		return NULL;
+	if (ie != NULL) {
+		*itemp = &ie->ent;
+		return 1;
+	} else if (action == FIND) {
+		*itemp = NULL;
+		errno = ESRCH;
+		return 1;
+	}
 
 	ie = malloc(sizeof *ie);
 	if (ie == NULL)
-		return NULL;
+		return 0;
 	ie->ent.key = item.key;
 	ie->ent.data = item.data;
 
-	SLIST_INSERT_HEAD(head, ie, link);
-	return &ie->ent;
+	SLIST_INSERT_HEAD(chain, ie, link);
+	*itemp = &ie->ent;
+	head->filled++;
+	return 1;
 }
diff --git a/lib/libc/stdlib/strfmon.3 b/lib/libc/stdlib/strfmon.3
index f82dfa30290a..47f7131b677c 100644
--- a/lib/libc/stdlib/strfmon.3
+++ b/lib/libc/stdlib/strfmon.3
@@ -171,10 +171,10 @@ function conforms to
 The
 .Fn strfmon
 function was implemented by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Jeroen Ruigrok van der Werven Aq asmodai@FreeBSD.org
+.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org
 based on the standards' text.
 .Sh BUGS
 The
diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c
index b82797dc6d1e..689c78b8bff3 100644
--- a/lib/libc/stdlib/strfmon.c
+++ b/lib/libc/stdlib/strfmon.c
@@ -526,7 +526,6 @@ __format_grouped_double(double value, int *flags,
 	char		*rslt;
 	char		*avalue;
 	int		avalue_size;
-	char		fmt[32];
 
 	size_t		bufsize;
 	char		*bufend;
@@ -567,14 +566,13 @@ __format_grouped_double(double value, int *flags,
 		left_prec += get_groups(left_prec, grouping);
 
 	/* convert to string */
-	snprintf(fmt, sizeof(fmt), "%%%d.%df", left_prec + right_prec + 1,
-	    right_prec);
-	avalue_size = asprintf(&avalue, fmt, value);
+	avalue_size = asprintf(&avalue, "%*.*f", left_prec + right_prec + 1,
+	    right_prec, value);
 	if (avalue_size < 0)
 		return (NULL);
 
 	/* make sure that we've enough space for result string */
-	bufsize = strlen(avalue)*2+1;
+	bufsize = avalue_size * 2 + 1;
 	rslt = calloc(1, bufsize);
 	if (rslt == NULL) {
 		free(avalue);
diff --git a/lib/libc/stdlib/strtonum.c b/lib/libc/stdlib/strtonum.c
index 6dccd973606b..aa433d835b36 100644
--- a/lib/libc/stdlib/strtonum.c
+++ b/lib/libc/stdlib/strtonum.c
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- *	$OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $
+ *	$OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $
  */
 
 #include <sys/cdefs.h>
@@ -24,17 +24,17 @@ __FBSDID("$FreeBSD$");
 #include <limits.h>
 #include <stdlib.h>
 
-#define INVALID 	1
-#define TOOSMALL 	2
-#define TOOLARGE 	3
+#define	INVALID		1
+#define	TOOSMALL	2
+#define	TOOLARGE	3
 
 long long
 strtonum(const char *numstr, long long minval, long long maxval,
     const char **errstrp)
 {
 	long long ll = 0;
-	char *ep;
 	int error = 0;
+	char *ep;
 	struct errval {
 		const char *errstr;
 		int err;
@@ -47,9 +47,9 @@ strtonum(const char *numstr, long long minval, long long maxval,
 
 	ev[0].err = errno;
 	errno = 0;
-	if (minval > maxval)
+	if (minval > maxval) {
 		error = INVALID;
-	else {
+	} else {
 		ll = strtoll(numstr, &ep, 10);
 		if (errno == EINVAL || numstr == ep || *ep != '\0')
 			error = INVALID;
diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c
index 149c2bb00f16..16bbf7c2587d 100644
--- a/lib/libc/stdlib/tsearch.c
+++ b/lib/libc/stdlib/tsearch.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $	*/
+/*	$NetBSD: tsearch.c,v 1.7 2012/06/25 22:32:45 abs Exp $	*/
 
 /*
  * Tree search generalized from Knuth (6.2.2) Algorithm T just like
@@ -14,7 +14,7 @@
 #include <sys/cdefs.h>
 #if 0
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $");
+__RCSID("$NetBSD: tsearch.c,v 1.7 2012/06/25 22:32:45 abs Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
 __FBSDID("$FreeBSD$");
@@ -25,10 +25,8 @@ __FBSDID("$FreeBSD$");
 
 /* find or insert datum into search tree */
 void *
-tsearch(vkey, vrootp, compar)
-	const void *vkey;		/* key to be located */
-	void **vrootp;			/* address of tree root */
-	int (*compar)(const void *, const void *);
+tsearch(const void *vkey, void **vrootp,
+    int (*compar)(const void *, const void *))
 {
 	node_t *q;
 	node_t **rootp = (node_t **)vrootp;
@@ -50,8 +48,7 @@ tsearch(vkey, vrootp, compar)
 	q = malloc(sizeof(node_t));		/* T5: key not found */
 	if (q != 0) {				/* make new node */
 		*rootp = q;			/* link new node to old */
-		/* LINTED const castaway ok */
-		q->key = (void *)vkey;		/* initialize new node */
+		q->key = __DECONST(void *, vkey);/* initialize new node */
 		q->llink = q->rlink = NULL;
 	}
 	return q;
diff --git a/lib/libc/stdlib/twalk.c b/lib/libc/stdlib/twalk.c
index 55f220f38750..7acee414d11f 100644
--- a/lib/libc/stdlib/twalk.c
+++ b/lib/libc/stdlib/twalk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: twalk.c,v 1.1 1999/02/22 10:33:16 christos Exp $	*/
+/*	$NetBSD: twalk.c,v 1.4 2012/03/20 16:38:45 matt Exp $	*/
 
 /*
  * Tree search generalized from Knuth (6.2.2) Algorithm T just like
@@ -14,7 +14,7 @@
 #include <sys/cdefs.h>
 #if 0
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: twalk.c,v 1.1 1999/02/22 10:33:16 christos Exp $");
+__RCSID("$NetBSD: twalk.c,v 1.4 2012/03/20 16:38:45 matt Exp $");
 #endif /* LIBC_SCCS and not lint */
 #endif
 __FBSDID("$FreeBSD$");
@@ -23,15 +23,12 @@ __FBSDID("$FreeBSD$");
 #include <search.h>
 #include <stdlib.h>
 
-static void trecurse(const node_t *,
-    void (*action)(const void *, VISIT, int), int level);
+typedef void (*cmp_fn_t)(const void *, VISIT, int);
 
 /* Walk the nodes of a tree */
 static void
-trecurse(root, action, level)
-	const node_t *root;	/* Root of the tree to be walked */
-	void (*action)(const void *, VISIT, int);
-	int level;
+trecurse(const node_t *root,	/* Root of the tree to be walked */
+	cmp_fn_t action, int level)
 {
 
 	if (root->llink == NULL && root->rlink == NULL)
@@ -49,9 +46,7 @@ trecurse(root, action, level)
 
 /* Walk the nodes of a tree */
 void
-twalk(vroot, action)
-	const void *vroot;	/* Root of the tree to be walked */
-	void (*action)(const void *, VISIT, int);
+twalk(const void *vroot, cmp_fn_t action) /* Root of the tree to be walked */
 {
 	if (vroot != NULL && action != NULL)
 		trecurse(vroot, action, 0);
diff --git a/lib/libc/stdtime/strftime.3 b/lib/libc/stdtime/strftime.3
index 0ed023b2cb3a..5847a6b7267d 100644
--- a/lib/libc/stdtime/strftime.3
+++ b/lib/libc/stdtime/strftime.3
@@ -248,7 +248,7 @@ function
 conforms to
 .St -isoC
 with a lot of extensions including
-.Ql %C ,
+.Ql \&%C ,
 .Ql \&%D ,
 .Ql %E* ,
 .Ql %e ,
diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c
index 4ad0bc4352a9..898101136ea5 100644
--- a/lib/libc/stdtime/strftime.c
+++ b/lib/libc/stdtime/strftime.c
@@ -24,9 +24,9 @@
 #ifndef NOID
 static const char	elsieid[] = "@(#)strftime.3	8.3";
 /*
-** Based on the UCB version with the ID appearing below.
-** This is ANSIish only when "multibyte character == plain character".
-*/
+ * Based on the UCB version with the ID appearing below.
+ * This is ANSIish only when "multibyte character == plain character".
+ */
 #endif /* !defined NOID */
 #endif /* !defined lint */
 
@@ -46,10 +46,10 @@ __FBSDID("$FreeBSD$");
 #include "timelocal.h"
 
 static char *	_add(const char *, char *, const char *);
-static char *	_conv(int, const char *, char *, const char *);
+static char *	_conv(int, const char *, char *, const char *, locale_t);
 static char *	_fmt(const char *, const struct tm *, char *, const char *,
 			int *, locale_t);
-static char *	_yconv(int, int, int, int, char *, const char *);
+static char *	_yconv(int, int, int, int, char *, const char *, locale_t);
 
 extern char *	tzname[];
 
@@ -57,32 +57,32 @@ extern char *	tzname[];
 #define YEAR_2000_NAME	"CHECK_STRFTIME_FORMATS_FOR_TWO_DIGIT_YEARS"
 #endif /* !defined YEAR_2000_NAME */
 
-#define IN_NONE	0
-#define IN_SOME	1
-#define IN_THIS	2
-#define IN_ALL	3
+#define	IN_NONE	0
+#define	IN_SOME	1
+#define	IN_THIS	2
+#define	IN_ALL	3
 
-#define PAD_DEFAULT	0
-#define PAD_LESS	1
-#define PAD_SPACE	2
-#define PAD_ZERO	3
+#define	PAD_DEFAULT	0
+#define	PAD_LESS	1
+#define	PAD_SPACE	2
+#define	PAD_ZERO	3
 
 static const char fmt_padding[][4][5] = {
 	/* DEFAULT,	LESS,	SPACE,	ZERO */
-#define PAD_FMT_MONTHDAY	0
-#define PAD_FMT_HMS		0
-#define PAD_FMT_CENTURY		0
-#define PAD_FMT_SHORTYEAR	0
-#define PAD_FMT_MONTH		0
-#define PAD_FMT_WEEKOFYEAR	0
-#define PAD_FMT_DAYOFMONTH	0
+#define	PAD_FMT_MONTHDAY	0
+#define	PAD_FMT_HMS		0
+#define	PAD_FMT_CENTURY		0
+#define	PAD_FMT_SHORTYEAR	0
+#define	PAD_FMT_MONTH		0
+#define	PAD_FMT_WEEKOFYEAR	0
+#define	PAD_FMT_DAYOFMONTH	0
 	{ "%02d",	"%d",	"%2d",	"%02d" },
-#define PAD_FMT_SDAYOFMONTH	1
-#define PAD_FMT_SHMS		1
+#define	PAD_FMT_SDAYOFMONTH	1
+#define	PAD_FMT_SHMS		1
 	{ "%2d",	"%d",	"%2d",	"%02d" },
 #define	PAD_FMT_DAYOFYEAR	2
 	{ "%03d",	"%d",	"%3d",	"%03d" },
-#define PAD_FMT_YEAR		3
+#define	PAD_FMT_YEAR		3
 	{ "%04d",	"%d",	"%4d",	"%04d" }
 };
 
@@ -101,20 +101,20 @@ strftime_l(char * __restrict s, size_t maxsize, const char * __restrict format,
 	if (warn != IN_NONE && getenv(YEAR_2000_NAME) != NULL) {
 		(void) fprintf_l(stderr, loc, "\n");
 		if (format == NULL)
-			(void) fprintf_l(stderr, loc, "NULL strftime format ");
+			(void) fputs("NULL strftime format ", stderr);
 		else	(void) fprintf_l(stderr, loc, "strftime format \"%s\" ",
 				format);
-		(void) fprintf_l(stderr, loc, "yields only two digits of years in ");
+		(void) fputs("yields only two digits of years in ", stderr);
 		if (warn == IN_SOME)
-			(void) fprintf_l(stderr, loc, "some locales");
+			(void) fputs("some locales", stderr);
 		else if (warn == IN_THIS)
-			(void) fprintf_l(stderr, loc, "the current locale");
-		else	(void) fprintf_l(stderr, loc, "all locales");
-		(void) fprintf_l(stderr, loc, "\n");
+			(void) fputs("the current locale", stderr);
+		else	(void) fputs("all locales", stderr);
+		(void) fputs("\n", stderr);
 	}
 #endif /* !defined NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU */
 	if (p == s + maxsize)
-		return 0;
+		return (0);
 	*p = '\0';
 	return p - s;
 }
@@ -176,14 +176,14 @@ locale_t	loc;
 				continue;
 			case 'C':
 				/*
-				** %C used to do a...
-				**	_fmt("%a %b %e %X %Y", t);
-				** ...whereas now POSIX 1003.2 calls for
-				** something completely different.
-				** (ado, 1993-05-24)
-				*/
+				 * %C used to do a...
+				 *	_fmt("%a %b %e %X %Y", t);
+				 * ...whereas now POSIX 1003.2 calls for
+				 * something completely different.
+				 * (ado, 1993-05-24)
+				 */
 				pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 0,
-					pt, ptlim);
+					pt, ptlim, loc);
 				continue;
 			case 'c':
 				{
@@ -200,8 +200,9 @@ locale_t	loc;
 				pt = _fmt("%m/%d/%y", t, pt, ptlim, warnp, loc);
 				continue;
 			case 'd':
-				pt = _conv(t->tm_mday, fmt_padding[PAD_FMT_DAYOFMONTH][PadIndex],
-					pt, ptlim);
+				pt = _conv(t->tm_mday,
+					fmt_padding[PAD_FMT_DAYOFMONTH][PadIndex],
+					pt, ptlim, loc);
 				continue;
 			case 'E':
 				if (Ealternative || Oalternative)
@@ -210,54 +211,57 @@ locale_t	loc;
 				goto label;
 			case 'O':
 				/*
-				** C99 locale modifiers.
-				** The sequences
-				**	%Ec %EC %Ex %EX %Ey %EY
-				**	%Od %oe %OH %OI %Om %OM
-				**	%OS %Ou %OU %OV %Ow %OW %Oy
-				** are supposed to provide alternate
-				** representations.
-				**
-				** FreeBSD extension
-				**      %OB
-				*/
+				 * C99 locale modifiers.
+				 * The sequences
+				 *	%Ec %EC %Ex %EX %Ey %EY
+				 *	%Od %oe %OH %OI %Om %OM
+				 *	%OS %Ou %OU %OV %Ow %OW %Oy
+				 * are supposed to provide alternate
+				 * representations.
+				 *
+				 * FreeBSD extension
+				 *      %OB
+				 */
 				if (Ealternative || Oalternative)
 					break;
 				Oalternative++;
 				goto label;
 			case 'e':
 				pt = _conv(t->tm_mday,
-					fmt_padding[PAD_FMT_SDAYOFMONTH][PadIndex], pt, ptlim);
+					fmt_padding[PAD_FMT_SDAYOFMONTH][PadIndex],
+					pt, ptlim, loc);
 				continue;
 			case 'F':
 				pt = _fmt("%Y-%m-%d", t, pt, ptlim, warnp, loc);
 				continue;
 			case 'H':
 				pt = _conv(t->tm_hour, fmt_padding[PAD_FMT_HMS][PadIndex],
-					pt, ptlim);
+					pt, ptlim, loc);
 				continue;
 			case 'I':
 				pt = _conv((t->tm_hour % 12) ?
 					(t->tm_hour % 12) : 12,
-					fmt_padding[PAD_FMT_HMS][PadIndex], pt, ptlim);
+					fmt_padding[PAD_FMT_HMS][PadIndex],
+					pt, ptlim, loc);
 				continue;
 			case 'j':
 				pt = _conv(t->tm_yday + 1,
-					fmt_padding[PAD_FMT_DAYOFYEAR][PadIndex], pt, ptlim);
+					fmt_padding[PAD_FMT_DAYOFYEAR][PadIndex],
+					pt, ptlim, loc);
 				continue;
 			case 'k':
 				/*
-				** This used to be...
-				**	_conv(t->tm_hour % 12 ?
-				**		t->tm_hour % 12 : 12, 2, ' ');
-				** ...and has been changed to the below to
-				** match SunOS 4.1.1 and Arnold Robbins'
-				** strftime version 3.0. That is, "%k" and
-				** "%l" have been swapped.
-				** (ado, 1993-05-24)
-				*/
+				 * This used to be...
+				 *	_conv(t->tm_hour % 12 ?
+				 *		t->tm_hour % 12 : 12, 2, ' ');
+				 * ...and has been changed to the below to
+				 * match SunOS 4.1.1 and Arnold Robbins'
+				 * strftime version 3.0. That is, "%k" and
+				 * "%l" have been swapped.
+				 * (ado, 1993-05-24)
+				 */
 				pt = _conv(t->tm_hour, fmt_padding[PAD_FMT_SHMS][PadIndex],
-					pt, ptlim);
+					pt, ptlim, loc);
 				continue;
 #ifdef KITCHEN_SINK
 			case 'K':
@@ -269,33 +273,34 @@ locale_t	loc;
 #endif /* defined KITCHEN_SINK */
 			case 'l':
 				/*
-				** This used to be...
-				**	_conv(t->tm_hour, 2, ' ');
-				** ...and has been changed to the below to
-				** match SunOS 4.1.1 and Arnold Robbin's
-				** strftime version 3.0. That is, "%k" and
-				** "%l" have been swapped.
-				** (ado, 1993-05-24)
-				*/
+				 * This used to be...
+				 *	_conv(t->tm_hour, 2, ' ');
+				 * ...and has been changed to the below to
+				 * match SunOS 4.1.1 and Arnold Robbin's
+				 * strftime version 3.0. That is, "%k" and
+				 * "%l" have been swapped.
+				 * (ado, 1993-05-24)
+				 */
 				pt = _conv((t->tm_hour % 12) ?
 					(t->tm_hour % 12) : 12,
-					fmt_padding[PAD_FMT_SHMS][PadIndex], pt, ptlim);
+					fmt_padding[PAD_FMT_SHMS][PadIndex],
+					pt, ptlim, loc);
 				continue;
 			case 'M':
 				pt = _conv(t->tm_min, fmt_padding[PAD_FMT_HMS][PadIndex],
-					pt, ptlim);
+					pt, ptlim, loc);
 				continue;
 			case 'm':
 				pt = _conv(t->tm_mon + 1,
-					fmt_padding[PAD_FMT_MONTH][PadIndex], pt, ptlim);
+					fmt_padding[PAD_FMT_MONTH][PadIndex],
+					pt, ptlim, loc);
 				continue;
 			case 'n':
 				pt = _add("\n", pt, ptlim);
 				continue;
 			case 'p':
 				pt = _add((t->tm_hour >= (HOURSPERDAY / 2)) ?
-					tptr->pm :
-					tptr->am,
+					tptr->pm : tptr->am,
 					pt, ptlim);
 				continue;
 			case 'R':
@@ -307,7 +312,7 @@ locale_t	loc;
 				continue;
 			case 'S':
 				pt = _conv(t->tm_sec, fmt_padding[PAD_FMT_HMS][PadIndex],
-					pt, ptlim);
+					pt, ptlim, loc);
 				continue;
 			case 's':
 				{
@@ -319,9 +324,9 @@ locale_t	loc;
 					tm = *t;
 					mkt = mktime(&tm);
 					if (TYPE_SIGNED(time_t))
-						(void) sprintf(buf, "%ld",
+						(void) sprintf_l(buf, loc, "%ld",
 							(long) mkt);
-					else	(void) sprintf(buf, "%lu",
+					else	(void) sprintf_l(buf, loc, "%lu",
 							(unsigned long) mkt);
 					pt = _add(buf, pt, ptlim);
 				}
@@ -335,40 +340,41 @@ locale_t	loc;
 			case 'U':
 				pt = _conv((t->tm_yday + DAYSPERWEEK -
 					t->tm_wday) / DAYSPERWEEK,
-					fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex], pt, ptlim);
+					fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex],
+					pt, ptlim, loc);
 				continue;
 			case 'u':
 				/*
-				** From Arnold Robbins' strftime version 3.0:
-				** "ISO 8601: Weekday as a decimal number
-				** [1 (Monday) - 7]"
-				** (ado, 1993-05-24)
-				*/
+				 * From Arnold Robbins' strftime version 3.0:
+				 * "ISO 8601: Weekday as a decimal number
+				 * [1 (Monday) - 7]"
+				 * (ado, 1993-05-24)
+				 */
 				pt = _conv((t->tm_wday == 0) ?
 					DAYSPERWEEK : t->tm_wday,
-					"%d", pt, ptlim);
+					"%d", pt, ptlim, loc);
 				continue;
 			case 'V':	/* ISO 8601 week number */
 			case 'G':	/* ISO 8601 year (four digits) */
 			case 'g':	/* ISO 8601 year (two digits) */
 /*
-** From Arnold Robbins' strftime version 3.0: "the week number of the
-** year (the first Monday as the first day of week 1) as a decimal number
-** (01-53)."
-** (ado, 1993-05-24)
-**
-** From "http://www.ft.uni-erlangen.de/~mskuhn/iso-time.html" by Markus Kuhn:
-** "Week 01 of a year is per definition the first week which has the
-** Thursday in this year, which is equivalent to the week which contains
-** the fourth day of January. In other words, the first week of a new year
-** is the week which has the majority of its days in the new year. Week 01
-** might also contain days from the previous year and the week before week
-** 01 of a year is the last week (52 or 53) of the previous year even if
-** it contains days from the new year. A week starts with Monday (day 1)
-** and ends with Sunday (day 7). For example, the first week of the year
-** 1997 lasts from 1996-12-30 to 1997-01-05..."
-** (ado, 1996-01-02)
-*/
+ * From Arnold Robbins' strftime version 3.0: "the week number of the
+ * year (the first Monday as the first day of week 1) as a decimal number
+ * (01-53)."
+ * (ado, 1993-05-24)
+ *
+ * From "http://www.ft.uni-erlangen.de/~mskuhn/iso-time.html" by Markus Kuhn:
+ * "Week 01 of a year is per definition the first week which has the
+ * Thursday in this year, which is equivalent to the week which contains
+ * the fourth day of January. In other words, the first week of a new year
+ * is the week which has the majority of its days in the new year. Week 01
+ * might also contain days from the previous year and the week before week
+ * 01 of a year is the last week (52 or 53) of the previous year even if
+ * it contains days from the new year. A week starts with Monday (day 1)
+ * and ends with Sunday (day 7). For example, the first week of the year
+ * 1997 lasts from 1996-12-30 to 1997-01-05..."
+ * (ado, 1996-01-02)
+ */
 				{
 					int	year;
 					int	base;
@@ -389,15 +395,15 @@ locale_t	loc;
 							DAYSPERLYEAR :
 							DAYSPERNYEAR;
 						/*
-						** What yday (-3 ... 3) does
-						** the ISO year begin on?
-						*/
+						 * What yday (-3 ... 3) does
+						 * the ISO year begin on?
+						 */
 						bot = ((yday + 11 - wday) %
 							DAYSPERWEEK) - 3;
 						/*
-						** What yday does the NEXT
-						** ISO year begin on?
-						*/
+						 * What yday does the NEXT
+						 * ISO year begin on?
+						 */
 						top = bot -
 							(len % DAYSPERWEEK);
 						if (top < -3)
@@ -427,21 +433,21 @@ locale_t	loc;
 #endif /* defined XPG4_1994_04_09 */
 					if (*format == 'V')
 						pt = _conv(w, fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex],
-							pt, ptlim);
+							pt, ptlim, loc);
 					else if (*format == 'g') {
 						*warnp = IN_ALL;
 						pt = _yconv(year, base, 0, 1,
-							pt, ptlim);
+							pt, ptlim, loc);
 					} else	pt = _yconv(year, base, 1, 1,
-							pt, ptlim);
+							pt, ptlim, loc);
 				}
 				continue;
 			case 'v':
 				/*
-				** From Arnold Robbins' strftime version 3.0:
-				** "date as dd-bbb-YYYY"
-				** (ado, 1993-05-24)
-				*/
+				 * From Arnold Robbins' strftime version 3.0:
+				 * "date as dd-bbb-YYYY"
+				 * (ado, 1993-05-24)
+				 */
 				pt = _fmt("%e-%b-%Y", t, pt, ptlim, warnp, loc);
 				continue;
 			case 'W':
@@ -449,10 +455,11 @@ locale_t	loc;
 					(t->tm_wday ?
 					(t->tm_wday - 1) :
 					(DAYSPERWEEK - 1))) / DAYSPERWEEK,
-					fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex], pt, ptlim);
+					fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex],
+					pt, ptlim, loc);
 				continue;
 			case 'w':
-				pt = _conv(t->tm_wday, "%d", pt, ptlim);
+				pt = _conv(t->tm_wday, "%d", pt, ptlim, loc);
 				continue;
 			case 'X':
 				pt = _fmt(tptr->X_fmt, t, pt, ptlim, warnp, loc);
@@ -471,11 +478,11 @@ locale_t	loc;
 			case 'y':
 				*warnp = IN_ALL;
 				pt = _yconv(t->tm_year, TM_YEAR_BASE, 0, 1,
-					pt, ptlim);
+					pt, ptlim, loc);
 				continue;
 			case 'Y':
 				pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 1,
-					pt, ptlim);
+					pt, ptlim, loc);
 				continue;
 			case 'Z':
 #ifdef TM_ZONE
@@ -487,10 +494,10 @@ locale_t	loc;
 					pt = _add(tzname[t->tm_isdst != 0],
 						pt, ptlim);
 				/*
-				** C99 says that %Z must be replaced by the
-				** empty string if the time zone is not
-				** determinable.
-				*/
+				 * C99 says that %Z must be replaced by the
+				 * empty string if the time zone is not
+				 * determinable.
+				 */
 				continue;
 			case 'z':
 				{
@@ -503,24 +510,24 @@ locale_t	loc;
 				diff = t->TM_GMTOFF;
 #else /* !defined TM_GMTOFF */
 				/*
-				** C99 says that the UTC offset must
-				** be computed by looking only at
-				** tm_isdst. This requirement is
-				** incorrect, since it means the code
-				** must rely on magic (in this case
-				** altzone and timezone), and the
-				** magic might not have the correct
-				** offset. Doing things correctly is
-				** tricky and requires disobeying C99;
-				** see GNU C strftime for details.
-				** For now, punt and conform to the
-				** standard, even though it's incorrect.
-				**
-				** C99 says that %z must be replaced by the
-				** empty string if the time zone is not
-				** determinable, so output nothing if the
-				** appropriate variables are not available.
-				*/
+				 * C99 says that the UTC offset must
+				 * be computed by looking only at
+				 * tm_isdst. This requirement is
+				 * incorrect, since it means the code
+				 * must rely on magic (in this case
+				 * altzone and timezone), and the
+				 * magic might not have the correct
+				 * offset. Doing things correctly is
+				 * tricky and requires disobeying C99;
+				 * see GNU C strftime for details.
+				 * For now, punt and conform to the
+				 * standard, even though it's incorrect.
+				 *
+				 * C99 says that %z must be replaced by the
+				 * empty string if the time zone is not
+				 * determinable, so output nothing if the
+				 * appropriate variables are not available.
+				 */
 				if (t->tm_isdst == 0)
 #ifdef USG_COMPAT
 					diff = -timezone;
@@ -537,13 +544,15 @@ locale_t	loc;
 				if (diff < 0) {
 					sign = "-";
 					diff = -diff;
-				} else	sign = "+";
+				} else
+					sign = "+";
 				pt = _add(sign, pt, ptlim);
 				diff /= SECSPERMIN;
 				diff = (diff / MINSPERHOUR) * 100 +
 					(diff % MINSPERHOUR);
 				pt = _conv(diff,
-					fmt_padding[PAD_FMT_YEAR][PadIndex], pt, ptlim);
+					fmt_padding[PAD_FMT_YEAR][PadIndex],
+					pt, ptlim, loc);
 				}
 				continue;
 			case '+':
@@ -567,10 +576,10 @@ locale_t	loc;
 				goto label;
 			case '%':
 			/*
-			** X311J/88-090 (4.12.3.5): if conversion char is
-			** undefined, behavior is undefined. Print out the
-			** character itself as printf(3) also does.
-			*/
+			 * X311J/88-090 (4.12.3.5): if conversion char is
+			 * undefined, behavior is undefined. Print out the
+			 * character itself as printf(3) also does.
+			 */
 			default:
 				break;
 			}
@@ -579,19 +588,20 @@ locale_t	loc;
 			break;
 		*pt++ = *format;
 	}
-	return pt;
+	return (pt);
 }
 
 static char *
-_conv(n, format, pt, ptlim)
+_conv(n, format, pt, ptlim, loc)
 const int		n;
 const char * const	format;
 char * const		pt;
 const char * const	ptlim;
+locale_t		loc;
 {
 	char	buf[INT_STRLEN_MAXIMUM(int) + 1];
 
-	(void) sprintf(buf, format, n);
+	(void) sprintf_l(buf, loc, format, n);
 	return _add(buf, pt, ptlim);
 }
 
@@ -603,30 +613,31 @@ const char * const	ptlim;
 {
 	while (pt < ptlim && (*pt = *str++) != '\0')
 		++pt;
-	return pt;
+	return (pt);
 }
 
 /*
-** POSIX and the C Standard are unclear or inconsistent about
-** what %C and %y do if the year is negative or exceeds 9999.
-** Use the convention that %C concatenated with %y yields the
-** same output as %Y, and that %Y contains at least 4 bytes,
-** with more only if necessary.
-*/
+ * POSIX and the C Standard are unclear or inconsistent about
+ * what %C and %y do if the year is negative or exceeds 9999.
+ * Use the convention that %C concatenated with %y yields the
+ * same output as %Y, and that %Y contains at least 4 bytes,
+ * with more only if necessary.
+ */
 
 static char *
-_yconv(a, b, convert_top, convert_yy, pt, ptlim)
+_yconv(a, b, convert_top, convert_yy, pt, ptlim, loc)
 const int		a;
 const int		b;
 const int		convert_top;
 const int		convert_yy;
 char *			pt;
 const char * const	ptlim;
+locale_t		loc;
 {
 	register int	lead;
 	register int	trail;
 
-#define DIVISOR	100
+#define	DIVISOR	100
 	trail = a % DIVISOR + b % DIVISOR;
 	lead = a / DIVISOR + b / DIVISOR + trail / DIVISOR;
 	trail %= DIVISOR;
@@ -640,9 +651,10 @@ const char * const	ptlim;
 	if (convert_top) {
 		if (lead == 0 && trail < 0)
 			pt = _add("-0", pt, ptlim);
-		else	pt = _conv(lead, "%02d", pt, ptlim);
+		else	pt = _conv(lead, "%02d", pt, ptlim, loc);
 	}
 	if (convert_yy)
-		pt = _conv(((trail < 0) ? -trail : trail), "%02d", pt, ptlim);
-	return pt;
+		pt = _conv(((trail < 0) ? -trail : trail), "%02d", pt,
+		     ptlim, loc);
+	return (pt);
 }
diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
index fb94dcd0df43..2333ab47e76e 100644
--- a/lib/libc/stdtime/strptime.c
+++ b/lib/libc/stdtime/strptime.c
@@ -1,25 +1,6 @@
-/*
- * Powerdog Industries kindly requests feedback from anyone modifying
- * this function:
- *
- * Date: Thu, 05 Jun 1997 23:17:17 -0400  
- * From: Kevin Ruddy <kevin.ruddy@powerdog.com>
- * To: James FitzGibbon <james@nexis.net>
- * Subject: Re: Use of your strptime(3) code (fwd)
- * 
- * The reason for the "no mod" clause was so that modifications would
- * come back and we could integrate them and reissue so that a wider 
- * audience could use it (thereby spreading the wealth).  This has   
- * made it possible to get strptime to work on many operating systems.
- * I'm not sure why that's "plain unacceptable" to the FreeBSD team.
- * 
- * Anyway, you can change it to "with or without modification" as
- * you see fit.  Enjoy.                                          
- * 
- * Kevin Ruddy
- * Powerdog Industries, Inc.
- */
-/*
+/*-
+ * Copyright (c) 2014 Gary Mills
+ * Copyright 2011, Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 1994 Powerdog Industries.  All rights reserved.
  *
  * Copyright (c) 2011 The FreeBSD Foundation
@@ -36,12 +17,6 @@
  *    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 Powerdog Industries.
- * 4. The name of Powerdog Industries may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY POWERDOG INDUSTRIES ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -54,6 +29,10 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation
+ * are those of the authors and should not be interpreted as representing
+ * official policies, either expressed or implied, of Powerdog Industries.
  */
 
 #include <sys/cdefs.h>
@@ -79,7 +58,7 @@ __FBSDID("$FreeBSD$");
 
 static char * _strptime(const char *, const char *, struct tm *, int *, locale_t);
 
-#define asizeof(a)	(sizeof (a) / sizeof ((a)[0]))
+#define	asizeof(a)	(sizeof (a) / sizeof ((a)[0]))
 
 static char *
 _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
@@ -87,8 +66,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 {
 	char	c;
 	const char *ptr;
-	int	i,
-		len;
+	int	i, len;
 	int Ealternative, Oalternative;
 	struct lc_time_T *tptr = __get_current_time_locale(locale);
 
@@ -105,7 +83,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				       isspace_l((unsigned char)*buf, locale))
 					buf++;
 			else if (c != *buf++)
-				return 0;
+				return (NULL);
 			continue;
 		}
 
@@ -117,18 +95,18 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 		case 0:
 		case '%':
 			if (*buf++ != '%')
-				return 0;
+				return (NULL);
 			break;
 
 		case '+':
 			buf = _strptime(buf, tptr->date_fmt, tm, GMTp, locale);
-			if (buf == 0)
-				return 0;
+			if (buf == NULL)
+				return (NULL);
 			break;
 
 		case 'C':
 			if (!isdigit_l((unsigned char)*buf, locale))
-				return 0;
+				return (NULL);
 
 			/* XXX This will break for 3-digit centuries. */
 			len = 2;
@@ -139,21 +117,21 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				len--;
 			}
 			if (i < 19)
-				return 0;
+				return (NULL);
 
 			tm->tm_year = i * 100 - 1900;
 			break;
 
 		case 'c':
 			buf = _strptime(buf, tptr->c_fmt, tm, GMTp, locale);
-			if (buf == 0)
-				return 0;
+			if (buf == NULL)
+				return (NULL);
 			break;
 
 		case 'D':
 			buf = _strptime(buf, "%m/%d/%y", tm, GMTp, locale);
-			if (buf == 0)
-				return 0;
+			if (buf == NULL)
+				return (NULL);
 			break;
 
 		case 'E':
@@ -170,43 +148,43 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 
 		case 'F':
 			buf = _strptime(buf, "%Y-%m-%d", tm, GMTp, locale);
-			if (buf == 0)
-				return 0;
+			if (buf == NULL)
+				return (NULL);
 			break;
 
 		case 'R':
 			buf = _strptime(buf, "%H:%M", tm, GMTp, locale);
-			if (buf == 0)
-				return 0;
+			if (buf == NULL)
+				return (NULL);
 			break;
 
 		case 'r':
 			buf = _strptime(buf, tptr->ampm_fmt, tm, GMTp, locale);
-			if (buf == 0)
-				return 0;
+			if (buf == NULL)
+				return (NULL);
 			break;
 
 		case 'T':
 			buf = _strptime(buf, "%H:%M:%S", tm, GMTp, locale);
-			if (buf == 0)
-				return 0;
+			if (buf == NULL)
+				return (NULL);
 			break;
 
 		case 'X':
 			buf = _strptime(buf, tptr->X_fmt, tm, GMTp, locale);
-			if (buf == 0)
-				return 0;
+			if (buf == NULL)
+				return (NULL);
 			break;
 
 		case 'x':
 			buf = _strptime(buf, tptr->x_fmt, tm, GMTp, locale);
-			if (buf == 0)
-				return 0;
+			if (buf == NULL)
+				return (NULL);
 			break;
 
 		case 'j':
 			if (!isdigit_l((unsigned char)*buf, locale))
-				return 0;
+				return (NULL);
 
 			len = 3;
 			for (i = 0; len && *buf != 0 &&
@@ -216,7 +194,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				len--;
 			}
 			if (i < 1 || i > 366)
-				return 0;
+				return (NULL);
 
 			tm->tm_yday = i - 1;
 			break;
@@ -228,7 +206,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				break;
 
 			if (!isdigit_l((unsigned char)*buf, locale))
-				return 0;
+				return (NULL);
 
 			len = 2;
 			for (i = 0; len && *buf != 0 &&
@@ -240,19 +218,14 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 
 			if (c == 'M') {
 				if (i > 59)
-					return 0;
+					return (NULL);
 				tm->tm_min = i;
 			} else {
 				if (i > 60)
-					return 0;
+					return (NULL);
 				tm->tm_sec = i;
 			}
 
-			if (*buf != 0 &&
-				isspace_l((unsigned char)*buf, locale))
-				while (*ptr != 0 &&
-				       !isspace_l((unsigned char)*ptr, locale))
-					ptr++;
 			break;
 
 		case 'H':
@@ -268,7 +241,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			 * digits if used incorrectly.
 			 */
 			if (!isdigit_l((unsigned char)*buf, locale))
-				return 0;
+				return (NULL);
 
 			len = 2;
 			for (i = 0; len && *buf != 0 &&
@@ -279,17 +252,12 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			}
 			if (c == 'H' || c == 'k') {
 				if (i > 23)
-					return 0;
+					return (NULL);
 			} else if (i > 12)
-				return 0;
+				return (NULL);
 
 			tm->tm_hour = i;
 
-			if (*buf != 0 &&
-			    isspace_l((unsigned char)*buf, locale))
-				while (*ptr != 0 &&
-				       !isspace_l((unsigned char)*ptr, locale))
-					ptr++;
 			break;
 
 		case 'p':
@@ -300,7 +268,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			len = strlen(tptr->am);
 			if (strncasecmp_l(buf, tptr->am, len, locale) == 0) {
 				if (tm->tm_hour > 12)
-					return 0;
+					return (NULL);
 				if (tm->tm_hour == 12)
 					tm->tm_hour = 0;
 				buf += len;
@@ -310,14 +278,14 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			len = strlen(tptr->pm);
 			if (strncasecmp_l(buf, tptr->pm, len, locale) == 0) {
 				if (tm->tm_hour > 12)
-					return 0;
+					return (NULL);
 				if (tm->tm_hour != 12)
 					tm->tm_hour += 12;
 				buf += len;
 				break;
 			}
 
-			return 0;
+			return (NULL);
 
 		case 'A':
 		case 'a':
@@ -332,7 +300,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 					break;
 			}
 			if (i == asizeof(tptr->weekday))
-				return 0;
+				return (NULL);
 
 			tm->tm_wday = i;
 			buf += len;
@@ -347,7 +315,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			 * range for now.
 			 */
 			if (!isdigit_l((unsigned char)*buf, locale))
-				return 0;
+				return (NULL);
 
 			len = 2;
 			for (i = 0; len && *buf != 0 &&
@@ -357,44 +325,43 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				len--;
 			}
 			if (i > 53)
-				return 0;
+				return (NULL);
 
-			if (*buf != 0 &&
-			    isspace_l((unsigned char)*buf, locale))
-				while (*ptr != 0 &&
-				       !isspace_l((unsigned char)*ptr, locale))
-					ptr++;
 			break;
 
 		case 'w':
 			if (!isdigit_l((unsigned char)*buf, locale))
-				return 0;
+				return (NULL);
 
 			i = *buf - '0';
 			if (i > 6)
-				return 0;
+				return (NULL);
 
 			tm->tm_wday = i;
 
-			if (*buf != 0 &&
-			    isspace_l((unsigned char)*buf, locale))
-				while (*ptr != 0 &&
-				       !isspace_l((unsigned char)*ptr, locale))
-					ptr++;
 			break;
 
-		case 'd':
 		case 'e':
 			/*
-			 * The %e specifier is explicitly documented as not
-			 * being zero-padded but there is no harm in allowing
+			 * With %e format, our strftime(3) adds a blank space
+			 * before single digits.
+			 */
+			if (*buf != 0 &&
+			    isspace_l((unsigned char)*buf, locale))
+			       buf++;
+			/* FALLTHROUGH */
+		case 'd':
+			/*
+			 * The %e specifier was once explicitly documented as
+			 * not being zero-padded but was later changed to
+			 * equivalent to %d.  There is no harm in allowing
 			 * such padding.
 			 *
 			 * XXX The %e specifier may gobble one too many
 			 * digits if used incorrectly.
 			 */
 			if (!isdigit_l((unsigned char)*buf, locale))
-				return 0;
+				return (NULL);
 
 			len = 2;
 			for (i = 0; len && *buf != 0 &&
@@ -404,15 +371,10 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				len--;
 			}
 			if (i > 31)
-				return 0;
+				return (NULL);
 
 			tm->tm_mday = i;
 
-			if (*buf != 0 &&
-			    isspace_l((unsigned char)*buf, locale))
-				while (*ptr != 0 &&
-				       !isspace_l((unsigned char)*ptr, locale))
-					ptr++;
 			break;
 
 		case 'B':
@@ -447,7 +409,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				}
 			}
 			if (i == asizeof(tptr->month))
-				return 0;
+				return (NULL);
 
 			tm->tm_mon = i;
 			buf += len;
@@ -455,7 +417,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 
 		case 'm':
 			if (!isdigit_l((unsigned char)*buf, locale))
-				return 0;
+				return (NULL);
 
 			len = 2;
 			for (i = 0; len && *buf != 0 &&
@@ -465,15 +427,10 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				len--;
 			}
 			if (i < 1 || i > 12)
-				return 0;
+				return (NULL);
 
 			tm->tm_mon = i - 1;
 
-			if (*buf != 0 &&
-			    isspace_l((unsigned char)*buf, locale))
-				while (*ptr != 0 &&
-				       !isspace_l((unsigned char)*ptr, locale))
-					ptr++;
 			break;
 
 		case 's':
@@ -488,7 +445,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			n = strtol_l(buf, &cp, 10, locale);
 			if (errno == ERANGE || (long)(t = n) != n) {
 				errno = sverrno;
-				return 0;
+				return (NULL);
 			}
 			errno = sverrno;
 			buf = cp;
@@ -504,7 +461,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				break;
 
 			if (!isdigit_l((unsigned char)*buf, locale))
-				return 0;
+				return (NULL);
 
 			len = (c == 'Y') ? 4 : 2;
 			for (i = 0; len && *buf != 0 &&
@@ -518,15 +475,10 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			if (c == 'y' && i < 69)
 				i += 100;
 			if (i < 0)
-				return 0;
+				return (NULL);
 
 			tm->tm_year = i;
 
-			if (*buf != 0 &&
-			    isspace_l((unsigned char)*buf, locale))
-				while (*ptr != 0 &&
-				       !isspace_l((unsigned char)*ptr, locale))
-					ptr++;
 			break;
 
 		case 'Z':
@@ -549,7 +501,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				} else if (0 == strcmp(zonestr, tzname[1])) {
 				    tm->tm_isdst = 1;
 				} else {
-				    return 0;
+				    return (NULL);
 				}
 				buf += cp - buf;
 			}
@@ -564,7 +516,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 				if (*buf == '-')
 					sign = -1;
 				else
-					return 0;
+					return (NULL);
 			}
 
 			buf++;
@@ -575,7 +527,7 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 					i += *buf - '0';
 					buf++;
 				} else
-					return 0;
+					return (NULL);
 			}
 
 			tm->tm_hour -= sign * (i / 100);
@@ -583,9 +535,15 @@ _strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
 			*GMTp = 1;
 			}
 			break;
+
+		case 'n':
+		case 't':
+			while (isspace_l((unsigned char)*buf, locale))
+				buf++;
+			break;
 		}
 	}
-	return (char *)buf;
+	return ((char *)buf);
 }
 
 
diff --git a/lib/libc/stdtime/timelocal.c b/lib/libc/stdtime/timelocal.c
index 3d9d096c7492..362cec3958ce 100644
--- a/lib/libc/stdtime/timelocal.c
+++ b/lib/libc/stdtime/timelocal.c
@@ -46,7 +46,7 @@ struct xlocale_time {
 
 struct xlocale_time __xlocale_global_time;
 
-#define LCTIME_SIZE (sizeof(struct lc_time_T) / sizeof(char *))
+#define	LCTIME_SIZE (sizeof(struct lc_time_T) / sizeof(char *))
 
 static const struct lc_time_T	_C_time_locale = {
 	{
diff --git a/lib/libc/string/memmem.3 b/lib/libc/string/memmem.3
index 73c267c14c10..31cdf77135e2 100644
--- a/lib/libc/string/memmem.3
+++ b/lib/libc/string/memmem.3
@@ -80,7 +80,7 @@ The
 function first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
-.An Pascal Gloor Aq pascal.gloor@spale.com
+.An Pascal Gloor Aq Mt pascal.gloor@spale.com
 .Sh BUGS
 This function was broken in Linux libc up to and including version 5.0.9
 and in GNU libc prior to version 2.1.
diff --git a/lib/libc/string/strerror.3 b/lib/libc/string/strerror.3
index 50b155530017..a47494fd0784 100644
--- a/lib/libc/string/strerror.3
+++ b/lib/libc/string/strerror.3
@@ -172,7 +172,7 @@ The
 function was implemented in
 .Fx 4.4
 by
-.An Wes Peters Aq wes@FreeBSD.org .
+.An Wes Peters Aq Mt wes@FreeBSD.org .
 .Sh BUGS
 The
 .Fn strerror
diff --git a/lib/libc/string/strtok.3 b/lib/libc/string/strtok.3
index 97a8b156b929..78c22655d4ac 100644
--- a/lib/libc/string/strtok.3
+++ b/lib/libc/string/strtok.3
@@ -150,9 +150,8 @@ function
 conforms to
 .St -isoC .
 .Sh AUTHORS
-.An Wes Peters ,
-Softweyr LLC:
-.Aq wes@softweyr.com
+.An Wes Peters Aq Mt wes@softweyr.com ,
+Softweyr LLC
 .Pp
 Based on the
 .Fx 3.0
diff --git a/lib/libc/sys/abort2.2 b/lib/libc/sys/abort2.2
index 4698c7283846..ca31d74267f3 100644
--- a/lib/libc/sys/abort2.2
+++ b/lib/libc/sys/abort2.2
@@ -108,6 +108,6 @@ system call first appeared in
 The
 .Fn abort2
 system call was designed by
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 It was implemented by
-.An "Wojciech A. Koszek" Aq dunstan@freebsd.czest.pl .
+.An Wojciech A. Koszek Aq Mt dunstan@freebsd.czest.pl .
diff --git a/lib/libc/sys/aio_cancel.2 b/lib/libc/sys/aio_cancel.2
index 54e7b394fc8e..3d9cbaf2ff4f 100644
--- a/lib/libc/sys/aio_cancel.2
+++ b/lib/libc/sys/aio_cancel.2
@@ -109,8 +109,8 @@ appeared in
 .An -nosplit
 This
 manual page was originally written by
-.An Wes Peters Aq wes@softweyr.com .
-.An Christopher M Sedore Aq cmsedore@maxwell.syr.edu
+.An Wes Peters Aq Mt wes@softweyr.com .
+.An Christopher M Sedore Aq Mt cmsedore@maxwell.syr.edu
 updated it when
 .Fn aio_cancel
 was implemented for
diff --git a/lib/libc/sys/aio_error.2 b/lib/libc/sys/aio_error.2
index f63a2dd06c21..030914616121 100644
--- a/lib/libc/sys/aio_error.2
+++ b/lib/libc/sys/aio_error.2
@@ -98,4 +98,4 @@ system call first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Wes Peters Aq wes@softweyr.com .
+.An Wes Peters Aq Mt wes@softweyr.com .
diff --git a/lib/libc/sys/aio_mlock.2 b/lib/libc/sys/aio_mlock.2
index 386393f32b12..95055e8c42b5 100644
--- a/lib/libc/sys/aio_mlock.2
+++ b/lib/libc/sys/aio_mlock.2
@@ -130,4 +130,4 @@ system call first appeared in
 .Fx 10.0 .
 .Sh AUTHORS
 The system call was introduced by
-.An Gleb Smirnoff Aq glebius@FreeBSD.org .
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org .
diff --git a/lib/libc/sys/aio_read.2 b/lib/libc/sys/aio_read.2
index ddf4f7630239..65b5e10d75fd 100644
--- a/lib/libc/sys/aio_read.2
+++ b/lib/libc/sys/aio_read.2
@@ -207,7 +207,7 @@ system call first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Terry Lambert Aq terry@whistle.com .
+.An Terry Lambert Aq Mt terry@whistle.com .
 .Sh BUGS
 Invalid information in
 .Fa iocb->_aiocb_private
diff --git a/lib/libc/sys/aio_return.2 b/lib/libc/sys/aio_return.2
index 2034f9d04822..2ef6c25953f7 100644
--- a/lib/libc/sys/aio_return.2
+++ b/lib/libc/sys/aio_return.2
@@ -99,4 +99,4 @@ system call first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Wes Peters Aq wes@softweyr.com .
+.An Wes Peters Aq Mt wes@softweyr.com .
diff --git a/lib/libc/sys/aio_suspend.2 b/lib/libc/sys/aio_suspend.2
index 5859d1527a93..0ff25f51c5ab 100644
--- a/lib/libc/sys/aio_suspend.2
+++ b/lib/libc/sys/aio_suspend.2
@@ -114,4 +114,4 @@ system call first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Wes Peters Aq wes@softweyr.com .
+.An Wes Peters Aq Mt wes@softweyr.com .
diff --git a/lib/libc/sys/aio_waitcomplete.2 b/lib/libc/sys/aio_waitcomplete.2
index 5145f78118ab..885b3d7fa481 100644
--- a/lib/libc/sys/aio_waitcomplete.2
+++ b/lib/libc/sys/aio_waitcomplete.2
@@ -134,4 +134,4 @@ system call first appeared in
 The
 .Fn aio_waitcomplete
 system call and this manual page were written by
-.An Christopher M Sedore Aq cmsedore@maxwell.syr.edu .
+.An Christopher M Sedore Aq Mt cmsedore@maxwell.syr.edu .
diff --git a/lib/libc/sys/aio_write.2 b/lib/libc/sys/aio_write.2
index 291fd7154bf7..080a6b8bbf58 100644
--- a/lib/libc/sys/aio_write.2
+++ b/lib/libc/sys/aio_write.2
@@ -202,7 +202,7 @@ system call first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Wes Peters Aq wes@softweyr.com .
+.An Wes Peters Aq Mt wes@softweyr.com .
 .Sh BUGS
 Invalid information in
 .Fa iocb->_aiocb_private
diff --git a/lib/libc/sys/bind.2 b/lib/libc/sys/bind.2
index 896b0053cad2..c0f84110ab06 100644
--- a/lib/libc/sys/bind.2
+++ b/lib/libc/sys/bind.2
@@ -28,7 +28,7 @@
 .\"     @(#)bind.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd June 4, 1993
+.Dd June 26, 2014
 .Dt BIND 2
 .Os
 .Sh NAME
@@ -85,6 +85,10 @@ is not a valid descriptor.
 .It Bq Er EINVAL
 The socket is already bound to an address, and the protocol does not support
 binding to a new address; or the socket has been shut down.
+.It Bq Er EINVAL
+The
+.Fa addrlen
+argument is not a valid length for the address family.
 .It Bq Er ENOTSOCK
 The
 .Fa s
diff --git a/lib/libc/sys/bindat.2 b/lib/libc/sys/bindat.2
index 9274679374a8..692099092d6c 100644
--- a/lib/libc/sys/bindat.2
+++ b/lib/libc/sys/bindat.2
@@ -105,5 +105,5 @@ nor a file descriptor associated with a directory.
 The
 .Nm
 was developed by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libc/sys/cap_fcntls_limit.2 b/lib/libc/sys/cap_fcntls_limit.2
index 0f792a5bb3d9..193d97da37eb 100644
--- a/lib/libc/sys/cap_fcntls_limit.2
+++ b/lib/libc/sys/cap_fcntls_limit.2
@@ -122,5 +122,5 @@ Support for capabilities and capabilities mode was developed as part of the
 Project.
 .Sh AUTHORS
 This function was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc/sys/cap_ioctls_limit.2 b/lib/libc/sys/cap_ioctls_limit.2
index 4fdd2551d274..2d1eef9724c4 100644
--- a/lib/libc/sys/cap_ioctls_limit.2
+++ b/lib/libc/sys/cap_ioctls_limit.2
@@ -153,5 +153,5 @@ Support for capabilities and capabilities mode was developed as part of the
 Project.
 .Sh AUTHORS
 This function was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc/sys/cap_rights_limit.2 b/lib/libc/sys/cap_rights_limit.2
index 33b57e135c58..4663951e5029 100644
--- a/lib/libc/sys/cap_rights_limit.2
+++ b/lib/libc/sys/cap_rights_limit.2
@@ -153,5 +153,5 @@ Support for capabilities and capabilities mode was developed as part of the
 Project.
 .Sh AUTHORS
 This function was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc/sys/connect.2 b/lib/libc/sys/connect.2
index ac019e829c37..8ed3f12bc8a2 100644
--- a/lib/libc/sys/connect.2
+++ b/lib/libc/sys/connect.2
@@ -28,7 +28,7 @@
 .\"     @(#)connect.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd September 5, 2010
+.Dd June 26, 2014
 .Dt CONNECT 2
 .Os
 .Sh NAME
@@ -80,6 +80,10 @@ The
 .Fa s
 argument
 is not a valid descriptor.
+.It Bq Er EINVAL
+The
+.Fa namelen
+argument is not a valid length for the address family.
 .It Bq Er ENOTSOCK
 The
 .Fa s
diff --git a/lib/libc/sys/connectat.2 b/lib/libc/sys/connectat.2
index 8cebf98372eb..759b7eac8e2e 100644
--- a/lib/libc/sys/connectat.2
+++ b/lib/libc/sys/connectat.2
@@ -105,5 +105,5 @@ nor a file descriptor associated with a directory.
 The
 .Nm
 was developed by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libc/sys/cpuset.2 b/lib/libc/sys/cpuset.2
index 3e76de39ca32..0c32b42192e8 100644
--- a/lib/libc/sys/cpuset.2
+++ b/lib/libc/sys/cpuset.2
@@ -224,5 +224,5 @@ The
 .Nm
 family of system calls first appeared in
 .Fx 7.1 .
-.Sh AUTHOR
-.An Jeffrey Roberson Aq jeff@FreeBSD.org
+.Sh AUTHORS
+.An Jeffrey Roberson Aq Mt jeff@FreeBSD.org
diff --git a/lib/libc/sys/cpuset_getaffinity.2 b/lib/libc/sys/cpuset_getaffinity.2
index 93cfe95dae22..810a03c72e9d 100644
--- a/lib/libc/sys/cpuset_getaffinity.2
+++ b/lib/libc/sys/cpuset_getaffinity.2
@@ -159,5 +159,5 @@ The
 .Nm
 family of system calls first appeared in
 .Fx 7.1 .
-.Sh AUTHOR
-.An Jeffrey Roberson Aq jeff@FreeBSD.org
+.Sh AUTHORS
+.An Jeffrey Roberson Aq Mt jeff@FreeBSD.org
diff --git a/lib/libc/sys/ffclock.2 b/lib/libc/sys/ffclock.2
index 68ea922e4d69..78fed527b148 100644
--- a/lib/libc/sys/ffclock.2
+++ b/lib/libc/sys/ffclock.2
@@ -171,7 +171,7 @@ Feed-forward clock support first appeared in
 .Sh AUTHORS
 .An -nosplit
 The feed-forward clock support was written by
-.An Julien Ridoux Aq jridoux@unimelb.edu.au
+.An Julien Ridoux Aq Mt jridoux@unimelb.edu.au
 in collaboration with
-.An Darryl Veitch Aq dveitch@unimelb.edu.au
+.An Darryl Veitch Aq Mt dveitch@unimelb.edu.au
 at the University of Melbourne under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index bc10b1de59de..7ce57aaf2d7c 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -133,7 +133,6 @@ executable file.
 A file descriptor argument was out of range, referred to no open file,
 or a read (write) request was made to a file that was only open for
 writing (reading).
-.Pp
 .It Er 10 ECHILD Em "\&No child processes" .
 A
 .Xr wait 2
@@ -302,7 +301,6 @@ addresses with
 Internet protocols.
 .It Er 48 EADDRINUSE Em "Address already in use" .
 Only one usage of each address is normally permitted.
-.Pp
 .It Er 49 EADDRNOTAVAIL Em "Can't assign requested address" .
 Normally results from an attempt to create a socket with an
 address not on this machine.
diff --git a/lib/libc/sys/kenv.2 b/lib/libc/sys/kenv.2
index 866c0d38a6f1..dc17388f08ba 100644
--- a/lib/libc/sys/kenv.2
+++ b/lib/libc/sys/kenv.2
@@ -171,9 +171,9 @@ or the value of a variable is longer than
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Chad David Aq davidc@FreeBSD.org .
+.An Chad David Aq Mt davidc@FreeBSD.org .
 .Pp
 The
 .Fn kenv
 system call was written by
-.An Maxime Henrion Aq mux@FreeBSD.org .
+.An Maxime Henrion Aq Mt mux@FreeBSD.org .
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index b9e496a3c9cd..f84bc05ba293 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 7, 2014
+.Dd July 18, 2014
 .Dt KQUEUE 2
 .Os
 .Sh NAME
@@ -454,7 +454,7 @@ Establishes an arbitrary timer identified by
 .Va ident .
 When adding a timer,
 .Va data
-specifies the timeout period in milliseconds.
+specifies the timeout period.
 The timer will be periodic unless EV_ONESHOT is specified.
 On return,
 .Va data
@@ -465,8 +465,25 @@ There is a system wide limit on the number of timers
 which is controlled by the
 .Va kern.kq_calloutmax
 sysctl.
+.Bl -tag -width XXNOTE_USECONDS
+.It Dv NOTE_SECONDS
+.Va data
+is in seconds.
+.It Dv NOTE_MSECONDS
+.Va data
+is in milliseconds.
+.It Dv NOTE_USECONDS
+.Va data
+is in microseconds.
+.It Dv NOTE_NSECONDS
+.Va data
+is in nanoseconds.
+.It
+.El
 .Pp
-On return,
+If
+.Va fflags
+is not set, the default is milliseconds. On return,
 .Va fflags
 contains the events which triggered the filter.
 .It Dv EVFILT_USER
@@ -613,7 +630,7 @@ system calls first appeared in
 The
 .Fn kqueue
 system and this manual page were written by
-.An Jonathan Lemon Aq jlemon@FreeBSD.org .
+.An Jonathan Lemon Aq Mt jlemon@FreeBSD.org .
 .Sh BUGS
 The
 .Fa timeout
diff --git a/lib/libc/sys/kse.2 b/lib/libc/sys/kse.2
index 41fcc373ea88..95e725624040 100644
--- a/lib/libc/sys/kse.2
+++ b/lib/libc/sys/kse.2
@@ -665,15 +665,15 @@ The KSE system calls first appeared in
 .Sh AUTHORS
 KSE was originally implemented by
 .An -nosplit
-.An "Julian Elischer" Aq julian@FreeBSD.org ,
+.An Julian Elischer Aq Mt julian@FreeBSD.org ,
 with additional contributions by
-.An "Jonathan Mini" Aq mini@FreeBSD.org ,
-.An "Daniel Eischen" Aq deischen@FreeBSD.org ,
+.An Jonathan Mini Aq Mt mini@FreeBSD.org ,
+.An Daniel Eischen Aq Mt deischen@FreeBSD.org ,
 and
-.An "David Xu" Aq davidxu@FreeBSD.org .
+.An David Xu Aq Mt davidxu@FreeBSD.org .
 .Pp
 This manual page was written by
-.An "Archie Cobbs" Aq archie@FreeBSD.org .
+.An Archie Cobbs Aq Mt archie@FreeBSD.org .
 .Sh BUGS
 The KSE code is
 .Ud
diff --git a/lib/libc/sys/listen.2 b/lib/libc/sys/listen.2
index ab22fd18e885..90059f89334b 100644
--- a/lib/libc/sys/listen.2
+++ b/lib/libc/sys/listen.2
@@ -28,7 +28,7 @@
 .\"	From: @(#)listen.2	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd October 20, 2012
+.Dd July 15, 2014
 .Dt LISTEN 2
 .Os
 .Sh NAME
@@ -139,6 +139,9 @@ will fail if:
 The argument
 .Fa s
 is not a valid descriptor.
+.It Bq Er EDESTADDRREQ
+The socket is not bound to a local address, and the protocol does not
+support listening on an unbound socket.
 .It Bq Er EINVAL
 The socket is already connected, or in the process of being connected.
 .It Bq Er ENOTSOCK
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index 01cde0ee5fe9..3dd830326ad0 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -28,7 +28,7 @@
 .\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
 .\" $FreeBSD$
 .\"
-.Dd September 9, 2013
+.Dd June 19, 2014
 .Dt MMAP 2
 .Os
 .Sh NAME
@@ -141,6 +141,12 @@ argument must be 0.
 This flag is identical to
 .Dv MAP_ANON
 and is provided for compatibility.
+.It Dv MAP_EXCL
+This flag can only be used in combination with
+.Dv MAP_FIXED .
+Please see the definition of
+.Dv MAP_FIXED
+for the description of its effect.
 .It Dv MAP_FIXED
 Do not permit the system to select a different address than the one
 specified.
@@ -152,17 +158,21 @@ If
 is specified,
 .Fa addr
 must be a multiple of the pagesize.
-If a
+If
+.Dv MAP_EXCL
+is not specified, a successfull
 .Dv MAP_FIXED
-request is successful, the mapping established by
-.Fn mmap
-replaces any previous mappings for the process' pages in the range from
+request replaces any previous mappings for the process'
+pages in the range from
 .Fa addr
 to
 .Fa addr
 +
 .Fa len .
-Use of this option is discouraged.
+In contrast, if
+.Dv MAP_EXCL
+is specified, the request will fail if a mapping
+already exists within the range.
 .It Dv MAP_HASSEMAPHORE
 Notify the kernel that the region may contain semaphores and that special
 handling may be necessary.
@@ -393,6 +403,17 @@ argument was not -1.
 was specified and the
 .Fa offset
 argument was not 0.
+.It Bq Er EINVAL
+Both
+.Dv MAP_FIXED
+and
+.Dv MAP_EXCL
+were specified, but the requested region is already used by a mapping.
+.It Bq Er EINVAL
+.Dv MAP_EXCL
+was specified, but
+.Dv MAP_FIXED
+was not.
 .It Bq Er ENODEV
 .Dv MAP_ANON
 has not been specified and
diff --git a/lib/libc/sys/mmap.c b/lib/libc/sys/mmap.c
index cfdb9448ea38..0fa03baa374d 100644
--- a/lib/libc/sys/mmap.c
+++ b/lib/libc/sys/mmap.c
@@ -44,18 +44,13 @@ __FBSDID("$FreeBSD$");
  * is not supplied by GCC 1.X but is supplied by GCC 2.X.
  */
 void *
-mmap(addr, len, prot, flags, fd, offset)
-	void *	addr;
-	size_t	len;
-	int	prot;
-	int	flags;
-	int	fd;
-	off_t	offset;
+mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
 {
 
-	if (__getosreldate() >= 700051)
+	if (__getosreldate() >= 700051) {
 		return (__sys_mmap(addr, len, prot, flags, fd, offset));
-	else
-
-		return (__sys_freebsd6_mmap(addr, len, prot, flags, fd, 0, offset));
+	} else {
+		return (__sys_freebsd6_mmap(addr, len, prot, flags, fd, 0,
+		    offset));
+	}
 }
diff --git a/lib/libc/sys/pdfork.2 b/lib/libc/sys/pdfork.2
index a4895159f2ab..e057f769b89e 100644
--- a/lib/libc/sys/pdfork.2
+++ b/lib/libc/sys/pdfork.2
@@ -188,9 +188,9 @@ Project.
 .Sh AUTHORS
 .An -nosplit
 These functions and the capability facility were created by
-.An "Robert N. M. Watson" Aq rwatson@FreeBSD.org
+.An Robert N. M. Watson Aq Mt rwatson@FreeBSD.org
 and
-.An "Jonathan Anderson" Aq jonathan@FreeBSD.org
+.An Jonathan Anderson Aq Mt jonathan@FreeBSD.org
 at the University of Cambridge Computer Laboratory with support from a grant
 from Google, Inc.
 .Sh BUGS
diff --git a/lib/libc/sys/posix_fallocate.2 b/lib/libc/sys/posix_fallocate.2
index 750177751e9a..4c92d9b9c2be 100644
--- a/lib/libc/sys/posix_fallocate.2
+++ b/lib/libc/sys/posix_fallocate.2
@@ -141,4 +141,4 @@ function appeared in
 .Sh AUTHORS
 .Fn posix_fallocate
 and this manual page were initially written by
-.An Matthew Fleming Aq mdf@FreeBSD.org .
+.An Matthew Fleming Aq Mt mdf@FreeBSD.org .
diff --git a/lib/libc/sys/posix_openpt.2 b/lib/libc/sys/posix_openpt.2
index 9ba26068ac72..916e75ac586b 100644
--- a/lib/libc/sys/posix_openpt.2
+++ b/lib/libc/sys/posix_openpt.2
@@ -137,4 +137,4 @@ is included for compatibility; in
 opening a terminal does not cause it to become a process's controlling
 terminal.
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libc/sys/procctl.2 b/lib/libc/sys/procctl.2
index 8f553eac057e..6ad0590804ad 100644
--- a/lib/libc/sys/procctl.2
+++ b/lib/libc/sys/procctl.2
@@ -50,7 +50,7 @@ If multiple processes match the identifier,
 .Nm
 will make a
 .Dq best effort
-to control as many of the selected possibles as possible.
+to control as many of the selected processes as possible.
 An error is only returned if no selected processes successfully complete
 the request.
 The following identifier types are supported:
diff --git a/lib/libc/sys/pselect.2 b/lib/libc/sys/pselect.2
index ed66aade1cde..6221c473e7d7 100644
--- a/lib/libc/sys/pselect.2
+++ b/lib/libc/sys/pselect.2
@@ -120,4 +120,4 @@ function first appeared in
 The first implementation of
 .Fn pselect
 function and this manual page were written by
-.An Garrett Wollman Aq wollman@FreeBSD.org .
+.An Garrett Wollman Aq Mt wollman@FreeBSD.org .
diff --git a/lib/libc/sys/rtprio.2 b/lib/libc/sys/rtprio.2
index f30ed225475b..23088a705967 100644
--- a/lib/libc/sys/rtprio.2
+++ b/lib/libc/sys/rtprio.2
@@ -188,7 +188,7 @@ The specified process or thread was not found or visible.
 .Sh AUTHORS
 .An -nosplit
 The original author was
-.An Henrik Vestergaard Draboel Aq hvd@terry.ping.dk .
+.An Henrik Vestergaard Draboel Aq Mt hvd@terry.ping.dk .
 This implementation in
 .Fx
 was substantially rewritten by
diff --git a/lib/libc/sys/sendfile.2 b/lib/libc/sys/sendfile.2
index 0e7dbe36263b..b363382af153 100644
--- a/lib/libc/sys/sendfile.2
+++ b/lib/libc/sys/sendfile.2
@@ -315,4 +315,4 @@ The
 .Fn sendfile
 system call
 and this manual page were written by
-.An David G. Lawrence Aq dg@dglawrence.com .
+.An David G. Lawrence Aq Mt dg@dglawrence.com .
diff --git a/lib/libc/sys/shm_open.2 b/lib/libc/sys/shm_open.2
index 76d8f3c150aa..b56f717b76d5 100644
--- a/lib/libc/sys/shm_open.2
+++ b/lib/libc/sys/shm_open.2
@@ -275,8 +275,8 @@ The functions were reimplemented as system calls using shared memory objects
 directly rather than files in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Garrett A. Wollman Aq wollman@FreeBSD.org
+.An Garrett A. Wollman Aq Mt wollman@FreeBSD.org
 (C library support and this manual page)
 .Pp
-.An Matthew Dillon Aq dillon@FreeBSD.org
+.An Matthew Dillon Aq Mt dillon@FreeBSD.org
 .Pq Dv MAP_NOSYNC
diff --git a/lib/libc/sys/shutdown.2 b/lib/libc/sys/shutdown.2
index 70211ffb2ebd..e8a434b23955 100644
--- a/lib/libc/sys/shutdown.2
+++ b/lib/libc/sys/shutdown.2
@@ -171,7 +171,7 @@ constants appeared in
 .Sh AUTHORS
 .An -nosplit
 This manual page was updated by
-.An Bruce M. Simpson Aq bms@FreeBSD.org
+.An Bruce M. Simpson Aq Mt bms@FreeBSD.org
 to reflect how
 .Fn shutdown
 behaves with
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index 74730be9bf36..c0b1bdc35fd1 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -57,24 +57,30 @@ These families are defined in the include file
 The currently understood formats are:
 .Pp
 .Bd -literal -offset indent -compact
-PF_LOCAL	Host-internal protocols, formerly called PF_UNIX,
-PF_UNIX		Host-internal protocols, deprecated, use PF_LOCAL,
+PF_LOCAL	Host-internal protocols (alias for PF_UNIX),
+PF_UNIX		Host-internal protocols,
 PF_INET		Internet version 4 protocols,
-PF_PUP		PUP protocols, like BSP,
-PF_APPLETALK	AppleTalk protocols,
-PF_ROUTE	Internal Routing protocol,
-PF_LINK		Link layer interface,
-PF_IPX		Novell Internet Packet eXchange protocol,
-PF_RTIP		Help Identify RTIP packets,
-PF_PIP		Help Identify PIP packets,
-PF_ISDN		Integrated Services Digital Network,
-PF_KEY		Internal key-management function,
 PF_INET6	Internet version 6 protocols,
-PF_NATM		Native ATM access,
-PF_ATM		ATM,
-PF_NETGRAPH	Netgraph sockets
+PF_ROUTE	Internal routing protocol,
+PF_LINK		Link layer interface,
+PF_KEY		Internal key-management function,
+PF_NATM		Asynchronous transfer mode protocols,
+PF_NETGRAPH	Netgraph sockets,
+PF_IEEE80211	IEEE 802.11 wireless link-layer protocols (WiFi),
+PF_BLUETOOTH	Bluetooth protocols,
+PF_INET_SDP	OFED socket direct protocol (IPv4),
+PF_INET6_SDP	OFED socket direct protocol (IPv6)
 .Ed
 .Pp
+Each protocol family is connected to an address family, which has the
+same name except that the prefix is
+.Dq Dv AF_
+in place of
+.Dq Dv PF_ .
+Other protocol families may be also defined, beginning with
+.Dq Dv PF_ ,
+with corresponding address families.
+.Pp
 The socket has the indicated
 .Fa type ,
 which specifies the semantics of communication.
@@ -307,6 +313,37 @@ The socket type is not supported by the protocol.
 .%B PS1
 .%N 8
 .Re
+.Sh STANDARDS
+The
+.Fn socket
+function conforms to
+.St -p1003.1-2008 .
+The
+.Tn POSIX
+standard specifies only the
+.Dv AF_INET ,
+.Dv AF_INET6 ,
+and
+.Dv AF_UNIX
+constants for address families, and requires the use of
+.Dv AF_*
+constants for the
+.Fa domain
+argument of
+.Fn socket .
+The
+.Dv SOCK_CLOEXEC
+flag is expected to conform to the next revision of the
+.Tn POSIX
+standard.
+The
+.Dv SOCK_RDM
+.Fa type ,
+the
+.Dv PF_*
+constants, and other address families are
+.Fx
+extensions.
 .Sh HISTORY
 The
 .Fn socket
diff --git a/lib/libc/sys/utimes.2 b/lib/libc/sys/utimes.2
index 74a7dd02ee48..15db6270407a 100644
--- a/lib/libc/sys/utimes.2
+++ b/lib/libc/sys/utimes.2
@@ -30,7 +30,7 @@
 .\"     @(#)utimes.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd April 10, 2008
+.Dd July 3, 2014
 .Dt UTIMES 2
 .Os
 .Sh NAME
@@ -119,22 +119,18 @@ is passed the special value
 .Dv AT_FDCWD
 in the
 .Fa fd
-parameter, the current working directory is used and the behavior is identical to
-a call to
+parameter, the current working directory is used and the behavior
+is identical to a call to
 .Fn utimes .
 .Sh RETURN VALUES
 .Rv -std
 .Sh ERRORS
-The
-.Fn utimes
-and
-.Fn lutimes
-system calls
-will fail if:
+All of the system call will fail if:
 .Bl -tag -width Er
 .It Bq Er EACCES
-Search permission is denied for a component of the path prefix;
-or the
+Search permission is denied for a component of the path prefix.
+.It Bq Er EACCES
+The
 .Fa times
 argument is
 .Dv NULL
@@ -148,6 +144,17 @@ or
 .Fa times
 argument
 points outside the process's allocated address space.
+.It Bq Er EFAULT
+The
+.Fa times
+argument
+points outside the process's allocated address space.
+.It Bq Er EINVAL
+The
+.Va tv_usec
+component of at least one of the values specified by the
+.Fa times
+argument has a value less than 0 or greater than 999999.
 .It Bq Er EIO
 An I/O error occurred while reading or writing the affected inode.
 .It Bq Er ELOOP
@@ -170,7 +177,8 @@ argument is not
 and the calling process's effective user ID
 does not match the owner of the file and is not the super-user.
 .It Bq Er EPERM
-The named file has its immutable or append-only flag set, see the
+The named file has its immutable or append-only flags set.
+See the
 .Xr chflags 2
 manual page for more information.
 .It Bq Er EROFS
@@ -189,40 +197,6 @@ argument
 does not refer to a valid descriptor.
 .El
 .Pp
-All of the system calls will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The
-.Fa times
-argument is
-.Dv NULL
-and the effective user ID of the process does not
-match the owner of the file, and is not the super-user, and write
-access is denied.
-.It Bq Er EFAULT
-The
-.Fa times
-argument
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-The
-.Va tv_usec
-component of at least one of the values specified by the
-.Fa times
-argument has a value less than 0 or greater than 999999.
-.It Bq Er EIO
-An I/O error occurred while reading or writing the affected inode.
-.It Bq Er EPERM
-The
-.Fa times
-argument is not
-.Dv NULL
-and the calling process's effective user ID
-does not match the owner of the file and is not the super-user.
-.It Bq Er EROFS
-The file system containing the file is mounted read-only.
-.El
-.Pp
 In addition to the errors returned by the
 .Fn utimes ,
 the
diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c
index 8051649202d2..11358069e00c 100644
--- a/lib/libc/xdr/xdr_float.c
+++ b/lib/libc/xdr/xdr_float.c
@@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$");
 
 #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
     defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
-    defined(__arm__) || defined(__ppc__) || defined(__ia64__) || \
+    defined(__arm__) || defined(__ppc__) || \
     defined(__arm26__) || defined(__sparc64__) || defined(__amd64__)
 #include <machine/endian.h>
 #define IEEEFP
diff --git a/lib/libcalendar/calendar.3 b/lib/libcalendar/calendar.3
index 469f1c9e70c5..f86d5e34eb06 100644
--- a/lib/libcalendar/calendar.3
+++ b/lib/libcalendar/calendar.3
@@ -198,6 +198,6 @@ library first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
 This manual page and the library was written by
-.An Wolfgang Helbig Aq helbig@FreeBSD.org .
+.An Wolfgang Helbig Aq Mt helbig@FreeBSD.org .
 .Sh BUGS
 The library was coded with great care so there are no bugs left.
diff --git a/lib/libcam/cam.3 b/lib/libcam/cam.3
index 4f918d2c09f9..7fe2a168fe72 100644
--- a/lib/libcam/cam.3
+++ b/lib/libcam/cam.3
@@ -406,7 +406,7 @@ characters long.
 The CAM library first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.org
+.An Kenneth Merry Aq Mt ken@FreeBSD.org
 .Sh BUGS
 .Fn cam_open_device
 does not check to see if the
diff --git a/lib/libcapsicum/libcapsicum.3 b/lib/libcapsicum/libcapsicum.3
index efeec2f131f2..9df565a4077d 100644
--- a/lib/libcapsicum/libcapsicum.3
+++ b/lib/libcapsicum/libcapsicum.3
@@ -284,5 +284,5 @@ printf("Name associated with %s is %s.\\n", ipstr, hp->h_name);
 The
 .Nm libcapsicum
 library was implemented by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libcrypt/crypt.3 b/lib/libcrypt/crypt.3
index 50829c2fa43b..828c37f51d63 100644
--- a/lib/libcrypt/crypt.3
+++ b/lib/libcrypt/crypt.3
@@ -283,7 +283,7 @@ libcrypt encryption library.
 .Sh AUTHORS
 .An -nosplit
 Originally written by
-.An David Burren Aq davidb@werj.com.au ,
+.An David Burren Aq Mt davidb@werj.com.au ,
 later additions and changes by
 .An Poul-Henning Kamp ,
 .An Mark R V Murray ,
diff --git a/lib/libcuse/cuse.3 b/lib/libcuse/cuse.3
index 356c51869450..6d8d2a3cd860 100644
--- a/lib/libcuse/cuse.3
+++ b/lib/libcuse/cuse.3
@@ -262,7 +262,6 @@ is returned.
 .Ft "void"
 .Fn "cuse_poll_wakeup" "void"
 This function will wake up any file pollers.
-.Pp
 .Sh LIBRARY LIMITATIONS
 Transfer lengths for
 .Fn read ,
@@ -374,7 +373,6 @@ values in case of failure and success.
 The events argument is also a mask of
 .Dv CUSE_POLL_XXX
 values.
-.Pp
 .Bd -literal -offset indent
 struct cuse_methods {
   cuse_open_t *cm_open;
diff --git a/lib/libcuse/cuse_lib.c b/lib/libcuse/cuse_lib.c
index f518e11d78f3..9d8352f81df1 100644
--- a/lib/libcuse/cuse_lib.c
+++ b/lib/libcuse/cuse_lib.c
@@ -425,7 +425,7 @@ cuse_dev_destroy(struct cuse_dev *cdev)
 	TAILQ_REMOVE(&h_cuse, cdev, entry);
 	cuse_unlock();
 
-	error = ioctl(f_cuse, CUSE_IOCTL_DESTROY_DEV, cdev);
+	error = ioctl(f_cuse, CUSE_IOCTL_DESTROY_DEV, &cdev);
 	if (error)
 		return;
 
diff --git a/lib/libdevinfo/devinfo.3 b/lib/libdevinfo/devinfo.3
index 0788100b7e88..ee094dd62f86 100644
--- a/lib/libdevinfo/devinfo.3
+++ b/lib/libdevinfo/devinfo.3
@@ -238,7 +238,7 @@ The
 library first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Michael Smith Aq msmith@FreeBSD.org
+.An Michael Smith Aq Mt msmith@FreeBSD.org
 .Sh BUGS
 This is the first implementation of the library,
 and the interface is still subject to refinement.
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index 39be6ac0ecef..2bbe2d770ac3 100644
--- a/lib/libdevstat/devstat.3
+++ b/lib/libdevstat/devstat.3
@@ -797,7 +797,7 @@ The new interface (the functions prefixed with
 first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.org
+.An Kenneth Merry Aq Mt ken@FreeBSD.org
 .Sh BUGS
 There should probably be an interface to de-allocate memory allocated by
 .Fn devstat_getdevs ,
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index d8ae64681960..df86778c5778 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.34 2005/05/28 12:02:53 lukem Exp $
+#	$NetBSD: Makefile,v 1.37 2009/01/18 12:17:49 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
@@ -10,8 +10,8 @@ OSRCS=	chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \
 	hist.c key.c map.c \
 	parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c
 
-DPADD=	${LIBNCURSES}
-LDADD=	-lncurses
+DPADD=	${LIBNCURSESW}
+LDADD=	-lncursesw
 
 MAN=	editline.3 editrc.5
 
@@ -70,9 +70,9 @@ editline.c: ${OSRCS}
 editline.o editline.po editline.So editline.ln:	\
 	common.h emacs.h fcns.c fcns.h help.c help.h vi.h
 
-test.o: ${.CURDIR}/TEST/test.c
+tc1.o: ${.CURDIR}/TEST/tc1.c
 
-test: test.o libedit.a ${DPADD} ${LIBTERMCAP}
+test: tc1.o libedit.a ${DPADD} ${LIBTERMCAP}
 	${CC} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} libedit.a ${LDADD}
 
 .include <bsd.lib.mk>
diff --git a/lib/libedit/TEST/test.c b/lib/libedit/TEST/tc1.c
similarity index 96%
rename from lib/libedit/TEST/test.c
rename to lib/libedit/TEST/tc1.c
index facbdaa7e3df..a60aa75775e1 100644
--- a/lib/libedit/TEST/test.c
+++ b/lib/libedit/TEST/tc1.c
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
 #if !defined(lint) && !defined(SCCSID)
 static char sccsid[] = "@(#)test.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint && not SCCSID */
-__RCSID("$NetBSD: test.c,v 1.18 2005/06/01 11:37:52 lukem Exp $");
+__RCSID("$NetBSD: test.c,v 1.3 2009/07/17 12:25:52 christos Exp $");
 __FBSDID("$FreeBSD$");
 
 /*
@@ -68,7 +68,7 @@ static	void	sig(int);
 static char *
 prompt(EditLine *el)
 {
-	static char a[] = "Edit$ ";
+	static char a[] = "\1\e[7m\1Edit$\1\e[0m\1 ";
 	static char b[] = "Edit> ";
 
 	return (continuation ? b : a);
@@ -143,7 +143,7 @@ main(int argc, char *argv[])
 
 	el_set(el, EL_EDITOR, "vi");	/* Default editor is vi		*/
 	el_set(el, EL_SIGNAL, 1);	/* Handle signals gracefully	*/
-	el_set(el, EL_PROMPT, prompt);	/* Set the prompt function	*/
+	el_set(el, EL_PROMPT_ESC, prompt, '\1');/* Set the prompt function */
 
 			/* Tell editline to use this history interface	*/
 	el_set(el, EL_HIST, history, hist);
@@ -183,7 +183,7 @@ main(int argc, char *argv[])
 
 #endif
 		if (gotsig) {
-			(void) fprintf(stderr, "Got signal %d.\n", gotsig);
+			(void) fprintf(stderr, "Got signal %d.\n", (int)gotsig);
 			gotsig = 0;
 			el_reset(el);
 		}
@@ -269,7 +269,7 @@ main(int argc, char *argv[])
 		} else if (el_parse(el, ac, av) == -1) {
 			switch (fork()) {
 			case 0:
-				execvp(av[0], __DECONST(char *const *, av));
+				execvp(av[0], __DECONST(char **, av));
 				perror(av[0]);
 				_exit(1);
 				/*NOTREACHED*/
diff --git a/lib/libedit/common.c b/lib/libedit/common.c
index 059955425418..64490c986290 100644
--- a/lib/libedit/common.c
+++ b/lib/libedit/common.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$NetBSD: common.c,v 1.19 2006/03/06 21:11:56 christos Exp $
+ *	$NetBSD: common.c,v 1.23 2009/02/27 04:18:45 msaitoh Exp $
  */
 
 #if !defined(lint) && !defined(SCCSID)
@@ -121,7 +121,7 @@ ed_delete_prev_word(EditLine *el, int c __unused)
 		*kp++ = *p;
 	el->el_chared.c_kill.last = kp;
 
-	c_delbefore(el, el->el_line.cursor - cp);	/* delete before dot */
+	c_delbefore(el, (int)(el->el_line.cursor - cp));/* delete before dot */
 	el->el_line.cursor = cp;
 	if (el->el_line.cursor < el->el_line.buffer)
 		el->el_line.cursor = el->el_line.buffer; /* bounds check */
@@ -208,9 +208,6 @@ ed_move_to_end(EditLine *el, int c __unused)
 
 	el->el_line.cursor = el->el_line.lastchar;
 	if (el->el_map.type == MAP_VI) {
-#ifdef VI_MOVE
-		el->el_line.cursor--;
-#endif
 		if (el->el_chared.c_vcmd.action != NOP) {
 			cv_delfini(el);
 			return (CC_REFRESH);
diff --git a/lib/libedit/emacs.c b/lib/libedit/emacs.c
index a285b1c305ee..edcc84bb23bc 100644
--- a/lib/libedit/emacs.c
+++ b/lib/libedit/emacs.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$NetBSD: emacs.c,v 1.21 2006/03/06 21:11:56 christos Exp $
+ *	$NetBSD: emacs.c,v 1.22 2009/02/15 21:55:23 christos Exp $
  */
 
 #if !defined(lint) && !defined(SCCSID)
@@ -101,7 +101,7 @@ em_delete_next_word(EditLine *el, int c __unused)
 		*kp++ = *p;
 	el->el_chared.c_kill.last = kp;
 
-	c_delafter(el, cp - el->el_line.cursor);	/* delete after dot */
+	c_delafter(el, (int)(cp - el->el_line.cursor));	/* delete after dot */
 	if (el->el_line.cursor > el->el_line.lastchar)
 		el->el_line.cursor = el->el_line.lastchar;
 				/* bounds check */
@@ -131,7 +131,8 @@ em_yank(EditLine *el, int c __unused)
 	cp = el->el_line.cursor;
 
 	/* open the space, */
-	c_insert(el, el->el_chared.c_kill.last - el->el_chared.c_kill.buf);
+	c_insert(el,
+	    (int)(el->el_chared.c_kill.last - el->el_chared.c_kill.buf));
 	/* copy the chars */
 	for (kp = el->el_chared.c_kill.buf; kp < el->el_chared.c_kill.last; kp++)
 		*cp++ = *kp;
@@ -185,14 +186,14 @@ em_kill_region(EditLine *el, int c __unused)
 		while (cp < el->el_chared.c_kill.mark)
 			*kp++ = *cp++;	/* copy it */
 		el->el_chared.c_kill.last = kp;
-		c_delafter(el, cp - el->el_line.cursor);
+		c_delafter(el, (int)(cp - el->el_line.cursor));
 	} else {		/* mark is before cursor */
 		cp = el->el_chared.c_kill.mark;
 		kp = el->el_chared.c_kill.buf;
 		while (cp < el->el_line.cursor)
 			*kp++ = *cp++;	/* copy it */
 		el->el_chared.c_kill.last = kp;
-		c_delbefore(el, cp - el->el_chared.c_kill.mark);
+		c_delbefore(el, (int)(cp - el->el_chared.c_kill.mark));
 		el->el_line.cursor = el->el_chared.c_kill.mark;
 	}
 	return (CC_REFRESH);
@@ -446,7 +447,7 @@ em_copy_prev_word(EditLine *el, int c __unused)
 	cp = c__prev_word(el->el_line.cursor, el->el_line.buffer,
 	    el->el_state.argument, ce__isword);
 
-	c_insert(el, oldc - cp);
+	c_insert(el, (int)(oldc - cp));
 	for (dp = oldc; cp < oldc && dp < el->el_line.lastchar; cp++)
 		*dp++ = *cp;
 
diff --git a/lib/libedit/filecomplete.h b/lib/libedit/filecomplete.h
index a3156e942b99..215cf7d7b0b4 100644
--- a/lib/libedit/filecomplete.h
+++ b/lib/libedit/filecomplete.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *	$NetBSD: filecomplete.h,v 1.9 2009/12/30 22:37:40 christos Exp $
+ *	$NetBSD: filecomplete.h,v 1.8 2009/02/16 00:15:45 christos Exp $
  * $FreeBSD$
  */
 #ifndef _FILECOMPLETE_H_
diff --git a/lib/libedit/histedit.h b/lib/libedit/histedit.h
index 9059ea20e52e..7cc524653c31 100644
--- a/lib/libedit/histedit.h
+++ b/lib/libedit/histedit.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)histedit.h	8.2 (Berkeley) 1/3/94
- *	$NetBSD: histedit.h,v 1.32 2007/06/10 20:20:28 christos Exp $
+ *	$NetBSD: histedit.h,v 1.41 2009/09/07 21:24:33 christos Exp $
  * $FreeBSD$
  */
 
diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c
index 76d2d64a44a0..2d37b67154d0 100644
--- a/lib/libedit/prompt.c
+++ b/lib/libedit/prompt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$NetBSD: prompt.c,v 1.11 2003/08/07 16:44:32 agc Exp $
+ *	$NetBSD: prompt.c,v 1.14 2009/03/31 17:38:27 christos Exp $
  */
 
 #if !defined(lint) && !defined(SCCSID)
diff --git a/lib/libedit/prompt.h b/lib/libedit/prompt.h
index fe69ca488b55..c796d938d4bb 100644
--- a/lib/libedit/prompt.h
+++ b/lib/libedit/prompt.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)prompt.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: prompt.h,v 1.6 2003/08/07 16:44:32 agc Exp $
+ *	$NetBSD: prompt.h,v 1.9 2009/03/31 17:38:27 christos Exp $
  * $FreeBSD$
  */
 
@@ -45,8 +45,8 @@
 typedef char * (*el_pfunc_t)(EditLine*);
 
 typedef struct el_prompt_t {
-	el_pfunc_t	p_func;	/* Function to return the prompt	*/
-	coord_t		p_pos;	/* position in the line after prompt	*/
+	el_pfunc_t	p_func;		/* Function to return the prompt */
+	coord_t		p_pos;		/* position in the line after prompt */
 	char		p_ignore;	/* character to start/end literal 
 */
 } el_prompt_t;
diff --git a/lib/libedit/read.h b/lib/libedit/read.h
index 1dcf16429a48..60189344ea4c 100644
--- a/lib/libedit/read.h
+++ b/lib/libedit/read.h
@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *	$NetBSD: read.h,v 1.5 2006/08/21 12:45:30 christos Exp $
+ *	$NetBSD: read.h,v 1.6 2008/04/29 06:53:01 martin Exp $
  * $FreeBSD$
  */
 
diff --git a/lib/libedit/sys.h b/lib/libedit/sys.h
index 9b1f04031072..5c017d3350b7 100644
--- a/lib/libedit/sys.h
+++ b/lib/libedit/sys.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: sys.h,v 1.9 2004/01/17 17:57:40 christos Exp $
+ *	$NetBSD: sys.h,v 1.12 2009/08/31 00:05:43 christos Exp $
  * $FreeBSD$
  */
 
@@ -70,6 +70,15 @@ typedef void	*ioctl_t;
 #define	REGEX		/* Use POSIX.2 regular expression functions */
 #undef	REGEXP		/* Use UNIX V8 regular expression functions */
 
+#if defined(__sun)
+extern int tgetent(char *, const char *);
+extern int tgetflag(char *);
+extern int tgetnum(char *);
+extern int tputs(const char *, int, int (*)(int));
+extern char* tgoto(const char*, int, int);
+extern char* tgetstr(char*, char**);
+#endif
+
 #ifdef notdef
 # undef REGEX
 # undef REGEXP
diff --git a/lib/libedit/term.h b/lib/libedit/term.h
index 4bf4685f7f79..cf7a909bfc8a 100644
--- a/lib/libedit/term.h
+++ b/lib/libedit/term.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)term.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: term.h,v 1.18 2006/11/24 00:01:17 christos Exp $
+ *	$NetBSD: term.h,v 1.20 2009/03/31 17:38:27 christos Exp $
  * $FreeBSD$
  */
 
diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c
index c0b4638b323c..f8bae9424a79 100644
--- a/lib/libedit/tty.c
+++ b/lib/libedit/tty.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$NetBSD: tty.c,v 1.25 2006/03/18 09:09:41 christos Exp $
+ *	$NetBSD: tty.c,v 1.31 2009/07/22 15:58:09 christos Exp $
  */
 
 #if !defined(lint) && !defined(SCCSID)
@@ -443,13 +443,12 @@ private const ttymodes_t ttymodes[] = {
 
 
 
-#define	tty_getty(el, td)	tcgetattr((el)->el_infd, (td))
-#define	tty_setty(el, td)	tcsetattr((el)->el_infd, TCSADRAIN, (td))
-
 #define	tty__gettabs(td)	((((td)->c_oflag & TAB3) == TAB3) ? 0 : 1)
 #define	tty__geteightbit(td)	(((td)->c_cflag & CSIZE) == CS8)
 #define	tty__cooked_mode(td)	((td)->c_lflag & ICANON)
 
+private int	tty_getty(EditLine *, struct termios *);
+private int	tty_setty(EditLine *, int, const struct termios *);
 private int	tty__getcharindex(int);
 private void	tty__getchar(struct termios *, unsigned char *);
 private void	tty__setchar(struct termios *, unsigned char *);
@@ -458,6 +457,29 @@ private int	tty_setup(EditLine *);
 
 #define	t_qu	t_ts
 
+/* tty_getty():
+ *	Wrapper for tcgetattr to handle EINTR
+ */
+private int
+tty_getty(EditLine *el, struct termios *t)
+{
+	int rv;
+	while ((rv = tcgetattr(el->el_infd, t)) == -1 && errno == EINTR)
+		continue;
+	return rv;
+}
+
+/* tty_setty():
+ *	Wrapper for tcsetattr to handle EINTR
+ */
+private int
+tty_setty(EditLine *el, int action, const struct termios *t)
+{
+	int rv;
+	while ((rv = tcsetattr(el->el_infd, action, t)) == -1 && errno == EINTR)
+		continue;
+	return rv;
+}
 
 /* tty_setup():
  *	Get the tty parameters and initialize the editing state
@@ -996,7 +1018,7 @@ tty_rawmode(EditLine *el)
 	if (el->el_tty.t_mode == EX_IO)
 		el->el_tty.t_ex = el->el_tty.t_ts;
 
-	if (tty_setty(el, &el->el_tty.t_ed) == -1) {
+	if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ed) == -1) {
 #ifdef DEBUG_TTY
 		(void) fprintf(el->el_errfile, "tty_rawmode: tty_setty: %s\n",
 		    strerror(errno));
@@ -1021,7 +1043,7 @@ tty_cookedmode(EditLine *el)
 	if (el->el_flags & EDIT_DISABLED)
 		return (0);
 
-	if (tty_setty(el, &el->el_tty.t_ex) == -1) {
+	if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ex) == -1) {
 #ifdef DEBUG_TTY
 		(void) fprintf(el->el_errfile,
 		    "tty_cookedmode: tty_setty: %s\n",
@@ -1057,7 +1079,7 @@ tty_quotemode(EditLine *el)
 	el->el_tty.t_qu.c_lflag &= ~el->el_tty.t_t[QU_IO][MD_LIN].t_clrmask;
 	el->el_tty.t_qu.c_lflag |= el->el_tty.t_t[QU_IO][MD_LIN].t_setmask;
 
-	if (tty_setty(el, &el->el_tty.t_qu) == -1) {
+	if (tty_setty(el, TCSADRAIN, &el->el_tty.t_qu) == -1) {
 #ifdef DEBUG_TTY
 		(void) fprintf(el->el_errfile, "QuoteModeOn: tty_setty: %s\n",
 		    strerror(errno));
@@ -1078,7 +1100,7 @@ tty_noquotemode(EditLine *el)
 
 	if (el->el_tty.t_mode != QU_IO)
 		return (0);
-	if (tty_setty(el, &el->el_tty.t_ed) == -1) {
+	if (tty_setty(el, TCSADRAIN, &el->el_tty.t_ed) == -1) {
 #ifdef DEBUG_TTY
 		(void) fprintf(el->el_errfile, "QuoteModeOff: tty_setty: %s\n",
 		    strerror(errno));
@@ -1139,7 +1161,7 @@ tty_stty(EditLine *el, int argc __unused, const char **argv)
 
 	if (!argv || !*argv) {
 		int i = -1;
-		int len = 0, st = 0, cu;
+		size_t len = 0, st = 0, cu;
 		for (m = ttymodes; m->m_name; m++) {
 			if (m->m_type != i) {
 				(void) fprintf(el->el_outfile, "%s%s",
@@ -1162,9 +1184,9 @@ tty_stty(EditLine *el, int argc __unused, const char **argv)
 
 				cu = strlen(m->m_name) + (x != '\0') + 1;
 
-				if (len + cu >= el->el_term.t_size.h) {
+				if (len + cu >= (size_t)el->el_term.t_size.h) {
 					(void) fprintf(el->el_outfile, "\n%*s",
-					    st, "");
+					    (int)st, "");
 					len = st + cu;
 				} else
 					len += cu;
@@ -1208,7 +1230,8 @@ tty_stty(EditLine *el, int argc __unused, const char **argv)
 			int c = ffs((int)m->m_value);
 			int v = *++p ? parse__escape((const char **) &p) :
 			    el->el_tty.t_vdisable;
-			assert(c-- != 0);
+			assert(c != 0);
+			c--;
 			c = tty__getcharindex(c);
 			assert(c != -1);
 			tios->c_cc[c] = v;
@@ -1229,6 +1252,17 @@ tty_stty(EditLine *el, int argc __unused, const char **argv)
 			break;
 		}
 	}
+
+	if (el->el_tty.t_mode == z) {
+		if (tty_setty(el, TCSADRAIN, tios) == -1) {
+#ifdef DEBUG_TTY
+			(void) fprintf(el->el_errfile,
+			    "tty_stty: tty_setty: %s\n", strerror(errno));
+#endif /* DEBUG_TTY */
+			return (-1);
+		}
+	}
+
 	return (0);
 }
 
diff --git a/lib/libefi/libefi.3 b/lib/libefi/libefi.3
index 7350508f8558..e090fd6e711f 100644
--- a/lib/libefi/libefi.3
+++ b/lib/libefi/libefi.3
@@ -140,4 +140,4 @@ for the ia64 architecture.
 The
 .Nm libefi
 library and this manual page were written by
-.An Marcel Moolenaar Aq marcel@FreeBSD.org .
+.An Marcel Moolenaar Aq Mt marcel@FreeBSD.org .
diff --git a/lib/libexpat/libbsdxml.3 b/lib/libexpat/libbsdxml.3
index 04887f0f33a5..0d706ea7219d 100644
--- a/lib/libexpat/libbsdxml.3
+++ b/lib/libexpat/libbsdxml.3
@@ -59,11 +59,11 @@ For full documentation, please see the eXpat webpage at
 .Sh AUTHORS
 .An -nosplit
 The original eXpat was written by
-.An James Clark Aq jjc@jclark.com .
+.An James Clark Aq Mt jjc@jclark.com .
 .Pp
 Subsequently eXpat maintenance and development been taken up by a group
 of people under the leadership of
-.An Fred Drake Aq fdrake@acm.com ,
+.An Fred Drake Aq Mt fdrake@acm.com ,
 .An Paul Prescod ,
 and
 .An Clark Cooper .
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index 3f8ef3b36325..a6fc47c60e44 100644
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -1110,6 +1110,9 @@ fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt)
 			errno = 0;
 			pfd.revents = 0;
 			if (poll(&pfd, 1, deltams) < 0) {
+				/* POSIX compliance */
+				if (errno == EAGAIN)
+					continue;
 				if (errno == EINTR && fetchRestartCalls)
 					continue;
 				return (-1);
diff --git a/lib/libgeom/libgeom.3 b/lib/libgeom/libgeom.3
index b897fad5f778..bda0c9d03c34 100644
--- a/lib/libgeom/libgeom.3
+++ b/lib/libgeom/libgeom.3
@@ -388,6 +388,6 @@ The
 library appeared in
 .Fx 5.1 .
 .Sh AUTHORS
-.An Poul-Henning Kamp Aq phk@FreeBSD.org
-.An Lukas Ertl Aq le@FreeBSD.org
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
+.An Lukas Ertl Aq Mt le@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
diff --git a/lib/libgssapi/mech.5 b/lib/libgssapi/mech.5
index dd15ba98938c..619de02e1de7 100644
--- a/lib/libgssapi/mech.5
+++ b/lib/libgssapi/mech.5
@@ -98,4 +98,4 @@ manual page first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/libiconv_modules/HZ/citrus_hz.c b/lib/libiconv_modules/HZ/citrus_hz.c
index f9eb006af8dc..d772b385b47d 100644
--- a/lib/libiconv_modules/HZ/citrus_hz.c
+++ b/lib/libiconv_modules/HZ/citrus_hz.c
@@ -532,10 +532,9 @@ _citrus_HZ_parse_graphic(void *context, const char *name, const char *s)
 	p = (void **)context;
 	escape = (escape_t *)p[0];
 	ei = (_HZEncodingInfo *)p[1];
-	graphic = malloc(sizeof(*graphic));
+	graphic = calloc(1, sizeof(*graphic));
 	if (graphic == NULL)
 		return (ENOMEM);
-	memset(graphic, 0, sizeof(*graphic));
 	if (strcmp("GL", name) == 0) {
 		if (GL(escape) != NULL)
 			goto release;
@@ -598,10 +597,9 @@ _citrus_HZ_parse_escape(void *context, const char *name, const char *s)
 	void *p[2];
 
 	ei = (_HZEncodingInfo *)context;
-	escape = malloc(sizeof(*escape));
+	escape = calloc(1, sizeof(*escape));
 	if (escape == NULL)
 		return (EINVAL);
-	memset(escape, 0, sizeof(*escape));
 	if (strcmp("0", name) == 0) {
 		escape->set = E0SET(ei);
 		TAILQ_INSERT_TAIL(E0SET(ei), escape, entry);
diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c
index 65d697c96160..9a5ec64e95e2 100644
--- a/lib/libkvm/kvm_amd64.c
+++ b/lib/libkvm/kvm_amd64.c
@@ -81,7 +81,7 @@ struct vmstate {
 /*
  * Map the ELF headers into the process' address space. We do this in two
  * steps: first the ELF header itself and using that information the whole
- * set of headers. (Taken from kvm_ia64.c)
+ * set of headers.
  */
 static int
 _kvm_maphdrs(kvm_t *kd, size_t sz)
@@ -105,7 +105,6 @@ _kvm_maphdrs(kvm_t *kd, size_t sz)
 
 /*
  * Translate a physical memory address to a file-offset in the crash-dump.
- * (Taken from kvm_ia64.c)
  */
 static size_t
 _kvm_pa2off(kvm_t *kd, uint64_t pa, off_t *ofs)
diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c
index 601126bc7a3f..45f0a5e9b88c 100644
--- a/lib/libkvm/kvm_i386.c
+++ b/lib/libkvm/kvm_i386.c
@@ -87,7 +87,7 @@ struct vmstate {
 /*
  * Map the ELF headers into the process' address space. We do this in two
  * steps: first the ELF header itself and using that information the whole
- * set of headers. (Taken from kvm_ia64.c)
+ * set of headers.
  */
 static int
 _kvm_maphdrs(kvm_t *kd, size_t sz)
@@ -111,7 +111,6 @@ _kvm_maphdrs(kvm_t *kd, size_t sz)
 
 /*
  * Translate a physical memory address to a file-offset in the crash-dump.
- * (Taken from kvm_ia64.c)
  */
 static size_t
 _kvm_pa2off(kvm_t *kd, uint64_t pa, off_t *ofs)
diff --git a/lib/libkvm/kvm_ia64.c b/lib/libkvm/kvm_ia64.c
deleted file mode 100644
index 5db7e1e7ab09..000000000000
--- a/lib/libkvm/kvm_ia64.c
+++ /dev/null
@@ -1,375 +0,0 @@
-/* $FreeBSD$ */
-/*	$NetBSD: kvm_alpha.c,v 1.7.2.1 1997/11/02 20:34:26 mellon Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 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/types.h>
-#include <sys/elf64.h>
-#include <sys/mman.h>
-
-#ifndef CROSS_LIBKVM
-#include <machine/atomic.h>
-#include <machine/bootinfo.h>
-#include <machine/elf.h>
-#include <machine/pte.h>
-#else
-#include "../../sys/ia64/include/atomic.h"
-#include "../../sys/ia64/include/bootinfo.h"
-#include "../../sys/ia64/include/elf.h"
-#include "../../sys/ia64/include/pte.h"
-#endif
-
-#include <kvm.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "kvm_private.h"
-
-#define	REGION_BASE(n)		(((uint64_t)(n)) << 61)
-#define	REGION_ADDR(x)		((x) & ((1LL<<61)-1LL))
-
-#define	NKPTEPG(ps)		((ps) / sizeof(struct ia64_lpte))
-#define	NKPTEDIR(ps)		((ps) >> 3)
-#define	KPTE_PTE_INDEX(va,ps)	(((va)/(ps)) % NKPTEPG(ps))
-#define	KPTE_DIR0_INDEX(va,ps)	((((va)/(ps)) / NKPTEPG(ps)) / NKPTEDIR(ps))
-#define	KPTE_DIR1_INDEX(va,ps)	((((va)/(ps)) / NKPTEPG(ps)) % NKPTEDIR(ps))
-
-#define	PBVM_BASE		0x9ffc000000000000UL
-#define	PBVM_PGSZ		(64 * 1024)
-
-typedef size_t (a2p_f)(kvm_t *, uint64_t, off_t *);
-
-struct vmstate {
-	void	*mmapbase;
-	size_t	mmapsize;
-	size_t	pagesize;
-	u_long	kptdir;
-	u_long	*pbvm_pgtbl;
-	u_int	pbvm_pgtblsz;
-	a2p_f	*kvatop;
-};
-
-/*
- * Map the ELF headers into the process' address space. We do this in two
- * steps: first the ELF header itself and using that information the whole
- * set of headers.
- */
-static int
-ia64_maphdrs(kvm_t *kd, size_t sz)
-{
-	struct vmstate *vm = kd->vmst;
-
-	/* munmap() previous mmap(). */
-	if (vm->mmapbase != NULL) {
-		munmap(vm->mmapbase, vm->mmapsize);
-		vm->mmapbase = NULL;
-	}
-
-	vm->mmapsize = sz;
-	vm->mmapbase = mmap(NULL, sz, PROT_READ, MAP_PRIVATE, kd->pmfd, 0);
-	if (vm->mmapbase == MAP_FAILED) {
-		_kvm_err(kd, kd->program, "cannot mmap corefile");
-		return (-1);
-	}
-
-	return (0);
-}
-
-/*
- * Physical core support.
- */
-
-static size_t
-phys_addr2off(kvm_t *kd, uint64_t pa, off_t *ofs, size_t pgsz)
-{
-	Elf64_Ehdr *e;
-	Elf64_Phdr *p;
-	int n;
-
-	if (pa != REGION_ADDR(pa))
-		goto fail;
-
-	e = (Elf64_Ehdr *)(kd->vmst->mmapbase);
-	n = e->e_phnum;
-	p = (Elf64_Phdr *)(void *)((uintptr_t)(void *)e + e->e_phoff);
-	while (n && (pa < p->p_paddr || pa >= p->p_paddr + p->p_memsz))
-		p++, n--;
-	if (n == 0)
-		goto fail;
-
-	*ofs = (pa - p->p_paddr) + p->p_offset;
-	if (pgsz == 0)
-		return (p->p_memsz - (pa - p->p_paddr));
-	return (pgsz - ((size_t)pa & (pgsz - 1)));
-
- fail:
-	_kvm_err(kd, kd->program, "invalid physical address %#jx",
-	    (uintmax_t)pa);
-	return (0);
-}
-
-static size_t
-phys_kvatop(kvm_t *kd, uint64_t va, off_t *ofs)
-{
-	struct ia64_lpte pte;
-	uint64_t pa, pgaddr, pt0addr, pt1addr;
-	size_t pgno, pgsz, pt0no, pt1no;
-
-	if (va >= REGION_BASE(6)) {
-		/* Regions 6 and 7: direct mapped. */
-		pa = REGION_ADDR(va);
-		return (phys_addr2off(kd, pa, ofs, 0));
-	} else if (va >= REGION_BASE(5)) {
-		/* Region 5: Kernel Virtual Memory. */
-		va = REGION_ADDR(va);
-		pgsz = kd->vmst->pagesize;
-		pt0no = KPTE_DIR0_INDEX(va, pgsz);
-		pt1no = KPTE_DIR1_INDEX(va, pgsz);
-		pgno = KPTE_PTE_INDEX(va, pgsz);
-		if (pt0no >= NKPTEDIR(pgsz))
-			goto fail;
-		pt0addr = kd->vmst->kptdir + (pt0no << 3);
-		if (kvm_read(kd, pt0addr, &pt1addr, 8) != 8)
-			goto fail;
-		if (pt1addr == 0)
-			goto fail;
-		pt1addr += pt1no << 3;
-		if (kvm_read(kd, pt1addr, &pgaddr, 8) != 8)
-			goto fail;
-		if (pgaddr == 0)
-			goto fail;
-		pgaddr += pgno * sizeof(pte);
-		if (kvm_read(kd, pgaddr, &pte, sizeof(pte)) != sizeof(pte))
-			goto fail;
-		if (!(pte.pte & PTE_PRESENT))
-			goto fail;
-		pa = (pte.pte & PTE_PPN_MASK) + (va & (pgsz - 1));
-		return (phys_addr2off(kd, pa, ofs, pgsz));
-	} else if (va >= PBVM_BASE) {
-		/* Region 4: Pre-Boot Virtual Memory (PBVM). */
-		va -= PBVM_BASE;
-		pgsz = PBVM_PGSZ;
-		pt0no = va / pgsz;
-		if (pt0no >= (kd->vmst->pbvm_pgtblsz >> 3))
-			goto fail;
-		pt0addr = kd->vmst->pbvm_pgtbl[pt0no];
-		if (!(pt0addr & PTE_PRESENT))
-			goto fail;
-		pa = (pt0addr & PTE_PPN_MASK) + va % pgsz;
-		return (phys_addr2off(kd, pa, ofs, pgsz));
-	}
-
- fail:
-	_kvm_err(kd, kd->program, "invalid kernel virtual address %#jx",
-	    (uintmax_t)va);
-	*ofs = -1;
-	return (0);
-}
-
-static ssize_t
-phys_read(kvm_t *kd, uint64_t pa, void *buf, size_t bufsz)
-{
-	off_t ofs;
-	size_t sz;
-
-	sz = phys_addr2off(kd, pa, &ofs, 0);
-	if (sz < bufsz)
-		return ((ssize_t)sz);
-
-	if (lseek(kd->pmfd, ofs, 0) == -1)
-		return (-1);
-	return (read(kd->pmfd, buf, bufsz));
-}
-
-/*
- * Virtual core support (aka minidump).
- */
-
-static size_t
-virt_addr2off(kvm_t *kd, uint64_t va, off_t *ofs, size_t pgsz)
-{
-	Elf64_Ehdr *e;
-	Elf64_Phdr *p;
-	int n;
-
-	if (va < REGION_BASE(4))
-		goto fail;
-
-	e = (Elf64_Ehdr *)(kd->vmst->mmapbase);
-	n = e->e_phnum;
-	p = (Elf64_Phdr *)(void *)((uintptr_t)(void *)e + e->e_phoff); 
-	while (n && (va < p->p_vaddr || va >= p->p_vaddr + p->p_memsz))
-		p++, n--;
-	if (n == 0)
-		goto fail;
-
-	*ofs = (va - p->p_vaddr) + p->p_offset;
-	if (pgsz == 0)
-		return (p->p_memsz - (va - p->p_vaddr));
-	return (pgsz - ((size_t)va & (pgsz - 1)));
-
- fail:
-	_kvm_err(kd, kd->program, "invalid virtual address %#jx",
-	    (uintmax_t)va);
-	return (0);
-}
-
-static size_t
-virt_kvatop(kvm_t *kd, uint64_t va, off_t *ofs)
-{
-
-	return (virt_addr2off(kd, va, ofs, 0));
-}
-
-/*
- * KVM architecture support functions.
- */
-
-void
-_kvm_freevtop(kvm_t *kd)
-{
-	struct vmstate *vm = kd->vmst;
-
-	if (vm->pbvm_pgtbl != NULL)
-		free(vm->pbvm_pgtbl);
-	if (vm->mmapbase != NULL)
-		munmap(vm->mmapbase, vm->mmapsize);
-	free(vm);
-	kd->vmst = NULL;
-}
-
-int
-_kvm_initvtop(kvm_t *kd)
-{
-	struct bootinfo bi;
-	struct nlist nl[2];
-	uint64_t va;
-	Elf64_Ehdr *ehdr;
-	size_t hdrsz;
-	ssize_t sz;
-
-	kd->vmst = (struct vmstate *)_kvm_malloc(kd, sizeof(*kd->vmst));
-	if (kd->vmst == NULL) {
-		_kvm_err(kd, kd->program, "cannot allocate vm");
-		return (-1);
-	}
-
-#ifndef CROSS_LIBKVM
-	kd->vmst->pagesize = getpagesize();
-#else
-	kd->vmst->pagesize = 8192;
-#endif
-
-	if (ia64_maphdrs(kd, sizeof(Elf64_Ehdr)) == -1)
-		return (-1);
-
-	ehdr = kd->vmst->mmapbase;
-	hdrsz = ehdr->e_phoff + ehdr->e_phentsize * ehdr->e_phnum;
-	if (ia64_maphdrs(kd, hdrsz) == -1)
-		return (-1);
-
-	kd->vmst->kvatop = (ehdr->e_flags & EF_IA_64_ABSOLUTE) ?
-	    phys_kvatop : virt_kvatop;
-
-	/*
-	 * Load the PBVM page table. We need this to resolve PBVM addresses.
-	 * The PBVM page table is obtained from the bootinfo structure, of
-	 * which the address is given to us in e_entry. If e_entry is 0, then
-	 * this is assumed to be a pre-PBVM kernel.
-	 * Note that the address of the bootinfo structure is either physical
-	 * or virtual, depending on whether the core is physical or virtual.
-	 */
-	if (ehdr->e_entry != 0 && (ehdr->e_flags & EF_IA_64_ABSOLUTE) != 0) {
-		sz = phys_read(kd, ehdr->e_entry, &bi, sizeof(bi));
-		if (sz != sizeof(bi)) {
-			_kvm_err(kd, kd->program,
-			    "cannot read bootinfo at physical address %#jx",
-			    (uintmax_t)ehdr->e_entry);
-			return (-1);
-		}
-		if (bi.bi_magic != BOOTINFO_MAGIC) {
-			_kvm_err(kd, kd->program, "invalid bootinfo");
-			return (-1);
-		}
-		kd->vmst->pbvm_pgtbl = _kvm_malloc(kd, bi.bi_pbvm_pgtblsz);
-		if (kd->vmst->pbvm_pgtbl == NULL) {
-			_kvm_err(kd, kd->program, "cannot allocate page table");
-			return (-1);
-		}
-		kd->vmst->pbvm_pgtblsz = bi.bi_pbvm_pgtblsz;
-		sz = phys_read(kd, bi.bi_pbvm_pgtbl, kd->vmst->pbvm_pgtbl,
-		    bi.bi_pbvm_pgtblsz);
-		if (sz != bi.bi_pbvm_pgtblsz) {
-			_kvm_err(kd, kd->program,
-			    "cannot read page table at physical address %#jx",
-			    (uintmax_t)bi.bi_pbvm_pgtbl);
-			return (-1);
-		}
-	} else {
-		kd->vmst->pbvm_pgtbl = NULL;
-		kd->vmst->pbvm_pgtblsz = 0;
-	}
-
-	/*
-	 * At this point we've got enough information to use kvm_read() for
-	 * direct mapped (ie region 6 and region 7) address, such as symbol
-	 * addresses/values.
-	 */
-
-	nl[0].n_name = "ia64_kptdir";
-	nl[1].n_name = 0;
-
-	if (kvm_nlist(kd, nl) != 0) {
-		_kvm_err(kd, kd->program, "bad namelist");
-		return (-1);
-	}
-
-	if (kvm_read(kd, (nl[0].n_value), &va, sizeof(va)) != sizeof(va)) {
-		_kvm_err(kd, kd->program, "cannot read kptdir");
-		return (-1);
-	}
-
-	if (va == REGION_BASE(5)) {
-		_kvm_err(kd, kd->program, "kptdir is itself virtual");
-		return (-1);
-	}
-
-	kd->vmst->kptdir = va;
-	return (0);
-}
-
-int
-_kvm_kvatop(kvm_t *kd, u_long va, off_t *ofs)
-{
-	size_t sz;
-
-	sz = kd->vmst->kvatop(kd, va, ofs);
-	return ((sz > INT_MAX) ? INT_MAX : sz);
-}
diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index 59d772df552f..14f17028e07d 100644
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -2,7 +2,8 @@
 # Copyright (c) David E. O'Brien, 2000-2004, 2006, 2009
 
 CONTRDIR=	${.CURDIR}/../../contrib/file
-.PATH: ${CONTRDIR}
+.PATH: ${CONTRDIR}/src
+.PATH: ${CONTRDIR}/doc
 
 LIB=	magic
 SHLIB_MAJOR=	4
@@ -18,7 +19,7 @@ INCS=	magic.h
 MAGICPATH?=	/usr/share/misc
 
 CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
-CFLAGS+= -I${.CURDIR} -I${CONTRDIR}
+CFLAGS+= -I${.CURDIR} -I${CONTRDIR}/src
 
 WARNS?=		3
 
@@ -27,9 +28,9 @@ CLEANFILES+=	magic magic.mgc
 FILES=		magic magic.mgc
 FILESDIR=	${MAGICPATH}
 
-MAGFILES=	${CONTRDIR}/Header\
-		${CONTRDIR}/Localstuff\
-		${CONTRDIR}/Magdir/[a-z]*
+MAGFILES=	${CONTRDIR}/magic/Header \
+		${CONTRDIR}/magic/Localstuff \
+		${CONTRDIR}/magic/Magdir/[a-z]*
 
 magic: ${MAGFILES}
 	cat ${.ALLSRC:O} > ${.TARGET}
@@ -39,7 +40,7 @@ magic.mgc: mkmagic magic
 
 CLEANFILES+=	mkmagic
 build-tools: mkmagic
-mkmagic: apprentice.c encoding.c funcs.c magic.c print.c
+mkmagic: apprentice.c cdf_time.c encoding.c funcs.c magic.c print.c
 	${CC} ${CFLAGS} -DCOMPILE_ONLY ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} \
 	    ${LDADD}
 
diff --git a/lib/libmagic/config.h b/lib/libmagic/config.h
index c7e38ec761a1..d80926d520bd 100644
--- a/lib/libmagic/config.h
+++ b/lib/libmagic/config.h
@@ -3,15 +3,24 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
 /* Define in built-in ELF support is used */
 #define BUILTIN_ELF 1
 
 /* Define for ELF core file support */
 #define ELFCORE 1
 
+/* Define to 1 if you have the `asctime_r' function. */
+#define HAVE_ASCTIME_R 1
+
 /* Define to 1 if you have the `asprintf' function. */
 #define HAVE_ASPRINTF 1
 
+/* Define to 1 if you have the `ctime_r' function. */
+#define HAVE_CTIME_R 1
+
 /* HAVE_DAYLIGHT */
 /* #undef HAVE_DAYLIGHT */
 
@@ -32,6 +41,9 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #define HAVE_FCNTL_H 1
 
+/* Define to 1 if you have the `fmtcheck' function. */
+#define HAVE_FMTCHECK 1
+
 /* Define to 1 if you have the `fork' function. */
 #define HAVE_FORK 1
 
@@ -47,11 +59,11 @@
 /* Define to 1 if you have the `getopt_long' function. */
 #define HAVE_GETOPT_LONG 1
 
-/* Define to 1 if the system has the type `int32_t'. */
-#define HAVE_INT32_T 1
+/* Define to 1 if you have the `getpagesize' function. */
+#define HAVE_GETPAGESIZE 1
 
-/* Define to 1 if the system has the type `int64_t'. */
-#define HAVE_INT64_T 1
+/* Define to 1 if the system has the type `intptr_t'. */
+#define HAVE_INTPTR_T 1
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
@@ -68,7 +80,7 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #define HAVE_LOCALE_H 1
 
-/* Define to 1 if you have the `mbrtowc' function. */
+/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
 #define HAVE_MBRTOWC 1
 
 /* Define to 1 if <wchar.h> declares mbstate_t. */
@@ -77,14 +89,20 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #define HAVE_MEMORY_H 1
 
+/* Define to 1 if you have the `mkostemp' function. */
+#define HAVE_MKOSTEMP 1
+
 /* Define to 1 if you have the `mkstemp' function. */
 #define HAVE_MKSTEMP 1
 
-/* Define to 1 if you have the `mmap' function. */
+/* Define to 1 if you have a working `mmap' system call. */
 #define HAVE_MMAP 1
 
-/* Define to 1 if the system has the type `pid_t'. */
-#define HAVE_PID_T 1
+/* Define to 1 if you have the `pread' function. */
+#define HAVE_PREAD 1
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
@@ -92,6 +110,9 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #define HAVE_STDLIB_H 1
 
+/* Define to 1 if you have the `strcasestr' function. */
+#define HAVE_STRCASESTR 1
+
 /* Define to 1 if you have the `strerror' function. */
 #define HAVE_STRERROR 1
 
@@ -131,6 +152,9 @@
 /* Define to 1 if you have the <sys/mman.h> header file. */
 #define HAVE_SYS_MMAN_H 1
 
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
@@ -155,17 +179,8 @@
 /* HAVE_TZNAME */
 #define HAVE_TZNAME 1
 
-/* Define to 1 if the system has the type `uint16_t'. */
-#define HAVE_UINT16_T 1
-
-/* Define to 1 if the system has the type `uint32_t'. */
-#define HAVE_UINT32_T 1
-
-/* Define to 1 if the system has the type `uint64_t'. */
-#define HAVE_UINT64_T 1
-
-/* Define to 1 if the system has the type `uint8_t'. */
-#define HAVE_UINT8_T 1
+/* Define to 1 if the system has the type `uintptr_t'. */
+#define HAVE_UINTPTR_T 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
@@ -182,6 +197,16 @@
 /* Define to 1 if you have the `vasprintf' function. */
 #define HAVE_VASPRINTF 1
 
+/* Define to 1 if you have the `vfork' function. */
+#define HAVE_VFORK 1
+
+/* Define to 1 if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
+
+/* Define to 1 or 0, depending whether the compiler supports simple visibility
+   declarations. */
+#define HAVE_VISIBILITY 1
+
 /* Define to 1 if you have the <wchar.h> header file. */
 #define HAVE_WCHAR_H 1
 
@@ -191,6 +216,12 @@
 /* Define to 1 if you have the `wcwidth' function. */
 #define HAVE_WCWIDTH 1
 
+/* Define to 1 if `fork' works. */
+#define HAVE_WORKING_FORK 1
+
+/* Define to 1 if `vfork' works. */
+#define HAVE_WORKING_VFORK 1
+
 /* Define to 1 if you have the <zlib.h> header file. */
 #define HAVE_ZLIB_H 1
 
@@ -206,9 +237,6 @@
    <sysmacros.h>. */
 /* #undef MAJOR_IN_SYSMACROS */
 
-/* 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 "file"
 
@@ -219,7 +247,7 @@
 #define PACKAGE_NAME "file"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "file 5.11"
+#define PACKAGE_STRING "file 5.19"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "file"
@@ -228,10 +256,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "5.11"
-
-/* The size of `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
+#define PACKAGE_VERSION "5.19"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -262,7 +287,24 @@
 
 
 /* Version number of package */
-#define VERSION "5.11"
+#define VERSION "5.19"
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
@@ -283,45 +325,67 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 /* #undef _POSIX_SOURCE */
 
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+/* #undef _UINT32_T */
+
+/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+/* #undef _UINT64_T */
+
+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+   #define below would cause a syntax error. */
+/* #undef _UINT8_T */
+
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
+/* Define to the type of a signed integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef int32_t */
+
+/* Define to the type of a signed integer type of width exactly 64 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef int64_t */
+
+/* Define to the type of a signed integer type wide enough to hold a pointer,
+   if such a type exists, and if the system does not define it. */
+/* #undef intptr_t */
+
 /* Define to a type if <wchar.h> does not define. */
 /* #undef mbstate_t */
 
 /* Define to `long int' if <sys/types.h> does not define. */
 /* #undef off_t */
 
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
 
+/* Define to the type of an unsigned integer type of width exactly 16 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint16_t */
 
-#ifdef _FREEBSD_UNUSED_
-#ifndef HAVE_UINT8_T
-typedef unsigned char uint8_t;
-#endif
-#ifndef HAVE_UINT16_T
-typedef unsigned short uint16_t;
-#endif
-#ifndef HAVE_UINT32_T
-typedef unsigned int uint32_t;
-#endif
-#ifndef HAVE_INT32_T
-typedef int int32_t;
-#endif
-#ifndef HAVE_UINT64_T
-#if SIZEOF_LONG_LONG == 8
-typedef unsigned long long uint64_t;
-#else
-typedef unsigned long uint64_t;
-#endif
-#endif
-#ifndef HAVE_INT64_T
-#if SIZEOF_LONG_LONG == 8
-typedef long long int64_t;
-#else
-typedef long int64_t;
-#endif
-#endif
-#endif /* _FREEBSD_UNUSED_ */
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint32_t */
 
+/* Define to the type of an unsigned integer type of width exactly 64 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint64_t */
+
+/* Define to the type of an unsigned integer type of width exactly 8 bits if
+   such a type exists and the standard includes do not define it. */
+/* #undef uint8_t */
+
+/* Define to the type of an unsigned integer type wide enough to hold a
+   pointer, if such a type exists, and if the system does not define it. */
+/* #undef uintptr_t */
+
+/* Define as `fork' if `vfork' does not work. */
+/* #undef vfork */
diff --git a/lib/libmd/mdX.3 b/lib/libmd/mdX.3
index 223e2efa4b26..4cc321fda792 100644
--- a/lib/libmd/mdX.3
+++ b/lib/libmd/mdX.3
@@ -178,7 +178,7 @@ The original MDX routines were developed by
 .Tn RSA
 Data Security, Inc., and published in the above references.
 This code is derived directly from these implementations by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 .Pp
 Phk ristede runen.
 .Sh BUGS
diff --git a/lib/libmemstat/libmemstat.3 b/lib/libmemstat/libmemstat.3
index 3eff1566d03e..0f6255399ea5 100644
--- a/lib/libmemstat/libmemstat.3
+++ b/lib/libmemstat/libmemstat.3
@@ -484,7 +484,7 @@ library appeared in
 .Sh AUTHORS
 The kernel memory allocator changes necessary to support a general purpose
 monitoring library, along with the library, were written by
-.An Robert Watson Aq rwatson@FreeBSD.org .
+.An Robert Watson Aq Mt rwatson@FreeBSD.org .
 .Sh BUGS
 There are memory allocators in the kernel, such as the VM page allocator
 and
diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile
index a9001a10c375..5d0e7a702c55 100644
--- a/lib/libmp/Makefile
+++ b/lib/libmp/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 LIB=		mp
 SHLIB_MAJOR=	7
 DPADD=		${LIBCRYPTO}
@@ -13,4 +15,8 @@ CFLAGS+=	-I${.CURDIR}/../../crypto
 VERSION_DEF=	${.CURDIR}/../libc/Versions.def
 SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.lib.mk>
diff --git a/lib/libmp/tests/Makefile b/lib/libmp/tests/Makefile
new file mode 100644
index 000000000000..0f591eb3ea42
--- /dev/null
+++ b/lib/libmp/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/lib/libmp
+
+TAP_TESTS_C+=	legacy_test
+
+DPADD+=		${LIBCRYPTO} ${LIBMP}
+LDADD+=		-lcrypto -lmp
+
+.include <bsd.test.mk>
diff --git a/tools/regression/lib/libmp/test-libmp.c b/lib/libmp/tests/legacy_test.c
similarity index 98%
rename from tools/regression/lib/libmp/test-libmp.c
rename to lib/libmp/tests/legacy_test.c
index d9d2c9f6b3e0..6f3f7b60e8d0 100644
--- a/tools/regression/lib/libmp/test-libmp.c
+++ b/lib/libmp/tests/legacy_test.c
@@ -46,7 +46,7 @@ testmcmp(const MINT *mp1, const MINT *mp2, const char *tname)
 		printf("not ok - %d %s\n", ++tnr, tname);
 }
 
-static int
+static void
 testsimpel(void)
 {
 	const char str42[] = "2a";
@@ -74,7 +74,7 @@ testsimpel(void)
 	mp_mfree(t2);
 }
 
-static int
+static void
 testgcd(void)
 {
 
@@ -82,7 +82,7 @@ testgcd(void)
 	testmcmp(t0, c5, "gcd0");
 }
 
-static int
+static void
 testmsqrt(void)
 {
 
@@ -94,7 +94,7 @@ testmsqrt(void)
 	testmcmp(t1, c6, "msqrt3");
 }
 
-static int
+static void
 testdiv(void)
 {
 	short ro;
@@ -121,7 +121,7 @@ testdiv(void)
 	mp_mfree(t2);
 }
 
-static int
+static void
 testmult(void)
 {
 
@@ -131,7 +131,7 @@ testmult(void)
 	testmcmp(t0, c42, "mmult1");
 }
 
-static int
+static void
 testpow(void)
 {
 
diff --git a/lib/libnetgraph/netgraph.3 b/lib/libnetgraph/netgraph.3
index bd557978f8ae..9d8d26a0571e 100644
--- a/lib/libnetgraph/netgraph.3
+++ b/lib/libnetgraph/netgraph.3
@@ -395,4 +395,4 @@ a version of
 .Fx 2.2
 customized for the Whistle InterJet.
 .Sh AUTHORS
-.An "Archie Cobbs" Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile
index 710c2950671c..cad1ea4eba63 100644
--- a/lib/libnv/Makefile
+++ b/lib/libnv/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 LIB=	nv
 SHLIBDIR?= /lib
 SHLIB_MAJOR= 0
@@ -158,4 +160,8 @@ MLINKS+=nv.3 nvlist_existsv.3 \
 
 WARNS?=	6
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.lib.mk>
diff --git a/lib/libnv/nv.3 b/lib/libnv/nv.3
index 28a8e0b1a188..63c8e8b0e202 100644
--- a/lib/libnv/nv.3
+++ b/lib/libnv/nv.3
@@ -600,5 +600,5 @@ library appeared in
 The
 .Nm libnv
 library was implemented by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libnv/tests/Makefile b/lib/libnv/tests/Makefile
new file mode 100644
index 000000000000..df1054960cd2
--- /dev/null
+++ b/lib/libnv/tests/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/lib/libnv
+
+TAP_TESTS_C+=	nvlist_add_test
+TAP_TESTS_C+=	nvlist_exists_test
+TAP_TESTS_C+=	nvlist_free_test
+TAP_TESTS_C+=	nvlist_get_test
+TAP_TESTS_C+=	nvlist_move_test
+TAP_TESTS_C+=	nvlist_send_recv_test
+
+DPADD+=		${LIBNV}
+LDADD+=		-lnv
+
+WARNS?=		6
+
+.include <bsd.test.mk>
diff --git a/tools/regression/lib/libnv/nvlist_add.c b/lib/libnv/tests/nvlist_add_test.c
similarity index 100%
rename from tools/regression/lib/libnv/nvlist_add.c
rename to lib/libnv/tests/nvlist_add_test.c
diff --git a/tools/regression/lib/libnv/nvlist_exists.c b/lib/libnv/tests/nvlist_exists_test.c
similarity index 100%
rename from tools/regression/lib/libnv/nvlist_exists.c
rename to lib/libnv/tests/nvlist_exists_test.c
diff --git a/tools/regression/lib/libnv/nvlist_free.c b/lib/libnv/tests/nvlist_free_test.c
similarity index 100%
rename from tools/regression/lib/libnv/nvlist_free.c
rename to lib/libnv/tests/nvlist_free_test.c
diff --git a/tools/regression/lib/libnv/nvlist_get.c b/lib/libnv/tests/nvlist_get_test.c
similarity index 100%
rename from tools/regression/lib/libnv/nvlist_get.c
rename to lib/libnv/tests/nvlist_get_test.c
diff --git a/tools/regression/lib/libnv/nvlist_move.c b/lib/libnv/tests/nvlist_move_test.c
similarity index 100%
rename from tools/regression/lib/libnv/nvlist_move.c
rename to lib/libnv/tests/nvlist_move_test.c
diff --git a/tools/regression/lib/libnv/nvlist_send_recv.c b/lib/libnv/tests/nvlist_send_recv_test.c
similarity index 100%
rename from tools/regression/lib/libnv/nvlist_send_recv.c
rename to lib/libnv/tests/nvlist_send_recv_test.c
diff --git a/lib/libohash/Makefile b/lib/libohash/Makefile
new file mode 100644
index 000000000000..198093e289b0
--- /dev/null
+++ b/lib/libohash/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+LIB=	ohash
+SRCS=	ohash.c
+INTERNALLIB=
+
+WARNS=	3
+
+.include <bsd.lib.mk>
diff --git a/lib/libohash/ohash.c b/lib/libohash/ohash.c
new file mode 100644
index 000000000000..3a0f5dde449c
--- /dev/null
+++ b/lib/libohash/ohash.c
@@ -0,0 +1,330 @@
+/* $OpenBSD: src/lib/libutil/ohash.c,v 1.1 2014/06/02 18:52:03 deraadt Exp $ */
+
+/* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include "ohash.h"
+
+struct _ohash_record {
+	uint32_t	hv;
+	const char	*p;
+};
+
+#define DELETED		((const char *)h)
+#define NONE		(h->size)
+
+/* Don't bother changing the hash table if the change is small enough.  */
+#define MINSIZE		(1UL << 4)
+#define MINDELETED	4
+
+static void ohash_resize(struct ohash *);
+
+
+/* This handles the common case of variable length keys, where the
+ * key is stored at the end of the record.
+ */
+void *
+ohash_create_entry(struct ohash_info *i, const char *start, const char **end)
+{
+	char *p;
+
+	if (!*end)
+		*end = start + strlen(start);
+	p = (i->alloc)(i->key_offset + (*end - start) + 1, i->data);
+	if (p) {
+		memcpy(p+i->key_offset, start, *end-start);
+		p[i->key_offset + (*end - start)] = '\0';
+	}
+	return (void *)p;
+}
+
+/* hash_delete only frees the hash structure. Use hash_first/hash_next
+ * to free entries as well.  */
+void
+ohash_delete(struct ohash *h)
+{
+	(h->info.free)(h->t, h->info.data);
+#ifndef NDEBUG
+	h->t = NULL;
+#endif
+}
+
+static void
+ohash_resize(struct ohash *h)
+{
+	struct _ohash_record *n;
+	size_t ns;
+	unsigned int	j;
+	unsigned int	i, incr;
+
+	if (4 * h->deleted < h->total) {
+		if (h->size >= (UINT_MAX >> 1U))
+			ns = UINT_MAX;
+		else
+			ns = h->size << 1U;
+	} else if (3 * h->deleted > 2 * h->total)
+		ns = h->size >> 1U;
+	else
+		ns = h->size;
+	if (ns < MINSIZE)
+		ns = MINSIZE;
+#ifdef STATS_HASH
+	STAT_HASH_EXPAND++;
+	STAT_HASH_SIZE += ns - h->size;
+#endif
+
+	n = (h->info.calloc)(ns, sizeof(struct _ohash_record), h->info.data);
+	if (!n)
+		return;
+
+	for (j = 0; j < h->size; j++) {
+		if (h->t[j].p != NULL && h->t[j].p != DELETED) {
+			i = h->t[j].hv % ns;
+			incr = ((h->t[j].hv % (ns - 2)) & ~1) + 1;
+			while (n[i].p != NULL) {
+				i += incr;
+				if (i >= ns)
+					i -= ns;
+			}
+			n[i].hv = h->t[j].hv;
+			n[i].p = h->t[j].p;
+		}
+	}
+	(h->info.free)(h->t, h->info.data);
+	h->t = n;
+	h->size = ns;
+	h->total -= h->deleted;
+	h->deleted = 0;
+}
+
+void *
+ohash_remove(struct ohash *h, unsigned int i)
+{
+	void		*result = (void *)h->t[i].p;
+
+	if (result == NULL || result == DELETED)
+		return NULL;
+
+#ifdef STATS_HASH
+	STAT_HASH_ENTRIES--;
+#endif
+	h->t[i].p = DELETED;
+	h->deleted++;
+	if (h->deleted >= MINDELETED && 4 * h->deleted > h->total)
+		ohash_resize(h);
+	return result;
+}
+
+void *
+ohash_find(struct ohash *h, unsigned int i)
+{
+	if (h->t[i].p == DELETED)
+		return NULL;
+	else
+		return (void *)h->t[i].p;
+}
+
+void *
+ohash_insert(struct ohash *h, unsigned int i, void *p)
+{
+#ifdef STATS_HASH
+	STAT_HASH_ENTRIES++;
+#endif
+	if (h->t[i].p == DELETED) {
+		h->deleted--;
+		h->t[i].p = p;
+	} else {
+		h->t[i].p = p;
+		/* Arbitrary resize boundary.  Tweak if not efficient enough.  */
+		if (++h->total * 4 > h->size * 3)
+			ohash_resize(h);
+	}
+	return p;
+}
+
+unsigned int
+ohash_entries(struct ohash *h)
+{
+	return h->total - h->deleted;
+}
+
+void *
+ohash_first(struct ohash *h, unsigned int *pos)
+{
+	*pos = 0;
+	return ohash_next(h, pos);
+}
+
+void *
+ohash_next(struct ohash *h, unsigned int *pos)
+{
+	for (; *pos < h->size; (*pos)++)
+		if (h->t[*pos].p != DELETED && h->t[*pos].p != NULL)
+			return (void *)h->t[(*pos)++].p;
+	return NULL;
+}
+
+void
+ohash_init(struct ohash *h, unsigned int size, struct ohash_info *info)
+{
+	h->size = 1UL << size;
+	if (h->size < MINSIZE)
+		h->size = MINSIZE;
+#ifdef STATS_HASH
+	STAT_HASH_CREATION++;
+	STAT_HASH_SIZE += h->size;
+#endif
+	/* Copy info so that caller may free it.  */
+	h->info.key_offset = info->key_offset;
+	h->info.calloc = info->calloc;
+	h->info.free = info->free;
+	h->info.alloc = info->alloc;
+	h->info.data = info->data;
+	h->t = (h->info.calloc)(h->size, sizeof(struct _ohash_record),
+		    h->info.data);
+	h->total = h->deleted = 0;
+}
+
+uint32_t
+ohash_interval(const char *s, const char **e)
+{
+	uint32_t k;
+
+	if (!*e)
+		*e = s + strlen(s);
+	if (s == *e)
+		k = 0;
+	else
+		k = *s++;
+	while (s != *e)
+		k =  ((k << 2) | (k >> 30)) ^ *s++;
+	return k;
+}
+
+unsigned int
+ohash_lookup_interval(struct ohash *h, const char *start, const char *end,
+    uint32_t hv)
+{
+	unsigned int	i, incr;
+	unsigned int	empty;
+
+#ifdef STATS_HASH
+	STAT_HASH_LOOKUP++;
+#endif
+	empty = NONE;
+	i = hv % h->size;
+	incr = ((hv % (h->size-2)) & ~1) + 1;
+	while (h->t[i].p != NULL) {
+#ifdef STATS_HASH
+		STAT_HASH_LENGTH++;
+#endif
+		if (h->t[i].p == DELETED) {
+			if (empty == NONE)
+				empty = i;
+		} else if (h->t[i].hv == hv &&
+		    strncmp(h->t[i].p+h->info.key_offset, start,
+			end - start) == 0 &&
+		    (h->t[i].p+h->info.key_offset)[end-start] == '\0') {
+			if (empty != NONE) {
+				h->t[empty].hv = hv;
+				h->t[empty].p = h->t[i].p;
+				h->t[i].p = DELETED;
+				return empty;
+			} else {
+#ifdef STATS_HASH
+				STAT_HASH_POSITIVE++;
+#endif
+				return i;
+			}
+		}
+		i += incr;
+		if (i >= h->size)
+			i -= h->size;
+	}
+
+	/* Found an empty position.  */
+	if (empty != NONE)
+		i = empty;
+	h->t[i].hv = hv;
+	return i;
+}
+
+unsigned int
+ohash_lookup_memory(struct ohash *h, const char *k, size_t size, uint32_t hv)
+{
+	unsigned int	i, incr;
+	unsigned int	empty;
+
+#ifdef STATS_HASH
+	STAT_HASH_LOOKUP++;
+#endif
+	empty = NONE;
+	i = hv % h->size;
+	incr = ((hv % (h->size-2)) & ~1) + 1;
+	while (h->t[i].p != NULL) {
+#ifdef STATS_HASH
+		STAT_HASH_LENGTH++;
+#endif
+		if (h->t[i].p == DELETED) {
+			if (empty == NONE)
+				empty = i;
+		} else if (h->t[i].hv == hv &&
+		    memcmp(h->t[i].p+h->info.key_offset, k, size) == 0) {
+			if (empty != NONE) {
+				h->t[empty].hv = hv;
+				h->t[empty].p = h->t[i].p;
+				h->t[i].p = DELETED;
+				return empty;
+			} else {
+#ifdef STATS_HASH
+				STAT_HASH_POSITIVE++;
+#endif
+			}	return i;
+		}
+		i += incr;
+		if (i >= h->size)
+			i -= h->size;
+	}
+
+	/* Found an empty position.  */
+	if (empty != NONE)
+		i = empty;
+	h->t[i].hv = hv;
+	return i;
+}
+
+unsigned int
+ohash_qlookup(struct ohash *h, const char *s)
+{
+	const char *e = NULL;
+	return ohash_qlookupi(h, s, &e);
+}
+
+unsigned int
+ohash_qlookupi(struct ohash *h, const char *s, const char **e)
+{
+	uint32_t hv;
+
+	hv = ohash_interval(s, e);
+	return ohash_lookup_interval(h, s, *e, hv);
+}
diff --git a/usr.bin/m4/lib/ohash.h b/lib/libohash/ohash.h
similarity index 86%
rename from usr.bin/m4/lib/ohash.h
rename to lib/libohash/ohash.h
index 98801022fb84..03de431d726b 100644
--- a/usr.bin/m4/lib/ohash.h
+++ b/lib/libohash/ohash.h
@@ -1,8 +1,4 @@
-#ifndef OHASH_H
-#define OHASH_H
-/* $OpenBSD: ohash.h,v 1.8 2005/12/29 18:54:47 jaredy Exp $ */
-/* ex:ts=8 sw=4: 
- */
+/* $OpenBSD: src/lib/libutil/ohash.h,v 1.2 2014/06/02 18:52:03 deraadt Exp $ */
 
 /* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
  *
@@ -21,21 +17,26 @@
  * $FreeBSD$
  */
 
+#ifndef OHASH_H
+#define OHASH_H
+
 /* Open hashing support. 
  * Open hashing was chosen because it is much lighter than other hash
  * techniques, and more efficient in most cases.
  */
 
+/* user-visible data structure */
 struct ohash_info {
 	ptrdiff_t key_offset;
 	void *data;	/* user data */
-	void *(*halloc)(size_t, void *);
-	void (*hfree)(void *, size_t, void *);
+	void *(*calloc)(size_t, size_t, void *);
+	void (*free)(void *, void *);
 	void *(*alloc)(size_t, void *);
 };
 
 struct _ohash_record;
 
+/* private structure. It's there just so you can do a sizeof */
 struct ohash {
 	struct _ohash_record 	*t;
 	struct ohash_info 	info;
@@ -55,9 +56,9 @@ void ohash_init(struct ohash *, unsigned, struct ohash_info *);
 void ohash_delete(struct ohash *);
 
 unsigned int ohash_lookup_interval(struct ohash *, const char *,
-	    const char *, u_int32_t);
+	    const char *, uint32_t);
 unsigned int ohash_lookup_memory(struct ohash *, const char *,
-	    size_t, u_int32_t);
+	    size_t, uint32_t);
 void *ohash_find(struct ohash *, unsigned int);
 void *ohash_remove(struct ohash *, unsigned int);
 void *ohash_insert(struct ohash *, unsigned int, void *);
@@ -66,10 +67,9 @@ void *ohash_next(struct ohash *, unsigned int *);
 unsigned int ohash_entries(struct ohash *);
 
 void *ohash_create_entry(struct ohash_info *, const char *, const char **);
-u_int32_t ohash_interval(const char *, const char **);
+uint32_t ohash_interval(const char *, const char **);
 
 unsigned int ohash_qlookupi(struct ohash *, const char *, const char **);
 unsigned int ohash_qlookup(struct ohash *, const char *);
 __END_DECLS
 #endif
-
diff --git a/usr.bin/m4/lib/ohash_init.3 b/lib/libohash/ohash_init.3
similarity index 81%
rename from usr.bin/m4/lib/ohash_init.3
rename to lib/libohash/ohash_init.3
index e0b232077465..184c4e389b24 100644
--- a/usr.bin/m4/lib/ohash_init.3
+++ b/lib/libohash/ohash_init.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ohash_init.3,v 1.14 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: ohash_init.3,v 1.2 2014/05/13 14:01:41 jmc Exp $
 .\" Copyright (c) 1999 Marc Espie <espie@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -15,8 +15,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt OPEN_HASH 3
+.Dd May 12, 2014
+.Dt OHASH_INIT 3
 .Os
 .Sh NAME
 .Nm ohash_init ,
@@ -71,11 +71,46 @@ initializes the table to store roughly 2 to the power
 .Fa size
 elements.
 .Fa info
-holds the position of the key in each record, and two pointers to
+is a pointer to a
+.Fa struct ohash_info .
+.Bd -literal -offset indent
+struct ohash_info {
+	ptrdiff_t key_offset;
+	void *data;	/* user data */
+	void *(*calloc)(size_t, size_t, void *);
+	void (*free)(void *, void *);
+	void *(*alloc)(size_t, void *);
+};
+.Ed
+.Pp
+The
+.Va offset
+field holds the position of the key in each record;
+the
+.Va calloc
+and
+.Va free
+fields are pointers to
 .Xr calloc 3
 and
 .Xr free 3 Ns -like
-functions, to use for managing the table internal storage.
+functions, used for managing the table internal storage;
+the
+.Va alloc
+field is only used by the utility function
+.Xr ohash_create_entry 3 .
+.Pp
+Each of these functions are called similarly to their standard counterpart,
+but with an extra
+.Ft void *
+parameter corresponding to the content of the field
+.Fa data ,
+which can be used to communicate specific information to the functions.
+.Pp
+.Fn ohash_init
+stores a copy of those fields internally, so
+.Fa info
+can be reclaimed after initialization.
 .Pp
 .Fn ohash_delete
 frees storage internal to
@@ -166,7 +201,7 @@ for (n = ohash_first(h, &i); n != NULL; n = ohash_next(h, &i))
 points to an auxiliary unsigned integer used to record the current position
 in the ohash table.
 Those functions are safe to use even while entries are added to/removed
-from the table, but in such a case they do not guarantee that new entries
+from the table, but in such a case they don't guarantee that new entries
 will be returned.
 As a special case, they can safely be used to free elements in the table.
 .Pp
@@ -179,7 +214,13 @@ Only
 .Fn ohash_remove
 and
 .Fn ohash_delete
-may call the user-supplied memory functions.
+may call the user-supplied memory functions:
+.Bd -literal -offset indent
+p = (*info->calloc)(n, sizeof_record, info->data);
+/* copy data from old to p */
+(*info->free)(old, info->data);
+.Ed
+.Pp
 It is the responsibility of the user memory allocation code to verify
 that those calls did not fail.
 .Pp
@@ -213,6 +254,7 @@ call.
 .Pp
 Multi-threaded applications should explicitly protect ohash table access.
 .Sh SEE ALSO
+.Xr hcreate 3 ,
 .Xr ohash_interval 3
 .Rs
 .%A Donald E. Knuth
diff --git a/usr.bin/m4/lib/ohash_interval.3 b/lib/libohash/ohash_interval.3
similarity index 92%
rename from usr.bin/m4/lib/ohash_interval.3
rename to lib/libohash/ohash_interval.3
index 8abe7a842bf8..3809c34e3c0f 100644
--- a/usr.bin/m4/lib/ohash_interval.3
+++ b/lib/libohash/ohash_interval.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ohash_interval.3,v 1.11 2007/05/31 19:19:30 jmc Exp $
+.\"	$OpenBSD: ohash_interval.3,v 1.1 2014/05/12 19:09:00 espie Exp $
 .\" Copyright (c) 2001 Marc Espie <espie@openbsd.org>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -15,8 +15,8 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt OPEN_HASH_HELPER 3
+.Dd June 5, 2013
+.Dt OHASH_INTERVAL 3
 .Os
 .Sh NAME
 .Nm ohash_interval ,
@@ -68,7 +68,10 @@ the alloc field of
 .Fa info
 should point to a
 .Xr malloc 3 Ns -like
-function to allocate the storage.
+function to allocate the storage:
+.Bd -literal -offset indent
+p = (*info->alloc)(sz, info->data);
+.Ed
 .Pp
 .Fn ohash_qlookupi
 is a wrapper function that simply calls
diff --git a/lib/libpam/modules/pam_group/pam_group.8 b/lib/libpam/modules/pam_group/pam_group.8
index 985094b1ed24..4f368e577c22 100644
--- a/lib/libpam/modules/pam_group/pam_group.8
+++ b/lib/libpam/modules/pam_group/pam_group.8
@@ -33,7 +33,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 9, 2011
+.Dd July 19, 2014
 .Dt PAM_GROUP 8
 .Os
 .Sh NAME
@@ -48,6 +48,11 @@
 .Sh DESCRIPTION
 The group service module for PAM accepts or rejects users based on
 their membership in a particular file group.
+.Nm pam_group
+provides functionality for two PAM categories: authentication and
+account management.
+In terms of the module-type parameter, they are the ``auth'' and
+``account'' features.
 .Pp
 The following options may be passed to the
 .Nm
diff --git a/lib/libpam/modules/pam_group/pam_group.c b/lib/libpam/modules/pam_group/pam_group.c
index a6e32cd2bf7e..6cf2774a308f 100644
--- a/lib/libpam/modules/pam_group/pam_group.c
+++ b/lib/libpam/modules/pam_group/pam_group.c
@@ -47,15 +47,14 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 
 #define PAM_SM_AUTH
+#define PAM_SM_ACCOUNT
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
 #include <security/openpam.h>
 
-
-PAM_EXTERN int
-pam_sm_authenticate(pam_handle_t *pamh, int flags __unused,
-    int argc __unused, const char *argv[] __unused)
+static int
+pam_group(pam_handle_t *pamh)
 {
 	int local, remote;
 	const char *group, *user;
@@ -96,14 +95,12 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused,
 	if ((grp = getgrnam(group)) == NULL || grp->gr_mem == NULL)
 		goto failed;
 
-	/* check if the group is empty */
-	if (*grp->gr_mem == NULL)
-		goto failed;
-
-	/* check membership */
+	/* check if user's own primary group */
 	if (pwd->pw_gid == grp->gr_gid)
 		goto found;
-	for (list = grp->gr_mem; *list != NULL; ++list)
+
+	/* iterate over members */
+	for (list = grp->gr_mem; list != NULL && *list != NULL; ++list)
 		if (strcmp(*list, pwd->pw_name) == 0)
 			goto found;
 
@@ -122,6 +119,14 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused,
 		goto not_found;
 }
 
+PAM_EXTERN int
+pam_sm_authenticate(pam_handle_t *pamh, int flags __unused,
+    int argc __unused, const char *argv[] __unused)
+{
+
+	return (pam_group(pamh));
+}
+
 PAM_EXTERN int
 pam_sm_setcred(pam_handle_t * pamh __unused, int flags __unused,
     int argc __unused, const char *argv[] __unused)
@@ -130,4 +135,12 @@ pam_sm_setcred(pam_handle_t * pamh __unused, int flags __unused,
 	return (PAM_SUCCESS);
 }
 
+PAM_EXTERN int
+pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused,
+    int argc __unused, const char *argv[] __unused)
+{
+
+	return (pam_group(pamh));
+}
+
 PAM_MODULE_ENTRY("pam_group");
diff --git a/lib/libpam/modules/pam_lastlog/pam_lastlog.c b/lib/libpam/modules/pam_lastlog/pam_lastlog.c
index 72bb94218104..814edb8c59af 100644
--- a/lib/libpam/modules/pam_lastlog/pam_lastlog.c
+++ b/lib/libpam/modules/pam_lastlog/pam_lastlog.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/time.h>
 
 #include <paths.h>
-#include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -68,7 +67,6 @@ PAM_EXTERN int
 pam_sm_open_session(pam_handle_t *pamh, int flags,
     int argc __unused, const char *argv[] __unused)
 {
-	struct passwd *pwd;
 	struct utmpx *utx, utl;
 	time_t t;
 	const char *user;
@@ -79,7 +77,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags,
 	pam_err = pam_get_user(pamh, &user, NULL);
 	if (pam_err != PAM_SUCCESS)
 		return (pam_err);
-	if (user == NULL || (pwd = getpwnam(user)) == NULL)
+	if (user == NULL)
 		return (PAM_SERVICE_ERR);
 	PAM_LOG("Got user: %s", user);
 
diff --git a/lib/libpam/modules/pam_opie/pam_opie.c b/lib/libpam/modules/pam_opie/pam_opie.c
index bfb875f88317..9625373d9d3e 100644
--- a/lib/libpam/modules/pam_opie/pam_opie.c
+++ b/lib/libpam/modules/pam_opie/pam_opie.c
@@ -62,7 +62,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused,
 	struct passwd *pwd;
 	int retval, i;
 	const char *(promptstr[]) = { "%s\nPassword: ", "%s\nPassword [echo on]: "};
-	char challenge[OPIE_CHALLENGE_MAX];
+	char challenge[OPIE_CHALLENGE_MAX + 1];
 	char principal[OPIE_PRINCIPAL_MAX];
 	const char *user;
 	char *response;
diff --git a/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 b/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
index 408f77d2707d..abdd3907e972 100644
--- a/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
+++ b/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8
@@ -123,7 +123,6 @@ password are not counted.
 In addition to being sufficiently long, passwords are required to
 contain enough different characters for the character classes and
 the minimum length they have been checked against.
-.Pp
 .It Cm max Ns = Ns Ar N
 .Pq Cm max Ns = Ns 40
 The maximum allowed password length.
@@ -257,7 +256,7 @@ is that the former is incompatible with
 The
 .Nm
 module was written by
-.An Solar Designer Aq solar@openwall.com .
+.An Solar Designer Aq Mt solar@openwall.com .
 This manual page, derived from the author's documentation, was written
 for the
 .Fx
diff --git a/lib/libpam/modules/pam_radius/pam_radius.8 b/lib/libpam/modules/pam_radius/pam_radius.8
index da36b7fe6c42..d71b41434419 100644
--- a/lib/libpam/modules/pam_radius/pam_radius.8
+++ b/lib/libpam/modules/pam_radius/pam_radius.8
@@ -126,9 +126,9 @@ manual page first appeared in
 The
 .Nm
 manual page was written by
-.An Andrzej Bialecki Aq abial@FreeBSD.org .
+.An Andrzej Bialecki Aq Mt abial@FreeBSD.org .
 .Pp
 The
 .Nm
 module was written by
-.An John D. Polstra Aq jdp@FreeBSD.org .
+.An John D. Polstra Aq Mt jdp@FreeBSD.org .
diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile
index 886610a8fd14..5643f321345d 100644
--- a/lib/libpam/modules/pam_ssh/Makefile
+++ b/lib/libpam/modules/pam_ssh/Makefile
@@ -14,7 +14,7 @@ WARNS?=	3
 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
 
 DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
-LDADD=	-lssh -lcrypto -lcrypt
+LDADD=	${LDSSH} -lcrypto -lcrypt
 USEPRIVATELIB= ssh
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.8 b/lib/libpam/modules/pam_ssh/pam_ssh.8
index ea41455f2e53..7c1ee40bf1ea 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.8
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.8
@@ -147,7 +147,7 @@ The
 .Nm
 module was originally written by
 .An -nosplit
-.An "Andrew J. Korty" Aq ajk@iu.edu .
+.An Andrew J. Korty Aq Mt ajk@iu.edu .
 The current implementation was developed for the
 .Fx
 Project by
@@ -156,4 +156,4 @@ Associates, Inc.\& under DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 This manual page was written by
-.An "Mark R V Murray" Aq markm@FreeBSD.org .
+.An Mark R V Murray Aq Mt markm@FreeBSD.org .
diff --git a/lib/libpam/modules/pam_tacplus/pam_tacplus.8 b/lib/libpam/modules/pam_tacplus/pam_tacplus.8
index a1fe9ba7b8d5..ee8cc78e0d9f 100644
--- a/lib/libpam/modules/pam_tacplus/pam_tacplus.8
+++ b/lib/libpam/modules/pam_tacplus/pam_tacplus.8
@@ -116,11 +116,11 @@ module first appeared in
 The
 .Nm
 manual page was written by
-.An Andrzej Bialecki Aq abial@FreeBSD.org
+.An Andrzej Bialecki Aq Mt abial@FreeBSD.org
 and adapted to TACACS+ from RADIUS by
-.An Mark R V Murray Aq markm@FreeBSD.org .
+.An Mark R V Murray Aq Mt markm@FreeBSD.org .
 .Pp
 The
 .Nm
 module was written by
-.An John D. Polstra Aq jdp@FreeBSD.org .
+.An John D. Polstra Aq Mt jdp@FreeBSD.org .
diff --git a/lib/libpmc/pmc.3 b/lib/libpmc/pmc.3
index c970da846056..8e6db485ae37 100644
--- a/lib/libpmc/pmc.3
+++ b/lib/libpmc/pmc.3
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 24, 2008
+.Dd July 28, 2014
 .Dt PMC 3
 .Os
 .Sh NAME
@@ -525,14 +525,26 @@ API is
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
+.Xr pmc.haswell 3 ,
+.Xr pmc.haswelluc 3 ,
 .Xr pmc.iaf 3 ,
+.Xr pmc.ivybridge 3 ,
+.Xr pmc.ivybridgexeon 3 ,
 .Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
+.Xr pmc.mips24k 3 ,
+.Xr pmc.octeon 3 ,
 .Xr pmc.p4 3 ,
 .Xr pmc.p5 3 ,
 .Xr pmc.p6 3 ,
+.Xr pmc.sandybridge 3 ,
+.Xr pmc.sandybridgeuc 3 ,
+.Xr pmc.sandybridgexeon 3 ,
 .Xr pmc.soft 3 ,
 .Xr pmc.tsc 3 ,
+.Xr pmc.westmere 3 ,
+.Xr pmc.westmereuc 3 ,
+.Xr pmc.xscale 3 ,
 .Xr pmclog 3 ,
 .Xr hwpmc 4 ,
 .Xr pmccontrol 8 ,
@@ -546,5 +558,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.atom.3 b/lib/libpmc/pmc.atom.3
index 9b9a58fa95c9..edf81ba54a5e 100644
--- a/lib/libpmc/pmc.atom.3
+++ b/lib/libpmc/pmc.atom.3
@@ -1191,5 +1191,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.atomsilvermont.3 b/lib/libpmc/pmc.atomsilvermont.3
index 91e22e9e3f50..dca200aa8db2 100644
--- a/lib/libpmc/pmc.atomsilvermont.3
+++ b/lib/libpmc/pmc.atomsilvermont.3
@@ -524,12 +524,11 @@ The
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Atom Silvermont
 microarchitecture was written by
-.An "Hiren Panchasara"
-.Aq hiren@FreeBSD.org .
+.An Hiren Panchasara Aq Mt hiren@FreeBSD.org .
diff --git a/lib/libpmc/pmc.core.3 b/lib/libpmc/pmc.core.3
index 73e8d81d5dc2..551e615dc320 100644
--- a/lib/libpmc/pmc.core.3
+++ b/lib/libpmc/pmc.core.3
@@ -805,5 +805,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.core2.3 b/lib/libpmc/pmc.core2.3
index 5c6b533164f9..cd038fb411d9 100644
--- a/lib/libpmc/pmc.core2.3
+++ b/lib/libpmc/pmc.core2.3
@@ -1121,5 +1121,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.corei7.3 b/lib/libpmc/pmc.corei7.3
index aaf1f022615f..90d19dfcab33 100644
--- a/lib/libpmc/pmc.corei7.3
+++ b/lib/libpmc/pmc.corei7.3
@@ -1573,5 +1573,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.corei7uc.3 b/lib/libpmc/pmc.corei7uc.3
index 3114c8ea9f6a..5b991138b73b 100644
--- a/lib/libpmc/pmc.corei7uc.3
+++ b/lib/libpmc/pmc.corei7uc.3
@@ -877,5 +877,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.haswell.3 b/lib/libpmc/pmc.haswell.3
index dd0cbb82b44f..ace9c2a544ef 100644
--- a/lib/libpmc/pmc.haswell.3
+++ b/lib/libpmc/pmc.haswell.3
@@ -964,12 +964,11 @@ The
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Haswell
 microarchitecture was written by
-.An "Hiren Panchasara"
-.Aq hiren.panchasara@gmail.com .
+.An Hiren Panchasara Aq Mt hiren.panchasara@gmail.com .
diff --git a/lib/libpmc/pmc.haswelluc.3 b/lib/libpmc/pmc.haswelluc.3
index dba9d4740019..fedf056eae7f 100644
--- a/lib/libpmc/pmc.haswelluc.3
+++ b/lib/libpmc/pmc.haswelluc.3
@@ -226,12 +226,11 @@ The
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Haswell
 microarchitecture was added by
-.An "Hiren Panchasara"
-.Aq hiren.panchasara@gmail.com .
+.An Hiren Panchasara Aq Mt hiren.panchasara@gmail.com .
diff --git a/lib/libpmc/pmc.iaf.3 b/lib/libpmc/pmc.iaf.3
index 7e623d6548ac..3184c199c59c 100644
--- a/lib/libpmc/pmc.iaf.3
+++ b/lib/libpmc/pmc.iaf.3
@@ -146,5 +146,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.ivybridge.3 b/lib/libpmc/pmc.ivybridge.3
index 7d8bdca62e3e..b8ad8e00c712 100644
--- a/lib/libpmc/pmc.ivybridge.3
+++ b/lib/libpmc/pmc.ivybridge.3
@@ -870,12 +870,11 @@ The
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Ivy Bridge
 microarchitecture was written by
-.An "Fabien Thomas"
-.Aq fabient@FreeBSD.org .
+.An Fabien Thomas Aq Mt fabient@FreeBSD.org .
diff --git a/lib/libpmc/pmc.ivybridgexeon.3 b/lib/libpmc/pmc.ivybridgexeon.3
index 76d5e60fce8f..3a5b7096b3a2 100644
--- a/lib/libpmc/pmc.ivybridgexeon.3
+++ b/lib/libpmc/pmc.ivybridgexeon.3
@@ -900,12 +900,11 @@ The
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Ivy Bridge Xeon
 microarchitecture was written by
-.An "Hiren Panchasara"
-.Aq hiren.panchasara@gmail.com .
+.An Hiren Panchasara Aq Mt hiren.panchasara@gmail.com .
diff --git a/lib/libpmc/pmc.k7.3 b/lib/libpmc/pmc.k7.3
index 646f35275149..a8be8143f9ea 100644
--- a/lib/libpmc/pmc.k7.3
+++ b/lib/libpmc/pmc.k7.3
@@ -262,5 +262,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.k8.3 b/lib/libpmc/pmc.k8.3
index 628137d7ffaf..45c70baa438c 100644
--- a/lib/libpmc/pmc.k8.3
+++ b/lib/libpmc/pmc.k8.3
@@ -672,7 +672,6 @@ Count memory controller high priority bypasses.
 .It Li memory-controller-lo-pri-bypass
 Count memory controller low priority bypasses.
 .El
-.Pp
 .It Li k8-nb-memory-controller-dram-slots-missed
 .Pq Event E2H
 Count memory controller DRAM command slots missed (in MemClks).
@@ -796,5 +795,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.mips24k.3 b/lib/libpmc/pmc.mips24k.3
index 4acb0a7eab94..d886d0e8c906 100644
--- a/lib/libpmc/pmc.mips24k.3
+++ b/lib/libpmc/pmc.mips24k.3
@@ -403,11 +403,10 @@ The
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 MIPS support was added by
-.An "George Neville-Neil"
-.Aq gnn@FreeBSD.org .
+.An George Neville-Neil Aq Mt gnn@FreeBSD.org .
diff --git a/lib/libpmc/pmc.octeon.3 b/lib/libpmc/pmc.octeon.3
index be38dd8c5786..019b448522e9 100644
--- a/lib/libpmc/pmc.octeon.3
+++ b/lib/libpmc/pmc.octeon.3
@@ -243,11 +243,10 @@ The
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 MIPS support was added by
-.An "George Neville-Neil"
-.Aq gnn@FreeBSD.org .
+.An George Neville-Neil Aq Mt gnn@FreeBSD.org .
diff --git a/lib/libpmc/pmc.p4.3 b/lib/libpmc/pmc.p4.3
index b273edd8b1e7..e113b72001e1 100644
--- a/lib/libpmc/pmc.p4.3
+++ b/lib/libpmc/pmc.p4.3
@@ -541,7 +541,6 @@ can take the following value (which is also the default):
 .It Li running
 Count cycles when the processor is active.
 .El
-.Pp
 .It Li p4-instr-retired Op Li ,mask= Ns Ar flags
 .Pq "TS event"
 Count instructions retired during a clock cycle.
@@ -1221,5 +1220,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.p5.3 b/lib/libpmc/pmc.p5.3
index ebdd5054e2d5..91d7677057ba 100644
--- a/lib/libpmc/pmc.p5.3
+++ b/lib/libpmc/pmc.p5.3
@@ -457,5 +457,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.p6.3 b/lib/libpmc/pmc.p6.3
index 3fa98a75a396..6a8270a86793 100644
--- a/lib/libpmc/pmc.p6.3
+++ b/lib/libpmc/pmc.p6.3
@@ -1023,5 +1023,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.sandybridge.3 b/lib/libpmc/pmc.sandybridge.3
index 931bd9d5f4e7..0b8f6b2f09a9 100644
--- a/lib/libpmc/pmc.sandybridge.3
+++ b/lib/libpmc/pmc.sandybridge.3
@@ -949,12 +949,11 @@ The
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org.
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Sandy Bridge
 microarchitecture was written by
-.An "Davide Italiano"
-.Aq davide@FreeBSD.org .
+.An Davide Italiano Aq Mt davide@FreeBSD.org .
diff --git a/lib/libpmc/pmc.sandybridgeuc.3 b/lib/libpmc/pmc.sandybridgeuc.3
index f952533334c6..0215c36a45d7 100644
--- a/lib/libpmc/pmc.sandybridgeuc.3
+++ b/lib/libpmc/pmc.sandybridgeuc.3
@@ -223,12 +223,11 @@ The
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Sandy Bridge
 microarchitecture was added by
-.An "Davide Italiano"
-.Aq davide@FreeBSD.org .
+.An Davide Italiano Aq Mt davide@FreeBSD.org .
diff --git a/lib/libpmc/pmc.sandybridgexeon.3 b/lib/libpmc/pmc.sandybridgexeon.3
index 8d69abd107dd..9a80f7892d13 100644
--- a/lib/libpmc/pmc.sandybridgexeon.3
+++ b/lib/libpmc/pmc.sandybridgexeon.3
@@ -1013,12 +1013,11 @@ The
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 The support for the Sandy Bridge Xeon
 microarchitecture was written by
-.An "Hiren Panchasara"
-.Aq hiren.panchasara@gmail.com .
+.An Hiren Panchasara Aq Mt hiren.panchasara@gmail.com .
diff --git a/lib/libpmc/pmc.soft.3 b/lib/libpmc/pmc.soft.3
index a6919aef0ca0..5d331e220a97 100644
--- a/lib/libpmc/pmc.soft.3
+++ b/lib/libpmc/pmc.soft.3
@@ -96,11 +96,10 @@ The
 library first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 Software PMC was written by
-.An "Fabien Thomas"
-.Aq fabient@FreeBSD.org .
+.An Fabien Thomas Aq Mt fabient@FreeBSD.org .
diff --git a/lib/libpmc/pmc.tsc.3 b/lib/libpmc/pmc.tsc.3
index 269200549d69..2392eb8db7a8 100644
--- a/lib/libpmc/pmc.tsc.3
+++ b/lib/libpmc/pmc.tsc.3
@@ -80,5 +80,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.ucf.3 b/lib/libpmc/pmc.ucf.3
index 15399e43d02e..6b027868d102 100644
--- a/lib/libpmc/pmc.ucf.3
+++ b/lib/libpmc/pmc.ucf.3
@@ -110,5 +110,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.westmere.3 b/lib/libpmc/pmc.westmere.3
index 547ee71eff0f..6bfdf391c8b6 100644
--- a/lib/libpmc/pmc.westmere.3
+++ b/lib/libpmc/pmc.westmere.3
@@ -1395,5 +1395,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.westmereuc.3 b/lib/libpmc/pmc.westmereuc.3
index 517c470fbe7d..2f260c24456d 100644
--- a/lib/libpmc/pmc.westmereuc.3
+++ b/lib/libpmc/pmc.westmereuc.3
@@ -1080,5 +1080,4 @@ library first appeared in
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/lib/libpmc/pmc.xscale.3 b/lib/libpmc/pmc.xscale.3
index 965ea741203d..5a496b942ade 100644
--- a/lib/libpmc/pmc.xscale.3
+++ b/lib/libpmc/pmc.xscale.3
@@ -144,14 +144,13 @@ library first appeared in
 Intel XScale support first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Lb libpmc
 library was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 .Pp
 Intel XScale support was added by
-.An "Rui Paulo"
-.Aq rpaulo@FreeBSD.org .
+.An Rui Paulo Aq Mt rpaulo@FreeBSD.org .
 .Sh CAVEATS
 The Intel XScale code does not yet support sampling.
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
index 7375a9ac43ab..dafe10df7134 100644
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@@ -15,7 +15,9 @@ INCS=	libproc.h
 
 CFLAGS+=	-I${.CURDIR}
 
-.if ${MK_LIBCPLUSPLUS} != "no"
+.if ${MK_CXX} == "no"
+CFLAGS+=	-DNO_CXA_DEMANGLE
+.elif ${MK_LIBCPLUSPLUS} != "no"
 LDADD+=		-lcxxrt
 DPADD+=		${LIBCXXRT}
 .else
diff --git a/lib/libproc/proc_sym.c b/lib/libproc/proc_sym.c
index 3777a46fd5e9..e1776a4e8e7a 100644
--- a/lib/libproc/proc_sym.c
+++ b/lib/libproc/proc_sym.c
@@ -46,27 +46,28 @@
 
 #include "_libproc.h"
 
+#ifndef NO_CXA_DEMANGLE
 extern char *__cxa_demangle(const char *, char *, size_t *, int *);
+#endif /* NO_CXA_DEMANGLE */
 
 static void	proc_rdl2prmap(rd_loadobj_t *, prmap_t *);
 
 static void
 demangle(const char *symbol, char *buf, size_t len)
 {
+#ifndef NO_CXA_DEMANGLE
 	char *dembuf;
-	size_t demlen = len;
 
-	dembuf = malloc(len);
-	if (!dembuf)
-		goto fail;
-	dembuf = __cxa_demangle(symbol, dembuf, &demlen, NULL);
-	if (!dembuf)
-		goto fail;
-	strlcpy(buf, dembuf, len);
-	free(dembuf);
-
-	return;
+	if (symbol[0] == '_' && symbol[1] == 'Z' && symbol[2]) {
+		dembuf = __cxa_demangle(symbol, NULL, NULL, NULL);
+		if (!dembuf)
+			goto fail;
+		strlcpy(buf, dembuf, len);
+		free(dembuf);
+		return;
+	}
 fail:
+#endif /* NO_CXA_DEMANGLE */
 	strlcpy(buf, symbol, len);
 }
 
@@ -297,10 +298,7 @@ proc_addr2sym(struct proc_handle *p, uintptr_t addr, char *name,
 		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])
-					demangle(s, name, namesz);
-				else
-					strlcpy(name, s, namesz);
+				demangle(s, name, namesz);
 				memcpy(symcopy, &sym, sizeof(sym));
 				/*
 				 * DTrace expects the st_value to contain
@@ -335,10 +333,7 @@ proc_addr2sym(struct proc_handle *p, uintptr_t addr, char *name,
 		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])
-					demangle(s, name, namesz);
-				else
-					strlcpy(name, s, namesz);
+				demangle(s, name, namesz);
 				memcpy(symcopy, &sym, sizeof(sym));
 				/*
 				 * DTrace expects the st_value to contain
diff --git a/lib/libprocstat/libprocstat.3 b/lib/libprocstat/libprocstat.3
index b472900dd8b9..1c1f811e6017 100644
--- a/lib/libprocstat/libprocstat.3
+++ b/lib/libprocstat/libprocstat.3
@@ -543,7 +543,7 @@ library appeared in
 The
 .Nm libprocstat
 library was written by
-.An Stanislav Sedov Aq stas@FreeBSD.org .
+.An Stanislav Sedov Aq Mt stas@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Sergey Kandaurov Aq pluknet@FreeBSD.org .
+.An Sergey Kandaurov Aq Mt pluknet@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_get_error.3 b/lib/librpcsec_gss/rpc_gss_get_error.3
index f1d8fc74b4a5..eea77c755498 100644
--- a/lib/librpcsec_gss/rpc_gss_get_error.3
+++ b/lib/librpcsec_gss/rpc_gss_get_error.3
@@ -55,4 +55,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_get_mech_info.3 b/lib/librpcsec_gss/rpc_gss_get_mech_info.3
index 9a26dc107d4b..0bf6d452f71a 100644
--- a/lib/librpcsec_gss/rpc_gss_get_mech_info.3
+++ b/lib/librpcsec_gss/rpc_gss_get_mech_info.3
@@ -65,4 +65,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_get_mechanisms.3 b/lib/librpcsec_gss/rpc_gss_get_mechanisms.3
index c37acea3421e..7c3bcca0e647 100644
--- a/lib/librpcsec_gss/rpc_gss_get_mechanisms.3
+++ b/lib/librpcsec_gss/rpc_gss_get_mechanisms.3
@@ -52,4 +52,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_get_principal_name.3 b/lib/librpcsec_gss/rpc_gss_get_principal_name.3
index 50fc65b0fb2e..286c09f68882 100644
--- a/lib/librpcsec_gss/rpc_gss_get_principal_name.3
+++ b/lib/librpcsec_gss/rpc_gss_get_principal_name.3
@@ -79,4 +79,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_get_versions.3 b/lib/librpcsec_gss/rpc_gss_get_versions.3
index d624f85e1bb4..9d79db4f9892 100644
--- a/lib/librpcsec_gss/rpc_gss_get_versions.3
+++ b/lib/librpcsec_gss/rpc_gss_get_versions.3
@@ -61,4 +61,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_getcred.3 b/lib/librpcsec_gss/rpc_gss_getcred.3
index 4ebd275728ae..515bd99743f8 100644
--- a/lib/librpcsec_gss/rpc_gss_getcred.3
+++ b/lib/librpcsec_gss/rpc_gss_getcred.3
@@ -82,4 +82,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_is_installed.3 b/lib/librpcsec_gss/rpc_gss_is_installed.3
index d427e87effa1..3d83b71ad2b6 100644
--- a/lib/librpcsec_gss/rpc_gss_is_installed.3
+++ b/lib/librpcsec_gss/rpc_gss_is_installed.3
@@ -62,4 +62,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_max_data_length.3 b/lib/librpcsec_gss/rpc_gss_max_data_length.3
index 1d3a9224f03f..57cf673032cb 100644
--- a/lib/librpcsec_gss/rpc_gss_max_data_length.3
+++ b/lib/librpcsec_gss/rpc_gss_max_data_length.3
@@ -61,4 +61,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_mech_to_oid.3 b/lib/librpcsec_gss/rpc_gss_mech_to_oid.3
index 14bd5ee8e767..1156325365d5 100644
--- a/lib/librpcsec_gss/rpc_gss_mech_to_oid.3
+++ b/lib/librpcsec_gss/rpc_gss_mech_to_oid.3
@@ -65,4 +65,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_oid_to_mech.3 b/lib/librpcsec_gss/rpc_gss_oid_to_mech.3
index 661bdff851f0..8ab8340f07cb 100644
--- a/lib/librpcsec_gss/rpc_gss_oid_to_mech.3
+++ b/lib/librpcsec_gss/rpc_gss_oid_to_mech.3
@@ -65,4 +65,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_qop_to_num.3 b/lib/librpcsec_gss/rpc_gss_qop_to_num.3
index 0f95d278bf31..bb8b50a5d7f7 100644
--- a/lib/librpcsec_gss/rpc_gss_qop_to_num.3
+++ b/lib/librpcsec_gss/rpc_gss_qop_to_num.3
@@ -67,4 +67,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_seccreate.3 b/lib/librpcsec_gss/rpc_gss_seccreate.3
index 836df2378feb..37e9efd5c04a 100644
--- a/lib/librpcsec_gss/rpc_gss_seccreate.3
+++ b/lib/librpcsec_gss/rpc_gss_seccreate.3
@@ -109,4 +109,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_set_callback.3 b/lib/librpcsec_gss/rpc_gss_set_callback.3
index 4226285288a0..2d202a5b0383 100644
--- a/lib/librpcsec_gss/rpc_gss_set_callback.3
+++ b/lib/librpcsec_gss/rpc_gss_set_callback.3
@@ -105,7 +105,7 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
 .Sh BUGS
 There is no mechanism for informing a server when a security context
 has been deleted.
diff --git a/lib/librpcsec_gss/rpc_gss_set_defaults.3 b/lib/librpcsec_gss/rpc_gss_set_defaults.3
index 72f22147682c..dcef9dad0b60 100644
--- a/lib/librpcsec_gss/rpc_gss_set_defaults.3
+++ b/lib/librpcsec_gss/rpc_gss_set_defaults.3
@@ -67,4 +67,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_set_svc_name.3 b/lib/librpcsec_gss/rpc_gss_set_svc_name.3
index a06d7d39aef5..97f1dee43943 100644
--- a/lib/librpcsec_gss/rpc_gss_set_svc_name.3
+++ b/lib/librpcsec_gss/rpc_gss_set_svc_name.3
@@ -84,4 +84,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3 b/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3
index f466e107434f..24eeae90dd26 100644
--- a/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3
+++ b/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3
@@ -61,4 +61,4 @@ function first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librpcsec_gss/rpcsec_gss.3 b/lib/librpcsec_gss/rpcsec_gss.3
index bcbef7cac068..d3120a6cee1b 100644
--- a/lib/librpcsec_gss/rpcsec_gss.3
+++ b/lib/librpcsec_gss/rpcsec_gss.3
@@ -228,4 +228,4 @@ library first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/lib/librtld_db/librtld_db.3 b/lib/librtld_db/librtld_db.3
index 4645142f7311..211ce79d757f 100644
--- a/lib/librtld_db/librtld_db.3
+++ b/lib/librtld_db/librtld_db.3
@@ -179,7 +179,7 @@ and was modeled after the same library present in the Solaris operating system.
 The
 .Nm librtld_db
 library and this manual page were written by
-.An Rui Paulo Aq rpaulo@FreeBSD.org
+.An Rui Paulo Aq Mt rpaulo@FreeBSD.org
 under sponsorship from the FreeBSD Foundation.
 .Sh CAVEATS
 The functions
diff --git a/lib/libsdp/sdp.3 b/lib/libsdp/sdp.3
index de115344e839..9d394e872497 100644
--- a/lib/libsdp/sdp.3
+++ b/lib/libsdp/sdp.3
@@ -409,7 +409,7 @@ to find out more about error.
 .Xr sdpcontrol 8 ,
 .Xr sdpd 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Most likely.
 Please report bugs if found.
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index 0e074d2a837e..ebf5c300811e 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -57,12 +57,10 @@ SRCS+= ntoh.c
 
 # string functions from libc
 .PATH: ${.CURDIR}/../libc/string
-.if ${MACHINE_CPUARCH} != "ia64"
 SRCS+=	bcmp.c bcopy.c bzero.c ffs.c memccpy.c memchr.c memcmp.c memcpy.c \
 	memmove.c memset.c qdivrem.c strcat.c strchr.c strcmp.c strcpy.c \
 	strcspn.c strlen.c strncat.c strncmp.c strncpy.c strpbrk.c \
 	strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c
-.endif
 .if ${MACHINE_CPUARCH} == "arm"
 .PATH: ${.CURDIR}/../libc/arm/gen
 
@@ -82,17 +80,6 @@ SRCS+=	aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S
 SRCS+=	aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
 .endif
 
-.endif
-.if ${MACHINE_CPUARCH} == "ia64"
-.PATH: ${.CURDIR}/../libc/ia64/string
-SRCS+=	bcmp.c bcopy.S bzero.S ffs.S memccpy.c memchr.c memcmp.c memcpy.S \
-	memmove.S memset.c strcat.c strchr.c strcmp.c strcpy.c strcspn.c \
-	strlen.c strncat.c strncmp.c strncpy.c strpbrk.c strrchr.c strsep.c \
-	strspn.c strstr.c strtok.c swab.c
-
-.PATH: ${.CURDIR}/../libc/ia64/gen
-SRCS+= __divdi3.S __divsi3.S __moddi3.S __modsi3.S
-SRCS+= __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S
 .endif
 .if ${MACHINE_CPUARCH} == "powerpc"
 .PATH: ${.CURDIR}/../libc/quad
@@ -174,6 +161,7 @@ SRCS+=	bootp.c rarp.c bootparam.c
 SRCS+=	ufs.c nfs.c cd9660.c tftp.c gzipfs.c bzipfs.c
 SRCS+=	dosfs.c ext2fs.c
 SRCS+=	splitfs.c
+SRCS+=	pkgfs.c
 .if ${MK_NAND} != "no"
 SRCS+=	nandfs.c
 .endif
diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3
index 2938e2d90cb1..b42c8b5bdd7f 100644
--- a/lib/libstand/libstand.3
+++ b/lib/libstand/libstand.3
@@ -665,12 +665,12 @@ from
 .It
 .Nm zalloc
 from
-.An Matthew Dillon Aq dillon@backplane.com
+.An Matthew Dillon Aq Mt dillon@backplane.com
 .El
 .Pp
 The reorganisation and port to
 .Fx 3.0 ,
 the environment functions and this manpage were written by
-.An Mike Smith Aq msmith@FreeBSD.org .
+.An Mike Smith Aq Mt msmith@FreeBSD.org .
 .Sh BUGS
 The lack of detailed memory usage data is unhelpful.
diff --git a/lib/libstand/open.c b/lib/libstand/open.c
index 49dc6608ff43..0d90433800a2 100644
--- a/lib/libstand/open.c
+++ b/lib/libstand/open.c
@@ -65,6 +65,8 @@ __FBSDID("$FreeBSD$");
 
 #include "stand.h"
 
+struct fs_ops *exclusive_file_system;
+
 struct open_file files[SOPEN_MAX];
 
 static int
@@ -89,6 +91,7 @@ o_rainit(struct open_file *f)
 int
 open(const char *fname, int mode)
 {
+    struct fs_ops	*fs;
     struct open_file	*f;
     int			fd, i, error, besterror;
     const char		*file;
@@ -105,6 +108,15 @@ open(const char *fname, int mode)
     f->f_offset = 0;
     f->f_devdata = NULL;
     file = (char *)0;
+
+    if (exclusive_file_system != NULL) {
+	fs = exclusive_file_system;
+	error = (fs->fo_open)(fname, f);
+	if (error == 0)
+	    goto ok;
+	goto fail;
+    }
+
     error = devopen(f, fname, &file);
     if (error ||
 	(((f->f_flags & F_NODEV) == 0) && f->f_dev == (struct devsw *)0))
@@ -120,20 +132,17 @@ open(const char *fname, int mode)
     /* pass file name to the different filesystem open routines */
     besterror = ENOENT;
     for (i = 0; file_system[i] != NULL; i++) {
-
-	error = ((*file_system[i]).fo_open)(file, f);
-	if (error == 0) {
-	    
-	    f->f_ops = file_system[i];
-	    o_rainit(f);
-	    return (fd);
-	}
+	fs = file_system[i];
+	error = (fs->fo_open)(file, f);
+	if (error == 0)
+	    goto ok;
 	if (error != EINVAL)
 	    besterror = error;
     }
     error = besterror;
 
-    if ((f->f_flags & F_NODEV) == 0)
+ fail:
+    if ((f->f_flags & F_NODEV) == 0 && f->f_dev != NULL)
 	f->f_dev->dv_close(f);
     if (error)
 	devclose(f);
@@ -142,4 +151,9 @@ open(const char *fname, int mode)
     f->f_flags = 0;
     errno = error;
     return (-1);
+
+ ok:
+    f->f_ops = fs;
+    o_rainit(f);
+    return (fd);
 }
diff --git a/lib/libstand/pkgfs.c b/lib/libstand/pkgfs.c
new file mode 100644
index 000000000000..fda7f607087d
--- /dev/null
+++ b/lib/libstand/pkgfs.c
@@ -0,0 +1,791 @@
+/*- 
+ * Copyright (c) 2007-2014, Juniper Networks, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 "stand.h"
+
+#include <sys/stat.h>
+#include <sys/stdint.h>
+#include <string.h>
+#include <zlib.h>
+
+#ifdef PKGFS_DEBUG
+#define	DBG(x)	printf x
+#else
+#define	DBG(x)
+#endif
+
+static int   pkg_open(const char *, struct open_file *);
+static int   pkg_close(struct open_file *);
+static int   pkg_read(struct open_file *, void *, size_t, size_t *);
+static off_t pkg_seek(struct open_file *, off_t, int);
+static int   pkg_stat(struct open_file *, struct stat *);
+static int   pkg_readdir(struct open_file *, struct dirent *);
+
+struct fs_ops pkgfs_fsops = {
+	"pkg",
+	pkg_open, 
+	pkg_close, 
+	pkg_read,
+	null_write,
+	pkg_seek,
+	pkg_stat,
+	pkg_readdir
+};
+
+#define PKG_BUFSIZE	512
+#define	PKG_MAXCACHESZ	4096
+
+#define	PKG_FILEEXT	".tgz"
+
+/*
+ * Layout of POSIX 'ustar' header.
+ */
+struct ustar_hdr {
+	char	ut_name[100];
+	char	ut_mode[8];
+	char	ut_uid[8];
+	char	ut_gid[8];
+	char	ut_size[12];
+	char	ut_mtime[12];
+	char	ut_checksum[8];
+	char	ut_typeflag[1];
+	char	ut_linkname[100];
+	char	ut_magic[6];		/* For POSIX: "ustar\0" */
+	char	ut_version[2];		/* For POSIX: "00" */
+	char	ut_uname[32];
+	char	ut_gname[32];
+	char	ut_rdevmajor[8];
+	char	ut_rdevminor[8];
+	union {
+		struct {
+			char	prefix[155];
+		} posix;
+		struct {
+			char	atime[12];
+			char	ctime[12];
+			char	offset[12];
+			char	longnames[4];
+			char	unused[1];
+			struct gnu_sparse {
+				char	offset[12];
+				char	numbytes[12];
+			} sparse[4];
+			char	isextended[1];
+			char	realsize[12];
+		} gnu;
+	} u;
+	u_char __padding[12];
+};
+
+struct package;
+
+struct tarfile
+{
+	struct package *tf_pkg;
+	struct tarfile *tf_next;
+	struct ustar_hdr tf_hdr;
+	off_t	tf_ofs;
+	off_t	tf_size;
+	off_t	tf_fp;
+	size_t	tf_cachesz;
+	void	*tf_cache;
+};
+
+struct package
+{
+	struct package *pkg_chain;
+	int	pkg_fd;
+	off_t	pkg_ofs;
+	z_stream pkg_zs;
+	struct tarfile *pkg_first;
+	struct tarfile *pkg_last;
+	u_char	pkg_buf[PKG_BUFSIZE];
+};
+
+static struct package *package = NULL;
+
+static int new_package(int, struct package **);
+
+void
+pkgfs_cleanup(void)
+{
+	struct package *chain;
+	struct tarfile *tf, *tfn;
+
+	while (package != NULL) {
+		inflateEnd(&package->pkg_zs);
+		close(package->pkg_fd);
+
+		tf = package->pkg_first;
+		while (tf != NULL) {
+			tfn = tf->tf_next;
+			if (tf->tf_cachesz > 0)
+				free(tf->tf_cache);
+			free(tf);
+			tf = tfn;
+		}
+
+		chain = package->pkg_chain;
+		free(package);
+		package = chain;
+	}
+}
+
+int
+pkgfs_init(const char *pkgname, struct fs_ops *proto)
+{
+	struct package *pkg;
+	int error, fd;
+
+	if (proto != &pkgfs_fsops)
+		pkgfs_cleanup();
+
+	exclusive_file_system = proto;
+
+	fd = open(pkgname, O_RDONLY);
+
+	exclusive_file_system = NULL;
+
+	if (fd == -1)
+		return (errno);
+
+	error = new_package(fd, &pkg);
+	if (error) {
+		close(fd);
+		return (error);
+	}
+
+	if (pkg == NULL)
+		return (EDOOFUS);
+
+	pkg->pkg_chain = package;
+	package = pkg;
+	exclusive_file_system = &pkgfs_fsops;
+	return (0);
+}
+
+static int get_mode(struct tarfile *);
+static int get_zipped(struct package *, void *, size_t);
+static int new_package(int, struct package **);
+static struct tarfile *scan_tarfile(struct package *, struct tarfile *);
+
+static int
+pkg_open(const char *fn, struct open_file *f)
+{
+	struct tarfile *tf;
+
+	if (fn == NULL || f == NULL)
+		return (EINVAL);
+
+	if (package == NULL)
+		return (ENXIO);
+
+	/*
+	 * We can only read from a package, so reject request to open
+	 * for write-only or read-write.
+	 */
+	if (f->f_flags != F_READ)
+		return (EPERM);
+
+	/*
+	 * Scan the file headers for the named file. We stop scanning
+	 * at the first filename that has the .pkg extension. This is
+	 * a package within a package. We assume we have all the files
+	 * we need up-front and without having to dig within nested
+	 * packages.
+	 *
+	 * Note that we preserve streaming properties as much as possible.
+	 */
+	while (*fn == '/')
+		fn++;
+
+	/*
+	 * Allow opening of the root directory for use by readdir()
+	 * to support listing files in the package.
+	 */
+	if (*fn == '\0') {
+		f->f_fsdata = NULL;
+		return (0);
+	}
+
+	tf = scan_tarfile(package, NULL);
+	while (tf != NULL) {
+		if (strcmp(fn, tf->tf_hdr.ut_name) == 0) {
+			f->f_fsdata = tf;
+			tf->tf_fp = 0;	/* Reset the file pointer. */
+			return (0);
+		}
+		tf = scan_tarfile(package, tf);
+	}
+	return (errno);
+}
+
+static int
+pkg_close(struct open_file *f)
+{
+	struct tarfile *tf;
+
+	tf = (struct tarfile *)f->f_fsdata;
+	if (tf == NULL)
+		return (0);
+
+	/*
+	 * Free up the cache if we read all of the file.
+	 */
+	if (tf->tf_fp == tf->tf_size && tf->tf_cachesz > 0) {
+		free(tf->tf_cache);
+		tf->tf_cachesz = 0;
+	}
+	return (0);
+}
+
+static int
+pkg_read(struct open_file *f, void *buf, size_t size, size_t *res)
+{
+	struct tarfile *tf;
+	char *p;
+	off_t fp;
+	size_t sz;
+
+	tf = (struct tarfile *)f->f_fsdata;
+	if (tf == NULL) {
+		if (res != NULL)
+			*res = size;
+		return (EBADF);
+	}
+
+	fp = tf->tf_fp;
+	p = buf;
+	sz = 0;
+	while (size > 0) {
+		sz = tf->tf_size - fp;
+		if (fp < tf->tf_cachesz && tf->tf_cachesz < tf->tf_size)
+			sz = tf->tf_cachesz - fp;
+		if (size < sz)
+			sz = size;
+		if (sz == 0)
+			break;
+
+		if (fp < tf->tf_cachesz) {
+			/* Satisfy the request from cache. */
+			memcpy(p, tf->tf_cache + fp, sz);
+			fp += sz;
+			p += sz;
+			size -= sz;
+			continue;
+		}
+
+		if (get_zipped(tf->tf_pkg, p, sz) == -1) {
+			sz = -1;
+			break;
+		}
+
+		fp += sz;
+		p += sz;
+		size -= sz;
+
+		if (tf->tf_cachesz != 0)
+			continue;
+
+		tf->tf_cachesz = (sz <= PKG_MAXCACHESZ) ? sz : PKG_MAXCACHESZ;
+		tf->tf_cache = malloc(tf->tf_cachesz);
+		if (tf->tf_cache != NULL)
+			memcpy(tf->tf_cache, buf, tf->tf_cachesz);
+		else
+			tf->tf_cachesz = 0;
+	}
+
+	tf->tf_fp = fp;
+	if (res != NULL)
+		*res = size;
+	return ((sz == -1) ? errno : 0);
+}
+
+static off_t
+pkg_seek(struct open_file *f, off_t ofs, int whence)
+{
+	char buf[512];
+	struct tarfile *tf;
+	off_t delta;
+	size_t sz, res;
+	int error;
+
+	tf = (struct tarfile *)f->f_fsdata;
+	if (tf == NULL) {
+		errno = EBADF;
+		return (-1);
+	}
+
+	switch (whence) {
+	case SEEK_SET:
+		delta = ofs - tf->tf_fp;
+		break;
+	case SEEK_CUR:
+		delta = ofs;
+		break;
+	case SEEK_END:
+		delta = tf->tf_size - tf->tf_fp + ofs;
+		break;
+	default:
+		errno = EINVAL;
+		return (-1);
+	}
+
+	if (delta < 0) {
+		DBG(("%s: negative file seek (%jd)\n", __func__,
+		    (intmax_t)delta));
+		errno = ESPIPE;
+		return (-1);
+	}
+
+	while (delta > 0 && tf->tf_fp < tf->tf_size) {
+		sz = (delta > sizeof(buf)) ? sizeof(buf) : delta;
+		error = pkg_read(f, buf, sz, &res);
+		if (error != 0) {
+			errno = error;
+			return (-1);
+		}
+		delta -= sz - res;
+	}
+
+	return (tf->tf_fp);
+}
+
+static int
+pkg_stat(struct open_file *f, struct stat *sb)
+{
+	struct tarfile *tf;
+
+	tf = (struct tarfile *)f->f_fsdata;
+	if (tf == NULL)
+		return (EBADF);
+	memset(sb, 0, sizeof(*sb));
+	sb->st_mode = get_mode(tf);
+	sb->st_size = tf->tf_size;
+	sb->st_blocks = (tf->tf_size + 511) / 512;
+	return (0);
+}
+
+static int
+pkg_readdir(struct open_file *f, struct dirent *d)
+{
+	struct tarfile *tf;
+
+	tf = (struct tarfile *)f->f_fsdata;
+	if (tf != NULL)
+		return (EBADF);
+
+	tf = scan_tarfile(package, NULL);
+	if (tf == NULL)
+		return (ENOENT);
+
+	d->d_fileno = 0;
+	d->d_reclen = sizeof(*d);
+	d->d_type = DT_REG;
+	memcpy(d->d_name, tf->tf_hdr.ut_name, sizeof(d->d_name));
+	return (0);
+}
+
+/*
+ * Low-level support functions.
+ */
+
+static int
+get_byte(struct package *pkg, off_t *op)
+{
+	int c;
+
+	if (pkg->pkg_zs.avail_in == 0) {
+		c = read(pkg->pkg_fd, pkg->pkg_buf, PKG_BUFSIZE);
+		if (c <= 0)
+			return (-1);
+		pkg->pkg_zs.avail_in = c;
+		pkg->pkg_zs.next_in = pkg->pkg_buf;
+	}
+
+	c = *pkg->pkg_zs.next_in;
+	pkg->pkg_zs.next_in++;
+	pkg->pkg_zs.avail_in--;
+	(*op)++;
+	return (c);
+}
+
+static int
+get_zipped(struct package *pkg, void *buf, size_t bufsz)
+{
+	int c;
+
+	pkg->pkg_zs.next_out = buf;
+	pkg->pkg_zs.avail_out = bufsz;
+
+	while (pkg->pkg_zs.avail_out) {
+		if (pkg->pkg_zs.avail_in == 0) {
+			c = read(pkg->pkg_fd, pkg->pkg_buf, PKG_BUFSIZE);
+			if (c <= 0) {
+				errno = EIO;
+				return (-1);
+			}
+			pkg->pkg_zs.avail_in = c;
+			pkg->pkg_zs.next_in = pkg->pkg_buf;
+		}
+
+		c = inflate(&pkg->pkg_zs, Z_SYNC_FLUSH);
+		if (c != Z_OK && c != Z_STREAM_END) {
+			errno = EIO;
+			return (-1);
+		}
+	}
+
+	pkg->pkg_ofs += bufsz;
+	return (0);
+}
+
+static int
+cache_data(struct tarfile *tf)
+{
+	struct package *pkg;
+	size_t sz;
+
+	if (tf == NULL) {
+		DBG(("%s: no file to cache data for?\n", __func__));
+		errno = EINVAL;
+		return (-1);
+	}
+
+	pkg = tf->tf_pkg;
+	if (pkg == NULL) {
+		DBG(("%s: no package associated with file?\n", __func__));
+		errno = EINVAL;
+		return (-1);
+	}
+
+	if (tf->tf_ofs != pkg->pkg_ofs) {
+		DBG(("%s: caching after partial read of file %s?\n",
+		    __func__, tf->tf_hdr.ut_name));
+		errno = EINVAL;
+		return (-1);
+	}
+
+	/* We don't cache everything... */
+	if (tf->tf_size > PKG_MAXCACHESZ) {
+		errno = ENOMEM;
+		return (-1);
+	}
+
+	/* All files are padded to a multiple of 512 bytes. */
+	sz = (tf->tf_size + 0x1ff) & ~0x1ff;
+
+	tf->tf_cache = malloc(sz);
+	if (tf->tf_cache == NULL) {
+		DBG(("%s: could not allocate %d bytes\n", __func__, (int)sz));
+		errno = ENOMEM;
+		return (-1);
+	}
+
+	tf->tf_cachesz = sz;
+	return (get_zipped(pkg, tf->tf_cache, sz));
+}
+
+/*
+ * Note that this implementation does not (and should not!) obey
+ * locale settings; you cannot simply substitute strtol here, since
+ * it does obey locale.
+ */
+static off_t
+pkg_atol8(const char *p, unsigned char_cnt)
+{
+        int64_t l, limit, last_digit_limit;
+        int digit, sign, base;
+
+        base = 8;
+        limit = INT64_MAX / base;
+        last_digit_limit = INT64_MAX % base;
+
+        while (*p == ' ' || *p == '\t')
+                p++;
+        if (*p == '-') {
+                sign = -1;
+                p++;
+        } else
+                sign = 1;
+
+        l = 0;
+        digit = *p - '0';
+        while (digit >= 0 && digit < base  && char_cnt-- > 0) {
+                if (l>limit || (l == limit && digit > last_digit_limit)) {
+                        l = UINT64_MAX; /* Truncate on overflow. */
+                        break;
+                }
+                l = (l * base) + digit;
+                digit = *++p - '0';
+        }
+        return (sign < 0) ? -l : l;
+}
+
+/*
+ * Parse a base-256 integer.  This is just a straight signed binary
+ * value in big-endian order, except that the high-order bit is
+ * ignored.  Remember that "int64_t" may or may not be exactly 64
+ * bits; the implementation here tries to avoid making any assumptions
+ * about the actual size of an int64_t.  It does assume we're using
+ * twos-complement arithmetic, though.
+ */
+static int64_t
+pkg_atol256(const char *_p, unsigned char_cnt)
+{
+        int64_t l, upper_limit, lower_limit;
+        const unsigned char *p = (const unsigned char *)_p;
+
+        upper_limit = INT64_MAX / 256;
+        lower_limit = INT64_MIN / 256;
+
+        /* Pad with 1 or 0 bits, depending on sign. */
+        if ((0x40 & *p) == 0x40)
+                l = (int64_t)-1;
+        else
+                l = 0;
+        l = (l << 6) | (0x3f & *p++);
+        while (--char_cnt > 0) {
+                if (l > upper_limit) {
+                        l = INT64_MAX; /* Truncate on overflow */
+                        break;
+                } else if (l < lower_limit) {
+                        l = INT64_MIN;
+                        break;
+                }
+                l = (l << 8) | (0xff & (int64_t)*p++);
+        }
+        return (l);
+}
+
+static off_t
+pkg_atol(const char *p, unsigned char_cnt)
+{
+	/*
+	 * Technically, GNU pkg considers a field to be in base-256
+	 * only if the first byte is 0xff or 0x80.
+	 */
+	if (*p & 0x80)
+		return (pkg_atol256(p, char_cnt));
+	return (pkg_atol8(p, char_cnt));
+}
+
+static int
+get_mode(struct tarfile *tf)
+{
+	return (pkg_atol(tf->tf_hdr.ut_mode, sizeof(tf->tf_hdr.ut_mode)));
+}
+
+/* GZip flag byte */
+#define ASCII_FLAG	0x01 /* bit 0 set: file probably ascii text */
+#define HEAD_CRC	0x02 /* bit 1 set: header CRC present */
+#define EXTRA_FIELD	0x04 /* bit 2 set: extra field present */
+#define ORIG_NAME	0x08 /* bit 3 set: original file name present */
+#define COMMENT		0x10 /* bit 4 set: file comment present */
+#define RESERVED	0xE0 /* bits 5..7: reserved */
+
+static int
+new_package(int fd, struct package **pp)
+{
+	struct package *pkg;
+	off_t ofs;
+	int flags, i, error;
+
+	pkg = malloc(sizeof(*pkg));
+	if (pkg == NULL)
+		return (ENOMEM);
+
+	bzero(pkg, sizeof(*pkg));
+	pkg->pkg_fd = fd;
+
+	/*
+	 * Parse the header.
+	 */
+	error = EFTYPE;
+	ofs = 0;
+
+	/* Check megic. */
+	if (get_byte(pkg, &ofs) != 0x1f || get_byte(pkg, &ofs) != 0x8b)
+		goto fail;
+	/* Check method. */
+	if (get_byte(pkg, &ofs) != Z_DEFLATED)
+		goto fail;
+	/* Check flags. */
+	flags = get_byte(pkg, &ofs);
+	if (flags & RESERVED)
+		goto fail;
+
+	/* Skip time, xflags and OS code. */
+	for (i = 0; i < 6; i++) {
+		if (get_byte(pkg, &ofs) == -1)
+			goto fail;
+	}
+
+	/* Skip extra field. */
+	if (flags & EXTRA_FIELD) {
+		i = (get_byte(pkg, &ofs) & 0xff) |
+		    ((get_byte(pkg, &ofs) << 8) & 0xff);
+		while (i-- > 0) {
+			if (get_byte(pkg, &ofs) == -1)
+				goto fail;
+		}
+	}
+
+	/* Skip original file name. */
+	if (flags & ORIG_NAME) {
+		do {
+			i = get_byte(pkg, &ofs);
+		} while (i != 0 && i != -1);
+		if (i == -1)
+			goto fail;
+	}
+
+	/* Print the comment if it's there. */
+	if (flags & COMMENT) {
+		while (1) {
+			i = get_byte(pkg, &ofs);
+			if (i == -1)
+				goto fail;
+			if (i == 0)
+				break;
+			putchar(i);
+		}
+	}
+
+	/* Skip the CRC. */
+	if (flags & HEAD_CRC) {
+		if (get_byte(pkg, &ofs) == -1)
+			goto fail;
+		if (get_byte(pkg, &ofs) == -1)
+			goto fail;
+	}
+
+	/*
+	 * Done parsing the ZIP header. Spkgt the inflation engine.
+	 */
+	error = inflateInit2(&pkg->pkg_zs, -15);
+	if (error != Z_OK)
+		goto fail;
+
+	*pp = pkg;
+	return (0);
+
+ fail:
+	free(pkg);
+	return (error);
+}
+
+static struct tarfile *
+scan_tarfile(struct package *pkg, struct tarfile *last)
+{
+	char buf[512];
+	struct tarfile *cur;
+	off_t ofs;
+	size_t sz;
+
+	cur = (last != NULL) ? last->tf_next : pkg->pkg_first;
+	if (cur == NULL) {
+		ofs = (last != NULL) ? last->tf_ofs + last->tf_size :
+		    pkg->pkg_ofs;
+		ofs = (ofs + 0x1ff) & ~0x1ff;
+
+		/* Check if we've reached EOF. */
+		if (ofs < pkg->pkg_ofs) {
+			errno = ENOSPC;
+			return (NULL);
+		}
+
+		if (ofs != pkg->pkg_ofs) {
+			if (last != NULL && pkg->pkg_ofs == last->tf_ofs) {
+				if (cache_data(last) == -1)
+					return (NULL);
+			} else {
+				sz = ofs - pkg->pkg_ofs;
+				while (sz != 0) {
+					if (sz > sizeof(buf))
+						sz = sizeof(buf);
+					if (get_zipped(pkg, buf, sz) == -1)
+						return (NULL);
+					sz = ofs - pkg->pkg_ofs;
+				}
+			}
+		}
+
+		cur = malloc(sizeof(*cur));
+		if (cur == NULL)
+			return (NULL);
+		memset(cur, 0, sizeof(*cur));
+		cur->tf_pkg = pkg;
+
+		while (1) {
+			if (get_zipped(pkg, &cur->tf_hdr,
+			    sizeof(cur->tf_hdr)) == -1) {
+				free(cur);
+				return (NULL);
+			}
+
+			/*
+			 * There are always 2 empty blocks appended to
+			 * a PKG. It marks the end of the archive.
+			 */
+			if (strncmp(cur->tf_hdr.ut_magic, "ustar", 5) != 0) {
+				free(cur);
+				errno = ENOSPC;
+				return (NULL);
+			}
+
+			cur->tf_ofs = pkg->pkg_ofs;
+			cur->tf_size = pkg_atol(cur->tf_hdr.ut_size,
+			    sizeof(cur->tf_hdr.ut_size));
+
+			if (cur->tf_hdr.ut_name[0] != '+')
+				break;
+
+			/*
+			 * Skip package meta-files.
+			 */
+			ofs = cur->tf_ofs + cur->tf_size;
+			ofs = (ofs + 0x1ff) & ~0x1ff;
+			while (pkg->pkg_ofs < ofs) {
+				if (get_zipped(pkg, buf, sizeof(buf)) == -1) {
+					free(cur);
+					return (NULL);
+				}
+			}
+		}
+
+		if (last != NULL)
+			last->tf_next = cur;
+		else
+			pkg->pkg_first = cur;
+		pkg->pkg_last = cur;
+	}
+
+	return (cur);
+}
diff --git a/lib/libstand/qdivrem.c b/lib/libstand/qdivrem.c
index 3a18eed8b31c..bde3b0d56e49 100644
--- a/lib/libstand/qdivrem.c
+++ b/lib/libstand/qdivrem.c
@@ -46,14 +46,13 @@ __FBSDID("$FreeBSD$");
 #define	B	(1 << HALF_BITS)	/* digit base */
 
 /* Combine two `digits' to make a single two-digit number. */
-#define	COMBINE(a, b) (((u_long)(a) << HALF_BITS) | (b))
+#define	COMBINE(a, b) (((u_int)(a) << HALF_BITS) | (b))
+
+_Static_assert(sizeof(int) / 2 == sizeof(short),
+	"Bitwise functions in libstand are broken on this architecture\n");
 
 /* select a type for digits in base B: use unsigned short if they fit */
-#if ULONG_MAX == 0xffffffff && USHRT_MAX >= 0xffff
 typedef unsigned short digit;
-#else
-typedef u_long digit;
-#endif
 
 /*
  * Shift p[0]..p[len] left `sh' bits, ignoring any bits that
@@ -74,7 +73,7 @@ shl(digit *p, int len, int sh)
  * __qdivrem(u, v, rem) returns u/v and, optionally, sets *rem to u%v.
  *
  * We do this in base 2-sup-HALF_BITS, so that all intermediate products
- * fit within u_long.  As a consequence, the maximum length dividend and
+ * fit within u_int.  As a consequence, the maximum length dividend and
  * divisor are 4 `digits' in this base (they are shorter if they have
  * leading zeros).
  */
@@ -85,7 +84,7 @@ __qdivrem(uq, vq, arq)
 	union uu tmp;
 	digit *u, *v, *q;
 	digit v1, v2;
-	u_long qhat, rhat, t;
+	u_int qhat, rhat, t;
 	int m, n, d, j, i;
 	digit uspace[5], vspace[5], qspace[5];
 
@@ -136,7 +135,7 @@ __qdivrem(uq, vq, arq)
 	v[4] = LHALF(tmp.ul[L]);
 	for (n = 4; v[1] == 0; v++) {
 		if (--n == 1) {
-			u_long rbj;	/* r*B+u[j] (not root boy jim) */
+			u_int rbj;	/* r*B+u[j] (not root boy jim) */
 			digit q1, q2, q3, q4;
 
 			/*
@@ -212,7 +211,7 @@ __qdivrem(uq, vq, arq)
 			rhat = uj1;
 			goto qhat_too_big;
 		} else {
-			u_long nn = COMBINE(uj0, uj1);
+			u_int nn = COMBINE(uj0, uj1);
 			qhat = nn / v1;
 			rhat = nn % v1;
 		}
diff --git a/lib/libstand/quad.h b/lib/libstand/quad.h
index 0ff27ff66356..349540a1e9fa 100644
--- a/lib/libstand/quad.h
+++ b/lib/libstand/quad.h
@@ -54,6 +54,9 @@
 #include <sys/types.h>
 #include <limits.h>
 
+_Static_assert(sizeof(quad_t) == sizeof(int) * 2,
+	"Bitwise function in libstand are broken on this architecture\n");
+
 /*
  * Depending on the desired operation, we view a `long long' (aka quad_t) in
  * one or more of the following formats.
@@ -61,8 +64,8 @@
 union uu {
 	quad_t	q;		/* as a (signed) quad */
 	quad_t	uq;		/* as an unsigned quad */
-	long	sl[2];		/* as two signed longs */
-	u_long	ul[2];		/* as two unsigned longs */
+	int	sl[2];		/* as two signed ints */
+	u_int	ul[2];		/* as two unsigned ints */
 };
 
 /*
@@ -77,8 +80,7 @@ union uu {
  * and assembly.
  */
 #define	QUAD_BITS	(sizeof(quad_t) * CHAR_BIT)
-#define	LONG_BITS	(sizeof(long) * CHAR_BIT)
-#define	HALF_BITS	(sizeof(long) * CHAR_BIT / 2)
+#define	HALF_BITS	(sizeof(int) * CHAR_BIT / 2)
 
 /*
  * Extract high and low shortwords from longword, and move low shortword of
diff --git a/lib/libstand/stand.h b/lib/libstand/stand.h
index 28087226a526..bcd146af5d6f 100644
--- a/lib/libstand/stand.h
+++ b/lib/libstand/stand.h
@@ -124,6 +124,7 @@ extern struct fs_ops bzipfs_fsops;
 extern struct fs_ops dosfs_fsops;
 extern struct fs_ops ext2fs_fsops;
 extern struct fs_ops splitfs_fsops;
+extern struct fs_ops pkgfs_fsops;
 
 /* where values for lseek(2) */
 #define	SEEK_SET	0	/* set file offset to offset */
@@ -364,6 +365,7 @@ extern int		devopen(struct open_file *, const char *, const char **);
 extern int		devclose(struct open_file *f);
 extern void		panic(const char *, ...) __dead2 __printflike(1, 2);
 extern struct fs_ops	*file_system[];
+extern struct fs_ops	*exclusive_file_system;
 extern struct devsw	*devsw[];
 
 /*
diff --git a/lib/libstdthreads/thrd_create.3 b/lib/libstdthreads/thrd_create.3
index 5cd960890f2c..df3bd4f922d8 100644
--- a/lib/libstdthreads/thrd_create.3
+++ b/lib/libstdthreads/thrd_create.3
@@ -257,4 +257,4 @@ These functions are expected to conform to
 These functions appeared in
 .Fx 10.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/lib/libthr/arch/ia64/Makefile.inc b/lib/libthr/arch/ia64/Makefile.inc
deleted file mode 100644
index 795aa9992d50..000000000000
--- a/lib/libthr/arch/ia64/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-SRCS+= _umtx_op_err.S pthread_md.c
diff --git a/lib/libthr/arch/ia64/ia64/_umtx_op_err.S b/lib/libthr/arch/ia64/ia64/_umtx_op_err.S
deleted file mode 100644
index a71221096e62..000000000000
--- a/lib/libthr/arch/ia64/ia64/_umtx_op_err.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 2009 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/syscall.h>
-
-ENTRY(_umtx_op_err, 5)
-	CALLSYS_NOERROR(_umtx_op)
-	br.ret.sptk.few rp
-END(_umtx_op_err)
diff --git a/lib/libthr/arch/ia64/ia64/pthread_md.c b/lib/libthr/arch/ia64/ia64/pthread_md.c
deleted file mode 100644
index c2ad71a4f775..000000000000
--- a/lib/libthr/arch/ia64/ia64/pthread_md.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2003 Daniel Eischen <deischen@freebsd.org>
- * Copyright (c) 2005 David Xu <davidxu@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. Neither the name of the author nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE 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$
- */
-
-#include <sys/types.h>
-#include <rtld_tls.h>
-
-#include "pthread_md.h"
-
-/*
- * The constructors.
- */
-struct tcb *
-_tcb_ctor(struct pthread *thread, int initial)
-{
-	struct tcb *tcb;
-
-	tcb = _rtld_allocate_tls((initial) ? _tcb_get() : NULL,
-	    sizeof(struct tcb), 16);
-	if (tcb)
-		tcb->tcb_thread = thread;
-	return (tcb);
-}
-
-void
-_tcb_dtor(struct tcb *tcb)
-{
-	_rtld_free_tls(tcb, sizeof(struct tcb), 16);
-}
diff --git a/lib/libthr/arch/ia64/include/pthread_md.h b/lib/libthr/arch/ia64/include/pthread_md.h
deleted file mode 100644
index 69b3eece4095..000000000000
--- a/lib/libthr/arch/ia64/include/pthread_md.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2003 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 _PTHREAD_MD_H_
-#define	_PTHREAD_MD_H_
-
-#include <stddef.h>
-
-#define	CPU_SPINWAIT
-
-#define	HAS__UMTX_OP_ERR	1
-
-#define	DTV_OFFSET		offsetof(struct tcb, tcb_dtv)
-
-/*
- * Variant I tcb. The structure layout is fixed, don't blindly
- * change it!
- */
-struct tcb {
-	void			*tcb_dtv;
-	struct pthread		*tcb_thread;
-};
-
-/*
- * The tcb constructors.
- */
-struct tcb	*_tcb_ctor(struct pthread *, int);
-void		_tcb_dtor(struct tcb *);
-
-/* Called from the thread to set its private data. */
-static __inline void
-_tcb_set(struct tcb *tcb)
-{
-	register struct tcb *tp __asm("%r13");
-
-	__asm __volatile("mov %0 = %1;;" : "=r"(tp) : "r"(tcb));
-}
-
-static __inline struct tcb *
-_tcb_get(void)
-{
-	register struct tcb *tp __asm("%r13");
-
-	return (tp);
-}
-
-extern struct pthread *_thr_initial;
-
-static __inline struct pthread *
-_get_curthread(void)
-{
-	if (_thr_initial)
-		return (_tcb_get()->tcb_thread);
-	return (NULL);
-}
-
-#endif /* _PTHREAD_MD_H_ */
diff --git a/lib/libthr/libthr.3 b/lib/libthr/libthr.3
index 696da17bdcb0..bfbebec340bd 100644
--- a/lib/libthr/libthr.3
+++ b/lib/libthr/libthr.3
@@ -53,10 +53,10 @@ The
 .Nm
 library
 was originally created by
-.An "Jeff Roberson" Aq jeff@FreeBSD.org ,
+.An Jeff Roberson Aq Mt jeff@FreeBSD.org ,
 and enhanced by
-.An "Jonathan Mini" Aq mini@FreeBSD.org
+.An Jonathan Mini Aq Mt mini@FreeBSD.org
 and
-.An "Mike Makonnen" Aq mtm@FreeBSD.org .
+.An Mike Makonnen Aq Mt mtm@FreeBSD.org .
 It has been substantially rewritten and optimized by
-.An "David Xu" Aq davidxu@FreeBSD.org .
+.An David Xu Aq Mt davidxu@FreeBSD.org .
diff --git a/usr.bin/csup/fixups.h b/lib/libthr/plockstat.d
similarity index 53%
rename from usr.bin/csup/fixups.h
rename to lib/libthr/plockstat.d
index b57eb9a351cc..68586cf84fdb 100644
--- a/usr.bin/csup/fixups.h
+++ b/lib/libthr/plockstat.d
@@ -1,48 +1,46 @@
-/*-
- * Copyright (c) 2006, Maxime Henrion <mux@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.
+/*
+ * Copyright (c) 2010 The FreeBSD Foundation 
+ * All rights reserved. 
+ * 
+ * This software was developed by Rui Paulo under sponsorship from the
+ * FreeBSD Foundation. 
+ *  
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright 
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the distribution. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND 
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE. 
  *
  * $FreeBSD$
  */
-#ifndef _FIXUPS_H_
-#define _FIXUPS_H_
 
-#include <sys/queue.h>
+provider plockstat {
+	probe mutex__acquire(void *mutex, int rec, int spincount);
+	probe mutex__release(void *mutex, int rec);
+	probe mutex__block(void *mutex);
+	probe mutex__spin(void *mutex);
+	probe mutex__spun(void *mutex, int success, int spincount);
+	probe mutex__blocked(void *mutex, int success);
+	probe mutex__error(void *mutex, int err);
 
-struct coll;
-struct fixups;
-
-struct fixup {
-	struct coll *f_coll;
-	char *f_name;
-	STAILQ_ENTRY(fixup) f_link;	/* Not for consumers. */
+	probe rw__acquire(void *lock, int wr);
+	probe rw__release(void *lock, int wr);
+	probe rw__block(void *lock, int wr);
+	probe rw__blocked(void *lock, int wr, int success);
+	probe rw__error(void *lock, int wr, int err);
 };
-
-struct fixups	*fixups_new(void);
-void		 fixups_put(struct fixups *, struct coll *, const char *);
-struct fixup	*fixups_get(struct fixups *);
-void		 fixups_close(struct fixups *);
-void		 fixups_free(struct fixups *);
-
-#endif /* !_FIXUPS_H_ */
diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c
index 937d83f1eb28..9bf0e2955158 100644
--- a/lib/libthr/thread/thr_init.c
+++ b/lib/libthr/thread/thr_init.c
@@ -37,6 +37,7 @@
 #include <sys/types.h>
 #include <sys/signalvar.h>
 #include <sys/ioctl.h>
+#include <sys/resource.h>
 #include <sys/sysctl.h>
 #include <sys/ttycom.h>
 #include <sys/mman.h>
@@ -441,6 +442,7 @@ init_main_thread(struct pthread *thread)
 static void
 init_private(void)
 {
+	struct rlimit rlim;
 	size_t len;
 	int mib[2];
 	char *env;
@@ -471,6 +473,12 @@ init_private(void)
 		len = sizeof (_usrstack);
 		if (sysctl(mib, 2, &_usrstack, &len, NULL, 0) == -1)
 			PANIC("Cannot get kern.usrstack from sysctl");
+		env = getenv("LIBPTHREAD_BIGSTACK_MAIN");
+		if (env != NULL) {
+			if (getrlimit(RLIMIT_STACK, &rlim) == -1)
+				PANIC("Cannot get stack rlimit");
+			_thr_stack_initial = rlim.rlim_cur;
+		}
 		len = sizeof(_thr_is_smp);
 		sysctlbyname("kern.smp.cpus", &_thr_is_smp, &len, NULL, 0);
 		_thr_is_smp = (_thr_is_smp > 1);
diff --git a/lib/libthr/thread/thr_stack.c b/lib/libthr/thread/thr_stack.c
index 15a9c82ef027..e5d149eedea8 100644
--- a/lib/libthr/thread/thr_stack.c
+++ b/lib/libthr/thread/thr_stack.c
@@ -246,7 +246,10 @@ _thr_stack_alloc(struct pthread_attr *attr)
 		THREAD_LIST_UNLOCK(curthread);
 	}
 	else {
-		/* Allocate a stack from usrstack. */
+		/*
+		 * Allocate a stack from or below usrstack, depending
+		 * on the LIBPTHREAD_BIGSTACK_MAIN env variable.
+		 */
 		if (last_stack == NULL)
 			last_stack = _usrstack - _thr_stack_initial -
 			    _thr_guard_default;
@@ -268,7 +271,7 @@ _thr_stack_alloc(struct pthread_attr *attr)
 
 		/* Map the stack and guard page together, and split guard
 		   page from allocated space: */
-		if ((stackaddr = mmap(stackaddr, stacksize+guardsize,
+		if ((stackaddr = mmap(stackaddr, stacksize + guardsize,
 		     _rtld_get_stack_prot(), MAP_STACK,
 		     -1, 0)) != MAP_FAILED &&
 		    (guardsize == 0 ||
diff --git a/lib/libthread_db/arch/ia64/libpthread_md.c b/lib/libthread_db/arch/ia64/libpthread_md.c
deleted file mode 100644
index f5f12d3ff64f..000000000000
--- a/lib/libthread_db/arch/ia64/libpthread_md.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2004 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/procfs.h>
-#include <thread_db.h>
-#include <ucontext.h>
-
-#include "libpthread_db.h"
-
-void
-pt_reg_to_ucontext(const struct reg *r __unused, ucontext_t *uc __unused)
-{
-}
-
-void
-pt_ucontext_to_reg(const ucontext_t *uc __unused, struct reg *r __unused)
-{
-}
-
-void
-pt_fpreg_to_ucontext(const struct fpreg* r __unused, ucontext_t *uc __unused)
-{
-}
-
-void
-pt_ucontext_to_fpreg(const ucontext_t *uc __unused, struct fpreg *r __unused)
-{
-}
-
-void
-pt_md_init(void)
-{
-}
-
-int
-pt_reg_sstep(struct reg *reg __unused, int step __unused)
-{
-	return (0);
-}
diff --git a/lib/libucl/Makefile b/lib/libucl/Makefile
index 3832c9fdd194..830c198bb490 100644
--- a/lib/libucl/Makefile
+++ b/lib/libucl/Makefile
@@ -5,7 +5,9 @@ LIBUCL=	${.CURDIR}/../../contrib/libucl
 LIB=		ucl
 PRIVATELIB=	true
 SHLIB_MAJOR=	1
-SRCS=		ucl_emitter.c \
+SRCS=		ucl_emitter_streamline.c \
+		ucl_emitter_utils.c \
+		ucl_emitter.c \
 		ucl_hash.c \
 		ucl_parser.c  \
 		ucl_schema.c \
diff --git a/lib/libufs/bread.3 b/lib/libufs/bread.3
index 0a9b862c0ede..9109166bea49 100644
--- a/lib/libufs/bread.3
+++ b/lib/libufs/bread.3
@@ -96,4 +96,4 @@ These functions first appeared as part of
 in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Juli Mallett Aq jmallett@FreeBSD.org
+.An Juli Mallett Aq Mt jmallett@FreeBSD.org
diff --git a/lib/libufs/cgread.3 b/lib/libufs/cgread.3
index 38edf17ea14f..28feaad11764 100644
--- a/lib/libufs/cgread.3
+++ b/lib/libufs/cgread.3
@@ -103,4 +103,4 @@ These functions first appeared as part of
 in
 .Fx 5.1 .
 .Sh AUTHORS
-.An Juli Mallett Aq jmallett@FreeBSD.org
+.An Juli Mallett Aq Mt jmallett@FreeBSD.org
diff --git a/lib/libufs/libufs.3 b/lib/libufs/libufs.3
index 6a2c7f6aa739..5b5dd9b1c898 100644
--- a/lib/libufs/libufs.3
+++ b/lib/libufs/libufs.3
@@ -71,8 +71,8 @@ The
 library first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Juli Mallett Aq jmallett@FreeBSD.org
+.An Juli Mallett Aq Mt jmallett@FreeBSD.org
 .Pp
 .An -nosplit
 Additional design, feedback, and ideas were provided by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
diff --git a/lib/libufs/sbread.3 b/lib/libufs/sbread.3
index e59365a80b27..8b5e8c0d4d6b 100644
--- a/lib/libufs/sbread.3
+++ b/lib/libufs/sbread.3
@@ -78,4 +78,4 @@ These functions first appeared as part of
 in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Juli Mallett Aq jmallett@FreeBSD.org
+.An Juli Mallett Aq Mt jmallett@FreeBSD.org
diff --git a/lib/libufs/ufs_disk_close.3 b/lib/libufs/ufs_disk_close.3
index 25a059e87d69..6eb785a39985 100644
--- a/lib/libufs/ufs_disk_close.3
+++ b/lib/libufs/ufs_disk_close.3
@@ -109,4 +109,4 @@ These functions first appeared as part of
 in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Juli Mallett Aq jmallett@FreeBSD.org
+.An Juli Mallett Aq Mt jmallett@FreeBSD.org
diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile
index 150dd0c42b75..c6bbedead598 100644
--- a/lib/libunbound/Makefile
+++ b/lib/libunbound/Makefile
@@ -10,9 +10,9 @@ UNBOUNDDIR= ${.CURDIR}/../../contrib/unbound
 LIB=	unbound
 PRIVATELIB=
 
-CFLAGS= -I${UNBOUNDDIR}	-I${LDNSDIR}
+CFLAGS= -I${UNBOUNDDIR}	-I${LDNSDIR} -I${.OBJDIR}
 
-SRCS=	alloc.c autotrust.c config_file.c configlexer.c configparser.c \
+SRCS=	alloc.c autotrust.c config_file.c configlexer.l configparser.y \
 	context.c dname.c dns.c dnstree.c fptr_wlist.c infra.c \
 	iter_delegpt.c iter_donotq.c iter_fwd.c iter_hints.c iter_priv.c \
 	iter_resptype.c iter_scrub.c iter_utils.c iterator.c keyraw.c \
@@ -31,4 +31,13 @@ WARNS?=	3
 DPADD+=	${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD}
 LDADD+=	-lssl -lcrypto -lpthread
 
+# Misnamed file in upstream source
+configlexer.l: configlexer.lex
+	cp -p ${.ALLSRC} ${.TARGET}
+CLEANFILES+= configlexer.l
+
+# Symbol prefix for lex and yacc
+LFLAGS= -Pub_c_
+YFLAGS= -pub_c_ -d
+
 .include <bsd.lib.mk>
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 5e5139ff9fa0..7e5f1a34895b 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -81,4 +81,8 @@ MLINKS+=pw_util.3 pw_copy.3 \
 	pw_util.3 pw_tempname.3 \
 	pw_util.3 pw_tmp.3
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.lib.mk>
diff --git a/lib/libutil/flopen.3 b/lib/libutil/flopen.3
index 66657022c0ee..aba788c67d85 100644
--- a/lib/libutil/flopen.3
+++ b/lib/libutil/flopen.3
@@ -98,4 +98,4 @@ and
 The
 .Nm
 function and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/lib/libutil/fparseln.3 b/lib/libutil/fparseln.3
index cd78437e3eb4..245fba77ccff 100644
--- a/lib/libutil/fparseln.3
+++ b/lib/libutil/fparseln.3
@@ -122,7 +122,6 @@ Remove escape preceding any other character.
 .It Dv FPARSELN_UNESCALL
 All of the above.
 .El
-.Pp
 .El
 .Sh RETURN VALUES
 Upon successful completion a pointer to the parsed line is returned;
diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c
index 0624f0e4ea31..d03357eae95c 100644
--- a/lib/libutil/fparseln.c
+++ b/lib/libutil/fparseln.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fparseln.c,v 1.9 1999/09/20 04:48:06 lukem Exp $	*/
+/*	$NetBSD: fparseln.c,v 1.7 2007/03/08 19:57:53 drochner Exp $	*/
 
 /*
  * Copyright (c) 1997 Christos Zoulas.  All rights reserved.
@@ -59,7 +59,7 @@ isescaped(const char *sp, const char *p, int esc)
 
 	/* No escape character */
 	if (esc == '\0')
-		return 1;
+		return 0;
 
 	/* Count the number of escape characters that precede ours */
 	for (ne = 0, cp = p; --cp >= sp && *cp == esc; ne++)
@@ -135,13 +135,19 @@ fparseln(FILE *fp, size_t *size, size_t *lineno, const char str[3], int flags)
 			cp = &ptr[s - 1];
 
 			if (*cp == con && !isescaped(ptr, cp, esc)) {
-				s--;	/* forget escape */
+				s--;	/* forget continuation char */
 				cnt = 1;
 			}
 		}
 
-		if (s == 0 && buf != NULL)
-			continue;
+		if (s == 0) {
+			/*
+			 * nothing to add, skip realloc except in case
+			 * we need a minimal buf to return an empty line
+			 */
+			if (cnt || buf != NULL)
+				continue;
+		}
 
 		if ((cp = realloc(buf, len + s + 1)) == NULL) {
 			free(buf);
diff --git a/lib/libutil/kld.3 b/lib/libutil/kld.3
index 595ac96730b4..f6b2c1394c12 100644
--- a/lib/libutil/kld.3
+++ b/lib/libutil/kld.3
@@ -90,4 +90,4 @@ The
 and
 .Fn kld_load
 functions and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/lib/libutil/login_class.3 b/lib/libutil/login_class.3
index 75f361481c81..c87faaeb8814 100644
--- a/lib/libutil/login_class.3
+++ b/lib/libutil/login_class.3
@@ -160,7 +160,6 @@ capability "setenv=var1 val1,var2 val2..,varN valN".
 .It LOGIN_SETMAC
 Set the MAC label for the current process to the label specified
 in system login class database.
-.Pp
 .It LOGIN_SETCPUMASK
 Create a new
 .Xr cpuset 2
diff --git a/lib/libutil/pidfile.3 b/lib/libutil/pidfile.3
index 30c880c1ad06..d5e2470752c1 100644
--- a/lib/libutil/pidfile.3
+++ b/lib/libutil/pidfile.3
@@ -291,7 +291,7 @@ Probably called not from the process which used
 The
 .Nm pidfile
 functionality is based on ideas from
-.An John-Mark Gurney Aq jmg@FreeBSD.org .
+.An John-Mark Gurney Aq Mt jmg@FreeBSD.org .
 .Pp
 The code and manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/lib/libutil/pw_util.3 b/lib/libutil/pw_util.3
index 6c449ba069cb..0d8c76325722 100644
--- a/lib/libutil/pw_util.3
+++ b/lib/libutil/pw_util.3
@@ -283,4 +283,4 @@ DARPA/SPAWAR contract N66001-01-C-8035
 as part of the DARPA CHATS research program.
 .Pp
 This manual page was written by
-.An Baptiste Daroussin Aq bapt@FreeBSD.org .
+.An Baptiste Daroussin Aq Mt bapt@FreeBSD.org .
diff --git a/lib/libutil/quotafile.3 b/lib/libutil/quotafile.3
index 1e75e9a87164..001a66c0e18d 100644
--- a/lib/libutil/quotafile.3
+++ b/lib/libutil/quotafile.3
@@ -285,6 +285,6 @@ functions first appeared in
 The
 .Nm quotafile
 functions and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org
 and
-.An Marshall Kirk McKusick Aq mckusick@mckusick.com .
+.An Marshall Kirk McKusick Aq Mt mckusick@mckusick.com .
diff --git a/lib/libutil/tests/Makefile b/lib/libutil/tests/Makefile
new file mode 100644
index 000000000000..31b6c54063c6
--- /dev/null
+++ b/lib/libutil/tests/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/lib/libutil
+
+TAP_TESTS_C+=	flopen_test
+TAP_TESTS_C+=	grp_test
+TAP_TESTS_C+=	humanize_number_test
+TAP_TESTS_C+=	pidfile_test
+TAP_TESTS_C+=	trimdomain_test
+TAP_TESTS_C+=	trimdomain-nodomain_test
+
+DPADD+=		${LIBUTIL}
+LDADD+=		-lutil
+
+.include <bsd.test.mk>
diff --git a/tools/regression/lib/libutil/test-flopen.c b/lib/libutil/tests/flopen_test.c
similarity index 100%
rename from tools/regression/lib/libutil/test-flopen.c
rename to lib/libutil/tests/flopen_test.c
diff --git a/tools/regression/lib/libutil/test-grp.c b/lib/libutil/tests/grp_test.c
similarity index 100%
rename from tools/regression/lib/libutil/test-grp.c
rename to lib/libutil/tests/grp_test.c
diff --git a/tools/regression/lib/libutil/test-humanize_number.c b/lib/libutil/tests/humanize_number_test.c
similarity index 95%
rename from tools/regression/lib/libutil/test-humanize_number.c
rename to lib/libutil/tests/humanize_number_test.c
index 24f197dac1ed..2d66204fefe5 100644
--- a/tools/regression/lib/libutil/test-humanize_number.c
+++ b/lib/libutil/tests/humanize_number_test.c
@@ -28,17 +28,15 @@
  *
  */
 
-#include <sys/types.h>
-#include <stdlib.h>
-#include <libutil.h>
-#include <stdio.h>
-#include <string.h>
+#include <sys/param.h>
 #include <inttypes.h>
-#include <math.h>
-#include <unistd.h>
+#include <libutil.h>
 #include <limits.h>
-
-extern char * optarg;
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #define	MAX_STR_FLAGS_RESULT	80
 #define MAX_INT_STR_DIGITS	12
@@ -490,7 +488,7 @@ static void
 testskipped(size_t i)
 {
 
-	printf("ok %lu # skip - not turned on\n", i);
+	printf("ok %zu # skip - not turned on\n", i);
 }
 
 int
@@ -498,10 +496,8 @@ main(int argc, char * const argv[])
 {
 	char *buf;
 	char *flag_str, *scale_str;
-	size_t i;
-	size_t errcnt, tested, skipped;
+	size_t buflen, errcnt, i, skipped, tested;
 	int r;
-	size_t buflen;
 	int includeNegScale;
 	int includeExabyteTests;
 	int verbose;
@@ -522,8 +518,8 @@ main(int argc, char * const argv[])
 	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++) {
+	printf("1..%zu\n", nitems(test_args));
+	for (i = 0; i < nitems(test_args); i++) {
 		/* KLUDGE */
 		if (test_args[i].num == INT64_MAX && buflen == 4) {
 		        /* Start final tests which require buffer of 6 */
@@ -537,12 +533,12 @@ main(int argc, char * const argv[])
 
 		if (test_args[i].scale < 0 && ! includeNegScale) {
 			skipped++;
-			testskipped(i);
+			testskipped(i + 1);
 			continue;
 		}
 		if (test_args[i].num >= halfExabyte && ! includeExabyteTests) {
 			skipped++;
-			testskipped(i);
+			testskipped(i + 1);
 			continue;
 		}
 
@@ -553,36 +549,46 @@ main(int argc, char * const argv[])
 
 		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",
+				printf("wrong return value on index %zu, "
+				    "buflen: %zu, got: %d + \"%s\", "
+				    "expected %d + \"%s\"; num = %jd, "
+				    "scale = %s, flags= %s.\n",
 				    i, buflen, r, buf, test_args[i].retval,
-				    test_args[i].res, test_args[i].num,
+				    test_args[i].res,
+				    (intmax_t)test_args[i].num,
 				    scale_str, flag_str);
 			else
-				printf("not ok %lu # return %d != %d\n", i, r,
-				    test_args[i].retval);
+				printf("not ok %zu # return %d != %d\n",
+				    i + 1, 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,
+				printf("result mismatch on index %zu, got: "
+				    "\"%s\", expected \"%s\"; num = %jd, "
+				    "scale = %s, flags= %s.\n",
+				    i, buf, test_args[i].res,
+				    (intmax_t)test_args[i].num,
 				    scale_str, flag_str);
 			else
-				printf("not ok %lu # buf \"%s\" != \"%s\"\n", i,
-				    buf, test_args[i].res);
+				printf("not ok %zu # buf \"%s\" != \"%s\"\n",
+				    i + 1, 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);
+				printf("successful result on index %zu, "
+				    "returned %d, got: \"%s\"; num = %jd, "
+				    "scale = %s, flags= %s.\n",
+				    i, r, buf,
+				    (intmax_t)test_args[i].num,
+				    scale_str, flag_str);
 			else
-				printf("ok %lu\n", i);
+				printf("ok %zu\n", i + 1);
 		}
 		tested++;
 	}
 
 	if (verbose)
-		printf("total errors: %lu/%lu tests, %lu skipped\n", errcnt,
+		printf("total errors: %zu/%zu tests, %zu skipped\n", errcnt,
 		    tested, skipped);
 
 	if (errcnt)
diff --git a/tools/regression/lib/libutil/test-pidfile.c b/lib/libutil/tests/pidfile_test.c
similarity index 100%
rename from tools/regression/lib/libutil/test-pidfile.c
rename to lib/libutil/tests/pidfile_test.c
diff --git a/tools/regression/lib/libutil/test-trimdomain-nodomain.c b/lib/libutil/tests/trimdomain-nodomain_test.c
similarity index 100%
rename from tools/regression/lib/libutil/test-trimdomain-nodomain.c
rename to lib/libutil/tests/trimdomain-nodomain_test.c
diff --git a/tools/regression/lib/libutil/test-trimdomain.c b/lib/libutil/tests/trimdomain_test.c
similarity index 100%
rename from tools/regression/lib/libutil/test-trimdomain.c
rename to lib/libutil/tests/trimdomain_test.c
diff --git a/lib/libvgl/vgl.3 b/lib/libvgl/vgl.3
index 0979e44483a8..d70ea73ddf3f 100644
--- a/lib/libvgl/vgl.3
+++ b/lib/libvgl/vgl.3
@@ -468,4 +468,4 @@ The
 library appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
diff --git a/lib/libvmmapi/vmmapi.c b/lib/libvmmapi/vmmapi.c
index 5ce3d8e7ae82..93955c7c233e 100644
--- a/lib/libvmmapi/vmmapi.c
+++ b/lib/libvmmapi/vmmapi.c
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/_iovec.h>
 #include <sys/cpuset.h>
 
+#include <x86/segments.h>
 #include <machine/specialreg.h>
 #include <machine/param.h>
 
@@ -274,6 +275,20 @@ vm_map_gpa(struct vmctx *ctx, vm_paddr_t gaddr, size_t len)
 	return (NULL);
 }
 
+size_t
+vm_get_lowmem_size(struct vmctx *ctx)
+{
+
+	return (ctx->lowmem);
+}
+
+size_t
+vm_get_highmem_size(struct vmctx *ctx)
+{
+
+	return (ctx->highmem);
+}
+
 int
 vm_set_desc(struct vmctx *ctx, int vcpu, int reg,
 	    uint64_t base, uint32_t limit, uint32_t access)
@@ -312,6 +327,16 @@ vm_get_desc(struct vmctx *ctx, int vcpu, int reg,
 	return (error);
 }
 
+int
+vm_get_seg_desc(struct vmctx *ctx, int vcpu, int reg, struct seg_desc *seg_desc)
+{
+	int error;
+
+	error = vm_get_desc(ctx, vcpu, reg, &seg_desc->base, &seg_desc->limit,
+	    &seg_desc->access);
+	return (error);
+}
+
 int
 vm_set_register(struct vmctx *ctx, int vcpu, int reg, uint64_t val)
 {
@@ -974,7 +999,7 @@ gla2gpa(struct vmctx *ctx, int vcpu, struct vm_guest_paging *paging,
 #endif
 
 int
-vm_gla2gpa(struct vmctx *ctx, int vcpu, struct vm_guest_paging *paging,
+vm_copy_setup(struct vmctx *ctx, int vcpu, struct vm_guest_paging *paging,
     uint64_t gla, size_t len, int prot, struct iovec *iov, int iovcnt)
 {
 	uint64_t gpa;
@@ -1092,3 +1117,32 @@ vm_activate_cpu(struct vmctx *ctx, int vcpu)
 	error = ioctl(ctx->fd, VM_ACTIVATE_CPU, &ac);
 	return (error);
 }
+
+int
+vm_get_intinfo(struct vmctx *ctx, int vcpu, uint64_t *info1, uint64_t *info2)
+{
+	struct vm_intinfo vmii;
+	int error;
+
+	bzero(&vmii, sizeof(struct vm_intinfo));
+	vmii.vcpuid = vcpu;
+	error = ioctl(ctx->fd, VM_GET_INTINFO, &vmii);
+	if (error == 0) {
+		*info1 = vmii.info1;
+		*info2 = vmii.info2;
+	}
+	return (error);
+}
+
+int
+vm_set_intinfo(struct vmctx *ctx, int vcpu, uint64_t info1)
+{
+	struct vm_intinfo vmii;
+	int error;
+
+	bzero(&vmii, sizeof(struct vm_intinfo));
+	vmii.vcpuid = vcpu;
+	vmii.info1 = info1;
+	error = ioctl(ctx->fd, VM_SET_INTINFO, &vmii);
+	return (error);
+}
diff --git a/lib/libvmmapi/vmmapi.h b/lib/libvmmapi/vmmapi.h
index 4cc429065e46..fbb6ddd3acfb 100644
--- a/lib/libvmmapi/vmmapi.h
+++ b/lib/libvmmapi/vmmapi.h
@@ -60,10 +60,14 @@ int	vm_get_gpa_pmap(struct vmctx *, uint64_t gpa, uint64_t *pte, int *num);
 uint32_t vm_get_lowmem_limit(struct vmctx *ctx);
 void	vm_set_lowmem_limit(struct vmctx *ctx, uint32_t limit);
 void	vm_set_memflags(struct vmctx *ctx, int flags);
+size_t	vm_get_lowmem_size(struct vmctx *ctx);
+size_t	vm_get_highmem_size(struct vmctx *ctx);
 int	vm_set_desc(struct vmctx *ctx, int vcpu, int reg,
 		    uint64_t base, uint32_t limit, uint32_t access);
 int	vm_get_desc(struct vmctx *ctx, int vcpu, int reg,
 		    uint64_t *base, uint32_t *limit, uint32_t *access);
+int	vm_get_seg_desc(struct vmctx *ctx, int vcpu, int reg,
+			struct seg_desc *seg_desc);
 int	vm_set_register(struct vmctx *ctx, int vcpu, int reg, uint64_t val);
 int	vm_get_register(struct vmctx *ctx, int vcpu, int reg, uint64_t *retval);
 int	vm_run(struct vmctx *ctx, int vcpu, uint64_t rip,
@@ -102,6 +106,9 @@ int	vm_setup_pptdev_msix(struct vmctx *ctx, int vcpu, int bus, int slot,
 	    int func, int idx, uint64_t addr, uint64_t msg,
 	    uint32_t vector_control);
 
+int	vm_get_intinfo(struct vmctx *ctx, int vcpu, uint64_t *i1, uint64_t *i2);
+int	vm_set_intinfo(struct vmctx *ctx, int vcpu, uint64_t exit_intinfo);
+
 /*
  * Return a pointer to the statistics buffer. Note that this is not MT-safe.
  */
@@ -119,7 +126,7 @@ int	vm_get_hpet_capabilities(struct vmctx *ctx, uint32_t *capabilities);
  * The 'iovcnt' should be big enough to accomodate all GPA segments.
  * Returns 0 on success, 1 on a guest fault condition and -1 otherwise.
  */
-int	vm_gla2gpa(struct vmctx *ctx, int vcpu, struct vm_guest_paging *paging,
+int	vm_copy_setup(struct vmctx *ctx, int vcpu, struct vm_guest_paging *pg,
 	    uint64_t gla, size_t len, int prot, struct iovec *iov, int iovcnt);
 void	vm_copyin(struct vmctx *ctx, int vcpu, struct iovec *guest_iov,
 	    void *host_dst, size_t len);
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 626e4055274c..654d0f5500ba 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -101,7 +101,7 @@ COMMON_SRCS+=	e_acoshl.c e_acosl.c e_asinl.c e_atan2l.c e_atanhl.c \
 	e_remainderl.c e_sinhl.c e_sqrtl.c \
 	invtrig.c k_cosl.c k_sinl.c k_tanl.c \
 	s_asinhl.c s_atanl.c s_cbrtl.c s_ceill.c s_cosl.c s_cprojl.c \
-	s_csqrtl.c s_exp2l.c s_expl.c s_floorl.c s_fmal.c \
+	s_csqrtl.c s_erfl.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_roundl.c s_scalbnl.c \
 	s_sinl.c s_tanhl.c s_tanl.c s_truncl.c w_cabsl.c
@@ -164,7 +164,7 @@ MLINKS+=copysign.3 copysignf.3 copysign.3 copysignl.3
 MLINKS+=cos.3 cosf.3 cos.3 cosl.3
 MLINKS+=cosh.3 coshf.3 cosh.3 coshl.3
 MLINKS+=csqrt.3 csqrtf.3 csqrt.3 csqrtl.3
-MLINKS+=erf.3 erfc.3 erf.3 erff.3 erf.3 erfcf.3
+MLINKS+=erf.3 erfc.3 erf.3 erff.3 erf.3 erfcf.3 erf.3 erfl.3 erf.3 erfcl.3
 MLINKS+=exp.3 expm1.3 exp.3 expm1f.3 exp.3 expm1l.3 exp.3 pow.3 exp.3 powf.3 \
 	exp.3 exp2.3 exp.3 exp2f.3 exp.3 exp2l.3 exp.3 expf.3 exp.3 expl.3
 MLINKS+=fabs.3 fabsf.3 fabs.3 fabsl.3
diff --git a/lib/msun/Symbol.map b/lib/msun/Symbol.map
index c36472bafb02..e53ca07118fd 100644
--- a/lib/msun/Symbol.map
+++ b/lib/msun/Symbol.map
@@ -265,6 +265,8 @@ FBSD_1.3 {
 	ctanf;
 	ctanh;
 	ctanhf;
+	erfcl;
+	erfl;
 	expl;
 	expm1l;
 	log10l;
@@ -274,8 +276,6 @@ FBSD_1.3 {
 	sinhl;
 	tanhl;
 	/* Implemented as weak aliases for imprecise versions */
-	erfcl;
-	erfl;
 	lgammal;
 	powl;
 	tgammal;
diff --git a/lib/msun/ia64/Makefile.inc b/lib/msun/ia64/Makefile.inc
deleted file mode 100644
index c941c66bb473..000000000000
--- a/lib/msun/ia64/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-ARCH_SRCS = s_fma.S s_fmaf.S s_fmal.S
-LDBL_PREC = 64
-SYM_MAPS += ${.CURDIR}/ia64/Symbol.map
diff --git a/lib/msun/ia64/Symbol.map b/lib/msun/ia64/Symbol.map
deleted file mode 100644
index c92e75d6e011..000000000000
--- a/lib/msun/ia64/Symbol.map
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * $FreeBSD$
- */
-FBSD_1.0 {
-	feupdateenv;
-};
-
-FBSD_1.3 {
-	fesetexceptflag;
-	feraiseexcept;
-	fegetenv;
-	feholdexcept;
-};
diff --git a/lib/msun/ia64/fenv.c b/lib/msun/ia64/fenv.c
deleted file mode 100644
index 09d2d4e92529..000000000000
--- a/lib/msun/ia64/fenv.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 2004 David Schultz <das@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/types.h>
-
-#define	__fenv_static
-#include "fenv.h"
-
-#ifdef __GNUC_GNU_INLINE__
-#error "This file must be compiled with C99 'inline' semantics"
-#endif
-
-const fenv_t __fe_dfl_env = 0x0009804c8a70033fULL;
-
-extern inline int feclearexcept(int __excepts);
-extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts);
-extern inline int fesetexceptflag(const fexcept_t *__flagp, int __excepts);
-extern inline int feraiseexcept(int __excepts);
-extern inline int fetestexcept(int __excepts);
-extern inline int fegetround(void);
-extern inline int fesetround(int __round);
-extern inline int fegetenv(fenv_t *__envp);
-extern inline int feholdexcept(fenv_t *__envp);
-extern inline int fesetenv(const fenv_t *__envp);
-
-/*
- * It doesn't pay to inline feupdateenv() because it includes one of
- * the rare uses of feraiseexcept() where the argument is not a
- * constant.  Thus, no dead code elimination can occur, resulting in
- * significant bloat.
- */
-int
-feupdateenv(const fenv_t *envp)
-{
-	fenv_t fpsr;
-
-	__stfpsr(&fpsr);
-	__ldfpsr(*envp);
-	feraiseexcept((fpsr >> _FPUSW_SHIFT) & FE_ALL_EXCEPT);
-	return (0);
-}
diff --git a/lib/msun/ia64/fenv.h b/lib/msun/ia64/fenv.h
deleted file mode 100644
index 0f001db03183..000000000000
--- a/lib/msun/ia64/fenv.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*-
- * Copyright (c) 2004-2005 David Schultz <das@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	_FENV_H_
-#define	_FENV_H_
-
-#include <sys/_types.h>
-
-#ifndef	__fenv_static
-#define	__fenv_static	static
-#endif
-
-typedef	__uint64_t	fenv_t;
-typedef	__uint16_t	fexcept_t;
-
-/* Exception flags */
-#define	FE_INVALID	0x01
-#define	FE_DENORMAL	0x02
-#define	FE_DIVBYZERO	0x04
-#define	FE_OVERFLOW	0x08
-#define	FE_UNDERFLOW	0x10
-#define	FE_INEXACT	0x20
-#define	FE_ALL_EXCEPT	(FE_DIVBYZERO | FE_DENORMAL | FE_INEXACT | \
-			 FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW)
-
-/* Rounding modes */
-#define	FE_TONEAREST	0x0000
-#define	FE_DOWNWARD	0x0400
-#define	FE_UPWARD	0x0800
-#define	FE_TOWARDZERO	0x0c00
-#define	_ROUND_MASK	(FE_TONEAREST | FE_DOWNWARD | \
-			 FE_UPWARD | FE_TOWARDZERO)
-
-__BEGIN_DECLS
-
-/* Default floating-point environment */
-extern const fenv_t	__fe_dfl_env;
-#define	FE_DFL_ENV	(&__fe_dfl_env)
-
-#define	_FPUSW_SHIFT	13
-
-#define	__stfpsr(__r)	__asm __volatile("mov %0=ar.fpsr" : "=r" (*(__r)))
-#define	__ldfpsr(__r)	__asm __volatile("mov ar.fpsr=%0;;" : : "r" (__r))
-
-__fenv_static inline int
-feclearexcept(int __excepts)
-{
-	fenv_t __fpsr;
-
-	__stfpsr(&__fpsr);
-	__fpsr &= ~((fenv_t)__excepts << _FPUSW_SHIFT);
-	__ldfpsr(__fpsr);
-	return (0);
-}
-
-__fenv_static inline int
-fegetexceptflag(fexcept_t *__flagp, int __excepts)
-{
-	fenv_t __fpsr;
-
-	__stfpsr(&__fpsr);
-	*__flagp = (fexcept_t)(__fpsr >> _FPUSW_SHIFT) & __excepts;
-	return (0);
-}
-
-__fenv_static inline int
-fesetexceptflag(const fexcept_t *__flagp, int __excepts)
-{
-	fenv_t __fpsr;
-
-	__stfpsr(&__fpsr);
-	__fpsr &= ~((fenv_t)__excepts << _FPUSW_SHIFT);
-	__fpsr |= (fenv_t)(__excepts & *__flagp) << _FPUSW_SHIFT;
-	__ldfpsr(__fpsr);
-	return (0);
-}
-
-/*
- * It is worthwhile to use the inline version of this function iff it
- * is called with arguments that are compile-time constants (due to
- * dead code elimination).  Unfortunately, gcc isn't smart enough to
- * figure this out automatically, and there's no way to tell it.
- * We assume that constant arguments will be the common case.
- */
-__fenv_static inline int
-feraiseexcept(int __excepts)
-{
-	volatile double d;
-
-	/*
-	 * With a compiler that supports the FENV_ACCESS pragma
-	 * properly, simple expressions like '0.0 / 0.0' should
-	 * be sufficient to generate traps.  Unfortunately, we
-	 * need to bring a volatile variable into the equation
-	 * to prevent incorrect optimizations.
-	 */
-	if (__excepts & FE_INVALID) {
-		d = 0.0;
-		d = 0.0 / d;
-	}
-	if (__excepts & FE_DIVBYZERO) {
-		d = 0.0;
-		d = 1.0 / d;
-	}
-	if (__excepts & FE_OVERFLOW) {
-		d = 0x1.ffp1023;
-		d *= 2.0;
-	}
-	if (__excepts & FE_UNDERFLOW) {
-		d = 0x1p-1022;
-		d /= 0x1p1023;
-	}
-	if (__excepts & FE_INEXACT) {
-		d = 0x1p-1022;
-		d += 1.0;
-	}
-	return (0);
-}
-
-__fenv_static inline int
-fetestexcept(int __excepts)
-{
-	fenv_t __fpsr;
-
-	__stfpsr(&__fpsr);
-	return ((__fpsr >> _FPUSW_SHIFT) & __excepts);
-}
-
-
-__fenv_static inline int
-fegetround(void)
-{
-	fenv_t __fpsr;
-
-	__stfpsr(&__fpsr);
-	return (__fpsr & _ROUND_MASK);
-}
-
-__fenv_static inline int
-fesetround(int __round)
-{
-	fenv_t __fpsr;
-
-	if (__round & ~_ROUND_MASK)
-		return (-1);
-	__stfpsr(&__fpsr);
-	__fpsr &= ~_ROUND_MASK;
-	__fpsr |= __round;
-	__ldfpsr(__fpsr);
-	return (0);
-}
-
-__fenv_static inline int
-fegetenv(fenv_t *__envp)
-{
-
-	__stfpsr(__envp);
-	return (0);
-}
-
-__fenv_static inline int
-feholdexcept(fenv_t *__envp)
-{
-	fenv_t __fpsr;
-
-	__stfpsr(&__fpsr);
-	*__envp = __fpsr;
-	__fpsr &= ~((fenv_t)FE_ALL_EXCEPT << _FPUSW_SHIFT);
-	__fpsr |= FE_ALL_EXCEPT;
-	__ldfpsr(__fpsr);
-	return (0);
-}
-
-__fenv_static inline int
-fesetenv(const fenv_t *__envp)
-{
-
-	__ldfpsr(*__envp);
-	return (0);
-}
-
-int feupdateenv(const fenv_t *__envp);
-
-#if __BSD_VISIBLE
-
-/* We currently provide no external definitions of the functions below. */
-
-static inline int
-feenableexcept(int __mask)
-{
-	fenv_t __newfpsr, __oldfpsr;
-
-	__stfpsr(&__oldfpsr);
-	__newfpsr = __oldfpsr & ~(__mask & FE_ALL_EXCEPT);
-	__ldfpsr(__newfpsr);
-	return (~__oldfpsr & FE_ALL_EXCEPT);
-}
-
-static inline int
-fedisableexcept(int __mask)
-{
-	fenv_t __newfpsr, __oldfpsr;
-
-	__stfpsr(&__oldfpsr);
-	__newfpsr = __oldfpsr | (__mask & FE_ALL_EXCEPT);
-	__ldfpsr(__newfpsr);
-	return (~__oldfpsr & FE_ALL_EXCEPT);
-}
-
-static inline int
-fegetexcept(void)
-{
-	fenv_t __fpsr;
-
-	__stfpsr(&__fpsr);
-	return (~__fpsr & FE_ALL_EXCEPT);
-}
-
-#endif /* __BSD_VISIBLE */
-
-__END_DECLS
-
-#endif	/* !_FENV_H_ */
diff --git a/lib/msun/ia64/s_fma.S b/lib/msun/ia64/s_fma.S
deleted file mode 100644
index 3fed3868bbe1..000000000000
--- a/lib/msun/ia64/s_fma.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 2005 David Schultz <das@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 <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
-ENTRY(fma, 3)
-{
-	fma.d		f8 = f8, f9, f10
-	br.ret.sptk	b0
-}
-END(fma)
diff --git a/lib/msun/ia64/s_fmaf.S b/lib/msun/ia64/s_fmaf.S
deleted file mode 100644
index c12fb03e87ed..000000000000
--- a/lib/msun/ia64/s_fmaf.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 2005 David Schultz <das@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 <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
-ENTRY(fmaf, 3)
-{
-	fma.s		f8 = f8, f9, f10
-	br.ret.sptk	b0
-}
-END(fmaf)
diff --git a/lib/msun/ia64/s_fmal.S b/lib/msun/ia64/s_fmal.S
deleted file mode 100644
index 4ae01cc00cac..000000000000
--- a/lib/msun/ia64/s_fmal.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 2005 David Schultz <das@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 <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
-ENTRY(fmal, 3)
-{
-	fma		f8 = f8, f9, f10
-	br.ret.sptk	b0
-}
-END(fmal)
diff --git a/lib/msun/ld128/s_erfl.c b/lib/msun/ld128/s_erfl.c
new file mode 100644
index 000000000000..e29c9691f45d
--- /dev/null
+++ b/lib/msun/ld128/s_erfl.c
@@ -0,0 +1,329 @@
+/* @(#)s_erf.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * See s_erf.c for complete comments.
+ *
+ * Converted to long double by Steven G. Kargl.
+ */
+#include <float.h>
+
+#include "fpmath.h"
+#include "math.h"
+#include "math_private.h"
+
+/* XXX Prevent compilers from erroneously constant folding these: */
+static const volatile long double tiny = 0x1p-10000L;
+
+static const double
+half= 0.5,
+one = 1,
+two = 2;
+/*
+ * In the domain [0, 2**-40], only the first term in the power series
+ * expansion of erf(x) is used.  The magnitude of the first neglected
+ * terms is less than 2**-120.
+ */
+static const long double
+efx  =  1.28379167095512573896158903121545167e-01L,	/* 0xecbff6a7, 0x481dd788, 0xb64d21a8, 0xeb06fc3f */
+efx8 =  1.02703333676410059116927122497236133e+00L,	/* 0xecbff6a7, 0x481dd788, 0xb64d21a8, 0xeb06ff3f */
+/*
+ * Domain [0, 0.84375], range ~[-1.919e-38, 1.919e-38]:
+ * |(erf(x) - x)/x - pp(x)/qq(x)| < 2**-125.29
+ */
+pp0  =  1.28379167095512573896158903121545167e-01L,	/* 0x3ffc06eb, 0xa8214db6, 0x88d71d48, 0xa7f6bfec */
+pp1  = -3.14931554396568573802046931159683404e-01L,	/* 0xbffd427d, 0x6ada7263, 0x547eb096, 0x95f37463 */
+pp2  = -5.27514920282183487103576956956725309e-02L,	/* 0xbffab023, 0xe5a271e3, 0xb0e79b01, 0x2f7ac962 */
+pp3  = -1.13202828509005281355609495523452713e-02L,	/* 0xbff872f1, 0x6a5023a1, 0xe08b3884, 0x326af20f */
+pp4  = -9.18626155872522453865998391206048506e-04L,	/* 0xbff4e19f, 0xea5fb024, 0x43247a37, 0xe430b06c */
+pp5  = -7.87518862406176274922506447157284230e-05L,	/* 0xbff14a4f, 0x31a85fe0, 0x7fff2204, 0x09c49b37 */
+pp6  = -3.42357944472240436548115331090560881e-06L,	/* 0xbfeccb81, 0x4b43c336, 0xcd2eb6c2, 0x903f2d87 */
+pp7  = -1.37317432573890412634717890726745428e-07L,	/* 0xbfe826e3, 0x0e915eb6, 0x42aee414, 0xf7e36805 */
+pp8  = -2.71115170113861755855049008732113726e-09L,	/* 0xbfe2749e, 0x2b94fd00, 0xecb4d166, 0x0efb91f8 */
+pp9  = -3.37925756196555959454018189718117864e-11L,	/* 0xbfdc293e, 0x1d9060cb, 0xd043204a, 0x314cd7f0 */
+qq1  =  4.76672625471551170489978555182449450e-01L,	/* 0x3ffde81c, 0xde6531f0, 0x76803bee, 0x526e29e9 */
+qq2  =  1.06713144672281502058807525850732240e-01L,	/* 0x3ffbb518, 0xd7a6bb74, 0xcd9bdd33, 0x7601eee5 */
+qq3  =  1.47747613127513761102189201923147490e-02L,	/* 0x3ff8e423, 0xae527e18, 0xf12cb447, 0x723b4749 */
+qq4  =  1.39939377672028671891148770908874816e-03L,	/* 0x3ff56ed7, 0xba055d84, 0xc21b45c4, 0x388d1812 */
+qq5  =  9.44302939359455241271983309378738276e-05L,	/* 0x3ff18c11, 0xc18c99a4, 0x86d0fe09, 0x46387b4c */
+qq6  =  4.56199342312522842161301671745365650e-06L,	/* 0x3fed3226, 0x73421d05, 0x08875300, 0x32fa1432 */
+qq7  =  1.53019260483764773845294600092361197e-07L,	/* 0x3fe8489b, 0x3a63f627, 0x2b9ad2ce, 0x26516e57 */
+qq8  =  3.25542691121324805094777901250005508e-09L,	/* 0x3fe2bf6c, 0x26d93a29, 0x9142be7c, 0x9f1dd043 */
+qq9  =  3.37405581964478060434410167262684979e-11L;	/* 0x3fdc28c8, 0xfb8fa1be, 0x10e57eec, 0xaa19e49f */
+
+static const long double
+erx  =  8.42700792949714894142232424201210961e-01L,	/* 0x3ffeaf76, 0x7a741088, 0xb0000000, 0x00000000 */
+/*
+ * Domain [0.84375, 1.25], range ~[-2.521e-36, 2.523e-36]:
+ * |(erf(x) - erx) - pa(x)/qa(x)| < 2**-120.15
+ */
+pa0  = -2.48010117891186017024438233323795897e-17L,	/* 0xbfc7c97f, 0x77812279, 0x6c877f22, 0xef4bfb2e */
+pa1  =  4.15107497420594680894327969504526489e-01L,	/* 0x3ffda911, 0xf096fbc2, 0x55662005, 0x2337fa64 */
+pa2  = -3.94180628087084846724448515851892609e-02L,	/* 0xbffa42e9, 0xab54528c, 0xad529da1, 0x6efc2af3 */
+pa3  =  4.48897599625192107295954790681677462e-02L,	/* 0x3ffa6fbc, 0xa65edba1, 0x0e4cbcea, 0x73ef9a31 */
+pa4  =  8.02069252143016600110972019232995528e-02L,	/* 0x3ffb4887, 0x0e8b548e, 0x3230b417, 0x11b553b3 */
+pa5  = -1.02729816533435279443621120242391295e-02L,	/* 0xbff850a0, 0x041de3ee, 0xd5bca6c9, 0x4ef5f9f2 */
+pa6  =  5.70777694530755634864821094419982095e-03L,	/* 0x3ff77610, 0x9b501e10, 0x4c978382, 0x742df68f */
+pa7  =  1.22635150233075521018231779267077071e-03L,	/* 0x3ff5417b, 0x0e623682, 0x60327da0, 0x96b9219e */
+pa8  =  5.36100234820204569428412542856666503e-04L,	/* 0x3ff41912, 0x27ceb4c1, 0x1d3298ec, 0x84ced627 */
+pa9  = -1.97753571846365167177187858667583165e-04L,	/* 0xbff29eb8, 0x23f5bcf3, 0x15c83c46, 0xe4fda98b */
+pa10 =  6.19333039900846970674794789568415105e-05L,	/* 0x3ff103c4, 0x60f88e46, 0xc0c9fb02, 0x13cc7fc1 */
+pa11 = -5.40531400436645861492290270311751349e-06L,	/* 0xbfed6abe, 0x9665f8a8, 0xdd0ad3ba, 0xe5dc0ee3 */
+qa1  =  9.05041313265490487793231810291907851e-01L,	/* 0x3ffecf61, 0x93340222, 0xe9930620, 0xc4e61168 */
+qa2  =  6.79848064708886864767240880834868092e-01L,	/* 0x3ffe5c15, 0x0ba858dc, 0xf7900ae9, 0xfea1e09a */
+qa3  =  4.04720609926471677581066689316516445e-01L,	/* 0x3ffd9e6f, 0x145e9b00, 0x6d8c1749, 0xd2928623 */
+qa4  =  1.69183273898369996364661075664302225e-01L,	/* 0x3ffc5a7c, 0xc2a363c1, 0xd6c19097, 0xef9b4063 */
+qa5  =  7.44476185988067992342479750486764248e-02L,	/* 0x3ffb30ef, 0xfc7259ef, 0x1bcbb089, 0x686dd62d */
+qa6  =  2.02981172725892407200420389604788573e-02L,	/* 0x3ff94c90, 0x7976cb0e, 0x21e1d36b, 0x0f09ca2b */
+qa7  =  6.94281866271607668268269403102277234e-03L,	/* 0x3ff7c701, 0x2b193250, 0xc5d46ecc, 0x374843d8 */
+qa8  =  1.12952275469171559611651594706820034e-03L,	/* 0x3ff52818, 0xfd2a7c06, 0xd13e38fd, 0xda4b34f5 */
+qa9  =  3.13736683241992737197226578597710179e-04L,	/* 0x3ff348fa, 0x0cb48d18, 0x051f849b, 0x135ccf74 */
+qa10 =  1.17037675204033225470121134087771410e-05L,	/* 0x3fee88b6, 0x98f47704, 0xa5d8f8f2, 0xc6422e11 */
+qa11 =  4.61312518293853991439362806880973592e-06L,	/* 0x3fed3594, 0xe31db94f, 0x3592b693, 0xed4386b4 */
+qa12 = -1.02158572037456893687737553657431771e-06L;	/* 0xbfeb123a, 0xd60d9b1e, 0x1f6fdeb9, 0x7dc8410a */
+/*
+ * Domain [1.25,2.85715], range ~[-2.922e-37,2.922e-37]:
+ * |log(x*erfc(x)) + x**2 + 0.5625 - ra(x)/sa(x)| < 2**-121.36
+ */
+static const long double
+ra0  = -9.86494292470069009555706994426014461e-03L,	/* 0xbff84341, 0x239e8709, 0xe941b06a, 0xcb4b6ec5 */
+ra1  = -1.13580436992565640457579040117568870e+00L,	/* 0xbfff22c4, 0x133f7c0d, 0x72d5e231, 0x2eb1ee3f */
+ra2  = -4.89744330295291950661185707066921755e+01L,	/* 0xc00487cb, 0xa38b4fc2, 0xc136695b, 0xc1df8047 */
+ra3  = -1.10766149300215937173768072715352140e+03L,	/* 0xc00914ea, 0x55e6beb3, 0xabc50e07, 0xb6e5664d */
+ra4  = -1.49991031232170934967642795601952100e+04L,	/* 0xc00cd4b8, 0xd33243e6, 0xffbf6545, 0x3c57ef6e */
+ra5  = -1.29805749738318462882524181556996692e+05L,	/* 0xc00ffb0d, 0xbfeed9b6, 0x5b2a3ff4, 0xe245bd3c */
+ra6  = -7.42828497044940065828871976644647850e+05L,	/* 0xc0126ab5, 0x8fe7caca, 0x473352d9, 0xcd4e0c90 */
+ra7  = -2.85637299581890734287995171242421106e+06L,	/* 0xc0145cad, 0xa7f76fe7, 0x3e358051, 0x1799f927 */
+ra8  = -7.40674797129824999383748865571026084e+06L,	/* 0xc015c412, 0x6fe29c02, 0x298ad158, 0x7d24e45c */
+ra9  = -1.28653420911930973914078724204151759e+07L,	/* 0xc016889e, 0x7c2eb0dc, 0x95d5863b, 0x0aa34dc3 */
+ra10 = -1.47198163599330179552932489109452638e+07L,	/* 0xc016c136, 0x90b84923, 0xf9bcb497, 0x19bbd0f5 */
+ra11 = -1.07812992258382800318665248311522624e+07L,	/* 0xc0164904, 0xe673a113, 0x35d7f079, 0xe13701f3 */
+ra12 = -4.83545565681708642630419905537756076e+06L,	/* 0xc0152721, 0xfea094a8, 0x869eb39d, 0x413d6f13 */
+ra13 = -1.23956521201673964822976917356685286e+06L,	/* 0xc0132ea0, 0xd3646baa, 0x2fe62b0d, 0xbae5ce85 */
+ra14 = -1.62289333553652417591275333240371812e+05L,	/* 0xc0103cf8, 0xaab1e2d6, 0x4c25e014, 0x248d76ab */
+ra15 = -8.82890392601176969729168894389833110e+03L,	/* 0xc00c13e7, 0x3b3d8f94, 0x6fbda6f6, 0xe7049a82 */
+ra16 = -1.22591866337261720023681535568334619e+02L,	/* 0xc005ea5e, 0x12358891, 0xcfa712c5, 0x77f050d4 */
+sa1  =  6.44508918884710829371852723353794047e+01L,	/* 0x400501cd, 0xb69a6c0f, 0x5716de14, 0x47161af6 */
+sa2  =  1.76118475473171481523704824327358534e+03L,	/* 0x4009b84b, 0xd305829f, 0xc4c771b0, 0xbf1f7f9b */
+sa3  =  2.69448346969488374857087646131950188e+04L,	/* 0x400da503, 0x56bacc05, 0x4fdba68d, 0x2cca27e6 */
+sa4  =  2.56826633369941456778326497384543763e+05L,	/* 0x4010f59d, 0x51124428, 0x69c41de6, 0xbd0d5753 */
+sa5  =  1.60647413092257206847700054645905859e+06L,	/* 0x40138834, 0xa2184244, 0x557a1bed, 0x68c9d556 */
+sa6  =  6.76963075165099718574753447122393797e+06L,	/* 0x40159d2f, 0x7b01b0cc, 0x8bac9e95, 0x5d35d56e */
+sa7  =  1.94295690905361884290986932493647741e+07L,	/* 0x40172878, 0xc1172d61, 0x3068501e, 0x2f3c71da */
+sa8  =  3.79774781017759149060839255547073541e+07L,	/* 0x401821be, 0xc30d06fe, 0x410563d7, 0x032111fd */
+sa9  =  5.00659831846029484248302236457727397e+07L,	/* 0x40187df9, 0x1f97a111, 0xc51d6ac2, 0x4b389793 */
+sa10 =  4.36486287620506484276130525941972541e+07L,	/* 0x40184d03, 0x3a618ae0, 0x2a723357, 0xfa45c60a */
+sa11 =  2.43779678791333894255510508253951934e+07L,	/* 0x401773fa, 0x6fe10ee2, 0xc467850d, 0xc6b7ff30 */
+sa12 =  8.30732360384443202039372372212966542e+06L,	/* 0x4015fb09, 0xee6a5631, 0xdd98de7e, 0x8b00461a */
+sa13 =  1.60160846942050515734192397495105693e+06L,	/* 0x40138704, 0x8782bf13, 0x5b8fb315, 0xa898abe5 */
+sa14 =  1.54255505242533291014555153757001825e+05L,	/* 0x40102d47, 0xc0abc98e, 0x843c9490, 0xb4352440 */
+sa15 =  5.87949220002375547561467275493888824e+03L,	/* 0x400b6f77, 0xe00d21d1, 0xec4d41e8, 0x2f8e1673 */
+sa16 =  4.97272976346793193860385983372237710e+01L;	/* 0x40048dd1, 0x816c1b3f, 0x24f540a6, 0x4cfe03cc */
+/*
+ * Domain [2.85715,9], range ~[-7.886e-37,7.918e-37]:
+ * |log(x*erfc(x)) + x**2 + 0.5625 - rb(x)/sb(x)| < 2**-120
+ */
+static const long double
+rb0  = -9.86494292470008707171371994479162369e-3L, /* 0xbff84341, 0x239e86f4, 0x2f57e561, 0xf4469360 */
+rb1  = -1.57047326624110727986326503729442830L,    /* 0xbfff920a, 0x8935bf73, 0x8803b894, 0x4656482d */
+rb2  = -1.03228196364885474342132255440317065e2L,  /* 0xc0059ce9, 0xac4ed0ff, 0x2cff0ff7, 0x5e70d1ab */
+rb3  = -3.74000570653418227179358710865224376e3L,  /* 0xc00ad380, 0x2ebf7835, 0xf6b07ed2, 0x861242f7 */
+rb4  = -8.35435477739098044190860390632813956e4L,  /* 0xc00f4657, 0x8c3ae934, 0x3647d7b3, 0x80e76fb7 */
+rb5  = -1.21398672055223642118716640216747152e6L,  /* 0xc0132862, 0x2b8761c8, 0x27d18c0f, 0x137c9463 */
+rb6  = -1.17669175877248796101665344873273970e7L,  /* 0xc0166719, 0x0b2cea46, 0x81f14174, 0x11602ea5 */
+rb7  = -7.66108006086998253606773064264599615e7L,  /* 0xc019243f, 0x3c26f4f0, 0x1cc05241, 0x3b953728 */
+rb8  = -3.32547117558141845968704725353130804e8L,  /* 0xc01b3d24, 0x42d8ee26, 0x24ef6f3b, 0x604a8c65 */
+rb9  = -9.41561252426350696802167711221739746e8L,  /* 0xc01cc0f8, 0xad23692a, 0x8ddb2310, 0xe9937145 */
+rb10 = -1.67157110805390944549427329626281063e9L,  /* 0xc01d8e88, 0x9a903734, 0x09a55fa3, 0xd205c903 */
+rb11 = -1.74339631004410841337645931421427373e9L,  /* 0xc01d9fa8, 0x77582d2a, 0xc183b8ab, 0x7e00cb05 */
+rb12 = -9.57655233596934915727573141357471703e8L,  /* 0xc01cc8a5, 0x460cc685, 0xd0271fa0, 0x6a70e3da */
+rb13 = -2.26320062731339353035254704082495066e8L,  /* 0xc01aafab, 0xd7d76721, 0xc9720e11, 0x6a8bd489 */
+rb14 = -1.42777302996263256686002973851837039e7L,  /* 0xc016b3b8, 0xc499689f, 0x2b88d965, 0xc32414f9 */
+sb1  =  1.08512869705594540211033733976348506e2L,  /* 0x4005b20d, 0x2db7528d, 0x00d20dcb, 0x858f6191 */
+sb2  =  5.02757713761390460534494530537572834e3L,  /* 0x400b3a39, 0x3bf4a690, 0x3025d28d, 0xfd40a891 */
+sb3  =  1.31019107205412870059331647078328430e5L,  /* 0x400fffcb, 0x1b71d05e, 0x3b28361d, 0x2a3c3690 */
+sb4  =  2.13021555152296846166736757455018030e6L,  /* 0x40140409, 0x3c6984df, 0xc4491d7c, 0xb04aa08d */
+sb5  =  2.26649105281820861953868568619768286e7L,  /* 0x401759d6, 0xce8736f0, 0xf28ad037, 0x2a901e0c */
+sb6  =  1.61071939490875921812318684143076081e8L,  /* 0x401a3338, 0x686fb541, 0x6bd27d06, 0x4f95c9ac */
+sb7  =  7.66895673844301852676056750497991966e8L,  /* 0x401c6daf, 0x31cec121, 0x54699126, 0x4bd9bf9e */
+sb8  =  2.41884450436101936436023058196042526e9L,  /* 0x401e2059, 0x46b0b8d7, 0x87b64cbf, 0x78bc296d */
+sb9  =  4.92403055884071695093305291535107666e9L,  /* 0x401f257e, 0xbe5ed739, 0x39e17346, 0xcadd2e55 */
+sb10 =  6.18627786365587486459633615573786416e9L,  /* 0x401f70bb, 0x1be7a7e7, 0x6a45b5ae, 0x607c70f0 */
+sb11 =  4.45898013426501378097430226324743199e9L,  /* 0x401f09c6, 0xa32643d7, 0xf1724620, 0x9ea46c32 */
+sb12 =  1.63006115763329848117160344854224975e9L,  /* 0x401d84a3, 0x0996887f, 0x65a4f43b, 0x978c1d74 */
+sb13 =  2.39216717012421697446304015847567721e8L,  /* 0x401ac845, 0x09a065c2, 0x30095da7, 0x9d72d6ae */
+sb14 =  7.84837329009278694937250358810225609e6L;  /* 0x4015df06, 0xd5290e15, 0x63031fac, 0x4d9c894c */
+/*
+ * Domain [9,108], range ~[-5.324e-38,5.340e-38]:
+ * |log(x*erfc(x)) + x**2 + 0.5625 - r(x)/s(x)| < 2**-124
+ */
+static const long double
+rc0  = -9.86494292470008707171367567652935673e-3L, /* 0xbff84341, 0x239e86f4, 0x2f57e55b, 0x1aa10fd3 */
+rc1  = -1.26229447747315096406518846411562266L,    /* 0xbfff4325, 0xbb1aab28, 0xda395cd9, 0xfb861c15 */
+rc2  = -6.13742634438922591780742637728666162e1L,  /* 0xc004eafe, 0x7dd51cd8, 0x3c7c5928, 0x751e50cf */
+rc3  = -1.50455835478908280402912854338421517e3L,  /* 0xc0097823, 0xbc15b9ab, 0x3d60745c, 0x523e80a5 */
+rc4  = -2.04415631865861549920184039902945685e4L,  /* 0xc00d3f66, 0x40b3fc04, 0x5388f2ec, 0xb009e1f0 */
+rc5  = -1.57625662981714582753490610560037638e5L,  /* 0xc01033dc, 0xd4dc95b6, 0xfd4da93b, 0xf355b4a9 */
+rc6  = -6.73473451616752528402917538033283794e5L,  /* 0xc01248d8, 0x2e73a4f9, 0xcded49c5, 0xfa3bfeb7 */
+rc7  = -1.47433165421387483167186683764364857e6L,  /* 0xc01367f1, 0xba77a8f7, 0xcfdd0dbb, 0x25d554b3 */
+rc8  = -1.38811981807868828563794929997744139e6L,  /* 0xc01352e5, 0x7d16d9ad, 0xbbdcbf38, 0x38fbc5ea */
+rc9  = -3.59659700530831825640766479698155060e5L,  /* 0xc0115f3a, 0xecd57f45, 0x21f8ad6c, 0x910a5958 */
+sc1  =  7.72730753022908298637508998072635696e1L,  /* 0x40053517, 0xa10d52bc, 0xdabb55b6, 0xbd0328cd */
+sc2  =  2.36825757341694050500333261769082182e3L,  /* 0x400a2808, 0x3e0a9b42, 0x82977842, 0x9c5de29e */
+sc3  =  3.72210540173034735352888847134073099e4L,  /* 0x400e22ca, 0x1ba827ef, 0xac8390d7, 0x1fc39a41 */
+sc4  =  3.24136032646418336712461033591393412e5L,  /* 0x40113c8a, 0x0216e100, 0xc59d1e44, 0xf0e68d9d */
+sc5  =  1.57836135851134393802505823370009175e6L,  /* 0x40138157, 0x95bc7664, 0x17575961, 0xdbe58eeb */
+sc6  =  4.12881981392063738026679089714182355e6L,  /* 0x4014f801, 0x9e82e8d2, 0xb8b3a70e, 0xfd84185d */
+sc7  =  5.24438427289213488410596395361544142e6L,  /* 0x40154017, 0x81177109, 0x2aa6c3b0, 0x1f106625 */
+sc8  =  2.59909544563616121735963429710382149e6L,  /* 0x40143d45, 0xbb90a9b1, 0x12bf9390, 0xa827a700 */
+sc9  =  2.80930665169282501639651995082335693e5L;  /* 0x40111258, 0xaa92222e, 0xa97e3216, 0xa237fa6c */
+
+long double
+erfl(long double x)
+{
+	long double ax,R,S,P,Q,s,y,z,r;
+	uint64_t lx, llx;
+	int32_t i;
+	uint16_t hx;
+
+	EXTRACT_LDBL128_WORDS(hx, lx, llx, x);
+
+	if((hx & 0x7fff) == 0x7fff) {	/* erfl(nan)=nan */
+		i = (hx>>15)<<1;
+		return (1-i)+one/x;	/* erfl(+-inf)=+-1 */
+	}
+
+	ax = fabsl(x);
+	if(ax < 0.84375) {
+	    if(ax < 0x1p-40L) {
+	        if(ax < 0x1p-16373L)	
+		    return (8*x+efx8*x)/8;	/* avoid spurious underflow */
+		return x + efx*x;
+	    }
+	    z = x*x;
+	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*(pp4+z*(pp5+z*(pp6+z*(pp7+
+		z*(pp8+z*pp9))))))));
+	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*(qq5+z*(qq6+z*(qq7+
+		z*(qq8+z*qq9))))))));
+	    y = r/s;
+	    return x + x*y;
+	}
+	if(ax < 1.25) {
+	    s = ax-one;
+	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*(pa6+s*(pa7+
+		s*(pa8+s*(pa9+s*(pa10+s*pa11))))))))));
+	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*(qa6+s*(qa7+
+		s*(qa8+s*(qa9+s*(qa10+s*(qa11+s*qa12)))))))))));
+	    if(x>=0) return (erx + P/Q); else return (-erx - P/Q);
+	}
+	if (ax >= 9) {			/* inf>|x|>= 9 */
+	    if(x>=0) return (one-tiny); else return (tiny-one);
+	}
+	s = one/(ax*ax);
+	if(ax < 2.85715) {	/* |x| < 2.85715 */
+	    R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(ra5+s*(ra6+s*(ra7+
+		s*(ra8+s*(ra9+s*(ra10+s*(ra11+s*(ra12+s*(ra13+s*(ra14+
+		s*(ra15+s*ra16)))))))))))))));
+	    S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(sa5+s*(sa6+s*(sa7+
+		s*(sa8+s*(sa9+s*(sa10+s*(sa11+s*(sa12+s*(sa13+s*(sa14+
+		s*(sa15+s*sa16)))))))))))))));
+	} else {	/* |x| >= 2.85715 */
+	    R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(rb5+s*(rb6+s*(rb7+
+		s*(rb8+s*(rb9+s*(rb10+s*(rb11+s*(rb12+s*(rb13+
+		s*rb14)))))))))))));
+	    S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(sb5+s*(sb6+s*(sb7+
+		s*(sb8+s*(sb9+s*(sb10+s*(sb11+s*(sb12+s*(sb13+
+		s*sb14)))))))))))));
+	}
+	z = (float)ax;
+	r = expl(-z*z-0.5625)*expl((z-ax)*(z+ax)+R/S);
+	if(x>=0) return (one-r/ax); else return (r/ax-one);
+}
+
+long double
+erfcl(long double x)
+{
+	long double ax,R,S,P,Q,s,y,z,r;
+	uint64_t lx, llx;
+	uint16_t hx;
+
+	EXTRACT_LDBL128_WORDS(hx, lx, llx, x);
+
+	if((hx & 0x7fff) == 0x7fff) {	/* erfcl(nan)=nan */
+					/* erfcl(+-inf)=0,2 */
+	    return ((hx>>15)<<1)+one/x;
+	}
+
+	ax = fabsl(x);
+	if(ax < 0.84375L) {
+	    if(ax < 0x1p-34L)
+		return one-x;
+	    z = x*x;
+	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*(pp4+z*(pp5+z*(pp6+z*(pp7+
+		z*(pp8+z*pp9))))))));
+	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*(qq5+z*(qq6+z*(qq7+
+		z*(qq8+z*qq9))))))));
+	    y = r/s;
+	    if(ax < 0.25L) {  	/* x<1/4 */
+		return one-(x+x*y);
+	    } else {
+		r = x*y;
+		r += (x-half);
+	       return half - r;
+	    }
+	}
+	if(ax < 1.25L) {
+	    s = ax-one;
+	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*(pa6+s*(pa7+
+		    s*(pa8+s*(pa9+s*(pa10+s*pa11))))))))));
+	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*(qa6+s*(qa7+
+		    s*(qa8+s*(qa9+s*(qa10+s*(qa11+s*qa12)))))))))));
+	    if(x>=0) {
+	        z  = one-erx; return z - P/Q;
+	    } else {
+		z = erx+P/Q; return one+z;
+	    }
+	}
+
+	if(ax < 108) {			/* |x| < 108 */
+ 	    s = one/(ax*ax);
+	    if(ax < 2.85715) {		/* |x| < 2.85715 */
+	        R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(ra5+s*(ra6+s*(ra7+
+		    s*(ra8+s*(ra9+s*(ra10+s*(ra11+s*(ra12+s*(ra13+s*(ra14+
+		    s*(ra15+s*ra16)))))))))))))));
+	        S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(sa5+s*(sa6+s*(sa7+
+		    s*(sa8+s*(sa9+s*(sa10+s*(sa11+s*(sa12+s*(sa13+s*(sa14+
+		    s*(sa15+s*sa16)))))))))))))));
+	    } else if(ax < 9) {
+		R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(rb5+s*(rb6+s*(rb7+
+		    s*(rb8+s*(rb9+s*(rb10+s*(rb11+s*(rb12+s*(rb13+
+		    s*rb14)))))))))))));
+		S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(sb5+s*(sb6+s*(sb7+
+		    s*(sb8+s*(sb9+s*(sb10+s*(sb11+s*(sb12+s*(sb13+
+		    s*sb14)))))))))))));
+	    } else {
+		if(x < -9) return two-tiny;	/* x < -9 */
+		R=rc0+s*(rc1+s*(rc2+s*(rc3+s*(rc4+s*(rc5+s*(rc6+s*(rc7+
+		    s*(rc8+s*rc9))))))));
+		S=one+s*(sc1+s*(sc2+s*(sc3+s*(sc4+s*(sc5+s*(sc6+s*(sc7+
+		    s*(sc8+s*sc9))))))));
+	    }
+	    z = (float)ax;
+	    r = expl(-z*z-0.5625)*expl((z-ax)*(z+ax)+R/S);
+	    if(x>0) return r/ax; else return two-r/ax;
+	} else {
+	    if(x>0) return tiny*tiny; else return two-tiny;
+	}
+}
diff --git a/lib/msun/ld80/s_erfl.c b/lib/msun/ld80/s_erfl.c
new file mode 100644
index 000000000000..1ae2f9092705
--- /dev/null
+++ b/lib/msun/ld80/s_erfl.c
@@ -0,0 +1,337 @@
+/* @(#)s_erf.c 5.1 93/09/24 */
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * See s_erf.c for complete comments.
+ *
+ * Converted to long double by Steven G. Kargl.
+ */
+#include <float.h>
+#ifdef __i386__
+#include <ieeefp.h>
+#endif
+
+#include "fpmath.h"
+#include "math.h"
+#include "math_private.h"
+
+/* XXX Prevent compilers from erroneously constant folding: */
+static const volatile long double tiny = 0x1p-10000L;
+
+static const double
+half= 0.5,
+one = 1,
+two = 2;
+/*
+ * In the domain [0, 2**-34], only the first term in the power series
+ * expansion of erf(x) is used.  The magnitude of the first neglected
+ * terms is less than 2**-102.
+ */
+static const union IEEEl2bits
+efxu  = LD80C(0x8375d410a6db446c, -3,  1.28379167095512573902e-1L),
+efx8u = LD80C(0x8375d410a6db446c,  0,  1.02703333676410059122e+0L),
+/*
+ * Domain [0, 0.84375], range ~[-1.423e-22, 1.423e-22]:
+ * |(erf(x) - x)/x - pp(x)/qq(x)| < 2**-72.573
+ */
+pp0u  = LD80C(0x8375d410a6db446c, -3,   1.28379167095512573902e-1L),
+pp1u  = LD80C(0xa46c7d09ec3d0cec, -2,  -3.21140201054840180596e-1L),
+pp2u  = LD80C(0x9b31e66325576f86, -5,  -3.78893851760347812082e-2L),
+pp3u  = LD80C(0x804ac72c9a0b97dd, -7,  -7.83032847030604679616e-3L),
+pp4u  = LD80C(0x9f42bcbc3d5a601d, -12, -3.03765663857082048459e-4L),
+pp5u  = LD80C(0x9ec4ad6193470693, -16, -1.89266527398167917502e-5L),
+qq1u  = LD80C(0xdb4b8eb713188d6b, -2,   4.28310832832310510579e-1L),
+qq2u  = LD80C(0xa5750835b2459bd1, -4,   8.07896272074540216658e-2L),
+qq3u  = LD80C(0x8b85d6bd6a90b51c, -7,   8.51579638189385354266e-3L),
+qq4u  = LD80C(0x87332f82cff4ff96, -11,  5.15746855583604912827e-4L),
+qq5u  = LD80C(0x83466cb6bf9dca00, -16,  1.56492109706256700009e-5L),
+qq6u  = LD80C(0xf5bf98c2f996bf63, -24,  1.14435527803073879724e-7L);
+#define	efx	(efxu.e)
+#define	efx8	(efx8u.e)
+#define	pp0	(pp0u.e)
+#define	pp1	(pp1u.e)
+#define	pp2	(pp2u.e)
+#define	pp3	(pp3u.e)
+#define	pp4	(pp4u.e)
+#define	pp5	(pp5u.e)
+#define	qq1	(qq1u.e)
+#define	qq2	(qq2u.e)
+#define	qq3	(qq3u.e)
+#define	qq4	(qq4u.e)
+#define	qq5	(qq5u.e)
+#define	qq6	(qq6u.e)
+static const union IEEEl2bits
+erxu  = LD80C(0xd7bb3d0000000000, -1,  8.42700779438018798828e-1L),
+/*
+ * Domain [0.84375, 1.25], range ~[-8.132e-22, 8.113e-22]:
+ * |(erf(x) - erx) - pa(x)/qa(x)| < 2**-71.762
+ */
+pa0u  = LD80C(0xe8211158da02c692, -27,  1.35116960705131296711e-8L),
+pa1u  = LD80C(0xd488f89f36988618, -2,   4.15107507167065612570e-1L),
+pa2u  = LD80C(0xece74f8c63fa3942, -4,  -1.15675565215949226989e-1L),
+pa3u  = LD80C(0xc8d31e020727c006, -4,   9.80589241379624665791e-2L),
+pa4u  = LD80C(0x985d5d5fafb0551f, -5,   3.71984145558422368847e-2L),
+pa5u  = LD80C(0xa5b6c4854d2f5452, -8,  -5.05718799340957673661e-3L),
+pa6u  = LD80C(0x85c8d58fe3993a47, -8,   4.08277919612202243721e-3L),
+pa7u  = LD80C(0xddbfbc23677b35cf, -13,  2.11476292145347530794e-4L),
+qa1u  = LD80C(0xb8a977896f5eff3f, -1,   7.21335860303380361298e-1L),
+qa2u  = LD80C(0x9fcd662c3d4eac86, -1,   6.24227891731886593333e-1L),
+qa3u  = LD80C(0x9d0b618eac67ba07, -2,   3.06727455774491855801e-1L),
+qa4u  = LD80C(0x881a4293f6d6c92d, -3,   1.32912674218195890535e-1L),
+qa5u  = LD80C(0xbab144f07dea45bf, -5,   4.55792134233613027584e-2L),
+qa6u  = LD80C(0xa6c34ba438bdc900, -7,   1.01783980070527682680e-2L),
+qa7u  = LD80C(0x8fa866dc20717a91, -9,   2.19204436518951438183e-3L);
+#define erx	(erxu.e)
+#define pa0	(pa0u.e)
+#define pa1	(pa1u.e)
+#define pa2	(pa2u.e)
+#define pa3	(pa3u.e)
+#define pa4	(pa4u.e)
+#define pa5	(pa5u.e)
+#define pa6	(pa6u.e)
+#define pa7	(pa7u.e)
+#define qa1	(qa1u.e)
+#define qa2	(qa2u.e)
+#define qa3	(qa3u.e)
+#define qa4	(qa4u.e)
+#define qa5	(qa5u.e)
+#define qa6	(qa6u.e)
+#define qa7	(qa7u.e)
+static const union IEEEl2bits
+/*
+ * Domain [1.25,2.85715], range ~[-2.334e-22,2.334e-22]:
+ * |log(x*erfc(x)) + x**2 + 0.5625 - ra(x)/sa(x)| < 2**-71.860
+ */
+ra0u  = LD80C(0xa1a091e0fb4f335a, -7, -9.86494298915814308249e-3L),
+ra1u  = LD80C(0xc2b0d045ae37df6b, -1, -7.60510460864878271275e-1L),
+ra2u  = LD80C(0xf2cec3ee7da636c5, 3,  -1.51754798236892278250e+1L),
+ra3u  = LD80C(0x813cc205395adc7d, 7,  -1.29237335516455333420e+2L),
+ra4u  = LD80C(0x8737c8b7b4062c2f, 9,  -5.40871625829510494776e+2L),
+ra5u  = LD80C(0x8ffe5383c08d4943, 10, -1.15194769466026108551e+3L),
+ra6u  = LD80C(0x983573e64d5015a9, 10, -1.21767039790249025544e+3L),
+ra7u  = LD80C(0x92a794e763a6d4db, 9,  -5.86618463370624636688e+2L),
+ra8u  = LD80C(0xd5ad1fae77c3d9a3, 6,  -1.06838132335777049840e+2L),
+ra9u  = LD80C(0x934c1a247807bb9c, 2,  -4.60303980944467334806e+0L),
+sa1u  = LD80C(0xd342f90012bb1189, 4,   2.64077014928547064865e+1L),
+sa2u  = LD80C(0x839be13d9d5da883, 8,   2.63217811300123973067e+2L),
+sa3u  = LD80C(0x9f8cba6d1ae1b24b, 10,  1.27639775710344617587e+3L),
+sa4u  = LD80C(0xcaa83f403713e33e, 11,  3.24251544209971162003e+3L),
+sa5u  = LD80C(0x8796aff2f3c47968, 12,  4.33883591261332837874e+3L),
+sa6u  = LD80C(0xb6ef97f9c753157b, 11,  2.92697460344182158454e+3L),
+sa7u  = LD80C(0xe02aee5f83773d1c, 9,   8.96670799139389559818e+2L),
+sa8u  = LD80C(0xc82b83855b88e07e, 6,   1.00084987800048510018e+2L),
+sa9u  = LD80C(0x92f030aefadf28ad, 1,   2.29591004455459083843e+0L);
+#define ra0	(ra0u.e)
+#define ra1	(ra1u.e)
+#define ra2	(ra2u.e)
+#define ra3	(ra3u.e)
+#define ra4	(ra4u.e)
+#define ra5	(ra5u.e)
+#define ra6	(ra6u.e)
+#define ra7	(ra7u.e)
+#define ra8	(ra8u.e)
+#define ra9	(ra9u.e)
+#define sa1	(sa1u.e)
+#define sa2	(sa2u.e)
+#define sa3	(sa3u.e)
+#define sa4	(sa4u.e)
+#define sa5	(sa5u.e)
+#define sa6	(sa6u.e)
+#define sa7	(sa7u.e)
+#define sa8	(sa8u.e)
+#define sa9	(sa9u.e)
+/*
+ * Domain [2.85715,7], range ~[-8.323e-22,8.390e-22]:
+ * |log(x*erfc(x)) + x**2 + 0.5625 - rb(x)/sb(x)| < 2**-70.326
+ */
+static const union IEEEl2bits
+rb0u = LD80C(0xa1a091cf43abcd26, -7, -9.86494292470284646962e-3L),
+rb1u = LD80C(0xd19d2df1cbb8da0a, -1, -8.18804618389296662837e-1L),
+rb2u = LD80C(0x9a4dd1383e5daf5b, 4,  -1.92879967111618594779e+1L),
+rb3u = LD80C(0xbff0ae9fc0751de6, 7,  -1.91940164551245394969e+2L),
+rb4u = LD80C(0xdde08465310b472b, 9,  -8.87508080766577324539e+2L),
+rb5u = LD80C(0xe796e1d38c8c70a9, 10, -1.85271506669474503781e+3L),
+rb6u = LD80C(0xbaf655a76e0ab3b5, 10, -1.49569795581333675349e+3L),
+rb7u = LD80C(0x95d21e3e75503c21, 8,  -2.99641547972948019157e+2L),
+sb1u = LD80C(0x814487ed823c8cbd, 5,   3.23169247732868256569e+1L),
+sb2u = LD80C(0xbe4bfbb1301304be, 8,   3.80593618534539961773e+2L),
+sb3u = LD80C(0x809c4ade46b927c7, 11,  2.05776827838541292848e+3L),
+sb4u = LD80C(0xa55284359f3395a8, 12,  5.29031455540062116327e+3L),
+sb5u = LD80C(0xbcfa72da9b820874, 12,  6.04730608102312640462e+3L),
+sb6u = LD80C(0x9d09a35988934631, 11,  2.51260238030767176221e+3L),
+sb7u = LD80C(0xd675bbe542c159fa, 7,   2.14459898308561015684e+2L);
+#define rb0	(rb0u.e)
+#define rb1	(rb1u.e)
+#define rb2	(rb2u.e)
+#define rb3	(rb3u.e)
+#define rb4	(rb4u.e)
+#define rb5	(rb5u.e)
+#define rb6	(rb6u.e)
+#define rb7	(rb7u.e)
+#define sb1	(sb1u.e)
+#define sb2	(sb2u.e)
+#define sb3	(sb3u.e)
+#define sb4	(sb4u.e)
+#define sb5	(sb5u.e)
+#define sb6	(sb6u.e)
+#define sb7	(sb7u.e)
+/*
+ * Domain [7,108], range ~[-4.422e-22,4.422e-22]:
+ * |log(x*erfc(x)) + x**2 + 0.5625 - rc(x)/sc(x)| < 2**-70.938
+ */
+static const union IEEEl2bits
+/* err = -4.422092275318925082e-22 -70.937689 */
+rc0u = LD80C(0xa1a091cf437a17ad, -7, -9.86494292470008707260e-3L),
+rc1u = LD80C(0xbe79c5a978122b00, -1, -7.44045595049165939261e-1L),
+rc2u = LD80C(0xdb26f9bbe31a2794, 3,  -1.36970155085888424425e+1L),
+rc3u = LD80C(0xb5f69a38f5747ac8, 6,  -9.09816453742625888546e+1L),
+rc4u = LD80C(0xd79676d970d0a21a, 7,  -2.15587750997584074147e+2L),
+rc5u = LD80C(0xfe528153c45ec97c, 6,  -1.27161142938347796666e+2L),
+sc1u = LD80C(0xc5e8cd46d5604a96, 4,   2.47386727842204312937e+1L),
+sc2u = LD80C(0xc5f0f5a5484520eb, 7,   1.97941248254913378865e+2L),
+sc3u = LD80C(0x964e3c7b34db9170, 9,   6.01222441484087787522e+2L),
+sc4u = LD80C(0x99be1b89faa0596a, 9,   6.14970430845978077827e+2L),
+sc5u = LD80C(0xf80dfcbf37ffc5ea, 6,   1.24027318931184605891e+2L);
+#define rc0	(rc0u.e)
+#define rc1	(rc1u.e)
+#define rc2	(rc2u.e)
+#define rc3	(rc3u.e)
+#define rc4	(rc4u.e)
+#define rc5	(rc5u.e)
+#define sc1	(sc1u.e)
+#define sc2	(sc2u.e)
+#define sc3	(sc3u.e)
+#define sc4	(sc4u.e)
+#define sc5	(sc5u.e)
+
+long double
+erfl(long double x)
+{
+	long double ax,R,S,P,Q,s,y,z,r;
+	uint64_t lx;
+	int32_t i;
+	uint16_t hx;
+
+	EXTRACT_LDBL80_WORDS(hx, lx, x);
+
+	if((hx & 0x7fff) == 0x7fff) {	/* erfl(nan)=nan */
+		i = (hx>>15)<<1;
+		return (1-i)+one/x;	/* erfl(+-inf)=+-1 */
+	}
+
+	ENTERI();
+
+	ax = fabsl(x);
+	if(ax < 0.84375) {
+	    if(ax < 0x1p-34L) {
+	        if(ax < 0x1p-16373L)	
+		    RETURNI((8*x+efx8*x)/8);	/* avoid spurious underflow */
+		RETURNI(x + efx*x);
+	    }
+	    z = x*x;
+	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*(pp4+z*pp5))));
+	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*(qq5+z*qq6)))));
+	    y = r/s;
+	    RETURNI(x + x*y);
+	}
+	if(ax < 1.25) {
+	    s = ax-one;
+	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*(pa6+s*pa7))))));
+	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*(qa6+s*qa7))))));
+	    if(x>=0) RETURNI(erx + P/Q); else RETURNI(-erx - P/Q);
+	}
+	if(ax >= 7) {			/* inf>|x|>= 7 */
+	    if(x>=0) RETURNI(one-tiny); else RETURNI(tiny-one);
+	}
+	s = one/(ax*ax);
+	if(ax < 2.85715) {	/* |x| < 2.85715 */
+	    R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(ra5+s*(ra6+s*(ra7+
+		s*(ra8+s*ra9))))))));
+	    S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(sa5+s*(sa6+s*(sa7+
+		s*(sa8+s*sa9))))))));
+	} else {	/* |x| >= 2.85715 */
+	    R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(rb5+s*(rb6+s*rb7))))));
+	    S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(sb5+s*(sb6+s*sb7))))));
+	}
+	z=(float)ax;
+	r=expl(-z*z-0.5625)*expl((z-ax)*(z+ax)+R/S);
+	if(x>=0) RETURNI(one-r/ax); else RETURNI(r/ax-one);
+}
+
+long double
+erfcl(long double x)
+{
+	long double ax,R,S,P,Q,s,y,z,r;
+	uint64_t lx;
+	uint16_t hx;
+
+	EXTRACT_LDBL80_WORDS(hx, lx, x);
+
+	if((hx & 0x7fff) == 0x7fff) {	/* erfcl(nan)=nan */
+					/* erfcl(+-inf)=0,2 */
+	    return ((hx>>15)<<1)+one/x;
+	}
+
+	ENTERI();
+
+	ax = fabsl(x);
+	if(ax < 0.84375L) {
+	    if(ax < 0x1p-34L)
+		RETURNI(one-x);
+	    z = x*x;
+	    r = pp0+z*(pp1+z*(pp2+z*(pp3+z*(pp4+z*pp5))));
+	    s = one+z*(qq1+z*(qq2+z*(qq3+z*(qq4+z*(qq5+z*qq6)))));
+	    y = r/s;
+	    if(ax < 0.25L) {  	/* x<1/4 */
+		RETURNI(one-(x+x*y));
+	    } else {
+		r = x*y;
+		r += (x-half);
+	       RETURNI(half - r);
+	    }
+	}
+	if(ax < 1.25L) {
+	    s = ax-one;
+	    P = pa0+s*(pa1+s*(pa2+s*(pa3+s*(pa4+s*(pa5+s*(pa6+s*pa7))))));
+	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*(qa4+s*(qa5+s*(qa6+s*qa7))))));
+	    if(x>=0) {
+	        z  = one-erx; RETURNI(z - P/Q);
+	    } else {
+		z = (erx+P/Q); RETURNI(one+z);
+	    }
+	}
+
+	if(ax < 108) {			/* |x| < 108 */
+ 	    s = one/(ax*ax);
+	    if(ax < 2.85715) {		/* |x| < 2.85715 */
+		R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(ra5+s*(ra6+s*(ra7+
+		    s*(ra8+s*ra9))))))));
+		S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(sa5+s*(sa6+s*(sa7+
+		    s*(sa8+s*sa9))))))));
+	    } else if(ax < 7) {		/* | |x| < 7 */
+		R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(rb5+s*(rb6+s*rb7))))));
+		S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(sb5+s*(sb6+s*sb7))))));
+	    } else {
+		if(x < -7) RETURNI(two-tiny);/* x < -7 */
+		R=rc0+s*(rc1+s*(rc2+s*(rc3+s*(rc4+s*rc5))));
+		S=one+s*(sc1+s*(sc2+s*(sc3+s*(sc4+s*sc5))));
+	    }
+	    z = (float)ax;
+	    r = expl(-z*z-0.5625)*expl((z-ax)*(z+ax)+R/S);
+	    if(x>0) RETURNI(r/ax); else RETURNI(two-r/ax);
+	} else {
+	    if(x>0) RETURNI(tiny*tiny); else RETURNI(two-tiny);
+	}
+}
diff --git a/lib/msun/man/erf.3 b/lib/msun/man/erf.3
index 46886b0506aa..a9a3e0a84abe 100644
--- a/lib/msun/man/erf.3
+++ b/lib/msun/man/erf.3
@@ -28,14 +28,16 @@
 .\"     from: @(#)erf.3	6.4 (Berkeley) 4/20/91
 .\" $FreeBSD$
 .\"
-.Dd April 20, 1991
+.Dd July 13, 2014
 .Dt ERF 3
 .Os
 .Sh NAME
 .Nm erf ,
 .Nm erff ,
+.Nm erfl ,
 .Nm erfc ,
-.Nm erfcf
+.Nm erfcf ,
+.Nm erfcl
 .Nd error function operators
 .Sh LIBRARY
 .Lb libm
@@ -45,18 +47,23 @@
 .Fn erf "double x"
 .Ft float
 .Fn erff "float x"
+.Ft "long double"
+.Fn erfl "long double x"
 .Ft double
 .Fn erfc "double x"
 .Ft float
 .Fn erfcf "float x"
+.Ft "long double"
+.Fn erfcl "long double x"
 .Sh DESCRIPTION
 These functions calculate the error function of
 .Fa x .
 .Pp
 The
-.Fn erf
-and the
-.Fn erff
+.Fn erf ,
+.Fn erff ,
+and
+.Fn erfl
 functions calculate the error function of x; where
 .Bd -ragged -offset indent
 .if n \{\
@@ -69,9 +76,10 @@ erf\|(x) :=
 .Ed
 .Pp
 The
-.Fn erfc
-and the
-.Fn erfcf
+.Fn erfc ,
+.Fn erfcf ,
+and
+.Fn erfcl
 functions calculate the complementary error function of
 .Fa x ;
 that is
@@ -79,9 +87,6 @@ that is
 subtracts the result of the error function
 .Fn erf x
 from 1.0.
-This is useful, since for large
-.Fa x
-places disappear.
 .Sh SEE ALSO
 .Xr math 3
 .Sh HISTORY
diff --git a/lib/msun/sparc64/fenv.h b/lib/msun/sparc64/fenv.h
index d17361fef453..0faf08d450b8 100644
--- a/lib/msun/sparc64/fenv.h
+++ b/lib/msun/sparc64/fenv.h
@@ -108,9 +108,9 @@ fesetexceptflag(const fexcept_t *__flagp, int __excepts)
 }
 
 /*
- * In contrast with the ia64 platform, it seems to be worthwhile to
- * inline this function on sparc64 even when the arguments are not
- * compile-time constants.  Perhaps this depends on the register window.
+ * It seems to be worthwhile to inline this function even when the
+ * arguments are not compile-time constants.  Perhaps this depends
+ * on the register window.
  */
 __fenv_static inline int
 feraiseexcept(int __excepts)
diff --git a/lib/msun/src/e_pow.c b/lib/msun/src/e_pow.c
index 7607a4a72650..d54af9d6806c 100644
--- a/lib/msun/src/e_pow.c
+++ b/lib/msun/src/e_pow.c
@@ -19,20 +19,20 @@ __FBSDID("$FreeBSD$");
  *	1. Compute and return log2(x) in two pieces:
  *		log2(x) = w1 + w2,
  *	   where w1 has 53-24 = 29 bit trailing zeros.
- *	2. Perform y*log2(x) = n+y' by simulating muti-precision 
+ *	2. Perform y*log2(x) = n+y' by simulating multi-precision 
  *	   arithmetic, where |y'|<=0.5.
  *	3. Return x**y = 2**n*exp(y'*log2)
  *
  * Special cases:
  *	1.  (anything) ** 0  is 1
  *	2.  (anything) ** 1  is itself
- *	3.  (anything) ** NAN is NAN
+ *	3.  (anything) ** NAN is NAN except 1 ** NAN = 1
  *	4.  NAN ** (anything except 0) is NAN
  *	5.  +-(|x| > 1) **  +INF is +INF
  *	6.  +-(|x| > 1) **  -INF is +0
  *	7.  +-(|x| < 1) **  +INF is +0
  *	8.  +-(|x| < 1) **  -INF is +INF
- *	9.  +-1         ** +-INF is NAN
+ *	9.  +-1         ** +-INF is 1
  *	10. +0 ** (+anything except 0, NAN)               is +0
  *	11. -0 ** (+anything except 0, NAN, odd integer)  is +0
  *	12. +0 ** (-anything except 0, NAN)               is +INF
@@ -141,7 +141,7 @@ __ieee754_pow(double x, double y)
 	if(ly==0) { 	
 	    if (iy==0x7ff00000) {	/* y is +-inf */
 	        if(((ix-0x3ff00000)|lx)==0)
-		    return  one;	/* (-1)**+-inf is NaN */
+		    return  one;	/* (-1)**+-inf is 1 */
 	        else if (ix >= 0x3ff00000)/* (|x|>1)**+-inf = inf,0 */
 		    return (hy>=0)? y: zero;
 	        else			/* (|x|<1)**-,+inf = inf,0 */
diff --git a/lib/msun/src/imprecise.c b/lib/msun/src/imprecise.c
index 5bd3d642955b..92fb2d06e98a 100644
--- a/lib/msun/src/imprecise.c
+++ b/lib/msun/src/imprecise.c
@@ -60,7 +60,5 @@ DECLARE_WEAK(powl);
 	long double imprecise_ ## f ## l(long double v) { return f(v); }\
 	DECLARE_WEAK(f ## l)
 
-DECLARE_IMPRECISE(erfc);
-DECLARE_IMPRECISE(erf);
 DECLARE_IMPRECISE(lgamma);
 DECLARE_IMPRECISE(tgamma);
diff --git a/lib/msun/src/math.h b/lib/msun/src/math.h
index fc4becc98403..e4e5682c7d0f 100644
--- a/lib/msun/src/math.h
+++ b/lib/msun/src/math.h
@@ -69,10 +69,6 @@ extern const union __nan_un {
 #define	math_errhandling	MATH_ERREXCEPT
 
 #define	FP_FAST_FMAF	1
-#ifdef __ia64__
-#define	FP_FAST_FMA	1
-#define	FP_FAST_FMAL	1
-#endif
 
 /* Symbolic constants to classify floating point numbers. */
 #define	FP_INFINITE	0x01
@@ -453,6 +449,8 @@ long double	ceill(long double);
 long double	copysignl(long double, long double) __pure2;
 long double	coshl(long double);
 long double	cosl(long double);
+long double	erfcl(long double);
+long double	erfl(long double);
 long double	exp2l(long double);
 long double	expl(long double);
 long double	expm1l(long double);
@@ -467,6 +465,7 @@ long double	frexpl(long double value, int *); /* fundamentally !__pure2 */
 long double	hypotl(long double, long double);
 int		ilogbl(long double) __pure2;
 long double	ldexpl(long double, int);
+long double	lgammal(long double);
 long long	llrintl(long double);
 long long	llroundl(long double);
 long double	log10l(long double);
@@ -483,6 +482,7 @@ long double	nextafterl(long double, long double);
 double		nexttoward(double, long double);
 float		nexttowardf(float, long double);
 long double	nexttowardl(long double, long double);
+long double	powl(long double, long double);
 long double	remainderl(long double, long double);
 long double	remquol(long double, long double, int *);
 long double	rintl(long double);
@@ -494,33 +494,10 @@ long double	sinl(long double);
 long double	sqrtl(long double);
 long double	tanhl(long double);
 long double	tanl(long double);
+long double	tgammal(long double);
 long double	truncl(long double);
 
 #endif /* __ISO_C_VISIBLE >= 1999 */
 __END_DECLS
 
 #endif /* !_MATH_H_ */
-
-/* separate header for cmath */
-#ifndef _MATH_EXTRA_H_
-#if __ISO_C_VISIBLE >= 1999
-#if _DECLARE_C99_LDBL_MATH
-
-#define _MATH_EXTRA_H_
-
-/*
- * extra long double versions of math functions for C99 and cmath
- */
-__BEGIN_DECLS
-
-long double	erfcl(long double);
-long double	erfl(long double);
-long double	lgammal(long double);
-long double	powl(long double, long double);
-long double	tgammal(long double);
-
-__END_DECLS
-
-#endif /* !_DECLARE_C99_LDBL_MATH */
-#endif /* __ISO_C_VISIBLE >= 1999 */
-#endif /* !_MATH_EXTRA_H_ */
diff --git a/lib/msun/src/s_erf.c b/lib/msun/src/s_erf.c
index 854767bc913f..e1d63bca8197 100644
--- a/lib/msun/src/s_erf.c
+++ b/lib/msun/src/s_erf.c
@@ -111,18 +111,25 @@ __FBSDID("$FreeBSD$");
 #include "math.h"
 #include "math_private.h"
 
+/* XXX Prevent compilers from erroneously constant folding: */
+static const volatile double tiny= 1e-300;
+
 static const double
-tiny	    = 1e-300,
-half=  5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */
-one =  1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */
-two =  2.00000000000000000000e+00, /* 0x40000000, 0x00000000 */
-	/* c = (float)0.84506291151 */
+half= 0.5,
+one = 1,
+two = 2,
+/* c = (float)0.84506291151 */
 erx =  8.45062911510467529297e-01, /* 0x3FEB0AC1, 0x60000000 */
 /*
- * Coefficients for approximation to  erf on [0,0.84375]
+ * In the domain [0, 2**-28], only the first term in the power series
+ * expansion of erf(x) is used.  The magnitude of the first neglected
+ * terms is less than 2**-84.
  */
 efx =  1.28379167095512586316e-01, /* 0x3FC06EBA, 0x8214DB69 */
 efx8=  1.02703333676410069053e+00, /* 0x3FF06EBA, 0x8214DB69 */
+/*
+ * Coefficients for approximation to erf on [0,0.84375]
+ */
 pp0  =  1.28379167095512558561e-01, /* 0x3FC06EBA, 0x8214DB68 */
 pp1  = -3.25042107247001499370e-01, /* 0xBFD4CD7D, 0x691CB913 */
 pp2  = -2.84817495755985104766e-02, /* 0xBF9D2A51, 0xDBD7194F */
@@ -134,7 +141,7 @@ qq3  =  5.08130628187576562776e-03, /* 0x3F74D022, 0xC4D36B0F */
 qq4  =  1.32494738004321644526e-04, /* 0x3F215DC9, 0x221C1A10 */
 qq5  = -3.96022827877536812320e-06, /* 0xBED09C43, 0x42A26120 */
 /*
- * Coefficients for approximation to  erf  in [0.84375,1.25]
+ * Coefficients for approximation to erf in [0.84375,1.25]
  */
 pa0  = -2.36211856075265944077e-03, /* 0xBF6359B8, 0xBEF77538 */
 pa1  =  4.14856118683748331666e-01, /* 0x3FDA8D00, 0xAD92B34D */
@@ -150,7 +157,7 @@ qa4  =  1.26171219808761642112e-01, /* 0x3FC02660, 0xE763351F */
 qa5  =  1.36370839120290507362e-02, /* 0x3F8BEDC2, 0x6B51DD1C */
 qa6  =  1.19844998467991074170e-02, /* 0x3F888B54, 0x5735151D */
 /*
- * Coefficients for approximation to  erfc in [1.25,1/0.35]
+ * Coefficients for approximation to erfc in [1.25,1/0.35]
  */
 ra0  = -9.86494403484714822705e-03, /* 0xBF843412, 0x600D6435 */
 ra1  = -6.93858572707181764372e-01, /* 0xBFE63416, 0xE4BA7360 */
@@ -169,7 +176,7 @@ sa6  =  1.08635005541779435134e+02, /* 0x405B28A3, 0xEE48AE2C */
 sa7  =  6.57024977031928170135e+00, /* 0x401A47EF, 0x8E484A93 */
 sa8  = -6.04244152148580987438e-02, /* 0xBFAEEFF2, 0xEE749A62 */
 /*
- * Coefficients for approximation to  erfc in [1/.35,28]
+ * Coefficients for approximation to erfc in [1/.35,28]
  */
 rb0  = -9.86494292470009928597e-03, /* 0xBF843412, 0x39E86F4A */
 rb1  = -7.99283237680523006574e-01, /* 0xBFE993BA, 0x70C285DE */
@@ -222,15 +229,12 @@ erf(double x)
 	x = fabs(x);
  	s = one/(x*x);
 	if(ix< 0x4006DB6E) {	/* |x| < 1/0.35 */
-	    R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(
-				ra5+s*(ra6+s*ra7))))));
-	    S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(
-				sa5+s*(sa6+s*(sa7+s*sa8)))))));
+	    R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(ra5+s*(ra6+s*ra7))))));
+	    S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(sa5+s*(sa6+s*(sa7+
+		s*sa8)))))));
 	} else {	/* |x| >= 1/0.35 */
-	    R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(
-				rb5+s*rb6)))));
-	    S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(
-				sb5+s*(sb6+s*sb7))))));
+	    R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(rb5+s*rb6)))));
+	    S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(sb5+s*(sb6+s*sb7))))));
 	}
 	z  = x;
 	SET_LOW_WORD(z,0);
@@ -238,6 +242,10 @@ erf(double x)
 	if(hx>=0) return one-r/x; else return  r/x-one;
 }
 
+#if (LDBL_MANT_DIG == 53)
+__weak_reference(erf, erfl);
+#endif
+
 double
 erfc(double x)
 {
@@ -279,23 +287,23 @@ erfc(double x)
 	    x = fabs(x);
  	    s = one/(x*x);
 	    if(ix< 0x4006DB6D) {	/* |x| < 1/.35 ~ 2.857143*/
-	        R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(
-				ra5+s*(ra6+s*ra7))))));
-	        S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(
-				sa5+s*(sa6+s*(sa7+s*sa8)))))));
+		R=ra0+s*(ra1+s*(ra2+s*(ra3+s*(ra4+s*(ra5+s*(ra6+s*ra7))))));
+		S=one+s*(sa1+s*(sa2+s*(sa3+s*(sa4+s*(sa5+s*(sa6+s*(sa7+
+		    s*sa8)))))));
 	    } else {			/* |x| >= 1/.35 ~ 2.857143 */
 		if(hx<0&&ix>=0x40180000) return two-tiny;/* x < -6 */
-	        R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(
-				rb5+s*rb6)))));
-	        S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(
-				sb5+s*(sb6+s*sb7))))));
+		R=rb0+s*(rb1+s*(rb2+s*(rb3+s*(rb4+s*(rb5+s*rb6)))));
+		S=one+s*(sb1+s*(sb2+s*(sb3+s*(sb4+s*(sb5+s*(sb6+s*sb7))))));
 	    }
 	    z  = x;
 	    SET_LOW_WORD(z,0);
-	    r  =  __ieee754_exp(-z*z-0.5625)*
-			__ieee754_exp((z-x)*(z+x)+R/S);
+	    r  =  __ieee754_exp(-z*z-0.5625)*__ieee754_exp((z-x)*(z+x)+R/S);
 	    if(hx>0) return r/x; else return two-r/x;
 	} else {
 	    if(hx>0) return tiny*tiny; else return two-tiny;
 	}
 }
+
+#if (LDBL_MANT_DIG == 53)
+__weak_reference(erfc, erfcl);
+#endif
diff --git a/lib/msun/src/s_erff.c b/lib/msun/src/s_erff.c
index b97ca1d12356..d6cfbd227678 100644
--- a/lib/msun/src/s_erff.c
+++ b/lib/msun/src/s_erff.c
@@ -19,64 +19,63 @@ __FBSDID("$FreeBSD$");
 #include "math.h"
 #include "math_private.h"
 
+/* XXX Prevent compilers from erroneously constant folding: */
+static const volatile float tiny = 1e-30;
+
 static const float
-tiny	    = 1e-30,
-half=  5.0000000000e-01, /* 0x3F000000 */
-one =  1.0000000000e+00, /* 0x3F800000 */
-two =  2.0000000000e+00, /* 0x40000000 */
+half= 0.5,
+one = 1,
+two = 2,
+erx = 8.42697144e-01,			/* 0x3f57bb00 */
 /*
- * Coefficients for approximation to erf on [0,0.84375]
+ * In the domain [0, 2**-14], only the first term in the power series
+ * expansion of erf(x) is used.  The magnitude of the first neglected
+ * terms is less than 2**-42.
  */
-efx =  1.2837916613e-01, /* 0x3e0375d4 */
-efx8=  1.0270333290e+00, /* 0x3f8375d4 */
+efx = 1.28379166e-01, /* 0x3e0375d4 */
+efx8= 1.02703333e+00, /* 0x3f8375d4 */
 /*
- *  Domain [0, 0.84375], range ~[-5.4446e-10,5.5197e-10]:
- *  |(erf(x) - x)/x - p(x)/q(x)| < 2**-31.
+ * Domain [0, 0.84375], range ~[-5.4419e-10, 5.5179e-10]:
+ * |(erf(x) - x)/x - pp(x)/qq(x)| < 2**-31
  */
-pp0  =  1.28379166e-01F, /*  0x1.06eba8p-3 */
-pp1  = -3.36030394e-01F, /* -0x1.58185ap-2 */
-pp2  = -1.86260219e-03F, /* -0x1.e8451ep-10 */
-qq1  =  3.12324286e-01F, /*  0x1.3fd1f0p-2 */
-qq2  =  2.16070302e-02F, /*  0x1.620274p-6 */
-qq3  = -1.98859419e-03F, /* -0x1.04a626p-9 */
+pp0  =  1.28379166e-01, /* 0x3e0375d4 */
+pp1  = -3.36030394e-01, /* 0xbeac0c2d */
+pp2  = -1.86261395e-03, /* 0xbaf422f4 */
+qq1  =  3.12324315e-01, /* 0x3e9fe8f9 */
+qq2  =  2.16070414e-02, /* 0x3cb10140 */
+qq3  = -1.98859372e-03, /* 0xbb025311 */
 /*
- * Domain [0.84375, 1.25], range ~[-1.953e-11,1.940e-11]:
- * |(erf(x) - erx) - p(x)/q(x)| < 2**-36.
+ * Domain [0.84375, 1.25], range ~[-1.023e-9, 1.023e-9]:
+ * |(erf(x) - erx) - pa(x)/qa(x)| < 2**-31
  */
-erx  =  8.42697144e-01F, /*  0x1.af7600p-1.  erf(1) rounded to 16 bits. */
-pa0  =  3.64939137e-06F, /*  0x1.e9d022p-19 */
-pa1  =  4.15109694e-01F, /*  0x1.a91284p-2 */
-pa2  = -1.65179938e-01F, /* -0x1.5249dcp-3 */
-pa3  =  1.10914491e-01F, /*  0x1.c64e46p-4 */
-qa1  =  6.02074385e-01F, /*  0x1.344318p-1 */
-qa2  =  5.35934687e-01F, /*  0x1.126608p-1 */
-qa3  =  1.68576106e-01F, /*  0x1.593e6ep-3 */
-qa4  =  5.62181212e-02F, /*  0x1.cc89f2p-5 */
+pa0  =  3.65041046e-06, /* 0x3674f993 */
+pa1  =  4.15109307e-01, /* 0x3ed48935 */
+pa2  = -2.09395722e-01, /* 0xbe566bd5 */
+pa3  =  8.67677554e-02, /* 0x3db1b34b */
+qa1  =  4.95560974e-01, /* 0x3efdba2b */
+qa2  =  3.71248513e-01, /* 0x3ebe1449 */
+qa3  =  3.92478965e-02, /* 0x3d20c267 */
 /*
- * Domain [1.25,1/0.35], range ~[-7.043e-10,7.457e-10]:
- * |log(x*erfc(x)) + x**2 + 0.5625 - r(x)/s(x)| < 2**-30
+ * Domain [1.25,1/0.35], range ~[-4.821e-9, 4.927e-9]:
+ * |log(x*erfc(x)) + x**2 + 0.5625 - ra(x)/sa(x)| < 2**-28
  */
-ra0  = -9.87132732e-03F, /* -0x1.4376b2p-7 */
-ra1  = -5.53605914e-01F, /* -0x1.1b723cp-1 */
-ra2  = -2.17589188e+00F, /* -0x1.1683a0p+1 */
-ra3  = -1.43268085e+00F, /* -0x1.6ec42cp+0 */
-sa1  =  5.45995426e+00F, /*  0x1.5d6fe4p+2 */
-sa2  =  6.69798088e+00F, /*  0x1.acabb8p+2 */
-sa3  =  1.43113089e+00F, /*  0x1.6e5e98p+0 */
-sa4  = -5.77397496e-02F, /* -0x1.d90108p-5 */
+ra0  = -9.88156721e-03, /* 0xbc21e64c */
+ra1  = -5.43658376e-01, /* 0xbf0b2d32 */
+ra2  = -1.66828310e+00, /* 0xbfd58a4d */
+ra3  = -6.91554189e-01, /* 0xbf3109b2 */
+sa1  =  4.48581553e+00, /* 0x408f8bcd */
+sa2  =  4.10799170e+00, /* 0x408374ab */
+sa3  =  5.53855181e-01, /* 0x3f0dc974 */
 /*
- * Domain [1/0.35, 11], range ~[-2.264e-13,2.336e-13]:
- * |log(x*erfc(x)) + x**2 + 0.5625 - r(x)/s(x)| < 2**-42
+ * Domain [2.85715, 11], range ~[-1.484e-9, 1.505e-9]:
+ * |log(x*erfc(x)) + x**2 + 0.5625 - rb(x)/sb(x)| < 2**-30
  */
-rb0  = -9.86494310e-03F, /* -0x1.434124p-7 */
-rb1  = -6.25171244e-01F, /* -0x1.401672p-1 */
-rb2  = -6.16498327e+00F, /* -0x1.8a8f16p+2 */
-rb3  = -1.66696873e+01F, /* -0x1.0ab70ap+4 */
-rb4  = -9.53764343e+00F, /* -0x1.313460p+3 */
-sb1  =  1.26884899e+01F, /*  0x1.96081cp+3 */
-sb2  =  4.51839523e+01F, /*  0x1.6978bcp+5 */
-sb3  =  4.72810211e+01F, /*  0x1.7a3f88p+5 */
-sb4  =  8.93033314e+00F; /*  0x1.1dc54ap+3 */
+rb0  = -9.86496918e-03, /* 0xbc21a0ae */
+rb1  = -5.48049808e-01, /* 0xbf0c4cfe */
+rb2  = -1.84115684e+00, /* 0xbfebab07 */
+sb1  =  4.87132740e+00, /* 0x409be1ea */
+sb2  =  3.04982710e+00, /* 0x4043305e */
+sb3  = -7.61900663e-01; /* 0xbf430bec */
 
 float
 erff(float x)
@@ -85,9 +84,9 @@ erff(float x)
 	float R,S,P,Q,s,y,z,r;
 	GET_FLOAT_WORD(hx,x);
 	ix = hx&0x7fffffff;
-	if(ix>=0x7f800000) {		/* erf(nan)=nan */
+	if(ix>=0x7f800000) {		/* erff(nan)=nan */
 	    i = ((u_int32_t)hx>>31)<<1;
-	    return (float)(1-i)+one/x;	/* erf(+-inf)=+-1 */
+	    return (float)(1-i)+one/x;	/* erff(+-inf)=+-1 */
 	}
 
 	if(ix < 0x3f580000) {		/* |x|<0.84375 */
@@ -105,7 +104,7 @@ erff(float x)
 	if(ix < 0x3fa00000) {		/* 0.84375 <= |x| < 1.25 */
 	    s = fabsf(x)-one;
 	    P = pa0+s*(pa1+s*(pa2+s*pa3));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*qa4)));
+	    Q = one+s*(qa1+s*(qa2+s*qa3));
 	    if(hx>=0) return erx + P/Q; else return -erx - P/Q;
 	}
 	if (ix >= 0x40800000) {		/* inf>|x|>=4 */
@@ -113,12 +112,12 @@ erff(float x)
 	}
 	x = fabsf(x);
  	s = one/(x*x);
-	if(ix< 0x4036DB6E) {	/* |x| < 1/0.35 */
+	if(ix< 0x4036db8c) {	/* |x| < 2.85715 ~ 1/0.35 */
 	    R=ra0+s*(ra1+s*(ra2+s*ra3));
-	    S=one+s*(sa1+s*(sa2+s*(sa3+s*sa4)));
-	} else {	/* |x| >= 1/0.35 */
-	    R=rb0+s*(rb1+s*(rb2+s*(rb3+s*rb4)));
-	    S=one+s*(sb1+s*(sb2+s*(sb3+s*sb4)));
+	    S=one+s*(sa1+s*(sa2+s*sa3));
+	} else {	/* |x| >= 2.85715 ~ 1/0.35 */
+	    R=rb0+s*(rb1+s*rb2);
+	    S=one+s*(sb1+s*(sb2+s*sb3));
 	}
 	SET_FLOAT_WORD(z,hx&0xffffe000);
 	r  = expf(-z*z-0.5625F)*expf((z-x)*(z+x)+R/S);
@@ -132,8 +131,8 @@ erfcf(float x)
 	float R,S,P,Q,s,y,z,r;
 	GET_FLOAT_WORD(hx,x);
 	ix = hx&0x7fffffff;
-	if(ix>=0x7f800000) {			/* erfc(nan)=nan */
-						/* erfc(+-inf)=0,2 */
+	if(ix>=0x7f800000) {			/* erfcf(nan)=nan */
+						/* erfcf(+-inf)=0,2 */
 	    return (float)(((u_int32_t)hx>>31)<<1)+one/x;
 	}
 
@@ -155,7 +154,7 @@ erfcf(float x)
 	if(ix < 0x3fa00000) {		/* 0.84375 <= |x| < 1.25 */
 	    s = fabsf(x)-one;
 	    P = pa0+s*(pa1+s*(pa2+s*pa3));
-	    Q = one+s*(qa1+s*(qa2+s*(qa3+s*qa4)));
+	    Q = one+s*(qa1+s*(qa2+s*qa3));
 	    if(hx>=0) {
 	        z  = one-erx; return z - P/Q;
 	    } else {
@@ -165,13 +164,13 @@ erfcf(float x)
 	if (ix < 0x41300000) {		/* |x|<11 */
 	    x = fabsf(x);
  	    s = one/(x*x);
-	    if(ix< 0x4036DB6D) {	/* |x| < 1/.35 ~ 2.857143*/
-	        R=ra0+s*(ra1+s*(ra2+s*ra3));
-	        S=one+s*(sa1+s*(sa2+s*(sa3+s*sa4)));
-	    } else {			/* |x| >= 1/.35 ~ 2.857143 */
+	    if(ix< 0x4036db8c) {	/* |x| < 2.85715 ~ 1/.35 */
+		R=ra0+s*(ra1+s*(ra2+s*ra3));
+		S=one+s*(sa1+s*(sa2+s*sa3));
+	    } else {			/* |x| >= 2.85715 ~ 1/.35 */
 		if(hx<0&&ix>=0x40a00000) return two-tiny;/* x < -5 */
-	        R=rb0+s*(rb1+s*(rb2+s*(rb3+s*rb4)));
-		S=one+s*(sb1+s*(sb2+s*(sb3+s*sb4)));
+		R=rb0+s*(rb1+s*rb2);
+		S=one+s*(sb1+s*(sb2+s*sb3));
 	    }
 	    SET_FLOAT_WORD(z,hx&0xffffe000);
 	    r  = expf(-z*z-0.5625F)*expf((z-x)*(z+x)+R/S);
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 428ec80032e6..3c2e5d9ff596 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -55,7 +55,7 @@ HAVE_TERMIOS_H=		1
 HAVE_TERMIO_H=		0
 HAVE_VSSCANF=		1
 HEADER_STDBOOL=		1
-# XXX amd64, ia64 1L and int
+# XXX amd64 1L and int
 ONEUL=			1UL
 TYPEOF_CHTYPE=		long
 TYPEOF_MMASK_T=		long
diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
index fa7fabe8ddc4..a36d94d30a20 100644
--- a/libexec/atf/atf-check/Makefile
+++ b/libexec/atf/atf-check/Makefile
@@ -37,10 +37,8 @@ MAN=		atf-check.1
 
 CFLAGS+=	-I${ATF}
 
-LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/libatf-c++
-LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/libatf-c
 DPADD+=		${LIBATF_CXX} ${LIBATF_C}
-LDADD+=		-latf-c++ -latf-c
+LDADD+=		${LDATF_CXX} ${LDATF_C}
 USEPRIVATELIB=	atf-c++ atf-c
 
 .if ${MK_TESTS} != "no"
diff --git a/libexec/atf/atf-sh/Makefile b/libexec/atf/atf-sh/Makefile
index 3f461fdbe9ac..90a780cc7751 100644
--- a/libexec/atf/atf-sh/Makefile
+++ b/libexec/atf/atf-sh/Makefile
@@ -39,7 +39,7 @@ CFLAGS+=	-DHAVE_CONFIG_H
 CFLAGS+=	-I${ATF}
 
 DPADD+=		${LIBATF_C} ${LIBATF_CXX}
-LDADD+=		-latf-c++ -latf-c
+LDADD+=		${LDATF_C} ${LDATF_CXX}
 USEPRIVATELIB=	atf-c++ atf-c
 
 FILESGROUPS=	SUBR
diff --git a/libexec/atf/atf-sh/tests/Makefile b/libexec/atf/atf-sh/tests/Makefile
index c7a8ffbf5325..e71b6b53a6b4 100644
--- a/libexec/atf/atf-sh/tests/Makefile
+++ b/libexec/atf/atf-sh/tests/Makefile
@@ -10,12 +10,15 @@ ATF=		${.CURDIR:H:H:H:H}/contrib/atf
 ATF_TESTS_SH+=	atf_check_test
 ATF_TESTS_SH+=	config_test
 ATF_TESTS_SH+=	integration_test
-ATF_TESTS_SH_SED_integration_test= \
-    -e 's,/usr/bin/env *atf-sh,/usr/libexec/atf-sh,g'
 ATF_TESTS_SH+=	normalize_test
 ATF_TESTS_SH+=	tc_test
 ATF_TESTS_SH+=	tp_test
 
+integration_test: Makefile
+ATF_TESTS_SH_SED_integration_test= \
+    -e 's,atf_check,PATH=/usr/libexec:$${PATH} atf_check,g' \
+    -e 's,/usr/bin/env *atf-sh,/usr/libexec/atf-sh,g'
+
 SCRIPTS+=		misc_helpers
 SCRIPTSDIR_misc_helpers=${TESTSDIR}
 CLEANFILES+=		misc_helpers misc_helpers.tmp
diff --git a/libexec/bootpd/bootpd.8 b/libexec/bootpd/bootpd.8
index 78afa37756b6..d12480025325 100644
--- a/libexec/bootpd/bootpd.8
+++ b/libexec/bootpd/bootpd.8
@@ -279,7 +279,7 @@ DHCP Options and BOOTP Vendor Extensions
 .El
 .Sh AUTHORS
 This distribution is currently maintained by
-.An Walter L. Wimer Aq walt+@cmu.edu .
+.An Walter L. Wimer Aq Mt walt+@cmu.edu .
 .Pp
 The original BOOTP server was created by
 .An Bill Croft
@@ -299,12 +299,12 @@ Enhancements and bug-fixes have been contributed by:
 (in alphabetical order)
 .Pp
 .An -split
-.An Danny Backx Aq db@sunbim.be
-.An John Brezak Aq brezak@ch.hp.com
-.An Frank da Cruz Aq fdc@cc.columbia.edu
-.An David R. Linn Aq drl@vuse.vanderbilt.edu
-.An Jim McKim Aq mckim@lerc.nasa.gov
-.An Gordon W. Ross Aq gwr@mc.com
-.An Jason Zions Aq jazz@hal.com .
+.An Danny Backx Aq Mt db@sunbim.be
+.An John Brezak Aq Mt brezak@ch.hp.com
+.An Frank da Cruz Aq Mt fdc@cc.columbia.edu
+.An David R. Linn Aq Mt drl@vuse.vanderbilt.edu
+.An Jim McKim Aq Mt mckim@lerc.nasa.gov
+.An Gordon W. Ross Aq Mt gwr@mc.com
+.An Jason Zions Aq Mt jazz@hal.com .
 .Sh BUGS
 Individual host entries must not exceed 1024 characters.
diff --git a/libexec/bootpd/tools/bootptest/bootptest.8 b/libexec/bootpd/tools/bootptest/bootptest.8
index 888ff227f124..4ba27244ba57 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.8
+++ b/libexec/bootpd/tools/bootptest/bootptest.8
@@ -62,7 +62,7 @@ utility is a combination of original and derived works.
 The main program module
 .Pq Pa bootptest.c
 is original work by
-.An "Gordon W. Ross" Aq gwr@mc.com .
+.An Gordon W. Ross Aq Mt gwr@mc.com .
 The packet printing module
 .Pq Pa print\-bootp.c
 is a slightly modified
diff --git a/libexec/mknetid/mknetid.8 b/libexec/mknetid/mknetid.8
index e70dc0038d9f..08b8e74c844b 100644
--- a/libexec/mknetid/mknetid.8
+++ b/libexec/mknetid/mknetid.8
@@ -149,4 +149,4 @@ the default netid database file
 .Xr yp 8 ,
 .Xr yp_mkdb 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
diff --git a/libexec/mknetid/netid.5 b/libexec/mknetid/netid.5
index 011d8f507ec9..b2ec827b28c2 100644
--- a/libexec/mknetid/netid.5
+++ b/libexec/mknetid/netid.5
@@ -88,4 +88,4 @@ unix.jodie@kaka 0:jodie
 .Xr mknetid 8 ,
 .Xr yp 8
 .Sh AUTHORS
-.An Mats O Jansson Aq moj@stacken.kth.se
+.An Mats O Jansson Aq Mt moj@stacken.kth.se
diff --git a/libexec/pppoed/pppoed.8 b/libexec/pppoed/pppoed.8
index 2f783535b767..6841bfda4733 100644
--- a/libexec/pppoed/pppoed.8
+++ b/libexec/pppoed/pppoed.8
@@ -206,7 +206,7 @@ and the following to
 The
 .Nm
 utility was written by
-.An Brian Somers Aq brian@Awfulhak.org
+.An Brian Somers Aq Mt brian@Awfulhak.org
 and first appeared in
 .Fx 3.4 .
 .Sh BUGS
diff --git a/libexec/revnetgroup/revnetgroup.8 b/libexec/revnetgroup/revnetgroup.8
index f48c327508d8..a17d9669e9dc 100644
--- a/libexec/revnetgroup/revnetgroup.8
+++ b/libexec/revnetgroup/revnetgroup.8
@@ -156,4 +156,4 @@ master server
 .Xr yp 8 ,
 .Xr yp_mkdb 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index ba13778f4ef9..48e86f77ca9e 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -80,5 +80,9 @@ beforeinstall:
 
 NO_PIE=	yes
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.symver.mk>
 .include <bsd.prog.mk>
diff --git a/libexec/rtld-elf/arm/rtld_start.S b/libexec/rtld-elf/arm/rtld_start.S
index 7a4fae4f0172..c48280815c33 100644
--- a/libexec/rtld-elf/arm/rtld_start.S
+++ b/libexec/rtld-elf/arm/rtld_start.S
@@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$");
  *	lr = &GOT[2]
  */
 _rtld_bind_start:
-	stmdb	sp!,{r0-r4,sl,fp}
+	stmdb	sp!,{r0-r5,sl,fp}
 
 	sub	r1, ip, lr		/* r1 = 4 * (n + 1) */
 	sub	r1, r1, #4		/* r1 = 4 * n */
@@ -86,11 +86,14 @@ _rtld_bind_start:
 	ldr	r0, [lr, #-4]		/* get obj ptr from GOT[1] */
 	mov	r4, ip			/* save GOT location */
 
+	mov	r5, sp			/* Save the stack pointer */
+	bic	sp, sp, #7		/* Align the stack pointer */
 	bl	_rtld_bind		/* Call the binder */
+	mov	sp, r5			/* Restore the old stack pointer */
 
 	str	r0, [r4]		/* save address in GOT */
 	mov	ip, r0			/* save new address */
 
-	ldmia	sp!,{r0-r4,sl,fp,lr}	/* restore the stack */
+	ldmia	sp!,{r0-r5,sl,fp,lr}	/* restore the stack */
 	mov	pc, ip			/* jump to the new address */
 
diff --git a/libexec/rtld-elf/ia64/Makefile.inc b/libexec/rtld-elf/ia64/Makefile.inc
deleted file mode 100644
index e8c0da7a1d7e..000000000000
--- a/libexec/rtld-elf/ia64/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-# $FreeBSD$
diff --git a/libexec/rtld-elf/ia64/reloc.c b/libexec/rtld-elf/ia64/reloc.c
deleted file mode 100644
index 1a41cb3cf8d2..000000000000
--- a/libexec/rtld-elf/ia64/reloc.c
+++ /dev/null
@@ -1,658 +0,0 @@
-/*-
- * Copyright 1996, 1997, 1998, 1999 John D. Polstra.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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$
- */
-
-/*
- * Dynamic linker for ELF.
- *
- * John Polstra <jdp@polstra.com>.
- */
-
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <machine/ia64_cpu.h>
-
-#include <dlfcn.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "debug.h"
-#include "rtld.h"
-
-extern Elf_Dyn _DYNAMIC;
-
-/*
- * Macros for loading/storing unaligned 64-bit values.  These are
- * needed because relocations can point to unaligned data.  This
- * occurs in the DWARF2 exception frame tables generated by the
- * compiler, for instance.
- *
- * We don't use these when relocating jump slots and GOT entries,
- * since they are guaranteed to be aligned.
- *
- * XXX dfr stub for now.
- */
-#define load64(p)	(*(u_int64_t *) (p))
-#define store64(p, v)	(*(u_int64_t *) (p) = (v))
-
-/* Allocate an @fptr. */
-
-#define FPTR_CHUNK_SIZE		64
-
-struct fptr_chunk {
-	struct fptr fptrs[FPTR_CHUNK_SIZE];
-};
-
-static struct fptr_chunk first_chunk;
-static struct fptr_chunk *current_chunk = &first_chunk;
-static struct fptr *next_fptr = &first_chunk.fptrs[0];
-static struct fptr *last_fptr = &first_chunk.fptrs[FPTR_CHUNK_SIZE];
-
-/*
- * We use static storage initially so that we don't have to call
- * malloc during init_rtld().
- */
-static struct fptr *
-alloc_fptr(Elf_Addr target, Elf_Addr gp)
-{
-	struct fptr* fptr;
-
-	if (next_fptr == last_fptr) {
-		current_chunk = xmalloc(sizeof(struct fptr_chunk));
-		next_fptr = &current_chunk->fptrs[0];
-		last_fptr = &current_chunk->fptrs[FPTR_CHUNK_SIZE];
-	}
-	fptr = next_fptr;
-	next_fptr++;
-	fptr->target = target;
-	fptr->gp = gp;
-	return fptr;
-}
-
-static struct fptr **
-alloc_fptrs(Obj_Entry *obj, bool mapped)
-{
-	struct fptr **fptrs;
-	size_t fbytes;
-
-	fbytes = obj->dynsymcount * sizeof(struct fptr *);
-
-	/*
-	 * Avoid malloc, if requested. Happens when relocating
-	 * rtld itself on startup.
-	 */
-	if (mapped) {
-		fptrs = mmap(NULL, fbytes, PROT_READ|PROT_WRITE,
-	    	    MAP_ANON, -1, 0);
-		if (fptrs == MAP_FAILED)
-			fptrs = NULL;
-	} else {
-		fptrs = xcalloc(1, fbytes);
-	}
-
-	/*
-	 * This assertion is necessary to guarantee function pointer
-	 * uniqueness
- 	 */
-	assert(fptrs != NULL);
-
-	return (obj->priv = fptrs);
-}
-
-static void
-free_fptrs(Obj_Entry *obj, bool mapped)
-{
-	struct fptr **fptrs;
-	size_t fbytes;
-
-	fptrs  = obj->priv;
-	if (fptrs == NULL)
-		return;
-
-	fbytes = obj->dynsymcount * sizeof(struct fptr *);
-	if (mapped)
-		munmap(fptrs, fbytes);
-	else
-		free(fptrs);
-	obj->priv = NULL;
-}
-
-/* Relocate a non-PLT object with addend. */
-static int
-reloc_non_plt_obj(Obj_Entry *obj_rtld, Obj_Entry *obj, const Elf_Rela *rela,
-    SymCache *cache, int flags, RtldLockState *lockstate)
-{
-	struct fptr **fptrs;
-	Elf_Addr *where = (Elf_Addr *) (obj->relocbase + rela->r_offset);
-
-	switch (ELF_R_TYPE(rela->r_info)) {
-	case R_IA_64_REL64LSB:
-		/*
-		 * We handle rtld's relocations in rtld_start.S
-		 */
-		if (obj != obj_rtld)
-			store64(where,
-				load64(where) + (Elf_Addr) obj->relocbase);
-		break;
-
-	case R_IA_64_DIR64LSB: {
-		const Elf_Sym *def;
-		const Obj_Entry *defobj;
-		Elf_Addr target;
-
-		def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		    flags, cache, lockstate);
-		if (def == NULL)
-			return -1;
-
-		target = (def->st_shndx != SHN_UNDEF)
-		    ? (Elf_Addr)(defobj->relocbase + def->st_value) : 0;
-		store64(where, target + rela->r_addend);
-		break;
-	}
-
-	case R_IA_64_FPTR64LSB: {
-		/*
-		 * We have to make sure that all @fptr references to
-		 * the same function are identical so that code can
-		 * compare function pointers.
-		 */
-		const Elf_Sym *def;
-		const Obj_Entry *defobj;
-		struct fptr *fptr = 0;
-		Elf_Addr target, gp;
-		int sym_index;
-
-		def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		    SYMLOOK_IN_PLT | flags, cache, lockstate);
-		if (def == NULL) {
-			/*
-			 * XXX r_debug_state is problematic and find_symdef()
-			 * returns NULL for it. This probably has something to
-			 * do with symbol versioning (r_debug_state is in the
-			 * symbol map). If we return -1 in that case we abort
-			 * relocating rtld, which typically is fatal. So, for
-			 * now just skip the symbol when we're relocating
-			 * rtld. We don't care about r_debug_state unless we
-			 * are being debugged.
-			 */
-			if (obj != obj_rtld)
-				return -1;
-			break;
-		}
-
-		if (def->st_shndx != SHN_UNDEF) {
-			target = (Elf_Addr)(defobj->relocbase + def->st_value);
-			gp = (Elf_Addr)defobj->pltgot;
-
-			/* rtld is allowed to reference itself only */
-			assert(!obj->rtld || obj == defobj);
-			fptrs = defobj->priv;
-			if (fptrs == NULL)
-				fptrs = alloc_fptrs((Obj_Entry *) defobj, 
-				    obj->rtld);
-
-			sym_index = def - defobj->symtab;
-
-			/*
-			 * Find the @fptr, using fptrs as a helper.
-			 */
-			if (fptrs)
-				fptr = fptrs[sym_index];
-			if (!fptr) {
-				fptr = alloc_fptr(target, gp);
-				if (fptrs)
-					fptrs[sym_index] = fptr;
-			}
-		} else
-			fptr = NULL;
-
-		store64(where, (Elf_Addr)fptr);
-		break;
-	}
-
-	case R_IA_64_IPLTLSB: {
-		/*
-		 * Relocation typically used to populate C++ virtual function
-		 * tables. It creates a 128-bit function descriptor at the
-		 * specified memory address.
-		 */
-		const Elf_Sym *def;
-		const Obj_Entry *defobj;
-		struct fptr *fptr;
-		Elf_Addr target, gp;
-
-		def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		    flags, cache, lockstate);
-		if (def == NULL)
-			return -1;
-
-		if (def->st_shndx != SHN_UNDEF) {
-			target = (Elf_Addr)(defobj->relocbase + def->st_value);
-			gp = (Elf_Addr)defobj->pltgot;
-		} else {
-			target = 0;
-			gp = 0;
-		}
-
-		fptr = (void*)where;
-		store64(&fptr->target, target);
-		store64(&fptr->gp, gp);
-		break;
-	}
-
-	case R_IA_64_DTPMOD64LSB: {
-		const Elf_Sym *def;
-		const Obj_Entry *defobj;
-
-		def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		    flags, cache, lockstate);
-		if (def == NULL)
-			return -1;
-
-		store64(where, defobj->tlsindex);
-		break;
-	}
-
-	case R_IA_64_DTPREL64LSB: {
-		const Elf_Sym *def;
-		const Obj_Entry *defobj;
-
-		def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		    flags, cache, lockstate);
-		if (def == NULL)
-			return -1;
-
-		store64(where, def->st_value + rela->r_addend);
-		break;
-	}
-
-	case R_IA_64_TPREL64LSB: {
-		const Elf_Sym *def;
-		const Obj_Entry *defobj;
-
-		def = find_symdef(ELF_R_SYM(rela->r_info), obj, &defobj,
-		    flags, cache, lockstate);
-		if (def == NULL)
-			return -1;
-
-		/*
-		 * We lazily allocate offsets for static TLS as we
-		 * see the first relocation that references the
-		 * TLS block. This allows us to support (small
-		 * amounts of) static TLS in dynamically loaded
-		 * modules. If we run out of space, we generate an
-		 * error.
-		 */
-		if (!defobj->tls_done) {
-			if (!allocate_tls_offset((Obj_Entry*) defobj)) {
-				_rtld_error("%s: No space available for static "
-				    "Thread Local Storage", obj->path);
-				return -1;
-			}
-		}
-
-		store64(where, defobj->tlsoffset + def->st_value + rela->r_addend);
-		break;
-	}
-
-	case R_IA_64_NONE:
-		break;
-
-	default:
-		_rtld_error("%s: Unsupported relocation type %u"
-			    " in non-PLT relocations\n", obj->path,
-			    (unsigned int)ELF_R_TYPE(rela->r_info));
-		return -1;
-	}
-
-	return(0);
-}
-
-/* Process the non-PLT relocations. */
-int
-reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, int flags,
-    RtldLockState *lockstate)
-{
-	const Elf_Rel *rellim;
-	const Elf_Rel *rel;
-	const Elf_Rela *relalim;
-	const Elf_Rela *rela;
-	SymCache *cache;
-	int bytes = obj->dynsymcount * sizeof(SymCache);
-	int r = -1;
-
-	/*
-	 * The dynamic loader may be called from a thread, we have
-	 * limited amounts of stack available so we cannot use alloca().
-	 */
-	cache = mmap(NULL, bytes, PROT_READ|PROT_WRITE, MAP_ANON, -1, 0);
-	if (cache == MAP_FAILED)
-		cache = NULL;
-
-	/* Perform relocations without addend if there are any: */
-	rellim = (const Elf_Rel *) ((caddr_t) obj->rel + obj->relsize);
-	for (rel = obj->rel;  obj->rel != NULL && rel < rellim;  rel++) {
-		Elf_Rela locrela;
-
-		locrela.r_info = rel->r_info;
-		locrela.r_offset = rel->r_offset;
-		locrela.r_addend = 0;
-		if (reloc_non_plt_obj(obj_rtld, obj, &locrela, cache, flags,
-		    lockstate))
-			goto done;
-	}
-
-	/* Perform relocations with addend if there are any: */
-	relalim = (const Elf_Rela *) ((caddr_t) obj->rela + obj->relasize);
-	for (rela = obj->rela;  obj->rela != NULL && rela < relalim;  rela++) {
-		if (reloc_non_plt_obj(obj_rtld, obj, rela, cache, flags,
-		    lockstate))
-			goto done;
-	}
-
-	r = 0;
-done:
-	if (cache)
-		munmap(cache, bytes);
-
-	/*
-	 * Release temporarily mapped fptrs if relocating
-	 * rtld object itself. A new table will be created
-	 * in make_function_pointer using malloc when needed.
-	 */
-	if (obj->rtld && obj->priv)
-		free_fptrs(obj, true);
-
-	return (r);
-}
-
-/* Process the PLT relocations. */
-int
-reloc_plt(Obj_Entry *obj)
-{
-	/* All PLT relocations are the same kind: Elf_Rel or Elf_Rela. */
-	if (obj->pltrelsize != 0) {
-		const Elf_Rel *rellim;
-		const Elf_Rel *rel;
-
-		rellim = (const Elf_Rel *)
-			((char *)obj->pltrel + obj->pltrelsize);
-		for (rel = obj->pltrel;  rel < rellim;  rel++) {
-			Elf_Addr *where;
-
-			assert(ELF_R_TYPE(rel->r_info) == R_IA_64_IPLTLSB);
-
-			/* Relocate the @fptr pointing into the PLT. */
-			where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
-			*where += (Elf_Addr)obj->relocbase;
-		}
-	} else {
-		const Elf_Rela *relalim;
-		const Elf_Rela *rela;
-
-		relalim = (const Elf_Rela *)
-			((char *)obj->pltrela + obj->pltrelasize);
-		for (rela = obj->pltrela;  rela < relalim;  rela++) {
-			Elf_Addr *where;
-
-			assert(ELF_R_TYPE(rela->r_info) == R_IA_64_IPLTLSB);
-
-			/* Relocate the @fptr pointing into the PLT. */
-			where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
-			*where += (Elf_Addr)obj->relocbase;
-		}
-	}
-	return 0;
-}
-
-int
-reloc_iresolve(Obj_Entry *obj, struct Struct_RtldLockState *lockstate)
-{
-
-	/* XXX not implemented */
-	return (0);
-}
-
-int
-reloc_gnu_ifunc(Obj_Entry *obj, int flags,
-    struct Struct_RtldLockState *lockstate)
-{
-
-	/* XXX not implemented */
-	return (0);
-}
-
-/* Relocate the jump slots in an object. */
-int
-reloc_jmpslots(Obj_Entry *obj, int flags, RtldLockState *lockstate)
-{
-	if (obj->jmpslots_done)
-		return 0;
-	/* All PLT relocations are the same kind: Elf_Rel or Elf_Rela. */
-	if (obj->pltrelsize != 0) {
-		const Elf_Rel *rellim;
-		const Elf_Rel *rel;
-
-		rellim = (const Elf_Rel *)
-			((char *)obj->pltrel + obj->pltrelsize);
-		for (rel = obj->pltrel;  rel < rellim;  rel++) {
-			Elf_Addr *where;
-			const Elf_Sym *def;
-			const Obj_Entry *defobj;
-
-			assert(ELF_R_TYPE(rel->r_info) == R_IA_64_IPLTLSB);
-			where = (Elf_Addr *)(obj->relocbase + rel->r_offset);
-			def = find_symdef(ELF_R_SYM(rel->r_info), obj,
-			    &defobj, SYMLOOK_IN_PLT | flags, NULL, lockstate);
-			if (def == NULL)
-				return -1;
-			reloc_jmpslot(where,
-				      (Elf_Addr)(defobj->relocbase
-						 + def->st_value),
-				      defobj, obj, rel);
-		}
-	} else {
-		const Elf_Rela *relalim;
-		const Elf_Rela *rela;
-
-		relalim = (const Elf_Rela *)
-			((char *)obj->pltrela + obj->pltrelasize);
-		for (rela = obj->pltrela;  rela < relalim;  rela++) {
-			Elf_Addr *where;
-			const Elf_Sym *def;
-			const Obj_Entry *defobj;
-
-			where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
-			def = find_symdef(ELF_R_SYM(rela->r_info), obj,
-			    &defobj, SYMLOOK_IN_PLT | flags, NULL, lockstate);
-			if (def == NULL)
-				return -1;
-			reloc_jmpslot(where,
-				      (Elf_Addr)(defobj->relocbase
-						 + def->st_value),
-				      defobj, obj, (Elf_Rel *)rela);
-		}
-	}
-	obj->jmpslots_done = true;
-	return 0;
-}
-
-/* Fixup the jump slot at "where" to transfer control to "target". */
-Elf_Addr
-reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const Obj_Entry *obj,
-	      const Obj_Entry *refobj, const Elf_Rel *rel)
-{
-	Elf_Addr stubaddr;
-
-	dbg(" reloc_jmpslot: where=%p, target=%p, gp=%p",
-	    (void *)where, (void *)target, (void *)obj->pltgot);
-	stubaddr = *where;
-	if (stubaddr != target) {
-
-		/*
-		 * Point this @fptr directly at the target. Update the
-		 * gp value first so that we don't break another cpu
-		 * which is currently executing the PLT entry.
-		 */
-		where[1] = (Elf_Addr) obj->pltgot;
-		ia64_mf();
-		where[0] = target;
-		ia64_mf();
-	}
-
-	/*
-	 * The caller needs an @fptr for the adjusted entry. The PLT
-	 * entry serves this purpose nicely.
-	 */
-	return (Elf_Addr) where;
-}
-
-/*
- * XXX ia64 doesn't seem to have copy relocations.
- *
- * Returns 0 on success, -1 on failure.
- */
-int
-do_copy_relocations(Obj_Entry *dstobj)
-{
-
-	return 0;
-}
-
-/*
- * Return the @fptr representing a given function symbol.
- */
-void *
-make_function_pointer(const Elf_Sym *sym, const Obj_Entry *obj)
-{
-	struct fptr **fptrs = obj->priv;
-	int index = sym - obj->symtab;
-
-	if (!fptrs) {
-		/*
-		 * This should only happen for something like
-		 * dlsym("dlopen"). Actually, I'm not sure it can ever 
-		 * happen.
-		 */
-		fptrs = alloc_fptrs((Obj_Entry *) obj, false);
-	}
-	if (!fptrs[index]) {
-		Elf_Addr target, gp;
-		target = (Elf_Addr) (obj->relocbase + sym->st_value);
-		gp = (Elf_Addr) obj->pltgot;
-		fptrs[index] = alloc_fptr(target, gp);
-	}
-	return fptrs[index];
-}
-
-void
-call_initfini_pointer(const Obj_Entry *obj, Elf_Addr target)
-{
-	struct fptr fptr;
-
-	fptr.gp = (Elf_Addr) obj->pltgot;
-	fptr.target = target;
-	dbg(" initfini: target=%p, gp=%p",
-	    (void *) fptr.target, (void *) fptr.gp);
-	((InitFunc) &fptr)();
-}
-
-void
-call_init_pointer(const Obj_Entry *obj, Elf_Addr target)
-{
-	struct fptr fptr;
-
-	fptr.gp = (Elf_Addr) obj->pltgot;
-	fptr.target = target;
-	dbg(" initfini: target=%p, gp=%p",
-	    (void *) fptr.target, (void *) fptr.gp);
-	((InitArrFunc) &fptr)(main_argc, main_argv, environ);
-}
-
-/* Initialize the special PLT entries. */
-void
-init_pltgot(Obj_Entry *obj)
-{
-	const Elf_Dyn *dynp;
-	Elf_Addr *pltres = 0;
-
-	/*
-	 * When there are no PLT relocations, the DT_IA_64_PLT_RESERVE entry
-	 * is bogus. Do not setup the BOR pointers in that case. An example
-	 * of where this happens is /usr/lib/libxpg4.so.3.
-	 */
-	if (obj->pltrelasize == 0 && obj->pltrelsize == 0)
-		return;
-
-	/*
-	 * Find the PLT RESERVE section.
-	 */
-	for (dynp = obj->dynamic;  dynp->d_tag != DT_NULL;  dynp++) {
-		if (dynp->d_tag == DT_IA_64_PLT_RESERVE)
-			pltres = (u_int64_t *)
-				(obj->relocbase + dynp->d_un.d_ptr);
-	}
-	if (!pltres)
-		errx(1, "Can't find DT_IA_64_PLT_RESERVE entry");
-
-	/*
-	 * The PLT RESERVE section is used to get values to pass to
-	 * _rtld_bind when lazy binding.
-	 */
-	pltres[0] = (Elf_Addr) obj;
-	pltres[1] = FPTR_TARGET(_rtld_bind_start);
-	pltres[2] = FPTR_GP(_rtld_bind_start);
-}
-
-void
-allocate_initial_tls(Obj_Entry *list)
-{
-    void *tpval;
-
-    /*
-     * Fix the size of the static TLS block by using the maximum
-     * offset allocated so far and adding a bit for dynamic modules to
-     * use.
-     */
-    tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA;
-
-    tpval = allocate_tls(list, NULL, TLS_TCB_SIZE, 16);
-    __asm __volatile("mov r13 = %0" :: "r"(tpval));
-}
-
-void *__tls_get_addr(unsigned long module, unsigned long offset)
-{
-    register Elf_Addr** tp __asm__("r13");
-
-    return tls_get_addr_common(tp, module, offset);
-}
diff --git a/libexec/rtld-elf/ia64/rtld_machdep.h b/libexec/rtld-elf/ia64/rtld_machdep.h
deleted file mode 100644
index 4a68ff79d1ad..000000000000
--- a/libexec/rtld-elf/ia64/rtld_machdep.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000 John D. Polstra.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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 RTLD_MACHDEP_H
-#define RTLD_MACHDEP_H	1
-
-#include <sys/types.h>
-#include <machine/atomic.h>
-
-/*
- * Macros for cracking ia64 function pointers.
- */
-struct fptr {
-	Elf_Addr	target;
-	Elf_Addr	gp;
-};
-
-#define FPTR_TARGET(f)	(((struct fptr *) (f))->target)
-#define FPTR_GP(f)	(((struct fptr *) (f))->gp)
-
-/* Return the address of the .dynamic section in the dynamic linker. */
-#define rtld_dynamic(obj)	(&_DYNAMIC)
-
-struct Struct_Obj_Entry;
-
-Elf_Addr reloc_jmpslot(Elf_Addr *, Elf_Addr, const struct Struct_Obj_Entry *,
-		       const struct Struct_Obj_Entry *, const Elf_Rel *);
-void *make_function_pointer(const Elf_Sym *, const struct Struct_Obj_Entry *);
-void call_initfini_pointer(const struct Struct_Obj_Entry *, Elf_Addr);
-void call_init_pointer(const struct Struct_Obj_Entry *, Elf_Addr);
-
-#define	TLS_TCB_SIZE	16
-
-#define round(size, align) \
-	(((size) + (align) - 1) & ~((align) - 1))
-#define calculate_first_tls_offset(size, align) \
-	round(TLS_TCB_SIZE, align)
-#define calculate_tls_offset(prev_offset, prev_size, size, align) \
-	round(prev_offset + prev_size, align)
-#define calculate_tls_end(off, size) 	((off) + (size))
-
-extern void *__tls_get_addr(unsigned long module, unsigned long offset);
-
-#define	RTLD_DEFAULT_STACK_PF_EXEC	0
-#define	RTLD_DEFAULT_STACK_EXEC		0
-
-#endif
diff --git a/libexec/rtld-elf/ia64/rtld_start.S b/libexec/rtld-elf/ia64/rtld_start.S
deleted file mode 100644
index f41e5e51bd2b..000000000000
--- a/libexec/rtld-elf/ia64/rtld_start.S
+++ /dev/null
@@ -1,252 +0,0 @@
-/* $FreeBSD$	*/
-/*	From: NetBSD: rtld_start.S,v 1.1 1996/12/16 20:38:09 cgd Exp 	*/
-
-/*
- * Copyright 1996 Matt Thomas <matt@3am-software.com>
- * Copyright 2000 John D. Polstra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-ENTRY(_rtld_start, 0)
-	alloc	r2=ar.pfs,3,0,3,0
-	;;
-1:	mov	r14=ip			// calculate gp
-	addl	r3=@gprel(1b),r0
-	;;
-	sub	gp=r14,r3
-	;;
-	.section .sdata
-2:	data4	@ltv(1b)		// unrelocated address of 1b
-	.align	8
-	.previous
-	add	r15=@gprel(2b),gp
-	;;
-	ld8	r15=[r15]
-	;;
-	sub	out0=r14,r15		// out0 is image base address
-	br.call.sptk.many rp=_rtld_reloc // fixup image
-
-	add	sp=-16,sp		// 16 bytes for us, 16 for _rtld
-	;;
-	mov	out0=in0
-	add	out1=16,sp		// address for exit proc
-	add	out2=24,sp		// address for obj_main
-
-	br.call.sptk.many rp=_rtld	// r8=_rtld(sp, &exit_proc, &obj_main)
-
-	add	r16=16,sp		// address for exit proc
-	;;
-	ld8	r15=[r16]		// read exit proc
-	add	sp=16,sp		// readjust stack
-	mov	b7=r8			// address of real _start
-	;;
-	alloc	r2=ar.pfs,0,0,3,0	// dump register frame
-	mov	out2=r15
-	;;
-	br.call.sptk.many rp=b7		// transfer to main program
-	br.call.sptk.many rp=exit	// die
-END(_rtld_start)
-
-/*
- * _rtld_bind_start:	lookup a lazy binding and transfer to real target
- *
- * Arguments:
- *	r1	gp value for rtld
- *	r15	Index in plt
- *	r16	Obj_Entry of caller
- *	in0-in7	Arguments for target procedure
- *	rp	Return address back to caller
- */
-ENTRY(_rtld_bind_start, 0)
-{ .mii
-	alloc	loc0=ar.pfs,8,6,3,0	// space to save r8-r11
-	add	r17=16-8*16,sp		// leave 16 bytes for _rtld_bind
-	add	r18=32-8*16,sp
-	;;
-} { .mii
-	mov	loc2=r8			// structure return address
-	add	sp=-8*16,sp		// space to save f8-f15
-	mov	loc1=rp
-	;;
-} { .mii
-	stf.spill [r17]=f8,32		// save float arguments
-	mov	loc3=r9			// language specific
-	mov	loc4=r10		// language specific
-} { .mii
-	stf.spill [r18]=f9,32
-	mov	loc5=r11		// language specific
-	shl	out1=r15,4		// 16 * index
-	;;
-} { .mmi
-	stf.spill [r17]=f10,32
-	stf.spill [r18]=f11,32
-	mov	out0=r16		// Obj_Entry for caller
-	;;
-} { .mmi
-	stf.spill [r17]=f12,32
-	stf.spill [r18]=f13,32
-	shladd	out1=r15,3,out1		// rela offset = 24 * index
-	;;
-} { .mmb
-	stf.spill [r17]=f14,32
-	stf.spill [r18]=f15,32
-	br.call.sptk.many rp=_rtld_bind
-} { .mii
-	ld8	r14=[r8],8		// target address
-	add	r17=16,sp
-	add	r18=32,sp
-	;;
-} { .mii
-	ld8	r1=[r8]			// target gp
-	mov	ar.pfs=loc0		// clean up
-	mov	rp=loc1
-} { .mmi
-	ldf.fill f8=[r17],32		// restore float arguments
-	ldf.fill f9=[r18],32
-	mov	r8=loc2			// restore structure pointer
-	;;
-} { .mmi
-	ldf.fill f10=[r17],32
-	ldf.fill f11=[r18],32
-	mov	r9=loc3
-	;;
-} { .mmi
-	ldf.fill f12=[r17],32
-	ldf.fill f13=[r18],32
-	mov	r10=loc4
-	;;
-} { .mmi
-	ldf.fill f14=[r17],32
-	ldf.fill f15=[r18],32
-	mov	r11=loc5
-	;;
-} { .mii
-	nop.m	0
-	mov	b7=r14
-	add	sp=8*16,sp
-	;;
-} { .mib
-	alloc	r14=ar.pfs,0,0,8,0	// drop our register frame
-	nop.i	0
-	br.sptk.many b7			// jump to target
-}
-END(_rtld_bind_start)
-
-#define DT_NULL		0	/* Terminating entry. */
-#define DT_RELA		7	/* Address of ElfNN_Rela relocations. */
-#define DT_RELASZ	8	/* Total size of ElfNN_Rela relocations. */
-#define DT_RELAENT	9	/* Size of each ElfNN_Rela relocation entry. */
-
-#define R_IA_64_NONE		0	/* None */
-#define R_IA_64_DIR64LSB	0x27	/* word64 LSB	S + A */
-#define R_IA_64_REL64LSB	0x6f	/* word64 LSB	BD + A */
-
-/*
- * _rtld_reloc:	relocate the rtld image, apart from @fptrs.
- *
- * Assumes that rtld was linked at zero and that we only need to
- * handle REL64LSB and DIR64LSB relocations.
- *
- * Arguments:
- *	r1	gp value for rtld
- *	in0	rtld base address
- */
-STATIC_ENTRY(_rtld_reloc, 1)
-	alloc	loc0=ar.pfs,1,2,0,0
-	mov	loc1=rp
-	;;
-	movl	r15=@gprel(_DYNAMIC)	// find _DYNAMIC etc.
-	;;
-	add	r15=r15,gp		// relocate _DYNAMIC etc.
-	;;
-1:	ld8	r16=[r15],8		// read r15->d_tag
-	;;
-	ld8	r17=[r15],8		// and r15->d_val
-	;;
-	cmp.eq	p6,p0=DT_NULL,r16	// done?
-(p6)	br.cond.dpnt.few 2f
-	;;
-	cmp.eq	p6,p0=DT_RELA,r16
-	;;
-(p6)	add	r18=r17,in0		// found rela section
-	;;
-	cmp.eq	p6,p0=DT_RELASZ,r16
-	;;
-(p6)	mov	r19=r17			// found rela size
-	;;
-	cmp.eq	p6,p0=DT_RELAENT,r16
-	;;
-(p6)	mov	r22=r17			// found rela entry size
-	;;
-	br.sptk.few 1b
-
-2:
-	ld8	r15=[r18],8		// read r_offset
-	;;
-	ld8	r16=[r18],8		// read r_info
-	add	r15=r15,in0		// relocate r_offset
-	;;
-	ld8	r17=[r18],8		// read r_addend
-	sub	r19=r19,r22		// update relasz
-
-	extr.u	r23=r16,0,32		// ELF64_R_TYPE(r16)
-	;;
-	cmp.eq	p6,p0=R_IA_64_NONE,r23
-(p6)	br.cond.dpnt.few 3f
-	;;
-	cmp.eq	p6,p0=R_IA_64_DIR64LSB,r23
-	;;
-(p6)	br.cond.dptk.few 4f
-	;;
-	cmp.eq	p6,p0=R_IA_64_REL64LSB,r23
-	;;
-(p6)	br.cond.dptk.few 4f
-	;;
-
-3:	cmp.ltu	p6,p0=0,r19		// more?
-(p6)	br.cond.dptk.few 2b		// loop
-
-	mov	r8=0			// success return value
-	;;
-	br.cond.sptk.few 9f		// done
-
-4:
-	ld8	r16=[r15]		// read value
-	;;
-	add	r16=r16,in0		// relocate it
-	;;
-	st8	[r15]=r16		// and store it back
-	br.cond.sptk.few 3b
-
-9:
-	mov	ar.pfs=loc0
-	mov	rp=loc1
-	;;
-	br.ret.sptk.few rp
-
-END(_rtld_reloc)
diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1
index 703a462e8d60..a8e9d680d25c 100644
--- a/libexec/rtld-elf/rtld.1
+++ b/libexec/rtld-elf/rtld.1
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 28, 2012
+.Dd June 20, 2014
 .Dt RTLD 1
 .Os
 .Sh NAME
@@ -192,6 +192,13 @@ the directories specified by
 will be searched first
 followed by the set of built-in standard directories.
 This variable is unset for set-user-ID and set-group-ID programs.
+.Ev LD_LIBRARY_PATH_FDS
+A colon separated list of file descriptor numbers for library directories.
+This is intended for use within
+.Xr capsicum 4
+sandboxes, when global namespaces such as the filesystem are unavailable.
+It is consulted just after LD_LIBRARY_PATH.
+This variable is unset for set-user-ID and set-group-ID programs.
 .It Ev LD_BIND_NOW
 When set to a nonempty string, causes
 .Nm
@@ -260,7 +267,6 @@ If set,
 .Nm
 will log events such as the loading and unloading of shared objects via
 .Xr utrace 2 .
-.Pp
 .It Ev LD_LOADFLTR
 If set,
 .Nm
@@ -283,6 +289,7 @@ The libmap configuration file for 32-bit binaries on 64-bit system.
 .Sh SEE ALSO
 .Xr ld 1 ,
 .Xr ldd 1 ,
+.Xr capsicum 4 ,
 .Xr elf 5 ,
 .Xr libmap.conf 5 ,
 .Xr ldconfig 8
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 443767d99ba4..03c92d0a3275 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -94,7 +94,7 @@ static bool donelist_check(DoneList *, const Obj_Entry *);
 static void errmsg_restore(char *);
 static char *errmsg_save(void);
 static void *fill_search_info(const char *, size_t, void *);
-static char *find_library(const char *, const Obj_Entry *);
+static char *find_library(const char *, const Obj_Entry *, int *);
 static const char *gethints(bool);
 static void init_dag(Obj_Entry *);
 static void init_pagesizes(Elf_Auxinfo **aux_info);
@@ -119,6 +119,7 @@ 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 int parse_libdir(const char *);
 static void *path_enumerate(const char *, path_enum_proc, void *);
 static int relocate_object_dag(Obj_Entry *root, bool bind_now,
     Obj_Entry *rtldobj, int flags, RtldLockState *lockstate);
@@ -133,6 +134,7 @@ static int rtld_dirname_abs(const char *, char *);
 static void *rtld_dlopen(const char *name, int fd, int mode);
 static void rtld_exit(void);
 static char *search_library_path(const char *, const char *);
+static char *search_library_pathfds(const char *, const char *, int *);
 static const void **get_program_var_addr(const char *, RtldLockState *);
 static void set_program_var(const char *, const void *);
 static int symlook_default(SymLook *, const Obj_Entry *refobj);
@@ -178,6 +180,7 @@ static bool dangerous_ld_env;	/* True if environment variables have been
 static char *ld_bind_now;	/* Environment variable for immediate binding */
 static char *ld_debug;		/* Environment variable for debugging */
 static char *ld_library_path;	/* Environment variable for search path */
+static char *ld_library_dirs;	/* Environment variable for library descriptors */
 static char *ld_preload;	/* Environment variable for libraries to
 				   load first */
 static char *ld_elf_hints_path;	/* Environment variable for alternative hints path */
@@ -401,7 +404,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp)
      */
     if (!trust) {
         if (unsetenv(LD_ "PRELOAD") || unsetenv(LD_ "LIBMAP") ||
-	    unsetenv(LD_ "LIBRARY_PATH") || unsetenv(LD_ "LIBMAP_DISABLE") ||
+	    unsetenv(LD_ "LIBRARY_PATH") || unsetenv(LD_ "LIBRARY_PATH_FDS") ||
+	    unsetenv(LD_ "LIBMAP_DISABLE") ||
 	    unsetenv(LD_ "DEBUG") || unsetenv(LD_ "ELF_HINTS_PATH") ||
 	    unsetenv(LD_ "LOADFLTR") || unsetenv(LD_ "LIBRARY_PATH_RPATH")) {
 		_rtld_error("environment corrupt; aborting");
@@ -412,6 +416,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp)
     libmap_disable = getenv(LD_ "LIBMAP_DISABLE") != NULL;
     libmap_override = getenv(LD_ "LIBMAP");
     ld_library_path = getenv(LD_ "LIBRARY_PATH");
+    ld_library_dirs = getenv(LD_ "LIBRARY_PATH_FDS");
     ld_preload = getenv(LD_ "PRELOAD");
     ld_elf_hints_path = getenv(LD_ "ELF_HINTS_PATH");
     ld_loadfltr = getenv(LD_ "LOADFLTR") != NULL;
@@ -1417,6 +1422,7 @@ gnu_hash(const char *s)
 	return (h & 0xffffffff);
 }
 
+
 /*
  * Find the library with the given name, and return its full pathname.
  * The returned string is dynamically allocated.  Generates an error
@@ -1425,6 +1431,10 @@ gnu_hash(const char *s)
  * If the second argument is non-NULL, then it refers to an already-
  * loaded shared object, whose library search path will be searched.
  *
+ * If a library is successfully located via LD_LIBRARY_PATH_FDS, its
+ * descriptor (which is close-on-exec) will be passed out via the third
+ * argument.
+ *
  * The search order is:
  *   DT_RPATH in the referencing file _unless_ DT_RUNPATH is present (1)
  *   DT_RPATH of the main object if DSO without defined DT_RUNPATH (1)
@@ -1437,7 +1447,7 @@ gnu_hash(const char *s)
  * (1) Handled in digest_dynamic2 - rpath left NULL if runpath defined.
  */
 static char *
-find_library(const char *xname, const Obj_Entry *refobj)
+find_library(const char *xname, const Obj_Entry *refobj, int *fdp)
 {
     char *pathname;
     char *name;
@@ -1474,6 +1484,7 @@ find_library(const char *xname, const Obj_Entry *refobj)
 	if ((pathname = search_library_path(name, ld_library_path)) != NULL ||
 	  (refobj != NULL &&
 	  (pathname = search_library_path(name, refobj->rpath)) != NULL) ||
+	  (pathname = search_library_pathfds(name, ld_library_dirs, fdp)) != NULL ||
           (pathname = search_library_path(name, gethints(false))) != NULL ||
 	  (pathname = search_library_path(name, STANDARD_LIBRARY_PATH)) != NULL)
 	    return (pathname);
@@ -1486,6 +1497,7 @@ find_library(const char *xname, const Obj_Entry *refobj)
 	  (pathname = search_library_path(name, ld_library_path)) != NULL ||
 	  (objgiven &&
 	  (pathname = search_library_path(name, refobj->runpath)) != NULL) ||
+	  (pathname = search_library_pathfds(name, ld_library_dirs, fdp)) != NULL ||
 	  (pathname = search_library_path(name, gethints(nodeflib))) != NULL ||
 	  (objgiven && !nodeflib &&
 	  (pathname = search_library_path(name, STANDARD_LIBRARY_PATH)) != NULL))
@@ -1790,6 +1802,11 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info)
     const Elf_Dyn *dyn_soname;
     const Elf_Dyn *dyn_runpath;
 
+#ifdef RTLD_INIT_PAGESIZES_EARLY
+    /* The page size is required by the dynamic memory allocator. */
+    init_pagesizes(aux_info);
+#endif
+
     /*
      * Conjure up an Obj_Entry structure for the dynamic linker.
      *
@@ -1826,8 +1843,10 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info)
     /* Now that non-local variables can be accesses, copy out obj_rtld. */
     memcpy(&obj_rtld, &objtmp, sizeof(obj_rtld));
 
+#ifndef RTLD_INIT_PAGESIZES_EARLY
     /* The page size is required by the dynamic memory allocator. */
     init_pagesizes(aux_info);
+#endif
 
     if (aux_info[AT_OSRELDATE] != NULL)
 	    osreldate = aux_info[AT_OSRELDATE]->a_un.a_val;
@@ -2085,29 +2104,34 @@ load_object(const char *name, int fd_u, const Obj_Entry *refobj, int flags)
     struct stat sb;
     char *path;
 
+    fd = -1;
     if (name != NULL) {
 	for (obj = obj_list->next;  obj != NULL;  obj = obj->next) {
 	    if (object_match_name(obj, name))
 		return (obj);
 	}
 
-	path = find_library(name, refobj);
+	path = find_library(name, refobj, &fd);
 	if (path == NULL)
 	    return (NULL);
     } else
 	path = NULL;
 
-    /*
-     * If we didn't find a match by pathname, or the name is not
-     * supplied, open the file and check again by device and inode.
-     * This avoids false mismatches caused by multiple links or ".."
-     * in pathnames.
-     *
-     * To avoid a race, we open the file and use fstat() rather than
-     * using stat().
-     */
-    fd = -1;
-    if (fd_u == -1) {
+    if (fd >= 0) {
+	/*
+	 * search_library_pathfds() opens a fresh file descriptor for the
+	 * library, so there is no need to dup().
+	 */
+    } else if (fd_u == -1) {
+	/*
+	 * If we didn't find a match by pathname, or the name is not
+	 * supplied, open the file and check again by device and inode.
+	 * This avoids false mismatches caused by multiple links or ".."
+	 * in pathnames.
+	 *
+	 * To avoid a race, we open the file and use fstat() rather than
+	 * using stat().
+	 */
 	if ((fd = open(path, O_RDONLY | O_CLOEXEC)) == -1) {
 	    _rtld_error("Cannot open \"%s\"", path);
 	    free(path);
@@ -2745,6 +2769,69 @@ search_library_path(const char *name, const char *path)
     return (p);
 }
 
+
+/*
+ * Finds the library with the given name using the directory descriptors
+ * listed in the LD_LIBRARY_PATH_FDS environment variable.
+ *
+ * Returns a freshly-opened close-on-exec file descriptor for the library,
+ * or -1 if the library cannot be found.
+ */
+static char *
+search_library_pathfds(const char *name, const char *path, int *fdp)
+{
+	char *envcopy, *fdstr, *found, *last_token;
+	size_t len;
+	int dirfd, fd;
+
+	dbg("%s('%s', '%s', fdp)\n", __func__, name, path);
+
+	/* Don't load from user-specified libdirs into setuid binaries. */
+	if (!trust)
+		return (NULL);
+
+	/* We can't do anything if LD_LIBRARY_PATH_FDS isn't set. */
+	if (path == NULL)
+		return (NULL);
+
+	/* LD_LIBRARY_PATH_FDS only works with relative paths. */
+	if (name[0] == '/') {
+		dbg("Absolute path (%s) passed to %s", name, __func__);
+		return (NULL);
+	}
+
+	/*
+	 * Use strtok_r() to walk the FD:FD:FD list.  This requires a local
+	 * copy of the path, as strtok_r rewrites separator tokens
+	 * with '\0'.
+	 */
+	found = NULL;
+	envcopy = xstrdup(path);
+	for (fdstr = strtok_r(envcopy, ":", &last_token); fdstr != NULL;
+	    fdstr = strtok_r(NULL, ":", &last_token)) {
+		dirfd = parse_libdir(fdstr);
+		if (dirfd < 0)
+			break;
+		fd = openat(dirfd, name, O_RDONLY | O_CLOEXEC);
+		if (fd >= 0) {
+			*fdp = fd;
+			len = strlen(fdstr) + strlen(name) + 3;
+			found = xmalloc(len);
+			if (rtld_snprintf(found, len, "#%d/%s", dirfd, name) < 0) {
+				_rtld_error("error generating '%d/%s'",
+				    dirfd, name);
+				die();
+			}
+			dbg("open('%s') => %d", found, fd);
+			break;
+		}
+	}
+	free(envcopy);
+
+	return (found);
+}
+
+
 int
 dlclose(void *handle)
 {
@@ -2997,9 +3084,7 @@ do_dlsym(void *handle, const char *name, void *retaddr, const Ver_Entry *ve,
     const Elf_Sym *def;
     SymLook req;
     RtldLockState lockstate;
-#ifndef __ia64__
     tls_index ti;
-#endif
     int res;
 
     def = NULL;
@@ -3104,24 +3189,17 @@ do_dlsym(void *handle, const char *name, void *retaddr, const Ver_Entry *ve,
 
 	/*
 	 * The value required by the caller is derived from the value
-	 * of the symbol. For the ia64 architecture, we need to
-	 * construct a function descriptor which the caller can use to
-	 * call the function with the right 'gp' value. For other
-	 * architectures and for non-functions, the value is simply
-	 * the relocated value of the symbol.
+	 * of the symbol. this is simply the relocated value of the
+	 * symbol.
 	 */
 	if (ELF_ST_TYPE(def->st_info) == STT_FUNC)
 	    return (make_function_pointer(def, defobj));
 	else if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC)
 	    return (rtld_resolve_ifunc(defobj, def));
 	else if (ELF_ST_TYPE(def->st_info) == STT_TLS) {
-#ifdef __ia64__
-	    return (__tls_get_addr(defobj->tlsindex, def->st_value));
-#else
 	    ti.ti_module = defobj->tlsindex;
 	    ti.ti_offset = def->st_value;
 	    return (__tls_get_addr(&ti));
-#endif
 	} else
 	    return (defobj->relocbase + def->st_value);
     }
@@ -4254,7 +4332,7 @@ tls_get_addr_common(Elf_Addr **dtvp, int index, size_t offset)
 	return (tls_get_addr_slow(dtvp, index, offset));
 }
 
-#if defined(__arm__) || defined(__ia64__) || defined(__mips__) || defined(__powerpc__)
+#if defined(__arm__) || defined(__mips__) || defined(__powerpc__)
 
 /*
  * Allocate Static TLS using the Variant I method.
@@ -4835,6 +4913,36 @@ symlook_init_from_req(SymLook *dst, const SymLook *src)
 	dst->lockstate = src->lockstate;
 }
 
+
+/*
+ * Parse a file descriptor number without pulling in more of libc (e.g. atoi).
+ */
+static int
+parse_libdir(const char *str)
+{
+	static const int RADIX = 10;  /* XXXJA: possibly support hex? */
+	const char *orig;
+	int fd;
+	char c;
+
+	orig = str;
+	fd = 0;
+	for (c = *str; c != '\0'; c = *++str) {
+		if (c < '0' || c > '9')
+			return (-1);
+
+		fd *= RADIX;
+		fd += c - '0';
+	}
+
+	/* Make sure we actually parsed something. */
+	if (str == orig) {
+		_rtld_error("failed to parse directory FD from '%s'", str);
+		return (-1);
+	}
+	return (fd);
+}
+
 /*
  * Overrides for libc_pic-provided functions.
  */
diff --git a/libexec/rtld-elf/rtld_printf.c b/libexec/rtld-elf/rtld_printf.c
index eb4514a3902b..9d945dc3b260 100644
--- a/libexec/rtld-elf/rtld_printf.c
+++ b/libexec/rtld-elf/rtld_printf.c
@@ -428,6 +428,18 @@ reswitch:	switch (ch = (u_char)*fmt++) {
 #undef PCHAR
 }
 
+int
+rtld_snprintf(char *buf, size_t bufsize, const char *fmt, ...)
+{
+	va_list ap;
+	int retval;
+
+	va_start(ap, fmt);
+	retval = rtld_vsnprintf(buf, bufsize, fmt, ap);
+	va_end(ap);
+	return (retval);
+}
+
 int
 rtld_vsnprintf(char *buf, size_t bufsize, const char *fmt, va_list ap)
 {
diff --git a/libexec/rtld-elf/rtld_printf.h b/libexec/rtld-elf/rtld_printf.h
index 6125732cb6ac..aaf2971accdb 100644
--- a/libexec/rtld-elf/rtld_printf.h
+++ b/libexec/rtld-elf/rtld_printf.h
@@ -31,6 +31,8 @@
 #include <sys/cdefs.h>
 #include <unistd.h>
 
+int rtld_snprintf(char *buf, size_t bufsize, const char *fmt, ...)
+    __printflike(3, 4);
 int rtld_vsnprintf(char *buf, size_t bufsize, const char *fmt, va_list ap);
 int rtld_vfdprintf(int fd, const char *fmt, va_list ap);
 int rtld_fdprintf(int fd, const char *fmt, ...) __printflike(2, 3);
diff --git a/libexec/rtld-elf/tests/Makefile b/libexec/rtld-elf/tests/Makefile
new file mode 100644
index 000000000000..f384218b1a59
--- /dev/null
+++ b/libexec/rtld-elf/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/libexec/rtld-elf
+SUBDIR+=	libpythagoras target
+
+ATF_TESTS_C=	ld_library_pathfds
+
+.include <bsd.test.mk>
diff --git a/libexec/rtld-elf/tests/ld_library_pathfds.c b/libexec/rtld-elf/tests/ld_library_pathfds.c
new file mode 100644
index 000000000000..11008945b7ed
--- /dev/null
+++ b/libexec/rtld-elf/tests/ld_library_pathfds.c
@@ -0,0 +1,221 @@
+/*-
+ * Copyright 2014 Jonathan Anderson.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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$
+ */
+
+#include <atf-c.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+
+struct descriptors {
+	int	binary;
+	int	testdir;
+	int	root;
+	int	etc;
+	int	usr;
+};
+
+static void	setup(struct descriptors *, const atf_tc_t *);
+static void	expect_success(int binary, char *pathfds);
+static void	expect_missing_library(int binary, char *pathfds);
+
+static void	try_to_run(int binary, int expected_exit_status,
+    char * const *env, const char *expected_out, const char *expected_err);
+static int	opendir(const char *name);
+static int	opendirat(int parent, const char *name);
+
+
+ATF_TC_WITHOUT_HEAD(missing_library);
+ATF_TC_BODY(missing_library, tc)
+{
+	struct descriptors files;
+
+	setup(&files, tc);
+	expect_missing_library(files.binary, NULL);
+}
+
+
+ATF_TC_WITHOUT_HEAD(wrong_library_directories);
+ATF_TC_BODY(wrong_library_directories, tc)
+{
+	struct descriptors files;
+	char *pathfds;
+
+	setup(&files, tc);
+	ATF_REQUIRE(
+		asprintf(&pathfds, "LD_LIBRARY_PATH_FDS=%d", files.etc) > 0);
+
+	expect_missing_library(files.binary, pathfds);
+}
+
+
+ATF_TC_WITHOUT_HEAD(bad_library_directories);
+ATF_TC_BODY(bad_library_directories, tc)
+{
+	struct descriptors files;
+	char *pathfds;
+
+	setup(&files, tc);
+	ATF_REQUIRE(asprintf(&pathfds, "LD_LIBRARY_PATH_FDS=::") > 0);
+
+	expect_missing_library(files.binary, pathfds);
+}
+
+
+ATF_TC_WITHOUT_HEAD(single_library_directory);
+ATF_TC_BODY(single_library_directory, tc)
+{
+	struct descriptors files;
+	char *pathfds;
+
+	setup(&files, tc);
+	ATF_REQUIRE(
+	    asprintf(&pathfds, "LD_LIBRARY_PATH_FDS=%d", files.testdir) > 0);
+
+	expect_success(files.binary, pathfds);
+}
+
+
+ATF_TC_WITHOUT_HEAD(first_library_directory);
+ATF_TC_BODY(first_library_directory, tc)
+{
+	struct descriptors files;
+	char *pathfds;
+
+	setup(&files, tc);
+	ATF_REQUIRE(
+	    asprintf(&pathfds, "LD_LIBRARY_PATH_FDS=%d:%d",
+		files.testdir, files.etc) > 0);
+
+	expect_success(files.binary, pathfds);
+}
+
+
+ATF_TC_WITHOUT_HEAD(middle_library_directory);
+ATF_TC_BODY(middle_library_directory, tc)
+{
+	struct descriptors files;
+	char *pathfds;
+
+	setup(&files, tc);
+	ATF_REQUIRE(
+	    asprintf(&pathfds, "LD_LIBRARY_PATH_FDS=%d:%d:%d",
+		files.root, files.testdir, files.usr) > 0);
+
+	expect_success(files.binary, pathfds);
+}
+
+
+ATF_TC_WITHOUT_HEAD(last_library_directory);
+ATF_TC_BODY(last_library_directory, tc)
+{
+	struct descriptors files;
+	char *pathfds;
+
+	setup(&files, tc);
+	ATF_REQUIRE(
+	    asprintf(&pathfds, "LD_LIBRARY_PATH_FDS=%d:%d",
+		files.root, files.testdir) > 0);
+
+	expect_success(files.binary, pathfds);
+}
+
+
+
+/* Register test cases with ATF. */
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, missing_library);
+	ATF_TP_ADD_TC(tp, wrong_library_directories);
+	ATF_TP_ADD_TC(tp, bad_library_directories);
+	ATF_TP_ADD_TC(tp, single_library_directory);
+	ATF_TP_ADD_TC(tp, first_library_directory);
+	ATF_TP_ADD_TC(tp, middle_library_directory);
+	ATF_TP_ADD_TC(tp, last_library_directory);
+
+	return atf_no_error();
+}
+
+
+static void
+setup(struct descriptors *dp, const atf_tc_t *tc)
+{
+
+	dp->testdir = opendir(atf_tc_get_config_var(tc, "srcdir"));
+	ATF_REQUIRE(dp->testdir >= 0);
+	ATF_REQUIRE(
+	    (dp->binary = openat(dp->testdir, "target", O_RDONLY)) >= 0);
+
+	ATF_REQUIRE((dp->root = opendir("/")) >= 0);
+	ATF_REQUIRE((dp->etc = opendirat(dp->root, "etc")) >= 0);
+	ATF_REQUIRE((dp->usr = opendirat(dp->root, "usr")) >= 0);
+}
+
+static void
+expect_success(int binary, char *pathfds)
+{
+	char * const env[] = { pathfds, NULL };
+	try_to_run(binary, 0, env, "the hypotenuse of 3 and 4 is 5\n", "");
+}
+
+static void
+expect_missing_library(int binary, char *pathfds)
+{
+	char * const env[] = { pathfds, NULL };
+	try_to_run(binary, 1, env, "",
+	   "Shared object \"libpythagoras.so.0\" not found,"
+	    " required by \"target\"\n");
+}
+
+
+static void
+try_to_run(int binary, int exit_status, char * const *env,
+        const char *expected_out, const char *expected_err)
+{
+	pid_t child = atf_utils_fork();
+
+	if (child == 0) {
+		char * const args[] = { "target", NULL };
+
+		fexecve(binary, args, env);
+		atf_tc_fail("fexecve() failed");
+	}
+
+	atf_utils_wait(child, exit_status, expected_out, expected_err);
+}
+
+
+static int
+opendir(const char *name)
+{
+	return open(name, O_RDONLY | O_DIRECTORY);
+}
+
+static int
+opendirat(int parent, const char *name)
+{
+	return openat(parent, name, O_RDONLY | O_DIRECTORY);
+}
diff --git a/libexec/rtld-elf/tests/libpythagoras/Makefile b/libexec/rtld-elf/tests/libpythagoras/Makefile
new file mode 100644
index 000000000000..618612fb3eaf
--- /dev/null
+++ b/libexec/rtld-elf/tests/libpythagoras/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB=		pythagoras
+SHLIB_MAJOR=	0
+
+LIBDIR=		${TESTSBASE}/libexec/rtld-elf
+SHLIBDIR=	${TESTSBASE}/libexec/rtld-elf
+
+SRCS=		pythagoras.c
+
+DPADD=		${LIBM}
+LDADD=		-lm
+
+.include <bsd.lib.mk>
diff --git a/sys/ia64/include/vdso.h b/libexec/rtld-elf/tests/libpythagoras/pythagoras.c
similarity index 83%
rename from sys/ia64/include/vdso.h
rename to libexec/rtld-elf/tests/libpythagoras/pythagoras.c
index 4571daa299d1..c7fa604b41a1 100644
--- a/sys/ia64/include/vdso.h
+++ b/libexec/rtld-elf/tests/libpythagoras/pythagoras.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2012 Konstantin Belousov <kib@FreeBSD.ORG>.
+ * Copyright 2014 Jonathan Anderson.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,17 +25,18 @@
  * $FreeBSD$
  */
 
-#ifndef _IA64_VDSO_H
-#define	_IA64_VDSO_H
+#include <errno.h>
+#include <math.h>
 
-#define	VDSO_TIMEHANDS_MD			\
-	uint32_t	th_res[8];
+#include "pythagoras.h"
 
-#ifdef _KERNEL
-#ifdef COMPAT_FREEBSD32
+double
+pythagorean_theorem(double a, double b)
+{
 
-#define	VDSO_TIMEHANDS_MD32	VDSO_TIMEHANDS_MD
-
-#endif
-#endif
-#endif
+	if (a <= 0 || b <= 0) {
+		errno = ERANGE;
+		return (-1.0);
+	}
+	return (sqrt(pow(a, 2) + pow(b, 2)));
+}
diff --git a/sys/boot/ia64/common/autoload.c b/libexec/rtld-elf/tests/libpythagoras/pythagoras.h
similarity index 90%
rename from sys/boot/ia64/common/autoload.c
rename to libexec/rtld-elf/tests/libpythagoras/pythagoras.h
index ea334b97e418..ef5379c3f61f 100644
--- a/sys/boot/ia64/common/autoload.c
+++ b/libexec/rtld-elf/tests/libpythagoras/pythagoras.h
@@ -1,11 +1,10 @@
 /*-
- * Copyright (c) 2006 Marcel Moolenaar
+ * Copyright 2014 Jonathan Anderson.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ -22,14 +21,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$
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-int
-ia64_autoload(void)
-{
-
-	return (0);
-}
+double	pythagorean_theorem(double, double);
diff --git a/libexec/rtld-elf/tests/target/Makefile b/libexec/rtld-elf/tests/target/Makefile
new file mode 100644
index 000000000000..fe8e7f39df71
--- /dev/null
+++ b/libexec/rtld-elf/tests/target/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+PROG=		target
+BINDIR=		${TESTSBASE}/libexec/rtld-elf
+
+CFLAGS+=	-I${.CURDIR}/../libpythagoras
+
+LDFLAGS+=	-L${.OBJDIR}/../libpythagoras
+LDADD=		-lpythagoras
+
+MAN=
+
+.include <bsd.prog.mk>
diff --git a/lib/libc/ia64/gen/fpgetround.c b/libexec/rtld-elf/tests/target/target.c
similarity index 84%
rename from lib/libc/ia64/gen/fpgetround.c
rename to libexec/rtld-elf/tests/target/target.c
index 6f5e8cc86c4c..e88b89956ef2 100644
--- a/lib/libc/ia64/gen/fpgetround.c
+++ b/libexec/rtld-elf/tests/target/target.c
@@ -1,11 +1,10 @@
-/*
- * Copyright (c) 2003 Marcel Moolenaar
+/*-
+ * Copyright 2014 Jonathan Anderson.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ -26,14 +25,15 @@
  * $FreeBSD$
  */
 
-#include <sys/types.h>
-#include <ieeefp.h>
+#include "pythagoras.h"
 
-fp_rnd_t
-fpgetround(void)
+#include <stdio.h>
+
+int
+main(int argc, char *argv[])
 {
-	uint64_t fpsr;
+	float hypotenuse = pythagorean_theorem(3, 4);
+	printf("the hypotenuse of 3 and 4 is %d\n", (int) hypotenuse);
 
-	__asm __volatile("mov %0=ar.fpsr" : "=r"(fpsr));
-	return ((fp_rnd_t)((fpsr >> 10) & 3));
+	return 0;
 }
diff --git a/libexec/save-entropy/save-entropy.sh b/libexec/save-entropy/save-entropy.sh
index e96b543a76b8..880a988404d7 100755
--- a/libexec/save-entropy/save-entropy.sh
+++ b/libexec/save-entropy/save-entropy.sh
@@ -42,6 +42,8 @@ elif [ -r /etc/rc.conf ]; then
 	. /etc/rc.conf 2>/dev/null
 fi
 
+[ $(/sbin/sysctl -n security.jail.jailed) = 0 ] || exit 0
+
 case ${entropy_dir} in
 [Nn][Oo])
 	exit 0
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index a63b937231e5..f80bf5c92dc1 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -30,8 +30,8 @@ CFLAGS+=	-I${TELNETDIR}
 
 LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
 
-DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET}
-LDADD=		-lutil -ltermcap ${LIBTELNET}
+DPADD=		${LIBUTIL} ${LIBTERMCAPW} ${LIBTELNET}
+LDADD=		-lutil -ltermcapw ${LIBTELNET}
 
 .if ${MK_OPENSSL} != "no"
 SRCS+=		authenc.c
diff --git a/libexec/ypxfr/ypxfr.8 b/libexec/ypxfr/ypxfr.8
index 281e31a57542..3e0758649f48 100644
--- a/libexec/ypxfr/ypxfr.8
+++ b/libexec/ypxfr/ypxfr.8
@@ -305,4 +305,4 @@ domain.
 .Xr yppush 8 ,
 .Xr ypserv 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
diff --git a/release/Makefile b/release/Makefile
index 2e31ae937e94..6b4517dc4377 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -154,11 +154,14 @@ system: packagesystem
 # Install system
 	mkdir -p release
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
-		DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \
-		WITHOUT_PROFILE=1 WITHOUT_SENDMAIL=1 MK_TESTS=no WITHOUT_LIB32=1
+		DESTDIR=${.OBJDIR}/release MK_RESCUE=no MK_KERNEL_SYMBOLS=no \
+		MK_PROFILE=no MK_SENDMAIL=no MK_TESTS=no MK_LIB32=no \
+		MK_DEBUG_FILES=no
 # Copy distfiles
 	mkdir -p release/usr/freebsd-dist
-	cp *.txz MANIFEST release/usr/freebsd-dist
+	for dist in MANIFEST $$(ls *.txz | grep -v -- '-dbg'); \
+	    do cp $${dist} release/usr/freebsd-dist; \
+	done
 # Copy documentation, if generated
 .if !defined(NODOC)
 	cp reldoc/* release
@@ -175,12 +178,12 @@ bootonly: packagesystem
 # Install system
 	mkdir -p bootonly
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
-	    DESTDIR=${.OBJDIR}/bootonly WITHOUT_AMD=1 WITHOUT_AT=1 \
-	    WITHOUT_GAMES=1 WITHOUT_GROFF=1 \
-	    WITHOUT_INSTALLLIB=1 WITHOUT_LIB32=1 WITHOUT_MAIL=1 \
-	    WITHOUT_NCP=1 WITHOUT_TOOLCHAIN=1 WITHOUT_PROFILE=1 \
-	    WITHOUT_INSTALLIB=1 WITHOUT_RESCUE=1 WITHOUT_DICT=1 \
-	    WITHOUT_KERNEL_SYMBOLS=1 MK_TESTS=no
+	    DESTDIR=${.OBJDIR}/bootonly MK_AMD=no MK_AT=no \
+	    MK_GAMES=no MK_GROFF=no \
+	    MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \
+	    MK_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \
+	    MK_INSTALLIB=no MK_RESCUE=no MK_DICT=no \
+	    MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no
 # Copy manifest only (no distfiles) to get checksums
 	mkdir -p bootonly/usr/freebsd-dist
 	cp MANIFEST bootonly/usr/freebsd-dist
@@ -199,11 +202,13 @@ dvd:
 # Install system
 	mkdir -p ${.TARGET}
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
-		DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \
-		MK_TESTS=no
+		DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \
+		MK_TESTS=no MK_DEBUG_FILES=no
 # Copy distfiles
 	mkdir -p ${.TARGET}/usr/freebsd-dist
-	cp *.txz MANIFEST ${.TARGET}/usr/freebsd-dist
+	for dist in MANIFEST $$(ls *.txz | grep -v -- '-dbg'); \
+	    do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
+	done
 # Copy documentation, if generated
 .if !defined(NODOC)
 	cp reldoc/* ${.TARGET}
diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh
index e10b892eeb29..6c289e093b8b 100755
--- a/release/amd64/make-memstick.sh
+++ b/release/amd64/make-memstick.sh
@@ -29,20 +29,13 @@ if [ -e ${2} ]; then
 fi
 
 echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
-makefs -B little -o label=FreeBSD_Install ${2} ${1}
+makefs -B little -o label=FreeBSD_Install ${2}.part ${1}
 if [ $? -ne 0 ]; then
 	echo "makefs failed"
 	exit 1
 fi
 rm ${1}/etc/fstab
 
-unit=$(mdconfig -a -t vnode -f ${2})
-if [ $? -ne 0 ]; then
-	echo "mdconfig failed"
-	exit 1
-fi
-gpart create -s BSD ${unit}
-gpart bootcode -b ${1}/boot/boot ${unit}
-gpart add -t freebsd-ufs ${unit}
-mdconfig -d -u ${unit}
+mkimg -s gpt -b ${1}/boot/pmbr -p efi:=${1}/boot/boot1.efifat -p freebsd-boot:=${1}/boot/gptboot -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2}
+rm ${2}.part
 
diff --git a/release/amd64/make-uefi-memstick.sh b/release/amd64/make-uefi-memstick.sh
deleted file mode 100755
index 6c289e093b8b..000000000000
--- a/release/amd64/make-uefi-memstick.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# This script generates a "memstick image" (image that can be copied to a
-# USB memory stick) from a directory tree.  Note that the script does not
-# clean up after itself very well for error conditions on purpose so the
-# problem can be diagnosed (full filesystem most likely but ...).
-#
-# Usage: make-memstick.sh <directory tree> <image filename>
-#
-# $FreeBSD$
-#
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-export PATH
-
-if [ $# -ne 2 ]; then
-	echo "make-memstick.sh /path/to/directory /path/to/image/file"
-	exit 1
-fi
-
-if [ ! -d ${1} ]; then
-	echo "${1} must be a directory"
-	exit 1
-fi
-
-if [ -e ${2} ]; then
-	echo "won't overwrite ${2}"
-	exit 1
-fi
-
-echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
-makefs -B little -o label=FreeBSD_Install ${2}.part ${1}
-if [ $? -ne 0 ]; then
-	echo "makefs failed"
-	exit 1
-fi
-rm ${1}/etc/fstab
-
-mkimg -s gpt -b ${1}/boot/pmbr -p efi:=${1}/boot/boot1.efifat -p freebsd-boot:=${1}/boot/gptboot -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2}
-rm ${2}.part
-
diff --git a/release/amd64/mkisoimages-uefi.sh b/release/amd64/mkisoimages-uefi.sh
deleted file mode 100644
index 2b89d89cda25..000000000000
--- a/release/amd64/mkisoimages-uefi.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#
-# Module: mkisoimages.sh
-# Author: Jordan K Hubbard
-# Date:   22 June 2001
-#
-# $FreeBSD$
-#
-# This script is used by release/Makefile to build the (optional) ISO images
-# for a FreeBSD release.  It is considered architecture dependent since each
-# platform has a slightly unique way of making bootable CDs.  This script
-# is also allowed to generate any number of images since that is more of
-# publishing decision than anything else.
-#
-# Usage:
-#
-# mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir]
-#
-# Where -b is passed if the ISO image should be made "bootable" by
-# whatever standards this architecture supports (may be unsupported),
-# image-label is the ISO image label, image-name is the filename of the
-# resulting ISO image, base-bits-dir contains the image contents and
-# extra-bits-dir, if provided, contains additional files to be merged
-# into base-bits-dir as part of making the image.
-
-if [ "x$1" = "x-b" ]; then
-	# This is highly x86-centric and will be used directly below.
-	bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
-
-	# Make EFI system partition (should be done with makefs in the future)
-	dd if=/dev/zero of=efiboot.img bs=4k count=100
-	device=`mdconfig -a -t vnode -f efiboot.img`
-	newfs_msdos -F 12 -m 0xf8 /dev/$device
-	mkdir efi
-	mount -t msdosfs /dev/$device efi
-	mkdir -p efi/efi/boot
-	cp ${4}/boot/loader.efi efi/efi/boot/bootx64.efi
-	umount efi
-	rmdir efi
-	mdconfig -d -u $device
-	bootable="-o bootimage=i386;efiboot.img -o no-emul-boot $bootable"
-	
-	shift
-else
-	bootable=""
-fi
-
-if [ $# -lt 3 ]; then
-	echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]'
-	exit 1
-fi
-
-LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
-NAME=$1; shift
-
-publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
-echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
-makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
-rm $1/etc/fstab
-rm -f efiboot.img
diff --git a/release/amd64/mkisoimages.sh b/release/amd64/mkisoimages.sh
index e4093d74e4c9..2b89d89cda25 100644
--- a/release/amd64/mkisoimages.sh
+++ b/release/amd64/mkisoimages.sh
@@ -26,6 +26,20 @@
 if [ "x$1" = "x-b" ]; then
 	# This is highly x86-centric and will be used directly below.
 	bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
+
+	# Make EFI system partition (should be done with makefs in the future)
+	dd if=/dev/zero of=efiboot.img bs=4k count=100
+	device=`mdconfig -a -t vnode -f efiboot.img`
+	newfs_msdos -F 12 -m 0xf8 /dev/$device
+	mkdir efi
+	mount -t msdosfs /dev/$device efi
+	mkdir -p efi/efi/boot
+	cp ${4}/boot/loader.efi efi/efi/boot/bootx64.efi
+	umount efi
+	rmdir efi
+	mdconfig -d -u $device
+	bootable="-o bootimage=i386;efiboot.img -o no-emul-boot $bootable"
+	
 	shift
 else
 	bootable=""
@@ -43,3 +57,4 @@ publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
 echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
 rm $1/etc/fstab
+rm -f efiboot.img
diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 49c02249dc4f..025bcb7725c8 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -1,30 +1,37 @@
+#!/bin/sh
 #
 # $FreeBSD$
 #
 
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head@rHEAD"
+export DOCBRANCH="doc/head@rHEAD"
+export PORTBRANCH="ports/head@rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+
 # Build chroot configuration
-TARGET="amd64"
-TARGET_ARCH="amd64"
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head@rHEAD"
-DOCBRANCH="doc/head@rHEAD"
-PORTBRANCH="ports/head@rHEAD"
-NODOC=yes
+load_chroot_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset XDEV XDEV_ARCH KERNEL
+	export TARGET="amd64"
+	export TARGET_ARCH="amd64"
+}
 
 # Build target configuration
-# Since this file is sourced by a script that runs another
-# script, these must be exported.
-set -a
-WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
-KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
-CHROOTDIR="/scratch"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="lang/python textproc/gsed"
-XDEV="arm"
-XDEV_ARCH="armv6"
-XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-KERNEL="BEAGLEBONE"
-CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-CROCHETBRANCH="trunk"
-set +a
-
+load_target_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset TARGET TARGET_ARCH
+	export EMBEDDEDPORTS="lang/python textproc/gsed"
+	export XDEV="arm"
+	export XDEV_ARCH="armv6"
+	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+	export KERNEL="BEAGLEBONE"
+	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+	export CROCHETBRANCH="trunk"
+}
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index d932dac9c849..afc53d56f18d 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -1,30 +1,37 @@
+#!/bin/sh
 #
 # $FreeBSD$
 #
 
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head@rHEAD"
+export DOCBRANCH="doc/head@rHEAD"
+export PORTBRANCH="ports/head@rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+export EMBEDDEDPORTS="lang/python textproc/gsed"
+
 # Build chroot configuration
-TARGET="amd64"
-TARGET_ARCH="amd64"
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head@rHEAD"
-DOCBRANCH="doc/head@rHEAD"
-PORTBRANCH="ports/head@rHEAD"
-NODOC=yes
+load_chroot_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset XDEV XDEV_ARCH KERNEL
+	export TARGET="amd64"
+	export TARGET_ARCH="amd64"
+}
 
 # Build target configuration
-# Since this file is sourced by a script that runs another
-# script, these must be exported.
-set -a
-WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
-KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
-CHROOTDIR="/scratch"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="lang/python textproc/gsed"
-XDEV="arm"
-XDEV_ARCH="armv6"
-XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-KERNEL="PANDABOARD"
-CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-CROCHETBRANCH="trunk"
-set +a
-
+load_target_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset TARGET TARGET_ARCH
+	export XDEV="arm"
+	export XDEV_ARCH="armv6"
+	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+	export KERNEL="PANDABOARD"
+	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+	export CROCHETBRANCH="trunk"
+}
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 01137c06244d..22ffb2b10a1a 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -1,32 +1,40 @@
+#!/bin/sh
 #
 # $FreeBSD$
 #
 
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head@rHEAD"
+export DOCBRANCH="doc/head@rHEAD"
+export PORTBRANCH="ports/head@rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+export EMBEDDEDPORTS="lang/python textproc/gsed"
+
 # Build chroot configuration
-TARGET="amd64"
-TARGET_ARCH="amd64"
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head@rHEAD"
-DOCBRANCH="doc/head@rHEAD"
-PORTBRANCH="ports/head@rHEAD"
-NODOC=yes
+load_chroot_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset XDEV XDEV_ARCH KERNEL
+	export TARGET="amd64"
+	export TARGET_ARCH="amd64"
+}
 
 # Build target configuration
-# Since this file is sourced by a script that runs another
-# script, these must be exported.
-set -a
-WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
-KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
-CHROOTDIR="/scratch"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="lang/python textproc/gsed"
-XDEV="arm"
-XDEV_ARCH="armv6"
-XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-KERNEL="RPI-B"
-CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-CROCHETBRANCH="trunk"
-UBOOTSRC="https://github.com/gonzoua/u-boot-pi"
-UBOOTBRANCH="trunk"
-UBOOTDIR="/tmp/crochet/u-boot-rpi"
-set +a
+load_target_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset TARGET TARGET_ARCH
+	export XDEV="arm"
+	export XDEV_ARCH="armv6"
+	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+	export KERNEL="RPI-B"
+	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+	export CROCHETBRANCH="trunk"
+	export UBOOTSRC="https://github.com/gonzoua/u-boot-pi"
+	export UBOOTBRANCH="trunk"
+	export UBOOTDIR="/tmp/crochet/u-boot-rpi"
+}
diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index 15c257f4ea4c..67933df57aed 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -1,30 +1,37 @@
+#!/bin/sh
 #
 # $FreeBSD$
 #
 
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head@rHEAD"
+export DOCBRANCH="doc/head@rHEAD"
+export PORTBRANCH="ports/head@rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+export EMBEDDEDPORTS="lang/python textproc/gsed"
+
 # Build chroot configuration
-TARGET="amd64"
-TARGET_ARCH="amd64"
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head@rHEAD"
-DOCBRANCH="doc/head@rHEAD"
-PORTBRANCH="ports/head@rHEAD"
-NODOC=yes
+load_chroot_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset XDEV XDEV_ARCH KERNEL
+	export TARGET="amd64"
+	export TARGET_ARCH="amd64"
+}
 
 # Build target configuration
-# Since this file is sourced by a script that runs another
-# script, these must be exported.
-set -a
-WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
-KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
-CHROOTDIR="/scratch"
-EMBEDDEDBUILD=1
-EMBEDDEDPORTS="lang/python textproc/gsed"
-XDEV="arm"
-XDEV_ARCH="armv6"
-XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-KERNEL="WANDBOARD-QUAD"
-CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-CROCHETBRANCH="trunk"
-set +a
-
+load_target_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset TARGET TARGET_ARCH
+	export XDEV="arm"
+	export XDEV_ARCH="armv6"
+	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+	export KERNEL="WANDBOARD-QUAD"
+	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+	export CROCHETBRANCH="trunk"
+}
diff --git a/release/arm/ZEDBOARD.conf b/release/arm/ZEDBOARD.conf
index a1b8ebf3d18a..c35d692d346e 100644
--- a/release/arm/ZEDBOARD.conf
+++ b/release/arm/ZEDBOARD.conf
@@ -1,29 +1,36 @@
+#!/bin/sh
 #
 # $FreeBSD$
 #
 
+# Global variables.
+export SVNROOT="svn://svn.FreeBSD.org/"
+export SRCBRANCH="base/head@rHEAD"
+export DOCBRANCH="doc/head@rHEAD"
+export PORTBRANCH="ports/head@rHEAD"
+export NODOC=yes
+export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+export export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+export CHROOTDIR="/scratch"
+export EMBEDDEDBUILD=1
+
 # Build chroot configuration
-TARGET="amd64"
-TARGET_ARCH="amd64"
-SVNROOT="svn://svn.FreeBSD.org/"
-SRCBRANCH="base/head@rHEAD"
-DOCBRANCH="doc/head@rHEAD"
-PORTBRANCH="ports/head@rHEAD"
-NODOC=yes
+load_chroot_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset XDEV XDEV_ARCH KERNEL
+	export TARGET="amd64"
+	export TARGET_ARCH="amd64"
+}
 
 # Build target configuration
-# Since this file is sourced by a script that runs another
-# script, these must be exported.
-set -a
-WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
-KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
-CHROOTDIR="/scratch"
-EMBEDDEDBUILD=1
-XDEV="arm"
-XDEV_ARCH="armv6"
-XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-KERNEL="ZEDBOARD"
-CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
-CROCHETBRANCH="trunk"
-set +a
-
+load_target_env() {
+	# Avoid collision with TARGET and XDEV.
+	unset TARGET TARGET_ARCH
+	export XDEV="arm"
+	export XDEV_ARCH="armv6"
+	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
+	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
+	export KERNEL="ZEDBOARD"
+	export CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+	export CROCHETBRANCH="trunk"
+}
diff --git a/release/arm/release.sh b/release/arm/release.sh
index c2b2a1b30755..2261247822d5 100755
--- a/release/arm/release.sh
+++ b/release/arm/release.sh
@@ -95,8 +95,16 @@ main() {
 	# Build the 'xdev' target for crochet.
 	eval chroot ${CHROOTDIR} make -C /usr/src \
 		${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
+		TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
 		${WORLD_FLAGS} xdev
 
+	# Install the cross-build symlinks to /usr/bin to make crochet
+	# happy.
+	eval chroot ${CHROOTDIR} make -C /usr/src \
+		${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
+		TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
+		${WORLD_FLAGS} xdev-links || true
+
 	# Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints
 	# is created.
 	eval chroot ${CHROOTDIR} /etc/rc.d/ldconfig forcerestart
@@ -111,6 +119,9 @@ main() {
 			BATCH=1 FORCE_PKG_REGISTER=1 install clean distclean
 	done
 
+	eval chroot ${CHROOTDIR} make -C /usr/src/gnu/usr.bin/cc \
+		WITH_GCC=1 ${WORLD_FLAGS} -j1 obj depend all install
+
 	mkdir -p ${CHROOTDIR}/tmp/crochet/work
 	before_build
 	install_crochet
diff --git a/release/doc/README b/release/doc/README
index 93cc12b40154..a46779d78f1f 100644
--- a/release/doc/README
+++ b/release/doc/README
@@ -99,10 +99,10 @@ element will be included.  For example:
 
 	<para arch="sparc64">SPARC64-specific text</para>
 
-The currently-supported architectures are amd64, arm, i386, ia64,
-pc98, powerpc, and sparc64.  An element may appear for multiple
-architectures by specifying a comma-separated list of architectures
-(i.e. arch="sparc64,ia64").
+The currently-supported architectures are amd64, arm, i386, pc98,
+powerpc and sparc64.  An element may appear for multiple architectures
+by specifying a comma-separated list of architectures
+(i.e. arch="sparc64,amd64").
 
 When creating a translation, make a new directory under this
 directory with a language code (paralleling the DocProj directory
diff --git a/release/doc/en_US.ISO8859-1/hardware/article.xml b/release/doc/en_US.ISO8859-1/hardware/article.xml
index 90d411827921..8919eefd7de1 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.xml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.xml
@@ -129,10 +129,10 @@
       </itemizedlist>
 
       <para>&intel; EM64T is an extended version of IA-32 (x86) and
-	different from &intel; IA-64 (Itanium) architecture, which
-	&os;/ia64 supports.  Some &intel;'s old documentation refers
-	to &intel; EM64T as <quote>64-bit extension technology</quote>
-	or <quote>IA-32e</quote>.</para>
+	different from &intel; IA-64 (Itanium) architecture.  Some
+	&intel;'s old documentation refers to &intel; EM64T as
+	<quote>64-bit extension technology</quote> or
+	<quote>IA-32e</quote>.</para>
 
       <para>Both Uniprocessor (UP) and Symmetric Multi-processor (SMP)
 	configurations are supported.</para>
@@ -232,41 +232,6 @@
 	more information.</para>
     </sect2>
 
-    <sect2 xml:id="proc-ia64">
-      <title>ia64</title>
-
-      <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>
-
-      <itemizedlist>
-	<listitem>
-	  <para>HP zx1</para>
-	</listitem>
-
-	<listitem>
-	  <para>&intel; 460GX</para>
-	</listitem>
-
-	<listitem>
-	  <para>&intel; E8870</para>
-	</listitem>
-      </itemizedlist>
-
-      <para>Both Uniprocessor (UP) and Symmetric Multi-processor (SMP)
-	configurations are supported.</para>
-
-      <para>Most devices that can be found in or are compatible with
-	&arch.ia64; machines are fully supported.  The notable
-	exception is the VGA console. The &os; support for VGA
-	consoles is at this time too much based on PC hardware and not
-	all &arch.ia64; machines have chipsets that provide sufficient
-	PC legacy support. As such &man.syscons.4; can not be enabled
-	and the use of a serial console is required.</para>
-    </sect2>
-
     <sect2 xml:id="proc-pc98">
       <title>pc98</title>
 
@@ -651,9 +616,8 @@
     <sect2 xml:id="disk">
       <title>Disk Controllers</title>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;,
-	&arch.sparc64;] IDE/ATA controllers (&man.ata.4;
-	driver)</para>
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;, &arch.sparc64;]
+	IDE/ATA controllers (&man.ata.4; driver)</para>
 
       <para>[&arch.pc98;] IDE/ATA controllers (wdc driver)</para>
 
@@ -1124,8 +1088,8 @@
       <para>[&arch.i386;] DigiBoard intelligent serial cards (digi
 	driver)</para>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;] PCI-Based
-	multi-port serial boards (&man.puc.4; driver)</para>
+      <para>[&arch.amd64;, &arch.i386;] PCI-Based multi-port serial
+	boards (&man.puc.4; driver)</para>
 
       <itemizedlist>
 	<listitem>
@@ -1146,10 +1110,6 @@
 	    4-port serial and dual port RS232/422/485</para>
 	</listitem>
 
-	<listitem>
-	  <para>[&arch.ia64;] Diva Serial (GSP) Multiport UART</para>
-	</listitem>
-
 	<listitem>
 	  <para>[&arch.amd64;, &arch.i386;] Dolphin Peripherals
 	    4025/4035/4036</para>
@@ -1428,7 +1388,7 @@
     <sect2 xml:id="usb">
       <title>USB Devices</title>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] A
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] A
 	range of USB peripherals are supported; devices known to work
 	are listed in this section.  Owing to the generic nature of
 	most USB devices, with some exceptions any device of a given
@@ -1436,14 +1396,14 @@
 	here.</para>
 
       <note>
-	<para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+	<para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	  USB Ethernet adapters can be found in the section listing
 	  <link linkend="ethernet">Ethernet
 	    interfaces</link>.</para>
       </note>
 
       <note>
-	<para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+	<para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	  USB Bluetooth adapters can be found in <link linkend="bluetooth">Bluetooth</link> section.</para>
       </note>
 
@@ -1451,14 +1411,14 @@
 
       &hwlist.uhci;
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] USB
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] USB
 	2.0 controllers using the EHCI interface (&man.ehci.4;
 	driver)</para>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	Hubs</para>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	Keyboards (&man.ukbd.4; driver)</para>
 
       <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
@@ -1490,7 +1450,7 @@
 
       &hwlist.umodem;
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] Mice
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Mice
 	(&man.ums.4; driver)</para>
 
       &hwlist.ulpt;
@@ -1569,7 +1529,7 @@
 	  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;]
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	Keyboards including:</para>
 
       <itemizedlist>
@@ -1588,12 +1548,12 @@
 	</listitem>
 
 	<listitem>
-	  <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+	  <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	    USB keyboards (&man.ukbd.4; driver)</para>
 	</listitem>
       </itemizedlist>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	Pointing devices including:</para>
 
       <itemizedlist>
@@ -1613,7 +1573,7 @@
 	</listitem>
 
 	<listitem>
-	  <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+	  <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	    USB mice (&man.ums.4; driver)</para>
 	</listitem>
       </itemizedlist>
diff --git a/release/doc/en_US.ISO8859-1/readme/article.xml b/release/doc/en_US.ISO8859-1/readme/article.xml
index 925ddfc7ddf8..bfd6aef94479 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.xml
+++ b/release/doc/en_US.ISO8859-1/readme/article.xml
@@ -68,7 +68,6 @@
       <para>&os; is an operating system based on 4.4 BSD Lite for
 	AMD64 and Intel EM64T based PC hardware (&arch.amd64;),
 	Intel, AMD, Cyrix or NexGen <quote>x86</quote> based PC hardware (&arch.i386;),
-	Intel Itanium Processor based computers (&arch.ia64;),
 	NEC PC-9801/9821 series PCs and compatibles (&arch.pc98;),
 	and &ultrasparc; machines (&arch.sparc64;).  Versions
 	for the &arm; (&arch.arm;), &mips; (&arch.mips;), and
@@ -326,7 +325,7 @@
       </para>
 
       <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
+	&arch.amd64;, &arch.i386;, &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.bsdinstall.8; utility.</para>
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index 1d0f898f6f26..1a8d36fb02ee 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -108,10 +108,6 @@
   <sect2 xml:id="kernel">
     <title>Kernel Changes</title>
 
-    <para revision="260888">The <filename>VT</filename> kernel
-      configuration file has been added, which enables the new
-      <literal>vt</literal> console driver.</para>
-
     <para revision="260903">Support for GPS ports has been added to
       &man.uhso.4;.</para>
 
@@ -160,6 +156,23 @@
       &man.sysctl.8; on &intel; processors with Turbo
       Boost&nbsp;&trade; enabled has been fixed.</para>
 
+    <para revision="266531">The <literal>IMAGACT_BINMISC</literal>
+      kernel configuration option has been enabled by default,
+      which enables application execution through emulators, such
+      as <application>Qemu</application>.</para>
+
+    <para revision="266757" contrib="sponsor"
+	sponsor="&chelsio;">Support for the &man.cxgbe.4; Terminator 5
+      (T5) 10G/40G cards has been added to &man.netmap.4;.</para>
+
+    <para revision="268045">The <literal>VT</literal> kernel
+      configuration file has been removed, and the &man.vt.4;
+      driver is included in the <literal>GENERIC</literal> kernel.
+      To enable &man.vt.4;, enter <literal>set kern.vty=vt</literal>
+      at the &man.loader.8; prompt during boot, or add
+      <literal>kern.vty=vt</literal> to &man.loader.conf.5; and
+      reboot the system.</para>
+
     <sect3 xml:id="kernel-virtualization">
       <title>Virtualization support</title>
 
@@ -187,6 +200,15 @@
 
       <para revision="260847">The &man.virtio_random.4; driver has
 	been added to harvest entropy from the host system.</para>
+
+      <para revision="267536" contrib="sponsor"
+	sponsor="&citrix.rd;">Support for running a &os;/&arch.amd64;
+	<application>Xen</application> guest instance as
+	<acronym>PVH</acronym> guest has been added.
+	<acronym>PVH</acronym> mode, short for <quote>Para-Virtualized
+	  Hardware</quote>, uses para-virtualized drivers for boot
+	and I/O, and uses hardware virtualization extensions for all
+	other tasks, without the need for emulation.</para>
     </sect3>
 
     <sect3 xml:id="kernel-arm">
@@ -205,6 +227,12 @@
     <sect3 xml:id="proc">
       <title>Hardware Support</title>
 
+      <para revision="268303">The &man.asmc.4; driver has been updated
+	to support the &apple;&nbsp;MacMini 3,1.</para>
+
+      <para revision="268351">Support for &os;/ia64 has been dropped
+	as of &os;&nbsp;11.</para>
+
       <sect4 xml:id="mm">
 	<title>Multimedia Support</title>
 
@@ -234,6 +262,10 @@
 	<para revision="265348" contrib="sponsor"
 	  sponsor="&netgate;">The &man.ath.hal.4; driver has been
 	  updated to support the Atheros AR1111 chipset.</para>
+
+	<para revision="266770">Support for the &intel;
+	  Centrino&trade; Wireless-N 105 chipset has been
+	  added.</para>
       </sect4>
     </sect3>
 
@@ -248,7 +280,9 @@
     <sect3 xml:id="disks">
       <title>Disks and Storage</title>
 
-      <para>&nbsp;</para>
+      <para revision="267359">Support for the
+	<literal>disklabel64</literal> partitioning scheme has been
+	added to &man.gpart.8;.</para>
     </sect3>
 
     <sect3 xml:id="fs">
@@ -317,7 +351,7 @@
 
     <para revision="266209">The &man.pmcstat.8; utility has been
       updated to include a new flag, <literal>-l</literal>, which
-      adds event collection after the specified number of
+      ends event collection after the specified number of
       seconds.</para>
 
     <para revision="266463">The default &man.newsyslog.conf.5; now
@@ -326,6 +360,11 @@
       <filename>/usr/local/etc/newsyslog.conf.d/</filename>
       directories by default for &man.newsyslog.8;.</para>
 
+    <para revision="268461">The &man.readline.3; library is now
+      statically linked in software within the base system, and the
+      shared library is no longer installed, allowing the Ports
+      Collection to use a modern version of the library.</para>
+
     <sect3 xml:id="rc-scripts">
       <title><filename>/etc/rc.d</filename> Scripts</title>
 
diff --git a/release/doc/share/examples/Makefile.relnotesng b/release/doc/share/examples/Makefile.relnotesng
index 4f97ee5a1b75..9607e283a071 100644
--- a/release/doc/share/examples/Makefile.relnotesng
+++ b/release/doc/share/examples/Makefile.relnotesng
@@ -6,7 +6,7 @@
 # the build tree.
 #
 
-ARCHS=		amd64 ia64 i386 pc98 powerpc sparc64
+ARCHS=		amd64 i386 pc98 powerpc sparc64
 MULTITEXTS=	
 UNITEXTS=	hardware readme relnotes errata
 
diff --git a/release/doc/share/misc/dev.archlist.txt b/release/doc/share/misc/dev.archlist.txt
index ad7a6afa4ba0..6872ec0c007b 100644
--- a/release/doc/share/misc/dev.archlist.txt
+++ b/release/doc/share/misc/dev.archlist.txt
@@ -35,43 +35,43 @@
 # Empty lines, and lines beginning with "#" are ignored.
 # <Driver name><tab><arch>[,<arch>...]
 #
-aac	i386,ia64,amd64
+aac	i386,amd64
 adv	i386,pc98,amd64
 adw	i386,pc98,amd64
 aha	i386
 ahb	i386
-ahd	i386,sparc64,ia64,amd64
+ahd	i386,sparc64,amd64
 aic	i386,pc98,amd64
 amd	i386,pc98,amd64
 arcmsr	i386,amd64
 asr	i386
 ath	i386,pc98,amd64,sparc64
-aue	i386,pc98,ia64,amd64,powerpc
+aue	i386,pc98,amd64,powerpc
 axe	i386,pc98,amd64,powerpc
 bce	i386,amd64
-bge	i386,pc98,sparc64,ia64,amd64
+bge	i386,pc98,sparc64,amd64
 bktr	i386,pc98
 bt	i386,amd64
 bxe	i386,amd64
-cdce	i386,pc98,ia64,amd64,powerpc
-ciss	i386,ia64,amd64
+cdce	i386,pc98,amd64,powerpc
+ciss	i386,amd64
 ce	i386,pc98
 cm	i386
 cnw	i386,pc98,amd64
 cp	i386,pc98
 ct	pc98
 ctau	i386
-cue	i386,pc98,ia64,amd64,powerpc
+cue	i386,pc98,amd64,powerpc
 cx	i386
 cxgb	i386,amd64
-de	i386,pc98,ia64,amd64
-dpt	i386,ia64,amd64
+de	i386,pc98,amd64
+dpt	i386,amd64
 ed	i386,pc98
 ep	i386,pc98,amd64
 esp	sparc64
 ex	i386,amd64
 fe	i386,pc98,amd64
-fwohci	i386,sparc64,ia64,amd64,powerpc
+fwohci	i386,sparc64,amd64,powerpc
 hifn	i386,pc98,amd64
 hpt27xx	i386,amd64
 hptiop	i386,amd64
@@ -79,15 +79,15 @@ hptmv	i386,amd64
 hptrr	i386,amd64
 ida	i386
 ie	i386
-iir	i386,ia64,amd64
+iir	i386,amd64
 ips	i386,amd64
 isci	i386,amd64
 ixgb	i386,amd64
-kue	i386,pc98,ia64,amd64,powerpc
+kue	i386,pc98,amd64,powerpc
 lge	i386,pc98,amd64
-mfi	i386,ia64,amd64
-mlx	i386,ia64,amd64
-mly	i386,ia64,amd64
+mfi	i386,amd64
+mlx	i386,amd64
+mly	i386,amd64
 msk	i386,amd64
 mxge	i386,amd64
 my	i386,pc98
@@ -99,9 +99,9 @@ ng_ubt	i386,pc98,amd64
 nsp	i386,pc98
 nxge	i386,amd64
 oce	i386,amd64
-ohci	i386,pc98,ia64,amd64,powerpc
+ohci	i386,pc98,amd64,powerpc
 oltr	i386
-pcn	i386,pc98,ia64,amd64
+pcn	i386,pc98,amd64
 pst	i386
 qlxgb	amd64
 qlxgbe	amd64
@@ -113,7 +113,7 @@ rue	i386,pc98,amd64
 rum	i386,amd64
 run	i386,amd64
 safe	i386,pc98,amd64
-sbp	i386,sparc64,ia64,amd64
+sbp	i386,sparc64,amd64
 sfgxe	amd64
 sn	i386,amd64
 snc	pc98
@@ -160,7 +160,7 @@ ubser	i386,pc98,amd64
 ucycom	i386,pc98,amd64
 udav	i386,pc98,amd64
 uftdi	i386,pc98,amd64
-uhci	i386,pc98,ia64,amd64,powerpc
+uhci	i386,pc98,amd64,powerpc
 ulpt	i386,pc98,amd64,powerpc
 umass	i386,pc98,amd64,powerpc
 umodem	i386,pc98,amd64
@@ -170,7 +170,7 @@ urio	i386,pc98,amd64,powerpc
 uvisor	i386,pc98,amd64
 uvscom	i386,pc98,amd64
 vpo	i386
-vx	i386,pc98,ia64,amd64
+vx	i386,pc98,amd64
 vxge	i386,amd64
 wb	i386,pc98,amd64
 xe	i386,amd64
diff --git a/release/doc/share/xml/release.ent b/release/doc/share/xml/release.ent
index 2c36985d023a..bdd58b70bd6a 100644
--- a/release/doc/share/xml/release.ent
+++ b/release/doc/share/xml/release.ent
@@ -65,7 +65,6 @@
 <!ENTITY arch.amd64 "amd64">
 <!ENTITY arch.arm "arm">
 <!ENTITY arch.i386 "i386">
-<!ENTITY arch.ia64 "ia64">
 <!ENTITY arch.mips "mips">
 <!ENTITY arch.pc98 "pc98">
 <!ENTITY arch.powerpc "powerpc">
diff --git a/release/doc/share/xml/sponsor.ent b/release/doc/share/xml/sponsor.ent
index 6e01090d3435..6e35b8e48680 100644
--- a/release/doc/share/xml/sponsor.ent
+++ b/release/doc/share/xml/sponsor.ent
@@ -10,13 +10,18 @@
 
 <!ENTITY afrl		"AFRL">
 
+<!ENTITY chelsio	"Chelsio Communications">
+
+<!ENTITY citrix		"Citrix Systems">
+<!ENTITY citrix.rd	"Citrix Systems R&amp;D">
+
 <!ENTITY darpa		"DARPA">
 <!ENTITY darpa_afrl	"DARPA, AFRL">
 
 <!ENTITY ff		"The&nbsp;&os;&nbsp;Foundation">
 <!ENTITY ff.url		"https://www.FreeBSDFoundation.org/">
 
-<!ENTITY google		"Google, Inc.">
+<!ENTITY google		"Google">
 
 <!ENTITY lsi		"LSI">
 
diff --git a/release/ia64/make-memstick.sh b/release/ia64/make-memstick.sh
deleted file mode 100755
index c9ff580d2f87..000000000000
--- a/release/ia64/make-memstick.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-#
-# This script generates a "memstick image" (image that can be copied to a
-# USB memory stick) from a directory tree.  Note that the script does not
-# clean up after itself very well for error conditions on purpose so the
-# problem can be diagnosed (full filesystem most likely but ...).
-#
-# Usage: make-memstick.sh <directory tree> <image filename>
-#
-# $FreeBSD$
-#
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-export PATH
-
-BLOCKSIZE=10240
-
-if [ $# -ne 2 ]; then
-  echo "make-memstick.sh /path/to/directory /path/to/image/file"
-  exit 1
-fi
-
-if [ ! -d ${1} ]; then
-  echo "${1} must be a directory"
-  exit 1
-fi
-
-if [ -e ${2} ]; then
-  echo "won't overwrite ${2}"
-  exit 1
-fi
-
-makefs -B little ${2} ${1}
-if [ $? -ne 0 ]; then
-  echo "makefs failed"
-  exit 1
-fi
-
diff --git a/release/ia64/mkisoimages.sh b/release/ia64/mkisoimages.sh
deleted file mode 100644
index 20b015392351..000000000000
--- a/release/ia64/mkisoimages.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-#
-# Module: mkisoimages.sh
-# Author: Jordan K Hubbard
-# Date:   22 June 2001
-#
-# $FreeBSD$
-#
-# This script is used by release/Makefile to build the (optional) ISO images
-# for a FreeBSD release.  It is considered architecture dependent since each
-# platform has a slightly unique way of making bootable CDs.  This script
-# is also allowed to generate any number of images since that is more of
-# publishing decision than anything else.
-#
-# Usage:
-#
-# mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir]
-#
-# Where -b is passed if the ISO image should be made "bootable" by
-# whatever standards this architecture supports (may be unsupported),
-# image-label is the ISO image label, image-name is the filename of the
-# resulting ISO image, base-bits-dir contains the image contents and
-# extra-bits-dir, if provided, contains additional files to be merged
-# into base-bits-dir as part of making the image.
-
-set -e
-
-if [ "x$1" = "x-b" ]; then
-    bootable=yes
-    shift
-else
-    bootable=no
-fi
-
-if [ $# -lt 3 ]; then
-    echo usage: $0 '[-b] label iso-name base-dir [extra-dir]'
-    exit 1
-fi
-
-LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
-NAME=$1; shift
-BASE=$1; shift
-
-EFIPART=efipart.sys
-
-# To create a bootable CD under EFI, the boot image should be an EFI
-# system partition.
-if [ $bootable = yes ]; then
-    EFISZ=65536
-    MNT=/mnt
-    dd if=/dev/zero of=$EFIPART count=$EFISZ
-    md=`mdconfig -a -t vnode -f $EFIPART`
-    newfs_msdos -F 12 -S 512 -h 4 -o 0 -s $EFISZ -u 16 $md
-    mount -t msdosfs /dev/$md $MNT
-    mkdir -p $MNT/efi/boot $MNT/boot $MNT/boot/kernel
-    cp -R $BASE/boot/defaults $MNT/boot
-    cp $BASE/boot/kernel/kernel $MNT/boot/kernel
-    if [ -s $BASE/boot/kernel/ispfw.ko ]; then
-	cp $BASE/boot/kernel/ispfw.ko $MNT/boot/kernel
-    fi
-    cp $BASE/boot/device.hints $MNT/boot
-    cp $BASE/boot/loader.* $MNT/boot
-    if [ -s $BASE/boot/mfsroot.gz ]; then
-	cp $BASE/boot/mfsroot.gz $MNT/boot
-    fi
-    cp $BASE/boot/color.4th $MNT/boot
-    cp $BASE/boot/support.4th $MNT/boot
-    cp $BASE/boot/check-password.4th $MNT/boot
-    cp $BASE/boot/screen.4th $MNT/boot
-    mv $MNT/boot/loader.efi $MNT/efi/boot/bootia64.efi
-    echo kern.cam.boot_delay=\"3000\" >> $MNT/boot/loader.conf
-    echo vfs.root.mountfrom=\"cd9660:iso9660/$LABEL\" >> $MNT/boot/loader.conf
-    umount $MNT
-    mdconfig -d -u $md
-    BOOTOPTS="-o bootimage=i386;$EFIPART -o no-emul-boot"
-else
-    BOOTOPTS=""
-fi
-
-publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
-echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $BASE/etc/fstab
-makefs -t cd9660 $BOOTOPTS -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $BASE $*
-rm $BASE/etc/fstab
-rm -f $EFIPART
-exit 0
diff --git a/release/release.conf.sample b/release/release.conf.sample
index 66f0cf99cfd8..bdd5a8a05d91 100644
--- a/release/release.conf.sample
+++ b/release/release.conf.sample
@@ -3,6 +3,11 @@
 # $FreeBSD$
 #
 
+## Redefine environment variables here to override prototypes
+## defined in release.sh.
+#load_chroot_env() { }
+#load_target_env() { }
+
 ## Set the directory within which the release will be built.
 CHROOTDIR="/scratch"
 
diff --git a/release/release.sh b/release/release.sh
index 73b706e223f1..9d345a0d7a92 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -39,6 +39,10 @@
 PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin"
 export PATH
 
+# Prototypes that can be redefined per-chroot or per-target.
+load_chroot_env() { }
+load_target_env() { }
+
 # The directory within which the release will be built.
 CHROOTDIR="/scratch"
 RELENGDIR="$(realpath $(dirname $(basename ${0})))"
@@ -124,10 +128,6 @@ DOCBRANCH="${SVNROOT}${DOCBRANCH}"
 PORTBRANCH="${SVNROOT}${PORTBRANCH}"
 
 if [ -n "${EMBEDDEDBUILD}" ]; then
-	if [ -z "${XDEV}" ] || [ -z "${XDEV_ARCH}" ]; then
-		echo "ERROR: XDEV and XDEV_ARCH must be set in ${RELEASECONF}."
-		exit 1
-	fi
 	WITH_DVD=
 	WITH_COMPRESSED_IMAGES=
 	NODOC=yes
@@ -161,6 +161,7 @@ if [ -n "${TARGET}" ] && [ -n "${TARGET_ARCH}" ]; then
 else
 	ARCH_FLAGS=
 fi
+load_chroot_env
 CHROOT_MAKEENV="${CHROOT_MAKEENV} MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
 CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}"
 CHROOT_IMAKEFLAGS="${CONF_FILES}"
@@ -229,6 +230,7 @@ if [ -n "${EMBEDDEDBUILD}" ]; then
 	# release/, copy it to the /tmp/external directory within the chroot.
 	# This allows building embedded releases without relying on updated
 	# scripts and/or configurations to exist in the branch being built.
+	load_target_env
 	if [ -e ${RELENGDIR}/tools/${XDEV}/crochet-${KERNEL}.conf ] && \
 		[ -e ${RELENGDIR}/${XDEV}/release.sh ]; then
 			mkdir -p ${CHROOTDIR}/tmp/external/${XDEV}/
@@ -261,6 +263,7 @@ if [ -d ${CHROOTDIR}/usr/ports ]; then
 	fi
 fi
 
+load_target_env
 eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld
 eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel
 eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
diff --git a/release/scripts/mm-mtree.sh b/release/scripts/mm-mtree.sh
index 644f309f3c09..ef971027d456 100755
--- a/release/scripts/mm-mtree.sh
+++ b/release/scripts/mm-mtree.sh
@@ -5,7 +5,7 @@
 # This script is intended to be used as part of the release building
 # process to generate the /var/db/mergemaster.mtree file relevant to
 # the source tree used to create the release so that users can make
-# use of mergemaster's -U option to update their files after csup'ing
+# use of mergemaster's -U option to update their files after updating
 # to -stable.
 
 # Copyright 2009 Douglas Barton
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 5de7b7286ba0..a16d7f241174 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -52,7 +52,7 @@ CRUNCH_SRCDIRS+= bin
 CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo 	\
 	 ed expr getfacl hostname kenv kill ln ls mkdir mv	\
 	 pkill ps pwd realpath rm rmdir setfacl sh stty sync test
-CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -ll -ltermcap -lutil
+CRUNCH_LIBS+= -lcrypt -ledit -ljail -lkvm -ll -ltermcapw -lutil
 CRUNCH_BUILDTOOLS+= bin/sh
 
 # Additional options for specific programs
@@ -118,11 +118,15 @@ CRUNCH_PROGS_sbin+= zpool
 # crunchgen does not like C++ programs; this should be fixed someday
 # CRUNCH_PROGS+= devd
 
-CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec
+CRUNCH_LIBS+= -lalias -lcam -lncursesw -ldevstat -lipsec
 .if ${MK_ZFS} != "no"
 CRUNCH_LIBS+= -lavl -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem
 .endif
-CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lsbuf -lufs -lz
+CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv
+.if ${MK_OPENSSL} == "no"
+CRUNCH_LIBS+= -lmd
+.endif
+CRUNCH_LIBS+= -lsbuf -lufs -lz
 
 .if ${MACHINE_CPUARCH} == "i386"
 CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
@@ -136,10 +140,6 @@ CRUNCH_PROGS_sbin+= bsdlabel
 CRUNCH_SRCDIR_fdisk= $(.CURDIR)/../../sbin/fdisk_pc98
 .endif
 
-.if ${MACHINE_CPUARCH} == "ia64"
-CRUNCH_PROGS_sbin+= mca
-.endif
-
 .if ${MACHINE_CPUARCH} == "sparc64"
 CRUNCH_PROGS_sbin+= bsdlabel sunlabel
 .endif
@@ -191,10 +191,11 @@ CRUNCH_ALIAS_xz= unxz lzma unlzma xzcat lzcat
 CRUNCH_LIBS+= -llzma
 
 CRUNCH_PROGS_usr.bin+= tar
-CRUNCH_LIBS+= -larchive -lmd
+CRUNCH_LIBS+= -larchive
 .if ${MK_OPENSSL} != "no"
 CRUNCH_LIBS+= -lcrypto
 .endif
+CRUNCH_LIBS+= -lmd
 
 CRUNCH_PROGS_usr.bin+= vi
 CRUNCH_ALIAS_vi= ex
diff --git a/sbin/Makefile.ia64 b/sbin/Makefile.ia64
deleted file mode 100644
index c1e6a417ac88..000000000000
--- a/sbin/Makefile.ia64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-SUBDIR += mca
diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index 6f0f15e49b97..1bd1391b8ccb 100644
--- a/sbin/adjkerntz/adjkerntz.8
+++ b/sbin/adjkerntz/adjkerntz.8
@@ -190,4 +190,4 @@ The
 utility appeared in
 .Fx 1.0 .
 .Sh AUTHORS
-.An Andrey A. Chernov Aq ache@astral.msk.su
+.An Andrey A. Chernov Aq Mt ache@astral.msk.su
diff --git a/sbin/atm/atmconfig/atmconfig.8 b/sbin/atm/atmconfig/atmconfig.8
index 1ff76a100cd8..c8a740cea59b 100644
--- a/sbin/atm/atmconfig/atmconfig.8
+++ b/sbin/atm/atmconfig/atmconfig.8
@@ -316,4 +316,4 @@ List all NATM routes.
 .Xr natmip 4 ,
 .Xr atm 8
 .Sh AUTHORS
-.An Hartmut Brandt Aq harti@FreeBSD.org
+.An Hartmut Brandt Aq Mt harti@FreeBSD.org
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index d31187be1e73..e0f3752c295b 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -109,7 +109,7 @@ argument forces
 .Nm
 to use a layout suitable for a different architecture.
 Current valid values are
-.Cm i386 , amd64 , ia64 ,
+.Cm i386 , amd64 , 
 and
 .Cm pc98 .
 If this option is omitted,
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index ce5d375f3181..b99c27918594 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -165,7 +165,6 @@ main(int argc, char *argv[])
 			case 'm':
 				if (!strcmp(optarg, "i386") ||
 				    !strcmp(optarg, "amd64") ||
-				    !strcmp(optarg, "ia64") ||
 				    !strcmp(optarg, "pc98")) {
 					labelsoffset = 1;
 					labeloffset = 0;
diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile
index 68633757c3df..4f11f195db5b 100644
--- a/sbin/camcontrol/Makefile
+++ b/sbin/camcontrol/Makefile
@@ -3,7 +3,7 @@
 PROG=	camcontrol
 SRCS=	camcontrol.c util.c
 .if !defined(RELEASE_CRUNCH)
-SRCS+=	fwdownload.c modeedit.c progress.c
+SRCS+=	fwdownload.c modeedit.c persist.c progress.c
 .else
 CFLAGS+= -DMINIMALISTIC
 .endif
diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8
index 856edc41c8d9..0c42564dfc4e 100644
--- a/sbin/camcontrol/camcontrol.8
+++ b/sbin/camcontrol/camcontrol.8
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 6, 2013
+.Dd November 20, 2013
 .Dt CAMCONTROL 8
 .Os
 .Sh NAME
@@ -269,6 +269,21 @@
 .Op Fl U Ar pwd
 .Op Fl y
 .Nm
+.Ic persist
+.Op device id
+.Op generic args
+.Aq Fl i Ar action | Fl o Ar action
+.Op Fl a
+.Op Fl I Ar trans_id
+.Op Fl k Ar key
+.Op Fl K Ar sa_key
+.Op Fl p
+.Op Fl R Ar rel_tgt_port
+.Op Fl s Ar scope
+.Op Fl S
+.Op Fl T Ar res_type
+.Op Fl U
+.Nm
 .Ic help
 .Sh DESCRIPTION
 The
@@ -1473,6 +1488,276 @@ to output a line for every firmware segment that is sent to the device by the
 fwdownload command
 -- the same as the ones shown in simulation mode.
 .El
+.It Ic persist
+Persistent reservation support.
+Persistent reservations are a way to reserve a particular
+.Tn SCSI
+LUN for use by one or more
+.Tn SCSI
+initiators.
+If the
+.Fl i
+option is specified,
+.Nm
+will issue the
+.Tn SCSI
+PERSISTENT RESERVE IN
+command using the requested service action.
+If the
+.Fl o
+option is specified,
+.Nm
+will issue the
+.Tn SCSI
+PERSISTENT RESERVE OUT
+command using the requested service action.
+One of those two options is required.
+.Pp
+Persistent reservations are complex, and fully explaining them is outside
+the scope of this manual.
+Please visit
+http://www.t10.org
+and download the latest SPC spec for a full explanation of persistent
+reservations.
+.Bl -tag -width 8n
+.It Fl i Ar mode
+Specify the service action for the PERSISTENT RESERVE IN command.
+Supported service actions:
+.Bl -tag -width 19n
+.It read_keys
+Report the current persistent reservation generation (PRgeneration) and any
+registered keys.
+.It read_reservation
+Report the persistent reservation, if any.
+.It report_capabilities
+Report the persistent reservation capabilities of the LUN.
+.It read_full_status
+Report the full status of persistent reservations on the LUN.
+.El
+.It Fl o Ar mode
+Specify the service action for the PERSISTENT RESERVE OUT command.
+For service actions like register that are components of other service
+action names, the entire name must be specified.
+Otherwise, enough of the service action name must be specified to
+distinguish it from other possible service actions.
+Supported service actions:
+.Bl -tag -width 15n
+.It register
+Register a reservation key with the LUN or unregister a reservation key.
+To register a key, specify the requested key as the Service Action
+Reservation Key.
+To unregister a key, specify the previously registered key as the
+Reservation Key.
+To change a key, specify the old key as the Reservation Key and the new
+key as the Service Action Reservation Key.
+.It register_ignore
+This is similar to the register subcommand, except that the Reservation Key
+is ignored.
+The Service Action Reservation Key will overwrite any previous key
+registered for the initiator.
+.It reserve
+Create a reservation.
+A key must be registered with the LUN before the LUN can be reserved, and
+it must be specified as the Reservation Key.
+The type of reservation must also be specified.
+The scope defaults to LUN scope (LU_SCOPE), but may be changed.
+.It release
+Release a reservation.
+The Reservation Key must be specified.
+.It clear
+Release a reservation and remove all keys from the device.
+The Reservation Key must be specified.
+.It preempt
+Remove a reservation belonging to another initiator.
+The Reservation Key must be specified.
+The Service Action Reservation Key may be specified, depending on the
+operation being performed.
+.It preempt_abort
+Remove a reservation belonging to another initiator and abort all
+outstanding commands from that initiator.
+The Reservation Key must be specified.
+The Service Action Reservation Key may be specified, depending on the
+operation being performed.
+.It register_move
+Register another initiator with the LUN, and establish a reservation on the
+LUN for that initiator.
+The Reservation Key and Service Action Reservation Key must be specified.
+.It replace_lost
+Replace Lost Reservation information.
+.El
+.It Fl a
+Set the All Target Ports (ALL_TG_PT) bit.
+This requests that the key registration be applied to all target ports and
+not just the particular target port that receives the command.
+This only applies to the register and register_ignore actions.
+.It Fl I Ar tid
+Specify a Transport ID.
+This only applies to the Register and Register and Move service actions for
+Persistent Reserve Out.
+Multiple Transport IDs may be specified with multiple
+.Fl I
+arguments.
+With the Register service action, specifying one or more Transport IDs
+implicitly enables the
+.Fl S
+option which turns on the SPEC_I_PT bit.
+Transport IDs generally have the format protocol,id.
+.Bl -tag -width 5n
+.It SAS
+A SAS Transport ID consists of
+.Dq sas,
+followed by a 64-bit SAS address.
+For example:
+.Pp
+.Dl sas,0x1234567812345678
+.It FC
+A Fibre Channel Transport ID consists of
+.Dq fcp,
+followed by a 64-bit Fibre Channel World Wide Name. 
+For example:
+.Pp
+.Dl fcp,0x1234567812345678
+.It SPI
+A Parallel SCSI address consists of
+.Dq spi,
+followed by a SCSI target ID and a relative target port identifier.
+For example:
+.Pp
+.Dl spi,4,1
+.It 1394
+An IEEE 1394 (Firewire) Transport ID consists of
+.Dq sbp,
+followed by a 64-bit EUI-64 IEEE 1394 node unique identifier.
+For example:
+.Pp
+.Dl sbp,0x1234567812345678
+.It RDMA
+A SCSI over RDMA Transport ID consists of
+.Dq srp,
+followed by a 128-bit RDMA initiator port identifier.
+The port identifier must be exactly 32 or 34 (if the leading 0x is
+included) hexadecimal digits.
+Only hexadecimal (base 16) numbers are supported.
+For example:
+.Pp
+.Dl srp,0x12345678123456781234567812345678
+.It iSCSI
+An iSCSI Transport ID consists an iSCSI name and optionally a separator and
+iSCSI session ID.
+For example, if only the iSCSI name is specified:
+.Pp
+.Dl iqn.2012-06.com.example:target0
+.Pp
+If the iSCSI separator and initiator session ID are specified:
+.Pp
+.Dl iqn.2012-06.com.example:target0,i,0x123
+.It PCIe
+A SCSI over PCIe Transport ID consists of
+.Dq sop,
+followed by a PCIe Routing ID.
+The Routing ID consists of a bus, device and function or in the alternate
+form, a bus and function.
+The bus must be in the range of 0 to 255 inclusive and the device must be
+in the range of 0 to 31 inclusive.
+The function must be in the range of 0 to 7 inclusive if the standard form
+is used, and in the range of 0 to 255 inclusive if the alternate form is
+used.
+For example, if a bus, device and function are specified for the standard
+Routing ID form:
+.Pp
+.Dl sop,4,5,1
+.Pp
+If the alternate Routing ID form is used:
+.Pp
+.Dl sop,4,1
+.El
+.It Fl k Ar key
+Specify the Reservation Key.
+This may be in decimal, octal or hexadecimal format.
+The value is zero by default if not otherwise specified.
+The value must be between 0 and 2^64 - 1, inclusive.
+.It Fl K Ar key
+Specify the Service Action Reservation Key.
+This may be in decimal, octal or hexadecimal format.
+The value is zero by default if not otherwise specified.
+The value must be between 0 and 2^64 - 1, inclusive.
+.It Fl p
+Enable the Activate Persist Through Power Loss bit.
+This is only used for the register and register_ignore actions.
+This requests that the reservation persist across power loss events.
+.It Fl s Ar scope
+Specify the scope of the reservation.
+The scope may be specified by name or by number.
+The scope is ignored for register, register_ignore and clear.
+If the desired scope isn't available by name, you may specify the number.
+.Bl -tag -width 7n
+.It lun
+LUN scope (0x00).
+This encompasses the entire LUN.
+.It extent
+Extent scope (0x01).
+.It element
+Element scope (0x02).
+.El
+.It Fl R Ar rtp
+Specify the Relative Target Port.
+This only applies to the Register and Move service action of the Persistent
+Reserve Out command.
+.It Fl S
+Enable the SPEC_I_PT bit.
+This only applies to the Register service action of Persistent Reserve Out.
+You must also specify at least one Transport ID with
+.Fl I
+if this option is set.
+If you specify a Transport ID, this option is automatically set.
+It is an error to specify this option for any service action other than
+Register.
+.It Fl T Ar type
+Specify the reservation type.
+The reservation type may be specified by name or by number.
+If the desired reservation type isn't available by name, you may specify
+the number.
+Supported reservation type names:
+.Bl -tag -width 11n
+.It read_shared
+Read Shared mode.
+.It wr_ex
+Write Exclusive mode.
+May also be specified as
+.Dq write_exclusive .
+.It rd_ex
+Read Exclusive mode.
+May also be specified as
+.Dq read_exclusive .
+.It ex_ac
+Exclusive access mode.
+May also be specified as
+.Dq exclusive_access .
+.It wr_ex_ro
+Write Exclusive Registrants Only mode.
+May also be specified as 
+.Dq write_exclusive_reg_only .
+.It ex_ac_ro
+Exclusive Access Registrants Only mode.
+May also be specified as 
+.Dq exclusive_access_reg_only .
+.It wr_ex_ar
+Write Exclusive All Registrants mode.
+May also be specified as
+.Dq write_exclusive_all_regs .
+.It ex_ac_ar
+Exclusive Access All Registrants mode.
+May also be specified as 
+.Dq exclusive_access_all_regs .
+.El
+.It Fl U
+Specify that the target should unregister the initiator that sent
+the Register and Move request.
+By default, the target will not unregister the initiator that sends the
+Register and Move request.
+This option only applies to the Register and Move service action of the
+Persistent Reserve Out command.
+.El
 .It Ic help
 Print out verbose usage information.
 .El
@@ -1639,6 +1924,66 @@ power-on or hardware reset!
 .Pp
 .Em DO NOT
 use this on a device which has an active filesystem!
+.Pp
+.Bd -literal -offset indent
+camcontrol persist da0 -v -i read_keys
+.Ed
+.Pp
+This will read any persistent reservation keys registered with da0, and
+display any errors encountered when sending the PERSISTENT RESERVE IN
+.Tn SCSI 
+command.
+.Bd -literal -offset indent
+camcontrol persist da0 -v -o register -a -K 0x12345678
+.Ed
+.Pp
+This will register the persistent reservation key 0x12345678 with da0,
+apply that registration to all ports on da0, and display any errors that
+occur when sending the PERSISTENT RESERVE OUT command.
+.Bd -literal -offset indent
+camcontrol persist da0 -v -o reserve -s lun -k 0x12345678 -T ex_ac
+.Ed
+.Pp
+This will reserve da0 for the exlusive use of the initiator issuing the
+command.
+The scope of the reservation is the entire LUN.
+Any errors sending the PERSISTENT RESERVE OUT command will be displayed.
+.Bd -literal -offset indent
+camcontrol persist da0 -v -i read_full
+.Ed
+.Pp
+This will display the full status of all reservations on da0 and print out
+status if there are any errors.
+.Bd -literal -offset indent
+camcontrol persist da0 -v -o release -k 0x12345678 -T ex_ac
+.Ed
+.Pp
+This will release a reservation on da0 of the type ex_ac
+(Exclusive Access).
+The Reservation Key for this registration is 0x12345678.
+Any errors that occur will be displayed.
+.Bd -literal -offset indent
+camcontrol persist da0 -v -o register -K 0x12345678 -S \e
+	-I sas,0x1234567812345678 -I sas,0x8765432187654321
+.Ed
+.Pp
+This will register the key 0x12345678 with da0, specifying that it applies
+to the SAS initiators with SAS addresses 0x1234567812345678 and
+0x8765432187654321.
+.Bd -literal -offset indent
+camcontrol persist da0 -v -o register_move -k 0x87654321 \e
+	-K 0x12345678 -U -p -R 2 -I fcp,0x1234567812345678
+.Ed
+.Pp
+This will move the registration from the current initiator, whose
+Registration Key is 0x87654321, to the Fibre Channel initiator with the 
+Fiber Channel World Wide Node Name 0x1234567812345678.
+A new registration key, 0x12345678, will be registered for the initiator 
+with the Fibre Channel World Wide Node Name 0x1234567812345678, and the
+current initiator will be unregistered from the target.
+The reservation will be moved to relative target port 2 on the target
+device.
+The registration will persist across power losses.
 .Sh SEE ALSO
 .Xr cam 3 ,
 .Xr cam_cdbparse 3 ,
@@ -1666,7 +2011,7 @@ and first appeared in
 in
 .Fx 2.0.5 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.org
+.An Kenneth Merry Aq Mt ken@FreeBSD.org
 .Sh BUGS
 The code that parses the generic command line arguments does not know that
 some of the subcommands take multiple arguments.
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index 6783bd3204c4..12a0e5c56849 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -96,6 +96,7 @@ typedef enum {
 	CAM_CMD_SECURITY	= 0x0000001d,
 	CAM_CMD_HPA		= 0x0000001e,
 	CAM_CMD_SANITIZE	= 0x0000001f,
+	CAM_CMD_PERSIST		= 0x00000020
 } cam_cmdmask;
 
 typedef enum {
@@ -218,6 +219,7 @@ static struct camcontrol_opts option_table[] = {
 	{"fwdownload", CAM_CMD_DOWNLOAD_FW, CAM_ARG_NONE, "f:ys"},
 	{"security", CAM_CMD_SECURITY, CAM_ARG_NONE, "d:e:fh:k:l:qs:T:U:y"},
 	{"hpa", CAM_CMD_HPA, CAM_ARG_NONE, "Pflp:qs:U:y"},
+	{"persist", CAM_CMD_PERSIST, CAM_ARG_NONE, "ai:I:k:K:o:ps:ST:U"},
 #endif /* MINIMALISTIC */
 	{"help", CAM_CMD_USAGE, CAM_ARG_NONE, NULL},
 	{"-?", CAM_CMD_USAGE, CAM_ARG_NONE, NULL},
@@ -225,12 +227,6 @@ static struct camcontrol_opts option_table[] = {
 	{NULL, 0, 0, NULL}
 };
 
-typedef enum {
-	CC_OR_NOT_FOUND,
-	CC_OR_AMBIGUOUS,
-	CC_OR_FOUND
-} camcontrol_optret;
-
 struct cam_devitem {
 	struct device_match_result dev_match;
 	int num_periphs;
@@ -7826,6 +7822,9 @@ usage(int printlong)
 "                              [-U <user|master>] [-y]\n"
 "        camcontrol hpa        [dev_id][generic args] [-f] [-l] [-P] [-p pwd]\n"
 "                              [-q] [-s max_sectors] [-U pwd] [-y]\n"
+"        camcontrol persist    [dev_id][generic args] <-i action|-o action>\n"
+"                              [-a][-I tid][-k key][-K sa_key][-p][-R rtp]\n"
+"                              [-s scope][-S][-T type][-U]\n"
 #endif /* MINIMALISTIC */
 "        camcontrol help\n");
 	if (!printlong)
@@ -7862,8 +7861,9 @@ usage(int printlong)
 "idle        send the ATA IDLE command to the named device\n"
 "standby     send the ATA STANDBY command to the named device\n"
 "sleep       send the ATA SLEEP command to the named device\n"
-"fwdownload  program firmware of the named device with the given image"
+"fwdownload  program firmware of the named device with the given image\n"
 "security    report or send ATA security commands to the named device\n"
+"persist     send the SCSI PERSISTENT RESERVE IN or OUT commands\n"
 "help        this message\n"
 "Device Identifiers:\n"
 "bus:target        specify the bus and target, lun defaults to 0\n"
@@ -7998,6 +7998,22 @@ usage(int printlong)
 "                  device\n"
 "-U pwd            unlock the HPA configuration of the device\n"
 "-y                don't ask any questions\n"
+"persist arguments:\n"
+"-i action         specify read_keys, read_reservation, report_cap, or\n"
+"                  read_full_status\n"
+"-o action         specify register, register_ignore, reserve, release,\n"
+"                  clear, preempt, preempt_abort, register_move, replace_lost\n"
+"-a                set the All Target Ports (ALL_TG_PT) bit\n"
+"-I tid            specify a Transport ID, e.g.: sas,0x1234567812345678\n"
+"-k key            specify the Reservation Key\n"
+"-K sa_key         specify the Service Action Reservation Key\n"
+"-p                set the Activate Persist Through Power Loss bit\n"
+"-R rtp            specify the Relative Target Port\n"
+"-s scope          specify the scope: lun, extent, element or a number\n"
+"-S                specify Transport ID for register, requires -I\n"
+"-T res_type       specify the reservation type: read_shared, wr_ex, rd_ex,\n"
+"                  ex_ac, wr_ex_ro, ex_ac_ro, wr_ex_ar, ex_ac_ar\n"
+"-U                unregister the current initiator for register_move\n"
 );
 #endif /* MINIMALISTIC */
 }
@@ -8332,6 +8348,11 @@ main(int argc, char **argv)
 			error = scsisanitize(cam_dev, argc, argv,
 					     combinedopt, retry_count, timeout);
 			break;
+		case CAM_CMD_PERSIST:
+			error = scsipersist(cam_dev, argc, argv, combinedopt,
+			    retry_count, timeout, arglist & CAM_ARG_VERBOSE,
+			    arglist & CAM_ARG_ERR_RECOVER);
+			break;
 #endif /* MINIMALISTIC */
 		case CAM_CMD_USAGE:
 			usage(1);
diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h
index 616236a8b762..7c249bfbcfa8 100644
--- a/sbin/camcontrol/camcontrol.h
+++ b/sbin/camcontrol/camcontrol.h
@@ -30,6 +30,13 @@
 
 #ifndef _CAMCONTROL_H
 #define _CAMCONTROL_H
+
+typedef enum {
+	CC_OR_NOT_FOUND,
+	CC_OR_AMBIGUOUS,
+	CC_OR_FOUND
+} camcontrol_optret;
+
 /*
  * get_hook: Structure for evaluating args in a callback.
  */
@@ -56,6 +63,9 @@ void mode_list(struct cam_device *device, int page_control, int dbd,
 	       int retry_count, int timeout);
 int scsidoinquiry(struct cam_device *device, int argc, char **argv,
 		  char *combinedopt, int retry_count, int timeout);
+int scsipersist(struct cam_device *device, int argc, char **argv,
+		char *combinedopt, int retry_count, int timeout, int verbose,
+		int err_recover);
 char *cget(void *hook, char *name);
 int iget(void *hook, char *name);
 void arg_put(void *hook, int letter, void *arg, int count, char *name);
diff --git a/sbin/camcontrol/persist.c b/sbin/camcontrol/persist.c
new file mode 100644
index 000000000000..bcc1073d2c05
--- /dev/null
+++ b/sbin/camcontrol/persist.c
@@ -0,0 +1,966 @@
+/*-
+ * Copyright (c) 2013 Spectra Logic 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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ *
+ * Authors: Ken Merry           (Spectra Logic Corporation)
+ */
+/*
+ * SCSI Persistent Reservation support for camcontrol(8).
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/ioctl.h>
+#include <sys/stdint.h>
+#include <sys/types.h>
+#include <sys/endian.h>
+#include <sys/sbuf.h>
+#include <sys/queue.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <unistd.h>
+#include <string.h>
+#include <strings.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <limits.h>
+#include <err.h>
+
+#include <cam/cam.h>
+#include <cam/cam_debug.h>
+#include <cam/cam_ccb.h>
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_pass.h>
+#include <cam/scsi/scsi_message.h>
+#include <camlib.h>
+#include "camcontrol.h"
+
+struct persist_transport_id {
+	struct scsi_transportid_header *hdr;
+	unsigned int alloc_len;
+	STAILQ_ENTRY(persist_transport_id) links;
+};
+
+/*
+ * Service Actions for PERSISTENT RESERVE IN.
+ */
+static struct scsi_nv persist_in_actions[] = {
+	{ "read_keys", SPRI_RK },
+	{ "read_reservation", SPRI_RR },
+	{ "report_capabilities", SPRI_RC },
+	{ "read_full_status", SPRI_RS }
+};
+
+/*
+ * Service Actions for PERSISTENT RESERVE OUT.
+ */
+static struct scsi_nv persist_out_actions[] = {
+	{ "register", SPRO_REGISTER },
+	{ "reserve", SPRO_RESERVE },
+	{ "release" , SPRO_RELEASE },
+	{ "clear", SPRO_CLEAR },
+	{ "preempt", SPRO_PREEMPT },
+	{ "preempt_abort", SPRO_PRE_ABO },
+	{ "register_ignore", SPRO_REG_IGNO },
+	{ "register_move", SPRO_REG_MOVE },
+	{ "replace_lost", SPRO_REPL_LOST_RES }
+};
+
+/*
+ * Known reservation scopes.  As of SPC-4, only LU_SCOPE is used in the
+ * spec.  The others are obsolete.
+ */
+static struct scsi_nv persist_scope_table[] = {
+	{ "lun", SPR_LU_SCOPE },
+	{ "extent", SPR_EXTENT_SCOPE },
+	{ "element", SPR_ELEMENT_SCOPE }
+};
+
+/*
+ * Reservation types.  The longer name for a given reservation type is
+ * listed first, so that it makes more sense when we print out the
+ * reservation type.  We step through the table linearly when looking for
+ * the text name for a particular numeric reservation type value.
+ */
+static struct scsi_nv persist_type_table[] = {
+	{ "read_shared", SPR_TYPE_RD_SHARED },
+	{ "write_exclusive", SPR_TYPE_WR_EX },
+	{ "wr_ex", SPR_TYPE_WR_EX },
+	{ "read_exclusive", SPR_TYPE_RD_EX },
+	{ "rd_ex", SPR_TYPE_RD_EX },
+	{ "exclusive_access", SPR_TYPE_EX_AC },
+	{ "ex_ac", SPR_TYPE_EX_AC },
+	{ "write_exclusive_reg_only", SPR_TYPE_WR_EX_RO },
+	{ "wr_ex_ro", SPR_TYPE_WR_EX_RO },
+	{ "exclusive_access_reg_only", SPR_TYPE_EX_AC_RO },
+	{ "ex_ac_ro", SPR_TYPE_EX_AC_RO },
+	{ "write_exclusive_all_regs", SPR_TYPE_WR_EX_AR },
+	{ "wr_ex_ar", SPR_TYPE_WR_EX_AR },
+	{ "exclusive_access_all_regs", SPR_TYPE_EX_AC_AR },
+	{ "ex_ac_ar", SPR_TYPE_EX_AC_AR }
+};
+
+/*
+ * Print out the standard scope/type field.
+ */
+static void
+persist_print_scopetype(uint8_t scopetype)
+{
+	const char *tmpstr;
+	int num_entries;
+
+	num_entries = sizeof(persist_scope_table) /
+		      sizeof(persist_scope_table[0]);
+	tmpstr = scsi_nv_to_str(persist_scope_table, num_entries,
+				scopetype & SPR_SCOPE_MASK);
+	fprintf(stdout, "Scope: %s (%#x)\n", (tmpstr != NULL) ? tmpstr :
+		"Unknown", (scopetype & SPR_SCOPE_MASK) >> SPR_SCOPE_SHIFT);
+
+	num_entries = sizeof(persist_type_table) /
+		      sizeof(persist_type_table[0]);
+	tmpstr = scsi_nv_to_str(persist_type_table, num_entries,
+				scopetype & SPR_TYPE_MASK);
+	fprintf(stdout, "Type: %s (%#x)\n", (tmpstr != NULL) ? tmpstr :
+		"Unknown", scopetype & SPR_TYPE_MASK);
+}
+
+static void
+persist_print_transportid(uint8_t *buf, uint32_t len)
+{
+	struct sbuf *sb;
+
+	sb = sbuf_new_auto();
+	if (sb == NULL)
+		fprintf(stderr, "Unable to allocate sbuf\n");
+
+	scsi_transportid_sbuf(sb, (struct scsi_transportid_header *)buf, len);
+
+	sbuf_finish(sb);
+
+	fprintf(stdout, "%s\n", sbuf_data(sb));
+
+	sbuf_delete(sb);
+}
+
+/*
+ * Print out a persistent reservation.  This is used with the READ
+ * RESERVATION (0x01) service action of the PERSISTENT RESERVE IN command.
+ */
+static void
+persist_print_res(struct scsi_per_res_in_header *hdr, uint32_t valid_len)
+{
+	uint32_t length;
+	struct scsi_per_res_in_rsrv *res;
+
+	length = scsi_4btoul(hdr->length);
+	length = MIN(length, valid_len);
+
+	res = (struct scsi_per_res_in_rsrv *)hdr;
+
+	if (length < sizeof(res->data) - sizeof(res->data.extent_length)) {
+		if (length == 0)
+			fprintf(stdout, "No reservations.\n");
+		else
+			warnx("unable to print reservation, only got %u "
+			      "valid bytes", length);
+		return;
+	}
+	fprintf(stdout, "PRgeneration: %#x\n",
+		scsi_4btoul(res->header.generation));
+	fprintf(stdout, "Reservation Key: %#jx\n",
+		(uintmax_t)scsi_8btou64(res->data.reservation));
+	fprintf(stdout, "Scope address: %#x\n",
+		scsi_4btoul(res->data.scope_addr));
+
+	persist_print_scopetype(res->data.scopetype);
+
+	fprintf(stdout, "Extent length: %u\n",
+		scsi_2btoul(res->data.extent_length));
+}
+
+/*
+ * Print out persistent reservation keys.  This is used with the READ KEYS
+ * service action of the PERSISTENT RESERVE IN command.
+ */
+static void
+persist_print_keys(struct scsi_per_res_in_header *hdr, uint32_t valid_len)
+{
+	uint32_t length, num_keys, i;
+	struct scsi_per_res_key *key;
+
+	length = scsi_4btoul(hdr->length);
+	length = MIN(length, valid_len);
+
+	num_keys = length / sizeof(*key);
+
+	fprintf(stdout, "PRgeneration: %#x\n", scsi_4btoul(hdr->generation));
+	fprintf(stdout, "%u key%s%s\n", num_keys, (num_keys == 1) ? "" : "s",
+		(num_keys == 0) ? "." : ":");
+
+	for (i = 0, key = (struct scsi_per_res_key *)&hdr[1]; i < num_keys;
+	     i++, key++) {
+		fprintf(stdout, "%u: %#jx\n", i,
+			(uintmax_t)scsi_8btou64(key->key));
+	}
+}
+
+/*
+ * Print out persistent reservation capabilities.  This is used with the
+ * REPORT CAPABILITIES service action of the PERSISTENT RESERVE IN command.
+ */
+static void
+persist_print_cap(struct scsi_per_res_cap *cap, uint32_t valid_len)
+{
+	uint32_t length;
+	int check_type_mask = 0;
+
+	length = scsi_2btoul(cap->length);
+	length = MIN(length, valid_len);
+
+	if (length < __offsetof(struct scsi_per_res_cap, type_mask)) {
+		fprintf(stdout, "Insufficient data (%u bytes) to report "
+			"full capabilities\n", length);
+		return;
+	}
+	if (length >= __offsetof(struct scsi_per_res_cap, reserved))
+		check_type_mask = 1;
+	
+	fprintf(stdout, "Replace Lost Reservation Capable (RLR_C): %d\n",
+		(cap->flags1 & SPRI_RLR_C) ? 1 : 0);
+	fprintf(stdout, "Compatible Reservation Handling (CRH): %d\n",
+		(cap->flags1 & SPRI_CRH) ? 1 : 0);
+	fprintf(stdout, "Specify Initiator Ports Capable (SIP_C): %d\n",
+		(cap->flags1 & SPRI_SIP_C) ? 1 : 0);
+	fprintf(stdout, "All Target Ports Capable (ATP_C): %d\n",
+		(cap->flags1 & SPRI_ATP_C) ? 1 : 0);
+	fprintf(stdout, "Persist Through Power Loss Capable (PTPL_C): %d\n",
+		(cap->flags1 & SPRI_PTPL_C) ? 1 : 0);
+	fprintf(stdout, "ALLOW COMMANDS field: (%#x)\n",
+		(cap->flags2 & SPRI_ALLOW_CMD_MASK) >> SPRI_ALLOW_CMD_SHIFT);
+	/*
+	 * These cases are cut-and-pasted from SPC4r36l.  There is no
+	 * succinct way to describe these otherwise, and even with the
+	 * verbose description, the user will probably have to refer to
+	 * the spec to fully understand what is going on.
+	 */
+	switch (cap->flags2 & SPRI_ALLOW_CMD_MASK) {
+	case SPRI_ALLOW_1:
+		fprintf(stdout,
+"    The device server allows the TEST UNIT READY command through Write\n"
+"    Exclusive type reservations and Exclusive Access type reservations\n"
+"    and does not provide information about whether the following commands\n"
+"    are allowed through Write Exclusive type reservations:\n"
+"        a) the MODE SENSE command, READ ATTRIBUTE command, READ BUFFER\n"
+"           command, RECEIVE COPY RESULTS command, RECEIVE DIAGNOSTIC\n"
+"           RESULTS command, REPORT SUPPORTED OPERATION CODES command,\n"
+"           and REPORT SUPPORTED TASK MANAGEMENT FUNCTION command; and\n"
+"        b) the READ DEFECT DATA command (see SBC-3).\n");
+		break;
+	case SPRI_ALLOW_2:
+		fprintf(stdout,
+"    The device server allows the TEST UNIT READY command through Write\n"
+"    Exclusive type reservations and Exclusive Access type reservations\n"
+"    and does not allow the following commands through Write Exclusive type\n"
+"    reservations:\n"
+"        a) the MODE SENSE command, READ ATTRIBUTE command, READ BUFFER\n"
+"           command, RECEIVE DIAGNOSTIC RESULTS command, REPORT SUPPORTED\n"
+"           OPERATION CODES command, and REPORT SUPPORTED TASK MANAGEMENT\n"
+"           FUNCTION command; and\n"
+"        b) the READ DEFECT DATA command.\n"
+"    The device server does not allow the RECEIVE COPY RESULTS command\n"
+"    through Write Exclusive type reservations or Exclusive Access type\n"
+"    reservations.\n");
+		break;
+	case SPRI_ALLOW_3:
+		fprintf(stdout,
+"    The device server allows the TEST UNIT READY command through Write\n"
+"    Exclusive type reservations and Exclusive Access type reservations\n"
+"    and allows the following commands through Write Exclusive type\n"
+"    reservations:\n"
+"        a) the MODE SENSE command, READ ATTRIBUTE command, READ BUFFER\n"
+"           command, RECEIVE DIAGNOSTIC RESULTS command, REPORT SUPPORTED\n"
+"           OPERATION CODES command, and REPORT SUPPORTED TASK MANAGEMENT\n"
+"           FUNCTION command; and\n"
+"        b) the READ DEFECT DATA command.\n"
+"    The device server does not allow the RECEIVE COPY RESULTS command\n"
+"    through Write Exclusive type reservations or Exclusive Access type\n"
+"    reservations.\n");
+		break;
+	case SPRI_ALLOW_4:
+		fprintf(stdout,
+"    The device server allows the TEST UNIT READY command and the RECEIVE\n"
+"    COPY RESULTS command through Write Exclusive type reservations and\n"
+"    Exclusive Access type reservations and allows the following commands\n"
+"    through Write Exclusive type reservations:\n"
+"        a) the MODE SENSE command, READ ATTRIBUTE command, READ BUFFER\n"
+"           command, RECEIVE DIAGNOSTIC RESULTS command, REPORT SUPPORTED\n"
+"           OPERATION CODES command, and REPORT SUPPORTED TASK MANAGEMENT\n"
+"           FUNCTION command; and\n"
+"        b) the READ DEFECT DATA command.\n");
+		break;
+	case SPRI_ALLOW_NA:
+		fprintf(stdout,
+"    No information is provided about whether certain commands are allowed\n"
+"    through certain types of persistent reservations.\n");
+		break;
+	default:
+		fprintf(stdout,
+"    Unknown ALLOW COMMANDS value %#x\n",
+			(cap->flags2 & SPRI_ALLOW_CMD_MASK) >>
+			SPRI_ALLOW_CMD_SHIFT);
+		break;
+	}
+	fprintf(stdout, "Persist Through Power Loss Activated (PTPL_A): %d\n",
+		(cap->flags2 & SPRI_PTPL_A) ? 1 : 0);
+	if ((check_type_mask != 0)
+	 && (cap->flags2 & SPRI_TMV)) {
+		fprintf(stdout, "Supported Persistent Reservation Types:\n");
+		fprintf(stdout, "    Write Exclusive - All Registrants "
+			"(WR_EX_AR): %d\n",
+			(cap->type_mask[0] & SPRI_TM_WR_EX_AR)? 1 : 0);
+		fprintf(stdout, "    Exclusive Access - Registrants Only "
+			"(EX_AC_RO): %d\n",
+			(cap->type_mask[0] & SPRI_TM_EX_AC_RO) ? 1 : 0);
+		fprintf(stdout, "    Write Exclusive - Registrants Only "
+			"(WR_EX_RO): %d\n",
+			(cap->type_mask[0] & SPRI_TM_WR_EX_RO)? 1 : 0);
+		fprintf(stdout, "    Exclusive Access (EX_AC): %d\n",
+			(cap->type_mask[0] & SPRI_TM_EX_AC) ? 1 : 0);
+		fprintf(stdout, "    Write Exclusive (WR_EX): %d\n",
+			(cap->type_mask[0] & SPRI_TM_WR_EX) ? 1 : 0);
+		fprintf(stdout, "    Exclusive Access - All Registrants "
+			"(EX_AC_AR): %d\n",
+			(cap->type_mask[1] & SPRI_TM_EX_AC_AR) ? 1 : 0);
+	} else {
+		fprintf(stdout, "Persistent Reservation Type Mask is NOT "
+			"valid\n");
+	}
+
+	
+}
+
+static void
+persist_print_full(struct scsi_per_res_in_header *hdr, uint32_t valid_len)
+{
+	uint32_t length, len_to_go = 0;
+	struct scsi_per_res_in_full_desc *desc;
+	uint8_t *cur_pos;
+	int i;
+
+	length = scsi_4btoul(hdr->length);
+	length = MIN(length, valid_len);
+
+	if (length < sizeof(*desc)) {
+		if (length == 0)
+			fprintf(stdout, "No reservations.\n");
+		else
+			warnx("unable to print reservation, only got %u "
+			      "valid bytes", length);
+		return;
+	}
+
+	fprintf(stdout, "PRgeneration: %#x\n", scsi_4btoul(hdr->generation));
+	cur_pos = (uint8_t *)&hdr[1];
+	for (len_to_go = length, i = 0,
+	     desc = (struct scsi_per_res_in_full_desc *)cur_pos;
+	     len_to_go >= sizeof(*desc);
+	     desc = (struct scsi_per_res_in_full_desc *)cur_pos, i++) {
+		uint32_t additional_length, cur_length;
+
+
+		fprintf(stdout, "Reservation Key: %#jx\n",
+			(uintmax_t)scsi_8btou64(desc->res_key.key));
+		fprintf(stdout, "All Target Ports (ALL_TG_PT): %d\n",
+			(desc->flags & SPRI_FULL_ALL_TG_PT) ? 1 : 0);
+		fprintf(stdout, "Reservation Holder (R_HOLDER): %d\n",
+			(desc->flags & SPRI_FULL_R_HOLDER) ? 1 : 0);
+		
+		if (desc->flags & SPRI_FULL_R_HOLDER)
+			persist_print_scopetype(desc->scopetype);
+
+		if ((desc->flags & SPRI_FULL_ALL_TG_PT) == 0)
+			fprintf(stdout, "Relative Target Port ID: %#x\n",
+				scsi_2btoul(desc->rel_trgt_port_id));
+
+		additional_length = scsi_4btoul(desc->additional_length);
+
+		persist_print_transportid(desc->transport_id,
+					  additional_length);
+
+		cur_length = sizeof(*desc) + additional_length;
+		len_to_go -= cur_length;
+		cur_pos += cur_length;
+	}
+}
+
+int
+scsipersist(struct cam_device *device, int argc, char **argv, char *combinedopt,
+	    int retry_count, int timeout, int verbosemode, int err_recover)
+{
+	union ccb *ccb = NULL;
+	int c, in = 0, out = 0;
+	int action = -1, num_ids = 0;
+	int error = 0;
+	uint32_t res_len = 0;
+	unsigned long rel_tgt_port = 0;
+	uint8_t *res_buf = NULL;
+	int scope = SPR_LU_SCOPE, res_type = 0, key_set = 0, sa_key_set = 0;
+	struct persist_transport_id *id, *id2;
+	STAILQ_HEAD(, persist_transport_id) transport_id_list;
+	uint64_t key = 0, sa_key = 0;
+	struct scsi_nv *table = NULL;
+	size_t table_size = 0, id_len = 0;
+	uint32_t valid_len = 0;
+	int all_tg_pt = 0, aptpl = 0, spec_i_pt = 0, unreg = 0,rel_port_set = 0;
+
+	STAILQ_INIT(&transport_id_list);
+
+	ccb = cam_getccb(device);
+	if (ccb == NULL) {
+		warnx("%s: error allocating CCB", __func__);
+		error = 1;
+		goto bailout;
+	}
+
+	bzero(&(&ccb->ccb_h)[1],
+	      sizeof(union ccb) - sizeof(struct ccb_hdr));
+
+	while ((c = getopt(argc, argv, combinedopt)) != -1) {
+		switch (c) {
+		case 'a':
+			all_tg_pt = 1;
+			break;
+		case 'I': {
+			int error_str_len = 128;
+			char error_str[error_str_len];
+			char *id_str;
+
+			id = malloc(sizeof(*id));
+			if (id == NULL) {
+				warnx("%s: error allocating %zu bytes",
+				    __func__, sizeof(*id));
+				error = 1;
+				goto bailout;
+			}
+			bzero(id, sizeof(*id));
+
+			id_str = strdup(optarg);
+			if (id_str == NULL) {
+				warnx("%s: error duplicating string %s",
+				    __func__, optarg);
+				free(id);
+				error = 1;
+				goto bailout;
+			}
+			error = scsi_parse_transportid(id_str, &id->hdr,
+			    &id->alloc_len, error_str, error_str_len);
+			if (error != 0) {
+				warnx("%s", error_str);
+				error = 1;
+				free(id);
+				free(id_str);
+				goto bailout;
+			}
+			free(id_str);
+
+			STAILQ_INSERT_TAIL(&transport_id_list, id, links);
+			num_ids++;
+			id_len += id->alloc_len;
+			break;
+		}
+		case 'k': 
+		case 'K': {
+			char *endptr;
+			uint64_t tmpval;
+
+			tmpval = strtoumax(optarg, &endptr, 0);
+			if (*endptr != '\0') {
+				warnx("%s: invalid key argument %s", __func__,
+				    optarg);
+				error = 1;
+				goto bailout;
+			}
+			if (c == 'k') {
+				key = tmpval;
+				key_set = 1;
+			} else {
+				sa_key = tmpval;
+				sa_key_set = 1;
+			}
+			break;
+		}
+		case 'i':
+		case 'o': {
+			scsi_nv_status status;
+			int table_entry = 0;
+
+			if (c == 'i') {
+				in = 1;
+				table = persist_in_actions;
+				table_size = sizeof(persist_in_actions) /
+					sizeof(persist_in_actions[0]);
+			} else {
+				out = 1;
+				table = persist_out_actions;
+				table_size = sizeof(persist_out_actions) /
+					sizeof(persist_out_actions[0]);
+			}
+
+			if ((in + out) > 1) {
+				warnx("%s: only one in (-i) or out (-o) "
+				    "action is allowed", __func__);
+				error = 1;
+				goto bailout;
+			}
+
+			status = scsi_get_nv(table, table_size, optarg,
+					     &table_entry,SCSI_NV_FLAG_IG_CASE);
+			if (status == SCSI_NV_FOUND)
+				action = table[table_entry].value;
+			else {
+				warnx("%s: %s %s option %s", __func__,
+				    (status == SCSI_NV_AMBIGUOUS) ?
+				    "ambiguous" : "invalid", in ? "in" :
+				    "out", optarg);
+				error = 1;
+				goto bailout;
+			}
+			break;
+		}
+		case 'p':
+			aptpl = 1;
+			break;
+		case 'R': {
+			char *endptr;
+
+			rel_tgt_port = strtoul(optarg, &endptr, 0);
+			if (*endptr != '\0') {
+				warnx("%s: invalid relative target port %s",
+				    __func__, optarg);
+				error = 1;
+				goto bailout;
+			}
+			rel_port_set = 1;
+			break;
+		}
+		case 's': {
+			size_t scope_size;
+			struct scsi_nv *scope_table = NULL;
+			scsi_nv_status status;
+			int table_entry = 0;
+			char *endptr;
+
+			/*
+			 * First check to see if the user gave us a numeric
+			 * argument.  If so, we'll try using it.
+			 */
+			if (isdigit(optarg[0])) {
+				scope = strtol(optarg, &endptr, 0);
+				if (*endptr != '\0') {
+					warnx("%s: invalid scope %s",
+					       __func__, optarg);
+					error = 1;
+					goto bailout;
+				}
+				scope = (scope << SPR_SCOPE_SHIFT) &
+				    SPR_SCOPE_MASK;
+				break;
+			}
+
+			scope_size = sizeof(persist_scope_table) /
+				     sizeof(persist_scope_table[0]);
+			scope_table = persist_scope_table;
+			status = scsi_get_nv(scope_table, scope_size, optarg,
+					     &table_entry,SCSI_NV_FLAG_IG_CASE);
+			if (status == SCSI_NV_FOUND)
+				scope = scope_table[table_entry].value;
+			else {
+				warnx("%s: %s scope %s", __func__,
+				      (status == SCSI_NV_AMBIGUOUS) ?
+				      "ambiguous" : "invalid", optarg);
+				error = 1;
+				goto bailout;
+			}
+			break;
+		}
+		case 'S':
+			spec_i_pt = 1;
+			break;
+		case 'T': {
+			size_t res_type_size;
+			struct scsi_nv *rtype_table = NULL;
+			scsi_nv_status status;
+			char *endptr;
+			int table_entry = 0;
+
+			/*
+			 * First check to see if the user gave us a numeric
+			 * argument.  If so, we'll try using it.
+			 */
+			if (isdigit(optarg[0])) {
+				res_type = strtol(optarg, &endptr, 0);
+				if (*endptr != '\0') {
+					warnx("%s: invalid reservation type %s",
+					       __func__, optarg);
+					error = 1;
+					goto bailout;
+				}
+				break;
+			}
+
+			res_type_size = sizeof(persist_type_table) /
+					sizeof(persist_type_table[0]);
+			rtype_table = persist_type_table;
+			status = scsi_get_nv(rtype_table, res_type_size,
+					     optarg, &table_entry,
+					     SCSI_NV_FLAG_IG_CASE);
+			if (status == SCSI_NV_FOUND)
+				res_type = rtype_table[table_entry].value;
+			else {
+				warnx("%s: %s reservation type %s", __func__,
+				      (status == SCSI_NV_AMBIGUOUS) ?
+				      "ambiguous" : "invalid", optarg);
+				error = 1;
+				goto bailout;
+			}
+			break;
+		}
+		case 'U':
+			unreg = 1;
+			break;
+		default:
+			break;
+		}
+	}
+
+	if ((in + out) != 1) {
+		warnx("%s: you must specify one of -i or -o", __func__);
+		error = 1;
+		goto bailout;
+	}
+
+	/*
+	 * Note that we don't really try to figure out whether the user
+	 * needs to specify one or both keys.  There are a number of
+	 * scenarios, and sometimes 0 is a valid and desired value.
+	 */
+	if (in != 0) {
+		switch (action) {
+		case SPRI_RK:
+		case SPRI_RR:
+		case SPRI_RS:
+			/*
+			 * Allocate the maximum length possible for these
+			 * service actions.  According to the spec, the
+			 * target is supposed to return the available
+			 * length in the header, regardless of the
+			 * allocation length.  In practice, though, with
+			 * the READ FULL STATUS (SPRI_RS) service action,
+			 * some Seagate drives (in particular a
+			 * Constellation ES, <SEAGATE ST32000444SS 0006>)
+			 * don't return the available length if you only
+			 * allocate the length of the header.  So just
+			 * allocate the maximum here so we don't miss
+			 * anything.
+			 */
+			res_len = SPRI_MAX_LEN;
+			break;
+		case SPRI_RC:
+			res_len = sizeof(struct scsi_per_res_cap);
+			break;
+		default:
+			/* In theory we should catch this above */
+			warnx("%s: invalid action %d", __func__, action);
+			error = 1;
+			goto bailout;
+			break;
+		}
+	} else {
+
+		/*
+		 * XXX KDM need to add length for transport IDs for the
+		 * register and move service action and the register
+		 * service action with the SPEC_I_PT bit set.
+		 */
+		if (action == SPRO_REG_MOVE) {
+			if (num_ids != 1) {
+			    	warnx("%s: register and move requires a "
+				    "single transport ID (-I)", __func__);
+				error = 1;
+				goto bailout;
+			}
+			if (rel_port_set == 0) {
+				warnx("%s: register and move requires a "
+				    "relative target port (-R)", __func__);
+				error = 1;
+				goto bailout;
+			}
+			res_len = sizeof(struct scsi_per_res_reg_move) + id_len;
+		} else {
+			res_len = sizeof(struct scsi_per_res_out_parms);
+			if ((action == SPRO_REGISTER)
+			 && (num_ids != 0)) {
+				/*
+				 * If the user specifies any IDs with the
+				 * register service action, turn on the
+				 * spec_i_pt bit.
+				 */
+				spec_i_pt = 1;
+				res_len += id_len;
+				res_len +=
+				    sizeof(struct scsi_per_res_out_trans_ids);
+			}
+		}
+	}
+retry:
+	if (res_buf != NULL) {
+		free(res_buf);
+		res_buf = NULL;
+	}
+	res_buf = malloc(res_len);
+	if (res_buf == NULL) {
+		warn("%s: error allocating %d bytes", __func__, res_len);
+		error = 1;
+		goto bailout;
+	}
+	bzero(res_buf, res_len);
+
+	if (in != 0) {
+		scsi_persistent_reserve_in(&ccb->csio,
+					   /*retries*/ retry_count,
+					   /*cbfcnp*/ NULL,
+					   /*tag_action*/ MSG_SIMPLE_Q_TAG,
+					   /*service_action*/ action,
+					   /*data_ptr*/ res_buf,
+					   /*dxfer_len*/ res_len,
+					   /*sense_len*/ SSD_FULL_SIZE,
+					   /*timeout*/ timeout ? timeout :5000);
+
+	} else {
+		switch (action) {
+		case SPRO_REGISTER:
+			if (spec_i_pt != 0) {
+				struct scsi_per_res_out_trans_ids *id_hdr;
+				uint8_t *bufptr;
+
+				bufptr = res_buf +
+				    sizeof(struct scsi_per_res_out_parms) +
+				    sizeof(struct scsi_per_res_out_trans_ids);
+				STAILQ_FOREACH(id, &transport_id_list, links) {
+					bcopy(id->hdr, bufptr, id->alloc_len);
+					bufptr += id->alloc_len;
+				}
+				id_hdr = (struct scsi_per_res_out_trans_ids *)
+				    (res_buf +
+				    sizeof(struct scsi_per_res_out_parms));
+				scsi_ulto4b(id_len, id_hdr->additional_length);
+			}
+		case SPRO_REG_IGNO:
+		case SPRO_PREEMPT:
+		case SPRO_PRE_ABO:
+		case SPRO_RESERVE:
+		case SPRO_RELEASE:
+		case SPRO_CLEAR:
+		case SPRO_REPL_LOST_RES: {
+			struct scsi_per_res_out_parms *parms;
+
+			parms = (struct scsi_per_res_out_parms *)res_buf;
+
+			scsi_u64to8b(key, parms->res_key.key);
+			scsi_u64to8b(sa_key, parms->serv_act_res_key);
+			if (spec_i_pt != 0)
+				parms->flags |= SPR_SPEC_I_PT;
+			if (all_tg_pt != 0)
+				parms->flags |= SPR_ALL_TG_PT;
+			if (aptpl != 0)
+				parms->flags |= SPR_APTPL;
+			break;
+		}
+		case SPRO_REG_MOVE: {
+			struct scsi_per_res_reg_move *reg_move;
+			uint8_t *bufptr;
+
+			reg_move = (struct scsi_per_res_reg_move *)res_buf;
+
+			scsi_u64to8b(key, reg_move->res_key.key);
+			scsi_u64to8b(sa_key, reg_move->serv_act_res_key);
+			if (unreg != 0)
+				reg_move->flags |= SPR_REG_MOVE_UNREG;
+			if (aptpl != 0)
+				reg_move->flags |= SPR_REG_MOVE_APTPL;
+			scsi_ulto2b(rel_tgt_port, reg_move->rel_trgt_port_id);
+			id = STAILQ_FIRST(&transport_id_list);
+			/*
+			 * This shouldn't happen, since we already checked
+			 * the number of IDs above.
+			 */
+			if (id == NULL) {
+				warnx("%s: No transport IDs found!", __func__);
+				error = 1;
+				goto bailout;
+			}
+			bufptr = (uint8_t *)&reg_move[1];
+			bcopy(id->hdr, bufptr, id->alloc_len);
+			scsi_ulto4b(id->alloc_len,
+			    reg_move->transport_id_length);
+			break;
+		}
+		default:
+			break;
+		}
+		scsi_persistent_reserve_out(&ccb->csio,
+					    /*retries*/ retry_count,
+					    /*cbfcnp*/ NULL,
+					    /*tag_action*/ MSG_SIMPLE_Q_TAG,
+					    /*service_action*/ action,
+					    /*scope*/ scope,
+					    /*res_type*/ res_type,
+					    /*data_ptr*/ res_buf,
+					    /*dxfer_len*/ res_len,
+					    /*sense_len*/ SSD_FULL_SIZE,
+					    /*timeout*/ timeout ?timeout :5000);
+	}
+
+	/* Disable freezing the device queue */
+	ccb->ccb_h.flags |= CAM_DEV_QFRZDIS;
+
+	if (err_recover != 0)
+		ccb->ccb_h.flags |= CAM_PASS_ERR_RECOVER;
+
+	if (cam_send_ccb(device, ccb) < 0) {
+		warn("error sending PERSISTENT RESERVE %s", (in != 0) ?
+		    "IN" : "OUT");
+
+		if (verbosemode != 0) {
+			cam_error_print(device, ccb, CAM_ESF_ALL,
+					CAM_EPF_ALL, stderr);
+		}
+
+		error = 1;
+		goto bailout;
+	}
+
+	if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
+		if (verbosemode != 0) {
+			cam_error_print(device, ccb, CAM_ESF_ALL,
+					CAM_EPF_ALL, stderr);
+		}
+		error = 1;
+		goto bailout;
+	}
+
+	if (in == 0)
+		goto bailout;
+
+	valid_len = res_len - ccb->csio.resid;
+
+	switch (action) {
+	case SPRI_RK:
+	case SPRI_RR:
+	case SPRI_RS: {
+		struct scsi_per_res_in_header *hdr;
+		uint32_t hdr_len;
+
+		if (valid_len < sizeof(*hdr)) {
+			warnx("%s: only got %d valid bytes, need %zd",
+			      __func__, valid_len, sizeof(*hdr));
+			error = 1;
+			goto bailout;
+		}
+		hdr = (struct scsi_per_res_in_header *)res_buf;
+		hdr_len = scsi_4btoul(hdr->length);
+
+		if (hdr_len > (res_len - sizeof(*hdr))) {
+			res_len = hdr_len + sizeof(*hdr);
+			goto retry;
+		}
+
+		if (action == SPRI_RK) {
+			persist_print_keys(hdr, valid_len);
+		} else if (action == SPRI_RR) {
+			persist_print_res(hdr, valid_len);
+		} else {
+			persist_print_full(hdr, valid_len);
+		}
+		break;
+	}
+	case SPRI_RC: {
+		struct scsi_per_res_cap *cap;
+		uint32_t cap_len;
+
+		if (valid_len < sizeof(*cap)) {
+			warnx("%s: only got %u valid bytes, need %zd",
+			      __func__, valid_len, sizeof(*cap));
+			error = 1;
+			goto bailout;
+		}
+		cap = (struct scsi_per_res_cap *)res_buf;
+		cap_len = scsi_2btoul(cap->length);
+		if (cap_len != sizeof(*cap)) {
+			/*
+			 * We should be able to deal with this,
+			 * it's just more trouble.
+			 */
+			warnx("%s: reported size %u is different "
+			    "than expected size %zd", __func__,
+			    cap_len, sizeof(*cap));
+		}
+
+		/*
+		 * If there is more data available, grab it all,
+		 * even though we don't really know what to do with
+		 * the extra data since it obviously wasn't in the
+		 * spec when this code was written.
+		 */
+		if (cap_len > res_len) {
+			res_len = cap_len;
+			goto retry;
+		}
+		persist_print_cap(cap, valid_len);
+		break;
+	}
+	default:
+		break;
+	}
+
+bailout:
+	free(res_buf);
+
+	if (ccb != NULL)
+		cam_freeccb(ccb);
+
+	STAILQ_FOREACH_SAFE(id, &transport_id_list, links, id2) {
+		STAILQ_REMOVE(&transport_id_list, id, persist_transport_id,
+		    links);
+		free(id);
+	}
+	return (error);
+}
diff --git a/sbin/casperd/casperd.8 b/sbin/casperd/casperd.8
index ebe560dbb9e5..d60b9f3fe29f 100644
--- a/sbin/casperd/casperd.8
+++ b/sbin/casperd/casperd.8
@@ -122,5 +122,5 @@ daemon exits 0 on success, and >0 if an error occurs.
 The
 .Nm
 was implemented by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net
 under sponsorship from the FreeBSD Foundation.
diff --git a/sbin/dhclient/bpf.c b/sbin/dhclient/bpf.c
index 7c2e53116cd0..78b9eb624e88 100644
--- a/sbin/dhclient/bpf.c
+++ b/sbin/dhclient/bpf.c
@@ -43,8 +43,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/capsicum.h>
-
 #include "dhcpd.h"
 #include "privsep.h"
 #include <sys/capsicum.h>
diff --git a/sbin/dhclient/dhclient-script.8 b/sbin/dhclient/dhclient-script.8
index fdb46a7774b7..2fae9f67cbe5 100644
--- a/sbin/dhclient/dhclient-script.8
+++ b/sbin/dhclient/dhclient-script.8
@@ -273,7 +273,7 @@ but current scripts do not do this.
 The original version of
 .Nm
 was written for the Internet Software Consortium by
-.An Ted Lemon Aq mellon@fugue.com
+.An Ted Lemon Aq Mt mellon@fugue.com
 in cooperation with Vixie Enterprises.
 .Pp
 The
@@ -281,7 +281,7 @@ The
 implementation of
 .Nm
 was written by
-.An Kenneth R. Westerback Aq krw@openbsd.org .
+.An Kenneth R. Westerback Aq Mt krw@openbsd.org .
 .Sh BUGS
 If more than one interface is being used, there is no obvious way to
 avoid clashes between server-supplied configuration parameters - for
diff --git a/sbin/dhclient/dhclient.8 b/sbin/dhclient/dhclient.8
index d2b8f437f7d4..c6940da89632 100644
--- a/sbin/dhclient/dhclient.8
+++ b/sbin/dhclient/dhclient.8
@@ -188,9 +188,9 @@ The
 .Nm
 utility
 was written by
-.An Ted Lemon Aq mellon@fugue.com
+.An Ted Lemon Aq Mt mellon@fugue.com
 and
-.An Elliot Poger Aq elliot@poger.com .
+.An Elliot Poger Aq Mt elliot@poger.com .
 .Pp
 The current implementation was reworked by
-.An Henning Brauer Aq henning@openbsd.org .
+.An Henning Brauer Aq Mt henning@openbsd.org .
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index c43bda9f480c..22b21f1da68c 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -56,8 +56,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/capsicum.h>
-
 #include "dhcpd.h"
 #include "privsep.h"
 
diff --git a/sbin/dhclient/dhclient.conf.5 b/sbin/dhclient/dhclient.conf.5
index 167239ef63c3..3b6ae044343c 100644
--- a/sbin/dhclient/dhclient.conf.5
+++ b/sbin/dhclient/dhclient.conf.5
@@ -537,8 +537,8 @@ The
 .Xr dhclient 8
 utility
 was written by
-.An Ted Lemon Aq mellon@vix.com
+.An Ted Lemon Aq Mt mellon@vix.com
 under a contract with Vixie Labs.
 .Pp
 The current implementation was reworked by
-.An Henning Brauer Aq henning@openbsd.org .
+.An Henning Brauer Aq Mt henning@openbsd.org .
diff --git a/sbin/dhclient/dhclient.leases.5 b/sbin/dhclient/dhclient.leases.5
index b1f0f3d8bd53..f48b106287cf 100644
--- a/sbin/dhclient/dhclient.leases.5
+++ b/sbin/dhclient/dhclient.leases.5
@@ -88,8 +88,8 @@ The
 .Xr dhclient 8
 utility
 was written by
-.An Ted Lemon Aq mellon@vix.com
+.An Ted Lemon Aq Mt mellon@vix.com
 under a contract with Vixie Labs.
 .Pp
 The current implementation was reworked by
-.An Henning Brauer Aq henning@openbsd.org .
+.An Henning Brauer Aq Mt henning@openbsd.org .
diff --git a/sbin/dhclient/dhcp-options.5 b/sbin/dhclient/dhcp-options.5
index 1405839a9f25..4b65fa723083 100644
--- a/sbin/dhclient/dhcp-options.5
+++ b/sbin/dhclient/dhcp-options.5
@@ -603,8 +603,8 @@ The
 .Xr dhcpd 8
 utility
 was written by
-.An Ted Lemon Aq mellon@vix.com
+.An Ted Lemon Aq Mt mellon@vix.com
 under a contract with Vixie Labs.
 .Pp
 The current implementation was reworked by
-.An Henning Brauer Aq henning@openbsd.org .
+.An Henning Brauer Aq Mt henning@openbsd.org .
diff --git a/sbin/etherswitchcfg/etherswitchcfg.c b/sbin/etherswitchcfg/etherswitchcfg.c
index dd68e67c4ec9..f7f117ae3e2b 100644
--- a/sbin/etherswitchcfg/etherswitchcfg.c
+++ b/sbin/etherswitchcfg/etherswitchcfg.c
@@ -235,6 +235,8 @@ set_port_media(struct cfg *cfg, char *argv[])
 	p.es_ifmr.ifm_count = IFMEDIAREQ_NULISTENTRIES;
 	if (ioctl(cfg->fd, IOETHERSWITCHGETPORT, &p) != 0)
 		err(EX_OSERR, "ioctl(IOETHERSWITCHGETPORT)");
+	if (p.es_ifmr.ifm_count == 0)
+		return;
 	subtype = get_media_subtype(IFM_TYPE(ifm_ulist[0]), argv[1]);
 	p.es_ifr.ifr_media = (p.es_ifmr.ifm_current & IFM_IMASK) |
 	        IFM_TYPE(ifm_ulist[0]) | subtype;
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index 34b96efd286c..819c1c72a852 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -507,7 +507,6 @@ print_part(const struct dos_partition *partp)
 static void
 init_boot(void)
 {
-#ifndef __ia64__
 	const char *fname;
 	int fdesc, n;
 	struct stat sb;
@@ -529,15 +528,6 @@ init_boot(void)
 		err(1, "%s", fname);
 	if (n != mboot.bootinst_size)
 		errx(1, "%s: short read", fname);
-#else
-	if (mboot.bootinst != NULL)
-		free(mboot.bootinst);
-	mboot.bootinst_size = secsize;
-	if ((mboot.bootinst = malloc(mboot.bootinst_size)) == NULL)
-		errx(1, "unable to allocate boot block buffer");
-	memset(mboot.bootinst, 0, mboot.bootinst_size);
-	le16enc(&mboot.bootinst[DOSMAGICOFFSET], DOSMAGIC);
-#endif
 }
 
 
diff --git a/sbin/ffsinfo/ffsinfo.8 b/sbin/ffsinfo/ffsinfo.8
index 9753cf7c0cf8..d3c8e9f4ff05 100644
--- a/sbin/ffsinfo/ffsinfo.8
+++ b/sbin/ffsinfo/ffsinfo.8
@@ -134,9 +134,9 @@ The
 utility first appeared in
 .Fx 4.4 .
 .Sh AUTHORS
-.An Christoph Herrmann Aq chm@FreeBSD.org
-.An Thomas-Henning von Kamptz Aq tomsoft@FreeBSD.org
-.An The GROWFS team Aq growfs@Tomsoft.COM
+.An Christoph Herrmann Aq Mt chm@FreeBSD.org
+.An Thomas-Henning von Kamptz Aq Mt tomsoft@FreeBSD.org
+.An The GROWFS team Aq Mt growfs@Tomsoft.COM
 .Sh BUGS
 Snapshots are handled like plain files.
 They should get their own level to provide for independent control of the
diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c
index 1fb005ddd8d8..083389e09933 100644
--- a/sbin/fsck_msdosfs/check.c
+++ b/sbin/fsck_msdosfs/check.c
@@ -142,7 +142,7 @@ checkfilesys(const char *fname)
 		goto out;
 
 	/* now write the FATs */
-	if (mod & FSFATMOD) {
+	if (mod & (FSFATMOD|FSFIXFAT)) {
 		if (ask(1, "Update FATs")) {
 			mod |= writefat(dosfs, &boot, fat, mod & FSFIXFAT);
 			if (mod & FSFATAL)
diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c
index 008d0b3398f1..e8d6475736c2 100644
--- a/sbin/fsck_msdosfs/dir.c
+++ b/sbin/fsck_msdosfs/dir.c
@@ -206,7 +206,7 @@ static char longName[DOSLONGNAMELEN] = "";
 static u_char *buffer = NULL;
 static u_char *delbuf = NULL;
 
-struct dosDirEntry *rootDir;
+static struct dosDirEntry *rootDir;
 static struct dosDirEntry *lostDir;
 
 /*
@@ -419,13 +419,14 @@ checksize(struct bootblock *boot, struct fatEntry *fat, u_char *p,
 		      fullpath(dir));
 		if (ask(1, "Drop superfluous clusters")) {
 			cl_t cl;
-			u_int32_t sz = 0;
+			u_int32_t sz, len;
 
-			for (cl = dir->head; (sz += boot->ClusterSize) <
-			    dir->size;)
+			for (cl = dir->head, len = sz = 0;
+			    (sz += boot->ClusterSize) < dir->size; len++)
 				cl = fat[cl].next;
 			clearchain(boot, fat, fat[cl].next);
 			fat[cl].next = CLUST_EOF;
+			fat[dir->head].length = len;
 			return FSFATMOD;
 		} else
 			return FSERROR;
diff --git a/sbin/fsck_msdosfs/ext.h b/sbin/fsck_msdosfs/ext.h
index 681cde998e28..ef9c420c90d0 100644
--- a/sbin/fsck_msdosfs/ext.h
+++ b/sbin/fsck_msdosfs/ext.h
@@ -26,7 +26,7 @@
  */
 
 #ifndef EXT_H
-#define EXT_H
+#define	EXT_H
 
 #include <sys/types.h>
 
@@ -43,8 +43,6 @@ extern int preen;	/* we are preening */
 extern int rdonly;	/* device is opened read only (supersedes above) */
 extern int skipclean;	/* skip clean file systems if preening */
 
-extern struct dosDirEntry *rootDir;
-
 /*
  * function declarations
  */
@@ -71,8 +69,8 @@ int checkfilesys(const char *);
 #define	FSFATMOD	4		/* The FAT was modified */
 #define	FSERROR		8		/* Some unrecovered error remains */
 #define	FSFATAL		16		/* Some unrecoverable error occurred */
-#define FSDIRTY		32		/* File system is dirty */
-#define FSFIXFAT	64		/* Fix file system FAT */
+#define	FSDIRTY		32		/* File system is dirty */
+#define	FSFIXFAT	64		/* Fix file system FAT */
 
 /*
  * read a boot block in a machine independent fashion and translate
diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c
index d2d144449ec5..b509c50246a6 100644
--- a/sbin/fsck_msdosfs/fat.c
+++ b/sbin/fsck_msdosfs/fat.c
@@ -242,7 +242,7 @@ readfat(int fs, struct bootblock *boot, u_int no, struct fatEntry **fp)
 			ret |= FSDIRTY;
 		else {
 			/* just some odd byte sequence in FAT */
-				
+
 			switch (boot->ClustMask) {
 			case CLUST32_MASK:
 				pwarn("%s (%02x%02x%02x%02x%02x%02x%02x%02x)\n",
@@ -262,7 +262,7 @@ readfat(int fs, struct bootblock *boot, u_int no, struct fatEntry **fp)
 				break;
 			}
 
-	
+
 			if (ask(1, "Correct"))
 				ret |= FSFIXFAT;
 		}
@@ -436,7 +436,15 @@ tryclear(struct bootblock *boot, struct fatEntry *fat, cl_t head, cl_t *truncp)
 		clearchain(boot, fat, head);
 		return FSFATMOD;
 	} else if (ask(0, "Truncate")) {
+		uint32_t len;
+		cl_t p;
+
+		for (p = head, len = 0;
+		    p >= CLUST_FIRST && p < boot->NumClusters;
+		    p = fat[p].next, len++)
+			continue;
 		*truncp = CLUST_EOF;
+		fat[head].length = len;
 		return FSFATMOD;
 	} else
 		return FSERROR;
@@ -465,7 +473,8 @@ checkfat(struct bootblock *boot, struct fatEntry *fat)
 
 		/* follow the chain and mark all clusters on the way */
 		for (len = 0, p = head;
-		     p >= CLUST_FIRST && p < boot->NumClusters;
+		     p >= CLUST_FIRST && p < boot->NumClusters &&
+		     fat[p].head != head;
 		     p = fat[p].next) {
 			fat[p].head = head;
 			len++;
@@ -486,10 +495,10 @@ checkfat(struct bootblock *boot, struct fatEntry *fat)
 			continue;
 
 		/* follow the chain to its end (hopefully) */
-		for (p = head;
+		for (len = fat[head].length, p = head;
 		     (n = fat[p].next) >= CLUST_FIRST && n < boot->NumClusters;
 		     p = n)
-			if (fat[n].head != head)
+			if (fat[n].head != head || len-- < 2)
 				break;
 		if (n >= CLUST_EOFS)
 			continue;
@@ -497,14 +506,20 @@ checkfat(struct bootblock *boot, struct fatEntry *fat)
 		if (n == CLUST_FREE || n >= CLUST_RSRVD) {
 			pwarn("Cluster chain starting at %u ends with cluster marked %s\n",
 			      head, rsrvdcltype(n));
+clear:
 			ret |= tryclear(boot, fat, head, &fat[p].next);
 			continue;
 		}
 		if (n < CLUST_FIRST || n >= boot->NumClusters) {
 			pwarn("Cluster chain starting at %u ends with cluster out of range (%u)\n",
-			      head, n);
-			ret |= tryclear(boot, fat, head, &fat[p].next);
-			continue;
+			    head, n);
+			goto clear;
+		}
+		if (head == fat[n].head) {
+			pwarn("Cluster chain starting at %u loops at cluster %u\n",
+			
+			    head, p);
+			goto clear;
 		}
 		pwarn("Cluster chains starting at %u and %u are linked at cluster %u\n",
 		      head, fat[n].head, n);
@@ -621,13 +636,15 @@ writefat(int fs, struct bootblock *boot, struct fatEntry *fat, int correct_fat)
 		default:
 			if (fat[cl].next == CLUST_FREE)
 				boot->NumFree++;
-			if (cl + 1 < boot->NumClusters
-			    && fat[cl + 1].next == CLUST_FREE)
-				boot->NumFree++;
 			*p++ = (u_char)fat[cl].next;
-			*p++ = (u_char)((fat[cl].next >> 8) & 0xf)
-			       |(u_char)(fat[cl+1].next << 4);
-			*p++ = (u_char)(fat[++cl].next >> 4);
+			*p = (u_char)((fat[cl].next >> 8) & 0xf);
+			cl++;
+			if (cl >= boot->NumClusters)
+				break;
+			if (fat[cl].next == CLUST_FREE)
+				boot->NumFree++;
+			*p++ |= (u_char)(fat[cl + 1].next << 4);
+			*p++ = (u_char)(fat[cl + 1].next >> 4);
 			break;
 		}
 	}
@@ -653,7 +670,7 @@ checklost(int dosfs, struct bootblock *boot, struct fatEntry *fat)
 	cl_t head;
 	int mod = FSOK;
 	int ret;
-	
+
 	for (head = CLUST_FIRST; head < boot->NumClusters; head++) {
 		/* find next untravelled chain */
 		if (fat[head].head != head
@@ -677,8 +694,9 @@ checklost(int dosfs, struct bootblock *boot, struct fatEntry *fat)
 
 	if (boot->bpbFSInfo) {
 		ret = 0;
-		if (boot->FSFree != boot->NumFree) {
-			pwarn("Free space in FSInfo block (%d) not correct (%d)\n",
+		if (boot->FSFree != 0xffffffffU &&
+		    boot->FSFree != boot->NumFree) {
+			pwarn("Free space in FSInfo block (%u) not correct (%u)\n",
 			      boot->FSFree, boot->NumFree);
 			if (ask(1, "Fix")) {
 				boot->FSFree = boot->NumFree;
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index f921e89828ca..21ac09f9c66d 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -9,8 +9,8 @@ SRCS=	fsdb.c fsdbutil.c \
 	pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c globs.c
 CFLAGS+= -I${.CURDIR}/../fsck_ffs
 WARNS?= 2
-LDADD=	-ledit -ltermcap
-DPADD=	${LIBEDIT} ${LIBTERMCAP}
+LDADD=	-ledit -ltermcapw
+DPADD=	${LIBEDIT} ${LIBTERMCAPW}
 .PATH:	${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs
 
 .include <bsd.prog.mk>
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 3156787a8bdc..f3fbd8d6c153 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -107,7 +107,7 @@ A
 version first appeared in
 .Fx 2.2.5 .
 .Sh AUTHORS
-.An Todd C. Miller Aq Todd.Miller@courtesan.com
+.An Todd C. Miller Aq Mt Todd.Miller@courtesan.com
 .Sh CAVEATS
 Since
 .Nm
diff --git a/sbin/gbde/gbde.8 b/sbin/gbde/gbde.8
index efd3156b4da9..47c2e2118d35 100644
--- a/sbin/gbde/gbde.8
+++ b/sbin/gbde/gbde.8
@@ -243,14 +243,14 @@ To destroy all copies of the masterkey:
 This software was developed for the
 .Fx
 Project by
-.An "Poul-Henning Kamp"
+.An Poul-Henning Kamp
 and NAI Labs, the Security Research Division of Network Associates, Inc.\&
 under DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the
 DARPA CHATS research program.
 .Sh AUTHORS
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
 .Sh BUGS
 The cryptographic algorithms and the overall design have not been
 attacked mercilessly for over 10 years by a gang of cryptoanalysts.
diff --git a/sbin/geom/class/cache/gcache.8 b/sbin/geom/class/cache/gcache.8
index b9f03bd7f3ae..b0f1c7abf1f7 100644
--- a/sbin/geom/class/cache/gcache.8
+++ b/sbin/geom/class/cache/gcache.8
@@ -189,4 +189,4 @@ The
 utility appeared in
 .Fx 7.0 .
 .Sh AUTHORS
-.An Ruslan Ermilov Aq ru@FreeBSD.org
+.An Ruslan Ermilov Aq Mt ru@FreeBSD.org
diff --git a/sbin/geom/class/concat/gconcat.8 b/sbin/geom/class/concat/gconcat.8
index b797a1c24dc2..d874b087b649 100644
--- a/sbin/geom/class/concat/gconcat.8
+++ b/sbin/geom/class/concat/gconcat.8
@@ -194,4 +194,4 @@ The
 utility appeared in
 .Fx 5.3 .
 .Sh AUTHORS
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
diff --git a/sbin/geom/class/eli/geli.8 b/sbin/geom/class/eli/geli.8
index 53c1dafc78a1..c435859ea024 100644
--- a/sbin/geom/class/eli/geli.8
+++ b/sbin/geom/class/eli/geli.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 1, 2013
+.Dd June 18, 2014
 .Dt GELI 8
 .Os
 .Sh NAME
@@ -331,7 +331,7 @@ key length.
 .It Nm AES-XTS
 .Em 128 ,
 256
-.It Nm AES-CBC , Nm Camilla-CBC
+.It Nm AES-CBC , Nm Camellia-CBC
 .Em 128 ,
 192,
 256
@@ -353,13 +353,14 @@ because encryption/decryption which requires an initialization vector
 is done per sector; fewer sectors means less computational work.
 .It Fl V Ar version
 Metadata version to use.
-This option is helpful when creating provider that may be used by older
+This option is helpful when creating a provider that may be used by older
 .Nm FreeBSD/GELI
 versions.
 Consult the
 .Sx HISTORY
 section to find which metadata version is supported by which FreeBSD version.
-Note that using older metadata version may limit numer of features available.
+Note that using an older version of metadata may limit the number of
+features available.
 .El
 .It Cm attach
 Attach the given provider.
@@ -619,7 +620,7 @@ devices.
 .El
 .It Cm resume
 Resume previously suspended device.
-The caller must ensure that executing this subcommand doesn't access the
+The caller must ensure that executing this subcommand does not access the
 suspended device, leading to a deadlock.
 For example suspending a device which contains the file system where the
 .Nm
@@ -823,7 +824,7 @@ Enter passphrase:
 .Pp
 Create an encrypted provider, but use two User Keys:
 one for your employee and one for you as the company's security officer
-(so it's not a tragedy if the employee
+(so it is not a tragedy if the employee
 .Qq accidentally
 forgets his passphrase):
 .Bd -literal -offset indent
@@ -1056,4 +1057,4 @@ metadata version supported by the given FreeBSD version:
 .It Li 10.0 Ta 7
 .El
 .Sh AUTHORS
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
diff --git a/sbin/geom/class/journal/gjournal.8 b/sbin/geom/class/journal/gjournal.8
index edef9023eb56..6eb8cde821ae 100644
--- a/sbin/geom/class/journal/gjournal.8
+++ b/sbin/geom/class/journal/gjournal.8
@@ -343,4 +343,4 @@ The
 utility appeared in
 .Fx 7.0 .
 .Sh AUTHORS
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
diff --git a/sbin/geom/class/label/glabel.8 b/sbin/geom/class/label/glabel.8
index 72b6dae02b14..c950e26b35a7 100644
--- a/sbin/geom/class/label/glabel.8
+++ b/sbin/geom/class/label/glabel.8
@@ -272,4 +272,4 @@ The
 utility appeared in
 .Fx 5.3 .
 .Sh AUTHORS
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
diff --git a/sbin/geom/class/mirror/gmirror.8 b/sbin/geom/class/mirror/gmirror.8
index bca5bdba9749..fb501ca3de64 100644
--- a/sbin/geom/class/mirror/gmirror.8
+++ b/sbin/geom/class/mirror/gmirror.8
@@ -376,7 +376,7 @@ The
 utility appeared in
 .Fx 5.3 .
 .Sh AUTHORS
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
 .Sh BUGS
 There should be a way to change a component's priority inside a running mirror.
 .Pp
diff --git a/sbin/geom/class/mountver/gmountver.8 b/sbin/geom/class/mountver/gmountver.8
index 02d77dbffd9f..c9a9c0ac8313 100644
--- a/sbin/geom/class/mountver/gmountver.8
+++ b/sbin/geom/class/mountver/gmountver.8
@@ -127,4 +127,4 @@ The
 utility appeared in
 .Fx 9.0 .
 .Sh AUTHORS
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
diff --git a/sbin/geom/class/multipath/gmultipath.8 b/sbin/geom/class/multipath/gmultipath.8
index 81b85ddbd642..07ac01ed6dc5 100644
--- a/sbin/geom/class/multipath/gmultipath.8
+++ b/sbin/geom/class/multipath/gmultipath.8
@@ -360,6 +360,6 @@ GEOM_MULTIPATH: da2 added to FRED
 .Xr mount 8 ,
 .Xr newfs 8 ,
 .Xr sysctl 8
-.Sh AUTHOR
-.An Matthew Jacob Aq mjacob@FreeBSD.org
-.An Alexander Motin Aq mav@FreeBSD.org
+.Sh AUTHORS
+.An Matthew Jacob Aq Mt mjacob@FreeBSD.org
+.An Alexander Motin Aq Mt mav@FreeBSD.org
diff --git a/sbin/geom/class/nop/gnop.8 b/sbin/geom/class/nop/gnop.8
index 2bcbef30d4f7..4770090dd706 100644
--- a/sbin/geom/class/nop/gnop.8
+++ b/sbin/geom/class/nop/gnop.8
@@ -176,4 +176,4 @@ The
 utility appeared in
 .Fx 5.3 .
 .Sh AUTHORS
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
diff --git a/sbin/geom/class/part/gpart.8 b/sbin/geom/class/part/gpart.8
index 8714eedc575b..e8c4dab2f43b 100644
--- a/sbin/geom/class/part/gpart.8
+++ b/sbin/geom/class/part/gpart.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 11, 2014
+.Dd August 12, 2014
 .Dt GPART 8
 .Os
 .Sh NAME
@@ -129,6 +129,14 @@
 .Op Fl f Ar flags
 .Ar geom
 .\"
+.Nm
+.Cm list
+.Nm
+.Cm status
+.Nm
+.Cm load
+.Nm
+.Cm unload
 .Sh DESCRIPTION
 The
 .Nm
@@ -467,6 +475,18 @@ See the section entitled
 below for a discussion
 about its use.
 .El
+.It Cm list
+See
+.Xr geom 8 .
+.It Cm status
+See
+.Xr geom 8 .
+.It Cm load
+See
+.Xr geom 8 .
+.It Cm unload
+See
+.Xr geom 8 .
 .El
 .Sh PARTITIONING SCHEMES
 Several partitioning schemes are supported by the
@@ -550,8 +570,20 @@ The
 .Nm
 utility also allows the user to specify scheme-specific partition types
 for partition types that do not have symbolic names.
-Symbolic names currently understood are:
-.Bl -tag -width ".Cm ms-ldm-metadata"
+Symbolic names currently understood and used by
+.Fx
+are:
+.Bl -tag -width ".Cm dragonfly-disklabel64"
+.It Cm apple-boot
+The system partition dedicated to storing boot loaders on some Apple
+systems.
+The scheme-specific types are
+.Qq Li "!171"
+for MBR,
+.Qq Li "!Apple_Bootstrap"
+for APM, and
+.Qq Li "!426f6f74-0000-11aa-aa11-00306543ecac"
+for GPT.
 .It Cm bios-boot
 The system partition dedicated to second stage of the boot loader program.
 Usually it is used by the GRUB 2 loader for GPT partitioning schemes.
@@ -563,16 +595,6 @@ Interface (EFI).
 In such cases, the GPT partitioning scheme is used and the
 actual partition type for the system partition can also be specified as
 .Qq Li "!c12a7328-f81f-11d2-ba4b-00a0c93ec93b" .
-.It Cm fat16
-A partition that contains a FAT16 filesystem.
-The scheme-specific type is
-.Qq Li "!6"
-for MBR.
-.It Cm fat32
-A partition that contains a FAT32 filesystem.
-The scheme-specific type is
-.Qq Li "!11"
-for MBR.
 .It Cm freebsd
 A
 .Fx
@@ -631,6 +653,138 @@ The scheme-specific types are
 for APM,
 .Qq Li "!516e7cba-6ecf-11d6-8ff8-00022d09712b"
 for GPT, and 0x0904 for VTOC8.
+.El
+.Pp
+Another symbolic names that can be used with
+.Cm gpart
+utility are:
+.Bl -tag -width ".Cm dragonfly-disklabel64"
+.It Cm apple-hfs
+An Apple Mac OS X partition that contains a HFS or HFS+ filesystem.
+The scheme-specific types are
+.Qq Li "!Apple_HFS"
+for APM and
+.Qq Li "!48465300-0000-11aa-aa11-00306543ecac"
+for GPT.
+.It Cm apple-label
+An Apple Mac OS X partition dedicated to partition metadata that descibes
+disk device.
+The scheme-specific type is
+.Qq Li "!4c616265-6c00-11aa-aa11-00306543ecac"
+for GPT.
+.It Cm apple-raid
+An Apple Mac OS X partition used in a software RAID configuration.
+The scheme-specific type is
+.Qq Li "!52414944-0000-11aa-aa11-00306543ecac"
+for GPT.
+.It Cm apple-raid-offline
+An Apple Mac OS X partition used in a software RAID configuration.
+The scheme-specific type is
+.Qq Li "!52414944-5f4f-11aa-aa11-00306543ecac"
+for GPT.
+.It Cm apple-tv-recovery
+An Apple Mac OS X partition used by Apple TV.
+The scheme-specific type is
+.Qq Li "!5265636f-7665-11aa-aa11-00306543ecac"
+for GPT.
+.It Cm apple-ufs
+An Apple Mac OS X partition that contains a UFS filesystem.
+The scheme-specific types are
+.Qq Li "!Apple_UNIX_SVR2"
+for APM and
+.Qq Li "!55465300-0000-11aa-aa11-00306543ecac"
+for GPT.
+.It Cm dragonfly-label32
+A DragonFlyBSD partition subdivided into filesystems with a
+.Bx
+disklabel.
+The scheme-specific type is
+.Qq Li "!9d087404-1ca5-11dc-8817-01301bb8a9f5"
+for GPT.
+.It Cm dragonfly-label64
+A DragonFlyBSD partition subdivided into filesystems with a
+disklabel64.
+The scheme-specific type is
+.Qq Li "!3d48ce54-1d16-11dc-8696-01301bb8a9f5"
+for GPT.
+.It Cm dragonfly-legacy
+A legacy partition type used in DragonFlyBSD.
+The scheme-specific type is
+.Qq Li "!bd215ab2-1d16-11dc-8696-01301bb8a9f5"
+for GPT.
+.It Cm dragonfly-ccd
+A DragonFlyBSD partition used with Concatenated Disk driver.
+The scheme-specific type is
+.Qq Li "!dbd5211b-1ca5-11dc-8817-01301bb8a9f5"
+for GPT.
+.It Cm dragonfly-hammer
+A DragonFlyBSD partition that contains a Hammer filesystem.
+The scheme-specific type is
+.Qq Li "!61dc63ac-6e38-11dc-8513-01301bb8a9f5"
+for GPT.
+.It Cm dragonfly-hammer2
+A DragonFlyBSD partition that contains a Hammer2 filesystem.
+The scheme-specific type is
+.Qq Li "!5cbb9ad1-862d-11dc-a94d-01301bb8a9f5"
+for GPT.
+.It Cm dragonfly-swap
+A DragonFlyBSD partition dedicated to swap space.
+The scheme-specific type is
+.Qq Li "!9d58fdbd-1ca5-11dc-8817-01301bb8a9f5"
+for GPT.
+.It Cm dragonfly-ufs
+A DragonFlyBSD partition that contains an UFS1 filesystem.
+The scheme-specific type is
+.Qq Li "!9d94ce7c-1ca5-11dc-8817-01301bb8a9f5"
+for GPT.
+.It Cm dragonfly-vinum
+A DragonFlyBSD partition used with Logical Volume Manager.
+The scheme-specific type is
+.Qq Li "!9dd4478f-1ca5-11dc-8817-01301bb8a9f5"
+for GPT.
+.It Cm ebr
+A partition subdivided into filesystems with a EBR.
+The scheme-specific type is
+.Qq Li "!5"
+for MBR.
+.It Cm fat16
+A partition that contains a FAT16 filesystem.
+The scheme-specific type is
+.Qq Li "!6"
+for MBR.
+.It Cm fat32
+A partition that contains a FAT32 filesystem.
+The scheme-specific type is
+.Qq Li "!11"
+for MBR.
+.It Cm linux-data
+A Linux partition that contains some filesystem with data.
+The scheme-specific types are
+.Qq Li "!131"
+for MBR and
+.Qq Li "!0fc63daf-8483-4772-8e79-3d69d8477de4"
+for GPT.
+.It Cm linux-lvm
+A Linux partition dedicated to Logical Volume Manager.
+The scheme-specific types are
+.Qq Li "!142"
+for MBR and
+.Qq Li "!e6d6d379-f507-44c2-a23c-238f2a3df928"
+for GPT.
+.It Cm linux-raid
+A Linux partition used in a software RAID configuration.
+The scheme-specific types are
+.Qq Li "!253"
+for MBR and
+.Qq Li "!a19d880f-05fc-4d3b-a006-743f0f84911e"
+for GPT.
+.It Cm linux-swap
+A Linux partition dedicated to swap space.
+The scheme-specific types are
+.Qq Li "!130"
+for MBR and
+.Qq Li "!0657fd6d-a4ab-43c4-84e5-0933c84b4f4f"
+for GPT.
 .It Cm mbr
 A partition that is sub-partitioned by a Master Boot Record (MBR).
 This type is known as
@@ -658,11 +812,49 @@ A partition that contains Logical Disk Manager (LDM) database.
 The scheme-specific type is
 .Qq Li "!5808c8aa-7e8f-42e0-85d2-e1e90434cfb3"
 for GPT.
+.It Cm netbsd-ccd
+A NetBSD partition used with Concatenated Disk driver.
+The scheme-specific type is
+.Qq Li "!2db519c4-b10f-11dc-b99b-0019d1879648"
+for GPT.
+.It Cm netbsd-cgd
+An encrypted NetBSD partition.
+The scheme-specific type is
+.Qq Li "!2db519ec-b10f-11dc-b99b-0019d1879648"
+for GPT.
+.It Cm netbsd-ffs
+A NetBSD partition that contains an UFS filesystem.
+The scheme-specific type is
+.Qq Li "!49f48d5a-b10e-11dc-b99b-0019d1879648"
+for GPT.
+.It Cm netbsd-lfs
+A NetBSD partition that contains an LFS filesystem.
+The scheme-specific type is
+.Qq Li "!49f48d82-b10e-11dc-b99b-0019d1879648"
+for GPT.
+.It Cm netbsd-raid
+A NetBSD partition used in a software RAID configuration.
+The scheme-specific type is
+.Qq Li "!49f48daa-b10e-11dc-b99b-0019d1879648"
+for GPT.
+.It Cm netbsd-swap
+A NetBSD partition dedicated to swap space.
+The scheme-specific type is
+.Qq Li "!49f48d32-b10e-11dc-b99b-0019d1879648"
+for GPT.
 .It Cm ntfs
 A partition that contains a NTFS or exFAT filesystem.
 The scheme-specific type is
 .Qq Li "!7"
 for MBR.
+.It Cm prep-boot
+The system partition dedicated to storing boot loaders on some PowerPC systems,
+notably those made by IBM.
+The scheme-specific types are
+.Qq Li "!65"
+for MBR and
+.Qq Li "!0x9e1a2d38-c612-4316-aa26-8b49521e5a8b"
+for GPT.
 .It Cm vmware-vmfs
 A partition that contains a VMware File System (VMFS).
 The scheme-specific types are
@@ -858,7 +1050,7 @@ Instead, the 800 KBytes bootstrap code image
 should be written with the
 .Cm gpart bootcode
 command to a partition of type
-.Cm freebsd-boot ,
+.Cm apple-boot ,
 which should also be 800 KB in size.
 .Sh OPERATIONAL FLAGS
 Actions other than the
@@ -984,6 +1176,12 @@ If this variable set to 1 each component of the mirrored volume will be
 present as independent partition.
 .Em NOTE :
 This may break a mirrored volume and lead to data damage.
+.It Va kern.geom.part.mbr.enforce_chs : No 0
+Specify how the Master Boot Record (MBR) module does alignment.
+If this variable is set to a non-zero value, the module will automatically
+recalculate the user-specified offset and size for alignment with the CHS
+geometry.
+Otherwise the values will be left unchanged.
 .El
 .Sh EXIT STATUS
 Exit status is 0 on success, and 1 if the command fails.
@@ -1127,4 +1325,4 @@ The
 utility appeared in
 .Fx 7.0 .
 .Sh AUTHORS
-.An Marcel Moolenaar Aq marcel@FreeBSD.org
+.An Marcel Moolenaar Aq Mt marcel@FreeBSD.org
diff --git a/sbin/geom/class/raid/graid.8 b/sbin/geom/class/raid/graid.8
index 47d7fa2c8690..496e44e4ed48 100644
--- a/sbin/geom/class/raid/graid.8
+++ b/sbin/geom/class/raid/graid.8
@@ -320,5 +320,5 @@ The
 utility appeared in
 .Fx 9.0 .
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org
-.An M. Warner Losh Aq imp@FreeBSD.org
+.An Alexander Motin Aq Mt mav@FreeBSD.org
+.An M. Warner Losh Aq Mt imp@FreeBSD.org
diff --git a/sbin/geom/class/raid3/graid3.8 b/sbin/geom/class/raid3/graid3.8
index a82d3882e8a2..426c94d17521 100644
--- a/sbin/geom/class/raid3/graid3.8
+++ b/sbin/geom/class/raid3/graid3.8
@@ -248,7 +248,7 @@ The
 utility appeared in
 .Fx 5.3 .
 .Sh AUTHORS
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
 .Sh BUGS
 There should be a section with an implementation description.
 .Pp
diff --git a/sbin/geom/class/sched/gsched.8 b/sbin/geom/class/sched/gsched.8
index ae04865a21b1..facb5c18440f 100644
--- a/sbin/geom/class/sched/gsched.8
+++ b/sbin/geom/class/sched/gsched.8
@@ -158,5 +158,5 @@ The
 utility first appeared in
 .Fx 8.1 .
 .Sh AUTHORS
-.An Fabio Checconi Aq fabio@FreeBSD.org
-.An Luigi Rizzo Aq luigi@FreeBSD.org
+.An Fabio Checconi Aq Mt fabio@FreeBSD.org
+.An Luigi Rizzo Aq Mt luigi@FreeBSD.org
diff --git a/sbin/geom/class/shsec/gshsec.8 b/sbin/geom/class/shsec/gshsec.8
index f72c31c784ce..dcfd2b397909 100644
--- a/sbin/geom/class/shsec/gshsec.8
+++ b/sbin/geom/class/shsec/gshsec.8
@@ -127,4 +127,4 @@ The
 utility appeared in
 .Fx 5.4 .
 .Sh AUTHORS
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
diff --git a/sbin/geom/class/stripe/gstripe.8 b/sbin/geom/class/stripe/gstripe.8
index 33ef30bf85ce..f1f34fe10609 100644
--- a/sbin/geom/class/stripe/gstripe.8
+++ b/sbin/geom/class/stripe/gstripe.8
@@ -240,4 +240,4 @@ The
 utility appeared in
 .Fx 5.3 .
 .Sh AUTHORS
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
diff --git a/sbin/geom/class/virstor/gvirstor.8 b/sbin/geom/class/virstor/gvirstor.8
index 0273cb41aaba..3d93e5baa2ae 100644
--- a/sbin/geom/class/virstor/gvirstor.8
+++ b/sbin/geom/class/virstor/gvirstor.8
@@ -257,6 +257,10 @@ The
 .Nm
 utility first appeared in
 .Fx 7.0 .
+.Sh AUTHORS
+.An Ivan Voras Aq Mt ivoras@FreeBSD.org
+.Pp
+Sponsored by Google Summer of Code 2006.
 .Sh BUGS
 Commands
 .Cm add
@@ -293,7 +297,3 @@ and all their structures will be physically allocated at the start
 of the first virstor component.
 This could have a significant impact on file system performance
 .Pq which can in some rare cases be even positive .
-.Sh AUTHOR
-.An Ivan Voras Aq ivoras@FreeBSD.org
-.Pp
-Sponsored by Google Summer of Code 2006.
diff --git a/sbin/geom/core/geom.8 b/sbin/geom/core/geom.8
index 6e79880ef629..ab960ff9e07b 100644
--- a/sbin/geom/core/geom.8
+++ b/sbin/geom/core/geom.8
@@ -203,4 +203,4 @@ The
 utility appeared in
 .Fx 5.3 .
 .Sh AUTHORS
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
diff --git a/sbin/ggate/ggatec/ggatec.8 b/sbin/ggate/ggatec/ggatec.8
index 09f0444fa6a5..72ae4c5a9c3e 100644
--- a/sbin/ggate/ggatec/ggatec.8
+++ b/sbin/ggate/ggatec/ggatec.8
@@ -178,4 +178,4 @@ client# mount_cd9660 /dev/ggate0 /cdrom
 The
 .Nm
 utility as well as this manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/sbin/ggate/ggated/ggated.8 b/sbin/ggate/ggated/ggated.8
index 3024a04230d7..3560fe0bc9b5 100644
--- a/sbin/ggate/ggated/ggated.8
+++ b/sbin/ggate/ggated/ggated.8
@@ -108,4 +108,4 @@ Export CD-ROM device and a file:
 The
 .Nm
 utility as well as this manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/sbin/ggate/ggatel/ggatel.8 b/sbin/ggate/ggatel/ggatel.8
index 236e550811e1..1463426f2384 100644
--- a/sbin/ggate/ggatel/ggatel.8
+++ b/sbin/ggate/ggatel/ggatel.8
@@ -152,4 +152,4 @@ ggatel destroy -u 5
 The
 .Nm
 utility as well as this manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/sbin/growfs/growfs.8 b/sbin/growfs/growfs.8
index 9d62a83b974b..0dab89f35943 100644
--- a/sbin/growfs/growfs.8
+++ b/sbin/growfs/growfs.8
@@ -118,10 +118,10 @@ utility first appeared in
 The ability to resize mounted filesystems was added in
 .Fx 10.0 .
 .Sh AUTHORS
-.An Christoph Herrmann Aq chm@FreeBSD.org
-.An Thomas-Henning von Kamptz Aq tomsoft@FreeBSD.org
-.An The GROWFS team Aq growfs@Tomsoft.COM
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org
+.An Christoph Herrmann Aq Mt chm@FreeBSD.org
+.An Thomas-Henning von Kamptz Aq Mt tomsoft@FreeBSD.org
+.An The GROWFS team Aq Mt growfs@Tomsoft.COM
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
 .Sh CAVEATS
 When expanding a file system mounted read-write, any writes to that file system
 will be temporarily suspended until the expansion is finished.
diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile
index c9716e94670c..1b5f948ce893 100644
--- a/sbin/gvinum/Makefile
+++ b/sbin/gvinum/Makefile
@@ -7,8 +7,8 @@ MAN=	gvinum.8
 WARNS?=	2
 CFLAGS+=	-I${.CURDIR}/../../sys -I${DESTDIR}/${INCLUDEDIR}/edit
 
-DPADD=	${LIBEDIT} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM}
-LDADD=	-ledit -ltermcap -ldevstat -lkvm -lgeom
+DPADD=	${LIBEDIT} ${LIBTERMCAPW} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM}
+LDADD=	-ledit -ltermcapw -ldevstat -lkvm -lgeom
 
 .PATH: ${.CURDIR}/../../sys/geom/vinum
 
diff --git a/sbin/gvinum/gvinum.8 b/sbin/gvinum/gvinum.8
index 703a81056f70..a8a448c8ff4d 100644
--- a/sbin/gvinum/gvinum.8
+++ b/sbin/gvinum/gvinum.8
@@ -395,9 +395,9 @@ and
 through the 2007 Google Summer of Code program.
 The documentation have been updated to reflect the new functionality.
 .Sh AUTHORS
-.An Lukas Ertl Aq le@FreeBSD.org
-.An Chris Jones Aq soc-cjones@FreeBSD.org
-.An Ulf Lilleengen Aq lulf@FreeBSD.org
+.An Lukas Ertl Aq Mt le@FreeBSD.org
+.An Chris Jones Aq Mt soc-cjones@FreeBSD.org
+.An Ulf Lilleengen Aq Mt lulf@FreeBSD.org
 .Sh BUGS
 Currently,
 .Nm
diff --git a/sbin/hastctl/hastctl.8 b/sbin/hastctl/hastctl.8
index bdca80d721a6..397d4cfec0a3 100644
--- a/sbin/hastctl/hastctl.8
+++ b/sbin/hastctl/hastctl.8
@@ -224,5 +224,5 @@ nodeB# application_start
 The
 .Nm
 was developed by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
 under sponsorship of the FreeBSD Foundation.
diff --git a/sbin/hastd/hast.conf.5 b/sbin/hastd/hast.conf.5
index 3d921e46c039..c7e2e33ec097 100644
--- a/sbin/hastd/hast.conf.5
+++ b/sbin/hastd/hast.conf.5
@@ -445,5 +445,5 @@ resource tank {
 The
 .Nm
 was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
 under sponsorship of the FreeBSD Foundation.
diff --git a/sbin/hastd/hastd.8 b/sbin/hastd/hastd.8
index 68c98cbc6fff..e30a11a46334 100644
--- a/sbin/hastd/hastd.8
+++ b/sbin/hastd/hastd.8
@@ -228,5 +228,5 @@ nodeA# mount -o noatime /dev/hast/shared /shared
 The
 .Nm
 was developed by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
 under sponsorship of the FreeBSD Foundation.
diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c
index b4db0f174cd7..d2e65e4dc96f 100644
--- a/sbin/ifconfig/af_inet6.c
+++ b/sbin/ifconfig/af_inet6.c
@@ -42,6 +42,7 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <time.h>
 #include <ifaddrs.h>
 
 #include <arpa/inet.h>
@@ -98,20 +99,21 @@ static void
 setip6lifetime(const char *cmd, const char *val, int s, 
     const struct afswtch *afp)
 {
-	time_t newval, t;
+	struct timespec now;
+	time_t newval;
 	char *ep;
 
-	t = time(NULL);
+	clock_gettime(CLOCK_MONOTONIC_FAST, &now);
 	newval = (time_t)strtoul(val, &ep, 0);
 	if (val == ep)
 		errx(1, "invalid %s", cmd);
 	if (afp->af_af != AF_INET6)
 		errx(1, "%s not allowed for the AF", cmd);
 	if (strcmp(cmd, "vltime") == 0) {
-		in6_addreq.ifra_lifetime.ia6t_expire = t + newval;
+		in6_addreq.ifra_lifetime.ia6t_expire = now.tv_sec + newval;
 		in6_addreq.ifra_lifetime.ia6t_vltime = newval;
 	} else if (strcmp(cmd, "pltime") == 0) {
-		in6_addreq.ifra_lifetime.ia6t_preferred = t + newval;
+		in6_addreq.ifra_lifetime.ia6t_preferred = now.tv_sec + newval;
 		in6_addreq.ifra_lifetime.ia6t_pltime = newval;
 	}
 }
@@ -172,9 +174,11 @@ in6_status(int s __unused, const struct ifaddrs *ifa)
 	int s6;
 	u_int32_t flags6;
 	struct in6_addrlifetime lifetime;
-	time_t t = time(NULL);
+	struct timespec now;
 	int error;
 
+	clock_gettime(CLOCK_MONOTONIC_FAST, &now);
+
 	memset(&null_sin, 0, sizeof(null_sin));
 
 	sin = (struct sockaddr_in6 *)ifa->ifa_addr;
@@ -258,15 +262,15 @@ in6_status(int s __unused, const struct ifaddrs *ifa)
 	if (ip6lifetime && (lifetime.ia6t_preferred || lifetime.ia6t_expire)) {
 		printf("pltime ");
 		if (lifetime.ia6t_preferred) {
-			printf("%s ", lifetime.ia6t_preferred < t
-				? "0" : sec2str(lifetime.ia6t_preferred - t));
+			printf("%s ", lifetime.ia6t_preferred < now.tv_sec
+				? "0" : sec2str(lifetime.ia6t_preferred - now.tv_sec));
 		} else
 			printf("infty ");
 
 		printf("vltime ");
 		if (lifetime.ia6t_expire) {
-			printf("%s ", lifetime.ia6t_expire < t
-				? "0" : sec2str(lifetime.ia6t_expire - t));
+			printf("%s ", lifetime.ia6t_expire < now.tv_sec
+				? "0" : sec2str(lifetime.ia6t_expire - now.tv_sec));
 		} else
 			printf("infty ");
 	}
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 290f31606ca8..5bf590d047d6 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -679,9 +679,11 @@ Set a flag to enable Neighbor Unreachability Detection.
 Clear a flag
 .Cm nud .
 .It Cm no_prefer_iface
-Set a flag to not prefer address on the interface as candidates of the
-source address for outgoing packets, even when the interface is
-outgoing interface.
+Set a flag to not honor rule 5 of source address selection in RFC 3484.         
+In practice this means the address on the outgoing interface will not be
+preferred, effectively yielding the decision to the address selection
+policy table, configurable with
+.Xr ip6addrctl 8 .
 .It Cm -no_prefer_iface
 Clear a flag
 .Cm no_prefer_iface .
@@ -2333,7 +2335,6 @@ src/dst address for IPv4 or IPv6.
 .It Cm l4
 src/dst port for TCP/UDP/SCTP.
 .El
-.Pp
 .El
 .Pp
 The following parameters are specific to IP tunnel interfaces,
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index d2ddeca21299..1f93a0d8c7fc 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -78,7 +78,7 @@ static const char rcsid[] =
 
 /*
  * Since "struct ifreq" is composed of various union members, callers
- * should pay special attention to interprete the value.
+ * should pay special attention to interpret the value.
  * (.e.g. little/big endian difference in the structure.)
  */
 struct	ifreq ifr;
diff --git a/sbin/ipf/Makefile.inc b/sbin/ipf/Makefile.inc
index b3efd6f8eec9..2d7d7b1c71bf 100644
--- a/sbin/ipf/Makefile.inc
+++ b/sbin/ipf/Makefile.inc
@@ -1,5 +1,7 @@
 #	$FreeBSD$
 
+.include <src.opts.mk>
+
 WARNS?=		2
 NO_WFORMAT=
 NO_WARRAY_BOUNDS=
@@ -10,6 +12,12 @@ CFLAGS+=	-I${.CURDIR}/../../../sys
 CFLAGS+=	-I${.CURDIR}/../../../sys/contrib/ipfilter
 CFLAGS+=	-DSTATETOP -D__UIO_EXPOSE
 
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+=	-DUSE_INET6
+.else
+CFLAGS+=	-DNOINET6
+.endif
+
 LIBIPF=		${.OBJDIR}/../libipf/libipf.a
 DPADD+=		${LIBIPF} ${LIBKVM}
 LDADD+=		${LIBIPF} -lkvm
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index f3c31ec4c104..96476971d816 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -1623,7 +1623,6 @@ followed by the number of significant bits.
 For example, an address with 33 significant bits could be specified as:
 .Pp
 .Dl "MAC 10:20:30:40:50:60/33 any"
-.Pp
 .It
 An ampersand
 .Pq &
@@ -3611,7 +3610,7 @@ options have been added by various developer over the years.
 .Pp
 .An -nosplit
 In-kernel NAT support written by
-.An Paolo Pisati Aq piso@FreeBSD.org
+.An Paolo Pisati Aq Mt piso@FreeBSD.org
 as part of a Summer of Code 2005 project.
 .Pp
 SCTP
diff --git a/sbin/kldconfig/kldconfig.8 b/sbin/kldconfig/kldconfig.8
index 18fbaf609ac4..3cc288f5a368 100644
--- a/sbin/kldconfig/kldconfig.8
+++ b/sbin/kldconfig/kldconfig.8
@@ -105,4 +105,4 @@ The
 utility first appeared in
 .Fx 4.4 .
 .Sh AUTHORS
-.An Peter Pentchev Aq roam@FreeBSD.org
+.An Peter Pentchev Aq Mt roam@FreeBSD.org
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index ee913ed638a1..b84b8630999e 100644
--- a/sbin/kldload/kldload.8
+++ b/sbin/kldload/kldload.8
@@ -126,4 +126,4 @@ replacing the
 .Nm lkm
 interface.
 .Sh AUTHORS
-.An Doug Rabson Aq dfr@FreeBSD.org
+.An Doug Rabson Aq Mt dfr@FreeBSD.org
diff --git a/sbin/kldstat/kldstat.8 b/sbin/kldstat/kldstat.8
index bebabe8bff52..b892ef678293 100644
--- a/sbin/kldstat/kldstat.8
+++ b/sbin/kldstat/kldstat.8
@@ -74,4 +74,4 @@ replacing the
 .Nm lkm
 interface.
 .Sh AUTHORS
-.An Doug Rabson Aq dfr@FreeBSD.org
+.An Doug Rabson Aq Mt dfr@FreeBSD.org
diff --git a/sbin/kldunload/kldunload.8 b/sbin/kldunload/kldunload.8
index 0a7937c5ebc4..5e371e6fc5a0 100644
--- a/sbin/kldunload/kldunload.8
+++ b/sbin/kldunload/kldunload.8
@@ -78,4 +78,4 @@ replacing the
 .Nm lkm
 interface.
 .Sh AUTHORS
-.An Doug Rabson Aq dfr@FreeBSD.org
+.An Doug Rabson Aq Mt dfr@FreeBSD.org
diff --git a/sbin/mca/mca.8 b/sbin/mca/mca.8
deleted file mode 100644
index e654d3676173..000000000000
--- a/sbin/mca/mca.8
+++ /dev/null
@@ -1,73 +0,0 @@
-.\" Copyright (c) 2006 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$
-.\"
-.Dd February 11, 2006
-.Dt MCA 8
-.Os
-.Sh NAME
-.Nm mca
-.Nd "Machine Check Architecture control utility"
-.Sh SYNOPSIS
-.Nm
-.Op Fl d
-.Op Fl f Ar filename
-.Sh DESCRIPTION
-The
-.Nm
-utility provides minimal functionality to dump or display MCA records
-that were saved by the kernel during boot.
-The default behaviour of the
-.Nm
-utility is to display all new MCA records on stdout.
-When the
-.Fl d
-option is given, the records are dumped in binary form.
-The default file to which records are dumped is
-.Pa /var/log/mca.log .
-This can be changed by specifying the
-.Fl f
-option.
-New records are appended to the dump file.
-.Pp
-Previously dumped records can be displayed by giving the name of
-the dump file with the
-.Fl f
-option.
-.Sh FILES
-.Bl -tag -width ".Pa /var/log/mca.log" -compact
-.It Pa /var/log/mca.log
-default dump file
-.El
-.Sh HISTORY
-The
-.Nm
-utility appeared in
-.Fx 5.0
-for ia64.
-.Sh BUGS
-The development of the
-.Nm
-utility is still a work in progress.
diff --git a/sbin/mca/mca.c b/sbin/mca/mca.c
deleted file mode 100644
index ed7bcff5fcc9..000000000000
--- a/sbin/mca/mca.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
- * Copyright (c) 2002 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/sysctl.h>
-#include <sys/uuid.h>
-
-/*
- * Hack to make this compile on non-ia64 machines.
- */
-#ifdef __ia64__
-#include <machine/mca.h>
-#else
-#include "../../sys/ia64/include/mca.h"
-#endif
-
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <uuid.h>
-
-#define	BCD(x)	((x >> 4) * 10 + (x & 15))
-
-#define	HW_MCA_MAX_CPUID	255
-
-static const char hw_mca_count[] = "hw.mca.count";
-static const char hw_mca_first[] = "hw.mca.first";
-static const char hw_mca_last[] = "hw.mca.last";
-static const char hw_mca_recid[] = "hw.mca.%d.%u";
-
-static char default_dumpfile[] = "/var/log/mca.log";
-
-int fl_dump;
-char *file;
-
-static const char *
-severity(int error)
-{
-
-	switch (error) {
-	case MCA_RH_ERROR_RECOVERABLE:
-		return ("recoverable");
-	case MCA_RH_ERROR_FATAL:
-		return ("fatal");
-	case MCA_RH_ERROR_CORRECTED:
-		return ("corrected");
-	}
-
-	return ("unknown");
-}
-
-static const char *
-uuid(uuid_t *id)
-{
-	static char buffer[64];
-	char *s;
-
-	uuid_to_string(id, &s, NULL);
-	strcpy(buffer, s);
-	free(s);
-	return (buffer);
-}
-
-static int
-show_value(int indent, const char *var, const char *fmt, ...)
-{
-	va_list ap;
-	int len;
-
-	len = indent;
-	while (indent--)
-		putchar(' ');
-	len += printf("<%s>", var);
-	va_start(ap, fmt);
-	len += vprintf(fmt, ap);
-	len += printf("</%s>\n", var);
-	return (len);
-}
-
-static size_t
-show_header(struct mca_record_header *rh)
-{
-
-	printf("  <header>\n");
-	show_value(4, "seqnr", "%lld", (long long)rh->rh_seqnr);
-	show_value(4, "revision", "%d.%d", BCD(rh->rh_major),
-	    BCD(rh->rh_minor));
-	show_value(4, "severity", "%s", severity(rh->rh_error));
-	show_value(4, "length", "%lld", (long long)rh->rh_length);
-	show_value(4, "date", "%d%02d/%02d/%02d",
-	    BCD(rh->rh_time[MCA_RH_TIME_CENT]),
-	    BCD(rh->rh_time[MCA_RH_TIME_YEAR]),
-	    BCD(rh->rh_time[MCA_RH_TIME_MON]),
-	    BCD(rh->rh_time[MCA_RH_TIME_MDAY]));
-	show_value(4, "time", "%02d:%02d:%02d",
-	    BCD(rh->rh_time[MCA_RH_TIME_HOUR]),
-	    BCD(rh->rh_time[MCA_RH_TIME_MIN]),
-	    BCD(rh->rh_time[MCA_RH_TIME_SEC]));
-	if (rh->rh_flags & MCA_RH_FLAGS_PLATFORM_ID)
-		show_value(4, "platform", "%s", uuid(&rh->rh_platform));
-	printf("  </header>\n");
-	return (rh->rh_length);
-}
-
-static void
-show_cpu_mod(const char *what, int idx, struct mca_cpu_mod *cpu_mod)
-{
-	printf("      <%s-%d>\n", what, idx);
-	if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_INFO)
-		show_value(8, "info", "0x%016llx",
-		    (long long)cpu_mod->cpu_mod_info);
-	if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_REQID)
-		show_value(8, "requester", "0x%016llx",
-		    (long long)cpu_mod->cpu_mod_reqid);
-	if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_RSPID)
-		show_value(8, "responder", "0x%016llx",
-		    (long long)cpu_mod->cpu_mod_rspid);
-	if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_TGTID)
-		show_value(8, "target", "0x%016llx",
-		    (long long)cpu_mod->cpu_mod_tgtid);
-	if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_IP)
-		show_value(8, "ip", "0x%016llx",
-		    (long long)cpu_mod->cpu_mod_ip);
-	printf("      </%s-%d>\n", what, idx);
-}
-
-static void
-show_cpu(struct mca_cpu_record *cpu)
-{
-	char var[16];
-	struct mca_cpu_mod *mod;
-	struct mca_cpu_cpuid *cpuid;
-#ifdef notyet
-	struct mca_cpu_psi *psi;
-#endif
-	int i, n;
-
-	printf("    <cpu>\n");
-
-	if (cpu->cpu_flags & MCA_CPU_FLAGS_ERRMAP)
-		show_value(6, "errmap", "0x%016llx",
-		    (long long)cpu->cpu_errmap);
-	if (cpu->cpu_flags & MCA_CPU_FLAGS_STATE)
-		show_value(6, "state", "0x%016llx",
-		    (long long)cpu->cpu_state);
-	if (cpu->cpu_flags & MCA_CPU_FLAGS_CR_LID)
-		show_value(6, "cr_lid", "0x%016llx",
-		    (long long)cpu->cpu_cr_lid);
-
-	mod = (struct mca_cpu_mod*)(cpu + 1);
-	n = MCA_CPU_FLAGS_CACHE(cpu->cpu_flags);
-	for (i = 0; i < n; i++)
-		show_cpu_mod("cache", i, mod++);
-	n = MCA_CPU_FLAGS_TLB(cpu->cpu_flags);
-	for (i = 0; i < n; i++)
-		show_cpu_mod("tlb", i, mod++);
-	n = MCA_CPU_FLAGS_BUS(cpu->cpu_flags);
-	for (i = 0; i < n; i++)
-		show_cpu_mod("bus", i, mod++);
-	n = MCA_CPU_FLAGS_REG(cpu->cpu_flags);
-	for (i = 0; i < n; i++)
-		show_cpu_mod("reg", i, mod++);
-	n = MCA_CPU_FLAGS_MS(cpu->cpu_flags);
-	for (i = 0; i < n; i++)
-		show_cpu_mod("ms", i, mod++);
-
-	cpuid = (struct mca_cpu_cpuid*)mod;
-	for (i = 0; i < 6; i++) {
-		sprintf(var, "cpuid-%d", i);
-		show_value(6, var, "0x%016llx", (long long)cpuid->cpuid[i]);
-	}
-
-#ifdef notyet
-	 psi = (struct mca_cpu_psi*)(cpuid + 1);
-#endif
-	 /* TODO: Dump PSI */
-
-	printf("    </cpu>\n");
-}
-
-static void
-show_memory(struct mca_mem_record *mem)
-{
-	printf("    <memory>\n");
-
-	if (mem->mem_flags & MCA_MEM_FLAGS_STATUS)
-		show_value(6, "status", "0x%016llx",
-		    (long long)mem->mem_status);
-	if (mem->mem_flags & MCA_MEM_FLAGS_ADDR)
-		show_value(6, "address", "0x%016llx",
-		    (long long)mem->mem_addr);
-	if (mem->mem_flags & MCA_MEM_FLAGS_ADDRMASK)
-		show_value(6, "mask", "0x%016llx",
-		    (long long)mem->mem_addrmask);
-	if (mem->mem_flags & MCA_MEM_FLAGS_NODE)
-		show_value(6, "node", "0x%04x", mem->mem_node);
-	if (mem->mem_flags & MCA_MEM_FLAGS_CARD)
-		show_value(6, "card", "0x%04x", mem->mem_card);
-	if (mem->mem_flags & MCA_MEM_FLAGS_MODULE)
-		show_value(6, "module", "0x%04x", mem->mem_module);
-	if (mem->mem_flags & MCA_MEM_FLAGS_BANK)
-		show_value(6, "bank", "0x%04x", mem->mem_bank);
-	if (mem->mem_flags & MCA_MEM_FLAGS_DEVICE)
-		show_value(6, "device", "0x%04x", mem->mem_device);
-	if (mem->mem_flags & MCA_MEM_FLAGS_ROW)
-		show_value(6, "row", "0x%04x", mem->mem_row);
-	if (mem->mem_flags & MCA_MEM_FLAGS_COLUMN)
-		show_value(6, "column", "0x%04x", mem->mem_column);
-	if (mem->mem_flags & MCA_MEM_FLAGS_BITPOS)
-		show_value(6, "bit", "0x%04x", mem->mem_bitpos);
-	if (mem->mem_flags & MCA_MEM_FLAGS_REQID)
-		show_value(6, "requester", "0x%016llx",
-		    (long long)mem->mem_reqid);
-	if (mem->mem_flags & MCA_MEM_FLAGS_RSPID)
-		show_value(6, "responder", "0x%016llx",
-		    (long long)mem->mem_rspid);
-	if (mem->mem_flags & MCA_MEM_FLAGS_TGTID)
-		show_value(6, "target", "0x%016llx",
-		    (long long)mem->mem_tgtid);
-	if (mem->mem_flags & MCA_MEM_FLAGS_BUSDATA)
-		show_value(6, "status", "0x%016llx",
-		    (long long)mem->mem_busdata);
-	if (mem->mem_flags & MCA_MEM_FLAGS_OEM_ID)
-		show_value(6, "oem", "%s", uuid(&mem->mem_oem_id));
-	/* TODO: Dump OEM data */
-
-	printf("    </memory>\n");
-}
-
-static void
-show_sel(void)
-{
-	printf("    # SEL\n");
-}
-
-static void
-show_pci_bus(struct mca_pcibus_record *pcibus)
-{
-	printf("    <pci-bus>\n");
-
-	if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_STATUS)
-		show_value(6, "status", "0x%016llx",
-		    (long long)pcibus->pcibus_status);
-	if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_ERROR)
-		show_value(6, "error", "0x%04x", pcibus->pcibus_error);
-	if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_BUS)
-		show_value(6, "bus", "0x%04x", pcibus->pcibus_bus);
-	if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_ADDR)
-		show_value(6, "address", "0x%016llx",
-		    (long long)pcibus->pcibus_addr);
-	if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_DATA)
-		show_value(6, "data", "0x%016llx",
-		    (long long)pcibus->pcibus_data);
-	if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_CMD)
-		show_value(6, "cmd", "0x%016llx",
-		    (long long)pcibus->pcibus_cmd);
-	if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_REQID)
-		show_value(6, "requester", "0x%016llx",
-		    (long long)pcibus->pcibus_reqid);
-	if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_RSPID)
-		show_value(6, "responder", "0x%016llx",
-		    (long long)pcibus->pcibus_rspid);
-	if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_TGTID)
-		show_value(6, "target", "0x%016llx",
-		    (long long)pcibus->pcibus_tgtid);
-	if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_OEM_ID)
-		show_value(6, "oem", "%s", uuid(&pcibus->pcibus_oem_id));
-	/* TODO: Dump OEM data */
-
-	printf("    </pci-bus>\n");
-}
-
-static void
-show_smbios(void)
-{
-	printf("    # SMBIOS\n");
-}
-
-static void
-show_pci_dev(struct mca_pcidev_record *pcidev)
-{
-	printf("    <pci-dev>\n");
-
-	if (pcidev->pcidev_flags & MCA_PCIDEV_FLAGS_STATUS)
-		show_value(6, "status", "0x%016llx",
-		    (long long)pcidev->pcidev_status);
-	if (pcidev->pcidev_flags & MCA_PCIDEV_FLAGS_INFO) {
-		show_value(6, "vendor", "0x%04x",
-		    pcidev->pcidev_info.info_vendor);
-		show_value(6, "device", "0x%04x",
-		    pcidev->pcidev_info.info_device);
-		show_value(6, "class", "0x%06x",
-		    MCA_PCIDEV_INFO_CLASS(pcidev->pcidev_info.info_ccfn));
-		show_value(6, "function", "0x%02x",
-		    MCA_PCIDEV_INFO_FUNCTION(pcidev->pcidev_info.info_ccfn));
-		show_value(6, "slot", "0x%02x", pcidev->pcidev_info.info_slot);
-		show_value(6, "bus", "0x%04x", pcidev->pcidev_info.info_bus);
-		show_value(6, "segment", "0x%04x",
-		    pcidev->pcidev_info.info_segment);
-	}
-	/* TODO: dump registers */
-	/* TODO: Dump OEM data */
-
-	printf("    </pci-dev>\n");
-}
-
-static void
-show_generic(void)
-{
-	printf("    # GENERIC\n");
-}
-
-static size_t
-show_section(struct mca_section_header *sh)
-{
-	static uuid_t uuid_cpu = MCA_UUID_CPU;
-	static uuid_t uuid_memory = MCA_UUID_MEMORY;
-	static uuid_t uuid_sel = MCA_UUID_SEL;
-	static uuid_t uuid_pci_bus = MCA_UUID_PCI_BUS;
-	static uuid_t uuid_smbios = MCA_UUID_SMBIOS;
-	static uuid_t uuid_pci_dev = MCA_UUID_PCI_DEV;
-	static uuid_t uuid_generic = MCA_UUID_GENERIC;
-
-	printf("  <section>\n");
-	show_value(4, "uuid", "%s", uuid(&sh->sh_uuid));
-	show_value(4, "revision", "%d.%d", BCD(sh->sh_major),
-	    BCD(sh->sh_minor));
-
-	if (uuid_equal(&sh->sh_uuid, &uuid_cpu, NULL))
-		show_cpu((void*)(sh + 1));
-	else if (uuid_equal(&sh->sh_uuid, &uuid_memory, NULL))
-		show_memory((void*)(sh + 1));
-	else if (uuid_equal(&sh->sh_uuid, &uuid_sel, NULL))
-		show_sel();
-	else if (uuid_equal(&sh->sh_uuid, &uuid_pci_bus, NULL))
-		show_pci_bus((void*)(sh + 1));
-	else if (uuid_equal(&sh->sh_uuid, &uuid_smbios, NULL))
-		show_smbios();
-	else if (uuid_equal(&sh->sh_uuid, &uuid_pci_dev, NULL))
-		show_pci_dev((void*)(sh + 1));
-	else if (uuid_equal(&sh->sh_uuid, &uuid_generic, NULL))
-		show_generic();
-
-	printf("  </section>\n");
-	return (sh->sh_length);
-}
-
-static void
-show(char *data, const char *mib)
-{
-	size_t reclen, seclen;
-
-	if (mib != NULL)
-		printf("<!-- MIB: %s -->\n", mib);
-
-	printf("<record>\n");
-	reclen = show_header((void*)data) - sizeof(struct mca_record_header);
-	data += sizeof(struct mca_record_header);
-	while (reclen > sizeof(struct mca_section_header)) {
-		seclen = show_section((void*)data);
-		reclen -= seclen;
-		data += seclen;
-	}
-	printf("</record>\n");
-}
-
-static void
-showall(char *buf, size_t buflen)
-{
-	struct mca_record_header *rh;
-	size_t reclen;
-
-	do {
-		if (buflen < sizeof(struct mca_record_header))
-			return;
-
-		rh = (void*)buf;
-		reclen = rh->rh_length;
-		if (buflen < reclen)
-			return;
-
-		show(buf, NULL);
-
-		buf += reclen;
-		buflen -= reclen;
-	}
-	while (1);
-}
-
-static void
-dump(char *data)
-{
-	struct mca_record_header *rh;
-	const char *fn;
-	int fd;
-
-	rh = (void*)data;
-	fn = (file) ? file : default_dumpfile;
-	fd = open(fn, O_WRONLY|O_CREAT|O_APPEND, 0660);
-	if (fd == -1)
-		err(2, "open(%s)", fn);
-	if (write(fd, (void*)rh, rh->rh_length) == -1)
-		err(2, "write(%s)", fn);
-	close(fd);
-}
-
-static void
-usage(void)
-{
-
-	fprintf(stderr, "usage: mca [-df]\n");
-	exit (1);
-}
-
-int
-main(int argc, char **argv)
-{
-	char mib[32];
-	char *buf;
-	size_t len;
-	int ch, error, fd;
-	int count, first, last, cpuid;
-
-	while ((ch = getopt(argc, argv, "df:")) != -1) {
-		switch(ch) {
-		case 'd':	/* dump */
-			fl_dump = 1;
-			break;
-		case 'f':
-			if (file)
-				free(file);		/* XXX complain! */
-			file = strdup(optarg);
-			break;
-		default:
-			usage();
-		}
-	}
-
-	argc -= optind;
-	argv += optind;
-
-	if (file == NULL || fl_dump) {
-		len = sizeof(count);
-		if (sysctlbyname(hw_mca_count, &count, &len, NULL, 0) == -1)
-			err(1, hw_mca_count);
-
-		if (count == 0)
-			errx(0, "no error records found");
-
-		len = sizeof(first);
-		if (sysctlbyname(hw_mca_first, &first, &len, NULL, 0) == -1)
-			err(1, hw_mca_first);
-
-		len = sizeof(last);
-		if (sysctlbyname(hw_mca_last, &last, &len, NULL, 0) == -1)
-			err(1, hw_mca_last);
-
-		cpuid = 0;
-		error = 0;
-		while (count && first <= last) {
-			do {
-				sprintf(mib, hw_mca_recid, first, cpuid);
-				len = 0;
-				ch = sysctlbyname(mib, NULL, &len, NULL, 0);
-				error = (ch == -1) ? errno : 0;
-				if (error != ENOENT)
-					break;
-				cpuid++;
-			} while (cpuid <= HW_MCA_MAX_CPUID);
-			if (error == ENOENT && cpuid > HW_MCA_MAX_CPUID) {
-				first++;
-				cpuid = 0;
-				continue;
-			}
-			if (error)
-				errc(1, error, "%s(1)", mib);
-
-			buf = malloc(len);
-			if (buf == NULL)
-				err(1, "buffer");
-
-			if (sysctlbyname(mib, buf, &len, NULL, 0) == -1)
-				err(1, "%s(2)", mib);
-
-			if (fl_dump)
-				dump(buf);
-			else
-				show(buf, mib);
-
-			free(buf);
-			count--;
-			if (cpuid == HW_MCA_MAX_CPUID) {
-				first++;
-				cpuid = 0;
-			} else
-				cpuid++;
-		}
-	} else {
-		fd = open(file, O_RDONLY);
-		if (fd == -1)
-			err(1, "open(%s)", file);
-
-		len = lseek(fd, 0LL, SEEK_END);
-		buf = mmap(NULL, len, PROT_READ, 0U, fd, 0LL);
-		if (buf == MAP_FAILED)
-			err(1, "mmap(%s)", file);
-
-		showall(buf, len);
-
-		munmap(buf, len);
-		close(fd);
-	}
-
-	return (0);
-}
diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index 77c40a17bfe1..e191cd16015c 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -154,4 +154,4 @@ This program is placed in the public domain for free general use by
 RSA Data Security.
 .Pp
 Support for SHA-1 and RIPEMD-160 has been added by
-.An Oliver Eikemeier Aq eik@FreeBSD.org .
+.An Oliver Eikemeier Aq Mt eik@FreeBSD.org .
diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index 6b52bec7830a..04d3391c0b16 100644
--- a/sbin/mdconfig/mdconfig.8
+++ b/sbin/mdconfig/mdconfig.8
@@ -319,5 +319,4 @@ combo.
 The
 .Nm
 utility was written by
-.An Poul-Henning Kamp
-.Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 50c5a8bd0391..3b5c2549657f 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -551,6 +551,7 @@ support for a particular file system might be provided either on a static
 .Xr mount_smbfs 8 ,
 .Xr mount_udf 8 ,
 .Xr mount_unionfs 8 ,
+.Xr tmpfs 5 ,
 .Xr umount 8 ,
 .Xr zfs 8 ,
 .Xr zpool 8
diff --git a/sbin/mount/mount.conf.8 b/sbin/mount/mount.conf.8
index c3296c363eaf..45b8257ebae9 100644
--- a/sbin/mount/mount.conf.8
+++ b/sbin/mount/mount.conf.8
@@ -247,6 +247,6 @@ The root mount logic in the
 kernel which parses
 .Pa /.mount.conf
 was written by
-.An Marcel Moolenaar Aq marcel@FreeBSD.org .
+.An Marcel Moolenaar Aq Mt marcel@FreeBSD.org .
 This man page was written by
-.An Craig Rodrigues Aq rodrigc@FreeBSD.org .
+.An Craig Rodrigues Aq Mt rodrigc@FreeBSD.org .
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index b4716862bfd3..974ab3b1349e 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -147,7 +147,7 @@ utility first appeared in
 .Bx 4.4 .
 .Pp
 The Unicode conversion routine was added by
-.An Ryuichiro Imura Aq imura@ryu16.org
+.An Ryuichiro Imura Aq Mt imura@ryu16.org
 in 2003.
 .Sh BUGS
 POSIX device node mapping is currently not supported.
diff --git a/sbin/mount_fusefs/mount_fusefs.8 b/sbin/mount_fusefs/mount_fusefs.8
index 7c8bb67a7771..3e11cf19bd8f 100644
--- a/sbin/mount_fusefs/mount_fusefs.8
+++ b/sbin/mount_fusefs/mount_fusefs.8
@@ -151,7 +151,6 @@ Do not refuse unmounting if there are secondary mounts
 .It Cm push_symlinks_in
 Prefix absolute symlinks with the mountpoint
 .El
-.Pp
 .El
 .Pp
 Besides the above mount options, there is a set of pseudo-mount options which
diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8
index e7bc764eaf02..ae69aeb52e46 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.8
+++ b/sbin/mount_msdosfs/mount_msdosfs.8
@@ -213,8 +213,8 @@ of the more aptly-named
 .Nm .
 .Pp
 The character code conversion routine was added by
-.An Ryuichiro Imura Aq imura@ryu16.org
-at 2003.
+.An Ryuichiro Imura Aq Mt imura@ryu16.org
+in 2003.
 .Sh CAVEATS
 The use of the
 .Fl 9
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index da11c29eeaa1..124ba7d60a0f 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 December 7, 2013
+.Dd August 5, 2014
 .Dt MOUNT_NFS 8
 .Os
 .Sh NAME
@@ -371,6 +371,14 @@ tune the timeout
 interval.)
 .It Cm udp
 Use UDP transport.
+.It Cm vers Ns = Ns Aq Ar vers_number
+Use the specified version number for NFS requests.
+See the
+.Cm nfsv2 ,
+.Cm nfsv3 ,
+and 
+.Cm nfsv4
+options for details.
 .It Cm wcommitsize Ns = Ns Aq Ar value
 Set the maximum pending write commit size to the specified value.
 This determines the maximum amount of pending write data that the NFS
@@ -466,6 +474,26 @@ Same as
 Same as
 .Fl o Cm retrans Ns = Ns Aq Ar value
 .El
+.Pp
+The following
+.Fl o
+named options are equivalent to other
+.Fl o
+named options and are supported for compatibility with other
+operating systems (e.g., Linux, Solaris, and OSX) to ease usage of
+.Xr autofs 5
+support.
+.Bl -tag -width indent
+.It Fl o Cm vers Ns = Ns 2
+Same as
+.Fl o Cm nfsv2
+.It Fl o Cm vers Ns = Ns 3
+Same as
+.Fl o Cm nfsv3
+.It Fl o Cm vers Ns = Ns 4
+Same as
+.Fl o Cm nfsv4
+.El
 .Sh SEE ALSO
 .Xr nmount 2 ,
 .Xr unmount 2 ,
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index bd016f3cb3bc..383f475479d8 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -310,6 +310,32 @@ main(int argc, char *argv[])
 					if (*p || num <= 0)
 						errx(1, "illegal maxgroups value -- %s", val);
 					//set_rpc_maxgrouplist(num);
+				} else if (strcmp(opt, "vers") == 0) {
+					num = strtol(val, &p, 10);
+					if (*p || num <= 0)
+						errx(1, "illegal vers value -- "
+						    "%s", val);
+					switch (num) {
+					case 2:
+						mountmode = V2;
+						break;
+					case 3:
+						mountmode = V3;
+						build_iovec(&iov, &iovlen,
+						    "nfsv3", NULL, 0);
+						break;
+					case 4:
+						mountmode = V4;
+						fstype = "nfs";
+						nfsproto = IPPROTO_TCP;
+						if (portspec == NULL)
+							portspec = "2049";
+						break;
+					default:
+						errx(1, "illegal nfs version "
+						    "value -- %s", val);
+					}
+					pass_flag_to_nmount=0;
 				}
 				if (pass_flag_to_nmount)
 					build_iovec(&iov, &iovlen, opt, val,
diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8
index b613a94414b4..075eff184ee1 100644
--- a/sbin/mount_unionfs/mount_unionfs.8
+++ b/sbin/mount_unionfs/mount_unionfs.8
@@ -342,9 +342,9 @@ because this is identical to using
 .An -nosplit
 In
 .Fx 7.0 ,
-.An Masanori OZAWA Aq ozawa@ongs.co.jp
+.An Masanori OZAWA Aq Mt ozawa@ongs.co.jp
 reimplemented handling of locking, whiteout, and file mode bits, and
-.An Hiroki Sato Aq hrs@FreeBSD.org
+.An Hiroki Sato Aq Mt hrs@FreeBSD.org
 wrote about the changes in this manual page.
 .Sh BUGS
 THIS FILE SYSTEM TYPE IS NOT YET FULLY SUPPORTED (READ: IT DOESN'T WORK)
@@ -357,7 +357,7 @@ BATTERIES NOT INCLUDED.
 .Pp
 This code also needs an owner in order to be less dangerous - serious
 hackers can apply by sending mail to
-.Aq freebsd-fs@FreeBSD.org
+.Aq Mt freebsd-fs@FreeBSD.org
 and announcing
 their intent to take it over.
 .Pp
diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index b4b37ed1fb5d..7ccfbf7578bb 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -585,7 +585,6 @@ in the
 file or using the command
 .Pp
 .Dl "sysctl net.inet.ip.forwarding=1"
-.Pp
 .It
 If you use the
 .Fl interface
@@ -813,19 +812,19 @@ are forwarded to the appropriate router on that interface.
 This program is the result of the efforts of many people at different
 times:
 .Pp
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
 (divert sockets)
-.An Charles Mott Aq cm@linktel.net
+.An Charles Mott Aq Mt cm@linktel.net
 (packet aliasing)
-.An Eivind Eklund Aq perhaps@yes.no
+.An Eivind Eklund Aq Mt perhaps@yes.no
 (IRC support & misc additions)
-.An Ari Suutari Aq suutari@iki.fi
+.An Ari Suutari Aq Mt suutari@iki.fi
 (natd)
-.An Dru Nelson Aq dnelson@redwoodsoft.com
+.An Dru Nelson Aq Mt dnelson@redwoodsoft.com
 (early PPTP support)
-.An Brian Somers Aq brian@awfulhak.org
+.An Brian Somers Aq Mt brian@awfulhak.org
 (glue)
-.An Ruslan Ermilov Aq ru@FreeBSD.org
+.An Ruslan Ermilov Aq Mt ru@FreeBSD.org
 (natd, packet aliasing, glue)
-.An Poul-Henning Kamp Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
 (multiple instances)
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 1627f2de2cd8..d61043a57bd9 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -238,4 +238,4 @@ The
 utility first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Robert Nordier Aq rnordier@FreeBSD.org .
+.An Robert Nordier Aq Mt rnordier@FreeBSD.org
diff --git a/sbin/newfs_nandfs/newfs_nandfs.8 b/sbin/newfs_nandfs/newfs_nandfs.8
index 6997430d7236..7a630bbbf89e 100644
--- a/sbin/newfs_nandfs/newfs_nandfs.8
+++ b/sbin/newfs_nandfs/newfs_nandfs.8
@@ -72,5 +72,5 @@ The
 .Nm
 utility first appeared in
 .Fx 10.0 .
-.Sh AUTHOR
+.Sh AUTHORS
 .An Grzegorz Bernacki
diff --git a/sbin/nos-tun/nos-tun.8 b/sbin/nos-tun/nos-tun.8
index 405d43007b62..8ea6d5c15fa5 100644
--- a/sbin/nos-tun/nos-tun.8
+++ b/sbin/nos-tun/nos-tun.8
@@ -82,11 +82,11 @@ tunnel source 192.168.56.45
 .Ed
 .Sh AUTHORS
 .An -nosplit
-.An Nickolay N. Dudorov Aq nnd@itfs.nsk.su
+.An Nickolay N. Dudorov Aq Mt nnd@itfs.nsk.su
 wrote the program,
-.An Poul-Henning Kamp Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
 wrote the man-page.
-.An Isao SEKI Aq iseki@gongon.com
+.An Isao SEKI Aq Mt iseki@gongon.com
 added a new flag, IP protocol number.
 .Sh BUGS
 We do not allow for setting our source address for multihomed machines.
diff --git a/sbin/nvmecontrol/nvmecontrol.8 b/sbin/nvmecontrol/nvmecontrol.8
index 010f10680a5f..3b4b5c23aef3 100644
--- a/sbin/nvmecontrol/nvmecontrol.8
+++ b/sbin/nvmecontrol/nvmecontrol.8
@@ -124,7 +124,7 @@ nvme0 controller and activate it on the next reset.
 .An -nosplit
 .Nm
 was developed by Intel and originally written by
-.An Jim Harris Aq jimharris@FreeBSD.org .
+.An Jim Harris Aq Mt jimharris@FreeBSD.org .
 .Pp
 This man page was written by
-.An Jim Harris Aq jimharris@FreeBSD.org .
+.An Jim Harris Aq Mt jimharris@FreeBSD.org .
diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8
index 5c0e7b37f4de..5908cf1a8e56 100644
--- a/sbin/pfctl/pfctl.8
+++ b/sbin/pfctl/pfctl.8
@@ -317,7 +317,6 @@ To kill a state with ID 4823e84500000018 created from a backup
 firewall with hostid 00000002 use:
 .Pp
 .Dl # pfctl -k id -k 4823e84500000018/2
-.Pp
 .It Fl m
 Merge in explicitly given options without resetting those
 which are omitted.
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 01e29a194e3b..b963de176892 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1090,8 +1090,14 @@ main(int argc, char *argv[])
 		/* signal handling */
 		if (seenalrm) {
 			/* last packet sent, timeout reached? */
-			if (npackets && ntransmitted >= npackets)
-				break;
+			if (npackets && ntransmitted >= npackets) {
+				struct timeval zerotime = {0, 0};
+				itimer.it_value = zerotime;
+				itimer.it_interval = zerotime;
+				(void)setitimer(ITIMER_REAL, &itimer, NULL);
+				seenalrm = 0;   /* clear flag */
+				continue;
+			}
 			retransmit();
 			seenalrm = 0;
 			continue;
diff --git a/sbin/rcorder/rcorder.8 b/sbin/rcorder/rcorder.8
index b43383a5b6ff..995ef684bb8d 100644
--- a/sbin/rcorder/rcorder.8
+++ b/sbin/rcorder/rcorder.8
@@ -165,9 +165,9 @@ utility first appeared in
 .Sh AUTHORS
 .An -nosplit
 Written by
-.An Perry E. Metzger Aq perry@piermont.com
+.An Perry E. Metzger Aq Mt perry@piermont.com
 and
-.An Matthew R. Green Aq mrg@eterna.com.au .
+.An Matthew R. Green Aq Mt mrg@eterna.com.au .
 .Sh BUGS
 The
 .Dq Li REQUIRE
diff --git a/sbin/reboot/nextboot.8 b/sbin/reboot/nextboot.8
index eb383197ae8f..7d4135298ac0 100644
--- a/sbin/reboot/nextboot.8
+++ b/sbin/reboot/nextboot.8
@@ -118,7 +118,7 @@ appeared in
 .Fx 5.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Gordon Tetlow Aq gordon@FreeBSD.org .
+.An Gordon Tetlow Aq Mt gordon@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/sbin/recoverdisk/recoverdisk.1 b/sbin/recoverdisk/recoverdisk.1
index b3924c554714..fd42f65ad5fb 100644
--- a/sbin/recoverdisk/recoverdisk.1
+++ b/sbin/recoverdisk/recoverdisk.1
@@ -137,9 +137,9 @@ utility first appeared in
 .Sh AUTHORS
 .An -nosplit
 The original implementation was done by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
 with minor improvements from
-.An Ulrich Sp\(:orlein Aq uqs@FreeBSD.org .
+.An Ulrich Sp\(:orlein Aq Mt uqs@FreeBSD.org .
 .Pp
 This manual page was written by
 .An Ulrich Sp\(:orlein .
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 4f3454901104..225fe3250bdb 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -260,9 +260,11 @@ setup(void)
 		fssize = TP_BSIZE;
 	if (stbuf.st_blksize >= TP_BSIZE && stbuf.st_blksize <= MAXBSIZE)
 		fssize = stbuf.st_blksize;
-	if (((fssize - 1) & fssize) != 0) {
-		fprintf(stderr, "bad block size %ld\n", fssize);
-		done(1);
+	if (((TP_BSIZE - 1) & stbuf.st_blksize) != 0) {
+		fprintf(stderr, "Warning: filesystem with non-multiple-of-%d "
+		    "blocksize (%d);\n", TP_BSIZE, stbuf.st_blksize);
+		fssize = roundup(fssize, TP_BSIZE);
+		fprintf(stderr, "\twriting using blocksize %ld\n", fssize);
 	}
 	if (spcl.c_volume != 1) {
 		fprintf(stderr, "Tape is not volume 1 of the dump\n");
diff --git a/sbin/sconfig/sconfig.8 b/sbin/sconfig/sconfig.8
index 3fe7abcff686..aa52b646b76e 100644
--- a/sbin/sconfig/sconfig.8
+++ b/sbin/sconfig/sconfig.8
@@ -595,7 +595,7 @@ versions of the
 utility are not fully compatible.
 .\"--------------------------------------------------------------
 .Sh AUTHORS
-.An Cronyx Engineering Aq info@cronyx.ru
+.An Cronyx Engineering Aq Mt info@cronyx.ru
 .Pp
 .Pa http://www.cronyx.ru
 .\"--------------------------------------------------------------
diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8
index 19a916447c36..4306ec22f8b8 100644
--- a/sbin/setkey/setkey.8
+++ b/sbin/setkey/setkey.8
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 13, 2006
+.Dd July 25, 2014
 .Dt SETKEY 8
 .Os
 .\"
@@ -514,7 +514,7 @@ the SA from the key exchange daemon.
 A value of
 .Li default
 tells the kernel to use the system wide default protocol
-e.g.\& the one from the
+e.g.,\& the one from the
 .Li esp_trans_deflev
 sysctl variable, when the kernel processes the packet.
 A value of
@@ -627,7 +627,7 @@ des-deriv	64		ipsec-ciph-des-derived-01
 3des-deriv	192		no document
 rijndael-cbc	128/192/256	rfc3602
 aes-ctr		160/224/288	draft-ietf-ipsec-ciph-aes-ctr-03
-camllia-cbc	128/192/256	rfc4312
+camellia-cbc	128/192/256	rfc4312
 .Ed
 .Pp
 Note that the first 128/192/256 bits of a key for
@@ -656,47 +656,46 @@ des-cbc encryption algorithm.
 .Bd -literal -offset indent
 add 3ffe:501:4819::1 3ffe:501:481d::1 esp 123457
 	-E des-cbc 0x3ffe05014819ffff ;
-
+.Pp
 .Ed
 .\"
 Add an authentication SA between two FQDN specified hosts:
 .Bd -literal -offset indent
 add -6 myhost.example.com yourhost.example.com ah 123456
 	-A hmac-sha1 "AH SA configuration!" ;
-
+.Pp
 .Ed
 Use both ESP and AH between two numerically specified hosts:
 .Bd -literal -offset indent
 add 10.0.11.41 10.0.11.33 esp 0x10001
 	-E des-cbc 0x3ffe05014819ffff
 	-A hmac-md5 "authentication!!" ;
-
+.Pp
 .Ed
 Get the SA information associated with first example above:
 .Bd -literal -offset indent
 get 3ffe:501:4819::1 3ffe:501:481d::1 ah 123456 ;
-
+.Pp
 .Ed
 Flush all entries from the database:
 .Bd -literal -offset indent
 flush ;
-
+.Pp
 .Ed
 Dump the ESP entries from the database:
 .Bd -literal -offset indent
 dump esp ;
-
+.Pp
 .Ed
 Add a security policy between two networks that uses ESP in tunnel mode:
 .Bd -literal -offset indent
 spdadd 10.0.11.41/32[21] 10.0.11.33/32[any] any
 	-P out ipsec esp/tunnel/192.168.0.1-192.168.1.2/require ;
-
+.Pp
 .Ed
 Use TCP MD5 between two numerically specified hosts:
 .Bd -literal -offset indent
 add 10.1.10.34 10.1.10.36 tcp 0x1000 -A tcp-md5 "TCP-MD5 BGP secret" ;
-
 .Ed
 .\"
 .Sh SEE ALSO
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index a86d659cb040..13596450d2e1 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -710,9 +710,10 @@ show_var(int *oid, int nlen)
 		warnx("malloc failed");
 		return (1);
 	}
+	ctltype = (kind & CTLTYPE);
 	len = j;
 	i = sysctl(oid, nlen, val, &len, 0, 0);
-	if (i || !len) {
+	if (i != 0 || (len == 0 && ctltype != CTLTYPE_STRING)) {
 		free(oval);
 		return (1);
 	}
@@ -724,7 +725,6 @@ show_var(int *oid, int nlen)
 	}
 	val[len] = '\0';
 	p = val;
-	ctltype = (kind & CTLTYPE);
 	sign = ctl_sign[ctltype];
 	intlen = ctl_size[ctltype];
 
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index 8fb841b23dd9..6127758f6853 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -3,8 +3,8 @@
 .include <bsd.own.mk>
 
 # OpenSSL version used for manual page generation
-OPENSSL_VER=	1.0.1h
-OPENSSL_DATE=	2014-06-05
+OPENSSL_VER=	1.0.1i
+OPENSSL_DATE=	2014-08-06
 
 LCRYPTO_SRC=	${.CURDIR}/../../../crypto/openssl
 LCRYPTO_DOC=	${.CURDIR}/../../../crypto/openssl/doc
diff --git a/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 b/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
index b9c86e880f7e..12eb24d6786a 100644
--- a/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
+++ b/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ASN1_OBJECT_new 3"
-.TH ASN1_OBJECT_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ASN1_OBJECT_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ASN1_STRING_length.3 b/secure/lib/libcrypto/man/ASN1_STRING_length.3
index 6e0d228c6a45..26b0d8114664 100644
--- a/secure/lib/libcrypto/man/ASN1_STRING_length.3
+++ b/secure/lib/libcrypto/man/ASN1_STRING_length.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ASN1_STRING_length 3"
-.TH ASN1_STRING_length 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ASN1_STRING_length 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ASN1_STRING_new.3 b/secure/lib/libcrypto/man/ASN1_STRING_new.3
index badbba16dc08..74579bdd72cd 100644
--- a/secure/lib/libcrypto/man/ASN1_STRING_new.3
+++ b/secure/lib/libcrypto/man/ASN1_STRING_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ASN1_STRING_new 3"
-.TH ASN1_STRING_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ASN1_STRING_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 b/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
index 1426345e2ff5..85217741891f 100644
--- a/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
+++ b/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ASN1_STRING_print_ex 3"
-.TH ASN1_STRING_print_ex 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ASN1_STRING_print_ex 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ASN1_generate_nconf.3 b/secure/lib/libcrypto/man/ASN1_generate_nconf.3
index 61bb3c049380..7dfb488c3600 100644
--- a/secure/lib/libcrypto/man/ASN1_generate_nconf.3
+++ b/secure/lib/libcrypto/man/ASN1_generate_nconf.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ASN1_generate_nconf 3"
-.TH ASN1_generate_nconf 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ASN1_generate_nconf 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -178,7 +178,7 @@ Encode the \fB\s-1NULL\s0\fR type, the \fBvalue\fR string must not be present.
 .IP "\fB\s-1INTEGER\s0\fR, \fB\s-1INT\s0\fR" 2
 .IX Item "INTEGER, INT"
 Encodes an \s-1ASN1\s0 \fB\s-1INTEGER\s0\fR type. The \fBvalue\fR string represents
-the value of the integer, it can be preceeded by a minus sign and
+the value of the integer, it can be prefaced by a minus sign and
 is normally interpreted as a decimal value unless the prefix \fB0x\fR
 is included.
 .IP "\fB\s-1ENUMERATED\s0\fR, \fB\s-1ENUM\s0\fR" 2
diff --git a/secure/lib/libcrypto/man/BIO_ctrl.3 b/secure/lib/libcrypto/man/BIO_ctrl.3
index 4be51052c002..ad865534421c 100644
--- a/secure/lib/libcrypto/man/BIO_ctrl.3
+++ b/secure/lib/libcrypto/man/BIO_ctrl.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_ctrl 3"
-.TH BIO_ctrl 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_ctrl 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_f_base64.3 b/secure/lib/libcrypto/man/BIO_f_base64.3
index ac14a73ca92e..9ebb393d5c07 100644
--- a/secure/lib/libcrypto/man/BIO_f_base64.3
+++ b/secure/lib/libcrypto/man/BIO_f_base64.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_f_base64 3"
-.TH BIO_f_base64 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_f_base64 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -172,11 +172,11 @@ to standard output:
 \&
 \& b64 = BIO_new(BIO_f_base64());
 \& bio = BIO_new_fp(stdout, BIO_NOCLOSE);
-\& bio = BIO_push(b64, bio);
-\& BIO_write(bio, message, strlen(message));
-\& BIO_flush(bio);
+\& BIO_push(b64, bio);
+\& BIO_write(b64, message, strlen(message));
+\& BIO_flush(b64);
 \&
-\& BIO_free_all(bio);
+\& BIO_free_all(b64);
 .Ve
 .PP
 Read Base64 encoded data from standard input and write the decoded
@@ -190,11 +190,12 @@ data to standard output:
 \& b64 = BIO_new(BIO_f_base64());
 \& bio = BIO_new_fp(stdin, BIO_NOCLOSE);
 \& bio_out = BIO_new_fp(stdout, BIO_NOCLOSE);
-\& bio = BIO_push(b64, bio);
-\& while((inlen = BIO_read(bio, inbuf, 512)) > 0) 
+\& BIO_push(b64, bio);
+\& while((inlen = BIO_read(b64, inbuf, 512)) > 0) 
 \&        BIO_write(bio_out, inbuf, inlen);
 \&
-\& BIO_free_all(bio);
+\& BIO_flush(bio_out);
+\& BIO_free_all(b64);
 .Ve
 .SH "BUGS"
 .IX Header "BUGS"
diff --git a/secure/lib/libcrypto/man/BIO_f_buffer.3 b/secure/lib/libcrypto/man/BIO_f_buffer.3
index 071f33f1db73..7dc4a89bf524 100644
--- a/secure/lib/libcrypto/man/BIO_f_buffer.3
+++ b/secure/lib/libcrypto/man/BIO_f_buffer.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_f_buffer 3"
-.TH BIO_f_buffer 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_f_buffer 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_f_cipher.3 b/secure/lib/libcrypto/man/BIO_f_cipher.3
index 37d7b93e5d15..cb7094ab33d7 100644
--- a/secure/lib/libcrypto/man/BIO_f_cipher.3
+++ b/secure/lib/libcrypto/man/BIO_f_cipher.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_f_cipher 3"
-.TH BIO_f_cipher 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_f_cipher 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_f_md.3 b/secure/lib/libcrypto/man/BIO_f_md.3
index 20ef45f4bb5e..32e3d9f37dc5 100644
--- a/secure/lib/libcrypto/man/BIO_f_md.3
+++ b/secure/lib/libcrypto/man/BIO_f_md.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_f_md 3"
-.TH BIO_f_md 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_f_md 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_f_null.3 b/secure/lib/libcrypto/man/BIO_f_null.3
index ed6d5f99e6e5..814cc2500de6 100644
--- a/secure/lib/libcrypto/man/BIO_f_null.3
+++ b/secure/lib/libcrypto/man/BIO_f_null.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_f_null 3"
-.TH BIO_f_null 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_f_null 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_f_ssl.3 b/secure/lib/libcrypto/man/BIO_f_ssl.3
index 0bd6b148fe6d..79f656e96c20 100644
--- a/secure/lib/libcrypto/man/BIO_f_ssl.3
+++ b/secure/lib/libcrypto/man/BIO_f_ssl.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_f_ssl 3"
-.TH BIO_f_ssl 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_f_ssl 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_find_type.3 b/secure/lib/libcrypto/man/BIO_find_type.3
index 573498ab1286..9589d69d1c97 100644
--- a/secure/lib/libcrypto/man/BIO_find_type.3
+++ b/secure/lib/libcrypto/man/BIO_find_type.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_find_type 3"
-.TH BIO_find_type 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_find_type 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_new.3 b/secure/lib/libcrypto/man/BIO_new.3
index 0b69ef468644..dcbeccf325b4 100644
--- a/secure/lib/libcrypto/man/BIO_new.3
+++ b/secure/lib/libcrypto/man/BIO_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_new 3"
-.TH BIO_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_new_CMS.3 b/secure/lib/libcrypto/man/BIO_new_CMS.3
index 04f95ba509d1..71e78f378cfc 100644
--- a/secure/lib/libcrypto/man/BIO_new_CMS.3
+++ b/secure/lib/libcrypto/man/BIO_new_CMS.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_new_CMS 3"
-.TH BIO_new_CMS 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_new_CMS 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_push.3 b/secure/lib/libcrypto/man/BIO_push.3
index 07542feab23d..40eb99632425 100644
--- a/secure/lib/libcrypto/man/BIO_push.3
+++ b/secure/lib/libcrypto/man/BIO_push.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_push 3"
-.TH BIO_push 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_push 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -168,7 +168,7 @@ If the call:
 \& BIO_push(b64, f);
 .Ve
 .PP
-is made then the new chain will be \fBb64\-chain\fR. After making the calls
+is made then the new chain will be \fBb64\-f\fR. After making the calls
 .PP
 .Vb 2
 \& BIO_push(md2, b64);
diff --git a/secure/lib/libcrypto/man/BIO_read.3 b/secure/lib/libcrypto/man/BIO_read.3
index fa1051469720..42a35601e2e5 100644
--- a/secure/lib/libcrypto/man/BIO_read.3
+++ b/secure/lib/libcrypto/man/BIO_read.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_read 3"
-.TH BIO_read 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_read 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_s_accept.3 b/secure/lib/libcrypto/man/BIO_s_accept.3
index c60982b58e90..13d1277cf87a 100644
--- a/secure/lib/libcrypto/man/BIO_s_accept.3
+++ b/secure/lib/libcrypto/man/BIO_s_accept.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_s_accept 3"
-.TH BIO_s_accept 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_s_accept 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_s_bio.3 b/secure/lib/libcrypto/man/BIO_s_bio.3
index 4891302e741f..f28110bec292 100644
--- a/secure/lib/libcrypto/man/BIO_s_bio.3
+++ b/secure/lib/libcrypto/man/BIO_s_bio.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_s_bio 3"
-.TH BIO_s_bio 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_s_bio 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_s_connect.3 b/secure/lib/libcrypto/man/BIO_s_connect.3
index 74b6d2d4d6e6..5f24efac8cef 100644
--- a/secure/lib/libcrypto/man/BIO_s_connect.3
+++ b/secure/lib/libcrypto/man/BIO_s_connect.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_s_connect 3"
-.TH BIO_s_connect 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_s_connect 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_s_fd.3 b/secure/lib/libcrypto/man/BIO_s_fd.3
index 16b20e0a52ed..d7acd5a5d5c8 100644
--- a/secure/lib/libcrypto/man/BIO_s_fd.3
+++ b/secure/lib/libcrypto/man/BIO_s_fd.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_s_fd 3"
-.TH BIO_s_fd 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_s_fd 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_s_file.3 b/secure/lib/libcrypto/man/BIO_s_file.3
index 337f2b2f5aa3..fc08e32fcfe5 100644
--- a/secure/lib/libcrypto/man/BIO_s_file.3
+++ b/secure/lib/libcrypto/man/BIO_s_file.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_s_file 3"
-.TH BIO_s_file 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_s_file 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_s_mem.3 b/secure/lib/libcrypto/man/BIO_s_mem.3
index b91155103ff3..d04a366c6c34 100644
--- a/secure/lib/libcrypto/man/BIO_s_mem.3
+++ b/secure/lib/libcrypto/man/BIO_s_mem.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_s_mem 3"
-.TH BIO_s_mem 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_s_mem 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_s_null.3 b/secure/lib/libcrypto/man/BIO_s_null.3
index 9b89c30fc15f..42f253416416 100644
--- a/secure/lib/libcrypto/man/BIO_s_null.3
+++ b/secure/lib/libcrypto/man/BIO_s_null.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_s_null 3"
-.TH BIO_s_null 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_s_null 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_s_socket.3 b/secure/lib/libcrypto/man/BIO_s_socket.3
index 7a197b6d9503..3b2347124694 100644
--- a/secure/lib/libcrypto/man/BIO_s_socket.3
+++ b/secure/lib/libcrypto/man/BIO_s_socket.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_s_socket 3"
-.TH BIO_s_socket 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_s_socket 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_set_callback.3 b/secure/lib/libcrypto/man/BIO_set_callback.3
index 398e64bc3fb2..0a3632d5a0e0 100644
--- a/secure/lib/libcrypto/man/BIO_set_callback.3
+++ b/secure/lib/libcrypto/man/BIO_set_callback.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_set_callback 3"
-.TH BIO_set_callback 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_set_callback 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BIO_should_retry.3 b/secure/lib/libcrypto/man/BIO_should_retry.3
index 9da1ab94b0a9..c04c1fde9a6b 100644
--- a/secure/lib/libcrypto/man/BIO_should_retry.3
+++ b/secure/lib/libcrypto/man/BIO_should_retry.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BIO_should_retry 3"
-.TH BIO_should_retry 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BIO_should_retry 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_BLINDING_new.3 b/secure/lib/libcrypto/man/BN_BLINDING_new.3
index a65ab189fde6..d62868496234 100644
--- a/secure/lib/libcrypto/man/BN_BLINDING_new.3
+++ b/secure/lib/libcrypto/man/BN_BLINDING_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_BLINDING_new 3"
-.TH BN_BLINDING_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_BLINDING_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_CTX_new.3 b/secure/lib/libcrypto/man/BN_CTX_new.3
index f878dd233b6b..095a9b7bec13 100644
--- a/secure/lib/libcrypto/man/BN_CTX_new.3
+++ b/secure/lib/libcrypto/man/BN_CTX_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_CTX_new 3"
-.TH BN_CTX_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_CTX_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_CTX_start.3 b/secure/lib/libcrypto/man/BN_CTX_start.3
index 658d761e376f..dc8055596ef3 100644
--- a/secure/lib/libcrypto/man/BN_CTX_start.3
+++ b/secure/lib/libcrypto/man/BN_CTX_start.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_CTX_start 3"
-.TH BN_CTX_start 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_CTX_start 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_add.3 b/secure/lib/libcrypto/man/BN_add.3
index ac4a815cbc90..58b02fe2bb55 100644
--- a/secure/lib/libcrypto/man/BN_add.3
+++ b/secure/lib/libcrypto/man/BN_add.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_add 3"
-.TH BN_add 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_add 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_add_word.3 b/secure/lib/libcrypto/man/BN_add_word.3
index 7cf46cf16233..e65b3fe31e2b 100644
--- a/secure/lib/libcrypto/man/BN_add_word.3
+++ b/secure/lib/libcrypto/man/BN_add_word.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_add_word 3"
-.TH BN_add_word 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_add_word 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_bn2bin.3 b/secure/lib/libcrypto/man/BN_bn2bin.3
index 2e378aa83370..4094b6ee2656 100644
--- a/secure/lib/libcrypto/man/BN_bn2bin.3
+++ b/secure/lib/libcrypto/man/BN_bn2bin.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_bn2bin 3"
-.TH BN_bn2bin 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_bn2bin 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_cmp.3 b/secure/lib/libcrypto/man/BN_cmp.3
index 7a1b11ff06b3..c1f8fa85908c 100644
--- a/secure/lib/libcrypto/man/BN_cmp.3
+++ b/secure/lib/libcrypto/man/BN_cmp.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_cmp 3"
-.TH BN_cmp 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_cmp 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_copy.3 b/secure/lib/libcrypto/man/BN_copy.3
index 78a053a024c4..37133ac459ec 100644
--- a/secure/lib/libcrypto/man/BN_copy.3
+++ b/secure/lib/libcrypto/man/BN_copy.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_copy 3"
-.TH BN_copy 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_copy 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_generate_prime.3 b/secure/lib/libcrypto/man/BN_generate_prime.3
index 88e6573e6a34..19d4df95d2c9 100644
--- a/secure/lib/libcrypto/man/BN_generate_prime.3
+++ b/secure/lib/libcrypto/man/BN_generate_prime.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_generate_prime 3"
-.TH BN_generate_prime 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_generate_prime 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_mod_inverse.3 b/secure/lib/libcrypto/man/BN_mod_inverse.3
index 3ca39e3c600c..2d85768d5f2f 100644
--- a/secure/lib/libcrypto/man/BN_mod_inverse.3
+++ b/secure/lib/libcrypto/man/BN_mod_inverse.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_mod_inverse 3"
-.TH BN_mod_inverse 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_mod_inverse 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 b/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
index 65f3750cc185..de0b96d2069c 100644
--- a/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
+++ b/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_mod_mul_montgomery 3"
-.TH BN_mod_mul_montgomery 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_mod_mul_montgomery 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 b/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
index 5a0b52df934b..26f6486e7f76 100644
--- a/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
+++ b/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_mod_mul_reciprocal 3"
-.TH BN_mod_mul_reciprocal 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_mod_mul_reciprocal 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_new.3 b/secure/lib/libcrypto/man/BN_new.3
index 1f10a0b3a162..547f0cc4b4ff 100644
--- a/secure/lib/libcrypto/man/BN_new.3
+++ b/secure/lib/libcrypto/man/BN_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_new 3"
-.TH BN_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_num_bytes.3 b/secure/lib/libcrypto/man/BN_num_bytes.3
index 0daa1dbe7172..a7cd68474d2c 100644
--- a/secure/lib/libcrypto/man/BN_num_bytes.3
+++ b/secure/lib/libcrypto/man/BN_num_bytes.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_num_bytes 3"
-.TH BN_num_bytes 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_num_bytes 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_rand.3 b/secure/lib/libcrypto/man/BN_rand.3
index 936c48f4c433..004a66bc646b 100644
--- a/secure/lib/libcrypto/man/BN_rand.3
+++ b/secure/lib/libcrypto/man/BN_rand.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_rand 3"
-.TH BN_rand 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_rand 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_set_bit.3 b/secure/lib/libcrypto/man/BN_set_bit.3
index b3001ce4c11b..6bebfc244e6f 100644
--- a/secure/lib/libcrypto/man/BN_set_bit.3
+++ b/secure/lib/libcrypto/man/BN_set_bit.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_set_bit 3"
-.TH BN_set_bit 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_set_bit 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_swap.3 b/secure/lib/libcrypto/man/BN_swap.3
index 201c9d8c42b0..ff6d38aa0d23 100644
--- a/secure/lib/libcrypto/man/BN_swap.3
+++ b/secure/lib/libcrypto/man/BN_swap.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_swap 3"
-.TH BN_swap 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_swap 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/BN_zero.3 b/secure/lib/libcrypto/man/BN_zero.3
index 9cd0d6c19fdf..41efb6cb6e9e 100644
--- a/secure/lib/libcrypto/man/BN_zero.3
+++ b/secure/lib/libcrypto/man/BN_zero.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "BN_zero 3"
-.TH BN_zero 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH BN_zero 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_add0_cert.3 b/secure/lib/libcrypto/man/CMS_add0_cert.3
index 4903530f8222..51e6c0cf5bc1 100644
--- a/secure/lib/libcrypto/man/CMS_add0_cert.3
+++ b/secure/lib/libcrypto/man/CMS_add0_cert.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_add0_cert 3"
-.TH CMS_add0_cert 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_add0_cert 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3 b/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3
index da6657ec20c8..23861a51b072 100644
--- a/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3
+++ b/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_add1_recipient_cert 3"
-.TH CMS_add1_recipient_cert 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_add1_recipient_cert 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_compress.3 b/secure/lib/libcrypto/man/CMS_compress.3
index 57756153e5e0..886cb40a03ed 100644
--- a/secure/lib/libcrypto/man/CMS_compress.3
+++ b/secure/lib/libcrypto/man/CMS_compress.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_compress 3"
-.TH CMS_compress 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_compress 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_decrypt.3 b/secure/lib/libcrypto/man/CMS_decrypt.3
index c3bb343c4f18..9df040b0161b 100644
--- a/secure/lib/libcrypto/man/CMS_decrypt.3
+++ b/secure/lib/libcrypto/man/CMS_decrypt.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_decrypt 3"
-.TH CMS_decrypt 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_decrypt 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_encrypt.3 b/secure/lib/libcrypto/man/CMS_encrypt.3
index fb76dcce07f0..fc531de43469 100644
--- a/secure/lib/libcrypto/man/CMS_encrypt.3
+++ b/secure/lib/libcrypto/man/CMS_encrypt.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_encrypt 3"
-.TH CMS_encrypt 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_encrypt 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_final.3 b/secure/lib/libcrypto/man/CMS_final.3
index 8900389a0ed9..46866359792c 100644
--- a/secure/lib/libcrypto/man/CMS_final.3
+++ b/secure/lib/libcrypto/man/CMS_final.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_final 3"
-.TH CMS_final 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_final 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3 b/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3
index dd8266b711d1..56efddaae335 100644
--- a/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3
+++ b/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_get0_RecipientInfos 3"
-.TH CMS_get0_RecipientInfos 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_get0_RecipientInfos 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3 b/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3
index 016f1842fc0b..2ec7e43f5934 100644
--- a/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3
+++ b/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_get0_SignerInfos 3"
-.TH CMS_get0_SignerInfos 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_get0_SignerInfos 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_get0_type.3 b/secure/lib/libcrypto/man/CMS_get0_type.3
index 3fa2bdbe5225..7a95909be10f 100644
--- a/secure/lib/libcrypto/man/CMS_get0_type.3
+++ b/secure/lib/libcrypto/man/CMS_get0_type.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_get0_type 3"
-.TH CMS_get0_type 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_get0_type 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3 b/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
index 3a746142e222..29a7ae834dba 100644
--- a/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
+++ b/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_get1_ReceiptRequest 3"
-.TH CMS_get1_ReceiptRequest 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_get1_ReceiptRequest 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_sign.3 b/secure/lib/libcrypto/man/CMS_sign.3
index 5936b2913b4a..5fd7f4bad2e3 100644
--- a/secure/lib/libcrypto/man/CMS_sign.3
+++ b/secure/lib/libcrypto/man/CMS_sign.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_sign 3"
-.TH CMS_sign 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_sign 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_sign_add1_signer.3 b/secure/lib/libcrypto/man/CMS_sign_add1_signer.3
index cd42f73d754d..72d4fcbf60db 100644
--- a/secure/lib/libcrypto/man/CMS_sign_add1_signer.3
+++ b/secure/lib/libcrypto/man/CMS_sign_add1_signer.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_sign_add1_signer 3"
-.TH CMS_sign_add1_signer 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_sign_add1_signer 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_sign_receipt.3 b/secure/lib/libcrypto/man/CMS_sign_receipt.3
index 4c73d60e59ec..104260a3968b 100644
--- a/secure/lib/libcrypto/man/CMS_sign_receipt.3
+++ b/secure/lib/libcrypto/man/CMS_sign_receipt.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_sign_receipt 3"
-.TH CMS_sign_receipt 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_sign_receipt 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_uncompress.3 b/secure/lib/libcrypto/man/CMS_uncompress.3
index 7691da8bff15..0fc03b34f9b5 100644
--- a/secure/lib/libcrypto/man/CMS_uncompress.3
+++ b/secure/lib/libcrypto/man/CMS_uncompress.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_uncompress 3"
-.TH CMS_uncompress 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_uncompress 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_verify.3 b/secure/lib/libcrypto/man/CMS_verify.3
index 4205f977cf87..79520f34a1fc 100644
--- a/secure/lib/libcrypto/man/CMS_verify.3
+++ b/secure/lib/libcrypto/man/CMS_verify.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_verify 3"
-.TH CMS_verify 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_verify 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CMS_verify_receipt.3 b/secure/lib/libcrypto/man/CMS_verify_receipt.3
index 7d2a2be18b62..02e3df456e64 100644
--- a/secure/lib/libcrypto/man/CMS_verify_receipt.3
+++ b/secure/lib/libcrypto/man/CMS_verify_receipt.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS_verify_receipt 3"
-.TH CMS_verify_receipt 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS_verify_receipt 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CONF_modules_free.3 b/secure/lib/libcrypto/man/CONF_modules_free.3
index 50584922d57c..b7573c73434a 100644
--- a/secure/lib/libcrypto/man/CONF_modules_free.3
+++ b/secure/lib/libcrypto/man/CONF_modules_free.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CONF_modules_free 3"
-.TH CONF_modules_free 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CONF_modules_free 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CONF_modules_load_file.3 b/secure/lib/libcrypto/man/CONF_modules_load_file.3
index 141108981802..20569a259ffd 100644
--- a/secure/lib/libcrypto/man/CONF_modules_load_file.3
+++ b/secure/lib/libcrypto/man/CONF_modules_load_file.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CONF_modules_load_file 3"
-.TH CONF_modules_load_file 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CONF_modules_load_file 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 b/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
index 0caf575254ae..a3738eddaddc 100644
--- a/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
+++ b/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CRYPTO_set_ex_data 3"
-.TH CRYPTO_set_ex_data 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CRYPTO_set_ex_data 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DH_generate_key.3 b/secure/lib/libcrypto/man/DH_generate_key.3
index 076185c57e3e..876458b0bb8e 100644
--- a/secure/lib/libcrypto/man/DH_generate_key.3
+++ b/secure/lib/libcrypto/man/DH_generate_key.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DH_generate_key 3"
-.TH DH_generate_key 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DH_generate_key 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DH_generate_parameters.3 b/secure/lib/libcrypto/man/DH_generate_parameters.3
index 9b257c1bd40a..aadfea9c072d 100644
--- a/secure/lib/libcrypto/man/DH_generate_parameters.3
+++ b/secure/lib/libcrypto/man/DH_generate_parameters.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DH_generate_parameters 3"
-.TH DH_generate_parameters 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DH_generate_parameters 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DH_get_ex_new_index.3 b/secure/lib/libcrypto/man/DH_get_ex_new_index.3
index 0a3f49be92dd..1f4a8ef4f1e9 100644
--- a/secure/lib/libcrypto/man/DH_get_ex_new_index.3
+++ b/secure/lib/libcrypto/man/DH_get_ex_new_index.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DH_get_ex_new_index 3"
-.TH DH_get_ex_new_index 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DH_get_ex_new_index 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DH_new.3 b/secure/lib/libcrypto/man/DH_new.3
index 2b6e703c9dda..635f1cb66966 100644
--- a/secure/lib/libcrypto/man/DH_new.3
+++ b/secure/lib/libcrypto/man/DH_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DH_new 3"
-.TH DH_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DH_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DH_set_method.3 b/secure/lib/libcrypto/man/DH_set_method.3
index 98d0a8b7071f..067e9bf541b7 100644
--- a/secure/lib/libcrypto/man/DH_set_method.3
+++ b/secure/lib/libcrypto/man/DH_set_method.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DH_set_method 3"
-.TH DH_set_method 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DH_set_method 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DH_size.3 b/secure/lib/libcrypto/man/DH_size.3
index fe8b762724d0..da903823e1bc 100644
--- a/secure/lib/libcrypto/man/DH_size.3
+++ b/secure/lib/libcrypto/man/DH_size.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DH_size 3"
-.TH DH_size 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DH_size 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DSA_SIG_new.3 b/secure/lib/libcrypto/man/DSA_SIG_new.3
index bf44edbf5809..bb0bcf0dbbb1 100644
--- a/secure/lib/libcrypto/man/DSA_SIG_new.3
+++ b/secure/lib/libcrypto/man/DSA_SIG_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSA_SIG_new 3"
-.TH DSA_SIG_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DSA_SIG_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DSA_do_sign.3 b/secure/lib/libcrypto/man/DSA_do_sign.3
index 05ed9bb38d49..2f3f5c3b07ad 100644
--- a/secure/lib/libcrypto/man/DSA_do_sign.3
+++ b/secure/lib/libcrypto/man/DSA_do_sign.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSA_do_sign 3"
-.TH DSA_do_sign 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DSA_do_sign 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DSA_dup_DH.3 b/secure/lib/libcrypto/man/DSA_dup_DH.3
index 6e3bdb5b1a04..4285dcacb2d8 100644
--- a/secure/lib/libcrypto/man/DSA_dup_DH.3
+++ b/secure/lib/libcrypto/man/DSA_dup_DH.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSA_dup_DH 3"
-.TH DSA_dup_DH 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DSA_dup_DH 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DSA_generate_key.3 b/secure/lib/libcrypto/man/DSA_generate_key.3
index e26bce14f3cf..5bd84b8e7d44 100644
--- a/secure/lib/libcrypto/man/DSA_generate_key.3
+++ b/secure/lib/libcrypto/man/DSA_generate_key.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSA_generate_key 3"
-.TH DSA_generate_key 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DSA_generate_key 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DSA_generate_parameters.3 b/secure/lib/libcrypto/man/DSA_generate_parameters.3
index 91088490db43..e857072ea70c 100644
--- a/secure/lib/libcrypto/man/DSA_generate_parameters.3
+++ b/secure/lib/libcrypto/man/DSA_generate_parameters.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSA_generate_parameters 3"
-.TH DSA_generate_parameters 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DSA_generate_parameters 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 b/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
index 5bf8cb5508db..689651753e41 100644
--- a/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
+++ b/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSA_get_ex_new_index 3"
-.TH DSA_get_ex_new_index 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DSA_get_ex_new_index 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DSA_new.3 b/secure/lib/libcrypto/man/DSA_new.3
index d393c7a305f7..303c38d70bae 100644
--- a/secure/lib/libcrypto/man/DSA_new.3
+++ b/secure/lib/libcrypto/man/DSA_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSA_new 3"
-.TH DSA_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DSA_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DSA_set_method.3 b/secure/lib/libcrypto/man/DSA_set_method.3
index 5c21c97ebe22..53f4ac043816 100644
--- a/secure/lib/libcrypto/man/DSA_set_method.3
+++ b/secure/lib/libcrypto/man/DSA_set_method.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSA_set_method 3"
-.TH DSA_set_method 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DSA_set_method 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DSA_sign.3 b/secure/lib/libcrypto/man/DSA_sign.3
index 4c2b6f0a93c3..0fa050fa466c 100644
--- a/secure/lib/libcrypto/man/DSA_sign.3
+++ b/secure/lib/libcrypto/man/DSA_sign.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSA_sign 3"
-.TH DSA_sign 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DSA_sign 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/DSA_size.3 b/secure/lib/libcrypto/man/DSA_size.3
index 60f85281f3f9..e783b4a0365d 100644
--- a/secure/lib/libcrypto/man/DSA_size.3
+++ b/secure/lib/libcrypto/man/DSA_size.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSA_size 3"
-.TH DSA_size 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DSA_size 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ERR_GET_LIB.3 b/secure/lib/libcrypto/man/ERR_GET_LIB.3
index 27b7202de23a..a49d787eeaa0 100644
--- a/secure/lib/libcrypto/man/ERR_GET_LIB.3
+++ b/secure/lib/libcrypto/man/ERR_GET_LIB.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ERR_GET_LIB 3"
-.TH ERR_GET_LIB 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ERR_GET_LIB 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ERR_clear_error.3 b/secure/lib/libcrypto/man/ERR_clear_error.3
index 9b0c35b5f9ba..5256ca1d8cfa 100644
--- a/secure/lib/libcrypto/man/ERR_clear_error.3
+++ b/secure/lib/libcrypto/man/ERR_clear_error.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ERR_clear_error 3"
-.TH ERR_clear_error 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ERR_clear_error 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ERR_error_string.3 b/secure/lib/libcrypto/man/ERR_error_string.3
index 670034f1169e..4bffebfbd01a 100644
--- a/secure/lib/libcrypto/man/ERR_error_string.3
+++ b/secure/lib/libcrypto/man/ERR_error_string.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ERR_error_string 3"
-.TH ERR_error_string 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ERR_error_string 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ERR_get_error.3 b/secure/lib/libcrypto/man/ERR_get_error.3
index 21559a079e11..68e5bebb1b43 100644
--- a/secure/lib/libcrypto/man/ERR_get_error.3
+++ b/secure/lib/libcrypto/man/ERR_get_error.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ERR_get_error 3"
-.TH ERR_get_error 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ERR_get_error 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -177,7 +177,7 @@ additionally store the file name and line number where
 the error occurred in *\fBfile\fR and *\fBline\fR, unless these are \fB\s-1NULL\s0\fR.
 .PP
 \&\fIERR_get_error_line_data()\fR, \fIERR_peek_error_line_data()\fR and
-\&\fIERR_get_last_error_line_data()\fR store additional data and flags
+\&\fIERR_peek_last_error_line_data()\fR store additional data and flags
 associated with the error code in *\fBdata\fR
 and *\fBflags\fR, unless these are \fB\s-1NULL\s0\fR. *\fBdata\fR contains a string
 if *\fBflags\fR&\fB\s-1ERR_TXT_STRING\s0\fR is true.
diff --git a/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 b/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
index f98a8f681d66..16a894d6d49b 100644
--- a/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
+++ b/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ERR_load_crypto_strings 3"
-.TH ERR_load_crypto_strings 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ERR_load_crypto_strings 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ERR_load_strings.3 b/secure/lib/libcrypto/man/ERR_load_strings.3
index a545361f66ec..a4a316350e11 100644
--- a/secure/lib/libcrypto/man/ERR_load_strings.3
+++ b/secure/lib/libcrypto/man/ERR_load_strings.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ERR_load_strings 3"
-.TH ERR_load_strings 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ERR_load_strings 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ERR_print_errors.3 b/secure/lib/libcrypto/man/ERR_print_errors.3
index 00f657516952..b1e617449def 100644
--- a/secure/lib/libcrypto/man/ERR_print_errors.3
+++ b/secure/lib/libcrypto/man/ERR_print_errors.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ERR_print_errors 3"
-.TH ERR_print_errors 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ERR_print_errors 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ERR_put_error.3 b/secure/lib/libcrypto/man/ERR_put_error.3
index 2d73735ab7fb..82fecce20a87 100644
--- a/secure/lib/libcrypto/man/ERR_put_error.3
+++ b/secure/lib/libcrypto/man/ERR_put_error.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ERR_put_error 3"
-.TH ERR_put_error 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ERR_put_error 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ERR_remove_state.3 b/secure/lib/libcrypto/man/ERR_remove_state.3
index 602179f7e851..9f17ba9c92a9 100644
--- a/secure/lib/libcrypto/man/ERR_remove_state.3
+++ b/secure/lib/libcrypto/man/ERR_remove_state.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ERR_remove_state 3"
-.TH ERR_remove_state 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ERR_remove_state 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ERR_set_mark.3 b/secure/lib/libcrypto/man/ERR_set_mark.3
index 9aa4ea58e1c5..8bee880091da 100644
--- a/secure/lib/libcrypto/man/ERR_set_mark.3
+++ b/secure/lib/libcrypto/man/ERR_set_mark.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ERR_set_mark 3"
-.TH ERR_set_mark 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ERR_set_mark 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_BytesToKey.3 b/secure/lib/libcrypto/man/EVP_BytesToKey.3
index 0890ae160412..2e2835f19963 100644
--- a/secure/lib/libcrypto/man/EVP_BytesToKey.3
+++ b/secure/lib/libcrypto/man/EVP_BytesToKey.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_BytesToKey 3"
-.TH EVP_BytesToKey 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_BytesToKey 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_DigestInit.3 b/secure/lib/libcrypto/man/EVP_DigestInit.3
index b1b51d00ca0f..248aebb65967 100644
--- a/secure/lib/libcrypto/man/EVP_DigestInit.3
+++ b/secure/lib/libcrypto/man/EVP_DigestInit.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_DigestInit 3"
-.TH EVP_DigestInit 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_DigestInit 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -288,9 +288,8 @@ success and 0 for failure.
 \&\fIEVP_MD_type()\fR, \fIEVP_MD_pkey_type()\fR and \fIEVP_MD_type()\fR return the \s-1NID\s0 of the
 corresponding \s-1OBJECT\s0 \s-1IDENTIFIER\s0 or NID_undef if none exists.
 .PP
-\&\fIEVP_MD_size()\fR, \fIEVP_MD_block_size()\fR, EVP_MD_CTX_size(e), \fIEVP_MD_size()\fR,
-\&\fIEVP_MD_CTX_block_size()\fR	and \fIEVP_MD_block_size()\fR return the digest or block
-size in bytes.
+\&\fIEVP_MD_size()\fR, \fIEVP_MD_block_size()\fR, \fIEVP_MD_CTX_size()\fR and
+\&\fIEVP_MD_CTX_block_size()\fR return the digest or block size in bytes.
 .PP
 \&\fIEVP_md_null()\fR, \fIEVP_md2()\fR, \fIEVP_md5()\fR, \fIEVP_sha()\fR, \fIEVP_sha1()\fR, \fIEVP_dss()\fR,
 \&\fIEVP_dss1()\fR, \fIEVP_mdc2()\fR and \fIEVP_ripemd160()\fR return pointers to the
diff --git a/secure/lib/libcrypto/man/EVP_DigestSignInit.3 b/secure/lib/libcrypto/man/EVP_DigestSignInit.3
index 3e0a3bf89aa0..d07624721c0b 100644
--- a/secure/lib/libcrypto/man/EVP_DigestSignInit.3
+++ b/secure/lib/libcrypto/man/EVP_DigestSignInit.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_DigestSignInit 3"
-.TH EVP_DigestSignInit 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_DigestSignInit 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3 b/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3
index d2822b3a6d29..d6c4aeff0415 100644
--- a/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3
+++ b/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_DigestVerifyInit 3"
-.TH EVP_DigestVerifyInit 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_DigestVerifyInit 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_EncryptInit.3 b/secure/lib/libcrypto/man/EVP_EncryptInit.3
index 3ea9ab24348e..8707153ccad0 100644
--- a/secure/lib/libcrypto/man/EVP_EncryptInit.3
+++ b/secure/lib/libcrypto/man/EVP_EncryptInit.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_EncryptInit 3"
-.TH EVP_EncryptInit 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_EncryptInit 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -452,7 +452,10 @@ bits and 12 rounds.
 .IX Header "NOTES"
 Where possible the \fB\s-1EVP\s0\fR interface to symmetric ciphers should be used in
 preference to the low level interfaces. This is because the code then becomes
-transparent to the cipher used and much more flexible.
+transparent to the cipher used and much more flexible. Additionally, the
+\&\fB\s-1EVP\s0\fR interface will ensure the use of platform specific cryptographic
+acceleration such as AES-NI (the low level interfaces do not provide the
+guarantee).
 .PP
 \&\s-1PKCS\s0 padding works by adding \fBn\fR padding bytes of value \fBn\fR to make the total 
 length of the encrypted data a multiple of the block size. Padding is always
diff --git a/secure/lib/libcrypto/man/EVP_OpenInit.3 b/secure/lib/libcrypto/man/EVP_OpenInit.3
index ca2cc2b8ccd1..2679872c20a1 100644
--- a/secure/lib/libcrypto/man/EVP_OpenInit.3
+++ b/secure/lib/libcrypto/man/EVP_OpenInit.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_OpenInit 3"
-.TH EVP_OpenInit 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_OpenInit 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3 b/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
index edfa80f6f9c7..ca9e443902f4 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_CTX_ctrl 3"
-.TH EVP_PKEY_CTX_ctrl 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_CTX_ctrl 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3 b/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3
index 8a75d8eb4367..b825c0915fa0 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_CTX_new 3"
-.TH EVP_PKEY_CTX_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_CTX_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_cmp.3 b/secure/lib/libcrypto/man/EVP_PKEY_cmp.3
index dde77313bbc9..a252663938f5 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_cmp.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_cmp.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_cmp 3"
-.TH EVP_PKEY_cmp 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_cmp 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3 b/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3
index 79237356f13b..bb9a9fda9952 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_decrypt 3"
-.TH EVP_PKEY_decrypt 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_decrypt 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_derive.3 b/secure/lib/libcrypto/man/EVP_PKEY_derive.3
index 43b23433eb20..69e1b302bf3a 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_derive.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_derive.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_derive 3"
-.TH EVP_PKEY_derive 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_derive 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3 b/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3
index 832c817b303a..9753df8e1347 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_encrypt 3"
-.TH EVP_PKEY_encrypt 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_encrypt 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3 b/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
index 4ab5d924583a..9a4a9640dd91 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_get_default_digest 3"
-.TH EVP_PKEY_get_default_digest 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_get_default_digest 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_keygen.3 b/secure/lib/libcrypto/man/EVP_PKEY_keygen.3
index 6c2a9792cdf7..ba589f210aa5 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_keygen.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_keygen.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_keygen 3"
-.TH EVP_PKEY_keygen 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_keygen 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_new.3 b/secure/lib/libcrypto/man/EVP_PKEY_new.3
index 66902d7461c8..9e60871a4859 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_new.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_new 3"
-.TH EVP_PKEY_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_print_private.3 b/secure/lib/libcrypto/man/EVP_PKEY_print_private.3
index dac12c58fa02..c84936d2944d 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_print_private.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_print_private.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_print_private 3"
-.TH EVP_PKEY_print_private 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_print_private 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 b/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
index 0b7d19cc7ad9..c83a7581e122 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_set1_RSA 3"
-.TH EVP_PKEY_set1_RSA 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_set1_RSA 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_sign.3 b/secure/lib/libcrypto/man/EVP_PKEY_sign.3
index b353260c8474..b1ec19d75c08 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_sign.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_sign.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_sign 3"
-.TH EVP_PKEY_sign 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_sign 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_verify.3 b/secure/lib/libcrypto/man/EVP_PKEY_verify.3
index 73099847256d..768071a5baf7 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_verify.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_verify.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_verify 3"
-.TH EVP_PKEY_verify 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_verify 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3 b/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3
index 5469cfde64b8..757ba0d2cc60 100644
--- a/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3
+++ b/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_PKEY_verify_recover 3"
-.TH EVP_PKEY_verify_recover 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_PKEY_verify_recover 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_SealInit.3 b/secure/lib/libcrypto/man/EVP_SealInit.3
index 6c9c8b57419a..a8204bd40829 100644
--- a/secure/lib/libcrypto/man/EVP_SealInit.3
+++ b/secure/lib/libcrypto/man/EVP_SealInit.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_SealInit 3"
-.TH EVP_SealInit 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_SealInit 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/EVP_SignInit.3 b/secure/lib/libcrypto/man/EVP_SignInit.3
index 5a513ddec57f..9a9a7eb26488 100644
--- a/secure/lib/libcrypto/man/EVP_SignInit.3
+++ b/secure/lib/libcrypto/man/EVP_SignInit.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_SignInit 3"
-.TH EVP_SignInit 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_SignInit 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -158,9 +158,11 @@ signature context \fBctx\fR. This function can be called several times on the
 same \fBctx\fR to include additional data.
 .PP
 \&\fIEVP_SignFinal()\fR signs the data in \fBctx\fR using the private key \fBpkey\fR and
-places the signature in \fBsig\fR. The number of bytes of data written (i.e. the
-length of the signature) will be written to the integer at \fBs\fR, at most
-EVP_PKEY_size(pkey) bytes will be written.
+places the signature in \fBsig\fR. \fBsig\fR must be at least EVP_PKEY_size(pkey)
+bytes in size. \fBs\fR is an \s-1OUT\s0 paramter, and not used as an \s-1IN\s0 parameter.
+The number of bytes of data written (i.e. the length of the signature)
+will be written to the integer at \fBs\fR, at most EVP_PKEY_size(pkey) bytes
+will be written.
 .PP
 \&\fIEVP_SignInit()\fR initializes a signing context \fBctx\fR to use the default
 implementation of digest \fBtype\fR.
diff --git a/secure/lib/libcrypto/man/EVP_VerifyInit.3 b/secure/lib/libcrypto/man/EVP_VerifyInit.3
index 776bc587c03c..76468a03d2aa 100644
--- a/secure/lib/libcrypto/man/EVP_VerifyInit.3
+++ b/secure/lib/libcrypto/man/EVP_VerifyInit.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EVP_VerifyInit 3"
-.TH EVP_VerifyInit 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EVP_VerifyInit 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/OBJ_nid2obj.3 b/secure/lib/libcrypto/man/OBJ_nid2obj.3
index a47ffb21f100..27b5f9b5a3ae 100644
--- a/secure/lib/libcrypto/man/OBJ_nid2obj.3
+++ b/secure/lib/libcrypto/man/OBJ_nid2obj.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OBJ_nid2obj 3"
-.TH OBJ_nid2obj 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH OBJ_nid2obj 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/OPENSSL_Applink.3 b/secure/lib/libcrypto/man/OPENSSL_Applink.3
index 1dd5138ec546..5a422bd7b8fe 100644
--- a/secure/lib/libcrypto/man/OPENSSL_Applink.3
+++ b/secure/lib/libcrypto/man/OPENSSL_Applink.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OPENSSL_Applink 3"
-.TH OPENSSL_Applink 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH OPENSSL_Applink 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 b/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
index 02f47a7289ea..114df3c01bd9 100644
--- a/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
+++ b/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OPENSSL_VERSION_NUMBER 3"
-.TH OPENSSL_VERSION_NUMBER 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH OPENSSL_VERSION_NUMBER 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/OPENSSL_config.3 b/secure/lib/libcrypto/man/OPENSSL_config.3
index e4f9e4bbf30b..7658dab3b500 100644
--- a/secure/lib/libcrypto/man/OPENSSL_config.3
+++ b/secure/lib/libcrypto/man/OPENSSL_config.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OPENSSL_config 3"
-.TH OPENSSL_config 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH OPENSSL_config 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 b/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
index 7b94a5975cda..299d3bb99c7c 100644
--- a/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
+++ b/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OPENSSL_ia32cap 3"
-.TH OPENSSL_ia32cap 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH OPENSSL_ia32cap 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 b/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
index 4e1c8a906ea5..f38e4a1ee9f0 100644
--- a/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
+++ b/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OPENSSL_load_builtin_modules 3"
-.TH OPENSSL_load_builtin_modules 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH OPENSSL_load_builtin_modules 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 b/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
index 4f89c70dcf86..5e57a23d90cd 100644
--- a/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
+++ b/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OpenSSL_add_all_algorithms 3"
-.TH OpenSSL_add_all_algorithms 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH OpenSSL_add_all_algorithms 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3 b/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
index cbcbd0d13f73..a586a8f62509 100644
--- a/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
+++ b/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PEM_write_bio_CMS_stream 3"
-.TH PEM_write_bio_CMS_stream 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PEM_write_bio_CMS_stream 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3 b/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
index 2ec83aacd10d..c3dac2abf07e 100644
--- a/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
+++ b/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PEM_write_bio_PKCS7_stream 3"
-.TH PEM_write_bio_PKCS7_stream 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PEM_write_bio_PKCS7_stream 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/PKCS12_create.3 b/secure/lib/libcrypto/man/PKCS12_create.3
index 104d37cd31d3..f4bb075d9c36 100644
--- a/secure/lib/libcrypto/man/PKCS12_create.3
+++ b/secure/lib/libcrypto/man/PKCS12_create.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS12_create 3"
-.TH PKCS12_create 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PKCS12_create 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/PKCS12_parse.3 b/secure/lib/libcrypto/man/PKCS12_parse.3
index d4312f5e56fb..74afcdc48626 100644
--- a/secure/lib/libcrypto/man/PKCS12_parse.3
+++ b/secure/lib/libcrypto/man/PKCS12_parse.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS12_parse 3"
-.TH PKCS12_parse 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PKCS12_parse 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/PKCS7_decrypt.3 b/secure/lib/libcrypto/man/PKCS7_decrypt.3
index 82fa6413fbf2..e3d939e36e43 100644
--- a/secure/lib/libcrypto/man/PKCS7_decrypt.3
+++ b/secure/lib/libcrypto/man/PKCS7_decrypt.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS7_decrypt 3"
-.TH PKCS7_decrypt 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PKCS7_decrypt 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/PKCS7_encrypt.3 b/secure/lib/libcrypto/man/PKCS7_encrypt.3
index 8970a3f15881..27ff30bb1823 100644
--- a/secure/lib/libcrypto/man/PKCS7_encrypt.3
+++ b/secure/lib/libcrypto/man/PKCS7_encrypt.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS7_encrypt 3"
-.TH PKCS7_encrypt 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PKCS7_encrypt 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/PKCS7_sign.3 b/secure/lib/libcrypto/man/PKCS7_sign.3
index 97f78b746820..60473441a135 100644
--- a/secure/lib/libcrypto/man/PKCS7_sign.3
+++ b/secure/lib/libcrypto/man/PKCS7_sign.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS7_sign 3"
-.TH PKCS7_sign 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PKCS7_sign 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3 b/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3
index e58f8dede807..6695b6a072d0 100644
--- a/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3
+++ b/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS7_sign_add_signer 3"
-.TH PKCS7_sign_add_signer 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PKCS7_sign_add_signer 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/PKCS7_verify.3 b/secure/lib/libcrypto/man/PKCS7_verify.3
index 4ecbb0ae1c3d..9a9a6831fdc3 100644
--- a/secure/lib/libcrypto/man/PKCS7_verify.3
+++ b/secure/lib/libcrypto/man/PKCS7_verify.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS7_verify 3"
-.TH PKCS7_verify 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PKCS7_verify 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RAND_add.3 b/secure/lib/libcrypto/man/RAND_add.3
index f0ce8db05c3d..060a0713f3a5 100644
--- a/secure/lib/libcrypto/man/RAND_add.3
+++ b/secure/lib/libcrypto/man/RAND_add.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RAND_add 3"
-.TH RAND_add 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RAND_add 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RAND_bytes.3 b/secure/lib/libcrypto/man/RAND_bytes.3
index a8bccd000970..78fca76a06e6 100644
--- a/secure/lib/libcrypto/man/RAND_bytes.3
+++ b/secure/lib/libcrypto/man/RAND_bytes.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RAND_bytes 3"
-.TH RAND_bytes 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RAND_bytes 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RAND_cleanup.3 b/secure/lib/libcrypto/man/RAND_cleanup.3
index 804f64a23773..b3d1ccaaa435 100644
--- a/secure/lib/libcrypto/man/RAND_cleanup.3
+++ b/secure/lib/libcrypto/man/RAND_cleanup.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RAND_cleanup 3"
-.TH RAND_cleanup 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RAND_cleanup 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RAND_egd.3 b/secure/lib/libcrypto/man/RAND_egd.3
index 75ea9890b235..a6c912aaa3e1 100644
--- a/secure/lib/libcrypto/man/RAND_egd.3
+++ b/secure/lib/libcrypto/man/RAND_egd.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RAND_egd 3"
-.TH RAND_egd 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RAND_egd 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RAND_load_file.3 b/secure/lib/libcrypto/man/RAND_load_file.3
index 78ba3ffb046f..5d9c7419891f 100644
--- a/secure/lib/libcrypto/man/RAND_load_file.3
+++ b/secure/lib/libcrypto/man/RAND_load_file.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RAND_load_file 3"
-.TH RAND_load_file 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RAND_load_file 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RAND_set_rand_method.3 b/secure/lib/libcrypto/man/RAND_set_rand_method.3
index 3a21c3263945..316853c134aa 100644
--- a/secure/lib/libcrypto/man/RAND_set_rand_method.3
+++ b/secure/lib/libcrypto/man/RAND_set_rand_method.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RAND_set_rand_method 3"
-.TH RAND_set_rand_method 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RAND_set_rand_method 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RSA_blinding_on.3 b/secure/lib/libcrypto/man/RSA_blinding_on.3
index eb1ba809c378..45f89aeae1b8 100644
--- a/secure/lib/libcrypto/man/RSA_blinding_on.3
+++ b/secure/lib/libcrypto/man/RSA_blinding_on.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA_blinding_on 3"
-.TH RSA_blinding_on 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA_blinding_on 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RSA_check_key.3 b/secure/lib/libcrypto/man/RSA_check_key.3
index 8484fe53597d..e21179579347 100644
--- a/secure/lib/libcrypto/man/RSA_check_key.3
+++ b/secure/lib/libcrypto/man/RSA_check_key.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA_check_key 3"
-.TH RSA_check_key 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA_check_key 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RSA_generate_key.3 b/secure/lib/libcrypto/man/RSA_generate_key.3
index c42db003ed9d..114e83f1a647 100644
--- a/secure/lib/libcrypto/man/RSA_generate_key.3
+++ b/secure/lib/libcrypto/man/RSA_generate_key.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA_generate_key 3"
-.TH RSA_generate_key 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA_generate_key 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 b/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
index 99544674ac72..b7123a5cba65 100644
--- a/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
+++ b/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA_get_ex_new_index 3"
-.TH RSA_get_ex_new_index 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA_get_ex_new_index 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RSA_new.3 b/secure/lib/libcrypto/man/RSA_new.3
index 29a8b5010ea5..fa371c9e1b40 100644
--- a/secure/lib/libcrypto/man/RSA_new.3
+++ b/secure/lib/libcrypto/man/RSA_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA_new 3"
-.TH RSA_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 b/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
index 13776cf6d8cf..66e819543785 100644
--- a/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
+++ b/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA_padding_add_PKCS1_type_1 3"
-.TH RSA_padding_add_PKCS1_type_1 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA_padding_add_PKCS1_type_1 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RSA_print.3 b/secure/lib/libcrypto/man/RSA_print.3
index 03fc1b607513..407b2eb58b4e 100644
--- a/secure/lib/libcrypto/man/RSA_print.3
+++ b/secure/lib/libcrypto/man/RSA_print.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA_print 3"
-.TH RSA_print 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA_print 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RSA_private_encrypt.3 b/secure/lib/libcrypto/man/RSA_private_encrypt.3
index fd21c6dba541..c61876bcbd29 100644
--- a/secure/lib/libcrypto/man/RSA_private_encrypt.3
+++ b/secure/lib/libcrypto/man/RSA_private_encrypt.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA_private_encrypt 3"
-.TH RSA_private_encrypt 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA_private_encrypt 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RSA_public_encrypt.3 b/secure/lib/libcrypto/man/RSA_public_encrypt.3
index 32306e2d85bc..3d8840f61610 100644
--- a/secure/lib/libcrypto/man/RSA_public_encrypt.3
+++ b/secure/lib/libcrypto/man/RSA_public_encrypt.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA_public_encrypt 3"
-.TH RSA_public_encrypt 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA_public_encrypt 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RSA_set_method.3 b/secure/lib/libcrypto/man/RSA_set_method.3
index a6f6feab46c0..d2b458ae4221 100644
--- a/secure/lib/libcrypto/man/RSA_set_method.3
+++ b/secure/lib/libcrypto/man/RSA_set_method.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA_set_method 3"
-.TH RSA_set_method 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA_set_method 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -253,14 +253,18 @@ the default method is used.
 \&     /* sign. For backward compatibility, this is used only
 \&      * if (flags & RSA_FLAG_SIGN_VER)
 \&      */
-\&        int (*rsa_sign)(int type, unsigned char *m, unsigned int m_len,
-\&           unsigned char *sigret, unsigned int *siglen, RSA *rsa);
-\&
+\&        int (*rsa_sign)(int type,
+\&                const unsigned char *m, unsigned int m_length,
+\&                unsigned char *sigret, unsigned int *siglen, const RSA *rsa);
 \&     /* verify. For backward compatibility, this is used only
 \&      * if (flags & RSA_FLAG_SIGN_VER)
 \&      */
-\&        int (*rsa_verify)(int type, unsigned char *m, unsigned int m_len,
-\&           unsigned char *sigbuf, unsigned int siglen, RSA *rsa);
+\&        int (*rsa_verify)(int dtype,
+\&                const unsigned char *m, unsigned int m_length,
+\&                const unsigned char *sigbuf, unsigned int siglen,
+\&                                                                const RSA *rsa);
+\&     /* keygen. If NULL builtin RSA key generation will be used */
+\&        int (*rsa_keygen)(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
 \&
 \& } RSA_METHOD;
 .Ve
diff --git a/secure/lib/libcrypto/man/RSA_sign.3 b/secure/lib/libcrypto/man/RSA_sign.3
index cf12aeafb365..83af30cb9077 100644
--- a/secure/lib/libcrypto/man/RSA_sign.3
+++ b/secure/lib/libcrypto/man/RSA_sign.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA_sign 3"
-.TH RSA_sign 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA_sign 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -148,6 +148,10 @@ RSA_sign, RSA_verify \- RSA signatures
 private key \fBrsa\fR as specified in \s-1PKCS\s0 #1 v2.0. It stores the
 signature in \fBsigret\fR and the signature size in \fBsiglen\fR. \fBsigret\fR
 must point to RSA_size(\fBrsa\fR) bytes of memory.
+Note that \s-1PKCS\s0 #1 adds meta-data, placing limits on the size of the
+key that can be used.
+See \fIRSA_private_encrypt\fR\|(3) for lower-level
+operations.
 .PP
 \&\fBtype\fR denotes the message digest algorithm that was used to generate
 \&\fBm\fR. It usually is one of \fBNID_sha1\fR, \fBNID_ripemd160\fR and \fBNID_md5\fR;
diff --git a/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 b/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
index bb55a61fa025..557aff1c8ebe 100644
--- a/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
+++ b/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA_sign_ASN1_OCTET_STRING 3"
-.TH RSA_sign_ASN1_OCTET_STRING 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA_sign_ASN1_OCTET_STRING 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/RSA_size.3 b/secure/lib/libcrypto/man/RSA_size.3
index 2479c3872bf2..98975e9f412c 100644
--- a/secure/lib/libcrypto/man/RSA_size.3
+++ b/secure/lib/libcrypto/man/RSA_size.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA_size 3"
-.TH RSA_size 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA_size 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/SMIME_read_CMS.3 b/secure/lib/libcrypto/man/SMIME_read_CMS.3
index d44893476236..523a65783577 100644
--- a/secure/lib/libcrypto/man/SMIME_read_CMS.3
+++ b/secure/lib/libcrypto/man/SMIME_read_CMS.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SMIME_read_CMS 3"
-.TH SMIME_read_CMS 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SMIME_read_CMS 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 b/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
index be12a0d25278..dc3376a0e0f8 100644
--- a/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
+++ b/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SMIME_read_PKCS7 3"
-.TH SMIME_read_PKCS7 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SMIME_read_PKCS7 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/SMIME_write_CMS.3 b/secure/lib/libcrypto/man/SMIME_write_CMS.3
index b5af40b192f4..57c473cef977 100644
--- a/secure/lib/libcrypto/man/SMIME_write_CMS.3
+++ b/secure/lib/libcrypto/man/SMIME_write_CMS.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SMIME_write_CMS 3"
-.TH SMIME_write_CMS 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SMIME_write_CMS 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 b/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
index 2fde51a7844a..622273fc9e4a 100644
--- a/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
+++ b/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SMIME_write_PKCS7 3"
-.TH SMIME_write_PKCS7 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SMIME_write_PKCS7 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 b/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
index 09aea7eb7a74..0e09a56c1fca 100644
--- a/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
+++ b/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509_NAME_ENTRY_get_object 3"
-.TH X509_NAME_ENTRY_get_object 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509_NAME_ENTRY_get_object 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 b/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
index 00084a17e13c..7b27eee35b6f 100644
--- a/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
+++ b/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509_NAME_add_entry_by_txt 3"
-.TH X509_NAME_add_entry_by_txt 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509_NAME_add_entry_by_txt 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 b/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
index f4070a97dee4..5f42eb1be87f 100644
--- a/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
+++ b/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509_NAME_get_index_by_NID 3"
-.TH X509_NAME_get_index_by_NID 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509_NAME_get_index_by_NID 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/X509_NAME_print_ex.3 b/secure/lib/libcrypto/man/X509_NAME_print_ex.3
index 2dd5b49cd092..bf7e2254b2fc 100644
--- a/secure/lib/libcrypto/man/X509_NAME_print_ex.3
+++ b/secure/lib/libcrypto/man/X509_NAME_print_ex.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509_NAME_print_ex 3"
-.TH X509_NAME_print_ex 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509_NAME_print_ex 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3 b/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3
index d9a4a614644d..4deff2860fc7 100644
--- a/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3
+++ b/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509_STORE_CTX_get_error 3"
-.TH X509_STORE_CTX_get_error 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509_STORE_CTX_get_error 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3 b/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
index 905b633b194b..24859d177f82 100644
--- a/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
+++ b/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509_STORE_CTX_get_ex_new_index 3"
-.TH X509_STORE_CTX_get_ex_new_index 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509_STORE_CTX_get_ex_new_index 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/X509_STORE_CTX_new.3 b/secure/lib/libcrypto/man/X509_STORE_CTX_new.3
index d06b69953476..ef8557d1eda7 100644
--- a/secure/lib/libcrypto/man/X509_STORE_CTX_new.3
+++ b/secure/lib/libcrypto/man/X509_STORE_CTX_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509_STORE_CTX_new 3"
-.TH X509_STORE_CTX_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509_STORE_CTX_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3 b/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
index 903e4ec17a12..5d2084f8c1ff 100644
--- a/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
+++ b/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509_STORE_CTX_set_verify_cb 3"
-.TH X509_STORE_CTX_set_verify_cb 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509_STORE_CTX_set_verify_cb 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3 b/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
index 6cee4dc8328b..287050ceffa0 100644
--- a/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
+++ b/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509_STORE_set_verify_cb_func 3"
-.TH X509_STORE_set_verify_cb_func 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509_STORE_set_verify_cb_func 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3 b/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
index 81fb9541884d..66fc0dcb9eb9 100644
--- a/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
+++ b/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509_VERIFY_PARAM_set_flags 3"
-.TH X509_VERIFY_PARAM_set_flags 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509_VERIFY_PARAM_set_flags 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/X509_new.3 b/secure/lib/libcrypto/man/X509_new.3
index 4e9cc3a0374b..f7e07f77f9a4 100644
--- a/secure/lib/libcrypto/man/X509_new.3
+++ b/secure/lib/libcrypto/man/X509_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509_new 3"
-.TH X509_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/X509_verify_cert.3 b/secure/lib/libcrypto/man/X509_verify_cert.3
index f63d10bb9388..2da12b565b7c 100644
--- a/secure/lib/libcrypto/man/X509_verify_cert.3
+++ b/secure/lib/libcrypto/man/X509_verify_cert.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509_verify_cert 3"
-.TH X509_verify_cert 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509_verify_cert 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/bio.3 b/secure/lib/libcrypto/man/bio.3
index 0845386ae053..36868f0b1521 100644
--- a/secure/lib/libcrypto/man/bio.3
+++ b/secure/lib/libcrypto/man/bio.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "bio 3"
-.TH bio 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH bio 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/blowfish.3 b/secure/lib/libcrypto/man/blowfish.3
index d13db52039bf..cbfcd82f2133 100644
--- a/secure/lib/libcrypto/man/blowfish.3
+++ b/secure/lib/libcrypto/man/blowfish.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "blowfish 3"
-.TH blowfish 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH blowfish 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/bn.3 b/secure/lib/libcrypto/man/bn.3
index 471cc7cfbcea..1734d975e491 100644
--- a/secure/lib/libcrypto/man/bn.3
+++ b/secure/lib/libcrypto/man/bn.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "bn 3"
-.TH bn 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH bn 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/bn_internal.3 b/secure/lib/libcrypto/man/bn_internal.3
index 05d1dfad89c7..afee3567edb7 100644
--- a/secure/lib/libcrypto/man/bn_internal.3
+++ b/secure/lib/libcrypto/man/bn_internal.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "bn_internal 3"
-.TH bn_internal 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH bn_internal 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/buffer.3 b/secure/lib/libcrypto/man/buffer.3
index c69e8e805da4..d2044cfd4750 100644
--- a/secure/lib/libcrypto/man/buffer.3
+++ b/secure/lib/libcrypto/man/buffer.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "buffer 3"
-.TH buffer 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH buffer 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/crypto.3 b/secure/lib/libcrypto/man/crypto.3
index 9fa177552e7a..9a12663fa3b7 100644
--- a/secure/lib/libcrypto/man/crypto.3
+++ b/secure/lib/libcrypto/man/crypto.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "crypto 3"
-.TH crypto 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH crypto 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 b/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
index dce2fc6615ba..0d194bc9ee3a 100644
--- a/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
+++ b/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "d2i_ASN1_OBJECT 3"
-.TH d2i_ASN1_OBJECT 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH d2i_ASN1_OBJECT 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/d2i_DHparams.3 b/secure/lib/libcrypto/man/d2i_DHparams.3
index 9ea1042f9b78..91b38a31888c 100644
--- a/secure/lib/libcrypto/man/d2i_DHparams.3
+++ b/secure/lib/libcrypto/man/d2i_DHparams.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "d2i_DHparams 3"
-.TH d2i_DHparams 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH d2i_DHparams 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 b/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
index 7e53fca7ec59..4ca1d585efcf 100644
--- a/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
+++ b/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "d2i_DSAPublicKey 3"
-.TH d2i_DSAPublicKey 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH d2i_DSAPublicKey 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 b/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
index 3f590c673ca7..2014f6032d86 100644
--- a/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
+++ b/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "d2i_PKCS8PrivateKey 3"
-.TH d2i_PKCS8PrivateKey 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH d2i_PKCS8PrivateKey 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 b/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
index 3417c06bee28..5c2080caa0bd 100644
--- a/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
+++ b/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "d2i_RSAPublicKey 3"
-.TH d2i_RSAPublicKey 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH d2i_RSAPublicKey 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/d2i_X509.3 b/secure/lib/libcrypto/man/d2i_X509.3
index 4f3106270699..05585ba58418 100644
--- a/secure/lib/libcrypto/man/d2i_X509.3
+++ b/secure/lib/libcrypto/man/d2i_X509.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "d2i_X509 3"
-.TH d2i_X509 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH d2i_X509 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 b/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
index d423f18d27cb..da90fbd91c49 100644
--- a/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
+++ b/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "d2i_X509_ALGOR 3"
-.TH d2i_X509_ALGOR 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH d2i_X509_ALGOR 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/d2i_X509_CRL.3 b/secure/lib/libcrypto/man/d2i_X509_CRL.3
index 8a432d35f501..ce32f4077e81 100644
--- a/secure/lib/libcrypto/man/d2i_X509_CRL.3
+++ b/secure/lib/libcrypto/man/d2i_X509_CRL.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "d2i_X509_CRL 3"
-.TH d2i_X509_CRL 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH d2i_X509_CRL 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/d2i_X509_NAME.3 b/secure/lib/libcrypto/man/d2i_X509_NAME.3
index 41b8a5259e84..4e82d22a033c 100644
--- a/secure/lib/libcrypto/man/d2i_X509_NAME.3
+++ b/secure/lib/libcrypto/man/d2i_X509_NAME.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "d2i_X509_NAME 3"
-.TH d2i_X509_NAME 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH d2i_X509_NAME 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/d2i_X509_REQ.3 b/secure/lib/libcrypto/man/d2i_X509_REQ.3
index 9da6593d4045..484f834e7744 100644
--- a/secure/lib/libcrypto/man/d2i_X509_REQ.3
+++ b/secure/lib/libcrypto/man/d2i_X509_REQ.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "d2i_X509_REQ 3"
-.TH d2i_X509_REQ 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH d2i_X509_REQ 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/d2i_X509_SIG.3 b/secure/lib/libcrypto/man/d2i_X509_SIG.3
index 9611a32a05d2..2d147a0c849b 100644
--- a/secure/lib/libcrypto/man/d2i_X509_SIG.3
+++ b/secure/lib/libcrypto/man/d2i_X509_SIG.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "d2i_X509_SIG 3"
-.TH d2i_X509_SIG 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH d2i_X509_SIG 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/des.3 b/secure/lib/libcrypto/man/des.3
index 5c42a238c8cb..1662db458a40 100644
--- a/secure/lib/libcrypto/man/des.3
+++ b/secure/lib/libcrypto/man/des.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "des 3"
-.TH des 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH des 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -263,9 +263,8 @@ depend on a global variable.
 .PP
 \&\fIDES_set_odd_parity()\fR sets the parity of the passed \fIkey\fR to odd.
 .PP
-\&\fIDES_is_weak_key()\fR returns 1 is the passed key is a weak key, 0 if it
-is ok.  The probability that a randomly generated key is weak is
-1/2^52, so it is not really worth checking for them.
+\&\fIDES_is_weak_key()\fR returns 1 if the passed key is a weak key, 0 if it
+is ok.
 .PP
 The following routines mostly operate on an input and output stream of
 \&\fIDES_cblock\fRs.
@@ -309,7 +308,7 @@ of 24 bytes.  This is much better than \s-1CBC\s0 \s-1DES\s0.
 .PP
 \&\fIDES_ede3_cbc_encrypt()\fR implements outer triple \s-1CBC\s0 \s-1DES\s0 encryption with
 three keys. This means that each \s-1DES\s0 operation inside the \s-1CBC\s0 mode is
-really an \f(CW\*(C`C=E(ks3,D(ks2,E(ks1,M)))\*(C'\fR.  This mode is used by \s-1SSL\s0.
+an \f(CW\*(C`C=E(ks3,D(ks2,E(ks1,M)))\*(C'\fR.  This mode is used by \s-1SSL\s0.
 .PP
 The \fIDES_ede2_cbc_encrypt()\fR macro implements two-key Triple-DES by
 reusing \fIks1\fR for the final encryption.  \f(CW\*(C`C=E(ks1,D(ks2,E(ks1,M)))\*(C'\fR.
diff --git a/secure/lib/libcrypto/man/dh.3 b/secure/lib/libcrypto/man/dh.3
index f1fe77818ea5..5dd1d670270a 100644
--- a/secure/lib/libcrypto/man/dh.3
+++ b/secure/lib/libcrypto/man/dh.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "dh 3"
-.TH dh 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH dh 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/dsa.3 b/secure/lib/libcrypto/man/dsa.3
index 18092aedecc9..6291a174282d 100644
--- a/secure/lib/libcrypto/man/dsa.3
+++ b/secure/lib/libcrypto/man/dsa.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "dsa 3"
-.TH dsa 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH dsa 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ecdsa.3 b/secure/lib/libcrypto/man/ecdsa.3
index db65c67e3585..7a354797605f 100644
--- a/secure/lib/libcrypto/man/ecdsa.3
+++ b/secure/lib/libcrypto/man/ecdsa.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ecdsa 3"
-.TH ecdsa 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ecdsa 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/engine.3 b/secure/lib/libcrypto/man/engine.3
index 367fd3eadd59..9e558098d14d 100644
--- a/secure/lib/libcrypto/man/engine.3
+++ b/secure/lib/libcrypto/man/engine.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "engine 3"
-.TH engine 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH engine 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/err.3 b/secure/lib/libcrypto/man/err.3
index 45a841b401ae..3eff15205bea 100644
--- a/secure/lib/libcrypto/man/err.3
+++ b/secure/lib/libcrypto/man/err.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "err 3"
-.TH err 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH err 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -299,7 +299,6 @@ be obtained by calling ERR_get_err_state_table(void) and
 ERR_get_string_table(void) respectively.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
-\&\fICRYPTO_set_id_callback\fR\|(3),
 \&\fICRYPTO_set_locking_callback\fR\|(3),
 \&\fIERR_get_error\fR\|(3),
 \&\s-1\fIERR_GET_LIB\s0\fR\|(3),
diff --git a/secure/lib/libcrypto/man/evp.3 b/secure/lib/libcrypto/man/evp.3
index 0ef7d3383aa7..b77de7d434b0 100644
--- a/secure/lib/libcrypto/man/evp.3
+++ b/secure/lib/libcrypto/man/evp.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "evp 3"
-.TH evp 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH evp 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/hmac.3 b/secure/lib/libcrypto/man/hmac.3
index 7346143b27f8..2e6fc0be3242 100644
--- a/secure/lib/libcrypto/man/hmac.3
+++ b/secure/lib/libcrypto/man/hmac.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "hmac 3"
-.TH hmac 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH hmac 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3 b/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3
index 737310146b10..a57567a9ded0 100644
--- a/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3
+++ b/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "i2d_CMS_bio_stream 3"
-.TH i2d_CMS_bio_stream 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH i2d_CMS_bio_stream 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 b/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
index bb39f02f63b5..35b87522e57a 100644
--- a/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
+++ b/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "i2d_PKCS7_bio_stream 3"
-.TH i2d_PKCS7_bio_stream 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH i2d_PKCS7_bio_stream 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/lh_stats.3 b/secure/lib/libcrypto/man/lh_stats.3
index 8c703398b81f..a17b90b30a3b 100644
--- a/secure/lib/libcrypto/man/lh_stats.3
+++ b/secure/lib/libcrypto/man/lh_stats.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "lh_stats 3"
-.TH lh_stats 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH lh_stats 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/lhash.3 b/secure/lib/libcrypto/man/lhash.3
index 789e40dcc00f..9576ee49e5ba 100644
--- a/secure/lib/libcrypto/man/lhash.3
+++ b/secure/lib/libcrypto/man/lhash.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "lhash 3"
-.TH lhash 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH lhash 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/md5.3 b/secure/lib/libcrypto/man/md5.3
index 8f61087e1c14..003b8d3cafef 100644
--- a/secure/lib/libcrypto/man/md5.3
+++ b/secure/lib/libcrypto/man/md5.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "md5 3"
-.TH md5 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH md5 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/mdc2.3 b/secure/lib/libcrypto/man/mdc2.3
index 3664ac8a8b53..32f0ed12eb14 100644
--- a/secure/lib/libcrypto/man/mdc2.3
+++ b/secure/lib/libcrypto/man/mdc2.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "mdc2 3"
-.TH mdc2 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH mdc2 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/pem.3 b/secure/lib/libcrypto/man/pem.3
index 01fc4b028020..d478da8c67ca 100644
--- a/secure/lib/libcrypto/man/pem.3
+++ b/secure/lib/libcrypto/man/pem.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "pem 3"
-.TH pem 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH pem 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -598,9 +598,9 @@ byte \fBsalt\fR encoded as a set of hexadecimal digits.
 .PP
 After this is the base64 encoded encrypted data.
 .PP
-The encryption key is determined using \fIEVP_bytestokey()\fR, using \fBsalt\fR and an
+The encryption key is determined using \fIEVP_BytesToKey()\fR, using \fBsalt\fR and an
 iteration count of 1. The \s-1IV\s0 used is the value of \fBsalt\fR and *not* the \s-1IV\s0
-returned by \fIEVP_bytestokey()\fR.
+returned by \fIEVP_BytesToKey()\fR.
 .SH "BUGS"
 .IX Header "BUGS"
 The \s-1PEM\s0 read routines in some versions of OpenSSL will not correctly reuse
@@ -624,3 +624,6 @@ The read routines return either a pointer to the structure read or \s-1NULL\s0
 if an error occurred.
 .PP
 The write routines return 1 for success or 0 for failure.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIEVP_get_cipherbyname\fR\|(3), \fIEVP_BytesToKey\fR\|(3)
diff --git a/secure/lib/libcrypto/man/rand.3 b/secure/lib/libcrypto/man/rand.3
index 3170b05835a2..6e80e00303f0 100644
--- a/secure/lib/libcrypto/man/rand.3
+++ b/secure/lib/libcrypto/man/rand.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "rand 3"
-.TH rand 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH rand 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/rc4.3 b/secure/lib/libcrypto/man/rc4.3
index a471c202ffb2..e79d92259f20 100644
--- a/secure/lib/libcrypto/man/rc4.3
+++ b/secure/lib/libcrypto/man/rc4.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "rc4 3"
-.TH rc4 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH rc4 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ripemd.3 b/secure/lib/libcrypto/man/ripemd.3
index a6b1c77522de..f5cbb432ac63 100644
--- a/secure/lib/libcrypto/man/ripemd.3
+++ b/secure/lib/libcrypto/man/ripemd.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ripemd 3"
-.TH ripemd 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ripemd 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/rsa.3 b/secure/lib/libcrypto/man/rsa.3
index 280cd6a691ee..c259d3cdc5df 100644
--- a/secure/lib/libcrypto/man/rsa.3
+++ b/secure/lib/libcrypto/man/rsa.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "rsa 3"
-.TH rsa 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH rsa 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/sha.3 b/secure/lib/libcrypto/man/sha.3
index 0ccb186eb383..d4f863ecc9c6 100644
--- a/secure/lib/libcrypto/man/sha.3
+++ b/secure/lib/libcrypto/man/sha.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "sha 3"
-.TH sha 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH sha 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/threads.3 b/secure/lib/libcrypto/man/threads.3
index 97c76c26de3a..1fc2c0e67494 100644
--- a/secure/lib/libcrypto/man/threads.3
+++ b/secure/lib/libcrypto/man/threads.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "threads 3"
-.TH threads 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH threads 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/ui.3 b/secure/lib/libcrypto/man/ui.3
index ae1348ec7d08..178092bd313f 100644
--- a/secure/lib/libcrypto/man/ui.3
+++ b/secure/lib/libcrypto/man/ui.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ui 3"
-.TH ui 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ui 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -247,7 +247,7 @@ verification will fail.
 \&\fIUI_add_input_boolean()\fR adds a prompt to the \s-1UI\s0 that's supposed to be answered
 in a boolean way, with a single character for yes and a different character
 for no.  A set of characters that can be used to cancel the prompt is given
-as well.  The prompt itself is really divided in two, one part being the
+as well.  The prompt itself is divided in two, one part being the
 descriptive text (given through the \fIprompt\fR argument) and one describing
 the possible answers (given through the \fIaction_desc\fR argument).
 .PP
diff --git a/secure/lib/libcrypto/man/ui_compat.3 b/secure/lib/libcrypto/man/ui_compat.3
index d232fa824c48..05dc09d1afa9 100644
--- a/secure/lib/libcrypto/man/ui_compat.3
+++ b/secure/lib/libcrypto/man/ui_compat.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ui_compat 3"
-.TH ui_compat 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ui_compat 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/man/x509.3 b/secure/lib/libcrypto/man/x509.3
index f1ac6a0231bf..61e84dbe46b1 100644
--- a/secure/lib/libcrypto/man/x509.3
+++ b/secure/lib/libcrypto/man/x509.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "x509 3"
-.TH x509 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH x509 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libcrypto/opensslconf-ia64.h b/secure/lib/libcrypto/opensslconf-ia64.h
deleted file mode 100644
index f3abe66fc6d6..000000000000
--- a/secure/lib/libcrypto/opensslconf-ia64.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/* $FreeBSD$ */
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-/* OpenSSL was configured with the following options: */
-#ifndef OPENSSL_DOING_MAKEDEPEND
-
-
-#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-# define OPENSSL_NO_EC_NISTP_64_GCC_128
-#endif
-#ifndef OPENSSL_NO_GMP
-# define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_JPAKE
-# define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
-# define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
-# define OPENSSL_NO_MD2
-#endif
-#ifndef OPENSSL_NO_SCTP
-# define OPENSSL_NO_SCTP
-#endif
-#ifndef OPENSSL_NO_STORE
-# define OPENSSL_NO_STORE
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
-
-#ifndef OPENSSL_THREADS
-# define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_ASM
-# define OPENSSL_NO_ASM
-#endif
-#ifndef OPENSSL_NO_STATIC_ENGINE
-# define OPENSSL_NO_STATIC_ENGINE
-#endif
-
-/* The OPENSSL_NO_* macros are also defined as NO_* if the application
-   asks for it.  This is a transient feature that is provided for those
-   who haven't had the time to do the appropriate changes in their
-   applications.  */
-#ifdef OPENSSL_ALGORITHM_DEFINES
-# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
-#  define NO_EC_NISTP_64_GCC_128
-# endif
-# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
-#  define NO_GMP
-# endif
-# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
-#  define NO_JPAKE
-# endif
-# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
-#  define NO_KRB5
-# endif
-# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
-#  define NO_MD2
-# endif
-# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
-#  define NO_SCTP
-# endif
-# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
-#  define NO_STORE
-# endif
-#endif
-
-/* crypto/opensslconf.h.in */
-
-/* Generate 80386 code? */
-#undef I386_ONLY
-
-#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
-#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
-#define OPENSSLDIR "/etc/ssl"
-#endif
-#endif
-
-#undef OPENSSL_UNISTD
-#define OPENSSL_UNISTD <unistd.h>
-
-#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
-#define IDEA_INT unsigned int
-#endif
-
-#if defined(HEADER_MD2_H) && !defined(MD2_INT)
-#define MD2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC2_H) && !defined(RC2_INT)
-/* I need to put in a mod for the alpha - eay */
-#define RC2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC4_H)
-#if !defined(RC4_INT)
-/* using int types make the structure larger but make the code faster
- * on most boxes I have tested - up to %20 faster. */
-/*
- * I don't know what does "most" mean, but declaring "int" is a must on:
- * - Intel P6 because partial register stalls are very expensive;
- * - elder Alpha because it lacks byte load/store instructions;
- */
-#define RC4_INT unsigned int
-#endif
-#if !defined(RC4_CHUNK)
-/*
- * This enables code handling data aligned at natural CPU word
- * boundary. See crypto/rc4/rc4_enc.c for further details.
- */
-#undef RC4_CHUNK
-#endif
-#endif
-
-#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
-/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
- * %20 speed up (longs are 8 bytes, int's are 4). */
-#ifndef DES_LONG
-#define DES_LONG unsigned int
-#endif
-#endif
-
-#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
-#define CONFIG_HEADER_BN_H
-#undef BN_LLONG
-
-/* Should we define BN_DIV2W here? */
-
-/* Only one for the following should be defined */
-#define SIXTY_FOUR_BIT_LONG
-#undef SIXTY_FOUR_BIT
-#undef THIRTY_TWO_BIT
-#endif
-
-#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
-#define CONFIG_HEADER_RC4_LOCL_H
-/* if this is defined data[i] is used instead of *data, this is a %20
- * speedup on x86 */
-#undef RC4_INDEX
-#endif
-
-#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
-#define CONFIG_HEADER_BF_LOCL_H
-#undef BF_PTR
-#endif /* HEADER_BF_LOCL_H */
-
-#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-#define CONFIG_HEADER_DES_LOCL_H
-#ifndef DES_DEFAULT_OPTIONS
-/* the following is tweaked from a config script, that is why it is a
- * protected undef/define */
-#ifndef DES_PTR
-#define DES_PTR
-#endif
-
-/* This helps C compiler generate the correct code for multiple functional
- * units.  It reduces register dependancies at the expense of 2 more
- * registers */
-#ifndef DES_RISC1
-#undef DES_RISC1
-#endif
-
-#ifndef DES_RISC2
-#define DES_RISC2
-#endif
-
-#if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
-#endif
-
-/* Unroll the inner loop, this sometimes helps, sometimes hinders.
- * Very mucy CPU dependant */
-#ifndef DES_UNROLL
-#undef DES_UNROLL
-#endif
-
-/* These default values were supplied by
- * Peter Gutman <pgut001@cs.auckland.ac.nz>
- * They are only used if nothing else has been defined */
-#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
-/* Special defines which change the way the code is built depending on the
-   CPU and OS.  For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
-   even newer MIPS CPU's, but at the moment one size fits all for
-   optimization options.  Older Sparc's work better with only UNROLL, but
-   there's no way to tell at compile time what it is you're running on */
- 
-#if defined( sun )		/* Newer Sparc's */
-#  define DES_PTR
-#  define DES_RISC1
-#  define DES_UNROLL
-#elif defined( __ultrix )	/* Older MIPS */
-#  define DES_PTR
-#  define DES_RISC2
-#  define DES_UNROLL
-#elif defined( __osf1__ )	/* Alpha */
-#  define DES_PTR
-#  define DES_RISC2
-#elif defined ( _AIX )		/* RS6000 */
-  /* Unknown */
-#elif defined( __hpux )		/* HP-PA */
-  /* Unknown */
-#elif defined( __aux )		/* 68K */
-  /* Unknown */
-#elif defined( __dgux )		/* 88K (but P6 in latest boxes) */
-#  define DES_UNROLL
-#elif defined( __sgi )		/* Newer MIPS */
-#  define DES_PTR
-#  define DES_RISC2
-#  define DES_UNROLL
-#elif defined(i386) || defined(__i386__)	/* x86 boxes, should be gcc */
-#  define DES_PTR
-#  define DES_RISC1
-#  define DES_UNROLL
-#endif /* Systems-specific speed defines */
-#endif
-
-#endif /* DES_DEFAULT_OPTIONS */
-#endif /* HEADER_DES_LOCL_H */
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index b63d6b9c6692..36b4d7606de9 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -35,7 +35,7 @@ LDNSDIR=	${.CURDIR}/../../../contrib/ldns
 CFLAGS+=	-DHAVE_LDNS=1 -I${LDNSDIR}
 SRCS+=	getrrsetbyname-ldns.c
 DPADD+=	${LIBLDNS}
-LDADD+=	-lldns
+LDADD+=	${LDLDNS}
 USEPRIVATELIB+= ldns
 .endif
 
diff --git a/secure/lib/libssl/Makefile.man b/secure/lib/libssl/Makefile.man
index 06f684ed1200..6b092db2f060 100644
--- a/secure/lib/libssl/Makefile.man
+++ b/secure/lib/libssl/Makefile.man
@@ -33,6 +33,7 @@ MAN+= SSL_CTX_set_session_cache_mode.3
 MAN+= SSL_CTX_set_session_id_context.3
 MAN+= SSL_CTX_set_ssl_version.3
 MAN+= SSL_CTX_set_timeout.3
+MAN+= SSL_CTX_set_tlsext_ticket_key_cb.3
 MAN+= SSL_CTX_set_tmp_dh_callback.3
 MAN+= SSL_CTX_set_tmp_rsa_callback.3
 MAN+= SSL_CTX_set_verify.3
diff --git a/secure/lib/libssl/man/SSL_CIPHER_get_name.3 b/secure/lib/libssl/man/SSL_CIPHER_get_name.3
index 7ee979778064..5aefa507d80c 100644
--- a/secure/lib/libssl/man/SSL_CIPHER_get_name.3
+++ b/secure/lib/libssl/man/SSL_CIPHER_get_name.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CIPHER_get_name 3"
-.TH SSL_CIPHER_get_name 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CIPHER_get_name 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -151,8 +151,12 @@ returned.
 \&\fBalg_bits\fR is not \s-1NULL\s0, it contains the number of bits processed by the
 chosen algorithm. If \fBcipher\fR is \s-1NULL\s0, 0 is returned.
 .PP
-\&\fISSL_CIPHER_get_version()\fR returns the protocol version for \fBcipher\fR, currently
-\&\*(L"SSLv2\*(R", \*(L"SSLv3\*(R", or \*(L"TLSv1\*(R". If \fBcipher\fR is \s-1NULL\s0, \*(L"(\s-1NONE\s0)\*(R" is returned.
+\&\fISSL_CIPHER_get_version()\fR returns string which indicates the \s-1SSL/TLS\s0 protocol
+version that first defined the cipher.
+This is currently \fBSSLv2\fR or \fBTLSv1/SSLv3\fR.
+In some cases it should possibly return \*(L"TLSv1.2\*(R" but does not;
+use \fISSL_CIPHER_description()\fR instead.
+If \fBcipher\fR is \s-1NULL\s0, \*(L"(\s-1NONE\s0)\*(R" is returned.
 .PP
 \&\fISSL_CIPHER_description()\fR returns a textual description of the cipher used
 into the buffer \fBbuf\fR of length \fBlen\fR provided. \fBlen\fR must be at least
@@ -175,7 +179,8 @@ sequence:
 Textual representation of the cipher name.
 .IP "<protocol version>" 4
 .IX Item "<protocol version>"
-Protocol version: \fBSSLv2\fR, \fBSSLv3\fR. The TLSv1 ciphers are flagged with SSLv3.
+Protocol version: \fBSSLv2\fR, \fBSSLv3\fR, \fBTLSv1.2\fR. The TLSv1.0 ciphers are
+flagged with SSLv3. No new ciphers were added by TLSv1.1.
 .IP "Kx=<key exchange>" 4
 .IX Item "Kx=<key exchange>"
 Key exchange method: \fB\s-1RSA\s0\fR (for export ciphers as \fB\s-1RSA\s0(512)\fR or
@@ -207,6 +212,12 @@ Some examples for the output of \fISSL_CIPHER_description()\fR:
 \& RC4\-MD5                 SSLv3 Kx=RSA      Au=RSA  Enc=RC4(128)  Mac=MD5
 \& EXP\-RC4\-MD5             SSLv3 Kx=RSA(512) Au=RSA  Enc=RC4(40)   Mac=MD5  export
 .Ve
+.PP
+A comp[lete list can be retrieved by invoking the following command:
+.PP
+.Vb 1
+\& openssl ciphers \-v ALL
+.Ve
 .SH "BUGS"
 .IX Header "BUGS"
 If \fISSL_CIPHER_description()\fR is called with \fBcipher\fR being \s-1NULL\s0, the
diff --git a/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 b/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
index 835116c35bda..19dc6369eb6b 100644
--- a/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
+++ b/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_COMP_add_compression_method 3"
-.TH SSL_COMP_add_compression_method 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_COMP_add_compression_method 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 b/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
index 2d62aaa51e08..5de9d3a8d852 100644
--- a/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
+++ b/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_add_extra_chain_cert 3"
-.TH SSL_CTX_add_extra_chain_cert 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_add_extra_chain_cert 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -150,6 +150,15 @@ these certificates explicitly specified. If no chain is specified,
 the library will try to complete the chain from the available \s-1CA\s0
 certificates in the trusted \s-1CA\s0 storage, see
 \&\fISSL_CTX_load_verify_locations\fR\|(3).
+.PP
+The \fBx509\fR certificate provided to \fISSL_CTX_add_extra_chain_cert()\fR will be freed by the library when the \fB\s-1SSL_CTX\s0\fR is destroyed. An application \fBshould not\fR free the \fBx509\fR object.
+.SH "RESTRICTIONS"
+.IX Header "RESTRICTIONS"
+Only one set of extra chain certificates can be specified per \s-1SSL_CTX\s0
+structure. Different chains for different certificates (for example if both
+\&\s-1RSA\s0 and \s-1DSA\s0 certificates are specified by the same server) or different \s-1SSL\s0
+structures with the same parent \s-1SSL_CTX\s0 cannot be specified using this
+function.
 .SH "RETURN VALUES"
 .IX Header "RETURN VALUES"
 \&\fISSL_CTX_add_extra_chain_cert()\fR returns 1 on success. Check out the
diff --git a/secure/lib/libssl/man/SSL_CTX_add_session.3 b/secure/lib/libssl/man/SSL_CTX_add_session.3
index 752ef36cff41..3ce2f7aaab8d 100644
--- a/secure/lib/libssl/man/SSL_CTX_add_session.3
+++ b/secure/lib/libssl/man/SSL_CTX_add_session.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_add_session 3"
-.TH SSL_CTX_add_session 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_add_session 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -168,7 +168,7 @@ If a server \s-1SSL_CTX\s0 is configured with the \s-1SSL_SESS_CACHE_NO_INTERNAL
 flag then the internal cache will not be populated automatically by new
 sessions negotiated by the \s-1SSL/TLS\s0 implementation, even though the internal
 cache will be searched automatically for session-resume requests (the
-latter can be surpressed by \s-1SSL_SESS_CACHE_NO_INTERNAL_LOOKUP\s0). So the
+latter can be suppressed by \s-1SSL_SESS_CACHE_NO_INTERNAL_LOOKUP\s0). So the
 application can use \fISSL_CTX_add_session()\fR directly to have full control
 over the sessions that can be resumed if desired.
 .SH "RETURN VALUES"
diff --git a/secure/lib/libssl/man/SSL_CTX_ctrl.3 b/secure/lib/libssl/man/SSL_CTX_ctrl.3
index 24c943c8e61d..a9d7e48e2523 100644
--- a/secure/lib/libssl/man/SSL_CTX_ctrl.3
+++ b/secure/lib/libssl/man/SSL_CTX_ctrl.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_ctrl 3"
-.TH SSL_CTX_ctrl 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_ctrl 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 b/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
index 59290257d3c2..6ed2246ab1dd 100644
--- a/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
+++ b/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_flush_sessions 3"
-.TH SSL_CTX_flush_sessions 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_flush_sessions 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_free.3 b/secure/lib/libssl/man/SSL_CTX_free.3
index 5efdabba64ff..83d368d7ef36 100644
--- a/secure/lib/libssl/man/SSL_CTX_free.3
+++ b/secure/lib/libssl/man/SSL_CTX_free.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_free 3"
-.TH SSL_CTX_free 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_free 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 b/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
index 14f68d6bf5dd..4a167a5479ad 100644
--- a/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
+++ b/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_get_ex_new_index 3"
-.TH SSL_CTX_get_ex_new_index 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_get_ex_new_index 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 b/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
index 1c31370e36fd..4500cdd70a69 100644
--- a/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
+++ b/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_get_verify_mode 3"
-.TH SSL_CTX_get_verify_mode 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_get_verify_mode 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 b/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
index 8ec3c9570ff0..50fc72f36d28 100644
--- a/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
+++ b/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_load_verify_locations 3"
-.TH SSL_CTX_load_verify_locations 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_load_verify_locations 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_new.3 b/secure/lib/libssl/man/SSL_CTX_new.3
index d7157cf05efd..02e2956b9140 100644
--- a/secure/lib/libssl/man/SSL_CTX_new.3
+++ b/secure/lib/libssl/man/SSL_CTX_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_new 3"
-.TH SSL_CTX_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -172,20 +172,34 @@ compatibility reasons, see SSLv23_*\fI_method()\fR. It will also not understand
 SSLv3 client hello messages.
 .IP "SSLv23_method(void), SSLv23_server_method(void), SSLv23_client_method(void)" 4
 .IX Item "SSLv23_method(void), SSLv23_server_method(void), SSLv23_client_method(void)"
-A \s-1TLS/SSL\s0 connection established with these methods will understand the SSLv2,
-SSLv3, and TLSv1 protocol. A client will send out SSLv2 client hello messages
-and will indicate that it also understands SSLv3 and TLSv1. A server will
-understand SSLv2, SSLv3, and TLSv1 client hello messages. This is the best
-choice when compatibility is a concern.
+A \s-1TLS/SSL\s0 connection established with these methods may understand the SSLv2,
+SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols.
+.Sp
+If the cipher list does not contain any SSLv2 ciphersuites (the default
+cipher list does not) or extensions are required (for example server name)
+a client will send out TLSv1 client hello messages including extensions and
+will indicate that it also understands TLSv1.1, TLSv1.2 and permits a
+fallback to SSLv3. A server will support SSLv3, TLSv1, TLSv1.1 and TLSv1.2
+protocols. This is the best choice when compatibility is a concern.
+.Sp
+If any SSLv2 ciphersuites are included in the cipher list and no extensions
+are required then SSLv2 compatible client hellos will be used by clients and
+SSLv2 will be accepted by servers. This is \fBnot\fR recommended due to the
+insecurity of SSLv2 and the limited nature of the SSLv2 client hello
+prohibiting the use of extensions.
 .PP
 The list of protocols available can later be limited using the SSL_OP_NO_SSLv2,
-SSL_OP_NO_SSLv3, SSL_OP_NO_TLSv1 options of the \fB\f(BISSL_CTX_set_options()\fB\fR or
-\&\fB\f(BISSL_set_options()\fB\fR functions. Using these options it is possible to choose
-e.g. \fISSLv23_server_method()\fR and be able to negotiate with all possible
-clients, but to only allow newer protocols like SSLv3 or TLSv1.
+SSL_OP_NO_SSLv3, SSL_OP_NO_TLSv1, SSL_OP_NO_TLSv1_1 and SSL_OP_NO_TLSv1_2
+options of the \fISSL_CTX_set_options()\fR or \fISSL_set_options()\fR functions.
+Using these options it is possible to choose e.g. \fISSLv23_server_method()\fR and
+be able to negotiate with all possible clients, but to only allow newer
+protocols like TLSv1, TLSv1.1 or \s-1TLS\s0 v1.2.
+.PP
+Applications which never want to support SSLv2 (even is the cipher string
+is configured to use SSLv2 ciphersuites) can set SSL_OP_NO_SSLv2.
 .PP
 \&\fISSL_CTX_new()\fR initializes the list of ciphers, the session cache setting,
-the callbacks, the keys and certificates, and the options to its default
+the callbacks, the keys and certificates and the options to its default
 values.
 .SH "RETURN VALUES"
 .IX Header "RETURN VALUES"
diff --git a/secure/lib/libssl/man/SSL_CTX_sess_number.3 b/secure/lib/libssl/man/SSL_CTX_sess_number.3
index f0b66a31c610..2e0b9d68028e 100644
--- a/secure/lib/libssl/man/SSL_CTX_sess_number.3
+++ b/secure/lib/libssl/man/SSL_CTX_sess_number.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_sess_number 3"
-.TH SSL_CTX_sess_number 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_sess_number 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 b/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
index d9317299681f..b6748a7fa03f 100644
--- a/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
+++ b/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_sess_set_cache_size 3"
-.TH SSL_CTX_sess_set_cache_size 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_sess_set_cache_size 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 b/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
index b35640c2e6fd..1cf7f31e39dd 100644
--- a/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
+++ b/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_sess_set_get_cb 3"
-.TH SSL_CTX_sess_set_get_cb 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_sess_set_get_cb 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_sessions.3 b/secure/lib/libssl/man/SSL_CTX_sessions.3
index 9fa3ce279899..6e43552cee95 100644
--- a/secure/lib/libssl/man/SSL_CTX_sessions.3
+++ b/secure/lib/libssl/man/SSL_CTX_sessions.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_sessions 3"
-.TH SSL_CTX_sessions 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_sessions 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 b/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
index be092fc381c8..97293ff9e9fb 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_cert_store 3"
-.TH SSL_CTX_set_cert_store 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_cert_store 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 b/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
index 3cf56439c560..709fc399f72b 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_cert_verify_callback 3"
-.TH SSL_CTX_set_cert_verify_callback 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_cert_verify_callback 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 b/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
index 4582ed2b19f3..7f6d90dab414 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_cipher_list 3"
-.TH SSL_CTX_set_cipher_list 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_cipher_list 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -180,6 +180,10 @@ client only supports export \s-1RSA\s0 ciphers with a asymmetric key length
 of 512 bits and the server is not configured to use temporary \s-1RSA\s0
 keys), the \*(L"no shared cipher\*(R" (\s-1SSL_R_NO_SHARED_CIPHER\s0) error is generated
 and the handshake will fail.
+.PP
+If the cipher list does not contain any SSLv2 cipher suites (this is the
+default) then SSLv2 is effectively disabled and neither clients nor servers
+will attempt to use SSLv2.
 .SH "RETURN VALUES"
 .IX Header "RETURN VALUES"
 \&\fISSL_CTX_set_cipher_list()\fR and \fISSL_set_cipher_list()\fR return 1 if any cipher
diff --git a/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 b/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
index dd5ffeed7c46..6b30038e3d44 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_client_CA_list 3"
-.TH SSL_CTX_set_client_CA_list 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_client_CA_list 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -162,7 +162,7 @@ the chosen \fBssl\fR, overriding the setting valid for \fBssl\fR's \s-1SSL_CTX\s
 .SH "NOTES"
 .IX Header "NOTES"
 When a \s-1TLS/SSL\s0 server requests a client certificate (see
-\&\fB\f(BISSL_CTX_set_verify_options()\fB\fR), it sends a list of CAs, for which
+\&\fB\f(BISSL_CTX_set_verify\fB\|(3)\fR), it sends a list of CAs, for which
 it will accept certificates, to the client.
 .PP
 This list must explicitly be set using \fISSL_CTX_set_client_CA_list()\fR for
diff --git a/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 b/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
index f1ffac8b9f8d..cd4db2ec67c2 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_client_cert_cb 3"
-.TH SSL_CTX_set_client_cert_cb 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_client_cert_cb 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -157,7 +157,7 @@ using the \fBx509\fR and \fBpkey\fR arguments and \*(L"1\*(R" must be returned.
 certificate will be installed into \fBssl\fR, see the \s-1NOTES\s0 and \s-1BUGS\s0 sections.
 If no certificate should be set, \*(L"0\*(R" has to be returned and no certificate
 will be sent. A negative return value will suspend the handshake and the
-handshake function will return immediatly. \fISSL_get_error\fR\|(3)
+handshake function will return immediately. \fISSL_get_error\fR\|(3)
 will return \s-1SSL_ERROR_WANT_X509_LOOKUP\s0 to indicate, that the handshake was
 suspended. The next call to the handshake function will again lead to the call
 of \fIclient_cert_cb()\fR. It is the job of the \fIclient_cert_cb()\fR to store information
diff --git a/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 b/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
index faff1275637f..f10adaf44afd 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_default_passwd_cb 3"
-.TH SSL_CTX_set_default_passwd_cb 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_default_passwd_cb 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 b/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
index b75db37b39d5..9796a36c0229 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_generate_session_id 3"
-.TH SSL_CTX_set_generate_session_id 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_generate_session_id 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 b/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
index 6866ec3dc0e9..ce25dc984503 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_info_callback 3"
-.TH SSL_CTX_set_info_callback 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_info_callback 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 b/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
index a9f4f912f7c1..0757e0e988c3 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_max_cert_list 3"
-.TH SSL_CTX_set_max_cert_list 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_max_cert_list 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_mode.3 b/secure/lib/libssl/man/SSL_CTX_set_mode.3
index a35503975fbb..81cb0e905a9c 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_mode.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_mode.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_mode 3"
-.TH SSL_CTX_set_mode 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_mode 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 b/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
index 58540289aa4d..409782b3a152 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_msg_callback 3"
-.TH SSL_CTX_set_msg_callback 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_msg_callback 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_options.3 b/secure/lib/libssl/man/SSL_CTX_set_options.3
index 50bcaa7d2956..b4943de4a83e 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_options.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_options.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_options 3"
-.TH SSL_CTX_set_options 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_options 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -345,7 +345,7 @@ renegotiation implementation.
 Connections and renegotiation are always permitted by OpenSSL implementations.
 .SS "Unpatched client and patched OpenSSL server"
 .IX Subsection "Unpatched client and patched OpenSSL server"
-The initial connection suceeds but client renegotiation is denied by the
+The initial connection succeeds but client renegotiation is denied by the
 server with a \fBno_renegotiation\fR warning alert if \s-1TLS\s0 v1.0 is used or a fatal
 \&\fBhandshake_failure\fR alert in \s-1SSL\s0 v3.0.
 .PP
diff --git a/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3 b/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3
index 7535bf4dd1ea..7727a562275a 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_psk_client_callback 3"
-.TH SSL_CTX_set_psk_client_callback 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_psk_client_callback 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 b/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
index 20f519c9bf67..5e513321fdc0 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_quiet_shutdown 3"
-.TH SSL_CTX_set_quiet_shutdown 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_quiet_shutdown 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 b/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
index 554e1f5d5af1..40811d9bc540 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_session_cache_mode 3"
-.TH SSL_CTX_set_session_cache_mode 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_session_cache_mode 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 b/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
index f1eb254e72fb..b197662fd2d6 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_session_id_context 3"
-.TH SSL_CTX_set_session_id_context 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_session_id_context 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 b/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
index 546b3d332f6c..b03716a6c5b6 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_ssl_version 3"
-.TH SSL_CTX_set_ssl_version 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_ssl_version 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_timeout.3 b/secure/lib/libssl/man/SSL_CTX_set_timeout.3
index 24c22536b09d..97cb2a4fd204 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_timeout.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_timeout.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_timeout 3"
-.TH SSL_CTX_set_timeout 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_timeout 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3 b/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3
new file mode 100644
index 000000000000..b0d969b3484d
--- /dev/null
+++ b/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3
@@ -0,0 +1,307 @@
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.28)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.el \{\
+.    de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "SSL_CTX_set_tlsext_ticket_key_cb 3"
+.TH SSL_CTX_set_tlsext_ticket_key_cb 3 "2014-08-06" "1.0.1i" "OpenSSL"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+SSL_CTX_set_tlsext_ticket_key_cb \- set a callback for session ticket processing
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+.Vb 1
+\& #include <openssl/tls1.h>
+\&
+\& long SSL_CTX_set_tlsext_ticket_key_cb(SSL_CTX sslctx,
+\&        int (*cb)(SSL *s, unsigned char key_name[16],
+\&                  unsigned char iv[EVP_MAX_IV_LENGTH],
+\&                  EVP_CIPHER_CTX *ctx, HMAC_CTX *hctx, int enc));
+.Ve
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fISSL_CTX_set_tlsext_ticket_key_cb()\fR sets a callback fuction \fIcb\fR for handling 
+session tickets for the ssl context \fIsslctx\fR. Session tickets, defined in 
+\&\s-1RFC5077\s0 provide an enhanced session resumption capability where the server
+implementation is not required to maintain per session state. It only applies
+to \s-1TLS\s0 and there is no SSLv3 implementation.
+.PP
+The callback is available when the OpenSSL library was built without 
+\&\fI\s-1OPENSSL_NO_TLSEXT\s0\fR being defined.
+.PP
+The callback function \fIcb\fR will be called for every client instigated \s-1TLS\s0
+session when session ticket extension is presented in the \s-1TLS\s0 hello
+message. It is the responsibility of this function to create or retrieve the
+cryptographic parameters and to maintain their state.
+.PP
+The OpenSSL library uses your callback function to help implement a common \s-1TLS\s0 
+ticket construction state according to \s-1RFC5077\s0 Section 4 such that per session
+state is unnecessary and a small set of cryptographic variables needs to be 
+maintained by the callback function implementation.
+.PP
+In order to reuse a session, a \s-1TLS\s0 client must send the a session ticket
+extension to the server. The client can only send exactly one session ticket.
+The server, through the callback function, either agrees to reuse the session
+ticket information or it starts a full \s-1TLS\s0 handshake to create a new session
+ticket.
+.PP
+Before the callback function is started \fIctx\fR and \fIhctx\fR have been 
+initialised with EVP_CIPHER_CTX_init and HMAC_CTX_init respectively.
+.PP
+For new sessions tickets, when the client doesn't present a session ticket, or
+an attempted retreival of the ticket failed, or a renew option was indicated,
+the callback function will be called with \fIenc\fR equal to 1. The OpenSSL
+library expects that the function will set an arbitary \fIname\fR, initialize
+\&\fIiv\fR, and set the cipher context \fIctx\fR and the hash context \fIhctx\fR.
+.PP
+The \fIname\fR is 16 characters long and is used as a key identifier.
+.PP
+The \fIiv\fR length is the length of the \s-1IV\s0 of the corresponding cipher. The
+maximum \s-1IV\s0 length is \s-1EVP_MAX_IV_LENGTH\s0 bytes defined in \fBevp.h\fR.
+.PP
+The initialization vector \fIiv\fR should be a random value. The cipher context 
+\&\fIctx\fR should use the initialisation vector \fIiv\fR. The cipher context can be 
+set using EVP_EncryptInit_ex. The hmac context can be set using HMAC_Init_ex.
+.PP
+When the client presents a session ticket, the callback function with be called 
+with \fIenc\fR set to 0 indicating that the \fIcb\fR function should retreive a set
+of parameters. In this case \fIname\fR and \fIiv\fR have already been parsed out of
+the session ticket. The OpenSSL library expects that the \fIname\fR will be used
+to retrieve a cryptographic parameters and that the cryptographic context
+\&\fIctx\fR will be set with the retreived parameters and the initialization vector
+\&\fIiv\fR. using a function like EVP_DecryptInit_ex. The \fIhctx\fR needs to be set
+using HMAC_Init_ex.
+.PP
+If the \fIname\fR is still valid but a renewal of the ticket is required the
+callback function should return 2. The library will call the callback again
+with an arguement of enc equal to 1 to set the new ticket.
+.PP
+The return value of the \fIcb\fR function is used by OpenSSL to determine what
+further processing will occur. The following return values have meaning:
+.IP "2" 4
+.IX Item "2"
+This indicates that the \fIctx\fR and \fIhctx\fR have been set and the session can 
+continue on those parameters. Additionally it indicates that the session
+ticket is in a renewal period and should be replaced. The OpenSSL library will
+call \fIcb\fR again with an enc argument of 1 to set the new ticket (see \s-1RFC5077\s0
+3.3 paragraph 2).
+.IP "1" 4
+.IX Item "1"
+This indicates that the \fIctx\fR and \fIhctx\fR have been set and the session can 
+continue on those parameters.
+.IP "0" 4
+This indicates that it was not possible to set/retrieve a session ticket and 
+the \s-1SSL/TLS\s0 session will continue by by negiotationing a set of cryptographic
+parameters or using the alternate \s-1SSL/TLS\s0 resumption mechanism, session ids.
+.Sp
+If called with enc equal to 0 the library will call the \fIcb\fR again to get
+a new set of parameters.
+.IP "less than 0" 4
+.IX Item "less than 0"
+This indicates an error.
+.SH "NOTES"
+.IX Header "NOTES"
+Session resumption shortcuts the \s-1TLS\s0 so that the client certificate
+negiotation don't occur. It makes up for this by storing client certificate
+an all other negotiated state information encrypted within the ticket. In a
+resumed session the applications will have all this state information available
+exactly as if a full negiotation had occured.
+.PP
+If an attacker can obtain the key used to encrypt a session ticket, they can
+obtain the master secret for any ticket using that key and decrypt any traffic
+using that session: even if the ciphersuite supports forward secrecy. As
+a result applications may wish to use multiple keys and avoid using long term
+keys stored in files.
+.PP
+Applications can use longer keys to maintain a consistent level of security.
+For example if a ciphersuite uses 256 bit ciphers but only a 128 bit ticket key
+the overall security is only 128 bits because breaking the ticket key will
+enable an attacker to obtain the session keys.
+.SH "EXAMPLES"
+.IX Header "EXAMPLES"
+Reference Implemention:
+  SSL_CTX_set_tlsext_ticket_key_cb(\s-1SSL\s0,ssl_tlsext_ticket_key_cb);
+  ....
+.PP
+.Vb 6
+\&  static int ssl_tlsext_ticket_key_cb(SSL *s, unsigned char key_name[16], unsigned char *iv, EVP_CIPHER_CTX *ctx, HMAC_CTX *hctx, int enc)
+\&  {
+\&      if (enc) { /* create new session */
+\&          if (RAND_bytes(iv, EVP_MAX_IV_LENGTH) ) {
+\&              return \-1; /* insufficient random */
+\&          }
+\&  
+\&          key = currentkey(); /* something that you need to implement */
+\&          if ( !key ) {
+\&              /* current key doesn\*(Aqt exist or isn\*(Aqt valid */
+\&              key = createkey(); /* something that you need to implement.
+\&                                   * createkey needs to initialise, a name,
+\&                                   * an aes_key, a hmac_key and optionally
+\&                                   * an expire time. */
+\&              if ( !key ) { /* key couldn\*(Aqt be created */
+\&                  return 0;
+\&              }
+\&          }
+\&          memcpy(key_name, key\->name, 16);
+\&  
+\&          EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key\->aes_key, iv);
+\&          HMAC_Init_ex(&hctx, key\->hmac_key, 16, EVP_sha256(), NULL);
+\&  
+\&          return 1;
+\&  
+\&      } else { /* retrieve session */
+\&          key = findkey(name);
+\&  
+\&          if  (!key || key\->expire < now() ) {
+\&              return 0;
+\&          }
+\&  
+\&          HMAC_Init_ex(&hctx, key\->hmac_key, 16, EVP_sha256(), NULL);
+\&          EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key\->aes_key, iv );
+\&
+\&          if (key\->expire < ( now() \- RENEW_TIME ) ) {
+\&              /* return 2 \- this session will get a new ticket even though the current is still valid */
+\&              return 2;
+\&          }
+\&          return 1;
+\&  
+\&      }
+\&  }
+.Ve
+.SH "RETURN VALUES"
+.IX Header "RETURN VALUES"
+returns 0 to indicate the callback function was set.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIssl\fR\|(3), \fISSL_set_session\fR\|(3),
+\&\fISSL_session_reused\fR\|(3),
+\&\fISSL_CTX_add_session\fR\|(3),
+\&\fISSL_CTX_sess_number\fR\|(3),
+\&\fISSL_CTX_sess_set_get_cb\fR\|(3),
+\&\fISSL_CTX_set_session_id_context\fR\|(3),
+.SH "HISTORY"
+.IX Header "HISTORY"
+This function was introduced in OpenSSL 0.9.8h
diff --git a/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 b/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
index 088664655407..46646535fa74 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_tmp_dh_callback 3"
-.TH SSL_CTX_set_tmp_dh_callback 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_tmp_dh_callback 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -140,11 +140,9 @@ SSL_CTX_set_tmp_dh_callback, SSL_CTX_set_tmp_dh, SSL_set_tmp_dh_callback, SSL_se
 \&            DH *(*tmp_dh_callback)(SSL *ssl, int is_export, int keylength));
 \& long SSL_CTX_set_tmp_dh(SSL_CTX *ctx, DH *dh);
 \&
-\& void SSL_set_tmp_dh_callback(SSL_CTX *ctx,
+\& void SSL_set_tmp_dh_callback(SSL *ctx,
 \&            DH *(*tmp_dh_callback)(SSL *ssl, int is_export, int keylength));
 \& long SSL_set_tmp_dh(SSL *ssl, DH *dh)
-\&
-\& DH *(*tmp_dh_callback)(SSL *ssl, int is_export, int keylength));
 .Ve
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
@@ -208,7 +206,7 @@ instead (see \fIdhparam\fR\|(1)), but in this case \s-1SSL_OP_SINGLE_DH_USE\s0
 is mandatory.
 .PP
 Application authors may compile in \s-1DH\s0 parameters. Files dh512.pem,
-dh1024.pem, dh2048.pem, and dh4096 in the 'apps' directory of current
+dh1024.pem, dh2048.pem, and dh4096.pem in the 'apps' directory of current
 version of the OpenSSL distribution contain the '\s-1SKIP\s0' \s-1DH\s0 parameters,
 which use safe primes and were generated verifiably pseudo-randomly.
 These files can be converted into C code using the \fB\-C\fR option of the
diff --git a/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 b/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
index 52167a920126..42189f85b2f3 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_tmp_rsa_callback 3"
-.TH SSL_CTX_set_tmp_rsa_callback 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_tmp_rsa_callback 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_set_verify.3 b/secure/lib/libssl/man/SSL_CTX_set_verify.3
index 09bc4be1dec3..15777e11c4b8 100644
--- a/secure/lib/libssl/man/SSL_CTX_set_verify.3
+++ b/secure/lib/libssl/man/SSL_CTX_set_verify.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_set_verify 3"
-.TH SSL_CTX_set_verify 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_set_verify 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -228,8 +228,8 @@ certificates would not be present, most likely a
 X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY will be issued.
 The depth count is \*(L"level 0:peer certificate\*(R", \*(L"level 1: \s-1CA\s0 certificate\*(R",
 \&\*(L"level 2: higher level \s-1CA\s0 certificate\*(R", and so on. Setting the maximum
-depth to 2 allows the levels 0, 1, and 2. The default depth limit is 9,
-allowing for the peer certificate and additional 9 \s-1CA\s0 certificates.
+depth to 2 allows the levels 0, 1, and 2. The default depth limit is 100,
+allowing for the peer certificate and additional 100 \s-1CA\s0 certificates.
 .PP
 The \fBverify_callback\fR function is used to control the behaviour when the
 \&\s-1SSL_VERIFY_PEER\s0 flag is set. It must be supplied by the application and
diff --git a/secure/lib/libssl/man/SSL_CTX_use_certificate.3 b/secure/lib/libssl/man/SSL_CTX_use_certificate.3
index c2348fc74a78..8c5674375bf8 100644
--- a/secure/lib/libssl/man/SSL_CTX_use_certificate.3
+++ b/secure/lib/libssl/man/SSL_CTX_use_certificate.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_use_certificate 3"
-.TH SSL_CTX_use_certificate 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_use_certificate 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3 b/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3
index a5ae5f91ebce..82735f69b1a5 100644
--- a/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3
+++ b/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_CTX_use_psk_identity_hint 3"
-.TH SSL_CTX_use_psk_identity_hint 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_CTX_use_psk_identity_hint 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_SESSION_free.3 b/secure/lib/libssl/man/SSL_SESSION_free.3
index a4101e5eda75..5379d25d0fe0 100644
--- a/secure/lib/libssl/man/SSL_SESSION_free.3
+++ b/secure/lib/libssl/man/SSL_SESSION_free.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_SESSION_free 3"
-.TH SSL_SESSION_free 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_SESSION_free 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 b/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
index 31f174954dca..5732f219963b 100644
--- a/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
+++ b/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_SESSION_get_ex_new_index 3"
-.TH SSL_SESSION_get_ex_new_index 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_SESSION_get_ex_new_index 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_SESSION_get_time.3 b/secure/lib/libssl/man/SSL_SESSION_get_time.3
index d42d2219165d..beda3cb46e92 100644
--- a/secure/lib/libssl/man/SSL_SESSION_get_time.3
+++ b/secure/lib/libssl/man/SSL_SESSION_get_time.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_SESSION_get_time 3"
-.TH SSL_SESSION_get_time 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_SESSION_get_time 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_accept.3 b/secure/lib/libssl/man/SSL_accept.3
index 79e5193c4eaa..c9030e0ea747 100644
--- a/secure/lib/libssl/man/SSL_accept.3
+++ b/secure/lib/libssl/man/SSL_accept.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_accept 3"
-.TH SSL_accept 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_accept 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_alert_type_string.3 b/secure/lib/libssl/man/SSL_alert_type_string.3
index 6383b608adfb..91928a0c4506 100644
--- a/secure/lib/libssl/man/SSL_alert_type_string.3
+++ b/secure/lib/libssl/man/SSL_alert_type_string.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_alert_type_string 3"
-.TH SSL_alert_type_string 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_alert_type_string 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_clear.3 b/secure/lib/libssl/man/SSL_clear.3
index eafd97cd4ffb..199d2489bf59 100644
--- a/secure/lib/libssl/man/SSL_clear.3
+++ b/secure/lib/libssl/man/SSL_clear.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_clear 3"
-.TH SSL_clear 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_clear 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_connect.3 b/secure/lib/libssl/man/SSL_connect.3
index 9703367653e7..72851af7d63a 100644
--- a/secure/lib/libssl/man/SSL_connect.3
+++ b/secure/lib/libssl/man/SSL_connect.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_connect 3"
-.TH SSL_connect 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_connect 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_do_handshake.3 b/secure/lib/libssl/man/SSL_do_handshake.3
index a26b6c947451..8c5349416f11 100644
--- a/secure/lib/libssl/man/SSL_do_handshake.3
+++ b/secure/lib/libssl/man/SSL_do_handshake.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_do_handshake 3"
-.TH SSL_do_handshake 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_do_handshake 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_free.3 b/secure/lib/libssl/man/SSL_free.3
index 471e7ab7085b..552cf26a4705 100644
--- a/secure/lib/libssl/man/SSL_free.3
+++ b/secure/lib/libssl/man/SSL_free.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_free 3"
-.TH SSL_free 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_free 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_SSL_CTX.3 b/secure/lib/libssl/man/SSL_get_SSL_CTX.3
index 4541f4d2ed6b..d383f6a0fbb9 100644
--- a/secure/lib/libssl/man/SSL_get_SSL_CTX.3
+++ b/secure/lib/libssl/man/SSL_get_SSL_CTX.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_SSL_CTX 3"
-.TH SSL_get_SSL_CTX 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_SSL_CTX 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_ciphers.3 b/secure/lib/libssl/man/SSL_get_ciphers.3
index 4c5ef0879b51..6c785d4ec9ce 100644
--- a/secure/lib/libssl/man/SSL_get_ciphers.3
+++ b/secure/lib/libssl/man/SSL_get_ciphers.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_ciphers 3"
-.TH SSL_get_ciphers 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_ciphers 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_client_CA_list.3 b/secure/lib/libssl/man/SSL_get_client_CA_list.3
index e5f9a9947d03..6b83efcbc07b 100644
--- a/secure/lib/libssl/man/SSL_get_client_CA_list.3
+++ b/secure/lib/libssl/man/SSL_get_client_CA_list.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_client_CA_list 3"
-.TH SSL_get_client_CA_list 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_client_CA_list 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_current_cipher.3 b/secure/lib/libssl/man/SSL_get_current_cipher.3
index d04f13633a4b..3d837a5d4258 100644
--- a/secure/lib/libssl/man/SSL_get_current_cipher.3
+++ b/secure/lib/libssl/man/SSL_get_current_cipher.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_current_cipher 3"
-.TH SSL_get_current_cipher 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_current_cipher 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_default_timeout.3 b/secure/lib/libssl/man/SSL_get_default_timeout.3
index 88ea75730573..515d81c4c328 100644
--- a/secure/lib/libssl/man/SSL_get_default_timeout.3
+++ b/secure/lib/libssl/man/SSL_get_default_timeout.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_default_timeout 3"
-.TH SSL_get_default_timeout 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_default_timeout 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_error.3 b/secure/lib/libssl/man/SSL_get_error.3
index 760af98d458e..a70f96357134 100644
--- a/secure/lib/libssl/man/SSL_get_error.3
+++ b/secure/lib/libssl/man/SSL_get_error.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_error 3"
-.TH SSL_get_error 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_error 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 b/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
index 71d554c35ea7..aa37340eea82 100644
--- a/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
+++ b/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_ex_data_X509_STORE_CTX_idx 3"
-.TH SSL_get_ex_data_X509_STORE_CTX_idx 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_ex_data_X509_STORE_CTX_idx 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_ex_new_index.3 b/secure/lib/libssl/man/SSL_get_ex_new_index.3
index 05d0625c0205..03f00d5f0eda 100644
--- a/secure/lib/libssl/man/SSL_get_ex_new_index.3
+++ b/secure/lib/libssl/man/SSL_get_ex_new_index.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_ex_new_index 3"
-.TH SSL_get_ex_new_index 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_ex_new_index 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_fd.3 b/secure/lib/libssl/man/SSL_get_fd.3
index bcaaa8e0afd0..e8c20507aa89 100644
--- a/secure/lib/libssl/man/SSL_get_fd.3
+++ b/secure/lib/libssl/man/SSL_get_fd.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_fd 3"
-.TH SSL_get_fd 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_fd 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 b/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
index 0303b846a9bb..368f5673b11c 100644
--- a/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
+++ b/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_peer_cert_chain 3"
-.TH SSL_get_peer_cert_chain 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_peer_cert_chain 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_peer_certificate.3 b/secure/lib/libssl/man/SSL_get_peer_certificate.3
index 5e9604fce9e0..086329e86b27 100644
--- a/secure/lib/libssl/man/SSL_get_peer_certificate.3
+++ b/secure/lib/libssl/man/SSL_get_peer_certificate.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_peer_certificate 3"
-.TH SSL_get_peer_certificate 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_peer_certificate 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_psk_identity.3 b/secure/lib/libssl/man/SSL_get_psk_identity.3
index 11c7d9818792..fdddcb50e690 100644
--- a/secure/lib/libssl/man/SSL_get_psk_identity.3
+++ b/secure/lib/libssl/man/SSL_get_psk_identity.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_psk_identity 3"
-.TH SSL_get_psk_identity 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_psk_identity 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_rbio.3 b/secure/lib/libssl/man/SSL_get_rbio.3
index 34f5c886e7d1..073f5e49fc3c 100644
--- a/secure/lib/libssl/man/SSL_get_rbio.3
+++ b/secure/lib/libssl/man/SSL_get_rbio.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_rbio 3"
-.TH SSL_get_rbio 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_rbio 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_session.3 b/secure/lib/libssl/man/SSL_get_session.3
index b8b14abcc4e0..38332dedd029 100644
--- a/secure/lib/libssl/man/SSL_get_session.3
+++ b/secure/lib/libssl/man/SSL_get_session.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_session 3"
-.TH SSL_get_session 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_session 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_verify_result.3 b/secure/lib/libssl/man/SSL_get_verify_result.3
index c31cbe7fdb19..51ac504d9c3c 100644
--- a/secure/lib/libssl/man/SSL_get_verify_result.3
+++ b/secure/lib/libssl/man/SSL_get_verify_result.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_verify_result 3"
-.TH SSL_get_verify_result 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_verify_result 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_get_version.3 b/secure/lib/libssl/man/SSL_get_version.3
index b0789e469a14..b0ccef64227d 100644
--- a/secure/lib/libssl/man/SSL_get_version.3
+++ b/secure/lib/libssl/man/SSL_get_version.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_get_version 3"
-.TH SSL_get_version 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_get_version 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -140,11 +140,11 @@ SSL_get_version \- get the protocol version of a connection.
 .Ve
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
-\&\fISSL_get_cipher_version()\fR returns the name of the protocol used for the
+\&\fISSL_get_version()\fR returns the name of the protocol used for the
 connection \fBssl\fR.
 .SH "RETURN VALUES"
 .IX Header "RETURN VALUES"
-The following strings can occur:
+The following strings can be returned:
 .IP "SSLv2" 4
 .IX Item "SSLv2"
 The connection uses the SSLv2 protocol.
@@ -153,7 +153,13 @@ The connection uses the SSLv2 protocol.
 The connection uses the SSLv3 protocol.
 .IP "TLSv1" 4
 .IX Item "TLSv1"
-The connection uses the TLSv1 protocol.
+The connection uses the TLSv1.0 protocol.
+.IP "TLSv1.1" 4
+.IX Item "TLSv1.1"
+The connection uses the TLSv1.1 protocol.
+.IP "TLSv1.2" 4
+.IX Item "TLSv1.2"
+The connection uses the TLSv1.2 protocol.
 .IP "unknown" 4
 .IX Item "unknown"
 This indicates that no version has been set (no connection established).
diff --git a/secure/lib/libssl/man/SSL_library_init.3 b/secure/lib/libssl/man/SSL_library_init.3
index 80b04c1da50f..3fa07d1b144b 100644
--- a/secure/lib/libssl/man/SSL_library_init.3
+++ b/secure/lib/libssl/man/SSL_library_init.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_library_init 3"
-.TH SSL_library_init 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_library_init 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_load_client_CA_file.3 b/secure/lib/libssl/man/SSL_load_client_CA_file.3
index 06baac98ed0d..aa7080962e9d 100644
--- a/secure/lib/libssl/man/SSL_load_client_CA_file.3
+++ b/secure/lib/libssl/man/SSL_load_client_CA_file.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_load_client_CA_file 3"
-.TH SSL_load_client_CA_file 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_load_client_CA_file 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_new.3 b/secure/lib/libssl/man/SSL_new.3
index f3daedd20b9b..38fd2124ad9b 100644
--- a/secure/lib/libssl/man/SSL_new.3
+++ b/secure/lib/libssl/man/SSL_new.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_new 3"
-.TH SSL_new 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_new 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_pending.3 b/secure/lib/libssl/man/SSL_pending.3
index d4bc050fb4e3..65ad1866f94f 100644
--- a/secure/lib/libssl/man/SSL_pending.3
+++ b/secure/lib/libssl/man/SSL_pending.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_pending 3"
-.TH SSL_pending 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_pending 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_read.3 b/secure/lib/libssl/man/SSL_read.3
index 6411d54e8f0c..cdd8d2087c15 100644
--- a/secure/lib/libssl/man/SSL_read.3
+++ b/secure/lib/libssl/man/SSL_read.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_read 3"
-.TH SSL_read 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_read 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_rstate_string.3 b/secure/lib/libssl/man/SSL_rstate_string.3
index 7235fd413d58..4c6523e18dbe 100644
--- a/secure/lib/libssl/man/SSL_rstate_string.3
+++ b/secure/lib/libssl/man/SSL_rstate_string.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_rstate_string 3"
-.TH SSL_rstate_string 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_rstate_string 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_session_reused.3 b/secure/lib/libssl/man/SSL_session_reused.3
index 8999288775ed..384c4ac45947 100644
--- a/secure/lib/libssl/man/SSL_session_reused.3
+++ b/secure/lib/libssl/man/SSL_session_reused.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_session_reused 3"
-.TH SSL_session_reused 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_session_reused 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_set_bio.3 b/secure/lib/libssl/man/SSL_set_bio.3
index bc2090cc94ea..32b959f2672f 100644
--- a/secure/lib/libssl/man/SSL_set_bio.3
+++ b/secure/lib/libssl/man/SSL_set_bio.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_set_bio 3"
-.TH SSL_set_bio 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_set_bio 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_set_connect_state.3 b/secure/lib/libssl/man/SSL_set_connect_state.3
index 8eb30ec7d95d..718ba26104cf 100644
--- a/secure/lib/libssl/man/SSL_set_connect_state.3
+++ b/secure/lib/libssl/man/SSL_set_connect_state.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_set_connect_state 3"
-.TH SSL_set_connect_state 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_set_connect_state 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_set_fd.3 b/secure/lib/libssl/man/SSL_set_fd.3
index 6b2b1380cdfa..d3e175623df1 100644
--- a/secure/lib/libssl/man/SSL_set_fd.3
+++ b/secure/lib/libssl/man/SSL_set_fd.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_set_fd 3"
-.TH SSL_set_fd 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_set_fd 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_set_session.3 b/secure/lib/libssl/man/SSL_set_session.3
index 1611fa557125..8a8bd10ba0db 100644
--- a/secure/lib/libssl/man/SSL_set_session.3
+++ b/secure/lib/libssl/man/SSL_set_session.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_set_session 3"
-.TH SSL_set_session 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_set_session 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_set_shutdown.3 b/secure/lib/libssl/man/SSL_set_shutdown.3
index 9f23b547e4a0..fcad1df62115 100644
--- a/secure/lib/libssl/man/SSL_set_shutdown.3
+++ b/secure/lib/libssl/man/SSL_set_shutdown.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_set_shutdown 3"
-.TH SSL_set_shutdown 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_set_shutdown 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_set_verify_result.3 b/secure/lib/libssl/man/SSL_set_verify_result.3
index b558d4ea5e27..fd19c3fb4b49 100644
--- a/secure/lib/libssl/man/SSL_set_verify_result.3
+++ b/secure/lib/libssl/man/SSL_set_verify_result.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_set_verify_result 3"
-.TH SSL_set_verify_result 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_set_verify_result 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_shutdown.3 b/secure/lib/libssl/man/SSL_shutdown.3
index dbec86da6273..e7cb7bdafdfa 100644
--- a/secure/lib/libssl/man/SSL_shutdown.3
+++ b/secure/lib/libssl/man/SSL_shutdown.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_shutdown 3"
-.TH SSL_shutdown 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_shutdown 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_state_string.3 b/secure/lib/libssl/man/SSL_state_string.3
index 4bd05adf0c81..2b16a8d0d5c9 100644
--- a/secure/lib/libssl/man/SSL_state_string.3
+++ b/secure/lib/libssl/man/SSL_state_string.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_state_string 3"
-.TH SSL_state_string 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_state_string 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_want.3 b/secure/lib/libssl/man/SSL_want.3
index cd7dfd2162ee..935007816177 100644
--- a/secure/lib/libssl/man/SSL_want.3
+++ b/secure/lib/libssl/man/SSL_want.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_want 3"
-.TH SSL_want 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_want 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/SSL_write.3 b/secure/lib/libssl/man/SSL_write.3
index cfaf21a05d3b..35ac546f8eda 100644
--- a/secure/lib/libssl/man/SSL_write.3
+++ b/secure/lib/libssl/man/SSL_write.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_write 3"
-.TH SSL_write 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SSL_write 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/lib/libssl/man/d2i_SSL_SESSION.3 b/secure/lib/libssl/man/d2i_SSL_SESSION.3
index 68eaa3c3fc35..2a4b2f63851b 100644
--- a/secure/lib/libssl/man/d2i_SSL_SESSION.3
+++ b/secure/lib/libssl/man/d2i_SSL_SESSION.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "d2i_SSL_SESSION 3"
-.TH d2i_SSL_SESSION 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH d2i_SSL_SESSION 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -175,6 +175,16 @@ known limit on the size of the created \s-1ASN1\s0 representation, so the necess
 amount of space should be obtained by first calling \fIi2d_SSL_SESSION()\fR with
 \&\fBpp=NULL\fR, and obtain the size needed, then allocate the memory and
 call \fIi2d_SSL_SESSION()\fR again.
+Note that this will advance the value contained in \fB*pp\fR so it is necessary
+to save a copy of the original allocation.
+For example:
+ int i,j;
+ char *p, *temp;
+ i = i2d_SSL_SESSION(sess, \s-1NULL\s0);
+ p = temp = malloc(i);
+ j = i2d_SSL_SESSION(sess, &temp);
+ assert(i == j);
+ assert(p+i == temp);
 .SH "RETURN VALUES"
 .IX Header "RETURN VALUES"
 \&\fId2i_SSL_SESSION()\fR returns a pointer to the newly allocated \s-1SSL_SESSION\s0
diff --git a/secure/lib/libssl/man/ssl.3 b/secure/lib/libssl/man/ssl.3
index 623022f67665..c5f83aee78c6 100644
--- a/secure/lib/libssl/man/ssl.3
+++ b/secure/lib/libssl/man/ssl.3
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ssl 3"
-.TH ssl 3 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ssl 3 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index eb788f6d0637..ebddba95f2fd 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -13,7 +13,7 @@ SRCS+=	roaming_dummy.c
 .endif
 
 DPADD=	${LIBSSH}
-LDADD=  -lssh
+LDADD=  ${LDSSH}
 USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index 668ad9e1b4f8..f248666baace 100644
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -9,7 +9,7 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 BINMODE=4555
 
 DPADD=	${LIBSSH}
-LDADD=	-lssh
+LDADD=	${LDSSH}
 USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile
index f3cf9029f4cc..b73416f25dd1 100644
--- a/secure/libexec/ssh-pkcs11-helper/Makefile
+++ b/secure/libexec/ssh-pkcs11-helper/Makefile
@@ -13,7 +13,7 @@ SRCS+=	roaming_dummy.c
 .endif
 
 DPADD=	${LIBSSH}
-LDADD=	-lssh
+LDADD=	${LDSSH}
 USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
diff --git a/secure/usr.bin/openssl/man/CA.pl.1 b/secure/usr.bin/openssl/man/CA.pl.1
index 12de6cf3f40c..e02c196e8a31 100644
--- a/secure/usr.bin/openssl/man/CA.pl.1
+++ b/secure/usr.bin/openssl/man/CA.pl.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CA.PL 1"
-.TH CA.PL 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CA.PL 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/asn1parse.1 b/secure/usr.bin/openssl/man/asn1parse.1
index 4925ca412a13..1119dfce2517 100644
--- a/secure/usr.bin/openssl/man/asn1parse.1
+++ b/secure/usr.bin/openssl/man/asn1parse.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ASN1PARSE 1"
-.TH ASN1PARSE 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ASN1PARSE 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -142,6 +142,8 @@ asn1parse \- ASN.1 parsing tool
 [\fB\-length number\fR]
 [\fB\-i\fR]
 [\fB\-oid filename\fR]
+[\fB\-dump\fR]
+[\fB\-dlimit num\fR]
 [\fB\-strparse offset\fR]
 [\fB\-genstr string\fR]
 [\fB\-genconf file\fR]
@@ -179,6 +181,12 @@ indents the output according to the \*(L"depth\*(R" of the structures.
 .IX Item "-oid filename"
 a file containing additional \s-1OBJECT\s0 IDENTIFIERs (OIDs). The format of this
 file is described in the \s-1NOTES\s0 section below.
+.IP "\fB\-dump\fR" 4
+.IX Item "-dump"
+dump unknown data in hex format.
+.IP "\fB\-dlimit num\fR" 4
+.IX Item "-dlimit num"
+like \fB\-dump\fR, but only the first \fBnum\fR bytes are output.
 .IP "\fB\-strparse offset\fR" 4
 .IX Item "-strparse offset"
 parse the contents octets of the \s-1ASN\s0.1 object starting at \fBoffset\fR. This
diff --git a/secure/usr.bin/openssl/man/ca.1 b/secure/usr.bin/openssl/man/ca.1
index cd9990dafdce..17f2b8ffc25a 100644
--- a/secure/usr.bin/openssl/man/ca.1
+++ b/secure/usr.bin/openssl/man/ca.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CA 1"
-.TH CA 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CA 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -139,6 +139,8 @@ ca \- sample minimal CA application
 [\fB\-name section\fR]
 [\fB\-gencrl\fR]
 [\fB\-revoke file\fR]
+[\fB\-status serial\fR]
+[\fB\-updatedb\fR]
 [\fB\-crl_reason reason\fR]
 [\fB\-crl_hold instruction\fR]
 [\fB\-crl_compromise time\fR]
@@ -152,6 +154,7 @@ ca \- sample minimal CA application
 [\fB\-md arg\fR]
 [\fB\-policy arg\fR]
 [\fB\-keyfile arg\fR]
+[\fB\-keyform PEM|DER\fR]
 [\fB\-key arg\fR]
 [\fB\-passin arg\fR]
 [\fB\-cert file\fR]
@@ -201,7 +204,7 @@ a single self signed certificate to be signed by the \s-1CA\s0.
 .IX Item "-spkac filename"
 a file containing a single Netscape signed public key and challenge
 and additional field values to be signed by the \s-1CA\s0. See the \fB\s-1SPKAC\s0 \s-1FORMAT\s0\fR
-section for information on the required format.
+section for information on the required input and output format.
 .IP "\fB\-infiles\fR" 4
 .IX Item "-infiles"
 if present this should be the last option, all subsequent arguments
@@ -210,7 +213,7 @@ are assumed to be the names of files containing certificate requests.
 .IX Item "-out filename"
 the output file to output certificates to. The default is standard
 output. The certificate details will also be printed out to this
-file.
+file in \s-1PEM\s0 format (except that \fB\-spkac\fR outputs \s-1DER\s0 format).
 .IP "\fB\-outdir directory\fR" 4
 .IX Item "-outdir directory"
 the directory to output certificates to. The certificate will be
@@ -222,6 +225,10 @@ the \s-1CA\s0 certificate file.
 .IP "\fB\-keyfile filename\fR" 4
 .IX Item "-keyfile filename"
 the private key to sign requests with.
+.IP "\fB\-keyform PEM|DER\fR" 4
+.IX Item "-keyform PEM|DER"
+the format of the data in the private key file.
+The default is \s-1PEM\s0.
 .IP "\fB\-key password\fR" 4
 .IX Item "-key password"
 the password used to encrypt the private key. Since on some
@@ -351,6 +358,13 @@ the number of hours before the next \s-1CRL\s0 is due.
 .IP "\fB\-revoke filename\fR" 4
 .IX Item "-revoke filename"
 a filename containing a certificate to revoke.
+.IP "\fB\-status serial\fR" 4
+.IX Item "-status serial"
+displays the revocation status of the certificate with the specified
+serial number and exits.
+.IP "\fB\-updatedb\fR" 4
+.IX Item "-updatedb"
+Updates the database index to purge expired certificates.
 .IP "\fB\-crl_reason reason\fR" 4
 .IX Item "-crl_reason reason"
 revocation reason, where \fBreason\fR is one of: \fBunspecified\fR, \fBkeyCompromise\fR,
@@ -546,6 +560,10 @@ The file should contain the variable \s-1SPKAC\s0 set to the value of
 the \s-1SPKAC\s0 and also the required \s-1DN\s0 components as name value pairs.
 If you need to include the same component twice then it can be
 preceded by a number and a '.'.
+.PP
+When processing \s-1SPKAC\s0 format, the output is \s-1DER\s0 if the \fB\-out\fR
+flag is used, but \s-1PEM\s0 format if sending to stdout or the \fB\-outdir\fR
+flag is used.
 .SH "EXAMPLES"
 .IX Header "EXAMPLES"
 Note: these examples assume that the \fBca\fR directory structure is
diff --git a/secure/usr.bin/openssl/man/ciphers.1 b/secure/usr.bin/openssl/man/ciphers.1
index 74b67178c21b..46afe12c653f 100644
--- a/secure/usr.bin/openssl/man/ciphers.1
+++ b/secure/usr.bin/openssl/man/ciphers.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CIPHERS 1"
-.TH CIPHERS 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CIPHERS 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -158,7 +158,7 @@ in a cipher list; this is when similar ciphers are available for
 \&\s-1SSL\s0 v2 and for \s-1SSL\s0 v3/TLS v1.
 .IP "\fB\-V\fR" 4
 .IX Item "-V"
-Like \fB\-V\fR, but include cipher suite codes in output (hex format).
+Like \fB\-v\fR, but include cipher suite codes in output (hex format).
 .IP "\fB\-ssl3\fR" 4
 .IX Item "-ssl3"
 only include \s-1SSL\s0 v3 ciphers.
@@ -225,8 +225,8 @@ specified.
 .IP "\fB\s-1COMPLEMENTOFDEFAULT\s0\fR" 4
 .IX Item "COMPLEMENTOFDEFAULT"
 the ciphers included in \fB\s-1ALL\s0\fR, but not enabled by default. Currently
-this is \fB\s-1ADH\s0\fR. Note that this rule does not cover \fBeNULL\fR, which is
-not included by \fB\s-1ALL\s0\fR (use \fB\s-1COMPLEMENTOFALL\s0\fR if necessary).
+this is \fB\s-1ADH\s0\fR and \fB\s-1AECDH\s0\fR. Note that this rule does not cover \fBeNULL\fR,
+which is not included by \fB\s-1ALL\s0\fR (use \fB\s-1COMPLEMENTOFALL\s0\fR if necessary).
 .IP "\fB\s-1ALL\s0\fR" 4
 .IX Item "ALL"
 all cipher suites except the \fBeNULL\fR ciphers which must be explicitly enabled;
@@ -264,18 +264,47 @@ included.
 .IP "\fBaNULL\fR" 4
 .IX Item "aNULL"
 the cipher suites offering no authentication. This is currently the anonymous
-\&\s-1DH\s0 algorithms. These cipher suites are vulnerable to a \*(L"man in the middle\*(R"
-attack and so their use is normally discouraged.
+\&\s-1DH\s0 algorithms and anonymous \s-1ECDH\s0 algorithms. These cipher suites are vulnerable
+to a \*(L"man in the middle\*(R" attack and so their use is normally discouraged.
 .IP "\fBkRSA\fR, \fB\s-1RSA\s0\fR" 4
 .IX Item "kRSA, RSA"
 cipher suites using \s-1RSA\s0 key exchange.
+.IP "\fBkDHr\fR, \fBkDHd\fR, \fBkDH\fR" 4
+.IX Item "kDHr, kDHd, kDH"
+cipher suites using \s-1DH\s0 key agreement and \s-1DH\s0 certificates signed by CAs with \s-1RSA\s0
+and \s-1DSS\s0 keys or either respectively. Not implemented.
 .IP "\fBkEDH\fR" 4
 .IX Item "kEDH"
-cipher suites using ephemeral \s-1DH\s0 key agreement.
-.IP "\fBkDHr\fR, \fBkDHd\fR" 4
-.IX Item "kDHr, kDHd"
-cipher suites using \s-1DH\s0 key agreement and \s-1DH\s0 certificates signed by CAs with \s-1RSA\s0
-and \s-1DSS\s0 keys respectively. Not implemented.
+cipher suites using ephemeral \s-1DH\s0 key agreement, including anonymous cipher
+suites.
+.IP "\fB\s-1EDH\s0\fR" 4
+.IX Item "EDH"
+cipher suites using authenticated ephemeral \s-1DH\s0 key agreement.
+.IP "\fB\s-1ADH\s0\fR" 4
+.IX Item "ADH"
+anonymous \s-1DH\s0 cipher suites, note that this does not include anonymous Elliptic
+Curve \s-1DH\s0 (\s-1ECDH\s0) cipher suites.
+.IP "\fB\s-1DH\s0\fR" 4
+.IX Item "DH"
+cipher suites using \s-1DH\s0, including anonymous \s-1DH\s0, ephemeral \s-1DH\s0 and fixed \s-1DH\s0.
+.IP "\fBkECDHr\fR, \fBkECDHe\fR, \fBkECDH\fR" 4
+.IX Item "kECDHr, kECDHe, kECDH"
+cipher suites using fixed \s-1ECDH\s0 key agreement signed by CAs with \s-1RSA\s0 and \s-1ECDSA\s0
+keys or either respectively.
+.IP "\fBkEECDH\fR" 4
+.IX Item "kEECDH"
+cipher suites using ephemeral \s-1ECDH\s0 key agreement, including anonymous
+cipher suites.
+.IP "\fB\s-1EECDHE\s0\fR" 4
+.IX Item "EECDHE"
+cipher suites using authenticated ephemeral \s-1ECDH\s0 key agreement.
+.IP "\fB\s-1AECDH\s0\fR" 4
+.IX Item "AECDH"
+anonymous Elliptic Curve Diffie Hellman cipher suites.
+.IP "\fB\s-1ECDH\s0\fR" 4
+.IX Item "ECDH"
+cipher suites using \s-1ECDH\s0 key exchange, including anonymous, ephemeral and
+fixed \s-1ECDH\s0.
 .IP "\fBaRSA\fR" 4
 .IX Item "aRSA"
 cipher suites using \s-1RSA\s0 authentication, i.e. the certificates carry \s-1RSA\s0 keys.
@@ -286,25 +315,33 @@ cipher suites using \s-1DSS\s0 authentication, i.e. the certificates carry \s-1D
 .IX Item "aDH"
 cipher suites effectively using \s-1DH\s0 authentication, i.e. the certificates carry
 \&\s-1DH\s0 keys.  Not implemented.
+.IP "\fBaECDH\fR" 4
+.IX Item "aECDH"
+cipher suites effectively using \s-1ECDH\s0 authentication, i.e. the certificates
+carry \s-1ECDH\s0 keys.
+.IP "\fBaECDSA\fR, \fB\s-1ECDSA\s0\fR" 4
+.IX Item "aECDSA, ECDSA"
+cipher suites using \s-1ECDSA\s0 authentication, i.e. the certificates carry \s-1ECDSA\s0
+keys.
 .IP "\fBkFZA\fR, \fBaFZA\fR, \fBeFZA\fR, \fB\s-1FZA\s0\fR" 4
 .IX Item "kFZA, aFZA, eFZA, FZA"
 ciphers suites using \s-1FORTEZZA\s0 key exchange, authentication, encryption or all
 \&\s-1FORTEZZA\s0 algorithms. Not implemented.
-.IP "\fBTLSv1\fR, \fBSSLv3\fR, \fBSSLv2\fR" 4
-.IX Item "TLSv1, SSLv3, SSLv2"
-\&\s-1TLS\s0 v1.0, \s-1SSL\s0 v3.0 or \s-1SSL\s0 v2.0 cipher suites respectively.
-.IP "\fB\s-1DH\s0\fR" 4
-.IX Item "DH"
-cipher suites using \s-1DH\s0, including anonymous \s-1DH\s0.
-.IP "\fB\s-1ADH\s0\fR" 4
-.IX Item "ADH"
-anonymous \s-1DH\s0 cipher suites.
-.IP "\fB\s-1AES\s0\fR" 4
-.IX Item "AES"
-cipher suites using \s-1AES\s0.
-.IP "\fB\s-1CAMELLIA\s0\fR" 4
-.IX Item "CAMELLIA"
-cipher suites using Camellia.
+.IP "\fBTLSv1.2\fR, \fBTLSv1\fR, \fBSSLv3\fR, \fBSSLv2\fR" 4
+.IX Item "TLSv1.2, TLSv1, SSLv3, SSLv2"
+\&\s-1TLS\s0 v1.2, \s-1TLS\s0 v1.0, \s-1SSL\s0 v3.0 or \s-1SSL\s0 v2.0 cipher suites respectively. Note:
+there are no ciphersuites specific to \s-1TLS\s0 v1.1.
+.IP "\fB\s-1AES128\s0\fR, \fB\s-1AES256\s0\fR, \fB\s-1AES\s0\fR" 4
+.IX Item "AES128, AES256, AES"
+cipher suites using 128 bit \s-1AES\s0, 256 bit \s-1AES\s0 or either 128 or 256 bit \s-1AES\s0.
+.IP "\fB\s-1AESGCM\s0\fR" 4
+.IX Item "AESGCM"
+\&\s-1AES\s0 in Galois Counter Mode (\s-1GCM\s0): these ciphersuites are only supported
+in \s-1TLS\s0 v1.2.
+.IP "\fB\s-1CAMELLIA128\s0\fR, \fB\s-1CAMELLIA256\s0\fR, \fB\s-1CAMELLIA\s0\fR" 4
+.IX Item "CAMELLIA128, CAMELLIA256, CAMELLIA"
+cipher suites using 128 bit \s-1CAMELLIA\s0, 256 bit \s-1CAMELLIA\s0 or either 128 or 256 bit
+\&\s-1CAMELLIA\s0.
 .IP "\fB3DES\fR" 4
 .IX Item "3DES"
 cipher suites using triple \s-1DES\s0.
@@ -329,6 +366,9 @@ cipher suites using \s-1MD5\s0.
 .IP "\fB\s-1SHA1\s0\fR, \fB\s-1SHA\s0\fR" 4
 .IX Item "SHA1, SHA"
 cipher suites using \s-1SHA1\s0.
+.IP "\fB\s-1SHA256\s0\fR, \fB\s-1SHA384\s0\fR" 4
+.IX Item "SHA256, SHA384"
+ciphersuites using \s-1SHA256\s0 or \s-1SHA384\s0.
 .IP "\fBaGOST\fR" 4
 .IX Item "aGOST"
 cipher suites using \s-1GOST\s0 R 34.10 (either 2001 or 94) for authenticaction
@@ -349,6 +389,9 @@ cipher suites, using \s-1HMAC\s0 based on \s-1GOST\s0 R 34.11\-94.
 .IP "\fB\s-1GOST89MAC\s0\fR" 4
 .IX Item "GOST89MAC"
 cipher suites using \s-1GOST\s0 28147\-89 \s-1MAC\s0 \fBinstead of\fR \s-1HMAC\s0.
+.IP "\fB\s-1PSK\s0\fR" 4
+.IX Item "PSK"
+cipher suites using pre-shared keys (\s-1PSK\s0).
 .SH "CIPHER SUITE NAMES"
 .IX Header "CIPHER SUITE NAMES"
 The following lists give the \s-1SSL\s0 or \s-1TLS\s0 cipher suites names from the
@@ -498,8 +541,104 @@ Note: these ciphers can also be used in \s-1SSL\s0 v3.
 \& TLS_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA  EXP1024\-DHE\-DSS\-RC4\-SHA
 \& TLS_DHE_DSS_WITH_RC4_128_SHA            DHE\-DSS\-RC4\-SHA
 .Ve
-.SS "\s-1SSL\s0 v2.0 cipher suites."
-.IX Subsection "SSL v2.0 cipher suites."
+.SS "Elliptic curve cipher suites."
+.IX Subsection "Elliptic curve cipher suites."
+.Vb 5
+\& TLS_ECDH_RSA_WITH_NULL_SHA              ECDH\-RSA\-NULL\-SHA
+\& TLS_ECDH_RSA_WITH_RC4_128_SHA           ECDH\-RSA\-RC4\-SHA
+\& TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA      ECDH\-RSA\-DES\-CBC3\-SHA
+\& TLS_ECDH_RSA_WITH_AES_128_CBC_SHA       ECDH\-RSA\-AES128\-SHA
+\& TLS_ECDH_RSA_WITH_AES_256_CBC_SHA       ECDH\-RSA\-AES256\-SHA
+\&
+\& TLS_ECDH_ECDSA_WITH_NULL_SHA            ECDH\-ECDSA\-NULL\-SHA
+\& TLS_ECDH_ECDSA_WITH_RC4_128_SHA         ECDH\-ECDSA\-RC4\-SHA
+\& TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA    ECDH\-ECDSA\-DES\-CBC3\-SHA
+\& TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA     ECDH\-ECDSA\-AES128\-SHA
+\& TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA     ECDH\-ECDSA\-AES256\-SHA
+\&
+\& TLS_ECDHE_RSA_WITH_NULL_SHA             ECDHE\-RSA\-NULL\-SHA
+\& TLS_ECDHE_RSA_WITH_RC4_128_SHA          ECDHE\-RSA\-RC4\-SHA
+\& TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA     ECDHE\-RSA\-DES\-CBC3\-SHA
+\& TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA      ECDHE\-RSA\-AES128\-SHA
+\& TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA      ECDHE\-RSA\-AES256\-SHA
+\&
+\& TLS_ECDHE_ECDSA_WITH_NULL_SHA           ECDHE\-ECDSA\-NULL\-SHA
+\& TLS_ECDHE_ECDSA_WITH_RC4_128_SHA        ECDHE\-ECDSA\-RC4\-SHA
+\& TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA   ECDHE\-ECDSA\-DES\-CBC3\-SHA
+\& TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA    ECDHE\-ECDSA\-AES128\-SHA
+\& TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA    ECDHE\-ECDSA\-AES256\-SHA
+\&
+\& TLS_ECDH_anon_WITH_NULL_SHA             AECDH\-NULL\-SHA
+\& TLS_ECDH_anon_WITH_RC4_128_SHA          AECDH\-RC4\-SHA
+\& TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA     AECDH\-DES\-CBC3\-SHA
+\& TLS_ECDH_anon_WITH_AES_128_CBC_SHA      AECDH\-AES128\-SHA
+\& TLS_ECDH_anon_WITH_AES_256_CBC_SHA      AECDH\-AES256\-SHA
+.Ve
+.SS "\s-1TLS\s0 v1.2 cipher suites"
+.IX Subsection "TLS v1.2 cipher suites"
+.Vb 1
+\& TLS_RSA_WITH_NULL_SHA256                  NULL\-SHA256
+\&
+\& TLS_RSA_WITH_AES_128_CBC_SHA256           AES128\-SHA256
+\& TLS_RSA_WITH_AES_256_CBC_SHA256           AES256\-SHA256
+\& TLS_RSA_WITH_AES_128_GCM_SHA256           AES128\-GCM\-SHA256
+\& TLS_RSA_WITH_AES_256_GCM_SHA384           AES256\-GCM\-SHA384
+\&
+\& TLS_DH_RSA_WITH_AES_128_CBC_SHA256        Not implemented.
+\& TLS_DH_RSA_WITH_AES_256_CBC_SHA256        Not implemented.
+\& TLS_DH_RSA_WITH_AES_128_GCM_SHA256        Not implemented.
+\& TLS_DH_RSA_WITH_AES_256_GCM_SHA384        Not implemented.
+\&
+\& TLS_DH_DSS_WITH_AES_128_CBC_SHA256        Not implemented.
+\& TLS_DH_DSS_WITH_AES_256_CBC_SHA256        Not implemented.
+\& TLS_DH_DSS_WITH_AES_128_GCM_SHA256        Not implemented.
+\& TLS_DH_DSS_WITH_AES_256_GCM_SHA384        Not implemented.
+\&
+\& TLS_DHE_RSA_WITH_AES_128_CBC_SHA256       DHE\-RSA\-AES128\-SHA256
+\& TLS_DHE_RSA_WITH_AES_256_CBC_SHA256       DHE\-RSA\-AES256\-SHA256
+\& TLS_DHE_RSA_WITH_AES_128_GCM_SHA256       DHE\-RSA\-AES128\-GCM\-SHA256
+\& TLS_DHE_RSA_WITH_AES_256_GCM_SHA384       DHE\-RSA\-AES256\-GCM\-SHA384
+\&
+\& TLS_DHE_DSS_WITH_AES_128_CBC_SHA256       DHE\-DSS\-AES128\-SHA256
+\& TLS_DHE_DSS_WITH_AES_256_CBC_SHA256       DHE\-DSS\-AES256\-SHA256
+\& TLS_DHE_DSS_WITH_AES_128_GCM_SHA256       DHE\-DSS\-AES128\-GCM\-SHA256
+\& TLS_DHE_DSS_WITH_AES_256_GCM_SHA384       DHE\-DSS\-AES256\-GCM\-SHA384
+\&
+\& TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256      ECDH\-RSA\-AES128\-SHA256
+\& TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384      ECDH\-RSA\-AES256\-SHA384
+\& TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256      ECDH\-RSA\-AES128\-GCM\-SHA256
+\& TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384      ECDH\-RSA\-AES256\-GCM\-SHA384
+\&
+\& TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256    ECDH\-ECDSA\-AES128\-SHA256
+\& TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384    ECDH\-ECDSA\-AES256\-SHA384
+\& TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256    ECDH\-ECDSA\-AES128\-GCM\-SHA256
+\& TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384    ECDH\-ECDSA\-AES256\-GCM\-SHA384
+\&
+\& TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256     ECDHE\-RSA\-AES128\-SHA256
+\& TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384     ECDHE\-RSA\-AES256\-SHA384
+\& TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256     ECDHE\-RSA\-AES128\-GCM\-SHA256
+\& TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384     ECDHE\-RSA\-AES256\-GCM\-SHA384
+\&
+\& TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256   ECDHE\-ECDSA\-AES128\-SHA256
+\& TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384   ECDHE\-ECDSA\-AES256\-SHA384
+\& TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256   ECDHE\-ECDSA\-AES128\-GCM\-SHA256
+\& TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384   ECDHE\-ECDSA\-AES256\-GCM\-SHA384
+\&
+\& TLS_DH_anon_WITH_AES_128_CBC_SHA256       ADH\-AES128\-SHA256
+\& TLS_DH_anon_WITH_AES_256_CBC_SHA256       ADH\-AES256\-SHA256
+\& TLS_DH_anon_WITH_AES_128_GCM_SHA256       ADH\-AES128\-GCM\-SHA256
+\& TLS_DH_anon_WITH_AES_256_GCM_SHA384       ADH\-AES256\-GCM\-SHA384
+.Ve
+.SS "Pre shared keying (\s-1PSK\s0) cipheruites"
+.IX Subsection "Pre shared keying (PSK) cipheruites"
+.Vb 4
+\& TLS_PSK_WITH_RC4_128_SHA                  PSK\-RC4\-SHA
+\& TLS_PSK_WITH_3DES_EDE_CBC_SHA             PSK\-3DES\-EDE\-CBC\-SHA
+\& TLS_PSK_WITH_AES_128_CBC_SHA              PSK\-AES128\-CBC\-SHA
+\& TLS_PSK_WITH_AES_256_CBC_SHA              PSK\-AES256\-CBC\-SHA
+.Ve
+.SS "Deprecated \s-1SSL\s0 v2.0 cipher suites."
+.IX Subsection "Deprecated SSL v2.0 cipher suites."
 .Vb 7
 \& SSL_CK_RC4_128_WITH_MD5                 RC4\-MD5
 \& SSL_CK_RC4_128_EXPORT40_WITH_MD5        EXP\-RC4\-MD5
@@ -531,6 +670,13 @@ strength:
 \& openssl ciphers \-v \*(AqALL:!ADH:@STRENGTH\*(Aq
 .Ve
 .PP
+Include all ciphers except ones with no encryption (eNULL) or no
+authentication (aNULL):
+.PP
+.Vb 1
+\& openssl ciphers \-v \*(AqALL:!aNULL\*(Aq
+.Ve
+.PP
 Include only 3DES ciphers and then place \s-1RSA\s0 ciphers last:
 .PP
 .Vb 1
diff --git a/secure/usr.bin/openssl/man/cms.1 b/secure/usr.bin/openssl/man/cms.1
index d77ae2800d97..c86144c97b85 100644
--- a/secure/usr.bin/openssl/man/cms.1
+++ b/secure/usr.bin/openssl/man/cms.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CMS 1"
-.TH CMS 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CMS 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -252,7 +252,7 @@ compiled with \fBzlib\fR support for this option to work, otherwise it will
 output an error.
 .IP "\fB\-EncryptedData_encrypt\fR" 4
 .IX Item "-EncryptedData_encrypt"
-Encrypt suppled content using supplied symmetric key and algorithm using a \s-1CMS\s0
+Encrypt content using supplied symmetric key and algorithm using a \s-1CMS\s0
 \&\fBEncrytedData\fR type and output the content.
 .IP "\fB\-sign_receipt\fR" 4
 .IX Item "-sign_receipt"
diff --git a/secure/usr.bin/openssl/man/crl.1 b/secure/usr.bin/openssl/man/crl.1
index f902d90881fb..3f3db944a502 100644
--- a/secure/usr.bin/openssl/man/crl.1
+++ b/secure/usr.bin/openssl/man/crl.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CRL 1"
-.TH CRL 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CRL 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -139,6 +139,7 @@ crl \- CRL utility
 [\fB\-text\fR]
 [\fB\-in filename\fR]
 [\fB\-out filename\fR]
+[\fB\-nameopt option\fR]
 [\fB\-noout\fR]
 [\fB\-hash\fR]
 [\fB\-issuer\fR]
@@ -171,6 +172,10 @@ default.
 .IP "\fB\-text\fR" 4
 .IX Item "-text"
 print out the \s-1CRL\s0 in text form.
+.IP "\fB\-nameopt option\fR" 4
+.IX Item "-nameopt option"
+option which determines how the subject or issuer names are displayed. See
+the description of \fB\-nameopt\fR in \fIx509\fR\|(1).
 .IP "\fB\-noout\fR" 4
 .IX Item "-noout"
 don't output the encoded version of the \s-1CRL\s0.
diff --git a/secure/usr.bin/openssl/man/crl2pkcs7.1 b/secure/usr.bin/openssl/man/crl2pkcs7.1
index 880d2a837c87..acb441a07aac 100644
--- a/secure/usr.bin/openssl/man/crl2pkcs7.1
+++ b/secure/usr.bin/openssl/man/crl2pkcs7.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CRL2PKCS7 1"
-.TH CRL2PKCS7 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH CRL2PKCS7 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/dgst.1 b/secure/usr.bin/openssl/man/dgst.1
index 93b40263eb24..6f6068b17a9f 100644
--- a/secure/usr.bin/openssl/man/dgst.1
+++ b/secure/usr.bin/openssl/man/dgst.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DGST 1"
-.TH DGST 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DGST 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/dhparam.1 b/secure/usr.bin/openssl/man/dhparam.1
index 35d7117965b9..1271ee47da5f 100644
--- a/secure/usr.bin/openssl/man/dhparam.1
+++ b/secure/usr.bin/openssl/man/dhparam.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DHPARAM 1"
-.TH DHPARAM 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DHPARAM 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -139,6 +139,7 @@ dhparam \- DH parameter manipulation and generation
 [\fB\-in\fR \fIfilename\fR]
 [\fB\-out\fR \fIfilename\fR]
 [\fB\-dsaparam\fR]
+[\fB\-check\fR]
 [\fB\-noout\fR]
 [\fB\-text\fR]
 [\fB\-C\fR]
@@ -182,6 +183,9 @@ and the recommended exponent length is shorter, which makes \s-1DH\s0 key
 exchange more efficient.  Beware that with such DSA-style \s-1DH\s0
 parameters, a fresh \s-1DH\s0 key should be created for each use to
 avoid small-subgroup attacks that may be possible otherwise.
+.IP "\fB\-check\fR" 4
+.IX Item "-check"
+check if the parameters are valid primes and generator.
 .IP "\fB\-2\fR, \fB\-5\fR" 4
 .IX Item "-2, -5"
 The generator to use, either 2 or 5. 2 is the default. If present then the
diff --git a/secure/usr.bin/openssl/man/dsa.1 b/secure/usr.bin/openssl/man/dsa.1
index e2f43f9d31ab..d2b81c0feded 100644
--- a/secure/usr.bin/openssl/man/dsa.1
+++ b/secure/usr.bin/openssl/man/dsa.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSA 1"
-.TH DSA 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DSA 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -140,6 +140,12 @@ dsa \- DSA key processing
 [\fB\-passin arg\fR]
 [\fB\-out filename\fR]
 [\fB\-passout arg\fR]
+[\fB\-aes128\fR]
+[\fB\-aes192\fR]
+[\fB\-aes256\fR]
+[\fB\-camellia128\fR]
+[\fB\-camellia192\fR]
+[\fB\-camellia256\fR]
 [\fB\-des\fR]
 [\fB\-des3\fR]
 [\fB\-idea\fR]
@@ -191,10 +197,10 @@ filename.
 .IX Item "-passout arg"
 the output file password source. For more information about the format of \fBarg\fR
 see the \fB\s-1PASS\s0 \s-1PHRASE\s0 \s-1ARGUMENTS\s0\fR section in \fIopenssl\fR\|(1).
-.IP "\fB\-des|\-des3|\-idea\fR" 4
-.IX Item "-des|-des3|-idea"
-These options encrypt the private key with the \s-1DES\s0, triple \s-1DES\s0, or the 
-\&\s-1IDEA\s0 ciphers respectively before outputting it. A pass phrase is prompted for.
+.IP "\fB\-aes128|\-aes192|\-aes256|\-camellia128|\-camellia192|\-camellia256|\-des|\-des3|\-idea\fR" 4
+.IX Item "-aes128|-aes192|-aes256|-camellia128|-camellia192|-camellia256|-des|-des3|-idea"
+These options encrypt the private key with the specified
+cipher before outputting it. A pass phrase is prompted for.
 If none of these options is specified the key is written in plain text. This
 means that using the \fBdsa\fR utility to read in an encrypted key with no
 encryption option can be used to remove the pass phrase from a key, or by
diff --git a/secure/usr.bin/openssl/man/dsaparam.1 b/secure/usr.bin/openssl/man/dsaparam.1
index e1bab9dcd354..0ccead2da8bc 100644
--- a/secure/usr.bin/openssl/man/dsaparam.1
+++ b/secure/usr.bin/openssl/man/dsaparam.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "DSAPARAM 1"
-.TH DSAPARAM 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH DSAPARAM 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/ec.1 b/secure/usr.bin/openssl/man/ec.1
index 0c7ac21b1efe..637d8cac98a4 100644
--- a/secure/usr.bin/openssl/man/ec.1
+++ b/secure/usr.bin/openssl/man/ec.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EC 1"
-.TH EC 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH EC 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/ecparam.1 b/secure/usr.bin/openssl/man/ecparam.1
index f09eb4629db6..298278f7d2c4 100644
--- a/secure/usr.bin/openssl/man/ecparam.1
+++ b/secure/usr.bin/openssl/man/ecparam.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ECPARAM 1"
-.TH ECPARAM 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ECPARAM 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -143,7 +143,7 @@ ecparam \- EC parameter manipulation and generation
 [\fB\-C\fR]
 [\fB\-check\fR]
 [\fB\-name arg\fR]
-[\fB\-list_curve\fR]
+[\fB\-list_curves\fR]
 [\fB\-conv_form arg\fR]
 [\fB\-param_enc arg\fR]
 [\fB\-no_seed\fR]
diff --git a/secure/usr.bin/openssl/man/enc.1 b/secure/usr.bin/openssl/man/enc.1
index eb1902728e8a..3f3299d73f26 100644
--- a/secure/usr.bin/openssl/man/enc.1
+++ b/secure/usr.bin/openssl/man/enc.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ENC 1"
-.TH ENC 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ENC 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/errstr.1 b/secure/usr.bin/openssl/man/errstr.1
index e2bb048bf143..05c3739a4578 100644
--- a/secure/usr.bin/openssl/man/errstr.1
+++ b/secure/usr.bin/openssl/man/errstr.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "ERRSTR 1"
-.TH ERRSTR 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH ERRSTR 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/gendsa.1 b/secure/usr.bin/openssl/man/gendsa.1
index a1312785f9de..0d026a67db48 100644
--- a/secure/usr.bin/openssl/man/gendsa.1
+++ b/secure/usr.bin/openssl/man/gendsa.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GENDSA 1"
-.TH GENDSA 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH GENDSA 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -135,6 +135,12 @@ gendsa \- generate a DSA private key from a set of parameters
 .IX Header "SYNOPSIS"
 \&\fBopenssl\fR \fBgendsa\fR
 [\fB\-out filename\fR]
+[\fB\-aes128\fR]
+[\fB\-aes192\fR]
+[\fB\-aes256\fR]
+[\fB\-camellia128\fR]
+[\fB\-camellia192\fR]
+[\fB\-camellia256\fR]
 [\fB\-des\fR]
 [\fB\-des3\fR]
 [\fB\-idea\fR]
@@ -147,10 +153,10 @@ The \fBgendsa\fR command generates a \s-1DSA\s0 private key from a \s-1DSA\s0 pa
 (which will be typically generated by the \fBopenssl dsaparam\fR command).
 .SH "OPTIONS"
 .IX Header "OPTIONS"
-.IP "\fB\-des|\-des3|\-idea\fR" 4
-.IX Item "-des|-des3|-idea"
-These options encrypt the private key with the \s-1DES\s0, triple \s-1DES\s0, or the 
-\&\s-1IDEA\s0 ciphers respectively before outputting it. A pass phrase is prompted for.
+.IP "\fB\-aes128|\-aes192|\-aes256|\-camellia128|\-camellia192|\-camellia256|\-des|\-des3|\-idea\fR" 4
+.IX Item "-aes128|-aes192|-aes256|-camellia128|-camellia192|-camellia256|-des|-des3|-idea"
+These options encrypt the private key with specified
+cipher before outputting it. A pass phrase is prompted for.
 If none of these options is specified no encryption is used.
 .IP "\fB\-rand file(s)\fR" 4
 .IX Item "-rand file(s)"
diff --git a/secure/usr.bin/openssl/man/genpkey.1 b/secure/usr.bin/openssl/man/genpkey.1
index 5ebcd80389e1..80838a14c258 100644
--- a/secure/usr.bin/openssl/man/genpkey.1
+++ b/secure/usr.bin/openssl/man/genpkey.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GENPKEY 1"
-.TH GENPKEY 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH GENPKEY 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/genrsa.1 b/secure/usr.bin/openssl/man/genrsa.1
index 20dce213f596..0b63274f2ffa 100644
--- a/secure/usr.bin/openssl/man/genrsa.1
+++ b/secure/usr.bin/openssl/man/genrsa.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GENRSA 1"
-.TH GENRSA 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH GENRSA 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -136,6 +136,18 @@ genrsa \- generate an RSA private key
 \&\fBopenssl\fR \fBgenrsa\fR
 [\fB\-out filename\fR]
 [\fB\-passout arg\fR]
+[\fB\-aes128\fR]
+[\fB\-aes128\fR]
+[\fB\-aes192\fR]
+[\fB\-aes256\fR]
+[\fB\-camellia128\fR]
+[\fB\-camellia192\fR]
+[\fB\-camellia256\fR]
+[\fB\-aes192\fR]
+[\fB\-aes256\fR]
+[\fB\-camellia128\fR]
+[\fB\-camellia192\fR]
+[\fB\-camellia256\fR]
 [\fB\-des\fR]
 [\fB\-des3\fR]
 [\fB\-idea\fR]
@@ -157,10 +169,10 @@ used.
 .IX Item "-passout arg"
 the output file password source. For more information about the format of \fBarg\fR
 see the \fB\s-1PASS\s0 \s-1PHRASE\s0 \s-1ARGUMENTS\s0\fR section in \fIopenssl\fR\|(1).
-.IP "\fB\-des|\-des3|\-idea\fR" 4
-.IX Item "-des|-des3|-idea"
-These options encrypt the private key with the \s-1DES\s0, triple \s-1DES\s0, or the 
-\&\s-1IDEA\s0 ciphers respectively before outputting it. If none of these options is
+.IP "\fB\-aes128|\-aes192|\-aes256|\-camellia128|\-camellia192|\-camellia256|\-des|\-des3|\-idea\fR" 4
+.IX Item "-aes128|-aes192|-aes256|-camellia128|-camellia192|-camellia256|-des|-des3|-idea"
+These options encrypt the private key with specified
+cipher before outputting it. If none of these options is
 specified no encryption is used. If encryption is used a pass phrase is prompted
 for if it is not supplied via the \fB\-passout\fR argument.
 .IP "\fB\-F4|\-3\fR" 4
diff --git a/secure/usr.bin/openssl/man/nseq.1 b/secure/usr.bin/openssl/man/nseq.1
index 9aa88e6c8688..a1c91442173d 100644
--- a/secure/usr.bin/openssl/man/nseq.1
+++ b/secure/usr.bin/openssl/man/nseq.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "NSEQ 1"
-.TH NSEQ 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH NSEQ 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/ocsp.1 b/secure/usr.bin/openssl/man/ocsp.1
index 8225e971726b..89543d53c740 100644
--- a/secure/usr.bin/openssl/man/ocsp.1
+++ b/secure/usr.bin/openssl/man/ocsp.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OCSP 1"
-.TH OCSP 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH OCSP 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/openssl.1 b/secure/usr.bin/openssl/man/openssl.1
index 52e984a871c5..37a5fcbb7fc3 100644
--- a/secure/usr.bin/openssl/man/openssl.1
+++ b/secure/usr.bin/openssl/man/openssl.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "OPENSSL 1"
-.TH OPENSSL 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH OPENSSL 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/passwd.1 b/secure/usr.bin/openssl/man/passwd.1
index f9245851b4be..0e97a2460348 100644
--- a/secure/usr.bin/openssl/man/passwd.1
+++ b/secure/usr.bin/openssl/man/passwd.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PASSWD 1"
-.TH PASSWD 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PASSWD 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/pkcs12.1 b/secure/usr.bin/openssl/man/pkcs12.1
index d51abed889b1..2d0d998d6d5a 100644
--- a/secure/usr.bin/openssl/man/pkcs12.1
+++ b/secure/usr.bin/openssl/man/pkcs12.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS12 1"
-.TH PKCS12 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PKCS12 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/pkcs7.1 b/secure/usr.bin/openssl/man/pkcs7.1
index 7755980d69a0..cd08761b078f 100644
--- a/secure/usr.bin/openssl/man/pkcs7.1
+++ b/secure/usr.bin/openssl/man/pkcs7.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS7 1"
-.TH PKCS7 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PKCS7 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/pkcs8.1 b/secure/usr.bin/openssl/man/pkcs8.1
index 84747b7e1738..45c4d3354c37 100644
--- a/secure/usr.bin/openssl/man/pkcs8.1
+++ b/secure/usr.bin/openssl/man/pkcs8.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKCS8 1"
-.TH PKCS8 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PKCS8 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/pkey.1 b/secure/usr.bin/openssl/man/pkey.1
index a5d80d2eac6c..1de162af7c22 100644
--- a/secure/usr.bin/openssl/man/pkey.1
+++ b/secure/usr.bin/openssl/man/pkey.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKEY 1"
-.TH PKEY 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PKEY 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/pkeyparam.1 b/secure/usr.bin/openssl/man/pkeyparam.1
index f56ce5a27423..41b3cf834ee6 100644
--- a/secure/usr.bin/openssl/man/pkeyparam.1
+++ b/secure/usr.bin/openssl/man/pkeyparam.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKEYPARAM 1"
-.TH PKEYPARAM 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PKEYPARAM 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/pkeyutl.1 b/secure/usr.bin/openssl/man/pkeyutl.1
index dde13bb37532..7514c7e65e95 100644
--- a/secure/usr.bin/openssl/man/pkeyutl.1
+++ b/secure/usr.bin/openssl/man/pkeyutl.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PKEYUTL 1"
-.TH PKEYUTL 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH PKEYUTL 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/rand.1 b/secure/usr.bin/openssl/man/rand.1
index 6bbd75a92bd1..e0fbe0153ce8 100644
--- a/secure/usr.bin/openssl/man/rand.1
+++ b/secure/usr.bin/openssl/man/rand.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RAND 1"
-.TH RAND 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RAND 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/req.1 b/secure/usr.bin/openssl/man/req.1
index c70a78e52e9a..b6500de2e45a 100644
--- a/secure/usr.bin/openssl/man/req.1
+++ b/secure/usr.bin/openssl/man/req.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "REQ 1"
-.TH REQ 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH REQ 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/rsa.1 b/secure/usr.bin/openssl/man/rsa.1
index 55141b7d5cee..41eafa6762fe 100644
--- a/secure/usr.bin/openssl/man/rsa.1
+++ b/secure/usr.bin/openssl/man/rsa.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSA 1"
-.TH RSA 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSA 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -141,6 +141,12 @@ rsa \- RSA key processing tool
 [\fB\-out filename\fR]
 [\fB\-passout arg\fR]
 [\fB\-sgckey\fR]
+[\fB\-aes128\fR]
+[\fB\-aes192\fR]
+[\fB\-aes256\fR]
+[\fB\-camellia128\fR]
+[\fB\-camellia192\fR]
+[\fB\-camellia256\fR]
 [\fB\-des\fR]
 [\fB\-des3\fR]
 [\fB\-idea\fR]
@@ -197,10 +203,10 @@ see the \fB\s-1PASS\s0 \s-1PHRASE\s0 \s-1ARGUMENTS\s0\fR section in \fIopenssl\f
 .IX Item "-sgckey"
 use the modified \s-1NET\s0 algorithm used with some versions of Microsoft \s-1IIS\s0 and \s-1SGC\s0
 keys.
-.IP "\fB\-des|\-des3|\-idea\fR" 4
-.IX Item "-des|-des3|-idea"
-These options encrypt the private key with the \s-1DES\s0, triple \s-1DES\s0, or the 
-\&\s-1IDEA\s0 ciphers respectively before outputting it. A pass phrase is prompted for.
+.IP "\fB\-aes128|\-aes192|\-aes256|\-camellia128|\-camellia192|\-camellia256|\-des|\-des3|\-idea\fR" 4
+.IX Item "-aes128|-aes192|-aes256|-camellia128|-camellia192|-camellia256|-des|-des3|-idea"
+These options encrypt the private key with the specified
+cipher before outputting it. A pass phrase is prompted for.
 If none of these options is specified the key is written in plain text. This
 means that using the \fBrsa\fR utility to read in an encrypted key with no
 encryption option can be used to remove the pass phrase from a key, or by
diff --git a/secure/usr.bin/openssl/man/rsautl.1 b/secure/usr.bin/openssl/man/rsautl.1
index c09e4729241a..3cfe92aa3067 100644
--- a/secure/usr.bin/openssl/man/rsautl.1
+++ b/secure/usr.bin/openssl/man/rsautl.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RSAUTL 1"
-.TH RSAUTL 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH RSAUTL 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/s_client.1 b/secure/usr.bin/openssl/man/s_client.1
index 8473cc1581a0..2e99fb29affb 100644
--- a/secure/usr.bin/openssl/man/s_client.1
+++ b/secure/usr.bin/openssl/man/s_client.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "S_CLIENT 1"
-.TH S_CLIENT 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH S_CLIENT 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -135,6 +135,7 @@ s_client \- SSL/TLS client program
 .IX Header "SYNOPSIS"
 \&\fBopenssl\fR \fBs_client\fR
 [\fB\-connect host:port\fR]
+[\fB\-servername name\fR]
 [\fB\-verify depth\fR]
 [\fB\-verify_return_error\fR]
 [\fB\-cert filename\fR]
@@ -154,6 +155,7 @@ s_client \- SSL/TLS client program
 [\fB\-nbio\fR]
 [\fB\-crlf\fR]
 [\fB\-ign_eof\fR]
+[\fB\-no_ign_eof\fR]
 [\fB\-quiet\fR]
 [\fB\-ssl2\fR]
 [\fB\-ssl3\fR]
@@ -163,6 +165,7 @@ s_client \- SSL/TLS client program
 [\fB\-no_tls1\fR]
 [\fB\-bugs\fR]
 [\fB\-cipher cipherlist\fR]
+[\fB\-serverpref\fR]
 [\fB\-starttls protocol\fR]
 [\fB\-engine id\fR]
 [\fB\-tlsextdebug\fR]
@@ -170,6 +173,8 @@ s_client \- SSL/TLS client program
 [\fB\-sess_out filename\fR]
 [\fB\-sess_in filename\fR]
 [\fB\-rand file(s)\fR]
+[\fB\-status\fR]
+[\fB\-nextprotoneg protocols\fR]
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 The \fBs_client\fR command implements a generic \s-1SSL/TLS\s0 client which connects
@@ -181,6 +186,9 @@ to a remote host using \s-1SSL/TLS\s0. It is a \fIvery\fR useful diagnostic tool
 .IX Item "-connect host:port"
 This specifies the host and optional port to connect to. If not specified
 then an attempt is made to connect to the local host on port 4433.
+.IP "\fB\-servername name\fR" 4
+.IX Item "-servername name"
+Set the \s-1TLS\s0 \s-1SNI\s0 (Server Name Indication) extension in the ClientHello message.
 .IP "\fB\-cert certname\fR" 4
 .IX Item "-cert certname"
 The certificate to use, if one is requested by the server. The default is
@@ -271,6 +279,10 @@ input.
 .IX Item "-quiet"
 inhibit printing of session and certificate information.  This implicitly
 turns on \fB\-ign_eof\fR as well.
+.IP "\fB\-no_ign_eof\fR" 4
+.IX Item "-no_ign_eof"
+shut down the connection when end of file is reached in the input.
+Can be used to override the implicit \fB\-ign_eof\fR after \fB\-quiet\fR.
 .IP "\fB\-psk_identity identity\fR" 4
 .IX Item "-psk_identity identity"
 Use the \s-1PSK\s0 identity \fBidentity\fR when using a \s-1PSK\s0 cipher suite.
@@ -299,6 +311,9 @@ this allows the cipher list sent by the client to be modified. Although
 the server determines which cipher suite is used it should take the first
 supported cipher in the list sent by the client. See the \fBciphers\fR
 command for more information.
+.IP "\fB\-serverpref\fR" 4
+.IX Item "-serverpref"
+use the server's cipher preferences; only used for \s-1SSLV2\s0.
 .IP "\fB\-starttls protocol\fR" 4
 .IX Item "-starttls protocol"
 send the protocol-specific message(s) to switch to \s-1TLS\s0 for communication.
@@ -330,6 +345,20 @@ generator, or an \s-1EGD\s0 socket (see \fIRAND_egd\fR\|(3)).
 Multiple files can be specified separated by a OS-dependent character.
 The separator is \fB;\fR for MS-Windows, \fB,\fR for OpenVMS, and \fB:\fR for
 all others.
+.IP "\fB\-status\fR" 4
+.IX Item "-status"
+sends a certificate status request to the server (\s-1OCSP\s0 stapling). The server
+response (if any) is printed out.
+.IP "\fB\-nextprotoneg protocols\fR" 4
+.IX Item "-nextprotoneg protocols"
+enable Next Protocol Negotiation \s-1TLS\s0 extension and provide a list of
+comma-separated protocol names that the client should advertise
+support for. The list should contain most wanted protocols first.
+Protocol names are printable \s-1ASCII\s0 strings, for example \*(L"http/1.1\*(R" or
+\&\*(L"spdy/3\*(R".
+Empty list of protocols is treated specially and will cause the client to
+advertise support for the \s-1TLS\s0 extension but disconnect just after
+reciving ServerHello with a list of server supported protocols.
 .SH "CONNECTED COMMANDS"
 .IX Header "CONNECTED COMMANDS"
 If a connection is established with an \s-1SSL\s0 server then any data received
diff --git a/secure/usr.bin/openssl/man/s_server.1 b/secure/usr.bin/openssl/man/s_server.1
index b81481df0364..aad3a54c3a46 100644
--- a/secure/usr.bin/openssl/man/s_server.1
+++ b/secure/usr.bin/openssl/man/s_server.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "S_SERVER 1"
-.TH S_SERVER 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH S_SERVER 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -161,6 +161,7 @@ s_server \- SSL/TLS server program
 [\fB\-CAfile filename\fR]
 [\fB\-nocert\fR]
 [\fB\-cipher cipherlist\fR]
+[\fB\-serverpref\fR]
 [\fB\-quiet\fR]
 [\fB\-no_tmp_rsa\fR]
 [\fB\-ssl2\fR]
@@ -181,6 +182,11 @@ s_server \- SSL/TLS server program
 [\fB\-no_ticket\fR]
 [\fB\-id_prefix arg\fR]
 [\fB\-rand file(s)\fR]
+[\fB\-status\fR]
+[\fB\-status_verbose\fR]
+[\fB\-status_timeout nsec\fR]
+[\fB\-status_url url\fR]
+[\fB\-nextprotoneg protocols\fR]
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 The \fBs_server\fR command implements a generic \s-1SSL/TLS\s0 server which listens
@@ -257,6 +263,9 @@ client certificate chain and makes the server request a certificate from
 the client. With the \fB\-verify\fR option a certificate is requested but the
 client does not have to send one, with the \fB\-Verify\fR option the client
 must supply a certificate or an error occurs.
+.Sp
+If the ciphersuite cannot request a client certificate (for example an
+anonymous ciphersuite or \s-1PSK\s0) this option has no effect.
 .IP "\fB\-crl_check\fR, \fB\-crl_check_all\fR" 4
 .IX Item "-crl_check, -crl_check_all"
 Check the peer certificate has not been revoked by its \s-1CA\s0.
@@ -322,6 +331,9 @@ the client sends a list of supported ciphers the first client cipher
 also included in the server list is used. Because the client specifies
 the preference order, the order of the server cipherlist irrelevant. See
 the \fBciphers\fR command for more information.
+.IP "\fB\-serverpref\fR" 4
+.IX Item "-serverpref"
+use the server's cipher preferences, rather than the client's preferences.
 .IP "\fB\-tlsextdebug\fR" 4
 .IX Item "-tlsextdebug"
 print out a hex dump of any \s-1TLS\s0 extensions received from the server.
@@ -365,6 +377,28 @@ generator, or an \s-1EGD\s0 socket (see \fIRAND_egd\fR\|(3)).
 Multiple files can be specified separated by a OS-dependent character.
 The separator is \fB;\fR for MS-Windows, \fB,\fR for OpenVMS, and \fB:\fR for
 all others.
+.IP "\fB\-status\fR" 4
+.IX Item "-status"
+enables certificate status request support (aka \s-1OCSP\s0 stapling).
+.IP "\fB\-status_verbose\fR" 4
+.IX Item "-status_verbose"
+enables certificate status request support (aka \s-1OCSP\s0 stapling) and gives
+a verbose printout of the \s-1OCSP\s0 response.
+.IP "\fB\-status_timeout nsec\fR" 4
+.IX Item "-status_timeout nsec"
+sets the timeout for \s-1OCSP\s0 response to \fBnsec\fR seconds.
+.IP "\fB\-status_url url\fR" 4
+.IX Item "-status_url url"
+sets a fallback responder \s-1URL\s0 to use if no responder \s-1URL\s0 is present in the
+server certificate. Without this option an error is returned if the server
+certificate does not contain a responder address.
+.IP "\fB\-nextprotoneg protocols\fR" 4
+.IX Item "-nextprotoneg protocols"
+enable Next Protocol Negotiation \s-1TLS\s0 extension and provide a
+comma-separated list of supported protocol names.
+The list should contain most wanted protocols first.
+Protocol names are printable \s-1ASCII\s0 strings, for example \*(L"http/1.1\*(R" or
+\&\*(L"spdy/3\*(R".
 .SH "CONNECTED COMMANDS"
 .IX Header "CONNECTED COMMANDS"
 If a connection request is established with an \s-1SSL\s0 client and neither the
diff --git a/secure/usr.bin/openssl/man/s_time.1 b/secure/usr.bin/openssl/man/s_time.1
index 1cd08608f2f0..927cc83d2897 100644
--- a/secure/usr.bin/openssl/man/s_time.1
+++ b/secure/usr.bin/openssl/man/s_time.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "S_TIME 1"
-.TH S_TIME 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH S_TIME 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/sess_id.1 b/secure/usr.bin/openssl/man/sess_id.1
index d16fb997a209..4e6eb1ce0a57 100644
--- a/secure/usr.bin/openssl/man/sess_id.1
+++ b/secure/usr.bin/openssl/man/sess_id.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SESS_ID 1"
-.TH SESS_ID 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SESS_ID 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/smime.1 b/secure/usr.bin/openssl/man/smime.1
index a50c5b7fc122..0a1549b583a0 100644
--- a/secure/usr.bin/openssl/man/smime.1
+++ b/secure/usr.bin/openssl/man/smime.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SMIME 1"
-.TH SMIME 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SMIME 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/speed.1 b/secure/usr.bin/openssl/man/speed.1
index 094620fb2014..c0bd2e172d04 100644
--- a/secure/usr.bin/openssl/man/speed.1
+++ b/secure/usr.bin/openssl/man/speed.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SPEED 1"
-.TH SPEED 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SPEED 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/spkac.1 b/secure/usr.bin/openssl/man/spkac.1
index bbd61b882565..7c571d7f599b 100644
--- a/secure/usr.bin/openssl/man/spkac.1
+++ b/secure/usr.bin/openssl/man/spkac.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SPKAC 1"
-.TH SPKAC 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH SPKAC 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/ts.1 b/secure/usr.bin/openssl/man/ts.1
index ffa5294c2644..d00f866e462c 100644
--- a/secure/usr.bin/openssl/man/ts.1
+++ b/secure/usr.bin/openssl/man/ts.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "TS 1"
-.TH TS 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH TS 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/tsget.1 b/secure/usr.bin/openssl/man/tsget.1
index e3d9ec888e8b..5bfbaf12c826 100644
--- a/secure/usr.bin/openssl/man/tsget.1
+++ b/secure/usr.bin/openssl/man/tsget.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "TSGET 1"
-.TH TSGET 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH TSGET 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/verify.1 b/secure/usr.bin/openssl/man/verify.1
index 81d3f3e6a6c1..4b8af5443653 100644
--- a/secure/usr.bin/openssl/man/verify.1
+++ b/secure/usr.bin/openssl/man/verify.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "VERIFY 1"
-.TH VERIFY 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH VERIFY 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -168,12 +168,12 @@ of the form: hash.0 or have symbolic links to them of this
 form (\*(L"hash\*(R" is the hashed certificate subject name: see the \fB\-hash\fR option
 of the \fBx509\fR utility). Under Unix the \fBc_rehash\fR script will automatically
 create symbolic links to a directory of certificates.
-.IP "\fB\-CAfile file\fR" 4
-.IX Item "-CAfile file"
-A file of trusted certificates. The file should contain multiple certificates
-in \s-1PEM\s0 format concatenated together.
+.IP "\fB\-CAfile file\fR A file of trusted certificates. The file should contain multiple certificates in \s-1PEM\s0 format concatenated together." 4
+.IX Item "-CAfile file A file of trusted certificates. The file should contain multiple certificates in PEM format concatenated together."
+.PD 0
 .IP "\fB\-untrusted file\fR" 4
 .IX Item "-untrusted file"
+.PD
 A file of untrusted certificates. The file should contain multiple certificates
 in \s-1PEM\s0 format concatenated together.
 .IP "\fB\-purpose purpose\fR" 4
diff --git a/secure/usr.bin/openssl/man/version.1 b/secure/usr.bin/openssl/man/version.1
index 5c10b1c963f7..0e6ca875a284 100644
--- a/secure/usr.bin/openssl/man/version.1
+++ b/secure/usr.bin/openssl/man/version.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "VERSION 1"
-.TH VERSION 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH VERSION 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/secure/usr.bin/openssl/man/x509.1 b/secure/usr.bin/openssl/man/x509.1
index 5b0617c94897..d3256263d09b 100644
--- a/secure/usr.bin/openssl/man/x509.1
+++ b/secure/usr.bin/openssl/man/x509.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509 1"
-.TH X509 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -145,6 +145,7 @@ x509 \- Certificate display and signing utility
 [\fB\-hash\fR]
 [\fB\-subject_hash\fR]
 [\fB\-issuer_hash\fR]
+[\fB\-ocspid\fR]
 [\fB\-subject\fR]
 [\fB\-issuer\fR]
 [\fB\-nameopt option\fR]
@@ -154,6 +155,7 @@ x509 \- Certificate display and signing utility
 [\fB\-enddate\fR]
 [\fB\-purpose\fR]
 [\fB\-dates\fR]
+[\fB\-checkend num\fR]
 [\fB\-modulus\fR]
 [\fB\-pubkey\fR]
 [\fB\-fingerprint\fR]
@@ -168,6 +170,7 @@ x509 \- Certificate display and signing utility
 [\fB\-days arg\fR]
 [\fB\-set_serial n\fR]
 [\fB\-signkey filename\fR]
+[\fB\-passin arg\fR]
 [\fB\-x509toreq\fR]
 [\fB\-req\fR]
 [\fB\-CA filename\fR]
@@ -175,6 +178,7 @@ x509 \- Certificate display and signing utility
 [\fB\-CAcreateserial\fR]
 [\fB\-CAserial filename\fR]
 [\fB\-text\fR]
+[\fB\-certopt option\fR]
 [\fB\-C\fR]
 [\fB\-md2|\-md5|\-sha1|\-mdc2\fR]
 [\fB\-clrext\fR]
@@ -262,6 +266,9 @@ name.
 .IP "\fB\-issuer_hash\fR" 4
 .IX Item "-issuer_hash"
 outputs the \*(L"hash\*(R" of the certificate issuer name.
+.IP "\fB\-ocspid\fR" 4
+.IX Item "-ocspid"
+outputs the \s-1OCSP\s0 hash values for the subject name and public key.
 .IP "\fB\-hash\fR" 4
 .IX Item "-hash"
 synonym for \*(L"\-subject_hash\*(R" for backward compatibility reasons.
@@ -300,6 +307,10 @@ prints out the expiry date of the certificate, that is the notAfter date.
 .IP "\fB\-dates\fR" 4
 .IX Item "-dates"
 prints out the start and expiry dates of a certificate.
+.IP "\fB\-checkend arg\fR" 4
+.IX Item "-checkend arg"
+checks if the certificate expires within the next \fBarg\fR seconds and exits
+non-zero if yes it will expire or zero if not.
 .IP "\fB\-fingerprint\fR" 4
 .IX Item "-fingerprint"
 prints out the digest of the \s-1DER\s0 encoded version of the whole certificate
@@ -383,6 +394,10 @@ the \fB\-clrext\fR option is supplied.
 If the input is a certificate request then a self signed certificate
 is created using the supplied private key using the subject name in
 the request.
+.IP "\fB\-passin arg\fR" 4
+.IX Item "-passin arg"
+the key password source. For more information about the format of \fBarg\fR
+see the \fB\s-1PASS\s0 \s-1PHRASE\s0 \s-1ARGUMENTS\s0\fR section in \fIopenssl\fR\|(1).
 .IP "\fB\-clrext\fR" 4
 .IX Item "-clrext"
 delete any extensions from a certificate. This option is used when a
@@ -512,8 +527,8 @@ present then multibyte characters larger than 0xff will be represented
 using the format \eUXXXX for 16 bits and \eWXXXXXXXX for 32 bits.
 Also if this option is off any UTF8Strings will be converted to their
 character form first.
-.IP "\fBno_type\fR" 4
-.IX Item "no_type"
+.IP "\fBignore_type\fR" 4
+.IX Item "ignore_type"
 this option does not attempt to interpret multibyte characters in any
 way. That is their content octets are merely dumped as though one octet
 represents each character. This is useful for diagnostic purposes but
diff --git a/secure/usr.bin/openssl/man/x509v3_config.1 b/secure/usr.bin/openssl/man/x509v3_config.1
index 6a24214a0310..216559e312bc 100644
--- a/secure/usr.bin/openssl/man/x509v3_config.1
+++ b/secure/usr.bin/openssl/man/x509v3_config.1
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "X509V3_CONFIG 1"
-.TH X509V3_CONFIG 1 "2014-06-05" "1.0.1h" "OpenSSL"
+.TH X509V3_CONFIG 1 "2014-08-06" "1.0.1i" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -307,7 +307,7 @@ The \s-1IP\s0 address used in the \fB\s-1IP\s0\fR options can be in either IPv4
 .PP
 The value of \fBdirName\fR should point to a section containing the distinguished
 name to use as a set of name value pairs. Multi values AVAs can be formed by
-preceeding the name with a \fB+\fR character.
+prefacing the name with a \fB+\fR character.
 .PP
 otherName can include arbitrary data associated with an \s-1OID:\s0 the value
 should be the \s-1OID\s0 followed by a semicolon and the content in standard
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index d58d855d8029..1d77d4fd13b1 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -12,7 +12,7 @@ SRCS+=	roaming_dummy.c
 .endif
 
 DPADD=	${LIBSSH}
-LDADD=	-lssh
+LDADD=	${LDSSH}
 USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index 15dcaa52061d..96f9d04132ec 100644
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -11,8 +11,8 @@ CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 SRCS+=	roaming_dummy.c
 .endif
 
-DPADD=	${LIBSSH} ${LIBEDIT} ${LIBNCURSES}
-LDADD=	-lssh -ledit -lncurses
+DPADD=	${LIBSSH} ${LIBEDIT} ${LIBNCURSESW}
+LDADD=	${LDSSH} -ledit -lncursesw
 USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
index 97191ba51fbf..fe8739be2436 100644
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -12,7 +12,7 @@ SRCS+=	roaming_dummy.c
 .endif
 
 DPADD=	${LIBSSH}
-LDADD=	-lssh
+LDADD=	${LDSSH}
 USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile
index b5db53236c8b..b5c98b75a9eb 100644
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@@ -12,7 +12,7 @@ SRCS+=	roaming_dummy.c
 .endif
 
 DPADD=	${LIBSSH}
-LDADD=	-lssh
+LDADD=	${LDSSH}
 USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
index 45e4d1691f98..62e3927a258b 100644
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -12,13 +12,13 @@ SRCS+=	roaming_dummy.c
 .endif
 
 DPADD=	${LIBSSH}
-LDADD=	-lssh
+LDADD=	${LDSSH}
 USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
 DPADD+=	${LIBLDNS}
-LDADD+=	-lldns
+LDADD+=	${LDLDNS}
 USEPRIVATELIB+= ldns
 .endif
 
diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile
index 298f52a53c07..44659187c0e7 100644
--- a/secure/usr.bin/ssh-keyscan/Makefile
+++ b/secure/usr.bin/ssh-keyscan/Makefile
@@ -7,7 +7,7 @@ SRCS=	ssh-keyscan.c roaming_dummy.c
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 
 DPADD=	${LIBSSH}
-LDADD=	-lssh
+LDADD=	${LDSSH}
 USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 89f9927c0aaa..bb23f4352956 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -16,13 +16,13 @@ SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
 SRCS+=	gss-genr.c
 
 DPADD=	${LIBSSH} ${LIBUTIL}
-LDADD=	-lssh -lutil
+LDADD=	${LDSSH} -lutil
 USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
 CFLAGS+=	-DHAVE_LDNS=1
 DPADD+=	${LIBLDNS}
-LDADD+=	-lldns
+LDADD+=	${LIBLDNSADD}
 USEPRIVATELIB+= ldns
 .endif
 
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index d487fe3dd7cc..721531552c52 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -26,7 +26,7 @@ MAN=	sshd.8 sshd_config.5
 CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
 
 DPADD=	${LIBSSH} ${LIBUTIL} ${LIBWRAP} ${LIBPAM}
-LDADD=	-lssh -lutil -lwrap ${MINUSLPAM}
+LDADD=	${LDSSH} -lutil -lwrap ${MINUSLPAM}
 USEPRIVATELIB= ssh
 
 .if ${MK_LDNS} != "no"
@@ -47,7 +47,7 @@ CFLAGS+= -include krb5_config.h
 DPADD+=	 ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} \
 	${LIBCOM_ERR} ${LIBROKEN} ${LIBWIND} ${LIBHEIMBASE} ${LIBHEIMIPCC}
 LDADD+=	 -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \
-	-lcom_err -lroken -lwind -lheimbase -lheimipcc
+	-lcom_err -lroken -lwind -lheimbase ${LDHEIMIPCC}
 .endif
 
 .if ${MK_OPENSSH_NONE_CIPHER} != "no"
diff --git a/share/Makefile b/share/Makefile
index 416a42de0292..63c18bb6464a 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -86,7 +86,7 @@ _syscons=	syscons
 _tests=		tests
 .endif
 
-.if ${MK_VT_SUPPORT} != "no"
+.if ${MK_VT} != "no"
 _vt=		vt
 .endif
 
diff --git a/share/dict/freebsd b/share/dict/freebsd
index c97170f3cc0e..2321038fa384 100644
--- a/share/dict/freebsd
+++ b/share/dict/freebsd
@@ -79,7 +79,6 @@ ISBN
 ISDN
 ISP
 Iomega
-Itanium
 JDK
 JRE
 JSP
diff --git a/share/dtrace/Makefile b/share/dtrace/Makefile
index ba52997a59ba..328f806f7a33 100644
--- a/share/dtrace/Makefile
+++ b/share/dtrace/Makefile
@@ -12,7 +12,10 @@ SUBDIR= ${_toolkit}
 _toolkit=	toolkit
 .endif
 
-SCRIPTS=	nfsclienttime hotopen
+SCRIPTS=	disklatency \
+		disklatencycmd \
+		hotopen \
+		nfsclienttime
 
 SCRIPTSDIR= ${SHAREDIR}/dtrace
 
diff --git a/share/dtrace/README b/share/dtrace/README
index e446ceecf076..0540badea798 100644
--- a/share/dtrace/README
+++ b/share/dtrace/README
@@ -1,11 +1,11 @@
 $FreeBSD$
 
 This directory contains scripts for use with the DTrace system.  The
-toolkit/ directory contains the latest vendor import of Brendan
-Gregg's DTraceToolkit while all the other files and directories
+toolkit/ directory installs the latest vendor import of Brendan
+Gregg's DTraceToolkit while the other files and directories
 contain code generated by the FreeBSD Project for use with DTrace on
 FreeBSD.
 
-NOTE: Do not add new scripts to the DTraceToolkit contained in this
-directory. New DTraceToolkit scripts should be send to the maintainer
-of the toolkit and then brought back into FreeBSD via future vendor imports.
+NOTE: Do not add new scripts to the toolkit directory. New DTraceToolkit
+scripts should be send to the maintainer of the toolkit and then brought
+back into FreeBSD via future vendor imports.
diff --git a/sys/dev/hwpmc/hwpmc_ia64.c b/share/dtrace/disklatency
old mode 100644
new mode 100755
similarity index 60%
rename from sys/dev/hwpmc/hwpmc_ia64.c
rename to share/dtrace/disklatency
index ce1caf69e108..97ef87a07980
--- a/sys/dev/hwpmc/hwpmc_ia64.c
+++ b/share/dtrace/disklatency
@@ -1,5 +1,6 @@
+#!/usr/sbin/dtrace -s
 /*-
- * Copyright (c) 2005, Joseph Koshy
+ * Copyright 2014 John-Mark Gurney.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,44 +24,44 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ *	$FreeBSD$
+ *
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+#pragma D option quiet
+#pragma D option dynvarsize=16m
 
-#include <sys/param.h>
-#include <sys/pmc.h>
-
-#include <machine/pmc_mdep.h>
-
-struct pmc_mdep *
-pmc_md_initialize()
+dtrace:::BEGIN
 {
-	return NULL;
+	printf("Tracing... Hit Ctrl-C to end.\n");
 }
 
-void
-pmc_md_finalize(struct pmc_mdep *md)
+io:::start
 {
-	(void) md;
+	start_time[arg0] = timestamp;
 }
 
-int
-pmc_save_kernel_callchain(uintptr_t *cc, int maxsamples,
-    struct trapframe *tf)
+io:::done
+/this->start = start_time[arg0]/
 {
-	(void) cc;
-	(void) maxsamples;
-	(void) tf;
-	return (0);
+	this->delta = (timestamp - this->start) / 1000;
+	@q[args[1]->device_name, args[1]->unit_number] =
+	    lquantize(this->delta, 4000, 80000, 4000);
+	@max[args[1]->device_name, args[1]->unit_number] = max(this->delta);
+	@avg[args[1]->device_name, args[1]->unit_number] = avg(this->delta);
+	@stddev[args[1]->device_name, args[1]->unit_number] = stddev(this->delta);
+	start_time[arg0] = 0;
 }
 
-int
-pmc_save_user_callchain(uintptr_t *cc, int maxsamples,
-    struct trapframe *tf)
+tick-10s
 {
-	(void) cc;
-	(void) maxsamples;
-	(void) tf;
-	return (0);
+	printa("   %s (%d), us:\n%@d\n", @q);
+	printa("max%s (%d), us:\n%@d\n", @max);
+	printa("avg%s (%d), us:\n%@d\n", @avg);
+	printa("stddev%s (%d), us:\n%@d\n", @stddev);
+
+	clear(@q);
+	clear(@max);
+	clear(@avg);
+	clear(@stddev);
 }
diff --git a/sys/ia64/include/sf_buf.h b/share/dtrace/disklatencycmd
old mode 100644
new mode 100755
similarity index 54%
rename from sys/ia64/include/sf_buf.h
rename to share/dtrace/disklatencycmd
index 44d0109b2452..95fa6532d8b9
--- a/sys/ia64/include/sf_buf.h
+++ b/share/dtrace/disklatencycmd
@@ -1,5 +1,6 @@
+#!/usr/sbin/dtrace -s
 /*-
- * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
+ * Copyright 2014 John-Mark Gurney.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,50 +24,49 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ *	$FreeBSD$
+ *
  */
 
-#ifndef _MACHINE_SF_BUF_H_
-#define _MACHINE_SF_BUF_H_
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_page.h>
+#pragma D option quiet
 
+/* from http://www.mail-archive.com/dtrace-discuss@opensolaris.org/msg03755.html */
+#pragma D option aggsize=8m
+#pragma D option bufsize=16m
+#pragma D option dynvarsize=32m
 /*
- * On this machine, the only purpose for which sf_buf is used is to implement
- * an opaque pointer required by the machine-independent parts of the kernel.
- * That pointer references the vm_page that is "mapped" by the sf_buf.  The
- * actual mapping is provided by the direct virtual-to-physical mapping.  
- */
-struct sf_buf;
+#pragma D option aggrate=0
+#pragma D option cleanrate=50Hz
+*/
 
-static inline struct sf_buf *
-sf_buf_alloc(struct vm_page *m, int pri)
+dtrace:::BEGIN
 {
-
-	return ((struct sf_buf *)m);
+	printf("Tracing... Hit Ctrl-C to end.\n");
+	dstart = timestamp;
 }
 
-static inline void
-sf_buf_free(struct sf_buf *sf)
+io:::start
 {
+	start_time[arg0] = timestamp;
 }
 
-static __inline vm_page_t
-sf_buf_page(struct sf_buf *sf)
+io:::done
+/this->start = start_time[arg0]/
 {
- 
-	return ((vm_page_t)sf);
+	this->delta = (timestamp - this->start) / 1000;
+	@q[args[1]->device_name, args[1]->unit_number] =
+	    lquantize(this->delta, 4000, 80000, 4000);
+	@max[args[1]->device_name, args[1]->unit_number] = max(this->delta);
+	@avg[args[1]->device_name, args[1]->unit_number] = avg(this->delta);
+	@stddev[args[1]->device_name, args[1]->unit_number] = stddev(this->delta);
+	start_time[arg0] = 0;
 }
 
-static __inline vm_offset_t
-sf_buf_kva(struct sf_buf *sf)
+dtrace:::END
 {
-	vm_page_t m;
-
-	m = sf_buf_page(sf);
-	return (pmap_page_to_va(m));
+	printf("total time, us: %d\n", (timestamp - dstart) / 1000);
+	printa("   %s (%d), us:\n%@d\n", @q);
+	printa("max%s (%d), us: %@d\n", @max);
+	printa("avg%s (%d), us: %@d\n", @avg);
+	printa("stddev%s (%d), us: %@d\n", @stddev);
 }
-
-#endif /* !_MACHINE_SF_BUF_H_ */
diff --git a/share/dtrace/hotopen b/share/dtrace/hotopen
index 1570006a3097..ba2777cfe893 100755
--- a/share/dtrace/hotopen
+++ b/share/dtrace/hotopen
@@ -1,40 +1,39 @@
-#!/bin/sh
-#
-# Copyright (c) 2012 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 hotopen D script periodically outputs  table of which UIDs
-# are opening files.   This is a very quick way to find out if
-# a paritcular user is thrashing a system with rapid calls to
-# open/close.
-#
-# Usage: hotopen
-#
+#!/usr/sbin/dtrace -s
+/*
+ * Copyright (c) 2012 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 hotopen D script periodically outputs  table of which UIDs
+ * are opening files.   This is a very quick way to find out if
+ * a paritcular user is thrashing a system with rapid calls to
+ * open/close.
+ *
+ * Usage: hotopen
+ */
 
-/usr/sbin/dtrace -n '
 #pragma D option quiet
 BEGIN
 {
@@ -55,4 +54,3 @@ tick-1sec
 	trunc(@files);
 	output = 0;
 }
-'
diff --git a/share/dtrace/nfsattrstats b/share/dtrace/nfsattrstats
index 364a39af7255..63ca9318cca3 100755
--- a/share/dtrace/nfsattrstats
+++ b/share/dtrace/nfsattrstats
@@ -1,42 +1,42 @@
-#!/bin/sh
-#
-# Copyright (c) 2012 Robert N. M. Watson
-# All rights reserved.
-#
-# This software was developed at the University of Cambridge Computer
-# Laboratory with support from a grant from Google, Inc.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, 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$
-#
-# This script creates a trace of NFS RPCs, NFS attribute cache
-# activity, and NFS access cache activity, along with the system call
-# that instigated the activity. Notice that NFS events may happen
-# outside of the context of a system call, most likely due to the VM
-# system paging from NFS, in which case the system call name is
-# reported as "-"
+#!/usr/sbin/dtrace -s
+/*
+ * Copyright (c) 2012 Robert N. M. Watson
+ * All rights reserved.
+ *
+ * This software was developed at the University of Cambridge Computer
+ * Laboratory with support from a grant from Google, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, 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$
+ *
+ * This script creates a trace of NFS RPCs, NFS attribute cache
+ * activity, and NFS access cache activity, along with the system call
+ * that instigated the activity. Notice that NFS events may happen
+ * outside of the context of a system call, most likely due to the VM
+ * system paging from NFS, in which case the system call name is
+ * reported as "-"
+ */
 
-/usr/sbin/dtrace -n '
 #pragma D option quiet
 
 dtrace:::BEGIN
@@ -71,4 +71,3 @@ nfsclient:::
     printf("%s\t%s\t%s\t%s\n", probemod, stringof(arg0), execname, 
 	    self->syscallname);
 }
-'
diff --git a/share/dtrace/nfsclienttime b/share/dtrace/nfsclienttime
index 335f067b3852..2422305d893b 100755
--- a/share/dtrace/nfsclienttime
+++ b/share/dtrace/nfsclienttime
@@ -1,46 +1,45 @@
-#!/bin/sh
-#
-# Copyright (c) 2012 Robert N. M. Watson
-# All rights reserved.
-#
-# This software was developed at the University of Cambridge Computer
-# Laboratory with support from a grant from Google, Inc.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, 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$
-#
-# This script measures all time spent waiting on RPC replies for each
-# system call, and then generates a histogram of those times sorted by
-# system call name.
-#
-# Currently only supports NFSv3
-#
-# Usage: nfsclienttime
-#
-# Press Ctrl-C to exit and display statistics.
-#
+#!/usr/sbin/dtrace -s
+/*
+ * Copyright (c) 2012 Robert N. M. Watson
+ * All rights reserved.
+ *
+ * This software was developed at the University of Cambridge Computer
+ * Laboratory with support from a grant from Google, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, 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$
+ *
+ * This script measures all time spent waiting on RPC replies for each
+ * system call, and then generates a histogram of those times sorted by
+ * system call name.
+ *
+ * Currently only supports NFSv3
+ *
+ * Usage: nfsclienttime
+ *
+ * Press Ctrl-C to exit and display statistics.
+ */
 
-/usr/sbin/dtrace -n '
 #pragma D option quiet
 
 dtrace:::BEGIN
@@ -71,4 +70,3 @@ syscall:::return
 
         @syscalls[probefunc] = quantize(self->count);
 }
-'
diff --git a/share/dtrace/toolkit/Makefile b/share/dtrace/toolkit/Makefile
index 0eb7ff21bc5c..663cc98140ff 100644
--- a/share/dtrace/toolkit/Makefile
+++ b/share/dtrace/toolkit/Makefile
@@ -5,10 +5,10 @@
 DTRACETOOLKIT= ../../../cddl/contrib/dtracetoolkit
 
 SCRIPTS=	${DTRACETOOLKIT}/execsnoop \
-		${DTRACETOOLKIT}/hotuser   \
 		${DTRACETOOLKIT}/hotkernel \
+		${DTRACETOOLKIT}/hotuser   \
 		${DTRACETOOLKIT}/opensnoop \
-		${DTRACETOOLKIT}/procsystime \
+		${DTRACETOOLKIT}/procsystime
 
 SCRIPTSDIR= ${SHAREDIR}/dtrace/toolkit
 
diff --git a/share/examples/Makefile b/share/examples/Makefile
index dcc3256d2d29..79de48eb3129 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -10,7 +10,6 @@ LDIRS=	BSD_daemon \
 	bhyve \
 	bootforth \
 	csh \
-	cvsup \
 	diskless \
 	drivers \
 	etc \
@@ -52,10 +51,6 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
 	bootforth/menuconf.4th \
 	bootforth/screen.4th \
 	csh/dot.cshrc \
-	cvsup/README \
-	cvsup/cvs-supfile \
-	cvsup/stable-supfile \
-	cvsup/standard-supfile \
 	diskless/ME \
 	diskless/README.BOOTP \
 	diskless/README.TEMPLATING \
diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh
index 0714b7f6cebc..33d0db9ffc19 100755
--- a/share/examples/bhyve/vmrun.sh
+++ b/share/examples/bhyve/vmrun.sh
@@ -78,8 +78,8 @@ isofile=${DEFAULT_ISOFILE}
 memsize=${DEFAULT_MEMSIZE}
 console=${DEFAULT_CONSOLE}
 cpus=${DEFAULT_CPUS}
-virtio_diskdev=${DEFAULT_VIRTIO_DISK}
-tapdev=${DEFAULT_TAPDEV}
+tap_total=0
+disk_total=0
 apic_opt=""
 gdbport=0
 loader_opt=""
@@ -96,7 +96,8 @@ while getopts ac:C:d:e:g:hH:iI:m:t: c ; do
 		console=${OPTARG}
 		;;
 	d)
-		virtio_diskdev=${OPTARG}
+		eval "disk_dev${disk_total}=\"${OPTARG}\""
+		disk_total=$(($disk_total + 1))
 		;;
 	e)
 		loader_opt="${loader_opt} -e ${OPTARG}"
@@ -117,7 +118,8 @@ while getopts ac:C:d:e:g:hH:iI:m:t: c ; do
 		memsize=${OPTARG}
 		;;
 	t)
-		tapdev=${OPTARG}
+		eval "tap_dev${tap_total}=\"${OPTARG}\""
+		tap_total=$(($tap_total + 1))
 		;;
 	*)
 		usage
@@ -125,6 +127,16 @@ while getopts ac:C:d:e:g:hH:iI:m:t: c ; do
 	esac
 done
 
+if [ $tap_total -eq 0 ] ; then
+    tap_total=1
+    tap_dev0="${DEFAULT_TAPDEV}"
+fi
+if [ $disk_total -eq 0 ] ; then
+    disk_total=1
+    disk_dev0="${DEFAULT_VIRTIO_DISK}"
+
+fi
+
 shift $((${OPTIND} - 1))
 
 if [ $# -ne 1 ]; then
@@ -136,29 +148,35 @@ if [ -n "${host_base}" ]; then
 	loader_opt="${loader_opt} -h ${host_base}"
 fi
 
-# Create the virtio diskdev file if needed
-if [ ! -f ${virtio_diskdev} ]; then
-	echo "virtio disk device file \"${virtio_diskdev}\" does not exist."
-	echo "Creating it ..."
-	truncate -s 8G ${virtio_diskdev} > /dev/null
-fi
+make_and_check_diskdev()
+{
+    local virtio_diskdev="$1"
+    # Create the virtio diskdev file if needed
+    if [ ! -f ${virtio_diskdev} ]; then
+	    echo "virtio disk device file \"${virtio_diskdev}\" does not exist."
+	    echo "Creating it ..."
+	    truncate -s 8G ${virtio_diskdev} > /dev/null
+    fi
 
-if [ ! -r ${virtio_diskdev} ]; then
-	echo "virtio disk device file \"${virtio_diskdev}\" is not readable"
-	exit 1
-fi
+    if [ ! -r ${virtio_diskdev} ]; then
+	    echo "virtio disk device file \"${virtio_diskdev}\" is not readable"
+	    exit 1
+    fi
 
-if [ ! -w ${virtio_diskdev} ]; then
-	echo "virtio disk device file \"${virtio_diskdev}\" is not writable"
-	exit 1
-fi
+    if [ ! -w ${virtio_diskdev} ]; then
+	    echo "virtio disk device file \"${virtio_diskdev}\" is not writable"
+	    exit 1
+    fi
+}
 
 echo "Launching virtual machine \"$vmname\" ..."
 
+virtio_diskdev="$disk_dev0"
+
 while [ 1 ]; do
 	${BHYVECTL} --vm=${vmname} --destroy > /dev/null 2>&1
 
-	file ${virtio_diskdev} | grep ": x86 boot sector" > /dev/null
+	file ${virtio_diskdev} | grep "boot sector" > /dev/null
 	rc=$?
 	if [ $rc -ne 0 ]; then
 		file ${virtio_diskdev} | grep ": Unix Fast File sys" > /dev/null
@@ -189,12 +207,33 @@ while [ 1 ]; do
 		break
 	fi
 
+	#
+	# Build up args for additional tap and disk devices now.
+	#
+	nextslot=2  # slot 0 is hostbridge, slot 1 is lpc
+	devargs=""  # accumulate disk/tap args here
+	i=0
+	while [ $i -lt $tap_total ] ; do
+	    eval "tapname=\$tap_dev${i}"
+	    devargs="$devargs -s $nextslot:0,virtio-net,${tapname} "
+	    nextslot=$(($nextslot + 1))
+	    i=$(($i + 1))
+	done
+
+	i=0
+	while [ $i -lt $disk_total ] ; do
+	    eval "disk=\$disk_dev${i}"
+	    make_and_check_diskdev "${disk}"
+	    devargs="$devargs -s $nextslot:0,virtio-blk,${disk} "
+	    nextslot=$(($nextslot + 1))
+	    i=$(($i + 1))
+	done
+
 	${FBSDRUN} -c ${cpus} -m ${memsize} ${apic_opt} -A -H -P	\
 		-g ${gdbport}						\
 		-s 0:0,hostbridge					\
 		-s 1:0,lpc						\
-		-s 2:0,virtio-net,${tapdev}				\
-		-s 3:0,virtio-blk,${virtio_diskdev}			\
+		${devargs}						\
 		-l com1,${console}					\
 		${installer_opt}					\
 		${vmname}
diff --git a/share/examples/cvsup/README b/share/examples/cvsup/README
deleted file mode 100644
index 0bf29327c959..000000000000
--- a/share/examples/cvsup/README
+++ /dev/null
@@ -1,41 +0,0 @@
-# $FreeBSD$
-
-BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
-
-The primary development work happens in Subversion and is temporarily
-exported to the legacy CVS system with significant time delays.
-
-You should NOT set up a new consumer of FreeBSD source code via CVS.
-Please see:
-http://www.freebsd.org/doc/handbook/svn.html
-http://www.freebsd.org/doc/handbook/svn-mirrors.html
-
-This directory contains sample "supfiles" for obtaining and updating
-the FreeBSD sources via the Internet.  These supfiles will work
-with CVSup version 14.0 or later.  For general information on CVSup
-itself, please see http://www.freebsd.org/doc/handbook/cvsup.html
-
-To maintain the sources for the FreeBSD-current release, use:
-
-    standard-supfile		Main source tree
-
-To maintain the sources for the FreeBSD-stable release, use:
-
-    stable-supfile		Main source tree
-
-To maintain a copy of the CVS repository containing all versions of
-FreeBSD, use:
-
-    cvs-supfile			Main source tree collection
-
-IMPORTANT: Before you use any of the supfiles in this directory,
-you will need to edit in an appropriate "host" setting.  See:
-
-    http://www.freebsd.org/doc/handbook/mirrors.html
-
-for an up-to-date list of public CVSup mirror sites.
-
-To prevent CVSup from updating particular directories and files, use
-this file:
-
-    refuse
diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile
deleted file mode 100644
index b501272a56cb..000000000000
--- a/share/examples/cvsup/cvs-supfile
+++ /dev/null
@@ -1,79 +0,0 @@
-# $FreeBSD$
-#
-# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
-#
-# The primary development work happens in Subversion and is temporarily
-# exported to the legacy CVS system with significant time delays.
-#
-# You should NOT set up a new consumer of FreeBSD source code via CVS.
-# Please see:
-# http://www.freebsd.org/doc/handbook/svn.html
-# http://www.freebsd.org/doc/handbook/svn-mirrors.html
-#
-# csup (CVS Update Protocol) allows you to download the latest CVS
-# tree (or any branch of development therefrom) to your system easily
-# and efficiently
-#
-# To keep your CVS tree up-to-date run:
-#
-#	csup cvs-supfile
-#
-# Note that this only updates the tree contents and does not
-# update what is actually installed.
-#
-# You may wish to change some of the settings in this file to better
-# suit your system:
-#
-# host=CHANGE_THIS.FreeBSD.org
-#		This specifies the server host which will supply the
-#		file updates.  You must change it to one of the CVSup
-#		mirror sites listed in the FreeBSD Handbook at
-#		http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-#		You can	override this setting on the command line
-#		with cvsup's "-h host" option.
-#
-# base=/var/db
-#		This specifies the root where csup will store information
-#		about the collections you have transferred to your system.
-#		A setting of "/var/db" will generate this information in
-#		/var/db/sup.  You can override the "base" setting on the
-#		command line with cvsup's "-b base" option.  This directory
-#		must exist in order to run CVSup.
-#
-# prefix=/home/ncvs
-#		This specifies where to place the requested files.  A
-#		setting of "/home/ncvs" will place all of the files
-#		requested in /home/ncvs (e.g., "/home/ncvs/src/bin").
-#		The prefix directory must exist in order to run CVSup.
-
-# Defaults that apply to all the collections
-#
-# IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-*default host=CHANGE_THIS.FreeBSD.org
-*default base=/var/db
-*default prefix=/home/ncvs
-*default release=cvs
-*default delete use-rel-suffix
-
-# If you seem to be limited by CPU rather than network or disk bandwidth, try
-# commenting out the following line.  (Normally, today's CPUs are fast enough
-# that you want to run compression.)
-*default compress
-
-## Main Source Tree.
-#
-# The easiest way to get the main source tree is to use the "src-all"
-# mega-collection.  It includes all of the individual "src-*" collections.
-src-all
-
-## Projects
-#
-# This collection retrieves the projects tree of the FreeBSD
-# repository
-projects-all
-
-## CVSROOT control files
-#
-# This is to get the control files that cvs(1) needs and the commit logs.
-cvsroot-all
diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile
deleted file mode 100644
index b520f8d41945..000000000000
--- a/share/examples/cvsup/stable-supfile
+++ /dev/null
@@ -1,74 +0,0 @@
-# $FreeBSD$
-#
-# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
-#
-# The primary development work happens in Subversion and is temporarily
-# exported to the legacy CVS system with significant time delays.
-#
-# You should NOT set up a new consumer of FreeBSD source code via CVS.
-# Please see:
-# http://www.freebsd.org/doc/handbook/svn.html
-# http://www.freebsd.org/doc/handbook/svn-mirrors.html
-#
-# csup (CVS Update Protocol) allows you to download the latest CVS
-# tree (or any branch of development therefrom) to your system easily
-# and efficiently
-#
-# To keep your CVS tree up-to-date run:
-#
-#	csup stable-supfile
-#
-# Note that this only updates the tree contents and does not
-# update what is actually installed.
-#
-# You may wish to change some of the settings in this file to better
-# suit your system:
-#
-# host=CHANGE_THIS.FreeBSD.org
-#		This specifies the server host which will supply the
-#		file updates.  You must change it to one of the CVSup
-#		mirror sites listed in the FreeBSD Handbook at
-#		http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-#		You can	override this setting on the command line
-#		with cvsup's "-h host" option.
-#
-# base=/var/db
-#		This specifies the root where csup will store information
-#		about the collections you have transferred to your system.
-#		A setting of "/var/db" will generate this information in
-#		/var/db/sup.  You can override the "base" setting on the
-#		command line with cvsup's "-b base" option.  This directory
-#		must exist in order to run CVSup.
-#
-# prefix=/usr
-#		This specifies where to place the requested files.  A
-#		setting of "/usr" will place all of the files requested
-#		in "/usr/src" (e.g., "/usr/src/bin", "/usr/src/lib").
-#		The prefix directory must exist in order to run CVSup.
-#
-
-# Defaults that apply to all the collections
-#
-# IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-*default host=CHANGE_THIS.FreeBSD.org
-*default base=/var/db
-*default prefix=/usr
-# The following line is for 9-stable.  If you want 8-stable, 7-stable,
-# 6-stable, 5-stable, 4-stable, 3-stable, or 2.2-stable, change to "RELENG_8",
-# "RELENG_7", "RELENG_6", "RELENG_5", "RELENG_4", "RELENG_3", or
-# "RELENG_2_2" respectively.
-*default release=cvs tag=RELENG_9
-*default delete use-rel-suffix
-
-# If you seem to be limited by CPU rather than network or disk bandwidth, try
-# commenting out the following line.  (Normally, today's CPUs are fast enough
-# that you want to run compression.)
-*default compress
-
-## Main Source Tree.
-#
-# The easiest way to get the main source tree is to use the "src-all"
-# mega-collection.  It includes all of the individual "src-*" collections.
-# Please note:  If you want to track -STABLE, leave this uncommented.
-src-all
diff --git a/share/examples/cvsup/standard-supfile b/share/examples/cvsup/standard-supfile
deleted file mode 100644
index 94eec5ee6cab..000000000000
--- a/share/examples/cvsup/standard-supfile
+++ /dev/null
@@ -1,68 +0,0 @@
-# $FreeBSD$
-#
-# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
-#
-# The primary development work happens in Subversion and is temporarily
-# exported to the legacy CVS system with significant time delays.
-#
-# You should NOT set up a new consumer of FreeBSD source code via CVS.
-# Please see:
-# http://www.freebsd.org/doc/handbook/svn.html
-# http://www.freebsd.org/doc/handbook/svn-mirrors.html
-#
-# csup (CVS Update Protocol) allows you to download the latest CVS
-# tree (or any branch of development therefrom) to your system easily
-# and efficiently
-#
-# To keep your CVS tree up-to-date run:
-#
-#	csup standard-supfile
-#
-# Note that this only updates the tree contents and does not
-# update what is actually installed.
-#
-# You may wish to change some of the settings in this file to better
-# suit your system:
-#
-# host=CHANGE_THIS.FreeBSD.org
-#		This specifies the server host which will supply the
-#		file updates.  You must change it to one of the CVSup
-#		mirror sites listed in the FreeBSD Handbook at
-#		http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-#		You can	override this setting on the command line
-#		with cvsup's "-h host" option.
-#
-# base=/var/db
-#		This specifies the root where csup will store information
-#		about the collections you have transferred to your system.
-#		A setting of "/var/db" will generate this information in
-#		/var/db/sup.  You can override the "base" setting on the
-#		command line with cvsup's "-b base" option.  This directory
-#		must exist in order to run CVSup.
-#
-# prefix=/usr
-#		This specifies where to place the requested files.  A
-#		setting of "/usr" will place all of the files requested
-#		in "/usr/src" (e.g., "/usr/src/bin", "/usr/src/lib").
-#		The prefix directory must exist in order to run CVSup.
-
-# Defaults that apply to all the collections
-#
-# IMPORTANT: Change the next line to use one of the CVSup mirror sites
-# listed at http://www.freebsd.org/doc/handbook/cvsup.html#CVSUP-MIRRORS.
-*default host=CHANGE_THIS.FreeBSD.org
-*default base=/var/db
-*default prefix=/usr
-*default release=cvs tag=.
-*default delete use-rel-suffix
-
-# If you seem to be limited by CPU rather than network or disk bandwidth, try
-# commenting out the following line.  (Normally, today's CPUs are fast enough
-# that you want to run compression.)
-*default compress
-
-## Main Source Tree.
-#
-# The easiest way to get the main source tree is to use the "src-all"
-# mega-collection.  It includes all of the individual "src-*" collections.
-src-all
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 5a5293319761..ca0ea36a77ad 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -40,7 +40,6 @@
 #       (VIA CPUs)	c7, c3-2, c3
 #   AMD64 architecture:	amdfam10, opteron-sse3, athlon64-sse3, k8-sse3,
 #			opteron, athlon64, k8, core2, nocona
-#   Intel ia64 architecture:	itanium2, itanium
 #   SPARC-V9 architecture:	v9 (generic 64-bit V9), ultrasparc (default
 #				if omitted), ultrasparc3
 # Additionally the following CPU types are recognized by clang:
@@ -185,18 +184,6 @@
 #ENABLE_SUID_K5SU=
 #
 #
-# CVSup update flags.  Edit SUPFILE settings to reflect whichever distribution
-# file(s) you use on your site (see /usr/share/examples/cvsup/README for more
-# information on CVSup and these files).  To use, do "make update" in /usr/src.
-#
-#SUP_UPDATE=
-#
-#SUP=            /usr/bin/csup
-#SUPFLAGS=       -L 2
-#SUPHOST=        cvsup.uk.FreeBSD.org
-#SUPFILE=        /usr/share/examples/cvsup/standard-supfile
-#PORTSSUPFILE=   /usr/share/examples/cvsup/ports-supfile
-#
 # top(1) uses a hash table for the user names.  The size of this hash
 # can be tuned to match the number of local users.  The table size should
 # be a prime number approximately twice as large as the number of lines in
diff --git a/share/examples/hwpmc/Makefile b/share/examples/hwpmc/Makefile
new file mode 100644
index 000000000000..a455fc6b5551
--- /dev/null
+++ b/share/examples/hwpmc/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+PROG=	overhead
+LDFLAGS+= -lpmc
+MAN=
+
+install:
+
+.include <bsd.prog.mk>
diff --git a/share/examples/hwpmc/README b/share/examples/hwpmc/README
index 035e68d22575..6ad35b680d6a 100644
--- a/share/examples/hwpmc/README
+++ b/share/examples/hwpmc/README
@@ -3,6 +3,4 @@
 Examples illustrating the use of the hwpmc(4) driver and pmc(3)
 library interface.
 
-While there is nothing here yet, the source code for pmccontrol(8)
-and pmcstat(8) could serve as examples.
 
diff --git a/share/examples/hwpmc/overhead.c b/share/examples/hwpmc/overhead.c
new file mode 100644
index 000000000000..14834bd27c3d
--- /dev/null
+++ b/share/examples/hwpmc/overhead.c
@@ -0,0 +1,106 @@
+/*-
+ * Copyright (c) 2014, Neville-Neil Consulting
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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
+ *
+ */
+
+/*
+ * Calculate the time overhead of starting, stopping, and recording
+ * pmc counters.
+ *
+ * The only argument is a counter name, such as "instruction-retired"
+ * which is CPU dependent and can be found with pmmcontrol(8) using
+ * pmccontrol -L.
+ *
+ * The start, stop, read and write operations are timed using the
+ * rdtsc() macro which reads the Time Stamp Counter on the CPU.
+ */
+
+#include <stdio.h>
+#include <err.h>
+#include <sysexits.h>
+#include <sys/types.h>
+#include <machine/cpufunc.h>
+#include <pmc.h>
+
+int
+main(int argc, char **argv)
+{
+	pmc_id_t pmcid;
+	pmc_value_t read_value;
+	pmc_value_t read_clear_value;
+	uint64_t tsc1, write_cyc, start_cyc, read_cyc, stop_cyc;
+	char *counter_name;
+	
+	if (argc != 2)
+		err(EX_USAGE, "counter-name required");
+
+	counter_name = argv[1];
+	
+	if (pmc_init() != 0)
+		err(EX_OSERR, "hwpmc(4) not loaded, kldload or update your kernel");
+
+	if (pmc_allocate(counter_name, PMC_MODE_SC, 0, 0, &pmcid) < 0)
+		err(EX_OSERR, "failed to allocate %s as a system counter in counting mode",
+		    counter_name);
+
+	tsc1 = rdtsc();
+	if (pmc_write(pmcid, 0) < 0)
+		err(EX_OSERR, "failed to zero counter %s", counter_name);
+	write_cyc = rdtsc() - tsc1;
+
+	tsc1 = rdtsc();
+	if (pmc_start(pmcid) < 0)
+		err(EX_OSERR, "failed to start counter %s", counter_name);
+	start_cyc = rdtsc() - tsc1;
+
+	tsc1 = rdtsc();
+	if (pmc_read(pmcid, &read_value) < 0)
+		err(EX_OSERR, "failed to read counter %s", counter_name);
+	read_cyc = rdtsc() - tsc1;
+
+	tsc1 = rdtsc();
+	if (pmc_stop(pmcid) < 0)
+		err(EX_OSERR, "failed to stop counter %s", counter_name);
+	stop_cyc = rdtsc() - tsc1;
+	
+	if (pmc_rw(pmcid, 0, &read_clear_value))
+		err(EX_OSERR, "failed to read and zero %s", counter_name);
+
+	if (pmc_release(pmcid) < 0)
+		err(EX_OSERR, "failed to release %s as a system counter in counting mode",
+		    counter_name);
+
+	printf("Counter %s, read value %ld, read/clear value %ld\n",
+	    counter_name, read_value, read_clear_value);
+	printf("Cycles to start: %ld\tstop: %ld\tread: %ld\twrite: %ld\n",
+	    start_cyc, stop_cyc, read_cyc, stop_cyc);
+
+	return(0);
+}
+
diff --git a/share/examples/mdoc/example.1 b/share/examples/mdoc/example.1
index a578502fafbf..dde029ec4a92 100644
--- a/share/examples/mdoc/example.1
+++ b/share/examples/mdoc/example.1
@@ -150,6 +150,6 @@ manual page example first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.org .
+.An Mike Pritchard Aq Mt mpp@FreeBSD.org .
 .Sh BUGS
 The actual code for this command is vaporware.
diff --git a/share/examples/mdoc/example.3 b/share/examples/mdoc/example.3
index bbdd068e8ea0..fc3b0fd2ba69 100644
--- a/share/examples/mdoc/example.3
+++ b/share/examples/mdoc/example.3
@@ -330,6 +330,6 @@ manual page example first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.org .
+.An Mike Pritchard Aq Mt mpp@FreeBSD.org .
 .Sh BUGS
 The actual code for this function is vaporware.
diff --git a/share/examples/mdoc/example.4 b/share/examples/mdoc/example.4
index c39e4865a9ab..e5c8a1fe035c 100644
--- a/share/examples/mdoc/example.4
+++ b/share/examples/mdoc/example.4
@@ -120,6 +120,6 @@ manual page example first appeared in
 .At v6 .
 .Sh AUTHORS
 This manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.org .
+.An Mike Pritchard Aq Mt mpp@FreeBSD.org .
 .Sh BUGS
 The actual code for this device driver is vaporware.
diff --git a/share/examples/mdoc/example.9 b/share/examples/mdoc/example.9
index 0fb5a1006f7b..97b57ffbc18f 100644
--- a/share/examples/mdoc/example.9
+++ b/share/examples/mdoc/example.9
@@ -338,6 +338,6 @@ manual page example first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Giorgos Keramidas Aq keramida@FreeBSD.org .
+.An Giorgos Keramidas Aq Mt keramida@FreeBSD.org .
 .Sh BUGS
 The actual code for this function is vaporware.
diff --git a/share/examples/scsi_target/scsi_target.8 b/share/examples/scsi_target/scsi_target.8
index 677e2b4ae6fa..4cb6442ee524 100644
--- a/share/examples/scsi_target/scsi_target.8
+++ b/share/examples/scsi_target/scsi_target.8
@@ -155,4 +155,4 @@ and was written by
 It was rewritten for
 .Fx 5.0
 by
-.An Nate Lawson Aq nate@root.org .
+.An Nate Lawson Aq Mt nate@root.org .
diff --git a/share/man/man1/builtin.1 b/share/man/man1/builtin.1
index 72b016bcd20d..1eda275ae2ae 100644
--- a/share/man/man1/builtin.1
+++ b/share/man/man1/builtin.1
@@ -329,4 +329,4 @@ manual page first appeared in
 .Fx 3.4 .
 .Sh AUTHORS
 This manual page was written by
-.An Sheldon Hearn Aq sheldonh@FreeBSD.org .
+.An Sheldon Hearn Aq Mt sheldonh@FreeBSD.org .
diff --git a/share/man/man3/ATOMIC_VAR_INIT.3 b/share/man/man3/ATOMIC_VAR_INIT.3
index e2fc5c0e7cc1..f6c0a5da21ae 100644
--- a/share/man/man3/ATOMIC_VAR_INIT.3
+++ b/share/man/man3/ATOMIC_VAR_INIT.3
@@ -297,5 +297,5 @@ These macros attempt to conform to
 These macros appeared in
 .Fx 10.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org ,
-.An David Chisnall Aq theraven@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
+.An David Chisnall Aq Mt theraven@FreeBSD.org
diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile
index f0cbf0ecd9f3..1213a7a56e40 100644
--- a/share/man/man3/Makefile
+++ b/share/man/man3/Makefile
@@ -68,7 +68,9 @@ MLINKS+=	queue.3 LIST_EMPTY.3 \
 		queue.3 LIST_ENTRY.3 \
 		queue.3 LIST_FIRST.3 \
 		queue.3 LIST_FOREACH.3 \
+		queue.3 LIST_FOREACH_FROM.3 \
 		queue.3 LIST_FOREACH_SAFE.3 \
+		queue.3 LIST_FOREACH_FROM_SAFE.3 \
 		queue.3 LIST_HEAD.3 \
 		queue.3 LIST_HEAD_INITIALIZER.3 \
 		queue.3 LIST_INIT.3 \
@@ -83,7 +85,9 @@ MLINKS+=	queue.3 LIST_EMPTY.3 \
 		queue.3 SLIST_ENTRY.3 \
 		queue.3 SLIST_FIRST.3 \
 		queue.3 SLIST_FOREACH.3 \
+		queue.3 SLIST_FOREACH_FROM.3 \
 		queue.3 SLIST_FOREACH_SAFE.3 \
+		queue.3 SLIST_FOREACH_FROM_SAFE.3 \
 		queue.3 SLIST_HEAD.3 \
 		queue.3 SLIST_HEAD_INITIALIZER.3 \
 		queue.3 SLIST_INIT.3 \
@@ -99,7 +103,9 @@ MLINKS+=	queue.3 LIST_EMPTY.3 \
 		queue.3 STAILQ_ENTRY.3 \
 		queue.3 STAILQ_FIRST.3 \
 		queue.3 STAILQ_FOREACH.3 \
+		queue.3 STAILQ_FOREACH_FROM.3 \
 		queue.3 STAILQ_FOREACH_SAFE.3 \
+		queue.3 STAILQ_FOREACH_FROM_SAFE.3 \
 		queue.3 STAILQ_HEAD.3 \
 		queue.3 STAILQ_HEAD_INITIALIZER.3 \
 		queue.3 STAILQ_INIT.3 \
@@ -117,9 +123,13 @@ MLINKS+=	queue.3 LIST_EMPTY.3 \
 		queue.3 TAILQ_ENTRY.3 \
 		queue.3 TAILQ_FIRST.3 \
 		queue.3 TAILQ_FOREACH.3 \
+		queue.3 TAILQ_FOREACH_FROM.3 \
 		queue.3 TAILQ_FOREACH_REVERSE.3 \
+		queue.3 TAILQ_FOREACH_REVERSE_FROM.3 \
 		queue.3 TAILQ_FOREACH_REVERSE_SAFE.3 \
+		queue.3 TAILQ_FOREACH_REVERSE_FROM_SAFE.3 \
 		queue.3 TAILQ_FOREACH_SAFE.3 \
+		queue.3 TAILQ_FOREACH_FROM_SAFE.3 \
 		queue.3 TAILQ_HEAD.3 \
 		queue.3 TAILQ_HEAD_INITIALIZER.3 \
 		queue.3 TAILQ_INIT.3 \
diff --git a/share/man/man3/offsetof.3 b/share/man/man3/offsetof.3
index 9b3f568e1386..ee5958f7b932 100644
--- a/share/man/man3/offsetof.3
+++ b/share/man/man3/offsetof.3
@@ -16,7 +16,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 18 2010
+.Dd February 18, 2010
 .Dt OFFSETOF 3
 .Os
 .Sh NAME
diff --git a/share/man/man3/pthread.3 b/share/man/man3/pthread.3
index 9c80f709c8eb..78a9153f29a0 100644
--- a/share/man/man3/pthread.3
+++ b/share/man/man3/pthread.3
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 8, 2010
+.Dd August 12, 2014
 .Dt PTHREAD 3
 .Os
 .Sh NAME
@@ -344,13 +344,13 @@ Unblock at least one of the threads blocked on the specified condition variable.
 .Fa "const struct timespec *abstime"
 .Fc
 .Xc
-Wait no longer than the specified time for a condition
-and lock the specified mutex.
+Unlock the specified mutex, wait no longer than the specified time for
+a condition, and then relock the mutex.
 .It Xo
 .Ft int
 .Fn pthread_cond_wait "pthread_cond_t *" "pthread_mutex_t *mutex"
 .Xc
-Wait for a condition and lock the specified mutex.
+Unlock the specified mutex, wait for a condition, and relock the mutex.
 .El
 .Ss Read/Write Lock Routines
 .Bl -tag -width indent
diff --git a/share/man/man3/pthread_affinity_np.3 b/share/man/man3/pthread_affinity_np.3
index 359ce9543ca8..5f867f996128 100644
--- a/share/man/man3/pthread_affinity_np.3
+++ b/share/man/man3/pthread_affinity_np.3
@@ -148,8 +148,6 @@ The
 and
 .Nm pthread_setaffinity_np
 functions were written by
-.An David Xu
-.Aq davidxu@FreeBSD.org ,
+.An David Xu Aq Mt davidxu@FreeBSD.org ,
 and this manpage was written by
-.An Xin LI
-.Aq delphij@FreeBSD.org .
+.An Xin LI Aq Mt delphij@FreeBSD.org .
diff --git a/share/man/man3/pthread_atfork.3 b/share/man/man3/pthread_atfork.3
index 125bb430316e..2e783caccd54 100644
--- a/share/man/man3/pthread_atfork.3
+++ b/share/man/man3/pthread_atfork.3
@@ -113,5 +113,4 @@ function is expected to conform to
 .St -p1003.1 .
 .Sh AUTHORS
 This manpage was written by
-.An Alex Vasylenko
-.Aq lxv@omut.org .
+.An Alex Vasylenko Aq Mt lxv@omut.org .
diff --git a/share/man/man3/pthread_attr_affinity_np.3 b/share/man/man3/pthread_attr_affinity_np.3
index fa1e6bb1b94e..ee63e7d71e1f 100644
--- a/share/man/man3/pthread_attr_affinity_np.3
+++ b/share/man/man3/pthread_attr_affinity_np.3
@@ -156,6 +156,6 @@ The
 and
 .Nm pthread_attr_setaffinity_np
 functions were written by
-.An David Xu Aq davidxu@FreeBSD.org ,
+.An David Xu Aq Mt davidxu@FreeBSD.org ,
 and this manpage was written by
-.An Xin LI Aq delphij@FreeBSD.org .
+.An Xin LI Aq Mt delphij@FreeBSD.org .
diff --git a/share/man/man3/pthread_attr_get_np.3 b/share/man/man3/pthread_attr_get_np.3
index 774be8f02875..e43bcf30e417 100644
--- a/share/man/man3/pthread_attr_get_np.3
+++ b/share/man/man3/pthread_attr_get_np.3
@@ -112,5 +112,4 @@ thread ID.
 The
 .Fn pthread_attr_get_np
 function and this manual page were written by
-.An Alexey Zelkin
-.Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_attr_setcreatesuspend_np.3 b/share/man/man3/pthread_attr_setcreatesuspend_np.3
index 92c2fe0a7059..75408ccefc62 100644
--- a/share/man/man3/pthread_attr_setcreatesuspend_np.3
+++ b/share/man/man3/pthread_attr_setcreatesuspend_np.3
@@ -69,4 +69,4 @@ is invalid.
 .Xr pthread_resume_np 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_cancel.3 b/share/man/man3/pthread_cancel.3
index 7ac5f9de2b0b..e737f5e36429 100644
--- a/share/man/man3/pthread_cancel.3
+++ b/share/man/man3/pthread_cancel.3
@@ -74,7 +74,7 @@ function conforms to
 .St -p1003.1-96 .
 .Sh AUTHORS
 This manual page was written by
-.An David Leonard Aq d@openbsd.org
+.An David Leonard Aq Mt d@openbsd.org
 for the
 .Ox
 implementation of
diff --git a/share/man/man3/pthread_getcpuclockid.3 b/share/man/man3/pthread_getcpuclockid.3
index 94a99ffbe32c..de0e6bcfd5ef 100644
--- a/share/man/man3/pthread_getcpuclockid.3
+++ b/share/man/man3/pthread_getcpuclockid.3
@@ -81,4 +81,4 @@ The
 function first appeared in
 .Fx 10.0 .
 .Sh AUTHORS
-.An David Xu Aq davidxu@FreeBSD.org
+.An David Xu Aq Mt davidxu@FreeBSD.org
diff --git a/share/man/man3/pthread_getthreadid_np.3 b/share/man/man3/pthread_getthreadid_np.3
index bd28c6b5bf20..a912e7d42efa 100644
--- a/share/man/man3/pthread_getthreadid_np.3
+++ b/share/man/man3/pthread_getthreadid_np.3
@@ -53,4 +53,4 @@ None.
 .Xr pthread_self 3
 .Sh AUTHORS
 This manual page was written by
-.An Jung-uk Kim Aq jkim@FreeBSD.org .
+.An Jung-uk Kim Aq Mt jkim@FreeBSD.org .
diff --git a/share/man/man3/pthread_main_np.3 b/share/man/man3/pthread_main_np.3
index 43d72920140a..81669b786094 100644
--- a/share/man/man3/pthread_main_np.3
+++ b/share/man/man3/pthread_main_np.3
@@ -57,4 +57,4 @@ and \-1 if the thread's initialization has not yet completed.
 .Xr pthread_self 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_multi_np.3 b/share/man/man3/pthread_multi_np.3
index 9a42a99585bc..c790d358ca3c 100644
--- a/share/man/man3/pthread_multi_np.3
+++ b/share/man/man3/pthread_multi_np.3
@@ -63,4 +63,4 @@ functions always return 0.
 .Xr pthread_suspend_all_np 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_resume_all_np.3 b/share/man/man3/pthread_resume_all_np.3
index 4c63c3bf4c37..0ac6736a9b74 100644
--- a/share/man/man3/pthread_resume_all_np.3
+++ b/share/man/man3/pthread_resume_all_np.3
@@ -48,4 +48,4 @@ and resumes those which were previously suspended.
 .Xr pthread_suspend_np 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_resume_np.3 b/share/man/man3/pthread_resume_np.3
index 08f7cb96f100..c8444d2dabcd 100644
--- a/share/man/man3/pthread_resume_np.3
+++ b/share/man/man3/pthread_resume_np.3
@@ -69,4 +69,4 @@ argument.
 .Xr pthread_suspend_np 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_set_name_np.3 b/share/man/man3/pthread_set_name_np.3
index aad2fd6c63a8..e3029398bb01 100644
--- a/share/man/man3/pthread_set_name_np.3
+++ b/share/man/man3/pthread_set_name_np.3
@@ -49,4 +49,4 @@ Because of the debugging nature of this function, all errors that may
 appear inside are silently ignored.
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_suspend_all_np.3 b/share/man/man3/pthread_suspend_all_np.3
index fdeab1970fc9..9daedbf7b064 100644
--- a/share/man/man3/pthread_suspend_all_np.3
+++ b/share/man/man3/pthread_suspend_all_np.3
@@ -50,4 +50,4 @@ function.
 .Xr pthread_suspend_np 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_suspend_np.3 b/share/man/man3/pthread_suspend_np.3
index 43d2b7ddea97..32138a15a106 100644
--- a/share/man/man3/pthread_suspend_np.3
+++ b/share/man/man3/pthread_suspend_np.3
@@ -67,4 +67,4 @@ argument.
 .Xr pthread_suspend_all_np 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_switch_add_np.3 b/share/man/man3/pthread_switch_add_np.3
index 0c4207271843..e3400e790335 100644
--- a/share/man/man3/pthread_switch_add_np.3
+++ b/share/man/man3/pthread_switch_add_np.3
@@ -84,4 +84,4 @@ function.
 .Xr pthread_create 3
 .Sh AUTHORS
 This manual page was written by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
+.An Alexey Zelkin Aq Mt phantom@FreeBSD.org .
diff --git a/share/man/man3/pthread_testcancel.3 b/share/man/man3/pthread_testcancel.3
index 007c768a94b0..ef6a1c11bd98 100644
--- a/share/man/man3/pthread_testcancel.3
+++ b/share/man/man3/pthread_testcancel.3
@@ -236,7 +236,7 @@ The standard allows implementations to make many more functions
 cancellation points.
 .Sh AUTHORS
 This manual page was written by
-.An David Leonard Aq d@openbsd.org
+.An David Leonard Aq Mt d@openbsd.org
 for the
 .Ox
 implementation of
diff --git a/share/man/man3/siginfo.3 b/share/man/man3/siginfo.3
index 225576627b44..0d4e59480ad3 100644
--- a/share/man/man3/siginfo.3
+++ b/share/man/man3/siginfo.3
@@ -337,4 +337,4 @@ can be generated as of
 .Fx 9.0 .
 .Sh AUTHORS
 This manual page was written by
-.An "David Xu" Aq davidxu@FreeBSD.org .
+.An David Xu Aq Mt davidxu@FreeBSD.org .
diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index d0f370163b8c..e0ffcaa5407d 100644
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -289,10 +289,8 @@ The
 driver first appeared in
 .Fx 4.3 .
 .Sh AUTHORS
-.An Mike Smith
-.Aq msmith@FreeBSD.org
-.An Scott Long
-.Aq scottl@FreeBSD.org
+.An Mike Smith Aq Mt msmith@FreeBSD.org
+.An Scott Long Aq Mt scottl@FreeBSD.org
 .Sh BUGS
 This driver is not compatible with Dell controllers that have version 1.x
 firmware.
diff --git a/share/man/man4/aacraid.4 b/share/man/man4/aacraid.4
index 5d22ac27131d..2ca830dd24e4 100644
--- a/share/man/man4/aacraid.4
+++ b/share/man/man4/aacraid.4
@@ -128,11 +128,8 @@ and are also queued for retrieval by a management application.
 .Xr scsi 4 ,
 .Xr kldload 8
 .Sh AUTHORS
-.An Achim Leubner
-.Aq achim@FreeBSD.org
-.An Ed Maste
-.Aq emaste@FreeBSD.org
-.An Scott Long
-.Aq scottl@FreeBSD.org
+.An Achim Leubner Aq Mt achim@FreeBSD.org
+.An Ed Maste Aq Mt emaste@FreeBSD.org
+.An Scott Long Aq Mt scottl@FreeBSD.org
 .Sh BUGS
 The controller is not actually paused on suspend/resume.
diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4
index 1e06d685446b..8196c43b5840 100644
--- a/share/man/man4/acpi.4
+++ b/share/man/man4/acpi.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 16, 2012
+.Dd June 23, 2014
 .Dt ACPI 4
 .Os
 .Sh NAME
@@ -61,6 +61,9 @@ If the default settings are not optimal, the following sysctls can be
 used to modify or monitor
 .Nm
 behavior.
+Note that some variables will be available only if the given hardware supports
+them (such as
+.Va hw.acpi.acline ) .
 .Bl -tag -width indent
 .It Va debug.acpi.enable_debug_objects
 Enable dumping Debug objects without
@@ -84,8 +87,7 @@ To enable ACPI CPU idling control,
 should be set to
 .Li acpi
 if it is listed in
-.Va machdep.idle_available
-.
+.Va machdep.idle_available .
 .It Va hw.acpi.cpu.cx_supported
 List of supported CPU idle states and their transition latency
 in microseconds.
@@ -578,7 +580,7 @@ and
 .Xr iasl 8
 utilities and some ACPI knowledge.
 .Sh COMPATIBILITY
-ACPI is only found and supported on i386/ia32, ia64, and amd64.
+ACPI is only found and supported on i386/ia32 and amd64.
 .Sh SEE ALSO
 .Xr kenv 1 ,
 .Xr acpi_thermal 4 ,
@@ -607,16 +609,16 @@ The following people made notable contributions to the ACPI subsystem
 in
 .Fx :
 .An Michael Smith ,
-.An Takanori Watanabe Aq takawata@jp.FreeBSD.org ,
-.An Mitsuru IWASAKI Aq iwasaki@jp.FreeBSD.org ,
+.An Takanori Watanabe Aq Mt takawata@jp.FreeBSD.org ,
+.An Mitsuru IWASAKI Aq Mt iwasaki@jp.FreeBSD.org ,
 .An Munehiro Matsuda ,
 .An Nate Lawson ,
 the ACPI-jp mailing list at
-.Aq acpi-jp@jp.FreeBSD.org ,
+.Aq Mt acpi-jp@jp.FreeBSD.org ,
 and many other contributors.
 .Pp
 This manual page was written by
-.An Michael Smith Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Sh BUGS
 Many BIOS versions have serious bugs that may cause system instability,
 break suspend/resume, or prevent devices from operating properly due to
diff --git a/share/man/man4/acpi_asus.4 b/share/man/man4/acpi_asus.4
index 1921adc771a0..124999a72cc6 100644
--- a/share/man/man4/acpi_asus.4
+++ b/share/man/man4/acpi_asus.4
@@ -175,7 +175,7 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Philip Paeps Aq philip@FreeBSD.org .
+.An Philip Paeps Aq Mt philip@FreeBSD.org .
 .Pp
 Inspiration came from the
 .Em acpi4asus project
diff --git a/share/man/man4/acpi_asus_wmi.4 b/share/man/man4/acpi_asus_wmi.4
index 129894be1280..9949b3b63bcb 100644
--- a/share/man/man4/acpi_asus_wmi.4
+++ b/share/man/man4/acpi_asus_wmi.4
@@ -87,4 +87,4 @@ The
 driver first appeared in
 .Fx 10.0 .
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org .
+.An Alexander Motin Aq Mt mav@FreeBSD.org
diff --git a/share/man/man4/acpi_dock.4 b/share/man/man4/acpi_dock.4
index 1fda11d3c09a..db23b3b7f21e 100644
--- a/share/man/man4/acpi_dock.4
+++ b/share/man/man4/acpi_dock.4
@@ -59,4 +59,4 @@ device driver first appeared in
 The
 .Nm
 device driver was written by
-.An Mitsuru IWASAKI Aq iwasaki@FreeBSD.org .
+.An Mitsuru IWASAKI Aq Mt iwasaki@FreeBSD.org .
diff --git a/share/man/man4/acpi_fujitsu.4 b/share/man/man4/acpi_fujitsu.4
index ef72fee4ba00..5a8271823610 100644
--- a/share/man/man4/acpi_fujitsu.4
+++ b/share/man/man4/acpi_fujitsu.4
@@ -166,10 +166,10 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Sean Bullington Aq shegget@gmail.com ,
-.An Anish Mistry Aq mistry.7@osu.edu ,
+.An Sean Bullington Aq Mt shegget@gmail.com ,
+.An Anish Mistry Aq Mt mistry.7@osu.edu ,
 and
-.An Marc Santcroos Aq marks@ripe.net .
+.An Marc Santcroos Aq Mt marks@ripe.net .
 .Pp
 This manual page was written by
-.An Philip Paeps Aq philip@FreeBSD.org .
+.An Philip Paeps Aq Mt philip@FreeBSD.org .
diff --git a/share/man/man4/acpi_hp.4 b/share/man/man4/acpi_hp.4
index 028d19a491c2..2ea74cf02047 100644
--- a/share/man/man4/acpi_hp.4
+++ b/share/man/man4/acpi_hp.4
@@ -261,7 +261,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Michael Gmelin Aq freebsd@grem.de .
+.An Michael Gmelin Aq Mt freebsd@grem.de .
 .Pp
 It has been inspired by hp-wmi driver, which implements a subset of these
 features (hotkeys) on Linux.
@@ -275,7 +275,7 @@ http://www.microsoft.com/whdc/system/pnppwr/wmi/wmi-acpi.mspx
 .El
 .Pp
 This manual page was written by
-.An Michael Gmelin Aq freebsd@grem.de .
+.An Michael Gmelin Aq Mt freebsd@grem.de .
 .Sh BUGS
 This driver is experimental and has only been tested on i386 on an
 HP Compaq 8510p which featured all supported wireless devices (WWAN/BT/WLAN).
diff --git a/share/man/man4/acpi_ibm.4 b/share/man/man4/acpi_ibm.4
index 4aa6d9fa5c00..d5662073e42b 100644
--- a/share/man/man4/acpi_ibm.4
+++ b/share/man/man4/acpi_ibm.4
@@ -476,10 +476,10 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Takanori Watanabe Aq takawata@FreeBSD.org
+.An Takanori Watanabe Aq Mt takawata@FreeBSD.org
 and later mostly rewritten by
-.An Markus Brueffer Aq markus@FreeBSD.org .
+.An Markus Brueffer Aq Mt markus@FreeBSD.org .
 This manual page was written by
-.An Christian Brueffer Aq brueffer@FreeBSD.org
+.An Christian Brueffer Aq Mt brueffer@FreeBSD.org
 and
-.An Markus Brueffer Aq markus@FreeBSD.org .
+.An Markus Brueffer Aq Mt markus@FreeBSD.org .
diff --git a/share/man/man4/acpi_panasonic.4 b/share/man/man4/acpi_panasonic.4
index 5458a3162ea7..9ea36e45fed1 100644
--- a/share/man/man4/acpi_panasonic.4
+++ b/share/man/man4/acpi_panasonic.4
@@ -173,6 +173,6 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An OGAWA Takaya Aq t\-ogawa@triaez.kaisei.org
+.An OGAWA Takaya Aq Mt t-ogawa@triaez.kaisei.org
 and
-.An TAKAHASHI Yoshihiro Aq nyan@FreeBSD.org .
+.An TAKAHASHI Yoshihiro Aq Mt nyan@FreeBSD.org .
diff --git a/share/man/man4/acpi_rapidstart.4 b/share/man/man4/acpi_rapidstart.4
index fa246f6c7711..0bfa1bd12ca7 100644
--- a/share/man/man4/acpi_rapidstart.4
+++ b/share/man/man4/acpi_rapidstart.4
@@ -81,4 +81,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Takanori Watanabe Aq takawata@FreeBSD.org .
+.An Takanori Watanabe Aq Mt takawata@FreeBSD.org .
diff --git a/share/man/man4/acpi_sony.4 b/share/man/man4/acpi_sony.4
index f0fb0e0835f1..c40ffcf1173d 100644
--- a/share/man/man4/acpi_sony.4
+++ b/share/man/man4/acpi_sony.4
@@ -79,4 +79,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Takanori Watanabe Aq takawata@FreeBSD.org .
+.An Takanori Watanabe Aq Mt takawata@FreeBSD.org .
diff --git a/share/man/man4/acpi_toshiba.4 b/share/man/man4/acpi_toshiba.4
index 134ecc8d302d..3bf19d41bdb3 100644
--- a/share/man/man4/acpi_toshiba.4
+++ b/share/man/man4/acpi_toshiba.4
@@ -123,6 +123,6 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Hiroyuki Aizu Aq aizu@navi.org .
+.An Hiroyuki Aizu Aq Mt aizu@navi.org .
 This manual page was written by
-.An Philip Paeps Aq philip@FreeBSD.org .
+.An Philip Paeps Aq Mt philip@FreeBSD.org .
diff --git a/share/man/man4/acpi_video.4 b/share/man/man4/acpi_video.4
index c28678479e71..2bdd3fb2d180 100644
--- a/share/man/man4/acpi_video.4
+++ b/share/man/man4/acpi_video.4
@@ -78,9 +78,9 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Taku YAMAMOTO Aq taku@cent.saitama-u.ac.jp .
+.An Taku YAMAMOTO Aq Mt taku@cent.saitama-u.ac.jp .
 This manual page was written by
-.An Mark Santcroos Aq marks@ripe.net .
+.An Mark Santcroos Aq Mt marks@ripe.net .
 .Sh BUGS
 Some systems only perform output switching via SMM even though they export
 the proper information via ACPI.
diff --git a/share/man/man4/acpi_wmi.4 b/share/man/man4/acpi_wmi.4
index 28bd0da2ec8a..1eba57553fa9 100644
--- a/share/man/man4/acpi_wmi.4
+++ b/share/man/man4/acpi_wmi.4
@@ -74,7 +74,7 @@ GUID                                  INST EXPE METH STR EVENT OID
 {8F1F6435-9F42-42C8-BADC-0E9424F20C9A}   0 NO   NO   NO  NO    BI
 .Ed
 .Sh SEE ALSO
-.Xr acpi 4 ,
+.Xr acpi 4
 .Sh HISTORY
 The
 .Nm
@@ -85,7 +85,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Michael Gmelin Aq freebsd@grem.de .
+.An Michael Gmelin Aq Mt freebsd@grem.de .
 .Pp
 Work has been inspired by the Linux acpi-wmi driver written by Carlos Corbacho.
 .Pp
@@ -93,4 +93,4 @@ See http://www.microsoft.com/whdc/system/pnppwr/wmi/wmi-acpi.mspx for
 the specification of ACPI-WMI.
 .Pp
 This manual page was written by
-.An Michael Gmelin Aq freebsd@grem.de .
+.An Michael Gmelin Aq Mt freebsd@grem.de .
diff --git a/share/man/man4/ada.4 b/share/man/man4/ada.4
index 760fa6649ae5..433a5476244d 100644
--- a/share/man/man4/ada.4
+++ b/share/man/man4/ada.4
@@ -154,4 +154,4 @@ The
 driver first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org
+.An Alexander Motin Aq Mt mav@FreeBSD.org
diff --git a/share/man/man4/ae.4 b/share/man/man4/ae.4
index 6bfe9d66bdf1..c7cf25eec590 100644
--- a/share/man/man4/ae.4
+++ b/share/man/man4/ae.4
@@ -137,8 +137,7 @@ instead.
 The
 .Nm
 driver and this manual page was written by
-.An Stanislav Sedov
-.Aq stas@FreeBSD.org .
+.An Stanislav Sedov Aq Mt stas@FreeBSD.org .
 It first appeared in
 .Fx 7.1 .
 .Sh BUGS
diff --git a/share/man/man4/aesni.4 b/share/man/man4/aesni.4
index 0001ca274f8e..3a8e101ec228 100644
--- a/share/man/man4/aesni.4
+++ b/share/man/man4/aesni.4
@@ -87,7 +87,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Konstantin Belousov Aq kib@FreeBSD.org .
+.An Konstantin Belousov Aq Mt kib@FreeBSD.org .
 The key schedule calculation code was adopted from the sample provided
 by Intel and used in the analogous
 .Ox
diff --git a/share/man/man4/age.4 b/share/man/man4/age.4
index 28e52c22451a..054627fec4eb 100644
--- a/share/man/man4/age.4
+++ b/share/man/man4/age.4
@@ -181,7 +181,6 @@ Display lots of useful MAC counters maintained in the driver.
 The
 .Nm
 driver was written by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
 It first appeared in
 .Fx 7.1 .
diff --git a/share/man/man4/ahci.4 b/share/man/man4/ahci.4
index 1019e6dc2709..67ead8dcfc31 100644
--- a/share/man/man4/ahci.4
+++ b/share/man/man4/ahci.4
@@ -181,4 +181,4 @@ The
 driver first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org .
+.An Alexander Motin Aq Mt mav@FreeBSD.org
diff --git a/share/man/man4/aibs.4 b/share/man/man4/aibs.4
index b955f0f094d2..c760465ae638 100644
--- a/share/man/man4/aibs.4
+++ b/share/man/man4/aibs.4
@@ -194,7 +194,7 @@ driver was written for
 and
 .Fx
 by
-.An Constantine A. Murenin Aq cnst@FreeBSD.org ,
+.An Constantine A. Murenin Aq Mt cnst@FreeBSD.org ,
 Raouf Boutaba Research Group,
 David R. Cheriton School of Computer Science,
 University of Waterloo.
diff --git a/share/man/man4/alc.4 b/share/man/man4/alc.4
index 9fe3c291e7be..0c6af6aed0b5 100644
--- a/share/man/man4/alc.4
+++ b/share/man/man4/alc.4
@@ -162,7 +162,6 @@ a change takes effect.
 The
 .Nm
 driver was written by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
 It first appeared in
 .Fx 8.0 .
diff --git a/share/man/man4/ale.4 b/share/man/man4/ale.4
index d5102a157e85..85fc6e24424c 100644
--- a/share/man/man4/ale.4
+++ b/share/man/man4/ale.4
@@ -156,7 +156,6 @@ a change takes effect.
 The
 .Nm
 driver was written by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
 It first appeared in
 .Fx 7.1 .
diff --git a/share/man/man4/alpm.4 b/share/man/man4/alpm.4
index 43ee4596178e..5bfa8774a81f 100644
--- a/share/man/man4/alpm.4
+++ b/share/man/man4/alpm.4
@@ -57,6 +57,6 @@ manual page first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Nicolas Souchu Aq nsouch@FreeBSD.org
+.An Nicolas Souchu Aq Mt nsouch@FreeBSD.org .
 .Sh BUGS
 Only polling mode is supported.
diff --git a/share/man/man4/amdpm.4 b/share/man/man4/amdpm.4
index f791a28ba283..9f6ab7cc233a 100644
--- a/share/man/man4/amdpm.4
+++ b/share/man/man4/amdpm.4
@@ -67,6 +67,6 @@ Based heavily on the
 driver by
 .An Nicolas Souchu .
 This manual page was written by
-.An Murray Stokely Aq murray@FreeBSD.org .
+.An Murray Stokely Aq Mt murray@FreeBSD.org .
 .Sh BUGS
 Only polling mode is supported.
diff --git a/share/man/man4/amdsbwd.4 b/share/man/man4/amdsbwd.4
index cfb2f79624d8..429ca44499b1 100644
--- a/share/man/man4/amdsbwd.4
+++ b/share/man/man4/amdsbwd.4
@@ -69,6 +69,6 @@ and
 The
 .Nm
 driver was written by
-.An Andriy Gapon Aq avg@FreeBSD.org .
+.An Andriy Gapon Aq Mt avg@FreeBSD.org .
 This manual page was written by
-.An Andriy Gapon Aq avg@FreeBSD.org .
+.An Andriy Gapon Aq Mt avg@FreeBSD.org .
diff --git a/share/man/man4/amdsmb.4 b/share/man/man4/amdsmb.4
index c038584082f9..93018d81ee88 100644
--- a/share/man/man4/amdsmb.4
+++ b/share/man/man4/amdsmb.4
@@ -51,4 +51,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Ruslan Ermilov Aq ru@FreeBSD.org .
+.An Ruslan Ermilov Aq Mt ru@FreeBSD.org .
diff --git a/share/man/man4/amdtemp.4 b/share/man/man4/amdtemp.4
index 52444f539a9b..86b7a4069bfc 100644
--- a/share/man/man4/amdtemp.4
+++ b/share/man/man4/amdtemp.4
@@ -91,9 +91,9 @@ The
 driver first appeared in
 .Fx 7.1 .
 .Sh AUTHORS
-.An Rui Paulo Aq rpaulo@FreeBSD.org
-.An Norikatsu Shigemura Aq nork@FreeBSD.org
-.An Jung-uk Kim Aq jkim@FreeBSD.org
+.An Rui Paulo Aq Mt rpaulo@FreeBSD.org
+.An Norikatsu Shigemura Aq Mt nork@FreeBSD.org
+.An Jung-uk Kim Aq Mt jkim@FreeBSD.org
 .Sh CAVEATS
 For Family 10h and later processors,
 .Do
diff --git a/share/man/man4/amr.4 b/share/man/man4/amr.4
index ad94ffe2c8dc..1a38ee98cad8 100644
--- a/share/man/man4/amr.4
+++ b/share/man/man4/amr.4
@@ -233,9 +233,9 @@ An I/O error has occurred.
 The
 .Nm
 driver was written by
-.An Mike Smith Aq msmith@FreeBSD.org .
+.An Mike Smith Aq Mt msmith@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Mike Smith Aq msmith@FreeBSD.org
+.An Mike Smith Aq Mt msmith@FreeBSD.org
 and
-.An Jeroen Ruigrok van der Werven Aq asmodai@FreeBSD.org .
+.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org .
diff --git a/share/man/man4/an.4 b/share/man/man4/an.4
index 608a4edf9a0c..dd21376269df 100644
--- a/share/man/man4/an.4
+++ b/share/man/man4/an.4
@@ -141,4 +141,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
diff --git a/share/man/man4/aout.4 b/share/man/man4/aout.4
index e44362ec2807..8e7b02b886fa 100644
--- a/share/man/man4/aout.4
+++ b/share/man/man4/aout.4
@@ -40,7 +40,7 @@ executable format was used before the release of
 Since i386 was the only supported architecture at that time,
 .Xr a.out 5
 executables can only be activated on platforms that support
-execution of i386 code, such as i386, amd64 and (partially) ia64.
+execution of i386 code, such as i386 and amd64.
 .Pp
 To add kernel support for old syscalls and old syscall invocation methods,
 place the following options in the kernel configuration file:
@@ -141,6 +141,6 @@ it was superseded by
 The
 .Nm
 manual page was written by
-.An Konstantin Belousov Aq kib@FreeBSD.org .
+.An Konstantin Belousov Aq Mt kib@FreeBSD.org .
 .Sh BUGS
 On 64bit architectures, not all wrappers for older syscalls are implemented.
diff --git a/share/man/man4/arcmsr.4 b/share/man/man4/arcmsr.4
index 1d4d650702aa..b34bbd747f80 100644
--- a/share/man/man4/arcmsr.4
+++ b/share/man/man4/arcmsr.4
@@ -163,7 +163,7 @@ driver first appeared in
 .Fx 5.4 .
 .Sh AUTHORS
 The driver was written by
-.An Erich Chen Aq erich@areca.com.tw .
+.An Erich Chen Aq Mt erich@areca.com.tw .
 .Sh BUGS
 The driver has been tested on i386 and amd64.
 It likely requires additional
diff --git a/share/man/man4/asmc.4 b/share/man/man4/asmc.4
index 6ad37442e0cd..c74dc9ea015e 100644
--- a/share/man/man4/asmc.4
+++ b/share/man/man4/asmc.4
@@ -155,9 +155,8 @@ The
 driver first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An -nosplit
-.An Rui Paulo Aq rpaulo@FreeBSD.org
-(Google Summer of Code project).
+.An Rui Paulo Aq Mt rpaulo@FreeBSD.org
+(Google Summer of Code project)
 .Sh BUGS
 Support for the latest models was never tested and is most likely not
 fully working.
diff --git a/share/man/man4/asr.4 b/share/man/man4/asr.4
index 955eb0f3655a..9311d64a9775 100644
--- a/share/man/man4/asr.4
+++ b/share/man/man4/asr.4
@@ -108,8 +108,8 @@ The
 .Nm
 driver was kindly donated by Adaptec
 and is maintained by
-.An Mark Salyzyn Aq mark_salyzyn@adaptec.com .
+.An Mark Salyzyn Aq Mt mark_salyzyn@adaptec.com .
 This manual page was written by
 .An Mark Salyzyn
 and fixed up by
-.An Jeroen Ruigrok van der Werven Aq asmodai@FreeBSD.org .
+.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org .
diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4
index a1cbad39e55a..4b53bf795e6b 100644
--- a/share/man/man4/ata.4
+++ b/share/man/man4/ata.4
@@ -267,7 +267,5 @@ It was turned into a
 interface module in
 .Fx 9.0 .
 .Sh AUTHORS
-.An Alexander Motin
-.Aq mav@FreeBSD.org ,
-.An S\(/oren Schmidt
-.Aq sos@FreeBSD.org
+.An Alexander Motin Aq Mt mav@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4
index 17ccef5435a0..202963a3035d 100644
--- a/share/man/man4/atkbd.4
+++ b/share/man/man4/atkbd.4
@@ -223,8 +223,8 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
 and
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
 This manual page was written by
 .An Kazutaka Yokota .
diff --git a/share/man/man4/atkbdc.4 b/share/man/man4/atkbdc.4
index 46d30c1ec24e..d0fc50d145a5 100644
--- a/share/man/man4/atkbdc.4
+++ b/share/man/man4/atkbdc.4
@@ -116,4 +116,4 @@ It is based on the kbdio module in
 The kbdio module, the
 .Nm
 driver and this manual page were written by
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
diff --git a/share/man/man4/atp.4 b/share/man/man4/atp.4
index f7827988ca30..6309d09b97d4 100644
--- a/share/man/man4/atp.4
+++ b/share/man/man4/atp.4
@@ -154,4 +154,4 @@ types.
 The
 .Nm
 driver was written by
-.An Rohit Grover Aq rgrover1@gmail.com .
+.An Rohit Grover Aq Mt rgrover1@gmail.com .
diff --git a/share/man/man4/audit.4 b/share/man/man4/audit.4
index 8fbce7db4ea8..9f3f17f0ff6d 100644
--- a/share/man/man4/audit.4
+++ b/share/man/man4/audit.4
@@ -123,7 +123,7 @@ The Basic Security Module (BSM) interface to audit records and audit event
 stream format were defined by Sun Microsystems.
 .Pp
 This manual page was written by
-.An Robert Watson Aq rwatson@FreeBSD.org .
+.An Robert Watson Aq Mt rwatson@FreeBSD.org .
 .Sh BUGS
 The
 .Fx
diff --git a/share/man/man4/auditpipe.4 b/share/man/man4/auditpipe.4
index 19db8565b703..af20f803629b 100644
--- a/share/man/man4/auditpipe.4
+++ b/share/man/man4/auditpipe.4
@@ -234,7 +234,7 @@ Support for kernel audit first appeared in
 .Fx 6.2 .
 .Sh AUTHORS
 The audit pipe facility was designed and implemented by
-.An Robert Watson Aq rwatson@FreeBSD.org .
+.An Robert Watson Aq Mt rwatson@FreeBSD.org .
 .Pp
 The Basic Security Module (BSM) interface to audit records and audit event
 stream format were defined by Sun Microsystems.
diff --git a/share/man/man4/aue.4 b/share/man/man4/aue.4
index c708c8948fdd..cfb59296ea56 100644
--- a/share/man/man4/aue.4
+++ b/share/man/man4/aue.4
@@ -202,4 +202,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
diff --git a/share/man/man4/axe.4 b/share/man/man4/axe.4
index 65e1887de270..06241a691a9f 100644
--- a/share/man/man4/axe.4
+++ b/share/man/man4/axe.4
@@ -255,4 +255,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/share/man/man4/axge.4 b/share/man/man4/axge.4
index 33f7db3188ff..d89ea8cd24f1 100644
--- a/share/man/man4/axge.4
+++ b/share/man/man4/axge.4
@@ -137,14 +137,15 @@ The
 device driver first appeared in
 .Fx 10.1 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 driver was written by
-.An Kevin Lo Aq kevlo@FreeBSD.org
+.An Kevin Lo Aq Mt kevlo@FreeBSD.org
 and
-.An Li-Wen Hsu Aq lwhsu@FreeBSD.org .
+.An Li-Wen Hsu Aq Mt lwhsu@FreeBSD.org .
 This manual page was adapted by
-.An Mark Johnston Aq markj@FreeBSD.org
+.An Mark Johnston Aq Mt markj@FreeBSD.org
 from the
 .Xr axe 4
 manual page.
diff --git a/share/man/man4/bce.4 b/share/man/man4/bce.4
index 004ffa30f2aa..9d7fc9dd19c0 100644
--- a/share/man/man4/bce.4
+++ b/share/man/man4/bce.4
@@ -411,7 +411,7 @@ For support questions please contact your QLogic approved reseller or
 QLogic Technical Support at
 .Pa http://support.qlogic.com ,
 or by E-mail at
-.Aq support@qlogic.com .
+.Aq Mt support@qlogic.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -429,4 +429,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An David Christensen Aq davidch@broadcom.com .
+.An David Christensen Aq Mt davidch@broadcom.com .
diff --git a/share/man/man4/bge.4 b/share/man/man4/bge.4
index dc31ff6695ab..474b48fa5ff1 100644
--- a/share/man/man4/bge.4
+++ b/share/man/man4/bge.4
@@ -261,4 +261,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/share/man/man4/bhyve.4 b/share/man/man4/bhyve.4
index cdfc1e294d8b..4947ecfc903f 100644
--- a/share/man/man4/bhyve.4
+++ b/share/man/man4/bhyve.4
@@ -58,9 +58,9 @@ and was developed at NetApp Inc.
 .Nm
 was developed by
 .An -nosplit
-.An "Peter Grehan" Aq grehan@FreeBSD.org
+.An Peter Grehan Aq Mt grehan@FreeBSD.org
 and
-.An "Neel Natu" Aq neel@FreeBSD.org
+.An Neel Natu Aq Mt neel@FreeBSD.org
 at NetApp Inc.
 .Sh BUGS
 .Nm
diff --git a/share/man/man4/bktr.4 b/share/man/man4/bktr.4
index 59136bff593d..5590b4a9fb11 100644
--- a/share/man/man4/bktr.4
+++ b/share/man/man4/bktr.4
@@ -257,10 +257,10 @@ driver first appeared in
 .Sh AUTHORS
 .An -nosplit
 This driver is based on the work of
-.An Jim Lowe Aq james@miller.cs.uwm.edu ,
-.An Mark Tinguely Aq tinguely@plains.nodak.edu ,
-.An Amancio Hasty Aq hasty@star-gate.com ,
-.An Roger Hardiman Aq roger@FreeBSD.org
+.An Jim Lowe Aq Mt james@miller.cs.uwm.edu ,
+.An Mark Tinguely Aq Mt tinguely@plains.nodak.edu ,
+.An Amancio Hasty Aq Mt hasty@star-gate.com ,
+.An Roger Hardiman Aq Mt roger@FreeBSD.org
 and a bunch of other people.
 Support for Pinnacle PCTV Rave cards was added by
-.An Branko Lankester Aq branko@euro.net .
+.An Branko Lankester Aq Mt branko@euro.net .
diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4
index ec54666c53c1..cecffc595e0d 100644
--- a/share/man/man4/bridge.4
+++ b/share/man/man4/bridge.4
@@ -500,20 +500,17 @@ driver first appeared in
 The
 .Nm bridge
 driver was originally written by
-.An Jason L. Wright
-.Aq jason@thought.net
+.An Jason L. Wright Aq Mt jason@thought.net
 as part of an undergraduate independent study at the University of
 North Carolina at Greensboro.
 .Pp
 This version of the
 .Nm
 driver has been heavily modified from the original version by
-.An Jason R. Thorpe
-.Aq thorpej@wasabisystems.com .
+.An Jason R. Thorpe Aq Mt thorpej@wasabisystems.com .
 .Pp
 Rapid Spanning Tree Protocol (RSTP) support was added by
-.An Andrew Thompson
-.Aq thompsa@FreeBSD.org .
+.An Andrew Thompson Aq Mt thompsa@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/bwn.4 b/share/man/man4/bwn.4
index 4aa75fda4944..3dc43b4bfd0d 100644
--- a/share/man/man4/bwn.4
+++ b/share/man/man4/bwn.4
@@ -146,8 +146,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Weongyo Jeong
-.Aq weongyo@FreeBSD.org .
+.An Weongyo Jeong Aq Mt weongyo@FreeBSD.org .
 .\".Sh BUGS
 .\"Some card based on the BCM4306 and BCM4309 chips do not work properly
 .\"on channel 1, 2 and 3.
diff --git a/share/man/man4/bxe.4 b/share/man/man4/bxe.4
index 0067385b7cb4..cdc23f570a00 100644
--- a/share/man/man4/bxe.4
+++ b/share/man/man4/bxe.4
@@ -320,7 +320,7 @@ For support questions please contact your QLogic approved reseller or
 QLogic Technical Support at
 .Pa http://support.qlogic.com ,
 or by E-mail at
-.Aq support@qlogic.com .
+.Aq Mt support@qlogic.com .
 .Sh SEE ALSO
 .Xr netstat 1 ,
 .Xr altq 4 ,
@@ -338,7 +338,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Eric Davis Aq edavis@broadcom.com ,
-.An David Christensen Aq davidch@broadcom.com ,
+.An Eric Davis Aq Mt edavis@broadcom.com ,
+.An David Christensen Aq Mt davidch@broadcom.com ,
 and
-.An Gary Zambrano Aq zambrano@broadcom.com .
+.An Gary Zambrano Aq Mt zambrano@broadcom.com .
diff --git a/share/man/man4/capsicum.4 b/share/man/man4/capsicum.4
index 9009d3ff4b46..9290cbcf0328 100644
--- a/share/man/man4/capsicum.4
+++ b/share/man/man4/capsicum.4
@@ -116,15 +116,15 @@ and was developed at the University of Cambridge.
 .Nm
 was developed by
 .An -nosplit
-.An "Robert Watson" Aq rwatson@FreeBSD.org
+.An Robert Watson Aq Mt rwatson@FreeBSD.org
 and
-.An "Jonathan Anderson" Aq jonathan@FreeBSD.org
+.An Jonathan Anderson Aq Mt jonathan@FreeBSD.org
 at the University of Cambridge, and
-.An "Ben Laurie" Aq benl@FreeBSD.org
+.An Ben Laurie Aq Mt benl@FreeBSD.org
 and
-.An "Kris Kennaway" Aq kris@FreeBSD.org
+.An Kris Kennaway Aq Mt kris@FreeBSD.org
 at Google, Inc., and
-.An "Pawel Jakub Dawidek" Aq pawel@dawidek.net .
+.An Pawel Jakub Dawidek Aq Mt pawel@dawidek.net .
 .Sh BUGS
 .Nm
 is considered experimental in
diff --git a/share/man/man4/cas.4 b/share/man/man4/cas.4
index 36a5ab19d55f..6fbbfcfcf298 100644
--- a/share/man/man4/cas.4
+++ b/share/man/man4/cas.4
@@ -152,8 +152,7 @@ and supports the same set of controllers but is otherwise unrelated.
 The
 .Nm
 driver was written by
-.An Marius Strobl
-.Aq marius@FreeBSD.org
+.An Marius Strobl Aq Mt marius@FreeBSD.org
 based on the
 .Xr gem 4
 driver.
diff --git a/share/man/man4/cc_cdg.4 b/share/man/man4/cc_cdg.4
index c111bd46ed40..38f8ed397def 100644
--- a/share/man/man4/cc_cdg.4
+++ b/share/man/man4/cc_cdg.4
@@ -145,11 +145,11 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module was written by
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
 This manual page was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org
 and
-.An Grenville Armitage Aq garmitage@swin.edu.au .
+.An Grenville Armitage Aq Mt garmitage@swin.edu.au .
 .Sh BUGS
 The underlying algorithm and parameter values are still a work in progress and
 may not be optimal for some network scenarios.
diff --git a/share/man/man4/cc_chd.4 b/share/man/man4/cc_chd.4
index 39cdef3b601d..963d89247fde 100644
--- a/share/man/man4/cc_chd.4
+++ b/share/man/man4/cc_chd.4
@@ -125,4 +125,4 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module and this manual page were written by
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
diff --git a/share/man/man4/cc_cubic.4 b/share/man/man4/cc_cubic.4
index 771f2643b9bb..75df183fa16f 100644
--- a/share/man/man4/cc_cubic.4
+++ b/share/man/man4/cc_cubic.4
@@ -109,6 +109,6 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module and this manual page were written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org
 and
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
diff --git a/share/man/man4/cc_hd.4 b/share/man/man4/cc_hd.4
index d0acb34c05ec..497e61616a0a 100644
--- a/share/man/man4/cc_hd.4
+++ b/share/man/man4/cc_hd.4
@@ -117,4 +117,4 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module and this manual page were written by
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
diff --git a/share/man/man4/cc_htcp.4 b/share/man/man4/cc_htcp.4
index 45d00186c878..0e141bb79a7d 100644
--- a/share/man/man4/cc_htcp.4
+++ b/share/man/man4/cc_htcp.4
@@ -126,11 +126,11 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module was written by
-.An James Healy Aq jimmy@deefa.com
+.An James Healy Aq Mt jimmy@deefa.com
 and
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org
 and
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
diff --git a/share/man/man4/cc_newreno.4 b/share/man/man4/cc_newreno.4
index fe4c3db306b4..b00f18f93ce8 100644
--- a/share/man/man4/cc_newreno.4
+++ b/share/man/man4/cc_newreno.4
@@ -73,10 +73,10 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module was written by
-.An James Healy Aq jimmy@deefa.com ,
-.An Lawrence Stewart Aq lstewart@FreeBSD.org
+.An James Healy Aq Mt jimmy@deefa.com ,
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org
 and
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
 .Pp
 This manual page was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man4/cc_vegas.4 b/share/man/man4/cc_vegas.4
index a7397d58d20d..45b4b6244017 100644
--- a/share/man/man4/cc_vegas.4
+++ b/share/man/man4/cc_vegas.4
@@ -133,4 +133,4 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 congestion control module and this manual page were written by
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
diff --git a/share/man/man4/cdce.4 b/share/man/man4/cdce.4
index e055e1b96f62..d38a9698f593 100644
--- a/share/man/man4/cdce.4
+++ b/share/man/man4/cdce.4
@@ -139,15 +139,15 @@ and
 The
 .Nm
 driver was written by
-.An Craig Boston Aq craig@tobuj.gank.org
+.An Craig Boston Aq Mt craig@tobuj.gank.org
 based on the
 .Xr aue 4
 driver written by
-.An Bill Paul Aq wpaul@windriver.com
+.An Bill Paul Aq Mt wpaul@windriver.com
 and ported to
 .Ox
 by
-.An Daniel Hartmeier Aq dhartmei@openbsd.org .
+.An Daniel Hartmeier Aq Mt dhartmei@openbsd.org .
 .Sh CAVEATS
 Many USB devices notoriously fail to report their class and interfaces
 correctly.
diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4
index d097d54ab6ea..121199b4c669 100644
--- a/share/man/man4/ch.4
+++ b/share/man/man4/ch.4
@@ -340,13 +340,13 @@ driver appeared in
 The
 .Nm
 driver was written by
-.An Jason R. Thorpe Aq thorpej@and.com
+.An Jason R. Thorpe Aq Mt thorpej@and.com
 for And Communications,
 .Pa http://www.and.com/ .
 It was added to the system by
-.An Stefan Grefen Aq grefen@goofy.zdv.uni-mainz.de
+.An Stefan Grefen Aq Mt grefen@goofy.zdv.uni-mainz.de
 who apparently had such a device.
 It was ported to CAM by
-.An Kenneth Merry Aq ken@FreeBSD.org .
+.An Kenneth Merry Aq Mt ken@FreeBSD.org .
 It was updated to support volume tags by
-.An Hans Huebner Aq hans@artcom.de .
+.An Hans Huebner Aq Mt hans@artcom.de .
diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4
index 284944bd177b..f79efe89a22a 100644
--- a/share/man/man4/ciss.4
+++ b/share/man/man4/ciss.4
@@ -184,7 +184,7 @@ HP Modular Smart Array 500 (MSA500)
 The
 .Nm
 driver was written by
-.An Mike Smith Aq msmith@FreeBSD.org .
+.An Mike Smith Aq Mt msmith@FreeBSD.org .
 .Pp
 This manual page is based on his comments and was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man4/cm.4 b/share/man/man4/cm.4
index bbeee52f9532..a933918e9faf 100644
--- a/share/man/man4/cm.4
+++ b/share/man/man4/cm.4
@@ -145,18 +145,18 @@ The
 device was ported from
 .Nx
 by
-.An Max Khon Aq fjoe@FreeBSD.org
+.An Max Khon Aq Mt fjoe@FreeBSD.org
 and first appeared in
 .Fx 4.6 .
 This manual page first appeared in
 .Fx 5.3 .
 .Sh AUTHORS
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 The
 .Sx IMPLEMENTATION NOTES
 section was submitted by
-.An Max Khon Aq fjoe@FreeBSD.org
+.An Max Khon Aq Mt fjoe@FreeBSD.org
 and originated from
 .Nx .
 .Sh BUGS
diff --git a/share/man/man4/cmx.4 b/share/man/man4/cmx.4
index 844e6c446e5a..38ae4661789d 100644
--- a/share/man/man4/cmx.4
+++ b/share/man/man4/cmx.4
@@ -103,11 +103,11 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Daniel Roethlisberger Aq daniel@roe.ch ,
+.An Daniel Roethlisberger Aq Mt daniel@roe.ch ,
 originally based on the Linux driver v1.1.0 by
-.An Omnikey GmbH Aq www.omnikey.com .
+.An Omnikey GmbH Lk www.omnikey.com .
 Early testing and bug fixes by
-.An Marcin Cieslak Aq saper@system.pl .
+.An Marcin Cieslak Aq Mt saper@system.pl .
 .Sh BUGS
 .An -nosplit
 The way the
diff --git a/share/man/man4/coretemp.4 b/share/man/man4/coretemp.4
index efae020a152c..91a975861a0a 100644
--- a/share/man/man4/coretemp.4
+++ b/share/man/man4/coretemp.4
@@ -68,7 +68,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Rui Paulo Aq rpaulo@FreeBSD.org
+.An Rui Paulo Aq Mt rpaulo@FreeBSD.org
 as part of a Google Summer of Code project.
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/share/man/man4/cpuctl.4 b/share/man/man4/cpuctl.4
index ed80f8aae1cd..470734b719a9 100644
--- a/share/man/man4/cpuctl.4
+++ b/share/man/man4/cpuctl.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 30, 2009
+.Dd June 20, 2014
 .Dt CPUCTL 4
 .Os
 .Sh NAME
@@ -65,7 +65,7 @@ All of the supported operations are invoked using the
 .Xr ioctl 2
 system call.
 Currently, the following ioctls are defined:
-.Bl -tag -width CPUCTL_UPDATE
+.Bl -tag -width CPUCTL_CPUID_COUNT
 .It Dv CPUCTL_RDMSR Fa cpuctl_msr_args_t *args
 .It Dv CPUCTL_WRMSR Fa cpuctl_msr_args_t *args
 Read/write CPU machine specific register.
@@ -87,20 +87,59 @@ Set/clear MSR bits according to the mask given in the
 field.
 .It Dv CPUCTL_CPUID Fa cpuctl_cpuid_args_t *args
 Retrieve CPUID information.
-Arguments are supplied in
-the following struct:
+Arguments are supplied in the following structure:
 .Bd -literal
 typedef struct {
-	int		level;	/* CPUID level */
+	int		level;		/* CPUID level */
 	uint32_t	data[4];
 } cpuctl_cpuid_args_t;
 .Ed
-.Pp
+It is equivalent to the
+.Dv CPUCTL_CPUID_COUNT
+request with
+.Va level_type
+set to 0.
+.It Dv CPUCTL_CPUID_COUNT Fa cpuctl_cpuid_count_args_t *args
+Retrieve CPUID information.
+Arguments are supplied in the following structure:
+.Bd -literal
+typedef struct {
+	int		level;		/* CPUID level */
+	int		level_type;	/* CPUID level type */
+	uint32_t	data[4];
+} cpuctl_cpuid_count_args_t;
+.Ed
 The
 .Va level
-field indicates the CPUID level to retrieve information for, while the
+field indicates the CPUID level to retrieve,
+it is loaded into the
+.Va %eax
+register before the CPUID instruction is executed,
+The
+.Va level_type
+field indicates the CPUID level type to retrieve,
+it is loaded into the
+.Va %ecx
+register.
+.Pp
+The
 .Va data
 field is used to store the received CPUID data.
+That is,
+.Va data[0]
+contains the value of
+.Va %eax
+register after the CPUID instruction is executed,
+.Va data[1]
+is for
+.Va %ebx ,
+.Va data[2]
+for
+.Va %ecx ,
+and
+.Va data[3]
+for
+.Va %edx .
 .It Dv CPUCTL_UPDATE cpuctl_update_args_t *args
 Update CPU firmware (microcode).
 The structure is defined in
@@ -149,6 +188,6 @@ driver first appeared in
 The
 .Nm
 module and this manual page were written by
-.An Stanislav Sedov Aq stas@FreeBSD.org .
+.An Stanislav Sedov Aq Mt stas@FreeBSD.org .
 .Sh BUGS
 Yes, probably, report if any.
diff --git a/share/man/man4/ctl.4 b/share/man/man4/ctl.4
index 7122a92b0ab8..51fd0a536020 100644
--- a/share/man/man4/ctl.4
+++ b/share/man/man4/ctl.4
@@ -90,4 +90,4 @@ subsystem first appeared in
 The
 .Nm
 subsystem was written by
-.An Kenneth Merry Aq ken@FreeBSD.org .
+.An Kenneth Merry Aq Mt ken@FreeBSD.org .
diff --git a/share/man/man4/cue.4 b/share/man/man4/cue.4
index a27653cffa8a..0ed9e8d7eb60 100644
--- a/share/man/man4/cue.4
+++ b/share/man/man4/cue.4
@@ -110,4 +110,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
diff --git a/share/man/man4/cxgb.4 b/share/man/man4/cxgb.4
index 97f72b570d99..5df049fc14d6 100644
--- a/share/man/man4/cxgb.4
+++ b/share/man/man4/cxgb.4
@@ -110,7 +110,7 @@ go to the Chelsio support website at:
 If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
-.Aq support@chelsio.com .
+.Aq Mt support@chelsio.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -129,6 +129,6 @@ and
 The
 .Nm
 driver was written by
-.An Kip Macy Aq kmacy@FreeBSD.org
+.An Kip Macy Aq Mt kmacy@FreeBSD.org
 with substantial support from
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Scott Long Aq Mt scottl@FreeBSD.org .
diff --git a/share/man/man4/cxgbe.4 b/share/man/man4/cxgbe.4
index af6a6a0c4f65..215a1948381b 100644
--- a/share/man/man4/cxgbe.4
+++ b/share/man/man4/cxgbe.4
@@ -292,7 +292,7 @@ go to the Chelsio support website at:
 .Pp
 If an issue is identified with this driver with a supported adapter,
 email all the specific information related to the issue to
-.Aq support@chelsio.com .
+.Aq Mt support@chelsio.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -314,4 +314,4 @@ and
 The
 .Nm
 driver was written by
-.An Navdeep Parhar Aq np@FreeBSD.org .
+.An Navdeep Parhar Aq Mt np@FreeBSD.org .
diff --git a/share/man/man4/dc.4 b/share/man/man4/dc.4
index cc6250c2c2ea..ba033cf2e252 100644
--- a/share/man/man4/dc.4
+++ b/share/man/man4/dc.4
@@ -383,7 +383,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
 .Sh BUGS
 The Macronix application notes claim that in order to put the
 chips in normal operation, the driver must write a certain magic
diff --git a/share/man/man4/dcons.4 b/share/man/man4/dcons.4
index 91bb4b459164..3f33dd214ef9 100644
--- a/share/man/man4/dcons.4
+++ b/share/man/man4/dcons.4
@@ -119,7 +119,7 @@ dcons_gdb="1"
 .Xr dconschat 8 ,
 .Xr fwcontrol 8
 .Sh AUTHORS
-.An Hidetoshi Shimokawa Aq simokawa@FreeBSD.org
+.An Hidetoshi Shimokawa Aq Mt simokawa@FreeBSD.org
 .Sh BUGS
 This driver is
 .Ud
diff --git a/share/man/man4/dcons_crom.4 b/share/man/man4/dcons_crom.4
index b9c5ca09deb1..eca479d5f99f 100644
--- a/share/man/man4/dcons_crom.4
+++ b/share/man/man4/dcons_crom.4
@@ -51,7 +51,7 @@ This address is supposed to be used by
 .Xr dconschat 8 ,
 .Xr fwcontrol 8
 .Sh AUTHORS
-.An Hidetoshi Shimokawa Aq simokawa@FreeBSD.org
+.An Hidetoshi Shimokawa Aq Mt simokawa@FreeBSD.org
 .Sh BUGS
 If you load
 .Pa dcons_crom.ko
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index 01f5135f58e1..15ff4f742729 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -60,7 +60,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 30, 2013
+.Dd July 15, 2014
 .Dt DDB 4
 .Os
 .Sh NAME
@@ -572,17 +572,26 @@ Dump data about APIC IDT vector mappings.
 Show breakpoints set with the "break" command.
 .\"
 .Pp
-.It Ic show Cm buffer
-Show buffer structure of
+.It Ic show Cm bio Ar addr
+Show information about the bio structure
+.Vt struct bio
+present at
+.Ar addr .
+See the
+.Pa sys/bio.h
+header file and
+.Xr g_bio 9
+for more details on the exact meaning of the structure fields.
+.\"
+.Pp
+.It Ic show Cm buffer Ar addr
+Show information about the buf structure
 .Vt struct buf
-type.
-Such a structure is used within the
-.Fx
-kernel for the I/O subsystem
-implementation.
-For an exact interpretation of the output, please see the
+present at
+.Ar addr .
+See the
 .Pa sys/buf.h
-header file.
+header file for more details on the exact meaning of the structure fields.
 .\"
 .Pp
 .It Ic show Cm cbstat
@@ -1115,7 +1124,7 @@ abbreviations.
 .It Ic capture status
 .Nm
 supports a basic output capture facility, which can be used to retrieve the
-results of debugging commands from userpsace using
+results of debugging commands from userspace using
 .Xr sysctl 2 .
 .Ic capture on
 enables output capture;
@@ -1420,7 +1429,7 @@ diagnose problems.
 Other bus' bridge chipsets may be able to generate NMI using bus specific
 methods.
 .Sh FILES
-Header files mention in this manual page can be found below
+Header files mentioned in this manual page can be found below
 .Pa /usr/include
 directory.
 .Pp
diff --git a/share/man/man4/divert.4 b/share/man/man4/divert.4
index d22275ec630e..d8296995ca97 100644
--- a/share/man/man4/divert.4
+++ b/share/man/man4/divert.4
@@ -175,7 +175,7 @@ that was not associated with any interface.
 .Xr ipfw 4 ,
 .Xr ipfw 8
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org ,
+.An Archie Cobbs Aq Mt archie@FreeBSD.org ,
 Whistle Communications Corp.
 .Sh BUGS
 This is an attempt to provide a clean way for user mode processes
diff --git a/share/man/man4/dummynet.4 b/share/man/man4/dummynet.4
index a5d0e6c8d05a..65571b3dde1f 100644
--- a/share/man/man4/dummynet.4
+++ b/share/man/man4/dummynet.4
@@ -69,7 +69,7 @@ facility
 was initially implemented as a testing tool for
 .Tn TCP
 congestion control by
-.An Luigi Rizzo Aq luigi@iet.unipi.it ,
+.An Luigi Rizzo Aq Mt luigi@iet.unipi.it ,
 as described on ACM Computer Communication Review, Jan.97 issue.
 Later it has been modified to work at the
 .Tn IP
diff --git a/share/man/man4/em.4 b/share/man/man4/em.4
index 9c95286736f5..ab50ab13a4e3 100644
--- a/share/man/man4/em.4
+++ b/share/man/man4/em.4
@@ -260,7 +260,7 @@ go to the Intel support website at:
 If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
-.Aq freebsd@intel.com .
+.Aq Mt freebsd@intel.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -280,7 +280,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Intel Corporation Aq freebsd@intel.com .
+.An Intel Corporation Aq Mt freebsd@intel.com .
 .Sh BUGS
 Hardware-assisted VLAN processing is disabled by default.
 You can enable it on an
diff --git a/share/man/man4/esp.4 b/share/man/man4/esp.4
index 6ebc85b31123..ccb574ce5e9e 100644
--- a/share/man/man4/esp.4
+++ b/share/man/man4/esp.4
@@ -102,11 +102,9 @@ The
 driver was ported to
 .Fx
 by
-.An Scott Long
-.Aq scottl@FreeBSD.org
+.An Scott Long Aq Mt scottl@FreeBSD.org
 and later on considerably improved by
-.An Marius Strobl
-.Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/est.4 b/share/man/man4/est.4
index 9f60206edac5..0dc4922fb991 100644
--- a/share/man/man4/est.4
+++ b/share/man/man4/est.4
@@ -91,7 +91,6 @@ The valid frequencies that are allowed by this CPU and their step values.
 .It dev.est.0.freq_settings: 2201/45000 2200/45000 2000/39581 1900/37387
 1800/34806 1700/32703 1600/30227 1500/28212 1400/25828 1300/23900 1200/21613
 1100/19775 1000/17582 900/15437 800/13723
-.Pp
 .El
 .Sh DIAGNOSTICS
 .Bl -diag
@@ -118,4 +117,4 @@ is only found on supported Intel CPUs.
 .Re
 .Sh AUTHORS
 This manual page was written by
-.An Sean Bruno Aq sbruno@FreeBSD.org .
+.An Sean Bruno Aq Mt sbruno@FreeBSD.org .
diff --git a/share/man/man4/et.4 b/share/man/man4/et.4
index 9b9947017423..7a0a92e7d534 100644
--- a/share/man/man4/et.4
+++ b/share/man/man4/et.4
@@ -177,10 +177,10 @@ release to include it was
 The
 .Nm
 driver was written by
-.An Sepherosa Ziehau Aq sepherosa@gmail.com
+.An Sepherosa Ziehau Aq Mt sepherosa@gmail.com
 for
 .Dx .
 It was ported to
 .Fx
 by
-.An Xin LI Aq delphij@FreeBSD.org .
+.An Xin LI Aq Mt delphij@FreeBSD.org .
diff --git a/share/man/man4/fatm.4 b/share/man/man4/fatm.4
index 51dc6fc0eb79..c59ff338b644 100644
--- a/share/man/man4/fatm.4
+++ b/share/man/man4/fatm.4
@@ -103,7 +103,7 @@ fatm0: <FORE PCA200E> mem 0xd5800000-0xd59fffff irq 9 at device 9.0 on pci0
 .Xr natmip 4 ,
 .Xr utopia 4
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
 .Sh BUGS
 These cards can CBR shape a single VCC only.
 It is currently possible to
diff --git a/share/man/man4/ffclock.4 b/share/man/man4/ffclock.4
index 9110c167ceb1..992610dc28d8 100644
--- a/share/man/man4/ffclock.4
+++ b/share/man/man4/ffclock.4
@@ -118,12 +118,12 @@ Feed-forward clock support first appeared in
 .Sh AUTHORS
 .An -nosplit
 The feed-forward clock support was written by
-.An Julien Ridoux Aq jridoux@unimelb.edu.au
+.An Julien Ridoux Aq Mt jridoux@unimelb.edu.au
 in collaboration with
-.An Darryl Veitch Aq dveitch@unimelb.edu.au
+.An Darryl Veitch Aq Mt dveitch@unimelb.edu.au
 at the University of Melbourne under sponsorship from the FreeBSD Foundation.
 .Pp
 This manual page was written by
-.An Julien Ridoux Aq jridoux@unimelb.edu.au
+.An Julien Ridoux Aq Mt jridoux@unimelb.edu.au
 and
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man4/full.4 b/share/man/man4/full.4
index a71eb926361d..1cd3f1a04021 100644
--- a/share/man/man4/full.4
+++ b/share/man/man4/full.4
@@ -44,4 +44,4 @@ However, it will always be full when writing to it.
 .Xr zero 4
 .Sh Author
 This device and man page was written by
-.An Eitan Adler Aq eadler@FreeBSD.org .
+.An Eitan Adler Aq Mt eadler@FreeBSD.org .
diff --git a/share/man/man4/gbde.4 b/share/man/man4/gbde.4
index 2b868e555482..ada799729ca7 100644
--- a/share/man/man4/gbde.4
+++ b/share/man/man4/gbde.4
@@ -301,4 +301,4 @@ under DARPA/SPAWAR contract N66001-01-C-8035
 as part of the
 DARPA CHATS research program.
 .Sh AUTHORS
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
diff --git a/share/man/man4/gdb.4 b/share/man/man4/gdb.4
index f81ef402a0eb..dc733821dc75 100644
--- a/share/man/man4/gdb.4
+++ b/share/man/man4/gdb.4
@@ -578,7 +578,7 @@ message to remind you to remove it again.
 .Xr kldload 8
 .Sh AUTHORS
 This man page was written by
-.An "Greg Lehey" Aq grog@FreeBSD.org .
+.An Greg Lehey Aq Mt grog@FreeBSD.org .
 .Sh BUGS
 The
 .Xr gdb 1
diff --git a/share/man/man4/gem.4 b/share/man/man4/gem.4
index e4ebeb0ca6d0..44e06251ea61 100644
--- a/share/man/man4/gem.4
+++ b/share/man/man4/gem.4
@@ -133,16 +133,12 @@ The
 driver was written for
 .Nx
 by
-.An Eduardo Horvath
-.Aq eeh@NetBSD.org .
+.An Eduardo Horvath Aq Mt eeh@NetBSD.org .
 It was ported to
 .Fx
 by
-.An Thomas Moestl
-.Aq tmm@FreeBSD.org
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org
 and later on improved by
-.An Marius Strobl
-.Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
 The man page was written by
-.An Thomas Klausner
-.Aq wiz@NetBSD.org .
+.An Thomas Klausner Aq Mt wiz@NetBSD.org .
diff --git a/share/man/man4/geom.4 b/share/man/man4/geom.4
index 3cfc28383d14..c881f476ed0e 100644
--- a/share/man/man4/geom.4
+++ b/share/man/man4/geom.4
@@ -481,4 +481,4 @@ in
 .Fx
 never succeeded.
 .Sh AUTHORS
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
diff --git a/share/man/man4/geom_fox.4 b/share/man/man4/geom_fox.4
index 8010d24d4d06..55d84f143e79 100644
--- a/share/man/man4/geom_fox.4
+++ b/share/man/man4/geom_fox.4
@@ -181,9 +181,9 @@ da2.fox     N/A  da2
 The
 .Nm
 driver was written by
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 This manual page was written by
-.An "Wilko Bulte" Aq wilko@FreeBSD.org .
+.An Wilko Bulte Aq Mt wilko@FreeBSD.org .
 .Sh CAVEATS
 The
 .Nm
diff --git a/share/man/man4/geom_linux_lvm.4 b/share/man/man4/geom_linux_lvm.4
index 7dee047512d6..2e1c8aa07ad1 100644
--- a/share/man/man4/geom_linux_lvm.4
+++ b/share/man/man4/geom_linux_lvm.4
@@ -85,4 +85,4 @@ Consumers:
 The
 .Nm
 driver was written by
-.An "Andrew Thompson" Aq thompsa@FreeBSD.org .
+.An Andrew Thompson Aq Mt thompsa@FreeBSD.org .
diff --git a/share/man/man4/geom_map.4 b/share/man/man4/geom_map.4
index 6af91be5d82c..51b15c79f8d7 100644
--- a/share/man/man4/geom_map.4
+++ b/share/man/man4/geom_map.4
@@ -208,4 +208,4 @@ hint.map.5.name="config"
 The
 .Nm
 driver was written by
-.An "Aleksandr Rybalko" Aq ray@ddteam.net .
+.An Aleksandr Rybalko Aq Mt ray@ddteam.net .
diff --git a/share/man/man4/geom_uncompress.4 b/share/man/man4/geom_uncompress.4
index 6e848d430fac..0682c690fe38 100644
--- a/share/man/man4/geom_uncompress.4
+++ b/share/man/man4/geom_uncompress.4
@@ -100,8 +100,8 @@ Consumers:
 The
 .Nm
 driver was written by
-.An "Maxim Sobolev" Aq sobomax@FreeBSD.org
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org
 and
-.An "Aleksandr Rybalko" Aq ray@FreeBSD.org .
+.An Aleksandr Rybalko Aq Mt ray@FreeBSD.org .
 This manual page was written by
-.An "Luiz Otavio O Souza" Aq loos@FreeBSD.org .
+.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org .
diff --git a/share/man/man4/geom_uzip.4 b/share/man/man4/geom_uzip.4
index 8d27673614bc..3344f8fe7aec 100644
--- a/share/man/man4/geom_uzip.4
+++ b/share/man/man4/geom_uzip.4
@@ -100,6 +100,6 @@ Consumers:
 The
 .Nm
 driver was written by
-.An "Max Khon" Aq fjoe@FreeBSD.org .
+.An Max Khon Aq Mt fjoe@FreeBSD.org .
 This manual page was written by
-.An "Ceri Davies" Aq ceri@FreeBSD.org .
+.An Ceri Davies Aq Mt ceri@FreeBSD.org .
diff --git a/share/man/man4/gpio.4 b/share/man/man4/gpio.4
index 119f9384c2cb..0e2c8cdb1423 100644
--- a/share/man/man4/gpio.4
+++ b/share/man/man4/gpio.4
@@ -142,4 +142,4 @@ manual page first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Sean Bruno Aq sbruno@FreeBSD.org .
+.An Sean Bruno Aq Mt sbruno@FreeBSD.org .
diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4
index a9267c97c40a..72bb5104d06d 100644
--- a/share/man/man4/gre.4
+++ b/share/man/man4/gre.4
@@ -306,7 +306,7 @@ A description of GRE encapsulation can be found in RFC 1701 and RFC 1702.
 .Pp
 A description of MOBILE encapsulation can be found in RFC 2004.
 .Sh AUTHORS
-.An Heiko W.Rupp Aq hwr@pilhuhn.de
+.An Heiko W.Rupp Aq Mt hwr@pilhuhn.de
 .Sh BUGS
 The
 .Fn compute_route
diff --git a/share/man/man4/h_ertt.4 b/share/man/man4/h_ertt.4
index 3dbedab451ad..84b68a6d44d9 100644
--- a/share/man/man4/h_ertt.4
+++ b/share/man/man4/h_ertt.4
@@ -135,7 +135,7 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 Khelp module and this manual page were written by
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
 .Sh BUGS
 The module maintains enhanced RTT estimates for all new TCP connections created
 after the time at which the module was loaded.
diff --git a/share/man/man4/hatm.4 b/share/man/man4/hatm.4
index 59de800438e7..e6e1714ea3fd 100644
--- a/share/man/man4/hatm.4
+++ b/share/man/man4/hatm.4
@@ -264,7 +264,7 @@ hatm0: ForeRunnerHE 622, Rev. D, S/N 2949834, MAC=00:20:48:2d:02:ca
 .Xr ifconfig 8 ,
 .Xr route 8
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
 .Sh CAVEATS
 When putting a HE155 into a 64-bit 66MHz PCI slot the machine may hang.
 This occurs very early in the POST so that even the display does not turn on.
diff --git a/share/man/man4/hme.4 b/share/man/man4/hme.4
index 2bdc72a6af42..f75ee452be17 100644
--- a/share/man/man4/hme.4
+++ b/share/man/man4/hme.4
@@ -147,5 +147,4 @@ version to include it was
 The
 .Nm
 driver was written by
-.An Paul Kranenburg
-.Aq pk@NetBSD.org .
+.An Paul Kranenburg Aq Mt pk@NetBSD.org .
diff --git a/share/man/man4/hpt27xx.4 b/share/man/man4/hpt27xx.4
index 01f9ba563645..4ad5eaf1cffb 100644
--- a/share/man/man4/hpt27xx.4
+++ b/share/man/man4/hpt27xx.4
@@ -97,5 +97,5 @@ The
 device driver was written by
 .An HighPoint Technologies, Inc. .
 This manual page was written by
-.An Xin LI Aq delphij@FreeBSD.org
+.An Xin LI Aq Mt delphij@FreeBSD.org
 for iXsystems, Inc.
diff --git a/share/man/man4/hptiop.4 b/share/man/man4/hptiop.4
index c1017f1f449d..fdd6d04c820d 100644
--- a/share/man/man4/hptiop.4
+++ b/share/man/man4/hptiop.4
@@ -126,7 +126,7 @@ The
 driver has only been tested on the i386 and amd64 platforms.
 .Sh SEE ALSO
 .Xr cam 4 ,
-.Xr hptmv 4 ,
+.Xr hptmv 4
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man4/hptnr.4 b/share/man/man4/hptnr.4
index e441b3ada2d8..47b691874896 100644
--- a/share/man/man4/hptnr.4
+++ b/share/man/man4/hptnr.4
@@ -88,5 +88,5 @@ The
 device driver was written by
 .An HighPoint Technologies, Inc. .
 This manual page was written by
-.An Xin LI Aq delphij@FreeBSD.org
+.An Xin LI Aq Mt delphij@FreeBSD.org
 for iXsystems, Inc.
diff --git a/share/man/man4/hv_ata_pci_disengage.4 b/share/man/man4/hv_ata_pci_disengage.4
index b8699f7b0b1b..2123e8b7655f 100644
--- a/share/man/man4/hv_ata_pci_disengage.4
+++ b/share/man/man4/hv_ata_pci_disengage.4
@@ -87,4 +87,4 @@ Microsoft Corporation, and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man4/hv_kvp.4 b/share/man/man4/hv_kvp.4
index afd3e321f167..269eef728d70 100644
--- a/share/man/man4/hv_kvp.4
+++ b/share/man/man4/hv_kvp.4
@@ -93,4 +93,4 @@ Incorporated, Microsoft Corporation and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man4/hv_netvsc.4 b/share/man/man4/hv_netvsc.4
index ed04e9d4506b..31325bb9e735 100644
--- a/share/man/man4/hv_netvsc.4
+++ b/share/man/man4/hv_netvsc.4
@@ -80,4 +80,4 @@ Microsoft Corporation, and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man4/hv_storvsc.4 b/share/man/man4/hv_storvsc.4
index 57b6127924ed..54805f101aa2 100644
--- a/share/man/man4/hv_storvsc.4
+++ b/share/man/man4/hv_storvsc.4
@@ -86,4 +86,4 @@ Microsoft Corporation, and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man4/hv_utils.4 b/share/man/man4/hv_utils.4
index 844e59933535..82439eaa6749 100644
--- a/share/man/man4/hv_utils.4
+++ b/share/man/man4/hv_utils.4
@@ -82,4 +82,4 @@ Microsoft Corporation, and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man4/hv_vmbus.4 b/share/man/man4/hv_vmbus.4
index 873cb28e2ddc..daafd5d505f0 100644
--- a/share/man/man4/hv_vmbus.4
+++ b/share/man/man4/hv_vmbus.4
@@ -90,4 +90,4 @@ Microsoft Corporation, and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man4/hwpmc.4 b/share/man/man4/hwpmc.4
index b0c393049cc0..5777cdd4264d 100644
--- a/share/man/man4/hwpmc.4
+++ b/share/man/man4/hwpmc.4
@@ -780,8 +780,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An "Joseph Koshy"
-.Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
 .Sh BUGS
 The driver samples the state of the kernel's logical processor support
 at the time of initialization (i.e., at module load time).
diff --git a/share/man/man4/ichsmb.4 b/share/man/man4/ichsmb.4
index a415941b6001..5fded279dbf9 100644
--- a/share/man/man4/ichsmb.4
+++ b/share/man/man4/ichsmb.4
@@ -54,4 +54,4 @@ device contained in the Intel 82801AA (ICH), 82801AB (ICH0),
 .Xr smb 4 ,
 .Xr smbus 4
 .Sh AUTHORS
-.An Archie L. Cobbs Aq archie@FreeBSD.org
+.An Archie L. Cobbs Aq Mt archie@FreeBSD.org
diff --git a/share/man/man4/ichwd.4 b/share/man/man4/ichwd.4
index 25b6dbb52e75..35a5f7f1a6e4 100644
--- a/share/man/man4/ichwd.4
+++ b/share/man/man4/ichwd.4
@@ -83,8 +83,8 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Wm. Daryl Hawkins Aq dhawkins@tamu.edu
+.An Wm. Daryl Hawkins Aq Mt dhawkins@tamu.edu
 of Texas A&M University and
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/share/man/man4/ida.4 b/share/man/man4/ida.4
index 01e0267cd24e..52f4bf21bde4 100644
--- a/share/man/man4/ida.4
+++ b/share/man/man4/ida.4
@@ -77,8 +77,8 @@ Pass-through should only be used to a device that is otherwise quiescent.
 The
 .Nm
 driver was written by
-.An Jonathan Lemon Aq jlemon@FreeBSD.org
+.An Jonathan Lemon Aq Mt jlemon@FreeBSD.org
 and
-.An Matthew N. Dodd Aq mdodd@FreeBSD.org .
+.An Matthew N. Dodd Aq Mt mdodd@FreeBSD.org .
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man4/igb.4 b/share/man/man4/igb.4
index 5c857c8a9258..cd916b017328 100644
--- a/share/man/man4/igb.4
+++ b/share/man/man4/igb.4
@@ -205,7 +205,7 @@ go to the Intel support website at:
 If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
-.Aq freebsd@intel.com .
+.Aq Mt freebsd@intel.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -225,4 +225,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Intel Corporation Aq freebsd@intel.com .
+.An Intel Corporation Aq Mt freebsd@intel.com .
diff --git a/share/man/man4/iic.4 b/share/man/man4/iic.4
index 9f410a3f5a9e..d82f5745cc37 100644
--- a/share/man/man4/iic.4
+++ b/share/man/man4/iic.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 6, 2006
+.Dd June 24, 2014
 .Dt IIC 4
 .Os
 .Sh NAME
@@ -51,12 +51,20 @@ following ioctls:
 Sends the start condition to the slave specified by the
 .Va slave
 element to the bus.
+The
+.Va slave
+element consists of a 7-bit address and a read/write bit
+(i.e., 7-bit address << 1 | r/w).
+If the read/write bit is set a read operation is initiated, if the read/write
+bit is cleared a write operation is initiated.
 All other elements are ignored.
 .It Dv I2CRPTSTART
 .Pq Vt "struct iiccmd"
 Sends the repeated start condition to the slave specified by the
 .Va slave
 element to the bus.
+The slave address should be specified as in
+.Dv I2CSTART .
 All other elements are ignored.
 .It Dv I2CSTOP
 No argument is passed.
@@ -115,10 +123,15 @@ is set in
 Otherwise the transfer is a write transfer.
 The
 .Va slave
-element specifies the 7-bit address for the transfer.
+element specifies the 7-bit address with the read/write bit for the transfer.
+The read/write bit will be handled by the iicbus stack based on the specified
+transfer operation.
 The
 .Va len
-element is the length of the data.
+element is the number of
+.Pq Vt "struct iic_msg"
+messages encoded on
+.Pq Vt "struct iic_rdwr_data" .
 The
 .Va buf
 element is a buffer for that data.
diff --git a/share/man/man4/iicbus.4 b/share/man/man4/iicbus.4
index a8de99869bea..4bbc846a529b 100644
--- a/share/man/man4/iicbus.4
+++ b/share/man/man4/iicbus.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 6, 1998
+.Dd June 24, 2014
 .Dt IICBUS 4
 .Os
 .Sh NAME
@@ -105,6 +105,7 @@ Some I2C interfaces are available:
 .El
 .Sh SEE ALSO
 .Xr bktr 4 ,
+.Xr iic 4 ,
 .Xr iicbb 4 ,
 .Xr lpbb 4 ,
 .Xr pcf 4
diff --git a/share/man/man4/iir.4 b/share/man/man4/iir.4
index a7608b2ece7f..d9e4309771cd 100644
--- a/share/man/man4/iir.4
+++ b/share/man/man4/iir.4
@@ -69,9 +69,9 @@ The
 .Nm
 driver is supported and maintained by
 .An -nosplit
-.An Achim Leubner Aq Achim_Leubner@adaptec.com .
+.An Achim Leubner Aq Mt Achim_Leubner@adaptec.com .
 .Pp
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 and is based on information supplied by the driver authors and the website of
-.An Mike Smith Aq msmith@FreeBSD.org .
+.An Mike Smith Aq Mt msmith@FreeBSD.org .
diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4
index 238cdbdb4ad3..0b7a108db52c 100644
--- a/share/man/man4/inet.4
+++ b/share/man/man4/inet.4
@@ -56,10 +56,9 @@ protocol.
 Internet addresses are four byte quantities, stored in
 network standard format (on little endian machines, such as the
 .Tn alpha ,
-.Tn amd64 ,
-.Tn i386
+.Tn amd64
 and
-.Tn ia64
+.Tn i386
 these are word and byte reversed).
 The include file
 .In netinet/in.h
diff --git a/share/man/man4/intpm.4 b/share/man/man4/intpm.4
index 5e015a8f371d..c9cf47e19625 100644
--- a/share/man/man4/intpm.4
+++ b/share/man/man4/intpm.4
@@ -54,7 +54,7 @@ driver first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Takanori Watanabe Aq takawata@shidahara1.planet.sci.kobe-u.ac.jp .
+.An Takanori Watanabe Aq Mt takawata@shidahara1.planet.sci.kobe-u.ac.jp .
 .Sh BUGS
 This device requires IRQ 9 exclusively.
 To use this, you should enable
diff --git a/share/man/man4/ipmi.4 b/share/man/man4/ipmi.4
index 25dc341aed18..9516d31ddb61 100644
--- a/share/man/man4/ipmi.4
+++ b/share/man/man4/ipmi.4
@@ -192,9 +192,9 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Doug Ambrisko Aq ambrisko@FreeBSD.org .
+.An Doug Ambrisko Aq Mt ambrisko@FreeBSD.org .
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 .Sh BUGS
 Not all features of the MontaVista driver are supported.
 .Pp
diff --git a/share/man/man4/ips.4 b/share/man/man4/ips.4
index 0a38d5b44713..b22b91ca5f4c 100644
--- a/share/man/man4/ips.4
+++ b/share/man/man4/ips.4
@@ -198,7 +198,7 @@ driver was written by
 .An -nosplit
 .An David Jefferys
 and
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Scott Long Aq Mt scottl@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man4/ipw.4 b/share/man/man4/ipw.4
index 9becdfa3a51b..9dfbd6dce525 100644
--- a/share/man/man4/ipw.4
+++ b/share/man/man4/ipw.4
@@ -152,4 +152,4 @@ This should not happen.
 The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien.bergamini@free.fr .
+.An Damien Bergamini Aq Mt damien.bergamini@free.fr .
diff --git a/share/man/man4/isci.4 b/share/man/man4/isci.4
index 1d9353d1ea2e..06e249b6dfc2 100644
--- a/share/man/man4/isci.4
+++ b/share/man/man4/isci.4
@@ -105,9 +105,11 @@ and 9.1.
 The
 .Nm
 driver was developed by Intel and originally written by
-.An Jim Harris Aq jimharris@FreeBSD.org
-with contributions from Sohaib Ahsan and input from
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Jim Harris Aq Mt jimharris@FreeBSD.org
+with contributions from
+.An Sohaib Ahsan
+and input from
+.An Scott Long Aq Mt scottl@FreeBSD.org .
 .Pp
 This man page was written by
-.An Jim Harris Aq jimharris@FreeBSD.org .
+.An Jim Harris Aq Mt jimharris@FreeBSD.org .
diff --git a/share/man/man4/ismt.4 b/share/man/man4/ismt.4
index 15baf4b8556e..63a395278803 100644
--- a/share/man/man4/ismt.4
+++ b/share/man/man4/ismt.4
@@ -56,4 +56,4 @@ The
 driver first appeared in
 .Fx 11.0 .
 .Sh AUTHORS
-.An Jim Harris Aq jimharris@FreeBSD.org
+.An Jim Harris Aq Mt jimharris@FreeBSD.org
diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4
index 97ff634f4c73..683f49655eb3 100644
--- a/share/man/man4/iwi.4
+++ b/share/man/man4/iwi.4
@@ -157,4 +157,4 @@ This should not happen.
 The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien.bergamini@free.fr
+.An Damien Bergamini Aq Mt damien.bergamini@free.fr .
diff --git a/share/man/man4/iwn.4 b/share/man/man4/iwn.4
index f489321e2de1..0a824e7c847a 100644
--- a/share/man/man4/iwn.4
+++ b/share/man/man4/iwn.4
@@ -192,4 +192,4 @@ This should not happen.
 The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien.bergamini@free.fr .
+.An Damien Bergamini Aq Mt damien.bergamini@free.fr .
diff --git a/share/man/man4/ixgb.4 b/share/man/man4/ixgb.4
index 59d164825c4c..b1e9af34698f 100644
--- a/share/man/man4/ixgb.4
+++ b/share/man/man4/ixgb.4
@@ -102,7 +102,7 @@ go to the Intel support website at:
 If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
-.Aq freebsd@intel.com .
+.Aq Mt freebsd@intel.com .
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr em 4 ,
@@ -122,4 +122,4 @@ and
 The
 .Nm
 driver was written by
-.An Intel Corporation Aq freebsd@intel.com .
+.An Intel Corporation Aq Mt freebsd@intel.com .
diff --git a/share/man/man4/ixgbe.4 b/share/man/man4/ixgbe.4
index be056d3b97a4..99c1cc7f8e27 100644
--- a/share/man/man4/ixgbe.4
+++ b/share/man/man4/ixgbe.4
@@ -105,7 +105,7 @@ go to the Intel support website at:
 If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
-.Aq freebsd@intel.com .
+.Aq Mt freebsd@intel.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -123,4 +123,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Intel Corporation Aq freebsd@intel.com .
+.An Intel Corporation Aq Mt freebsd@intel.com .
diff --git a/share/man/man4/jme.4 b/share/man/man4/jme.4
index e17a797b63ec..513c253e15ff 100644
--- a/share/man/man4/jme.4
+++ b/share/man/man4/jme.4
@@ -165,8 +165,7 @@ a change takes effect.
 The
 .Nm
 driver was written by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
 It first appeared in
 .Fx 7.1 .
 .Sh CAVEATS
diff --git a/share/man/man4/joy.4 b/share/man/man4/joy.4
index 4de2f5a6ee41..566dc73fe112 100644
--- a/share/man/man4/joy.4
+++ b/share/man/man4/joy.4
@@ -116,4 +116,4 @@ The
 driver appeared in
 .Fx 2.0.5 .
 .Sh AUTHORS
-.An Jean-Marc Zucconi Aq jmz@cabri.obs-besancon.fr
+.An Jean-Marc Zucconi Aq Mt jmz@cabri.obs-besancon.fr
diff --git a/share/man/man4/kbdmux.4 b/share/man/man4/kbdmux.4
index 72b588906a14..a909ba9e8809 100644
--- a/share/man/man4/kbdmux.4
+++ b/share/man/man4/kbdmux.4
@@ -41,7 +41,7 @@ The
 module was implemented in
 .Fx 6.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh CAVEATS
 The
 .Nm
diff --git a/share/man/man4/keyboard.4 b/share/man/man4/keyboard.4
index 8cff2924e8fb..4a71aa3828f3 100644
--- a/share/man/man4/keyboard.4
+++ b/share/man/man4/keyboard.4
@@ -167,4 +167,4 @@ The
 .Xr kbdcontrol 1
 utility also allows changing these values at runtime.
 .Sh AUTHORS
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4
index de991c40ffd7..185389a4944d 100644
--- a/share/man/man4/kld.4
+++ b/share/man/man4/kld.4
@@ -146,7 +146,7 @@ facility provided by
 The
 .Nm
 facility was originally implemented by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
 .Sh BUGS
 If a module B, is dependent on another module A, but is not compiled with
 module A as a dependency, then
diff --git a/share/man/man4/ksyms.4 b/share/man/man4/ksyms.4
index 5c1dae002e2c..6ce42ea6205e 100644
--- a/share/man/man4/ksyms.4
+++ b/share/man/man4/ksyms.4
@@ -130,8 +130,7 @@ to support
 The
 .Nm
 driver was written by
-.An Stacey Son
-.Aq sson@FreeBSD.org .
+.An Stacey Son Aq Mt sson@FreeBSD.org .
 .Sh BUGS
 Because files can be dynamically linked into the kernel at any time the symbol
 information can vary.  When you open the
diff --git a/share/man/man4/kue.4 b/share/man/man4/kue.4
index c9a8ad710904..c5353198e688 100644
--- a/share/man/man4/kue.4
+++ b/share/man/man4/kue.4
@@ -134,7 +134,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/lagg.4 b/share/man/man4/lagg.4
index bb2cfc6c0161..392f5f73cdc6 100644
--- a/share/man/man4/lagg.4
+++ b/share/man/man4/lagg.4
@@ -190,7 +190,7 @@ The
 driver was written under the name
 .Nm trunk
 by
-.An Reyk Floeter Aq reyk@openbsd.org .
+.An Reyk Floeter Aq Mt reyk@openbsd.org .
 The LACP implementation was written by
 .An YAMAMOTO Takashi
 for
diff --git a/share/man/man4/le.4 b/share/man/man4/le.4
index 0a1823d30311..0316e4687398 100644
--- a/share/man/man4/le.4
+++ b/share/man/man4/le.4
@@ -427,7 +427,7 @@ driver which first appeared in
 The
 .Nm
 driver was ported by
-.An "Marius Strobl" Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
 .\" .Sh BUGS
 .\" The Am7990 Revision C chips have a bug which causes garbage to be inserted
 .\" in front of the received packet occasionally.
diff --git a/share/man/man4/led.4 b/share/man/man4/led.4
index b31a083c034b..0fe4af0c7420 100644
--- a/share/man/man4/led.4
+++ b/share/man/man4/led.4
@@ -182,12 +182,9 @@ driver first appeared in
 .Sh AUTHORS
 .An -nosplit
 This software was written by
-.An Poul-Henning Kamp
-.Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Sergey A. Osokin
-.Aq osa@FreeBSD.org
+.An Sergey A. Osokin Aq Mt osa@FreeBSD.org
 and
-.An Poul-Henning Kamp
-.Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
diff --git a/share/man/man4/lge.4 b/share/man/man4/lge.4
index 89510f2c2146..734eb4a8ae4f 100644
--- a/share/man/man4/lge.4
+++ b/share/man/man4/lge.4
@@ -154,4 +154,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq william.paul@windriver.com .
+.An Bill Paul Aq Mt william.paul@windriver.com .
diff --git a/share/man/man4/lm75.4 b/share/man/man4/lm75.4
index 8e794dc6b99c..d137eb063a69 100644
--- a/share/man/man4/lm75.4
+++ b/share/man/man4/lm75.4
@@ -188,4 +188,4 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Luiz Otavio O Souza Aq loos@FreeBSD.org .
+.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org .
diff --git a/share/man/man4/lmc.4 b/share/man/man4/lmc.4
index ee29aeeef9fb..e07875acea0f 100644
--- a/share/man/man4/lmc.4
+++ b/share/man/man4/lmc.4
@@ -761,4 +761,4 @@ rewrote everything and now feels responsible for it.
 .\"
 .Sh AUTHORS
 .\"
-.An "David Boggs" Aq boggs@boggs.palo-alto.ca.us
+.An David Boggs Aq Mt boggs@boggs.palo-alto.ca.us
diff --git a/share/man/man4/mac_bsdextended.4 b/share/man/man4/mac_bsdextended.4
index 23b89c04d04b..ca0296226e82 100644
--- a/share/man/man4/mac_bsdextended.4
+++ b/share/man/man4/mac_bsdextended.4
@@ -139,7 +139,7 @@ and was developed by the
 Project.
 .Pp
 The "match first case" and logging capabilities were later added by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 .Sh AUTHORS
 This software was contributed to the
 .Fx
diff --git a/share/man/man4/man4.arm/ti_adc.4 b/share/man/man4/man4.arm/ti_adc.4
index aa800162b9bc..7c70c27383d2 100644
--- a/share/man/man4/man4.arm/ti_adc.4
+++ b/share/man/man4/man4.arm/ti_adc.4
@@ -125,4 +125,4 @@ driver first appeared in
 .Sh AUTHORS
 .An -nosplit
 The driver and this manual page was written by
-.An Luiz Otavio O Souza Aq loos@FreeBSD.org .
+.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org .
diff --git a/share/man/man4/man4.i386/CPU_ELAN.4 b/share/man/man4/man4.i386/CPU_ELAN.4
index 4a0611f23f2d..5405743ef325 100644
--- a/share/man/man4/man4.i386/CPU_ELAN.4
+++ b/share/man/man4/man4.i386/CPU_ELAN.4
@@ -156,4 +156,4 @@ The
 code first appeared in
 .Fx 4.7 .
 .Sh AUTHORS
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
diff --git a/share/man/man4/man4.i386/ct.4 b/share/man/man4/man4.i386/ct.4
index ac8d6c2ae1e8..28208a16893f 100644
--- a/share/man/man4/man4.i386/ct.4
+++ b/share/man/man4/man4.i386/ct.4
@@ -150,13 +150,13 @@ and ported for
 It first appeared in
 .Fx 4.4 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 driver was written by
 .An Naofumi HONDA .
 .Pp
 This manual page was written by
-.An -nosplit
-.An Noriaki MITSUNAGA Aq non@FreeBSD.org
+.An Noriaki MITSUNAGA Aq Mt non@FreeBSD.org
 and
-.An Hideyuki KURASHINA Aq rushani@FreeBSD.org .
+.An Hideyuki KURASHINA Aq Mt rushani@FreeBSD.org .
diff --git a/share/man/man4/man4.i386/fe.4 b/share/man/man4/man4.i386/fe.4
index 22bbf2a6a648..b313edb52bca 100644
--- a/share/man/man4/man4.i386/fe.4
+++ b/share/man/man4/man4.i386/fe.4
@@ -259,7 +259,7 @@ driver appeared in
 The
 .Nm
 driver was originally written and contributed by
-.An M. Sekiguchi Aq seki@sysrap.cs.fujitsu.co.jp ,
+.An M. Sekiguchi Aq Mt seki@sysrap.cs.fujitsu.co.jp ,
 following the
 .Nm ed
 driver written by
@@ -267,7 +267,7 @@ driver written by
 PC card support in
 .Nm
 is written by
-.An Hidetoshi Kimura Aq h-kimura@tokyo.se.fujitsu.co.jp .
+.An Hidetoshi Kimura Aq Mt h-kimura@tokyo.se.fujitsu.co.jp .
 This manual page was written by
 .An M. Sekiguchi .
 .Pp
diff --git a/share/man/man4/man4.i386/glxiic.4 b/share/man/man4/man4.i386/glxiic.4
index 30d3ffe98de8..2f259d1f0099 100644
--- a/share/man/man4/man4.i386/glxiic.4
+++ b/share/man/man4/man4.i386/glxiic.4
@@ -103,4 +103,4 @@ device driver and manual page first appeared in
 The
 .Nm
 device driver and manual page were written by
-.An Henrik Brix Andersen Aq brix@FreeBSD.org .
+.An Henrik Brix Andersen Aq Mt brix@FreeBSD.org .
diff --git a/share/man/man4/man4.i386/glxsb.4 b/share/man/man4/man4.i386/glxsb.4
index fb2669f10478..a77b475e1dd2 100644
--- a/share/man/man4/man4.i386/glxsb.4
+++ b/share/man/man4/man4.i386/glxsb.4
@@ -94,4 +94,4 @@ by
 It was ported to
 .Fx
 by
-.An Patrick Lamaiziere Aq patfbsd@davenulle.org .
+.An Patrick Lamaiziere Aq Mt patfbsd@davenulle.org .
diff --git a/share/man/man4/man4.i386/longrun.4 b/share/man/man4/man4.i386/longrun.4
index b9bfc66c5e21..865bb8d35bc1 100644
--- a/share/man/man4/man4.i386/longrun.4
+++ b/share/man/man4/man4.i386/longrun.4
@@ -62,6 +62,6 @@ The Transmeta(TM) Crusoe(TM) LongRun(TM) support first appeared in
 .Sh AUTHORS
 .An -nosplit
 LongRun support and this manual page were written by
-.An Tamotsu HATTORI Aq athlete@kta.att.ne.jp
+.An Tamotsu HATTORI Aq Mt athlete@kta.att.ne.jp
 and
-.An Mitsuru IWASAKI Aq iwasaki@FreeBSD.org .
+.An Mitsuru IWASAKI Aq Mt iwasaki@FreeBSD.org .
diff --git a/share/man/man4/man4.i386/pae.4 b/share/man/man4/man4.i386/pae.4
index 718e2b2e20c2..55c2aa62cce2 100644
--- a/share/man/man4/man4.i386/pae.4
+++ b/share/man/man4/man4.i386/pae.4
@@ -69,7 +69,7 @@ option first appeared in
 and
 .Fx 5.1 .
 .Sh AUTHORS
-.An Jake Burkholder Aq jake@FreeBSD.org
+.An Jake Burkholder Aq Mt jake@FreeBSD.org
 .Sh BUGS
 Since KLD modules are not compiled with the same options headers that
 the kernel is compiled with,
diff --git a/share/man/man4/man4.i386/pbio.4 b/share/man/man4/man4.i386/pbio.4
index f4fbf3b4652e..d04eb325d169 100644
--- a/share/man/man4/man4.i386/pbio.4
+++ b/share/man/man4/man4.i386/pbio.4
@@ -179,7 +179,7 @@ The
 device was first used under
 .Fx 4.1 .
 .Sh AUTHORS
-.An "Diomidis D. Spinellis" Aq dds@aueb.gr
+.An Diomidis D. Spinellis Aq Mt dds@aueb.gr
 .Sh BUGS
 One of the
 .Tn PCL-724
diff --git a/share/man/man4/man4.i386/smapi.4 b/share/man/man4/man4.i386/smapi.4
index 8af17fa0a826..116c40197cac 100644
--- a/share/man/man4/man4.i386/smapi.4
+++ b/share/man/man4/man4.i386/smapi.4
@@ -146,8 +146,8 @@ Finally a length field which is comprised of Byte, Word, or Double Word.
 The
 .Nm
 driver was written by
-.An Matthew N. Dodd Aq mdodd@FreeBSD.org .
+.An Matthew N. Dodd Aq Mt mdodd@FreeBSD.org .
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 and
-.An Matthew N. Dodd Aq mdodd@FreeBSD.org .
+.An Matthew N. Dodd Aq Mt mdodd@FreeBSD.org .
diff --git a/share/man/man4/man4.i386/snc.4 b/share/man/man4/man4.i386/snc.4
index 66b45247822b..6f826907352f 100644
--- a/share/man/man4/man4.i386/snc.4
+++ b/share/man/man4/man4.i386/snc.4
@@ -122,16 +122,16 @@ driver was ported from
 .Nx
 by
 .An -nosplit
-.An Motomichi Matsuzaki Aq mzaki@e-mail.ne.jp
+.An Motomichi Matsuzaki Aq Mt mzaki@e-mail.ne.jp
 and
-.An Hiroshi Yamashita Aq bluemoon@msj.biglobe.ne.jp .
+.An Hiroshi Yamashita Aq Mt bluemoon@msj.biglobe.ne.jp .
 It first appeared in
 .Fx 4.2 .
 This manual page first appeared in
 .Fx 5.3 .
 .Sh AUTHORS
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 .Sh BUGS
 Currently the
 .Nm
diff --git a/share/man/man4/man4.i386/vpd.4 b/share/man/man4/man4.i386/vpd.4
index 7ed2063a6fa9..ba7acd4aea2c 100644
--- a/share/man/man4/man4.i386/vpd.4
+++ b/share/man/man4/man4.i386/vpd.4
@@ -87,4 +87,4 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Matthew N. Dodd Aq mdodd@FreeBSD.org .
+.An Matthew N. Dodd Aq Mt mdodd@FreeBSD.org .
diff --git a/share/man/man4/man4.i386/vx.4 b/share/man/man4/man4.i386/vx.4
index ab0472b6868a..e3c1ae470265 100644
--- a/share/man/man4/man4.i386/vx.4
+++ b/share/man/man4/man4.i386/vx.4
@@ -114,7 +114,7 @@ driver, from which it inherits most of its limitations.
 The
 .Nm
 device driver and this manual page were written by
-.An Fred Gray Aq fgray@rice.edu ,
+.An Fred Gray Aq Mt fgray@rice.edu ,
 based on the work of
 .An Herb Peyerl
 and with the assistance of numerous others.
diff --git a/share/man/man4/man4.powerpc/adb.4 b/share/man/man4/man4.powerpc/adb.4
index eb34ecaf0c4e..05a17a49b240 100644
--- a/share/man/man4/man4.powerpc/adb.4
+++ b/share/man/man4/man4.powerpc/adb.4
@@ -66,5 +66,4 @@ device driver appeared in
 The
 .Nm
 driver was written by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org .
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/akbd.4 b/share/man/man4/man4.powerpc/akbd.4
index e56676a76a2e..2ecaaefd1022 100644
--- a/share/man/man4/man4.powerpc/akbd.4
+++ b/share/man/man4/man4.powerpc/akbd.4
@@ -101,5 +101,4 @@ device driver appeared in
 The
 .Nm
 driver was written by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org .
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/ams.4 b/share/man/man4/man4.powerpc/ams.4
index 15560cf3d9ed..00ce975bac86 100644
--- a/share/man/man4/man4.powerpc/ams.4
+++ b/share/man/man4/man4.powerpc/ams.4
@@ -83,5 +83,4 @@ device driver appeared in
 The
 .Nm
 driver was written by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org .
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/bm.4 b/share/man/man4/man4.powerpc/bm.4
index 9d6a02970149..850d3070abee 100644
--- a/share/man/man4/man4.powerpc/bm.4
+++ b/share/man/man4/man4.powerpc/bm.4
@@ -80,8 +80,6 @@ device driver appeared in
 The
 .Nm
 driver was written by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org
 based on work by
-.An Peter Grehan
-.Aq grehan@FreeBSD.org .
+.An Peter Grehan Aq Mt grehan@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/cuda.4 b/share/man/man4/man4.powerpc/cuda.4
index f1faaf2d2919..021b6a18d94f 100644
--- a/share/man/man4/man4.powerpc/cuda.4
+++ b/share/man/man4/man4.powerpc/cuda.4
@@ -72,8 +72,8 @@ and then in
 The
 .Nm
 driver was written by
-.An Michael Lorenz
-.Aq macallan@NetBSD.org
-and ported to FreeBSD by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org .
+.An Michael Lorenz Aq Mt macallan@NetBSD.org
+and ported to
+.Fx
+by
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/pmu.4 b/share/man/man4/man4.powerpc/pmu.4
index ab998772a6f9..30b2762fac06 100644
--- a/share/man/man4/man4.powerpc/pmu.4
+++ b/share/man/man4/man4.powerpc/pmu.4
@@ -109,8 +109,8 @@ and then in
 The
 .Nm
 driver was written by
-.An Michael Lorenz
-.Aq macallan@NetBSD.org
-and ported to FreeBSD by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org .
+.An Michael Lorenz Aq Mt macallan@NetBSD.org
+and ported to
+.Fx
+by
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/powermac_nvram.4 b/share/man/man4/man4.powerpc/powermac_nvram.4
index 9aae9204adbf..9547bc8ce88c 100644
--- a/share/man/man4/man4.powerpc/powermac_nvram.4
+++ b/share/man/man4/man4.powerpc/powermac_nvram.4
@@ -62,4 +62,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Maxim Sobolev Aq sobomax@FreeBSD.org .
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/smu.4 b/share/man/man4/man4.powerpc/smu.4
index 2550a0df6736..2e10160ee071 100644
--- a/share/man/man4/man4.powerpc/smu.4
+++ b/share/man/man4/man4.powerpc/smu.4
@@ -121,5 +121,4 @@ device driver appeared in
 The
 .Nm
 driver was written by
-.An Nathan Whitehorn
-.Aq nwhitehorn@FreeBSD.org .
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org .
diff --git a/share/man/man4/man4.powerpc/snd_ai2s.4 b/share/man/man4/man4.powerpc/snd_ai2s.4
index 472a518b79e4..93566001a5c2 100644
--- a/share/man/man4/man4.powerpc/snd_ai2s.4
+++ b/share/man/man4/man4.powerpc/snd_ai2s.4
@@ -79,10 +79,10 @@ and then in
 The
 .Nm
 driver was written by
-.An Tsubai Masanari
-.Aq tsubai@netbsd.org ,
-and ported to FreeBSD by
-.An Marco Trillo
-.Aq marcotrillo@gmail.com .
+.An Tsubai Masanari Aq Mt tsubai@netbsd.org ,
+and ported to
+.Fx
+by
+.An Marco Trillo Aq Mt marcotrillo@gmail.com .
 .Sh BUGS
 Recording and operation with non-44.1 Khz audio are not currently supported.
diff --git a/share/man/man4/man4.powerpc/snd_davbus.4 b/share/man/man4/man4.powerpc/snd_davbus.4
index e220de27c35f..9949f9b8b502 100644
--- a/share/man/man4/man4.powerpc/snd_davbus.4
+++ b/share/man/man4/man4.powerpc/snd_davbus.4
@@ -75,7 +75,6 @@ device driver appeared in
 The
 .Nm
 driver was written by
-.An Marco Trillo
-.Aq marcotrillo@gmail.com .
+.An Marco Trillo Aq Mt marcotrillo@gmail.com .
 .Sh BUGS
 Recording is not currently supported.
diff --git a/share/man/man4/man4.sparc64/auxio.4 b/share/man/man4/man4.sparc64/auxio.4
index fb3cdbdf2028..9c5bbe154d53 100644
--- a/share/man/man4/man4.sparc64/auxio.4
+++ b/share/man/man4/man4.sparc64/auxio.4
@@ -77,4 +77,4 @@ driver was written by
 and ported to
 .Fx
 by
-.An Pyun YongHyeon Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
diff --git a/share/man/man4/man4.sparc64/central.4 b/share/man/man4/man4.sparc64/central.4
index 3fa09bdca0fc..fcde31da1313 100644
--- a/share/man/man4/man4.sparc64/central.4
+++ b/share/man/man4/man4.sparc64/central.4
@@ -57,4 +57,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An "Jake Burkholder" Aq jake@FreeBSD.org .
+.An Jake Burkholder Aq Mt jake@FreeBSD.org .
diff --git a/share/man/man4/man4.sparc64/clkbrd.4 b/share/man/man4/man4.sparc64/clkbrd.4
index ad74ee288ef9..677648ff49ef 100644
--- a/share/man/man4/man4.sparc64/clkbrd.4
+++ b/share/man/man4/man4.sparc64/clkbrd.4
@@ -79,10 +79,10 @@ version to include it was
 The
 .Nm
 driver was written by
-.An "Jason L. Wright"
+.An Jason L. Wright
 and ported to
 .Fx
 by
-.An "Marius Strobl" Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
 .Sh CAVEATS
 Hardware management functionality is not implemented.
diff --git a/share/man/man4/man4.sparc64/creator.4 b/share/man/man4/man4.sparc64/creator.4
index 5d7205be72ee..64035a7daf3d 100644
--- a/share/man/man4/man4.sparc64/creator.4
+++ b/share/man/man4/man4.sparc64/creator.4
@@ -79,7 +79,7 @@ version to include it was
 The
 .Nm
 driver was written by
-.An "Jake Burkholder" Aq jake@FreeBSD.org
+.An Jake Burkholder Aq Mt jake@FreeBSD.org
 roughly based on the
 .Ox
 driver written by
diff --git a/share/man/man4/man4.sparc64/ebus.4 b/share/man/man4/man4.sparc64/ebus.4
index 2dd9807a200d..26b67447a601 100644
--- a/share/man/man4/man4.sparc64/ebus.4
+++ b/share/man/man4/man4.sparc64/ebus.4
@@ -115,8 +115,8 @@ version to include it was
 The
 .Nm
 driver was written by
-.An "Matthew R. Green"
+.An Matthew R. Green
 and ported to
 .Fx
 by
-.An "Thomas Moestl" Aq tmm@FreeBSD.org .
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org .
diff --git a/share/man/man4/man4.sparc64/eeprom.4 b/share/man/man4/man4.sparc64/eeprom.4
index 58af4e892ecf..8d7c3a57df51 100644
--- a/share/man/man4/man4.sparc64/eeprom.4
+++ b/share/man/man4/man4.sparc64/eeprom.4
@@ -123,8 +123,8 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An "Thomas Moestl" Aq tmm@FreeBSD.org
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org
 based on the
 .Nx
 sparc64 clock code written by
-.An "Paul Kranenburg" .
+.An Paul Kranenburg .
diff --git a/share/man/man4/man4.sparc64/fhc.4 b/share/man/man4/man4.sparc64/fhc.4
index 378737060f38..1cd12e982f1d 100644
--- a/share/man/man4/man4.sparc64/fhc.4
+++ b/share/man/man4/man4.sparc64/fhc.4
@@ -79,4 +79,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An "Jake Burkholder" Aq jake@FreeBSD.org .
+.An Jake Burkholder Aq Mt jake@FreeBSD.org .
diff --git a/share/man/man4/man4.sparc64/machfb.4 b/share/man/man4/man4.sparc64/machfb.4
index c42eb9b08b98..9e65222b194c 100644
--- a/share/man/man4/man4.sparc64/machfb.4
+++ b/share/man/man4/man4.sparc64/machfb.4
@@ -171,10 +171,10 @@ version to include it was
 The
 .Nm
 driver was written by
-.An "Marius Strobl" Aq marius@FreeBSD.org
+.An Marius Strobl Aq Mt marius@FreeBSD.org
 based on the
 .Nx
 driver written by
-.An "Bang Jun-Young" .
+.An Bang Jun-Young .
 .Sh CAVEATS
 Font loading and mode switching are not implemented.
diff --git a/share/man/man4/man4.sparc64/ofw_console.4 b/share/man/man4/man4.sparc64/ofw_console.4
index 9a4513b10506..f21b977b4d2f 100644
--- a/share/man/man4/man4.sparc64/ofw_console.4
+++ b/share/man/man4/man4.sparc64/ofw_console.4
@@ -93,7 +93,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An "Benno Rice" Aq benno@FreeBSD.org .
+.An Benno Rice Aq Mt benno@FreeBSD.org .
 .Sh CAVEATS
 Since the Open Firmware will handle BREAK
 (or Stop-A)
diff --git a/share/man/man4/man4.sparc64/openfirm.4 b/share/man/man4/man4.sparc64/openfirm.4
index 4b6bde78943f..bee4915b5f11 100644
--- a/share/man/man4/man4.sparc64/openfirm.4
+++ b/share/man/man4/man4.sparc64/openfirm.4
@@ -278,7 +278,7 @@ The
 interface was ported to
 .Fx
 by
-.An "Thomas Moestl" Aq tmm@FreeBSD.org .
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org .
 .Sh CAVEATS
 Due to limitations within
 .Tn Open Firmware
diff --git a/share/man/man4/man4.sparc64/openprom.4 b/share/man/man4/man4.sparc64/openprom.4
index 38a2291f098f..8acdb14995db 100644
--- a/share/man/man4/man4.sparc64/openprom.4
+++ b/share/man/man4/man4.sparc64/openprom.4
@@ -222,7 +222,7 @@ interface was
 The
 .Nm
 interface was written by
-.An "Jake Burkholder" Aq jake@FreeBSD.org .
+.An Jake Burkholder Aq Mt jake@FreeBSD.org .
 .Sh CAVEATS
 Due to limitations within
 .Tn Open Firmware
diff --git a/share/man/man4/man4.sparc64/rtc.4 b/share/man/man4/man4.sparc64/rtc.4
index 9117bf325b7c..34bd865bbc5b 100644
--- a/share/man/man4/man4.sparc64/rtc.4
+++ b/share/man/man4/man4.sparc64/rtc.4
@@ -85,4 +85,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An "Marius Strobl" Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
diff --git a/share/man/man4/man4.sparc64/sbus.4 b/share/man/man4/man4.sparc64/sbus.4
index 7955727994b4..17ab18da4878 100644
--- a/share/man/man4/man4.sparc64/sbus.4
+++ b/share/man/man4/man4.sparc64/sbus.4
@@ -72,8 +72,8 @@ version to include it was
 The
 .Nm
 driver was written by
-.An "Paul Kranenburg"
+.An Paul Kranenburg
 and ported to
 .Fx
 by
-.An "Thomas Moestl" Aq tmm@FreeBSD.org .
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org .
diff --git a/share/man/man4/man4.sparc64/snd_audiocs.4 b/share/man/man4/man4.sparc64/snd_audiocs.4
index 5fcc44ab56c3..13b4c22c3328 100644
--- a/share/man/man4/man4.sparc64/snd_audiocs.4
+++ b/share/man/man4/man4.sparc64/snd_audiocs.4
@@ -80,8 +80,7 @@ device driver first appeared in
 The
 .Nm
 driver was ported by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org
 from the
 .Ox
 driver written by
diff --git a/share/man/man4/md.4 b/share/man/man4/md.4
index 49b0069d8e7a..af91e58eaa2c 100644
--- a/share/man/man4/md.4
+++ b/share/man/man4/md.4
@@ -110,5 +110,4 @@ driver in
 The
 .Nm
 driver was written by
-.An Poul-Henning Kamp
-.Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
diff --git a/share/man/man4/meteor.4 b/share/man/man4/meteor.4
index 77765defcde3..c9381733a863 100644
--- a/share/man/man4/meteor.4
+++ b/share/man/man4/meteor.4
@@ -865,8 +865,8 @@ invalid meteor_counts structure pointer.
 .El
 .El
 .Sh AUTHORS
-.An Jim Lowe Aq james@miller.cs.uwm.edu ,
-.An Mark Tinguely Aq tinguely@plains.nodak.edu
+.An Jim Lowe Aq Mt james@miller.cs.uwm.edu
+.An Mark Tinguely Aq Mt tinguely@plains.nodak.edu
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/mfi.4 b/share/man/man4/mfi.4
index a6d6278f1e64..c20d9bd0900e 100644
--- a/share/man/man4/mfi.4
+++ b/share/man/man4/mfi.4
@@ -143,6 +143,6 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Scott Long Aq Mt scottl@FreeBSD.org .
 .Sh BUGS
 The driver does not support big-endian architectures at this time.
diff --git a/share/man/man4/miibus.4 b/share/man/man4/miibus.4
index 2affa5600424..6152095fc3b8 100644
--- a/share/man/man4/miibus.4
+++ b/share/man/man4/miibus.4
@@ -185,4 +185,4 @@ driver first appeared in
 .Fx 3.3 .
 .Sh AUTHORS
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man4/mk48txx.4 b/share/man/man4/mk48txx.4
index 303ccc960cf5..30385934f5e8 100644
--- a/share/man/man4/mk48txx.4
+++ b/share/man/man4/mk48txx.4
@@ -216,13 +216,10 @@ The
 driver was written for
 .Nx
 by
-.An Paul Kranenburg
-.Aq pk@NetBSD.org .
+.An Paul Kranenburg Aq Mt pk@NetBSD.org .
 It was ported to
 .Fx
 by
-.An Thomas Moestl
-.Aq tmm@FreeBSD.org
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org
 and later on improved by
-.An Marius Strobl
-.Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
diff --git a/share/man/man4/mlx.4 b/share/man/man4/mlx.4
index 696d04812e51..332a5f916794 100644
--- a/share/man/man4/mlx.4
+++ b/share/man/man4/mlx.4
@@ -238,15 +238,12 @@ or in the driver.
 The
 .Nm
 driver was written by
-.An Michael Smith
-.Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Jeroen Ruigrok van der Werven
-.Aq asmodai@FreeBSD.org
+.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org
 and
-.An Michael Smith
-.Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Sh BUGS
 The driver does not yet support EISA adapters.
 The DEC KZPSC has insufficient flash ROM to hold any reasonably recent firmware.
diff --git a/share/man/man4/mly.4 b/share/man/man4/mly.4
index 3affcacbd3cd..0a701762d415 100644
--- a/share/man/man4/mly.4
+++ b/share/man/man4/mly.4
@@ -260,12 +260,10 @@ These events report controller status changes.
 The
 .Nm
 driver was written by
-.An Michael Smith
-.Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Michael Smith
-.Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Sh BUGS
 The driver does not yet provide an external management interface.
 .Pp
diff --git a/share/man/man4/mn.4 b/share/man/man4/mn.4
index 0b88f2fb9267..aac7f96e7f96 100644
--- a/share/man/man4/mn.4
+++ b/share/man/man4/mn.4
@@ -52,4 +52,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
diff --git a/share/man/man4/mod_cc.4 b/share/man/man4/mod_cc.4
index 204537faa36f..4b08a6d9cff9 100644
--- a/share/man/man4/mod_cc.4
+++ b/share/man/man4/mod_cc.4
@@ -106,12 +106,12 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 facility was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org ,
-.An James Healy Aq jimmy@deefa.com
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org ,
+.An James Healy Aq Mt jimmy@deefa.com
 and
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
 .Pp
 This manual page was written by
-.An David Hayes Aq david.hayes@ieee.org
+.An David Hayes Aq Mt david.hayes@ieee.org
 and
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man4/mouse.4 b/share/man/man4/mouse.4
index 816936af6a37..1cf7aa2fe51e 100644
--- a/share/man/man4/mouse.4
+++ b/share/man/man4/mouse.4
@@ -400,4 +400,4 @@ USB mouse device
 .\".Sh HISTORY
 .Sh AUTHORS
 This manual page was written by
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
diff --git a/share/man/man4/mpr.4 b/share/man/man4/mpr.4
index 4a42fa136d17..c85be6758387 100644
--- a/share/man/man4/mpr.4
+++ b/share/man/man4/mpr.4
@@ -220,10 +220,10 @@ The
 .Nm
 driver was originally written by
 .An -nosplit
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Scott Long Aq Mt scottl@FreeBSD.org .
 It has been improved and tested by LSI Corporation.
 .Pp
 This man page was written by
-.An Ken Merry Aq ken@FreeBSD.org
+.An Ken Merry Aq Mt ken@FreeBSD.org
 with additional input from
-.An Stephen McConnell Aq stephen.mcconnell@lsi.com .
+.An Stephen McConnell Aq Mt stephen.mcconnell@lsi.com .
diff --git a/share/man/man4/mps.4 b/share/man/man4/mps.4
index 6840c2183ccd..deeca95886e1 100644
--- a/share/man/man4/mps.4
+++ b/share/man/man4/mps.4
@@ -210,10 +210,10 @@ driver first appeared in
 The
 .Nm
 driver was originally written by
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Scott Long Aq Mt scottl@FreeBSD.org .
 It has been improved and tested by LSI Logic Corporation.
 This man page was written by
-.An Ken Merry Aq ken@FreeBSD.org .
+.An Ken Merry Aq Mt ken@FreeBSD.org .
 .Sh BUGS
 This driver has a couple of known shortcomings:
 .Bl -bullet -compact
diff --git a/share/man/man4/mpt.4 b/share/man/man4/mpt.4
index 9d62d17c63de..d514cc937183 100644
--- a/share/man/man4/mpt.4
+++ b/share/man/man4/mpt.4
@@ -178,9 +178,9 @@ by
 .An Greg Ansley
 and marginally improved upon
 by
-.An Matt Jacob Aq mjacob@FreeBSD.org .
+.An Matt Jacob Aq Mt mjacob@FreeBSD.org .
 .Pp
-.An Justin Gibbs Aq gibbs@FreeBSD.org
+.An Justin Gibbs Aq Mt gibbs@FreeBSD.org
 and
-.An Scott Long Aq scottl@FreeBSD.org
+.An Scott Long Aq Mt scottl@FreeBSD.org
 have made more substantial improvements.
diff --git a/share/man/man4/mrsas.4 b/share/man/man4/mrsas.4
index 6065188f2a78..70cafca9bf5e 100644
--- a/share/man/man4/mrsas.4
+++ b/share/man/man4/mrsas.4
@@ -207,7 +207,7 @@ variable, where X is the adapter number, either in
 or via
 .Xr sysctl 8 .
 The following bits have the described effects:
-.Bl -tag -offset indent
+.Bl -tag -width indent -offset indent
 .It 0x01
 Enable informational prints.
 .It 0x02
@@ -377,7 +377,7 @@ This is the 12Gb/s MegaRAID HBA card which has device id 0x005F.
 The
 .Nm
 driver and this manual page were written by
-.An Kashyap Desai Aq Kashyap.Desai@lsi.com .
+.An Kashyap Desai Aq Mt Kashyap.Desai@lsi.com .
 .Sh TODO
 The driver does not support big-endian architectures at this time.
 .Pp
diff --git a/share/man/man4/msk.4 b/share/man/man4/msk.4
index 200c6f7f3e52..6c2a030dfc19 100644
--- a/share/man/man4/msk.4
+++ b/share/man/man4/msk.4
@@ -243,8 +243,7 @@ a change takes effect.
 The
 .Nm
 driver was written by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org
 and it is based on
 .Xr sk 4
 and Marvell's
diff --git a/share/man/man4/mvs.4 b/share/man/man4/mvs.4
index be8c3eab913e..167992e6cf92 100644
--- a/share/man/man4/mvs.4
+++ b/share/man/man4/mvs.4
@@ -175,4 +175,4 @@ The
 driver first appeared in
 .Fx 8.1 .
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org
+.An Alexander Motin Aq Mt mav@FreeBSD.org
diff --git a/share/man/man4/mxge.4 b/share/man/man4/mxge.4
index 5a353fbf423a..3e54062fd212 100644
--- a/share/man/man4/mxge.4
+++ b/share/man/man4/mxge.4
@@ -131,7 +131,6 @@ both be capable of MSI-X.
 Older Myri10GE NICs can be field upgraded to add
 MSI-X using the "10G NIC Tool Kit" for FreeBSD which is available from
 .Pa http://www.myri.com/scs/download-10g-tools.html .
-.Pp
 .It Va hw.mxge.rss_hashtype
 This value determines how incoming traffic is steered to different
 slices.
@@ -167,7 +166,7 @@ go to the Myricom support website at:
 If an issue is identified with the released source code on the supported kernel
 with a supported adapter, email the specific information related to the
 issue to
-.Aq help@myri.com .
+.Aq Mt help@myri.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
@@ -183,4 +182,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Andrew Gallatin Aq gallatin@FreeBSD.org .
+.An Andrew Gallatin Aq Mt gallatin@FreeBSD.org .
diff --git a/share/man/man4/my.4 b/share/man/man4/my.4
index 28b67ddbd85f..b1ca8043afcd 100644
--- a/share/man/man4/my.4
+++ b/share/man/man4/my.4
@@ -83,7 +83,7 @@ The
 driver was written by Myson Technology Inc.
 .Pp
 This manual page was written by
-.An Hiten M. Pandya Aq hmp@FreeBSD.org .
+.An Hiten M. Pandya Aq Mt hmp@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/nand.4 b/share/man/man4/nand.4
index d23e292fac74..4371e38c8f96 100644
--- a/share/man/man4/nand.4
+++ b/share/man/man4/nand.4
@@ -131,7 +131,8 @@ The
 .Nm
 framework support first appeared in
 .Fx 10.0 .
-.Sh AUTHOR
+.Sh AUTHORS
+.An -nosplit
 The
 .Nm
 framework was designed and developed by
diff --git a/share/man/man4/nandsim.4 b/share/man/man4/nandsim.4
index ebb54527f502..bf8d624eeb8a 100644
--- a/share/man/man4/nandsim.4
+++ b/share/man/man4/nandsim.4
@@ -83,7 +83,8 @@ The
 .Nm
 support first appeared in
 .Fx 10.0 .
-.Sh AUTHOR
+.Sh AUTHORS
+.An -nosplit
 The
 .Nm
 kernel driver was developed by
diff --git a/share/man/man4/ncv.4 b/share/man/man4/ncv.4
index 8ab719921b80..01cdc93f5302 100644
--- a/share/man/man4/ncv.4
+++ b/share/man/man4/ncv.4
@@ -128,6 +128,6 @@ The
 driver was written by
 .An Naofumi Honda .
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 and
-.An Noriaki Mitsunaga Aq non@FreeBSD.org .
+.An Noriaki Mitsunaga Aq Mt non@FreeBSD.org .
diff --git a/share/man/man4/ndis.4 b/share/man/man4/ndis.4
index 874a843f9770..5e1c29485ff3 100644
--- a/share/man/man4/ndis.4
+++ b/share/man/man4/ndis.4
@@ -150,4 +150,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4
index 90fc77e4f528..b1a55ad8c3d6 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -1479,6 +1479,6 @@ It first made its debut in the main tree in
 .Fx 3.4 .
 .Sh AUTHORS
 .An -nosplit
-.An Julian Elischer Aq julian@FreeBSD.org ,
+.An Julian Elischer Aq Mt julian@FreeBSD.org ,
 with contributions by
-.An Archie Cobbs Aq archie@FreeBSD.org .
+.An Archie Cobbs Aq Mt archie@FreeBSD.org .
diff --git a/share/man/man4/nfe.4 b/share/man/man4/nfe.4
index 45dd380bb022..29342111079f 100644
--- a/share/man/man4/nfe.4
+++ b/share/man/man4/nfe.4
@@ -189,15 +189,12 @@ and then in
 The
 .Nm
 driver was written by
-.An Jonathan Gray
-.Aq jsg@openbsd.org
+.An Jonathan Gray Aq Mt jsg@openbsd.org
 and
-.An Damien Bergamini
-.Aq damien@openbsd.org .
+.An Damien Bergamini Aq Mt damien@openbsd.org .
 The
 .Nm
 driver was ported to
 .Fx
 by
-.An Shigeaki Tagashira
-.Aq shigeaki@se.hiroshima-u.ac.jp .
+.An Shigeaki Tagashira Aq Mt shigeaki@se.hiroshima-u.ac.jp .
diff --git a/share/man/man4/nfsmb.4 b/share/man/man4/nfsmb.4
index d6f39cec7fc5..f3022191ea8e 100644
--- a/share/man/man4/nfsmb.4
+++ b/share/man/man4/nfsmb.4
@@ -51,4 +51,4 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Ruslan Ermilov Aq ru@FreeBSD.org .
+.An Ruslan Ermilov Aq Mt ru@FreeBSD.org .
diff --git a/share/man/man4/ng_UI.4 b/share/man/man4/ng_UI.4
index 30f7c4898ef1..f00cb63f117e 100644
--- a/share/man/man4/ng_UI.4
+++ b/share/man/man4/ng_UI.4
@@ -90,4 +90,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_async.4 b/share/man/man4/ng_async.4
index ffd9a385d461..cf38b2ed8421 100644
--- a/share/man/man4/ng_async.4
+++ b/share/man/man4/ng_async.4
@@ -143,7 +143,6 @@ This command returns a
 containing node statistics for packet, octet, and error counts.
 .It Dv NGM_ASYNC_CMD_CLR_STATS Pq Ic clrstats
 Clears the node statistics.
-.Pp
 .El
 .Sh SHUTDOWN
 This node shuts down upon receipt of a
@@ -170,4 +169,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
diff --git a/share/man/man4/ng_atm.4 b/share/man/man4/ng_atm.4
index c11b9111a912..9c0733437480 100644
--- a/share/man/man4/ng_atm.4
+++ b/share/man/man4/ng_atm.4
@@ -403,4 +403,4 @@ panics if set.
 .Xr ng_ether 4 ,
 .Xr ngctl 8
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/ng_atmllc.4 b/share/man/man4/ng_atmllc.4
index 50131a2c41d3..3c7cfa947fc7 100644
--- a/share/man/man4/ng_atmllc.4
+++ b/share/man/man4/ng_atmllc.4
@@ -93,4 +93,4 @@ control message, or when all hooks have been disconnected.
 .%O RFC 1483
 .Re
 .Sh AUTHORS
-.An Benno Rice Aq benno@FreeBSD.org
+.An Benno Rice Aq Mt benno@FreeBSD.org
diff --git a/share/man/man4/ng_bluetooth.4 b/share/man/man4/ng_bluetooth.4
index c956dd06a3e8..b19dee157ae6 100644
--- a/share/man/man4/ng_bluetooth.4
+++ b/share/man/man4/ng_bluetooth.4
@@ -109,4 +109,4 @@ The
 module was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/share/man/man4/ng_bpf.4 b/share/man/man4/ng_bpf.4
index 44a51e37f404..0edb4996aeec 100644
--- a/share/man/man4/ng_bpf.4
+++ b/share/man/man4/ng_bpf.4
@@ -180,7 +180,7 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
 .Sh BUGS
 When built as a loadable kernel module, this module includes the file
 .Pa net/bpf_filter.c .
diff --git a/share/man/man4/ng_bridge.4 b/share/man/man4/ng_bridge.4
index 6ec87089ba79..9b3e600c6445 100644
--- a/share/man/man4/ng_bridge.4
+++ b/share/man/man4/ng_bridge.4
@@ -209,4 +209,4 @@ The
 node type was implemented in
 .Fx 4.2 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
diff --git a/share/man/man4/ng_bt3c.4 b/share/man/man4/ng_bt3c.4
index b6c3ba7243a8..9cff66bc1599 100644
--- a/share/man/man4/ng_bt3c.4
+++ b/share/man/man4/ng_bt3c.4
@@ -122,8 +122,8 @@ The
 node type was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 The driver is based on information obtained from
-.An Jose Orlando Pereira Aq jop@di.uminho.pt
+.An Jose Orlando Pereira Aq Mt jop@di.uminho.pt
 and disassembled the W2K driver.
diff --git a/share/man/man4/ng_btsocket.4 b/share/man/man4/ng_btsocket.4
index 12f28448ef6e..103497af2547 100644
--- a/share/man/man4/ng_btsocket.4
+++ b/share/man/man4/ng_btsocket.4
@@ -348,7 +348,7 @@ The
 module was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Most likely.
 Please report if found.
diff --git a/share/man/man4/ng_car.4 b/share/man/man4/ng_car.4
index 348b03d64d64..ade46498fa63 100644
--- a/share/man/man4/ng_car.4
+++ b/share/man/man4/ng_car.4
@@ -208,7 +208,7 @@ SEQ
 .%O RFC 2698
 .Re
 .Sh AUTHORS
-.An Nuno Antunes Aq nuno.antunes@gmail.com
-.An Alexander Motin Aq mav@FreeBSD.org
+.An Nuno Antunes Aq Mt nuno.antunes@gmail.com
+.An Alexander Motin Aq Mt mav@FreeBSD.org
 .Sh BUGS
 At this moment only DROP and FORWARD actions are implemented.
diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4
index f643d726d55e..3d6778fa25d5 100644
--- a/share/man/man4/ng_ccatm.4
+++ b/share/man/man4/ng_ccatm.4
@@ -206,7 +206,6 @@ struct ngm_ccatm_port {
 	uint32_t	port;
 };
 .Ed
-.Pp
 .It Dv NGM_CCATM_START Pq Ic start
 Start processing on the port.
 The argument is a
@@ -321,4 +320,4 @@ Return extended status information from the node.
 .Xr ng_uni 4 ,
 .Xr ngctl 8
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/ng_cisco.4 b/share/man/man4/ng_cisco.4
index 143ecdb521bd..3904176855b8 100644
--- a/share/man/man4/ng_cisco.4
+++ b/share/man/man4/ng_cisco.4
@@ -175,8 +175,8 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org ,
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
 .Sh BUGS
 Not all of the functionality has been implemented.
 For example,
diff --git a/share/man/man4/ng_deflate.4 b/share/man/man4/ng_deflate.4
index dbf3c562f18a..92710b4afedf 100644
--- a/share/man/man4/ng_deflate.4
+++ b/share/man/man4/ng_deflate.4
@@ -151,7 +151,7 @@ control message, or when hook have been disconnected.
 .%O RFC 1661
 .Re
 .Sh AUTHORS
-.An Alexander Motin Aq mav@alkar.net
+.An Alexander Motin Aq Mt mav@alkar.net
 .Sh BUGS
 Due to nature of netgraph PPP implementation there are possible race conditions
 between data packet and ResetAck CCP packet in case of packet loss. As result,
diff --git a/share/man/man4/ng_device.4 b/share/man/man4/ng_device.4
index a03a03b6b0c2..5374e646dbef 100644
--- a/share/man/man4/ng_device.4
+++ b/share/man/man4/ng_device.4
@@ -92,5 +92,5 @@ The
 node type was first implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Mark Santcroos Aq marks@ripe.net
-.An Gleb Smirnoff Aq glebius@FreeBSD.org
+.An Mark Santcroos Aq Mt marks@ripe.net
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org
diff --git a/share/man/man4/ng_echo.4 b/share/man/man4/ng_echo.4
index f502c621ac00..ac05d54cae0e 100644
--- a/share/man/man4/ng_echo.4
+++ b/share/man/man4/ng_echo.4
@@ -70,4 +70,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_etf.4 b/share/man/man4/ng_etf.4
index a35f4fa565ba..5e78b3d0bab4 100644
--- a/share/man/man4/ng_etf.4
+++ b/share/man/man4/ng_etf.4
@@ -151,4 +151,4 @@ The
 node type was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_ether.4 b/share/man/man4/ng_ether.4
index 610a8af8ae2e..6d579e8b9f55 100644
--- a/share/man/man4/ng_ether.4
+++ b/share/man/man4/ng_ether.4
@@ -224,8 +224,8 @@ ngctl connect fxp0: lower upper left
 .Xr ngctl 8 ,
 .Xr nghook 8
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
 .Sh BUGS
 The automatic KLD module loading mechanism that works for most
 other Netgraph node types does not work for the
diff --git a/share/man/man4/ng_ether_echo.4 b/share/man/man4/ng_ether_echo.4
index 2f9dd38aa415..e86c3a931e45 100644
--- a/share/man/man4/ng_ether_echo.4
+++ b/share/man/man4/ng_ether_echo.4
@@ -74,4 +74,4 @@ The
 node type was implemented in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_frame_relay.4 b/share/man/man4/ng_frame_relay.4
index 576fdfe3e8e8..7f7f0251ba62 100644
--- a/share/man/man4/ng_frame_relay.4
+++ b/share/man/man4/ng_frame_relay.4
@@ -87,7 +87,7 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
 .Sh BUGS
 Technically, frames on DLCI X should not be transmitted to the switch
 until the LMI protocol entity on both ends has configured DLCI X as active.
diff --git a/share/man/man4/ng_gif.4 b/share/man/man4/ng_gif.4
index 2f360c0fb46d..dcda5e651f15 100644
--- a/share/man/man4/ng_gif.4
+++ b/share/man/man4/ng_gif.4
@@ -123,4 +123,4 @@ interface to standard output decoded in hex and ASCII:
 .Xr ngctl 8 ,
 .Xr nghook 8
 .Sh AUTHORS
-.An Brooks Davis Aq brooks@FreeBSD.org
+.An Brooks Davis Aq Mt brooks@FreeBSD.org
diff --git a/share/man/man4/ng_gif_demux.4 b/share/man/man4/ng_gif_demux.4
index b245e09fa29d..e827659b8f58 100644
--- a/share/man/man4/ng_gif_demux.4
+++ b/share/man/man4/ng_gif_demux.4
@@ -104,4 +104,4 @@ This node type supports only the generic control messages.
 .Xr ngctl 8 ,
 .Xr nghook 8
 .Sh AUTHORS
-.An Brooks Davis Aq brooks@FreeBSD.org
+.An Brooks Davis Aq Mt brooks@FreeBSD.org
diff --git a/share/man/man4/ng_h4.4 b/share/man/man4/ng_h4.4
index a3b99ed9ace7..bb539a230eba 100644
--- a/share/man/man4/ng_h4.4
+++ b/share/man/man4/ng_h4.4
@@ -115,7 +115,7 @@ The
 node type was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 This node still uses
 .Xr spltty 9
diff --git a/share/man/man4/ng_hci.4 b/share/man/man4/ng_hci.4
index 7ef7fcba061d..d5727ef83ea3 100644
--- a/share/man/man4/ng_hci.4
+++ b/share/man/man4/ng_hci.4
@@ -381,7 +381,7 @@ The
 node type was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Most likely.
 Please report if found.
diff --git a/share/man/man4/ng_hole.4 b/share/man/man4/ng_hole.4
index 4d0c0773f2be..227170d422e8 100644
--- a/share/man/man4/ng_hole.4
+++ b/share/man/man4/ng_hole.4
@@ -88,4 +88,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_hub.4 b/share/man/man4/ng_hub.4
index da687239e7f2..bdd3f42daadf 100644
--- a/share/man/man4/ng_hub.4
+++ b/share/man/man4/ng_hub.4
@@ -72,4 +72,4 @@ The
 node type appeared in
 .Fx 5.3 .
 .Sh AUTHORS
-.An Ruslan Ermilov Aq ru@FreeBSD.org
+.An Ruslan Ermilov Aq Mt ru@FreeBSD.org
diff --git a/share/man/man4/ng_iface.4 b/share/man/man4/ng_iface.4
index 270aa4fd1426..66de96eba4a9 100644
--- a/share/man/man4/ng_iface.4
+++ b/share/man/man4/ng_iface.4
@@ -163,4 +163,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
diff --git a/share/man/man4/ng_ip_input.4 b/share/man/man4/ng_ip_input.4
index 430f43c6eaa1..0c4cbafd2f48 100644
--- a/share/man/man4/ng_ip_input.4
+++ b/share/man/man4/ng_ip_input.4
@@ -95,7 +95,7 @@ The
 node type was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Brooks Davis Aq brooks@FreeBSD.org
+.An Brooks Davis Aq Mt brooks@FreeBSD.org
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/ng_ipfw.4 b/share/man/man4/ng_ipfw.4
index 9a9099efd75c..19e8f7418884 100644
--- a/share/man/man4/ng_ipfw.4
+++ b/share/man/man4/ng_ipfw.4
@@ -114,4 +114,4 @@ node type was implemented in
 The
 .Nm ipfw
 node was written by
-.An "Gleb Smirnoff" Aq glebius@FreeBSD.org .
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org .
diff --git a/share/man/man4/ng_ksocket.4 b/share/man/man4/ng_ksocket.4
index ff67028beffe..0590bbf91f3d 100644
--- a/share/man/man4/ng_ksocket.4
+++ b/share/man/man4/ng_ksocket.4
@@ -239,4 +239,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
diff --git a/share/man/man4/ng_l2cap.4 b/share/man/man4/ng_l2cap.4
index ba5df7d9c032..63b2ede785a9 100644
--- a/share/man/man4/ng_l2cap.4
+++ b/share/man/man4/ng_l2cap.4
@@ -416,7 +416,7 @@ The
 node type was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Most likely.
 Please report if found.
diff --git a/share/man/man4/ng_l2tp.4 b/share/man/man4/ng_l2tp.4
index fc5ed07167d8..11f3c5e515b1 100644
--- a/share/man/man4/ng_l2tp.4
+++ b/share/man/man4/ng_l2tp.4
@@ -326,4 +326,4 @@ The
 node type was developed at Packet Design, LLC,
 .Pa http://www.packetdesign.com/ .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@packetdesign.com
+.An Archie Cobbs Aq Mt archie@packetdesign.com
diff --git a/share/man/man4/ng_lmi.4 b/share/man/man4/ng_lmi.4
index 537871768253..21a96d1628b4 100644
--- a/share/man/man4/ng_lmi.4
+++ b/share/man/man4/ng_lmi.4
@@ -135,4 +135,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_mppc.4 b/share/man/man4/ng_mppc.4
index e7eeedfb4789..0d4d674aa09d 100644
--- a/share/man/man4/ng_mppc.4
+++ b/share/man/man4/ng_mppc.4
@@ -185,7 +185,7 @@ option.
 .%O RFC 2637
 .Re
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
 .Sh BUGS
 In PPP, encryption should be handled by the Encryption Control Protocol (ECP)
 rather than CCP.
diff --git a/share/man/man4/ng_nat.4 b/share/man/man4/ng_nat.4
index 9b3b3fc01853..e0d056d2152f 100644
--- a/share/man/man4/ng_nat.4
+++ b/share/man/man4/ng_nat.4
@@ -347,4 +347,4 @@ The
 node type was implemented in
 .Fx 6.0 .
 .Sh AUTHORS
-.An Gleb Smirnoff Aq glebius@FreeBSD.org
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org
diff --git a/share/man/man4/ng_netflow.4 b/share/man/man4/ng_netflow.4
index 3c710dc1a4e8..fb7e1faafad5 100644
--- a/share/man/man4/ng_netflow.4
+++ b/share/man/man4/ng_netflow.4
@@ -335,13 +335,13 @@ SEQ
 The
 .Nm
 node type was written by
-.An Gleb Smirnoff Aq glebius@FreeBSD.org ,
-.An Alexander Motin Aq mav@FreeBSD.org ,
-.An Alexander Chernikov Aq melifaro@ipfw.ru .
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org ,
+.An Alexander Motin Aq Mt mav@FreeBSD.org ,
+.An Alexander Chernikov Aq Mt melifaro@ipfw.ru .
 The initial code was based on
 .Nm ng_ipacct
 written by
-.An Roman V. Palagin Aq romanp@unshadow.net .
+.An Roman V. Palagin Aq Mt romanp@unshadow.net .
 .Sh BUGS
 Cache snapshot obtained via
 .Dv NGM_NETFLOW_SHOW
diff --git a/share/man/man4/ng_one2many.4 b/share/man/man4/ng_one2many.4
index 288ea1868785..845254e19069 100644
--- a/share/man/man4/ng_one2many.4
+++ b/share/man/man4/ng_one2many.4
@@ -268,11 +268,9 @@ node type was implemented in
 The
 .Nm one2many
 netgraph node (with round-robin algorithm) was written by
-.An Archie Cobbs
-.Aq archie@FreeBSD.org .
+.An Archie Cobbs Aq Mt archie@FreeBSD.org .
 The all algorithm was added by
-.An Rogier R. Mulhuijzen
-.Aq drwilco@drwilco.net .
+.An Rogier R. Mulhuijzen Aq Mt drwilco@drwilco.net .
 .Sh BUGS
 More transmit and link failure algorithms should be supported.
 A good candidate is Cisco's Etherchannel.
diff --git a/share/man/man4/ng_patch.4 b/share/man/man4/ng_patch.4
index db7ede54025f..52658ac1051c 100644
--- a/share/man/man4/ng_patch.4
+++ b/share/man/man4/ng_patch.4
@@ -218,9 +218,11 @@ The
 node type was implemented in
 .Fx 8.1 .
 .Sh AUTHORS
-.An "Maxim Ignatenko" Aq gelraen.ua@gmail.com .
+.An Maxim Ignatenko Aq Mt gelraen.ua@gmail.com
+.Pp
+.An -nosplit
 This manual page was written by
-.An "Vadim Goncharov" Aq vadimnuclight@tpu.ru .
+.An Vadim Goncharov Aq Mt vadimnuclight@tpu.ru .
 .Sh BUGS
 Node blindly tries to apply every patching operation to each packet
 (except those which offset if greater than length of the packet),
diff --git a/share/man/man4/ng_ppp.4 b/share/man/man4/ng_ppp.4
index 26c2853d7f8e..89e662cf81ff 100644
--- a/share/man/man4/ng_ppp.4
+++ b/share/man/man4/ng_ppp.4
@@ -457,4 +457,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
diff --git a/share/man/man4/ng_pppoe.4 b/share/man/man4/ng_pppoe.4
index a124d6770b7c..c2cf63f06dea 100644
--- a/share/man/man4/ng_pppoe.4
+++ b/share/man/man4/ng_pppoe.4
@@ -504,4 +504,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_pptpgre.4 b/share/man/man4/ng_pptpgre.4
index 3e26f9cc024b..fccecf854300 100644
--- a/share/man/man4/ng_pptpgre.4
+++ b/share/man/man4/ng_pptpgre.4
@@ -169,7 +169,7 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
 .Sh BUGS
 The node should not expect incoming GRE packets to have an IP header.
 This behavior is inherited from the (converse) behavior of raw IP sockets.
diff --git a/share/man/man4/ng_pred1.4 b/share/man/man4/ng_pred1.4
index fed3fdca8d04..7befbbccd00a 100644
--- a/share/man/man4/ng_pred1.4
+++ b/share/man/man4/ng_pred1.4
@@ -138,7 +138,7 @@ control message, or when hook have been disconnected.
 .%O RFC 1661
 .Re
 .Sh AUTHORS
-.An Alexander Motin Aq mav@alkar.net
+.An Alexander Motin Aq Mt mav@alkar.net
 .Sh BUGS
 Due to nature of netgraph PPP implementation there are possible race conditions
 between data packet and ResetAck CCP packet in case of packet loss. As result,
diff --git a/share/man/man4/ng_rfc1490.4 b/share/man/man4/ng_rfc1490.4
index de45fb7dab1e..51baa9e26a66 100644
--- a/share/man/man4/ng_rfc1490.4
+++ b/share/man/man4/ng_rfc1490.4
@@ -136,6 +136,6 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
 .Sh BUGS
 Not all of RFC 1490 is implemented.
diff --git a/share/man/man4/ng_socket.4 b/share/man/man4/ng_socket.4
index 84ddd1561bc6..d05802b0862e 100644
--- a/share/man/man4/ng_socket.4
+++ b/share/man/man4/ng_socket.4
@@ -179,7 +179,7 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
 .Sh BUGS
 It is not possible to reject the connection of a hook, though any
 data received on that hook can certainly be ignored.
diff --git a/share/man/man4/ng_split.4 b/share/man/man4/ng_split.4
index 4062ca25fbf2..827ecb65500b 100644
--- a/share/man/man4/ng_split.4
+++ b/share/man/man4/ng_split.4
@@ -84,5 +84,5 @@ but incorporated into
 in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
-.An Vitaly V. Belekhov Aq vitaly@riss-telecom.ru
+.An Julian Elischer Aq Mt julian@FreeBSD.org
+.An Vitaly V. Belekhov Aq Mt vitaly@riss-telecom.ru
diff --git a/share/man/man4/ng_sppp.4 b/share/man/man4/ng_sppp.4
index d23268f7f14d..685d45f1500e 100644
--- a/share/man/man4/ng_sppp.4
+++ b/share/man/man4/ng_sppp.4
@@ -169,4 +169,4 @@ It was included to the system since
 .Fx 5.3 .
 .Sh AUTHORS
 Copyright (C) 2003-2004
-.An Roman Kurakin Aq rik@cronyx.ru .
+.An Roman Kurakin Aq Mt rik@cronyx.ru
diff --git a/share/man/man4/ng_sscfu.4 b/share/man/man4/ng_sscfu.4
index c44c1f430958..2c444dacd589 100644
--- a/share/man/man4/ng_sscfu.4
+++ b/share/man/man4/ng_sscfu.4
@@ -158,4 +158,4 @@ If the node has not been enabled, 0 is returned.
 .Xr ng_sscop 4 ,
 .Xr ngctl 8
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/ng_sscop.4 b/share/man/man4/ng_sscop.4
index 5496a379b946..c98a43462581 100644
--- a/share/man/man4/ng_sscop.4
+++ b/share/man/man4/ng_sscop.4
@@ -400,4 +400,4 @@ were disabled.
 .Xr ng_sscfu 4 ,
 .Xr ngctl 8
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/ng_tag.4 b/share/man/man4/ng_tag.4
index 70bd23470259..6aac9fa97edf 100644
--- a/share/man/man4/ng_tag.4
+++ b/share/man/man4/ng_tag.4
@@ -329,7 +329,7 @@ The
 node type was implemented in
 .Fx 6.2 .
 .Sh AUTHORS
-.An Vadim Goncharov Aq vadimnuclight@tpu.ru
+.An Vadim Goncharov Aq Mt vadimnuclight@tpu.ru
 .Sh BUGS
 For manipulating any tags with data payload (that is, all tags with non-zero
 .Va tag_len )
diff --git a/share/man/man4/ng_tcpmss.4 b/share/man/man4/ng_tcpmss.4
index 240d97579c19..e13c562e3eee 100644
--- a/share/man/man4/ng_tcpmss.4
+++ b/share/man/man4/ng_tcpmss.4
@@ -119,7 +119,7 @@ The
 node type was implemented in
 .Fx 6.0 .
 .Sh AUTHORS
-.An Alexey Popov Aq lollypop@flexuser.ru
-.An Gleb Smirnoff Aq glebius@FreeBSD.org
+.An Alexey Popov Aq Mt lollypop@flexuser.ru
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org
 .Sh BUGS
 When running on SMP, system statistics may be broken.
diff --git a/share/man/man4/ng_tee.4 b/share/man/man4/ng_tee.4
index e86209df8429..426aaf99d012 100644
--- a/share/man/man4/ng_tee.4
+++ b/share/man/man4/ng_tee.4
@@ -131,4 +131,4 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Julian Elischer Aq Mt julian@FreeBSD.org
diff --git a/share/man/man4/ng_tty.4 b/share/man/man4/ng_tty.4
index 3add57cdc2cb..c8d5b37e95c7 100644
--- a/share/man/man4/ng_tty.4
+++ b/share/man/man4/ng_tty.4
@@ -116,8 +116,8 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
-.An Andrew Thompson Aq thompsa@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
+.An Andrew Thompson Aq Mt thompsa@FreeBSD.org
 .Sh BUGS
 The serial driver code also has a notion of a
 .Dq hot character .
diff --git a/share/man/man4/ng_ubt.4 b/share/man/man4/ng_ubt.4
index ef8a57ea7064..0036fa8cfd08 100644
--- a/share/man/man4/ng_ubt.4
+++ b/share/man/man4/ng_ubt.4
@@ -118,7 +118,7 @@ The
 node type was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Isochronous USB transfers are broken.
 This means that the USB device will not be able to transfer SCO data (voice).
diff --git a/share/man/man4/ng_uni.4 b/share/man/man4/ng_uni.4
index a2e3c4582205..da7028b0e015 100644
--- a/share/man/man4/ng_uni.4
+++ b/share/man/man4/ng_uni.4
@@ -404,7 +404,7 @@ The
 .Nm uni
 netgraph node
 and this manual page were written by
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
 .Sh BUGS
 .Bl -bullet -compact
 .It
diff --git a/share/man/man4/ng_vjc.4 b/share/man/man4/ng_vjc.4
index 83f026947670..bc4d562cd8bc 100644
--- a/share/man/man4/ng_vjc.4
+++ b/share/man/man4/ng_vjc.4
@@ -217,7 +217,7 @@ The
 node type was implemented in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@FreeBSD.org
+.An Archie Cobbs Aq Mt archie@FreeBSD.org
 .Sh BUGS
 As the initialization routine in the kernel implementation of
 Van Jacobson compression initializes both compression and decompression
diff --git a/share/man/man4/ng_vlan.4 b/share/man/man4/ng_vlan.4
index 1efacccc8088..7b225fdef06c 100644
--- a/share/man/man4/ng_vlan.4
+++ b/share/man/man4/ng_vlan.4
@@ -142,4 +142,4 @@ The
 node type appeared in
 .Fx 4.10 .
 .Sh AUTHORS
-.An Ruslan Ermilov Aq ru@FreeBSD.org
+.An Ruslan Ermilov Aq Mt ru@FreeBSD.org
diff --git a/share/man/man4/ngatmbase.4 b/share/man/man4/ngatmbase.4
index fd885ee51796..0227b44347bd 100644
--- a/share/man/man4/ngatmbase.4
+++ b/share/man/man4/ngatmbase.4
@@ -131,4 +131,4 @@ returns an appropriate error code.
 .Xr ng_sscop 4 ,
 .Xr ng_uni 4
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/nge.4 b/share/man/man4/nge.4
index ec02052601c9..227cffbcb3cb 100644
--- a/share/man/man4/nge.4
+++ b/share/man/man4/nge.4
@@ -224,4 +224,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@bsdi.com .
+.An Bill Paul Aq Mt wpaul@bsdi.com .
diff --git a/share/man/man4/nsp.4 b/share/man/man4/nsp.4
index 7ff7fe176255..86e3330405ca 100644
--- a/share/man/man4/nsp.4
+++ b/share/man/man4/nsp.4
@@ -91,8 +91,8 @@ driver was written by
 .An Naofumi HONDA .
 .Pp
 This manual page was written by
-.An Noriaki MITSUNAGA Aq non@FreeBSD.org
+.An Noriaki MITSUNAGA Aq Mt non@FreeBSD.org
 and
-.An Hideyuki KURASHINA Aq rushani@FreeBSD.org .
+.An Hideyuki KURASHINA Aq Mt rushani@FreeBSD.org .
 .Sh BUGS
 SMIT mode is only supported under OLDCARD now.
diff --git a/share/man/man4/ntb.4 b/share/man/man4/ntb.4
index ac16c61ebe09..ada350aae71d 100644
--- a/share/man/man4/ntb.4
+++ b/share/man/man4/ntb.4
@@ -94,7 +94,7 @@ variable.
 The
 .Nm
 driver was developed by Intel and originally written by
-.An Carl Delsey Aq carl@FreeBSD.org.
+.An Carl Delsey Aq Mt carl@FreeBSD.org .
 .Sh BUGS
 If the driver is unloaded, it cannot be reloaded without a system reboot.
 .Pp
diff --git a/share/man/man4/nvd.4 b/share/man/man4/nvd.4
index 0874ad5e70dd..f5210bf4a146 100644
--- a/share/man/man4/nvd.4
+++ b/share/man/man4/nvd.4
@@ -90,8 +90,8 @@ driver first appeared in
 The
 .Nm
 driver was developed by Intel and originally written by
-.An Jim Harris Aq jimharris@FreeBSD.org ,
+.An Jim Harris Aq Mt jimharris@FreeBSD.org ,
 with contributions from Joe Golio at EMC.
 .Pp
 This man page was written by
-.An Jim Harris Aq jimharris@FreeBSD.org .
+.An Jim Harris Aq Mt jimharris@FreeBSD.org .
diff --git a/share/man/man4/nvme.4 b/share/man/man4/nvme.4
index 0ea529b16cc9..068b006b954a 100644
--- a/share/man/man4/nvme.4
+++ b/share/man/man4/nvme.4
@@ -164,8 +164,10 @@ driver first appeared in
 The
 .Nm
 driver was developed by Intel and originally written by
-.An Jim Harris Aq jimharris@FreeBSD.org ,
-with contributions from Joe Golio at EMC.
+.An Jim Harris Aq Mt jimharris@FreeBSD.org ,
+with contributions from
+.An Joe Golio
+at EMC.
 .Pp
 This man page was written by
-.An Jim Harris Aq jimharris@FreeBSD.org .
+.An Jim Harris Aq Mt jimharris@FreeBSD.org .
diff --git a/share/man/man4/nvram2env.4 b/share/man/man4/nvram2env.4
index 36423fb96f99..b9b03115e98a 100644
--- a/share/man/man4/nvram2env.4
+++ b/share/man/man4/nvram2env.4
@@ -113,6 +113,4 @@ hint.nvram.1.base=0x1cff8000
 first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
-.An -nosplit
-.Nm
-.An Aleksandr Rybalko Aq ray@ddteam.net .
+.An Aleksandr Rybalko Aq Mt ray@ddteam.net
diff --git a/share/man/man4/nxge.4 b/share/man/man4/nxge.4
index 8d94afc599b9..7d18c787a713 100644
--- a/share/man/man4/nxge.4
+++ b/share/man/man4/nxge.4
@@ -79,7 +79,7 @@ For troubleshooting tips and FAQs, please visit
 .Pa http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous .
 .Pp
 For any issues please send an email to
-.Aq support@neterion.com .
+.Aq Mt support@neterion.com .
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr netintro 4 ,
@@ -93,5 +93,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Neterion
-.Aq support@neterion.com .
+.An Neterion Aq Mt support@neterion.com .
diff --git a/share/man/man4/ohci.4 b/share/man/man4/ohci.4
index 4a60c8bea5f6..b89eeb774f35 100644
--- a/share/man/man4/ohci.4
+++ b/share/man/man4/ohci.4
@@ -72,7 +72,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Lennart Augustsson Aq augustss@carlstedt.se
+.An Lennart Augustsson Aq Mt augustss@carlstedt.se
 for the
 .Nx
 project.
diff --git a/share/man/man4/orm.4 b/share/man/man4/orm.4
index 2922cb68eade..ede8c7573a4a 100644
--- a/share/man/man4/orm.4
+++ b/share/man/man4/orm.4
@@ -41,7 +41,7 @@ top of an option ROM.
 .Sh AUTHORS
 This
 manual page was written by
-.An Nikolai Saoukh Aq nms@otdel-1.org .
+.An Nikolai Saoukh Aq Mt nms@otdel-1.org .
 .Sh BUGS
 Due to the implementation of the resource manager,
 other drivers cannot attach to the option ROM address range.
diff --git a/share/man/man4/padlock.4 b/share/man/man4/padlock.4
index 2a74f63939c0..ad648af9d946 100644
--- a/share/man/man4/padlock.4
+++ b/share/man/man4/padlock.4
@@ -87,11 +87,11 @@ release to include it was
 The
 .Nm
 driver with AES encryption support was written by
-.An Jason Wright Aq jason@OpenBSD.org .
+.An Jason Wright Aq Mt jason@OpenBSD.org .
 It was ported to
 .Fx
 and then extended to support SHA1 and SHA256
 by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
 This manual page was written by
-.An Christian Brueffer Aq brueffer@FreeBSD.org .
+.An Christian Brueffer Aq Mt brueffer@FreeBSD.org .
diff --git a/share/man/man4/pass.4 b/share/man/man4/pass.4
index 7819ea369b80..7280de1a2df7 100644
--- a/share/man/man4/pass.4
+++ b/share/man/man4/pass.4
@@ -112,7 +112,7 @@ None.
 The CAM passthrough driver first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.org
+.An Kenneth Merry Aq Mt ken@FreeBSD.org
 .Sh BUGS
 It might be nice to have a way to asynchronously send CCBs through the
 passthrough driver.
diff --git a/share/man/man4/patm.4 b/share/man/man4/patm.4
index 443b9f7a8d43..4f7a10438f43 100644
--- a/share/man/man4/patm.4
+++ b/share/man/man4/patm.4
@@ -159,7 +159,7 @@ Thanks to Christian Bucari from ProSum for lending two of these cards to enable
 the development of this driver.
 Thanks also for answering my questions.
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
 .Sh CAVEATS
 The card fails to generate an interrupt if a cell is received in AAL0 mode
 that has the MSB of the PTI field cleared.
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4
index c79626f57bda..b1a056b970a7 100644
--- a/share/man/man4/pci.4
+++ b/share/man/man4/pci.4
@@ -331,7 +331,7 @@ Support for device listing and matching was re-implemented by
 Kenneth Merry, and first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.org
+.An Kenneth Merry Aq Mt ken@FreeBSD.org
 .Sh BUGS
 It is not possible for users to specify an accurate offset into the device
 list without calling the
diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4
index c92b1e68a099..78ab5b246ba0 100644
--- a/share/man/man4/pcm.4
+++ b/share/man/man4/pcm.4
@@ -780,14 +780,14 @@ The API evolved from the VOXWARE
 standard which later became OSS standard.
 .Sh AUTHORS
 .An -nosplit
-.An Luigi Rizzo Aq luigi@iet.unipi.it
+.An Luigi Rizzo Aq Mt luigi@iet.unipi.it
 initially wrote the
 .Nm pcm
 device driver and this manual page.
-.An Cameron Grant Aq gandalf@vilnya.demon.co.uk
+.An Cameron Grant Aq Mt gandalf@vilnya.demon.co.uk
 later revised the device driver for
 .Fx 4.0 .
-.An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
+.An Seigo Tanimura Aq Mt tanimura@r.dl.itc.u-tokyo.ac.jp
 revised this manual page.
 It was then rewritten for
 .Fx 5.2 .
diff --git a/share/man/man4/pcn.4 b/share/man/man4/pcn.4
index b86e4fb4f11b..619f20792599 100644
--- a/share/man/man4/pcn.4
+++ b/share/man/man4/pcn.4
@@ -188,4 +188,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@osd.bsdi.com .
+.An Bill Paul Aq Mt wpaul@osd.bsdi.com .
diff --git a/share/man/man4/polling.4 b/share/man/man4/polling.4
index 6abc37cbb34b..2d9018cb3de0 100644
--- a/share/man/man4/polling.4
+++ b/share/man/man4/polling.4
@@ -219,4 +219,4 @@ and
 .Fx 5.0 .
 .Sh AUTHORS
 Device polling was written by
-.An Luigi Rizzo Aq luigi@iet.unipi.it .
+.An Luigi Rizzo Aq Mt luigi@iet.unipi.it .
diff --git a/share/man/man4/procdesc.4 b/share/man/man4/procdesc.4
index e6895b0d68ee..ec8c827f29ec 100644
--- a/share/man/man4/procdesc.4
+++ b/share/man/man4/procdesc.4
@@ -77,13 +77,13 @@ and was developed at the University of Cambridge.
 .Nm
 was developed by
 .An -nosplit
-.An "Robert Watson" Aq rwatson@FreeBSD.org
+.An Robert Watson Aq Mt rwatson@FreeBSD.org
 and
-.An "Jonathan Anderson" Aq jonathan@FreeBSD.org
+.An Jonathan Anderson Aq Mt jonathan@FreeBSD.org
 at the University of Cambridge, and
-.An "Ben Laurie" Aq benl@FreeBSD.org
+.An Ben Laurie Aq Mt benl@FreeBSD.org
 and
-.An "Kris Kennaway" Aq kris@FreeBSD.org
+.An Kris Kennaway Aq Mt kris@FreeBSD.org
 at Google, Inc.
 .Sh BUGS
 .Nm
diff --git a/share/man/man4/proto.4 b/share/man/man4/proto.4
index f0fd60a88582..ead546b2320a 100644
--- a/share/man/man4/proto.4
+++ b/share/man/man4/proto.4
@@ -76,6 +76,7 @@ with
 .Pa pci<d>:<b>:<s>:<f>
 representing the location of the PCI device in the PCI hierarchy.
 A location includes:
+.Pp
 .Bl -tag -width XXXXXX -compact
 .It <d>
 The PCI domain number
@@ -101,11 +102,17 @@ representing I/O port or memory mapped I/O space (resp.)
 .Sh EXAMPLES
 A single function PCI device in domain 0, on bus 1, in slot 2 and having a
 single memory mapped I/O region will have the following device special files:
-.Bl -tag -compact
+.Pp
+.Bl -tag -width XXXXXX -compact
 .It Pa /dev/proto/pci0:1:2:0/10.mem
 .It Pa /dev/proto/pci0:1:2:0/pcicfg
 .El
-.\" 
+.\"
+.Sh AUTHORS
+The
+.Nm
+device driver and this manual page were written by
+.An Marcel Moolenaar Aq Mt marcel@xcllnt.net .
 .Sh SECURITY CONSIDERATIONS
 Because programs have direct access to the hardware, the
 .Nm
@@ -126,9 +133,3 @@ The details of how a program can set up and
 initiate DMA still need to be fleshed out.
 .Pp
 Support for non-PCI devices has not been implemented yet.
-.\"
-.Sh AUTHORS
-The
-.Nm
-device driver and this manual page were written by
-.An Marcel Moolenaar Aq marcel@xcllnt.net .
diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4
index 6ecb65c8597b..866e44747ef0 100644
--- a/share/man/man4/psm.4
+++ b/share/man/man4/psm.4
@@ -833,7 +833,7 @@ and
 to name the few.
 .Pp
 This manual page was written by
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
 .Sh CAVEATS
 Many pad devices behave as if the first (left) button were pressed if
 the user `taps' the surface of the pad.
diff --git a/share/man/man4/pst.4 b/share/man/man4/pst.4
index 3ce95d858890..549757731313 100644
--- a/share/man/man4/pst.4
+++ b/share/man/man4/pst.4
@@ -72,5 +72,4 @@ driver first appeared in
 The
 .Nm
 driver and man page was written by
-.An S\(/oren Schmidt
-.Aq sos@FreeBSD.org .
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org .
diff --git a/share/man/man4/qlxgb.4 b/share/man/man4/qlxgb.4
index c76386f540ae..c1e87e307d8b 100644
--- a/share/man/man4/qlxgb.4
+++ b/share/man/man4/qlxgb.4
@@ -72,7 +72,7 @@ For support questions please contact your QLogic approved reseller or
 QLogic Technical Support at
 .Pa http://support.qlogic.com ,
 or by E-mail at
-.Aq support@qlogic.com .
+.Aq Mt support@qlogic.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
diff --git a/share/man/man4/qlxgbe.4 b/share/man/man4/qlxgbe.4
index 888a57511577..32b7d34af857 100644
--- a/share/man/man4/qlxgbe.4
+++ b/share/man/man4/qlxgbe.4
@@ -70,7 +70,7 @@ For support questions please contact your QLogic approved reseller or
 QLogic Technical Support at
 .Pa http://support.qlogic.com ,
 or by E-mail at
-.Aq support@qlogic.com .
+.Aq Mt support@qlogic.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
diff --git a/share/man/man4/qlxge.4 b/share/man/man4/qlxge.4
index 01d2c0595759..21e6ce16c484 100644
--- a/share/man/man4/qlxge.4
+++ b/share/man/man4/qlxge.4
@@ -70,7 +70,7 @@ For support questions please contact your QLogic approved reseller or
 QLogic Technical Support at
 .Pa http://support.qlogic.com ,
 or by E-mail at
-.Aq support@qlogic.com .
+.Aq Mt support@qlogic.com .
 .Sh SEE ALSO
 .Xr altq 4 ,
 .Xr arp 4 ,
diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4
index f2a2bd185908..c99902aca12b 100644
--- a/share/man/man4/ral.4
+++ b/share/man/man4/ral.4
@@ -271,7 +271,7 @@ Support for the RT3090 chipset was added in
 The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien@openbsd.org .
+.An Damien Bergamini Aq Mt damien@openbsd.org .
 .Sh CAVEATS
 The
 .Nm
diff --git a/share/man/man4/rc.4 b/share/man/man4/rc.4
index 60c4fa501f07..c2ab34a8bc0a 100644
--- a/share/man/man4/rc.4
+++ b/share/man/man4/rc.4
@@ -109,7 +109,7 @@ This manual page first appeared in
 .Fx 5.3 .
 .Sh AUTHORS
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/re.4 b/share/man/man4/re.4
index bd720f47fc18..e5fc7b05a0d2 100644
--- a/share/man/man4/re.4
+++ b/share/man/man4/re.4
@@ -253,7 +253,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
 .Sh BUGS
 The Xterasys XN-152 32-bit PCI NIC, which uses the RTL8169 MAC and
 Marvell 88E1000 PHY, has a defect that causes DMA corruption
diff --git a/share/man/man4/rights.4 b/share/man/man4/rights.4
index 5819677db20b..476b15bad1d4 100644
--- a/share/man/man4/rights.4
+++ b/share/man/man4/rights.4
@@ -667,8 +667,8 @@ Project.
 .Sh AUTHORS
 .An -nosplit
 This manual page was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+.An Pawel Jakub Dawidek Aq Mt 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 .
+.An Robert Watson Aq Mt rwatson@FreeBSD.org .
diff --git a/share/man/man4/rl.4 b/share/man/man4/rl.4
index 583274bf832d..0de968fb6c65 100644
--- a/share/man/man4/rl.4
+++ b/share/man/man4/rl.4
@@ -273,7 +273,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
 .Sh BUGS
 Since outbound packets must be longword aligned, the transmit
 routine has to copy an unaligned packet into an mbuf cluster buffer
diff --git a/share/man/man4/rp.4 b/share/man/man4/rp.4
index a894f1242c76..d8a130c810b3 100644
--- a/share/man/man4/rp.4
+++ b/share/man/man4/rp.4
@@ -169,15 +169,15 @@ Off  Off  Off  Off   380-3C3
 .It Pa /dev/ttyR[0-4][0-9a-f]
 .El
 .Sh AUTHORS
-.An Theodore Ts'o Aq tytso@mit.edu
+.An Theodore Ts'o Aq Mt tytso@mit.edu
 .Pp
 This driver was written under contract for Comtrol Corporation.
 For dealer, distributor and other information regarding Comtrol
 .Tn RocketPort ,
 contact Comtrol Corporation at (800) 926-6876 or send email to
-.Aq info@comtrol.com .
+.Aq Mt info@comtrol.com .
 To report bugs for this driver, please send email to
-.Aq bug-bsdi-rocketport@comtrol.com .
+.Aq Mt bug-bsdi-rocketport@comtrol.com .
 .Sh BUGS
 If incoming software flow control is enabled on a 486 or Pentium
 machine, and the flow control is very heavily exercised, on rare occasions
diff --git a/share/man/man4/rsu.4 b/share/man/man4/rsu.4
index e26e3588fe82..be4aad9b9ccb 100644
--- a/share/man/man4/rsu.4
+++ b/share/man/man4/rsu.4
@@ -171,9 +171,9 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien@openbsd.org
+.An Damien Bergamini Aq Mt damien@openbsd.org
 and ported by
-.An Rui Paulo Aq rpaulo@freebsd.org .
+.An Rui Paulo Aq Mt rpaulo@freebsd.org .
 .Sh CAVEATS
 The
 .Nm
diff --git a/share/man/man4/rue.4 b/share/man/man4/rue.4
index 06f91e8a0a02..7450ccf97615 100644
--- a/share/man/man4/rue.4
+++ b/share/man/man4/rue.4
@@ -151,4 +151,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Shunsuke Akiyama Aq akiyama@FreeBSD.org .
+.An Shunsuke Akiyama Aq Mt akiyama@FreeBSD.org .
diff --git a/share/man/man4/rum.4 b/share/man/man4/rum.4
index 6e456894175a..3abcbcad8764 100644
--- a/share/man/man4/rum.4
+++ b/share/man/man4/rum.4
@@ -175,12 +175,13 @@ The
 driver first appeared in
 .Ox 4.0 .
 .Sh AUTHORS
+.An -nosplit
 The original
 .Nm
 driver was written by
-.An Niall O'Higgins Aq niallo@openbsd.org
+.An Niall O'Higgins Aq Mt niallo@openbsd.org
 and
-.An Damien Bergamini Aq damien@openbsd.org .
+.An Damien Bergamini Aq Mt damien@openbsd.org .
 .Sh BUGS
 Host AP mode doesn't support client power save.
 Clients using power save mode will experience
diff --git a/share/man/man4/run.4 b/share/man/man4/run.4
index f86a2968653b..52ce5442bc77 100644
--- a/share/man/man4/run.4
+++ b/share/man/man4/run.4
@@ -244,7 +244,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien@openbsd.org .
+.An Damien Bergamini Aq Mt damien@openbsd.org .
 .Sh CAVEATS
 The
 .Nm
diff --git a/share/man/man4/scc.4 b/share/man/man4/scc.4
index b08b3f8dbac6..80072f55d690 100644
--- a/share/man/man4/scc.4
+++ b/share/man/man4/scc.4
@@ -72,4 +72,4 @@ device driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Marcel Moolenaar Aq marcel@xcllnt.net .
+.An Marcel Moolenaar Aq Mt marcel@xcllnt.net .
diff --git a/share/man/man4/sched_ule.4 b/share/man/man4/sched_ule.4
index 42dee4de8a61..7ba18d361a38 100644
--- a/share/man/man4/sched_ule.4
+++ b/share/man/man4/sched_ule.4
@@ -72,5 +72,4 @@ The
 scheduler first appeared in
 .Fx 5.1 .
 .Sh AUTHORS
-.An Jeff Roberson
-.Aq jeff@FreeBSD.org
+.An Jeff Roberson Aq Mt jeff@FreeBSD.org
diff --git a/share/man/man4/screen.4 b/share/man/man4/screen.4
index 0b6ac2d93133..2e08d28e9759 100644
--- a/share/man/man4/screen.4
+++ b/share/man/man4/screen.4
@@ -238,4 +238,4 @@ SGR	E[nm	Set character attributes:		--
 note: the first E in the sequences stands for ESC (0x1b)
 .Ed
 .Sh AUTHORS
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4
index 868430708eaa..7c786ea8888b 100644
--- a/share/man/man4/scsi.4
+++ b/share/man/man4/scsi.4
@@ -351,4 +351,4 @@ The
 .Nm
 .Tn ATA
 support was added by
-.An Alexander Motin Aq mav@FreeBSD.org .
+.An Alexander Motin Aq Mt mav@FreeBSD.org .
diff --git a/share/man/man4/sdhci.4 b/share/man/man4/sdhci.4
index 6adfd81a3823..8fd16ff8a849 100644
--- a/share/man/man4/sdhci.4
+++ b/share/man/man4/sdhci.4
@@ -80,7 +80,7 @@ TI PCIXX21/XX11
 .%T "SD Specifications, Part 2, SD Host Controller, Simplified Specification"
 .Re
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org .
+.An Alexander Motin Aq Mt mav@FreeBSD.org
 .Sh BUGS
 Many of existing SD controller chips have some nonstandard requirements,
 proprietary registers and hardware bugs, requiring additional handling.
diff --git a/share/man/man4/send.4 b/share/man/man4/send.4
index 3f90eafe44f6..4af510aa729e 100644
--- a/share/man/man4/send.4
+++ b/share/man/man4/send.4
@@ -206,7 +206,7 @@ The
 module first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
-.An Ana Kukec Aq anchie@FreeBSD.org ,
+.An Ana Kukec Aq Mt anchie@FreeBSD.org ,
 University of Zagreb
 .Sh BUGS
 Due to the lack of NDP locking, it is currently not possible to unload the
diff --git a/share/man/man4/sf.4 b/share/man/man4/sf.4
index 80ba44e19bfe..a32df916887c 100644
--- a/share/man/man4/sf.4
+++ b/share/man/man4/sf.4
@@ -206,4 +206,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
diff --git a/share/man/man4/sge.4 b/share/man/man4/sge.4
index 70d839e6adce..0322169b6e74 100644
--- a/share/man/man4/sge.4
+++ b/share/man/man4/sge.4
@@ -112,10 +112,8 @@ SiS191 Fast/Gigabit Ethernet controller
 The
 .Nm
 driver was written by
-.An Alexander Pohoyda
-.Aq alexander.pohoyda@gmx.net .
+.An Alexander Pohoyda Aq Mt alexander.pohoyda@gmx.net .
 And enhanced by
-.An Nikolay Denev
-.Aq ndenev@gmail.com .
+.An Nikolay Denev Aq Mt ndenev@gmail.com .
 It first appeared in
 .Fx 8.1 .
diff --git a/share/man/man4/si.4 b/share/man/man4/si.4
index 5eb7629d979d..1f008859702c 100644
--- a/share/man/man4/si.4
+++ b/share/man/man4/si.4
@@ -144,22 +144,22 @@ locked termios state devices for dialout ports
 .Sh HISTORY
 This driver is loosely based on driver code originating at Specialix, which
 was ported to run on BSDI by
-.An Andy Rutter Aq andy@specialix.co.uk .
+.An Andy Rutter Aq Mt andy@specialix.co.uk .
 The System V driver source is/was available by ftp from
 .Sy ftp.specialix.co.uk .
 .Pp
 This driver is not supported by Specialix International.
 .Sh AUTHORS
 .An -nosplit
-.An Peter Wemm Aq peter@netplex.com.au
+.An Peter Wemm Aq Mt peter@netplex.com.au
 obtained the code from
 .An Andy Rutter
 and ported it to
 .Fx
 and threw the man page together.
-.An Bruce Evans Aq bde@zeta.org.au
+.An Bruce Evans Aq Mt bde@zeta.org.au
 provided a large amount of assistance during porting.
-.An Nick Sayer Aq nick@specialix.com
+.An Nick Sayer Aq Mt nick@specialix.com
 wrote the EISA, PCI and SX portions.
 .Sh BUGS
 The interrupt tuning rate is not believed to be optimal at this time for
diff --git a/share/man/man4/siba.4 b/share/man/man4/siba.4
index 288a13f1a145..6f855d413f8b 100644
--- a/share/man/man4/siba.4
+++ b/share/man/man4/siba.4
@@ -81,10 +81,8 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bruce M. Simpson
-.Aq bms@FreeBSD.org
+.An Bruce M. Simpson Aq Mt bms@FreeBSD.org
 and
-.An Weongyo Jeong
-.Aq weongyo@FreeBSD.org .
+.An Weongyo Jeong Aq Mt weongyo@FreeBSD.org .
 .Sh CAVEATS
 Host mode is not supported at this moment.
diff --git a/share/man/man4/siftr.4 b/share/man/man4/siftr.4
index ab92f77b94e4..4f29c115f344 100644
--- a/share/man/man4/siftr.4
+++ b/share/man/man4/siftr.4
@@ -642,12 +642,12 @@ http://caia.swin.edu.au/freebsd/etcp09/
 .An -nosplit
 .Nm
 was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org
 and
-.An James Healy Aq jimmy@deefa.com .
+.An James Healy Aq Mt jimmy@deefa.com .
 .Pp
 This manual page was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
 .Sh BUGS
 Current known limitations and any relevant workarounds are outlined below:
 .Bl -dash
diff --git a/share/man/man4/siis.4 b/share/man/man4/siis.4
index 366c3ccc539d..4bf97c22e3c4 100644
--- a/share/man/man4/siis.4
+++ b/share/man/man4/siis.4
@@ -138,4 +138,4 @@ The
 driver first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org .
+.An Alexander Motin Aq Mt mav@FreeBSD.org
diff --git a/share/man/man4/sis.4 b/share/man/man4/sis.4
index 414f0d8d7260..66eadc5c2862 100644
--- a/share/man/man4/sis.4
+++ b/share/man/man4/sis.4
@@ -223,4 +223,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
diff --git a/share/man/man4/sk.4 b/share/man/man4/sk.4
index 18e53a94945a..d78eafeb1343 100644
--- a/share/man/man4/sk.4
+++ b/share/man/man4/sk.4
@@ -238,4 +238,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
diff --git a/share/man/man4/smp.4 b/share/man/man4/smp.4
index 1dfd283e45d0..a1b8c09f3133 100644
--- a/share/man/man4/smp.4
+++ b/share/man/man4/smp.4
@@ -39,7 +39,7 @@ kernel implements symmetric multi-processor support.
 Support for multi-processor systems is present for all Tier-1
 architectures on
 .Fx .
-Currently, this includes amd64, i386, ia64, and sparc64.
+Currently, this includes amd64, i386 and sparc64.
 Support is enabled using
 .Cd options SMP .
 It is permissible to use the SMP kernel configuration on non-SMP equipped
@@ -158,6 +158,6 @@ in
 .Bsx .
 .Pp
 .Fx 5.0
-also introduced support for SMP on the ia64 and sparc64 architectures.
+also introduced support for SMP on the sparc64 architecture.
 .Sh AUTHORS
-.An Steve Passe Aq fsmp@FreeBSD.org
+.An Steve Passe Aq Mt fsmp@FreeBSD.org
diff --git a/share/man/man4/snd_ad1816.4 b/share/man/man4/snd_ad1816.4
index 3d2cb0c444a1..2bc5a46aa560 100644
--- a/share/man/man4/snd_ad1816.4
+++ b/share/man/man4/snd_ad1816.4
@@ -76,6 +76,6 @@ The
 device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
-.An "Cameron Grant" Aq cg@FreeBSD.org
-.An "Luigi Rizzo" Aq luigi@FreeBSD.org
+.An Cameron Grant Aq Mt cg@FreeBSD.org
+.An Luigi Rizzo Aq Mt luigi@FreeBSD.org
 .An "Hannu Savolainen"
diff --git a/share/man/man4/snd_als4000.4 b/share/man/man4/snd_als4000.4
index a13779a29046..fbf63f4a5de0 100644
--- a/share/man/man4/snd_als4000.4
+++ b/share/man/man4/snd_als4000.4
@@ -67,4 +67,4 @@ The
 device driver first appeared in
 .Fx 4.4 .
 .Sh AUTHORS
-.An "Orion Hodson" Aq oho@acm.org
+.An Orion Hodson Aq Mt oho@acm.org
diff --git a/share/man/man4/snd_atiixp.4 b/share/man/man4/snd_atiixp.4
index ba02da648bd2..45c65f984989 100644
--- a/share/man/man4/snd_atiixp.4
+++ b/share/man/man4/snd_atiixp.4
@@ -89,7 +89,7 @@ device driver first appeared in
 .Fx 6.1 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/snd_cmi.4 b/share/man/man4/snd_cmi.4
index d6dc088215c7..35aded63bbd5 100644
--- a/share/man/man4/snd_cmi.4
+++ b/share/man/man4/snd_cmi.4
@@ -73,4 +73,4 @@ The
 device driver first appeared in
 .Fx 4.3 .
 .Sh AUTHORS
-.An "Orion Hodson" Aq O.Hodson@cs.ucl.ac.uk
+.An Orion Hodson Aq Mt O.Hodson@cs.ucl.ac.uk
diff --git a/share/man/man4/snd_cs4281.4 b/share/man/man4/snd_cs4281.4
index 2b94174dde54..ee7b4ddc0891 100644
--- a/share/man/man4/snd_cs4281.4
+++ b/share/man/man4/snd_cs4281.4
@@ -67,4 +67,4 @@ The
 device driver first appeared in
 .Fx 4.3 .
 .Sh AUTHORS
-.An "Orion Hodson" Aq O.Hodson@cs.ucl.ac.uk
+.An Orion Hodson Aq Mt O.Hodson@cs.ucl.ac.uk
diff --git a/share/man/man4/snd_csa.4 b/share/man/man4/snd_csa.4
index 36a6857e8ffd..ed0fb76dd006 100644
--- a/share/man/man4/snd_csa.4
+++ b/share/man/man4/snd_csa.4
@@ -95,4 +95,4 @@ The
 device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
+.An Seigo Tanimura Aq Mt tanimura@r.dl.itc.u-tokyo.ac.jp
diff --git a/share/man/man4/snd_ds1.4 b/share/man/man4/snd_ds1.4
index d6919244c80c..2d3491366ffe 100644
--- a/share/man/man4/snd_ds1.4
+++ b/share/man/man4/snd_ds1.4
@@ -69,4 +69,4 @@ The
 device driver first appeared in
 .Fx 4.1 .
 .Sh AUTHORS
-.An "Cameron Grant" Aq cg@FreeBSD.org
+.An Cameron Grant Aq Mt cg@FreeBSD.org
diff --git a/share/man/man4/snd_emu10k1.4 b/share/man/man4/snd_emu10k1.4
index 3052f1238bb0..1d4a8603a4ec 100644
--- a/share/man/man4/snd_emu10k1.4
+++ b/share/man/man4/snd_emu10k1.4
@@ -75,8 +75,8 @@ The
 device driver first appeared in
 .Fx 4.1 .
 .Sh AUTHORS
-.An "David O'Brien" Aq obrien@FreeBSD.org
-.An "Orlando Bassotto" Aq orlando.bassotto@ieo-research.it
-.An "Cameron Grant" Aq cg@FreeBSD.org
+.An David O'Brien Aq Mt obrien@FreeBSD.org
+.An Orlando Bassotto Aq Mt orlando.bassotto@ieo-research.it
+.An Cameron Grant Aq Mt cg@FreeBSD.org
 .Sh BUGS
 Fancy features like DD5.1 output are not supported.
diff --git a/share/man/man4/snd_emu10kx.4 b/share/man/man4/snd_emu10kx.4
index 72568c3ffec6..690727416f54 100644
--- a/share/man/man4/snd_emu10kx.4
+++ b/share/man/man4/snd_emu10kx.4
@@ -275,11 +275,11 @@ device driver first appeared in
 The PCM part of the driver is based on the
 .Xr snd_emu10k1 4
 SB Live!\& driver by
-.An Cameron Grant Aq cg@FreeBSD.org .
+.An Cameron Grant Aq Mt cg@FreeBSD.org .
 The MIDI interface is based on the
 .Xr snd_emu10k1 4
 MIDI interface code by
-.An Mathew Kanner Aq matk@FreeBSD.org .
+.An Mathew Kanner Aq Mt matk@FreeBSD.org .
 The
 .Nm
 device driver and this manual page were written by
diff --git a/share/man/man4/snd_envy24.4 b/share/man/man4/snd_envy24.4
index 158fbf891063..5844d920cf04 100644
--- a/share/man/man4/snd_envy24.4
+++ b/share/man/man4/snd_envy24.4
@@ -81,4 +81,4 @@ The
 driver was written by
 .An Katsurajima Naoto .
 This manual page was written by
-.An Alexander Leidinger Aq netchild@FreeBSD.org .
+.An Alexander Leidinger Aq Mt netchild@FreeBSD.org .
diff --git a/share/man/man4/snd_envy24ht.4 b/share/man/man4/snd_envy24ht.4
index 03a9cb4805e0..086d5cd81105 100644
--- a/share/man/man4/snd_envy24ht.4
+++ b/share/man/man4/snd_envy24ht.4
@@ -104,4 +104,4 @@ based upon the
 .Xr snd_envy24 4
 driver.
 This manual page was written by
-.An Alexander Leidinger Aq netchild@FreeBSD.org .
+.An Alexander Leidinger Aq Mt netchild@FreeBSD.org .
diff --git a/share/man/man4/snd_es137x.4 b/share/man/man4/snd_es137x.4
index 9602fcec96e2..d00ea5fb9a35 100644
--- a/share/man/man4/snd_es137x.4
+++ b/share/man/man4/snd_es137x.4
@@ -111,7 +111,7 @@ The
 device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
-.An "Russell Cattelan" Aq cattelan@thebarn.com
-.An "Cameron Grant" Aq cg@FreeBSD.org
-.An "Joachim Kuebart"
-.An "Jonathan Noack" Aq noackjr@alumni.rice.edu
+.An Russell Cattelan Aq Mt cattelan@thebarn.com
+.An Cameron Grant Aq Mt cg@FreeBSD.org
+.An Joachim Kuebart
+.An Jonathan Noack Aq Mt noackjr@alumni.rice.edu
diff --git a/share/man/man4/snd_ess.4 b/share/man/man4/snd_ess.4
index bd0d6d75ec03..2b0333130084 100644
--- a/share/man/man4/snd_ess.4
+++ b/share/man/man4/snd_ess.4
@@ -68,5 +68,5 @@ The
 device driver first appeared in
 .Fx 4.1 .
 .Sh AUTHORS
-.An "Cameron Grant" Aq cg@FreeBSD.org
-.An "Luigi Rizzo" Aq luigi@FreeBSD.org
+.An Cameron Grant Aq Mt cg@FreeBSD.org
+.An Luigi Rizzo Aq Mt luigi@FreeBSD.org
diff --git a/share/man/man4/snd_fm801.4 b/share/man/man4/snd_fm801.4
index 0e6650451d56..48807ec3a2f3 100644
--- a/share/man/man4/snd_fm801.4
+++ b/share/man/man4/snd_fm801.4
@@ -69,7 +69,7 @@ device driver first appeared in
 .Fx 4.2 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
 .Sh BUGS
 The Forte Media FM801 chipset is a sort of PCI bridge, not an actual
 sound controller, making it possible to have soundless support.
diff --git a/share/man/man4/snd_gusc.4 b/share/man/man4/snd_gusc.4
index 99df5403e158..1ad73cfef4b2 100644
--- a/share/man/man4/snd_gusc.4
+++ b/share/man/man4/snd_gusc.4
@@ -91,7 +91,7 @@ The
 device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Ville-Pertti Keinonen Aq will@iki.fi
-.An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
+.An Ville-Pertti Keinonen Aq Mt will@iki.fi
+.An Seigo Tanimura Aq Mt tanimura@r.dl.itc.u-tokyo.ac.jp
 .Sh BUGS
 Recording pcm sound data is not supported yet.
diff --git a/share/man/man4/snd_hda.4 b/share/man/man4/snd_hda.4
index 91e599d65da2..cdb2a620dbc5 100644
--- a/share/man/man4/snd_hda.4
+++ b/share/man/man4/snd_hda.4
@@ -605,15 +605,15 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Stephane E. Potvin Aq sepotvin@videotron.ca ,
-.An Ariff Abdullah Aq ariff@FreeBSD.org
+.An Stephane E. Potvin Aq Mt sepotvin@videotron.ca ,
+.An Ariff Abdullah Aq Mt ariff@FreeBSD.org
 and
-.An Alexander Motin Aq mav@FreeBSD.org .
+.An Alexander Motin Aq Mt mav@FreeBSD.org .
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org ,
-.An Alexander Motin Aq mav@FreeBSD.org
+.An Joel Dahl Aq Mt joel@FreeBSD.org ,
+.An Alexander Motin Aq Mt mav@FreeBSD.org
 and
-.An Giorgos Keramidas Aq keramida@FreeBSD.org .
+.An Giorgos Keramidas Aq Mt keramida@FreeBSD.org .
 .Sh BUGS
 Some Hardware/OEM vendors tend to screw up BIOS settings or use custom
 unusual CODEC wiring that create problems to the driver.
diff --git a/share/man/man4/snd_ich.4 b/share/man/man4/snd_ich.4
index c4359c85acc2..528d28cb52e9 100644
--- a/share/man/man4/snd_ich.4
+++ b/share/man/man4/snd_ich.4
@@ -108,4 +108,4 @@ device driver first appeared in
 .Fx 4.2 .
 .Sh AUTHORS
 This manual page was written by
-.An Jorge Mario G. Mazo Aq jgutie11@eafit.edu.co .
+.An Jorge Mario G. Mazo Aq Mt jgutie11@eafit.edu.co .
diff --git a/share/man/man4/snd_maestro.4 b/share/man/man4/snd_maestro.4
index d630a3324f97..eb74709e98a1 100644
--- a/share/man/man4/snd_maestro.4
+++ b/share/man/man4/snd_maestro.4
@@ -75,4 +75,4 @@ device driver first appeared in
 .Fx 4.2 .
 .Sh AUTHORS
 This manual page was written by
-.An Jorge Mario G. Mazo Aq jgutie11@eafit.edu.co .
+.An Jorge Mario G. Mazo Aq Mt jgutie11@eafit.edu.co .
diff --git a/share/man/man4/snd_maestro3.4 b/share/man/man4/snd_maestro3.4
index 4fadd0453cae..fa61a5b6f37f 100644
--- a/share/man/man4/snd_maestro3.4
+++ b/share/man/man4/snd_maestro3.4
@@ -90,5 +90,5 @@ The
 driver first appeared in
 .Fx 4.3 .
 .Sh AUTHORS
-.An Scott Long Aq scottl@FreeBSD.org
-.An Darrel Anderson Aq anderson@cs.duke.edu
+.An Scott Long Aq Mt scottl@FreeBSD.org
+.An Darrel Anderson Aq Mt anderson@cs.duke.edu
diff --git a/share/man/man4/snd_mss.4 b/share/man/man4/snd_mss.4
index 76ef18339c6b..1baf1989d23a 100644
--- a/share/man/man4/snd_mss.4
+++ b/share/man/man4/snd_mss.4
@@ -113,4 +113,4 @@ device driver first appeared in
 .Fx 2.2.6 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
diff --git a/share/man/man4/snd_neomagic.4 b/share/man/man4/snd_neomagic.4
index 430220c23152..2865bbba344c 100644
--- a/share/man/man4/snd_neomagic.4
+++ b/share/man/man4/snd_neomagic.4
@@ -71,4 +71,4 @@ device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
diff --git a/share/man/man4/snd_sbc.4 b/share/man/man4/snd_sbc.4
index 8b53c8eb9eaa..227080c65beb 100644
--- a/share/man/man4/snd_sbc.4
+++ b/share/man/man4/snd_sbc.4
@@ -129,4 +129,4 @@ The
 device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Seigo Tanimura Aq tanimura@r.dl.itc.u-tokyo.ac.jp
+.An Seigo Tanimura Aq Mt tanimura@r.dl.itc.u-tokyo.ac.jp
diff --git a/share/man/man4/snd_solo.4 b/share/man/man4/snd_solo.4
index 55e12fc002cb..c694cc5c78ba 100644
--- a/share/man/man4/snd_solo.4
+++ b/share/man/man4/snd_solo.4
@@ -63,4 +63,4 @@ The
 device driver first appeared in
 .Fx 4.1 .
 .Sh AUTHORS
-.An "Cameron Grant" Aq cg@FreeBSD.org
+.An Cameron Grant Aq Mt cg@FreeBSD.org
diff --git a/share/man/man4/snd_spicds.4 b/share/man/man4/snd_spicds.4
index 7b95b8689bd3..aea0c56e0935 100644
--- a/share/man/man4/snd_spicds.4
+++ b/share/man/man4/snd_spicds.4
@@ -86,4 +86,4 @@ based upon the
 .Xr snd_envy24 4
 driver.
 This manual page was written by
-.An Alexander Leidinger Aq netchild@FreeBSD.org .
+.An Alexander Leidinger Aq Mt netchild@FreeBSD.org .
diff --git a/share/man/man4/snd_t4dwave.4 b/share/man/man4/snd_t4dwave.4
index ef916659115f..c96eefb1b6d7 100644
--- a/share/man/man4/snd_t4dwave.4
+++ b/share/man/man4/snd_t4dwave.4
@@ -74,4 +74,4 @@ device driver first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
diff --git a/share/man/man4/snd_uaudio.4 b/share/man/man4/snd_uaudio.4
index b045851692b1..d1049471a7ba 100644
--- a/share/man/man4/snd_uaudio.4
+++ b/share/man/man4/snd_uaudio.4
@@ -86,7 +86,7 @@ This manual page was adopted from
 and modified for
 .Fx
 by
-.An Hiten Pandya Aq hmp@FreeBSD.org .
+.An Hiten Pandya Aq Mt hmp@FreeBSD.org .
 .Sh BUGS
 The
 .Tn PCM
diff --git a/share/man/man4/snd_via8233.4 b/share/man/man4/snd_via8233.4
index 377fbd3ee0b1..5637701beb37 100644
--- a/share/man/man4/snd_via8233.4
+++ b/share/man/man4/snd_via8233.4
@@ -95,7 +95,7 @@ device driver first appeared in
 .Fx 4.7 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/snd_via82c686.4 b/share/man/man4/snd_via82c686.4
index 183684ec1170..85c6c18e0b8d 100644
--- a/share/man/man4/snd_via82c686.4
+++ b/share/man/man4/snd_via82c686.4
@@ -68,4 +68,4 @@ device driver first appeared in
 .Fx 4.2 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
diff --git a/share/man/man4/snd_vibes.4 b/share/man/man4/snd_vibes.4
index 716a65cd299a..9db6f0fe5b64 100644
--- a/share/man/man4/snd_vibes.4
+++ b/share/man/man4/snd_vibes.4
@@ -68,4 +68,4 @@ device driver first appeared in
 .Fx 4.4 .
 .Sh AUTHORS
 This manual page was written by
-.An Joel Dahl Aq joel@FreeBSD.org .
+.An Joel Dahl Aq Mt joel@FreeBSD.org .
diff --git a/share/man/man4/snp.4 b/share/man/man4/snp.4
index 2545164436a1..48e10a951b9a 100644
--- a/share/man/man4/snp.4
+++ b/share/man/man4/snp.4
@@ -83,12 +83,13 @@ the
 .Nm
 driver was rewritten to work with the replaced TTY subsystem.
 .Sh AUTHORS
+.An -nosplit
 The author of the current implementation is
-.An Ed Schouten Aq ed@FreeBSD.org .
+.An Ed Schouten Aq Mt ed@FreeBSD.org .
 Previous versions of
 .Nm
 were based on code written by
-.An Ugen J.S. Antsilevich Aq ugen@NetVision.net.il .
+.An Ugen J.S. Antsilevich Aq Mt ugen@NetVision.net.il .
 .Sh BUGS
 This version of
 .Nm
diff --git a/share/man/man4/spic.4 b/share/man/man4/spic.4
index a398007f88ed..5bbf53bb8bea 100644
--- a/share/man/man4/spic.4
+++ b/share/man/man4/spic.4
@@ -57,5 +57,5 @@ The
 device driver first appeared in
 .Fx 4.6 .
 .Sh AUTHORS
-.An Nick Sayer Aq nsayer@FreeBSD.org
-.An Will Andrews Aq will@FreeBSD.org
+.An Nick Sayer Aq Mt nsayer@FreeBSD.org
+.An Will Andrews Aq Mt will@FreeBSD.org
diff --git a/share/man/man4/spkr.4 b/share/man/man4/spkr.4
index 1f39a1eec0ec..c1f0894cd5df 100644
--- a/share/man/man4/spkr.4
+++ b/share/man/man4/spkr.4
@@ -222,10 +222,10 @@ The
 device appeared in
 .Fx 1.0 .
 .Sh AUTHORS
-.An Eric S. Raymond Aq esr@snark.thyrsus.com
+.An Eric S. Raymond Aq Mt esr@snark.thyrsus.com ,
 June 1990
-.Sh "PORTED BY"
-.An Andrew A. Chernov Aq ache@astral.msk.su
+.Sh PORTED BY
+.An Andrew A. Chernov Aq Mt ache@astral.msk.su
 .Sh BUGS
 Due to roundoff in the pitch tables and slop in the tone-generation and timer
 hardware (neither of which was designed for precision), neither pitch accuracy
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index 2a9a2970c059..6cbccf3d966f 100644
--- a/share/man/man4/splash.4
+++ b/share/man/man4/splash.4
@@ -259,24 +259,24 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
 The
 .Pa splash_bmp
 module was written by
-.An Michael Smith Aq msmith@FreeBSD.org
+.An Michael Smith Aq Mt msmith@FreeBSD.org
 and
 .An Kazutaka Yokota .
 The
 .Pa splash_pcx
 module was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org
 based on the
 .Pa splash_bmp
 code.
 The
 .Pa splash_txt
 module was written by
-.An Antony Mawer Aq antony@mawer.org
+.An Antony Mawer Aq Mt antony@mawer.org
 based on the
 .Pa splash_bmp
 code, with some additional inspiration from the
diff --git a/share/man/man4/sppp.4 b/share/man/man4/sppp.4
index 519120f4fdaf..00700d8bcb96 100644
--- a/share/man/man4/sppp.4
+++ b/share/man/man4/sppp.4
@@ -204,9 +204,8 @@ take place.
 The original implementation of
 .Nm
 was written in 1994 at Cronyx Ltd., Moscow by
-.An Serge Vakulenko Aq vak@cronyx.ru .
-.An J\(:org Wunsch
-.Aq joerg_wunsch@uriah.heep.sax.de
+.An Serge Vakulenko Aq Mt vak@cronyx.ru .
+.An J\(:org Wunsch Aq Mt joerg_wunsch@uriah.heep.sax.de
 rewrote a large part in 1997 in order
 to fully implement the state machine as described in RFC 1661, so it
 could also be used for dialup lines.
diff --git a/share/man/man4/ste.4 b/share/man/man4/ste.4
index 22982b1db22f..60f7e4336d0e 100644
--- a/share/man/man4/ste.4
+++ b/share/man/man4/ste.4
@@ -201,4 +201,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
diff --git a/share/man/man4/stge.4 b/share/man/man4/stge.4
index bfcaab0533c2..527d241aa815 100644
--- a/share/man/man4/stge.4
+++ b/share/man/man4/stge.4
@@ -192,11 +192,9 @@ and first appeared in
 The
 .Nx
 version was written by
-.An Jason R. Thorpe
-.Aq thorpej@NetBSD.org .
+.An Jason R. Thorpe Aq Mt thorpej@NetBSD.org .
 .Sh AUTHORS
 The
 .Nm
 driver was ported by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
diff --git a/share/man/man4/syncache.4 b/share/man/man4/syncache.4
index 45dcf2c9b8b0..b212b12cde95 100644
--- a/share/man/man4/syncache.4
+++ b/share/man/man4/syncache.4
@@ -212,4 +212,4 @@ then further extended here.
 The
 .Nm
 code and manual page were written by
-.An Jonathan Lemon Aq jlemon@FreeBSD.org .
+.An Jonathan Lemon Aq Mt jlemon@FreeBSD.org .
diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index d9400c91fbcb..8653c79d1253 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 11, 2009
+.Dd July 3, 2014
 .Dt SYSCONS 4
 .Os
 .Sh NAME
@@ -62,6 +62,10 @@ In
 .Pa /boot/device.hints :
 .Cd hint.sc.0.at="isa"
 .Cd hint.sc.0.vesa_mode=0x103
+.Pp
+In
+.Pa /boot/loader.conf :
+.Cd kern.vty=sc
 .Sh DESCRIPTION
 The
 .Nm
@@ -403,7 +407,9 @@ option too.
 The following driver flags can be used to control the
 .Nm
 driver.
-They can be set either in
+Driver flags can be set with the
+.Cd hint.sc.0.flags
+tunable, either in
 .Pa /boot/device.hints ,
 or else at the loader prompt (see
 .Xr loader 8 ) .
@@ -446,6 +452,26 @@ This option instructs the syscons driver to periodically scan
 for a keyboard device if it is not currently attached to one.
 Otherwise, the driver only probes for a keyboard once during bootup.
 .El
+.Ss Loader Tunables
+These settings can be entered at the
+.Xr loader 8
+prompt or in
+.Xr loader.conf 5 .
+.Bl -tag -width indent
+.It Va kern.vty
+When both
+.Nm
+and
+.Xr vt 4
+have been compiled into the kernel, the one to use for the system console can
+be selected by setting this variable to
+.Ql sc
+or
+.Ql vt .
+If not set,
+.Nm
+provides the default system console.
+.El
 .Sh FILES
 .Bl -tag -width /usr/share/syscons/xxxxyyyyzzz -compact
 .It Pa /dev/console
@@ -533,6 +559,7 @@ to the kernel.
 .Xr splash 4 ,
 .Xr ukbd 4 ,
 .Xr vga 4 ,
+.Xr vt 4 ,
 .Xr kbdmap 5 ,
 .Xr rc.conf 5 ,
 .Xr ttys 5 ,
@@ -550,9 +577,9 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An S\(/oren Schmidt Aq sos@FreeBSD.org .
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org .
 This manual page was written by
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
 .Sh CAVEATS
 The amount of data that is possible to insert from the cut buffer is limited
 by the
diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4
index a02ffaa7d133..e0329509f853 100644
--- a/share/man/man4/sysmouse.4
+++ b/share/man/man4/sysmouse.4
@@ -441,7 +441,6 @@ The
 field
 holds the click count: the number of times the user has clicked the button
 successively.
-.Pp
 .El
 .El
 .Sh FILES
@@ -468,6 +467,6 @@ driver first appeared in
 .An -nosplit
 This
 manual page was written by
-.An John-Mark Gurney Aq jmg@FreeBSD.org
+.An John-Mark Gurney Aq Mt jmg@FreeBSD.org
 and
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
diff --git a/share/man/man4/targ.4 b/share/man/man4/targ.4
index 6c61735ff370..45d5e59990b0 100644
--- a/share/man/man4/targ.4
+++ b/share/man/man4/targ.4
@@ -139,7 +139,7 @@ It was rewritten
 for
 .Fx 5.0
 by
-.An Nate Lawson Aq nate@root.org .
+.An Nate Lawson Aq Mt nate@root.org .
 .Sh BUGS
 Currently, only the
 .Xr ahc 4
diff --git a/share/man/man4/tdfx.4 b/share/man/man4/tdfx.4
index b785c75ad86e..2a09a71cf6ce 100644
--- a/share/man/man4/tdfx.4
+++ b/share/man/man4/tdfx.4
@@ -80,14 +80,14 @@ and was originally developed for Linux kernel 2.0.x, later written for
 .Sh AUTHORS
 .An -nosplit
 The driver was developed by
-.An Coleman Kane Aq cokane@micro.ti.com
+.An Coleman Kane Aq Mt cokane@micro.ti.com
 after the linux version of this driver by
 .An Darryll Straus ,
 .An John Taylor ,
 .An Jens Axboe ,
-.An Carlo Wood Aq carlo@alinoe.com
+.An Carlo Wood Aq Mt carlo@alinoe.com
 and
-.An Joseph Kain Aq joseph@3dfx.com
+.An Joseph Kain Aq Mt joseph@3dfx.com
 to be directly compatible with it and support the many GLIDE based games
 available for Linux and
 .Ux .
diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4
index f41545919079..a589ec048ebf 100644
--- a/share/man/man4/ti.4
+++ b/share/man/man4/ti.4
@@ -416,10 +416,10 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@bsdi.com .
+.An Bill Paul Aq Mt wpaul@bsdi.com .
 The header splitting firmware modifications, character
 .Xr ioctl 2
 interface and debugging support were written by
-.An Kenneth Merry Aq ken@FreeBSD.org .
+.An Kenneth Merry Aq Mt ken@FreeBSD.org .
 Initial zero copy support was written by
-.An Andrew Gallatin Aq gallatin@FreeBSD.org .
+.An Andrew Gallatin Aq Mt gallatin@FreeBSD.org .
diff --git a/share/man/man4/tl.4 b/share/man/man4/tl.4
index 0716ce08029f..d971dcd6c1d9 100644
--- a/share/man/man4/tl.4
+++ b/share/man/man4/tl.4
@@ -182,4 +182,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
diff --git a/share/man/man4/trm.4 b/share/man/man4/trm.4
index 6180c9423d38..6d88720ccd09 100644
--- a/share/man/man4/trm.4
+++ b/share/man/man4/trm.4
@@ -104,4 +104,4 @@ of Tekram Technology,
 and ported to
 .Fx 5.0
 by
-.An Olivier Houchard Aq cognet@FreeBSD.org .
+.An Olivier Houchard Aq Mt cognet@FreeBSD.org .
diff --git a/share/man/man4/tty.4 b/share/man/man4/tty.4
index 70e5da2fc85b..ec6d9f155aca 100644
--- a/share/man/man4/tty.4
+++ b/share/man/man4/tty.4
@@ -127,7 +127,6 @@ Before
 .Fx 8.0 ,
 it would change to the new line discipline pointed to by
 .Fa ldisc .
-.Pp
 .It Dv TIOCGETD Fa int *ldisc
 Return the current line discipline in the integer pointed to by
 .Fa ldisc .
diff --git a/share/man/man4/twa.4 b/share/man/man4/twa.4
index 32cccfc37e9d..dbafe91885cc 100644
--- a/share/man/man4/twa.4
+++ b/share/man/man4/twa.4
@@ -132,4 +132,4 @@ messages, the quantity of which varies depending on the value assigned to
 The
 .Nm
 driver and manpage were written by
-.An Vinod Kashyap Aq vkashyap@FreeBSD.org .
+.An Vinod Kashyap Aq Mt vkashyap@FreeBSD.org .
diff --git a/share/man/man4/twe.4 b/share/man/man4/twe.4
index fc73a012cb4e..9f2eadfb2662 100644
--- a/share/man/man4/twe.4
+++ b/share/man/man4/twe.4
@@ -258,15 +258,12 @@ and outstanding commands were restarted.
 The
 .Nm
 driver and manual page were written by
-.An Michael Smith
-.Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Pp
 Extensive work done on the driver by
-.An Vinod Kashyap
-.Aq vkashyap@FreeBSD.org
+.An Vinod Kashyap Aq Mt vkashyap@FreeBSD.org
 and
-.An Paul Saab
-.Aq ps@FreeBSD.org .
+.An Paul Saab Aq Mt ps@FreeBSD.org .
 .Sh BUGS
 The controller cannot handle I/O transfers
 that are not aligned to a 512-byte boundary.
diff --git a/share/man/man4/tws.4 b/share/man/man4/tws.4
index 3f2ab6608f82..40e49bd88121 100644
--- a/share/man/man4/tws.4
+++ b/share/man/man4/tws.4
@@ -114,5 +114,5 @@ The
 driver was written by
 .An Manjunath Ranganathaiah
 for LSI and this manual page was written by
-.An Xin LI Aq delphij@FreeBSD.org
+.An Xin LI Aq Mt delphij@FreeBSD.org
 for iXsystems, Inc.
diff --git a/share/man/man4/u3g.4 b/share/man/man4/u3g.4
index d83f1575a316..0663a9af30aa 100644
--- a/share/man/man4/u3g.4
+++ b/share/man/man4/u3g.4
@@ -111,15 +111,16 @@ driver appeared in
 is based on the
 .Xr uark 4
 driver, and written by
-.An Andrea Guzzo Aq aguzzo@anywi.com
+.An Andrea Guzzo Aq Mt aguzzo@anywi.com
 in September 2008.
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 driver was written by
-.An Andrea Guzzo Aq aguzzo@anywi.com
+.An Andrea Guzzo Aq Mt aguzzo@anywi.com
 and
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt 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
diff --git a/share/man/man4/uark.4 b/share/man/man4/uark.4
index a4e2e5664f50..b130ff165484 100644
--- a/share/man/man4/uark.4
+++ b/share/man/man4/uark.4
@@ -75,8 +75,7 @@ release to include it was
 The
 .Nm
 driver was written by
-.An Jonathan Gray
-.Aq jsg@openbsd.org .
+.An Jonathan Gray Aq Mt jsg@openbsd.org .
 .Sh CAVEATS
 Setting hardware flow control is not currently supported.
 It is not yet known how to ask the hardware to send a break.
diff --git a/share/man/man4/uart.4 b/share/man/man4/uart.4
index 644c37dfb55e..748d6cb7a7d6 100644
--- a/share/man/man4/uart.4
+++ b/share/man/man4/uart.4
@@ -178,4 +178,4 @@ device driver first appeared in
 The
 .Nm
 device driver and this manual page were written by
-.An Marcel Moolenaar Aq marcel@xcllnt.net .
+.An Marcel Moolenaar Aq Mt marcel@xcllnt.net .
diff --git a/share/man/man4/uath.4 b/share/man/man4/uath.4
index e93094e4148d..07cdc280db13 100644
--- a/share/man/man4/uath.4
+++ b/share/man/man4/uath.4
@@ -175,11 +175,11 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Weongyo Jeong Aq weongyo@FreeBSD.org
+.An Weongyo Jeong Aq Mt weongyo@FreeBSD.org
 and
-.An Sam Leffler Aq sam@FreeBSD.org .
+.An Sam Leffler Aq Mt sam@FreeBSD.org .
 It is distantly related to a driver written by
-.An Damien Bergamini Aq damien@openbsd.org .
+.An Damien Bergamini Aq Mt damien@openbsd.org .
 .Sh CAVEATS
 Atheros proprietary 108 Mbps mode (aka Super AG mode) is not supported.
 .Pp
diff --git a/share/man/man4/ubsa.4 b/share/man/man4/ubsa.4
index df9002cb9c4a..12a18f007504 100644
--- a/share/man/man4/ubsa.4
+++ b/share/man/man4/ubsa.4
@@ -96,14 +96,14 @@ The
 manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002 and modified for the
 .Nm
 driver by
-.An Alexander Kabaev Aq kan@FreeBSD.org
+.An Alexander Kabaev Aq Mt kan@FreeBSD.org
 in October 2002.
 .Sh AUTHORS
 The
 .Nm
 driver was written by
-.An Alexander Kabaev Aq kan@FreeBSD.org .
+.An Alexander Kabaev Aq Mt kan@FreeBSD.org .
diff --git a/share/man/man4/ubtbcmfw.4 b/share/man/man4/ubtbcmfw.4
index 8451c6f7a489..0337124e2387 100644
--- a/share/man/man4/ubtbcmfw.4
+++ b/share/man/man4/ubtbcmfw.4
@@ -102,7 +102,7 @@ The
 driver was implemented in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Most likely.
 Please report if found.
diff --git a/share/man/man4/ucom.4 b/share/man/man4/ucom.4
index 8898872fab8c..9be029424322 100644
--- a/share/man/man4/ucom.4
+++ b/share/man/man4/ucom.4
@@ -94,7 +94,7 @@ in March of 2002.
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002.
 .Sh BUGS
 Prior to
diff --git a/share/man/man4/ucycom.4 b/share/man/man4/ucycom.4
index 063d419ccf60..8ec0a4812c24 100644
--- a/share/man/man4/ucycom.4
+++ b/share/man/man4/ucycom.4
@@ -84,4 +84,4 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/share/man/man4/udav.4 b/share/man/man4/udav.4
index 4d90236d9121..5f6c80c55906 100644
--- a/share/man/man4/udav.4
+++ b/share/man/man4/udav.4
@@ -98,4 +98,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Shingo WATANABE Aq nabe@nabechan.org .
+.An Shingo WATANABE Aq Mt nabe@nabechan.org .
diff --git a/share/man/man4/udbp.4 b/share/man/man4/udbp.4
index 45afd790ae49..b455901043ac 100644
--- a/share/man/man4/udbp.4
+++ b/share/man/man4/udbp.4
@@ -115,10 +115,10 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Doug Ambrisko Aq ambrisko@whistle.com ,
-.An Julian Elischer Aq julian@FreeBSD.org
+.An Doug Ambrisko Aq Mt ambrisko@whistle.com ,
+.An Julian Elischer Aq Mt julian@FreeBSD.org
 and
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org .
diff --git a/share/man/man4/uep.4 b/share/man/man4/uep.4
index 74b65f37b233..231abb7deb40 100644
--- a/share/man/man4/uep.4
+++ b/share/man/man4/uep.4
@@ -71,7 +71,7 @@ creates a blocking pseudo\-device file,
 The
 .Nm
 driver was written by
-.An Gleb Smirnoff Aq glebius@FreeBSD.org
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org .
 .Sh BUGS
 .Nm
 can't act like
diff --git a/share/man/man4/ufm.4 b/share/man/man4/ufm.4
index 7ae11bd6112c..a06d45cfd355 100644
--- a/share/man/man4/ufm.4
+++ b/share/man/man4/ufm.4
@@ -80,6 +80,6 @@ blocking device node
 The
 .Nm
 driver was written by
-.An M. Warner Losh Aq imp@FreeBSD.org
+.An M. Warner Losh Aq Mt imp@FreeBSD.org
 for
 .Fx .
diff --git a/share/man/man4/uhci.4 b/share/man/man4/uhci.4
index 6c8b65937c44..9fcd4d484280 100644
--- a/share/man/man4/uhci.4
+++ b/share/man/man4/uhci.4
@@ -62,7 +62,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Lennart Augustsson Aq augustss@carlstedt.se
+.An Lennart Augustsson Aq Mt augustss@carlstedt.se
 for the
 .Nx
 project.
diff --git a/share/man/man4/uhid.4 b/share/man/man4/uhid.4
index b6274ba83e93..fc90fff40350 100644
--- a/share/man/man4/uhid.4
+++ b/share/man/man4/uhid.4
@@ -143,5 +143,5 @@ appeared in
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002.
diff --git a/share/man/man4/uhso.4 b/share/man/man4/uhso.4
index cc2e9ae0537e..37f7dc352a67 100644
--- a/share/man/man4/uhso.4
+++ b/share/man/man4/uhso.4
@@ -139,4 +139,4 @@ AT_OWANCALL=1,0,1
 The
 .Nm
 driver was written by
-.An Fredrik Lindberg Aq fli@shapeshifter.se .
+.An Fredrik Lindberg Aq Mt fli@shapeshifter.se .
diff --git a/share/man/man4/ukbd.4 b/share/man/man4/ukbd.4
index 71ee348e0717..3a3125d74ed5 100644
--- a/share/man/man4/ukbd.4
+++ b/share/man/man4/ukbd.4
@@ -157,15 +157,15 @@ driver to the kernel.
 The
 .Nm
 driver was written by
-.An Lennart Augustsson Aq augustss@cs.chalmers.se
+.An Lennart Augustsson Aq Mt augustss@cs.chalmers.se
 for
 .Nx
 and was substantially rewritten for
 .Fx
 by
-.An Kazutaka YOKOTA Aq yokota@zodiac.mech.utsunomiya-u.ac.jp .
+.An Kazutaka YOKOTA Aq Mt yokota@zodiac.mech.utsunomiya-u.ac.jp .
 .Pp
 This manual page was written by
-.An Nick Hibma Aq n_hibma@FreeBSD.org
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org
 with a large amount of input from
-.An Kazutaka YOKOTA Aq yokota@zodiac.mech.utsunomiya-u.ac.jp .
+.An Kazutaka YOKOTA Aq Mt yokota@zodiac.mech.utsunomiya-u.ac.jp .
diff --git a/share/man/man4/ulpt.4 b/share/man/man4/ulpt.4
index cd3b300fe897..894211bf6ff7 100644
--- a/share/man/man4/ulpt.4
+++ b/share/man/man4/ulpt.4
@@ -106,5 +106,5 @@ appeared in
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002.
diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4
index e57849e200ee..b4c08d721707 100644
--- a/share/man/man4/umass.4
+++ b/share/man/man4/umass.4
@@ -254,9 +254,9 @@ when using
 The
 .Nm
 driver was written by
-.An MAEKAWA Masahide Aq bishop@rr.iij4u.or.jp
+.An MAEKAWA Masahide Aq Mt bishop@rr.iij4u.or.jp
 and
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org .
diff --git a/share/man/man4/umcs.4 b/share/man/man4/umcs.4
index fc96ad2ad91a..f94e359aadb8 100644
--- a/share/man/man4/umcs.4
+++ b/share/man/man4/umcs.4
@@ -94,8 +94,7 @@ appeared in ports since December of 2010.
 The
 .Nm
 driver was written by
-.An Lev Serebryakov
-.Aq lev@FreeBSD.org .
+.An Lev Serebryakov Aq Mt lev@FreeBSD.org .
 .Sh BUGS
 This driver doesn't support access to any fine tunes of
 chip, like RS522/RS485 mode, non-standard baudrates, etc.
diff --git a/share/man/man4/umct.4 b/share/man/man4/umct.4
index e40e146b2c31..00e4e09e20cd 100644
--- a/share/man/man4/umct.4
+++ b/share/man/man4/umct.4
@@ -91,11 +91,11 @@ appeared in
 It is loosely based on the
 .Xr ubsa 4
 driver by
-.An Alexander Kabaev Aq kan@FreeBSD.org
+.An Alexander Kabaev Aq Mt kan@FreeBSD.org
 with documentation from
-.An Wolfgang Grandeggar Aq wolfgang@cec.ch .
+.An Wolfgang Grandeggar Aq Mt wolfgang@cec.ch .
 .Sh AUTHORS
 The
 .Nm
 driver was written by
-.An Scott Long Aq scottl@FreeBSD.org .
+.An Scott Long Aq Mt scottl@FreeBSD.org .
diff --git a/share/man/man4/umodem.4 b/share/man/man4/umodem.4
index 71827dbc9600..480b453f5328 100644
--- a/share/man/man4/umodem.4
+++ b/share/man/man4/umodem.4
@@ -108,7 +108,7 @@ appeared in
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002.
 .Sh BUGS
 Only modems with multiplexed commands and data are supported
diff --git a/share/man/man4/ums.4 b/share/man/man4/ums.4
index 6c052a1858cb..83aeeda7ad61 100644
--- a/share/man/man4/ums.4
+++ b/share/man/man4/ums.4
@@ -99,15 +99,15 @@ as in X change it to:
 The
 .Nm
 driver was written by
-.An Lennart Augustsson Aq augustss@cs.chalmers.se
+.An Lennart Augustsson Aq Mt augustss@cs.chalmers.se
 for
 .Nx
 and was adopted for
 .Fx
 by
-.An MAEKAWA Masahide Aq bishop@rr.iij4u.or.jp .
+.An MAEKAWA Masahide Aq Mt bishop@rr.iij4u.or.jp .
 .Pp
 This manual page was written by
-.An Nick Hibma Aq n_hibma@FreeBSD.org
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org
 with input from
-.An Kazutaka YOKOTA Aq yokota@zodiac.mech.utsunomiya-u.ac.jp .
+.An Kazutaka YOKOTA Aq Mt yokota@zodiac.mech.utsunomiya-u.ac.jp .
diff --git a/share/man/man4/upgt.4 b/share/man/man4/upgt.4
index 7b8143888abb..c7d3ee52ad3a 100644
--- a/share/man/man4/upgt.4
+++ b/share/man/man4/upgt.4
@@ -209,7 +209,7 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An Marcus Glocker Aq mglocker@openbsd.org .
+.An Marcus Glocker Aq Mt mglocker@openbsd.org .
 .Pp
 The hardware specification was reverse engineered by the people at
 .Pa http://www.prism54.org .
diff --git a/share/man/man4/uplcom.4 b/share/man/man4/uplcom.4
index 7c2bce07754b..6ed2038da1f5 100644
--- a/share/man/man4/uplcom.4
+++ b/share/man/man4/uplcom.4
@@ -193,5 +193,5 @@ appeared in
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002.
diff --git a/share/man/man4/ural.4 b/share/man/man4/ural.4
index 4ae6c18ebcf7..1563fde20969 100644
--- a/share/man/man4/ural.4
+++ b/share/man/man4/ural.4
@@ -158,7 +158,7 @@ driver first appeared in
 The original
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien.bergamini@free.fr
+.An Damien Bergamini Aq Mt damien.bergamini@free.fr .
 .Sh BUGS
 Host AP mode doesn't support client power save.
 Clients using power save mode will experience
diff --git a/share/man/man4/urio.4 b/share/man/man4/urio.4
index 68a4964cab3c..30048c14f16a 100644
--- a/share/man/man4/urio.4
+++ b/share/man/man4/urio.4
@@ -122,9 +122,9 @@ CFLAGS="-I/usr/include/dev/usb" ./configure \\
 The
 .Nm
 driver was written by
-.An Iwasa Kazmi Aq kzmi@ca2.so-net.ne.jp
+.An Iwasa Kazmi Aq Mt kzmi@ca2.so-net.ne.jp
 for
 .Fx .
 .Pp
 This manual page was written by
-.An Dirk-Willem van Gulik Aq dirkx@webweaving.org .
+.An Dirk-Willem van Gulik Aq Mt dirkx@webweaving.org .
diff --git a/share/man/man4/urtw.4 b/share/man/man4/urtw.4
index 58f291ffcd45..a67235eb5f3b 100644
--- a/share/man/man4/urtw.4
+++ b/share/man/man4/urtw.4
@@ -122,5 +122,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Weongyo Jeong
-.Aq weongyo@FreeBSD.org .
+.An Weongyo Jeong Aq Mt weongyo@FreeBSD.org .
diff --git a/share/man/man4/urtwn.4 b/share/man/man4/urtwn.4
index da1db76cb415..223dbbc2d597 100644
--- a/share/man/man4/urtwn.4
+++ b/share/man/man4/urtwn.4
@@ -150,7 +150,7 @@ and
 The
 .Nm
 driver was written by
-.An Damien Bergamini Aq damien@openbsd.org .
+.An Damien Bergamini Aq Mt damien@openbsd.org .
 .Sh CAVEATS
 The
 .Nm
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index f64d8b8c8108..4db0d73a8a43 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -175,8 +175,11 @@ module complies with the USB 2.0 standard.
 .Sh HISTORY
 The
 .Nm
-module has been inspired by the NetBSD USB stack initially written by
-Lennart Augustsson. The
+module has been inspired by the
+.Nx
+USB stack initially written by
+.An Lennart Augustsson .
+The
 .Nm
 module was written by
-.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
+.An Hans Petter Selasky Aq Mt hselasky@FreeBSD.org .
diff --git a/share/man/man4/usb_quirk.4 b/share/man/man4/usb_quirk.4
index eb45eaa6e08a..9352e7660b4f 100644
--- a/share/man/man4/usb_quirk.4
+++ b/share/man/man4/usb_quirk.4
@@ -191,6 +191,6 @@ The
 module appeared in
 .Fx 8.0 ,
 and was written by
-.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
+.An Hans Petter Selasky Aq Mt hselasky@FreeBSD.org .
 This manual page was written by
-.An Nick Hibma Aq n_hibma@FreeBSD.org .
+.An Nick Hibma Aq Mt n_hibma@FreeBSD.org .
diff --git a/share/man/man4/usb_template.4 b/share/man/man4/usb_template.4
index 331ece97a3de..e4dba2cf74af 100644
--- a/share/man/man4/usb_template.4
+++ b/share/man/man4/usb_template.4
@@ -80,4 +80,4 @@ module complies to the USB 1.0, 2.0 and 3.0 standard.
 The
 .Nm
 module was written by
-.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
+.An Hans Petter Selasky Aq Mt hselasky@FreeBSD.org .
diff --git a/share/man/man4/uslcom.4 b/share/man/man4/uslcom.4
index d043cb2f20f1..01eb93dc4bb9 100644
--- a/share/man/man4/uslcom.4
+++ b/share/man/man4/uslcom.4
@@ -209,4 +209,4 @@ release to include it was
 The
 .Nm
 driver was written by
-.An Jonathan Gray Aq jsg@openbsd.org .
+.An Jonathan Gray Aq Mt jsg@openbsd.org .
diff --git a/share/man/man4/utopia.4 b/share/man/man4/utopia.4
index 00020ea76ac6..b3c0e5b9c2f0 100644
--- a/share/man/man4/utopia.4
+++ b/share/man/man4/utopia.4
@@ -193,4 +193,4 @@ may be needed for interworking with public networks.
 .Xr patm 4 ,
 .Xr utopia 9
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/uvisor.4 b/share/man/man4/uvisor.4
index 2397e4522f2e..254e9b5b2d9d 100644
--- a/share/man/man4/uvisor.4
+++ b/share/man/man4/uvisor.4
@@ -131,7 +131,7 @@ in August 2002.
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 at that time.
 .Sh BUGS
 The code to provide multiple
diff --git a/share/man/man4/uvscom.4 b/share/man/man4/uvscom.4
index be40518c20ee..fb8ada7aa26d 100644
--- a/share/man/man4/uvscom.4
+++ b/share/man/man4/uvscom.4
@@ -91,5 +91,5 @@ and later in
 This manual page was adopted from
 .Nx
 by
-.An Tom Rhodes Aq trhodes@FreeBSD.org
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org
 in April 2002.
diff --git a/share/man/man4/vale.4 b/share/man/man4/vale.4
index a52b137b2766..4eeab1ae1cc2 100644
--- a/share/man/man4/vale.4
+++ b/share/man/man4/vale.4
@@ -90,7 +90,6 @@ The maximum number of packets processed internally
 in each iteration.
 Defaults to 1024, use lower values to trade latency
 with throughput.
-.Pp
 .It dev.netmap.verbose
 Set to non-zero values to enable in-kernel diagnostics.
 .El
diff --git a/share/man/man4/vga.4 b/share/man/man4/vga.4
index b102d2f6f5d8..cf4179b72bfa 100644
--- a/share/man/man4/vga.4
+++ b/share/man/man4/vga.4
@@ -178,8 +178,8 @@ driver first appeared in
 The
 .Nm
 driver was written by
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
 and
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
 This manual page was written by
 .An Kazutaka Yokota .
diff --git a/share/man/man4/vge.4 b/share/man/man4/vge.4
index f8fd8f774996..7363b95a46ea 100644
--- a/share/man/man4/vge.4
+++ b/share/man/man4/vge.4
@@ -222,4 +222,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/share/man/man4/viapm.4 b/share/man/man4/viapm.4
index 851c1fc79229..a155e91f8230 100644
--- a/share/man/man4/viapm.4
+++ b/share/man/man4/viapm.4
@@ -67,6 +67,6 @@ manual page first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Nicolas Souchu Aq nsouch@FreeBSD.org .
+.An Nicolas Souchu Aq Mt nsouch@FreeBSD.org .
 .Sh BUGS
 Only polling mode is supported.
diff --git a/share/man/man4/viawd.4 b/share/man/man4/viawd.4
index 47473cf395e2..e579bf0887af 100644
--- a/share/man/man4/viawd.4
+++ b/share/man/man4/viawd.4
@@ -76,4 +76,4 @@ driver first appeared in
 The
 .Nm
 driver and this manual page were written by
-.An Fabien Thomas Aq fabient@FreeBSD.org .
+.An Fabien Thomas Aq Mt fabient@FreeBSD.org .
diff --git a/share/man/man4/virtio.4 b/share/man/man4/virtio.4
index 10ebf209bb12..8a0cbc6eb5d9 100644
--- a/share/man/man4/virtio.4
+++ b/share/man/man4/virtio.4
@@ -94,4 +94,4 @@ Support for VirtIO first appeared in
 .An -nosplit
 .Fx
 support for VirtIO was first added by
-.An Bryan Venteicher Aq bryanv@FreeBSD.org .
+.An Bryan Venteicher Aq Mt bryanv@FreeBSD.org .
diff --git a/share/man/man4/virtio_balloon.4 b/share/man/man4/virtio_balloon.4
index 450b5cdfce94..b7ce0ed13cbb 100644
--- a/share/man/man4/virtio_balloon.4
+++ b/share/man/man4/virtio_balloon.4
@@ -59,6 +59,6 @@ The hypervisor can later signal the balloon to return the memory.
 The
 .Nm
 driver was written by
-.An Bryan Venteicher Aq bryanv@FreeBSD.org .
+.An Bryan Venteicher Aq Mt bryanv@FreeBSD.org .
 It first appeared in
 .Fx 9.0 .
diff --git a/share/man/man4/virtio_blk.4 b/share/man/man4/virtio_blk.4
index eb5fded32d3a..579fb4a9745e 100644
--- a/share/man/man4/virtio_blk.4
+++ b/share/man/man4/virtio_blk.4
@@ -87,6 +87,6 @@ be toggled between writethrough and writeback.
 The
 .Nm
 driver was written by
-.An Bryan Venteicher Aq bryanv@FreeBSD.org .
+.An Bryan Venteicher Aq Mt bryanv@FreeBSD.org .
 It first appeared in
 .Fx 9.0 .
diff --git a/share/man/man4/virtio_random.4 b/share/man/man4/virtio_random.4
index a20e868d7441..5ce7d17ffb08 100644
--- a/share/man/man4/virtio_random.4
+++ b/share/man/man4/virtio_random.4
@@ -58,4 +58,4 @@ hypervisor to the guest.
 The
 .Nm
 driver was written by
-.An Bryan Venteicher Aq bryanv@FreeBSD.org .
+.An Bryan Venteicher Aq Mt bryanv@FreeBSD.org .
diff --git a/share/man/man4/virtio_scsi.4 b/share/man/man4/virtio_scsi.4
index b136de6ba97c..f65f8b7b3f59 100644
--- a/share/man/man4/virtio_scsi.4
+++ b/share/man/man4/virtio_scsi.4
@@ -87,6 +87,6 @@ Enable tracing prints.
 The
 .Nm
 driver was written by
-.An Bryan Venteicher Aq bryanv@FreeBSD.org .
+.An Bryan Venteicher Aq Mt bryanv@FreeBSD.org .
 It first appeared in
 .Fx 10.0 .
diff --git a/share/man/man4/vkbd.4 b/share/man/man4/vkbd.4
index debdd3eea528..78110a6107bc 100644
--- a/share/man/man4/vkbd.4
+++ b/share/man/man4/vkbd.4
@@ -136,7 +136,7 @@ The
 module was implemented in
 .Fx 6.0 .
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh CAVEATS
 The
 .Nm
diff --git a/share/man/man4/vmx.4 b/share/man/man4/vmx.4
index 0598aa898a8d..974c3f840a90 100644
--- a/share/man/man4/vmx.4
+++ b/share/man/man4/vmx.4
@@ -148,7 +148,7 @@ The
 driver was ported from
 .Ox
 and significantly rewritten by
-.An Bryan Venteicher Aq bryanv@freebsd.org .
+.An Bryan Venteicher Aq Mt bryanv@freebsd.org .
 The
 .Ox
 driver was written by
diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4
index 1390cc998de6..da4ee5bcbc1c 100644
--- a/share/man/man4/vr.4
+++ b/share/man/man4/vr.4
@@ -203,7 +203,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4
index 10be5906da53..013974a41c08 100644
--- a/share/man/man4/vt.4
+++ b/share/man/man4/vt.4
@@ -24,25 +24,28 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 9, 2014
+.Dd July 2, 2014
 .Dt "VIRTUAL TERMINALS" 4
 .Os
 .Sh NAME
 .Nm vt
 .Nd virtual terminal console driver
 .Sh SYNOPSIS
+.Cd "options TERMINAL_KERN_ATTR=_attribute_"
+.Cd "options TERMINAL_NORM_ATTR=_attribute_"
 .Cd "options VT_MAXWINDOWS=N"
 .Cd "options VT_ALT_TO_ESC_HACK=1"
 .Cd "options VT_TWOBUTTON_MOUSE"
 .Cd "options VT_FB_DEFAULT_WIDTH=X"
 .Cd "options VT_FB_DEFAULT_HEIGHT=Y"
 .Cd "options SC_NO_CUTPASTE"
-.Cd "options SC_NO_SYSMOUSE"
 .Cd "device vt"
 .Pp
 In
 .Xr loader.conf 5 :
 .Cd hw.vga.textmode=1
+.Cd kern.vty=vt
+.Cd kern.vt.spclkeys=15
 .Sh DESCRIPTION
 The
 .Nm
@@ -107,6 +110,15 @@ These kernel options control the
 .Nm
 driver.
 .Bl -tag -width MAXCONS
+.It Dv TERMINAL_NORM_ATTR= Ns Pa attribute
+.It Dv TERMINAL_KERN_ATTR= Ns Pa attribute
+These options allow changing the default colors used for normal and kernel
+text.
+Available colors are defined in
+.In sys/terminal.h .
+See
+.Sx EXAMPLES
+below.
 .It Dv VT_MAXWINDOWS=N
 Set the number of virtual terminals to be created to
 .Fa N .
@@ -136,10 +148,11 @@ These options will be removed in a future
 version.
 .Bl -column -offset indent ".Sy vt VT_TWOBUTTON_MOUSE" ".Sy SC_TWOBUTTON_MOUSE"
 .It Sy vt Option Name Ta Sy sc Option Name
+.It Dv TERMINAL_KERN_ATTR Ta Dv SC_KERNEL_CONS_ATTR
+.It Dv TERMINAL_NORM_ATTR Ta Dv SC_NORM_ATTR
 .It Dv VT_TWOBUTTON_MOUSE Ta Dv SC_TWOBUTTON_MOUSE
 .It Dv VT_MAXWINDOWS Ta Dv MAXCONS
 .It none Ta Dv SC_NO_CUTPASTE
-.It none Ta Dv SC_NO_SYSMOUSE
 .El
 .Sh START-UP OPERATION WITH X86 BIOS SYSTEMS
 The computer BIOS starts in text mode, and
@@ -153,13 +166,13 @@ is set, the system remains in text mode.
 Otherwise,
 .Nm
 switches to 640x480x16 VGA mode using
-.Fn vt_vga .
+.Cm vt_vga .
 If a KMS
 .Pq Kernel Mode Switching
 video driver is available, the display is switched to high resolution
 and the KMS driver takes over.
 When a KMS driver is not available,
-.Fn vt_vga
+.Cm vt_vga
 remains active.
 .Sh LOADER TUNABLES
 These settings can be entered at the
@@ -171,6 +184,31 @@ prompt or in
 Set to 1 to use virtual terminals in text mode instead of graphics mode.
 Features that require graphics mode, like loadable fonts, will be
 disabled.
+.It Va kern.vty
+When both
+.Nm
+and
+.Xr sc 4 have been compiled into the kernel, the one to use for the
+system console can be selected by setting this value to
+.Ql vt
+or
+.Ql sc .
+If this value is not set,
+.Xr sc 4
+is used.
+.It Va kern.vt.spclkeys
+bitmap of allowed special keys. 1 is enabled, 0 is disabled. Encoded as:
+.Bl -tag -compact -width 0x000000
+.It 0x0001
+Debug request key combination. (Ctrl+Alt+Esc)
+.It 0x0002
+Reboot. (Ctrl+Alt+Del)
+.It 0x0004
+Halt.
+.It 0x0008
+Power down.
+.El
+Default is 15, all enabled.
 .El
 .Sh FILES
 .Bl -tag -width /usr/share/syscons/keymaps/* -compact
@@ -181,6 +219,19 @@ virtual terminals
 .It Pa /etc/ttys
 terminal initialization information
 .El
+.Sh EXAMPLES
+This example changes the default color of normal text to green on a
+black background, or black on a green background when reversed.
+Note that white space cannot be used inside the attribute string
+because of the current implementation of
+.Xr config 8 .
+.Pp
+.Dl "options TERMINAL_NORM_ATTR=(FG_GREEN|BG_BLACK)"
+.Pp
+This line changes the default color of kernel messages to be bright red
+on a black background, or black on a bright red background when reversed.
+.Pp
+.Dl "options TERMINAL_KERN_ATTR=(FG_LIGHTRED|BG_BLACK)"
 .Sh SEE ALSO
 .Xr kbdcontrol 1 ,
 .Xr login 1 ,
@@ -201,26 +252,25 @@ terminal initialization information
 .Xr kbdmux 8 ,
 .Xr kldload 8 ,
 .Xr moused 8
-.\" WB: to be uncommented when an actual release contains vt(4)
-.\" .Sh HISTORY
-.\" The
-.\" Nm
-.\" driver first appeared in
-.\" .Fx 9.3 .
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Fx 9.3 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Nm
 device driver was developed by
-.An Ed Schouten Aq ed@FreeBSD.org ,
-.An Ed Maste Aq emaste@FreeBSD.org ,
+.An Ed Schouten Aq Mt ed@FreeBSD.org ,
+.An Ed Maste Aq Mt emaste@FreeBSD.org ,
 and
-.An Aleksandr Rybalko Aq ray@FreeBSD.org ,
+.An Aleksandr Rybalko Aq Mt ray@FreeBSD.org ,
 with sponsorship provided by the
 .Fx
 Foundation.
 This manual page was written by
-.An Warren Block <wblock@FreeBSD.org>.
+.An Warren Block Aq Mt wblock@FreeBSD.org .
 .Sh CAVEATS
 Paste buffer size is limited by the system value
 .Brq Dv MAX_INPUT ,
diff --git a/share/man/man4/vte.4 b/share/man/man4/vte.4
index 18b39d0b9481..23080a0e2789 100644
--- a/share/man/man4/vte.4
+++ b/share/man/man4/vte.4
@@ -146,7 +146,6 @@ Show hardware MAC statistics maintained in driver.
 The
 .Nm
 driver was written by
-.An Pyun YongHyeon
-.Aq yongari@FreeBSD.org .
+.An Pyun YongHyeon Aq Mt yongari@FreeBSD.org .
 It first appeared in
 .Fx 8.3 .
diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4
index d3d7bc81d5cd..8825049ad6a7 100644
--- a/share/man/man4/vtnet.4
+++ b/share/man/man4/vtnet.4
@@ -105,7 +105,7 @@ The default value is 0.
 The
 .Nm
 driver was written by
-.An Bryan Venteicher Aq bryanv@FreeBSD.org .
+.An Bryan Venteicher Aq Mt bryanv@FreeBSD.org .
 It first appeared in
 .Fx 9.0 .
 .Sh CAVEATS
diff --git a/share/man/man4/vxge.4 b/share/man/man4/vxge.4
index fdca8e2b65f8..b21c3501f801 100644
--- a/share/man/man4/vxge.4
+++ b/share/man/man4/vxge.4
@@ -98,7 +98,7 @@ For troubleshooting tips and FAQs, please visit
 .Pa http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous .
 .Pp
 For any issues please send an email to
-.Aq support@neterion.com .
+.Aq Mt support@neterion.com .
 .Sh SEE ALSO
 .Xr arp 8 ,
 .Xr ifconfig 8
@@ -106,5 +106,4 @@ For any issues please send an email to
 The
 .Nm
 driver was written by
-.An Neterion
-.Aq support@neterion.com .
+.An Neterion Aq Mt support@neterion.com .
diff --git a/share/man/man4/watchdog.4 b/share/man/man4/watchdog.4
index 4d953d6957e2..cb592f58cf5a 100644
--- a/share/man/man4/watchdog.4
+++ b/share/man/man4/watchdog.4
@@ -137,11 +137,11 @@ code first appeared in
 The
 .Nm
 facility was written by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 The software watchdog code and this manual page were written by
-.An Sean Kelly Aq smkelly@FreeBSD.org .
+.An Sean Kelly Aq Mt smkelly@FreeBSD.org .
 Some contributions were made by
-.An Jeff Roberson Aq jeff@FreeBSD.org .
+.An Jeff Roberson Aq Mt jeff@FreeBSD.org .
 .Sh BUGS
 The
 .Dv WD_PASSIVE
diff --git a/share/man/man4/wb.4 b/share/man/man4/wb.4
index 22a670651ac6..b0b4e7842269 100644
--- a/share/man/man4/wb.4
+++ b/share/man/man4/wb.4
@@ -180,7 +180,7 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
 .Sh BUGS
 The Winbond chip seems to behave strangely in some cases when the
 link partner switches modes.
diff --git a/share/man/man4/wbwd.4 b/share/man/man4/wbwd.4
index 49290ff2ef35..058a407bc6f0 100644
--- a/share/man/man4/wbwd.4
+++ b/share/man/man4/wbwd.4
@@ -110,4 +110,4 @@ driver first appeared in
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Bjoern A. Zeeb Aq bz@FreeBSD.org .
+.An Bjoern A. Zeeb Aq Mt bz@FreeBSD.org .
diff --git a/share/man/man4/wi.4 b/share/man/man4/wi.4
index 92dedff7a1d5..0e55e7b21e6f 100644
--- a/share/man/man4/wi.4
+++ b/share/man/man4/wi.4
@@ -330,7 +330,7 @@ device driver first appeared in
 The original
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
 This man page comes from
 .Ox .
 .Sh CAVEATS
diff --git a/share/man/man4/wlan.4 b/share/man/man4/wlan.4
index 76e797cc51c9..16d1f2e47dac 100644
--- a/share/man/man4/wlan.4
+++ b/share/man/man4/wlan.4
@@ -216,4 +216,4 @@ and then rewrote it to support multi-mode devices,
 add the extensible frameworks
 for cryptographic, authentication, and access control plugins.
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4
index f1bc15ed674c..f2d4251e5e12 100644
--- a/share/man/man4/wpi.4
+++ b/share/man/man4/wpi.4
@@ -132,8 +132,8 @@ The original
 driver was written for
 .Ox
 by
-.An Damien Bergamini Aq damien.bergamini@free.fr .
-.An Benjamin Close Aq benjsc@FreeBSD.org
+.An Damien Bergamini Aq Mt damien.bergamini@free.fr .
+.An Benjamin Close Aq Mt benjsc@FreeBSD.org
 ported
 .Nm
 to
diff --git a/share/man/man4/wsp.4 b/share/man/man4/wsp.4
index a74097c7486f..24c9b77efb15 100644
--- a/share/man/man4/wsp.4
+++ b/share/man/man4/wsp.4
@@ -87,4 +87,4 @@ types.
 The
 .Nm
 driver was written by
-.An Huang Wen Hui Aq huanghwh@gmail.com
+.An Huang Wen Hui Aq Mt huanghwh@gmail.com .
diff --git a/share/man/man4/xe.4 b/share/man/man4/xe.4
index 0935884badc9..51240d2cfa05 100644
--- a/share/man/man4/xe.4
+++ b/share/man/man4/xe.4
@@ -154,11 +154,11 @@ driver first appeared in
 The
 .Nm
 device driver was written by
-.An Scott Mitchell Aq rsm@FreeBSD.org .
+.An Scott Mitchell Aq Mt rsm@FreeBSD.org .
 This manual page was written by
-.An Scott Mitchell Aq rsm@FreeBSD.org ,
+.An Scott Mitchell Aq Mt rsm@FreeBSD.org ,
 and
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 .Sh BUGS
 Supported devices will fail to attach on some machines using the
 .Tn NEWCARD
diff --git a/share/man/man4/xen.4 b/share/man/man4/xen.4
index e053fc53580e..83b3d1226854 100644
--- a/share/man/man4/xen.4
+++ b/share/man/man4/xen.4
@@ -159,16 +159,16 @@ first appeared in
 .An -nosplit
 .Fx
 support for Xen was first added by
-.An Kip Macy Aq kmacy@FreeBSD.org
+.An Kip Macy Aq Mt kmacy@FreeBSD.org
 and
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
 Further refinements were made by
-.An Justin Gibbs Aq gibbs@FreeBSD.org ,
-.An Adrian Chadd Aq adrian@FreeBSD.org ,
+.An Justin Gibbs Aq Mt gibbs@FreeBSD.org ,
+.An Adrian Chadd Aq Mt adrian@FreeBSD.org ,
 and
-.An Colin Percival Aq cperciva@FreeBSD.org .
+.An Colin Percival Aq Mt cperciva@FreeBSD.org .
 This manual page was written by
-.An Robert Watson Aq rwatson@FreeBSD.org .
+.An Robert Watson Aq Mt rwatson@FreeBSD.org .
 .Sh BUGS
 .Fx
 is only able to run as a Xen guest (DomU) and not as a Xen host (Dom0).
diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4
index d10d270be019..81cf711a446c 100644
--- a/share/man/man4/xl.4
+++ b/share/man/man4/xl.4
@@ -267,4 +267,4 @@ device driver first appeared in
 The
 .Nm
 driver was written by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
diff --git a/share/man/man4/xnb.4 b/share/man/man4/xnb.4
index d7f4609a7642..a0c1c60ac52d 100644
--- a/share/man/man4/xnb.4
+++ b/share/man/man4/xnb.4
@@ -97,14 +97,13 @@ The
 device driver first appeared in
 .Fx 10.0 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 driver was written by
-.An Alan Somers
-.Aq alans@spectralogic.com
+.An Alan Somers Aq Mt alans@spectralogic.com
 and
-.An John Suykerbuyk
-.Aq johns@spectralogic.com .
+.An John Suykerbuyk Aq Mt johns@spectralogic.com .
 .Sh CAVEATS
 Packets sent through Xennet pass over shared memory, so the protocol includes
 no form of link-layer checksum or CRC.
diff --git a/share/man/man4/xpt.4 b/share/man/man4/xpt.4
index e670acb199c8..c15ca4b55c4c 100644
--- a/share/man/man4/xpt.4
+++ b/share/man/man4/xpt.4
@@ -105,4 +105,4 @@ None.
 The CAM transport layer driver first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.org
+.An Kenneth Merry Aq Mt ken@FreeBSD.org
diff --git a/share/man/man4/zyd.4 b/share/man/man4/zyd.4
index 5a1f0a5a6627..178adfb3a6e1 100644
--- a/share/man/man4/zyd.4
+++ b/share/man/man4/zyd.4
@@ -175,10 +175,10 @@ This should not happen.
 The original
 .Nm
 driver was written by
-.An Florian Stoehr Aq ich@florian-stoehr.de ,
-.An Damien Bergamini Aq damien@openbsd.org ,
+.An Florian Stoehr Aq Mt ich@florian-stoehr.de ,
+.An Damien Bergamini Aq Mt damien@openbsd.org ,
 and
-.An Jonathan Gray Aq jsg@openbsd.org .
+.An Jonathan Gray Aq Mt jsg@openbsd.org .
 .Sh CAVEATS
 The
 .Nm
diff --git a/share/man/man5/bluetooth.device.conf.5 b/share/man/man5/bluetooth.device.conf.5
index d8abb9ec85eb..ea3553b07403 100644
--- a/share/man/man5/bluetooth.device.conf.5
+++ b/share/man/man5/bluetooth.device.conf.5
@@ -183,4 +183,4 @@ second USB Bluetooth device.
 .Xr hcsecd 8 ,
 .Xr l2control 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/share/man/man5/bluetooth.hosts.5 b/share/man/man5/bluetooth.hosts.5
index bda4d920496d..3afa145d055e 100644
--- a/share/man/man5/bluetooth.hosts.5
+++ b/share/man/man5/bluetooth.hosts.5
@@ -60,4 +60,4 @@ delimiter, newline, or comment character.
 .Sh SEE ALSO
 .Xr bluetooth 3
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/share/man/man5/bluetooth.protocols.5 b/share/man/man5/bluetooth.protocols.5
index 64a7dd56367b..2968fa39991c 100644
--- a/share/man/man5/bluetooth.protocols.5
+++ b/share/man/man5/bluetooth.protocols.5
@@ -59,4 +59,4 @@ character other than a field delimiter, newline, or comment character.
 .Sh SEE ALSO
 .Xr bluetooth 3
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/share/man/man5/boot.config.5 b/share/man/man5/boot.config.5
index 681fc3aa765f..f2d7e2db4a7c 100644
--- a/share/man/man5/boot.config.5
+++ b/share/man/man5/boot.config.5
@@ -100,4 +100,4 @@ will do both of the above.
 .Xr loader 8
 .Sh AUTHORS
 This manual page was written by
-.An Daniel Gerzo Aq danger@FreeBSD.org .
+.An Daniel Gerzo Aq Mt danger@FreeBSD.org .
diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5
index 5ee1621fd1aa..073f0a58aed2 100644
--- a/share/man/man5/devfs.5
+++ b/share/man/man5/devfs.5
@@ -145,4 +145,4 @@ manual page first appeared in
 The
 .Nm
 manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.org .
+.An Mike Pritchard Aq Mt mpp@FreeBSD.org .
diff --git a/share/man/man5/devfs.conf.5 b/share/man/man5/devfs.conf.5
index 8e53735aab97..834d6e768e96 100644
--- a/share/man/man5/devfs.conf.5
+++ b/share/man/man5/devfs.conf.5
@@ -135,4 +135,4 @@ perm	cd0	0660
 .Xr chown 8
 .Sh AUTHORS
 This manual page was written by
-.An "Roland Smith" Aq rsmith@xs4all.nl .
+.An Roland Smith Aq Mt rsmith@xs4all.nl .
diff --git a/share/man/man5/devfs.rules.5 b/share/man/man5/devfs.rules.5
index 603189e2e01d..b8016dbf8012 100644
--- a/share/man/man5/devfs.rules.5
+++ b/share/man/man5/devfs.rules.5
@@ -124,4 +124,4 @@ group, a similar rule may be used:
 .Xr devfs 8
 .Sh AUTHORS
 This manual page was written by
-.An "Roland Smith" Aq rsmith@xs4all.nl .
+.An Roland Smith Aq Mt rsmith@xs4all.nl .
diff --git a/share/man/man5/elf.5 b/share/man/man5/elf.5
index b68363ef12c3..a72eed6a1f97 100644
--- a/share/man/man5/elf.5
+++ b/share/man/man5/elf.5
@@ -1305,8 +1305,7 @@ ELF in itself first appeared in
 The ELF format is an adopted standard.
 .Sh AUTHORS
 This manual page was written by
-.An Jeroen Ruigrok van der Werven
-.Aq asmodai@FreeBSD.org
+.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org
 with inspiration from BSDi's
 .Bsx
 .Xr elf 5
diff --git a/share/man/man5/ext2fs.5 b/share/man/man5/ext2fs.5
index 536561b1a4b2..00be16f750ab 100644
--- a/share/man/man5/ext2fs.5
+++ b/share/man/man5/ext2fs.5
@@ -80,4 +80,4 @@ and others in the
 Project made modifications.
 .Pp
 This manual page was written by
-.An Craig Rodrigues Aq rodrigc@FreeBSD.org .
+.An Craig Rodrigues Aq Mt rodrigc@FreeBSD.org .
diff --git a/share/man/man5/fdescfs.5 b/share/man/man5/fdescfs.5
index f7232085895b..30e72a5f3b1c 100644
--- a/share/man/man5/fdescfs.5
+++ b/share/man/man5/fdescfs.5
@@ -120,7 +120,7 @@ manual page first appeared in
 The
 .Nm
 manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.org ,
+.An Mike Pritchard Aq Mt mpp@FreeBSD.org ,
 and was based on the
 manual page written by
 .An Jan-Simon Pendry .
diff --git a/share/man/man5/freebsd-update.conf.5 b/share/man/man5/freebsd-update.conf.5
index f9f7a562fa42..498fa15e685f 100644
--- a/share/man/man5/freebsd-update.conf.5
+++ b/share/man/man5/freebsd-update.conf.5
@@ -230,4 +230,4 @@ configuration file.
 .Xr sha256 1 ,
 .Xr freebsd-update 8
 .Sh AUTHORS
-.An Colin Percival Aq cperciva@FreeBSD.org
+.An Colin Percival Aq Mt cperciva@FreeBSD.org
diff --git a/share/man/man5/libmap.conf.5 b/share/man/man5/libmap.conf.5
index b97160faa07d..f59bc071ff51 100644
--- a/share/man/man5/libmap.conf.5
+++ b/share/man/man5/libmap.conf.5
@@ -174,7 +174,8 @@ The
 mechanism first appeared in
 .Fx 5.1 .
 .Sh AUTHORS
+.An -nosplit
 This manual page was written by
-.An Matthew N. Dodd Aq winter@jurai.net
+.An Matthew N. Dodd Aq Mt winter@jurai.net
 and extensively rewritten by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/share/man/man5/mailer.conf.5 b/share/man/man5/mailer.conf.5
index 3f48eda1a952..dc55ae773e46 100644
--- a/share/man/man5/mailer.conf.5
+++ b/share/man/man5/mailer.conf.5
@@ -153,7 +153,7 @@ send-mail	/usr/local/bin/mini_sendmail -srelayhost
 appeared in
 .Nx 1.4 .
 .Sh AUTHORS
-.An Perry E. Metzger Aq perry@piermont.com
+.An Perry E. Metzger Aq Mt perry@piermont.com
 .Sh BUGS
 The entire reason this program exists is a crock.
 Instead, a command
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index e33104cd2b9b..e70574963f1b 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -145,7 +145,7 @@ are not supported.
 is provided as a set of
 .Xr cc 1
 settings suggested by
-.An "Bruce Evans" Aq bde@FreeBSD.org
+.An Bruce Evans Aq Mt bde@FreeBSD.org
 for developing and testing changes.
 They can be used, if set, by:
 .Bd -literal -offset indent
@@ -692,7 +692,7 @@ file appeared sometime before
 .Sh AUTHORS
 This
 manual page was written by
-.An Mike W. Meyer Aq mwm@mired.org .
+.An Mike W. Meyer Aq Mt mwm@mired.org .
 .Sh CAVEATS
 Note, that
 .Ev MAKEOBJDIRPREFIX
diff --git a/share/man/man5/mqueuefs.5 b/share/man/man5/mqueuefs.5
index 2431267a8e3e..dedec109cefc 100644
--- a/share/man/man5/mqueuefs.5
+++ b/share/man/man5/mqueuefs.5
@@ -121,4 +121,4 @@ To see the queue's attributes, just read the file:
 .Xr umount 8
 .Sh AUTHORS
 This manual page was written by
-.An "David Xu" Aq davidxu@FreeBSD.org .
+.An David Xu Aq Mt davidxu@FreeBSD.org .
diff --git a/share/man/man5/msdosfs.5 b/share/man/man5/msdosfs.5
index 70cfe50794d4..ff1df4ba525b 100644
--- a/share/man/man5/msdosfs.5
+++ b/share/man/man5/msdosfs.5
@@ -66,4 +66,4 @@ directory layout.
 .Xr umount 8
 .Sh AUTHORS
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man5/nandfs.5 b/share/man/man5/nandfs.5
index 2ef3259f591c..9084b8986831 100644
--- a/share/man/man5/nandfs.5
+++ b/share/man/man5/nandfs.5
@@ -114,15 +114,18 @@ code diverged significantly and is by no means compatible with NILFS.
 .Pp
 The NAND Flash file system first appeared in
 .Fx 10.0 .
-.Sh AUTHOR
+.Sh AUTHORS
+.An -nosplit
 The NAND FS was written by
-.An Grzegorz Bernacki with the help of
+.An Grzegorz Bernacki
+with the help of
 .An Mateusz Guzik ,
 based on the NetBSD code created by
 .An Reinoud Zandijk .
 Additional help and support by
 .An Lukasz Plachno ,
-.An Jan Sieka and
+.An Jan Sieka
+and
 .An Lukasz Wojcik .
 This manual page was written by
 .An Rafal Jaworowski .
diff --git a/share/man/man5/nsmb.conf.5 b/share/man/man5/nsmb.conf.5
index 7e48f60ac0ee..9f76e787982d 100644
--- a/share/man/man5/nsmb.conf.5
+++ b/share/man/man5/nsmb.conf.5
@@ -147,6 +147,6 @@ smbutil crypt
 .Sh AUTHORS
 This manual page was written by
 .An -nosplit
-.An Sergey Osokin Aq osa@FreeBSD.org
+.An Sergey Osokin Aq Mt osa@FreeBSD.org
 and
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man5/nsswitch.conf.5 b/share/man/man5/nsswitch.conf.5
index 80b6cb212fb0..b1fbbd489e58 100644
--- a/share/man/man5/nsswitch.conf.5
+++ b/share/man/man5/nsswitch.conf.5
@@ -373,8 +373,7 @@ It was imported from the
 Project, where it appeared first in
 .Nx 1.4 .
 .Sh AUTHORS
-Luke Mewburn
-.Aq lukem@netbsd.org
+.An Luke Mewburn Aq Mt lukem@netbsd.org
 wrote this freely distributable name-service switch implementation,
 using ideas from the
 .Tn ULTRIX
diff --git a/share/man/man5/nullfs.5 b/share/man/man5/nullfs.5
index 653711b12bb2..3f691e49914b 100644
--- a/share/man/man5/nullfs.5
+++ b/share/man/man5/nullfs.5
@@ -72,4 +72,4 @@ kernel implementation was written by
 .An John Heideman .
 .Pp
 This manual page was written by
-.An Daniel Gerzo Aq danger@FreeBSD.org .
+.An Daniel Gerzo Aq Mt danger@FreeBSD.org .
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index b4629a8dc2c8..83897c152629 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -973,4 +973,4 @@ The
 file appeared in
 .Fx 4.1 .
 .Sh AUTHORS
-.An Brian Somers Aq brian@Awfulhak.org
+.An Brian Somers Aq Mt brian@Awfulhak.org
diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5
index 83fc7c5609c1..4f959333a595 100644
--- a/share/man/man5/pf.conf.5
+++ b/share/man/man5/pf.conf.5
@@ -342,7 +342,6 @@ set limit states 10000
 .Pp
 With 9000 state table entries, the timeout values are scaled to 50%
 (tcp.first 60, tcp.established 43200).
-.Pp
 .It Ar set loginterface
 Enable collection of packet and byte count statistics for the given
 interface or interface group.
@@ -362,7 +361,6 @@ One can disable the loginterface using:
 .Bd -literal -offset indent
 set loginterface none
 .Ed
-.Pp
 .It Ar set limit
 Sets hard limits on the memory pools used by the packet filter.
 See
@@ -415,7 +413,6 @@ Various limits can be combined on a single line:
 .Bd -literal -offset indent
 set limit { states 20000, frags 20000, src-nodes 2000 }
 .Ed
-.Pp
 .It Ar set ruleset-optimization
 .Bl -tag -width xxxxxxxx -compact
 .It Ar none
@@ -481,7 +478,6 @@ For example:
 .Bd -literal -offset indent
 set optimization aggressive
 .Ed
-.Pp
 .It Ar set block-policy
 The
 .Ar block-policy
@@ -573,7 +569,6 @@ ruleset finishes loading.
 For example:
 .Pp
 .Dl set fingerprints \&"/etc/pf.os.devel\&"
-.Pp
 .It Ar set skip on Aq Ar ifspec
 List interfaces for which packets should not be filtered.
 Packets passing in or out on such interfaces are passed as if pf was
@@ -583,7 +578,6 @@ packet filtering is not desired and can have unexpected effects.
 For example:
 .Pp
 .Dl set skip on lo0
-.Pp
 .It Ar set debug
 Set the debug
 .Ar level
@@ -693,7 +687,6 @@ are received.
 The
 .Ar fragment crop
 reassembly mechanism does not yet work with NAT.
-.Pp
 .It Ar fragment drop-ovl
 This option is similar to the
 .Ar fragment crop
@@ -3058,7 +3051,7 @@ Service name database.
 .Xr services 5 ,
 .Xr ftp-proxy 8 ,
 .Xr pfctl 8 ,
-.Xr pflogd 8 ,
+.Xr pflogd 8
 .Sh HISTORY
 The
 .Nm
diff --git a/share/man/man5/portindex.5 b/share/man/man5/portindex.5
index a3f856fef2c5..c997a256167f 100644
--- a/share/man/man5/portindex.5
+++ b/share/man/man5/portindex.5
@@ -97,4 +97,4 @@ vim-6.3.15|/usr/ports/editors/vim|/usr/local|Vi "workalike", with many additiona
 This manual page was written by
 .An Paul Armstrong
 and
-.An Thomas Abthorpe Aq tabthorpe@FreeBSD.org .
+.An Thomas Abthorpe Aq Mt tabthorpe@FreeBSD.org .
diff --git a/share/man/man5/portsnap.conf.5 b/share/man/man5/portsnap.conf.5
index 07685b2b0ef0..f679edab3004 100644
--- a/share/man/man5/portsnap.conf.5
+++ b/share/man/man5/portsnap.conf.5
@@ -144,4 +144,4 @@ Default location of the portsnap configuration file.
 .Xr portsnap 8 ,
 .Xr sha256 8
 .Sh AUTHORS
-.An Colin Percival Aq cperciva@FreeBSD.org
+.An Colin Percival Aq Mt cperciva@FreeBSD.org
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 2dd713bd40b6..c87de447bce5 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -1498,7 +1498,6 @@ interface as described in RFC 4941.
 This is the IPv6 equivalent of
 .Va network_interfaces .
 Normally manual configuration of this variable is not needed.
-.Pp
 .It Va ipv6_cpe_wanif
 .Pq Vt str
 If the variable is set to an interface name,
diff --git a/share/man/man5/reiserfs.5 b/share/man/man5/reiserfs.5
index c610f5e3722e..254afb7b2409 100644
--- a/share/man/man5/reiserfs.5
+++ b/share/man/man5/reiserfs.5
@@ -74,10 +74,10 @@ The ReiserFS kernel implementation was written by
 and ported to
 .Fx
 by
-.An Jean-S\['e]bastien P\['e]dron Aq dumbbell@FreeBSD.org .
+.An Jean-S\['e]bastien P\['e]dron Aq Mt dumbbell@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Craig Rodrigues Aq rodrigc@FreeBSD.org .
+.An Craig Rodrigues Aq Mt rodrigc@FreeBSD.org .
 .Sh CAVEATS
 Currently, only read-only access is supported for ReiserFS volumes,
 writing to a volume is not supported.
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index ac881377dcb5..3c3c9cfc1ea5 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
 .\" $FreeBSD$
-.Dd June 8, 2014
+.Dd July 16, 2014
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -198,7 +198,7 @@ When set, it also enforces the following options:
 Set to not build the Clang C/C++ compiler during the regular phase of the build.
 .Pp
 It is a default setting on
-arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
+arm/armeb, 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
@@ -221,7 +221,7 @@ unless an alternative compiiler is provided via
 XCC.
 .Pp
 It is a default setting on
-arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
+arm/armeb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
 .It Va WITH_CLANG_BOOTSTRAP
 .\" from FreeBSD: head/tools/build/options/WITH_CLANG_BOOTSTRAP 264660 2014-04-18 17:03:58Z imp
 Set to build the Clang C/C++ compiler during the bootstrap phase of the build.
@@ -237,7 +237,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/armv6hf, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
+arm/arm, arm/armeb, arm/armv6, arm/armv6hf, 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
@@ -254,7 +254,7 @@ and
 .Pa /usr/bin/cpp .
 .Pp
 It is a default setting on
-arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/armeb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
 .It Va WITH_CLANG_IS_CC
 .\" from FreeBSD: head/tools/build/options/WITH_CLANG_IS_CC 235342 2012-05-12 16:12:36Z gjb
 Set to install the Clang C/C++ compiler as
@@ -346,6 +346,8 @@ When set, it also enforces the following options:
 .It
 .Va WITHOUT_CLANG_FULL
 .It
+.Va WITHOUT_GNUCXX
+.It
 .Va WITHOUT_GROFF
 .El
 .It Va WITH_DEBUG_FILES
@@ -422,13 +424,13 @@ Set to not build games.
 Set to not build and install gcc and g++ as part of the normal build process.
 .Pp
 It is a default setting on
-amd64/amd64, arm/arm, arm/armv6, arm/armv6hf and i386/i386.
+amd64/amd64, arm/arm, arm/armv6, arm/armv6hf, i386/i386 and pc98/i386.
 .It Va WITH_GCC
 .\" from FreeBSD: head/tools/build/options/WITH_GCC 255326 2013-09-06 20:49:48Z zeising
 Set to build and install gcc and g++.
 .Pp
 It is a default setting on
-arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/armeb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
 .It Va WITHOUT_GCC_BOOTSTRAP
 .\" from FreeBSD: head/tools/build/options/WITHOUT_GCC_BOOTSTRAP 264660 2014-04-18 17:03:58Z imp
 Set to not build gcc and g++ as part of the bootstrap process.
@@ -437,13 +439,13 @@ unless an alternative compiiler is provided via
 XCC.
 .Pp
 It is a default setting on
-amd64/amd64, arm/arm, arm/armv6, arm/armv6hf and i386/i386.
+amd64/amd64, arm/arm, arm/armv6, arm/armv6hf, i386/i386 and pc98/i386.
 .It Va WITH_GCC_BOOTSTRAP
 .\" from FreeBSD: head/tools/build/options/WITH_GCC_BOOTSTRAP 264660 2014-04-18 17:03:58Z imp
 Set to build gcc and g++ as part of the bootstrap process.
 .Pp
 It is a default setting on
-arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/armeb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, 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
@@ -480,7 +482,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, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/armeb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
 .It Va WITHOUT_GNU_GREP_COMPAT
 .\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_GREP_COMPAT 266752 2014-05-27 15:52:27Z gjb
 Set this option to omit the gnu extentions to grep from being included in 
@@ -545,9 +547,9 @@ Set to build libraries, programs, and kernel modules without IPv6 support.
 .It Va WITHOUT_INET_SUPPORT
 .\" from FreeBSD: head/tools/build/options/WITHOUT_INET_SUPPORT 221266 2011-04-30 17:58:28Z bz
 Set to build libraries, programs, and kernel modules without IPv4 support.
-.It Va WITHOUT_INFO
-.\" from FreeBSD: head/tools/build/options/WITHOUT_INFO 156932 2006-03-21 07:50:50Z ru
-Set to not make or install
+.It Va WITH_INFO
+.\" from FreeBSD: head/tools/build/options/WITH_INFO 268496 2014-07-10 15:05:41Z bapt
+Set to make or install
 .Xr info 5
 files.
 .It Va WITHOUT_INSTALLLIB
@@ -1021,15 +1023,16 @@ 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 267033 2014-06-03 22:34:27Z jmmv
-Set to install the
+.It Va WITHOUT_TESTS
+.\" from FreeBSD: head/tools/build/options/WITHOUT_TESTS 268778 2014-07-16 21:40:11Z jmmv
+Set to not build nor install the
 .Fx
 Test Suite in
 .Pa /usr/tests/ .
 See
 .Xr tests 7
 for more details.
+This also disables the build of all test-related dependencies, including ATF.
 .It Va WITHOUT_TEXTPROC
 .\" from FreeBSD: head/tools/build/options/WITHOUT_TEXTPROC 183242 2008-09-21 22:02:26Z sam
 Set to not build
@@ -1088,11 +1091,11 @@ and
 .It Va WITHOUT_VI
 .\" from FreeBSD: head/tools/build/options/WITHOUT_VI 264903 2014-04-24 23:17:40Z imp
 Set to not build and install vi, view, ex and related programs.
-.It Va WITHOUT_VT_SUPPORT
-.\" from FreeBSD: head/tools/build/options/WITHOUT_VT_SUPPORT 267124 2014-06-05 18:53:56Z emaste
+.It Va WITHOUT_VT
+.\" from FreeBSD: head/tools/build/options/WITHOUT_VT 268022 2014-06-30 00:20:12Z emaste
 Set to not build
 .Xr vt 4
-support files (fonts).
+support files (fonts and keymaps).
 .It Va WITHOUT_WARNS
 .\" from FreeBSD: head/tools/build/options/WITHOUT_WARNS 265830 2014-05-10 16:37:53Z imp
 Set this to not add warning flags to the compiler invocations.
diff --git a/share/man/man5/tmpfs.5 b/share/man/man5/tmpfs.5
index 78568d2253a6..9cce1fba8682 100644
--- a/share/man/man5/tmpfs.5
+++ b/share/man/man5/tmpfs.5
@@ -129,7 +129,7 @@ driver first appeared in
 The
 .Nm
 kernel implementation was written by
-.An Julio M. Merino Vidal Aq jmmv@NetBSD.org
+.An Julio M. Merino Vidal Aq Mt jmmv@NetBSD.org
 as a Google SoC project.
 .Pp
 .An Rohit Jalan
@@ -139,6 +139,6 @@ to
 .Fx .
 .Pp
 This manual page was written by
-.An Xin LI Aq delphij@FreeBSD.org .
+.An Xin LI Aq Mt delphij@FreeBSD.org .
 .Sh BUGS
 Some file system mount time options may not be well-supported.
diff --git a/share/man/man7/build.7 b/share/man/man7/build.7
index 76a2fa6e1adf..a2172ed3316e 100644
--- a/share/man/man7/build.7
+++ b/share/man/man7/build.7
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 27, 2014
+.Dd June 25, 2014
 .Dt BUILD 7
 .Os
 .Sh NAME
@@ -40,8 +40,7 @@ normally
 and
 .Pa /usr/ports .
 These directories may be initially empty or non-existent until updated with
-.Xr csup 1 ,
-.Xr svn 1 ,
+.Xr svn 1
 or
 .Xr portsnap 8 .
 Directory
@@ -415,6 +414,12 @@ If set, this variable supplies a list of additional directories relative to
 the root of the source tree to build as part of the
 .Cm everything
 target.
+.It Va LOCAL_ITOOLS
+If set, this variable supplies a list of additional tools that are used by the
+.Cm installworld
+and
+.Cm distributeworld
+targets.
 .It Va LOCAL_LIB_DIRS
 If set, this variable supplies a list of additional directories relative to
 the root of the source tree to build as part of the
@@ -610,7 +615,6 @@ make TARGET=sparc64 DESTDIR=/clients/sparc64 installworld
 .Ed
 .Sh SEE ALSO
 .Xr cc 1 ,
-.Xr csup 1 ,
 .Xr install 1 ,
 .Xr make 1 ,
 .Xr svn 1 ,
@@ -624,4 +628,4 @@ make TARGET=sparc64 DESTDIR=/clients/sparc64 installworld
 .Xr reboot 8 ,
 .Xr shutdown 8
 .Sh AUTHORS
-.An Mike W. Meyer Aq mwm@mired.org .
+.An Mike W. Meyer Aq Mt mwm@mired.org
diff --git a/share/man/man7/c99.7 b/share/man/man7/c99.7
index 43ef6750cd66..fcf14769d0e9 100644
--- a/share/man/man7/c99.7
+++ b/share/man/man7/c99.7
@@ -180,4 +180,4 @@ This manual page first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
 This manual page was originally written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
diff --git a/share/man/man7/development.7 b/share/man/man7/development.7
index 18b98131fc40..65fe008ad123 100644
--- a/share/man/man7/development.7
+++ b/share/man/man7/development.7
@@ -467,14 +467,14 @@ operations you do will be done as
 The
 .Nm
 manual page was originally written by
-.An Matthew Dillon Aq dillon@FreeBSD.org
+.An Matthew Dillon Aq Mt dillon@FreeBSD.org
 and first appeared
 in
 .Fx 5.0 ,
 December 2002.
 It was since extensively modified by
-.An Eitan Adler Aq eadler@FreeBSD.org
+.An Eitan Adler Aq Mt eadler@FreeBSD.org
 to reflect the repository conversion from
-.Xr cvs
+.Xr cvs 1
 to
-.Xr svn .
+.Xr svn 1 .
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 1722ea37b35b..782517cefc94 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -28,7 +28,7 @@
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd December 25, 2013
+.Dd July 25, 2014
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -86,10 +86,6 @@ see
 .Xr rc 8
 .It Pa bluetooth/
 bluetooth configuration files
-.It Pa gnats/
-gnats configuration files;
-see
-.Xr send-pr 1
 .It Pa localtime
 local timezone information;
 see
@@ -226,6 +222,8 @@ WaveLAN driver
 .El
 .It Pa fs/
 .Bl -tag -width ".Pa kerberos5/" -compact
+.It Pa cd9660/
+iso9660 file system
 .It Pa fdescfs/
 per-process file descriptors file system
 .It Pa fifofs/
@@ -265,11 +263,6 @@ STRIPE GEOM class
 .Pp
 .It Pa isc/
 ISC utility library libisc include files
-.It Pa isofs/
-.Bl -tag -width ".Pa kerberos5/" -compact
-.It Pa cd9660/
-iso9660 file system
-.El
 .It Pa libmilter/
 C include files for libmilter,
 the
@@ -279,6 +272,10 @@ mail filter API
 machine-specific C include files
 .It Pa net/
 miscellaneous network C include files
+.It Pa net80211/
+C include files for 802.11 wireless networking;
+see
+.Xr net80211 4
 .It Pa netinet/
 C include files for Internet standard protocols;
 see
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index f3f897ec5406..8fc75f3da4eb 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -636,10 +636,10 @@ and
 .An Poul-Henning Kamp .
 .Pp
 This manual page was originally written by
-.An Murray Stokely Aq murray@FreeBSD.org .
+.An Murray Stokely Aq Mt murray@FreeBSD.org .
 .Pp
 It was updated by
-.An Nathan Whitehorn Aq nwhitehorn@FreeBSD.org
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org
 to include the
 .Fa generate-release.sh
 script used for the
@@ -647,7 +647,7 @@ script used for the
 release cycle.
 .Pp
 It was later updated by
-.An Glen Barber Aq gjb@FreeBSD.org
+.An Glen Barber Aq Mt gjb@FreeBSD.org
 to include the
 .Fa release.sh
 script used for the
diff --git a/share/man/man7/sdoc.7 b/share/man/man7/sdoc.7
index a3c000dff3cb..d678c97e2818 100644
--- a/share/man/man7/sdoc.7
+++ b/share/man/man7/sdoc.7
@@ -237,5 +237,7 @@ The
 manual page first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
-.An "Tim Fraser, NAI Labs CBOSS project." Aq tfraser@tislabs.com
-.An "Brian Feldman, NAI Labs CBOSS project." Aq bfeldman@tislabs.com
+.An Tim Fraser Aq Mt tfraser@tislabs.com ,
+NAI Labs CBOSS project
+.An Brian Feldman Aq Mt bfeldman@tislabs.com ,
+NAI Labs CBOSS project
diff --git a/share/man/man7/sprog.7 b/share/man/man7/sprog.7
index cde04b2f7cbb..f5a2d9ca4ec6 100644
--- a/share/man/man7/sprog.7
+++ b/share/man/man7/sprog.7
@@ -173,8 +173,8 @@ properly beforehand.
 .Xr strlcpy 3
 .Sh AUTHORS
 .An -nosplit
-.An Eric Melville Aq eric@FreeBSD.org
+.An Eric Melville Aq Mt eric@FreeBSD.org
 originally wrote this document based on a chapter of the
 .%B "FreeBSD Developer's Handbook"
 written by
-.An Murray Stokely Aq murray@FreeBSD.org .
+.An Murray Stokely Aq Mt murray@FreeBSD.org .
diff --git a/share/man/man7/tests.7 b/share/man/man7/tests.7
index f7d0611fb94c..e8e216aafc2d 100644
--- a/share/man/man7/tests.7
+++ b/share/man/man7/tests.7
@@ -195,7 +195,7 @@ For more details please refer to:
 .It
 .Lk http://lists.freebsd.org/ "FreeBSD Mailing Lists"
 .It
-.Lk http://www.freebsd.org/send-pr.html "Submit a FreeBSD Problem Report"
+.Lk http://www.freebsd.org/support.html "Problem Reporting"
 .El
 .Sh FILES
 .Bl -tag -compact -width usrXlocalXetcXkyuaXkyuaXconfXX
diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7
index 5e228dd907d9..baf0bcc650fb 100644
--- a/share/man/man7/tuning.7
+++ b/share/man/man7/tuning.7
@@ -778,4 +778,4 @@ in
 .Fx 4.3 ,
 May 2001.
 The manual page was greatly modified by
-.An Eitan Adler Aq eadler@FreeBSD.org
+.An Eitan Adler Aq Mt eadler@FreeBSD.org .
diff --git a/share/man/man8/hv_kvp_daemon.8 b/share/man/man8/hv_kvp_daemon.8
index a7171530c647..a095fe8f1324 100644
--- a/share/man/man8/hv_kvp_daemon.8
+++ b/share/man/man8/hv_kvp_daemon.8
@@ -93,4 +93,4 @@ Microsoft Corporation, and Network Appliance Incorporated.
 support for
 .Nm
 was first added by
-.An Microsoft BSD Integration Services Team Aq bsdic@microsoft.com .
+.An Microsoft BSD Integration Services Team Aq Mt bsdic@microsoft.com .
diff --git a/share/man/man8/nanobsd.8 b/share/man/man8/nanobsd.8
index 0309c4e424c8..ef23aa81d9a7 100644
--- a/share/man/man8/nanobsd.8
+++ b/share/man/man8/nanobsd.8
@@ -332,6 +332,6 @@ utility first appeared in
 .An -nosplit
 .Nm NanoBSD
 was developed by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 This manual page was written by
-.An Daniel Gerzo Aq danger@FreeBSD.org .
+.An Daniel Gerzo Aq Mt danger@FreeBSD.org .
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index e117fe447e84..4d4daa1020b9 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -650,13 +650,13 @@ already exists on disk (e.g.\& as a result of a previous update).
 .Xr swapon 8
 .Sh AUTHORS
 .An -nosplit
-.An Andrzej Bialecki Aq abial@FreeBSD.org ,
+.An Andrzej Bialecki Aq Mt abial@FreeBSD.org ,
 with subsequent work on the scripts by
-.An Luigi Rizzo Aq luigi@iet.unipi.it
+.An Luigi Rizzo Aq Mt luigi@iet.unipi.it
 and others.
 Man page and
 .Pa Makefiles
 created by
-.An Greg Lehey Aq grog@lemis.com .
+.An Greg Lehey Aq Mt grog@lemis.com .
 .Sh BUGS
 Documentation is still incomplete.
diff --git a/share/man/man8/rescue.8 b/share/man/man8/rescue.8
index 29218874d676..299bdfcc6d57 100644
--- a/share/man/man8/rescue.8
+++ b/share/man/man8/rescue.8
@@ -145,13 +145,13 @@ utilities first appeared in
 The
 .Nm
 system was written by
-.An Tim Kientzle Aq kientzle@FreeBSD.org ,
+.An Tim Kientzle Aq Mt kientzle@FreeBSD.org ,
 based on ideas taken from
 .Nx .
 This manual page was written by
-.An Simon L. Nielsen Aq simon@FreeBSD.org ,
+.An Simon L. Nielsen Aq Mt simon@FreeBSD.org ,
 based on text by
-.An Tim Kientzle Aq kientzle@FreeBSD.org .
+.An Tim Kientzle Aq Mt kientzle@FreeBSD.org .
 .Sh BUGS
 Most of the
 .Nm
diff --git a/share/man/man9/BUF_ISLOCKED.9 b/share/man/man9/BUF_ISLOCKED.9
index 597038881fc3..2471db978d9e 100644
--- a/share/man/man9/BUF_ISLOCKED.9
+++ b/share/man/man9/BUF_ISLOCKED.9
@@ -66,4 +66,4 @@ The lock is not held by anyone.
 .Xr lockmgr 9
 .Sh AUTHORS
 This manual page was written by
-.An Attilio Rao Aq attilio@FreeBSD.org .
+.An Attilio Rao Aq Mt attilio@FreeBSD.org .
diff --git a/share/man/man9/BUF_LOCK.9 b/share/man/man9/BUF_LOCK.9
index ca414ecdbaa0..9676af83efac 100644
--- a/share/man/man9/BUF_LOCK.9
+++ b/share/man/man9/BUF_LOCK.9
@@ -72,4 +72,4 @@ information on non-zero return values.
 .Xr lockmgr 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/BUF_LOCKFREE.9 b/share/man/man9/BUF_LOCKFREE.9
index d356f0d8be46..1226ceadacd6 100644
--- a/share/man/man9/BUF_LOCKFREE.9
+++ b/share/man/man9/BUF_LOCKFREE.9
@@ -60,4 +60,4 @@ The buffer whose lock is to be destroyed.
 .Xr lockdestroy 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/BUF_LOCKINIT.9 b/share/man/man9/BUF_LOCKINIT.9
index 286e7f8db2a0..98d3b2aa1149 100644
--- a/share/man/man9/BUF_LOCKINIT.9
+++ b/share/man/man9/BUF_LOCKINIT.9
@@ -59,4 +59,4 @@ The buffer whose lock it to be initialized.
 .Xr lockmgr 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/BUF_RECURSED.9 b/share/man/man9/BUF_RECURSED.9
index 2e369ea69e0b..fccf83f40e96 100644
--- a/share/man/man9/BUF_RECURSED.9
+++ b/share/man/man9/BUF_RECURSED.9
@@ -62,4 +62,4 @@ for details.
 .Xr lockmgr 9
 .Sh AUTHORS
 This manual page was written by
-.An Attilio Rao Aq attilio@FreeBSD.org .
+.An Attilio Rao Aq Mt attilio@FreeBSD.org .
diff --git a/share/man/man9/BUF_TIMELOCK.9 b/share/man/man9/BUF_TIMELOCK.9
index 31ca2007c9dd..151e7f5251b7 100644
--- a/share/man/man9/BUF_TIMELOCK.9
+++ b/share/man/man9/BUF_TIMELOCK.9
@@ -80,4 +80,4 @@ for details on non-zero return values.
 .Xr lockmgr 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/BUF_UNLOCK.9 b/share/man/man9/BUF_UNLOCK.9
index 0b6b0b35080f..e305a5d7f5c1 100644
--- a/share/man/man9/BUF_UNLOCK.9
+++ b/share/man/man9/BUF_UNLOCK.9
@@ -61,4 +61,4 @@ The buffer must already be locked.
 .Xr lockmgr 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/BUS_CONFIG_INTR.9 b/share/man/man9/BUS_CONFIG_INTR.9
index a3b4c543c917..8a45b53e3143 100644
--- a/share/man/man9/BUS_CONFIG_INTR.9
+++ b/share/man/man9/BUS_CONFIG_INTR.9
@@ -102,5 +102,4 @@ method first appeared in
 .\"
 .Sh AUTHORS
 This manual page was written by
-.An Marcel Moolenaar
-.Aq marcel@xcllnt.net .
+.An Marcel Moolenaar Aq Mt marcel@xcllnt.net .
diff --git a/share/man/man9/BUS_SETUP_INTR.9 b/share/man/man9/BUS_SETUP_INTR.9
index 8264a999a5fb..eab62e39ecc4 100644
--- a/share/man/man9/BUS_SETUP_INTR.9
+++ b/share/man/man9/BUS_SETUP_INTR.9
@@ -205,12 +205,10 @@ otherwise an appropriate error is returned.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Jeroen Ruigrok van der Werven
-.Aq asmodai@FreeBSD.org
+.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org
 based on the manual pages for
 .Fn BUS_CREATE_INTR
 and
 .Fn BUS_CONNECT_INTR
 written by
-.An Doug Rabson
-.Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/share/man/man9/CTASSERT.9 b/share/man/man9/CTASSERT.9
index 4885d4248b8e..6211c2e5095a 100644
--- a/share/man/man9/CTASSERT.9
+++ b/share/man/man9/CTASSERT.9
@@ -66,5 +66,4 @@ structure is 16 bytes.
 .Xr KASSERT 9
 .Sh AUTHORS
 This manual page was written by
-.An Hiten M. Pandya
-.Aq hmp@FreeBSD.org .
+.An Hiten M. Pandya Aq Mt hmp@FreeBSD.org .
diff --git a/share/man/man9/DB_COMMAND.9 b/share/man/man9/DB_COMMAND.9
index 179f3f3181a4..bf3faea69261 100644
--- a/share/man/man9/DB_COMMAND.9
+++ b/share/man/man9/DB_COMMAND.9
@@ -103,8 +103,8 @@ Calling my command with address 0x1000
 db>
 .Ef
 .Ed
-.Sh "SEE ALSO"
+.Sh SEE ALSO
 .Xr ddb 4
-.Sh AUTHOR
+.Sh AUTHORS
 This manual page was written by
-.An Guillaume Ballet Aq gballet@gmail.com .
+.An Guillaume Ballet Aq Mt gballet@gmail.com .
diff --git a/share/man/man9/DECLARE_GEOM_CLASS.9 b/share/man/man9/DECLARE_GEOM_CLASS.9
index 01f074d86fce..a6dc969e0986 100644
--- a/share/man/man9/DECLARE_GEOM_CLASS.9
+++ b/share/man/man9/DECLARE_GEOM_CLASS.9
@@ -176,4 +176,4 @@ DECLARE_GEOM_CLASS(example_class, g_example);
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/DECLARE_MODULE.9 b/share/man/man9/DECLARE_MODULE.9
index d33c18ed6081..b5c85772c290 100644
--- a/share/man/man9/DECLARE_MODULE.9
+++ b/share/man/man9/DECLARE_MODULE.9
@@ -107,6 +107,6 @@ enumeration
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org ,
+.An Alexander Langer Aq Mt alex@FreeBSD.org ,
 inspired by the KLD Facility Programming Tutorial by
-.An Andrew Reiter Aq arr@watson.org .
+.An Andrew Reiter Aq Mt arr@watson.org .
diff --git a/share/man/man9/DEVICE_ATTACH.9 b/share/man/man9/DEVICE_ATTACH.9
index ccb9f27b6930..12cce747a337 100644
--- a/share/man/man9/DEVICE_ATTACH.9
+++ b/share/man/man9/DEVICE_ATTACH.9
@@ -68,4 +68,4 @@ Zero is returned on success, otherwise an appropriate error is returned.
 .Xr DEVICE_SHUTDOWN 9
 .Sh AUTHORS
 This manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/share/man/man9/DEVICE_IDENTIFY.9 b/share/man/man9/DEVICE_IDENTIFY.9
index 4257407eac8b..6f0011a19547 100644
--- a/share/man/man9/DEVICE_IDENTIFY.9
+++ b/share/man/man9/DEVICE_IDENTIFY.9
@@ -91,4 +91,4 @@ foo_identify(driver_t *driver, device_t parent)
 .Xr DEVICE_SHUTDOWN 9
 .Sh AUTHORS
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/DEV_MODULE.9 b/share/man/man9/DEV_MODULE.9
index 28465b3f8dac..e28b245ea635 100644
--- a/share/man/man9/DEV_MODULE.9
+++ b/share/man/man9/DEV_MODULE.9
@@ -102,4 +102,4 @@ DEV_MODULE(foo, foo_load, NULL);
 .Xr module 9
 .Sh AUTHORS
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/DRIVER_MODULE.9 b/share/man/man9/DRIVER_MODULE.9
index 274fdcceed99..af03ef926ef4 100644
--- a/share/man/man9/DRIVER_MODULE.9
+++ b/share/man/man9/DRIVER_MODULE.9
@@ -147,4 +147,4 @@ for a specific pass level.
 .Xr SYSINIT 9
 .Sh AUTHORS
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/EVENTHANDLER.9 b/share/man/man9/EVENTHANDLER.9
index fc22d5e0a6a7..711c6efaa44e 100644
--- a/share/man/man9/EVENTHANDLER.9
+++ b/share/man/man9/EVENTHANDLER.9
@@ -334,4 +334,4 @@ facility first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Joseph Koshy Aq jkoshy@FreeBSD.org .
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org .
diff --git a/share/man/man9/KASSERT.9 b/share/man/man9/KASSERT.9
index 62c97c44bd55..0c6898a7799b 100644
--- a/share/man/man9/KASSERT.9
+++ b/share/man/man9/KASSERT.9
@@ -83,5 +83,4 @@ vput(vp)
 .Xr panic 9
 .Sh AUTHORS
 This manual page was written by
-.An Jonathan M. Bresler
-.Aq jmb@FreeBSD.org .
+.An Jonathan M. Bresler Aq Mt jmb@FreeBSD.org .
diff --git a/share/man/man9/LOCK_PROFILING.9 b/share/man/man9/LOCK_PROFILING.9
index d64b3286e7a3..2b7777882cc9 100644
--- a/share/man/man9/LOCK_PROFILING.9
+++ b/share/man/man9/LOCK_PROFILING.9
@@ -134,16 +134,16 @@ Generalized lock profiling support appeared in
 The
 .Nm MUTEX_PROFILING
 code was written by
-.An Eivind Eklund Aq eivind@FreeBSD.org ,
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org
+.An Eivind Eklund Aq Mt eivind@FreeBSD.org ,
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org
 and
-.An Robert Watson Aq rwatson@FreeBSD.org .
+.An Robert Watson Aq Mt rwatson@FreeBSD.org .
 The
 .Nm
 code was written by
-.An Kip Macy Aq kmacy@FreeBSD.org .
+.An Kip Macy Aq Mt kmacy@FreeBSD.org .
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
 .Sh NOTES
 The
 .Dv LOCK_PROFILING
diff --git a/share/man/man9/MODULE_DEPEND.9 b/share/man/man9/MODULE_DEPEND.9
index c0a8fdd44c94..b8e3104e3bec 100644
--- a/share/man/man9/MODULE_DEPEND.9
+++ b/share/man/man9/MODULE_DEPEND.9
@@ -77,4 +77,4 @@ MODULE_DEPEND(foo, bar, 1, 3, 4);
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/MODULE_VERSION.9 b/share/man/man9/MODULE_VERSION.9
index 2f284b874b91..e791ded652d7 100644
--- a/share/man/man9/MODULE_VERSION.9
+++ b/share/man/man9/MODULE_VERSION.9
@@ -56,4 +56,4 @@ MODULE_VERSION(foo, 1);
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index d027d3751761..1966f024791f 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -112,6 +112,7 @@ MAN=	accept_filter.9 \
 	fail.9 \
 	fetch.9 \
 	firmware.9 \
+	fpu_kern.9 \
 	g_access.9 \
 	g_attach.9 \
 	g_bio.9 \
@@ -187,6 +188,7 @@ MAN=	accept_filter.9 \
 	osd.9 \
 	panic.9 \
 	pbuf.9 \
+	PCBGROUP.9 \
 	p_candebug.9 \
 	p_cansee.9 \
 	pci.9 \
@@ -197,7 +199,6 @@ MAN=	accept_filter.9 \
 	physio.9 \
 	pmap.9 \
 	pmap_activate.9 \
-	pmap_change_wiring.9 \
 	pmap_clear_modify.9 \
 	pmap_copy.9 \
 	pmap_enter.9 \
@@ -211,12 +212,13 @@ MAN=	accept_filter.9 \
 	pmap_object_init_pt.9 \
 	pmap_page_exists_quick.9 \
 	pmap_page_init.9 \
-	pmap_page_protect.9 \
 	pmap_pinit.9 \
+	pmap_protect.9 \
 	pmap_qenter.9 \
 	pmap_release.9 \
 	pmap_remove.9 \
 	pmap_resident_count.9 \
+	pmap_unwire.9 \
 	pmap_zero_page.9 \
 	printf.9 \
 	prison_check.9 \
@@ -355,7 +357,6 @@ MAN=	accept_filter.9 \
 	VOP_GETACL.9 \
 	VOP_GETEXTATTR.9 \
 	VOP_GETPAGES.9 \
-	VOP_GETVOBJECT.9 \
 	VOP_INACTIVE.9 \
 	VOP_IOCTL.9 \
 	VOP_LINK.9 \
@@ -382,7 +383,6 @@ MAN=	accept_filter.9 \
 	vrele.9 \
 	vslock.9 \
 	watchdog.9 \
-	zero_copy.9 \
 	zone.9
 
 MLINKS=	unr.9 alloc_unr.9 \
@@ -670,6 +670,12 @@ MLINKS+=fetch.9 fubyte.9 \
 	fetch.9 fuword16.9 \
 	fetch.9 fuword32.9 \
 	fetch.9 fuword64.9
+MLINKS+=fpu_kern.9 fpu_kern_alloc_ctx.9 \
+	fpu_kern.9 fpu_kern_free_ctx.9 \
+	fpu_kern.9 fpu_kern_enter.9 \
+	fpu_kern.9 fpu_kern_leave.9 \
+	fpu_kern.9 fpu_kern_thread.9 \
+	fpu_kern.9 is_fpu_kern_thread.9
 MLINKS+=g_attach.9 g_detach.9
 MLINKS+=g_bio.9 g_clone_bio.9 \
 	g_bio.9 g_destroy_bio.9 \
@@ -918,10 +924,12 @@ MLINKS+=\
 	mbuf.9 m_move_pkthdr.9 \
 	mbuf.9 M_PREPEND.9 \
 	mbuf.9 m_prepend.9 \
+	mbuf.9 m_pulldown.9 \
 	mbuf.9 m_pullup.9 \
 	mbuf.9 m_split.9 \
 	mbuf.9 mtod.9 \
 	mbuf.9 M_TRAILINGSPACE.9 \
+	mbuf.9 m_unshare.9 \
 	mbuf.9 M_WRITABLE.9
 MLINKS+=\
 	mbuf_tags.9 m_tag_alloc.9 \
@@ -1035,12 +1043,10 @@ MLINKS+=pfil.9 pfil_add_hook.9 \
 	pfil.9 pfil_hook_get.9 \
 	pfil.9 pfil_remove_hook.9
 MLINKS+=pfind.9 zpfind.9
-MLINKS+=pmap_clear_modify.9 pmap_clear_reference.9
 MLINKS+=pmap_copy.9 pmap_copy_page.9
 MLINKS+=pmap_extract.9 pmap_extract_and_hold.9
 MLINKS+=pmap_init.9 pmap_init2.9
-MLINKS+=pmap_is_modified.9 pmap_ts_modified.9
-MLINKS+=pmap_page_protect.9 pmap_protect.9
+MLINKS+=pmap_is_modified.9 pmap_ts_referenced.9
 MLINKS+=pmap_pinit.9 pmap_pinit0.9 \
 	pmap_pinit.9 pmap_pinit2.9
 MLINKS+=pmap_qenter.9 pmap_qremove.9
@@ -1344,33 +1350,36 @@ MLINKS+=sx.9 sx_assert.9 \
 	sx.9 sx_xlocked.9 \
 	sx.9 sx_xunlock.9
 MLINKS+=sysctl.9 SYSCTL_DECL.9 \
+	sysctl.9 SYSCTL_ADD_INT.9 \
+	sysctl.9 SYSCTL_ADD_LONG.9 \
+	sysctl.9 SYSCTL_ADD_NODE.9 \
+	sysctl.9 SYSCTL_ADD_OPAQUE.9 \
+	sysctl.9 SYSCTL_ADD_PROC.9 \
+	sysctl.9 SYSCTL_ADD_QUAD.9 \
+	sysctl.9 SYSCTL_ADD_ROOT_NODE.9 \
+	sysctl.9 SYSCTL_ADD_STRING.9 \
+	sysctl.9 SYSCTL_ADD_STRUCT.9 \
+	sysctl.9 SYSCTL_ADD_UINT.9 \
+	sysctl.9 SYSCTL_ADD_ULONG.9 \
+	sysctl.9 SYSCTL_ADD_UQUAD.9 \
+	sysctl.9 SYSCTL_CHILDREN.9 \
+	sysctl.9 SYSCTL_STATIC_CHILDREN.9 \
+	sysctl.9 SYSCTL_NODE_CHILDREN.9 \
+	sysctl.9 SYSCTL_PARENT.9 \
 	sysctl.9 SYSCTL_INT.9 \
 	sysctl.9 SYSCTL_LONG.9 \
 	sysctl.9 SYSCTL_NODE.9 \
 	sysctl.9 SYSCTL_OPAQUE.9 \
 	sysctl.9 SYSCTL_PROC.9 \
 	sysctl.9 SYSCTL_QUAD.9 \
+	sysctl.9 SYSCTL_ROOT_NODE.9 \
 	sysctl.9 SYSCTL_STRING.9 \
 	sysctl.9 SYSCTL_STRUCT.9 \
 	sysctl.9 SYSCTL_UINT.9 \
 	sysctl.9 SYSCTL_ULONG.9 \
 	sysctl.9 SYSCTL_UQUAD.9
-MLINKS+=sysctl_add_oid.9 SYSCTL_ADD_INT.9 \
-	sysctl_add_oid.9 SYSCTL_ADD_LONG.9 \
-	sysctl_add_oid.9 SYSCTL_ADD_NODE.9 \
-	sysctl_add_oid.9 SYSCTL_ADD_OID.9 \
-	sysctl_add_oid.9 SYSCTL_ADD_OPAQUE.9 \
-	sysctl_add_oid.9 SYSCTL_ADD_PROC.9 \
-	sysctl_add_oid.9 SYSCTL_ADD_QUAD.9 \
-	sysctl_add_oid.9 SYSCTL_ADD_STRING.9 \
-	sysctl_add_oid.9 SYSCTL_ADD_STRUCT.9 \
-	sysctl_add_oid.9 SYSCTL_ADD_UINT.9 \
-	sysctl_add_oid.9 SYSCTL_ADD_ULONG.9 \
-	sysctl_add_oid.9 SYSCTL_ADD_UQUAD.9 \
-	sysctl_add_oid.9 SYSCTL_CHILDREN.9 \
-	sysctl_add_oid.9 sysctl_move_oid.9 \
-	sysctl_add_oid.9 sysctl_remove_oid.9 \
-	sysctl_add_oid.9 SYSCTL_STATIC_CHILDREN.9
+MLINKS+=sysctl_add_oid.9 sysctl_move_oid.9 \
+	sysctl_add_oid.9 sysctl_remove_oid.9
 MLINKS+=sysctl_ctx_init.9 sysctl_ctx_entry_add.9 \
 	sysctl_ctx_init.9 sysctl_ctx_entry_del.9 \
 	sysctl_ctx_init.9 sysctl_ctx_entry_find.9 \
@@ -1551,8 +1560,6 @@ MLINKS+=VOP_CREATE.9 VOP_MKDIR.9 \
 	VOP_CREATE.9 VOP_MKNOD.9 \
 	VOP_CREATE.9 VOP_SYMLINK.9
 MLINKS+=VOP_GETPAGES.9 VOP_PUTPAGES.9
-MLINKS+=VOP_GETVOBJECT.9 VOP_CREATEVOBJECT.9 \
-	VOP_GETVOBJECT.9 VOP_DESTROYVOBJECT.9
 MLINKS+=VOP_INACTIVE.9 VOP_RECLAIM.9
 MLINKS+=VOP_LOCK.9 vn_lock.9 \
 	VOP_LOCK.9 VOP_ISLOCKED.9 \
@@ -1566,7 +1573,6 @@ MLINKS+=vref.9 VREF.9
 MLINKS+=vrele.9 vput.9 \
 	vrele.9 vunref.9
 MLINKS+=vslock.9 vsunlock.9
-MLINKS+=zero_copy.9 zero_copy_sockets.9
 MLINKS+=zone.9 uma.9 \
 	zone.9 uma_zalloc.9 \
 	zone.9 uma_zalloc_arg.9 \
diff --git a/share/man/man9/PCBGROUP.9 b/share/man/man9/PCBGROUP.9
new file mode 100644
index 000000000000..85d1bc011f36
--- /dev/null
+++ b/share/man/man9/PCBGROUP.9
@@ -0,0 +1,221 @@
+.\" Copyright (c) 2014 Adrian Chadd
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd July 23, 2014
+.Dt PCBGROUP 9
+.Os
+.Sh NAME
+.Nm PCBGROUP
+.Nd Distributed Protocol Control Block Groups
+.Sh SYNOPSIS
+.Cd "options PCBGROUP"
+.Pp
+.In sys/param.h
+.In netinet/in.h
+.In netinet/in_pcb.h
+.Ft void
+.Fo in_pcbgroup_init
+.Fa "struct inpcbinfo *pcbinfo" "u_int hashfields" "int hash_nelements"
+.Fc
+.Ft void
+.Fn in_pcbgroup_destroy "struct inpcbinfo *pcbinfo"
+.Ft struct inpcbgroup *
+.Fo in_pcbgroup_byhash
+.Fa "struct inpcbinfo *pcbinfo" "u_int hashtype" "uint32_t hash"
+.Fc
+.Ft struct inpcbgroup *
+.Fn in_pcbgroup_byinpcb "struct inpcb *inp"
+.Ft void
+.Fn in_pcbgroup_update "struct inpcb *inp"
+.Ft void
+.Fn in_pcbgroup_update_mbuf "struct inpcb *inp" "struct mbuf *m"
+.Ft void
+.Fn in_pcbgroup_remove "struct inpcb *inp"
+.Ft int
+.Fn in_pcbgroup_enabled "struct inpcbinfo *pcbinfo"
+.In netinet6/in6_pcb.h
+.Ft struct inpcbgroup *
+.Fo in6_pcbgroup_byhash
+.Fa "struct inpcbinfo *pcbinfo" "u_int hashtype" "uint32_t hash"
+.Fc
+.Sh DESCRIPTION
+This implementation introduces notions of affinity
+for connections and distribute work so as to reduce lock contention,
+with hardware work distribution strategies
+such as RSS.
+In this construction, connection groups supplement, rather than replace,
+existing reservation tables for protocol 4-tuples, offering CPU-affine
+lookup tables with minimal cache line migration and lock contention
+during steady state operation.
+.Pp
+Internet protocols like UDP and TCP register to use connection groups
+by providing an ipi_hashfields value other than IPI_HASHFIELDS_NONE.
+This indicates to the connection group code whether a 2-tuple or
+4-tuple is used as an argument to hashes that assign a connection to
+a particular group.
+This must be aligned with any hardware-offloaded distribution model,
+such as RSS or similar approaches taken in embedded network boards.
+Wildcard sockets require special handling, as in Willmann 2006, and
+are shared between connection groups while being protected by
+group-local locks.
+Connection establishment and teardown can be signficantly more
+expensive than without connection groups, but that steady-state
+processing can be significantly faster.
+.Pp
+Enabling PCBGROUP in the kernel only provides the infrastructure
+required to create and manage multiple PCB groups.
+An implementation needs to fill in a few functions to provide PCB
+group hash information in order for PCBs to be placed in a PCB group.
+.Ss Operation
+By default, each PCB info block (struct pcbinfo) has a single hash for
+all PCB entries for the given protocol with a single lock protecting it.
+This can be a significant source of lock contention on SMP hardware.
+When a PCBGROUP is created, an array of separate hash tables are
+created, each with its own lock.
+A separate table for wildcard PCBs is provided.
+By default, a PCBGROUP table is created for each available CPU.
+The PCBGROUP code attempts to calculate a hash value from the given
+PCB or mbuf when looking up a PCBGROUP.
+While processing a received frame,
+.Fn in_pcbgroup_byhash
+can be used in conjunction with either a hardware-provided hash
+value
+.Po
+eg the
+.Xr RSS 9
+calculated hash value provided by some NICs
+.Pc
+or a software-provided hash value in order to choose a PCBGROUP
+table to query.
+A single table lock is held while performing a wildcard match.
+However, all of the table locks are acquired before modifying the
+wildcard table.
+The PCBGROUP tables operate in conjunction with the normal single PCB list
+in a PCB info block.
+Thus, inserting and removing a PCB will still incur the same costs
+as without PCBGROUP.
+A protocol which uses PCBGROUP should fall back to the normal PCB list
+lookup if a call to the PCBGROUP layer does not yield a lookup hit.
+.Ss Usage
+Initialize a PCBGROUP in a PCB info block
+.Pq Vt "struct pcbinfo"
+by calling
+.Fn in_pcbgroup_init .
+.Pp
+Add a connection to a PCBGROUP with
+.Fn in_pcbgroup_update .
+Connections are removed by with
+.Fn in_pcbgroup_remove .
+These in turn will determine which PCBGROUP bucket the given PCB
+is placed into and calculate the hash value appropriately.
+.Pp
+Wildcard PCBs are hashed differently and placed in a single wildcard
+PCB list.
+If
+.Xr RSS 9
+is enabled and in use, RSS-aware wildcard PCBs are placed in a single
+PCBGROUP based on RSS information.
+Protocols may look up the PCB entry in a PCBGROUP by using the lookup
+functions
+.Fn in_pcbgroup_byhash
+and
+.Fn in_pcbgroup_byinpcb .
+.Sh IMPLEMENTATION NOTES
+The PCB code in
+.Pa sys/netinet
+and
+.Pa sys/netinet6
+is aware of PCBGROUP and will call into the PCBGROUP code to do
+PCBGROUP assignment and lookup, preferring a PCBGROUP lookup to the
+default global PCB info table.
+.Pp
+An implementor wishing to experiment or modify the PCBGROUP assignment
+should modify this set of functions:
+.Bl -tag -width "12345678" -offset indent
+.It Fn in_pcbgroup_getbucket No and Fn in6_pcbgroup_getbucket
+Map a given 32 bit hash value to a PCBGROUP.
+By default this is hash % number_of_pcbgroups.
+However, this distribution may not align with NIC receive queues or
+the
+.Xr netisr 9
+configuration.
+.It Fn in_pcbgroup_byhash No and Fn in6_pcbgroup_byhash
+Map a 32 bit hash value and a hash type identifier to a PCBGROUP.
+By default, this simply returns NULL.
+This function is used by the
+.Xr mbuf 9
+receive path in
+.Pa sys/netinet/in_pcb.c
+to map an mbuf to a PCBGROUP.
+.It Fn in_pcbgroup_bytuple No and Fn in6_pcbgroup_bytuple
+Map the source and destination address and port details to a PCBGROUP.
+By default, this does a very simple XOR hash.
+This function is used by both the PCB lookup code and as a fallback in
+the
+.Xr mbuf 9
+receive path in
+.Pa sys/netinet/in_pcb.c .
+.El
+.Sh SEE ALSO
+.Xr mbuf 9 ,
+.Xr netisr 9 ,
+.Xr RSS 9
+.Rs
+.%A Paul Willmann
+.%A Scott Rixner
+.%A Alan L. Cox
+.%T "An Evaluation of Network Stack Parallelization Strategies in Modern Operating Systems"
+.%J "2006 USENIX Annual Technical Conference"
+.%D 2006
+.%U http://www.ece.rice.edu/~willmann/pubs/paranet_usenix.pdf
+.Re
+.Sh HISTORY
+PCBGROUP first appeared in
+.Fx 9.0 .
+.Sh AUTHORS
+.An -nosplit
+The PCBGROUP implementation was written by
+.An Robert N. M. Watson Aq Mt rwatson@FreeBSD.org
+under contract to Juniper Networks, Inc.
+.Pp
+This manual page written by
+.An Adrian Chadd Aq Mt adrian@FreeBSD.org .
+.Sh NOTES
+The
+.Xr RSS 9
+implementation currently uses
+.Ic #ifdef
+blocks to tie into PCBGROUP.
+This is a sign that a more abstract programming API is needed.
+.Pp
+There is currently no support for re-balancing the PCBGROUP assignment,
+nor is there any support for overriding which PCBGROUP a socket/PCB
+should be in.
+.Pp
+No statistics are kept to indicate how often PCBGROUP lookups
+succeed or fail.
diff --git a/share/man/man9/SDT.9 b/share/man/man9/SDT.9
index 1f821cf8d904..91bf4b1caf70 100644
--- a/share/man/man9/SDT.9
+++ b/share/man/man9/SDT.9
@@ -278,9 +278,9 @@ SDT_PROBE_DEFINE1_XLATE(ip, , , receive, "struct icmp *",
 DTrace and the
 .Nm
 framework were originally ported to FreeBSD from Solaris by
-.An John Birrell Aq jb@FreeBSD.org .
+.An John Birrell Aq Mt jb@FreeBSD.org .
 This manual page was written by
-.An Mark Johnston Aq markj@FreeBSD.org .
+.An Mark Johnston Aq Mt markj@FreeBSD.org .
 .Sh BUGS
 The
 .Nm
diff --git a/share/man/man9/SYSCALL_MODULE.9 b/share/man/man9/SYSCALL_MODULE.9
index 973adebf2cfb..b803bcec11e3 100644
--- a/share/man/man9/SYSCALL_MODULE.9
+++ b/share/man/man9/SYSCALL_MODULE.9
@@ -81,4 +81,4 @@ A minimal example for a syscall module can be found in
 .Pa /usr/share/examples/kld/syscall/module/syscall.c
 .Sh AUTHORS
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/SYSINIT.9 b/share/man/man9/SYSINIT.9
index 1837d25d4849..28701f25f030 100644
--- a/share/man/man9/SYSINIT.9
+++ b/share/man/man9/SYSINIT.9
@@ -157,7 +157,7 @@ framework first appeared in
 The
 .Nm
 framework was written by
-.An Terrence Lambert Aq terry@FreeBSD.org .
+.An Terrence Lambert Aq Mt terry@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Hiten Pandya Aq hmp@FreeBSD.org .
+.An Hiten Pandya Aq Mt hmp@FreeBSD.org .
diff --git a/share/man/man9/VFS_SET.9 b/share/man/man9/VFS_SET.9
index 25acc86bd6c0..c35935e6c476 100644
--- a/share/man/man9/VFS_SET.9
+++ b/share/man/man9/VFS_SET.9
@@ -108,4 +108,4 @@ VFS_SET(myfs_vfsops, myfs, 0);
 .Xr vfs_modevent 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/VOP_GETVOBJECT.9 b/share/man/man9/VOP_GETVOBJECT.9
deleted file mode 100644
index 47741d1225be..000000000000
--- a/share/man/man9/VOP_GETVOBJECT.9
+++ /dev/null
@@ -1,113 +0,0 @@
-.\" -*- nroff -*-
-.\"
-.\" Copyright (c) 2000 Boris Popov
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this 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 September 10, 2000
-.Dt VOP_CREATEVOBJECT 9
-.Os
-.Sh NAME
-.Nm VOP_CREATEVOBJECT ,
-.Nm VOP_DESTROYVOBJECT ,
-.Nm VOP_GETVOBJECT
-.Nd VM object interaction
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/vnode.h
-.Ft int
-.Fn VOP_CREATEVOBJECT "struct vnode *vp" "struct ucred *cred" "struct thread *td"
-.Ft int
-.Fn VOP_DESTROYVOBJECT "struct vnode *vp"
-.Ft int
-.Fn VOP_GETVOBJECT "struct vnode *vp" "struct vm_object **objpp"
-.Sh DESCRIPTION
-These calls are used to control the association of a VM object
-with a particular vnode.
-.Pp
-The arguments specific to these functions are:
-.Bl -tag -width objpp
-.It Fa vp
-The vnode of the file.
-.It Fa objpp
-The VM object being returned, or
-.Dv NULL
-if the caller wants to test for the existence
-of the VM object.
-.El
-.Pp
-.Xr VFS 9
-invokes
-.Fn VOP_CREATEVOBJECT
-when it needs to create a VM object for the given
-.Xr vnode 9 .
-File system code may pass this call down to the underlying file system.
-This VOP can be called multiple times,
-and file system code should ignore any additional calls,
-exiting with a zero return code.
-.Pp
-.Fn VOP_DESTROYVOBJECT
-is called when a
-.Xr vnode 9
-is recycled.
-.Pp
-.Fn VOP_GETVOBJECT
-should be used by all kernel code to get a VM object.
-.\" XXX What is the next sentence trying to tell people?
-The returned VM object may belong to a different file system in the case
-of stacked mounts.
-.Pp
-.Xr VFS 9
-has three functions which perform standard operations by creating
-and destroying VM objects.
-These functions are:
-.Fn vop_stdcreatevobject ,
-.Fn vop_stddestroyvobject
-and
-.Fn vop_stdgetvobject .
-.Pp
-.Em Note :
-a
-.Xr vnode 9
-should be locked on entry and must be left locked on exit.
-.Sh RETURN VALUES
-The
-.Fn VOP_CREATEVOBJECT ,
-.Fn VOP_DESTROYVOBJECT
-and
-.Fn VOP_GETVOBJECT
-functions return zero on success, or a non-zero value on failure.
-Zero is returned on success, otherwise an error is returned.
-.Sh EXAMPLES
-.\" XXX Why is this code here when it does not use the functions
-.\" described in this manual page?
-By default, file systems leave VM object handling to the
-.Fn vop_std*
-functions.
-.Sh SEE ALSO
-.Xr vnode 9 ,
-.Xr VOP_GETPAGES 9 ,
-.Xr VOP_PUTPAGES 9
-.Sh AUTHORS
-This manual page was written by
-.An Boris Popov .
diff --git a/share/man/man9/VOP_INACTIVE.9 b/share/man/man9/VOP_INACTIVE.9
index 2f1e4ed60bd6..6c71d03659ce 100644
--- a/share/man/man9/VOP_INACTIVE.9
+++ b/share/man/man9/VOP_INACTIVE.9
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 24, 1996
+.Dd July 27, 2014
 .Dt VOP_INACTIVE 9
 .Os
 .Sh NAME
@@ -63,17 +63,14 @@ is called when a vnode is being reused for a different file system.
 Any file system specific resources associated with the vnode should be
 freed.
 .Sh LOCKS
-For VOP_INACTIVE, the
+For both
+.Fn VOP_INACTIVE
+and
+.Fn VOP_RECLAIM ,
+the
 .Fa vp
-will be locked on entry.
-Your VOP_INACTIVE code
-must unlock the
-.Fa vp
-prior to returning.
-.Pp
-For VOP_RECLAIM, the
-.Fa vp
-will not be locked on entry and should be left unlocked on return.
+will be exclusively locked on entry, and must be left exclusively
+locked on return.
 .Sh SEE ALSO
 .Xr vnode 9
 .Sh AUTHORS
diff --git a/share/man/man9/alq.9 b/share/man/man9/alq.9
index 65c2d07d93e8..b8b0c237b06c 100644
--- a/share/man/man9/alq.9
+++ b/share/man/man9/alq.9
@@ -431,11 +431,11 @@ Asynchronous Logging Queues (ALQ) facility first appeared in
 The
 .Nm
 facility was written by
-.An Jeffrey Roberson Aq jeff@FreeBSD.org
+.An Jeffrey Roberson Aq Mt jeff@FreeBSD.org
 and extended by
-.An Lawrence Stewart Aq lstewart@freebsd.org .
+.An Lawrence Stewart Aq Mt lstewart@freebsd.org .
 .Pp
 This manual page was written by
-.An Hiten Pandya Aq hmp@FreeBSD.org
+.An Hiten Pandya Aq Mt hmp@FreeBSD.org
 and revised by
-.An Lawrence Stewart Aq lstewart@freebsd.org .
+.An Lawrence Stewart Aq Mt lstewart@freebsd.org .
diff --git a/share/man/man9/atomic.9 b/share/man/man9/atomic.9
index 44d800e8bec3..a9ce842b1834 100644
--- a/share/man/man9/atomic.9
+++ b/share/man/man9/atomic.9
@@ -169,10 +169,6 @@ On the
 .Tn i386
 architecture, the cache coherency model requires that the hardware perform
 this task, thus the atomic operations are atomic across multiple processors.
-On the
-.Tn ia64
-architecture, coherency is only guaranteed for pages that are configured to
-using a caching policy of either uncached or write back.
 .Ss Semantics
 This section describes the semantics of each operation using a C like notation.
 .Bl -hang
diff --git a/share/man/man9/bus_activate_resource.9 b/share/man/man9/bus_activate_resource.9
index eb5b3e824e79..12d202c8d745 100644
--- a/share/man/man9/bus_activate_resource.9
+++ b/share/man/man9/bus_activate_resource.9
@@ -90,4 +90,4 @@ Zero is returned on success, otherwise an error is returned.
 .Xr driver 9
 .Sh AUTHORS
 This manual page was written by
-.An Warner Losh Aq imp@FreeBSD.org .
+.An Warner Losh Aq Mt imp@FreeBSD.org .
diff --git a/share/man/man9/bus_alloc_resource.9 b/share/man/man9/bus_alloc_resource.9
index 388a7f3123a1..78959a02a1cf 100644
--- a/share/man/man9/bus_alloc_resource.9
+++ b/share/man/man9/bus_alloc_resource.9
@@ -178,6 +178,6 @@ should be saved in the softc of the device after these calls.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Alexander Langer Aq alex@big.endian.de
+.An Alexander Langer Aq Mt alex@big.endian.de
 with parts by
-.An Warner Losh Aq imp@FreeBSD.org .
+.An Warner Losh Aq Mt imp@FreeBSD.org .
diff --git a/share/man/man9/bus_child_present.9 b/share/man/man9/bus_child_present.9
index 12577ad3d54b..4ba967ad6e03 100644
--- a/share/man/man9/bus_child_present.9
+++ b/share/man/man9/bus_child_present.9
@@ -84,4 +84,4 @@ if (bus_child_present(dev))
 .Xr driver 9
 .Sh AUTHORS
 This manual page was written by
-.An Warner Losh Aq imp@FreeBSD.org .
+.An Warner Losh Aq Mt imp@FreeBSD.org .
diff --git a/share/man/man9/bus_release_resource.9 b/share/man/man9/bus_release_resource.9
index 35e70d994a10..731eda3b975a 100644
--- a/share/man/man9/bus_release_resource.9
+++ b/share/man/man9/bus_release_resource.9
@@ -103,4 +103,4 @@ The kernel will panic, if it cannot release the resource.
 .Xr driver 9
 .Sh AUTHORS
 This manual page was written by
-.An Alexander Langer Aq alex@big.endian.de .
+.An Alexander Langer Aq Mt alex@big.endian.de .
diff --git a/share/man/man9/bus_set_resource.9 b/share/man/man9/bus_set_resource.9
index cda47b62b682..2eb24bf5db1e 100644
--- a/share/man/man9/bus_set_resource.9
+++ b/share/man/man9/bus_set_resource.9
@@ -93,4 +93,4 @@ Zero is returned on success, otherwise an error is returned.
 .Xr driver 9
 .Sh AUTHORS
 This manual page was written by
-.An Warner Losh Aq imp@FreeBSD.org .
+.An Warner Losh Aq Mt imp@FreeBSD.org .
diff --git a/share/man/man9/cd.9 b/share/man/man9/cd.9
index 4ed2d52a531e..364a605ed8dc 100644
--- a/share/man/man9/cd.9
+++ b/share/man/man9/cd.9
@@ -116,8 +116,8 @@ manual page first appeared in
 .An -nosplit
 This
 manual page was written by
-.An John-Mark Gurney Aq jmg@FreeBSD.org .
+.An John-Mark Gurney Aq Mt jmg@FreeBSD.org .
 It was updated for CAM and
 .Fx 3.0
 by
-.An Kenneth Merry Aq ken@FreeBSD.org .
+.An Kenneth Merry Aq Mt ken@FreeBSD.org .
diff --git a/share/man/man9/config_intrhook.9 b/share/man/man9/config_intrhook.9
index 083a2a2a375c..60bf9d848587 100644
--- a/share/man/man9/config_intrhook.9
+++ b/share/man/man9/config_intrhook.9
@@ -100,6 +100,6 @@ with the CAM subsystem, but are available for any driver to use.
 .Sh AUTHORS
 .An -nosplit
 The functions were written by
-.An Justin Gibbs Aq gibbs@FreeBSD.org .
+.An Justin Gibbs Aq Mt gibbs@FreeBSD.org .
 This manual page was written by
-.An M. Warner Losh Aq imp@FreeBSD.org .
+.An M. Warner Losh Aq Mt imp@FreeBSD.org .
diff --git a/share/man/man9/crypto.9 b/share/man/man9/crypto.9
index c9a999691cf3..8ed30d9cdd4a 100644
--- a/share/man/man9/crypto.9
+++ b/share/man/man9/crypto.9
@@ -648,7 +648,7 @@ most of the framework code
 The cryptographic framework first appeared in
 .Ox 2.7
 and was written by
-.An "Angelos D. Keromytis" Aq angelos@openbsd.org .
+.An Angelos D. Keromytis Aq Mt angelos@openbsd.org .
 .Sh BUGS
 The framework currently assumes that all the algorithms in a
 .Fn crypto_newsession
diff --git a/share/man/man9/devstat.9 b/share/man/man9/devstat.9
index 7ed7ec13975d..ad1393415a50 100644
--- a/share/man/man9/devstat.9
+++ b/share/man/man9/devstat.9
@@ -431,7 +431,7 @@ The
 statistics system appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.org
+.An Kenneth Merry Aq Mt ken@FreeBSD.org
 .Sh BUGS
 There may be a need for
 .Fn spl
diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9
index e07bdedff602..14ae52b04bb7 100644
--- a/share/man/man9/domain.9
+++ b/share/man/man9/domain.9
@@ -111,7 +111,7 @@ struct protosw {
 	pr_slowtimo_t *pr_slowtimo;	/* slow timeout (500ms) */
 	pr_drain_t *pr_drain;		/* flush any excess space possible */
 
-	struct	pr_usrreqs *pr_usrreqs;	/* supersedes pr_usrreq() */
+	struct	pr_usrreqs *pr_usrreqs;	/* user-protocol hook */
 };
 .Ed
 .Pp
@@ -240,4 +240,4 @@ types if the domain has a default raw protocol.
 .Xr socket 2
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/eventtimers.9 b/share/man/man9/eventtimers.9
index 0c28d76b01c6..09cd8b3e6616 100644
--- a/share/man/man9/eventtimers.9
+++ b/share/man/man9/eventtimers.9
@@ -250,4 +250,4 @@ timer hardware access.
 .Sh SEE ALSO
 .Xr eventtimers 4
 .Sh AUTHORS
-.An Alexander Motin Aq mav@FreeBSD.org
+.An Alexander Motin Aq Mt mav@FreeBSD.org
diff --git a/share/man/man9/fail.9 b/share/man/man9/fail.9
index 6a3d815d6c7a..8dbba1b568c1 100644
--- a/share/man/man9/fail.9
+++ b/share/man/man9/fail.9
@@ -191,7 +191,7 @@ Return 5 once, when pid 1234 executes the fail point.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Zach Loafman Aq zml@FreeBSD.org .
+.An Zach Loafman Aq Mt zml@FreeBSD.org .
 .Sh CAVEATS
 It is easy to shoot yourself in the foot by setting fail points too
 aggressively or setting too many in combination.
diff --git a/share/man/man9/firmware.9 b/share/man/man9/firmware.9
index 48119213e23a..f8c8b322d90d 100644
--- a/share/man/man9/firmware.9
+++ b/share/man/man9/firmware.9
@@ -269,4 +269,4 @@ system was introduced in
 .Fx 6.1 .
 .Sh AUTHORS
 This manual page was written by
-.An Max Laier Aq mlaier@FreeBSD.org .
+.An Max Laier Aq Mt mlaier@FreeBSD.org .
diff --git a/share/man/man9/fpu_kern.9 b/share/man/man9/fpu_kern.9
new file mode 100644
index 000000000000..207e5e805422
--- /dev/null
+++ b/share/man/man9/fpu_kern.9
@@ -0,0 +1,195 @@
+.\" Copyright (c) 2014
+.\"	Konstantin Belousov <kib@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$
+.\"
+.Dd June 23, 2014
+.Dt FPU_KERN 9
+.Os
+.Sh NAME
+.Nm fpu_kern
+.Nd "facility to use the FPU in the kernel"
+.Sh SYNOPSIS
+.Ft struct fpu_kern_ctx *
+.Fn fpu_kern_alloc_ctx "u_int flags"
+.Ft void
+.Fn fpu_kern_free_ctx "struct fpu_kern_ctx *ctx"
+.Ft int
+.Fn fpu_kern_enter "struct thread *td" "struct fpu_kern_ctx *ctx" "u_int flags"
+.Ft int
+.Fn fpu_kern_leave "struct thread *td" "struct fpu_kern_ctx *ctx"
+.Ft int
+.Fn fpu_kern_thread "u_int flags"
+.Ft int
+.Fn is_fpu_kern_thread "u_int flags"
+.Sh DESCRIPTION
+The
+.Nm
+family of functions allows the use of FPU hardware in kernel code.
+Modern FPUs are not limited to providing hardware implementation for
+floating point arithmetic; they offer advanced accelerators for cryptography
+and other computational-intensive algorithms.
+These facilities share registers with the FPU hardware.
+.Pp
+Typical kernel code does not need access to the FPU.
+Saving a large register file on each entry to the kernel would waste
+time.
+When kernel code uses the FPU, the current FPU state must be saved to
+avoid corrupting the user-mode state, and vice versa.
+.Pp
+The management of the save and restore is automatic.
+The processor catches accesses to the FPU registers
+when the non-current context tries to access them.
+Explicit calls are required for the allocation of the save area and
+the notification of the start and end of the code using the FPU.
+.Pp
+The
+.Fn fpu_kern_alloc_ctx
+function allocates the memory used by
+.Nm
+to track the use of the FPU hardware state and the related software state.
+The
+.Fn fpu_kern_alloc_ctx
+function requires the
+.Fa flags
+argument, which currently accepts the following flags:
+.Bl -tag -width ".Dv FPU_KERN_NOWAIT" -offset indent
+.It Dv FPU_KERN_NOWAIT
+Do not wait for the available memory if the request could not be satisfied
+without sleep.
+.It 0
+No special handling is required.
+.El
+.Pp
+The function returns the allocated context area, or
+.Va NULL
+if the allocation failed.
+.Pp
+The
+.Fn fpu_kern_free_ctx
+function frees the context previously allocated by
+.Fn fpu_kern_alloc_ctx .
+.Pp
+The
+.Fn fpu_kern_enter
+function designates the start of the region of kernel code where the
+use of the FPU is allowed.
+Its arguments are:
+.Bl -tag -width ".Fa ctx" -offset indent
+.It Fa td
+Currently must be
+.Va curthread .
+.It Fa ctx
+The context save area previously allocated by
+.Fn fpu_kern_alloc_ctx
+and not currently in use by another call to
+.Fn fpu_kern_enter .
+.It Fa flags
+This argument currently accepts the following flags:
+.Bl -tag -width ".Dv FPU_KERN_NORMAL" -offset indent
+.It Dv FPU_KERN_NORMAL
+Indicates that the caller intends to access the full FPU state.
+Must be specified currently.
+.It Dv FPU_KERN_KTHR
+Indicates that no saving of the current FPU state should be performed,
+if the thread called
+.Xr fpu_kern_thread 9
+function.
+This is intended to minimize code duplication in callers which
+could be used from both kernel thread and syscall contexts.
+The
+.Fn fpu_kern_leave
+function correctly handles such contexts.
+.El
+.El
+.Pp
+The function does not sleep or block.
+It could cause the
+.Nm Device Not Available
+exception during execution, and on the first FPU access after the
+function returns, as well as after each context switch
+(see Intel Software Developer Manual for the reference).
+Currently, no errors are defined which can be returned by
+.Fn fpu_kern_enter
+to the caller.
+.Pp
+The
+.Fn fpu_kern_leave
+function ends the region started by
+.Fn fpu_kern_enter .
+The uses of FPU in the kernel after the call to
+.Fn fpu_kern_leave
+are erronous until the next call to
+.Fn fpu_kern_enter
+is performed.
+The function takes the
+.Fa td
+thread argument, which currently must be
+.Va curthread ,
+and the
+.Fa ctx
+context pointer, previously passed to
+.Fn fpu_kern_enter .
+After the function returns, the context may be freed or reused
+by other invocation of
+.Fn fpu_kern_enter .
+There are no errors defined for the function, it always returns 0.
+.Pp
+The
+.Fn fpu_kern_thread
+function provides an optimization for threads which never leave to
+the usermode.
+Such thread can reuse the usermode save area for the FPU state,
+which is allowed by the function call.
+There is no flags defined for the function, and no error states
+that the function returns.
+.Pp
+The
+.Fn is_fpu_kern_thread
+function returns the boolean indicating whether the current thread
+entered the mode enabled by
+.Fn fpu_kern_thread .
+There is currently no flags defined for the function, the return
+value is true if the current thread have the permanent FPU save area,
+and false otherwise.
+.Sh NOTES
+The
+.Nm
+is currently implemented only for the i386 and amd64 architectures.
+.Pp
+There is no way to handle floating point exceptions raised from
+kernel mode.
+.Pp
+The unused
+.Fa flags
+arguments
+to the
+.Nm
+functions are to be extended to allow specification of the
+set of the FPU hardware state used by the code region.
+This would allow optimizations of saving and restoring the state.
+.Sh AUTHORS
+The
+.Nm
+facitily and this manual page were written by
+.An Konstantin Belousov Aq Mt kib@FreeBSD.org .
diff --git a/share/man/man9/g_access.9 b/share/man/man9/g_access.9
index 95ad1da91a32..fcfc86958581 100644
--- a/share/man/man9/g_access.9
+++ b/share/man/man9/g_access.9
@@ -162,4 +162,4 @@ Any other error that can be returned by the provider's access method.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_attach.9 b/share/man/man9/g_attach.9
index 4bf7d9c51493..c5cdf5a8e959 100644
--- a/share/man/man9/g_attach.9
+++ b/share/man/man9/g_attach.9
@@ -138,4 +138,4 @@ The operation creates a topology loop.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_bio.9 b/share/man/man9/g_bio.9
index e7351b8054e4..e3ac64e94e86 100644
--- a/share/man/man9/g_bio.9
+++ b/share/man/man9/g_bio.9
@@ -274,4 +274,4 @@ example_start(struct bio *bp)
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_consumer.9 b/share/man/man9/g_consumer.9
index e30fb80280b5..1cdcacd8d975 100644
--- a/share/man/man9/g_consumer.9
+++ b/share/man/man9/g_consumer.9
@@ -134,4 +134,4 @@ some_function(struct g_geom *mygeom, struct g_provider *pp)
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_data.9 b/share/man/man9/g_data.9
index f5cd6961a04a..724854e23dcd 100644
--- a/share/man/man9/g_data.9
+++ b/share/man/man9/g_data.9
@@ -119,4 +119,4 @@ An I/O error occurred while reading from or writing to the consumer.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_event.9 b/share/man/man9/g_event.9
index 380caa82a0b8..0bdd0ab6688b 100644
--- a/share/man/man9/g_event.9
+++ b/share/man/man9/g_event.9
@@ -186,4 +186,4 @@ and there was insufficient memory.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_geom.9 b/share/man/man9/g_geom.9
index 2f4599d60ba6..2b4aac84ce93 100644
--- a/share/man/man9/g_geom.9
+++ b/share/man/man9/g_geom.9
@@ -203,4 +203,4 @@ destroy_example_geom(struct g_geom *gp)
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_provider.9 b/share/man/man9/g_provider.9
index 05e4addabf36..b22ae0bc9044 100644
--- a/share/man/man9/g_provider.9
+++ b/share/man/man9/g_provider.9
@@ -142,4 +142,4 @@ create_example_provider(struct g_geom *gp)
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_provider_by_name.9 b/share/man/man9/g_provider_by_name.9
index 58da421a243d..56dd303298b6 100644
--- a/share/man/man9/g_provider_by_name.9
+++ b/share/man/man9/g_provider_by_name.9
@@ -74,4 +74,4 @@ if there is no such provider.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/g_wither_geom.9 b/share/man/man9/g_wither_geom.9
index 8ced94948dda..337d9628d6d2 100644
--- a/share/man/man9/g_wither_geom.9
+++ b/share/man/man9/g_wither_geom.9
@@ -83,4 +83,4 @@ The topology lock has to be held.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
diff --git a/share/man/man9/get_cyclecount.9 b/share/man/man9/get_cyclecount.9
index eabaeb1fa806..ed57e4e065e9 100644
--- a/share/man/man9/get_cyclecount.9
+++ b/share/man/man9/get_cyclecount.9
@@ -78,11 +78,6 @@ processors use the
 .Li TSC
 register.
 .Pp
-The
-.Tn IA64
-processors use the
-.Li AR.ITC
-register.
 .Sh SEE ALSO
 .Xr binuptime 9
 .Sh HISTORY
@@ -92,4 +87,4 @@ function first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Mark Murray Aq markm@FreeBSD.org .
+.An Mark Murray Aq Mt markm@FreeBSD.org .
diff --git a/share/man/man9/getnewvnode.9 b/share/man/man9/getnewvnode.9
index 2e81212630fd..57ecc986c7cd 100644
--- a/share/man/man9/getnewvnode.9
+++ b/share/man/man9/getnewvnode.9
@@ -66,4 +66,4 @@ returns 0 on success.
 There are currently no failure conditions - that do not result in a panic.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/groupmember.9 b/share/man/man9/groupmember.9
index 0d3629a1ad45..84d57e63208e 100644
--- a/share/man/man9/groupmember.9
+++ b/share/man/man9/groupmember.9
@@ -57,4 +57,4 @@ If the
 is found, 1 is returned; otherwise, 0 is returned.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/hhook.9 b/share/man/man9/hhook.9
index ca6b4940fa3e..f572fd2778d6 100644
--- a/share/man/man9/hhook.9
+++ b/share/man/man9/hhook.9
@@ -374,9 +374,9 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 framework was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
 .Pp
 This manual page was written by
-.An David Hayes Aq david.hayes@ieee.org
+.An David Hayes Aq Mt david.hayes@ieee.org
 and
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man9/ieee80211_radiotap.9 b/share/man/man9/ieee80211_radiotap.9
index cea2eb4e7f1a..3a6700710519 100644
--- a/share/man/man9/ieee80211_radiotap.9
+++ b/share/man/man9/ieee80211_radiotap.9
@@ -297,6 +297,6 @@ definitions first appeared in
 .Sh AUTHORS
 .An -nosplit
 The original version of this manual page was written by
-.An Bruce M. Simpson Aq bms@FreeBSD.org
+.An Bruce M. Simpson Aq Mt bms@FreeBSD.org
 and
-.An Darron Broad Aq darron@kewl.org .
+.An Darron Broad Aq Mt darron@kewl.org .
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index f1d3e471bc6a..ae210726e792 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 5, 2013
+.Dd July 29, 2014
 .Dt IFNET 9
 .Os
 .Sh NAME
@@ -1084,10 +1084,6 @@ address in the route table.
 .It Va ifa_refcnt
 .Pq Vt short
 The reference count.
-.It Va ifa_metric
-.Pq Vt int
-A metric associated with this interface address, for the use of some
-external routing protocol.
 .El
 .Pp
 References to
@@ -1370,7 +1366,6 @@ function is called to perform the operation; qq.v.
 .It Dv SIOCDIFADDR
 The socket's protocol control routine is called to implement the
 requested action.
-.Pp
 .El
 .El
 .Pp
diff --git a/share/man/man9/insmntque.9 b/share/man/man9/insmntque.9
index e2bf0d577b71..ae94d901b755 100644
--- a/share/man/man9/insmntque.9
+++ b/share/man/man9/insmntque.9
@@ -92,4 +92,4 @@ even if the file system is being unmounted.
 .Xr vgone 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/kernel_mount.9 b/share/man/man9/kernel_mount.9
index 4164e5b9c8db..873f522fa1f7 100644
--- a/share/man/man9/kernel_mount.9
+++ b/share/man/man9/kernel_mount.9
@@ -194,7 +194,7 @@ must come in pairs, e.g.,
 .Ed
 .Sh SEE ALSO
 .Xr VFS 9 ,
-.Xr VFS_MOUNT 9 ,
+.Xr VFS_MOUNT 9
 .Sh HISTORY
 The
 .Fn kernel_mount
@@ -206,6 +206,6 @@ appeared in
 The
 .Fn kernel_mount
 family of functions and API was developed by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/share/man/man9/khelp.9 b/share/man/man9/khelp.9
index 2f3f0e1284d9..667bccc3642c 100644
--- a/share/man/man9/khelp.9
+++ b/share/man/man9/khelp.9
@@ -430,9 +430,9 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 framework was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
 .Pp
 This manual page was written by
-.An David Hayes Aq david.hayes@ieee.org
+.An David Hayes Aq Mt david.hayes@ieee.org
 and
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man9/kqueue.9 b/share/man/man9/kqueue.9
index 29ae5f7a76ae..28aadee776ba 100644
--- a/share/man/man9/kqueue.9
+++ b/share/man/man9/kqueue.9
@@ -463,4 +463,4 @@ by
 .Sh AUTHORS
 This
 manual page was written by
-.An John-Mark Gurney Aq jmg@FreeBSD.org .
+.An John-Mark Gurney Aq Mt jmg@FreeBSD.org .
diff --git a/share/man/man9/kthread.9 b/share/man/man9/kthread.9
index 25a20cecf9ed..b7c0388bf8b2 100644
--- a/share/man/man9/kthread.9
+++ b/share/man/man9/kthread.9
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 24, 2010
+.Dd July 15, 2014
 .Dt KTHREAD 9
 .Os
 .Sh NAME
@@ -275,7 +275,7 @@ buf_daemon()
 	    bufdaemonthread, SHUTDOWN_PRI_LAST);
 	...
 	for (;;) {
-		kthread_suspend_check(bufdaemonthread);
+		kthread_suspend_check();
 		...
 	}
 }
diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9
index cb77686140be..22fa2f7de416 100644
--- a/share/man/man9/lock.9
+++ b/share/man/man9/lock.9
@@ -397,4 +397,4 @@ will be the result of trying.
 .Xr VOP_PRINT 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/mbchain.9 b/share/man/man9/mbchain.9
index 4e05e7ad3ec9..3603ba188991 100644
--- a/share/man/man9/mbchain.9
+++ b/share/man/man9/mbchain.9
@@ -219,4 +219,4 @@ mb_done(mbp);
 .Xr mdchain 9
 .Sh AUTHORS
 This manual page was written by
-.An Boris Popov Aq bp@FreeBSD.org .
+.An Boris Popov Aq Mt bp@FreeBSD.org .
diff --git a/share/man/man9/mbpool.9 b/share/man/man9/mbpool.9
index 600c37179fb4..e9cd7a244e49 100644
--- a/share/man/man9/mbpool.9
+++ b/share/man/man9/mbpool.9
@@ -255,7 +255,7 @@ the number of buffers on the free list.
 .Sh SEE ALSO
 .Xr mbuf 9
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
 .Sh CAVEATS
 The function
 .Fn mbp_sync
diff --git a/share/man/man9/mbuf_tags.9 b/share/man/man9/mbuf_tags.9
index cab22a00f7f2..c812a3f25bd7 100644
--- a/share/man/man9/mbuf_tags.9
+++ b/share/man/man9/mbuf_tags.9
@@ -283,4 +283,4 @@ Inlined functions are defined in
 The packet tags first appeared in
 .Ox 2.9
 and were written by
-.An Angelos D. Keromytis Aq angelos@openbsd.org .
+.An Angelos D. Keromytis Aq Mt angelos@openbsd.org .
diff --git a/share/man/man9/mdchain.9 b/share/man/man9/mdchain.9
index 5b0bf4ace4ff..ed25c1eb6f20 100644
--- a/share/man/man9/mdchain.9
+++ b/share/man/man9/mdchain.9
@@ -208,4 +208,4 @@ mb_done(mdp);
 .Xr mbuf 9
 .Sh AUTHORS
 This manual page was written by
-.An Boris Popov Aq bp@FreeBSD.org .
+.An Boris Popov Aq Mt bp@FreeBSD.org .
diff --git a/share/man/man9/memguard.9 b/share/man/man9/memguard.9
index 9ce773a3cfae..42678c05223b 100644
--- a/share/man/man9/memguard.9
+++ b/share/man/man9/memguard.9
@@ -196,13 +196,13 @@ first appeared in
 .An -nosplit
 .Nm
 was originally written by
-.An Bosko Milekic Aq bmilekic@FreeBSD.org .
+.An Bosko Milekic Aq Mt bmilekic@FreeBSD.org .
 This manual page was originally written by
-.An Christian Brueffer Aq brueffer@FreeBSD.org .
+.An Christian Brueffer Aq Mt brueffer@FreeBSD.org .
 Additions have been made by
-.An Matthew Fleming Aq mdf@FreeBSD.org
+.An Matthew Fleming Aq Mt mdf@FreeBSD.org
 and
-.An Gleb Smirnoff Aq glebius@FreeBSD.org
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org
 to both the implementation and the documentation.
 .Sh BUGS
 It is not possible to guard allocations that really expect themselves to be
diff --git a/share/man/man9/microtime.9 b/share/man/man9/microtime.9
index 3288578e1736..f5ea65d1fc34 100644
--- a/share/man/man9/microtime.9
+++ b/share/man/man9/microtime.9
@@ -118,4 +118,4 @@ but have existed in other incarnations since
 .Bx 4.4 .
 .Sh AUTHORS
 This manual page was written by
-.An Kelly Yancey Aq kbyanc@posi.net .
+.An Kelly Yancey Aq Mt kbyanc@posi.net .
diff --git a/share/man/man9/microuptime.9 b/share/man/man9/microuptime.9
index 5a9a71befd48..048143dcb80c 100644
--- a/share/man/man9/microuptime.9
+++ b/share/man/man9/microuptime.9
@@ -120,4 +120,4 @@ execution time.
 .Xr tvtohz 9
 .Sh AUTHORS
 This manual page was written by
-.An Kelly Yancey Aq kbyanc@posi.net .
+.An Kelly Yancey Aq Mt kbyanc@posi.net .
diff --git a/share/man/man9/mod_cc.9 b/share/man/man9/mod_cc.9
index d753a3c125d8..12bc9be38f66 100644
--- a/share/man/man9/mod_cc.9
+++ b/share/man/man9/mod_cc.9
@@ -322,12 +322,12 @@ http://caia.swin.edu.au/urp/newtcp/
 The
 .Nm
 framework was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org ,
-.An James Healy Aq jimmy@deefa.com
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org ,
+.An James Healy Aq Mt jimmy@deefa.com
 and
-.An David Hayes Aq david.hayes@ieee.org .
+.An David Hayes Aq Mt david.hayes@ieee.org .
 .Pp
 This manual page was written by
-.An David Hayes Aq david.hayes@ieee.org
+.An David Hayes Aq Mt david.hayes@ieee.org
 and
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man9/module.9 b/share/man/man9/module.9
index bd072a92dee9..274b3b450244 100644
--- a/share/man/man9/module.9
+++ b/share/man/man9/module.9
@@ -118,4 +118,4 @@ DECLARE_MODULE(foo, mod_data, SI_SUB_EXEC, SI_ORDER_ANY);
 .Pa /usr/share/examples/kld
 .Sh AUTHORS
 This manual page was written by
-.An Alexander Langer Aq alex@FreeBSD.org .
+.An Alexander Langer Aq Mt alex@FreeBSD.org .
diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9
index 95c20a322c74..0bd827f2cd5e 100644
--- a/share/man/man9/namei.9
+++ b/share/man/man9/namei.9
@@ -347,9 +347,9 @@ An attempt is made to modify a file or directory on a read-only file system.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Eivind Eklund Aq eivind@FreeBSD.org
+.An Eivind Eklund Aq Mt eivind@FreeBSD.org
 and later significantly revised by
-.An Hiten M. Pandya Aq hmp@FreeBSD.org .
+.An Hiten M. Pandya Aq Mt hmp@FreeBSD.org .
 .Sh BUGS
 The
 .Dv LOCKPARENT
diff --git a/share/man/man9/osd.9 b/share/man/man9/osd.9
index ba9c632e1d0c..e8260fe46338 100644
--- a/share/man/man9/osd.9
+++ b/share/man/man9/osd.9
@@ -384,7 +384,7 @@ Object Specific Data (OSD) facility first appeared in
 The
 .Nm
 facility was written by
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org .
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Lawrence Stewart Aq lstewart@FreeBSD.org .
+.An Lawrence Stewart Aq Mt lstewart@FreeBSD.org .
diff --git a/share/man/man9/pbuf.9 b/share/man/man9/pbuf.9
index 4329ac9c84fe..6cf6d3944bfd 100644
--- a/share/man/man9/pbuf.9
+++ b/share/man/man9/pbuf.9
@@ -129,4 +129,4 @@ In the case of
 can also be returned indicating that there are no buffers available.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9
index 28bae85ff238..411c11a57cfa 100644
--- a/share/man/man9/pci.9
+++ b/share/man/man9/pci.9
@@ -695,10 +695,11 @@ space on the target architecture.
 .%O ISBN 0-201-30974-2
 .Re
 .Sh AUTHORS
+.An -nosplit
 This manual page was written by
-.An Bruce M Simpson Aq bms@FreeBSD.org
+.An Bruce M Simpson Aq Mt bms@FreeBSD.org
 and
-.An John Baldwin Aq jhb@FreeBSD.org .
+.An John Baldwin Aq Mt jhb@FreeBSD.org .
 .Sh BUGS
 The kernel PCI code has a number of references to
 .Dq "slot numbers" .
diff --git a/share/man/man9/pfind.9 b/share/man/man9/pfind.9
index dfd15b8dcf74..5a3f5caf1344 100644
--- a/share/man/man9/pfind.9
+++ b/share/man/man9/pfind.9
@@ -85,4 +85,4 @@ on failure.
 .Xr pgfind 9
 .Sh AUTHORS
 This manual page was written by
-.An Evan Sarmiento Aq kaworu@sektor7.ath.cx .
+.An Evan Sarmiento Aq Mt kaworu@sektor7.ath.cx .
diff --git a/share/man/man9/pgfind.9 b/share/man/man9/pgfind.9
index a3049876d729..5a2cf289f64b 100644
--- a/share/man/man9/pgfind.9
+++ b/share/man/man9/pgfind.9
@@ -62,4 +62,4 @@ structure on successful completion.
 .Xr pfind 9
 .Sh AUTHORS
 This manual page was written by
-.An Evan Sarmiento Aq kaworu@sektor7.ath.cx .
+.An Evan Sarmiento Aq Mt kaworu@sektor7.ath.cx .
diff --git a/share/man/man9/pmap.9 b/share/man/man9/pmap.9
index aa6d4a3dd1cd..5d317805fe04 100644
--- a/share/man/man9/pmap.9
+++ b/share/man/man9/pmap.9
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 21, 2003
+.Dd August 3, 2014
 .Dt PMAP 9
 .Os
 .Sh NAME
@@ -89,9 +89,7 @@ operation.
 .Sh SEE ALSO
 .Xr pmap 9 ,
 .Xr pmap_activate 9 ,
-.Xr pmap_change_wiring 9 ,
 .Xr pmap_clear_modify 9 ,
-.Xr pmap_clear_reference 9 ,
 .Xr pmap_copy 9 ,
 .Xr pmap_copy_page 9 ,
 .Xr pmap_enter 9 ,
@@ -107,7 +105,6 @@ operation.
 .Xr pmap_object_init_pt 9 ,
 .Xr pmap_page_exists_quick 9 ,
 .Xr pmap_page_init 9 ,
-.Xr pmap_page_protect 9 ,
 .Xr pmap_pinit 9 ,
 .Xr pmap_pinit0 9 ,
 .Xr pmap_pinit2 9 ,
@@ -119,7 +116,8 @@ operation.
 .Xr pmap_remove_all 9 ,
 .Xr pmap_remove_pages 9 ,
 .Xr pmap_resident_count 9 ,
-.Xr pmap_ts_modified 9 ,
+.Xr pmap_ts_referenced 9 ,
+.Xr pmap_unwire 9 ,
 .Xr pmap_wired_count 9 ,
 .Xr pmap_zero_area 9 ,
 .Xr pmap_zero_idle 9 ,
@@ -127,4 +125,4 @@ operation.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_activate.9 b/share/man/man9/pmap_activate.9
index 840d8a19c270..8d9f0504c02b 100644
--- a/share/man/man9/pmap_activate.9
+++ b/share/man/man9/pmap_activate.9
@@ -48,4 +48,4 @@ accessed.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_clear_modify.9 b/share/man/man9/pmap_clear_modify.9
index 002300b5625e..a873c91df9ad 100644
--- a/share/man/man9/pmap_clear_modify.9
+++ b/share/man/man9/pmap_clear_modify.9
@@ -25,12 +25,11 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 21, 2003
+.Dd July 17, 2014
 .Dt PMAP_CLEAR_MODIFY 9
 .Os
 .Sh NAME
-.Nm pmap_clear_modify ,
-.Nm pmap_clear_reference
+.Nm pmap_clear_modify
 .Nd set information about physical pages
 .Sh SYNOPSIS
 .In sys/param.h
@@ -38,8 +37,6 @@
 .In vm/pmap.h
 .Ft void
 .Fn pmap_clear_modify "vm_page_t m"
-.Ft void
-.Fn pmap_clear_reference "vm_page_t m"
 .Sh DESCRIPTION
 The
 .Fn pmap_clear_modify
@@ -47,17 +44,9 @@ function clears the
 .Dq modified
 bit on the physical page
 .Fa m .
-.Pp
-The
-.Fn pmap_clear_reference
-function clears the
-.Dq referenced
-bit on the physical page
-.Fa m .
 .Sh SEE ALSO
 .Xr pmap 9 ,
-.Xr pmap_is_modified 9 ,
-.Xr pmap_ts_referenced 9
+.Xr pmap_is_modified 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_copy.9 b/share/man/man9/pmap_copy.9
index 1541fa5e09b1..4899b6d970c6 100644
--- a/share/man/man9/pmap_copy.9
+++ b/share/man/man9/pmap_copy.9
@@ -81,4 +81,4 @@ routine only operates upon a single page.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_enter.9 b/share/man/man9/pmap_enter.9
index 2e524532b117..69e0650c6ef6 100644
--- a/share/man/man9/pmap_enter.9
+++ b/share/man/man9/pmap_enter.9
@@ -65,4 +65,4 @@ specification to make the requested entry at the time it is called.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_extract.9 b/share/man/man9/pmap_extract.9
index 0622b65ccd31..d2154ebe8a0b 100644
--- a/share/man/man9/pmap_extract.9
+++ b/share/man/man9/pmap_extract.9
@@ -90,6 +90,6 @@ be returned.
 The
 .Fn pmap_extract_and_hold
 function was implemented by
-.An Alan L. Cox Aq alc@imimic.com .
+.An Alan L. Cox Aq Mt alc@imimic.com .
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_growkernel.9 b/share/man/man9/pmap_growkernel.9
index f038fb53d93b..1385ddcb1273 100644
--- a/share/man/man9/pmap_growkernel.9
+++ b/share/man/man9/pmap_growkernel.9
@@ -48,4 +48,4 @@ It will allocate more page entries if required.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_init.9 b/share/man/man9/pmap_init.9
index 1a8d74c94a03..b377208231d6 100644
--- a/share/man/man9/pmap_init.9
+++ b/share/man/man9/pmap_init.9
@@ -62,4 +62,4 @@ excessive numbers of PV entries.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_is_modified.9 b/share/man/man9/pmap_is_modified.9
index 591a98539400..66493cda651e 100644
--- a/share/man/man9/pmap_is_modified.9
+++ b/share/man/man9/pmap_is_modified.9
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 21, 2003
+.Dd July 17, 2014
 .Dt PMAP_IS_MODIFIED 9
 .Os
 .Sh NAME
@@ -64,8 +64,7 @@ necessary that 0 only be returned when there are no remaining reference
 bits set on the page.
 .Sh SEE ALSO
 .Xr pmap 9 ,
-.Xr pmap_clear_modify 9 ,
-.Xr pmap_clear_reference 9
+.Xr pmap_clear_modify 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_is_prefaultable.9 b/share/man/man9/pmap_is_prefaultable.9
index c6f28709b666..9c3a7490e732 100644
--- a/share/man/man9/pmap_is_prefaultable.9
+++ b/share/man/man9/pmap_is_prefaultable.9
@@ -54,4 +54,4 @@ This is a helper function which is called by
 .Xr vm_fault_prefault 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_map.9 b/share/man/man9/pmap_map.9
index 2c472fe97b49..f813a217ce9c 100644
--- a/share/man/man9/pmap_map.9
+++ b/share/man/man9/pmap_map.9
@@ -77,4 +77,4 @@ is returned.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_mincore.9 b/share/man/man9/pmap_mincore.9
index d0e45ea5db3a..383387cfdb4a 100644
--- a/share/man/man9/pmap_mincore.9
+++ b/share/man/man9/pmap_mincore.9
@@ -71,4 +71,4 @@ return
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_object_init_pt.9 b/share/man/man9/pmap_object_init_pt.9
index 90ae75f44621..f87c8a9fc56a 100644
--- a/share/man/man9/pmap_object_init_pt.9
+++ b/share/man/man9/pmap_object_init_pt.9
@@ -70,4 +70,4 @@ startup, and immediately following a call to
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_page_exists_quick.9 b/share/man/man9/pmap_page_exists_quick.9
index 8db258014405..cc377ab7793a 100644
--- a/share/man/man9/pmap_page_exists_quick.9
+++ b/share/man/man9/pmap_page_exists_quick.9
@@ -63,4 +63,4 @@ is one of the first 16 PVs linked from the page
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_page_init.9 b/share/man/man9/pmap_page_init.9
index 65f72ec850e5..d6787e36aa11 100644
--- a/share/man/man9/pmap_page_init.9
+++ b/share/man/man9/pmap_page_init.9
@@ -48,4 +48,4 @@ queue management lists.
 .Xr pmap_pinit 9
 .Sh AUTHORS
 This manual page was written by
-.An Hiten Pandya Aq hmp@FreeBSD.org .
+.An Hiten Pandya Aq Mt hmp@FreeBSD.org .
diff --git a/share/man/man9/pmap_pinit.9 b/share/man/man9/pmap_pinit.9
index d52172934c3a..f001e7454744 100644
--- a/share/man/man9/pmap_pinit.9
+++ b/share/man/man9/pmap_pinit.9
@@ -64,4 +64,4 @@ until further notice.
 .Xr pmap_growkernel 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_page_protect.9 b/share/man/man9/pmap_protect.9
similarity index 87%
rename from share/man/man9/pmap_page_protect.9
rename to share/man/man9/pmap_protect.9
index f77d57def77e..659dc6db6a2d 100644
--- a/share/man/man9/pmap_page_protect.9
+++ b/share/man/man9/pmap_protect.9
@@ -25,11 +25,10 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 21, 2003
+.Dd July 18, 2014
 .Dt PMAP_PROTECT 9
 .Os
 .Sh NAME
-.Nm pmap_page_protect ,
 .Nm pmap_protect
 .Nd set physical page protection
 .Sh SYNOPSIS
@@ -37,20 +36,11 @@
 .In vm/vm.h
 .In vm/pmap.h
 .Ft void
-.Fn pmap_page_protect "vm_page_t m" "vm_prot_t prot"
-.Ft void
 .Fo pmap_protect
-.Fa "pmap_t pmap" "vm_offset_t sva" "vm_offset_t eva" "vm_prot_t pr"
+.Fa "pmap_t pmap" "vm_offset_t sva" "vm_offset_t eva" "vm_prot_t prot"
 .Fc
 .Sh DESCRIPTION
 The
-.Fn pmap_page_protect
-function lowers the physical page permissions to
-.Fa prot
-for all mappings of a given page
-.Fa m .
-.Pp
-The
 .Fn pmap_protect
 function sets the physical page permissions to
 .Fa prot
@@ -64,4 +54,4 @@ and
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_qenter.9 b/share/man/man9/pmap_qenter.9
index b148b69f694a..a5a94d497018 100644
--- a/share/man/man9/pmap_qenter.9
+++ b/share/man/man9/pmap_qenter.9
@@ -76,4 +76,4 @@ function is intended to remove such temporary mappings.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_release.9 b/share/man/man9/pmap_release.9
index ef2964161802..b328bd852c89 100644
--- a/share/man/man9/pmap_release.9
+++ b/share/man/man9/pmap_release.9
@@ -55,4 +55,4 @@ no longer contains any valid mappings.
 .Xr pmap_pinit 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_remove.9 b/share/man/man9/pmap_remove.9
index 12664dce74a1..4426f0de7d42 100644
--- a/share/man/man9/pmap_remove.9
+++ b/share/man/man9/pmap_remove.9
@@ -81,4 +81,4 @@ more quickly than would be the case for calling
 .Fn pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_resident_count.9 b/share/man/man9/pmap_resident_count.9
index bf39548cea09..343dc7cc5cf1 100644
--- a/share/man/man9/pmap_resident_count.9
+++ b/share/man/man9/pmap_resident_count.9
@@ -71,4 +71,4 @@ which are currently wired into in main memory.
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pmap_change_wiring.9 b/share/man/man9/pmap_unwire.9
similarity index 66%
rename from share/man/man9/pmap_change_wiring.9
rename to share/man/man9/pmap_unwire.9
index f3952f89b6cf..964eff9a469f 100644
--- a/share/man/man9/pmap_change_wiring.9
+++ b/share/man/man9/pmap_unwire.9
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2003 Bruce M Simpson <bms@spc.org>
+.\" Copyright (c) 2014 Alan L. Cox <alc@rice.edu>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -25,44 +25,41 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 21, 2003
-.Dt PMAP_CHANGE_WIRING 9
+.Dd July 17, 2014
+.Dt PMAP_UNWIRE 9
 .Os
 .Sh NAME
-.Nm pmap_change_wiring
-.Nd change physical wiring for a map or virtual address pair
+.Nm pmap_unwire
+.Nd unwire a range of virtual pages
 .Sh SYNOPSIS
 .In sys/param.h
 .In vm/vm.h
 .In vm/pmap.h
 .Ft void
-.Fn pmap_change_wiring "pmap_t pmap" "vm_offset_t va" "boolean_t wired"
+.Fo pmap_unwire
+.Fa "pmap_t pmap" "vm_offset_t start" "vm_offset_t end"
+.Fc
 .Sh DESCRIPTION
-The
-.Fn pmap_change_wiring
-function changes the wiring attribute for the page at virtual address
-.Fa va
-in the physical map
+The function
+.Fn pmap_unwire
+removes the wired attribute from each of the virtual-to-physical page mappings
+within the virtual address range from
+.Fa start
+to
+.Fa end
+of the physical map
 .Fa pmap .
-A wired page gets its name from being
-.Dq wired
-into the system page tables so that it will not be paged out.
-.Pp
-The mapping must already exist in the
-.Fa pmap .
-If
-.Fa wired
-is
-.Dv TRUE ,
-the map's wired page count will be incremented; if
-.Dv FALSE ,
-it will be decremented.
-.Pp
-It is typically called by the
-.Fn vm_fault_unwire
-function.
+Every valid mapping within that range is required to have the wired attribute
+set.
+Invalid mappings are ignored, since they cannot have the wired attribute set.
+.Sh NOTES
+Only the function
+.Xr pmap_enter 9
+can be used to set the wired attribute of a virtual-to-physical page mapping.
 .Sh SEE ALSO
-.Xr pmap 9
+.Xr pmap 9 ,
+.Xr pmap_enter 9 ,
+.Xr pmap_wired_count 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Alan L. Cox Aq alc@rice.edu .
diff --git a/share/man/man9/pmap_zero_page.9 b/share/man/man9/pmap_zero_page.9
index 541eef06104b..519e76b1871f 100644
--- a/share/man/man9/pmap_zero_page.9
+++ b/share/man/man9/pmap_zero_page.9
@@ -69,4 +69,4 @@ This function is required to be implemented for each architecture supported by
 .Xr pmap 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/pseudofs.9 b/share/man/man9/pseudofs.9
index 5d394961dc57..98ccc6cae7b9 100644
--- a/share/man/man9/pseudofs.9
+++ b/share/man/man9/pseudofs.9
@@ -67,4 +67,4 @@ module appeared in
 The
 .Nm
 module and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/share/man/man9/redzone.9 b/share/man/man9/redzone.9
index 98723c7b7ac2..6328236ced5d 100644
--- a/share/man/man9/redzone.9
+++ b/share/man/man9/redzone.9
@@ -114,7 +114,7 @@ Free backtrace:
 first appeared in
 .Fx 7.0 .
 .Sh AUTHORS
-.An Pawel Jakub Dawidek Aq pjd@FreeBSD.org
+.An Pawel Jakub Dawidek Aq Mt pjd@FreeBSD.org
 .Sh BUGS
 Currently,
 .Nm
diff --git a/share/man/man9/resource_int_value.9 b/share/man/man9/resource_int_value.9
index e82853513c19..710e97e91b3f 100644
--- a/share/man/man9/resource_int_value.9
+++ b/share/man/man9/resource_int_value.9
@@ -76,4 +76,4 @@ Inappropriate resource type.
 .Xr driver 9
 .Sh AUTHORS
 This manual page was written by
-.An Warner Losh Aq imp@FreeBSD.org .
+.An Warner Losh Aq Mt imp@FreeBSD.org .
diff --git a/share/man/man9/rman.9 b/share/man/man9/rman.9
index d9a20920da35..a14f68680f7e 100644
--- a/share/man/man9/rman.9
+++ b/share/man/man9/rman.9
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 29, 2011
+.Dd July 15, 2014
 .Dt RMAN 9
 .Os
 .Sh NAME
@@ -141,13 +141,11 @@ represented by a 16-bit flag register, as follows.
 #define RF_ALLOCATED    0x0001 /* resource has been reserved */
 #define RF_ACTIVE       0x0002 /* resource allocation has been activated */
 #define RF_SHAREABLE    0x0004 /* resource permits contemporaneous sharing */
-#define RF_TIMESHARE    0x0008 /* resource permits time-division sharing */
-#define RF_WANTED       0x0010 /* somebody is waiting for this resource */
 #define RF_FIRSTSHARE   0x0020 /* first in sharing list */
 #define RF_PREFETCHABLE 0x0040 /* resource is prefetchable */
 .Ed
 .Pp
-The remainder of the flag bits are used to represent the desired alignment
+Bits 15:10  of the flag register are used to represent the desired alignment
 of the resource within the region.
 .Pp
 The
@@ -299,12 +297,9 @@ The
 .Fa bound
 argument must be a power of two.
 It may be set to zero to specify no boundary restriction.
-The default behavior is to allocate an exclusive segment, unless the
+A shared segment will be allocated if the
 .Dv RF_SHAREABLE
-or
-.Dv RF_TIMESHARE
-flags are set, in which case a shared
-segment will be allocated.
+flag is set, otherwise an exclusive segment will be allocated.
 If this shared segment already exists, the caller has its device
 added to the list of consumers.
 .Pp
@@ -469,4 +464,4 @@ function returns a pointer to the device which reserved the resource
 .Xr mutex 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/sbuf.9 b/share/man/man9/sbuf.9
index d8acbaff0ce7..495726c5fb16 100644
--- a/share/man/man9/sbuf.9
+++ b/share/man/man9/sbuf.9
@@ -551,15 +551,15 @@ family of functions first appeared in
 The
 .Nm
 family of functions was designed by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org
 and implemented by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
 Additional improvements were suggested by
-.An Justin T. Gibbs Aq gibbs@FreeBSD.org .
+.An Justin T. Gibbs Aq Mt gibbs@FreeBSD.org .
 Auto-extend support added by
-.An Kelly Yancey Aq kbyanc@FreeBSD.org .
+.An Kelly Yancey Aq Mt kbyanc@FreeBSD.org .
 Drain functionality added by
-.An Matthew Fleming Aq mdf@FreeBSD.org .
+.An Matthew Fleming Aq Mt mdf@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/share/man/man9/selrecord.9 b/share/man/man9/selrecord.9
index f7a0113fc413..aafbe4b3d96e 100644
--- a/share/man/man9/selrecord.9
+++ b/share/man/man9/selrecord.9
@@ -121,6 +121,6 @@ but consumers should not generally rely on this feature.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Chad David Aq davidc@FreeBSD.org
+.An Chad David Aq Mt davidc@FreeBSD.org
 and
-.An Alfred Perlstein Aq alfred@FreeBSD.org .
+.An Alfred Perlstein Aq Mt alfred@FreeBSD.org .
diff --git a/share/man/man9/signal.9 b/share/man/man9/signal.9
index c61ceb653ced..a2e54fef012d 100644
--- a/share/man/man9/signal.9
+++ b/share/man/man9/signal.9
@@ -435,4 +435,4 @@ returns either a valid signal number or zero.
 .Xr psignal 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@FreeBSD.org .
+.An Chad David Aq Mt davidc@FreeBSD.org .
diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9
index e0225ee98a4f..bd421eaf6baa 100644
--- a/share/man/man9/sleep.9
+++ b/share/man/man9/sleep.9
@@ -383,4 +383,4 @@ function appeared in
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An J\(:org Wunsch Aq joerg@FreeBSD.org .
+.An J\(:org Wunsch Aq Mt joerg@FreeBSD.org .
diff --git a/share/man/man9/socket.9 b/share/man/man9/socket.9
index 8590a3d41e2d..4b3e2cbd4669 100644
--- a/share/man/man9/socket.9
+++ b/share/man/man9/socket.9
@@ -391,7 +391,7 @@ If
 is
 .Pf non- Dv NULL ,
 only the
-.Pf uio_resid
+.Fa uio_resid
 of
 .Fa uio
 is used.
diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9
index b9a9fe581722..8bc92e49bf57 100644
--- a/share/man/man9/sysctl.9
+++ b/share/man/man9/sysctl.9
@@ -25,79 +25,421 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 12, 2013
+.Dd July 31, 2014
 .Dt SYSCTL 9
 .Os
 .Sh NAME
 .Nm SYSCTL_DECL ,
+.Nm SYSCTL_ADD_INT ,
+.Nm SYSCTL_ADD_LONG ,
+.Nm SYSCTL_ADD_NODE ,
+.Nm SYSCTL_ADD_OPAQUE ,
+.Nm SYSCTL_ADD_PROC ,
+.Nm SYSCTL_ADD_QUAD ,
+.Nm SYSCTL_ADD_ROOT_NODE ,
+.Nm SYSCTL_ADD_STRING ,
+.Nm SYSCTL_ADD_STRUCT ,
+.Nm SYSCTL_ADD_UINT ,
+.Nm SYSCTL_ADD_ULONG ,
+.Nm SYSCTL_ADD_UQUAD ,
+.Nm SYSCTL_CHILDREN ,
+.Nm SYSCTL_STATIC_CHILDREN ,
+.Nm SYSCTL_NODE_CHILDREN ,
+.Nm SYSCTL_PARENT ,
 .Nm SYSCTL_INT ,
 .Nm SYSCTL_LONG ,
 .Nm SYSCTL_NODE ,
 .Nm SYSCTL_OPAQUE ,
 .Nm SYSCTL_PROC ,
 .Nm SYSCTL_QUAD ,
+.Nm SYSCTL_ROOT_NODE ,
 .Nm SYSCTL_STRING ,
 .Nm SYSCTL_STRUCT ,
 .Nm SYSCTL_UINT ,
 .Nm SYSCTL_ULONG ,
 .Nm SYSCTL_UQUAD
-.Nd Static sysctl declaration functions
+.Nd Dynamic and static sysctl MIB creation functions
 .Sh SYNOPSIS
 .In sys/types.h
 .In sys/sysctl.h
 .Fn SYSCTL_DECL name
-.Fn SYSCTL_INT parent nbr name access ptr val descr
-.Fn SYSCTL_LONG parent nbr name access ptr val descr
-.Fn SYSCTL_NODE parent nbr name access handler descr
-.Fn SYSCTL_OPAQUE parent nbr name access ptr len fmt descr
-.Fn SYSCTL_PROC parent nbr name access ptr arg handler fmt descr
-.Fn SYSCTL_QUAD parent nbr name access ptr val descr
-.Fn SYSCTL_STRING parent nbr name access arg len descr
-.Fn SYSCTL_STRUCT parent nbr name access ptr type descr
-.Fn SYSCTL_UINT parent nbr name access ptr val descr
-.Fn SYSCTL_ULONG parent nbr name access ptr val descr
-.Fn SYSCTL_UQUAD parent nbr name access ptr val descr
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_INT
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "int *ptr"
+.Fa "intptr_t val"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_LONG
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "long *ptr"
+.Fa "intptr_t val"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_NODE
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "int (*handler)(SYSCTL_HANDLER_ARGS)"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_OPAQUE
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "void *ptr"
+.Fa "intptr_t len"
+.Fa "const char *format"
+.Fa "const char *descr
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_PROC
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "void *arg1"
+.Fa "intptr_t arg2"
+.Fa "int (*handler) (SYSCTL_HANDLERARGS)"
+.Fa "const char *format"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_QUAD
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "quad_t *ptr"
+.Fa "intptr_t val"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_ROOT_NODE
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "int (*handler)(SYSCTL_HANDLER_ARGS)"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_STRING
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "char *ptr"
+.Fa "intptr_t len"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_STRUCT
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "void *ptr"
+.Fa struct_type
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_UINT
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "unsigned int *ptr"
+.Fa "intptr_t val"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_ULONG
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "unsigned long *ptr"
+.Fa "intptr_t val"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_UQUAD
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "u_quad_t *ptr"
+.Fa "intptr_t val"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid_list *
+.Fo SYSCTL_CHILDREN
+.Fa "struct sysctl_oid *oidp"
+.Fc
+.Ft struct sysctl_oid_list *
+.Fo SYSCTL_STATIC_CHILDREN
+.Fa "struct sysctl_oid_list OID_NAME"
+.Fc
+.Ft struct sysctl_oid_list *
+.Fo SYSCTL_NODE_CHILDREN
+.Fa "parent"
+.Fa "name"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_PARENT
+.Fa "struct sysctl_oid *oid"
+.Fc
+.Fn SYSCTL_INT parent number name ctlflags ptr val descr
+.Fn SYSCTL_LONG parent number name ctlflags ptr val descr
+.Fn SYSCTL_NODE parent number name ctlflags handler descr
+.Fn SYSCTL_OPAQUE parent number name ctlflags ptr len format descr
+.Fn SYSCTL_PROC parent number name ctlflags arg1 arg2 handler format descr
+.Fn SYSCTL_QUAD parent number name ctlflags ptr val descr
+.Fn SYSCTL_STRING parent number name ctlflags arg len descr
+.Fn SYSCTL_STRUCT parent number name ctlflags ptr struct_type descr
+.Fn SYSCTL_ROOT_NODE number name ctlflags handler descr
+.Fn SYSCTL_UINT parent number name ctlflags ptr val descr
+.Fn SYSCTL_ULONG parent number name ctlflags ptr val descr
+.Fn SYSCTL_UQUAD parent number name ctlflags ptr val descr
 .Sh DESCRIPTION
 The
 .Nm SYSCTL
-kernel interfaces allow code to statically declare
+kernel interface allows dynamic or static creation of
 .Xr sysctl 8
-MIB entries, which will be initialized when the kernel module containing the
-declaration is initialized.
-When the module is unloaded, the sysctl will be automatically destroyed.
-.Pp
-Sysctl nodes are created in a hierarchical tree, with all static nodes being
-represented by named C data structures; in order to create a new node under
-an existing node in the tree, the structure representing the desired parent
-node must be declared in the current context using
-.Fn SYSCTL_DECL .
-.Pp
-New nodes are declared using one of
+MIB entries.
+All static sysctls are automatically destroyed when the module which
+they are part of is unloaded.
+Most top level categories are created statically and are available to
+all kernel code and its modules.
+.Sh DESCRIPTION OF ARGUMENTS
+.Bl -tag -width ctlflags
+.It Fa ctx
+Pointer to sysctl context or NULL, if no context.
+See
+.Xr sysctl_ctx_init 9
+for how to create a new sysctl context.
+Programmers are strongly advised to use contexts to organize the
+dynamic OIDs which they create because when a context is destroyed all
+belonging sysctls are destroyed as well.
+This makes the sysctl cleanup code much simpler.
+Else deletion of all created OIDs is required at module unload.
+.It Fa parent
+A pointer to a
+.Li struct sysctl_oid_list ,
+which is the head of the parent's list of children.
+This pointer is retrieved using the
+.Fn SYSCTL_STATIC_CHILDREN
+macro for static sysctls and the
+.Fn SYSCTL_CHILDREN
+macro for dynamic sysctls.
+The
+.Fn SYSCTL_PARENT
+macro can be used to get the parent of an OID.
+The macro returns NULL if there is no parent.
+.It Fa number
+The OID number that will be assigned to this OID.
+In almost all cases this should be set to
+.Dv OID_AUTO ,
+which will result in the assignment of the next available OID number.
+.It Fa name
+The name of the OID.
+The newly created OID will contain a copy of the name.
+.It Fa ctlflags
+A bit mask of sysctl control flags.
+See the section below describing all the control flags.
+.It Fa arg1
+First callback argument for procedure sysctls.
+.It Fa arg2
+Second callback argument for procedure sysctls.
+.It Fa len
+The length of the data pointed to by the
+.Fa ptr
+argument.
+For string type OIDs a length of zero means that
+.Xr strlen 3
+will be used to get the length of the string at each access to the OID.
+.It Fa ptr
+Pointer to sysctl variable or string data.
+For sysctl values the pointer can be NULL which means the OID is read-only and the returned value should be taken from the
+.Fa val
+argument.
+.It Fa val
+If the
+.Fa ptr
+argument is NULL, gives the constant value returned by this OID.
+Else this argument is not used.
+.It Fa struct_type
+Name of structure type.
+.It Fa handler
+A pointer to the function
+that is responsible for handling read and write requests
+to this OID.
+There are several standard handlers
+that support operations on nodes,
+integers, strings and opaque objects.
+It is possible to define custom handlers using the
+.Fn SYSCTL_PROC
+macro or the
+.Fn SYSCTL_ADD_PROC
+function.
+.It Fa format
+A pointer to a string
+which specifies the format of the OID in a symbolic way.
+This format is used as a hint by
+.Xr sysctl 8
+to apply proper data formatting for display purposes.
+Currently used format names are:
+.Dq N
+for node,
+.Dq A
+for
+.Li "char *" ,
+.Dq I
+for
+.Li "int" ,
+.Dq IU
+for
+.Li "unsigned int" ,
+.Dq L
+for
+.Li "long" ,
+.Dq LU
+for
+.Li "unsigned long" ,
+.Dq Q
+for
+.Li "quad_t" ,
+.Dq QU
+for
+.Li "u_quad_t"
+and
+.Dq S,TYPE
+for
+.Li "struct TYPE"
+structures.
+.It Fa descr
+A pointer to a textual description of the OID.
+.El
+.Sh CREATING ROOT NODES
+Sysctl MIBs or OIDs are created in a hierarchical tree.
+The nodes at the bottom of the tree are called root nodes, and have no
+parent OID.
+To create bottom tree nodes the
+.Fn SYSCTL_ROOT_NODE
+macro or the
+.Fn SYSCTL_ADD_ROOT_NODE
+function needs to be used.
+By default all static sysctl node OIDs are global and need a
+.Fn SYSCTL_DECL
+statement prior to their
+.Fn SYSCTL_NODE
+definition statement, typically in a so-called header file.
+.Sh CREATING SYSCTL STRINGS
+Zero terminated character strings sysctls are created either using the
+.Fn SYSCTL_STRING
+macro or the
+.Fn SYSCTL_ADD_STRING
+function.
+If the
+.Fa len
+argument in zero, the string length is computed at every access to the OID using
+.Xr strlen 3 .
+.Sh CREATING OPAQUE SYSCTLS
+The
+.Fn SYSCTL_OPAQUE
+or
+.Fn SYSCTL_STRUCT
+macros or the
+.Fn SYSCTL_ADD_OPAQUE
+or
+.Fn SYSCTL_ADD_STRUCT
+functions create an OID that handle any chunk of data
+of the size specified by the
+.Fa len
+argument and data pointed to by the
+.Fa ptr
+argument.
+When using the structure version the type is encoded as part of the
+created sysctl.
+.Sh CREATING CUSTOM SYSCTLS
+The
+.Fn SYSCTL_PROC
+macro and the
+.Fn SYSCTL_ADD_PROC
+function
+create OIDs with the specified
+.Pa handler
+function.
+The handler is responsible for handling all read and write requests to
+the OID.
+This OID type is especially useful if the kernel data is not easily
+accessible, or needs to be processed before exporting.
+.Sh CREATING A STATIC SYSCTL
+Static sysctls are declared using one of the
 .Fn SYSCTL_INT ,
 .Fn SYSCTL_LONG ,
 .Fn SYSCTL_NODE ,
 .Fn SYSCTL_OPAQUE ,
 .Fn SYSCTL_PROC ,
 .Fn SYSCTL_QUAD ,
+.Fn SYSCTL_ROOT_NODE ,
 .Fn SYSCTL_STRING ,
 .Fn SYSCTL_STRUCT ,
 .Fn SYSCTL_UINT ,
-.Fn SYSCTL_ULONG ,
-and
-.Fn SYSCTL_UQUAD .
-Each macro accepts a parent name, as declared using
-.Fn SYSCTL_DECL ,
-an OID number, typically
-.Dv OID_AUTO ,
-a node name, a set of control and access flags, and a description.
-Depending on the macro, a pointer to a variable supporting the MIB entry, a
-size, a value, and a function pointer implementing the MIB entry may also be
-present.
-.Pp
-For most of the above macros, declaring a type as part of the access flags is
-not necessary \[em] however, when declaring a sysctl implemented by a function,
-including a type in the access mask is required:
-.Bl -tag -width ".Dv CTLTYPE_STRING"
+.Fn SYSCTL_ULONG
+or
+.Fn SYSCTL_UQUAD
+macros.
+.Sh CREATING A DYNAMIC SYSCTL
+Dynamic nodes are created using one of the
+.Fn SYSCTL_ADD_INT ,
+.Fn SYSCTL_ADD_LONG ,
+.Fn SYSCTL_ADD_NODE ,
+.Fn SYSCTL_ADD_OPAQUE ,
+.Fn SYSCTL_ADD_PROC ,
+.Fn SYSCTL_ADD_QUAD ,
+.Fn SYSCTL_ADD_ROOT_NODE ,
+.Fn SYSCTL_ADD_STRING ,
+.Fn SYSCTL_ADD_STRUCT ,
+.Fn SYSCTL_ADD_UINT ,
+.Fn SYSCTL_ADD_ULONG
+or
+.Fn SYSCTL_UQUAD
+functions.
+See
+.Xr sysctl_remove_oid 9
+or
+.Xr sysctl_ctx_free 9
+for more information on how to destroy a dynamically created OID.
+.Sh CONTROL FLAGS
+For most of the above functions and macros, declaring a type as part
+of the access flags is not necessary \[em] however, when declaring a
+sysctl implemented by a function, including a type in the access mask
+is required:
+.Bl -tag -width ".Dv CTLTYPE_NOFETCH"
 .It Dv CTLTYPE_NODE
 This is a node intended to be a parent for other nodes.
 .It Dv CTLTYPE_INT
@@ -127,13 +469,21 @@ flags to be set indicating the read and write disposition of the sysctl:
 .It Dv CTLFLAG_RD
 This is a read-only sysctl.
 .It Dv CTLFLAG_RDTUN
-This is a read-only sysctl which can be set by a system tunable.
+This is a read-only sysctl and tunable which is tried fetched once
+from the system enviroment early during module load or system boot.
 .It Dv CTLFLAG_WR
 This is a writable sysctl.
 .It Dv CTLFLAG_RW
 This sysctl is readable and writable.
 .It Dv CTLFLAG_RWTUN
-This sysctl is readable and writable and can also be set by a system tunable.
+This is a readable and writeable sysctl and tunable which is tried
+fetched once from the system enviroment early during module load or
+system boot.
+.It Dv CTLFLAG_NOFETCH
+In case the node is marked as a tunable using the CTLFLAG_[XX]TUN,
+this flag will prevent fetching the initial value from the system
+environment. Typically this flag should only be used for very early
+low level system setup code, and not by common drivers and modules.
 .El
 .Pp
 Additionally, any of the following optional flags may also be specified:
@@ -150,8 +500,12 @@ This sysctl can be written to by processes in
 When iterating the sysctl name space, do not list this sysctl.
 .It Dv CTLFLAG_TUN
 Advisory flag that a system tunable also exists for this variable.
+The initial sysctl value is tried fetched once from the system
+enviroment early during module load or system boot.
+.It Dv CTLFLAG_DYN
+Dynamically created OIDs automatically get this flag set.
 .El
-.Pp
+.Sh SECURITY CONSIDERATIONS
 When creating new sysctls, careful attention should be paid to the security
 implications of the monitoring or management interface being created.
 Most sysctls present in the kernel are read-only or writable only by the
@@ -252,6 +606,45 @@ SYSCTL_PROC(_kern_timecounter, OID_AUTO, hardware, CTLTYPE_STRING |
     CTLFLAG_RW, NULL, 0, sysctl_kern_timecounter_hardware, "A",
     "");
 .Ed
+.Pp
+The following is an example of
+how to create a new top-level category
+and how to hook up another subtree to an existing static node.
+This example does not use contexts,
+which results in tedious management of all intermediate oids,
+as they need to be freed later on:
+.Bd -literal -offset indent
+#include <sys/sysctl.h>
+ ...
+/*
+ * Need to preserve pointers to newly created subtrees,
+ * to be able to free them later:
+ */
+static struct sysctl_oid *root1;
+static struct sysctl_oid *root2;
+static struct sysctl_oid *oidp;
+static int a_int;
+static char *string = "dynamic sysctl";
+ ...
+
+root1 = SYSCTL_ADD_ROOT_NODE(NULL,
+	OID_AUTO, "newtree", CTLFLAG_RW, 0, "new top level tree");
+oidp = SYSCTL_ADD_INT(NULL, SYSCTL_CHILDREN(root1),
+	OID_AUTO, "newint", CTLFLAG_RW, &a_int, 0, "new int leaf");
+ ...
+root2 = SYSCTL_ADD_NODE(NULL, SYSCTL_STATIC_CHILDREN(_debug),
+	OID_AUTO, "newtree", CTLFLAG_RW, 0, "new tree under debug");
+oidp = SYSCTL_ADD_STRING(NULL, SYSCTL_CHILDREN(root2),
+	OID_AUTO, "newstring", CTLFLAG_RD, string, 0, "new string leaf");
+.Ed
+.Pp
+This example creates the following subtrees:
+.Bd -literal -offset indent
+debug.newtree.newstring
+newtree.newint
+.Ed
+.Pp
+.Em "Care should be taken to free all OIDs once they are no longer needed!"
 .Sh SYSCTL NAMING
 When adding, modifying, or removing sysctl names, it is important to be
 aware that these interfaces may be used by users, libraries, applications,
@@ -281,8 +674,8 @@ Use positive logic instead:
 .Va foobar ,
 .Va foobar_enable .
 .Pp
-A temporary sysctl node that should not be relied upon must be designated
-as such by a leading underscore character in its name.  For example:
+A temporary sysctl node OID that should not be relied upon must be designated
+as such by a leading underscore character in its name. For example:
 .Va _dirty_hack .
 .Sh SEE ALSO
 .Xr sysctl 3 ,
diff --git a/share/man/man9/sysctl_add_oid.9 b/share/man/man9/sysctl_add_oid.9
index bffc6dbb4120..9195f0b15d4c 100644
--- a/share/man/man9/sysctl_add_oid.9
+++ b/share/man/man9/sysctl_add_oid.9
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 12, 2013
+.Dd July 31, 2014
 .Dt SYSCTL_ADD_OID 9
 .Os
 .Sh NAME
@@ -46,7 +46,7 @@
 .Fa "const char *name"
 .Fa "int kind"
 .Fa "void *arg1"
-.Fa "int arg2"
+.Fa "intptr_t arg2"
 .Fa "int (*handler) (SYSCTL_HANDLER_ARGS)"
 .Fa "const char *format"
 .Fa "const char *descr"
@@ -62,160 +62,16 @@
 .Fa "int del"
 .Fa "int recurse"
 .Fc
-.Ft struct sysctl_oid_list *
-.Fo SYSCTL_CHILDREN
-.Fa "struct sysctl_oid *oidp"
-.Fc
-.Ft struct sysctl_oid_list *
-.Fo SYSCTL_STATIC_CHILDREN
-.Fa "struct sysctl_oid_list OID_NAME"
-.Fc
-.Ft struct sysctl_oid *
-.Fo SYSCTL_ADD_OID
-.Fa "struct sysctl_ctx_list *ctx"
-.Fa "struct sysctl_oid_list *parent"
-.Fa "int number"
-.Fa "const char *name"
-.Fa "int kind"
-.Fa "void *arg1"
-.Fa "int arg2"
-.Fa "int (*handler) (SYSCTL_HANDLER_ARGS)"
-.Fa "const char *format"
-.Fa "const char *descr"
-.Fc
-.Ft struct sysctl_oid *
-.Fo SYSCTL_ADD_NODE
-.Fa "struct sysctl_ctx_list *ctx"
-.Fa "struct sysctl_oid_list *parent"
-.Fa "int number"
-.Fa "const char *name"
-.Fa "int access"
-.Fa "int (*handler) (SYSCTL_HANDLER_ARGS)"
-.Fa "const char *descr"
-.Fc
-.Ft struct sysctl_oid *
-.Fo SYSCTL_ADD_STRING
-.Fa "struct sysctl_ctx_list *ctx"
-.Fa "struct sysctl_oid_list *parent"
-.Fa "int number"
-.Fa "const char *name"
-.Fa "int access"
-.Fa "char *arg"
-.Fa "int len"
-.Fa "const char *descr"
-.Fc
-.Ft struct sysctl_oid *
-.Fo SYSCTL_ADD_INT
-.Fa "struct sysctl_ctx_list *ctx"
-.Fa "struct sysctl_oid_list *parent"
-.Fa "int number"
-.Fa "const char *name"
-.Fa "int access"
-.Fa "int *arg"
-.Fa "int len"
-.Fa "const char *descr"
-.Fc
-.Ft struct sysctl_oid *
-.Fo SYSCTL_ADD_UINT
-.Fa "struct sysctl_ctx_list *ctx"
-.Fa "struct sysctl_oid_list *parent"
-.Fa "int number"
-.Fa "const char *name"
-.Fa "int access"
-.Fa "unsigned int *arg"
-.Fa "int len"
-.Fa "const char *descr"
-.Fc
-.Ft struct sysctl_oid *
-.Fo SYSCTL_ADD_LONG
-.Fa "struct sysctl_ctx_list *ctx"
-.Fa "struct sysctl_oid_list *parent"
-.Fa "int number"
-.Fa "const char *name"
-.Fa "int access"
-.Fa "long *arg"
-.Fa "const char *descr"
-.Fc
-.Ft struct sysctl_oid *
-.Fo SYSCTL_ADD_ULONG
-.Fa "struct sysctl_ctx_list *ctx"
-.Fa "struct sysctl_oid_list *parent"
-.Fa "int number"
-.Fa "const char *name"
-.Fa "int access"
-.Fa "unsigned long *arg"
-.Fa "const char *descr"
-.Fc
-.Ft struct sysctl_oid *
-.Fo SYSCTL_ADD_QUAD
-.Fa "struct sysctl_ctx_list *ctx"
-.Fa "struct sysctl_oid_list *parent"
-.Fa "int number"
-.Fa "const char *name"
-.Fa "int access"
-.Fa "int64_t *arg"
-.Fa "const char *descr"
-.Fc
-.Ft struct sysctl_oid *
-.Fo SYSCTL_ADD_UQUAD
-.Fa "struct sysctl_ctx_list *ctx"
-.Fa "struct sysctl_oid_list *parent"
-.Fa "int number"
-.Fa "const char *name"
-.Fa "int access"
-.Fa "uint64_t *arg"
-.Fa "const char *descr"
-.Fc
-.Ft struct sysctl_oid *
-.Fo SYSCTL_ADD_OPAQUE
-.Fa "struct sysctl_ctx_list *ctx"
-.Fa "struct sysctl_oid_list *parent"
-.Fa "int number"
-.Fa "const char *name"
-.Fa "int access"
-.Fa "void *arg"
-.Fa "int len"
-.Fa "const char *format"
-.Fa "const char *descr"
-.Fc
-.Ft struct sysctl_oid *
-.Fo SYSCTL_ADD_STRUCT
-.Fa "struct sysctl_ctx_list *ctx"
-.Fa "struct sysctl_oid_list *parent"
-.Fa "int number"
-.Fa "const char *name"
-.Fa "int access"
-.Fa "void *arg"
-.Fa STRUCT_NAME
-.Fa "const char *descr"
-.Fc
-.Ft struct sysctl_oid *
-.Fo SYSCTL_ADD_PROC
-.Fa "struct sysctl_ctx_list *ctx"
-.Fa "struct sysctl_oid_list *parent"
-.Fa "int number"
-.Fa "const char *name"
-.Fa "int access"
-.Fa "void *arg1"
-.Fa "int arg2"
-.Fa "int (*handler) (SYSCTL_HANDLER_ARGS)"
-.Fa "const char *format"
-.Fa "const char *descr"
-.Fc
 .Sh DESCRIPTION
-These functions and macros provide an interface
-for creating and deleting sysctl oids at runtime
-(e.g.\& during lifetime of a module).
-The alternative method,
-based on linker sets (see
-.In sys/linker_set.h
-and
-.\" XXX Manual pages should avoid referencing source files
-.Pa src/sys/kern/kern_sysctl.c
-for details), only allows creation and deletion
-on module load and unload respectively.
+These functions provide the interface for creating and deleting sysctl
+OIDs at runtime for example during the lifetime of a module.
+The wrapper macros defined by
+.Xr sysctl 9
+are recommended when creating new OIDs.
+.Fn sysctl_add_oid
+should not be called directly from the code.
 .Pp
-Dynamic oids of type
+Dynamic OIDs of type
 .Dv CTLTYPE_NODE
 are reusable
 so that several code sections can create and delete them,
@@ -227,170 +83,51 @@ to create partially overlapping trees that they both can use.
 It is not possible to create overlapping leaves,
 nor to create different child types with the same name and parent.
 .Pp
-Newly created oids are connected to their parent nodes.
-In all these functions and macros
-(with the exception of
-.Fn sysctl_remove_oid ) ,
-one of the required parameters is
-.Fa parent ,
-which points to the head of the parent's list of children.
-.Pp
-Most top level categories are created statically.
-When connecting to existing static oids,
-this pointer can be obtained with the
-.Fn SYSCTL_STATIC_CHILDREN
-macro, where the
-.Fa OID_NAME
-argument is name of the parent oid of type
-.Dv CTLTYPE_NODE
-(i.e., the name displayed by
-.Xr sysctl 8 ,
-preceded by underscore, and with all dots replaced with underscores).
-.Pp
-When connecting to an existing dynamic oid, this pointer
-can be obtained with the
-.Fn SYSCTL_CHILDREN
-macro, where the
-.Fa oidp
-argument points to the parent oid of type
-.Dv CTLTYPE_NODE .
-.Pp
 The
 .Fn sysctl_add_oid
-function creates raw oids of any type.
-If the oid is successfully created,
-the function returns a pointer to it;
-otherwise it returns
+function creates a raw OID of any type and connects it to its parent node, if any.
+If the OID is successfully created,
+the function returns a pointer to it else
+it returns
 .Dv NULL .
 Many of the arguments for
 .Fn sysctl_add_oid
-are common to the macros.
-The arguments are as follows:
-.Bl -tag -width handler
-.It Fa ctx
-A pointer to an optional sysctl context, or
-.Dv NULL .
-See
-.Xr sysctl_ctx_init 9
-for details.
-Programmers are strongly advised to use contexts
-to organize the dynamic oids which they create,
-unless special creation and deletion sequences are required.
-If
-.Fa ctx
-is not
-.Dv NULL ,
-the newly created oid will be added to this context
-as its first entry.
-.It Fa parent
-A pointer to a
-.Li struct sysctl_oid_list ,
-which is the head of the parent's list of children.
-.It Fa number
-The oid number that will be assigned to this oid.
-In almost all cases this should be set to
-.Dv OID_AUTO ,
-which will result in the assignment of the next available oid number.
-.It Fa name
-The name of the oid.
-The newly created oid will contain a copy of the name.
-.It Fa kind
-The kind of oid,
-specified as a bit mask of the type and access values defined in the
-.In sys/sysctl.h
-header file.
-Oids created dynamically always have the
-.Dv CTLFLAG_DYN
-flag set.
-Access flags specify whether this oid is read-only or read-write,
-and whether it may be modified by all users
-or by the superuser only.
-.It Fa arg1
-A pointer to any data that the oid should reference, or
-.Dv NULL .
-.It Fa arg2
-The size of
-.Fa arg1 ,
-or 0 if
-.Fa arg1
-is
-.Dv NULL .
-.It Fa handler
-A pointer to the function
-that is responsible for handling read and write requests
-to this oid.
-There are several standard handlers
-that support operations on nodes,
-integers, strings and opaque objects.
-It is possible also to define new handlers using the
-.Fn SYSCTL_ADD_PROC
-macro.
-.It Fa format
-A pointer to a string
-which specifies the format of the oid symbolically.
-This format is used as a hint by
-.Xr sysctl 8
-to apply proper data formatting for display purposes.
-Currently used format names are:
-.Dq N
-for node,
-.Dq A
-for
-.Li "char *" ,
-.Dq I
-for
-.Li "int" ,
-.Dq IU
-for
-.Li "unsigned int" ,
-.Dq L
-for
-.Li "long" ,
-.Dq LU
-for
-.Li "unsigned long"
-and
-.Dq S,TYPE
-for
-.Li "struct TYPE"
-structures.
-.It Fa descr
-A pointer to a textual description of the oid.
-.El
+are common to the wrapper macros defined by
+.Xr sysctl 9 .
 .Pp
 The
 .Fn sysctl_move_oid
-function reparents an existing oid.
-The oid is assigned a new number as if it had been created with
+function reparents an existing OID.
+The OID is assigned a new number as if it had been created with
 .Fa number
 set to
 .Dv OID_AUTO .
 .Pp
 The
 .Fn sysctl_remove_oid
-function removes a dynamically created oid from the tree,
+function removes a dynamically created OID from the tree and
 optionally freeing its resources.
 It takes the following arguments:
 .Bl -tag -width recurse
 .It Fa oidp
-A pointer to the dynamic oid to be removed.
-If the oid is not dynamic, or the pointer is
+A pointer to the dynamic OID to be removed.
+If the OID is not dynamic, or the pointer is
 .Dv NULL ,
 the function returns
 .Er EINVAL .
 .It Fa del
 If non-zero,
 .Fn sysctl_remove_oid
-will try to free the oid's resources
-when the reference count of the oid becomes zero.
+will try to free the OID's resources
+when the reference count of the OID becomes zero.
 However, if
 .Fa del
 is set to 0,
-the routine will only deregister the oid from the tree,
+the routine will only deregister the OID from the tree,
 without freeing its resources.
 This behaviour is useful when the caller expects to rollback
 (possibly partially failed)
-deletion of many oids later.
+deletion of many OIDs later.
 .It Fa recurse
 If non-zero, attempt to remove the node and all its children.
 If
@@ -412,112 +149,11 @@ Be aware, though, that this may result in a system
 if other code sections continue to use removed subtrees.
 .El
 .Pp
-.\" XXX sheldonh finished up to here
 Again, in most cases the programmer should use contexts,
 as described in
 .Xr sysctl_ctx_init 9 ,
-to keep track of created oids,
+to keep track of created OIDs,
 and to delete them later in orderly fashion.
-.Pp
-There is a set of macros defined
-that helps to create oids of given type.
-They are as follows:
-.Bl -tag -width SYSCTL_ADD_STRINGXX
-.It Fn SYSCTL_ADD_OID
-creates a raw oid.
-This macro is functionally equivalent to the
-.Fn sysctl_add_oid
-function.
-.It Fn SYSCTL_ADD_NODE
-creates an oid of type
-.Dv CTLTYPE_NODE ,
-to which child oids may be added.
-.It Fn SYSCTL_ADD_STRING
-creates an oid that handles a zero-terminated character string.
-.It Fn SYSCTL_ADD_INT
-creates an oid that handles an
-.Li int
-variable.
-.It Fn SYSCTL_ADD_UINT
-creates an oid that handles an
-.Li unsigned int
-variable.
-.It Fn SYSCTL_ADD_LONG
-creates an oid that handles a
-.Li long
-variable.
-.It Fn SYSCTL_ADD_ULONG
-creates an oid that handles an
-.Li unsigned long
-variable.
-.It Fn SYSCTL_ADD_QUAD
-creates an oid that handles an
-.Li int64_t
-variable.
-.It Fn SYSCTL_ADD_OPAQUE
-creates an oid that handles any chunk of opaque data
-of the size specified by the
-.Fa len
-argument,
-which is a pointer to a
-.Li "size_t *" .
-.It Fn SYSCTL_ADD_STRUCT
-creates an oid that handles a
-.Li "struct TYPE"
-structure.
-The
-.Fa format
-parameter will be set to
-.Dq S,TYPE
-to provide proper hints to the
-.Xr sysctl 8
-utility.
-.It Fn SYSCTL_ADD_PROC
-creates an oid with the specified
-.Pa handler
-function.
-The handler is responsible for handling read and write requests
-to the oid.
-This oid type is especially useful
-if the kernel data is not easily accessible,
-or needs to be processed before exporting.
-.El
-.Sh EXAMPLES
-The following is an example of
-how to create a new top-level category
-and how to hook up another subtree to an existing static node.
-This example does not use contexts,
-which results in tedious management of all intermediate oids,
-as they need to be freed later on:
-.Bd -literal
-#include <sys/sysctl.h>
- ...
-/* Need to preserve pointers to newly created subtrees, to be able
- * to free them later.
- */
-struct sysctl_oid *root1, *root2, *oidp;
-int a_int;
-char *string = "dynamic sysctl";
- ...
-
-root1 = SYSCTL_ADD_NODE( NULL, SYSCTL_STATIC_CHILDREN(/* tree top */),
-	OID_AUTO, "newtree", CTLFLAG_RW, 0, "new top level tree");
-oidp = SYSCTL_ADD_INT( NULL, SYSCTL_CHILDREN(root1),
-	OID_AUTO, "newint", CTLFLAG_RW, &a_int, 0, "new int leaf");
- ...
-root2 = SYSCTL_ADD_NODE( NULL, SYSCTL_STATIC_CHILDREN(_debug),
-	OID_AUTO, "newtree", CTLFLAG_RW, 0, "new tree under debug");
-oidp = SYSCTL_ADD_STRING( NULL, SYSCTL_CHILDREN(root2),
-	OID_AUTO, "newstring", CTLFLAG_RD, string, 0, "new string leaf");
-.Ed
-.Pp
-This example creates the following subtrees:
-.Bd -literal -offset indent
-debug.newtree.newstring
-newtree.newint
-.Ed
-.Pp
-.Em "Care should be taken to free all oids once they are no longer needed!"
 .Sh SEE ALSO
 .Xr sysctl 8 ,
 .Xr sysctl 9 ,
@@ -527,14 +163,14 @@ newtree.newint
 These functions first appeared in
 .Fx 4.2 .
 .Sh AUTHORS
-.An Andrzej Bialecki Aq abial@FreeBSD.org
+.An Andrzej Bialecki Aq Mt abial@FreeBSD.org
 .Sh BUGS
 Sharing nodes between many code sections
 causes interdependencies that sometimes may lock the resources.
 For example,
-if module A hooks up a subtree to an oid created by module B,
-module B will be unable to delete that oid.
+if module A hooks up a subtree to an OID created by module B,
+module B will be unable to delete that OID.
 These issues are handled properly by sysctl contexts.
 .Pp
 Many operations on the tree involve traversing linked lists.
-For this reason, oid creation and removal is relatively costly.
+For this reason, OID creation and removal is relatively costly.
diff --git a/share/man/man9/sysctl_ctx_init.9 b/share/man/man9/sysctl_ctx_init.9
index cbca5c619327..28c7b9309de3 100644
--- a/share/man/man9/sysctl_ctx_init.9
+++ b/share/man/man9/sysctl_ctx_init.9
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 15, 2000
+.Dd July 31, 2014
 .Dt SYSCTL_CTX_INIT 9
 .Os
 .Sh NAME
@@ -36,7 +36,7 @@
 .Nm sysctl_ctx_entry_add ,
 .Nm sysctl_ctx_entry_find ,
 .Nm sysctl_ctx_entry_del
-.Nd "sysctl context for managing dynamically created sysctl oids"
+.Nd "sysctl context for managing dynamically created sysctl OIDs"
 .Sh SYNOPSIS
 .In sys/types.h
 .In sys/sysctl.h
@@ -65,10 +65,10 @@
 .Fc
 .Sh DESCRIPTION
 These functions provide an interface
-for managing dynamically created oids.
-The sysctl context is responsible for keeping track of created oids,
+for managing dynamically created OIDs.
+The sysctl context is responsible for keeping track of created OIDs,
 as well as their proper removal when needed.
-It adds a simple transactional aspect to oid removal operations;
+It adds a simple transactional aspect to OID removal operations;
 i.e., if a removal operation fails part way,
 it is possible to roll back the sysctl tree
 to its previous state.
@@ -87,7 +87,7 @@ a pointer to the context can be passed as an argument to all the
 .Fa SYSCTL_ADD_*
 macros (see
 .Xr sysctl_add_oid 9 ) ,
-and it will be updated with entries pointing to newly created oids.
+and it will be updated with entries pointing to newly created OIDS.
 .Pp
 Internally, the context is represented as a
 .Xr queue 3
@@ -104,14 +104,14 @@ struct sysctl_ctx_entry {
 TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry);
 .Ed
 .Pp
-Each context entry points to one dynamic oid that it manages.
-Newly created oids are always inserted in the front of the list.
+Each context entry points to one dynamic OID that it manages.
+Newly created OIDs are always inserted in the front of the list.
 .Pp
 The
 .Fn sysctl_ctx_free
-function removes the context and associated oids it manages.
+function removes the context and associated OIDs it manages.
 If the function completes successfully,
-all managed oids have been unregistered
+all managed OIDs have been unregistered
 (removed from the tree)
 and freed,
 together with all their allocated memory,
@@ -127,34 +127,34 @@ If there are no errors during this step,
 .Fn sysctl_ctx_free
 proceeds to the next step.
 If the first step fails,
-all unregistered oids associated with the context are registered again.
+all unregistered OIDs associated with the context are registered again.
 .Pp
 .Em Note :
 in most cases, the programmer specifies
 .Dv OID_AUTO
-as the oid number when creating an oid.
-However, during registration of the oid in the tree,
+as the OID number when creating an OID.
+However, during registration of the OID in the tree,
 this number is changed to the first available number
 greater than or equal to
 .Dv CTL_AUTO_START .
 If the first step of context deletion fails,
-re-registration of the oid does not change the already assigned oid number
+re-registration of the OID does not change the already assigned OID number
 (which is different from OID_AUTO).
 This ensures that re-registered entries
 maintain their original positions in the tree.
 .Pp
-The second step actually performs the deletion of the dynamic oids.
+The second step actually performs the deletion of the dynamic OIDs.
 .Xr sysctl_remove_oid 9
 iterates through the context list,
 starting from beginning (i.e., the newest entries).
 .Em Important :
-this time, the function not only deletes the oids from the tree,
+this time, the function not only deletes the OIDs from the tree,
 but also frees their memory (provided that oid_refcnt == 0),
 as well as the memory of all context entries.
 .Pp
 The
 .Fn sysctl_ctx_entry_add
-function allows the addition of an existing dynamic oid to a context.
+function allows the addition of an existing dynamic OID to a context.
 .Pp
 The
 .Fn sysctl_ctx_entry_del
@@ -166,7 +166,7 @@ is freed, but the
 .Fa oidp
 pointer remains intact.
 Thereafter, the programmer is responsible for managing the resources
-allocated to this oid.
+allocated to this OID.
 .Pp
 The
 .Fn sysctl_ctx_entry_find
@@ -181,18 +181,18 @@ or
 .Sh EXAMPLES
 The following is an example of how to create a new top-level category
 and how to hook up another subtree to an existing static node.
-This example uses contexts to keep track of the oids.
+This example uses contexts to keep track of the OIDs.
 .Bd -literal
 #include <sys/sysctl.h>
  ...
-struct sysctl_ctx_list clist;
-struct sysctl_oid *oidp;
-int a_int;
-const char *string = "dynamic sysctl";
+static struct sysctl_ctx_list clist;
+static struct sysctl_oid *oidp;
+static int a_int;
+static const char *string = "dynamic sysctl";
  ...
 
 sysctl_ctx_init(&clist);
-oidp = SYSCTL_ADD_NODE(&clist, SYSCTL_STATIC_CHILDREN(/* tree top */),
+oidp = SYSCTL_ADD_ROOT_NODE(&clist,
 	OID_AUTO, "newtree", CTLFLAG_RW, 0, "new top level tree");
 oidp = SYSCTL_ADD_INT(&clist, SYSCTL_CHILDREN(oidp),
 	OID_AUTO, "newint", CTLFLAG_RW, &a_int, 0, "new int leaf");
@@ -202,9 +202,9 @@ oidp = SYSCTL_ADD_NODE(&clist, SYSCTL_STATIC_CHILDREN(_debug),
 oidp = SYSCTL_ADD_STRING(&clist, SYSCTL_CHILDREN(oidp),
 	OID_AUTO, "newstring", CTLFLAG_RD, string, 0, "new string leaf");
  ...
-/* Now we can free up the oids */
+/* Now we can free up the OIDs */
 if (sysctl_ctx_free(&clist)) {
-	printf("can't free this context - other oids depend on it");
+	printf("can't free this context - other OIDs depend on it");
 	return (ENOTEMPTY);
 } else {
 	printf("Success!\\n");
@@ -233,11 +233,11 @@ and then proceeds to free the older entries (in this case the nodes).
 These functions first appeared in
 .Fx 4.2 .
 .Sh AUTHORS
-.An Andrzej Bialecki Aq abial@FreeBSD.org
+.An Andrzej Bialecki Aq Mt abial@FreeBSD.org
 .Sh BUGS
 The current removal algorithm is somewhat heavy.
 In the worst case,
-all oids need to be unregistered, registered again,
+all OIDs need to be unregistered, registered again,
 and then unregistered and deleted.
 However, the algorithm does guarantee transactional properties
 for removal operations.
diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9
index 178250caefcf..7d97db6075bd 100644
--- a/share/man/man9/timeout.9
+++ b/share/man/man9/timeout.9
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 23, 2013
+.Dd July 17, 2014
 .Dt TIMEOUT 9
 .Os
 .Sh NAME
@@ -371,6 +371,10 @@ Specifies relative event time precision as binary logarithm of time interval
 divided by acceptable time deviation: 1 -- 1/2, 2 -- 1/4, etc.
 Smaller value allows to aggregate more events in one timer interrupt to
 reduce processing overhead and power consumption.
+.It Dv C_HARDCLOCK
+Align the timeouts, if possible, to 
+.Fn hardclock  
+calls.
 .El
 .Pp
 The functions
diff --git a/share/man/man9/tvtohz.9 b/share/man/man9/tvtohz.9
index 672aaf9dbbe7..cf07d603a790 100644
--- a/share/man/man9/tvtohz.9
+++ b/share/man/man9/tvtohz.9
@@ -55,4 +55,4 @@ function first appeared in
 .Fx 3.0
 .Sh AUTHORS
 This manual page was written by
-.An Kelly Yancey Aq kbyanc@posi.net .
+.An Kelly Yancey Aq Mt kbyanc@posi.net .
diff --git a/share/man/man9/ucred.9 b/share/man/man9/ucred.9
index a44e0d77d78b..e8b26d653fbd 100644
--- a/share/man/man9/ucred.9
+++ b/share/man/man9/ucred.9
@@ -233,4 +233,4 @@ accepts a target process, not a target thread, for access control purposes.
 .Xr uihold 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/uidinfo.9 b/share/man/man9/uidinfo.9
index 8a3d708bc466..4dc93d2bfedd 100644
--- a/share/man/man9/uidinfo.9
+++ b/share/man/man9/uidinfo.9
@@ -106,4 +106,4 @@ returns a pointer to an initialized
 structure, and should not fail.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/usbdi.9 b/share/man/man9/usbdi.9
index 03cc3057b821..283cda05d7e1 100644
--- a/share/man/man9/usbdi.9
+++ b/share/man/man9/usbdi.9
@@ -507,7 +507,7 @@ This flag causes a failing USB transfer to remain first in the PIPE
 queue except in the case of "xfer->error" equal to
 "USB_ERR_CANCELLED". No other USB transfers in the affected PIPE queue
 will be started until either:
-.Bl -tag -width "1"
+.Bl -tag -width "X"
 .It 1
 The failing USB transfer is stopped using "usbd_transfer_stop()".
 .It 2
@@ -638,4 +638,4 @@ module has been inspired by the NetBSD USB stack initially written by
 Lennart Augustsson. The
 .Nm usb
 module was written by
-.An Hans Petter Selasky Aq hselasky@FreeBSD.org .
+.An Hans Petter Selasky Aq Mt hselasky@FreeBSD.org .
diff --git a/share/man/man9/utopia.9 b/share/man/man9/utopia.9
index a7d02c19bee2..99be5fa809b2 100644
--- a/share/man/man9/utopia.9
+++ b/share/man/man9/utopia.9
@@ -350,4 +350,4 @@ Update the statistics with counters read from the chip.
 .Sh SEE ALSO
 .Xr utopia 4
 .Sh AUTHORS
-.An Harti Brandt Aq harti@FreeBSD.org
+.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man9/vaccess_acl_nfs4.9 b/share/man/man9/vaccess_acl_nfs4.9
index 27b4cfa644b3..c7293619a349 100644
--- a/share/man/man9/vaccess_acl_nfs4.9
+++ b/share/man/man9/vaccess_acl_nfs4.9
@@ -123,7 +123,7 @@ appropriate privileges or to the owner of a file or other resource.
 Current implementation of
 .Fn vaccess_acl_nfs4
 was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org .
 .Sh BUGS
 This manual page should include a full description of the NFSv4 ACL
 evaluation algorithm, or cross reference another page that does.
diff --git a/share/man/man9/vflush.9 b/share/man/man9/vflush.9
index 94485f925797..280088f99269 100644
--- a/share/man/man9/vflush.9
+++ b/share/man/man9/vflush.9
@@ -78,4 +78,4 @@ will be returned.
 .Xr vrele 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_busy.9 b/share/man/man9/vfs_busy.9
index 30fe79bf122b..8b9ba86d2bac 100644
--- a/share/man/man9/vfs_busy.9
+++ b/share/man/man9/vfs_busy.9
@@ -88,4 +88,4 @@ is set).
 .Xr vfs_unbusy 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_getnewfsid.9 b/share/man/man9/vfs_getnewfsid.9
index b6f12382fe13..f43800c41a57 100644
--- a/share/man/man9/vfs_getnewfsid.9
+++ b/share/man/man9/vfs_getnewfsid.9
@@ -74,4 +74,4 @@ xxx_mount(struct mount *mp, char *path, caddr_t data,
 .Xr vfs_getvfs 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_getopt.9 b/share/man/man9/vfs_getopt.9
index 09db47c7929d..1675fef8f6ee 100644
--- a/share/man/man9/vfs_getopt.9
+++ b/share/man/man9/vfs_getopt.9
@@ -240,6 +240,6 @@ if the option was not found.
 .Sh AUTHORS
 .An -nosplit
 This manual page was written by
-.An Chad David Aq davidc@FreeBSD.org
+.An Chad David Aq Mt davidc@FreeBSD.org
 and
-.An Ruslan Ermilov Aq ru@FreeBSD.org .
+.An Ruslan Ermilov Aq Mt ru@FreeBSD.org .
diff --git a/share/man/man9/vfs_getvfs.9 b/share/man/man9/vfs_getvfs.9
index c563adcddca3..93df89f7070a 100644
--- a/share/man/man9/vfs_getvfs.9
+++ b/share/man/man9/vfs_getvfs.9
@@ -74,4 +74,4 @@ if ((mp = vfs_getvfs(&fhp->fh_fsid)) == NULL) {
 .Xr vfs_getnewfsid 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_mountedfrom.9 b/share/man/man9/vfs_mountedfrom.9
index 10ad32816f7b..d0d7542630f0 100644
--- a/share/man/man9/vfs_mountedfrom.9
+++ b/share/man/man9/vfs_mountedfrom.9
@@ -52,4 +52,4 @@ is the device that contains the file system, but in the case of a pseudo
 file system it could be a descriptive name like "devfs" or "procfs".
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_rootmountalloc.9 b/share/man/man9/vfs_rootmountalloc.9
index ecad73e3af20..6453849f1e98 100644
--- a/share/man/man9/vfs_rootmountalloc.9
+++ b/share/man/man9/vfs_rootmountalloc.9
@@ -63,4 +63,4 @@ or invalid.
 .Xr vfsconf 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_timestamp.9 b/share/man/man9/vfs_timestamp.9
index 455d6f6ba427..0103779402ce 100644
--- a/share/man/man9/vfs_timestamp.9
+++ b/share/man/man9/vfs_timestamp.9
@@ -60,4 +60,4 @@ seconds and nanoseconds, maximum precision.
 .El
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfs_unbusy.9 b/share/man/man9/vfs_unbusy.9
index 5d0b4e5d780b..13cea5eba67f 100644
--- a/share/man/man9/vfs_unbusy.9
+++ b/share/man/man9/vfs_unbusy.9
@@ -55,4 +55,4 @@ The mount point to unbusy.
 .Xr vfs_busy 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vfsconf.9 b/share/man/man9/vfsconf.9
index 83a66210e228..7e129c07ff08 100644
--- a/share/man/man9/vfsconf.9
+++ b/share/man/man9/vfsconf.9
@@ -148,4 +148,4 @@ whatever the case.
 .Xr VFS_SET 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vgone.9 b/share/man/man9/vgone.9
index 12715e133ddd..dc10cda76e76 100644
--- a/share/man/man9/vgone.9
+++ b/share/man/man9/vgone.9
@@ -60,4 +60,4 @@ exclusively locked.
 .Xr vnode 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vhold.9 b/share/man/man9/vhold.9
index cb1f35d1df37..503ce29c5643 100644
--- a/share/man/man9/vhold.9
+++ b/share/man/man9/vhold.9
@@ -80,4 +80,4 @@ expect the interlock to already be held.
 .Xr vnode 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vinvalbuf.9 b/share/man/man9/vinvalbuf.9
index f3e627a8f3d2..260eb6f39b37 100644
--- a/share/man/man9/vinvalbuf.9
+++ b/share/man/man9/vinvalbuf.9
@@ -114,4 +114,4 @@ set in
 .Xr VOP_FSYNC 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_fault_prefault.9 b/share/man/man9/vm_fault_prefault.9
index dcc7e7abfa37..39138e88a1ad 100644
--- a/share/man/man9/vm_fault_prefault.9
+++ b/share/man/man9/vm_fault_prefault.9
@@ -69,4 +69,4 @@ helper function to determine if a page may be prefaulted into physical memory.
 .Xr pmap_is_prefaultable 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map.9 b/share/man/man9/vm_map.9
index f45be0b055e6..a5ba60a189e7 100644
--- a/share/man/man9/vm_map.9
+++ b/share/man/man9/vm_map.9
@@ -347,4 +347,4 @@ is backed by a
 .Xr vm_map_wire 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_check_protection.9 b/share/man/man9/vm_map_check_protection.9
index abaf6d0301e6..1d475249d0c7 100644
--- a/share/man/man9/vm_map_check_protection.9
+++ b/share/man/man9/vm_map_check_protection.9
@@ -67,4 +67,4 @@ or if any other error occurred, the value FALSE is returned.
 .Xr vm_map_protect 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_create.9 b/share/man/man9/vm_map_create.9
index 0574f396f82b..11ba8ac84d84 100644
--- a/share/man/man9/vm_map_create.9
+++ b/share/man/man9/vm_map_create.9
@@ -63,4 +63,4 @@ Otherwise, it returns
 .Xr vm_map_init 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_delete.9 b/share/man/man9/vm_map_delete.9
index e884f366aaaf..8eea565a04da 100644
--- a/share/man/man9/vm_map_delete.9
+++ b/share/man/man9/vm_map_delete.9
@@ -65,4 +65,4 @@ function always returns
 .Xr vm_map_remove 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_entry_resize_free.9 b/share/man/man9/vm_map_entry_resize_free.9
index eaaec650fb60..9e70a8d757bf 100644
--- a/share/man/man9/vm_map_entry_resize_free.9
+++ b/share/man/man9/vm_map_entry_resize_free.9
@@ -240,5 +240,4 @@ tree-based free space algorithm was added in
 .Fx 5.3 .
 .Sh AUTHORS
 The tree-based free space algorithm and this manual page were written by
-.An Mark W. Krentel
-.Aq krentel@dreamscape.com .
+.An Mark W. Krentel Aq Mt krentel@dreamscape.com .
diff --git a/share/man/man9/vm_map_find.9 b/share/man/man9/vm_map_find.9
index 106854eca750..031be99b767a 100644
--- a/share/man/man9/vm_map_find.9
+++ b/share/man/man9/vm_map_find.9
@@ -158,4 +158,4 @@ will be returned.
 .Xr vm_map_lock 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_findspace.9 b/share/man/man9/vm_map_findspace.9
index a12e78961574..29d465bd3583 100644
--- a/share/man/man9/vm_map_findspace.9
+++ b/share/man/man9/vm_map_findspace.9
@@ -75,4 +75,4 @@ otherwise, the value 1 is returned.
 .Xr vm_map_lock 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_inherit.9 b/share/man/man9/vm_map_inherit.9
index fb5a9d5ff37b..f8416c722cde 100644
--- a/share/man/man9/vm_map_inherit.9
+++ b/share/man/man9/vm_map_inherit.9
@@ -82,4 +82,4 @@ will be returned.
 .Xr fork 2
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_init.9 b/share/man/man9/vm_map_init.9
index c65f611fbb8d..25b8aeb39f21 100644
--- a/share/man/man9/vm_map_init.9
+++ b/share/man/man9/vm_map_init.9
@@ -56,4 +56,4 @@ It is called during early system initialization.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_insert.9 b/share/man/man9/vm_map_insert.9
index 8f3b52e78c98..20e062b446a3 100644
--- a/share/man/man9/vm_map_insert.9
+++ b/share/man/man9/vm_map_insert.9
@@ -90,4 +90,4 @@ overlaps the end of the map.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_lock.9 b/share/man/man9/vm_map_lock.9
index 709570926603..0f26412871fb 100644
--- a/share/man/man9/vm_map_lock.9
+++ b/share/man/man9/vm_map_lock.9
@@ -110,4 +110,4 @@ Currently, all of the locking macros implement their locks as sleep locks.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_lookup.9 b/share/man/man9/vm_map_lookup.9
index 759b5f6673fd..a28613fafdfd 100644
--- a/share/man/man9/vm_map_lookup.9
+++ b/share/man/man9/vm_map_lookup.9
@@ -85,4 +85,4 @@ arguments appropriately for the hypothetical page fault.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_madvise.9 b/share/man/man9/vm_map_madvise.9
index 97ba6040de8d..dc283ebbb8b2 100644
--- a/share/man/man9/vm_map_madvise.9
+++ b/share/man/man9/vm_map_madvise.9
@@ -74,4 +74,4 @@ is returned.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_max.9 b/share/man/man9/vm_map_max.9
index e694983ba6aa..92d574dbeed6 100644
--- a/share/man/man9/vm_map_max.9
+++ b/share/man/man9/vm_map_max.9
@@ -63,4 +63,4 @@ returns a pointer to the physical map associated with the virtual map
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_protect.9 b/share/man/man9/vm_map_protect.9
index 8976781297e5..c4b5a738abe7 100644
--- a/share/man/man9/vm_map_protect.9
+++ b/share/man/man9/vm_map_protect.9
@@ -90,4 +90,4 @@ is returned.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_remove.9 b/share/man/man9/vm_map_remove.9
index 53da53349bb2..79c678228175 100644
--- a/share/man/man9/vm_map_remove.9
+++ b/share/man/man9/vm_map_remove.9
@@ -66,4 +66,4 @@ always returns
 .Xr vm_map_delete 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_simplify_entry.9 b/share/man/man9/vm_map_simplify_entry.9
index 8bb5484b4cb7..3c7a1f87df36 100644
--- a/share/man/man9/vm_map_simplify_entry.9
+++ b/share/man/man9/vm_map_simplify_entry.9
@@ -58,4 +58,4 @@ possibly extended.
 .Xr vm_map_remove 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_stack.9 b/share/man/man9/vm_map_stack.9
index e237c063d59f..4036efb4f043 100644
--- a/share/man/man9/vm_map_stack.9
+++ b/share/man/man9/vm_map_stack.9
@@ -129,4 +129,4 @@ function previously located in the file
 .Xr vm_map_insert 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_submap.9 b/share/man/man9/vm_map_submap.9
index 704151aa5fc7..6f29d6b90b3f 100644
--- a/share/man/man9/vm_map_submap.9
+++ b/share/man/man9/vm_map_submap.9
@@ -92,4 +92,4 @@ backing object was specified.
 .Xr vm_map_find 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_sync.9 b/share/man/man9/vm_map_sync.9
index 0ee12193d12e..dd487df273c6 100644
--- a/share/man/man9/vm_map_sync.9
+++ b/share/man/man9/vm_map_sync.9
@@ -78,4 +78,4 @@ or if an entry could not be found for the given start address.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_map_wire.9 b/share/man/man9/vm_map_wire.9
index 12bb3f675aed..f112f344e6bc 100644
--- a/share/man/man9/vm_map_wire.9
+++ b/share/man/man9/vm_map_wire.9
@@ -111,4 +111,4 @@ is returned.
 .Xr vm_map 9
 .Sh AUTHORS
 This manual page was written by
-.An Bruce M Simpson Aq bms@spc.org .
+.An Bruce M Simpson Aq Mt bms@spc.org .
diff --git a/share/man/man9/vm_page_aflag.9 b/share/man/man9/vm_page_aflag.9
index 4500bd2d69cc..0d0bdeb55085 100644
--- a/share/man/man9/vm_page_aflag.9
+++ b/share/man/man9/vm_page_aflag.9
@@ -97,4 +97,4 @@ and
 bits are only valid for the managed pages.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_alloc.9 b/share/man/man9/vm_page_alloc.9
index 3109a3fae492..082574f4d150 100644
--- a/share/man/man9/vm_page_alloc.9
+++ b/share/man/man9/vm_page_alloc.9
@@ -136,4 +136,4 @@ unless
 is set.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_bits.9 b/share/man/man9/vm_page_bits.9
index 79d568552cc5..43b54dcf93b6 100644
--- a/share/man/man9/vm_page_bits.9
+++ b/share/man/man9/vm_page_bits.9
@@ -164,4 +164,4 @@ clears all of the dirty bits in a page.
 None of these functions are allowed to block.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_busy.9 b/share/man/man9/vm_page_busy.9
index bc4b796d1fce..9503dacbe8a8 100644
--- a/share/man/man9/vm_page_busy.9
+++ b/share/man/man9/vm_page_busy.9
@@ -95,7 +95,7 @@ themselves.
 For example, when a thread wants to access or update page contents
 without a lock held the page is shared busied.
 .Pp
-Before busing a page the vm_object lock must be held.
+Before busying a page the vm_object lock must be held.
 The same rule applies when a page is unbusied.
 This makes the vm_object lock a real busy interlock.
 .Pp
diff --git a/share/man/man9/vm_page_cache.9 b/share/man/man9/vm_page_cache.9
index 0379e8c7a9c1..58bf43c992a9 100644
--- a/share/man/man9/vm_page_cache.9
+++ b/share/man/man9/vm_page_cache.9
@@ -48,4 +48,4 @@ to the cache queue will fail.
 If the page is dirty the system will panic.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_deactivate.9 b/share/man/man9/vm_page_deactivate.9
index 30bb7fa11ace..fff5ea9b5499 100644
--- a/share/man/man9/vm_page_deactivate.9
+++ b/share/man/man9/vm_page_deactivate.9
@@ -47,4 +47,4 @@ unmanaged and is not wired.
 .Xr vm_page_wire 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_dontneed.9 b/share/man/man9/vm_page_dontneed.9
index 99baa330816d..b30df14c7018 100644
--- a/share/man/man9/vm_page_dontneed.9
+++ b/share/man/man9/vm_page_dontneed.9
@@ -56,4 +56,4 @@ ones from the queues as their pages are released.
 .Xr vm_page_deactivate 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_free.9 b/share/man/man9/vm_page_free.9
index a78e577adbd4..7df970cf6da9 100644
--- a/share/man/man9/vm_page_free.9
+++ b/share/man/man9/vm_page_free.9
@@ -95,4 +95,4 @@ returns 1 if it is able to free the page; otherwise, 0 is returned.
 .Xr vm_page_wire 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_grab.9 b/share/man/man9/vm_page_grab.9
index ff9aae902de2..d19289ae9459 100644
--- a/share/man/man9/vm_page_grab.9
+++ b/share/man/man9/vm_page_grab.9
@@ -81,4 +81,4 @@ always returns the page.
 .Xr vm_page_alloc 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_hold.9 b/share/man/man9/vm_page_hold.9
index 183fa4020d56..971d6c2d5da2 100644
--- a/share/man/man9/vm_page_hold.9
+++ b/share/man/man9/vm_page_hold.9
@@ -72,4 +72,4 @@ page daemon.
 .Xr vm_page_wire 9
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_insert.9 b/share/man/man9/vm_page_insert.9
index 53f1eba82933..ce2c6ae91966 100644
--- a/share/man/man9/vm_page_insert.9
+++ b/share/man/man9/vm_page_insert.9
@@ -93,4 +93,4 @@ For example, if the page size is 4096 bytes, and the address
 in the object is 81944, the page index is 20.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_lookup.9 b/share/man/man9/vm_page_lookup.9
index 7f8cd5e1dd77..a268617e358b 100644
--- a/share/man/man9/vm_page_lookup.9
+++ b/share/man/man9/vm_page_lookup.9
@@ -60,4 +60,4 @@ is returned if successful; otherwise,
 is returned.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_rename.9 b/share/man/man9/vm_page_rename.9
index bb8591fae3ab..64f6409b186c 100644
--- a/share/man/man9/vm_page_rename.9
+++ b/share/man/man9/vm_page_rename.9
@@ -69,4 +69,4 @@ at which the new page should be inserted.
 .El
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_page_wire.9 b/share/man/man9/vm_page_wire.9
index f988dd96e467..4722f71bdc6a 100644
--- a/share/man/man9/vm_page_wire.9
+++ b/share/man/man9/vm_page_wire.9
@@ -64,4 +64,4 @@ is set) then the page is left on
 .Dv PQ_NONE .
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vm_set_page_size.9 b/share/man/man9/vm_set_page_size.9
index 7f211d1bffc8..09afaba8341b 100644
--- a/share/man/man9/vm_set_page_size.9
+++ b/share/man/man9/vm_set_page_size.9
@@ -59,4 +59,4 @@ is not a power of two, the system will panic.
 must be called prior to any page size dependent functions.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vn_fullpath.9 b/share/man/man9/vn_fullpath.9
index eff2105f83a4..50c35c979f8c 100644
--- a/share/man/man9/vn_fullpath.9
+++ b/share/man/man9/vn_fullpath.9
@@ -122,4 +122,4 @@ otherwise, an error number is returned.
 .Xr free 9
 .Sh AUTHORS
 This manual page was written by
-.An Robert Watson Aq rwatson@FreeBSD.org .
+.An Robert Watson Aq Mt rwatson@FreeBSD.org .
diff --git a/share/man/man9/vn_isdisk.9 b/share/man/man9/vn_isdisk.9
index 59096347526e..76cdf96810cb 100644
--- a/share/man/man9/vn_isdisk.9
+++ b/share/man/man9/vn_isdisk.9
@@ -70,4 +70,4 @@ is returned and
 will contain the error number.
 .Sh AUTHORS
 This manual page was written by
-.An Chad David Aq davidc@acns.ab.ca .
+.An Chad David Aq Mt davidc@acns.ab.ca .
diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9
index cc80bde191e6..074d8ecfd8ed 100644
--- a/share/man/man9/vnode.9
+++ b/share/man/man9/vnode.9
@@ -170,7 +170,6 @@ intertwining of VM Objects and Vnodes.
 .Xr VOP_GETACL 9 ,
 .Xr VOP_GETEXTATTR 9 ,
 .Xr VOP_GETPAGES 9 ,
-.Xr VOP_GETVOBJECT 9 ,
 .Xr VOP_INACTIVE 9 ,
 .Xr VOP_IOCTL 9 ,
 .Xr VOP_LINK 9 ,
diff --git a/share/man/man9/watchdog.9 b/share/man/man9/watchdog.9
index 2df9fd6e450f..e43e739016fc 100644
--- a/share/man/man9/watchdog.9
+++ b/share/man/man9/watchdog.9
@@ -78,4 +78,4 @@ behaviour is recommended.
 The
 .Nm
 facility and this manual page was written
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
diff --git a/share/man/man9/zero_copy.9 b/share/man/man9/zero_copy.9
deleted file mode 100644
index 27498ffcaa3c..000000000000
--- a/share/man/man9/zero_copy.9
+++ /dev/null
@@ -1,171 +0,0 @@
-.\"
-.\" Copyright (c) 2002 Kenneth D. Merry.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd October 23, 2012
-.Dt ZERO_COPY 9
-.Os
-.Sh NAME
-.Nm zero_copy ,
-.Nm zero_copy_sockets
-.Nd "zero copy sockets code"
-.Sh SYNOPSIS
-.Cd "options SOCKET_SEND_COW"
-.Cd "options SOCKET_RECV_PFLIP"
-.Sh DESCRIPTION
-The
-.Fx
-kernel includes a facility for eliminating data copies on
-socket reads and writes.
-.Pp
-This code is collectively known as the zero copy sockets code, because during
-normal network I/O, data will not be copied by the CPU at all.
-Rather it
-will be DMAed from the user's buffer to the NIC (for sends), or DMAed from
-the NIC to a buffer that will then be given to the user (receives).
-.Pp
-The zero copy sockets code uses the standard socket read and write
-semantics, and therefore has some limitations and restrictions that
-programmers should be aware of when trying to take advantage of this
-functionality.
-.Pp
-For sending data, there are no special requirements or capabilities that
-the sending NIC must have.
-The data written to the socket, though, must be
-at least a page in size and page aligned in order to be mapped into the
-kernel.
-If it does not meet the page size and alignment constraints, it
-will be copied into the kernel, as is normally the case with socket I/O.
-.Pp
-The user should be careful not to overwrite buffers that have been written
-to the socket before the data has been freed by the kernel, and the
-copy-on-write mapping cleared.
-If a buffer is overwritten before it has
-been given up by the kernel, the data will be copied, and no savings in CPU
-utilization and memory bandwidth utilization will be realized.
-.Pp
-The
-.Xr socket 2
-API does not really give the user any indication of when his data has
-actually been sent over the wire, or when the data has been freed from
-kernel buffers.
-For protocols like TCP, the data will be kept around in
-the kernel until it has been acknowledged by the other side; it must be
-kept until the acknowledgement is received in case retransmission is required.
-.Pp
-From an application standpoint, the best way to guarantee that the data has
-been sent out over the wire and freed by the kernel (for TCP-based sockets)
-is to set a socket buffer size (see the
-.Dv SO_SNDBUF
-socket option in the
-.Xr setsockopt 2
-manual page) appropriate for the application and network environment and then
-make sure you have sent out twice as much data as the socket buffer size
-before reusing a buffer.
-For TCP, the send and receive socket buffer sizes
-generally directly correspond to the TCP window size.
-.Pp
-For receiving data, in order to take advantage of the zero copy receive
-code, the user must have a NIC that is configured for an MTU greater than
-the architecture page size.
-(E.g., for i386 it would be 4KB.)
-Additionally, in order for zero copy receive to work,
-packet payloads must be at least a page in size and page aligned.
-.Pp
-Achieving page aligned payloads requires a NIC that can split an incoming
-packet into multiple buffers.
-It also generally requires some sort of
-intelligence on the NIC to make sure that the payload starts in its own
-buffer.
-This is called
-.Dq "header splitting" .
-Currently the only NICs with
-support for header splitting are Alteon Tigon 2 based boards running
-slightly modified firmware.
-The
-.Fx
-.Xr ti 4
-driver includes modified firmware for Tigon 2 boards only.
-Header
-splitting code can be written, however, for any NIC that allows putting
-received packets into multiple buffers and that has enough programmability
-to determine that the header should go into one buffer and the payload into
-another.
-.Pp
-You can also do a form of header splitting that does not require any NIC
-modifications if your NIC is at least capable of splitting packets into
-multiple buffers.
-This requires that you optimize the NIC driver for your
-most common packet header size.
-If that size (ethernet + IP + TCP headers)
-is generally 66 bytes, for instance, you would set the first buffer in a
-set for a particular packet to be 66 bytes long, and then subsequent
-buffers would be a page in size.
-For packets that have headers that are
-exactly 66 bytes long, your payload will be page aligned.
-.Pp
-The other requirement for zero copy receive to work is that the buffer that
-is the destination for the data read from a socket must be at least a page
-in size and page aligned.
-.Pp
-Obviously the requirements for receive side zero copy are impossible to
-meet without NIC hardware that is programmable enough to do header
-splitting of some sort.
-Since most NICs are not that programmable, or their
-manufacturers will not share the source code to their firmware, this approach
-to zero copy receive is not widely useful.
-.Pp
-There are other approaches, such as RDMA and TCP Offload, that may
-potentially help alleviate the CPU overhead associated with copying data
-out of the kernel.
-Most known techniques require some sort of support at
-the NIC level to work, and describing such techniques is beyond the scope
-of this manual page.
-.Pp
-The zero copy send and zero copy receive code can be individually turned
-off via the
-.Va kern.ipc.zero_copy.send
-and
-.Va kern.ipc.zero_copy.receive
-.Nm sysctl
-variables respectively.
-.Sh SEE ALSO
-.Xr sendfile 2 ,
-.Xr socket 2 ,
-.Xr ti 4
-.Sh HISTORY
-The zero copy sockets code first appeared in
-.Fx 5.0 ,
-although it has
-been in existence in patch form since at least mid-1999.
-.Sh AUTHORS
-.An -nosplit
-The zero copy sockets code was originally written by
-.An Andrew Gallatin Aq gallatin@FreeBSD.org
-and substantially modified and updated by
-.An Kenneth Merry Aq ken@FreeBSD.org .
-.Sh BUGS
-The COW based send mechanism is not safe and may result in kernel crashes.
diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9
index d0af88ec2687..ed5939b0f31f 100644
--- a/share/man/man9/zone.9
+++ b/share/man/man9/zone.9
@@ -366,10 +366,10 @@ to function as a slab allocator.
 The zone allocator was written by
 .An John S. Dyson .
 The zone allocator was rewritten in large parts by
-.An Jeff Roberson Aq jeff@FreeBSD.org
+.An Jeff Roberson Aq Mt jeff@FreeBSD.org
 to function as a slab allocator.
 .Pp
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
 Changes for UMA by
-.An Jeroen Ruigrok van der Werven Aq asmodai@FreeBSD.org .
+.An Jeroen Ruigrok van der Werven Aq Mt asmodai@FreeBSD.org .
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index 930c91da4f41..c3a2d25b4651 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -291,21 +291,21 @@ FreeBSD 5.2           |      |                 |                       |
  |     |              |      |       |         |                       |
  |  FreeBSD           |      |    NetBSD 6.1.2 |                       |
  |    9.2          Mac OS X  |       |         |                       |
- |                   10.9    |       |    OpenBSD 5.4                  |
- |                    |      |       |         |               DragonFly 3.6.0
- |                    |      |       |         |                       |
- *--FreeBSD           |      |    NetBSD 6.1.3 |                       |
- |   10.0             |      |       |         |                       |
- |                    |      |       |         |               DragonFly 3.6.1
- |                    |      |       |         |                       |
- |                    |      |       |         |                       |
- |                    |      |       |         |               DragonFly 3.6.2
- |                    |      |    NetBSD 6.1.4 |                       |
- |                    |      |                 |                       |
- |                    |      |            OpenBSD 5.5                  |
- |                    |      |                 |               DragonFly 3.8.0
- |                    |      |                 |                       |
- |                    |      |                 |                       |
+ |     |             10.9    |       |    OpenBSD 5.4                  |
+ |     `-----.        |      |       |         |               DragonFly 3.6.0
+ |            \       |      |       |         |                       |
+ *--FreeBSD    |      |      |    NetBSD 6.1.3 |                       |
+ |   10.0      |      |      |       |         |                       |
+ |             |      |      |       |         |               DragonFly 3.6.1
+ |             |      |      |       |         |                       |
+ |             |      |      |       |         |                       |
+ |             |      |      |       |         |               DragonFly 3.6.2
+ |             |      |      |    NetBSD 6.1.4 |                       |
+ |             |      |      |                 |                       |
+ |             |      |      |            OpenBSD 5.5                  |
+ |             |      |      |                 |               DragonFly 3.8.0
+ |          FreeBSD   |      |                 |                       |
+ |            9.3     |      |                 |                       |
  |                    |      |                 |                       |
  |                    |      |                 |                       |
  |                    |      |                 |                       |
@@ -640,6 +640,7 @@ NetBSD 6.0.5		2014-04-19 [NDB]
 NetBSD 6.1.4		2014-04-19 [NDB]
 OpenBSD 5.5		2014-05-01 [OBD]
 DragonFly 3.8.0		2014-06-04 [DFB]
+FreeBSD 9.3		2014-07-05 [FBD]
 
 Bibliography
 ------------------------
diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot
index 778d86b8049d..914a1dd6379b 100644
--- a/share/misc/committers-ports.dot
+++ b/share/misc/committers-ports.dot
@@ -86,6 +86,7 @@ delphij [label="Xin Li\ndelphij@FreeBSD.org\n2006/05/01"]
 demon [label="Dmitry Sivachenko\ndemon@FreeBSD.org\n2000/11/13"]
 dhn [label="Dennis Herrmann\ndhn@FreeBSD.org\n2009/03/03"]
 dryice [label="Dryice Dong Liu\ndryice@FreeBSD.org\n2006/12/25"]
+dvl [label="Dan Langille\ndvl@FreeBSD.org\n2014/08/10"]
 eadler [label="Eitan Adler\neadler@FreeBSD.org\n2011/08/17"]
 edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2002/10/22"]
 ehaupt [label="Emanuel Haupt\nehaupt@FreeBSD.org\n2005/10/03"]
@@ -183,6 +184,7 @@ rene [label="Rene Ladan\nrene@FreeBSD.org\n2010/04/11"]
 riggs [label="Thomas Zander\nriggs@FreeBSD.org\n2014/01/09"]
 rm [label="Ruslan Makhmatkhanov\nrm@FreeBSD.org\n2011/11/06"]
 rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/07/21"]
+robak [label="Bartek Rutkowski\nrobak@FreeBSD.org\n2014/06/10"]
 rodrigo [label="Rodrigo Osorio\nrodrigo@FreeBSD.org\n2014/01/15"]
 romain [label="Romain Tartiere\nromain@FreeBSD.org\n2010/01/24"]
 sahil [label="Sahil Tandon\nsahil@FreeBSD.org\n2010/04/11"]
@@ -416,11 +418,14 @@ marcus -> bland
 marcus -> eik
 marcus -> jmallett
 
+marino -> robak
+
 makc -> bf
 makc -> jhale
 makc -> rakuco
 
 mat -> bmah
+mat -> dvl
 mat -> thierry
 
 mezz -> tmclaugh
@@ -524,6 +529,7 @@ steve -> netchild
 swills -> feld
 swills -> milki
 swills -> pclin
+swills -> robak
 swills -> xmj
 
 tabthorpe -> ashish
@@ -554,6 +560,7 @@ wen -> pawel
 
 wg -> alexey
 wg -> danilo
+wg -> dvl
 wg -> nemysis
 
 will -> lioux
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index 891efa31d3a9..100a0ce656c1 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -170,6 +170,7 @@ grehan [label="Peter Grehan\ngrehan@FreeBSD.org\n2002/08/08"]
 grog [label="Greg Lehey\ngrog@FreeBSD.org\n1998/08/30"]
 gshapiro [label="Gregory Shapiro\ngshapiro@FreeBSD.org\n2000/07/12"]
 harti [label="Hartmut Brandt\nharti@FreeBSD.org\n2003/01/29"]
+hiren [label="Hiren Panchasara\nhiren@FreeBSD.org\n2013/04/12"]
 hmp [label="Hiten Pandya\nhmp@FreeBSD.org\n2004/03/23"]
 ian [label="Ian Lepore\nian@FreeBSD.org\n2013/01/07"]
 iedowse [label="Ian Dowse\niedowse@FreeBSD.org\n2000/12/01"]
@@ -228,6 +229,7 @@ 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"]
+ngie [label="Garrett Cooper\nngie@FreeBSD.org\n2014/07/27"]
 nork [label="Norikatsu Shigemura\nnork@FreeBSD.org\n2009/06/09"]
 np [label="Navdeep Parhar\nnp@FreeBSD.org\n2009/06/05"]
 nwhitehorn [label="Nathan Whitehorn\nnwhitehorn@FreeBSD.org\n2008/07/03"]
@@ -512,6 +514,8 @@ jlemon -> brooks
 
 jmallett -> pkelsey
 
+jmmv -> ngie
+
 joerg -> brian
 joerg -> eik
 joerg -> jmg
@@ -623,6 +627,7 @@ rpaulo -> avg
 rpaulo -> bschmidt
 rpaulo -> dim
 rpaulo -> jmmv
+rpaulo -> ngie
 
 rrs -> brucec
 rrs -> jchandra
@@ -660,6 +665,7 @@ sam -> andre
 sam -> benjsc
 sam -> sephe
 
+sbruno -> hiren
 sbruno -> jimharris
 
 schweikh -> dds
diff --git a/share/misc/organization.dot b/share/misc/organization.dot
index 84b901410796..ece8a0d015ec 100644
--- a/share/misc/organization.dot
+++ b/share/misc/organization.dot
@@ -25,13 +25,13 @@ _misc [label="Miscellaneous Hats"]
 
 # Development teams go here alphabetically sorted
 
-core [label="Core Team\ncore@FreeBSD.org\ntabthorpe, gavin, jhb, kib,\ntheraven, hrs, peter, miwi"]
-coresecretary [label="Core Team Secretary\ncore-secretary@FreeBSD.org\npgj"]
+core [label="Core Team\ncore@FreeBSD.org\nbapt, emaste, gavin,\nglebius, gnn, hrs,\npeter, rwatson, theraven"]
+coresecretary [label="Core Team Secretary\ncore-secretary@FreeBSD.org\nmatthew"]
 doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"]
 doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor, hrs"]
 portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"]
-portmgr [label="Port Management Team\nportmgr@FreeBSD.org\ntabthorpe, marcus, bapt,\nerwin, bdrewery,\nitetcu, miwi"]
-portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\ntabthorpe"]
+portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nantoine, bapt, bdrewery,\ndecke, erwin, mat,\nmiwi, swills, tabthorpe"]
+portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nculot"]
 re [label="Primary Release Engineering Team\nre@FreeBSD.org\nkib, blackend, jpaetzel, hrs, kensmith"]
 secteam [label="Security Team\nsecteam@FreeBSD.org\nsimon, qingli, delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"]
 portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\nmiwi, rea, swills, wxs,\njgh, sbz, eadler, zi, remko, simon"]
diff --git a/share/mk/Makefile b/share/mk/Makefile
index 4ad624d852a9..cd69ca83f10c 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -11,7 +11,6 @@ FILES=	\
 	bsd.crunchgen.mk \
 	bsd.dep.mk \
 	bsd.doc.mk \
-	bsd.dtrace.mk \
 	bsd.endian.mk \
 	bsd.files.mk \
 	bsd.incs.mk \
diff --git a/share/mk/atf.test.mk b/share/mk/atf.test.mk
index 57cff5af1125..3c60d3bf5056 100644
--- a/share/mk/atf.test.mk
+++ b/share/mk/atf.test.mk
@@ -71,7 +71,7 @@ BINDIR.${_T}= ${TESTSDIR}
 MAN.${_T}?= # empty
 SRCS.${_T}?= ${_T}.c
 DPADD.${_T}+= ${LIBATF_C}
-LDADD.${_T}+= -latf-c
+LDADD.${_T}+= ${LDATF_C}
 USEPRIVATELIB+= atf-c
 TEST_INTERFACE.${_T}= atf
 .endfor
@@ -85,7 +85,7 @@ 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
+LDADD.${_T}+= ${LDATF_CXX} ${LDATF_C}
 USEPRIVATELIB+= atf-c++
 TEST_INTERFACE.${_T}= atf
 .endfor
@@ -105,7 +105,8 @@ ATF_TESTS_SH_SED_${_T}?= # empty
 ATF_TESTS_SH_SRC_${_T}?= ${_T}.sh
 ${_T}: ${ATF_TESTS_SH_SRC_${_T}}
 	echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp
-	cat ${.ALLSRC} | sed ${ATF_TESTS_SH_SED_${_T}} >>${.TARGET}.tmp
+	cat ${.ALLSRC:N*Makefile*} \
+	    | sed ${ATF_TESTS_SH_SED_${_T}} >>${.TARGET}.tmp
 	chmod +x ${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}
 .endfor
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 9740dac629ce..954984e040f2 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -231,7 +231,9 @@ LDADD		Additional loader objects.  Usually used for libraries.
 
 			LDADD=-lutil -lcompat
 
-LDFLAGS		Additional loader flags.
+LDFLAGS		Additional loader flags. Passed to the loader via CC,
+		since that's used to link programs as well, so loader
+		specific flags need to be prefixed with -Wl, to work.
 
 LINKS		The list of binary links; should be full pathnames, the
 		linked-to file coming first, followed by the linked
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 553351c52013..f786109cdfd3 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -10,8 +10,6 @@ _CPUCFLAGS =
 MACHINE_CPU = i486
 . elif ${MACHINE_CPUARCH} == "amd64"
 MACHINE_CPU = amd64 sse2 sse mmx
-. elif ${MACHINE_CPUARCH} == "ia64"
-MACHINE_CPU = itanium
 . elif ${MACHINE_CPUARCH} == "powerpc"
 MACHINE_CPU = aim
 . elif ${MACHINE_CPUARCH} == "sparc64"
@@ -234,10 +232,6 @@ MACHINE_CPU = ssse3 sse3
 MACHINE_CPU = sse3
 .  endif
 MACHINE_CPU += amd64 sse2 sse mmx
-. elif ${MACHINE_CPUARCH} == "ia64"
-.  if ${CPUTYPE} == "itanium"
-MACHINE_CPU = itanium
-.  endif
 . elif ${MACHINE_ARCH} == "powerpc"
 .  if ${CPUTYPE} == "e500"
 MACHINE_CPU = booke
@@ -266,3 +260,4 @@ CFLAGS += ${_CPUCFLAGS}
 # Add in any architecture-specific CFLAGS.  
 # These come from make.conf or the command line or the environment.
 CFLAGS += ${CFLAGS.${MACHINE_ARCH}}
+CXXFLAGS += ${CXXFLAGS.${MACHINE_ARCH}}
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index deac736c2d37..14619eb93c7a 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -73,15 +73,16 @@ tags: ${SRCS}
 CLEANFILES?=
 
 .if !exists(${.OBJDIR}/${DEPENDFILE})
-.for _S in ${SRCS:N*.[hly]}
+.for _S in ${SRCS:N*.[dhly]}
 ${_S:R}.o: ${_S}
 .endfor
 .endif
 
+# Lexical analyzers
 .for _LSRC in ${SRCS:M*.l:N*/*}
 .for _LC in ${_LSRC:R}.c
 ${_LC}: ${_LSRC}
-	${LEX} -t ${LFLAGS} ${.ALLSRC} > ${.TARGET}
+	${LEX} ${LFLAGS} -o${.TARGET} ${.ALLSRC}
 .if !exists(${.OBJDIR}/${DEPENDFILE})
 ${_LC:R}.o: ${_LC}
 .endif
@@ -90,6 +91,7 @@ CLEANFILES+= ${_LC}
 .endfor
 .endfor
 
+# Yacc grammars
 .for _YSRC in ${SRCS:M*.y:N*/*}
 .for _YC in ${_YSRC:R}.c
 SRCS:=	${SRCS:S/${_YSRC}/${_YC}/}
@@ -117,6 +119,38 @@ ${_YC:R}.o: ${_YC}
 .endif
 .endfor
 .endfor
+
+# DTrace probe definitions
+# libelf is currently needed for drti.o
+.if ${SRCS:M*.d}
+LDFLAGS+=	-lelf
+LDADD+=		${LIBELF}
+CFLAGS+=	-D_DTRACE_VERSION=1 -I${.OBJDIR}
+.endif
+.for _DSRC in ${SRCS:M*.d:N*/*}
+.for _D in ${_DSRC:R}
+DHDRS+=	${_D}.h
+${_D}.h: ${_DSRC}
+	${DTRACE} -xnolibs -h -s ${.ALLSRC}
+SRCS:=	${SRCS:S/${_DSRC}/${_D}.h/}
+OBJS+=	${_D}.o
+CLEANFILES+= ${_D}.h ${_D}.o
+${_D}.o: ${_D}.h ${OBJS:S/${_D}.o//}
+	${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.CURDIR}/${_DSRC} \
+		${OBJS:S/${_D}.o//}
+.if defined(LIB)
+CLEANFILES+= ${_D}.So ${_D}.po
+${_D}.So: ${_D}.h ${SOBJS:S/${_D}.So//}
+	${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.CURDIR}/${_DSRC} \
+		${SOBJS:S/${_D}.So//}
+${_D}.po: ${_D}.h ${POBJS:S/${_D}.po//}
+	${DTRACE} -xnolibs -G -o ${.TARGET} -s ${.CURDIR}/${_DSRC} \
+		${POBJS:S/${_D}.po//}
+.endif
+.endfor
+.endfor
+beforedepend: ${DHDRS}
+beforebuild: ${DHDRS}
 .endif
 
 .if !target(depend)
diff --git a/share/mk/bsd.dtrace.mk b/share/mk/bsd.dtrace.mk
deleted file mode 100644
index 518de30ff339..000000000000
--- a/share/mk/bsd.dtrace.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# $FreeBSD$
-#
-# Copyright (c) 2010 The FreeBSD Foundation 
-# All rights reserved. 
-# 
-# This software was developed by Rui Paulo under sponsorship from the
-# FreeBSD Foundation. 
-#  
-# Redistribution and use in source and binary forms, with or without 
-# modification, are permitted provided that the following conditions 
-# are met: 
-# 1. Redistributions of source code must retain the above copyright 
-#    notice, this list of conditions and the following disclaimer. 
-# 2. Redistributions in binary form must reproduce the above copyright 
-#    notice, this list of conditions and the following disclaimer in the 
-#    documentation and/or other materials provided with the distribution. 
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND 
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
-# SUCH DAMAGE. 
-# 
-#
-# The only variable that you should define on your Makefile is 'DTRACEOBJS'.
-# You must include this file before bsd.lib.mk or bsd.prog.mk.
-#
-
-.if defined(WITH_DTRACE)
-
-CFLAGS+=-DWITH_DTRACE
-DTRACEHEADERS=${DTRACEOBJS:S/o$/h/}
-DTRACESRCS=${DTRACEOBJS:S/o$/d/}
-CLEANFILES+=${DTRACEOBJS} ${DTRACEHEADERS}
-
-DPADD+=${LIBELF}
-LDADD+=-lelf
-
-.if defined(PROG)
-_DTRACELINKING=${OBJS}
-OBJS+=${DTRACEOBJS}
-.else
-_DTRACELINKING=${SOBJS}
-SOBJS+=${DTRACEOBJS}
-.endif
-
-${DTRACEOBJS}:
-
-beforedepend:
-	${DTRACE} -C -h -s ${DTRACESRCS}
-beforelinking:
-	${DTRACE} -G -s ${DTRACESRCS} ${_DTRACELINKING:S/${DTRACEOBJS}//}
-
-.endif
diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk
index 15306a072a51..565d1aa04790 100644
--- a/share/mk/bsd.endian.mk
+++ b/share/mk/bsd.endian.mk
@@ -2,7 +2,6 @@
 
 .if ${MACHINE_ARCH} == "amd64" || \
     ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "ia64" || \
     ${MACHINE_ARCH} == "arm"  || \
     ${MACHINE_ARCH} == "armv6"  || \
     ${MACHINE_ARCH} == "armv6hf"  || \
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index f3f0d45487e1..f0acf16772d3 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -45,7 +45,8 @@ STRIP?=	-s
 
 .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
     empty(DEBUG_FLAGS:M-gdwarf*)
-CFLAGS+= -g
+SHARED_CFLAGS+= -g
+SHARED_CXXFLAGS+= -g
 CTFFLAGS+= -g
 .endif
 
@@ -117,7 +118,8 @@ PO_FLAG=-pg
 	${CC} ${PICFLAG} -DPIC ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 	${CTFCONVERT_CMD}
 
-all: objwarn
+all: beforebuild .WAIT
+beforebuild: objwarn
 
 .if defined(PRIVATELIB)
 _LIBDIR:=${LIBPRIVATEDIR}
@@ -154,11 +156,12 @@ LDFLAGS+=	-Wl,--version-script=${VERSION_MAP}
 .endif
 
 .if defined(USEPRIVATELIB)
-LDFLAGS+= -L${_SHLIBDIRPREFIX}${LIBPRIVATEDIR} -rpath ${LIBPRIVATEDIR}
+LDFLAGS+= -rpath ${LIBPRIVATEDIR}
 .endif
 
 .if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME)
 OBJS+=		${SRCS:N*.h:R:S/$/.o/}
+NOPATH_FILES+=	${OBJS}
 .endif
 
 .if defined(LIB) && !empty(LIB)
@@ -180,6 +183,7 @@ lib${LIB}.a: ${OBJS} ${STATICOBJS}
 .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
 _LIBS+=		lib${LIB}_p.a
 POBJS+=		${OBJS:.o=.po} ${STATICOBJS:.o=.po}
+NOPATH_FILES+=	${POBJS}
 
 lib${LIB}_p.a: ${POBJS}
 	@${ECHO} building profiled ${LIB} library
@@ -195,6 +199,7 @@ lib${LIB}_p.a: ${POBJS}
 .if defined(SHLIB_NAME) || \
     defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
 SOBJS+=		${OBJS:.o=.So}
+NOPATH_FILES+=	${SOBJS}
 .endif
 
 .if defined(SHLIB_NAME)
@@ -253,6 +258,7 @@ lib${LIB}_pic.a: ${SOBJS}
 LINTLIB=	llib-l${LIB}.ln
 _LIBS+=		${LINTLIB}
 LINTOBJS+=	${SRCS:M*.c:.c=.ln}
+NOPATH_FILES+=	${LINTOBJS}
 
 ${LINTLIB}: ${LINTOBJS}
 	@${ECHO} building lint library ${.TARGET}
@@ -301,11 +307,11 @@ _SHLINSTALLFLAGS:=	${_SHLINSTALLFLAGS${ie}}
 realinstall: _libinstall
 .ORDER: beforeinstall _libinstall
 _libinstall:
-.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
+.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" && !defined(PRIVATELIB)
 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
 .endif
-.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
+.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) && !defined(PRIVATELIB)
 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
 .endif
@@ -321,7 +327,7 @@ _libinstall:
 	    ${_INSTALLFLAGS} \
 	    ${SHLIB_NAME}.debug ${DESTDIR}${DEBUGFILEDIR}
 .endif
-.if defined(SHLIB_LINK)
+.if defined(SHLIB_LINK) && !defined(PRIVATELIB)
 # ${_SHLIBDIRPREFIX} and ${_LDSCRIPTROOT} are both needed when cross-building
 # and when building 32 bits library shims.  ${_SHLIBDIRPREFIX} is the directory
 # prefix where shared objects will be installed by the install target.
@@ -362,7 +368,7 @@ _libinstall:
 .endif # SHLIB_LDSCRIPT
 .endif # SHLIB_LINK
 .endif # SHIB_NAME
-.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
+.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" && !defined(PRIVATELIB)
 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}
 .endif
@@ -453,6 +459,10 @@ clean:
 .endif
 .endif
 
+.if !empty(_LIBS)
+NOPATH_FILES+=	${_LIBS}
+.endif
+
 .include <bsd.obj.mk>
 
 .include <bsd.sys.mk>
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index eb0509b4609e..c7ad449240f0 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -8,13 +8,13 @@
 .error bsd.libnames.mk cannot be included directly.
 .endif
 
+.sinclude <src.libnames.mk>
+
 LIBCRT0?=	${DESTDIR}${LIBDIR}/crt0.o
 
 LIBALIAS?=	${DESTDIR}${LIBDIR}/libalias.a
 LIBARCHIVE?=	${DESTDIR}${LIBDIR}/libarchive.a
 LIBASN1?=	${DESTDIR}${LIBDIR}/libasn1.a
-LIBATF_C?=	${DESTDIR}${LIBPRIVATEDIR}/libatf-c.a
-LIBATF_CXX?=	${DESTDIR}${LIBPRIVATEDIR}/libatf-c++.a
 LIBATM?=	${DESTDIR}${LIBDIR}/libatm.a
 LIBAUDITD?=	${DESTDIR}${LIBDIR}/libauditd.a
 LIBAVL?=	${DESTDIR}${LIBDIR}/libavl.a
@@ -57,10 +57,7 @@ LIBGNUREGEX?=	${DESTDIR}${LIBDIR}/libgnuregex.a
 LIBGSSAPI?=	${DESTDIR}${LIBDIR}/libgssapi.a
 LIBGSSAPI_KRB5?= ${DESTDIR}${LIBDIR}/libgssapi_krb5.a
 LIBHDB?=	${DESTDIR}${LIBDIR}/libhdb.a
-LIBHISTORY?=	${DESTDIR}${LIBDIR}/libhistory.a
 LIBHEIMBASE?=	${DESTDIR}${LIBDIR}/libheimbase.a
-LIBHEIMIPCC?=	${DESTDIR}${LIBPRIVATEDIR}/libheimipcc.a
-LIBHEIMIPCS?=	${DESTDIR}${LIBPRIVATEDIR}/libheimipcs.a
 LIBHEIMNTLM?=	${DESTDIR}${LIBDIR}/libheimntlm.a
 LIBHEIMSQLITE?=	${DESTDIR}${LIBDIR}/libheimsqlite.a
 LIBHX509?=	${DESTDIR}${LIBDIR}/libhx509.a
@@ -75,7 +72,6 @@ LIBKICONV?=	${DESTDIR}${LIBDIR}/libkiconv.a
 LIBKRB5?=	${DESTDIR}${LIBDIR}/libkrb5.a
 LIBKVM?=	${DESTDIR}${LIBDIR}/libkvm.a
 LIBL?=		${DESTDIR}${LIBDIR}/libl.a
-LIBLDNS?=	${DESTDIR}${LIBPRIVATEDIR}/libldns.a
 LIBLN?=		"don't use LIBLN, use LIBL"
 LIBLZMA?=	${DESTDIR}${LIBDIR}/liblzma.a
 LIBM?=		${DESTDIR}${LIBDIR}/libm.a
@@ -127,7 +123,6 @@ LIBPROC?=	${DESTDIR}${LIBDIR}/libproc.a
 LIBPROCSTAT?=	${DESTDIR}${LIBDIR}/libprocstat.a
 LIBPTHREAD?=	${DESTDIR}${LIBDIR}/libpthread.a
 LIBRADIUS?=	${DESTDIR}${LIBDIR}/libradius.a
-LIBREADLINE?=	${DESTDIR}${LIBDIR}/libreadline.a
 LIBROKEN?=	${DESTDIR}${LIBDIR}/libroken.a
 LIBRPCSVC?=	${DESTDIR}${LIBDIR}/librpcsvc.a
 LIBRPCSEC_GSS?=	${DESTDIR}${LIBDIR}/librpcsec_gss.a
@@ -136,7 +131,6 @@ LIBRTLD_DB?=	${DESTDIR}${LIBDIR}/librtld_db.a
 LIBSBUF?=	${DESTDIR}${LIBDIR}/libsbuf.a
 LIBSDP?=	${DESTDIR}${LIBDIR}/libsdp.a
 LIBSMB?=	${DESTDIR}${LIBDIR}/libsmb.a
-LIBSSH?=	${DESTDIR}${LIBPRIVATEDIR}/libssh.a
 LIBSSL?=	${DESTDIR}${LIBDIR}/libssl.a
 LIBSTAND?=	${DESTDIR}${LIBDIR}/libstand.a
 LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a
@@ -144,11 +138,9 @@ LIBTACPLUS?=	${DESTDIR}${LIBDIR}/libtacplus.a
 LIBTERMCAP?=	${DESTDIR}${LIBDIR}/libtermcap.a
 LIBTERMLIB?=	"don't use LIBTERMLIB, use LIBTERMCAP"
 LIBTINFO?=	"don't use LIBTINFO, use LIBNCURSES"
-LIBUCL?=	${DESTDIR}${LIBPRIVATEDIR}/libucl.a
 LIBUFS?=	${DESTDIR}${LIBDIR}/libufs.a
 LIBUGIDFW?=	${DESTDIR}${LIBDIR}/libugidfw.a
 LIBUMEM?=	${DESTDIR}${LIBDIR}/libumem.a
-LIBUNBOUND?=	${DESTDIR}${LIBPRIVATEDIR}/libunbound.a
 LIBUSBHID?=	${DESTDIR}${LIBDIR}/libusbhid.a
 LIBUSB?=	${DESTDIR}${LIBDIR}/libusb.a
 LIBULOG?=	${DESTDIR}${LIBDIR}/libulog.a
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index 634261eba594..95122e8ea01b 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -119,8 +119,9 @@ cleanobj: clean cleandepend
 	@if [ -L ${.CURDIR}/obj ]; then rm -f ${.CURDIR}/obj; fi
 
 # Tell bmake not to look for generated files via .PATH
-.if !empty(CLEANFILES)
-.NOPATH: ${CLEANFILES}
+NOPATH_FILES+=	${CLEANFILES}
+.if !empty(NOPATH_FILES)
+.NOPATH: ${NOPATH_FILES}
 .endif
 
 .if !target(clean)
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index 6b5ad51c5434..4539e92e9ca8 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -51,7 +51,6 @@ __<bsd.opts.mk>__:
 __DEFAULT_YES_OPTIONS = \
     ASSERT_DEBUG \
     DOCCOMPRESS \
-    INFO \
     INSTALLLIB \
     KERBEROS \
     MAN \
@@ -69,6 +68,7 @@ __DEFAULT_NO_OPTIONS = \
     CTF \
     DEBUG_FILES \
     INSTALL_AS_USER \
+    INFO \
     PIE
 
 .include <bsd.mkopt.mk>
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 229ce8e1fe64..b83e2ca1f00b 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -159,7 +159,8 @@ MAN1=	${MAN}
 .endif
 .endif # defined(PROG)
 
-all: objwarn ${PROG} ${SCRIPTS}
+all: beforebuild .WAIT ${PROG} ${SCRIPTS}
+beforebuild: objwarn
 .if ${MK_MAN} != "no"
 all: _manpages
 .endif
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index b0ce12039088..f76d5e12321a 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -80,7 +80,11 @@ __subdir_targets=
 __subdir_targets+= .WAIT
 .else
 __subdir_targets+= ${__target}_subdir_${__dir}
-${__target}_subdir_${__dir}: .MAKE
+__deps=
+.for __dep in ${SUBDIR_DEPEND_${__dir}}
+__deps+= ${__target}_subdir_${__dep}
+.endfor
+${__target}_subdir_${__dir}: .MAKE ${__deps}
 .if !defined(NO_SUBDIR)
 	@${_+_}set -e; \
 		if test -d ${.CURDIR}/${__dir}.${MACHINE_ARCH}; then \
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index f019e5ebc593..58d617149402 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -126,12 +126,12 @@ CFLAGS.clang+=	 -fno-dwarf2-cfi-asm
 # but not yet.
 CXXFLAGS.clang+=	 -Wno-c++11-extensions
 
-.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
+.if ${MK_SSP} != "no" && \
     ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
 # Don't use -Wstack-protector as it breaks world with -Werror.
 SSP_CFLAGS?=	-fstack-protector
 CFLAGS+=	${SSP_CFLAGS}
-.endif # SSP && !IA64 && !ARM && !MIPS
+.endif # SSP && !ARM && !MIPS
 
 # Allow user-specified additional warning flags, plus compiler specific flag overrides.
 # Unless we've overriden this...
diff --git a/share/mk/plain.test.mk b/share/mk/plain.test.mk
index 99685ef1d966..f26bab3e42ef 100644
--- a/share/mk/plain.test.mk
+++ b/share/mk/plain.test.mk
@@ -57,7 +57,8 @@ CLEANFILES+= ${_T} ${_T}.tmp
 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
+	cat ${.ALLSRC:N*Makefile*} \
+	    | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp
 	chmod +x ${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}
 .endfor
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
new file mode 100644
index 000000000000..09a44ee2d526
--- /dev/null
+++ b/share/mk/src.libnames.mk
@@ -0,0 +1,50 @@
+# $FreeBSD$
+#
+# The include file <src.libnames.mk> define library names suitable
+# for INTERNALLIB and PRIVATELIB definition
+
+.if !target(__<bsd.init.mk>__)
+.error src.libnames.mk cannot be included directly.
+.endif
+
+ROOTOBJDIR=	${.OBJDIR:S/${.CURDIR}//}${.MAKE.MAKEFILES:M*/src.libnames.mk:H:H:H}
+
+LIBATF_CDIR=	${ROOTOBJDIR}/lib/atf/libatf-c
+LDATF_C?=	${LIBATF_CDIR}/libatf-c.so
+LIBATF_C?=	${LIBATF_CDIR}/libatf-c.a
+
+LIBATF_CXXDIR=	${ROOTOBJDIR}/lib/atf/libatf-c++
+LDATF_CXX?=	${LIBATF_CXXDIR}/libatf-c++.so
+LIBATF_CXX?=	${LIBATF_CXXDIR}/libatf-c++.a
+
+LIBHEIMIPCCDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimipcc
+LDHEIMIPCC?=	${LIBHEIMIPCCDIR}/libheimipcc.so
+LIBHEIMIPCC?=	${LIBHEIMIPCCDIR}/libheimipcc.a
+
+LIBHEIMIPCSDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimipcs
+LDHEIMIPCS?=	${LIBHEIMIPCSDIR}/libheimipcs.so
+LIBHEIMIPCS?=	${LIBHEIMIPCSDIR}/libheimipcs.a
+
+LIBLDNSDIR=	${ROOTOBJDIR}/lib/libldns
+LDLDNS?=	${LIBLDNSDIR}/libldns.so
+LIBLDNS?=	${LIBLDNSDIR}/libldns.a
+
+LIBSSHDIR=	${ROOTOBJDIR}/secure/lib/libssh
+LDSSH?=		${LIBSSHDIR}/libssh.so
+LIBSSH?=	${LIBSSHDIR}/libssh.a
+
+LIBUNBOUNDDIR=	${ROOTOBJDIR}/lib/libunbound
+LDUNBOUND?=	${LIBUNBOUNDDIR}/libunbound.so
+LIBUNBOUND?=	${LIBUNBOUNDDIR}/libunbound.a
+
+LIBUCLDIR=	${ROOTOBJDIR}/lib/libucl
+LDUCL?=		${LIBUCLDIR}/libucl.so
+LIBUCL?=	${LIBUCLDIR}/libucl.a
+
+LIBREADLINEDIR=	${ROOTOBJDIR}/gnu/lib/libreadline/readline
+LDREADLINE?=	${LIBREADLINEDIR}/libreadline.a
+LIBREADLINE?=	${LIBREADLINEDIR}/libreadline.a
+
+LIBOHASHDIR=	${ROOTOBJDIR}/lib/libohash
+LDOHASH?=	${LIBOHASHDIR}/libohash.a
+LIBOHASH?=	${LIBOHASHDIR}/libohash.a
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index c68028538089..a4f3e25ce5cc 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -68,6 +68,7 @@ __DEFAULT_YES_OPTIONS = \
     CROSS_COMPILER \
     CRYPT \
     CTM \
+    CUSE \
     CXX \
     DICT \
     DMAGENT \
@@ -143,12 +144,13 @@ __DEFAULT_YES_OPTIONS = \
     SYSINSTALL \
     TCSH \
     TELNET \
+    TESTS \
     TEXTPROC \
     UNBOUND \
     USB \
     UTMPX \
     VI \
-    VT_SUPPORT \
+    VT \
     WIRELESS \
     WPA_SUPPLICANT_EAPOL \
     ZFS \
@@ -168,7 +170,6 @@ __DEFAULT_NO_OPTIONS = \
     SHARED_TOOLCHAIN \
     SORT_THREADS \
     SVN \
-    TESTS \
     USB_GADGET_EXAMPLES
 
 #
@@ -204,18 +205,11 @@ __DEFAULT_NO_OPTIONS+=CLANG CLANG_FULL CLANG_BOOTSTRAP
 .if ${__T} == "amd64" || ${__T} == "arm" || ${__T} == "armv6" || \
     ${__T} == "armv6hf" || ${__T} == "i386"
 __DEFAULT_YES_OPTIONS+=CLANG_IS_CC
-__DEFAULT_NO_OPTIONS+=GNUCXX
-# The pc98 bootloader requires gcc to build and so we must leave gcc enabled
-# for pc98 for now.
-.if ${__TT} == "pc98"
-__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP
-.else
-__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP
-.endif
+__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
 .else
 # If clang is not cc, then build gcc by default
 __DEFAULT_NO_OPTIONS+=CLANG_IS_CC CLANG CLANG_BOOTSTRAP
-__DEFAULT_YES_OPTIONS+=GCC GNUCXX GCC_BOOTSTRAP
+__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
 .endif
 
 .include <bsd.mkopt.mk>
@@ -275,6 +269,7 @@ MK_KERBEROS:=	no
 .if ${MK_CXX} == "no"
 MK_CLANG:=	no
 MK_GROFF:=	no
+MK_GNUCXX:=	no
 .endif
 
 .if ${MK_MAIL} == "no"
diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk
index 03aefc4f1e4d..2682dca0d7bf 100644
--- a/share/mk/src.sys.mk
+++ b/share/mk/src.sys.mk
@@ -9,5 +9,5 @@
 SRCCONF?=	/etc/src.conf
 .if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_)
 .include "${SRCCONF}"
-_srcconf_included_:
+_srcconf_included_:	.NOTMAIN
 .endif
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 9f5852cb7800..981b750adb18 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -117,7 +117,8 @@ LEX		?=	lex
 LFLAGS		?=
 
 LD		?=	ld
-LDFLAGS		?=
+LDFLAGS		?=				# LDFLAGS is for CC, 
+_LDFLAGS	=	${LDFLAGS:S/-Wl,//g}	# strip -Wl, for LD
 
 LINT		?=	lint
 LINTFLAGS	?=	-cghapbx
diff --git a/share/mk/tap.test.mk b/share/mk/tap.test.mk
index 4c056616c4c5..058ebdfeae9b 100644
--- a/share/mk/tap.test.mk
+++ b/share/mk/tap.test.mk
@@ -66,7 +66,7 @@ TAP_TESTS_PERL_SRC_${_T}?= ${_T}.pl
 ${_T}: ${TAP_TESTS_PERL_SRC_${_T}}
 	{ \
 	    echo '#! ${TAP_PERL_INTERPRETER}'; \
-	    cat ${.ALLSRC} | sed ${TAP_TESTS_PERL_SED_${_T}}; \
+	    cat ${.ALLSRC:N*Makefile*} | sed ${TAP_TESTS_PERL_SED_${_T}}; \
 	} >${.TARGET}.tmp
 	chmod +x ${.TARGET}.tmp
 	mv ${.TARGET}.tmp ${.TARGET}
diff --git a/share/termcap/termcap.src b/share/termcap/termcap.src
index 23536f60526b..08a1c8333c42 100644
--- a/share/termcap/termcap.src
+++ b/share/termcap/termcap.src
@@ -36,7 +36,7 @@
 #	John Kunze, Berkeley
 #	Craig Leres, Berkeley
 #
-# Please submit changes with send-pr(1).
+# Please submit changes via https://bugs.freebsd.org/submit/
 #
 # << EOH - after reordering, above header lines survive and this line dies >>
 #
diff --git a/share/vt/fonts/Makefile b/share/vt/fonts/Makefile
index f8a27001c8a6..05e99a5fe6bf 100644
--- a/share/vt/fonts/Makefile
+++ b/share/vt/fonts/Makefile
@@ -3,13 +3,18 @@
 FILES=	gallant.fnt \
 	vgarom-8x8.fnt \
 	vgarom-8x14.fnt \
-	vgarom-8x16.fnt
+	vgarom-8x16.fnt \
+	vgarom-thin-8x8.fnt \
+	vgarom-thin-8x16.fnt
 
 CLEANFILES+=	${FILES}
 
-.SUFFIXES: .uu
-.uu:
-	uudecode < ${.IMPSRC}
+.SUFFIXES: .fnt .fnt.uu .hex
+.hex.fnt:
+	vtfontcvt ${.IMPSRC} ${.TARGET}
+
+.fnt.uu.fnt:
+	uudecode -p < ${.IMPSRC} > ${.TARGET}
 
 FILESDIR=	${SHAREDIR}/vt/fonts
 
diff --git a/share/vt/fonts/vgarom-8x14.fnt.uu b/share/vt/fonts/vgarom-8x14.fnt.uu
deleted file mode 100644
index d0b9e3e4b2b6..000000000000
--- a/share/vt/fonts/vgarom-8x14.fnt.uu
+++ /dev/null
@@ -1,98 +0,0 @@
-# $FreeBSD$
-begin 644 vgarom-8x14.fnt
-M5D9.5#`P,#((#@``````_@```%``````````````````````````````````
-M````&#P\/!@8`!@8`````&9F9B0``````````````&QL_FQL;/YL;````!@8
-M?,;"P'P&AL9\&!@``````,+&#!@P9L8``````#AL;#AVW,S,=@`````P,#!@
-M```````````````,&#`P,#`P&`P``````#`8#`P,#`P8,`````````!F//\\
-M9@```````````!@8?A@8`````````````````!@8&#```````````/X`````
-M````````````````&!@```````(&#!@P8,"`````````?,;.WO;FQL9\````
-M```8.'@8&!@8&'X``````'S&!@P8,&#&_@``````?,8&!CP&!L9\```````,
-M'#QLS/X,#!X``````/[`P,#\!@;&?```````.&#`P/S&QL9\``````#^Q@8,
-M&#`P,#```````'S&QL9\QL;&?```````?,;&QGX&!@QX````````&!@````8
-M&``````````8&````!@8,```````!@P8,&`P&`P&``````````!^``!^````
-M`````&`P&`P&#!@P8```````?,;&#!@8`!@8``````!\QL;>WM[<P'P`````
-M`!`X;,;&_L;&Q@``````_&9F9GQF9F;\```````\9L+`P,#"9CP``````/AL
-M9F9F9F9L^```````_F9B:'AH8F;^``````#^9F)H>&A@8/```````#QFPL#`
-MWL9F.@``````QL;&QO[&QL;&```````\&!@8&!@8&#P``````!X,#`P,#,S,
-M>```````YF9L;'AL;&;F``````#P8&!@8&!B9OX``````,;N_O[6QL;&Q@``
-M````QN;V_M[.QL;&```````X;,;&QL;&;#@``````/QF9F9\8&!@\```````
-M?,;&QL;6WGP,#@````#\9F9F?&QF9N8``````'S&QF`X#,;&?```````?GY:
-M&!@8&!@\``````#&QL;&QL;&QGP``````,;&QL;&QFPX$```````QL;&QM;6
-M_GQL``````#&QFPX.#ALQL8``````&9F9F8\&!@8/```````_L:,&#!@PL;^
-M```````\,#`P,#`P,#P``````(#`X'`X'`X&`@``````/`P,#`P,#`P\````
-M$#ALQ@````````````````````````````#_`#`P&```````````````````
-M``!X#'S,S'8``````.!@8'AL9F9F?```````````?,;`P,9\```````<#`P\
-M;,S,S'8``````````'S&_L#&?```````.&QD8/!@8&#P``````````!VS,S,
-M?`S,>````.!@8&QV9F9FY@``````&!@`.!@8&!@\```````&!@`.!@8&!F9F
-M/````.!@8&9L>&QFY@``````.!@8&!@8&!@\``````````#L_M;6UL8`````
-M`````-QF9F9F9@``````````?,;&QL9\``````````#<9F9F?&!@\```````
-M`';,S,Q\#`P>````````W'9F8&#P``````````!\QG`<QGP``````!`P,/PP
-M,#`V'```````````S,S,S,QV``````````!F9F9F/!@``````````,;&UM;^
-M;```````````QFPX.&S&``````````#&QL;&?@8,^````````/[,&#!F_@``
-M````#A@8&'`8&!@.```````8&!@8`!@8&!@``````'`8&!@.&!@8<```````
-M=MP````````````````8&``8&#P\/!@`````&!@\9F!@9CP8&``````X;&1@
-M\&!@8.;\``````!F9CP8?AA^&!@`````?,9@.&S&QFPX#,9\```\;&P^`'X`
-M`````````````#9LV&PV``````````````#^!@8&```````X;&PX````````
-M````````&!A^&!@``/\`````<-@P8,CX``````````````!F9F9F?&!@P```
-M``!_V]O;>QL;&QL`````````````&``````````X;&PX`'P`````````````
-M`-AL-FS8````````P,#&S-@P9LZ>/@8&``#`P,;,V#!@W(8,&#X````P,``P
-M,&#&QGP`````QL80.&S&QO[&Q@```#AL.``X;,;&_L;&```````^;,S,_LS,
-MS,X``````#QFPL#`PF8\#`9\`!@P8`#^9F!\8&;^````=MP`QN;V_M[.QL8`
-M````QL8X;,;&QL9L.`````#&Q@#&QL;&QL9\`````````'S&_,;&_,#`0```
-M8#`8`'@,?,S,=@`````8,&``>`Q\S,QV`````!`X;`!X#'S,S'8``````,S,
-M`'@,?,S,=@`````X;#@`>`Q\S,QV`````````,QV-G[8V&X`````````/&9@
-M9CP,!CP```!@,!@`?,;^P,9\``````P8,`!\QO[`QGP`````$#AL`'S&_L#&
-M?```````S,P`?,;^P,9\`````&`P&``X&!@8&#P`````#!@P`#@8&!@8/```
-M```8/&8`.!@8&!@\``````!F9@`X&!@8&#P``````';<`-QF9F9F9@````!@
-M,!@`?,;&QL9\`````!@P8`!\QL;&QGP`````$#AL`'S&QL;&?```````QL8`
-M?,;&QL9\````````&!@`?@`8&```````8#`8`,S,S,S,=@`````8,&``S,S,
-MS,QV`````#!XS`#,S,S,S'8``````,S,`,S,S,S,=@``````QL8`QL;&QGX&
-M#'@```X;&!@8?A@8&!C8<````/[&QL#`P,#`P```````.&S&QO[&QFPX````
-M``#^QF`P&#!@QOX``````'X8/&9F9CP8?@``````.&S&QL9L;&SN````````
-M``!VW-C8W'8``````!XP&`P^9F9F/```````'#!@8'Q@8#`<`````````/YL
-M;&QL;&P``````````'[8V-C8<`````````!VW!@8&!@8```````#!G[;V_-^
-M8,```````````!@\/!@`````````9F9F9F9F`&9F`````-AL;&QL;```````
-M````^,S,^,3,WLS,Q@`````````P8/Y@,``````````8/'X8&!@8&!@`````
-M````&`S^#!@`````````&!@8&!@8?CP8`````````"AL_FPH`````````!@\
-M?A@8&'X\&```````&#Q^&!@8?CP8?@``````````&!@`````````#PP,#`P,
-M[&P\'```````````?MO;?@````````````#`P,#^``````````!\QL;&QL;&
-MQ@````````!VW`!VW```````````_@``_@``_@````````P8,&`P&`P`?@``
-M````,!@,!@P8,`!^`````````!`X;,;&_@````````````#^P,#`````````
-M#AL;&!@8&!@8&!@8&!@8&!@8&!C8V'``````````````_P```````!@8&!@8
-M&!@8&!@8&!@8`````````!\8&!@8&!@`````````^!@8&!@8&!@8&!@8&!@?
-M````````&!@8&!@8&/@````````8&!@8&!@8'Q@8&!@8&!@8&!@8&!CX&!@8
-M&!@8`````````/\8&!@8&!@8&!@8&!@8_P```````!@8&!@8&!C_&!@8&!@8
-M``````#_`/\````````V-C8V-C8V-C8V-C8V-@``````'Q@?&!@8&!@8````
-M`````#\V-C8V-C8``````#\P-S8V-C8V-@``````^!CX&!@8&!@8````````
-M`/XV-C8V-C8``````/X&]C8V-C8V-A@8&!@8'Q@?````````-C8V-C8V-C\`
-M```````V-C8V-C<P/P```````!@8&!@8^!CX````````-C8V-C8V-OX`````
-M```V-C8V-O8&_@```````!@8&!@8'Q@?&!@8&!@8-C8V-C8V-C<V-C8V-C8V
-M-C8V-C<P-S8V-C8V-A@8&!@8^!CX&!@8&!@8-C8V-C8V-O8V-C8V-C8V-C8V
-M-O8&]C8V-C8V-@``````_P#_&!@8&!@8`````````/\V-C8V-C8``````/\`
-M]S8V-C8V-A@8&!@8_P#_````````-C8V-C8V-O\````````V-C8V-O<`_P``
-M`````!@8&!@8_QC_&!@8&!@8-C8V-C8V-O\V-C8V-C8V-C8V-O<`]S8V-C8V
-M-O________\``````````````````/____________________________#P
-M\/#P\/#P\/#P\/#P#P\/#P\/#P\/#P\/#P\11!%$$4011!%$$4011%6J5:I5
-MJE6J5:I5JE6JW7?==]UWW7?==]UWW7<`````?'Q\?'Q\````````````````
-M_O[^````````$#@X?'S^_@```````(#`X/C^^.#`@````````/[^?'PX.!``
-M```````"!@X^_CX.!@(`````````/&9"0F8\`````/______Y\/#Y_______
-M_____\.9O;V9P_____\``'Z!I8&!O9F!?@``````?O_;___#Y_]^```````8
-M&-L\YSS;&!@``````#QF9F8\&'X8&```````'@X:,GC,S,QX```````8/'[_
-M_WX8&#P``````!@\/.?GYQ@8/````````&S^_O[^?#@0````````$#A\_GPX
-M$````````#\S/S`P,'#PX```````?V-_8V-C9^?FP```````(````%X```"@
-M`````````*$`7P`"````I0!B``````"G`&,``````*H`9``"````L`!G``(`
-M``"U`&H``@```+H`;0`#````OP!Q``````#$`'(``P```,D`=@``````T0!W
-M``````#6`'@``````-P`>0``````WP!Z``,```#D`'X`"P```/$`B@`#````
-M]@".``$```#Y`)```P```/\`E``````!D@"5``````.3`)8``````Y@`EP``
-M```#HP"8``````.F`)D``````ZD`F@`````#L0";``````.T`)P``0```\``
-MG@`````#PP"?``$```/&`*$`````("(`H@`````@/`"C`````"!_`*0`````
-M(*<`I0`````AD`"F``4``"&H`*P`````(AD`K0`!```B'@"O``$``"(I`+$`
-M````(D@`L@`````B80"S`````")D`+0``0``(P(`M@`````C$`"W`````",@
-M`+@``0``)0``N@`````E`@"[`````"4,`+P`````)1``O0`````E%`"^````
-M`"48`+\`````)1P`P``````E)`#!`````"4L`,(`````)30`PP`````E/`#$
-M`````"50`,4`'```)8``X@`````EA`#C`````"6(`.0`````)8P`Y0`````E
-MD`#F``,``"6@`.H`````):P`ZP`````EL@#L`````"6Z`.T`````);P`[@``
-M```EQ`#O`````"7+`/``````)=@`\0`!```F.@#S``(``"9``/8`````)D(`
-K]P`````F8`#X`````"9C`/D`````)F4`^@`!```F:@#\`````"9L`/T`````
-`
-end
diff --git a/share/vt/fonts/vgarom-8x14.hex b/share/vt/fonts/vgarom-8x14.hex
index 498d7f6b2609..30374077b9dd 100644
--- a/share/vt/fonts/vgarom-8x14.hex
+++ b/share/vt/fonts/vgarom-8x14.hex
@@ -101,34 +101,70 @@
 00A1:000018180018183C3C3C18000000
 00A2:0018183C666060663C1818000000
 00A3:00386C6460F0606060E6FC000000
+00A4:000000423C6666663C4200000000
 00A5:000066663C187E187E1818000000
+00A6:0000181818180018181818000000
 00A7:007CC660386CC6C66C380CC67C00
+00A8:0063630000000000000000000000
+00A9:0000003E415D51515D413E000000
 00AA:003C6C6C3E007E00000000000000
 00AB:00000000366CD86C360000000000
 00AC:000000000000FE06060600000000
+00AD:0000000000007F00000000000000
+00AE:0000003E415D555955413E000000
+00AF:007E000000000000000000000000
 00B0:00386C6C38000000000000000000
 00B1:00000018187E18180000FF000000
 00B2:0070D83060C8F800000000000000
+00B3:007C0C380C6C3800000000000000
+00B4:00060C1800000000000000000000
 00B5:00000000666666667C6060C00000
 00B6:00007FDBDBDB7B1B1B1B1B000000
 00B7:0000000000000018000000000000
+00B8:000000000000000000000C0C061C
+00B9:0030703030307800000000000000
 00BA:00386C6C38007C00000000000000
 00BB:00000000D86C366CD80000000000
 00BC:00C0C0C6CCD83066CE9E3E060600
 00BD:00C0C0C6CCD83060DC860C183E00
+00BE:00F03063F66C183367CF1F030300
 00BF:0000303000303060C6C67C000000
+00C0:603018001C3663637F6363000000
+00C1:03060C001C3663637F6363000000
+00C2:081C36001C3663637F6363000000
+00C3:3B6E00081C3663637F6363000000
 00C4:00C6C610386CC6C6FEC6C6000000
 00C5:386C3800386CC6C6FEC6C6000000
 00C6:00003E6CCCCCFECCCCCCCE000000
 00C7:00003C66C2C0C0C2663C0C067C00
+00C8:603018007F33303E30337F000000
 00C9:18306000FE66607C6066FE000000
+00CA:081C36007F33303E30337F000000
+00CB:006363007F33303E30337F000000
+00CC:603018003C18181818183C000000
+00CD:060C18003C18181818183C000000
+00CE:183C66003C18181818183C000000
+00CF:006666003C18181818183C000000
+00D0:00003C3633337B3333363C000000
 00D1:76DC00C6E6F6FEDECEC6C6000000
+00D2:603018001C36636363361C000000
+00D3:03060C001C36636363361C000000
+00D4:081C36001C36636363361C000000
+00D5:003B6E001C36636363361C000000
 00D6:00C6C6386CC6C6C6C66C38000000
+00D7:00000063361C081C366300000000
+00D8:00031E36676F6B7B73363C600000
+00D9:603018006363636363633E000000
+00DA:03060C006363636363633E000000
+00DB:081C36006363636363633E000000
 00DC:00C6C600C6C6C6C6C6C67C000000
+00DD:060C18006666663C18183C000000
+00DE:0078303E33333E30303078000000
 00DF:000000007CC6FCC6C6FCC0C04000
 00E0:0060301800780C7CCCCC76000000
 00E1:0018306000780C7CCCCC76000000
 00E2:0010386C00780C7CCCCC76000000
+00E3:00003B6E003C063E66663B000000
 00E4:0000CCCC00780C7CCCCC76000000
 00E5:00386C3800780C7CCCCC76000000
 00E6:00000000CC76367ED8D86E000000
@@ -141,34 +177,322 @@
 00ED:000C18300038181818183C000000
 00EE:00183C660038181818183C000000
 00EF:000066660038181818183C000000
+00F0:0000361C36063E6666663C000000
 00F1:000076DC00DC6666666666000000
 00F2:00603018007CC6C6C6C67C000000
 00F3:00183060007CC6C6C6C67C000000
 00F4:0010386C007CC6C6C6C67C000000
+00F5:00003B6E003E636363633E000000
 00F6:0000C6C6007CC6C6C6C67C000000
 00F7:0000001818007E00181800000000
+00F8:00000000033E676F7B733E600000
 00F9:0060301800CCCCCCCCCC76000000
 00FA:0018306000CCCCCCCCCC76000000
 00FB:003078CC00CCCCCCCCCC76000000
 00FC:0000CCCC00CCCCCCCCCC76000000
+00FD:00060C1800636666663E06663C00
+00FE:00000078303E333333333E307800
 00FF:0000C6C600C6C6C6C67E060C7800
+0100:7C00387CC6C6C6FEC6C6C6C60000
+0101:0000007C00780C7CCCCCCC760000
+0102:C67C0010386CC6FEC6C6C6000000
+0103:0000C67C00780C7CCCCC76000000
+0104:000010386CC6C6FEC6C6CE180E00
+0105:0000000000780C7CCCCC76301C00
+0106:0C18003C66C2C0C0C2663C000000
+0107:000C1830007CC6C0C0C67C000000
+010C:6C38003C66C2C0C0C2663C000000
+010D:00006C38007CC6C0C0C67C000000
+010E:6C3800F86C666666666CF8000000
+010F:6C38001C0C0C3C6CCCCC76000000
+0110:0000F86C6666F666666CF8000000
+0111:00000C0C7E0C3C6CCCCC76000000
+0112:7C00FE6660607C60606066FE0000
+0113:0000007C007CC6C6FEC0C67C0000
+0116:1818FE6660607C60606066FE0000
+0117:00001818007CC6C6FEC0C67C0000
+0118:0000FE66626878686266FE301C00
+0119:00000000007CC6FEC0C67C301C00
+011A:6C3800FE666278686266FE000000
+011B:00006C38007CC6FEC0C67C000000
+0122:00007CC6C6C0C0CEC6C6C67C0C78
+0123:3C60380076CEC6C6C6CE7606FC00
+0128:76DC003C181818181818183C0000
+0129:000076DC003818181818183C0000
+012A:7E003C18181818181818183C0000
+012B:0000007C003818181818183C0000
+012E:00003C18181818181818183C301E
+012F:00001818003818181818183C301E
+0136:0000C6C6CCD8F0F0D8CCC6C60C78
+0137:0000E0606066666C786C66E60C78
+0138:0000000000E66C78786C66E60000
+0139:0000F66C606060606266FE000000
+013A:0000E66C606060606060F0000000
+013B:0000F06060606060606266FE0C78
+013C:00003818181818181818183C18F0
+013D:001BEE60606060606266FE000000
+013E:001BEE60606060606060F0000000
+0141:0000F0646C7870E0E266FE000000
+0142:0000381A1E1C183878583C000000
+0143:0C1800C6E6F6FEDECEC6C6000000
+0144:000C183000DC6666666666000000
+0145:0000C6C6E6E6F6DECECEC6C60C78
+0146:0000000000DC6666666666660C78
+0147:6C3800C6E6F6FEDECEC6C6000000
+0148:00006C3800DC6666666666000000
+014A:0000DCFEF6E6C6C6C6C6C6DC0000
+014B:00000000DCFEF6E6C6C6061C0000
+014C:7C007CC6C6C6C6C6C6C6C67C0000
+014D:0000007C007CC6C6C6C6C67C0000
+0150:366C007CC6C6C6C6C6C67C000000
+0151:0000366C007CC6C6C6C67C000000
+0152:001F366666676666361F00000000
+0153:00000000366B6B6E683700000000
+0154:0C1800FC66667C6C6666E6000000
+0155:000C183000DC76666060F0000000
+0156:0000FC6666667C786C6666E60C78
+0157:0000000000DC7666606060F030E0
+0158:6C3800FC66667C6C6666E6000000
+0159:00006C3800DC76666060F0000000
+015A:0C18007CC6C6701CC6C67C000000
+015B:000C1830007CC6701CC67C000000
+015E:00007CC6C660380CC6C67C187000
+015F:00000000007CC6701CC67C187000
+0160:6C38007CC6C6701CC6C67C000000
+0161:00006C38007CC6701CC67C000000
+0162:00007E7E5A18181818183C0C3800
+0163:0000103030FC303030361C0C3800
+0164:361C007E7E5A181818183C000000
+0165:6C3800103030FC3030361C000000
+0166:0000FFDB99181E3C7818183C0000
+0167:0000303030FC303C78F0361C0000
+0168:76DC00C6C6C6C6C6C6C6C67C0000
+0169:000076DC00CCCCCCCCCCCC760000
+016A:7C00C6C6C6C6C6C6C6C6C67C0000
+016B:000000FC00CCCCCCCCCCCC760000
+016E:386C38C6C6C6C6C6C6C67C000000
+016F:00386C3800CCCCCCCCCC76000000
+0170:366C00C6C6C6C6C6C6C67C000000
+0171:00006CD800CCCCCCCCCC76000000
+0172:0000C6C6C6C6C6C6C6C6C67C301C
+0173:0000000000CCCCCCCCCCCC76301E
+0178:6600666666663C18183C00000000
+0179:0C1800FEC68C183062C6FE000000
+017A:000C183000FECC183066FE000000
+017B:181800FEC68C183062C6FE000000
+017C:0000181800FECC183066FE000000
+017D:6C3800FEC68C183062C6FE000000
+017E:00006C3800FECC183066FE000000
 0192:000E1B1818187E18181818D87000
+02C7:006C380000000000000000000000
+02D8:00C67C0000000000000000000000
+02D9:0018180000000000000000000000
+02DB:0000000000000000000030301C00
+02DD:00366CD800000000000000000000
+037A:0000000000000000000000000000
+0384:060C180000000000000000000000
+0385:060C18C300000000000000000000
+0386:0000C090B86CC6C6FEC6C6C60000
+0388:000000BFB130303E3031313F0000
+0389:000000B3B333333F333333330000
+038A:000000BC981818181818183C0000
+038C:0000009EB33333333333331E0000
+038E:000000B3B333331E0C0C0C1E0000
+038F:0000009EB3212121213312330000
+0390:000C0800660018181818180E0000
+0391:00000010386CC6C6FEC6C6C60000
+0392:000000FC6666667C666666FC0000
 0393:0000FEC6C6C0C0C0C0C0C0000000
+0394:00000010386CC6C6C6C6C6FE0000
+0395:000000FE66626878686266FE0000
+0396:000000FEC6860C183062C6FE0000
+0397:000000C6C6C6C6FEC6C6C6C60000
 0398:0000386CC6C6FEC6C66C38000000
+0399:0000003C181818181818183C0000
+039A:000000E666666C786C6666E60000
+039B:00000010386CC6C6C6C6C6C60000
+039C:000000C6EEFEFED6C6C6C6C60000
+039D:000000C6E6F6FEDECEC6C6C60000
+039E:000000FE8200007C000082FE0000
+039F:0000007CC6C6C6C6C6C6C67C0000
+03A0:000000FEC6C6C6C6C6C6C6C60000
+03A1:000000FC6666667C606060F00000
 03A3:0000FEC66030183060C6FE000000
+03A4:0000007E7E5A18181818183C0000
+03A5:000000666666663C1818183C0000
 03A6:00007E183C6666663C187E000000
+03A7:000000C6C66C7C387C6CC6C60000
+03A8:00000018DBDBDBDB7E18183C0000
 03A9:0000386CC6C6C66C6C6CEE000000
+03AA:0000C31818181818181818180000
+03AB:00C300666666663C1818183C0000
+03AC:0000003810007BCECCCCCC7B0000
+03AD:00003810007CC6C078C0C67C0000
+03AE:000000381000DC66666666660606
+03AF:00000038100018181818180E0000
+03B0:000018C30000E7666666663C0000
 03B1:000000000076DCD8D8DC76000000
+03B2:0000007CC6C6C6FCC6C6C6FCC0C0
+03B3:0000000000C3663C183C6642663C
 03B4:00001E30180C3E6666663C000000
 03B5:00001C3060607C6060301C000000
+03B6:00FC0C183060C0C0C0C0780C0C78
+03B7:000000000000DC66666666660606
+03B8:0000003E6363637F6363633E0000
+03B9:00000000000018181818180E0000
+03BA:000000000000E66C786C66E60000
+03BB:000000386C0C0C0C366666660000
+03BC:00000000000066666666667F6060
+03BD:00000000000082C6C66C6C380000
+03BE:00FC60C0783060C0C0C07C06067C
+03BF:0000000000007CC6C6C6C67C0000
 03C0:00000000FE6C6C6C6C6C6C000000
+03C1:0000000000003C666666667C6060
+03C2:0000000000003E63C060380CC67C
 03C3:00000000007ED8D8D8D870000000
 03C4:0000000076DC1818181818000000
+03C5:000000000000E7666666663C0000
 03C6:000003067EDBDBF37E60C0000000
+03C7:000000000000C66C38386CC60000
+03C8:000000000000D6D6D6D6D67C1010
+03C9:00000000000066C3C3DBFF660000
+03CA:000000C3000018181818180E0000
+03CB:000000C30000E7666666663C0000
+03CC:0000003810007CC6C6C6C67C0000
+03CD:000000381000E7666666663C0000
+03CE:00000038100066C3C3DBFF660000
+0401:6C6C00FEC6C0F0C0C0C6FE000000
+0402:0000F86060607C6666666C000000
+0403:1830007E60606060606060000000
+0404:00007CC6C0C0F8C0C0C67C000000
+0405:00007CC6C660380CC6C67C000000
+0406:0018003C1818181818183C000000
+0407:0066003C1818181818183C000000
+0408:00001E0C0C0C0C0CCCCC78000000
+0409:0000183878D8DEDBDBDBDE000000
+040A:0000D8D8D8D8FEDBDBDBDE000000
+040B:0000FC3030303C36363636000000
+040C:183000CCD8F0F0D8CCCCCC000000
+040E:281000C6C6C6C67E06C67C000000
+040F:0000C6C6C6C6C6C6FE3838000000
+0410:00003E66C6C6C6FEC6C6C6000000
+0411:0000FEC0C0FCC6C6C6C6FC000000
+0412:0000FCC6C6C6FCC6C6C6FC000000
+0413:0000FEC6C0C0C0C0C0C0C0000000
+0414:00003C6C6C6C6C6C6C6CFEC68200
+0415:0000FEC6C0C0F0C0C0C6FE000000
+0416:0000D6D6D6547CD6D6D6D6000000
+0417:00007CC6061C0606C6C67C000000
+0418:0000C6C6C6CEDEF6E6C6C6000000
+0419:000CDAC6C6CEDEF6E6C6C6000000
+041A:0000C6CCD8F0F0D8CCC6C6000000
+041B:00001E3666C6C6C6C6C6C6000000
+041C:000082C6C6EEEEFED6C6C6000000
+041D:0000C6C6C6C6FEC6C6C6C6000000
+041E:00007EC6C6C6C6C6C6C6FC000000
+041F:0000FEC6C6C6C6C6C6C6C6000000
+0420:0000FCC6C6C6C6FCC0C0C0000000
+0421:00007CC6C6C0C0C0C6C67C000000
+0422:00007E7E5A181818181818000000
+0423:0000C6C6C6C6C67E06C67C000000
+0424:00007CD6D6D6D6D67C1038000000
+0425:0000C6C66C38386CC6C6C6000000
+0426:0000CCCCCCCCCCCCCCCCFE020600
+0427:0000C6C6C6C6C67E060606000000
+0428:00D6D6D6D6D6D6D6D6D6FE000000
+0429:00D6D6D6D6D6D6D6D6D6FE020600
+042A:0000E0E0607C666666667C000000
+042B:0000C6C6C6E6B6B6B6B6E6000000
+042C:0000C0C0C0FCC6C6C6C6FC000000
+042D:00007CC6061E0606C6C67C000000
+042E:00009CB6B6B6F6B6B6B69C000000
+042F:00007EC6C6C6C67E3666C6000000
+0430:00000000007CC6C6FEC6C6000000
+0431:0000000000FEC0FCC6C6FC000000
+0432:0000000000FCC6FCC6C6FC000000
+0433:0000000000FEC2C0C0C0C0000000
+0434:00000000003C6C6C6C6CFEC68200
+0435:00000000007CC6FCC0C67C000000
+0436:0000000000D6D67CD6D6D6000000
+0437:00000000007CC61C06C67C000000
+0438:0000000000C6CEDEF6E6C6000000
+0439:0000000C18C6CEDEF6E6C6000000
+043A:0000000000C6CCF8D8CCC6000000
+043B:00000000003E66666666C6000000
+043C:0000000000C6EEFED6C6C6000000
+043D:0000000000C6C6C6FEC6C6000000
+043E:00000000007EC6C6C6C6FC000000
+043F:0000000000FEC6C6C6C6C6000000
+0440:0000000000FCC6C6C6C6FCC0C000
+0441:00000000007CC6C0C0C67C000000
+0442:00000000007E5A18181818000000
+0443:0000000000C6C6C6C6C67E067C00
+0444:00000000107CD6D6D6D67C103800
+0445:0000000000C66C38386CC6000000
+0446:0000000000CCCCCCCCCCFE060C00
+0447:0000000000C6C6C67E0606000000
+0448:0000000000D6D6D6D6D6FE000000
+0449:0000000000D6D6D6D6D6FE020600
+044A:0000000000E0607C66667C000000
+044B:0000000000C6C6E6B6B6E6000000
+044C:0000000000C0C0FCC6C6FC000000
+044D:00000000007CC61E06C67C000000
+044E:00000000009CB6B6F6B69C000000
+044F:00000000007EC67E3666C6000000
+0451:00006C6C007CC6FCC0C67C000000
+0452:00006060F8607C666666660C0000
+0453:00001830007C6060606060000000
+0454:00000000007CC6F0C0C67C000000
+0455:00000000007CC6701CC67C000000
+0456:000010100038181818183C000000
+0457:000028280038181818183C000000
+0458:00000404000E0606060666663C00
+0459:00000000003878DEDBDBDE000000
+045A:0000000000D8D8FEDBDBDE000000
+045B:00003030FC303C36363636000000
+045C:0000183000CCD8F0D8CCCC000000
+045E:0000281000C6C6C6C6C67E067C00
+045F:0000000000C6C6C6FE3838000000
+05D0:0000006363333B6E666363000000
+05D1:0000007C0606060606067F000000
+05D2:0000001C060606061E3663000000
+05D3:0000007F06060606060606000000
+05D4:0000007E03030363636363000000
+05D5:000000380C0C0C0C0C0C0C000000
+05D6:0000007E1818180C0C1830000000
+05D7:0000007E33636363636363000000
+05D8:000000666B6B636363663C000000
+05D9:0000003C0606060C000000000000
+05DA:0000007E03030606060606060700
+05DB:0000007E0303030303067C000000
+05DC:0060607E030303060C1818000000
+05DD:0000007E6363636363637F000000
+05DE:0000006E7B33636363636F000000
+05DF:0000001C06060C0C0C0C0C0C0E00
+05E0:0000001C0606060606063E000000
+05E1:0000007E3363636363663C000000
+05E2:00000033333333331B0E7C000000
+05E3:0000007C26667606060606060700
+05E4:0000007E2363730303037F000000
+05E5:000000666666666C786060607000
+05E6:0000006363331E0C06037F000000
+05E7:0000007E03033336363730303000
+05E8:0000007E03030303030303000000
+05E9:0000006B6B6B6B6B7B633E000000
+05EA:0000007E33333333333373000000
+200E:0000000000000000000000000000
+200F:0000000000000000000000000000
+2015:00000000000000FF000000000000
+2017:00000000000000000000FF00FF00
+2018:0030606030000000000000000000
+2019:000C06060C000000000000000000
 2022:0000000000183C3C180000000000
 203C:0000666666666666006666000000
 207F:00D86C6C6C6C6C00000000000000
 20A7:00F8CCCCF8C4CCDECCCCC6000000
+20AC:0000000000000000000000000000
+20AF:0000000000000000000000000000
+2116:0000888ACDEAB8988B888B000000
 2190:000000003060FE60300000000000
 2191:0000183C7E181818181818000000
 2192:00000000180CFE0C180000000000
diff --git a/share/vt/fonts/vgarom-8x16.fnt.uu b/share/vt/fonts/vgarom-8x16.fnt.uu
deleted file mode 100644
index 91a8258065ce..000000000000
--- a/share/vt/fonts/vgarom-8x16.fnt.uu
+++ /dev/null
@@ -1,110 +0,0 @@
-# $FreeBSD$
-begin 644 vgarom-8x16.fnt
-M5D9.5#`P,#(($```````_@```%``````````````````````````````````
-M```````8/#P\&!@8`!@8``````!F9F8D``````````````````!L;/YL;&S^
-M;&P`````&!A\QL+`?`8&AL9\&!@```````#"Q@P8,&#&A@```````#AL;#AV
-MW,S,S'8``````#`P,&``````````````````#!@P,#`P,#`8#````````#`8
-M#`P,#`P,&#````````````!F//\\9@``````````````&!A^&!@`````````
-M```````````8&!@P`````````````/X````````````````````````8&```
-M`````````@8,&#!@P(`````````X;,;&UM;&QFPX````````&#AX&!@8&!@8
-M?@```````'S&!@P8,&#`QOX```````!\Q@8&/`8&!L9\````````#!P\;,S^
-M#`P,'@```````/[`P,#\!@8&QGP````````X8,#`_,;&QL9\````````_L8&
-M!@P8,#`P,````````'S&QL9\QL;&QGP```````!\QL;&?@8&!@QX````````
-M```8&````!@8````````````&!@````8&#``````````!@P8,&`P&`P&````
-M````````?@``?@````````````!@,!@,!@P8,&````````!\QL8,&!@8`!@8
-M`````````'S&QM[>WMS`?````````!`X;,;&_L;&QL8```````#\9F9F?&9F
-M9F;\````````/&;"P,#`P,)F/````````/AL9F9F9F9F;/@```````#^9F)H
-M>&A@8F;^````````_F9B:'AH8&!@\````````#QFPL#`WL;&9CH```````#&
-MQL;&_L;&QL;&````````/!@8&!@8&!@8/````````!X,#`P,#,S,S'@`````
-M``#F9F9L>'AL9F;F````````\&!@8&!@8&)F_@```````,;N_O[6QL;&QL8`
-M``````#&YO;^WL[&QL;&````````?,;&QL;&QL;&?````````/QF9F9\8&!@
-M8/````````!\QL;&QL;&UMY\#`X`````_&9F9GQL9F9FY@```````'S&QF`X
-M#`;&QGP```````!^?EH8&!@8&!@\````````QL;&QL;&QL;&?````````,;&
-MQL;&QL9L.!````````#&QL;&UM;6_NYL````````QL9L?#@X?&S&Q@``````
-M`&9F9F8\&!@8&#P```````#^QH8,&#!@PL;^````````/#`P,#`P,#`P/```
-M``````"`P.!P.!P.!@(````````\#`P,#`P,#`P\`````!`X;,8`````````
-M````````````````````````_P``,#`8````````````````````````>`Q\
-MS,S,=@```````.!@8'AL9F9F9GP```````````!\QL#`P,9\````````'`P,
-M/&S,S,S,=@```````````'S&_L#`QGP````````X;&1@\&!@8&#P````````
-M````=LS,S,S,?`S,>````.!@8&QV9F9F9N8````````8&``X&!@8&!@\````
-M````!@8`#@8&!@8&!F9F/````.!@8&9L>'AL9N8````````X&!@8&!@8&!@\
-M````````````[/[6UM;6Q@```````````-QF9F9F9F8```````````!\QL;&
-MQL9\````````````W&9F9F9F?&!@\````````';,S,S,S'P,#!X```````#<
-M=F9@8&#P````````````?,9@.`S&?````````!`P,/PP,#`P-AP`````````
-M``#,S,S,S,QV````````````9F9F9F8\&````````````,;&UM;6_FP`````
-M``````#&;#@X.&S&````````````QL;&QL;&?@8,^````````/[,&#!@QOX`
-M```````.&!@8<!@8&!@.````````&!@8&``8&!@8&````````'`8&!@.&!@8
-M&'````````!VW```````````````````&!@`&!@8/#P\&```````&!@\9F!@
-M8&8\&!@``````#AL9&#P8&!@8.;\````````9F8\&'X8?A@8&```````?,9@
-M.&S&QFPX#,9\`````#QL;#X`?@``````````````````-FS8;#8`````````
-M``````#^!@8&!@```````#AL;#@````````````````````8&'X8&```_P``
-M````<-@P8,CX`````````````````&9F9F9F?&!@P```````?]O;VWL;&QL;
-M&P```````````````!@``````````#AL;#@`?```````````````````V&PV
-M;-@`````````P,#"QLP8,&;.GCX&!@```,#`PL;,&#!@W(8,&#X`````,#``
-M,#!@P,;&?```````Q@`0.&S&QO[&QL8`````.&PX`#ALQL;^QL;&````````
-M/FS,S/[,S,S,S@```````#QFPL#`P,)F/`P&?```&#!@`/YF8'Q@8&;^````
-M`';<`,;F]O[>SL;&Q@``````Q@!\QL;&QL;&QGP``````,8`QL;&QL;&QL9\
-M````````>,S,S-C,QL;&S```````8#`8`'@,?,S,S'8``````!@P8`!X#'S,
-MS,QV```````0.&P`>`Q\S,S,=@```````,P``'@,?,S,S'8``````#AL.`!X
-M#'S,S,QV````````````S'8V?MC8;@``````````/&9@8&8\#`8\`````&`P
-M&`!\QO[`P,9\```````,&#``?,;^P,#&?```````$#AL`'S&_L#`QGP`````
-M``#&``!\QO[`P,9\``````!@,!@`.!@8&!@8/```````#!@P`#@8&!@8&#P`
-M`````!@\9@`X&!@8&!@\````````9@``.!@8&!@8/````````';<`-QF9F9F
-M9F8``````&`P&`!\QL;&QL9\```````8,&``?,;&QL;&?```````$#AL`'S&
-MQL;&QGP```````#&``!\QL;&QL9\```````````8&`!^`!@8````````8#`8
-M`,S,S,S,S'8``````!@P8`#,S,S,S,QV```````P>,P`S,S,S,S,=@``````
-M`,P``,S,S,S,S'8```````#&``#&QL;&QL9^!@QX```.&Q@8&'X8&!@8&-AP
-M`````/[&QL#`P,#`P,``````````.&S&QO[&QFPX`````````/[&8#`8,&#&
-M_@````````!^&#QF9F8\&'X````````X;,;&QFQL;&SN````````````=MS8
-MV-C<=@```````!XP&`P^9F9F9CP````````<,&!@?&!@8#`<``````````#^
-M;&QL;&QL;````````````'[8V-C8V'```````````';<&!@8&!@8````````
-M``,&?MO;\WY@P``````````````8/#P8``````````!F9F9F9F9F`&9F````
-M``#8;&QL;&P`````````````^,S,^,3,WLS,S,8````````````P8/Y@,```
-M````````&#Q^&!@8&!@8&````````````!@,_@P8```````````8&!@8&!@8
-M?CP8````````````*&S^;"@``````````!@\?A@8&'X\&``````````8/'X8
-M&!A^/!A^```````````````8&```````````#PP,#`P,[&QL/!P`````````
-M``!^V]O;?@```````````````,#`P/X```````````!\QL;&QL;&QL8`````
-M``````!VW`!VW`````````````#^``#^``#^```````````,&#!@,!@,`'X`
-M````````,!@,!@P8,`!^```````````0.&S&QL;^``````````````#^P,#`
-MP``````````.&QL8&!@8&!@8&!@8&!@8&!@8&!@8V-C8<```````````````
-M_P``````````&!@8&!@8&!@8&!@8&!@8&``````````?&!@8&!@8&!@`````
-M````^!@8&!@8&!@8&!@8&!@8&!\``````````!@8&!@8&!CX```````````8
-M&!@8&!@8'Q@8&!@8&!@8&!@8&!@8&/@8&!@8&!@8&`````````#_&!@8&!@8
-M&!@8&!@8&!@8_P``````````&!@8&!@8&/\8&!@8&!@8&```````_P#_````
-M```````V-C8V-C8V-C8V-C8V-C8V```````?&!\8&!@8&!@8&``````````_
-M-C8V-C8V-C8``````#\P-S8V-C8V-C8V``````#X&/@8&!@8&!@8&```````
-M``#^-C8V-C8V-C8``````/X&]C8V-C8V-C8V&!@8&!@?&!\``````````#8V
-M-C8V-C8_```````````V-C8V-C<P/P``````````&!@8&!CX&/@`````````
-M`#8V-C8V-C;^```````````V-C8V-O8&_@``````````&!@8&!@?&!\8&!@8
-M&!@8&#8V-C8V-C8W-C8V-C8V-C8V-C8V-C<P-S8V-C8V-C8V&!@8&!CX&/@8
-M&!@8&!@8&#8V-C8V-C;V-C8V-C8V-C8V-C8V-O8&]C8V-C8V-C8V``````#_
-M`/\8&!@8&!@8&`````````#_-C8V-C8V-C8``````/\`]S8V-C8V-C8V&!@8
-M&!C_`/\``````````#8V-C8V-C;_```````````V-C8V-O<`_P``````````
-M&!@8&!C_&/\8&!@8&!@8&#8V-C8V-C;_-C8V-C8V-C8V-C8V-O<`]S8V-C8V
-M-C8V_________P````````````````````#_________________________
-M________\/#P\/#P\/#P\/#P\/#P\`\/#P\/#P\/#P\/#P\/#P\11!%$$401
-M1!%$$4011!%$5:I5JE6J5:I5JE6J5:I5JMUWW7?==]UWW7?==]UWW7<`````
-M?'Q\?'Q\?`````````````````#^_O[^```````````0.#A\?/[^````````
-M@,#@\/C^^/#@P(```````````/[^?'PX.!`````````"!@X>/OX^'@X&`@``
-M`````````#QF0D)F/```````________Y\/#Y_______________PYF]O9G#
-M______\``'Z!I8&!O9F!@7X```````!^_]O__\/G__]^`````````!@8VSSG
-M/-L8&````````#QF9F9F/!A^&!@````````>#AHR>,S,S,QX`````````!@\
-M?O__?A@8/``````````8/#SGY^<8&#P``````````&S^_O[^?#@0````````
-M```0.'S^?#@0`````````#\S/S`P,#!P\.````````!_8W]C8V-C9^?FP```
-M`````"````!>````H`````````"A`%\``@```*4`8@``````IP!C``````"J
-M`&0``@```+``9P`"````M0!J``(```"Z`&T``P```+\`<0``````Q`!R``,`
-M``#)`'8``````-$`=P``````U@!X``````#<`'D``````-\`>@`#````Y`!^
-M``L```#Q`(H``P```/8`C@`!````^0"0``,```#_`)0``````9(`E0`````#
-MDP"6``````.8`)<``````Z,`F``````#I@"9``````.I`)H``````[$`FP``
-M```#M`"<``$```/``)X``````\,`GP`!```#Q@"A`````"`B`*(`````(#P`
-MHP`````@?P"D`````""G`*4`````(9``I@`%```AJ`"L`````"(9`*T``0``
-M(AX`KP`!```B*0"Q`````")(`+(`````(F$`LP`````B9`"T``$``","`+8`
-M````(Q``MP`````C(`"X``$``"4``+H`````)0(`NP`````E#`"\`````"40
-M`+T`````)10`O@`````E&`"_`````"4<`,``````)20`P0`````E+`#"````
-M`"4T`,,`````)3P`Q``````E4`#%`!P``"6``.(`````)80`XP`````EB`#D
-M`````"6,`.4`````)9``Y@`#```EH`#J`````"6L`.L`````);(`[``````E
-MN@#M`````"6\`.X`````)<0`[P`````ERP#P`````"78`/$``0``)CH`\P`"
-M```F0`#V`````"9"`/<`````)F``^``````F8P#Y`````"9E`/H``0``)FH`
-+_``````F;`#]````
-`
-end
diff --git a/share/vt/fonts/vgarom-8x16.hex b/share/vt/fonts/vgarom-8x16.hex
index 2c9a58c663f0..fe1dc366b249 100644
--- a/share/vt/fonts/vgarom-8x16.hex
+++ b/share/vt/fonts/vgarom-8x16.hex
@@ -101,34 +101,70 @@
 00A1:00001818001818183C3C3C1800000000
 00A2:0018183C66606060663C181800000000
 00A3:00386C6460F060606060E6FC00000000
+00A4:00000082C67CC6C6C6C67CC682000000
 00A5:000066663C187E187E18181800000000
+00A6:00001818181800181818181800000000
 00A7:007CC660386CC6C66C380CC67C000000
+00A8:00C60000000000000000000000000000
+00A9:00007CC682BAA2A2BA82C67C00000000
 00AA:003C6C6C3E007E000000000000000000
 00AB:0000000000366CD86C36000000000000
 00AC:000000000000FE060606060000000000
+00AD:000000000000007C0000000000000000
+00AE:00007CC682BAAAB2AA82C67C00000000
+00AF:00FE0000000000000000000000000000
 00B0:00386C6C380000000000000000000000
 00B1:0000000018187E18180000FF00000000
 00B2:0070D83060C8F8000000000000000000
+00B3:00F8183018D870000000000000000000
+00B4:18306000000000000000000000000000
 00B5:0000000066666666667C6060C0000000
 00B6:00007FDBDBDB7B1B1B1B1B1B00000000
 00B7:00000000000000001800000000000000
+00B8:00000000000000000000180C063C0000
+00B9:0060E0606060F0000000000000000000
 00BA:00386C6C38007C000000000000000000
 00BB:0000000000D86C366CD8000000000000
 00BC:00C0C0C2C6CC183066CE9E3E06060000
 00BD:00C0C0C2C6CC183060DC860C183E0000
+00BE:00F0307236EC183066CE963E06060000
 00BF:0000303000303060C0C6C67C00000000
+00C0:60301800386CC6C6FEC6C6C600000000
+00C1:0C183000386CC6C6FEC6C6C600000000
+00C2:10386C00386CC6C6FEC6C6C600000000
+00C3:0076DC00386CC6C6FEC6C6C600000000
 00C4:00C60010386CC6C6FEC6C6C600000000
 00C5:386C3800386CC6C6FEC6C6C600000000
 00C6:00003E6CCCCCFECCCCCCCCCE00000000
 00C7:00003C66C2C0C0C0C2663C0C067C0000
+00C8:30180C00FE66607C606066FE00000000
 00C9:18306000FE66607C606066FE00000000
+00CA:10386C00FE66607C606066FE00000000
+00CB:00C600FE6660607C606066FE00000000
+00CC:30180C003C1818181818183C00000000
+00CD:0C1830003C1818181818183C00000000
+00CE:183C66003C1818181818183C00000000
+00CF:0066003C181818181818183C00000000
+00D0:0000786C666666F666666C7800000000
 00D1:76DC00C6E6F6FEDECEC6C6C600000000
+00D2:603018007CC6C6C6C6C6C67C00000000
+00D3:0C1830007CC6C6C6C6C6C67C00000000
+00D4:10386C007CC6C6C6C6C6C67C00000000
+00D5:76DC007CC6C6C6C6C6C6C67C00000000
 00D6:00C6007CC6C6C6C6C6C6C67C00000000
+00D7:00000000C66C3810386CC60000000000
+00D8:02067CCECEDED6D6F6E6E67CC0800000
+00D9:60301800C6C6C6C6C6C6C67C00000000
+00DA:0C183000C6C6C6C6C6C6C67C00000000
+00DB:10386C00C6C6C6C6C6C6C67C00000000
 00DC:00C600C6C6C6C6C6C6C6C67C00000000
+00DD:0C183000C3C3663C1818183C00000000
+00DE:F0607C6666667C60606060F000000000
 00DF:000078CCCCCCD8CCC6C6C6CC00000000
 00E0:0060301800780C7CCCCCCC7600000000
 00E1:0018306000780C7CCCCCCC7600000000
 00E2:0010386C00780C7CCCCCCC7600000000
+00E3:000076DC00780C7CCCCCCC7600000000
 00E4:0000CC0000780C7CCCCCCC7600000000
 00E5:00386C3800780C7CCCCCCC7600000000
 00E6:0000000000CC76367ED8D86E00000000
@@ -141,34 +177,326 @@
 00ED:000C1830003818181818183C00000000
 00EE:00183C66003818181818183C00000000
 00EF:00006600003818181818183C00000000
+00F0:006C38386C0C3C6CCCCCCC7800000000
 00F1:000076DC00DC66666666666600000000
 00F2:00603018007CC6C6C6C6C67C00000000
 00F3:00183060007CC6C6C6C6C67C00000000
 00F4:0010386C007CC6C6C6C6C67C00000000
+00F5:000076DC007CC6C6C6C6C67C00000000
 00F6:0000C600007CC6C6C6C6C67C00000000
 00F7:000000001818007E0018180000000000
+00F8:00000002067CCEDED6F6E67CC0800000
 00F9:0060301800CCCCCCCCCCCC7600000000
 00FA:0018306000CCCCCCCCCCCC7600000000
 00FB:003078CC00CCCCCCCCCCCC7600000000
 00FC:0000CC0000CCCCCCCCCCCC7600000000
+00FD:0018306000C6C6C6C6C6C67E060CF800
+00FE:000000F0607C66666666667C6060F000
 00FF:0000C60000C6C6C6C6C6C67E060C7800
+0100:007C00386CC6C6C6FEC6C6C6C6000000
+0101:000000007C00780C7CCCCCCC76000000
+0102:C67C0010386CC6C6FEC6C6C600000000
+0103:0000C67C00780C7CCCCCCC7600000000
+0104:000010386CC6C6FEC6C6C6C618301E00
+0105:0000000000780C7CCCCCCC7618301E00
+0106:0C18003C66C2C0C0C0C2663C00000000
+0107:000C1830007CC6C0C0C0C67C00000000
+010C:6C38003C66C2C0C0C0C2663C00000000
+010D:00006C38007CC6C0C0C0C67C00000000
+010E:6C3800F86C66666666666CF800000000
+010F:6C38001C0C0C3C6CCCCCCC7600000000
+0110:0000F86C6666F66666666CF800000000
+0111:00000C0C7E0C3C6CCCCCCC7600000000
+0112:7C0000FE6660607C60606066FE000000
+0113:000000007C007CC6C6FEC0C67C000000
+0116:181800FE6660607860606066FE000000
+0117:0000103810007CC6C6FEC0C67C000000
+0118:0000FE6662687868606266FE18301E00
+0119:00000000007CC6FEC0C0C67C30603C00
+011A:6C3800FE66626878686266FE00000000
+011B:00006C38007CC6FEC0C0C67C00000000
+011E:423C003C66C2C0DEC6C6663A00000000
+011F:000044380076CCCCCCCCCC7C0CCC7800
+0122:0000007CC6C6C0C0CECEC6C67C0C7800
+0123:00003C60300076CEC6C6C6CE7606FC00
+0128:76DC003C18181818181818183C000000
+0129:00000076DC003818181818183C000000
+012A:003C003C18181818181818183C000000
+012B:000000007C003818181818183C000000
+012E:0000003C18181818181818183C301E00
+012F:0000001818003818181818183C301C00
+0130:000018003C1818181818183C00000000
+0131:00000000003818181818183C00000000
+0136:000000C6C6CCD8F0F0D8CCC6C60C7800
+0137:000000E0606066666C786C66E618F000
+0138:000000000000E66C78786C66E6000000
+0139:0000F66C60606060606266FE00000000
+013A:0000E66C60606060606060F000000000
+013B:000000F06060606060606266FE0C7800
+013C:0000003818181818181818183C0C7800
+013D:001BEE6060606060606266FE00000000
+013E:001BEE6060606060606060F000000000
+0141:0000F0646C7870E0E06266FE00000000
+0142:0000381A1E1C18387858183C00000000
+0143:0C1800C6E6F6FEDECEC6C6C600000000
+0144:000C183000DC66666666666600000000
+0145:000000C6C6E6F6FEDECEC6C6C60C7800
+0146:000000000000DC6666666666660C7800
+0147:6C3800C6E6F6FEDECEC6C6C600000000
+0148:00006C3800DC66666666666600000000
+014A:000000DCFEE6C6C6C6C6C6C6DC000000
+014B:0000000000DCFEE6C6C6C6061C000000
+014C:007C007CC6C6C6C6C6C6C6C67C000000
+014D:000000007C007CC6C6C6C6C67C000000
+0150:366C007CC6C6C6C6C6C6C67C00000000
+0151:0000366C007CC6C6C6C6C67C00000000
+0152:00007ECCCCCCCECCCCCCCC7E00000000
+0153:00000000006EDBDBDED8DC6700000000
+0154:0C1800FC6666667C6C6666E600000000
+0155:000C183000DC7666606060F000000000
+0156:000000FC6666667C786C6666F618F000
+0157:000000000000DC6660606060F018F000
+0158:6C3800FC6666667C6C6666E600000000
+0159:00006C3800DC7666606060F000000000
+015A:0C18007CC6C660380CC6C67C00000000
+015B:000C1830007CC660380CC67C00000000
+015E:00007CC6C660380C06C6C67C180C7800
+015F:00000000007CC660380CC67C180C7800
+0160:6C38007CC6C660380CC6C67C00000000
+0161:00006C38007CC660380CC67C00000000
+0162:00007E7E5A1818181818183C180C7800
+0163:0000103030FC30303030361C180C7800
+0164:361C007E7E5A18181818183C00000000
+0165:6C3800103030FC303030361C00000000
+0166:000000FFDB99181E3C7818183C000000
+0167:000000303030FC303C78F0361C000000
+0168:76DC00C6C6C6C6C6C6C6C6C67C000000
+0169:00000076DC00CCCCCCCCCCCC76000000
+016A:007C00C6C6C6C6C6C6C6C6C67C000000
+016B:00000000FC00CCCCCCCCCCCC76000000
+016E:386C38C6C6C6C6C6C6C6C67C00000000
+016F:00386C3800CCCCCCCCCCCC7600000000
+0170:366C00C6C6C6C6C6C6C6C67C00000000
+0171:0000366C00CCCCCCCCCCCC7600000000
+0172:000000C6C6C6C6C6C6C6C6C67C603C00
+0173:000000000000CCCCCCCCCCCC76603C00
+0178:00C300C3C3663C181818183C00000000
+0179:0C1800FEC68C183060C2C6FE00000000
+017A:000C183000FECC183060C6FE00000000
+017B:181800FEC68C183060C2C6FE00000000
+017C:0000181800FECC183060C6FE00000000
+017D:6C3800FEC68C183060C2C6FE00000000
+017E:00006C3800FECC183060C6FE00000000
 0192:000E1B1818187E1818181818D8700000
+02C7:006C3800000000000000000000000000
+02D8:00C67C00000000000000000000000000
+02D9:00181800000000000000000000000000
+02DB:00000000000000000000000030603C00
+02DD:00366CD8000000000000000000000000
+037A:00000000000000000000000000000000
+0384:060C1800000000000000000000000000
+0385:060C18C3000000000000000000000000
+0386:00C090B86CC6C6FEC6C6C6C600000000
+0388:0000BFB130303E303031313F00000000
+0389:0000B3B333333F333333330000000000
+038A:0000BC98181818181818183C00000000
+038C:00009EB33333333333331E0000000000
+038E:0000B3B333331E0C0C0C0C1E00000000
+038F:00009EB3212121212133123300000000
+0390:0C080066001818181818180E00000000
+0391:000010386CC6C6FEC6C6C6C600000000
+0392:0000FC6666667C66666666FC00000000
 0393:0000FEC6C6C0C0C0C0C0C0C000000000
+0394:000010386CC6C6C6C6C6C6FE00000000
+0395:0000FE6662687868606266FE00000000
+0396:0000FEC6860C183060C2C6FE00000000
+0397:0000C6C6C6C6FEC6C6C6C6C600000000
 0398:000000386CC6C6FEC6C66C3800000000
+0399:00003C18181818181818183C00000000
+039A:0000E666666C78786C6666E600000000
+039B:000010386CC6C6C6C6C6C6C600000000
+039C:0000C6EEFEFED6C6C6C6C6C600000000
+039D:0000C6E6F6FEDECEC6C6C6C600000000
+039E:0000FE8200007C00000082FE00000000
+039F:00007CC6C6C6C6C6C6C6C67C00000000
+03A0:0000FEC6C6C6C6C6C6C6C6C600000000
+03A1:0000FC6666667C60606060F000000000
 03A3:000000FEC66030183060C6FE00000000
+03A4:00007E7E5A1818181818183C00000000
+03A5:0000666666663C181818183C00000000
 03A6:0000007E183C6666663C187E00000000
+03A7:0000C6C66C7C38387C6CC6C600000000
+03A8:000018DBDBDBDBDB7E18183C00000000
 03A9:0000386CC6C6C66C6C6C6CEE00000000
+03AA:00C31818181818181818181800000000
+03AB:C300666666663C181818183C00000000
+03AC:00003810007BCECCCCCCCC7B00000000
+03AD:00003810007CC6C078C0C67C00000000
+03AE:0000381000DC66666666666606060600
+03AF:00003810001818181818180E00000000
+03B0:0018C30000E766666666663C00000000
 03B1:000000000076DCD8D8D8DC7600000000
+03B2:00007CC6C6C6C6FCC6C6C6FCC0C0C000
+03B3:0000000000C3663C183C6642663C0000
 03B4:00001E30180C3E666666663C00000000
 03B5:00001C3060607C606060301C00000000
+03B6:0000FC0C183060C0C0C0C0780C0C7800
+03B7:0000000000DC66666666666606060600
+03B8:00003E6363637F636363633E00000000
+03B9:00000000001818181818180E00000000
+03BA:0000000000E66C78786C66E600000000
+03BB:0000386C0C0C0C366666666600000000
+03BC:00000000006666666666667F60606000
+03BD:000000000082C6C66C6C383800000000
+03BE:0000FC60C0783060C0C0C07C06063C00
+03BF:00000000007CC6C6C6C6C67C00000000
 03C0:00000000FE6C6C6C6C6C6C6C00000000
+03C1:00000000003C66666666667C60606000
+03C2:00000000003E63C0C060380CC67C0000
 03C3:00000000007ED8D8D8D8D87000000000
 03C4:0000000076DC18181818181800000000
+03C5:0000000000E766666666663C00000000
 03C6:00000003067EDBDBF37E60C000000000
+03C7:0000000000C66C3838386CC600000000
+03C8:0000000000D6D6D6D6D6D67C10101000
+03C9:000000000066C3C3C3DBFF6600000000
+03CA:0000C300001818181818180E00000000
+03CB:0000C30000E766666666663C00000000
+03CC:00003810007CC6C6C6C6C67C00000000
+03CD:0000381000E766666666663C00000000
+03CE:000038100066C3C3C3DBFF6600000000
+0401:666600FEC6C0C0F0C0C0C6FE00000000
+0402:0000F86060607C666666666C00000000
+0403:1830007E606060606060606000000000
+0404:00003C66C0C0F8C0C0C0663C00000000
+0405:00007CC6C660380C06C6C67C00000000
+0406:0018003C181818181818183C00000000
+0407:0066003C181818181818183C00000000
+0408:00001E0C0C0C0C0CCCCCCC7800000000
+0409:0000183878D8D8DEDBDBDBDE00000000
+040A:0000D8D8D8D8D8FEDBDBDBDE00000000
+040B:0000FC3030303C363636363600000000
+040C:183000C6CCD8F0F8CCC6C6C600000000
+040E:281000C6C6C6C67E0606C67C00000000
+040F:0000C6C6C6C6C6C6C6FE383800000000
+0410:00003E66C6C6C6FEC6C6C6C600000000
+0411:0000FEC0C0C0FCC6C6C6C6FC00000000
+0412:0000FCC6C6C6FCC6C6C6C6FC00000000
+0413:0000FEC6C0C0C0C0C0C0C0C000000000
+0414:00003C6C6C6C6C6C6C6C6CFEC6820000
+0415:0000FEC6C0C0F0C0C0C0C6FE00000000
+0416:0000D6D6D6547CD6D6D6D6D600000000
+0417:00007CC606061C0606C6C67C00000000
+0418:0000C6C6C6C6CEDEF6E6C6C600000000
+0419:000CDAC6C6C6CEDEF6E6C6C600000000
+041A:0000C6CCD8F0F0D8CCC6C6C600000000
+041B:00001E3666C6C6C6C6C6C6C600000000
+041C:0000C6C6EEEEFEFED6D6C6C600000000
+041D:0000C6C6C6C6FEC6C6C6C6C600000000
+041E:00007EC6C6C6C6C6C6C6C6FC00000000
+041F:0000FEC6C6C6C6C6C6C6C6C600000000
+0420:0000FCC6C6C6C6C6FCC0C0C000000000
+0421:00007CC6C6C0C0C0C0C6C67C00000000
+0422:00007E7E5A1818181818181800000000
+0423:0000C6C6C6C6C6C67E06C67C00000000
+0424:00007CD6D6D6D6D6D67C103800000000
+0425:0000C6C66C38386CC6C6C6C600000000
+0426:0000CCCCCCCCCCCCCCCCCCFE02060400
+0427:0000C6C6C6C6C67E0606060600000000
+0428:0000D6D6D6D6D6D6D6D6D6FE00000000
+0429:0000D6D6D6D6D6D6D6D6D6FE02060400
+042A:0000E0E060607C666666667C00000000
+042B:0000C6C6C6C6E6B6B6B6B6E600000000
+042C:0000C0C0C0C0FCC6C6C6C6FC00000000
+042D:000078CC06061E1E0606CC7800000000
+042E:00009CB6B6B6F6B6B6B6B69C00000000
+042F:00007EC6C6C6C67E3666C6C600000000
+0430:00000000007CC6C6C6FEC6C600000000
+0431:0000000000FEC0FCC6C6C6FC00000000
+0432:0000000000FCC6C6FCC6C6FC00000000
+0433:0000000000FEC6C2C0C0C0C000000000
+0434:00000000003C6C6C6C6C6CFEC6820000
+0435:00000000007CC6C6FCC0C67C00000000
+0436:0000000000D6D6D67CD6D6D600000000
+0437:00000000007CC6061C06C67C00000000
+0438:0000000000C6C6CEDEF6E6C600000000
+0439:0000000C18C6C6CEDEF6E6C600000000
+043A:0000000000C6CCD8F8D8CCC600000000
+043B:00000000003E6666666666C600000000
+043C:0000000000C6EEFED6C6C6C600000000
+043D:0000000000C6C6C6FEC6C6C600000000
+043E:00000000007EC6C6C6C6C6FC00000000
+043F:0000000000FEC6C6C6C6C6C600000000
+0440:0000000000FCC6C6C6C6C6FCC0C0C000
+0441:00000000007CC6C0C0C2C67C00000000
+0442:00000000007E5A181818181800000000
+0443:0000000000C6C6C6C6C6C67E06C67C00
+0444:00000000107CD6D6D6D6D67C10380000
+0445:0000000000C66C38386CC6C600000000
+0446:0000000000CCCCCCCCCCCCFE060C0000
+0447:0000000000C6C6C6C67E060600000000
+0448:0000000000D6D6D6D6D6D6FE00000000
+0449:0000000000D6D6D6D6D6D6FE02060400
+044A:0000000000E0607C6666667C00000000
+044B:0000000000C6C6E6B6B6B6E600000000
+044C:0000000000C0C0FCC6C6C6FC00000000
+044D:00000000007CC6061E06C67C00000000
+044E:00000000009CB6B6F6B6B69C00000000
+044F:00000000007EC6C67E3666C600000000
+0451:00006C6C007CC6C6FCC0C67C00000000
+0452:0000606060F8607C666666660C000000
+0453:00001830007C60606060606000000000
+0454:00000000007CC6C0F0C0C67C00000000
+0455:00000000007CC660380CC67C00000000
+0456:00001010003818181818183C00000000
+0457:00002828003818181818183C00000000
+0458:00000404000E06060606060666663C00
+0459:0000000000183878DEDBDBDE00000000
+045A:0000000000D8D8D8FEDBDBDE00000000
+045B:0000303030FC303C3636363600000000
+045C:0000183000C4CCD8F0D8CCCC00000000
+045E:0000281000C6C6C6C6C6C67E06C67C00
+045F:0000000000C6C6C6C6FE383800000000
+05D0:00000000C6C66676DCCCC6C600000000
+05D1:00000000F80C0C0C0C0C0CFE00000000
+05D2:00000000380C0C0C0C1C36E600000000
+05D3:00000000FE0C0C0C0C0C0C0C00000000
+05D4:00000000FC060606C6C6C6C600000000
+05D5:00000000701818181818181800000000
+05D6:00000000FC3030301818306000000000
+05D7:00000000FC66C6C6C6C6C6C600000000
+05D8:00000000CCD6D6C6C6C6C67C00000000
+05D9:00000000701818183000000000000000
+05DA:00000000FC0606060C0C0C0C0C0C0E00
+05DB:00000000FC060606060606FC00000000
+05DC:0000C0C0FC060606060C181800000000
+05DD:00000000FC66C6C6C6C6C6FE00000000
+05DE:00000000DC7666C6C6C6C6DE00000000
+05DF:00000000380C0C181818181818181C00
+05E0:00000000380C0C0C0C0C0C7C00000000
+05E1:00000000FC66C6C6C6C6CC7800000000
+05E2:00000000EE66666666662CF800000000
+05E3:00000000F84CCCCCEC0C0C0C0C0C0E00
+05E4:00000000FC46C6C6E60606FE00000000
+05E5:00000000EE66666C7860606060607000
+05E6:00000000EE666634180C06FE00000000
+05E7:00000000FC060666646C6E6060606000
+05E8:00000000FC0606060606060600000000
+05E9:00000000D6D6D6D6D6F6C67C00000000
+05EA:00000000FC6666666666E6E600000000
+200E:00000000000000000000000000000000
+200F:00000000000000000000000000000000
+2015:00000000000000FF0000000000000000
+2017:000000000000000000000000FF00FF00
+2018:00306060300000000000000000000000
+2019:000C06060C0000000000000000000000
 2022:000000000000183C3C18000000000000
 203C:00006666666666666600666600000000
 207F:00D86C6C6C6C6C000000000000000000
 20A7:00F8CCCCF8C4CCDECCCCCCC600000000
+20AC:00000000000000000000000000000000
+20AF:00000000000000000000000000000000
+2116:0000888ACDEAB8988B888B8800000000
 2190:00000000003060FE6030000000000000
 2191:0000183C7E1818181818181800000000
 2192:0000000000180CFE0C18000000000000
diff --git a/share/vt/fonts/vgarom-8x8.fnt.uu b/share/vt/fonts/vgarom-8x8.fnt.uu
deleted file mode 100644
index 7d40314a719a..000000000000
--- a/share/vt/fonts/vgarom-8x8.fnt.uu
+++ /dev/null
@@ -1,65 +0,0 @@
-# $FreeBSD$
-begin 644 vgarom-8x8.fnt
-M5D9.5#`P,#(("```````_@```%```````````````````````````#!X>#`P
-M`#``;&QL``````!L;/YL_FQL`#!\P'@,^#```,;,&#!FQ@`X;#AVW,QV`&!@
-MP```````&#!@8&`P&`!@,!@8&#!@``!F//\\9@```#`P_#`P`````````#`P
-M8````/P````````````P,``&#!@P8,"``'S&SM[VYGP`,'`P,#`P_`!XS`PX
-M8,S\`'C,##@,S'@`'#QLS/X,'@#\P/@,#,QX`#A@P/C,S'@`_,P,&#`P,`!X
-MS,QXS,QX`'C,S'P,&'```#`P```P,```,#```#`P8!@P8,!@,!@```#\``#\
-M``!@,!@,&#!@`'C,#!@P`#``?,;>WM[`>``P>,S,_,S,`/QF9GQF9OP`/&;`
-MP,!F/`#X;&9F9FSX`/YB:'AH8OX`_F)H>&A@\``\9L#`SF8^`,S,S/S,S,P`
-M>#`P,#`P>``>#`P,S,QX`.9F;'AL9N8`\&!@8&)F_@#&[O[^UL;&`,;F]M[.
-MQL8`.&S&QL9L.`#\9F9\8&#P`'C,S,S<>!P`_&9F?&QFY@!XS.!P',QX`/RT
-M,#`P,'@`S,S,S,S,_`#,S,S,S'@P`,;&QM;^[L8`QL9L.#ALQ@#,S,QX,#!X
-M`/[&C!@R9OX`>&!@8&!@>`#`8#`8#`8"`'@8&!@8&'@`$#ALQ@``````````
-M````_S`P&`````````!X#'S,=@#@8&!\9F;<````>,S`S'@`'`P,?,S,=@``
-M`'C,_,!X`#AL8/!@8/````!VS,Q\#/C@8&QV9F;F`#``<#`P,'@`#``,#`S,
-MS'C@8&9L>&SF`'`P,#`P,'@```#,_O[6Q@```/C,S,S,````>,S,S'@```#<
-M9F9\8/```';,S'P,'@``W'9F8/````!\P'@,^``0,'PP,#08````S,S,S'8`
-M``#,S,QX,````,;6_OYL````QFPX;,8```#,S,Q\#/@``/R8,&3\`!PP,.`P
-M,!P`&!@8`!@8&`#@,#`<,##@`';<````````&!@`&!@8&``8&'[`P'X8&#AL
-M9/!@YOP`S,QX_##\,#`^8SAL;#C,>#QL;#X`?@```#-FS&8S``````#\#`P`
-M`#AL;#@`````,##\,#``_`!P&#!@>`````!F9F9F?&#`?]O;>QL;&P``````
-M&````#AL;#@`?````,QF,V;,``##QLS;-V_/`\/&S-XS9LP/,``P8,#,>`#&
-M.&S&_L;&`#`P`'C,_,P`/FS,_LS,S@!XS,#,>!@,>!P`_&!X8/P`_`#,[/S<
-MS`##&#QF9CP8`,P`S,S,S'@``'C,^,SXP,#@`'@,?,Q^`!P`>`Q\S'X`?L,\
-M!CYF/P#,`'@,?,Q^`#`P>`Q\S'X```!_#'_,?P```'C`P'@,..``>,S\P'@`
-M'`!XS/S`>`!^PSQF?F`\`,P`>,S\P'@`X`!P,#`P>``X`'`P,#!X`'S&.!@8
-M&#P`S`!P,#`P>```^`#XS,S,``#@`'C,S'@``!P`>,S,>`!XS`!XS,QX``#,
-M`'C,S'@`,#``_``P,```X`#,S,Q^```<`,S,S'X`>,P`S,S,?@``S`#,S,Q^
-M``#,`,S,?`SX#AL8/!@8V'``_,S`P,#``#ALQO[&;#@`_,Q@,&#,_`#\,'C,
-MS'@P_#ALQL9L;.X```!VW,C<=@`<,!A\S,QX`#A@P/C`8#@``/YL;&QL;```
-M`'[8V-AP``!VW!@8&!@`!@Q^V]M^8,```!@\/!@``&9F9F9F`&8`>&QL;&P`
-M``#XS,SZQL_&QP`P8/Y@,```&#Q^&!@8&```&`S^#!@``!@8&!A^/!@``"1F
-M_V8D```8/'X8&'X\&!@\?AA^/!C_````&!@````/#`P,[&P\'```?MO;?@``
-M``#`P,#^``!XS,S,S,S,``!VW`!VW````/P`_`#\```8,&`P&`#\`&`P&#!@
-M`/P``!`X;,;&_@````#\P,````X;&Q@8&!@8&!@8&!C8V'``````_P```!@8
-M&!@8&!@8`````!\8&!@`````^!@8&!@8&!@?````&!@8&/@````8&!@8'Q@8
-M&!@8&!CX&!@8`````/\8&!@8&!@8_P```!@8&!C_&!@8``#_`/\````V-C8V
-M-C8V-@``'Q@?&!@8`````#\V-C8``#\P-S8V-@``^!CX&!@8`````/XV-C8`
-M`/X&]C8V-A@8'Q@?````-C8V-C\````V-C<P/P```!@8^!CX````-C8V-OX`
-M```V-O8&_@```!@8'Q@?&!@8-C8V-C<V-C8V-C<P-S8V-A@8^!CX&!@8-C8V
-M-O8V-C8V-O8&]C8V-@``_P#_&!@8`````/\V-C8``/\`]S8V-A@8_P#_````
-M-C8V-O\````V-O<`_P```!@8_QC_&!@8-C8V-O\V-C8V-O<`]S8V-O____\`
-M`````````/________________#P\/#P\/#P#P\/#P\/#P\BB"*((H@BB%6J
-M5:I5JE6JVW?;[MMWV^X``#P\/#P```````!^?GX``!@\?O__``"`X/C^^."`
-M``#__WX\&````@X^_CX.`@``/&9"0F8\`/__Y\/#Y____\.9O;V9P_]^@:6!
-MO9F!?G[_V__#Y_]^F5H\Y^<\6ID\9F9F/!A^&`\'#WW,S,QX$!`X?/Y\.'PX
-M?#C^_GPX?&S^_OY\.!``$#A\_GPX$``_,S\P,'#PX']C?V-C9^;`````(```
-M`%X```"@`````````*$`7P`"````I0!B``````"G`&,``````*H`9``"````
-ML`!G``(```"U`&H``@```+H`;0`#````OP!Q``````#$`'(``P```,D`=@``
-M````T0!W``````#6`'@``````-P`>0``````WP!Z``,```#D`'X`"P```/$`
-MB@`#````]@".``$```#Y`)```P```/\`E``````!D@"5``````.3`)8`````
-M`Y@`EP`````#HP"8``````.F`)D``````ZD`F@`````#L0";``````.T`)P`
-M`0```\``G@`````#PP"?``$```/&`*$`````("(`H@`````@/`"C`````"!_
-M`*0`````(*<`I0`````AD`"F``4``"&H`*P`````(AD`K0`!```B'@"O``$`
-M`"(I`+$`````(D@`L@`````B80"S`````")D`+0``0``(P(`M@`````C$`"W
-M`````",@`+@``0``)0``N@`````E`@"[`````"4,`+P`````)1``O0`````E
-M%`"^`````"48`+\`````)1P`P``````E)`#!`````"4L`,(`````)30`PP``
-M```E/`#$`````"50`,4`'```)8``X@`````EA`#C`````"6(`.0`````)8P`
-MY0`````ED`#F``,``"6@`.H`````):P`ZP`````EL@#L`````"6Z`.T`````
-M);P`[@`````EQ`#O`````"7+`/``````)=@`\0`!```F.@#S``(``"9``/8`
-M````)D(`]P`````F8`#X`````"9C`/D`````)F4`^@`!```F:@#\`````"9L
-$`/T`````
-`
-end
diff --git a/share/vt/fonts/vgarom-8x8.hex b/share/vt/fonts/vgarom-8x8.hex
index 4deba035b247..2021fab346cc 100644
--- a/share/vt/fonts/vgarom-8x8.hex
+++ b/share/vt/fonts/vgarom-8x8.hex
@@ -100,34 +100,70 @@
 00A1:1818001818181800
 00A2:18187EC0C07E1818
 00A3:386C64F060E6FC00
+00A4:00C33C66663CC300
 00A5:CCCC78FC30FC3030
+00A6:1818180018181800
 00A7:3E63386C6C38CC78
+00A8:C600000000000000
+00A9:7C82BAA2BA827C00
 00AA:3C6C6C3E007E0000
 00AB:003366CC66330000
 00AC:000000FC0C0C0000
+00AD:0000000000000000
+00AE:7C82BAB2AA827C00
+00AF:FE00000000000000
 00B0:386C6C3800000000
 00B1:3030FC303000FC00
 00B2:7018306078000000
+00B3:1E020E021E000000
+00B4:1830000000000000
 00B5:00666666667C60C0
 00B6:7FDBDB7B1B1B1B00
 00B7:0000000018000000
+00B8:0000000000001830
+00B9:060E060606000000
 00BA:386C6C38007C0000
 00BB:00CC663366CC0000
 00BC:C3C6CCDB376FCF03
 00BD:C3C6CCDE3366CC0F
+00BE:F020966C33670F03
 00BF:30003060C0CC7800
+00C0:180C3078CCFCCC00
+00C1:60C03078CCFCCC00
+00C2:78843078CCFCCC00
+00C3:66983078CCFCCC00
 00C4:C6386CC6FEC6C600
 00C5:30300078CCFCCC00
 00C6:3E6CCCFECCCCCE00
 00C7:78CCC0CC78180C78
+00C8:3018FE627862FE00
 00C9:1C00FC607860FC00
+00CA:3844FE627862FE00
+00CB:6600FE627862FE00
+00CC:6030783030307800
+00CD:1830783030307800
+00CE:7884783030307800
+00CF:CC00783030307800
+00D0:786C66F6666C7800
 00D1:FC00CCECFCDCCC00
+00D2:30187CC6C6C67C00
+00D3:18307CC6C6C67C00
+00D4:38447CC6C6C67C00
+00D5:66987CC6C6C67C00
 00D6:C3183C66663C1800
+00D7:00C66C38386CC600
+00D8:067CCE9AB2E678C0
+00D9:6030CCCCCCCCFC00
+00DA:1830CCCCCCCCFC00
+00DB:7884CCCCCCCCFC00
 00DC:CC00CCCCCCCC7800
+00DD:1830CCCC78307800
+00DE:60786C7860606000
 00DF:0078CCF8CCF8C0C0
 00E0:E000780C7CCC7E00
 00E1:1C00780C7CCC7E00
 00E2:7EC33C063E663F00
+00E3:6698780C7CCC7600
 00E4:CC00780C7CCC7E00
 00E5:3030780C7CCC7E00
 00E6:00007F0C7FCC7F00
@@ -140,34 +176,322 @@
 00ED:3800703030307800
 00EE:7CC6381818183C00
 00EF:CC00703030307800
+00F0:6C386C0C6CCC7800
 00F1:00F800F8CCCCCC00
 00F2:00E00078CCCC7800
 00F3:001C0078CCCC7800
 00F4:78CC0078CCCC7800
+00F5:6698007CC6C67C00
 00F6:00CC0078CCCC7800
 00F7:303000FC00303000
+00F8:0000067CDEF67CC0
 00F9:00E000CCCCCC7E00
 00FA:001C00CCCCCC7E00
 00FB:78CC00CCCCCC7E00
 00FC:00CC00CCCCCC7E00
+00FD:1830CCCCCC7C0CF8
+00FE:E0786C666C78E000
 00FF:00CC00CCCC7C0CF8
+0100:7C007CC6C6FEC6C6
+0101:007C00780C7CCC76
+0102:663C3C667E666600
+0103:C67C780C7CCC7600
+0104:183C667E666E180E
+0105:0000780C7CCC761C
+0106:0C187CC6C0C67C00
+0107:0C18003C60603C00
+010C:6C387CC6C0C67C00
+010D:361C003C60603C00
+010E:6C38FC666666FC00
+010F:6C380C0C7CCC7600
+0110:F86C66F6666CF800
+0111:0C3E0C7CCCCC7600
+0112:7C00FE607C6066FE
+0113:007C007CC6FEC07C
+0116:18FE66607C6066FE
+0117:0038007CC6FEC07C
+0118:FE6268786862FE1C
+0119:00003C667E603C1C
+011A:6C38FE607860FE00
+011B:361C3C667E603C00
+0122:3C66C0CE663E1870
+0123:3860307ECC7C0CF8
+0128:76DC38181818183C
+0129:0076DC003818183C
+012A:3C003C181818183C
+012B:003C00381818183C
+012E:783030303078301C
+012F:18003818183C180E
+0136:C6CCF8D8CCC60C38
+0137:00E0666C786CE61C
+0138:000000E66C786CE6
+0139:E66C60606266FE00
+013A:7336303030307800
+013B:F060606266FE1870
+013C:38181818183C1870
+013D:FB6E60606266FE00
+013E:FB6E60606060F000
+0141:F06878F0E266FE00
+0142:381A1E3C78183C00
+0143:0C18E6F6DECEC600
+0144:0C187C6666666600
+0145:C6E6F6DECEC60C38
+0146:0000DCE6C6C61870
+0147:6C38E6F6DECEC600
+0148:6C387C6666666600
+014A:00DCFEF6C6C6C6DC
+014B:0000DCFEF6C6061C
+014C:7C007CC6C6C6C67C
+014D:007C007CC6C6C67C
+0150:366C7CC6C6C67C00
+0151:366C003C66663C00
+0152:58D8DCD8583E0000
+0153:006CD2DED06E0000
+0154:0C18FCC6FCCCC600
+0155:0C18DC766660F000
+0156:FC667E6C66E61870
+0157:0000DC7666F030E0
+0158:6C38FCC6FCCCC600
+0159:6C38DC766660F000
+015A:0C187CC238867C00
+015B:0C183C4038047800
+015E:3C6630180C663C38
+015F:00003E603C067C38
+0160:6C387CC238867C00
+0161:6C383C4038047800
+0162:7E5A181818183C0E
+0163:10307C303034180E
+0164:361C7E5A18183C00
+0165:6C38307C30341800
+0166:00FF991E3C78183C
+0167:003030FC3038761C
+0168:76DC00C6C6C6C67C
+0169:76DC00CCCCCCCC76
+016A:7C00C6C6C6C6C67C
+016B:007800CCCCCCCC76
+016E:386CF6C6C6C67C00
+016F:30CC30CCCCCC7600
+0170:366CC6C6C6C67C00
+0171:6CD800CCCCCC7600
+0172:C6C6C6C6C67C301E
+0173:0000CCCCCC7E301C
+0178:00CCCC7830780000
+0179:0C18FE861862FE00
+017A:0C18007C18307C00
+017B:1800FE861862FE00
+017C:0018007C18307C00
+017D:6C38FE861862FE00
+017E:6C38007C18307C00
 0192:0E1B183C1818D870
+02C7:6C38000000000000
+02D8:C67C000000000000
+02D9:1800000000000000
+02DB:000000000000301C
+02DD:366C000000000000
+037A:0000000000000000
+0384:0810000000000000
+0385:08D3000000000000
+0386:5CB6637F63636300
+0388:5F90101E10101F00
+0389:B3B3333F33333300
+038A:5E8C0C0C0C0C1E00
+038C:5CB6636363361C00
+038E:B3B3331E0C0C1E00
+038F:5CB6636336147700
+0390:08D3003030303C00
+0391:386CC6FEC6C6C600
+0392:FC66667C6666FC00
 0393:00FCCCC0C0C0C000
+0394:10386CC6C6C6FE00
+0395:FEC0C0FCC0C0FE00
+0396:FE060C183060FE00
+0397:C6C6C6FEC6C6C600
 0398:386CC6FEC66C3800
+0399:7E18181818187E00
+039A:C6CCD8F0D8CCC600
+039B:10386CC6C6C6C600
+039C:C6EEFED6C6C6C600
+039D:C6E6F6DECEC6C600
+039E:FEC6003800C6FE00
+039F:7CC6C6C6C6C67C00
+03A0:FF66666666666600
+03A1:FCC6C6FCC0C0C000
 03A3:FCCC603060CCFC00
+03A4:7E18181818181800
+03A5:6666663C18181800
 03A6:FC3078CCCC7830FC
+03A7:C6C66C386CC6C600
+03A8:10D6D6D67C103800
 03A9:386CC6C66C6CEE00
+03AA:C33C181818183C00
+03AB:660066663C183C00
+03AC:081076CCCCCC7600
+03AD:08107EC07CC07E00
+03AE:0810BC6666666606
+03AF:0810303030303C00
+03B0:08D300E666663C00
 03B1:000076DCC8DC7600
+03B2:78CCD8FCC6C6FC80
+03B3:0000C66C386CC67C
 03B4:1C30187CCCCC7800
 03B5:3860C0F8C0603800
+03B6:7E061C30603E021C
+03B7:0000BC6666666606
+03B8:7CC6E63E86C67C00
+03B9:0000303030301C00
+03BA:0000C6DCF0DCC600
+03BB:7CC6061E3666C600
+03BC:0000C6C6C6E6DDC0
+03BD:000082C6C66C3800
+03BE:7E18303C603E021C
+03BF:00007CC6C6C67C00
 03C0:00FE6C6C6C6C6C00
+03C1:00007CC6C6FCC0C0
+03C2:00007EC0C07C061C
 03C3:00007ED8D8D87000
 03C4:0076DC1818181800
+03C5:0000E66666663C00
 03C6:060C7EDBDB7E60C0
+03C7:0000C26C386C8600
+03C8:000010D6D6D67C10
+03C9:000044D6D6D66C00
+03CA:CC00303030303C00
+03CB:6600E66666663C00
+03CC:08107CC6C6C67C00
+03CD:0810E66666663C00
+03CE:081044D6D6D66C00
+0401:66007E607C607E00
+0402:F860607C66666C00
+0403:187E606060606000
+0404:3C66C0F8C0663C00
+0405:78CCE0701CCC7800
+0406:3078303030307800
+0407:4878303030307800
+0408:1E0C0C0CCCCC7800
+0409:3878D8DEDBDBDE00
+040A:D8D8D8FEDBDBDE00
+040B:FC30303C36363600
+040C:18D6CCF8F8CCC600
+040E:1866663E06663C00
+040F:C6C6C6C6FE383800
+0410:1E3666667E666600
+0411:7C60607C66667C00
+0412:7C66667C66667C00
+0413:7E60606060606000
+0414:386C6C6C6C6CFEC6
+0415:7E60607C60607E00
+0416:DBDB7E3C7EDBDB00
+0417:3C66061C06663C00
+0418:66666E7E76666600
+0419:3C666E7E76666600
+041A:666C7870786C6600
+041B:1E36666666666600
+041C:C6EEFEFED6C6C600
+041D:6666667E66666600
+041E:3C66666666663C00
+041F:7E66666666666600
+0420:7C6666667C606000
+0421:3C66606060663C00
+0422:7E18181818181800
+0423:6666663E06663C00
+0424:7EDBDBDB7E181800
+0425:66663C183C666600
+0426:6666666666667F03
+0427:6666663E06060600
+0428:DBDBDBDBDBDBFF00
+0429:DBDBDBDBDBDBFF03
+042A:E060607C66667C00
+042B:C6C6C6F6DEDEF600
+042C:6060607C66667C00
+042D:788C063E068C7800
+042E:CEDBDBFBDBDBCE00
+042F:3E6666663E366600
+0430:0000780C7CCC7600
+0431:003C603C66663C00
+0432:00007C667C667C00
+0433:00007E6060606000
+0434:00003C6C6C6CFEC6
+0435:00003C667E603C00
+0436:0000DB7E3C7EDB00
+0437:00003C660C663C00
+0438:0000666E7E766600
+0439:0018666E7E766600
+043A:0000666C786C6600
+043B:00001E3666666600
+043C:0000C6FEFED6C600
+043D:000066667E666600
+043E:00003C6666663C00
+043F:00007E6666666600
+0440:00007C66667C6000
+0441:00003C6660663C00
+0442:00007E1818181800
+0443:000066663E063C00
+0444:00007EDBDB7E1800
+0445:0000663C183C6600
+0446:0000666666667F03
+0447:000066663E060600
+0448:0000DBDBDBDBFF00
+0449:0000DBDBDBDBFF03
+044A:0000E0607C667C00
+044B:0000C6C6F6DEF600
+044C:000060607C667C00
+044D:00007C063E067C00
+044E:0000CEDBFBDBCE00
+044F:00003E663E366600
+0451:24003C667E603C00
+0452:6060F8607C66660C
+0453:18007E6060606000
+0454:00007CC0F8C07C00
+0455:00007CC0780CF800
+0456:2000703030307800
+0457:5000703030307800
+0458:08001C0C0CCCCC78
+0459:00003878DEDBDE00
+045A:0000D8D8FEDBDE00
+045B:3030FC303C363600
+045C:1810CCD8F0D8CC00
+045E:180066663E063C00
+045F:0000C6C6FE383800
+05D0:00C66676DCCCC600
+05D1:00F80C0C0C0CFE00
+05D2:00380C0C1C34E600
+05D3:00FE0C0C0C0C0C00
+05D4:00FC0606C6C6C600
+05D5:0070181818181800
+05D6:003C18180C183000
+05D7:00FC66C6C6C6C600
+05D8:00CCD6D6C6CC7800
+05D9:00380C0C18000000
+05DA:00FC06060C0C0C0E
+05DB:00FC06060606FC00
+05DC:C0FC06060C181800
+05DD:00FC66C6C6C6FE00
+05DE:00DC7666C6C6DE00
+05DF:00380C181818181C
+05E0:00380C0C0C0C7C00
+05E1:00FC66C6C6CC7800
+05E2:006666666636FC00
+05E3:00F84CCCEC0C0C0E
+05E4:00FC46C6E606FE00
+05E5:006666667C606070
+05E6:0066361C0C067E00
+05E7:00FC06666C6E6060
+05E8:00FC060606060600
+05E9:00D6D6D6F6C67C00
+05EA:00FC666666E6E600
+200E:0000000000000000
+200F:0000000000000000
+2015:000000FF00000000
+2017:0000000000FF00FF
+2018:3040300000000000
+2019:0C020C0000000000
 2022:0000183C3C180000
 203C:6666666666006600
 207F:786C6C6C6C000000
 20A7:F8CCCCFAC6CFC6C7
+20AC:0000000000000000
+20AF:0000000000000000
+2116:8ACDEAB89B888B00
 2190:003060FE60300000
 2191:183C7E1818181800
 2192:00180CFE0C180000
diff --git a/share/vt/fonts/vgarom-thin-8x16.hex b/share/vt/fonts/vgarom-thin-8x16.hex
new file mode 100644
index 000000000000..4ec9fa7034c9
--- /dev/null
+++ b/share/vt/fonts/vgarom-thin-8x16.hex
@@ -0,0 +1,308 @@
+# $FreeBSD$
+# Height: 16
+# Width: 8
+0000:00000000000000000000000000000000
+0020:00000000000000000000000000000000
+0021:00001038383810101000101000000000
+0022:00424242420000000000000000000000
+0023:0000004444FE444444FE444400000000
+0024:10107C828240300C0482827C10100000
+0025:00000000008284081020428200000000
+0026:00003844443838474444443B00000000
+0027:00202040000000000000000000000000
+0028:00000408101010101010080400000000
+0029:00002010080808080808102000000000
+002A:00000000002418FF1824000000000000
+002B:000000000010107C1010000000000000
+002C:00000000000000000010101020000000
+002D:00000000000000FE0000000000000000
+002E:00000000000000000000101000000000
+002F:00000000000204081020408000000000
+0030:00003844828292928282443800000000
+0031:00000818380808080808083E00000000
+0032:00007C8202040810204082FE00000000
+0033:00007C8202023C020202827C00000000
+0034:00000C14244484FE0404040E00000000
+0035:0000FE808080FC020202827C00000000
+0036:000038408080FC828282827C00000000
+0037:0000FE82020204081010101000000000
+0038:00007C8282827C828282827C00000000
+0039:00007C8282827E020202047800000000
+003A:00000000101000000010100000000000
+003B:00000000101000000010102000000000
+003C:00000004081020402010080400000000
+003D:00000000007E00007E00000000000000
+003E:00000040201008040810204000000000
+003F:00007C82820204080800080800000000
+0040:0000007C82829E92928C807C00000000
+0041:00001028448282FE8282828200000000
+0042:0000FC4242427C42424242FC00000000
+0043:00003C42828080808082423C00000000
+0044:0000F84442424242424244F800000000
+0045:0000FE4242487848404242FE00000000
+0046:0000FE4242487848404040E000000000
+0047:00003C428280809E8282463A00000000
+0048:000082828282FE828282828200000000
+0049:00003810101010101010103800000000
+004A:00000E04040404048484847800000000
+004B:0000C24242444878444242C200000000
+004C:0000E04040404040404242FE00000000
+004D:000082C6AA9282828282828200000000
+004E:00008282C2A2928A8682828200000000
+004F:00003844828282828282443800000000
+0050:0000FC4242427C40404040E000000000
+0051:00007C828282828282928A7C04020000
+0052:0000FC4242427C44424242C200000000
+0053:00007C828240300C0482827C00000000
+0054:0000FE92921010101010103800000000
+0055:00008282828282828282827C00000000
+0056:00008282828282828244281000000000
+0057:000082828282828292AAC68200000000
+0058:00008282442810284482828200000000
+0059:00008282824438101010103800000000
+005A:0000FE8282041820408282FE00000000
+005B:00003C20202020202020203C00000000
+005C:00000080402010080402010000000000
+005D:00003C04040404040404043C00000000
+005E:10284482000000000000000000000000
+005F:00000000000000000000000000FF0000
+0060:10100800000000000000000000000000
+0061:000000000078047C84848C7600000000
+0062:0000C040407844424242427C00000000
+0063:00000000007C82808080827C00000000
+0064:00000C04043C448484848C7600000000
+0065:00000000007C8282FE80827C00000000
+0066:000038444440E040404040E000000000
+0067:0000000000768C848484847C04847800
+0068:0000C040407C4242424242C200000000
+0069:00001010003010101010103800000000
+006A:00000202000602020202020242423C00
+006B:0000C04040424448784442C200000000
+006C:00003010101010101010103800000000
+006D:0000000000EC92929292929200000000
+006E:0000000000DC62424242424200000000
+006F:00000000007C82828282827C00000000
+0070:0000000000DC62424242427C4040E000
+0071:0000000000768C848484847C04040E00
+0072:0000000000DC6242404040E000000000
+0073:00000000007C82807C02827C00000000
+0074:0000202020F820202020221C00000000
+0075:000000000084848484848C7600000000
+0076:00000000004242424242241800000000
+0077:000000000082828292AAC68200000000
+0078:00000000008244281028448200000000
+0079:00000000008282828282827E02047800
+007A:0000000000FE8408102042FE00000000
+007B:00000E10101060101010100E00000000
+007C:00001010101000101010101000000000
+007D:00007008080806080808087000000000
+007E:000076DC000000000000000000000000
+00A0:00000000000000000000000000000000
+00A1:00001010001010103838381000000000
+00A2:00101038444040404838101000000000
+00A3:0038444440E04040404042FC00000000
+00A4:0000413E2222223E4100000000000000
+00A5:0000444428107C107C10101000000000
+00A6:00080808080800000808080808000000
+00A7:007C864038448282443804C27C000000
+00A8:00242424000000000000000000000000
+00A9:00003E41415D51515D41413E00000000
+00AA:003C44443E007E000000000000000000
+00AB:00000000002448904824000000000000
+00AC:000000000000FE060606060000000000
+00AD:00000000000000FF0000000000000000
+00AE:00003E415D5559555541413E00000000
+00AF:0000FF00000000000000000000000000
+00B0:00384444380000000000000000000000
+00B1:0000000010107C10100000FE00000000
+00B2:00708810204878000000000000000000
+00B3:00007008300870000000000000000000
+00B4:00020408000000000000000000000000
+00B5:0000000042424242427C4040C0000000
+00B6:00007F89898979090909090900000000
+00B7:00000000000000181800000000000000
+00B8:00000000000000000000000002040800
+00B9:00001030101000000000000000000000
+00BA:0038444438007C000000000000000000
+00BB:00000000008844224488000000000000
+00BC:0080808284881020468A123E02020000
+00BD:0080808284881020409C0204081E0000
+00BE:00304810094A34081123450F01010000
+00BF:00002020002020408082827C00000000
+00C0:300C003C4242427E4242424200000000
+00C1:0C30003C4242427E4242424200000000
+00C2:1824003C4242427E4242424200000000
+00C3:324C003C4242427E4242424200000000
+00C4:0082001028448282FE82828200000000
+00C5:3844381028448282FE82828200000000
+00C6:00003E448484FE848484848600000000
+00C7:00003C428280808082423C04027C0000
+00C8:1806003E2020203C2020203E00000000
+00C9:081020FE4240407C404042FE00000000
+00CA:0C12003E2020203C2020203E00000000
+00CB:1414003E2020203C2020203E00000000
+00CC:1806001C080808080808081C00000000
+00CD:0618001C080808080808081C00000000
+00CE:0814001C080808080808081C00000000
+00CF:1414001C080808080808081C00000000
+00D0:000078444242F2424242447800000000
+00D1:76DC0082C2A2928A8682828200000000
+00D2:300C003C424242424242423C00000000
+00D3:0C30003C424242424242423C00000000
+00D4:1824003C424242424242423C00000000
+00D5:324C003C424242424242423C00000000
+00D6:0082007C828282828282827C00000000
+00D7:00000000002214081422000000000000
+00D8:0000011A244A4A525224588000000000
+00D9:300C0042424242424242423C00000000
+00DA:0C300042424242424242423C00000000
+00DB:18240042424242424242423C00000000
+00DC:00820082828282828282827C00000000
+00DD:04080041412214080808080800000000
+00DE:00202038242222222438202020000000
+00DF:000078848484B884828282BC80000000
+00E0:004020100078047C84848C7600000000
+00E1:000810200078047C84848C7600000000
+00E2:001028440078047C84848C7600000000
+00E3:0000324C003C42023E42423D00000000
+00E4:000084840078047C84848C7600000000
+00E5:003844380078047C84848C7600000000
+00E6:00000000008C52327E88986E00000000
+00E7:000000003C424040423C04023C000000
+00E8:00402010007C8282FE80827C00000000
+00E9:00040810007C8282FE80827C00000000
+00EA:00102844007C8282FE80827C00000000
+00EB:00008400007C8282FE80827C00000000
+00EC:00402010001808080808081C00000000
+00ED:00040810001808080808081C00000000
+00EE:00182442001808080808081C00000000
+00EF:00004444001808080808081C00000000
+00F0:00001D02060A023E4242423E00000000
+00F1:000076DC00DC62424242424200000000
+00F2:00402010007C82828282827C00000000
+00F3:00081020007C82828282827C00000000
+00F4:00102844007C82828282827C00000000
+00F5:0000324C003C42424242423C00000000
+00F6:00004400007C82828282827C00000000
+00F7:000000001010007C0010100000000000
+00F8:00000000001D22454951225C00000000
+00F9:004020100084848484848C7600000000
+00FA:000810200084848484848C7600000000
+00FB:003048840084848484848C7600000000
+00FC:000084000084848484848C7600000000
+00FD:00000408000042424242423E02023C00
+00FE:00002020382424242830202020000000
+00FF:00008200000082828282827E02047800
+0152:00007F8888888E888888887F00000000
+0153:00000000006E91919F90916E00000000
+0160:2418003C4240403C0202423C00000000
+0161:00002418003C42403C02423C00000000
+0178:14140041412214080808080800000000
+017D:2418007E020408102040407E00000000
+017E:00002418007E04081020407E00000000
+0192:0006090808083E080808080848300000
+0393:0000FE82828080808080808000000000
+0398:00000038448282FE8282443800000000
+03A3:000000FE82402010204082FE00000000
+03A6:0000007C103844444438107C00000000
+03A9:0000384482828244282828EE00000000
+03B1:00000000006294988898946200000000
+03B4:00001E1008043E424242423C00000000
+03B5:00001C20404078404040201C00000000
+03C0:00000000FE4444444444444400000000
+03C3:00000000007E88888888887000000000
+03C4:0000000072D408080808080800000000
+03C6:00000001027E8991A17E408000000000
+2022:000000000000183C3C18000000000000
+203C:00004242424242424200424200000000
+207F:00D86444444444000000000000000000
+20A7:00F88484F884849E8484848600000000
+20AC:00001E21207E207E20211E0000000000
+2190:00000000002040FE4020000000000000
+2191:000010387C1010101010101000000000
+2192:00000000000804FE0408000000000000
+2193:0000101010101010107C381000000000
+2194:0000000000286CFE6C28000000000000
+2195:000010387C1010107C38100000000000
+21A8:000010387C1010107C38107C00000000
+2219:00000000000000001800000000000000
+221A:000F0808080808E82828281800000000
+221E:00000000007E9999997E000000000000
+221F:000000000000808080FE000000000000
+2229:0000007C828282828282828200000000
+2248:000000000076DC0076DC000000000000
+2261:00000000FE0000FE0000FE0000000000
+2264:00000008102040201008007E00000000
+2265:00000010080402040810007E00000000
+2302:00000000102844828282FE0000000000
+2310:000000000000FEC0C0C0C00000000000
+2320:00000E11111010101010101010101010
+2321:08080808080808080888887070000000
+2500:00000000000000FF0000000000000000
+2502:18181818181818181818181818181818
+250C:000000000000001F1818181818181818
+2510:00000000000000F81818181818181818
+2514:181818181818181F0000000000000000
+2518:18181818181818F80000000000000000
+251C:181818181818181F1818181818181818
+2524:18181818181818F81818181818181818
+252C:00000000000000FF1818181818181818
+2534:18181818181818FF0000000000000000
+253C:18181818181818FF1818181818181818
+2550:0000000000FF00FF0000000000000000
+2551:36363636363636363636363636363636
+2552:00000000001F181F1818181818181818
+2553:000000000000003F3636363636363636
+2554:00000000003F30373636363636363636
+2555:0000000000F818F81818181818181818
+2556:00000000000000FE3636363636363636
+2557:0000000000FE06F63636363636363636
+2558:18181818181F181F0000000000000000
+2559:363636363636363F0000000000000000
+255A:363636363637303F0000000000000000
+255B:1818181818F818F80000000000000000
+255C:36363636363636FE0000000000000000
+255D:3636363636F606FE0000000000000000
+255E:18181818181F181F1818181818181818
+255F:36363636363636373636363636363636
+2560:36363636363730373636363636363636
+2561:1818181818F818F81818181818181818
+2562:36363636363636F63636363636363636
+2563:3636363636F606F63636363636363636
+2564:0000000000FF00FF1818181818181818
+2565:00000000000000FF3636363636363636
+2566:0000000000FF00F73636363636363636
+2567:1818181818FF00FF0000000000000000
+2568:36363636363636FF0000000000000000
+2569:3636363636F700FF0000000000000000
+256A:1818181818FF18FF1818181818181818
+256B:36363636363636FF3636363636363636
+256C:3636363636F700F73636363636363636
+2580:FFFFFFFFFFFFFF000000000000000000
+2584:00000000000000FFFFFFFFFFFFFFFFFF
+2588:FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+258C:F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0
+2590:0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F0F
+2591:11441144114411441144114411441144
+2592:55AA55AA55AA55AA55AA55AA55AA55AA
+2593:DD77DD77DD77DD77DD77DD77DD77DD77
+25A0:000000007C7C7C7C7C7C7C0000000000
+25AC:0000000000000000FEFEFEFE00000000
+25B2:000000001038387C7CFEFE0000000000
+25BA:0080C0E0F0F8FEF8F0E0C08000000000
+25BC:00000000FEFE7C7C3838100000000000
+25C4:0002060E1E3EFE3E1E0E060200000000
+25CB:00000000003C664242663C0000000000
+25D8:FFFFFFFFFFFFE7C3C3E7FFFFFFFFFFFF
+25D9:FFFFFFFFFFC399BDBD99C3FFFFFFFFFF
+263A:00007E81A58181BD9981817E00000000
+263B:00007EFFDBFFFFC3E7FFFF7E00000000
+263C:0000001010D638EE38D6101000000000
+2640:0000384444444438107C101000000000
+2642:00003E0A122278848484847800000000
+2660:000000183C7EFFFF7E18183C00000000
+2663:000000183C3CE7E7E718183C00000000
+2665:000000006CFEFEFEFE7C381000000000
+2666:0000000010387CFE7C38100000000000
+266A:00003F213F2020202060E0C000000000
+266C:00003F213F212121212367E6C0000000
diff --git a/share/vt/fonts/vgarom-thin-8x8.hex b/share/vt/fonts/vgarom-thin-8x8.hex
new file mode 100644
index 000000000000..738949733bd6
--- /dev/null
+++ b/share/vt/fonts/vgarom-thin-8x8.hex
@@ -0,0 +1,258 @@
+# $FreeBSD$
+# Height: 8
+# Width: 8
+0020:0000000000000000
+0021:1038381010001000
+0022:2424240000000000
+0023:2424FF24FF242400
+0024:107C807804F81000
+0025:00C6CC183066C600
+0026:3844385684847600
+0027:2020400000000000
+0028:1020404040201000
+0029:2010080808102000
+002A:004438FE38440000
+002B:001010FE10100000
+002C:0000000000101020
+002D:000000FC00000000
+002E:0000000000101000
+002F:0204081020408000
+0030:7C82868A92A27C00
+0031:1030101010107C00
+0032:788404104084FC00
+0033:7884043804847800
+0034:08182848FE081C00
+0035:FC80F80404847800
+0036:384080F884847800
+0037:FC84081020202000
+0038:7884847884847800
+0039:7884847C04087000
+003A:0010100000101000
+003B:0010100000101020
+003C:1020408040201000
+003D:0000FC0000FC0000
+003E:2010080408102000
+003F:7884040810001000
+0040:7C829E929E807800
+0041:30488484FC848400
+0042:FC42427C4242FC00
+0043:3C42808080423C00
+0044:F84442424244F800
+0045:FE4248784842FE00
+0046:FE4248784840E000
+0047:3C4280808E423E00
+0048:848484FC84848400
+0049:3810101010103800
+004A:0E04040444443800
+004B:C24448704442C200
+004C:E04040404042FE00
+004D:82C6AA9282828200
+004E:82C2A2928A868200
+004F:3844828282443800
+0050:FC42427C4040E000
+0051:3844828282543804
+0052:FC42427C4442C200
+0053:3884807804847400
+0054:FE92101010103800
+0055:848484848484FC00
+0056:8484848484483000
+0057:82828292AAC68200
+0058:8244281028448200
+0059:8244281010103800
+005A:FE8488102242FE00
+005B:7840404040407800
+005C:8040201008040200
+005D:7808080808087800
+005E:1028448200000000
+005F:00000000000000FF
+0060:2020100000000000
+0061:000078047C847600
+0062:C0407C424242DC00
+0063:0000788480847800
+0064:0C047C8484847600
+0065:00007884FC807800
+0066:384440E04040E000
+0067:00007684847C04F8
+0068:C0404C624242C200
+0069:1000301010103800
+006A:0400040404848478
+006B:C04042447844C200
+006C:3010101010103800
+006D:0000EC9292928200
+006E:0000F88484848400
+006F:0000788484847800
+0070:0000DC42427C40E0
+0071:00007684847C040E
+0072:0000DC624040E000
+0073:00007C807804F800
+0074:10107C1010120C00
+0075:0000848484847600
+0076:0000848484483000
+0077:00008292AAC68200
+0078:0000844830488400
+0079:00008484847C04F8
+007A:0000FC883044FC00
+007B:182020C020201800
+007C:1010100010101000
+007D:6010100C10106000
+007E:6498000000000000
+00A0:0000000000000000
+00A1:1010001038381000
+00A2:10107E80807E1010
+00A3:384444E04082FC00
+00A5:4428107C107C1010
+00A7:3E61384444388C78
+00AA:3C44443A007E0000
+00AB:0022448844220000
+00AC:000000FC0C0C0000
+00B0:3844443800000000
+00B1:2020FC202000FC00
+00B2:3048102078000000
+00B5:00424242427C4080
+00B6:7F92927212121200
+00B7:0000001818000000
+00BA:38444438007C0000
+00BB:0044221122440000
+00BC:4244485365498F01
+00BD:424448566942840F
+00BF:2000204080847800
+00C4:82384482FE828200
+00C5:30104482FE828200
+00C6:3F4888FF88888F00
+00C7:7884808478180478
+00C9:0CFC40784040FC00
+00D1:649884A494848400
+00D6:4218244242241800
+00DC:8400848484847800
+00DF:007884F884F88080
+00E0:C00078047C847A00
+00E1:1C0078047C847A00
+00E2:7E813C023E423D00
+00E4:840078047C847A00
+00E5:202078047C847A00
+00E6:000067197F987700
+00E7:0000788080780438
+00E8:60007884FC807800
+00E9:0C007884FC807800
+00EA:7E813C427E403C00
+00EB:84007884FC807800
+00EC:6000301010103800
+00ED:1800301010103800
+00EE:7C82301010103800
+00EF:4800301010103800
+00F1:6498B8C484848400
+00F2:C000788484847800
+00F3:0810788484847800
+00F4:7884788484847800
+00F6:8400788484847800
+00F7:202000F800202000
+00F9:2010424242423C00
+00FA:0810848484847A00
+00FB:7E81424242423C00
+00FC:0084008484847A00
+00FF:84008484847C04F8
+0192:0C12103810109060
+0393:00FC848080808000
+0398:384482FE82443800
+03A3:FC8440204084FC00
+03A6:F8207088887020F8
+03A9:3844828228286C00
+03B1:0000629488946200
+03B4:1C10087C84847800
+03B5:384080F880403800
+03C0:00FE282828282800
+03C3:00007E8888887000
+03C4:0076880808080800
+03C6:02047E89917E4080
+2022:0000183C3C180000
+203C:2424242424002400
+207F:5844444444000000
+20A7:F88484F882878283
+2190:002040FE40200000
+2191:10387C1010101000
+2192:000804FE04080000
+2193:101010107C381000
+2194:002466FF66240000
+2195:10387C10107C3810
+21A8:10387C107C3810FE
+2219:0000000018000000
+221A:0704040464241C0C
+221E:00007C92927C0000
+221F:0000808080FE0000
+2229:7884848484848400
+2248:0064980064980000
+2261:00FC00FC00FC0000
+2264:102040201000FC00
+2265:402010204000FC00
+2302:001028448282FE00
+2310:000000FCC0C00000
+2320:0E11111010101010
+2321:0808080808888870
+2500:00000000FF000000
+2502:1818181818181818
+250C:000000001F181818
+2510:00000000F8181818
+2514:181818181F000000
+2518:18181818F8000000
+251C:181818181F181818
+2524:18181818F8181818
+252C:00000000FF181818
+2534:18181818FF000000
+253C:18181818FF181818
+2550:0000FF00FF000000
+2551:3636363636363636
+2552:00001F181F181818
+2553:000000003F363636
+2554:00003F3037363636
+2555:0000F818F8181818
+2556:00000000FE363636
+2557:0000FE06F6363636
+2558:18181F181F000000
+2559:363636363F000000
+255A:363637303F000000
+255B:1818F818F8000000
+255C:36363636FE000000
+255D:3636F606FE000000
+255E:18181F181F181818
+255F:3636363637363636
+2560:3636373037363636
+2561:1818F818F8181818
+2562:36363636F6363636
+2563:3636F606F6363636
+2564:0000FF00FF181818
+2565:00000000FF363636
+2566:0000FF00F7363636
+2567:1818FF00FF000000
+2568:36363636FF000000
+2569:3636F700FF000000
+256A:1818FF18FF181818
+256B:36363636FF363636
+256C:3636F700F7363636
+2580:FFFFFFFF00000000
+2584:00000000FFFFFFFF
+2588:FFFFFFFFFFFFFFFF
+258C:F0F0F0F0F0F0F0F0
+2590:0F0F0F0F0F0F0F0F
+2591:2288228822882288
+2592:55AA55AA55AA55AA
+2593:77DD77DD77DD77DD
+25A0:00003C3C3C3C0000
+25AC:000000007E7E7E00
+25B2:00183C7EFFFF0000
+25BA:80E0F8FEF8E08000
+25BC:00FFFF7E3C180000
+25C4:020E3EFE3E0E0200
+25CB:003C664242663C00
+25D8:FFFFE7C3C3E7FFFF
+25D9:FFC399BDBD99C3FF
+263A:7E81A581BD99817E
+263B:7EFFDBFFC3E7FF7E
+263C:995A3CE7E73C5A99
+2640:3E4141413E083E08
+2642:1F03057D84848478
+2660:101038ECFE7C107C
+2663:387C38FED610107C
+2665:6CFEFEFE7C381000
+2666:10387CFE7C381000
+266A:3F213F20202060C0
+266C:3F213F21212366C0
diff --git a/share/vt/keymaps/Makefile b/share/vt/keymaps/Makefile
index 44972392dd52..35944a96913d 100644
--- a/share/vt/keymaps/Makefile
+++ b/share/vt/keymaps/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-FILES=	ua.kbd ua.shift.alt.kbd
+FILES=	pl.kbd ua.kbd ua.shift.alt.kbd
 
 FILESDIR= ${SHAREDIR}/vt/keymaps
 
diff --git a/share/vt/keymaps/pl.kbd b/share/vt/keymaps/pl.kbd
new file mode 100644
index 000000000000..ebbf8e9e4081
--- /dev/null
+++ b/share/vt/keymaps/pl.kbd
@@ -0,0 +1,116 @@
+# Polish ISO-8859-2 keymap by Krzysztof Mlynarski (17:46 27-04-1996 MET DST)
+#                             (krzysio@hydra.mimuw.edu.pl)
+# $FreeBSD$
+#                                                         alt
+# scan                       cntrl          alt    alt   cntrl lock
+# code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
+# ------------------------------------------------------------------
+  000   nop    nop    nop    nop    nop    nop    nop    nop     O
+  001   esc    esc    esc    esc    esc    esc    debug  esc     O
+  002   '1'    '!'    nop    nop    '1'    '!'    nop    nop     O
+  003   '2'    '@'    nul    nul    '2'    '@'    nul    nul     O
+  004   '3'    '#'    nop    nop    '3'    '#'    nop    nop     O
+  005   '4'    '$'    nop    nop    '4'    '$'    nop    nop     O
+  006   '5'    '%'    nop    nop    '5'    '%'    nop    nop     O
+  007   '6'    '^'    rs     rs     '6'    '^'    rs     rs      O
+  008   '7'    '&'    nop    nop    '7'    '&'    nop    nop     O
+  009   '8'    '*'    nop    nop    '8'    '*'    nop    nop     O
+  010   '9'    '('    nop    nop    '9'    '('    nop    nop     O
+  011   '0'    ')'    nop    nop    '0'    ')'    nop    nop     O
+  012   '-'    '_'    us     us     '-'    '_'    us     us      O
+  013   '='    '+'    nop    nop    '='    '+'    nop    nop     O
+  014   bs     bs     del    del    bs     bs     del    del     O
+  015   ht     btab   nop    nop    ht     btab   nop    nop     O
+  016   'q'    'Q'    dc1    dc1    'q'    'Q'    dc1    dc1     C
+  017   'w'    'W'    etb    etb    'w'    'W'    etb    etb     C
+  018   'e'    'E'    enq    enq    281    280    enq    enq     C
+  019   'r'    'R'    dc2    dc2    'r'    'R'    dc2    dc2     C
+  020   't'    'T'    dc4    dc4    't'    'T'    dc4    dc4     C
+  021   'y'    'Y'    em     em     'y'    'Y'    em     em      C
+  022   'u'    'U'    nak    nak    'u'    'U'    nak    nak     C
+  023   'i'    'I'    ht     ht     'i'    'I'    ht     ht      C
+  024   'o'    'O'    si     si     243    211    si     si      C
+  025   'p'    'P'    dle    dle    'p'    'P'    dle    dle     C
+  026   '['    '{'    esc    esc    '['    '{'    esc    esc     O
+  027   ']'    '}'    gs     gs     ']'    '}'    gs     gs      O
+  028   cr     cr     nl     nl     cr     cr     nl     nl      O
+  029   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
+  030   'a'    'A'    soh    soh    261    260    soh    soh     C
+  031   's'    'S'    dc3    dc3    347    346    dc3    dc3     C
+  032   'd'    'D'    eot    eot    'd'    'D'    eot    eot     C
+  033   'f'    'F'    ack    ack    'f'    'F'    ack    ack     C
+  034   'g'    'G'    bel    bel    'g'    'G'    bel    bel     C
+  035   'h'    'H'    bs     bs     'h'    'H'    bs     bs      C
+  036   'j'    'J'    nl     nl     'j'    'J'    nl     nl      C
+  037   'k'    'K'    vt     vt     'k'    'K'    vt     vt      C
+  038   'l'    'L'    ff     ff     322    321    ff     ff      C
+  039   ';'    ':'    nop    nop    ';'    ':'    nop    nop     O
+  040   '''    '"'    nop    nop    '''    '"'    nop    nop     O
+  041   '`'    '~'    nop    nop    '`'    '~'    nop    nop     O
+  042   lshift lshift lshift lshift lshift lshift lshift lshift  O
+  043   '\'    '|'    fs     fs     '\'    '|'    fs     fs      O
+  044   'z'    'Z'    sub    sub    380    379    sub    sub     C
+  045   'x'    'X'    can    can    378    377    can    can     C
+  046   'c'    'C'    etx    etx    263    262    etx    etx     C
+  047   'v'    'V'    syn    syn    'v'    'V'    syn    syn     C
+  048   'b'    'B'    stx    stx    'b'    'B'    stx    stx     C
+  049   'n'    'N'    so     so     324    323    so     so      C
+  050   'm'    'M'    cr     cr     'm'    'M'    cr     cr      C
+  051   ','    '<'    nop    nop    ','    '<'    nop    nop     O
+  052   '.'    '>'    nop    nop    '.'    '>'    nop    nop     O
+  053   '/'    '?'    nop    nop    '/'    '?'    nop    nop     O
+  054   rshift rshift rshift rshift rshift rshift rshift rshift  O
+  055   '*'    '*'    '*'    '*'    '*'    '*'    '*'    '*'     O
+  056   lalt   lalt   lalt   lalt   lalt   lalt   lalt   lalt    O
+  057   ' '    ' '    nul    ' '    ' '    ' '    susp   ' '     O
+  058   clock  clock  clock  clock  clock  clock  clock  clock   O
+  059   fkey01 fkey13 fkey25 fkey37 scr01  scr11  scr01  scr11   O
+  060   fkey02 fkey14 fkey26 fkey38 scr02  scr12  scr02  scr12   O
+  061   fkey03 fkey15 fkey27 fkey39 scr03  scr13  scr03  scr13   O
+  062   fkey04 fkey16 fkey28 fkey40 scr04  scr14  scr04  scr14   O
+  063   fkey05 fkey17 fkey29 fkey41 scr05  scr15  scr05  scr15   O
+  064   fkey06 fkey18 fkey30 fkey42 scr06  scr16  scr06  scr16   O
+  065   fkey07 fkey19 fkey31 fkey43 scr07  scr07  scr07  scr07   O
+  066   fkey08 fkey20 fkey32 fkey44 scr08  scr08  scr08  scr08   O
+  067   fkey09 fkey21 fkey33 fkey45 scr09  scr09  scr09  scr09   O
+  068   fkey10 fkey22 fkey34 fkey46 scr10  scr10  scr10  scr10   O
+  069   nlock  nlock  nlock  nlock  nlock  nlock  nlock  nlock   O
+  070   slock  slock  slock  slock  slock  slock  slock  slock   O
+  071   fkey49 '7'    '7'    '7'    '7'    '7'    '7'    '7'     N
+  072   fkey50 '8'    '8'    '8'    '8'    '8'    '8'    '8'     N
+  073   fkey51 '9'    '9'    '9'    '9'    '9'    '9'    '9'     N
+  074   fkey52 '-'    '-'    '-'    '-'    '-'    '-'    '-'     N
+  075   fkey53 '4'    '4'    '4'    '4'    '4'    '4'    '4'     N
+  076   fkey54 '5'    '5'    '5'    '5'    '5'    '5'    '5'     N
+  077   fkey55 '6'    '6'    '6'    '6'    '6'    '6'    '6'     N
+  078   fkey56 '+'    '+'    '+'    '+'    '+'    '+'    '+'     N
+  079   fkey57 '1'    '1'    '1'    '1'    '1'    '1'    '1'     N
+  080   fkey58 '2'    '2'    '2'    '2'    '2'    '2'    '2'     N
+  081   fkey59 '3'    '3'    '3'    '3'    '3'    '3'    '3'     N
+  082   fkey60 '0'    '0'    '0'    '0'    '0'    '0'    '0'     N
+  083   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
+  084   nop    nop    nop    nop    nop    nop    nop    nop     O
+  085   nop    nop    nop    nop    nop    nop    nop    nop     O
+  086   nop    nop    nop    nop    nop    nop    nop    nop     O
+  087   fkey11 fkey23 fkey35 fkey47 scr11  scr11  scr11  scr11   O
+  088   fkey12 fkey24 fkey36 fkey48 scr12  scr12  scr12  scr12   O
+  089   cr     cr     cr     cr     cr     cr     cr     cr      O
+  090   rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl   O
+  091   '/'    '/'    '/'    '/'    '/'    '/'    '/'    '/'     O
+  092   nscr   pscr   debug  debug  nop    nop    nop    nop     O
+  093   ralt   ralt   ralt   ralt   ralt   ralt   ralt   ralt    O
+  094   fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49  O
+  095   fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50  O
+  096   fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51  O
+  097   fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53  O
+  098   fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55  O
+  099   fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57  O
+  100   fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58  O
+  101   fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59  O
+  102   fkey60 paste  fkey60 fkey60 fkey60 fkey60 fkey60 fkey60  O
+  103   fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot   fkey61  O
+  104   slock  saver  slock  saver  susp   nop    susp   nop     O
+  105   fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62  O
+  106   fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63  O
+  107   fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64  O
+  108   nop    nop    nop    nop    nop    nop    nop    nop     O
diff --git a/sys/Makefile b/sys/Makefile
index a440e7288813..dc1d5e984327 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -8,7 +8,7 @@ CSCOPEDIRS=	boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
 		pci rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR}
 .if !defined(CSCOPE_ARCHDIR)
 .if defined(ALL_ARCH)
-CSCOPE_ARCHDIR = amd64 arm i386 ia64 mips pc98 powerpc sparc64 x86
+CSCOPE_ARCHDIR = amd64 arm i386 mips pc98 powerpc sparc64 x86
 .else
 CSCOPE_ARCHDIR = ${MACHINE} 
 .if ${MACHINE} != ${MACHINE_CPUARCH}
diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c
index e5dd4c306d14..049b51bb4e9f 100644
--- a/sys/amd64/acpica/acpi_machdep.c
+++ b/sys/amd64/acpica/acpi_machdep.c
@@ -45,9 +45,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/nexusvar.h>
 
 int acpi_resume_beep;
-TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep);
-SYSCTL_INT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep,
-    0, "Beep the PC speaker when resuming");
+SYSCTL_INT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RWTUN,
+    &acpi_resume_beep, 0, "Beep the PC speaker when resuming");
 
 int acpi_reset_video;
 TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video);
diff --git a/sys/amd64/acpica/acpi_wakecode.S b/sys/amd64/acpica/acpi_wakecode.S
index c4b0dcdfd502..a4c559fc8917 100644
--- a/sys/amd64/acpica/acpi_wakecode.S
+++ b/sys/amd64/acpica/acpi_wakecode.S
@@ -148,9 +148,9 @@ wakeup_32:
 	mov	$bootdata32 - bootgdt, %eax
 	mov	%ax, %ds
 
-	/* Turn on the PAE and PSE bits for when paging is enabled */
+	/* Turn on the PAE bit for when paging is enabled */
 	mov	%cr4, %eax
-	orl	$(CR4_PAE | CR4_PSE), %eax
+	orl	$CR4_PAE, %eax
 	mov	%eax, %cr4
 
 	/*
diff --git a/sys/amd64/amd64/amd64_mem.c b/sys/amd64/amd64/amd64_mem.c
index e77a96f3f554..29cf2c03d828 100644
--- a/sys/amd64/amd64/amd64_mem.c
+++ b/sys/amd64/amd64/amd64_mem.c
@@ -69,7 +69,6 @@ static char *mem_owner_bios = "BIOS";
 	(((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK))
 
 static int mtrrs_disabled;
-TUNABLE_INT("machdep.disable_mtrrs", &mtrrs_disabled);
 SYSCTL_INT(_machdep, OID_AUTO, disable_mtrrs, CTLFLAG_RDTUN,
     &mtrrs_disabled, 0, "Disable amd64 MTRRs.");
 
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index d51078dd1808..2a908a980f8d 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -228,7 +228,7 @@ alltraps_pushregs_no_rdi:
 	.type	calltrap,@function
 calltrap:
 	movq	%rsp,%rdi
-	call	trap
+	call	trap_check
 	MEXITCOUNT
 	jmp	doreti			/* Handle any pending ASTs */
 
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index d2d506a08a10..0f4b2b52aeef 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -890,6 +890,7 @@ static MALLOC_DEFINE(M_FPUKERN_CTX, "fpukern_ctx",
     "Kernel contexts for FPU state");
 
 #define	FPU_KERN_CTX_FPUINITDONE 0x01
+#define	FPU_KERN_CTX_DUMMY	 0x02	/* avoided save for the kern thread */
 
 struct fpu_kern_ctx {
 	struct savefpu *prev;
@@ -933,6 +934,10 @@ fpu_kern_enter(struct thread *td, struct fpu_kern_ctx *ctx, u_int flags)
 {
 	struct pcb *pcb;
 
+	if ((flags & FPU_KERN_KTHR) != 0 && is_fpu_kern_thread(0)) {
+		ctx->flags = FPU_KERN_CTX_DUMMY;
+		return (0);
+	}
 	pcb = td->td_pcb;
 	KASSERT(!PCB_USER_FPU(pcb) || pcb->pcb_save ==
 	    get_pcb_user_save_pcb(pcb), ("mangled pcb_save"));
@@ -952,6 +957,9 @@ fpu_kern_leave(struct thread *td, struct fpu_kern_ctx *ctx)
 {
 	struct pcb *pcb;
 
+	if (is_fpu_kern_thread(0) && (ctx->flags & FPU_KERN_CTX_DUMMY) != 0)
+		return (0);
+	KASSERT((ctx->flags & FPU_KERN_CTX_DUMMY) == 0, ("dummy ctx"));
 	pcb = td->td_pcb;
 	critical_enter();
 	if (curthread == PCPU_GET(fpcurthread))
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index 96d911a97d28..3b66369253f8 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/specialreg.h>
 #include <machine/md_var.h>
 
+#include <amd64/vmm/intel/vmx_controls.h>
 #include <x86/isa/icu.h>
 
 /* XXX - should be in header file: */
@@ -73,6 +74,7 @@ static u_int find_cpu_vendor_id(void);
 static void print_AMD_info(void);
 static void print_AMD_assoc(int i);
 static void print_via_padlock_info(void);
+static void print_vmx_info(void);
 
 int	cpu_class;
 char machine[] = "amd64";
@@ -428,6 +430,9 @@ printcpuinfo(void)
 			if (via_feature_rng != 0 || via_feature_xcrypt != 0)
 				print_via_padlock_info();
 
+			if (cpu_feature2 & CPUID2_VMX)
+				print_vmx_info();
+
 			if ((cpu_feature & CPUID_HTT) &&
 			    cpu_vendor_id == CPU_VENDOR_AMD)
 				cpu_feature &= ~CPUID_HTT;
@@ -722,3 +727,197 @@ print_via_padlock_info(void)
 	"\015RSA"		/* PMM */
 	);
 }
+
+static uint32_t
+vmx_settable(uint64_t basic, int msr, int true_msr)
+{
+	uint64_t val;
+
+	if (basic & (1UL << 55))
+		val = rdmsr(true_msr);
+	else
+		val = rdmsr(msr);
+
+	/* Just report the controls that can be set to 1. */
+	return (val >> 32);
+}
+
+static void
+print_vmx_info(void)
+{
+	uint64_t basic, msr;
+	uint32_t entry, exit, mask, pin, proc, proc2;
+	int comma;
+
+	printf("\n  VT-x: ");
+	msr = rdmsr(MSR_IA32_FEATURE_CONTROL);
+	if (!(msr & IA32_FEATURE_CONTROL_VMX_EN))
+		printf("(disabled in BIOS) ");
+	basic = rdmsr(MSR_VMX_BASIC);
+	pin = vmx_settable(basic, MSR_VMX_PINBASED_CTLS,
+	    MSR_VMX_TRUE_PINBASED_CTLS);
+	proc = vmx_settable(basic, MSR_VMX_PROCBASED_CTLS,
+	    MSR_VMX_TRUE_PROCBASED_CTLS);
+	if (proc & PROCBASED_SECONDARY_CONTROLS)
+		proc2 = vmx_settable(basic, MSR_VMX_PROCBASED_CTLS2,
+		    MSR_VMX_PROCBASED_CTLS2);
+	else
+		proc2 = 0;
+	exit = vmx_settable(basic, MSR_VMX_EXIT_CTLS, MSR_VMX_TRUE_EXIT_CTLS);
+	entry = vmx_settable(basic, MSR_VMX_ENTRY_CTLS, MSR_VMX_TRUE_ENTRY_CTLS);
+
+	if (!bootverbose) {
+		comma = 0;
+		if (exit & VM_EXIT_SAVE_PAT && exit & VM_EXIT_LOAD_PAT &&
+		    entry & VM_ENTRY_LOAD_PAT) {
+			printf("%sPAT", comma ? "," : "");
+			comma = 1;
+		}
+		if (proc & PROCBASED_HLT_EXITING) {
+			printf("%sHLT", comma ? "," : "");
+			comma = 1;
+		}
+		if (proc & PROCBASED_MTF) {
+			printf("%sMTF", comma ? "," : "");
+			comma = 1;
+		}
+		if (proc & PROCBASED_PAUSE_EXITING) {
+			printf("%sPAUSE", comma ? "," : "");
+			comma = 1;
+		}
+		if (proc2 & PROCBASED2_ENABLE_EPT) {
+			printf("%sEPT", comma ? "," : "");
+			comma = 1;
+		}
+		if (proc2 & PROCBASED2_UNRESTRICTED_GUEST) {
+			printf("%sUG", comma ? "," : "");
+			comma = 1;
+		}
+		if (proc2 & PROCBASED2_ENABLE_VPID) {
+			printf("%sVPID", comma ? "," : "");
+			comma = 1;
+		}
+		if (proc & PROCBASED_USE_TPR_SHADOW &&
+		    proc2 & PROCBASED2_VIRTUALIZE_APIC_ACCESSES &&
+		    proc2 & PROCBASED2_VIRTUALIZE_X2APIC_MODE &&
+		    proc2 & PROCBASED2_APIC_REGISTER_VIRTUALIZATION &&
+		    proc2 & PROCBASED2_VIRTUAL_INTERRUPT_DELIVERY) {
+			printf("%sVID", comma ? "," : "");
+			comma = 1;
+			if (pin & PINBASED_POSTED_INTERRUPT)
+				printf(",PostIntr");
+		}
+		return;
+	}
+
+	mask = basic >> 32;
+	printf("Basic Features=0x%b", mask,
+	"\020"
+	"\02132PA"		/* 32-bit physical addresses */
+	"\022SMM"		/* SMM dual-monitor */
+	"\027INS/OUTS"		/* VM-exit info for INS and OUTS */
+	"\030TRUE"		/* TRUE_CTLS MSRs */
+	);
+	printf("\n        Pin-Based Controls=0x%b", pin,
+	"\020"
+	"\001ExtINT"		/* External-interrupt exiting */
+	"\004NMI"		/* NMI exiting */
+	"\006VNMI"		/* Virtual NMIs */
+	"\007PreTmr"		/* Activate VMX-preemption timer */
+	"\010PostIntr"		/* Process posted interrupts */
+	);
+	printf("\n        Primary Processor Controls=0x%b", proc,
+	"\020"
+	"\003INTWIN"		/* Interrupt-window exiting */
+	"\004TSCOff"		/* Use TSC offsetting */
+	"\010HLT"		/* HLT exiting */
+	"\012INVLPG"		/* INVLPG exiting */
+	"\013MWAIT"		/* MWAIT exiting */
+	"\014RDPMC"		/* RDPMC exiting */
+	"\015RDTSC"		/* RDTSC exiting */
+	"\020CR3-LD"		/* CR3-load exiting */
+	"\021CR3-ST"		/* CR3-store exiting */
+	"\024CR8-LD"		/* CR8-load exiting */
+	"\025CR8-ST"		/* CR8-store exiting */
+	"\026TPR"		/* Use TPR shadow */
+	"\027NMIWIN"		/* NMI-window exiting */
+	"\030MOV-DR"		/* MOV-DR exiting */
+	"\031IO"		/* Unconditional I/O exiting */
+	"\032IOmap"		/* Use I/O bitmaps */
+	"\034MTF"		/* Monitor trap flag */
+	"\035MSRmap"		/* Use MSR bitmaps */
+	"\036MONITOR"		/* MONITOR exiting */
+	"\037PAUSE"		/* PAUSE exiting */
+	);
+	if (proc & PROCBASED_SECONDARY_CONTROLS)
+		printf("\n        Secondary Processor Controls=0x%b", proc2,
+		"\020"
+		"\001APIC"		/* Virtualize APIC accesses */
+		"\002EPT"		/* Enable EPT */
+		"\003DT"		/* Descriptor-table exiting */
+		"\004RDTSCP"		/* Enable RDTSCP */
+		"\005x2APIC"		/* Virtualize x2APIC mode */
+		"\006VPID"		/* Enable VPID */
+		"\007WBINVD"		/* WBINVD exiting */
+		"\010UG"		/* Unrestricted guest */
+		"\011APIC-reg"		/* APIC-register virtualization */
+		"\012VID"		/* Virtual-interrupt delivery */
+		"\013PAUSE-loop"	/* PAUSE-loop exiting */
+		"\014RDRAND"		/* RDRAND exiting */
+		"\015INVPCID"		/* Enable INVPCID */
+		"\016VMFUNC"		/* Enable VM functions */
+		"\017VMCS"		/* VMCS shadowing */
+		"\020EPT#VE"		/* EPT-violation #VE */
+		"\021XSAVES"		/* Enable XSAVES/XRSTORS */
+		);
+	printf("\n        Exit Controls=0x%b", mask,
+	"\020"
+	"\003DR"		/* Save debug controls */
+				/* Ignore Host address-space size */
+	"\015PERF"		/* Load MSR_PERF_GLOBAL_CTRL */
+	"\020AckInt"		/* Acknowledge interrupt on exit */
+	"\023PAT-SV"		/* Save MSR_PAT */
+	"\024PAT-LD"		/* Load MSR_PAT */
+	"\025EFER-SV"		/* Save MSR_EFER */
+	"\026EFER-LD"		/* Load MSR_EFER */
+	"\027PTMR-SV"		/* Save VMX-preemption timer value */
+	);
+	printf("\n        Entry Controls=0x%b", mask,
+	"\020"
+	"\003DR"		/* Save debug controls */
+				/* Ignore IA-32e mode guest */
+				/* Ignore Entry to SMM */
+				/* Ignore Deactivate dual-monitor treatment */
+	"\016PERF"		/* Load MSR_PERF_GLOBAL_CTRL */
+	"\017PAT"		/* Load MSR_PAT */
+	"\020EFER"		/* Load MSR_EFER */
+	);
+	if (proc & PROCBASED_SECONDARY_CONTROLS &&
+	    (proc2 & (PROCBASED2_ENABLE_EPT | PROCBASED2_ENABLE_VPID)) != 0) {
+		msr = rdmsr(MSR_VMX_EPT_VPID_CAP);
+		mask = msr;
+		printf("\n        EPT Features=0x%b", mask,
+		"\020"
+		"\001XO"		/* Execute-only translations */
+		"\007PW4"		/* Page-walk length of 4 */
+		"\011UC"		/* EPT paging-structure mem can be UC */
+		"\017WB"		/* EPT paging-structure mem can be WB */
+		"\0212M"		/* EPT PDE can map a 2-Mbyte page */
+		"\0221G"		/* EPT PDPTE can map a 1-Gbyte page */
+		"\025INVEPT"		/* INVEPT is supported */
+		"\026AD"		/* Accessed and dirty flags for EPT */
+		"\032single"		/* INVEPT single-context type */
+		"\033all"		/* INVEPT all-context type */
+		);
+		mask = msr >> 32;
+		printf("\n        VPID Features=0x%b", mask,
+		"\020"
+		"\001INVVPID"		/* INVVPID is supported */
+		"\011individual"	/* INVVPID individual-address type */
+		"\012single"		/* INVVPID single-context type */
+		"\013all"		/* INVVPID all-context type */
+		 /* INVVPID single-context-retaining-globals type */
+		"\014single-globals"	
+		);
+	}
+}
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 14cb1373d12a..f02045d64147 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -675,8 +675,7 @@ cpu_halt(void)
 void (*cpu_idle_hook)(sbintime_t) = NULL;	/* ACPI idle hook. */
 static int	cpu_ident_amdc1e = 0;	/* AMD C1E supported. */
 static int	idle_mwait = 1;		/* Use MONITOR/MWAIT for short idle. */
-TUNABLE_INT("machdep.idle_mwait", &idle_mwait);
-SYSCTL_INT(_machdep, OID_AUTO, idle_mwait, CTLFLAG_RW, &idle_mwait,
+SYSCTL_INT(_machdep, OID_AUTO, idle_mwait, CTLFLAG_RWTUN, &idle_mwait,
     0, "Use MONITOR/MWAIT for short idle");
 
 #define	STATE_RUNNING	0x0
@@ -1955,6 +1954,14 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
 	 */
 	clock_init();
 
+	/*
+	 * Use vt(4) by default for UEFI boot (during the sc(4)/vt(4)
+	 * transition).
+	 */
+	if (kmdp != NULL && preload_search_info(kmdp,
+	    MODINFO_METADATA | MODINFOMD_EFI_MAP) != NULL)
+		vty_set_preferred(VTY_VT);
+
 	/*
 	 * Initialize the console before we print anything out.
 	 */
@@ -2137,7 +2144,9 @@ makectx(struct trapframe *tf, struct pcb *pcb)
 int
 ptrace_set_pc(struct thread *td, unsigned long addr)
 {
+
 	td->td_frame->tf_rip = addr;
+	set_pcb_flags(td->td_pcb, PCB_FULL_IRET);
 	return (0);
 }
 
@@ -2237,8 +2246,8 @@ set_regs(struct thread *td, struct reg *regs)
 		tp->tf_fs = regs->r_fs;
 		tp->tf_gs = regs->r_gs;
 		tp->tf_flags = TF_HASSEGS;
-		set_pcb_flags(td->td_pcb, PCB_FULL_IRET);
 	}
+	set_pcb_flags(td->td_pcb, PCB_FULL_IRET);
 	return (0);
 }
 
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 6e59645c2bdd..9b12449ef196 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -125,9 +125,7 @@ static u_long *ipi_hardclock_counts[MAXCPU];
 #endif
 
 /* Default cpu_ops implementation. */
-struct cpu_ops cpu_ops = {
-	.ipi_vectored = lapic_ipi_vectored
-};
+struct cpu_ops cpu_ops;
 
 extern inthand_t IDTVEC(fast_syscall), IDTVEC(fast_syscall32);
 
@@ -1125,7 +1123,7 @@ ipi_send_cpu(int cpu, u_int ipi)
 		if (old_pending)
 			return;
 	}
-	cpu_ops.ipi_vectored(ipi, cpu_apic_ids[cpu]);
+	lapic_ipi_vectored(ipi, cpu_apic_ids[cpu]);
 }
 
 /*
@@ -1395,7 +1393,7 @@ ipi_all_but_self(u_int ipi)
 		CPU_OR_ATOMIC(&ipi_nmi_pending, &other_cpus);
 
 	CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi);
-	cpu_ops.ipi_vectored(ipi, APIC_IPI_DEST_OTHERS);
+	lapic_ipi_vectored(ipi, APIC_IPI_DEST_OTHERS);
 }
 
 int
diff --git a/sys/amd64/amd64/mp_watchdog.c b/sys/amd64/amd64/mp_watchdog.c
index b1799a20b3db..b03d2614d9b5 100644
--- a/sys/amd64/amd64/mp_watchdog.c
+++ b/sys/amd64/amd64/mp_watchdog.c
@@ -68,8 +68,7 @@ static int	watchdog_dontfire = 1;
 static int	watchdog_timer = -1;
 static int	watchdog_nmi = 1;
 
-TUNABLE_INT("debug.watchdog", &watchdog_cpu);
-SYSCTL_INT(_debug, OID_AUTO, watchdog_nmi, CTLFLAG_RW, &watchdog_nmi, 0,
+SYSCTL_INT(_debug, OID_AUTO, watchdog_nmi, CTLFLAG_RWTUN, &watchdog_nmi, 0,
     "IPI the boot processor with an NMI to enter the debugger");
 
 static struct callout	watchdog_callout;
diff --git a/sys/amd64/amd64/mpboot.S b/sys/amd64/amd64/mpboot.S
index ec30c72ecb9b..c4b6537d27ea 100644
--- a/sys/amd64/amd64/mpboot.S
+++ b/sys/amd64/amd64/mpboot.S
@@ -90,9 +90,9 @@ protmode:
 	mov	$bootdata-gdt, %eax
 	mov	%ax, %ds
 
-	/* Turn on the PAE, PSE and PGE bits for when paging is enabled */
+	/* Turn on the PAE bit for when paging is enabled */
 	mov	%cr4, %eax
-	orl	$(CR4_PAE | CR4_PSE), %eax
+	orl	$CR4_PAE, %eax
 	mov	%eax, %cr4
 
 	/*
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 0141f153d6ba..6adc86dcb3d9 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -332,8 +332,8 @@ SYSCTL_INT(_vm_pmap, OID_AUTO, pat_works, CTLFLAG_RD, &pat_works, 1,
     "Is page attribute table fully functional?");
 
 static int pg_ps_enabled = 1;
-SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RDTUN, &pg_ps_enabled, 0,
-    "Are large page mappings enabled?");
+SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
+    &pg_ps_enabled, 0, "Are large page mappings enabled?");
 
 #define	PAT_INDEX_SIZE	8
 static int pat_index[PAT_INDEX_SIZE];	/* cache mode to PAT index conversion */
@@ -368,8 +368,8 @@ static int pmap_flags = PMAP_PDE_SUPERPAGE;	/* flags for x86 pmaps */
 static struct unrhdr pcid_unr;
 static struct mtx pcid_mtx;
 int pmap_pcid_enabled = 0;
-SYSCTL_INT(_vm_pmap, OID_AUTO, pcid_enabled, CTLFLAG_RDTUN, &pmap_pcid_enabled,
-    0, "Is TLB Context ID enabled ?");
+SYSCTL_INT(_vm_pmap, OID_AUTO, pcid_enabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
+    &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 ?");
@@ -390,6 +390,11 @@ SYSCTL_PROC(_vm_pmap, OID_AUTO, pcid_save_cnt, CTLTYPE_U64 | CTLFLAG_RW |
     CTLFLAG_MPSAFE, NULL, 0, pmap_pcid_save_cnt_proc, "QU",
     "Count of saved TLB context on switch");
 
+/* pmap_copy_pages() over non-DMAP */
+static struct mtx cpage_lock;
+static vm_offset_t cpage_a;
+static vm_offset_t cpage_b;
+
 /*
  * Crashdump maps.
  */
@@ -826,7 +831,7 @@ pmap_bootstrap(vm_paddr_t *firstaddr)
 
 
 	/* XXX do %cr0 as well */
-	load_cr4(rcr4() | CR4_PGE | CR4_PSE);
+	load_cr4(rcr4() | CR4_PGE);
 	load_cr3(KPML4phys);
 	if (cpu_stdext_feature & CPUID_STDEXT_SMEP)
 		load_cr4(rcr4() | CR4_SMEP);
@@ -1055,6 +1060,10 @@ pmap_init(void)
 	    M_WAITOK | M_ZERO);
 	for (i = 0; i < pv_npg; i++)
 		TAILQ_INIT(&pv_table[i].pv_list);
+
+	mtx_init(&cpage_lock, "cpage", NULL, MTX_DEF);
+	cpage_a = kva_alloc(PAGE_SIZE);
+	cpage_b = kva_alloc(PAGE_SIZE);
 }
 
 static SYSCTL_NODE(_vm_pmap, OID_AUTO, pde, CTLFLAG_RD, 0,
@@ -2868,7 +2877,7 @@ free_pv_chunk(struct pv_chunk *pc)
 	/* entire chunk is free, return it */
 	m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc));
 	dump_drop_page(m->phys_addr);
-	vm_page_unwire(m, 0);
+	vm_page_unwire(m, PQ_INACTIVE);
 	vm_page_free(m);
 }
 
@@ -4107,9 +4116,9 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va,
  *	or lose information.  That is, this routine must actually
  *	insert this page into the given map NOW.
  */
-void
-pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
-    vm_prot_t prot, boolean_t wired)
+int
+pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
+    u_int flags, int8_t psind __unused)
 {
 	struct rwlock *lock;
 	pd_entry_t *pde;
@@ -4118,6 +4127,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 	pv_entry_t pv;
 	vm_paddr_t opa, pa;
 	vm_page_t mpte, om;
+	boolean_t nosleep;
 
 	PG_A = pmap_accessed_bit(pmap);
 	PG_G = pmap_global_bit(pmap);
@@ -4134,18 +4144,18 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 	    va >= kmi.clean_eva,
 	    ("pmap_enter: managed mapping within the clean submap"));
 	if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m))
-		VM_OBJECT_ASSERT_WLOCKED(m->object);
+		VM_OBJECT_ASSERT_LOCKED(m->object);
 	pa = VM_PAGE_TO_PHYS(m);
 	newpte = (pt_entry_t)(pa | PG_A | PG_V);
-	if ((access & VM_PROT_WRITE) != 0)
+	if ((flags & VM_PROT_WRITE) != 0)
 		newpte |= PG_M;
 	if ((prot & VM_PROT_WRITE) != 0)
 		newpte |= PG_RW;
 	KASSERT((newpte & (PG_M | PG_RW)) != PG_M,
-	    ("pmap_enter: access includes VM_PROT_WRITE but prot doesn't"));
+	    ("pmap_enter: flags includes VM_PROT_WRITE but prot doesn't"));
 	if ((prot & VM_PROT_EXECUTE) == 0)
 		newpte |= pg_nx;
-	if (wired)
+	if ((flags & PMAP_ENTER_WIRED) != 0)
 		newpte |= PG_W;
 	if (va < VM_MAXUSER_ADDRESS)
 		newpte |= PG_U;
@@ -4187,7 +4197,15 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 		 * Here if the pte page isn't mapped, or if it has been
 		 * deallocated.
 		 */
-		mpte = _pmap_allocpte(pmap, pmap_pde_pindex(va), &lock);
+		nosleep = (flags & PMAP_ENTER_NOSLEEP) != 0;
+		mpte = _pmap_allocpte(pmap, pmap_pde_pindex(va),
+		    nosleep ? NULL : &lock);
+		if (mpte == NULL && nosleep) {
+			KASSERT(lock == NULL, ("lock leaked for nosleep"));
+			PMAP_UNLOCK(pmap);
+			rw_runlock(&pvh_global_lock);
+			return (KERN_RESOURCE_SHORTAGE);
+		}
 		goto retry;
 	} else
 		panic("pmap_enter: invalid page directory va=%#lx", va);
@@ -4319,6 +4337,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 		rw_wunlock(lock);
 	rw_runlock(&pvh_global_lock);
 	PMAP_UNLOCK(pmap);
+	return (KERN_SUCCESS);
 }
 
 /*
@@ -4684,52 +4703,96 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object,
 }
 
 /*
- *	Routine:	pmap_change_wiring
- *	Function:	Change the wiring attribute for a map/virtual-address
- *			pair.
- *	In/out conditions:
- *			The mapping must already exist in the pmap.
+ *	Clear the wired attribute from the mappings for the specified range of
+ *	addresses in the given pmap.  Every valid mapping within that range
+ *	must have the wired attribute set.  In contrast, invalid mappings
+ *	cannot have the wired attribute set, so they are ignored.
+ *
+ *	The wired attribute of the page table entry is not a hardware feature,
+ *	so there is no need to invalidate any TLB entries.
  */
 void
-pmap_change_wiring(pmap_t pmap, vm_offset_t va, boolean_t wired)
+pmap_unwire(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
+	vm_offset_t va_next;
+	pml4_entry_t *pml4e;
+	pdp_entry_t *pdpe;
 	pd_entry_t *pde;
-	pt_entry_t *pte;
+	pt_entry_t *pte, PG_V;
 	boolean_t pv_lists_locked;
 
+	PG_V = pmap_valid_bit(pmap);
 	pv_lists_locked = FALSE;
-
-	/*
-	 * Wiring is not a hardware characteristic so there is no need to
-	 * invalidate TLB.
-	 */
-retry:
+resume:
 	PMAP_LOCK(pmap);
-	pde = pmap_pde(pmap, va);
-	if ((*pde & PG_PS) != 0) {
-		if (!wired != ((*pde & PG_W) == 0)) {
-			if (!pv_lists_locked) {
-				pv_lists_locked = TRUE;
-				if (!rw_try_rlock(&pvh_global_lock)) {
-					PMAP_UNLOCK(pmap);
-					rw_rlock(&pvh_global_lock);
-					goto retry;
+	for (; sva < eva; sva = va_next) {
+		pml4e = pmap_pml4e(pmap, sva);
+		if ((*pml4e & PG_V) == 0) {
+			va_next = (sva + NBPML4) & ~PML4MASK;
+			if (va_next < sva)
+				va_next = eva;
+			continue;
+		}
+		pdpe = pmap_pml4e_to_pdpe(pml4e, sva);
+		if ((*pdpe & PG_V) == 0) {
+			va_next = (sva + NBPDP) & ~PDPMASK;
+			if (va_next < sva)
+				va_next = eva;
+			continue;
+		}
+		va_next = (sva + NBPDR) & ~PDRMASK;
+		if (va_next < sva)
+			va_next = eva;
+		pde = pmap_pdpe_to_pde(pdpe, sva);
+		if ((*pde & PG_V) == 0)
+			continue;
+		if ((*pde & PG_PS) != 0) {
+			if ((*pde & PG_W) == 0)
+				panic("pmap_unwire: pde %#jx is missing PG_W",
+				    (uintmax_t)*pde);
+
+			/*
+			 * Are we unwiring the entire large page?  If not,
+			 * demote the mapping and fall through.
+			 */
+			if (sva + NBPDR == va_next && eva >= va_next) {
+				atomic_clear_long(pde, PG_W);
+				pmap->pm_stats.wired_count -= NBPDR /
+				    PAGE_SIZE;
+				continue;
+			} else {
+				if (!pv_lists_locked) {
+					pv_lists_locked = TRUE;
+					if (!rw_try_rlock(&pvh_global_lock)) {
+						PMAP_UNLOCK(pmap);
+						rw_rlock(&pvh_global_lock);
+						/* Repeat sva. */
+						goto resume;
+					}
 				}
+				if (!pmap_demote_pde(pmap, pde, sva))
+					panic("pmap_unwire: demotion failed");
 			}
-			if (!pmap_demote_pde(pmap, pde, va))
-				panic("pmap_change_wiring: demotion failed");
-		} else
-			goto out;
+		}
+		if (va_next > eva)
+			va_next = eva;
+		for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++,
+		    sva += PAGE_SIZE) {
+			if ((*pte & PG_V) == 0)
+				continue;
+			if ((*pte & PG_W) == 0)
+				panic("pmap_unwire: pte %#jx is missing PG_W",
+				    (uintmax_t)*pte);
+
+			/*
+			 * PG_W must be cleared atomically.  Although the pmap
+			 * lock synchronizes access to PG_W, another processor
+			 * could be setting PG_M and/or PG_A concurrently.
+			 */
+			atomic_clear_long(pte, PG_W);
+			pmap->pm_stats.wired_count--;
+		}
 	}
-	pte = pmap_pde_to_pte(pde, va);
-	if (wired && (*pte & PG_W) == 0) {
-		pmap->pm_stats.wired_count++;
-		atomic_set_long(pte, PG_W);
-	} else if (!wired && (*pte & PG_W) != 0) {
-		pmap->pm_stats.wired_count--;
-		atomic_clear_long(pte, PG_W);
-	}
-out:
 	if (pv_lists_locked)
 		rw_runlock(&pvh_global_lock);
 	PMAP_UNLOCK(pmap);
@@ -4968,19 +5031,66 @@ pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset, vm_page_t mb[],
     vm_offset_t b_offset, int xfersize)
 {
 	void *a_cp, *b_cp;
+	vm_page_t m_a, m_b;
+	vm_paddr_t p_a, p_b;
+	pt_entry_t *pte;
 	vm_offset_t a_pg_offset, b_pg_offset;
 	int cnt;
+	boolean_t pinned;
 
+	/*
+	 * NB:  The sequence of updating a page table followed by accesses
+	 * to the corresponding pages used in the !DMAP case is subject to
+	 * the situation described in the "AMD64 Architecture Programmer's
+	 * Manual Volume 2: System Programming" rev. 3.23, "7.3.1 Special
+	 * Coherency Considerations".  Therefore, issuing the INVLPG right
+	 * after modifying the PTE bits is crucial.
+	 */
+	pinned = FALSE;
 	while (xfersize > 0) {
 		a_pg_offset = a_offset & PAGE_MASK;
-		cnt = min(xfersize, PAGE_SIZE - a_pg_offset);
-		a_cp = (char *)PHYS_TO_DMAP(ma[a_offset >> PAGE_SHIFT]->
-		    phys_addr) + a_pg_offset;
+		m_a = ma[a_offset >> PAGE_SHIFT];
+		p_a = m_a->phys_addr;
 		b_pg_offset = b_offset & PAGE_MASK;
+		m_b = mb[b_offset >> PAGE_SHIFT];
+		p_b = m_b->phys_addr;
+		cnt = min(xfersize, PAGE_SIZE - a_pg_offset);
 		cnt = min(cnt, PAGE_SIZE - b_pg_offset);
-		b_cp = (char *)PHYS_TO_DMAP(mb[b_offset >> PAGE_SHIFT]->
-		    phys_addr) + b_pg_offset;
+		if (__predict_false(p_a < DMAP_MIN_ADDRESS ||
+		    p_a > DMAP_MIN_ADDRESS + dmaplimit)) {
+			mtx_lock(&cpage_lock);
+			sched_pin();
+			pinned = TRUE;
+			pte = vtopte(cpage_a);
+			*pte = p_a | X86_PG_A | X86_PG_V |
+			    pmap_cache_bits(kernel_pmap, m_a->md.pat_mode, 0);
+			invlpg(cpage_a);
+			a_cp = (char *)cpage_a + a_pg_offset;
+		} else {
+			a_cp = (char *)PHYS_TO_DMAP(p_a) + a_pg_offset;
+		}
+		if (__predict_false(p_b < DMAP_MIN_ADDRESS ||
+		    p_b > DMAP_MIN_ADDRESS + dmaplimit)) {
+			if (!pinned) {
+				mtx_lock(&cpage_lock);
+				sched_pin();
+				pinned = TRUE;
+			}
+			pte = vtopte(cpage_b);
+			*pte = p_b | X86_PG_A | X86_PG_M | X86_PG_RW |
+			    X86_PG_V | pmap_cache_bits(kernel_pmap,
+			    m_b->md.pat_mode, 0);
+			invlpg(cpage_b);
+			b_cp = (char *)cpage_b + b_pg_offset;
+		} else {
+			b_cp = (char *)PHYS_TO_DMAP(p_b) + b_pg_offset;
+		}
 		bcopy(a_cp, b_cp, cnt);
+		if (__predict_false(pinned)) {
+			sched_unpin();
+			mtx_unlock(&cpage_lock);
+			pinned = FALSE;
+		}
 		a_offset += cnt;
 		b_offset += cnt;
 		xfersize -= cnt;
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 41709c2aa929..37935cffb057 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -73,7 +73,6 @@ static void
 max_ldt_segment_init(void *arg __unused)
 {
 
-	TUNABLE_INT_FETCH("machdep.max_ldt_segment", &max_ldt_segment);
 	if (max_ldt_segment <= 0)
 		max_ldt_segment = 1;
 	if (max_ldt_segment > MAX_LD)
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index ce0ab6a51ca6..f6459f48cf81 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -97,7 +97,8 @@ PMC_SOFT_DEFINE( , , page_fault, write);
 #include <sys/dtrace_bsd.h>
 #endif
 
-extern void trap(struct trapframe *frame);
+extern void __noinline trap(struct trapframe *frame);
+extern void trap_check(struct trapframe *frame);
 extern void syscall(struct trapframe *frame);
 void dblfault_handler(struct trapframe *frame);
 
@@ -143,20 +144,18 @@ static char *trap_msg[] = {
 
 #ifdef KDB
 static int kdb_on_nmi = 1;
-SYSCTL_INT(_machdep, OID_AUTO, kdb_on_nmi, CTLFLAG_RW,
+SYSCTL_INT(_machdep, OID_AUTO, kdb_on_nmi, CTLFLAG_RWTUN,
 	&kdb_on_nmi, 0, "Go to KDB on NMI");
-TUNABLE_INT("machdep.kdb_on_nmi", &kdb_on_nmi);
 #endif
 static int panic_on_nmi = 1;
-SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW,
+SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RWTUN,
 	&panic_on_nmi, 0, "Panic on NMI");
-TUNABLE_INT("machdep.panic_on_nmi", &panic_on_nmi);
 static int prot_fault_translation;
-SYSCTL_INT(_machdep, OID_AUTO, prot_fault_translation, CTLFLAG_RW,
+SYSCTL_INT(_machdep, OID_AUTO, prot_fault_translation, CTLFLAG_RWTUN,
     &prot_fault_translation, 0,
     "Select signal to deliver on protection fault");
 static int uprintf_signal;
-SYSCTL_INT(_machdep, OID_AUTO, uprintf_signal, CTLFLAG_RW,
+SYSCTL_INT(_machdep, OID_AUTO, uprintf_signal, CTLFLAG_RWTUN,
     &uprintf_signal, 0,
     "Print debugging information on trap signal to ctty");
 
@@ -220,18 +219,6 @@ trap(struct trapframe *frame)
 		goto out;
 	}
 
-#ifdef KDTRACE_HOOKS
-	/*
-	 * A trap can occur while DTrace executes a probe. Before
-	 * executing the probe, DTrace blocks re-scheduling and sets
-	 * a flag in its per-cpu flags to indicate that it doesn't
-	 * want to fault. On returning from the probe, the no-fault
-	 * flag is cleared and finally re-scheduling is enabled.
-	 */
-	if (dtrace_trap_func != NULL && (*dtrace_trap_func)(frame, type))
-		goto out;
-#endif
-
 	if ((frame->tf_rflags & PSL_I) == 0) {
 		/*
 		 * Buggy application or kernel code has disabled
@@ -315,6 +302,10 @@ trap(struct trapframe *frame)
 			i = SIGBUS;
 			ucode = BUS_OBJERR;
 			break;
+		case T_ALIGNFLT:
+			i = SIGBUS;
+			ucode = BUS_ADRALN;
+			break;
 		case T_DOUBLEFLT:	/* double fault */
 		default:
 			i = SIGBUS;
@@ -614,6 +605,21 @@ trap(struct trapframe *frame)
 	return;
 }
 
+/*
+ * Ensure that we ignore any DTrace-induced faults. This function cannot
+ * be instrumented, so it cannot generate such faults itself.
+ */
+void
+trap_check(struct trapframe *frame)
+{
+
+#ifdef KDTRACE_HOOKS
+	if (dtrace_trap_func != NULL && (*dtrace_trap_func)(frame))
+		return;
+#endif
+	trap(frame);
+}
+
 static int
 trap_pfault(frame, usermode)
 	struct trapframe *frame;
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 3a41da340f46..42698896b40b 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -184,6 +184,11 @@ device		splash			# Splash screen and screen saver support
 device		sc
 options 	SC_PIXEL_MODE		# add support for the raster text mode
 
+# vt is the new video console driver
+device		vt
+device		vt_vga
+device		vt_efifb
+
 device		agp			# support several AGP chipsets
 
 # PCCARD (PCMCIA) support
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index e26c730d8fa9..8866e762c2c7 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -248,6 +248,10 @@ options 	VGA_WIDTH90		# support 90 column modes
 # Debugging.
 options 	VGA_DEBUG
 
+# vt(4) drivers.
+device		vt_vga		# VGA
+device		vt_efifb	# EFI framebuffer
+
 # Linear framebuffer driver for S3 VESA 1.2 cards. Works on top of VESA.
 device		s3pci
 
diff --git a/sys/amd64/conf/VT b/sys/amd64/conf/VT
deleted file mode 100644
index c11f1afa4420..000000000000
--- a/sys/amd64/conf/VT
+++ /dev/null
@@ -1,15 +0,0 @@
-# VT -- kernel config using the vt(9) system console instead of legacy syscons
-#                                                                              
-# For more information see https://wiki.freebsd.org/Newcons
-#
-# $FreeBSD$
-
-include		GENERIC
-ident		VT
-
-nodevice	sc
-nodevice	vga
-
-device		vt
-device		vt_vga
-device		vt_efifb
diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index 3c5d5df86fcf..eb9bef8f2e72 100644
--- a/sys/amd64/include/cpu.h
+++ b/sys/amd64/include/cpu.h
@@ -63,7 +63,6 @@
 struct cpu_ops {
 	void (*cpu_init)(void);
 	void (*cpu_resume)(void);
-	void (*ipi_vectored)(u_int, int);
 };
 
 extern struct	cpu_ops cpu_ops;
diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h
index ef5d6236f677..be1bdc6c5d7f 100644
--- a/sys/amd64/include/fpu.h
+++ b/sys/amd64/include/fpu.h
@@ -84,6 +84,7 @@ void	fpu_save_area_reset(struct savefpu *fsa);
  */
 #define	FPU_KERN_NORMAL	0x0000
 #define	FPU_KERN_NOWAIT	0x0001
+#define	FPU_KERN_KTHR	0x0002
 
 #endif
 
diff --git a/sys/amd64/include/sf_buf.h b/sys/amd64/include/sf_buf.h
index 729e8e50a473..00b3085991e1 100644
--- a/sys/amd64/include/sf_buf.h
+++ b/sys/amd64/include/sf_buf.h
@@ -29,42 +29,23 @@
 #ifndef _MACHINE_SF_BUF_H_
 #define _MACHINE_SF_BUF_H_
 
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_page.h>
-
 /*
  * On this machine, the only purpose for which sf_buf is used is to implement
  * an opaque pointer required by the machine-independent parts of the kernel.
  * That pointer references the vm_page that is "mapped" by the sf_buf.  The
  * actual mapping is provided by the direct virtual-to-physical mapping.  
  */
-struct sf_buf;
-
-static inline struct sf_buf *
-sf_buf_alloc(struct vm_page *m, int pri)
-{
-
-	return ((struct sf_buf *)m);
-}
-
-static inline void
-sf_buf_free(struct sf_buf *sf)
-{
-}
-
-static __inline vm_offset_t
+static inline vm_offset_t
 sf_buf_kva(struct sf_buf *sf)
 {
 
 	return (PHYS_TO_DMAP(VM_PAGE_TO_PHYS((vm_page_t)sf)));
 }
 
-static __inline vm_page_t
+static inline vm_page_t
 sf_buf_page(struct sf_buf *sf)
 {
 
 	return ((vm_page_t)sf);
 }
-
 #endif /* !_MACHINE_SF_BUF_H_ */
diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h
index 5a359e95993c..63a9b3fdde0f 100644
--- a/sys/amd64/include/vmm.h
+++ b/sys/amd64/include/vmm.h
@@ -29,11 +29,14 @@
 #ifndef _VMM_H_
 #define	_VMM_H_
 
+#include <x86/segments.h>
+
 enum vm_suspend_how {
 	VM_SUSPEND_NONE,
 	VM_SUSPEND_RESET,
 	VM_SUSPEND_POWEROFF,
 	VM_SUSPEND_HALT,
+	VM_SUSPEND_TRIPLEFAULT,
 	VM_SUSPEND_LAST
 };
 
@@ -75,6 +78,10 @@ enum vm_reg_name {
 	VM_REG_GUEST_GDTR,
 	VM_REG_GUEST_EFER,
 	VM_REG_GUEST_CR2,
+	VM_REG_GUEST_PDPTE0,
+	VM_REG_GUEST_PDPTE1,
+	VM_REG_GUEST_PDPTE2,
+	VM_REG_GUEST_PDPTE3,
 	VM_REG_LAST
 };
 
@@ -84,6 +91,16 @@ enum x2apic_state {
 	X2APIC_STATE_LAST
 };
 
+#define	VM_INTINFO_VECTOR(info)	((info) & 0xff)
+#define	VM_INTINFO_DEL_ERRCODE	0x800
+#define	VM_INTINFO_RSVD		0x7ffff000
+#define	VM_INTINFO_VALID	0x80000000
+#define	VM_INTINFO_TYPE		0x700
+#define	VM_INTINFO_HWINTR	(0 << 8)
+#define	VM_INTINFO_NMI		(2 << 8)
+#define	VM_INTINFO_HWEXCEPTION	(3 << 8)
+#define	VM_INTINFO_SWINTR	(4 << 8)
+
 #ifdef _KERNEL
 
 #define	VM_MAX_NAMELEN	32
@@ -99,6 +116,7 @@ struct vioapic;
 struct vlapic;
 struct vmspace;
 struct vm_object;
+struct vm_guest_paging;
 struct pmap;
 
 typedef int	(*vmm_init_func_t)(int ipinum);
@@ -252,6 +270,14 @@ vcpu_is_running(struct vm *vm, int vcpu, int *hostcpu)
 	return (vcpu_get_state(vm, vcpu, hostcpu) == VCPU_RUNNING);
 }
 
+#ifdef _SYS_PROC_H_
+static int __inline
+vcpu_should_yield(struct vm *vm, int vcpu)
+{
+	return (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED));
+}
+#endif
+
 void *vcpu_stats(struct vm *vm, int vcpu);
 void vcpu_notify_event(struct vm *vm, int vcpuid, bool lapic_intr);
 struct vmspace *vm_get_vmspace(struct vm *vm);
@@ -274,21 +300,63 @@ struct vatpit *vm_atpit(struct vm *vm);
 int vm_inject_exception(struct vm *vm, int vcpuid, struct vm_exception *vme);
 
 /*
- * Returns 0 if there is no exception pending for this vcpu. Returns 1 if an
- * exception is pending and also updates 'vme'. The pending exception is
- * cleared when this function returns.
+ * This function is called after a VM-exit that occurred during exception or
+ * interrupt delivery through the IDT. The format of 'intinfo' is described
+ * in Figure 15-1, "EXITINTINFO for All Intercepts", APM, Vol 2.
  *
- * This function should only be called in the context of the thread that is
- * executing this vcpu.
+ * If a VM-exit handler completes the event delivery successfully then it
+ * should call vm_exit_intinfo() to extinguish the pending event. For e.g.,
+ * if the task switch emulation is triggered via a task gate then it should
+ * call this function with 'intinfo=0' to indicate that the external event
+ * is not pending anymore.
+ *
+ * Return value is 0 on success and non-zero on failure.
  */
-int vm_exception_pending(struct vm *vm, int vcpuid, struct vm_exception *vme);
+int vm_exit_intinfo(struct vm *vm, int vcpuid, uint64_t intinfo);
 
-void vm_inject_gp(struct vm *vm, int vcpuid); /* general protection fault */
-void vm_inject_ud(struct vm *vm, int vcpuid); /* undefined instruction fault */
-void vm_inject_pf(struct vm *vm, int vcpuid, int error_code, uint64_t cr2);
+/*
+ * This function is called before every VM-entry to retrieve a pending
+ * event that should be injected into the guest. This function combines
+ * nested events into a double or triple fault.
+ *
+ * Returns 0 if there are no events that need to be injected into the guest
+ * and non-zero otherwise.
+ */
+int vm_entry_intinfo(struct vm *vm, int vcpuid, uint64_t *info);
+
+int vm_get_intinfo(struct vm *vm, int vcpuid, uint64_t *info1, uint64_t *info2);
 
 enum vm_reg_name vm_segment_name(int seg_encoding);
 
+struct vm_copyinfo {
+	uint64_t	gpa;
+	size_t		len;
+	void		*hva;
+	void		*cookie;
+};
+
+/*
+ * Set up 'copyinfo[]' to copy to/from guest linear address space starting
+ * at 'gla' and 'len' bytes long. The 'prot' should be set to PROT_READ for
+ * a copyin or PROT_WRITE for a copyout. 
+ *
+ * Returns 0 on success.
+ * Returns 1 if an exception was injected into the guest.
+ * Returns -1 otherwise.
+ *
+ * The 'copyinfo[]' can be passed to 'vm_copyin()' or 'vm_copyout()' only if
+ * the return value is 0. The 'copyinfo[]' resources should be freed by calling
+ * 'vm_copy_teardown()' after the copy is done.
+ */
+int vm_copy_setup(struct vm *vm, int vcpuid, struct vm_guest_paging *paging,
+    uint64_t gla, size_t len, int prot, struct vm_copyinfo *copyinfo,
+    int num_copyinfo);
+void vm_copy_teardown(struct vm *vm, int vcpuid, struct vm_copyinfo *copyinfo,
+    int num_copyinfo);
+void vm_copyin(struct vm *vm, int vcpuid, struct vm_copyinfo *copyinfo,
+    void *kaddr, size_t len);
+void vm_copyout(struct vm *vm, int vcpuid, const void *kaddr,
+    struct vm_copyinfo *copyinfo, size_t len);
 #endif	/* KERNEL */
 
 #define	VM_MAXCPU	16			/* maximum virtual cpus */
@@ -322,13 +390,16 @@ struct seg_desc {
 	uint32_t	limit;
 	uint32_t	access;
 };
-#define	SEG_DESC_TYPE(desc)		((desc)->access & 0x001f)
-#define	SEG_DESC_PRESENT(desc)		((desc)->access & 0x0080)
-#define	SEG_DESC_DEF32(desc)		((desc)->access & 0x4000)
-#define	SEG_DESC_GRANULARITY(desc)	((desc)->access & 0x8000)
-#define	SEG_DESC_UNUSABLE(desc)		((desc)->access & 0x10000)
+#define	SEG_DESC_TYPE(access)		((access) & 0x001f)
+#define	SEG_DESC_DPL(access)		(((access) >> 5) & 0x3)
+#define	SEG_DESC_PRESENT(access)	(((access) & 0x0080) ? 1 : 0)
+#define	SEG_DESC_DEF32(access)		(((access) & 0x4000) ? 1 : 0)
+#define	SEG_DESC_GRANULARITY(access)	(((access) & 0x8000) ? 1 : 0)
+#define	SEG_DESC_UNUSABLE(access)	(((access) & 0x10000) ? 1 : 0)
 
 enum vm_cpu_mode {
+	CPU_MODE_REAL,
+	CPU_MODE_PROTECTED,
 	CPU_MODE_COMPATIBILITY,		/* IA-32E mode (CS.L = 0) */
 	CPU_MODE_64BIT,			/* IA-32E mode (CS.L = 1) */
 };
@@ -364,11 +435,14 @@ struct vie {
 	uint8_t		num_valid;		/* size of the instruction */
 	uint8_t		num_processed;
 
+	uint8_t		addrsize:4, opsize:4;	/* address and operand sizes */
 	uint8_t		rex_w:1,		/* REX prefix */
 			rex_r:1,
 			rex_x:1,
 			rex_b:1,
-			rex_present:1;
+			rex_present:1,
+			opsize_override:1,	/* Operand size override */
+			addrsize_override:1;	/* Address size override */
 
 	uint8_t		mod:2,			/* ModRM byte */
 			reg:4,
@@ -410,6 +484,7 @@ enum vm_exitcode {
 	VM_EXITCODE_IOAPIC_EOI,
 	VM_EXITCODE_SUSPENDED,
 	VM_EXITCODE_INOUT_STR,
+	VM_EXITCODE_TASK_SWITCH,
 	VM_EXITCODE_MAX
 };
 
@@ -434,6 +509,22 @@ struct vm_inout_str {
 	struct seg_desc seg_desc;
 };
 
+enum task_switch_reason {
+	TSR_CALL,
+	TSR_IRET,
+	TSR_JMP,
+	TSR_IDT_GATE,	/* task gate in IDT */
+};
+
+struct vm_task_switch {
+	uint16_t	tsssel;		/* new TSS selector */
+	int		ext;		/* task switch due to external event */
+	uint32_t	errcode;
+	int		errcode_valid;	/* push 'errcode' on the new stack */
+	enum task_switch_reason reason;
+	struct vm_guest_paging paging;
+};
+
 struct vm_exit {
 	enum vm_exitcode	exitcode;
 	int			inst_length;	/* 0 means unknown */
@@ -448,6 +539,7 @@ struct vm_exit {
 		struct {
 			uint64_t	gpa;
 			uint64_t	gla;
+			int		cs_d;		/* CS.D */
 			struct vm_guest_paging paging;
 			struct vie	vie;
 		} inst_emul;
@@ -487,7 +579,38 @@ struct vm_exit {
 		struct {
 			enum vm_suspend_how how;
 		} suspended;
+		struct vm_task_switch task_switch;
 	} u;
 };
 
+/* APIs to inject faults into the guest */
+void vm_inject_fault(void *vm, int vcpuid, int vector, int errcode_valid,
+    int errcode);
+
+static void __inline
+vm_inject_ud(void *vm, int vcpuid)
+{
+	vm_inject_fault(vm, vcpuid, IDT_UD, 0, 0);
+}
+
+static void __inline
+vm_inject_gp(void *vm, int vcpuid)
+{
+	vm_inject_fault(vm, vcpuid, IDT_GP, 1, 0);
+}
+
+static void __inline
+vm_inject_ac(void *vm, int vcpuid, int errcode)
+{
+	vm_inject_fault(vm, vcpuid, IDT_AC, 1, errcode);
+}
+
+static void __inline
+vm_inject_ss(void *vm, int vcpuid, int errcode)
+{
+	vm_inject_fault(vm, vcpuid, IDT_SS, 1, errcode);
+}
+
+void vm_inject_pf(void *vm, int vcpuid, int error_code, uint64_t cr2);
+
 #endif	/* _VMM_H_ */
diff --git a/sys/amd64/include/vmm_dev.h b/sys/amd64/include/vmm_dev.h
index 9b3b00ded0ba..e4d839ef6549 100644
--- a/sys/amd64/include/vmm_dev.h
+++ b/sys/amd64/include/vmm_dev.h
@@ -189,6 +189,12 @@ struct vm_cpuset {
 #define	VM_ACTIVE_CPUS		0
 #define	VM_SUSPENDED_CPUS	1
 
+struct vm_intinfo {
+	int		vcpuid;
+	uint64_t	info1;
+	uint64_t	info2;
+};
+
 enum {
 	/* general routines */
 	IOCNUM_ABIVERS = 0,
@@ -211,6 +217,8 @@ enum {
 	IOCNUM_GET_SEGMENT_DESCRIPTOR = 23,
 
 	/* interrupt injection */
+	IOCNUM_GET_INTINFO = 28,
+	IOCNUM_SET_INTINFO = 29,
 	IOCNUM_INJECT_EXCEPTION = 30,
 	IOCNUM_LAPIC_IRQ = 31,
 	IOCNUM_INJECT_NMI = 32,
@@ -324,4 +332,8 @@ enum {
 	_IOW('v', IOCNUM_ACTIVATE_CPU, struct vm_activate_cpu)
 #define	VM_GET_CPUS	\
 	_IOW('v', IOCNUM_GET_CPUSET, struct vm_cpuset)
+#define	VM_SET_INTINFO	\
+	_IOW('v', IOCNUM_SET_INTINFO, struct vm_intinfo)
+#define	VM_GET_INTINFO	\
+	_IOWR('v', IOCNUM_GET_INTINFO, struct vm_intinfo)
 #endif
diff --git a/sys/amd64/include/vmm_instruction_emul.h b/sys/amd64/include/vmm_instruction_emul.h
index e4c408bf165f..bbd3d88d9cf3 100644
--- a/sys/amd64/include/vmm_instruction_emul.h
+++ b/sys/amd64/include/vmm_instruction_emul.h
@@ -52,8 +52,8 @@ typedef int (*mem_region_write_t)(void *vm, int cpuid, uint64_t gpa,
  * s
  */
 int vmm_emulate_instruction(void *vm, int cpuid, uint64_t gpa, struct vie *vie,
-			    mem_region_read_t mrr, mem_region_write_t mrw,
-			    void *mrarg);
+    struct vm_guest_paging *paging, mem_region_read_t mrr,
+    mem_region_write_t mrw, void *mrarg);
 
 int vie_update_register(void *vm, int vcpuid, enum vm_reg_name reg,
     uint64_t val, int size);
@@ -108,7 +108,7 @@ void vie_init(struct vie *vie);
  */
 #define	VIE_INVALID_GLA		(1UL << 63)	/* a non-canonical address */
 int vmm_decode_instruction(struct vm *vm, int cpuid, uint64_t gla,
-			   enum vm_cpu_mode cpu_mode, struct vie *vie);
+			   enum vm_cpu_mode cpu_mode, int csd, struct vie *vie);
 #endif	/* _KERNEL */
 
 #endif	/* _VMM_INSTRUCTION_EMUL_H_ */
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index 9b5c5554cd5e..c06ce1198f86 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -1083,7 +1083,7 @@ static Elf32_Brandinfo linux_brand = {
 	.sysvec		= &elf_linux_sysvec,
 	.interp_newpath	= NULL,
 	.brand_note	= &linux32_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE | BI_CAN_EXEC_INTERP
+	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
 static Elf32_Brandinfo linux_glibc2brand = {
@@ -1095,7 +1095,7 @@ static Elf32_Brandinfo linux_glibc2brand = {
 	.sysvec		= &elf_linux_sysvec,
 	.interp_newpath	= NULL,
 	.brand_note	= &linux32_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE | BI_CAN_EXEC_INTERP
+	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
 Elf32_Brandinfo *linux_brandlist[] = {
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index 706fdd381ace..0039008b3452 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -65,7 +65,6 @@ static int pcie_minbus, pcie_maxbus;
 static uint32_t pcie_badslots;
 static struct mtx pcicfg_mtx;
 static int mcfg_enable = 1;
-TUNABLE_INT("hw.pci.mcfg", &mcfg_enable);
 SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0,
     "Enable support for PCI-e memory mapped config access");
 
diff --git a/sys/amd64/vmm/intel/vmcs.c b/sys/amd64/vmm/intel/vmcs.c
index cc97d9516613..51e5c2c06f00 100644
--- a/sys/amd64/vmm/intel/vmcs.c
+++ b/sys/amd64/vmm/intel/vmcs.c
@@ -103,6 +103,14 @@ vmcs_field_encoding(int ident)
 		return (VMCS_GUEST_LDTR_SELECTOR);
 	case VM_REG_GUEST_EFER:
 		return (VMCS_GUEST_IA32_EFER);
+	case VM_REG_GUEST_PDPTE0:
+		return (VMCS_GUEST_PDPTE0);
+	case VM_REG_GUEST_PDPTE1:
+		return (VMCS_GUEST_PDPTE1);
+	case VM_REG_GUEST_PDPTE2:
+		return (VMCS_GUEST_PDPTE2);
+	case VM_REG_GUEST_PDPTE3:
+		return (VMCS_GUEST_PDPTE3);
 	default:
 		return (-1);
 	}
diff --git a/sys/amd64/vmm/intel/vmcs.h b/sys/amd64/vmm/intel/vmcs.h
index 657d5b0f65cb..4e9557c39b9b 100644
--- a/sys/amd64/vmm/intel/vmcs.h
+++ b/sys/amd64/vmm/intel/vmcs.h
@@ -346,6 +346,9 @@ vmcs_write(uint32_t encoding, uint64_t val)
 #define	VMCS_INTR_T_HWINTR	(0 << 8)
 #define	VMCS_INTR_T_NMI		(2 << 8)
 #define	VMCS_INTR_T_HWEXCEPTION	(3 << 8)
+#define	VMCS_INTR_T_SWINTR	(4 << 8)
+#define	VMCS_INTR_T_PRIV_SWEXCEPTION (5 << 8)
+#define	VMCS_INTR_T_SWEXCEPTION	(6 << 8)
 #define	VMCS_INTR_DEL_ERRCODE	(1 << 11)
 
 /*
diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
index ec628546456a..b2c570216a78 100644
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -149,8 +149,6 @@ SYSCTL_ULONG(_hw_vmm_vmx, OID_AUTO, cr4_ones_mask, CTLFLAG_RD,
 SYSCTL_ULONG(_hw_vmm_vmx, OID_AUTO, cr4_zeros_mask, CTLFLAG_RD,
 	     &cr4_zeros_mask, 0, NULL);
 
-static int vmx_no_patmsr;
-
 static int vmx_initialized;
 SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, initialized, CTLFLAG_RD,
 	   &vmx_initialized, 0, "Intel VMX initialized");
@@ -158,18 +156,38 @@ SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, initialized, CTLFLAG_RD,
 /*
  * Optional capabilities
  */
+static SYSCTL_NODE(_hw_vmm_vmx, OID_AUTO, cap, CTLFLAG_RW, NULL, NULL);
+
+static int vmx_patmsr;
+SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, patmsr, CTLFLAG_RD, &vmx_patmsr, 0,
+    "PAT MSR saved and restored in VCMS");
+
 static int cap_halt_exit;
+SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, halt_exit, CTLFLAG_RD, &cap_halt_exit, 0,
+    "HLT triggers a VM-exit");
+
 static int cap_pause_exit;
+SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, pause_exit, CTLFLAG_RD, &cap_pause_exit,
+    0, "PAUSE triggers a VM-exit");
+
 static int cap_unrestricted_guest;
+SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, unrestricted_guest, CTLFLAG_RD,
+    &cap_unrestricted_guest, 0, "Unrestricted guests");
+
 static int cap_monitor_trap;
+SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, monitor_trap, CTLFLAG_RD,
+    &cap_monitor_trap, 0, "Monitor trap flag");
+
 static int cap_invpcid;
+SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, invpcid, CTLFLAG_RD, &cap_invpcid,
+    0, "Guests are allowed to use INVPCID");
 
 static int virtual_interrupt_delivery;
-SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, virtual_interrupt_delivery, CTLFLAG_RD,
+SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, virtual_interrupt_delivery, CTLFLAG_RD,
     &virtual_interrupt_delivery, 0, "APICv virtual interrupt delivery support");
 
 static int posted_interrupts;
-SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, posted_interrupts, CTLFLAG_RD,
+SYSCTL_INT(_hw_vmm_vmx_cap, OID_AUTO, posted_interrupts, CTLFLAG_RD,
     &posted_interrupts, 0, "APICv posted interrupt support");
 
 static int pirvec;
@@ -618,6 +636,7 @@ vmx_init(int ipinum)
 	}
 
 	/* Check support for VM-exit controls */
+	vmx_patmsr = 1;
 	error = vmx_set_ctlreg(MSR_VMX_EXIT_CTLS, MSR_VMX_TRUE_EXIT_CTLS,
 			       VM_EXIT_CTLS_ONE_SETTING,
 			       VM_EXIT_CTLS_ZERO_SETTING,
@@ -637,12 +656,12 @@ vmx_init(int ipinum)
 			if (bootverbose)
 				printf("vmm: PAT MSR access not supported\n");
 			guest_msr_valid(MSR_PAT);
-			vmx_no_patmsr = 1;
+			vmx_patmsr = 0;
 		}
 	}
 
 	/* Check support for VM-entry controls */
-	if (!vmx_no_patmsr) {
+	if (vmx_patmsr) {
 		error = vmx_set_ctlreg(MSR_VMX_ENTRY_CTLS,
 				       MSR_VMX_TRUE_ENTRY_CTLS,
 				       VM_ENTRY_CTLS_ONE_SETTING,
@@ -918,7 +937,7 @@ vmx_vminit(struct vm *vm, pmap_t pmap)
 	 * MSR_PAT save/restore support, leave access disabled so accesses
 	 * will be trapped.
 	 */
-	if (!vmx_no_patmsr && guest_msr_rw(vmx, MSR_PAT))
+	if (vmx_patmsr && guest_msr_rw(vmx, MSR_PAT))
 		panic("vmx_vminit: error setting guest pat msr access");
 
 	vpid_alloc(vpid, VM_MAXCPU);
@@ -974,7 +993,7 @@ vmx_vminit(struct vm *vm, pmap_t pmap)
 		vmx->cap[i].proc_ctls = procbased_ctls;
 		vmx->cap[i].proc_ctls2 = procbased_ctls2;
 
-		vmx->state[i].lastcpu = -1;
+		vmx->state[i].lastcpu = NOCPU;
 		vmx->state[i].vpid = vpid[i];
 
 		msr_save_area_init(vmx->guest_msrs[i], &guest_msr_count);
@@ -1047,27 +1066,37 @@ vmx_astpending_trace(struct vmx *vmx, int vcpu, uint64_t rip)
 }
 
 static VMM_STAT_INTEL(VCPU_INVVPID_SAVED, "Number of vpid invalidations saved");
+static VMM_STAT_INTEL(VCPU_INVVPID_DONE, "Number of vpid invalidations done");
 
-static void
-vmx_set_pcpu_defaults(struct vmx *vmx, int vcpu, pmap_t pmap)
+/*
+ * Invalidate guest mappings identified by its vpid from the TLB.
+ */
+static __inline void
+vmx_invvpid(struct vmx *vmx, int vcpu, pmap_t pmap, int running)
 {
 	struct vmxstate *vmxstate;
 	struct invvpid_desc invvpid_desc;
 
 	vmxstate = &vmx->state[vcpu];
-	if (vmxstate->lastcpu == curcpu)
+	if (vmxstate->vpid == 0)
 		return;
 
-	vmxstate->lastcpu = curcpu;
+	if (!running) {
+		/*
+		 * Set the 'lastcpu' to an invalid host cpu.
+		 *
+		 * This will invalidate TLB entries tagged with the vcpu's
+		 * vpid the next time it runs via vmx_set_pcpu_defaults().
+		 */
+		vmxstate->lastcpu = NOCPU;
+		return;
+	}
 
-	vmm_stat_incr(vmx->vm, vcpu, VCPU_MIGRATIONS, 1);
-
-	vmcs_write(VMCS_HOST_TR_BASE, vmm_get_host_trbase());
-	vmcs_write(VMCS_HOST_GDTR_BASE, vmm_get_host_gdtrbase());
-	vmcs_write(VMCS_HOST_GS_BASE, vmm_get_host_gsbase());
+	KASSERT(curthread->td_critnest > 0, ("%s: vcpu %d running outside "
+	    "critical section", __func__, vcpu));
 
 	/*
-	 * If we are using VPIDs then invalidate all mappings tagged with 'vpid'
+	 * Invalidate all mappings tagged with 'vpid'
 	 *
 	 * We do this because this vcpu was executing on a different host
 	 * cpu when it last ran. We do not track whether it invalidated
@@ -1081,25 +1110,43 @@ vmx_set_pcpu_defaults(struct vmx *vmx, int vcpu, pmap_t pmap)
 	 * Note also that this will invalidate mappings tagged with 'vpid'
 	 * for "all" EP4TAs.
 	 */
-	if (vmxstate->vpid != 0) {
-		if (pmap->pm_eptgen == vmx->eptgen[curcpu]) {
-			invvpid_desc._res1 = 0;
-			invvpid_desc._res2 = 0;
-			invvpid_desc.vpid = vmxstate->vpid;
-			invvpid_desc.linear_addr = 0;
-			invvpid(INVVPID_TYPE_SINGLE_CONTEXT, invvpid_desc);
-		} else {
-			/*
-			 * The invvpid can be skipped if an invept is going to
-			 * be performed before entering the guest. The invept
-			 * will invalidate combined mappings tagged with
-			 * 'vmx->eptp' for all vpids.
-			 */
-			vmm_stat_incr(vmx->vm, vcpu, VCPU_INVVPID_SAVED, 1);
-		}
+	if (pmap->pm_eptgen == vmx->eptgen[curcpu]) {
+		invvpid_desc._res1 = 0;
+		invvpid_desc._res2 = 0;
+		invvpid_desc.vpid = vmxstate->vpid;
+		invvpid_desc.linear_addr = 0;
+		invvpid(INVVPID_TYPE_SINGLE_CONTEXT, invvpid_desc);
+		vmm_stat_incr(vmx->vm, vcpu, VCPU_INVVPID_DONE, 1);
+	} else {
+		/*
+		 * The invvpid can be skipped if an invept is going to
+		 * be performed before entering the guest. The invept
+		 * will invalidate combined mappings tagged with
+		 * 'vmx->eptp' for all vpids.
+		 */
+		vmm_stat_incr(vmx->vm, vcpu, VCPU_INVVPID_SAVED, 1);
 	}
 }
 
+static void
+vmx_set_pcpu_defaults(struct vmx *vmx, int vcpu, pmap_t pmap)
+{
+	struct vmxstate *vmxstate;
+
+	vmxstate = &vmx->state[vcpu];
+	if (vmxstate->lastcpu == curcpu)
+		return;
+
+	vmxstate->lastcpu = curcpu;
+
+	vmm_stat_incr(vmx->vm, vcpu, VCPU_MIGRATIONS, 1);
+
+	vmcs_write(VMCS_HOST_TR_BASE, vmm_get_host_trbase());
+	vmcs_write(VMCS_HOST_GDTR_BASE, vmm_get_host_gdtrbase());
+	vmcs_write(VMCS_HOST_GS_BASE, vmm_get_host_gsbase());
+	vmx_invvpid(vmx, vcpu, pmap, 1);
+}
+
 /*
  * We depend on 'procbased_ctls' to have the Interrupt Window Exiting bit set.
  */
@@ -1183,24 +1230,32 @@ vmx_inject_nmi(struct vmx *vmx, int vcpu)
 static void
 vmx_inject_interrupts(struct vmx *vmx, int vcpu, struct vlapic *vlapic)
 {
-	struct vm_exception exc;
 	int vector, need_nmi_exiting, extint_pending;
-	uint64_t rflags;
+	uint64_t rflags, entryinfo;
 	uint32_t gi, info;
 
-	if (vm_exception_pending(vmx->vm, vcpu, &exc)) {
-		KASSERT(exc.vector >= 0 && exc.vector < 32,
-		    ("%s: invalid exception vector %d", __func__, exc.vector));
+	if (vm_entry_intinfo(vmx->vm, vcpu, &entryinfo)) {
+		KASSERT((entryinfo & VMCS_INTR_VALID) != 0, ("%s: entry "
+		    "intinfo is not valid: %#lx", __func__, entryinfo));
 
 		info = vmcs_read(VMCS_ENTRY_INTR_INFO);
 		KASSERT((info & VMCS_INTR_VALID) == 0, ("%s: cannot inject "
-		     "pending exception %d: %#x", __func__, exc.vector, info));
+		     "pending exception: %#lx/%#x", __func__, entryinfo, info));
 
-		info = exc.vector | VMCS_INTR_T_HWEXCEPTION | VMCS_INTR_VALID;
-		if (exc.error_code_valid) {
-			info |= VMCS_INTR_DEL_ERRCODE;
-			vmcs_write(VMCS_ENTRY_EXCEPTION_ERROR, exc.error_code);
+		info = entryinfo;
+		vector = info & 0xff;
+		if (vector == IDT_BP || vector == IDT_OF) {
+			/*
+			 * VT-x requires #BP and #OF to be injected as software
+			 * exceptions.
+			 */
+			info &= ~VMCS_INTR_T_MASK;
+			info |= VMCS_INTR_T_SWEXCEPTION;
 		}
+
+		if (info & VMCS_INTR_DEL_ERRCODE)
+			vmcs_write(VMCS_ENTRY_EXCEPTION_ERROR, entryinfo >> 32);
+
 		vmcs_write(VMCS_ENTRY_INTR_INFO, info);
 	}
 
@@ -1258,12 +1313,28 @@ vmx_inject_interrupts(struct vmx *vmx, int vcpu, struct vlapic *vlapic)
 		/* Ask the local apic for a vector to inject */
 		if (!vlapic_pending_intr(vlapic, &vector))
 			return;
+
+		/*
+		 * From the Intel SDM, Volume 3, Section "Maskable
+		 * Hardware Interrupts":
+		 * - maskable interrupt vectors [16,255] can be delivered
+		 *   through the local APIC.
+		*/
+		KASSERT(vector >= 16 && vector <= 255,
+		    ("invalid vector %d from local APIC", vector));
 	} else {
 		/* Ask the legacy pic for a vector to inject */
 		vatpic_pending_intr(vmx->vm, &vector);
-	}
 
-	KASSERT(vector >= 32 && vector <= 255, ("invalid vector %d", vector));
+		/*
+		 * From the Intel SDM, Volume 3, Section "Maskable
+		 * Hardware Interrupts":
+		 * - maskable interrupt vectors [0,255] can be delivered
+		 *   through the INTR pin.
+		 */
+		KASSERT(vector >= 0 && vector <= 255,
+		    ("invalid vector %d from INTR", vector));
+	}
 
 	/* Check RFLAGS.IF and the interruptibility state of the guest */
 	rflags = vmcs_read(VMCS_GUEST_RFLAGS);
@@ -1363,6 +1434,16 @@ vmx_clear_nmi_blocking(struct vmx *vmx, int vcpuid)
 	vmcs_write(VMCS_GUEST_INTERRUPTIBILITY, gi);
 }
 
+static void
+vmx_assert_nmi_blocking(struct vmx *vmx, int vcpuid)
+{
+	uint32_t gi;
+
+	gi = vmcs_read(VMCS_GUEST_INTERRUPTIBILITY);
+	KASSERT(gi & VMCS_INTERRUPTIBILITY_NMI_BLOCKING,
+	    ("NMI blocking is not in effect %#x", gi));
+}
+
 static int
 vmx_emulate_xsetbv(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 {
@@ -1643,11 +1724,19 @@ vmx_cpl(void)
 static enum vm_cpu_mode
 vmx_cpu_mode(void)
 {
+	uint32_t csar;
 
-	if (vmcs_read(VMCS_GUEST_IA32_EFER) & EFER_LMA)
-		return (CPU_MODE_64BIT);
-	else
-		return (CPU_MODE_COMPATIBILITY);
+	if (vmcs_read(VMCS_GUEST_IA32_EFER) & EFER_LMA) {
+		csar = vmcs_read(VMCS_GUEST_CS_ACCESS_RIGHTS);
+		if (csar & 0x2000)
+			return (CPU_MODE_64BIT);	/* CS.L = 1 */
+		else
+			return (CPU_MODE_COMPATIBILITY);
+	} else if (vmcs_read(VMCS_GUEST_CR0) & CR0_PE) {
+		return (CPU_MODE_PROTECTED);
+	} else {
+		return (CPU_MODE_REAL);
+	}
 }
 
 static enum vm_paging_mode
@@ -1741,10 +1830,25 @@ vmx_paging_info(struct vm_guest_paging *paging)
 static void
 vmexit_inst_emul(struct vm_exit *vmexit, uint64_t gpa, uint64_t gla)
 {
+	struct vm_guest_paging *paging;
+	uint32_t csar;
+	
+	paging = &vmexit->u.inst_emul.paging;
+
 	vmexit->exitcode = VM_EXITCODE_INST_EMUL;
 	vmexit->u.inst_emul.gpa = gpa;
 	vmexit->u.inst_emul.gla = gla;
-	vmx_paging_info(&vmexit->u.inst_emul.paging);
+	vmx_paging_info(paging);
+	switch (paging->cpu_mode) {
+	case CPU_MODE_PROTECTED:
+	case CPU_MODE_COMPATIBILITY:
+		csar = vmcs_read(VMCS_GUEST_CS_ACCESS_RIGHTS);
+		vmexit->u.inst_emul.cs_d = SEG_DESC_DEF32(csar);
+		break;
+	default:
+		vmexit->u.inst_emul.cs_d = 0;
+		break;
+	}
 }
 
 static int
@@ -1953,6 +2057,26 @@ vmx_handle_apic_access(struct vmx *vmx, int vcpuid, struct vm_exit *vmexit)
 	return (UNHANDLED);
 }
 
+static enum task_switch_reason
+vmx_task_switch_reason(uint64_t qual)
+{
+	int reason;
+
+	reason = (qual >> 30) & 0x3;
+	switch (reason) {
+	case 0:
+		return (TSR_CALL);
+	case 1:
+		return (TSR_IRET);
+	case 2:
+		return (TSR_JMP);
+	case 3:
+		return (TSR_IDT_GATE);
+	default:
+		panic("%s: invalid reason %d", __func__, reason);
+	}
+}
+
 static int
 vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 {
@@ -1960,9 +2084,10 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 	struct vmxctx *vmxctx;
 	struct vlapic *vlapic;
 	struct vm_inout_str *vis;
+	struct vm_task_switch *ts;
 	uint32_t eax, ecx, edx, idtvec_info, idtvec_err, intr_info, inst_info;
-	uint32_t reason;
-	uint64_t qual, gpa;
+	uint32_t intr_type, reason;
+	uint64_t exitintinfo, qual, gpa;
 	bool retu;
 
 	CTASSERT((PINBASED_CTLS_ONE_SETTING & PINBASED_VIRTUAL_NMI) != 0);
@@ -1978,46 +2103,99 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 	vmm_stat_incr(vmx->vm, vcpu, VMEXIT_COUNT, 1);
 
 	/*
-	 * VM exits that could be triggered during event injection on the
-	 * previous VM entry need to be handled specially by re-injecting
-	 * the event.
+	 * VM exits that can be triggered during event delivery need to
+	 * be handled specially by re-injecting the event if the IDT
+	 * vectoring information field's valid bit is set.
 	 *
 	 * See "Information for VM Exits During Event Delivery" in Intel SDM
 	 * for details.
 	 */
-	switch (reason) {
-	case EXIT_REASON_EPT_FAULT:
-	case EXIT_REASON_EPT_MISCONFIG:
-	case EXIT_REASON_APIC_ACCESS:
-	case EXIT_REASON_TASK_SWITCH:
-	case EXIT_REASON_EXCEPTION:
-		idtvec_info = vmcs_idt_vectoring_info();
-		if (idtvec_info & VMCS_IDT_VEC_VALID) {
-			idtvec_info &= ~(1 << 12); /* clear undefined bit */
-			vmcs_write(VMCS_ENTRY_INTR_INFO, idtvec_info);
-			if (idtvec_info & VMCS_IDT_VEC_ERRCODE_VALID) {
-				idtvec_err = vmcs_idt_vectoring_err();
-				vmcs_write(VMCS_ENTRY_EXCEPTION_ERROR,
-				    idtvec_err);
-			}
-			/*
-			 * If 'virtual NMIs' are being used and the VM-exit
-			 * happened while injecting an NMI during the previous
-			 * VM-entry, then clear "blocking by NMI" in the Guest
-			 * Interruptibility-state.
-			 */
-			if ((idtvec_info & VMCS_INTR_T_MASK) ==
-			    VMCS_INTR_T_NMI) {
-				 vmx_clear_nmi_blocking(vmx, vcpu);
-			}
+	idtvec_info = vmcs_idt_vectoring_info();
+	if (idtvec_info & VMCS_IDT_VEC_VALID) {
+		idtvec_info &= ~(1 << 12); /* clear undefined bit */
+		exitintinfo = idtvec_info;
+		if (idtvec_info & VMCS_IDT_VEC_ERRCODE_VALID) {
+			idtvec_err = vmcs_idt_vectoring_err();
+			exitintinfo |= (uint64_t)idtvec_err << 32;
+		}
+		error = vm_exit_intinfo(vmx->vm, vcpu, exitintinfo);
+		KASSERT(error == 0, ("%s: vm_set_intinfo error %d",
+		    __func__, error));
+
+		/*
+		 * If 'virtual NMIs' are being used and the VM-exit
+		 * happened while injecting an NMI during the previous
+		 * VM-entry, then clear "blocking by NMI" in the
+		 * Guest Interruptibility-State so the NMI can be
+		 * reinjected on the subsequent VM-entry.
+		 *
+		 * However, if the NMI was being delivered through a task
+		 * gate, then the new task must start execution with NMIs
+		 * blocked so don't clear NMI blocking in this case.
+		 */
+		intr_type = idtvec_info & VMCS_INTR_T_MASK;
+		if (intr_type == VMCS_INTR_T_NMI) {
+			if (reason != EXIT_REASON_TASK_SWITCH)
+				vmx_clear_nmi_blocking(vmx, vcpu);
+			else
+				vmx_assert_nmi_blocking(vmx, vcpu);
+		}
+
+		/*
+		 * Update VM-entry instruction length if the event being
+		 * delivered was a software interrupt or software exception.
+		 */
+		if (intr_type == VMCS_INTR_T_SWINTR ||
+		    intr_type == VMCS_INTR_T_PRIV_SWEXCEPTION ||
+		    intr_type == VMCS_INTR_T_SWEXCEPTION) {
 			vmcs_write(VMCS_ENTRY_INST_LENGTH, vmexit->inst_length);
 		}
-	default:
-		idtvec_info = 0;
-		break;
 	}
 
 	switch (reason) {
+	case EXIT_REASON_TASK_SWITCH:
+		ts = &vmexit->u.task_switch;
+		ts->tsssel = qual & 0xffff;
+		ts->reason = vmx_task_switch_reason(qual);
+		ts->ext = 0;
+		ts->errcode_valid = 0;
+		vmx_paging_info(&ts->paging);
+		/*
+		 * If the task switch was due to a CALL, JMP, IRET, software
+		 * interrupt (INT n) or software exception (INT3, INTO),
+		 * then the saved %rip references the instruction that caused
+		 * the task switch. The instruction length field in the VMCS
+		 * is valid in this case.
+		 *
+		 * In all other cases (e.g., NMI, hardware exception) the
+		 * saved %rip is one that would have been saved in the old TSS
+		 * had the task switch completed normally so the instruction
+		 * length field is not needed in this case and is explicitly
+		 * set to 0.
+		 */
+		if (ts->reason == TSR_IDT_GATE) {
+			KASSERT(idtvec_info & VMCS_IDT_VEC_VALID,
+			    ("invalid idtvec_info %#x for IDT task switch",
+			    idtvec_info));
+			intr_type = idtvec_info & VMCS_INTR_T_MASK;
+			if (intr_type != VMCS_INTR_T_SWINTR &&
+			    intr_type != VMCS_INTR_T_SWEXCEPTION &&
+			    intr_type != VMCS_INTR_T_PRIV_SWEXCEPTION) {
+				/* Task switch triggered by external event */
+				ts->ext = 1;
+				vmexit->inst_length = 0;
+				if (idtvec_info & VMCS_IDT_VEC_ERRCODE_VALID) {
+					ts->errcode_valid = 1;
+					ts->errcode = vmcs_idt_vectoring_err();
+				}
+			}
+		}
+		vmexit->exitcode = VM_EXITCODE_TASK_SWITCH;
+		VCPU_CTR4(vmx->vm, vcpu, "task switch reason %d, tss 0x%04x, "
+		    "%s errcode 0x%016lx", ts->reason, ts->tsssel,
+		    ts->ext ? "external" : "internal",
+		    ((uint64_t)ts->errcode << 32) | ts->errcode_valid);
+		break;
 	case EXIT_REASON_CR_ACCESS:
 		vmm_stat_incr(vmx->vm, vcpu, VMEXIT_CR_ACCESS, 1);
 		switch (qual & 0xf) {
@@ -2163,6 +2341,7 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 		 * the guest.
 		 *
 		 * See "Resuming Guest Software after Handling an Exception".
+		 * See "Information for VM Exits Due to Vectored Events".
 		 */
 		if ((idtvec_info & VMCS_IDT_VEC_VALID) == 0 &&
 		    (intr_info & 0xff) != IDT_DF &&
@@ -2380,6 +2559,13 @@ vmx_run(void *arg, int vcpu, register_t startrip, pmap_t pmap,
 		 * pmap_invalidate_ept().
 		 */
 		disable_intr();
+		vmx_inject_interrupts(vmx, vcpu, vlapic);
+
+		/*
+		 * Check for vcpu suspension after injecting events because
+		 * vmx_inject_interrupts() can suspend the vcpu due to a
+		 * triple fault.
+		 */
 		if (vcpu_suspended(suspend_cookie)) {
 			enable_intr();
 			vm_exit_suspended(vmx->vm, vcpu, vmcs_guest_rip());
@@ -2392,7 +2578,7 @@ vmx_run(void *arg, int vcpu, register_t startrip, pmap_t pmap,
 			break;
 		}
 
-		if (curthread->td_flags & (TDF_ASTPENDING | TDF_NEEDRESCHED)) {
+		if (vcpu_should_yield(vm, vcpu)) {
 			enable_intr();
 			vm_exit_astpending(vmx->vm, vcpu, vmcs_guest_rip());
 			vmx_astpending_trace(vmx, vcpu, vmexit->rip);
@@ -2400,7 +2586,6 @@ vmx_run(void *arg, int vcpu, register_t startrip, pmap_t pmap,
 			break;
 		}
 
-		vmx_inject_interrupts(vmx, vcpu, vlapic);
 		vmx_run_trace(vmx, vcpu);
 		rc = vmx_enter_guest(vmxctx, vmx, launched);
 
@@ -2568,6 +2753,7 @@ vmx_setreg(void *arg, int vcpu, int reg, uint64_t val)
 {
 	int error, hostcpu, running, shadow;
 	uint64_t ctls;
+	pmap_t pmap;
 	struct vmx *vmx = arg;
 
 	running = vcpu_is_running(vmx->vm, vcpu, &hostcpu);
@@ -2605,6 +2791,18 @@ vmx_setreg(void *arg, int vcpu, int reg, uint64_t val)
 			error = vmcs_setreg(&vmx->vmcs[vcpu], running,
 				    VMCS_IDENT(shadow), val);
 		}
+
+		if (reg == VM_REG_GUEST_CR3) {
+			/*
+			 * Invalidate the guest vcpu's TLB mappings to emulate
+			 * the behavior of updating %cr3.
+			 *
+			 * XXX the processor retains global mappings when %cr3
+			 * is updated but vmx_invvpid() does not.
+			 */
+			pmap = vmx->ctx[vcpu].pmap;
+			vmx_invvpid(vmx, vcpu, pmap, running);
+		}
 	}
 
 	return (error);
diff --git a/sys/amd64/vmm/intel/vmx_msr.c b/sys/amd64/vmm/intel/vmx_msr.c
index 2aba63c916e6..a3428db8a87d 100644
--- a/sys/amd64/vmm/intel/vmx_msr.c
+++ b/sys/amd64/vmm/intel/vmx_msr.c
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 
 #include <machine/cpufunc.h>
+#include <machine/specialreg.h>
 
 #include "vmx_msr.h"
 
diff --git a/sys/amd64/vmm/intel/vmx_msr.h b/sys/amd64/vmm/intel/vmx_msr.h
index e6379a93d155..340b0f7ab436 100644
--- a/sys/amd64/vmm/intel/vmx_msr.h
+++ b/sys/amd64/vmm/intel/vmx_msr.h
@@ -29,29 +29,6 @@
 #ifndef _VMX_MSR_H_
 #define	_VMX_MSR_H_
 
-#define	MSR_VMX_BASIC			0x480
-#define	MSR_VMX_EPT_VPID_CAP		0x48C
-
-#define	MSR_VMX_PROCBASED_CTLS		0x482
-#define	MSR_VMX_TRUE_PROCBASED_CTLS	0x48E
-
-#define	MSR_VMX_PINBASED_CTLS		0x481
-#define	MSR_VMX_TRUE_PINBASED_CTLS	0x48D
-
-#define	MSR_VMX_PROCBASED_CTLS2		0x48B
-
-#define	MSR_VMX_EXIT_CTLS		0x483
-#define	MSR_VMX_TRUE_EXIT_CTLS		0x48f
-
-#define	MSR_VMX_ENTRY_CTLS		0x484
-#define	MSR_VMX_TRUE_ENTRY_CTLS		0x490
-
-#define	MSR_VMX_CR0_FIXED0		0x486
-#define	MSR_VMX_CR0_FIXED1		0x487
-
-#define	MSR_VMX_CR4_FIXED0		0x488
-#define	MSR_VMX_CR4_FIXED1		0x489
-
 uint32_t vmx_revision(void);
 
 int vmx_set_ctlreg(int ctl_reg, int true_ctl_reg, uint32_t ones_mask,
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index 8edb3fb47917..397035a71de4 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -97,6 +97,7 @@ struct vcpu {
 	int		hostcpu;	/* (o) vcpu's host cpu */
 	struct vlapic	*vlapic;	/* (i) APIC device model */
 	enum x2apic_state x2apic_state;	/* (i) APIC mode */
+	uint64_t	exitintinfo;	/* (i) events pending at VM exit */
 	int		nmi_pending;	/* (i) NMI pending */
 	int		extint_pending;	/* (i) INTR pending */
 	struct vm_exception exception;	/* (x) exception collateral */
@@ -199,7 +200,6 @@ SYSCTL_NODE(_hw, OID_AUTO, vmm, CTLFLAG_RW, NULL, NULL);
  * interrupts disabled.
  */
 static int halt_detection_enabled = 1;
-TUNABLE_INT("hw.vmm.halt_detection", &halt_detection_enabled);
 SYSCTL_INT(_hw_vmm, OID_AUTO, halt_detection, CTLFLAG_RDTUN,
     &halt_detection_enabled, 0,
     "Halt VM if all vcpus execute HLT with interrupts disabled");
@@ -242,6 +242,7 @@ vcpu_init(struct vm *vm, int vcpu_id, bool create)
 
 	vcpu->vlapic = VLAPIC_INIT(vm->cookie, vcpu_id);
 	vm_set_x2apic_state(vm, vcpu_id, X2APIC_DISABLED);
+	vcpu->exitintinfo = 0;
 	vcpu->nmi_pending = 0;
 	vcpu->extint_pending = 0;
 	vcpu->exception_pending = 0;
@@ -1104,6 +1105,10 @@ vm_handle_hlt(struct vm *vm, int vcpuid, bool intr_disabled, bool *retu)
 			}
 		}
 
+		/* Don't go to sleep if the vcpu thread needs to yield */
+		if (vcpu_should_yield(vm, vcpuid))
+			break;
+
 		/*
 		 * Some Linux guests implement "halt" by having all vcpus
 		 * execute HLT with interrupts disabled. 'halted_cpus' keeps
@@ -1127,7 +1132,11 @@ vm_handle_hlt(struct vm *vm, int vcpuid, bool intr_disabled, bool *retu)
 
 		t = ticks;
 		vcpu_require_state_locked(vcpu, VCPU_SLEEPING);
-		msleep_spin(vcpu, &vcpu->mtx, wmesg, 0);
+		/*
+		 * XXX msleep_spin() cannot be interrupted by signals so
+		 * wake up periodically to check pending signals.
+		 */
+		msleep_spin(vcpu, &vcpu->mtx, wmesg, hz);
 		vcpu_require_state_locked(vcpu, VCPU_FROZEN);
 		vmm_stat_incr(vm, vcpuid, VCPU_IDLE_TICKS, ticks - t);
 	}
@@ -1191,15 +1200,18 @@ vm_handle_inst_emul(struct vm *vm, int vcpuid, bool *retu)
 	struct vm_guest_paging *paging;
 	mem_region_read_t mread;
 	mem_region_write_t mwrite;
-	int error;
+	enum vm_cpu_mode cpu_mode;
+	int cs_d, error;
 
 	vcpu = &vm->vcpu[vcpuid];
 	vme = &vcpu->exitinfo;
 
 	gla = vme->u.inst_emul.gla;
 	gpa = vme->u.inst_emul.gpa;
+	cs_d = vme->u.inst_emul.cs_d;
 	vie = &vme->u.inst_emul.vie;
 	paging = &vme->u.inst_emul.paging;
+	cpu_mode = paging->cpu_mode;
 
 	vie_init(vie);
 
@@ -1213,7 +1225,7 @@ vm_handle_inst_emul(struct vm *vm, int vcpuid, bool *retu)
 	else if (error != 0)
 		panic("%s: vmm_fetch_instruction error %d", __func__, error);
 
-	if (vmm_decode_instruction(vm, vcpuid, gla, paging->cpu_mode, vie) != 0)
+	if (vmm_decode_instruction(vm, vcpuid, gla, cpu_mode, cs_d, vie) != 0)
 		return (EFAULT);
 
 	/* return to userland unless this is an in-kernel emulated device */
@@ -1231,8 +1243,8 @@ vm_handle_inst_emul(struct vm *vm, int vcpuid, bool *retu)
 		return (0);
 	}
 
-	error = vmm_emulate_instruction(vm, vcpuid, gpa, vie, mread, mwrite,
-	    retu);
+	error = vmm_emulate_instruction(vm, vcpuid, gpa, vie, paging,
+	    mread, mwrite, retu);
 
 	return (error);
 }
@@ -1455,6 +1467,202 @@ vm_run(struct vm *vm, struct vm_run *vmrun)
 	return (error);
 }
 
+int
+vm_exit_intinfo(struct vm *vm, int vcpuid, uint64_t info)
+{
+	struct vcpu *vcpu;
+	int type, vector;
+
+	if (vcpuid < 0 || vcpuid >= VM_MAXCPU)
+		return (EINVAL);
+
+	vcpu = &vm->vcpu[vcpuid];
+
+	if (info & VM_INTINFO_VALID) {
+		type = info & VM_INTINFO_TYPE;
+		vector = info & 0xff;
+		if (type == VM_INTINFO_NMI && vector != IDT_NMI)
+			return (EINVAL);
+		if (type == VM_INTINFO_HWEXCEPTION && vector >= 32)
+			return (EINVAL);
+		if (info & VM_INTINFO_RSVD)
+			return (EINVAL);
+	} else {
+		info = 0;
+	}
+	VCPU_CTR2(vm, vcpuid, "%s: info1(%#lx)", __func__, info);
+	vcpu->exitintinfo = info;
+	return (0);
+}
+
+enum exc_class {
+	EXC_BENIGN,
+	EXC_CONTRIBUTORY,
+	EXC_PAGEFAULT
+};
+
+#define	IDT_VE	20	/* Virtualization Exception (Intel specific) */
+
+static enum exc_class
+exception_class(uint64_t info)
+{
+	int type, vector;
+
+	KASSERT(info & VM_INTINFO_VALID, ("intinfo must be valid: %#lx", info));
+	type = info & VM_INTINFO_TYPE;
+	vector = info & 0xff;
+
+	/* Table 6-4, "Interrupt and Exception Classes", Intel SDM, Vol 3 */
+	switch (type) {
+	case VM_INTINFO_HWINTR:
+	case VM_INTINFO_SWINTR:
+	case VM_INTINFO_NMI:
+		return (EXC_BENIGN);
+	default:
+		/*
+		 * Hardware exception.
+		 *
+		 * SVM and VT-x use identical type values to represent NMI,
+		 * hardware interrupt and software interrupt.
+		 *
+		 * SVM uses type '3' for all exceptions. VT-x uses type '3'
+		 * for exceptions except #BP and #OF. #BP and #OF use a type
+		 * value of '5' or '6'. Therefore we don't check for explicit
+		 * values of 'type' to classify 'intinfo' into a hardware
+		 * exception.
+		 */
+		break;
+	}
+
+	switch (vector) {
+	case IDT_PF:
+	case IDT_VE:
+		return (EXC_PAGEFAULT);
+	case IDT_DE:
+	case IDT_TS:
+	case IDT_NP:
+	case IDT_SS:
+	case IDT_GP:
+		return (EXC_CONTRIBUTORY);
+	default:
+		return (EXC_BENIGN);
+	}
+}
+
+static int
+nested_fault(struct vm *vm, int vcpuid, uint64_t info1, uint64_t info2,
+    uint64_t *retinfo)
+{
+	enum exc_class exc1, exc2;
+	int type1, vector1;
+
+	KASSERT(info1 & VM_INTINFO_VALID, ("info1 %#lx is not valid", info1));
+	KASSERT(info2 & VM_INTINFO_VALID, ("info2 %#lx is not valid", info2));
+
+	/*
+	 * If an exception occurs while attempting to call the double-fault
+	 * handler the processor enters shutdown mode (aka triple fault).
+	 */
+	type1 = info1 & VM_INTINFO_TYPE;
+	vector1 = info1 & 0xff;
+	if (type1 == VM_INTINFO_HWEXCEPTION && vector1 == IDT_DF) {
+		VCPU_CTR2(vm, vcpuid, "triple fault: info1(%#lx), info2(%#lx)",
+		    info1, info2);
+		vm_suspend(vm, VM_SUSPEND_TRIPLEFAULT);
+		*retinfo = 0;
+		return (0);
+	}
+
+	/*
+	 * Table 6-5 "Conditions for Generating a Double Fault", Intel SDM, Vol3
+	 */
+	exc1 = exception_class(info1);
+	exc2 = exception_class(info2);
+	if ((exc1 == EXC_CONTRIBUTORY && exc2 == EXC_CONTRIBUTORY) ||
+	    (exc1 == EXC_PAGEFAULT && exc2 != EXC_BENIGN)) {
+		/* Convert nested fault into a double fault. */
+		*retinfo = IDT_DF;
+		*retinfo |= VM_INTINFO_VALID | VM_INTINFO_HWEXCEPTION;
+		*retinfo |= VM_INTINFO_DEL_ERRCODE;
+	} else {
+		/* Handle exceptions serially */
+		*retinfo = info2;
+	}
+	return (1);
+}
+
+static uint64_t
+vcpu_exception_intinfo(struct vcpu *vcpu)
+{
+	uint64_t info = 0;
+
+	if (vcpu->exception_pending) {
+		info = vcpu->exception.vector & 0xff;
+		info |= VM_INTINFO_VALID | VM_INTINFO_HWEXCEPTION;
+		if (vcpu->exception.error_code_valid) {
+			info |= VM_INTINFO_DEL_ERRCODE;
+			info |= (uint64_t)vcpu->exception.error_code << 32;
+		}
+	}
+	return (info);
+}
+
+int
+vm_entry_intinfo(struct vm *vm, int vcpuid, uint64_t *retinfo)
+{
+	struct vcpu *vcpu;
+	uint64_t info1, info2;
+	int valid;
+
+	KASSERT(vcpuid >= 0 && vcpuid < VM_MAXCPU, ("invalid vcpu %d", vcpuid));
+
+	vcpu = &vm->vcpu[vcpuid];
+
+	info1 = vcpu->exitintinfo;
+	vcpu->exitintinfo = 0;
+
+	info2 = 0;
+	if (vcpu->exception_pending) {
+		info2 = vcpu_exception_intinfo(vcpu);
+		vcpu->exception_pending = 0;
+		VCPU_CTR2(vm, vcpuid, "Exception %d delivered: %#lx",
+		    vcpu->exception.vector, info2);
+	}
+
+	if ((info1 & VM_INTINFO_VALID) && (info2 & VM_INTINFO_VALID)) {
+		valid = nested_fault(vm, vcpuid, info1, info2, retinfo);
+	} else if (info1 & VM_INTINFO_VALID) {
+		*retinfo = info1;
+		valid = 1;
+	} else if (info2 & VM_INTINFO_VALID) {
+		*retinfo = info2;
+		valid = 1;
+	} else {
+		valid = 0;
+	}
+
+	if (valid) {
+		VCPU_CTR4(vm, vcpuid, "%s: info1(%#lx), info2(%#lx), "
+		    "retinfo(%#lx)", __func__, info1, info2, *retinfo);
+	}
+
+	return (valid);
+}
+
+int
+vm_get_intinfo(struct vm *vm, int vcpuid, uint64_t *info1, uint64_t *info2)
+{
+	struct vcpu *vcpu;
+
+	if (vcpuid < 0 || vcpuid >= VM_MAXCPU)
+		return (EINVAL);
+
+	vcpu = &vm->vcpu[vcpuid];
+	*info1 = vcpu->exitintinfo;
+	*info2 = vcpu_exception_intinfo(vcpu);
+	return (0);
+}
+
 int
 vm_inject_exception(struct vm *vm, int vcpuid, struct vm_exception *exception)
 {
@@ -1466,6 +1674,14 @@ vm_inject_exception(struct vm *vm, int vcpuid, struct vm_exception *exception)
 	if (exception->vector < 0 || exception->vector >= 32)
 		return (EINVAL);
 
+	/*
+	 * A double fault exception should never be injected directly into
+	 * the guest. It is a derived exception that results from specific
+	 * combinations of nested faults.
+	 */
+	if (exception->vector == IDT_DF)
+		return (EINVAL);
+
 	vcpu = &vm->vcpu[vcpuid];
 
 	if (vcpu->exception_pending) {
@@ -1481,32 +1697,21 @@ vm_inject_exception(struct vm *vm, int vcpuid, struct vm_exception *exception)
 	return (0);
 }
 
-int
-vm_exception_pending(struct vm *vm, int vcpuid, struct vm_exception *exception)
-{
-	struct vcpu *vcpu;
-	int pending;
-
-	KASSERT(vcpuid >= 0 && vcpuid < VM_MAXCPU, ("invalid vcpu %d", vcpuid));
-
-	vcpu = &vm->vcpu[vcpuid];
-	pending = vcpu->exception_pending;
-	if (pending) {
-		vcpu->exception_pending = 0;
-		*exception = vcpu->exception;
-		VCPU_CTR1(vm, vcpuid, "Exception %d delivered",
-		    exception->vector);
-	}
-	return (pending);
-}
-
-static void
-vm_inject_fault(struct vm *vm, int vcpuid, struct vm_exception *exception)
+void
+vm_inject_fault(void *vmarg, int vcpuid, int vector, int errcode_valid,
+    int errcode)
 {
+	struct vm_exception exception;
 	struct vm_exit *vmexit;
+	struct vm *vm;
 	int error;
 
-	error = vm_inject_exception(vm, vcpuid, exception);
+	vm = vmarg;
+
+	exception.vector = vector;
+	exception.error_code = errcode;
+	exception.error_code_valid = errcode_valid;
+	error = vm_inject_exception(vm, vcpuid, &exception);
 	KASSERT(error == 0, ("vm_inject_exception error %d", error));
 
 	/*
@@ -1521,45 +1726,19 @@ vm_inject_fault(struct vm *vm, int vcpuid, struct vm_exception *exception)
 }
 
 void
-vm_inject_pf(struct vm *vm, int vcpuid, int error_code, uint64_t cr2)
+vm_inject_pf(void *vmarg, int vcpuid, int error_code, uint64_t cr2)
 {
-	struct vm_exception pf = {
-		.vector = IDT_PF,
-		.error_code_valid = 1,
-		.error_code = error_code
-	};
+	struct vm *vm;
 	int error;
 
+	vm = vmarg;
 	VCPU_CTR2(vm, vcpuid, "Injecting page fault: error_code %#x, cr2 %#lx",
 	    error_code, cr2);
 
 	error = vm_set_register(vm, vcpuid, VM_REG_GUEST_CR2, cr2);
 	KASSERT(error == 0, ("vm_set_register(cr2) error %d", error));
 
-	vm_inject_fault(vm, vcpuid, &pf);
-}
-
-void
-vm_inject_gp(struct vm *vm, int vcpuid)
-{
-	struct vm_exception gpf = {
-		.vector = IDT_GP,
-		.error_code_valid = 1,
-		.error_code = 0
-	};
-
-	vm_inject_fault(vm, vcpuid, &gpf);
-}
-
-void
-vm_inject_ud(struct vm *vm, int vcpuid)
-{
-	struct vm_exception udf = {
-		.vector = IDT_UD,
-		.error_code_valid = 0
-	};
-
-	vm_inject_fault(vm, vcpuid, &udf);
+	vm_inject_fault(vm, vcpuid, IDT_PF, 1, error_code);
 }
 
 static VMM_STAT(VCPU_NMI_COUNT, "number of NMIs delivered to vcpu");
@@ -1992,3 +2171,125 @@ vm_segment_name(int seg)
 	    ("%s: invalid segment encoding %d", __func__, seg));
 	return (seg_names[seg]);
 }
+
+void
+vm_copy_teardown(struct vm *vm, int vcpuid, struct vm_copyinfo *copyinfo,
+    int num_copyinfo)
+{
+	int idx;
+
+	for (idx = 0; idx < num_copyinfo; idx++) {
+		if (copyinfo[idx].cookie != NULL)
+			vm_gpa_release(copyinfo[idx].cookie);
+	}
+	bzero(copyinfo, num_copyinfo * sizeof(struct vm_copyinfo));
+}
+
+int
+vm_copy_setup(struct vm *vm, int vcpuid, struct vm_guest_paging *paging,
+    uint64_t gla, size_t len, int prot, struct vm_copyinfo *copyinfo,
+    int num_copyinfo)
+{
+	int error, idx, nused;
+	size_t n, off, remaining;
+	void *hva, *cookie;
+	uint64_t gpa;
+
+	bzero(copyinfo, sizeof(struct vm_copyinfo) * num_copyinfo);
+
+	nused = 0;
+	remaining = len;
+	while (remaining > 0) {
+		KASSERT(nused < num_copyinfo, ("insufficient vm_copyinfo"));
+		error = vmm_gla2gpa(vm, vcpuid, paging, gla, prot, &gpa);
+		if (error)
+			return (error);
+		off = gpa & PAGE_MASK;
+		n = min(remaining, PAGE_SIZE - off);
+		copyinfo[nused].gpa = gpa;
+		copyinfo[nused].len = n;
+		remaining -= n;
+		gla += n;
+		nused++;
+	}
+
+	for (idx = 0; idx < nused; idx++) {
+		hva = vm_gpa_hold(vm, copyinfo[idx].gpa, copyinfo[idx].len,
+		    prot, &cookie);
+		if (hva == NULL)
+			break;
+		copyinfo[idx].hva = hva;
+		copyinfo[idx].cookie = cookie;
+	}
+
+	if (idx != nused) {
+		vm_copy_teardown(vm, vcpuid, copyinfo, num_copyinfo);
+		return (-1);
+	} else {
+		return (0);
+	}
+}
+
+void
+vm_copyin(struct vm *vm, int vcpuid, struct vm_copyinfo *copyinfo, void *kaddr,
+    size_t len)
+{
+	char *dst;
+	int idx;
+	
+	dst = kaddr;
+	idx = 0;
+	while (len > 0) {
+		bcopy(copyinfo[idx].hva, dst, copyinfo[idx].len);
+		len -= copyinfo[idx].len;
+		dst += copyinfo[idx].len;
+		idx++;
+	}
+}
+
+void
+vm_copyout(struct vm *vm, int vcpuid, const void *kaddr,
+    struct vm_copyinfo *copyinfo, size_t len)
+{
+	const char *src;
+	int idx;
+
+	src = kaddr;
+	idx = 0;
+	while (len > 0) {
+		bcopy(src, copyinfo[idx].hva, copyinfo[idx].len);
+		len -= copyinfo[idx].len;
+		src += copyinfo[idx].len;
+		idx++;
+	}
+}
+
+/*
+ * Return the amount of in-use and wired memory for the VM. Since
+ * these are global stats, only return the values with for vCPU 0
+ */
+VMM_STAT_DECLARE(VMM_MEM_RESIDENT);
+VMM_STAT_DECLARE(VMM_MEM_WIRED);
+
+static void
+vm_get_rescnt(struct vm *vm, int vcpu, struct vmm_stat_type *stat)
+{
+
+	if (vcpu == 0) {
+		vmm_stat_set(vm, vcpu, VMM_MEM_RESIDENT,
+	       	    PAGE_SIZE * vmspace_resident_count(vm->vmspace));
+	}	
+}
+
+static void
+vm_get_wiredcnt(struct vm *vm, int vcpu, struct vmm_stat_type *stat)
+{
+
+	if (vcpu == 0) {
+		vmm_stat_set(vm, vcpu, VMM_MEM_WIRED,
+	      	    PAGE_SIZE * pmap_wired_count(vmspace_pmap(vm->vmspace)));
+	}	
+}
+
+VMM_STAT_FUNC(VMM_MEM_RESIDENT, "Resident memory", vm_get_rescnt);
+VMM_STAT_FUNC(VMM_MEM_WIRED, "Wired memory", vm_get_wiredcnt);
diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c
index f3e31a33df4a..a85109edaa1d 100644
--- a/sys/amd64/vmm/vmm_dev.c
+++ b/sys/amd64/vmm/vmm_dev.c
@@ -173,6 +173,7 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag,
 	struct vm_gla2gpa *gg;
 	struct vm_activate_cpu *vac;
 	struct vm_cpuset *vm_cpuset;
+	struct vm_intinfo *vmii;
 
 	sc = vmmdev_lookup2(cdev);
 	if (sc == NULL)
@@ -199,6 +200,8 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag,
 	case VM_SET_X2APIC_STATE:
 	case VM_GLA2GPA:
 	case VM_ACTIVATE_CPU:
+	case VM_SET_INTINFO:
+	case VM_GET_INTINFO:
 		/*
 		 * XXX fragile, handle with care
 		 * Assumes that the first field of the ioctl data is the vcpu.
@@ -470,6 +473,15 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag,
 			error = copyout(cpuset, vm_cpuset->cpus, size);
 		free(cpuset, M_TEMP);
 		break;
+	case VM_SET_INTINFO:
+		vmii = (struct vm_intinfo *)data;
+		error = vm_exit_intinfo(sc->vm, vmii->vcpuid, vmii->info1);
+		break;
+	case VM_GET_INTINFO:
+		vmii = (struct vm_intinfo *)data;
+		error = vm_get_intinfo(sc->vm, vmii->vcpuid, &vmii->info1,
+		    &vmii->info2);
+		break;
 	default:
 		error = ENOTTY;
 		break;
diff --git a/sys/amd64/vmm/vmm_instruction_emul.c b/sys/amd64/vmm/vmm_instruction_emul.c
index 83dd4147bc7e..a65b1251e52b 100644
--- a/sys/amd64/vmm/vmm_instruction_emul.c
+++ b/sys/amd64/vmm/vmm_instruction_emul.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #else	/* !_KERNEL */
 #include <sys/types.h>
 #include <sys/errno.h>
+#include <sys/_iovec.h>
 
 #include <machine/vmm.h>
 
@@ -65,18 +66,26 @@ enum {
 	VIE_OP_TYPE_AND,
 	VIE_OP_TYPE_OR,
 	VIE_OP_TYPE_TWO_BYTE,
+	VIE_OP_TYPE_PUSH,
+	VIE_OP_TYPE_CMP,
 	VIE_OP_TYPE_LAST
 };
 
 /* struct vie_op.op_flags */
-#define	VIE_OP_F_IMM		(1 << 0)	/* immediate operand present */
-#define	VIE_OP_F_IMM8		(1 << 1)	/* 8-bit immediate operand */
+#define	VIE_OP_F_IMM		(1 << 0)  /* 16/32-bit immediate operand */
+#define	VIE_OP_F_IMM8		(1 << 1)  /* 8-bit immediate operand */
+#define	VIE_OP_F_MOFFSET	(1 << 2)  /* 16/32/64-bit immediate moffset */
+#define	VIE_OP_F_NO_MODRM	(1 << 3)
 
 static const struct vie_op two_byte_opcodes[256] = {
 	[0xB6] = {
 		.op_byte = 0xB6,
 		.op_type = VIE_OP_TYPE_MOVZX,
 	},
+	[0xB7] = {
+		.op_byte = 0xB7,
+		.op_type = VIE_OP_TYPE_MOVZX,
+	},
 	[0xBE] = {
 		.op_byte = 0xBE,
 		.op_type = VIE_OP_TYPE_MOVSX,
@@ -88,6 +97,10 @@ static const struct vie_op one_byte_opcodes[256] = {
 		.op_byte = 0x0F,
 		.op_type = VIE_OP_TYPE_TWO_BYTE
 	},
+	[0x3B] = {
+		.op_byte = 0x3B,
+		.op_type = VIE_OP_TYPE_CMP,
+	},
 	[0x88] = {
 		.op_byte = 0x88,
 		.op_type = VIE_OP_TYPE_MOV,
@@ -104,6 +117,22 @@ static const struct vie_op one_byte_opcodes[256] = {
 		.op_byte = 0x8B,
 		.op_type = VIE_OP_TYPE_MOV,
 	},
+	[0xA1] = {
+		.op_byte = 0xA1,
+		.op_type = VIE_OP_TYPE_MOV,
+		.op_flags = VIE_OP_F_MOFFSET | VIE_OP_F_NO_MODRM,
+	},
+	[0xA3] = {
+		.op_byte = 0xA3,
+		.op_type = VIE_OP_TYPE_MOV,
+		.op_flags = VIE_OP_F_MOFFSET | VIE_OP_F_NO_MODRM,
+	},
+	[0xC6] = {
+		/* XXX Group 11 extended opcode - not just MOV */
+		.op_byte = 0xC6,
+		.op_type = VIE_OP_TYPE_MOV,
+		.op_flags = VIE_OP_F_IMM8,
+	},
 	[0xC7] = {
 		.op_byte = 0xC7,
 		.op_type = VIE_OP_TYPE_MOV,
@@ -125,6 +154,11 @@ static const struct vie_op one_byte_opcodes[256] = {
 		.op_type = VIE_OP_TYPE_OR,
 		.op_flags = VIE_OP_F_IMM8,
 	},
+	[0xFF] = {
+		/* XXX Group 5 extended opcode - not just PUSH */
+		.op_byte = 0xFF,
+		.op_type = VIE_OP_TYPE_PUSH,
+	}
 };
 
 /* struct vie.mod */
@@ -175,18 +209,15 @@ vie_read_register(void *vm, int vcpuid, enum vm_reg_name reg, uint64_t *rval)
 	return (error);
 }
 
-static int
-vie_read_bytereg(void *vm, int vcpuid, struct vie *vie, uint8_t *rval)
+static void
+vie_calc_bytereg(struct vie *vie, enum vm_reg_name *reg, int *lhbr)
 {
-	uint64_t val;
-	int error, rshift;
-	enum vm_reg_name reg;
-
-	rshift = 0;
-	reg = gpr_map[vie->reg];
+	*lhbr = 0;
+	*reg = gpr_map[vie->reg];
 
 	/*
-	 * 64-bit mode imposes limitations on accessing legacy byte registers.
+	 * 64-bit mode imposes limitations on accessing legacy high byte
+	 * registers (lhbr).
 	 *
 	 * The legacy high-byte registers cannot be addressed if the REX
 	 * prefix is present. In this case the values 4, 5, 6 and 7 of the
@@ -198,17 +229,56 @@ vie_read_bytereg(void *vm, int vcpuid, struct vie *vie, uint8_t *rval)
 	 */
 	if (!vie->rex_present) {
 		if (vie->reg & 0x4) {
-			/*
-			 * Obtain the value of %ah by reading %rax and shifting
-			 * right by 8 bits (same for %bh, %ch and %dh).
-			 */
-			rshift = 8;
-			reg = gpr_map[vie->reg & 0x3];
+			*lhbr = 1;
+			*reg = gpr_map[vie->reg & 0x3];
 		}
 	}
+}
 
+static int
+vie_read_bytereg(void *vm, int vcpuid, struct vie *vie, uint8_t *rval)
+{
+	uint64_t val;
+	int error, lhbr;
+	enum vm_reg_name reg;
+
+	vie_calc_bytereg(vie, &reg, &lhbr);
 	error = vm_get_register(vm, vcpuid, reg, &val);
-	*rval = val >> rshift;
+
+	/*
+	 * To obtain the value of a legacy high byte register shift the
+	 * base register right by 8 bits (%ah = %rax >> 8).
+	 */
+	if (lhbr)
+		*rval = val >> 8;
+	else
+		*rval = val;
+	return (error);
+}
+
+static int
+vie_write_bytereg(void *vm, int vcpuid, struct vie *vie, uint8_t byte)
+{
+	uint64_t origval, val, mask;
+	int error, lhbr;
+	enum vm_reg_name reg;
+
+	vie_calc_bytereg(vie, &reg, &lhbr);
+	error = vm_get_register(vm, vcpuid, reg, &origval);
+	if (error == 0) {
+		val = byte;
+		mask = 0xff;
+		if (lhbr) {
+			/*
+			 * Shift left by 8 to store 'byte' in a legacy high
+			 * byte register.
+			 */
+			val <<= 8;
+			mask <<= 8;
+		}
+		val |= origval & ~mask;
+		error = vm_set_register(vm, vcpuid, reg, val);
+	}
 	return (error);
 }
 
@@ -242,16 +312,52 @@ vie_update_register(void *vm, int vcpuid, enum vm_reg_name reg,
 }
 
 /*
- * The following simplifying assumptions are made during emulation:
- *
- * - guest is in 64-bit mode
- *   - default address size is 64-bits
- *   - default operand size is 32-bits
- *
- * - operand size override is not supported
- *
- * - address size override is not supported
+ * Return the status flags that would result from doing (x - y).
  */
+static u_long
+getcc16(uint16_t x, uint16_t y)
+{
+	u_long rflags;
+
+	__asm __volatile("sub %1,%2; pushfq; popq %0" :
+	    "=r" (rflags) : "m" (y), "r" (x));
+	return (rflags);
+}
+
+static u_long
+getcc32(uint32_t x, uint32_t y)
+{
+	u_long rflags;
+
+	__asm __volatile("sub %1,%2; pushfq; popq %0" :
+	    "=r" (rflags) : "m" (y), "r" (x));
+	return (rflags);
+}
+
+static u_long
+getcc64(uint64_t x, uint64_t y)
+{
+	u_long rflags;
+
+	__asm __volatile("sub %1,%2; pushfq; popq %0" :
+	    "=r" (rflags) : "m" (y), "r" (x));
+	return (rflags);
+}
+
+static u_long
+getcc(int opsize, uint64_t x, uint64_t y)
+{
+	KASSERT(opsize == 2 || opsize == 4 || opsize == 8,
+	    ("getcc: invalid operand size %d", opsize));
+
+	if (opsize == 2)
+		return (getcc16(x, y));
+	else if (opsize == 4)
+		return (getcc32(x, y));
+	else
+		return (getcc64(x, y));
+}
+
 static int
 emulate_mov(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 	    mem_region_read_t memread, mem_region_write_t memwrite, void *arg)
@@ -261,7 +367,7 @@ emulate_mov(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 	uint8_t byte;
 	uint64_t val;
 
-	size = 4;
+	size = vie->opsize;
 	error = EINVAL;
 
 	switch (vie->op.op_byte) {
@@ -271,7 +377,7 @@ emulate_mov(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 		 * 88/r:	mov r/m8, r8
 		 * REX + 88/r:	mov r/m8, r8 (%ah, %ch, %dh, %bh not available)
 		 */
-		size = 1;
+		size = 1;	/* override for byte operation */
 		error = vie_read_bytereg(vm, vcpuid, vie, &byte);
 		if (error == 0)
 			error = memwrite(vm, vcpuid, gpa, byte, size, arg);
@@ -279,11 +385,10 @@ emulate_mov(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 	case 0x89:
 		/*
 		 * MOV from reg (ModRM:reg) to mem (ModRM:r/m)
+		 * 89/r:	mov r/m16, r16
 		 * 89/r:	mov r/m32, r32
 		 * REX.W + 89/r	mov r/m64, r64
 		 */
-		if (vie->rex_w)
-			size = 8;
 		reg = gpr_map[vie->reg];
 		error = vie_read_register(vm, vcpuid, reg, &val);
 		if (error == 0) {
@@ -292,38 +397,72 @@ emulate_mov(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 		}
 		break;
 	case 0x8A:
+		/*
+		 * MOV byte from mem (ModRM:r/m) to reg (ModRM:reg)
+		 * 8A/r:	mov r8, r/m8
+		 * REX + 8A/r:	mov r8, r/m8
+		 */
+		size = 1;	/* override for byte operation */
+		error = memread(vm, vcpuid, gpa, &val, size, arg);
+		if (error == 0)
+			error = vie_write_bytereg(vm, vcpuid, vie, val);
+		break;
 	case 0x8B:
 		/*
 		 * MOV from mem (ModRM:r/m) to reg (ModRM:reg)
-		 * 8A/r:	mov r/m8, r8
-		 * REX + 8A/r:	mov r/m8, r8
+		 * 8B/r:	mov r16, r/m16
 		 * 8B/r:	mov r32, r/m32
 		 * REX.W 8B/r:	mov r64, r/m64
 		 */
-		if (vie->op.op_byte == 0x8A)
-			size = 1;
-		else if (vie->rex_w)
-			size = 8;
 		error = memread(vm, vcpuid, gpa, &val, size, arg);
 		if (error == 0) {
 			reg = gpr_map[vie->reg];
 			error = vie_update_register(vm, vcpuid, reg, val, size);
 		}
 		break;
+	case 0xA1:
+		/*
+		 * MOV from seg:moffset to AX/EAX/RAX
+		 * A1:		mov AX, moffs16
+		 * A1:		mov EAX, moffs32
+		 * REX.W + A1:	mov RAX, moffs64
+		 */
+		error = memread(vm, vcpuid, gpa, &val, size, arg);
+		if (error == 0) {
+			reg = VM_REG_GUEST_RAX;
+			error = vie_update_register(vm, vcpuid, reg, val, size);
+		}
+		break;
+	case 0xA3:
+		/*
+		 * MOV from AX/EAX/RAX to seg:moffset
+		 * A3:		mov moffs16, AX
+		 * A3:		mov moffs32, EAX 
+		 * REX.W + A3:	mov moffs64, RAX
+		 */
+		error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RAX, &val);
+		if (error == 0) {
+			val &= size2mask[size];
+			error = memwrite(vm, vcpuid, gpa, val, size, arg);
+		}
+		break;
+	case 0xC6:
+		/*
+		 * MOV from imm8 to mem (ModRM:r/m)
+		 * C6/0		mov r/m8, imm8
+		 * REX + C6/0	mov r/m8, imm8
+		 */
+		size = 1;	/* override for byte operation */
+		error = memwrite(vm, vcpuid, gpa, vie->immediate, size, arg);
+		break;
 	case 0xC7:
 		/*
-		 * MOV from imm32 to mem (ModRM:r/m)
+		 * MOV from imm16/imm32 to mem (ModRM:r/m)
+		 * C7/0		mov r/m16, imm16
 		 * C7/0		mov r/m32, imm32
 		 * REX.W + C7/0	mov r/m64, imm32 (sign-extended to 64-bits)
 		 */
-		val = vie->immediate;		/* already sign-extended */
-
-		if (vie->rex_w)
-			size = 8;
-
-		if (size != 8)
-			val &= size2mask[size];
-
+		val = vie->immediate & size2mask[size];
 		error = memwrite(vm, vcpuid, gpa, val, size, arg);
 		break;
 	default:
@@ -333,17 +472,6 @@ emulate_mov(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 	return (error);
 }
 
-/*
- * The following simplifying assumptions are made during emulation:
- *
- * - guest is in 64-bit mode
- *   - default address size is 64-bits
- *   - default operand size is 32-bits
- *
- * - operand size override is not supported
- *
- * - address size override is not supported
- */
 static int
 emulate_movx(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 	     mem_region_read_t memread, mem_region_write_t memwrite,
@@ -353,7 +481,7 @@ emulate_movx(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 	enum vm_reg_name reg;
 	uint64_t val;
 
-	size = 4;
+	size = vie->opsize;
 	error = EINVAL;
 
 	switch (vie->op.op_byte) {
@@ -362,8 +490,9 @@ emulate_movx(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 		 * MOV and zero extend byte from mem (ModRM:r/m) to
 		 * reg (ModRM:reg).
 		 *
-		 * 0F B6/r		movzx r/m8, r32
-		 * REX.W + 0F B6/r	movzx r/m8, r64
+		 * 0F B6/r		movzx r16, r/m8
+		 * 0F B6/r		movzx r32, r/m8
+		 * REX.W + 0F B6/r	movzx r64, r/m8
 		 */
 
 		/* get the first operand */
@@ -374,10 +503,29 @@ emulate_movx(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 		/* get the second operand */
 		reg = gpr_map[vie->reg];
 
-		if (vie->rex_w)
-			size = 8;
+		/* zero-extend byte */
+		val = (uint8_t)val;
 
 		/* write the result */
+		error = vie_update_register(vm, vcpuid, reg, val, size);
+		break;
+	case 0xB7:
+		/*
+		 * MOV and zero extend word from mem (ModRM:r/m) to
+		 * reg (ModRM:reg).
+		 *
+		 * 0F B7/r		movzx r32, r/m16
+		 * REX.W + 0F B7/r	movzx r64, r/m16
+		 */
+		error = memread(vm, vcpuid, gpa, &val, 2, arg);
+		if (error)
+			return (error);
+
+		reg = gpr_map[vie->reg];
+
+		/* zero-extend word */
+		val = (uint16_t)val;
+
 		error = vie_update_register(vm, vcpuid, reg, val, size);
 		break;
 	case 0xBE:
@@ -385,8 +533,9 @@ emulate_movx(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 		 * MOV and sign extend byte from mem (ModRM:r/m) to
 		 * reg (ModRM:reg).
 		 *
-		 * 0F BE/r		movsx r/m8, r32
-		 * REX.W + 0F BE/r	movsx r/m8, r64
+		 * 0F BE/r		movsx r16, r/m8
+		 * 0F BE/r		movsx r32, r/m8
+		 * REX.W + 0F BE/r	movsx r64, r/m8
 		 */
 
 		/* get the first operand */
@@ -397,9 +546,6 @@ emulate_movx(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 		/* get the second operand */
 		reg = gpr_map[vie->reg];
 
-		if (vie->rex_w)
-			size = 8;
-
 		/* sign extend byte */
 		val = (int8_t)val;
 
@@ -420,7 +566,7 @@ emulate_and(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 	enum vm_reg_name reg;
 	uint64_t val1, val2;
 
-	size = 4;
+	size = vie->opsize;
 	error = EINVAL;
 
 	switch (vie->op.op_byte) {
@@ -429,11 +575,10 @@ emulate_and(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 		 * AND reg (ModRM:reg) and mem (ModRM:r/m) and store the
 		 * result in reg.
 		 *
+		 * 23/r		and r16, r/m16
 		 * 23/r		and r32, r/m32
 		 * REX.W + 23/r	and r64, r/m64
 		 */
-		if (vie->rex_w)
-			size = 8;
 
 		/* get the first operand */
 		reg = gpr_map[vie->reg];
@@ -455,8 +600,9 @@ emulate_and(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 		 * AND mem (ModRM:r/m) with immediate and store the
 		 * result in mem.
 		 *
-		 * 81/          and r/m32, imm32
-		 * REX.W + 81/  and r/m64, imm32 sign-extended to 64
+		 * 81 /4		and r/m16, imm16
+		 * 81 /4		and r/m32, imm32
+		 * REX.W + 81 /4	and r/m64, imm32 sign-extended to 64
 		 *
 		 * Currently, only the AND operation of the 0x81 opcode
 		 * is implemented (ModRM:reg = b100).
@@ -464,9 +610,6 @@ emulate_and(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 		if ((vie->reg & 7) != 4)
 			break;
 
-		if (vie->rex_w)
-			size = 8;
-		
 		/* get the first operand */
                 error = memread(vm, vcpuid, gpa, &val1, size, arg);
                 if (error)
@@ -492,7 +635,7 @@ emulate_or(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 	int error, size;
 	uint64_t val1;
 
-	size = 4;
+	size = vie->opsize;
 	error = EINVAL;
 
 	switch (vie->op.op_byte) {
@@ -501,8 +644,9 @@ emulate_or(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 		 * OR mem (ModRM:r/m) with immediate and store the
 		 * result in mem.
 		 *
-		 * 83/          OR r/m32, imm8 sign-extended to 32
-		 * REX.W + 83/  OR r/m64, imm8 sign-extended to 64
+		 * 83 /1		OR r/m16, imm8 sign-extended to 16
+		 * 83 /1		OR r/m32, imm8 sign-extended to 32
+		 * REX.W + 83/1		OR r/m64, imm8 sign-extended to 64
 		 *
 		 * Currently, only the OR operation of the 0x83 opcode
 		 * is implemented (ModRM:reg = b001).
@@ -510,9 +654,6 @@ emulate_or(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 		if ((vie->reg & 7) != 1)
 			break;
 
-		if (vie->rex_w)
-			size = 8;
-		
 		/* get the first operand */
                 error = memread(vm, vcpuid, gpa, &val1, size, arg);
                 if (error)
@@ -531,10 +672,167 @@ emulate_or(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 	return (error);
 }
 
+#define	RFLAGS_STATUS_BITS    (PSL_C | PSL_PF | PSL_AF | PSL_Z | PSL_N | PSL_V)
+
+static int
+emulate_cmp(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
+	    mem_region_read_t memread, mem_region_write_t memwrite, void *arg)
+{
+	int error, size;
+	uint64_t op1, op2, rflags, rflags2;
+	enum vm_reg_name reg;
+
+	size = vie->opsize;
+	switch (vie->op.op_byte) {
+	case 0x3B:
+		/*
+		 * 3B/r		CMP r16, r/m16
+		 * 3B/r		CMP r32, r/m32
+		 * REX.W + 3B/r	CMP r64, r/m64
+		 *
+		 * Compare first operand (reg) with second operand (r/m) and
+		 * set status flags in EFLAGS register. The comparison is
+		 * performed by subtracting the second operand from the first
+		 * operand and then setting the status flags.
+		 */
+
+		/* Get the first operand */
+		reg = gpr_map[vie->reg];
+		error = vie_read_register(vm, vcpuid, reg, &op1);
+		if (error)
+			return (error);
+
+		/* Get the second operand */
+		error = memread(vm, vcpuid, gpa, &op2, size, arg);
+		if (error)
+			return (error);
+
+		break;
+	default:
+		return (EINVAL);
+	}
+	rflags2 = getcc(size, op1, op2);
+	error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, &rflags);
+	if (error)
+		return (error);
+	rflags &= ~RFLAGS_STATUS_BITS;
+	rflags |= rflags2 & RFLAGS_STATUS_BITS;
+
+	error = vie_update_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, rflags, 8);
+	return (error);
+}
+
+static int
+emulate_push(void *vm, int vcpuid, uint64_t mmio_gpa, struct vie *vie,
+    struct vm_guest_paging *paging, mem_region_read_t memread,
+    mem_region_write_t memwrite, void *arg)
+{
+#ifdef _KERNEL
+	struct vm_copyinfo copyinfo[2];
+#else
+	struct iovec copyinfo[2];
+#endif
+	struct seg_desc ss_desc;
+	uint64_t cr0, rflags, rsp, stack_gla, val;
+	int error, size, stackaddrsize;
+
+	/*
+	 * Table A-6, "Opcode Extensions", Intel SDM, Vol 2.
+	 *
+	 * PUSH is part of the group 5 extended opcodes and is identified
+	 * by ModRM:reg = b110.
+	 */
+	if ((vie->reg & 7) != 6)
+		return (EINVAL);
+
+	size = vie->opsize;
+	/*
+	 * From "Address-Size Attributes for Stack Accesses", Intel SDL, Vol 1
+	 */
+	if (paging->cpu_mode == CPU_MODE_REAL) {
+		stackaddrsize = 2;
+	} else if (paging->cpu_mode == CPU_MODE_64BIT) {
+		/*
+		 * "Stack Manipulation Instructions in 64-bit Mode", SDM, Vol 3
+		 * - Stack pointer size is always 64-bits.
+		 * - PUSH/POP of 32-bit values is not possible in 64-bit mode.
+		 * - 16-bit PUSH/POP is supported by using the operand size
+		 *   override prefix (66H).
+		 */
+		stackaddrsize = 8;
+		size = vie->opsize_override ? 2 : 8;
+	} else {
+		/*
+		 * In protected or compability mode the 'B' flag in the
+		 * stack-segment descriptor determines the size of the
+		 * stack pointer.
+		 */
+		error = vm_get_seg_desc(vm, vcpuid, VM_REG_GUEST_SS, &ss_desc);
+		KASSERT(error == 0, ("%s: error %d getting SS descriptor",
+		    __func__, error));
+		if (SEG_DESC_DEF32(ss_desc.access))
+			stackaddrsize = 4;
+		else
+			stackaddrsize = 2;
+	}
+
+	error = vie_read_register(vm, vcpuid, VM_REG_GUEST_CR0, &cr0);
+	KASSERT(error == 0, ("%s: error %d getting cr0", __func__, error));
+
+	error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, &rflags);
+	KASSERT(error == 0, ("%s: error %d getting rflags", __func__, error));
+
+	error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RSP, &rsp);
+	KASSERT(error == 0, ("%s: error %d getting rsp", __func__, error));
+
+	rsp -= size;
+	if (vie_calculate_gla(paging->cpu_mode, VM_REG_GUEST_SS, &ss_desc,
+	    rsp, size, stackaddrsize, PROT_WRITE, &stack_gla)) {
+		vm_inject_ss(vm, vcpuid, 0);
+		return (0);
+	}
+
+	if (vie_canonical_check(paging->cpu_mode, stack_gla)) {
+		vm_inject_ss(vm, vcpuid, 0);
+		return (0);
+	}
+
+	if (vie_alignment_check(paging->cpl, size, cr0, rflags, stack_gla)) {
+		vm_inject_ac(vm, vcpuid, 0);
+		return (0);
+	}
+
+	error = vm_copy_setup(vm, vcpuid, paging, stack_gla, size, PROT_WRITE,
+	    copyinfo, nitems(copyinfo));
+	if (error == -1) {
+		/*
+		 * XXX cannot return a negative error value here because it
+		 * ends up being the return value of the VM_RUN() ioctl and
+		 * is interpreted as a pseudo-error (for e.g. ERESTART).
+		 */
+		return (EFAULT);
+	} else if (error == 1) {
+		/* Resume guest execution to handle page fault */
+		return (0);
+	}
+
+	error = memread(vm, vcpuid, mmio_gpa, &val, size, arg);
+	if (error == 0) {
+		vm_copyout(vm, vcpuid, &val, copyinfo, size);
+		error = vie_update_register(vm, vcpuid, VM_REG_GUEST_RSP, rsp,
+		    stackaddrsize);
+		KASSERT(error == 0, ("error %d updating rsp", error));
+	}
+#ifdef _KERNEL
+	vm_copy_teardown(vm, vcpuid, copyinfo, nitems(copyinfo));
+#endif
+	return (error);
+}
+
 int
 vmm_emulate_instruction(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
-			mem_region_read_t memread, mem_region_write_t memwrite,
-			void *memarg)
+    struct vm_guest_paging *paging, mem_region_read_t memread,
+    mem_region_write_t memwrite, void *memarg)
 {
 	int error;
 
@@ -542,6 +840,14 @@ vmm_emulate_instruction(void *vm, int vcpuid, uint64_t gpa, struct vie *vie,
 		return (EINVAL);
 
 	switch (vie->op.op_type) {
+	case VIE_OP_TYPE_PUSH:
+		error = emulate_push(vm, vcpuid, gpa, vie, paging, memread,
+		    memwrite, memarg);
+		break;
+	case VIE_OP_TYPE_CMP:
+		error = emulate_cmp(vm, vcpuid, gpa, vie,
+				    memread, memwrite, memarg);
+		break;
 	case VIE_OP_TYPE_MOV:
 		error = emulate_mov(vm, vcpuid, gpa, vie,
 				    memread, memwrite, memarg);
@@ -612,7 +918,7 @@ vie_calculate_gla(enum vm_cpu_mode cpu_mode, enum vm_reg_name seg,
     struct seg_desc *desc, uint64_t offset, int length, int addrsize,
     int prot, uint64_t *gla)
 {
-	uint64_t low_limit, high_limit, segbase;
+	uint64_t firstoff, low_limit, high_limit, segbase;
 	int glasize, type;
 
 	KASSERT(seg >= VM_REG_GUEST_ES && seg <= VM_REG_GUEST_GS,
@@ -622,6 +928,7 @@ vie_calculate_gla(enum vm_cpu_mode cpu_mode, enum vm_reg_name seg,
 	KASSERT((prot & ~(PROT_READ | PROT_WRITE)) == 0,
 	    ("%s: invalid prot %#x", __func__, prot));
 
+	firstoff = offset;
 	if (cpu_mode == CPU_MODE_64BIT) {
 		KASSERT(addrsize == 4 || addrsize == 8, ("%s: invalid address "
 		    "size %d for cpu_mode %d", __func__, addrsize, cpu_mode));
@@ -635,7 +942,7 @@ vie_calculate_gla(enum vm_cpu_mode cpu_mode, enum vm_reg_name seg,
 		 * then the descriptor is unusable and attempting to use
 		 * it results in a #GP(0).
 		 */
-		if (SEG_DESC_UNUSABLE(desc))
+		if (SEG_DESC_UNUSABLE(desc->access))
 			return (-1);
 
 		/* 
@@ -644,13 +951,13 @@ vie_calculate_gla(enum vm_cpu_mode cpu_mode, enum vm_reg_name seg,
 		 * descriptor that is not present. If this was the case then
 		 * it would have been checked before the VM-exit.
 		 */
-		KASSERT(SEG_DESC_PRESENT(desc), ("segment %d not present: %#x",
-		    seg, desc->access));
+		KASSERT(SEG_DESC_PRESENT(desc->access),
+		    ("segment %d not present: %#x", seg, desc->access));
 
 		/*
 		 * The descriptor type must indicate a code/data segment.
 		 */
-		type = SEG_DESC_TYPE(desc);
+		type = SEG_DESC_TYPE(desc->access);
 		KASSERT(type >= 16 && type <= 31, ("segment %d has invalid "
 		    "descriptor type %#x", seg, type));
 
@@ -679,7 +986,8 @@ vie_calculate_gla(enum vm_cpu_mode cpu_mode, enum vm_reg_name seg,
 		if ((type & 0xC) == 0x4) {
 			/* expand-down data segment */
 			low_limit = desc->limit + 1;
-			high_limit = SEG_DESC_DEF32(desc) ? 0xffffffff : 0xffff;
+			high_limit = SEG_DESC_DEF32(desc->access) ?
+			    0xffffffff : 0xffff;
 		} else {
 			/* code segment or expand-up data segment */
 			low_limit = 0;
@@ -707,11 +1015,11 @@ vie_calculate_gla(enum vm_cpu_mode cpu_mode, enum vm_reg_name seg,
 	}
 
 	/*
-	 * Truncate 'offset' to the effective address size before adding
+	 * Truncate 'firstoff' to the effective address size before adding
 	 * it to the segment base.
 	 */
-	offset &= vie_size2mask(addrsize);
-	*gla = (segbase + offset) & vie_size2mask(glasize);
+	firstoff &= vie_size2mask(addrsize);
+	*gla = (segbase + firstoff) & vie_size2mask(glasize);
 	return (0);
 }
 
@@ -946,45 +1254,24 @@ vmm_gla2gpa(struct vm *vm, int vcpuid, struct vm_guest_paging *paging,
 }
 
 int
-vmm_fetch_instruction(struct vm *vm, int cpuid, struct vm_guest_paging *paging,
+vmm_fetch_instruction(struct vm *vm, int vcpuid, struct vm_guest_paging *paging,
     uint64_t rip, int inst_length, struct vie *vie)
 {
-	int n, error, prot;
-	uint64_t gpa, off;
-	void *hpa, *cookie;
+	struct vm_copyinfo copyinfo[2];
+	int error, prot;
 
-	/*
-	 * XXX cache previously fetched instructions using 'rip' as the tag
-	 */
-
-	prot = VM_PROT_READ | VM_PROT_EXECUTE;
 	if (inst_length > VIE_INST_SIZE)
 		panic("vmm_fetch_instruction: invalid length %d", inst_length);
 
-	/* Copy the instruction into 'vie' */
-	while (vie->num_valid < inst_length) {
-		error = vmm_gla2gpa(vm, cpuid, paging, rip, prot, &gpa);
-		if (error)
-			return (error);
-
-		off = gpa & PAGE_MASK;
-		n = min(inst_length - vie->num_valid, PAGE_SIZE - off);
-
-		if ((hpa = vm_gpa_hold(vm, gpa, n, prot, &cookie)) == NULL)
-			break;
-
-		bcopy(hpa, &vie->inst[vie->num_valid], n);
-
-		vm_gpa_release(cookie);
-
-		rip += n;
-		vie->num_valid += n;
+	prot = PROT_READ | PROT_EXEC;
+	error = vm_copy_setup(vm, vcpuid, paging, rip, inst_length, prot,
+	    copyinfo, nitems(copyinfo));
+	if (error == 0) {
+		vm_copyin(vm, vcpuid, copyinfo, vie->inst, inst_length);
+		vm_copy_teardown(vm, vcpuid, copyinfo, nitems(copyinfo));
+		vie->num_valid = inst_length;
 	}
-
-	if (vie->num_valid == inst_length)
-		return (0);
-	else
-		return (-1);
+	return (error);
 }
 
 static int
@@ -1006,24 +1293,65 @@ vie_advance(struct vie *vie)
 }
 
 static int
-decode_rex(struct vie *vie)
+decode_prefixes(struct vie *vie, enum vm_cpu_mode cpu_mode, int cs_d)
 {
 	uint8_t x;
 
-	if (vie_peek(vie, &x))
-		return (-1);
+	while (1) {
+		if (vie_peek(vie, &x))
+			return (-1);
 
-	if (x >= 0x40 && x <= 0x4F) {
-		vie->rex_present = 1;
-
-		vie->rex_w = x & 0x8 ? 1 : 0;
-		vie->rex_r = x & 0x4 ? 1 : 0;
-		vie->rex_x = x & 0x2 ? 1 : 0;
-		vie->rex_b = x & 0x1 ? 1 : 0;
+		if (x == 0x66)
+			vie->opsize_override = 1;
+		else if (x == 0x67)
+			vie->addrsize_override = 1;
+		else
+			break;
 
 		vie_advance(vie);
 	}
 
+	/*
+	 * From section 2.2.1, "REX Prefixes", Intel SDM Vol 2:
+	 * - Only one REX prefix is allowed per instruction.
+	 * - The REX prefix must immediately precede the opcode byte or the
+	 *   escape opcode byte.
+	 * - If an instruction has a mandatory prefix (0x66, 0xF2 or 0xF3)
+	 *   the mandatory prefix must come before the REX prefix.
+	 */
+	if (cpu_mode == CPU_MODE_64BIT && x >= 0x40 && x <= 0x4F) {
+		vie->rex_present = 1;
+		vie->rex_w = x & 0x8 ? 1 : 0;
+		vie->rex_r = x & 0x4 ? 1 : 0;
+		vie->rex_x = x & 0x2 ? 1 : 0;
+		vie->rex_b = x & 0x1 ? 1 : 0;
+		vie_advance(vie);
+	}
+
+	/*
+	 * Section "Operand-Size And Address-Size Attributes", Intel SDM, Vol 1
+	 */
+	if (cpu_mode == CPU_MODE_64BIT) {
+		/*
+		 * Default address size is 64-bits and default operand size
+		 * is 32-bits.
+		 */
+		vie->addrsize = vie->addrsize_override ? 4 : 8;
+		if (vie->rex_w)
+			vie->opsize = 8;
+		else if (vie->opsize_override)
+			vie->opsize = 2;
+		else
+			vie->opsize = 4;
+	} else if (cs_d) {
+		/* Default address and operand sizes are 32-bits */
+		vie->addrsize = vie->addrsize_override ? 2 : 4;
+		vie->opsize = vie->opsize_override ? 2 : 4;
+	} else {
+		/* Default address and operand sizes are 16-bits */
+		vie->addrsize = vie->addrsize_override ? 4 : 2;
+		vie->opsize = vie->opsize_override ? 4 : 2;
+	}
 	return (0);
 }
 
@@ -1070,6 +1398,12 @@ decode_modrm(struct vie *vie, enum vm_cpu_mode cpu_mode)
 {
 	uint8_t x;
 
+	if (cpu_mode == CPU_MODE_REAL)
+		return (-1);
+
+	if (vie->op.op_flags & VIE_OP_F_NO_MODRM)
+		return (0);
+
 	if (vie_peek(vie, &x))
 		return (-1);
 
@@ -1248,20 +1582,32 @@ decode_immediate(struct vie *vie)
 	union {
 		char	buf[4];
 		int8_t	signed8;
+		int16_t	signed16;
 		int32_t	signed32;
 	} u;
 
 	/* Figure out immediate operand size (if any) */
-	if (vie->op.op_flags & VIE_OP_F_IMM)
-		vie->imm_bytes = 4;
-	else if (vie->op.op_flags & VIE_OP_F_IMM8)
+	if (vie->op.op_flags & VIE_OP_F_IMM) {
+		/*
+		 * Section 2.2.1.5 "Immediates", Intel SDM:
+		 * In 64-bit mode the typical size of immediate operands
+		 * remains 32-bits. When the operand size if 64-bits, the
+		 * processor sign-extends all immediates to 64-bits prior
+		 * to their use.
+		 */
+		if (vie->opsize == 4 || vie->opsize == 8)
+			vie->imm_bytes = 4;
+		else
+			vie->imm_bytes = 2;
+	} else if (vie->op.op_flags & VIE_OP_F_IMM8) {
 		vie->imm_bytes = 1;
+	}
 
 	if ((n = vie->imm_bytes) == 0)
 		return (0);
 
-	if (n != 1 && n != 4)
-		panic("decode_immediate: invalid imm_bytes %d", n);
+	KASSERT(n == 1 || n == 2 || n == 4,
+	    ("%s: invalid number of immediate bytes: %d", __func__, n));
 
 	for (i = 0; i < n; i++) {
 		if (vie_peek(vie, &x))
@@ -1270,12 +1616,47 @@ decode_immediate(struct vie *vie)
 		u.buf[i] = x;
 		vie_advance(vie);
 	}
-	
-	if (n == 1)
-		vie->immediate = u.signed8;		/* sign-extended */
-	else
-		vie->immediate = u.signed32;		/* sign-extended */
 
+	/* sign-extend the immediate value before use */
+	if (n == 1)
+		vie->immediate = u.signed8;
+	else if (n == 2)
+		vie->immediate = u.signed16;
+	else
+		vie->immediate = u.signed32;
+
+	return (0);
+}
+
+static int
+decode_moffset(struct vie *vie)
+{
+	int i, n;
+	uint8_t x;
+	union {
+		char	buf[8];
+		uint64_t u64;
+	} u;
+
+	if ((vie->op.op_flags & VIE_OP_F_MOFFSET) == 0)
+		return (0);
+
+	/*
+	 * Section 2.2.1.4, "Direct Memory-Offset MOVs", Intel SDM:
+	 * The memory offset size follows the address-size of the instruction.
+	 */
+	n = vie->addrsize;
+	KASSERT(n == 2 || n == 4 || n == 8, ("invalid moffset bytes: %d", n));
+
+	u.u64 = 0;
+	for (i = 0; i < n; i++) {
+		if (vie_peek(vie, &x))
+			return (-1);
+
+		u.buf[i] = x;
+		vie_advance(vie);
+	}
+	vie->displacement = u.u64;
 	return (0);
 }
 
@@ -1300,7 +1681,7 @@ static int
 verify_gla(struct vm *vm, int cpuid, uint64_t gla, struct vie *vie)
 {
 	int error;
-	uint64_t base, idx;
+	uint64_t base, idx, gla2;
 
 	/* Skip 'gla' verification */
 	if (gla == VIE_INVALID_GLA)
@@ -1333,11 +1714,14 @@ verify_gla(struct vm *vm, int cpuid, uint64_t gla, struct vie *vie)
 		}
 	}
 
-	if (base + vie->scale * idx + vie->displacement != gla) {
+	/* XXX assuming that the base address of the segment is 0 */
+	gla2 = base + vie->scale * idx + vie->displacement;
+	gla2 &= size2mask[vie->addrsize];
+	if (gla != gla2) {
 		printf("verify_gla mismatch: "
 		       "base(0x%0lx), scale(%d), index(0x%0lx), "
-		       "disp(0x%0lx), gla(0x%0lx)\n",
-		       base, vie->scale, idx, vie->displacement, gla);
+		       "disp(0x%0lx), gla(0x%0lx), gla2(0x%0lx)\n",
+		       base, vie->scale, idx, vie->displacement, gla, gla2);
 		return (-1);
 	}
 
@@ -1346,13 +1730,11 @@ verify_gla(struct vm *vm, int cpuid, uint64_t gla, struct vie *vie)
 
 int
 vmm_decode_instruction(struct vm *vm, int cpuid, uint64_t gla,
-		       enum vm_cpu_mode cpu_mode, struct vie *vie)
+		       enum vm_cpu_mode cpu_mode, int cs_d, struct vie *vie)
 {
 
-	if (cpu_mode == CPU_MODE_64BIT) {
-		if (decode_rex(vie))
-			return (-1);
-	}
+	if (decode_prefixes(vie, cpu_mode, cs_d))
+		return (-1);
 
 	if (decode_opcode(vie))
 		return (-1);
@@ -1365,10 +1747,13 @@ vmm_decode_instruction(struct vm *vm, int cpuid, uint64_t gla,
 
 	if (decode_displacement(vie))
 		return (-1);
-	
+
 	if (decode_immediate(vie))
 		return (-1);
 
+	if (decode_moffset(vie))
+		return (-1);
+
 	if (verify_inst_length(vie))
 		return (-1);
 
diff --git a/sys/amd64/vmm/vmm_stat.c b/sys/amd64/vmm/vmm_stat.c
index ef9f41173fee..9ecf9afd8a81 100644
--- a/sys/amd64/vmm/vmm_stat.c
+++ b/sys/amd64/vmm/vmm_stat.c
@@ -83,12 +83,21 @@ vmm_stat_register(void *arg)
 int
 vmm_stat_copy(struct vm *vm, int vcpu, int *num_stats, uint64_t *buf)
 {
-	int i;
+	struct vmm_stat_type *vst;
 	uint64_t *stats;
+	int i;
 
 	if (vcpu < 0 || vcpu >= VM_MAXCPU)
 		return (EINVAL);
-		
+
+	/* Let stats functions update their counters */
+	for (i = 0; i < vst_num_types; i++) {
+		vst = vsttab[i];
+		if (vst->func != NULL)
+			(*vst->func)(vm, vcpu, vst);
+	}
+
+	/* Copy over the stats */
 	stats = vcpu_stats(vm, vcpu);
 	for (i = 0; i < vst_num_elems; i++)
 		buf[i] = stats[i];
diff --git a/sys/amd64/vmm/vmm_stat.h b/sys/amd64/vmm/vmm_stat.h
index 6e98965ac270..1640ba37e025 100644
--- a/sys/amd64/vmm/vmm_stat.h
+++ b/sys/amd64/vmm/vmm_stat.h
@@ -42,21 +42,29 @@ enum vmm_stat_scope {
 	VMM_STAT_SCOPE_AMD,		/* AMD SVM specific statistic */
 };
 
+struct vmm_stat_type;
+typedef void (*vmm_stat_func_t)(struct vm *vm, int vcpu,
+    struct vmm_stat_type *stat);
+
 struct vmm_stat_type {
 	int	index;			/* position in the stats buffer */
 	int	nelems;			/* standalone or array */
 	const char *desc;		/* description of statistic */
+	vmm_stat_func_t func;
 	enum vmm_stat_scope scope;
 };
 
 void	vmm_stat_register(void *arg);
 
-#define	VMM_STAT_DEFINE(type, nelems, desc, scope)			\
+#define	VMM_STAT_FDEFINE(type, nelems, desc, func, scope)		\
 	struct vmm_stat_type type[1] = {				\
-		{ -1, nelems, desc, scope }				\
+		{ -1, nelems, desc, func, scope }			\
 	};								\
 	SYSINIT(type##_stat, SI_SUB_KLD, SI_ORDER_ANY, vmm_stat_register, type)
 
+#define VMM_STAT_DEFINE(type, nelems, desc, scope) 			\
+	VMM_STAT_FDEFINE(type, nelems, desc, NULL, scope)
+
 #define	VMM_STAT_DECLARE(type)						\
 	extern struct vmm_stat_type type[1]
 
@@ -67,6 +75,9 @@ void	vmm_stat_register(void *arg);
 #define	VMM_STAT_AMD(type, desc)	\
 	VMM_STAT_DEFINE(type, 1, desc, VMM_STAT_SCOPE_AMD)
 
+#define	VMM_STAT_FUNC(type, desc, func)	\
+	VMM_STAT_FDEFINE(type, 1, desc, func, VMM_STAT_SCOPE_ANY)
+
 #define	VMM_STAT_ARRAY(type, nelems, desc)	\
 	VMM_STAT_DEFINE(type, nelems, desc, VMM_STAT_SCOPE_ANY)
 
@@ -93,8 +104,21 @@ vmm_stat_array_incr(struct vm *vm, int vcpu, struct vmm_stat_type *vst,
 		stats[vst->index + statidx] += x;
 #endif
 }
-		   
 
+static void __inline
+vmm_stat_array_set(struct vm *vm, int vcpu, struct vmm_stat_type *vst,
+		   int statidx, uint64_t val)
+{
+#ifdef VMM_KEEP_STATS
+	uint64_t *stats;
+	
+	stats = vcpu_stats(vm, vcpu);
+
+	if (vst->index >= 0 && statidx < vst->nelems)
+		stats[vst->index + statidx] = val;
+#endif
+}
+		   
 static void __inline
 vmm_stat_incr(struct vm *vm, int vcpu, struct vmm_stat_type *vst, uint64_t x)
 {
@@ -104,6 +128,15 @@ vmm_stat_incr(struct vm *vm, int vcpu, struct vmm_stat_type *vst, uint64_t x)
 #endif
 }
 
+static void __inline
+vmm_stat_set(struct vm *vm, int vcpu, struct vmm_stat_type *vst, uint64_t val)
+{
+
+#ifdef VMM_KEEP_STATS
+	vmm_stat_array_set(vm, vcpu, vst, 0, val);
+#endif
+}
+
 VMM_STAT_DECLARE(VCPU_MIGRATIONS);
 VMM_STAT_DECLARE(VMEXIT_COUNT);
 VMM_STAT_DECLARE(VMEXIT_EXTINT);
diff --git a/sys/arm/arm/busdma_machdep-v6.c b/sys/arm/arm/busdma_machdep-v6.c
index 6cbcae439c59..b6df3def8931 100644
--- a/sys/arm/arm/busdma_machdep-v6.c
+++ b/sys/arm/arm/busdma_machdep-v6.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/bus.h>
 #include <sys/busdma_bufalloc.h>
+#include <sys/counter.h>
 #include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
@@ -64,7 +65,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 
 #define MAX_BPAGES 64
-#define BUS_DMA_COULD_BOUNCE	BUS_DMA_BUS3
+#define MAX_DMA_SEGMENTS	4096
+#define BUS_DMA_EXCL_BOUNCE	BUS_DMA_BUS2
+#define BUS_DMA_ALIGN_BOUNCE	BUS_DMA_BUS3
+#define BUS_DMA_COULD_BOUNCE	(BUS_DMA_EXCL_BOUNCE | BUS_DMA_ALIGN_BOUNCE)
 #define BUS_DMA_MIN_ALLOC_COMP	BUS_DMA_BUS4
 
 struct bounce_zone;
@@ -94,15 +98,6 @@ struct bus_dma_tag {
 	 */
 	struct arm32_dma_range	*ranges;
 	int			_nranges;
-	/*
-	 * Most tags need one or two segments, and can use the local tagsegs
-	 * array.  For tags with a larger limit, we'll allocate a bigger array
-	 * on first use.
-	 */
-	bus_dma_segment_t	*segments;
-	bus_dma_segment_t	tagsegs[2];
-
-
 };
 
 struct bounce_page {
@@ -143,11 +138,42 @@ struct bounce_zone {
 static struct mtx bounce_lock;
 static int total_bpages;
 static int busdma_zonecount;
+static uint32_t tags_total;
+static uint32_t maps_total;
+static uint32_t maps_dmamem;
+static uint32_t maps_coherent;
+static counter_u64_t maploads_total;
+static counter_u64_t maploads_bounced;
+static counter_u64_t maploads_coherent;
+static counter_u64_t maploads_dmamem;
+static counter_u64_t maploads_mbuf;
+static counter_u64_t maploads_physmem;
+
 static STAILQ_HEAD(, bounce_zone) bounce_zone_list;
 
 SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD, 0, "Busdma parameters");
+SYSCTL_UINT(_hw_busdma, OID_AUTO, tags_total, CTLFLAG_RD, &tags_total, 0,
+   "Number of active tags");
+SYSCTL_UINT(_hw_busdma, OID_AUTO, maps_total, CTLFLAG_RD, &maps_total, 0,
+   "Number of active maps");
+SYSCTL_UINT(_hw_busdma, OID_AUTO, maps_dmamem, CTLFLAG_RD, &maps_dmamem, 0,
+   "Number of active maps for bus_dmamem_alloc buffers");
+SYSCTL_UINT(_hw_busdma, OID_AUTO, maps_coherent, CTLFLAG_RD, &maps_coherent, 0,
+   "Number of active maps with BUS_DMA_COHERENT flag set");
+SYSCTL_COUNTER_U64(_hw_busdma, OID_AUTO, maploads_total, CTLFLAG_RD, 
+    &maploads_total, "Number of load operations performed");
+SYSCTL_COUNTER_U64(_hw_busdma, OID_AUTO, maploads_bounced, CTLFLAG_RD,
+    &maploads_bounced, "Number of load operations that used bounce buffers");
+SYSCTL_COUNTER_U64(_hw_busdma, OID_AUTO, maploads_coherent, CTLFLAG_RD,
+    &maploads_dmamem, "Number of load operations on BUS_DMA_COHERENT memory");
+SYSCTL_COUNTER_U64(_hw_busdma, OID_AUTO, maploads_dmamem, CTLFLAG_RD,
+    &maploads_dmamem, "Number of load operations on bus_dmamem_alloc buffers");
+SYSCTL_COUNTER_U64(_hw_busdma, OID_AUTO, maploads_mbuf, CTLFLAG_RD,
+    &maploads_mbuf, "Number of load operations for mbufs");
+SYSCTL_COUNTER_U64(_hw_busdma, OID_AUTO, maploads_physmem, CTLFLAG_RD,
+    &maploads_physmem, "Number of load operations on physical buffers");
 SYSCTL_INT(_hw_busdma, OID_AUTO, total_bpages, CTLFLAG_RD, &total_bpages, 0,
-	   "Total bounce pages");
+   "Total bounce pages");
 
 struct bus_dmamap {
 	struct bp_list	       bpages;
@@ -160,7 +186,10 @@ struct bus_dmamap {
 	void		      *callback_arg;
 	int		      flags;
 #define DMAMAP_COHERENT		(1 << 0)
+#define DMAMAP_DMAMEM_ALLOC	(1 << 1)
+#define DMAMAP_MBUF		(1 << 2)
 	STAILQ_ENTRY(bus_dmamap) links;
+	bus_dma_segment_t	*segments;
 	int		       sync_count;
 	struct sync_list       slist[];
 };
@@ -177,7 +206,6 @@ 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, bus_size_t size, int coherent);
 static void _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
     void *buf, bus_size_t buflen, int flags);
 static void _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
@@ -192,6 +220,13 @@ busdma_init(void *dummy)
 {
 	int uma_flags;
 
+	maploads_total    = counter_u64_alloc(M_WAITOK);
+	maploads_bounced  = counter_u64_alloc(M_WAITOK);
+	maploads_coherent = counter_u64_alloc(M_WAITOK);
+	maploads_dmamem   = counter_u64_alloc(M_WAITOK);
+	maploads_mbuf     = counter_u64_alloc(M_WAITOK);
+	maploads_physmem  = counter_u64_alloc(M_WAITOK);
+
 	uma_flags = 0;
 
 	/* Create a cache of buffers in standard (cacheable) memory. */
@@ -223,25 +258,143 @@ busdma_init(void *dummy)
 
 /*
  * This init historically used SI_SUB_VM, but now the init code requires
- * malloc(9) using M_DEVBUF memory, which is set up later than SI_SUB_VM, by
- * SI_SUB_KMEM and SI_ORDER_SECOND, so we'll go right after that by using
- * SI_SUB_KMEM and SI_ORDER_THIRD.
+ * malloc(9) using M_DEVBUF memory and the pcpu zones for counter(9), which get
+ * set up by SI_SUB_KMEM and SI_ORDER_LAST, so we'll go right after that by
+ * using SI_SUB_KMEM+1.
  */
-SYSINIT(busdma, SI_SUB_KMEM, SI_ORDER_THIRD, busdma_init, NULL);
+SYSINIT(busdma, SI_SUB_KMEM+1, SI_ORDER_FIRST, busdma_init, NULL);
 
-static __inline int
-_bus_dma_can_bounce(vm_offset_t lowaddr, vm_offset_t highaddr)
+/*
+ * This routine checks the exclusion zone constraints from a tag against the
+ * physical RAM available on the machine.  If a tag specifies an exclusion zone
+ * but there's no RAM in that zone, then we avoid allocating resources to bounce
+ * a request, and we can use any memory allocator (as opposed to needing
+ * kmem_alloc_contig() just because it can allocate pages in an address range).
+ *
+ * Most tags have BUS_SPACE_MAXADDR or BUS_SPACE_MAXADDR_32BIT (they are the
+ * same value on 32-bit architectures) as their lowaddr constraint, and we can't
+ * possibly have RAM at an address higher than the highest address we can
+ * express, so we take a fast out.
+ */
+static int
+exclusion_bounce_check(vm_offset_t lowaddr, vm_offset_t highaddr)
 {
 	int i;
+
+	if (lowaddr >= BUS_SPACE_MAXADDR)
+		return (0);
+
 	for (i = 0; phys_avail[i] && phys_avail[i + 1]; i += 2) {
-		if ((lowaddr >= phys_avail[i] && lowaddr <= phys_avail[i + 1])
-		    || (lowaddr < phys_avail[i] &&
-		    highaddr > phys_avail[i]))
+		if ((lowaddr >= phys_avail[i] && lowaddr < phys_avail[i + 1]) ||
+		    (lowaddr < phys_avail[i] && highaddr >= phys_avail[i]))
 			return (1);
 	}
 	return (0);
 }
 
+/*
+ * Return true if the tag has an exclusion zone that could lead to bouncing.
+ */
+static __inline int
+exclusion_bounce(bus_dma_tag_t dmat)
+{
+
+	return (dmat->flags & BUS_DMA_EXCL_BOUNCE);
+}
+
+/*
+ * Return true if the given address does not fall on the alignment boundary.
+ */
+static __inline int
+alignment_bounce(bus_dma_tag_t dmat, bus_addr_t addr)
+{
+
+	return (addr & (dmat->alignment - 1));
+}
+
+/*
+ * Return true if the DMA should bounce because the start or end does not fall
+ * on a cacheline boundary (which would require a partial cacheline flush).
+ * COHERENT memory doesn't trigger cacheline flushes.  Memory allocated by
+ * bus_dmamem_alloc() is always aligned to cacheline boundaries, and there's a
+ * strict rule that such memory cannot be accessed by the CPU while DMA is in
+ * progress (or by multiple DMA engines at once), so that it's always safe to do
+ * full cacheline flushes even if that affects memory outside the range of a
+ * given DMA operation that doesn't involve the full allocated buffer.  If we're
+ * mapping an mbuf, that follows the same rules as a buffer we allocated.
+ */
+static __inline int
+cacheline_bounce(bus_dmamap_t map, bus_addr_t addr, bus_size_t size)
+{
+
+	if (map->flags & (DMAMAP_DMAMEM_ALLOC | DMAMAP_COHERENT | DMAMAP_MBUF))
+		return (0);
+	return ((addr | size) & arm_dcache_align_mask);
+}
+
+/*
+ * Return true if we might need to bounce the DMA described by addr and size.
+ *
+ * This is used to quick-check whether we need to do the more expensive work of
+ * checking the DMA page-by-page looking for alignment and exclusion bounces.
+ *
+ * Note that the addr argument might be either virtual or physical.  It doesn't
+ * matter because we only look at the low-order bits, which are the same in both
+ * address spaces.
+ */
+static __inline int
+might_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t addr, 
+    bus_size_t size)
+{
+	return ((dmat->flags & BUS_DMA_EXCL_BOUNCE) ||
+	    alignment_bounce(dmat, addr) ||
+	    cacheline_bounce(map, addr, size));
+}
+
+/*
+ * Return true if we must bounce the DMA described by paddr and size.
+ *
+ * Bouncing can be triggered by DMA that doesn't begin and end on cacheline
+ * boundaries, or doesn't begin on an alignment boundary, or falls within the
+ * exclusion zone of any tag in the ancestry chain.
+ *
+ * For exclusions, walk the chain of tags comparing paddr to the exclusion zone
+ * within each tag.  If the tag has a filter function, use it to decide whether
+ * the DMA needs to bounce, otherwise any DMA within the zone bounces.
+ */
+static int
+must_bounce(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t paddr, 
+    bus_size_t size)
+{
+
+	if (cacheline_bounce(map, paddr, size))
+		return (1);
+
+	/*
+	 *  The tag already contains ancestors' alignment restrictions so this
+	 *  check doesn't need to be inside the loop.
+	 */
+	if (alignment_bounce(dmat, paddr))
+		return (1);
+
+	/*
+	 * Even though each tag has an exclusion zone that is a superset of its
+	 * own and all its ancestors' exclusions, the exclusion zone of each tag
+	 * up the chain must be checked within the loop, because the busdma
+	 * rules say the filter function is called only when the address lies
+	 * within the low-highaddr range of the tag that filterfunc belongs to.
+	 */
+	while (dmat != NULL && exclusion_bounce(dmat)) {
+		if ((paddr >= dmat->lowaddr && paddr <= dmat->highaddr) &&
+		    (dmat->filter == NULL || 
+		    dmat->filter(dmat->filterarg, paddr) != 0))
+			return (1);
+		dmat = dmat->parent;
+	} 
+
+	return (0);
+}
+
 static __inline struct arm32_dma_range *
 _bus_dma_inrange(struct arm32_dma_range *ranges, int nranges,
     bus_addr_t curaddr)
@@ -258,35 +411,6 @@ _bus_dma_inrange(struct arm32_dma_range *ranges, int nranges,
 	return (NULL);
 }
 
-/*
- * 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, bus_size_t size, int coherent)
-{
-	int retval;
-
-	retval = 0;
-
-	do {
-		if (((paddr > dmat->lowaddr && paddr <= dmat->highaddr)
-		 || ((paddr & (dmat->alignment - 1)) != 0) ||
-		 (!coherent && (size & arm_dcache_align_mask)) ||
-		 (!coherent && (paddr & arm_dcache_align_mask)))
-		 && (dmat->filter == NULL
-		  || (*dmat->filter)(dmat->filterarg, paddr) != 0))
-			retval = 1;
-
-		dmat = dmat->parent;
-	} while (retval == 0 && dmat != NULL);
-	return (retval);
-}
-
 /*
  * Convenience function for manipulating driver locks from busdma (during
  * busdma_swi, for example).  Drivers that don't provide their own locks
@@ -384,34 +508,21 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
 		newtag->lockfunc = dflt_lock;
 		newtag->lockfuncarg = NULL;
 	}
-	/*
-	 * If all the segments we need fit into the local tagsegs array, set the
-	 * pointer now.  Otherwise NULL the pointer and an array of segments
-	 * will be allocated later, on first use.  We don't pre-allocate now
-	 * because some tags exist just to pass contraints to children in the
-	 * device hierarchy, and they tend to use BUS_SPACE_UNRESTRICTED and we
-	 * sure don't want to try to allocate an array for that.
-	 */
-	if (newtag->nsegments <= nitems(newtag->tagsegs))
-		newtag->segments = newtag->tagsegs;
-	else
-		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);
+		newtag->alignment = MAX(parent->alignment, newtag->alignment);
+		newtag->flags |= parent->flags & BUS_DMA_COULD_BOUNCE;
 		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
+			 * Short circuit to looking at our parent directly
 			 * since we have encapsulated all of its information
 			 */
 			newtag->filter = parent->filter;
@@ -422,9 +533,10 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
 			atomic_add_int(&parent->ref_count, 1);
 	}
 
-	if (_bus_dma_can_bounce(newtag->lowaddr, newtag->highaddr)
-	 || newtag->alignment > 1)
-		newtag->flags |= BUS_DMA_COULD_BOUNCE;
+	if (exclusion_bounce_check(newtag->lowaddr, newtag->highaddr))
+		newtag->flags |= BUS_DMA_EXCL_BOUNCE;
+	if (alignment_bounce(newtag, 1))
+		newtag->flags |= BUS_DMA_ALIGN_BOUNCE;
 
 	/*
 	 * Any request can auto-bounce due to cacheline alignment, in addition
@@ -463,6 +575,7 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
 	if (error != 0) {
 		free(newtag, M_DEVBUF);
 	} else {
+		atomic_add_32(&tags_total, 1);
 		*dmat = newtag;
 	}
 	CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
@@ -492,9 +605,7 @@ bus_dma_tag_destroy(bus_dma_tag_t dmat)
 			parent = dmat->parent;
 			atomic_subtract_int(&dmat->ref_count, 1);
 			if (dmat->ref_count == 0) {
-				if (dmat->segments != NULL &&
-				    dmat->segments != dmat->tagsegs)
-					free(dmat->segments, M_DEVBUF);
+				atomic_subtract_32(&tags_total, 1);
 				free(dmat, M_DEVBUF);
 				/*
 				 * Last reference count, so
@@ -534,8 +645,8 @@ static int allocate_bz_and_pages(bus_dma_tag_t dmat, bus_dmamap_t mapp)
 		maxpages = MAX_BPAGES;
 	else
 		maxpages = 2 * bz->map_count;
-	if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0
-	    || (bz->map_count > 0 && bz->total_bpages < maxpages)) {
+	if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0 ||
+	    (bz->map_count > 0 && bz->total_bpages < maxpages)) {
 		int pages;
 		
 		pages = atop(roundup2(dmat->maxsize, PAGE_SIZE)) + 1;
@@ -551,6 +662,31 @@ static int allocate_bz_and_pages(bus_dma_tag_t dmat, bus_dmamap_t mapp)
 	return (0);
 }
 
+static bus_dmamap_t
+allocate_map(bus_dma_tag_t dmat, int mflags)
+{
+	int mapsize, segsize;
+	bus_dmamap_t map;
+
+	/*
+	 * Allocate the map.  The map structure ends with an embedded
+	 * variable-sized array of sync_list structures.  Following that
+	 * we allocate enough extra space to hold the array of bus_dma_segments.
+	 */
+	KASSERT(dmat->nsegments <= MAX_DMA_SEGMENTS, 
+	   ("cannot allocate %u dma segments (max is %u)",
+	    dmat->nsegments, MAX_DMA_SEGMENTS));
+	segsize = sizeof(struct bus_dma_segment) * dmat->nsegments;
+	mapsize = sizeof(*map) + sizeof(struct sync_list) * dmat->nsegments;
+	map = malloc(mapsize + segsize, M_DEVBUF, mflags | M_ZERO);
+	if (map == NULL) {
+		CTR3(KTR_BUSDMA, "%s: tag %p error %d", __func__, dmat, ENOMEM);
+		return (NULL);
+	}
+	map->segments = (bus_dma_segment_t *)((uintptr_t)map + mapsize);
+	return (map);
+}
+
 /*
  * Allocate a handle for mapping from kva/uva/physical
  * address space into bus device space.
@@ -558,41 +694,32 @@ static int allocate_bz_and_pages(bus_dma_tag_t dmat, bus_dmamap_t mapp)
 int
 bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
 {
-	int mapsize;
+	bus_dmamap_t map;
 	int error = 0;
 
-	mapsize = sizeof(**mapp) + (sizeof(struct sync_list) * dmat->nsegments);
-	*mapp = (bus_dmamap_t)malloc(mapsize, M_DEVBUF, M_NOWAIT | M_ZERO);
-	if (*mapp == NULL) {
+	*mapp = map = allocate_map(dmat, M_NOWAIT);
+	if (map == NULL) {
 		CTR3(KTR_BUSDMA, "%s: tag %p error %d", __func__, dmat, ENOMEM);
 		return (ENOMEM);
 	}
-	(*mapp)->sync_count = 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);
-			free(*mapp, M_DEVBUF);
-			*mapp = NULL;
-			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.
+	 * Bouncing might be required if the driver asks for an exclusion
+	 * region, a data alignment that is stricter than 1, or DMA that begins
+	 * or ends with a partial cacheline.  Whether bouncing will actually
+	 * happen can't be known until mapping time, but we need to pre-allocate
+	 * resources now because we might not be allowed to at mapping time.
 	 */
-	error = allocate_bz_and_pages(dmat, *mapp);
+	error = allocate_bz_and_pages(dmat, map);
 	if (error != 0) {
-		free(*mapp, M_DEVBUF);
+		free(map, M_DEVBUF);
 		*mapp = NULL;
 		return (error);
 	}
-	return (error);
+	if (map->flags & DMAMAP_COHERENT)
+		atomic_add_32(&maps_coherent, 1);
+	atomic_add_32(&maps_total, 1);
+	return (0);
 }
 
 /*
@@ -609,6 +736,9 @@ bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map)
 	}
 	if (dmat->bounce_zone)
 		dmat->bounce_zone->map_count--;
+	if (map->flags & DMAMAP_COHERENT)
+		atomic_subtract_32(&maps_coherent, 1);
+	atomic_subtract_32(&maps_total, 1);
 	free(map, M_DEVBUF);
 	dmat->map_count--;
 	CTR2(KTR_BUSDMA, "%s: tag %p error 0", __func__, dmat);
@@ -627,58 +757,33 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 {
 	busdma_bufalloc_t ba;
 	struct busdma_bufzone *bufzone;
+	bus_dmamap_t map;
 	vm_memattr_t memattr;
 	int mflags;
-	int mapsize;
-	int error;
 
 	if (flags & BUS_DMA_NOWAIT)
 		mflags = M_NOWAIT;
 	else
 		mflags = M_WAITOK;
+	if (flags & BUS_DMA_ZERO)
+		mflags |= M_ZERO;
 
-	/* ARM non-snooping caches need a map for the VA cache sync structure */
-
-	mapsize = sizeof(**mapp) + (sizeof(struct sync_list) * dmat->nsegments);
-	*mapp = (bus_dmamap_t)malloc(mapsize, M_DEVBUF, M_NOWAIT | M_ZERO);
-	if (*mapp == NULL) {
+	*mapp = map = allocate_map(dmat, mflags);
+	if (map == NULL) {
 		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 		    __func__, dmat, dmat->flags, ENOMEM);
 		return (ENOMEM);
 	}
+	map->flags = DMAMAP_DMAMEM_ALLOC;
 
-	(*mapp)->sync_count = 0;
-	/* We may need bounce pages, even for allocated memory */
-	error = allocate_bz_and_pages(dmat, *mapp);
-	if (error != 0) {
-		free(*mapp, M_DEVBUF);
-		*mapp = NULL;
-		return (error);
-	}
-
-	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);
-			free(*mapp, M_DEVBUF);
-			*mapp = NULL;
-			return (ENOMEM);
-		}
-	}
-
-	if (flags & BUS_DMA_ZERO)
-		mflags |= M_ZERO;
+	/* Choose a busdma buffer allocator based on memory type flags. */
 	if (flags & BUS_DMA_COHERENT) {
 		memattr = VM_MEMATTR_UNCACHEABLE;
 		ba = coherent_allocator;
-		(*mapp)->flags |= DMAMAP_COHERENT;
+		map->flags |= DMAMAP_COHERENT;
 	} else {
 		memattr = VM_MEMATTR_DEFAULT;
 		ba = standard_allocator;
-		(*mapp)->flags = 0;
 	}
 
 	/*
@@ -702,7 +807,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 	 * constraints is something that only the contig allocator can fulfill.
 	 */
 	if (bufzone != NULL && dmat->alignment <= bufzone->size &&
-	    !_bus_dma_can_bounce(dmat->lowaddr, dmat->highaddr)) {
+	    !exclusion_bounce(dmat)) {
 		*vaddr = uma_zalloc(bufzone->umazone, mflags);
 	} else if (dmat->nsegments >= btoc(dmat->maxsize) &&
 	    dmat->alignment <= PAGE_SIZE && dmat->boundary == 0) {
@@ -718,12 +823,14 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 	if (*vaddr == NULL) {
 		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 		    __func__, dmat, dmat->flags, ENOMEM);
-		free(*mapp, M_DEVBUF);
+		free(map, M_DEVBUF);
 		*mapp = NULL;
 		return (ENOMEM);
-	} else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) {
-		printf("bus_dmamem_alloc failed to align memory properly.\n");
 	}
+	if (map->flags & DMAMAP_COHERENT)
+		atomic_add_32(&maps_coherent, 1);
+	atomic_add_32(&maps_dmamem, 1);
+	atomic_add_32(&maps_total, 1);
 	dmat->map_count++;
 
 	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
@@ -751,12 +858,16 @@ bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
 	bufzone = busdma_bufalloc_findzone(ba, dmat->maxsize);
 
 	if (bufzone != NULL && dmat->alignment <= bufzone->size &&
-	    !_bus_dma_can_bounce(dmat->lowaddr, dmat->highaddr))
+	    !exclusion_bounce(dmat))
 		uma_zfree(bufzone->umazone, vaddr);
 	else
 		kmem_free(kernel_arena, (vm_offset_t)vaddr, dmat->maxsize);
 
 	dmat->map_count--;
+	if (map->flags & DMAMAP_COHERENT)
+		atomic_subtract_32(&maps_coherent, 1);
+	atomic_subtract_32(&maps_total, 1);
+	atomic_subtract_32(&maps_dmamem, 1);
 	free(map, M_DEVBUF);
 	CTR3(KTR_BUSDMA, "%s: tag %p flags 0x%x", __func__, dmat, dmat->flags);
 }
@@ -780,8 +891,7 @@ _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
 		curaddr = buf;
 		while (buflen != 0) {
 			sgsize = MIN(buflen, dmat->maxsegsz);
-			if (run_filter(dmat, curaddr, sgsize, 
-			    map->flags & DMAMAP_COHERENT) != 0) {
+			if (must_bounce(dmat, map, curaddr, sgsize) != 0) {
 				sgsize = MIN(sgsize, PAGE_SIZE);
 				map->pagesneeded++;
 			}
@@ -817,10 +927,9 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
 				paddr = pmap_kextract(vaddr);
 			else
 				paddr = pmap_extract(map->pmap, vaddr);
-			if (run_filter(dmat, paddr,
-			    min(vendaddr - vaddr, 
-			    (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK))),
-			    map->flags & DMAMAP_COHERENT) != 0) {
+			if (must_bounce(dmat, map, paddr,
+			    min(vendaddr - vaddr, (PAGE_SIZE - ((vm_offset_t)vaddr & 
+			    PAGE_MASK)))) != 0) {
 				map->pagesneeded++;
 			}
 			vaddr += (PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK));
@@ -934,12 +1043,15 @@ _bus_dmamap_load_phys(bus_dma_tag_t dmat,
 	int error;
 
 	if (segs == NULL)
-		segs = dmat->segments;
+		segs = map->segments;
 
-	if (((map->flags & DMAMAP_COHERENT) == 0) ||
-	    (dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) {
+	counter_u64_add(maploads_total, 1);
+	counter_u64_add(maploads_physmem, 1);
+
+	if (might_bounce(dmat, map, buflen, buflen)) {
 		_bus_dmamap_count_phys(dmat, map, buf, buflen, flags);
 		if (map->pagesneeded != 0) {
+			counter_u64_add(maploads_bounced, 1);
 			error = _bus_dmamap_reserve_pages(dmat, map, flags);
 			if (error)
 				return (error);
@@ -949,10 +1061,8 @@ _bus_dmamap_load_phys(bus_dma_tag_t dmat,
 	while (buflen > 0) {
 		curaddr = buf;
 		sgsize = MIN(buflen, dmat->maxsegsz);
-		if ((((map->flags & DMAMAP_COHERENT) == 0) ||
-		    ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0)) &&
-		    map->pagesneeded != 0 && run_filter(dmat, curaddr,
-		    sgsize, map->flags & DMAMAP_COHERENT)) {
+		if (map->pagesneeded != 0 && must_bounce(dmat, map, curaddr,
+		    sgsize)) {
 			sgsize = MIN(sgsize, PAGE_SIZE);
 			curaddr = add_bounce_page(dmat, map, 0, curaddr,
 						  sgsize);
@@ -1004,15 +1114,26 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dmat,
 	struct sync_list *sl;
 	int error;
 
+	counter_u64_add(maploads_total, 1);
+	if (map->flags & DMAMAP_COHERENT)
+		counter_u64_add(maploads_coherent, 1);
+	if (map->flags & DMAMAP_DMAMEM_ALLOC)
+		counter_u64_add(maploads_dmamem, 1);
+
 	if (segs == NULL)
-		segs = dmat->segments;
+		segs = map->segments;
+
+	if (flags & BUS_DMA_LOAD_MBUF) {
+		counter_u64_add(maploads_mbuf, 1);
+		map->flags |= DMAMAP_MBUF;
+	}
 
 	map->pmap = pmap;
 
-	if (!(map->flags & DMAMAP_COHERENT) ||
-	    (dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) {
+	if (might_bounce(dmat, map, (bus_addr_t)buf, buflen)) {
 		_bus_dmamap_count_pages(dmat, map, buf, buflen, flags);
 		if (map->pagesneeded != 0) {
+			counter_u64_add(maploads_bounced, 1);
 			error = _bus_dmamap_reserve_pages(dmat, map, flags);
 			if (error)
 				return (error);
@@ -1040,10 +1161,8 @@ _bus_dmamap_load_buffer(bus_dma_tag_t dmat,
 		if (buflen < sgsize)
 			sgsize = buflen;
 
-		if ((((map->flags & DMAMAP_COHERENT) == 0) ||
-		    ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0)) &&
-		    map->pagesneeded != 0 && run_filter(dmat, curaddr,
-		    sgsize, map->flags & DMAMAP_COHERENT)) {
+		if (map->pagesneeded != 0 && must_bounce(dmat, map, curaddr,
+		    sgsize)) {
 			curaddr = add_bounce_page(dmat, map, vaddr, curaddr,
 						  sgsize);
 		} else {
@@ -1100,7 +1219,7 @@ _bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map,
 {
 
 	if (segs == NULL)
-		segs = dmat->segments;
+		segs = map->segments;
 	return (segs);
 }
 
@@ -1126,6 +1245,7 @@ _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map)
 		map->pagesneeded = 0;
 	}
 	map->sync_count = 0;
+	map->flags &= ~DMAMAP_MBUF;
 }
 
 #ifdef notyetbounceuser
@@ -1204,12 +1324,12 @@ _bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
 			while (bpage != NULL) {
 				if (bpage->datavaddr != 0)
 					bcopy((void *)bpage->datavaddr,
-					      (void *)bpage->vaddr,
-					      bpage->datacount);
+					    (void *)bpage->vaddr,
+					    bpage->datacount);
 				else
 					physcopyout(bpage->dataaddr,
-					      (void *)bpage->vaddr,
-					      bpage->datacount);
+					    (void *)bpage->vaddr,
+					    bpage->datacount);
 				cpu_dcache_wb_range((vm_offset_t)bpage->vaddr,
 					bpage->datacount);
 				l2cache_wb_range((vm_offset_t)bpage->vaddr,
@@ -1251,12 +1371,12 @@ _bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
 				l2cache_inv_range(startv, startp, len);
 				if (bpage->datavaddr != 0)
 					bcopy((void *)bpage->vaddr,
-					      (void *)bpage->datavaddr,
-					      bpage->datacount);
+					    (void *)bpage->datavaddr,
+					    bpage->datacount);
 				else
 					physcopyin((void *)bpage->vaddr,
-					      bpage->dataaddr,
-					      bpage->datacount);
+					    bpage->dataaddr,
+					    bpage->datacount);
 				bpage = STAILQ_NEXT(bpage, links);
 			}
 			dmat->bounce_zone->total_bounced++;
@@ -1345,8 +1465,8 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
 
 	/* 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)) {
+		if ((dmat->alignment <= bz->alignment) &&
+		    (dmat->lowaddr >= bz->lowaddr)) {
 			dmat->bounce_zone = bz;
 			return (0);
 		}
@@ -1397,7 +1517,7 @@ alloc_bounce_zone(bus_dma_tag_t dmat)
 	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");
+	    "Total bounce requests (pages bounced)");
 	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
 	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
 	    "total_deferred", CTLFLAG_RD, &bz->total_deferred, 0,
@@ -1424,15 +1544,12 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages)
 		struct bounce_page *bpage;
 
 		bpage = (struct bounce_page *)malloc(sizeof(*bpage), M_DEVBUF,
-						     M_NOWAIT | M_ZERO);
+		    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);
+		    M_NOWAIT, 0ul, bz->lowaddr, PAGE_SIZE, 0);
 		if (bpage->vaddr == 0) {
 			free(bpage, M_DEVBUF);
 			break;
@@ -1538,7 +1655,7 @@ free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage)
 		if (reserve_bounce_pages(map->dmat, map, 1) == 0) {
 			STAILQ_REMOVE_HEAD(&bounce_map_waitinglist, links);
 			STAILQ_INSERT_TAIL(&bounce_map_callbacklist,
-					   map, links);
+			    map, links);
 			busdma_swi_pending = 1;
 			bz->total_deferred++;
 			swi_sched(vm_ih, 0);
@@ -1558,10 +1675,10 @@ busdma_swi(void)
 		STAILQ_REMOVE_HEAD(&bounce_map_callbacklist, links);
 		mtx_unlock(&bounce_lock);
 		dmat = map->dmat;
-		(dmat->lockfunc)(dmat->lockfuncarg, BUS_DMA_LOCK);
+		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);
+		    map->callback_arg, BUS_DMA_WAITOK);
+		dmat->lockfunc(dmat->lockfuncarg, BUS_DMA_UNLOCK);
 		mtx_lock(&bounce_lock);
 	}
 	mtx_unlock(&bounce_lock);
diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c
index 8ef8e03e7d8a..57b58fcfa75c 100644
--- a/sys/arm/arm/busdma_machdep.c
+++ b/sys/arm/arm/busdma_machdep.c
@@ -276,10 +276,10 @@ busdma_init(void *dummy)
 /*
  * This init historically used SI_SUB_VM, but now the init code requires
  * malloc(9) using M_DEVBUF memory, which is set up later than SI_SUB_VM, by
- * SI_SUB_KMEM and SI_ORDER_SECOND, so we'll go right after that by using
- * SI_SUB_KMEM and SI_ORDER_THIRD.
+ * SI_SUB_KMEM and SI_ORDER_THIRD, so we'll go right after that by using
+ * SI_SUB_KMEM and SI_ORDER_FOURTH.
  */
-SYSINIT(busdma, SI_SUB_KMEM, SI_ORDER_THIRD, busdma_init, NULL);
+SYSINIT(busdma, SI_SUB_KMEM, SI_ORDER_FOURTH, busdma_init, NULL);
 
 /*
  * End block of code useful to transplant to other implementations.
diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
index 79636b5dba57..07090d291411 100644
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -1410,12 +1410,27 @@ cpu_scc_setup_ccnt(void)
  * you want!
  */
 #ifdef _PMC_USER_READ_WRITE_
+#if defined(CPU_ARM1136) || defined(CPU_ARM1176)
+	/* Use the Secure User and Non-secure Access Validation Control Register
+	 * to allow userland access
+	 */
+	__asm volatile ("mcr	p15, 0, %0, c15, c9, 0\n\t"
+			:
+			: "r"(0x00000001));
+#else
 	/* Set PMUSERENR[0] to allow userland access */
 	__asm volatile ("mcr	p15, 0, %0, c9, c14, 0\n\t"
 			:
 			: "r"(0x00000001));
 #endif
-        /* Set up the PMCCNTR register as a cyclecounter:
+#endif
+#if defined(CPU_ARM1136) || defined(CPU_ARM1176)
+	/* Set PMCR[2,0] to enable counters and reset CCNT */
+	__asm volatile ("mcr	p15, 0, %0, c15, c12, 0\n\t"
+			:
+			: "r"(0x00000005));
+#else
+	/* Set up the PMCCNTR register as a cyclecounter:
 	 * Set PMINTENCLR to 0xFFFFFFFF to block interrupts
 	 * Set PMCR[2,0] to enable counters and reset CCNT
 	 * Set PMCNTENSET to 0x80000000 to enable CCNT */
@@ -1426,6 +1441,7 @@ cpu_scc_setup_ccnt(void)
 			: "r"(0xFFFFFFFF),
 			  "r"(0x00000005),
 			  "r"(0x80000000));
+#endif
 }
 #endif
 
diff --git a/sys/arm/arm/cpufunc_asm_arm10.S b/sys/arm/arm/cpufunc_asm_arm10.S
index 654219b1c668..9ef3115d0216 100644
--- a/sys/arm/arm/cpufunc_asm_arm10.S
+++ b/sys/arm/arm/cpufunc_asm_arm10.S
@@ -209,7 +209,7 @@ ENTRY_NP(arm10_idcache_wbinv_all)
 	mcr	p15, 0, r0, c7, c5, 0	/* Flush I cache */
 	/* Fall through to purge Dcache. */
 
-ENTRY(arm10_dcache_wbinv_all)
+EENTRY(arm10_dcache_wbinv_all)
 .Larm10_dcache_wbinv_all:
 	ldr	ip, .Larm10_cache_data
 	ldmia	ip, {s_max, i_max, s_inc, i_inc}
@@ -223,8 +223,8 @@ ENTRY(arm10_dcache_wbinv_all)
 	bhs	.Lnext_set_inv		/* Next set */
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	bx	lr
+EEND(arm10_dcache_wbinv_all)
 END(arm10_idcache_wbinv_all)
-END(arm10_dcache_wbinv_all)
 
 .Larm10_cache_data:
 	.word	_C_LABEL(arm10_dcache_sets_max)
diff --git a/sys/arm/arm/cpufunc_asm_arm9.S b/sys/arm/arm/cpufunc_asm_arm9.S
index dd2947940a13..bae7f71c9cd7 100644
--- a/sys/arm/arm/cpufunc_asm_arm9.S
+++ b/sys/arm/arm/cpufunc_asm_arm9.S
@@ -197,7 +197,7 @@ ENTRY_NP(arm9_idcache_wbinv_all)
 	mcr	p15, 0, r0, c7, c5, 0	/* Flush I cache */
 	/* Fall through */
 
-ENTRY(arm9_dcache_wbinv_all)
+EENTRY(arm9_dcache_wbinv_all)
 .Larm9_dcache_wbinv_all:
 	ldr	ip, .Larm9_cache_data
 	ldmia	ip, {s_max, i_max, s_inc, i_inc}
@@ -210,8 +210,8 @@ ENTRY(arm9_dcache_wbinv_all)
 	subs	s_max, s_max, s_inc
 	bhs	.Lnext_set_inv		/* Next set */
 	mov	pc, lr
+EEND(arm9_dcache_wbinv_all)
 END(arm9_idcache_wbinv_all)
-END(arm9_dcache_wbinv_all)
 
 .Larm9_cache_data:
 	.word	_C_LABEL(arm9_dcache_sets_max)
diff --git a/sys/arm/arm/cpufunc_asm_armv5.S b/sys/arm/arm/cpufunc_asm_armv5.S
index 94e6b43e1912..7435b462e51b 100644
--- a/sys/arm/arm/cpufunc_asm_armv5.S
+++ b/sys/arm/arm/cpufunc_asm_armv5.S
@@ -194,6 +194,7 @@ ENTRY(armv5_idcache_wbinv_range)
 END(armv5_idcache_wbinv_range)
 
 ENTRY_NP(armv5_idcache_wbinv_all)
+armv5_idcache_wbinv_all:
 .Larmv5_idcache_wbinv_all:
 	/*
 	 * We assume that the code here can never be out of sync with the
@@ -203,7 +204,7 @@ ENTRY_NP(armv5_idcache_wbinv_all)
 	mcr	p15, 0, r0, c7, c5, 0	/* Flush I cache */
 	/* Fall through to purge Dcache. */
 
-ENTRY(armv5_dcache_wbinv_all)
+EENTRY(armv5_dcache_wbinv_all)
 .Larmv5_dcache_wbinv_all:
 	ldr	ip, .Larmv5_cache_data
 	ldmia	ip, {s_max, i_max, s_inc, i_inc}
@@ -219,8 +220,8 @@ ENTRY(armv5_dcache_wbinv_all)
 	bpl	1b			/* Next set */
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	RET
+EEND(armv5_dcache_wbinv_all)
 END(armv5_idcache_wbinv_all)
-END(armv5_dcache_wbinv_all)
 
 .Larmv5_cache_data:
 	.word	_C_LABEL(armv5_dcache_sets_max)
diff --git a/sys/arm/arm/cpufunc_asm_armv6.S b/sys/arm/arm/cpufunc_asm_armv6.S
index 103faf8b7812..f46820fad943 100644
--- a/sys/arm/arm/cpufunc_asm_armv6.S
+++ b/sys/arm/arm/cpufunc_asm_armv6.S
@@ -137,12 +137,12 @@ ENTRY_NP(armv6_idcache_wbinv_all)
 	/* Fall through to purge Dcache. */
 
 /* LINTSTUB: void armv6_dcache_wbinv_all(void); */
-ENTRY(armv6_dcache_wbinv_all)
+EENTRY(armv6_dcache_wbinv_all)
 	mcr	p15, 0, r0, c7, c14, 0	/* clean & invalidate D cache */
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
 	RET
+EEND(armv6_dcache_wbinv_all)
 END(armv6_idcache_wbinv_all)
-END(armv6_dcache_wbinv_all)
 
 ENTRY(armv6_idcache_inv_all)
 	mov	r0, #0
diff --git a/sys/arm/arm/cpufunc_asm_armv7.S b/sys/arm/arm/cpufunc_asm_armv7.S
index 71e9ca5d8d1b..93896d219c75 100644
--- a/sys/arm/arm/cpufunc_asm_armv7.S
+++ b/sys/arm/arm/cpufunc_asm_armv7.S
@@ -358,7 +358,7 @@ ENTRY(armv7_idcache_inv_all)
 	mcr     p15, 0, r0, c7, c5, 0   @ invalidate instruction+branch cache
 	isb                             @ instruction sync barrier
 	bx      lr                      @ return
-END(armv7_l1cache_inv_all)
+END(armv7_idcache_inv_all)
 
 ENTRY_NP(armv7_sleep)
 	dsb
diff --git a/sys/arm/arm/cpufunc_asm_xscale.S b/sys/arm/arm/cpufunc_asm_xscale.S
index e7eda4b60e1e..fb99dea7cce4 100644
--- a/sys/arm/arm/cpufunc_asm_xscale.S
+++ b/sys/arm/arm/cpufunc_asm_xscale.S
@@ -306,11 +306,12 @@ _C_LABEL(xscale_minidata_clean_size):
 	XSCALE_CACHE_CLEAN_UNBLOCK
 
 ENTRY_NP(xscale_cache_syncI)
-ENTRY_NP(xscale_cache_purgeID)
+
+EENTRY_NP(xscale_cache_purgeID)
 	mcr	p15, 0, r0, c7, c5, 0	/* flush I cache (D cleaned below) */
-ENTRY_NP(xscale_cache_cleanID)
-ENTRY_NP(xscale_cache_purgeD)
-ENTRY(xscale_cache_cleanD)
+EENTRY_NP(xscale_cache_cleanID)
+EENTRY_NP(xscale_cache_purgeD)
+EENTRY(xscale_cache_cleanD)
 	XSCALE_CACHE_CLEAN_PROLOGUE
 
 1:	subs	r0, r0, #32
@@ -326,11 +327,11 @@ ENTRY(xscale_cache_cleanD)
 
 	XSCALE_CACHE_CLEAN_EPILOGUE
 	RET
+EEND(xscale_cache_cleanD)
+EEND(xscale_cache_purgeD)
+EEND(xscale_cache_cleanID)
+EEND(xscale_cache_purgeID)
 END(xscale_cache_syncI)
-END(xscale_cache_purgeID)
-END(xscale_cache_cleanID)
-END(xscale_cache_purgeD)
-END(xscale_cache_cleanD)
 
 /*
  * Clean the mini-data cache.
@@ -374,7 +375,7 @@ END(xscale_cache_purgeD_E)
  */
 /* xscale_cache_syncI is identical to xscale_cache_purgeID */
 
-ENTRY(xscale_cache_cleanID_rng)
+EENTRY(xscale_cache_cleanID_rng)
 ENTRY(xscale_cache_cleanD_rng)
 	cmp	r1, #0x4000
 	bcs	_C_LABEL(xscale_cache_cleanID)
@@ -393,7 +394,7 @@ ENTRY(xscale_cache_cleanD_rng)
 	mcr	p15, 0, r0, c7, c10, 4	/* drain write buffer */
 
 	CPWAIT_AND_RETURN(r0)
-END(xscale_cache_cleanID_rng)
+/*END(xscale_cache_cleanID_rng)*/
 END(xscale_cache_cleanD_rng)
 
 ENTRY(xscale_cache_purgeID_rng)
diff --git a/sys/arm/arm/cpufunc_asm_xscale_c3.S b/sys/arm/arm/cpufunc_asm_xscale_c3.S
index 7c39f3520dda..0fdb39c2cd64 100644
--- a/sys/arm/arm/cpufunc_asm_xscale_c3.S
+++ b/sys/arm/arm/cpufunc_asm_xscale_c3.S
@@ -143,11 +143,12 @@ __FBSDID("$FreeBSD$");
 
 
 ENTRY_NP(xscalec3_cache_syncI)
-ENTRY_NP(xscalec3_cache_purgeID)
+xscalec3_cache_purgeID:
+EENTRY_NP(xscalec3_cache_purgeID)
 	mcr	p15, 0, r0, c7, c5, 0	/* flush I cache (D cleaned below) */
-ENTRY_NP(xscalec3_cache_cleanID)
-ENTRY_NP(xscalec3_cache_purgeD)
-ENTRY(xscalec3_cache_cleanD)
+EENTRY_NP(xscalec3_cache_cleanID)
+EENTRY_NP(xscalec3_cache_purgeD)
+EENTRY(xscalec3_cache_cleanD)
 
 	XSCALE_CACHE_CLEAN_BLOCK
 	mov	r0, #0
@@ -168,11 +169,11 @@ ENTRY(xscalec3_cache_cleanD)
 	mcr	p15, 0, r0, c7, c10, 4	/* drain write buffer */
 
 	RET
+EEND(xscalec3_cache_purgeID)
+EEND(xscalec3_cache_cleanID)
+EEND(xscalec3_cache_purgeD)
+EEND(xscalec3_cache_cleanD)
 END(xscalec3_cache_syncI)
-END(xscalec3_cache_purgeID)
-END(xscalec3_cache_cleanID)
-END(xscalec3_cache_purgeD)
-END(xscalec3_cache_cleanD)
 
 ENTRY(xscalec3_cache_purgeID_rng)
 
@@ -238,7 +239,7 @@ ENTRY(xscalec3_cache_purgeD_rng)
 END(xscalec3_cache_purgeD_rng)
 
 ENTRY(xscalec3_cache_cleanID_rng)
-ENTRY(xscalec3_cache_cleanD_rng)
+EENTRY(xscalec3_cache_cleanD_rng)
 
 	cmp	r1, #0x4000
 	bcs	_C_LABEL(xscalec3_cache_cleanID)
@@ -257,8 +258,8 @@ ENTRY(xscalec3_cache_cleanD_rng)
 	mcr	p15, 0, r0, c7, c10, 4	/* drain write buffer */
 
 	CPWAIT_AND_RETURN(r0)
+EEND(xscalec3_cache_cleanD_rng)
 END(xscalec3_cache_cleanID_rng)
-END(xscalec3_cache_cleanD_rng)
 
 ENTRY(xscalec3_l2cache_purge)
 	/* Clean-up the L2 cache */
diff --git a/sys/arm/arm/dump_machdep.c b/sys/arm/arm/dump_machdep.c
index f37346c3d008..b5a37f2a52e2 100644
--- a/sys/arm/arm/dump_machdep.c
+++ b/sys/arm/arm/dump_machdep.c
@@ -50,8 +50,7 @@ __FBSDID("$FreeBSD$");
 CTASSERT(sizeof(struct kerneldumpheader) == 512);
 
 int do_minidump = 1;
-TUNABLE_INT("debug.minidump", &do_minidump);
-SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RW, &do_minidump, 0,
+SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RWTUN, &do_minidump, 0,
     "Enable mini crash dumps");
 
 /*
@@ -272,7 +271,7 @@ foreach_chunk(callback_t cb, void *arg)
 	return (seqnr);
 }
 
-void
+int
 dumpsys(struct dumperinfo *di)
 {
 	Elf_Ehdr ehdr;
@@ -283,7 +282,7 @@ dumpsys(struct dumperinfo *di)
 
 	if (do_minidump) {
 		minidumpsys(di);
-		return;
+		return (0);
 	}
 
 	bzero(&ehdr, sizeof(ehdr));
@@ -369,7 +368,7 @@ dumpsys(struct dumperinfo *di)
 	/* Signal completion, signoff and exit stage left. */
 	dump_write(di, NULL, 0, 0, 0);
 	printf("\nDump complete\n");
-	return;
+	return (0);
 
  fail:
 	if (error < 0)
@@ -381,4 +380,5 @@ dumpsys(struct dumperinfo *di)
 		printf("\nDump failed. Partition too small.\n");
 	else
 		printf("\n** DUMP FAILED (ERROR %d) **\n", error);
+	return (error);
 }
diff --git a/sys/arm/arm/elf_machdep.c b/sys/arm/arm/elf_machdep.c
index 8ef9bd444c93..d8169805d0a1 100644
--- a/sys/arm/arm/elf_machdep.c
+++ b/sys/arm/arm/elf_machdep.c
@@ -120,6 +120,34 @@ elf32_dump_thread(struct thread *td __unused, void *dst __unused,
 {
 }
 
+/*
+ * It is possible for the compiler to emit relocations for unaligned data.
+ * We handle this situation with these inlines.
+ */
+#define	RELOC_ALIGNED_P(x) \
+	(((uintptr_t)(x) & (sizeof(void *) - 1)) == 0)
+
+static __inline Elf_Addr
+load_ptr(Elf_Addr *where)
+{
+	Elf_Addr res;
+
+	if (RELOC_ALIGNED_P(where))
+		return *where;
+	memcpy(&res, where, sizeof(res));
+	return (res);
+}
+
+static __inline void
+store_ptr(Elf_Addr *where, Elf_Addr val)
+{
+	if (RELOC_ALIGNED_P(where))
+		*where = val;
+	else
+		memcpy(where, &val, sizeof(val));
+}
+#undef RELOC_ALIGNED_P
+
 
 /* Process one elf relocation with addend. */
 static int
@@ -137,7 +165,7 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
 	case ELF_RELOC_REL:
 		rel = (const Elf_Rel *)data;
 		where = (Elf_Addr *) (relocbase + rel->r_offset);
-		addend = *where;
+		addend = load_ptr(where);
 		rtype = ELF_R_TYPE(rel->r_info);
 		symidx = ELF_R_SYM(rel->r_info);
 		break;
@@ -155,8 +183,8 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
 	if (local) {
 		if (rtype == R_ARM_RELATIVE) {	/* A + B */
 			addr = elf_relocaddr(lf, relocbase + addend);
-			if (*where != addr)
-				*where = addr;
+			if (load_ptr(where) != addr)
+				store_ptr(where, addr);
 		}
 		return (0);
 	}
@@ -170,7 +198,7 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
 			addr = lookup(lf, symidx, 1);
 			if (addr == 0)
 				return -1;
-			*where += addr;
+			store_ptr(where, addr + load_ptr(where));
 			break;
 
 		case R_ARM_COPY:	/* none */
@@ -185,7 +213,7 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
 		case R_ARM_JUMP_SLOT:
 			addr = lookup(lf, symidx, 1);
 			if (addr) {
-				*where = addr;
+				store_ptr(where, addr);
 				return (0);
 			}
 			return (-1);
diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S
index d49e20d3972c..7f79654d3719 100644
--- a/sys/arm/arm/exception.S
+++ b/sys/arm/arm/exception.S
@@ -280,12 +280,12 @@ ASENTRY_NP(swi_entry)
 	 * that a newly created thread appears to return from a SWI just like
 	 * the parent thread that created it.
 	 */
-ASENTRY_NP(swi_exit)
+ASEENTRY_NP(swi_exit)
 	DO_AST				/* Handle pending signals. */
 	PULLFRAME			/* Deallocate trapframe. */
 	movs	pc, lr			/* Return to userland. */
 	STOP_UNWINDING			/* Don't unwind into user mode. */
-END(swi_exit)
+EEND(swi_exit)
 END(swi_entry)
 
 /*
diff --git a/sys/arm/arm/fusu.S b/sys/arm/arm/fusu.S
index 137bdf60994a..c70215c297db 100644
--- a/sys/arm/arm/fusu.S
+++ b/sys/arm/arm/fusu.S
@@ -54,8 +54,8 @@ __FBSDID("$FreeBSD$");
  * Fetch an int from the user's address space.
  */
 
-ENTRY_NP(casuword32)
 ENTRY(casuword)
+EENTRY_NP(casuword32)
 	GET_PCB(r3)
 	ldr	r3, [r3]
 
@@ -91,7 +91,7 @@ ENTRY(casuword)
 	mov	r1, #0x00000000
 	str	r1, [r3, #PCB_ONFAULT]
 	RET
-END(casuword32)
+EEND(casuword32)
 END(casuword)
 
 /*
@@ -110,8 +110,8 @@ END(casuword)
  * Fetch an int from the user's address space.
  */
 
-ENTRY_NP(fuword32)
 ENTRY(fuword)
+EENTRY_NP(fuword32)
 	GET_PCB(r2)
 	ldr	r2, [r2]
 
@@ -277,8 +277,8 @@ fusupcbfaulttext:
  * Store an int in the user's address space.
  */
 
-ENTRY_NP(suword32)
 ENTRY(suword)
+EENTRY_NP(suword32)
 	GET_PCB(r2)
 	ldr	r2, [r2]
 
@@ -390,4 +390,3 @@ ENTRY(subyte)
 	str	r0, [r2, #PCB_ONFAULT]
 	RET
 END(subyte)
-
diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c
index 63e1717e0ec8..df7d0cd0b9b7 100644
--- a/sys/arm/arm/generic_timer.c
+++ b/sys/arm/arm/generic_timer.c
@@ -343,7 +343,8 @@ static driver_t arm_tmr_driver = {
 
 static devclass_t arm_tmr_devclass;
 
-DRIVER_MODULE(timer, simplebus, arm_tmr_driver, arm_tmr_devclass, 0, 0);
+EARLY_DRIVER_MODULE(timer, simplebus, arm_tmr_driver, arm_tmr_devclass, 0, 0,
+    BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE);
 
 void
 DELAY(int usec)
diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c
index 4d523c335c64..9a9275b08d6a 100644
--- a/sys/arm/arm/gic.c
+++ b/sys/arm/arm/gic.c
@@ -166,8 +166,9 @@ gic_init_secondary(void)
 	/* Enable interrupt distribution */
 	gic_d_write_4(GICD_CTLR, 0x01);
 
-	/* Activate IRQ 29, ie private timer IRQ*/
+	/* Activate IRQ 29-30, ie private timer (secure & non-secure) IRQs */
 	gic_d_write_4(GICD_ISENABLER(29 >> 5), (1UL << (29 & 0x1F)));
+	gic_d_write_4(GICD_ISENABLER(30 >> 5), (1UL << (30 & 0x1F)));
 }
 
 static int
@@ -263,7 +264,8 @@ static driver_t arm_gic_driver = {
 
 static devclass_t arm_gic_devclass;
 
-DRIVER_MODULE(gic, simplebus, arm_gic_driver, arm_gic_devclass, 0, 0);
+EARLY_DRIVER_MODULE(gic, simplebus, arm_gic_driver, arm_gic_devclass, 0, 0,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
 
 static void
 gic_post_filter(void *arg)
diff --git a/sys/arm/arm/intr.c b/sys/arm/arm/intr.c
index ba151276d332..83eca0777826 100644
--- a/sys/arm/arm/intr.c
+++ b/sys/arm/arm/intr.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/syslog.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/bus.h>
@@ -75,8 +76,8 @@ size_t sintrnames = sizeof(intrnames);
  * assumptions of vmstat(8) and the kdb "show intrcnt" command, the two
  * consumers of this data.
  */
-void
-arm_intrnames_init(void)
+static void
+intr_init(void *unused)
 {
 	int i;
 
@@ -86,6 +87,8 @@ arm_intrnames_init(void)
 	}
 }
 
+SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL);
+
 void
 arm_setup_irqhandler(const char *name, driver_filter_t *filt,
     void (*hand)(void*), void *arg, int irq, int flags, void **cookiep)
diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S
index 1376e88a928c..965f72f47245 100644
--- a/sys/arm/arm/locore.S
+++ b/sys/arm/arm/locore.S
@@ -75,7 +75,8 @@ __FBSDID("$FreeBSD$");
  * For both types of boot we gather up the args, put them in a struct arm_boot_params
  * structure and pass that to initarm.
  */
-ENTRY_NP(btext)
+	.globl	btext
+btext:
 ASENTRY_NP(_start)
 	STOP_UNWINDING		/* Can't unwind into the bootloader! */
 
@@ -285,7 +286,6 @@ virt_done:
 	adr	r0, .Lmainreturned
 	b	_C_LABEL(panic)
 	/* NOTREACHED */
-END(btext)
 END(_start)
 
 /*
@@ -548,7 +548,7 @@ ENTRY_NP(sigcode)
 
 	/* Branch back to retry SYS_sigreturn */
 	b	. - 16
-
+END(sigcode)
 	.word	SYS_sigreturn
 	.word	SYS_exit
 
@@ -560,5 +560,5 @@ ENTRY_NP(sigcode)
 	.global szsigcode
 szsigcode:
 	.long esigcode-sigcode
-END(sigcode)
+
 /* End of locore.S */
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index b61d5552ff73..94d708163446 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -1278,7 +1278,6 @@ initarm(struct arm_boot_params *abp)
 
 	init_proc0(kernelstack.pv_va);
 
-	arm_intrnames_init();
 	arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL);
 	pmap_bootstrap(freemempos, &kernel_l1pt);
 	msgbufp = (void *)msgbufpv.pv_va;
diff --git a/sys/arm/arm/mpcore_timer.c b/sys/arm/arm/mpcore_timer.c
index bf3070790cee..3f87a2a94452 100644
--- a/sys/arm/arm/mpcore_timer.c
+++ b/sys/arm/arm/mpcore_timer.c
@@ -382,7 +382,8 @@ static driver_t arm_tmr_driver = {
 
 static devclass_t arm_tmr_devclass;
 
-DRIVER_MODULE(mp_tmr, simplebus, arm_tmr_driver, arm_tmr_devclass, 0, 0);
+EARLY_DRIVER_MODULE(mp_tmr, simplebus, arm_tmr_driver, arm_tmr_devclass, 0, 0,
+    BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE);
 
 /*
  * Handle a change in clock frequency.  The mpcore timer runs at half the CPU
diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c
index fe1261f0a416..a66fc3e0135b 100644
--- a/sys/arm/arm/nexus.c
+++ b/sys/arm/arm/nexus.c
@@ -125,7 +125,12 @@ static driver_t nexus_driver = {
 	nexus_methods,
 	1			/* no softc */
 };
+#ifdef ARM_DEVICE_MULTIPASS
+EARLY_DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0, 
+    BUS_PASS_BUS + BUS_PASS_ORDER_EARLY);
+#else
 DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0);
+#endif
 
 static int
 nexus_probe(device_t dev)
diff --git a/sys/arm/arm/pl190.c b/sys/arm/arm/pl190.c
index 01cd84a193f5..5e811343b413 100644
--- a/sys/arm/arm/pl190.c
+++ b/sys/arm/arm/pl190.c
@@ -152,7 +152,8 @@ static driver_t pl190_intc_driver = {
 
 static devclass_t pl190_intc_devclass;
 
-DRIVER_MODULE(intc, simplebus, pl190_intc_driver, pl190_intc_devclass, 0, 0);
+EARLY_DRIVER_MODULE(intc, simplebus, pl190_intc_driver, pl190_intc_devclass, 
+    0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
 
 int
 arm_get_next_irq(int last_irq)
diff --git a/sys/arm/arm/pl310.c b/sys/arm/arm/pl310.c
index cf19d6c4be10..76ad17be70d2 100644
--- a/sys/arm/arm/pl310.c
+++ b/sys/arm/arm/pl310.c
@@ -378,6 +378,44 @@ pl310_set_way_sizes(struct pl310_softc *sc)
 	g_l2cache_size = g_way_size * g_ways_assoc;
 }
 
+/*
+ * Setup interrupt handling.  This is done only if the cache controller is
+ * disabled, for debugging.  We set counters so when a cache event happens we'll
+ * get interrupted and be warned that something is wrong, because no cache
+ * events should happen if we're disabled.
+ */
+static void
+pl310_config_intr(void *arg)
+{
+	struct pl310_softc * sc;
+
+	sc = arg;
+
+	/* activate the interrupt */
+	bus_setup_intr(sc->sc_dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE,
+	    pl310_filter, NULL, sc, &sc->sc_irq_h);
+
+	/* Cache Line Eviction for Counter 0 */
+	pl310_write4(sc, PL310_EVENT_COUNTER0_CONF, 
+	    EVENT_COUNTER_CONF_INCR | EVENT_COUNTER_CONF_CO);
+	/* Data Read Request for Counter 1 */
+	pl310_write4(sc, PL310_EVENT_COUNTER1_CONF, 
+	    EVENT_COUNTER_CONF_INCR | EVENT_COUNTER_CONF_DRREQ);
+
+	/* Enable and clear pending interrupts */
+	pl310_write4(sc, PL310_INTR_CLEAR, INTR_MASK_ECNTR);
+	pl310_write4(sc, PL310_INTR_MASK, INTR_MASK_ALL);
+
+	/* Enable counters and reset C0 and C1 */
+	pl310_write4(sc, PL310_EVENT_COUNTER_CTRL, 
+	    EVENT_COUNTER_CTRL_ENABLED | 
+	    EVENT_COUNTER_CTRL_C0_RESET | 
+	    EVENT_COUNTER_CTRL_C1_RESET);
+
+	config_intrhook_disestablish(sc->sc_ich);
+	free(sc->sc_ich, M_DEVBUF);
+}
+
 static int
 pl310_probe(device_t dev)
 {
@@ -416,10 +454,6 @@ pl310_attach(device_t dev)
 	pl310_softc = sc;
 	mtx_init(&sc->sc_mtx, "pl310lock", NULL, MTX_SPIN);
 
-	/* activate the interrupt */
-	bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE,
-				pl310_filter, NULL, sc, &sc->sc_irq_h);
-
 	cache_id = pl310_read4(sc, PL310_CACHE_ID);
 	sc->sc_rtl_revision = (cache_id >> CACHE_ID_RELEASE_SHIFT) &
 	    CACHE_ID_RELEASE_MASK;
@@ -466,28 +500,14 @@ pl310_attach(device_t dev)
 		if (bootverbose)
 			pl310_print_config(sc);
 	} else {
-		/*
-		 * Set counters so when cache event happens we'll get interrupt
-		 * and be warned that something is off.
-		 */
-
-		/* Cache Line Eviction for Counter 0 */
-		pl310_write4(sc, PL310_EVENT_COUNTER0_CONF, 
-		    EVENT_COUNTER_CONF_INCR | EVENT_COUNTER_CONF_CO);
-		/* Data Read Request for Counter 1 */
-		pl310_write4(sc, PL310_EVENT_COUNTER1_CONF, 
-		    EVENT_COUNTER_CONF_INCR | EVENT_COUNTER_CONF_DRREQ);
-
-		/* Enable and clear pending interrupts */
-		pl310_write4(sc, PL310_INTR_CLEAR, INTR_MASK_ECNTR);
-		pl310_write4(sc, PL310_INTR_MASK, INTR_MASK_ALL);
-
-		/* Enable counters and reset C0 and C1 */
-		pl310_write4(sc, PL310_EVENT_COUNTER_CTRL, 
-		    EVENT_COUNTER_CTRL_ENABLED | 
-		    EVENT_COUNTER_CTRL_C0_RESET | 
-		    EVENT_COUNTER_CTRL_C1_RESET);
-
+		malloc(sizeof(*sc->sc_ich), M_DEVBUF, M_WAITOK);
+		sc->sc_ich->ich_func = pl310_config_intr;
+		sc->sc_ich->ich_arg = sc;
+		if (config_intrhook_establish(sc->sc_ich) != 0) {
+			device_printf(dev,
+			    "config_intrhook_establish failed\n");
+			return(ENXIO);
+		}
 		device_printf(dev, "L2 Cache disabled\n");
 	}
 
@@ -514,4 +534,6 @@ static driver_t pl310_driver = {
 };
 static devclass_t pl310_devclass;
 
-DRIVER_MODULE(pl310, simplebus, pl310_driver, pl310_devclass, 0, 0);
+EARLY_DRIVER_MODULE(pl310, simplebus, pl310_driver, pl310_devclass, 0, 0,
+    BUS_PASS_CPU + BUS_PASS_ORDER_MIDDLE);
+
diff --git a/sys/arm/arm/platform.c b/sys/arm/arm/platform.c
index c744d7ec654e..8dcccc7714ad 100644
--- a/sys/arm/arm/platform.c
+++ b/sys/arm/arm/platform.c
@@ -65,8 +65,8 @@ static platform_t	plat_obj;
 static struct kobj_ops	plat_kernel_kops;
 static struct platform_kobj	plat_kernel_obj;
 
-static char plat_name[64] = "";
-SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RDTUN, plat_name, 0,
+static char plat_name[64];
+SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, plat_name, 0,
     "Platform currently in use");
 
 /*
diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c
index 6fc328cf8623..1be98885ec73 100644
--- a/sys/arm/arm/pmap-v6.c
+++ b/sys/arm/arm/pmap-v6.c
@@ -231,8 +231,8 @@ static boolean_t	pmap_pv_insert_section(pmap_t, vm_offset_t,
 static struct pv_entry	*pmap_remove_pv(struct vm_page *, pmap_t, vm_offset_t);
 static int		pmap_pvh_wired_mappings(struct md_page *, int);
 
-static void		pmap_enter_locked(pmap_t, vm_offset_t, vm_prot_t,
-    vm_page_t, vm_prot_t, boolean_t, int);
+static int		pmap_enter_locked(pmap_t, vm_offset_t, vm_page_t,
+    vm_prot_t, u_int);
 static vm_paddr_t	pmap_extract_locked(pmap_t pmap, vm_offset_t va);
 static void		pmap_alloc_l1(pmap_t);
 static void		pmap_free_l1(pmap_t);
@@ -465,7 +465,7 @@ static SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
 
 /* Superpages utilization enabled = 1 / disabled = 0 */
 static int sp_enabled = 1;
-SYSCTL_INT(_vm_pmap, OID_AUTO, sp_enabled, CTLFLAG_RDTUN, &sp_enabled, 0,
+SYSCTL_INT(_vm_pmap, OID_AUTO, sp_enabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &sp_enabled, 0,
     "Are large page mappings enabled?");
 
 SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0,
@@ -2752,16 +2752,6 @@ pmap_change_attr(vm_offset_t sva, vm_size_t len, int mode)
 	offset = sva & PAGE_MASK;
 	size = roundup(offset + len, PAGE_SIZE);
 
-#ifdef checkit
-	/*
-	 * Only supported on kernel virtual addresses, including the direct
-	 * map but excluding the recursive map.
-	 */
-	if (base < DMAP_MIN_ADDRESS) {
-		PMAP_UNLOCK(kernel_pmap);
-		return (EINVAL);
-	}
-#endif
 	for (tmpva = base; tmpva < base + size; ) {
 		next_bucket = L2_NEXT_BUCKET(tmpva);
 		if (next_bucket > base + size)
@@ -2852,11 +2842,11 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
 			 * Are we protecting the entire large page? If not,
 			 * demote the mapping and fall through.
 			 */
-			if (sva + L1_S_SIZE == L2_NEXT_BUCKET(sva) &&
-			    eva >= L2_NEXT_BUCKET(sva)) {
+			if (sva + L1_S_SIZE == next_bucket &&
+			    eva >= next_bucket) {
 				l1pd &= ~(L1_S_PROT_MASK | L1_S_XN);
 				if (!(prot & VM_PROT_EXECUTE))
-					*pl1pd |= L1_S_XN;
+					l1pd |= L1_S_XN;
 				/*
 				 * At this point we are always setting
 				 * write-protect bit.
@@ -2944,35 +2934,38 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
  *	insert this page into the given map NOW.
  */
 
-void
-pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
-    vm_prot_t prot, boolean_t wired)
+int
+pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
+    u_int flags, int8_t psind __unused)
 {
 	struct l2_bucket *l2b;
+	int rv;
 
 	rw_wlock(&pvh_global_lock);
 	PMAP_LOCK(pmap);
-	pmap_enter_locked(pmap, va, access, m, prot, wired, M_WAITOK);
-	/*
-	 * If both the l2b_occupancy and the reservation are fully
-	 * populated, then attempt promotion.
-	 */
-	l2b = pmap_get_l2_bucket(pmap, va);
-	if ((l2b != NULL) && (l2b->l2b_occupancy == L2_PTE_NUM_TOTAL) &&
-	    sp_enabled && (m->flags & PG_FICTITIOUS) == 0 &&
-	    vm_reserv_level_iffullpop(m) == 0)
-		pmap_promote_section(pmap, va);
-
+	rv = pmap_enter_locked(pmap, va, m, prot, flags);
+	if (rv == KERN_SUCCESS) {
+		/*
+		 * If both the l2b_occupancy and the reservation are fully
+		 * populated, then attempt promotion.
+		 */
+		l2b = pmap_get_l2_bucket(pmap, va);
+		if (l2b != NULL && l2b->l2b_occupancy == L2_PTE_NUM_TOTAL &&
+		    sp_enabled && (m->flags & PG_FICTITIOUS) == 0 &&
+		    vm_reserv_level_iffullpop(m) == 0)
+			pmap_promote_section(pmap, va);
+	}
 	PMAP_UNLOCK(pmap);
 	rw_wunlock(&pvh_global_lock);
+	return (rv);
 }
 
 /*
  *	The pvh global and pmap locks must be held.
  */
-static void
-pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
-    vm_prot_t prot, boolean_t wired, int flags)
+static int
+pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
+    u_int flags)
 {
 	struct l2_bucket *l2b = NULL;
 	struct vm_page *om;
@@ -2990,9 +2983,8 @@ pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 		pa = systempage.pv_pa;
 		m = NULL;
 	} else {
-		KASSERT((m->oflags & VPO_UNMANAGED) != 0 ||
-		    vm_page_xbusied(m) || (flags & M_NOWAIT) != 0,
-		    ("pmap_enter_locked: page %p is not busy", m));
+		if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m))
+			VM_OBJECT_ASSERT_LOCKED(m->object);
 		pa = VM_PAGE_TO_PHYS(m);
 	}
 
@@ -3013,12 +3005,12 @@ pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 
 	if (prot & VM_PROT_WRITE)
 		nflags |= PVF_WRITE;
-	if (wired)
+	if ((flags & PMAP_ENTER_WIRED) != 0)
 		nflags |= PVF_WIRED;
 
 	PDEBUG(1, printf("pmap_enter: pmap = %08x, va = %08x, m = %08x, "
-	    "prot = %x, wired = %x\n", (uint32_t) pmap, va, (uint32_t) m,
-	    prot, wired));
+	    "prot = %x, flags = %x\n", (uint32_t) pmap, va, (uint32_t) m,
+	    prot, flags));
 
 	if (pmap == pmap_kernel()) {
 		l2b = pmap_get_l2_bucket(pmap, va);
@@ -3028,7 +3020,7 @@ pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 do_l2b_alloc:
 		l2b = pmap_alloc_l2_bucket(pmap, va);
 		if (l2b == NULL) {
-			if (flags & M_WAITOK) {
+			if ((flags & PMAP_ENTER_NOSLEEP) == 0) {
 				PMAP_UNLOCK(pmap);
 				rw_wunlock(&pvh_global_lock);
 				VM_WAIT;
@@ -3036,7 +3028,7 @@ pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 				PMAP_LOCK(pmap);
 				goto do_l2b_alloc;
 			}
-			return;
+			return (KERN_RESOURCE_SHORTAGE);
 		}
 	}
 
@@ -3195,6 +3187,7 @@ pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 
 	if ((pmap != pmap_kernel()) && (pmap == &curproc->p_vmspace->vm_pmap))
 		cpu_icache_sync_range(va, PAGE_SIZE);
+	return (KERN_SUCCESS);
 }
 
 /*
@@ -3216,13 +3209,12 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end,
 	vm_offset_t va;
 	vm_page_t m;
 	vm_pindex_t diff, psize;
-	vm_prot_t access;
 
 	VM_OBJECT_ASSERT_LOCKED(m_start->object);
 
 	psize = atop(end - start);
 	m = m_start;
-	access = prot = prot & (VM_PROT_READ | VM_PROT_EXECUTE);
+	prot &= VM_PROT_READ | VM_PROT_EXECUTE;
 	rw_wlock(&pvh_global_lock);
 	PMAP_LOCK(pmap);
 	while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) {
@@ -3232,8 +3224,8 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end,
 		    pmap_enter_section(pmap, va, m, prot))
 			m = &m[L1_S_SIZE / PAGE_SIZE - 1];
 		else
-			pmap_enter_locked(pmap, va, access, m, prot,
-			    FALSE, M_NOWAIT);
+			pmap_enter_locked(pmap, va, m, prot,
+			    PMAP_ENTER_NOSLEEP);
 		m = TAILQ_NEXT(m, listq);
 	}
 	PMAP_UNLOCK(pmap);
@@ -3252,64 +3244,86 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end,
 void
 pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot)
 {
-	vm_prot_t access;
 
-	access = prot = prot & (VM_PROT_READ | VM_PROT_EXECUTE);
+	prot &= VM_PROT_READ | VM_PROT_EXECUTE;
 	rw_wlock(&pvh_global_lock);
 	PMAP_LOCK(pmap);
-	pmap_enter_locked(pmap, va, access, m, prot, FALSE, M_NOWAIT);
+	pmap_enter_locked(pmap, va, m, prot, PMAP_ENTER_NOSLEEP);
 	PMAP_UNLOCK(pmap);
 	rw_wunlock(&pvh_global_lock);
 }
 
 /*
- *	Routine:	pmap_change_wiring
- *	Function:	Change the wiring attribute for a map/virtual-address
- *			pair.
- *	In/out conditions:
- *			The mapping must already exist in the pmap.
+ *	Clear the wired attribute from the mappings for the specified range of
+ *	addresses in the given pmap.  Every valid mapping within that range
+ *	must have the wired attribute set.  In contrast, invalid mappings
+ *	cannot have the wired attribute set, so they are ignored.
+ *
+ *	XXX Wired mappings of unmanaged pages cannot be counted by this pmap
+ *	implementation.
  */
 void
-pmap_change_wiring(pmap_t pmap, vm_offset_t va, boolean_t wired)
+pmap_unwire(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
 	struct l2_bucket *l2b;
 	struct md_page *pvh;
-	struct pv_entry *pve;
-	pd_entry_t *pl1pd, l1pd;
+	pd_entry_t l1pd;
 	pt_entry_t *ptep, pte;
+	pv_entry_t pv;
+	vm_offset_t next_bucket;
+	vm_paddr_t pa;
 	vm_page_t m;
-
+ 
 	rw_wlock(&pvh_global_lock);
 	PMAP_LOCK(pmap);
-	pl1pd = &pmap->pm_l1->l1_kva[L1_IDX(va)];
-	l1pd = *pl1pd;
-	if ((l1pd & L1_TYPE_MASK) == L1_S_PROTO) {
-		m = PHYS_TO_VM_PAGE(l1pd & L1_S_FRAME);
-		KASSERT((m != NULL) && ((m->oflags & VPO_UNMANAGED) == 0),
-		    ("pmap_change_wiring: unmanaged superpage should not "
-		     "be changed"));
-		KASSERT(pmap != pmap_kernel(),
-		    ("pmap_change_wiring: managed kernel superpage "
-		     "should not exist"));
-		pvh = pa_to_pvh(l1pd & L1_S_FRAME);
-		pve = pmap_find_pv(pvh, pmap, trunc_1mpage(va));
-		if (!wired != ((pve->pv_flags & PVF_WIRED) == 0)) {
-			if (!pmap_demote_section(pmap, va))
-				panic("pmap_change_wiring: demotion failed");
-		} else
-			goto out;
+	while (sva < eva) {
+		next_bucket = L2_NEXT_BUCKET(sva);
+		l1pd = pmap->pm_l1->l1_kva[L1_IDX(sva)];
+		if ((l1pd & L1_TYPE_MASK) == L1_S_PROTO) {
+			pa = l1pd & L1_S_FRAME;
+			m = PHYS_TO_VM_PAGE(pa);
+			KASSERT(m != NULL && (m->oflags & VPO_UNMANAGED) == 0,
+			    ("pmap_unwire: unmanaged 1mpage %p", m));
+			pvh = pa_to_pvh(pa);
+			pv = pmap_find_pv(pvh, pmap, trunc_1mpage(sva));
+			if ((pv->pv_flags & PVF_WIRED) == 0)
+				panic("pmap_unwire: pv %p isn't wired", pv);
+
+			/*
+			 * Are we unwiring the entire large page? If not,
+			 * demote the mapping and fall through.
+			 */
+			if (sva + L1_S_SIZE == next_bucket &&
+			    eva >= next_bucket) {
+				pv->pv_flags &= ~PVF_WIRED;
+				pmap->pm_stats.wired_count -= L2_PTE_NUM_TOTAL;
+				sva = next_bucket;
+				continue;
+			} else if (!pmap_demote_section(pmap, sva))
+				panic("pmap_unwire: demotion failed");
+		}
+		if (next_bucket > eva)
+			next_bucket = eva;
+		l2b = pmap_get_l2_bucket(pmap, sva);
+		if (l2b == NULL) {
+			sva = next_bucket;
+			continue;
+		}
+		for (ptep = &l2b->l2b_kva[l2pte_index(sva)]; sva < next_bucket;
+		    sva += PAGE_SIZE, ptep++) {
+			if ((pte = *ptep) == 0 ||
+			    (m = PHYS_TO_VM_PAGE(l2pte_pa(pte))) == NULL ||
+			    (m->oflags & VPO_UNMANAGED) != 0)
+				continue;
+			pv = pmap_find_pv(&m->md, pmap, sva);
+			if ((pv->pv_flags & PVF_WIRED) == 0)
+				panic("pmap_unwire: pv %p isn't wired", pv);
+			pv->pv_flags &= ~PVF_WIRED;
+			pmap->pm_stats.wired_count--;
+		}
 	}
-	l2b = pmap_get_l2_bucket(pmap, va);
-	KASSERT(l2b, ("No l2b bucket in pmap_change_wiring"));
-	ptep = &l2b->l2b_kva[l2pte_index(va)];
-	pte = *ptep;
-	m = PHYS_TO_VM_PAGE(l2pte_pa(pte));
-	if (m != NULL)
-		pmap_modify_pv(m, pmap, va, PVF_WIRED,
-		    wired == TRUE ? PVF_WIRED : 0);
-out:
 	rw_wunlock(&pvh_global_lock);
-	PMAP_UNLOCK(pmap);
+ 	PMAP_UNLOCK(pmap);
 }
 
 
@@ -3486,8 +3500,8 @@ pmap_pinit(pmap_t pmap)
 	pmap->pm_stats.resident_count = 1;
 	if (vector_page < KERNBASE) {
 		pmap_enter(pmap, vector_page,
-		    VM_PROT_READ, PHYS_TO_VM_PAGE(systempage.pv_pa),
-		    VM_PROT_READ, 1);
+		    PHYS_TO_VM_PAGE(systempage.pv_pa), VM_PROT_READ,
+		    PMAP_ENTER_WIRED, 0);
 	}
 	return (1);
 }
@@ -4222,7 +4236,7 @@ pmap_free_pv_chunk(struct pv_chunk *pc)
 	/* entire chunk is free, return it */
 	m = PHYS_TO_VM_PAGE(pmap_kextract((vm_offset_t)pc));
 	pmap_qremove((vm_offset_t)pc, 1);
-	vm_page_unwire(m, 0);
+	vm_page_unwire(m, PQ_INACTIVE);
 	vm_page_free(m);
 	pmap_ptelist_free(&pv_vafree, (vm_offset_t)pc);
 
@@ -4315,7 +4329,7 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
 	struct l2_bucket *l2b;
 	vm_offset_t next_bucket;
-	pd_entry_t *pl1pd, l1pd;
+	pd_entry_t l1pd;
 	pt_entry_t *ptep;
 	u_int total;
 	u_int mappings, is_exec, is_refd;
@@ -4330,11 +4344,12 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 	PMAP_LOCK(pmap);
 	total = 0;
 	while (sva < eva) {
+		next_bucket = L2_NEXT_BUCKET(sva);
+
 		/*
 		 * Check for large page.
 		 */
-		pl1pd = &pmap->pm_l1->l1_kva[L1_IDX(sva)];
-		l1pd = *pl1pd;
+		l1pd = pmap->pm_l1->l1_kva[L1_IDX(sva)];
 		if ((l1pd & L1_TYPE_MASK) == L1_S_PROTO) {
 			KASSERT((l1pd & L1_S_DOM_MASK) !=
 			    L1_S_DOM(PMAP_DOMAIN_KERNEL), ("pmap_remove: "
@@ -4343,21 +4358,20 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 			 * Are we removing the entire large page?  If not,
 			 * demote the mapping and fall through.
 			 */
-			if (sva + L1_S_SIZE == L2_NEXT_BUCKET(sva) &&
-			    eva >= L2_NEXT_BUCKET(sva)) {
+			if (sva + L1_S_SIZE == next_bucket &&
+			    eva >= next_bucket) {
 				pmap_remove_section(pmap, sva);
-				sva = L2_NEXT_BUCKET(sva);
+				sva = next_bucket;
 				continue;
 			} else if (!pmap_demote_section(pmap, sva)) {
 				/* The large page mapping was destroyed. */
-				sva = L2_NEXT_BUCKET(sva);
+				sva = next_bucket;
 				continue;
 			}
 		}
 		/*
 		 * Do one L2 bucket's worth at a time.
 		 */
-		next_bucket = L2_NEXT_BUCKET(sva);
 		if (next_bucket > eva)
 			next_bucket = eva;
 
@@ -4856,7 +4870,7 @@ pmap_advise(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, int advice)
 {
 	struct l2_bucket *l2b;
 	struct pv_entry *pve;
-	pd_entry_t *pl1pd, l1pd;
+	pd_entry_t l1pd;
 	pt_entry_t *ptep, opte, pte;
 	vm_offset_t next_bucket;
 	vm_page_t m;
@@ -4869,8 +4883,7 @@ pmap_advise(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, int advice)
 		next_bucket = L2_NEXT_BUCKET(sva);
 		if (next_bucket < sva)
 			next_bucket = eva;
-		pl1pd = &pmap->pm_l1->l1_kva[L1_IDX(sva)];
-		l1pd = *pl1pd;
+		l1pd = pmap->pm_l1->l1_kva[L1_IDX(sva)];
 		if ((l1pd & L1_TYPE_MASK) == L1_S_PROTO) {
 			if (pmap == pmap_kernel())
 				continue;
diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c
index b014447d5ada..ec0d236fa978 100644
--- a/sys/arm/arm/pmap.c
+++ b/sys/arm/arm/pmap.c
@@ -199,8 +199,8 @@ extern int last_fault_code;
 static void pmap_free_pv_entry (pv_entry_t);
 static pv_entry_t pmap_get_pv_entry(void);
 
-static void		pmap_enter_locked(pmap_t, vm_offset_t, vm_page_t,
-    vm_prot_t, boolean_t, int);
+static int		pmap_enter_locked(pmap_t, vm_offset_t, vm_page_t,
+    vm_prot_t, u_int);
 static vm_paddr_t	pmap_extract_locked(pmap_t pmap, vm_offset_t va);
 static void		pmap_fix_cache(struct vm_page *, pmap_t, vm_offset_t);
 static void		pmap_alloc_l1(pmap_t);
@@ -3034,7 +3034,14 @@ pmap_remove_all(vm_page_t m)
 	if (TAILQ_EMPTY(&m->md.pv_list))
 		return;
 	rw_wlock(&pvh_global_lock);
-	pmap_remove_write(m);
+
+	/*
+	 * XXX This call shouldn't exist.  Iterating over the PV list twice,
+	 * once in pmap_clearbit() and again below, is both unnecessary and
+	 * inefficient.  The below code should itself write back the cache
+	 * entry before it destroys the mapping.
+	 */
+	pmap_clearbit(m, PVF_WRITE);
 	curpm = vmspace_pmap(curproc->p_vmspace);
 	while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) {
 		if (flush == FALSE && (pv->pv_pmap == curpm ||
@@ -3043,7 +3050,7 @@ pmap_remove_all(vm_page_t m)
 
 		PMAP_LOCK(pv->pv_pmap);
 		/*
-		 * Cached contents were written-back in pmap_remove_write(),
+		 * Cached contents were written-back in pmap_clearbit(),
 		 * but we still have to invalidate the cache entry to make
 		 * sure stale data are not retrieved when another page will be
 		 * mapped under this virtual address.
@@ -3201,24 +3208,26 @@ pmap_protect(pmap_t pm, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
  *	insert this page into the given map NOW.
  */
 
-void
-pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
-    vm_prot_t prot, boolean_t wired)
+int
+pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
+    u_int flags, int8_t psind __unused)
 {
+	int rv;
 
 	rw_wlock(&pvh_global_lock);
 	PMAP_LOCK(pmap);
-	pmap_enter_locked(pmap, va, m, prot, wired, M_WAITOK);
+	rv = pmap_enter_locked(pmap, va, m, prot, flags);
 	rw_wunlock(&pvh_global_lock);
  	PMAP_UNLOCK(pmap);
+	return (rv);
 }
 
 /*
  *	The pvh global and pmap locks must be held.
  */
-static void
+static int
 pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
-    boolean_t wired, int flags)
+    u_int flags)
 {
 	struct l2_bucket *l2b = NULL;
 	struct vm_page *opg;
@@ -3234,9 +3243,8 @@ pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 		pa = systempage.pv_pa;
 		m = NULL;
 	} else {
-		KASSERT((m->oflags & VPO_UNMANAGED) != 0 ||
-		    vm_page_xbusied(m) || (flags & M_NOWAIT) != 0,
-		    ("pmap_enter_locked: page %p is not busy", m));
+		if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m))
+			VM_OBJECT_ASSERT_LOCKED(m->object);
 		pa = VM_PAGE_TO_PHYS(m);
 	}
 	nflags = 0;
@@ -3244,10 +3252,10 @@ pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 		nflags |= PVF_WRITE;
 	if (prot & VM_PROT_EXECUTE)
 		nflags |= PVF_EXEC;
-	if (wired)
+	if ((flags & PMAP_ENTER_WIRED) != 0)
 		nflags |= PVF_WIRED;
 	PDEBUG(1, printf("pmap_enter: pmap = %08x, va = %08x, m = %08x, prot = %x, "
-	    "wired = %x\n", (uint32_t) pmap, va, (uint32_t) m, prot, wired));
+	    "flags = %x\n", (uint32_t) pmap, va, (uint32_t) m, prot, flags));
 
 	if (pmap == pmap_kernel()) {
 		l2b = pmap_get_l2_bucket(pmap, va);
@@ -3257,7 +3265,7 @@ pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 do_l2b_alloc:
 		l2b = pmap_alloc_l2_bucket(pmap, va);
 		if (l2b == NULL) {
-			if (flags & M_WAITOK) {
+			if ((flags & PMAP_ENTER_NOSLEEP) == 0) {
 				PMAP_UNLOCK(pmap);
 				rw_wunlock(&pvh_global_lock);
 				VM_WAIT;
@@ -3265,7 +3273,7 @@ pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 				PMAP_LOCK(pmap);
 				goto do_l2b_alloc;
 			}
-			return;
+			return (KERN_RESOURCE_SHORTAGE);
 		}
 	}
 
@@ -3479,6 +3487,7 @@ pmap_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 		if (m)
 			pmap_fix_cache(m, pmap, va);
 	}
+	return (KERN_SUCCESS);
 }
 
 /*
@@ -3508,7 +3517,7 @@ pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end,
 	PMAP_LOCK(pmap);
 	while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) {
 		pmap_enter_locked(pmap, start + ptoa(diff), m, prot &
-		    (VM_PROT_READ | VM_PROT_EXECUTE), FALSE, M_NOWAIT);
+		    (VM_PROT_READ | VM_PROT_EXECUTE), PMAP_ENTER_NOSLEEP);
 		m = TAILQ_NEXT(m, listq);
 	}
 	rw_wunlock(&pvh_global_lock);
@@ -3531,34 +3540,53 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot)
 	rw_wlock(&pvh_global_lock);
  	PMAP_LOCK(pmap);
 	pmap_enter_locked(pmap, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE),
-	    FALSE, M_NOWAIT);
+	    PMAP_ENTER_NOSLEEP);
 	rw_wunlock(&pvh_global_lock);
  	PMAP_UNLOCK(pmap);
 }
 
 /*
- *	Routine:	pmap_change_wiring
- *	Function:	Change the wiring attribute for a map/virtual-address
- *			pair.
- *	In/out conditions:
- *			The mapping must already exist in the pmap.
+ *	Clear the wired attribute from the mappings for the specified range of
+ *	addresses in the given pmap.  Every valid mapping within that range
+ *	must have the wired attribute set.  In contrast, invalid mappings
+ *	cannot have the wired attribute set, so they are ignored.
+ *
+ *	XXX Wired mappings of unmanaged pages cannot be counted by this pmap
+ *	implementation.
  */
 void
-pmap_change_wiring(pmap_t pmap, vm_offset_t va, boolean_t wired)
+pmap_unwire(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
 	struct l2_bucket *l2b;
 	pt_entry_t *ptep, pte;
-	vm_page_t pg;
-
+	pv_entry_t pv;
+	vm_offset_t next_bucket;
+	vm_page_t m;
+ 
 	rw_wlock(&pvh_global_lock);
- 	PMAP_LOCK(pmap);
-	l2b = pmap_get_l2_bucket(pmap, va);
-	KASSERT(l2b, ("No l2b bucket in pmap_change_wiring"));
-	ptep = &l2b->l2b_kva[l2pte_index(va)];
-	pte = *ptep;
-	pg = PHYS_TO_VM_PAGE(l2pte_pa(pte));
-	if (pg)
-		pmap_modify_pv(pg, pmap, va, PVF_WIRED, wired ? PVF_WIRED : 0);
+	PMAP_LOCK(pmap);
+	while (sva < eva) {
+		next_bucket = L2_NEXT_BUCKET(sva);
+		if (next_bucket > eva)
+			next_bucket = eva;
+		l2b = pmap_get_l2_bucket(pmap, sva);
+		if (l2b == NULL) {
+			sva = next_bucket;
+			continue;
+		}
+		for (ptep = &l2b->l2b_kva[l2pte_index(sva)]; sva < next_bucket;
+		    sva += PAGE_SIZE, ptep++) {
+			if ((pte = *ptep) == 0 ||
+			    (m = PHYS_TO_VM_PAGE(l2pte_pa(pte))) == NULL ||
+			    (m->oflags & VPO_UNMANAGED) != 0)
+				continue;
+			pv = pmap_find_pv(m, pmap, sva);
+			if ((pv->pv_flags & PVF_WIRED) == 0)
+				panic("pmap_unwire: pv %p isn't wired", pv);
+			pv->pv_flags &= ~PVF_WIRED;
+			pmap->pm_stats.wired_count--;
+		}
+	}
 	rw_wunlock(&pvh_global_lock);
  	PMAP_UNLOCK(pmap);
 }
@@ -3743,9 +3771,8 @@ pmap_pinit(pmap_t pmap)
 	bzero(&pmap->pm_stats, sizeof pmap->pm_stats);
 	pmap->pm_stats.resident_count = 1;
 	if (vector_page < KERNBASE) {
-		pmap_enter(pmap, vector_page,
-		    VM_PROT_READ, PHYS_TO_VM_PAGE(systempage.pv_pa),
-		    VM_PROT_READ, 1);
+		pmap_enter(pmap, vector_page, PHYS_TO_VM_PAGE(systempage.pv_pa),
+		    VM_PROT_READ, PMAP_ENTER_WIRED | VM_PROT_READ, 0);
 	}
 	return (1);
 }
diff --git a/sys/arm/arm/setstack.s b/sys/arm/arm/setstack.s
index b47a154ab2e1..72a9905aa37a 100644
--- a/sys/arm/arm/setstack.s
+++ b/sys/arm/arm/setstack.s
@@ -71,7 +71,7 @@ ENTRY(set_stackptr)
         msr	cpsr_fsxc, r3		/* Restore the old mode */
 
 	mov	pc, lr			/* Exit */
-
+END(set_stackptr)
 /* To get the stack pointer for a particular mode we must switch
  * to that mode copy the banked r13 and then switch back.
  * This routine provides an easy way of doing this for any mode
@@ -90,5 +90,5 @@ ENTRY(get_stackptr)
         msr	cpsr_fsxc, r3		/* Restore the old mode */
 
 	mov	pc, lr			/* Exit */
-
+END(get_stackptr)
 /* End of setstack.S */
diff --git a/sys/arm/arm/support.S b/sys/arm/arm/support.S
index 9019e3301eb4..2a6eec9828e0 100644
--- a/sys/arm/arm/support.S
+++ b/sys/arm/arm/support.S
@@ -130,7 +130,7 @@ ENTRY(bzero)
 .Lnormal0:
 	mov	r3, #0x00
 	b	do_memset
-
+EEND(bzero)
 /* LINTSTUB: Func: void *memset(void *, int, size_t) */
 ENTRY(memset)
 	and	r3, r1, #0xff		/* We deal with bytes */
@@ -276,7 +276,6 @@ do_memset:
 	strgeb	r3, [ip], #0x01		/* Set another byte */
 	strgtb	r3, [ip]		/* and a third */
 	RET			/* Exit */
-END(bzero)
 END(memset)
 
 ENTRY(bcmp)
@@ -394,7 +393,7 @@ ENTRY(bcopy)
 	eor     r0, r1, r0
 	eor     r1, r0, r1
 	eor     r0, r1, r0
-ENTRY(memmove)
+EENTRY(memmove)
 	/* Do the buffers overlap? */
 	cmp	r0, r1
 	RETeq		/* Bail now if src/dst are the same */
@@ -931,8 +930,8 @@ ENTRY(memmove)
 .Lmemmove_bsrcul1l4:
 	add	r1, r1, #1
 	b	.Lmemmove_bl4
+EEND(memmove)
 END(bcopy)
-END(memmove)
 
 #if !defined(_ARM_ARCH_5E)
 ENTRY(memcpy)
@@ -2945,13 +2944,17 @@ END(memcpy)
 
 ENTRY(user)
 	nop
+END(user)
 ENTRY(btrap)
 	nop
+END(btrap)
 ENTRY(etrap)
 	nop
+END(etrap)
 ENTRY(bintr)
 	nop
+END(bintr)
 ENTRY(eintr)
 	nop
-
+END(eintr)
 #endif
diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c
index df764e8531ac..4a9cf3f6a595 100644
--- a/sys/arm/arm/vm_machdep.c
+++ b/sys/arm/arm/vm_machdep.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <sys/socketvar.h>
-#include <sys/sf_buf.h>
 #include <sys/syscall.h>
 #include <sys/sysctl.h>
 #include <sys/sysent.h>
@@ -83,42 +82,6 @@ __FBSDID("$FreeBSD$");
 CTASSERT(sizeof(struct switchframe) == 24);
 CTASSERT(sizeof(struct trapframe) == 80);
 
-#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;
-
 /*
  * Finish a fork operation, with process p2 nearly set up.
  * Copy and update the pcb, set up the stack so that the child
@@ -184,106 +147,6 @@ cpu_thread_swapout(struct thread *td)
 {
 }
 
-/*
- * Detatch mapped page and release resources back to the system.
- */
-void
-sf_buf_free(struct sf_buf *sf)
-{
-
-	 mtx_lock(&sf_buf_lock);
-	 sf->ref_count--;
-	 if (sf->ref_count == 0) {
-		 TAILQ_INSERT_TAIL(&sf_buf_freelist, sf, free_entry);
-		 nsfbufsused--;
-		 pmap_kremove(sf->kva);
-		 sf->m = NULL;
-		 LIST_REMOVE(sf, list_entry);
-		 if (sf_buf_alloc_want > 0)
-			 wakeup(&sf_buf_freelist);
-	 }
-	 mtx_unlock(&sf_buf_lock);
-}
-
-/*
- * 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;
-
-	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;
-
-	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_kenter(sf->kva, VM_PAGE_TO_PHYS(sf->m));
-done:
-	mtx_unlock(&sf_buf_lock);
-	return (sf);
-}
-
 void
 cpu_set_syscall_retval(struct thread *td, int error)
 {
diff --git a/sys/arm/at91/if_ate.c b/sys/arm/at91/if_ate.c
index 100b7be19c5b..6b2eabc54ccc 100644
--- a/sys/arm/at91/if_ate.c
+++ b/sys/arm/at91/if_ate.c
@@ -671,7 +671,6 @@ ate_deactivate(struct ate_softc *sc)
 			bus_dmamem_free(sc->rx_tag, sc->rx_buf[i],
 			    sc->rx_map[i]);
 			sc->rx_buf[i] = NULL;
-			sc->rx_map[i] = NULL;
 		}
 		bus_dma_tag_destroy(sc->rx_tag);
 	}
diff --git a/sys/arm/conf/AC100 b/sys/arm/conf/AC100
deleted file mode 100644
index 3612cbcbcb9e..000000000000
--- a/sys/arm/conf/AC100
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# Custom kernel for Toshiba AC100
-#
-# $FreeBSD$
-#
-
-ident		AC100
-include		"../tegra/std.tegra2"
-
-makeoptions	MODULES_OVERRIDE=""
-
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-makeoptions	WERROR="-Werror"
-
-#options 	SCHED_ULE		# ULE scheduler
-options 	SCHED_4BSD		# 4BSD scheduler
-options 	INET			# InterNETworking
-#options 	INET6			# IPv6 communications protocols
-options 	FFS			# Berkeley Fast Filesystem
-#options 	NFSCL			# Network Filesystem Client
-#options 	NFSLOCKD		# Network Lock Manager
-#options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
-#options 	BOOTP
-#options 	BOOTP_NFSROOT
-#options 	BOOTP_NFSV3
-#options 	BOOTP_WIRED_TO=mge0
-
-options 	TMPFS			# Efficient memory filesystem
-options 	GEOM_PART_BSD		# BSD partition scheme
-options 	GEOM_PART_MBR		# MBR partition scheme
-options 	GEOM_PART_GPT
-options 	ROOTDEVNAME=\"ufs:/dev/da0p1\"
-
-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 	MUTEX_NOINLINE
-options 	RWLOCK_NOINLINE
-options 	NO_FFS_SNAPSHOT
-options 	NO_SWAPPING
-
-#options 	SMP
-
-# Debugging
-options 	VERBOSE_SYSINIT
-#options 	ALT_BREAK_TO_DEBUGGER
-options 	DDB
-options 	GDB
-options 	DIAGNOSTIC
-options 	INVARIANTS		# Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-options 	KDB
-options 	KDB_TRACE
-#options 	KTR
-#options 	KTR_VERBOSE=0
-#options 	KTR_ENTRIES=16384
-#options 	KTR_MASK=(KTR_SPARE2)
-#options 	KTR_COMPILE=KTR_ALL
-options 	WITNESS			# Enable checks to detect deadlocks and cycles
-options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-#options 	WITNESS_KDB
-options 	MUTEX_DEBUG
-
-# Pseudo devices
-device		random
-device		pty
-device		loop
-device		md
-
-# USB
-#options 	USB_DEBUG		# enable debug msgs
-#device		usb
-#device		ehci
-#device		umass
-#device		scbus
-#device		pass
-#device		da
-
-# SATA
-#device		ata
-#device		mvs
-
-# Serial ports
-device		uart
-
-# I2C (TWSI)
-#device		iic
-#device		iicbus
-
-#Network
-device		ether
-
-#FDT
-options 	FDT
-options 	FDT_DTB_STATIC
-makeoptions	FDT_DTS_FILE=tegra20-paz00.dts
-
diff --git a/sys/arm/conf/APALIS-IMX6 b/sys/arm/conf/APALIS-IMX6
new file mode 100644
index 000000000000..137677f1b409
--- /dev/null
+++ b/sys/arm/conf/APALIS-IMX6
@@ -0,0 +1,31 @@
+# Kernel configuration for Toradex Apalis i.MX6
+#
+# 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$
+
+#NO_UNIVERSE
+
+include  	"IMX6"
+ident		APALIS-IMX6
+
+makeoptions	MODULES_OVERRIDE=""
+makeoptions	WITHOUT_MODULES="ahc"
+
+# Flattened Device Tree
+options  	FDT
+options  	FDT_DTB_STATIC
+makeoptions  	FDT_DTS_FILE=apalis-imx6.dts
diff --git a/sys/arm/conf/CHROMEBOOK b/sys/arm/conf/CHROMEBOOK
index d187f1f43f89..94591517cce4 100644
--- a/sys/arm/conf/CHROMEBOOK
+++ b/sys/arm/conf/CHROMEBOOK
@@ -22,14 +22,12 @@ ident		CHROMEBOOK
 
 hints		"CHROMEBOOK.hints"
 
-device		chrome_ec	# Chrome Embedded Controller
+device		chrome_ec_i2c	# Chrome Embedded Controller
 device		chrome_kb	# Chrome Keyboard
 
 # Framebuffer
 device		vt
 device		kbdmux
-options 	SC_DFLT_FONT		# compile font in
-makeoptions	SC_DFLT_FONT=cp437
 device		ukbd
 
 #FDT
diff --git a/sys/arm/conf/CHROMEBOOK-PEACH-PIT b/sys/arm/conf/CHROMEBOOK-PEACH-PIT
new file mode 100644
index 000000000000..7bcfed7ed01c
--- /dev/null
+++ b/sys/arm/conf/CHROMEBOOK-PEACH-PIT
@@ -0,0 +1,47 @@
+# Kernel configuration for Chromebook2 (Exynos5 Octa machine).
+#
+# 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$
+
+#NO_UNIVERSE
+
+include		"EXYNOS5420"
+ident		CHROMEBOOK-PEACH-PIT
+
+hints		"CHROMEBOOK-PEACH-PIT.hints"
+
+device		chrome_ec_spi	# Chrome Embedded Controller
+device		chrome_kb	# Chrome Keyboard
+
+# Framebuffer
+device		vt
+device		kbdmux
+device		ukbd
+
+# 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=ue0
+#options	ROOTDEVNAME=\"nfs:10.5.0.1:/tftpboot/root\"
+
+#FDT
+options		FDT
+options		FDT_DTB_STATIC
+makeoptions	FDT_DTS_FILE=exynos5420-peach-pit.dts
diff --git a/sys/arm/conf/CHROMEBOOK-PEACH-PIT.hints b/sys/arm/conf/CHROMEBOOK-PEACH-PIT.hints
new file mode 100644
index 000000000000..81737c1280e2
--- /dev/null
+++ b/sys/arm/conf/CHROMEBOOK-PEACH-PIT.hints
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+# Chrome Embedded Controller
+hint.chrome_ec.0.at="spibus0"
+hint.chrome_ec.0.addr=0x00
diff --git a/sys/arm/conf/CHROMEBOOK-SNOW b/sys/arm/conf/CHROMEBOOK-SNOW
index eaab60e1c756..e9242d1b47e1 100644
--- a/sys/arm/conf/CHROMEBOOK-SNOW
+++ b/sys/arm/conf/CHROMEBOOK-SNOW
@@ -25,4 +25,4 @@ ident		CHROMEBOOK-SNOW
 #FDT
 options 	FDT
 options 	FDT_DTB_STATIC
-makeoptions	FDT_DTS_FILE=exynos5250-chromebook-snow.dts
+makeoptions	FDT_DTS_FILE=exynos5250-snow.dts
diff --git a/sys/arm/conf/CHROMEBOOK-SPRING b/sys/arm/conf/CHROMEBOOK-SPRING
index b2f00bce1a04..1b791ac652bc 100644
--- a/sys/arm/conf/CHROMEBOOK-SPRING
+++ b/sys/arm/conf/CHROMEBOOK-SPRING
@@ -25,4 +25,4 @@ ident		CHROMEBOOK-SPRING
 #FDT
 options 	FDT
 options 	FDT_DTB_STATIC
-makeoptions	FDT_DTS_FILE=exynos5250-chromebook-spring.dts
+makeoptions	FDT_DTS_FILE=exynos5250-spring.dts
diff --git a/sys/arm/conf/EXYNOS5.common b/sys/arm/conf/EXYNOS5.common
index ec61e8b5c5a2..164058bc23b1 100644
--- a/sys/arm/conf/EXYNOS5.common
+++ b/sys/arm/conf/EXYNOS5.common
@@ -51,6 +51,8 @@ options 	PREEMPTION
 options 	FREEBSD_BOOT_LOADER
 options 	VFP			# vfp/neon
 
+options 	SMP
+
 # Debugging
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	BREAK_TO_DEBUGGER
@@ -99,6 +101,7 @@ options 	USB_DEBUG
 #device		musb
 device		ehci
 #device		ohci
+device		xhci
 
 device		umass
 device		scbus			# SCSI bus (required for SCSI)
@@ -117,6 +120,10 @@ device		uart
 device		iic
 device		iicbus
 
+# SPI
+device		spibus
+device		exynos_spi
+
 # Ethernet
 device		ether
 device		mii
diff --git a/sys/arm/conf/EXYNOS5250 b/sys/arm/conf/EXYNOS5250
index 16f1d75ef750..156d8564eba1 100644
--- a/sys/arm/conf/EXYNOS5250
+++ b/sys/arm/conf/EXYNOS5250
@@ -21,7 +21,5 @@ ident		EXYNOS5250
 include		"EXYNOS5.common"
 include		"../samsung/exynos/std.exynos5250"
 
-options		SMP
-
 #FDT
 options 	FDT
diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6
index 47819c419d0b..7aacff23c474 100644
--- a/sys/arm/conf/IMX6
+++ b/sys/arm/conf/IMX6
@@ -82,6 +82,9 @@ device  	miibus			# Required for ethernet
 device  	bpf			# Berkeley packet filter (required for DHCP)
 #device  	iomux			# IO Multiplexor
 
+# General-purpose input/output
+device  	gpio
+
 # Serial (COM) ports
 device  	uart			# Multi-uart driver
 
@@ -106,7 +109,7 @@ device  	u3g			# USB modems
 #device  	ukbd			# Allow keyboard like HIDs to control console
 #device  	ums			# USB mouse
 
-# USB Ethernet, requires miibus 	
+# USB Ethernet, requires miibus
 #device  	aue			# ADMtek USB Ethernet
 #device  	axe			# ASIX Electronics USB Ethernet
 #device  	cdce			# Generic USB over Ethernet
@@ -151,8 +154,8 @@ options  	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 
 # SoC-specific devices
 device  	ffec			# Freescale Fast Ethernet Controller
-#device  	fsliic			# Freescale i2c/iic (not ready yet)
-#device  	iic			# iic protocol
-#device  	iicbus			# iic bus
+device  	fsliic			# Freescale i2c/iic
+device  	iic			# iic protocol
+device  	iicbus			# iic bus
 #device  	imxwdt			# Watchdog. WARNING: can't be disabled!!!
 
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index 57775d1a71c1..322a4ecf83ff 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -72,8 +72,6 @@ device		pty
 # Comment following lines for boot console on serial port
 device		vt
 device		kbdmux
-options         SC_DFLT_FONT		# compile font in
-makeoptions     SC_DFLT_FONT=cp437
 device		ukbd
 
 device		sdhci
diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID
index ca2d93d8e096..510f9b4976a0 100644
--- a/sys/arm/conf/VYBRID
+++ b/sys/arm/conf/VYBRID
@@ -148,8 +148,6 @@ device		vf_spi
 # Framebuffer
 device		vt
 device		kbdmux
-options 	SC_DFLT_FONT		# compile font in
-makeoptions	SC_DFLT_FONT=cp437
 device		ukbd
 
 options 	FDT
diff --git a/sys/arm/freescale/imx/files.imx51 b/sys/arm/freescale/imx/files.imx51
index 49aeceb6d04c..17ae33ed17d3 100644
--- a/sys/arm/freescale/imx/files.imx51
+++ b/sys/arm/freescale/imx/files.imx51
@@ -22,7 +22,7 @@ arm/freescale/imx/tzic.c		standard
 arm/freescale/imx/imx51_iomux.c		optional iomux
 
 # GPIO
-arm/freescale/imx/imx51_gpio.c		optional gpio
+arm/freescale/imx/imx_gpio.c		optional gpio
 
 # Generic Periodic Timer
 arm/freescale/imx/imx_gpt.c		standard
@@ -44,7 +44,7 @@ dev/usb/controller/ehci_imx.c		optional ehci
 arm/freescale/imx/imx_wdog.c		optional imxwdt
 
 # i2c
-arm/freescale/imx/i2c.c			optional fsliic
+arm/freescale/imx/imx_i2c.c		optional fsliic
 
 # IPU - Image Processing Unit (frame buffer also)
 arm/freescale/imx/imx51_ipuv3.c		optional sc
diff --git a/sys/arm/freescale/imx/files.imx53 b/sys/arm/freescale/imx/files.imx53
index ef594a73bfe0..301ea784c142 100644
--- a/sys/arm/freescale/imx/files.imx53
+++ b/sys/arm/freescale/imx/files.imx53
@@ -25,7 +25,7 @@ arm/freescale/imx/tzic.c		standard
 arm/freescale/imx/imx51_iomux.c		optional iomux
 
 # GPIO
-arm/freescale/imx/imx51_gpio.c		optional gpio
+arm/freescale/imx/imx_gpio.c		optional gpio
 
 # Generic Periodic Timer
 arm/freescale/imx/imx_gpt.c		standard
@@ -47,7 +47,7 @@ dev/usb/controller/ehci_imx.c		optional ehci
 arm/freescale/imx/imx_wdog.c		optional imxwdt
 
 # i2c
-arm/freescale/imx/i2c.c			optional fsliic
+arm/freescale/imx/imx_i2c.c		optional fsliic
 
 # IPU - Image Processing Unit (frame buffer also)
 arm/freescale/imx/imx51_ipuv3.c		optional sc
diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6
index be9b8a3970b7..0074be55bd2b 100644
--- a/sys/arm/freescale/imx/files.imx6
+++ b/sys/arm/freescale/imx/files.imx6
@@ -26,6 +26,8 @@ arm/freescale/imx/imx6_mp.c		optional smp
 arm/freescale/imx/imx6_pl310.c		standard
 arm/freescale/imx/imx_machdep.c		standard
 arm/freescale/imx/imx_gpt.c		standard
+arm/freescale/imx/imx_gpio.c		optional gpio
+arm/freescale/imx/imx_i2c.c		optional fsliic
 
 #
 # Optional devices.
@@ -50,8 +52,5 @@ arm/freescale/imx/imx6_usbphy.c		optional ehci
 # 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
 #arm/freescale/imx/imx51_ipuv3.c  	optional sc
-
diff --git a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
index 25d17c7aa180..48282407e9a1 100644
--- a/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
+++ b/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
@@ -163,18 +163,18 @@ ipu3_fb_init_cmap(uint32_t *cmap, int bytespp)
 
 	switch (bytespp) {
 	case 8:
-		return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
+		return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB,
 		    0x7, 5, 0x7, 2, 0x3, 0));
 	case 15:
-		return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
+		return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB,
 		    0x1f, 10, 0x1f, 5, 0x1f, 0));
 	case 16:
-		return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
+		return (vt_generate_cons_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, 16, 0xff, 8, 0xff, 0));
+		return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB,
+		    0xff, 0, 0xff, 8, 0xff, 16));
 	default:
 		return (1);
 	}
diff --git a/sys/arm/freescale/imx/imx6_anatop.c b/sys/arm/freescale/imx/imx6_anatop.c
index b1757fbdf1a8..30978381b8f0 100644
--- a/sys/arm/freescale/imx/imx6_anatop.c
+++ b/sys/arm/freescale/imx/imx6_anatop.c
@@ -375,12 +375,12 @@ cpufreq_initialize(struct imx6_anatop_softc *sc)
 	    "CPU frequency");
 
 	SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_imx6), 
-	    OID_AUTO, "cpu_minmhz", CTLTYPE_INT | CTLFLAG_RWTUN, sc, 0,
-	    cpufreq_sysctl_minmhz, "IU", "Minimum CPU frequency");
+	    OID_AUTO, "cpu_minmhz", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH,
+	    sc, 0, cpufreq_sysctl_minmhz, "IU", "Minimum CPU frequency");
 
 	SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_imx6),
-	    OID_AUTO, "cpu_maxmhz", CTLTYPE_INT | CTLFLAG_RWTUN, sc, 0,
-	    cpufreq_sysctl_maxmhz, "IU", "Maximum CPU frequency");
+	    OID_AUTO, "cpu_maxmhz", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH,
+	    sc, 0, cpufreq_sysctl_maxmhz, "IU", "Maximum CPU frequency");
 
 	SYSCTL_ADD_INT(NULL, SYSCTL_STATIC_CHILDREN(_hw_imx6),
 	    OID_AUTO, "cpu_maxmhz_hw", CTLFLAG_RD, &sc->cpu_maxmhz_hw, 0, 
@@ -413,9 +413,6 @@ cpufreq_initialize(struct imx6_anatop_softc *sc)
 	sc->cpu_maxmhz_hw = imx6_ocotp_mhz_tab[cfg3speed];
 	sc->cpu_maxmhz = sc->cpu_maxmhz_hw;
 
-	TUNABLE_INT_FETCH("hw.imx6.cpu_overclock_enable",
-	    &sc->cpu_overclock_enable);
-
 	TUNABLE_INT_FETCH("hw.imx6.cpu_minmhz", &sc->cpu_minmhz);
 	op = cpufreq_nearest_oppt(sc, sc->cpu_minmhz);
 	sc->cpu_minmhz = op->mhz;
diff --git a/sys/arm/freescale/imx/imx6_ccmreg.h b/sys/arm/freescale/imx/imx6_ccmreg.h
index 9cb7acc18a56..d50c190c736f 100644
--- a/sys/arm/freescale/imx/imx6_ccmreg.h
+++ b/sys/arm/freescale/imx/imx6_ccmreg.h
@@ -36,6 +36,7 @@
 #define	  CCM_CLPCR_LPM_STOP		  0x02
 #define	CCM_CGPR			0x064
 #define	  CCM_CGPR_INT_MEM_CLK_LPM	  (1 << 17)
+#define	CCM_CCGR0			0x068
 #define	CCM_CCGR1			0x06C
 #define	CCM_CCGR2			0x070
 #define	CCM_CCGR3			0x074
diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c
index eb69eda0f2c3..139e2cd2ecda 100644
--- a/sys/arm/freescale/imx/imx6_machdep.c
+++ b/sys/arm/freescale/imx/imx6_machdep.c
@@ -146,12 +146,16 @@ u_int imx_soc_type()
 {
 	uint32_t digprog, hwsoc;
 	uint32_t *pcr;
+	static u_int soctype;
 	const vm_offset_t SCU_CONFIG_PHYSADDR = 0x00a00004;
 #define	HWSOC_MX6SL	0x60
 #define	HWSOC_MX6DL	0x61
 #define	HWSOC_MX6SOLO	0x62
 #define	HWSOC_MX6Q	0x63
 
+	if (soctype != 0)
+		return (soctype);
+
 	digprog = imx6_anatop_read_4(IMX6_ANALOG_DIGPROG_SL);
 	hwsoc = (digprog >> IMX6_ANALOG_DIGPROG_SOCTYPE_SHIFT) & 
 	    IMX6_ANALOG_DIGPROG_SOCTYPE_MASK;
@@ -175,20 +179,25 @@ u_int imx_soc_type()
 
 	switch (hwsoc) {
 	case HWSOC_MX6SL:
-		return (IMXSOC_6SL);
+		soctype = IMXSOC_6SL;
+		break;
 	case HWSOC_MX6SOLO:
-		return (IMXSOC_6S);
+		soctype = IMXSOC_6S;
+		break;
 	case HWSOC_MX6DL:
-		return (IMXSOC_6DL);
+		soctype = IMXSOC_6DL;
+		break;
 	case HWSOC_MX6Q :
-		return (IMXSOC_6Q);
+		soctype = IMXSOC_6Q;
+		break;
 	default:
 		printf("imx_soc_type: Don't understand hwsoc 0x%02x, "
 		    "digprog 0x%08x; assuming IMXSOC_6Q\n", hwsoc, digprog);
+		soctype = IMXSOC_6Q;
 		break;
 	}
 
-	return (IMXSOC_6Q);
+	return (soctype);
 }
 
 /*
diff --git a/sys/arm/freescale/imx/imx6_mp.c b/sys/arm/freescale/imx/imx6_mp.c
index dfa435bc149c..e6366dd9b8a5 100644
--- a/sys/arm/freescale/imx/imx6_mp.c
+++ b/sys/arm/freescale/imx/imx6_mp.c
@@ -162,7 +162,7 @@ platform_mp_start_ap(void)
 		    ( 1 << (SRC_CONTROL_C1RST_SHIFT - 1 + i)));
 
 	}
-	bus_space_write_4(fdtbus_bs_tag, src, 0, val);
+	bus_space_write_4(fdtbus_bs_tag, src, SRC_CONTROL_REG, val);
 
 	armv7_sev();
 
diff --git a/sys/arm/freescale/imx/imx51_gpio.c b/sys/arm/freescale/imx/imx_gpio.c
similarity index 97%
rename from sys/arm/freescale/imx/imx51_gpio.c
rename to sys/arm/freescale/imx/imx_gpio.c
index 1c1eed188753..95e24ca0378e 100644
--- a/sys/arm/freescale/imx/imx51_gpio.c
+++ b/sys/arm/freescale/imx/imx_gpio.c
@@ -102,6 +102,13 @@ struct imx51_gpio_softc {
 	struct gpio_pin		gpio_pins[NGPIO];
 };
 
+static struct ofw_compat_data compat_data[] = {
+	{"fsl,imx6q-gpio",  1},
+	{"fsl,imx53-gpio",  1},
+	{"fsl,imx51-gpio",  1},
+	{NULL,	            0}
+};
+
 static struct resource_spec imx_gpio_spec[] = {
 	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
 	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
@@ -355,7 +362,7 @@ imx51_gpio_intr(void *arg)
 	sc = arg;
 	input = READ4(sc, IMX_GPIO_ISR_REG);
 	value = input & READ4(sc, IMX_GPIO_IMR_REG);
-	WRITE4(sc, IMX_GPIO_DR_REG, input);
+	WRITE4(sc, IMX_GPIO_ISR_REG, input);
 
 	if (!value)
 		goto intr_done;
@@ -373,9 +380,8 @@ imx51_gpio_probe(device_t dev)
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
-	if (ofw_bus_is_compatible(dev, "fsl,imx51-gpio") ||
-	    ofw_bus_is_compatible(dev, "fsl,imx53-gpio")) {
-		device_set_desc(dev, "i.MX515 GPIO Controller");
+	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) {
+		device_set_desc(dev, "Freescale i.MX GPIO Controller");
 		return (BUS_PROBE_DEFAULT);
 	}
 
diff --git a/sys/arm/freescale/imx/i2c.c b/sys/arm/freescale/imx/imx_i2c.c
similarity index 97%
rename from sys/arm/freescale/imx/i2c.c
rename to sys/arm/freescale/imx/imx_i2c.c
index dd74a7dd847f..3c192ead291b 100644
--- a/sys/arm/freescale/imx/i2c.c
+++ b/sys/arm/freescale/imx/imx_i2c.c
@@ -86,6 +86,12 @@ __FBSDID("$FreeBSD$");
 #define debugf(fmt, args...)
 #endif
 
+static struct ofw_compat_data compat_data[] = {
+	{"fsl,imx6q-i2c",  1},
+	{"fsl,imx-i2c",	   1},
+	{NULL,             0}
+};
+
 struct i2c_softc {
 	device_t		dev;
 	device_t		iicbus;
@@ -227,7 +233,7 @@ i2c_probe(device_t dev)
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
-	if (!ofw_bus_is_compatible(dev, "fsl,imx-i2c"))
+	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
 		return (ENXIO);
 
 	sc = device_get_softc(dev);
@@ -246,7 +252,7 @@ i2c_probe(device_t dev)
 	/* Enable I2C */
 	i2c_write_reg(sc, I2C_CONTROL_REG, I2CCR_MEN);
 	bus_release_resource(dev, SYS_RES_MEMORY, sc->rid, sc->res);
-	device_set_desc(dev, "I2C bus controller");
+	device_set_desc(dev, "Freescale i.MX I2C bus controller");
 
 	return (BUS_PROBE_DEFAULT);
 }
diff --git a/sys/arm/freescale/vybrid/files.vybrid b/sys/arm/freescale/vybrid/files.vybrid
index b054259ac1a6..572a3ef1c4bb 100644
--- a/sys/arm/freescale/vybrid/files.vybrid
+++ b/sys/arm/freescale/vybrid/files.vybrid
@@ -23,6 +23,7 @@ arm/freescale/vybrid/vf_src.c			standard
 arm/freescale/vybrid/vf_edma.c			standard
 arm/freescale/vybrid/vf_dmamux.c		standard
 arm/freescale/vybrid/vf_port.c			standard
+arm/freescale/vybrid/vf_adc.c			standard
 arm/freescale/vybrid/vf_i2c.c			optional	iicbus
 arm/freescale/vybrid/vf_tcon.c			optional	vt
 arm/freescale/vybrid/vf_dcu4.c			optional	vt
diff --git a/sys/arm/freescale/vybrid/vf_adc.c b/sys/arm/freescale/vybrid/vf_adc.c
new file mode 100644
index 000000000000..f497ec09f8b1
--- /dev/null
+++ b/sys/arm/freescale/vybrid/vf_adc.c
@@ -0,0 +1,245 @@
+/*-
+ * Copyright (c) 2014 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 12-bit Analog to Digital Converter (ADC)
+ * Chapter 37, 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 <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>
+#include <arm/freescale/vybrid/vf_adc.h>
+
+#define	ADC_HC0		0x00		/* Ctrl reg for hardware triggers */
+#define	ADC_HC1		0x04		/* Ctrl reg for hardware triggers */
+#define	 HC_AIEN	(1 << 7)	/* Conversion Complete Int Control */
+#define	 HC_ADCH_M	0x1f		/* Input Channel Select Mask */
+#define	 HC_ADCH_S	0		/* Input Channel Select Shift */
+#define	ADC_HS		0x08		/* Status register for HW triggers */
+#define	 HS_COCO0	(1 << 0)	/* Conversion Complete Flag */
+#define	 HS_COCO1	(1 << 1)	/* Conversion Complete Flag */
+#define	ADC_R0		0x0C		/* Data result reg for HW triggers */
+#define	ADC_R1		0x10		/* Data result reg for HW triggers */
+#define	ADC_CFG		0x14		/* Configuration register */
+#define	 CFG_OVWREN	(1 << 16)	/* Data Overwrite Enable */
+#define	 CFG_AVGS_M	0x3		/* Hardware Average select Mask */
+#define	 CFG_AVGS_S	14		/* Hardware Average select Shift */
+#define	 CFG_ADTRG	(1 << 13)	/* Conversion Trigger Select */
+#define	 CFG_REFSEL_M	0x3		/* Voltage Reference Select Mask */
+#define	 CFG_REFSEL_S	11		/* Voltage Reference Select Shift */
+#define	 CFG_ADHSC	(1 << 10)	/* High Speed Configuration */
+#define	 CFG_ADSTS_M	0x3		/* Defines the sample time duration */
+#define	 CFG_ADSTS_S	8		/* Defines the sample time duration */
+#define	 CFG_ADLPC	(1 << 7)	/* Low-Power Configuration */
+#define	 CFG_ADIV_M	0x3		/* Clock Divide Select */
+#define	 CFG_ADIV_S	5		/* Clock Divide Select */
+#define	 CFG_ADLSMP	(1 << 4)	/* Long Sample Time Configuration */
+#define	 CFG_MODE_M	0x3		/* Conversion Mode Selection Mask */
+#define	 CFG_MODE_S	2		/* Conversion Mode Selection Shift */
+#define	 CFG_MODE_12	0x2		/* 12-bit mode */
+#define	 CFG_ADICLK_M	0x3		/* Input Clock Select Mask */
+#define	 CFG_ADICLK_S	0		/* Input Clock Select Shift */
+#define	ADC_GC		0x18		/* General control register */
+#define	 GC_CAL		(1 << 7)	/* Calibration */
+#define	 GC_ADCO	(1 << 6)	/* Continuous Conversion Enable */
+#define	 GC_AVGE	(1 << 5)	/* Hardware average enable */
+#define	 GC_ACFE	(1 << 4)	/* Compare Function Enable */
+#define	 GC_ACFGT	(1 << 3)	/* Compare Function Greater Than En */
+#define	 GC_ACREN	(1 << 2)	/* Compare Function Range En */
+#define	 GC_DMAEN	(1 << 1)	/* DMA Enable */
+#define	 GC_ADACKEN	(1 << 0)	/* Asynchronous clock output enable */
+#define	ADC_GS		0x1C		/* General status register */
+#define	 GS_AWKST	(1 << 2)	/* Asynchronous wakeup int status */
+#define	 GS_CALF	(1 << 1)	/* Calibration Failed Flag */
+#define	 GS_ADACT	(1 << 0)	/* Conversion Active */
+#define	ADC_CV		0x20		/* Compare value register */
+#define	 CV_CV2_M	0xfff		/* Compare Value 2 Mask */
+#define	 CV_CV2_S	16		/* Compare Value 2 Shift */
+#define	 CV_CV1_M	0xfff		/* Compare Value 1 Mask */
+#define	 CV_CV1_S	0		/* Compare Value 1 Shift */
+#define	ADC_OFS		0x24		/* Offset correction value register */
+#define	 OFS_SIGN	12		/* Sign bit */
+#define	 OFS_M		0xfff		/* Offset value Mask */
+#define	 OFS_S		0		/* Offset value Shift */
+#define	ADC_CAL		0x28		/* Calibration value register */
+#define	 CAL_CODE_M	0xf		/* Calibration Result Value Mask */
+#define	 CAL_CODE_S	0		/* Calibration Result Value Shift */
+#define	ADC_PCTL	0x30		/* Pin control register */
+
+struct adc_softc {
+	struct resource		*res[2];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+	void			*ih;
+};
+
+struct adc_softc *adc_sc;
+
+static struct resource_spec adc_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static int
+adc_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (!ofw_bus_is_compatible(dev, "fsl,mvf600-adc"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Vybrid Family "
+	    "12-bit Analog to Digital Converter");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static void
+adc_intr(void *arg)
+{
+	struct adc_softc *sc;
+
+	sc = arg;
+
+	/* Conversation complete */
+}
+
+uint32_t
+adc_read(void)
+{
+	struct adc_softc *sc;
+
+	sc = adc_sc;
+	if (sc == NULL)
+		return (0);
+
+	return (READ4(sc, ADC_R0));
+}
+
+uint32_t
+adc_enable(int channel)
+{
+	struct adc_softc *sc;
+	int reg;
+
+	sc = adc_sc;
+	if (sc == NULL)
+		return (1);
+
+	reg = READ4(sc, ADC_HC0);
+	reg &= ~(HC_ADCH_M << HC_ADCH_S);
+	reg |= (channel << HC_ADCH_S);
+	WRITE4(sc, ADC_HC0, reg);
+
+	return (0);
+}
+
+static int
+adc_attach(device_t dev)
+{
+	struct adc_softc *sc;
+	int err;
+	int reg;
+
+	sc = device_get_softc(dev);
+
+	if (bus_alloc_resources(dev, adc_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]);
+
+	adc_sc = sc;
+
+	/* Setup interrupt handler */
+	err = bus_setup_intr(dev, sc->res[1], INTR_TYPE_BIO | INTR_MPSAFE,
+	    NULL, adc_intr, sc, &sc->ih);
+	if (err) {
+		device_printf(dev, "Unable to alloc interrupt resource.\n");
+		return (ENXIO);
+	}
+
+	/* Configure 12-bit mode */
+	reg = READ4(sc, ADC_CFG);
+	reg &= ~(CFG_MODE_M << CFG_MODE_S);
+	reg |= (CFG_MODE_12 << CFG_MODE_S); /* 12bit */
+	WRITE4(sc, ADC_CFG, reg);
+
+	/* Configure for continuous conversion */
+	reg = READ4(sc, ADC_GC);
+	reg |= (GC_ADCO | GC_AVGE);
+	WRITE4(sc, ADC_GC, reg);
+
+	/* Disable interrupts */
+	reg = READ4(sc, ADC_HC0);
+	reg &= HC_AIEN;
+	WRITE4(sc, ADC_HC0, reg);
+
+	return (0);
+}
+
+static device_method_t adc_methods[] = {
+	DEVMETHOD(device_probe,		adc_probe),
+	DEVMETHOD(device_attach,	adc_attach),
+	{ 0, 0 }
+};
+
+static driver_t adc_driver = {
+	"adc",
+	adc_methods,
+	sizeof(struct adc_softc),
+};
+
+static devclass_t adc_devclass;
+
+DRIVER_MODULE(adc, simplebus, adc_driver, adc_devclass, 0, 0);
diff --git a/usr.bin/csup/main.h b/sys/arm/freescale/vybrid/vf_adc.h
similarity index 92%
rename from usr.bin/csup/main.h
rename to sys/arm/freescale/vybrid/vf_adc.h
index 217c7eb9c1ac..efb231f70a8f 100644
--- a/usr.bin/csup/main.h
+++ b/sys/arm/freescale/vybrid/vf_adc.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2003-2004, Maxime Henrion <mux@FreeBSD.org>
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
-extern int verbose;
+uint32_t adc_read(void);
+uint32_t adc_enable(int);
diff --git a/sys/arm/freescale/vybrid/vf_i2c.c b/sys/arm/freescale/vybrid/vf_i2c.c
index 67254b4a0bec..2eb67264a19b 100644
--- a/sys/arm/freescale/vybrid/vf_i2c.c
+++ b/sys/arm/freescale/vybrid/vf_i2c.c
@@ -30,7 +30,7 @@
  */
 
 /*
- * This driver is based on the I2C driver for IMX (imx/i2c.c).
+ * This driver is based on the I2C driver for i.MX
  */
 
 #include <sys/cdefs.h>
diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h
index 4ba76868f4a6..1229c1c8b3e5 100644
--- a/sys/arm/include/asm.h
+++ b/sys/arm/include/asm.h
@@ -74,9 +74,20 @@
 #define GLOBAL(X) .globl x
 #define _ENTRY(x) \
 	.text; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; x: _FNSTART
-
 #define	_END(x)	.size x, . - x; _FNEND
 
+/*
+ * EENTRY()/EEND() mark "extra" entry/exit points from a function.
+ * The unwind info cannot handle the concept of a nested function, or a function
+ * with multiple .fnstart directives, but some of our assembler code is written
+ * with multiple labels to allow entry at several points.  The EENTRY() macro
+ * defines such an extra entry point without a new .fnstart, so that it's
+ * basically just a label that you can jump to.  The EEND() macro does nothing
+ * at all, except document the exit point associated with the same-named entry.
+ */
+#define _EENTRY(x) 	.globl x; .type x,_ASM_TYPE_FUNCTION; x:
+#define _EEND(x)	/* nothing */
+
 #ifdef GPROF
 #  define _PROF_PROLOGUE	\
 	mov ip, lr; bl __mcount
@@ -85,11 +96,17 @@
 #endif
 
 #define	ENTRY(y)	_ENTRY(_C_LABEL(y)); _PROF_PROLOGUE
+#define	EENTRY(y)	_EENTRY(_C_LABEL(y)); _PROF_PROLOGUE
 #define	ENTRY_NP(y)	_ENTRY(_C_LABEL(y))
+#define	EENTRY_NP(y)	_EENTRY(_C_LABEL(y))
 #define	END(y)		_END(_C_LABEL(y))
+#define	EEND(y)
 #define	ASENTRY(y)	_ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE
+#define	ASEENTRY(y)	_EENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE
 #define	ASENTRY_NP(y)	_ENTRY(_ASM_LABEL(y))
+#define	ASEENTRY_NP(y)	_EENTRY(_ASM_LABEL(y))
 #define	ASEND(y)	_END(_ASM_LABEL(y))
+#define	ASEEND(y)
 
 #define	ASMSTR		.asciz
 
diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h
index 02be1bdff555..a62ca0037446 100644
--- a/sys/arm/include/atomic.h
+++ b/sys/arm/include/atomic.h
@@ -88,6 +88,8 @@
 	defined (__ARM_ARCH_6T2__) || \
 	defined (__ARM_ARCH_6Z__)  || \
 	defined (__ARM_ARCH_6ZK__)
+#define	ARM_HAVE_ATOMIC64
+
 static __inline void
 __do_dmb(void)
 {
@@ -145,6 +147,28 @@ atomic_set_32(volatile uint32_t *address, uint32_t setmask)
 			     
 }
 
+static __inline void
+atomic_set_64(volatile uint64_t *p, uint64_t val)
+{
+	uint64_t tmp;
+	uint32_t exflag;
+
+	__asm __volatile(
+		"1:          \n"
+		"   ldrexd   %[tmp], [%[ptr]]\n"
+		"   orr      %Q[tmp], %Q[val]\n"
+		"   orr      %R[tmp], %R[val]\n"
+		"   strexd   %[exf], %[tmp], [%[ptr]]\n"
+		"   teq      %[exf], #0\n"
+		"   it ne    \n"
+		"   bne      1b\n"
+		:   [exf]    "=&r"  (exflag), 
+		    [tmp]    "=&r"  (tmp)
+		:   [ptr]    "r"    (p), 
+		    [val]    "r"    (val)
+		:   "cc", "memory");
+}
+
 static __inline void
 atomic_set_long(volatile u_long *address, u_long setmask)
 {
@@ -176,6 +200,28 @@ atomic_clear_32(volatile uint32_t *address, uint32_t setmask)
 			   ,"+r" (address), "+r" (setmask) : : "cc", "memory");
 }
 
+static __inline void
+atomic_clear_64(volatile uint64_t *p, uint64_t val)
+{
+	uint64_t tmp;
+	uint32_t exflag;
+
+	__asm __volatile(
+		"1:          \n"
+		"   ldrexd   %[tmp], [%[ptr]]\n"
+		"   bic      %Q[tmp], %Q[val]\n"
+		"   bic      %R[tmp], %R[val]\n"
+		"   strexd   %[exf], %[tmp], [%[ptr]]\n"
+		"   teq      %[exf], #0\n"
+		"   it ne    \n"
+		"   bne      1b\n"
+		:   [exf]    "=&r"  (exflag), 
+		    [tmp]    "=&r"  (tmp)
+		:   [ptr]    "r"    (p), 
+		    [val]    "r"    (val)
+		:   "cc", "memory");
+}
+
 static __inline void
 atomic_clear_long(volatile u_long *address, u_long setmask)
 {
@@ -213,6 +259,35 @@ atomic_cmpset_32(volatile u_int32_t *p, volatile u_int32_t cmpval, volatile u_in
 	return (ret);
 }
 
+static __inline int
+atomic_cmpset_64(volatile uint64_t *p, uint64_t cmpval, uint64_t newval)
+{
+	uint64_t tmp;
+	uint32_t ret;
+
+	__asm __volatile(
+		"1:          \n"
+		"   ldrexd   %[tmp], [%[ptr]]\n"
+		"   teq      %Q[tmp], %Q[cmp]\n"
+		"   itee eq  \n"
+		"   teqeq    %R[tmp], %R[cmp]\n"
+		"   movne    %[ret], #0\n"
+		"   bne      2f\n"
+		"   strexd   %[ret], %[new], [%[ptr]]\n"
+		"   teq      %[ret], #0\n"
+		"   it ne    \n"
+		"   bne      1b\n"
+		"   mov      %[ret], #1\n"
+		"2:          \n"
+		:   [ret]    "=&r"  (ret), 
+		    [tmp]    "=&r"  (tmp)
+		:   [ptr]    "r"    (p), 
+		    [cmp]    "r"    (cmpval), 
+		    [new]    "r"    (newval)
+		:   "cc", "memory");
+	return (ret);
+}
+
 static __inline u_long
 atomic_cmpset_long(volatile u_long *p, volatile u_long cmpval, volatile u_long newval)
 {
@@ -244,6 +319,15 @@ atomic_cmpset_acq_32(volatile u_int32_t *p, volatile u_int32_t cmpval, volatile
 	return (ret);
 }
 
+static __inline uint64_t
+atomic_cmpset_acq_64(volatile uint64_t *p, volatile uint64_t cmpval, volatile uint64_t newval)
+{
+	uint64_t ret = atomic_cmpset_64(p, cmpval, newval);
+
+	__do_dmb();
+	return (ret);
+}
+
 static __inline u_long
 atomic_cmpset_acq_long(volatile u_long *p, volatile u_long cmpval, volatile u_long newval)
 {
@@ -261,6 +345,14 @@ atomic_cmpset_rel_32(volatile u_int32_t *p, volatile u_int32_t cmpval, volatile
 	return (atomic_cmpset_32(p, cmpval, newval));
 }
 
+static __inline uint64_t
+atomic_cmpset_rel_64(volatile uint64_t *p, volatile uint64_t cmpval, volatile uint64_t newval)
+{
+	
+	__do_dmb();
+	return (atomic_cmpset_64(p, cmpval, newval));
+}
+
 static __inline u_long
 atomic_cmpset_rel_long(volatile u_long *p, volatile u_long cmpval, volatile u_long newval)
 {
@@ -285,6 +377,28 @@ atomic_add_32(volatile u_int32_t *p, u_int32_t val)
 			    ,"+r" (p), "+r" (val) : : "cc", "memory");
 }
 
+static __inline void
+atomic_add_64(volatile uint64_t *p, uint64_t val)
+{
+	uint64_t tmp;
+	uint32_t exflag;
+
+	__asm __volatile(
+		"1:          \n"
+		"   ldrexd   %[tmp], [%[ptr]]\n"
+		"   adds     %Q[tmp], %Q[val]\n"
+		"   adc      %R[tmp], %R[val]\n"
+		"   strexd   %[exf], %[tmp], [%[ptr]]\n"
+		"   teq      %[exf], #0\n"
+		"   it ne    \n"
+		"   bne      1b\n"
+		:   [exf]    "=&r"  (exflag), 
+		    [tmp]    "=&r"  (tmp)
+		:   [ptr]    "r"    (p), 
+		    [val]    "r"    (val)
+		:   "cc", "memory");
+}
+
 static __inline void
 atomic_add_long(volatile u_long *p, u_long val)
 {
@@ -315,6 +429,28 @@ atomic_subtract_32(volatile u_int32_t *p, u_int32_t val)
 			    ,"+r" (p), "+r" (val) : : "cc", "memory");
 }
 
+static __inline void
+atomic_subtract_64(volatile uint64_t *p, uint64_t val)
+{
+	uint64_t tmp;
+	uint32_t exflag;
+
+	__asm __volatile(
+		"1:          \n"
+		"   ldrexd   %[tmp], [%[ptr]]\n"
+		"   subs     %Q[tmp], %Q[val]\n"
+		"   sbc      %R[tmp], %R[val]\n"
+		"   strexd   %[exf], %[tmp], [%[ptr]]\n"
+		"   teq      %[exf], #0\n"
+		"   it ne    \n"
+		"   bne      1b\n"
+		:   [exf]    "=&r"  (exflag), 
+		    [tmp]    "=&r"  (tmp)
+		:   [ptr]    "r"    (p), 
+		    [val]    "r"    (val)
+		:   "cc", "memory");
+}
+
 static __inline void
 atomic_subtract_long(volatile u_long *p, u_long val)
 {
@@ -334,6 +470,10 @@ ATOMIC_ACQ_REL(clear, 32)
 ATOMIC_ACQ_REL(add, 32)
 ATOMIC_ACQ_REL(subtract, 32)
 ATOMIC_ACQ_REL(set, 32)
+ATOMIC_ACQ_REL(clear, 64)
+ATOMIC_ACQ_REL(add, 64)
+ATOMIC_ACQ_REL(subtract, 64)
+ATOMIC_ACQ_REL(set, 64)
 ATOMIC_ACQ_REL_LONG(clear)
 ATOMIC_ACQ_REL_LONG(add)
 ATOMIC_ACQ_REL_LONG(subtract)
@@ -392,6 +532,116 @@ atomic_store_rel_32(volatile uint32_t *p, uint32_t v)
 	*p = v;
 }
 
+static __inline uint64_t
+atomic_fetchadd_64(volatile uint64_t *p, uint64_t val)
+{
+	uint64_t ret, tmp;
+	uint32_t exflag;
+
+	__asm __volatile(
+		"1:          \n"
+		"   ldrexd   %[ret], [%[ptr]]\n"
+		"   adds     %Q[tmp], %Q[ret], %Q[val]\n"
+		"   adc      %R[tmp], %R[ret], %R[val]\n"
+		"   strexd   %[exf], %[tmp], [%[ptr]]\n"
+		"   teq      %[exf], #0\n"
+		"   it ne    \n"
+		"   bne      1b\n"
+		:   [ret]    "=&r"  (ret),
+		    [exf]    "=&r"  (exflag),
+		    [tmp]    "=&r"  (tmp)
+		:   [ptr]    "r"    (p), 
+		    [val]    "r"    (val)
+		:   "cc", "memory");
+	return (ret);
+}
+
+static __inline uint64_t
+atomic_readandclear_64(volatile uint64_t *p)
+{
+	uint64_t ret, tmp;
+	uint32_t exflag;
+
+	__asm __volatile(
+		"1:          \n"
+		"   ldrexd   %[ret], [%[ptr]]\n"
+		"   mov      %Q[tmp], #0\n"
+		"   mov      %R[tmp], #0\n"
+		"   strexd   %[exf], %[tmp], [%[ptr]]\n"
+		"   teq      %[exf], #0\n"
+		"   it ne    \n"
+		"   bne      1b\n"
+		:   [ret]    "=&r"  (ret),
+		    [exf]    "=&r"  (exflag),
+		    [tmp]    "=&r"  (tmp)
+		:   [ptr]    "r"    (p)
+		:   "cc", "memory");
+	return (ret);
+}
+
+static __inline uint64_t
+atomic_load_64(volatile uint64_t *p)
+{
+	uint64_t ret;
+
+	/*
+	 * The only way to atomically load 64 bits is with LDREXD which puts the
+	 * exclusive monitor into the open state, so reset it with CLREX because
+	 * we don't actually need to store anything.
+	 */
+	__asm __volatile(
+		"1:          \n"
+		"   ldrexd   %[ret], [%[ptr]]\n"
+		"   clrex    \n"
+		:   [ret]    "=&r"  (ret)
+		:   [ptr]    "r"    (p)
+		:   "cc", "memory");
+	return (ret);
+}
+
+static __inline uint64_t
+atomic_load_acq_64(volatile uint64_t *p)
+{
+	uint64_t ret;
+
+	ret = atomic_load_64(p);
+	__do_dmb();
+	return (ret);
+}
+
+static __inline void
+atomic_store_64(volatile uint64_t *p, uint64_t val)
+{
+	uint64_t tmp;
+	uint32_t exflag;
+
+	/*
+	 * The only way to atomically store 64 bits is with STREXD, which will
+	 * succeed only if paired up with a preceeding LDREXD using the same
+	 * address, so we read and discard the existing value before storing.
+	 */
+	__asm __volatile(
+		"1:          \n"
+		"   ldrexd   %[tmp], [%[ptr]]\n"
+		"   strexd   %[exf], %[val], [%[ptr]]\n"
+		"   teq      %[exf], #0\n"
+		"   it ne    \n"
+		"   bne      1b\n"
+		:   [tmp]    "=&r"  (tmp),
+		    [exf]    "=&r"  (exflag)
+		:   [ptr]    "r"    (p),
+		    [val]    "r"    (val)
+		:   "cc", "memory");
+}
+
+static __inline void
+atomic_store_rel_64(volatile uint64_t *p, uint64_t val)
+{
+
+	__do_dmb();
+	atomic_store_64(p, val);
+}
+
 static __inline u_long
 atomic_fetchadd_long(volatile u_long *p, u_long val)
 {
@@ -474,18 +724,32 @@ __swp(uint32_t val, volatile uint32_t *ptr)
 
 
 #ifdef _KERNEL
+#define	ARM_HAVE_ATOMIC64
+
 static __inline void
 atomic_set_32(volatile uint32_t *address, uint32_t setmask)
 {
 	__with_interrupts_disabled(*address |= setmask);
 }
 
+static __inline void
+atomic_set_64(volatile uint64_t *address, uint64_t setmask)
+{
+	__with_interrupts_disabled(*address |= setmask);
+}
+
 static __inline void
 atomic_clear_32(volatile uint32_t *address, uint32_t clearmask)
 {
 	__with_interrupts_disabled(*address &= ~clearmask);
 }
 
+static __inline void
+atomic_clear_64(volatile uint64_t *address, uint64_t clearmask)
+{
+	__with_interrupts_disabled(*address &= ~clearmask);
+}
+
 static __inline u_int32_t
 atomic_cmpset_32(volatile u_int32_t *p, volatile u_int32_t cmpval, volatile u_int32_t newval)
 {
@@ -503,18 +767,47 @@ atomic_cmpset_32(volatile u_int32_t *p, volatile u_int32_t cmpval, volatile u_in
 	return (ret);
 }
 
+static __inline u_int64_t
+atomic_cmpset_64(volatile u_int64_t *p, volatile u_int64_t cmpval, volatile u_int64_t newval)
+{
+	int ret;
+	
+	__with_interrupts_disabled(
+	 {
+	    	if (*p == cmpval) {
+			*p = newval;
+			ret = 1;
+		} else {
+			ret = 0;
+		}
+	});
+	return (ret);
+}
+
 static __inline void
 atomic_add_32(volatile u_int32_t *p, u_int32_t val)
 {
 	__with_interrupts_disabled(*p += val);
 }
 
+static __inline void
+atomic_add_64(volatile u_int64_t *p, u_int64_t val)
+{
+	__with_interrupts_disabled(*p += val);
+}
+
 static __inline void
 atomic_subtract_32(volatile u_int32_t *p, u_int32_t val)
 {
 	__with_interrupts_disabled(*p -= val);
 }
 
+static __inline void
+atomic_subtract_64(volatile u_int64_t *p, u_int64_t val)
+{
+	__with_interrupts_disabled(*p -= val);
+}
+
 static __inline uint32_t
 atomic_fetchadd_32(volatile uint32_t *p, uint32_t v)
 {
@@ -528,6 +821,34 @@ atomic_fetchadd_32(volatile uint32_t *p, uint32_t v)
 	return (value);
 }
 
+static __inline uint64_t
+atomic_fetchadd_64(volatile uint64_t *p, uint64_t v)
+{
+	uint64_t value;
+
+	__with_interrupts_disabled(
+	{
+	    	value = *p;
+		*p += v;
+	});
+	return (value);
+}
+
+static __inline uint64_t
+atomic_load_64(volatile uint64_t *p)
+{
+	uint64_t value;
+
+	__with_interrupts_disabled(value = *p);
+	return (value);
+}
+
+static __inline void
+atomic_store_64(volatile uint64_t *p, uint64_t value)
+{
+	__with_interrupts_disabled(*p = value);
+}
+
 #else /* !_KERNEL */
 
 static __inline u_int32_t
diff --git a/sys/arm/include/counter.h b/sys/arm/include/counter.h
index a6dfa8ef875b..c4da91f7a14b 100644
--- a/sys/arm/include/counter.h
+++ b/sys/arm/include/counter.h
@@ -30,6 +30,7 @@
 #define __MACHINE_COUNTER_H__
 
 #include <sys/pcpu.h>
+#include <machine/atomic.h>
 #ifdef INVARIANTS
 #include <sys/proc.h>
 #endif
@@ -38,12 +39,13 @@
 #define	counter_exit()	critical_exit()
 
 #ifdef IN_SUBR_COUNTER_C
-/* XXXKIB non-atomic 64bit read */
+
 static inline uint64_t
 counter_u64_read_one(uint64_t *p, int cpu)
 {
 
-	return (*(uint64_t *)((char *)p + sizeof(struct pcpu) * cpu));
+	return (atomic_load_64((uint64_t *)((char *)p + sizeof(struct pcpu) *
+	    cpu)));
 }
 
 static inline uint64_t
@@ -59,13 +61,12 @@ counter_u64_fetch_inline(uint64_t *p)
 	return (r);
 }
 
-/* XXXKIB non-atomic 64bit store, might interrupt increment */
 static void
 counter_u64_zero_one_cpu(void *arg)
 {
 
-	*((uint64_t *)((char *)arg + sizeof(struct pcpu) *
-	    PCPU_GET(cpuid))) = 0;
+	atomic_store_64((uint64_t *)((char *)arg + sizeof(struct pcpu) *
+	    PCPU_GET(cpuid)), 0);
 }
 
 static inline void
@@ -79,7 +80,7 @@ counter_u64_zero_inline(counter_u64_t c)
 
 #define	counter_u64_add_protected(c, inc)	do {	\
 	CRITICAL_ASSERT(curthread);			\
-	*(uint64_t *)zpcpu_get(c) += (inc);		\
+	atomic_add_64((uint64_t *)zpcpu_get(c), (inc));	\
 } while (0)
 
 static inline void
diff --git a/sys/arm/include/cpu.h b/sys/arm/include/cpu.h
index d63979ed8913..dd7b6acce3ee 100644
--- a/sys/arm/include/cpu.h
+++ b/sys/arm/include/cpu.h
@@ -25,7 +25,16 @@ get_cyclecount(void)
 	 * Read PMCCNTR. Curses! Its only 32 bits.
 	 * TODO: Fix this by catching overflow with interrupt?
 	 */
+/* The ARMv6 vs ARMv7 divide is going to need a better way of
+ * distinguishing between them.
+ */
+#if defined(CPU_ARM1136) || defined(CPU_ARM1176)
+	/* ARMv6 - Earlier model SCCs */
+	__asm __volatile("mrc p15, 0, %0, c15, c12, 1": "=r" (ccnt));
+#else
+	/* ARMv7 - Later model SCCs */
 	__asm __volatile("mrc p15, 0, %0, c9, c13, 0": "=r" (ccnt));
+#endif
 	ccnt64 = (uint64_t)ccnt;
 	return (ccnt64);
 #else /* No performance counters, so use binuptime(9). This is slooooow */
diff --git a/sys/arm/include/elf.h b/sys/arm/include/elf.h
index 91086f85785c..9b18646d187c 100644
--- a/sys/arm/include/elf.h
+++ b/sys/arm/include/elf.h
@@ -55,6 +55,9 @@ __ElfType(Auxinfo);
 
 #define	ELF_MACHINE_OK(x) ((x) == EM_ARM)
 
+/* Unwind info section type */
+#define	PT_ARM_EXIDX (PT_LOPROC + 1)
+
 /*
  * Relocation types.
  */
diff --git a/sys/arm/include/pl310.h b/sys/arm/include/pl310.h
index 873087700f0d..f7c75e9f9a54 100644
--- a/sys/arm/include/pl310.h
+++ b/sys/arm/include/pl310.h
@@ -137,6 +137,8 @@
 #define		POWER_CTRL_ENABLE_GATING	(1 << 0)
 #define		POWER_CTRL_ENABLE_STANDBY	(1 << 1)
 
+struct intr_config_hook;
+
 struct pl310_softc {
 	device_t	sc_dev;
 	struct resource *sc_mem_res;
@@ -145,6 +147,7 @@ struct pl310_softc {
 	int		sc_enabled;
 	struct mtx	sc_mtx;
 	u_int		sc_rtl_revision;
+	struct intr_config_hook *sc_ich;
 };
 
 /**
diff --git a/sys/arm/include/sf_buf.h b/sys/arm/include/sf_buf.h
index 2ec07def1403..b761cc70c69b 100644
--- a/sys/arm/include/sf_buf.h
+++ b/sys/arm/include/sf_buf.h
@@ -29,33 +29,18 @@
 #ifndef _MACHINE_SF_BUF_H_
 #define _MACHINE_SF_BUF_H_
 
-#include <sys/queue.h>
-
-struct vm_page;
-
-struct sf_buf {
-	LIST_ENTRY(sf_buf) list_entry;	/* list of buffers */
-	TAILQ_ENTRY(sf_buf) free_entry;	/* list of buffers */
-	struct		vm_page *m;	/* currently mapped page */
-	vm_offset_t	kva;		/* va of mapping */
-	int		ref_count;	/* usage of this mapping */
-};
-
-static __inline vm_offset_t
-sf_buf_kva(struct sf_buf *sf)
+static inline void
+sf_buf_map(struct sf_buf *sf, int flags)
 {
 
-	return (sf->kva);
+	pmap_kenter(sf->kva, VM_PAGE_TO_PHYS(sf->m));
 }
 
-static __inline struct vm_page *
-sf_buf_page(struct sf_buf *sf)
+static inline int
+sf_buf_unmap(struct sf_buf *sf)
 {
 
-	return (sf->m);
+	pmap_kremove(sf->kva);
+	return (1);
 }
-
-struct sf_buf *	sf_buf_alloc(struct vm_page *m, int flags);
-void sf_buf_free(struct sf_buf *sf);
-
 #endif /* !_MACHINE_SF_BUF_H_ */
diff --git a/sys/arm/include/vmparam.h b/sys/arm/include/vmparam.h
index 1c6085e640b9..9bfd358eef5a 100644
--- a/sys/arm/include/vmparam.h
+++ b/sys/arm/include/vmparam.h
@@ -170,4 +170,7 @@ extern vm_offset_t vm_max_kernel_address;
 #define	VM_MAX_AUTOTUNE_MAXUSERS	384
 #endif
 
+#define	SFBUF
+#define	SFBUF_MAP
+
 #endif	/* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arm/samsung/exynos/chrome_ec.c b/sys/arm/samsung/exynos/chrome_ec.c
index ef64c1ac4ecb..2c88414d2d35 100644
--- a/sys/arm/samsung/exynos/chrome_ec.c
+++ b/sys/arm/samsung/exynos/chrome_ec.c
@@ -43,13 +43,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.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>
 
@@ -95,7 +93,7 @@ bus_claim(struct ec_softc *sc)
 	/* Say we want the bus */
 	GPIO_PIN_SET(gpio_dev, sc->our_gpio, GPIO_PIN_LOW);
 
-	/* TODO(imax): insert a delay to allow EC to react. */
+	/* TODO: insert a delay to allow EC to react. */
 
 	/* Check EC decision */
 	GPIO_PIN_GET(gpio_dev, sc->ec_gpio, &status);
@@ -214,7 +212,7 @@ int ec_hello(void)
 	data_in[2] = 0x20;
 	data_in[3] = 0x10;
 
-	ec_command(EC_CMD_MKBP_STATE, data_in, 4,
+	ec_command(EC_CMD_HELLO, data_in, 4,
 	    data_out, 4);
 
 	return (0);
@@ -225,7 +223,7 @@ configure_i2c_arbitrator(struct ec_softc *sc)
 {
 	phandle_t arbitrator;
 
-	/* TODO(imax): look for compatible entry instead of hard-coded path */
+	/* TODO: look for compatible entry instead of hard-coded path */
 	arbitrator = OF_finddevice("/i2c-arbitrator");
 	if (arbitrator > 0 &&
 	    OF_hasprop(arbitrator, "freebsd,our-gpio") &&
diff --git a/sys/arm/samsung/exynos/chrome_ec.h b/sys/arm/samsung/exynos/chrome_ec.h
index 9d3f521e962f..9879c1685f15 100644
--- a/sys/arm/samsung/exynos/chrome_ec.h
+++ b/sys/arm/samsung/exynos/chrome_ec.h
@@ -30,6 +30,8 @@
 #define	EC_CMD_GET_VERSION	0x02
 #define	EC_CMD_MKBP_STATE	0x60
 #define	EC_CMD_VERSION0		0xdc
+#define	EC_CMD_RESEND_RESPONSE	0xdb
+#define	EC_CMD_GET_COMMS_STATUS	0x09
 
 int ec_command(uint8_t cmd, uint8_t *dout, uint8_t dout_len,
     uint8_t *dinp, uint8_t dinp_len);
diff --git a/sys/arm/samsung/exynos/chrome_ec_spi.c b/sys/arm/samsung/exynos/chrome_ec_spi.c
new file mode 100644
index 000000000000..a018afae9d24
--- /dev/null
+++ b/sys/arm/samsung/exynos/chrome_ec_spi.c
@@ -0,0 +1,228 @@
+/*-
+ * Copyright (c) 2014 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 EXPREC OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNEC 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 BUSINEC INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * Samsung Chromebook Embedded Controller (EC)
+ */
+
+#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/gpio.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/cpu.h>
+#include <machine/intr.h>
+
+#include <dev/spibus/spi.h>
+#include <dev/spibus/spibusvar.h>
+
+#include "spibus_if.h"
+#include "gpio_if.h"
+
+#include <arm/samsung/exynos/chrome_ec.h>
+
+struct ec_softc {
+	device_t	dev;
+	device_t	dev_gpio;
+};
+
+struct ec_softc *ec_sc;
+
+#define EC_SPI_CS	200
+
+static int
+assert_cs(struct ec_softc *sc, int enable)
+{
+	/* Get the GPIO device */
+	sc->dev_gpio = devclass_get_device(devclass_find("gpio"), 0);
+	if (sc->dev_gpio == NULL) {
+		device_printf(sc->dev, "Error: failed to get the GPIO dev\n");
+		return (1);
+	}
+
+	GPIO_PIN_SETFLAGS(sc->dev_gpio, EC_SPI_CS, GPIO_PIN_OUTPUT);
+
+	if (enable) {
+		GPIO_PIN_SET(sc->dev_gpio, EC_SPI_CS, GPIO_PIN_LOW);
+	} else {
+		GPIO_PIN_SET(sc->dev_gpio, EC_SPI_CS, GPIO_PIN_HIGH);
+	}
+
+	return (0);
+}
+
+static int
+ec_probe(device_t dev)
+{
+
+	device_set_desc(dev, "Chromebook Embedded Controller");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+fill_checksum(uint8_t *data_out, int len)
+{
+	int res;
+	int i;
+
+	res = 0;
+	for (i = 0; i < len; i++) {
+		res += data_out[i];
+	}
+
+	data_out[len] = (res & 0xff);
+
+	return (0);
+}
+
+int
+ec_command(uint8_t cmd, uint8_t *dout, uint8_t dout_len,
+    uint8_t *dinp, uint8_t dinp_len)
+{
+	struct spi_command spi_cmd;
+	struct ec_softc *sc;
+	uint8_t *msg_dout;
+	uint8_t *msg_dinp;
+	int ret;
+	int i;
+
+	memset(&spi_cmd, 0, sizeof(spi_cmd));
+
+	msg_dout = malloc(dout_len + 4, M_DEVBUF, M_NOWAIT | M_ZERO);
+	msg_dinp = malloc(dinp_len + 4, M_DEVBUF, M_NOWAIT | M_ZERO);
+
+	spi_cmd.tx_cmd = msg_dout;
+	spi_cmd.rx_cmd = msg_dinp;
+
+	if (ec_sc == NULL)
+		return (-1);
+
+	sc = ec_sc;
+
+	msg_dout[0] = EC_CMD_VERSION0;
+	msg_dout[1] = cmd;
+	msg_dout[2] = dout_len;
+
+	for (i = 0; i < dout_len; i++) {
+		msg_dout[i + 3] = dout[i];
+	};
+
+	fill_checksum(msg_dout, dout_len + 3);
+
+	assert_cs(sc, 1);
+	spi_cmd.rx_cmd_sz = spi_cmd.tx_cmd_sz = dout_len + 4;
+	ret = SPIBUS_TRANSFER(device_get_parent(sc->dev), sc->dev, &spi_cmd);
+
+	/* Wait 0xec */
+	for (i = 0; i < 1000; i++) {
+		DELAY(10);
+		msg_dout[0] = 0xff;
+		spi_cmd.rx_cmd_sz = spi_cmd.tx_cmd_sz = 1;
+		SPIBUS_TRANSFER(device_get_parent(sc->dev), sc->dev, &spi_cmd);
+		if (msg_dinp[0] == 0xec)
+			break;
+	}
+
+	/* Get the rest */
+	for (i = 0; i < (dout_len + 4); i++)
+		msg_dout[i] = 0xff;
+	spi_cmd.rx_cmd_sz = spi_cmd.tx_cmd_sz = dout_len + 4 - 1;
+	ret = SPIBUS_TRANSFER(device_get_parent(sc->dev), sc->dev, &spi_cmd);
+	assert_cs(sc, 0);
+
+	if (ret != 0) {
+		device_printf(sc->dev, "spibus_transfer returned %d\n", ret);
+		free(msg_dout, M_DEVBUF);
+		free(msg_dinp, M_DEVBUF);
+		return (-1);
+	}
+
+	for (i = 0; i < dinp_len; i++) {
+		dinp[i] = msg_dinp[i + 2];
+	};
+
+	free(msg_dout, M_DEVBUF);
+	free(msg_dinp, M_DEVBUF);
+
+	return (0);
+}
+
+static int
+ec_attach(device_t dev)
+{
+	struct ec_softc *sc;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+
+	ec_sc = sc;
+
+	return (0);
+}
+
+static int
+ec_detach(device_t dev)
+{
+	struct ec_softc *sc;
+
+	sc = device_get_softc(dev);
+
+	return (0);
+}
+
+static device_method_t ec_methods[] = {
+	DEVMETHOD(device_probe,		ec_probe),
+	DEVMETHOD(device_attach,	ec_attach),
+	DEVMETHOD(device_detach,	ec_detach),
+	{ 0, 0 }
+};
+
+static driver_t ec_driver = {
+	"chrome_ec",
+	ec_methods,
+	sizeof(struct ec_softc),
+};
+
+static devclass_t ec_devclass;
+
+DRIVER_MODULE(chrome_ec, spibus, ec_driver, ec_devclass, 0, 0);
+MODULE_VERSION(chrome_ec, 1);
+MODULE_DEPEND(chrome_ec, spibus, 1, 1, 1);
diff --git a/sys/arm/samsung/exynos/chrome_kb.c b/sys/arm/samsung/exynos/chrome_kb.c
index d5d55e9233df..b10a5ac8b187 100644
--- a/sys/arm/samsung/exynos/chrome_kb.c
+++ b/sys/arm/samsung/exynos/chrome_kb.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #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>
@@ -57,7 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/kbio.h>
 
 #include <machine/bus.h>
-#include <machine/fdt.h>
 #include <machine/cpu.h>
 #include <machine/intr.h>
 
@@ -741,18 +739,18 @@ parse_dts(struct ckb_softc *sc)
 
 	if ((len = OF_getproplen(node, "google,key-rows")) <= 0)
 		return (ENXIO);
-	OF_getprop(node, "google,key-rows", &dts_value, len);
-	sc->rows = fdt32_to_cpu(dts_value);
+	OF_getencprop(node, "google,key-rows", &dts_value, len);
+	sc->rows = dts_value;
 
 	if ((len = OF_getproplen(node, "google,key-columns")) <= 0)
 		return (ENXIO);
-	OF_getprop(node, "google,key-columns", &dts_value, len);
-	sc->cols = fdt32_to_cpu(dts_value);
+	OF_getencprop(node, "google,key-columns", &dts_value, len);
+	sc->cols = dts_value;
 
 	if ((len = OF_getproplen(node, "freebsd,intr-gpio")) <= 0)
 		return (ENXIO);
-	OF_getprop(node, "freebsd,intr-gpio", &dts_value, len);
-	sc->gpio = fdt32_to_cpu(dts_value);
+	OF_getencprop(node, "freebsd,intr-gpio", &dts_value, len);
+	sc->gpio = dts_value;
 
 	if (OF_hasprop(node, "freebsd,keymap")) {
 		keymap_prop = "freebsd,keymap";
diff --git a/sys/arm/samsung/exynos/exynos5_combiner.c b/sys/arm/samsung/exynos/exynos5_combiner.c
index e7bb8961d76c..ffd557e3866b 100644
--- a/sys/arm/samsung/exynos/exynos5_combiner.c
+++ b/sys/arm/samsung/exynos/exynos5_combiner.c
@@ -43,13 +43,11 @@ __FBSDID("$FreeBSD$");
 #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>
 
@@ -57,7 +55,6 @@ __FBSDID("$FreeBSD$");
 #include <arm/samsung/exynos/exynos5_combiner.h>
 
 #define NGRP		32
-#define ITABLE_LEN	24
 
 #define	IESR(n)	(0x10 * n + 0x0)	/* Interrupt enable set */
 #define	IECR(n)	(0x10 * n + 0x4)	/* Interrupt enable clear */
@@ -118,7 +115,7 @@ struct combiner_entry {
 	char *source_name;
 };
 
-static struct combiner_entry interrupt_table[ITABLE_LEN] = {
+static struct combiner_entry interrupt_table[] = {
 	{ 63, 1, "EINT[15]" },
 	{ 63, 0, "EINT[14]" },
 	{ 62, 1, "EINT[13]" },
@@ -143,8 +140,116 @@ static struct combiner_entry interrupt_table[ITABLE_LEN] = {
 	{ 55, 4, "MCT_G1" },
 	{ 55, 3, "MCT_G0" },
 	{ 55, 0, "EINT[0]" },
+	{ 54, 7, "CPU_nCNTVIRQ[1]" },
+	{ 54, 6, "CPU_nCTIIRQ[1]" },
+	{ 54, 5, "CPU_nCNTPSIRQ[1]" },
+	{ 54, 4, "CPU_nPMUIRQ[1]" },
+	{ 54, 3, "CPU_nCNTPNSIRQ[1]" },
+	{ 54, 2, "CPU_PARITYFAILSCU[1]" },
+	{ 54, 1, "CPU_nCNTHPIRQ[1]" },
+	{ 54, 0, "PARITYFAIL[1]" },
+	{ 53, 1, "CPU_nIRQ[1]" },
+	{ 52, 0, "CPU_nIRQ[0]" },
+	{ 51, 7, "CPU_nRAMERRIRQ" },
+	{ 51, 6, "CPU_nAXIERRIRQ" },
+	{ 51, 4, "INT_COMB_ISP_GIC" },
+	{ 51, 3, "INT_COMB_IOP_GIC" },
+	{ 51, 2, "CCI_nERRORIRQ" },
+	{ 51, 1, "INT_COMB_ARMISP_GIC" },
+	{ 51, 0, "INT_COMB_ARMIOP_GIC" },
+	{ 50, 7, "DISP1[3]" },
+	{ 50, 6, "DISP1[2]" },
+	{ 50, 5, "DISP1[1]" },
+	{ 50, 4, "DISP1[0]" },
+	{ 49, 3, "SSCM_PULSE_IRQ_C2CIF[1]" },
+	{ 49, 2, "SSCM_PULSE_IRQ_C2CIF[0]" },
+	{ 49, 1, "SSCM_IRQ_C2CIF[1]" },
+	{ 49, 0, "SSCM_IRQ_C2CIF[0]" },
+	{ 48, 3, "PEREV_M1_CDREX" },
+	{ 48, 2, "PEREV_M0_CDREX" },
+	{ 48, 1, "PEREV_A1_CDREX" },
+	{ 48, 0, "PEREV_A0_CDREX" },
+	{ 47, 3, "MDMA0_ABORT" },
+	/* 46 is fully reserved */
+	{ 45, 1, "MDMA1_ABORT" },
+	/* 44 is fully reserved */
+	{ 43, 7, "SYSMMU_DRCISP[1]" },
+	{ 43, 6, "SYSMMU_DRCISP[0]" },
+	{ 43, 1, "SYSMMU_ODC[1]" },
+	{ 43, 0, "SYSMMU_ODC[0]" },
+	{ 42, 7, "SYSMMU_ISP[1]" },
+	{ 42, 6, "SYSMMU_ISP[0]" },
+	{ 42, 5, "SYSMMU_DIS0[1]" },
+	{ 42, 4, "SYSMMU_DIS0[0]" },
+	{ 42, 3, "DP1" },
+	{ 41, 5, "SYSMMU_DIS1[1]" },
+	{ 41, 4, "SYSMMU_DIS1[0]" },
+	{ 40, 6, "SYSMMU_MFCL[1]" },
+	{ 40, 5, "SYSMMU_MFCL[0]" },
+	{ 39, 5, "SYSMMU_TV_M0[1]" },
+	{ 39, 4, "SYSMMU_TV_M0[0]" },
+	{ 39, 3, "SYSMMU_MDMA1[1]" },
+	{ 39, 2, "SYSMMU_MDMA1[0]" },
+	{ 39, 1, "SYSMMU_MDMA0[1]" },
+	{ 39, 0, "SYSMMU_MDMA0[0]" },
+	{ 38, 7, "SYSMMU_SSS[1]" },
+	{ 38, 6, "SYSMMU_SSS[0]" },
+	{ 38, 5, "SYSMMU_RTIC[1]" },
+	{ 38, 4, "SYSMMU_RTIC[0]" },
+	{ 38, 3, "SYSMMU_MFCR[1]" },
+	{ 38, 2, "SYSMMU_MFCR[0]" },
+	{ 38, 1, "SYSMMU_ARM[1]" },
+	{ 38, 0, "SYSMMU_ARM[0]" },
+	{ 37, 7, "SYSMMU_3DNR[1]" },
+	{ 37, 6, "SYSMMU_3DNR[0]" },
+	{ 37, 5, "SYSMMU_MCUISP[1]" },
+	{ 37, 4, "SYSMMU_MCUISP[0]" },
+	{ 37, 3, "SYSMMU_SCALERCISP[1]" },
+	{ 37, 2, "SYSMMU_SCALERCISP[0]" },
+	{ 37, 1, "SYSMMU_FDISP[1]" },
+	{ 37, 0, "SYSMMU_FDISP[0]" },
+	{ 36, 7, "MCUIOP_CTIIRQ" },
+	{ 36, 6, "MCUIOP_PMUIRQ" },
+	{ 36, 5, "MCUISP_CTIIRQ" },
+	{ 36, 4, "MCUISP_PMUIRQ" },
+	{ 36, 3, "SYSMMU_JPEGX[1]" },
+	{ 36, 2, "SYSMMU_JPEGX[0]" },
+	{ 36, 1, "SYSMMU_ROTATOR[1]" },
+	{ 36, 0, "SYSMMU_ROTATOR[0]" },
+	{ 35, 7, "SYSMMU_SCALERPISP[1]" },
+	{ 35, 6, "SYSMMU_SCALERPISP[0]" },
+	{ 35, 5, "SYSMMU_FIMC_LITE0[1]" },
+	{ 35, 4, "SYSMMU_FIMC_LITE0[0]" },
+	{ 35, 3, "SYSMMU_DISP1_M0[1]" },
+	{ 35, 2, "SYSMMU_DISP1_M0[0]" },
+	{ 35, 1, "SYSMMU_FIMC_LITE2[1]" },
+	{ 35, 0, "SYSMMU_FIMC_LITE2[0]" },
+	{ 34, 7, "SYSMMU_GSCL3[1]" },
+	{ 34, 6, "SYSMMU_GSCL3[0]" },
+	{ 34, 5, "SYSMMU_GSCL2[1]" },
+	{ 34, 4, "SYSMMU_GSCL2[0]" },
+	{ 34, 3, "SYSMMU_GSCL1[1]" },
+	{ 34, 2, "SYSMMU_GSCL1[0]" },
+	{ 34, 1, "SYSMMU_GSCL0[1]" },
+	{ 34, 0, "SYSMMU_GSCL0[0]" },
+	{ 33, 7, "CPU_nCNTVIRQ[0]" },
+	{ 33, 6, "CPU_nCNTPSIRQ[0]" },
+	{ 33, 5, "CPU_nCNTPSNIRQ[0]" },
+	{ 33, 4, "CPU_nCNTHPIRQ[0]" },
+	{ 33, 3, "CPU_nCTIIRQ[0]" },
+	{ 33, 2, "CPU_nPMUIRQ[0]" },
+	{ 33, 1, "CPU_PARITYFAILSCU[0]" },
+	{ 33, 0, "CPU_PARITYFAIL0" },
+	{ 32, 7, "TZASC_XR1BXW" },
+	{ 32, 6, "TZASC_XR1BXR" },
+	{ 32, 5, "TZASC_XLBXW" },
+	{ 32, 4, "TZASC_XLBXR" },
+	{ 32, 3, "TZASC_DRBXW" },
+	{ 32, 2, "TZASC_DRBXR" },
+	{ 32, 1, "TZASC_CBXW" },
+	{ 32, 0, "TZASC_CBXR" },
 
-	/* TODO: add groups 54-32 */
+	{ -1, -1, NULL },
 };
 
 struct combined_intr {
@@ -212,7 +317,7 @@ combiner_setup_intr(char *source_name, void (*ih)(void *), void *ih_user)
 
 	entry = NULL;
 
-	for (i = 0; i < ITABLE_LEN; i++) {
+	for (i = 0; i < NGRP && interrupt_table[i].bit != -1; i++) {
 		if (strcmp(interrupt_table[i].source_name, source_name) == 0) {
 			entry = &interrupt_table[i];
 		}
@@ -246,6 +351,9 @@ static int
 combiner_probe(device_t dev)
 {
 
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
 	if (!ofw_bus_is_compatible(dev, "exynos,combiner"))
 		return (ENXIO);
 
diff --git a/sys/arm/samsung/exynos/exynos5_ehci.c b/sys/arm/samsung/exynos/exynos5_ehci.c
index 84e4c5f05b6f..7c5d4555c33c 100644
--- a/sys/arm/samsung/exynos/exynos5_ehci.c
+++ b/sys/arm/samsung/exynos/exynos5_ehci.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2013-2014 Ruslan Bukin <br@bsdpad.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,11 +50,12 @@ __FBSDID("$FreeBSD$");
 #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 <arm/samsung/exynos/exynos5_common.h>
+#include <arm/samsung/exynos/exynos5_pmu.h>
+
 #include "gpio_if.h"
 
 #include "opt_platform.h"
@@ -64,11 +65,6 @@ __FBSDID("$FreeBSD$");
 #define	GPIO_INPUT	0
 #define	PIN_USB		161
 
-/* PWR control */
-#define	EXYNOS5_PWR_USBHOST_PHY		0x708
-#define	PHY_POWER_ON			1
-#define	PHY_POWER_OFF			0
-
 /* SYSREG */
 #define	EXYNOS5_SYSREG_USB2_PHY	0x0
 #define	USB2_MODE_HOST		0x1
@@ -91,12 +87,10 @@ static int	exynos_ehci_probe(device_t dev);
 struct exynos_ehci_softc {
 	device_t		dev;
 	ehci_softc_t		base;
-	struct resource		*res[5];
+	struct resource		*res[4];
 	bus_space_tag_t		host_bst;
-	bus_space_tag_t		pwr_bst;
 	bus_space_tag_t		sysreg_bst;
 	bus_space_handle_t	host_bsh;
-	bus_space_handle_t	pwr_bsh;
 	bus_space_handle_t	sysreg_bsh;
 
 };
@@ -105,7 +99,6 @@ static struct resource_spec exynos_ehci_spec[] = {
 	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
 	{ SYS_RES_MEMORY,	1,	RF_ACTIVE },
 	{ SYS_RES_MEMORY,	2,	RF_ACTIVE },
-	{ SYS_RES_MEMORY,	3,	RF_ACTIVE },
 	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
 	{ -1, 0 }
 };
@@ -185,10 +178,8 @@ reset_hsic_hub(struct exynos_ehci_softc *esc, phandle_t hub)
 	device_t gpio_dev;
 	pcell_t pin;
 
-	/* TODO(imax): check that hub is compatible with "smsc,usb3503" */
+	/* TODO: check that hub is compatible with "smsc,usb3503" */
 	if (!OF_hasprop(hub, "freebsd,reset-gpio")) {
-		device_printf(esc->dev,
-		    "cannot detect reset GPIO pin for HSIC hub\n");
 		return (1);
 	}
 
@@ -201,7 +192,7 @@ reset_hsic_hub(struct exynos_ehci_softc *esc, phandle_t hub)
 	/* Get the GPIO device, we need this to give power to USB */
 	gpio_dev = devclass_get_device(devclass_find("gpio"), 0);
 	if (gpio_dev == NULL) {
-		device_printf(esc->dev, "cant find gpio_dev\n");
+		device_printf(esc->dev, "Cant find gpio device\n");
 		return (1);
 	}
 
@@ -225,8 +216,7 @@ phy_init(struct exynos_ehci_softc *esc)
 	    EXYNOS5_SYSREG_USB2_PHY, USB2_MODE_HOST);
 
 	/* Power ON phy */
-	bus_space_write_4(esc->pwr_bst, esc->pwr_bsh,
-	    EXYNOS5_PWR_USBHOST_PHY, PHY_POWER_ON);
+	usb2_phy_power_on();
 
 	reg = bus_space_read_4(esc->host_bst, esc->host_bsh, 0x0);
 	reg &= ~(HOST_CTRL_CLK_MASK |
@@ -284,13 +274,9 @@ exynos_ehci_attach(device_t dev)
 	esc->host_bst = rman_get_bustag(esc->res[1]);
 	esc->host_bsh = rman_get_bushandle(esc->res[1]);
 
-	/* PWR registers */
-	esc->pwr_bst = rman_get_bustag(esc->res[2]);
-	esc->pwr_bsh = rman_get_bushandle(esc->res[2]);
-
 	/* SYSREG */
-	esc->sysreg_bst = rman_get_bustag(esc->res[3]);
-	esc->sysreg_bsh = rman_get_bushandle(esc->res[3]);
+	esc->sysreg_bst = rman_get_bustag(esc->res[2]);
+	esc->sysreg_bsh = rman_get_bushandle(esc->res[2]);
 
 	/* get all DMA memory */
 	if (usb_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(dev),
@@ -309,7 +295,7 @@ exynos_ehci_attach(device_t dev)
 	phy_init(esc);
 
 	/* Setup interrupt handler */
-	err = bus_setup_intr(dev, esc->res[4], INTR_TYPE_BIO | INTR_MPSAFE,
+	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) {
@@ -322,7 +308,7 @@ exynos_ehci_attach(device_t dev)
 	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[4],
+		err = bus_teardown_intr(dev, esc->res[3],
 		    sc->sc_intr_hdl);
 		if (err)
 			device_printf(dev, "Could not tear down irq,"
@@ -343,7 +329,7 @@ exynos_ehci_attach(device_t dev)
 		device_delete_child(dev, sc->sc_bus.bdev);
 		sc->sc_bus.bdev = NULL;
 
-		err = bus_teardown_intr(dev, esc->res[4],
+		err = bus_teardown_intr(dev, esc->res[3],
 		    sc->sc_intr_hdl);
 		if (err)
 			device_printf(dev, "Could not tear down irq,"
@@ -382,8 +368,8 @@ exynos_ehci_detach(device_t dev)
 		bus_space_write_4(sc->sc_io_tag, sc->sc_io_hdl,
 		    EHCI_USBINTR, 0);
 
-	if (esc->res[4] && sc->sc_intr_hdl) {
-		err = bus_teardown_intr(dev, esc->res[4],
+	if (esc->res[3] && sc->sc_intr_hdl) {
+		err = bus_teardown_intr(dev, esc->res[3],
 		    sc->sc_intr_hdl);
 		if (err) {
 			device_printf(dev, "Could not tear down irq,"
diff --git a/sys/arm/samsung/exynos/exynos5_fimd.c b/sys/arm/samsung/exynos/exynos5_fimd.c
index d7b7330fb7f3..2a02074ec1f1 100644
--- a/sys/arm/samsung/exynos/exynos5_fimd.c
+++ b/sys/arm/samsung/exynos/exynos5_fimd.c
@@ -50,8 +50,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_kern.h>
+#include <vm/pmap.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>
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
 #include "gpio_if.h"
 
 #include <machine/bus.h>
-#include <machine/fdt.h>
 #include <machine/cpu.h>
 #include <machine/intr.h>
 
@@ -213,37 +212,37 @@ get_panel_info(struct fimd_softc *sc, struct panel_info *panel)
 	/* panel size */
 	if ((len = OF_getproplen(node, "panel-size")) <= 0)
 		return (ENXIO);
-	OF_getprop(node, "panel-size", &dts_value, len);
-	panel->width = fdt32_to_cpu(dts_value[0]);
-	panel->height = fdt32_to_cpu(dts_value[1]);
+	OF_getencprop(node, "panel-size", dts_value, len);
+	panel->width = dts_value[0];
+	panel->height = dts_value[1];
 
 	/* hsync */
 	if ((len = OF_getproplen(node, "panel-hsync")) <= 0)
 		return (ENXIO);
-	OF_getprop(node, "panel-hsync", &dts_value, len);
-	panel->h_back_porch = fdt32_to_cpu(dts_value[0]);
-	panel->h_pulse_width = fdt32_to_cpu(dts_value[1]);
-	panel->h_front_porch = fdt32_to_cpu(dts_value[2]);
+	OF_getencprop(node, "panel-hsync", dts_value, len);
+	panel->h_back_porch = dts_value[0];
+	panel->h_pulse_width = dts_value[1];
+	panel->h_front_porch = dts_value[2];
 
 	/* vsync */
 	if ((len = OF_getproplen(node, "panel-vsync")) <= 0)
 		return (ENXIO);
-	OF_getprop(node, "panel-vsync", &dts_value, len);
-	panel->v_back_porch = fdt32_to_cpu(dts_value[0]);
-	panel->v_pulse_width = fdt32_to_cpu(dts_value[1]);
-	panel->v_front_porch = fdt32_to_cpu(dts_value[2]);
+	OF_getencprop(node, "panel-vsync", dts_value, len);
+	panel->v_back_porch = dts_value[0];
+	panel->v_pulse_width = dts_value[1];
+	panel->v_front_porch = dts_value[2];
 
 	/* clk divider */
 	if ((len = OF_getproplen(node, "panel-clk-div")) <= 0)
 		return (ENXIO);
-	OF_getprop(node, "panel-clk-div", &dts_value, len);
-	panel->clk_div = fdt32_to_cpu(dts_value[0]);
+	OF_getencprop(node, "panel-clk-div", dts_value, len);
+	panel->clk_div = dts_value[0];
 
 	/* backlight pin */
 	if ((len = OF_getproplen(node, "panel-backlight-pin")) <= 0)
 		return (ENXIO);
-	OF_getprop(node, "panel-backlight-pin", &dts_value, len);
-	panel->backlight_pin = fdt32_to_cpu(dts_value[0]);
+	OF_getencprop(node, "panel-backlight-pin", dts_value, len);
+	panel->backlight_pin = dts_value[0];
 
 	return (0);
 }
diff --git a/sys/arm/samsung/exynos/exynos5_i2c.c b/sys/arm/samsung/exynos/exynos5_i2c.c
index ef63a7e7f5f1..294249a5a354 100644
--- a/sys/arm/samsung/exynos/exynos5_i2c.c
+++ b/sys/arm/samsung/exynos/exynos5_i2c.c
@@ -47,13 +47,11 @@ __FBSDID("$FreeBSD$");
 
 #include "iicbus_if.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>
 
diff --git a/sys/arm/samsung/exynos/exynos5_machdep.c b/sys/arm/samsung/exynos/exynos5_machdep.c
index 24fd3f445464..170c01d4432f 100644
--- a/sys/arm/samsung/exynos/exynos5_machdep.c
+++ b/sys/arm/samsung/exynos/exynos5_machdep.c
@@ -43,8 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/machdep.h>
 #include <machine/platform.h> 
 
-#include <dev/fdt/fdt_common.h>
-
 vm_offset_t
 platform_lastaddr(void)
 {
@@ -74,6 +72,9 @@ int
 platform_devmap_init(void)
 {
 
+	/* CHIP ID */
+	arm_devmap_add_entry(0x10000000, 0x100000);
+
 	/* UART */
 	arm_devmap_add_entry(0x12C00000, 0x100000);
 
diff --git a/sys/arm/samsung/exynos/exynos5_mct.c b/sys/arm/samsung/exynos/exynos5_mct.c
index 863baa8e20b1..6f74a862bb96 100644
--- a/sys/arm/samsung/exynos/exynos5_mct.c
+++ b/sys/arm/samsung/exynos/exynos5_mct.c
@@ -45,13 +45,11 @@ __FBSDID("$FreeBSD$");
 #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>
 
 #define	MCT_CTRL_START		(1 << 8)
 #define	MCT_CTRL		(0x240)
diff --git a/sys/arm/samsung/exynos/exynos5_mp.c b/sys/arm/samsung/exynos/exynos5_mp.c
index 7b97a6e12d4c..aaeaf8059a1c 100644
--- a/sys/arm/samsung/exynos/exynos5_mp.c
+++ b/sys/arm/samsung/exynos/exynos5_mp.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2013-2014 Ruslan Bukin <br@bsdpad.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,34 @@ __FBSDID("$FreeBSD$");
 #include <machine/fdt.h>
 #include <machine/intr.h>
 
-#define	EXYNOS_SYSRAM			0x02020000
+#define	EXYNOS_CHIPID		0x10000000
+
+#define	EXYNOS5250_SOC_ID	0x43520000
+#define	EXYNOS5420_SOC_ID	0xE5420000
+#define	EXYNOS5_SOC_ID_MASK	0xFFFFF000
+
+#define	EXYNOS_SYSRAM		0x02020000
+#define	EXYNOS5420_SYSRAM_NS	(EXYNOS_SYSRAM + 0x53000 + 0x1c)
+
+#define	EXYNOS_PMU_BASE		0x10040000
+#define	CORE_CONFIG(n)		(0x2000 + (0x80 * (n)))
+#define	CORE_STATUS(n)		(CORE_CONFIG(n) + 0x4)
+#define	CORE_PWR_EN		0x3
+
+static int
+exynos_get_soc_id(void)
+{
+	bus_addr_t chipid;
+	int reg;
+
+	if (bus_space_map(fdtbus_bs_tag, EXYNOS_CHIPID,
+		0x1000, 0, &chipid) != 0)
+		panic("Couldn't map chipid\n");
+	reg = bus_space_read_4(fdtbus_bs_tag, chipid, 0x0);
+	bus_space_unmap(fdtbus_bs_tag, chipid, 0x1000);
+
+	return (reg & EXYNOS5_SOC_ID_MASK);
+}
 
 void
 platform_mp_init_secondary(void)
@@ -50,27 +77,58 @@ void
 platform_mp_setmaxid(void)
 {
 
-	mp_maxid = 1;
+	if (exynos_get_soc_id() == EXYNOS5420_SOC_ID)
+		mp_ncpus = 4;
+	else
+		mp_ncpus = 2;
+
+	mp_maxid = mp_ncpus - 1;
 }
 
 int
 platform_mp_probe(void)
 {
 
-	mp_ncpus = 2;
-	return (1);
+	return (mp_ncpus > 1);
 }
 
 void
 platform_mp_start_ap(void)
 {
-	bus_addr_t sysram;
-	int err;
+	bus_addr_t sysram, pmu;
+	int err, i, j;
+	int status;
+	int reg;
 
-	err = bus_space_map(fdtbus_bs_tag, EXYNOS_SYSRAM, 0x100, 0, &sysram);
+	err = bus_space_map(fdtbus_bs_tag, EXYNOS_PMU_BASE, 0x20000, 0, &pmu);
+	if (err != 0)
+		panic("Couldn't map pmu\n");
+
+	if (exynos_get_soc_id() == EXYNOS5420_SOC_ID)
+		reg = EXYNOS5420_SYSRAM_NS;
+	else
+		reg = EXYNOS_SYSRAM;
+
+	err = bus_space_map(fdtbus_bs_tag, reg, 0x100, 0, &sysram);
 	if (err != 0)
 		panic("Couldn't map sysram\n");
 
+	/* Give power to CPUs */
+	for (i = 1; i < mp_ncpus; i++) {
+		bus_space_write_4(fdtbus_bs_tag, pmu, CORE_CONFIG(i),
+		    CORE_PWR_EN);
+
+		for (j = 10; j >= 0; j--) {
+			status = bus_space_read_4(fdtbus_bs_tag, pmu,
+			    CORE_STATUS(i));
+			if ((status & CORE_PWR_EN) == CORE_PWR_EN)
+				break;
+			DELAY(10);
+			if (j == 0)
+				printf("Can't power on CPU%d\n", i);
+		}
+	}
+
 	bus_space_write_4(fdtbus_bs_tag, sysram, 0x0,
 	    pmap_kextract((vm_offset_t)mpentry));
 
@@ -79,6 +137,7 @@ platform_mp_start_ap(void)
 
 	armv7_sev();
 	bus_space_unmap(fdtbus_bs_tag, sysram, 0x100);
+	bus_space_unmap(fdtbus_bs_tag, pmu, 0x20000);
 }
 
 void
diff --git a/sys/arm/samsung/exynos/exynos5_pad.c b/sys/arm/samsung/exynos/exynos5_pad.c
index 10e1a25d1a47..c956e86612c2 100644
--- a/sys/arm/samsung/exynos/exynos5_pad.c
+++ b/sys/arm/samsung/exynos/exynos5_pad.c
@@ -45,13 +45,11 @@ __FBSDID("$FreeBSD$");
 #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>
 
@@ -65,10 +63,13 @@ __FBSDID("$FreeBSD$");
 
 #define	DEFAULT_CAPS	(GPIO_PIN_INPUT | GPIO_PIN_OUTPUT)
 
-#define	NPORTS	4
-#define	NGRP	40
-#define	NGPIO	253
-#define	NINTS	16
+#define	MAX_PORTS	5
+#define	MAX_NGPIO	253
+
+#define	N_EXT_INTS	16
+
+#define	EXYNOS5250	1
+#define	EXYNOS5420	2
 
 #define	PIN_IN	0
 #define	PIN_OUT	1
@@ -90,20 +91,36 @@ static int pad_pin_set(device_t, uint32_t, unsigned int);
 static int pad_pin_get(device_t, uint32_t, unsigned int *);
 static int pad_pin_toggle(device_t, uint32_t pin);
 
+struct gpio_bank {
+	char		*name;
+	uint32_t	port;
+	uint32_t	con;
+	uint32_t	ngpio;
+	uint32_t	ext_con;
+	uint32_t	ext_flt_con;
+	uint32_t	mask;
+	uint32_t	pend;
+};
+
 struct pad_softc {
-	struct resource		*res[NPORTS+4];
-	bus_space_tag_t		bst[NPORTS];
-	bus_space_handle_t	bsh[NPORTS];
+	struct resource		*res[MAX_PORTS * 2];
+	bus_space_tag_t		bst[MAX_PORTS];
+	bus_space_handle_t	bsh[MAX_PORTS];
 	struct mtx		sc_mtx;
 	int			gpio_npins;
-	struct gpio_pin		gpio_pins[NGPIO];
-	void			*gpio_ih[NPORTS+4];
+	struct gpio_pin		gpio_pins[MAX_NGPIO];
+	void			*gpio_ih[MAX_PORTS];
 	device_t		dev;
+	int			model;
+	struct resource_spec	*pad_spec;
+	struct gpio_bank	*gpio_map;
+	struct interrupt_entry	*interrupt_table;
+	int			nports;
 };
 
 struct pad_softc *gpio_sc;
 
-static struct resource_spec pad_spec[] = {
+static struct resource_spec pad_spec_5250[] = {
 	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
 	{ SYS_RES_MEMORY,	1,	RF_ACTIVE },
 	{ SYS_RES_MEMORY,	2,	RF_ACTIVE },
@@ -115,20 +132,40 @@ static struct resource_spec pad_spec[] = {
 	{ -1, 0 }
 };
 
+static struct resource_spec pad_spec_5420[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ SYS_RES_MEMORY,	1,	RF_ACTIVE },
+	{ SYS_RES_MEMORY,	2,	RF_ACTIVE },
+	{ SYS_RES_MEMORY,	3,	RF_ACTIVE },
+	{ SYS_RES_MEMORY,	4,	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 struct ofw_compat_data compat_data[] = {
+	{"samsung,exynos5420-padctrl",	EXYNOS5420},
+	{"samsung,exynos5250-padctrl",	EXYNOS5250},
+	{NULL, 0}
+};
+
 struct pad_intr {
 	uint32_t	enabled;
 	void		(*ih) (void *);
 	void		*ih_user;
 };
 
-static struct pad_intr intr_map[NGPIO];
+static struct pad_intr intr_map[MAX_NGPIO];
 
 struct interrupt_entry {
 	int gpio_number;
 	char *combiner_source_name;
 };
 
-struct interrupt_entry interrupt_table[NINTS] = {
+struct interrupt_entry interrupt_table_5250[N_EXT_INTS] = {
 	{ 147, "EINT[15]" },
 	{ 146, "EINT[14]" },
 	{ 145, "EINT[13]" },
@@ -147,84 +184,144 @@ struct interrupt_entry interrupt_table[NINTS] = {
 	{ 132, "EINT[0]" },
 };
 
-struct gpio_bank {
-	char		*name;
-	uint32_t	port;
-	uint32_t	con;
-	uint32_t	ngpio;
-	uint32_t	ext_int_grp;
-	uint32_t	ext_con;
-	uint32_t	ext_flt_con;
-	uint32_t	mask;
-	uint32_t	pend;
+struct interrupt_entry interrupt_table_5420[N_EXT_INTS] = {
+	{ 23, "EINT[15]" },
+	{ 22, "EINT[14]" },
+	{ 21, "EINT[13]" },
+	{ 20, "EINT[12]" },
+	{ 19, "EINT[11]" },
+	{ 18, "EINT[10]" },
+	{ 17, "EINT[9]" },
+	{ 16, "EINT[8]" },
+	{ 15, "EINT[7]" },
+	{ 14, "EINT[6]" },
+	{ 13, "EINT[5]" },
+	{ 12, "EINT[4]" },
+	{ 11, "EINT[3]" },
+	{ 10, "EINT[2]" },
+	{  9, "EINT[1]" },
+	{  8, "EINT[0]" },
 };
 
 /*
  * 253 multi-functional input/output ports
  */
 
-static struct gpio_bank gpio_map[] = {
+static struct gpio_bank gpio_map_5250[] = {
 	/* first 132 gpio */
-	{ "gpa0", 0, 0x000, 8,  1, 0x700, 0x800, 0x900, 0xA00 },
-	{ "gpa1", 0, 0x020, 6,  2, 0x704, 0x808, 0x904, 0xA04 },
-	{ "gpa2", 0, 0x040, 8,  3, 0x708, 0x810, 0x908, 0xA08 },
-	{ "gpb0", 0, 0x060, 5,  4, 0x70C, 0x818, 0x90C, 0xA0C },
-	{ "gpb1", 0, 0x080, 5,  5, 0x710, 0x820, 0x910, 0xA10 },
-	{ "gpb2", 0, 0x0A0, 4,  6, 0x714, 0x828, 0x914, 0xA14 },
-	{ "gpb3", 0, 0x0C0, 4,  7, 0x718, 0x830, 0x918, 0xA18 },
-	{ "gpc0", 0, 0x0E0, 7,  8, 0x71C, 0x838, 0x91C, 0xA1C },
-	{ "gpc1", 0, 0x100, 4,  9, 0x720, 0x840, 0x920, 0xA20 },
-	{ "gpc2", 0, 0x120, 7, 10, 0x724, 0x848, 0x924, 0xA24 },
-	{ "gpc3", 0, 0x140, 7, 11, 0x728, 0x850, 0x928, 0xA28 },
-	{ "gpd0", 0, 0x160, 4, 12, 0x72C, 0x858, 0x92C, 0xA2C },
-	{ "gpd1", 0, 0x180, 8, 13, 0x730, 0x860, 0x930, 0xA30 },
-	{ "gpy0", 0, 0x1A0, 6,  0,     0,     0,     0,     0 },
-	{ "gpy1", 0, 0x1C0, 4,  0,     0,     0,     0,     0 },
-	{ "gpy2", 0, 0x1E0, 6,  0,     0,     0,     0,     0 },
-	{ "gpy3", 0, 0x200, 8,  0,     0,     0,     0,     0 },
-	{ "gpy4", 0, 0x220, 8,  0,     0,     0,     0,     0 },
-	{ "gpy5", 0, 0x240, 8,  0,     0,     0,     0,     0 },
-	{ "gpy6", 0, 0x260, 8,  0,     0,     0,     0,     0 },
-	{ "gpc4", 0, 0x2E0, 7, 30, 0x734, 0x868, 0x934, 0xA34 },
+	{ "gpa0", 0, 0x000, 8, 0x700, 0x800, 0x900, 0xA00 },
+	{ "gpa1", 0, 0x020, 6, 0x704, 0x808, 0x904, 0xA04 },
+	{ "gpa2", 0, 0x040, 8, 0x708, 0x810, 0x908, 0xA08 },
+	{ "gpb0", 0, 0x060, 5, 0x70C, 0x818, 0x90C, 0xA0C },
+	{ "gpb1", 0, 0x080, 5, 0x710, 0x820, 0x910, 0xA10 },
+	{ "gpb2", 0, 0x0A0, 4, 0x714, 0x828, 0x914, 0xA14 },
+	{ "gpb3", 0, 0x0C0, 4, 0x718, 0x830, 0x918, 0xA18 },
+	{ "gpc0", 0, 0x0E0, 7, 0x71C, 0x838, 0x91C, 0xA1C },
+	{ "gpc1", 0, 0x100, 4, 0x720, 0x840, 0x920, 0xA20 },
+	{ "gpc2", 0, 0x120, 7, 0x724, 0x848, 0x924, 0xA24 },
+	{ "gpc3", 0, 0x140, 7, 0x728, 0x850, 0x928, 0xA28 },
+	{ "gpd0", 0, 0x160, 4, 0x72C, 0x858, 0x92C, 0xA2C },
+	{ "gpd1", 0, 0x180, 8, 0x730, 0x860, 0x930, 0xA30 },
+	{ "gpy0", 0, 0x1A0, 6,     0,     0,     0,     0 },
+	{ "gpy1", 0, 0x1C0, 4,     0,     0,     0,     0 },
+	{ "gpy2", 0, 0x1E0, 6,     0,     0,     0,     0 },
+	{ "gpy3", 0, 0x200, 8,     0,     0,     0,     0 },
+	{ "gpy4", 0, 0x220, 8,     0,     0,     0,     0 },
+	{ "gpy5", 0, 0x240, 8,     0,     0,     0,     0 },
+	{ "gpy6", 0, 0x260, 8,     0,     0,     0,     0 },
+	{ "gpc4", 0, 0x2E0, 7, 0x734, 0x868, 0x934, 0xA34 },
 
 	/* next 32 */
-	{ "gpx0", 0, 0xC00, 8, 40, 0xE00, 0xE80, 0xF00, 0xF40 },
-	{ "gpx1", 0, 0xC20, 8, 41, 0xE04, 0xE88, 0xF04, 0xF44 },
-	{ "gpx2", 0, 0xC40, 8, 42, 0xE08, 0xE90, 0xF08, 0xF48 },
-	{ "gpx3", 0, 0xC60, 8, 43, 0xE0C, 0xE98, 0xF0C, 0xF4C },
+	{ "gpx0", 0, 0xC00, 8, 0xE00, 0xE80, 0xF00, 0xF40 },
+	{ "gpx1", 0, 0xC20, 8, 0xE04, 0xE88, 0xF04, 0xF44 },
+	{ "gpx2", 0, 0xC40, 8, 0xE08, 0xE90, 0xF08, 0xF48 },
+	{ "gpx3", 0, 0xC60, 8, 0xE0C, 0xE98, 0xF0C, 0xF4C },
 
-	{ "gpe0", 1, 0x000, 8, 14, 0x700, 0x800, 0x900, 0xA00 },
-	{ "gpe1", 1, 0x020, 2, 15, 0x704, 0x808, 0x904, 0xA04 },
-	{ "gpf0", 1, 0x040, 4, 16, 0x708, 0x810, 0x908, 0xA08 },
-	{ "gpf1", 1, 0x060, 4, 17, 0x70C, 0x818, 0x90C, 0xA0C },
-	{ "gpg0", 1, 0x080, 8, 18, 0x710, 0x820, 0x910, 0xA10 },
-	{ "gpg1", 1, 0x0A0, 8, 19, 0x714, 0x828, 0x914, 0xA14 },
-	{ "gpg2", 1, 0x0C0, 2, 20, 0x718, 0x830, 0x918, 0xA18 },
-	{ "gph0", 1, 0x0E0, 4, 21, 0x71C, 0x838, 0x91C, 0xA1C },
-	{ "gph1", 1, 0x100, 8, 22, 0x720, 0x840, 0x920, 0xA20 },
+	{ "gpe0", 1, 0x000, 8, 0x700, 0x800, 0x900, 0xA00 },
+	{ "gpe1", 1, 0x020, 2, 0x704, 0x808, 0x904, 0xA04 },
+	{ "gpf0", 1, 0x040, 4, 0x708, 0x810, 0x908, 0xA08 },
+	{ "gpf1", 1, 0x060, 4, 0x70C, 0x818, 0x90C, 0xA0C },
+	{ "gpg0", 1, 0x080, 8, 0x710, 0x820, 0x910, 0xA10 },
+	{ "gpg1", 1, 0x0A0, 8, 0x714, 0x828, 0x914, 0xA14 },
+	{ "gpg2", 1, 0x0C0, 2, 0x718, 0x830, 0x918, 0xA18 },
+	{ "gph0", 1, 0x0E0, 4, 0x71C, 0x838, 0x91C, 0xA1C },
+	{ "gph1", 1, 0x100, 8, 0x720, 0x840, 0x920, 0xA20 },
 
-	{ "gpv0", 2, 0x000, 8, 60, 0x700, 0x800, 0x900, 0xA00 },
-	{ "gpv1", 2, 0x020, 8, 61, 0x704, 0x808, 0x904, 0xA04 },
-	{ "gpv2", 2, 0x060, 8, 62, 0x708, 0x810, 0x908, 0xA08 },
-	{ "gpv3", 2, 0x080, 8, 63, 0x70C, 0x818, 0x90C, 0xA0C },
-	{ "gpv4", 2, 0x0C0, 2, 64, 0x710, 0x820, 0x910, 0xA10 },
+	{ "gpv0", 2, 0x000, 8, 0x700, 0x800, 0x900, 0xA00 },
+	{ "gpv1", 2, 0x020, 8, 0x704, 0x808, 0x904, 0xA04 },
+	{ "gpv2", 2, 0x060, 8, 0x708, 0x810, 0x908, 0xA08 },
+	{ "gpv3", 2, 0x080, 8, 0x70C, 0x818, 0x90C, 0xA0C },
+	{ "gpv4", 2, 0x0C0, 2, 0x710, 0x820, 0x910, 0xA10 },
 
-	{ "gpz",  3, 0x000, 7, 50, 0x700, 0x800, 0x900, 0xA00 },
+	{ "gpz",  3, 0x000, 7, 0x700, 0x800, 0x900, 0xA00 },
+
+	{ NULL, -1, -1, -1, -1, -1, -1, -1 },
+};
+
+static struct gpio_bank gpio_map_5420[] = {
+	/* First 40 */
+	{ "gpy7", 0, 0x000, 8, 0x700, 0x800, 0x900, 0xA00 },
+	{ "gpx0", 0, 0xC00, 8, 0x704, 0xE80, 0xF00, 0xF40 },
+	{ "gpx1", 0, 0xC20, 8, 0x708, 0xE88, 0xF04, 0xF44 },
+	{ "gpx2", 0, 0xC40, 8, 0x70C, 0xE90, 0xF08, 0xF48 },
+	{ "gpx3", 0, 0xC60, 8, 0x710, 0xE98, 0xF0C, 0xF4C },
+
+	/* Next 85 */
+	{ "gpc0", 1, 0x000, 8, 0x700, 0x800, 0x900, 0xA00 },
+	{ "gpc1", 1, 0x020, 8, 0x704, 0x808, 0x904, 0xA04 },
+	{ "gpc2", 1, 0x040, 7, 0x708, 0x810, 0x908, 0xA08 },
+	{ "gpc3", 1, 0x060, 4, 0x70C, 0x818, 0x90C, 0xA0C },
+	{ "gpc4", 1, 0x080, 2, 0x710, 0x820, 0x910, 0xA10 },
+	{ "gpd1", 1, 0x0A0, 8, 0x714, 0x828, 0x914, 0xA14 },
+	{ "gpy0", 1, 0x0C0, 6, 0x718, 0x830, 0x918, 0xA18 },
+	{ "gpy1", 1, 0x0E0, 4, 0x71C, 0x838, 0x91C, 0xA1C },
+	{ "gpy2", 1, 0x100, 6, 0x720, 0x840, 0x920, 0xA20 },
+	{ "gpy3", 1, 0x120, 8, 0x724, 0x848, 0x924, 0xA24 },
+	{ "gpy4", 1, 0x140, 8, 0x728, 0x850, 0x928, 0xA28 },
+	{ "gpy5", 1, 0x160, 8, 0x72C, 0x858, 0x92C, 0xA2C },
+	{ "gpy6", 1, 0x180, 8, 0x730, 0x860, 0x930, 0xA30 },
+
+	/* Next 46 */
+	{ "gpe0", 2, 0x000, 8, 0x700, 0x800, 0x900, 0xA00 },
+	{ "gpe1", 2, 0x020, 2, 0x704, 0x808, 0x904, 0xA04 },
+	{ "gpf0", 2, 0x040, 6, 0x708, 0x810, 0x908, 0xA08 },
+	{ "gpf1", 2, 0x060, 8, 0x70C, 0x818, 0x90C, 0xA0C },
+	{ "gpg0", 2, 0x080, 8, 0x710, 0x820, 0x910, 0xA10 },
+	{ "gpg1", 2, 0x0A0, 8, 0x714, 0x828, 0x914, 0xA14 },
+	{ "gpg2", 2, 0x0C0, 2, 0x718, 0x830, 0x918, 0xA18 },
+	{ "gpj4", 2, 0x0E0, 4, 0x71C, 0x838, 0x91C, 0xA1C },
+
+	/* Next 54 */
+	{ "gpa0", 3, 0x000, 8, 0x700, 0x800, 0x900, 0xA00 },
+	{ "gpa1", 3, 0x020, 6, 0x704, 0x808, 0x904, 0xA04 },
+	{ "gpa2", 3, 0x040, 8, 0x708, 0x810, 0x908, 0xA08 },
+	{ "gpb0", 3, 0x060, 5, 0x70C, 0x818, 0x90C, 0xA0C },
+	{ "gpb1", 3, 0x080, 5, 0x710, 0x820, 0x910, 0xA10 },
+	{ "gpb2", 3, 0x0A0, 4, 0x714, 0x828, 0x914, 0xA14 },
+	{ "gpb3", 3, 0x0C0, 8, 0x718, 0x830, 0x918, 0xA18 },
+	{ "gpb4", 3, 0x0E0, 2, 0x71C, 0x838, 0x91C, 0xA1C },
+	{ "gph0", 3, 0x100, 8, 0x720, 0x840, 0x920, 0xA20 },
+
+	/* Last 7 */
+	{ "gpz",  4, 0x000, 7, 0x700, 0x800, 0x900, 0xA00 },
+
+	{ NULL, -1, -1, -1, -1, -1, -1, -1 },
 };
 
 static int
-get_bank(int gpio_number, struct gpio_bank *bank, int *pin_shift)
+get_bank(struct pad_softc *sc, int gpio_number,
+    struct gpio_bank *bank, int *pin_shift)
 {
 	int ngpio;
 	int i;
 	int n;
 
 	n = 0;
-	for (i = 0; i < NGRP; i++) {
-		ngpio = gpio_map[i].ngpio;
+	for (i = 0; sc->gpio_map[i].ngpio != -1; i++) {
+		ngpio = sc->gpio_map[i].ngpio;
 
 		if ((n + ngpio) > gpio_number) {
-			*bank = gpio_map[i];
+			*bank = sc->gpio_map[i];
 			*pin_shift = (gpio_number - n);
 			return (0);
 		};
@@ -260,16 +357,16 @@ ext_intr(void *arg)
 	sc = arg;
 
 	n = 0;
-	for (i = 0; i < NGRP; i++) {
+	for (i = 0; sc->gpio_map[i].ngpio != -1; i++) {
 		found = 0;
-		ngpio = gpio_map[i].ngpio;
+		ngpio = sc->gpio_map[i].ngpio;
 
-		if (gpio_map[i].pend == 0) {
+		if (sc->gpio_map[i].pend == 0) {
 			n += ngpio;
 			continue;
 		}
 
-		reg = READ4(sc, gpio_map[i].port, gpio_map[i].pend);
+		reg = READ4(sc, sc->gpio_map[i].port, sc->gpio_map[i].pend);
 
 		for (j = 0; j < ngpio; j++) {
 			if (reg & (1 << j)) {
@@ -286,7 +383,7 @@ ext_intr(void *arg)
 
 		if (found) {
 			/* ACK */
-			WRITE4(sc, gpio_map[i].port, gpio_map[i].pend, reg);
+			WRITE4(sc, sc->gpio_map[i].port, sc->gpio_map[i].pend, reg);
 		}
 
 		n += ngpio;
@@ -311,13 +408,13 @@ pad_setup_intr(int gpio_number, void (*ih)(void *), void *ih_user)
 		return (-1);
 	}
 
-	if (get_bank(gpio_number, &bank, &pin_shift) != 0)
+	if (get_bank(sc, gpio_number, &bank, &pin_shift) != 0)
 		return (-1);
 
 	entry = NULL;
-	for (i = 0; i < NINTS; i++)
-		if (interrupt_table[i].gpio_number == gpio_number)
-			entry = &interrupt_table[i];
+	for (i = 0; i < N_EXT_INTS; i++)
+		if (sc->interrupt_table[i].gpio_number == gpio_number)
+			entry = &(sc->interrupt_table[i]);
 
 	if (entry == NULL) {
 		device_printf(sc->dev, "Cant find interrupt source for %d\n",
@@ -374,11 +471,12 @@ pad_probe(device_t dev)
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
-	if (!ofw_bus_is_compatible(dev, "exynos,pad"))
-		return (ENXIO);
+	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) {
+		device_set_desc(dev, "Exynos Pad Control");
+		return (BUS_PROBE_DEFAULT);
+	}
 
-	device_set_desc(dev, "Exynos Pad Control");
-	return (BUS_PROBE_DEFAULT);
+	return (ENXIO);
 }
 
 static int
@@ -391,27 +489,47 @@ pad_attach(device_t dev)
 	int i;
 
 	sc = device_get_softc(dev);
+
 	mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
 
-	if (bus_alloc_resources(dev, pad_spec, sc->res)) {
+	sc->model = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
+	switch (sc->model) {
+	case EXYNOS5250:
+		sc->pad_spec = pad_spec_5250;
+		sc->gpio_map = gpio_map_5250;
+		sc->interrupt_table = interrupt_table_5250;
+		sc->gpio_npins = 253;
+		sc->nports = 4;
+		break;
+	case EXYNOS5420:
+		sc->pad_spec = pad_spec_5420;
+		sc->gpio_map = gpio_map_5420;
+		sc->interrupt_table = interrupt_table_5420;
+		sc->gpio_npins = 232;
+		sc->nports = 5;
+		break;
+	default:
+		return (-1);
+	};
+
+	if (bus_alloc_resources(dev, sc->pad_spec, sc->res)) {
 		device_printf(dev, "could not allocate resources\n");
 		return (ENXIO);
 	}
 
 	/* Memory interface */
 
-	for (i = 0; i < NPORTS; i++) {
+	for (i = 0; i < sc->nports; i++) {
 		sc->bst[i] = rman_get_bustag(sc->res[i]);
 		sc->bsh[i] = rman_get_bushandle(sc->res[i]);
 	};
 
 	sc->dev = dev;
-	sc->gpio_npins = NGPIO;
 
 	gpio_sc = sc;
 
-	for (i = 0; i < NPORTS; i++) {
-		if ((bus_setup_intr(dev, sc->res[NPORTS + i],
+	for (i = 0; i < sc->nports; i++) {
+		if ((bus_setup_intr(dev, sc->res[sc->nports + i],
 			    INTR_TYPE_BIO | INTR_MPSAFE, port_intr,
 			    NULL, sc, &sc->gpio_ih[i]))) {
 			device_printf(dev,
@@ -424,7 +542,7 @@ pad_attach(device_t dev)
 		sc->gpio_pins[i].gp_pin = i;
 		sc->gpio_pins[i].gp_caps = DEFAULT_CAPS;
 
-		if (get_bank(i, &bank, &pin_shift) != 0)
+		if (get_bank(sc, i, &bank, &pin_shift) != 0)
 			continue;
 
 		pin_shift *= 4;
@@ -450,8 +568,11 @@ pad_attach(device_t dev)
 static int
 pad_pin_max(device_t dev, int *maxpin)
 {
+	struct pad_softc *sc;
 
-	*maxpin = NGPIO - 1;
+	sc = device_get_softc(dev);
+
+	*maxpin = sc->gpio_npins - 1;
 	return (0);
 }
 
@@ -538,7 +659,7 @@ pad_pin_get(device_t dev, uint32_t pin, unsigned int *val)
 	if (i >= sc->gpio_npins)
 		return (EINVAL);
 
-	if (get_bank(pin, &bank, &pin_shift) != 0)
+	if (get_bank(sc, pin, &bank, &pin_shift) != 0)
 		return (EINVAL);
 
 	GPIO_LOCK(sc);
@@ -569,7 +690,7 @@ pad_pin_toggle(device_t dev, uint32_t pin)
 	if (i >= sc->gpio_npins)
 		return (EINVAL);
 
-	if (get_bank(pin, &bank, &pin_shift) != 0)
+	if (get_bank(sc, pin, &bank, &pin_shift) != 0)
 		return (EINVAL);
 
 	GPIO_LOCK(sc);
@@ -601,7 +722,7 @@ pad_pin_configure(struct pad_softc *sc, struct gpio_pin *pin,
 	if (flags & (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) {
 		pin->gp_flags &= ~(GPIO_PIN_INPUT|GPIO_PIN_OUTPUT);
 
-		if (get_bank(pin->gp_pin, &bank, &pin_shift) != 0)
+		if (get_bank(sc, pin->gp_pin, &bank, &pin_shift) != 0)
 			return;
 
 		pin_shift *= 4;
@@ -675,7 +796,7 @@ pad_pin_set(device_t dev, uint32_t pin, unsigned int value)
 	if (i >= sc->gpio_npins)
 		return (EINVAL);
 
-	if (get_bank(pin, &bank, &pin_shift) != 0)
+	if (get_bank(sc, pin, &bank, &pin_shift) != 0)
 		return (EINVAL);
 
 	GPIO_LOCK(sc);
diff --git a/sys/arm/samsung/exynos/exynos5_pmu.c b/sys/arm/samsung/exynos/exynos5_pmu.c
new file mode 100644
index 000000000000..92868e8c0dde
--- /dev/null
+++ b/sys/arm/samsung/exynos/exynos5_pmu.c
@@ -0,0 +1,179 @@
+/*-
+ * Copyright (c) 2014 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.
+ */
+
+/*
+ * Exynos 5 Power Management Unit (PMU)
+ */
+
+#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/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/intr.h>
+
+#include <arm/samsung/exynos/exynos5_common.h>
+#include <arm/samsung/exynos/exynos5_pmu.h>
+
+#define	EXYNOS5250	1
+#define	EXYNOS5420	2
+
+/* PWR control */
+#define	EXYNOS5_PWR_USBHOST_PHY		0x708
+#define	EXYNOS5_USBDRD_PHY_CTRL		0x704
+#define	EXYNOS5420_USBDRD1_PHY_CTRL	0x708
+
+#define	PHY_POWER_ON			1
+#define	PHY_POWER_OFF			0
+
+struct pmu_softc {
+	struct resource		*res[1];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+	device_t		dev;
+	int			model;
+};
+
+struct pmu_softc *pmu_sc;
+
+static struct ofw_compat_data compat_data[] = {
+	{"samsung,exynos5420-pmu",	EXYNOS5420},
+	{"samsung,exynos5250-pmu",	EXYNOS5250},
+	{NULL, 0}
+};
+
+static struct resource_spec pmu_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static int
+pmu_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) {
+		device_set_desc(dev, "Samsung Exynos 5 Power Management Unit");
+		return (BUS_PROBE_DEFAULT);
+	}
+
+	return (ENXIO);
+}
+
+int
+usb2_phy_power_on(void)
+{
+	struct pmu_softc *sc;
+
+	sc = pmu_sc;
+	if (sc == NULL)
+		return (-1);
+
+	/* EHCI */
+	WRITE4(sc, EXYNOS5_PWR_USBHOST_PHY, PHY_POWER_ON);
+
+	return (0);
+}
+
+int
+usbdrd_phy_power_on(void)
+{
+	struct pmu_softc *sc;
+
+	sc = pmu_sc;
+	if (sc == NULL)
+		return (-1);
+
+	/*
+	 * First XHCI controller (left-side USB port on chromebook2)
+	 */
+	WRITE4(sc, EXYNOS5_USBDRD_PHY_CTRL, PHY_POWER_ON);
+
+	/*
+	 * Second XHCI controller (right-side USB port on chrombook2)
+	 * Only available on 5420.
+	 */
+	if (sc->model == EXYNOS5420)
+		WRITE4(sc, EXYNOS5420_USBDRD1_PHY_CTRL, PHY_POWER_ON);
+
+	return (0);
+}
+
+static int
+pmu_attach(device_t dev)
+{
+	struct pmu_softc *sc;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+	sc->model = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
+
+	if (bus_alloc_resources(dev, pmu_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]);
+
+	pmu_sc = sc;
+
+	return (0);
+}
+
+static device_method_t pmu_methods[] = {
+	DEVMETHOD(device_probe,		pmu_probe),
+	DEVMETHOD(device_attach,	pmu_attach),
+	{ 0, 0 }
+};
+
+static driver_t pmu_driver = {
+	"pmu",
+	pmu_methods,
+	sizeof(struct pmu_softc),
+};
+
+static devclass_t pmu_devclass;
+
+DRIVER_MODULE(pmu, simplebus, pmu_driver, pmu_devclass, 0, 0);
diff --git a/lib/libc/ia64/gen/_set_tp.c b/sys/arm/samsung/exynos/exynos5_pmu.h
similarity index 91%
rename from lib/libc/ia64/gen/_set_tp.c
rename to sys/arm/samsung/exynos/exynos5_pmu.h
index 901e90166918..73c6b85bf89e 100644
--- a/lib/libc/ia64/gen/_set_tp.c
+++ b/sys/arm/samsung/exynos/exynos5_pmu.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2004 Doug Rabson
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,12 +23,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ * $FreeBSD$
  */
 
-void
-_set_tp(void *tpval)
-{
-
-	__asm __volatile("mov r13 = %0" :: "r"(tpval));
-}
+int usb2_phy_power_on(void);
+int usbdrd_phy_power_on(void);
diff --git a/sys/arm/samsung/exynos/exynos5_spi.c b/sys/arm/samsung/exynos/exynos5_spi.c
new file mode 100644
index 000000000000..2a574b884e4a
--- /dev/null
+++ b/sys/arm/samsung/exynos/exynos5_spi.c
@@ -0,0 +1,234 @@
+/*-
+ * Copyright (c) 2014 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.
+ */
+
+/*
+ * Exynos 5 Serial Peripheral Interface (SPI)
+ */
+
+#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/spibus/spi.h>
+#include <dev/spibus/spibusvar.h>
+
+#include "spibus_if.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/cpu.h>
+#include <machine/intr.h>
+
+#include <arm/samsung/exynos/exynos5_common.h>
+
+#define	CH_CFG		0x00		/* SPI configuration */
+#define	 SW_RST		(1 << 5)	/* Reset */
+#define	 RX_CH_ON	(1 << 1)	/* SPI Rx Channel On */
+#define	 TX_CH_ON	(1 << 0)	/* SPI Tx Channel On */
+#define	MODE_CFG	0x08		/* FIFO control */
+#define	CS_REG		0x0C		/* slave selection control */
+#define	 NSSOUT		(1 << 0)
+#define	SPI_INT_EN	0x10		/* interrupt enable */
+#define	SPI_STATUS	0x14		/* SPI status */
+#define	 TX_FIFO_LVL_S	6
+#define	 TX_FIFO_LVL_M	0x1ff
+#define	 RX_FIFO_LVL_S	15
+#define	 RX_FIFO_LVL_M	0x1ff
+#define	SPI_TX_DATA	0x18		/* Tx data */
+#define	SPI_RX_DATA	0x1C		/* Rx data */
+#define	PACKET_CNT_REG	0x20		/* packet count */
+#define	PENDING_CLR_REG	0x24		/* interrupt pending clear */
+#define	SWAP_CFG	0x28		/* swap configuration */
+#define	FB_CLK_SEL	0x2C		/* feedback clock selection */
+#define	 FB_CLK_180	0x2		/* 180 degree phase lagging */
+
+struct spi_softc {
+	struct resource		*res[2];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+	device_t		dev;
+};
+
+struct spi_softc *spi_sc;
+
+static struct resource_spec spi_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static int
+spi_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (!ofw_bus_is_compatible(dev, "samsung,exynos5-spi"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Exynos 5 Serial Peripheral Interface (SPI)");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+spi_attach(device_t dev)
+{
+	struct spi_softc *sc;
+	int reg;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+
+	if (bus_alloc_resources(dev, spi_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]);
+
+	spi_sc = sc;
+
+	WRITE4(sc, FB_CLK_SEL, FB_CLK_180);
+
+	reg = READ4(sc, CH_CFG);
+	reg |= (RX_CH_ON | TX_CH_ON);
+	WRITE4(sc, CH_CFG, reg);
+
+	device_add_child(dev, "spibus", 0);
+	return (bus_generic_attach(dev));
+}
+
+static int
+spi_txrx(struct spi_softc *sc, uint8_t *out_buf,
+    uint8_t *in_buf, int bufsz, int cs)
+{
+	uint32_t reg;
+	uint32_t i;
+
+	if (bufsz == 0) {
+		/* Nothing to transfer */
+		return (0);
+	}
+
+	/* Reset registers */
+	reg = READ4(sc, CH_CFG);
+	reg |= SW_RST;
+	WRITE4(sc, CH_CFG, reg);
+	reg &= ~SW_RST;
+	WRITE4(sc, CH_CFG, reg);
+
+	/* Assert CS */
+	reg = READ4(sc, CS_REG);
+	reg &= ~NSSOUT;
+	WRITE4(sc, CS_REG, reg);
+
+	for (i = 0; i < bufsz; i++) {
+
+		/* TODO: Implement FIFO operation */
+
+		/* Wait all the data shifted out */
+		while (READ4(sc, SPI_STATUS) & \
+		    (TX_FIFO_LVL_M << TX_FIFO_LVL_S))
+			continue;
+
+		WRITE1(sc, SPI_TX_DATA, out_buf[i]);
+
+		/* Wait until no data available */
+		while ((READ4(sc, SPI_STATUS) & \
+			(RX_FIFO_LVL_M << RX_FIFO_LVL_S)) == 0)
+			continue;
+
+		in_buf[i] = READ1(sc, SPI_RX_DATA);
+	}
+
+	/* Deassert CS */
+	reg = READ4(sc, CS_REG);
+	reg |= NSSOUT;
+	WRITE4(sc, CS_REG, reg);
+
+	return (0);
+}
+
+static int
+spi_transfer(device_t dev, device_t child, struct spi_command *cmd)
+{
+	struct spi_softc *sc;
+	uint32_t cs;
+
+	sc = device_get_softc(dev);
+
+	KASSERT(cmd->tx_cmd_sz == cmd->rx_cmd_sz,
+	    ("%s: TX/RX command sizes should be equal", __func__));
+	KASSERT(cmd->tx_data_sz == cmd->rx_data_sz,
+	    ("%s: TX/RX data sizes should be equal", __func__));
+
+	/* get the proper chip select */
+	spibus_get_cs(child, &cs);
+
+	/* Command */
+	spi_txrx(sc, cmd->tx_cmd, cmd->rx_cmd, cmd->tx_cmd_sz, cs);
+
+	/* Data */
+	spi_txrx(sc, cmd->tx_data, cmd->rx_data, cmd->tx_data_sz, cs);
+
+	return (0);
+}
+
+static device_method_t spi_methods[] = {
+	DEVMETHOD(device_probe,		spi_probe),
+	DEVMETHOD(device_attach,	spi_attach),
+
+	/* SPI interface */
+	DEVMETHOD(spibus_transfer,	spi_transfer),
+
+	{ 0, 0 }
+};
+
+static driver_t spi_driver = {
+	"spi",
+	spi_methods,
+	sizeof(struct spi_softc),
+};
+
+static devclass_t spi_devclass;
+
+DRIVER_MODULE(spi, simplebus, spi_driver, spi_devclass, 0, 0);
diff --git a/sys/arm/samsung/exynos/exynos5_usb_phy.c b/sys/arm/samsung/exynos/exynos5_usb_phy.c
new file mode 100644
index 000000000000..2756efbc337c
--- /dev/null
+++ b/sys/arm/samsung/exynos/exynos5_usb_phy.c
@@ -0,0 +1,271 @@
+/*-
+ * Copyright (c) 2014 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.
+ */
+
+/*
+ * DWC3 USB 3.0 DRD (dual role device) PHY
+ */
+
+#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/gpio.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/cpu.h>
+#include <machine/intr.h>
+
+#include <arm/samsung/exynos/exynos5_common.h>
+#include <arm/samsung/exynos/exynos5_pmu.h>
+
+#include "gpio_if.h"
+
+#define	USB_DRD_LINKSYSTEM			0x04
+#define	 LINKSYSTEM_FLADJ_MASK			(0x3f << 1)
+#define	 LINKSYSTEM_FLADJ(x)			((x) << 1)
+#define	 LINKSYSTEM_XHCI_VERSION_CTRL		(1 << 27)
+#define	USB_DRD_PHYUTMI				0x08
+#define	 PHYUTMI_OTGDISABLE			(1 << 6)
+#define	 PHYUTMI_FORCESUSPEND			(1 << 1)
+#define	 PHYUTMI_FORCESLEEP			(1 << 0)
+#define	USB_DRD_PHYPIPE				0x0c
+#define	USB_DRD_PHYCLKRST			0x10
+#define	 PHYCLKRST_PORTRESET			(1 << 1)
+#define	 PHYCLKRST_COMMONONN			(1 << 0)
+#define	 PHYCLKRST_EN_UTMISUSPEND		(1 << 31)
+#define	 PHYCLKRST_SSC_REFCLKSEL_MASK		(0xff << 23)
+#define	 PHYCLKRST_SSC_REFCLKSEL(x)		((x) << 23)
+#define	 PHYCLKRST_SSC_RANGE_MASK		(0x03 << 21)
+#define	 PHYCLKRST_SSC_RANGE(x)			((x) << 21)
+#define	 PHYCLKRST_SSC_EN			(1 << 20)
+#define	 PHYCLKRST_REF_SSP_EN			(1 << 19)
+#define	 PHYCLKRST_REF_CLKDIV2			(1 << 18)
+#define	 PHYCLKRST_MPLL_MLTPR_MASK		(0x7f << 11)
+#define	 PHYCLKRST_MPLL_MLTPR_100MHZ		(0x19 << 11)
+#define	 PHYCLKRST_MPLL_MLTPR_50M		(0x32 << 11)
+#define	 PHYCLKRST_MPLL_MLTPR_24MHZ		(0x68 << 11)
+#define	 PHYCLKRST_MPLL_MLTPR_20MHZ		(0x7d << 11)
+#define	 PHYCLKRST_MPLL_MLTPR_19200KHZ		(0x02 << 11)
+#define	 PHYCLKRST_FSEL_UTMI_MASK		(0x7 << 5)
+#define	 PHYCLKRST_FSEL_PIPE_MASK		(0x7 << 8)
+#define	 PHYCLKRST_FSEL(x)			((x) << 5)
+#define	 PHYCLKRST_FSEL_9MHZ6			0x0
+#define	 PHYCLKRST_FSEL_10MHZ			0x1
+#define	 PHYCLKRST_FSEL_12MHZ			0x2
+#define	 PHYCLKRST_FSEL_19MHZ2			0x3
+#define	 PHYCLKRST_FSEL_20MHZ			0x4
+#define	 PHYCLKRST_FSEL_24MHZ			0x5
+#define	 PHYCLKRST_FSEL_50MHZ			0x7
+#define	 PHYCLKRST_RETENABLEN			(1 << 4)
+#define	 PHYCLKRST_REFCLKSEL_MASK		(0x03 << 2)
+#define	 PHYCLKRST_REFCLKSEL_PAD_REFCLK		(0x2 << 2)
+#define	 PHYCLKRST_REFCLKSEL_EXT_REFCLK		(0x3 << 2)
+#define	USB_DRD_PHYREG0				0x14
+#define	USB_DRD_PHYREG1				0x18
+#define	USB_DRD_PHYPARAM0			0x1c
+#define	 PHYPARAM0_REF_USE_PAD			(1 << 31)
+#define	 PHYPARAM0_REF_LOSLEVEL_MASK		(0x1f << 26)
+#define	 PHYPARAM0_REF_LOSLEVEL			(0x9 << 26)
+#define	USB_DRD_PHYPARAM1			0x20
+#define	 PHYPARAM1_PCS_TXDEEMPH_MASK		(0x1f << 0)
+#define	 PHYPARAM1_PCS_TXDEEMPH			(0x1c)
+#define	USB_DRD_PHYTERM				0x24
+#define	USB_DRD_PHYTEST				0x28
+#define	 PHYTEST_POWERDOWN_SSP			(1 << 3)
+#define	 PHYTEST_POWERDOWN_HSP			(1 << 2)
+#define	USB_DRD_PHYADP				0x2c
+#define	USB_DRD_PHYUTMICLKSEL			0x30
+#define	 PHYUTMICLKSEL_UTMI_CLKSEL		(1 << 2)
+#define	USB_DRD_PHYRESUME			0x34
+#define	USB_DRD_LINKPORT			0x44
+
+struct usb_phy_softc {
+	struct resource		*res[1];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+	device_t		dev;
+};
+
+static struct resource_spec usb_phy_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static int
+usb_phy_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (!ofw_bus_is_compatible(dev, "samsung,exynos5420-usbdrd-phy"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Samsung Exynos 5 USB PHY");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+vbus_on(struct usb_phy_softc *sc)
+{
+	pcell_t dts_value[3];
+	device_t gpio_dev;
+	phandle_t node;
+	pcell_t pin;
+	int len;
+
+	if ((node = ofw_bus_get_node(sc->dev)) == -1)
+		return (-1);
+
+	/* Power pin */
+	if ((len = OF_getproplen(node, "vbus-supply")) <= 0)
+		return (-1);
+	OF_getencprop(node, "vbus-supply", dts_value, len);
+	pin = dts_value[0];
+
+	gpio_dev = devclass_get_device(devclass_find("gpio"), 0);
+	if (gpio_dev == NULL) {
+		device_printf(sc->dev, "cant find gpio_dev\n");
+		return (1);
+	}
+
+	GPIO_PIN_SETFLAGS(gpio_dev, pin, GPIO_PIN_OUTPUT);
+	GPIO_PIN_SET(gpio_dev, pin, GPIO_PIN_HIGH);
+
+	return (0);
+}
+
+static int
+usb3_phy_init(struct usb_phy_softc *sc)
+{
+	int reg;
+
+	/* Reset USB 3.0 PHY */
+	WRITE4(sc, USB_DRD_PHYREG0, 0);
+
+	reg = READ4(sc, USB_DRD_PHYPARAM0);
+	/* PHY CLK src */
+	reg &= ~(PHYPARAM0_REF_USE_PAD);
+	reg &= ~(PHYPARAM0_REF_LOSLEVEL_MASK);
+	reg |= (PHYPARAM0_REF_LOSLEVEL);
+	WRITE4(sc, USB_DRD_PHYPARAM0, reg);
+	WRITE4(sc, USB_DRD_PHYRESUME, 0);
+
+	reg = (LINKSYSTEM_XHCI_VERSION_CTRL |
+	    LINKSYSTEM_FLADJ(0x20));
+	WRITE4(sc, USB_DRD_LINKSYSTEM, reg);
+
+	reg = READ4(sc, USB_DRD_PHYPARAM1);
+	reg &= ~(PHYPARAM1_PCS_TXDEEMPH_MASK);
+	reg |= (PHYPARAM1_PCS_TXDEEMPH);
+	WRITE4(sc, USB_DRD_PHYPARAM1, reg);
+
+	reg = READ4(sc, USB_DRD_PHYUTMICLKSEL);
+	reg |= (PHYUTMICLKSEL_UTMI_CLKSEL);
+	WRITE4(sc, USB_DRD_PHYUTMICLKSEL, reg);
+
+	reg = READ4(sc, USB_DRD_PHYTEST);
+	reg &= ~(PHYTEST_POWERDOWN_HSP);
+	reg &= ~(PHYTEST_POWERDOWN_SSP);
+	WRITE4(sc, USB_DRD_PHYTEST, reg);
+
+	WRITE4(sc, USB_DRD_PHYUTMI, PHYUTMI_OTGDISABLE);
+
+	/* Clock */
+	reg = (PHYCLKRST_REFCLKSEL_EXT_REFCLK);
+	reg |= (PHYCLKRST_FSEL(PHYCLKRST_FSEL_24MHZ));
+	reg |= (PHYCLKRST_MPLL_MLTPR_24MHZ);
+	reg |= (PHYCLKRST_SSC_REFCLKSEL(0x88));
+	reg |= (PHYCLKRST_RETENABLEN |
+	    PHYCLKRST_REF_SSP_EN | /* Super speed */
+	    PHYCLKRST_SSC_EN | /* Spread spectrum */
+	    PHYCLKRST_COMMONONN |
+	    PHYCLKRST_PORTRESET);
+
+	WRITE4(sc, USB_DRD_PHYCLKRST, reg);
+	DELAY(50000);
+	reg &= ~PHYCLKRST_PORTRESET;
+	WRITE4(sc, USB_DRD_PHYCLKRST, reg);
+
+	return (0);
+}
+
+static int
+usb_phy_attach(device_t dev)
+{
+	struct usb_phy_softc *sc;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+
+	if (bus_alloc_resources(dev, usb_phy_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]);
+
+	vbus_on(sc);
+
+	usbdrd_phy_power_on();
+
+	DELAY(100);
+
+	usb3_phy_init(sc);
+
+	return (0);
+}
+
+static device_method_t usb_phy_methods[] = {
+	DEVMETHOD(device_probe,		usb_phy_probe),
+	DEVMETHOD(device_attach,	usb_phy_attach),
+	{ 0, 0 }
+};
+
+static driver_t usb_phy_driver = {
+	"usb_phy",
+	usb_phy_methods,
+	sizeof(struct usb_phy_softc),
+};
+
+static devclass_t usb_phy_devclass;
+
+DRIVER_MODULE(usb_phy, simplebus, usb_phy_driver, usb_phy_devclass, 0, 0);
diff --git a/sys/arm/samsung/exynos/exynos5_xhci.c b/sys/arm/samsung/exynos/exynos5_xhci.c
new file mode 100644
index 000000000000..ae581e52d034
--- /dev/null
+++ b/sys/arm/samsung/exynos/exynos5_xhci.c
@@ -0,0 +1,339 @@
+/*-
+ * Copyright (c) 2014 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.
+ */
+
+#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 <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/xhci.h>
+#include <dev/usb/controller/xhcireg.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+
+#include <arm/samsung/exynos/exynos5_common.h>
+
+#include "opt_platform.h"
+
+#define	GSNPSID				0x20
+#define	 GSNPSID_MASK			0xffff0000
+#define	 REVISION_MASK			0xffff
+#define	GCTL				0x10
+#define	 GCTL_PWRDNSCALE(n)		((n) << 19)
+#define	 GCTL_U2RSTECN			(1 << 16)
+#define	 GCTL_CLK_BUS			(0)
+#define	 GCTL_CLK_PIPE			(1)
+#define	 GCTL_CLK_PIPEHALF		(2)
+#define	 GCTL_CLK_M			(3)
+#define	 GCTL_CLK_S			(6)
+#define	 GCTL_PRTCAP(n)			(((n) & (3 << 12)) >> 12)
+#define	 GCTL_PRTCAPDIR(n)		((n) << 12)
+#define	 GCTL_PRTCAP_HOST		1
+#define	 GCTL_PRTCAP_DEVICE		2
+#define	 GCTL_PRTCAP_OTG		3
+#define	 GCTL_CORESOFTRESET		(1 << 11)
+#define	 GCTL_SCALEDOWN_MASK		3
+#define	 GCTL_SCALEDOWN_SHIFT		4
+#define	 GCTL_DISSCRAMBLE		(1 << 3)
+#define	 GCTL_DSBLCLKGTNG		(1 << 0)
+#define	GHWPARAMS1			0x3c
+#define	 GHWPARAMS1_EN_PWROPT(n)	(((n) & (3 << 24)) >> 24)
+#define	 GHWPARAMS1_EN_PWROPT_NO	0
+#define	 GHWPARAMS1_EN_PWROPT_CLK	1
+#define	GUSB2PHYCFG(n)			(0x100 + (n * 0x04))
+#define	 GUSB2PHYCFG_PHYSOFTRST		(1 << 31)
+#define	 GUSB2PHYCFG_SUSPHY		(1 << 6)
+#define	GUSB3PIPECTL(n)			(0x1c0 + (n * 0x04))
+#define	 GUSB3PIPECTL_PHYSOFTRST	(1 << 31)
+#define	 GUSB3PIPECTL_SUSPHY		(1 << 17)
+
+/* Forward declarations */
+static int	exynos_xhci_attach(device_t dev);
+static int	exynos_xhci_detach(device_t dev);
+static int	exynos_xhci_probe(device_t dev);
+
+struct exynos_xhci_softc {
+	device_t		dev;
+	struct xhci_softc	base;
+	struct resource		*res[3];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+};
+
+static struct resource_spec exynos_xhci_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ SYS_RES_MEMORY,	1,	RF_ACTIVE },
+	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static device_method_t xhci_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe, exynos_xhci_probe),
+	DEVMETHOD(device_attach, exynos_xhci_attach),
+	DEVMETHOD(device_detach, exynos_xhci_detach),
+	DEVMETHOD(device_suspend, bus_generic_suspend),
+	DEVMETHOD(device_resume, bus_generic_resume),
+	DEVMETHOD(device_shutdown, bus_generic_shutdown),
+
+	DEVMETHOD_END
+};
+
+/* kobj_class definition */
+static driver_t xhci_driver = {
+	"xhci",
+	xhci_methods,
+	sizeof(struct xhci_softc)
+};
+
+static devclass_t xhci_devclass;
+
+DRIVER_MODULE(xhci, simplebus, xhci_driver, xhci_devclass, 0, 0);
+MODULE_DEPEND(xhci, usb, 1, 1, 1);
+
+/*
+ * Public methods
+ */
+static int
+exynos_xhci_probe(device_t dev)
+{
+
+	if (!ofw_bus_status_okay(dev))
+		return (ENXIO);
+
+	if (ofw_bus_is_compatible(dev, "samsung,exynos5250-dwusb3") == 0)
+		return (ENXIO);
+
+	device_set_desc(dev, "Exynos USB 3.0 controller");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+dwc3_init(struct exynos_xhci_softc *esc)
+{
+	struct xhci_softc *sc;
+	int hwparams1;
+	int rev;
+	int reg;
+
+	sc = &esc->base;
+
+	rev = READ4(esc, GSNPSID);
+	if ((rev & GSNPSID_MASK) != 0x55330000) {
+		printf("It is not DWC3 controller\n");
+		return (-1);
+	}
+
+	/* Reset controller */
+	WRITE4(esc, GCTL, GCTL_CORESOFTRESET);
+	WRITE4(esc, GUSB3PIPECTL(0), GUSB3PIPECTL_PHYSOFTRST);
+	WRITE4(esc, GUSB2PHYCFG(0), GUSB2PHYCFG_PHYSOFTRST);
+
+	DELAY(100000);
+
+	reg = READ4(esc, GUSB3PIPECTL(0));
+	reg &= ~(GUSB3PIPECTL_PHYSOFTRST);
+	WRITE4(esc, GUSB3PIPECTL(0), reg);
+
+	reg = READ4(esc, GUSB2PHYCFG(0));
+	reg &= ~(GUSB2PHYCFG_PHYSOFTRST);
+	WRITE4(esc, GUSB2PHYCFG(0), reg);
+
+	reg = READ4(esc, GCTL);
+	reg &= ~GCTL_CORESOFTRESET;
+	WRITE4(esc, GCTL, reg);
+
+	hwparams1 = READ4(esc, GHWPARAMS1);
+
+	reg = READ4(esc, GCTL);
+	reg &= ~(GCTL_SCALEDOWN_MASK << GCTL_SCALEDOWN_SHIFT);
+	reg &= ~(GCTL_DISSCRAMBLE);
+
+	if (GHWPARAMS1_EN_PWROPT(hwparams1) == \
+	    GHWPARAMS1_EN_PWROPT_CLK)
+		reg &= ~(GCTL_DSBLCLKGTNG);
+
+	if ((rev & REVISION_MASK) < 0x190a)
+		reg |= (GCTL_U2RSTECN);
+	WRITE4(esc, GCTL, reg);
+
+	/* Set host mode */
+	reg = READ4(esc, GCTL);
+	reg &= ~(GCTL_PRTCAPDIR(GCTL_PRTCAP_OTG));
+	reg |= GCTL_PRTCAPDIR(GCTL_PRTCAP_HOST);
+	WRITE4(esc, GCTL, reg);
+
+	return (0);
+}
+
+static int
+exynos_xhci_attach(device_t dev)
+{
+	struct exynos_xhci_softc *esc;
+	struct xhci_softc *sc;
+	bus_space_handle_t bsh;
+	int err;
+
+	esc = device_get_softc(dev);
+	esc->dev = dev;
+
+	sc = &esc->base;
+
+	if (xhci_init(sc, dev)) {
+		device_printf(dev, "Could not initialize softc\n");
+		return (ENXIO);
+	}
+
+	if (bus_alloc_resources(dev, exynos_xhci_spec, esc->res)) {
+		device_printf(dev, "could not allocate resources\n");
+		return (ENXIO);
+	}
+
+	usb_callout_init_mtx(&sc->sc_callout, &sc->sc_bus.bus_mtx, 0);
+
+	/* XHCI 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]);
+
+	/* DWC3 ctrl registers */
+	esc->bst = rman_get_bustag(esc->res[1]);
+	esc->bsh = rman_get_bushandle(esc->res[1]);
+
+	/*
+	 * Set handle to USB related registers subregion used by
+	 * generic XHCI driver.
+	 */
+	err = bus_space_subregion(sc->sc_io_tag, bsh, 0x0,
+	    sc->sc_io_size, &sc->sc_io_hdl);
+	if (err != 0)
+		return (ENXIO);
+
+	/* Setup interrupt handler */
+	err = bus_setup_intr(dev, esc->res[2], INTR_TYPE_BIO | INTR_MPSAFE,
+	    NULL, (driver_intr_t *)xhci_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[2],
+		    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, "Samsung", sizeof(sc->sc_vendor));
+
+	dwc3_init(esc);
+
+	err = xhci_halt_controller(sc);
+	if (err == 0) {
+		device_printf(dev, "Starting controller\n");
+		err = xhci_start_controller(sc);
+	}
+
+	if (err == 0) {
+		device_printf(dev, "Controller started\n");
+		err = device_probe_and_attach(sc->sc_bus.bdev);
+	}
+
+	if (err == 0) {
+		device_printf(dev, "Attached success\n");
+	} else {
+		device_printf(dev, "USB 3.0 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[2],
+		    sc->sc_intr_hdl);
+		if (err)
+			device_printf(dev, "Could not tear down irq,"
+			    " %d\n", err);
+		return (1);
+	}
+	return (0);
+}
+
+static int
+exynos_xhci_detach(device_t dev)
+{
+	struct exynos_xhci_softc *esc;
+	struct xhci_softc *sc;
+	int err;
+
+	esc = device_get_softc(dev);
+	sc = &esc->base;
+
+	if (esc->res[2] && sc->sc_intr_hdl) {
+		err = bus_teardown_intr(dev, esc->res[2],
+		    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, exynos_xhci_spec, esc->res);
+
+	return (0);
+}
diff --git a/sys/arm/samsung/exynos/files.exynos5 b/sys/arm/samsung/exynos/files.exynos5
index 90e1c9bca288..8dc660214a17 100644
--- a/sys/arm/samsung/exynos/files.exynos5
+++ b/sys/arm/samsung/exynos/files.exynos5
@@ -21,11 +21,16 @@ arm/samsung/exynos/exynos5_combiner.c		standard
 arm/samsung/exynos/exynos5_pad.c		optional	gpio
 arm/samsung/exynos/exynos_uart.c		optional	uart
 arm/samsung/exynos/exynos5_ehci.c		optional	ehci
+arm/samsung/exynos/exynos5_xhci.c		optional	xhci
 arm/samsung/exynos/exynos5_fimd.c		optional	vt
 arm/samsung/exynos/exynos5_i2c.c		optional	iicbus
+arm/samsung/exynos/exynos5_usb_phy.c		standard
+arm/samsung/exynos/exynos5_pmu.c		standard
+arm/samsung/exynos/exynos5_spi.c		optional	exynos_spi
 
 # chromebook drivers
-arm/samsung/exynos/chrome_ec.c			optional	chrome_ec
+arm/samsung/exynos/chrome_ec.c			optional	chrome_ec_i2c
+arm/samsung/exynos/chrome_ec_spi.c		optional	chrome_ec_spi
 arm/samsung/exynos/chrome_kb.c			optional	chrome_kb
 
 #dev/sdhci/sdhci_fdt.c				optional	sdhci
diff --git a/sys/arm/tegra/files.tegra2 b/sys/arm/tegra/files.tegra2
deleted file mode 100644
index ce2c5a10c73c..000000000000
--- a/sys/arm/tegra/files.tegra2
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-arm/arm/bus_space_asm_generic.S		standard
-arm/arm/bus_space_generic.c		standard
-arm/arm/bus_space-v6.c			standard
-arm/arm/cpufunc_asm_armv5.S		standard
-arm/arm/cpufunc_asm_arm11.S		standard
-arm/arm/cpufunc_asm_armv7.S		standard
-
-arm/arm/gic.c				standard
-arm/arm/mpcore_timer.c			standard
-
-arm/tegra/tegra2_common.c		standard
-arm/tegra/tegra2_machdep.c		standard
-
-kern/kern_clocksource.c			standard
-
-dev/uart/uart_dev_ns8250.c		optional	uart
diff --git a/sys/arm/tegra/std.tegra2 b/sys/arm/tegra/std.tegra2
deleted file mode 100644
index e8d5524c75eb..000000000000
--- a/sys/arm/tegra/std.tegra2
+++ /dev/null
@@ -1,14 +0,0 @@
-# nVidia Tegra 2 common options
-#$FreeBSD$
-
-cpu		CPU_CORTEXA
-machine 	arm armv6
-
-options		PHYSADDR=0x00000000
-
-makeoptions	KERNPHYSADDR=0x00200000
-options		KERNPHYSADDR=0x00200000
-makeoptions	KERNVIRTADDR=0xc0200000
-options		KERNVIRTADDR=0xc0200000
-
-files		"../tegra/files.tegra2"
diff --git a/sys/arm/tegra/tegra2_common.c b/sys/arm/tegra/tegra2_common.c
deleted file mode 100644
index 868572dde33f..000000000000
--- a/sys/arm/tegra/tegra2_common.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- *
- * Developed by Damjan Marion <damjan.marion@gmail.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE 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>
-
-/* FIXME move to header file */
-#define TEGRA2_CLK_RST_PA_BASE		0x60006000
-
-void
-cpu_reset(void)
-{
-	bus_space_handle_t bsh;
-	printf("Resetting...\n");
-	bus_space_map(fdtbus_bs_tag,TEGRA2_CLK_RST_PA_BASE, 0x1000, 0, &bsh);
-	bus_space_write_4(fdtbus_bs_tag, bsh, 4, 4);
-
-	while(1);
-}
-
-struct fdt_fixup_entry fdt_fixup_table[] = {
-	{ NULL, NULL }
-};
-
-static int
-fdt_pic_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_pic_decode_ic,
-	NULL
-};
-
-
-
diff --git a/sys/arm/tegra/tegra2_machdep.c b/sys/arm/tegra/tegra2_machdep.c
deleted file mode 100644
index e9c5ae138ce9..000000000000
--- a/sys/arm/tegra/tegra2_machdep.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*-
- * Copyright (c) 2011 Damjan Marion.
- * Copyright (c) 1994-1998 Mark Brinicombe.
- * Copyright (c) 1994 Brini.
- * All rights reserved.
- *
- * This code is derived from software written for Brini by Mark Brinicombe
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 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/mv/mv_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/bus.h>
-#include <machine/devmap.h>
-#include <machine/machdep.h>
-#include <machine/platform.h> 
-
-#include <dev/fdt/fdt_common.h>
-
-#define TEGRA2_CLK_RST_PA_BASE		0x60006000
-
-#define TEGRA2_CLK_RST_OSC_FREQ_DET_REG		0x58
-#define TEGRA2_CLK_RST_OSC_FREQ_DET_STAT_REG	0x5C
-#define OSC_FREQ_DET_TRIG			(1U<<31)
-#define OSC_FREQ_DET_BUSY               	(1U<<31)
-
-#if 0
-static int
-tegra2_osc_freq_detect(void)
-{
-	bus_space_handle_t	bsh;
-	uint32_t		c;
-	uint32_t		r=0;
-	int			i=0;
-
-	struct {
-		uint32_t val;
-		uint32_t freq;
-	} freq_det_cnts[] = {
-		{ 732,  12000000 },
-		{ 794,  13000000 },
-		{1172,  19200000 },
-		{1587,  26000000 },
-		{  -1,         0 },
-	};
-
-	printf("Measuring...\n");
-	bus_space_map(fdtbus_bs_tag,TEGRA2_CLK_RST_PA_BASE, 0x1000, 0, &bsh);
-
-	bus_space_write_4(fdtbus_bs_tag, bsh, TEGRA2_CLK_RST_OSC_FREQ_DET_REG,
-			OSC_FREQ_DET_TRIG | 1 );
-	do {} while (bus_space_read_4(fdtbus_bs_tag, bsh,
-			TEGRA2_CLK_RST_OSC_FREQ_DET_STAT_REG) & OSC_FREQ_DET_BUSY);
-
-	c = bus_space_read_4(fdtbus_bs_tag, bsh, TEGRA2_CLK_RST_OSC_FREQ_DET_STAT_REG);
-
-	while (freq_det_cnts[i].val > 0) {
-		if (((freq_det_cnts[i].val - 3) < c) && (c < (freq_det_cnts[i].val + 3)))
-			r = freq_det_cnts[i].freq;
-		i++;
-	}
-	printf("c=%u r=%u\n",c,r );
-	bus_space_free(fdtbus_bs_tag, bsh, 0x1000);
-	return r;
-}
-#endif
-
-vm_offset_t
-platform_lastaddr(void)
-{
-
-	return (arm_devmap_lastaddr());
-}
-
-void
-platform_probe_and_attach(void)
-{
-}
-
-void
-platform_gpio_init(void)
-{
-}
-
-void
-platform_late_init(void)
-{
-}
-
-/*
- * Add a static mapping for the register range that includes the debug uart.
- * It's not clear this is needed, but the original code established this mapping
- * before conversion to the newer arm_devmap_add_entry() routine.
- */
-int
-platform_devmap_init(void)
-{
-
-	arm_devmap_add_entry(0x70000000, 0x00100000);
-	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/arm/ti/ti_smc.S b/sys/arm/ti/ti_smc.S
index ec1c637d7759..208e3a04c7dc 100644
--- a/sys/arm/ti/ti_smc.S
+++ b/sys/arm/ti/ti_smc.S
@@ -26,7 +26,8 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
-.arch armv7a
+	.arch armv7a
+	.arch_extension sec
 
 /* Issue a smc #0 call */
 /* r0 and r1 contains the eventual arguments, r2 contains the function ID */
diff --git a/sys/arm/xilinx/zy7_slcr.c b/sys/arm/xilinx/zy7_slcr.c
index e448d76edb61..5dc15d1b1d6f 100644
--- a/sys/arm/xilinx/zy7_slcr.c
+++ b/sys/arm/xilinx/zy7_slcr.c
@@ -71,12 +71,14 @@ extern void (*zynq7_cpu_reset);
 #define	ZSLCR_UNLOCK(sc)		mtx_unlock(&(sc)->sc_mtx)
 #define ZSLCR_LOCK_INIT(sc) \
 	mtx_init(&(sc)->sc_mtx, device_get_nameunit((sc)->dev),	\
-	    "zy7_slcr", MTX_SPIN)
+	    "zy7_slcr", MTX_DEF)
 #define ZSLCR_LOCK_DESTROY(_sc)	mtx_destroy(&_sc->sc_mtx);
 
 #define RD4(sc, off) 		(bus_read_4((sc)->mem_res, (off)))
 #define WR4(sc, off, val) 	(bus_write_4((sc)->mem_res, (off), (val)))
 
+#define ZYNQ_DEFAULT_PS_CLK_FREQUENCY	33333333	/* 33.3 Mhz */
+
 
 SYSCTL_NODE(_hw, OID_AUTO, zynq, CTLFLAG_RD, 0, "Xilinx Zynq-7000");
 
@@ -84,7 +86,7 @@ static char zynq_bootmode[64];
 SYSCTL_STRING(_hw_zynq, OID_AUTO, bootmode, CTLFLAG_RD, zynq_bootmode, 0,
 	      "Zynq boot mode");
 
-static char zynq_pssid[80];
+static char zynq_pssid[100];
 SYSCTL_STRING(_hw_zynq, OID_AUTO, pssid, CTLFLAG_RD, zynq_pssid, 0,
 	   "Zynq PSS IDCODE");
 
@@ -92,6 +94,22 @@ static uint32_t zynq_reboot_status;
 SYSCTL_INT(_hw_zynq, OID_AUTO, reboot_status, CTLFLAG_RD, &zynq_reboot_status,
 	   0, "Zynq REBOOT_STATUS register");
 
+static int ps_clk_frequency;
+SYSCTL_INT(_hw_zynq, OID_AUTO, ps_clk_frequency, CTLFLAG_RD, &ps_clk_frequency,
+	   0, "Zynq PS_CLK Frequency");
+
+static int io_pll_frequency;
+SYSCTL_INT(_hw_zynq, OID_AUTO, io_pll_frequency, CTLFLAG_RD, &io_pll_frequency,
+	   0, "Zynq IO PLL Frequency");
+
+static int arm_pll_frequency;
+SYSCTL_INT(_hw_zynq, OID_AUTO, arm_pll_frequency, CTLFLAG_RD,
+	   &arm_pll_frequency, 0, "Zynq ARM PLL Frequency");
+
+static int ddr_pll_frequency;
+SYSCTL_INT(_hw_zynq, OID_AUTO, ddr_pll_frequency, CTLFLAG_RD,
+	   &ddr_pll_frequency, 0, "Zynq DDR PLL Frequency");
+
 static void
 zy7_slcr_unlock(struct zy7_slcr_softc *sc)
 {
@@ -189,6 +207,54 @@ zy7_slcr_postload_pl(int en_level_shifters)
 	ZSLCR_UNLOCK(sc);
 }
 
+/* Override cgem_set_refclk() in gigabit ethernet driver
+ * (sys/dev/cadence/if_cgem.c).  This function is called to
+ * request a change in the gem's reference clock speed.
+ */
+int
+cgem_set_ref_clk(int unit, int frequency)
+{
+	struct zy7_slcr_softc *sc = zy7_slcr_softc_p;
+	int div0, div1;
+
+	if (!sc)
+		return (-1);
+
+	/* Find suitable divisor pairs.  Round result to nearest khz
+	 * to test for match.
+	 */
+	for (div1 = 1; div1 <= ZY7_SLCR_GEM_CLK_CTRL_DIVISOR1_MAX; div1++) {
+		div0 = (io_pll_frequency + div1 * frequency / 2) /
+			div1 / frequency;
+		if (div0 > 0 && div0 <= ZY7_SLCR_GEM_CLK_CTRL_DIVISOR_MAX &&
+		    ((io_pll_frequency / div0 / div1) + 500) / 1000 ==
+		    (frequency + 500) / 1000)
+			break;
+	}
+
+	if (div1 > ZY7_SLCR_GEM_CLK_CTRL_DIVISOR1_MAX)
+		return (-1);
+
+	ZSLCR_LOCK(sc);
+
+	/* Unlock SLCR registers. */
+	zy7_slcr_unlock(sc);
+
+	/* Modify GEM reference clock. */
+	WR4(sc, unit ? ZY7_SLCR_GEM1_CLK_CTRL : ZY7_SLCR_GEM0_CLK_CTRL,
+	    (div1 << ZY7_SLCR_GEM_CLK_CTRL_DIVISOR1_SHIFT) |
+	    (div0 << ZY7_SLCR_GEM_CLK_CTRL_DIVISOR_SHIFT) |
+	    ZY7_SLCR_GEM_CLK_CTRL_SRCSEL_IO_PLL |
+	    ZY7_SLCR_GEM_CLK_CTRL_CLKACT);
+
+	/* Lock SLCR registers. */
+	zy7_slcr_lock(sc);
+
+	ZSLCR_UNLOCK(sc);
+
+	return (0);
+}
+
 static int
 zy7_slcr_probe(device_t dev)
 {
@@ -208,8 +274,13 @@ zy7_slcr_attach(device_t dev)
 {
 	struct zy7_slcr_softc *sc = device_get_softc(dev);
 	int rid;
+	phandle_t node;
+	pcell_t cell;
 	uint32_t bootmode;
 	uint32_t pss_idcode;
+	uint32_t arm_pll_ctrl;
+	uint32_t ddr_pll_ctrl;
+	uint32_t io_pll_ctrl;
 	static char *bootdev_names[] = {
 		"JTAG", "Quad-SPI", "NOR", "(3?)",
 		"NAND", "SD Card", "(6?)", "(7?)"
@@ -260,6 +331,53 @@ zy7_slcr_attach(device_t dev)
 
 	zynq_reboot_status = RD4(sc, ZY7_SLCR_REBOOT_STAT);
 
+	/* Derive PLL frequencies from PS_CLK. */
+	node = ofw_bus_get_node(dev);
+	if (OF_getprop(node, "clock-frequency", &cell, sizeof(cell)) > 0)
+		ps_clk_frequency = fdt32_to_cpu(cell);
+	else
+		ps_clk_frequency = ZYNQ_DEFAULT_PS_CLK_FREQUENCY;
+
+	arm_pll_ctrl = RD4(sc, ZY7_SLCR_ARM_PLL_CTRL);
+	ddr_pll_ctrl = RD4(sc, ZY7_SLCR_DDR_PLL_CTRL);
+	io_pll_ctrl = RD4(sc, ZY7_SLCR_IO_PLL_CTRL);
+
+	/* Determine ARM PLL frequency. */
+	if (((arm_pll_ctrl & ZY7_SLCR_PLL_CTRL_BYPASS_QUAL) == 0 &&
+	     (arm_pll_ctrl & ZY7_SLCR_PLL_CTRL_BYPASS_FORCE) != 0) ||
+	    ((arm_pll_ctrl & ZY7_SLCR_PLL_CTRL_BYPASS_QUAL) != 0 &&
+	     (bootmode & ZY7_SLCR_BOOT_MODE_PLL_BYPASS) != 0))
+		/* PLL is bypassed. */
+		arm_pll_frequency = ps_clk_frequency;
+	else
+		arm_pll_frequency = ps_clk_frequency *
+			((arm_pll_ctrl & ZY7_SLCR_PLL_CTRL_FDIV_MASK) >>
+			 ZY7_SLCR_PLL_CTRL_FDIV_SHIFT);
+
+	/* Determine DDR PLL frequency. */
+	if (((ddr_pll_ctrl & ZY7_SLCR_PLL_CTRL_BYPASS_QUAL) == 0 &&
+	     (ddr_pll_ctrl & ZY7_SLCR_PLL_CTRL_BYPASS_FORCE) != 0) ||
+	    ((ddr_pll_ctrl & ZY7_SLCR_PLL_CTRL_BYPASS_QUAL) != 0 &&
+	     (bootmode & ZY7_SLCR_BOOT_MODE_PLL_BYPASS) != 0))
+		/* PLL is bypassed. */
+		ddr_pll_frequency = ps_clk_frequency;
+	else
+		ddr_pll_frequency = ps_clk_frequency *
+			((ddr_pll_ctrl & ZY7_SLCR_PLL_CTRL_FDIV_MASK) >>
+			 ZY7_SLCR_PLL_CTRL_FDIV_SHIFT);
+
+	/* Determine IO PLL frequency. */
+	if (((io_pll_ctrl & ZY7_SLCR_PLL_CTRL_BYPASS_QUAL) == 0 &&
+	     (io_pll_ctrl & ZY7_SLCR_PLL_CTRL_BYPASS_FORCE) != 0) ||
+	    ((io_pll_ctrl & ZY7_SLCR_PLL_CTRL_BYPASS_QUAL) != 0 &&
+	     (bootmode & ZY7_SLCR_BOOT_MODE_PLL_BYPASS) != 0))
+		/* PLL is bypassed. */
+		io_pll_frequency = ps_clk_frequency;
+	else
+		io_pll_frequency = ps_clk_frequency *
+			((io_pll_ctrl & ZY7_SLCR_PLL_CTRL_FDIV_MASK) >>
+			 ZY7_SLCR_PLL_CTRL_FDIV_SHIFT);
+
 	/* Lock SLCR registers. */
 	zy7_slcr_lock(sc);
 
diff --git a/sys/arm/xilinx/zy7_slcr.h b/sys/arm/xilinx/zy7_slcr.h
index af30b0984f71..70c466193127 100644
--- a/sys/arm/xilinx/zy7_slcr.h
+++ b/sys/arm/xilinx/zy7_slcr.h
@@ -126,6 +126,18 @@
 #define ZY7_SLCR_GEM1_RCLK_CTRL		0x013c
 #define ZY7_SLCR_GEM0_CLK_CTRL		0x0140
 #define ZY7_SLCR_GEM1_CLK_CTRL		0x0144
+#define   ZY7_SLCR_GEM_CLK_CTRL_DIVISOR1_MASK		(0x3f<<20)
+#define   ZY7_SLCR_GEM_CLK_CTRL_DIVISOR1_SHIFT		20
+#define   ZY7_SLCR_GEM_CLK_CTRL_DIVISOR1_MAX		0x3f
+#define   ZY7_SLCR_GEM_CLK_CTRL_DIVISOR_MASK		(0x3f<<8)
+#define   ZY7_SLCR_GEM_CLK_CTRL_DIVISOR_SHIFT		8
+#define   ZY7_SLCR_GEM_CLK_CTRL_DIVISOR_MAX		0x3f
+#define   ZY7_SLCR_GEM_CLK_CTRL_SRCSEL_MASK		(7<<4)
+#define   ZY7_SLCR_GEM_CLK_CTRL_SRCSEL_IO_PLL		(0<<4)
+#define   ZY7_SLCR_GEM_CLK_CTRL_SRCSEL_ARM_PLL		(2<<4)
+#define   ZY7_SLCR_GEM_CLK_CTRL_SRCSEL_DDR_PLL		(3<<4)
+#define   ZY7_SLCR_GEM_CLK_CTRL_SRCSEL_EMIO_CLK		(4<<4)
+#define   ZY7_SLCR_GEM_CLK_CTRL_CLKACT			1
 #define ZY7_SLCR_SMC_CLK_CTRL		0x0148
 #define ZY7_SLCR_LQSPI_CLK_CTRL		0x014c
 #define ZY7_SLCR_SDIO_CLK_CTRL		0x0150
@@ -274,6 +286,7 @@
 
 #ifdef _KERNEL
 extern void zy7_slcr_preload_pl(void);
-extern void zy7_slcr_postload_pl(int);
+extern void zy7_slcr_postload_pl(int en_level_shifters);
+extern int cgem_set_ref_clk(int unit, int frequency);
 #endif
 #endif /* _ZY7_SLCR_H_ */
diff --git a/sys/arm/xscale/ixp425/if_npe.c b/sys/arm/xscale/ixp425/if_npe.c
index aae31a009eba..d031de674230 100644
--- a/sys/arm/xscale/ixp425/if_npe.c
+++ b/sys/arm/xscale/ixp425/if_npe.c
@@ -255,9 +255,8 @@ static SYSCTL_NODE(_hw, OID_AUTO, npe, CTLFLAG_RD, 0,
     "IXP4XX NPE driver parameters");
 
 static int npe_debug = 0;
-SYSCTL_INT(_hw_npe, OID_AUTO, debug, CTLFLAG_RW, &npe_debug,
+SYSCTL_INT(_hw_npe, OID_AUTO, debug, CTLFLAG_RWTUN, &npe_debug,
 	   0, "IXP4XX NPE network interface debug msgs");
-TUNABLE_INT("hw.npe.debug", &npe_debug);
 #define	DPRINTF(sc, fmt, ...) do {					\
 	if (sc->sc_debug) device_printf(sc->sc_dev, fmt, __VA_ARGS__);	\
 } while (0)
@@ -265,18 +264,15 @@ TUNABLE_INT("hw.npe.debug", &npe_debug);
 	if (sc->sc_debug >= n) device_printf(sc->sc_dev, fmt, __VA_ARGS__);\
 } while (0)
 static int npe_tickinterval = 3;		/* npe_tick frequency (secs) */
-SYSCTL_INT(_hw_npe, OID_AUTO, tickinterval, CTLFLAG_RD, &npe_tickinterval,
+SYSCTL_INT(_hw_npe, OID_AUTO, tickinterval, CTLFLAG_RDTUN, &npe_tickinterval,
 	    0, "periodic work interval (secs)");
-TUNABLE_INT("hw.npe.tickinterval", &npe_tickinterval);
 
 static	int npe_rxbuf = 64;		/* # rx buffers to allocate */
-SYSCTL_INT(_hw_npe, OID_AUTO, rxbuf, CTLFLAG_RD, &npe_rxbuf,
+SYSCTL_INT(_hw_npe, OID_AUTO, rxbuf, CTLFLAG_RDTUN, &npe_rxbuf,
 	    0, "rx buffers allocated");
-TUNABLE_INT("hw.npe.rxbuf", &npe_rxbuf);
 static	int npe_txbuf = 128;		/* # tx buffers to allocate */
-SYSCTL_INT(_hw_npe, OID_AUTO, txbuf, CTLFLAG_RD, &npe_txbuf,
+SYSCTL_INT(_hw_npe, OID_AUTO, txbuf, CTLFLAG_RDTUN, &npe_txbuf,
 	    0, "tx buffers allocated");
-TUNABLE_INT("hw.npe.txbuf", &npe_txbuf);
 
 static int
 unit2npeid(int unit)
@@ -685,7 +681,8 @@ npe_activate(device_t dev)
 	/* MAC */
 	if (!override_addr(dev, "mac", &macbase))
 		macbase = npeconfig[sc->sc_npeid].macbase;
-	device_printf(sc->sc_dev, "MAC at 0x%x\n", macbase);
+	if (bootverbose)
+		device_printf(sc->sc_dev, "MAC at 0x%x\n", macbase);
 	if (bus_space_map(sc->sc_iot, macbase, IXP425_REG_SIZE, 0, &sc->sc_ioh)) {
 		device_printf(dev, "cannot map mac registers 0x%x:0x%x\n",
 		    macbase, IXP425_REG_SIZE);
@@ -697,7 +694,8 @@ npe_activate(device_t dev)
 		phy = npeconfig[sc->sc_npeid].phy;
 	if (!override_addr(dev, "mii", &miibase))
 		miibase = npeconfig[sc->sc_npeid].miibase;
-	device_printf(sc->sc_dev, "MII at 0x%x\n", miibase);
+	if (bootverbose)
+		device_printf(sc->sc_dev, "MII at 0x%x\n", miibase);
 	if (miibase != macbase) {
 		/*
 		 * PHY is mapped through a different MAC, setup an
diff --git a/sys/arm/xscale/ixp425/ixp425_npe.c b/sys/arm/xscale/ixp425/ixp425_npe.c
index 0ccc7d0cb7f9..6dbce4ccb954 100644
--- a/sys/arm/xscale/ixp425/ixp425_npe.c
+++ b/sys/arm/xscale/ixp425/ixp425_npe.c
@@ -181,9 +181,8 @@ typedef struct {
 } IxNpeDlNpeMgrStateInfoBlock;
 
 static int npe_debug = 0;
-SYSCTL_INT(_debug, OID_AUTO, ixp425npe, CTLFLAG_RW, &npe_debug,
+SYSCTL_INT(_debug, OID_AUTO, ixp425npe, CTLFLAG_RWTUN, &npe_debug,
 	   0, "IXP4XX NPE debug msgs");
-TUNABLE_INT("debug.ixp425npe", &npe_debug);
 #define	DPRINTF(dev, fmt, ...) do {					\
 	if (npe_debug) device_printf(dev, fmt, __VA_ARGS__);		\
 } while (0)
diff --git a/sys/arm/xscale/ixp425/ixp425_qmgr.c b/sys/arm/xscale/ixp425/ixp425_qmgr.c
index b6fe434564e8..cb6c8defc948 100644
--- a/sys/arm/xscale/ixp425/ixp425_qmgr.c
+++ b/sys/arm/xscale/ixp425/ixp425_qmgr.c
@@ -159,10 +159,9 @@ struct ixpqmgr_softc {
 	uint32_t		aqmFreeSramAddress;	/* SRAM free space */
 };
 
-static int qmgr_debug = 0;
-SYSCTL_INT(_debug, OID_AUTO, qmgr, CTLFLAG_RW, &qmgr_debug,
+static int qmgr_debug;
+SYSCTL_INT(_debug, OID_AUTO, qmgr, CTLFLAG_RWTUN, &qmgr_debug,
 	   0, "IXP4XX Q-Manager debug msgs");
-TUNABLE_INT("debug.qmgr", &qmgr_debug);
 #define	DPRINTF(dev, fmt, ...) do {					\
 	if (qmgr_debug) printf(fmt, __VA_ARGS__);			\
 } while (0)
diff --git a/sys/boot/Makefile.ia64 b/sys/boot/Makefile.ia64
deleted file mode 100644
index 256201d4f940..000000000000
--- a/sys/boot/Makefile.ia64
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-SUBDIR+=		efi
-SUBDIR+=		zfs
diff --git a/sys/boot/amd64/boot1.efi/Makefile b/sys/boot/amd64/boot1.efi/Makefile
index 641861ed00a6..3e3bc9fcc827 100644
--- a/sys/boot/amd64/boot1.efi/Makefile
+++ b/sys/boot/amd64/boot1.efi/Makefile
@@ -77,7 +77,7 @@ CLEANFILES= boot1.efifat
 
 beforedepend ${OBJS}: machine x86
 
-CLEANFILES+=   machine x86
+CLEANFILES+=   machine x86 boot1.efi
 
 machine:
 	ln -sf ${.CURDIR}/../../../amd64/include machine
diff --git a/sys/boot/amd64/efi/bootinfo.c b/sys/boot/amd64/efi/bootinfo.c
index bf11f5b73b25..db82b241df56 100644
--- a/sys/boot/amd64/efi/bootinfo.c
+++ b/sys/boot/amd64/efi/bootinfo.c
@@ -225,8 +225,15 @@ bi_load_efi_data(struct preloaded_file *kfp)
 	struct efi_map_header *efihdr;
 	struct efi_fb efifb;
 
-	if (efi_find_framebuffer(&efifb) == 0)
+	if (efi_find_framebuffer(&efifb) == 0) {
+		printf("EFI framebuffer information:\n");
+		printf("addr, size     0x%lx, 0x%lx\n", efifb.fb_addr, efifb.fb_size);
+		printf("dimensions     %d x %d\n", efifb.fb_width, efifb.fb_height);
+		printf("stride         %d\n", efifb.fb_stride);
+		printf("masks          0x%08x, 0x%08x, 0x%08x, 0x%08x\n", efifb.fb_mask_red, efifb.fb_mask_green, efifb.fb_mask_blue, efifb.fb_mask_reserved);
+
 		file_addmetadata(kfp, MODINFOMD_EFI_FB, sizeof(efifb), &efifb);
+	}
 
 	efisz = (sizeof(struct efi_map_header) + 0xf) & ~0xf;
 
diff --git a/sys/boot/amd64/efi/main.c b/sys/boot/amd64/efi/main.c
index d1ea9c3f00be..2262a1d03143 100644
--- a/sys/boot/amd64/efi/main.c
+++ b/sys/boot/amd64/efi/main.c
@@ -124,7 +124,7 @@ main(int argc, CHAR16 *argv[])
 	archsw.arch_copyout = x86_efi_copyout;
 	archsw.arch_readin = x86_efi_readin;
 
-	interact();			/* doesn't return */
+	interact(NULL);			/* doesn't return */
 
 	return (EFI_SUCCESS);		/* keep compiler happy */
 }
diff --git a/sys/boot/arm/at91/boot0/main.c b/sys/boot/arm/at91/boot0/main.c
index 4bc7fc6ea90a..36dfe821444d 100644
--- a/sys/boot/arm/at91/boot0/main.c
+++ b/sys/boot/arm/at91/boot0/main.c
@@ -30,6 +30,8 @@
 
 typedef void fn_t(void);
 
+int main(void);
+
 int
 main(void)
 {
diff --git a/sys/boot/arm/at91/boot0iic/main.c b/sys/boot/arm/at91/boot0iic/main.c
index 7d0e9d319e78..2a81b937ae69 100644
--- a/sys/boot/arm/at91/boot0iic/main.c
+++ b/sys/boot/arm/at91/boot0iic/main.c
@@ -28,6 +28,8 @@
 #include "lib.h"
 #include "at91rm9200_lowlevel.h"
 
+int main(void);
+
 int
 main(void)
 {
diff --git a/sys/boot/arm/at91/boot0spi/main.c b/sys/boot/arm/at91/boot0spi/main.c
index 4d03b26fe0d2..cac037b5b0af 100644
--- a/sys/boot/arm/at91/boot0spi/main.c
+++ b/sys/boot/arm/at91/boot0spi/main.c
@@ -31,7 +31,9 @@
 
 #define OFFSET 0
 
-void
+int main(void);
+
+int
 main(void)
 {
 	int len, i, j, off, sec;
@@ -59,4 +61,5 @@ main(void)
 	    continue;
 	printf("Done\n");
 	reset();
+	return (1);
 }
diff --git a/sys/boot/arm/at91/boot2/boot2.c b/sys/boot/arm/at91/boot2/boot2.c
index c3629a522c7b..1e17ab21c14f 100644
--- a/sys/boot/arm/at91/boot2/boot2.c
+++ b/sys/boot/arm/at91/boot2/boot2.c
@@ -77,7 +77,7 @@ extern uint32_t _end;
 #define OPT_CHECK(opt)	((opts) & OPT_SET(opt))
 
 static const char optstr[NOPT] = "agnrsv";
-static const unsigned char flags[NOPT] = {
+static const unsigned char bootflags[NOPT] = {
 	RBX_ASKNAME,
 	RBX_GDB,
 	RBX_NOINTR,
@@ -93,6 +93,7 @@ static char kname[1024];
 static uint32_t opts;
 static uint8_t dsk_meta;
 
+int main(void);
 static void load(void);
 static int parse(void);
 static int dskread(void *, unsigned, unsigned);
@@ -190,6 +191,7 @@ main(void)
 		else
 			load();
 	}
+	return (1);
 }
 
 static void
@@ -263,7 +265,7 @@ parse()
 				for (i = 0; c != optstr[i]; i++)
 					if (i == NOPT - 1)
 						return -1;
-				opts ^= OPT_SET(flags[i]);
+				opts ^= OPT_SET(bootflags[i]);
 			}
 		} else {
 			arg--;
diff --git a/sys/boot/arm/at91/bootiic/main.c b/sys/boot/arm/at91/bootiic/main.c
index b2b6e39041e5..86368358ce8a 100644
--- a/sys/boot/arm/at91/bootiic/main.c
+++ b/sys/boot/arm/at91/bootiic/main.c
@@ -28,6 +28,8 @@
 #include "emac.h"
 #include "lib.h"
 
+int main(void);
+
 /*
  * .KB_C_FN_DEFINITION_START
  * int main(void)
diff --git a/sys/boot/arm/at91/bootspi/main.c b/sys/boot/arm/at91/bootspi/main.c
index c15dabc636f5..cb9d1dbc4225 100644
--- a/sys/boot/arm/at91/bootspi/main.c
+++ b/sys/boot/arm/at91/bootspi/main.c
@@ -43,6 +43,8 @@
 #include "spi_flash.h"
 #include "ee.h"
 
+int main(void);
+
 int
 main(void)
 {
diff --git a/sys/boot/arm/at91/libat91/emac.c b/sys/boot/arm/at91/libat91/emac.c
index 2ec715fb78e6..509d535ed977 100644
--- a/sys/boot/arm/at91/libat91/emac.c
+++ b/sys/boot/arm/at91/libat91/emac.c
@@ -96,7 +96,8 @@ GetServerAddress(void)
 	memcpy(p_ARP->target_ip, serverIPAddr, 4);
 
 	// wait until transmit is available
-	while (!(*AT91C_EMAC_TSR & AT91C_EMAC_BNQ)) ;
+	while (!(*AT91C_EMAC_TSR & AT91C_EMAC_BNQ)) 
+		continue;
 
   	*AT91C_EMAC_TSR |= AT91C_EMAC_COMP;
 	*AT91C_EMAC_TAR = (unsigned)transmitBuffer;
@@ -157,7 +158,8 @@ Send_TFTP_Packet(char *tftpData, unsigned tftpLength)
 
 	udpHdr->udp_cksum = SWAP16(t_checksum);
 
-	while (!(*AT91C_EMAC_TSR & AT91C_EMAC_BNQ)) ;
+	while (!(*AT91C_EMAC_TSR & AT91C_EMAC_BNQ))
+		continue;
 
   	*AT91C_EMAC_TSR |= AT91C_EMAC_COMP;
 	*AT91C_EMAC_TAR = (unsigned)tftpSendPacket;
diff --git a/sys/boot/arm/at91/libat91/mci_device.h b/sys/boot/arm/at91/libat91/mci_device.h
index 903454c2c0ff..c2b75ad70be0 100644
--- a/sys/boot/arm/at91/libat91/mci_device.h
+++ b/sys/boot/arm/at91/libat91/mci_device.h
@@ -90,6 +90,8 @@ typedef struct _AT91S_MciDevice
 {
 	volatile unsigned char	state;
 	unsigned char	SDCard_bus_width;
+	unsigned char	IsSDv2;
+	unsigned char	IsSDHC;
 	unsigned int 	RCA;		// RCA
 	unsigned int	READ_BL_LEN;
 #ifdef REPORT_SIZE
@@ -202,7 +204,9 @@ typedef struct _AT91S_MciDevice
      MMC_MAXLAT)
 #define GO_INACTIVE_STATE_CMD \
      (15 | MMC_RSPTYP_NO)
-
+#define SD_SEND_IF_COND_CMD \
+     (8 | MMC_TRCMD_NO | MMC_SPCMD_NONE | MMC_RSPTYP_48 | \
+     MMC_MAXLAT)
 //*------------------------------------------------
 //* Class 2 commands: Block oriented Read commands
 //*------------------------------------------------
@@ -264,7 +268,7 @@ typedef struct _AT91S_MciDevice
 #define SDCARD_STATUS_CMD					(13 | MMC_SPCMD_NONE	| MMC_RSPTYP_48	| MMC_TRCMD_NO	| MMC_MAXLAT)
 #define SDCARD_SEND_NUM_WR_BLOCKS_CMD		(22 | MMC_SPCMD_NONE	| MMC_RSPTYP_48	| MMC_TRCMD_NO	| MMC_MAXLAT)
 #define SDCARD_SET_WR_BLK_ERASE_COUNT_CMD	(23 | MMC_SPCMD_NONE	| MMC_RSPTYP_48	| MMC_TRCMD_NO	| MMC_MAXLAT)
-#define SDCARD_APP_OP_COND_CMD			(41 | MMC_SPCMD_NONE	| MMC_RSPTYP_48	| MMC_TRCMD_NO )
+#define SDCARD_APP_OP_COND_CMD			(41 | MMC_SPCMD_NONE	| MMC_RSPTYP_48	| MMC_TRCMD_NO | MMC_MAXLAT)
 #define SDCARD_SET_CLR_CARD_DETECT_CMD	(42 | MMC_SPCMD_NONE	| MMC_RSPTYP_48	| MMC_TRCMD_NO	| MMC_MAXLAT)
 #define SDCARD_SEND_SCR_CMD				(51 | MMC_SPCMD_NONE	| MMC_RSPTYP_48	| MMC_TRCMD_NO	| MMC_MAXLAT)
 
@@ -306,7 +310,8 @@ 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		(1U << 31)
+#define AT91C_CCS					(1 << 30)
+#define AT91C_CARD_POWER_UP_DONE			(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/at91/libat91/sd-card.c b/sys/boot/arm/at91/libat91/sd-card.c
index acc8e335ad43..803d782d97ae 100644
--- a/sys/boot/arm/at91/libat91/sd-card.c
+++ b/sys/boot/arm/at91/libat91/sd-card.c
@@ -47,35 +47,38 @@
 #include "lib.h"
 #include "sd-card.h"
 
-#define AT91C_MCI_TIMEOUT	1000000   /* For AT91F_MCIDeviceWaitReady */
-#define BUFFER_SIZE_MCI_DEVICE	512
-#define MASTER_CLOCK		60000000
+#define AT91C_MCI_TIMEOUT       1000000   /* For AT91F_MCIDeviceWaitReady */
+#define SD_BLOCK_SIZE           512
 
 //* Global Variables
-AT91S_MciDevice			MCI_Device;
-char				Buffer[BUFFER_SIZE_MCI_DEVICE];
+static AT91S_MciDevice          MCI_Device;
 
 /******************************************************************************
 **Error return codes
 ******************************************************************************/
-#define MCI_UNSUPP_SIZE_ERROR		5
+#define MCI_UNSUPP_SIZE_ERROR   5
 #define MCI_UNSUPP_OFFSET_ERROR 6
 
 //*----------------------------------------------------------------------------
 //* \fn    MCIDeviceWaitReady
 //* \brief Wait for MCI Device ready
 //*----------------------------------------------------------------------------
-static void
+static unsigned int
 MCIDeviceWaitReady(unsigned int timeout)
 {
-	volatile int status;
-	
+	volatile unsigned int status;
+	int waitfor;
+
+	if (MCI_Device.state == AT91C_MCI_RX_SINGLE_BLOCK)
+		waitfor = AT91C_MCI_RXBUFF;
+	else
+		waitfor = AT91C_MCI_NOTBUSY;
 	do
 	{
 		status = AT91C_BASE_MCI->MCI_SR;
 		timeout--;
 	}
-	while( !(status & AT91C_MCI_NOTBUSY)  && (timeout>0) );	
+	while( !(status & waitfor) && (timeout>0) );	
 
 	status = AT91C_BASE_MCI->MCI_SR;
 
@@ -92,25 +95,39 @@ MCIDeviceWaitReady(unsigned int timeout)
  		AT91C_BASE_PDC_MCI->PDC_PTCR = AT91C_PDC_RXTDIS;
 		MCI_Device.state = AT91C_MCI_IDLE;
 	}	// End of if AT91C_MCI_RXBUFF
+
+	//printf("WaitReady returning status %x\n", status);
+
+	return status;
 }
 
 static inline unsigned int
-swap(unsigned int a)
+swap(unsigned int v)
 {
-    return (((a & 0xff) << 24) | ((a & 0xff00) << 8) | ((a & 0xff0000) >> 8)
-      | ((a & 0xff000000) >> 24));
+	unsigned int t1;
+
+	__asm __volatile("eor %1, %0, %0, ror #16\n"
+	    		"bic %1, %1, #0x00ff0000\n"
+			"mov %0, %0, ror #8\n"
+			"eor %0, %0, %1, lsr #8\n"
+			 : "+r" (v), "=r" (t1));
+	
+	return (v);
 }
 
-static inline void
+inline static unsigned int
 wait_ready()
 {
 	int status;
+	int timeout = AT91C_MCI_TIMEOUT;
 
 	// wait for CMDRDY Status flag to read the response
 	do
 	{
 		status = AT91C_BASE_MCI->MCI_SR;
-	} while( !(status & AT91C_MCI_CMDRDY) );
+	} while( !(status & AT91C_MCI_CMDRDY) && (--timeout > 0)  );
+
+	return status;
 }
 
 //*----------------------------------------------------------------------------
@@ -122,18 +139,24 @@ MCI_SendCommand(
 	unsigned int Cmd,
 	unsigned int Arg)
 {
-	unsigned int	error;
+	unsigned int error;
+	unsigned int errorMask = AT91C_MCI_SR_ERROR;
+	unsigned int opcode = Cmd & 0x3F;
+
+	//printf("SendCmd %d (%x) arg %x\n", opcode, Cmd, Arg);
+
+	// Don't check response CRC on ACMD41 (R3 response type).
+
+	if (opcode == 41)
+		errorMask &= ~AT91C_MCI_RCRCE;
 
 	AT91C_BASE_MCI->MCI_ARGR = Arg;
 	AT91C_BASE_MCI->MCI_CMDR = Cmd;
 
-//	printf("CMDR %x ARG %x\n", Cmd, Arg);
-	wait_ready();
-	// Test error  ==> if crc error and response R3 ==> don't check error
-	error = (AT91C_BASE_MCI->MCI_SR) & AT91C_MCI_SR_ERROR;
-	if (error != 0) {
-		if (error != AT91C_MCI_RCRCE)
-			return (1);
+	error = wait_ready();
+
+	if ((error & errorMask) != 0) {
+		return (1);
 	}
 	return 0;
 }
@@ -146,93 +169,97 @@ static unsigned int
 MCI_GetStatus()
 {
 	if (MCI_SendCommand(SEND_STATUS_CMD, MCI_Device.RCA << 16))
-		return AT91C_CMD_SEND_ERROR;
+		return 0;
 	return (AT91C_BASE_MCI->MCI_RSPR[0]);
+
 }
 
 //*----------------------------------------------------------------------------
 //* \fn    MCI_ReadBlock
-//* \brief Read an ENTIRE block or PARTIAL block
+//* \brief Start the read for a single 512-byte block
 //*----------------------------------------------------------------------------
 static int
-MCI_ReadBlock(int src, unsigned int *dataBuffer, int sizeToRead)
+MCI_StartReadBlock(unsigned blknum, void *dataBuffer)
 {
-//	unsigned log2sl = MCI_Device.READ_BL_LEN;
-//	unsigned sectorLength = 1 << log2sl;
-	unsigned sectorLength = 512;
-
-	///////////////////////////////////////////////////////////////////////
-	if (MCI_Device.state != AT91C_MCI_IDLE)
-		return 1;
-    
-	if ((MCI_GetStatus() & AT91C_SR_READY_FOR_DATA) == 0)
-		return 1;
-
-	///////////////////////////////////////////////////////////////////////
-      
         // Init Mode Register
-	AT91C_BASE_MCI->MCI_MR |= ((sectorLength << 16) | AT91C_MCI_PDCMODE);
+	AT91C_BASE_MCI->MCI_MR |= ((SD_BLOCK_SIZE << 16) | AT91C_MCI_PDCMODE);
 	 
-	sizeToRead = sizeToRead / 4;
-
+	// (PDC) Receiver Transfer Enable
 	AT91C_BASE_PDC_MCI->PDC_PTCR = (AT91C_PDC_TXTDIS | AT91C_PDC_RXTDIS);
 	AT91C_BASE_PDC_MCI->PDC_RPR  = (unsigned int)dataBuffer;
-	AT91C_BASE_PDC_MCI->PDC_RCR  = sizeToRead;
+	AT91C_BASE_PDC_MCI->PDC_RCR  = SD_BLOCK_SIZE / 4;;
+	AT91C_BASE_PDC_MCI->PDC_PTCR = AT91C_PDC_RXTEN;
+
+	// SDHC wants block offset, non-HC wants byte offset.
+	if (!MCI_Device.IsSDHC)
+		blknum *= SD_BLOCK_SIZE;
 
 	// Send the Read single block command
-	if (MCI_SendCommand(READ_SINGLE_BLOCK_CMD, src))
+	if (MCI_SendCommand(READ_SINGLE_BLOCK_CMD, blknum)) {
 		return AT91C_READ_ERROR;
+	}
 	MCI_Device.state = AT91C_MCI_RX_SINGLE_BLOCK;
 
-	// Enable AT91C_MCI_RXBUFF Interrupt
-	AT91C_BASE_MCI->MCI_IER = AT91C_MCI_RXBUFF;
-
-	// (PDC) Receiver Transfer Enable
-	AT91C_BASE_PDC_MCI->PDC_PTCR = AT91C_PDC_RXTEN;
-	
 	return 0;
 }
 
+//*----------------------------------------------------------------------------
+//* \fn    MCI_readblocks
+//* \brief Read one or more blocks
+//*----------------------------------------------------------------------------
 int
-MCI_read(char* dest, unsigned source, unsigned length)
+MCI_readblocks(char* dest, unsigned blknum, unsigned blkcount)
 {
-//	unsigned log2sl = MCI_Device.READ_BL_LEN;
-//	unsigned sectorLength = 1 << log2sl;
-	unsigned sectorLength = 512;
-	int sizeToRead;
+	unsigned int status;
 	unsigned int *walker;
 
-	//As long as there is data to read
-	while (length)
-	{
-		if (length > sectorLength)
-			sizeToRead = sectorLength;
-		else
-			sizeToRead = length;
-
-		MCIDeviceWaitReady(AT91C_MCI_TIMEOUT);
-		//Do the reading
-		if (MCI_ReadBlock(source,
-			(unsigned int*)dest, sizeToRead))
-			return -1;
-
-		//* Wait MCI Device Ready
-		MCIDeviceWaitReady(AT91C_MCI_TIMEOUT);
-
-		// Fix erratum in MCI part
-		for (walker = (unsigned int *)dest;
-		     walker < (unsigned int *)(dest + sizeToRead); walker++)
-		    *walker = swap(*walker);
-
-		//Update counters & pointers
-		length -= sizeToRead;
-		dest += sizeToRead;
-		source += sizeToRead;
+	if (MCI_Device.state != AT91C_MCI_IDLE) {
+		return 1;
 	}
 
+	if ((MCI_GetStatus() & AT91C_SR_READY_FOR_DATA) == 0) {
+		return 1;
+	}
+
+	// As long as there is data to read
+	while (blkcount)
+	{
+		//Do the reading
+		if (MCI_StartReadBlock(blknum, dest))
+			return -1;
+
+		// Wait MCI Device Ready
+		status = MCIDeviceWaitReady(AT91C_MCI_TIMEOUT);
+		if (status & AT91C_MCI_SR_ERROR)
+			return 1;
+
+		// Fix erratum in MCI part - endian-swap all data.
+		for (walker = (unsigned int *)dest;
+		     walker < (unsigned int *)(dest + SD_BLOCK_SIZE); walker++)
+		    *walker = swap(*walker);
+
+		// Update counters & pointers
+		++blknum;
+		--blkcount;
+		dest += SD_BLOCK_SIZE;
+	}
+
+
 	return 0;
 }
 
+//*----------------------------------------------------------------------------
+//* \fn    MCI_read
+//* \brief Legacy read function, takes byte offset and length but was always
+//*  used to read full blocks; interface preserved for existing boot code.
+//*----------------------------------------------------------------------------
+int
+MCI_read(char* dest, unsigned byteoffset, unsigned length)
+{
+	return MCI_readblocks(dest, 
+	    byteoffset/SD_BLOCK_SIZE, length/SD_BLOCK_SIZE);
+}
+
 //*----------------------------------------------------------------------------
 //* \fn    MCI_SDCard_SendAppCommand
 //* \brief Specific function to send a specific command to the SDCard
@@ -242,15 +269,11 @@ MCI_SDCard_SendAppCommand(
 	unsigned int Cmd_App,
 	unsigned int Arg)
 {
-	// Send the CMD55 for application specific command
-	AT91C_BASE_MCI->MCI_ARGR = (MCI_Device.RCA << 16 );
-	AT91C_BASE_MCI->MCI_CMDR = APP_CMD;
+	int status;
 
-	wait_ready();
-	// if an error occurs
-	if (AT91C_BASE_MCI->MCI_SR & AT91C_MCI_SR_ERROR)
-		return (1);
-	return (MCI_SendCommand(Cmd_App,Arg));
+	if ((status = MCI_SendCommand(APP_CMD, (MCI_Device.RCA << 16))) == 0)
+		status = MCI_SendCommand(Cmd_App,Arg);
+	return status;
 }
 
 //*----------------------------------------------------------------------------
@@ -260,12 +283,11 @@ MCI_SDCard_SendAppCommand(
 static int
 MCI_GetCSD(unsigned int rca, unsigned int *response)
 {
- 	
- 	if (MCI_SendCommand(SEND_CSD_CMD, (rca << 16)))
+	if (MCI_SendCommand(SEND_CSD_CMD, (rca << 16)))
 		return 1;
 	
 	response[0] = AT91C_BASE_MCI->MCI_RSPR[0];
-   	response[1] = AT91C_BASE_MCI->MCI_RSPR[1];
+	response[1] = AT91C_BASE_MCI->MCI_RSPR[1];
 	response[2] = AT91C_BASE_MCI->MCI_RSPR[2];
 	response[3] = AT91C_BASE_MCI->MCI_RSPR[3];
     
@@ -274,22 +296,64 @@ MCI_GetCSD(unsigned int rca, unsigned int *response)
 
 //*----------------------------------------------------------------------------
 //* \fn    MCI_SDCard_GetOCR
-//* \brief Asks to all cards to send their operations conditions
+//* \brief Wait for card to power up and determine whether it's SDHC or not.
 //*----------------------------------------------------------------------------
 static int
 MCI_SDCard_GetOCR()
 {
-	unsigned int	response=0x0;
+	unsigned int response;
+	unsigned int arg = AT91C_MMC_HOST_VOLTAGE_RANGE;
+	int          timeout = AT91C_MCI_TIMEOUT;
 
-	// The RCA to be used for CMD55 in Idle state shall be the card's default RCA=0x0000.
-	MCI_Device.RCA = 0x0;
- 	
- 	while( (response & AT91C_CARD_POWER_UP_BUSY) != AT91C_CARD_POWER_UP_BUSY ) {
-		if (MCI_SDCard_SendAppCommand(SDCARD_APP_OP_COND_CMD,
-			AT91C_MMC_HOST_VOLTAGE_RANGE))
-			return 1;
-		response = AT91C_BASE_MCI->MCI_RSPR[0];
+	// Force card to idle state.
+
+	MCI_SendCommand(GO_IDLE_STATE_CMD, AT91C_NO_ARGUMENT);
+
+	// Begin probe for SDHC by sending CMD8; only v2.0 cards respond to it.
+	//
+	// Arg is vvpp where vv is voltage range and pp is an arbitrary bit
+	// pattern that gets echoed back in the response. The only voltage
+	// ranges defined are:
+	//   0x01 = 2.7 - 3.6
+	//   0x02 = "reserved for low voltage" whatever that means.
+	//
+	// If the card fails to respond then it's not v2.0. If it responds by
+	// echoing back exactly the arg we sent, then it's a v2.0 card and can
+	// run at our voltage.  That means that when we send the ACMD41 (in
+	// MCI_SDCard_GetOCR) we can include the HCS bit to inquire about SDHC.
+
+	if (MCI_SendCommand(SD_SEND_IF_COND_CMD, 0x01AA) == 0) {
+		MCI_Device.IsSDv2 = (AT91C_BASE_MCI->MCI_RSPR[0] == 0x01AA);
 	}
+
+	// If we've determined the card supports v2.0 functionality, set the
+	// HCS/CCS bit to indicate that we support SDHC.  This will cause a
+	// v2.0 card to report whether it is SDHC in the ACMD41 response.
+
+	if (MCI_Device.IsSDv2) {
+		arg |= AT91C_CCS;
+	}
+
+	// The RCA to be used for CMD55 in Idle state shall be the card's 
+	// default RCA=0x0000.
+
+	MCI_Device.RCA = 0x0;
+
+	// Repeat ACMD41 until the card comes out of power-up-busy state.
+
+	do {
+		if (MCI_SDCard_SendAppCommand(SDCARD_APP_OP_COND_CMD, arg)) {
+			return 1;
+		}
+		response = AT91C_BASE_MCI->MCI_RSPR[0];
+	} while (!(response & AT91C_CARD_POWER_UP_DONE) && (--timeout > 0));
+
+	// A v2.0 card sets CCS (card capacity status) in the response if it's SDHC.
+
+	if (MCI_Device.IsSDv2) {
+		MCI_Device.IsSDHC = ((response & AT91C_CCS) == AT91C_CCS);
+	}
+
 	return (0);
 }
 
@@ -304,7 +368,7 @@ MCI_SDCard_GetCID(unsigned int *response)
 		return 1;
 	
 	response[0] = AT91C_BASE_MCI->MCI_RSPR[0];
-   	response[1] = AT91C_BASE_MCI->MCI_RSPR[1];
+	response[1] = AT91C_BASE_MCI->MCI_RSPR[1];
 	response[2] = AT91C_BASE_MCI->MCI_RSPR[2];
 	response[3] = AT91C_BASE_MCI->MCI_RSPR[3];
     
@@ -312,47 +376,62 @@ MCI_SDCard_GetCID(unsigned int *response)
 }
 
 //*----------------------------------------------------------------------------
-//* \fn    MCI_SDCard_SetBusWidth
-//* \brief  Set bus width for SDCard
+//* \fn    sdcard_4wire
+//* \brief  Set bus width to 1-bit or 4-bit according to the parm.
+//*
+//* Unlike most functions in this file, the return value from this one is
+//* bool-ish; returns 0 on failure, 1 on success.
 //*----------------------------------------------------------------------------
-static int
-MCI_SDCard_SetBusWidth()
+int
+sdcard_use4wire(int use4wire)
 {
 	volatile int	ret_value;
-	char			bus_width;
 
 	do {
 		ret_value=MCI_GetStatus();
 	}
 	while((ret_value > 0) && ((ret_value & AT91C_SR_READY_FOR_DATA) == 0));
 
-	// Select Card
-	MCI_SendCommand(SEL_DESEL_CARD_CMD, (MCI_Device.RCA)<<16);
+	// If going to 4-wire mode, ask the card to turn off the DAT3 card detect
+	// pullup resistor, if going to 1-wire ask it to turn it back on.
 
-	// Set bus width for Sdcard
-	if (MCI_Device.SDCard_bus_width == AT91C_MCI_SCDBUS)
-		bus_width = AT91C_BUS_WIDTH_4BITS;
-	else
-		bus_width = AT91C_BUS_WIDTH_1BIT;
+	ret_value = MCI_SDCard_SendAppCommand(SDCARD_SET_CLR_CARD_DETECT_CMD, 
+					      use4wire ? 0 : 1);
+	if (ret_value != AT91C_CMD_SEND_OK)
+		return 0;
 
-	if (MCI_SDCard_SendAppCommand(
-	      SDCARD_SET_BUS_WIDTH_CMD,bus_width) != AT91C_CMD_SEND_OK)
-		return 1;
+	// Ask the card to go into the requested mode.
 
-	return 0;
+	ret_value = MCI_SDCard_SendAppCommand(SDCARD_SET_BUS_WIDTH_CMD,
+					      use4wire ? AT91C_BUS_WIDTH_4BITS : 
+					                 AT91C_BUS_WIDTH_1BIT);
+	if (ret_value != AT91C_CMD_SEND_OK)
+		return 0;
+
+	// Set the MCI device to match the mode we set in the card.
+
+	if (use4wire) {
+		MCI_Device.SDCard_bus_width = AT91C_BUS_WIDTH_4BITS;
+		AT91C_BASE_MCI->MCI_SDCR |= AT91C_MCI_SCDBUS;
+	} else {
+		MCI_Device.SDCard_bus_width = AT91C_BUS_WIDTH_1BIT;
+		AT91C_BASE_MCI->MCI_SDCR &= ~AT91C_MCI_SCDBUS;
+	}
+
+	return 1;
 }
 
 //*----------------------------------------------------------------------------
-//* \fn    main
-//* \brief main function
+//* \fn    sdcard_init
+//* \brief get the mci device ready to read from an SD or SDHC card.
+//*
+//* Unlike most functions in this file, the return value from this one is
+//* bool-ish; returns 0 on failure, 1 on success.
 //*----------------------------------------------------------------------------
 int
 sdcard_init(void)
 {
 	unsigned int	tab_response[4];
-#ifdef REPORT_SIZE
-	unsigned int	mult,blocknr;
-#endif
 	int i;
 
 	// Init MCI for MMC and SDCard interface
@@ -362,51 +441,77 @@ sdcard_init(void)
 
 	// Init Device Structure
 	MCI_Device.state		= AT91C_MCI_IDLE;
-	MCI_Device.SDCard_bus_width	= AT91C_MCI_SCDBUS;
+	MCI_Device.SDCard_bus_width	= 0;
+	MCI_Device.IsSDv2		= 0;
+	MCI_Device.IsSDHC		= 0;
 
-	//* Reset the MCI
-	AT91C_BASE_MCI->MCI_CR = AT91C_MCI_MCIEN | AT91C_MCI_PWSEN;
+	// Reset the MCI and set the bus speed.
+	// Using MCK/230 gives a legal (under 400khz) bus speed for the card id
+	// sequence for all reasonable master clock speeds.
+
+	AT91C_BASE_MCI->MCI_CR = AT91C_MCI_MCIDIS | 0x80;
 	AT91C_BASE_MCI->MCI_IDR = 0xFFFFFFFF;
 	AT91C_BASE_MCI->MCI_DTOR = AT91C_MCI_DTOR_1MEGA_CYCLES;
-	AT91C_BASE_MCI->MCI_MR = AT91C_MCI_PDCMODE;
-	AT91C_BASE_MCI->MCI_SDCR = AT91C_MCI_SDCARD_4BITS_SLOTA;
-	MCI_SendCommand(GO_IDLE_STATE_CMD, AT91C_NO_ARGUMENT);
+	AT91C_BASE_MCI->MCI_MR = AT91C_MCI_PDCMODE | 114; /* clkdiv 114 = MCK/230 */
+	AT91C_BASE_MCI->MCI_SDCR = AT91C_MCI_MMC_SLOTA;
+	AT91C_BASE_MCI->MCI_CR = AT91C_MCI_MCIEN|AT91C_MCI_PWSEN;
+
+	// Wait for the card to come out of power-up-busy state by repeatedly
+	// sending ACMD41.  This also probes for SDHC versus standard cards.
 
 	for (i = 0; i < 100; i++) {
-		if (!MCI_SDCard_GetOCR(&MCI_Device))
+		if (MCI_SDCard_GetOCR() == 0)
 			break;
-		printf(".");
+		if ((i & 0x01) == 0) {
+			printf(".");
+		}
 	}
 	if (i >= 100)
 		return 0;
+
 	if (MCI_SDCard_GetCID(tab_response))
 		return 0;
+
+	// Tell the card to set its address, and remember the result.
+
 	if (MCI_SendCommand(SET_RELATIVE_ADDR_CMD, 0))
 		return 0;
-
 	MCI_Device.RCA = (AT91C_BASE_MCI->MCI_RSPR[0] >> 16);
+
+	// After sending CMD3 (set addr) we can increase the clock to full speed.
+	// Using MCK/4 gives a legal (under 25mhz) bus speed for all reasonable
+	// master clock speeds.
+
+	AT91C_BASE_MCI->MCI_MR = AT91C_MCI_PDCMODE | 1; /* clkdiv 1 = MCK/4 */
+
 	if (MCI_GetCSD(MCI_Device.RCA,tab_response))
 		return 0;
 	MCI_Device.READ_BL_LEN = (tab_response[1] >> CSD_1_RD_B_LEN_S) &
 	    CSD_1_RD_B_LEN_M;
+
 #ifdef REPORT_SIZE
-	// compute MULT
-	mult = 1 << ( ((tab_response[2] >> CSD_2_C_SIZE_M_S) &
-	    CSD_2_C_SIZE_M_M) + 2 );
-	// compute MSB of C_SIZE
-	blocknr = ((tab_response[1] >> CSD_1_CSIZE_H_S) &
-	    CSD_1_CSIZE_H_M) << 2;
-	// compute MULT * (LSB of C-SIZE + MSB already computed + 1) = BLOCKNR
-	blocknr = mult * ((blocknr + ((tab_response[2] >> CSD_2_CSIZE_L_S) &
-	    CSD_2_CSIZE_L_M)) + 1);
-	MCI_Device.Memory_Capacity = (1 << MCI_Device.READ_BL_LEN) * blocknr;
+	{
+		unsigned int	mult,blocknr;
+		// compute MULT
+		mult = 1 << ( ((tab_response[2] >> CSD_2_C_SIZE_M_S) &
+		    CSD_2_C_SIZE_M_M) + 2 );
+		// compute MSB of C_SIZE
+		blocknr = ((tab_response[1] >> CSD_1_CSIZE_H_S) &
+		    CSD_1_CSIZE_H_M) << 2;
+		// compute MULT * (LSB of C-SIZE + MSB already computed + 1) = BLOCKNR
+		blocknr = mult * ((blocknr + ((tab_response[2] >> CSD_2_CSIZE_L_S) &
+		    CSD_2_CSIZE_L_M)) + 1);
+		MCI_Device.Memory_Capacity = (1 << MCI_Device.READ_BL_LEN) * blocknr;
+		printf("Found SD card %u bytes\n", MCI_Device.Memory_Capacity);
+	}
 #endif
-	if (MCI_SDCard_SetBusWidth())
+
+	// Select card and set block length for following transfers.
+
+	if (MCI_SendCommand(SEL_DESEL_CARD_CMD, (MCI_Device.RCA)<<16))
 		return 0;
-	if (MCI_SendCommand(SET_BLOCKLEN_CMD, 1 << MCI_Device.READ_BL_LEN))
+	if (MCI_SendCommand(SET_BLOCKLEN_CMD, SD_BLOCK_SIZE))
 		return 0;
-#ifdef REPORT_SIZE
-	printf("Found SD card %u bytes\n", MCI_Device.Memory_Capacity);
-#endif
+
 	return 1;
 }
diff --git a/sys/boot/arm/at91/libat91/sd-card.h b/sys/boot/arm/at91/libat91/sd-card.h
index 0a3ce696925b..378ad0178901 100644
--- a/sys/boot/arm/at91/libat91/sd-card.h
+++ b/sys/boot/arm/at91/libat91/sd-card.h
@@ -30,9 +30,35 @@
 #ifndef __SD_CARD_H
 #define __SD_CARD_H
 
-int MCI_write (unsigned dest, char* source, unsigned length);
-int MCI_read (char* dest, unsigned source, unsigned length);
+/* MCI_read() is the original read function, taking a byte offset and byte
+ * count.  It is preserved to support existing customized boot code that still
+ * refers to it; it will work fine even on SDHC cards as long as the kernel and
+ * the metadata for locating it all exist within the first 4GB of the card.
+ *
+ * MCI_readblocks() is the new read function, taking offset and length in terms
+ * of block counts (where the SD spec defines a block as 512 bytes), allowing
+ * the kernel and filesystem metadata to be located anywhere on an SDHC card.
+ *
+ * Returns 0 on success, non-zero on failure.
+ */
+
+int MCI_read (char* dest, unsigned bytenum, unsigned length);
+int MCI_readblocks (char* dest, unsigned blknum, unsigned blkcount);
+
+/* sdcard_init() - get things set up to read from an SD or SDHC card.
+ *
+ * Returns 0 on failure, non-zero on success.
+ */
+
 int sdcard_init(void);
 
+/* By default sdcard_init() sets things up for a 1-wire interface to the
+ * SD card.  Calling sdcard_4wire(true) after sdcard_init() allows customized
+ * boot code to change to 4-bit transfers when the hardware supports it.
+ *
+ * Returns 0 on failure, non-zero on success.
+ */
+int sdcard_use4wire(int use4wire);
+
 #endif
 
diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc
index 2a4d561d444b..a44dcc1f8183 100644
--- a/sys/boot/common/Makefile.inc
+++ b/sys/boot/common/Makefile.inc
@@ -7,8 +7,6 @@ SRCS+=	module.c panic.c
 .if ${MACHINE} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	load_elf32.c load_elf32_obj.c reloc_elf32.c
 SRCS+=	load_elf64.c load_elf64_obj.c reloc_elf64.c
-.elif ${MACHINE_CPUARCH} == "ia64"
-SRCS+=	load_elf64.c load_elf64_obj.c reloc_elf64.c
 .elif ${MACHINE} == "pc98"
 SRCS+=	load_elf32.c load_elf32_obj.c reloc_elf32.c
 .elif ${MACHINE_CPUARCH} == "arm"
@@ -74,4 +72,9 @@ MAN+=	../forth/version.4th.8
 CFLAGS+=	-DBOOT_PROMPT_123
 .endif
 
+.if defined(LOADER_INSTALL_SUPPORT)
+SRCS+=	install.c
+CFLAGS+=-I${.CURDIR}/../../../../lib/libstand
+.endif
+
 MAN+=	loader.8
diff --git a/sys/boot/common/bootstrap.h b/sys/boot/common/bootstrap.h
index c9bcc52755f4..eec1b3bd9b29 100644
--- a/sys/boot/common/bootstrap.h
+++ b/sys/boot/common/bootstrap.h
@@ -59,7 +59,7 @@ extern char	command_errbuf[];	/* XXX blah, length */
 #define CMD_ERROR	1
 
 /* interp.c */
-void	interact(void);
+void	interact(const char *rc);
 int	include(const char *filename);
 
 /* interp_backslash.c */
@@ -69,7 +69,7 @@ char	*backslash(char *str);
 int	parse(int *argc, char ***argv, char *str);
 
 /* interp_forth.c */
-void	bf_init(void);
+void	bf_init(const char *rc);
 int	bf_run(char *line);
 
 /* boot.c */
@@ -229,6 +229,7 @@ extern struct preloaded_file	*preloaded_files;
 
 int			mod_load(char *name, struct mod_depend *verinfo, int argc, char *argv[]);
 int			mod_loadkld(const char *name, int argc, char *argv[]);
+void			unload(void);
 
 struct preloaded_file *file_alloc(void);
 struct preloaded_file *file_findfile(char *name, char *type);
diff --git a/sys/boot/common/install.c b/sys/boot/common/install.c
new file mode 100644
index 000000000000..1c2c82cf6ab3
--- /dev/null
+++ b/sys/boot/common/install.c
@@ -0,0 +1,339 @@
+/*-
+ * Copyright (c) 2008-2014, Juniper Networks, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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/socket.h>
+#include <net/if.h>
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+
+#include <stand.h>
+#include <net.h>
+#include <string.h>
+
+#include "bootstrap.h"
+
+extern struct in_addr rootip;
+extern struct in_addr servip;
+
+extern int pkgfs_init(const char *, struct fs_ops *);
+extern void pkgfs_cleanup(void);
+
+COMMAND_SET(install, "install", "install software package", command_install);
+
+static char *inst_kernel;
+static char **inst_modules;
+static char *inst_rootfs;
+
+static int
+setpath(char **what, char *val)
+{
+	char *path;
+	size_t len;
+	int rel;
+
+	len = strlen(val) + 1;
+	rel = (val[0] != '/') ? 1 : 0;
+	path = malloc(len + rel);
+	if (path == NULL)
+		return (ENOMEM);
+	path[0] = '/';
+	strcpy(path + rel, val);
+
+	*what = path;
+	return (0);
+}
+
+static int
+setmultipath(char ***what, char *val)
+{
+	char *s, *v;
+	int count, error, idx;
+
+	count = 0;
+	v = val;
+	do {
+		count++;
+		s = strchr(v, ',');
+		v = (s == NULL) ? NULL : s + 1;
+	} while (v != NULL);
+
+	*what = calloc(count + 1, sizeof(char *));
+	if (*what == NULL)
+		return (ENOMEM);
+
+	for (idx = 0; idx < count; idx++) {
+		s = strchr(val, ',');
+		if (s != NULL)
+			*s++ = '\0';
+		error = setpath(*what + idx, val);
+		if (error)
+			return (error);
+		val = s;
+	}
+
+	return (0);
+}
+
+static int
+read_metatags(int fd)
+{
+	char buf[1024];
+	char *p, *tag, *val;
+	ssize_t fsize;
+	int error;
+
+	fsize = read(fd, buf, sizeof(buf));
+	if (fsize == -1)
+		return (errno);
+
+	/*
+	 * Assume that if we read a whole buffer worth of data, we
+	 * haven't read the entire file. In other words, the buffer
+	 * size must always be larger than the file size. That way
+	 * we can append a '\0' and use standard string operations.
+	 * Return an error if this is not possible.
+	 */
+	if (fsize == sizeof(buf))
+		return (ENOMEM);
+
+	buf[fsize] = '\0';
+	error = 0;
+	tag = buf;
+	while (!error && *tag != '\0') {
+		val = strchr(tag, '=');
+		if (val == NULL) {
+			error = EINVAL;
+			break;
+		}
+		*val++ = '\0';
+		p = strchr(val, '\n');
+		if (p == NULL) {
+			error = EINVAL;
+			break;
+		}
+		*p++ = '\0';
+
+		if (strcmp(tag, "KERNEL") == 0)
+			error = setpath(&inst_kernel, val);
+		else if (strcmp(tag, "MODULES") == 0)
+			error = setmultipath(&inst_modules, val);
+		else if (strcmp(tag, "ROOTFS") == 0)
+			error = setpath(&inst_rootfs, val);
+
+		tag = p;
+	}
+
+	return (error);
+}
+
+static void
+cleanup(void)
+{
+	u_int i;
+
+	if (inst_kernel != NULL) {
+		free(inst_kernel);
+		inst_kernel = NULL;
+	}
+	if (inst_modules != NULL) {
+		i = 0;
+		while (inst_modules[i] != NULL)
+			free(inst_modules[i++]);
+		free(inst_modules);
+		inst_modules = NULL;
+	}
+	if (inst_rootfs != NULL) {
+		free(inst_rootfs);
+		inst_rootfs = NULL;
+	}
+	pkgfs_cleanup();
+}
+
+/*
+ * usage: install URL
+ * where: URL = (tftp|file)://[host]/<package>
+ */
+static int
+install(char *pkgname)
+{
+	static char buf[256];
+	struct fs_ops *proto;
+	struct preloaded_file *fp;
+	char *s, *currdev;
+	const char *devname;
+	int error, fd, i, local;
+
+	s = strstr(pkgname, "://");
+	if (s == NULL)
+		goto invalid_url;
+
+	i = s - pkgname;
+	if (i == 4 && !strncasecmp(pkgname, "tftp", i)) {
+		devname = "net0";
+		proto = &tftp_fsops;
+		local = 0;
+	} else if (i == 4 && !strncasecmp(pkgname, "file", i)) {
+		currdev = getenv("currdev");
+		if (currdev != NULL && strcmp(currdev, "pxe0:") == 0) {
+			devname = "pxe0";
+			proto = NULL;
+		} else {
+			devname = "disk1";
+			proto = &dosfs_fsops;
+		}
+		local = 1;
+	} else
+		goto invalid_url;
+
+	s += 3;
+	if (*s == '\0')
+		goto invalid_url;
+
+	if (*s != '/' ) {
+		if (local)
+			goto invalid_url;
+
+		pkgname = strchr(s, '/');
+		if (pkgname == NULL)
+			goto invalid_url;
+
+		*pkgname = '\0';
+		servip.s_addr = inet_addr(s);
+		if (servip.s_addr == htonl(INADDR_NONE))
+			goto invalid_url;
+
+		setenv("serverip", inet_ntoa(servip), 1);
+
+		*pkgname = '/';
+	} else
+		pkgname = s;
+
+	if (strlen(devname) + strlen(pkgname) + 2 > sizeof(buf)) {
+		command_errmsg = "package name too long";
+		return (CMD_ERROR);
+	}
+	sprintf(buf, "%s:%s", devname, pkgname);
+	setenv("install_package", buf, 1);
+
+	error = pkgfs_init(buf, proto);
+	if (error) {
+		command_errmsg = "cannot open package";
+		goto fail;
+	}
+
+	/*
+	 * Point of no return: unload anything that may have been
+	 * loaded and prune the environment from harmful variables.
+	 */
+	unload();
+	unsetenv("vfs.root.mountfrom");
+
+	/*
+	 * read the metatags file.
+	 */
+	fd = open("/metatags", O_RDONLY);
+	if (fd != -1) {
+		error = read_metatags(fd);
+		close(fd);
+		if (error) {
+			command_errmsg = "cannot load metatags";
+			goto fail;
+		}
+	}
+
+	s = (inst_kernel == NULL) ? "/kernel" : inst_kernel;
+	error = mod_loadkld(s, 0, NULL);
+	if (error) {
+		command_errmsg = "cannot load kernel from package";
+		goto fail;
+	}
+
+	i = 0;
+	while (inst_modules != NULL && inst_modules[i] != NULL) {
+		error = mod_loadkld(inst_modules[i], 0, NULL);
+		if (error) {
+			command_errmsg = "cannot load module(s) from package";
+			goto fail;
+		}
+		i++;
+	}
+
+	s = (inst_rootfs == NULL) ? "/install.iso" : inst_rootfs;
+	if (file_loadraw("mfs_root", s) == NULL) {
+		error = errno;
+		command_errmsg = "cannot load root file system";
+		goto fail;
+	}
+
+	cleanup();
+
+	fp = file_findfile(NULL, NULL);
+	if (fp != NULL)
+		file_formats[fp->f_loader]->l_exec(fp);
+	error = CMD_ERROR;
+	command_errmsg = "unable to start installation";
+
+ fail:
+	sprintf(buf, "%s (error %d)", command_errmsg, error);
+	cleanup();
+	unload();
+	exclusive_file_system = NULL;
+	command_errmsg = buf;	/* buf is static. */
+	return (CMD_ERROR);
+
+ invalid_url:
+	command_errmsg = "invalid URL";
+	return (CMD_ERROR);
+}
+
+static int
+command_install(int argc, char *argv[])
+{
+	int argidx;
+
+	unsetenv("install_format");
+
+	argidx = 1;
+	while (1) {
+		if (argc == argidx) {
+			command_errmsg =
+			    "usage: install [--format] <URL>";
+			return (CMD_ERROR);
+		}
+		if (!strcmp(argv[argidx], "--format")) {
+			setenv("install_format", "yes", 1);
+			argidx++;
+			continue;
+		}
+		break;
+	}
+
+	return (install(argv[argidx]));
+}
diff --git a/sys/boot/common/interp.c b/sys/boot/common/interp.c
index 61251ba226d8..6866643eeac3 100644
--- a/sys/boot/common/interp.c
+++ b/sys/boot/common/interp.c
@@ -90,7 +90,7 @@ perform(int argc, char *argv[])
  * Interactive mode
  */
 void
-interact(void)
+interact(const char *rc)
 {
     static char	input[256];			/* big enough? */
 #ifndef BOOT_FORTH
@@ -99,15 +99,18 @@ interact(void)
 #endif
 
 #ifdef BOOT_FORTH
-    bf_init();
+    bf_init((rc) ? "" : NULL);
 #endif
 
-    /*
-     * Read our default configuration
-     */
-    if (include("/boot/loader.rc") != CMD_OK)
-	include("/boot/boot.conf");
+    if (rc == NULL) {
+	/* Read our default configuration. */
+	if (include("/boot/loader.rc") != CMD_OK)
+	    include("/boot/boot.conf");
+    } else if (*rc != '\0')
+	include(rc);
+
     printf("\n");
+
     /*
      * Before interacting, we might want to autoboot.
      */
diff --git a/sys/boot/common/interp_forth.c b/sys/boot/common/interp_forth.c
index 1c37e2b0bebe..37b377b0ee53 100644
--- a/sys/boot/common/interp_forth.c
+++ b/sys/boot/common/interp_forth.c
@@ -241,7 +241,7 @@ bf_command(FICL_VM *vm)
  * Initialise the Forth interpreter, create all our commands as words.
  */
 void
-bf_init(void)
+bf_init(const char *rc)
 {
     struct bootblk_command	**cmdp;
     char create_buf[41];	/* 31 characters-long builtins */
@@ -271,13 +271,20 @@ bf_init(void)
     ficlSetEnv(bf_sys, "loader_version", 
 	       (bootprog_rev[0] - '0') * 10 + (bootprog_rev[2] - '0'));
 
+    pInterp = ficlLookup(bf_sys, "interpret");
+
     /* try to load and run init file if present */
-    if ((fd = open("/boot/boot.4th", O_RDONLY)) != -1) {
-	(void)ficlExecFD(bf_vm, fd);
-	close(fd);
+    if (rc == NULL)
+	rc = "/boot/boot.4th";
+    if (*rc != '\0') {
+	fd = open(rc, O_RDONLY);
+	if (fd != -1) {
+	    (void)ficlExecFD(bf_vm, fd);
+	    close(fd);
+	}
     }
 
-    /* Do this last, so /boot/boot.4th can change it */
+    /* Do this again, so that interpret can be redefined. */
     pInterp = ficlLookup(bf_sys, "interpret");
 }
 
diff --git a/sys/boot/common/module.c b/sys/boot/common/module.c
index cea01c06b720..e1170bbd6fe6 100644
--- a/sys/boot/common/module.c
+++ b/sys/boot/common/module.c
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/linker.h>
 #include <sys/module.h>
 #include <sys/queue.h>
+#include <sys/stdint.h>
 
 #include "bootstrap.h"
 
@@ -191,13 +192,11 @@ command_load_geli(int argc, char *argv[])
     return(file_loadraw(argv[2], typestr) ? CMD_OK : CMD_ERROR);
 }
 
-COMMAND_SET(unload, "unload", "unload all modules", command_unload);
-
-static int
-command_unload(int argc, char *argv[])
+void
+unload(void)
 {
-    struct preloaded_file	*fp;
-    
+    struct preloaded_file *fp;
+
     while (preloaded_files != NULL) {
 	fp = preloaded_files;
 	preloaded_files = preloaded_files->f_next;
@@ -205,6 +204,14 @@ command_unload(int argc, char *argv[])
     }
     loadaddr = 0;
     unsetenv("kernelname");
+}
+
+COMMAND_SET(unload, "unload", "unload all modules", command_unload);
+
+static int
+command_unload(int argc, char *argv[])
+{
+    unload();
     return(CMD_OK);
 }
 
@@ -236,8 +243,10 @@ command_lsmod(int argc, char *argv[])
 
     pager_open();
     for (fp = preloaded_files; fp; fp = fp->f_next) {
-	sprintf(lbuf, " %p: %s (%s, 0x%lx)\n", 
-		(void *) fp->f_addr, fp->f_name, fp->f_type, (long) fp->f_size);
+	sprintf(lbuf, " %p: ", (void *) fp->f_addr);
+	pager_output(lbuf);
+	pager_output(fp->f_name);
+	sprintf(lbuf, " (%s, 0x%lx)\n", fp->f_type, (long)fp->f_size);
 	pager_output(lbuf);
 	if (fp->f_args != NULL) {
 	    pager_output("    args: ");
@@ -387,6 +396,8 @@ file_loadraw(char *name, char *type)
     if (archsw.arch_loadaddr != NULL)
 	loadaddr = archsw.arch_loadaddr(LOAD_RAW, name, loadaddr);
 
+    printf("%s ", name);
+
     laddr = loadaddr;
     for (;;) {
 	/* read in 4k chunks; size is not really important */
@@ -401,7 +412,9 @@ file_loadraw(char *name, char *type)
 	}
 	laddr += got;
     }
-    
+
+    printf("size=%#jx\n", (uintmax_t)(laddr - loadaddr));
+
     /* Looks OK so far; create & populate control structure */
     fp = file_alloc();
     fp->f_name = strdup(name);
diff --git a/sys/boot/efi/include/amd64/pe.h b/sys/boot/efi/include/amd64/pe.h
index 11204647697d..f8033c55ac55 100644
--- a/sys/boot/efi/include/amd64/pe.h
+++ b/sys/boot/efi/include/amd64/pe.h
@@ -498,7 +498,6 @@ typedef struct _IMAGE_BASE_RELOCATION {
 #define IMAGE_REL_BASED_HIGHLOW               3
 #define IMAGE_REL_BASED_HIGHADJ               4
 #define IMAGE_REL_BASED_MIPS_JMPADDR          5
-#define IMAGE_REL_BASED_IA64_IMM64            9
 #define IMAGE_REL_BASED_DIR64                 10
 
 //
diff --git a/sys/boot/efi/include/efiapi.h b/sys/boot/efi/include/efiapi.h
index 187fe294b58e..b955338296b8 100644
--- a/sys/boot/efi/include/efiapi.h
+++ b/sys/boot/efi/include/efiapi.h
@@ -314,10 +314,6 @@ EFI_STATUS
 #define EFI_IMAGE_MACHINE_IA32      0x014c
 #endif
 
-#if !defined(EFI_IMAGE_MACHINE_IA64)
-#define EFI_IMAGE_MACHINE_IA64      0x0200
-#endif
-
 #if !defined(EFI_IMAGE_MACHINE_EBC)
 #define EFI_IMAGE_MACHINE_EBC       0x0EBC
 #endif
diff --git a/sys/boot/efi/include/i386/pe.h b/sys/boot/efi/include/i386/pe.h
index 0381a44066de..e2ae25c3ddf6 100644
--- a/sys/boot/efi/include/i386/pe.h
+++ b/sys/boot/efi/include/i386/pe.h
@@ -498,7 +498,6 @@ typedef struct _IMAGE_BASE_RELOCATION {
 #define IMAGE_REL_BASED_HIGHLOW               3
 #define IMAGE_REL_BASED_HIGHADJ               4
 #define IMAGE_REL_BASED_MIPS_JMPADDR          5
-#define IMAGE_REL_BASED_IA64_IMM64            9
 #define IMAGE_REL_BASED_DIR64                 10
 
 //
diff --git a/sys/boot/efi/include/ia64/efibind.h b/sys/boot/efi/include/ia64/efibind.h
deleted file mode 100644
index 21f0d25d70e7..000000000000
--- a/sys/boot/efi/include/ia64/efibind.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* $FreeBSD$ */
-/*++
-
-Copyright (c)  1999 - 2003 Intel Corporation. All rights reserved
-This software and associated documentation (if any) is furnished
-under a license and may only be used or copied in accordance
-with the terms of the license. Except as permitted by such
-license, no part of this software or documentation may be
-reproduced, stored in a retrieval system, or transmitted in any
-form or by any means without the express written consent of
-Intel Corporation.
-
-Module Name:
-
-    efefind.h
-
-Abstract:
-
-    EFI to compile bindings
-
-
-
-
-Revision History
-
---*/
-
-#pragma pack()
-
-
-#ifdef __FreeBSD__
-#include <sys/stdint.h>
-#else
-//
-// Basic int types of various widths
-//
-
-#if (__STDC_VERSION__ < 199901L )
-
-    // No ANSI C 1999/2000 stdint.h integer width declarations 
-
-    #if _MSC_EXTENSIONS
-
-        // Use Microsoft C compiler integer width declarations 
-
-        typedef unsigned __int64    uint64_t;
-        typedef __int64             int64_t;
-        typedef unsigned __int32    uint32_t;
-        typedef __int32             int32_t;
-        typedef unsigned __int16    uint16_t;
-        typedef __int16             int16_t;
-        typedef unsigned __int8     uint8_t;
-        typedef __int8              int8_t;
-    #else             
-        #ifdef UNIX_LP64
-
-            // Use LP64 programming model from C_FLAGS for integer width declarations 
-
-            typedef unsigned long       uint64_t;
-            typedef long                int64_t;
-            typedef unsigned int        uint32_t;
-            typedef int                 int32_t;
-            typedef unsigned short      uint16_t;
-            typedef short               int16_t;
-            typedef unsigned char       uint8_t;
-            typedef char                int8_t;
-        #else
-
-            // Assume P64 programming model from C_FLAGS for integer width declarations 
-
-            typedef unsigned long long  uint64_t;
-            typedef long long           int64_t;
-            typedef unsigned int        uint32_t;
-            typedef int                 int32_t;
-            typedef unsigned short      uint16_t;
-            typedef short               int16_t;
-            typedef unsigned char       uint8_t;
-            typedef char                int8_t;
-        #endif
-    #endif
-#endif
-#endif	/* __FreeBSD__ */
-
-//
-// Basic EFI types of various widths
-//
-
-
-typedef uint64_t   UINT64;
-typedef int64_t    INT64;
-typedef uint32_t   UINT32;
-typedef int32_t    INT32;
-typedef uint16_t   UINT16;
-typedef int16_t    INT16;
-typedef uint8_t    UINT8;
-typedef int8_t     INT8;
-
-
-#undef VOID
-#define VOID    void
-
-
-typedef int64_t    INTN;
-typedef uint64_t   UINTN;
-
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// BugBug: Code to debug
-//
-#define BIT63   0x8000000000000000
-
-#define PLATFORM_IOBASE_ADDRESS   (0xffffc000000 | BIT63)                                               
-#define PORT_TO_MEMD(_Port) (PLATFORM_IOBASE_ADDRESS | ( ( ( (_Port) & 0xfffc) << 10 ) | ( (_Port) & 0x0fff) ) )
-                                                                           
-//                                                                  
-// Macro's with casts make this much easier to use and read.
-//
-#define PORT_TO_MEM8D(_Port)  (*(UINT8  *)(PORT_TO_MEMD(_Port)))
-#define POST_CODE(_Data)  (PORT_TO_MEM8D(0x80) = (_Data))
-//
-// BugBug: End Debug Code!!!
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-#define EFIERR(a)           (0x8000000000000000 | a)
-#define EFI_ERROR_MASK      0x8000000000000000
-#define EFIERR_OEM(a)       (0xc000000000000000 | a)      
-
-#define BAD_POINTER         0xFBFBFBFBFBFBFBFB
-#define MAX_ADDRESS         0xFFFFFFFFFFFFFFFF
-
-#pragma intrinsic (__break)  
-#define BREAKPOINT()  __break(0)
-
-//
-// Pointers must be aligned to these address to function
-//  you will get an alignment fault if this value is less than 8
-//
-#define MIN_ALIGNMENT_SIZE  8
-
-#define ALIGN_VARIABLE(Value , Adjustment) \
-            (UINTN) Adjustment = 0; \
-            if((UINTN)Value % MIN_ALIGNMENT_SIZE) \
-                (UINTN)Adjustment = MIN_ALIGNMENT_SIZE - ((UINTN)Value % MIN_ALIGNMENT_SIZE); \
-            Value = (UINTN)Value + (UINTN)Adjustment
-
-//
-// Define macros to create data structure signatures.
-//
-
-#define EFI_SIGNATURE_16(A,B)             ((A) | (B<<8))
-#define EFI_SIGNATURE_32(A,B,C,D)         (EFI_SIGNATURE_16(A,B)     | (EFI_SIGNATURE_16(C,D)     << 16))
-#define EFI_SIGNATURE_64(A,B,C,D,E,F,G,H) (EFI_SIGNATURE_32(A,B,C,D) | ((UINT64)(EFI_SIGNATURE_32(E,F,G,H)) << 32))
-
-//
-// EFIAPI - prototype calling convention for EFI function pointers
-// BOOTSERVICE - prototype for implementation of a boot service interface
-// RUNTIMESERVICE - prototype for implementation of a runtime service interface
-// RUNTIMEFUNCTION - prototype for implementation of a runtime function that is not a service
-// RUNTIME_CODE - pragma macro for declaring runtime code    
-//
-
-#ifndef EFIAPI                  // Forces EFI calling conventions reguardless of compiler options 
-    #if _MSC_EXTENSIONS
-        #define EFIAPI __cdecl  // Force C calling convention for Microsoft C compiler 
-    #else
-        #define EFIAPI          // Substitute expresion to force C calling convention 
-    #endif
-#endif
-
-#define BOOTSERVICE
-#define RUNTIMESERVICE
-#define RUNTIMEFUNCTION
-
-#define RUNTIME_CODE(a)         alloc_text("rtcode", a)
-#define BEGIN_RUNTIME_DATA()    data_seg("rtdata")
-#define END_RUNTIME_DATA()      data_seg()
-
-#define VOLATILE    volatile
-
-//
-// BugBug: Need to find out if this is portable accross compliers.
-//
-void __mfa (void);                       
-#pragma intrinsic (__mfa)  
-#define MEMORY_FENCE()    __mfa()
-
-#ifdef EFI_NO_INTERFACE_DECL
-  #define EFI_FORWARD_DECLARATION(x)
-  #define EFI_INTERFACE_DECL(x)
-#else
-  #define EFI_FORWARD_DECLARATION(x) typedef struct _##x x
-  #define EFI_INTERFACE_DECL(x) typedef struct x
-#endif
-
-//
-// When build similiar to FW, then link everything together as
-// one big module.
-//
-
-#define EFI_DRIVER_ENTRY_POINT(InitFunction)
-
-#define LOAD_INTERNAL_DRIVER(_if, type, name, entry)    \
-            (_if)->LoadInternal(type, name, entry)
-//        entry(NULL, ST)
-
-#ifdef __FreeBSD__
-#define INTERFACE_DECL(x) struct x
-#else
-//
-// Some compilers don't support the forward reference construct:
-//  typedef struct XXXXX
-//
-// The following macro provide a workaround for such cases.
-//
-#ifdef NO_INTERFACE_DECL
-#define INTERFACE_DECL(x)
-#else
-#define INTERFACE_DECL(x) typedef struct x
-#endif
-#endif
diff --git a/sys/boot/efi/include/ia64/pe.h b/sys/boot/efi/include/ia64/pe.h
deleted file mode 100644
index 24480a5b3ced..000000000000
--- a/sys/boot/efi/include/ia64/pe.h
+++ /dev/null
@@ -1,637 +0,0 @@
-/* $FreeBSD$ */
-/* 
-    PE32+ header file
- */
-#ifndef _PE_H
-#define _PE_H
-
-#define IMAGE_DOS_SIGNATURE                 0x5A4D      // MZ
-#define IMAGE_OS2_SIGNATURE                 0x454E      // NE
-#define IMAGE_OS2_SIGNATURE_LE              0x454C      // LE
-#define IMAGE_NT_SIGNATURE                  0x00004550  // PE00  
-#define IMAGE_EDOS_SIGNATURE                0x44454550  // PEED
-
-/*****************************************************************************
- * The following stuff comes from winnt.h from the ia64sdk, plus the Plabel for
- * loading EM executables.
- *****************************************************************************/
-//
-// Intel IA64 specific
-//
-
-#define IMAGE_REL_BASED_IA64_IMM64            9
-#define IMAGE_REL_BASED_IA64_DIR64            10
-
-struct Plabel { 
-    UINT64  EntryPoint;
-    UINT64  NewGP;
-};
-
-typedef struct _IMAGE_DOS_HEADER {      // DOS .EXE header
-    UINT16   e_magic;                     // Magic number
-    UINT16   e_cblp;                      // Bytes on last page of file
-    UINT16   e_cp;                        // Pages in file
-    UINT16   e_crlc;                      // Relocations
-    UINT16   e_cparhdr;                   // Size of header in paragraphs
-    UINT16   e_minalloc;                  // Minimum extra paragraphs needed
-    UINT16   e_maxalloc;                  // Maximum extra paragraphs needed
-    UINT16   e_ss;                        // Initial (relative) SS value
-    UINT16   e_sp;                        // Initial SP value
-    UINT16   e_csum;                      // Checksum
-    UINT16   e_ip;                        // Initial IP value
-    UINT16   e_cs;                        // Initial (relative) CS value
-    UINT16   e_lfarlc;                    // File address of relocation table
-    UINT16   e_ovno;                      // Overlay number
-    UINT16   e_res[4];                    // Reserved words
-    UINT16   e_oemid;                     // OEM identifier (for e_oeminfo)
-    UINT16   e_oeminfo;                   // OEM information; e_oemid specific
-    UINT16   e_res2[10];                  // Reserved words
-    UINT32   e_lfanew;                    // File address of new exe header
-  } IMAGE_DOS_HEADER, *PIMAGE_DOS_HEADER;
-
-typedef struct _IMAGE_OS2_HEADER {      // OS/2 .EXE header
-    UINT16   ne_magic;                    // Magic number
-    UINT8    ne_ver;                      // Version number
-    UINT8    ne_rev;                      // Revision number
-    UINT16   ne_enttab;                   // Offset of Entry Table
-    UINT16   ne_cbenttab;                 // Number of bytes in Entry Table
-    UINT32   ne_crc;                      // Checksum of whole file
-    UINT16   ne_flags;                    // Flag UINT16
-    UINT16   ne_autodata;                 // Automatic data segment number
-    UINT16   ne_heap;                     // Initial heap allocation
-    UINT16   ne_stack;                    // Initial stack allocation
-    UINT32   ne_csip;                     // Initial CS:IP setting
-    UINT32   ne_sssp;                     // Initial SS:SP setting
-    UINT16   ne_cseg;                     // Count of file segments
-    UINT16   ne_cmod;                     // Entries in Module Reference Table
-    UINT16   ne_cbnrestab;                // Size of non-resident name table
-    UINT16   ne_segtab;                   // Offset of Segment Table
-    UINT16   ne_rsrctab;                  // Offset of Resource Table
-    UINT16   ne_restab;                   // Offset of resident name table
-    UINT16   ne_modtab;                   // Offset of Module Reference Table
-    UINT16   ne_imptab;                   // Offset of Imported Names Table
-    UINT32   ne_nrestab;                  // Offset of Non-resident Names Table
-    UINT16   ne_cmovent;                  // Count of movable entries
-    UINT16   ne_align;                    // Segment alignment shift count
-    UINT16   ne_cres;                     // Count of resource segments
-    UINT8    ne_exetyp;                   // Target Operating system
-    UINT8    ne_flagsothers;              // Other .EXE flags
-    UINT16   ne_pretthunks;               // offset to return thunks
-    UINT16   ne_psegrefbytes;             // offset to segment ref. bytes
-    UINT16   ne_swaparea;                 // Minimum code swap area size
-    UINT16   ne_expver;                   // Expected Windows version number
-  } IMAGE_OS2_HEADER, *PIMAGE_OS2_HEADER;
-
-//
-// File header format.
-//
-
-typedef struct _IMAGE_FILE_HEADER {
-    UINT16   Machine;
-    UINT16   NumberOfSections;
-    UINT32   TimeDateStamp;
-    UINT32   PointerToSymbolTable;
-    UINT32   NumberOfSymbols;
-    UINT16   SizeOfOptionalHeader;
-    UINT16   Characteristics;
-} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER;
-
-#define IMAGE_SIZEOF_FILE_HEADER             20
-
-#define IMAGE_FILE_RELOCS_STRIPPED           0x0001  // Relocation info stripped from file.
-#define IMAGE_FILE_EXECUTABLE_IMAGE          0x0002  // File is executable  (i.e. no unresolved externel references).
-#define IMAGE_FILE_LINE_NUMS_STRIPPED        0x0004  // Line nunbers stripped from file.
-#define IMAGE_FILE_LOCAL_SYMS_STRIPPED       0x0008  // Local symbols stripped from file.
-#define IMAGE_FILE_BYTES_REVERSED_LO         0x0080  // Bytes of machine word are reversed.
-#define IMAGE_FILE_32BIT_MACHINE             0x0100  // 32 bit word machine.
-#define IMAGE_FILE_DEBUG_STRIPPED            0x0200  // Debugging info stripped from file in .DBG file
-#define IMAGE_FILE_SYSTEM                    0x1000  // System File.
-#define IMAGE_FILE_DLL                       0x2000  // File is a DLL.
-#define IMAGE_FILE_BYTES_REVERSED_HI         0x8000  // Bytes of machine word are reversed.
-
-#define IMAGE_FILE_MACHINE_UNKNOWN           0
-#define IMAGE_FILE_MACHINE_I386              0x14c   // Intel 386.
-#define IMAGE_FILE_MACHINE_R3000             0x162   // MIPS little-endian, 0540 big-endian
-#define IMAGE_FILE_MACHINE_R4000             0x166   // MIPS little-endian
-#define IMAGE_FILE_MACHINE_ALPHA             0x184   // Alpha_AXP
-#define IMAGE_FILE_MACHINE_POWERPC           0x1F0   // IBM PowerPC Little-Endian
-#define IMAGE_FILE_MACHINE_TAHOE             0x7cc   // Intel EM machine
-//
-// Directory format.
-//
-
-typedef struct _IMAGE_DATA_DIRECTORY {
-    UINT32   VirtualAddress;
-    UINT32   Size;
-} IMAGE_DATA_DIRECTORY, *PIMAGE_DATA_DIRECTORY;
-
-#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES    16
-
-
-typedef struct _IMAGE_ROM_OPTIONAL_HEADER {
-    UINT16  Magic;
-    UINT8   MajorLinkerVersion;
-    UINT8   MinorLinkerVersion;
-    UINT32  SizeOfCode;
-    UINT32  SizeOfInitializedData;
-    UINT32  SizeOfUninitializedData;
-    UINT32  AddressOfEntryPoint;
-    UINT32  BaseOfCode;
-    UINT32  BaseOfData;
-    UINT32  BaseOfBss;
-    UINT32  GprMask;
-    UINT32  CprMask[4];
-    UINT32  GpValue;
-} IMAGE_ROM_OPTIONAL_HEADER, *PIMAGE_ROM_OPTIONAL_HEADER;
-
-typedef struct _IMAGE_OPTIONAL_HEADER {
-    UINT16      Magic;
-    UINT8       MajorLinkerVersion;
-    UINT8       MinorLinkerVersion;
-    UINT32      SizeOfCode;
-    UINT32      SizeOfInitializedData;
-    UINT32      SizeOfUninitializedData;
-    UINT32      AddressOfEntryPoint;
-    UINT32      BaseOfCode;
-    // UINT32       BaseOfData;
-    UINT64      ImageBase;
-    UINT32      SectionAlignment;
-    UINT32      FileAlignment;
-    UINT16      MajorOperatingSystemVersion;
-    UINT16      MinorOperatingSystemVersion;
-    UINT16      MajorImageVersion;
-    UINT16      MinorImageVersion;
-    UINT16      MajorSubsystemVersion;
-    UINT16      MinorSubsystemVersion;
-    UINT32      Win32VersionValue;
-    UINT32      SizeOfImage;
-    UINT32      SizeOfHeaders;
-    UINT32      CheckSum;
-    UINT16      Subsystem;
-    UINT16      DllCharacteristics;
-    UINT64      SizeOfStackReserve;
-    UINT64      SizeOfStackCommit;
-    UINT64      SizeOfHeapReserve;
-    UINT64      SizeOfHeapCommit;
-    UINT32      LoaderFlags;
-    UINT32      NumberOfRvaAndSizes;
-    IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
-} IMAGE_OPTIONAL_HEADER, *PIMAGE_OPTIONAL_HEADER;
-
-
-#define IMAGE_SIZEOF_ROM_OPTIONAL_HEADER      56
-#define IMAGE_SIZEOF_STD_OPTIONAL_HEADER      28
-#define IMAGE_SIZEOF_NT_OPTIONAL_HEADER      224
-#define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER    244
-
-#define IMAGE_NT_OPTIONAL_HDR_MAGIC        0x10b
-#define IMAGE_NT_OPTIONAL_HDR64_MAGIC      0x20b
-#define IMAGE_ROM_OPTIONAL_HDR_MAGIC       0x107
-
-typedef struct _IMAGE_NT_HEADERS {
-    UINT32 Signature;
-    IMAGE_FILE_HEADER FileHeader;
-    IMAGE_OPTIONAL_HEADER OptionalHeader;
-} IMAGE_NT_HEADERS, *PIMAGE_NT_HEADERS;
-
-typedef struct _IMAGE_ROM_HEADERS {
-    IMAGE_FILE_HEADER FileHeader;
-    IMAGE_ROM_OPTIONAL_HEADER OptionalHeader;
-} IMAGE_ROM_HEADERS, *PIMAGE_ROM_HEADERS;
-
-#define IMAGE_FIRST_SECTION( ntheader ) ((PIMAGE_SECTION_HEADER)        \
-    ((UINT32)ntheader +                                                  \
-     FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) +                 \
-     ((PIMAGE_NT_HEADERS)(ntheader))->FileHeader.SizeOfOptionalHeader   \
-    ))
-
-
-// Subsystem Values
-
-#define IMAGE_SUBSYSTEM_UNKNOWN              0   // Unknown subsystem.
-#define IMAGE_SUBSYSTEM_NATIVE               1   // Image doesn't require a subsystem.
-#define IMAGE_SUBSYSTEM_WINDOWS_GUI          2   // Image runs in the Windows GUI subsystem.
-#define IMAGE_SUBSYSTEM_WINDOWS_CUI          3   // Image runs in the Windows character subsystem.
-#define IMAGE_SUBSYSTEM_OS2_CUI              5   // image runs in the OS/2 character subsystem.
-#define IMAGE_SUBSYSTEM_POSIX_CUI            7   // image run  in the Posix character subsystem.
-
-
-// Directory Entries
-
-#define IMAGE_DIRECTORY_ENTRY_EXPORT         0   // Export Directory
-#define IMAGE_DIRECTORY_ENTRY_IMPORT         1   // Import Directory
-#define IMAGE_DIRECTORY_ENTRY_RESOURCE       2   // Resource Directory
-#define IMAGE_DIRECTORY_ENTRY_EXCEPTION      3   // Exception Directory
-#define IMAGE_DIRECTORY_ENTRY_SECURITY       4   // Security Directory
-#define IMAGE_DIRECTORY_ENTRY_BASERELOC      5   // Base Relocation Table
-#define IMAGE_DIRECTORY_ENTRY_DEBUG          6   // Debug Directory
-#define IMAGE_DIRECTORY_ENTRY_COPYRIGHT      7   // Description String
-#define IMAGE_DIRECTORY_ENTRY_GLOBALPTR      8   // Machine Value (MIPS GP)
-#define IMAGE_DIRECTORY_ENTRY_TLS            9   // TLS Directory
-#define IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG   10   // Load Configuration Directory
-
-//
-// Section header format.
-//
-
-#define IMAGE_SIZEOF_SHORT_NAME              8
-
-typedef struct _IMAGE_SECTION_HEADER {
-    UINT8   Name[IMAGE_SIZEOF_SHORT_NAME];
-    union {
-            UINT32   PhysicalAddress;
-            UINT32   VirtualSize;
-    } Misc;
-    UINT32   VirtualAddress;
-    UINT32   SizeOfRawData;
-    UINT32   PointerToRawData;
-    UINT32   PointerToRelocations;
-    UINT32   PointerToLinenumbers;
-    UINT16   NumberOfRelocations;
-    UINT16   NumberOfLinenumbers;
-    UINT32   Characteristics;
-} IMAGE_SECTION_HEADER, *PIMAGE_SECTION_HEADER;
-
-#define IMAGE_SIZEOF_SECTION_HEADER          40
-
-#define IMAGE_SCN_TYPE_NO_PAD                0x00000008  // Reserved.
-
-#define IMAGE_SCN_CNT_CODE                   0x00000020  // Section contains code.
-#define IMAGE_SCN_CNT_INITIALIZED_DATA       0x00000040  // Section contains initialized data.
-#define IMAGE_SCN_CNT_UNINITIALIZED_DATA     0x00000080  // Section contains uninitialized data.
-
-#define IMAGE_SCN_LNK_OTHER                  0x00000100  // Reserved.
-#define IMAGE_SCN_LNK_INFO                   0x00000200  // Section contains comments or some other type of information.
-#define IMAGE_SCN_LNK_REMOVE                 0x00000800  // Section contents will not become part of image.
-#define IMAGE_SCN_LNK_COMDAT                 0x00001000  // Section contents comdat.
-
-#define IMAGE_SCN_ALIGN_1BYTES               0x00100000  //
-#define IMAGE_SCN_ALIGN_2BYTES               0x00200000  //
-#define IMAGE_SCN_ALIGN_4BYTES               0x00300000  //
-#define IMAGE_SCN_ALIGN_8BYTES               0x00400000  //
-#define IMAGE_SCN_ALIGN_16BYTES              0x00500000  // Default alignment if no others are specified.
-#define IMAGE_SCN_ALIGN_32BYTES              0x00600000  //
-#define IMAGE_SCN_ALIGN_64BYTES              0x00700000  //
-
-#define IMAGE_SCN_MEM_DISCARDABLE            0x02000000  // Section can be discarded.
-#define IMAGE_SCN_MEM_NOT_CACHED             0x04000000  // Section is not cachable.
-#define IMAGE_SCN_MEM_NOT_PAGED              0x08000000  // Section is not pageable.
-#define IMAGE_SCN_MEM_SHARED                 0x10000000  // Section is shareable.
-#define IMAGE_SCN_MEM_EXECUTE                0x20000000  // Section is executable.
-#define IMAGE_SCN_MEM_READ                   0x40000000  // Section is readable.
-#define IMAGE_SCN_MEM_WRITE                  0x80000000  // Section is writeable.
-
-//
-// Symbol format.
-//
-
-
-#define IMAGE_SIZEOF_SYMBOL                  18
-
-//
-// Section values.
-//
-// Symbols have a section number of the section in which they are
-// defined. Otherwise, section numbers have the following meanings:
-//
-
-#define IMAGE_SYM_UNDEFINED           (UINT16)0           // Symbol is undefined or is common.
-#define IMAGE_SYM_ABSOLUTE            (UINT16)-1          // Symbol is an absolute value.
-#define IMAGE_SYM_DEBUG               (UINT16)-2          // Symbol is a special debug item.
-
-//
-// Type (fundamental) values.
-//
-
-#define IMAGE_SYM_TYPE_NULL                  0           // no type.
-#define IMAGE_SYM_TYPE_VOID                  1           //
-#define IMAGE_SYM_TYPE_CHAR                  2           // type character.
-#define IMAGE_SYM_TYPE_SHORT                 3           // type short integer.
-#define IMAGE_SYM_TYPE_INT                   4           //
-#define IMAGE_SYM_TYPE_LONG                  5           //
-#define IMAGE_SYM_TYPE_FLOAT                 6           //
-#define IMAGE_SYM_TYPE_DOUBLE                7           //
-#define IMAGE_SYM_TYPE_STRUCT                8           //
-#define IMAGE_SYM_TYPE_UNION                 9           //
-#define IMAGE_SYM_TYPE_ENUM                  10          // enumeration.
-#define IMAGE_SYM_TYPE_MOE                   11          // member of enumeration.
-#define IMAGE_SYM_TYPE_BYTE                  12          //
-#define IMAGE_SYM_TYPE_WORD                  13          //
-#define IMAGE_SYM_TYPE_UINT                  14          //
-#define IMAGE_SYM_TYPE_DWORD                 15          //
-
-//
-// Type (derived) values.
-//
-
-#define IMAGE_SYM_DTYPE_NULL                 0           // no derived type.
-#define IMAGE_SYM_DTYPE_POINTER              1           // pointer.
-#define IMAGE_SYM_DTYPE_FUNCTION             2           // function.
-#define IMAGE_SYM_DTYPE_ARRAY                3           // array.
-
-//
-// Storage classes.
-//
-
-#define IMAGE_SYM_CLASS_END_OF_FUNCTION      (BYTE )-1
-#define IMAGE_SYM_CLASS_NULL                 0
-#define IMAGE_SYM_CLASS_AUTOMATIC            1
-#define IMAGE_SYM_CLASS_EXTERNAL             2
-#define IMAGE_SYM_CLASS_STATIC               3
-#define IMAGE_SYM_CLASS_REGISTER             4
-#define IMAGE_SYM_CLASS_EXTERNAL_DEF         5
-#define IMAGE_SYM_CLASS_LABEL                6
-#define IMAGE_SYM_CLASS_UNDEFINED_LABEL      7
-#define IMAGE_SYM_CLASS_MEMBER_OF_STRUCT     8
-#define IMAGE_SYM_CLASS_ARGUMENT             9
-#define IMAGE_SYM_CLASS_STRUCT_TAG           10
-#define IMAGE_SYM_CLASS_MEMBER_OF_UNION      11
-#define IMAGE_SYM_CLASS_UNION_TAG            12
-#define IMAGE_SYM_CLASS_TYPE_DEFINITION      13
-#define IMAGE_SYM_CLASS_UNDEFINED_STATIC     14
-#define IMAGE_SYM_CLASS_ENUM_TAG             15
-#define IMAGE_SYM_CLASS_MEMBER_OF_ENUM       16
-#define IMAGE_SYM_CLASS_REGISTER_PARAM       17
-#define IMAGE_SYM_CLASS_BIT_FIELD            18
-#define IMAGE_SYM_CLASS_BLOCK                100
-#define IMAGE_SYM_CLASS_FUNCTION             101
-#define IMAGE_SYM_CLASS_END_OF_STRUCT        102
-#define IMAGE_SYM_CLASS_FILE                 103
-// new
-#define IMAGE_SYM_CLASS_SECTION              104
-#define IMAGE_SYM_CLASS_WEAK_EXTERNAL        105
-
-// type packing constants
-
-#define N_BTMASK                            017
-#define N_TMASK                             060
-#define N_TMASK1                            0300
-#define N_TMASK2                            0360
-#define N_BTSHFT                            4
-#define N_TSHIFT                            2
-
-// MACROS
-
-//
-// Communal selection types.
-//
-
-#define IMAGE_COMDAT_SELECT_NODUPLICATES   1
-#define IMAGE_COMDAT_SELECT_ANY            2
-#define IMAGE_COMDAT_SELECT_SAME_SIZE      3
-#define IMAGE_COMDAT_SELECT_EXACT_MATCH    4
-#define IMAGE_COMDAT_SELECT_ASSOCIATIVE    5
-
-#define IMAGE_WEAK_EXTERN_SEARCH_NOLIBRARY 1
-#define IMAGE_WEAK_EXTERN_SEARCH_LIBRARY   2
-#define IMAGE_WEAK_EXTERN_SEARCH_ALIAS     3
-
-
-//
-// Relocation format.
-//
-
-typedef struct _IMAGE_RELOCATION {
-    UINT32   VirtualAddress;
-    UINT32   SymbolTableIndex;
-    UINT16   Type;
-} IMAGE_RELOCATION;
-
-#define IMAGE_SIZEOF_RELOCATION              10
-
-//
-// I386 relocation types.
-//
-
-#define IMAGE_REL_I386_ABSOLUTE              0           // Reference is absolute, no relocation is necessary
-#define IMAGE_REL_I386_DIR16                 01          // Direct 16-bit reference to the symbols virtual address
-#define IMAGE_REL_I386_REL16                 02          // PC-relative 16-bit reference to the symbols virtual address
-#define IMAGE_REL_I386_DIR32                 06          // Direct 32-bit reference to the symbols virtual address
-#define IMAGE_REL_I386_DIR32NB               07          // Direct 32-bit reference to the symbols virtual address, base not included
-#define IMAGE_REL_I386_SEG12                 011         // Direct 16-bit reference to the segment-selector bits of a 32-bit virtual address
-#define IMAGE_REL_I386_SECTION               012
-#define IMAGE_REL_I386_SECREL                013
-#define IMAGE_REL_I386_REL32                 024         // PC-relative 32-bit reference to the symbols virtual address
-
-//
-// MIPS relocation types.
-//
-
-#define IMAGE_REL_MIPS_ABSOLUTE              0           // Reference is absolute, no relocation is necessary
-#define IMAGE_REL_MIPS_REFHALF               01
-#define IMAGE_REL_MIPS_REFWORD               02
-#define IMAGE_REL_MIPS_JMPADDR               03
-#define IMAGE_REL_MIPS_REFHI                 04
-#define IMAGE_REL_MIPS_REFLO                 05
-#define IMAGE_REL_MIPS_GPREL                 06
-#define IMAGE_REL_MIPS_LITERAL               07
-#define IMAGE_REL_MIPS_SECTION               012
-#define IMAGE_REL_MIPS_SECREL                013
-#define IMAGE_REL_MIPS_REFWORDNB             042
-#define IMAGE_REL_MIPS_PAIR                  045
-
-//
-// Alpha Relocation types.
-//
-
-#define IMAGE_REL_ALPHA_ABSOLUTE             0x0
-#define IMAGE_REL_ALPHA_REFLONG              0x1
-#define IMAGE_REL_ALPHA_REFQUAD              0x2
-#define IMAGE_REL_ALPHA_GPREL32              0x3
-#define IMAGE_REL_ALPHA_LITERAL              0x4
-#define IMAGE_REL_ALPHA_LITUSE               0x5
-#define IMAGE_REL_ALPHA_GPDISP               0x6
-#define IMAGE_REL_ALPHA_BRADDR               0x7
-#define IMAGE_REL_ALPHA_HINT                 0x8
-#define IMAGE_REL_ALPHA_INLINE_REFLONG       0x9
-#define IMAGE_REL_ALPHA_REFHI                0xA
-#define IMAGE_REL_ALPHA_REFLO                0xB
-#define IMAGE_REL_ALPHA_PAIR                 0xC
-#define IMAGE_REL_ALPHA_MATCH                0xD
-#define IMAGE_REL_ALPHA_SECTION              0xE
-#define IMAGE_REL_ALPHA_SECREL               0xF
-#define IMAGE_REL_ALPHA_REFLONGNB            0x10
-
-//
-// IBM PowerPC relocation types.
-//
-
-#define IMAGE_REL_PPC_ABSOLUTE 0x0000  // NOP
-#define IMAGE_REL_PPC_ADDR64   0x0001  // 64-bit address
-#define IMAGE_REL_PPC_ADDR32   0x0002  // 32-bit address
-#define IMAGE_REL_PPC_ADDR24   0x0003  // 26-bit address, shifted left 2 (branch absolute)
-#define IMAGE_REL_PPC_ADDR16   0x0004  // 16-bit address
-#define IMAGE_REL_PPC_ADDR14   0x0005  // 16-bit address, shifted left 2 (load doubleword)
-#define IMAGE_REL_PPC_REL24    0x0006  // 26-bit PC-relative offset, shifted left 2 (branch relative)
-#define IMAGE_REL_PPC_REL14    0x0007  // 16-bit PC-relative offset, shifted left 2 (br cond relative)
-#define IMAGE_REL_PPC_TOCREL16 0x0008  // 16-bit offset from TOC base
-#define IMAGE_REL_PPC_TOCREL14 0x0009  // 16-bit offset from TOC base, shifted left 2 (load doubleword)
-
-#define IMAGE_REL_PPC_ADDR32NB 0x000A  // 32-bit addr w/o image base
-#define IMAGE_REL_PPC_SECREL   0x000B  // va of containing section (as in an image sectionhdr)
-#define IMAGE_REL_PPC_SECTION  0x000C  // sectionheader number
-#define IMAGE_REL_PPC_IFGLUE   0x000D  // substitute TOC restore instruction iff symbol is glue code
-#define IMAGE_REL_PPC_IMGLUE   0x000E  // symbol is glue code; virtual address is TOC restore instruction
-
-#define IMAGE_REL_PPC_TYPEMASK 0x00FF  // mask to isolate above values in IMAGE_RELOCATION.Type
-
-// Flag bits in IMAGE_RELOCATION.TYPE
-
-#define IMAGE_REL_PPC_NEG      0x0100  // subtract reloc value rather than adding it
-#define IMAGE_REL_PPC_BRTAKEN  0x0200  // fix branch prediction bit to predict branch taken
-#define IMAGE_REL_PPC_BRNTAKEN 0x0400  // fix branch prediction bit to predict branch not taken
-#define IMAGE_REL_PPC_TOCDEFN  0x0800  // toc slot defined in file (or, data in toc)
-
-//
-// Based relocation format.
-//
-
-typedef struct _IMAGE_BASE_RELOCATION {
-    UINT32   VirtualAddress;
-    UINT32   SizeOfBlock;
-//  UINT16    TypeOffset[1];
-} IMAGE_BASE_RELOCATION, *PIMAGE_BASE_RELOCATION;
-
-#define IMAGE_SIZEOF_BASE_RELOCATION         8
-
-//
-// Based relocation types.
-//
-
-#define IMAGE_REL_BASED_ABSOLUTE              0
-#define IMAGE_REL_BASED_HIGH                  1
-#define IMAGE_REL_BASED_LOW                   2
-#define IMAGE_REL_BASED_HIGHLOW               3
-#define IMAGE_REL_BASED_HIGHADJ               4
-#define IMAGE_REL_BASED_MIPS_JMPADDR          5
-#define IMAGE_REL_BASED_IA64_IMM64            9
-#define IMAGE_REL_BASED_DIR64                 10
-
-//
-// Line number format.
-//
-
-typedef struct _IMAGE_LINENUMBER {
-    union {
-        UINT32   SymbolTableIndex;               // Symbol table index of function name if Linenumber is 0.
-        UINT32   VirtualAddress;                 // Virtual address of line number.
-    } Type;
-    UINT16    Linenumber;                         // Line number.
-} IMAGE_LINENUMBER;
-
-#define IMAGE_SIZEOF_LINENUMBER              6
-
-//
-// Archive format.
-//
-
-#define IMAGE_ARCHIVE_START_SIZE             8
-#define IMAGE_ARCHIVE_START                  "!<arch>\n"
-#define IMAGE_ARCHIVE_END                    "`\n"
-#define IMAGE_ARCHIVE_PAD                    "\n"
-#define IMAGE_ARCHIVE_LINKER_MEMBER          "/               "
-#define IMAGE_ARCHIVE_LONGNAMES_MEMBER       "//              "
-
-typedef struct _IMAGE_ARCHIVE_MEMBER_HEADER {
-    UINT8     Name[16];                          // File member name - `/' terminated.
-    UINT8     Date[12];                          // File member date - decimal.
-    UINT8     UserID[6];                         // File member user id - decimal.
-    UINT8     GroupID[6];                        // File member group id - decimal.
-    UINT8     Mode[8];                           // File member mode - octal.
-    UINT8     Size[10];                          // File member size - decimal.
-    UINT8     EndHeader[2];                      // String to end header.
-} IMAGE_ARCHIVE_MEMBER_HEADER, *PIMAGE_ARCHIVE_MEMBER_HEADER;
-
-#define IMAGE_SIZEOF_ARCHIVE_MEMBER_HDR      60
-
-//
-// DLL support.
-//
-
-//
-// Export Format
-//
-
-typedef struct _IMAGE_EXPORT_DIRECTORY {
-    UINT32   Characteristics;
-    UINT32   TimeDateStamp;
-    UINT16   MajorVersion;
-    UINT16   MinorVersion;
-    UINT32   Name;
-    UINT32   Base;
-    UINT32   NumberOfFunctions;
-    UINT32   NumberOfNames;
-    UINT32   AddressOfFunctions;
-    UINT32   AddressOfNames;
-    UINT32   AddressOfNameOrdinals;
-} IMAGE_EXPORT_DIRECTORY, *PIMAGE_EXPORT_DIRECTORY;
-
-//
-// Import Format
-//
-
-typedef struct _IMAGE_IMPORT_BY_NAME {
-    UINT16    Hint;
-    UINT8     Name[1];
-} IMAGE_IMPORT_BY_NAME, *PIMAGE_IMPORT_BY_NAME;
-
-typedef struct _IMAGE_THUNK_DATA {
-    union {
-        UINT32 Function;
-        UINT32 Ordinal;
-        PIMAGE_IMPORT_BY_NAME AddressOfData;
-    } u1;
-} IMAGE_THUNK_DATA, *PIMAGE_THUNK_DATA;
-
-#define IMAGE_ORDINAL_FLAG 0x80000000
-#define IMAGE_SNAP_BY_ORDINAL(Ordinal) ((Ordinal & IMAGE_ORDINAL_FLAG) != 0)
-#define IMAGE_ORDINAL(Ordinal) (Ordinal & 0xffff)
-
-typedef struct _IMAGE_IMPORT_DESCRIPTOR {
-    UINT32   Characteristics;
-    UINT32   TimeDateStamp;
-    UINT32   ForwarderChain;
-    UINT32   Name;
-    PIMAGE_THUNK_DATA FirstThunk;
-} IMAGE_IMPORT_DESCRIPTOR, *PIMAGE_IMPORT_DESCRIPTOR;
-
-#define IMAGE_DEBUG_TYPE_CODEVIEW   2
-
-typedef struct {
-  UINT32    Characteristics;
-  UINT32    TimeDateStamp;
-  UINT16    MajorVersion;
-  UINT16    MinorVersion;
-  UINT32    Type;
-  UINT32    SizeOfData;
-  UINT32    RVA;
-  UINT32    FileOffset;
-} IMAGE_DEBUG_DIRECTORY_ENTRY;
-
-#define CODEVIEW_SIGNATURE_NB10  0x3031424E // "NB10"
-
-typedef struct {
-  UINT32    Signature; // "NB10"
-  UINT32    Unknown;
-  UINT32    Unknown2;
-  UINT32    Unknown3;     
-  //
-  // Filename of .PDB goes here
-  //
-} EFI_IMAGE_DEBUG_CODEVIEW_NB10_ENTRY;
-
-#define CODEVIEW_SIGNATURE_RSDS  0x53445352 // "RSDS"
-
-typedef struct {
-  UINT32    Signature; // "RSDS"
-  UINT32    Unknown;
-  UINT32    Unknown2;
-  UINT32    Unknown3;     
-  UINT32    Unknown4;     
-  UINT32    Unknown5;     
-  //
-  // Filename of .PDB goes here
-  //
-} EFI_IMAGE_DEBUG_CODEVIEW_RSDS_ENTRY;
-
-#endif
diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
index df37f31b8d08..60cb43f02744 100644
--- a/sys/boot/efi/libefi/Makefile
+++ b/sys/boot/efi/libefi/Makefile
@@ -16,4 +16,8 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
 # Pick up the bootstrap header for some interface items
 CFLAGS+= -I${.CURDIR}/../../common
 
+ 
+# Suppress warning from clang for FreeBSD %b and %D formats
+CFLAGS+= -fformat-extensions
+
 .include <bsd.lib.mk>
diff --git a/sys/boot/fdt/dts/arm/apalis-imx6.dts b/sys/boot/fdt/dts/arm/apalis-imx6.dts
new file mode 100644
index 000000000000..0806f4e39815
--- /dev/null
+++ b/sys/boot/fdt/dts/arm/apalis-imx6.dts
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2014 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/ "imx6.dtsi"
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	model = "Toradex Apalis i.MX6";
+	compatible = "toradex,imx6q-apalis", "fsl,imx6q";
+
+	memory {
+		reg = <0x10000000 0x40000000>; /* RAM 1GB */
+	};
+
+	SOC: soc@00000000 {
+		aips@02000000 { /* AIPS1 */
+			iomux@020e0000		{ status = "okay"; };
+			gpio@0209c000		{ status = "okay"; };
+			gpio@020a0000		{ status = "okay"; };
+			gpio@020a4000		{ status = "okay"; };
+			gpio@020a8000		{ status = "okay"; };
+			gpio@020ac000		{ status = "okay"; };
+			gpio@020b0000		{ status = "okay"; };
+			gpio@020b4000		{ status = "okay"; };
+			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"; };
+			ecspi@02008000		{ status = "okay"; };
+			ssi@02028000		{ status = "okay"; };
+			sdma@020ec000		{ 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 = "disabled"; };
+			usdhc@0219c000		{ status = "disabled"; };
+			audmux@021d8000		{ status = "okay"; };
+		};
+	};
+
+	chosen {
+		stdin = &console;
+		stdout = &console;
+	};
+};
diff --git a/sys/boot/fdt/dts/arm/exynos5.dtsi b/sys/boot/fdt/dts/arm/exynos5.dtsi
index 553129959f0e..87d8fdb019f2 100644
--- a/sys/boot/fdt/dts/arm/exynos5.dtsi
+++ b/sys/boot/fdt/dts/arm/exynos5.dtsi
@@ -50,6 +50,11 @@
 		ranges;
 		bus-frequency = <0>;
 
+		pmu_system_controller: system-controller@10040000 {
+			reg = <0x10040000 0x5000>;
+			status = "disabled";
+		};
+
 		GIC: interrupt-controller@10481000 {
 			compatible = "arm,gic";
 			reg =	< 0x10481000 0x1000 >,	/* Distributor Registers */
@@ -96,21 +101,46 @@
 		};
 
 		pad0: pad@11400000 {
-			compatible = "exynos,pad";
 			status = "disabled";
-			reg = <0x11400000 0x1000>, /* gpio left */
-			      <0x13400000 0x1000>, /* gpio right */
-			      <0x10D10000 0x1000>, /* gpio c2c */
-			      <0x03860000 0x1000>;
-			interrupts = < 78 77 82 79 >;
+		};
+
+		usbdrd_phy0: phy@12100000 {
+			compatible = "samsung,exynos5420-usbdrd-phy";
+			status = "disabled";
+			reg = <0x12100000 0x100>;
+			samsung,pmu-syscon = <&pmu_system_controller>;
+		};
+
+		usbdrd_phy1: phy@12500000 {
+			compatible = "samsung,exynos5420-usbdrd-phy";
+			status = "disabled";
+			reg = <0x12500000 0x100>;
+			samsung,pmu-syscon = <&pmu_system_controller>;
+		};
+
+		xhci@12000000 {
+			compatible = "samsung,exynos5250-dwusb3";
+			status = "disabled";
+			reg = <0x12000000 0x1000>,
+			      <0x1200c100 0x1000>;
+			interrupts = < 104 >;
+			interrupt-parent = <&GIC>;
+		};
+
+		xhci@12400000 {
+			compatible = "samsung,exynos5250-dwusb3";
+			status = "disabled";
+			reg = <0x12400000 0x1000>,
+			      <0x1240c100 0x1000>;
+			interrupts = < 105 >;
 			interrupt-parent = <&GIC>;
 		};
 
 		usb@12110000 {
 			compatible = "exynos,usb-ehci", "usb-ehci";
+			status = "disabled";
 			reg = <0x12110000 0x1000>, /* EHCI */
 			      <0x12130000 0x1000>, /* EHCI host ctrl */
-			      <0x10040000 0x1000>, /* Power */
 			      <0x10050230 0x10>; /* Sysreg */
 			interrupts = < 103 >;
 			interrupt-parent = <&GIC>;
@@ -200,6 +230,30 @@
 			current-speed = <115200>;
 		};
 
+		spi0: spi@12d20000 {
+			compatible = "samsung,exynos5-spi";
+			status = "disabled";
+			reg = <0x12d20000 0x100>;
+			interrupts = < 100 >;
+			interrupt-parent = <&GIC>;
+		};
+
+		spi1: spi@12d30000 {
+			compatible = "samsung,exynos5-spi";
+			status = "disabled";
+			reg = <0x12d30000 0x100>;
+			interrupts = < 101 >;
+			interrupt-parent = <&GIC>;
+		};
+
+		spi2: spi@12d40000 {
+			compatible = "samsung,exynos5-spi";
+			status = "disabled";
+			reg = <0x12d40000 0x100>;
+			interrupts = < 102 >;
+			interrupt-parent = <&GIC>;
+		};
+
 		i2c0: i2c@12C60000 {
 			compatible = "exynos,i2c";
 			status = "disabled";
@@ -276,8 +330,7 @@
 		dp0: dp@145B0000 {
 			compatible = "exynos,dp";
 			status = "disabled";
-			reg = < 0x145B0000 0x10000 >,
-			      < 0x10040720 0x10 >; /* PHY */
+			reg = < 0x145B0000 0x10000 >;
 			interrupt-parent = <&GIC>;
 		};
 	};
diff --git a/sys/boot/fdt/dts/arm/exynos5250-chromebook-snow.dts b/sys/boot/fdt/dts/arm/exynos5250-snow.dts
similarity index 97%
rename from sys/boot/fdt/dts/arm/exynos5250-chromebook-snow.dts
rename to sys/boot/fdt/dts/arm/exynos5250-snow.dts
index c8ef54aea044..cb40ec5b0b6a 100644
--- a/sys/boot/fdt/dts/arm/exynos5250-chromebook-snow.dts
+++ b/sys/boot/fdt/dts/arm/exynos5250-snow.dts
@@ -64,6 +64,10 @@
 			google,key-columns = <13>;
 			freebsd,intr-gpio = <146>;
 		};
+
+		usbdrd_phy0: phy@12100000 {
+			vbus-supply = < 155 >;
+		};
 	};
 
 	i2c-arbitrator {
diff --git a/sys/boot/fdt/dts/arm/exynos5250-chromebook-spring.dts b/sys/boot/fdt/dts/arm/exynos5250-spring.dts
similarity index 100%
rename from sys/boot/fdt/dts/arm/exynos5250-chromebook-spring.dts
rename to sys/boot/fdt/dts/arm/exynos5250-spring.dts
diff --git a/sys/boot/fdt/dts/arm/exynos5250.dtsi b/sys/boot/fdt/dts/arm/exynos5250.dtsi
index fd5006584219..a8f74f498bdb 100644
--- a/sys/boot/fdt/dts/arm/exynos5250.dtsi
+++ b/sys/boot/fdt/dts/arm/exynos5250.dtsi
@@ -33,6 +33,21 @@
 
 	SOC: Exynos5@0 {
 
+		pmu_system_controller: system-controller@10040000 {
+			compatible = "samsung,exynos5250-pmu";
+			status = "okay";
+		};
+
+		pad0: pad@11400000 {
+			compatible = "samsung,exynos5250-padctrl";
+			reg = <0x11400000 0x1000>,
+			      <0x13400000 0x1000>,
+			      <0x10D10000 0x1000>,
+			      <0x03860000 0x1000>;
+			interrupts = < 78 77 82 79 >;
+			interrupt-parent = <&GIC>;
+		};
+
 		serial0: serial@12C00000 {
 			clock-frequency = < 100000000 >;
 		};
@@ -48,5 +63,17 @@
 		serial3: serial@12C30000 {
 			clock-frequency = < 100000000 >;
 		};
+
+		usb@12110000 {
+			status = "okay";
+		};
+
+		usbdrd_phy0: phy@12100000 {
+			status = "okay";
+		};
+
+		xhci@12000000 {
+			status = "okay";
+		};
 	};
 };
diff --git a/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts b/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
index e1d788dfabec..29542c8c5991 100644
--- a/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
+++ b/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
@@ -35,13 +35,21 @@
 
 	memory {
 		device_type = "memory";
-		reg = < 0x20000000 0x40000000 >;  /* 1G */
+		reg = < 0x20000000 0x7f200000 >;  /* 2G */
 	};
 
 	SOC: Exynos5@0 {
 		serial3: serial@12C30000 {
 			status = "okay";
 		};
+
+		usb@12110000 {
+			status = "okay";
+		};
+
+		sdhci@12220000 {
+			status = "disabled";
+		};
 	};
 
 	chosen {
diff --git a/usr.bin/csup/parse.y b/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts
similarity index 60%
rename from usr.bin/csup/parse.y
rename to sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts
index 3dcd617421a9..ebe3dfcf962f 100644
--- a/usr.bin/csup/parse.y
+++ b/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts
@@ -1,6 +1,5 @@
-%{
 /*-
- * Copyright (c) 2003-2004, Maxime Henrion <mux@FreeBSD.org>
+ * Copyright (c) 2014 Ruslan Bukin <br@bsdpad.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -15,7 +14,7 @@
  * 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
+ * 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)
@@ -27,65 +26,47 @@
  * $FreeBSD$
  */
 
-#include <sys/types.h>
+/dts-v1/;
 
-#include "config.h"
-#include "token.h"
+/include/ "exynos5420.dtsi"
 
-%}
+/ {
+	model = "Chromebook Peach Pit";
 
-%union {
-	char *str;
-	int i;
-}
+	memory {
+		device_type = "memory";
+		reg = < 0x20000000 0xdf000000 >; /* 3.5G */
+	};
 
-%token DEFAULT
-%token <i> NAME
-%token <i> BOOLEAN
-%token EQUAL
-%token <str> STRING
+	SOC: Exynos5@0 {
 
-%%
+		fimd0: fimd@14400000 {
+			status = "okay";
 
-config_file	
-	: config_list
-       	|
-       	;
+			panel-size = < 1366 768 >;
+			panel-hsync = < 80 32 48 >;
+			panel-vsync = < 14 5 3 >;
+			panel-clk-div = < 17 >;
+			panel-backlight-pin = < 25 >;
+		};
 
-config_list
-        : config
-        | config_list config
-        ;
+		spi2: spi@12d40000 {
+			status = "okay";
+		};
 
-config
-	: default_line
-	| collection
-	;
+		keyboard-controller {
+			compatible = "google,mkbp-keyb";
+			google,key-rows = <8>;
+			google,key-columns = <13>;
+			freebsd,intr-gpio = < 21 >;
+		};
 
-default_line
-	: DEFAULT options
-		{ coll_setdef(); }
-	;
+		usbdrd_phy0: phy@12100000 {
+			vbus-supply = < 217 >;
+		};
 
-collection
-	: STRING options
-		{ coll_add($1); }
-	;
-
-options
-	:
-	| options option
-	;
-
-option
-	: BOOLEAN
-		{ coll_setopt($1, NULL); }
-	| value
-	;
-
-value
-	: NAME EQUAL STRING
-		{ coll_setopt($1, $3); }
-	;
-
-%%
+		usbdrd_phy1: phy@12500000 {
+			vbus-supply = < 218 >;
+		};
+	};
+};
diff --git a/sys/boot/fdt/dts/arm/exynos5420.dtsi b/sys/boot/fdt/dts/arm/exynos5420.dtsi
index 8fdff7ea9b2e..7feb6d911758 100644
--- a/sys/boot/fdt/dts/arm/exynos5420.dtsi
+++ b/sys/boot/fdt/dts/arm/exynos5420.dtsi
@@ -33,6 +33,23 @@
 
 	SOC: Exynos5@0 {
 
+		pmu_system_controller: system-controller@10040000 {
+			compatible = "samsung,exynos5420-pmu";
+			status = "okay";
+		};
+
+		pad0: pad@11400000 {
+			compatible = "samsung,exynos5420-padctrl";
+			status = "okay";
+			reg = <0x13400000 0x1000>,
+			      <0x13410000 0x1000>,
+			      <0x14000000 0x1000>,
+			      <0x14010000 0x1000>,
+			      <0x03860000 0x1000>;
+			interrupts = < 77 110 78 82 79 >;
+			interrupt-parent = <&GIC>;
+		};
+
 		serial0: serial@12C00000 {
 			clock-frequency = < 50000000 >;
 		};
@@ -48,5 +65,21 @@
 		serial3: serial@12C30000 {
 			clock-frequency = < 50000000 >;
 		};
+
+		usbdrd_phy0: phy@12100000 {
+			status = "okay";
+		};
+
+		usbdrd_phy1: phy@12500000 {
+			status = "okay";
+		};
+
+		xhci@12000000 {
+			status = "okay";
+		};
+
+		xhci@12400000 {
+			status = "okay";
+		};
 	};
 };
diff --git a/sys/boot/fdt/dts/arm/imx6.dtsi b/sys/boot/fdt/dts/arm/imx6.dtsi
index d89a1a5e4fea..f7e739b3a8b2 100644
--- a/sys/boot/fdt/dts/arm/imx6.dtsi
+++ b/sys/boot/fdt/dts/arm/imx6.dtsi
@@ -102,6 +102,20 @@
 				interrupts = <119 120>;
 			};
 
+			/* System Reset Controller */
+			src: src@4006E000 {
+				compatible = "fsl,imx6-src";
+				reg = <0x020D8000 0x100>;
+			};
+
+			sdma: sdma@020ec000 {
+				compatible = "fsl,imx6q-sdma";
+				reg = <0x020ec000 0x4000>;
+				interrupt-parent = <&gic>;
+				interrupts = <34>;
+				status = "disabled";
+			};
+
 			anatop: anatop@020c8000 {
 				compatible = "fsl,imx6q-anatop";
 				reg = <0x020c8000 0x1000>;
@@ -115,87 +129,95 @@
 				interrupt-parent = <&gic>; interrupts = <87>;
 			};
 
-//			iomux@73fa8000 {
-//				compatible = "fsl,imx51-iomux";
-//				reg = <0x73fa8000 0x4000>;
-//				interrupt-parent = <&gic>; interrupts = <7>;
-//				status = "disabled";
-//			};
+			iomux@020e0000 {
+				compatible = "fsl,imx6q-iomux";
+				reg = <0x020e0000 0x4000>;
+				interrupt-parent = <&gic>;
+				interrupts = <32>;
+				status = "disabled";
+			};
 
 			gpio1: gpio@0209c000 {
 				compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
 				reg = <0x0209c000 0x4000>;
-				interrupts = <0 66 0x04 0 67 0x04>;
+				interrupts = < 98 99 >;
 				gpio-controller;
 				#gpio-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
+				status = "disabled";
 			};
-			
+
 			gpio2: gpio@020a0000 {
 				compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
 				reg = <0x020a0000 0x4000>;
-				interrupts = <0 68 0x04 0 69 0x04>;
+				interrupts = < 100 101 >;
 				gpio-controller;
 				#gpio-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
+				status = "disabled";
 			};
-			
+
 			gpio3: gpio@020a4000 {
 				compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
 				reg = <0x020a4000 0x4000>;
-				interrupts = <0 70 0x04 0 71 0x04>;
+				interrupts = < 102 103 >;
 				gpio-controller;
 				#gpio-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
+				status = "disabled";
 			};
-			
+
 			gpio4: gpio@020a8000 {
 				compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
 				reg = <0x020a8000 0x4000>;
-				interrupts = <0 72 0x04 0 73 0x04>;
+				interrupts = < 104 105 >;
 				gpio-controller;
 				#gpio-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
+				status = "disabled";
 			};
-			
+
 			gpio5: gpio@020ac000 {
 				compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
 				reg = <0x020ac000 0x4000>;
-				interrupts = <0 74 0x04 0 75 0x04>;
+				interrupts = < 106 107 >;
 				gpio-controller;
 				#gpio-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
+				status = "disabled";
 			};
-			
+
 			gpio6: gpio@020b0000 {
 				compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
 				reg = <0x020b0000 0x4000>;
-				interrupts = <0 76 0x04 0 77 0x04>;
+				interrupts = < 108 109 >;
 				gpio-controller;
 				#gpio-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
+				status = "disabled";
 			};
-			
+
 			gpio7: gpio@020b4000 {
 				compatible = "fsl,imx6q-gpio", "fsl,imx35-gpio";
 				reg = <0x020b4000 0x4000>;
-				interrupts = <0 78 0x04 0 79 0x04>;
+				interrupts = < 110 111 >;
 				gpio-controller;
 				#gpio-cells = <2>;
 				interrupt-controller;
 				#interrupt-cells = <2>;
+				status = "disabled";
 			};
 
 			uart1: serial@02020000 {
 				compatible = "fsl,imx6q-uart";
 				reg = <0x02020000 0x4000>;
-				interrupt-parent = <&gic>; 
+				interrupt-parent = <&gic>;
 				interrupts = <58>;
 				clock-frequency = <80000000>;
 				status = "disabled";
@@ -204,7 +226,7 @@
 			uart2: serial@021e8000 {
 				compatible = "fsl,imx6q-uart";
 				reg = <0x021e8000 0x4000>;
-				interrupt-parent = <&gic>; 
+				interrupt-parent = <&gic>;
 				interrupts = <59>;
 				clock-frequency = <80000000>;
 				status = "disabled";
@@ -213,7 +235,7 @@
 			uart3: serial@021ec000 {
 				compatible = "fsl,imx6q-uart";
 				reg = <0x021ec000 0x4000>;
-				interrupt-parent = <&gic>; 
+				interrupt-parent = <&gic>;
 				interrupts = <60>;
 				clock-frequency = <80000000>;
 				status = "disabled";
@@ -222,7 +244,7 @@
 			uart4: serial@021f0000 {
 				compatible = "fsl,imx6q-uart";
 				reg = <0x021f0000 0x4000>;
-				interrupt-parent = <&gic>; 
+				interrupt-parent = <&gic>;
 				interrupts = <61>;
 				clock-frequency = <80000000>;
 				status = "disabled";
@@ -231,7 +253,7 @@
 			uart5: serial@021f4000 {
 				compatible = "fsl,imx6q-uart";
 				reg = <0x021f4000 0x4000>;
-				interrupt-parent = <&gic>; 
+				interrupt-parent = <&gic>;
 				interrupts = <62>;
 				clock-frequency = <80000000>;
 				status = "disabled";
@@ -243,14 +265,69 @@
 				interrupts = <44>;
 				status = "disabled";
 			};
-			
+
 			usbphy2: usbphy@020ca000 {
 				compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
 				reg = <0x020ca000 0x1000>;
 				interrupts = <45>;
 				status = "disabled";
 			};
-			
+
+			ecspi1: ecspi@02008000 {
+				compatible = "fsl,imx6q-ecspi";
+				reg = <0x02008000 0x4000>;
+				interrupts = < 63 >;
+				status = "disabled";
+			};
+
+			ecspi2: ecspi@0200C000 {
+				compatible = "fsl,imx6q-ecspi";
+				reg = <0x0200C000 0x4000>;
+				interrupts = < 64 >;
+				status = "disabled";
+			};
+
+			ecspi3: ecspi@02010000 {
+				compatible = "fsl,imx6q-ecspi";
+				reg = <0x02010000 0x4000>;
+				interrupts = < 65 >;
+				status = "disabled";
+			};
+
+			ecspi4: ecspi@02014000 {
+				compatible = "fsl,imx6q-ecspi";
+				reg = <0x02014000 0x4000>;
+				interrupts = < 66 >;
+				status = "disabled";
+			};
+
+			ecspi5: ecspi@02018000 {
+				compatible = "fsl,imx6q-ecspi";
+				reg = <0x02018000 0x4000>;
+				interrupts = < 67 >;
+				status = "disabled";
+			};
+
+			ssi1: ssi@02028000 {
+				compatible = "fsl,imx6q-ssi";
+				reg = <0x02028000 0x4000>;
+				interrupts = < 78 >;
+				status = "disabled";
+			};
+
+			ssi2: ssi@0202C000 {
+				compatible = "fsl,imx6q-ssi";
+				reg = <0x0202C000 0x4000>;
+				interrupts = < 79 >;
+				status = "disabled";
+			};
+
+			ssi3: ssi@02030000 {
+				compatible = "fsl,imx6q-ssi";
+				reg = <0x02030000 0x4000>;
+				interrupts = < 80 >;
+				status = "disabled";
+			};
 		};
 
 		aips@02100000 { /* AIPS2 */
@@ -261,13 +338,34 @@
 			reg = <0x02100000 0x00100000>;
 			ranges;
 
+			i2c1: i2c@021a0000 {
+				compatible = "fsl,imx6q-i2c";
+				reg = <0x021a0000 0x4000>;
+				interrupts = < 68 >;
+				status = "disabled";
+			};
+
+			i2c2: i2c@021a4000 {
+				compatible = "fsl,imx6q-i2c";
+				reg = <0x021a4000 0x4000>;
+				interrupts = < 69 >;
+				status = "disabled";
+			};
+
+			i2c3: i2c@021ac000 {
+				compatible = "fsl,imx6q-i2c";
+				reg = <0x021a8000 0x4000>;
+				interrupts = < 70 >;
+				status = "disabled";
+			};
+
 			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>;
@@ -276,7 +374,7 @@
 				fsl,usbmisc = <&usbmisc 0>;
 				status = "disabled";
 			};
-			
+
 			usbh1: usb@02184200 {
 				compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
 				reg = <0x02184200 0x200>;
@@ -285,7 +383,7 @@
 				fsl,usbmisc = <&usbmisc 1>;
 				status = "disabled";
 			};
-			
+
 			usbh2: usb@02184400 {
 				compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
 				reg = <0x02184400 0x200>;
@@ -293,7 +391,7 @@
 				fsl,usbmisc = <&usbmisc 2>;
 				status = "disabled";
 			};
-			
+
 			usbh3: usb@02184600 {
 				compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
 				reg = <0x02184600 0x200>;
@@ -301,7 +399,7 @@
 				fsl,usbmisc = <&usbmisc 3>;
 				status = "disabled";
 			};
-			
+
 			usbmisc: usbmisc@02184800 {
 				#index-cells = <1>;
 				compatible = "fsl,imx6q-usbmisc";
@@ -352,6 +450,12 @@
 				compatible = "fsl,imx6q-ocotp";
 				reg = <0x021bc000 0x4000>;
 			};
+
+			audmux: audmux@021d8000 {
+				compatible = "fsl,imx6q-audmux";
+				reg = <0x021d8000 0x4000>;
+				status = "disabled";
+			};
 		};
 	};
 };
diff --git a/sys/boot/fdt/dts/arm/wandboard-dual.dts b/sys/boot/fdt/dts/arm/wandboard-dual.dts
index 65a88c42fca2..e9461b66af41 100644
--- a/sys/boot/fdt/dts/arm/wandboard-dual.dts
+++ b/sys/boot/fdt/dts/arm/wandboard-dual.dts
@@ -44,11 +44,14 @@
 
 	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"; };
+			iomux@020e0000		{ status = "disabled"; };
+			gpio@0209c000		{ status = "okay"; };
+			gpio@020a0000		{ status = "okay"; };
+			gpio@020a4000		{ status = "okay"; };
+			gpio@020a8000		{ status = "okay"; };
+			gpio@020ac000		{ status = "okay"; };
+			gpio@020b0000		{ status = "okay"; };
+			gpio@020b4000		{ status = "okay"; };
 			console:serial@02020000 { status = "okay"; };
 			serial@021e8000		{ status = "disabled"; };
 			serial@021ec000		{ status = "disabled"; };
@@ -58,7 +61,7 @@
 			usbphy@020ca000		{ status = "okay"; };
 		};
 		aips@02100000 { /* AIPS2 */
-			ethernet@02188000	{ 
+			ethernet@02188000	{
 				status = "okay";
 				phy-mode = "rgmii";
 				phy-disable-preamble;
diff --git a/sys/boot/fdt/dts/arm/wandboard-quad.dts b/sys/boot/fdt/dts/arm/wandboard-quad.dts
index 71c51560a513..56c1eb148129 100644
--- a/sys/boot/fdt/dts/arm/wandboard-quad.dts
+++ b/sys/boot/fdt/dts/arm/wandboard-quad.dts
@@ -44,11 +44,14 @@
 
 	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"; };
+			iomux@020e0000		{ status = "disabled"; };
+			gpio@0209c000		{ status = "okay"; };
+			gpio@020a0000		{ status = "okay"; };
+			gpio@020a4000		{ status = "okay"; };
+			gpio@020a8000		{ status = "okay"; };
+			gpio@020ac000		{ status = "okay"; };
+			gpio@020b0000		{ status = "okay"; };
+			gpio@020b4000		{ status = "okay"; };
 			console:serial@02020000 { status = "okay"; };
 			serial@021e8000		{ status = "disabled"; };
 			serial@021ec000		{ status = "disabled"; };
@@ -58,7 +61,7 @@
 			usbphy@020ca000		{ status = "okay"; };
 		};
 		aips@02100000 { /* AIPS2 */
-			ethernet@02188000	{ 
+			ethernet@02188000	{
 				status = "okay";
 				phy-mode = "rgmii";
 				phy-disable-preamble;
diff --git a/sys/boot/fdt/dts/arm/wandboard-solo.dts b/sys/boot/fdt/dts/arm/wandboard-solo.dts
index 70e05e0a80fc..3a7139b8f71c 100644
--- a/sys/boot/fdt/dts/arm/wandboard-solo.dts
+++ b/sys/boot/fdt/dts/arm/wandboard-solo.dts
@@ -44,11 +44,14 @@
 
 	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"; };
+			iomux@020e0000		{ status = "disabled"; };
+			gpio@0209c000		{ status = "okay"; };
+			gpio@020a0000		{ status = "okay"; };
+			gpio@020a4000		{ status = "okay"; };
+			gpio@020a8000		{ status = "okay"; };
+			gpio@020ac000		{ status = "okay"; };
+			gpio@020b0000		{ status = "okay"; };
+			gpio@020b4000		{ status = "okay"; };
 			console:serial@02020000 { status = "okay"; };
 			serial@021e8000		{ status = "disabled"; };
 			serial@021ec000		{ status = "disabled"; };
@@ -58,7 +61,7 @@
 			usbphy@020ca000		{ status = "okay"; };
 		};
 		aips@02100000 { /* AIPS2 */
-			ethernet@02188000	{ 
+			ethernet@02188000	{
 				status = "okay";
 				phy-mode = "rgmii";
 				phy-disable-preamble;
diff --git a/sys/boot/fdt/dts/arm/zedboard.dts b/sys/boot/fdt/dts/arm/zedboard.dts
index 2d9fccdeac2a..7277308c8760 100644
--- a/sys/boot/fdt/dts/arm/zedboard.dts
+++ b/sys/boot/fdt/dts/arm/zedboard.dts
@@ -63,6 +63,7 @@
 		slcr: slcr@7000 {
 			compatible = "xlnx,zy7_slcr";
 			reg = <0x0 0x1000>;
+			clock-frequency = <33333333>; // 33Mhz PS_CLK
 		};
 
 		// Interrupt controller
@@ -175,6 +176,7 @@
 		 	reg = <0xb000 0x1000>;
 			interrupts = <54 55>;
 			interrupt-parent = <&GIC>;
+			ref-clock-num = <0>;
 		};
 
 		// SDIO
diff --git a/sys/boot/ficl/ia64/sysdep.c b/sys/boot/ficl/ia64/sysdep.c
deleted file mode 100644
index 00b0d4acf0e3..000000000000
--- a/sys/boot/ficl/ia64/sysdep.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************
-** s y s d e p . c
-** Forth Inspired Command Language
-** Author: John Sadler (john_sadler@alum.mit.edu)
-** Created: 16 Oct 1997
-** Implementations of FICL external interface functions... 
-**
-*******************************************************************/
-
-/* $FreeBSD$ */
-
-#ifdef TESTMAIN
-#include <stdio.h>
-#include <stdlib.h>
-#else
-#include <stand.h>
-#endif
-#include "ficl.h"
-
-/*
-*******************  FreeBSD  P O R T   B E G I N S   H E R E ******************** Michael Smith
-*/
-
-#if PORTABLE_LONGMULDIV == 0
-DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y)
-{
-    DPUNS q;
-    u_int64_t qx;
-
-    qx = (u_int64_t)x * (u_int64_t) y;
-
-    q.hi = (u_int32_t)( qx >> 32 );
-    q.lo = (u_int32_t)( qx & 0xFFFFFFFFL);
-
-    return q;
-}
-
-UNSQR ficlLongDiv(DPUNS q, FICL_UNS y)
-{
-    UNSQR result;
-    u_int64_t qx, qh;
-
-    qh = q.hi;
-    qx = (qh << 32) | q.lo;
-
-    result.quot = qx / y;
-    result.rem  = qx % y;
-
-    return result;
-}
-#endif
-
-void  ficlTextOut(FICL_VM *pVM, char *msg, int fNewline)
-{
-    IGNORE(pVM);
-
-    while(*msg != 0)
-	putchar(*(msg++));
-    if (fNewline)
-	putchar('\n');
-
-   return;
-}
-
-void *ficlMalloc (size_t size)
-{
-    return malloc(size);
-}
-
-void *ficlRealloc (void *p, size_t size)
-{
-    return realloc(p, size);
-}
-
-void  ficlFree   (void *p)
-{
-    free(p);
-}
-
-
-/*
-** Stub function for dictionary access control - does nothing
-** by default, user can redefine to guarantee exclusive dict
-** access to a single thread for updates. All dict update code
-** is guaranteed to be bracketed as follows:
-** ficlLockDictionary(TRUE);
-** <code that updates dictionary>
-** ficlLockDictionary(FALSE);
-**
-** Returns zero if successful, nonzero if unable to acquire lock
-** befor timeout (optional - could also block forever)
-*/
-#if FICL_MULTITHREAD
-int ficlLockDictionary(short fLock)
-{
-	IGNORE(fLock);
-	return 0;
-}
-#endif /* FICL_MULTITHREAD */
-
-
diff --git a/sys/boot/ficl/ia64/sysdep.h b/sys/boot/ficl/ia64/sysdep.h
deleted file mode 100644
index 08bc0e1f4d0b..000000000000
--- a/sys/boot/ficl/ia64/sysdep.h
+++ /dev/null
@@ -1,434 +0,0 @@
-/*******************************************************************
-                    s y s d e p . h
-** Forth Inspired Command Language
-** Author: John Sadler (john_sadler@alum.mit.edu)
-** Created: 16 Oct 1997
-** Ficl system dependent types and prototypes...
-**
-** Note: Ficl also depends on the use of "assert" when
-** FICL_ROBUST is enabled. This may require some consideration
-** in firmware systems since assert often
-** assumes stderr/stdout.  
-** $Id: sysdep.h,v 1.11 2001/12/05 07:21:34 jsadler Exp $
-*******************************************************************/
-/*
-** Copyright (c) 1997-2001 John Sadler (john_sadler@alum.mit.edu)
-** All rights reserved.
-**
-** Get the latest Ficl release at http://ficl.sourceforge.net
-**
-** I am interested in hearing from anyone who uses ficl. If you have
-** a problem, a success story, a defect, an enhancement request, or
-** if you would like to contribute to the ficl release, please
-** contact me by email at the address above.
-**
-** L I C E N S E  and  D I S C L A I M E R
-** 
-** Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions
-** are met:
-** 1. Redistributions of source code must retain the above copyright
-**    notice, this list of conditions and the following disclaimer.
-** 2. Redistributions in binary form must reproduce the above copyright
-**    notice, this 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.
-**
-** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $
-*/
-
-/* $FreeBSD$ */
-
-#if !defined (__SYSDEP_H__)
-#define __SYSDEP_H__ 
-
-#include <sys/types.h>
-
-#include <stddef.h> /* size_t, NULL */
-#include <setjmp.h>
-#include <assert.h>
-
-#if !defined IGNORE		/* Macro to silence unused param warnings */
-#define IGNORE(x) &x
-#endif
-
-/*
-** TRUE and FALSE for C boolean operations, and
-** portable 32 bit types for CELLs
-** 
-*/
-#if !defined TRUE
-#define TRUE 1
-#endif
-#if !defined FALSE
-#define FALSE 0
-#endif
-
-/*
-** System dependent data type declarations...
-*/
-#if !defined INT32
-#define INT32 int
-#endif
-
-#if !defined UNS32
-#define UNS32 unsigned int
-#endif
-
-#if !defined UNS16
-#define UNS16 unsigned short
-#endif
-
-#if !defined UNS8
-#define UNS8 unsigned char
-#endif
-
-#if !defined NULL
-#define NULL ((void *)0)
-#endif
-
-/*
-** FICL_UNS and FICL_INT must have the same size as a void* on
-** the target system. A CELL is a union of void*, FICL_UNS, and
-** FICL_INT. 
-** (11/2000: same for FICL_FLOAT)
-*/
-#if !defined FICL_INT
-#define FICL_INT long
-#endif
-
-#if !defined FICL_UNS
-#define FICL_UNS unsigned long
-#endif
-
-#if !defined FICL_FLOAT
-#define FICL_FLOAT float
-#endif
-
-/*
-** Ficl presently supports values of 32 and 64 for BITS_PER_CELL
-*/
-#if !defined BITS_PER_CELL
-#define BITS_PER_CELL 64
-#endif
-
-#if ((BITS_PER_CELL != 32) && (BITS_PER_CELL != 64))
-    Error!
-#endif
-
-typedef struct
-{
-    FICL_UNS hi;
-    FICL_UNS lo;
-} DPUNS;
-
-typedef struct
-{
-    FICL_UNS quot;
-    FICL_UNS rem;
-} UNSQR;
-
-typedef struct
-{
-    FICL_INT hi;
-    FICL_INT lo;
-} DPINT;
-
-typedef struct
-{
-    FICL_INT quot;
-    FICL_INT rem;
-} INTQR;
-
-
-/*
-** B U I L D   C O N T R O L S
-*/
-
-#if !defined (FICL_MINIMAL)
-#define FICL_MINIMAL 0
-#endif
-#if (FICL_MINIMAL)
-#define FICL_WANT_SOFTWORDS  0
-#define FICL_WANT_FILE       0
-#define FICL_WANT_FLOAT      0
-#define FICL_WANT_USER       0
-#define FICL_WANT_LOCALS     0
-#define FICL_WANT_DEBUGGER   0
-#define FICL_WANT_OOP        0
-#define FICL_PLATFORM_EXTEND 0
-#define FICL_MULTITHREAD     0
-#define FICL_ROBUST          0
-#define FICL_EXTENDED_PREFIX 0
-#endif
-
-/*
-** FICL_PLATFORM_EXTEND
-** Includes words defined in ficlCompilePlatform
-*/
-#if !defined (FICL_PLATFORM_EXTEND)
-#define FICL_PLATFORM_EXTEND 1
-#endif
-
-
-/*
-** FICL_WANT_FILE
-** Includes the FILE and FILE-EXT wordset and associated code. Turn this off if you do not
-** have a filesystem!
-** Contributed by Larry Hastings
-*/
-#if !defined (FICL_WANT_FILE)
-#define FICL_WANT_FILE 0
-#endif
-
-/*
-** FICL_WANT_FLOAT
-** Includes a floating point stack for the VM, and words to do float operations.
-** Contributed by Guy Carver
-*/
-#if !defined (FICL_WANT_FLOAT)
-#define FICL_WANT_FLOAT 0
-#endif
-
-/*
-** FICL_WANT_DEBUGGER
-** Inludes a simple source level debugger
-*/
-#if !defined (FICL_WANT_DEBUGGER)
-#define FICL_WANT_DEBUGGER 1
-#endif
-
-/*
-** FICL_EXTENDED_PREFIX enables a bunch of extra prefixes in prefix.c and prefix.fr (if
-** included as part of softcore.c)
-*/
-#if !defined FICL_EXTENDED_PREFIX
-#define FICL_EXTENDED_PREFIX 0
-#endif
-
-/*
-** User variables: per-instance variables bound to the VM.
-** Kinda like thread-local storage. Could be implemented in a 
-** VM private dictionary, but I've chosen the lower overhead
-** approach of an array of CELLs instead.
-*/
-#if !defined FICL_WANT_USER
-#define FICL_WANT_USER 1
-#endif
-
-#if !defined FICL_USER_CELLS
-#define FICL_USER_CELLS 16
-#endif
-
-/* 
-** FICL_WANT_LOCALS controls the creation of the LOCALS wordset and
-** a private dictionary for local variable compilation.
-*/
-#if !defined FICL_WANT_LOCALS
-#define FICL_WANT_LOCALS 1
-#endif
-
-/* Max number of local variables per definition */
-#if !defined FICL_MAX_LOCALS
-#define FICL_MAX_LOCALS 16
-#endif
-
-/*
-** FICL_WANT_OOP
-** Inludes object oriented programming support (in softwords)
-** OOP support requires locals and user variables!
-*/
-#if !(FICL_WANT_LOCALS) || !(FICL_WANT_USER)
-#if !defined (FICL_WANT_OOP)
-#define FICL_WANT_OOP 0
-#endif
-#endif
-
-#if !defined (FICL_WANT_OOP)
-#define FICL_WANT_OOP 1
-#endif
-
-/*
-** FICL_WANT_SOFTWORDS
-** Controls inclusion of all softwords in softcore.c
-*/
-#if !defined (FICL_WANT_SOFTWORDS)
-#define FICL_WANT_SOFTWORDS 1
-#endif
-
-/*
-** FICL_MULTITHREAD enables dictionary mutual exclusion
-** wia the ficlLockDictionary system dependent function.
-** Note: this implementation is experimental and poorly
-** tested. Further, it's unnecessary unless you really
-** intend to have multiple SESSIONS (poor choice of name
-** on my part) - that is, threads that modify the dictionary
-** at the same time.
-*/
-#if !defined FICL_MULTITHREAD
-#define FICL_MULTITHREAD 0
-#endif
-
-/*
-** PORTABLE_LONGMULDIV causes ficlLongMul and ficlLongDiv to be
-** defined in C in sysdep.c. Use this if you cannot easily 
-** generate an inline asm definition
-*/ 
-#if !defined (PORTABLE_LONGMULDIV)
-#define PORTABLE_LONGMULDIV 0
-#endif
-
-/*
-** INLINE_INNER_LOOP causes the inner interpreter to be inline code
-** instead of a function call. This is mainly because MS VC++ 5
-** chokes with an internal compiler error on the function version.
-** in release mode. Sheesh.
-*/
-#if !defined INLINE_INNER_LOOP
-#if defined _DEBUG
-#define INLINE_INNER_LOOP 0
-#else
-#define INLINE_INNER_LOOP 1
-#endif
-#endif
-
-/*
-** FICL_ROBUST enables bounds checking of stacks and the dictionary.
-** This will detect stack over and underflows and dictionary overflows.
-** Any exceptional condition will result in an assertion failure.
-** (As generated by the ANSI assert macro)
-** FICL_ROBUST == 1 --> stack checking in the outer interpreter
-** FICL_ROBUST == 2 also enables checking in many primitives
-*/
-
-#if !defined FICL_ROBUST
-#define FICL_ROBUST 2
-#endif
-
-/*
-** FICL_DEFAULT_STACK Specifies the default size (in CELLs) of
-** a new virtual machine's stacks, unless overridden at 
-** create time.
-*/
-#if !defined FICL_DEFAULT_STACK
-#define FICL_DEFAULT_STACK 128
-#endif
-
-/*
-** FICL_DEFAULT_DICT specifies the number of CELLs to allocate
-** for the system dictionary by default. The value
-** can be overridden at startup time as well.
-** FICL_DEFAULT_ENV specifies the number of cells to allot
-** for the environment-query dictionary.
-*/
-#if !defined FICL_DEFAULT_DICT
-#define FICL_DEFAULT_DICT 12288
-#endif
-
-#if !defined FICL_DEFAULT_ENV
-#define FICL_DEFAULT_ENV 260
-#endif
-
-/*
-** FICL_DEFAULT_VOCS specifies the maximum number of wordlists in 
-** the dictionary search order. See Forth DPANS sec 16.3.3
-** (file://dpans16.htm#16.3.3)
-*/
-#if !defined FICL_DEFAULT_VOCS
-#define FICL_DEFAULT_VOCS 16
-#endif
-
-/*
-** FICL_MAX_PARSE_STEPS controls the size of an array in the FICL_SYSTEM structure
-** that stores pointers to parser extension functions. I would never expect to have
-** more than 8 of these, so that's the default limit. Too many of these functions
-** will probably exact a nasty performance penalty.
-*/
-#if !defined FICL_MAX_PARSE_STEPS
-#define FICL_MAX_PARSE_STEPS 8
-#endif
-
-/*
-** FICL_ALIGN is the power of two to which the dictionary
-** pointer address must be aligned. This value is usually
-** either 1 or 2, depending on the memory architecture
-** of the target system; 2 is safe on any 16 or 32 bit
-** machine. 3 would be appropriate for a 64 bit machine.
-*/
-#if !defined FICL_ALIGN
-#define FICL_ALIGN 3
-#define FICL_ALIGN_ADD ((1 << FICL_ALIGN) - 1)
-#endif
-
-/*
-** System dependent routines --
-** edit the implementations in sysdep.c to be compatible
-** with your runtime environment...
-** ficlTextOut sends a NULL terminated string to the 
-**   default output device - used for system error messages
-** ficlMalloc and ficlFree have the same semantics as malloc and free
-**   in standard C
-** ficlLongMul multiplies two UNS32s and returns a 64 bit unsigned 
-**   product
-** ficlLongDiv divides an UNS64 by an UNS32 and returns UNS32 quotient
-**   and remainder
-*/
-struct vm;
-void  ficlTextOut(struct vm *pVM, char *msg, int fNewline);
-void *ficlMalloc (size_t size);
-void  ficlFree   (void *p);
-void *ficlRealloc(void *p, size_t size);
-/*
-** Stub function for dictionary access control - does nothing
-** by default, user can redefine to guarantee exclusive dict
-** access to a single thread for updates. All dict update code
-** must be bracketed as follows:
-** ficlLockDictionary(TRUE);
-** <code that updates dictionary>
-** ficlLockDictionary(FALSE);
-**
-** Returns zero if successful, nonzero if unable to acquire lock
-** before timeout (optional - could also block forever)
-**
-** NOTE: this function must be implemented with lock counting
-** semantics: nested calls must behave properly.
-*/
-#if FICL_MULTITHREAD
-int ficlLockDictionary(short fLock);
-#else
-#define ficlLockDictionary(x) 0 /* ignore */
-#endif
-
-/*
-** 64 bit integer math support routines: multiply two UNS32s
-** to get a 64 bit product, & divide the product by an UNS32
-** to get an UNS32 quotient and remainder. Much easier in asm
-** on a 32 bit CPU than in C, which usually doesn't support 
-** the double length result (but it should).
-*/
-DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y);
-UNSQR ficlLongDiv(DPUNS    q, FICL_UNS y);
-
-
-/*
-** FICL_HAVE_FTRUNCATE indicates whether the current OS supports
-** the ftruncate() function (available on most UNIXes).  This
-** function is necessary to provide the complete File-Access wordset.
-*/
-#if !defined (FICL_HAVE_FTRUNCATE)
-#define FICL_HAVE_FTRUNCATE 0
-#endif
-
-
-#endif /*__SYSDEP_H__*/
diff --git a/sys/boot/ficl/loader.c b/sys/boot/ficl/loader.c
index f39b1eb660d9..349a7c66d1ca 100644
--- a/sys/boot/ficl/loader.c
+++ b/sys/boot/ficl/loader.c
@@ -800,15 +800,9 @@ void ficlCompilePlatform(FICL_SYSTEM *pSys)
     ficlSetEnv(pSys, "arch-pc98",         FICL_TRUE);
 #elif defined(__i386__)
     ficlSetEnv(pSys, "arch-i386",         FICL_TRUE);
-    ficlSetEnv(pSys, "arch-ia64",         FICL_FALSE);
-    ficlSetEnv(pSys, "arch-powerpc",      FICL_FALSE);
-#elif defined(__ia64__)
-    ficlSetEnv(pSys, "arch-i386",         FICL_FALSE);
-    ficlSetEnv(pSys, "arch-ia64",         FICL_TRUE);
     ficlSetEnv(pSys, "arch-powerpc",      FICL_FALSE);
 #elif defined(__powerpc__)
     ficlSetEnv(pSys, "arch-i386",         FICL_FALSE);
-    ficlSetEnv(pSys, "arch-ia64",         FICL_FALSE);
     ficlSetEnv(pSys, "arch-powerpc",      FICL_TRUE);
 #endif
 
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 3f31b7a8ebec..241b14aaf973 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -134,6 +134,7 @@ module_path="/boot/modules"	# Set the module search path
 #vfs.root.mountfrom=""		# Specify root partition in a way the
 				# kernel understands
 #vm.kmem_size=""		# Sets the size of kernel memory (bytes)
+#debug.kdb.break_to_debugger="0" # Allow console to break into debugger.
 #debug.ktr.cpumask="0xf"	# Bitmask of CPUs to enable KTR on
 #debug.ktr.mask="0x1200"	# Bitmask of KTR events to enable
 #debug.ktr.verbose="1"		# Enable console dump of KTR events
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index 6998026d6189..cd384e565894 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/sys/boot/i386/boot2/boot2.c
@@ -34,9 +34,22 @@ __FBSDID("$FreeBSD$");
 #include "boot2.h"
 #include "lib.h"
 
+/* Define to 0 to omit serial support */
+#ifndef SERIAL
+#define SERIAL 1
+#endif
+
 #define IO_KEYBOARD	1
 #define IO_SERIAL	2
 
+#if SERIAL
+#define DO_KBD (ioctrl & IO_KEYBOARD)
+#define DO_SIO (ioctrl & IO_SERIAL)
+#else
+#define DO_KBD (1)
+#define DO_SIO (0)
+#endif
+
 #define SECOND		18	/* Circa that many ticks in a second. */
 
 #define RBX_ASKNAME	0x0	/* -a */
@@ -131,9 +144,11 @@ static struct dsk {
 static char cmd[512], cmddup[512], knamebuf[1024];
 static const char *kname;
 static uint32_t opts;
-static int comspeed = SIOSPD;
 static struct bootinfo bootinfo;
+#if SERIAL
+static int comspeed = SIOSPD;
 static uint8_t ioctrl = IO_KEYBOARD;
+#endif
 
 void exit(int);
 static void load(void);
@@ -276,7 +291,7 @@ main(void)
 		   "boot: ",
 		   dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit,
 		   'a' + dsk.part, kname);
-	if (ioctrl & IO_SERIAL)
+	if (DO_SIO)
 	    sio_flush();
 	if (!autoboot || keyhit(3*SECOND))
 	    getstr();
@@ -398,6 +413,7 @@ parse()
 		    }
 		    printf("Keyboard: %s\n", cp);
 		    continue;
+#if SERIAL
 		} else if (c == 'S') {
 		    j = 0;
 		    while ((unsigned int)(i = *arg++ - '0') <= 9)
@@ -407,18 +423,21 @@ parse()
 			break;
 		    }
 		    /* Fall through to error below ('S' not in optstr[]). */
+#endif
 		}
 		for (i = 0; c != optstr[i]; i++)
 		    if (i == NOPT - 1)
 			return -1;
 		opts ^= OPT_SET(flags[i]);
 	    }
+#if SERIAL
 	    ioctrl = OPT_CHECK(RBX_DUAL) ? (IO_SERIAL|IO_KEYBOARD) :
 		     OPT_CHECK(RBX_SERIAL) ? IO_SERIAL : IO_KEYBOARD;
-	    if (ioctrl & IO_SERIAL) {
+	    if (DO_SIO) {
 	        if (sio_init(115200 / comspeed) != 0)
 		    ioctrl &= ~IO_SERIAL;
 	    }
+#endif
 	} else {
 	    for (q = arg--; *q && *q != '('; q++);
 	    if (*q) {
@@ -626,9 +645,9 @@ keyhit(unsigned ticks)
 static int
 xputc(int c)
 {
-    if (ioctrl & IO_KEYBOARD)
+    if (DO_KBD)
 	putc(c);
-    if (ioctrl & IO_SERIAL)
+    if (DO_SIO)
 	sio_putc(c);
     return c;
 }
@@ -648,9 +667,9 @@ xgetc(int fn)
     if (OPT_CHECK(RBX_NOINTR))
 	return 0;
     for (;;) {
-	if (ioctrl & IO_KEYBOARD && getc(1))
+	if (DO_KBD && getc(1))
 	    return fn ? 1 : getc(0);
-	if (ioctrl & IO_SERIAL && sio_ischar())
+	if (DO_SIO && sio_ischar())
 	    return fn ? 1 : sio_getc();
 	if (fn)
 	    return 0;
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index e40f8b6bb1bb..6b7e056d7d17 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -55,6 +55,9 @@ CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../common \
 # the location of libstand
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
 
+# Suppress warning from clang for FreeBSD %b and %D formats
+CFLAGS+= -fformat-extensions
+
 .if ${MACHINE_CPUARCH} == "amd64"
 CLEANFILES+=	machine
 machine:
diff --git a/sys/boot/i386/libi386/amd64_tramp.S b/sys/boot/i386/libi386/amd64_tramp.S
index ff12c661d94d..fe0cf83c9d8f 100644
--- a/sys/boot/i386/libi386/amd64_tramp.S
+++ b/sys/boot/i386/libi386/amd64_tramp.S
@@ -84,7 +84,7 @@ amd64_tramp:
 
 	/* Turn on PAE */
 	movl	%cr4, %eax
-	orl	$(CR4_PAE | CR4_PSE), %eax
+	orl	$CR4_PAE, %eax
 	movl	%eax, %cr4
 
 	/* Set %cr3 for PT4 */
diff --git a/sys/boot/i386/libi386/libi386.h b/sys/boot/i386/libi386/libi386.h
index f7dc3790ca0c..24d6f56b8d7f 100644
--- a/sys/boot/i386/libi386/libi386.h
+++ b/sys/boot/i386/libi386/libi386.h
@@ -121,4 +121,5 @@ int	bi_load32(char *args, int *howtop, int *bootdevp, vm_offset_t *bip,
 	    vm_offset_t *modulep, vm_offset_t *kernend);
 int	bi_load64(char *args, vm_offset_t *modulep, vm_offset_t *kernend);
 
+char	*pxe_default_rc(void);
 void	pxe_enable(void *pxeinfo);
diff --git a/sys/boot/i386/libi386/pxe.c b/sys/boot/i386/libi386/pxe.c
index 49814ddf9dbe..1b255e9f5a21 100644
--- a/sys/boot/i386/libi386/pxe.c
+++ b/sys/boot/i386/libi386/pxe.c
@@ -301,10 +301,6 @@ pxe_open(struct open_file *f, ...)
 			bcopy(&rootpath[i], &temp[0], strlen(&rootpath[i])+1);
 			bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1);
 		}
-		printf("pxe_open: server addr: %s\n", inet_ntoa(rootip));
-		printf("pxe_open: server path: %s\n", rootpath);
-		printf("pxe_open: gateway ip:  %s\n", inet_ntoa(gateip));
-
 		setenv("boot.netif.ip", inet_ntoa(myip), 1);
 		setenv("boot.netif.netmask", intoa(netmask), 1);
 		setenv("boot.netif.gateway", inet_ntoa(gateip), 1);
@@ -312,9 +308,24 @@ pxe_open(struct open_file *f, ...)
 		    sprintf(temp, "%6D", bootplayer.CAddr, ":");
 		    setenv("boot.netif.hwaddr", temp, 1);
 		}
+#ifdef LOADER_NFS_SUPPORT
+		printf("pxe_open: server addr: %s\n", inet_ntoa(rootip));
+		printf("pxe_open: server path: %s\n", rootpath);
+		printf("pxe_open: gateway ip:  %s\n", inet_ntoa(gateip));
+
 		setenv("boot.nfsroot.server", inet_ntoa(rootip), 1);
 		setenv("boot.nfsroot.path", rootpath, 1);
+#else
+		setenv("boot.netif.server", inet_ntoa(rootip), 1);
+#endif
 		setenv("dhcp.host-name", hostname, 1);
+
+		sprintf(temp, "%08X", ntohl(myip.s_addr));
+		setenv("pxeboot.ip", temp, 1);
+		if (bootplayer.Hardware == ETHER_TYPE) {
+		    sprintf(temp, "%6D", bootplayer.CAddr, "-");
+		    setenv("pxeboot.hwaddr", temp, 1);
+		}
 	}
     }
     pxe_opens++;
@@ -694,3 +705,26 @@ readudp(struct iodesc *h, void *pkt, size_t len, time_t timeout)
 	uh->uh_sport = udpread_p->s_port;
 	return udpread_p->buffer_size;
 }
+
+char *
+pxe_default_rc(void)
+{
+	char *rc;
+	size_t count, rcsz;
+
+	/* XXX It may not be a good idea to modify the PXE boot file. */
+	rc = (char *)bootplayer.bootfile;
+	rcsz = sizeof(bootplayer.bootfile);
+
+	/* Ignore how we define rc and rcsz above -- it can change. */
+	if (rcsz < 6)
+		return (NULL);
+	if (*rc == '\0') {
+		strncpy(rc, "pxeboot", rcsz);
+		rc[rcsz - 1] = '\0';
+	}
+	count = strlen(rc);
+	strncat(rc, ".4th", rcsz - count - 1);
+	printf("PXE: loading Forth from %s\n", rc);
+	return (rc);
+}
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 7de6176f63da..f6913140786b 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -134,6 +134,6 @@ LDADD=	${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND}
 beforedepend ${OBJS}: machine
 CLEANFILES+=	machine
 CFLAGS+=	-DLOADER_PREFER_AMD64
-machine:
+machine: .NOPATH
 	ln -sf ${.CURDIR}/../../../i386/include machine
 .endif
diff --git a/sys/boot/i386/loader/main.c b/sys/boot/i386/loader/main.c
index 84ae7131bbbe..13f93350127f 100644
--- a/sys/boot/i386/loader/main.c
+++ b/sys/boot/i386/loader/main.c
@@ -192,7 +192,12 @@ main(void)
     
     bios_getsmap();
 
-    interact();			/* doesn't return */
+#ifdef LOADER_TFTP_SUPPORT
+    if (kargs->bootflags & KARGS_FLAGS_PXE)
+	interact(pxe_default_rc());
+    else
+#endif
+    interact(NULL);
 
     /* if we ever get here, it is an error */
     return (1);
diff --git a/sys/boot/ia64/Makefile b/sys/boot/ia64/Makefile
deleted file mode 100644
index 5f24fb2dc67b..000000000000
--- a/sys/boot/ia64/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-SUBDIR= common efi
-
-# In the ski sub-directory, one can build a loader for use under Ski.
-# Ski is an Itanium simulator, originally developed by HP. It's not
-# supported anymore in FreeBSD, but left for reference and education.
-# SUBDIR += ski
-
-.include <bsd.subdir.mk>
diff --git a/sys/boot/ia64/Makefile.inc b/sys/boot/ia64/Makefile.inc
deleted file mode 100644
index e63fb5464734..000000000000
--- a/sys/boot/ia64/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-BINDIR?=	/boot
-
-# Options used when building standalone components
-CFLAGS+=	-ffreestanding -fshort-wchar -Wformat
-LDFLAGS+=	-nostdlib
-
-.include "../Makefile.inc"
diff --git a/sys/boot/ia64/common/Makefile b/sys/boot/ia64/common/Makefile
deleted file mode 100644
index ef2737f4cd2f..000000000000
--- a/sys/boot/ia64/common/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-MK_SSP=		no
-
-LIB=		ia64
-INTERNALLIB=
-
-SRCS=		autoload.c bootinfo.c copy.c devicename.c exec.c icache.c
-
-CFLAGS+=	-I${.CURDIR}/../../efi/include
-CFLAGS+=	-I${.CURDIR}/../../efi/include/${MACHINE_CPUARCH}
-CFLAGS+=	-I${.CURDIR}/../../..
-CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand
-
-.if ${MK_FORTH} != "no"
-BOOT_FORTH=	yes
-CFLAGS+=	-DBOOT_FORTH
-CFLAGS+=	-I${.CURDIR}/../../ficl
-CFLAGS+=	-I${.CURDIR}/../../ficl/${MACHINE_CPUARCH}
-.endif
-
-.PATH: ${.CURDIR}/../../common
-.include "${.CURDIR}/../../common/Makefile.inc"
-
-CFLAGS+=	-I${.CURDIR}/../../common
-
-FILES+=		loader.help
-CLEANFILES+=	loader.help
-loader.help: help.common
-	cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk \
-	    > ${.TARGET}
-
-.PATH: ${.CURDIR}/../../forth
-FILES+=		loader.4th support.4th loader.conf
-FILES+=		screen.4th frames.4th
-FILES+=		beastie.4th brand.4th check-password.4th color.4th delay.4th
-FILES+=		menu.4th menu-commands.4th menusets.4th shortcuts.4th version.4th
-.if !exists(${DESTDIR}/boot/loader.rc)
-FILES+=		loader.rc
-.endif
-.if !exists(${DESTDIR}/boot/menu.rc)
-FILES+=		menu.rc
-.endif
-FILESDIR_loader.conf= /boot/defaults
-
-.include <bsd.lib.mk>
diff --git a/sys/boot/ia64/common/bootinfo.c b/sys/boot/ia64/common/bootinfo.c
deleted file mode 100644
index 04e8ba25c329..000000000000
--- a/sys/boot/ia64/common/bootinfo.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*-
- * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
- * Copyright (c) 2006 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stand.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/reboot.h>
-#include <sys/linker.h>
-#include <sys/boot.h>
-
-#include <efi.h>
-#include <efilib.h>
-
-#include "libia64.h"
-
-static const char howto_switches[] = "aCdrgDmphsv";
-static int howto_masks[] = {
-	RB_ASKNAME, RB_CDROM, RB_KDB, RB_DFLTROOT, RB_GDB, RB_MULTIPLE,
-	RB_MUTE, RB_PAUSE, RB_SERIAL, RB_SINGLE, RB_VERBOSE
-};
-
-int
-bi_getboothowto(char *kargs)
-{
-	const char *sw;
-	char *opts;
-	int howto, i;
-
-	howto = 0;
-
-	/* Get the boot options from the environment first. */
-	for (i = 0; howto_names[i].ev != NULL; i++) {
-		if (getenv(howto_names[i].ev) != NULL)
-			howto |= howto_names[i].mask;
-	}
-
-	/* Parse kargs */
-	if (kargs == NULL)
-		return (howto);
-
-	opts = strchr(kargs, '-');
-	while (opts != NULL) {
-		while (*(++opts) != '\0') {
-			sw = strchr(howto_switches, *opts);
-			if (sw == NULL)
-				break;
-			howto |= howto_masks[sw - howto_switches];
-		}
-		opts = strchr(opts, '-');
-	}
-
-	return (howto);
-}
-
-/*
- * Copy the environment into the load area starting at (addr).
- * Each variable is formatted as <name>=<value>, with a single nul
- * separating each variable, and a double nul terminating the environment.
- */
-vm_offset_t
-bi_copyenv(vm_offset_t start)
-{
-	struct env_var *ep;
-	vm_offset_t addr, last;
-	size_t len;
-
-	addr = last = start;
-
-	/* Traverse the environment. */
-	for (ep = environ; ep != NULL; ep = ep->ev_next) {
-		len = strlen(ep->ev_name);
-		if (ia64_copyin(ep->ev_name, addr, len) != len)
-			break;
-		addr += len;
-		if (ia64_copyin("=", addr, 1) != 1)
-			break;
-		addr++;
-		if (ep->ev_value != NULL) {
-			len = strlen(ep->ev_value);
-			if (ia64_copyin(ep->ev_value, addr, len) != len)
-				break;
-			addr += len;
-		}
-		if (ia64_copyin("", addr, 1) != 1)
-			break;
-		last = ++addr;
-	}
-
-	if (ia64_copyin("", last++, 1) != 1)
-		last = start;
-	return(last);
-}
-
-/*
- * Copy module-related data into the load area, where it can be
- * used as a directory for loaded modules.
- *
- * Module data is presented in a self-describing format.  Each datum
- * is preceded by a 32-bit identifier and a 32-bit size field.
- *
- * Currently, the following data are saved:
- *
- * MOD_NAME	(variable)		module name (string)
- * MOD_TYPE	(variable)		module type (string)
- * MOD_ARGS	(variable)		module parameters (string)
- * MOD_ADDR	sizeof(vm_offset_t)	module load address
- * MOD_SIZE	sizeof(size_t)		module size
- * MOD_METADATA	(variable)		type-specific metadata
- */
-#define COPY32(v, a) {				\
-    u_int32_t	x = (v);			\
-    ia64_copyin(&x, a, sizeof(x));		\
-    a += sizeof(x);				\
-}
-
-#define MOD_STR(t, a, s) {			\
-    COPY32(t, a);				\
-    COPY32(strlen(s) + 1, a);			\
-    ia64_copyin(s, a, strlen(s) + 1);		\
-    a += roundup(strlen(s) + 1, sizeof(u_int64_t));\
-}
-
-#define MOD_NAME(a, s)	MOD_STR(MODINFO_NAME, a, s)
-#define MOD_TYPE(a, s)	MOD_STR(MODINFO_TYPE, a, s)
-#define MOD_ARGS(a, s)	MOD_STR(MODINFO_ARGS, a, s)
-
-#define MOD_VAR(t, a, s) {			\
-    COPY32(t, a);				\
-    COPY32(sizeof(s), a);			\
-    ia64_copyin(&s, a, sizeof(s));		\
-    a += roundup(sizeof(s), sizeof(u_int64_t));	\
-}
-
-#define MOD_ADDR(a, s)	MOD_VAR(MODINFO_ADDR, a, s)
-#define MOD_SIZE(a, s)	MOD_VAR(MODINFO_SIZE, a, s)
-
-#define MOD_METADATA(a, mm) {			\
-    COPY32(MODINFO_METADATA | mm->md_type, a);	\
-    COPY32(mm->md_size, a);			\
-    ia64_copyin(mm->md_data, a, mm->md_size);	\
-    a += roundup(mm->md_size, sizeof(u_int64_t));\
-}
-
-#define MOD_END(a) {				\
-    COPY32(MODINFO_END, a);			\
-    COPY32(0, a);				\
-}
-
-vm_offset_t
-bi_copymodules(vm_offset_t addr)
-{
-	struct preloaded_file *fp;
-	struct file_metadata *md;
-
-	/* Start with the first module on the list, should be the kernel. */
-	for (fp = file_findfile(NULL, NULL); fp != NULL; fp = fp->f_next) {
-		/* The name field must come first. */
-		MOD_NAME(addr, fp->f_name);
-		MOD_TYPE(addr, fp->f_type);
-		if (fp->f_args)
-			MOD_ARGS(addr, fp->f_args);
-		MOD_ADDR(addr, fp->f_addr);
-		MOD_SIZE(addr, fp->f_size);
-		for (md = fp->f_metadata; md != NULL; md = md->md_next) {
-			if (!(md->md_type & MODINFOMD_NOCOPY))
-				MOD_METADATA(addr, md);
-		}
-	}
-	MOD_END(addr);
-	return(addr);
-}
-
-/*
- * Load the information expected by the kernel.
- *
- * - The kernel environment is copied into kernel space.
- * - Module metadata are formatted and placed in kernel space.
- */
-int
-ia64_bootinfo(struct preloaded_file *fp, struct bootinfo **res)
-{
-	struct bootinfo bi;
-	struct preloaded_file *xp;
-	struct file_metadata *md;
-	struct devdesc *rootdev;
-	char *rootdevname;
-	vm_offset_t addr, ssym, esym;
-	int error;
-
-	*res = NULL;
-	bzero(&bi, sizeof(struct bootinfo));
-	bi.bi_magic = BOOTINFO_MAGIC;
-	bi.bi_version = 1;
-	bi.bi_boothowto = bi_getboothowto(fp->f_args);
-
-	/* 
-	 * Allow the environment variable 'rootdev' to override the supplied
-	 * device. This should perhaps go to MI code and/or have $rootdev
-	 * tested/set by MI code before launching the kernel.
-	 */
-	rootdevname = getenv("rootdev");
-	ia64_getdev((void**)&rootdev, rootdevname, NULL);
-	if (rootdev != NULL) {
-		/* Try reading /etc/fstab to select the root device. */
-		getrootmount(ia64_fmtdev(rootdev));
-		free(rootdev);
-	}
-
-	md = file_findmetadata(fp, MODINFOMD_SSYM);
-	ssym = (md != NULL) ? *((vm_offset_t *)&(md->md_data)) : 0;
-	md = file_findmetadata(fp, MODINFOMD_ESYM);
-	esym = (md != NULL) ? *((vm_offset_t *)&(md->md_data)) : 0;
-	if (ssym != 0 && esym != 0) {
-		bi.bi_symtab = ssym;
-		bi.bi_esymtab = esym;
-	}
-
-	/* Find the last module in the chain. */
-	addr = 0;
-	for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) {
-		if (addr < (xp->f_addr + xp->f_size))
-			addr = xp->f_addr + xp->f_size;
-	}
-
-	addr = (addr + 15) & ~15;
-
-	/* Copy module list and metadata. */
-	bi.bi_modulep = addr;
-	addr = bi_copymodules(addr);
-	if (addr <= bi.bi_modulep) {
-		addr = bi.bi_modulep;
-		bi.bi_modulep = 0;
-	}
-
-	addr = (addr + 15) & ~15;
-
-	/* Copy our environment. */
-	bi.bi_envp = addr;
-	addr = bi_copyenv(addr);
-	if (addr <= bi.bi_envp) {
-		addr = bi.bi_envp;
-		bi.bi_envp = 0;
-	}
-
-	addr = (addr + 15) & ~15;
-	bi.bi_kernend = addr;
-
-	error = ia64_platform_bootinfo(&bi, res);
-	if (error)
-		return (error);
-
-	if (IS_LEGACY_KERNEL()) {
-		if (*res == NULL)
-			return (EDOOFUS);
-
-		bcopy(&bi, *res, sizeof(bi));
-		return (0);
-	}
-
-	bi.bi_pbvm_pgtbl = (uintptr_t)ia64_pgtbl;
-	bi.bi_pbvm_pgtblsz = ia64_pgtblsz;
-	ia64_copyin((void *)bi.bi_memmap, addr, bi.bi_memmap_size);
-	bi.bi_memmap = addr;
-	addr = (addr + bi.bi_memmap_size + 15) & ~15;
-	bi.bi_kernend = addr + sizeof(bi);	
-	ia64_copyin(&bi, addr, sizeof(bi));
-	*res = (void *)addr;
-	return (0);
-}
diff --git a/sys/boot/ia64/common/copy.c b/sys/boot/ia64/common/copy.c
deleted file mode 100644
index b14386ebf4f6..000000000000
--- a/sys/boot/ia64/common/copy.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*-
- * Copyright (c) 2006 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stand.h>
-#include <machine/param.h>
-#include <machine/pte.h>
-
-#include "libia64.h"
-
-u_int ia64_legacy_kernel;
-
-uint64_t *ia64_pgtbl;
-uint32_t ia64_pgtblsz;
-
-static int
-pgtbl_extend(u_int idx)
-{
-	vm_paddr_t pa;
-	uint64_t *pgtbl;
-	uint32_t pgtblsz;
-	u_int pot;
-
-	pgtblsz = (idx + 1) << 3;
-
-	/* The minimum size is 4KB. */
-	if (pgtblsz < 4096)
-		pgtblsz = 4096;
-
-	/* Find the next higher power of 2. */
-	pgtblsz--;
-	for (pot = 1; pot < 32; pot <<= 1)
-		pgtblsz = pgtblsz | (pgtblsz >> pot);
-	pgtblsz++;
-
-	/* The maximum size is 1MB. */
-	if (pgtblsz > 1048576)
-		return (ENOMEM);
-
-	/* Make sure the size is a valid (mappable) page size. */
-	if (pgtblsz == 32*1024 || pgtblsz == 128*1024 || pgtblsz == 512*1024)
-		pgtblsz <<= 1;
-
-	/* Allocate naturally aligned memory. */
-	pa = ia64_platform_alloc(0, pgtblsz);
-	if (pa == ~0UL)
-		return (ENOMEM);
-	pgtbl = (void *)pa;
-
-	/* Initialize new page table. */
-	if (ia64_pgtbl != NULL && ia64_pgtbl != pgtbl)
-		bcopy(ia64_pgtbl, pgtbl, ia64_pgtblsz);
-	bzero(pgtbl + (ia64_pgtblsz >> 3), pgtblsz - ia64_pgtblsz);
-
-	if (ia64_pgtbl != NULL && ia64_pgtbl != pgtbl)
-		ia64_platform_free(0, (uintptr_t)ia64_pgtbl, ia64_pgtblsz);
-
-	ia64_pgtbl = pgtbl;
-	ia64_pgtblsz = pgtblsz;
-	return (0);
-}
-
-void *
-ia64_va2pa(vm_offset_t va, size_t *len)
-{
-	uint64_t pa, pte;
-	u_int idx, ofs;
-	int error;
-
-	/* Backward compatibility. */
-	if (va >= IA64_RR_BASE(7)) {
-		ia64_legacy_kernel = 1;
-		pa = IA64_RR_MASK(va);
-		return ((void *)pa);
-	}
-
-	if (va < IA64_PBVM_BASE) {
-		error = EINVAL;
-		goto fail;
-	}
-
-	ia64_legacy_kernel = 0;
-
-	idx = (va - IA64_PBVM_BASE) >> IA64_PBVM_PAGE_SHIFT;
-	if (idx >= (ia64_pgtblsz >> 3)) {
-		error = pgtbl_extend(idx);
-		if (error)
-			goto fail;
-	}
-
-	ofs = va & IA64_PBVM_PAGE_MASK;
-	pte = ia64_pgtbl[idx];
-	if ((pte & PTE_PRESENT) == 0) {
-		pa = ia64_platform_alloc(va - ofs, IA64_PBVM_PAGE_SIZE);
-		if (pa == ~0UL) {
-			error = ENOMEM;
-			goto fail;
-		}
-		pte = PTE_AR_RWX | PTE_DIRTY | PTE_ACCESSED | PTE_PRESENT;
-		pte |= (pa & PTE_PPN_MASK);
-		ia64_pgtbl[idx] = pte;
-	}
-	pa = (pte & PTE_PPN_MASK) + ofs;
-
-	/* We can not cross page boundaries (in general). */
-	if (*len + ofs > IA64_PBVM_PAGE_SIZE)
-		*len = IA64_PBVM_PAGE_SIZE - ofs;
-
-	return ((void *)pa);
-
- fail:
-	*len = 0;
-	return (NULL);
-}
-
-ssize_t
-ia64_copyin(const void *src, vm_offset_t va, size_t len)
-{
-	void *pa;
-	ssize_t res;
-	size_t sz;
-
-	res = 0;
-	while (len > 0) {
-		sz = len;
-		pa = ia64_va2pa(va, &sz);
-		if (sz == 0)
-			break;
-		bcopy(src, pa, sz);
-		len -= sz;
-		res += sz;
-		va += sz;
-	}
-	return (res);
-}
-
-ssize_t
-ia64_copyout(vm_offset_t va, void *dst, size_t len)
-{
-	void *pa;
-	ssize_t res;
-	size_t sz;
-
-	res = 0;
-	while (len > 0) {
-		sz = len;
-		pa = ia64_va2pa(va, &sz);
-		if (sz == 0)
-			break;
-		bcopy(pa, dst, sz);
-		len -= sz;
-		res += sz;
-		va += sz;
-	}
-	return (res);
-}
-
-uint64_t
-ia64_loadaddr(u_int type, void *data, uint64_t addr)
-{
-	uint64_t align;
-
-	/*
-	 * Align ELF objects at PBVM page boundaries.  Align all other
-	 * objects at cache line boundaries for good measure.
-	 */
-	align = (type == LOAD_ELF) ? IA64_PBVM_PAGE_SIZE : CACHE_LINE_SIZE;
-	return ((addr + align - 1) & ~(align - 1));
-}
-
-ssize_t
-ia64_readin(int fd, vm_offset_t va, size_t len)
-{
-	void *pa;
-	ssize_t res, s;
-	size_t sz;
-
-	res = 0;
-	while (len > 0) {
-		sz = len;
-		pa = ia64_va2pa(va, &sz);
-		if (sz == 0)
-			break;
-		s = read(fd, pa, sz);
-		if (s <= 0)
-			break;
-		len -= s;
-		res += s;
-		va += s;
-	}
-	return (res);
-}
diff --git a/sys/boot/ia64/common/devicename.c b/sys/boot/ia64/common/devicename.c
deleted file mode 100644
index 08d9b54c531b..000000000000
--- a/sys/boot/ia64/common/devicename.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*-
- * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
- * Copyright (c) 2006 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stand.h>
-#include <string.h>
-#include <sys/disklabel.h>
-#include "bootstrap.h"
-
-#include <efi.h>
-#include <efilib.h>
-
-static int ia64_parsedev(struct devdesc **, const char *, const char **);
-
-/* 
- * Point (dev) at an allocated device specifier for the device matching the
- * path in (devspec). If it contains an explicit device specification,
- * use that.  If not, use the default device.
- */
-int
-ia64_getdev(void **vdev, const char *devspec, const char **path)
-{
-	struct devdesc **dev = (struct devdesc **)vdev;
-	int rv;
-
-	/*
-	 * If it looks like this is just a path and no device, then
-	 * use the current device instead.
-	 */
-	if (devspec == NULL || *devspec == '/' || !strchr(devspec, ':')) {
-		rv = ia64_parsedev(dev, getenv("currdev"), NULL);
-		if (rv == 0 && path != NULL)
-			*path = devspec;
-		return (rv);
-	}
-
-	/* Parse the device name off the beginning of the devspec. */
-	return (ia64_parsedev(dev, devspec, path));
-}
-
-/*
- * Point (dev) at an allocated device specifier matching the string version
- * at the beginning of (devspec).  Return a pointer to the remaining
- * text in (path).
- *
- * In all cases, the beginning of (devspec) is compared to the names
- * of known devices in the device switch, and then any following text
- * is parsed according to the rules applied to the device type.
- *
- * For disk-type devices, the syntax is:
- *
- * fs<unit>:
- */
-static int
-ia64_parsedev(struct devdesc **dev, const char *devspec, const char **path)
-{
-	struct devdesc *idev;
-	struct devsw *dv;
-	char *cp;
-	const char *np;
-	int i, err;
-
-	/* minimum length check */
-	if (strlen(devspec) < 2)
-		return (EINVAL);
-
-	/* look for a device that matches */
-	for (i = 0; devsw[i] != NULL; i++) {
-		dv = devsw[i];
-		if (!strncmp(devspec, dv->dv_name, strlen(dv->dv_name)))
-			break;
-	}
-	if (devsw[i] == NULL)
-		return (ENOENT);
-
-	idev = malloc(sizeof(struct devdesc));
-	if (idev == NULL)
-		return (ENOMEM);
-
-	idev->d_dev = dv;
-	idev->d_type = dv->dv_type;
-	idev->d_unit = -1;
-
-	err = 0;
-	np = devspec + strlen(dv->dv_name);
-	if (*np != '\0' && *np != ':') {
-		idev->d_unit = strtol(np, &cp, 0);
-		if (cp == np) {
-			idev->d_unit = -1;
-			free(idev);
-			return (EUNIT);
-		}
-	}
-	if (*cp != '\0' && *cp != ':') {
-		free(idev);
-		return (EINVAL);
-	}
-
-	if (path != NULL)
-		*path = (*cp == 0) ? cp : cp + 1;
-	if (dev != NULL)
-		*dev = idev;
-	else
-		free(idev);
-	return (0);
-}
-
-char *
-ia64_fmtdev(void *vdev)
-{
-	struct devdesc *dev = (struct devdesc *)vdev;
-	static char buf[32];	/* XXX device length constant? */
-
-	switch(dev->d_type) {
-	case DEVT_NONE:
-		strcpy(buf, "(no device)");
-		break;
-
-	default:
-		sprintf(buf, "%s%d:", dev->d_dev->dv_name, dev->d_unit);
-		break;
-	}
-
-	return(buf);
-}
-
-/*
- * Set currdev to suit the value being supplied in (value)
- */
-int
-ia64_setcurrdev(struct env_var *ev, int flags, const void *value)
-{
-	struct devdesc *ncurr;
-	int rv;
-
-	rv = ia64_parsedev(&ncurr, value, NULL);
-	if (rv != 0)
-		return(rv);
-
-	free(ncurr);
-	env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL);
-	return (0);
-}
diff --git a/sys/boot/ia64/common/exec.c b/sys/boot/ia64/common/exec.c
deleted file mode 100644
index b721f97b43af..000000000000
--- a/sys/boot/ia64/common/exec.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*-
- * Copyright (c) 2006 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stand.h>
-#include <string.h>
-
-#include <sys/param.h>
-#include <sys/linker.h>
-#include <machine/elf.h>
-#include <machine/ia64_cpu.h>
-#include <machine/pte.h>
-
-#include <efi.h>
-#include <efilib.h>
-
-#include "libia64.h"
-
-static u_int itr_idx = 0;
-static u_int dtr_idx = 0;
-
-static vm_offset_t ia64_text_start;
-static size_t ia64_text_size;
-
-static vm_offset_t ia64_data_start;
-static size_t ia64_data_size;
-
-static int elf64_exec(struct preloaded_file *amp);
-static int elf64_obj_exec(struct preloaded_file *amp);
-
-static struct file_format ia64_elf = {
-	elf64_loadfile,
-	elf64_exec
-};
-static struct file_format ia64_elf_obj = {
-	elf64_obj_loadfile,
-	elf64_obj_exec
-};
-
-struct file_format *file_formats[] = {
-	&ia64_elf,
-	&ia64_elf_obj,
-	NULL
-};
-
-static u_int
-sz2shft(vm_offset_t ofs, vm_size_t sz)
-{
-	vm_size_t s;
-	u_int shft;
-
-	shft = 12;	/* Start with 4K */
-	s = 1 << shft;
-	while (s <= sz) {
-		shft++;
-		s <<= 1;
-	}
-	do {
-		shft--;
-		s >>= 1;
-	} while (ofs & (s - 1));
-
-	return (shft);
-}
-
-/*
- * Entered with psr.ic and psr.i both zero.
- */
-static void
-enter_kernel(uint64_t start, struct bootinfo *bi)
-{
-
-	__asm __volatile("srlz.i;;");
-	__asm __volatile("mov cr.ipsr=%0"
-			 :: "r"(IA64_PSR_IC
-				| IA64_PSR_DT
-				| IA64_PSR_RT
-				| IA64_PSR_IT
-				| IA64_PSR_BN));
-	__asm __volatile("mov cr.iip=%0" :: "r"(start));
-	__asm __volatile("mov cr.ifs=r0;;");
-	__asm __volatile("mov ar.rsc=0;; flushrs;;");
-	__asm __volatile("mov r8=%0" :: "r" (bi));
-	__asm __volatile("rfi;;");
-
-	/* NOTREACHED */
-}
-
-static u_int
-mmu_wire(vm_offset_t va, vm_paddr_t pa, u_int pgshft, u_int acc)
-{
-	pt_entry_t pte;
-
-	/* Round up to the smallest possible page size. */
-	if (pgshft < 12)
-		pgshft = 12;
-	/* Truncate to the largest possible page size (256MB). */
-	if (pgshft > 28)
-		pgshft = 28;
-	/* Round down to a valid (mappable) page size. */
-	if (pgshft > 14 && (pgshft & 1) != 0)
-		pgshft--;
-
-	pte = PTE_PRESENT | PTE_MA_WB | PTE_ACCESSED | PTE_DIRTY |
-	    PTE_PL_KERN | (acc & PTE_AR_MASK) | (pa & PTE_PPN_MASK);
-
-	__asm __volatile("mov cr.ifa=%0" :: "r"(va));
-	__asm __volatile("mov cr.itir=%0" :: "r"(pgshft << 2));
-	__asm __volatile("srlz.d;;");
-
-	__asm __volatile("ptr.d %0,%1" :: "r"(va), "r"(pgshft << 2));
-	__asm __volatile("srlz.d;;");
-	__asm __volatile("itr.d dtr[%0]=%1" :: "r"(dtr_idx), "r"(pte));
-	__asm __volatile("srlz.d;;");
-	dtr_idx++;
-
-	if (acc == PTE_AR_RWX || acc == PTE_AR_RX) {
-		__asm __volatile("ptr.i %0,%1;;" :: "r"(va), "r"(pgshft << 2));
-		__asm __volatile("srlz.i;;");
-		__asm __volatile("itr.i itr[%0]=%1;;" :: "r"(itr_idx), "r"(pte));
-		__asm __volatile("srlz.i;;");
-		itr_idx++;
-	}
-
-	return (pgshft);
-}
-
-static void
-mmu_setup_legacy(uint64_t entry)
-{
-
-	/*
-	 * Region 6 is direct mapped UC and region 7 is direct mapped
-	 * WC. The details of this is controlled by the Alt {I,D}TLB
-	 * 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) | (28 << 2));
-	ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (28 << 2));
-	__asm __volatile("srlz.i;;");
-
-	mmu_wire(entry, IA64_RR_MASK(entry), 28, PTE_AR_RWX);
-}
-
-static void
-mmu_setup_paged(struct bootinfo *bi)
-{
-	void *pa;
-	size_t sz;
-	u_int shft;
-
-	ia64_set_rr(IA64_RR_BASE(IA64_PBVM_RR),
-	    (IA64_PBVM_RR << 8) | (IA64_PBVM_PAGE_SHIFT << 2));
-	__asm __volatile("srlz.i;;");
-
-	/* Wire the PBVM page table. */
-	mmu_wire(IA64_PBVM_PGTBL, (uintptr_t)ia64_pgtbl,
-	    sz2shft(IA64_PBVM_PGTBL, ia64_pgtblsz), PTE_AR_RW);
-
-	/* Wire as much of the text segment as we can. */
-	sz = ia64_text_size;	/* XXX */
-	pa = ia64_va2pa(ia64_text_start, &ia64_text_size);
-	ia64_text_size = sz;	/* XXX */
-	shft = sz2shft(ia64_text_start, ia64_text_size);
-	shft = mmu_wire(ia64_text_start, (uintptr_t)pa, shft, PTE_AR_RWX);
-	ia64_copyin(&shft, (uintptr_t)&bi->bi_text_mapped, 4);
-
-	/* Wire as much of the data segment as well. */
-	sz = ia64_data_size;	/* XXX */
-	pa = ia64_va2pa(ia64_data_start, &ia64_data_size);
-	ia64_data_size = sz;	/* XXX */
-	shft = sz2shft(ia64_data_start, ia64_data_size);
-	shft = mmu_wire(ia64_data_start, (uintptr_t)pa, shft, PTE_AR_RW);
-	ia64_copyin(&shft, (uintptr_t)&bi->bi_data_mapped, 4);
-
-	/* Update the bootinfo with the number of TRs used. */
-	ia64_copyin(&itr_idx, (uintptr_t)&bi->bi_itr_used, 4);
-	ia64_copyin(&dtr_idx, (uintptr_t)&bi->bi_dtr_used, 4);
-}
-
-static int
-elf64_exec(struct preloaded_file *fp)
-{
-	struct bootinfo *bi;
-	struct file_metadata *md;
-	Elf_Ehdr *hdr;
-	int error;
-
-	md = file_findmetadata(fp, MODINFOMD_ELFHDR);
-	if (md == NULL)
-		return (EINVAL);
-
-	error = ia64_bootinfo(fp, &bi);
-	if (error)
-		return (error);
-
-	hdr = (Elf_Ehdr *)&(md->md_data);
-	printf("Entering %s at 0x%lx...\n", fp->f_name, hdr->e_entry);
-
-	error = ia64_platform_enter(fp->f_name);
-	if (error)
-		return (error);
-
-	__asm __volatile("rsm psr.ic|psr.i;;");
-	__asm __volatile("srlz.i;;");
-
-	if (IS_LEGACY_KERNEL())
-		mmu_setup_legacy(hdr->e_entry);
-	else
-		mmu_setup_paged(bi);
-
-	enter_kernel(hdr->e_entry, bi);
-	/* NOTREACHED */
-	return (EDOOFUS);
-}
-
-static int
-elf64_obj_exec(struct preloaded_file *fp)
-{
-
-	printf("%s called for preloaded file %p (=%s):\n", __func__, fp,
-	    fp->f_name);
-	return (ENOSYS);
-}
-
-void
-ia64_loadseg(Elf_Ehdr *eh, Elf_Phdr *ph, uint64_t delta)
-{
-
-	if (eh->e_type != ET_EXEC)
-		return;
-
-	if (ph->p_flags & PF_X) {
-		ia64_text_start = ph->p_vaddr + delta;
-		ia64_text_size = ph->p_memsz;
-
-		ia64_sync_icache(ia64_text_start, ia64_text_size);
-	} else {
-		ia64_data_start = ph->p_vaddr + delta;
-		ia64_data_size = ph->p_memsz;
-	}
-}
-
diff --git a/sys/boot/ia64/common/icache.c b/sys/boot/ia64/common/icache.c
deleted file mode 100644
index 77a35d705b76..000000000000
--- a/sys/boot/ia64/common/icache.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 2011 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stand.h>
-#include <machine/ia64_cpu.h>
-
-#include "libia64.h"
-
-void
-ia64_sync_icache(vm_offset_t va, size_t sz)
-{
-	uintptr_t pa;
-	size_t cnt, max;
-
-	while (sz > 0) {
-		max = sz;
-		pa = (uintptr_t)ia64_va2pa(va, &max);
-		for (cnt = 0; cnt < max; cnt += 32)
-			ia64_fc_i(pa + cnt);
-		ia64_sync_i();
-		va += max;
-		sz -= max;
-	}
-	ia64_srlz_i();
-}
diff --git a/sys/boot/ia64/common/libia64.h b/sys/boot/ia64/common/libia64.h
deleted file mode 100644
index 4bc76384dc34..000000000000
--- a/sys/boot/ia64/common/libia64.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 2006 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 _LIBIA64_H_
-#define	_LIBIA64_H_
-
-#include <bootstrap.h>
-#include <ia64/include/bootinfo.h>
-#include <machine/vmparam.h>
-
-#define	IS_LEGACY_KERNEL()	(ia64_legacy_kernel)
-
-/*
- * Portability functions provided by the loader
- * implementation specific to the platform.
- */
-vm_paddr_t ia64_platform_alloc(vm_offset_t, vm_size_t);
-void ia64_platform_free(vm_offset_t, vm_paddr_t, vm_size_t);
-int ia64_platform_bootinfo(struct bootinfo *, struct bootinfo **);
-int ia64_platform_enter(const char *);
-
-/*
- * Functions and variables provided by the ia64 common code
- * and shared by all loader implementations.
- */
-extern u_int ia64_legacy_kernel;
-
-extern uint64_t *ia64_pgtbl;
-extern uint32_t ia64_pgtblsz;
-
-int ia64_autoload(void);
-int ia64_bootinfo(struct preloaded_file *, struct bootinfo **);
-uint64_t ia64_loadaddr(u_int, void *, uint64_t);
-#ifdef __elfN
-void ia64_loadseg(Elf_Ehdr *, Elf_Phdr *, uint64_t);
-#else
-void ia64_loadseg(void *, void *, uint64_t);
-#endif
-
-ssize_t ia64_copyin(const void *, vm_offset_t, size_t);
-ssize_t ia64_copyout(vm_offset_t, void *, size_t);
-void ia64_sync_icache(vm_offset_t, size_t);
-ssize_t ia64_readin(int, vm_offset_t, size_t);
-void *ia64_va2pa(vm_offset_t, size_t *);
-
-char *ia64_fmtdev(struct devdesc *);
-int ia64_getdev(void **, const char *, const char **);
-int ia64_setcurrdev(struct env_var *, int, const void *);
-
-#endif /* !_LIBIA64_H_ */
diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile
deleted file mode 100644
index fc11d6e8d657..000000000000
--- a/sys/boot/ia64/efi/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $FreeBSD$
-
-MAN=
-
-.include <src.opts.mk>
-MK_SSP=		no
-
-PROG=		loader.sym
-INTERNALPROG=
-SRCS=		conf.c efimd.c main.c pal.S start.S vers.c
-
-.PATH: ${.CURDIR}/../../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH}
-
-CFLAGS+=	-I${.CURDIR}/../common
-CFLAGS+=	-I${.CURDIR}/../../common
-CFLAGS+=	-I${.CURDIR}/../../efi/include
-CFLAGS+=	-I${.CURDIR}/../../efi/include/${MACHINE_CPUARCH}
-CFLAGS+=	-I${.CURDIR}/../../..
-CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand
-
-LDSCRIPT=	${.CURDIR}/ldscript.${MACHINE_CPUARCH}
-LDFLAGS=	-Wl,-T${LDSCRIPT} -shared -symbolic
-
-${PROG}: ${LDSCRIPT}
-
-NEWVERSWHAT=	"EFI boot" ${MACHINE_CPUARCH}
-
-vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
-	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
-
-OBJCOPY?=	objcopy
-OBJDUMP?=	objdump
-
-FILES=		loader.efi
-FILESMODE_loader.efi= ${BINMODE}
-
-loader.efi: loader.sym
-	if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
-		${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \
-		rm ${.ALLSRC}; \
-		exit 1; \
-	fi
-	${OBJCOPY} -j .data -j .dynamic -j .dynstr -j .dynsym -j .hash \
-	    -j .rela.dyn -j .reloc -j .sdata -j .text \
-	    --target=efi-app-${MACHINE_CPUARCH} ${.ALLSRC} ${.TARGET}
-
-CLEANFILES=	vers.c loader.efi
-
-LIBIA64=	${.OBJDIR}/../common/libia64.a
-LIBEFI=		${.OBJDIR}/../../efi/libefi/libefi.a
-.if ${MK_FORTH} != "no"
-LIBFICL=        ${.OBJDIR}/../../ficl/libficl.a
-.endif
-
-DPADD=		${LIBIA64} ${LIBFICL} ${LIBEFI} ${LIBSTAND}
-LDADD=		-Wl,--whole-archive ${LIBIA64} -Wl,--no-whole-archive \
-		    ${LIBFICL} ${LIBEFI} -lstand
-
-.include <bsd.prog.mk>
diff --git a/sys/boot/ia64/efi/conf.c b/sys/boot/ia64/efi/conf.c
deleted file mode 100644
index 0e0d12995672..000000000000
--- a/sys/boot/ia64/efi/conf.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 1997
- *	Matthias Drochner.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project
- *	by Matthias Drochner.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stand.h>
-#include <efi.h>
-#include <efilib.h>
-
-/*
- * We could use linker sets for some or all of these, but
- * then we would have to control what ended up linked into
- * the bootstrap.  So it's easier to conditionalise things
- * here.
- *
- * XXX rename these arrays to be consistent and less namespace-hostile
- */
-
-/* Exported for libstand */
-struct devsw *devsw[] = {
-	&efipart_dev,
-	&efinet_dev,
-	NULL
-};
-
-struct fs_ops *file_system[] = {
-	&dosfs_fsops,
-	&ufs_fsops,
-	&cd9660_fsops,
-	&nfs_fsops,
-	&gzipfs_fsops,
-	NULL
-};
-
-struct netif_driver *netif_drivers[] = {
-	&efinetif,
-	NULL
-};
-
-/* 
- * Consoles 
- *
- * We don't prototype these in efiboot.h because they require
- * data structures from bootstrap.h as well.
- */
-extern struct console efi_console;
-
-struct console *consoles[] = {
-	&efi_console,
-	NULL
-};
diff --git a/sys/boot/ia64/efi/efimd.c b/sys/boot/ia64/efi/efimd.c
deleted file mode 100644
index 0b29e1280ce0..000000000000
--- a/sys/boot/ia64/efi/efimd.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/*-
- * Copyright (c) 2004, 2006 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stand.h>
-
-#include <efi.h>
-#include <efilib.h>
-
-#include <libia64.h>
-
-#define EFI_INTEL_FPSWA		\
-    {0xc41b6531,0x97b9,0x11d3,{0x9a,0x29,0x00,0x90,0x27,0x3f,0xc1,0x4d}}
-
-static EFI_GUID fpswa_guid = EFI_INTEL_FPSWA;
-
-/* DIG64 Headless Console & Debug Port Table. */
-#define	HCDP_TABLE_GUID		\
-    {0xf951938d,0x620b,0x42ef,{0x82,0x79,0xa8,0x4b,0x79,0x61,0x78,0x98}}
-
-static EFI_GUID hcdp_guid = HCDP_TABLE_GUID;
-
-static EFI_MEMORY_DESCRIPTOR *memmap;
-static UINTN memmapsz;
-static UINTN mapkey;
-static UINTN descsz;
-static UINT32 descver;
-
-#define	IA64_EFI_CHUNK_SIZE	(32 * 1048576)
-static vm_paddr_t ia64_efi_chunk;
-
-#define	IA64_EFI_PGTBLSZ_MAX	1048576
-static vm_paddr_t ia64_efi_pgtbl;
-static vm_size_t ia64_efi_pgtblsz;
-
-/* Don't allocate memory below the boundary */
-#define	IA64_EFI_ALLOC_BOUNDARY	1048576
-
-static int
-ia64_efi_memmap_update(void)
-{
-	EFI_STATUS status;
-
-	if (memmap != NULL) {
-		free(memmap);
-		memmap = NULL;
-	}
-
-	memmapsz = 0;
-	BS->GetMemoryMap(&memmapsz, NULL, &mapkey, &descsz, &descver);
-	if (memmapsz == 0)
-		return (FALSE);
-	memmap = malloc(memmapsz);
-	if (memmap == NULL)
-		return (FALSE);
-
-	status = BS->GetMemoryMap(&memmapsz, memmap, &mapkey, &descsz,
-	    &descver);
-	if (EFI_ERROR(status)) {
-		free(memmap);
-		memmap = NULL;
-		return (FALSE);
-	}
-
-	return (TRUE);
-}
-
-/*
- * Returns 0 on failure. Successful allocations return an address
- * larger or equal to IA64_EFI_ALLOC_BOUNDARY.
- */
-static vm_paddr_t
-ia64_efi_alloc(vm_size_t sz)
-{
-	EFI_PHYSICAL_ADDRESS pa;
-	EFI_MEMORY_DESCRIPTOR *mm;
-	uint8_t *mmiter, *mmiterend;
-	vm_size_t memsz;
-	UINTN npgs;
-	EFI_STATUS status;
-
-	/* We can't allocate less than a page */
-	if (sz < EFI_PAGE_SIZE)
-		return (0);
-
-	/* The size must be a power of 2. */
-	if (sz & (sz - 1))
-		return (0);
-
-	if (!ia64_efi_memmap_update())
-		return (0);
-
-	mmiter = (void *)memmap;
-	mmiterend = mmiter + memmapsz;
-	for (; mmiter < mmiterend; mmiter += descsz) {
-		mm = (void *)mmiter;
-		if (mm->Type != EfiConventionalMemory)
-			continue;
-		memsz = mm->NumberOfPages * EFI_PAGE_SIZE;
-		if (mm->PhysicalStart + memsz <= IA64_EFI_ALLOC_BOUNDARY)
-			continue;
-		/*
-		 * XXX We really should make sure the memory is local to the
-		 * BSP.
-		 */
-		pa = (mm->PhysicalStart < IA64_EFI_ALLOC_BOUNDARY) ?
-		    IA64_EFI_ALLOC_BOUNDARY : mm->PhysicalStart;
-		pa  = (pa + sz - 1) & ~(sz - 1);
-		if (pa + sz > mm->PhysicalStart + memsz)
-			continue;
-
-		npgs = EFI_SIZE_TO_PAGES(sz);
-		status = BS->AllocatePages(AllocateAddress, EfiLoaderData,
-		    npgs, &pa);
-		if (!EFI_ERROR(status))
-			return (pa);
-	}
-
-	printf("%s: unable to allocate %lx bytes\n", __func__, sz);
-	return (0);
-}
-
-vm_paddr_t
-ia64_platform_alloc(vm_offset_t va, vm_size_t sz)
-{
-	vm_paddr_t pa;
-
-	if (va == 0) {
-		/* Page table itself. */
-		if (sz > IA64_EFI_PGTBLSZ_MAX)
-			return (~0UL);
-		if (ia64_efi_pgtbl == 0)
-			ia64_efi_pgtbl = ia64_efi_alloc(IA64_EFI_PGTBLSZ_MAX);
-		if (ia64_efi_pgtbl != 0)
-			ia64_efi_pgtblsz = sz;
-		return (ia64_efi_pgtbl);
-	} else if (va < IA64_PBVM_BASE) {
-		/* Should not happen. */
-		return (~0UL);
-	}
-
-	/* Loader virtual memory page. */
-	va -= IA64_PBVM_BASE;
-
-	/* Allocate a big chunk that can be wired with a single PTE. */
-	if (ia64_efi_chunk == 0)
-		ia64_efi_chunk = ia64_efi_alloc(IA64_EFI_CHUNK_SIZE);
-	if (va < IA64_EFI_CHUNK_SIZE)
-		return (ia64_efi_chunk + va);
-
-	/* Allocate a page at a time when we go beyond the chunk. */
-	pa = ia64_efi_alloc(sz);
-	return ((pa == 0) ? ~0UL : pa);
-}
-
-void
-ia64_platform_free(vm_offset_t va, vm_paddr_t pa, vm_size_t sz)
-{
-
-	BS->FreePages(pa, sz >> EFI_PAGE_SHIFT);
-}
-
-int
-ia64_platform_bootinfo(struct bootinfo *bi, struct bootinfo **res)
-{
-	VOID *fpswa;
-	EFI_HANDLE handle;
-	EFI_STATUS status;
-	UINTN sz;
-
-	bi->bi_systab = (uint64_t)ST;
-	bi->bi_hcdp = (uint64_t)efi_get_table(&hcdp_guid);
-
-	sz = sizeof(EFI_HANDLE);
-	status = BS->LocateHandle(ByProtocol, &fpswa_guid, 0, &sz, &handle);
-	if (status == 0)
-		status = BS->HandleProtocol(handle, &fpswa_guid, &fpswa);
-	bi->bi_fpswa = (status == 0) ? (uint64_t)fpswa : 0;
-
-	if (!ia64_efi_memmap_update())
-		return (ENOMEM);
-
-	bi->bi_memmap = (uint64_t)memmap;
-	bi->bi_memmap_size = memmapsz;
-	bi->bi_memdesc_size = descsz;
-	bi->bi_memdesc_version = descver;
-
-	if (IS_LEGACY_KERNEL())
-		*res = malloc(sizeof(**res));
-
-	return (0);
-}
-
-int
-ia64_platform_enter(const char *kernel)
-{
-	EFI_STATUS status;
-
-	status = BS->ExitBootServices(IH, mapkey);
-	if (EFI_ERROR(status)) {
-		printf("%s: ExitBootServices() returned 0x%lx\n", __func__,
-		    (long)status);
-		return (EINVAL);
-	}
-
-	return (0);
-}
-
-COMMAND_SET(pbvm, "pbvm", "show PBVM details", command_pbvm);
-
-static int
-command_pbvm(int argc, char *argv[])
-{
-	uint64_t limit, pg, start;
-	u_int idx;
-
-	printf("Page table @ %p, size %x\n", ia64_pgtbl, ia64_pgtblsz);
-
-	if (ia64_pgtbl == NULL)
-		return (0);
-
-	limit = ~0;
-	start = ~0;
-	idx = 0;
-	while (ia64_pgtbl[idx] != 0) {
-		pg = ia64_pgtbl[idx];
-		if (pg != limit) {	
-			if (start != ~0)
-				printf("%#lx-%#lx\n", start, limit);
-			start = pg;
-		}
-		limit = pg + IA64_PBVM_PAGE_SIZE;
-		idx++;
-	}
-	if (start != ~0)
-		printf("%#lx-%#lx\n", start, limit);
-
-	return (0);
-}
diff --git a/sys/boot/ia64/efi/ldscript.ia64 b/sys/boot/ia64/efi/ldscript.ia64
deleted file mode 100644
index 0d7901fe75a5..000000000000
--- a/sys/boot/ia64/efi/ldscript.ia64
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $FreeBSD$ */
-OUTPUT_FORMAT("elf64-ia64-freebsd", "elf64-ia64-freebsd", "elf64-ia64-freebsd")
-OUTPUT_ARCH(ia64)
-ENTRY(_start_plabel)
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = 0;
-  ImageBase = .;
-  . = SIZEOF_HEADERS;
-  . = ALIGN(4096);
-  .text		: {
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    /* .gnu.warning sections are handled specially by elf32.em. */
-    *(.gnu.warning)
-    *(.plt)
-  } =0x00300000010070000002000001000400
-  . = ALIGN(4096);
-  __start_set_Xcommand_set = .;
-  set_Xcommand_set      : { *(set_Xcommand_set) }
-  __stop_set_Xcommand_set = .;
-  .data		: {
-    *(.rodata .rodata.* .gnu.linkonce.r.*)
-    *(.rodata1)
-    *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
-    *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
-    *(.opd)
-    *(.data .data.* .gnu.linkonce.d.*)
-    *(.data1)
-    *(.plabel)
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-  }
-  .IA_64.unwind_info	: { *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) }
-  .IA_64.unwind	: { *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) }
-  . = ALIGN(4096);
-  __gp = .;
-  .sdata	: {
-    *(.got.plt .got)
-    *(.IA_64.pltoff)
-    *(.sdata .sdata.* .gnu.linkonce.s.*)
-    *(dynsbss)
-    *(.sbss .sbss.* .gnu.linkonce.sb.*)
-    *(.scommon)
-  }
-  . = ALIGN(4096);
-  .dynamic	: { *(.dynamic) }
-  . = ALIGN(4096);
-  .rela.dyn	: {
-    *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
-    *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
-    *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
-    *(.rela.got)
-    *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*)
-    *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*)
-    *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*)
-    *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*)
-    *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
-    *(.rela.plt)
-    *(.rela.IA_64.pltoff)
-    *(.relaset_*)
-    *(.rela.dyn .rela.dyn.*)
-  }
-  . = ALIGN(4096);
-  .reloc	: { *(.reloc) }
-  . = ALIGN(4096);
-  .hash		: { *(.hash) }
-  . = ALIGN(4096);
-  .dynsym	: { *(.dynsym) }
-  . = ALIGN(4096);
-  .dynstr	: { *(.dynstr) }
-}
diff --git a/sys/boot/ia64/efi/main.c b/sys/boot/ia64/efi/main.c
deleted file mode 100644
index ec12b4266a07..000000000000
--- a/sys/boot/ia64/efi/main.c
+++ /dev/null
@@ -1,618 +0,0 @@
-/*-
- * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
- * Copyright (c) 1998,2000 Doug Rabson <dfr@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 <stand.h>
-#include <string.h>
-#include <setjmp.h>
-#include <machine/sal.h>
-#include <machine/pal.h>
-#include <machine/pte.h>
-#include <machine/dig64.h>
-
-#include <efi.h>
-#include <efilib.h>
-
-#include <libia64.h>
-
-/* DIG64 Headless Console & Debug Port Table. */
-#define	HCDP_TABLE_GUID		\
-    {0xf951938d,0x620b,0x42ef,{0x82,0x79,0xa8,0x4b,0x79,0x61,0x78,0x98}}
- 
-extern char bootprog_name[];
-extern char bootprog_rev[];
-extern char bootprog_date[];
-extern char bootprog_maker[];
-
-struct arch_switch archsw;	/* MI/MD interface boundary */
-
-extern u_int64_t	ia64_pal_entry;
-
-EFI_GUID acpi = ACPI_TABLE_GUID;
-EFI_GUID acpi20 = ACPI_20_TABLE_GUID;
-EFI_GUID devid = DEVICE_PATH_PROTOCOL;
-EFI_GUID hcdp = HCDP_TABLE_GUID;
-EFI_GUID imgid = LOADED_IMAGE_PROTOCOL;
-EFI_GUID mps = MPS_TABLE_GUID;
-EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL;
-EFI_GUID sal = SAL_SYSTEM_TABLE_GUID;
-EFI_GUID smbios = SMBIOS_TABLE_GUID;
-
-static void
-find_pal_proc(void)
-{
-	int i;
-	struct sal_system_table *saltab = 0;
-	static int sizes[6] = {
-		48, 32, 16, 32, 16, 16
-	};
-	u_int8_t *p;
-
-	saltab = efi_get_table(&sal);
-	if (saltab == NULL) {
-		printf("Can't find SAL System Table\n");
-		return;
-	}
-
-	if (memcmp(saltab->sal_signature, "SST_", 4)) {
-		printf("Bad signature for SAL System Table\n");
-		return;
-	}
-
-	p = (u_int8_t *) (saltab + 1);
-	for (i = 0; i < saltab->sal_entry_count; i++) {
-		if (*p == 0) {
-			struct sal_entrypoint_descriptor *dp;
-			dp = (struct sal_entrypoint_descriptor *) p;
-			ia64_pal_entry = dp->sale_pal_proc;
-			return;
-		}
-		p += sizes[*p];
-	}
-
-	printf("Can't find PAL proc\n");
-	return;
-}
-
-static int
-usc2cmp(CHAR16 *s1, CHAR16 *s2)
-{
-
-	while (*s1 == *s2++) {
-		if (*s1++ == 0)
-			return (0);
-	}
-	return (*s1 - *(s2 - 1));
-}
-
-static char *
-get_dev_option(int argc, CHAR16 *argv[])
-{
-	static char dev[32];
-	CHAR16 *arg;
-	char *devp;
-	int i, j;
-
-	devp = NULL;
-	for (i = 0; i < argc; i++) {
-		if (usc2cmp(argv[i], L"-dev") == 0 && i < argc - 1) {
-			arg = argv[i + 1];
-			j = 0;
-			while (j < sizeof(dev) && *arg != 0)
-				dev[j++] = *arg++;
-			if (j == sizeof(dev))
-				j--;
-			dev[j] = '\0';
-			devp = dev;
-			break;
-		}
-	}
-
-	return (devp);
-}
-
-EFI_STATUS
-main(int argc, CHAR16 *argv[])
-{
-	struct devdesc currdev;
-	EFI_LOADED_IMAGE *img;
-	char *dev;
-	int i;
-
-	/* 
-	 * XXX Chicken-and-egg problem; we want to have console output
-	 * early, but some console attributes may depend on reading from
-	 * eg. the boot device, which we can't do yet.  We can use
-	 * printf() etc. once this is done.
-	 */
-	cons_probe();
-
-	printf("\n%s, Revision %s\n", bootprog_name, bootprog_rev);
-
-	find_pal_proc();
-
-	/*
-	 * March through the device switch probing for things.
-	 */
-	for (i = 0; devsw[i] != NULL; i++)
-		if (devsw[i]->dv_init != NULL)
-			(devsw[i]->dv_init)();
-
-	/*
-	 * Disable the watchdog timer. By default the boot manager sets
-	 * the timer to 5 minutes before invoking a boot option. If we
-	 * want to return to the boot manager, we have to disable the
-	 * watchdog timer and since we're an interactive program, we don't
-	 * want to wait until the user types "quit". The timer may have
-	 * fired by then. We don't care if this fails. It does not prevent
-	 * normal functioning in any way...
-	 */
-	BS->SetWatchdogTimer(0, 0, 0, NULL);
-
-	/* Get our loaded image protocol interface structure. */
-	BS->HandleProtocol(IH, &imgid, (VOID**)&img);
-
-	bzero(&currdev, sizeof(currdev));
-	efi_handle_lookup(img->DeviceHandle, &currdev.d_dev, &currdev.d_unit);
-	currdev.d_type = currdev.d_dev->dv_type;
-
-	env_setenv("loaddev", EV_VOLATILE, ia64_fmtdev(&currdev), env_noset,
-	    env_nounset);
-
-	dev = get_dev_option(argc, argv);
-	if (dev == NULL)
-		dev = ia64_fmtdev(&currdev);
-
-	env_setenv("currdev", EV_VOLATILE, dev, ia64_setcurrdev, env_nounset);
-
-	setenv("LINES", "24", 1);	/* optional */
-
-	archsw.arch_autoload = ia64_autoload;
-	archsw.arch_copyin = ia64_copyin;
-	archsw.arch_copyout = ia64_copyout;
-	archsw.arch_getdev = ia64_getdev;
-	archsw.arch_loadaddr = ia64_loadaddr;
-	archsw.arch_loadseg = ia64_loadseg;
-	archsw.arch_readin = ia64_readin;
-
-	interact();			/* doesn't return */
-
-	return (EFI_SUCCESS);		/* keep compiler happy */
-}
-
-COMMAND_SET(quit, "quit", "exit the loader", command_quit);
-
-static int
-command_quit(int argc, char *argv[])
-{
-	exit(0);
-	/* NOTREACHED */
-	return (CMD_OK);
-}
-
-COMMAND_SET(reboot, "reboot", "reboot the system", command_reboot);
- 
-static int
-command_reboot(int argc, char *argv[])
-{
-
-	RS->ResetSystem(EfiResetWarm, EFI_SUCCESS, 0, NULL);
-	/* NOTREACHED */
-	return (CMD_OK);
-}
-
-COMMAND_SET(memmap, "memmap", "print memory map", command_memmap);
-
-static int
-command_memmap(int argc, char *argv[])
-{
-	UINTN sz;
-	EFI_MEMORY_DESCRIPTOR *map, *p;
-	UINTN key, dsz;
-	UINT32 dver;
-	EFI_STATUS status;
-	int i, ndesc;
-	static char *types[] = {
-	    "Reserved",
-	    "LoaderCode",
-	    "LoaderData",
-	    "BootServicesCode",
-	    "BootServicesData",
-	    "RuntimeServicesCode",
-	    "RuntimeServicesData",
-	    "ConventionalMemory",
-	    "UnusableMemory",
-	    "ACPIReclaimMemory",
-	    "ACPIMemoryNVS",
-	    "MemoryMappedIO",
-	    "MemoryMappedIOPortSpace",
-	    "PalCode"
-	};
-
-	sz = 0;
-	status = BS->GetMemoryMap(&sz, 0, &key, &dsz, &dver);
-	if (status != EFI_BUFFER_TOO_SMALL) {
-		printf("Can't determine memory map size\n");
-		return CMD_ERROR;
-	}
-	map = malloc(sz);
-	status = BS->GetMemoryMap(&sz, map, &key, &dsz, &dver);
-	if (EFI_ERROR(status)) {
-		printf("Can't read memory map\n");
-		return CMD_ERROR;
-	}
-
-	ndesc = sz / dsz;
-	printf("%23s %12s %12s %8s %4s\n",
-	       "Type", "Physical", "Virtual", "#Pages", "Attr");
-	       
-	for (i = 0, p = map; i < ndesc;
-	     i++, p = NextMemoryDescriptor(p, dsz)) {
-	    printf("%23s %012lx %012lx %08lx ",
-		   types[p->Type],
-		   p->PhysicalStart,
-		   p->VirtualStart,
-		   p->NumberOfPages);
-	    if (p->Attribute & EFI_MEMORY_UC)
-		printf("UC ");
-	    if (p->Attribute & EFI_MEMORY_WC)
-		printf("WC ");
-	    if (p->Attribute & EFI_MEMORY_WT)
-		printf("WT ");
-	    if (p->Attribute & EFI_MEMORY_WB)
-		printf("WB ");
-	    if (p->Attribute & EFI_MEMORY_UCE)
-		printf("UCE ");
-	    if (p->Attribute & EFI_MEMORY_WP)
-		printf("WP ");
-	    if (p->Attribute & EFI_MEMORY_RP)
-		printf("RP ");
-	    if (p->Attribute & EFI_MEMORY_XP)
-		printf("XP ");
-	    if (p->Attribute & EFI_MEMORY_RUNTIME)
-		printf("RUNTIME");
-	    printf("\n");
-	}
-
-	return CMD_OK;
-}
-
-COMMAND_SET(configuration, "configuration",
-	    "print configuration tables", command_configuration);
-
-static const char *
-guid_to_string(EFI_GUID *guid)
-{
-	static char buf[40];
-
-	sprintf(buf, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-	    guid->Data1, guid->Data2, guid->Data3, guid->Data4[0],
-	    guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4],
-	    guid->Data4[5], guid->Data4[6], guid->Data4[7]);
-	return (buf);
-}
-
-static int
-command_configuration(int argc, char *argv[])
-{
-	int i;
-
-	printf("NumberOfTableEntries=%ld\n", ST->NumberOfTableEntries);
-	for (i = 0; i < ST->NumberOfTableEntries; i++) {
-		EFI_GUID *guid;
-
-		printf("  ");
-		guid = &ST->ConfigurationTable[i].VendorGuid;
-		if (!memcmp(guid, &mps, sizeof(EFI_GUID)))
-			printf("MPS Table");
-		else if (!memcmp(guid, &acpi, sizeof(EFI_GUID)))
-			printf("ACPI Table");
-		else if (!memcmp(guid, &acpi20, sizeof(EFI_GUID)))
-			printf("ACPI 2.0 Table");
-		else if (!memcmp(guid, &smbios, sizeof(EFI_GUID)))
-			printf("SMBIOS Table");
-		else if (!memcmp(guid, &sal, sizeof(EFI_GUID)))
-			printf("SAL System Table");
-		else if (!memcmp(guid, &hcdp, sizeof(EFI_GUID)))
-			printf("DIG64 HCDP Table");
-		else
-			printf("Unknown Table (%s)", guid_to_string(guid));
-		printf(" at %p\n", ST->ConfigurationTable[i].VendorTable);
-	}
-
-	return CMD_OK;
-}    
-
-COMMAND_SET(sal, "sal", "print SAL System Table", command_sal);
-
-static int
-command_sal(int argc, char *argv[])
-{
-	int i;
-	struct sal_system_table *saltab = 0;
-	static int sizes[6] = {
-		48, 32, 16, 32, 16, 16
-	};
-	u_int8_t *p;
-
-	saltab = efi_get_table(&sal);
-	if (saltab == NULL) {
-		printf("Can't find SAL System Table\n");
-		return CMD_ERROR;
-	}
-
-	if (memcmp(saltab->sal_signature, "SST_", 4)) {
-		printf("Bad signature for SAL System Table\n");
-		return CMD_ERROR;
-	}
-
-	printf("SAL Revision %x.%02x\n",
-	       saltab->sal_rev[1],
-	       saltab->sal_rev[0]);
-	printf("SAL A Version %x.%02x\n",
-	       saltab->sal_a_version[1],
-	       saltab->sal_a_version[0]);
-	printf("SAL B Version %x.%02x\n",
-	       saltab->sal_b_version[1],
-	       saltab->sal_b_version[0]);
-
-	p = (u_int8_t *) (saltab + 1);
-	for (i = 0; i < saltab->sal_entry_count; i++) {
-		printf("  Desc %d", *p);
-		if (*p == 0) {
-			struct sal_entrypoint_descriptor *dp;
-			dp = (struct sal_entrypoint_descriptor *) p;
-			printf("\n");
-			printf("    PAL Proc at 0x%lx\n",
-			       dp->sale_pal_proc);
-			printf("    SAL Proc at 0x%lx\n",
-			       dp->sale_sal_proc);
-			printf("    SAL GP at 0x%lx\n",
-			       dp->sale_sal_gp);
-		} else if (*p == 1) {
-			struct sal_memory_descriptor *dp;
-			dp = (struct sal_memory_descriptor *) p;
-			printf(" Type %d.%d, ",
-			       dp->sale_memory_type[0],
-			       dp->sale_memory_type[1]);
-			printf("Address 0x%lx, ",
-			       dp->sale_physical_address);
-			printf("Length 0x%x\n",
-			       dp->sale_length);
-		} else if (*p == 5) {
-			struct sal_ap_wakeup_descriptor *dp;
-			dp = (struct sal_ap_wakeup_descriptor *) p;
-			printf("\n");
-			printf("    Mechanism %d\n", dp->sale_mechanism);
-			printf("    Vector 0x%lx\n", dp->sale_vector);
-		} else
-			printf("\n");
-
-		p += sizes[*p];
-	}
-
-	return CMD_OK;
-}
-
-int
-print_trs(int type)
-{
-	struct ia64_pal_result res;
-	int i, maxtr;
-	struct {
-		pt_entry_t	pte;
-		uint64_t	itir;
-		uint64_t	ifa;
-		struct ia64_rr	rr;
-	} buf;
-	static const char *psnames[] = {
-		"1B",	"2B",	"4B",	"8B",
-		"16B",	"32B",	"64B",	"128B",
-		"256B",	"512B",	"1K",	"2K",
-		"4K",	"8K",	"16K",	"32K",
-		"64K",	"128K",	"256K",	"512K",
-		"1M",	"2M",	"4M",	"8M",
-		"16M",	"32M",	"64M",	"128M",
-		"256M",	"512M",	"1G",	"2G"
-	};
-	static const char *manames[] = {
-		"WB",	"bad",	"bad",	"bad",
-		"UC",	"UCE",	"WC",	"NaT",
-	};
-
-	res = ia64_call_pal_static(PAL_VM_SUMMARY, 0, 0, 0);
-	if (res.pal_status != 0) {
-		printf("Can't get VM summary\n");
-		return CMD_ERROR;
-	}
-
-	if (type == 0)
-		maxtr = (res.pal_result[0] >> 40) & 0xff;
-	else
-		maxtr = (res.pal_result[0] >> 32) & 0xff;
-
-	printf("%d translation registers\n", maxtr);
-
-	pager_open();
-	pager_output("TR# RID    Virtual Page  Physical Page PgSz ED AR PL D A MA  P KEY\n");
-	for (i = 0; i <= maxtr; i++) {
-		char lbuf[128];
-
-		bzero(&buf, sizeof(buf));
-		res = ia64_call_pal_stacked(PAL_VM_TR_READ, i, type,
-					    (u_int64_t) &buf);
-		if (res.pal_status != 0)
-			break;
-
-		/* Only display valid translations */
-		if ((buf.ifa & 1) == 0)
-			continue;
-
-		if (!(res.pal_result[0] & 1))
-			buf.pte &= ~PTE_AR_MASK;
-		if (!(res.pal_result[0] & 2))
-			buf.pte &= ~PTE_PL_MASK;
-		if (!(res.pal_result[0] & 4))
-			buf.pte &= ~PTE_DIRTY;
-		if (!(res.pal_result[0] & 8))
-			buf.pte &= ~PTE_MA_MASK;
-		sprintf(lbuf, "%03d %06x %013lx %013lx %4s %d  %d  %d  %d %d "
-		    "%-3s %d %06x\n", i, buf.rr.rr_rid, buf.ifa >> 12,
-		    (buf.pte & PTE_PPN_MASK) >> 12,
-		    psnames[(buf.itir & ITIR_PS_MASK) >> 2],
-		    (buf.pte & PTE_ED) ? 1 : 0,
-		    (int)(buf.pte & PTE_AR_MASK) >> 9,
-		    (int)(buf.pte & PTE_PL_MASK) >> 7,
-		    (buf.pte & PTE_DIRTY) ? 1 : 0,
-		    (buf.pte & PTE_ACCESSED) ? 1 : 0,
-		    manames[(buf.pte & PTE_MA_MASK) >> 2],
-		    (buf.pte & PTE_PRESENT) ? 1 : 0,
-		    (int)((buf.itir & ITIR_KEY_MASK) >> 8));
-		pager_output(lbuf);
-	}
-	pager_close();
-
-	if (res.pal_status != 0) {
-		printf("Error while getting TR contents\n");
-		return CMD_ERROR;
-	}
-	return CMD_OK;
-}
-
-COMMAND_SET(itr, "itr", "print instruction TRs", command_itr);
-
-static int
-command_itr(int argc, char *argv[])
-{
-	return print_trs(0);
-}
-
-COMMAND_SET(dtr, "dtr", "print data TRs", command_dtr);
-
-static int
-command_dtr(int argc, char *argv[])
-{
-	return print_trs(1);
-}
-
-COMMAND_SET(hcdp, "hcdp", "Dump HCDP info", command_hcdp);
-
-static char *
-hcdp_string(char *s, u_int len)
-{
-	static char buffer[256];
-
-	memcpy(buffer, s, len);
-	buffer[len] = 0;
-	return (buffer);
-}
-	
-static int
-command_hcdp(int argc, char *argv[])
-{
-	struct dig64_hcdp_table *tbl;
-	struct dig64_hcdp_entry *ent;
-	struct dig64_gas *gas;
-	int i;
-
-	tbl = efi_get_table(&hcdp);
-	if (tbl == NULL) {
-		printf("No HCDP table present\n");
-		return (CMD_OK);
-	}
-	if (memcmp(tbl->signature, HCDP_SIGNATURE, sizeof(tbl->signature))) {
-		printf("HCDP table has invalid signature\n");
-		return (CMD_OK);
-	}
-	if (tbl->length < sizeof(*tbl) - sizeof(*tbl->entry)) {
-		printf("HCDP table too short\n");
-		return (CMD_OK);
-	}
-	printf("HCDP table at 0x%016lx\n", (u_long)tbl);
-	printf("Signature  = %s\n", hcdp_string(tbl->signature, 4));
-	printf("Length     = %u\n", tbl->length);
-	printf("Revision   = %u\n", tbl->revision);
-	printf("Checksum   = %u\n", tbl->checksum);
-	printf("OEM Id     = %s\n", hcdp_string(tbl->oem_id, 6));
-	printf("Table Id   = %s\n", hcdp_string(tbl->oem_tbl_id, 8));
-	printf("OEM rev    = %u\n", tbl->oem_rev);
-	printf("Creator Id = %s\n", hcdp_string(tbl->creator_id, 4));
-	printf("Creator rev= %u\n", tbl->creator_rev);
-	printf("Entries    = %u\n", tbl->entries);
-	for (i = 0; i < tbl->entries; i++) {
-		ent = tbl->entry + i;
-		printf("Entry #%d:\n", i + 1);
-		printf("    Type      = %u\n", ent->type);
-		printf("    Databits  = %u\n", ent->databits);
-		printf("    Parity    = %u\n", ent->parity);
-		printf("    Stopbits  = %u\n", ent->stopbits);
-		printf("    PCI seg   = %u\n", ent->pci_segment);
-		printf("    PCI bus   = %u\n", ent->pci_bus);
-		printf("    PCI dev   = %u\n", ent->pci_device);
-		printf("    PCI func  = %u\n", ent->pci_function);
-		printf("    Interrupt = %u\n", ent->interrupt);
-		printf("    PCI flag  = %u\n", ent->pci_flag);
-		printf("    Baudrate  = %lu\n",
-		    ((u_long)ent->baud_high << 32) + (u_long)ent->baud_low);
-		gas = &ent->address;
-		printf("    Addr space= %u\n", gas->addr_space);
-		printf("    Bit width = %u\n", gas->bit_width);
-		printf("    Bit offset= %u\n", gas->bit_offset);
-		printf("    Address   = 0x%016lx\n",
-		    ((u_long)gas->addr_high << 32) + (u_long)gas->addr_low);
-		printf("    PCI type  = %u\n", ent->pci_devid);
-		printf("    PCI vndr  = %u\n", ent->pci_vendor);
-		printf("    IRQ       = %u\n", ent->irq);
-		printf("    PClock    = %u\n", ent->pclock);
-		printf("    PCI iface = %u\n", ent->pci_interface);
-	}
-	printf("<EOT>\n");
-	return (CMD_OK);
-}
-
-COMMAND_SET(about, "about", "about the loader", command_about);
-
-extern uint64_t _start_plabel[];
-
-static int
-command_about(int argc, char *argv[])
-{
-	EFI_LOADED_IMAGE *img;
-
-	printf("%s\n", bootprog_name);
-	printf("revision %s\n", bootprog_rev);
-	printf("built by %s\n", bootprog_maker);
-	printf("built on %s\n", bootprog_date);
-
-	printf("\n");
-
-	BS->HandleProtocol(IH, &imgid, (VOID**)&img);
-	printf("image loaded at %p\n", img->ImageBase);
-	printf("entry at %#lx (%#lx)\n", _start_plabel[0], _start_plabel[1]);
-}
diff --git a/sys/boot/ia64/efi/start.S b/sys/boot/ia64/efi/start.S
deleted file mode 100644
index 9d28a968993c..000000000000
--- a/sys/boot/ia64/efi/start.S
+++ /dev/null
@@ -1,290 +0,0 @@
-/*-
- * Copyright (c) 2001 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$
- */
-
-	.text
-
-#include <machine/asm.h>
-
-#define EFI_SUCCESS		0
-#define EFI_LOAD_ERROR		1
-#define EFI_BUFFER_TOO_SMALL	5
-
-#define DT_NULL		0	/* Terminating entry. */
-#define DT_PLTRELSZ	2	/* Total size in bytes of PLT relocations. */
-#define DT_SYMTAB	6	/* Address of symbol table. */
-#define DT_RELA		7	/* Address of ElfNN_Rela relocations. */
-#define DT_RELASZ	8	/* Total size of ElfNN_Rela relocations. */
-#define DT_RELAENT	9	/* Size of each ElfNN_Rela relocation entry. */
-#define DT_SYMENT	11	/* Size of each symbol table entry. */
-#define DT_JMPREL	23	/* Address of PLT relocations. */
-
-#define R_IA_64_NONE		0	/* None */
-#define R_IA_64_DIR64LSB	0x27	/* word64 LSB	S + A */
-#define R_IA_64_FPTR64LSB	0x47	/* word64 LSB	@fptr(S + A) */
-#define R_IA_64_REL32LSB	0x6d	/* word32 LSB	BD + A */
-#define R_IA_64_REL64LSB	0x6f	/* word64 LSB	BD + A */
-#define	R_IA_64_IPLTLSB		0x81	/* function descriptor LSB speciaal */
-
-ENTRY(_start, 2)
-	alloc	loc0=ar.pfs,2,3,3,0
-	mov	loc1=rp
-	movl	loc2=@gprel(ImageBase)
-	;;
-	add	loc2=gp,loc2
-	;;
-	mov	out0=loc2
-	mov	out1=in1
-	;;
-	br.call.sptk.few rp=_reloc	// relocate image
-	
-	cmp.ne	p6,p0=EFI_SUCCESS,r8	// did it work?
-(p6)	br.cond.dpnt.few 9f
-
-	mov	out0=in0		// image_handle
-	mov	out1=in1		// system_table
-	br.call.sptk.few rp=efi_main
-9:
-	mov	ar.pfs=loc0
-	mov	rp=loc1
-	;;
-	br.ret.sptk.few rp
-END(_start)
-
-	// PLABEL for PE32+
-	.section .plabel, "a"
-	.align	16
-	.global _start_plabel
-_start_plabel:
-	data16	@iplt(_start)
-	.previous
-
-	// A PE32+ relocation entry for the plabel
-	.section .reloc, "a"
-	data4	_start_plabel
-	data4	12
-	data2	(10 << 12) + 0
-	data2	(10 << 12) + 8
-	.previous
-
-// in0:	image base
-// in1:	system table
-//
-// XXX Assumes PLT relocations are of type Elf_Rela
-//
-// r2 = address of fptr_storage
-// r3 = address of fptr_storage_end
-// r4 = address of first free fptr
-//
-// r15 = r_offset
-// r16 = r_info		-OR-	d_tag
-// r17 = r_addend	-OR-	d_val (=d_ptr)
-// r18 = address of .rela dynamic section
-// r19 = size of .rela section
-// r20 = size of .rela element (Elf_Rela)
-// r21 = address of first PLT relocation
-// r22 = size of PLT relocations
-// r23 = relocation type
-// r24 = address of symbol
-// r28 = R_IA_64_IPLTLSB
-// f8 = address of symbol table
-// f9 = size of symtab element
-
-STATIC_ENTRY(_reloc, 2)
-	alloc	loc0=ar.pfs,2,2,0,0
-	;;
-	mov	loc1=rp
-	movl	r29=@gprel(_DYNAMIC)	// find _DYNAMIC etc.
-	;;
-	add	r15=r29,gp
-	movl	r29=@gprel(fptr_storage)
-	;;
-	add	r2=r29,gp
-	movl	r29=@gprel(fptr_storage_end)
-	;;
-	add	r3=r29,gp
-	mov	r4=r2
-	mov	r19=0
-	mov	r22=0
-	mov	r20=24
-	mov	r28=R_IA_64_IPLTLSB
-	;;
-1:
-	ld8	r16=[r15],8		// read r15->d_tag
-	;;
-	ld8	r17=[r15],8		// and r15->d_val
-	;;
-	cmp.eq	p6,p0=DT_NULL,r16	// done?
-(p6)	br.cond.dpnt.few 2f
-	;;
-	cmp.eq	p6,p0=DT_RELA,r16	// rela section?
-	;;
-(p6)	add	r18=r17,in0
-	cmp.eq	p6,p0=DT_RELASZ,r16	// rela section size?
-	;;
-(p6)	mov	r19=r17
-	cmp.eq	p6,p0=DT_RELAENT,r16	// rela entry size?
-	;;
-(p6)	mov	r20=r17
-	cmp.eq	p6,p0=DT_JMPREL,r16	// PLT relocs?
-	;;
-(p6)	add	r21=r17,in0
-	cmp.eq	p6,p0=DT_PLTRELSZ,r16	// PLT relocs size?
-	;;
-(p6)	mov	r22=r17
-	cmp.eq	p6,p0=DT_SYMTAB,r16	// symbol table?
-	;;
-(p6)	add	r29=r17,in0
-	;;
-(p6)	setf.sig f8=r29
-	cmp.eq	p6,p0=DT_SYMENT,r16	// symbol entry size?
-	;;
-(p6)	setf.sig f9=r17
-	br.dptk	1b
-
-2:
-	cmp.lt	p6,p0=0,r19
-(p6)	br.cond.dptk	3f
-	;;
-	mov	r19=r22
-	mov	r18=r21
-	mov	r21=0
-	mov	r22=0
-	;;
-	cmp.lt	p6,p0=0,r19
-(p6)	br.cond.dptk	3f
-	;;
-	mov	r8=EFI_SUCCESS
-	br.dptk	9f
-3:
-	ld8	r29=[r18],8		// read r_offset
-	;;
-	ld8	r16=[r18],8		// read r_info
-	add	r15=r29,in0		// relocate r_offset
-	;;
-	ld8	r17=[r18],8		// read r_addend
-	sub	r19=r19,r20		// update relasz
-	extr.u	r23=r16,0,32		// ELF64_R_TYPE(r16)
-	;;
-	cmp.eq	p6,p0=R_IA_64_NONE,r23
-(p6)	br.cond.dpnt.few 2b
-	;;
-	cmp.eq	p6,p0=R_IA_64_REL32LSB,r23
-(p6)	br.cond.dptk.few 3f
-	;;
-	cmp.eq	p6,p0=R_IA_64_REL64LSB,r23
-(p6)	br.cond.dptk.few 4f
-	;;
-	extr.u	r29=r16,32,32		// ELF64_R_SYM(r16)
-	;;
-	setf.sig f10=r29		// so we can multiply
-	;;
-	xma.lu	f10=f10,f9,f8		// f10=symtab + r_sym*syment
-	;;
-	getf.sig r29=f10
-	;;
-	add	r29=8,r29		// address of st_value
-	;;
-	ld8	r29=[r29]		// read symbol value
-	;;
-	add	r24=r29,in0		// relocate symbol value
-	;;
-	cmp.eq	p6,p0=R_IA_64_DIR64LSB,r23
-(p6)	br.cond.dptk.few 5f
-	;;
-	cmp.eq	p6,p0=R_IA_64_FPTR64LSB,r23
-(p6)	br.cond.dptk.few 6f
-	;;
-	cmp.ne	p6,p0=r28,r23		// IPLTLSB
-(p6)	br.cond.dptk.few 2b
-
-	// IPLTLSB
-	add	r29=r24,r17		// S + A
-	;;
-	st8	[r15]=r29,8		// fdesc:FP
-	;;
-	st8	[r15]=gp		// fdesc:GP
-	br.cond.sptk.few 2b
-
-	// REL32LSB
-3:
-	add	r29=in0,r17
-	;;
-	st4	[r15]=r29
-	br.cond.sptk.few 2b
-
-	// REL64LSB
-4:
-	add	r29=in0,r17		// BD + A
-	;;
-	st8	[r15]=r29		// word64
-	br.cond.sptk.few 2b
-
-	// DIR64LSB
-5:
-	add	r29=r24,r17		// S + A
-	;;
-	st8	[r15]=r29		// word64
-	br.cond.sptk.few 2b
-
-6:
-	mov	r29=r2			// FPTR64LSB
-	;;
-7:
-	cmp.geu	p6,p0=r29,r4		// end of fptrs?
-(p6)	br.cond.dpnt.few 8f		// can't find existing fptr
-	ld8	r17=[r29]		// read function from fptr
-	;;
-	cmp.eq	p6,p0=r24,r17		// same function?
-	;;
-(p6)	st8	[r15]=r29		// reuse fptr
-(p6)	br.cond.sptk.few 2b		// done
-	add	r29=16,r29		// next fptr
-	br.sptk.few 7b
-8:
-	mov	r8=EFI_BUFFER_TOO_SMALL	// failure return value
-	cmp.geu	p6,p0=r4,r3		// space left?
-(p6)	br.cond.dpnt.few 9f		// bail out
-	st8	[r15]=r4		// install fptr
-	;;
-	st8	[r4]=r24,8		// write fptr address
-	;;
-	st8	[r4]=gp,8		// write fptr gp
-	br.cond.sptk.few 2b
-
-9:
-	mov	ar.pfs=loc0
-	mov	rp=loc1
-	;;
-	br.ret.sptk.few rp
-END(_reloc)
-
-	.data
-	.align	16
-fptr_storage:
-	.space	1024*16			// XXX
-fptr_storage_end:
diff --git a/sys/boot/ia64/efi/version b/sys/boot/ia64/efi/version
deleted file mode 100644
index 4f4203a7a050..000000000000
--- a/sys/boot/ia64/efi/version
+++ /dev/null
@@ -1,27 +0,0 @@
-$FreeBSD$
-
-NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
-file is important.  Make sure the current version number is on line 6.
-
-3.2:	Various fixes to libstand, in particular dosfs.
-3.1:	Add the about, reboot and pbvm commands.
-	I-cache coherency is maintained.
-3.0:	Add support for PBVM.
-2.2:	Create direct mapping based on start address instead of mapping
-	first 256M.
-2.1:	Add support for "-dev <part>" argument parsing.
-2.0:	Provide devices based on the block I/O protocol, rather than the
-	simple file services protocol. Use the FreeBSD file system code
-	on top of those devices to access files.
-1.2:	Restructured. Has some user visible differences.
-1.1:	Pass the HCDP table address to the kernel via bootinfo if one
-	is present in the EFI system table.
-1.0:	Don't map the I/O port range. We expect the kernel to do it. It
-	was done in the loader as a debugging aid and not intended as a
-	service/feature.
-0.3:	Pass the physical address of the bootinfo block in register r8
-	to the kernel. Continue to put it at the fixed address for now.
-0.2:	Much improved version. Significant is the support for passing
-	the FPSWA interface pointer to the kernel.
-0.1:	Initial EFI version, germinated from the NetBSD i386
-	standalone, but enormously modified.
diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile
deleted file mode 100644
index 06201265f901..000000000000
--- a/sys/boot/ia64/ski/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $FreeBSD$
-
-MAN=
-
-.include <src.opts.mk>
-MK_SSP=		no
-
-PROG=		skiload
-STRIP=		# We must not strip skiload at install time.
-
-SRCS=		acpi_stub.c conf.c delay.c efi_stub.c exit.c main.c \
-		pal_stub.S sal_stub.c skiconsole.c skifs.c skimd.c \
-		ssc.c start.S time.c vers.c
-
-CFLAGS+=	-I${.CURDIR}/../common
-CFLAGS+=	-I${.CURDIR}/../../common
-CFLAGS+=	-I${.CURDIR}/../../..
-CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand
-
-LDSCRIPT=	${.CURDIR}/ldscript.${MACHINE_CPUARCH}
-LDFLAGS=	-Wl,-T${LDSCRIPT}
-
-NEWVERSWHAT=	"SKI boot" ${MACHINE_CPUARCH}
-
-vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
-	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
-
-CLEANFILES=	vers.c
-
-LIBIA64=	${.OBJDIR}/../common/libia64.a
-.if ${MK_FORTH} != "no"
-LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
-.endif
-
-DPADD=		${LIBIA64} ${LIBFICL} ${LIBSTAND}
-LDADD=		-Wl,--whole-archive ${LIBIA64} -Wl,--no-whole-archive \
-		    ${LIBFICL} -lstand
-
-.include <bsd.prog.mk>
diff --git a/sys/boot/ia64/ski/acpi_stub.c b/sys/boot/ia64/ski/acpi_stub.c
deleted file mode 100644
index b16bb0a6b433..000000000000
--- a/sys/boot/ia64/ski/acpi_stub.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <contrib/dev/acpica/include/acpi.h>
-
-#define APIC_IO_SAPIC                   6
-#define APIC_LOCAL_SAPIC                7
-
-#pragma pack(1)
-
-typedef struct  /* LOCAL SAPIC */
-{
-	ACPI_SUBTABLE_HEADER Header;
-	UINT8		ProcessorId;		/* ACPI processor id */
-	UINT8		LocalSapicId;		/* Processor local SAPIC id */
-	UINT8		LocalSapicEid;		/* Processor local SAPIC eid */
-	UINT8		Reserved[3];
-	UINT32		ProcessorEnabled: 1;
-	UINT32		FlagsReserved: 31;
-} LOCAL_SAPIC;
-
-typedef struct  /* IO SAPIC */
-{
-	ACPI_SUBTABLE_HEADER Header;
-	UINT8		IoSapicId;		/* I/O SAPIC ID */
-	UINT8		Reserved;		/* reserved - must be zero */
-	UINT32		Vector;			/* interrupt base */
-	UINT64		IoSapicAddress;		/* SAPIC's physical address */
-} IO_SAPIC;
-
-/*
- */
-
-struct {
-	ACPI_TABLE_MADT		MADT;
-	ACPI_MADT_LOCAL_SAPIC	cpu0;
-	ACPI_MADT_LOCAL_SAPIC	cpu1;
-	ACPI_MADT_LOCAL_SAPIC	cpu2;
-	ACPI_MADT_LOCAL_SAPIC	cpu3;
-	ACPI_MADT_IO_SAPIC	sapic;
-} apic = {
-	/* Header. */
-	{
-		ACPI_SIG_MADT,			/* Signature. */
-		sizeof(apic),			/* Length of table. */
-		0,				/* ACPI minor revision. */
-		0,				/* Checksum. */
-		"FBSD",				/* OEM Id. */
-		"SKI",				/* OEM table Id. */
-		0,				/* OEM revision. */
-		"FBSD",				/* ASL compiler Id. */
-		0,				/* ASL revision. */
-		0xfee00000,
-	},
-	/* cpu0. */
-	{
-		APIC_LOCAL_SAPIC,		/* Type. */
-		sizeof(apic.cpu0),		/* Length. */
-		0,				/* ACPI processor id */
-		0,				/* Processor local SAPIC id */
-		0,				/* Processor local SAPIC eid */
-		{ 0, 0, 0 },
-		1,				/* FL: Enabled. */
-	},
-	/* cpu1. */
-	{
-		APIC_LOCAL_SAPIC,		/* Type. */
-		sizeof(apic.cpu1),		/* Length. */
-		1,				/* ACPI processor id */
-		0,				/* Processor local SAPIC id */
-		1,				/* Processor local SAPIC eid */
-		{ 0, 0, 0 },
-		1,				/* FL: Enabled. */
-	},
-	/* cpu2. */
-	{
-		APIC_LOCAL_SAPIC,		/* Type. */
-		sizeof(apic.cpu2),		/* Length. */
-		2,				/* ACPI processor id */
-		1,				/* Processor local SAPIC id */
-		0,				/* Processor local SAPIC eid */
-		{ 0, 0, 0 },
-		0,				/* FL: Enabled. */
-	},
-	/* cpu3. */
-	{
-		APIC_LOCAL_SAPIC,		/* Type. */
-		sizeof(apic.cpu3),		/* Length. */
-		3,				/* ACPI processor id */
-		1,				/* Processor local SAPIC id */
-		1,				/* Processor local SAPIC eid */
-		{ 0, 0, 0 },
-		0,				/* FL: Enabled. */
-	},
-	/* sapic. */
-	{
-		APIC_IO_SAPIC,			/* Type. */
-		sizeof(apic.sapic),		/* Length. */
-		4,				/* IO SAPIC id. */
-		0,
-		16,				/* Interrupt base. */
-		0xfec00000			/* IO SAPIC address. */
-	}
-};
-
-struct {
-	ACPI_TABLE_HEADER	Header;
-	UINT64			apic_tbl;
-} xsdt = {
-	{
-		ACPI_SIG_XSDT,		/* Signature. */
-		sizeof(xsdt),		/* Length of table. */
-		0,			/* ACPI minor revision. */
-		0,			/* XXX checksum. */
-		"FBSD",			/* OEM Id. */
-		"SKI",			/* OEM table Id. */
-		0,			/* OEM revision. */
-		"FBSD",			/* ASL compiler Id. */
-		0			/* ASL revision. */
-	},
-	0UL				/* XXX APIC table address. */
-};
-
-ACPI_TABLE_RSDP acpi_root = {
-	ACPI_SIG_RSDP,
-	0,				/* XXX checksum. */
-	"FBSD",
-	2,				/* ACPI Rev 2.0. */
-	0UL,
-	sizeof(xsdt),			/* XSDT length. */
-	0UL,				/* XXX PA of XSDT. */
-	0,				/* XXX Extended checksum. */
-};
-
-static void
-cksum(void *addr, int sz, UINT8 *sum)
-{
-	UINT8 *p, s;
-
-	p = addr;
-	s = 0;
-	while (sz--)
-		s += *p++;
-	*sum = -s;
-}
-
-void
-acpi_stub_init(void)
-{
-	acpi_root.XsdtPhysicalAddress = (UINT64)&xsdt;
-	cksum(&acpi_root, 20, &acpi_root.Checksum);
-	cksum(&acpi_root, sizeof(acpi_root), &acpi_root.ExtendedChecksum);
-
-	cksum(&apic, sizeof(apic), &apic.MADT.Header.Checksum);
-	xsdt.apic_tbl = (UINT32)&apic;
-	cksum(&xsdt, sizeof(xsdt), &xsdt.Header.Checksum);
-}
diff --git a/sys/boot/ia64/ski/conf.c b/sys/boot/ia64/ski/conf.c
deleted file mode 100644
index 3ee3b33460b3..000000000000
--- a/sys/boot/ia64/ski/conf.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * Copyright (c) 1997
- *	Matthias Drochner.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project
- *	by Matthias Drochner.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stand.h>
-
-#include "libski.h"
-
-/*
- * We could use linker sets for some or all of these, but
- * then we would have to control what ended up linked into
- * the bootstrap.  So it's easier to conditionalise things
- * here.
- *
- * XXX rename these arrays to be consistent and less namespace-hostile
- */
-
-/* Exported for libstand */
-struct devsw *devsw[] = {
-	&skifs_dev,
-	NULL
-};
-
-struct fs_ops *file_system[] = {
-	&ski_fsops,
-	&ufs_fsops,
-	&gzipfs_fsops,
-	NULL
-};
-
-/* 
- * Consoles 
- *
- * We don't prototype these in libski.h because they require
- * data structures from bootstrap.h as well.
- */
-extern struct console ski_console;
-
-struct console *consoles[] = {
-	&ski_console,
-	NULL
-};
diff --git a/sys/boot/ia64/ski/delay.c b/sys/boot/ia64/ski/delay.c
deleted file mode 100644
index 2389603edb4a..000000000000
--- a/sys/boot/ia64/ski/delay.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * Copyright (c) 2001 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-void
-delay(int usecs)
-{
-	return;
-}
diff --git a/sys/boot/ia64/ski/efi_stub.c b/sys/boot/ia64/ski/efi_stub.c
deleted file mode 100644
index 7236c696a897..000000000000
--- a/sys/boot/ia64/ski/efi_stub.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*-
- * Copyright (c) 2003,2004 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <machine/bootinfo.h>
-#include <machine/efi.h>
-#include <stand.h>
-#include "libski.h"
-
-extern void acpi_root;
-extern void sal_systab;
-
-struct efi_cfgtbl efi_cfgtab[] = {
-	{ EFI_TABLE_ACPI20,	(intptr_t)&acpi_root },
-	{ EFI_TABLE_SAL,	(intptr_t)&sal_systab }
-};
-
-static efi_status GetTime(struct efi_tm *, struct efi_tmcap *);
-static efi_status SetTime(struct efi_tm *);
-static efi_status GetWakeupTime(uint8_t *, uint8_t *, struct efi_tm *);
-static efi_status SetWakeupTime(uint8_t, struct efi_tm *);
-
-static efi_status SetVirtualAddressMap(u_long, u_long, uint32_t,
-    struct efi_md*);
-static efi_status ConvertPointer(u_long, void **);
-
-static efi_status GetVariable(efi_char *, struct uuid *, uint32_t *, u_long *,
-    void *);
-static efi_status GetNextVariableName(u_long *, efi_char *, struct uuid *);
-static efi_status SetVariable(efi_char *, struct uuid *, uint32_t, u_long,
-    void *);
-
-static efi_status GetNextHighMonotonicCount(uint32_t *);
-static efi_status ResetSystem(enum efi_reset, efi_status, u_long, efi_char *);
-
-struct efi_rt efi_rttab = {
-	/* Header. */
-	{	0,			/* XXX Signature */
-		0,			/* XXX Revision */
-		0,			/* XXX HeaderSize */
-		0,			/* XXX CRC32 */
-	},
-
-	/* Time services */
-	GetTime,
-	SetTime,
-	GetWakeupTime,
-	SetWakeupTime,
-
-	/* Virtual memory services */
-	SetVirtualAddressMap,
-	ConvertPointer,
-
-	/* Variable services */
-	GetVariable,
-	GetNextVariableName,
-	SetVariable,
-
-	/* Misc */
-	GetNextHighMonotonicCount,
-	ResetSystem
-};
-
-struct efi_systbl efi_systab = {
-	/* Header. */
-	{	EFI_SYSTBL_SIG,
-		0,			/* XXX Revision */
-		0,			/* XXX HeaderSize */
-		0,			/* XXX CRC32 */
-	},
-
-	/* Firmware info. */
-	L"FreeBSD", 0, 0,
-
-	/* Console stuff. */
-	NULL, NULL,
-	NULL, NULL,
-	NULL, NULL,
-
-	/* Services (runtime first). */
-	(intptr_t)&efi_rttab,
-	NULL,
-
-	/* Configuration tables. */
-	sizeof(efi_cfgtab)/sizeof(struct efi_cfgtbl),
-	(intptr_t)efi_cfgtab
-};
-
-static efi_status
-unsupported(const char *func)
-{
-	printf("EFI: %s not supported\n", func);
-	return ((1UL << 63) + 3);
-}
-
-static efi_status
-GetTime(struct efi_tm *time, struct efi_tmcap *caps)
-{
-	uint32_t comps[8];
-
-	ssc((uint64_t)comps, 0, 0, 0, SSC_GET_RTC);
-	time->tm_year = comps[0] + 1900;
-	time->tm_mon = comps[1] + 1;
-	time->tm_mday = comps[2];
-	time->tm_hour = comps[3];
-	time->tm_min = comps[4];
-	time->tm_sec = comps[5];
-	time->__pad1 = time->__pad2 = 0;
-	time->tm_nsec = 0;
-	time->tm_tz = 0;
-	time->tm_dst = 0;
-	return (0);
-}
-
-static efi_status
-SetTime(struct efi_tm *time)
-{
-	return (0);
-}
-
-static efi_status
-GetWakeupTime(uint8_t *enabled, uint8_t *pending, struct efi_tm *time)
-{
-	return (unsupported(__func__));
-}
-
-static efi_status
-SetWakeupTime(uint8_t enable, struct efi_tm *time)
-{
-	return (unsupported(__func__));
-}
-
-static void
-Reloc(void *addr, uint64_t delta)
-{
-	uint64_t **fpp = addr;
-
-	*fpp[0] += delta;
-	*fpp[1] += delta;
-	*fpp += delta >> 3;
-}
-
-static efi_status
-SetVirtualAddressMap(u_long mapsz, u_long descsz, uint32_t version,
-    struct efi_md *memmap)
-{
-	uint64_t delta;
-
-	delta = (uintptr_t)memmap->md_virt - memmap->md_phys;
-	Reloc(&efi_rttab.rt_gettime, delta);
-	Reloc(&efi_rttab.rt_settime, delta);
-	return (0);		/* Hah... */
-}
-
-static efi_status
-ConvertPointer(u_long debug, void **addr)
-{
-	return (unsupported(__func__));
-}
-
-static efi_status
-GetVariable(efi_char *name, struct uuid *vendor, uint32_t *attrs,
-    u_long *datasz, void *data)
-{
-	return (unsupported(__func__));
-}
-
-static efi_status
-GetNextVariableName(u_long *namesz, efi_char *name, struct uuid *vendor)
-{
-	return (unsupported(__func__));
-}
-
-static efi_status
-SetVariable(efi_char *name, struct uuid *vendor, uint32_t attrs, u_long datasz,
-    void *data)
-{
-	return (unsupported(__func__));
-}
-
-static efi_status
-GetNextHighMonotonicCount(uint32_t *high)
-{
-	static uint32_t counter = 0;
-
-	*high = counter++;
-	return (0);
-}
-
-static efi_status
-ResetSystem(enum efi_reset type, efi_status status, u_long datasz,
-    efi_char *data)
-{
-	return (unsupported(__func__));
-}
-
-void
-efi_stub_init(struct bootinfo *bi)
-{
-	static struct efi_md memmap[4];
-
-	/* Describe the SKI memory map. */
-	bi->bi_memmap = (uintptr_t)(void *)memmap;
-	bi->bi_memmap_size = sizeof(memmap);
-	bi->bi_memdesc_size = sizeof(struct efi_md);
-	bi->bi_memdesc_version = 1;
-
-	memmap[0].md_type = EFI_MD_TYPE_PALCODE;
-	memmap[0].md_phys = 0x100000;
-	memmap[0].md_virt = NULL;
-	memmap[0].md_pages = (1L*1024*1024)>>12;
-	memmap[0].md_attr = EFI_MD_ATTR_WB | EFI_MD_ATTR_RT;
-
-	memmap[1].md_type = EFI_MD_TYPE_FREE;
-	memmap[1].md_phys = 4L*1024*1024;
-	memmap[1].md_virt = NULL;
-	memmap[1].md_pages = (128L*1024*1024)>>12;
-	memmap[1].md_attr = EFI_MD_ATTR_WB;
-
-	memmap[2].md_type = EFI_MD_TYPE_FREE;
-	memmap[2].md_phys = 4L*1024*1024*1024;
-	memmap[2].md_virt = NULL;
-	memmap[2].md_pages = (64L*1024*1024)>>12;
-	memmap[2].md_attr = EFI_MD_ATTR_WB;
-
-	memmap[3].md_type = EFI_MD_TYPE_IOPORT;
-	memmap[3].md_phys = 0xffffc000000;
-	memmap[3].md_virt = NULL;
-	memmap[3].md_pages = (64L*1024*1024)>>12;
-	memmap[3].md_attr = EFI_MD_ATTR_UC;
-
-	bi->bi_systab = (u_int64_t)&efi_systab;
-}
diff --git a/sys/boot/ia64/ski/exit.c b/sys/boot/ia64/ski/exit.c
deleted file mode 100644
index aeac67c49341..000000000000
--- a/sys/boot/ia64/ski/exit.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <stddef.h>
-#include <stand.h>
-#include <stdarg.h>
-
-#include "libski.h"
-
-void
-exit(int code)
-{
-	ssc(code, 0, 0, 0, SSC_EXIT);
-}
diff --git a/sys/boot/ia64/ski/ldscript.ia64 b/sys/boot/ia64/ski/ldscript.ia64
deleted file mode 100644
index e7a303f574b2..000000000000
--- a/sys/boot/ia64/ski/ldscript.ia64
+++ /dev/null
@@ -1,61 +0,0 @@
-/* $FreeBSD$ */
-OUTPUT_FORMAT("elf64-ia64-freebsd", "elf64-ia64-freebsd", "elf64-ia64-freebsd")
-OUTPUT_ARCH(ia64)
-ENTRY(_start)
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = 0x100000;
-  .text		: {
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    /* .gnu.warning sections are handled specially by elf32.em. */
-    *(.gnu.warning)
-    *(.plt)
-  } =0x00300000010070000002000001000400
-  __start_set_Xcommand_set = .;
-  set_Xcommand_set      : { *(set_Xcommand_set) }
-  __stop_set_Xcommand_set = .;
-  .data		: {
-    *(.rodata .rodata.* .gnu.linkonce.r.*)
-    *(.rodata1)
-    *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
-    *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
-    *(.opd)
-    *(.data .data.* .gnu.linkonce.d.*)
-    *(.data1)
-    *(.plabel)
-    *(.dynbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-  }
-  .IA_64.unwind_info	: { *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) }
-  .IA_64.unwind	: { *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) }
-  __gp = .;
-  .sdata	: {
-    *(.got.plt .got)
-    *(.IA_64.pltoff)
-    *(.sdata .sdata.* .gnu.linkonce.s.*)
-    *(dynsbss)
-    *(.sbss .sbss.* .gnu.linkonce.sb.*)
-    *(.scommon)
-  }
-  .dynamic	: { *(.dynamic) }
-  .rela		: {
-    *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
-    *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
-    *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
-    *(.rela.got)
-    *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*)
-    *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*)
-    *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*)
-    *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*)
-    *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
-    *(.rela.plt)
-    *(.rela.IA_64.pltoff)
-    *(.relaset_*)
-    *(.rela.dyn .rela.dyn.*)
-  }
-  .hash		: { *(.hash) }
-  .dynsym	: { *(.dynsym) }
-  .dynstr	: { *(.dynstr) }
-}
diff --git a/sys/boot/ia64/ski/libski.h b/sys/boot/ia64/ski/libski.h
deleted file mode 100644
index 0e7fbc60578b..000000000000
--- a/sys/boot/ia64/ski/libski.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 2001 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$
- */
-
-#define	MAXDEV	31	/* maximum number of distinct devices */
-
-typedef unsigned long physaddr_t;
-
-/* exported devices XXX rename? */
-extern struct devsw skifs_dev;
-extern struct devsw ski_disk;
-extern struct netif_driver ski_net;
-
-/* Wrapper over SKI filesystems. */
-extern struct fs_ops ski_fsops;
-
-/* this is in startup code */
-extern void		delay(int);
-extern void		reboot(void);
-
-extern int		ski_boot(void);
-
-struct bootinfo;
-struct preloaded_file;
-
-#define SSC_CONSOLE_INIT		20
-#define SSC_GETCHAR			21
-#define SSC_PUTCHAR			31
-#define SSC_OPEN			50
-#define SSC_CLOSE			51
-#define SSC_READ			52
-#define SSC_WRITE			53
-#define SSC_GET_COMPLETION		54
-#define SSC_WAIT_COMPLETION		55
-#define SSC_GET_RTC			65
-#define SSC_EXIT			66
-#define SSC_LOAD_SYMBOLS		69
-#define	SSC_SAL_SET_VECTORS		120
-
-u_int64_t ssc(u_int64_t in0, u_int64_t in1, u_int64_t in2, u_int64_t in3,
-	      int which);
diff --git a/sys/boot/ia64/ski/main.c b/sys/boot/ia64/ski/main.c
deleted file mode 100644
index 5a00d1c43137..000000000000
--- a/sys/boot/ia64/ski/main.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
- * Copyright (c) 1998,2000 Doug Rabson <dfr@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 <stand.h>
-#include <string.h>
-#include <setjmp.h>
-#include <machine/fpu.h>
-
-#include <libia64.h>
-#include "libski.h"
-
-extern char bootprog_name[];
-extern char bootprog_rev[];
-extern char bootprog_date[];
-extern char bootprog_maker[];
-
-struct devdesc currdev;		/* our current device */
-struct arch_switch archsw;	/* MI/MD interface boundary */
-
-void
-ski_main(void)
-{
-	static char malloc[512*1024];
-	int i;
-
-	/* 
-	 * initialise the heap as early as possible.  Once this is done,
-	 * alloc() is usable. The stack is buried inside us, so this is
-	 * safe.
-	 */
-	setheap((void *)malloc, (void *)(malloc + 512*1024));
-
-	/* 
-	 * XXX Chicken-and-egg problem; we want to have console output
-	 * early, but some console attributes may depend on reading from
-	 * eg. the boot device, which we can't do yet.  We can use
-	 * printf() etc. once this is done.
-	 */
-	cons_probe();
-
-	/*
-	 * March through the device switch probing for things.
-	 */
-	for (i = 0; devsw[i] != NULL; i++)
-		if (devsw[i]->dv_init != NULL)
-			(devsw[i]->dv_init)();
-
-	printf("\n");
-	printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf("(%s, %s)\n", bootprog_maker, bootprog_date);
-#if 0
-	printf("Memory: %ld k\n", memsize() / 1024);
-#endif
-
-	/* XXX presumes that biosdisk is first in devsw */
-	currdev.d_dev = devsw[0];
-	currdev.d_type = currdev.d_dev->dv_type;
-	currdev.d_unit = 0;
-
-#if 0
-	/* Create arc-specific variables */
-	bootfile = GetEnvironmentVariable(ARCENV_BOOTFILE);
-	if (bootfile)
-		setenv("bootfile", bootfile, 1);
-#endif
-
-	env_setenv("currdev", EV_VOLATILE, ia64_fmtdev(&currdev),
-	    ia64_setcurrdev, env_nounset);
-	env_setenv("loaddev", EV_VOLATILE, ia64_fmtdev(&currdev), env_noset,
-	    env_nounset);
-
-	setenv("LINES", "24", 1);	/* optional */
-
-	archsw.arch_autoload = ia64_autoload;
-	archsw.arch_copyin = ia64_copyin;
-	archsw.arch_copyout = ia64_copyout;
-	archsw.arch_getdev = ia64_getdev;
-	archsw.arch_loadaddr = ia64_loadaddr;
-	archsw.arch_loadseg = ia64_loadseg;
-	archsw.arch_readin = ia64_readin;
-
-	interact();			/* doesn't return */
-
-	exit(0);
-}
-
-COMMAND_SET(quit, "quit", "exit the loader", command_quit);
-
-static int
-command_quit(int argc, char *argv[])
-{
-	exit(0);
-	return (CMD_OK);
-}
diff --git a/sys/boot/ia64/ski/pal_stub.S b/sys/boot/ia64/ski/pal_stub.S
deleted file mode 100644
index 81fbd080e3f4..000000000000
--- a/sys/boot/ia64/ski/pal_stub.S
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * Copyright (c) 2003 Marcel Moolenaar
- * Copyright (c) 2001 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 <machine/asm.h>
-
-	.text
-ENTRY(PalProc, 0)
-	cmp.eq		p6,p0=6,r28		// PAL_PTCE_INFO
-(p6)	br.cond.dptk	pal_ptce_info
-	;;
-	cmp.eq		p6,p0=8,r28		// PAL_VM_SUMMARY
-(p6)	br.cond.dptk	pal_vm_summary
-	;;
-	cmp.eq		p6,p0=14,r28		// PAL_FREQ_RATIOS
-(p6)	br.cond.dptk	pal_freq_ratios
-	;;
-	cmp.eq		p6,p0=29,r28		// PAL_HALT_LIGHT
-(p6)	br.cond.dptk	pal_halt_light
-	;;
-	mov		r15=66			// EXIT
-	break.i		0x80000			// SSC
-	;;
-pal_ptce_info:
-	mov		r8=0
-	mov		r9=0			// base
-	movl		r10=0x0000000100000001	// loop counts (outer|inner)
-	mov		r11=0x0000000000000000	// loop strides (outer|inner)
-	br.sptk		b0
-pal_vm_summary:
-	mov		r8=0
-	movl		r9=(8<<40)|(8<<32)	// VM info 1
-	mov		r10=(18<<8)|(41<<0)	// VM info 2
-	mov		r11=0
-	br.sptk		b0
-pal_freq_ratios:
-	mov		r8=0
-	movl		r9=0x0000000B00000002	// processor ratio 11/2
-	movl		r10=0x0000000100000001	// bus ratio 1/1
-	movl		r11=0x0000000B00000002	// ITC ratio 11/2
-	br.sptk		b0
-pal_halt_light:
-	mov		r8=0
-	mov		r9=0
-	mov		r10=0
-	mov		r11=0
-	br.sptk		b0
-END(PalProc)
diff --git a/sys/boot/ia64/ski/sal_stub.c b/sys/boot/ia64/ski/sal_stub.c
deleted file mode 100644
index 1ebbb4cc24bd..000000000000
--- a/sys/boot/ia64/ski/sal_stub.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <machine/md_var.h>
-#include <machine/sal.h>
-#include <stand.h>
-#include "libski.h"
-
-extern void PalProc(void);
-static sal_entry_t SalProc;
-
-struct {
-	struct sal_system_table header;
-	struct sal_entrypoint_descriptor entry;
-	struct sal_ap_wakeup_descriptor wakeup;
-} sal_systab = {
-	/* Header. */
-	{
-		SAL_SIGNATURE,
-		sizeof(sal_systab),
-		{ 00, 03 },		/* Revision 3.0. */
-		2,			/* Number of decsriptors. */
-		0,			/* XXX checksum. */
-		{ 0 },
-		{ 00, 00 },		/* XXX SAL_A version. */
-		{ 00, 00 },		/* XXX SAL_B version. */
-		"FreeBSD",
-		"Ski loader",
-		{ 0 }
-	},
-	/* Entrypoint. */
-	{
-		0,			/* Type=entrypoint descr. */
-		{ 0 },
-		0,			/* XXX PalProc. */
-		0,			/* XXX SalProc. */
-		0,			/* XXX SalProc GP. */
-		{ 0 }
-	},
-	/* AP wakeup. */
-	{
-		5,			/* Type=AP wakeup descr. */
-		0,			/* External interrupt. */
-		{ 0 },
-		255			/* Wakeup vector. */
-	}
-};
-
-static inline void
-puts(const char *s)
-{
-	s = (const char *)((7UL << 61) | (u_long)s);
-	while (*s)
-		ski_cons_putchar(*s++);
-}
-
-static struct ia64_sal_result
-SalProc(u_int64_t a1, u_int64_t a2, u_int64_t a3, u_int64_t a4, u_int64_t a5,
-    u_int64_t a6, u_int64_t a7, u_int64_t a8)
-{
-	struct ia64_sal_result res;
-
-	res.sal_status = -3;
-	res.sal_result[0] = 0;
-	res.sal_result[1] = 0;
-	res.sal_result[2] = 0;
-
-	if (a1 == SAL_FREQ_BASE) {
-		res.sal_status = 0;
-		res.sal_result[0] = 133338184;
-	} else if (a1 == SAL_SET_VECTORS) {
-		/* XXX unofficial SSC function. */
-		ssc(a2, a3, a4, a5, SSC_SAL_SET_VECTORS);
-	} else if (a1 != SAL_GET_STATE_INFO_SIZE) {
-		puts("SAL: unimplemented function called\n");
-	}
-
-	return (res);
-}
-
-void
-sal_stub_init(void)
-{
-	struct ia64_fdesc *fd;
-
-	fd = (void*)PalProc;
-	sal_systab.entry.sale_pal_proc = fd->func;
-	fd = (void*)SalProc;
-	sal_systab.entry.sale_sal_proc = fd->func;
-	sal_systab.entry.sale_sal_gp = fd->gp;
-}
diff --git a/sys/boot/ia64/ski/skiconsole.c b/sys/boot/ia64/ski/skiconsole.c
deleted file mode 100644
index e5cea3dc9936..000000000000
--- a/sys/boot/ia64/ski/skiconsole.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stand.h>
-
-#include "bootstrap.h"
-#include "libski.h"
-
-static void
-ski_cons_probe(struct console *cp)
-{
-	cp->c_flags |= C_PRESENTIN | C_PRESENTOUT;
-}
-
-static int
-ski_cons_init(int arg)
-{
-	ssc(0, 0, 0, 0, SSC_CONSOLE_INIT);
-	return 0;
-}
-
-void
-ski_cons_putchar(int c)
-{
-	ssc(c, 0, 0, 0, SSC_PUTCHAR);
-}
-
-static int pollchar = -1;
-
-int
-ski_cons_getchar()
-{
-	int c;
-
-	if (pollchar > 0) {
-		c = pollchar;
-		pollchar = -1;
-		return c;
-	}
-
-	do {
-		c = ssc(0, 0, 0, 0, SSC_GETCHAR);
-	} while (c == 0);
-
-	return c;
-}
-
-int
-ski_cons_poll()
-{
-	int c;
-	if (pollchar > 0)
-		return 1;
-	c = ssc(0, 0, 0, 0, SSC_GETCHAR);
-	if (!c)
-		return 0;
-	pollchar = c;
-	return 1;
-}
-
-struct console ski_console = {
-	"ski",
-	"ia64 SKI console",
-	0,
-	ski_cons_probe,
-	ski_cons_init,
-	ski_cons_putchar,
-	ski_cons_getchar,
-	ski_cons_poll
-};
diff --git a/sys/boot/ia64/ski/skifs.c b/sys/boot/ia64/ski/skifs.c
deleted file mode 100644
index 72276feba6cb..000000000000
--- a/sys/boot/ia64/ski/skifs.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*-
- * Copyright (c) 2001 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <stddef.h>
-#include <stand.h>
-#include <stdarg.h>
-
-#include <bootstrap.h>
-#include "libski.h"
-
-struct disk_req {
-	unsigned long addr;
-	unsigned len;
-};
-
-struct disk_stat {
-	int fd;
-	unsigned count;
-};
-
-static int
-skifs_open(const char *path, struct open_file *f)
-{
-	int fd;
-
-	/*
-	 * Skip leading '/' so that our pretend filesystem starts in
-	 * the current working directory.
-	 */
-	while (*path == '/')
-		path++;
-
-	fd = ssc((u_int64_t) path, 1, 0, 0, SSC_OPEN);
-	if (fd > 0) {
-		f->f_fsdata = (void*)(u_int64_t) fd;
-		return 0;
-	}
-	return ENOENT;
-}
-
-static int
-skifs_close(struct open_file *f)
-{
-	ssc((u_int64_t) f->f_fsdata, 0, 0, 0, SSC_CLOSE);
-	return 0;
-}
-
-static int
-skifs_read(struct open_file *f, void *buf, size_t size, size_t *resid)
-{
-	struct disk_req req;
-	struct disk_stat stat;
-
-	req.len = size;
-	req.addr = (u_int64_t) buf;
-	ssc((u_int64_t) f->f_fsdata, 1, (u_int64_t) &req, f->f_offset, SSC_READ);
-	stat.fd = (u_int64_t) f->f_fsdata;
-	ssc((u_int64_t)&stat, 0, 0, 0, SSC_WAIT_COMPLETION);
-
-	*resid = size - stat.count;
-	f->f_offset += stat.count;
-	return 0;
-}
-
-static off_t
-skifs_seek(struct open_file *f, off_t offset, int where)
-{
-	u_int64_t base;
-
-	switch (where) {
-	case SEEK_SET:
-		base = 0;
-		break;
-
-	case SEEK_CUR:
-		base = f->f_offset;
-		break;
-
-	case SEEK_END:
-		printf("can't find end of file in SKI\n");
-		base = f->f_offset;
-		break;
-	}
-
-	f->f_offset = base + offset;
-	return base;
-}
-
-static int
-skifs_stat(struct open_file *f, struct stat *sb)
-{
-	bzero(sb, sizeof(*sb));
-	sb->st_mode = S_IFREG | S_IRUSR;
-	return 0;
-}
-
-static int
-skifs_readdir(struct open_file *f, struct dirent *d)
-{
-	return ENOENT;
-}
-
-struct fs_ops ski_fsops = {
-	"fs",
-	skifs_open,
-	skifs_close,
-	skifs_read,
-	null_write,
-	skifs_seek,
-	skifs_stat,
-	skifs_readdir
-};
-
-static int
-skifs_dev_init(void) 
-{
-	return 0;
-}
-
-/*
- * Print information about disks
- */
-static void
-skifs_dev_print(int verbose)
-{
-}
-
-/*
- * Attempt to open the disk described by (dev) for use by (f).
- *
- * Note that the philosophy here is "give them exactly what
- * they ask for".  This is necessary because being too "smart"
- * about what the user might want leads to complications.
- * (eg. given no slice or partition value, with a disk that is
- *  sliced - are they after the first BSD slice, or the DOS
- *  slice before it?)
- */
-static int 
-skifs_dev_open(struct open_file *f, ...)
-{
-	return 0;
-}
-
-static int 
-skifs_dev_close(struct open_file *f)
-{
-
-	return 0;
-}
-
-static int 
-skifs_dev_strategy(void *devdata, int rw, daddr_t dblk, size_t size, char *buf, size_t *rsize)
-{
-	return 0;
-}
-
-struct devsw skifs_dev = {
-	"fs", 
-	DEVT_DISK, 
-	skifs_dev_init,
-	skifs_dev_strategy, 
-	skifs_dev_open, 
-	skifs_dev_close, 
-	noioctl,
-	skifs_dev_print
-};
diff --git a/sys/boot/ia64/ski/skiload.cmd b/sys/boot/ia64/ski/skiload.cmd
deleted file mode 100644
index 48b77e1e40ba..000000000000
--- a/sys/boot/ia64/ski/skiload.cmd
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-iar
-fr
-pa
-b enter_kernel
-c
-b printf
-c
-b rp
-c
-b ssc
-c
-b rp
-c
-bD
-s 11
diff --git a/sys/boot/ia64/ski/skimd.c b/sys/boot/ia64/ski/skimd.c
deleted file mode 100644
index baa31382a95d..000000000000
--- a/sys/boot/ia64/ski/skimd.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 2006 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stand.h>
-
-#include <libia64.h>
-
-#include "libski.h"
-
-extern void acpi_stub_init(void);
-extern void efi_stub_init(struct bootinfo *);
-extern void sal_stub_init(void);
-
-vm_paddr_t
-ia64_platform_alloc(vm_offset_t va, vm_size_t sz __unused)
-{
-	vm_paddr_t pa;
-
-	if (va == 0)
-		pa = 2 * 1024 * 1024;
-	else
-		pa = (va - IA64_PBVM_BASE) + (32 * 1024 * 1024);
-
-	return (pa);
-}
-
-void
-ia64_platform_free(vm_offset_t va __unused, vm_paddr_t pa __unused,
-    vm_size_t sz __unused)
-{
-}
-
-int
-ia64_platform_bootinfo(struct bootinfo *bi, struct bootinfo **res)
-{
-	static struct bootinfo bootinfo;
-
-	efi_stub_init(bi);
-	sal_stub_init();
-	acpi_stub_init();
-
-	if (IS_LEGACY_KERNEL())
-		*res = &bootinfo;
-
-	return (0);
-}
-
-int
-ia64_platform_enter(const char *kernel)
-{
-
-	while (*kernel == '/')
-		kernel++;
-	ssc(0, (uint64_t)kernel, 0, 0, SSC_LOAD_SYMBOLS);
-	return (0);
-}
diff --git a/sys/boot/ia64/ski/ssc.c b/sys/boot/ia64/ski/ssc.c
deleted file mode 100644
index e1f871c4d5c5..000000000000
--- a/sys/boot/ia64/ski/ssc.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2001 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stand.h>
-#include "libski.h"
-
-/*
- * Ugh... Work around a bug in the Linux version of ski for SSC_GET_RTC. The
- * PSR.dt register is not preserved properly and causes further memory
- * references to be done without translation. All we need to do is preserve
- * PSR.dt across the SSC call. We do this by saving and restoring psr.l
- * completely.
- */
-u_int64_t
-ssc(u_int64_t in0, u_int64_t in1, u_int64_t in2, u_int64_t in3, int which)
-{
-	register u_int64_t psr;
-	register u_int64_t ret0 __asm("r8");
-
-	__asm __volatile("mov %0=psr;;" : "=r"(psr));
-	__asm __volatile("mov r15=%1\n\t"
-			 "break 0x80000;;"
-			 : "=r"(ret0)
-			 : "r"(which), "r"(in0), "r"(in1), "r"(in2), "r"(in3));
-	__asm __volatile("mov psr.l=%0;; srlz.d" :: "r"(psr));
-	return ret0;
-}
diff --git a/sys/boot/ia64/ski/start.S b/sys/boot/ia64/ski/start.S
deleted file mode 100644
index 0bd10e928d04..000000000000
--- a/sys/boot/ia64/ski/start.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 2003 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$
- */
-
-#define	STACKSIZE	16384
-#define	FPSR_DEFAULT	0x0009804c0270033f
-
-	.text
-	.global		_start
-	.proc		_start
-_start:
-{	.mlx
-	mov		ar.rsc=0
-	movl		gp=__gp
-	;;
-}
-{	.mlx
-	add		r2=@gprel(stack),gp
-	movl		r14=FPSR_DEFAULT
-	;;
-}
-{	.mib
-	mov		ar.bspstore=r2
-	add		r12=STACKSIZE-16,r2
-	bsw.1
-	;;
-}
-{	.mmb
-	mov		ar.rsc=3
-	mov		ar.fpsr=r14
-	br.sptk		ski_main
-	;;
-}
-	.endp		_start
-
-	.data
-	.align		16
-stack:	.skip		STACKSIZE
diff --git a/sys/boot/ia64/ski/time.c b/sys/boot/ia64/ski/time.c
deleted file mode 100644
index 7aa71202d10a..000000000000
--- a/sys/boot/ia64/ski/time.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000
- * Intel Corporation.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 
- *    This product includes software developed by Intel Corporation and
- *    its contributors.
- * 
- * 4. Neither the name of Intel Corporation or its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION AND CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL INTEL CORPORATION OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * 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 <time.h>
-#include <sys/time.h>
-#include <stand.h>
-
-#include "libski.h"
-
-/*
-// Accurate only for the past couple of centuries;
-// that will probably do.
-//
-// (#defines From FreeBSD 3.2 lib/libc/stdtime/tzfile.h)
-*/
-
-#define isleap(y)	(((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
-#define SECSPERHOUR ( 60*60 )
-#define SECSPERDAY	(24 * SECSPERHOUR)
-
-struct ssc_time {
-	int	Year;
-	int	Month;
-	int	Day;
-	int	Hour;
-	int	Minute;
-	int	Second;
-	int	Msec;
-	int	Wday;
-};
-
-time_t
-EfiTimeToUnixTime(struct ssc_time *ETime)
-{
-    /*
-    //  These arrays give the cumulative number of days up to the first of the
-    //  month number used as the index (1 -> 12) for regular and leap years.
-    //  The value at index 13 is for the whole year.
-    */
-    static time_t CumulativeDays[2][14] = {
-    {0,
-     0,
-     31,
-     31 + 28,
-     31 + 28 + 31,
-     31 + 28 + 31 + 30,
-     31 + 28 + 31 + 30 + 31,
-     31 + 28 + 31 + 30 + 31 + 30,
-     31 + 28 + 31 + 30 + 31 + 30 + 31,
-     31 + 28 + 31 + 30 + 31 + 30 + 31 + 31,
-     31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
-     31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
-     31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30,
-     31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31 },
-    {0,
-     0,
-     31,
-     31 + 29,
-     31 + 29 + 31,
-     31 + 29 + 31 + 30,
-     31 + 29 + 31 + 30 + 31,
-     31 + 29 + 31 + 30 + 31 + 30,
-     31 + 29 + 31 + 30 + 31 + 30 + 31,
-     31 + 29 + 31 + 30 + 31 + 30 + 31 + 31,
-     31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30,
-     31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31,
-     31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30,
-     31 + 29 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31 }};
-
-    time_t  UTime; 
-    int     Year;
-
-    ETime->Year += 1900;
-
-    /*
-    //  Do a santity check
-    */
-    if ( ETime->Year  <  1998 || ETime->Year   > 2099 ||
-    	 ETime->Month ==    0 || ETime->Month  >   12 ||
-    	 ETime->Day   ==    0 || ETime->Month  >   31 ||
-    	                         ETime->Hour   >   23 ||
-    	                         ETime->Minute >   59 ||
-    	                         ETime->Second >   59 ) {
-    	return (0);
-    }
-
-    /*
-    // Years
-    */
-    UTime = 0;
-    for (Year = 1970; Year != ETime->Year; ++Year) {
-        UTime += (CumulativeDays[isleap(Year)][13] * SECSPERDAY);
-    }
-
-    /*
-    // UTime should now be set to 00:00:00 on Jan 1 of the file's year.
-    //
-    // Months  
-    */
-    UTime += (CumulativeDays[isleap(ETime->Year)][ETime->Month] * SECSPERDAY);
-
-    /*
-    // UTime should now be set to 00:00:00 on the first of the file's month and year
-    //
-    // Days -- Don't count the file's day
-    */
-    UTime += (((ETime->Day > 0) ? ETime->Day-1:0) * SECSPERDAY);
-
-    /*
-    // Hours
-    */
-    UTime += (ETime->Hour * SECSPERHOUR);
-
-    /*
-    // Minutes
-    */
-    UTime += (ETime->Minute * 60);
-
-    /*
-    // Seconds
-    */
-    UTime += ETime->Second;
-
-    return UTime;
-}
-
-time_t
-time(time_t *tloc)
-{
-	struct ssc_time time;
-
-	ssc((u_int64_t) &time, 0, 0, 0, SSC_GET_RTC);
-
-	return *tloc = EfiTimeToUnixTime(&time);
-}
diff --git a/sys/boot/ia64/ski/version b/sys/boot/ia64/ski/version
deleted file mode 100644
index a5b40f5de17d..000000000000
--- a/sys/boot/ia64/ski/version
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
-
-NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
-file is important.  Make sure the current version number is on line 6.
-
-2.0:    Add support for PBVM.
-1.2:    Restructured. Has some user visible differences. Due to code
-	sharing, has been given the same version number as the EFI
-	loader.
-0.2:	Pass the address of the bootinfo block to the kernel in register
-	r8. Keep it at the hardwired address for now.
-0.1:	Initial SKI version.
diff --git a/sys/boot/usb/bsd_busspace.c b/sys/boot/kshim/bsd_busspace.c
similarity index 100%
rename from sys/boot/usb/bsd_busspace.c
rename to sys/boot/kshim/bsd_busspace.c
diff --git a/sys/boot/usb/bsd_global.h b/sys/boot/kshim/bsd_global.h
similarity index 100%
rename from sys/boot/usb/bsd_global.h
rename to sys/boot/kshim/bsd_global.h
diff --git a/sys/boot/usb/bsd_kernel.c b/sys/boot/kshim/bsd_kernel.c
similarity index 100%
rename from sys/boot/usb/bsd_kernel.c
rename to sys/boot/kshim/bsd_kernel.c
diff --git a/sys/boot/usb/bsd_kernel.h b/sys/boot/kshim/bsd_kernel.h
similarity index 100%
rename from sys/boot/usb/bsd_kernel.h
rename to sys/boot/kshim/bsd_kernel.h
diff --git a/sys/boot/kshim/kshim.mk b/sys/boot/kshim/kshim.mk
new file mode 100644
index 000000000000..7e9b00d562d8
--- /dev/null
+++ b/sys/boot/kshim/kshim.mk
@@ -0,0 +1,79 @@
+#
+# $FreeBSD$
+#
+# Copyright (c) 2013 Hans Petter Selasky.
+# Copyright (c) 2014 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.
+#
+
+KSHIM_DIR:=	${.PARSEDIR}
+.PATH:		${KSHIM_DIR}
+
+CFLAGS+=	-I${KSHIM_DIR}
+CFLAGS+=	-I${KSHIM_DIR}/../..
+CFLAGS+=	-DUSB_GLOBAL_INCLUDE_FILE=\"bsd_global.h\"
+CFLAGS+=	-DHAVE_ENDIAN_DEFS
+
+#
+# Single threaded BSD kernel
+#
+KSRCS+=	bsd_kernel.c
+
+#
+# BUSSPACE implementation
+#
+KSRCS+=	bsd_busspace.c
+
+SRCS+=	sysinit_data.c
+SRCS+=	sysuninit_data.c
+
+CLEANFILES+= sysinit.bin
+CLEANFILES+= sysinit_data.c
+CLEANFILES+= sysuninit_data.c
+
+SRCS+=	${KSRCS}
+SYSINIT_OBJS=	${KSRCS:R:C/$/.osys/}
+CLEANFILES+=	${SYSINIT_OBJS}
+
+#
+# SYSINIT() and SYSUNINIT() handling
+#
+
+sysinit_data.c: sysinit.bin
+	sysinit -i sysinit.bin -o ${.TARGET} -k sysinit -s sysinit_data
+
+sysuninit_data.c: sysinit.bin
+	sysinit -i sysinit.bin -o ${.TARGET} -R -k sysuninit -s sysuninit_data
+
+.for KSRC in ${KSRCS:R}
+${KSRC}.osys: ${KSRC}.o
+	${OBJCOPY} -j ".debug.sysinit" -O binary ${KSRC}.o ${KSRC}.osys
+.endfor
+
+sysinit.bin: ${SYSINIT_OBJS}
+	cat ${.ALLSRC} > sysinit.bin
diff --git a/sys/boot/usb/tools/sysinit.h b/sys/boot/kshim/sysinit.h
similarity index 100%
rename from sys/boot/usb/tools/sysinit.h
rename to sys/boot/kshim/sysinit.h
diff --git a/sys/boot/libstand32/Makefile b/sys/boot/libstand32/Makefile
index 56f7d153678e..39c8e4003d58 100644
--- a/sys/boot/libstand32/Makefile
+++ b/sys/boot/libstand32/Makefile
@@ -60,12 +60,10 @@ SRCS+= ntoh.c
 
 # string functions from libc
 .PATH: ${LIBC}/string
-.if ${MACHINE_CPUARCH} != "ia64"
 SRCS+=	bcmp.c bcopy.c bzero.c ffs.c memccpy.c memchr.c memcmp.c memcpy.c \
 	memmove.c memset.c qdivrem.c strcat.c strchr.c strcmp.c strcpy.c \
 	strcspn.c strlen.c strncat.c strncmp.c strncpy.c strpbrk.c \
 	strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c
-.endif
 .if ${MACHINE_CPUARCH} == "arm"
 .PATH: ${LIBC}/arm/gen
 
@@ -85,17 +83,6 @@ SRCS+=	aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S
 SRCS+=	aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
 .endif
 
-.endif
-.if ${MACHINE_CPUARCH} == "ia64"
-.PATH: ${LIBC}/ia64/string
-SRCS+=	bcmp.c bcopy.S bzero.S ffs.S memccpy.c memchr.c memcmp.c memcpy.S \
-	memmove.S memset.c strcat.c strchr.c strcmp.c strcpy.c strcspn.c \
-	strlen.c strncat.c strncmp.c strncpy.c strpbrk.c strrchr.c strsep.c \
-	strspn.c strstr.c strtok.c swab.c
-
-.PATH: ${LIBC}/ia64/gen
-SRCS+= __divdi3.S __divsi3.S __moddi3.S __modsi3.S
-SRCS+= __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S
 .endif
 .if ${MACHINE_CPUARCH} == "powerpc"
 .PATH: ${LIBC}/quad
@@ -179,6 +166,7 @@ SRCS+=	bootp.c rarp.c bootparam.c
 SRCS+=	ufs.c nfs.c cd9660.c tftp.c gzipfs.c bzipfs.c
 SRCS+=	dosfs.c ext2fs.c
 SRCS+=	splitfs.c
+SRCS+=	pkgfs.c
 .if ${MK_NAND} != "no"
 SRCS+=	nandfs.c
 .endif
@@ -186,11 +174,8 @@ SRCS+=	nandfs.c
 .include <bsd.lib.mk>
 
 .if ${MACHINE_CPUARCH} == "amd64"
+CLEANFILES+= machine
 beforedepend ${OBJS}: machine
-cleandepend: cleanmachine
-cleanmachine:
-	rm -f machine
-
 machine:
-	ln -s ${.CURDIR}/../../i386/include machine
+	ln -fs ${.CURDIR}/../../i386/include machine
 .endif
diff --git a/sys/boot/mips/beri/boot2/Makefile b/sys/boot/mips/beri/boot2/Makefile
index 71953949c9d2..b4258c0c030f 100644
--- a/sys/boot/mips/beri/boot2/Makefile
+++ b/sys/boot/mips/beri/boot2/Makefile
@@ -73,7 +73,7 @@ LDFLAGS=	-nostdlib			\
 CFLAGS+=	-I${.CURDIR}/../common
 
 flashboot.elf: relocate.o start.o boot2.o altera_jtag_uart.o cfi.o sdcard.o
-	${LD} ${LDFLAGS} -T ${.CURDIR}/flashboot.ldscript -o ${.TARGET}	\
+	${LD} ${_LDFLAGS} -T ${.CURDIR}/flashboot.ldscript -o ${.TARGET}	\
 	    ${.ALLSRC} ${LIBSTAND}
 flashboot: flashboot.elf
 	objcopy -S -O binary ${.TARGET}.elf ${.TARGET}
@@ -81,7 +81,7 @@ flashboot.md5: flashboot
 	md5 flashboot > flashboot.md5
 
 jtagboot: start.o boot2.o altera_jtag_uart.o cfi.o sdcard.o
-	${LD} ${LDFLAGS} -T ${.CURDIR}/jtagboot.ldscript -o ${.TARGET}	\
+	${LD} ${_LDFLAGS} -T ${.CURDIR}/jtagboot.ldscript -o ${.TARGET}	\
 	    ${.ALLSRC} ${LIBSTAND}
 jtagboot.md5: jtagboot
 	md5 jtagboot > jtagboot.md5
diff --git a/sys/boot/mips/beri/loader/main.c b/sys/boot/mips/beri/loader/main.c
index a8e3424aa8ce..8253fb261d26 100644
--- a/sys/boot/mips/beri/loader/main.c
+++ b/sys/boot/mips/beri/loader/main.c
@@ -151,7 +151,7 @@ main(int argc, char *argv[], char *envv[], struct bootinfo *bootinfop)
 	printf("bootpath=\"%s\"\n", bootpath);
 #endif
 
-	interact();
+	interact(NULL);
 	return (0);
 }
 
diff --git a/sys/boot/ofw/common/main.c b/sys/boot/ofw/common/main.c
index 940ca63b7263..eb8ae0c08c81 100644
--- a/sys/boot/ofw/common/main.c
+++ b/sys/boot/ofw/common/main.c
@@ -162,7 +162,7 @@ main(int (*openfirm)(void *))
 	archsw.arch_readin = ofw_readin;
 	archsw.arch_autoload = ofw_autoload;
 
-	interact();				/* doesn't return */
+	interact(NULL);				/* doesn't return */
 
 	OF_exit();
 
diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile
index 00037cb60ee7..1657cad2b480 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@@ -3,8 +3,8 @@
 .include <bsd.own.mk>
 
 # XXX: clang can compile the boot code just fine, but boot2 gets too big
-CC:=		gcc
-COMPILER_TYPE:=	gcc
+#CC:=		gcc
+#COMPILER_TYPE:=	gcc
 
 NO_PIE=	yes
 
@@ -26,10 +26,7 @@ BOOT2_UFS?=	UFS1_AND_UFS2
 #BOOT2_UFS?=	UFS1_ONLY
 
 CFLAGS=	-Os \
-	-fno-guess-branch-probability \
 	-fomit-frame-pointer \
-	-fno-unit-at-a-time \
-	-mno-align-long-strings \
 	-mrtd \
 	-mregparm=3 \
 	-D${BOOT2_UFS} \
@@ -46,7 +43,10 @@ CFLAGS=	-Os \
 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
 	-Winline
 
-CFLAGS.gcc+=	--param max-inline-insns-single=100
+CFLAGS.gcc+=	-fno-guess-branch-probability \
+		-fno-unit-at-a-time \
+		-mno-align-long-strings \
+		--param max-inline-insns-single=100
 
 # Set machine type to PC98_SYSTEM_PARAMETER
 #CFLAGS+=	-DSET_MACHINE_TYPE
@@ -54,6 +54,8 @@ CFLAGS.gcc+=	--param max-inline-insns-single=100
 # Initialize the bi_bios_geom using the BIOS geometry
 #CFLAGS+=	-DGET_BIOSGEOM
 
+CFLAGS.clang+=${CLANG_OPT_SMALL}
+
 LD_FLAGS=-static -N --gc-sections
 
 # Pick up ../Makefile.inc early.
@@ -112,3 +114,6 @@ boot2.h: boot1.out
 	    REL1=`printf "%d" ${REL1}` > ${.TARGET}
 
 .include <bsd.prog.mk>
+
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS+=		${CLANG_NO_IAS}
diff --git a/sys/boot/pc98/boot2/boot2.c b/sys/boot/pc98/boot2/boot2.c
index 3d3e5d286719..69a422e5cb44 100644
--- a/sys/boot/pc98/boot2/boot2.c
+++ b/sys/boot/pc98/boot2/boot2.c
@@ -36,9 +36,22 @@ __FBSDID("$FreeBSD$");
 #include "boot2.h"
 #include "lib.h"
 
+/* Define to 0 to omit serial support */
+#ifndef SERIAL
+#define SERIAL 0
+#endif
+
 #define IO_KEYBOARD	1
 #define IO_SERIAL	2
 
+#if SERIAL
+#define DO_KBD (ioctrl & IO_KEYBOARD)
+#define DO_SIO (ioctrl & IO_SERIAL)
+#else
+#define DO_KBD (1)
+#define DO_SIO (0)
+#endif
+
 #define SECOND		1	/* Circa that many ticks in a second. */
 
 #define RBX_ASKNAME	0x0	/* -a */
@@ -133,9 +146,11 @@ static struct dsk {
 static char cmd[512], cmddup[512], knamebuf[1024];
 static const char *kname;
 static uint32_t opts;
-static int comspeed = SIOSPD;
 static struct bootinfo bootinfo;
+#if SERIAL
+static int comspeed = SIOSPD;
 static uint8_t ioctrl = IO_KEYBOARD;
+#endif
 
 void exit(int);
 static void load(void);
@@ -415,7 +430,7 @@ main(void)
 		   "boot: ",
 		   dsk.unit, dev_nm[dsk.type], dsk.unit,
 		   'a' + dsk.part, kname);
-	if (ioctrl & IO_SERIAL)
+	if (DO_SIO)
 	    sio_flush();
 	if (!autoboot || keyhit(3*SECOND))
 	    getstr();
@@ -537,6 +552,7 @@ parse()
 		    }
 		    printf("Keyboard: %s\n", cp);
 		    continue;
+#if SERIAL
 		} else if (c == 'S') {
 		    j = 0;
 		    while ((unsigned int)(i = *arg++ - '0') <= 9)
@@ -546,18 +562,21 @@ parse()
 			break;
 		    }
 		    /* Fall through to error below ('S' not in optstr[]). */
+#endif
 		}
 		for (i = 0; c != optstr[i]; i++)
 		    if (i == NOPT - 1)
 			return -1;
 		opts ^= OPT_SET(flags[i]);
 	    }
+#if SERIAL
 	    ioctrl = OPT_CHECK(RBX_DUAL) ? (IO_SERIAL|IO_KEYBOARD) :
 		     OPT_CHECK(RBX_SERIAL) ? IO_SERIAL : IO_KEYBOARD;
-	    if (ioctrl & IO_SERIAL) {
+	    if (DO_SIO) {
 	        if (sio_init(115200 / comspeed) != 0)
 		    ioctrl &= ~IO_SERIAL;
 	    }
+#endif
 	} else {
 	    for (q = arg--; *q && *q != '('; q++);
 	    if (*q) {
@@ -780,9 +799,9 @@ keyhit(unsigned sec)
 static int
 xputc(int c)
 {
-    if (ioctrl & IO_KEYBOARD)
+    if (DO_KBD)
 	putc(c);
-    if (ioctrl & IO_SERIAL)
+    if (DO_SIO)
 	sio_putc(c);
     return c;
 }
@@ -805,9 +824,9 @@ xgetc(int fn)
     if (OPT_CHECK(RBX_NOINTR))
 	return 0;
     for (;;) {
-	if (ioctrl & IO_KEYBOARD && getc(1))
+	if (DO_KBD && getc(1))
 	    return fn ? 1 : getc(0);
-	if (ioctrl & IO_SERIAL && sio_ischar())
+	if (DO_SIO && sio_ischar())
 	    return fn ? 1 : sio_getc();
 	if (fn)
 	    return 0;
diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c
index 75690c720d7b..da9bca55fbaa 100644
--- a/sys/boot/pc98/loader/main.c
+++ b/sys/boot/pc98/loader/main.c
@@ -193,7 +193,7 @@ main(void)
     extract_currdev();				/* set $currdev and $loaddev */
     setenv("LINES", "24", 1);			/* optional */
 
-    interact();			/* doesn't return */
+    interact(NULL);			/* doesn't return */
 
     /* if we ever get here, it is an error */
     return (1);
diff --git a/sys/boot/powerpc/ps3/main.c b/sys/boot/powerpc/ps3/main.c
index 64bd7e9f9a24..86ce62ebfac5 100644
--- a/sys/boot/powerpc/ps3/main.c
+++ b/sys/boot/powerpc/ps3/main.c
@@ -145,7 +145,7 @@ main(void)
 	setenv("LINES", "24", 1);
 	setenv("hw.platform", "ps3", 1);
 
-	interact();			/* doesn't return */
+	interact(NULL);			/* doesn't return */
 
 	return (0);
 }
diff --git a/sys/boot/sparc64/loader/main.c b/sys/boot/sparc64/loader/main.c
index 1cdcaeec38fc..44c4d212a522 100644
--- a/sys/boot/sparc64/loader/main.c
+++ b/sys/boot/sparc64/loader/main.c
@@ -897,7 +897,7 @@ main(int (*openfirm)(void *))
 	printf("bootpath=\"%s\"\n", bootpath);
 
 	/* Give control to the machine independent loader code. */
-	interact();
+	interact(NULL);
 	return (1);
 }
 
diff --git a/sys/boot/uboot/common/main.c b/sys/boot/uboot/common/main.c
index 16cea2395787..288a02d14ce8 100644
--- a/sys/boot/uboot/common/main.c
+++ b/sys/boot/uboot/common/main.c
@@ -492,7 +492,7 @@ main(void)
 	archsw.arch_readin = uboot_readin;
 	archsw.arch_autoload = uboot_autoload;
 
-	interact();				/* doesn't return */
+	interact(NULL);				/* doesn't return */
 
 	return (0);
 }
diff --git a/sys/boot/usb/Makefile b/sys/boot/usb/Makefile
index cd4dec000a60..1b94b3db7d82 100644
--- a/sys/boot/usb/Makefile
+++ b/sys/boot/usb/Makefile
@@ -1,7 +1,13 @@
 #
 # $FreeBSD$
 #
-# Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
+# Copyright (c) 2013 Hans Petter Selasky.
+# Copyright (c) 2014 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
@@ -25,37 +31,15 @@
 # SUCH DAMAGE.
 #
 
-T=${.CURDIR}/tools
-S=${.CURDIR}/../..
-
-.PATH: \
-	${.CURDIR} \
-	${.CURDIR}/storage \
-	${S}/dev/usb \
-	${S}/dev/usb/controller \
-	${S}/dev/usb/serial \
-	${S}/dev/usb/storage \
-	${S}/dev/usb/template
-
 LIB=		usbboot
 INTERNALLIB=
-OBJCOPY?=	objcopy
-SYSCC?=		/usr/bin/cc
 
 CFLAGS+=	-DBOOTPROG=\"usbloader\"
-CFLAGS+=	-DUSB_GLOBAL_INCLUDE_FILE=\"bsd_global.h\"
 CFLAGS+=	-ffunction-sections -fdata-sections
 CFLAGS+=	-ffreestanding
 CFLAGS+=	-Wformat -Wall
-CFLAGS+=	-I${S}
-CFLAGS+=	-I${T}
-CFLAGS+=	-I${.CURDIR}
-CFLAGS+=	-I${.CURDIR}/../common
 CFLAGS+=	-g
-CFLAGS+=	-DUSB_MSCTEST_BULK_SIZE=65536
-CFLAGS+=	-DUSB_POOL_SIZE=131072
 CFLAGS+=	-fno-pic
-CFLAGS+=	-DHAVE_ENDIAN_DEFS
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=	-march=i386
@@ -68,148 +52,7 @@ CFLAGS+=	-m32
 CFLAGS+=	-mno-abicalls
 .endif
 
-#
-# Single threaded BSD kernel
-#
-SRCS+=	bsd_kernel.c
-
-#
-# BUSSPACE implementation
-#
-SRCS+=	bsd_busspace.c
-
-#
-# BUSDMA implementation
-#
-SRCS+=	usb_busdma_loader.c
-
-#
-# USB controller drivers
-#
-
-SRCS+=	usb_controller.c
-
-.if defined(HAVE_AT91DCI)
-CFLAGS += -DUSB_PCI_PROBE_LIST="\"at91dci\""
-SRCS+=	at91dci.c
-.endif
-
-.if defined(HAVE_ATMEGADCI)
-CFLAGS += -DUSB_PCI_PROBE_LIST="\"atmegadci\""
-SRCS+=	atmegadci.c
-.endif
-
-.if defined(HAVE_AVR32DCI)
-CFLAGS += -DUSB_PCI_PROBE_LIST="\"avr32dci\""
-SRCS+=	avr32dci.c
-.endif
-
-.if defined(HAVE_DWCOTG)
-CFLAGS += -DUSB_PCI_PROBE_LIST="\"dwcotg\""
-SRCS+=	dwcotg.c
-.endif
-
-.if defined(HAVE_MUSBOTG)
-CFLAGS += -DUSB_PCI_PROBE_LIST="\"musbotg\""
-SRCS+=	musbotg.c
-.endif
-
-.if defined(HAVE_EHCI)
-CFLAGS += -DUSB_PCI_PROBE_LIST="\"ehci\""
-SRCS+=	ehci.c
-.endif
-
-.if defined(HAVE_OHCI)
-CFLAGS += -DUSB_PCI_PROBE_LIST="\"ohci\""
-SRCS+=	ohci.c
-.endif
-
-.if defined(HAVE_UHCI)
-CFLAGS += -DUSB_PCI_PROBE_LIST="\"uhci\""
-SRCS+=	uhci.c
-.endif
-
-.if defined(HAVE_XHCI)
-CFLAGS += -DUSB_PCI_PROBE_LIST="\"xhci\""
-SRCS+=	xhci.c
-.endif
-
-.if defined(HAVE_USS820DCI)
-CFLAGS += -DUSB_PCI_PROBE_LIST="\"uss820dci\""
-SRCS+=	uss820dci.c
-.endif
-
-.if defined(HAVE_SAF1761OTG)
-CFLAGS += -DUSB_PCI_PROBE_LIST="\"saf1761otg\""
-CFLAGS += -DUSB_PCI_MEMORY_ADDRESS=0x900000007f100000ULL
-CFLAGS += -DUSB_PCI_MEMORY_SIZE=0x40000U
-SRCS+=	saf1761_otg.c
-SRCS+=	saf1761_otg_boot.c
-.endif
-
-#
-# USB core and templates
-#
-SRCS+=	usb_core.c
-SRCS+=	usb_debug.c
-SRCS+=	usb_device.c
-SRCS+=	usb_dynamic.c
-SRCS+=	usb_error.c
-SRCS+=	usb_handle_request.c
-SRCS+=	usb_hid.c
-SRCS+=	usb_hub.c
-SRCS+=	usb_lookup.c
-SRCS+=	usb_msctest.c
-SRCS+=	usb_parse.c
-SRCS+=	usb_request.c
-SRCS+=	usb_transfer.c
-SRCS+=	usb_util.c
-SRCS+=	usb_template.c
-SRCS+=	usb_template_cdce.c
-SRCS+=	usb_template_msc.c
-SRCS+=	usb_template_mtp.c
-SRCS+=	usb_template_modem.c
-SRCS+=	usb_template_mouse.c
-SRCS+=	usb_template_kbd.c
-SRCS+=	usb_template_audio.c
-SRCS+=	sysinit_data.c
-SRCS+=	sysuninit_data.c
-
-#
-# USB mass storage support
-#
-SRCS+=	umass_common.c
-
-.if defined(HAVE_UMASS_LOADER)
-SRCS+=	umass_loader.c
-.endif
-
-CLEANFILES+= sysinit
-CLEANFILES+= sysinit.bin
-CLEANFILES+= sysinit_data.c
-CLEANFILES+= sysuninit_data.c
-
-CLEANFILES+= ${SRCS:C/\.c/.osys/g}
 
+.include "usbcore.mk"
+.include "../kshim/kshim.mk"
 .include <bsd.lib.mk>
-
-#
-# SYSINIT() and SYSUNINIT() handling
-#
-sysinit: ${T}/sysinit.c
-	${SYSCC} -Wall -o ${.TARGET} ${.ALLSRC}
-
-sysinit_data.c: sysinit.bin sysinit
-	${.OBJDIR}/sysinit -i sysinit.bin -o ${.TARGET} -k sysinit -s sysinit_data
-
-sysuninit_data.c: sysinit.bin sysinit
-	${.OBJDIR}/sysinit -i sysinit.bin -o ${.TARGET} -R -k sysuninit -s sysuninit_data
-
-.for F in ${OBJS}
-${F}sys: ${F}
-	${OBJCOPY} -j ".debug.sysinit" -O binary ${F} ${.TARGET}
-	[ -f ${.TARGET} ] || touch ${.TARGET}
-.endfor
-
-sysinit.bin: ${OBJS:C/\.o/.osys/g:C/sysinit_data.osys//g:C/sysuninit_data.osys//g}
-	cat ${.ALLSRC} > sysinit.bin
diff --git a/sys/boot/usb/tools/Makefile b/sys/boot/usb/tools/Makefile
new file mode 100644
index 000000000000..ae3259f98c32
--- /dev/null
+++ b/sys/boot/usb/tools/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+PROG=	sysinit
+NO_MAN=
+
+CFLAGS+=	-I${.CURDIR}/../../kshim
+
+BINDIR?=	/usr/bin
+
+.include <bsd.prog.mk>
diff --git a/sys/boot/usb/usbcore.mk b/sys/boot/usb/usbcore.mk
new file mode 100644
index 000000000000..05cacd1f7794
--- /dev/null
+++ b/sys/boot/usb/usbcore.mk
@@ -0,0 +1,155 @@
+#
+# $FreeBSD$
+#
+# Copyright (c) 2013 Hans Petter Selasky.
+# Copyright (c) 2014 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.
+#
+
+USBCOREDIR:=	${.PARSEDIR}
+S=${USBCOREDIR}/../..
+
+.PATH: \
+	${USBCOREDIR} \
+	${USBCOREDIR}/storage \
+	${S}/dev/usb \
+	${S}/dev/usb/controller \
+	${S}/dev/usb/serial \
+	${S}/dev/usb/storage \
+	${S}/dev/usb/template
+.undef S
+
+CFLAGS+=	-DUSB_MSCTEST_BULK_SIZE=65536
+CFLAGS+=	-DUSB_POOL_SIZE=131072
+
+#
+# BUSDMA implementation
+#
+SRCS+=	usb_busdma_loader.c
+
+#
+# USB controller drivers
+#
+
+KSRCS+=	usb_controller.c
+
+.if defined(HAVE_AT91DCI)
+CFLAGS += -DUSB_PCI_PROBE_LIST="\"at91dci\""
+KSRCS+=	at91dci.c
+.endif
+
+.if defined(HAVE_ATMEGADCI)
+CFLAGS += -DUSB_PCI_PROBE_LIST="\"atmegadci\""
+KSRCS+=	atmegadci.c
+.endif
+
+.if defined(HAVE_AVR32DCI)
+CFLAGS += -DUSB_PCI_PROBE_LIST="\"avr32dci\""
+KSRCS+=	avr32dci.c
+.endif
+
+.if defined(HAVE_DWCOTG)
+CFLAGS += -DUSB_PCI_PROBE_LIST="\"dwcotg\""
+KSRCS+=	dwcotg.c
+.endif
+
+.if defined(HAVE_MUSBOTG)
+CFLAGS += -DUSB_PCI_PROBE_LIST="\"musbotg\""
+KSRCS+=	musbotg.c
+.endif
+
+.if defined(HAVE_EHCI)
+CFLAGS += -DUSB_PCI_PROBE_LIST="\"ehci\""
+KSRCS+=	ehci.c
+.endif
+
+.if defined(HAVE_OHCI)
+CFLAGS += -DUSB_PCI_PROBE_LIST="\"ohci\""
+KSRCS+=	ohci.c
+.endif
+
+.if defined(HAVE_UHCI)
+CFLAGS += -DUSB_PCI_PROBE_LIST="\"uhci\""
+KSRCS+=	uhci.c
+.endif
+
+.if defined(HAVE_XHCI)
+CFLAGS += -DUSB_PCI_PROBE_LIST="\"xhci\""
+KSRCS+=	xhci.c
+.endif
+
+.if defined(HAVE_USS820DCI)
+CFLAGS += -DUSB_PCI_PROBE_LIST="\"uss820dci\""
+KSRCS+=	uss820dci.c
+.endif
+
+.if defined(HAVE_SAF1761OTG)
+CFLAGS += -DUSB_PCI_PROBE_LIST="\"saf1761otg\""
+CFLAGS += -DUSB_PCI_MEMORY_ADDRESS=0x900000007f100000ULL
+CFLAGS += -DUSB_PCI_MEMORY_SIZE=0x40000U
+KSRCS+=	saf1761_otg.c
+KSRCS+=	saf1761_otg_boot.c
+.endif
+
+#
+# USB core and templates
+#
+KSRCS+=	usb_core.c
+KSRCS+=	usb_debug.c
+KSRCS+=	usb_device.c
+KSRCS+=	usb_dynamic.c
+KSRCS+=	usb_error.c
+KSRCS+=	usb_handle_request.c
+KSRCS+=	usb_hid.c
+KSRCS+=	usb_hub.c
+KSRCS+=	usb_lookup.c
+KSRCS+=	usb_msctest.c
+KSRCS+=	usb_parse.c
+KSRCS+=	usb_request.c
+KSRCS+=	usb_transfer.c
+KSRCS+=	usb_util.c
+KSRCS+=	usb_template.c
+KSRCS+=	usb_template_cdce.c
+KSRCS+=	usb_template_msc.c
+KSRCS+=	usb_template_mtp.c
+KSRCS+=	usb_template_modem.c
+KSRCS+=	usb_template_mouse.c
+KSRCS+=	usb_template_kbd.c
+KSRCS+=	usb_template_audio.c
+KSRCS+=	usb_template_phone.c
+
+#
+# USB mass storage support
+#
+SRCS+=	umass_common.c
+
+.if defined(HAVE_UMASS_LOADER)
+CFLAGS+=        -I${.CURDIR}/../common
+SRCS+=  umass_loader.c
+.endif
+
diff --git a/sys/boot/userboot/libstand/Makefile b/sys/boot/userboot/libstand/Makefile
index 042b6a36a5ea..692aa5af30e7 100644
--- a/sys/boot/userboot/libstand/Makefile
+++ b/sys/boot/userboot/libstand/Makefile
@@ -69,18 +69,6 @@ SRCS+=	bcmp.c bcopy.c bzero.c ffs.c memccpy.c memchr.c memcmp.c memcpy.c \
 .PATH: ${LIBC}/arm/gen
 SRCS+= divsi3.S
 .endif
-.if ${MACHINE_CPUARCH} == "ia64"
-.PATH: ${LIBC}/ia64/string
-SRCS+=	bcmp.c bcopy.S bzero.S ffs.S index.c memccpy.c memchr.c memcmp.c \
-	memcpy.S memmove.S memset.c rindex.c strcat.c strchr.c \
-	strcmp.c strcpy.c strcspn.c strlen.c \
-	strncat.c strncmp.c strncpy.c strpbrk.c strrchr.c strsep.c \
-	strspn.c strstr.c strtok.c swab.c
-
-.PATH: ${LIBC}/ia64/gen
-SRCS+= __divdi3.S __divsi3.S __moddi3.S __modsi3.S
-SRCS+= __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S
-.endif
 .if ${MACHINE_CPUARCH} == "powerpc"
 .PATH: ${LIBC}/libc/quad
 SRCS+=	ashldi3.c ashrdi3.c
diff --git a/sys/boot/userboot/test/test.c b/sys/boot/userboot/test/test.c
index 36258a7a4dfb..d7ec3e4b5e99 100644
--- a/sys/boot/userboot/test/test.c
+++ b/sys/boot/userboot/test/test.c
@@ -36,6 +36,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
+#include <inttypes.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -292,6 +293,7 @@ test_copyin(void *arg, const void *from, uint64_t to, size_t size)
 	if (to + size > image_size)
 		size = image_size - to;
 	memcpy(&image[to], from, size);
+	return(0);
 }
 
 int
@@ -304,6 +306,7 @@ test_copyout(void *arg, uint64_t from, void *to, size_t size)
 	if (from + size > image_size)
 		size = image_size - from;
 	memcpy(to, &image[from], size);
+	return(0);
 }
 
 void
@@ -333,7 +336,7 @@ test_setgdt(void *arg, uint64_t v, size_t sz)
 void
 test_exec(void *arg, uint64_t pc)
 {
-	printf("Execute at 0x%llx\n", pc);
+	printf("Execute at 0x%"PRIu64"\n", pc);
 	test_exit(arg, 0);
 }
 
@@ -411,7 +414,7 @@ void
 usage()
 {
 
-	printf("usage: %s [-d <disk image path>] [-h <host filesystem path>\n");
+	printf("usage: [-d <disk image path>] [-h <host filesystem path>\n");
 	exit(1);
 }
 
diff --git a/sys/boot/userboot/userboot/devicename.c b/sys/boot/userboot/userboot/devicename.c
index 8569ed4c60e4..efa5634e541e 100644
--- a/sys/boot/userboot/userboot/devicename.c
+++ b/sys/boot/userboot/userboot/devicename.c
@@ -91,7 +91,7 @@ userboot_parsedev(struct disk_devdesc **dev, const char *devspec, const char **p
     struct disk_devdesc *idev;
     struct devsw	*dv;
     int			i, unit, err;
-    char		*cp;
+    const char		*cp;
     const char		*np;
 
     /* minimum length check */
@@ -126,7 +126,7 @@ userboot_parsedev(struct disk_devdesc **dev, const char *devspec, const char **p
 	unit = 0;
 
 	if (*np && (*np != ':')) {
-	    unit = strtol(np, &cp, 0);	/* get unit number if present */
+	    unit = strtol(np, (char **)&cp, 0);	/* get unit number if present */
 	    if (cp == np) {
 		err = EUNIT;
 		goto fail;
diff --git a/sys/boot/userboot/userboot/main.c b/sys/boot/userboot/userboot/main.c
index c9353ab7a045..d4cefff42251 100644
--- a/sys/boot/userboot/userboot/main.c
+++ b/sys/boot/userboot/userboot/main.c
@@ -141,7 +141,7 @@ loader_main(struct loader_callbacks *cb, void *arg, int version, int ndisks)
 	if (setjmp(jb))
 		return;
 
-	interact();			/* doesn't return */
+	interact(NULL);			/* doesn't return */
 
 	exit(0);
 }
diff --git a/sys/boot/zfs/zfsimpl.c b/sys/boot/zfs/zfsimpl.c
index b240b9662f29..16b57c7a6150 100644
--- a/sys/boot/zfs/zfsimpl.c
+++ b/sys/boot/zfs/zfsimpl.c
@@ -56,6 +56,7 @@ static const char *features_for_read[] = {
 	"org.illumos:lz4_compress",
 	"com.delphix:hole_birth",
 	"com.delphix:extensible_dataset",
+	"com.delphix:embedded_data",
 	NULL
 };
 
@@ -1133,6 +1134,34 @@ zio_read(const spa_t *spa, const blkptr_t *bp, void *buf)
 	void *pbuf;
 	int i, error;
 
+	/*
+	 * Process data embedded in block pointer
+	 */
+	if (BP_IS_EMBEDDED(bp)) {
+		ASSERT(BPE_GET_ETYPE(bp) == BP_EMBEDDED_TYPE_DATA);
+
+		size = BPE_GET_PSIZE(bp);
+		ASSERT(size <= BPE_PAYLOAD_SIZE);
+
+		if (cpfunc != ZIO_COMPRESS_OFF)
+			pbuf = zfs_alloc(size);
+		else
+			pbuf = buf;
+
+		decode_embedded_bp_compressed(bp, pbuf);
+		error = 0;
+
+		if (cpfunc != ZIO_COMPRESS_OFF) {
+			error = zio_decompress_data(cpfunc, pbuf,
+			    size, buf, BP_GET_LSIZE(bp));
+			zfs_free(pbuf, size);
+		}
+		if (error != 0)
+			printf("ZFS: i/o error - unable to decompress block pointer data, error %d\n",
+			    error);
+		return (error);
+	}
+
 	error = EIO;
 
 	for (i = 0; i < SPA_DVAS_PER_BP; i++) {
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
index 7d0d272c0d63..9c99e88140be 100644
--- a/sys/cam/ata/ata_da.c
+++ b/sys/cam/ata/ata_da.c
@@ -546,30 +546,22 @@ static int ada_write_cache = ADA_DEFAULT_WRITE_CACHE;
 
 static SYSCTL_NODE(_kern_cam, OID_AUTO, ada, CTLFLAG_RD, 0,
             "CAM Direct Access Disk driver");
-SYSCTL_INT(_kern_cam_ada, OID_AUTO, legacy_aliases, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_ada, OID_AUTO, legacy_aliases, CTLFLAG_RWTUN,
            &ada_legacy_aliases, 0, "Create legacy-like device aliases");
-TUNABLE_INT("kern.cam.ada.legacy_aliases", &ada_legacy_aliases);
-SYSCTL_INT(_kern_cam_ada, OID_AUTO, retry_count, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_ada, OID_AUTO, retry_count, CTLFLAG_RWTUN,
            &ada_retry_count, 0, "Normal I/O retry count");
-TUNABLE_INT("kern.cam.ada.retry_count", &ada_retry_count);
-SYSCTL_INT(_kern_cam_ada, OID_AUTO, default_timeout, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_ada, OID_AUTO, default_timeout, CTLFLAG_RWTUN,
            &ada_default_timeout, 0, "Normal I/O timeout (in seconds)");
-TUNABLE_INT("kern.cam.ada.default_timeout", &ada_default_timeout);
-SYSCTL_INT(_kern_cam_ada, OID_AUTO, send_ordered, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_ada, OID_AUTO, send_ordered, CTLFLAG_RWTUN,
            &ada_send_ordered, 0, "Send Ordered Tags");
-TUNABLE_INT("kern.cam.ada.send_ordered", &ada_send_ordered);
-SYSCTL_INT(_kern_cam_ada, OID_AUTO, spindown_shutdown, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_ada, OID_AUTO, spindown_shutdown, CTLFLAG_RWTUN,
            &ada_spindown_shutdown, 0, "Spin down upon shutdown");
-TUNABLE_INT("kern.cam.ada.spindown_shutdown", &ada_spindown_shutdown);
-SYSCTL_INT(_kern_cam_ada, OID_AUTO, spindown_suspend, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_ada, OID_AUTO, spindown_suspend, CTLFLAG_RWTUN,
            &ada_spindown_suspend, 0, "Spin down upon suspend");
-TUNABLE_INT("kern.cam.ada.spindown_suspend", &ada_spindown_suspend);
-SYSCTL_INT(_kern_cam_ada, OID_AUTO, read_ahead, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_ada, OID_AUTO, read_ahead, CTLFLAG_RWTUN,
            &ada_read_ahead, 0, "Enable disk read-ahead");
-TUNABLE_INT("kern.cam.ada.read_ahead", &ada_read_ahead);
-SYSCTL_INT(_kern_cam_ada, OID_AUTO, write_cache, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_ada, OID_AUTO, write_cache, CTLFLAG_RWTUN,
            &ada_write_cache, 0, "Enable disk write cache");
-TUNABLE_INT("kern.cam.ada.write_cache", &ada_write_cache);
 
 /*
  * ADA_ORDEREDTAG_INTERVAL determines how often, relative
@@ -727,8 +719,11 @@ adastrategy(struct bio *bp)
 	/*
 	 * Place it in the queue of disk activities for this disk
 	 */
-	if (bp->bio_cmd == BIO_DELETE &&
-	    (softc->flags & ADA_FLAG_CAN_TRIM)) {
+	if (bp->bio_cmd == BIO_DELETE) {
+		KASSERT((softc->flags & ADA_FLAG_CAN_TRIM) ||
+			((softc->flags & ADA_FLAG_CAN_CFA) &&
+			 !(softc->flags & ADA_FLAG_CAN_48BIT)),
+			("BIO_DELETE but no supported TRIM method."));
 		bioq_disksort(&softc->trim_queue, bp);
 	} else {
 		if (ADA_SIO)
@@ -1383,6 +1378,96 @@ adaregister(struct cam_periph *periph, void *arg)
 	return(CAM_REQ_CMP);
 }
 
+static void
+ada_dsmtrim(struct ada_softc *softc, struct bio *bp, struct ccb_ataio *ataio)
+{
+	struct trim_request *req = &softc->trim_req;
+	uint64_t lastlba = (uint64_t)-1;
+	int c, lastcount = 0, off, ranges = 0;
+
+	bzero(req, sizeof(*req));
+	TAILQ_INIT(&req->bps);
+	do {
+		uint64_t lba = bp->bio_pblkno;
+		int count = bp->bio_bcount / softc->params.secsize;
+
+		bioq_remove(&softc->trim_queue, bp);
+
+		/* Try to extend the previous range. */
+		if (lba == lastlba) {
+			c = min(count, ATA_DSM_RANGE_MAX - lastcount);
+			lastcount += c;
+			off = (ranges - 1) * ATA_DSM_RANGE_SIZE;
+			req->data[off + 6] = lastcount & 0xff;
+			req->data[off + 7] =
+				(lastcount >> 8) & 0xff;
+			count -= c;
+			lba += c;
+		}
+
+		while (count > 0) {
+			c = min(count, ATA_DSM_RANGE_MAX);
+			off = ranges * ATA_DSM_RANGE_SIZE;
+			req->data[off + 0] = lba & 0xff;
+			req->data[off + 1] = (lba >> 8) & 0xff;
+			req->data[off + 2] = (lba >> 16) & 0xff;
+			req->data[off + 3] = (lba >> 24) & 0xff;
+			req->data[off + 4] = (lba >> 32) & 0xff;
+			req->data[off + 5] = (lba >> 40) & 0xff;
+			req->data[off + 6] = c & 0xff;
+			req->data[off + 7] = (c >> 8) & 0xff;
+			lba += c;
+			count -= c;
+			lastcount = c;
+			ranges++;
+			/*
+			 * Its the caller's responsibility to ensure the
+			 * request will fit so we don't need to check for
+			 * overrun here
+			 */
+		}
+		lastlba = lba;
+		TAILQ_INSERT_TAIL(&req->bps, bp, bio_queue);
+		bp = bioq_first(&softc->trim_queue);
+		if (bp == NULL ||
+		    bp->bio_bcount / softc->params.secsize >
+		    (softc->trim_max_ranges - ranges) * ATA_DSM_RANGE_MAX)
+			break;
+	} while (1);
+	cam_fill_ataio(ataio,
+	    ada_retry_count,
+	    adadone,
+	    CAM_DIR_OUT,
+	    0,
+	    req->data,
+	    ((ranges + ATA_DSM_BLK_RANGES - 1) /
+	    ATA_DSM_BLK_RANGES) * ATA_DSM_BLK_SIZE,
+	    ada_default_timeout * 1000);
+	ata_48bit_cmd(ataio, ATA_DATA_SET_MANAGEMENT,
+	    ATA_DSM_TRIM, 0, (ranges + ATA_DSM_BLK_RANGES -
+	    1) / ATA_DSM_BLK_RANGES);
+}
+
+static void
+ada_cfaerase(struct ada_softc *softc, struct bio *bp, struct ccb_ataio *ataio)
+{
+	uint64_t lba = bp->bio_pblkno;
+	uint16_t count = bp->bio_bcount / softc->params.secsize;
+
+	cam_fill_ataio(ataio,
+	    ada_retry_count,
+	    adadone,
+	    CAM_DIR_NONE,
+	    0,
+	    NULL,
+	    0,
+	    ada_default_timeout*1000);
+
+	if (count >= 256)
+		count = 0;
+	ata_28bit_cmd(ataio, ATA_CFA_ERASE, 0, lba, count);
+}
+
 static void
 adastart(struct cam_periph *periph, union ccb *start_ccb)
 {
@@ -1400,76 +1485,15 @@ adastart(struct cam_periph *periph, union ccb *start_ccb)
 		/* 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 c, lastcount = 0, off, ranges = 0;
-
+			if (softc->flags & ADA_FLAG_CAN_TRIM) {
+				ada_dsmtrim(softc, bp, ataio);
+			} else if ((softc->flags & ADA_FLAG_CAN_CFA) &&
+			    !(softc->flags & ADA_FLAG_CAN_48BIT)) {
+				ada_cfaerase(softc, bp, ataio);
+			} else {
+				panic("adastart: BIO_DELETE without method, not possible.");
+			}
 			softc->trim_running = 1;
-			bzero(req, sizeof(*req));
-			TAILQ_INIT(&req->bps);
-			bp1 = bp;
-			do {
-				uint64_t lba = bp1->bio_pblkno;
-				int count = bp1->bio_bcount /
-				    softc->params.secsize;
-
-				bioq_remove(&softc->trim_queue, bp1);
-
-				/* Try to extend the previous range. */
-				if (lba == lastlba) {
-					c = min(count, ATA_DSM_RANGE_MAX - lastcount);
-					lastcount += c;
-					off = (ranges - 1) * ATA_DSM_RANGE_SIZE;
-					req->data[off + 6] = lastcount & 0xff;
-					req->data[off + 7] =
-					    (lastcount >> 8) & 0xff;
-					count -= c;
-					lba += c;
-				}
-
-				while (count > 0) {
-					c = min(count, ATA_DSM_RANGE_MAX);
-					off = ranges * ATA_DSM_RANGE_SIZE;
-					req->data[off + 0] = lba & 0xff;
-					req->data[off + 1] = (lba >> 8) & 0xff;
-					req->data[off + 2] = (lba >> 16) & 0xff;
-					req->data[off + 3] = (lba >> 24) & 0xff;
-					req->data[off + 4] = (lba >> 32) & 0xff;
-					req->data[off + 5] = (lba >> 40) & 0xff;
-					req->data[off + 6] = c & 0xff;
-					req->data[off + 7] = (c >> 8) & 0xff;
-					lba += c;
-					count -= c;
-					lastcount = c;
-					ranges++;
-					/*
-					 * Its the caller's responsibility to ensure the
-					 * request will fit so we don't need to check for
-					 * overrun here
-					 */
-				}
-				lastlba = lba;
-				TAILQ_INSERT_TAIL(&req->bps, bp1, bio_queue);
-				bp1 = bioq_first(&softc->trim_queue);
-				if (bp1 == NULL ||
-				    bp1->bio_bcount / softc->params.secsize >
-				    (softc->trim_max_ranges - ranges) *
-				    ATA_DSM_RANGE_MAX)
-					break;
-			} while (1);
-			cam_fill_ataio(ataio,
-			    ada_retry_count,
-			    adadone,
-			    CAM_DIR_OUT,
-			    0,
-			    req->data,
-			    ((ranges + ATA_DSM_BLK_RANGES - 1) /
-			        ATA_DSM_BLK_RANGES) * ATA_DSM_BLK_SIZE,
-			    ada_default_timeout * 1000);
-			ata_48bit_cmd(ataio, ATA_DATA_SET_MANAGEMENT,
-			    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;
@@ -1604,25 +1628,6 @@ adastart(struct cam_periph *periph, union ccb *start_ccb)
 			}
 			break;
 		}
-		case BIO_DELETE:
-		{
-			uint64_t lba = bp->bio_pblkno;
-			uint16_t count = bp->bio_bcount / softc->params.secsize;
-
-			cam_fill_ataio(ataio,
-			    ada_retry_count,
-			    adadone,
-			    CAM_DIR_NONE,
-			    0,
-			    NULL,
-			    0,
-			    ada_default_timeout*1000);
-
-			if (count >= 256)
-				count = 0;
-			ata_28bit_cmd(ataio, ATA_CFA_ERASE, 0, lba, count);
-			break;
-		}
 		case BIO_FLUSH:
 			cam_fill_ataio(ataio,
 			    1,
diff --git a/sys/cam/ata/ata_pmp.c b/sys/cam/ata/ata_pmp.c
index bd4d25a67def..fab0e6f1f574 100644
--- a/sys/cam/ata/ata_pmp.c
+++ b/sys/cam/ata/ata_pmp.c
@@ -139,15 +139,12 @@ static int pmp_hide_special = PMP_DEFAULT_HIDE_SPECIAL;
 
 static SYSCTL_NODE(_kern_cam, OID_AUTO, pmp, CTLFLAG_RD, 0,
             "CAM Direct Access Disk driver");
-SYSCTL_INT(_kern_cam_pmp, OID_AUTO, retry_count, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_pmp, OID_AUTO, retry_count, CTLFLAG_RWTUN,
            &pmp_retry_count, 0, "Normal I/O retry count");
-TUNABLE_INT("kern.cam.pmp.retry_count", &pmp_retry_count);
-SYSCTL_INT(_kern_cam_pmp, OID_AUTO, default_timeout, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_pmp, OID_AUTO, default_timeout, CTLFLAG_RWTUN,
            &pmp_default_timeout, 0, "Normal I/O timeout (in seconds)");
-TUNABLE_INT("kern.cam.pmp.default_timeout", &pmp_default_timeout);
-SYSCTL_INT(_kern_cam_pmp, OID_AUTO, hide_special, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_pmp, OID_AUTO, hide_special, CTLFLAG_RWTUN,
            &pmp_hide_special, 0, "Hide extra ports");
-TUNABLE_INT("kern.cam.pmp.hide_special", &pmp_hide_special);
 
 static struct periph_driver pmpdriver =
 {
diff --git a/sys/cam/cam.c b/sys/cam/cam.c
index f608d6f88729..939dd76c3068 100644
--- a/sys/cam/cam.c
+++ b/sys/cam/cam.c
@@ -116,7 +116,6 @@ SYSCTL_NODE(_kern, OID_AUTO, cam, CTLFLAG_RD, 0, "CAM Subsystem");
 #endif
 
 int cam_sort_io_queues = CAM_DEFAULT_SORT_IO_QUEUES;
-TUNABLE_INT("kern.cam.sort_io_queues", &cam_sort_io_queues);
 SYSCTL_INT(_kern_cam, OID_AUTO, sort_io_queues, CTLFLAG_RWTUN,
     &cam_sort_io_queues, 0, "Sort IO queues to try and optimise disk access patterns");
 #endif
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index 1628ab0d1f5b..2e23996966a8 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -597,7 +597,7 @@ cam_periph_invalidate(struct cam_periph *periph)
 		return;
 
 	CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph invalidated\n"));
-	if (periph->flags & CAM_PERIPH_ANNOUNCED)
+	if ((periph->flags & CAM_PERIPH_ANNOUNCED) && !rebooting)
 		xpt_denounce_periph(periph);
 	periph->flags |= CAM_PERIPH_INVALID;
 	periph->flags &= ~CAM_PERIPH_NEW_DEV_FOUND;
@@ -663,9 +663,9 @@ camperiphfree(struct cam_periph *periph)
 	xpt_remove_periph(periph);
 
 	xpt_unlock_buses();
-	if (periph->flags & CAM_PERIPH_ANNOUNCED) {
+	if ((periph->flags & CAM_PERIPH_ANNOUNCED) && !rebooting)
 		xpt_print(periph->path, "Periph destroyed\n");
-	} else
+	else
 		CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph destroyed\n"));
 
 	if (periph->flags & CAM_PERIPH_NEW_DEV_FOUND) {
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index bfad6dd95cbd..4a8f14b0f732 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -149,7 +149,6 @@ typedef int	xpt_pdrvfunc_t (struct periph_driver **pdrv, void *arg);
 /* Transport layer configuration information */
 static struct xpt_softc xsoftc;
 
-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");
 
@@ -163,7 +162,6 @@ 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");
 
@@ -197,12 +195,10 @@ static struct cdevsw xpt_cdevsw = {
 /* Storage for debugging datastructures */
 struct cam_path *cam_dpath;
 u_int32_t cam_dflags = CAM_DEBUG_FLAGS;
-TUNABLE_INT("kern.cam.dflags", &cam_dflags);
-SYSCTL_UINT(_kern_cam, OID_AUTO, dflags, CTLFLAG_RW,
+SYSCTL_UINT(_kern_cam, OID_AUTO, dflags, CTLFLAG_RWTUN,
 	&cam_dflags, 0, "Enabled debug flags");
 u_int32_t cam_debug_delay = CAM_DEBUG_DELAY;
-TUNABLE_INT("kern.cam.debug_delay", &cam_debug_delay);
-SYSCTL_UINT(_kern_cam, OID_AUTO, debug_delay, CTLFLAG_RW,
+SYSCTL_UINT(_kern_cam, OID_AUTO, debug_delay, CTLFLAG_RWTUN,
 	&cam_debug_delay, 0, "Delay in us after each debug message");
 
 /* Our boot-time initialization hook */
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 1e9a952eaedb..147441ca076f 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -82,20 +82,6 @@ __FBSDID("$FreeBSD$");
 
 struct ctl_softc *control_softc = NULL;
 
-/*
- * The default is to run with CTL_DONE_THREAD turned on.  Completed
- * transactions are queued for processing by the CTL work thread.  When
- * CTL_DONE_THREAD is not defined, completed transactions are processed in
- * the caller's context.
- */
-#define CTL_DONE_THREAD
-
-/*
- * Use the serial number and device ID provided by the backend, rather than
- * making up our own.
- */
-#define CTL_USE_BACKEND_SN
-
 /*
  * Size and alignment macros needed for Copan-specific HA hardware.  These
  * can go away when the HA code is re-written, and uses busdma for any
@@ -296,8 +282,10 @@ static struct scsi_control_page control_page_default = {
 	/*rlec*/0,
 	/*queue_flags*/0,
 	/*eca_and_aen*/0,
-	/*reserved*/0,
-	/*aen_holdoff_period*/{0, 0}
+	/*flags4*/SCP_TAS,
+	/*aen_holdoff_period*/{0, 0},
+	/*busy_timeout_period*/{0, 0},
+	/*extended_selftest_completion_time*/{0, 0}
 };
 
 static struct scsi_control_page control_page_changeable = {
@@ -306,8 +294,10 @@ static struct scsi_control_page control_page_changeable = {
 	/*rlec*/SCP_DSENSE,
 	/*queue_flags*/0,
 	/*eca_and_aen*/0,
-	/*reserved*/0,
-	/*aen_holdoff_period*/{0, 0}
+	/*flags4*/0,
+	/*aen_holdoff_period*/{0, 0},
+	/*busy_timeout_period*/{0, 0},
+	/*extended_selftest_completion_time*/{0, 0}
 };
 
 
@@ -321,20 +311,19 @@ static int     ctl_is_single = 1;
 static int     index_to_aps_page;
 
 SYSCTL_NODE(_kern_cam, OID_AUTO, ctl, CTLFLAG_RD, 0, "CAM Target Layer");
-static int worker_threads = 1;
-TUNABLE_INT("kern.cam.ctl.worker_threads", &worker_threads);
+static int worker_threads = -1;
 SYSCTL_INT(_kern_cam_ctl, OID_AUTO, worker_threads, CTLFLAG_RDTUN,
     &worker_threads, 1, "Number of worker threads");
 static int verbose = 0;
-TUNABLE_INT("kern.cam.ctl.verbose", &verbose);
 SYSCTL_INT(_kern_cam_ctl, OID_AUTO, verbose, CTLFLAG_RWTUN,
     &verbose, 0, "Show SCSI errors returned to initiator");
 
 /*
- * Serial number (0x80), device id (0x83), supported pages (0x00),
- * Block limits (0xB0) and Logical Block Provisioning (0xB2)
+ * Supported pages (0x00), Serial number (0x80), Device ID (0x83),
+ * SCSI Ports (0x88), Third-party Copy (0x8F), Block limits (0xB0),
+ * Block Device Characteristics (0xB1) and Logical Block Provisioning (0xB2)
  */
-#define SCSI_EVPD_NUM_SUPPORTED_PAGES	5
+#define SCSI_EVPD_NUM_SUPPORTED_PAGES	8
 
 static void ctl_isc_event_handler(ctl_ha_channel chanel, ctl_ha_event event,
 				  int param);
@@ -345,12 +334,10 @@ static int ctl_open(struct cdev *dev, int flags, int fmt, struct thread *td);
 static int ctl_close(struct cdev *dev, int flags, int fmt, struct thread *td);
 static void ctl_ioctl_online(void *arg);
 static void ctl_ioctl_offline(void *arg);
-static int ctl_ioctl_targ_enable(void *arg, struct ctl_id targ_id);
-static int ctl_ioctl_targ_disable(void *arg, struct ctl_id targ_id);
 static int ctl_ioctl_lun_enable(void *arg, struct ctl_id targ_id, int lun_id);
 static int ctl_ioctl_lun_disable(void *arg, struct ctl_id targ_id, int lun_id);
 static int ctl_ioctl_do_datamove(struct ctl_scsiio *ctsio);
-static int ctl_serialize_other_sc_cmd(struct ctl_scsiio *ctsio, int have_lock);
+static int ctl_serialize_other_sc_cmd(struct ctl_scsiio *ctsio);
 static int ctl_ioctl_submit_wait(union ctl_io *io);
 static void ctl_ioctl_datamove(union ctl_io *io);
 static void ctl_ioctl_done(union ctl_io *io);
@@ -362,8 +349,8 @@ static int ctl_ioctl_fill_ooa(struct ctl_lun *lun, uint32_t *cur_fill_num,
 			      struct ctl_ooa_entry *kern_entries);
 static int ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		     struct thread *td);
-uint32_t ctl_get_resindex(struct ctl_nexus *nexus);
-uint32_t ctl_port_idx(int port_num);
+static uint32_t ctl_map_lun(int port_num, uint32_t lun);
+static uint32_t ctl_map_lun_back(int port_num, uint32_t lun);
 #ifdef unused
 static union ctl_io *ctl_malloc_io(ctl_io_type io_type, uint32_t targ_port,
 				   uint32_t targ_target, uint32_t targ_lun,
@@ -392,8 +379,11 @@ static void ctl_hndl_per_res_out_on_other_sc(union ctl_ha_msg *msg);
 static int ctl_inquiry_evpd_supported(struct ctl_scsiio *ctsio, int alloc_len);
 static int ctl_inquiry_evpd_serial(struct ctl_scsiio *ctsio, int alloc_len);
 static int ctl_inquiry_evpd_devid(struct ctl_scsiio *ctsio, int alloc_len);
+static int ctl_inquiry_evpd_scsi_ports(struct ctl_scsiio *ctsio,
+					 int alloc_len);
 static int ctl_inquiry_evpd_block_limits(struct ctl_scsiio *ctsio,
 					 int alloc_len);
+static int ctl_inquiry_evpd_bdc(struct ctl_scsiio *ctsio, int alloc_len);
 static int ctl_inquiry_evpd_lbp(struct ctl_scsiio *ctsio, int alloc_len);
 static int ctl_inquiry_evpd(struct ctl_scsiio *ctsio);
 static int ctl_inquiry_std(struct ctl_scsiio *ctsio);
@@ -406,7 +396,7 @@ static ctl_action ctl_check_ooa(struct ctl_lun *lun, union ctl_io *pending_io,
 static int ctl_check_blocked(struct ctl_lun *lun);
 static int ctl_scsiio_lun_check(struct ctl_softc *ctl_softc,
 				struct ctl_lun *lun,
-				struct ctl_cmd_entry *entry,
+				const struct ctl_cmd_entry *entry,
 				struct ctl_scsiio *ctsio);
 //static int ctl_check_rtr(union ctl_io *pending_io, struct ctl_softc *softc);
 static void ctl_failover(void);
@@ -420,7 +410,9 @@ static int ctl_target_reset(struct ctl_softc *ctl_softc, union ctl_io *io,
 static int ctl_lun_reset(struct ctl_lun *lun, union ctl_io *io,
 			 ctl_ua_type ua_type);
 static int ctl_abort_task(union ctl_io *io);
-static void ctl_run_task_queue(struct ctl_softc *ctl_softc);
+static int ctl_abort_task_set(union ctl_io *io);
+static int ctl_i_t_nexus_reset(union ctl_io *io);
+static void ctl_run_task(union ctl_io *io);
 #ifdef CTL_IO_DELAY
 static void ctl_datamove_timer_wakeup(void *arg);
 static void ctl_done_timer_wakeup(void *arg);
@@ -437,8 +429,19 @@ static int ctl_datamove_remote_xfer(union ctl_io *io, unsigned command,
 				    ctl_ha_dt_cb callback);
 static void ctl_datamove_remote_read(union ctl_io *io);
 static void ctl_datamove_remote(union ctl_io *io);
-static int ctl_process_done(union ctl_io *io, int have_lock);
+static int ctl_process_done(union ctl_io *io);
+static void ctl_lun_thread(void *arg);
 static void ctl_work_thread(void *arg);
+static void ctl_enqueue_incoming(union ctl_io *io);
+static void ctl_enqueue_rtr(union ctl_io *io);
+static void ctl_enqueue_done(union ctl_io *io);
+static void ctl_enqueue_isc(union ctl_io *io);
+static const struct ctl_cmd_entry *
+    ctl_get_cmd_entry(struct ctl_scsiio *ctsio);
+static const struct ctl_cmd_entry *
+    ctl_validate_command(struct ctl_scsiio *ctsio);
+static int ctl_cmd_applicable(uint8_t lun_type,
+    const struct ctl_cmd_entry *entry);
 
 /*
  * Load the serialization table.  This isn't very pretty, but is probably
@@ -460,6 +463,7 @@ static struct cdevsw ctl_cdevsw = {
 
 
 MALLOC_DEFINE(M_CTL, "ctlmem", "Memory used for CTL");
+MALLOC_DEFINE(M_CTLIO, "ctlio", "Memory used for CTL requests");
 
 static int ctl_module_event_handler(module_t, int /*modeventtype_t*/, void *);
 
@@ -472,6 +476,11 @@ static moduledata_t ctl_moduledata = {
 DECLARE_MODULE(ctl, ctl_moduledata, SI_SUB_CONFIGURE, SI_ORDER_THIRD);
 MODULE_VERSION(ctl, 1);
 
+static struct ctl_frontend ioctl_frontend =
+{
+	.name = "ioctl",
+};
+
 static void
 ctl_isc_handler_finish_xfer(struct ctl_softc *ctl_softc,
 			    union ctl_ha_msg *msg_info)
@@ -496,8 +505,7 @@ ctl_isc_handler_finish_xfer(struct ctl_softc *ctl_softc,
 	       sizeof(ctsio->sense_data));
 	memcpy(&ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes,
 	       &msg_info->scsi.lbalen, sizeof(msg_info->scsi.lbalen));
-	STAILQ_INSERT_TAIL(&ctl_softc->isc_queue, &ctsio->io_hdr, links);
-	ctl_wakeup_thread();
+	ctl_enqueue_isc((union ctl_io *)ctsio);
 }
 
 static void
@@ -543,8 +551,7 @@ ctl_isc_handler_finish_ser_only(struct ctl_softc *ctl_softc,
 	}
 #endif
 	ctsio->io_hdr.msg_type = CTL_MSG_FINISH_IO;
-	STAILQ_INSERT_TAIL(&ctl_softc->isc_queue, &ctsio->io_hdr, links);
-	ctl_wakeup_thread();
+	ctl_enqueue_isc((union ctl_io *)ctsio);
 }
 
 /*
@@ -579,7 +586,6 @@ ctl_isc_event_handler(ctl_ha_channel channel, ctl_ha_event event, int param)
 			       isc_status);
 			return;
 		}
-		mtx_lock(&ctl_softc->ctl_lock);
 
 		switch (msg_info.hdr.msg_type) {
 		case CTL_MSG_SERIALIZE:
@@ -592,7 +598,6 @@ ctl_isc_event_handler(ctl_ha_channel channel, ctl_ha_event event, int param)
 				       "ctl_io!\n");
 				/* Bad Juju */
 				/* Need to set busy and send msg back */
-				mtx_unlock(&ctl_softc->ctl_lock);
 				msg_info.hdr.msg_type = CTL_MSG_BAD_JUJU;
 				msg_info.hdr.status = CTL_SCSI_ERROR;
 				msg_info.scsi.scsi_status = SCSI_STATUS_BUSY;
@@ -634,18 +639,14 @@ ctl_isc_event_handler(ctl_ha_channel channel, ctl_ha_event event, int param)
 			memcpy(io->scsiio.cdb, msg_info.scsi.cdb,
 			       CTL_MAX_CDBLEN);
 			if (ctl_softc->ha_mode == CTL_HA_MODE_XFER) {
-				struct ctl_cmd_entry *entry;
-				uint8_t opcode;
+				const struct ctl_cmd_entry *entry;
 
-				opcode = io->scsiio.cdb[0];
-				entry = &ctl_cmd_table[opcode];
+				entry = ctl_get_cmd_entry(&io->scsiio);
 				io->io_hdr.flags &= ~CTL_FLAG_DATA_MASK;
 				io->io_hdr.flags |=
 					entry->flags & CTL_FLAG_DATA_MASK;
 			}
-			STAILQ_INSERT_TAIL(&ctl_softc->isc_queue,
-					   &io->io_hdr, links);
-			ctl_wakeup_thread();
+			ctl_enqueue_isc(io);
 			break;
 
 		/* Performed on the Originating SC, XFER mode only */
@@ -749,11 +750,8 @@ ctl_isc_event_handler(ctl_ha_channel channel, ctl_ha_event event, int param)
 			 * the full S/G list.  Queue processing in the thread.
 			 * Otherwise wait for the next piece.
 			 */
-			if (msg_info.dt.sg_last != 0) {
-				STAILQ_INSERT_TAIL(&ctl_softc->isc_queue,
-						   &io->io_hdr, links);
-				ctl_wakeup_thread();
-			}
+			if (msg_info.dt.sg_last != 0)
+				ctl_enqueue_isc(io);
 			break;
 		}
 		/* Performed on the Serializing (primary) SC, XFER mode only */
@@ -779,10 +777,7 @@ ctl_isc_event_handler(ctl_ha_channel channel, ctl_ha_event event, int param)
 			io->scsiio.residual = msg_info.scsi.residual;
 			memcpy(&io->scsiio.sense_data,&msg_info.scsi.sense_data,
 			       sizeof(io->scsiio.sense_data));
-
-			STAILQ_INSERT_TAIL(&ctl_softc->isc_queue,
-					   &io->io_hdr, links);
-			ctl_wakeup_thread();
+			ctl_enqueue_isc(io);
 			break;
 		}
 
@@ -791,7 +786,6 @@ ctl_isc_event_handler(ctl_ha_channel channel, ctl_ha_event event, int param)
 			io = msg_info.hdr.original_sc;
 			if (io == NULL) {
 				printf("%s: Major Bummer\n", __func__);
-				mtx_unlock(&ctl_softc->ctl_lock);
 				return;
 			} else {
 #if 0
@@ -800,9 +794,7 @@ ctl_isc_event_handler(ctl_ha_channel channel, ctl_ha_event event, int param)
 			}
 			io->io_hdr.msg_type = CTL_MSG_R2R;
 			io->io_hdr.serializing_sc = msg_info.hdr.serializing_sc;
-			STAILQ_INSERT_TAIL(&ctl_softc->isc_queue,
-					   &io->io_hdr, links);
-			ctl_wakeup_thread();
+			ctl_enqueue_isc(io);
 			break;
 
 		/*
@@ -839,9 +831,7 @@ ctl_isc_event_handler(ctl_ha_channel channel, ctl_ha_event event, int param)
 
 			/* io = msg_info.hdr.serializing_sc; */
 			io->io_hdr.msg_type = CTL_MSG_BAD_JUJU;
-		        STAILQ_INSERT_TAIL(&ctl_softc->isc_queue,
-					   &io->io_hdr, links);
-			ctl_wakeup_thread();
+			ctl_enqueue_isc(io);
 			break;
 
 		/* Handle resets sent from the other side */
@@ -855,7 +845,6 @@ ctl_isc_event_handler(ctl_ha_channel channel, ctl_ha_event event, int param)
 				/* Bad Juju */
 				/* should I just call the proper reset func
 				   here??? */
-				mtx_unlock(&ctl_softc->ctl_lock);
 				goto bailout;
 			}
 			ctl_zero_io((union ctl_io *)taskio);
@@ -872,10 +861,7 @@ ctl_isc_event_handler(ctl_ha_channel channel, ctl_ha_event event, int param)
 			cs_prof_gettime(&taskio->io_hdr.start_ticks);
 #endif
 #endif /* CTL_TIME_IO */
-		        STAILQ_INSERT_TAIL(&ctl_softc->task_queue,
-					   &taskio->io_hdr, links);
-			ctl_softc->flags |= CTL_FLAG_TASK_PENDING;
-			ctl_wakeup_thread();
+			ctl_run_task((union ctl_io *)taskio);
 			break;
 		}
 		/* Persistent Reserve action which needs attention */
@@ -887,15 +873,12 @@ ctl_isc_event_handler(ctl_ha_channel channel, ctl_ha_event event, int param)
 				       "ctl_io!\n");
 				/* Bad Juju */
 				/* Need to set busy and send msg back */
-				mtx_unlock(&ctl_softc->ctl_lock);
 				goto bailout;
 			}
 			ctl_zero_io((union ctl_io *)presio);
 			presio->io_hdr.msg_type = CTL_MSG_PERS_ACTION;
 			presio->pr_msg = msg_info.pr;
-		        STAILQ_INSERT_TAIL(&ctl_softc->isc_queue,
-					   &presio->io_hdr, links);
-			ctl_wakeup_thread();
+			ctl_enqueue_isc((union ctl_io *)presio);
 			break;
 		case CTL_MSG_SYNC_FE:
 			rcv_sync_msg = 1;
@@ -908,23 +891,21 @@ ctl_isc_event_handler(ctl_ha_channel channel, ctl_ha_event event, int param)
 			struct copan_aps_subpage *current_sp;
 			uint32_t targ_lun;
 
-			targ_lun = msg_info.hdr.nexus.targ_lun;
-			if (msg_info.hdr.nexus.lun_map_fn != NULL)
-				targ_lun = msg_info.hdr.nexus.lun_map_fn(msg_info.hdr.nexus.lun_map_arg, targ_lun);
-
+			targ_lun = msg_info.hdr.nexus.targ_mapped_lun;
 			lun = ctl_softc->ctl_luns[targ_lun];
+			mtx_lock(&lun->lun_lock);
 			page_index = &lun->mode_pages.index[index_to_aps_page];
 			current_sp = (struct copan_aps_subpage *)
 				     (page_index->page_data +
 				     (page_index->page_len * CTL_PAGE_CURRENT));
 
 			current_sp->lock_active = msg_info.aps.lock_flag;
+			mtx_unlock(&lun->lun_lock);
 		        break;
 		}
 		default:
 		        printf("How did I get here?\n");
 		}
-		mtx_unlock(&ctl_softc->ctl_lock);
 	} else if (event == CTL_HA_EVT_MSG_SENT) {
 		if (param != CTL_HA_STATUS_SUCCESS) {
 			printf("Bad status from ctl_ha_msg_send status %d\n",
@@ -960,8 +941,7 @@ ctl_init(void)
 {
 	struct ctl_softc *softc;
 	struct ctl_io_pool *internal_pool, *emergency_pool, *other_pool;
-	struct ctl_frontend *fe;
-	struct ctl_lun *lun;
+	struct ctl_port *port;
         uint8_t sc_id =0;
 	int i, error, retval;
 	//int isc_retval;
@@ -1040,22 +1020,12 @@ ctl_init(void)
 	softc->target.wwid[1] = 0x87654321;
 	STAILQ_INIT(&softc->lun_list);
 	STAILQ_INIT(&softc->pending_lun_queue);
-	STAILQ_INIT(&softc->task_queue);
-	STAILQ_INIT(&softc->incoming_queue);
-	STAILQ_INIT(&softc->rtr_queue);
-	STAILQ_INIT(&softc->done_queue);
-	STAILQ_INIT(&softc->isc_queue);
 	STAILQ_INIT(&softc->fe_list);
+	STAILQ_INIT(&softc->port_list);
 	STAILQ_INIT(&softc->be_list);
 	STAILQ_INIT(&softc->io_pools);
+	ctl_tpc_init(softc);
 
-	lun = &softc->lun;
-
-	/*
-	 * We don't bother calling these with ctl_lock held here, because,
-	 * in theory, no one else can try to do anything while we're in our
-	 * module init routine.
-	 */
 	if (ctl_pool_create(softc, CTL_POOL_INTERNAL, CTL_POOL_ENTRIES_INTERNAL,
 			    &internal_pool)!= 0){
 		printf("ctl: can't allocate %d entry internal pool, "
@@ -1085,76 +1055,65 @@ ctl_init(void)
 	softc->emergency_pool = emergency_pool;
 	softc->othersc_pool = other_pool;
 
-	/*
-	 * We used to allocate a processor LUN here.  The new scheme is to
-	 * just let the user allocate LUNs as he sees fit.
-	 */
-#if 0
-	mtx_lock(&softc->ctl_lock);
-	ctl_alloc_lun(softc, lun, /*be_lun*/NULL, /*target*/softc->target);
-	mtx_unlock(&softc->ctl_lock);
-#endif
-
-	if (worker_threads > MAXCPU || worker_threads == 0) {
-		printf("invalid kern.cam.ctl.worker_threads value; "
-		    "setting to 1");
-		worker_threads = 1;
-	} else if (worker_threads < 0) {
-		if (mp_ncpus > 2) {
-			/*
-			 * Using more than two worker threads actually hurts
-			 * performance due to lock contention.
-			 */
-			worker_threads = 2;
-		} else {
-			worker_threads = 1;
-		}
-	}
+	if (worker_threads <= 0)
+		worker_threads = max(1, mp_ncpus / 4);
+	if (worker_threads > CTL_MAX_THREADS)
+		worker_threads = CTL_MAX_THREADS;
 
 	for (i = 0; i < worker_threads; i++) {
-		error = kproc_kthread_add(ctl_work_thread, softc,
-		    &softc->work_thread, NULL, 0, 0, "ctl", "work%d", i);
+		struct ctl_thread *thr = &softc->threads[i];
+
+		mtx_init(&thr->queue_lock, "CTL queue mutex", NULL, MTX_DEF);
+		thr->ctl_softc = softc;
+		STAILQ_INIT(&thr->incoming_queue);
+		STAILQ_INIT(&thr->rtr_queue);
+		STAILQ_INIT(&thr->done_queue);
+		STAILQ_INIT(&thr->isc_queue);
+
+		error = kproc_kthread_add(ctl_work_thread, thr,
+		    &softc->ctl_proc, &thr->thread, 0, 0, "ctl", "work%d", i);
 		if (error != 0) {
 			printf("error creating CTL work thread!\n");
-			mtx_lock(&softc->ctl_lock);
-			ctl_free_lun(lun);
-			mtx_unlock(&softc->ctl_lock);
 			ctl_pool_free(internal_pool);
 			ctl_pool_free(emergency_pool);
 			ctl_pool_free(other_pool);
 			return (error);
 		}
 	}
+	error = kproc_kthread_add(ctl_lun_thread, softc,
+	    &softc->ctl_proc, NULL, 0, 0, "ctl", "lun");
+	if (error != 0) {
+		printf("error creating CTL lun thread!\n");
+		ctl_pool_free(internal_pool);
+		ctl_pool_free(emergency_pool);
+		ctl_pool_free(other_pool);
+		return (error);
+	}
 	if (bootverbose)
 		printf("ctl: CAM Target Layer loaded\n");
 
-	/*
-	 * Initialize the initiator and portname mappings
-	 */
-	memset(softc->wwpn_iid, 0, sizeof(softc->wwpn_iid));
-
 	/*
 	 * Initialize the ioctl front end.
 	 */
-	fe = &softc->ioctl_info.fe;
-	sprintf(softc->ioctl_info.port_name, "CTL ioctl");
-	fe->port_type = CTL_PORT_IOCTL;
-	fe->num_requested_ctl_io = 100;
-	fe->port_name = softc->ioctl_info.port_name;
-	fe->port_online = ctl_ioctl_online;
-	fe->port_offline = ctl_ioctl_offline;
-	fe->onoff_arg = &softc->ioctl_info;
-	fe->targ_enable = ctl_ioctl_targ_enable;
-	fe->targ_disable = ctl_ioctl_targ_disable;
-	fe->lun_enable = ctl_ioctl_lun_enable;
-	fe->lun_disable = ctl_ioctl_lun_disable;
-	fe->targ_lun_arg = &softc->ioctl_info;
-	fe->fe_datamove = ctl_ioctl_datamove;
-	fe->fe_done = ctl_ioctl_done;
-	fe->max_targets = 15;
-	fe->max_target_id = 15;
+	ctl_frontend_register(&ioctl_frontend);
+	port = &softc->ioctl_info.port;
+	port->frontend = &ioctl_frontend;
+	sprintf(softc->ioctl_info.port_name, "ioctl");
+	port->port_type = CTL_PORT_IOCTL;
+	port->num_requested_ctl_io = 100;
+	port->port_name = softc->ioctl_info.port_name;
+	port->port_online = ctl_ioctl_online;
+	port->port_offline = ctl_ioctl_offline;
+	port->onoff_arg = &softc->ioctl_info;
+	port->lun_enable = ctl_ioctl_lun_enable;
+	port->lun_disable = ctl_ioctl_lun_disable;
+	port->targ_lun_arg = &softc->ioctl_info;
+	port->fe_datamove = ctl_ioctl_datamove;
+	port->fe_done = ctl_ioctl_done;
+	port->max_targets = 15;
+	port->max_target_id = 15;
 
-	if (ctl_frontend_register(&softc->ioctl_info.fe,
+	if (ctl_port_register(&softc->ioctl_info.port,
 	                  (softc->flags & CTL_FLAG_MASTER_SHELF)) != 0) {
 		printf("ctl: ioctl front end registration failed, will "
 		       "continue anyway\n");
@@ -1180,7 +1139,7 @@ ctl_shutdown(void)
 
 	softc = (struct ctl_softc *)control_softc;
 
-	if (ctl_frontend_deregister(&softc->ioctl_info.fe) != 0)
+	if (ctl_port_deregister(&softc->ioctl_info.port) != 0)
 		printf("ctl: ioctl front end deregistration failed\n");
 
 	mtx_lock(&softc->ctl_lock);
@@ -1195,6 +1154,8 @@ ctl_shutdown(void)
 
 	mtx_unlock(&softc->ctl_lock);
 
+	ctl_frontend_deregister(&ioctl_frontend);
+
 	/*
 	 * This will rip the rug out from under any FETDs or anyone else
 	 * that has a pool allocated.  Since we increment our module
@@ -1208,8 +1169,10 @@ ctl_shutdown(void)
 
 #if 0
 	ctl_shutdown_thread(softc->work_thread);
+	mtx_destroy(&softc->queue_lock);
 #endif
 
+	ctl_tpc_shutdown(softc);
 	mtx_destroy(&softc->pool_lock);
 	mtx_destroy(&softc->ctl_lock);
 
@@ -1258,7 +1221,7 @@ int
 ctl_port_enable(ctl_port_type port_type)
 {
 	struct ctl_softc *softc;
-	struct ctl_frontend *fe;
+	struct ctl_port *port;
 
 	if (ctl_is_single == 0) {
 		union ctl_ha_msg msg_info;
@@ -1287,13 +1250,13 @@ ctl_port_enable(ctl_port_type port_type)
 
 	softc = control_softc;
 
-	STAILQ_FOREACH(fe, &softc->fe_list, links) {
-		if (port_type & fe->port_type)
+	STAILQ_FOREACH(port, &softc->port_list, links) {
+		if (port_type & port->port_type)
 		{
 #if 0
-			printf("port %d\n", fe->targ_port);
+			printf("port %d\n", port->targ_port);
 #endif
-			ctl_frontend_online(fe);
+			ctl_port_online(port);
 		}
 	}
 
@@ -1304,13 +1267,13 @@ int
 ctl_port_disable(ctl_port_type port_type)
 {
 	struct ctl_softc *softc;
-	struct ctl_frontend *fe;
+	struct ctl_port *port;
 
 	softc = control_softc;
 
-	STAILQ_FOREACH(fe, &softc->fe_list, links) {
-		if (port_type & fe->port_type)
-			ctl_frontend_offline(fe);
+	STAILQ_FOREACH(port, &softc->port_list, links) {
+		if (port_type & port->port_type)
+			ctl_port_offline(port);
 	}
 
 	return (0);
@@ -1328,7 +1291,7 @@ ctl_port_list(struct ctl_port_entry *entries, int num_entries_alloced,
 	      ctl_port_type port_type, int no_virtual)
 {
 	struct ctl_softc *softc;
-	struct ctl_frontend *fe;
+	struct ctl_port *port;
 	int entries_dropped, entries_filled;
 	int retval;
 	int i;
@@ -1341,14 +1304,14 @@ ctl_port_list(struct ctl_port_entry *entries, int num_entries_alloced,
 
 	i = 0;
 	mtx_lock(&softc->ctl_lock);
-	STAILQ_FOREACH(fe, &softc->fe_list, links) {
+	STAILQ_FOREACH(port, &softc->port_list, links) {
 		struct ctl_port_entry *entry;
 
-		if ((fe->port_type & port_type) == 0)
+		if ((port->port_type & port_type) == 0)
 			continue;
 
 		if ((no_virtual != 0)
-		 && (fe->virtual_port != 0))
+		 && (port->virtual_port != 0))
 			continue;
 
 		if (entries_filled >= num_entries_alloced) {
@@ -1357,13 +1320,13 @@ ctl_port_list(struct ctl_port_entry *entries, int num_entries_alloced,
 		}
 		entry = &entries[i];
 
-		entry->port_type = fe->port_type;
-		strlcpy(entry->port_name, fe->port_name,
+		entry->port_type = port->port_type;
+		strlcpy(entry->port_name, port->port_name,
 			sizeof(entry->port_name));
-		entry->physical_port = fe->physical_port;
-		entry->virtual_port = fe->virtual_port;
-		entry->wwnn = fe->wwnn;
-		entry->wwpn = fe->wwpn;
+		entry->physical_port = port->physical_port;
+		entry->virtual_port = port->virtual_port;
+		entry->wwnn = port->wwnn;
+		entry->wwpn = port->wwpn;
 
 		i++;
 		entries_filled++;
@@ -1402,32 +1365,24 @@ ctl_ioctl_offline(void *arg)
 
 /*
  * Remove an initiator by port number and initiator ID.
- * Returns 0 for success, 1 for failure.
+ * Returns 0 for success, -1 for failure.
  */
 int
-ctl_remove_initiator(int32_t targ_port, uint32_t iid)
+ctl_remove_initiator(struct ctl_port *port, int iid)
 {
-	struct ctl_softc *softc;
-
-	softc = control_softc;
+	struct ctl_softc *softc = control_softc;
 
 	mtx_assert(&softc->ctl_lock, MA_NOTOWNED);
 
-	if ((targ_port < 0)
-	 || (targ_port > CTL_MAX_PORTS)) {
-		printf("%s: invalid port number %d\n", __func__, targ_port);
-		return (1);
-	}
 	if (iid > CTL_MAX_INIT_PER_PORT) {
 		printf("%s: initiator ID %u > maximun %u!\n",
 		       __func__, iid, CTL_MAX_INIT_PER_PORT);
-		return (1);
+		return (-1);
 	}
 
 	mtx_lock(&softc->ctl_lock);
-
-	softc->wwpn_iid[targ_port][iid].in_use = 0;
-
+	port->wwpn_iid[iid].in_use--;
+	port->wwpn_iid[iid].last_use = time_uptime;
 	mtx_unlock(&softc->ctl_lock);
 
 	return (0);
@@ -1435,41 +1390,91 @@ ctl_remove_initiator(int32_t targ_port, uint32_t iid)
 
 /*
  * Add an initiator to the initiator map.
- * Returns 0 for success, 1 for failure.
+ * Returns iid for success, < 0 for failure.
  */
 int
-ctl_add_initiator(uint64_t wwpn, int32_t targ_port, uint32_t iid)
+ctl_add_initiator(struct ctl_port *port, int iid, uint64_t wwpn, char *name)
 {
-	struct ctl_softc *softc;
-	int retval;
-
-	softc = control_softc;
+	struct ctl_softc *softc = control_softc;
+	time_t best_time;
+	int i, best;
 
 	mtx_assert(&softc->ctl_lock, MA_NOTOWNED);
 
-	retval = 0;
-
-	if ((targ_port < 0)
-	 || (targ_port > CTL_MAX_PORTS)) {
-		printf("%s: invalid port number %d\n", __func__, targ_port);
-		return (1);
-	}
-	if (iid > CTL_MAX_INIT_PER_PORT) {
-		printf("%s: WWPN %#jx initiator ID %u > maximun %u!\n",
+	if (iid >= CTL_MAX_INIT_PER_PORT) {
+		printf("%s: WWPN %#jx initiator ID %u > maximum %u!\n",
 		       __func__, wwpn, iid, CTL_MAX_INIT_PER_PORT);
-		return (1);
+		free(name, M_CTL);
+		return (-1);
 	}
 
 	mtx_lock(&softc->ctl_lock);
 
-	if (softc->wwpn_iid[targ_port][iid].in_use != 0) {
+	if (iid < 0 && (wwpn != 0 || name != NULL)) {
+		for (i = 0; i < CTL_MAX_INIT_PER_PORT; i++) {
+			if (wwpn != 0 && wwpn == port->wwpn_iid[i].wwpn) {
+				iid = i;
+				break;
+			}
+			if (name != NULL && port->wwpn_iid[i].name != NULL &&
+			    strcmp(name, port->wwpn_iid[i].name) == 0) {
+				iid = i;
+				break;
+			}
+		}
+	}
+
+	if (iid < 0) {
+		for (i = 0; i < CTL_MAX_INIT_PER_PORT; i++) {
+			if (port->wwpn_iid[i].in_use == 0 &&
+			    port->wwpn_iid[i].wwpn == 0 &&
+			    port->wwpn_iid[i].name == NULL) {
+				iid = i;
+				break;
+			}
+		}
+	}
+
+	if (iid < 0) {
+		best = -1;
+		best_time = INT32_MAX;
+		for (i = 0; i < CTL_MAX_INIT_PER_PORT; i++) {
+			if (port->wwpn_iid[i].in_use == 0) {
+				if (port->wwpn_iid[i].last_use < best_time) {
+					best = i;
+					best_time = port->wwpn_iid[i].last_use;
+				}
+			}
+		}
+		iid = best;
+	}
+
+	if (iid < 0) {
+		mtx_unlock(&softc->ctl_lock);
+		free(name, M_CTL);
+		return (-2);
+	}
+
+	if (port->wwpn_iid[iid].in_use > 0 && (wwpn != 0 || name != NULL)) {
 		/*
-		 * We don't treat this as an error.
+		 * This is not an error yet.
 		 */
-		if (softc->wwpn_iid[targ_port][iid].wwpn == wwpn) {
-			printf("%s: port %d iid %u WWPN %#jx arrived again?\n",
-			       __func__, targ_port, iid, (uintmax_t)wwpn);
-			goto bailout;
+		if (wwpn != 0 && wwpn == port->wwpn_iid[iid].wwpn) {
+#if 0
+			printf("%s: port %d iid %u WWPN %#jx arrived"
+			    " again\n", __func__, port->targ_port,
+			    iid, (uintmax_t)wwpn);
+#endif
+			goto take;
+		}
+		if (name != NULL && port->wwpn_iid[iid].name != NULL &&
+		    strcmp(name, port->wwpn_iid[iid].name) == 0) {
+#if 0
+			printf("%s: port %d iid %u name '%s' arrived"
+			    " again\n", __func__, port->targ_port,
+			    iid, name);
+#endif
+			goto take;
 		}
 
 		/*
@@ -1477,42 +1482,80 @@ ctl_add_initiator(uint64_t wwpn, int32_t targ_port, uint32_t iid)
 		 * driver is telling us we have a new WWPN for this
 		 * initiator ID, so we pretty much need to use it.
 		 */
-		printf("%s: port %d iid %u WWPN %#jx arrived, WWPN %#jx is "
-		       "still at that address\n", __func__, targ_port, iid,
-		       (uintmax_t)wwpn,
-		       (uintmax_t)softc->wwpn_iid[targ_port][iid].wwpn);
+		printf("%s: port %d iid %u WWPN %#jx '%s' arrived,"
+		    " but WWPN %#jx '%s' is still at that address\n",
+		    __func__, port->targ_port, iid, wwpn, name,
+		    (uintmax_t)port->wwpn_iid[iid].wwpn,
+		    port->wwpn_iid[iid].name);
 
 		/*
 		 * XXX KDM clear have_ca and ua_pending on each LUN for
 		 * this initiator.
 		 */
 	}
-	softc->wwpn_iid[targ_port][iid].in_use = 1;
-	softc->wwpn_iid[targ_port][iid].iid = iid;
-	softc->wwpn_iid[targ_port][iid].wwpn = wwpn;
-	softc->wwpn_iid[targ_port][iid].port = targ_port;
-
-bailout:
-
+take:
+	free(port->wwpn_iid[iid].name, M_CTL);
+	port->wwpn_iid[iid].name = name;
+	port->wwpn_iid[iid].wwpn = wwpn;
+	port->wwpn_iid[iid].in_use++;
 	mtx_unlock(&softc->ctl_lock);
 
-	return (retval);
-}
-
-/*
- * XXX KDM should we pretend to do something in the target/lun
- * enable/disable functions?
- */
-static int
-ctl_ioctl_targ_enable(void *arg, struct ctl_id targ_id)
-{
-	return (0);
+	return (iid);
 }
 
 static int
-ctl_ioctl_targ_disable(void *arg, struct ctl_id targ_id)
+ctl_create_iid(struct ctl_port *port, int iid, uint8_t *buf)
 {
-	return (0);
+	int len;
+
+	switch (port->port_type) {
+	case CTL_PORT_FC:
+	{
+		struct scsi_transportid_fcp *id =
+		    (struct scsi_transportid_fcp *)buf;
+		if (port->wwpn_iid[iid].wwpn == 0)
+			return (0);
+		memset(id, 0, sizeof(*id));
+		id->format_protocol = SCSI_PROTO_FC;
+		scsi_u64to8b(port->wwpn_iid[iid].wwpn, id->n_port_name);
+		return (sizeof(*id));
+	}
+	case CTL_PORT_ISCSI:
+	{
+		struct scsi_transportid_iscsi_port *id =
+		    (struct scsi_transportid_iscsi_port *)buf;
+		if (port->wwpn_iid[iid].name == NULL)
+			return (0);
+		memset(id, 0, 256);
+		id->format_protocol = SCSI_TRN_ISCSI_FORMAT_PORT |
+		    SCSI_PROTO_ISCSI;
+		len = strlcpy(id->iscsi_name, port->wwpn_iid[iid].name, 252) + 1;
+		len = roundup2(min(len, 252), 4);
+		scsi_ulto2b(len, id->additional_length);
+		return (sizeof(*id) + len);
+	}
+	case CTL_PORT_SAS:
+	{
+		struct scsi_transportid_sas *id =
+		    (struct scsi_transportid_sas *)buf;
+		if (port->wwpn_iid[iid].wwpn == 0)
+			return (0);
+		memset(id, 0, sizeof(*id));
+		id->format_protocol = SCSI_PROTO_SAS;
+		scsi_u64to8b(port->wwpn_iid[iid].wwpn, id->sas_address);
+		return (sizeof(*id));
+	}
+	default:
+	{
+		struct scsi_transportid_spi *id =
+		    (struct scsi_transportid_spi *)buf;
+		memset(id, 0, sizeof(*id));
+		id->format_protocol = SCSI_PROTO_SPI;
+		scsi_ulto2b(iid, id->scsi_addr);
+		scsi_ulto2b(port->targ_port, id->rel_trgt_port_id);
+		return (sizeof(*id));
+	}
+	}
 }
 
 static int
@@ -1699,7 +1742,7 @@ ctl_ioctl_do_datamove(struct ctl_scsiio *ctsio)
  * (SER_ONLY mode).
  */
 static int
-ctl_serialize_other_sc_cmd(struct ctl_scsiio *ctsio, int have_lock)
+ctl_serialize_other_sc_cmd(struct ctl_scsiio *ctsio)
 {
 	struct ctl_softc *ctl_softc;
 	union ctl_ha_msg msg_info;
@@ -1708,12 +1751,8 @@ ctl_serialize_other_sc_cmd(struct ctl_scsiio *ctsio, int have_lock)
 	uint32_t targ_lun;
 
 	ctl_softc = control_softc;
-	if (have_lock == 0)
-		mtx_lock(&ctl_softc->ctl_lock);
 
-	targ_lun = ctsio->io_hdr.nexus.targ_lun;
-	if (ctsio->io_hdr.nexus.lun_map_fn != NULL)
-		targ_lun = ctsio->io_hdr.nexus.lun_map_fn(ctsio->io_hdr.nexus.lun_map_arg, targ_lun);
+	targ_lun = ctsio->io_hdr.nexus.targ_mapped_lun;
 	lun = ctl_softc->ctl_luns[targ_lun];
 	if (lun==NULL)
 	{
@@ -1742,12 +1781,11 @@ ctl_serialize_other_sc_cmd(struct ctl_scsiio *ctsio, int have_lock)
 	        if (ctl_ha_msg_send(CTL_HA_CHAN_CTL, &msg_info,
 				sizeof(msg_info), 0 ) > CTL_HA_STATUS_SUCCESS) {
 		}
-		if (have_lock == 0)
-			mtx_unlock(&ctl_softc->ctl_lock);
 		return(1);
 
 	}
 
+	mtx_lock(&lun->lun_lock);
     	TAILQ_INSERT_TAIL(&lun->ooa_queue, &ctsio->io_hdr, ooa_links);
 
 	switch (ctl_check_ooa(lun, (union ctl_io *)ctsio,
@@ -1762,8 +1800,7 @@ ctl_serialize_other_sc_cmd(struct ctl_scsiio *ctsio, int have_lock)
 	case CTL_ACTION_SKIP:
 		if (ctl_softc->ha_mode == CTL_HA_MODE_XFER) {
 			ctsio->io_hdr.flags |= CTL_FLAG_IS_WAS_ON_RTR;
-			STAILQ_INSERT_TAIL(&ctl_softc->rtr_queue,
-					   &ctsio->io_hdr, links);
+			ctl_enqueue_rtr((union ctl_io *)ctsio);
 		} else {
 
 			/* send msg back to other side */
@@ -1858,8 +1895,7 @@ ctl_serialize_other_sc_cmd(struct ctl_scsiio *ctsio, int have_lock)
 		}
 		break;
 	}
-	if (have_lock == 0)
-		mtx_unlock(&ctl_softc->ctl_lock);
+	mtx_unlock(&lun->lun_lock);
 	return (retval);
 }
 
@@ -2018,8 +2054,7 @@ ctl_ioctl_fill_ooa(struct ctl_lun *lun, uint32_t *cur_fill_num,
 
 	retval = 0;
 
-	mtx_assert(&control_softc->ctl_lock, MA_OWNED);
-
+	mtx_lock(&lun->lun_lock);
 	for (io = (union ctl_io *)TAILQ_FIRST(&lun->ooa_queue); (io != NULL);
 	     (*cur_fill_num)++, io = (union ctl_io *)TAILQ_NEXT(&io->io_hdr,
 	     ooa_links)) {
@@ -2056,6 +2091,7 @@ ctl_ioctl_fill_ooa(struct ctl_lun *lun, uint32_t *cur_fill_num,
 		if (io->io_hdr.flags & CTL_FLAG_DMA_QUEUED)
 			entry->cmd_flags |= CTL_OOACMD_FLAG_DMA_QUEUED;
 	}
+	mtx_unlock(&lun->lun_lock);
 
 	return (retval);
 }
@@ -2080,40 +2116,40 @@ ctl_copyin_alloc(void *user_addr, int len, char *error_str,
 }
 
 static void
-ctl_free_args(int num_be_args, struct ctl_be_arg *be_args)
+ctl_free_args(int num_args, struct ctl_be_arg *args)
 {
 	int i;
 
-	if (be_args == NULL)
+	if (args == NULL)
 		return;
 
-	for (i = 0; i < num_be_args; i++) {
-		free(be_args[i].kname, M_CTL);
-		free(be_args[i].kvalue, M_CTL);
+	for (i = 0; i < num_args; i++) {
+		free(args[i].kname, M_CTL);
+		free(args[i].kvalue, M_CTL);
 	}
 
-	free(be_args, M_CTL);
+	free(args, M_CTL);
 }
 
 static struct ctl_be_arg *
-ctl_copyin_args(int num_be_args, struct ctl_be_arg *be_args,
+ctl_copyin_args(int num_args, struct ctl_be_arg *uargs,
 		char *error_str, size_t error_str_len)
 {
 	struct ctl_be_arg *args;
 	int i;
 
-	args = ctl_copyin_alloc(be_args, num_be_args * sizeof(*be_args),
+	args = ctl_copyin_alloc(uargs, num_args * sizeof(*args),
 				error_str, error_str_len);
 
 	if (args == NULL)
 		goto bailout;
 
-	for (i = 0; i < num_be_args; i++) {
+	for (i = 0; i < num_args; i++) {
 		args[i].kname = NULL;
 		args[i].kvalue = NULL;
 	}
 
-	for (i = 0; i < num_be_args; i++) {
+	for (i = 0; i < num_args; i++) {
 		uint8_t *tmpptr;
 
 		args[i].kname = ctl_copyin_alloc(args[i].name,
@@ -2127,31 +2163,43 @@ ctl_copyin_args(int num_be_args, struct ctl_be_arg *be_args,
 			goto bailout;
 		}
 
-		args[i].kvalue = NULL;
-
-		tmpptr = ctl_copyin_alloc(args[i].value,
-			args[i].vallen, error_str, error_str_len);
-		if (tmpptr == NULL)
-			goto bailout;
-
-		args[i].kvalue = tmpptr;
-
-		if ((args[i].flags & CTL_BEARG_ASCII)
-		 && (tmpptr[args[i].vallen - 1] != '\0')) {
-			snprintf(error_str, error_str_len, "Argument %d "
-				 "value is not NUL-terminated", i);
-			goto bailout;
+		if (args[i].flags & CTL_BEARG_RD) {
+			tmpptr = ctl_copyin_alloc(args[i].value,
+				args[i].vallen, error_str, error_str_len);
+			if (tmpptr == NULL)
+				goto bailout;
+			if ((args[i].flags & CTL_BEARG_ASCII)
+			 && (tmpptr[args[i].vallen - 1] != '\0')) {
+				snprintf(error_str, error_str_len, "Argument "
+				    "%d value is not NUL-terminated", i);
+				goto bailout;
+			}
+			args[i].kvalue = tmpptr;
+		} else {
+			args[i].kvalue = malloc(args[i].vallen,
+			    M_CTL, M_WAITOK | M_ZERO);
 		}
 	}
 
 	return (args);
 bailout:
 
-	ctl_free_args(num_be_args, args);
+	ctl_free_args(num_args, args);
 
 	return (NULL);
 }
 
+static void
+ctl_copyout_args(int num_args, struct ctl_be_arg *args)
+{
+	int i;
+
+	for (i = 0; i < num_args; i++) {
+		if (args[i].flags & CTL_BEARG_WR)
+			copyout(args[i].kvalue, args[i].value, args[i].vallen);
+	}
+}
+
 /*
  * Escape characters that are illegal or not recommended in XML.
  */
@@ -2207,14 +2255,14 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		 * to this FETD.
 		 */
 		if ((softc->ioctl_info.flags & CTL_IOCTL_FLAG_ENABLED) == 0) {
-			retval = -EPERM;
+			retval = EPERM;
 			break;
 		}
 
-		io = ctl_alloc_io(softc->ioctl_info.fe.ctl_pool_ref);
+		io = ctl_alloc_io(softc->ioctl_info.port.ctl_pool_ref);
 		if (io == NULL) {
 			printf("ctl_ioctl: can't allocate ctl_io!\n");
-			retval = -ENOSPC;
+			retval = ENOSPC;
 			break;
 		}
 
@@ -2235,7 +2283,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		/*
 		 * The user sets the initiator ID, target and LUN IDs.
 		 */
-		io->io_hdr.nexus.targ_port = softc->ioctl_info.fe.targ_port;
+		io->io_hdr.nexus.targ_port = softc->ioctl_info.port.targ_port;
 		io->io_hdr.flags |= CTL_FLAG_USER_REQ;
 		if ((io->io_hdr.io_type == CTL_IO_SCSI)
 		 && (io->scsiio.tag_type != CTL_TAG_UNTAGGED))
@@ -2258,20 +2306,20 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 	case CTL_ENABLE_PORT:
 	case CTL_DISABLE_PORT:
 	case CTL_SET_PORT_WWNS: {
-		struct ctl_frontend *fe;
+		struct ctl_port *port;
 		struct ctl_port_entry *entry;
 
 		entry = (struct ctl_port_entry *)addr;
 		
 		mtx_lock(&softc->ctl_lock);
-		STAILQ_FOREACH(fe, &softc->fe_list, links) {
+		STAILQ_FOREACH(port, &softc->port_list, links) {
 			int action, done;
 
 			action = 0;
 			done = 0;
 
 			if ((entry->port_type == CTL_PORT_NONE)
-			 && (entry->targ_port == fe->targ_port)) {
+			 && (entry->targ_port == port->targ_port)) {
 				/*
 				 * If the user only wants to enable or
 				 * disable or set WWNs on a specific port,
@@ -2279,7 +2327,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 				 */
 				action = 1;
 				done = 1;
-			} else if (entry->port_type & fe->port_type) {
+			} else if (entry->port_type & port->port_type) {
 				/*
 				 * Compare the user's type mask with the
 				 * particular frontend type to see if we
@@ -2314,21 +2362,21 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 
 					STAILQ_FOREACH(lun, &softc->lun_list,
 						       links) {
-						fe->lun_enable(fe->targ_lun_arg,
+						port->lun_enable(port->targ_lun_arg,
 						    lun->target,
 						    lun->lun);
 					}
 
-					ctl_frontend_online(fe);
+					ctl_port_online(port);
 				} else if (cmd == CTL_DISABLE_PORT) {
 					struct ctl_lun *lun;
 
-					ctl_frontend_offline(fe);
+					ctl_port_offline(port);
 
 					STAILQ_FOREACH(lun, &softc->lun_list,
 						       links) {
-						fe->lun_disable(
-						    fe->targ_lun_arg,
+						port->lun_disable(
+						    port->targ_lun_arg,
 						    lun->target,
 						    lun->lun);
 					}
@@ -2337,7 +2385,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 				mtx_lock(&softc->ctl_lock);
 
 				if (cmd == CTL_SET_PORT_WWNS)
-					ctl_frontend_set_wwns(fe,
+					ctl_port_set_wwns(port,
 					    (entry->flags & CTL_PORT_WWNN_VALID) ?
 					    1 : 0, entry->wwnn,
 					    (entry->flags & CTL_PORT_WWPN_VALID) ?
@@ -2350,7 +2398,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		break;
 	}
 	case CTL_GET_PORT_LIST: {
-		struct ctl_frontend *fe;
+		struct ctl_port *port;
 		struct ctl_port_list *list;
 		int i;
 
@@ -2370,7 +2418,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		list->dropped_num = 0;
 		i = 0;
 		mtx_lock(&softc->ctl_lock);
-		STAILQ_FOREACH(fe, &softc->fe_list, links) {
+		STAILQ_FOREACH(port, &softc->port_list, links) {
 			struct ctl_port_entry entry, *list_entry;
 
 			if (list->fill_num >= list->alloc_num) {
@@ -2378,15 +2426,15 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 				continue;
 			}
 
-			entry.port_type = fe->port_type;
-			strlcpy(entry.port_name, fe->port_name,
+			entry.port_type = port->port_type;
+			strlcpy(entry.port_name, port->port_name,
 				sizeof(entry.port_name));
-			entry.targ_port = fe->targ_port;
-			entry.physical_port = fe->physical_port;
-			entry.virtual_port = fe->virtual_port;
-			entry.wwnn = fe->wwnn;
-			entry.wwpn = fe->wwpn;
-			if (fe->status & CTL_PORT_STATUS_ONLINE)
+			entry.targ_port = port->targ_port;
+			entry.physical_port = port->physical_port;
+			entry.virtual_port = port->virtual_port;
+			entry.wwnn = port->wwnn;
+			entry.wwpn = port->wwpn;
+			if (port->status & CTL_PORT_STATUS_ONLINE)
 				entry.online = 1;
 			else
 				entry.online = 0;
@@ -2428,6 +2476,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		mtx_lock(&softc->ctl_lock);
 		printf("Dumping OOA queues:\n");
 		STAILQ_FOREACH(lun, &softc->lun_list, links) {
+			mtx_lock(&lun->lun_lock);
 			for (io = (union ctl_io *)TAILQ_FIRST(
 			     &lun->ooa_queue); io != NULL;
 			     io = (union ctl_io *)TAILQ_NEXT(&io->io_hdr,
@@ -2449,6 +2498,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 				sbuf_finish(&sb);
 				printf("%s\n", sbuf_data(&sb));
 			}
+			mtx_unlock(&lun->lun_lock);
 		}
 		printf("OOA queues dump done\n");
 		mtx_unlock(&softc->ctl_lock);
@@ -2564,15 +2614,16 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 			ooa_info->status = CTL_OOA_INVALID_LUN;
 			break;
 		}
-
+		mtx_lock(&lun->lun_lock);
+		mtx_unlock(&softc->ctl_lock);
 		ooa_info->num_entries = 0;
 		for (io = (union ctl_io *)TAILQ_FIRST(&lun->ooa_queue);
 		     io != NULL; io = (union ctl_io *)TAILQ_NEXT(
 		     &io->io_hdr, ooa_links)) {
 			ooa_info->num_entries++;
 		}
+		mtx_unlock(&lun->lun_lock);
 
-		mtx_unlock(&softc->ctl_lock);
 		ooa_info->status = CTL_OOA_SUCCESS;
 
 		break;
@@ -2690,6 +2741,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 			delay_info->status = CTL_DELAY_STATUS_INVALID_LUN;
 		} else {
 			lun = softc->ctl_luns[delay_info->lun_id];
+			mtx_lock(&lun->lun_lock);
 
 			delay_info->status = CTL_DELAY_STATUS_OK;
 
@@ -2722,6 +2774,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 					CTL_DELAY_STATUS_INVALID_LOC;
 				break;
 			}
+			mtx_unlock(&lun->lun_lock);
 		}
 
 		mtx_unlock(&softc->ctl_lock);
@@ -2744,7 +2797,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 			softc->flags |= CTL_FLAG_REAL_SYNC;
 			break;
 		default:
-			retval = -EINVAL;
+			retval = EINVAL;
 			break;
 		}
 		mtx_unlock(&softc->ctl_lock);
@@ -2782,12 +2835,13 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		 * in the set case, hopefully the user won't do something
 		 * silly.
 		 */
+		mtx_lock(&lun->lun_lock);
+		mtx_unlock(&softc->ctl_lock);
 		if (cmd == CTL_GETSYNC)
 			sync_info->sync_interval = lun->sync_interval;
 		else
 			lun->sync_interval = sync_info->sync_interval;
-
-		mtx_unlock(&softc->ctl_lock);
+		mtx_unlock(&lun->lun_lock);
 
 		sync_info->status = CTL_GS_SYNC_OK;
 
@@ -2848,6 +2902,8 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 			retval = EINVAL;
 			break;
 		}
+		mtx_lock(&lun->lun_lock);
+		mtx_unlock(&softc->ctl_lock);
 
 		/*
 		 * We could do some checking here to verify the validity
@@ -2870,7 +2926,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		err_desc->serial = lun->error_serial;
 		lun->error_serial++;
 
-		mtx_unlock(&softc->ctl_lock);
+		mtx_unlock(&lun->lun_lock);
 		break;
 	}
 	case CTL_ERROR_INJECT_DELETE: {
@@ -2890,6 +2946,8 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 			retval = EINVAL;
 			break;
 		}
+		mtx_lock(&lun->lun_lock);
+		mtx_unlock(&softc->ctl_lock);
 		STAILQ_FOREACH_SAFE(desc, &lun->error_list, links, desc2) {
 			if (desc->serial != delete_desc->serial)
 				continue;
@@ -2899,7 +2957,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 			free(desc, M_CTL);
 			delete_done = 1;
 		}
-		mtx_unlock(&softc->ctl_lock);
+		mtx_unlock(&lun->lun_lock);
 		if (delete_done == 0) {
 			printf("%s: CTL_ERROR_INJECT_DELETE: can't find "
 			       "error serial %ju on LUN %u\n", __func__, 
@@ -2910,22 +2968,11 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		break;
 	}
 	case CTL_DUMP_STRUCTS: {
-		int i, j, k;
+		int i, j, k, idx;
+		struct ctl_port *port;
 		struct ctl_frontend *fe;
 
-		printf("CTL IID to WWPN map start:\n");
-		for (i = 0; i < CTL_MAX_PORTS; i++) {
-			for (j = 0; j < CTL_MAX_INIT_PER_PORT; j++) {
-				if (softc->wwpn_iid[i][j].in_use == 0)
-					continue;
-
-				printf("port %d iid %u WWPN %#jx\n",
-				       softc->wwpn_iid[i][j].port,
-				       softc->wwpn_iid[i][j].iid, 
-				       (uintmax_t)softc->wwpn_iid[i][j].wwpn);
-			}
-		}
-		printf("CTL IID to WWPN map end\n");
+		mtx_lock(&softc->ctl_lock);
 		printf("CTL Persistent Reservation information start:\n");
 		for (i = 0; i < CTL_MAX_LUNS; i++) {
 			struct ctl_lun *lun;
@@ -2938,36 +2985,48 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 
 			for (j = 0; j < (CTL_MAX_PORTS * 2); j++) {
 				for (k = 0; k < CTL_MAX_INIT_PER_PORT; k++){
-					if (lun->per_res[j+k].registered == 0)
+					idx = j * CTL_MAX_INIT_PER_PORT + k;
+					if (lun->per_res[idx].registered == 0)
 						continue;
-					printf("LUN %d port %d iid %d key "
+					printf("  LUN %d port %d iid %d key "
 					       "%#jx\n", i, j, k,
 					       (uintmax_t)scsi_8btou64(
-					       lun->per_res[j+k].res_key.key));
+					       lun->per_res[idx].res_key.key));
 				}
 			}
 		}
 		printf("CTL Persistent Reservation information end\n");
-		printf("CTL Frontends:\n");
+		printf("CTL Ports:\n");
+		STAILQ_FOREACH(port, &softc->port_list, links) {
+			printf("  Port %d '%s' Frontend '%s' Type %u pp %d vp %d WWNN "
+			       "%#jx WWPN %#jx\n", port->targ_port, port->port_name,
+			       port->frontend->name, port->port_type,
+			       port->physical_port, port->virtual_port,
+			       (uintmax_t)port->wwnn, (uintmax_t)port->wwpn);
+			for (j = 0; j < CTL_MAX_INIT_PER_PORT; j++) {
+				if (port->wwpn_iid[j].in_use == 0 &&
+				    port->wwpn_iid[j].wwpn == 0 &&
+				    port->wwpn_iid[j].name == NULL)
+					continue;
+
+				printf("    iid %u use %d WWPN %#jx '%s'\n",
+				    j, port->wwpn_iid[j].in_use,
+				    (uintmax_t)port->wwpn_iid[j].wwpn,
+				    port->wwpn_iid[j].name);
+			}
+		}
+		printf("CTL Port information end\n");
+		mtx_unlock(&softc->ctl_lock);
 		/*
 		 * XXX KDM calling this without a lock.  We'd likely want
 		 * to drop the lock before calling the frontend's dump
 		 * routine anyway.
 		 */
+		printf("CTL Frontends:\n");
 		STAILQ_FOREACH(fe, &softc->fe_list, links) {
-			printf("Frontend %s Type %u pport %d vport %d WWNN "
-			       "%#jx WWPN %#jx\n", fe->port_name, fe->port_type,
-			       fe->physical_port, fe->virtual_port,
-			       (uintmax_t)fe->wwnn, (uintmax_t)fe->wwpn);
-
-			/*
-			 * Frontends are not required to support the dump
-			 * routine.
-			 */
-			if (fe->fe_dump == NULL)
-				continue;
-
-			fe->fe_dump();
+			printf("  Frontend '%s'\n", fe->name);
+			if (fe->fe_dump != NULL)
+				fe->fe_dump();
 		}
 		printf("CTL Frontend information end\n");
 		break;
@@ -3002,6 +3061,8 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		retval = backend->ioctl(dev, cmd, addr, flag, td);
 
 		if (lun_req->num_be_args > 0) {
+			ctl_copyout_args(lun_req->num_be_args,
+				      lun_req->kern_be_args);
 			ctl_free_args(lun_req->num_be_args,
 				      lun_req->kern_be_args);
 		}
@@ -3011,7 +3072,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		struct sbuf *sb;
 		struct ctl_lun *lun;
 		struct ctl_lun_list *list;
-		struct ctl_be_lun_option *opt;
+		struct ctl_option *opt;
 
 		list = (struct ctl_lun_list *)addr;
 
@@ -3052,8 +3113,8 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		sbuf_printf(sb, "<ctllunlist>\n");
 
 		mtx_lock(&softc->ctl_lock);
-
 		STAILQ_FOREACH(lun, &softc->lun_list, links) {
+			mtx_lock(&lun->lun_lock);
 			retval = sbuf_printf(sb, "<lun id=\"%ju\">\n",
 					     (uintmax_t)lun->lun);
 
@@ -3064,7 +3125,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 			if (retval != 0)
 				break;
 
-			retval = sbuf_printf(sb, "<backend_type>%s"
+			retval = sbuf_printf(sb, "\t<backend_type>%s"
 					     "</backend_type>\n",
 					     (lun->backend == NULL) ?  "none" :
 					     lun->backend->name);
@@ -3072,7 +3133,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 			if (retval != 0)
 				break;
 
-			retval = sbuf_printf(sb, "<lun_type>%d</lun_type>\n",
+			retval = sbuf_printf(sb, "\t<lun_type>%d</lun_type>\n",
 					     lun->be_lun->lun_type);
 
 			if (retval != 0)
@@ -3085,20 +3146,20 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 				continue;
 			}
 
-			retval = sbuf_printf(sb, "<size>%ju</size>\n",
+			retval = sbuf_printf(sb, "\t<size>%ju</size>\n",
 					     (lun->be_lun->maxlba > 0) ?
 					     lun->be_lun->maxlba + 1 : 0);
 
 			if (retval != 0)
 				break;
 
-			retval = sbuf_printf(sb, "<blocksize>%u</blocksize>\n",
+			retval = sbuf_printf(sb, "\t<blocksize>%u</blocksize>\n",
 					     lun->be_lun->blocksize);
 
 			if (retval != 0)
 				break;
 
-			retval = sbuf_printf(sb, "<serial_number>");
+			retval = sbuf_printf(sb, "\t<serial_number>");
 
 			if (retval != 0)
 				break;
@@ -3114,7 +3175,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 			if (retval != 0)
 				break;
 
-			retval = sbuf_printf(sb, "<device_id>");
+			retval = sbuf_printf(sb, "\t<device_id>");
 
 			if (retval != 0)
 				break;
@@ -3135,7 +3196,8 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 					break;
 			}
 			STAILQ_FOREACH(opt, &lun->be_lun->options, links) {
-				retval = sbuf_printf(sb, "<%s>%s</%s>", opt->name, opt->value, opt->name);
+				retval = sbuf_printf(sb, "\t<%s>%s</%s>\n",
+				    opt->name, opt->value, opt->name);
 				if (retval != 0)
 					break;
 			}
@@ -3144,7 +3206,10 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 
 			if (retval != 0)
 				break;
+			mtx_unlock(&lun->lun_lock);
 		}
+		if (lun != NULL)
+			mtx_unlock(&lun->lun_lock);
 		mtx_unlock(&softc->ctl_lock);
 
 		if ((retval != 0)
@@ -3174,22 +3239,157 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 
 		ci = (struct ctl_iscsi *)addr;
 
-		mtx_lock(&softc->ctl_lock);
-		STAILQ_FOREACH(fe, &softc->fe_list, links) {
-			if (strcmp(fe->port_name, "iscsi") == 0)
-				break;
-		}
-		mtx_unlock(&softc->ctl_lock);
-
+		fe = ctl_frontend_find("iscsi");
 		if (fe == NULL) {
 			ci->status = CTL_ISCSI_ERROR;
-			snprintf(ci->error_str, sizeof(ci->error_str), "Backend \"iscsi\" not found.");
+			snprintf(ci->error_str, sizeof(ci->error_str),
+			    "Frontend \"iscsi\" not found.");
 			break;
 		}
 
 		retval = fe->ioctl(dev, cmd, addr, flag, td);
 		break;
 	}
+	case CTL_PORT_REQ: {
+		struct ctl_req *req;
+		struct ctl_frontend *fe;
+
+		req = (struct ctl_req *)addr;
+
+		fe = ctl_frontend_find(req->driver);
+		if (fe == NULL) {
+			req->status = CTL_LUN_ERROR;
+			snprintf(req->error_str, sizeof(req->error_str),
+			    "Frontend \"%s\" not found.", req->driver);
+			break;
+		}
+		if (req->num_args > 0) {
+			req->kern_args = ctl_copyin_args(req->num_args,
+			    req->args, req->error_str, sizeof(req->error_str));
+			if (req->kern_args == NULL) {
+				req->status = CTL_LUN_ERROR;
+				break;
+			}
+		}
+
+		retval = fe->ioctl(dev, cmd, addr, flag, td);
+
+		if (req->num_args > 0) {
+			ctl_copyout_args(req->num_args, req->kern_args);
+			ctl_free_args(req->num_args, req->kern_args);
+		}
+		break;
+	}
+	case CTL_PORT_LIST: {
+		struct sbuf *sb;
+		struct ctl_port *port;
+		struct ctl_lun_list *list;
+		struct ctl_option *opt;
+
+		list = (struct ctl_lun_list *)addr;
+
+		sb = sbuf_new(NULL, NULL, list->alloc_len, SBUF_FIXEDLEN);
+		if (sb == NULL) {
+			list->status = CTL_LUN_LIST_ERROR;
+			snprintf(list->error_str, sizeof(list->error_str),
+				 "Unable to allocate %d bytes for LUN list",
+				 list->alloc_len);
+			break;
+		}
+
+		sbuf_printf(sb, "<ctlportlist>\n");
+
+		mtx_lock(&softc->ctl_lock);
+		STAILQ_FOREACH(port, &softc->port_list, links) {
+			retval = sbuf_printf(sb, "<targ_port id=\"%ju\">\n",
+					     (uintmax_t)port->targ_port);
+
+			/*
+			 * Bail out as soon as we see that we've overfilled
+			 * the buffer.
+			 */
+			if (retval != 0)
+				break;
+
+			retval = sbuf_printf(sb, "\t<frontend_type>%s"
+			    "</frontend_type>\n", port->frontend->name);
+			if (retval != 0)
+				break;
+
+			retval = sbuf_printf(sb, "\t<port_type>%d</port_type>\n",
+					     port->port_type);
+			if (retval != 0)
+				break;
+
+			retval = sbuf_printf(sb, "\t<online>%s</online>\n",
+			    (port->status & CTL_PORT_STATUS_ONLINE) ? "YES" : "NO");
+			if (retval != 0)
+				break;
+
+			retval = sbuf_printf(sb, "\t<port_name>%s</port_name>\n",
+			    port->port_name);
+			if (retval != 0)
+				break;
+
+			retval = sbuf_printf(sb, "\t<physical_port>%d</physical_port>\n",
+			    port->physical_port);
+			if (retval != 0)
+				break;
+
+			retval = sbuf_printf(sb, "\t<virtual_port>%d</virtual_port>\n",
+			    port->virtual_port);
+			if (retval != 0)
+				break;
+
+			retval = sbuf_printf(sb, "\t<wwnn>%#jx</wwnn>\n",
+			    (uintmax_t)port->wwnn);
+			if (retval != 0)
+				break;
+
+			retval = sbuf_printf(sb, "\t<wwpn>%#jx</wwpn>\n",
+			    (uintmax_t)port->wwpn);
+			if (retval != 0)
+				break;
+
+			if (port->port_info != NULL) {
+				retval = port->port_info(port->onoff_arg, sb);
+				if (retval != 0)
+					break;
+			}
+			STAILQ_FOREACH(opt, &port->options, links) {
+				retval = sbuf_printf(sb, "\t<%s>%s</%s>\n",
+				    opt->name, opt->value, opt->name);
+				if (retval != 0)
+					break;
+			}
+
+			retval = sbuf_printf(sb, "</targ_port>\n");
+			if (retval != 0)
+				break;
+		}
+		mtx_unlock(&softc->ctl_lock);
+
+		if ((retval != 0)
+		 || ((retval = sbuf_printf(sb, "</ctlportlist>\n")) != 0)) {
+			retval = 0;
+			sbuf_delete(sb);
+			list->status = CTL_LUN_LIST_NEED_MORE_SPACE;
+			snprintf(list->error_str, sizeof(list->error_str),
+				 "Out of space, %d bytes is too small",
+				 list->alloc_len);
+			break;
+		}
+
+		sbuf_finish(sb);
+
+		retval = copyout(sbuf_data(sb), list->lun_xml,
+				 sbuf_len(sb) + 1);
+
+		list->fill_len = sbuf_len(sb) + 1;
+		list->status = CTL_LUN_LIST_OK;
+		sbuf_delete(sb);
+		break;
+	}
 	default: {
 		/* XXX KDM should we fix this? */
 #if 0
@@ -3215,7 +3415,7 @@ ctl_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 		if (found == 0) {
 			printf("ctl: unknown ioctl command %#lx or backend "
 			       "%d\n", cmd, type);
-			retval = -EINVAL;
+			retval = EINVAL;
 			break;
 		}
 		retval = backend->ioctl(dev, cmd, addr, flag, td);
@@ -3254,6 +3454,35 @@ ctl_port_idx(int port_num)
 		return(port_num - CTL_MAX_PORTS);
 }
 
+static uint32_t
+ctl_map_lun(int port_num, uint32_t lun_id)
+{
+	struct ctl_port *port;
+
+	port = control_softc->ctl_ports[ctl_port_idx(port_num)];
+	if (port == NULL)
+		return (UINT32_MAX);
+	if (port->lun_map == NULL)
+		return (lun_id);
+	return (port->lun_map(port->targ_lun_arg, lun_id));
+}
+
+static uint32_t
+ctl_map_lun_back(int port_num, uint32_t lun_id)
+{
+	struct ctl_port *port;
+	uint32_t i;
+
+	port = control_softc->ctl_ports[ctl_port_idx(port_num)];
+	if (port->lun_map == NULL)
+		return (lun_id);
+	for (i = 0; i < CTL_MAX_LUNS; i++) {
+		if (port->lun_map(port->targ_lun_arg, i) == lun_id)
+			return (i);
+	}
+	return (UINT32_MAX);
+}
+
 /*
  * Note:  This only works for bitmask sizes that are at least 32 bits, and
  * that are a power of 2.
@@ -3380,7 +3609,7 @@ ctl_pool_create(struct ctl_softc *ctl_softc, ctl_pool_type pool_type,
 	pool = (struct ctl_io_pool *)malloc(sizeof(*pool), M_CTL,
 					    M_NOWAIT | M_ZERO);
 	if (pool == NULL) {
-		retval = -ENOMEM;
+		retval = ENOMEM;
 		goto bailout;
 	}
 
@@ -3403,7 +3632,7 @@ ctl_pool_create(struct ctl_softc *ctl_softc, ctl_pool_type pool_type,
 	 * tracking.
 	 */
 	for (i = 0; i < total_ctl_io; i++) {
-		cur_io = (union ctl_io *)malloc(sizeof(*cur_io), M_CTL,
+		cur_io = (union ctl_io *)malloc(sizeof(*cur_io), M_CTLIO,
 						M_NOWAIT);
 		if (cur_io == NULL) {
 			retval = ENOMEM;
@@ -3422,7 +3651,7 @@ ctl_pool_create(struct ctl_softc *ctl_softc, ctl_pool_type pool_type,
 							      links);
 			STAILQ_REMOVE(&pool->free_queue, &cur_io->io_hdr,
 				      ctl_io_hdr, links);
-			free(cur_io, M_CTL);
+			free(cur_io, M_CTLIO);
 		}
 
 		free(pool, M_CTL);
@@ -3442,7 +3671,6 @@ ctl_pool_create(struct ctl_softc *ctl_softc, ctl_pool_type pool_type,
 #if 0
 	if ((pool_type != CTL_POOL_EMERGENCY)
 	 && (pool_type != CTL_POOL_INTERNAL)
-	 && (pool_type != CTL_POOL_IOCTL)
 	 && (pool_type != CTL_POOL_4OTHERSC))
 		MOD_INC_USE_COUNT;
 #endif
@@ -3463,7 +3691,7 @@ ctl_pool_acquire(struct ctl_io_pool *pool)
 	mtx_assert(&pool->ctl_softc->pool_lock, MA_OWNED);
 
 	if (pool->flags & CTL_POOL_FLAG_INVALID)
-		return (-EINVAL);
+		return (EINVAL);
 
 	pool->refcount++;
 
@@ -3484,7 +3712,7 @@ ctl_pool_release(struct ctl_io_pool *pool)
 	while ((io = (union ctl_io *)STAILQ_FIRST(&pool->free_queue)) != NULL) {
 		STAILQ_REMOVE(&pool->free_queue, &io->io_hdr, ctl_io_hdr,
 			      links);
-		free(io, M_CTL);
+		free(io, M_CTLIO);
 	}
 
 	STAILQ_REMOVE(&ctl_softc->io_pools, pool, ctl_io_pool, links);
@@ -3496,7 +3724,7 @@ ctl_pool_release(struct ctl_io_pool *pool)
 #if 0
 	if ((pool->type != CTL_POOL_EMERGENCY)
 	 && (pool->type != CTL_POOL_INTERNAL)
-	 && (pool->type != CTL_POOL_IOCTL))
+	 && (pool->type != CTL_POOL_4OTHERSC))
 		MOD_DEC_USE_COUNT;
 #endif
 
@@ -3588,7 +3816,7 @@ ctl_alloc_io(void *pool_ref)
 	 * The emergency pool (if it exists) didn't have one, so try an
 	 * atomic (i.e. nonblocking) malloc and see if we get lucky.
 	 */
-	io = (union ctl_io *)malloc(sizeof(*io), M_CTL, M_NOWAIT);
+	io = (union ctl_io *)malloc(sizeof(*io), M_CTLIO, M_NOWAIT);
 	if (io != NULL) {
 		/*
 		 * If the emergency pool exists but is empty, add this
@@ -3626,49 +3854,9 @@ ctl_free_io(union ctl_io *io)
 	 */
 	if (io->io_hdr.pool != NULL) {
 		struct ctl_io_pool *pool;
-#if 0
-		struct ctl_softc *ctl_softc;
-		union ctl_io *tmp_io;
-		unsigned long xflags;
-		int i;
-
-		ctl_softc = control_softc;
-#endif
 
 		pool = (struct ctl_io_pool *)io->io_hdr.pool;
-
 		mtx_lock(&pool->ctl_softc->pool_lock);
-#if 0
-		save_flags(xflags);
-
-		for (i = 0, tmp_io = (union ctl_io *)STAILQ_FIRST(
-		     &ctl_softc->task_queue); tmp_io != NULL; i++,
-		     tmp_io = (union ctl_io *)STAILQ_NEXT(&tmp_io->io_hdr,
-		     links)) {
-			if (tmp_io == io) {
-				printf("%s: %p is still on the task queue!\n",
-				       __func__, tmp_io);
-				printf("%s: (%d): type %d "
-				       "msg %d cdb %x iptl: "
-				       "%d:%d:%d:%d tag 0x%04x "
-				       "flg %#lx\n",
-					__func__, i,
-					tmp_io->io_hdr.io_type,
-					tmp_io->io_hdr.msg_type,
-					tmp_io->scsiio.cdb[0],
-					tmp_io->io_hdr.nexus.initid.id,
-					tmp_io->io_hdr.nexus.targ_port,
-					tmp_io->io_hdr.nexus.targ_target.id,
-					tmp_io->io_hdr.nexus.targ_lun,
-					(tmp_io->io_hdr.io_type ==
-					CTL_IO_TASK) ?
-					tmp_io->taskio.tag_num :
-					tmp_io->scsiio.tag_num,
-					xflags);
-				panic("I/O still on the task queue!");
-			}
-		}
-#endif
 		io->io_hdr.io_type = 0xff;
 		STAILQ_INSERT_TAIL(&pool->free_queue, &io->io_hdr, links);
 		pool->total_freed++;
@@ -3680,7 +3868,7 @@ ctl_free_io(union ctl_io *io)
 		 * Otherwise, just free it.  We probably malloced it and
 		 * the emergency pool wasn't available.
 		 */
-		free(io, M_CTL);
+		free(io, M_CTLIO);
 	}
 
 }
@@ -4242,8 +4430,12 @@ ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *ctl_lun,
 	      struct ctl_be_lun *const be_lun, struct ctl_id target_id)
 {
 	struct ctl_lun *nlun, *lun;
-	struct ctl_frontend *fe;
+	struct ctl_port *port;
+	struct scsi_vpd_id_descriptor *desc;
+	struct scsi_vpd_id_t10 *t10id;
+	const char *eui, *naa, *scsiname, *vendor;
 	int lun_number, i, lun_malloced;
+	int devidlen, idlen1, idlen2 = 0, len;
 
 	if (be_lun == NULL)
 		return (EINVAL);
@@ -4275,6 +4467,69 @@ ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *ctl_lun,
 	if (lun_malloced)
 		lun->flags = CTL_LUN_MALLOCED;
 
+	/* Generate LUN ID. */
+	devidlen = max(CTL_DEVID_MIN_LEN,
+	    strnlen(be_lun->device_id, CTL_DEVID_LEN));
+	idlen1 = sizeof(*t10id) + devidlen;
+	len = sizeof(struct scsi_vpd_id_descriptor) + idlen1;
+	scsiname = ctl_get_opt(&be_lun->options, "scsiname");
+	if (scsiname != NULL) {
+		idlen2 = roundup2(strlen(scsiname) + 1, 4);
+		len += sizeof(struct scsi_vpd_id_descriptor) + idlen2;
+	}
+	eui = ctl_get_opt(&be_lun->options, "eui");
+	if (eui != NULL) {
+		len += sizeof(struct scsi_vpd_id_descriptor) + 8;
+	}
+	naa = ctl_get_opt(&be_lun->options, "naa");
+	if (naa != NULL) {
+		len += sizeof(struct scsi_vpd_id_descriptor) + 8;
+	}
+	lun->lun_devid = malloc(sizeof(struct ctl_devid) + len,
+	    M_CTL, M_WAITOK | M_ZERO);
+	lun->lun_devid->len = len;
+	desc = (struct scsi_vpd_id_descriptor *)lun->lun_devid->data;
+	desc->proto_codeset = SVPD_ID_CODESET_ASCII;
+	desc->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_LUN | SVPD_ID_TYPE_T10;
+	desc->length = idlen1;
+	t10id = (struct scsi_vpd_id_t10 *)&desc->identifier[0];
+	memset(t10id->vendor, ' ', sizeof(t10id->vendor));
+	if ((vendor = ctl_get_opt(&be_lun->options, "vendor")) == NULL) {
+		strncpy((char *)t10id->vendor, CTL_VENDOR, sizeof(t10id->vendor));
+	} else {
+		strncpy(t10id->vendor, vendor,
+		    min(sizeof(t10id->vendor), strlen(vendor)));
+	}
+	strncpy((char *)t10id->vendor_spec_id,
+	    (char *)be_lun->device_id, devidlen);
+	if (scsiname != NULL) {
+		desc = (struct scsi_vpd_id_descriptor *)(&desc->identifier[0] +
+		    desc->length);
+		desc->proto_codeset = SVPD_ID_CODESET_UTF8;
+		desc->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_LUN |
+		    SVPD_ID_TYPE_SCSI_NAME;
+		desc->length = idlen2;
+		strlcpy(desc->identifier, scsiname, idlen2);
+	}
+	if (eui != NULL) {
+		desc = (struct scsi_vpd_id_descriptor *)(&desc->identifier[0] +
+		    desc->length);
+		desc->proto_codeset = SVPD_ID_CODESET_BINARY;
+		desc->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_LUN |
+		    SVPD_ID_TYPE_EUI64;
+		desc->length = 8;
+		scsi_u64to8b(strtouq(eui, NULL, 0), desc->identifier);
+	}
+	if (naa != NULL) {
+		desc = (struct scsi_vpd_id_descriptor *)(&desc->identifier[0] +
+		    desc->length);
+		desc->proto_codeset = SVPD_ID_CODESET_BINARY;
+		desc->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_LUN |
+		    SVPD_ID_TYPE_NAA;
+		desc->length = 8;
+		scsi_u64to8b(strtouq(naa, NULL, 0), desc->identifier);
+	}
+
 	mtx_lock(&ctl_softc->ctl_lock);
 	/*
 	 * See if the caller requested a particular LUN number.  If so, see
@@ -4318,6 +4573,7 @@ ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *ctl_lun,
 	}
 	ctl_set_mask(ctl_softc->ctl_lun_mask, lun_number);
 
+	mtx_init(&lun->lun_lock, "CTL LUN", NULL, MTX_DEF);
 	lun->target = target_id;
 	lun->lun = lun_number;
 	lun->be_lun = be_lun;
@@ -4343,6 +4599,7 @@ ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *ctl_lun,
 	TAILQ_INIT(&lun->ooa_queue);
 	TAILQ_INIT(&lun->blocked_queue);
 	STAILQ_INIT(&lun->error_list);
+	ctl_tpc_lun_init(lun);
 
 	/*
 	 * Initialize the mode page index.
@@ -4353,7 +4610,7 @@ ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *ctl_lun,
 	 * Set the poweron UA for all initiators on this LUN only.
 	 */
 	for (i = 0; i < CTL_MAX_INITIATORS; i++)
-		lun->pending_sense[i].ua_pending = CTL_UA_POWERON;
+		lun->pending_ua[i] = CTL_UA_POWERON;
 
 	/*
 	 * Now, before we insert this lun on the lun list, set the lun
@@ -4361,7 +4618,7 @@ ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *ctl_lun,
 	 */
 	STAILQ_FOREACH(nlun, &ctl_softc->lun_list, links) {
 		for (i = 0; i < CTL_MAX_INITIATORS; i++) {
-			nlun->pending_sense[i].ua_pending |= CTL_UA_LUN_CHANGE;
+			nlun->pending_ua[i] |= CTL_UA_LUN_CHANGE;
 		}
 	}
 
@@ -4390,35 +4647,17 @@ ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *ctl_lun,
 	 * already.  Enable the target ID if it hasn't been enabled, and
 	 * enable this particular LUN.
 	 */
-	STAILQ_FOREACH(fe, &ctl_softc->fe_list, links) {
+	STAILQ_FOREACH(port, &ctl_softc->port_list, links) {
 		int retval;
 
-		/*
-		 * XXX KDM this only works for ONE TARGET ID.  We'll need
-		 * to do things differently if we go to a multiple target
-		 * ID scheme.
-		 */
-		if ((fe->status & CTL_PORT_STATUS_TARG_ONLINE) == 0) {
-
-			retval = fe->targ_enable(fe->targ_lun_arg, target_id);
-			if (retval != 0) {
-				printf("ctl_alloc_lun: FETD %s port %d "
-				       "returned error %d for targ_enable on "
-				       "target %ju\n", fe->port_name,
-				       fe->targ_port, retval,
-				       (uintmax_t)target_id.id);
-			} else
-				fe->status |= CTL_PORT_STATUS_TARG_ONLINE;
-		}
-
-		retval = fe->lun_enable(fe->targ_lun_arg, target_id,lun_number);
+		retval = port->lun_enable(port->targ_lun_arg, target_id,lun_number);
 		if (retval != 0) {
 			printf("ctl_alloc_lun: FETD %s port %d returned error "
 			       "%d for lun_enable on target %ju lun %d\n",
-			       fe->port_name, fe->targ_port, retval,
+			       port->port_name, port->targ_port, retval,
 			       (uintmax_t)target_id.id, lun_number);
 		} else
-			fe->status |= CTL_PORT_STATUS_LUN_ONLINE;
+			port->status |= CTL_PORT_STATUS_LUN_ONLINE;
 	}
 	return (0);
 }
@@ -4434,10 +4673,9 @@ ctl_free_lun(struct ctl_lun *lun)
 {
 	struct ctl_softc *softc;
 #if 0
-	struct ctl_frontend *fe;
+	struct ctl_port *port;
 #endif
 	struct ctl_lun *nlun;
-	union ctl_io *io, *next_io;
 	int i;
 
 	softc = lun->ctl_softc;
@@ -4450,49 +4688,8 @@ ctl_free_lun(struct ctl_lun *lun)
 
 	softc->ctl_luns[lun->lun] = NULL;
 
-	if (TAILQ_FIRST(&lun->ooa_queue) != NULL) {
-		printf("ctl_free_lun: aieee!! freeing a LUN with "
-		       "outstanding I/O!!\n");
-	}
-
-	/*
-	 * If we have anything pending on the RtR queue, remove it.
-	 */
-	for (io = (union ctl_io *)STAILQ_FIRST(&softc->rtr_queue); io != NULL;
-	     io = next_io) {
-		uint32_t targ_lun;
-
-		next_io = (union ctl_io *)STAILQ_NEXT(&io->io_hdr, links);
-		targ_lun = io->io_hdr.nexus.targ_lun;
-		if (io->io_hdr.nexus.lun_map_fn != NULL)
-			targ_lun = io->io_hdr.nexus.lun_map_fn(io->io_hdr.nexus.lun_map_arg, targ_lun);
-		if ((io->io_hdr.nexus.targ_target.id == lun->target.id)
-		 && (targ_lun == lun->lun))
-			STAILQ_REMOVE(&softc->rtr_queue, &io->io_hdr,
-				      ctl_io_hdr, links);
-	}
-
-	/*
-	 * Then remove everything from the blocked queue.
-	 */
-	for (io = (union ctl_io *)TAILQ_FIRST(&lun->blocked_queue); io != NULL;
-	     io = next_io) {
-		next_io = (union ctl_io *)TAILQ_NEXT(&io->io_hdr,blocked_links);
-		TAILQ_REMOVE(&lun->blocked_queue, &io->io_hdr, blocked_links);
-		io->io_hdr.flags &= ~CTL_FLAG_BLOCKED;
-	}
-
-	/*
-	 * Now clear out the OOA queue, and free all the I/O.
-	 * XXX KDM should we notify the FETD here?  We probably need to
-	 * quiesce the LUN before deleting it.
-	 */
-	for (io = (union ctl_io *)TAILQ_FIRST(&lun->ooa_queue); io != NULL;
-	     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(io);
-	}
+	if (!TAILQ_EMPTY(&lun->ooa_queue))
+		panic("Freeing a LUN %p with outstanding I/O!!\n", lun);
 
 	softc->num_luns--;
 
@@ -4500,7 +4697,7 @@ ctl_free_lun(struct ctl_lun *lun)
 	 * XXX KDM this scheme only works for a single target/multiple LUN
 	 * setup.  It needs to be revamped for a multiple target scheme.
 	 *
-	 * XXX KDM this results in fe->lun_disable() getting called twice,
+	 * XXX KDM this results in port->lun_disable() getting called twice,
 	 * once when ctl_disable_lun() is called, and a second time here.
 	 * We really need to re-think the LUN disable semantics.  There
 	 * should probably be several steps/levels to LUN removal:
@@ -4512,37 +4709,37 @@ ctl_free_lun(struct ctl_lun *lun)
 	 * the front end ports, at least for individual LUNs.
 	 */
 #if 0
-	STAILQ_FOREACH(fe, &softc->fe_list, links) {
+	STAILQ_FOREACH(port, &softc->port_list, links) {
 		int retval;
 
-		retval = fe->lun_disable(fe->targ_lun_arg, lun->target,
+		retval = port->lun_disable(port->targ_lun_arg, lun->target,
 					 lun->lun);
 		if (retval != 0) {
 			printf("ctl_free_lun: FETD %s port %d returned error "
 			       "%d for lun_disable on target %ju lun %jd\n",
-			       fe->port_name, fe->targ_port, retval,
+			       port->port_name, port->targ_port, retval,
 			       (uintmax_t)lun->target.id, (intmax_t)lun->lun);
 		}
 
 		if (STAILQ_FIRST(&softc->lun_list) == NULL) {
-			fe->status &= ~CTL_PORT_STATUS_LUN_ONLINE;
+			port->status &= ~CTL_PORT_STATUS_LUN_ONLINE;
 
-			retval = fe->targ_disable(fe->targ_lun_arg,lun->target);
+			retval = port->targ_disable(port->targ_lun_arg,lun->target);
 			if (retval != 0) {
 				printf("ctl_free_lun: FETD %s port %d "
 				       "returned error %d for targ_disable on "
-				       "target %ju\n", fe->port_name,
-				       fe->targ_port, retval,
+				       "target %ju\n", port->port_name,
+				       port->targ_port, retval,
 				       (uintmax_t)lun->target.id);
 			} else
-				fe->status &= ~CTL_PORT_STATUS_TARG_ONLINE;
+				port->status &= ~CTL_PORT_STATUS_TARG_ONLINE;
 
-			if ((fe->status & CTL_PORT_STATUS_TARG_ONLINE) != 0)
+			if ((port->status & CTL_PORT_STATUS_TARG_ONLINE) != 0)
 				continue;
 
 #if 0
-			fe->port_offline(fe->onoff_arg);
-			fe->status &= ~CTL_PORT_STATUS_ONLINE;
+			port->port_offline(port->onoff_arg);
+			port->status &= ~CTL_PORT_STATUS_ONLINE;
 #endif
 		}
 	}
@@ -4554,12 +4751,15 @@ ctl_free_lun(struct ctl_lun *lun)
 	atomic_subtract_int(&lun->be_lun->be->num_luns, 1);
 	lun->be_lun->lun_shutdown(lun->be_lun->be_lun);
 
+	ctl_tpc_lun_shutdown(lun);
+	mtx_destroy(&lun->lun_lock);
+	free(lun->lun_devid, M_CTL);
 	if (lun->flags & CTL_LUN_MALLOCED)
 		free(lun, M_CTL);
 
 	STAILQ_FOREACH(nlun, &softc->lun_list, links) {
 		for (i = 0; i < CTL_MAX_INITIATORS; i++) {
-			nlun->pending_sense[i].ua_pending |= CTL_UA_LUN_CHANGE;
+			nlun->pending_ua[i] |= CTL_UA_LUN_CHANGE;
 		}
 	}
 
@@ -4582,15 +4782,12 @@ ctl_create_lun(struct ctl_be_lun *be_lun)
 int
 ctl_add_lun(struct ctl_be_lun *be_lun)
 {
-	struct ctl_softc *ctl_softc;
-
-	ctl_softc = control_softc;
+	struct ctl_softc *ctl_softc = control_softc;
 
 	mtx_lock(&ctl_softc->ctl_lock);
 	STAILQ_INSERT_TAIL(&ctl_softc->pending_lun_queue, be_lun, links);
 	mtx_unlock(&ctl_softc->ctl_lock);
-
-	ctl_wakeup_thread();
+	wakeup(&ctl_softc->pending_lun_queue);
 
 	return (0);
 }
@@ -4599,7 +4796,7 @@ int
 ctl_enable_lun(struct ctl_be_lun *be_lun)
 {
 	struct ctl_softc *ctl_softc;
-	struct ctl_frontend *fe, *nfe;
+	struct ctl_port *port, *nport;
 	struct ctl_lun *lun;
 	int retval;
 
@@ -4608,18 +4805,21 @@ ctl_enable_lun(struct ctl_be_lun *be_lun)
 	lun = (struct ctl_lun *)be_lun->ctl_lun;
 
 	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 	if ((lun->flags & CTL_LUN_DISABLED) == 0) {
 		/*
 		 * eh?  Why did we get called if the LUN is already
 		 * enabled?
 		 */
+		mtx_unlock(&lun->lun_lock);
 		mtx_unlock(&ctl_softc->ctl_lock);
 		return (0);
 	}
 	lun->flags &= ~CTL_LUN_DISABLED;
+	mtx_unlock(&lun->lun_lock);
 
-	for (fe = STAILQ_FIRST(&ctl_softc->fe_list); fe != NULL; fe = nfe) {
-		nfe = STAILQ_NEXT(fe, links);
+	for (port = STAILQ_FIRST(&ctl_softc->port_list); port != NULL; port = nport) {
+		nport = STAILQ_NEXT(port, links);
 
 		/*
 		 * Drop the lock while we call the FETD's enable routine.
@@ -4627,18 +4827,18 @@ ctl_enable_lun(struct ctl_be_lun *be_lun)
 		 * case of the internal initiator frontend.
 		 */
 		mtx_unlock(&ctl_softc->ctl_lock);
-		retval = fe->lun_enable(fe->targ_lun_arg, lun->target,lun->lun);
+		retval = port->lun_enable(port->targ_lun_arg, lun->target,lun->lun);
 		mtx_lock(&ctl_softc->ctl_lock);
 		if (retval != 0) {
 			printf("%s: FETD %s port %d returned error "
 			       "%d for lun_enable on target %ju lun %jd\n",
-			       __func__, fe->port_name, fe->targ_port, retval,
+			       __func__, port->port_name, port->targ_port, retval,
 			       (uintmax_t)lun->target.id, (intmax_t)lun->lun);
 		}
 #if 0
 		 else {
             /* NOTE:  TODO:  why does lun enable affect port status? */
-			fe->status |= CTL_PORT_STATUS_LUN_ONLINE;
+			port->status |= CTL_PORT_STATUS_LUN_ONLINE;
 		}
 #endif
 	}
@@ -4652,7 +4852,7 @@ int
 ctl_disable_lun(struct ctl_be_lun *be_lun)
 {
 	struct ctl_softc *ctl_softc;
-	struct ctl_frontend *fe;
+	struct ctl_port *port;
 	struct ctl_lun *lun;
 	int retval;
 
@@ -4661,14 +4861,16 @@ ctl_disable_lun(struct ctl_be_lun *be_lun)
 	lun = (struct ctl_lun *)be_lun->ctl_lun;
 
 	mtx_lock(&ctl_softc->ctl_lock);
-
+	mtx_lock(&lun->lun_lock);
 	if (lun->flags & CTL_LUN_DISABLED) {
+		mtx_unlock(&lun->lun_lock);
 		mtx_unlock(&ctl_softc->ctl_lock);
 		return (0);
 	}
 	lun->flags |= CTL_LUN_DISABLED;
+	mtx_unlock(&lun->lun_lock);
 
-	STAILQ_FOREACH(fe, &ctl_softc->fe_list, links) {
+	STAILQ_FOREACH(port, &ctl_softc->port_list, links) {
 		mtx_unlock(&ctl_softc->ctl_lock);
 		/*
 		 * Drop the lock before we call the frontend's disable
@@ -4677,13 +4879,13 @@ ctl_disable_lun(struct ctl_be_lun *be_lun)
 		 * XXX KDM what happens if the frontend list changes while
 		 * we're traversing it?  It's unlikely, but should be handled.
 		 */
-		retval = fe->lun_disable(fe->targ_lun_arg, lun->target,
+		retval = port->lun_disable(port->targ_lun_arg, lun->target,
 					 lun->lun);
 		mtx_lock(&ctl_softc->ctl_lock);
 		if (retval != 0) {
 			printf("ctl_alloc_lun: FETD %s port %d returned error "
 			       "%d for lun_disable on target %ju lun %jd\n",
-			       fe->port_name, fe->targ_port, retval,
+			       port->port_name, port->targ_port, retval,
 			       (uintmax_t)lun->target.id, (intmax_t)lun->lun);
 		}
 	}
@@ -4703,9 +4905,9 @@ ctl_start_lun(struct ctl_be_lun *be_lun)
 
 	lun = (struct ctl_lun *)be_lun->ctl_lun;
 
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 	lun->flags &= ~CTL_LUN_STOPPED;
-	mtx_unlock(&ctl_softc->ctl_lock);
+	mtx_unlock(&lun->lun_lock);
 
 	return (0);
 }
@@ -4720,9 +4922,9 @@ ctl_stop_lun(struct ctl_be_lun *be_lun)
 
 	lun = (struct ctl_lun *)be_lun->ctl_lun;
 
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 	lun->flags |= CTL_LUN_STOPPED;
-	mtx_unlock(&ctl_softc->ctl_lock);
+	mtx_unlock(&lun->lun_lock);
 
 	return (0);
 }
@@ -4737,9 +4939,9 @@ ctl_lun_offline(struct ctl_be_lun *be_lun)
 
 	lun = (struct ctl_lun *)be_lun->ctl_lun;
 
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 	lun->flags |= CTL_LUN_OFFLINE;
-	mtx_unlock(&ctl_softc->ctl_lock);
+	mtx_unlock(&lun->lun_lock);
 
 	return (0);
 }
@@ -4754,9 +4956,9 @@ ctl_lun_online(struct ctl_be_lun *be_lun)
 
 	lun = (struct ctl_lun *)be_lun->ctl_lun;
 
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 	lun->flags &= ~CTL_LUN_OFFLINE;
-	mtx_unlock(&ctl_softc->ctl_lock);
+	mtx_unlock(&lun->lun_lock);
 
 	return (0);
 }
@@ -4771,13 +4973,13 @@ ctl_invalidate_lun(struct ctl_be_lun *be_lun)
 
 	lun = (struct ctl_lun *)be_lun->ctl_lun;
 
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 
 	/*
 	 * The LUN needs to be disabled before it can be marked invalid.
 	 */
 	if ((lun->flags & CTL_LUN_DISABLED) == 0) {
-		mtx_unlock(&ctl_softc->ctl_lock);
+		mtx_unlock(&lun->lun_lock);
 		return (-1);
 	}
 	/*
@@ -4790,9 +4992,13 @@ ctl_invalidate_lun(struct ctl_be_lun *be_lun)
 	 * If we have something in the OOA queue, we'll free it when the
 	 * last I/O completes.
 	 */
-	if (TAILQ_FIRST(&lun->ooa_queue) == NULL)
+	if (TAILQ_EMPTY(&lun->ooa_queue)) {
+		mtx_unlock(&lun->lun_lock);
+		mtx_lock(&ctl_softc->ctl_lock);
 		ctl_free_lun(lun);
-	mtx_unlock(&ctl_softc->ctl_lock);
+		mtx_unlock(&ctl_softc->ctl_lock);
+	} else
+		mtx_unlock(&lun->lun_lock);
 
 	return (0);
 }
@@ -4806,9 +5012,9 @@ ctl_lun_inoperable(struct ctl_be_lun *be_lun)
 	ctl_softc = control_softc;
 	lun = (struct ctl_lun *)be_lun->ctl_lun;
 
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 	lun->flags |= CTL_LUN_INOPERABLE;
-	mtx_unlock(&ctl_softc->ctl_lock);
+	mtx_unlock(&lun->lun_lock);
 
 	return (0);
 }
@@ -4822,9 +5028,9 @@ ctl_lun_operable(struct ctl_be_lun *be_lun)
 	ctl_softc = control_softc;
 	lun = (struct ctl_lun *)be_lun->ctl_lun;
 
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 	lun->flags &= ~CTL_LUN_INOPERABLE;
-	mtx_unlock(&ctl_softc->ctl_lock);
+	mtx_unlock(&lun->lun_lock);
 
 	return (0);
 }
@@ -4844,6 +5050,7 @@ ctl_lun_power_lock(struct ctl_be_lun *be_lun, struct ctl_nexus *nexus,
 	mtx_lock(&softc->ctl_lock);
 
 	lun = (struct ctl_lun *)be_lun->ctl_lun;
+	mtx_lock(&lun->lun_lock);
 
 	page_index = NULL;
 	for (i = 0; i < CTL_NUM_MODE_PAGES; i++) {
@@ -4857,6 +5064,7 @@ ctl_lun_power_lock(struct ctl_be_lun *be_lun, struct ctl_nexus *nexus,
 	}
 
 	if (page_index == NULL) {
+		mtx_unlock(&lun->lun_lock);
 		mtx_unlock(&softc->ctl_lock);
 		printf("%s: APS subpage not found for lun %ju!\n", __func__,
 		       (uintmax_t)lun->lun);
@@ -4867,6 +5075,7 @@ ctl_lun_power_lock(struct ctl_be_lun *be_lun, struct ctl_nexus *nexus,
 	 && (softc->aps_locked_lun != lun->lun)) {
 		printf("%s: attempt to lock LUN %llu when %llu is already "
 		       "locked\n");
+		mtx_unlock(&lun->lun_lock);
 		mtx_unlock(&softc->ctl_lock);
 		return (1);
 	}
@@ -4903,11 +5112,13 @@ ctl_lun_power_lock(struct ctl_be_lun *be_lun, struct ctl_nexus *nexus,
 		if (isc_retval > CTL_HA_STATUS_SUCCESS) {
 			printf("%s: APS (lock=%d) error returned from "
 			       "ctl_ha_msg_send: %d\n", __func__, lock, isc_retval);
+			mtx_unlock(&lun->lun_lock);
 			mtx_unlock(&softc->ctl_lock);
 			return (1);
 		}
 	}
 
+	mtx_unlock(&lun->lun_lock);
 	mtx_unlock(&softc->ctl_lock);
 
 	return (0);
@@ -4922,14 +5133,14 @@ ctl_lun_capacity_changed(struct ctl_be_lun *be_lun)
 
 	softc = control_softc;
 
-	mtx_lock(&softc->ctl_lock);
-
 	lun = (struct ctl_lun *)be_lun->ctl_lun;
 
-	for (i = 0; i < CTL_MAX_INITIATORS; i++) 
-		lun->pending_sense[i].ua_pending |= CTL_UA_CAPACITY_CHANGED;
+	mtx_lock(&lun->lun_lock);
 
-	mtx_unlock(&softc->ctl_lock);
+	for (i = 0; i < CTL_MAX_INITIATORS; i++) 
+		lun->pending_ua[i] |= CTL_UA_CAPACITY_CHANGED;
+
+	mtx_unlock(&lun->lun_lock);
 }
 
 /*
@@ -4970,7 +5181,8 @@ ctl_config_move_done(union ctl_io *io)
 					 /*sks_valid*/ 1,
 					 /*retry_count*/
 					 io->io_hdr.port_status);
-		free(io->scsiio.kern_data_ptr, M_CTL);
+		if (io->io_hdr.flags & CTL_FLAG_ALLOCATED)
+			free(io->scsiio.kern_data_ptr, M_CTL);
 		ctl_done(io);
 		goto bailout;
 	}
@@ -4983,7 +5195,8 @@ ctl_config_move_done(union ctl_io *io)
 		 * S/G list.  If we start using S/G lists for config data,
 		 * we'll need to know how to clean them up here as well.
 		 */
-		free(io->scsiio.kern_data_ptr, M_CTL);
+		if (io->io_hdr.flags & CTL_FLAG_ALLOCATED)
+			free(io->scsiio.kern_data_ptr, M_CTL);
 		/* Hopefully the user has already set the status... */
 		ctl_done(io);
 	} else {
@@ -5010,6 +5223,31 @@ ctl_config_move_done(union ctl_io *io)
 	return (retval);
 }
 
+/*
+ * This gets called by a backend driver when it is done with a
+ * data_submit method.
+ */
+void
+ctl_data_submit_done(union ctl_io *io)
+{
+	/*
+	 * If the IO_CONT flag is set, we need to call the supplied
+	 * function to continue processing the I/O, instead of completing
+	 * the I/O just yet.
+	 *
+	 * If there is an error, though, we don't want to keep processing.
+	 * Instead, just send status back to the initiator.
+	 */
+	if ((io->io_hdr.flags & CTL_FLAG_IO_CONT) &&
+	    (io->io_hdr.flags & CTL_FLAG_ABORT) == 0 &&
+	    ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_STATUS_NONE ||
+	     (io->io_hdr.status & CTL_STATUS_MASK) == CTL_SUCCESS)) {
+		io->scsiio.io_cont(io);
+		return;
+	}
+	ctl_done(io);
+}
+
 /*
  * This gets called by a backend driver when it is done with a
  * configuration write.
@@ -5060,50 +5298,11 @@ ctl_scsi_release(struct ctl_scsiio *ctsio)
 	ctl_softc = control_softc;
 
 	switch (ctsio->cdb[0]) {
-	case RELEASE: {
-		struct scsi_release *cdb;
-
-		cdb = (struct scsi_release *)ctsio->cdb;
-		if ((cdb->byte2 & 0x1f) != 0) {
-			ctl_set_invalid_field(ctsio,
-					      /*sks_valid*/ 1,
-					      /*command*/ 1,
-					      /*field*/ 1,
-					      /*bit_valid*/ 0,
-					      /*bit*/ 0);
-			ctl_done((union ctl_io *)ctsio);
-			return (CTL_RETVAL_COMPLETE);
-		}
-		break;
-	}
 	case RELEASE_10: {
 		struct scsi_release_10 *cdb;
 
 		cdb = (struct scsi_release_10 *)ctsio->cdb;
 
-		if ((cdb->byte2 & SR10_EXTENT) != 0) {
-			ctl_set_invalid_field(ctsio,
-					      /*sks_valid*/ 1,
-					      /*command*/ 1,
-					      /*field*/ 1,
-					      /*bit_valid*/ 1,
-					      /*bit*/ 0);
-			ctl_done((union ctl_io *)ctsio);
-			return (CTL_RETVAL_COMPLETE);
-
-		}
-
-		if ((cdb->byte2 & SR10_3RDPTY) != 0) {
-			ctl_set_invalid_field(ctsio,
-					      /*sks_valid*/ 1,
-					      /*command*/ 1,
-					      /*field*/ 1,
-					      /*bit_valid*/ 1,
-					      /*bit*/ 4);
-			ctl_done((union ctl_io *)ctsio);
-			return (CTL_RETVAL_COMPLETE);
-		}
-
 		if (cdb->byte2 & SR10_LONGID)
 			longid = 1;
 		else
@@ -5143,7 +5342,7 @@ ctl_scsi_release(struct ctl_scsiio *ctsio)
 	if (length > 0)
 		thirdparty_id = scsi_8btou64(ctsio->kern_data_ptr);
 
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 
 	/*
 	 * According to SPC, it is not an error for an intiator to attempt
@@ -5161,6 +5360,8 @@ ctl_scsi_release(struct ctl_scsiio *ctsio)
 		}
 	}
 
+	mtx_unlock(&lun->lun_lock);
+
 	ctsio->scsi_status = SCSI_STATUS_OK;
 	ctsio->io_hdr.status = CTL_SUCCESS;
 
@@ -5169,8 +5370,6 @@ ctl_scsi_release(struct ctl_scsiio *ctsio)
 		ctsio->io_hdr.flags &= ~CTL_FLAG_ALLOCATED;
 	}
 
-	mtx_unlock(&ctl_softc->ctl_lock);
-
 	ctl_done((union ctl_io *)ctsio);
 	return (CTL_RETVAL_COMPLETE);
 }
@@ -5197,49 +5396,11 @@ ctl_scsi_reserve(struct ctl_scsiio *ctsio)
 	ctl_softc = control_softc;
 
 	switch (ctsio->cdb[0]) {
-	case RESERVE: {
-		struct scsi_reserve *cdb;
-
-		cdb = (struct scsi_reserve *)ctsio->cdb;
-		if ((cdb->byte2 & 0x1f) != 0) {
-			ctl_set_invalid_field(ctsio,
-					      /*sks_valid*/ 1,
-					      /*command*/ 1,
-					      /*field*/ 1,
-					      /*bit_valid*/ 0,
-					      /*bit*/ 0);
-			ctl_done((union ctl_io *)ctsio);
-			return (CTL_RETVAL_COMPLETE);
-		}
-		resv_id = cdb->resv_id;
-		length = scsi_2btoul(cdb->length);
-		break;
-	}
 	case RESERVE_10: {
 		struct scsi_reserve_10 *cdb;
 
 		cdb = (struct scsi_reserve_10 *)ctsio->cdb;
 
-		if ((cdb->byte2 & SR10_EXTENT) != 0) {
-			ctl_set_invalid_field(ctsio,
-					      /*sks_valid*/ 1,
-					      /*command*/ 1,
-					      /*field*/ 1,
-					      /*bit_valid*/ 1,
-					      /*bit*/ 0);
-			ctl_done((union ctl_io *)ctsio);
-			return (CTL_RETVAL_COMPLETE);
-		}
-		if ((cdb->byte2 & SR10_3RDPTY) != 0) {
-			ctl_set_invalid_field(ctsio,
-					      /*sks_valid*/ 1,
-					      /*command*/ 1,
-					      /*field*/ 1,
-					      /*bit_valid*/ 1,
-					      /*bit*/ 4);
-			ctl_done((union ctl_io *)ctsio);
-			return (CTL_RETVAL_COMPLETE);
-		}
 		if (cdb->byte2 & SR10_LONGID)
 			longid = 1;
 		else
@@ -5278,7 +5439,7 @@ ctl_scsi_reserve(struct ctl_scsiio *ctsio)
 	if (length > 0)
 		thirdparty_id = scsi_8btou64(ctsio->kern_data_ptr);
 
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 	if (lun->flags & CTL_LUN_RESERVED) {
 		if ((ctsio->io_hdr.nexus.initid.id != lun->rsv_nexus.initid.id)
 		 || (ctsio->io_hdr.nexus.targ_port != lun->rsv_nexus.targ_port)
@@ -5297,13 +5458,13 @@ ctl_scsi_reserve(struct ctl_scsiio *ctsio)
 	ctsio->io_hdr.status = CTL_SUCCESS;
 
 bailout:
+	mtx_unlock(&lun->lun_lock);
+
 	if (ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) {
 		free(ctsio->kern_data_ptr, M_CTL);
 		ctsio->io_hdr.flags &= ~CTL_FLAG_ALLOCATED;
 	}
 
-	mtx_unlock(&ctl_softc->ctl_lock);
-
 	ctl_done((union ctl_io *)ctsio);
 	return (CTL_RETVAL_COMPLETE);
 }
@@ -5352,35 +5513,6 @@ ctl_start_stop(struct ctl_scsiio *ctsio)
 		return (CTL_RETVAL_COMPLETE);
 	}
 
-	/*
-	 * We don't support the power conditions field.  We need to check
-	 * this prior to checking the load/eject and start/stop bits.
-	 */
-	if ((cdb->how & SSS_PC_MASK) != SSS_PC_START_VALID) {
-		ctl_set_invalid_field(ctsio,
-				      /*sks_valid*/ 1,
-				      /*command*/ 1,
-				      /*field*/ 4,
-				      /*bit_valid*/ 1,
-				      /*bit*/ 4);
-		ctl_done((union ctl_io *)ctsio);
-		return (CTL_RETVAL_COMPLETE);
-	}
-
-	/*
-	 * Media isn't removable, so we can't load or eject it.
-	 */
-	if ((cdb->how & SSS_LOEJ) != 0) {
-		ctl_set_invalid_field(ctsio,
-				      /*sks_valid*/ 1,
-				      /*command*/ 1,
-				      /*field*/ 4,
-				      /*bit_valid*/ 1,
-				      /*bit*/ 1);
-		ctl_done((union ctl_io *)ctsio);
-		return (CTL_RETVAL_COMPLETE);
-	}
-
 	if ((lun->flags & CTL_LUN_PR_RESERVED)
 	 && ((cdb->how & SSS_START)==0)) {
 		uint32_t residx;
@@ -5412,7 +5544,7 @@ ctl_start_stop(struct ctl_scsiio *ctsio)
 	 * Figure out a reasonable way to port this?
 	 */
 #ifdef NEEDTOPORT
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 
 	if (((cdb->byte2 & SSS_ONOFFLINE) == 0)
 	 && (lun->flags & CTL_LUN_OFFLINE)) {
@@ -5420,11 +5552,11 @@ ctl_start_stop(struct ctl_scsiio *ctsio)
 		 * If the LUN is offline, and the on/offline bit isn't set,
 		 * reject the start or stop.  Otherwise, let it through.
 		 */
-		mtx_unlock(&ctl_softc->ctl_lock);
+		mtx_unlock(&lun->lun_lock);
 		ctl_set_lun_not_ready(ctsio);
 		ctl_done((union ctl_io *)ctsio);
 	} else {
-		mtx_unlock(&ctl_softc->ctl_lock);
+		mtx_unlock(&lun->lun_lock);
 #endif /* NEEDTOPORT */
 		/*
 		 * This could be a start or a stop when we're online,
@@ -5478,7 +5610,6 @@ ctl_sync_cache(struct ctl_scsiio *ctsio)
 	struct ctl_softc *ctl_softc;
 	uint64_t starting_lba;
 	uint32_t block_count;
-	int reladr, immed;
 	int retval;
 
 	CTL_DEBUG_PRINT(("ctl_sync_cache\n"));
@@ -5486,20 +5617,12 @@ ctl_sync_cache(struct ctl_scsiio *ctsio)
 	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
 	ctl_softc = control_softc;
 	retval = 0;
-	reladr = 0;
-	immed = 0;
 
 	switch (ctsio->cdb[0]) {
 	case SYNCHRONIZE_CACHE: {
 		struct scsi_sync_cache *cdb;
 		cdb = (struct scsi_sync_cache *)ctsio->cdb;
 
-		if (cdb->byte2 & SSC_RELADR)
-			reladr = 1;
-
-		if (cdb->byte2 & SSC_IMMED)
-			immed = 1;
-
 		starting_lba = scsi_4btoul(cdb->begin_lba);
 		block_count = scsi_2btoul(cdb->lb_count);
 		break;
@@ -5508,12 +5631,6 @@ ctl_sync_cache(struct ctl_scsiio *ctsio)
 		struct scsi_sync_cache_16 *cdb;
 		cdb = (struct scsi_sync_cache_16 *)ctsio->cdb;
 
-		if (cdb->byte2 & SSC_RELADR)
-			reladr = 1;
-
-		if (cdb->byte2 & SSC_IMMED)
-			immed = 1;
-
 		starting_lba = scsi_8btou64(cdb->begin_lba);
 		block_count = scsi_4btoul(cdb->lb_count);
 		break;
@@ -5525,41 +5642,6 @@ ctl_sync_cache(struct ctl_scsiio *ctsio)
 		break; /* NOTREACHED */
 	}
 
-	if (immed) {
-		/*
-		 * We don't support the immediate bit.  Since it's in the
-		 * same place for the 10 and 16 byte SYNCHRONIZE CACHE
-		 * commands, we can just return the same error in either
-		 * case.
-		 */
-		ctl_set_invalid_field(ctsio,
-				      /*sks_valid*/ 1,
-				      /*command*/ 1,
-				      /*field*/ 1,
-				      /*bit_valid*/ 1,
-				      /*bit*/ 1);
-		ctl_done((union ctl_io *)ctsio);
-		goto bailout;
-	}
-
-	if (reladr) {
-		/*
-		 * We don't support the reladr bit either.  It can only be
-		 * used with linked commands, and we don't support linked
-		 * commands.  Since the bit is in the same place for the
-		 * 10 and 16 byte SYNCHRONIZE CACHE * commands, we can
-		 * just return the same error in either case.
-		 */
-		ctl_set_invalid_field(ctsio,
-				      /*sks_valid*/ 1,
-				      /*command*/ 1,
-				      /*field*/ 1,
-				      /*bit_valid*/ 1,
-				      /*bit*/ 0);
-		ctl_done((union ctl_io *)ctsio);
-		goto bailout;
-	}
-
 	/*
 	 * We check the LBA and length, but don't do anything with them.
 	 * A SYNCHRONIZE CACHE will cause the entire cache for this lun to
@@ -5585,14 +5667,14 @@ ctl_sync_cache(struct ctl_scsiio *ctsio)
 	 * Check to see whether we're configured to send the SYNCHRONIZE
 	 * CACHE command directly to the back end.
 	 */
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 	if ((ctl_softc->flags & CTL_FLAG_REAL_SYNC)
 	 && (++(lun->sync_count) >= lun->sync_interval)) {
 		lun->sync_count = 0;
-		mtx_unlock(&ctl_softc->ctl_lock);
+		mtx_unlock(&lun->lun_lock);
 		retval = lun->backend->config_write((union ctl_io *)ctsio);
 	} else {
-		mtx_unlock(&ctl_softc->ctl_lock);
+		mtx_unlock(&lun->lun_lock);
 		ctl_set_success(ctsio);
 		ctl_done((union ctl_io *)ctsio);
 	}
@@ -5685,9 +5767,9 @@ ctl_format(struct ctl_scsiio *ctsio)
 	 * get them to issue a command that will basically make them think
 	 * they're blowing away the media.
 	 */
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 	lun->flags &= ~CTL_LUN_INOPERABLE;
-	mtx_unlock(&ctl_softc->ctl_lock);
+	mtx_unlock(&lun->lun_lock);
 
 	ctsio->scsi_status = SCSI_STATUS_OK;
 	ctsio->io_hdr.status = CTL_SUCCESS;
@@ -5702,24 +5784,96 @@ ctl_format(struct ctl_scsiio *ctsio)
 	return (CTL_RETVAL_COMPLETE);
 }
 
+int
+ctl_read_buffer(struct ctl_scsiio *ctsio)
+{
+	struct scsi_read_buffer *cdb;
+	struct ctl_lun *lun;
+	int buffer_offset, len;
+	static uint8_t descr[4];
+	static uint8_t echo_descr[4] = { 0 };
+
+	CTL_DEBUG_PRINT(("ctl_read_buffer\n"));
+
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+	cdb = (struct scsi_read_buffer *)ctsio->cdb;
+
+	if (lun->flags & CTL_LUN_PR_RESERVED) {
+		uint32_t residx;
+
+		/*
+		 * XXX KDM need a lock here.
+		 */
+		residx = ctl_get_resindex(&ctsio->io_hdr.nexus);
+		if ((lun->res_type == SPR_TYPE_EX_AC
+		  && residx != lun->pr_res_idx)
+		 || ((lun->res_type == SPR_TYPE_EX_AC_RO
+		   || lun->res_type == SPR_TYPE_EX_AC_AR)
+		  && !lun->per_res[residx].registered)) {
+			ctl_set_reservation_conflict(ctsio);
+			ctl_done((union ctl_io *)ctsio);
+			return (CTL_RETVAL_COMPLETE);
+	        }
+	}
+
+	if ((cdb->byte2 & RWB_MODE) != RWB_MODE_DATA &&
+	    (cdb->byte2 & RWB_MODE) != RWB_MODE_ECHO_DESCR &&
+	    (cdb->byte2 & RWB_MODE) != RWB_MODE_DESCR) {
+		ctl_set_invalid_field(ctsio,
+				      /*sks_valid*/ 1,
+				      /*command*/ 1,
+				      /*field*/ 1,
+				      /*bit_valid*/ 1,
+				      /*bit*/ 4);
+		ctl_done((union ctl_io *)ctsio);
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	len = scsi_3btoul(cdb->length);
+	buffer_offset = scsi_3btoul(cdb->offset);
+
+	if (buffer_offset + len > sizeof(lun->write_buffer)) {
+		ctl_set_invalid_field(ctsio,
+				      /*sks_valid*/ 1,
+				      /*command*/ 1,
+				      /*field*/ 6,
+				      /*bit_valid*/ 0,
+				      /*bit*/ 0);
+		ctl_done((union ctl_io *)ctsio);
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	if ((cdb->byte2 & RWB_MODE) == RWB_MODE_DESCR) {
+		descr[0] = 0;
+		scsi_ulto3b(sizeof(lun->write_buffer), &descr[1]);
+		ctsio->kern_data_ptr = descr;
+		len = min(len, sizeof(descr));
+	} else if ((cdb->byte2 & RWB_MODE) == RWB_MODE_ECHO_DESCR) {
+		ctsio->kern_data_ptr = echo_descr;
+		len = min(len, sizeof(echo_descr));
+	} else
+		ctsio->kern_data_ptr = lun->write_buffer + buffer_offset;
+	ctsio->kern_data_len = len;
+	ctsio->kern_total_len = len;
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+	ctsio->kern_sg_entries = 0;
+	ctsio->be_move_done = ctl_config_move_done;
+	ctl_datamove((union ctl_io *)ctsio);
+
+	return (CTL_RETVAL_COMPLETE);
+}
+
 int
 ctl_write_buffer(struct ctl_scsiio *ctsio)
 {
 	struct scsi_write_buffer *cdb;
-	struct copan_page_header *header;
 	struct ctl_lun *lun;
-	struct ctl_softc *ctl_softc;
 	int buffer_offset, len;
-	int retval;
-
-	header = NULL;
-
-	retval = CTL_RETVAL_COMPLETE;
 
 	CTL_DEBUG_PRINT(("ctl_write_buffer\n"));
 
 	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
-	ctl_softc = control_softc;
 	cdb = (struct scsi_write_buffer *)ctsio->cdb;
 
 	if ((cdb->byte2 & RWB_MODE) != RWB_MODE_DATA) {
@@ -5732,21 +5886,11 @@ ctl_write_buffer(struct ctl_scsiio *ctsio)
 		ctl_done((union ctl_io *)ctsio);
 		return (CTL_RETVAL_COMPLETE);
 	}
-	if (cdb->buffer_id != 0) {
-		ctl_set_invalid_field(ctsio,
-				      /*sks_valid*/ 1,
-				      /*command*/ 1,
-				      /*field*/ 2,
-				      /*bit_valid*/ 0,
-				      /*bit*/ 0);
-		ctl_done((union ctl_io *)ctsio);
-		return (CTL_RETVAL_COMPLETE);
-	}
 
 	len = scsi_3btoul(cdb->length);
 	buffer_offset = scsi_3btoul(cdb->offset);
 
-	if (len > sizeof(lun->write_buffer)) {
+	if (buffer_offset + len > sizeof(lun->write_buffer)) {
 		ctl_set_invalid_field(ctsio,
 				      /*sks_valid*/ 1,
 				      /*command*/ 1,
@@ -5757,23 +5901,12 @@ ctl_write_buffer(struct ctl_scsiio *ctsio)
 		return (CTL_RETVAL_COMPLETE);
 	}
 
-	if (buffer_offset != 0) {
-		ctl_set_invalid_field(ctsio,
-				      /*sks_valid*/ 1,
-				      /*command*/ 1,
-				      /*field*/ 3,
-				      /*bit_valid*/ 0,
-				      /*bit*/ 0);
-		ctl_done((union ctl_io *)ctsio);
-		return (CTL_RETVAL_COMPLETE);
-	}
-
 	/*
 	 * If we've got a kernel request that hasn't been malloced yet,
 	 * malloc it and tell the caller the data buffer is here.
 	 */
 	if ((ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) == 0) {
-		ctsio->kern_data_ptr = lun->write_buffer;
+		ctsio->kern_data_ptr = lun->write_buffer + buffer_offset;
 		ctsio->kern_data_len = len;
 		ctsio->kern_total_len = len;
 		ctsio->kern_data_resid = 0;
@@ -5795,7 +5928,7 @@ int
 ctl_write_same(struct ctl_scsiio *ctsio)
 {
 	struct ctl_lun *lun;
-	struct ctl_lba_len_flags lbalen;
+	struct ctl_lba_len_flags *lbalen;
 	uint64_t lba;
 	uint32_t num_blocks;
 	int len, retval;
@@ -5888,11 +6021,10 @@ ctl_write_same(struct ctl_scsiio *ctsio)
 		return (CTL_RETVAL_COMPLETE);
 	}
 
-	lbalen.lba = lba;
-	lbalen.len = num_blocks;
-	lbalen.flags = byte2;
-	memcpy(ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes, &lbalen,
-	       sizeof(lbalen));
+	lbalen = (struct ctl_lba_len_flags *)&ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
+	lbalen->lba = lba;
+	lbalen->len = num_blocks;
+	lbalen->flags = byte2;
 	retval = lun->backend->config_write((union ctl_io *)ctsio);
 
 	return (retval);
@@ -5903,7 +6035,7 @@ ctl_unmap(struct ctl_scsiio *ctsio)
 {
 	struct ctl_lun *lun;
 	struct scsi_unmap *cdb;
-	struct ctl_ptr_len_flags ptrlen;
+	struct ctl_ptr_len_flags *ptrlen;
 	struct scsi_unmap_header *hdr;
 	struct scsi_unmap_desc *buf, *end;
 	uint64_t lba;
@@ -5958,11 +6090,10 @@ ctl_unmap(struct ctl_scsiio *ctsio)
 	buf = (struct scsi_unmap_desc *)(hdr + 1);
 	end = buf + len / sizeof(*buf);
 
-	ptrlen.ptr = (void *)buf;
-	ptrlen.len = len;
-	ptrlen.flags = byte2;
-	memcpy(ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes, &ptrlen,
-	       sizeof(ptrlen));
+	ptrlen = (struct ctl_ptr_len_flags *)&ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
+	ptrlen->ptr = (void *)buf;
+	ptrlen->len = len;
+	ptrlen->flags = byte2;
 
 	for (; buf < end; buf++) {
 		lba = scsi_8btou64(buf->lba);
@@ -6017,7 +6148,7 @@ ctl_control_page_handler(struct ctl_scsiio *ctsio,
 
 	softc = control_softc;
 
-	mtx_lock(&softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 	if (((current_cp->rlec & SCP_DSENSE) == 0)
 	 && ((user_cp->rlec & SCP_DSENSE) != 0)) {
 		/*
@@ -6109,11 +6240,10 @@ ctl_control_page_handler(struct ctl_scsiio *ctsio,
 			if (i == initidx)
 				continue;
 
-			lun->pending_sense[i].ua_pending |=
-				CTL_UA_MODE_CHANGE;
+			lun->pending_ua[i] |= CTL_UA_MODE_CHANGE;
 		}
 	}
-	mtx_unlock(&softc->ctl_lock);
+	mtx_unlock(&lun->lun_lock);
 
 	return (0);
 }
@@ -6692,6 +6822,24 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
 	else
 		control_dev = 0;
 
+	if (lun->flags & CTL_LUN_PR_RESERVED) {
+		uint32_t residx;
+
+		/*
+		 * XXX KDM need a lock here.
+		 */
+		residx = ctl_get_resindex(&ctsio->io_hdr.nexus);
+		if ((lun->res_type == SPR_TYPE_EX_AC
+		  && residx != lun->pr_res_idx)
+		 || ((lun->res_type == SPR_TYPE_EX_AC_RO
+		   || lun->res_type == SPR_TYPE_EX_AC_AR)
+		  && !lun->per_res[residx].registered)) {
+			ctl_set_reservation_conflict(ctsio);
+			ctl_done((union ctl_io *)ctsio);
+			return (CTL_RETVAL_COMPLETE);
+		}
+	}
+
 	switch (ctsio->cdb[0]) {
 	case MODE_SENSE_6: {
 		struct scsi_mode_sense_6 *cdb;
@@ -6986,6 +7134,7 @@ ctl_mode_sense(struct ctl_scsiio *ctsio)
 
 	ctsio->scsi_status = SCSI_STATUS_OK;
 
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 	ctsio->be_move_done = ctl_config_move_done;
 	ctl_datamove((union ctl_io *)ctsio);
 
@@ -7045,13 +7194,14 @@ ctl_read_capacity(struct ctl_scsiio *ctsio)
 
 	ctsio->scsi_status = SCSI_STATUS_OK;
 
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 	ctsio->be_move_done = ctl_config_move_done;
 	ctl_datamove((union ctl_io *)ctsio);
 
 	return (CTL_RETVAL_COMPLETE);
 }
 
-static int
+int
 ctl_read_capacity_16(struct ctl_scsiio *ctsio)
 {
 	struct scsi_read_capacity_16 *cdb;
@@ -7103,10 +7253,11 @@ ctl_read_capacity_16(struct ctl_scsiio *ctsio)
 	data->prot_lbppbe = lun->be_lun->pblockexp & SRC16_LBPPBE;
 	scsi_ulto2b(lun->be_lun->pblockoff & SRC16_LALBA_A, data->lalba_lbp);
 	if (lun->be_lun->flags & CTL_LUN_FLAG_UNMAP)
-		data->lalba_lbp[0] |= SRC16_LBPME;
+		data->lalba_lbp[0] |= SRC16_LBPME | SRC16_LBPRZ;
 
 	ctsio->scsi_status = SCSI_STATUS_OK;
 
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 	ctsio->be_move_done = ctl_config_move_done;
 	ctl_datamove((union ctl_io *)ctsio);
 
@@ -7114,50 +7265,20 @@ ctl_read_capacity_16(struct ctl_scsiio *ctsio)
 }
 
 int
-ctl_service_action_in(struct ctl_scsiio *ctsio)
-{
-	struct scsi_service_action_in *cdb;
-	int retval;
-
-	CTL_DEBUG_PRINT(("ctl_service_action_in\n"));
-
-	cdb = (struct scsi_service_action_in *)ctsio->cdb;
-
-	retval = CTL_RETVAL_COMPLETE;
-
-	switch (cdb->service_action) {
-	case SRC16_SERVICE_ACTION:
-		retval = ctl_read_capacity_16(ctsio);
-		break;
-	default:
-		ctl_set_invalid_field(/*ctsio*/ ctsio,
-				      /*sks_valid*/ 1,
-				      /*command*/ 1,
-				      /*field*/ 1,
-				      /*bit_valid*/ 1,
-				      /*bit*/ 4);
-		ctl_done((union ctl_io *)ctsio);
-		break;
-	}
-
-	return (retval);
-}
-
-int
-ctl_maintenance_in(struct ctl_scsiio *ctsio)
+ctl_report_tagret_port_groups(struct ctl_scsiio *ctsio)
 {
 	struct scsi_maintenance_in *cdb;
 	int retval;
-	int alloc_len, total_len = 0;
-	int num_target_port_groups, single;
+	int alloc_len, ext, total_len = 0, g, p, pc, pg;
+	int num_target_port_groups, num_target_ports, single;
 	struct ctl_lun *lun;
 	struct ctl_softc *softc;
+	struct ctl_port *port;
 	struct scsi_target_group_data *rtg_ptr;
-	struct scsi_target_port_group_descriptor *tpg_desc_ptr1, *tpg_desc_ptr2;
-	struct scsi_target_port_descriptor  *tp_desc_ptr1_1, *tp_desc_ptr1_2,
-	                                    *tp_desc_ptr2_1, *tp_desc_ptr2_2;
+	struct scsi_target_group_data_extended *rtg_ext_ptr;
+	struct scsi_target_port_group_descriptor *tpg_desc;
 
-	CTL_DEBUG_PRINT(("ctl_maintenance_in\n"));
+	CTL_DEBUG_PRINT(("ctl_report_tagret_port_groups\n"));
 
 	cdb = (struct scsi_maintenance_in *)ctsio->cdb;
 	softc = control_softc;
@@ -7165,31 +7286,48 @@ ctl_maintenance_in(struct ctl_scsiio *ctsio)
 
 	retval = CTL_RETVAL_COMPLETE;
 
-	if ((cdb->byte2 & SERVICE_ACTION_MASK) != SA_RPRT_TRGT_GRP) {
+	switch (cdb->byte2 & STG_PDF_MASK) {
+	case STG_PDF_LENGTH:
+		ext = 0;
+		break;
+	case STG_PDF_EXTENDED:
+		ext = 1;
+		break;
+	default:
 		ctl_set_invalid_field(/*ctsio*/ ctsio,
 				      /*sks_valid*/ 1,
 				      /*command*/ 1,
-				      /*field*/ 1,
+				      /*field*/ 2,
 				      /*bit_valid*/ 1,
-				      /*bit*/ 4);
+				      /*bit*/ 5);
 		ctl_done((union ctl_io *)ctsio);
 		return(retval);
 	}
 
-	mtx_lock(&softc->ctl_lock);
 	single = ctl_is_single;
+	if (single)
+		num_target_port_groups = 1;
+	else
+		num_target_port_groups = NUM_TARGET_PORT_GROUPS;
+	num_target_ports = 0;
+	mtx_lock(&softc->ctl_lock);
+	STAILQ_FOREACH(port, &softc->port_list, links) {
+		if ((port->status & CTL_PORT_STATUS_ONLINE) == 0)
+			continue;
+		if (ctl_map_lun_back(port->targ_port, lun->lun) >= CTL_MAX_LUNS)
+			continue;
+		num_target_ports++;
+	}
 	mtx_unlock(&softc->ctl_lock);
 
-	if (single)
-        	num_target_port_groups = NUM_TARGET_PORT_GROUPS - 1;
+	if (ext)
+		total_len = sizeof(struct scsi_target_group_data_extended);
 	else
-        	num_target_port_groups = NUM_TARGET_PORT_GROUPS;
-
-	total_len = sizeof(struct scsi_target_group_data) +
-		sizeof(struct scsi_target_port_group_descriptor) *
+		total_len = sizeof(struct scsi_target_group_data);
+	total_len += sizeof(struct scsi_target_port_group_descriptor) *
 		num_target_port_groups +
-		sizeof(struct scsi_target_port_descriptor) *
-		NUM_PORTS_PER_GRP * num_target_port_groups;
+	    sizeof(struct scsi_target_port_descriptor) *
+		num_target_ports * num_target_port_groups;
 
 	alloc_len = scsi_4btoul(cdb->length);
 
@@ -7209,77 +7347,53 @@ ctl_maintenance_in(struct ctl_scsiio *ctsio)
 	ctsio->kern_data_resid = 0;
 	ctsio->kern_rel_offset = 0;
 
-	rtg_ptr = (struct scsi_target_group_data *)ctsio->kern_data_ptr;
-
-	tpg_desc_ptr1 = &rtg_ptr->groups[0];
-	tp_desc_ptr1_1 = &tpg_desc_ptr1->descriptors[0];
-	tp_desc_ptr1_2 = (struct scsi_target_port_descriptor *)
-	        &tp_desc_ptr1_1->desc_list[0];
-
-	if (single == 0) {
-		tpg_desc_ptr2 = (struct scsi_target_port_group_descriptor *)
-	                &tp_desc_ptr1_2->desc_list[0];
-		tp_desc_ptr2_1 = &tpg_desc_ptr2->descriptors[0];
-		tp_desc_ptr2_2 = (struct scsi_target_port_descriptor *)
-	        	&tp_desc_ptr2_1->desc_list[0];
-        } else {
-		tpg_desc_ptr2 = NULL;
-		tp_desc_ptr2_1 = NULL;
-		tp_desc_ptr2_2 = NULL;
-	}
-
-	scsi_ulto4b(total_len - 4, rtg_ptr->length);
-	if (single == 0) {
-        	if (ctsio->io_hdr.nexus.targ_port < CTL_MAX_PORTS) {
-			if (lun->flags & CTL_LUN_PRIMARY_SC) {
-				tpg_desc_ptr1->pref_state = TPG_PRIMARY;
-				tpg_desc_ptr2->pref_state =
-					TPG_ASYMMETRIC_ACCESS_NONOPTIMIZED;
-			} else {
-				tpg_desc_ptr1->pref_state =
-					TPG_ASYMMETRIC_ACCESS_NONOPTIMIZED;
-				tpg_desc_ptr2->pref_state = TPG_PRIMARY;
-			}
-		} else {
-			if (lun->flags & CTL_LUN_PRIMARY_SC) {
-				tpg_desc_ptr1->pref_state =
-					TPG_ASYMMETRIC_ACCESS_NONOPTIMIZED;
-				tpg_desc_ptr2->pref_state = TPG_PRIMARY;
-			} else {
-				tpg_desc_ptr1->pref_state = TPG_PRIMARY;
-				tpg_desc_ptr2->pref_state =
-					TPG_ASYMMETRIC_ACCESS_NONOPTIMIZED;
-			}
-		}
+	if (ext) {
+		rtg_ext_ptr = (struct scsi_target_group_data_extended *)
+		    ctsio->kern_data_ptr;
+		scsi_ulto4b(total_len - 4, rtg_ext_ptr->length);
+		rtg_ext_ptr->format_type = 0x10;
+		rtg_ext_ptr->implicit_transition_time = 0;
+		tpg_desc = &rtg_ext_ptr->groups[0];
 	} else {
-		tpg_desc_ptr1->pref_state = TPG_PRIMARY;
+		rtg_ptr = (struct scsi_target_group_data *)
+		    ctsio->kern_data_ptr;
+		scsi_ulto4b(total_len - 4, rtg_ptr->length);
+		tpg_desc = &rtg_ptr->groups[0];
 	}
-	tpg_desc_ptr1->support = 0;
-	tpg_desc_ptr1->target_port_group[1] = 1;
-	tpg_desc_ptr1->status = TPG_IMPLICIT;
-	tpg_desc_ptr1->target_port_count= NUM_PORTS_PER_GRP;
 
-	if (single == 0) {
-		tpg_desc_ptr2->support = 0;
-		tpg_desc_ptr2->target_port_group[1] = 2;
-		tpg_desc_ptr2->status = TPG_IMPLICIT;
-		tpg_desc_ptr2->target_port_count = NUM_PORTS_PER_GRP;
-
-		tp_desc_ptr1_1->relative_target_port_identifier[1] = 1;
-		tp_desc_ptr1_2->relative_target_port_identifier[1] = 2;
-
-		tp_desc_ptr2_1->relative_target_port_identifier[1] = 9;
-		tp_desc_ptr2_2->relative_target_port_identifier[1] = 10;
-	} else {
-        	if (ctsio->io_hdr.nexus.targ_port < CTL_MAX_PORTS) {
-			tp_desc_ptr1_1->relative_target_port_identifier[1] = 1;
-			tp_desc_ptr1_2->relative_target_port_identifier[1] = 2;
-		} else {
-			tp_desc_ptr1_1->relative_target_port_identifier[1] = 9;
-			tp_desc_ptr1_2->relative_target_port_identifier[1] = 10;
+	pg = ctsio->io_hdr.nexus.targ_port / CTL_MAX_PORTS;
+	mtx_lock(&softc->ctl_lock);
+	for (g = 0; g < num_target_port_groups; g++) {
+		if (g == pg)
+			tpg_desc->pref_state = TPG_PRIMARY |
+			    TPG_ASYMMETRIC_ACCESS_OPTIMIZED;
+		else
+			tpg_desc->pref_state =
+			    TPG_ASYMMETRIC_ACCESS_NONOPTIMIZED;
+		tpg_desc->support = TPG_AO_SUP;
+		if (!single)
+			tpg_desc->support |= TPG_AN_SUP;
+		scsi_ulto2b(g + 1, tpg_desc->target_port_group);
+		tpg_desc->status = TPG_IMPLICIT;
+		pc = 0;
+		STAILQ_FOREACH(port, &softc->port_list, links) {
+			if ((port->status & CTL_PORT_STATUS_ONLINE) == 0)
+				continue;
+			if (ctl_map_lun_back(port->targ_port, lun->lun) >=
+			    CTL_MAX_LUNS)
+				continue;
+			p = port->targ_port % CTL_MAX_PORTS + g * CTL_MAX_PORTS;
+			scsi_ulto2b(p, tpg_desc->descriptors[pc].
+			    relative_target_port_identifier);
+			pc++;
 		}
+		tpg_desc->target_port_count = pc;
+		tpg_desc = (struct scsi_target_port_group_descriptor *)
+		    &tpg_desc->descriptors[pc];
 	}
+	mtx_unlock(&softc->ctl_lock);
 
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 	ctsio->be_move_done = ctl_config_move_done;
 
 	CTL_DEBUG_PRINT(("buf = %x %x %x %x %x %x %x %x\n",
@@ -7292,6 +7406,270 @@ ctl_maintenance_in(struct ctl_scsiio *ctsio)
 	return(retval);
 }
 
+int
+ctl_report_supported_opcodes(struct ctl_scsiio *ctsio)
+{
+	struct ctl_lun *lun;
+	struct scsi_report_supported_opcodes *cdb;
+	const struct ctl_cmd_entry *entry, *sentry;
+	struct scsi_report_supported_opcodes_all *all;
+	struct scsi_report_supported_opcodes_descr *descr;
+	struct scsi_report_supported_opcodes_one *one;
+	int retval;
+	int alloc_len, total_len;
+	int opcode, service_action, i, j, num;
+
+	CTL_DEBUG_PRINT(("ctl_report_supported_opcodes\n"));
+
+	cdb = (struct scsi_report_supported_opcodes *)ctsio->cdb;
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	retval = CTL_RETVAL_COMPLETE;
+
+	opcode = cdb->requested_opcode;
+	service_action = scsi_2btoul(cdb->requested_service_action);
+	switch (cdb->options & RSO_OPTIONS_MASK) {
+	case RSO_OPTIONS_ALL:
+		num = 0;
+		for (i = 0; i < 256; i++) {
+			entry = &ctl_cmd_table[i];
+			if (entry->flags & CTL_CMD_FLAG_SA5) {
+				for (j = 0; j < 32; j++) {
+					sentry = &((const struct ctl_cmd_entry *)
+					    entry->execute)[j];
+					if (ctl_cmd_applicable(
+					    lun->be_lun->lun_type, sentry))
+						num++;
+				}
+			} else {
+				if (ctl_cmd_applicable(lun->be_lun->lun_type,
+				    entry))
+					num++;
+			}
+		}
+		total_len = sizeof(struct scsi_report_supported_opcodes_all) +
+		    num * sizeof(struct scsi_report_supported_opcodes_descr);
+		break;
+	case RSO_OPTIONS_OC:
+		if (ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) {
+			ctl_set_invalid_field(/*ctsio*/ ctsio,
+					      /*sks_valid*/ 1,
+					      /*command*/ 1,
+					      /*field*/ 2,
+					      /*bit_valid*/ 1,
+					      /*bit*/ 2);
+			ctl_done((union ctl_io *)ctsio);
+			return (CTL_RETVAL_COMPLETE);
+		}
+		total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32;
+		break;
+	case RSO_OPTIONS_OC_SA:
+		if ((ctl_cmd_table[opcode].flags & CTL_CMD_FLAG_SA5) == 0 ||
+		    service_action >= 32) {
+			ctl_set_invalid_field(/*ctsio*/ ctsio,
+					      /*sks_valid*/ 1,
+					      /*command*/ 1,
+					      /*field*/ 2,
+					      /*bit_valid*/ 1,
+					      /*bit*/ 2);
+			ctl_done((union ctl_io *)ctsio);
+			return (CTL_RETVAL_COMPLETE);
+		}
+		total_len = sizeof(struct scsi_report_supported_opcodes_one) + 32;
+		break;
+	default:
+		ctl_set_invalid_field(/*ctsio*/ ctsio,
+				      /*sks_valid*/ 1,
+				      /*command*/ 1,
+				      /*field*/ 2,
+				      /*bit_valid*/ 1,
+				      /*bit*/ 2);
+		ctl_done((union ctl_io *)ctsio);
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	alloc_len = scsi_4btoul(cdb->length);
+
+	ctsio->kern_data_ptr = malloc(total_len, M_CTL, M_WAITOK | M_ZERO);
+
+	ctsio->kern_sg_entries = 0;
+
+	if (total_len < alloc_len) {
+		ctsio->residual = alloc_len - total_len;
+		ctsio->kern_data_len = total_len;
+		ctsio->kern_total_len = total_len;
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+
+	switch (cdb->options & RSO_OPTIONS_MASK) {
+	case RSO_OPTIONS_ALL:
+		all = (struct scsi_report_supported_opcodes_all *)
+		    ctsio->kern_data_ptr;
+		num = 0;
+		for (i = 0; i < 256; i++) {
+			entry = &ctl_cmd_table[i];
+			if (entry->flags & CTL_CMD_FLAG_SA5) {
+				for (j = 0; j < 32; j++) {
+					sentry = &((const struct ctl_cmd_entry *)
+					    entry->execute)[j];
+					if (!ctl_cmd_applicable(
+					    lun->be_lun->lun_type, sentry))
+						continue;
+					descr = &all->descr[num++];
+					descr->opcode = i;
+					scsi_ulto2b(j, descr->service_action);
+					descr->flags = RSO_SERVACTV;
+					scsi_ulto2b(sentry->length,
+					    descr->cdb_length);
+				}
+			} else {
+				if (!ctl_cmd_applicable(lun->be_lun->lun_type,
+				    entry))
+					continue;
+				descr = &all->descr[num++];
+				descr->opcode = i;
+				scsi_ulto2b(0, descr->service_action);
+				descr->flags = 0;
+				scsi_ulto2b(entry->length, descr->cdb_length);
+			}
+		}
+		scsi_ulto4b(
+		    num * sizeof(struct scsi_report_supported_opcodes_descr),
+		    all->length);
+		break;
+	case RSO_OPTIONS_OC:
+		one = (struct scsi_report_supported_opcodes_one *)
+		    ctsio->kern_data_ptr;
+		entry = &ctl_cmd_table[opcode];
+		goto fill_one;
+	case RSO_OPTIONS_OC_SA:
+		one = (struct scsi_report_supported_opcodes_one *)
+		    ctsio->kern_data_ptr;
+		entry = &ctl_cmd_table[opcode];
+		entry = &((const struct ctl_cmd_entry *)
+		    entry->execute)[service_action];
+fill_one:
+		if (ctl_cmd_applicable(lun->be_lun->lun_type, entry)) {
+			one->support = 3;
+			scsi_ulto2b(entry->length, one->cdb_length);
+			one->cdb_usage[0] = opcode;
+			memcpy(&one->cdb_usage[1], entry->usage,
+			    entry->length - 1);
+		} else
+			one->support = 1;
+		break;
+	}
+
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+
+	ctl_datamove((union ctl_io *)ctsio);
+	return(retval);
+}
+
+int
+ctl_report_supported_tmf(struct ctl_scsiio *ctsio)
+{
+	struct ctl_lun *lun;
+	struct scsi_report_supported_tmf *cdb;
+	struct scsi_report_supported_tmf_data *data;
+	int retval;
+	int alloc_len, total_len;
+
+	CTL_DEBUG_PRINT(("ctl_report_supported_tmf\n"));
+
+	cdb = (struct scsi_report_supported_tmf *)ctsio->cdb;
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	retval = CTL_RETVAL_COMPLETE;
+
+	total_len = sizeof(struct scsi_report_supported_tmf_data);
+	alloc_len = scsi_4btoul(cdb->length);
+
+	ctsio->kern_data_ptr = malloc(total_len, M_CTL, M_WAITOK | M_ZERO);
+
+	ctsio->kern_sg_entries = 0;
+
+	if (total_len < alloc_len) {
+		ctsio->residual = alloc_len - total_len;
+		ctsio->kern_data_len = total_len;
+		ctsio->kern_total_len = total_len;
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+
+	data = (struct scsi_report_supported_tmf_data *)ctsio->kern_data_ptr;
+	data->byte1 |= RST_ATS | RST_ATSS | RST_CTSS | RST_LURS | RST_TRS;
+	data->byte2 |= RST_ITNRS;
+
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+
+	ctl_datamove((union ctl_io *)ctsio);
+	return (retval);
+}
+
+int
+ctl_report_timestamp(struct ctl_scsiio *ctsio)
+{
+	struct ctl_lun *lun;
+	struct scsi_report_timestamp *cdb;
+	struct scsi_report_timestamp_data *data;
+	struct timeval tv;
+	int64_t timestamp;
+	int retval;
+	int alloc_len, total_len;
+
+	CTL_DEBUG_PRINT(("ctl_report_timestamp\n"));
+
+	cdb = (struct scsi_report_timestamp *)ctsio->cdb;
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	retval = CTL_RETVAL_COMPLETE;
+
+	total_len = sizeof(struct scsi_report_timestamp_data);
+	alloc_len = scsi_4btoul(cdb->length);
+
+	ctsio->kern_data_ptr = malloc(total_len, M_CTL, M_WAITOK | M_ZERO);
+
+	ctsio->kern_sg_entries = 0;
+
+	if (total_len < alloc_len) {
+		ctsio->residual = alloc_len - total_len;
+		ctsio->kern_data_len = total_len;
+		ctsio->kern_total_len = total_len;
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+
+	data = (struct scsi_report_timestamp_data *)ctsio->kern_data_ptr;
+	scsi_ulto2b(sizeof(*data) - 2, data->length);
+	data->origin = RTS_ORIG_OUTSIDE;
+	getmicrotime(&tv);
+	timestamp = (int64_t)tv.tv_sec * 1000 + tv.tv_usec / 1000;
+	scsi_ulto4b(timestamp >> 16, data->timestamp);
+	scsi_ulto2b(timestamp & 0xffff, &data->timestamp[4]);
+
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+
+	ctl_datamove((union ctl_io *)ctsio);
+	return (retval);
+}
+
 int
 ctl_persistent_reserve_in(struct ctl_scsiio *ctsio)
 {
@@ -7312,7 +7690,7 @@ ctl_persistent_reserve_in(struct ctl_scsiio *ctsio)
 	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
 
 retry:
-	mtx_lock(&softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 	switch (cdb->action) {
 	case SPRI_RK: /* read keys */
 		total_len = sizeof(struct scsi_per_res_in_keys) +
@@ -7329,19 +7707,14 @@ ctl_persistent_reserve_in(struct ctl_scsiio *ctsio)
 		total_len = sizeof(struct scsi_per_res_cap);
 		break;
 	case SPRI_RS: /* read full status */
+		total_len = sizeof(struct scsi_per_res_in_header) +
+		    (sizeof(struct scsi_per_res_in_full_desc) + 256) *
+		    lun->pr_key_count;
+		break;
 	default:
-		mtx_unlock(&softc->ctl_lock);
-		ctl_set_invalid_field(ctsio,
-				      /*sks_valid*/ 1,
-				      /*command*/ 1,
-				      /*field*/ 1,
-				      /*bit_valid*/ 1,
-				      /*bit*/ 0);
-		ctl_done((union ctl_io *)ctsio);
-		return (CTL_RETVAL_COMPLETE);
-		break; /* NOTREACHED */
+		panic("Invalid PR type %x", cdb->action);
 	}
-	mtx_unlock(&softc->ctl_lock);
+	mtx_unlock(&lun->lun_lock);
 
 	ctsio->kern_data_ptr = malloc(total_len, M_CTL, M_WAITOK | M_ZERO);
 
@@ -7359,7 +7732,7 @@ ctl_persistent_reserve_in(struct ctl_scsiio *ctsio)
 	ctsio->kern_rel_offset = 0;
 	ctsio->kern_sg_entries = 0;
 
-	mtx_lock(&softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 	switch (cdb->action) {
 	case SPRI_RK: { // read keys
         struct scsi_per_res_in_keys *res_keys;
@@ -7377,7 +7750,7 @@ ctl_persistent_reserve_in(struct ctl_scsiio *ctsio)
 		if (total_len != (sizeof(struct scsi_per_res_in_keys) +
 		    (lun->pr_key_count *
 		     sizeof(struct scsi_per_res_key)))){
-			mtx_unlock(&softc->ctl_lock);
+			mtx_unlock(&lun->lun_lock);
 			free(ctsio->kern_data_ptr, M_CTL);
 			printf("%s: reservation length changed, retrying\n",
 			       __func__);
@@ -7452,7 +7825,7 @@ ctl_persistent_reserve_in(struct ctl_scsiio *ctsio)
 		 * command active right now.)
 		 */
 		if (tmp_len != total_len) {
-			mtx_unlock(&softc->ctl_lock);
+			mtx_unlock(&lun->lun_lock);
 			free(ctsio->kern_data_ptr, M_CTL);
 			printf("%s: reservation status changed, retrying\n",
 			       __func__);
@@ -7484,7 +7857,7 @@ ctl_persistent_reserve_in(struct ctl_scsiio *ctsio)
 
 		res_cap = (struct scsi_per_res_cap *)ctsio->kern_data_ptr;
 		scsi_ulto2b(sizeof(*res_cap), res_cap->length);
-		res_cap->flags2 |= SPRI_TMV;
+		res_cap->flags2 |= SPRI_TMV | SPRI_ALLOW_3;
 		type_mask = SPRI_TM_WR_EX_AR |
 			    SPRI_TM_EX_AC_RO |
 			    SPRI_TM_WR_EX_RO |
@@ -7494,7 +7867,62 @@ ctl_persistent_reserve_in(struct ctl_scsiio *ctsio)
 		scsi_ulto2b(type_mask, res_cap->type_mask);
 		break;
 	}
-	case SPRI_RS: //read full status
+	case SPRI_RS: { // read full status
+		struct scsi_per_res_in_full *res_status;
+		struct scsi_per_res_in_full_desc *res_desc;
+		struct ctl_port *port;
+		int i, len;
+
+		res_status = (struct scsi_per_res_in_full*)ctsio->kern_data_ptr;
+
+		/*
+		 * We had to drop the lock to allocate our buffer, which
+		 * leaves time for someone to come in with another
+		 * persistent reservation.  (That is unlikely, though,
+		 * since this should be the only persistent reservation
+		 * command active right now.)
+		 */
+		if (total_len < (sizeof(struct scsi_per_res_in_header) +
+		    (sizeof(struct scsi_per_res_in_full_desc) + 256) *
+		     lun->pr_key_count)){
+			mtx_unlock(&lun->lun_lock);
+			free(ctsio->kern_data_ptr, M_CTL);
+			printf("%s: reservation length changed, retrying\n",
+			       __func__);
+			goto retry;
+		}
+
+		scsi_ulto4b(lun->PRGeneration, res_status->header.generation);
+
+		res_desc = &res_status->desc[0];
+		for (i = 0; i < 2*CTL_MAX_INITIATORS; i++) {
+			if (!lun->per_res[i].registered)
+				continue;
+
+			memcpy(&res_desc->res_key, &lun->per_res[i].res_key.key,
+			    sizeof(res_desc->res_key));
+			if ((lun->flags & CTL_LUN_PR_RESERVED) &&
+			    (lun->pr_res_idx == i ||
+			     lun->pr_res_idx == CTL_PR_ALL_REGISTRANTS)) {
+				res_desc->flags = SPRI_FULL_R_HOLDER;
+				res_desc->scopetype = lun->res_type;
+			}
+			scsi_ulto2b(i / CTL_MAX_INIT_PER_PORT,
+			    res_desc->rel_trgt_port_id);
+			len = 0;
+			port = softc->ctl_ports[i / CTL_MAX_INIT_PER_PORT];
+			if (port != NULL)
+				len = ctl_create_iid(port,
+				    i % CTL_MAX_INIT_PER_PORT,
+				    res_desc->transport_id);
+			scsi_ulto4b(len, res_desc->additional_length);
+			res_desc = (struct scsi_per_res_in_full_desc *)
+			    &res_desc->transport_id[len];
+		}
+		scsi_ulto4b((uint8_t *)res_desc - (uint8_t *)&res_status->desc[0],
+		    res_status->header.length);
+		break;
+	}
 	default:
 		/*
 		 * This is a bug, because we just checked for this above,
@@ -7503,8 +7931,9 @@ ctl_persistent_reserve_in(struct ctl_scsiio *ctsio)
 		panic("Invalid PR type %x", cdb->action);
 		break; /* NOTREACHED */
 	}
-	mtx_unlock(&softc->ctl_lock);
+	mtx_unlock(&lun->lun_lock);
 
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 	ctsio->be_move_done = ctl_config_move_done;
 
 	CTL_DEBUG_PRINT(("buf = %x %x %x %x %x %x %x %x\n",
@@ -7534,13 +7963,13 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 
 	retval = 0;
 
+	mtx_lock(&lun->lun_lock);
 	if (sa_res_key == 0) {
-		mtx_lock(&softc->ctl_lock);
 		if (lun->pr_res_idx == CTL_PR_ALL_REGISTRANTS) {
 			/* validate scope and type */
 			if ((cdb->scope_type & SPR_SCOPE_MASK) !=
 			     SPR_LU_SCOPE) {
-				mtx_unlock(&softc->ctl_lock);
+				mtx_unlock(&lun->lun_lock);
 				ctl_set_invalid_field(/*ctsio*/ ctsio,
 						      /*sks_valid*/ 1,
 						      /*command*/ 1,
@@ -7552,7 +7981,7 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 			}
 
 		        if (type>8 || type==2 || type==4 || type==0) {
-				mtx_unlock(&softc->ctl_lock);
+				mtx_unlock(&lun->lun_lock);
 				ctl_set_invalid_field(/*ctsio*/ ctsio,
        	           				      /*sks_valid*/ 1,
 						      /*command*/ 1,
@@ -7576,12 +8005,11 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 
 				if (!persis_offset
 				 && i <CTL_MAX_INITIATORS)
-					lun->pending_sense[i].ua_pending |=
+					lun->pending_ua[i] |=
 						CTL_UA_REG_PREEMPT;
 				else if (persis_offset
 				      && i >= persis_offset)
-					lun->pending_sense[i-persis_offset
-						].ua_pending |=
+					lun->pending_ua[i-persis_offset] |=
 						CTL_UA_REG_PREEMPT;
 				lun->per_res[i].registered = 0;
 				memset(&lun->per_res[i].res_key, 0,
@@ -7594,7 +8022,6 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 			 && lun->res_type != SPR_TYPE_EX_AC_AR)
 				lun->pr_res_idx = residx;
 
-			mtx_unlock(&softc->ctl_lock);
 			/* send msg to other side */
 			persis_io.hdr.nexus = ctsio->io_hdr.nexus;
 			persis_io.hdr.msg_type = CTL_MSG_PERS_ACTION;
@@ -7613,7 +8040,7 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 			}
 		} else {
 			/* not all registrants */
-			mtx_unlock(&softc->ctl_lock);
+			mtx_unlock(&lun->lun_lock);
 			free(ctsio->kern_data_ptr, M_CTL);
 			ctl_set_invalid_field(ctsio,
 					      /*sks_valid*/ 1,
@@ -7628,7 +8055,6 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 		|| !(lun->flags & CTL_LUN_PR_RESERVED)) {
 		int found = 0;
 
-		mtx_lock(&softc->ctl_lock);
 		if (res_key == sa_res_key) {
 			/* special case */
 			/*
@@ -7640,7 +8066,7 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 			 * zero I'll take that approach since this has
 			 * to do with the sa_res_key.
 			 */
-			mtx_unlock(&softc->ctl_lock);
+			mtx_unlock(&lun->lun_lock);
 			free(ctsio->kern_data_ptr, M_CTL);
 			ctl_set_invalid_field(ctsio,
 					      /*sks_valid*/ 1,
@@ -7665,17 +8091,14 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 			       sizeof(struct scsi_per_res_key));
 			lun->pr_key_count--;
 
-			if (!persis_offset
-			 && i < CTL_MAX_INITIATORS)
-				lun->pending_sense[i].ua_pending |=
-					CTL_UA_REG_PREEMPT;
-			else if (persis_offset
-			      && i >= persis_offset)
-				lun->pending_sense[i-persis_offset].ua_pending|=
+			if (!persis_offset && i < CTL_MAX_INITIATORS)
+				lun->pending_ua[i] |= CTL_UA_REG_PREEMPT;
+			else if (persis_offset && i >= persis_offset)
+				lun->pending_ua[i-persis_offset] |=
 					CTL_UA_REG_PREEMPT;
 		}
-		mtx_unlock(&softc->ctl_lock);
 		if (!found) {
+			mtx_unlock(&lun->lun_lock);
 			free(ctsio->kern_data_ptr, M_CTL);
 			ctl_set_reservation_conflict(ctsio);
 			ctl_done((union ctl_io *)ctsio);
@@ -7705,6 +8128,7 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 			/* validate scope and type */
 			if ((cdb->scope_type & SPR_SCOPE_MASK) !=
 			     SPR_LU_SCOPE) {
+				mtx_unlock(&lun->lun_lock);
 				ctl_set_invalid_field(/*ctsio*/ ctsio,
 						      /*sks_valid*/ 1,
 						      /*command*/ 1,
@@ -7716,6 +8140,7 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 			}
 
 			if (type>8 || type==2 || type==4 || type==0) {
+				mtx_unlock(&lun->lun_lock);
 				ctl_set_invalid_field(/*ctsio*/ ctsio,
 						      /*sks_valid*/ 1,
 						      /*command*/ 1,
@@ -7760,27 +8185,23 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 
 					if (!persis_offset
 					 && i < CTL_MAX_INITIATORS)
-						lun->pending_sense[i
-							].ua_pending |=
+						lun->pending_ua[i] |=
 							CTL_UA_REG_PREEMPT;
 					else if (persis_offset
 					      && i >= persis_offset)
-						lun->pending_sense[
-						  i-persis_offset].ua_pending |=
+						lun->pending_ua[i-persis_offset] |=
 						  CTL_UA_REG_PREEMPT;
 				} else if (type != lun->res_type
 					&& (lun->res_type == SPR_TYPE_WR_EX_RO
 					 || lun->res_type ==SPR_TYPE_EX_AC_RO)){
 						if (!persis_offset
 						 && i < CTL_MAX_INITIATORS)
-							lun->pending_sense[i
-							].ua_pending |=
+							lun->pending_ua[i] |=
 							CTL_UA_RES_RELEASE;
 						else if (persis_offset
 						      && i >= persis_offset)
-							lun->pending_sense[
-							i-persis_offset
-							].ua_pending |=
+							lun->pending_ua[
+							i-persis_offset] |=
 							CTL_UA_RES_RELEASE;
 				}
 			}
@@ -7790,8 +8211,7 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 			 && lun->res_type != SPR_TYPE_EX_AC_AR)
 				lun->pr_res_idx = residx;
 			else
-				lun->pr_res_idx =
-					CTL_PR_ALL_REGISTRANTS;
+				lun->pr_res_idx = CTL_PR_ALL_REGISTRANTS;
 
 			persis_io.hdr.nexus = ctsio->io_hdr.nexus;
 			persis_io.hdr.msg_type = CTL_MSG_PERS_ACTION;
@@ -7814,7 +8234,6 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 			 * remove registrants
 			 */
 			int found=0;
-			mtx_lock(&softc->ctl_lock);
 
 			for (i=0; i < 2*CTL_MAX_INITIATORS; i++) {
 				if (memcmp(param->serv_act_res_key,
@@ -7830,23 +8249,21 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 
 				if (!persis_offset
 				 && i < CTL_MAX_INITIATORS)
-					lun->pending_sense[i].ua_pending |=
+					lun->pending_ua[i] |=
 						CTL_UA_REG_PREEMPT;
 				else if (persis_offset
 				      && i >= persis_offset)
-					lun->pending_sense[
-						i-persis_offset].ua_pending |=
+					lun->pending_ua[i-persis_offset] |=
 						CTL_UA_REG_PREEMPT;
 			}
 
 			if (!found) {
-				mtx_unlock(&softc->ctl_lock);
+				mtx_unlock(&lun->lun_lock);
 				free(ctsio->kern_data_ptr, M_CTL);
 				ctl_set_reservation_conflict(ctsio);
 				ctl_done((union ctl_io *)ctsio);
 		        	return (1);
 			}
-			mtx_unlock(&softc->ctl_lock);
 			persis_io.hdr.nexus = ctsio->io_hdr.nexus;
 			persis_io.hdr.msg_type = CTL_MSG_PERS_ACTION;
 			persis_io.pr.pr_info.action = CTL_PR_PREEMPT;
@@ -7866,6 +8283,7 @@ ctl_pro_preempt(struct ctl_softc *softc, struct ctl_lun *lun, uint64_t res_key,
 	}
 
 	lun->PRGeneration++;
+	mtx_unlock(&lun->lun_lock);
 
 	return (retval);
 }
@@ -7897,11 +8315,10 @@ ctl_pro_preempt_other(struct ctl_lun *lun, union ctl_ha_msg *msg)
 
 				if (!persis_offset
 				 && i < CTL_MAX_INITIATORS)
-					lun->pending_sense[i].ua_pending |=
+					lun->pending_ua[i] |=
 						CTL_UA_REG_PREEMPT;
 				else if (persis_offset && i >= persis_offset)
-					lun->pending_sense[i -
-						persis_offset].ua_pending |=
+					lun->pending_ua[i - persis_offset] |=
 						CTL_UA_REG_PREEMPT;
 				lun->per_res[i].registered = 0;
 				memset(&lun->per_res[i].res_key, 0,
@@ -7928,12 +8345,11 @@ ctl_pro_preempt_other(struct ctl_lun *lun, union ctl_ha_msg *msg)
 
 				if (!persis_offset
 				 && i < persis_offset)
-					lun->pending_sense[i].ua_pending |=
+					lun->pending_ua[i] |=
 						CTL_UA_REG_PREEMPT;
 				else if (persis_offset
 				      && i >= persis_offset)
-					lun->pending_sense[i -
-						persis_offset].ua_pending |=
+					lun->pending_ua[i - persis_offset] |=
 						CTL_UA_REG_PREEMPT;
 			}
 		}
@@ -7956,25 +8372,22 @@ ctl_pro_preempt_other(struct ctl_lun *lun, union ctl_ha_msg *msg)
 				lun->pr_key_count--;
 				if (!persis_offset
 				 && i < CTL_MAX_INITIATORS)
-					lun->pending_sense[i].ua_pending |=
+					lun->pending_ua[i] |=
 						CTL_UA_REG_PREEMPT;
 				else if (persis_offset
 				      && i >= persis_offset)
-					lun->pending_sense[i -
-						persis_offset].ua_pending |=
+					lun->pending_ua[i - persis_offset] |=
 						CTL_UA_REG_PREEMPT;
 			} else if (msg->pr.pr_info.res_type != lun->res_type
 				&& (lun->res_type == SPR_TYPE_WR_EX_RO
 				 || lun->res_type == SPR_TYPE_EX_AC_RO)) {
 					if (!persis_offset
 					 && i < persis_offset)
-						lun->pending_sense[i
-							].ua_pending |=
+						lun->pending_ua[i] |=
 							CTL_UA_RES_RELEASE;
 					else if (persis_offset
 					      && i >= persis_offset)
-					lun->pending_sense[i -
-						persis_offset].ua_pending |=
+					lun->pending_ua[i - persis_offset] |=
 						CTL_UA_RES_RELEASE;
 			}
 		}
@@ -8048,28 +8461,6 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 		}
 	}
 
-	switch (cdb->action & SPRO_ACTION_MASK) {
-	case SPRO_REGISTER:
-	case SPRO_RESERVE:
-	case SPRO_RELEASE:
-	case SPRO_CLEAR:
-	case SPRO_PREEMPT:
-	case SPRO_REG_IGNO:
-		break;
-	case SPRO_REG_MOVE:
-	case SPRO_PRE_ABO:
-	default:
-		ctl_set_invalid_field(/*ctsio*/ ctsio,
-				      /*sks_valid*/ 1,
-				      /*command*/ 1,
-				      /*field*/ 1,
-				      /*bit_valid*/ 1,
-				      /*bit*/ 0);
-		ctl_done((union ctl_io *)ctsio);
-		return (CTL_RETVAL_COMPLETE);
-		break; /* NOTREACHED */
-	}
-
 	param_len = scsi_4btoul(cdb->length);
 
 	if ((ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) == 0) {
@@ -8097,7 +8488,7 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 	 * This must be done for all other service actions
 	 */
 	if ((cdb->action & SPRO_ACTION_MASK) != SPRO_REG_IGNO) {
-		mtx_lock(&softc->ctl_lock);
+		mtx_lock(&lun->lun_lock);
 		if (lun->per_res[residx].registered) {
 		    if (memcmp(param->res_key.key,
 			       lun->per_res[residx].res_key.key,
@@ -8108,7 +8499,7 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 				 * the one the initiator previously
 				 * registered.
 				 */
-				mtx_unlock(&softc->ctl_lock);
+				mtx_unlock(&lun->lun_lock);
 				free(ctsio->kern_data_ptr, M_CTL);
 				ctl_set_reservation_conflict(ctsio);
 				ctl_done((union ctl_io *)ctsio);
@@ -8118,7 +8509,7 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 			/*
 			 * We are not registered
 			 */
-			mtx_unlock(&softc->ctl_lock);
+			mtx_unlock(&lun->lun_lock);
 			free(ctsio->kern_data_ptr, M_CTL);
 			ctl_set_reservation_conflict(ctsio);
 			ctl_done((union ctl_io *)ctsio);
@@ -8128,13 +8519,13 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 			 * We are not registered and trying to register but
 			 * the register key isn't zero.
 			 */
-			mtx_unlock(&softc->ctl_lock);
+			mtx_unlock(&lun->lun_lock);
 			free(ctsio->kern_data_ptr, M_CTL);
 			ctl_set_reservation_conflict(ctsio);
 			ctl_done((union ctl_io *)ctsio);
 			return (CTL_RETVAL_COMPLETE);
 		}
-		mtx_unlock(&softc->ctl_lock);
+		mtx_unlock(&lun->lun_lock);
 	}
 
 	switch (cdb->action & SPRO_ACTION_MASK) {
@@ -8173,7 +8564,7 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 			return (CTL_RETVAL_COMPLETE);
 		}
 
-		mtx_lock(&softc->ctl_lock);
+		mtx_lock(&lun->lun_lock);
 
 		/*
 		 * The initiator wants to clear the
@@ -8184,7 +8575,7 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 			  && (cdb->action & SPRO_ACTION_MASK) == SPRO_REGISTER)
 			 || ((cdb->action & SPRO_ACTION_MASK) == SPRO_REG_IGNO
 			  && !lun->per_res[residx].registered)) {
-				mtx_unlock(&softc->ctl_lock);
+				mtx_unlock(&lun->lun_lock);
 				goto done;
 			}
 
@@ -8213,8 +8604,7 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 						    i+persis_offset].registered
 						    == 0)
 							continue;
-						lun->pending_sense[i
-							].ua_pending |=
+						lun->pending_ua[i] |=
 							CTL_UA_RES_RELEASE;
 					}
 				}
@@ -8236,7 +8626,6 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 				printf("CTL:Persis Out error returned from "
 				       "ctl_ha_msg_send %d\n", isc_retval);
 			}
-			mtx_unlock(&softc->ctl_lock);
 		} else /* sa_res_key != 0 */ {
 
 			/*
@@ -8260,7 +8649,6 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 			memcpy(persis_io.pr.pr_info.sa_res_key,
 			       param->serv_act_res_key,
 			       sizeof(param->serv_act_res_key));
-			mtx_unlock(&softc->ctl_lock);
 			if ((isc_retval=ctl_ha_msg_send(CTL_HA_CHAN_CTL,
 			     &persis_io, sizeof(persis_io), 0)) >
 			     CTL_HA_STATUS_SUCCESS) {
@@ -8269,6 +8657,7 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 			}
 		}
 		lun->PRGeneration++;
+		mtx_unlock(&lun->lun_lock);
 
 		break;
 	}
@@ -8276,7 +8665,7 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 #if 0
                 printf("Reserve executed type %d\n", type);
 #endif
-		mtx_lock(&softc->ctl_lock);
+		mtx_lock(&lun->lun_lock);
 		if (lun->flags & CTL_LUN_PR_RESERVED) {
 			/*
 			 * if this isn't the reservation holder and it's
@@ -8286,13 +8675,13 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 			if ((lun->pr_res_idx != residx
 			  && lun->pr_res_idx != CTL_PR_ALL_REGISTRANTS)
 			 || lun->res_type != type) {
-				mtx_unlock(&softc->ctl_lock);
+				mtx_unlock(&lun->lun_lock);
 				free(ctsio->kern_data_ptr, M_CTL);
 				ctl_set_reservation_conflict(ctsio);
 				ctl_done((union ctl_io *)ctsio);
 				return (CTL_RETVAL_COMPLETE);
 			}
-			mtx_unlock(&softc->ctl_lock);
+			mtx_unlock(&lun->lun_lock);
 		} else /* create a reservation */ {
 			/*
 			 * If it's not an "all registrants" type record
@@ -8307,7 +8696,7 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 			lun->flags |= CTL_LUN_PR_RESERVED;
 			lun->res_type = type;
 
-			mtx_unlock(&softc->ctl_lock);
+			mtx_unlock(&lun->lun_lock);
 
 			/* send msg to other side */
 			persis_io.hdr.nexus = ctsio->io_hdr.nexus;
@@ -8325,10 +8714,10 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 		break;
 
 	case SPRO_RELEASE:
-		mtx_lock(&softc->ctl_lock);
+		mtx_lock(&lun->lun_lock);
 		if ((lun->flags & CTL_LUN_PR_RESERVED) == 0) {
 			/* No reservation exists return good status */
-			mtx_unlock(&softc->ctl_lock);
+			mtx_unlock(&lun->lun_lock);
 			goto done;
 		}
 		/*
@@ -8340,12 +8729,12 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 			 * not a res holder return good status but
 			 * do nothing
 			 */
-			mtx_unlock(&softc->ctl_lock);
+			mtx_unlock(&lun->lun_lock);
 			goto done;
 		}
 
 		if (lun->res_type != type) {
-			mtx_unlock(&softc->ctl_lock);
+			mtx_unlock(&lun->lun_lock);
 			free(ctsio->kern_data_ptr, M_CTL);
 			ctl_set_illegal_pr_release(ctsio);
 			ctl_done((union ctl_io *)ctsio);
@@ -8373,13 +8762,13 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 				if (lun->per_res[i+persis_offset].registered
 				    == 0)
 					continue;
-				lun->pending_sense[i].ua_pending |=
+				lun->pending_ua[i] |=
 					CTL_UA_RES_RELEASE;
 			}
 
 			lun->per_res[residx].registered = 1;
 		}
-		mtx_unlock(&softc->ctl_lock);
+		mtx_unlock(&lun->lun_lock);
 		/* Send msg to other side */
 		persis_io.hdr.nexus = ctsio->io_hdr.nexus;
 		persis_io.hdr.msg_type = CTL_MSG_PERS_ACTION;
@@ -8394,7 +8783,7 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 	case SPRO_CLEAR:
 		/* send msg to other side */
 
-		mtx_lock(&softc->ctl_lock);
+		mtx_lock(&lun->lun_lock);
 		lun->flags &= ~CTL_LUN_PR_RESERVED;
 		lun->res_type = 0;
 		lun->pr_key_count = 0;
@@ -8408,18 +8797,18 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 		for (i=0; i < 2*CTL_MAX_INITIATORS; i++)
 			if (lun->per_res[i].registered) {
 				if (!persis_offset && i < CTL_MAX_INITIATORS)
-					lun->pending_sense[i].ua_pending |=
+					lun->pending_ua[i] |=
 						CTL_UA_RES_PREEMPT;
 				else if (persis_offset && i >= persis_offset)
-					lun->pending_sense[i-persis_offset
-					    ].ua_pending |= CTL_UA_RES_PREEMPT;
+					lun->pending_ua[i-persis_offset] |=
+					    CTL_UA_RES_PREEMPT;
 
 				memset(&lun->per_res[i].res_key,
 				       0, sizeof(struct scsi_per_res_key));
 				lun->per_res[i].registered = 0;
 			}
 		lun->PRGeneration++;
-		mtx_unlock(&softc->ctl_lock);
+		mtx_unlock(&lun->lun_lock);
 		persis_io.hdr.nexus = ctsio->io_hdr.nexus;
 		persis_io.hdr.msg_type = CTL_MSG_PERS_ACTION;
 		persis_io.pr.pr_info.action = CTL_PR_CLEAR;
@@ -8439,19 +8828,8 @@ ctl_persistent_reserve_out(struct ctl_scsiio *ctsio)
 			return (CTL_RETVAL_COMPLETE);
 		break;
 	}
-	case SPRO_REG_MOVE:
-	case SPRO_PRE_ABO:
 	default:
-		free(ctsio->kern_data_ptr, M_CTL);
-		ctl_set_invalid_field(/*ctsio*/ ctsio,
-				      /*sks_valid*/ 1,
-				      /*command*/ 1,
-				      /*field*/ 1,
-				      /*bit_valid*/ 1,
-				      /*bit*/ 0);
-		ctl_done((union ctl_io *)ctsio);
-		return (CTL_RETVAL_COMPLETE);
-		break; /* NOTREACHED */
+		panic("Invalid PR type %x", cdb->action);
 	}
 
 done:
@@ -8478,12 +8856,9 @@ ctl_hndl_per_res_out_on_other_sc(union ctl_ha_msg *msg)
 
 	softc = control_softc;
 
-	mtx_lock(&softc->ctl_lock);
-
-	targ_lun = msg->hdr.nexus.targ_lun;
-	if (msg->hdr.nexus.lun_map_fn != NULL)
-		targ_lun = msg->hdr.nexus.lun_map_fn(msg->hdr.nexus.lun_map_arg, targ_lun);
+	targ_lun = msg->hdr.nexus.targ_mapped_lun;
 	lun = softc->ctl_luns[targ_lun];
+	mtx_lock(&lun->lun_lock);
 	switch(msg->pr.pr_info.action) {
 	case CTL_PR_REG_KEY:
 		if (!lun->per_res[msg->pr.pr_info.residx].registered) {
@@ -8524,8 +8899,7 @@ ctl_hndl_per_res_out_on_other_sc(union ctl_ha_msg *msg)
 					    persis_offset].registered == 0)
 						continue;
 
-					lun->pending_sense[i
-						].ua_pending |=
+					lun->pending_ua[i] |=
 						CTL_UA_RES_RELEASE;
 				}
 			}
@@ -8556,7 +8930,7 @@ ctl_hndl_per_res_out_on_other_sc(union ctl_ha_msg *msg)
 		 && lun->res_type != SPR_TYPE_WR_EX) {
 			for (i = 0; i < CTL_MAX_INITIATORS; i++)
 				if (lun->per_res[i+persis_offset].registered)
-					lun->pending_sense[i].ua_pending |=
+					lun->pending_ua[i] |=
 						CTL_UA_RES_RELEASE;
 		}
 
@@ -8579,11 +8953,10 @@ ctl_hndl_per_res_out_on_other_sc(union ctl_ha_msg *msg)
 				continue;
 			if (!persis_offset
 			 && i < CTL_MAX_INITIATORS)
-				lun->pending_sense[i].ua_pending |=
-					CTL_UA_RES_PREEMPT;
+				lun->pending_ua[i] |= CTL_UA_RES_PREEMPT;
 			else if (persis_offset
 			      && i >= persis_offset)
-   				lun->pending_sense[i-persis_offset].ua_pending|=
+				lun->pending_ua[i-persis_offset] |=
 					CTL_UA_RES_PREEMPT;
 			memset(&lun->per_res[i].res_key, 0,
 			       sizeof(struct scsi_per_res_key));
@@ -8593,17 +8966,17 @@ ctl_hndl_per_res_out_on_other_sc(union ctl_ha_msg *msg)
 		break;
 	}
 
-	mtx_unlock(&softc->ctl_lock);
+	mtx_unlock(&lun->lun_lock);
 }
 
 int
 ctl_read_write(struct ctl_scsiio *ctsio)
 {
 	struct ctl_lun *lun;
-	struct ctl_lba_len lbalen;
+	struct ctl_lba_len_flags *lbalen;
 	uint64_t lba;
 	uint32_t num_blocks;
-	int reladdr, fua, dpo, ebp;
+	int fua, dpo;
 	int retval;
 	int isread;
 
@@ -8611,10 +8984,8 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 
 	CTL_DEBUG_PRINT(("ctl_read_write: command: %#x\n", ctsio->cdb[0]));
 
-	reladdr = 0;
 	fua = 0;
 	dpo = 0;
-	ebp = 0;
 
 	retval = CTL_RETVAL_COMPLETE;
 
@@ -8662,17 +9033,11 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 
 		cdb = (struct scsi_rw_10 *)ctsio->cdb;
 
-		if (cdb->byte2 & SRW10_RELADDR)
-			reladdr = 1;
 		if (cdb->byte2 & SRW10_FUA)
 			fua = 1;
 		if (cdb->byte2 & SRW10_DPO)
 			dpo = 1;
 
-		if ((cdb->opcode == WRITE_10)
-		 && (cdb->byte2 & SRW10_EBP))
-			ebp = 1;
-
 		lba = scsi_4btoul(cdb->addr);
 		num_blocks = scsi_2btoul(cdb->length);
 		break;
@@ -8702,8 +9067,6 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 
 		cdb = (struct scsi_rw_12 *)ctsio->cdb;
 
-		if (cdb->byte2 & SRW12_RELADDR)
-			reladdr = 1;
 		if (cdb->byte2 & SRW12_FUA)
 			fua = 1;
 		if (cdb->byte2 & SRW12_DPO)
@@ -8731,8 +9094,6 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 
 		cdb = (struct scsi_rw_16 *)ctsio->cdb;
 
-		if (cdb->byte2 & SRW12_RELADDR)
-			reladdr = 1;
 		if (cdb->byte2 & SRW12_FUA)
 			fua = 1;
 		if (cdb->byte2 & SRW12_DPO)
@@ -8772,20 +9133,6 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 	 * getting it to do write-through for a particular transaction may
 	 * not be possible.
 	 */
-	/*
-	 * We don't support relative addressing.  That also requires
-	 * supporting linked commands, which we don't do.
-	 */
-	if (reladdr != 0) {
-		ctl_set_invalid_field(ctsio,
-				      /*sks_valid*/ 1,
-				      /*command*/ 1,
-				      /*field*/ 1,
-				      /*bit_valid*/ 1,
-				      /*bit*/ 0);
-		ctl_done((union ctl_io *)ctsio);
-		return (CTL_RETVAL_COMPLETE);
-	}
 
 	/*
 	 * The first check is to make sure we're in bounds, the second
@@ -8811,10 +9158,14 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 		return (CTL_RETVAL_COMPLETE);
 	}
 
-	lbalen.lba = lba;
-	lbalen.len = num_blocks;
-	memcpy(ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes, &lbalen,
-	       sizeof(lbalen));
+	lbalen = (struct ctl_lba_len_flags *)
+	    &ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
+	lbalen->lba = lba;
+	lbalen->len = num_blocks;
+	lbalen->flags = isread ? CTL_LLF_READ : CTL_LLF_WRITE;
+
+	ctsio->kern_total_len = num_blocks * lun->be_lun->blocksize;
+	ctsio->kern_rel_offset = 0;
 
 	CTL_DEBUG_PRINT(("ctl_read_write: calling data_submit()\n"));
 
@@ -8823,6 +9174,228 @@ ctl_read_write(struct ctl_scsiio *ctsio)
 	return (retval);
 }
 
+static int
+ctl_cnw_cont(union ctl_io *io)
+{
+	struct ctl_scsiio *ctsio;
+	struct ctl_lun *lun;
+	struct ctl_lba_len_flags *lbalen;
+	int retval;
+
+	ctsio = &io->scsiio;
+	ctsio->io_hdr.status = CTL_STATUS_NONE;
+	ctsio->io_hdr.flags &= ~CTL_FLAG_IO_CONT;
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+	lbalen = (struct ctl_lba_len_flags *)
+	    &ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
+	lbalen->flags = CTL_LLF_WRITE;
+
+	CTL_DEBUG_PRINT(("ctl_cnw_cont: calling data_submit()\n"));
+	retval = lun->backend->data_submit((union ctl_io *)ctsio);
+	return (retval);
+}
+
+int
+ctl_cnw(struct ctl_scsiio *ctsio)
+{
+	struct ctl_lun *lun;
+	struct ctl_lba_len_flags *lbalen;
+	uint64_t lba;
+	uint32_t num_blocks;
+	int fua, dpo;
+	int retval;
+
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	CTL_DEBUG_PRINT(("ctl_cnw: command: %#x\n", ctsio->cdb[0]));
+
+	fua = 0;
+	dpo = 0;
+
+	retval = CTL_RETVAL_COMPLETE;
+
+	switch (ctsio->cdb[0]) {
+	case COMPARE_AND_WRITE: {
+		struct scsi_compare_and_write *cdb;
+
+		cdb = (struct scsi_compare_and_write *)ctsio->cdb;
+
+		if (cdb->byte2 & SRW10_FUA)
+			fua = 1;
+		if (cdb->byte2 & SRW10_DPO)
+			dpo = 1;
+		lba = scsi_8btou64(cdb->addr);
+		num_blocks = cdb->length;
+		break;
+	}
+	default:
+		/*
+		 * We got a command we don't support.  This shouldn't
+		 * happen, commands should be filtered out above us.
+		 */
+		ctl_set_invalid_opcode(ctsio);
+		ctl_done((union ctl_io *)ctsio);
+
+		return (CTL_RETVAL_COMPLETE);
+		break; /* NOTREACHED */
+	}
+
+	/*
+	 * XXX KDM what do we do with the DPO and FUA bits?  FUA might be
+	 * interesting for us, but if RAIDCore is in write-back mode,
+	 * getting it to do write-through for a particular transaction may
+	 * not be possible.
+	 */
+
+	/*
+	 * The first check is to make sure we're in bounds, the second
+	 * check is to catch wrap-around problems.  If the lba + num blocks
+	 * is less than the lba, then we've wrapped around and the block
+	 * range is invalid anyway.
+	 */
+	if (((lba + num_blocks) > (lun->be_lun->maxlba + 1))
+	 || ((lba + num_blocks) < lba)) {
+		ctl_set_lba_out_of_range(ctsio);
+		ctl_done((union ctl_io *)ctsio);
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	/*
+	 * According to SBC-3, a transfer length of 0 is not an error.
+	 */
+	if (num_blocks == 0) {
+		ctl_set_success(ctsio);
+		ctl_done((union ctl_io *)ctsio);
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	ctsio->kern_total_len = 2 * num_blocks * lun->be_lun->blocksize;
+	ctsio->kern_rel_offset = 0;
+
+	/*
+	 * Set the IO_CONT flag, so that if this I/O gets passed to
+	 * ctl_data_submit_done(), it'll get passed back to
+	 * ctl_ctl_cnw_cont() for further processing.
+	 */
+	ctsio->io_hdr.flags |= CTL_FLAG_IO_CONT;
+	ctsio->io_cont = ctl_cnw_cont;
+
+	lbalen = (struct ctl_lba_len_flags *)
+	    &ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
+	lbalen->lba = lba;
+	lbalen->len = num_blocks;
+	lbalen->flags = CTL_LLF_COMPARE;
+
+	CTL_DEBUG_PRINT(("ctl_cnw: calling data_submit()\n"));
+	retval = lun->backend->data_submit((union ctl_io *)ctsio);
+	return (retval);
+}
+
+int
+ctl_verify(struct ctl_scsiio *ctsio)
+{
+	struct ctl_lun *lun;
+	struct ctl_lba_len_flags *lbalen;
+	uint64_t lba;
+	uint32_t num_blocks;
+	int bytchk, dpo;
+	int retval;
+
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	CTL_DEBUG_PRINT(("ctl_verify: command: %#x\n", ctsio->cdb[0]));
+
+	bytchk = 0;
+	dpo = 0;
+	retval = CTL_RETVAL_COMPLETE;
+
+	switch (ctsio->cdb[0]) {
+	case VERIFY_10: {
+		struct scsi_verify_10 *cdb;
+
+		cdb = (struct scsi_verify_10 *)ctsio->cdb;
+		if (cdb->byte2 & SVFY_BYTCHK)
+			bytchk = 1;
+		if (cdb->byte2 & SVFY_DPO)
+			dpo = 1;
+		lba = scsi_4btoul(cdb->addr);
+		num_blocks = scsi_2btoul(cdb->length);
+		break;
+	}
+	case VERIFY_12: {
+		struct scsi_verify_12 *cdb;
+
+		cdb = (struct scsi_verify_12 *)ctsio->cdb;
+		if (cdb->byte2 & SVFY_BYTCHK)
+			bytchk = 1;
+		if (cdb->byte2 & SVFY_DPO)
+			dpo = 1;
+		lba = scsi_4btoul(cdb->addr);
+		num_blocks = scsi_4btoul(cdb->length);
+		break;
+	}
+	case VERIFY_16: {
+		struct scsi_rw_16 *cdb;
+
+		cdb = (struct scsi_rw_16 *)ctsio->cdb;
+		if (cdb->byte2 & SVFY_BYTCHK)
+			bytchk = 1;
+		if (cdb->byte2 & SVFY_DPO)
+			dpo = 1;
+		lba = scsi_8btou64(cdb->addr);
+		num_blocks = scsi_4btoul(cdb->length);
+		break;
+	}
+	default:
+		/*
+		 * We got a command we don't support.  This shouldn't
+		 * happen, commands should be filtered out above us.
+		 */
+		ctl_set_invalid_opcode(ctsio);
+		ctl_done((union ctl_io *)ctsio);
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	/*
+	 * The first check is to make sure we're in bounds, the second
+	 * check is to catch wrap-around problems.  If the lba + num blocks
+	 * is less than the lba, then we've wrapped around and the block
+	 * range is invalid anyway.
+	 */
+	if (((lba + num_blocks) > (lun->be_lun->maxlba + 1))
+	 || ((lba + num_blocks) < lba)) {
+		ctl_set_lba_out_of_range(ctsio);
+		ctl_done((union ctl_io *)ctsio);
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	/*
+	 * According to SBC-3, a transfer length of 0 is not an error.
+	 */
+	if (num_blocks == 0) {
+		ctl_set_success(ctsio);
+		ctl_done((union ctl_io *)ctsio);
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	lbalen = (struct ctl_lba_len_flags *)
+	    &ctsio->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
+	lbalen->lba = lba;
+	lbalen->len = num_blocks;
+	if (bytchk) {
+		lbalen->flags = CTL_LLF_COMPARE;
+		ctsio->kern_total_len = num_blocks * lun->be_lun->blocksize;
+	} else {
+		lbalen->flags = CTL_LLF_VERIFY;
+		ctsio->kern_total_len = 0;
+	}
+	ctsio->kern_rel_offset = 0;
+
+	CTL_DEBUG_PRINT(("ctl_verify: calling data_submit()\n"));
+	retval = lun->backend->data_submit((union ctl_io *)ctsio);
+	return (retval);
+}
+
 int
 ctl_report_luns(struct ctl_scsiio *ctsio)
 {
@@ -8897,9 +9470,7 @@ ctl_report_luns(struct ctl_scsiio *ctsio)
 
 	mtx_lock(&control_softc->ctl_lock);
 	for (targ_lun_id = 0, num_filled = 0; targ_lun_id < CTL_MAX_LUNS && num_filled < num_luns; targ_lun_id++) {
-		lun_id = targ_lun_id;
-		if (ctsio->io_hdr.nexus.lun_map_fn != NULL)
-			lun_id = ctsio->io_hdr.nexus.lun_map_fn(ctsio->io_hdr.nexus.lun_map_arg, lun_id);
+		lun_id = ctl_map_lun(ctsio->io_hdr.nexus.targ_port, targ_lun_id);
 		if (lun_id >= CTL_MAX_LUNS)
 			continue;
 		lun = control_softc->ctl_luns[lun_id];
@@ -8951,9 +9522,11 @@ ctl_report_luns(struct ctl_scsiio *ctsio)
 		 * case, we shouldn't clear any pending lun change unit
 		 * attention.
 		 */
-		if (request_lun != NULL)
-			lun->pending_sense[initidx].ua_pending &=
-				~CTL_UA_LUN_CHANGE;
+		if (request_lun != NULL) {
+			mtx_lock(&lun->lun_lock);
+			lun->pending_ua[initidx] &= ~CTL_UA_LUN_CHANGE;
+			mtx_unlock(&lun->lun_lock);
+		}
 	}
 	mtx_unlock(&control_softc->ctl_lock);
 
@@ -8992,6 +9565,7 @@ ctl_report_luns(struct ctl_scsiio *ctsio)
 	 */
 	ctsio->scsi_status = SCSI_STATUS_OK;
 
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 	ctsio->be_move_done = ctl_config_move_done;
 	ctl_datamove((union ctl_io *)ctsio);
 
@@ -9051,7 +9625,8 @@ ctl_request_sense(struct ctl_scsiio *ctsio)
 	 * Check for pending sense, and then for pending unit attentions.
 	 * Pending sense gets returned first, then pending unit attentions.
 	 */
-	mtx_lock(&lun->ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
+#ifdef CTL_WITH_CA
 	if (ctl_is_set(lun->have_ca, initidx)) {
 		scsi_sense_data_type stored_format;
 
@@ -9059,8 +9634,7 @@ ctl_request_sense(struct ctl_scsiio *ctsio)
 		 * Check to see which sense format was used for the stored
 		 * sense data.
 		 */
-		stored_format = scsi_sense_type(
-		    &lun->pending_sense[initidx].sense);
+		stored_format = scsi_sense_type(&lun->pending_sense[initidx]);
 
 		/*
 		 * If the user requested a different sense format than the
@@ -9075,32 +9649,34 @@ ctl_request_sense(struct ctl_scsiio *ctsio)
 		if ((stored_format == SSD_TYPE_FIXED)
 		 && (sense_format == SSD_TYPE_DESC))
 			ctl_sense_to_desc((struct scsi_sense_data_fixed *)
-			    &lun->pending_sense[initidx].sense,
+			    &lun->pending_sense[initidx],
 			    (struct scsi_sense_data_desc *)sense_ptr);
 		else if ((stored_format == SSD_TYPE_DESC)
 		      && (sense_format == SSD_TYPE_FIXED))
 			ctl_sense_to_fixed((struct scsi_sense_data_desc *)
-			    &lun->pending_sense[initidx].sense,
+			    &lun->pending_sense[initidx],
 			    (struct scsi_sense_data_fixed *)sense_ptr);
 		else
-			memcpy(sense_ptr, &lun->pending_sense[initidx].sense,
+			memcpy(sense_ptr, &lun->pending_sense[initidx],
 			       ctl_min(sizeof(*sense_ptr),
-			       sizeof(lun->pending_sense[initidx].sense)));
+			       sizeof(lun->pending_sense[initidx])));
 
 		ctl_clear_mask(lun->have_ca, initidx);
 		have_error = 1;
-	} else if (lun->pending_sense[initidx].ua_pending != CTL_UA_NONE) {
+	} else
+#endif
+	if (lun->pending_ua[initidx] != CTL_UA_NONE) {
 		ctl_ua_type ua_type;
 
-		ua_type = ctl_build_ua(lun->pending_sense[initidx].ua_pending,
+		ua_type = ctl_build_ua(lun->pending_ua[initidx],
 				       sense_ptr, sense_format);
 		if (ua_type != CTL_UA_NONE) {
 			have_error = 1;
 			/* We're reporting this UA, so clear it */
-			lun->pending_sense[initidx].ua_pending &= ~ua_type;
+			lun->pending_ua[initidx] &= ~ua_type;
 		}
 	}
-	mtx_unlock(&lun->ctl_softc->ctl_lock);
+	mtx_unlock(&lun->lun_lock);
 
 	/*
 	 * We already have a pending error, return it.
@@ -9118,7 +9694,7 @@ ctl_request_sense(struct ctl_scsiio *ctsio)
 		 * parameter data.
 		 */
 		ctsio->sense_len = 0;
-
+		ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 		ctsio->be_move_done = ctl_config_move_done;
 		ctl_datamove((union ctl_io *)ctsio);
 
@@ -9147,6 +9723,7 @@ ctl_request_sense(struct ctl_scsiio *ctsio)
 	 * autosense in this case.  We're reporting sense as parameter data.
 	 */
 	ctsio->sense_len = 0;
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 	ctsio->be_move_done = ctl_config_move_done;
 	ctl_datamove((union ctl_io *)ctsio);
 
@@ -9163,7 +9740,7 @@ ctl_tur(struct ctl_scsiio *ctsio)
 	CTL_DEBUG_PRINT(("ctl_tur\n"));
 
 	if (lun == NULL)
-		return (-EINVAL);
+		return (EINVAL);
 
 	ctsio->scsi_status = SCSI_STATUS_OK;
 	ctsio->io_hdr.status = CTL_SUCCESS;
@@ -9227,13 +9804,20 @@ ctl_inquiry_evpd_supported(struct ctl_scsiio *ctsio, int alloc_len)
 	pages->page_list[1] = SVPD_UNIT_SERIAL_NUMBER;
 	/* Device Identification */
 	pages->page_list[2] = SVPD_DEVICE_ID;
+	/* SCSI Ports */
+	pages->page_list[3] = SVPD_SCSI_PORTS;
+	/* Third-party Copy */
+	pages->page_list[4] = SVPD_SCSI_TPC;
 	/* Block limits */
-	pages->page_list[3] = SVPD_BLOCK_LIMITS;
+	pages->page_list[5] = SVPD_BLOCK_LIMITS;
+	/* Block Device Characteristics */
+	pages->page_list[6] = SVPD_BDC;
 	/* Logical Block Provisioning */
-	pages->page_list[4] = SVPD_LBP;
+	pages->page_list[7] = SVPD_LBP;
 
 	ctsio->scsi_status = SCSI_STATUS_OK;
 
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 	ctsio->be_move_done = ctl_config_move_done;
 	ctl_datamove((union ctl_io *)ctsio);
 
@@ -9245,9 +9829,6 @@ ctl_inquiry_evpd_serial(struct ctl_scsiio *ctsio, int alloc_len)
 {
 	struct scsi_vpd_unit_serial_number *sn_ptr;
 	struct ctl_lun *lun;
-#ifndef CTL_USE_BACKEND_SN
-	char tmpstr[32];
-#endif
 
 	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
 
@@ -9281,7 +9862,6 @@ ctl_inquiry_evpd_serial(struct ctl_scsiio *ctsio, int alloc_len)
 
 	sn_ptr->page_code = SVPD_UNIT_SERIAL_NUMBER;
 	sn_ptr->length = ctl_min(sizeof(*sn_ptr) - 4, CTL_SN_LEN);
-#ifdef CTL_USE_BACKEND_SN
 	/*
 	 * If we don't have a LUN, we just leave the serial number as
 	 * all spaces.
@@ -9291,17 +9871,9 @@ ctl_inquiry_evpd_serial(struct ctl_scsiio *ctsio, int alloc_len)
 		strncpy((char *)sn_ptr->serial_num,
 			(char *)lun->be_lun->serial_num, CTL_SN_LEN);
 	}
-#else
-	/*
-	 * Note that we're using a non-unique serial number here,
-	 */
-	snprintf(tmpstr, sizeof(tmpstr), "MYSERIALNUMIS000");
-	memset(sn_ptr->serial_num, 0x20, sizeof(sn_ptr->serial_num));
-	strncpy(sn_ptr->serial_num, tmpstr, ctl_min(CTL_SN_LEN,
-		ctl_min(sizeof(tmpstr), sizeof(*sn_ptr) - 4)));
-#endif
 	ctsio->scsi_status = SCSI_STATUS_OK;
 
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 	ctsio->be_move_done = ctl_config_move_done;
 	ctl_datamove((union ctl_io *)ctsio);
 
@@ -9313,45 +9885,38 @@ static int
 ctl_inquiry_evpd_devid(struct ctl_scsiio *ctsio, int alloc_len)
 {
 	struct scsi_vpd_device_id *devid_ptr;
-	struct scsi_vpd_id_descriptor *desc, *desc1;
-	struct scsi_vpd_id_descriptor *desc2, *desc3; /* for types 4h and 5h */
-	struct scsi_vpd_id_t10 *t10id;
+	struct scsi_vpd_id_descriptor *desc;
 	struct ctl_softc *ctl_softc;
 	struct ctl_lun *lun;
-	struct ctl_frontend *fe;
-#ifndef CTL_USE_BACKEND_SN
-	char tmpstr[32];
-#endif /* CTL_USE_BACKEND_SN */
-	int devid_len;
+	struct ctl_port *port;
+	int data_len;
+	uint8_t proto;
 
 	ctl_softc = control_softc;
 
-	mtx_lock(&ctl_softc->ctl_lock);
-	fe = ctl_softc->ctl_ports[ctl_port_idx(ctsio->io_hdr.nexus.targ_port)];
-	mtx_unlock(&ctl_softc->ctl_lock);
-
-	if (fe->devid != NULL)
-		return ((fe->devid)(ctsio, alloc_len));
-
+	port = ctl_softc->ctl_ports[ctl_port_idx(ctsio->io_hdr.nexus.targ_port)];
 	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
 
-	devid_len = sizeof(struct scsi_vpd_device_id) +
-		sizeof(struct scsi_vpd_id_descriptor) +
-		sizeof(struct scsi_vpd_id_t10) + CTL_DEVID_LEN +
-		sizeof(struct scsi_vpd_id_descriptor) + CTL_WWPN_LEN +
-		sizeof(struct scsi_vpd_id_descriptor) +
+	data_len = sizeof(struct scsi_vpd_device_id) +
+	    sizeof(struct scsi_vpd_id_descriptor) +
 		sizeof(struct scsi_vpd_id_rel_trgt_port_id) +
-		sizeof(struct scsi_vpd_id_descriptor) +
+	    sizeof(struct scsi_vpd_id_descriptor) +
 		sizeof(struct scsi_vpd_id_trgt_port_grp_id);
+	if (lun && lun->lun_devid)
+		data_len += lun->lun_devid->len;
+	if (port->port_devid)
+		data_len += port->port_devid->len;
+	if (port->target_devid)
+		data_len += port->target_devid->len;
 
-	ctsio->kern_data_ptr = malloc(devid_len, M_CTL, M_WAITOK | M_ZERO);
+	ctsio->kern_data_ptr = malloc(data_len, M_CTL, M_WAITOK | M_ZERO);
 	devid_ptr = (struct scsi_vpd_device_id *)ctsio->kern_data_ptr;
 	ctsio->kern_sg_entries = 0;
 
-	if (devid_len < alloc_len) {
-		ctsio->residual = alloc_len - devid_len;
-		ctsio->kern_data_len = devid_len;
-		ctsio->kern_total_len = devid_len;
+	if (data_len < alloc_len) {
+		ctsio->residual = alloc_len - data_len;
+		ctsio->kern_data_len = data_len;
+		ctsio->kern_total_len = data_len;
 	} else {
 		ctsio->residual = 0;
 		ctsio->kern_data_len = alloc_len;
@@ -9361,15 +9926,6 @@ ctl_inquiry_evpd_devid(struct ctl_scsiio *ctsio, int alloc_len)
 	ctsio->kern_rel_offset = 0;
 	ctsio->kern_sg_entries = 0;
 
-	desc = (struct scsi_vpd_id_descriptor *)devid_ptr->desc_list;
-	t10id = (struct scsi_vpd_id_t10 *)&desc->identifier[0];
-	desc1 = (struct scsi_vpd_id_descriptor *)(&desc->identifier[0] +
-		sizeof(struct scsi_vpd_id_t10) + CTL_DEVID_LEN);
-	desc2 = (struct scsi_vpd_id_descriptor *)(&desc1->identifier[0] +
-	          CTL_WWPN_LEN);
-	desc3 = (struct scsi_vpd_id_descriptor *)(&desc2->identifier[0] +
-	         sizeof(struct scsi_vpd_id_rel_trgt_port_id));
-
 	/*
 	 * The control device is always connected.  The disk device, on the
 	 * other hand, may not be online all the time.
@@ -9379,115 +9935,187 @@ ctl_inquiry_evpd_devid(struct ctl_scsiio *ctsio, int alloc_len)
 				     lun->be_lun->lun_type;
 	else
 		devid_ptr->device = (SID_QUAL_LU_OFFLINE << 5) | T_DIRECT;
-
 	devid_ptr->page_code = SVPD_DEVICE_ID;
+	scsi_ulto2b(data_len - 4, devid_ptr->length);
 
-	scsi_ulto2b(devid_len - 4, devid_ptr->length);
-
-	mtx_lock(&ctl_softc->ctl_lock);
-
-	/*
-	 * For Fibre channel,
-	 */
-	if (fe->port_type == CTL_PORT_FC)
-	{
-		desc->proto_codeset = (SCSI_PROTO_FC << 4) |
-				      SVPD_ID_CODESET_ASCII;
-        	desc1->proto_codeset = (SCSI_PROTO_FC << 4) |
-		              SVPD_ID_CODESET_BINARY;
-	}
+	if (port->port_type == CTL_PORT_FC)
+		proto = SCSI_PROTO_FC << 4;
+	else if (port->port_type == CTL_PORT_ISCSI)
+		proto = SCSI_PROTO_ISCSI << 4;
 	else
-	{
-		desc->proto_codeset = (SCSI_PROTO_SPI << 4) |
-				      SVPD_ID_CODESET_ASCII;
-        	desc1->proto_codeset = (SCSI_PROTO_SPI << 4) |
-		              SVPD_ID_CODESET_BINARY;
-	}
-	desc2->proto_codeset = desc3->proto_codeset = desc1->proto_codeset;
-	mtx_unlock(&ctl_softc->ctl_lock);
+		proto = SCSI_PROTO_SPI << 4;
+	desc = (struct scsi_vpd_id_descriptor *)devid_ptr->desc_list;
 
 	/*
 	 * We're using a LUN association here.  i.e., this device ID is a
 	 * per-LUN identifier.
 	 */
-	desc->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_LUN | SVPD_ID_TYPE_T10;
-	desc->length = sizeof(*t10id) + CTL_DEVID_LEN;
-	strncpy((char *)t10id->vendor, CTL_VENDOR, sizeof(t10id->vendor));
-
-	/*
-	 * desc1 is for the WWPN which is a port asscociation.
-	 */
-	desc1->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT | SVPD_ID_TYPE_NAA;
-	desc1->length = CTL_WWPN_LEN;
-	/* XXX Call Reggie's get_WWNN func here then add port # to the end */
-	/* For testing just create the WWPN */
-#if 0
-	ddb_GetWWNN((char *)desc1->identifier);
-
-	/* NOTE: if the port is 0 or 8 we don't want to subtract 1 */
-	/* This is so Copancontrol will return something sane */
-	if (ctsio->io_hdr.nexus.targ_port!=0 &&
-	    ctsio->io_hdr.nexus.targ_port!=8)
-		desc1->identifier[7] += ctsio->io_hdr.nexus.targ_port-1;
-	else
-		desc1->identifier[7] += ctsio->io_hdr.nexus.targ_port;
-#endif
-
-	be64enc(desc1->identifier, fe->wwpn);
-
-	/*
-	 * desc2 is for the Relative Target Port(type 4h) identifier
-	 */
-	desc2->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT
-	                 | SVPD_ID_TYPE_RELTARG;
-	desc2->length = 4;
-//#if 0
-	/* NOTE: if the port is 0 or 8 we don't want to subtract 1 */
-	/* This is so Copancontrol will return something sane */
-	if (ctsio->io_hdr.nexus.targ_port!=0 &&
-	    ctsio->io_hdr.nexus.targ_port!=8)
-		desc2->identifier[3] = ctsio->io_hdr.nexus.targ_port - 1;
-	else
-	        desc2->identifier[3] = ctsio->io_hdr.nexus.targ_port;
-//#endif
-
-	/*
-	 * desc3 is for the Target Port Group(type 5h) identifier
-	 */
-	desc3->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT
-	                 | SVPD_ID_TYPE_TPORTGRP;
-	desc3->length = 4;
-	if (ctsio->io_hdr.nexus.targ_port < CTL_MAX_PORTS || ctl_is_single)
-		desc3->identifier[3] = 1;
-	else
-		desc3->identifier[3] = 2;
-
-#ifdef CTL_USE_BACKEND_SN
-	/*
-	 * If we've actually got a backend, copy the device id from the
-	 * per-LUN data.  Otherwise, set it to all spaces.
-	 */
-	if (lun != NULL) {
-		/*
-		 * Copy the backend's LUN ID.
-		 */
-		strncpy((char *)t10id->vendor_spec_id,
-			(char *)lun->be_lun->device_id, CTL_DEVID_LEN);
-	} else {
-		/*
-		 * No backend, set this to spaces.
-		 */
-		memset(t10id->vendor_spec_id, 0x20, CTL_DEVID_LEN);
+	if (lun && lun->lun_devid) {
+		memcpy(desc, lun->lun_devid->data, lun->lun_devid->len);
+		desc = (struct scsi_vpd_id_descriptor *)((uint8_t *)desc +
+		    lun->lun_devid->len);
+	}
+
+	/*
+	 * This is for the WWPN which is a port association.
+	 */
+	if (port->port_devid) {
+		memcpy(desc, port->port_devid->data, port->port_devid->len);
+		desc = (struct scsi_vpd_id_descriptor *)((uint8_t *)desc +
+		    port->port_devid->len);
+	}
+
+	/*
+	 * This is for the Relative Target Port(type 4h) identifier
+	 */
+	desc->proto_codeset = proto | SVPD_ID_CODESET_BINARY;
+	desc->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT |
+	    SVPD_ID_TYPE_RELTARG;
+	desc->length = 4;
+	scsi_ulto2b(ctsio->io_hdr.nexus.targ_port, &desc->identifier[2]);
+	desc = (struct scsi_vpd_id_descriptor *)(&desc->identifier[0] +
+	    sizeof(struct scsi_vpd_id_rel_trgt_port_id));
+
+	/*
+	 * This is for the Target Port Group(type 5h) identifier
+	 */
+	desc->proto_codeset = proto | SVPD_ID_CODESET_BINARY;
+	desc->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT |
+	    SVPD_ID_TYPE_TPORTGRP;
+	desc->length = 4;
+	scsi_ulto2b(ctsio->io_hdr.nexus.targ_port / CTL_MAX_PORTS + 1,
+	    &desc->identifier[2]);
+	desc = (struct scsi_vpd_id_descriptor *)(&desc->identifier[0] +
+	    sizeof(struct scsi_vpd_id_trgt_port_grp_id));
+
+	/*
+	 * This is for the Target identifier
+	 */
+	if (port->target_devid) {
+		memcpy(desc, port->target_devid->data, port->target_devid->len);
 	}
-#else
-	snprintf(tmpstr, sizeof(tmpstr), "MYDEVICEIDIS%4d",
-		 (lun != NULL) ?  (int)lun->lun : 0);
-	strncpy(t10id->vendor_spec_id, tmpstr, ctl_min(CTL_DEVID_LEN,
-		sizeof(tmpstr)));
-#endif
 
 	ctsio->scsi_status = SCSI_STATUS_OK;
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+	ctl_datamove((union ctl_io *)ctsio);
 
+	return (CTL_RETVAL_COMPLETE);
+}
+
+static int
+ctl_inquiry_evpd_scsi_ports(struct ctl_scsiio *ctsio, int alloc_len)
+{
+	struct ctl_softc *softc = control_softc;
+	struct scsi_vpd_scsi_ports *sp;
+	struct scsi_vpd_port_designation *pd;
+	struct scsi_vpd_port_designation_cont *pdc;
+	struct ctl_lun *lun;
+	struct ctl_port *port;
+	int data_len, num_target_ports, iid_len, id_len, g, pg, p;
+	int num_target_port_groups, single;
+
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	single = ctl_is_single;
+	if (single)
+		num_target_port_groups = 1;
+	else
+		num_target_port_groups = NUM_TARGET_PORT_GROUPS;
+	num_target_ports = 0;
+	iid_len = 0;
+	id_len = 0;
+	mtx_lock(&softc->ctl_lock);
+	STAILQ_FOREACH(port, &softc->port_list, links) {
+		if ((port->status & CTL_PORT_STATUS_ONLINE) == 0)
+			continue;
+		if (lun != NULL &&
+		    ctl_map_lun_back(port->targ_port, lun->lun) >=
+		    CTL_MAX_LUNS)
+			continue;
+		num_target_ports++;
+		if (port->init_devid)
+			iid_len += port->init_devid->len;
+		if (port->port_devid)
+			id_len += port->port_devid->len;
+	}
+	mtx_unlock(&softc->ctl_lock);
+
+	data_len = sizeof(struct scsi_vpd_scsi_ports) + num_target_port_groups *
+	    num_target_ports * (sizeof(struct scsi_vpd_port_designation) +
+	     sizeof(struct scsi_vpd_port_designation_cont)) + iid_len + id_len;
+	ctsio->kern_data_ptr = malloc(data_len, M_CTL, M_WAITOK | M_ZERO);
+	sp = (struct scsi_vpd_scsi_ports *)ctsio->kern_data_ptr;
+	ctsio->kern_sg_entries = 0;
+
+	if (data_len < alloc_len) {
+		ctsio->residual = alloc_len - data_len;
+		ctsio->kern_data_len = data_len;
+		ctsio->kern_total_len = data_len;
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+	ctsio->kern_sg_entries = 0;
+
+	/*
+	 * The control device is always connected.  The disk device, on the
+	 * other hand, may not be online all the time.  Need to change this
+	 * to figure out whether the disk device is actually online or not.
+	 */
+	if (lun != NULL)
+		sp->device = (SID_QUAL_LU_CONNECTED << 5) |
+				  lun->be_lun->lun_type;
+	else
+		sp->device = (SID_QUAL_LU_OFFLINE << 5) | T_DIRECT;
+
+	sp->page_code = SVPD_SCSI_PORTS;
+	scsi_ulto2b(data_len - sizeof(struct scsi_vpd_scsi_ports),
+	    sp->page_length);
+	pd = &sp->design[0];
+
+	mtx_lock(&softc->ctl_lock);
+	if (softc->flags & CTL_FLAG_MASTER_SHELF)
+		pg = 0;
+	else
+		pg = 1;
+	for (g = 0; g < num_target_port_groups; g++) {
+		STAILQ_FOREACH(port, &softc->port_list, links) {
+			if ((port->status & CTL_PORT_STATUS_ONLINE) == 0)
+				continue;
+			if (lun != NULL &&
+			    ctl_map_lun_back(port->targ_port, lun->lun) >=
+			    CTL_MAX_LUNS)
+				continue;
+			p = port->targ_port % CTL_MAX_PORTS + g * CTL_MAX_PORTS;
+			scsi_ulto2b(p, pd->relative_port_id);
+			if (port->init_devid && g == pg) {
+				iid_len = port->init_devid->len;
+				memcpy(pd->initiator_transportid,
+				    port->init_devid->data, port->init_devid->len);
+			} else
+				iid_len = 0;
+			scsi_ulto2b(iid_len, pd->initiator_transportid_length);
+			pdc = (struct scsi_vpd_port_designation_cont *)
+			    (&pd->initiator_transportid[iid_len]);
+			if (port->port_devid && g == pg) {
+				id_len = port->port_devid->len;
+				memcpy(pdc->target_port_descriptors,
+				    port->port_devid->data, port->port_devid->len);
+			} else
+				id_len = 0;
+			scsi_ulto2b(id_len, pdc->target_port_descriptors_length);
+			pd = (struct scsi_vpd_port_designation *)
+			    ((uint8_t *)pdc->target_port_descriptors + id_len);
+		}
+	}
+	mtx_unlock(&softc->ctl_lock);
+
+	ctsio->scsi_status = SCSI_STATUS_OK;
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 	ctsio->be_move_done = ctl_config_move_done;
 	ctl_datamove((union ctl_io *)ctsio);
 
@@ -9502,7 +10130,6 @@ ctl_inquiry_evpd_block_limits(struct ctl_scsiio *ctsio, int alloc_len)
 	int bs;
 
 	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
-	bs = lun->be_lun->blocksize;
 
 	ctsio->kern_data_ptr = malloc(sizeof(*bl_ptr), M_CTL, M_WAITOK | M_ZERO);
 	bl_ptr = (struct scsi_vpd_block_limits *)ctsio->kern_data_ptr;
@@ -9534,15 +10161,74 @@ ctl_inquiry_evpd_block_limits(struct ctl_scsiio *ctsio, int alloc_len)
 
 	bl_ptr->page_code = SVPD_BLOCK_LIMITS;
 	scsi_ulto2b(sizeof(*bl_ptr), bl_ptr->page_length);
+	bl_ptr->max_cmp_write_len = 0xff;
 	scsi_ulto4b(0xffffffff, bl_ptr->max_txfer_len);
-	scsi_ulto4b(MAXPHYS / bs, bl_ptr->opt_txfer_len);
-	if (lun->be_lun->flags & CTL_LUN_FLAG_UNMAP) {
-		scsi_ulto4b(0xffffffff, bl_ptr->max_unmap_lba_cnt);
-		scsi_ulto4b(0xffffffff, bl_ptr->max_unmap_blk_cnt);
+	if (lun != NULL) {
+		bs = lun->be_lun->blocksize;
+		scsi_ulto4b(MAXPHYS / bs, bl_ptr->opt_txfer_len);
+		if (lun->be_lun->flags & CTL_LUN_FLAG_UNMAP) {
+			scsi_ulto4b(0xffffffff, bl_ptr->max_unmap_lba_cnt);
+			scsi_ulto4b(0xffffffff, bl_ptr->max_unmap_blk_cnt);
+			if (lun->be_lun->pblockexp != 0) {
+				scsi_ulto4b((1 << lun->be_lun->pblockexp),
+				    bl_ptr->opt_unmap_grain);
+				scsi_ulto4b(0x80000000 | lun->be_lun->pblockoff,
+				    bl_ptr->unmap_grain_align);
+			}
+		}
 	}
 	scsi_u64to8b(UINT64_MAX, bl_ptr->max_write_same_length);
 
 	ctsio->scsi_status = SCSI_STATUS_OK;
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+	ctl_datamove((union ctl_io *)ctsio);
+
+	return (CTL_RETVAL_COMPLETE);
+}
+
+static int
+ctl_inquiry_evpd_bdc(struct ctl_scsiio *ctsio, int alloc_len)
+{
+	struct scsi_vpd_block_device_characteristics *bdc_ptr;
+	struct ctl_lun *lun;
+
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	ctsio->kern_data_ptr = malloc(sizeof(*bdc_ptr), M_CTL, M_WAITOK | M_ZERO);
+	bdc_ptr = (struct scsi_vpd_block_device_characteristics *)ctsio->kern_data_ptr;
+	ctsio->kern_sg_entries = 0;
+
+	if (sizeof(*bdc_ptr) < alloc_len) {
+		ctsio->residual = alloc_len - sizeof(*bdc_ptr);
+		ctsio->kern_data_len = sizeof(*bdc_ptr);
+		ctsio->kern_total_len = sizeof(*bdc_ptr);
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+	ctsio->kern_sg_entries = 0;
+
+	/*
+	 * The control device is always connected.  The disk device, on the
+	 * other hand, may not be online all the time.  Need to change this
+	 * to figure out whether the disk device is actually online or not.
+	 */
+	if (lun != NULL)
+		bdc_ptr->device = (SID_QUAL_LU_CONNECTED << 5) |
+				  lun->be_lun->lun_type;
+	else
+		bdc_ptr->device = (SID_QUAL_LU_OFFLINE << 5) | T_DIRECT;
+	bdc_ptr->page_code = SVPD_BDC;
+	scsi_ulto2b(sizeof(*bdc_ptr) - 4, bdc_ptr->page_length);
+	scsi_ulto2b(SVPD_NON_ROTATING, bdc_ptr->medium_rotation_rate);
+	bdc_ptr->flags = SVPD_FUAB | SVPD_VBULS;
+
+	ctsio->scsi_status = SCSI_STATUS_OK;
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 	ctsio->be_move_done = ctl_config_move_done;
 	ctl_datamove((union ctl_io *)ctsio);
 
@@ -9554,10 +10240,8 @@ ctl_inquiry_evpd_lbp(struct ctl_scsiio *ctsio, int alloc_len)
 {
 	struct scsi_vpd_logical_block_prov *lbp_ptr;
 	struct ctl_lun *lun;
-	int bs;
 
 	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
-	bs = lun->be_lun->blocksize;
 
 	ctsio->kern_data_ptr = malloc(sizeof(*lbp_ptr), M_CTL, M_WAITOK | M_ZERO);
 	lbp_ptr = (struct scsi_vpd_logical_block_prov *)ctsio->kern_data_ptr;
@@ -9588,10 +10272,15 @@ ctl_inquiry_evpd_lbp(struct ctl_scsiio *ctsio, int alloc_len)
 		lbp_ptr->device = (SID_QUAL_LU_OFFLINE << 5) | T_DIRECT;
 
 	lbp_ptr->page_code = SVPD_LBP;
-	if (lun->be_lun->flags & CTL_LUN_FLAG_UNMAP)
-		lbp_ptr->flags = SVPD_LBP_UNMAP | SVPD_LBP_WS16 | SVPD_LBP_WS10;
+	scsi_ulto2b(sizeof(*lbp_ptr) - 4, lbp_ptr->page_length);
+	if (lun != NULL && lun->be_lun->flags & CTL_LUN_FLAG_UNMAP) {
+		lbp_ptr->flags = SVPD_LBP_UNMAP | SVPD_LBP_WS16 |
+		    SVPD_LBP_WS10 | SVPD_LBP_RZ | SVPD_LBP_ANC_SUP;
+		lbp_ptr->prov_type = SVPD_LBP_RESOURCE;
+	}
 
 	ctsio->scsi_status = SCSI_STATUS_OK;
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 	ctsio->be_move_done = ctl_config_move_done;
 	ctl_datamove((union ctl_io *)ctsio);
 
@@ -9622,9 +10311,18 @@ ctl_inquiry_evpd(struct ctl_scsiio *ctsio)
 	case SVPD_DEVICE_ID:
 		retval = ctl_inquiry_evpd_devid(ctsio, alloc_len);
 		break;
+	case SVPD_SCSI_PORTS:
+		retval = ctl_inquiry_evpd_scsi_ports(ctsio, alloc_len);
+		break;
+	case SVPD_SCSI_TPC:
+		retval = ctl_inquiry_evpd_tpc(ctsio, alloc_len);
+		break;
 	case SVPD_BLOCK_LIMITS:
 		retval = ctl_inquiry_evpd_block_limits(ctsio, alloc_len);
 		break;
+	case SVPD_BDC:
+		retval = ctl_inquiry_evpd_bdc(ctsio, alloc_len);
+		break;
 	case SVPD_LBP:
 		retval = ctl_inquiry_evpd_lbp(ctsio, alloc_len);
 		break;
@@ -9650,8 +10348,9 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio)
 	struct scsi_inquiry *cdb;
 	struct ctl_softc *ctl_softc;
 	struct ctl_lun *lun;
+	char *val;
 	uint32_t alloc_len;
-	int is_fc;
+	ctl_port_type port_type;
 
 	ctl_softc = control_softc;
 
@@ -9660,13 +10359,10 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio)
 	 * We treat the ioctl front end, and any SCSI adapters, as packetized
 	 * SCSI front ends.
 	 */
-	mtx_lock(&ctl_softc->ctl_lock);
-	if (ctl_softc->ctl_ports[ctl_port_idx(ctsio->io_hdr.nexus.targ_port)]->port_type !=
-	    CTL_PORT_FC)
-		is_fc = 0;
-	else
-		is_fc = 1;
-	mtx_unlock(&ctl_softc->ctl_lock);
+	port_type = ctl_softc->ctl_ports[
+	    ctl_port_idx(ctsio->io_hdr.nexus.targ_port)]->port_type;
+	if (port_type == CTL_PORT_IOCTL || port_type == CTL_PORT_INTERNAL)
+		port_type = CTL_PORT_SCSI;
 
 	lun = ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
 	cdb = (struct scsi_inquiry *)ctsio->cdb;
@@ -9745,7 +10441,7 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio)
 		inq_ptr->device = (SID_QUAL_BAD_LU << 5) | T_NODEVICE;
 
 	/* RMB in byte 2 is 0 */
-	inq_ptr->version = SCSI_REV_SPC3;
+	inq_ptr->version = SCSI_REV_SPC4;
 
 	/*
 	 * According to SAM-3, even if a device only supports a single
@@ -9766,21 +10462,24 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio)
 	 */
 	inq_ptr->response_format = SID_HiSup | 2;
 
-	inq_ptr->additional_length = sizeof(*inq_ptr) - 4;
+	inq_ptr->additional_length =
+	    offsetof(struct scsi_inquiry_data, vendor_specific1) -
+	    (offsetof(struct scsi_inquiry_data, additional_length) + 1);
 	CTL_DEBUG_PRINT(("additional_length = %d\n",
 			 inq_ptr->additional_length));
 
-	inq_ptr->spc3_flags = SPC3_SID_TPGS_IMPLICIT;
+	inq_ptr->spc3_flags = SPC3_SID_3PC;
+	if (!ctl_is_single)
+		inq_ptr->spc3_flags |= SPC3_SID_TPGS_IMPLICIT;
 	/* 16 bit addressing */
-	if (is_fc == 0)
+	if (port_type == CTL_PORT_SCSI)
 		inq_ptr->spc2_flags = SPC2_SID_ADDR16;
 	/* XXX set the SID_MultiP bit here if we're actually going to
 	   respond on multiple ports */
 	inq_ptr->spc2_flags |= SPC2_SID_MultiP;
 
 	/* 16 bit data bus, synchronous transfers */
-	/* XXX these flags don't apply for FC */
-	if (is_fc == 0)
+	if (port_type == CTL_PORT_SCSI)
 		inq_ptr->flags = SID_WBus16 | SID_Sync;
 	/*
 	 * XXX KDM do we want to support tagged queueing on the control
@@ -9794,10 +10493,17 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio)
 	 * We have 8 bytes for the vendor name, and 16 bytes for the device
 	 * name and 4 bytes for the revision.
 	 */
-	strncpy(inq_ptr->vendor, CTL_VENDOR, sizeof(inq_ptr->vendor));
+	if (lun == NULL || (val = ctl_get_opt(&lun->be_lun->options,
+	    "vendor")) == NULL) {
+		strcpy(inq_ptr->vendor, CTL_VENDOR);
+	} else {
+		memset(inq_ptr->vendor, ' ', sizeof(inq_ptr->vendor));
+		strncpy(inq_ptr->vendor, val,
+		    min(sizeof(inq_ptr->vendor), strlen(val)));
+	}
 	if (lun == NULL) {
 		strcpy(inq_ptr->product, CTL_DIRECT_PRODUCT);
-	} else {
+	} else if ((val = ctl_get_opt(&lun->be_lun->options, "product")) == NULL) {
 		switch (lun->be_lun->lun_type) {
 		case T_DIRECT:
 			strcpy(inq_ptr->product, CTL_DIRECT_PRODUCT);
@@ -9809,13 +10515,24 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio)
 			strcpy(inq_ptr->product, CTL_UNKNOWN_PRODUCT);
 			break;
 		}
+	} else {
+		memset(inq_ptr->product, ' ', sizeof(inq_ptr->product));
+		strncpy(inq_ptr->product, val,
+		    min(sizeof(inq_ptr->product), strlen(val)));
 	}
 
 	/*
 	 * XXX make this a macro somewhere so it automatically gets
 	 * incremented when we make changes.
 	 */
-	strncpy(inq_ptr->revision, "0001", sizeof(inq_ptr->revision));
+	if (lun == NULL || (val = ctl_get_opt(&lun->be_lun->options,
+	    "revision")) == NULL) {
+		strncpy(inq_ptr->revision, "0001", sizeof(inq_ptr->revision));
+	} else {
+		memset(inq_ptr->revision, ' ', sizeof(inq_ptr->revision));
+		strncpy(inq_ptr->revision, val,
+		    min(sizeof(inq_ptr->revision), strlen(val)));
+	}
 
 	/*
 	 * For parallel SCSI, we support double transition and single
@@ -9823,33 +10540,36 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio)
 	 * and Selection) and Information Unit transfers on both the
 	 * control and array devices.
 	 */
-	if (is_fc == 0)
+	if (port_type == CTL_PORT_SCSI)
 		inq_ptr->spi3data = SID_SPI_CLOCK_DT_ST | SID_SPI_QAS |
 				    SID_SPI_IUS;
 
-	/* SAM-3 */
-	scsi_ulto2b(0x0060, inq_ptr->version1);
-	/* SPC-3 (no version claimed) XXX should we claim a version? */
-	scsi_ulto2b(0x0300, inq_ptr->version2);
-	if (is_fc) {
+	/* SAM-5 (no version claimed) */
+	scsi_ulto2b(0x00A0, inq_ptr->version1);
+	/* SPC-4 (no version claimed) */
+	scsi_ulto2b(0x0460, inq_ptr->version2);
+	if (port_type == CTL_PORT_FC) {
 		/* FCP-2 ANSI INCITS.350:2003 */
 		scsi_ulto2b(0x0917, inq_ptr->version3);
-	} else {
+	} else if (port_type == CTL_PORT_SCSI) {
 		/* SPI-4 ANSI INCITS.362:200x */
 		scsi_ulto2b(0x0B56, inq_ptr->version3);
+	} else if (port_type == CTL_PORT_ISCSI) {
+		/* iSCSI (no version claimed) */
+		scsi_ulto2b(0x0960, inq_ptr->version3);
+	} else if (port_type == CTL_PORT_SAS) {
+		/* SAS (no version claimed) */
+		scsi_ulto2b(0x0BE0, inq_ptr->version3);
 	}
 
 	if (lun == NULL) {
-		/* SBC-2 (no version claimed) XXX should we claim a version? */
-		scsi_ulto2b(0x0320, inq_ptr->version4);
+		/* SBC-3 (no version claimed) */
+		scsi_ulto2b(0x04C0, inq_ptr->version4);
 	} else {
 		switch (lun->be_lun->lun_type) {
 		case T_DIRECT:
-			/*
-			 * SBC-2 (no version claimed) XXX should we claim a
-			 * version?
-			 */
-			scsi_ulto2b(0x0320, inq_ptr->version4);
+			/* SBC-3 (no version claimed) */
+			scsi_ulto2b(0x04C0, inq_ptr->version4);
 			break;
 		case T_PROCESSOR:
 		default:
@@ -9859,6 +10579,7 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio)
 
 	ctsio->scsi_status = SCSI_STATUS_OK;
 	if (ctsio->kern_data_len > 0) {
+		ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
 		ctsio->be_move_done = ctl_config_move_done;
 		ctl_datamove((union ctl_io *)ctsio);
 	} else {
@@ -9928,6 +10649,15 @@ ctl_get_lba_len(union ctl_io *io, uint64_t *lba, uint32_t *len)
 		return (1);
 
 	switch (io->scsiio.cdb[0]) {
+	case COMPARE_AND_WRITE: {
+		struct scsi_compare_and_write *cdb;
+
+		cdb = (struct scsi_compare_and_write *)io->scsiio.cdb;
+
+		*lba = scsi_8btou64(cdb->addr);
+		*len = cdb->length;
+		break;
+	}
 	case READ_6:
 	case WRITE_6: {
 		struct scsi_rw_6 *cdb;
@@ -10016,6 +10746,33 @@ ctl_get_lba_len(union ctl_io *io, uint64_t *lba, uint32_t *len)
 		*len = scsi_4btoul(cdb->length);
 		break;
 	}
+	case VERIFY_10: {
+		struct scsi_verify_10 *cdb;
+
+		cdb = (struct scsi_verify_10 *)io->scsiio.cdb;
+
+		*lba = scsi_4btoul(cdb->addr);
+		*len = scsi_2btoul(cdb->length);
+		break;
+	}
+	case VERIFY_12: {
+		struct scsi_verify_12 *cdb;
+
+		cdb = (struct scsi_verify_12 *)io->scsiio.cdb;
+
+		*lba = scsi_4btoul(cdb->addr);
+		*len = scsi_4btoul(cdb->length);
+		break;
+	}
+	case VERIFY_16: {
+		struct scsi_verify_16 *cdb;
+
+		cdb = (struct scsi_verify_16 *)io->scsiio.cdb;
+
+		*lba = scsi_8btou64(cdb->addr);
+		*len = scsi_4btoul(cdb->length);
+		break;
+	}
 	default:
 		return (1);
 		break; /* NOTREACHED */
@@ -10060,7 +10817,7 @@ ctl_extent_check(union ctl_io *io1, union ctl_io *io2)
 static ctl_action
 ctl_check_for_blockage(union ctl_io *pending_io, union ctl_io *ooa_io)
 {
-	struct ctl_cmd_entry *pending_entry, *ooa_entry;
+	const struct ctl_cmd_entry *pending_entry, *ooa_entry;
 	ctl_serialize_action *serialize_row;
 
 	/*
@@ -10133,8 +10890,8 @@ ctl_check_for_blockage(union ctl_io *pending_io, union ctl_io *ooa_io)
 	  || (ooa_io->scsiio.tag_type == CTL_TAG_ORDERED)))
 		return (CTL_ACTION_BLOCK);
 
-	pending_entry = &ctl_cmd_table[pending_io->scsiio.cdb[0]];
-	ooa_entry = &ctl_cmd_table[ooa_io->scsiio.cdb[0]];
+	pending_entry = ctl_get_cmd_entry(&pending_io->scsiio);
+	ooa_entry = ctl_get_cmd_entry(&ooa_io->scsiio);
 
 	serialize_row = ctl_serialize_table[ooa_entry->seridx];
 
@@ -10173,7 +10930,7 @@ ctl_check_ooa(struct ctl_lun *lun, union ctl_io *pending_io,
 	union ctl_io *ooa_io;
 	ctl_action action;
 
-	mtx_assert(&control_softc->ctl_lock, MA_OWNED);
+	mtx_assert(&lun->lun_lock, MA_OWNED);
 
 	/*
 	 * Run back along the OOA queue, starting with the current
@@ -10221,7 +10978,7 @@ ctl_check_blocked(struct ctl_lun *lun)
 {
 	union ctl_io *cur_blocked, *next_blocked;
 
-	mtx_assert(&control_softc->ctl_lock, MA_OWNED);
+	mtx_assert(&lun->lun_lock, MA_OWNED);
 
 	/*
 	 * Run forward from the head of the blocked queue, checking each
@@ -10264,9 +11021,8 @@ ctl_check_blocked(struct ctl_lun *lun)
 		case CTL_ACTION_PASS:
 		case CTL_ACTION_SKIP: {
 			struct ctl_softc *softc;
-			struct ctl_cmd_entry *entry;
+			const struct ctl_cmd_entry *entry;
 			uint32_t initidx;
-			uint8_t opcode;
 			int isc_retval;
 
 			/*
@@ -10303,8 +11059,7 @@ ctl_check_blocked(struct ctl_lun *lun)
 				}
 				break;
 			}
-			opcode = cur_blocked->scsiio.cdb[0];
-			entry = &ctl_cmd_table[opcode];
+			entry = ctl_get_cmd_entry(&cur_blocked->scsiio);
 			softc = control_softc;
 
 			initidx = ctl_get_initindex(&cur_blocked->io_hdr.nexus);
@@ -10321,28 +11076,9 @@ ctl_check_blocked(struct ctl_lun *lun)
 						 &cur_blocked->scsiio) == 0) {
 				cur_blocked->io_hdr.flags |=
 				                      CTL_FLAG_IS_WAS_ON_RTR;
-				STAILQ_INSERT_TAIL(&lun->ctl_softc->rtr_queue,
-						   &cur_blocked->io_hdr, links);
-				/*
-				 * In the non CTL_DONE_THREAD case, we need
-				 * to wake up the work thread here.  When
-				 * we're processing completed requests from
-				 * the work thread context, we'll pop back
-				 * around and end up pulling things off the
-				 * RtR queue.  When we aren't processing
-				 * things from the work thread context,
-				 * though, we won't ever check the RtR queue.
-				 * So we need to wake up the thread to clear
-				 * things off the queue.  Otherwise this
-				 * transaction will just sit on the RtR queue
-				 * until a new I/O comes in.  (Which may or
-				 * may not happen...)
-				 */
-#ifndef CTL_DONE_THREAD
-				ctl_wakeup_thread();
-#endif
+				ctl_enqueue_rtr(cur_blocked);
 			} else
-				ctl_done_lock(cur_blocked, /*have_lock*/ 1);
+				ctl_done(cur_blocked);
 			break;
 		}
 		default:
@@ -10371,12 +11107,14 @@ ctl_check_blocked(struct ctl_lun *lun)
  */
 static int
 ctl_scsiio_lun_check(struct ctl_softc *ctl_softc, struct ctl_lun *lun,
-		     struct ctl_cmd_entry *entry, struct ctl_scsiio *ctsio)
+    const struct ctl_cmd_entry *entry, struct ctl_scsiio *ctsio)
 {
 	int retval;
 
 	retval = 0;
 
+	mtx_assert(&lun->lun_lock, MA_OWNED);
+
 	/*
 	 * If this shelf is a secondary shelf controller, we have to reject
 	 * any media access commands.
@@ -10468,7 +11206,7 @@ static void
 ctl_failover_io(union ctl_io *io, int have_lock)
 {
 	ctl_set_busy(&io->scsiio);
-	ctl_done_lock(io, have_lock);
+	ctl_done(io);
 }
 
 static void
@@ -10492,6 +11230,8 @@ ctl_failover(void)
 	 * We'll either abort them or delete them below, depending on
 	 * which HA mode we're in.
 	 */
+#ifdef notyet
+	mtx_lock(&ctl_softc->queue_lock);
 	for (io = (union ctl_io *)STAILQ_FIRST(&ctl_softc->rtr_queue);
 	     io != NULL; io = next_io) {
 		next_io = (union ctl_io *)STAILQ_NEXT(&io->io_hdr, links);
@@ -10499,6 +11239,8 @@ ctl_failover(void)
 			STAILQ_REMOVE(&ctl_softc->rtr_queue, &io->io_hdr,
 				      ctl_io_hdr, links);
 	}
+	mtx_unlock(&ctl_softc->queue_lock);
+#endif
 
 	for (lun_idx=0; lun_idx < ctl_softc->num_luns; lun_idx++) {
 		lun = ctl_softc->ctl_luns[lun_idx];
@@ -10606,8 +11348,7 @@ ctl_failover(void)
 						CTL_FLAG_FAILOVER;
 				} else {
 					ctl_set_busy(&pending_io->scsiio);
-					ctl_done_lock(pending_io,
-						      /*have_lock*/1);
+					ctl_done(pending_io);
 				}
 			}
 
@@ -10615,7 +11356,7 @@ ctl_failover(void)
 			 * Build Unit Attention
 			 */
 			for (i = 0; i < CTL_MAX_INITIATORS; i++) {
-				lun->pending_sense[i].ua_pending |=
+				lun->pending_ua[i] |=
 				                     CTL_UA_ASYM_ACC_CHANGE;
 			}
 		} else if (((lun->flags & CTL_LUN_PRIMARY_SC) == 0)
@@ -10639,8 +11380,7 @@ ctl_failover(void)
 			     CTL_FLAG_IS_WAS_ON_RTR) == 0) {
 				pending_io->io_hdr.flags |=
 				    CTL_FLAG_IS_WAS_ON_RTR;
-				STAILQ_INSERT_TAIL(&ctl_softc->rtr_queue,
-						   &pending_io->io_hdr, links);
+				ctl_enqueue_rtr(pending_io);
 			}
 #if 0
 			else
@@ -10683,22 +11423,18 @@ ctl_failover(void)
 				case CTL_ACTION_SKIP:
 					pending_io->io_hdr.flags |=
 					    CTL_FLAG_IS_WAS_ON_RTR;
-					STAILQ_INSERT_TAIL(
-					    &ctl_softc->rtr_queue,
-					    &pending_io->io_hdr, links);
+					ctl_enqueue_rtr(pending_io);
 					break;
 				case CTL_ACTION_OVERLAP:
 					ctl_set_overlapped_cmd(
 					    (struct ctl_scsiio *)pending_io);
-					ctl_done_lock(pending_io,
-						      /*have_lock*/ 1);
+					ctl_done(pending_io);
 					break;
 				case CTL_ACTION_OVERLAP_TAG:
 					ctl_set_overlapped_tag(
 					    (struct ctl_scsiio *)pending_io,
 					    pending_io->scsiio.tag_num & 0xff);
-					ctl_done_lock(pending_io,
-						      /*have_lock*/ 1);
+					ctl_done(pending_io);
 					break;
 				case CTL_ACTION_ERROR:
 				default:
@@ -10706,8 +11442,7 @@ ctl_failover(void)
 						(struct ctl_scsiio *)pending_io,
 						0,  // sks_valid
 						0); //retry count
-					ctl_done_lock(pending_io,
-						      /*have_lock*/ 1);
+					ctl_done(pending_io);
 					break;
 				}
 			}
@@ -10716,7 +11451,7 @@ ctl_failover(void)
 			 * Build Unit Attention
 			 */
 			for (i = 0; i < CTL_MAX_INITIATORS; i++) {
-				lun->pending_sense[i].ua_pending |=
+				lun->pending_ua[i] |=
 				                     CTL_UA_ASYM_ACC_CHANGE;
 			}
 		} else {
@@ -10732,8 +11467,7 @@ static int
 ctl_scsiio_precheck(struct ctl_softc *ctl_softc, struct ctl_scsiio *ctsio)
 {
 	struct ctl_lun *lun;
-	struct ctl_cmd_entry *entry;
-	uint8_t opcode;
+	const struct ctl_cmd_entry *entry;
 	uint32_t initidx, targ_lun;
 	int retval;
 
@@ -10741,13 +11475,7 @@ ctl_scsiio_precheck(struct ctl_softc *ctl_softc, struct ctl_scsiio *ctsio)
 
 	lun = NULL;
 
-	opcode = ctsio->cdb[0];
-
-	mtx_lock(&ctl_softc->ctl_lock);
-
-	targ_lun = ctsio->io_hdr.nexus.targ_lun;
-	if (ctsio->io_hdr.nexus.lun_map_fn != NULL)
-		targ_lun = ctsio->io_hdr.nexus.lun_map_fn(ctsio->io_hdr.nexus.lun_map_arg, targ_lun);
+	targ_lun = ctsio->io_hdr.nexus.targ_mapped_lun;
 	if ((targ_lun < CTL_MAX_LUNS)
 	 && (ctl_softc->ctl_luns[targ_lun] != NULL)) {
 		lun = ctl_softc->ctl_luns[targ_lun];
@@ -10765,13 +11493,27 @@ ctl_scsiio_precheck(struct ctl_softc *ctl_softc, struct ctl_scsiio *ctsio)
 			if (lun->be_lun->lun_type == T_PROCESSOR) {
 				ctsio->io_hdr.flags |= CTL_FLAG_CONTROL_DEV;
 			}
+
+			/*
+			 * Every I/O goes into the OOA queue for a
+			 * particular LUN, and stays there until completion.
+			 */
+			mtx_lock(&lun->lun_lock);
+			TAILQ_INSERT_TAIL(&lun->ooa_queue, &ctsio->io_hdr,
+			    ooa_links);
 		}
 	} else {
 		ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr = NULL;
 		ctsio->io_hdr.ctl_private[CTL_PRIV_BACKEND_LUN].ptr = NULL;
 	}
 
-	entry = &ctl_cmd_table[opcode];
+	/* Get command entry and return error if it is unsuppotyed. */
+	entry = ctl_validate_command(ctsio);
+	if (entry == NULL) {
+		if (lun)
+			mtx_unlock(&lun->lun_lock);
+		return (retval);
+	}
 
 	ctsio->io_hdr.flags &= ~CTL_FLAG_DATA_MASK;
 	ctsio->io_hdr.flags |= entry->flags & CTL_FLAG_DATA_MASK;
@@ -10784,66 +11526,42 @@ ctl_scsiio_precheck(struct ctl_softc *ctl_softc, struct ctl_scsiio *ctsio)
 	 * it on the rtr queue.
 	 */
 	if (lun == NULL) {
-		if (entry->flags & CTL_CMD_FLAG_OK_ON_ALL_LUNS)
-			goto queue_rtr;
+		if (entry->flags & CTL_CMD_FLAG_OK_ON_ALL_LUNS) {
+			ctsio->io_hdr.flags |= CTL_FLAG_IS_WAS_ON_RTR;
+			ctl_enqueue_rtr((union ctl_io *)ctsio);
+			return (retval);
+		}
 
 		ctl_set_unsupported_lun(ctsio);
-		mtx_unlock(&ctl_softc->ctl_lock);
 		ctl_done((union ctl_io *)ctsio);
 		CTL_DEBUG_PRINT(("ctl_scsiio_precheck: bailing out due to invalid LUN\n"));
-		goto bailout;
+		return (retval);
 	} else {
-		/*
-		 * Every I/O goes into the OOA queue for a particular LUN, and
-		 * stays there until completion.
-		 */
-		TAILQ_INSERT_TAIL(&lun->ooa_queue, &ctsio->io_hdr, ooa_links);
-
 		/*
 		 * Make sure we support this particular command on this LUN.
 		 * e.g., we don't support writes to the control LUN.
 		 */
-		switch (lun->be_lun->lun_type) {
-		case T_PROCESSOR:
-		 	if (((entry->flags & CTL_CMD_FLAG_OK_ON_PROC) == 0)
-			 && ((entry->flags & CTL_CMD_FLAG_OK_ON_ALL_LUNS)
-			      == 0)) {
-				ctl_set_invalid_opcode(ctsio);
-				mtx_unlock(&ctl_softc->ctl_lock);
-				ctl_done((union ctl_io *)ctsio);
-				goto bailout;
-			}
-			break;
-		case T_DIRECT:
-			if (((entry->flags & CTL_CMD_FLAG_OK_ON_SLUN) == 0)
-			 && ((entry->flags & CTL_CMD_FLAG_OK_ON_ALL_LUNS)
-			      == 0)){
-				ctl_set_invalid_opcode(ctsio);
-				mtx_unlock(&ctl_softc->ctl_lock);
-				ctl_done((union ctl_io *)ctsio);
-				goto bailout;
-			}
-			break;
-		default:
-			printf("Unsupported CTL LUN type %d\n",
-			       lun->be_lun->lun_type);
-			panic("Unsupported CTL LUN type %d\n",
-			      lun->be_lun->lun_type);
-			break; /* NOTREACHED */
+		if (!ctl_cmd_applicable(lun->be_lun->lun_type, entry)) {
+			mtx_unlock(&lun->lun_lock);
+			ctl_set_invalid_opcode(ctsio);
+			ctl_done((union ctl_io *)ctsio);
+			return (retval);
 		}
 	}
 
 	initidx = ctl_get_initindex(&ctsio->io_hdr.nexus);
 
+#ifdef CTL_WITH_CA
 	/*
 	 * If we've got a request sense, it'll clear the contingent
 	 * allegiance condition.  Otherwise, if we have a CA condition for
 	 * this initiator, clear it, because it sent down a command other
 	 * than request sense.
 	 */
-	if ((opcode != REQUEST_SENSE)
+	if ((ctsio->cdb[0] != REQUEST_SENSE)
 	 && (ctl_is_set(lun->have_ca, initidx)))
 		ctl_clear_mask(lun->have_ca, initidx);
+#endif
 
 	/*
 	 * If the command has this flag set, it handles its own unit
@@ -10870,7 +11588,7 @@ ctl_scsiio_precheck(struct ctl_softc *ctl_softc, struct ctl_scsiio *ctsio)
 	if ((entry->flags & CTL_CMD_FLAG_NO_SENSE) == 0) {
 		ctl_ua_type ua_type;
 
-		ua_type = lun->pending_sense[initidx].ua_pending;
+		ua_type = lun->pending_ua[initidx];
 		if (ua_type != CTL_UA_NONE) {
 			scsi_sense_data_type sense_format;
 
@@ -10888,20 +11606,19 @@ ctl_scsiio_precheck(struct ctl_softc *ctl_softc, struct ctl_scsiio *ctsio)
 				ctsio->io_hdr.status = CTL_SCSI_ERROR |
 						       CTL_AUTOSENSE;
 				ctsio->sense_len = SSD_FULL_SIZE;
-				lun->pending_sense[initidx].ua_pending &=
-					~ua_type;
-				mtx_unlock(&ctl_softc->ctl_lock);
+				lun->pending_ua[initidx] &= ~ua_type;
+				mtx_unlock(&lun->lun_lock);
 				ctl_done((union ctl_io *)ctsio);
-				goto bailout;
+				return (retval);
 			}
 		}
 	}
 
 
 	if (ctl_scsiio_lun_check(ctl_softc, lun, entry, ctsio) != 0) {
-		mtx_unlock(&ctl_softc->ctl_lock);
+		mtx_unlock(&lun->lun_lock);
 		ctl_done((union ctl_io *)ctsio);
-		goto bailout;
+		return (retval);
 	}
 
 	/*
@@ -10937,7 +11654,7 @@ ctl_scsiio_precheck(struct ctl_softc *ctl_softc, struct ctl_scsiio *ctsio)
 		    CTL_HA_STATUS_SUCCESS) {
 			printf("CTL:precheck, ctl_ha_msg_send returned %d\n",
 			       isc_retval);
-			printf("CTL:opcode is %x\n",opcode);
+			printf("CTL:opcode is %x\n", ctsio->cdb[0]);
 		} else {
 #if 0
 			printf("CTL:Precheck sent msg, opcode is %x\n",opcode);
@@ -10951,7 +11668,8 @@ ctl_scsiio_precheck(struct ctl_softc *ctl_softc, struct ctl_scsiio *ctsio)
 		 * so that we have an idea of what we're waiting for from
 		 * the other side.
 		 */
-		goto bailout_unlock;
+		mtx_unlock(&lun->lun_lock);
+		return (retval);
 	}
 
 	switch (ctl_check_ooa(lun, (union ctl_io *)ctsio,
@@ -10961,59 +11679,115 @@ ctl_scsiio_precheck(struct ctl_softc *ctl_softc, struct ctl_scsiio *ctsio)
 		ctsio->io_hdr.flags |= CTL_FLAG_BLOCKED;
 		TAILQ_INSERT_TAIL(&lun->blocked_queue, &ctsio->io_hdr,
 				  blocked_links);
-		goto bailout_unlock;
-		break; /* NOTREACHED */
+		mtx_unlock(&lun->lun_lock);
+		return (retval);
 	case CTL_ACTION_PASS:
 	case CTL_ACTION_SKIP:
-		goto queue_rtr;
-		break; /* NOTREACHED */
+		ctsio->io_hdr.flags |= CTL_FLAG_IS_WAS_ON_RTR;
+		mtx_unlock(&lun->lun_lock);
+		ctl_enqueue_rtr((union ctl_io *)ctsio);
+		break;
 	case CTL_ACTION_OVERLAP:
+		mtx_unlock(&lun->lun_lock);
 		ctl_set_overlapped_cmd(ctsio);
-		mtx_unlock(&ctl_softc->ctl_lock);
 		ctl_done((union ctl_io *)ctsio);
-		goto bailout;
-		break; /* NOTREACHED */
+		break;
 	case CTL_ACTION_OVERLAP_TAG:
+		mtx_unlock(&lun->lun_lock);
 		ctl_set_overlapped_tag(ctsio, ctsio->tag_num & 0xff);
-		mtx_unlock(&ctl_softc->ctl_lock);
 		ctl_done((union ctl_io *)ctsio);
-		goto bailout;
-		break; /* NOTREACHED */
+		break;
 	case CTL_ACTION_ERROR:
 	default:
+		mtx_unlock(&lun->lun_lock);
 		ctl_set_internal_failure(ctsio,
 					 /*sks_valid*/ 0,
 					 /*retry_count*/ 0);
-		mtx_unlock(&ctl_softc->ctl_lock);
 		ctl_done((union ctl_io *)ctsio);
-		goto bailout;
-		break; /* NOTREACHED */
+		break;
 	}
-
-	goto bailout_unlock;
-
-queue_rtr:
-	ctsio->io_hdr.flags |= CTL_FLAG_IS_WAS_ON_RTR;
-	STAILQ_INSERT_TAIL(&ctl_softc->rtr_queue, &ctsio->io_hdr, links);
-
-bailout_unlock:
-	mtx_unlock(&ctl_softc->ctl_lock);
-
-bailout:
 	return (retval);
 }
 
+const struct ctl_cmd_entry *
+ctl_get_cmd_entry(struct ctl_scsiio *ctsio)
+{
+	const struct ctl_cmd_entry *entry;
+	int service_action;
+
+	entry = &ctl_cmd_table[ctsio->cdb[0]];
+	if (entry->flags & CTL_CMD_FLAG_SA5) {
+		service_action = ctsio->cdb[1] & SERVICE_ACTION_MASK;
+		entry = &((const struct ctl_cmd_entry *)
+		    entry->execute)[service_action];
+	}
+	return (entry);
+}
+
+const struct ctl_cmd_entry *
+ctl_validate_command(struct ctl_scsiio *ctsio)
+{
+	const struct ctl_cmd_entry *entry;
+	int i;
+	uint8_t diff;
+
+	entry = ctl_get_cmd_entry(ctsio);
+	if (entry->execute == NULL) {
+		ctl_set_invalid_opcode(ctsio);
+		ctl_done((union ctl_io *)ctsio);
+		return (NULL);
+	}
+	KASSERT(entry->length > 0,
+	    ("Not defined length for command 0x%02x/0x%02x",
+	     ctsio->cdb[0], ctsio->cdb[1]));
+	for (i = 1; i < entry->length; i++) {
+		diff = ctsio->cdb[i] & ~entry->usage[i - 1];
+		if (diff == 0)
+			continue;
+		ctl_set_invalid_field(ctsio,
+				      /*sks_valid*/ 1,
+				      /*command*/ 1,
+				      /*field*/ i,
+				      /*bit_valid*/ 1,
+				      /*bit*/ fls(diff) - 1);
+		ctl_done((union ctl_io *)ctsio);
+		return (NULL);
+	}
+	return (entry);
+}
+
+static int
+ctl_cmd_applicable(uint8_t lun_type, const struct ctl_cmd_entry *entry)
+{
+
+	switch (lun_type) {
+	case T_PROCESSOR:
+		if (((entry->flags & CTL_CMD_FLAG_OK_ON_PROC) == 0) &&
+		    ((entry->flags & CTL_CMD_FLAG_OK_ON_ALL_LUNS) == 0))
+			return (0);
+		break;
+	case T_DIRECT:
+		if (((entry->flags & CTL_CMD_FLAG_OK_ON_SLUN) == 0) &&
+		    ((entry->flags & CTL_CMD_FLAG_OK_ON_ALL_LUNS) == 0))
+			return (0);
+		break;
+	default:
+		return (0);
+	}
+	return (1);
+}
+
 static int
 ctl_scsiio(struct ctl_scsiio *ctsio)
 {
 	int retval;
-	struct ctl_cmd_entry *entry;
+	const struct ctl_cmd_entry *entry;
 
 	retval = CTL_RETVAL_COMPLETE;
 
 	CTL_DEBUG_PRINT(("ctl_scsiio cdb[0]=%02X\n", ctsio->cdb[0]));
 
-	entry = &ctl_cmd_table[ctsio->cdb[0]];
+	entry = ctl_get_cmd_entry(ctsio);
 
 	/*
 	 * If this I/O has been aborted, just send it straight to
@@ -11069,8 +11843,10 @@ ctl_target_reset(struct ctl_softc *ctl_softc, union ctl_io *io,
 	}
 	retval = 0;
 
+	mtx_lock(&ctl_softc->ctl_lock);
 	STAILQ_FOREACH(lun, &ctl_softc->lun_list, links)
 		retval += ctl_lun_reset(lun, io, ua_type);
+	mtx_unlock(&ctl_softc->ctl_lock);
 
 	return (retval);
 }
@@ -11105,6 +11881,7 @@ ctl_lun_reset(struct ctl_lun *lun, union ctl_io *io, ctl_ua_type ua_type)
 #endif
 	int i;
 
+	mtx_lock(&lun->lun_lock);
 	/*
 	 * Run through the OOA queue and abort each I/O.
 	 */
@@ -11113,7 +11890,7 @@ ctl_lun_reset(struct ctl_lun *lun, union ctl_io *io, ctl_ua_type ua_type)
 #endif
 	for (xio = (union ctl_io *)TAILQ_FIRST(&lun->ooa_queue); xio != NULL;
 	     xio = (union ctl_io *)TAILQ_NEXT(&xio->io_hdr, ooa_links)) {
-		xio->io_hdr.flags |= CTL_FLAG_ABORT;
+		xio->io_hdr.flags |= CTL_FLAG_ABORT | CTL_FLAG_ABORT_STATUS;
 	}
 
 	/*
@@ -11124,7 +11901,7 @@ ctl_lun_reset(struct ctl_lun *lun, union ctl_io *io, ctl_ua_type ua_type)
 	for (i = 0; i < CTL_MAX_INITIATORS; i++) {
 		if (initindex == i)
 			continue;
-		lun->pending_sense[i].ua_pending |= ua_type;
+		lun->pending_ua[i] |= ua_type;
 	}
 #endif
 
@@ -11139,10 +11916,116 @@ ctl_lun_reset(struct ctl_lun *lun, union ctl_io *io, ctl_ua_type ua_type)
 	lun->flags &= ~CTL_LUN_RESERVED;
 
 	for (i = 0; i < CTL_MAX_INITIATORS; i++) {
+#ifdef CTL_WITH_CA
 		ctl_clear_mask(lun->have_ca, i);
-		lun->pending_sense[i].ua_pending |= ua_type;
+#endif
+		lun->pending_ua[i] |= ua_type;
+	}
+	mtx_unlock(&lun->lun_lock);
+
+	return (0);
+}
+
+static int
+ctl_abort_tasks_lun(struct ctl_lun *lun, uint32_t targ_port, uint32_t init_id,
+    int other_sc)
+{
+	union ctl_io *xio;
+	int found;
+
+	mtx_assert(&lun->lun_lock, MA_OWNED);
+
+	/*
+	 * Run through the OOA queue and attempt to find the given I/O.
+	 * The target port, initiator ID, tag type and tag number have to
+	 * match the values that we got from the initiator.  If we have an
+	 * untagged command to abort, simply abort the first untagged command
+	 * we come to.  We only allow one untagged command at a time of course.
+	 */
+	for (xio = (union ctl_io *)TAILQ_FIRST(&lun->ooa_queue); xio != NULL;
+	     xio = (union ctl_io *)TAILQ_NEXT(&xio->io_hdr, ooa_links)) {
+
+		if ((targ_port == UINT32_MAX ||
+		     targ_port == xio->io_hdr.nexus.targ_port) &&
+		    (init_id == UINT32_MAX ||
+		     init_id == xio->io_hdr.nexus.initid.id)) {
+			if (targ_port != xio->io_hdr.nexus.targ_port ||
+			    init_id != xio->io_hdr.nexus.initid.id)
+				xio->io_hdr.flags |= CTL_FLAG_ABORT_STATUS;
+			xio->io_hdr.flags |= CTL_FLAG_ABORT;
+			found = 1;
+			if (!other_sc && !(lun->flags & CTL_LUN_PRIMARY_SC)) {
+				union ctl_ha_msg msg_info;
+
+				msg_info.hdr.nexus = xio->io_hdr.nexus;
+				msg_info.task.task_action = CTL_TASK_ABORT_TASK;
+				msg_info.task.tag_num = xio->scsiio.tag_num;
+				msg_info.task.tag_type = xio->scsiio.tag_type;
+				msg_info.hdr.msg_type = CTL_MSG_MANAGE_TASKS;
+				msg_info.hdr.original_sc = NULL;
+				msg_info.hdr.serializing_sc = NULL;
+				ctl_ha_msg_send(CTL_HA_CHAN_CTL,
+				    (void *)&msg_info, sizeof(msg_info), 0);
+			}
+		}
+	}
+	return (found);
+}
+
+static int
+ctl_abort_task_set(union ctl_io *io)
+{
+	struct ctl_softc *softc = control_softc;
+	struct ctl_lun *lun;
+	uint32_t targ_lun;
+
+	/*
+	 * Look up the LUN.
+	 */
+	targ_lun = io->io_hdr.nexus.targ_mapped_lun;
+	mtx_lock(&softc->ctl_lock);
+	if ((targ_lun < CTL_MAX_LUNS) && (softc->ctl_luns[targ_lun] != NULL))
+		lun = softc->ctl_luns[targ_lun];
+	else {
+		mtx_unlock(&softc->ctl_lock);
+		return (1);
 	}
 
+	mtx_lock(&lun->lun_lock);
+	mtx_unlock(&softc->ctl_lock);
+	if (io->taskio.task_action == CTL_TASK_ABORT_TASK_SET) {
+		ctl_abort_tasks_lun(lun, io->io_hdr.nexus.targ_port,
+		    io->io_hdr.nexus.initid.id,
+		    (io->io_hdr.flags & CTL_FLAG_FROM_OTHER_SC) != 0);
+	} else { /* CTL_TASK_CLEAR_TASK_SET */
+		ctl_abort_tasks_lun(lun, UINT32_MAX, UINT32_MAX,
+		    (io->io_hdr.flags & CTL_FLAG_FROM_OTHER_SC) != 0);
+	}
+	mtx_unlock(&lun->lun_lock);
+	return (0);
+}
+
+static int
+ctl_i_t_nexus_reset(union ctl_io *io)
+{
+	struct ctl_softc *softc = control_softc;
+	struct ctl_lun *lun;
+	uint32_t initindex;
+
+	initindex = ctl_get_initindex(&io->io_hdr.nexus);
+	mtx_lock(&softc->ctl_lock);
+	STAILQ_FOREACH(lun, &softc->lun_list, links) {
+		mtx_lock(&lun->lun_lock);
+		ctl_abort_tasks_lun(lun, io->io_hdr.nexus.targ_port,
+		    io->io_hdr.nexus.initid.id,
+		    (io->io_hdr.flags & CTL_FLAG_FROM_OTHER_SC) != 0);
+#ifdef CTL_WITH_CA
+		ctl_clear_mask(lun->have_ca, initindex);
+#endif
+		lun->pending_ua[initindex] |= CTL_UA_I_T_NEXUS_LOSS;
+		mtx_unlock(&lun->lun_lock);
+	}
+	mtx_unlock(&softc->ctl_lock);
 	return (0);
 }
 
@@ -11165,20 +12048,23 @@ ctl_abort_task(union ctl_io *io)
 	/*
 	 * Look up the LUN.
 	 */
-	targ_lun = io->io_hdr.nexus.targ_lun;
-	if (io->io_hdr.nexus.lun_map_fn != NULL)
-		targ_lun = io->io_hdr.nexus.lun_map_fn(io->io_hdr.nexus.lun_map_arg, targ_lun);
+	targ_lun = io->io_hdr.nexus.targ_mapped_lun;
+	mtx_lock(&ctl_softc->ctl_lock);
 	if ((targ_lun < CTL_MAX_LUNS)
 	 && (ctl_softc->ctl_luns[targ_lun] != NULL))
 		lun = ctl_softc->ctl_luns[targ_lun];
-	else
-		goto bailout;
+	else {
+		mtx_unlock(&ctl_softc->ctl_lock);
+		return (1);
+	}
 
 #if 0
 	printf("ctl_abort_task: called for lun %lld, tag %d type %d\n",
 	       lun->lun, io->taskio.tag_num, io->taskio.tag_type);
 #endif
 
+	mtx_lock(&lun->lun_lock);
+	mtx_unlock(&ctl_softc->ctl_lock);
 	/*
 	 * Run through the OOA queue and attempt to find the given I/O.
 	 * The target port, initiator ID, tag type and tag number have to
@@ -11270,8 +12156,7 @@ ctl_abort_task(union ctl_io *io)
 			}
 		}
 	}
-
-bailout:
+	mtx_unlock(&lun->lun_lock);
 
 	if (found == 0) {
 		/*
@@ -11288,166 +12173,123 @@ ctl_abort_task(union ctl_io *io)
 		       io->io_hdr.nexus.targ_lun, io->taskio.tag_num,
 		       io->taskio.tag_type);
 #endif
-		return (1);
-	} else
-		return (0);
+	}
+	return (0);
 }
 
-/*
- * This routine cannot block!  It must be callable from an interrupt
- * handler as well as from the work thread.
- */
 static void
-ctl_run_task_queue(struct ctl_softc *ctl_softc)
+ctl_run_task(union ctl_io *io)
 {
-	union ctl_io *io, *next_io;
+	struct ctl_softc *ctl_softc = control_softc;
+	int retval = 1;
+	const char *task_desc;
 
-	mtx_assert(&ctl_softc->ctl_lock, MA_OWNED);
+	CTL_DEBUG_PRINT(("ctl_run_task\n"));
 
-	CTL_DEBUG_PRINT(("ctl_run_task_queue\n"));
+	KASSERT(io->io_hdr.io_type == CTL_IO_TASK,
+	    ("ctl_run_task: Unextected io_type %d\n",
+	     io->io_hdr.io_type));
 
-	for (io = (union ctl_io *)STAILQ_FIRST(&ctl_softc->task_queue);
-	     io != NULL; io = next_io) {
-		int retval;
-		const char *task_desc;
-
-		next_io = (union ctl_io *)STAILQ_NEXT(&io->io_hdr, links);
-
-		retval = 0;
-
-		switch (io->io_hdr.io_type) {
-		case CTL_IO_TASK: {
-			task_desc = ctl_scsi_task_string(&io->taskio);
-			if (task_desc != NULL) {
+	task_desc = ctl_scsi_task_string(&io->taskio);
+	if (task_desc != NULL) {
 #ifdef NEEDTOPORT
-				csevent_log(CSC_CTL | CSC_SHELF_SW |
-					    CTL_TASK_REPORT,
-					    csevent_LogType_Trace,
-					    csevent_Severity_Information,
-					    csevent_AlertLevel_Green,
-					    csevent_FRU_Firmware,
-					    csevent_FRU_Unknown,
-					    "CTL: received task: %s",task_desc);
+		csevent_log(CSC_CTL | CSC_SHELF_SW |
+			    CTL_TASK_REPORT,
+			    csevent_LogType_Trace,
+			    csevent_Severity_Information,
+			    csevent_AlertLevel_Green,
+			    csevent_FRU_Firmware,
+			    csevent_FRU_Unknown,
+			    "CTL: received task: %s",task_desc);
 #endif
-			} else {
+	} else {
 #ifdef NEEDTOPORT
-				csevent_log(CSC_CTL | CSC_SHELF_SW |
-					    CTL_TASK_REPORT,
-					    csevent_LogType_Trace,
-					    csevent_Severity_Information,
-					    csevent_AlertLevel_Green,
-					    csevent_FRU_Firmware,
-					    csevent_FRU_Unknown,
-					    "CTL: received unknown task "
-					    "type: %d (%#x)",
-					    io->taskio.task_action,
-					    io->taskio.task_action);
+		csevent_log(CSC_CTL | CSC_SHELF_SW |
+			    CTL_TASK_REPORT,
+			    csevent_LogType_Trace,
+			    csevent_Severity_Information,
+			    csevent_AlertLevel_Green,
+			    csevent_FRU_Firmware,
+			    csevent_FRU_Unknown,
+			    "CTL: received unknown task "
+			    "type: %d (%#x)",
+			    io->taskio.task_action,
+			    io->taskio.task_action);
 #endif
-			}
-			switch (io->taskio.task_action) {
-			case CTL_TASK_ABORT_TASK:
-				retval = ctl_abort_task(io);
-				break;
-			case CTL_TASK_ABORT_TASK_SET:
-				break;
-			case CTL_TASK_CLEAR_ACA:
-				break;
-			case CTL_TASK_CLEAR_TASK_SET:
-				break;
-			case CTL_TASK_LUN_RESET: {
-				struct ctl_lun *lun;
-				uint32_t targ_lun;
-				int retval;
-
-				targ_lun = io->io_hdr.nexus.targ_lun;
-				if (io->io_hdr.nexus.lun_map_fn != NULL)
-					targ_lun = io->io_hdr.nexus.lun_map_fn(io->io_hdr.nexus.lun_map_arg, targ_lun);
-
-				if ((targ_lun < CTL_MAX_LUNS)
-				 && (ctl_softc->ctl_luns[targ_lun] != NULL))
-					lun = ctl_softc->ctl_luns[targ_lun];
-				else {
-					retval = 1;
-					break;
-				}
-
-				if (!(io->io_hdr.flags &
-				    CTL_FLAG_FROM_OTHER_SC)) {
-					union ctl_ha_msg msg_info;
-
-					io->io_hdr.flags |=
-						CTL_FLAG_SENT_2OTHER_SC;
-					msg_info.hdr.msg_type =
-						CTL_MSG_MANAGE_TASKS;
-					msg_info.hdr.nexus = io->io_hdr.nexus;
-					msg_info.task.task_action =
-						CTL_TASK_LUN_RESET;
-					msg_info.hdr.original_sc = NULL;
-					msg_info.hdr.serializing_sc = NULL;
-					if (CTL_HA_STATUS_SUCCESS !=
-					    ctl_ha_msg_send(CTL_HA_CHAN_CTL,
-					    (void *)&msg_info,
-					    sizeof(msg_info), 0)) {
-					}
-				}
-
-				retval = ctl_lun_reset(lun, io,
-						       CTL_UA_LUN_RESET);
-				break;
-			}
-			case CTL_TASK_TARGET_RESET:
-				retval = ctl_target_reset(ctl_softc, io,
-							  CTL_UA_TARG_RESET);
-				break;
-			case CTL_TASK_BUS_RESET:
-				retval = ctl_bus_reset(ctl_softc, io);
-				break;
-			case CTL_TASK_PORT_LOGIN:
-				break;
-			case CTL_TASK_PORT_LOGOUT:
-				break;
-			default:
-				printf("ctl_run_task_queue: got unknown task "
-				       "management event %d\n",
-				       io->taskio.task_action);
-				break;
-			}
-			if (retval == 0)
-				io->io_hdr.status = CTL_SUCCESS;
-			else
-				io->io_hdr.status = CTL_ERROR;
-
-			STAILQ_REMOVE(&ctl_softc->task_queue, &io->io_hdr,
-				      ctl_io_hdr, links);
-			/*
-			 * This will queue this I/O to the done queue, but the
-			 * work thread won't be able to process it until we
-			 * return and the lock is released.
-			 */
-			ctl_done_lock(io, /*have_lock*/ 1);
-			break;
-		}
-		default: {
-
-			printf("%s: invalid I/O type %d msg %d cdb %x"
-			       " iptl: %ju:%d:%ju:%d tag 0x%04x\n",
-			       __func__, io->io_hdr.io_type,
-			       io->io_hdr.msg_type, io->scsiio.cdb[0],
-			       (uintmax_t)io->io_hdr.nexus.initid.id,
-			       io->io_hdr.nexus.targ_port,
-			       (uintmax_t)io->io_hdr.nexus.targ_target.id,
-			       io->io_hdr.nexus.targ_lun /* XXX */,
-			       (io->io_hdr.io_type == CTL_IO_TASK) ?
-			       io->taskio.tag_num : io->scsiio.tag_num);
-			STAILQ_REMOVE(&ctl_softc->task_queue, &io->io_hdr,
-				      ctl_io_hdr, links);
-			ctl_free_io(io);
-			break;
-		}
-		}
 	}
+	switch (io->taskio.task_action) {
+	case CTL_TASK_ABORT_TASK:
+		retval = ctl_abort_task(io);
+		break;
+	case CTL_TASK_ABORT_TASK_SET:
+	case CTL_TASK_CLEAR_TASK_SET:
+		retval = ctl_abort_task_set(io);
+		break;
+	case CTL_TASK_CLEAR_ACA:
+		break;
+	case CTL_TASK_I_T_NEXUS_RESET:
+		retval = ctl_i_t_nexus_reset(io);
+		break;
+	case CTL_TASK_LUN_RESET: {
+		struct ctl_lun *lun;
+		uint32_t targ_lun;
 
-	ctl_softc->flags &= ~CTL_FLAG_TASK_PENDING;
+		targ_lun = io->io_hdr.nexus.targ_mapped_lun;
+		mtx_lock(&ctl_softc->ctl_lock);
+		if ((targ_lun < CTL_MAX_LUNS)
+		 && (ctl_softc->ctl_luns[targ_lun] != NULL))
+			lun = ctl_softc->ctl_luns[targ_lun];
+		else {
+			mtx_unlock(&ctl_softc->ctl_lock);
+			retval = 1;
+			break;
+		}
+
+		if (!(io->io_hdr.flags &
+		    CTL_FLAG_FROM_OTHER_SC)) {
+			union ctl_ha_msg msg_info;
+
+			io->io_hdr.flags |=
+				CTL_FLAG_SENT_2OTHER_SC;
+			msg_info.hdr.msg_type =
+				CTL_MSG_MANAGE_TASKS;
+			msg_info.hdr.nexus = io->io_hdr.nexus;
+			msg_info.task.task_action =
+				CTL_TASK_LUN_RESET;
+			msg_info.hdr.original_sc = NULL;
+			msg_info.hdr.serializing_sc = NULL;
+			if (CTL_HA_STATUS_SUCCESS !=
+			    ctl_ha_msg_send(CTL_HA_CHAN_CTL,
+			    (void *)&msg_info,
+			    sizeof(msg_info), 0)) {
+			}
+		}
+
+		retval = ctl_lun_reset(lun, io,
+				       CTL_UA_LUN_RESET);
+		mtx_unlock(&ctl_softc->ctl_lock);
+		break;
+	}
+	case CTL_TASK_TARGET_RESET:
+		retval = ctl_target_reset(ctl_softc, io, CTL_UA_TARG_RESET);
+		break;
+	case CTL_TASK_BUS_RESET:
+		retval = ctl_bus_reset(ctl_softc, io);
+		break;
+	case CTL_TASK_PORT_LOGIN:
+		break;
+	case CTL_TASK_PORT_LOGOUT:
+		break;
+	default:
+		printf("ctl_run_task: got unknown task management event %d\n",
+		       io->taskio.task_action);
+		break;
+	}
+	if (retval == 0)
+		io->io_hdr.status = CTL_SUCCESS;
+	else
+		io->io_hdr.status = CTL_ERROR;
+	ctl_done(io);
 }
 
 /*
@@ -11464,52 +12306,44 @@ ctl_handle_isc(union ctl_io *io)
 
 	ctl_softc = control_softc;
 
-	targ_lun = io->io_hdr.nexus.targ_lun;
-	if (io->io_hdr.nexus.lun_map_fn != NULL)
-		targ_lun = io->io_hdr.nexus.lun_map_fn(io->io_hdr.nexus.lun_map_arg, targ_lun);
+	targ_lun = io->io_hdr.nexus.targ_mapped_lun;
 	lun = ctl_softc->ctl_luns[targ_lun];
 
 	switch (io->io_hdr.msg_type) {
 	case CTL_MSG_SERIALIZE:
-		free_io = ctl_serialize_other_sc_cmd(&io->scsiio,
-						     /*have_lock*/ 0);
+		free_io = ctl_serialize_other_sc_cmd(&io->scsiio);
 		break;
 	case CTL_MSG_R2R: {
-		uint8_t opcode;
-		struct ctl_cmd_entry *entry;
+		const struct ctl_cmd_entry *entry;
 
 		/*
 		 * This is only used in SER_ONLY mode.
 		 */
 		free_io = 0;
-		opcode = io->scsiio.cdb[0];
-		entry = &ctl_cmd_table[opcode];
-		mtx_lock(&ctl_softc->ctl_lock);
+		entry = ctl_get_cmd_entry(&io->scsiio);
+		mtx_lock(&lun->lun_lock);
 		if (ctl_scsiio_lun_check(ctl_softc, lun,
 		    entry, (struct ctl_scsiio *)io) != 0) {
-			ctl_done_lock(io, /*have_lock*/ 1);
-			mtx_unlock(&ctl_softc->ctl_lock);
+			mtx_unlock(&lun->lun_lock);
+			ctl_done(io);
 			break;
 		}
 		io->io_hdr.flags |= CTL_FLAG_IS_WAS_ON_RTR;
-		STAILQ_INSERT_TAIL(&ctl_softc->rtr_queue,
-				   &io->io_hdr, links);
-		mtx_unlock(&ctl_softc->ctl_lock);
+		mtx_unlock(&lun->lun_lock);
+		ctl_enqueue_rtr(io);
 		break;
 	}
 	case CTL_MSG_FINISH_IO:
 		if (ctl_softc->ha_mode == CTL_HA_MODE_XFER) {
 			free_io = 0;
-			ctl_done_lock(io, /*have_lock*/ 0);
+			ctl_done(io);
 		} else {
 			free_io = 1;
-			mtx_lock(&ctl_softc->ctl_lock);
+			mtx_lock(&lun->lun_lock);
 			TAILQ_REMOVE(&lun->ooa_queue, &io->io_hdr,
 				     ooa_links);
-			STAILQ_REMOVE(&ctl_softc->task_queue,
-				      &io->io_hdr, ctl_io_hdr, links);
 			ctl_check_blocked(lun);
-			mtx_unlock(&ctl_softc->ctl_lock);
+			mtx_unlock(&lun->lun_lock);
 		}
 		break;
 	case CTL_MSG_PERS_ACTION:
@@ -11519,7 +12353,7 @@ ctl_handle_isc(union ctl_io *io)
 		break;
 	case CTL_MSG_BAD_JUJU:
 		free_io = 0;
-		ctl_done_lock(io, /*have_lock*/ 0);
+		ctl_done(io);
 		break;
 	case CTL_MSG_DATAMOVE:
 		/* Only used in XFER mode */
@@ -11550,9 +12384,8 @@ ctl_handle_isc(union ctl_io *io)
 static ctl_lun_error_pattern
 ctl_cmd_pattern_match(struct ctl_scsiio *ctsio, struct ctl_error_desc *desc)
 {
-	struct ctl_cmd_entry *entry;
+	const struct ctl_cmd_entry *entry;
 	ctl_lun_error_pattern filtered_pattern, pattern;
-	uint8_t opcode;
 
 	pattern = desc->error_pattern;
 
@@ -11567,8 +12400,7 @@ ctl_cmd_pattern_match(struct ctl_scsiio *ctsio, struct ctl_error_desc *desc)
 	if ((pattern & CTL_LUN_PAT_MASK) == CTL_LUN_PAT_ANY)
 		return (CTL_LUN_PAT_ANY);
 
-	opcode = ctsio->cdb[0];
-	entry = &ctl_cmd_table[opcode];
+	entry = ctl_get_cmd_entry(ctsio);
 
 	filtered_pattern = entry->pattern & pattern;
 
@@ -11616,7 +12448,7 @@ ctl_inject_error(struct ctl_lun *lun, union ctl_io *io)
 {
 	struct ctl_error_desc *desc, *desc2;
 
-	mtx_assert(&control_softc->ctl_lock, MA_OWNED);
+	mtx_assert(&lun->lun_lock, MA_OWNED);
 
 	STAILQ_FOREACH_SAFE(desc, &lun->error_list, links, desc2) {
 		ctl_lun_error_pattern pattern;
@@ -11732,7 +12564,6 @@ ctl_datamove(union ctl_io *io)
 	}
 #endif /* CTL_TIME_IO */
 
-	mtx_lock(&control_softc->ctl_lock);
 #ifdef CTL_IO_DELAY
 	if (io->io_hdr.flags & CTL_FLAG_DELAY_DONE) {
 		struct ctl_lun *lun;
@@ -11757,31 +12588,10 @@ ctl_datamove(union ctl_io *io)
 			if (lun->delay_info.datamove_type ==
 			    CTL_DELAY_TYPE_ONESHOT)
 				lun->delay_info.datamove_delay = 0;
-			mtx_unlock(&control_softc->ctl_lock);
 			return;
 		}
 	}
 #endif
-	/*
-	 * If we have any pending task management commands, process them
-	 * first.  This is necessary to eliminate a race condition with the
-	 * FETD:
-	 *
-	 * - FETD submits a task management command, like an abort.
-	 * - Back end calls fe_datamove() to move the data for the aborted
-	 *   command.  The FETD can't really accept it, but if it did, it
-	 *   would end up transmitting data for a command that the initiator
-	 *   told us to abort.
-	 *
-	 * We close the race by processing all pending task management
-	 * commands here (we can't block!), and then check this I/O to see
-	 * if it has been aborted.  If so, return it to the back end with
-	 * bad status, so the back end can say return an error to the back end
-	 * and then when the back end returns an error, we can return the
-	 * aborted command to the FETD, so it can clean up its resources.
-	 */
-	if (control_softc->flags & CTL_FLAG_TASK_PENDING)
-		ctl_run_task_queue(control_softc);
 
 	/*
 	 * This command has been aborted.  Set the port status, so we fail
@@ -11793,9 +12603,7 @@ ctl_datamove(union ctl_io *io)
 		       io->io_hdr.nexus.targ_port,
 		       (uintmax_t)io->io_hdr.nexus.targ_target.id,
 		       io->io_hdr.nexus.targ_lun);
-		io->io_hdr.status = CTL_CMD_ABORTED;
 		io->io_hdr.port_status = 31337;
-		mtx_unlock(&control_softc->ctl_lock);
 		/*
 		 * Note that the backend, in this case, will get the
 		 * callback in its context.  In other cases it may get
@@ -11961,7 +12769,7 @@ ctl_datamove(union ctl_io *io)
 		}
 		io->io_hdr.flags &= ~CTL_FLAG_IO_ACTIVE;
 		if (io->io_hdr.flags & CTL_FLAG_FAILOVER)
-			ctl_failover_io(io, /*have_lock*/ 1);
+			ctl_failover_io(io, /*have_lock*/ 0);
 
 	} else {
 
@@ -11971,7 +12779,6 @@ ctl_datamove(union ctl_io *io)
 		 */
 		fe_datamove =
 		    control_softc->ctl_ports[ctl_port_idx(io->io_hdr.nexus.targ_port)]->fe_datamove;
-		mtx_unlock(&control_softc->ctl_lock);
 
 		fe_datamove(io);
 	}
@@ -12551,36 +13358,24 @@ ctl_datamove_remote(union ctl_io *io)
 
 	/*
 	 * Note that we look for an aborted I/O here, but don't do some of
-	 * the other checks that ctl_datamove() normally does.  We don't
-	 * need to run the task queue, because this I/O is on the ISC
-	 * queue, which is executed by the work thread after the task queue.
+	 * the other checks that ctl_datamove() normally does.
 	 * We don't need to run the datamove delay code, since that should
 	 * have been done if need be on the other controller.
 	 */
-	mtx_lock(&softc->ctl_lock);
-
 	if (io->io_hdr.flags & CTL_FLAG_ABORT) {
-
 		printf("%s: tag 0x%04x on (%d:%d:%d:%d) aborted\n", __func__,
 		       io->scsiio.tag_num, io->io_hdr.nexus.initid.id,
 		       io->io_hdr.nexus.targ_port,
 		       io->io_hdr.nexus.targ_target.id,
 		       io->io_hdr.nexus.targ_lun);
-		io->io_hdr.status = CTL_CMD_ABORTED;
 		io->io_hdr.port_status = 31338;
-
-		mtx_unlock(&softc->ctl_lock);
-
 		ctl_send_datamove_done(io, /*have_lock*/ 0);
-
 		return;
 	}
 
 	if ((io->io_hdr.flags & CTL_FLAG_DATA_MASK) == CTL_FLAG_DATA_OUT) {
-		mtx_unlock(&softc->ctl_lock);
 		ctl_datamove_remote_write(io);
 	} else if ((io->io_hdr.flags & CTL_FLAG_DATA_MASK) == CTL_FLAG_DATA_IN){
-		mtx_unlock(&softc->ctl_lock);
 		ctl_datamove_remote_read(io);
 	} else {
 		union ctl_ha_msg msg;
@@ -12616,12 +13411,9 @@ ctl_datamove_remote(union ctl_io *io)
 		io->io_hdr.flags &= ~CTL_FLAG_IO_ACTIVE;
 		if (io->io_hdr.flags & CTL_FLAG_FAILOVER) {
 			ctl_failover_io(io, /*have_lock*/ 1);
-			mtx_unlock(&softc->ctl_lock);
 			return;
 		}
 
-		mtx_unlock(&softc->ctl_lock);
-
 		if (ctl_ha_msg_send(CTL_HA_CHAN_CTL, &msg, sizeof(msg), 0) >
 		    CTL_HA_STATUS_SUCCESS) {
 			/* XXX KDM what to do if this fails? */
@@ -12632,7 +13424,7 @@ ctl_datamove_remote(union ctl_io *io)
 }
 
 static int
-ctl_process_done(union ctl_io *io, int have_lock)
+ctl_process_done(union ctl_io *io)
 {
 	struct ctl_lun *lun;
 	struct ctl_softc *ctl_softc;
@@ -12703,17 +13495,13 @@ ctl_process_done(union ctl_io *io, int have_lock)
 	lun = (struct ctl_lun *)io->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
 	if (lun == NULL) {
 		CTL_DEBUG_PRINT(("NULL LUN for lun %d\n",
-				 io->io_hdr.nexus.targ_lun));
+				 io->io_hdr.nexus.targ_mapped_lun));
 		fe_done(io);
 		goto bailout;
 	}
 	ctl_softc = lun->ctl_softc;
 
-	/*
-	 * Remove this from the OOA queue.
-	 */
-	if (have_lock == 0)
-		mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&lun->lun_lock);
 
 	/*
 	 * Check to see if we have any errors to inject here.  We only
@@ -12729,134 +13517,39 @@ ctl_process_done(union ctl_io *io, int have_lock)
 	 *
 	 * XXX KDM should we also track I/O latency?
 	 */
-	if ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_SUCCESS) {
-		uint32_t blocksize;
+	if ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_SUCCESS &&
+	    io->io_hdr.io_type == CTL_IO_SCSI) {
 #ifdef CTL_TIME_IO
 		struct bintime cur_bt;
 #endif
+		int type;
 
-		if ((lun->be_lun != NULL)
-		 && (lun->be_lun->blocksize != 0))
-			blocksize = lun->be_lun->blocksize;
+		if ((io->io_hdr.flags & CTL_FLAG_DATA_MASK) ==
+		    CTL_FLAG_DATA_IN)
+			type = CTL_STATS_READ;
+		else if ((io->io_hdr.flags & CTL_FLAG_DATA_MASK) ==
+		    CTL_FLAG_DATA_OUT)
+			type = CTL_STATS_WRITE;
 		else
-			blocksize = 512;
-
-		switch (io->io_hdr.io_type) {
-		case CTL_IO_SCSI: {
-			int isread;
-			struct ctl_lba_len lbalen;
-
-			isread = 0;
-			switch (io->scsiio.cdb[0]) {
-			case READ_6:
-			case READ_10:
-			case READ_12:
-			case READ_16:
-				isread = 1;
-				/* FALLTHROUGH */
-			case WRITE_6:
-			case WRITE_10:
-			case WRITE_12:
-			case WRITE_16:
-			case WRITE_VERIFY_10:
-			case WRITE_VERIFY_12:
-			case WRITE_VERIFY_16:
-				memcpy(&lbalen, io->io_hdr.ctl_private[
-				       CTL_PRIV_LBA_LEN].bytes, sizeof(lbalen));
-
-				if (isread) {
-					lun->stats.ports[targ_port].bytes[CTL_STATS_READ] +=
-						lbalen.len * blocksize;
-					lun->stats.ports[targ_port].operations[CTL_STATS_READ]++;
+			type = CTL_STATS_NO_IO;
 
+		lun->stats.ports[targ_port].bytes[type] +=
+		    io->scsiio.kern_total_len;
+		lun->stats.ports[targ_port].operations[type]++;
 #ifdef CTL_TIME_IO
-					bintime_add(
-					   &lun->stats.ports[targ_port].dma_time[CTL_STATS_READ],
-					   &io->io_hdr.dma_bt);
-					lun->stats.ports[targ_port].num_dmas[CTL_STATS_READ] +=
-						io->io_hdr.num_dmas;
-					getbintime(&cur_bt);
-					bintime_sub(&cur_bt,
-						    &io->io_hdr.start_bt);
-
-					bintime_add(
-					    &lun->stats.ports[targ_port].time[CTL_STATS_READ],
-					    &cur_bt);
-
-#if 0
-					cs_prof_gettime(&cur_ticks);
-					lun->stats.time[CTL_STATS_READ] +=
-						cur_ticks -
-						io->io_hdr.start_ticks;
+		bintime_add(&lun->stats.ports[targ_port].dma_time[type],
+		   &io->io_hdr.dma_bt);
+		lun->stats.ports[targ_port].num_dmas[type] +=
+		    io->io_hdr.num_dmas;
+		getbintime(&cur_bt);
+		bintime_sub(&cur_bt, &io->io_hdr.start_bt);
+		bintime_add(&lun->stats.ports[targ_port].time[type], &cur_bt);
 #endif
-#if 0
-					lun->stats.time[CTL_STATS_READ] +=
-						jiffies - io->io_hdr.start_time;
-#endif
-#endif /* CTL_TIME_IO */
-				} else {
-					lun->stats.ports[targ_port].bytes[CTL_STATS_WRITE] +=
-						lbalen.len * blocksize;
-					lun->stats.ports[targ_port].operations[
-						CTL_STATS_WRITE]++;
-
-#ifdef CTL_TIME_IO
-					bintime_add(
-					  &lun->stats.ports[targ_port].dma_time[CTL_STATS_WRITE],
-					  &io->io_hdr.dma_bt);
-					lun->stats.ports[targ_port].num_dmas[CTL_STATS_WRITE] +=
-						io->io_hdr.num_dmas;
-					getbintime(&cur_bt);
-					bintime_sub(&cur_bt,
-						    &io->io_hdr.start_bt);
-
-					bintime_add(
-					    &lun->stats.ports[targ_port].time[CTL_STATS_WRITE],
-					    &cur_bt);
-#if 0
-					cs_prof_gettime(&cur_ticks);
-					lun->stats.ports[targ_port].time[CTL_STATS_WRITE] +=
-						cur_ticks -
-						io->io_hdr.start_ticks;
-					lun->stats.ports[targ_port].time[CTL_STATS_WRITE] +=
-						jiffies - io->io_hdr.start_time;
-#endif
-#endif /* CTL_TIME_IO */
-				}
-				break;
-			default:
-				lun->stats.ports[targ_port].operations[CTL_STATS_NO_IO]++;
-
-#ifdef CTL_TIME_IO
-				bintime_add(
-				  &lun->stats.ports[targ_port].dma_time[CTL_STATS_NO_IO],
-				  &io->io_hdr.dma_bt);
-				lun->stats.ports[targ_port].num_dmas[CTL_STATS_NO_IO] +=
-					io->io_hdr.num_dmas;
-				getbintime(&cur_bt);
-				bintime_sub(&cur_bt, &io->io_hdr.start_bt);
-
-				bintime_add(&lun->stats.ports[targ_port].time[CTL_STATS_NO_IO],
-					    &cur_bt);
-
-#if 0
-				cs_prof_gettime(&cur_ticks);
-				lun->stats.ports[targ_port].time[CTL_STATS_NO_IO] +=
-					cur_ticks -
-					io->io_hdr.start_ticks;
-				lun->stats.ports[targ_port].time[CTL_STATS_NO_IO] +=
-					jiffies - io->io_hdr.start_time;
-#endif
-#endif /* CTL_TIME_IO */
-				break;
-			}
-			break;
-		}
-		default:
-			break;
-		}
 	}
 
+	/*
+	 * Remove this from the OOA queue.
+	 */
 	TAILQ_REMOVE(&lun->ooa_queue, &io->io_hdr, ooa_links);
 
 	/*
@@ -12870,8 +13563,13 @@ ctl_process_done(union ctl_io *io, int have_lock)
 	 * left on its OOA queue.
 	 */
 	if ((lun->flags & CTL_LUN_INVALID)
-	 && (TAILQ_FIRST(&lun->ooa_queue) == NULL))
+	 && TAILQ_EMPTY(&lun->ooa_queue)) {
+		mtx_unlock(&lun->lun_lock);
+		mtx_lock(&ctl_softc->ctl_lock);
 		ctl_free_lun(lun);
+		mtx_unlock(&ctl_softc->ctl_lock);
+	} else
+		mtx_unlock(&lun->lun_lock);
 
 	/*
 	 * If this command has been aborted, make sure we set the status
@@ -12879,7 +13577,7 @@ ctl_process_done(union ctl_io *io, int have_lock)
 	 * whatever it needs to do to clean up its state.
 	 */
 	if (io->io_hdr.flags & CTL_FLAG_ABORT)
-		io->io_hdr.status = CTL_CMD_ABORTED;
+		ctl_set_task_aborted(&io->scsiio);
 
 	/*
 	 * We print out status for every task management command.  For SCSI
@@ -12916,8 +13614,6 @@ ctl_process_done(union ctl_io *io, int have_lock)
 
 			if ((time_uptime - ctl_softc->last_print_jiffies) <= 0){
 				ctl_softc->skipped_prints++;
-				if (have_lock == 0)
-					mtx_unlock(&ctl_softc->ctl_lock);
 			} else {
 				uint32_t skipped_prints;
 
@@ -12926,8 +13622,6 @@ ctl_process_done(union ctl_io *io, int have_lock)
 				ctl_softc->skipped_prints = 0;
 				ctl_softc->last_print_jiffies = time_uptime;
 
-				if (have_lock == 0)
-					mtx_unlock(&ctl_softc->ctl_lock);
 				if (skipped_prints > 0) {
 #ifdef NEEDTOPORT
 					csevent_log(CSC_CTL | CSC_SHELF_SW |
@@ -12944,21 +13638,14 @@ ctl_process_done(union ctl_io *io, int have_lock)
 				if (bootverbose || verbose > 0)
 					ctl_io_error_print(io, NULL);
 			}
-		} else {
-			if (have_lock == 0)
-				mtx_unlock(&ctl_softc->ctl_lock);
 		}
 		break;
 	}
 	case CTL_IO_TASK:
-		if (have_lock == 0)
-			mtx_unlock(&ctl_softc->ctl_lock);
 		if (bootverbose || verbose > 0)
 			ctl_io_error_print(io, NULL);
 		break;
 	default:
-		if (have_lock == 0)
-			mtx_unlock(&ctl_softc->ctl_lock);
 		break;
 	}
 
@@ -13017,6 +13704,7 @@ ctl_process_done(union ctl_io *io, int have_lock)
 	return (CTL_RETVAL_COMPLETE);
 }
 
+#ifdef CTL_WITH_CA
 /*
  * Front end should call this if it doesn't do autosense.  When the request
  * sense comes back in from the initiator, we'll dequeue this and send it.
@@ -13046,8 +13734,7 @@ ctl_queue_sense(union ctl_io *io)
 	 * information.
 	 */
 	targ_lun = io->io_hdr.nexus.targ_lun;
-	if (io->io_hdr.nexus.lun_map_fn != NULL)
-		targ_lun = io->io_hdr.nexus.lun_map_fn(io->io_hdr.nexus.lun_map_arg, targ_lun);
+	targ_lun = ctl_map_lun(io->io_hdr.nexus.targ_port, targ_lun);
 	if ((targ_lun < CTL_MAX_LUNS)
 	 && (ctl_softc->ctl_luns[targ_lun] != NULL))
 		lun = ctl_softc->ctl_luns[targ_lun];
@@ -13056,16 +13743,20 @@ ctl_queue_sense(union ctl_io *io)
 
 	initidx = ctl_get_initindex(&io->io_hdr.nexus);
 
+	mtx_lock(&lun->lun_lock);
 	/*
 	 * Already have CA set for this LUN...toss the sense information.
 	 */
-	if (ctl_is_set(lun->have_ca, initidx))
+	if (ctl_is_set(lun->have_ca, initidx)) {
+		mtx_unlock(&lun->lun_lock);
 		goto bailout;
+	}
 
-	memcpy(&lun->pending_sense[initidx].sense, &io->scsiio.sense_data,
-	       ctl_min(sizeof(lun->pending_sense[initidx].sense),
+	memcpy(&lun->pending_sense[initidx], &io->scsiio.sense_data,
+	       ctl_min(sizeof(lun->pending_sense[initidx]),
 	       sizeof(io->scsiio.sense_data)));
 	ctl_set_mask(lun->have_ca, initidx);
+	mtx_unlock(&lun->lun_lock);
 
 bailout:
 	mtx_unlock(&ctl_softc->ctl_lock);
@@ -13074,6 +13765,7 @@ ctl_queue_sense(union ctl_io *io)
 
 	return (CTL_RETVAL_COMPLETE);
 }
+#endif
 
 /*
  * Primary command inlet from frontend ports.  All SCSI and task I/O
@@ -13093,42 +13785,19 @@ ctl_queue(union ctl_io *io)
 	getbintime(&io->io_hdr.start_bt);
 #endif /* CTL_TIME_IO */
 
-	mtx_lock(&ctl_softc->ctl_lock);
+	/* Map FE-specific LUN ID into global one. */
+	io->io_hdr.nexus.targ_mapped_lun =
+	    ctl_map_lun(io->io_hdr.nexus.targ_port, io->io_hdr.nexus.targ_lun);
 
 	switch (io->io_hdr.io_type) {
 	case CTL_IO_SCSI:
-		STAILQ_INSERT_TAIL(&ctl_softc->incoming_queue, &io->io_hdr,
-				   links);
-		break;
 	case CTL_IO_TASK:
-		STAILQ_INSERT_TAIL(&ctl_softc->task_queue, &io->io_hdr, links);
-		/*
-		 * Set the task pending flag.  This is necessary to close a
-		 * race condition with the FETD:
-		 *
-		 * - FETD submits a task management command, like an abort.
-		 * - Back end calls fe_datamove() to move the data for the
-		 *   aborted command.  The FETD can't really accept it, but
-		 *   if it did, it would end up transmitting data for a
-		 *   command that the initiator told us to abort.
-		 *
-		 * We close the race condition by setting the flag here,
-		 * and checking it in ctl_datamove(), before calling the
-		 * FETD's fe_datamove routine.  If we've got a task
-		 * pending, we run the task queue and then check to see
-		 * whether our particular I/O has been aborted.
-		 */
-		ctl_softc->flags |= CTL_FLAG_TASK_PENDING;
+		ctl_enqueue_incoming(io);
 		break;
 	default:
-		mtx_unlock(&ctl_softc->ctl_lock);
 		printf("ctl_queue: unknown I/O type %d\n", io->io_hdr.io_type);
-		return (-EINVAL);
-		break; /* NOTREACHED */
+		return (EINVAL);
 	}
-	mtx_unlock(&ctl_softc->ctl_lock);
-
-	ctl_wakeup_thread();
 
 	return (CTL_RETVAL_COMPLETE);
 }
@@ -13140,23 +13809,17 @@ ctl_done_timer_wakeup(void *arg)
 	union ctl_io *io;
 
 	io = (union ctl_io *)arg;
-	ctl_done_lock(io, /*have_lock*/ 0);
+	ctl_done(io);
 }
 #endif /* CTL_IO_DELAY */
 
 void
-ctl_done_lock(union ctl_io *io, int have_lock)
+ctl_done(union ctl_io *io)
 {
 	struct ctl_softc *ctl_softc;
-#ifndef CTL_DONE_THREAD
-	union ctl_io *xio;
-#endif /* !CTL_DONE_THREAD */
 
 	ctl_softc = control_softc;
 
-	if (have_lock == 0)
-		mtx_lock(&ctl_softc->ctl_lock);
-
 	/*
 	 * Enable this to catch duplicate completion issues.
 	 */
@@ -13187,11 +13850,8 @@ ctl_done_lock(union ctl_io *io, int have_lock)
 	 * This is an internal copy of an I/O, and should not go through
 	 * the normal done processing logic.
 	 */
-	if (io->io_hdr.flags & CTL_FLAG_INT_COPY) {
-		if (have_lock == 0)
-			mtx_unlock(&ctl_softc->ctl_lock);
+	if (io->io_hdr.flags & CTL_FLAG_INT_COPY)
 		return;
-	}
 
 	/*
 	 * We need to send a msg to the serializing shelf to finish the IO
@@ -13236,38 +13896,12 @@ ctl_done_lock(union ctl_io *io, int have_lock)
 				      ctl_done_timer_wakeup, io);
 			if (lun->delay_info.done_type == CTL_DELAY_TYPE_ONESHOT)
 				lun->delay_info.done_delay = 0;
-			if (have_lock == 0)
-				mtx_unlock(&ctl_softc->ctl_lock);
 			return;
 		}
 	}
 #endif /* CTL_IO_DELAY */
 
-	STAILQ_INSERT_TAIL(&ctl_softc->done_queue, &io->io_hdr, links);
-
-#ifdef CTL_DONE_THREAD
-	if (have_lock == 0)
-		mtx_unlock(&ctl_softc->ctl_lock);
-
-	ctl_wakeup_thread();
-#else /* CTL_DONE_THREAD */
-	for (xio = (union ctl_io *)STAILQ_FIRST(&ctl_softc->done_queue);
-	     xio != NULL;
-	     xio =(union ctl_io *)STAILQ_FIRST(&ctl_softc->done_queue)) {
-
-		STAILQ_REMOVE_HEAD(&ctl_softc->done_queue, links);
-
-		ctl_process_done(xio, /*have_lock*/ 1);
-	}
-	if (have_lock == 0)
-		mtx_unlock(&ctl_softc->ctl_lock);
-#endif /* CTL_DONE_THREAD */
-}
-
-void
-ctl_done(union ctl_io *io)
-{
-	ctl_done_lock(io, /*have_lock*/ 0);
+	ctl_enqueue_done(io);
 }
 
 int
@@ -13291,24 +13925,18 @@ ctl_isc(struct ctl_scsiio *ctsio)
 static void
 ctl_work_thread(void *arg)
 {
-	struct ctl_softc *softc;
+	struct ctl_thread *thr = (struct ctl_thread *)arg;
+	struct ctl_softc *softc = thr->ctl_softc;
 	union ctl_io *io;
-	struct ctl_be_lun *be_lun;
 	int retval;
 
 	CTL_DEBUG_PRINT(("ctl_work_thread starting\n"));
 
-	softc = (struct ctl_softc *)arg;
-	if (softc == NULL)
-		return;
-
-	mtx_lock(&softc->ctl_lock);
 	for (;;) {
 		retval = 0;
 
 		/*
 		 * We handle the queues in this order:
-		 * - task management
 		 * - ISC
 		 * - done queue (to free up resources, unblock other commands)
 		 * - RtR queue
@@ -13317,84 +13945,128 @@ ctl_work_thread(void *arg)
 		 * If those queues are empty, we break out of the loop and
 		 * go to sleep.
 		 */
-		io = (union ctl_io *)STAILQ_FIRST(&softc->task_queue);
+		mtx_lock(&thr->queue_lock);
+		io = (union ctl_io *)STAILQ_FIRST(&thr->isc_queue);
 		if (io != NULL) {
-			ctl_run_task_queue(softc);
-			continue;
-		}
-		io = (union ctl_io *)STAILQ_FIRST(&softc->isc_queue);
-		if (io != NULL) {
-			STAILQ_REMOVE_HEAD(&softc->isc_queue, links);
+			STAILQ_REMOVE_HEAD(&thr->isc_queue, links);
+			mtx_unlock(&thr->queue_lock);
 			ctl_handle_isc(io);
 			continue;
 		}
-		io = (union ctl_io *)STAILQ_FIRST(&softc->done_queue);
+		io = (union ctl_io *)STAILQ_FIRST(&thr->done_queue);
 		if (io != NULL) {
-			STAILQ_REMOVE_HEAD(&softc->done_queue, links);
+			STAILQ_REMOVE_HEAD(&thr->done_queue, links);
 			/* clear any blocked commands, call fe_done */
-			mtx_unlock(&softc->ctl_lock);
-			/*
-			 * XXX KDM
-			 * Call this without a lock for now.  This will
-			 * depend on whether there is any way the FETD can
-			 * sleep or deadlock if called with the CTL lock
-			 * held.
-			 */
-			retval = ctl_process_done(io, /*have_lock*/ 0);
-			mtx_lock(&softc->ctl_lock);
+			mtx_unlock(&thr->queue_lock);
+			retval = ctl_process_done(io);
+			continue;
+		}
+		io = (union ctl_io *)STAILQ_FIRST(&thr->incoming_queue);
+		if (io != NULL) {
+			STAILQ_REMOVE_HEAD(&thr->incoming_queue, links);
+			mtx_unlock(&thr->queue_lock);
+			if (io->io_hdr.io_type == CTL_IO_TASK)
+				ctl_run_task(io);
+			else
+				ctl_scsiio_precheck(softc, &io->scsiio);
 			continue;
 		}
 		if (!ctl_pause_rtr) {
-			io = (union ctl_io *)STAILQ_FIRST(&softc->rtr_queue);
+			io = (union ctl_io *)STAILQ_FIRST(&thr->rtr_queue);
 			if (io != NULL) {
-				STAILQ_REMOVE_HEAD(&softc->rtr_queue, links);
-				mtx_unlock(&softc->ctl_lock);
+				STAILQ_REMOVE_HEAD(&thr->rtr_queue, links);
+				mtx_unlock(&thr->queue_lock);
 				retval = ctl_scsiio(&io->scsiio);
 				if (retval != CTL_RETVAL_COMPLETE)
 					CTL_DEBUG_PRINT(("ctl_scsiio failed\n"));
-				mtx_lock(&softc->ctl_lock);
 				continue;
 			}
 		}
-		io = (union ctl_io *)STAILQ_FIRST(&softc->incoming_queue);
-		if (io != NULL) {
-			STAILQ_REMOVE_HEAD(&softc->incoming_queue, links);
-			mtx_unlock(&softc->ctl_lock);
-			ctl_scsiio_precheck(softc, &io->scsiio);
-			mtx_lock(&softc->ctl_lock);
-			continue;
-		}
-		/*
-		 * We might want to move this to a separate thread, so that
-		 * configuration requests (in this case LUN creations)
-		 * won't impact the I/O path.
-		 */
+
+		/* Sleep until we have something to do. */
+		mtx_sleep(thr, &thr->queue_lock, PDROP | PRIBIO, "-", 0);
+	}
+}
+
+static void
+ctl_lun_thread(void *arg)
+{
+	struct ctl_softc *softc = (struct ctl_softc *)arg;
+	struct ctl_be_lun *be_lun;
+	int retval;
+
+	CTL_DEBUG_PRINT(("ctl_lun_thread starting\n"));
+
+	for (;;) {
+		retval = 0;
+		mtx_lock(&softc->ctl_lock);
 		be_lun = STAILQ_FIRST(&softc->pending_lun_queue);
 		if (be_lun != NULL) {
 			STAILQ_REMOVE_HEAD(&softc->pending_lun_queue, links);
 			mtx_unlock(&softc->ctl_lock);
 			ctl_create_lun(be_lun);
-			mtx_lock(&softc->ctl_lock);
 			continue;
 		}
 
-		/* XXX KDM use the PDROP flag?? */
 		/* Sleep until we have something to do. */
-		mtx_sleep(softc, &softc->ctl_lock, PRIBIO, "-", 0);
-
-		/* Back to the top of the loop to see what woke us up. */
-		continue;
+		mtx_sleep(&softc->pending_lun_queue, &softc->ctl_lock,
+		    PDROP | PRIBIO, "-", 0);
 	}
 }
 
-void
-ctl_wakeup_thread()
+static void
+ctl_enqueue_incoming(union ctl_io *io)
 {
-	struct ctl_softc *softc;
+	struct ctl_softc *softc = control_softc;
+	struct ctl_thread *thr;
+	u_int idx;
 
-	softc = control_softc;
+	idx = (io->io_hdr.nexus.targ_port * 127 +
+	       io->io_hdr.nexus.initid.id) % worker_threads;
+	thr = &softc->threads[idx];
+	mtx_lock(&thr->queue_lock);
+	STAILQ_INSERT_TAIL(&thr->incoming_queue, &io->io_hdr, links);
+	mtx_unlock(&thr->queue_lock);
+	wakeup(thr);
+}
 
-	wakeup_one(softc);
+static void
+ctl_enqueue_rtr(union ctl_io *io)
+{
+	struct ctl_softc *softc = control_softc;
+	struct ctl_thread *thr;
+
+	thr = &softc->threads[io->io_hdr.nexus.targ_mapped_lun % worker_threads];
+	mtx_lock(&thr->queue_lock);
+	STAILQ_INSERT_TAIL(&thr->rtr_queue, &io->io_hdr, links);
+	mtx_unlock(&thr->queue_lock);
+	wakeup(thr);
+}
+
+static void
+ctl_enqueue_done(union ctl_io *io)
+{
+	struct ctl_softc *softc = control_softc;
+	struct ctl_thread *thr;
+
+	thr = &softc->threads[io->io_hdr.nexus.targ_mapped_lun % worker_threads];
+	mtx_lock(&thr->queue_lock);
+	STAILQ_INSERT_TAIL(&thr->done_queue, &io->io_hdr, links);
+	mtx_unlock(&thr->queue_lock);
+	wakeup(thr);
+}
+
+static void
+ctl_enqueue_isc(union ctl_io *io)
+{
+	struct ctl_softc *softc = control_softc;
+	struct ctl_thread *thr;
+
+	thr = &softc->threads[io->io_hdr.nexus.targ_mapped_lun % worker_threads];
+	mtx_lock(&thr->queue_lock);
+	STAILQ_INSERT_TAIL(&thr->isc_queue, &io->io_hdr, links);
+	mtx_unlock(&thr->queue_lock);
+	wakeup(thr);
 }
 
 /* Initialization and failover */
diff --git a/sys/cam/ctl/ctl.h b/sys/cam/ctl/ctl.h
index 07c82bac1bf5..0525a51d24a2 100644
--- a/sys/cam/ctl/ctl.h
+++ b/sys/cam/ctl/ctl.h
@@ -53,6 +53,7 @@ typedef enum {
 	CTL_PORT_IOCTL		= 0x04,
 	CTL_PORT_INTERNAL	= 0x08,
 	CTL_PORT_ISCSI		= 0x10,
+	CTL_PORT_SAS		= 0x20,
 	CTL_PORT_ALL		= 0xff,
 	CTL_PORT_ISC		= 0x100 // FC port for inter-shelf communication
 } ctl_port_type;
@@ -96,12 +97,15 @@ union ctl_modepage_info {
 /*
  * Device ID length, for VPD page 0x83.
  */
-#define	CTL_DEVID_LEN	16
+#define	CTL_DEVID_LEN	64
+#define	CTL_DEVID_MIN_LEN	16
 /*
  * WWPN length, for VPD page 0x83.
  */
 #define CTL_WWPN_LEN   8
 
+#define	CTL_DRIVER_NAME_LEN	32
+
 /*
  * Unit attention types. ASC/ASCQ values for these should be placed in
  * ctl_build_ua.  These are also listed in order of reporting priority.
@@ -112,38 +116,24 @@ typedef enum {
 	CTL_UA_POWERON		= 0x0001,
 	CTL_UA_BUS_RESET	= 0x0002,
 	CTL_UA_TARG_RESET	= 0x0004,
-	CTL_UA_LUN_RESET	= 0x0008,
-	CTL_UA_LUN_CHANGE	= 0x0010,
-	CTL_UA_MODE_CHANGE	= 0x0020,
-	CTL_UA_LOG_CHANGE	= 0x0040,
-	CTL_UA_LVD		= 0x0080,
-	CTL_UA_SE		= 0x0100,
-	CTL_UA_RES_PREEMPT	= 0x0200,
-	CTL_UA_RES_RELEASE	= 0x0400,
-	CTL_UA_REG_PREEMPT  	= 0x0800,
-	CTL_UA_ASYM_ACC_CHANGE  = 0x1000,
-	CTL_UA_CAPACITY_CHANGED = 0x2000
+	CTL_UA_I_T_NEXUS_LOSS	= 0x0008,
+	CTL_UA_LUN_RESET	= 0x0010,
+	CTL_UA_LUN_CHANGE	= 0x0020,
+	CTL_UA_MODE_CHANGE	= 0x0030,
+	CTL_UA_LOG_CHANGE	= 0x0080,
+	CTL_UA_LVD		= 0x0100,
+	CTL_UA_SE		= 0x0200,
+	CTL_UA_RES_PREEMPT	= 0x0400,
+	CTL_UA_RES_RELEASE	= 0x0800,
+	CTL_UA_REG_PREEMPT  	= 0x1000,
+	CTL_UA_ASYM_ACC_CHANGE  = 0x2000,
+	CTL_UA_CAPACITY_CHANGED = 0x4000
 } ctl_ua_type;
 
 #ifdef	_KERNEL
 
 MALLOC_DECLARE(M_CTL);
 
-typedef enum {
-	CTL_THREAD_NONE		= 0x00,
-	CTL_THREAD_WAKEUP	= 0x01
-} ctl_thread_flags;
-
-struct ctl_thread {
-	void			(*thread_func)(void *arg);
-	void			*arg;
-	struct cv		wait_queue;
-	const char		*thread_name;
-	ctl_thread_flags	thread_flags;
-	struct completion	*thread_event;
-	struct task_struct	*task;
-};
-
 struct ctl_page_index;
 
 #ifdef SYSCTL_DECL	/* from sysctl.h */
@@ -195,20 +185,27 @@ int ctl_debugconf_sp_select_handler(struct ctl_scsiio *ctsio,
 int ctl_config_move_done(union ctl_io *io);
 void ctl_datamove(union ctl_io *io);
 void ctl_done(union ctl_io *io);
+void ctl_data_submit_done(union ctl_io *io);
 void ctl_config_write_done(union ctl_io *io);
-#if 0
-int ctl_thread(void *arg);
-#endif
-void ctl_wakeup_thread(void);
-#if 0
-struct ctl_thread *ctl_create_thread(void (*thread_func)
-	(void *thread_arg), void *thread_arg, const char *thread_name);
-void ctl_signal_thread(struct ctl_thread *thread);
-void ctl_shutdown_thread(struct ctl_thread *thread);
-#endif
 void ctl_portDB_changed(int portnum);
 void ctl_init_isc_msg(void);
 
+/*
+ * KPI to manipulate LUN/port options
+ */
+
+struct ctl_option {
+	STAILQ_ENTRY(ctl_option)	links;
+	char			*name;
+	char			*value;
+};
+typedef STAILQ_HEAD(ctl_options, ctl_option) ctl_options_t;
+
+struct ctl_be_arg;
+void ctl_init_opts(ctl_options_t *opts, int num_args, struct ctl_be_arg *args);
+void ctl_free_opts(ctl_options_t *opts);
+char * ctl_get_opt(ctl_options_t *opts, const char *name);
+
 #endif	/* _KERNEL */
 
 #endif	/* _CTL_H_ */
diff --git a/sys/cam/ctl/ctl_backend.c b/sys/cam/ctl/ctl_backend.c
index 5234c4a32076..0e1a76c5d970 100644
--- a/sys/cam/ctl/ctl_backend.c
+++ b/sys/cam/ctl/ctl_backend.c
@@ -173,6 +173,49 @@ ctl_backend_find(char *backend_name)
 	return (NULL);
 }
 
-/*
- * vim: ts=8
- */
+void
+ctl_init_opts(ctl_options_t *opts, int num_args, struct ctl_be_arg *args)
+{
+	struct ctl_option *opt;
+	int i;
+
+	STAILQ_INIT(opts);
+	for (i = 0; i < num_args; i++) {
+		if ((args[i].flags & CTL_BEARG_RD) == 0)
+			continue;
+		if ((args[i].flags & CTL_BEARG_ASCII) == 0)
+			continue;
+		opt = malloc(sizeof(*opt), M_CTL, M_WAITOK);
+		opt->name = malloc(strlen(args[i].kname) + 1, M_CTL, M_WAITOK);
+		strcpy(opt->name, args[i].kname);
+		opt->value = malloc(strlen(args[i].kvalue) + 1, M_CTL, M_WAITOK);
+		strcpy(opt->value, args[i].kvalue);
+		STAILQ_INSERT_TAIL(opts, opt, links);
+	}
+}
+
+void
+ctl_free_opts(ctl_options_t *opts)
+{
+	struct ctl_option *opt;
+
+	while ((opt = STAILQ_FIRST(opts)) != NULL) {
+		STAILQ_REMOVE_HEAD(opts, links);
+		free(opt->name, M_CTL);
+		free(opt->value, M_CTL);
+		free(opt, M_CTL);
+	}
+}
+
+char *
+ctl_get_opt(ctl_options_t *opts, const char *name)
+{
+	struct ctl_option *opt;
+
+	STAILQ_FOREACH(opt, opts, links) {
+		if (strcmp(opt->name, name) == 0) {
+			return (opt->value);
+		}
+	}
+	return (NULL);
+}
diff --git a/sys/cam/ctl/ctl_backend.h b/sys/cam/ctl/ctl_backend.h
index ad93119afc97..c2066c527466 100644
--- a/sys/cam/ctl/ctl_backend.h
+++ b/sys/cam/ctl/ctl_backend.h
@@ -180,12 +180,6 @@ typedef void (*be_lun_config_t)(void *be_lun,
  * The links field is for CTL internal use only, and should not be used by
  * the backend.
  */
-struct ctl_be_lun_option {
-	STAILQ_ENTRY(ctl_be_lun_option)	links;
-	char			*name;
-	char			*value;
-};
-
 struct ctl_be_lun {
 	uint8_t			lun_type;	/* passed to CTL */
 	ctl_backend_lun_flags	flags;		/* passed to CTL */
@@ -202,7 +196,7 @@ struct ctl_be_lun {
 	be_lun_config_t		lun_config_status; /* passed to CTL */
 	struct ctl_backend_driver *be;		/* passed to CTL */
 	void			*ctl_lun;	/* used by CTL */
-	STAILQ_HEAD(, ctl_be_lun_option) options; /* passed to CTL */
+	ctl_options_t		options;	/* passed to CTL */
 	STAILQ_ENTRY(ctl_be_lun) links;		/* used by CTL */
 };
 
diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c
index 4856b45cd155..1fe4874a0f76 100644
--- a/sys/cam/ctl/ctl_backend_block.c
+++ b/sys/cam/ctl/ctl_backend_block.c
@@ -92,9 +92,11 @@ __FBSDID("$FreeBSD$");
  * The idea here is that we'll allocate enough S/G space to hold a 1MB
  * I/O.  If we get an I/O larger than that, we'll split it.
  */
-#define	CTLBLK_MAX_IO_SIZE	(1024 * 1024)
+#define	CTLBLK_HALF_IO_SIZE	(512 * 1024)
+#define	CTLBLK_MAX_IO_SIZE	(CTLBLK_HALF_IO_SIZE * 2)
 #define	CTLBLK_MAX_SEG		MAXPHYS
-#define	CTLBLK_MAX_SEGS		MAX(CTLBLK_MAX_IO_SIZE / CTLBLK_MAX_SEG, 1)
+#define	CTLBLK_HALF_SEGS	MAX(CTLBLK_HALF_IO_SIZE / CTLBLK_MAX_SEG, 1)
+#define	CTLBLK_MAX_SEGS		(CTLBLK_HALF_SEGS * 2)
 
 #ifdef CTLBLK_DEBUG
 #define DPRINTF(fmt, args...) \
@@ -103,6 +105,11 @@ __FBSDID("$FreeBSD$");
 #define DPRINTF(fmt, args...) do {} while(0)
 #endif
 
+#define PRIV(io)	\
+    ((struct ctl_ptr_len_flags *)&(io)->io_hdr.ctl_private[CTL_PRIV_BACKEND])
+#define ARGS(io)	\
+    ((struct ctl_lba_len_flags *)&(io)->io_hdr.ctl_private[CTL_PRIV_LBA_LEN])
+
 SDT_PROVIDER_DEFINE(cbb);
 
 typedef enum {
@@ -153,7 +160,6 @@ struct ctl_be_block_lun {
 	cbb_dispatch_t dispatch;
 	cbb_dispatch_t lun_flush;
 	cbb_dispatch_t unmap;
-	struct mtx lock;
 	uma_zone_t lun_zone;
 	uint64_t size_blocks;
 	uint64_t size_bytes;
@@ -172,6 +178,8 @@ struct ctl_be_block_lun {
 	STAILQ_HEAD(, ctl_io_hdr) input_queue;
 	STAILQ_HEAD(, ctl_io_hdr) config_write_queue;
 	STAILQ_HEAD(, ctl_io_hdr) datamove_queue;
+	struct mtx_padalign io_lock;
+	struct mtx_padalign queue_lock;
 };
 
 /*
@@ -212,10 +220,9 @@ struct ctl_be_block_io {
 };
 
 static int cbb_num_threads = 14;
-TUNABLE_INT("kern.cam.ctl.block.num_threads", &cbb_num_threads);
 SYSCTL_NODE(_kern_cam_ctl, OID_AUTO, block, CTLFLAG_RD, 0,
 	    "CAM Target Layer Block Backend");
-SYSCTL_INT(_kern_cam_ctl_block, OID_AUTO, num_threads, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_ctl_block, OID_AUTO, num_threads, CTLFLAG_RWTUN,
            &cbb_num_threads, 0, "Number of threads per backing file");
 
 static struct ctl_be_block_io *ctl_alloc_beio(struct ctl_be_block_softc *softc);
@@ -309,6 +316,13 @@ ctl_free_beio(struct ctl_be_block_io *beio)
 
 		uma_zfree(beio->lun->lun_zone, beio->sg_segs[i].addr);
 		beio->sg_segs[i].addr = NULL;
+
+		/* For compare we had two equal S/G lists. */
+		if (ARGS(beio->io)->flags & CTL_LLF_COMPARE) {
+			uma_zfree(beio->lun->lun_zone,
+			    beio->sg_segs[i + CTLBLK_HALF_SEGS].addr);
+			beio->sg_segs[i + CTLBLK_HALF_SEGS].addr = NULL;
+		}
 	}
 
 	if (duplicate_free > 0) {
@@ -322,28 +336,13 @@ ctl_free_beio(struct ctl_be_block_io *beio)
 static void
 ctl_complete_beio(struct ctl_be_block_io *beio)
 {
-	union ctl_io *io;
-	int io_len;
-
-	io = beio->io;
-
-	if ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_SUCCESS)
-		io_len = beio->io_len;
-	else
-		io_len = 0;
-
-	devstat_end_transaction(beio->lun->disk_stats,
-				/*bytes*/ io_len,
-				beio->ds_tag_type,
-				beio->ds_trans_type,
-				/*now*/ NULL,
-				/*then*/&beio->ds_t0);
+	union ctl_io *io = beio->io;
 
 	if (beio->beio_cont != NULL) {
 		beio->beio_cont(beio);
 	} else {
 		ctl_free_beio(beio);
-		ctl_done(io);
+		ctl_data_submit_done(io);
 	}
 }
 
@@ -352,13 +351,13 @@ ctl_be_block_move_done(union ctl_io *io)
 {
 	struct ctl_be_block_io *beio;
 	struct ctl_be_block_lun *be_lun;
+	struct ctl_lba_len_flags *lbalen;
 #ifdef CTL_TIME_IO
 	struct bintime cur_bt;
-#endif  
-
-	beio = (struct ctl_be_block_io *)
-		io->io_hdr.ctl_private[CTL_PRIV_BACKEND].ptr;
+#endif
+	int i;
 
+	beio = (struct ctl_be_block_io *)PRIV(io)->ptr;
 	be_lun = beio->lun;
 
 	DPRINTF("entered\n");
@@ -369,16 +368,37 @@ ctl_be_block_move_done(union ctl_io *io)
 	bintime_add(&io->io_hdr.dma_bt, &cur_bt);
 	io->io_hdr.num_dmas++;
 #endif  
+	io->scsiio.kern_rel_offset += io->scsiio.kern_data_len;
 
 	/*
 	 * We set status at this point for read commands, and write
 	 * commands with errors.
 	 */
-	if ((beio->bio_cmd == BIO_READ)
-	 && (io->io_hdr.port_status == 0)
-	 && ((io->io_hdr.flags & CTL_FLAG_ABORT) == 0)
-	 && ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_STATUS_NONE))
-		ctl_set_success(&io->scsiio);
+	if ((io->io_hdr.port_status == 0) &&
+	    ((io->io_hdr.flags & CTL_FLAG_ABORT) == 0) &&
+	    ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_STATUS_NONE)) {
+		lbalen = ARGS(beio->io);
+		if (lbalen->flags & CTL_LLF_READ) {
+			ctl_set_success(&io->scsiio);
+		} else if (lbalen->flags & CTL_LLF_COMPARE) {
+			/* We have two data blocks ready for comparison. */
+			for (i = 0; i < beio->num_segs; i++) {
+				if (memcmp(beio->sg_segs[i].addr,
+				    beio->sg_segs[i + CTLBLK_HALF_SEGS].addr,
+				    beio->sg_segs[i].len) != 0)
+					break;
+			}
+			if (i < beio->num_segs)
+				ctl_set_sense(&io->scsiio,
+				    /*current_error*/ 1,
+				    /*sense_key*/ SSD_KEY_MISCOMPARE,
+				    /*asc*/ 0x1D,
+				    /*ascq*/ 0x00,
+				    SSD_ELEM_NONE);
+			else
+				ctl_set_success(&io->scsiio);
+		}
+	}
 	else if ((io->io_hdr.port_status != 0)
 	      && ((io->io_hdr.flags & CTL_FLAG_ABORT) == 0)
 	      && ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_STATUS_NONE)) {
@@ -414,14 +434,14 @@ ctl_be_block_move_done(union ctl_io *io)
 	 * This move done routine is generally called in the SIM's
 	 * interrupt context, and therefore we cannot block.
 	 */
-	mtx_lock(&be_lun->lock);
+	mtx_lock(&be_lun->queue_lock);
 	/*
 	 * XXX KDM make sure that links is okay to use at this point.
 	 * Otherwise, we either need to add another field to ctl_io_hdr,
 	 * or deal with resource allocation here.
 	 */
 	STAILQ_INSERT_TAIL(&be_lun->datamove_queue, &io->io_hdr, links);
-	mtx_unlock(&be_lun->lock);
+	mtx_unlock(&be_lun->queue_lock);
 
 	taskqueue_enqueue(be_lun->io_taskqueue, &be_lun->io_task);
 
@@ -443,7 +463,7 @@ ctl_be_block_biodone(struct bio *bio)
 	DPRINTF("entered\n");
 
 	error = bio->bio_error;
-	mtx_lock(&be_lun->lock);
+	mtx_lock(&be_lun->io_lock);
 	if (error != 0)
 		beio->num_errors++;
 
@@ -461,7 +481,7 @@ ctl_be_block_biodone(struct bio *bio)
 	 */
 	if ((beio->send_complete == 0)
 	 || (beio->num_bios_done < beio->num_bios_sent)) {
-		mtx_unlock(&be_lun->lock);
+		mtx_unlock(&be_lun->io_lock);
 		return;
 	}
 
@@ -469,7 +489,10 @@ ctl_be_block_biodone(struct bio *bio)
 	 * At this point, we've verified that we are the last I/O to
 	 * complete, so it's safe to drop the lock.
 	 */
-	mtx_unlock(&be_lun->lock);
+	devstat_end_transaction(beio->lun->disk_stats, beio->io_len,
+	    beio->ds_tag_type, beio->ds_trans_type,
+	    /*now*/ NULL, /*then*/&beio->ds_t0);
+	mtx_unlock(&be_lun->io_lock);
 
 	/*
 	 * If there are any errors from the backing device, we fail the
@@ -490,12 +513,13 @@ ctl_be_block_biodone(struct bio *bio)
 	}
 
 	/*
-	 * If this is a write, a flush or a delete, we're all done.
+	 * If this is a write, a flush, a delete or verify, we're all done.
 	 * If this is a read, we can now send the data to the user.
 	 */
 	if ((beio->bio_cmd == BIO_WRITE)
 	 || (beio->bio_cmd == BIO_FLUSH)
-	 || (beio->bio_cmd == BIO_DELETE)) {
+	 || (beio->bio_cmd == BIO_DELETE)
+	 || (ARGS(io)->flags & CTL_LLF_VERIFY)) {
 		ctl_set_success(&io->scsiio);
 		ctl_complete_beio(beio);
 	} else {
@@ -510,15 +534,18 @@ static void
 ctl_be_block_flush_file(struct ctl_be_block_lun *be_lun,
 			struct ctl_be_block_io *beio)
 {
-	union ctl_io *io;
+	union ctl_io *io = beio->io;
 	struct mount *mountpoint;
 	int error, lock_flags;
 
 	DPRINTF("entered\n");
 
-	io = beio->io;
+	binuptime(&beio->ds_t0);
+	mtx_lock(&be_lun->io_lock);
+	devstat_start_transaction(beio->lun->disk_stats, &beio->ds_t0);
+	mtx_unlock(&be_lun->io_lock);
 
-       	(void) vn_start_write(be_lun->vn, &mountpoint, V_WAIT);
+	(void) vn_start_write(be_lun->vn, &mountpoint, V_WAIT);
 
 	if (MNT_SHARED_WRITES(mountpoint)
 	 || ((mountpoint == NULL)
@@ -529,14 +556,17 @@ ctl_be_block_flush_file(struct ctl_be_block_lun *be_lun,
 
 	vn_lock(be_lun->vn, lock_flags | LK_RETRY);
 
-	binuptime(&beio->ds_t0);
-	devstat_start_transaction(beio->lun->disk_stats, &beio->ds_t0);
-
 	error = VOP_FSYNC(be_lun->vn, MNT_WAIT, curthread);
 	VOP_UNLOCK(be_lun->vn, 0);
 
 	vn_finished_write(mountpoint);
 
+	mtx_lock(&be_lun->io_lock);
+	devstat_end_transaction(beio->lun->disk_stats, beio->io_len,
+	    beio->ds_tag_type, beio->ds_trans_type,
+	    /*now*/ NULL, /*then*/&beio->ds_t0);
+	mtx_unlock(&be_lun->io_lock);
+
 	if (error == 0)
 		ctl_set_success(&io->scsiio);
 	else {
@@ -571,18 +601,14 @@ ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun,
 	io = beio->io;
 	flags = beio->bio_flags;
 
+	bzero(&xuio, sizeof(xuio));
 	if (beio->bio_cmd == BIO_READ) {
 		SDT_PROBE(cbb, kernel, read, file_start, 0, 0, 0, 0, 0);
+		xuio.uio_rw = UIO_READ;
 	} else {
 		SDT_PROBE(cbb, kernel, write, file_start, 0, 0, 0, 0, 0);
-	}
-
-	bzero(&xuio, sizeof(xuio));
-	if (beio->bio_cmd == BIO_READ)
-		xuio.uio_rw = UIO_READ;
-	else
 		xuio.uio_rw = UIO_WRITE;
-
+	}
 	xuio.uio_offset = beio->io_offset;
 	xuio.uio_resid = beio->io_len;
 	xuio.uio_segflg = UIO_SYSSPACE;
@@ -595,12 +621,14 @@ ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun,
 		xiovec->iov_len = beio->sg_segs[i].len;
 	}
 
+	binuptime(&beio->ds_t0);
+	mtx_lock(&be_lun->io_lock);
+	devstat_start_transaction(beio->lun->disk_stats, &beio->ds_t0);
+	mtx_unlock(&be_lun->io_lock);
+
 	if (beio->bio_cmd == BIO_READ) {
 		vn_lock(be_lun->vn, LK_SHARED | LK_RETRY);
 
-		binuptime(&beio->ds_t0);
-		devstat_start_transaction(beio->lun->disk_stats, &beio->ds_t0);
-
 		/*
 		 * UFS pays attention to IO_DIRECT for reads.  If the
 		 * DIRECTIO option is configured into the kernel, it calls
@@ -625,6 +653,7 @@ ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun,
 				 (IO_DIRECT|IO_SYNC) : 0, file_data->cred);
 
 		VOP_UNLOCK(be_lun->vn, 0);
+		SDT_PROBE(cbb, kernel, read, file_done, 0, 0, 0, 0, 0);
 	} else {
 		struct mount *mountpoint;
 		int lock_flags;
@@ -640,9 +669,6 @@ ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun,
 
 		vn_lock(be_lun->vn, lock_flags | LK_RETRY);
 
-		binuptime(&beio->ds_t0);
-		devstat_start_transaction(beio->lun->disk_stats, &beio->ds_t0);
-
 		/*
 		 * UFS pays attention to IO_DIRECT for writes.  The write
 		 * is done asynchronously.  (Normally the write would just
@@ -666,8 +692,15 @@ ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun,
 		VOP_UNLOCK(be_lun->vn, 0);
 
 		vn_finished_write(mountpoint);
+		SDT_PROBE(cbb, kernel, write, file_done, 0, 0, 0, 0, 0);
         }
 
+	mtx_lock(&be_lun->io_lock);
+	devstat_end_transaction(beio->lun->disk_stats, beio->io_len,
+	    beio->ds_tag_type, beio->ds_trans_type,
+	    /*now*/ NULL, /*then*/&beio->ds_t0);
+	mtx_unlock(&be_lun->io_lock);
+
 	/*
 	 * If we got an error, set the sense data to "MEDIUM ERROR" and
 	 * return the I/O to the user.
@@ -689,15 +722,96 @@ ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun,
 	}
 
 	/*
-	 * If this is a write, we're all done.
+	 * If this is a write or a verify, we're all done.
 	 * If this is a read, we can now send the data to the user.
 	 */
-	if (beio->bio_cmd == BIO_WRITE) {
+	if ((beio->bio_cmd == BIO_WRITE) ||
+	    (ARGS(io)->flags & CTL_LLF_VERIFY)) {
 		ctl_set_success(&io->scsiio);
-		SDT_PROBE(cbb, kernel, write, file_done, 0, 0, 0, 0, 0);
 		ctl_complete_beio(beio);
 	} else {
+#ifdef CTL_TIME_IO
+        	getbintime(&io->io_hdr.dma_start_bt);
+#endif  
+		ctl_datamove(io);
+	}
+}
+
+static void
+ctl_be_block_dispatch_zvol(struct ctl_be_block_lun *be_lun,
+			   struct ctl_be_block_io *beio)
+{
+	struct ctl_be_block_devdata *dev_data;
+	union ctl_io *io;
+	struct uio xuio;
+	struct iovec *xiovec;
+	int flags;
+	int error, i;
+
+	DPRINTF("entered\n");
+
+	dev_data = &be_lun->backend.dev;
+	io = beio->io;
+	flags = beio->bio_flags;
+
+	bzero(&xuio, sizeof(xuio));
+	if (beio->bio_cmd == BIO_READ) {
+		SDT_PROBE(cbb, kernel, read, file_start, 0, 0, 0, 0, 0);
+		xuio.uio_rw = UIO_READ;
+	} else {
+		SDT_PROBE(cbb, kernel, write, file_start, 0, 0, 0, 0, 0);
+		xuio.uio_rw = UIO_WRITE;
+	}
+	xuio.uio_offset = beio->io_offset;
+	xuio.uio_resid = beio->io_len;
+	xuio.uio_segflg = UIO_SYSSPACE;
+	xuio.uio_iov = beio->xiovecs;
+	xuio.uio_iovcnt = beio->num_segs;
+	xuio.uio_td = curthread;
+
+	for (i = 0, xiovec = xuio.uio_iov; i < xuio.uio_iovcnt; i++, xiovec++) {
+		xiovec->iov_base = beio->sg_segs[i].addr;
+		xiovec->iov_len = beio->sg_segs[i].len;
+	}
+
+	binuptime(&beio->ds_t0);
+	mtx_lock(&be_lun->io_lock);
+	devstat_start_transaction(beio->lun->disk_stats, &beio->ds_t0);
+	mtx_unlock(&be_lun->io_lock);
+
+	if (beio->bio_cmd == BIO_READ) {
+		error = (*dev_data->csw->d_read)(dev_data->cdev, &xuio, 0);
 		SDT_PROBE(cbb, kernel, read, file_done, 0, 0, 0, 0, 0);
+	} else {
+		error = (*dev_data->csw->d_write)(dev_data->cdev, &xuio, 0);
+		SDT_PROBE(cbb, kernel, write, file_done, 0, 0, 0, 0, 0);
+	}
+
+	mtx_lock(&be_lun->io_lock);
+	devstat_end_transaction(beio->lun->disk_stats, beio->io_len,
+	    beio->ds_tag_type, beio->ds_trans_type,
+	    /*now*/ NULL, /*then*/&beio->ds_t0);
+	mtx_unlock(&be_lun->io_lock);
+
+	/*
+	 * If we got an error, set the sense data to "MEDIUM ERROR" and
+	 * return the I/O to the user.
+	 */
+	if (error != 0) {
+		ctl_set_medium_error(&io->scsiio);
+		ctl_complete_beio(beio);
+		return;
+	}
+
+	/*
+	 * If this is a write or a verify, we're all done.
+	 * If this is a read, we can now send the data to the user.
+	 */
+	if ((beio->bio_cmd == BIO_WRITE) ||
+	    (ARGS(io)->flags & CTL_LLF_VERIFY)) {
+		ctl_set_success(&io->scsiio);
+		ctl_complete_beio(beio);
+	} else {
 #ifdef CTL_TIME_IO
         	getbintime(&io->io_hdr.dma_start_bt);
 #endif  
@@ -739,7 +853,9 @@ ctl_be_block_flush_dev(struct ctl_be_block_lun *be_lun,
 	beio->send_complete = 1;
 
 	binuptime(&beio->ds_t0);
+	mtx_lock(&be_lun->io_lock);
 	devstat_start_transaction(be_lun->disk_stats, &beio->ds_t0);
+	mtx_unlock(&be_lun->io_lock);
 
 	(*dev_data->csw->d_strategy)(bio);
 }
@@ -770,11 +886,11 @@ ctl_be_block_unmap_dev_range(struct ctl_be_block_lun *be_lun,
 		off += bio->bio_length;
 		len -= bio->bio_length;
 
-		mtx_lock(&be_lun->lock);
+		mtx_lock(&be_lun->io_lock);
 		beio->num_bios_sent++;
 		if (last && len == 0)
 			beio->send_complete = 1;
-		mtx_unlock(&be_lun->lock);
+		mtx_unlock(&be_lun->io_lock);
 
 		(*dev_data->csw->d_strategy)(bio);
 	}
@@ -786,7 +902,7 @@ ctl_be_block_unmap_dev(struct ctl_be_block_lun *be_lun,
 {
 	union ctl_io *io;
 	struct ctl_be_block_devdata *dev_data;
-	struct ctl_ptr_len_flags ptrlen;
+	struct ctl_ptr_len_flags *ptrlen;
 	struct scsi_unmap_desc *buf, *end;
 	uint64_t len;
 
@@ -796,14 +912,15 @@ ctl_be_block_unmap_dev(struct ctl_be_block_lun *be_lun,
 	DPRINTF("entered\n");
 
 	binuptime(&beio->ds_t0);
+	mtx_lock(&be_lun->io_lock);
 	devstat_start_transaction(be_lun->disk_stats, &beio->ds_t0);
+	mtx_unlock(&be_lun->io_lock);
 
 	if (beio->io_offset == -1) {
 		beio->io_len = 0;
-		memcpy(&ptrlen, io->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes,
-		       sizeof(ptrlen));
-		buf = (struct scsi_unmap_desc *)ptrlen.ptr;
-		end = buf + ptrlen.len / sizeof(*buf);
+		ptrlen = (struct ctl_ptr_len_flags *)&io->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
+		buf = (struct scsi_unmap_desc *)ptrlen->ptr;
+		end = buf + ptrlen->len / sizeof(*buf);
 		for (; buf < end; buf++) {
 			len = (uint64_t)scsi_4btoul(buf->length) *
 			    be_lun->blocksize;
@@ -821,6 +938,7 @@ static void
 ctl_be_block_dispatch_dev(struct ctl_be_block_lun *be_lun,
 			  struct ctl_be_block_io *beio)
 {
+	TAILQ_HEAD(, bio) queue = TAILQ_HEAD_INITIALIZER(queue);
 	int i;
 	struct bio *bio;
 	struct ctl_be_block_devdata *dev_data;
@@ -841,14 +959,6 @@ ctl_be_block_dispatch_dev(struct ctl_be_block_lun *be_lun,
 		max_iosize = DFLTPHYS;
 
 	cur_offset = beio->io_offset;
-
-	/*
-	 * XXX KDM need to accurately reflect the number of I/Os outstanding
-	 * to a device.
-	 */
-	binuptime(&beio->ds_t0);
-	devstat_start_transaction(be_lun->disk_stats, &beio->ds_t0);
-
 	for (i = 0; i < beio->num_segs; i++) {
 		size_t cur_size;
 		uint8_t *cur_ptr;
@@ -876,32 +986,23 @@ ctl_be_block_dispatch_dev(struct ctl_be_block_lun *be_lun,
 			cur_ptr += bio->bio_length;
 			cur_size -= bio->bio_length;
 
-			/*
-			 * Make sure we set the complete bit just before we
-			 * issue the last bio so we don't wind up with a
-			 * race.
-			 *
-			 * Use the LUN mutex here instead of a combination
-			 * of atomic variables for simplicity.
-			 *
-			 * XXX KDM we could have a per-IO lock, but that
-			 * would cause additional per-IO setup and teardown
-			 * overhead.  Hopefully there won't be too much
-			 * contention on the LUN lock.
-			 */
-			mtx_lock(&be_lun->lock);
-
+			TAILQ_INSERT_TAIL(&queue, bio, bio_queue);
 			beio->num_bios_sent++;
-
-			if ((i == beio->num_segs - 1)
-			 && (cur_size == 0))
-				beio->send_complete = 1;
-
-			mtx_unlock(&be_lun->lock);
-
-			(*dev_data->csw->d_strategy)(bio);
 		}
 	}
+	binuptime(&beio->ds_t0);
+	mtx_lock(&be_lun->io_lock);
+	devstat_start_transaction(be_lun->disk_stats, &beio->ds_t0);
+	beio->send_complete = 1;
+	mtx_unlock(&be_lun->io_lock);
+
+	/*
+	 * Fire off all allocated requests!
+	 */
+	while ((bio = TAILQ_FIRST(&queue)) != NULL) {
+		TAILQ_REMOVE(&queue, bio, bio_queue);
+		(*dev_data->csw->d_strategy)(bio);
+	}
 }
 
 static void
@@ -911,8 +1012,9 @@ ctl_be_block_cw_done_ws(struct ctl_be_block_io *beio)
 
 	io = beio->io;
 	ctl_free_beio(beio);
-	if (((io->io_hdr.status & CTL_STATUS_MASK) != CTL_STATUS_NONE)
-	  && ((io->io_hdr.status & CTL_STATUS_MASK) != CTL_SUCCESS)) {
+	if ((io->io_hdr.flags & CTL_FLAG_ABORT) ||
+	    ((io->io_hdr.status & CTL_STATUS_MASK) != CTL_STATUS_NONE &&
+	     (io->io_hdr.status & CTL_STATUS_MASK) != CTL_SUCCESS)) {
 		ctl_config_write_done(io);
 		return;
 	}
@@ -926,20 +1028,19 @@ ctl_be_block_cw_dispatch_ws(struct ctl_be_block_lun *be_lun,
 {
 	struct ctl_be_block_io *beio;
 	struct ctl_be_block_softc *softc;
-	struct ctl_lba_len_flags lbalen;
+	struct ctl_lba_len_flags *lbalen;
 	uint64_t len_left, lba;
 	int i, seglen;
 	uint8_t *buf, *end;
 
 	DPRINTF("entered\n");
 
-	beio = io->io_hdr.ctl_private[CTL_PRIV_BACKEND].ptr;
+	beio = (struct ctl_be_block_io *)PRIV(io)->ptr;
 	softc = be_lun->softc;
-	memcpy(&lbalen, io->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes,
-	       sizeof(lbalen));
+	lbalen = ARGS(beio->io);
 
-	if (lbalen.flags & ~(SWS_LBDATA | SWS_UNMAP) ||
-	    (lbalen.flags & SWS_UNMAP && be_lun->unmap == NULL)) {
+	if (lbalen->flags & ~(SWS_LBDATA | SWS_UNMAP | SWS_ANCHOR) ||
+	    (lbalen->flags & (SWS_UNMAP | SWS_ANCHOR) && be_lun->unmap == NULL)) {
 		ctl_free_beio(beio);
 		ctl_set_invalid_field(&io->scsiio,
 				      /*sks_valid*/ 1,
@@ -975,9 +1076,9 @@ ctl_be_block_cw_dispatch_ws(struct ctl_be_block_lun *be_lun,
 		break;
 	}
 
-	if (lbalen.flags & SWS_UNMAP) {
-		beio->io_offset = lbalen.lba * be_lun->blocksize;
-		beio->io_len = (uint64_t)lbalen.len * be_lun->blocksize;
+	if (lbalen->flags & (SWS_UNMAP | SWS_ANCHOR)) {
+		beio->io_offset = lbalen->lba * be_lun->blocksize;
+		beio->io_len = (uint64_t)lbalen->len * be_lun->blocksize;
 		beio->bio_cmd = BIO_DELETE;
 		beio->ds_trans_type = DEVSTAT_FREE;
 
@@ -989,9 +1090,9 @@ ctl_be_block_cw_dispatch_ws(struct ctl_be_block_lun *be_lun,
 	beio->ds_trans_type = DEVSTAT_WRITE;
 
 	DPRINTF("WRITE SAME at LBA %jx len %u\n",
-	       (uintmax_t)lbalen.lba, lbalen.len);
+	       (uintmax_t)lbalen->lba, lbalen->len);
 
-	len_left = (uint64_t)lbalen.len * be_lun->blocksize;
+	len_left = (uint64_t)lbalen->len * be_lun->blocksize;
 	for (i = 0, lba = 0; i < CTLBLK_MAX_SEGS && len_left > 0; i++) {
 
 		/*
@@ -1012,21 +1113,19 @@ ctl_be_block_cw_dispatch_ws(struct ctl_be_block_lun *be_lun,
 		end = buf + seglen;
 		for (; buf < end; buf += be_lun->blocksize) {
 			memcpy(buf, io->scsiio.kern_data_ptr, be_lun->blocksize);
-			if (lbalen.flags & SWS_LBDATA)
-				scsi_ulto4b(lbalen.lba + lba, buf);
+			if (lbalen->flags & SWS_LBDATA)
+				scsi_ulto4b(lbalen->lba + lba, buf);
 			lba++;
 		}
 	}
 
-	beio->io_offset = lbalen.lba * be_lun->blocksize;
+	beio->io_offset = lbalen->lba * be_lun->blocksize;
 	beio->io_len = lba * be_lun->blocksize;
 
 	/* We can not do all in one run. Correct and schedule rerun. */
 	if (len_left > 0) {
-		lbalen.lba += lba;
-		lbalen.len -= lba;
-		memcpy(io->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes, &lbalen,
-		       sizeof(lbalen));
+		lbalen->lba += lba;
+		lbalen->len -= lba;
 		beio->beio_cont = ctl_be_block_cw_done_ws;
 	}
 
@@ -1039,16 +1138,15 @@ ctl_be_block_cw_dispatch_unmap(struct ctl_be_block_lun *be_lun,
 {
 	struct ctl_be_block_io *beio;
 	struct ctl_be_block_softc *softc;
-	struct ctl_ptr_len_flags ptrlen;
+	struct ctl_ptr_len_flags *ptrlen;
 
 	DPRINTF("entered\n");
 
-	beio = io->io_hdr.ctl_private[CTL_PRIV_BACKEND].ptr;
+	beio = (struct ctl_be_block_io *)PRIV(io)->ptr;
 	softc = be_lun->softc;
-	memcpy(&ptrlen, io->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes,
-	       sizeof(ptrlen));
+	ptrlen = (struct ctl_ptr_len_flags *)&io->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
 
-	if (ptrlen.flags != 0 || be_lun->unmap == NULL) {
+	if ((ptrlen->flags & ~SU_ANCHOR) != 0 || be_lun->unmap == NULL) {
 		ctl_free_beio(beio);
 		ctl_set_invalid_field(&io->scsiio,
 				      /*sks_valid*/ 0,
@@ -1090,8 +1188,7 @@ ctl_be_block_cw_dispatch_unmap(struct ctl_be_block_lun *be_lun,
 	beio->bio_cmd = BIO_DELETE;
 	beio->ds_trans_type = DEVSTAT_FREE;
 
-	DPRINTF("WRITE SAME at LBA %jx len %u\n",
-	       (uintmax_t)lbalen.lba, lbalen.len);
+	DPRINTF("UNMAP\n");
 
 	be_lun->unmap(be_lun, beio);
 }
@@ -1120,7 +1217,7 @@ ctl_be_block_cw_dispatch(struct ctl_be_block_lun *be_lun,
 	beio->io = io;
 	beio->lun = be_lun;
 	beio->beio_cont = ctl_be_block_cw_done;
-	io->io_hdr.ctl_private[CTL_PRIV_BACKEND].ptr = beio;
+	PRIV(io)->ptr = (void *)beio;
 
 	switch (io->scsiio.cdb[0]) {
 	case SYNCHRONIZE_CACHE:
@@ -1158,24 +1255,24 @@ ctl_be_block_next(struct ctl_be_block_io *beio)
 	io = beio->io;
 	be_lun = beio->lun;
 	ctl_free_beio(beio);
-	if (((io->io_hdr.status & CTL_STATUS_MASK) != CTL_STATUS_NONE)
-	  && ((io->io_hdr.status & CTL_STATUS_MASK) != CTL_SUCCESS)) {
-		ctl_done(io);
+	if ((io->io_hdr.flags & CTL_FLAG_ABORT) ||
+	    ((io->io_hdr.status & CTL_STATUS_MASK) != CTL_STATUS_NONE &&
+	     (io->io_hdr.status & CTL_STATUS_MASK) != CTL_SUCCESS)) {
+		ctl_data_submit_done(io);
 		return;
 	}
 
-	io->scsiio.kern_rel_offset += io->scsiio.kern_data_len;
 	io->io_hdr.status &= ~CTL_STATUS_MASK;
 	io->io_hdr.status |= CTL_STATUS_NONE;
 
-	mtx_lock(&be_lun->lock);
+	mtx_lock(&be_lun->queue_lock);
 	/*
 	 * XXX KDM make sure that links is okay to use at this point.
 	 * Otherwise, we either need to add another field to ctl_io_hdr,
 	 * or deal with resource allocation here.
 	 */
 	STAILQ_INSERT_TAIL(&be_lun->input_queue, &io->io_hdr, links);
-	mtx_unlock(&be_lun->lock);
+	mtx_unlock(&be_lun->queue_lock);
 
 	taskqueue_enqueue(be_lun->io_taskqueue, &be_lun->io_task);
 }
@@ -1186,24 +1283,27 @@ ctl_be_block_dispatch(struct ctl_be_block_lun *be_lun,
 {
 	struct ctl_be_block_io *beio;
 	struct ctl_be_block_softc *softc;
-	struct ctl_lba_len lbalen;
-	uint64_t len_left, lbaoff;
+	struct ctl_lba_len_flags *lbalen;
+	struct ctl_ptr_len_flags *bptrlen;
+	uint64_t len_left, lbas;
 	int i;
 
 	softc = be_lun->softc;
 
 	DPRINTF("entered\n");
 
-	if ((io->io_hdr.flags & CTL_FLAG_DATA_MASK) == CTL_FLAG_DATA_IN) {
-		SDT_PROBE(cbb, kernel, read, start, 0, 0, 0, 0, 0);
-	} else {
+	lbalen = ARGS(io);
+	if (lbalen->flags & CTL_LLF_WRITE) {
 		SDT_PROBE(cbb, kernel, write, start, 0, 0, 0, 0, 0);
+	} else {
+		SDT_PROBE(cbb, kernel, read, start, 0, 0, 0, 0, 0);
 	}
 
 	beio = ctl_alloc_beio(softc);
 	beio->io = io;
 	beio->lun = be_lun;
-	io->io_hdr.ctl_private[CTL_PRIV_BACKEND].ptr = beio;
+	bptrlen = PRIV(io);
+	bptrlen->ptr = (void *)beio;
 
 	/*
 	 * If the I/O came down with an ordered or head of queue tag, set
@@ -1234,28 +1334,25 @@ ctl_be_block_dispatch(struct ctl_be_block_lun *be_lun,
 		break;
 	}
 
-	/*
-	 * This path handles read and write only.  The config write path
-	 * handles flush operations.
-	 */
-	if ((io->io_hdr.flags & CTL_FLAG_DATA_MASK) == CTL_FLAG_DATA_IN) {
-		beio->bio_cmd = BIO_READ;
-		beio->ds_trans_type = DEVSTAT_READ;
-	} else {
+	if (lbalen->flags & CTL_LLF_WRITE) {
 		beio->bio_cmd = BIO_WRITE;
 		beio->ds_trans_type = DEVSTAT_WRITE;
+	} else {
+		beio->bio_cmd = BIO_READ;
+		beio->ds_trans_type = DEVSTAT_READ;
 	}
 
-	memcpy(&lbalen, io->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes,
-	       sizeof(lbalen));
 	DPRINTF("%s at LBA %jx len %u @%ju\n",
 	       (beio->bio_cmd == BIO_READ) ? "READ" : "WRITE",
-	       (uintmax_t)lbalen.lba, lbalen.len, lbaoff);
-	lbaoff = io->scsiio.kern_rel_offset / be_lun->blocksize;
-	beio->io_offset = (lbalen.lba + lbaoff) * be_lun->blocksize;
-	beio->io_len = MIN((lbalen.len - lbaoff) * be_lun->blocksize,
-	    CTLBLK_MAX_IO_SIZE);
-	beio->io_len -= beio->io_len % be_lun->blocksize;
+	       (uintmax_t)lbalen->lba, lbalen->len, bptrlen->len);
+	if (lbalen->flags & CTL_LLF_COMPARE)
+		lbas = CTLBLK_HALF_IO_SIZE;
+	else
+		lbas = CTLBLK_MAX_IO_SIZE;
+	lbas = MIN(lbalen->len - bptrlen->len, lbas / be_lun->blocksize);
+	beio->io_offset = (lbalen->lba + bptrlen->len) * be_lun->blocksize;
+	beio->io_len = lbas * be_lun->blocksize;
+	bptrlen->len += lbas;
 
 	for (i = 0, len_left = beio->io_len; len_left > 0; i++) {
 		KASSERT(i < CTLBLK_MAX_SEGS, ("Too many segs (%d >= %d)",
@@ -1270,14 +1367,25 @@ ctl_be_block_dispatch(struct ctl_be_block_lun *be_lun,
 		DPRINTF("segment %d addr %p len %zd\n", i,
 			beio->sg_segs[i].addr, beio->sg_segs[i].len);
 
+		/* Set up second segment for compare operation. */
+		if (lbalen->flags & CTL_LLF_COMPARE) {
+			beio->sg_segs[i + CTLBLK_HALF_SEGS].len =
+			    beio->sg_segs[i].len;
+			beio->sg_segs[i + CTLBLK_HALF_SEGS].addr =
+			    uma_zalloc(be_lun->lun_zone, M_WAITOK);
+		}
+
 		beio->num_segs++;
 		len_left -= beio->sg_segs[i].len;
 	}
-	if (io->scsiio.kern_rel_offset + beio->io_len <
-	    io->scsiio.kern_total_len)
+	if (bptrlen->len < lbalen->len)
 		beio->beio_cont = ctl_be_block_next;
 	io->scsiio.be_move_done = ctl_be_block_move_done;
-	io->scsiio.kern_data_ptr = (uint8_t *)beio->sg_segs;
+	/* For compare we have separate S/G lists for read and datamove. */
+	if (lbalen->flags & CTL_LLF_COMPARE)
+		io->scsiio.kern_data_ptr = (uint8_t *)&beio->sg_segs[CTLBLK_HALF_SEGS];
+	else
+		io->scsiio.kern_data_ptr = (uint8_t *)beio->sg_segs;
 	io->scsiio.kern_data_len = beio->io_len;
 	io->scsiio.kern_data_resid = 0;
 	io->scsiio.kern_sg_entries = beio->num_segs;
@@ -1312,7 +1420,7 @@ ctl_be_block_worker(void *context, int pending)
 
 	DPRINTF("entered\n");
 
-	mtx_lock(&be_lun->lock);
+	mtx_lock(&be_lun->queue_lock);
 	for (;;) {
 		io = (union ctl_io *)STAILQ_FIRST(&be_lun->datamove_queue);
 		if (io != NULL) {
@@ -1323,14 +1431,13 @@ ctl_be_block_worker(void *context, int pending)
 			STAILQ_REMOVE(&be_lun->datamove_queue, &io->io_hdr,
 				      ctl_io_hdr, links);
 
-			mtx_unlock(&be_lun->lock);
+			mtx_unlock(&be_lun->queue_lock);
 
-			beio = (struct ctl_be_block_io *)
-			    io->io_hdr.ctl_private[CTL_PRIV_BACKEND].ptr;
+			beio = (struct ctl_be_block_io *)PRIV(io)->ptr;
 
 			be_lun->dispatch(be_lun, beio);
 
-			mtx_lock(&be_lun->lock);
+			mtx_lock(&be_lun->queue_lock);
 			continue;
 		}
 		io = (union ctl_io *)STAILQ_FIRST(&be_lun->config_write_queue);
@@ -1341,11 +1448,11 @@ ctl_be_block_worker(void *context, int pending)
 			STAILQ_REMOVE(&be_lun->config_write_queue, &io->io_hdr,
 				      ctl_io_hdr, links);
 
-			mtx_unlock(&be_lun->lock);
+			mtx_unlock(&be_lun->queue_lock);
 
 			ctl_be_block_cw_dispatch(be_lun, io);
 
-			mtx_lock(&be_lun->lock);
+			mtx_lock(&be_lun->queue_lock);
 			continue;
 		}
 		io = (union ctl_io *)STAILQ_FIRST(&be_lun->input_queue);
@@ -1354,7 +1461,7 @@ ctl_be_block_worker(void *context, int pending)
 
 			STAILQ_REMOVE(&be_lun->input_queue, &io->io_hdr,
 				      ctl_io_hdr, links);
-			mtx_unlock(&be_lun->lock);
+			mtx_unlock(&be_lun->queue_lock);
 
 			/*
 			 * We must drop the lock, since this routine and
@@ -1362,7 +1469,7 @@ ctl_be_block_worker(void *context, int pending)
 			 */
 			ctl_be_block_dispatch(be_lun, io);
 
-			mtx_lock(&be_lun->lock);
+			mtx_lock(&be_lun->queue_lock);
 			continue;
 		}
 
@@ -1372,7 +1479,7 @@ ctl_be_block_worker(void *context, int pending)
 		 */
 		break;
 	}
-	mtx_unlock(&be_lun->lock);
+	mtx_unlock(&be_lun->queue_lock);
 }
 
 /*
@@ -1383,15 +1490,11 @@ ctl_be_block_worker(void *context, int pending)
 static int
 ctl_be_block_submit(union ctl_io *io)
 {
-	struct ctl_lba_len lbalen;
 	struct ctl_be_block_lun *be_lun;
 	struct ctl_be_lun *ctl_be_lun;
-	int retval;
 
 	DPRINTF("entered\n");
 
-	retval = CTL_RETVAL_COMPLETE;
-
 	ctl_be_lun = (struct ctl_be_lun *)io->io_hdr.ctl_private[
 		CTL_PRIV_BACKEND_LUN].ptr;
 	be_lun = (struct ctl_be_block_lun *)ctl_be_lun->be_lun;
@@ -1402,23 +1505,19 @@ ctl_be_block_submit(union ctl_io *io)
 	KASSERT(io->io_hdr.io_type == CTL_IO_SCSI, ("Non-SCSI I/O (type "
 		"%#x) encountered", io->io_hdr.io_type));
 
-	memcpy(&lbalen, io->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes,
-	       sizeof(lbalen));
-	io->scsiio.kern_total_len = lbalen.len * be_lun->blocksize;
-	io->scsiio.kern_rel_offset = 0;
+	PRIV(io)->len = 0;
 
-	mtx_lock(&be_lun->lock);
+	mtx_lock(&be_lun->queue_lock);
 	/*
 	 * XXX KDM make sure that links is okay to use at this point.
 	 * Otherwise, we either need to add another field to ctl_io_hdr,
 	 * or deal with resource allocation here.
 	 */
 	STAILQ_INSERT_TAIL(&be_lun->input_queue, &io->io_hdr, links);
-	mtx_unlock(&be_lun->lock);
-
+	mtx_unlock(&be_lun->queue_lock);
 	taskqueue_enqueue(be_lun->io_taskqueue, &be_lun->io_task);
 
-	return (retval);
+	return (CTL_RETVAL_COMPLETE);
 }
 
 static int
@@ -1561,14 +1660,17 @@ ctl_be_block_open_dev(struct ctl_be_block_lun *be_lun, struct ctl_lun_req *req)
 	params = &req->reqdata.create;
 
 	be_lun->dev_type = CTL_BE_BLOCK_DEV;
-	be_lun->dispatch = ctl_be_block_dispatch_dev;
-	be_lun->lun_flush = ctl_be_block_flush_dev;
-	be_lun->unmap = ctl_be_block_unmap_dev;
 	be_lun->backend.dev.cdev = be_lun->vn->v_rdev;
 	be_lun->backend.dev.csw = dev_refthread(be_lun->backend.dev.cdev,
 					     &be_lun->backend.dev.dev_ref);
 	if (be_lun->backend.dev.csw == NULL)
 		panic("Unable to retrieve device switch");
+	if (strcmp(be_lun->backend.dev.csw->d_name, "zvol") == 0)
+		be_lun->dispatch = ctl_be_block_dispatch_zvol;
+	else
+		be_lun->dispatch = ctl_be_block_dispatch_dev;
+	be_lun->lun_flush = ctl_be_block_flush_dev;
+	be_lun->unmap = ctl_be_block_unmap_dev;
 
 	error = VOP_GETATTR(be_lun->vn, &vattr, NOCRED);
 	if (error) {
@@ -1821,27 +1923,28 @@ ctl_be_block_create(struct ctl_be_block_softc *softc, struct ctl_lun_req *req)
 {
 	struct ctl_be_block_lun *be_lun;
 	struct ctl_lun_create_params *params;
-	struct ctl_be_arg *file_arg;
+	char num_thread_str[16];
 	char tmpstr[32];
+	char *value;
 	int retval, num_threads, unmap;
-	int i;
+	int tmp_num_threads;
 
 	params = &req->reqdata.create;
 	retval = 0;
 
 	num_threads = cbb_num_threads;
 
-	file_arg = NULL;
-
 	be_lun = malloc(sizeof(*be_lun), M_CTLBLK, M_ZERO | M_WAITOK);
 
 	be_lun->softc = softc;
 	STAILQ_INIT(&be_lun->input_queue);
 	STAILQ_INIT(&be_lun->config_write_queue);
 	STAILQ_INIT(&be_lun->datamove_queue);
-	STAILQ_INIT(&be_lun->ctl_be_lun.options);
 	sprintf(be_lun->lunname, "cblk%d", softc->num_luns);
-	mtx_init(&be_lun->lock, be_lun->lunname, NULL, MTX_DEF);
+	mtx_init(&be_lun->io_lock, "cblk io lock", NULL, MTX_DEF);
+	mtx_init(&be_lun->queue_lock, "cblk queue lock", NULL, MTX_DEF);
+	ctl_init_opts(&be_lun->ctl_be_lun.options,
+	    req->num_be_args, req->kern_be_args);
 
 	be_lun->lun_zone = uma_zcreate(be_lun->lunname, CTLBLK_MAX_SEG,
 	    NULL, NULL, NULL, NULL, /*align*/ 0, /*flags*/0);
@@ -1858,24 +1961,13 @@ ctl_be_block_create(struct ctl_be_block_softc *softc, struct ctl_lun_req *req)
 		be_lun->ctl_be_lun.lun_type = T_DIRECT;
 
 	if (be_lun->ctl_be_lun.lun_type == T_DIRECT) {
-		for (i = 0; i < req->num_be_args; i++) {
-			if (strcmp(req->kern_be_args[i].kname, "file") == 0) {
-				file_arg = &req->kern_be_args[i];
-				break;
-			}
-		}
-
-		if (file_arg == NULL) {
+		value = ctl_get_opt(&be_lun->ctl_be_lun.options, "file");
+		if (value == NULL) {
 			snprintf(req->error_str, sizeof(req->error_str),
 				 "%s: no file argument specified", __func__);
 			goto bailout_error;
 		}
-
-		be_lun->dev_path = malloc(file_arg->vallen, M_CTLBLK,
-					  M_WAITOK | M_ZERO);
-
-		strlcpy(be_lun->dev_path, (char *)file_arg->kvalue,
-			file_arg->vallen);
+		be_lun->dev_path = strdup(value, M_CTLBLK);
 
 		retval = ctl_be_block_open(softc, be_lun, req);
 		if (retval != 0) {
@@ -1914,50 +2006,27 @@ ctl_be_block_create(struct ctl_be_block_softc *softc, struct ctl_lun_req *req)
 	 * XXX This searching loop might be refactored to be combined with
 	 * the loop above,
 	 */
-	unmap = 0;
-	for (i = 0; i < req->num_be_args; i++) {
-		if (strcmp(req->kern_be_args[i].kname, "num_threads") == 0) {
-			struct ctl_be_arg *thread_arg;
-			char num_thread_str[16];
-			int tmp_num_threads;
+	value = ctl_get_opt(&be_lun->ctl_be_lun.options, "num_threads");
+	if (value != NULL) {
+		tmp_num_threads = strtol(value, NULL, 0);
 
-
-			thread_arg = &req->kern_be_args[i];
-
-			strlcpy(num_thread_str, (char *)thread_arg->kvalue,
-				min(thread_arg->vallen,
-				sizeof(num_thread_str)));
-
-			tmp_num_threads = strtol(num_thread_str, NULL, 0);
-
-			/*
-			 * We don't let the user specify less than one
-			 * thread, but hope he's clueful enough not to
-			 * specify 1000 threads.
-			 */
-			if (tmp_num_threads < 1) {
-				snprintf(req->error_str, sizeof(req->error_str),
-					 "%s: invalid number of threads %s",
-				         __func__, num_thread_str);
-				goto bailout_error;
-			}
-
-			num_threads = tmp_num_threads;
-		} else if (strcmp(req->kern_be_args[i].kname, "unmap") == 0 &&
-		    strcmp(req->kern_be_args[i].kvalue, "on") == 0) {
-			unmap = 1;
-		} else if (strcmp(req->kern_be_args[i].kname, "file") != 0 &&
-		    strcmp(req->kern_be_args[i].kname, "dev") != 0) {
-			struct ctl_be_lun_option *opt;
-
-			opt = malloc(sizeof(*opt), M_CTLBLK, M_WAITOK);
-			opt->name = malloc(strlen(req->kern_be_args[i].kname) + 1, M_CTLBLK, M_WAITOK);
-			strcpy(opt->name, req->kern_be_args[i].kname);
-			opt->value = malloc(strlen(req->kern_be_args[i].kvalue) + 1, M_CTLBLK, M_WAITOK);
-			strcpy(opt->value, req->kern_be_args[i].kvalue);
-			STAILQ_INSERT_TAIL(&be_lun->ctl_be_lun.options, opt, links);
+		/*
+		 * We don't let the user specify less than one
+		 * thread, but hope he's clueful enough not to
+		 * specify 1000 threads.
+		 */
+		if (tmp_num_threads < 1) {
+			snprintf(req->error_str, sizeof(req->error_str),
+				 "%s: invalid number of threads %s",
+			         __func__, num_thread_str);
+			goto bailout_error;
 		}
+		num_threads = tmp_num_threads;
 	}
+	unmap = 0;
+	value = ctl_get_opt(&be_lun->ctl_be_lun.options, "unmap");
+	if (value != NULL && strcmp(value, "on") == 0)
+		unmap = 1;
 
 	be_lun->flags = CTL_BE_BLOCK_LUN_UNCONFIGURED;
 	be_lun->ctl_be_lun.flags = CTL_LUN_FLAG_PRIMARY;
@@ -2113,9 +2182,16 @@ ctl_be_block_create(struct ctl_be_block_softc *softc, struct ctl_lun_req *req)
 bailout_error:
 	req->status = CTL_LUN_ERROR;
 
+	if (be_lun->io_taskqueue != NULL)
+		taskqueue_free(be_lun->io_taskqueue);
 	ctl_be_block_close(be_lun);
-
-	free(be_lun->dev_path, M_CTLBLK);
+	if (be_lun->dev_path != NULL)
+		free(be_lun->dev_path, M_CTLBLK);
+	if (be_lun->lun_zone != NULL)
+		uma_zdestroy(be_lun->lun_zone);
+	ctl_free_opts(&be_lun->ctl_be_lun.options);
+	mtx_destroy(&be_lun->queue_lock);
+	mtx_destroy(&be_lun->io_lock);
 	free(be_lun, M_CTLBLK);
 
 	return (retval);
@@ -2201,8 +2277,10 @@ ctl_be_block_rm(struct ctl_be_block_softc *softc, struct ctl_lun_req *req)
 
 	uma_zdestroy(be_lun->lun_zone);
 
+	ctl_free_opts(&be_lun->ctl_be_lun.options);
 	free(be_lun->dev_path, M_CTLBLK);
-
+	mtx_destroy(&be_lun->queue_lock);
+	mtx_destroy(&be_lun->io_lock);
 	free(be_lun, M_CTLBLK);
 
 	req->status = CTL_LUN_OK;
@@ -2449,10 +2527,10 @@ ctl_be_block_config_write(union ctl_io *io)
 		 * user asked to be synced out.  When they issue a sync
 		 * cache command, we'll sync out the whole thing.
 		 */
-		mtx_lock(&be_lun->lock);
+		mtx_lock(&be_lun->queue_lock);
 		STAILQ_INSERT_TAIL(&be_lun->config_write_queue, &io->io_hdr,
 				   links);
-		mtx_unlock(&be_lun->lock);
+		mtx_unlock(&be_lun->queue_lock);
 		taskqueue_enqueue(be_lun->io_taskqueue, &be_lun->io_task);
 		break;
 	case START_STOP_UNIT: {
@@ -2517,7 +2595,7 @@ ctl_be_block_lun_info(void *be_lun, struct sbuf *sb)
 	lun = (struct ctl_be_block_lun *)be_lun;
 	retval = 0;
 
-	retval = sbuf_printf(sb, "<num_threads>");
+	retval = sbuf_printf(sb, "\t<num_threads>");
 
 	if (retval != 0)
 		goto bailout;
@@ -2527,26 +2605,7 @@ ctl_be_block_lun_info(void *be_lun, struct sbuf *sb)
 	if (retval != 0)
 		goto bailout;
 
-	retval = sbuf_printf(sb, "</num_threads>");
-
-	/*
-	 * For processor devices, we don't have a path variable.
-	 */
-	if ((retval != 0)
-	 || (lun->dev_path == NULL))
-		goto bailout;
-
-	retval = sbuf_printf(sb, "<file>");
-
-	if (retval != 0)
-		goto bailout;
-
-	retval = ctl_sbuf_printf_esc(sb, lun->dev_path);
-
-	if (retval != 0)
-		goto bailout;
-
-	retval = sbuf_printf(sb, "</file>\n");
+	retval = sbuf_printf(sb, "</num_threads>\n");
 
 bailout:
 
@@ -2562,7 +2621,7 @@ ctl_be_block_init(void)
 	softc = &backend_block_softc;
 	retval = 0;
 
-	mtx_init(&softc->lock, "ctlblk", NULL, MTX_DEF);
+	mtx_init(&softc->lock, "ctlblock", NULL, MTX_DEF);
 	beio_zone = uma_zcreate("beio", sizeof(struct ctl_be_block_io),
 	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
 	STAILQ_INIT(&softc->disk_list);
diff --git a/sys/cam/ctl/ctl_backend_ramdisk.c b/sys/cam/ctl/ctl_backend_ramdisk.c
index 57c470e9ce34..6613e8e8656d 100644
--- a/sys/cam/ctl/ctl_backend_ramdisk.c
+++ b/sys/cam/ctl/ctl_backend_ramdisk.c
@@ -84,7 +84,7 @@ struct ctl_be_ramdisk_lun {
 	struct taskqueue *io_taskqueue;
 	struct task io_task;
 	STAILQ_HEAD(, ctl_io_hdr) cont_queue;
-	struct mtx lock;
+	struct mtx_padalign queue_lock;
 };
 
 struct ctl_be_ramdisk_softc {
@@ -150,7 +150,7 @@ ctl_backend_ramdisk_init(void)
 
 	memset(softc, 0, sizeof(*softc));
 
-	mtx_init(&softc->lock, "ramdisk", NULL, MTX_DEF);
+	mtx_init(&softc->lock, "ctlramdisk", NULL, MTX_DEF);
 
 	STAILQ_INIT(&softc->lun_list);
 	softc->rd_size = 1024 * 1024;
@@ -241,11 +241,11 @@ ctl_backend_ramdisk_move_done(union ctl_io *io)
 	if ((io->io_hdr.port_status == 0)
 	 && ((io->io_hdr.flags & CTL_FLAG_ABORT) == 0)
 	 && ((io->io_hdr.status & CTL_STATUS_MASK) == CTL_STATUS_NONE)) {
-		if (io->scsiio.kern_rel_offset < io->scsiio.kern_total_len) {
-			mtx_lock(&be_lun->lock);
+		if (io->io_hdr.ctl_private[CTL_PRIV_BACKEND].integer > 0) {
+			mtx_lock(&be_lun->queue_lock);
 			STAILQ_INSERT_TAIL(&be_lun->cont_queue,
 			    &io->io_hdr, links);
-			mtx_unlock(&be_lun->lock);
+			mtx_unlock(&be_lun->queue_lock);
 			taskqueue_enqueue(be_lun->io_taskqueue,
 			    &be_lun->io_task);
 			return (0);
@@ -267,27 +267,27 @@ ctl_backend_ramdisk_move_done(union ctl_io *io)
 					 /*retry_count*/
 					 io->io_hdr.port_status);
 	}
-	ctl_done(io);
+	ctl_data_submit_done(io);
 	return(0);
 }
 
 static int
 ctl_backend_ramdisk_submit(union ctl_io *io)
 {
-	struct ctl_lba_len lbalen;
 	struct ctl_be_lun *ctl_be_lun;
+	struct ctl_lba_len_flags *lbalen;
 
 	ctl_be_lun = (struct ctl_be_lun *)io->io_hdr.ctl_private[
 		CTL_PRIV_BACKEND_LUN].ptr;
-
-	memcpy(&lbalen, io->io_hdr.ctl_private[CTL_PRIV_LBA_LEN].bytes,
-	       sizeof(lbalen));
-	io->scsiio.be_move_done = ctl_backend_ramdisk_move_done;
-	io->scsiio.kern_total_len = lbalen.len * ctl_be_lun->blocksize;
-	io->scsiio.kern_rel_offset = 0;
-	io->scsiio.kern_data_resid = 0;
+	lbalen = (struct ctl_lba_len_flags *)&io->io_hdr.ctl_private[CTL_PRIV_LBA_LEN];
+	if (lbalen->flags & CTL_LLF_VERIFY) {
+		ctl_set_success(&io->scsiio);
+		ctl_data_submit_done(io);
+		return (CTL_RETVAL_COMPLETE);
+	}
+	io->io_hdr.ctl_private[CTL_PRIV_BACKEND].integer =
+	    lbalen->len * ctl_be_lun->blocksize;
 	ctl_backend_ramdisk_continue(io);
-
 	return (CTL_RETVAL_COMPLETE);
 }
 
@@ -302,7 +302,7 @@ ctl_backend_ramdisk_continue(union ctl_io *io)
 #endif
 
 	softc = &rd_softc;
-	len = io->scsiio.kern_total_len - io->scsiio.kern_rel_offset;
+	len = io->io_hdr.ctl_private[CTL_PRIV_BACKEND].integer;
 #ifdef CTL_RAMDISK_PAGES
 	sg_filled = min(btoc(len), softc->num_pages);
 	if (sg_filled > 1) {
@@ -328,9 +328,12 @@ ctl_backend_ramdisk_continue(union ctl_io *io)
 	io->scsiio.kern_data_ptr = softc->ramdisk_buffer;
 #endif /* CTL_RAMDISK_PAGES */
 
+	io->scsiio.be_move_done = ctl_backend_ramdisk_move_done;
+	io->scsiio.kern_data_resid = 0;
 	io->scsiio.kern_data_len = len_filled;
 	io->scsiio.kern_sg_entries = sg_filled;
 	io->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	io->io_hdr.ctl_private[CTL_PRIV_BACKEND].integer -= len_filled;
 #ifdef CTL_TIME_IO
 	getbintime(&io->io_hdr.dma_start_bt);
 #endif
@@ -347,18 +350,18 @@ ctl_backend_ramdisk_worker(void *context, int pending)
 	be_lun = (struct ctl_be_ramdisk_lun *)context;
 	softc = be_lun->softc;
 
-	mtx_lock(&be_lun->lock);
+	mtx_lock(&be_lun->queue_lock);
 	for (;;) {
 		io = (union ctl_io *)STAILQ_FIRST(&be_lun->cont_queue);
 		if (io != NULL) {
 			STAILQ_REMOVE(&be_lun->cont_queue, &io->io_hdr,
 				      ctl_io_hdr, links);
 
-			mtx_unlock(&be_lun->lock);
+			mtx_unlock(&be_lun->queue_lock);
 
 			ctl_backend_ramdisk_continue(io);
 
-			mtx_lock(&be_lun->lock);
+			mtx_lock(&be_lun->queue_lock);
 			continue;
 		}
 
@@ -368,7 +371,7 @@ ctl_backend_ramdisk_worker(void *context, int pending)
 		 */
 		break;
 	}
-	mtx_unlock(&be_lun->lock);
+	mtx_unlock(&be_lun->queue_lock);
 }
 
 static int
@@ -502,7 +505,8 @@ ctl_backend_ramdisk_rm(struct ctl_be_ramdisk_softc *softc,
 	if (retval == 0) {
 		taskqueue_drain(be_lun->io_taskqueue, &be_lun->io_task);
 		taskqueue_free(be_lun->io_taskqueue);
-		mtx_destroy(&be_lun->lock);
+		ctl_free_opts(&be_lun->ctl_be_lun.options);
+		mtx_destroy(&be_lun->queue_lock);
 		free(be_lun, M_RAMDISK);
 	}
 
@@ -523,8 +527,9 @@ ctl_backend_ramdisk_create(struct ctl_be_ramdisk_softc *softc,
 	struct ctl_be_ramdisk_lun *be_lun;
 	struct ctl_lun_create_params *params;
 	uint32_t blocksize;
+	char *value;
 	char tmpstr[32];
-	int i, retval, unmap;
+	int retval, unmap;
 
 	retval = 0;
 	params = &req->reqdata.create;
@@ -543,7 +548,8 @@ ctl_backend_ramdisk_create(struct ctl_be_ramdisk_softc *softc,
 		goto bailout_error;
 	}
 	sprintf(be_lun->lunname, "cram%d", softc->num_luns);
-	STAILQ_INIT(&be_lun->ctl_be_lun.options);
+	ctl_init_opts(&be_lun->ctl_be_lun.options,
+	    req->num_be_args, req->kern_be_args);
 
 	if (params->flags & CTL_LUN_FLAG_DEV_TYPE)
 		be_lun->ctl_be_lun.lun_type = params->device_type;
@@ -581,21 +587,9 @@ ctl_backend_ramdisk_create(struct ctl_be_ramdisk_softc *softc,
 	be_lun->softc = softc;
 
 	unmap = 0;
-	for (i = 0; i < req->num_be_args; i++) {
-		if (strcmp(req->kern_be_args[i].kname, "unmap") == 0 &&
-		    strcmp(req->kern_be_args[i].kvalue, "on") == 0) {
-			unmap = 1;
-		} else {
-			struct ctl_be_lun_option *opt;
-
-			opt = malloc(sizeof(*opt), M_RAMDISK, M_WAITOK);
-			opt->name = malloc(strlen(req->kern_be_args[i].kname) + 1, M_RAMDISK, M_WAITOK);
-			strcpy(opt->name, req->kern_be_args[i].kname);
-			opt->value = malloc(strlen(req->kern_be_args[i].kvalue) + 1, M_RAMDISK, M_WAITOK);
-			strcpy(opt->value, req->kern_be_args[i].kvalue);
-			STAILQ_INSERT_TAIL(&be_lun->ctl_be_lun.options, opt, links);
-		}
-	}
+	value = ctl_get_opt(&be_lun->ctl_be_lun.options, "unmap");
+	if (value != NULL && strcmp(value, "on") == 0)
+		unmap = 1;
 
 	be_lun->flags = CTL_BE_RAMDISK_LUN_UNCONFIGURED;
 	be_lun->ctl_be_lun.flags = CTL_LUN_FLAG_PRIMARY;
@@ -646,7 +640,7 @@ ctl_backend_ramdisk_create(struct ctl_be_ramdisk_softc *softc,
 	}
 
 	STAILQ_INIT(&be_lun->cont_queue);
-	mtx_init(&be_lun->lock, "CTL ramdisk", NULL, MTX_DEF);
+	mtx_init(&be_lun->queue_lock, "cram queue lock", NULL, MTX_DEF);
 	TASK_INIT(&be_lun->io_task, /*priority*/0, ctl_backend_ramdisk_worker,
 	    be_lun);
 
@@ -728,7 +722,8 @@ ctl_backend_ramdisk_create(struct ctl_be_ramdisk_softc *softc,
 		if (be_lun->io_taskqueue != NULL) {
 			taskqueue_free(be_lun->io_taskqueue);
 		}
-		mtx_destroy(&be_lun->lock);
+		ctl_free_opts(&be_lun->ctl_be_lun.options);
+		mtx_destroy(&be_lun->queue_lock);
 		free(be_lun, M_RAMDISK);
 	}
 
@@ -820,7 +815,7 @@ ctl_backend_ramdisk_lun_shutdown(void *be_lun)
 	if (lun->flags & CTL_BE_RAMDISK_LUN_WAITING) {
 		wakeup(lun);
 	} else {
-		STAILQ_REMOVE(&softc->lun_list, be_lun, ctl_be_ramdisk_lun,
+		STAILQ_REMOVE(&softc->lun_list, lun, ctl_be_ramdisk_lun,
 			      links);
 		softc->num_luns--;
 		do_free = 1;
diff --git a/sys/cam/ctl/ctl_cmd_table.c b/sys/cam/ctl/ctl_cmd_table.c
index 145ddb46ccde..6ad90dd36883 100644
--- a/sys/cam/ctl/ctl_cmd_table.c
+++ b/sys/cam/ctl/ctl_cmd_table.c
@@ -58,16 +58,453 @@
 #include <cam/ctl/ctl_private.h>
 
 /*
- * Whenever support for a new command is added, it should be added to this
- * table.
+ * Whenever support for a new command is added, it should be added to these
+ * tables.
  */
-struct ctl_cmd_entry ctl_cmd_table[] =
+
+/* 5E PERSISTENT RESERVE IN */
+const struct ctl_cmd_entry ctl_cmd_table_5e[32] =
+{
+/* 00 READ KEYS */
+{ctl_persistent_reserve_in, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
+						CTL_CMD_FLAG_OK_ON_BOTH |
+						CTL_CMD_FLAG_OK_ON_STOPPED |
+						CTL_CMD_FLAG_OK_ON_INOPERABLE |
+						CTL_CMD_FLAG_OK_ON_SECONDARY |
+						CTL_FLAG_DATA_IN |
+						CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE,
+ 10, { 0x00, 0, 0, 0, 0, 0, 0xff, 0xff, 0x07}},
+
+/* 01 READ RESERVATION */
+{ctl_persistent_reserve_in, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
+						CTL_CMD_FLAG_OK_ON_BOTH |
+						CTL_CMD_FLAG_OK_ON_STOPPED |
+						CTL_CMD_FLAG_OK_ON_INOPERABLE |
+						CTL_CMD_FLAG_OK_ON_SECONDARY |
+						CTL_FLAG_DATA_IN |
+						CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE,
+ 10, { 0x01, 0, 0, 0, 0, 0, 0xff, 0xff, 0x07}},
+
+/* 02 REPORT CAPABILITIES */
+{ctl_persistent_reserve_in, CTL_SERIDX_INQ, CTL_CMD_FLAG_ALLOW_ON_RESV |
+					    CTL_CMD_FLAG_OK_ON_BOTH |
+					    CTL_CMD_FLAG_OK_ON_STOPPED |
+					    CTL_CMD_FLAG_OK_ON_INOPERABLE |
+					    CTL_CMD_FLAG_OK_ON_SECONDARY |
+					    CTL_FLAG_DATA_IN |
+					    CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE,
+ 10, { 0x02, 0, 0, 0, 0, 0, 0xff, 0xff, 0x07}},
+
+/* 03 READ FULL STATUS */
+{ctl_persistent_reserve_in, CTL_SERIDX_INQ, CTL_CMD_FLAG_ALLOW_ON_RESV |
+					    CTL_CMD_FLAG_OK_ON_BOTH |
+					    CTL_CMD_FLAG_OK_ON_STOPPED |
+					    CTL_CMD_FLAG_OK_ON_INOPERABLE |
+					    CTL_CMD_FLAG_OK_ON_SECONDARY |
+					    CTL_FLAG_DATA_IN |
+					    CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE,
+ 10, { 0x03, 0, 0, 0, 0, 0, 0xff, 0xff, 0x07}},
+
+/* 04-1f */
+};
+
+/* 5F PERSISTENT RESERVE OUT */
+const struct ctl_cmd_entry ctl_cmd_table_5f[32] =
+{
+/* 00 REGISTER */
+{ctl_persistent_reserve_out, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
+						CTL_CMD_FLAG_OK_ON_BOTH |
+						CTL_CMD_FLAG_OK_ON_STOPPED |
+						CTL_CMD_FLAG_OK_ON_INOPERABLE |
+						CTL_CMD_FLAG_OK_ON_SECONDARY |
+						CTL_FLAG_DATA_OUT |
+						CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE,
+ 10, { 0x00, 0xff, 0, 0, 0xff, 0xff, 0xff, 0xff, 0x07}},
+
+/* 01 RESERVE */
+{ctl_persistent_reserve_out, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
+						CTL_CMD_FLAG_OK_ON_BOTH |
+						CTL_CMD_FLAG_OK_ON_STOPPED |
+						CTL_CMD_FLAG_OK_ON_INOPERABLE |
+						CTL_CMD_FLAG_OK_ON_SECONDARY |
+						CTL_FLAG_DATA_OUT |
+						CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE,
+ 10, { 0x01, 0xff, 0, 0, 0xff, 0xff, 0xff, 0xff, 0x07}},
+
+/* 02 RELEASE */
+{ctl_persistent_reserve_out, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
+						CTL_CMD_FLAG_OK_ON_BOTH |
+						CTL_CMD_FLAG_OK_ON_STOPPED |
+						CTL_CMD_FLAG_OK_ON_INOPERABLE |
+						CTL_CMD_FLAG_OK_ON_SECONDARY |
+						CTL_FLAG_DATA_OUT |
+						CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE,
+ 10, { 0x02, 0xff, 0, 0, 0xff, 0xff, 0xff, 0xff, 0x07}},
+
+/* 03 CLEAR */
+{ctl_persistent_reserve_out, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
+						CTL_CMD_FLAG_OK_ON_BOTH |
+						CTL_CMD_FLAG_OK_ON_STOPPED |
+						CTL_CMD_FLAG_OK_ON_INOPERABLE |
+						CTL_CMD_FLAG_OK_ON_SECONDARY |
+						CTL_FLAG_DATA_OUT |
+						CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE,
+ 10, { 0x03, 0xff, 0, 0, 0xff, 0xff, 0xff, 0xff, 0x07}},
+
+/* 04 PREEMPT */
+{ctl_persistent_reserve_out, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
+						CTL_CMD_FLAG_OK_ON_BOTH |
+						CTL_CMD_FLAG_OK_ON_STOPPED |
+						CTL_CMD_FLAG_OK_ON_INOPERABLE |
+						CTL_CMD_FLAG_OK_ON_SECONDARY |
+						CTL_FLAG_DATA_OUT |
+						CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE,
+ 10, { 0x04, 0xff, 0, 0, 0xff, 0xff, 0xff, 0xff, 0x07}},
+
+/* 05 PREEMPT AND ABORT */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 06 REGISTER AND IGNORE EXISTING KEY */
+{ctl_persistent_reserve_out, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
+						CTL_CMD_FLAG_OK_ON_BOTH |
+						CTL_CMD_FLAG_OK_ON_STOPPED |
+						CTL_CMD_FLAG_OK_ON_INOPERABLE |
+						CTL_CMD_FLAG_OK_ON_SECONDARY |
+						CTL_FLAG_DATA_OUT |
+						CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE,
+ 10, { 0x06, 0xff, 0, 0, 0xff, 0xff, 0xff, 0xff, 0x07}},
+
+/* 07 REGISTER AND MOVE */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 08-1f */
+};
+
+/* 83 EXTENDED COPY */
+const struct ctl_cmd_entry ctl_cmd_table_83[32] =
+{
+/* 00 EXTENDED COPY (LID1) */
+{ctl_extended_copy_lid1, CTL_SERIDX_RD_CAP, CTL_CMD_FLAG_OK_ON_BOTH |
+					    CTL_FLAG_DATA_OUT,
+ CTL_LUN_PAT_NONE,
+ 16, { 0x00, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 01 EXTENDED COPY (LID4) */
+{ctl_extended_copy_lid4, CTL_SERIDX_RD_CAP, CTL_CMD_FLAG_OK_ON_BOTH |
+					    CTL_FLAG_DATA_OUT,
+ CTL_LUN_PAT_NONE,
+ 16, { 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 02 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 03 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 04 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 05 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 06 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 07 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 08 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 09 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0A */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0B */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0C */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0D */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0E */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0F */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 10 POPULATE TOKEN */
+{ctl_populate_token, CTL_SERIDX_RD_CAP, CTL_CMD_FLAG_OK_ON_SLUN |
+					CTL_FLAG_DATA_OUT,
+ CTL_LUN_PAT_NONE,
+ 16, { 0x10, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff,
+       0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 11 WRITE USING TOKEN */
+{ctl_write_using_token, CTL_SERIDX_RD_CAP, CTL_CMD_FLAG_OK_ON_SLUN |
+					CTL_FLAG_DATA_OUT,
+ CTL_LUN_PAT_NONE,
+ 16, { 0x11, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff,
+       0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 12 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 13 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 14 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 15 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 16 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 17 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 18 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 19 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 1A */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 1B */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 1C COPY OPERATION ABORT */
+{ctl_copy_operation_abort, CTL_SERIDX_RD_CAP, CTL_CMD_FLAG_OK_ON_BOTH |
+					      CTL_FLAG_DATA_NONE,
+ CTL_LUN_PAT_NONE,
+ 16, { 0x1c, 0xff, 0xff, 0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x07}},
+};
+
+/* 84 RECEIVE COPY STATUS */
+const struct ctl_cmd_entry ctl_cmd_table_84[32] =
+{
+/* 00 RECEIVE COPY STATUS (LID1) */
+{ctl_receive_copy_status_lid1, CTL_SERIDX_RD_CAP,
+ CTL_CMD_FLAG_OK_ON_BOTH |
+ CTL_FLAG_DATA_IN,
+ CTL_LUN_PAT_NONE,
+ 16, {0x00, 0xff, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 01 RECEIVE COPY DATA (LID1) */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 02 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 03 RECEIVE COPY OPERATING PARAMETERS */
+{ctl_receive_copy_operating_parameters, CTL_SERIDX_RD_CAP,
+ CTL_CMD_FLAG_OK_ON_BOTH |
+ CTL_CMD_FLAG_OK_ON_STOPPED |
+ CTL_CMD_FLAG_OK_ON_INOPERABLE |
+ CTL_CMD_FLAG_OK_ON_SECONDARY |
+ CTL_FLAG_DATA_IN,
+ CTL_LUN_PAT_NONE,
+ 16, {0x03, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 04 RECEIVE COPY FAILURE DETAILS (LID1) */
+{ctl_receive_copy_failure_details, CTL_SERIDX_RD_CAP,
+ CTL_CMD_FLAG_OK_ON_BOTH |
+ CTL_FLAG_DATA_IN,
+ CTL_LUN_PAT_NONE,
+ 16, {0x04, 0xff, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 05 RECEIVE COPY STATUS (LID4) */
+{ctl_receive_copy_status_lid4, CTL_SERIDX_RD_CAP,
+ CTL_CMD_FLAG_OK_ON_BOTH |
+ CTL_FLAG_DATA_IN,
+ CTL_LUN_PAT_NONE,
+ 16, {0x05, 0xff, 0xff, 0xff, 0xff, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 06 RECEIVE COPY DATA (LID4)*/
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 07 RECEIVE ROD TOKEN INFORMATION */
+{ctl_receive_rod_token_information, CTL_SERIDX_RD_CAP,
+ CTL_CMD_FLAG_OK_ON_BOTH |
+ CTL_FLAG_DATA_IN,
+ CTL_LUN_PAT_NONE,
+ 16, {0x07, 0xff, 0xff, 0xff, 0xff, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 08 REPORT ALL ROD TOKENS */
+{ctl_report_all_rod_tokens, CTL_SERIDX_RD_CAP,
+ CTL_CMD_FLAG_OK_ON_BOTH |
+ CTL_FLAG_DATA_IN,
+ CTL_LUN_PAT_NONE,
+ 16, {0x08, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+};
+
+/* 9E SERVICE ACTION IN(16) */
+const struct ctl_cmd_entry ctl_cmd_table_9e[32] =
+{
+/* 00 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 01 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 02 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 03 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 04 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 05 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 06 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 07 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 08 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 09 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0A */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0B */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0C */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0D */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0E */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0F */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 10 */
+{ctl_read_capacity_16, CTL_SERIDX_RD_CAP, CTL_CMD_FLAG_OK_ON_SLUN |
+					  CTL_CMD_FLAG_OK_ON_STOPPED |
+					  CTL_CMD_FLAG_OK_ON_INOPERABLE |
+					  CTL_CMD_FLAG_OK_ON_SECONDARY |
+					  CTL_FLAG_DATA_IN |
+					  CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_READCAP,
+ 16, {0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 11-1f */
+};
+
+/* A3 MAINTENANCE IN */
+const struct ctl_cmd_entry ctl_cmd_table_a3[32] =
+{
+/* 00 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 01 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 02 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 03 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 04 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 05 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 06 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 07 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 08 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 09 */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0A REPORT TARGET PORT GROUPS */
+{ctl_report_tagret_port_groups, CTL_SERIDX_INQ, CTL_CMD_FLAG_OK_ON_BOTH |
+						CTL_CMD_FLAG_OK_ON_STOPPED |
+						CTL_CMD_FLAG_OK_ON_INOPERABLE |
+						CTL_CMD_FLAG_OK_ON_SECONDARY |
+						CTL_FLAG_DATA_IN,
+ CTL_LUN_PAT_NONE,
+ 12, {0x0a, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 0B */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0C REPORT SUPPORTED_OPCODES */
+{ctl_report_supported_opcodes, CTL_SERIDX_INQ, CTL_CMD_FLAG_OK_ON_BOTH |
+						CTL_CMD_FLAG_OK_ON_STOPPED |
+						CTL_CMD_FLAG_OK_ON_INOPERABLE |
+						CTL_CMD_FLAG_OK_ON_SECONDARY |
+						CTL_FLAG_DATA_IN,
+ CTL_LUN_PAT_NONE,
+ 12, {0x0c, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 0D REPORT SUPPORTED_TASK MANAGEMENT FUNCTIONS */
+{ctl_report_supported_tmf, CTL_SERIDX_INQ, CTL_CMD_FLAG_OK_ON_BOTH |
+					   CTL_CMD_FLAG_OK_ON_STOPPED |
+					   CTL_CMD_FLAG_OK_ON_INOPERABLE |
+					   CTL_CMD_FLAG_OK_ON_SECONDARY |
+					   CTL_FLAG_DATA_IN,
+ CTL_LUN_PAT_NONE,
+ 12, {0x0d, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 0E */
+{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+
+/* 0F REPORT TIMESTAMP */
+{ctl_report_timestamp, CTL_SERIDX_INQ, CTL_CMD_FLAG_OK_ON_BOTH |
+					CTL_CMD_FLAG_OK_ON_STOPPED |
+					CTL_CMD_FLAG_OK_ON_INOPERABLE |
+					CTL_CMD_FLAG_OK_ON_SECONDARY |
+					CTL_FLAG_DATA_IN,
+ CTL_LUN_PAT_NONE,
+ 12, {0x0f, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
+
+/* 10-1f */
+};
+
+const struct ctl_cmd_entry ctl_cmd_table[256] =
 {
 /* 00 TEST UNIT READY */
 {ctl_tur, CTL_SERIDX_TUR, CTL_CMD_FLAG_OK_ON_BOTH |
 			  CTL_FLAG_DATA_NONE |
 			  CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
- CTL_LUN_PAT_TUR},
+ CTL_LUN_PAT_TUR, 6, {0, 0, 0, 0, 0x07}},
 
 /* 01 REWIND */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -85,13 +522,13 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 				       CTL_CMD_FLAG_OK_ON_OFFLINE |
 				       CTL_CMD_FLAG_OK_ON_SECONDARY |
 				       CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE, 6, {0x01, 0, 0, 0xff, 0x07}},
 
 /* 04 FORMAT UNIT */
 {ctl_format, CTL_SERIDX_FORMAT, CTL_CMD_FLAG_OK_ON_SLUN |
 				CTL_CMD_FLAG_OK_ON_INOPERABLE |
 				CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE, 6, {0xff, 0, 0, 0, 0x07}},
 
 /* 05 READ BLOCK LIMITS */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -106,7 +543,7 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 {ctl_read_write, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_SLUN |
 				  CTL_FLAG_DATA_IN |
 				  CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
- CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE},
+ CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE, 6, {0x1f, 0xff, 0xff, 0xff, 0x07}},
 
 /* 09 */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -114,7 +551,7 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 /* 0A WRITE(6) */
 {ctl_read_write, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN |
 				   CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE},
+ CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE, 6, {0x1f, 0xff, 0xff, 0xff, 0x07}},
 
 /* 0B SEEK(6) */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -147,7 +584,7 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 			      CTL_CMD_FLAG_OK_ON_SECONDARY |
 			      CTL_FLAG_DATA_IN |
 			      CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE, 6, {0xe1, 0xff, 0xff, 0xff, 0x07}},
 
 /* 13 */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -161,25 +598,25 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 				     CTL_CMD_FLAG_OK_ON_INOPERABLE |
 				     CTL_CMD_FLAG_OK_ON_SECONDARY |
 				     CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE, 6, {0x11, 0, 0, 0xff, 0x07}},
 
 /* 16 RESERVE(6) */
-{ctl_scsi_reserve, CTL_SERIDX_RESV, CTL_CMD_FLAG_ALLOW_ON_RESV |
+{ctl_scsi_reserve, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
 				    CTL_CMD_FLAG_OK_ON_BOTH |
 				    CTL_CMD_FLAG_OK_ON_STOPPED |
 				    CTL_CMD_FLAG_OK_ON_INOPERABLE |
 				    CTL_CMD_FLAG_OK_ON_SECONDARY |
 				    CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE, 6, {0, 0, 0, 0, 0x07}},
 
 /* 17 RELEASE(6) */
-{ctl_scsi_release, CTL_SERIDX_REL, CTL_CMD_FLAG_ALLOW_ON_RESV |
+{ctl_scsi_release, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
 				   CTL_CMD_FLAG_OK_ON_BOTH |
 				   CTL_CMD_FLAG_OK_ON_STOPPED |
 				   CTL_CMD_FLAG_OK_ON_INOPERABLE |
 				   CTL_CMD_FLAG_OK_ON_SECONDARY |
 				   CTL_FLAG_DATA_NONE,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE, 6, {0, 0, 0, 0, 0x07}},
 
 /* 18 COPY */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -192,8 +629,9 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 				    CTL_CMD_FLAG_OK_ON_STOPPED |
 				    CTL_CMD_FLAG_OK_ON_INOPERABLE |
 				    CTL_CMD_FLAG_OK_ON_SECONDARY |
-				    CTL_FLAG_DATA_IN,
- CTL_LUN_PAT_NONE},
+				    CTL_FLAG_DATA_IN |
+				    CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE, 6, {0x08, 0xff, 0, 0xff, 0x07}},
 
 /* 1B START STOP UNIT */
 {ctl_start_stop, CTL_SERIDX_START, CTL_CMD_FLAG_OK_ON_SLUN |
@@ -202,7 +640,7 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 				   CTL_CMD_FLAG_OK_ON_OFFLINE |
 				   CTL_FLAG_DATA_NONE |
 				   CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE, 6, {0x01, 0, 0, 0x03, 0x07}},
 
 /* 1C RECEIVE DIAGNOSTIC RESULTS */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -238,7 +676,7 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 				       CTL_CMD_FLAG_OK_ON_SECONDARY |
 				       CTL_FLAG_DATA_IN |
 				       CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
- CTL_LUN_PAT_READCAP},
+ CTL_LUN_PAT_READCAP, 10, {0, 0, 0, 0, 0, 0, 0, 0, 0x07}},
 
 /* 26 */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -250,14 +688,16 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 {ctl_read_write, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_SLUN |
 				  CTL_FLAG_DATA_IN |
 				  CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
- CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE},
+ CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE,
+ 10, {0x18, 0xff, 0xff, 0xff, 0xff, 0, 0xff, 0xff, 0x07}},
 
 /* 29 READ GENERATION */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
 /* 2A WRITE(10) */
 {ctl_read_write, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN| CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE},
+ CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
+ 10, {0x18, 0xff, 0xff, 0xff, 0xff, 0, 0xff, 0xff, 0x07}},
 
 /* 2B SEEK(10) */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -270,10 +710,15 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 
 /* 2E WRITE AND VERIFY(10) */
 {ctl_read_write, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN| CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE},
+ CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
+ 10, {0x10, 0xff, 0xff, 0xff, 0xff, 0, 0xff, 0xff, 0x07}},
 
 /* 2F VERIFY(10) */
-{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+{ctl_verify, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_SLUN |
+			      CTL_FLAG_DATA_OUT |
+			      CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE,
+ 10, {0x16, 0xff, 0xff, 0xff, 0xff, 0, 0xff, 0xff, 0x07}},
 
 /* 30 SEARCH DATA HIGH(10) */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -293,7 +738,8 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 /* 35 SYNCHRONIZE CACHE(10) */
 {ctl_sync_cache, CTL_SERIDX_START, CTL_CMD_FLAG_OK_ON_SLUN |
 				   CTL_FLAG_DATA_NONE,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE,
+ 10, {0, 0xff, 0xff, 0xff, 0xff, 0, 0xff, 0xff, 0x07}},
 
 /* 36 LOCK UNLOCK CACHE(10) */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -311,12 +757,17 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
 /* 3B WRITE BUFFER */
-{ctl_write_buffer, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_PROC |
-				     CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_NONE},
+{ctl_write_buffer, CTL_SERIDX_MD_SEL, CTL_CMD_FLAG_OK_ON_BOTH |
+				      CTL_FLAG_DATA_OUT,
+ CTL_LUN_PAT_NONE,
+ 10, {0x1f, 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07}},
 
 /* 3C READ BUFFER */
-{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+{ctl_read_buffer, CTL_SERIDX_MD_SNS, CTL_CMD_FLAG_OK_ON_BOTH |
+				     CTL_FLAG_DATA_IN |
+				     CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE,
+ 10, {0x1f, 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07}},
 
 /* 3D UPDATE BLOCK */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -333,11 +784,13 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 /* 41 WRITE SAME(10) */
 {ctl_write_same, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN |
 				   CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE},
+ CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
+ 10, {0x1a, 0xff, 0xff, 0xff, 0xff, 0, 0xff, 0xff, 0x07}},
 
 /* 42 READ SUB-CHANNEL / UNMAP */
 {ctl_unmap, CTL_SERIDX_UNMAP, CTL_CMD_FLAG_OK_ON_SLUN | CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_WRITE},
+ CTL_LUN_PAT_WRITE,
+ 10, {1, 0, 0, 0, 0, 0, 0xff, 0xff, 0x07}},
 
 /* 43 READ TOC/PMA/ATIP */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -399,25 +852,25 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 				     CTL_CMD_FLAG_OK_ON_INOPERABLE |
 				     CTL_CMD_FLAG_OK_ON_SECONDARY |
 				     CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE, 10, {0x11, 0, 0, 0, 0, 0, 0xff, 0xff, 0x07} },
 
 /* 56 RESERVE(10) */
-{ctl_scsi_reserve, CTL_SERIDX_RESV, CTL_CMD_FLAG_ALLOW_ON_RESV |
+{ctl_scsi_reserve, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
 				    CTL_CMD_FLAG_OK_ON_BOTH |
 				    CTL_CMD_FLAG_OK_ON_STOPPED |
 				    CTL_CMD_FLAG_OK_ON_INOPERABLE |
 				    CTL_CMD_FLAG_OK_ON_SECONDARY |
 				    CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE, 10, {0x02, 0, 0xff, 0, 0, 0, 0xff, 0xff, 0x07} },
 
 /* 57 RELEASE(10) */
-{ctl_scsi_release, CTL_SERIDX_REL, CTL_CMD_FLAG_ALLOW_ON_RESV |
+{ctl_scsi_release, CTL_SERIDX_RES, CTL_CMD_FLAG_ALLOW_ON_RESV |
 				   CTL_CMD_FLAG_OK_ON_BOTH |
 				   CTL_CMD_FLAG_OK_ON_STOPPED |
 				   CTL_CMD_FLAG_OK_ON_INOPERABLE |
 				   CTL_CMD_FLAG_OK_ON_SECONDARY |
 				   CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE, 10, {0x02, 0, 0xff, 0, 0, 0, 0xff, 0xff, 0x07} },
 
 /* 58 REPAIR TRACK */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -430,8 +883,9 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 				    CTL_CMD_FLAG_OK_ON_STOPPED |
 				    CTL_CMD_FLAG_OK_ON_INOPERABLE |
 				    CTL_CMD_FLAG_OK_ON_SECONDARY |
-				    CTL_FLAG_DATA_IN,
- CTL_LUN_PAT_NONE},
+				    CTL_FLAG_DATA_IN |
+				    CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_NONE, 10, {0x18, 0xff, 0, 0, 0, 0, 0xff, 0xff, 0x07} },
 
 /* 5B CLOSE TRACK/SESSION */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -443,29 +897,13 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
 /* 5E PERSISTENT RESERVE IN */
-{ctl_persistent_reserve_in, CTL_SERIDX_PRES_IN, CTL_CMD_FLAG_ALLOW_ON_RESV |
-						CTL_CMD_FLAG_OK_ON_BOTH |
-						CTL_CMD_FLAG_OK_ON_STOPPED |
-						CTL_CMD_FLAG_OK_ON_INOPERABLE |
-						CTL_CMD_FLAG_OK_ON_SECONDARY |
-						CTL_FLAG_DATA_IN |
-						CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+{__DECONST(ctl_opfunc *, ctl_cmd_table_5e), CTL_SERIDX_INVLD, CTL_CMD_FLAG_SA5,
  CTL_LUN_PAT_NONE},
 
-//{ctl_persistent_reserve_in, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE},
-
 /* 5F PERSISTENT RESERVE OUT */
-{ctl_persistent_reserve_out, CTL_SERIDX_PRES_OUT, CTL_CMD_FLAG_ALLOW_ON_RESV |
-						  CTL_CMD_FLAG_OK_ON_BOTH |
-						  CTL_CMD_FLAG_OK_ON_STOPPED |
-						  CTL_CMD_FLAG_OK_ON_INOPERABLE|
-						  CTL_CMD_FLAG_OK_ON_SECONDARY |
-						  CTL_FLAG_DATA_OUT |
-						  CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+{__DECONST(ctl_opfunc *, ctl_cmd_table_5f), CTL_SERIDX_INVLD, CTL_CMD_FLAG_SA5,
  CTL_LUN_PAT_NONE},
 
-//{ctl_persistent_reserve_out, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE},
-
 /* 60 */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
@@ -572,10 +1010,12 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
 /* 83 EXTENDED COPY */
-{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+{__DECONST(ctl_opfunc *, ctl_cmd_table_83), CTL_SERIDX_INVLD, CTL_CMD_FLAG_SA5,
+ CTL_LUN_PAT_NONE},
 
 /* 84 RECEIVE COPY RESULTS */
-{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+{__DECONST(ctl_opfunc *, ctl_cmd_table_84), CTL_SERIDX_INVLD, CTL_CMD_FLAG_SA5,
+ CTL_LUN_PAT_NONE},
 
 /* 85 */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -589,14 +1029,21 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 /* 88 READ(16) */
 {ctl_read_write, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_SLUN | CTL_FLAG_DATA_IN |
                                   CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
- CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE},
+ CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE,
+ 16, {0x18, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
-/* 89 */
-{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+/* 89 COMPARE AND WRITE */
+{ctl_cnw, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN| CTL_FLAG_DATA_OUT,
+ CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
+ 16, {0x18, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+      0xff, 0xff, 0, 0, 0, 0xff, 0, 0x07}},
 
 /* 8A WRITE(16) */
 {ctl_read_write, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN| CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE},
+ CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
+ 16, {0x18, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* 8B */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -609,10 +1056,17 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 
 /* 8E WRITE AND VERIFY(16) */
 {ctl_read_write, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN| CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE},
+ CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
+ 16, {0x10, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* 8F VERIFY(16) */
-{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+{ctl_verify, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_SLUN |
+			      CTL_FLAG_DATA_OUT |
+			      CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE,
+ 16, {0x16, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* 90 PRE-FETCH(16) */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -620,7 +1074,9 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 /* 91 SYNCHRONIZE CACHE(16) */
 {ctl_sync_cache, CTL_SERIDX_START, CTL_CMD_FLAG_OK_ON_SLUN |
 				   CTL_FLAG_DATA_NONE,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE,
+ 16, {0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* 92 LOCK UNLOCK CACHE(16) */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -628,7 +1084,9 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 /* 93 WRITE SAME(16) */
 {ctl_write_same, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN |
 				   CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE},
+ CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
+ 16, {0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* 94 */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -661,14 +1119,8 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
 /* 9E SERVICE ACTION IN(16) */
-/* XXX KDM not all service actions will be read capacity!! */
-{ctl_service_action_in, CTL_SERIDX_RD_CAP, CTL_CMD_FLAG_OK_ON_SLUN |
-					   CTL_CMD_FLAG_OK_ON_STOPPED |
-					   CTL_CMD_FLAG_OK_ON_INOPERABLE |
-					   CTL_CMD_FLAG_OK_ON_SECONDARY |
-					   CTL_FLAG_DATA_IN |
-					   CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
- CTL_LUN_PAT_READCAP},
+{__DECONST(ctl_opfunc *, ctl_cmd_table_9e), CTL_SERIDX_INVLD, CTL_CMD_FLAG_SA5,
+ CTL_LUN_PAT_NONE},
 
 /* 9F SERVICE ACTION OUT(16) */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -683,7 +1135,8 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 				  CTL_CMD_FLAG_OK_ON_SECONDARY |
 				  CTL_FLAG_DATA_IN |
 				  CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE,
+ 12, {0, 0xff, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* A1 BLANK */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -691,15 +1144,11 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 /* A2 SEND EVENT */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
-/* A3 MAINTENANCE (IN) Service Action - (0A) REPORT TARGET PORT GROUP */
-{ctl_maintenance_in, CTL_SERIDX_MAIN_IN, CTL_CMD_FLAG_OK_ON_BOTH |
-				         CTL_CMD_FLAG_OK_ON_STOPPED |
-				         CTL_CMD_FLAG_OK_ON_INOPERABLE |
-				         CTL_CMD_FLAG_OK_ON_SECONDARY |
-				         CTL_FLAG_DATA_IN,
+/* A3 MAINTENANCE IN */
+{__DECONST(ctl_opfunc *, ctl_cmd_table_a3), CTL_SERIDX_INVLD, CTL_CMD_FLAG_SA5,
  CTL_LUN_PAT_NONE},
 
-/* A4 MAINTENANCE (OUT) */
+/* A4 MAINTENANCE OUT */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
 /* A5 MOVE MEDIUM */
@@ -714,14 +1163,16 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 /* A8 READ(12) */
 {ctl_read_write, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_SLUN | CTL_FLAG_DATA_IN |
                                   CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
- CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE},
+ CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE,
+ 12, {0x18, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* A9 PLAY TRACK RELATIVE(12) */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
 /* AA WRITE(12) */
 {ctl_read_write, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN| CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE},
+ CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
+ 12, {0x18, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* AB SERVICE ACTION IN(12) */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -734,10 +1185,15 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 
 /* AE WRITE AND VERIFY(12) */
 {ctl_read_write, CTL_SERIDX_WRITE, CTL_CMD_FLAG_OK_ON_SLUN| CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE},
+ CTL_LUN_PAT_WRITE | CTL_LUN_PAT_RANGE,
+ 12, {0x10, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* AF VERIFY(12) */
-{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
+{ctl_verify, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_SLUN |
+			      CTL_FLAG_DATA_OUT |
+			      CTL_CMD_FLAG_ALLOW_ON_PR_RESV,
+ CTL_LUN_PAT_READ | CTL_LUN_PAT_RANGE,
+ 12, {0x16, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0x07}},
 
 /* B0 SEARCH DATA HIGH(12) */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
@@ -769,43 +1225,51 @@ struct ctl_cmd_entry ctl_cmd_table[] =
 /* B9 READ CD MSF */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
-/* BA REDUNDANCY GROUP (IN) */
+/* BA REDUNDANCY GROUP IN */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
-/* BB REDUNDANCY GROUP (OUT) */
+/* BB REDUNDANCY GROUP OUT */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
-/* BC SPARE (IN) */
+/* BC SPARE IN */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
-/* BD SPARE (OUT) */
+/* BD SPARE OUT */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
-/* BE VOLUME SET (IN) */
+/* BE VOLUME SET IN */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
-/* BF VOLUME SET (OUT) */
+/* BF VOLUME SET OUT */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
 
 /* C0 - ISC_SEND_MSG_SHORT */
 //{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE},
 {ctl_isc, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_PROC | CTL_FLAG_DATA_NONE,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE,
+ 16, {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}},
 
 /* C1 - ISC_SEND_MSG */
 //{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE},
 {ctl_isc, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_PROC | CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE,
+ 16, {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}},
 
 /* C2 - ISC_WRITE */
 //{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE},
 {ctl_isc, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_PROC | CTL_FLAG_DATA_OUT,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE,
+ 16, {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}},
 
 /* C3 - ISC_READ */
 //{NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE},
 {ctl_isc, CTL_SERIDX_READ, CTL_CMD_FLAG_OK_ON_PROC | CTL_FLAG_DATA_IN,
- CTL_LUN_PAT_NONE},
+ CTL_LUN_PAT_NONE,
+ 16, {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}},
 
 /* C4 */
 {NULL, CTL_SERIDX_INVLD, CTL_CMD_FLAG_NONE, CTL_LUN_PAT_NONE},
diff --git a/sys/cam/ctl/ctl_error.c b/sys/cam/ctl/ctl_error.c
index 4425b2d608ad..6ecb54bee75a 100644
--- a/sys/cam/ctl/ctl_error.c
+++ b/sys/cam/ctl/ctl_error.c
@@ -401,6 +401,11 @@ ctl_build_ua(ctl_ua_type ua_type, struct scsi_sense_data *sense,
 		asc = 0x29;
 		ascq = 0x03;
 		break;
+	case CTL_UA_I_T_NEXUS_LOSS:
+		/* 29h/07h  I_T NEXUS LOSS OCCURRED */
+		asc = 0x29;
+		ascq = 0x07;
+		break;
 	case CTL_UA_LUN_RESET:
 		/* 29h/00h  POWER ON, RESET, OR BUS DEVICE RESET OCCURRED */
 		/*
@@ -789,6 +794,18 @@ ctl_set_busy(struct ctl_scsiio *ctsio)
 	ctsio->io_hdr.status = CTL_SCSI_ERROR;
 }
 
+void
+ctl_set_task_aborted(struct ctl_scsiio *ctsio)
+{
+	struct scsi_sense_data *sense;
+
+	sense = &ctsio->sense_data;
+	memset(sense, 0, sizeof(*sense));
+	ctsio->scsi_status = SCSI_STATUS_TASK_ABORTED;
+	ctsio->sense_len = 0;
+	ctsio->io_hdr.status = CTL_CMD_ABORTED;
+}
+
 void
 ctl_set_success(struct ctl_scsiio *ctsio)
 {
diff --git a/sys/cam/ctl/ctl_error.h b/sys/cam/ctl/ctl_error.h
index 1d8bd9b7d1b8..62596d0a1a40 100644
--- a/sys/cam/ctl/ctl_error.h
+++ b/sys/cam/ctl/ctl_error.h
@@ -80,6 +80,7 @@ void ctl_set_data_phase_error(struct ctl_scsiio *ctsio);
 void ctl_set_reservation_conflict(struct ctl_scsiio *ctsio);
 void ctl_set_queue_full(struct ctl_scsiio *ctsio);
 void ctl_set_busy(struct ctl_scsiio *ctsio);
+void ctl_set_task_aborted(struct ctl_scsiio *ctsio);
 void ctl_set_success(struct ctl_scsiio *ctsio);
 
 #endif	/* _CTL_ERROR_H_ */
diff --git a/sys/cam/ctl/ctl_frontend.c b/sys/cam/ctl/ctl_frontend.c
index 2bc6ade46415..34b4a9ef5875 100644
--- a/sys/cam/ctl/ctl_frontend.c
+++ b/sys/cam/ctl/ctl_frontend.c
@@ -66,7 +66,77 @@ __FBSDID("$FreeBSD$");
 extern struct ctl_softc *control_softc;
 
 int
-ctl_frontend_register(struct ctl_frontend *fe, int master_shelf)
+ctl_frontend_register(struct ctl_frontend *fe)
+{
+	struct ctl_frontend *fe_tmp;
+
+	KASSERT(control_softc != NULL, ("CTL is not initialized"));
+
+	/*
+	 * Sanity check, make sure this isn't a duplicate registration.
+	 */
+	mtx_lock(&control_softc->ctl_lock);
+	STAILQ_FOREACH(fe_tmp, &control_softc->fe_list, links) {
+		if (strcmp(fe_tmp->name, fe->name) == 0) {
+			mtx_unlock(&control_softc->ctl_lock);
+			return (-1);
+		}
+	}
+	mtx_unlock(&control_softc->ctl_lock);
+	STAILQ_INIT(&fe->port_list);
+
+	/*
+	 * Call the frontend's initialization routine.
+	 */
+	if (fe->init != NULL)
+		fe->init();
+
+	mtx_lock(&control_softc->ctl_lock);
+	control_softc->num_frontends++;
+	STAILQ_INSERT_TAIL(&control_softc->fe_list, fe, links);
+	mtx_unlock(&control_softc->ctl_lock);
+	return (0);
+}
+
+int
+ctl_frontend_deregister(struct ctl_frontend *fe)
+{
+
+	if (!STAILQ_EMPTY(&fe->port_list))
+		return (-1);
+
+	mtx_lock(&control_softc->ctl_lock);
+	STAILQ_REMOVE(&control_softc->fe_list, fe, ctl_frontend, links);
+	control_softc->num_frontends--;
+	mtx_unlock(&control_softc->ctl_lock);
+
+	/*
+	 * Call the frontend's shutdown routine.
+	 */
+	if (fe->shutdown != NULL)
+		fe->shutdown();
+	return (0);
+}
+
+struct ctl_frontend *
+ctl_frontend_find(char *frontend_name)
+{
+	struct ctl_softc *ctl_softc = control_softc;
+	struct ctl_frontend *fe;
+
+	mtx_lock(&ctl_softc->ctl_lock);
+	STAILQ_FOREACH(fe, &ctl_softc->fe_list, links) {
+		if (strcmp(fe->name, frontend_name) == 0) {
+			mtx_unlock(&ctl_softc->ctl_lock);
+			return (fe);
+		}
+	}
+	mtx_unlock(&ctl_softc->ctl_lock);
+	return (NULL);
+}
+
+int
+ctl_port_register(struct ctl_port *port, int master_shelf)
 {
 	struct ctl_io_pool *pool;
 	int port_num;
@@ -80,13 +150,24 @@ ctl_frontend_register(struct ctl_frontend *fe, int master_shelf)
 	port_num = ctl_ffz(&control_softc->ctl_port_mask, CTL_MAX_PORTS);
 	if ((port_num == -1)
 	 || (ctl_set_mask(&control_softc->ctl_port_mask, port_num) == -1)) {
-		fe->targ_port = -1;
+		port->targ_port = -1;
 		mtx_unlock(&control_softc->ctl_lock);
 		return (1);
 	}
-	control_softc->num_frontends++;
-
+	control_softc->num_ports++;
 	mtx_unlock(&control_softc->ctl_lock);
+
+	/*
+	 * Initialize the initiator and portname mappings
+	 */
+	port->max_initiators = CTL_MAX_INIT_PER_PORT;
+	port->wwpn_iid = malloc(sizeof(*port->wwpn_iid) * port->max_initiators,
+	    M_CTL, M_NOWAIT | M_ZERO);
+	if (port->wwpn_iid == NULL) {
+		retval = ENOMEM;
+		goto error;
+	}
+
 	/*
 	 * We add 20 to whatever the caller requests, so he doesn't get
 	 * burned by queueing things back to the pending sense queue.  In
@@ -95,90 +176,137 @@ ctl_frontend_register(struct ctl_frontend *fe, int master_shelf)
 	 * pending sense queue on the next command, whether or not it is
 	 * a REQUEST SENSE.
 	 */
-	retval = ctl_pool_create(control_softc,
-				 (fe->port_type != CTL_PORT_IOCTL) ?
-				 CTL_POOL_FETD : CTL_POOL_IOCTL,
-				 fe->num_requested_ctl_io + 20, &pool);
+	retval = ctl_pool_create(control_softc, CTL_POOL_FETD,
+				 port->num_requested_ctl_io + 20, &pool);
 	if (retval != 0) {
-		fe->targ_port = -1;
+		free(port->wwpn_iid, M_CTL);
+error:
+		port->targ_port = -1;
 		mtx_lock(&control_softc->ctl_lock);
 		ctl_clear_mask(&control_softc->ctl_port_mask, port_num);
 		mtx_unlock(&control_softc->ctl_lock);
 		return (retval);
 	}
+	port->ctl_pool_ref = pool;
+
+	if (port->options.stqh_first == NULL)
+		STAILQ_INIT(&port->options);
 
 	mtx_lock(&control_softc->ctl_lock);
-
-	/* For now assume master shelf */
-	//fe->targ_port = port_num;
-	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);
-	control_softc->ctl_ports[port_num] = fe;
-
+	port->targ_port = port_num + (master_shelf != 0 ? 0 : CTL_MAX_PORTS);
+	STAILQ_INSERT_TAIL(&port->frontend->port_list, port, fe_links);
+	STAILQ_INSERT_TAIL(&control_softc->port_list, port, links);
+	control_softc->ctl_ports[port_num] = port;
 	mtx_unlock(&control_softc->ctl_lock);
 
-	fe->ctl_pool_ref = pool;
-
 	return (retval);
 }
 
 int
-ctl_frontend_deregister(struct ctl_frontend *fe)
+ctl_port_deregister(struct ctl_port *port)
 {
 	struct ctl_io_pool *pool;
-	int port_num;
-	int retval;
+	int port_num, retval, i;
 
 	retval = 0;
 
-	pool = (struct ctl_io_pool *)fe->ctl_pool_ref;
+	pool = (struct ctl_io_pool *)port->ctl_pool_ref;
 
-	if (fe->targ_port == -1) {
+	if (port->targ_port == -1) {
 		retval = 1;
 		goto bailout;
 	}
 
 	mtx_lock(&control_softc->ctl_lock);
-	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 :
-	                                             fe->targ_port - CTL_MAX_PORTS;
+	STAILQ_REMOVE(&control_softc->port_list, port, ctl_port, links);
+	STAILQ_REMOVE(&port->frontend->port_list, port, ctl_port, fe_links);
+	control_softc->num_ports--;
+	port_num = (port->targ_port < CTL_MAX_PORTS) ? port->targ_port :
+	    port->targ_port - CTL_MAX_PORTS;
 	ctl_clear_mask(&control_softc->ctl_port_mask, port_num);
 	control_softc->ctl_ports[port_num] = NULL;
 	mtx_unlock(&control_softc->ctl_lock);
 
 	ctl_pool_free(pool);
+	ctl_free_opts(&port->options);
+
+	free(port->port_devid, M_CTL);
+	port->port_devid = NULL;
+	free(port->target_devid, M_CTL);
+	port->target_devid = NULL;
+	free(port->init_devid, M_CTL);
+	port->init_devid = NULL;
+	for (i = 0; i < port->max_initiators; i++)
+		free(port->wwpn_iid[i].name, M_CTL);
+	free(port->wwpn_iid, M_CTL);
 
 bailout:
 	return (retval);
 }
 
 void
-ctl_frontend_set_wwns(struct ctl_frontend *fe, int wwnn_valid, uint64_t wwnn,
+ctl_port_set_wwns(struct ctl_port *port, int wwnn_valid, uint64_t wwnn,
 		      int wwpn_valid, uint64_t wwpn)
 {
-	if (wwnn_valid)
-		fe->wwnn = wwnn;
+	struct scsi_vpd_id_descriptor *desc;
+	int len, proto;
 
-	if (wwpn_valid)
-		fe->wwpn = wwpn;
+	if (port->port_type == CTL_PORT_FC)
+		proto = SCSI_PROTO_FC << 4;
+	else if (port->port_type == CTL_PORT_ISCSI)
+		proto = SCSI_PROTO_ISCSI << 4;
+	else
+		proto = SCSI_PROTO_SPI << 4;
+
+	if (wwnn_valid) {
+		port->wwnn = wwnn;
+
+		free(port->target_devid, M_CTL);
+
+		len = sizeof(struct scsi_vpd_device_id) + CTL_WWPN_LEN;
+		port->target_devid = malloc(sizeof(struct ctl_devid) + len,
+		    M_CTL, M_WAITOK | M_ZERO);
+		port->target_devid->len = len;
+		desc = (struct scsi_vpd_id_descriptor *)port->target_devid->data;
+		desc->proto_codeset = proto | SVPD_ID_CODESET_BINARY;
+		desc->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_TARGET |
+		    SVPD_ID_TYPE_NAA;
+		desc->length = CTL_WWPN_LEN;
+		scsi_u64to8b(port->wwnn, desc->identifier);
+	}
+
+	if (wwpn_valid) {
+		port->wwpn = wwpn;
+
+		free(port->port_devid, M_CTL);
+
+		len = sizeof(struct scsi_vpd_device_id) + CTL_WWPN_LEN;
+		port->port_devid = malloc(sizeof(struct ctl_devid) + len,
+		    M_CTL, M_WAITOK | M_ZERO);
+		port->port_devid->len = len;
+		desc = (struct scsi_vpd_id_descriptor *)port->port_devid->data;
+		desc->proto_codeset = proto | SVPD_ID_CODESET_BINARY;
+		desc->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT |
+		    SVPD_ID_TYPE_NAA;
+		desc->length = CTL_WWPN_LEN;
+		scsi_u64to8b(port->wwpn, desc->identifier);
+	}
 }
 
 void
-ctl_frontend_online(struct ctl_frontend *fe)
+ctl_port_online(struct ctl_port *port)
 {
-	fe->port_online(fe->onoff_arg);
+	port->port_online(port->onoff_arg);
 	/* XXX KDM need a lock here? */
-	fe->status |= CTL_PORT_STATUS_ONLINE;
+	port->status |= CTL_PORT_STATUS_ONLINE;
 }
 
 void
-ctl_frontend_offline(struct ctl_frontend *fe)
+ctl_port_offline(struct ctl_port *port)
 {
-	fe->port_offline(fe->onoff_arg);
+	port->port_offline(port->onoff_arg);
 	/* XXX KDM need a lock here? */
-	fe->status &= ~CTL_PORT_STATUS_ONLINE;
+	port->status &= ~CTL_PORT_STATUS_ONLINE;
 }
 
 /*
diff --git a/sys/cam/ctl/ctl_frontend.h b/sys/cam/ctl/ctl_frontend.h
index 23f91b4a810e..825ff50a0bca 100644
--- a/sys/cam/ctl/ctl_frontend.h
+++ b/sys/cam/ctl/ctl_frontend.h
@@ -46,12 +46,46 @@ typedef enum {
 	CTL_PORT_STATUS_LUN_ONLINE	= 0x04
 } ctl_port_status;
 
+typedef int (*fe_init_t)(void);
+typedef void (*fe_shutdown_t)(void);
 typedef void (*port_func_t)(void *onoff_arg);
-typedef int (*targ_func_t)(void *arg, struct ctl_id targ_id);
+typedef int (*port_info_func_t)(void *onoff_arg, struct sbuf *sb);
 typedef	int (*lun_func_t)(void *arg, struct ctl_id targ_id, int lun_id);
+typedef	uint32_t (*lun_map_func_t)(void *arg, uint32_t lun_id);
 typedef int (*fe_ioctl_t)(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
 			  struct thread *td);
-typedef int (*fe_devid_t)(struct ctl_scsiio *ctsio, int alloc_len);
+
+#define CTL_FRONTEND_DECLARE(name, driver) \
+	static int name ## _modevent(module_t mod, int type, void *data) \
+	{ \
+		switch (type) { \
+		case MOD_LOAD: \
+			ctl_frontend_register( \
+				(struct ctl_frontend *)data); \
+			break; \
+		case MOD_UNLOAD: \
+			printf(#name " module unload - not possible for this module type\n"); \
+			return EINVAL; \
+		default: \
+			return EOPNOTSUPP; \
+		} \
+		return 0; \
+	} \
+	static moduledata_t name ## _mod = { \
+		#name, \
+		name ## _modevent, \
+		(void *)&driver \
+	}; \
+	DECLARE_MODULE(name, name ## _mod, SI_SUB_CONFIGURE, SI_ORDER_FOURTH); \
+	MODULE_DEPEND(name, ctl, 1, 1, 1); \
+	MODULE_DEPEND(name, cam, 1, 1, 1)
+
+struct ctl_wwpn_iid {
+	int in_use;
+	time_t last_use;
+	uint64_t wwpn;
+	char *name;
+};
 
 /*
  * The ctl_frontend structure is the registration mechanism between a FETD
@@ -105,30 +139,6 @@ typedef int (*fe_devid_t)(struct ctl_scsiio *ctsio, int alloc_len);
  *			  and port_offline().  This is specified by the
  *			  FETD.
  *
- * targ_enable():	  This function is called, with targ_lun_arg and a
- * 			  target ID as its arguments, by CTL when it wants
- *			  the FETD to enable a particular target.  targ_enable()
- *			  will always be called for a particular target ID
- * 			  before any LUN is enabled for that target.  If the
- *			  FETD does not support enabling targets, but rather
- *			  LUNs, it should ignore this call and return 0.  If
- *			  the FETD does support enabling targets, it should
- *			  return 0 for success and non-zero if it cannot
- *			  enable the given target.
- *
- *			  TODO:  Add the ability to specify a WWID here.
- *
- * targ_disable():	  This function is called, with targ_lun_arg and a
- *			  target ID as its arguments, by CTL when it wants
- *			  the FETD to disable a particular target.
- *			  targ_disable() will always be called for a
- *			  particular target ID after all LUNs are disabled
- *			  on that particular target.  If the FETD does not
- *			  support enabling targets, it should ignore this
- *			  call and return 0.  If the FETD does support
- *			  enabling targets, it should return 0 for success,
- *			  and non-zero if it cannot disable the given target.
- *
  * lun_enable():	  This function is called, with targ_lun_arg, a target
  *			  ID and a LUN ID as its arguments, by CTL when it
  *			  wants the FETD to enable a particular LUN.  If the
@@ -203,7 +213,8 @@ typedef int (*fe_devid_t)(struct ctl_scsiio *ctsio, int alloc_len);
  * links:		  Linked list pointers, used by CTL.  The FETD
  *			  shouldn't touch this field.
  */
-struct ctl_frontend {
+struct ctl_port {
+	struct ctl_frontend *frontend;
 	ctl_port_type	port_type;		/* passed to CTL */
 	int		num_requested_ctl_io;	/* passed to CTL */
 	char		*port_name;		/* passed to CTL */
@@ -211,25 +222,38 @@ struct ctl_frontend {
 	int		virtual_port;		/* passed to CTL */
 	port_func_t	port_online;		/* passed to CTL */
 	port_func_t	port_offline;		/* passed to CTL */
+	port_info_func_t port_info;		/* passed to CTL */
 	void		*onoff_arg;		/* passed to CTL */
-	targ_func_t	targ_enable;		/* passed to CTL */
-	targ_func_t	targ_disable;		/* passed to CTL */
 	lun_func_t	lun_enable;		/* passed to CTL */
 	lun_func_t	lun_disable;		/* passed to CTL */
-	fe_ioctl_t	ioctl;			/* passed to CTL */
-	fe_devid_t	devid;			/* passed to CTL */
+	lun_map_func_t	lun_map;		/* passed to CTL */
 	void		*targ_lun_arg;		/* passed to CTL */
 	void		(*fe_datamove)(union ctl_io *io); /* passed to CTL */
 	void		(*fe_done)(union ctl_io *io); /* passed to CTL */
-	void		(*fe_dump)(void);	/* passed to CTL */
 	int		max_targets;		/* passed to CTL */
 	int		max_target_id;		/* passed to CTL */
 	int32_t		targ_port;		/* passed back to FETD */
 	void		*ctl_pool_ref;		/* passed back to FETD */
 	uint32_t	max_initiators;		/* passed back to FETD */
+	struct ctl_wwpn_iid *wwpn_iid;		/* used by CTL */
 	uint64_t	wwnn;			/* set by CTL before online */
 	uint64_t	wwpn;			/* set by CTL before online */
 	ctl_port_status	status;			/* used by CTL */
+	ctl_options_t	options;		/* passed to CTL */
+	struct ctl_devid *port_devid;		/* passed to CTL */
+	struct ctl_devid *target_devid;		/* passed to CTL */
+	struct ctl_devid *init_devid;		/* passed to CTL */
+	STAILQ_ENTRY(ctl_port) fe_links;	/* used by CTL */
+	STAILQ_ENTRY(ctl_port) links;		/* used by CTL */
+};
+
+struct ctl_frontend {
+	char		name[CTL_DRIVER_NAME_LEN];	/* passed to CTL */
+	fe_init_t	init;			/* passed to CTL */
+	fe_ioctl_t	ioctl;			/* passed to CTL */
+	void		(*fe_dump)(void);	/* passed to CTL */
+	fe_shutdown_t	shutdown;		/* passed to CTL */
+	STAILQ_HEAD(, ctl_port) port_list;	/* used by CTL */
 	STAILQ_ENTRY(ctl_frontend) links;	/* used by CTL */
 };
 
@@ -237,7 +261,7 @@ struct ctl_frontend {
  * This may block until resources are allocated.  Called at FETD module load
  * time. Returns 0 for success, non-zero for failure.
  */
-int ctl_frontend_register(struct ctl_frontend *fe, int master_SC);
+int ctl_frontend_register(struct ctl_frontend *fe);
 
 /*
  * Called at FETD module unload time.
@@ -245,21 +269,38 @@ int ctl_frontend_register(struct ctl_frontend *fe, int master_SC);
  */
 int ctl_frontend_deregister(struct ctl_frontend *fe);
 
+/*
+ * Find the frontend by its name. Returns NULL if not found.
+ */
+struct ctl_frontend * ctl_frontend_find(char *frontend_name);
+
+/*
+ * This may block until resources are allocated.  Called at FETD module load
+ * time. Returns 0 for success, non-zero for failure.
+ */
+int ctl_port_register(struct ctl_port *port, int master_SC);
+
+/*
+ * Called at FETD module unload time.
+ * Returns 0 for success, non-zero for failure.
+ */
+int ctl_port_deregister(struct ctl_port *port);
+
 /*
  * Called to set the WWNN and WWPN for a particular frontend.
  */
-void ctl_frontend_set_wwns(struct ctl_frontend *fe, int wwnn_valid,
+void ctl_port_set_wwns(struct ctl_port *port, int wwnn_valid,
 			   uint64_t wwnn, int wwpn_valid, uint64_t wwpn);
 
 /*
  * Called to bring a particular frontend online.
  */
-void ctl_frontend_online(struct ctl_frontend *fe);
+void ctl_port_online(struct ctl_port *fe);
 
 /*
  * Called to take a particular frontend offline.
  */
-void ctl_frontend_offline(struct ctl_frontend *fe);
+void ctl_port_offline(struct ctl_port *fe);
 
 /*
  * This routine queues I/O and task management requests from the FETD to the
@@ -280,21 +321,18 @@ int ctl_queue(union ctl_io *io);
 int ctl_queue_sense(union ctl_io *io);
 
 /*
- * This routine adds an initiator to CTL's port database.  The WWPN should
- * be the FC WWPN, if available.  The targ_port field should be the same as
- * the targ_port passed back from CTL in the ctl_frontend structure above.
+ * This routine adds an initiator to CTL's port database.
+ * The iid field should be the same as the iid passed in the nexus of each
+ * ctl_io from this initiator.
+ * The WWPN should be the FC WWPN, if available.
+ */
+int ctl_add_initiator(struct ctl_port *port, int iid, uint64_t wwpn, char *name);
+
+/*
+ * This routine will remove an initiator from CTL's port database.
  * The iid field should be the same as the iid passed in the nexus of each
  * ctl_io from this initiator.
  */
-int ctl_add_initiator(uint64_t wwpn, int32_t targ_port, uint32_t iid);
-
-/*
- * This routine will remove an initiator from CTL's port database.  The
- * targ_port field should be the same as the targ_port passed back in the
- * ctl_frontend structure above.  The iid field should be the same as the
- * iid passed in the nexus of each ctl_io from this initiator.
- */
-int
-ctl_remove_initiator(int32_t targ_port, uint32_t iid);
+int ctl_remove_initiator(struct ctl_port *port, int iid);
 
 #endif	/* _CTL_FRONTEND_H_ */
diff --git a/sys/cam/ctl/ctl_frontend_cam_sim.c b/sys/cam/ctl/ctl_frontend_cam_sim.c
index 37366e568543..72f8dd81c8b4 100644
--- a/sys/cam/ctl/ctl_frontend_cam_sim.c
+++ b/sys/cam/ctl/ctl_frontend_cam_sim.c
@@ -74,13 +74,12 @@ struct cfcs_io {
 };
 
 struct cfcs_softc {
-	struct ctl_frontend fe;
+	struct ctl_port port;
 	char port_name[32];
 	struct cam_sim *sim;
 	struct cam_devq *devq;
 	struct cam_path *path;
 	struct mtx lock;
-	char lock_desc[32];
 	uint64_t wwnn;
 	uint64_t wwpn;
 	uint32_t cur_tag_num;
@@ -97,12 +96,9 @@ struct cfcs_softc {
 	CAM_SENSE_PHYS)
 
 int cfcs_init(void);
-void cfcs_shutdown(void);
 static void cfcs_poll(struct cam_sim *sim);
 static void cfcs_online(void *arg);
 static void cfcs_offline(void *arg);
-static int cfcs_targ_enable(void *arg, struct ctl_id targ_id);
-static int cfcs_targ_disable(void *arg, struct ctl_id targ_id);
 static int cfcs_lun_enable(void *arg, struct ctl_id target_id, int lun_id);
 static int cfcs_lun_disable(void *arg, struct ctl_id target_id, int lun_id);
 static void cfcs_datamove(union ctl_io *io);
@@ -124,25 +120,19 @@ SYSCTL_NODE(_kern_cam, OID_AUTO, ctl2cam, CTLFLAG_RD, 0,
 SYSCTL_INT(_kern_cam_ctl2cam, OID_AUTO, max_sense, CTLFLAG_RW,
            &cfcs_max_sense, 0, "Maximum sense data size");
 
-static int cfcs_module_event_handler(module_t, int /*modeventtype_t*/, void *);
-
-static moduledata_t cfcs_moduledata = {
-	"ctlcfcs",
-	cfcs_module_event_handler,
-	NULL
+static struct ctl_frontend cfcs_frontend =
+{
+	.name = "camsim",
+	.init = cfcs_init,
 };
-
-DECLARE_MODULE(ctlcfcs, cfcs_moduledata, SI_SUB_CONFIGURE, SI_ORDER_FOURTH);
-MODULE_VERSION(ctlcfcs, 1);
-MODULE_DEPEND(ctlcfi, ctl, 1, 1, 1);
-MODULE_DEPEND(ctlcfi, cam, 1, 1, 1);
+CTL_FRONTEND_DECLARE(ctlcfcs, cfcs_frontend);
 
 int
 cfcs_init(void)
 {
 	struct cfcs_softc *softc;
 	struct ccb_setasync csa;
-	struct ctl_frontend *fe;
+	struct ctl_port *port;
 #ifdef NEEDTOPORT
 	char wwnn[8];
 #endif
@@ -151,34 +141,32 @@ cfcs_init(void)
 	softc = &cfcs_softc;
 	retval = 0;
 	bzero(softc, sizeof(*softc));
-	sprintf(softc->lock_desc, "ctl2cam");
-	mtx_init(&softc->lock, softc->lock_desc, NULL, MTX_DEF);
-	fe = &softc->fe;
+	mtx_init(&softc->lock, "ctl2cam", NULL, MTX_DEF);
+	port = &softc->port;
 
-	fe->port_type = CTL_PORT_INTERNAL;
+	port->frontend = &cfcs_frontend;
+	port->port_type = CTL_PORT_INTERNAL;
 	/* XXX KDM what should the real number be here? */
-	fe->num_requested_ctl_io = 4096;
-	snprintf(softc->port_name, sizeof(softc->port_name), "ctl2cam");
-	fe->port_name = softc->port_name;
-	fe->port_online = cfcs_online;
-	fe->port_offline = cfcs_offline;
-	fe->onoff_arg = softc;
-	fe->targ_enable = cfcs_targ_enable;
-	fe->targ_disable = cfcs_targ_disable;
-	fe->lun_enable = cfcs_lun_enable;
-	fe->lun_disable = cfcs_lun_disable;
-	fe->targ_lun_arg = softc;
-	fe->fe_datamove = cfcs_datamove;
-	fe->fe_done = cfcs_done;
+	port->num_requested_ctl_io = 4096;
+	snprintf(softc->port_name, sizeof(softc->port_name), "camsim");
+	port->port_name = softc->port_name;
+	port->port_online = cfcs_online;
+	port->port_offline = cfcs_offline;
+	port->onoff_arg = softc;
+	port->lun_enable = cfcs_lun_enable;
+	port->lun_disable = cfcs_lun_disable;
+	port->targ_lun_arg = softc;
+	port->fe_datamove = cfcs_datamove;
+	port->fe_done = cfcs_done;
 
 	/* XXX KDM what should we report here? */
 	/* XXX These should probably be fetched from CTL. */
-	fe->max_targets = 1;
-	fe->max_target_id = 15;
+	port->max_targets = 1;
+	port->max_target_id = 15;
 
-	retval = ctl_frontend_register(fe, /*master_SC*/ 1);
+	retval = ctl_port_register(port, /*master_SC*/ 1);
 	if (retval != 0) {
-		printf("%s: ctl_frontend_register() failed with error %d!\n",
+		printf("%s: ctl_port_register() failed with error %d!\n",
 		       __func__, retval);
 		mtx_destroy(&softc->lock);
 		return (retval);
@@ -190,30 +178,29 @@ cfcs_init(void)
 #ifdef NEEDTOPORT
 	ddb_GetWWNN((char *)wwnn);
 	softc->wwnn = be64dec(wwnn);
-	softc->wwpn = softc->wwnn + (softc->fe.targ_port & 0xff);
+	softc->wwpn = softc->wwnn + (softc->port.targ_port & 0xff);
 #endif
 
 	/*
 	 * If the CTL frontend didn't tell us what our WWNN/WWPN is, go
 	 * ahead and set something random.
 	 */
-	if (fe->wwnn == 0) {
+	if (port->wwnn == 0) {
 		uint64_t random_bits;
 
 		arc4rand(&random_bits, sizeof(random_bits), 0);
 		softc->wwnn = (random_bits & 0x0000000fffffff00ULL) |
 			/* Company ID */ 0x5000000000000000ULL |
 			/* NL-Port */    0x0300;
-		softc->wwpn = softc->wwnn + fe->targ_port + 1;
-		fe->wwnn = softc->wwnn;
-		fe->wwpn = softc->wwpn;
+		softc->wwpn = softc->wwnn + port->targ_port + 1;
+		ctl_port_set_wwns(port, true, softc->wwnn, true, softc->wwpn);
 	} else {
-		softc->wwnn = fe->wwnn;
-		softc->wwpn = fe->wwpn;
+		softc->wwnn = port->wwnn;
+		softc->wwpn = port->wwpn;
 	}
 
 	mtx_lock(&softc->lock);
-	softc->devq = cam_simq_alloc(fe->num_requested_ctl_io);
+	softc->devq = cam_simq_alloc(port->num_requested_ctl_io);
 	if (softc->devq == NULL) {
 		printf("%s: error allocating devq\n", __func__);
 		retval = ENOMEM;
@@ -222,7 +209,7 @@ cfcs_init(void)
 
 	softc->sim = cam_sim_alloc(cfcs_action, cfcs_poll, softc->port_name,
 				   softc, /*unit*/ 0, &softc->lock, 1,
-				   fe->num_requested_ctl_io, softc->devq);
+				   port->num_requested_ctl_io, softc->devq);
 	if (softc->sim == NULL) {
 		printf("%s: error allocating SIM\n", __func__);
 		retval = ENOMEM;
@@ -273,26 +260,6 @@ cfcs_poll(struct cam_sim *sim)
 
 }
 
-void
-cfcs_shutdown(void)
-{
-
-}
-
-static int
-cfcs_module_event_handler(module_t mod, int what, void *arg)
-{
-
-	switch (what) {
-	case MOD_LOAD:
-		return (cfcs_init());
-	case MOD_UNLOAD:
-		return (EBUSY);
-	default:
-		return (EOPNOTSUPP);
-	}
-}
-
 static void
 cfcs_onoffline(void *arg, int online)
 {
@@ -335,18 +302,6 @@ cfcs_offline(void *arg)
 	cfcs_onoffline(arg, /*online*/ 0);
 }
 
-static int
-cfcs_targ_enable(void *arg, struct ctl_id targ_id)
-{
-	return (0);
-}
-
-static int
-cfcs_targ_disable(void *arg, struct ctl_id targ_id)
-{
-	return (0);
-}
-
 static int
 cfcs_lun_enable(void *arg, struct ctl_id target_id, int lun_id)
 {
@@ -505,6 +460,10 @@ cfcs_done(union ctl_io *io)
 	union ccb *ccb;
 
 	ccb = io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr;
+	if (ccb == NULL) {
+		ctl_free_io(io);
+		return;
+	}
 
 	/*
 	 * At this point we should have status.  If we don't, that's a bug.
@@ -586,7 +545,7 @@ cfcs_action(struct cam_sim *sim, union ccb *ccb)
 			return;
 		}
 
-		io = ctl_alloc_io(softc->fe.ctl_pool_ref);
+		io = ctl_alloc_io(softc->port.ctl_pool_ref);
 		if (io == NULL) {
 			printf("%s: can't allocate ctl_io\n", __func__);
 			ccb->ccb_h.status = CAM_BUSY | CAM_DEV_QFRZN;
@@ -605,7 +564,7 @@ cfcs_action(struct cam_sim *sim, union ccb *ccb)
 		 */
 		io->io_hdr.io_type = CTL_IO_SCSI;
 		io->io_hdr.nexus.initid.id = 1;
-		io->io_hdr.nexus.targ_port = softc->fe.targ_port;
+		io->io_hdr.nexus.targ_port = softc->port.targ_port;
 		/*
 		 * XXX KDM how do we handle target IDs?
 		 */
@@ -681,7 +640,7 @@ cfcs_action(struct cam_sim *sim, union ccb *ccb)
 			return;
 		}
 
-		io = ctl_alloc_io(softc->fe.ctl_pool_ref);
+		io = ctl_alloc_io(softc->port.ctl_pool_ref);
 		if (io == NULL) {
 			ccb->ccb_h.status = CAM_BUSY | CAM_DEV_QFRZN;
 			xpt_freeze_devq(ccb->ccb_h.path, 1);
@@ -696,7 +655,7 @@ cfcs_action(struct cam_sim *sim, union ccb *ccb)
 
 		io->io_hdr.io_type = CTL_IO_TASK;
 		io->io_hdr.nexus.initid.id = 1;
-		io->io_hdr.nexus.targ_port = softc->fe.targ_port;
+		io->io_hdr.nexus.targ_port = softc->port.targ_port;
 		io->io_hdr.nexus.targ_target.id = ccb->ccb_h.target_id;
 		io->io_hdr.nexus.targ_lun = ccb->ccb_h.target_lun;
 		io->taskio.task_action = CTL_TASK_ABORT_TASK;
@@ -753,7 +712,7 @@ cfcs_action(struct cam_sim *sim, union ccb *ccb)
 		fc->bitrate = 800000;
 		fc->wwnn = softc->wwnn;
 		fc->wwpn = softc->wwpn;
-       		fc->port = softc->fe.targ_port;
+		fc->port = softc->port.targ_port;
 		fc->valid |= CTS_FC_VALID_WWNN | CTS_FC_VALID_WWPN |
 			CTS_FC_VALID_PORT; 
 		ccb->ccb_h.status = CAM_REQ_CMP;
@@ -776,7 +735,7 @@ cfcs_action(struct cam_sim *sim, union ccb *ccb)
 			return;
 		}
 
-		io = ctl_alloc_io(softc->fe.ctl_pool_ref);
+		io = ctl_alloc_io(softc->port.ctl_pool_ref);
 		if (io == NULL) {
 			ccb->ccb_h.status = CAM_BUSY | CAM_DEV_QFRZN;
 			xpt_freeze_devq(ccb->ccb_h.path, 1);
@@ -786,12 +745,13 @@ cfcs_action(struct cam_sim *sim, union ccb *ccb)
 
 		ctl_zero_io(io);
 		/* Save pointers on both sides */
-		io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = ccb;
+		if (ccb->ccb_h.func_code == XPT_RESET_DEV)
+			io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = ccb;
 		ccb->ccb_h.io_ptr = io;
 
 		io->io_hdr.io_type = CTL_IO_TASK;
 		io->io_hdr.nexus.initid.id = 0;
-		io->io_hdr.nexus.targ_port = softc->fe.targ_port;
+		io->io_hdr.nexus.targ_port = softc->port.targ_port;
 		io->io_hdr.nexus.targ_target.id = ccb->ccb_h.target_id;
 		io->io_hdr.nexus.targ_lun = ccb->ccb_h.target_lun;
 		if (ccb->ccb_h.func_code == XPT_RESET_BUS)
@@ -845,7 +805,7 @@ cfcs_action(struct cam_sim *sim, union ccb *ccb)
 		cpi->transport_version = 0;
 		cpi->xport_specific.fc.wwnn = softc->wwnn;
 		cpi->xport_specific.fc.wwpn = softc->wwpn;
-		cpi->xport_specific.fc.port = softc->fe.targ_port;
+		cpi->xport_specific.fc.port = softc->port.targ_port;
 		cpi->xport_specific.fc.bitrate = 8 * 1000 * 1000;
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		break;
diff --git a/sys/cam/ctl/ctl_frontend_internal.c b/sys/cam/ctl/ctl_frontend_internal.c
index 85eec748221a..ac972f306420 100644
--- a/sys/cam/ctl/ctl_frontend_internal.c
+++ b/sys/cam/ctl/ctl_frontend_internal.c
@@ -173,7 +173,7 @@ typedef enum {
 } cfi_flags;
 
 struct cfi_softc {
-	struct ctl_frontend fe;
+	struct ctl_port port;
 	char fe_name[40];
 	struct mtx lock;
 	cfi_flags flags;
@@ -192,8 +192,6 @@ int cfi_init(void);
 void cfi_shutdown(void) __unused;
 static void cfi_online(void *arg);
 static void cfi_offline(void *arg);
-static int cfi_targ_enable(void *arg, struct ctl_id targ_id);
-static int cfi_targ_disable(void *arg, struct ctl_id targ_id);
 static int cfi_lun_enable(void *arg, struct ctl_id target_id, int lun_id);
 static int cfi_lun_disable(void *arg, struct ctl_id target_id, int lun_id);
 static void cfi_datamove(union ctl_io *io);
@@ -216,28 +214,24 @@ static void cfi_metatask_io_done(union ctl_io *io);
 static void cfi_err_recovery_done(union ctl_io *io);
 static void cfi_lun_io_done(union ctl_io *io);
 
-static int cfi_module_event_handler(module_t, int /*modeventtype_t*/, void *);
-
-static moduledata_t cfi_moduledata = {
-	"ctlcfi",
-	cfi_module_event_handler,
-	NULL
+static struct ctl_frontend cfi_frontend =
+{
+	.name = "kernel",
+	.init = cfi_init,
+	.shutdown = cfi_shutdown,
 };
-
-DECLARE_MODULE(ctlcfi, cfi_moduledata, SI_SUB_CONFIGURE, SI_ORDER_FOURTH);
-MODULE_VERSION(ctlcfi, 1);
-MODULE_DEPEND(ctlcfi, ctl, 1, 1, 1);
+CTL_FRONTEND_DECLARE(ctlcfi, cfi_frontend);
 
 int
 cfi_init(void)
 {
 	struct cfi_softc *softc;
-	struct ctl_frontend *fe;
+	struct ctl_port *port;
 	int retval;
 
 	softc = &fetd_internal_softc;
 
-	fe = &softc->fe;
+	port = &softc->port;
 
 	retval = 0;
 
@@ -254,24 +248,23 @@ cfi_init(void)
 
 	STAILQ_INIT(&softc->lun_list);
 	STAILQ_INIT(&softc->metatask_list);
-	sprintf(softc->fe_name, "CTL internal");
-	fe->port_type = CTL_PORT_INTERNAL;
-	fe->num_requested_ctl_io = 100;
-	fe->port_name = softc->fe_name;
-	fe->port_online = cfi_online;
-	fe->port_offline = cfi_offline;
-	fe->onoff_arg = softc;
-	fe->targ_enable = cfi_targ_enable;
-	fe->targ_disable = cfi_targ_disable;
-	fe->lun_enable = cfi_lun_enable;
-	fe->lun_disable = cfi_lun_disable;
-	fe->targ_lun_arg = softc;
-	fe->fe_datamove = cfi_datamove;
-	fe->fe_done = cfi_done;
-	fe->max_targets = 15;
-	fe->max_target_id = 15;
+	sprintf(softc->fe_name, "kernel");
+	port->frontend = &cfi_frontend;
+	port->port_type = CTL_PORT_INTERNAL;
+	port->num_requested_ctl_io = 100;
+	port->port_name = softc->fe_name;
+	port->port_online = cfi_online;
+	port->port_offline = cfi_offline;
+	port->onoff_arg = softc;
+	port->lun_enable = cfi_lun_enable;
+	port->lun_disable = cfi_lun_disable;
+	port->targ_lun_arg = softc;
+	port->fe_datamove = cfi_datamove;
+	port->fe_done = cfi_done;
+	port->max_targets = 15;
+	port->max_target_id = 15;
 
-	if (ctl_frontend_register(fe, (softc->flags & CTL_FLAG_MASTER_SHELF)) != 0) 
+	if (ctl_port_register(port, (softc->flags & CTL_FLAG_MASTER_SHELF)) != 0) 
 	{
 		printf("%s: internal frontend registration failed\n", __func__);
 		return (0);
@@ -295,27 +288,13 @@ cfi_shutdown(void)
 	/*
 	 * XXX KDM need to clear out any I/O pending on each LUN.
 	 */
-	if (ctl_frontend_deregister(&softc->fe) != 0)
+	if (ctl_port_deregister(&softc->port) != 0)
 		printf("%s: ctl_frontend_deregister() failed\n", __func__);
 
 	uma_zdestroy(cfi_lun_zone);
 	uma_zdestroy(cfi_metatask_zone);
 }
 
-static int
-cfi_module_event_handler(module_t mod, int what, void *arg)
-{
-
-	switch (what) {
-	case MOD_LOAD:
-		return (cfi_init());
-	case MOD_UNLOAD:
-		return (EBUSY);
-	default:
-		return (EOPNOTSUPP);
-	}
-}
-
 static void
 cfi_online(void *arg)
 {
@@ -346,18 +325,6 @@ cfi_offline(void *arg)
 	softc->flags &= ~CFI_ONLINE;
 }
 
-static int
-cfi_targ_enable(void *arg, struct ctl_id targ_id)
-{
-	return (0);
-}
-
-static int
-cfi_targ_disable(void *arg, struct ctl_id targ_id)
-{
-	return (0);
-}
-
 static int
 cfi_lun_enable(void *arg, struct ctl_id target_id, int lun_id)
 {
@@ -734,7 +701,7 @@ cfi_init_io(union ctl_io *io, struct cfi_lun *lun,
 	struct cfi_lun_io *lun_io;
 
 	io->io_hdr.nexus.initid.id = 7;
-	io->io_hdr.nexus.targ_port = lun->softc->fe.targ_port;
+	io->io_hdr.nexus.targ_port = lun->softc->port.targ_port;
 	io->io_hdr.nexus.targ_target.id = lun->target_id.id;
 	io->io_hdr.nexus.targ_lun = lun->lun_id;
 	io->io_hdr.retries = retries;
@@ -795,7 +762,7 @@ cfi_done(union ctl_io *io)
 			union ctl_io *new_io;
 			struct cfi_lun_io *new_lun_io;
 
-			new_io = ctl_alloc_io(softc->fe.ctl_pool_ref);
+			new_io = ctl_alloc_io(softc->port.ctl_pool_ref);
 			if (new_io == NULL) {
 				printf("%s: unable to allocate ctl_io for "
 				       "error recovery\n", __func__);
@@ -1001,7 +968,7 @@ cfi_lun_probe(struct cfi_lun *lun, int have_lock)
 		struct cfi_lun_io *lun_io;
 		union ctl_io *io;
 
-		io = ctl_alloc_io(lun->softc->fe.ctl_pool_ref);
+		io = ctl_alloc_io(lun->softc->port.ctl_pool_ref);
 		if (io == NULL) {
 			printf("%s: unable to alloc ctl_io for target %ju "
 			       "lun %d probe\n", __func__,
@@ -1048,7 +1015,7 @@ cfi_lun_probe(struct cfi_lun *lun, int have_lock)
 		uint8_t *dataptr;
 		union ctl_io *io;
 
-		io = ctl_alloc_io(lun->softc->fe.ctl_pool_ref);
+		io = ctl_alloc_io(lun->softc->port.ctl_pool_ref);
 		if (io == NULL) {
 			printf("%s: unable to alloc ctl_io for target %ju "
 			       "lun %d probe\n", __func__,
@@ -1429,7 +1396,7 @@ cfi_action(struct cfi_metatask *metatask)
 			if (SID_TYPE(&lun->inq_data) != T_DIRECT)
 				continue;
 			da_luns++;
-			io = ctl_alloc_io(softc->fe.ctl_pool_ref);
+			io = ctl_alloc_io(softc->port.ctl_pool_ref);
 			if (io != NULL) {
 				ios_allocated++;
 				STAILQ_INSERT_TAIL(&tmp_io_list, &io->io_hdr,
@@ -1583,7 +1550,7 @@ cfi_action(struct cfi_metatask *metatask)
 
 		}
 
-		io = ctl_alloc_io(softc->fe.ctl_pool_ref);
+		io = ctl_alloc_io(softc->port.ctl_pool_ref);
 		if (io == NULL) {
 			metatask->status = CFI_MT_ERROR;
 			metatask->taskinfo.bbrread.status = CFI_BBR_NO_MEM;
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index fbe46b40a5c4..8953ece5fd02 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -85,19 +85,15 @@ static uma_zone_t cfiscsi_data_wait_zone;
 SYSCTL_NODE(_kern_cam_ctl, OID_AUTO, iscsi, CTLFLAG_RD, 0,
     "CAM Target Layer iSCSI Frontend");
 static int debug = 3;
-TUNABLE_INT("kern.cam.ctl.iscsi.debug", &debug);
 SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, debug, CTLFLAG_RWTUN,
     &debug, 1, "Enable debug messages");
 static int ping_timeout = 5;
-TUNABLE_INT("kern.cam.ctl.iscsi.ping_timeout", &ping_timeout);
 SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, ping_timeout, CTLFLAG_RWTUN,
     &ping_timeout, 5, "Interval between ping (NOP-Out) requests, in seconds");
 static int login_timeout = 60;
-TUNABLE_INT("kern.cam.ctl.iscsi.login_timeout", &login_timeout);
 SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, login_timeout, CTLFLAG_RWTUN,
     &login_timeout, 60, "Time to wait for ctld(8) to finish Login Phase, in seconds");
 static int maxcmdsn_delta = 256;
-TUNABLE_INT("kern.cam.ctl.iscsi.maxcmdsn_delta", &maxcmdsn_delta);
 SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, maxcmdsn_delta, CTLFLAG_RWTUN,
     &maxcmdsn_delta, 256, "Number of commands the initiator can send "
     "without confirmation");
@@ -149,18 +145,16 @@ SYSCTL_INT(_kern_cam_ctl_iscsi, OID_AUTO, maxcmdsn_delta, CTLFLAG_RWTUN,
 int		cfiscsi_init(void);
 static void	cfiscsi_online(void *arg);
 static void	cfiscsi_offline(void *arg);
-static int	cfiscsi_targ_enable(void *arg, struct ctl_id targ_id);
-static int	cfiscsi_targ_disable(void *arg, struct ctl_id targ_id);
+static int	cfiscsi_info(void *arg, struct sbuf *sb);
 static int	cfiscsi_lun_enable(void *arg,
 		    struct ctl_id target_id, int lun_id);
 static int	cfiscsi_lun_disable(void *arg,
 		    struct ctl_id target_id, int lun_id);
+static uint32_t	cfiscsi_lun_map(void *arg, uint32_t lun);
 static int	cfiscsi_ioctl(struct cdev *dev,
 		    u_long cmd, caddr_t addr, int flag, struct thread *td);
-static int	cfiscsi_devid(struct ctl_scsiio *ctsio, int alloc_len);
 static void	cfiscsi_datamove(union ctl_io *io);
 static void	cfiscsi_done(union ctl_io *io);
-static uint32_t	cfiscsi_map_lun(void *arg, uint32_t lun);
 static bool	cfiscsi_pdu_update_cmdsn(const struct icl_pdu *request);
 static void	cfiscsi_pdu_handle_nop_out(struct icl_pdu *request);
 static void	cfiscsi_pdu_handle_scsi_command(struct icl_pdu *request);
@@ -170,23 +164,21 @@ static void	cfiscsi_pdu_handle_logout_request(struct icl_pdu *request);
 static void	cfiscsi_session_terminate(struct cfiscsi_session *cs);
 static struct cfiscsi_target	*cfiscsi_target_find(struct cfiscsi_softc
 		    *softc, const char *name);
+static struct cfiscsi_target	*cfiscsi_target_find_or_create(
+    struct cfiscsi_softc *softc, const char *name, const char *alias);
 static void	cfiscsi_target_release(struct cfiscsi_target *ct);
 static void	cfiscsi_session_delete(struct cfiscsi_session *cs);
 
 static struct cfiscsi_softc cfiscsi_softc;
 extern struct ctl_softc *control_softc;
 
-static int cfiscsi_module_event_handler(module_t, int /*modeventtype_t*/, void *);
-
-static moduledata_t cfiscsi_moduledata = {
-	"ctlcfiscsi",
-	cfiscsi_module_event_handler,
-	NULL
+static struct ctl_frontend cfiscsi_frontend =
+{
+	.name = "iscsi",
+	.init = cfiscsi_init,
+	.ioctl = cfiscsi_ioctl,
 };
-
-DECLARE_MODULE(ctlcfiscsi, cfiscsi_moduledata, SI_SUB_CONFIGURE, SI_ORDER_FOURTH);
-MODULE_VERSION(ctlcfiscsi, 1);
-MODULE_DEPEND(ctlcfiscsi, ctl, 1, 1, 1);
+CTL_FRONTEND_DECLARE(ctlcfiscsi, cfiscsi_frontend);
 MODULE_DEPEND(ctlcfiscsi, icl, 1, 1, 1);
 
 static struct icl_pdu *
@@ -547,7 +539,7 @@ cfiscsi_pdu_handle_scsi_command(struct icl_pdu *request)
 		cfiscsi_session_terminate(cs);
 		return;
 	}
-	io = ctl_alloc_io(cs->cs_target->ct_softc->fe.ctl_pool_ref);
+	io = ctl_alloc_io(cs->cs_target->ct_port.ctl_pool_ref);
 	if (io == NULL) {
 		CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io; "
 		    "dropping connection");
@@ -559,11 +551,9 @@ cfiscsi_pdu_handle_scsi_command(struct icl_pdu *request)
 	io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = request;
 	io->io_hdr.io_type = CTL_IO_SCSI;
 	io->io_hdr.nexus.initid.id = cs->cs_ctl_initid;
-	io->io_hdr.nexus.targ_port = cs->cs_target->ct_softc->fe.targ_port;
+	io->io_hdr.nexus.targ_port = cs->cs_target->ct_port.targ_port;
 	io->io_hdr.nexus.targ_target.id = 0;
 	io->io_hdr.nexus.targ_lun = cfiscsi_decode_lun(bhssc->bhssc_lun);
-	io->io_hdr.nexus.lun_map_fn = cfiscsi_map_lun;
-	io->io_hdr.nexus.lun_map_arg = cs;
 	io->scsiio.tag_num = bhssc->bhssc_initiator_task_tag;
 	switch ((bhssc->bhssc_flags & BHSSC_FLAGS_ATTR)) {
 	case BHSSC_FLAGS_ATTR_UNTAGGED:
@@ -613,7 +603,7 @@ cfiscsi_pdu_handle_task_request(struct icl_pdu *request)
 
 	cs = PDU_SESSION(request);
 	bhstmr = (struct iscsi_bhs_task_management_request *)request->ip_bhs;
-	io = ctl_alloc_io(cs->cs_target->ct_softc->fe.ctl_pool_ref);
+	io = ctl_alloc_io(cs->cs_target->ct_port.ctl_pool_ref);
 	if (io == NULL) {
 		CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io;"
 		    "dropping connection");
@@ -625,11 +615,9 @@ cfiscsi_pdu_handle_task_request(struct icl_pdu *request)
 	io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = request;
 	io->io_hdr.io_type = CTL_IO_TASK;
 	io->io_hdr.nexus.initid.id = cs->cs_ctl_initid;
-	io->io_hdr.nexus.targ_port = cs->cs_target->ct_softc->fe.targ_port;
+	io->io_hdr.nexus.targ_port = cs->cs_target->ct_port.targ_port;
 	io->io_hdr.nexus.targ_target.id = 0;
 	io->io_hdr.nexus.targ_lun = cfiscsi_decode_lun(bhstmr->bhstmr_lun);
-	io->io_hdr.nexus.lun_map_fn = cfiscsi_map_lun;
-	io->io_hdr.nexus.lun_map_arg = cs;
 	io->taskio.tag_type = CTL_TAG_SIMPLE; /* XXX */
 
 	switch (bhstmr->bhstmr_function & ~0x80) {
@@ -640,6 +628,12 @@ cfiscsi_pdu_handle_task_request(struct icl_pdu *request)
 		io->taskio.task_action = CTL_TASK_ABORT_TASK;
 		io->taskio.tag_num = bhstmr->bhstmr_referenced_task_tag;
 		break;
+	case BHSTMR_FUNCTION_ABORT_TASK_SET:
+#if 0
+		CFISCSI_SESSION_DEBUG(cs, "BHSTMR_FUNCTION_ABORT_TASK_SET");
+#endif
+		io->taskio.task_action = CTL_TASK_ABORT_TASK_SET;
+		break;
 	case BHSTMR_FUNCTION_LOGICAL_UNIT_RESET:
 #if 0
 		CFISCSI_SESSION_DEBUG(cs, "BHSTMR_FUNCTION_LOGICAL_UNIT_RESET");
@@ -737,12 +731,15 @@ cfiscsi_handle_data_segment(struct icl_pdu *request, struct cfiscsi_data_wait *c
 		buffer_offset = ntohl(bhsdo->bhsdo_buffer_offset);
 	else
 		buffer_offset = 0;
+	len = icl_pdu_data_segment_length(request);
 
 	/*
 	 * Make sure the offset, as sent by the initiator, matches the offset
 	 * we're supposed to be at in the scatter-gather list.
 	 */
-	if (buffer_offset !=
+	if (buffer_offset >
+	    io->scsiio.kern_rel_offset + io->scsiio.ext_data_filled ||
+	    buffer_offset + len <=
 	    io->scsiio.kern_rel_offset + io->scsiio.ext_data_filled) {
 		CFISCSI_SESSION_WARN(cs, "received bad buffer offset %zd, "
 		    "expected %zd; dropping connection", buffer_offset,
@@ -758,8 +755,8 @@ cfiscsi_handle_data_segment(struct icl_pdu *request, struct cfiscsi_data_wait *c
 	 * to buffer_offset, which is the offset within the task (SCSI
 	 * command).
 	 */
-	off = 0;
-	len = icl_pdu_data_segment_length(request);
+	off = io->scsiio.kern_rel_offset + io->scsiio.ext_data_filled -
+	    buffer_offset;
 
 	/*
 	 * Iterate over the scatter/gather segments, filling them with data
@@ -816,12 +813,8 @@ cfiscsi_handle_data_segment(struct icl_pdu *request, struct cfiscsi_data_wait *c
 		 * This obviously can only happen with SCSI Command PDU. 
 		 */
 		if ((request->ip_bhs->bhs_opcode & ~ISCSI_BHS_OPCODE_IMMEDIATE) ==
-		    ISCSI_BHS_OPCODE_SCSI_COMMAND) {
-			CFISCSI_SESSION_DEBUG(cs, "received too much immediate "
-			    "data: got %zd bytes, expected %zd",
-			    icl_pdu_data_segment_length(request), off);
+		    ISCSI_BHS_OPCODE_SCSI_COMMAND)
 			return (true);
-		}
 
 		CFISCSI_SESSION_WARN(cs, "received too much data: got %zd bytes, "
 		    "expected %zd; dropping connection",
@@ -1043,71 +1036,61 @@ cfiscsi_callout(void *context)
 static void
 cfiscsi_session_terminate_tasks(struct cfiscsi_session *cs)
 {
-	struct cfiscsi_data_wait *cdw, *tmpcdw;
+	struct cfiscsi_data_wait *cdw;
 	union ctl_io *io;
-	int error;
+	int error, last;
 
-#ifdef notyet
-	io = ctl_alloc_io(cs->cs_target->ct_softc->fe.ctl_pool_ref);
+	io = ctl_alloc_io(cs->cs_target->ct_port.ctl_pool_ref);
 	if (io == NULL) {
 		CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io");
 		return;
 	}
 	ctl_zero_io(io);
-	io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = NULL;
+	io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = cs;
 	io->io_hdr.io_type = CTL_IO_TASK;
 	io->io_hdr.nexus.initid.id = cs->cs_ctl_initid;
-	io->io_hdr.nexus.targ_port = cs->cs_target->ct_softc->fe.targ_port;
+	io->io_hdr.nexus.targ_port = cs->cs_target->ct_port.targ_port;
 	io->io_hdr.nexus.targ_target.id = 0;
-	io->io_hdr.nexus.targ_lun = lun;
+	io->io_hdr.nexus.targ_lun = 0;
 	io->taskio.tag_type = CTL_TAG_SIMPLE; /* XXX */
-	io->taskio.task_action = CTL_TASK_ABORT_TASK_SET;
+	io->taskio.task_action = CTL_TASK_I_T_NEXUS_RESET;
+	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);
+		refcount_release(&cs->cs_outstanding_ctl_pdus);
 		ctl_free_io(io);
 	}
-#else
-	/*
-	 * CTL doesn't currently support CTL_TASK_ABORT_TASK_SET, so instead
-	 * just iterate over tasks that are waiting for something - data - and
-	 * terminate those.
-	 */
+
 	CFISCSI_SESSION_LOCK(cs);
-	TAILQ_FOREACH_SAFE(cdw,
-	    &cs->cs_waiting_for_data_out, cdw_next, tmpcdw) {
-		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");
-			return;
-		}
-		ctl_zero_io(io);
-		io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = NULL;
-		io->io_hdr.io_type = CTL_IO_TASK;
-		io->io_hdr.nexus.initid.id = cs->cs_ctl_initid;
-		io->io_hdr.nexus.targ_port =
-		    cs->cs_target->ct_softc->fe.targ_port;
-		io->io_hdr.nexus.targ_target.id = 0;
-		//io->io_hdr.nexus.targ_lun = lun; /* Not needed? */
-		io->taskio.tag_type = CTL_TAG_SIMPLE; /* XXX */
-		io->taskio.task_action = CTL_TASK_ABORT_TASK;
-		io->taskio.tag_num = cdw->cdw_initiator_task_tag;
-		error = ctl_queue(io);
-		if (error != CTL_RETVAL_COMPLETE) {
-			CFISCSI_SESSION_WARN(cs, "ctl_queue() failed; error %d", error);
-			ctl_free_io(io);
-			return;
-		}
-#if 0
-		CFISCSI_SESSION_DEBUG(cs, "removing csw for initiator task tag "
-		    "0x%x", cdw->cdw_initiator_task_tag);
-#endif
-		cdw->cdw_ctl_io->scsiio.be_move_done(cdw->cdw_ctl_io);
+	while ((cdw = TAILQ_FIRST(&cs->cs_waiting_for_data_out)) != NULL) {
 		TAILQ_REMOVE(&cs->cs_waiting_for_data_out, cdw, cdw_next);
+		CFISCSI_SESSION_UNLOCK(cs);
+		/*
+		 * Set nonzero port status; this prevents backends from
+		 * assuming that the data transfer actually succeeded
+		 * and writing uninitialized data to disk.
+		 */
+		cdw->cdw_ctl_io->scsiio.io_hdr.port_status = 42;
+		cdw->cdw_ctl_io->scsiio.be_move_done(cdw->cdw_ctl_io);
 		uma_zfree(cfiscsi_data_wait_zone, cdw);
+		CFISCSI_SESSION_LOCK(cs);
 	}
 	CFISCSI_SESSION_UNLOCK(cs);
-#endif
+
+	/*
+	 * Wait for CTL to terminate all the tasks.
+	 */
+	for (;;) {
+		refcount_acquire(&cs->cs_outstanding_ctl_pdus);
+		last = refcount_release(&cs->cs_outstanding_ctl_pdus);
+		if (last != 0)
+			break;
+		CFISCSI_SESSION_WARN(cs, "waiting for CTL to terminate tasks, "
+		    "%d remaining", cs->cs_outstanding_ctl_pdus);
+		tsleep(__DEVOLATILE(void *, &cs->cs_outstanding_ctl_pdus),
+		    0, "cfiscsi_terminate", hz / 100);
+	}
 }
 
 static void
@@ -1124,21 +1107,22 @@ cfiscsi_maintenance_thread(void *arg)
 		CFISCSI_SESSION_UNLOCK(cs);
 
 		if (cs->cs_terminating) {
-			cfiscsi_session_terminate_tasks(cs);
-			callout_drain(&cs->cs_callout);
 
+			/*
+			 * We used to wait up to 30 seconds to deliver queued
+			 * PDUs to the initiator.  We also tried hard to deliver
+			 * SCSI Responses for the aborted PDUs.  We don't do
+			 * that anymore.  We might need to revisit that.
+			 */
+			callout_drain(&cs->cs_callout);
 			icl_conn_shutdown(cs->cs_conn);
 			icl_conn_close(cs->cs_conn);
 
-			cs->cs_terminating++;
-
 			/*
-			 * XXX: We used to wait up to 30 seconds to deliver queued PDUs
-			 * 	to the initiator.  We also tried hard to deliver SCSI Responses
-			 * 	for the aborted PDUs.  We don't do that anymore.  We might need
-			 * 	to revisit that.
+			 * At this point ICL receive thread is no longer
+			 * running; no new tasks can be queued.
 			 */
-
+			cfiscsi_session_terminate_tasks(cs);
 			cfiscsi_session_delete(cs);
 			kthread_exit();
 			return;
@@ -1151,9 +1135,9 @@ static void
 cfiscsi_session_terminate(struct cfiscsi_session *cs)
 {
 
-	if (cs->cs_terminating != 0)
+	if (cs->cs_terminating)
 		return;
-	cs->cs_terminating = 1;
+	cs->cs_terminating = true;
 	cv_signal(&cs->cs_maintenance_cv);
 #ifdef ICL_KERNEL_PROXY
 	cv_signal(&cs->cs_login_cv);
@@ -1163,41 +1147,25 @@ cfiscsi_session_terminate(struct cfiscsi_session *cs)
 static int
 cfiscsi_session_register_initiator(struct cfiscsi_session *cs)
 {
-	int error, i;
-	struct cfiscsi_softc *softc;
+	struct cfiscsi_target *ct;
+	char *name;
+	int i;
 
 	KASSERT(cs->cs_ctl_initid == -1, ("already registered"));
 
-	softc = &cfiscsi_softc;
-
-	mtx_lock(&softc->lock);
-	for (i = 0; i < softc->max_initiators; i++) {
-		if (softc->ctl_initids[i] == 0)
-			break;
-	}
-	if (i == softc->max_initiators) {
-		CFISCSI_SESSION_WARN(cs, "too many concurrent sessions (%d)",
-		    softc->max_initiators);
-		mtx_unlock(&softc->lock);
-		return (1);
-	}
-	softc->ctl_initids[i] = 1;
-	mtx_unlock(&softc->lock);
-
-#if 0
-	CFISCSI_SESSION_DEBUG(cs, "adding initiator id %d, max %d",
-	    i, softc->max_initiators);
-#endif
-	cs->cs_ctl_initid = i;
-	error = ctl_add_initiator(0x0, softc->fe.targ_port, cs->cs_ctl_initid);
-	if (error != 0) {
-		CFISCSI_SESSION_WARN(cs, "ctl_add_initiator failed with error %d", error);
-		mtx_lock(&softc->lock);
-		softc->ctl_initids[cs->cs_ctl_initid] = 0;
-		mtx_unlock(&softc->lock);
+	ct = cs->cs_target;
+	name = strdup(cs->cs_initiator_id, M_CTL);
+	i = ctl_add_initiator(&ct->ct_port, -1, 0, name);
+	if (i < 0) {
+		CFISCSI_SESSION_WARN(cs, "ctl_add_initiator failed with error %d",
+		    i);
 		cs->cs_ctl_initid = -1;
 		return (1);
 	}
+	cs->cs_ctl_initid = i;
+#if 0
+	CFISCSI_SESSION_DEBUG(cs, "added initiator id %d", i);
+#endif
 
 	return (0);
 }
@@ -1206,21 +1174,15 @@ static void
 cfiscsi_session_unregister_initiator(struct cfiscsi_session *cs)
 {
 	int error;
-	struct cfiscsi_softc *softc;
 
 	if (cs->cs_ctl_initid == -1)
 		return;
 
-	softc = &cfiscsi_softc;
-
-	error = ctl_remove_initiator(softc->fe.targ_port, cs->cs_ctl_initid);
+	error = ctl_remove_initiator(&cs->cs_target->ct_port, cs->cs_ctl_initid);
 	if (error != 0) {
 		CFISCSI_SESSION_WARN(cs, "ctl_remove_initiator failed with error %d",
 		    error);
 	}
-	mtx_lock(&softc->lock);
-	softc->ctl_initids[cs->cs_ctl_initid] = 0;
-	mtx_unlock(&softc->lock);
 	cs->cs_ctl_initid = -1;
 }
 
@@ -1304,7 +1266,6 @@ int
 cfiscsi_init(void)
 {
 	struct cfiscsi_softc *softc;
-	struct ctl_frontend *fe;
 	int retval;
 
 	softc = &cfiscsi_softc;
@@ -1318,62 +1279,11 @@ cfiscsi_init(void)
 	TAILQ_INIT(&softc->sessions);
 	TAILQ_INIT(&softc->targets);
 
-	fe = &softc->fe;
-	fe->port_type = CTL_PORT_ISCSI;
-	/* XXX KDM what should the real number be here? */
-	fe->num_requested_ctl_io = 4096;
-	snprintf(softc->port_name, sizeof(softc->port_name), "iscsi");
-	fe->port_name = softc->port_name;
-	fe->port_online = cfiscsi_online;
-	fe->port_offline = cfiscsi_offline;
-	fe->onoff_arg = softc;
-	fe->targ_enable = cfiscsi_targ_enable;
-	fe->targ_disable = cfiscsi_targ_disable;
-	fe->lun_enable = cfiscsi_lun_enable;
-	fe->lun_disable = cfiscsi_lun_disable;
-	fe->targ_lun_arg = softc;
-	fe->ioctl = cfiscsi_ioctl;
-	fe->devid = cfiscsi_devid;
-	fe->fe_datamove = cfiscsi_datamove;
-	fe->fe_done = cfiscsi_done;
-
-	/* XXX KDM what should we report here? */
-	/* XXX These should probably be fetched from CTL. */
-	fe->max_targets = 1;
-	fe->max_target_id = 15;
-
-	retval = ctl_frontend_register(fe, /*master_SC*/ 1);
-	if (retval != 0) {
-		CFISCSI_WARN("ctl_frontend_register() failed with error %d",
-		    retval);
-		retval = 1;
-		goto bailout;
-	}
-
-	softc->max_initiators = fe->max_initiators;
-
 	cfiscsi_data_wait_zone = uma_zcreate("cfiscsi_data_wait",
 	    sizeof(struct cfiscsi_data_wait), NULL, NULL, NULL, NULL,
 	    UMA_ALIGN_PTR, 0);
 
 	return (0);
-
-bailout:
-	return (retval);
-}
-
-static int
-cfiscsi_module_event_handler(module_t mod, int what, void *arg)
-{
-
-	switch (what) {
-	case MOD_LOAD:
-		return (cfiscsi_init());
-	case MOD_UNLOAD:
-		return (EBUSY);
-	default:
-		return (EOPNOTSUPP);
-	}
 }
 
 #ifdef ICL_KERNEL_PROXY
@@ -1400,10 +1310,23 @@ static void
 cfiscsi_online(void *arg)
 {
 	struct cfiscsi_softc *softc;
+	struct cfiscsi_target *ct;
+	int online;
 
-	softc = (struct cfiscsi_softc *)arg;
+	ct = (struct cfiscsi_target *)arg;
+	softc = ct->ct_softc;
+
+	mtx_lock(&softc->lock);
+	if (ct->ct_online) {
+		mtx_unlock(&softc->lock);
+		return;
+	}
+	ct->ct_online = 1;
+	online = softc->online++;
+	mtx_unlock(&softc->lock);
+	if (online > 0)
+		return;
 
-	softc->online = 1;
 #ifdef ICL_KERNEL_PROXY
 	if (softc->listener != NULL)
 		icl_listen_free(softc->listener);
@@ -1415,16 +1338,28 @@ static void
 cfiscsi_offline(void *arg)
 {
 	struct cfiscsi_softc *softc;
+	struct cfiscsi_target *ct;
 	struct cfiscsi_session *cs;
+	int online;
 
-	softc = (struct cfiscsi_softc *)arg;
-
-	softc->online = 0;
+	ct = (struct cfiscsi_target *)arg;
+	softc = ct->ct_softc;
 
 	mtx_lock(&softc->lock);
-	TAILQ_FOREACH(cs, &softc->sessions, cs_next)
-		cfiscsi_session_terminate(cs);
+	if (!ct->ct_online) {
+		mtx_unlock(&softc->lock);
+		return;
+	}
+	ct->ct_online = 0;
+	online = --softc->online;
+
+	TAILQ_FOREACH(cs, &softc->sessions, cs_next) {
+		if (cs->cs_target == ct)
+			cfiscsi_session_terminate(cs);
+	}
 	mtx_unlock(&softc->lock);
+	if (online > 0)
+		return;
 
 #ifdef ICL_KERNEL_PROXY
 	icl_listen_free(softc->listener);
@@ -1433,24 +1368,21 @@ cfiscsi_offline(void *arg)
 }
 
 static int
-cfiscsi_targ_enable(void *arg, struct ctl_id targ_id)
+cfiscsi_info(void *arg, struct sbuf *sb)
 {
+	struct cfiscsi_target *ct = (struct cfiscsi_target *)arg;
+	int retval;
 
-	return (0);
-}
-
-static int
-cfiscsi_targ_disable(void *arg, struct ctl_id targ_id)
-{
-
-	return (0);
+	retval = sbuf_printf(sb, "\t<cfiscsi_state>%d</cfiscsi_state>\n",
+	    ct->ct_state);
+	return (retval);
 }
 
 static void
 cfiscsi_ioctl_handoff(struct ctl_iscsi *ci)
 {
 	struct cfiscsi_softc *softc;
-	struct cfiscsi_session *cs;
+	struct cfiscsi_session *cs, *cs2;
 	struct cfiscsi_target *ct;
 	struct ctl_iscsi_handoff_params *cihp;
 	int error;
@@ -1462,13 +1394,6 @@ cfiscsi_ioctl_handoff(struct ctl_iscsi *ci)
 	    cihp->initiator_name, cihp->initiator_addr,
 	    cihp->target_name);
 
-	if (softc->online == 0) {
-		ci->status = CTL_ISCSI_ERROR;
-		snprintf(ci->error_str, sizeof(ci->error_str),
-		    "%s: port offline", __func__);
-		return;
-	}
-
 	ct = cfiscsi_target_find(softc, cihp->target_name);
 	if (ct == NULL) {
 		ci->status = CTL_ISCSI_ERROR;
@@ -1477,6 +1402,14 @@ cfiscsi_ioctl_handoff(struct ctl_iscsi *ci)
 		return;
 	}
 
+	if (ct->ct_online == 0) {
+		ci->status = CTL_ISCSI_ERROR;
+		snprintf(ci->error_str, sizeof(ci->error_str),
+		    "%s: port offline", __func__);
+		cfiscsi_target_release(ct);
+		return;
+	}
+
 #ifdef ICL_KERNEL_PROXY
 	if (cihp->socket > 0 && cihp->connection_id > 0) {
 		snprintf(ci->error_str, sizeof(ci->error_str),
@@ -1537,13 +1470,44 @@ cfiscsi_ioctl_handoff(struct ctl_iscsi *ci)
 	    cihp->initiator_addr, sizeof(cs->cs_initiator_addr));
 	strlcpy(cs->cs_initiator_alias,
 	    cihp->initiator_alias, sizeof(cs->cs_initiator_alias));
+	memcpy(cs->cs_initiator_isid,
+	    cihp->initiator_isid, sizeof(cs->cs_initiator_isid));
+	snprintf(cs->cs_initiator_id, sizeof(cs->cs_initiator_id),
+	    "%s,i,0x%02x%02x%02x%02x%02x%02x", cs->cs_initiator_name,
+	    cihp->initiator_isid[0], cihp->initiator_isid[1],
+	    cihp->initiator_isid[2], cihp->initiator_isid[3],
+	    cihp->initiator_isid[4], cihp->initiator_isid[5]);
+
+	refcount_acquire(&cs->cs_outstanding_ctl_pdus);
+restart:
+	if (!cs->cs_terminating) {
+		mtx_lock(&softc->lock);
+		TAILQ_FOREACH(cs2, &softc->sessions, cs_next) {
+			if (cs2 != cs && cs2->cs_tasks_aborted == false &&
+			    cs->cs_target == cs2->cs_target &&
+			    cs->cs_portal_group_tag == cs2->cs_portal_group_tag &&
+			    strcmp(cs->cs_initiator_id, cs2->cs_initiator_id) == 0) {
+				cfiscsi_session_terminate(cs2);
+				mtx_unlock(&softc->lock);
+				pause("cfiscsi_reinstate", 1);
+				goto restart;
+			}
+		}
+		mtx_unlock(&softc->lock);
+	}
+
+	/*
+	 * Register initiator with CTL.
+	 */
+	cfiscsi_session_register_initiator(cs);
 
 #ifdef ICL_KERNEL_PROXY
 	if (cihp->socket > 0) {
 #endif
 		error = icl_conn_handoff(cs->cs_conn, cihp->socket);
 		if (error != 0) {
-			cfiscsi_session_delete(cs);
+			cfiscsi_session_terminate(cs);
+			refcount_release(&cs->cs_outstanding_ctl_pdus);
 			ci->status = CTL_ISCSI_ERROR;
 			snprintf(ci->error_str, sizeof(ci->error_str),
 			    "%s: icl_conn_handoff failed with error %d",
@@ -1554,11 +1518,6 @@ cfiscsi_ioctl_handoff(struct ctl_iscsi *ci)
 	}
 #endif
 
-	/*
-	 * Register initiator with CTL.
-	 */
-	cfiscsi_session_register_initiator(cs);
-
 #ifdef ICL_KERNEL_PROXY
 	cs->cs_login_phase = false;
 
@@ -1573,6 +1532,7 @@ cfiscsi_ioctl_handoff(struct ctl_iscsi *ci)
 	}
 #endif
 
+	refcount_release(&cs->cs_outstanding_ctl_pdus);
 	ci->status = CTL_ISCSI_OK;
 }
 
@@ -1971,11 +1931,181 @@ cfiscsi_ioctl_receive(struct ctl_iscsi *ci)
 
 #endif /* !ICL_KERNEL_PROXY */
 
+static void
+cfiscsi_ioctl_port_create(struct ctl_req *req)
+{
+	struct cfiscsi_target *ct;
+	struct ctl_port *port;
+	const char *target, *alias, *tag;
+	struct scsi_vpd_id_descriptor *desc;
+	ctl_options_t opts;
+	int retval, len, idlen;
+
+	ctl_init_opts(&opts, req->num_args, req->kern_args);
+	target = ctl_get_opt(&opts, "cfiscsi_target");
+	alias = ctl_get_opt(&opts, "cfiscsi_target_alias");
+	tag = ctl_get_opt(&opts, "cfiscsi_portal_group_tag");
+	if (target == NULL || tag == NULL) {
+		req->status = CTL_LUN_ERROR;
+		snprintf(req->error_str, sizeof(req->error_str),
+		    "Missing required argument");
+		ctl_free_opts(&opts);
+		return;
+	}
+	ct = cfiscsi_target_find_or_create(&cfiscsi_softc, target, alias);
+	if (ct == NULL) {
+		req->status = CTL_LUN_ERROR;
+		snprintf(req->error_str, sizeof(req->error_str),
+		    "failed to create target \"%s\"", target);
+		ctl_free_opts(&opts);
+		return;
+	}
+	if (ct->ct_state == CFISCSI_TARGET_STATE_ACTIVE) {
+		req->status = CTL_LUN_ERROR;
+		snprintf(req->error_str, sizeof(req->error_str),
+		    "target \"%s\" already exist", target);
+		cfiscsi_target_release(ct);
+		ctl_free_opts(&opts);
+		return;
+	}
+	port = &ct->ct_port;
+	if (ct->ct_state == CFISCSI_TARGET_STATE_DYING)
+		goto done;
+
+	port->frontend = &cfiscsi_frontend;
+	port->port_type = CTL_PORT_ISCSI;
+	/* XXX KDM what should the real number be here? */
+	port->num_requested_ctl_io = 4096;
+	port->port_name = "iscsi";
+	port->virtual_port = strtoul(tag, NULL, 0);
+	port->port_online = cfiscsi_online;
+	port->port_offline = cfiscsi_offline;
+	port->port_info = cfiscsi_info;
+	port->onoff_arg = ct;
+	port->lun_enable = cfiscsi_lun_enable;
+	port->lun_disable = cfiscsi_lun_disable;
+	port->lun_map = cfiscsi_lun_map;
+	port->targ_lun_arg = ct;
+	port->fe_datamove = cfiscsi_datamove;
+	port->fe_done = cfiscsi_done;
+
+	/* XXX KDM what should we report here? */
+	/* XXX These should probably be fetched from CTL. */
+	port->max_targets = 1;
+	port->max_target_id = 15;
+
+	port->options = opts;
+	STAILQ_INIT(&opts);
+
+	/* Generate Port ID. */
+	idlen = strlen(target) + strlen(",t,0x0001") + 1;
+	idlen = roundup2(idlen, 4);
+	len = sizeof(struct scsi_vpd_device_id) + idlen;
+	port->port_devid = malloc(sizeof(struct ctl_devid) + len,
+	    M_CTL, M_WAITOK | M_ZERO);
+	port->port_devid->len = len;
+	desc = (struct scsi_vpd_id_descriptor *)port->port_devid->data;
+	desc->proto_codeset = (SCSI_PROTO_ISCSI << 4) | SVPD_ID_CODESET_UTF8;
+	desc->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT |
+	    SVPD_ID_TYPE_SCSI_NAME;
+	desc->length = idlen;
+	snprintf(desc->identifier, idlen, "%s,t,0x%4.4x",
+	    target, port->virtual_port);
+
+	/* Generate Target ID. */
+	idlen = strlen(target) + 1;
+	idlen = roundup2(idlen, 4);
+	len = sizeof(struct scsi_vpd_device_id) + idlen;
+	port->target_devid = malloc(sizeof(struct ctl_devid) + len,
+	    M_CTL, M_WAITOK | M_ZERO);
+	port->target_devid->len = len;
+	desc = (struct scsi_vpd_id_descriptor *)port->target_devid->data;
+	desc->proto_codeset = (SCSI_PROTO_ISCSI << 4) | SVPD_ID_CODESET_UTF8;
+	desc->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_TARGET |
+	    SVPD_ID_TYPE_SCSI_NAME;
+	desc->length = idlen;
+	strlcpy(desc->identifier, target, idlen);
+
+	retval = ctl_port_register(port, /*master_SC*/ 1);
+	if (retval != 0) {
+		ctl_free_opts(&port->options);
+		cfiscsi_target_release(ct);
+		free(port->port_devid, M_CFISCSI);
+		free(port->target_devid, M_CFISCSI);
+		req->status = CTL_LUN_ERROR;
+		snprintf(req->error_str, sizeof(req->error_str),
+		    "ctl_frontend_register() failed with error %d", retval);
+		return;
+	}
+done:
+	ct->ct_state = CFISCSI_TARGET_STATE_ACTIVE;
+	req->status = CTL_LUN_OK;
+	memcpy(req->kern_args[0].kvalue, &port->targ_port,
+	    sizeof(port->targ_port)); //XXX
+}
+
+static void
+cfiscsi_ioctl_port_remove(struct ctl_req *req)
+{
+	struct cfiscsi_target *ct;
+	const char *target;
+	ctl_options_t opts;
+
+	ctl_init_opts(&opts, req->num_args, req->kern_args);
+	target = ctl_get_opt(&opts, "cfiscsi_target");
+	if (target == NULL) {
+		ctl_free_opts(&opts);
+		req->status = CTL_LUN_ERROR;
+		snprintf(req->error_str, sizeof(req->error_str),
+		    "Missing required argument");
+		return;
+	}
+	ct = cfiscsi_target_find(&cfiscsi_softc, target);
+	if (ct == NULL) {
+		ctl_free_opts(&opts);
+		req->status = CTL_LUN_ERROR;
+		snprintf(req->error_str, sizeof(req->error_str),
+		    "can't find target \"%s\"", target);
+		return;
+	}
+	if (ct->ct_state != CFISCSI_TARGET_STATE_ACTIVE) {
+		ctl_free_opts(&opts);
+		req->status = CTL_LUN_ERROR;
+		snprintf(req->error_str, sizeof(req->error_str),
+		    "target \"%s\" is already dying", target);
+		return;
+	}
+	ctl_free_opts(&opts);
+
+	ct->ct_state = CFISCSI_TARGET_STATE_DYING;
+	ctl_port_offline(&ct->ct_port);
+	cfiscsi_target_release(ct);
+	cfiscsi_target_release(ct);
+}
+
 static int
 cfiscsi_ioctl(struct cdev *dev,
     u_long cmd, caddr_t addr, int flag, struct thread *td)
 {
 	struct ctl_iscsi *ci;
+	struct ctl_req *req;
+
+	if (cmd == CTL_PORT_REQ) {
+		req = (struct ctl_req *)addr;
+		switch (req->reqtype) {
+		case CTL_REQ_CREATE:
+			cfiscsi_ioctl_port_create(req);
+			break;
+		case CTL_REQ_REMOVE:
+			cfiscsi_ioctl_port_remove(req);
+			break;
+		default:
+			req->status = CTL_LUN_ERROR;
+			snprintf(req->error_str, sizeof(req->error_str),
+			    "Unsupported request type %d", req->reqtype);
+		}
+		return (0);
+	}
 
 	if (cmd != CTL_ISCSI)
 		return (ENOTTY);
@@ -2028,135 +2158,6 @@ cfiscsi_ioctl(struct cdev *dev,
 	return (0);
 }
 
-static int
-cfiscsi_devid(struct ctl_scsiio *ctsio, int alloc_len)
-{
-	struct cfiscsi_session *cs;
-	struct scsi_vpd_device_id *devid_ptr;
-	struct scsi_vpd_id_descriptor *desc, *desc1;
-	struct scsi_vpd_id_descriptor *desc2, *desc3; /* for types 4h and 5h */
-	struct scsi_vpd_id_t10 *t10id;
-	struct ctl_lun *lun;
-	const struct icl_pdu *request;
-	size_t devid_len, wwpn_len;
-
-	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
-	request = ctsio->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr;
-	cs = PDU_SESSION(request);
-
-	wwpn_len = strlen(cs->cs_target->ct_name);
-	wwpn_len += strlen(",t,0x01");
-	wwpn_len += 1; /* '\0' */
-	if ((wwpn_len % 4) != 0)
-		wwpn_len += (4 - (wwpn_len % 4));
-
-	devid_len = sizeof(struct scsi_vpd_device_id) +
-		sizeof(struct scsi_vpd_id_descriptor) +
-		sizeof(struct scsi_vpd_id_t10) + CTL_DEVID_LEN +
-		sizeof(struct scsi_vpd_id_descriptor) + wwpn_len +
-		sizeof(struct scsi_vpd_id_descriptor) +
-		sizeof(struct scsi_vpd_id_rel_trgt_port_id) +
-		sizeof(struct scsi_vpd_id_descriptor) +
-		sizeof(struct scsi_vpd_id_trgt_port_grp_id);
-
-	ctsio->kern_data_ptr = malloc(devid_len, M_CTL, M_WAITOK | M_ZERO);
-	devid_ptr = (struct scsi_vpd_device_id *)ctsio->kern_data_ptr;
-	ctsio->kern_sg_entries = 0;
-
-	if (devid_len < alloc_len) {
-		ctsio->residual = alloc_len - devid_len;
-		ctsio->kern_data_len = devid_len;
-		ctsio->kern_total_len = devid_len;
-	} else {
-		ctsio->residual = 0;
-		ctsio->kern_data_len = alloc_len;
-		ctsio->kern_total_len = alloc_len;
-	}
-	ctsio->kern_data_resid = 0;
-	ctsio->kern_rel_offset = 0;
-	ctsio->kern_sg_entries = 0;
-
-	desc = (struct scsi_vpd_id_descriptor *)devid_ptr->desc_list;
-	t10id = (struct scsi_vpd_id_t10 *)&desc->identifier[0];
-	desc1 = (struct scsi_vpd_id_descriptor *)(&desc->identifier[0] +
-	    sizeof(struct scsi_vpd_id_t10) + CTL_DEVID_LEN);
-	desc2 = (struct scsi_vpd_id_descriptor *)(&desc1->identifier[0] +
-	    wwpn_len);
-	desc3 = (struct scsi_vpd_id_descriptor *)(&desc2->identifier[0] +
-	    sizeof(struct scsi_vpd_id_rel_trgt_port_id));
-
-	if (lun != NULL)
-		devid_ptr->device = (SID_QUAL_LU_CONNECTED << 5) |
-		    lun->be_lun->lun_type;
-	else
-		devid_ptr->device = (SID_QUAL_LU_OFFLINE << 5) | T_DIRECT;
-
-	devid_ptr->page_code = SVPD_DEVICE_ID;
-
-	scsi_ulto2b(devid_len - 4, devid_ptr->length);
-
-	/*
-	 * We're using a LUN association here.  i.e., this device ID is a
-	 * per-LUN identifier.
-	 */
-	desc->proto_codeset = (SCSI_PROTO_ISCSI << 4) | SVPD_ID_CODESET_ASCII;
-	desc->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_LUN | SVPD_ID_TYPE_T10;
-	desc->length = sizeof(*t10id) + CTL_DEVID_LEN;
-	strncpy((char *)t10id->vendor, CTL_VENDOR, sizeof(t10id->vendor));
-
-	/*
-	 * If we've actually got a backend, copy the device id from the
-	 * per-LUN data.  Otherwise, set it to all spaces.
-	 */
-	if (lun != NULL) {
-		/*
-		 * Copy the backend's LUN ID.
-		 */
-		strncpy((char *)t10id->vendor_spec_id,
-		    (char *)lun->be_lun->device_id, CTL_DEVID_LEN);
-	} else {
-		/*
-		 * No backend, set this to spaces.
-		 */
-		memset(t10id->vendor_spec_id, 0x20, CTL_DEVID_LEN);
-	}
-
-	/*
-	 * desc1 is for the WWPN which is a port asscociation.
-	 */
-       	desc1->proto_codeset = (SCSI_PROTO_ISCSI << 4) | SVPD_ID_CODESET_UTF8;
-	desc1->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT |
-	    SVPD_ID_TYPE_SCSI_NAME;
-	desc1->length = wwpn_len;
-	snprintf(desc1->identifier, wwpn_len, "%s,t,0x%x",
-	    cs->cs_target->ct_name, cs->cs_portal_group_tag);
-
-	/*
-	 * desc2 is for the Relative Target Port(type 4h) identifier
-	 */
-       	desc2->proto_codeset = (SCSI_PROTO_ISCSI << 4) | SVPD_ID_CODESET_BINARY;
-	desc2->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT |
-	    SVPD_ID_TYPE_RELTARG;
-	desc2->length = 4;
-	desc2->identifier[3] = 1;
-
-	/*
-	 * desc3 is for the Target Port Group(type 5h) identifier
-	 */
-       	desc3->proto_codeset = (SCSI_PROTO_ISCSI << 4) | SVPD_ID_CODESET_BINARY;
-	desc3->id_type = SVPD_ID_PIV | SVPD_ID_ASSOC_PORT |
-	    SVPD_ID_TYPE_TPORTGRP;
-	desc3->length = 4;
-	desc3->identifier[3] = 1;
-
-	ctsio->scsi_status = SCSI_STATUS_OK;
-
-	ctsio->be_move_done = ctl_config_move_done;
-	ctl_datamove((union ctl_io *)ctsio);
-
-	return (CTL_RETVAL_COMPLETE);
-}
-
 static void
 cfiscsi_target_hold(struct cfiscsi_target *ct)
 {
@@ -2174,6 +2175,12 @@ cfiscsi_target_release(struct cfiscsi_target *ct)
 	if (refcount_release(&ct->ct_refcount)) {
 		TAILQ_REMOVE(&softc->targets, ct, ct_next);
 		mtx_unlock(&softc->lock);
+		if (ct->ct_state != CFISCSI_TARGET_STATE_INVALID) {
+			ct->ct_state = CFISCSI_TARGET_STATE_INVALID;
+			if (ctl_port_deregister(&ct->ct_port) != 0)
+				printf("%s: ctl_port_deregister() failed\n",
+				    __func__);
+		}
 		free(ct, M_CFISCSI);
 
 		return;
@@ -2188,7 +2195,8 @@ cfiscsi_target_find(struct cfiscsi_softc *softc, const char *name)
 
 	mtx_lock(&softc->lock);
 	TAILQ_FOREACH(ct, &softc->targets, ct_next) {
-		if (strcmp(name, ct->ct_name) != 0)
+		if (strcmp(name, ct->ct_name) != 0 ||
+		    ct->ct_state != CFISCSI_TARGET_STATE_ACTIVE)
 			continue;
 		cfiscsi_target_hold(ct);
 		mtx_unlock(&softc->lock);
@@ -2213,7 +2221,8 @@ cfiscsi_target_find_or_create(struct cfiscsi_softc *softc, const char *name,
 
 	mtx_lock(&softc->lock);
 	TAILQ_FOREACH(ct, &softc->targets, ct_next) {
-		if (strcmp(name, ct->ct_name) != 0)
+		if (strcmp(name, ct->ct_name) != 0 ||
+		    ct->ct_state == CFISCSI_TARGET_STATE_INVALID)
 			continue;
 		cfiscsi_target_hold(ct);
 		mtx_unlock(&softc->lock);
@@ -2222,7 +2231,7 @@ cfiscsi_target_find_or_create(struct cfiscsi_softc *softc, const char *name,
 	}
 
 	for (i = 0; i < CTL_MAX_LUNS; i++)
-		newct->ct_luns[i] = -1;
+		newct->ct_luns[i] = UINT32_MAX;
 
 	strlcpy(newct->ct_name, name, sizeof(newct->ct_name));
 	if (alias != NULL)
@@ -2239,22 +2248,16 @@ cfiscsi_target_find_or_create(struct cfiscsi_softc *softc, const char *name,
  * Takes LUN from the target space and returns LUN from the CTL space.
  */
 static uint32_t
-cfiscsi_map_lun(void *arg, uint32_t lun)
+cfiscsi_lun_map(void *arg, uint32_t lun)
 {
-	struct cfiscsi_session *cs;
-
-	cs = arg;
+	struct cfiscsi_target *ct = arg;
 
 	if (lun >= CTL_MAX_LUNS) {
 		CFISCSI_DEBUG("requested lun number %d is higher "
 		    "than maximum %d", lun, CTL_MAX_LUNS - 1);
-		return (0xffffffff);
+		return (UINT32_MAX);
 	}
-
-	if (cs->cs_target->ct_luns[lun] < 0)
-		return (0xffffffff);
-
-	return (cs->cs_target->ct_luns[lun]);
+	return (ct->ct_luns[lun]);
 }
 
 static int
@@ -2268,7 +2271,7 @@ cfiscsi_target_set_lun(struct cfiscsi_target *ct,
 		return (-1);
 	}
 
-	if (ct->ct_luns[lun_id] >= 0) {
+	if (ct->ct_luns[lun_id] < CTL_MAX_LUNS) {
 		/*
 		 * CTL calls cfiscsi_lun_enable() twice for each LUN - once
 		 * when the LUN is created, and a second time just before
@@ -2287,22 +2290,6 @@ cfiscsi_target_set_lun(struct cfiscsi_target *ct,
 #endif
 
 	ct->ct_luns[lun_id] = ctl_lun_id;
-	cfiscsi_target_hold(ct);
-
-	return (0);
-}
-
-static int
-cfiscsi_target_unset_lun(struct cfiscsi_target *ct, unsigned long lun_id)
-{
-
-	if (ct->ct_luns[lun_id] < 0) {
-		CFISCSI_WARN("lun %ld not allocated", lun_id);
-		return (-1);
-	}
-
-	ct->ct_luns[lun_id] = -1;
-	cfiscsi_target_release(ct);
 
 	return (0);
 }
@@ -2312,22 +2299,17 @@ cfiscsi_lun_enable(void *arg, struct ctl_id target_id, int lun_id)
 {
 	struct cfiscsi_softc *softc;
 	struct cfiscsi_target *ct;
-	struct ctl_be_lun_option *opt;
-	const char *target = NULL, *target_alias = NULL;
+	const char *target = NULL;
 	const char *lun = NULL;
 	unsigned long tmp;
 
-	softc = (struct cfiscsi_softc *)arg;
+	ct = (struct cfiscsi_target *)arg;
+	softc = ct->ct_softc;
 
-	STAILQ_FOREACH(opt,
-	    &control_softc->ctl_luns[lun_id]->be_lun->options, links) {
-		if (strcmp(opt->name, "cfiscsi_target") == 0)
-			target = opt->value;
-		else if (strcmp(opt->name, "cfiscsi_target_alias") == 0)
-			target_alias = opt->value;
-		else if (strcmp(opt->name, "cfiscsi_lun") == 0)
-			lun = opt->value;
-	}
+	target = ctl_get_opt(&control_softc->ctl_luns[lun_id]->be_lun->options,
+	    "cfiscsi_target");
+	lun = ctl_get_opt(&control_softc->ctl_luns[lun_id]->be_lun->options,
+	    "cfiscsi_lun");
 
 	if (target == NULL && lun == NULL)
 		return (0);
@@ -2338,15 +2320,11 @@ cfiscsi_lun_enable(void *arg, struct ctl_id target_id, int lun_id)
 		return (0);
 	}
 
-	ct = cfiscsi_target_find_or_create(softc, target, target_alias);
-	if (ct == NULL) {
-		CFISCSI_WARN("failed to create target \"%s\"", target);
+	if (strcmp(target, ct->ct_name) != 0)
 		return (0);
-	}
 
 	tmp = strtoul(lun, NULL, 10);
 	cfiscsi_target_set_lun(ct, tmp, lun_id);
-	cfiscsi_target_release(ct);
 	return (0);
 }
 
@@ -2357,19 +2335,15 @@ cfiscsi_lun_disable(void *arg, struct ctl_id target_id, int lun_id)
 	struct cfiscsi_target *ct;
 	int i;
 
-	softc = (struct cfiscsi_softc *)arg;
+	ct = (struct cfiscsi_target *)arg;
+	softc = ct->ct_softc;
 
 	mtx_lock(&softc->lock);
-	TAILQ_FOREACH(ct, &softc->targets, ct_next) {
-		for (i = 0; i < CTL_MAX_LUNS; i++) {
-			if (ct->ct_luns[i] < 0)
-				continue;
-			if (ct->ct_luns[i] != lun_id)
-				continue;
-			mtx_unlock(&softc->lock);
-			cfiscsi_target_unset_lun(ct, i);
-			return (0);
-		}
+	for (i = 0; i < CTL_MAX_LUNS; i++) {
+		if (ct->ct_luns[i] != lun_id)
+			continue;
+		ct->ct_luns[i] = UINT32_MAX;
+		break;
 	}
 	mtx_unlock(&softc->lock);
 	return (0);
@@ -2623,8 +2597,8 @@ cfiscsi_datamove_out(union ctl_io *io)
 	cdw->cdw_target_transfer_tag = target_transfer_tag;
 	cdw->cdw_initiator_task_tag = bhssc->bhssc_initiator_task_tag;
 
-	if (cs->cs_immediate_data && io->scsiio.kern_rel_offset == 0 &&
-	    icl_pdu_data_segment_length(request) > 0) {
+	if (cs->cs_immediate_data && io->scsiio.kern_rel_offset <
+	    icl_pdu_data_segment_length(request)) {
 		done = cfiscsi_handle_data_segment(request, cdw);
 		if (done) {
 			uma_zfree(cfiscsi_data_wait_zone, cdw);
@@ -2725,6 +2699,17 @@ cfiscsi_scsi_command_done(union ctl_io *io)
 	CFISCSI_SESSION_UNLOCK(cs);
 #endif
 
+	/*
+	 * Do not return status for aborted commands.
+	 * There are exceptions, but none supported by CTL yet.
+	 */
+	if ((io->io_hdr.flags & CTL_FLAG_ABORT) &&
+	    (io->io_hdr.flags & CTL_FLAG_ABORT_STATUS) == 0) {
+		ctl_free_io(io);
+		icl_pdu_free(request);
+		return;
+	}
+
 	response = cfiscsi_pdu_new_response(request, M_WAITOK);
 	bhssr = (struct iscsi_bhs_scsi_response *)response->ip_bhs;
 	bhssr->bhssr_opcode = ISCSI_BHS_OPCODE_SCSI_RESPONSE;
@@ -2851,14 +2836,20 @@ cfiscsi_done(union ctl_io *io)
 	KASSERT(((io->io_hdr.status & CTL_STATUS_MASK) != CTL_STATUS_NONE),
 		("invalid CTL status %#x", io->io_hdr.status));
 
-	request = io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr;
-	if (request == NULL) {
+	if (io->io_hdr.io_type == CTL_IO_TASK &&
+	    io->taskio.task_action == CTL_TASK_I_T_NEXUS_RESET) {
 		/*
 		 * Implicit task termination has just completed; nothing to do.
 		 */
+		cs = io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr;
+		cs->cs_tasks_aborted = true;
+		refcount_release(&cs->cs_outstanding_ctl_pdus);
+		wakeup(__DEVOLATILE(void *, &cs->cs_outstanding_ctl_pdus));
+		ctl_free_io(io);
 		return;
 	}
 
+	request = io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr;
 	cs = PDU_SESSION(request);
 	refcount_release(&cs->cs_outstanding_ctl_pdus);
 
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.h b/sys/cam/ctl/ctl_frontend_iscsi.h
index aca89f9dcfca..0ac0e98ce46c 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.h
+++ b/sys/cam/ctl/ctl_frontend_iscsi.h
@@ -32,13 +32,20 @@
 #ifndef CTL_FRONTEND_ISCSI_H
 #define	CTL_FRONTEND_ISCSI_H
 
+#define CFISCSI_TARGET_STATE_INVALID	0
+#define CFISCSI_TARGET_STATE_ACTIVE	1
+#define CFISCSI_TARGET_STATE_DYING	2
+
 struct cfiscsi_target {
 	TAILQ_ENTRY(cfiscsi_target)	ct_next;
-	int				ct_luns[CTL_MAX_LUNS];
+	uint32_t			ct_luns[CTL_MAX_LUNS];
 	struct cfiscsi_softc		*ct_softc;
 	volatile u_int			ct_refcount;
 	char				ct_name[CTL_ISCSI_NAME_LEN];
 	char				ct_alias[CTL_ISCSI_ALIAS_LEN];
+	int				ct_state;
+	int				ct_online;
+	struct ctl_port			ct_port;
 };
 
 struct cfiscsi_data_wait {
@@ -72,13 +79,16 @@ struct cfiscsi_session {
 	int				cs_timeout;
 	int				cs_portal_group_tag;
 	struct cv			cs_maintenance_cv;
-	int				cs_terminating;
+	bool				cs_terminating;
+	bool				cs_tasks_aborted;
 	size_t				cs_max_data_segment_length;
 	size_t				cs_max_burst_length;
 	bool				cs_immediate_data;
 	char				cs_initiator_name[CTL_ISCSI_NAME_LEN];
 	char				cs_initiator_addr[CTL_ISCSI_ADDR_LEN];
 	char				cs_initiator_alias[CTL_ISCSI_ALIAS_LEN];
+	char				cs_initiator_isid[6];
+	char				cs_initiator_id[CTL_ISCSI_NAME_LEN + 5 + 6 + 1];
 	unsigned int			cs_id;
 	int				cs_ctl_initid;
 #ifdef ICL_KERNEL_PROXY
@@ -96,15 +106,12 @@ struct icl_listen;
 #endif
 
 struct cfiscsi_softc {
-	struct ctl_frontend		fe;
 	struct mtx			lock;
 	char				port_name[32];
 	int				online;
 	unsigned int			last_session_id;
 	TAILQ_HEAD(, cfiscsi_target)	targets;
 	TAILQ_HEAD(, cfiscsi_session)	sessions;
-	char				ctl_initids[CTL_MAX_INIT_PER_PORT];
-	int				max_initiators;
 #ifdef ICL_KERNEL_PROXY
 	struct icl_listen		*listener;
 	struct cv			accept_cv;
diff --git a/sys/cam/ctl/ctl_io.h b/sys/cam/ctl/ctl_io.h
index e018b3f8a5f6..8f4ab92c330b 100644
--- a/sys/cam/ctl/ctl_io.h
+++ b/sys/cam/ctl/ctl_io.h
@@ -96,6 +96,7 @@ typedef enum {
 	CTL_FLAG_CONTROL_DEV	= 0x00000080,	/* processor device */
 	CTL_FLAG_ALLOCATED	= 0x00000100,	/* data space allocated */
 	CTL_FLAG_BLOCKED	= 0x00000200,	/* on the blocked queue */
+	CTL_FLAG_ABORT_STATUS	= 0x00000400,	/* return TASK ABORTED status */
 	CTL_FLAG_ABORT		= 0x00000800,	/* this I/O should be aborted */
 	CTL_FLAG_DMA_INPROG	= 0x00001000,	/* DMA in progress */
 	CTL_FLAG_NO_DATASYNC	= 0x00002000,	/* don't cache flush data */
@@ -138,6 +139,10 @@ struct ctl_lba_len_flags {
 	uint64_t lba;
 	uint32_t len;
 	uint32_t flags;
+#define CTL_LLF_READ	0x10000000
+#define CTL_LLF_WRITE	0x20000000
+#define CTL_LLF_VERIFY	0x40000000
+#define CTL_LLF_COMPARE	0x80000000
 };
 
 struct ctl_ptr_len_flags {
@@ -216,8 +221,7 @@ struct ctl_nexus {
 	uint32_t targ_port;		/* Target port, filled in by PORT */
 	struct ctl_id targ_target;	/* Destination target */
 	uint32_t targ_lun;		/* Destination lun */
-	uint32_t (*lun_map_fn)(void *arg, uint32_t lun);
-	void *lun_map_arg;
+	uint32_t targ_mapped_lun;	/* Destination lun CTL-wide */
 };
 
 typedef enum {
@@ -361,6 +365,7 @@ typedef enum {
 	CTL_TASK_ABORT_TASK_SET,
 	CTL_TASK_CLEAR_ACA,
 	CTL_TASK_CLEAR_TASK_SET,
+	CTL_TASK_I_T_NEXUS_RESET,
 	CTL_TASK_LUN_RESET,
 	CTL_TASK_TARGET_RESET,
 	CTL_TASK_BUS_RESET,
@@ -402,7 +407,7 @@ struct ctl_pr_info {
 	ctl_pr_action        action;
 	uint8_t              sa_res_key[8];
 	uint8_t              res_type;
-	uint16_t             residx;
+	uint32_t             residx;
 };
 
 struct ctl_ha_msg_hdr {
diff --git a/sys/cam/ctl/ctl_ioctl.h b/sys/cam/ctl/ctl_ioctl.h
index 93dc4920334c..a90475b8fcf5 100644
--- a/sys/cam/ctl/ctl_ioctl.h
+++ b/sys/cam/ctl/ctl_ioctl.h
@@ -70,7 +70,7 @@
 /*
  * Maximum number of ports registered at one time.
  */
-#define	CTL_MAX_PORTS		32
+#define	CTL_MAX_PORTS		128
 
 /*
  * Maximum number of initiators we support.
@@ -594,6 +594,45 @@ struct ctl_lun_list {
 						/* passed to userland */
 };
 
+/*
+ * Port request interface:
+ *
+ * driver:		This is required, and is NUL-terminated a string
+ *			that is the name of the frontend, like "iscsi" .
+ *
+ * reqtype:		The type of request, CTL_REQ_CREATE to create a
+ *			port, CTL_REQ_REMOVE to delete a port.
+ *
+ * num_be_args:		This is the number of frontend-specific arguments
+ *			in the be_args array.
+ *
+ * be_args:		This is an array of frontend-specific arguments.
+ *			See above for a description of the fields in this
+ *			structure.
+ *
+ * status:		Status of the request.
+ *
+ * error_str:		If the status is CTL_LUN_ERROR, this will
+ *			contain a string describing the error.
+ *
+ * kern_be_args:	For kernel use only.
+ */
+typedef enum {
+	CTL_REQ_CREATE,
+	CTL_REQ_REMOVE,
+	CTL_REQ_MODIFY,
+} ctl_req_type;
+
+struct ctl_req {
+	char			driver[CTL_DRIVER_NAME_LEN];
+	ctl_req_type		reqtype;
+	int			num_args;
+	struct ctl_be_arg	*args;
+	ctl_lun_status		status;
+	char			error_str[CTL_ERROR_STR_LEN];
+	struct ctl_be_arg	*kern_args;
+};
+
 /*
  * iSCSI status
  *
@@ -642,6 +681,7 @@ struct ctl_iscsi_handoff_params {
 	char			initiator_name[CTL_ISCSI_NAME_LEN];
 	char			initiator_addr[CTL_ISCSI_ADDR_LEN];
 	char			initiator_alias[CTL_ISCSI_ALIAS_LEN];
+	uint8_t			initiator_isid[6];
 	char			target_name[CTL_ISCSI_NAME_LEN];
 	int			socket;
 	int			portal_group_tag;
@@ -789,6 +829,8 @@ struct ctl_iscsi {
 #define	CTL_ERROR_INJECT_DELETE	_IOW(CTL_MINOR, 0x23, struct ctl_error_desc)
 #define	CTL_SET_PORT_WWNS	_IOW(CTL_MINOR, 0x24, struct ctl_port_entry)
 #define	CTL_ISCSI		_IOWR(CTL_MINOR, 0x25, struct ctl_iscsi)
+#define	CTL_PORT_REQ		_IOWR(CTL_MINOR, 0x26, struct ctl_req)
+#define	CTL_PORT_LIST		_IOWR(CTL_MINOR, 0x27, struct ctl_lun_list)
 
 #endif /* _CTL_IOCTL_H_ */
 
diff --git a/sys/cam/ctl/ctl_private.h b/sys/cam/ctl/ctl_private.h
index c742a9344e82..46527ba015b4 100644
--- a/sys/cam/ctl/ctl_private.h
+++ b/sys/cam/ctl/ctl_private.h
@@ -79,7 +79,6 @@ typedef enum {
 	CTL_POOL_INTERNAL,
 	CTL_POOL_FETD,
 	CTL_POOL_EMERGENCY,
-	CTL_POOL_IOCTL,
 	CTL_POOL_4OTHERSC
 } ctl_pool_type;
 
@@ -110,7 +109,7 @@ typedef enum {
 struct ctl_ioctl_info {
 	ctl_ioctl_flags		flags;
 	uint32_t		cur_tag_num;
-	struct ctl_frontend	fe;
+	struct ctl_port		port;
 	char			port_name[24];
 };
 
@@ -136,6 +135,7 @@ typedef enum {
  *
  * Note:  "OK_ON_ALL_LUNS" == we don't have to have a lun configured
  *        "OK_ON_BOTH"     == we have to have a lun configured
+ *        "SA5"            == command has 5-bit service action at byte 1
  */
 typedef enum {
 	CTL_CMD_FLAG_NONE		= 0x0000,
@@ -149,7 +149,8 @@ typedef enum {
 	CTL_CMD_FLAG_OK_ON_INOPERABLE	= 0x0800,
 	CTL_CMD_FLAG_OK_ON_OFFLINE	= 0x1000,
 	CTL_CMD_FLAG_OK_ON_SECONDARY	= 0x2000,
-	CTL_CMD_FLAG_ALLOW_ON_PR_RESV   = 0x4000
+	CTL_CMD_FLAG_ALLOW_ON_PR_RESV	= 0x4000,
+	CTL_CMD_FLAG_SA5		= 0x8000
 } ctl_cmd_flags;
 
 typedef enum {
@@ -162,14 +163,10 @@ typedef enum {
 	CTL_SERIDX_RQ_SNS,
 	CTL_SERIDX_INQ,
 	CTL_SERIDX_RD_CAP,
-	CTL_SERIDX_RESV,
-	CTL_SERIDX_REL,
+	CTL_SERIDX_RES,
 	CTL_SERIDX_LOG_SNS,
 	CTL_SERIDX_FORMAT,
 	CTL_SERIDX_START,
-	CTL_SERIDX_PRES_IN,
-	CTL_SERIDX_PRES_OUT,
-	CTL_SERIDX_MAIN_IN,
 	/* TBD: others to be filled in as needed */
 	CTL_SERIDX_COUNT, /* LAST, not a normal code, provides # codes */
 	CTL_SERIDX_INVLD = CTL_SERIDX_COUNT
@@ -182,6 +179,9 @@ struct ctl_cmd_entry {
 	ctl_seridx		seridx;
 	ctl_cmd_flags		flags;
 	ctl_lun_error_pattern	pattern;
+	uint8_t			length;		/* CDB length */
+	uint8_t			usage[15];	/* Mask of allowed CDB bits
+						 * after the opcode byte. */
 };
 
 typedef enum {
@@ -332,11 +332,6 @@ struct ctl_mode_pages {
 	struct ctl_page_index		index[CTL_NUM_MODE_PAGES];
 };
 
-struct ctl_pending_sense {
-	ctl_ua_type		ua_pending;
-	struct scsi_sense_data	sense;
-};
-
 struct ctl_lun_delay_info {
 	ctl_delay_type		datamove_type;
 	uint32_t		datamove_delay;
@@ -360,15 +355,20 @@ struct ctl_per_res_info {
 	uint8_t  registered;
 };
 
-#define CTL_PR_ALL_REGISTRANTS  0xFFFF
-#define CTL_PR_NO_RESERVATION   0xFFF0
+#define CTL_PR_ALL_REGISTRANTS  0xFFFFFFFF
+#define CTL_PR_NO_RESERVATION   0xFFFFFFF0
+
+struct ctl_devid {
+	int		len;
+	uint8_t		data[];
+};
 
 /*
  * For report target port groups.
  */
 #define NUM_TARGET_PORT_GROUPS	2
-#define NUM_PORTS_PER_GRP	2
 
+struct tpc_list;
 struct ctl_lun {
 	struct mtx			lun_lock;
 	struct ctl_id			target;
@@ -388,31 +388,41 @@ struct ctl_lun {
 	STAILQ_ENTRY(ctl_lun)		links;
 	STAILQ_ENTRY(ctl_lun)		run_links;
 	struct ctl_nexus		rsv_nexus;
+#ifdef CTL_WITH_CA
 	uint32_t			have_ca[CTL_MAX_INITIATORS >> 5];
-	struct ctl_pending_sense	pending_sense[CTL_MAX_INITIATORS];
+	struct scsi_sense_data		pending_sense[CTL_MAX_INITIATORS];
+#endif
+	ctl_ua_type			pending_ua[CTL_MAX_INITIATORS];
 	struct ctl_mode_pages		mode_pages;
 	struct ctl_lun_io_stats		stats;
 	struct ctl_per_res_info		per_res[2*CTL_MAX_INITIATORS];
 	unsigned int			PRGeneration;
 	int				pr_key_count;
-	uint16_t        		pr_res_idx;
+	uint32_t			pr_res_idx;
 	uint8_t				res_type;
-	uint8_t				write_buffer[524288];
+	uint8_t				write_buffer[262144];
+	struct ctl_devid		*lun_devid;
+	TAILQ_HEAD(tpc_lists, tpc_list) tpc_lists;
 };
 
 typedef enum {
-	CTL_FLAG_TASK_PENDING	= 0x01,
 	CTL_FLAG_REAL_SYNC	= 0x02,
 	CTL_FLAG_MASTER_SHELF	= 0x04
 } ctl_gen_flags;
 
-struct ctl_wwpn_iid {
-	int in_use;
-	uint64_t wwpn;
-	uint32_t iid;
-	int32_t port;
+#define CTL_MAX_THREADS		16
+
+struct ctl_thread {
+	struct mtx_padalign queue_lock;
+	struct ctl_softc	*ctl_softc;
+	struct thread		*thread;
+	STAILQ_HEAD(, ctl_io_hdr) incoming_queue;
+	STAILQ_HEAD(, ctl_io_hdr) rtr_queue;
+	STAILQ_HEAD(, ctl_io_hdr) done_queue;
+	STAILQ_HEAD(, ctl_io_hdr) isc_queue;
 };
 
+struct tpc_token;
 struct ctl_softc {
 	struct mtx ctl_lock;
 	struct cdev *dev;
@@ -426,27 +436,22 @@ struct ctl_softc {
 	struct sysctl_ctx_list sysctl_ctx;
 	struct sysctl_oid *sysctl_tree;
 	struct ctl_ioctl_info ioctl_info;
-	struct ctl_lun lun;
 	struct ctl_io_pool *internal_pool;
 	struct ctl_io_pool *emergency_pool;
 	struct ctl_io_pool *othersc_pool;
-	struct proc *work_thread;
+	struct proc *ctl_proc;
 	int targ_online;
 	uint32_t ctl_lun_mask[CTL_MAX_LUNS >> 5];
 	struct ctl_lun *ctl_luns[CTL_MAX_LUNS];
-	struct ctl_wwpn_iid wwpn_iid[CTL_MAX_PORTS][CTL_MAX_INIT_PER_PORT];
 	uint32_t ctl_port_mask;
 	uint64_t aps_locked_lun;
 	STAILQ_HEAD(, ctl_lun) lun_list;
 	STAILQ_HEAD(, ctl_be_lun) pending_lun_queue;
-	STAILQ_HEAD(, ctl_io_hdr) task_queue;
-	STAILQ_HEAD(, ctl_io_hdr) incoming_queue;
-	STAILQ_HEAD(, ctl_io_hdr) rtr_queue;
-	STAILQ_HEAD(, ctl_io_hdr) done_queue;
-	STAILQ_HEAD(, ctl_io_hdr) isc_queue;
 	uint32_t num_frontends;
 	STAILQ_HEAD(, ctl_frontend) fe_list;
-	struct ctl_frontend *ctl_ports[CTL_MAX_PORTS];
+	uint32_t num_ports;
+	STAILQ_HEAD(, ctl_port) port_list;
+	struct ctl_port *ctl_ports[CTL_MAX_PORTS];
 	uint32_t num_backends;
 	STAILQ_HEAD(, ctl_backend_driver) be_list;
 	struct mtx pool_lock;
@@ -455,13 +460,18 @@ struct ctl_softc {
 	STAILQ_HEAD(, ctl_io_pool) io_pools;
 	time_t last_print_jiffies;
 	uint32_t skipped_prints;
+	struct ctl_thread threads[CTL_MAX_THREADS];
+	TAILQ_HEAD(tpc_tokens, tpc_token) tpc_tokens;
+	struct callout tpc_timeout;
 };
 
 #ifdef _KERNEL
 
-extern struct ctl_cmd_entry ctl_cmd_table[];
+extern const struct ctl_cmd_entry ctl_cmd_table[256];
 
 uint32_t ctl_get_initindex(struct ctl_nexus *nexus);
+uint32_t ctl_get_resindex(struct ctl_nexus *nexus);
+uint32_t ctl_port_idx(int port_num);
 int ctl_pool_create(struct ctl_softc *ctl_softc, ctl_pool_type pool_type,
 		    uint32_t total_ctl_io, struct ctl_io_pool **npool);
 void ctl_pool_free(struct ctl_io_pool *pool);
@@ -470,24 +480,46 @@ int ctl_scsi_reserve(struct ctl_scsiio *ctsio);
 int ctl_start_stop(struct ctl_scsiio *ctsio);
 int ctl_sync_cache(struct ctl_scsiio *ctsio);
 int ctl_format(struct ctl_scsiio *ctsio);
+int ctl_read_buffer(struct ctl_scsiio *ctsio);
 int ctl_write_buffer(struct ctl_scsiio *ctsio);
 int ctl_write_same(struct ctl_scsiio *ctsio);
 int ctl_unmap(struct ctl_scsiio *ctsio);
 int ctl_mode_select(struct ctl_scsiio *ctsio);
 int ctl_mode_sense(struct ctl_scsiio *ctsio);
 int ctl_read_capacity(struct ctl_scsiio *ctsio);
-int ctl_service_action_in(struct ctl_scsiio *ctsio);
+int ctl_read_capacity_16(struct ctl_scsiio *ctsio);
 int ctl_read_write(struct ctl_scsiio *ctsio);
+int ctl_cnw(struct ctl_scsiio *ctsio);
 int ctl_report_luns(struct ctl_scsiio *ctsio);
 int ctl_request_sense(struct ctl_scsiio *ctsio);
 int ctl_tur(struct ctl_scsiio *ctsio);
+int ctl_verify(struct ctl_scsiio *ctsio);
 int ctl_inquiry(struct ctl_scsiio *ctsio);
 int ctl_persistent_reserve_in(struct ctl_scsiio *ctsio);
 int ctl_persistent_reserve_out(struct ctl_scsiio *ctsio);
-int ctl_maintenance_in(struct ctl_scsiio *ctsio);
-void ctl_done_lock(union ctl_io *io, int have_lock);
+int ctl_report_tagret_port_groups(struct ctl_scsiio *ctsio);
+int ctl_report_supported_opcodes(struct ctl_scsiio *ctsio);
+int ctl_report_supported_tmf(struct ctl_scsiio *ctsio);
+int ctl_report_timestamp(struct ctl_scsiio *ctsio);
 int ctl_isc(struct ctl_scsiio *ctsio);
 
+void ctl_tpc_init(struct ctl_softc *softc);
+void ctl_tpc_shutdown(struct ctl_softc *softc);
+void ctl_tpc_lun_init(struct ctl_lun *lun);
+void ctl_tpc_lun_shutdown(struct ctl_lun *lun);
+int ctl_inquiry_evpd_tpc(struct ctl_scsiio *ctsio, int alloc_len);
+int ctl_receive_copy_status_lid1(struct ctl_scsiio *ctsio);
+int ctl_receive_copy_failure_details(struct ctl_scsiio *ctsio);
+int ctl_receive_copy_status_lid4(struct ctl_scsiio *ctsio);
+int ctl_receive_copy_operating_parameters(struct ctl_scsiio *ctsio);
+int ctl_extended_copy_lid1(struct ctl_scsiio *ctsio);
+int ctl_extended_copy_lid4(struct ctl_scsiio *ctsio);
+int ctl_copy_operation_abort(struct ctl_scsiio *ctsio);
+int ctl_populate_token(struct ctl_scsiio *ctsio);
+int ctl_write_using_token(struct ctl_scsiio *ctsio);
+int ctl_receive_rod_token_information(struct ctl_scsiio *ctsio);
+int ctl_report_all_rod_tokens(struct ctl_scsiio *ctsio);
+
 #endif	/* _KERNEL */
 
 #endif	/* _CTL_PRIVATE_H_ */
diff --git a/sys/cam/ctl/ctl_ser_table.c b/sys/cam/ctl/ctl_ser_table.c
index ee4f3044c07a..2bf39e6955f9 100644
--- a/sys/cam/ctl/ctl_ser_table.c
+++ b/sys/cam/ctl/ctl_ser_table.c
@@ -60,23 +60,19 @@
 
 static ctl_serialize_action
 ctl_serialize_table[CTL_SERIDX_COUNT][CTL_SERIDX_COUNT] = {
-/**>IDX_ :: 2nd:TUR RD  WRT UNM MDSN MDSL RQSN INQ RDCP RES REL LSNS FMT STR PRIN PROT MAININ*/
-/*TUR     */{   pS, pS, pS, pS, bK,  bK,  bK,  pS, pS,  bK, bK, pS,  bK, bK, bK,  bK,  bK},
-/*READ    */{   pS, pS, xT, bK, bK,  bK,  bK,  pS, pS,  bK, bK, pS,  bK, bK, bK,  bK,  bK},
-/*WRITE   */{   pS, xT, xT, bK, bK,  bK,  bK,  pS, pS,  bK, bK, pS,  bK, bK, bK,  bK,  bK},
-/*UNMAP   */{   pS, bK, bK, pS, bK,  bK,  bK,  pS, pS,  bK, bK, pS,  bK, bK, bK,  bK,  bK},
-/*MD_SNS  */{   bK, bK, bK, bK, pS,  bK,  bK,  pS, pS,  bK, bK, pS,  bK, bK, bK,  bK,  bK},
-/*MD_SEL  */{   bK, bK, bK, bK, bK,  bK,  bK,  pS, pS,  bK, bK, pS,  bK, bK, bK,  bK,  bK},
-/*RQ_SNS  */{   pS, pS, pS, pS, pS,  pS,  bK,  pS, pS,  bK, bK, pS,  bK, bK, bK,  bK,  bK},
-/*INQ     */{   pS, pS, pS, pS, pS,  pS,  bK,  pS, pS,  bK, bK, pS,  bK, bK, bK,  bK,  bK},
-/*RD_CAP  */{   pS, pS, pS, pS, pS,  pS,  bK,  pS, pS,  bK, bK, pS,  bK, bK, bK,  bK,  bK},
-/*RESV    */{   bK, bK, bK, bK, bK,  bK,  bK,  bK, bK,  bK, bK, bK,  bK, bK, bK,  bK,  bK},
-/*REL     */{   bK, bK, bK, bK, bK,  bK,  bK,  bK, bK,  bK, bK, bK,  bK, bK, bK,  bK,  bK},
-/*LOG_SNS */{   pS, pS, pS, pS, pS,  bK,  bK,  pS, pS,  bK, bK, pS,  bK, bK, bK,  bK,  bK},
-/*FORMAT  */{   pS, bK, bK, bK, bK,  bK,  pS,  pS, bK,  bK, bK, bK,  bK, bK, bK,  bK,  bK},
-/*START   */{   bK, bK, bK, bK, bK,  bK,  bK,  pS, bK,  bK, bK, bK,  bK, bK, bK,  bK,  bK},
-/*PRES_IN */{   bK, bK, bK, bK, bK,  bK,  bK,  bK, bK,  bK, bK, bK,  bK, bK, bK,  bK,  bK},
-/*PRES_OUT*/{   bK, bK, bK, bK, bK,  bK,  bK,  bK, bK,  bK, bK, bK,  bK, bK, bK,  bK,  bK},
-/*MAIN_IN */{   bK, bK, bK, bK, bK,  bK,  bK,  pS, bK,  bK, bK, bK,  bK, bK, bK,  bK,  pS}
+/**>IDX_ :: 2nd:TUR RD  WRT UNM MDSN MDSL RQSN INQ RDCP RES LSNS FMT STR*/
+/*TUR     */{   pS, pS, pS, pS, bK,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
+/*READ    */{   pS, pS, xT, bK, bK,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
+/*WRITE   */{   pS, xT, xT, bK, bK,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
+/*UNMAP   */{   pS, bK, bK, pS, bK,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
+/*MD_SNS  */{   bK, bK, bK, bK, pS,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
+/*MD_SEL  */{   bK, bK, bK, bK, bK,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
+/*RQ_SNS  */{   pS, pS, pS, pS, pS,  pS,  bK,  pS, pS,  bK, pS,  bK, bK},
+/*INQ     */{   pS, pS, pS, pS, pS,  pS,  bK,  pS, pS,  pS, pS,  bK, bK},
+/*RD_CAP  */{   pS, pS, pS, pS, pS,  pS,  bK,  pS, pS,  pS, pS,  bK, pS},
+/*RES     */{   bK, bK, bK, bK, bK,  bK,  bK,  pS, bK,  bK, bK,  bK, bK},
+/*LOG_SNS */{   pS, pS, pS, pS, pS,  bK,  bK,  pS, pS,  bK, pS,  bK, bK},
+/*FORMAT  */{   pS, bK, bK, bK, bK,  bK,  pS,  pS, bK,  bK, bK,  bK, bK},
+/*START   */{   bK, bK, bK, bK, bK,  bK,  bK,  pS, bK,  bK, bK,  bK, bK},
 };
 
diff --git a/sys/cam/ctl/ctl_tpc.c b/sys/cam/ctl/ctl_tpc.c
new file mode 100644
index 000000000000..a037189d9ac9
--- /dev/null
+++ b/sys/cam/ctl/ctl_tpc.c
@@ -0,0 +1,2260 @@
+/*-
+ * Copyright (c) 2014 Alexander Motin <mav@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,
+ *    without modification, immediately at the beginning of the file.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, 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/types.h>
+#include <sys/lock.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/condvar.h>
+#include <sys/malloc.h>
+#include <sys/conf.h>
+#include <sys/queue.h>
+#include <sys/sysctl.h>
+#include <machine/atomic.h>
+
+#include <cam/cam.h>
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_da.h>
+#include <cam/ctl/ctl_io.h>
+#include <cam/ctl/ctl.h>
+#include <cam/ctl/ctl_frontend.h>
+#include <cam/ctl/ctl_frontend_internal.h>
+#include <cam/ctl/ctl_util.h>
+#include <cam/ctl/ctl_backend.h>
+#include <cam/ctl/ctl_ioctl.h>
+#include <cam/ctl/ctl_ha.h>
+#include <cam/ctl/ctl_private.h>
+#include <cam/ctl/ctl_debug.h>
+#include <cam/ctl/ctl_scsi_all.h>
+#include <cam/ctl/ctl_tpc.h>
+#include <cam/ctl/ctl_error.h>
+
+#define	TPC_MAX_CSCDS	64
+#define	TPC_MAX_SEGS	64
+#define	TPC_MAX_SEG	0
+#define	TPC_MAX_LIST	8192
+#define	TPC_MAX_INLINE	0
+#define	TPC_MAX_LISTS	255
+#define	TPC_MAX_IO_SIZE	(1024 * 1024)
+#define	TPC_MAX_IOCHUNK_SIZE	(TPC_MAX_IO_SIZE * 16)
+#define	TPC_MIN_TOKEN_TIMEOUT	1
+#define	TPC_DFL_TOKEN_TIMEOUT	60
+#define	TPC_MAX_TOKEN_TIMEOUT	600
+
+MALLOC_DEFINE(M_CTL_TPC, "ctltpc", "CTL TPC");
+
+typedef enum {
+	TPC_ERR_RETRY		= 0x000,
+	TPC_ERR_FAIL		= 0x001,
+	TPC_ERR_MASK		= 0x0ff,
+	TPC_ERR_NO_DECREMENT	= 0x100
+} tpc_error_action;
+
+struct tpc_list;
+TAILQ_HEAD(runl, tpc_io);
+struct tpc_io {
+	union ctl_io		*io;
+	uint64_t		 lun;
+	struct tpc_list		*list;
+	struct runl		 run;
+	TAILQ_ENTRY(tpc_io)	 rlinks;
+	TAILQ_ENTRY(tpc_io)	 links;
+};
+
+struct tpc_token {
+	uint8_t			 token[512];
+	uint64_t		 lun;
+	uint32_t		 blocksize;
+	uint8_t			*params;
+	struct scsi_range_desc	*range;
+	int			 nrange;
+	int			 active;
+	time_t			 last_active;
+	uint32_t		 timeout;
+	TAILQ_ENTRY(tpc_token)	 links;
+};
+
+struct tpc_list {
+	uint8_t			 service_action;
+	int			 init_port;
+	uint32_t		 init_idx;
+	uint32_t		 list_id;
+	uint8_t			 flags;
+	uint8_t			*params;
+	struct scsi_ec_cscd	*cscd;
+	struct scsi_ec_segment	*seg[TPC_MAX_SEGS];
+	uint8_t			*inl;
+	int			 ncscd;
+	int			 nseg;
+	int			 leninl;
+	struct tpc_token	*token;
+	struct scsi_range_desc	*range;
+	int			 nrange;
+	off_t			 offset_into_rod;
+
+	int			 curseg;
+	off_t			 cursectors;
+	off_t			 curbytes;
+	int			 curops;
+	int			 stage;
+	uint8_t			*buf;
+	off_t			 segsectors;
+	off_t			 segbytes;
+	int			 tbdio;
+	int			 error;
+	int			 abort;
+	int			 completed;
+	time_t			 last_active;
+	TAILQ_HEAD(, tpc_io)	 allio;
+	struct scsi_sense_data	 sense_data;
+	uint8_t			 sense_len;
+	uint8_t			 scsi_status;
+	struct ctl_scsiio	*ctsio;
+	struct ctl_lun		*lun;
+	int			 res_token_valid;
+	uint8_t			 res_token[512];
+	TAILQ_ENTRY(tpc_list)	 links;
+};
+
+extern struct ctl_softc *control_softc;
+
+static void
+tpc_timeout(void *arg)
+{
+	struct ctl_softc *softc = arg;
+	struct ctl_lun *lun;
+	struct tpc_token *token, *ttoken;
+	struct tpc_list *list, *tlist;
+
+	/* Free completed lists with expired timeout. */
+	STAILQ_FOREACH(lun, &softc->lun_list, links) {
+		mtx_lock(&lun->lun_lock);
+		TAILQ_FOREACH_SAFE(list, &lun->tpc_lists, links, tlist) {
+			if (!list->completed || time_uptime < list->last_active +
+			    TPC_DFL_TOKEN_TIMEOUT)
+				continue;
+			TAILQ_REMOVE(&lun->tpc_lists, list, links);
+			free(list, M_CTL);
+		}
+		mtx_unlock(&lun->lun_lock);
+	}
+
+	/* Free inactive ROD tokens with expired timeout. */
+	TAILQ_FOREACH_SAFE(token, &softc->tpc_tokens, links, ttoken) {
+		if (token->active ||
+		    time_uptime < token->last_active + token->timeout + 1)
+			continue;
+		TAILQ_REMOVE(&softc->tpc_tokens, token, links);
+		free(token->params, M_CTL);
+		free(token, M_CTL);
+	}
+	callout_schedule(&softc->tpc_timeout, hz);
+}
+
+void
+ctl_tpc_init(struct ctl_softc *softc)
+{
+
+	TAILQ_INIT(&softc->tpc_tokens);
+	callout_init_mtx(&softc->tpc_timeout, &softc->ctl_lock, 0);
+	callout_reset(&softc->tpc_timeout, hz, tpc_timeout, softc);
+}
+
+void
+ctl_tpc_shutdown(struct ctl_softc *softc)
+{
+	struct tpc_token *token;
+
+	callout_drain(&softc->tpc_timeout);
+
+	/* Free ROD tokens. */
+	mtx_lock(&softc->ctl_lock);
+	while ((token = TAILQ_FIRST(&softc->tpc_tokens)) != NULL) {
+		TAILQ_REMOVE(&softc->tpc_tokens, token, links);
+		free(token->params, M_CTL);
+		free(token, M_CTL);
+	}
+	mtx_unlock(&softc->ctl_lock);
+}
+
+void
+ctl_tpc_lun_init(struct ctl_lun *lun)
+{
+
+	TAILQ_INIT(&lun->tpc_lists);
+}
+
+void
+ctl_tpc_lun_shutdown(struct ctl_lun *lun)
+{
+	struct tpc_list *list;
+	struct tpc_token *token, *ttoken;
+
+	/* Free lists for this LUN. */
+	while ((list = TAILQ_FIRST(&lun->tpc_lists)) != NULL) {
+		TAILQ_REMOVE(&lun->tpc_lists, list, links);
+		KASSERT(list->completed,
+		    ("Not completed TPC (%p) on shutdown", list));
+		free(list, M_CTL);
+	}
+
+	/* Free ROD tokens for this LUN. */
+	mtx_lock(&control_softc->ctl_lock);
+	TAILQ_FOREACH_SAFE(token, &control_softc->tpc_tokens, links, ttoken) {
+		if (token->lun != lun->lun || token->active)
+			continue;
+		TAILQ_REMOVE(&control_softc->tpc_tokens, token, links);
+		free(token->params, M_CTL);
+		free(token, M_CTL);
+	}
+	mtx_unlock(&control_softc->ctl_lock);
+}
+
+int
+ctl_inquiry_evpd_tpc(struct ctl_scsiio *ctsio, int alloc_len)
+{
+	struct scsi_vpd_tpc *tpc_ptr;
+	struct scsi_vpd_tpc_descriptor *d_ptr;
+	struct scsi_vpd_tpc_descriptor_bdrl *bdrl_ptr;
+	struct scsi_vpd_tpc_descriptor_sc *sc_ptr;
+	struct scsi_vpd_tpc_descriptor_sc_descr *scd_ptr;
+	struct scsi_vpd_tpc_descriptor_pd *pd_ptr;
+	struct scsi_vpd_tpc_descriptor_sd *sd_ptr;
+	struct scsi_vpd_tpc_descriptor_sdid *sdid_ptr;
+	struct scsi_vpd_tpc_descriptor_rtf *rtf_ptr;
+	struct scsi_vpd_tpc_descriptor_rtf_block *rtfb_ptr;
+	struct scsi_vpd_tpc_descriptor_srt *srt_ptr;
+	struct scsi_vpd_tpc_descriptor_srtd *srtd_ptr;
+	struct scsi_vpd_tpc_descriptor_gco *gco_ptr;
+	struct ctl_lun *lun;
+	int data_len;
+
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	data_len = sizeof(struct scsi_vpd_tpc) +
+	    sizeof(struct scsi_vpd_tpc_descriptor_bdrl) +
+	    roundup2(sizeof(struct scsi_vpd_tpc_descriptor_sc) +
+	     2 * sizeof(struct scsi_vpd_tpc_descriptor_sc_descr) + 11, 4) +
+	    sizeof(struct scsi_vpd_tpc_descriptor_pd) +
+	    roundup2(sizeof(struct scsi_vpd_tpc_descriptor_sd) + 4, 4) +
+	    roundup2(sizeof(struct scsi_vpd_tpc_descriptor_sdid) + 2, 4) +
+	    sizeof(struct scsi_vpd_tpc_descriptor_rtf) +
+	     sizeof(struct scsi_vpd_tpc_descriptor_rtf_block) +
+	    sizeof(struct scsi_vpd_tpc_descriptor_srt) +
+	     2*sizeof(struct scsi_vpd_tpc_descriptor_srtd) +
+	    sizeof(struct scsi_vpd_tpc_descriptor_gco);
+
+	ctsio->kern_data_ptr = malloc(data_len, M_CTL, M_WAITOK | M_ZERO);
+	tpc_ptr = (struct scsi_vpd_tpc *)ctsio->kern_data_ptr;
+	ctsio->kern_sg_entries = 0;
+
+	if (data_len < alloc_len) {
+		ctsio->residual = alloc_len - data_len;
+		ctsio->kern_data_len = data_len;
+		ctsio->kern_total_len = data_len;
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+	ctsio->kern_sg_entries = 0;
+
+	/*
+	 * The control device is always connected.  The disk device, on the
+	 * other hand, may not be online all the time.
+	 */
+	if (lun != NULL)
+		tpc_ptr->device = (SID_QUAL_LU_CONNECTED << 5) |
+				     lun->be_lun->lun_type;
+	else
+		tpc_ptr->device = (SID_QUAL_LU_OFFLINE << 5) | T_DIRECT;
+	tpc_ptr->page_code = SVPD_SCSI_TPC;
+	scsi_ulto2b(data_len - 4, tpc_ptr->page_length);
+
+	/* Block Device ROD Limits */
+	d_ptr = (struct scsi_vpd_tpc_descriptor *)&tpc_ptr->descr[0];
+	bdrl_ptr = (struct scsi_vpd_tpc_descriptor_bdrl *)d_ptr;
+	scsi_ulto2b(SVPD_TPC_BDRL, bdrl_ptr->desc_type);
+	scsi_ulto2b(sizeof(*bdrl_ptr) - 4, bdrl_ptr->desc_length);
+	scsi_ulto2b(TPC_MAX_SEGS, bdrl_ptr->maximum_ranges);
+	scsi_ulto4b(TPC_MAX_TOKEN_TIMEOUT,
+	    bdrl_ptr->maximum_inactivity_timeout);
+	scsi_ulto4b(TPC_DFL_TOKEN_TIMEOUT,
+	    bdrl_ptr->default_inactivity_timeout);
+	scsi_u64to8b(0, bdrl_ptr->maximum_token_transfer_size);
+	scsi_u64to8b(0, bdrl_ptr->optimal_transfer_count);
+
+	/* Supported commands */
+	d_ptr = (struct scsi_vpd_tpc_descriptor *)
+	    (&d_ptr->parameters[0] + scsi_2btoul(d_ptr->desc_length));
+	sc_ptr = (struct scsi_vpd_tpc_descriptor_sc *)d_ptr;
+	scsi_ulto2b(SVPD_TPC_SC, sc_ptr->desc_type);
+	sc_ptr->list_length = 2 * sizeof(*scd_ptr) + 11;
+	scsi_ulto2b(roundup2(1 + sc_ptr->list_length, 4), sc_ptr->desc_length);
+	scd_ptr = &sc_ptr->descr[0];
+	scd_ptr->opcode = EXTENDED_COPY;
+	scd_ptr->sa_length = 5;
+	scd_ptr->supported_service_actions[0] = EC_EC_LID1;
+	scd_ptr->supported_service_actions[1] = EC_EC_LID4;
+	scd_ptr->supported_service_actions[2] = EC_PT;
+	scd_ptr->supported_service_actions[3] = EC_WUT;
+	scd_ptr->supported_service_actions[4] = EC_COA;
+	scd_ptr = (struct scsi_vpd_tpc_descriptor_sc_descr *)
+	    &scd_ptr->supported_service_actions[scd_ptr->sa_length];
+	scd_ptr->opcode = RECEIVE_COPY_STATUS;
+	scd_ptr->sa_length = 6;
+	scd_ptr->supported_service_actions[0] = RCS_RCS_LID1;
+	scd_ptr->supported_service_actions[1] = RCS_RCFD;
+	scd_ptr->supported_service_actions[2] = RCS_RCS_LID4;
+	scd_ptr->supported_service_actions[3] = RCS_RCOP;
+	scd_ptr->supported_service_actions[4] = RCS_RRTI;
+	scd_ptr->supported_service_actions[5] = RCS_RART;
+
+	/* Parameter data. */
+	d_ptr = (struct scsi_vpd_tpc_descriptor *)
+	    (&d_ptr->parameters[0] + scsi_2btoul(d_ptr->desc_length));
+	pd_ptr = (struct scsi_vpd_tpc_descriptor_pd *)d_ptr;
+	scsi_ulto2b(SVPD_TPC_PD, pd_ptr->desc_type);
+	scsi_ulto2b(sizeof(*pd_ptr) - 4, pd_ptr->desc_length);
+	scsi_ulto2b(TPC_MAX_CSCDS, pd_ptr->maximum_cscd_descriptor_count);
+	scsi_ulto2b(TPC_MAX_SEGS, pd_ptr->maximum_segment_descriptor_count);
+	scsi_ulto4b(TPC_MAX_LIST, pd_ptr->maximum_descriptor_list_length);
+	scsi_ulto4b(TPC_MAX_INLINE, pd_ptr->maximum_inline_data_length);
+
+	/* Supported Descriptors */
+	d_ptr = (struct scsi_vpd_tpc_descriptor *)
+	    (&d_ptr->parameters[0] + scsi_2btoul(d_ptr->desc_length));
+	sd_ptr = (struct scsi_vpd_tpc_descriptor_sd *)d_ptr;
+	scsi_ulto2b(SVPD_TPC_SD, sd_ptr->desc_type);
+	scsi_ulto2b(roundup2(sizeof(*sd_ptr) - 4 + 4, 4), sd_ptr->desc_length);
+	sd_ptr->list_length = 4;
+	sd_ptr->supported_descriptor_codes[0] = EC_SEG_B2B;
+	sd_ptr->supported_descriptor_codes[1] = EC_SEG_VERIFY;
+	sd_ptr->supported_descriptor_codes[2] = EC_SEG_REGISTER_KEY;
+	sd_ptr->supported_descriptor_codes[3] = EC_CSCD_ID;
+
+	/* Supported CSCD Descriptor IDs */
+	d_ptr = (struct scsi_vpd_tpc_descriptor *)
+	    (&d_ptr->parameters[0] + scsi_2btoul(d_ptr->desc_length));
+	sdid_ptr = (struct scsi_vpd_tpc_descriptor_sdid *)d_ptr;
+	scsi_ulto2b(SVPD_TPC_SDID, sdid_ptr->desc_type);
+	scsi_ulto2b(roundup2(sizeof(*sdid_ptr) - 4 + 2, 4), sdid_ptr->desc_length);
+	scsi_ulto2b(2, sdid_ptr->list_length);
+	scsi_ulto2b(0xffff, &sdid_ptr->supported_descriptor_ids[0]);
+
+	/* ROD Token Features */
+	d_ptr = (struct scsi_vpd_tpc_descriptor *)
+	    (&d_ptr->parameters[0] + scsi_2btoul(d_ptr->desc_length));
+	rtf_ptr = (struct scsi_vpd_tpc_descriptor_rtf *)d_ptr;
+	scsi_ulto2b(SVPD_TPC_RTF, rtf_ptr->desc_type);
+	scsi_ulto2b(sizeof(*rtf_ptr) - 4 + sizeof(*rtfb_ptr), rtf_ptr->desc_length);
+	rtf_ptr->remote_tokens = 0;
+	scsi_ulto4b(TPC_MIN_TOKEN_TIMEOUT, rtf_ptr->minimum_token_lifetime);
+	scsi_ulto4b(UINT32_MAX, rtf_ptr->maximum_token_lifetime);
+	scsi_ulto4b(TPC_MAX_TOKEN_TIMEOUT,
+	    rtf_ptr->maximum_token_inactivity_timeout);
+	scsi_ulto2b(sizeof(*rtfb_ptr), rtf_ptr->type_specific_features_length);
+	rtfb_ptr = (struct scsi_vpd_tpc_descriptor_rtf_block *)
+	    &rtf_ptr->type_specific_features;
+	rtfb_ptr->type_format = SVPD_TPC_RTF_BLOCK;
+	scsi_ulto2b(sizeof(*rtfb_ptr) - 4, rtfb_ptr->desc_length);
+	scsi_ulto2b(0, rtfb_ptr->optimal_length_granularity);
+	scsi_u64to8b(0, rtfb_ptr->maximum_bytes);
+	scsi_u64to8b(0, rtfb_ptr->optimal_bytes);
+	scsi_u64to8b(TPC_MAX_IOCHUNK_SIZE,
+	    rtfb_ptr->optimal_bytes_to_token_per_segment);
+	scsi_u64to8b(TPC_MAX_IOCHUNK_SIZE,
+	    rtfb_ptr->optimal_bytes_from_token_per_segment);
+
+	/* Supported ROD Tokens */
+	d_ptr = (struct scsi_vpd_tpc_descriptor *)
+	    (&d_ptr->parameters[0] + scsi_2btoul(d_ptr->desc_length));
+	srt_ptr = (struct scsi_vpd_tpc_descriptor_srt *)d_ptr;
+	scsi_ulto2b(SVPD_TPC_SRT, srt_ptr->desc_type);
+	scsi_ulto2b(sizeof(*srt_ptr) - 4 + 2*sizeof(*srtd_ptr), srt_ptr->desc_length);
+	scsi_ulto2b(2*sizeof(*srtd_ptr), srt_ptr->rod_type_descriptors_length);
+	srtd_ptr = (struct scsi_vpd_tpc_descriptor_srtd *)
+	    &srt_ptr->rod_type_descriptors;
+	scsi_ulto4b(ROD_TYPE_AUR, srtd_ptr->rod_type);
+	srtd_ptr->flags = SVPD_TPC_SRTD_TIN | SVPD_TPC_SRTD_TOUT;
+	scsi_ulto2b(0, srtd_ptr->preference_indicator);
+	srtd_ptr++;
+	scsi_ulto4b(ROD_TYPE_BLOCK_ZERO, srtd_ptr->rod_type);
+	srtd_ptr->flags = SVPD_TPC_SRTD_TIN;
+	scsi_ulto2b(0, srtd_ptr->preference_indicator);
+
+	/* General Copy Operations */
+	d_ptr = (struct scsi_vpd_tpc_descriptor *)
+	    (&d_ptr->parameters[0] + scsi_2btoul(d_ptr->desc_length));
+	gco_ptr = (struct scsi_vpd_tpc_descriptor_gco *)d_ptr;
+	scsi_ulto2b(SVPD_TPC_GCO, gco_ptr->desc_type);
+	scsi_ulto2b(sizeof(*gco_ptr) - 4, gco_ptr->desc_length);
+	scsi_ulto4b(TPC_MAX_LISTS, gco_ptr->total_concurrent_copies);
+	scsi_ulto4b(TPC_MAX_LISTS, gco_ptr->maximum_identified_concurrent_copies);
+	scsi_ulto4b(TPC_MAX_SEG, gco_ptr->maximum_segment_length);
+	gco_ptr->data_segment_granularity = 0;
+	gco_ptr->inline_data_granularity = 0;
+
+	ctsio->scsi_status = SCSI_STATUS_OK;
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+	ctl_datamove((union ctl_io *)ctsio);
+
+	return (CTL_RETVAL_COMPLETE);
+}
+
+int
+ctl_receive_copy_operating_parameters(struct ctl_scsiio *ctsio)
+{
+	struct scsi_receive_copy_operating_parameters *cdb;
+	struct scsi_receive_copy_operating_parameters_data *data;
+	int retval;
+	int alloc_len, total_len;
+
+	CTL_DEBUG_PRINT(("ctl_report_supported_tmf\n"));
+
+	cdb = (struct scsi_receive_copy_operating_parameters *)ctsio->cdb;
+
+	retval = CTL_RETVAL_COMPLETE;
+
+	total_len = sizeof(*data) + 4;
+	alloc_len = scsi_4btoul(cdb->length);
+
+	ctsio->kern_data_ptr = malloc(total_len, M_CTL, M_WAITOK | M_ZERO);
+
+	ctsio->kern_sg_entries = 0;
+
+	if (total_len < alloc_len) {
+		ctsio->residual = alloc_len - total_len;
+		ctsio->kern_data_len = total_len;
+		ctsio->kern_total_len = total_len;
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+
+	data = (struct scsi_receive_copy_operating_parameters_data *)ctsio->kern_data_ptr;
+	scsi_ulto4b(sizeof(*data) - 4 + 4, data->length);
+	data->snlid = RCOP_SNLID;
+	scsi_ulto2b(TPC_MAX_CSCDS, data->maximum_cscd_descriptor_count);
+	scsi_ulto2b(TPC_MAX_SEGS, data->maximum_segment_descriptor_count);
+	scsi_ulto4b(TPC_MAX_LIST, data->maximum_descriptor_list_length);
+	scsi_ulto4b(TPC_MAX_SEG, data->maximum_segment_length);
+	scsi_ulto4b(TPC_MAX_INLINE, data->maximum_inline_data_length);
+	scsi_ulto4b(0, data->held_data_limit);
+	scsi_ulto4b(0, data->maximum_stream_device_transfer_size);
+	scsi_ulto2b(TPC_MAX_LISTS, data->total_concurrent_copies);
+	data->maximum_concurrent_copies = TPC_MAX_LISTS;
+	data->data_segment_granularity = 0;
+	data->inline_data_granularity = 0;
+	data->held_data_granularity = 0;
+	data->implemented_descriptor_list_length = 4;
+	data->list_of_implemented_descriptor_type_codes[0] = EC_SEG_B2B;
+	data->list_of_implemented_descriptor_type_codes[1] = EC_SEG_VERIFY;
+	data->list_of_implemented_descriptor_type_codes[2] = EC_SEG_REGISTER_KEY;
+	data->list_of_implemented_descriptor_type_codes[3] = EC_CSCD_ID;
+
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+
+	ctl_datamove((union ctl_io *)ctsio);
+	return (retval);
+}
+
+static struct tpc_list *
+tpc_find_list(struct ctl_lun *lun, uint32_t list_id, uint32_t init_idx)
+{
+	struct tpc_list *list;
+
+	mtx_assert(&lun->lun_lock, MA_OWNED);
+	TAILQ_FOREACH(list, &lun->tpc_lists, links) {
+		if ((list->flags & EC_LIST_ID_USAGE_MASK) !=
+		     EC_LIST_ID_USAGE_NONE && list->list_id == list_id &&
+		    list->init_idx == init_idx)
+			break;
+	}
+	return (list);
+}
+
+int
+ctl_receive_copy_status_lid1(struct ctl_scsiio *ctsio)
+{
+	struct ctl_lun *lun;
+	struct scsi_receive_copy_status_lid1 *cdb;
+	struct scsi_receive_copy_status_lid1_data *data;
+	struct tpc_list *list;
+	struct tpc_list list_copy;
+	int retval;
+	int alloc_len, total_len;
+	uint32_t list_id;
+
+	CTL_DEBUG_PRINT(("ctl_receive_copy_status_lid1\n"));
+
+	cdb = (struct scsi_receive_copy_status_lid1 *)ctsio->cdb;
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	retval = CTL_RETVAL_COMPLETE;
+
+	list_id = cdb->list_identifier;
+	mtx_lock(&lun->lun_lock);
+	list = tpc_find_list(lun, list_id,
+	    ctl_get_resindex(&ctsio->io_hdr.nexus));
+	if (list == NULL) {
+		mtx_unlock(&lun->lun_lock);
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1,
+		    /*command*/ 1, /*field*/ 2, /*bit_valid*/ 0,
+		    /*bit*/ 0);
+		ctl_done((union ctl_io *)ctsio);
+		return (retval);
+	}
+	list_copy = *list;
+	if (list->completed) {
+		TAILQ_REMOVE(&lun->tpc_lists, list, links);
+		free(list, M_CTL);
+	}
+	mtx_unlock(&lun->lun_lock);
+
+	total_len = sizeof(*data);
+	alloc_len = scsi_4btoul(cdb->length);
+
+	ctsio->kern_data_ptr = malloc(total_len, M_CTL, M_WAITOK | M_ZERO);
+
+	ctsio->kern_sg_entries = 0;
+
+	if (total_len < alloc_len) {
+		ctsio->residual = alloc_len - total_len;
+		ctsio->kern_data_len = total_len;
+		ctsio->kern_total_len = total_len;
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+
+	data = (struct scsi_receive_copy_status_lid1_data *)ctsio->kern_data_ptr;
+	scsi_ulto4b(sizeof(*data) - 4, data->available_data);
+	if (list_copy.completed) {
+		if (list_copy.error || list_copy.abort)
+			data->copy_command_status = RCS_CCS_ERROR;
+		else
+			data->copy_command_status = RCS_CCS_COMPLETED;
+	} else
+		data->copy_command_status = RCS_CCS_INPROG;
+	scsi_ulto2b(list_copy.curseg, data->segments_processed);
+	if (list_copy.curbytes <= UINT32_MAX) {
+		data->transfer_count_units = RCS_TC_BYTES;
+		scsi_ulto4b(list_copy.curbytes, data->transfer_count);
+	} else {
+		data->transfer_count_units = RCS_TC_MBYTES;
+		scsi_ulto4b(list_copy.curbytes >> 20, data->transfer_count);
+	}
+
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+
+	ctl_datamove((union ctl_io *)ctsio);
+	return (retval);
+}
+
+int
+ctl_receive_copy_failure_details(struct ctl_scsiio *ctsio)
+{
+	struct ctl_lun *lun;
+	struct scsi_receive_copy_failure_details *cdb;
+	struct scsi_receive_copy_failure_details_data *data;
+	struct tpc_list *list;
+	struct tpc_list list_copy;
+	int retval;
+	int alloc_len, total_len;
+	uint32_t list_id;
+
+	CTL_DEBUG_PRINT(("ctl_receive_copy_failure_details\n"));
+
+	cdb = (struct scsi_receive_copy_failure_details *)ctsio->cdb;
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	retval = CTL_RETVAL_COMPLETE;
+
+	list_id = cdb->list_identifier;
+	mtx_lock(&lun->lun_lock);
+	list = tpc_find_list(lun, list_id,
+	    ctl_get_resindex(&ctsio->io_hdr.nexus));
+	if (list == NULL || !list->completed) {
+		mtx_unlock(&lun->lun_lock);
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1,
+		    /*command*/ 1, /*field*/ 2, /*bit_valid*/ 0,
+		    /*bit*/ 0);
+		ctl_done((union ctl_io *)ctsio);
+		return (retval);
+	}
+	list_copy = *list;
+	TAILQ_REMOVE(&lun->tpc_lists, list, links);
+	free(list, M_CTL);
+	mtx_unlock(&lun->lun_lock);
+
+	total_len = sizeof(*data) + list_copy.sense_len;
+	alloc_len = scsi_4btoul(cdb->length);
+
+	ctsio->kern_data_ptr = malloc(total_len, M_CTL, M_WAITOK | M_ZERO);
+
+	ctsio->kern_sg_entries = 0;
+
+	if (total_len < alloc_len) {
+		ctsio->residual = alloc_len - total_len;
+		ctsio->kern_data_len = total_len;
+		ctsio->kern_total_len = total_len;
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+
+	data = (struct scsi_receive_copy_failure_details_data *)ctsio->kern_data_ptr;
+	if (list_copy.completed && (list_copy.error || list_copy.abort)) {
+		scsi_ulto4b(sizeof(*data) - 4 + list_copy.sense_len,
+		    data->available_data);
+		data->copy_command_status = RCS_CCS_ERROR;
+	} else
+		scsi_ulto4b(0, data->available_data);
+	scsi_ulto2b(list_copy.sense_len, data->sense_data_length);
+	memcpy(data->sense_data, &list_copy.sense_data, list_copy.sense_len);
+
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+
+	ctl_datamove((union ctl_io *)ctsio);
+	return (retval);
+}
+
+int
+ctl_receive_copy_status_lid4(struct ctl_scsiio *ctsio)
+{
+	struct ctl_lun *lun;
+	struct scsi_receive_copy_status_lid4 *cdb;
+	struct scsi_receive_copy_status_lid4_data *data;
+	struct tpc_list *list;
+	struct tpc_list list_copy;
+	int retval;
+	int alloc_len, total_len;
+	uint32_t list_id;
+
+	CTL_DEBUG_PRINT(("ctl_receive_copy_status_lid4\n"));
+
+	cdb = (struct scsi_receive_copy_status_lid4 *)ctsio->cdb;
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	retval = CTL_RETVAL_COMPLETE;
+
+	list_id = scsi_4btoul(cdb->list_identifier);
+	mtx_lock(&lun->lun_lock);
+	list = tpc_find_list(lun, list_id,
+	    ctl_get_resindex(&ctsio->io_hdr.nexus));
+	if (list == NULL) {
+		mtx_unlock(&lun->lun_lock);
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1,
+		    /*command*/ 1, /*field*/ 2, /*bit_valid*/ 0,
+		    /*bit*/ 0);
+		ctl_done((union ctl_io *)ctsio);
+		return (retval);
+	}
+	list_copy = *list;
+	if (list->completed) {
+		TAILQ_REMOVE(&lun->tpc_lists, list, links);
+		free(list, M_CTL);
+	}
+	mtx_unlock(&lun->lun_lock);
+
+	total_len = sizeof(*data) + list_copy.sense_len;
+	alloc_len = scsi_4btoul(cdb->length);
+
+	ctsio->kern_data_ptr = malloc(total_len, M_CTL, M_WAITOK | M_ZERO);
+
+	ctsio->kern_sg_entries = 0;
+
+	if (total_len < alloc_len) {
+		ctsio->residual = alloc_len - total_len;
+		ctsio->kern_data_len = total_len;
+		ctsio->kern_total_len = total_len;
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+
+	data = (struct scsi_receive_copy_status_lid4_data *)ctsio->kern_data_ptr;
+	scsi_ulto4b(sizeof(*data) - 4 + list_copy.sense_len,
+	    data->available_data);
+	data->response_to_service_action = list_copy.service_action;
+	if (list_copy.completed) {
+		if (list_copy.error)
+			data->copy_command_status = RCS_CCS_ERROR;
+		else if (list_copy.abort)
+			data->copy_command_status = RCS_CCS_ABORTED;
+		else
+			data->copy_command_status = RCS_CCS_COMPLETED;
+	} else
+		data->copy_command_status = RCS_CCS_INPROG_FG;
+	scsi_ulto2b(list_copy.curops, data->operation_counter);
+	scsi_ulto4b(UINT32_MAX, data->estimated_status_update_delay);
+	data->transfer_count_units = RCS_TC_BYTES;
+	scsi_u64to8b(list_copy.curbytes, data->transfer_count);
+	scsi_ulto2b(list_copy.curseg, data->segments_processed);
+	data->length_of_the_sense_data_field = list_copy.sense_len;
+	data->sense_data_length = list_copy.sense_len;
+	memcpy(data->sense_data, &list_copy.sense_data, list_copy.sense_len);
+
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+
+	ctl_datamove((union ctl_io *)ctsio);
+	return (retval);
+}
+
+int
+ctl_copy_operation_abort(struct ctl_scsiio *ctsio)
+{
+	struct ctl_lun *lun;
+	struct scsi_copy_operation_abort *cdb;
+	struct tpc_list *list;
+	int retval;
+	uint32_t list_id;
+
+	CTL_DEBUG_PRINT(("ctl_copy_operation_abort\n"));
+
+	cdb = (struct scsi_copy_operation_abort *)ctsio->cdb;
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	retval = CTL_RETVAL_COMPLETE;
+
+	list_id = scsi_4btoul(cdb->list_identifier);
+	mtx_lock(&lun->lun_lock);
+	list = tpc_find_list(lun, list_id,
+	    ctl_get_resindex(&ctsio->io_hdr.nexus));
+	if (list == NULL) {
+		mtx_unlock(&lun->lun_lock);
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1,
+		    /*command*/ 1, /*field*/ 2, /*bit_valid*/ 0,
+		    /*bit*/ 0);
+		ctl_done((union ctl_io *)ctsio);
+		return (retval);
+	}
+	list->abort = 1;
+	mtx_unlock(&lun->lun_lock);
+
+	ctl_set_success(ctsio);
+	ctl_done((union ctl_io *)ctsio);
+	return (retval);
+}
+
+static uint64_t
+tpc_resolve(struct tpc_list *list, uint16_t idx, uint32_t *ss)
+{
+
+	if (idx == 0xffff) {
+		if (ss && list->lun->be_lun)
+			*ss = list->lun->be_lun->blocksize;
+		return (list->lun->lun);
+	}
+	if (idx >= list->ncscd)
+		return (UINT64_MAX);
+	return (tpcl_resolve(list->init_port, &list->cscd[idx], ss));
+}
+
+static int
+tpc_process_b2b(struct tpc_list *list)
+{
+	struct scsi_ec_segment_b2b *seg;
+	struct scsi_ec_cscd_dtsp *sdstp, *ddstp;
+	struct tpc_io *tior, *tiow;
+	struct runl run, *prun;
+	uint64_t sl, dl;
+	off_t srclba, dstlba, numbytes, donebytes, roundbytes;
+	int numlba;
+	uint32_t srcblock, dstblock;
+
+	if (list->stage == 1) {
+complete:
+		while ((tior = TAILQ_FIRST(&list->allio)) != NULL) {
+			TAILQ_REMOVE(&list->allio, tior, links);
+			ctl_free_io(tior->io);
+			free(tior, M_CTL);
+		}
+		free(list->buf, M_CTL);
+		if (list->abort) {
+			ctl_set_task_aborted(list->ctsio);
+			return (CTL_RETVAL_ERROR);
+		} else if (list->error) {
+			ctl_set_sense(list->ctsio, /*current_error*/ 1,
+			    /*sense_key*/ SSD_KEY_COPY_ABORTED,
+			    /*asc*/ 0x0d, /*ascq*/ 0x01, SSD_ELEM_NONE);
+			return (CTL_RETVAL_ERROR);
+		}
+		list->cursectors += list->segsectors;
+		list->curbytes += list->segbytes;
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	TAILQ_INIT(&list->allio);
+	seg = (struct scsi_ec_segment_b2b *)list->seg[list->curseg];
+	sl = tpc_resolve(list, scsi_2btoul(seg->src_cscd), &srcblock);
+	dl = tpc_resolve(list, scsi_2btoul(seg->dst_cscd), &dstblock);
+	if (sl >= CTL_MAX_LUNS || dl >= CTL_MAX_LUNS) {
+		ctl_set_sense(list->ctsio, /*current_error*/ 1,
+		    /*sense_key*/ SSD_KEY_COPY_ABORTED,
+		    /*asc*/ 0x08, /*ascq*/ 0x04, SSD_ELEM_NONE);
+		return (CTL_RETVAL_ERROR);
+	}
+	sdstp = &list->cscd[scsi_2btoul(seg->src_cscd)].dtsp;
+	if (scsi_3btoul(sdstp->block_length) != 0)
+		srcblock = scsi_3btoul(sdstp->block_length);
+	ddstp = &list->cscd[scsi_2btoul(seg->dst_cscd)].dtsp;
+	if (scsi_3btoul(ddstp->block_length) != 0)
+		dstblock = scsi_3btoul(ddstp->block_length);
+	numlba = scsi_2btoul(seg->number_of_blocks);
+	if (seg->flags & EC_SEG_DC)
+		numbytes = (off_t)numlba * dstblock;
+	else
+		numbytes = (off_t)numlba * srcblock;
+	srclba = scsi_8btou64(seg->src_lba);
+	dstlba = scsi_8btou64(seg->dst_lba);
+
+//	printf("Copy %ju bytes from %ju @ %ju to %ju @ %ju\n",
+//	    (uintmax_t)numbytes, sl, scsi_8btou64(seg->src_lba),
+//	    dl, scsi_8btou64(seg->dst_lba));
+
+	if (numbytes == 0)
+		return (CTL_RETVAL_COMPLETE);
+
+	if (numbytes % srcblock != 0 || numbytes % dstblock != 0) {
+		ctl_set_sense(list->ctsio, /*current_error*/ 1,
+		    /*sense_key*/ SSD_KEY_COPY_ABORTED,
+		    /*asc*/ 0x26, /*ascq*/ 0x0A, SSD_ELEM_NONE);
+		return (CTL_RETVAL_ERROR);
+	}
+
+	list->buf = malloc(numbytes, M_CTL, M_WAITOK);
+	list->segbytes = numbytes;
+	list->segsectors = numbytes / dstblock;
+	donebytes = 0;
+	TAILQ_INIT(&run);
+	prun = &run;
+	list->tbdio = 1;
+	while (donebytes < numbytes) {
+		roundbytes = MIN(numbytes - donebytes, TPC_MAX_IO_SIZE);
+
+		tior = malloc(sizeof(*tior), M_CTL, M_WAITOK | M_ZERO);
+		TAILQ_INIT(&tior->run);
+		tior->list = list;
+		TAILQ_INSERT_TAIL(&list->allio, tior, links);
+		tior->io = tpcl_alloc_io();
+		if (tior->io == NULL) {
+			list->error = 1;
+			goto complete;
+		}
+		ctl_scsi_read_write(tior->io,
+				    /*data_ptr*/ &list->buf[donebytes],
+				    /*data_len*/ roundbytes,
+				    /*read_op*/ 1,
+				    /*byte2*/ 0,
+				    /*minimum_cdb_size*/ 0,
+				    /*lba*/ srclba + donebytes / srcblock,
+				    /*num_blocks*/ roundbytes / srcblock,
+				    /*tag_type*/ CTL_TAG_SIMPLE,
+				    /*control*/ 0);
+		tior->io->io_hdr.retries = 3;
+		tior->lun = sl;
+		tior->io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = tior;
+
+		tiow = malloc(sizeof(*tior), M_CTL, M_WAITOK | M_ZERO);
+		TAILQ_INIT(&tiow->run);
+		tiow->list = list;
+		TAILQ_INSERT_TAIL(&list->allio, tiow, links);
+		tiow->io = tpcl_alloc_io();
+		if (tiow->io == NULL) {
+			list->error = 1;
+			goto complete;
+		}
+		ctl_scsi_read_write(tiow->io,
+				    /*data_ptr*/ &list->buf[donebytes],
+				    /*data_len*/ roundbytes,
+				    /*read_op*/ 0,
+				    /*byte2*/ 0,
+				    /*minimum_cdb_size*/ 0,
+				    /*lba*/ dstlba + donebytes / dstblock,
+				    /*num_blocks*/ roundbytes / dstblock,
+				    /*tag_type*/ CTL_TAG_SIMPLE,
+				    /*control*/ 0);
+		tiow->io->io_hdr.retries = 3;
+		tiow->lun = dl;
+		tiow->io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = tior;
+
+		TAILQ_INSERT_TAIL(&tior->run, tiow, rlinks);
+		TAILQ_INSERT_TAIL(prun, tior, rlinks);
+		prun = &tior->run;
+		donebytes += roundbytes;
+	}
+
+	while ((tior = TAILQ_FIRST(&run)) != NULL) {
+		TAILQ_REMOVE(&run, tior, rlinks);
+		if (tpcl_queue(tior->io, tior->lun) != CTL_RETVAL_COMPLETE)
+			panic("tpcl_queue() error");
+	}
+
+	list->stage++;
+	return (CTL_RETVAL_QUEUED);
+}
+
+static int
+tpc_process_verify(struct tpc_list *list)
+{
+	struct scsi_ec_segment_verify *seg;
+	struct tpc_io *tio;
+	uint64_t sl;
+
+	if (list->stage == 1) {
+complete:
+		while ((tio = TAILQ_FIRST(&list->allio)) != NULL) {
+			TAILQ_REMOVE(&list->allio, tio, links);
+			ctl_free_io(tio->io);
+			free(tio, M_CTL);
+		}
+		if (list->abort) {
+			ctl_set_task_aborted(list->ctsio);
+			return (CTL_RETVAL_ERROR);
+		} else if (list->error) {
+			ctl_set_sense(list->ctsio, /*current_error*/ 1,
+			    /*sense_key*/ SSD_KEY_COPY_ABORTED,
+			    /*asc*/ 0x0d, /*ascq*/ 0x01, SSD_ELEM_NONE);
+			return (CTL_RETVAL_ERROR);
+		} else
+			return (CTL_RETVAL_COMPLETE);
+	}
+
+	TAILQ_INIT(&list->allio);
+	seg = (struct scsi_ec_segment_verify *)list->seg[list->curseg];
+	sl = tpc_resolve(list, scsi_2btoul(seg->src_cscd), NULL);
+	if (sl >= CTL_MAX_LUNS) {
+		ctl_set_sense(list->ctsio, /*current_error*/ 1,
+		    /*sense_key*/ SSD_KEY_COPY_ABORTED,
+		    /*asc*/ 0x08, /*ascq*/ 0x04, SSD_ELEM_NONE);
+		return (CTL_RETVAL_ERROR);
+	}
+
+//	printf("Verify %ju\n", sl);
+
+	if ((seg->tur & 0x01) == 0)
+		return (CTL_RETVAL_COMPLETE);
+
+	list->tbdio = 1;
+	tio = malloc(sizeof(*tio), M_CTL, M_WAITOK | M_ZERO);
+	TAILQ_INIT(&tio->run);
+	tio->list = list;
+	TAILQ_INSERT_TAIL(&list->allio, tio, links);
+	tio->io = tpcl_alloc_io();
+	if (tio->io == NULL) {
+		list->error = 1;
+		goto complete;
+	}
+	ctl_scsi_tur(tio->io, /*tag_type*/ CTL_TAG_SIMPLE, /*control*/ 0);
+	tio->io->io_hdr.retries = 3;
+	tio->lun = sl;
+	tio->io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = tio;
+	list->stage++;
+	if (tpcl_queue(tio->io, tio->lun) != CTL_RETVAL_COMPLETE)
+		panic("tpcl_queue() error");
+	return (CTL_RETVAL_QUEUED);
+}
+
+static int
+tpc_process_register_key(struct tpc_list *list)
+{
+	struct scsi_ec_segment_register_key *seg;
+	struct tpc_io *tio;
+	uint64_t dl;
+	int datalen;
+
+	if (list->stage == 1) {
+complete:
+		while ((tio = TAILQ_FIRST(&list->allio)) != NULL) {
+			TAILQ_REMOVE(&list->allio, tio, links);
+			ctl_free_io(tio->io);
+			free(tio, M_CTL);
+		}
+		free(list->buf, M_CTL);
+		if (list->abort) {
+			ctl_set_task_aborted(list->ctsio);
+			return (CTL_RETVAL_ERROR);
+		} else if (list->error) {
+			ctl_set_sense(list->ctsio, /*current_error*/ 1,
+			    /*sense_key*/ SSD_KEY_COPY_ABORTED,
+			    /*asc*/ 0x0d, /*ascq*/ 0x01, SSD_ELEM_NONE);
+			return (CTL_RETVAL_ERROR);
+		} else
+			return (CTL_RETVAL_COMPLETE);
+	}
+
+	TAILQ_INIT(&list->allio);
+	seg = (struct scsi_ec_segment_register_key *)list->seg[list->curseg];
+	dl = tpc_resolve(list, scsi_2btoul(seg->dst_cscd), NULL);
+	if (dl >= CTL_MAX_LUNS) {
+		ctl_set_sense(list->ctsio, /*current_error*/ 1,
+		    /*sense_key*/ SSD_KEY_COPY_ABORTED,
+		    /*asc*/ 0x08, /*ascq*/ 0x04, SSD_ELEM_NONE);
+		return (CTL_RETVAL_ERROR);
+	}
+
+//	printf("Register Key %ju\n", dl);
+
+	list->tbdio = 1;
+	tio = malloc(sizeof(*tio), M_CTL, M_WAITOK | M_ZERO);
+	TAILQ_INIT(&tio->run);
+	tio->list = list;
+	TAILQ_INSERT_TAIL(&list->allio, tio, links);
+	tio->io = tpcl_alloc_io();
+	if (tio->io == NULL) {
+		list->error = 1;
+		goto complete;
+	}
+	datalen = sizeof(struct scsi_per_res_out_parms);
+	list->buf = malloc(datalen, M_CTL, M_WAITOK);
+	ctl_scsi_persistent_res_out(tio->io,
+	    list->buf, datalen, SPRO_REGISTER, -1,
+	    scsi_8btou64(seg->res_key), scsi_8btou64(seg->sa_res_key),
+	    /*tag_type*/ CTL_TAG_SIMPLE, /*control*/ 0);
+	tio->io->io_hdr.retries = 3;
+	tio->lun = dl;
+	tio->io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = tio;
+	list->stage++;
+	if (tpcl_queue(tio->io, tio->lun) != CTL_RETVAL_COMPLETE)
+		panic("tpcl_queue() error");
+	return (CTL_RETVAL_QUEUED);
+}
+
+static off_t
+tpc_ranges_length(struct scsi_range_desc *range, int nrange)
+{
+	off_t length = 0;
+	int r;
+
+	for (r = 0; r < nrange; r++)
+		length += scsi_4btoul(range[r].length);
+	return (length);
+}
+
+static int
+tpc_skip_ranges(struct scsi_range_desc *range, int nrange, off_t skip,
+    int *srange, off_t *soffset)
+{
+	off_t off;
+	int r;
+
+	r = 0;
+	off = 0;
+	while (r < nrange) {
+		if (skip - off < scsi_4btoul(range[r].length)) {
+			*srange = r;
+			*soffset = skip - off;
+			return (0);
+		}
+		off += scsi_4btoul(range[r].length);
+		r++;
+	}
+	return (-1);
+}
+
+static int
+tpc_process_wut(struct tpc_list *list)
+{
+	struct tpc_io *tio, *tior, *tiow;
+	struct runl run, *prun;
+	int drange, srange;
+	off_t doffset, soffset;
+	off_t srclba, dstlba, numbytes, donebytes, roundbytes;
+	uint32_t srcblock, dstblock;
+
+	if (list->stage > 0) {
+complete:
+		/* Cleanup after previous rounds. */
+		while ((tio = TAILQ_FIRST(&list->allio)) != NULL) {
+			TAILQ_REMOVE(&list->allio, tio, links);
+			ctl_free_io(tio->io);
+			free(tio, M_CTL);
+		}
+		free(list->buf, M_CTL);
+		if (list->abort) {
+			ctl_set_task_aborted(list->ctsio);
+			return (CTL_RETVAL_ERROR);
+		} else if (list->error) {
+			ctl_set_sense(list->ctsio, /*current_error*/ 1,
+			    /*sense_key*/ SSD_KEY_COPY_ABORTED,
+			    /*asc*/ 0x0d, /*ascq*/ 0x01, SSD_ELEM_NONE);
+			return (CTL_RETVAL_ERROR);
+		}
+		list->cursectors += list->segsectors;
+		list->curbytes += list->segbytes;
+	}
+
+	/* Check where we are on destination ranges list. */
+	if (tpc_skip_ranges(list->range, list->nrange, list->cursectors,
+	    &drange, &doffset) != 0)
+		return (CTL_RETVAL_COMPLETE);
+	dstblock = list->lun->be_lun->blocksize;
+
+	/* Check where we are on source ranges list. */
+	srcblock = list->token->blocksize;
+	if (tpc_skip_ranges(list->token->range, list->token->nrange,
+	    list->offset_into_rod + list->cursectors * dstblock / srcblock,
+	    &srange, &soffset) != 0) {
+		ctl_set_sense(list->ctsio, /*current_error*/ 1,
+		    /*sense_key*/ SSD_KEY_COPY_ABORTED,
+		    /*asc*/ 0x0d, /*ascq*/ 0x04, SSD_ELEM_NONE);
+		return (CTL_RETVAL_ERROR);
+	}
+
+	srclba = scsi_8btou64(list->token->range[srange].lba) + soffset;
+	numbytes = srcblock * omin(TPC_MAX_IOCHUNK_SIZE / srcblock,
+	    (scsi_4btoul(list->token->range[srange].length) - soffset));
+	dstlba = scsi_8btou64(list->range[drange].lba) + doffset;
+	numbytes = omin(numbytes,
+	    dstblock * omin(TPC_MAX_IOCHUNK_SIZE / dstblock,
+	    (scsi_4btoul(list->range[drange].length) - doffset)));
+
+	if (numbytes % srcblock != 0 || numbytes % dstblock != 0) {
+		ctl_set_sense(list->ctsio, /*current_error*/ 1,
+		    /*sense_key*/ SSD_KEY_COPY_ABORTED,
+		    /*asc*/ 0x26, /*ascq*/ 0x0A, SSD_ELEM_NONE);
+		return (CTL_RETVAL_ERROR);
+	}
+
+	list->buf = malloc(numbytes, M_CTL, M_WAITOK |
+	    (list->token == NULL ? M_ZERO : 0));
+	list->segbytes = numbytes;
+	list->segsectors = numbytes / dstblock;
+//printf("Copy chunk of %ju sectors from %ju to %ju\n", list->segsectors,
+//    srclba, dstlba);
+	donebytes = 0;
+	TAILQ_INIT(&run);
+	prun = &run;
+	list->tbdio = 1;
+	TAILQ_INIT(&list->allio);
+	while (donebytes < numbytes) {
+		roundbytes = MIN(numbytes - donebytes, TPC_MAX_IO_SIZE);
+
+		tior = malloc(sizeof(*tior), M_CTL, M_WAITOK | M_ZERO);
+		TAILQ_INIT(&tior->run);
+		tior->list = list;
+		TAILQ_INSERT_TAIL(&list->allio, tior, links);
+		tior->io = tpcl_alloc_io();
+		if (tior->io == NULL) {
+			list->error = 1;
+			goto complete;
+		}
+		ctl_scsi_read_write(tior->io,
+				    /*data_ptr*/ &list->buf[donebytes],
+				    /*data_len*/ roundbytes,
+				    /*read_op*/ 1,
+				    /*byte2*/ 0,
+				    /*minimum_cdb_size*/ 0,
+				    /*lba*/ srclba + donebytes / srcblock,
+				    /*num_blocks*/ roundbytes / srcblock,
+				    /*tag_type*/ CTL_TAG_SIMPLE,
+				    /*control*/ 0);
+		tior->io->io_hdr.retries = 3;
+		tior->lun = list->token->lun;
+		tior->io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = tior;
+
+		tiow = malloc(sizeof(*tiow), M_CTL, M_WAITOK | M_ZERO);
+		TAILQ_INIT(&tiow->run);
+		tiow->list = list;
+		TAILQ_INSERT_TAIL(&list->allio, tiow, links);
+		tiow->io = tpcl_alloc_io();
+		if (tiow->io == NULL) {
+			list->error = 1;
+			goto complete;
+		}
+		ctl_scsi_read_write(tiow->io,
+				    /*data_ptr*/ &list->buf[donebytes],
+				    /*data_len*/ roundbytes,
+				    /*read_op*/ 0,
+				    /*byte2*/ 0,
+				    /*minimum_cdb_size*/ 0,
+				    /*lba*/ dstlba + donebytes / dstblock,
+				    /*num_blocks*/ roundbytes / dstblock,
+				    /*tag_type*/ CTL_TAG_SIMPLE,
+				    /*control*/ 0);
+		tiow->io->io_hdr.retries = 3;
+		tiow->lun = list->lun->lun;
+		tiow->io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = tiow;
+
+		TAILQ_INSERT_TAIL(&tior->run, tiow, rlinks);
+		TAILQ_INSERT_TAIL(prun, tior, rlinks);
+		prun = &tior->run;
+		donebytes += roundbytes;
+	}
+
+	while ((tior = TAILQ_FIRST(&run)) != NULL) {
+		TAILQ_REMOVE(&run, tior, rlinks);
+		if (tpcl_queue(tior->io, tior->lun) != CTL_RETVAL_COMPLETE)
+			panic("tpcl_queue() error");
+	}
+
+	list->stage++;
+	return (CTL_RETVAL_QUEUED);
+}
+
+static int
+tpc_process_zero_wut(struct tpc_list *list)
+{
+	struct tpc_io *tio, *tiow;
+	struct runl run, *prun;
+	int r;
+	uint32_t dstblock, len;
+
+	if (list->stage > 0) {
+complete:
+		/* Cleanup after previous rounds. */
+		while ((tio = TAILQ_FIRST(&list->allio)) != NULL) {
+			TAILQ_REMOVE(&list->allio, tio, links);
+			ctl_free_io(tio->io);
+			free(tio, M_CTL);
+		}
+		free(list->buf, M_CTL);
+		if (list->abort) {
+			ctl_set_task_aborted(list->ctsio);
+			return (CTL_RETVAL_ERROR);
+		} else if (list->error) {
+			ctl_set_sense(list->ctsio, /*current_error*/ 1,
+			    /*sense_key*/ SSD_KEY_COPY_ABORTED,
+			    /*asc*/ 0x0d, /*ascq*/ 0x01, SSD_ELEM_NONE);
+			return (CTL_RETVAL_ERROR);
+		}
+		list->cursectors += list->segsectors;
+		list->curbytes += list->segbytes;
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	dstblock = list->lun->be_lun->blocksize;
+	list->buf = malloc(dstblock, M_CTL, M_WAITOK | M_ZERO);
+	TAILQ_INIT(&run);
+	prun = &run;
+	list->tbdio = 1;
+	TAILQ_INIT(&list->allio);
+	list->segsectors = 0;
+	for (r = 0; r < list->nrange; r++) {
+		len = scsi_4btoul(list->range[r].length);
+		if (len == 0)
+			continue;
+
+		tiow = malloc(sizeof(*tiow), M_CTL, M_WAITOK | M_ZERO);
+		TAILQ_INIT(&tiow->run);
+		tiow->list = list;
+		TAILQ_INSERT_TAIL(&list->allio, tiow, links);
+		tiow->io = tpcl_alloc_io();
+		if (tiow->io == NULL) {
+			list->error = 1;
+			goto complete;
+		}
+		ctl_scsi_write_same(tiow->io,
+				    /*data_ptr*/ list->buf,
+				    /*data_len*/ dstblock,
+				    /*byte2*/ 0,
+				    /*lba*/ scsi_8btou64(list->range[r].lba),
+				    /*num_blocks*/ len,
+				    /*tag_type*/ CTL_TAG_SIMPLE,
+				    /*control*/ 0);
+		tiow->io->io_hdr.retries = 3;
+		tiow->lun = list->lun->lun;
+		tiow->io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = tiow;
+
+		TAILQ_INSERT_TAIL(prun, tiow, rlinks);
+		prun = &tiow->run;
+		list->segsectors += len;
+	}
+	list->segbytes = list->segsectors * dstblock;
+
+	if (TAILQ_EMPTY(&run))
+		goto complete;
+
+	while ((tiow = TAILQ_FIRST(&run)) != NULL) {
+		TAILQ_REMOVE(&run, tiow, rlinks);
+		if (tpcl_queue(tiow->io, tiow->lun) != CTL_RETVAL_COMPLETE)
+			panic("tpcl_queue() error");
+	}
+
+	list->stage++;
+	return (CTL_RETVAL_QUEUED);
+}
+
+static void
+tpc_process(struct tpc_list *list)
+{
+	struct ctl_lun *lun = list->lun;
+	struct scsi_ec_segment *seg;
+	struct ctl_scsiio *ctsio = list->ctsio;
+	int retval = CTL_RETVAL_COMPLETE;
+
+	if (list->service_action == EC_WUT) {
+		if (list->token != NULL)
+			retval = tpc_process_wut(list);
+		else
+			retval = tpc_process_zero_wut(list);
+		if (retval == CTL_RETVAL_QUEUED)
+			return;
+		if (retval == CTL_RETVAL_ERROR) {
+			list->error = 1;
+			goto done;
+		}
+	} else {
+//printf("ZZZ %d cscd, %d segs\n", list->ncscd, list->nseg);
+		while (list->curseg < list->nseg) {
+			seg = list->seg[list->curseg];
+			switch (seg->type_code) {
+			case EC_SEG_B2B:
+				retval = tpc_process_b2b(list);
+				break;
+			case EC_SEG_VERIFY:
+				retval = tpc_process_verify(list);
+				break;
+			case EC_SEG_REGISTER_KEY:
+				retval = tpc_process_register_key(list);
+				break;
+			default:
+				ctl_set_sense(ctsio, /*current_error*/ 1,
+				    /*sense_key*/ SSD_KEY_COPY_ABORTED,
+				    /*asc*/ 0x26, /*ascq*/ 0x09, SSD_ELEM_NONE);
+				goto done;
+			}
+			if (retval == CTL_RETVAL_QUEUED)
+				return;
+			if (retval == CTL_RETVAL_ERROR) {
+				list->error = 1;
+				goto done;
+			}
+			list->curseg++;
+			list->stage = 0;
+		}
+	}
+
+	ctl_set_success(ctsio);
+
+done:
+//printf("ZZZ done\n");
+	free(list->params, M_CTL);
+	list->params = NULL;
+	if (list->token) {
+		mtx_lock(&control_softc->ctl_lock);
+		if (--list->token->active == 0)
+			list->token->last_active = time_uptime;
+		mtx_unlock(&control_softc->ctl_lock);
+		list->token = NULL;
+	}
+	mtx_lock(&lun->lun_lock);
+	if ((list->flags & EC_LIST_ID_USAGE_MASK) == EC_LIST_ID_USAGE_NONE) {
+		TAILQ_REMOVE(&lun->tpc_lists, list, links);
+		free(list, M_CTL);
+	} else {
+		list->completed = 1;
+		list->last_active = time_uptime;
+		list->sense_data = ctsio->sense_data;
+		list->sense_len = ctsio->sense_len;
+		list->scsi_status = ctsio->scsi_status;
+	}
+	mtx_unlock(&lun->lun_lock);
+
+	ctl_done((union ctl_io *)ctsio);
+}
+
+/*
+ * For any sort of check condition, busy, etc., we just retry.  We do not
+ * decrement the retry count for unit attention type errors.  These are
+ * normal, and we want to save the retry count for "real" errors.  Otherwise,
+ * we could end up with situations where a command will succeed in some
+ * situations and fail in others, depending on whether a unit attention is
+ * pending.  Also, some of our error recovery actions, most notably the
+ * LUN reset action, will cause a unit attention.
+ *
+ * We can add more detail here later if necessary.
+ */
+static tpc_error_action
+tpc_checkcond_parse(union ctl_io *io)
+{
+	tpc_error_action error_action;
+	int error_code, sense_key, asc, ascq;
+
+	/*
+	 * Default to retrying the command.
+	 */
+	error_action = TPC_ERR_RETRY;
+
+	scsi_extract_sense_len(&io->scsiio.sense_data,
+			       io->scsiio.sense_len,
+			       &error_code,
+			       &sense_key,
+			       &asc,
+			       &ascq,
+			       /*show_errors*/ 1);
+
+	switch (error_code) {
+	case SSD_DEFERRED_ERROR:
+	case SSD_DESC_DEFERRED_ERROR:
+		error_action |= TPC_ERR_NO_DECREMENT;
+		break;
+	case SSD_CURRENT_ERROR:
+	case SSD_DESC_CURRENT_ERROR:
+	default:
+		switch (sense_key) {
+		case SSD_KEY_UNIT_ATTENTION:
+			error_action |= TPC_ERR_NO_DECREMENT;
+			break;
+		case SSD_KEY_HARDWARE_ERROR:
+			/*
+			 * This is our generic "something bad happened"
+			 * error code.  It often isn't recoverable.
+			 */
+			if ((asc == 0x44) && (ascq == 0x00))
+				error_action = TPC_ERR_FAIL;
+			break;
+		case SSD_KEY_NOT_READY:
+			/*
+			 * If the LUN is powered down, there likely isn't
+			 * much point in retrying right now.
+			 */
+			if ((asc == 0x04) && (ascq == 0x02))
+				error_action = TPC_ERR_FAIL;
+			/*
+			 * If the LUN is offline, there probably isn't much
+			 * point in retrying, either.
+			 */
+			if ((asc == 0x04) && (ascq == 0x03))
+				error_action = TPC_ERR_FAIL;
+			break;
+		}
+	}
+	return (error_action);
+}
+
+static tpc_error_action
+tpc_error_parse(union ctl_io *io)
+{
+	tpc_error_action error_action = TPC_ERR_RETRY;
+
+	switch (io->io_hdr.io_type) {
+	case CTL_IO_SCSI:
+		switch (io->io_hdr.status & CTL_STATUS_MASK) {
+		case CTL_SCSI_ERROR:
+			switch (io->scsiio.scsi_status) {
+			case SCSI_STATUS_CHECK_COND:
+				error_action = tpc_checkcond_parse(io);
+				break;
+			default:
+				break;
+			}
+			break;
+		default:
+			break;
+		}
+		break;
+	case CTL_IO_TASK:
+		break;
+	default:
+		panic("%s: invalid ctl_io type %d\n", __func__,
+		      io->io_hdr.io_type);
+		break;
+	}
+	return (error_action);
+}
+
+void
+tpc_done(union ctl_io *io)
+{
+	struct tpc_io *tio, *tior;
+
+	/*
+	 * Very minimal retry logic.  We basically retry if we got an error
+	 * back, and the retry count is greater than 0.  If we ever want
+	 * more sophisticated initiator type behavior, the CAM error
+	 * recovery code in ../common might be helpful.
+	 */
+//	if ((io->io_hdr.status & CTL_STATUS_MASK) != CTL_SUCCESS)
+//		ctl_io_error_print(io, NULL);
+	tio = io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr;
+	if (((io->io_hdr.status & CTL_STATUS_MASK) != CTL_SUCCESS)
+	 && (io->io_hdr.retries > 0)) {
+		ctl_io_status old_status;
+		tpc_error_action error_action;
+
+		error_action = tpc_error_parse(io);
+		switch (error_action & TPC_ERR_MASK) {
+		case TPC_ERR_FAIL:
+			break;
+		case TPC_ERR_RETRY:
+		default:
+			if ((error_action & TPC_ERR_NO_DECREMENT) == 0)
+				io->io_hdr.retries--;
+			old_status = io->io_hdr.status;
+			io->io_hdr.status = CTL_STATUS_NONE;
+			io->io_hdr.flags &= ~CTL_FLAG_ABORT;
+			io->io_hdr.flags &= ~CTL_FLAG_SENT_2OTHER_SC;
+			if (tpcl_queue(io, tio->lun) != CTL_RETVAL_COMPLETE) {
+				printf("%s: error returned from ctl_queue()!\n",
+				       __func__);
+				io->io_hdr.status = old_status;
+			} else
+				return;
+		}
+	}
+
+	if ((io->io_hdr.status & CTL_STATUS_MASK) != CTL_SUCCESS)
+		tio->list->error = 1;
+	else
+		atomic_add_int(&tio->list->curops, 1);
+	if (!tio->list->error && !tio->list->abort) {
+		while ((tior = TAILQ_FIRST(&tio->run)) != NULL) {
+			TAILQ_REMOVE(&tio->run, tior, rlinks);
+			atomic_add_int(&tio->list->tbdio, 1);
+			if (tpcl_queue(tior->io, tior->lun) != CTL_RETVAL_COMPLETE)
+				panic("tpcl_queue() error");
+		}
+	}
+	if (atomic_fetchadd_int(&tio->list->tbdio, -1) == 1)
+		tpc_process(tio->list);
+}
+
+int
+ctl_extended_copy_lid1(struct ctl_scsiio *ctsio)
+{
+	struct scsi_extended_copy *cdb;
+	struct scsi_extended_copy_lid1_data *data;
+	struct ctl_lun *lun;
+	struct tpc_list *list, *tlist;
+	uint8_t *ptr;
+	char *value;
+	int len, off, lencscd, lenseg, leninl, nseg;
+
+	CTL_DEBUG_PRINT(("ctl_extended_copy_lid1\n"));
+
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+	cdb = (struct scsi_extended_copy *)ctsio->cdb;
+	len = scsi_4btoul(cdb->length);
+
+	if (len < sizeof(struct scsi_extended_copy_lid1_data) ||
+	    len > sizeof(struct scsi_extended_copy_lid1_data) +
+	    TPC_MAX_LIST + TPC_MAX_INLINE) {
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1, /*command*/ 1,
+		    /*field*/ 9, /*bit_valid*/ 0, /*bit*/ 0);
+		goto done;
+	}
+
+	/*
+	 * If we've got a kernel request that hasn't been malloced yet,
+	 * malloc it and tell the caller the data buffer is here.
+	 */
+	if ((ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) == 0) {
+		ctsio->kern_data_ptr = malloc(len, M_CTL, M_WAITOK);
+		ctsio->kern_data_len = len;
+		ctsio->kern_total_len = len;
+		ctsio->kern_data_resid = 0;
+		ctsio->kern_rel_offset = 0;
+		ctsio->kern_sg_entries = 0;
+		ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+		ctsio->be_move_done = ctl_config_move_done;
+		ctl_datamove((union ctl_io *)ctsio);
+
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	data = (struct scsi_extended_copy_lid1_data *)ctsio->kern_data_ptr;
+	lencscd = scsi_2btoul(data->cscd_list_length);
+	lenseg = scsi_4btoul(data->segment_list_length);
+	leninl = scsi_4btoul(data->inline_data_length);
+	if (len < sizeof(struct scsi_extended_copy_lid1_data) +
+	    lencscd + lenseg + leninl ||
+	    leninl > TPC_MAX_INLINE) {
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1, /*command*/ 0,
+		    /*field*/ 2, /*bit_valid*/ 0, /*bit*/ 0);
+		goto done;
+	}
+	if (lencscd > TPC_MAX_CSCDS * sizeof(struct scsi_ec_cscd)) {
+		ctl_set_sense(ctsio, /*current_error*/ 1,
+		    /*sense_key*/ SSD_KEY_ILLEGAL_REQUEST,
+		    /*asc*/ 0x26, /*ascq*/ 0x06, SSD_ELEM_NONE);
+		goto done;
+	}
+	if (lencscd + lenseg > TPC_MAX_LIST) {
+		ctl_set_param_len_error(ctsio);
+		goto done;
+	}
+
+	list = malloc(sizeof(struct tpc_list), M_CTL, M_WAITOK | M_ZERO);
+	list->service_action = cdb->service_action;
+	value = ctl_get_opt(&lun->be_lun->options, "insecure_tpc");
+	if (value != NULL && strcmp(value, "on") == 0)
+		list->init_port = -1;
+	else
+		list->init_port = ctsio->io_hdr.nexus.targ_port;
+	list->init_idx = ctl_get_resindex(&ctsio->io_hdr.nexus);
+	list->list_id = data->list_identifier;
+	list->flags = data->flags;
+	list->params = ctsio->kern_data_ptr;
+	list->cscd = (struct scsi_ec_cscd *)&data->data[0];
+	ptr = &data->data[lencscd];
+	for (nseg = 0, off = 0; off < lenseg; nseg++) {
+		if (nseg >= TPC_MAX_SEGS) {
+			free(list, M_CTL);
+			ctl_set_sense(ctsio, /*current_error*/ 1,
+			    /*sense_key*/ SSD_KEY_ILLEGAL_REQUEST,
+			    /*asc*/ 0x26, /*ascq*/ 0x08, SSD_ELEM_NONE);
+			goto done;
+		}
+		list->seg[nseg] = (struct scsi_ec_segment *)(ptr + off);
+		off += sizeof(struct scsi_ec_segment) +
+		    scsi_2btoul(list->seg[nseg]->descr_length);
+	}
+	list->inl = &data->data[lencscd + lenseg];
+	list->ncscd = lencscd / sizeof(struct scsi_ec_cscd);
+	list->nseg = nseg;
+	list->leninl = leninl;
+	list->ctsio = ctsio;
+	list->lun = lun;
+	mtx_lock(&lun->lun_lock);
+	if ((list->flags & EC_LIST_ID_USAGE_MASK) != EC_LIST_ID_USAGE_NONE) {
+		tlist = tpc_find_list(lun, list->list_id, list->init_idx);
+		if (tlist != NULL && !tlist->completed) {
+			mtx_unlock(&lun->lun_lock);
+			free(list, M_CTL);
+			ctl_set_invalid_field(ctsio, /*sks_valid*/ 1,
+			    /*command*/ 0, /*field*/ 0, /*bit_valid*/ 0,
+			    /*bit*/ 0);
+			goto done;
+		}
+		if (tlist != NULL) {
+			TAILQ_REMOVE(&lun->tpc_lists, tlist, links);
+			free(tlist, M_CTL);
+		}
+	}
+	TAILQ_INSERT_TAIL(&lun->tpc_lists, list, links);
+	mtx_unlock(&lun->lun_lock);
+
+	tpc_process(list);
+	return (CTL_RETVAL_COMPLETE);
+
+done:
+	ctl_done((union ctl_io *)ctsio);
+	return (CTL_RETVAL_COMPLETE);
+}
+
+int
+ctl_extended_copy_lid4(struct ctl_scsiio *ctsio)
+{
+	struct scsi_extended_copy *cdb;
+	struct scsi_extended_copy_lid4_data *data;
+	struct ctl_lun *lun;
+	struct tpc_list *list, *tlist;
+	uint8_t *ptr;
+	char *value;
+	int len, off, lencscd, lenseg, leninl, nseg;
+
+	CTL_DEBUG_PRINT(("ctl_extended_copy_lid4\n"));
+
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+	cdb = (struct scsi_extended_copy *)ctsio->cdb;
+	len = scsi_4btoul(cdb->length);
+
+	if (len < sizeof(struct scsi_extended_copy_lid4_data) ||
+	    len > sizeof(struct scsi_extended_copy_lid4_data) +
+	    TPC_MAX_LIST + TPC_MAX_INLINE) {
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1, /*command*/ 1,
+		    /*field*/ 9, /*bit_valid*/ 0, /*bit*/ 0);
+		goto done;
+	}
+
+	/*
+	 * If we've got a kernel request that hasn't been malloced yet,
+	 * malloc it and tell the caller the data buffer is here.
+	 */
+	if ((ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) == 0) {
+		ctsio->kern_data_ptr = malloc(len, M_CTL, M_WAITOK);
+		ctsio->kern_data_len = len;
+		ctsio->kern_total_len = len;
+		ctsio->kern_data_resid = 0;
+		ctsio->kern_rel_offset = 0;
+		ctsio->kern_sg_entries = 0;
+		ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+		ctsio->be_move_done = ctl_config_move_done;
+		ctl_datamove((union ctl_io *)ctsio);
+
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	data = (struct scsi_extended_copy_lid4_data *)ctsio->kern_data_ptr;
+	lencscd = scsi_2btoul(data->cscd_list_length);
+	lenseg = scsi_2btoul(data->segment_list_length);
+	leninl = scsi_2btoul(data->inline_data_length);
+	if (len < sizeof(struct scsi_extended_copy_lid4_data) +
+	    lencscd + lenseg + leninl ||
+	    leninl > TPC_MAX_INLINE) {
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1, /*command*/ 0,
+		    /*field*/ 2, /*bit_valid*/ 0, /*bit*/ 0);
+		goto done;
+	}
+	if (lencscd > TPC_MAX_CSCDS * sizeof(struct scsi_ec_cscd)) {
+		ctl_set_sense(ctsio, /*current_error*/ 1,
+		    /*sense_key*/ SSD_KEY_ILLEGAL_REQUEST,
+		    /*asc*/ 0x26, /*ascq*/ 0x06, SSD_ELEM_NONE);
+		goto done;
+	}
+	if (lencscd + lenseg > TPC_MAX_LIST) {
+		ctl_set_param_len_error(ctsio);
+		goto done;
+	}
+
+	list = malloc(sizeof(struct tpc_list), M_CTL, M_WAITOK | M_ZERO);
+	list->service_action = cdb->service_action;
+	value = ctl_get_opt(&lun->be_lun->options, "insecure_tpc");
+	if (value != NULL && strcmp(value, "on") == 0)
+		list->init_port = -1;
+	else
+		list->init_port = ctsio->io_hdr.nexus.targ_port;
+	list->init_idx = ctl_get_resindex(&ctsio->io_hdr.nexus);
+	list->list_id = scsi_4btoul(data->list_identifier);
+	list->flags = data->flags;
+	list->params = ctsio->kern_data_ptr;
+	list->cscd = (struct scsi_ec_cscd *)&data->data[0];
+	ptr = &data->data[lencscd];
+	for (nseg = 0, off = 0; off < lenseg; nseg++) {
+		if (nseg >= TPC_MAX_SEGS) {
+			free(list, M_CTL);
+			ctl_set_sense(ctsio, /*current_error*/ 1,
+			    /*sense_key*/ SSD_KEY_ILLEGAL_REQUEST,
+			    /*asc*/ 0x26, /*ascq*/ 0x08, SSD_ELEM_NONE);
+			goto done;
+		}
+		list->seg[nseg] = (struct scsi_ec_segment *)(ptr + off);
+		off += sizeof(struct scsi_ec_segment) +
+		    scsi_2btoul(list->seg[nseg]->descr_length);
+	}
+	list->inl = &data->data[lencscd + lenseg];
+	list->ncscd = lencscd / sizeof(struct scsi_ec_cscd);
+	list->nseg = nseg;
+	list->leninl = leninl;
+	list->ctsio = ctsio;
+	list->lun = lun;
+	mtx_lock(&lun->lun_lock);
+	if ((list->flags & EC_LIST_ID_USAGE_MASK) != EC_LIST_ID_USAGE_NONE) {
+		tlist = tpc_find_list(lun, list->list_id, list->init_idx);
+		if (tlist != NULL && !tlist->completed) {
+			mtx_unlock(&lun->lun_lock);
+			free(list, M_CTL);
+			ctl_set_invalid_field(ctsio, /*sks_valid*/ 1,
+			    /*command*/ 0, /*field*/ 0, /*bit_valid*/ 0,
+			    /*bit*/ 0);
+			goto done;
+		}
+		if (tlist != NULL) {
+			TAILQ_REMOVE(&lun->tpc_lists, tlist, links);
+			free(tlist, M_CTL);
+		}
+	}
+	TAILQ_INSERT_TAIL(&lun->tpc_lists, list, links);
+	mtx_unlock(&lun->lun_lock);
+
+	tpc_process(list);
+	return (CTL_RETVAL_COMPLETE);
+
+done:
+	ctl_done((union ctl_io *)ctsio);
+	return (CTL_RETVAL_COMPLETE);
+}
+
+static void
+tpc_create_token(struct ctl_lun *lun, struct ctl_port *port, off_t len,
+    struct scsi_token *token)
+{
+	static int id = 0;
+	struct scsi_vpd_id_descriptor *idd = NULL;
+	int targid_len;
+
+	scsi_ulto4b(ROD_TYPE_AUR, token->type);
+	scsi_ulto2b(0x01f8, token->length);
+	scsi_u64to8b(atomic_fetchadd_int(&id, 1), &token->body[0]);
+	if (lun->lun_devid)
+		idd = scsi_get_devid_desc((struct scsi_vpd_id_descriptor *)
+		    lun->lun_devid->data, lun->lun_devid->len,
+		    scsi_devid_is_lun_naa);
+	if (idd == NULL && lun->lun_devid)
+		idd = scsi_get_devid_desc((struct scsi_vpd_id_descriptor *)
+		    lun->lun_devid->data, lun->lun_devid->len,
+		    scsi_devid_is_lun_eui64);
+	if (idd != NULL)
+		memcpy(&token->body[8], idd, 4 + idd->length);
+	scsi_u64to8b(0, &token->body[40]);
+	scsi_u64to8b(len, &token->body[48]);
+	if (port->target_devid) {
+		targid_len = port->target_devid->len;
+		memcpy(&token->body[120], port->target_devid->data, targid_len);
+	} else
+		targid_len = 32;
+	arc4rand(&token->body[120 + targid_len], 384 - targid_len, 0);
+};
+
+int
+ctl_populate_token(struct ctl_scsiio *ctsio)
+{
+	struct scsi_populate_token *cdb;
+	struct scsi_populate_token_data *data;
+	struct ctl_lun *lun;
+	struct ctl_port *port;
+	struct tpc_list *list, *tlist;
+	struct tpc_token *token;
+	int len, lendesc;
+
+	CTL_DEBUG_PRINT(("ctl_populate_token\n"));
+
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+	port = control_softc->ctl_ports[ctl_port_idx(ctsio->io_hdr.nexus.targ_port)];
+	cdb = (struct scsi_populate_token *)ctsio->cdb;
+	len = scsi_4btoul(cdb->length);
+
+	if (len < sizeof(struct scsi_populate_token_data) ||
+	    len > sizeof(struct scsi_populate_token_data) +
+	     TPC_MAX_SEGS * sizeof(struct scsi_range_desc)) {
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1, /*command*/ 1,
+		    /*field*/ 9, /*bit_valid*/ 0, /*bit*/ 0);
+		goto done;
+	}
+
+	/*
+	 * If we've got a kernel request that hasn't been malloced yet,
+	 * malloc it and tell the caller the data buffer is here.
+	 */
+	if ((ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) == 0) {
+		ctsio->kern_data_ptr = malloc(len, M_CTL, M_WAITOK);
+		ctsio->kern_data_len = len;
+		ctsio->kern_total_len = len;
+		ctsio->kern_data_resid = 0;
+		ctsio->kern_rel_offset = 0;
+		ctsio->kern_sg_entries = 0;
+		ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+		ctsio->be_move_done = ctl_config_move_done;
+		ctl_datamove((union ctl_io *)ctsio);
+
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	data = (struct scsi_populate_token_data *)ctsio->kern_data_ptr;
+	lendesc = scsi_2btoul(data->range_descriptor_length);
+	if (len < sizeof(struct scsi_populate_token_data) + lendesc) {
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1, /*command*/ 0,
+		    /*field*/ 2, /*bit_valid*/ 0, /*bit*/ 0);
+		goto done;
+	}
+/*
+	printf("PT(list=%u) flags=%x to=%d rt=%x len=%x\n",
+	    scsi_4btoul(cdb->list_identifier),
+	    data->flags, scsi_4btoul(data->inactivity_timeout),
+	    scsi_4btoul(data->rod_type),
+	    scsi_2btoul(data->range_descriptor_length));
+*/
+	if ((data->flags & EC_PT_RTV) &&
+	    scsi_4btoul(data->rod_type) != ROD_TYPE_AUR) {
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1, /*command*/ 0,
+		    /*field*/ 8, /*bit_valid*/ 0, /*bit*/ 0);
+		goto done;
+	}
+
+	list = malloc(sizeof(struct tpc_list), M_CTL, M_WAITOK | M_ZERO);
+	list->service_action = cdb->service_action;
+	list->init_port = ctsio->io_hdr.nexus.targ_port;
+	list->init_idx = ctl_get_resindex(&ctsio->io_hdr.nexus);
+	list->list_id = scsi_4btoul(cdb->list_identifier);
+	list->flags = data->flags;
+	list->ctsio = ctsio;
+	list->lun = lun;
+	mtx_lock(&lun->lun_lock);
+	tlist = tpc_find_list(lun, list->list_id, list->init_idx);
+	if (tlist != NULL && !tlist->completed) {
+		mtx_unlock(&lun->lun_lock);
+		free(list, M_CTL);
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1,
+		    /*command*/ 0, /*field*/ 0, /*bit_valid*/ 0,
+		    /*bit*/ 0);
+		goto done;
+	}
+	if (tlist != NULL) {
+		TAILQ_REMOVE(&lun->tpc_lists, tlist, links);
+		free(tlist, M_CTL);
+	}
+	TAILQ_INSERT_TAIL(&lun->tpc_lists, list, links);
+	mtx_unlock(&lun->lun_lock);
+
+	token = malloc(sizeof(*token), M_CTL, M_WAITOK | M_ZERO);
+	token->lun = lun->lun;
+	token->blocksize = lun->be_lun->blocksize;
+	token->params = ctsio->kern_data_ptr;
+	token->range = &data->desc[0];
+	token->nrange = scsi_2btoul(data->range_descriptor_length) /
+	    sizeof(struct scsi_range_desc);
+	tpc_create_token(lun, port, list->curbytes,
+	    (struct scsi_token *)token->token);
+	token->active = 0;
+	token->last_active = time_uptime;
+	token->timeout = scsi_4btoul(data->inactivity_timeout);
+	if (token->timeout == 0)
+		token->timeout = TPC_DFL_TOKEN_TIMEOUT;
+	else if (token->timeout < TPC_MIN_TOKEN_TIMEOUT)
+		token->timeout = TPC_MIN_TOKEN_TIMEOUT;
+	else if (token->timeout > TPC_MAX_TOKEN_TIMEOUT) {
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1,
+		    /*command*/ 0, /*field*/ 4, /*bit_valid*/ 0,
+		    /*bit*/ 0);
+	}
+	memcpy(list->res_token, token->token, sizeof(list->res_token));
+	list->res_token_valid = 1;
+	list->cursectors = tpc_ranges_length(token->range, token->nrange);
+	list->curbytes = (off_t)list->cursectors * lun->be_lun->blocksize;
+	list->curseg = 0;
+	list->completed = 1;
+	list->last_active = time_uptime;
+	mtx_lock(&control_softc->ctl_lock);
+	TAILQ_INSERT_TAIL(&control_softc->tpc_tokens, token, links);
+	mtx_unlock(&control_softc->ctl_lock);
+	ctl_set_success(ctsio);
+	ctl_done((union ctl_io *)ctsio);
+	return (CTL_RETVAL_COMPLETE);
+
+done:
+	if (ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED)
+		free(ctsio->kern_data_ptr, M_CTL);
+	ctl_done((union ctl_io *)ctsio);
+	return (CTL_RETVAL_COMPLETE);
+}
+
+int
+ctl_write_using_token(struct ctl_scsiio *ctsio)
+{
+	struct scsi_write_using_token *cdb;
+	struct scsi_write_using_token_data *data;
+	struct ctl_lun *lun;
+	struct tpc_list *list, *tlist;
+	struct tpc_token *token;
+	int len, lendesc;
+
+	CTL_DEBUG_PRINT(("ctl_write_using_token\n"));
+
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+	cdb = (struct scsi_write_using_token *)ctsio->cdb;
+	len = scsi_4btoul(cdb->length);
+
+	if (len < sizeof(struct scsi_populate_token_data) ||
+	    len > sizeof(struct scsi_populate_token_data) +
+	     TPC_MAX_SEGS * sizeof(struct scsi_range_desc)) {
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1, /*command*/ 1,
+		    /*field*/ 9, /*bit_valid*/ 0, /*bit*/ 0);
+		goto done;
+	}
+
+	/*
+	 * If we've got a kernel request that hasn't been malloced yet,
+	 * malloc it and tell the caller the data buffer is here.
+	 */
+	if ((ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED) == 0) {
+		ctsio->kern_data_ptr = malloc(len, M_CTL, M_WAITOK);
+		ctsio->kern_data_len = len;
+		ctsio->kern_total_len = len;
+		ctsio->kern_data_resid = 0;
+		ctsio->kern_rel_offset = 0;
+		ctsio->kern_sg_entries = 0;
+		ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+		ctsio->be_move_done = ctl_config_move_done;
+		ctl_datamove((union ctl_io *)ctsio);
+
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	data = (struct scsi_write_using_token_data *)ctsio->kern_data_ptr;
+	lendesc = scsi_2btoul(data->range_descriptor_length);
+	if (len < sizeof(struct scsi_populate_token_data) + lendesc) {
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1, /*command*/ 0,
+		    /*field*/ 2, /*bit_valid*/ 0, /*bit*/ 0);
+		goto done;
+	}
+/*
+	printf("WUT(list=%u) flags=%x off=%ju len=%x\n",
+	    scsi_4btoul(cdb->list_identifier),
+	    data->flags, scsi_8btou64(data->offset_into_rod),
+	    scsi_2btoul(data->range_descriptor_length));
+*/
+	list = malloc(sizeof(struct tpc_list), M_CTL, M_WAITOK | M_ZERO);
+	list->service_action = cdb->service_action;
+	list->init_port = ctsio->io_hdr.nexus.targ_port;
+	list->init_idx = ctl_get_resindex(&ctsio->io_hdr.nexus);
+	list->list_id = scsi_4btoul(cdb->list_identifier);
+	list->flags = data->flags;
+	list->params = ctsio->kern_data_ptr;
+	list->range = &data->desc[0];
+	list->nrange = scsi_2btoul(data->range_descriptor_length) /
+	    sizeof(struct scsi_range_desc);
+	list->offset_into_rod = scsi_8btou64(data->offset_into_rod);
+	list->ctsio = ctsio;
+	list->lun = lun;
+	mtx_lock(&lun->lun_lock);
+	tlist = tpc_find_list(lun, list->list_id, list->init_idx);
+	if (tlist != NULL && !tlist->completed) {
+		mtx_unlock(&lun->lun_lock);
+		free(list, M_CTL);
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1,
+		    /*command*/ 0, /*field*/ 0, /*bit_valid*/ 0,
+		    /*bit*/ 0);
+		goto done;
+	}
+	if (tlist != NULL) {
+		TAILQ_REMOVE(&lun->tpc_lists, tlist, links);
+		free(tlist, M_CTL);
+	}
+	TAILQ_INSERT_TAIL(&lun->tpc_lists, list, links);
+	mtx_unlock(&lun->lun_lock);
+
+	/* Block device zero ROD token -> no token. */
+	if (scsi_4btoul(data->rod_token) == ROD_TYPE_BLOCK_ZERO) {
+		tpc_process(list);
+		return (CTL_RETVAL_COMPLETE);
+	}
+
+	mtx_lock(&control_softc->ctl_lock);
+	TAILQ_FOREACH(token, &control_softc->tpc_tokens, links) {
+		if (memcmp(token->token, data->rod_token,
+		    sizeof(data->rod_token)) == 0)
+			break;
+	}
+	if (token != NULL) {
+		token->active++;
+		list->token = token;
+		if (data->flags & EC_WUT_DEL_TKN)
+			token->timeout = 0;
+	}
+	mtx_unlock(&control_softc->ctl_lock);
+	if (token == NULL) {
+		mtx_lock(&lun->lun_lock);
+		TAILQ_REMOVE(&lun->tpc_lists, list, links);
+		mtx_unlock(&lun->lun_lock);
+		free(list, M_CTL);
+		ctl_set_sense(ctsio, /*current_error*/ 1,
+		    /*sense_key*/ SSD_KEY_ILLEGAL_REQUEST,
+		    /*asc*/ 0x23, /*ascq*/ 0x04, SSD_ELEM_NONE);
+		goto done;
+	}
+
+	tpc_process(list);
+	return (CTL_RETVAL_COMPLETE);
+
+done:
+	if (ctsio->io_hdr.flags & CTL_FLAG_ALLOCATED)
+		free(ctsio->kern_data_ptr, M_CTL);
+	ctl_done((union ctl_io *)ctsio);
+	return (CTL_RETVAL_COMPLETE);
+}
+
+int
+ctl_receive_rod_token_information(struct ctl_scsiio *ctsio)
+{
+	struct ctl_lun *lun;
+	struct scsi_receive_rod_token_information *cdb;
+	struct scsi_receive_copy_status_lid4_data *data;
+	struct tpc_list *list;
+	struct tpc_list list_copy;
+	uint8_t *ptr;
+	int retval;
+	int alloc_len, total_len, token_len;
+	uint32_t list_id;
+
+	CTL_DEBUG_PRINT(("ctl_receive_rod_token_information\n"));
+
+	cdb = (struct scsi_receive_rod_token_information *)ctsio->cdb;
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	retval = CTL_RETVAL_COMPLETE;
+
+	list_id = scsi_4btoul(cdb->list_identifier);
+	mtx_lock(&lun->lun_lock);
+	list = tpc_find_list(lun, list_id,
+	    ctl_get_resindex(&ctsio->io_hdr.nexus));
+	if (list == NULL) {
+		mtx_unlock(&lun->lun_lock);
+		ctl_set_invalid_field(ctsio, /*sks_valid*/ 1,
+		    /*command*/ 1, /*field*/ 2, /*bit_valid*/ 0,
+		    /*bit*/ 0);
+		ctl_done((union ctl_io *)ctsio);
+		return (retval);
+	}
+	list_copy = *list;
+	if (list->completed) {
+		TAILQ_REMOVE(&lun->tpc_lists, list, links);
+		free(list, M_CTL);
+	}
+	mtx_unlock(&lun->lun_lock);
+
+	token_len = list_copy.res_token_valid ? 2 + sizeof(list_copy.res_token) : 0;
+	total_len = sizeof(*data) + list_copy.sense_len + 4 + token_len;
+	alloc_len = scsi_4btoul(cdb->length);
+
+	ctsio->kern_data_ptr = malloc(total_len, M_CTL, M_WAITOK | M_ZERO);
+
+	ctsio->kern_sg_entries = 0;
+
+	if (total_len < alloc_len) {
+		ctsio->residual = alloc_len - total_len;
+		ctsio->kern_data_len = total_len;
+		ctsio->kern_total_len = total_len;
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+
+	data = (struct scsi_receive_copy_status_lid4_data *)ctsio->kern_data_ptr;
+	scsi_ulto4b(sizeof(*data) - 4 + list_copy.sense_len +
+	    4 + token_len, data->available_data);
+	data->response_to_service_action = list_copy.service_action;
+	if (list_copy.completed) {
+		if (list_copy.error)
+			data->copy_command_status = RCS_CCS_ERROR;
+		else if (list_copy.abort)
+			data->copy_command_status = RCS_CCS_ABORTED;
+		else
+			data->copy_command_status = RCS_CCS_COMPLETED;
+	} else
+		data->copy_command_status = RCS_CCS_INPROG_FG;
+	scsi_ulto2b(list_copy.curops, data->operation_counter);
+	scsi_ulto4b(UINT32_MAX, data->estimated_status_update_delay);
+	data->transfer_count_units = RCS_TC_LBAS;
+	scsi_u64to8b(list_copy.cursectors, data->transfer_count);
+	scsi_ulto2b(list_copy.curseg, data->segments_processed);
+	data->length_of_the_sense_data_field = list_copy.sense_len;
+	data->sense_data_length = list_copy.sense_len;
+	memcpy(data->sense_data, &list_copy.sense_data, list_copy.sense_len);
+
+	ptr = &data->sense_data[data->length_of_the_sense_data_field];
+	scsi_ulto4b(token_len, &ptr[0]);
+	if (list_copy.res_token_valid) {
+		scsi_ulto2b(0, &ptr[4]);
+		memcpy(&ptr[6], list_copy.res_token, sizeof(list_copy.res_token));
+	}
+/*
+	printf("RRTI(list=%u) valid=%d\n",
+	    scsi_4btoul(cdb->list_identifier), list_copy.res_token_valid);
+*/
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+
+	ctl_datamove((union ctl_io *)ctsio);
+	return (retval);
+}
+
+int
+ctl_report_all_rod_tokens(struct ctl_scsiio *ctsio)
+{
+	struct ctl_lun *lun;
+	struct scsi_report_all_rod_tokens *cdb;
+	struct scsi_report_all_rod_tokens_data *data;
+	struct tpc_token *token;
+	int retval;
+	int alloc_len, total_len, tokens, i;
+
+	CTL_DEBUG_PRINT(("ctl_receive_rod_token_information\n"));
+
+	cdb = (struct scsi_report_all_rod_tokens *)ctsio->cdb;
+	lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+
+	retval = CTL_RETVAL_COMPLETE;
+
+	tokens = 0;
+	mtx_lock(&control_softc->ctl_lock);
+	TAILQ_FOREACH(token, &control_softc->tpc_tokens, links)
+		tokens++;
+	mtx_unlock(&control_softc->ctl_lock);
+	if (tokens > 512)
+		tokens = 512;
+
+	total_len = sizeof(*data) + tokens * 96;
+	alloc_len = scsi_4btoul(cdb->length);
+
+	ctsio->kern_data_ptr = malloc(total_len, M_CTL, M_WAITOK | M_ZERO);
+
+	ctsio->kern_sg_entries = 0;
+
+	if (total_len < alloc_len) {
+		ctsio->residual = alloc_len - total_len;
+		ctsio->kern_data_len = total_len;
+		ctsio->kern_total_len = total_len;
+	} else {
+		ctsio->residual = 0;
+		ctsio->kern_data_len = alloc_len;
+		ctsio->kern_total_len = alloc_len;
+	}
+	ctsio->kern_data_resid = 0;
+	ctsio->kern_rel_offset = 0;
+
+	data = (struct scsi_report_all_rod_tokens_data *)ctsio->kern_data_ptr;
+	i = 0;
+	mtx_lock(&control_softc->ctl_lock);
+	TAILQ_FOREACH(token, &control_softc->tpc_tokens, links) {
+		if (i >= tokens)
+			break;
+		memcpy(&data->rod_management_token_list[i * 96],
+		    token->token, 96);
+		i++;
+	}
+	mtx_unlock(&control_softc->ctl_lock);
+	scsi_ulto4b(sizeof(*data) - 4 + i * 96, data->available_data);
+/*
+	printf("RART tokens=%d\n", i);
+*/
+	ctsio->io_hdr.flags |= CTL_FLAG_ALLOCATED;
+	ctsio->be_move_done = ctl_config_move_done;
+
+	ctl_datamove((union ctl_io *)ctsio);
+	return (retval);
+}
+
diff --git a/sys/ia64/include/sigframe.h b/sys/cam/ctl/ctl_tpc.h
similarity index 76%
rename from sys/ia64/include/sigframe.h
rename to sys/cam/ctl/ctl_tpc.h
index d0e886e9bc90..ecbaec105d30 100644
--- a/sys/ia64/include/sigframe.h
+++ b/sys/cam/ctl/ctl_tpc.h
@@ -1,18 +1,16 @@
 /*-
- * Copyright (c) 1999 Marcel Moolenaar
+ * Copyright (c) 2014 Alexander Motin <mav@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 
- *    in this position and unchanged.
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 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
@@ -28,12 +26,13 @@
  * $FreeBSD$
  */
 
-#ifndef _MACHINE_SIGFRAME_H_
-#define _MACHINE_SIGFRAME_H_ 1
+#ifndef	_CTL_TPC_H
+#define	_CTL_TPC_H 1
 
-struct sigframe {
-	ucontext_t	sf_uc;
-	siginfo_t	sf_si;
-};
+void tpc_done(union ctl_io *io);
 
-#endif /* _MACHINE_SIGFRAME_H_ */
+uint64_t tpcl_resolve(int init_port, struct scsi_ec_cscd *cscd, uint32_t *ss);
+union ctl_io * tpcl_alloc_io(void);
+int tpcl_queue(union ctl_io *io, uint64_t lun);
+
+#endif	/* _CTL_TPC_H */
diff --git a/sys/cam/ctl/ctl_tpc_local.c b/sys/cam/ctl/ctl_tpc_local.c
new file mode 100644
index 000000000000..8fb797865ad2
--- /dev/null
+++ b/sys/cam/ctl/ctl_tpc_local.c
@@ -0,0 +1,387 @@
+/*-
+ * Copyright (c) 2014 Alexander Motin <mav@FreeBSD.org>
+ * Copyright (c) 2004, 2005 Silicon Graphics International Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer,
+ *    without modification, immediately at the beginning of the file.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, 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/types.h>
+#include <sys/lock.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/condvar.h>
+#include <sys/malloc.h>
+#include <sys/conf.h>
+#include <sys/queue.h>
+#include <sys/sysctl.h>
+
+#include <cam/cam.h>
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_da.h>
+#include <cam/ctl/ctl_io.h>
+#include <cam/ctl/ctl.h>
+#include <cam/ctl/ctl_frontend.h>
+#include <cam/ctl/ctl_frontend_internal.h>
+#include <cam/ctl/ctl_util.h>
+#include <cam/ctl/ctl_backend.h>
+#include <cam/ctl/ctl_ioctl.h>
+#include <cam/ctl/ctl_ha.h>
+#include <cam/ctl/ctl_private.h>
+#include <cam/ctl/ctl_debug.h>
+#include <cam/ctl/ctl_scsi_all.h>
+#include <cam/ctl/ctl_tpc.h>
+#include <cam/ctl/ctl_error.h>
+
+struct tpcl_softc {
+	struct ctl_port port;
+	int cur_tag_num;
+};
+
+extern struct ctl_softc *control_softc;
+static struct tpcl_softc tpcl_softc;
+
+static int tpcl_init(void);
+static void tpcl_shutdown(void);
+static void tpcl_online(void *arg);
+static void tpcl_offline(void *arg);
+static int tpcl_lun_enable(void *arg, struct ctl_id target_id, int lun_id);
+static int tpcl_lun_disable(void *arg, struct ctl_id target_id, int lun_id);
+static void tpcl_datamove(union ctl_io *io);
+static void tpcl_done(union ctl_io *io);
+
+
+static struct ctl_frontend tpcl_frontend =
+{
+	.name = "tpc",
+	.init = tpcl_init,
+	.shutdown = tpcl_shutdown,
+};
+CTL_FRONTEND_DECLARE(ctltpc, tpcl_frontend);
+
+static int
+tpcl_init(void)
+{
+	struct ctl_softc *softc = control_softc;
+	struct tpcl_softc *tsoftc = &tpcl_softc;
+	struct ctl_port *port;
+	struct scsi_transportid_spi *tid;
+	int len;
+
+	memset(tsoftc, 0, sizeof(*tsoftc));
+
+	port = &tsoftc->port;
+	port->frontend = &tpcl_frontend;
+	port->port_type = CTL_PORT_INTERNAL;
+	port->num_requested_ctl_io = 100;
+	port->port_name = "tpc";
+	port->port_online = tpcl_online;
+	port->port_offline = tpcl_offline;
+	port->onoff_arg = tsoftc;
+	port->lun_enable = tpcl_lun_enable;
+	port->lun_disable = tpcl_lun_disable;
+	port->targ_lun_arg = tsoftc;
+	port->fe_datamove = tpcl_datamove;
+	port->fe_done = tpcl_done;
+	port->max_targets = 1;
+	port->max_target_id = 0;
+	port->max_initiators = 1;
+
+	if (ctl_port_register(port, (softc->flags & CTL_FLAG_MASTER_SHELF)) != 0) 
+	{
+		printf("%s: tpc frontend registration failed\n", __func__);
+		return (0);
+	}
+
+	len = sizeof(struct scsi_transportid_spi);
+	port->init_devid = malloc(sizeof(struct ctl_devid) + len,
+	    M_CTL, M_WAITOK | M_ZERO);
+	port->init_devid->len = len;
+	tid = (struct scsi_transportid_spi *)port->init_devid->data;
+	tid->format_protocol = SCSI_TRN_SPI_FORMAT_DEFAULT | SCSI_PROTO_SPI;
+	scsi_ulto2b(0, tid->scsi_addr);
+	scsi_ulto2b(port->targ_port, tid->rel_trgt_port_id);
+
+	ctl_port_online(port);
+	return (0);
+}
+
+void
+tpcl_shutdown(void)
+{
+	struct tpcl_softc *tsoftc = &tpcl_softc;
+	struct ctl_port *port;
+
+	port = &tsoftc->port;
+	ctl_port_offline(port);
+	if (ctl_port_deregister(&tsoftc->port) != 0)
+		printf("%s: ctl_frontend_deregister() failed\n", __func__);
+}
+
+static void
+tpcl_online(void *arg)
+{
+}
+
+static void
+tpcl_offline(void *arg)
+{
+}
+
+static int
+tpcl_lun_enable(void *arg, struct ctl_id target_id, int lun_id)
+{
+
+	return (0);
+}
+
+static int
+tpcl_lun_disable(void *arg, struct ctl_id target_id, int lun_id)
+{
+
+	return (0);
+}
+
+static void
+tpcl_datamove(union ctl_io *io)
+{
+	struct ctl_sg_entry *ext_sglist, *kern_sglist;
+	struct ctl_sg_entry ext_entry, kern_entry;
+	int ext_sg_entries, kern_sg_entries;
+	int ext_sg_start, ext_offset;
+	int len_to_copy, len_copied;
+	int kern_watermark, ext_watermark;
+	struct ctl_scsiio *ctsio;
+	int i, j;
+
+	ext_sg_start = 0;
+	ext_offset = 0;
+	ext_sglist = NULL;
+
+	CTL_DEBUG_PRINT(("%s\n", __func__));
+
+	ctsio = &io->scsiio;
+
+	/*
+	 * If this is the case, we're probably doing a BBR read and don't
+	 * actually need to transfer the data.  This will effectively
+	 * bit-bucket the data.
+	 */
+	if (ctsio->ext_data_ptr == NULL)
+		goto bailout;
+
+	/*
+	 * To simplify things here, if we have a single buffer, stick it in
+	 * a S/G entry and just make it a single entry S/G list.
+	 */
+	if (ctsio->io_hdr.flags & CTL_FLAG_EDPTR_SGLIST) {
+		int len_seen;
+
+		ext_sglist = (struct ctl_sg_entry *)ctsio->ext_data_ptr;
+		ext_sg_entries = ctsio->ext_sg_entries;
+		ext_sg_start = 0;
+		ext_offset = 0;
+		len_seen = 0;
+		for (i = 0; i < ext_sg_entries; i++) {
+			if ((len_seen + ext_sglist[i].len) >=
+			     ctsio->ext_data_filled) {
+				ext_sg_start = i;
+				ext_offset = ctsio->ext_data_filled - len_seen;
+				break;
+			}
+			len_seen += ext_sglist[i].len;
+		}
+	} else {
+		ext_sglist = &ext_entry;
+		ext_sglist->addr = ctsio->ext_data_ptr;
+		ext_sglist->len = ctsio->ext_data_len;
+		ext_sg_entries = 1;
+		ext_sg_start = 0;
+		ext_offset = ctsio->ext_data_filled;
+	}
+
+	if (ctsio->kern_sg_entries > 0) {
+		kern_sglist = (struct ctl_sg_entry *)ctsio->kern_data_ptr;
+		kern_sg_entries = ctsio->kern_sg_entries;
+	} else {
+		kern_sglist = &kern_entry;
+		kern_sglist->addr = ctsio->kern_data_ptr;
+		kern_sglist->len = ctsio->kern_data_len;
+		kern_sg_entries = 1;
+	}
+
+	kern_watermark = 0;
+	ext_watermark = ext_offset;
+	len_copied = 0;
+	for (i = ext_sg_start, j = 0;
+	     i < ext_sg_entries && j < kern_sg_entries;) {
+		uint8_t *ext_ptr, *kern_ptr;
+
+		len_to_copy = min(ext_sglist[i].len - ext_watermark,
+				  kern_sglist[j].len - kern_watermark);
+
+		ext_ptr = (uint8_t *)ext_sglist[i].addr;
+		ext_ptr = ext_ptr + ext_watermark;
+		if (io->io_hdr.flags & CTL_FLAG_BUS_ADDR) {
+			/*
+			 * XXX KDM fix this!
+			 */
+			panic("need to implement bus address support");
+#if 0
+			kern_ptr = bus_to_virt(kern_sglist[j].addr);
+#endif
+		} else
+			kern_ptr = (uint8_t *)kern_sglist[j].addr;
+		kern_ptr = kern_ptr + kern_watermark;
+
+		kern_watermark += len_to_copy;
+		ext_watermark += len_to_copy;
+		
+		if ((ctsio->io_hdr.flags & CTL_FLAG_DATA_MASK) ==
+		     CTL_FLAG_DATA_IN) {
+			CTL_DEBUG_PRINT(("%s: copying %d bytes to user\n",
+					 __func__, len_to_copy));
+			CTL_DEBUG_PRINT(("%s: from %p to %p\n", __func__,
+					 kern_ptr, ext_ptr));
+			memcpy(ext_ptr, kern_ptr, len_to_copy);
+		} else {
+			CTL_DEBUG_PRINT(("%s: copying %d bytes from user\n",
+					 __func__, len_to_copy));
+			CTL_DEBUG_PRINT(("%s: from %p to %p\n", __func__,
+					 ext_ptr, kern_ptr));
+			memcpy(kern_ptr, ext_ptr, len_to_copy);
+		}
+
+		len_copied += len_to_copy;
+
+		if (ext_sglist[i].len == ext_watermark) {
+			i++;
+			ext_watermark = 0;
+		}
+
+		if (kern_sglist[j].len == kern_watermark) {
+			j++;
+			kern_watermark = 0;
+		}
+	}
+
+	ctsio->ext_data_filled += len_copied;
+
+	CTL_DEBUG_PRINT(("%s: ext_sg_entries: %d, kern_sg_entries: %d\n",
+			 __func__, ext_sg_entries, kern_sg_entries));
+	CTL_DEBUG_PRINT(("%s: ext_data_len = %d, kern_data_len = %d\n",
+			 __func__, ctsio->ext_data_len, ctsio->kern_data_len));
+
+	/* XXX KDM set residual?? */
+bailout:
+	io->scsiio.be_move_done(io);
+}
+
+static void
+tpcl_done(union ctl_io *io)
+{
+
+	tpc_done(io);
+}
+
+uint64_t
+tpcl_resolve(int init_port, struct scsi_ec_cscd *cscd, uint32_t *ss)
+{
+	struct ctl_softc *softc = control_softc;
+	struct scsi_ec_cscd_id *cscdid;
+	struct ctl_port *port;
+	struct ctl_lun *lun;
+	uint64_t lunid = UINT64_MAX, l;
+	int i;
+
+	if (cscd->type_code != EC_CSCD_ID)
+		return (lunid);
+
+	cscdid = (struct scsi_ec_cscd_id *)cscd;
+	mtx_lock(&softc->ctl_lock);
+	if (init_port >= 0) {
+		port = softc->ctl_ports[ctl_port_idx(init_port)];
+		if (port == NULL || port->lun_map == NULL)
+			init_port = -1;
+	}
+	if (init_port < 0) {
+		STAILQ_FOREACH(lun, &softc->lun_list, links) {
+			if (lun->lun_devid == NULL)
+				continue;
+			if (scsi_devid_match(lun->lun_devid->data,
+			    lun->lun_devid->len, &cscdid->codeset,
+			    cscdid->length + 4) == 0) {
+				lunid = lun->lun;
+				if (ss && lun->be_lun)
+					*ss = lun->be_lun->blocksize;
+				break;
+			}
+		}
+	} else {
+		for (i = 0; i < CTL_MAX_LUNS; i++) {
+			l = port->lun_map(port->targ_lun_arg, i);
+			if (l >= CTL_MAX_LUNS)
+				continue;
+			lun = softc->ctl_luns[l];
+			if (lun == NULL || lun->lun_devid == NULL)
+				continue;
+			if (scsi_devid_match(lun->lun_devid->data,
+			    lun->lun_devid->len, &cscdid->codeset,
+			    cscdid->length + 4) == 0) {
+				lunid = lun->lun;
+				if (ss && lun->be_lun)
+					*ss = lun->be_lun->blocksize;
+				break;
+			}
+		}
+	}
+	mtx_unlock(&softc->ctl_lock);
+	return (lunid);
+};
+
+union ctl_io *
+tpcl_alloc_io(void)
+{
+	struct tpcl_softc *tsoftc = &tpcl_softc;
+
+	return (ctl_alloc_io(tsoftc->port.ctl_pool_ref));
+};
+
+int
+tpcl_queue(union ctl_io *io, uint64_t lun)
+{
+	struct tpcl_softc *tsoftc = &tpcl_softc;
+
+	io->io_hdr.nexus.initid.id = 0;
+	io->io_hdr.nexus.targ_port = tsoftc->port.targ_port;
+	io->io_hdr.nexus.targ_target.id = 0;
+	io->io_hdr.nexus.targ_lun = lun;
+	io->scsiio.tag_num = atomic_fetchadd_int(&tsoftc->cur_tag_num, 1);
+	io->scsiio.ext_data_filled = 0;
+	return (ctl_queue(io));
+}
diff --git a/sys/cam/ctl/ctl_util.c b/sys/cam/ctl/ctl_util.c
index 3ca0aa243fce..61b008500165 100644
--- a/sys/cam/ctl/ctl_util.c
+++ b/sys/cam/ctl/ctl_util.c
@@ -84,6 +84,7 @@ static struct ctl_task_desc ctl_task_table[] = {
 	{CTL_TASK_ABORT_TASK_SET, "Abort Task Set"},
 	{CTL_TASK_CLEAR_ACA, "Clear ACA"},
 	{CTL_TASK_CLEAR_TASK_SET, "Clear Task Set"},
+	{CTL_TASK_I_T_NEXUS_RESET, "I_T Nexus Reset"},
 	{CTL_TASK_LUN_RESET, "LUN Reset"},
 	{CTL_TASK_TARGET_RESET, "Target Reset"},
 	{CTL_TASK_BUS_RESET, "Bus Reset"},
@@ -343,6 +344,37 @@ ctl_scsi_read_write(union ctl_io *io, uint8_t *data_ptr, uint32_t data_len,
 	ctsio->sense_len = SSD_FULL_SIZE;
 }
 
+void
+ctl_scsi_write_same(union ctl_io *io, uint8_t *data_ptr, uint32_t data_len,
+		    uint8_t byte2, uint64_t lba, uint32_t num_blocks,
+		    ctl_tag_type tag_type, uint8_t control)
+{
+	struct ctl_scsiio *ctsio;
+	struct scsi_write_same_16 *cdb;
+
+	ctl_scsi_zero_io(io);
+
+	io->io_hdr.io_type = CTL_IO_SCSI;
+	ctsio = &io->scsiio;
+	ctsio->cdb_len = sizeof(*cdb);
+	cdb = (struct scsi_write_same_16 *)ctsio->cdb;
+	cdb->opcode = WRITE_SAME_16;
+	cdb->byte2 = byte2;
+	scsi_u64to8b(lba, cdb->addr);
+	scsi_ulto4b(num_blocks, cdb->length);
+	cdb->group = 0;
+	cdb->control = control;
+
+	io->io_hdr.io_type = CTL_IO_SCSI;
+	io->io_hdr.flags = CTL_FLAG_DATA_OUT;
+	ctsio->tag_type = tag_type;
+	ctsio->ext_data_ptr = data_ptr;
+	ctsio->ext_data_len = data_len;
+	ctsio->ext_sg_entries = 0;
+	ctsio->ext_data_filled = 0;
+	ctsio->sense_len = SSD_FULL_SIZE;
+}
+
 void
 ctl_scsi_read_capacity(union ctl_io *io, uint8_t *data_ptr, uint32_t data_len,
 		       uint32_t addr, int reladr, int pmi,
diff --git a/sys/cam/ctl/ctl_util.h b/sys/cam/ctl/ctl_util.h
index 29bc3e5d26e3..774ac274acf7 100644
--- a/sys/cam/ctl/ctl_util.h
+++ b/sys/cam/ctl/ctl_util.h
@@ -61,6 +61,10 @@ void ctl_scsi_read_write(union ctl_io *io, uint8_t *data_ptr,
 			 int minimum_cdb_size, uint64_t lba,
 			 uint32_t num_blocks, ctl_tag_type tag_type,
 			 uint8_t control);
+void ctl_scsi_write_same(union ctl_io *io, uint8_t *data_ptr,
+			 uint32_t data_len, uint8_t byte2,
+			 uint64_t lba, uint32_t num_blocks,
+			 ctl_tag_type tag_type, uint8_t control);
 void ctl_scsi_read_capacity(union ctl_io *io, uint8_t *data_ptr,
 			    uint32_t data_len, uint32_t addr, int reladr,
 			    int pmi, ctl_tag_type tag_type, uint8_t control);
diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c
index 2ed8d2800f0d..3529683f6208 100644
--- a/sys/cam/ctl/scsi_ctl.c
+++ b/sys/cam/ctl/scsi_ctl.c
@@ -77,7 +77,7 @@ typedef enum {
 } ctlfe_ccb_types;
 
 struct ctlfe_softc {
-	struct ctl_frontend fe;
+	struct ctl_port port;
 	path_id_t path_id;
 	u_int	maxio;
 	struct cam_sim *sim;
@@ -198,7 +198,7 @@ MALLOC_DEFINE(M_CTLFE, "CAM CTL FE", "CAM CTL FE interface");
 
 int			ctlfeinitialize(void);
 void			ctlfeshutdown(void);
-static periph_init_t	ctlfeinit;
+static periph_init_t	ctlfeperiphinit;
 static void		ctlfeasync(void *callback_arg, uint32_t code,
 				   struct cam_path *path, void *arg);
 static periph_ctor_t	ctlferegister;
@@ -211,8 +211,6 @@ static void		ctlfedone(struct cam_periph *periph,
 static void 		ctlfe_onoffline(void *arg, int online);
 static void 		ctlfe_online(void *arg);
 static void 		ctlfe_offline(void *arg);
-static int 		ctlfe_targ_enable(void *arg, struct ctl_id targ_id);
-static int 		ctlfe_targ_disable(void *arg, struct ctl_id targ_id);
 static int 		ctlfe_lun_enable(void *arg, struct ctl_id targ_id,
 					 int lun_id);
 static int 		ctlfe_lun_disable(void *arg, struct ctl_id targ_id,
@@ -225,26 +223,18 @@ static void 		ctlfe_dump(void);
 
 static struct periph_driver ctlfe_driver =
 {
-	ctlfeinit, "ctl",
+	ctlfeperiphinit, "ctl",
 	TAILQ_HEAD_INITIALIZER(ctlfe_driver.units), /*generation*/ 0
 };
 
-static int ctlfe_module_event_handler(module_t, int /*modeventtype_t*/, void *);
-
-/*
- * We're not using PERIPHDRIVER_DECLARE(), because it runs at SI_SUB_DRIVERS,
- * and that happens before CTL gets initialised.
- */
-static moduledata_t ctlfe_moduledata = {
-	"ctlfe",
-	ctlfe_module_event_handler,
-	NULL
+static struct ctl_frontend ctlfe_frontend =
+{
+	.name = "camtarget",
+	.init = ctlfeinitialize,
+	.fe_dump = ctlfe_dump,
+	.shutdown = ctlfeshutdown,
 };
-
-DECLARE_MODULE(ctlfe, ctlfe_moduledata, SI_SUB_CONFIGURE, SI_ORDER_FOURTH);
-MODULE_VERSION(ctlfe, 1);
-MODULE_DEPEND(ctlfe, ctl, 1, 1, 1);
-MODULE_DEPEND(ctlfe, cam, 1, 1, 1);
+CTL_FRONTEND_DECLARE(ctlfe, ctlfe_frontend);
 
 extern struct ctl_softc *control_softc;
 
@@ -254,41 +244,29 @@ ctlfeshutdown(void)
 	return;
 }
 
+int
+ctlfeinitialize(void)
+{
+
+	STAILQ_INIT(&ctlfe_softc_list);
+	mtx_init(&ctlfe_list_mtx, ctlfe_mtx_desc, NULL, MTX_DEF);
+	periphdriver_register(&ctlfe_driver);
+	return (0);
+}
+
 void
-ctlfeinit(void)
+ctlfeperiphinit(void)
 {
 	cam_status status;
 
-	STAILQ_INIT(&ctlfe_softc_list);
-
-	mtx_init(&ctlfe_list_mtx, ctlfe_mtx_desc, NULL, MTX_DEF);
-
-	KASSERT(control_softc != NULL, ("CTL is not initialized!"));
-
 	status = xpt_register_async(AC_PATH_REGISTERED | AC_PATH_DEREGISTERED |
 				    AC_CONTRACT, ctlfeasync, NULL, NULL);
-
 	if (status != CAM_REQ_CMP) {
 		printf("ctl: Failed to attach async callback due to CAM "
 		       "status 0x%x!\n", status);
 	}
 }
 
-static int
-ctlfe_module_event_handler(module_t mod, int what, void *arg)
-{
-
-	switch (what) {
-	case MOD_LOAD:
-		periphdriver_register(&ctlfe_driver);
-		return (0);
-	case MOD_UNLOAD:
-		return (EBUSY);
-	default:
-		return (EOPNOTSUPP);
-	}
-}
-
 static void
 ctlfeasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 {
@@ -304,7 +282,7 @@ ctlfeasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
  	 */
 	switch (code) {
 	case AC_PATH_REGISTERED: {
-		struct ctl_frontend *fe;
+		struct ctl_port *port;
 		struct ctlfe_softc *bus_softc;
 		struct ccb_pathinq *cpi;
 		int retval;
@@ -386,56 +364,56 @@ ctlfeasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 		    MTX_DEF);
 		STAILQ_INIT(&bus_softc->lun_softc_list);
 
-		fe = &bus_softc->fe;
+		port = &bus_softc->port;
+		port->frontend = &ctlfe_frontend;
 
 		/*
 		 * XXX KDM should we be more accurate here ?
 		 */
 		if (cpi->transport == XPORT_FC)
-			fe->port_type = CTL_PORT_FC;
+			port->port_type = CTL_PORT_FC;
+		else if (cpi->transport == XPORT_SAS)
+			port->port_type = CTL_PORT_SAS;
 		else
-			fe->port_type = CTL_PORT_SCSI;
+			port->port_type = CTL_PORT_SCSI;
 
 		/* XXX KDM what should the real number be here? */
-		fe->num_requested_ctl_io = 4096;
+		port->num_requested_ctl_io = 4096;
 		snprintf(bus_softc->port_name, sizeof(bus_softc->port_name),
 			 "%s%d", cpi->dev_name, cpi->unit_number);
 		/*
 		 * XXX KDM it would be nice to allocate storage in the
 		 * frontend structure itself.
 	 	 */
-		fe->port_name = bus_softc->port_name;
-		fe->physical_port = cpi->unit_number;
-		fe->virtual_port = cpi->bus_id;
-		fe->port_online = ctlfe_online;
-		fe->port_offline = ctlfe_offline;
-		fe->onoff_arg = bus_softc;
-		fe->targ_enable = ctlfe_targ_enable;
-		fe->targ_disable = ctlfe_targ_disable;
-		fe->lun_enable = ctlfe_lun_enable;
-		fe->lun_disable = ctlfe_lun_disable;
-		fe->targ_lun_arg = bus_softc;
-		fe->fe_datamove = ctlfe_datamove_done;
-		fe->fe_done = ctlfe_datamove_done;
-		fe->fe_dump = ctlfe_dump;
+		port->port_name = bus_softc->port_name;
+		port->physical_port = cpi->unit_number;
+		port->virtual_port = cpi->bus_id;
+		port->port_online = ctlfe_online;
+		port->port_offline = ctlfe_offline;
+		port->onoff_arg = bus_softc;
+		port->lun_enable = ctlfe_lun_enable;
+		port->lun_disable = ctlfe_lun_disable;
+		port->targ_lun_arg = bus_softc;
+		port->fe_datamove = ctlfe_datamove_done;
+		port->fe_done = ctlfe_datamove_done;
 		/*
 		 * XXX KDM the path inquiry doesn't give us the maximum
 		 * number of targets supported.
 		 */
-		fe->max_targets = cpi->max_target;
-		fe->max_target_id = cpi->max_target;
+		port->max_targets = cpi->max_target;
+		port->max_target_id = cpi->max_target;
 		
 		/*
 		 * XXX KDM need to figure out whether we're the master or
 		 * slave.
 		 */
 #ifdef CTLFEDEBUG
-		printf("%s: calling ctl_frontend_register() for %s%d\n",
+		printf("%s: calling ctl_port_register() for %s%d\n",
 		       __func__, cpi->dev_name, cpi->unit_number);
 #endif
-		retval = ctl_frontend_register(fe, /*master_SC*/ 1);
+		retval = ctl_port_register(port, /*master_SC*/ 1);
 		if (retval != 0) {
-			printf("%s: ctl_frontend_register() failed with "
+			printf("%s: ctl_port_register() failed with "
 			       "error %d!\n", __func__, retval);
 			mtx_destroy(&bus_softc->lun_softc_mtx);
 			free(bus_softc, M_CTLFE);
@@ -466,7 +444,7 @@ ctlfeasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 			 * XXX KDM are we certain at this point that there
 			 * are no outstanding commands for this frontend?
 			 */
-			ctl_frontend_deregister(&softc->fe);
+			ctl_port_deregister(&softc->port);
 			mtx_destroy(&softc->lun_softc_mtx);
 			free(softc, M_CTLFE);
 		}
@@ -508,18 +486,18 @@ ctlfeasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 				break;
 			}
 			if (dev_chg->arrived != 0) {
-				retval = ctl_add_initiator(dev_chg->wwpn,
-					softc->fe.targ_port, dev_chg->target);
+				retval = ctl_add_initiator(&softc->port,
+				    dev_chg->target, dev_chg->wwpn, NULL);
 			} else {
-				retval = ctl_remove_initiator(
-					softc->fe.targ_port, dev_chg->target);
+				retval = ctl_remove_initiator(&softc->port,
+				    dev_chg->target);
 			}
 
-			if (retval != 0) {
+			if (retval < 0) {
 				printf("%s: could not %s port %d iid %u "
 				       "WWPN %#jx!\n", __func__,
 				       (dev_chg->arrived != 0) ? "add" :
-				       "remove", softc->fe.targ_port,
+				       "remove", softc->port.targ_port,
 				       dev_chg->target,
 				       (uintmax_t)dev_chg->wwpn);
 			}
@@ -826,8 +804,8 @@ ctlfestart(struct cam_periph *periph, union ccb *start_ccb)
 			if (io == NULL) {
 				scsi_status = SCSI_STATUS_BUSY;
 				csio->sense_len = 0;
-			} else if ((io->io_hdr.status & CTL_STATUS_MASK) ==
-				   CTL_CMD_ABORTED) {
+			} else if ((io->io_hdr.flags & CTL_FLAG_ABORT) &&
+			    (io->io_hdr.flags & CTL_FLAG_ABORT_STATUS) == 0) {
 				io->io_hdr.flags &= ~CTL_FLAG_STATUS_QUEUED;
 
 				/*
@@ -1206,7 +1184,7 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 		 * Allocate a ctl_io, pass it to CTL, and wait for the
 		 * datamove or done.
 		 */
-		io = ctl_alloc_io(bus_softc->fe.ctl_pool_ref);
+		io = ctl_alloc_io(bus_softc->port.ctl_pool_ref);
 		if (io == NULL) {
 			atio->ccb_h.flags &= ~CAM_DIR_MASK;
 			atio->ccb_h.flags |= CAM_DIR_NONE;
@@ -1239,7 +1217,7 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 		 */
 		io->io_hdr.io_type = CTL_IO_SCSI;
 		io->io_hdr.nexus.initid.id = atio->init_id;
-		io->io_hdr.nexus.targ_port = bus_softc->fe.targ_port;
+		io->io_hdr.nexus.targ_port = bus_softc->port.targ_port;
 		io->io_hdr.nexus.targ_target.id = atio->ccb_h.target_id;
 		io->io_hdr.nexus.targ_lun = atio->ccb_h.target_lun;
 		io->scsiio.tag_num = atio->tag_id;
@@ -1511,7 +1489,7 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 		       "seq %#x\n", __func__, inot->ccb_h.status,
 		       inot->tag_id, inot->seq_id);
 
-		io = ctl_alloc_io(bus_softc->fe.ctl_pool_ref);
+		io = ctl_alloc_io(bus_softc->port.ctl_pool_ref);
 		if (io != NULL) {
 			int send_ctl_io;
 
@@ -1522,7 +1500,7 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 			io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr =done_ccb;
 			inot->ccb_h.io_ptr = io;
 			io->io_hdr.nexus.initid.id = inot->initiator_id;
-			io->io_hdr.nexus.targ_port = bus_softc->fe.targ_port;
+			io->io_hdr.nexus.targ_port = bus_softc->port.targ_port;
 			io->io_hdr.nexus.targ_target.id = inot->ccb_h.target_id;
 			io->io_hdr.nexus.targ_lun = inot->ccb_h.target_lun;
 			/* XXX KDM should this be the tag_id? */
@@ -1734,7 +1712,7 @@ ctlfe_onoffline(void *arg, int online)
 			 * This should be replaced later with ddb_GetWWNN,
 			 * or possibly a more centralized scheme.  (It
 			 * would be nice to have the WWNN/WWPN for each
-			 * port stored in the ctl_frontend structure.)
+			 * port stored in the ctl_port structure.)
 			 */
 #ifdef RANDOM_WWNN
 			ccb->knob.xport_specific.fc.wwnn = 
@@ -1747,7 +1725,7 @@ ctlfe_onoffline(void *arg, int online)
 				0x0000000fffffff00ULL) |
 				/* Company ID */ 0x5000ED5000000000ULL |
 				/* NL-Port */    0x3000 |
-				/* Port Num */ (bus_softc->fe.targ_port & 0xff);
+				/* Port Num */ (bus_softc->port.targ_port & 0xff);
 
 			/*
 			 * This is a bit of an API break/reversal, but if
@@ -1756,10 +1734,9 @@ ctlfe_onoffline(void *arg, int online)
 			 * using with the frontend code so it's reported
 			 * accurately.
 			 */
-			bus_softc->fe.wwnn = 
-				ccb->knob.xport_specific.fc.wwnn;
-			bus_softc->fe.wwpn = 
-				ccb->knob.xport_specific.fc.wwpn;
+			ctl_port_set_wwns(&bus_softc->port,
+			    true, ccb->knob.xport_specific.fc.wwnn,
+			    true, ccb->knob.xport_specific.fc.wwpn);
 			set_wwnn = 1;
 #else /* RANDOM_WWNN */
 			/*
@@ -1767,18 +1744,17 @@ ctlfe_onoffline(void *arg, int online)
 			 * down to the SIM.  Otherwise, record what the SIM
 			 * has reported.
 			 */
-			if ((bus_softc->fe.wwnn != 0)
-			 && (bus_softc->fe.wwpn != 0)) {
+			if ((bus_softc->port.wwnn != 0)
+			 && (bus_softc->port.wwpn != 0)) {
 				ccb->knob.xport_specific.fc.wwnn =
-					bus_softc->fe.wwnn;
+					bus_softc->port.wwnn;
 				ccb->knob.xport_specific.fc.wwpn =
-					bus_softc->fe.wwpn;
+					bus_softc->port.wwpn;
 				set_wwnn = 1;
 			} else {
-				bus_softc->fe.wwnn =
-					ccb->knob.xport_specific.fc.wwnn;
-				bus_softc->fe.wwpn =
-					ccb->knob.xport_specific.fc.wwpn;
+				ctl_port_set_wwns(&bus_softc->port,
+				    true, ccb->knob.xport_specific.fc.wwnn,
+				    true, ccb->knob.xport_specific.fc.wwpn);
 			}
 #endif /* RANDOM_WWNN */
 
@@ -1927,18 +1903,6 @@ ctlfe_offline(void *arg)
 	xpt_free_path(path);
 }
 
-static int
-ctlfe_targ_enable(void *arg, struct ctl_id targ_id)
-{
-	return (0);
-}
-
-static int
-ctlfe_targ_disable(void *arg, struct ctl_id targ_id)
-{
-	return (0);
-}
-
 /*
  * This will get called to enable a LUN on every bus that is attached to
  * CTL.  So we only need to create a path/periph for this particular bus.
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index ff9dc1711c08..d61d4522163d 100644
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -44,11 +44,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
+#include <sys/ctype.h>
 #else
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #endif
 
 #include <cam/cam.h>
@@ -471,7 +473,8 @@ static struct op_table_entry scsi_op_codes[] = {
 	 */
 	/* 88  MM  O O   O     READ(16) */
 	{ 0x88,	D | T | W | O | B, "READ(16)" },
-	/* 89 */
+	/* 89  O               COMPARE AND WRITE*/
+	{ 0x89,	D, "COMPARE AND WRITE" },
 	/* 8A  OM  O O   O     WRITE(16) */
 	{ 0x8A,	D | T | W | O | B, "WRITE(16)" },
 	/* 8B  O               ORWRITE */
@@ -1589,37 +1592,37 @@ static struct asc_table_entry asc_table[] = {
 	{ SST(0x22, 0x00, SS_FATAL | EINVAL,
 	    "Illegal function (use 20 00, 24 00, or 26 00)") },
 	/* DT P      B    */
-	{ SST(0x23, 0x00, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x00, SS_FATAL | EINVAL,
 	    "Invalid token operation, cause not reportable") },
 	/* DT P      B    */
-	{ SST(0x23, 0x01, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x01, SS_FATAL | EINVAL,
 	    "Invalid token operation, unsupported token type") },
 	/* DT P      B    */
-	{ SST(0x23, 0x02, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x02, SS_FATAL | EINVAL,
 	    "Invalid token operation, remote token usage not supported") },
 	/* DT P      B    */
-	{ SST(0x23, 0x03, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x03, SS_FATAL | EINVAL,
 	    "Invalid token operation, remote ROD token creation not supported") },
 	/* DT P      B    */
-	{ SST(0x23, 0x04, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x04, SS_FATAL | EINVAL,
 	    "Invalid token operation, token unknown") },
 	/* DT P      B    */
-	{ SST(0x23, 0x05, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x05, SS_FATAL | EINVAL,
 	    "Invalid token operation, token corrupt") },
 	/* DT P      B    */
-	{ SST(0x23, 0x06, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x06, SS_FATAL | EINVAL,
 	    "Invalid token operation, token revoked") },
 	/* DT P      B    */
-	{ SST(0x23, 0x07, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x07, SS_FATAL | EINVAL,
 	    "Invalid token operation, token expired") },
 	/* DT P      B    */
-	{ SST(0x23, 0x08, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x08, SS_FATAL | EINVAL,
 	    "Invalid token operation, token cancelled") },
 	/* DT P      B    */
-	{ SST(0x23, 0x09, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x09, SS_FATAL | EINVAL,
 	    "Invalid token operation, token deleted") },
 	/* DT P      B    */
-	{ SST(0x23, 0x0A, SS_RDEF,	/* XXX TBD */
+	{ SST(0x23, 0x0A, SS_FATAL | EINVAL,
 	    "Invalid token operation, invalid token length") },
 	/* DTLPWROMAEBKVF */
 	{ SST(0x24, 0x00, SS_FATAL | EINVAL,
@@ -1670,28 +1673,28 @@ static struct asc_table_entry asc_table[] = {
 	{ SST(0x26, 0x05, SS_RDEF,	/* XXX TBD */
 	    "Data decryption error") },
 	/* DTLPWRO    K   */
-	{ SST(0x26, 0x06, SS_RDEF,	/* XXX TBD */
+	{ SST(0x26, 0x06, SS_FATAL | EINVAL,
 	    "Too many target descriptors") },
 	/* DTLPWRO    K   */
-	{ SST(0x26, 0x07, SS_RDEF,	/* XXX TBD */
+	{ SST(0x26, 0x07, SS_FATAL | EINVAL,
 	    "Unsupported target descriptor type code") },
 	/* DTLPWRO    K   */
-	{ SST(0x26, 0x08, SS_RDEF,	/* XXX TBD */
+	{ SST(0x26, 0x08, SS_FATAL | EINVAL,
 	    "Too many segment descriptors") },
 	/* DTLPWRO    K   */
-	{ SST(0x26, 0x09, SS_RDEF,	/* XXX TBD */
+	{ SST(0x26, 0x09, SS_FATAL | EINVAL,
 	    "Unsupported segment descriptor type code") },
 	/* DTLPWRO    K   */
-	{ SST(0x26, 0x0A, SS_RDEF,	/* XXX TBD */
+	{ SST(0x26, 0x0A, SS_FATAL | EINVAL,
 	    "Unexpected inexact segment") },
 	/* DTLPWRO    K   */
-	{ SST(0x26, 0x0B, SS_RDEF,	/* XXX TBD */
+	{ SST(0x26, 0x0B, SS_FATAL | EINVAL,
 	    "Inline data length exceeded") },
 	/* DTLPWRO    K   */
-	{ SST(0x26, 0x0C, SS_RDEF,	/* XXX TBD */
+	{ SST(0x26, 0x0C, SS_FATAL | EINVAL,
 	    "Invalid operation for copy source or destination") },
 	/* DTLPWRO    K   */
-	{ SST(0x26, 0x0D, SS_RDEF,	/* XXX TBD */
+	{ SST(0x26, 0x0D, SS_FATAL | EINVAL,
 	    "Copy segment granularity violation") },
 	/* DT PWROMAEBK   */
 	{ SST(0x26, 0x0E, SS_RDEF,	/* XXX TBD */
@@ -5432,32 +5435,1019 @@ scsi_devid_is_lun_name(uint8_t *bufp)
 }
 
 struct scsi_vpd_id_descriptor *
-scsi_get_devid(struct scsi_vpd_device_id *id, uint32_t page_len,
+scsi_get_devid_desc(struct scsi_vpd_id_descriptor *desc, uint32_t len,
     scsi_devid_checkfn_t ck_fn)
 {
-	struct scsi_vpd_id_descriptor *desc;
-	uint8_t *page_end;
 	uint8_t *desc_buf_end;
 
-	page_end = (uint8_t *)id + page_len;
-	if (page_end < id->desc_list)
-		return (NULL);
+	desc_buf_end = (uint8_t *)desc + len;
 
-	desc_buf_end = MIN(id->desc_list + scsi_2btoul(id->length), page_end);
-
-	for (desc = (struct scsi_vpd_id_descriptor *)id->desc_list;
-	     desc->identifier <= desc_buf_end
-	  && desc->identifier + desc->length <= desc_buf_end;
-	     desc = (struct scsi_vpd_id_descriptor *)(desc->identifier
+	for (; desc->identifier <= desc_buf_end &&
+	    desc->identifier + desc->length <= desc_buf_end;
+	    desc = (struct scsi_vpd_id_descriptor *)(desc->identifier
 						    + desc->length)) {
 
 		if (ck_fn == NULL || ck_fn((uint8_t *)desc) != 0)
 			return (desc);
 	}
+	return (NULL);
+}
+
+struct scsi_vpd_id_descriptor *
+scsi_get_devid(struct scsi_vpd_device_id *id, uint32_t page_len,
+    scsi_devid_checkfn_t ck_fn)
+{
+	uint32_t len;
+
+	if (page_len < sizeof(*id))
+		return (NULL);
+	len = MIN(scsi_2btoul(id->length), page_len - sizeof(*id));
+	return (scsi_get_devid_desc((struct scsi_vpd_id_descriptor *)
+	    id->desc_list, len, ck_fn));
+}
+
+int
+scsi_transportid_sbuf(struct sbuf *sb, struct scsi_transportid_header *hdr,
+		      uint32_t valid_len)
+{
+	switch (hdr->format_protocol & SCSI_TRN_PROTO_MASK) {
+	case SCSI_PROTO_FC: {
+		struct scsi_transportid_fcp *fcp;
+		uint64_t n_port_name;
+
+		fcp = (struct scsi_transportid_fcp *)hdr;
+
+		n_port_name = scsi_8btou64(fcp->n_port_name);
+
+		sbuf_printf(sb, "FCP address: 0x%.16jx",(uintmax_t)n_port_name);
+		break;
+	}
+	case SCSI_PROTO_SPI: {
+		struct scsi_transportid_spi *spi;
+
+		spi = (struct scsi_transportid_spi *)hdr;
+
+		sbuf_printf(sb, "SPI address: %u,%u",
+			    scsi_2btoul(spi->scsi_addr),
+			    scsi_2btoul(spi->rel_trgt_port_id));
+		break;
+	}
+	case SCSI_PROTO_SSA:
+		/*
+		 * XXX KDM there is no transport ID defined in SPC-4 for
+		 * SSA.
+		 */
+		break;
+	case SCSI_PROTO_1394: {
+		struct scsi_transportid_1394 *sbp;
+		uint64_t eui64;
+
+		sbp = (struct scsi_transportid_1394 *)hdr;
+
+		eui64 = scsi_8btou64(sbp->eui64);
+		sbuf_printf(sb, "SBP address: 0x%.16jx", (uintmax_t)eui64);
+		break;
+	}
+	case SCSI_PROTO_RDMA: {
+		struct scsi_transportid_rdma *rdma;
+		unsigned int i;
+
+		rdma = (struct scsi_transportid_rdma *)hdr;
+
+		sbuf_printf(sb, "RDMA address: 0x");
+		for (i = 0; i < sizeof(rdma->initiator_port_id); i++)
+			sbuf_printf(sb, "%02x", rdma->initiator_port_id[i]);
+		break;
+	}
+	case SCSI_PROTO_ISCSI: {
+		uint32_t add_len, i;
+		uint8_t *iscsi_name = NULL;
+		int nul_found = 0;
+
+		sbuf_printf(sb, "iSCSI address: ");
+		if ((hdr->format_protocol & SCSI_TRN_FORMAT_MASK) == 
+		    SCSI_TRN_ISCSI_FORMAT_DEVICE) {
+			struct scsi_transportid_iscsi_device *dev;
+
+			dev = (struct scsi_transportid_iscsi_device *)hdr;
+
+			/*
+			 * Verify how much additional data we really have.
+			 */
+			add_len = scsi_2btoul(dev->additional_length);
+			add_len = MIN(add_len, valid_len -
+				__offsetof(struct scsi_transportid_iscsi_device,
+					   iscsi_name));
+			iscsi_name = &dev->iscsi_name[0];
+
+		} else if ((hdr->format_protocol & SCSI_TRN_FORMAT_MASK) ==
+			    SCSI_TRN_ISCSI_FORMAT_PORT) {
+			struct scsi_transportid_iscsi_port *port;
+
+			port = (struct scsi_transportid_iscsi_port *)hdr;
+			
+			add_len = scsi_2btoul(port->additional_length);
+			add_len = MIN(add_len, valid_len -
+				__offsetof(struct scsi_transportid_iscsi_port,
+					   iscsi_name));
+			iscsi_name = &port->iscsi_name[0];
+		} else {
+			sbuf_printf(sb, "unknown format %x",
+				    (hdr->format_protocol &
+				     SCSI_TRN_FORMAT_MASK) >>
+				     SCSI_TRN_FORMAT_SHIFT);
+			break;
+		}
+		if (add_len == 0) {
+			sbuf_printf(sb, "not enough data");
+			break;
+		}
+		/*
+		 * This is supposed to be a NUL-terminated ASCII 
+		 * string, but you never know.  So we're going to
+		 * check.  We need to do this because there is no
+		 * sbuf equivalent of strncat().
+		 */
+		for (i = 0; i < add_len; i++) {
+			if (iscsi_name[i] == '\0') {
+				nul_found = 1;
+				break;
+			}
+		}
+		/*
+		 * If there is a NUL in the name, we can just use
+		 * sbuf_cat().  Otherwise we need to use sbuf_bcat().
+		 */
+		if (nul_found != 0)
+			sbuf_cat(sb, iscsi_name);
+		else
+			sbuf_bcat(sb, iscsi_name, add_len);
+		break;
+	}
+	case SCSI_PROTO_SAS: {
+		struct scsi_transportid_sas *sas;
+		uint64_t sas_addr;
+
+		sas = (struct scsi_transportid_sas *)hdr;
+
+		sas_addr = scsi_8btou64(sas->sas_address);
+		sbuf_printf(sb, "SAS address: 0x%.16jx", (uintmax_t)sas_addr);
+		break;
+	}
+	case SCSI_PROTO_ADITP:
+	case SCSI_PROTO_ATA:
+	case SCSI_PROTO_UAS:
+		/*
+		 * No Transport ID format for ADI, ATA or USB is defined in
+		 * SPC-4.
+		 */
+		sbuf_printf(sb, "No known Transport ID format for protocol "
+			    "%#x", hdr->format_protocol & SCSI_TRN_PROTO_MASK);
+		break;
+	case SCSI_PROTO_SOP: {
+		struct scsi_transportid_sop *sop;
+		struct scsi_sop_routing_id_norm *rid;
+
+		sop = (struct scsi_transportid_sop *)hdr;
+		rid = (struct scsi_sop_routing_id_norm *)sop->routing_id;
+
+		/*
+		 * Note that there is no alternate format specified in SPC-4
+		 * for the PCIe routing ID, so we don't really have a way
+		 * to know whether the second byte of the routing ID is
+		 * a device and function or just a function.  So we just
+		 * assume bus,device,function.
+		 */
+		sbuf_printf(sb, "SOP Routing ID: %u,%u,%u",
+			    rid->bus, rid->devfunc >> SCSI_TRN_SOP_DEV_SHIFT,
+			    rid->devfunc & SCSI_TRN_SOP_FUNC_NORM_MAX);
+		break;
+	}
+	case SCSI_PROTO_NONE:
+	default:
+		sbuf_printf(sb, "Unknown protocol %#x",
+			    hdr->format_protocol & SCSI_TRN_PROTO_MASK);
+		break;
+	}
+
+	return (0);
+}
+
+struct scsi_nv scsi_proto_map[] = {
+	{ "fcp", SCSI_PROTO_FC },
+	{ "spi", SCSI_PROTO_SPI },
+	{ "ssa", SCSI_PROTO_SSA },
+	{ "sbp", SCSI_PROTO_1394 },
+	{ "1394", SCSI_PROTO_1394 },
+	{ "srp", SCSI_PROTO_RDMA },
+	{ "rdma", SCSI_PROTO_RDMA },
+	{ "iscsi", SCSI_PROTO_ISCSI },
+	{ "iqn", SCSI_PROTO_ISCSI },
+	{ "sas", SCSI_PROTO_SAS },
+	{ "aditp", SCSI_PROTO_ADITP },
+	{ "ata", SCSI_PROTO_ATA },
+	{ "uas", SCSI_PROTO_UAS },
+	{ "usb", SCSI_PROTO_UAS },
+	{ "sop", SCSI_PROTO_SOP }
+};
+
+const char *
+scsi_nv_to_str(struct scsi_nv *table, int num_table_entries, uint64_t value)
+{
+	int i;
+
+	for (i = 0; i < num_table_entries; i++) {
+		if (table[i].value == value)
+			return (table[i].name);
+	}
 
 	return (NULL);
 }
 
+/*
+ * Given a name/value table, find a value matching the given name.
+ * Return values:
+ *	SCSI_NV_FOUND - match found
+ *	SCSI_NV_AMBIGUOUS - more than one match, none of them exact
+ *	SCSI_NV_NOT_FOUND - no match found
+ */
+scsi_nv_status
+scsi_get_nv(struct scsi_nv *table, int num_table_entries,
+	    char *name, int *table_entry, scsi_nv_flags flags)
+{
+	int i, num_matches = 0;
+
+	for (i = 0; i < num_table_entries; i++) {
+		size_t table_len, name_len;
+
+		table_len = strlen(table[i].name);
+		name_len = strlen(name);
+
+		if ((((flags & SCSI_NV_FLAG_IG_CASE) != 0)
+		  && (strncasecmp(table[i].name, name, name_len) == 0))
+		|| (((flags & SCSI_NV_FLAG_IG_CASE) == 0)
+		 && (strncmp(table[i].name, name, name_len) == 0))) {
+			*table_entry = i;
+
+			/*
+			 * Check for an exact match.  If we have the same
+			 * number of characters in the table as the argument,
+			 * and we already know they're the same, we have
+			 * an exact match.
+		 	 */
+			if (table_len == name_len)
+				return (SCSI_NV_FOUND);
+
+			/*
+			 * Otherwise, bump up the number of matches.  We'll
+			 * see later how many we have.
+			 */
+			num_matches++;
+		}
+	}
+
+	if (num_matches > 1)
+		return (SCSI_NV_AMBIGUOUS);
+	else if (num_matches == 1)
+		return (SCSI_NV_FOUND);
+	else
+		return (SCSI_NV_NOT_FOUND);
+}
+
+/*
+ * Parse transport IDs for Fibre Channel, 1394 and SAS.  Since these are
+ * all 64-bit numbers, the code is similar.
+ */
+int
+scsi_parse_transportid_64bit(int proto_id, char *id_str,
+			     struct scsi_transportid_header **hdr,
+			     unsigned int *alloc_len,
+#ifdef _KERNEL
+			     struct malloc_type *type, int flags,
+#endif
+			     char *error_str, int error_str_len)
+{
+	uint64_t value;
+	char *endptr;
+	int retval;
+	size_t alloc_size;
+
+	retval = 0;
+
+	value = strtouq(id_str, &endptr, 0); 
+	if (*endptr != '\0') {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: error "
+				 "parsing ID %s, 64-bit number required",
+				 __func__, id_str);
+		}
+		retval = 1;
+		goto bailout;
+	}
+
+	switch (proto_id) {
+	case SCSI_PROTO_FC:
+		alloc_size = sizeof(struct scsi_transportid_fcp);
+		break;
+	case SCSI_PROTO_1394:
+		alloc_size = sizeof(struct scsi_transportid_1394);
+		break;
+	case SCSI_PROTO_SAS:
+		alloc_size = sizeof(struct scsi_transportid_sas);
+		break;
+	default:
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: unsupoprted "
+				 "protocol %d", __func__, proto_id);
+		}
+		retval = 1;
+		goto bailout;
+		break; /* NOTREACHED */
+	}
+#ifdef _KERNEL
+	*hdr = malloc(alloc_size, type, flags);
+#else /* _KERNEL */
+	*hdr = malloc(alloc_size);
+#endif /*_KERNEL */
+	if (*hdr == NULL) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: unable to "
+				 "allocate %zu bytes", __func__, alloc_size);
+		}
+		retval = 1;
+		goto bailout;
+	}
+
+	*alloc_len = alloc_size;
+
+	bzero(*hdr, alloc_size);
+
+	switch (proto_id) {
+	case SCSI_PROTO_FC: {
+		struct scsi_transportid_fcp *fcp;
+
+		fcp = (struct scsi_transportid_fcp *)(*hdr);
+		fcp->format_protocol = SCSI_PROTO_FC |
+				       SCSI_TRN_FCP_FORMAT_DEFAULT;
+		scsi_u64to8b(value, fcp->n_port_name);
+		break;
+	}
+	case SCSI_PROTO_1394: {
+		struct scsi_transportid_1394 *sbp;
+
+		sbp = (struct scsi_transportid_1394 *)(*hdr);
+		sbp->format_protocol = SCSI_PROTO_1394 |
+				       SCSI_TRN_1394_FORMAT_DEFAULT;
+		scsi_u64to8b(value, sbp->eui64);
+		break;
+	}
+	case SCSI_PROTO_SAS: {
+		struct scsi_transportid_sas *sas;
+
+		sas = (struct scsi_transportid_sas *)(*hdr);
+		sas->format_protocol = SCSI_PROTO_SAS |
+				       SCSI_TRN_SAS_FORMAT_DEFAULT;
+		scsi_u64to8b(value, sas->sas_address);
+		break;
+	}
+	default:
+		break;
+	}
+bailout:
+	return (retval);
+}
+
+/*
+ * Parse a SPI (Parallel SCSI) address of the form: id,rel_tgt_port
+ */
+int
+scsi_parse_transportid_spi(char *id_str, struct scsi_transportid_header **hdr,
+			   unsigned int *alloc_len,
+#ifdef _KERNEL
+			   struct malloc_type *type, int flags,
+#endif
+			   char *error_str, int error_str_len)
+{
+	unsigned long scsi_addr, target_port;
+	struct scsi_transportid_spi *spi;
+	char *tmpstr, *endptr;
+	int retval;
+
+	retval = 0;
+
+	tmpstr = strsep(&id_str, ",");
+	if (tmpstr == NULL) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len,
+				 "%s: no ID found", __func__);
+		}
+		retval = 1;
+		goto bailout;
+	}
+	scsi_addr = strtoul(tmpstr, &endptr, 0);
+	if (*endptr != '\0') {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: error "
+				 "parsing SCSI ID %s, number required",
+				 __func__, tmpstr);
+		}
+		retval = 1;
+		goto bailout;
+	}
+
+	if (id_str == NULL) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: no relative "
+				 "target port found", __func__);
+		}
+		retval = 1;
+		goto bailout;
+	}
+
+	target_port = strtoul(id_str, &endptr, 0);
+	if (*endptr != '\0') {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: error "
+				 "parsing relative target port %s, number "
+				 "required", __func__, id_str);
+		}
+		retval = 1;
+		goto bailout;
+	}
+#ifdef _KERNEL
+	spi = malloc(sizeof(*spi), type, flags);
+#else
+	spi = malloc(sizeof(*spi));
+#endif
+	if (spi == NULL) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: unable to "
+				 "allocate %zu bytes", __func__,
+				 sizeof(*spi));
+		}
+		retval = 1;
+		goto bailout;
+	}
+	*alloc_len = sizeof(*spi);
+	bzero(spi, sizeof(*spi));
+
+	spi->format_protocol = SCSI_PROTO_SPI | SCSI_TRN_SPI_FORMAT_DEFAULT;
+	scsi_ulto2b(scsi_addr, spi->scsi_addr);
+	scsi_ulto2b(target_port, spi->rel_trgt_port_id);
+
+	*hdr = (struct scsi_transportid_header *)spi;
+bailout:
+	return (retval);
+}
+
+/*
+ * Parse an RDMA/SRP Initiator Port ID string.  This is 32 hexadecimal digits,
+ * optionally prefixed by "0x" or "0X".
+ */
+int
+scsi_parse_transportid_rdma(char *id_str, struct scsi_transportid_header **hdr,
+			    unsigned int *alloc_len,
+#ifdef _KERNEL
+			    struct malloc_type *type, int flags,
+#endif
+			    char *error_str, int error_str_len)
+{
+	struct scsi_transportid_rdma *rdma;
+	int retval;
+	size_t id_len, rdma_id_size;
+	uint8_t rdma_id[SCSI_TRN_RDMA_PORT_LEN];
+	char *tmpstr;
+	unsigned int i, j;
+
+	retval = 0;
+	id_len = strlen(id_str);
+	rdma_id_size = SCSI_TRN_RDMA_PORT_LEN;
+
+	/*
+	 * Check the size.  It needs to be either 32 or 34 characters long.
+	 */
+	if ((id_len != (rdma_id_size * 2))
+	 && (id_len != ((rdma_id_size * 2) + 2))) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: RDMA ID "
+				 "must be 32 hex digits (0x prefix "
+				 "optional), only %zu seen", __func__, id_len);
+		}
+		retval = 1;
+		goto bailout;
+	}
+
+	tmpstr = id_str;
+	/*
+	 * If the user gave us 34 characters, the string needs to start
+	 * with '0x'.
+	 */
+	if (id_len == ((rdma_id_size * 2) + 2)) {
+	 	if ((tmpstr[0] == '0')
+		 && ((tmpstr[1] == 'x') || (tmpstr[1] == 'X'))) {
+			tmpstr += 2;
+		} else {
+			if (error_str != NULL) {
+				snprintf(error_str, error_str_len, "%s: RDMA "
+					 "ID prefix, if used, must be \"0x\", "
+					 "got %s", __func__, tmpstr);
+			}
+			retval = 1;
+			goto bailout;
+		}
+	}
+	bzero(rdma_id, sizeof(rdma_id));
+
+	/*
+	 * Convert ASCII hex into binary bytes.  There is no standard
+	 * 128-bit integer type, and so no strtou128t() routine to convert
+	 * from hex into a large integer.  In the end, we're not going to
+	 * an integer, but rather to a byte array, so that and the fact
+	 * that we require the user to give us 32 hex digits simplifies the
+	 * logic.
+	 */
+	for (i = 0; i < (rdma_id_size * 2); i++) {
+		int cur_shift;
+		unsigned char c;
+
+		/* Increment the byte array one for every 2 hex digits */
+		j = i >> 1;
+
+		/*
+		 * The first digit in every pair is the most significant
+		 * 4 bits.  The second is the least significant 4 bits.
+		 */
+		if ((i % 2) == 0)
+			cur_shift = 4;
+		else 
+			cur_shift = 0;
+
+		c = tmpstr[i];
+		/* Convert the ASCII hex character into a number */
+		if (isdigit(c))
+			c -= '0';
+		else if (isalpha(c))
+			c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+		else {
+			if (error_str != NULL) {
+				snprintf(error_str, error_str_len, "%s: "
+					 "RDMA ID must be hex digits, got "
+					 "invalid character %c", __func__,
+					 tmpstr[i]);
+			}
+			retval = 1;
+			goto bailout;
+		}
+		/*
+		 * The converted number can't be less than 0; the type is
+		 * unsigned, and the subtraction logic will not give us 
+		 * a negative number.  So we only need to make sure that
+		 * the value is not greater than 0xf.  (i.e. make sure the
+		 * user didn't give us a value like "0x12jklmno").
+		 */
+		if (c > 0xf) {
+			if (error_str != NULL) {
+				snprintf(error_str, error_str_len, "%s: "
+					 "RDMA ID must be hex digits, got "
+					 "invalid character %c", __func__,
+					 tmpstr[i]);
+			}
+			retval = 1;
+			goto bailout;
+		}
+		
+		rdma_id[j] |= c << cur_shift;
+	}
+
+#ifdef _KERNEL
+	rdma = malloc(sizeof(*rdma), type, flags);
+#else
+	rdma = malloc(sizeof(*rdma));
+#endif
+	if (rdma == NULL) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: unable to "
+				 "allocate %zu bytes", __func__,
+				 sizeof(*rdma));
+		}
+		retval = 1;
+		goto bailout;
+	}
+	*alloc_len = sizeof(*rdma);
+	bzero(rdma, sizeof(rdma));
+
+	rdma->format_protocol = SCSI_PROTO_RDMA | SCSI_TRN_RDMA_FORMAT_DEFAULT;
+	bcopy(rdma_id, rdma->initiator_port_id, SCSI_TRN_RDMA_PORT_LEN);
+
+	*hdr = (struct scsi_transportid_header *)rdma;
+
+bailout:
+	return (retval);
+}
+
+/*
+ * Parse an iSCSI name.  The format is either just the name:
+ *
+ *	iqn.2012-06.com.example:target0
+ * or the name, separator and initiator session ID:
+ *
+ *	iqn.2012-06.com.example:target0,i,0x123
+ *
+ * The separator format is exact.
+ */
+int
+scsi_parse_transportid_iscsi(char *id_str, struct scsi_transportid_header **hdr,
+			     unsigned int *alloc_len,
+#ifdef _KERNEL
+			     struct malloc_type *type, int flags,
+#endif
+			     char *error_str, int error_str_len)
+{
+	size_t id_len, sep_len, id_size, name_len;
+	int retval;
+	unsigned int i, sep_pos, sep_found;
+	const char *sep_template = ",i,0x";
+	const char *iqn_prefix = "iqn.";
+	struct scsi_transportid_iscsi_device *iscsi;
+
+	retval = 0;
+	sep_found = 0;
+
+	id_len = strlen(id_str);
+	sep_len = strlen(sep_template);
+
+	/*
+	 * The separator is defined as exactly ',i,0x'.  Any other commas,
+	 * or any other form, is an error.  So look for a comma, and once
+	 * we find that, the next few characters must match the separator
+	 * exactly.  Once we get through the separator, there should be at
+	 * least one character.
+	 */
+	for (i = 0, sep_pos = 0; i < id_len; i++) {
+		if (sep_pos == 0) {
+		 	if (id_str[i] == sep_template[sep_pos])
+				sep_pos++;
+
+			continue;
+		}
+		if (sep_pos < sep_len) {
+			if (id_str[i] == sep_template[sep_pos]) {
+				sep_pos++;
+				continue;
+			} 
+			if (error_str != NULL) {
+				snprintf(error_str, error_str_len, "%s: "
+					 "invalid separator in iSCSI name "
+					 "\"%s\"",
+					 __func__, id_str);
+			}
+			retval = 1;
+			goto bailout;
+		} else {
+			sep_found = 1;
+			break;
+		}
+	}
+
+	/*
+	 * Check to see whether we have a separator but no digits after it.
+	 */
+	if ((sep_pos != 0)
+	 && (sep_found == 0)) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: no digits "
+				 "found after separator in iSCSI name \"%s\"",
+				 __func__, id_str);
+		}
+		retval = 1;
+		goto bailout;
+	}
+
+	/*
+	 * The incoming ID string has the "iqn." prefix stripped off.  We
+	 * need enough space for the base structure (the structures are the
+	 * same for the two iSCSI forms), the prefix, the ID string and a
+	 * terminating NUL.
+	 */
+	id_size = sizeof(*iscsi) + strlen(iqn_prefix) + id_len + 1;
+
+#ifdef _KERNEL
+	iscsi = malloc(id_size, type, flags);
+#else
+	iscsi = malloc(id_size);
+#endif
+	if (iscsi == NULL) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: unable to "
+				 "allocate %zu bytes", __func__, id_size);
+		}
+		retval = 1;
+		goto bailout;
+	}
+	*alloc_len = id_size;
+	bzero(iscsi, id_size);
+
+	iscsi->format_protocol = SCSI_PROTO_ISCSI;
+	if (sep_found == 0)
+		iscsi->format_protocol |= SCSI_TRN_ISCSI_FORMAT_DEVICE;
+	else
+		iscsi->format_protocol |= SCSI_TRN_ISCSI_FORMAT_PORT;
+	name_len = id_size - sizeof(*iscsi);
+	scsi_ulto2b(name_len, iscsi->additional_length);
+	snprintf(iscsi->iscsi_name, name_len, "%s%s", iqn_prefix, id_str);
+
+	*hdr = (struct scsi_transportid_header *)iscsi;
+
+bailout:
+	return (retval);
+}
+
+/*
+ * Parse a SCSI over PCIe (SOP) identifier.  The Routing ID can either be
+ * of the form 'bus,device,function' or 'bus,function'.
+ */
+int
+scsi_parse_transportid_sop(char *id_str, struct scsi_transportid_header **hdr,
+			   unsigned int *alloc_len,
+#ifdef _KERNEL
+			   struct malloc_type *type, int flags,
+#endif
+			   char *error_str, int error_str_len)
+{
+	struct scsi_transportid_sop *sop;
+	unsigned long bus, device, function;
+	char *tmpstr, *endptr;
+	int retval, device_spec;
+
+	retval = 0;
+	device_spec = 0;
+	device = 0;
+
+	tmpstr = strsep(&id_str, ",");
+	if ((tmpstr == NULL)
+	 || (*tmpstr == '\0')) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: no ID found",
+				 __func__);
+		}
+		retval = 1;
+		goto bailout;
+	}
+	bus = strtoul(tmpstr, &endptr, 0);
+	if (*endptr != '\0') {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: error "
+				 "parsing PCIe bus %s, number required",
+				 __func__, tmpstr);
+		}
+		retval = 1;
+		goto bailout;
+	}
+	if ((id_str == NULL) 
+	 || (*id_str == '\0')) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: no PCIe "
+				 "device or function found", __func__);
+		}
+		retval = 1;
+		goto bailout;
+	}
+	tmpstr = strsep(&id_str, ",");
+	function = strtoul(tmpstr, &endptr, 0);
+	if (*endptr != '\0') {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: error "
+				 "parsing PCIe device/function %s, number "
+				 "required", __func__, tmpstr);
+		}
+		retval = 1;
+		goto bailout;
+	}
+	/*
+	 * Check to see whether the user specified a third value.  If so,
+	 * the second is the device.
+	 */
+	if (id_str != NULL) {
+		if (*id_str == '\0') {
+			if (error_str != NULL) {
+				snprintf(error_str, error_str_len, "%s: "
+					 "no PCIe function found", __func__);
+			}
+			retval = 1;
+			goto bailout;
+		}
+		device = function;
+		device_spec = 1;
+		function = strtoul(id_str, &endptr, 0);
+		if (*endptr != '\0') {
+			if (error_str != NULL) {
+				snprintf(error_str, error_str_len, "%s: "
+					 "error parsing PCIe function %s, "
+					 "number required", __func__, id_str);
+			}
+			retval = 1;
+			goto bailout;
+		}
+	}
+	if (bus > SCSI_TRN_SOP_BUS_MAX) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: bus value "
+				 "%lu greater than maximum %u", __func__,
+				 bus, SCSI_TRN_SOP_BUS_MAX);
+		}
+		retval = 1;
+		goto bailout;
+	}
+
+	if ((device_spec != 0)
+	 && (device > SCSI_TRN_SOP_DEV_MASK)) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: device value "
+				 "%lu greater than maximum %u", __func__,
+				 device, SCSI_TRN_SOP_DEV_MAX);
+		}
+		retval = 1;
+		goto bailout;
+	}
+
+	if (((device_spec != 0)
+	  && (function > SCSI_TRN_SOP_FUNC_NORM_MAX))
+	 || ((device_spec == 0)
+	  && (function > SCSI_TRN_SOP_FUNC_ALT_MAX))) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: function value "
+				 "%lu greater than maximum %u", __func__,
+				 function, (device_spec == 0) ?
+				 SCSI_TRN_SOP_FUNC_ALT_MAX : 
+				 SCSI_TRN_SOP_FUNC_NORM_MAX);
+		}
+		retval = 1;
+		goto bailout;
+	}
+
+#ifdef _KERNEL
+	sop = malloc(sizeof(*sop), type, flags);
+#else
+	sop = malloc(sizeof(*sop));
+#endif
+	if (sop == NULL) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: unable to "
+				 "allocate %zu bytes", __func__, sizeof(*sop));
+		}
+		retval = 1;
+		goto bailout;
+	}
+	*alloc_len = sizeof(*sop);
+	bzero(sop, sizeof(*sop));
+	sop->format_protocol = SCSI_PROTO_SOP | SCSI_TRN_SOP_FORMAT_DEFAULT;
+	if (device_spec != 0) {
+		struct scsi_sop_routing_id_norm rid;
+
+		rid.bus = bus;
+		rid.devfunc = (device << SCSI_TRN_SOP_DEV_SHIFT) | function;
+		bcopy(&rid, sop->routing_id, MIN(sizeof(rid),
+		      sizeof(sop->routing_id)));
+	} else {
+		struct scsi_sop_routing_id_alt rid;
+
+		rid.bus = bus;
+		rid.function = function;
+		bcopy(&rid, sop->routing_id, MIN(sizeof(rid),
+		      sizeof(sop->routing_id)));
+	}
+
+	*hdr = (struct scsi_transportid_header *)sop;
+bailout:
+	return (retval);
+}
+
+/*
+ * transportid_str: NUL-terminated string with format: protcol,id
+ *		    The ID is protocol specific.
+ * hdr:		    Storage will be allocated for the transport ID.
+ * alloc_len:	    The amount of memory allocated is returned here.
+ * type:	    Malloc bucket (kernel only).
+ * flags:	    Malloc flags (kernel only).
+ * error_str:	    If non-NULL, it will contain error information (without
+ * 		    a terminating newline) if an error is returned.
+ * error_str_len:   Allocated length of the error string.
+ *
+ * Returns 0 for success, non-zero for failure.
+ */
+int
+scsi_parse_transportid(char *transportid_str,
+		       struct scsi_transportid_header **hdr,
+		       unsigned int *alloc_len,
+#ifdef _KERNEL
+		       struct malloc_type *type, int flags,
+#endif
+		       char *error_str, int error_str_len)
+{
+	char *tmpstr;
+	scsi_nv_status status;
+	int retval, num_proto_entries, table_entry;
+
+	retval = 0;
+	table_entry = 0;
+
+	/*
+	 * We do allow a period as well as a comma to separate the protocol
+	 * from the ID string.  This is to accommodate iSCSI names, which
+	 * start with "iqn.".
+	 */
+	tmpstr = strsep(&transportid_str, ",.");
+	if (tmpstr == NULL) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len,
+				 "%s: transportid_str is NULL", __func__);
+		}
+		retval = 1;
+		goto bailout;
+	}
+
+	num_proto_entries = sizeof(scsi_proto_map) /
+			    sizeof(scsi_proto_map[0]);
+	status = scsi_get_nv(scsi_proto_map, num_proto_entries, tmpstr,
+			     &table_entry, SCSI_NV_FLAG_IG_CASE);
+	if (status != SCSI_NV_FOUND) {
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: %s protocol "
+				 "name %s", __func__,
+				 (status == SCSI_NV_AMBIGUOUS) ? "ambiguous" :
+				 "invalid", tmpstr);
+		}
+		retval = 1;
+		goto bailout;
+	}
+	switch (scsi_proto_map[table_entry].value) {
+	case SCSI_PROTO_FC:
+	case SCSI_PROTO_1394:
+	case SCSI_PROTO_SAS:
+		retval = scsi_parse_transportid_64bit(
+		    scsi_proto_map[table_entry].value, transportid_str, hdr,
+		    alloc_len,
+#ifdef _KERNEL
+		    type, flags,
+#endif
+		    error_str, error_str_len);
+		break;
+	case SCSI_PROTO_SPI:
+		retval = scsi_parse_transportid_spi(transportid_str, hdr,
+		    alloc_len,
+#ifdef _KERNEL
+		    type, flags,
+#endif
+		    error_str, error_str_len);
+		break;
+	case SCSI_PROTO_RDMA:
+		retval = scsi_parse_transportid_rdma(transportid_str, hdr,
+		    alloc_len,
+#ifdef _KERNEL
+		    type, flags,
+#endif
+		    error_str, error_str_len);
+		break;
+	case SCSI_PROTO_ISCSI:
+		retval = scsi_parse_transportid_iscsi(transportid_str, hdr,
+		    alloc_len,
+#ifdef _KERNEL
+		    type, flags,
+#endif
+		    error_str, error_str_len);
+		break;
+	case SCSI_PROTO_SOP:
+		retval = scsi_parse_transportid_sop(transportid_str, hdr,
+		    alloc_len,
+#ifdef _KERNEL
+		    type, flags,
+#endif
+		    error_str, error_str_len);
+		break;
+	case SCSI_PROTO_SSA:
+	case SCSI_PROTO_ADITP:
+	case SCSI_PROTO_ATA:
+	case SCSI_PROTO_UAS:
+	case SCSI_PROTO_NONE:
+	default:
+		/*
+		 * There is no format defined for a Transport ID for these
+		 * protocols.  So even if the user gives us something, we
+		 * have no way to turn it into a standard SCSI Transport ID.
+		 */
+		retval = 1;
+		if (error_str != NULL) {
+			snprintf(error_str, error_str_len, "%s: no Transport "
+				 "ID format exists for protocol %s",
+				 __func__, tmpstr);
+		}
+		goto bailout;
+		break;	/* NOTREACHED */
+	}
+bailout:
+	return (retval);
+}
+
 void
 scsi_test_unit_ready(struct ccb_scsiio *csio, u_int32_t retries,
 		     void (*cbfcnp)(struct cam_periph *, union ccb *),
@@ -6409,6 +7399,63 @@ scsi_start_stop(struct ccb_scsiio *csio, u_int32_t retries,
 }
 
 
+void
+scsi_persistent_reserve_in(struct ccb_scsiio *csio, uint32_t retries, 
+			   void (*cbfcnp)(struct cam_periph *, union ccb *),
+			   uint8_t tag_action, int service_action,
+			   uint8_t *data_ptr, uint32_t dxfer_len, int sense_len,
+			   int timeout)
+{
+	struct scsi_per_res_in *scsi_cmd;
+
+	scsi_cmd = (struct scsi_per_res_in *)&csio->cdb_io.cdb_bytes;
+	bzero(scsi_cmd, sizeof(*scsi_cmd));
+
+	scsi_cmd->opcode = PERSISTENT_RES_IN;
+	scsi_cmd->action = service_action;
+	scsi_ulto2b(dxfer_len, scsi_cmd->length);
+
+	cam_fill_csio(csio,
+		      retries,
+		      cbfcnp,
+		      /*flags*/CAM_DIR_IN,
+		      tag_action,
+		      data_ptr,
+		      dxfer_len,
+		      sense_len,
+		      sizeof(*scsi_cmd),
+		      timeout);
+}
+
+void
+scsi_persistent_reserve_out(struct ccb_scsiio *csio, uint32_t retries, 
+			    void (*cbfcnp)(struct cam_periph *, union ccb *),
+			    uint8_t tag_action, int service_action,
+			    int scope, int res_type, uint8_t *data_ptr,
+			    uint32_t dxfer_len, int sense_len, int timeout)
+{
+	struct scsi_per_res_out *scsi_cmd;
+
+	scsi_cmd = (struct scsi_per_res_out *)&csio->cdb_io.cdb_bytes;
+	bzero(scsi_cmd, sizeof(*scsi_cmd));
+
+	scsi_cmd->opcode = PERSISTENT_RES_OUT;
+	scsi_cmd->action = service_action;
+	scsi_cmd->scope_type = scope | res_type;
+	scsi_ulto4b(dxfer_len, scsi_cmd->length);
+
+	cam_fill_csio(csio,
+		      retries,
+		      cbfcnp,
+		      /*flags*/CAM_DIR_OUT,
+		      tag_action,
+		      data_ptr,
+		      dxfer_len,
+		      sense_len,
+		      sizeof(*scsi_cmd),
+		      timeout);
+}
+
 /*      
  * Try make as good a match as possible with
  * available sub drivers
diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h
index 30b5ccb81cdc..010a4abcd2c0 100644
--- a/sys/cam/scsi/scsi_all.h
+++ b/sys/cam/scsi/scsi_all.h
@@ -278,6 +278,7 @@ struct scsi_per_res_in
 #define	SPRI_RS	0x03
 	u_int8_t reserved[5];
 	u_int8_t length[2];
+#define	SPRI_MAX_LEN		0xffff
 	u_int8_t control;
 };
 
@@ -302,13 +303,21 @@ struct scsi_per_res_cap
 {
 	uint8_t length[2];
 	uint8_t flags1;
-#define	SPRI_CRH	0x10
-#define	SPRI_SIP_C	0x08
-#define	SPRI_ATP_C	0x04
-#define	SPRI_PTPL_C	0x01
+#define	SPRI_RLR_C		0x80
+#define	SPRI_CRH		0x10
+#define	SPRI_SIP_C		0x08
+#define	SPRI_ATP_C		0x04
+#define	SPRI_PTPL_C		0x01
 	uint8_t flags2;
-#define	SPRI_TMV	0x80
-#define	SPRI_PTPL_A	0x01
+#define	SPRI_TMV		0x80
+#define	SPRI_ALLOW_CMD_MASK	0x70
+#define	SPRI_ALLOW_CMD_SHIFT	4
+#define	SPRI_ALLOW_NA		0x00
+#define	SPRI_ALLOW_1		0x10
+#define	SPRI_ALLOW_2		0x20
+#define	SPRI_ALLOW_3		0x30
+#define	SPRI_ALLOW_4		0x40
+#define	SPRI_PTPL_A		0x01
 	uint8_t type_mask[2];
 #define	SPRI_TM_WR_EX_AR	0x8000
 #define	SPRI_TM_EX_AC_RO	0x4000
@@ -322,7 +331,7 @@ struct scsi_per_res_cap
 struct scsi_per_res_in_rsrv_data
 {
 	uint8_t reservation[8];
-	uint8_t obsolete1[4];
+	uint8_t scope_addr[4];
 	uint8_t reserved;
 	uint8_t scopetype;
 #define	SPRT_WE    0x01
@@ -331,7 +340,7 @@ struct scsi_per_res_in_rsrv_data
 #define	SPRT_EARO  0x06
 #define	SPRT_WEAR  0x07
 #define	SPRT_EAAR  0x08
-	uint8_t obsolete2[2];
+	uint8_t extent_length[2];
 };
 
 struct scsi_per_res_in_rsrv
@@ -340,6 +349,26 @@ struct scsi_per_res_in_rsrv
 	struct scsi_per_res_in_rsrv_data data;
 };
 
+struct scsi_per_res_in_full_desc
+{
+	struct scsi_per_res_key res_key;
+	uint8_t reserved1[4];
+	uint8_t flags;
+#define	SPRI_FULL_ALL_TG_PT	0x02
+#define	SPRI_FULL_R_HOLDER	0x01
+	uint8_t scopetype;
+	uint8_t reserved2[4];
+	uint8_t rel_trgt_port_id[2];
+	uint8_t additional_length[4];
+	uint8_t transport_id[];
+};
+
+struct scsi_per_res_in_full
+{
+	struct scsi_per_res_in_header header;
+	struct scsi_per_res_in_full_desc desc[];
+};
+
 struct scsi_per_res_out
 {
 	u_int8_t opcode;
@@ -352,13 +381,20 @@ struct scsi_per_res_out
 #define	SPRO_PRE_ABO		0x05
 #define	SPRO_REG_IGNO		0x06
 #define	SPRO_REG_MOVE		0x07
+#define	SPRO_REPL_LOST_RES	0x08
 #define	SPRO_ACTION_MASK	0x1f
 	u_int8_t scope_type;
 #define	SPR_SCOPE_MASK		0xf0
+#define	SPR_SCOPE_SHIFT		4
 #define	SPR_LU_SCOPE		0x00
+#define	SPR_EXTENT_SCOPE	0x10
+#define	SPR_ELEMENT_SCOPE	0x20
 #define	SPR_TYPE_MASK		0x0f
+#define	SPR_TYPE_RD_SHARED	0x00
 #define	SPR_TYPE_WR_EX		0x01
+#define	SPR_TYPE_RD_EX		0x02
 #define	SPR_TYPE_EX_AC		0x03
+#define	SPR_TYPE_SHARED		0x04
 #define	SPR_TYPE_WR_EX_RO	0x05
 #define	SPR_TYPE_EX_AC_RO	0x06
 #define	SPR_TYPE_WR_EX_AR	0x07
@@ -372,15 +408,139 @@ struct scsi_per_res_out_parms
 {
 	struct scsi_per_res_key res_key;
 	u_int8_t serv_act_res_key[8];
-	u_int8_t obsolete1[4];
+	u_int8_t scope_spec_address[4];
 	u_int8_t flags;
 #define	SPR_SPEC_I_PT		0x08
 #define	SPR_ALL_TG_PT		0x04
 #define	SPR_APTPL		0x01
 	u_int8_t reserved1;
-	u_int8_t obsolete2[2];
+	u_int8_t extent_length[2];
+	u_int8_t transport_id_list[];
 };
 
+struct scsi_per_res_out_trans_ids {
+	u_int8_t additional_length[4];
+	u_int8_t transport_ids[];
+};
+
+/*
+ * Used with REGISTER AND MOVE serivce action of the PERSISTENT RESERVE OUT
+ * command.
+ */
+struct scsi_per_res_reg_move
+{
+	struct scsi_per_res_key res_key;
+	u_int8_t serv_act_res_key[8];
+	u_int8_t reserved;
+	u_int8_t flags;
+#define	SPR_REG_MOVE_UNREG	0x02
+#define	SPR_REG_MOVE_APTPL	0x01
+	u_int8_t rel_trgt_port_id[2];
+	u_int8_t transport_id_length[4];
+	u_int8_t transport_id[];
+};
+
+struct scsi_transportid_header
+{
+	uint8_t format_protocol;
+#define	SCSI_TRN_FORMAT_MASK		0xc0
+#define	SCSI_TRN_FORMAT_SHIFT		6
+#define	SCSI_TRN_PROTO_MASK		0x0f
+};
+
+struct scsi_transportid_fcp
+{
+	uint8_t format_protocol;
+#define	SCSI_TRN_FCP_FORMAT_DEFAULT	0x00
+	uint8_t reserved1[7];
+	uint8_t n_port_name[8];
+	uint8_t reserved2[8];
+};
+
+struct scsi_transportid_spi
+{
+	uint8_t format_protocol;
+#define	SCSI_TRN_SPI_FORMAT_DEFAULT	0x00
+	uint8_t reserved1;
+	uint8_t scsi_addr[2];
+	uint8_t obsolete[2];
+	uint8_t rel_trgt_port_id[2];
+	uint8_t reserved2[16];
+};
+
+struct scsi_transportid_1394
+{
+	uint8_t format_protocol;
+#define	SCSI_TRN_1394_FORMAT_DEFAULT	0x00
+	uint8_t reserved1[7];
+	uint8_t eui64[8];
+	uint8_t reserved2[8];
+};
+
+struct scsi_transportid_rdma
+{
+	uint8_t format_protocol;
+#define	SCSI_TRN_RDMA_FORMAT_DEFAULT	0x00
+	uint8_t reserved[7];
+#define	SCSI_TRN_RDMA_PORT_LEN		16
+	uint8_t initiator_port_id[SCSI_TRN_RDMA_PORT_LEN];
+};
+
+struct scsi_transportid_iscsi_device
+{
+	uint8_t format_protocol;
+#define	SCSI_TRN_ISCSI_FORMAT_DEVICE	0x00
+	uint8_t reserved;
+	uint8_t additional_length[2];
+	uint8_t iscsi_name[];
+};
+
+struct scsi_transportid_iscsi_port
+{
+	uint8_t format_protocol;
+#define	SCSI_TRN_ISCSI_FORMAT_PORT	0x40
+	uint8_t reserved;
+	uint8_t additional_length[2];
+	uint8_t iscsi_name[];
+	/*
+	 * Followed by a separator and iSCSI initiator session ID
+	 */
+};
+
+struct scsi_transportid_sas
+{
+	uint8_t format_protocol;
+#define	SCSI_TRN_SAS_FORMAT_DEFAULT	0x00
+	uint8_t reserved1[3];
+	uint8_t sas_address[8];
+	uint8_t reserved2[12];
+};
+
+struct scsi_sop_routing_id_norm {
+	uint8_t bus;
+	uint8_t devfunc;
+#define	SCSI_TRN_SOP_BUS_MAX		0xff
+#define	SCSI_TRN_SOP_DEV_MAX		0x1f
+#define	SCSI_TRN_SOP_DEV_MASK		0xf8
+#define	SCSI_TRN_SOP_DEV_SHIFT		3
+#define	SCSI_TRN_SOP_FUNC_NORM_MASK	0x07
+#define	SCSI_TRN_SOP_FUNC_NORM_MAX	0x07
+};
+
+struct scsi_sop_routing_id_alt {
+	uint8_t bus;
+	uint8_t function;
+#define	SCSI_TRN_SOP_FUNC_ALT_MAX	0xff
+};
+
+struct scsi_transportid_sop
+{
+	uint8_t format_protocol;
+#define	SCSI_TRN_SOP_FORMAT_DEFAULT	0x00
+	uint8_t reserved1;
+	uint8_t routing_id[2];
+	uint8_t reserved2[20];
+};
 
 struct scsi_log_sense
 {
@@ -470,15 +630,24 @@ struct scsi_control_page {
 #define	SCP_QUEUE_ALG_MASK		0xF0
 #define	SCP_QUEUE_ALG_RESTRICTED	0x00
 #define	SCP_QUEUE_ALG_UNRESTRICTED	0x10
+#define	SCP_NUAR			0x08	/*No UA on release*/
 #define	SCP_QUEUE_ERR			0x02	/*Queued I/O aborted for CACs*/
 #define	SCP_QUEUE_DQUE			0x01	/*Queued I/O disabled*/
 	u_int8_t eca_and_aen;
 #define	SCP_EECA			0x80	/*Enable Extended CA*/
+#define	SCP_RAC				0x40	/*Report a check*/
+#define	SCP_SWP				0x08	/*Software Write Protect*/
 #define	SCP_RAENP			0x04	/*Ready AEN Permission*/
 #define	SCP_UAAENP			0x02	/*UA AEN Permission*/
 #define	SCP_EAENP			0x01	/*Error AEN Permission*/
-	u_int8_t reserved;
+	u_int8_t flags4;
+#define	SCP_ATO				0x80	/*Application tag owner*/
+#define	SCP_TAS				0x40	/*Task aborted status*/
+#define	SCP_ATMPE			0x20	/*Application tag mode page*/
+#define	SCP_RWWP			0x10	/*Reject write without prot*/
 	u_int8_t aen_holdoff_period[2];
+	u_int8_t busy_timeout_period[2];
+	u_int8_t extended_selftest_completion_time[2];
 };
 
 struct scsi_cache_page {
@@ -597,21 +766,41 @@ struct scsi_info_exceptions_page {
 	u_int8_t report_count[4];
 };
 
+/*
+ * SCSI protocol identifier values, current as of SPC4r36l.
+ */
+#define	SCSI_PROTO_FC		0x00	/* Fibre Channel */
+#define	SCSI_PROTO_SPI		0x01	/* Parallel SCSI */
+#define	SCSI_PROTO_SSA		0x02	/* Serial Storage Arch. */
+#define	SCSI_PROTO_1394		0x03	/* IEEE 1394 (Firewire) */
+#define	SCSI_PROTO_RDMA		0x04	/* SCSI RDMA Protocol */
+#define	SCSI_PROTO_ISCSI	0x05	/* Internet SCSI */
+#define	SCSI_PROTO_iSCSI	0x05	/* Internet SCSI */
+#define	SCSI_PROTO_SAS		0x06	/* SAS Serial SCSI Protocol */
+#define	SCSI_PROTO_ADT		0x07	/* Automation/Drive Int. Trans. Prot.*/
+#define	SCSI_PROTO_ADITP	0x07	/* Automation/Drive Int. Trans. Prot.*/
+#define	SCSI_PROTO_ATA		0x08	/* AT Attachment Interface */
+#define	SCSI_PROTO_UAS		0x09	/* USB Atached SCSI */
+#define	SCSI_PROTO_SOP		0x0a	/* SCSI over PCI Express */
+#define	SCSI_PROTO_NONE		0x0f	/* No specific protocol */
+
 struct scsi_proto_specific_page {
 	u_int8_t page_code;
 #define	SPSP_PAGE_SAVABLE		0x80	/* Page is savable */
 	u_int8_t page_length;
 	u_int8_t protocol;
-#define	SPSP_PROTO_FC			0x00
-#define	SPSP_PROTO_SPI			0x01
-#define	SPSP_PROTO_SSA			0x02
-#define	SPSP_PROTO_1394			0x03
-#define	SPSP_PROTO_RDMA			0x04
-#define	SPSP_PROTO_ISCSI		0x05
-#define	SPSP_PROTO_SAS			0x06
-#define	SPSP_PROTO_ADT			0x07
-#define	SPSP_PROTO_ATA			0x08
-#define	SPSP_PROTO_NONE			0x0f
+#define	SPSP_PROTO_FC			SCSI_PROTO_FC
+#define	SPSP_PROTO_SPI			SCSI_PROTO_SPI
+#define	SPSP_PROTO_SSA			SCSI_PROTO_SSA
+#define	SPSP_PROTO_1394			SCSI_PROTO_1394
+#define	SPSP_PROTO_RDMA			SCSI_PROTO_RDMA
+#define	SPSP_PROTO_ISCSI		SCSI_PROTO_ISCSI
+#define	SPSP_PROTO_SAS			SCSI_PROTO_SAS
+#define	SPSP_PROTO_ADT			SCSI_PROTO_ADITP
+#define	SPSP_PROTO_ATA			SCSI_PROTO_ATA
+#define	SPSP_PROTO_UAS			SCSI_PROTO_UAS
+#define	SPSP_PROTO_SOP			SCSI_PROTO_SOP
+#define	SPSP_PROTO_NONE			SCSI_PROTO_NONE
 };
 
 struct scsi_reserve
@@ -746,12 +935,16 @@ struct scsi_read_buffer
 {
 	u_int8_t opcode;
 	u_int8_t byte2;
-#define	RWB_MODE		0x07
+#define	RWB_MODE		0x1F
 #define	RWB_MODE_HDR_DATA	0x00
 #define	RWB_MODE_VENDOR		0x01
 #define	RWB_MODE_DATA		0x02
+#define	RWB_MODE_DESCR		0x03
 #define	RWB_MODE_DOWNLOAD	0x04
 #define	RWB_MODE_DOWNLOAD_SAVE	0x05
+#define	RWB_MODE_ECHO		0x0A
+#define	RWB_MODE_ECHO_DESCR	0x0B
+#define	RWB_MODE_ERROR_HISTORY	0x1C
         u_int8_t buffer_id;
         u_int8_t offset[3];
         u_int8_t length[3];
@@ -968,6 +1161,482 @@ struct scsi_maintenance_in
 	uint8_t  control;
 };
 
+struct scsi_report_supported_opcodes
+{
+        uint8_t  opcode;
+        uint8_t  service_action;
+        uint8_t  options;
+#define RSO_RCTD		0x80
+#define RSO_OPTIONS_MASK	0x07
+#define RSO_OPTIONS_ALL		0x00
+#define RSO_OPTIONS_OC		0x01
+#define RSO_OPTIONS_OC_SA	0x02
+        uint8_t  requested_opcode;
+        uint8_t  requested_service_action[2];
+	uint8_t  length[4];
+	uint8_t  reserved1;
+	uint8_t  control;
+};
+
+struct scsi_report_supported_opcodes_timeout
+{
+	uint8_t  length[2];
+	uint8_t  reserved;
+	uint8_t  cmd_specific;
+	uint8_t  nominal_time[4];
+	uint8_t  recommended_time[4];
+};
+
+struct scsi_report_supported_opcodes_descr
+{
+	uint8_t  opcode;
+	uint8_t  reserved;
+	uint8_t  service_action[2];
+	uint8_t  reserved2;
+	uint8_t  flags;
+#define RSO_SERVACTV		0x01
+#define RSO_CTDP		0x02
+	uint8_t  cdb_length[2];
+	struct scsi_report_supported_opcodes_timeout timeout[0];
+};
+
+struct scsi_report_supported_opcodes_all
+{
+	uint8_t  length[4];
+	struct scsi_report_supported_opcodes_descr descr[0];
+};
+
+struct scsi_report_supported_opcodes_one
+{
+	uint8_t  reserved;
+	uint8_t  support;
+#define RSO_ONE_CTDP		0x80
+	uint8_t  cdb_length[2];
+	uint8_t  cdb_usage[];
+};
+
+struct scsi_report_supported_tmf
+{
+	uint8_t  opcode;
+	uint8_t  service_action;
+	uint8_t  reserved[4];
+	uint8_t  length[4];
+	uint8_t  reserved1;
+	uint8_t  control;
+};
+
+struct scsi_report_supported_tmf_data
+{
+	uint8_t  byte1;
+#define RST_WAKES		0x01
+#define RST_TRS			0x02
+#define RST_QTS			0x04
+#define RST_LURS		0x08
+#define RST_CTSS		0x10
+#define RST_CACAS		0x20
+#define RST_ATSS		0x40
+#define RST_ATS			0x80
+	uint8_t  byte2;
+#define RST_ITNRS		0x01
+#define RST_QTSS		0x02
+#define RST_QAES		0x04
+	uint8_t  reserved[2];
+};
+
+struct scsi_report_timestamp
+{
+	uint8_t  opcode;
+	uint8_t  service_action;
+	uint8_t  reserved[4];
+	uint8_t  length[4];
+	uint8_t  reserved1;
+	uint8_t  control;
+};
+
+struct scsi_report_timestamp_data
+{
+	uint8_t  length[2];
+	uint8_t  origin;
+#define RTS_ORIG_MASK		0x00
+#define RTS_ORIG_ZERO		0x00
+#define RTS_ORIG_SET		0x02
+#define RTS_ORIG_OUTSIDE	0x03
+	uint8_t  reserved;
+	uint8_t  timestamp[6];
+	uint8_t  reserve2[2];
+};
+
+struct scsi_receive_copy_status_lid1
+{
+	uint8_t  opcode;
+	uint8_t  service_action;
+#define RCS_RCS_LID1		0x00
+	uint8_t  list_identifier;
+	uint8_t  reserved[7];
+	uint8_t  length[4];
+	uint8_t  reserved1;
+	uint8_t  control;
+};
+
+struct scsi_receive_copy_status_lid1_data
+{
+	uint8_t  available_data[4];
+	uint8_t  copy_command_status;
+#define RCS_CCS_INPROG		0x00
+#define RCS_CCS_COMPLETED	0x01
+#define RCS_CCS_ERROR		0x02
+	uint8_t  segments_processed[2];
+	uint8_t  transfer_count_units;
+#define RCS_TC_BYTES		0x00
+#define RCS_TC_KBYTES		0x01
+#define RCS_TC_MBYTES		0x02
+#define RCS_TC_GBYTES		0x03
+#define RCS_TC_TBYTES		0x04
+#define RCS_TC_PBYTES		0x05
+#define RCS_TC_EBYTES		0x06
+#define RCS_TC_LBAS		0xf1
+	uint8_t  transfer_count[4];
+};
+
+struct scsi_receive_copy_failure_details
+{
+	uint8_t  opcode;
+	uint8_t  service_action;
+#define RCS_RCFD		0x04
+	uint8_t  list_identifier;
+	uint8_t  reserved[7];
+	uint8_t  length[4];
+	uint8_t  reserved1;
+	uint8_t  control;
+};
+
+struct scsi_receive_copy_failure_details_data
+{
+	uint8_t  available_data[4];
+	uint8_t  reserved[52];
+	uint8_t  copy_command_status;
+	uint8_t  reserved2;
+	uint8_t  sense_data_length[2];
+	uint8_t  sense_data[];
+};
+
+struct scsi_receive_copy_status_lid4
+{
+	uint8_t  opcode;
+	uint8_t  service_action;
+#define RCS_RCS_LID4		0x05
+	uint8_t  list_identifier[4];
+	uint8_t  reserved[4];
+	uint8_t  length[4];
+	uint8_t  reserved1;
+	uint8_t  control;
+};
+
+struct scsi_receive_copy_status_lid4_data
+{
+	uint8_t  available_data[4];
+	uint8_t  response_to_service_action;
+	uint8_t  copy_command_status;
+#define RCS_CCS_COMPLETED_PROD	0x03
+#define RCS_CCS_COMPLETED_RESID	0x04
+#define RCS_CCS_INPROG_FGBG	0x10
+#define RCS_CCS_INPROG_FG	0x11
+#define RCS_CCS_INPROG_BG	0x12
+#define RCS_CCS_ABORTED		0x60
+	uint8_t  operation_counter[2];
+	uint8_t  estimated_status_update_delay[4];
+	uint8_t  extended_copy_completion_status;
+	uint8_t  length_of_the_sense_data_field;
+	uint8_t  sense_data_length;
+	uint8_t  transfer_count_units;
+	uint8_t  transfer_count[8];
+	uint8_t  segments_processed[2];
+	uint8_t  reserved[6];
+	uint8_t  sense_data[];
+};
+
+struct scsi_receive_copy_operating_parameters
+{
+	uint8_t  opcode;
+	uint8_t  service_action;
+#define RCS_RCOP		0x03
+	uint8_t  reserved[8];
+	uint8_t  length[4];
+	uint8_t  reserved1;
+	uint8_t  control;
+};
+
+struct scsi_receive_copy_operating_parameters_data
+{
+	uint8_t  length[4];
+	uint8_t  snlid;
+#define RCOP_SNLID		0x01
+	uint8_t  reserved[3];
+	uint8_t  maximum_cscd_descriptor_count[2];
+	uint8_t  maximum_segment_descriptor_count[2];
+	uint8_t  maximum_descriptor_list_length[4];
+	uint8_t  maximum_segment_length[4];
+	uint8_t  maximum_inline_data_length[4];
+	uint8_t  held_data_limit[4];
+	uint8_t  maximum_stream_device_transfer_size[4];
+	uint8_t  reserved2[2];
+	uint8_t  total_concurrent_copies[2];
+	uint8_t  maximum_concurrent_copies;
+	uint8_t  data_segment_granularity;
+	uint8_t  inline_data_granularity;
+	uint8_t  held_data_granularity;
+	uint8_t  reserved3[3];
+	uint8_t  implemented_descriptor_list_length;
+	uint8_t  list_of_implemented_descriptor_type_codes[0];
+};
+
+struct scsi_extended_copy
+{
+	uint8_t  opcode;
+	uint8_t  service_action;
+#define EC_EC_LID1		0x00
+#define EC_EC_LID4		0x01
+	uint8_t  reserved[8];
+	uint8_t  length[4];
+	uint8_t  reserved1;
+	uint8_t  control;
+};
+
+struct scsi_ec_cscd_dtsp
+{
+	uint8_t  flags;
+#define EC_CSCD_FIXED		0x01
+#define EC_CSCD_PAD		0x04
+	uint8_t  block_length[3];
+};
+
+struct scsi_ec_cscd
+{
+	uint8_t  type_code;
+#define EC_CSCD_EXT		0xff
+	uint8_t  luidt_pdt;
+#define EC_LUIDT_MASK		0xc0
+#define EC_LUIDT_LUN		0x00
+#define EC_LUIDT_PROXY_TOKEN	0x40
+	uint8_t  relative_initiator_port[2];
+	uint8_t  cscd_params[24];
+	struct scsi_ec_cscd_dtsp dtsp;
+};
+
+struct scsi_ec_cscd_id
+{
+	uint8_t  type_code;
+#define EC_CSCD_ID		0xe4
+	uint8_t  luidt_pdt;
+	uint8_t  relative_initiator_port[2];
+	uint8_t  codeset;
+	uint8_t  id_type;
+	uint8_t  reserved;
+	uint8_t  length;
+	uint8_t  designator[20];
+	struct scsi_ec_cscd_dtsp dtsp;
+};
+
+struct scsi_ec_segment
+{
+	uint8_t  type_code;
+	uint8_t  flags;
+#define EC_SEG_DC		0x02
+#define EC_SEG_CAT		0x01
+	uint8_t  descr_length[2];
+	uint8_t  params[];
+};
+
+struct scsi_ec_segment_b2b
+{
+	uint8_t  type_code;
+#define EC_SEG_B2B		0x02
+	uint8_t  flags;
+	uint8_t  descr_length[2];
+	uint8_t  src_cscd[2];
+	uint8_t  dst_cscd[2];
+	uint8_t  reserved[2];
+	uint8_t  number_of_blocks[2];
+	uint8_t  src_lba[8];
+	uint8_t  dst_lba[8];
+};
+
+struct scsi_ec_segment_verify
+{
+	uint8_t  type_code;
+#define EC_SEG_VERIFY		0x07
+	uint8_t  reserved;
+	uint8_t  descr_length[2];
+	uint8_t  src_cscd[2];
+	uint8_t  reserved2[2];
+	uint8_t  tur;
+	uint8_t  reserved3[3];
+};
+
+struct scsi_ec_segment_register_key
+{
+	uint8_t  type_code;
+#define EC_SEG_REGISTER_KEY	0x14
+	uint8_t  reserved;
+	uint8_t  descr_length[2];
+	uint8_t  reserved2[2];
+	uint8_t  dst_cscd[2];
+	uint8_t  res_key[8];
+	uint8_t  sa_res_key[8];
+	uint8_t  reserved3[4];
+};
+
+struct scsi_extended_copy_lid1_data
+{
+	uint8_t  list_identifier;
+	uint8_t  flags;
+#define EC_PRIORITY		0x07
+#define EC_LIST_ID_USAGE_MASK	0x18
+#define EC_LIST_ID_USAGE_FULL	0x08
+#define EC_LIST_ID_USAGE_NOHOLD	0x10
+#define EC_LIST_ID_USAGE_NONE	0x18
+#define EC_STR			0x20
+	uint8_t  cscd_list_length[2];
+	uint8_t  reserved[4];
+	uint8_t  segment_list_length[4];
+	uint8_t  inline_data_length[4];
+	uint8_t  data[];
+};
+
+struct scsi_extended_copy_lid4_data
+{
+	uint8_t  list_format;
+#define EC_LIST_FORMAT		0x01
+	uint8_t  flags;
+	uint8_t  header_cscd_list_length[2];
+	uint8_t  reserved[11];
+	uint8_t  flags2;
+#define EC_IMMED		0x01
+#define EC_G_SENSE		0x02
+	uint8_t  header_cscd_type_code;
+	uint8_t  reserved2[3];
+	uint8_t  list_identifier[4];
+	uint8_t  reserved3[18];
+	uint8_t  cscd_list_length[2];
+	uint8_t  segment_list_length[2];
+	uint8_t  inline_data_length[2];
+	uint8_t  data[];
+};
+
+struct scsi_copy_operation_abort
+{
+	uint8_t  opcode;
+	uint8_t  service_action;
+#define EC_COA			0x1c
+	uint8_t  list_identifier[4];
+	uint8_t  reserved[9];
+	uint8_t  control;
+};
+
+struct scsi_populate_token
+{
+	uint8_t  opcode;
+	uint8_t  service_action;
+#define EC_PT			0x10
+	uint8_t  reserved[4];
+	uint8_t  list_identifier[4];
+	uint8_t  length[4];
+	uint8_t  group_number;
+	uint8_t  control;
+};
+
+struct scsi_range_desc
+{
+	uint8_t	lba[8];
+	uint8_t	length[4];
+	uint8_t	reserved[4];
+};
+
+struct scsi_populate_token_data
+{
+	uint8_t  length[2];
+	uint8_t  flags;
+#define EC_PT_IMMED			0x01
+#define EC_PT_RTV			0x02
+	uint8_t  reserved;
+	uint8_t  inactivity_timeout[4];
+	uint8_t  rod_type[4];
+	uint8_t  reserved2[2];
+	uint8_t  range_descriptor_length[2];
+	struct scsi_range_desc desc[];
+};
+
+struct scsi_write_using_token
+{
+	uint8_t  opcode;
+	uint8_t  service_action;
+#define EC_WUT			0x11
+	uint8_t  reserved[4];
+	uint8_t  list_identifier[4];
+	uint8_t  length[4];
+	uint8_t  group_number;
+	uint8_t  control;
+};
+
+struct scsi_write_using_token_data
+{
+	uint8_t  length[2];
+	uint8_t  flags;
+#define EC_WUT_IMMED			0x01
+#define EC_WUT_DEL_TKN			0x02
+	uint8_t  reserved[5];
+	uint8_t  offset_into_rod[8];
+	uint8_t  rod_token[512];
+	uint8_t  reserved2[6];
+	uint8_t  range_descriptor_length[2];
+	struct scsi_range_desc desc[];
+};
+
+struct scsi_receive_rod_token_information
+{
+	uint8_t  opcode;
+	uint8_t  service_action;
+#define RCS_RRTI		0x07
+	uint8_t  list_identifier[4];
+	uint8_t  reserved[4];
+	uint8_t  length[4];
+	uint8_t  reserved2;
+	uint8_t  control;
+};
+
+struct scsi_token
+{
+	uint8_t  type[4];
+#define ROD_TYPE_INTERNAL	0x00000000
+#define ROD_TYPE_AUR		0x00001000
+#define ROD_TYPE_PIT_DEF	0x00080000
+#define ROD_TYPE_PIT_VULN	0x00080001
+#define ROD_TYPE_PIT_PERS	0x00080002
+#define ROD_TYPE_PIT_ANY	0x0008FFFF
+#define ROD_TYPE_BLOCK_ZERO	0xFFFF0001
+	uint8_t  reserved[2];
+	uint8_t  length[2];
+	uint8_t  body[0];
+};
+
+struct scsi_report_all_rod_tokens
+{
+	uint8_t  opcode;
+	uint8_t  service_action;
+#define RCS_RART		0x08
+	uint8_t  reserved[8];
+	uint8_t  length[4];
+	uint8_t  reserved2;
+	uint8_t  control;
+};
+
+struct scsi_report_all_rod_tokens_data
+{
+	uint8_t  available_data[4];
+	uint8_t  reserved[4];
+	uint8_t  rod_management_token_list[];
+};
+
 struct ata_pass_16 {
 	u_int8_t opcode;
 	u_int8_t protocol;
@@ -1039,10 +1708,14 @@ struct ata_pass_16 {
 #define	MODE_SENSE_10		0x5A
 #define	PERSISTENT_RES_IN	0x5E
 #define	PERSISTENT_RES_OUT	0x5F
+#define	EXTENDED_COPY		0x83
+#define	RECEIVE_COPY_STATUS	0x84
 #define	ATA_PASS_16		0x85
 #define	READ_16			0x88
+#define	COMPARE_AND_WRITE	0x89
 #define	WRITE_16		0x8A
 #define	WRITE_VERIFY_16		0x8E
+#define	VERIFY_16		0x8F
 #define	SYNCHRONIZE_CACHE_16	0x91
 #define	WRITE_SAME_16		0x93
 #define	SERVICE_ACTION_IN	0x9E
@@ -1054,6 +1727,7 @@ struct ata_pass_16 {
 #define	READ_12			0xA8
 #define	WRITE_12		0xAA
 #define	WRITE_VERIFY_12		0xAE
+#define	VERIFY_12		0xAF
 #define	READ_ELEMENT_STATUS	0xB8
 #define	READ_CD			0xBE
 
@@ -1149,7 +1823,9 @@ struct scsi_inquiry_data
 #define	SID_QUAL_IS_VENDOR_UNIQUE(inq_data) ((SID_QUAL(inq_data) & 0x08) != 0)
 	u_int8_t dev_qual2;
 #define	SID_QUAL2	0x7F
-#define	SID_IS_REMOVABLE(inq_data) (((inq_data)->dev_qual2 & 0x80) != 0)
+#define	SID_LU_CONG	0x40
+#define	SID_RMB		0x80
+#define	SID_IS_REMOVABLE(inq_data) (((inq_data)->dev_qual2 & SID_RMB) != 0)
 	u_int8_t version;
 #define	SID_ANSI_REV(inq_data) ((inq_data)->version & 0x07)
 #define		SCSI_REV_0		0
@@ -1297,15 +1973,9 @@ struct scsi_vpd_device_id
 struct scsi_vpd_id_descriptor
 {
 	u_int8_t	proto_codeset;
-#define	SCSI_PROTO_FC		0x00
-#define	SCSI_PROTO_SPI		0x01
-#define	SCSI_PROTO_SSA		0x02
-#define	SCSI_PROTO_1394		0x03
-#define	SCSI_PROTO_RDMA		0x04
-#define	SCSI_PROTO_ISCSI	0x05
-#define	SCSI_PROTO_SAS		0x06
-#define	SCSI_PROTO_ADT		0x07
-#define	SCSI_PROTO_ATA		0x08
+	/*
+	 * See the SCSI_PROTO definitions above for the protocols.
+	 */
 #define	SVPD_ID_PROTO_SHIFT	4
 #define	SVPD_ID_CODESET_BINARY	0x01
 #define	SVPD_ID_CODESET_ASCII	0x02
@@ -1447,12 +2117,179 @@ struct scsi_diag_page {
 	uint8_t params[0];
 };
 
+struct scsi_vpd_port_designation
+{
+	uint8_t reserved[2];
+	uint8_t relative_port_id[2];
+	uint8_t reserved2[2];
+	uint8_t initiator_transportid_length[2];
+	uint8_t initiator_transportid[0];
+};
+
+struct scsi_vpd_port_designation_cont
+{
+	uint8_t reserved[2];
+	uint8_t target_port_descriptors_length[2];
+	struct scsi_vpd_id_descriptor target_port_descriptors[0];
+};
+
+struct scsi_vpd_scsi_ports
+{
+	u_int8_t device;
+	u_int8_t page_code;
+#define	SVPD_SCSI_PORTS		0x88
+	u_int8_t page_length[2];
+	struct scsi_vpd_port_designation design[];
+};
+
 /*
  * ATA Information VPD Page based on
  * T10/2126-D Revision 04
  */
 #define SVPD_ATA_INFORMATION		0x89
 
+
+struct scsi_vpd_tpc_descriptor
+{
+	uint8_t desc_type[2];
+	uint8_t desc_length[2];
+	uint8_t parameters[];
+};
+
+struct scsi_vpd_tpc_descriptor_bdrl
+{
+	uint8_t desc_type[2];
+#define	SVPD_TPC_BDRL			0x0000
+	uint8_t desc_length[2];
+	uint8_t vendor_specific[6];
+	uint8_t maximum_ranges[2];
+	uint8_t maximum_inactivity_timeout[4];
+	uint8_t default_inactivity_timeout[4];
+	uint8_t maximum_token_transfer_size[8];
+	uint8_t optimal_transfer_count[8];
+};
+
+struct scsi_vpd_tpc_descriptor_sc_descr
+{
+	uint8_t opcode;
+	uint8_t sa_length;
+	uint8_t supported_service_actions[0];
+};
+
+struct scsi_vpd_tpc_descriptor_sc
+{
+	uint8_t desc_type[2];
+#define	SVPD_TPC_SC			0x0001
+	uint8_t desc_length[2];
+	uint8_t list_length;
+	struct scsi_vpd_tpc_descriptor_sc_descr descr[];
+};
+
+struct scsi_vpd_tpc_descriptor_pd
+{
+	uint8_t desc_type[2];
+#define	SVPD_TPC_PD			0x0004
+	uint8_t desc_length[2];
+	uint8_t reserved[4];
+	uint8_t maximum_cscd_descriptor_count[2];
+	uint8_t maximum_segment_descriptor_count[2];
+	uint8_t maximum_descriptor_list_length[4];
+	uint8_t maximum_inline_data_length[4];
+	uint8_t reserved2[12];
+};
+
+struct scsi_vpd_tpc_descriptor_sd
+{
+	uint8_t desc_type[2];
+#define	SVPD_TPC_SD			0x0008
+	uint8_t desc_length[2];
+	uint8_t list_length;
+	uint8_t supported_descriptor_codes[];
+};
+
+struct scsi_vpd_tpc_descriptor_sdid
+{
+	uint8_t desc_type[2];
+#define	SVPD_TPC_SDID			0x000C
+	uint8_t desc_length[2];
+	uint8_t list_length[2];
+	uint8_t supported_descriptor_ids[];
+};
+
+struct scsi_vpd_tpc_descriptor_rtf_block
+{
+	uint8_t type_format;
+#define	SVPD_TPC_RTF_BLOCK			0x00
+	uint8_t reserved;
+	uint8_t desc_length[2];
+	uint8_t reserved2[2];
+	uint8_t optimal_length_granularity[2];
+	uint8_t maximum_bytes[8];
+	uint8_t optimal_bytes[8];
+	uint8_t optimal_bytes_to_token_per_segment[8];
+	uint8_t optimal_bytes_from_token_per_segment[8];
+	uint8_t reserved3[8];
+};
+
+struct scsi_vpd_tpc_descriptor_rtf
+{
+	uint8_t desc_type[2];
+#define	SVPD_TPC_RTF			0x0106
+	uint8_t desc_length[2];
+	uint8_t remote_tokens;
+	uint8_t reserved[11];
+	uint8_t minimum_token_lifetime[4];
+	uint8_t maximum_token_lifetime[4];
+	uint8_t maximum_token_inactivity_timeout[4];
+	uint8_t reserved2[18];
+	uint8_t type_specific_features_length[2];
+	uint8_t type_specific_features[0];
+};
+
+struct scsi_vpd_tpc_descriptor_srtd
+{
+	uint8_t rod_type[4];
+	uint8_t flags;
+#define	SVPD_TPC_SRTD_TOUT		0x01
+#define	SVPD_TPC_SRTD_TIN		0x02
+#define	SVPD_TPC_SRTD_ECPY		0x80
+	uint8_t reserved;
+	uint8_t preference_indicator[2];
+	uint8_t reserved2[56];
+};
+
+struct scsi_vpd_tpc_descriptor_srt
+{
+	uint8_t desc_type[2];
+#define	SVPD_TPC_SRT			0x0108
+	uint8_t desc_length[2];
+	uint8_t reserved[2];
+	uint8_t rod_type_descriptors_length[2];
+	uint8_t rod_type_descriptors[0];
+};
+
+struct scsi_vpd_tpc_descriptor_gco
+{
+	uint8_t desc_type[2];
+#define	SVPD_TPC_GCO			0x8001
+	uint8_t desc_length[2];
+	uint8_t total_concurrent_copies[4];
+	uint8_t maximum_identified_concurrent_copies[4];
+	uint8_t maximum_segment_length[4];
+	uint8_t data_segment_granularity;
+	uint8_t inline_data_granularity;
+	uint8_t reserved[18];
+};
+
+struct scsi_vpd_tpc
+{
+	uint8_t device;
+	uint8_t page_code;
+#define	SVPD_SCSI_TPC			0x8F
+	uint8_t page_length[2];
+	struct scsi_vpd_tpc_descriptor descr[];
+};
+
 /*
  * Block Device Characteristics VPD Page based on
  * T10/1799-D Revision 31
@@ -1477,6 +2314,27 @@ struct scsi_vpd_block_characteristics
 	u_int8_t reserved2[56];
 };
 
+/*
+ * Block Device Characteristics VPD Page
+ */
+struct scsi_vpd_block_device_characteristics
+{
+	uint8_t device;
+	uint8_t page_code;
+#define	SVPD_BDC		0xB1
+	uint8_t page_length[2];
+	uint8_t medium_rotation_rate[2];
+#define	SVPD_NOT_REPORTED	0x0000
+#define	SVPD_NON_ROTATING	0x0001
+	uint8_t product_type;
+	uint8_t wab_wac_ff;
+	uint8_t flags;
+#define	SVPD_VBULS		0x01
+#define	SVPD_FUAB		0x02
+#define	SVPD_HAW_ZBC		0x10
+	uint8_t reserved[55];
+};
+
 /*
  * Logical Block Provisioning VPD Page based on
  * T10/1799-D Revision 31
@@ -1637,8 +2495,9 @@ struct scsi_target_group
 {
 	uint8_t opcode;
 	uint8_t service_action;
+#define	STG_PDF_MASK		0xe0
 #define	STG_PDF_LENGTH		0x00
-#define	RPL_PDF_EXTENDED	0x20
+#define	STG_PDF_EXTENDED	0x20
 	uint8_t reserved1[4];
 	uint8_t length[4];
 	uint8_t reserved2;
@@ -1688,7 +2547,7 @@ struct scsi_target_group_data {
 
 struct scsi_target_group_data_extended {
 	uint8_t length[4];	/* length of returned data, in bytes */
-	uint8_t format_type;	/* STG_PDF_LENGTH or RPL_PDF_EXTENDED */
+	uint8_t format_type;	/* STG_PDF_LENGTH or STG_PDF_EXTENDED */
 	uint8_t	implicit_transition_time;
 	uint8_t reserved[2];
 	struct scsi_target_port_group_descriptor groups[];
@@ -2202,6 +3061,22 @@ typedef enum {
 	SSS_FLAG_PRINT_COMMAND	= 0x01
 } scsi_sense_string_flags;
 
+struct scsi_nv {
+	const char *name;
+	uint64_t value;
+};
+
+typedef enum {
+	SCSI_NV_FOUND,
+	SCSI_NV_AMBIGUOUS,
+	SCSI_NV_NOT_FOUND
+} scsi_nv_status;
+
+typedef enum {
+	SCSI_NV_FLAG_NONE	= 0x00,
+	SCSI_NV_FLAG_IG_CASE	= 0x01	/* Case insensitive comparison */
+} scsi_nv_flags;
+
 struct ccb_scsiio;
 struct cam_periph;
 union  ccb;
@@ -2342,6 +3217,67 @@ int		scsi_devid_is_lun_t10(uint8_t *bufp);
 struct scsi_vpd_id_descriptor *
 		scsi_get_devid(struct scsi_vpd_device_id *id, uint32_t len,
 			       scsi_devid_checkfn_t ck_fn);
+struct scsi_vpd_id_descriptor *
+		scsi_get_devid_desc(struct scsi_vpd_id_descriptor *desc, uint32_t len,
+			       scsi_devid_checkfn_t ck_fn);
+
+int		scsi_transportid_sbuf(struct sbuf *sb,
+				      struct scsi_transportid_header *hdr,
+				      uint32_t valid_len);
+
+const char *	scsi_nv_to_str(struct scsi_nv *table, int num_table_entries,
+			       uint64_t value);
+
+scsi_nv_status	scsi_get_nv(struct scsi_nv *table, int num_table_entries,
+			    char *name, int *table_entry, scsi_nv_flags flags);
+
+int	scsi_parse_transportid_64bit(int proto_id, char *id_str,
+				     struct scsi_transportid_header **hdr,
+				     unsigned int *alloc_len,
+#ifdef _KERNEL
+				     struct malloc_type *type, int flags,
+#endif
+				     char *error_str, int error_str_len);
+
+int	scsi_parse_transportid_spi(char *id_str,
+				   struct scsi_transportid_header **hdr,
+				   unsigned int *alloc_len,
+#ifdef _KERNEL
+				   struct malloc_type *type, int flags,
+#endif
+				   char *error_str, int error_str_len);
+
+int	scsi_parse_transportid_rdma(char *id_str,
+				    struct scsi_transportid_header **hdr,
+				    unsigned int *alloc_len,
+#ifdef _KERNEL
+				    struct malloc_type *type, int flags,
+#endif
+				    char *error_str, int error_str_len);
+
+int	scsi_parse_transportid_iscsi(char *id_str,
+				     struct scsi_transportid_header **hdr,
+				     unsigned int *alloc_len,
+#ifdef _KERNEL
+				     struct malloc_type *type, int flags,
+#endif
+				     char *error_str,int error_str_len);
+
+int	scsi_parse_transportid_sop(char *id_str,
+				   struct scsi_transportid_header **hdr,
+				   unsigned int *alloc_len,
+#ifdef _KERNEL
+				   struct malloc_type *type, int flags,
+#endif
+				   char *error_str,int error_str_len);
+
+int	scsi_parse_transportid(char *transportid_str,
+			       struct scsi_transportid_header **hdr,
+			       unsigned int *alloc_len,
+#ifdef _KERNEL
+			       struct malloc_type *type, int flags,
+#endif
+			       char *error_str, int error_str_len);
 
 void		scsi_test_unit_ready(struct ccb_scsiio *csio, u_int32_t retries,
 				     void (*cbfcnp)(struct cam_periph *, 
@@ -2538,6 +3474,20 @@ void scsi_start_stop(struct ccb_scsiio *csio, u_int32_t retries,
 		     u_int8_t tag_action, int start, int load_eject,
 		     int immediate, u_int8_t sense_len, u_int32_t timeout);
 
+void scsi_persistent_reserve_in(struct ccb_scsiio *csio, uint32_t retries, 
+				void (*cbfcnp)(struct cam_periph *,union ccb *),
+				uint8_t tag_action, int service_action,
+				uint8_t *data_ptr, uint32_t dxfer_len,
+				int sense_len, int timeout);
+
+void scsi_persistent_reserve_out(struct ccb_scsiio *csio, uint32_t retries, 
+				 void (*cbfcnp)(struct cam_periph *,
+				       union ccb *),
+				 uint8_t tag_action, int service_action,
+				 int scope, int res_type, uint8_t *data_ptr,
+				 uint32_t dxfer_len, int sense_len,
+				 int timeout);
+
 int		scsi_inquiry_match(caddr_t inqbuffer, caddr_t table_entry);
 int		scsi_static_inquiry_match(caddr_t inqbuffer,
 					  caddr_t table_entry);
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index 81c29a6fb54c..47a5a438d294 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -277,15 +277,12 @@ static int cd_retry_count = CD_DEFAULT_RETRY;
 static int cd_timeout = CD_DEFAULT_TIMEOUT;
 
 static SYSCTL_NODE(_kern_cam, OID_AUTO, cd, CTLFLAG_RD, 0, "CAM CDROM driver");
-SYSCTL_INT(_kern_cam_cd, OID_AUTO, poll_period, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_cd, OID_AUTO, poll_period, CTLFLAG_RWTUN,
            &cd_poll_period, 0, "Media polling period in seconds");
-TUNABLE_INT("kern.cam.cd.poll_period", &cd_poll_period);
-SYSCTL_INT(_kern_cam_cd, OID_AUTO, retry_count, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_cd, OID_AUTO, retry_count, CTLFLAG_RWTUN,
            &cd_retry_count, 0, "Normal I/O retry count");
-TUNABLE_INT("kern.cam.cd.retry_count", &cd_retry_count);
-SYSCTL_INT(_kern_cam_cd, OID_AUTO, timeout, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_cd, OID_AUTO, timeout, CTLFLAG_RWTUN,
 	   &cd_timeout, 0, "Timeout, in us, for read operations");
-TUNABLE_INT("kern.cam.cd.timeout", &cd_timeout);
 
 static MALLOC_DEFINE(M_SCSICD, "scsi_cd", "scsi_cd buffers");
 
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 1a0757702035..0b1f8d595e36 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -1188,18 +1188,14 @@ static int da_send_ordered = DA_DEFAULT_SEND_ORDERED;
 
 static SYSCTL_NODE(_kern_cam, OID_AUTO, da, CTLFLAG_RD, 0,
             "CAM Direct Access Disk driver");
-SYSCTL_INT(_kern_cam_da, OID_AUTO, poll_period, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_da, OID_AUTO, poll_period, CTLFLAG_RWTUN,
            &da_poll_period, 0, "Media polling period in seconds");
-TUNABLE_INT("kern.cam.da.poll_period", &da_poll_period);
-SYSCTL_INT(_kern_cam_da, OID_AUTO, retry_count, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_da, OID_AUTO, retry_count, CTLFLAG_RWTUN,
            &da_retry_count, 0, "Normal I/O retry count");
-TUNABLE_INT("kern.cam.da.retry_count", &da_retry_count);
-SYSCTL_INT(_kern_cam_da, OID_AUTO, default_timeout, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_da, OID_AUTO, default_timeout, CTLFLAG_RWTUN,
            &da_default_timeout, 0, "Normal I/O timeout (in seconds)");
-TUNABLE_INT("kern.cam.da.default_timeout", &da_default_timeout);
-SYSCTL_INT(_kern_cam_da, OID_AUTO, send_ordered, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_da, OID_AUTO, send_ordered, CTLFLAG_RWTUN,
            &da_send_ordered, 0, "Send Ordered Tags");
-TUNABLE_INT("kern.cam.da.send_ordered", &da_send_ordered);
 
 /*
  * DA_ORDEREDTAG_INTERVAL determines how often, relative
diff --git a/sys/cam/scsi/scsi_da.h b/sys/cam/scsi/scsi_da.h
index 4fbd7256af91..a27b17325b1e 100644
--- a/sys/cam/scsi/scsi_da.h
+++ b/sys/cam/scsi/scsi_da.h
@@ -222,18 +222,49 @@ struct scsi_read_format_capacities
 	uint8_t	reserved1[3];
 };
 
-struct scsi_verify
+struct scsi_verify_10
 {
-	uint8_t	opcode;		/* VERIFY */
+	uint8_t	opcode;		/* VERIFY(10) */
 	uint8_t	byte2;
 #define	SVFY_LUN_MASK	0xE0
 #define	SVFY_RELADR	0x01
-#define	SVFY_BYTECHK	0x02
+#define	SVFY_BYTCHK	0x02
 #define	SVFY_DPO	0x10
 	uint8_t	addr[4];	/* LBA to begin verification at */
-	uint8_t	reserved0[1];
-	uint8_t	len[2];		/* number of blocks to verify */
-	uint8_t	reserved1[3];
+	uint8_t	group;
+	uint8_t	length[2];		/* number of blocks to verify */
+	uint8_t	control;
+};
+
+struct scsi_verify_12
+{
+	uint8_t	opcode;		/* VERIFY(12) */
+	uint8_t	byte2;
+	uint8_t	addr[4];	/* LBA to begin verification at */
+	uint8_t	length[4];		/* number of blocks to verify */
+	uint8_t	group;
+	uint8_t	control;
+};
+
+struct scsi_verify_16
+{
+	uint8_t	opcode;		/* VERIFY(16) */
+	uint8_t	byte2;
+	uint8_t	addr[8];	/* LBA to begin verification at */
+	uint8_t	length[4];		/* number of blocks to verify */
+	uint8_t	group;
+	uint8_t	control;
+};
+
+struct scsi_compare_and_write
+{
+	uint8_t	opcode;		/* COMPARE AND WRITE */
+	uint8_t	byte2;
+	uint8_t	addr[8];	/* LBA to begin verification at */
+	uint8_t	reserved[3];
+	uint8_t	length;		/* number of blocks */
+	uint8_t	group;
+	uint8_t	control;
 };
 
 struct scsi_write_and_verify
diff --git a/sys/cam/scsi/scsi_enc_safte.c b/sys/cam/scsi/scsi_enc_safte.c
index 8282d013bb58..89f70a5ada23 100644
--- a/sys/cam/scsi/scsi_enc_safte.c
+++ b/sys/cam/scsi/scsi_enc_safte.c
@@ -226,9 +226,8 @@ static char *safte_2little = "Too Little Data Returned (%d) at line %d\n";
 
 int emulate_array_devices = 1;
 SYSCTL_DECL(_kern_cam_enc);
-SYSCTL_INT(_kern_cam_enc, OID_AUTO, emulate_array_devices, CTLFLAG_RW,
+SYSCTL_INT(_kern_cam_enc, OID_AUTO, emulate_array_devices, CTLFLAG_RWTUN,
            &emulate_array_devices, 0, "Emulate Array Devices for SAF-TE");
-TUNABLE_INT("kern.cam.enc.emulate_array_devices", &emulate_array_devices);
 
 static int
 safte_fill_read_buf_io(enc_softc_t *enc, struct enc_fsm_state *state,
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index c1cd0f0bfdf6..c5284cd9b734 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -113,16 +113,8 @@ typedef enum {
 #define ccb_pflags	ppriv_field0
 #define ccb_bp	 	ppriv_ptr1
 
-#define	SA_CCB_BUFFER_IO	0x0
-#define	SA_CCB_TYPEMASK		0x1
-#define	SA_POSITION_UPDATED	0x2
-
-#define	Set_CCB_Type(x, type)				\
-	x->ccb_h.ccb_pflags &= ~SA_CCB_TYPEMASK;	\
-	x->ccb_h.ccb_pflags |= type
-
-#define	CCB_Type(x)	(x->ccb_h.ccb_pflags & SA_CCB_TYPEMASK)
-
+/* bits in ccb_pflags */
+#define	SA_POSITION_UPDATED	0x1
 
 
 typedef enum {
@@ -445,9 +437,10 @@ static int sa_allow_io_split = SA_DEFAULT_IO_SPLIT;
  * is bad behavior, because it hides the true tape block size from the
  * application.
  */
-TUNABLE_INT("kern.cam.sa.allow_io_split", &sa_allow_io_split);
 static SYSCTL_NODE(_kern_cam, OID_AUTO, sa, CTLFLAG_RD, 0,
 		  "CAM Sequential Access Tape Driver");
+SYSCTL_INT(_kern_cam_sa, OID_AUTO, allow_io_split, CTLFLAG_RDTUN,
+    &sa_allow_io_split, 0, "Default I/O split value");
 
 static struct periph_driver sadriver =
 {
@@ -1494,7 +1487,7 @@ sasysctlinit(void *context, int pending)
 		goto bailout;
 
 	SYSCTL_ADD_INT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),
-	    OID_AUTO, "allow_io_split", CTLTYPE_INT | CTLFLAG_RDTUN, 
+	    OID_AUTO, "allow_io_split", CTLTYPE_INT | CTLFLAG_RDTUN | CTLFLAG_NOFETCH, 
 	    &softc->allow_io_split, 0, "Allow Splitting I/O");
 	SYSCTL_ADD_INT(&softc->sysctl_ctx, SYSCTL_CHILDREN(softc->sysctl_tree),
 	    OID_AUTO, "maxio", CTLTYPE_INT | CTLFLAG_RD, 
@@ -1834,7 +1827,6 @@ sastart(struct cam_periph *periph, union ccb *start_ccb)
 			    bp->bio_data, bp->bio_bcount, SSD_FULL_SIZE,
 			    IO_TIMEOUT);
 			start_ccb->ccb_h.ccb_pflags &= ~SA_POSITION_UPDATED;
-			Set_CCB_Type(start_ccb, SA_CCB_BUFFER_IO);
 			start_ccb->ccb_h.ccb_bp = bp;
 			bp = bioq_first(&softc->bio_queue);
 			xpt_action(start_ccb);
@@ -1859,92 +1851,86 @@ sadone(struct cam_periph *periph, union ccb *done_ccb)
 {
 	struct sa_softc *softc;
 	struct ccb_scsiio *csio;
+	struct bio *bp;
+	int error;
 
 	softc = (struct sa_softc *)periph->softc;
 	csio = &done_ccb->csio;
-	switch (CCB_Type(csio)) {
-	case SA_CCB_BUFFER_IO:
-	{
-		struct bio *bp;
-		int error;
-
-		softc->dsreg = MTIO_DSREG_REST;
-		bp = (struct bio *)done_ccb->ccb_h.ccb_bp;
-		error = 0;
-		if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
-			if ((error = saerror(done_ccb, 0, 0)) == ERESTART) {
-				/*
-				 * A retry was scheduled, so just return.
-				 */
-				return;
-			}
-		}
-
-		if (error == EIO) {
 
+	softc->dsreg = MTIO_DSREG_REST;
+	bp = (struct bio *)done_ccb->ccb_h.ccb_bp;
+	error = 0;
+	if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
+		if ((error = saerror(done_ccb, 0, 0)) == ERESTART) {
 			/*
-			 * Catastrophic error. Mark the tape as frozen
-			 * (we no longer know tape position).
-			 *
-			 * Return all queued I/O with EIO, and unfreeze
-			 * our queue so that future transactions that
-			 * attempt to fix this problem can get to the
-			 * device.
-			 *
+			 * A retry was scheduled, so just return.
 			 */
+			return;
+		}
+	}
+
+	if (error == EIO) {
 
-			softc->flags |= SA_FLAG_TAPE_FROZEN;
-			bioq_flush(&softc->bio_queue, NULL, EIO);
-		}
-		if (error != 0) {
-			bp->bio_resid = bp->bio_bcount;
-			bp->bio_error = error;
-			bp->bio_flags |= BIO_ERROR;
-			/*
-			 * In the error case, position is updated in saerror.
-			 */
-		} else {
-			bp->bio_resid = csio->resid;
-			bp->bio_error = 0;
-			if (csio->resid != 0) {
-				bp->bio_flags |= BIO_ERROR;
-			}
-			if (bp->bio_cmd == BIO_WRITE) {
-				softc->flags |= SA_FLAG_TAPE_WRITTEN;
-				softc->filemarks = 0;
-			}
-			if (!(csio->ccb_h.ccb_pflags & SA_POSITION_UPDATED) &&
-			    (softc->blkno != (daddr_t) -1)) {
-				if ((softc->flags & SA_FLAG_FIXED) != 0) {
-					u_int32_t l;
-					if (softc->blk_shift != 0) {
-						l = bp->bio_bcount >>
-							softc->blk_shift;
-					} else {
-						l = bp->bio_bcount /
-							softc->media_blksize;
-					}
-					softc->blkno += (daddr_t) l;
-				} else {
-					softc->blkno++;
-				}
-			}
-		}
 		/*
-		 * If we had an error (immediate or pending),
-		 * release the device queue now.
+		 * Catastrophic error. Mark the tape as frozen
+		 * (we no longer know tape position).
+		 *
+		 * Return all queued I/O with EIO, and unfreeze
+		 * our queue so that future transactions that
+		 * attempt to fix this problem can get to the
+		 * device.
+		 *
 		 */
-		if (error || (softc->flags & SA_FLAG_ERR_PENDING))
-			cam_release_devq(done_ccb->ccb_h.path, 0, 0, 0, 0);
-		if (error || bp->bio_resid) {
-			CAM_DEBUG(periph->path, CAM_DEBUG_INFO,
-			    	  ("error %d resid %ld count %ld\n", error,
-				  bp->bio_resid, bp->bio_bcount));
+
+		softc->flags |= SA_FLAG_TAPE_FROZEN;
+		bioq_flush(&softc->bio_queue, NULL, EIO);
+	}
+	if (error != 0) {
+		bp->bio_resid = bp->bio_bcount;
+		bp->bio_error = error;
+		bp->bio_flags |= BIO_ERROR;
+		/*
+		 * In the error case, position is updated in saerror.
+		 */
+	} else {
+		bp->bio_resid = csio->resid;
+		bp->bio_error = 0;
+		if (csio->resid != 0) {
+			bp->bio_flags |= BIO_ERROR;
+		}
+		if (bp->bio_cmd == BIO_WRITE) {
+			softc->flags |= SA_FLAG_TAPE_WRITTEN;
+			softc->filemarks = 0;
+		}
+		if (!(csio->ccb_h.ccb_pflags & SA_POSITION_UPDATED) &&
+		    (softc->blkno != (daddr_t) -1)) {
+			if ((softc->flags & SA_FLAG_FIXED) != 0) {
+				u_int32_t l;
+				if (softc->blk_shift != 0) {
+					l = bp->bio_bcount >>
+						softc->blk_shift;
+				} else {
+					l = bp->bio_bcount /
+						softc->media_blksize;
+				}
+				softc->blkno += (daddr_t) l;
+			} else {
+				softc->blkno++;
+			}
 		}
-		biofinish(bp, softc->device_stats, 0);
-		break;
 	}
+	/*
+	 * If we had an error (immediate or pending),
+	 * release the device queue now.
+	 */
+	if (error || (softc->flags & SA_FLAG_ERR_PENDING))
+		cam_release_devq(done_ccb->ccb_h.path, 0, 0, 0, 0);
+	if (error || bp->bio_resid) {
+		CAM_DEBUG(periph->path, CAM_DEBUG_INFO,
+		    	  ("error %d resid %ld count %ld\n", error,
+			  bp->bio_resid, bp->bio_bcount));
 	}
+	biofinish(bp, softc->device_stats, 0);
 	xpt_release_ccb(done_ccb);
 }
 
@@ -2497,7 +2483,8 @@ saerror(union ccb *ccb, u_int32_t cflgs, u_int32_t sflgs)
 					info /= softc->media_blksize;
 			}
 		}
-		if (CCB_Type(csio) == SA_CCB_BUFFER_IO) {
+		if (csio->cdb_io.cdb_bytes[0] == SA_READ ||
+		    csio->cdb_io.cdb_bytes[0] == SA_WRITE) {
 			bcopy((caddr_t) sense, (caddr_t) &softc->last_io_sense,
 			    sizeof (struct scsi_sense_data));
 			bcopy(csio->cdb_io.cdb_bytes, softc->last_io_cdb,
diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c
index 942f7121cf5a..42b8774fd88a 100644
--- a/sys/cam/scsi/scsi_xpt.c
+++ b/sys/cam/scsi/scsi_xpt.c
@@ -78,9 +78,8 @@ struct scsi_quirk_entry {
 #define SCSI_QUIRK(dev)	((struct scsi_quirk_entry *)((dev)->quirk))
 
 static int cam_srch_hi = 0;
-TUNABLE_INT("kern.cam.cam_srch_hi", &cam_srch_hi);
 static int sysctl_cam_search_luns(SYSCTL_HANDLER_ARGS);
-SYSCTL_PROC(_kern_cam, OID_AUTO, cam_srch_hi, CTLTYPE_INT|CTLFLAG_RW, 0, 0,
+SYSCTL_PROC(_kern_cam, OID_AUTO, cam_srch_hi, CTLTYPE_INT | CTLFLAG_RWTUN, 0, 0,
     sysctl_cam_search_luns, "I",
     "allow search above LUN 7 for SCSI3 and greater devices");
 
diff --git a/sys/cddl/boot/zfs/README b/sys/cddl/boot/zfs/README
index f7c045dab5d0..5f16d5cddf26 100644
--- a/sys/cddl/boot/zfs/README
+++ b/sys/cddl/boot/zfs/README
@@ -7,9 +7,10 @@ are used by the ZFS bootstrap:
     sha256.c			checksum support
     lz4.c			compression support
     lzjb.c			compression support
+    blkptr.c			ZFS embedded-data block pointers support
     zfssubr.c			checksum, compression and raidz support
     zfsimpl.h			mostly describing the physical layout
 
-The files fletcher.c, lzjb.c and sha256.c are largely identical to the
-ZFS base code (with write support removed) and could be shared but
-that might complicate future imports from OpenSolaris.
+The files fletcher.c, lzjb.c, lz4.c, sha256.c and blkptr.c are largely identical
+to the ZFS base code (with write support removed) and could be shared but that
+might complicate future imports from Illumos.
diff --git a/sys/cddl/boot/zfs/blkptr.c b/sys/cddl/boot/zfs/blkptr.c
new file mode 100644
index 000000000000..c36c59bbe884
--- /dev/null
+++ b/sys/cddl/boot/zfs/blkptr.c
@@ -0,0 +1,73 @@
+/*
+ * CDDL HEADER START
+ *
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ */
+
+/*
+ * Embedded-data Block Pointers
+ *
+ * Normally, block pointers point (via their DVAs) to a block which holds data.
+ * If the data that we need to store is very small, this is an inefficient
+ * use of space, because a block must be at minimum 1 sector (typically 512
+ * bytes or 4KB).  Additionally, reading these small blocks tends to generate
+ * more random reads.
+ *
+ * Embedded-data Block Pointers allow small pieces of data (the "payload",
+ * up to 112 bytes) to be stored in the block pointer itself, instead of
+ * being pointed to.  The "Pointer" part of this name is a bit of a
+ * misnomer, as nothing is pointed to.
+ *
+ * BP_EMBEDDED_TYPE_DATA block pointers allow highly-compressible data to
+ * be embedded in the block pointer.  The logic for this is handled in
+ * the SPA, by the zio pipeline.  Therefore most code outside the zio
+ * pipeline doesn't need special-cases to handle these block pointers.
+ *
+ * See spa.h for details on the exact layout of embedded block pointers.
+ */
+
+/*
+ * buf must be at least BPE_GET_PSIZE(bp) bytes long (which will never be
+ * more than BPE_PAYLOAD_SIZE bytes).
+ */
+void
+decode_embedded_bp_compressed(const blkptr_t *bp, void *buf)
+{
+	int psize;
+	uint8_t *buf8 = buf;
+	uint64_t w = 0;
+	const uint64_t *bp64 = (const uint64_t *)bp;
+
+	ASSERT(BP_IS_EMBEDDED(bp));
+
+	psize = BPE_GET_PSIZE(bp);
+
+	/*
+	 * Decode the words of the block pointer into the byte array.
+	 * Low bits of first word are the first byte (little endian).
+	 */
+	for (int i = 0; i < psize; i++) {
+		if (i % sizeof (w) == 0) {
+			/* beginning of a word */
+			ASSERT3P(bp64, <, bp + 1);
+			w = *bp64;
+			bp64++;
+			if (!BPE_IS_PAYLOADWORD(bp, bp64))
+				bp64++;
+		}
+		buf8[i] = BF64_GET(w, (i % sizeof (w)) * NBBY, NBBY);
+	}
+}
diff --git a/sys/cddl/boot/zfs/zfsimpl.h b/sys/cddl/boot/zfs/zfsimpl.h
index 7bc4c433de16..98f54791ae26 100644
--- a/sys/cddl/boot/zfs/zfsimpl.h
+++ b/sys/cddl/boot/zfs/zfsimpl.h
@@ -55,9 +55,14 @@
 /*
  * Copyright 2013 by Saso Kiselkov. All rights reserved.
  */
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ */
 
 #define	MAXNAMELEN	256
 
+#define _NOTE(s)
+
 /* CRC64 table */
 #define	ZFS_CRC64_POLY	0xC96C5795D7870F42ULL	/* ECMA-182, reflected form */
 
@@ -163,7 +168,7 @@ typedef struct zio_cksum {
  *	+-------+-------+-------+-------+-------+-------+-------+-------+
  * 5	|G|			 offset3				|
  *	+-------+-------+-------+-------+-------+-------+-------+-------+
- * 6	|BDX|lvl| type	| cksum | comp	|     PSIZE	|     LSIZE	|
+ * 6	|BDX|lvl| type	| cksum |E| comp|    PSIZE	|     LSIZE	|
  *	+-------+-------+-------+-------+-------+-------+-------+-------+
  * 7	|			padding					|
  *	+-------+-------+-------+-------+-------+-------+-------+-------+
@@ -197,7 +202,8 @@ typedef struct zio_cksum {
  * G		gang block indicator
  * B		byteorder (endianness)
  * D		dedup
- * X		unused
+ * X		encryption (on version 30, which is not supported)
+ * E		blkptr_t contains embedded data (see below)
  * lvl		level of indirection
  * type		DMU object type
  * phys birth	txg of block allocation; zero if same as logical birth txg
@@ -205,6 +211,100 @@ typedef struct zio_cksum {
  * fill count	number of non-zero blocks under this bp
  * checksum[4]	256-bit checksum of the data this bp describes
  */
+
+/*
+ * "Embedded" blkptr_t's don't actually point to a block, instead they
+ * have a data payload embedded in the blkptr_t itself.  See the comment
+ * in blkptr.c for more details.
+ *
+ * The blkptr_t is laid out as follows:
+ *
+ *	64	56	48	40	32	24	16	8	0
+ *	+-------+-------+-------+-------+-------+-------+-------+-------+
+ * 0	|      payload                                                  |
+ * 1	|      payload                                                  |
+ * 2	|      payload                                                  |
+ * 3	|      payload                                                  |
+ * 4	|      payload                                                  |
+ * 5	|      payload                                                  |
+ *	+-------+-------+-------+-------+-------+-------+-------+-------+
+ * 6	|BDX|lvl| type	| etype |E| comp| PSIZE|              LSIZE	|
+ *	+-------+-------+-------+-------+-------+-------+-------+-------+
+ * 7	|      payload                                                  |
+ * 8	|      payload                                                  |
+ * 9	|      payload                                                  |
+ *	+-------+-------+-------+-------+-------+-------+-------+-------+
+ * a	|			logical birth txg			|
+ *	+-------+-------+-------+-------+-------+-------+-------+-------+
+ * b	|      payload                                                  |
+ * c	|      payload                                                  |
+ * d	|      payload                                                  |
+ * e	|      payload                                                  |
+ * f	|      payload                                                  |
+ *	+-------+-------+-------+-------+-------+-------+-------+-------+
+ *
+ * Legend:
+ *
+ * payload		contains the embedded data
+ * B (byteorder)	byteorder (endianness)
+ * D (dedup)		padding (set to zero)
+ * X			encryption (set to zero; see above)
+ * E (embedded)		set to one
+ * lvl			indirection level
+ * type			DMU object type
+ * etype		how to interpret embedded data (BP_EMBEDDED_TYPE_*)
+ * comp			compression function of payload
+ * PSIZE		size of payload after compression, in bytes
+ * LSIZE		logical size of payload, in bytes
+ *			note that 25 bits is enough to store the largest
+ *			"normal" BP's LSIZE (2^16 * 2^9) in bytes
+ * log. birth		transaction group in which the block was logically born
+ *
+ * Note that LSIZE and PSIZE are stored in bytes, whereas for non-embedded
+ * bp's they are stored in units of SPA_MINBLOCKSHIFT.
+ * Generally, the generic BP_GET_*() macros can be used on embedded BP's.
+ * The B, D, X, lvl, type, and comp fields are stored the same as with normal
+ * BP's so the BP_SET_* macros can be used with them.  etype, PSIZE, LSIZE must
+ * be set with the BPE_SET_* macros.  BP_SET_EMBEDDED() should be called before
+ * other macros, as they assert that they are only used on BP's of the correct
+ * "embedded-ness".
+ */
+
+#define	BPE_GET_ETYPE(bp)	\
+	(ASSERT(BP_IS_EMBEDDED(bp)), \
+	BF64_GET((bp)->blk_prop, 40, 8))
+#define	BPE_SET_ETYPE(bp, t)	do { \
+	ASSERT(BP_IS_EMBEDDED(bp)); \
+	BF64_SET((bp)->blk_prop, 40, 8, t); \
+_NOTE(CONSTCOND) } while (0)
+
+#define	BPE_GET_LSIZE(bp)	\
+	(ASSERT(BP_IS_EMBEDDED(bp)), \
+	BF64_GET_SB((bp)->blk_prop, 0, 25, 0, 1))
+#define	BPE_SET_LSIZE(bp, x)	do { \
+	ASSERT(BP_IS_EMBEDDED(bp)); \
+	BF64_SET_SB((bp)->blk_prop, 0, 25, 0, 1, x); \
+_NOTE(CONSTCOND) } while (0)
+
+#define	BPE_GET_PSIZE(bp)	\
+	(ASSERT(BP_IS_EMBEDDED(bp)), \
+	BF64_GET_SB((bp)->blk_prop, 25, 7, 0, 1))
+#define	BPE_SET_PSIZE(bp, x)	do { \
+	ASSERT(BP_IS_EMBEDDED(bp)); \
+	BF64_SET_SB((bp)->blk_prop, 25, 7, 0, 1, x); \
+_NOTE(CONSTCOND) } while (0)
+
+typedef enum bp_embedded_type {
+	BP_EMBEDDED_TYPE_DATA,
+	BP_EMBEDDED_TYPE_RESERVED, /* Reserved for an unintegrated feature. */
+	NUM_BP_EMBEDDED_TYPES = BP_EMBEDDED_TYPE_RESERVED
+} bp_embedded_type_t;
+
+#define	BPE_NUM_WORDS 14
+#define	BPE_PAYLOAD_SIZE (BPE_NUM_WORDS * sizeof (uint64_t))
+#define	BPE_IS_PAYLOADWORD(bp, wp) \
+	((wp) != &(bp)->blk_prop && (wp) != &(bp)->blk_birth)
+
 #define	SPA_BLKPTRSHIFT	7		/* blkptr_t is 128 bytes	*/
 #define	SPA_DVAS_PER_BP	3		/* Number of DVAs in a bp	*/
 
@@ -242,18 +342,22 @@ typedef struct blkptr {
 #define	DVA_SET_GANG(dva, x)	BF64_SET((dva)->dva_word[1], 63, 1, x)
 
 #define	BP_GET_LSIZE(bp)	\
-	(BP_IS_HOLE(bp) ? 0 : \
+	(BP_IS_EMBEDDED(bp) ?	\
+	(BPE_GET_ETYPE(bp) == BP_EMBEDDED_TYPE_DATA ? BPE_GET_LSIZE(bp) : 0): \
 	BF64_GET_SB((bp)->blk_prop, 0, SPA_LSIZEBITS, SPA_MINBLOCKSHIFT, 1))
-#define	BP_SET_LSIZE(bp, x)	\
-	BF64_SET_SB((bp)->blk_prop, 0, SPA_LSIZEBITS, SPA_MINBLOCKSHIFT, 1, x)
+#define	BP_SET_LSIZE(bp, x)	do { \
+	ASSERT(!BP_IS_EMBEDDED(bp)); \
+	BF64_SET_SB((bp)->blk_prop, \
+	    0, SPA_LSIZEBITS, SPA_MINBLOCKSHIFT, 1, x); \
+_NOTE(CONSTCOND) } while (0)
 
 #define	BP_GET_PSIZE(bp)	\
 	BF64_GET_SB((bp)->blk_prop, 16, SPA_LSIZEBITS, SPA_MINBLOCKSHIFT, 1)
 #define	BP_SET_PSIZE(bp, x)	\
 	BF64_SET_SB((bp)->blk_prop, 16, SPA_LSIZEBITS, SPA_MINBLOCKSHIFT, 1, x)
 
-#define	BP_GET_COMPRESS(bp)	BF64_GET((bp)->blk_prop, 32, 8)
-#define	BP_SET_COMPRESS(bp, x)	BF64_SET((bp)->blk_prop, 32, 8, x)
+#define	BP_GET_COMPRESS(bp)	BF64_GET((bp)->blk_prop, 32, 7)
+#define	BP_SET_COMPRESS(bp, x)	BF64_SET((bp)->blk_prop, 32, 7, x)
 
 #define	BP_GET_CHECKSUM(bp)	BF64_GET((bp)->blk_prop, 40, 8)
 #define	BP_SET_CHECKSUM(bp, x)	BF64_SET((bp)->blk_prop, 40, 8, x)
@@ -264,6 +368,8 @@ typedef struct blkptr {
 #define	BP_GET_LEVEL(bp)	BF64_GET((bp)->blk_prop, 56, 5)
 #define	BP_SET_LEVEL(bp, x)	BF64_SET((bp)->blk_prop, 56, 5, x)
 
+#define	BP_IS_EMBEDDED(bp)	BF64_GET((bp)->blk_prop, 39, 1)
+
 #define	BP_GET_DEDUP(bp)	BF64_GET((bp)->blk_prop, 62, 1)
 #define	BP_SET_DEDUP(bp, x)	BF64_SET((bp)->blk_prop, 62, 1, x)
 
@@ -331,6 +437,11 @@ typedef struct blkptr {
 	ZIO_SET_CHECKSUM(&(bp)->blk_cksum, 0, 0, 0, 0);	\
 }
 
+#define	BPE_NUM_WORDS 14
+#define	BPE_PAYLOAD_SIZE (BPE_NUM_WORDS * sizeof (uint64_t))
+#define	BPE_IS_PAYLOADWORD(bp, wp) \
+	((wp) != &(bp)->blk_prop && (wp) != &(bp)->blk_birth)
+
 /*
  * Embedded checksum
  */
@@ -1341,3 +1452,5 @@ typedef struct spa {
 	objset_phys_t	spa_mos;	/* MOS for this pool */
 	int		spa_inited;	/* initialized */
 } spa_t;
+
+static void decode_embedded_bp_compressed(const blkptr_t *, void *);
diff --git a/sys/cddl/boot/zfs/zfssubr.c b/sys/cddl/boot/zfs/zfssubr.c
index 0f018487bcab..a64f065ad164 100644
--- a/sys/cddl/boot/zfs/zfssubr.c
+++ b/sys/cddl/boot/zfs/zfssubr.c
@@ -30,9 +30,11 @@ static uint64_t zfs_crc64_table[256];
 
 #define	ECKSUM	666
 
-#define	ASSERT(...)	do { } while (0)
-#define	ASSERT3U(...)	do { } while (0)
-#define	ASSERT3S(...)	do { } while (0)
+#define	ASSERT3S(x, y, z)	((void)0)
+#define	ASSERT3U(x, y, z)	((void)0)
+#define	ASSERT3P(x, y, z)	((void)0)
+#define	ASSERT0(x)		((void)0)
+#define	ASSERT(x)		((void)0)
 
 #define	panic(...)	do {						\
 	printf(__VA_ARGS__);						\
@@ -82,6 +84,8 @@ typedef struct zio_checksum_info {
 	const char	*ci_name;	/* descriptive name */
 } zio_checksum_info_t;
 
+#include "blkptr.c"
+
 #include "fletcher.c"
 #include "sha256.c"
 
diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c b/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
index 4aba9ea6cfe5..8a0fdf387fac 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
@@ -52,7 +52,7 @@ atomic_init(void)
 }
 #endif
 
-#if !defined(__LP64__) && !defined(__mips_n32)
+#if !defined(__LP64__) && !defined(__mips_n32) && !defined(ARM_HAVE_ATOMIC64)
 void
 atomic_add_64(volatile uint64_t *target, int64_t delta)
 {
diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c b/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c
index ba6510992688..03993553f6aa 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 
 static MALLOC_DEFINE(M_KSTAT, "kstat_data", "Kernel statistics");
 
-SYSCTL_NODE(, OID_AUTO, kstat, CTLFLAG_RW, 0, "Kernel statistics");
+SYSCTL_ROOT_NODE(OID_AUTO, kstat, CTLFLAG_RW, 0, "Kernel statistics");
 
 kstat_t *
 kstat_create(char *module, int instance, char *name, char *class, uchar_t type,
diff --git a/sys/cddl/compat/opensolaris/sys/atomic.h b/sys/cddl/compat/opensolaris/sys/atomic.h
index f34d77e6f38c..65c9e7124593 100644
--- a/sys/cddl/compat/opensolaris/sys/atomic.h
+++ b/sys/cddl/compat/opensolaris/sys/atomic.h
@@ -36,7 +36,7 @@
 	atomic_cmpset_ptr((volatile uintptr_t *)(_a), (uintptr_t)(_b), (uintptr_t) (_c))
 #define cas32	atomic_cmpset_32
 
-#if !defined(__LP64__) && !defined(__mips_n32)
+#if !defined(__LP64__) && !defined(__mips_n32) && !defined(ARM_HAVE_ATOMIC64)
 extern void atomic_add_64(volatile uint64_t *target, int64_t delta);
 extern void atomic_dec_64(volatile uint64_t *target);
 #endif
@@ -85,7 +85,7 @@ atomic_dec_32_nv(volatile uint32_t *target)
 	return (atomic_fetchadd_32(target, -1) - 1);
 }
 
-#if defined(__LP64__) || defined(__mips_n32)
+#if defined(__LP64__) || defined(__mips_n32) || defined(ARM_HAVE_ATOMIC64)
 static __inline void
 atomic_dec_64(volatile uint64_t *target)
 {
diff --git a/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S b/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S
deleted file mode 100644
index 4907ef69f70d..000000000000
--- a/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 2007 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$
- */
-
-#include <machine/asm.h>
-
-	.text
-
-/*
- * uint32_t atomic_cas_32(volatile uint32_t *p, uint32_t cmp, uint32_t v)
- */
-ENTRY(atomic_cas_32, 3)
-	mov             ar.ccv = r33
-	;;
-	cmpxchg4.acq    r8 = [r32], r34, ar.ccv
-	;;
-	br.ret.sptk     rp
-END(atomic_cas_32)
-
-/*
- * uint64_t atomic_cas_64(volatile uint64_t *p, uint64_t cmp, uint64_t v)
- */
-ENTRY(atomic_cas_64, 3)
-	mov             ar.ccv = r33
-	;;
-	cmpxchg8.acq    r8 = [r32], r34, ar.ccv
-	;;
-	br.ret.sptk     rp
-END(atomic_cas_64)
-
-/*
- * uint64_t atomic_add_64_nv(volatile uint64_t *p, uint64_t v)
- */
-ENTRY(atomic_add_64_nv, 2)
-1:
-	ld8		r16 = [r32]
-	;;
-	mov		ar.ccv = r16
-	add		r8 = r16, r33
-	;;
-	cmpxchg8.acq	r17 = [r32], r8, ar.ccv
-	;;
-	cmp.eq		p6, p7 = r16, r17
-(p6)	br.ret.sptk	rp
-(p7)	br.cond.spnt	1b
-END(atomic_add_64_nv)
-
-/*
- * uint8_t atomic_or_8_nv(volatile uint8_t *p, uint8_t v)
- */
-ENTRY(atomic_or_8_nv, 2)
-1:
-	ld1		r16 = [r32]
-	;;
-	mov		ar.ccv = r16
-	or		r8 = r16, r33
-	;;
-	cmpxchg1.acq	r17 = [r32], r8, ar.ccv
-	;;
-	cmp.eq		p6, p7 = r16, r17
-(p6)	br.ret.sptk	rp
-(p7)	br.cond.spnt	1b
-END(atomic_or_8_nv)
-
-ENTRY(membar_producer, 0)
-	mf
-	;;
-	br.ret.sptk	rp
-END(membar_producer)
diff --git a/sys/cddl/contrib/opensolaris/common/avl/avl.c b/sys/cddl/contrib/opensolaris/common/avl/avl.c
index 7f54c33a11eb..9d862422d586 100644
--- a/sys/cddl/contrib/opensolaris/common/avl/avl.c
+++ b/sys/cddl/contrib/opensolaris/common/avl/avl.c
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2014 by Delphix. All rights reserved.
+ */
+
 /*
  * AVL - generic AVL tree implementation for kernel use
  *
@@ -85,6 +89,12 @@
  *	  is a modified "avl_node_t *".  The bottom bit (normally 0 for a
  *	  pointer) is set to indicate if that the new node has a value greater
  *	  than the value of the indicated "avl_node_t *".
+ *
+ * Note - in addition to userland (e.g. libavl and libutil) and the kernel
+ * (e.g. genunix), avl.c is compiled into ld.so and kmdb's genunix module,
+ * which each have their own compilation environments and subsequent
+ * requirements. Each of these environments must be considered when adding
+ * dependencies from avl.c.
  */
 
 #include <sys/types.h>
@@ -864,6 +874,24 @@ avl_update(avl_tree_t *t, void *obj)
 	return (B_FALSE);
 }
 
+void
+avl_swap(avl_tree_t *tree1, avl_tree_t *tree2)
+{
+	avl_node_t *temp_node;
+	ulong_t temp_numnodes;
+
+	ASSERT3P(tree1->avl_compar, ==, tree2->avl_compar);
+	ASSERT3U(tree1->avl_offset, ==, tree2->avl_offset);
+	ASSERT3U(tree1->avl_size, ==, tree2->avl_size);
+
+	temp_node = tree1->avl_root;
+	temp_numnodes = tree1->avl_numnodes;
+	tree1->avl_root = tree2->avl_root;
+	tree1->avl_numnodes = tree2->avl_numnodes;
+	tree2->avl_root = temp_node;
+	tree2->avl_numnodes = temp_numnodes;
+}
+
 /*
  * initialize a new AVL tree
  */
diff --git a/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c b/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c
index 07186b30c830..06c8a05506e7 100644
--- a/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c
+++ b/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c
@@ -23,7 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 
 /*
@@ -143,10 +142,10 @@
 #define	U8_16BIT_TABLE_INDICATOR	(0x8000U)
 
 /* The following are some convenience macros. */
-#define	U8_PUT_3BYTES_INTO_UTF32(u, b1, b2, b3) \
-	(u) = ((uint32_t)(b1) & 0x0F) << 12 | ((uint32_t)(b2) & 0x3F) << 6 | \
-		(uint32_t)(b3) & 0x3F;
-
+#define	U8_PUT_3BYTES_INTO_UTF32(u, b1, b2, b3)  \
+	(u) = ((((uint32_t)(b1) & 0x0F) << 12) | \
+		(((uint32_t)(b2) & 0x3F) << 6)  | \
+		((uint32_t)(b3) & 0x3F));
 #define	U8_SIMPLE_SWAP(a, b, t) \
 	(t) = (a); \
 	(a) = (b); \
@@ -216,10 +215,10 @@ const int8_t u8_number_of_bytes[0x100] = {
 /*	80  81  82  83  84  85  86  87  88  89  8A  8B  8C  8D  8E  8F  */
 	I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_,
 
-/*  	90  91  92  93  94  95  96  97  98  99  9A  9B  9C  9D  9E  9F  */
+/*	90  91  92  93  94  95  96  97  98  99  9A  9B  9C  9D  9E  9F  */
 	I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_,
 
-/*  	A0  A1  A2  A3  A4  A5  A6  A7  A8  A9  AA  AB  AC  AD  AE  AF  */
+/*	A0  A1  A2  A3  A4  A5  A6  A7  A8  A9  AA  AB  AC  AD  AE  AF  */
 	I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_, I_,
 
 /*	B0  B1  B2  B3  B4  B5  B6  B7  B8  B9  BA  BB  BC  BD  BE  BF  */
diff --git a/sys/cddl/contrib/opensolaris/common/util/strtolctype.h b/sys/cddl/contrib/opensolaris/common/util/strtolctype.h
new file mode 100644
index 000000000000..a1d18367d345
--- /dev/null
+++ b/sys/cddl/contrib/opensolaris/common/util/strtolctype.h
@@ -0,0 +1,79 @@
+/*
+ * 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) 1988 AT&T	*/
+/*	  All Rights Reserved  	*/
+
+#ifndef	_COMMON_UTIL_CTYPE_H
+#define	_COMMON_UTIL_CTYPE_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/*
+ * This header file contains a collection of macros that the strtou?ll?
+ * functions in common/util use to test characters.  What we need is a kernel
+ * version of ctype.h.
+ *
+ * NOTE: These macros are used within several DTrace probe context functions.
+ * They must not be altered to make function calls or perform actions not
+ * safe in probe context.
+ */
+
+#if defined(sun) &&	(defined(_KERNEL) || defined(_BOOT))
+
+#define	isalnum(ch)	(isalpha(ch) || isdigit(ch))
+#define	isalpha(ch)	(isupper(ch) || islower(ch))
+#define	isdigit(ch)	((ch) >= '0' && (ch) <= '9')
+#define	islower(ch)	((ch) >= 'a' && (ch) <= 'z')
+#define	isspace(ch)	(((ch) == ' ') || ((ch) == '\r') || ((ch) == '\n') || \
+			((ch) == '\t') || ((ch) == '\f'))
+#define	isupper(ch)	((ch) >= 'A' && (ch) <= 'Z')
+#define	isxdigit(ch)	(isdigit(ch) || ((ch) >= 'a' && (ch) <= 'f') || \
+			((ch) >= 'A' && (ch) <= 'F'))
+
+#endif	/* _KERNEL || _BOOT */
+
+#define	DIGIT(x)	\
+	(isdigit(x) ? (x) - '0' : islower(x) ? (x) + 10 - 'a' : (x) + 10 - 'A')
+
+#define	MBASE	('z' - 'a' + 1 + 10)
+
+/*
+ * The following macro is a version of isalnum() that limits alphabetic
+ * characters to the ranges a-z and A-Z; locale dependent characters will not
+ * return 1.  The members of a-z and A-Z are assumed to be in ascending order
+ * and contiguous.
+ */
+#define	lisalnum(x)	\
+	(isdigit(x) || ((x) >= 'a' && (x) <= 'z') || ((x) >= 'A' && (x) <= 'Z'))
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _COMMON_UTIL_CTYPE_H */
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
index 5aa9d2b8cb06..65d285893e94 100644
--- a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
+++ b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
@@ -23,6 +23,7 @@
  * 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.
+ * Copyright (c) 2014, Nexenta Systems, Inc. All rights reserved.
  */
 
 #ifdef _KERNEL
@@ -168,7 +169,7 @@ zpool_feature_init(void)
 	zfeature_register(SPA_FEATURE_LZ4_COMPRESS,
 	    "org.illumos:lz4_compress", "lz4_compress",
 	    "LZ4 compression algorithm support.", B_FALSE, B_FALSE,
-	    B_FALSE, NULL);
+	    B_TRUE, NULL);
 
 	zfeature_register(SPA_FEATURE_MULTI_VDEV_CRASH_DUMP,
 	    "com.joyent:multi_vdev_crash_dump", "multi_vdev_crash_dump",
@@ -214,4 +215,9 @@ zpool_feature_init(void)
 	    "com.joyent:filesystem_limits", "filesystem_limits",
 	    "Filesystem and snapshot limits.", B_TRUE, B_FALSE, B_FALSE,
 	    filesystem_limits_deps);
+
+	zfeature_register(SPA_FEATURE_EMBEDDED_DATA,
+	    "com.delphix:embedded_data", "embedded_data",
+	    "Blocks which compress very well use even less space.",
+	    B_FALSE, B_TRUE, B_TRUE, NULL);
 }
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
index 1f668a5b5653..65016f1b5e2d 100644
--- a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
+++ b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
@@ -47,6 +47,7 @@ typedef enum spa_feature {
 	SPA_FEATURE_ENABLED_TXG,
 	SPA_FEATURE_HOLE_BIRTH,
 	SPA_FEATURE_EXTENSIBLE_DATASET,
+	SPA_FEATURE_EMBEDDED_DATA,
 	SPA_FEATURE_BOOKMARKS,
 	SPA_FEATURE_FS_SS_LIMIT,
 	SPA_FEATURES
@@ -67,7 +68,7 @@ typedef struct zfeature_info {
 	const spa_feature_t *fi_depends;
 } zfeature_info_t;
 
-typedef int (zfeature_func_t)(zfeature_info_t *fi, void *arg);
+typedef int (zfeature_func_t)(zfeature_info_t *, void *);
 
 #define	ZFS_FEATURE_DEBUG
 
@@ -76,8 +77,8 @@ extern zfeature_info_t spa_feature_table[SPA_FEATURES];
 extern boolean_t zfeature_is_valid_guid(const char *);
 
 extern boolean_t zfeature_is_supported(const char *);
-extern int zfeature_lookup_name(const char *name, spa_feature_t *res);
-extern boolean_t zfeature_depends_on(spa_feature_t fid, spa_feature_t check);
+extern int zfeature_lookup_name(const char *, spa_feature_t *);
+extern boolean_t zfeature_depends_on(spa_feature_t, spa_feature_t);
 
 extern void zpool_feature_init(void);
 
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c b/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c
index d44d6f408e1b..62fed7b6ef27 100644
--- a/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c
+++ b/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c
@@ -19,6 +19,7 @@
  * CDDL HEADER END
  */
 /*
+ * Copyright 2013 Xin Li <delphij@FreeBSD.org>. All rights reserved.
  * Copyright 2013 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
  * Portions Copyright 2005, 2010, Oracle and/or its affiliates.
  * All rights reserved.
@@ -51,8 +52,63 @@ zfs_cmd_compat_get(zfs_cmd_t *zc, caddr_t addr, const int cflag)
 	zfs_cmd_v15_t *zc_c;
 	zfs_cmd_v28_t *zc28_c;
 	zfs_cmd_deadman_t *zcdm_c;
+	zfs_cmd_zcmd_t *zcmd_c;
 
 	switch (cflag) {
+	case ZFS_CMD_COMPAT_ZCMD:
+		zcmd_c = (void *)addr;
+		/* zc */
+		strlcpy(zc->zc_name, zcmd_c->zc_name, MAXPATHLEN);
+		strlcpy(zc->zc_value, zcmd_c->zc_value, MAXPATHLEN * 2);
+		strlcpy(zc->zc_string, zcmd_c->zc_string, MAXPATHLEN);
+
+#define ZCMD_COPY(field) zc->field = zcmd_c->field
+		ZCMD_COPY(zc_nvlist_src);
+		ZCMD_COPY(zc_nvlist_src_size);
+		ZCMD_COPY(zc_nvlist_dst);
+		ZCMD_COPY(zc_nvlist_dst_size);
+		ZCMD_COPY(zc_nvlist_dst_filled);
+		ZCMD_COPY(zc_pad2);
+		ZCMD_COPY(zc_history);
+		ZCMD_COPY(zc_guid);
+		ZCMD_COPY(zc_nvlist_conf);
+		ZCMD_COPY(zc_nvlist_conf_size);
+		ZCMD_COPY(zc_cookie);
+		ZCMD_COPY(zc_objset_type);
+		ZCMD_COPY(zc_perm_action);
+		ZCMD_COPY(zc_history_len);
+		ZCMD_COPY(zc_history_offset);
+		ZCMD_COPY(zc_obj);
+		ZCMD_COPY(zc_iflags);
+		ZCMD_COPY(zc_share);
+		ZCMD_COPY(zc_jailid);
+		ZCMD_COPY(zc_objset_stats);
+
+		/*
+		 * zc_begin_record, zc_inject_record didn't change in embedeed-data
+		 * block pointers
+		 *
+		 * TODO: CTASSERT?
+		 */
+		ZCMD_COPY(zc_begin_record);
+		ZCMD_COPY(zc_inject_record);
+
+		/* boolean_t -> uint32_t */
+		zc->zc_defer_destroy = (uint32_t)(zcmd_c->zc_defer_destroy);
+		zc->zc_flags = 0;
+
+		ZCMD_COPY(zc_action_handle);
+		ZCMD_COPY(zc_cleanup_fd);
+		ZCMD_COPY(zc_simple);
+		bcopy(zcmd_c->zc_pad, zc->zc_pad, sizeof(zc->zc_pad));
+		ZCMD_COPY(zc_sendobj);
+		ZCMD_COPY(zc_fromobj);
+		ZCMD_COPY(zc_createtxg);
+		ZCMD_COPY(zc_stat);
+#undef ZCMD_COPY
+
+		break;
+
 	case ZFS_CMD_COMPAT_DEADMAN:
 		zcdm_c = (void *)addr;
 		/* zc */
@@ -79,7 +135,7 @@ zfs_cmd_compat_get(zfs_cmd_t *zc, caddr_t addr, const int cflag)
 		zc->zc_objset_stats = zcdm_c->zc_objset_stats;
 		zc->zc_begin_record = zcdm_c->zc_begin_record;
 		zc->zc_defer_destroy = zcdm_c->zc_defer_destroy;
-		zc->zc_temphold = zcdm_c->zc_temphold;
+		(void)zcdm_c->zc_temphold;
 		zc->zc_action_handle = zcdm_c->zc_action_handle;
 		zc->zc_cleanup_fd = zcdm_c->zc_cleanup_fd;
 		zc->zc_simple = zcdm_c->zc_simple;
@@ -94,7 +150,7 @@ zfs_cmd_compat_get(zfs_cmd_t *zc, caddr_t addr, const int cflag)
 
 		/* we always assume zc_nvlist_dst_filled is true */
 		zc->zc_nvlist_dst_filled = B_TRUE;
-	break;
+		break;
 
 	case ZFS_CMD_COMPAT_V28:
 		zc28_c = (void *)addr;
@@ -123,7 +179,7 @@ zfs_cmd_compat_get(zfs_cmd_t *zc, caddr_t addr, const int cflag)
 		zc->zc_objset_stats = zc28_c->zc_objset_stats;
 		zc->zc_begin_record = zc28_c->zc_begin_record;
 		zc->zc_defer_destroy = zc28_c->zc_defer_destroy;
-		zc->zc_temphold = zc28_c->zc_temphold;
+		(void)zc28_c->zc_temphold;
 		zc->zc_action_handle = zc28_c->zc_action_handle;
 		zc->zc_cleanup_fd = zc28_c->zc_cleanup_fd;
 		zc->zc_simple = zc28_c->zc_simple;
@@ -224,8 +280,63 @@ zfs_cmd_compat_put(zfs_cmd_t *zc, caddr_t addr, const int request,
 	zfs_cmd_v15_t *zc_c;
 	zfs_cmd_v28_t *zc28_c;
 	zfs_cmd_deadman_t *zcdm_c;
+	zfs_cmd_zcmd_t *zcmd_c;
 
 	switch (cflag) {
+	case ZFS_CMD_COMPAT_ZCMD:
+		zcmd_c = (void *)addr;
+		/* zc */
+		strlcpy(zcmd_c->zc_name, zc->zc_name, MAXPATHLEN);
+		strlcpy(zcmd_c->zc_value, zc->zc_value, MAXPATHLEN * 2);
+		strlcpy(zcmd_c->zc_string, zc->zc_string, MAXPATHLEN);
+
+#define ZCMD_COPY(field) zcmd_c->field = zc->field
+		ZCMD_COPY(zc_nvlist_src);
+		ZCMD_COPY(zc_nvlist_src_size);
+		ZCMD_COPY(zc_nvlist_dst);
+		ZCMD_COPY(zc_nvlist_dst_size);
+		ZCMD_COPY(zc_nvlist_dst_filled);
+		ZCMD_COPY(zc_pad2);
+		ZCMD_COPY(zc_history);
+		ZCMD_COPY(zc_guid);
+		ZCMD_COPY(zc_nvlist_conf);
+		ZCMD_COPY(zc_nvlist_conf_size);
+		ZCMD_COPY(zc_cookie);
+		ZCMD_COPY(zc_objset_type);
+		ZCMD_COPY(zc_perm_action);
+		ZCMD_COPY(zc_history_len);
+		ZCMD_COPY(zc_history_offset);
+		ZCMD_COPY(zc_obj);
+		ZCMD_COPY(zc_iflags);
+		ZCMD_COPY(zc_share);
+		ZCMD_COPY(zc_jailid);
+		ZCMD_COPY(zc_objset_stats);
+
+		/*
+		 * zc_begin_record, zc_inject_record didn't change in embedeed-data
+		 * block pointers
+		 *
+		 * TODO: CTASSERT?
+		 */
+		ZCMD_COPY(zc_begin_record);
+		ZCMD_COPY(zc_inject_record);
+
+		/* boolean_t -> uint32_t */
+		zcmd_c->zc_defer_destroy = (uint32_t)(zc->zc_defer_destroy);
+		zcmd_c->zc_temphold = 0;
+
+		ZCMD_COPY(zc_action_handle);
+		ZCMD_COPY(zc_cleanup_fd);
+		ZCMD_COPY(zc_simple);
+		bcopy(zc->zc_pad, zcmd_c->zc_pad, sizeof(zcmd_c->zc_pad));
+		ZCMD_COPY(zc_sendobj);
+		ZCMD_COPY(zc_fromobj);
+		ZCMD_COPY(zc_createtxg);
+		ZCMD_COPY(zc_stat);
+#undef ZCMD_COPY
+
+		break;
+
 	case ZFS_CMD_COMPAT_DEADMAN:
 		zcdm_c = (void *)addr;
 
@@ -252,7 +363,7 @@ zfs_cmd_compat_put(zfs_cmd_t *zc, caddr_t addr, const int request,
 		zcdm_c->zc_objset_stats = zc->zc_objset_stats;
 		zcdm_c->zc_begin_record = zc->zc_begin_record;
 		zcdm_c->zc_defer_destroy = zc->zc_defer_destroy;
-		zcdm_c->zc_temphold = zc->zc_temphold;
+		zcdm_c->zc_temphold = 0;
 		zcdm_c->zc_action_handle = zc->zc_action_handle;
 		zcdm_c->zc_cleanup_fd = zc->zc_cleanup_fd;
 		zcdm_c->zc_simple = zc->zc_simple;
@@ -270,7 +381,7 @@ zfs_cmd_compat_put(zfs_cmd_t *zc, caddr_t addr, const int request,
 			    zc->zc_value + strlen(zc->zc_value) + 1,
 			    (MAXPATHLEN * 2) - strlen(zc->zc_value) - 1);
 #endif
-	break;
+		break;
 
 	case ZFS_CMD_COMPAT_V28:
 		zc28_c = (void *)addr;
@@ -298,7 +409,7 @@ zfs_cmd_compat_put(zfs_cmd_t *zc, caddr_t addr, const int request,
 		zc28_c->zc_objset_stats = zc->zc_objset_stats;
 		zc28_c->zc_begin_record = zc->zc_begin_record;
 		zc28_c->zc_defer_destroy = zc->zc_defer_destroy;
-		zc28_c->zc_temphold = zc->zc_temphold;
+		zc28_c->zc_temphold = 0;
 		zc28_c->zc_action_handle = zc->zc_action_handle;
 		zc28_c->zc_cleanup_fd = zc->zc_cleanup_fd;
 		zc28_c->zc_simple = zc->zc_simple;
@@ -586,6 +697,12 @@ zcmd_ioctl_compat(int fd, int request, zfs_cmd_t *zc, const int cflag)
 		zp.zfs_cmd_size = sizeof(zfs_cmd_t);
 		zp.zfs_ioctl_version = ZFS_IOCVER_CURRENT;
 		return (ioctl(fd, ncmd, &zp));
+	case ZFS_CMD_COMPAT_ZCMD:
+		ncmd = _IOWR('Z', request, struct zfs_iocparm);
+		zp.zfs_cmd = (uint64_t)zc;
+		zp.zfs_cmd_size = sizeof(zfs_cmd_zcmd_t);
+		zp.zfs_ioctl_version = ZFS_IOCVER_ZCMD;
+		return (ioctl(fd, ncmd, &zp));
 	case ZFS_CMD_COMPAT_LZC:
 		ncmd = _IOWR('Z', request, struct zfs_cmd);
 		return (ioctl(fd, ncmd, zc));
@@ -683,7 +800,8 @@ zfs_ioctl_compat_innvl(zfs_cmd_t *zc, nvlist_t * innvl, const int vec,
 	char *poolname, *snapname;
 	int err;
 
-	if (cflag == ZFS_CMD_COMPAT_NONE || cflag == ZFS_CMD_COMPAT_LZC)
+	if (cflag == ZFS_CMD_COMPAT_NONE || cflag == ZFS_CMD_COMPAT_LZC ||
+	    cflag == ZFS_CMD_COMPAT_ZCMD)
 		goto out;
 
 	switch (vec) {
@@ -834,7 +952,8 @@ zfs_ioctl_compat_outnvl(zfs_cmd_t *zc, nvlist_t * outnvl, const int vec,
 {
 	nvlist_t *tmpnvl;
 
-	if (cflag == ZFS_CMD_COMPAT_NONE || cflag == ZFS_CMD_COMPAT_LZC)
+	if (cflag == ZFS_CMD_COMPAT_NONE || cflag == ZFS_CMD_COMPAT_LZC ||
+	    cflag == ZFS_CMD_COMPAT_ZCMD)
 		return (outnvl);
 
 	switch (vec) {
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h b/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h
index 6e8d51d37639..bdcac6f9c3be 100644
--- a/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h
+++ b/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h
@@ -19,6 +19,7 @@
  * CDDL HEADER END
  */
 /*
+ * Copyright 2014 Xin Li <delphij@FreeBSD.org>.  All rights reserved.
  * Copyright 2013 Martin Matuska <mm@FreeBSD.org>.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -50,7 +51,8 @@ extern "C" {
 #define	ZFS_IOCVER_DEADMAN	1
 #define	ZFS_IOCVER_LZC		2
 #define	ZFS_IOCVER_ZCMD		3
-#define	ZFS_IOCVER_CURRENT	ZFS_IOCVER_ZCMD
+#define	ZFS_IOCVER_EDBP		4
+#define	ZFS_IOCVER_CURRENT	ZFS_IOCVER_EDBP
 
 /* compatibility conversion flag */
 #define	ZFS_CMD_COMPAT_NONE	0
@@ -58,6 +60,7 @@ extern "C" {
 #define	ZFS_CMD_COMPAT_V28	2
 #define	ZFS_CMD_COMPAT_DEADMAN	3
 #define	ZFS_CMD_COMPAT_LZC	4
+#define	ZFS_CMD_COMPAT_ZCMD	5
 
 #define	ZFS_IOC_COMPAT_PASS	254
 #define	ZFS_IOC_COMPAT_FAIL	255
@@ -200,6 +203,49 @@ typedef struct zfs_cmd_deadman {
 	zfs_stat_t	zc_stat;
 } zfs_cmd_deadman_t;
 
+typedef struct zfs_cmd_zcmd {
+	char		zc_name[MAXPATHLEN];	/* name of pool or dataset */
+	uint64_t	zc_nvlist_src;		/* really (char *) */
+	uint64_t	zc_nvlist_src_size;
+	uint64_t	zc_nvlist_dst;		/* really (char *) */
+	uint64_t	zc_nvlist_dst_size;
+	boolean_t	zc_nvlist_dst_filled;	/* put an nvlist in dst? */
+	int		zc_pad2;
+
+	/*
+	 * The following members are for legacy ioctls which haven't been
+	 * converted to the new method.
+	 */
+	uint64_t	zc_history;		/* really (char *) */
+	char		zc_value[MAXPATHLEN * 2];
+	char		zc_string[MAXNAMELEN];
+	uint64_t	zc_guid;
+	uint64_t	zc_nvlist_conf;		/* really (char *) */
+	uint64_t	zc_nvlist_conf_size;
+	uint64_t	zc_cookie;
+	uint64_t	zc_objset_type;
+	uint64_t	zc_perm_action;
+	uint64_t	zc_history_len;
+	uint64_t	zc_history_offset;
+	uint64_t	zc_obj;
+	uint64_t	zc_iflags;		/* internal to zfs(7fs) */
+	zfs_share_t	zc_share;
+	uint64_t	zc_jailid;
+	dmu_objset_stats_t zc_objset_stats;
+	struct drr_begin zc_begin_record;
+	zinject_record_t zc_inject_record;
+	boolean_t	zc_defer_destroy;
+	boolean_t	zc_temphold;
+	uint64_t	zc_action_handle;
+	int		zc_cleanup_fd;
+	uint8_t		zc_simple;
+	uint8_t		zc_pad[3];		/* alignment */
+	uint64_t	zc_sendobj;
+	uint64_t	zc_fromobj;
+	uint64_t	zc_createtxg;
+	zfs_stat_t	zc_stat;
+} zfs_cmd_zcmd_t;
+
 #ifdef _KERNEL
 unsigned static long zfs_ioctl_v15_to_v28[] = {
 	0,	/*  0 ZFS_IOC_POOL_CREATE */
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
index b345206a4a1c..bd023c70ef47 100644
--- a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
+++ b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
@@ -435,6 +435,8 @@ zfs_prop_init(void)
 	    PROP_READONLY, ZFS_TYPE_DATASET, "OBJSETID");
 	zprop_register_hidden(ZFS_PROP_INCONSISTENT, "inconsistent",
 	    PROP_TYPE_NUMBER, PROP_READONLY, ZFS_TYPE_DATASET, "INCONSISTENT");
+	zprop_register_hidden(ZFS_PROP_PREV_SNAP, "prevsnap", PROP_TYPE_STRING,
+	    PROP_READONLY, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "PREVSNAP");
 
 	/* oddball properties */
 	zprop_register_impl(ZFS_PROP_CREATION, "creation", PROP_TYPE_NUMBER, 0,
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c b/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
index 72db87937110..a400f821e2e2 100644
--- a/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
+++ b/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2007, 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) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/zio.h>
@@ -81,10 +81,14 @@ zpool_prop_init(void)
 	    ZFS_TYPE_POOL, "<size>", "FREE");
 	zprop_register_number(ZPOOL_PROP_FREEING, "freeing", 0, PROP_READONLY,
 	    ZFS_TYPE_POOL, "<size>", "FREEING");
+	zprop_register_number(ZPOOL_PROP_LEAKED, "leaked", 0, PROP_READONLY,
+	    ZFS_TYPE_POOL, "<size>", "LEAKED");
 	zprop_register_number(ZPOOL_PROP_ALLOCATED, "allocated", 0,
 	    PROP_READONLY, ZFS_TYPE_POOL, "<size>", "ALLOC");
 	zprop_register_number(ZPOOL_PROP_EXPANDSZ, "expandsize", 0,
 	    PROP_READONLY, ZFS_TYPE_POOL, "<size>", "EXPANDSZ");
+	zprop_register_number(ZPOOL_PROP_FRAGMENTATION, "fragmentation", 0,
+	    PROP_READONLY, ZFS_TYPE_POOL, "<percent>", "FRAG");
 	zprop_register_number(ZPOOL_PROP_CAPACITY, "capacity", 0, PROP_READONLY,
 	    ZFS_TYPE_POOL, "<size>", "CAP");
 	zprop_register_number(ZPOOL_PROP_GUID, "guid", 0, PROP_READONLY,
diff --git a/sys/cddl/contrib/opensolaris/uts/common/Makefile.files b/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
index a652218b99e9..4c7e225f0d38 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
+++ b/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
@@ -33,6 +33,7 @@
 ZFS_COMMON_OBJS +=		\
 	arc.o			\
 	bplist.o		\
+	blkptr.o		\
 	bpobj.o			\
 	bptree.o		\
 	dbuf.o			\
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
index 73e404c7353c..3efe022ec2bd 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
@@ -22,13 +22,11 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * DTrace - Dynamic Tracing for Solaris
  *
@@ -111,6 +109,7 @@
 #include <sys/zone.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include "strtolctype.h"
 
 /* FreeBSD includes: */
 #if !defined(sun)
@@ -219,6 +218,7 @@ static dtrace_provider_t *dtrace_provider;	/* provider list */
 static dtrace_meta_t	*dtrace_meta_pid;	/* user-land meta provider */
 static int		dtrace_opens;		/* number of opens */
 static int		dtrace_helpers;		/* number of helpers */
+static int		dtrace_getf;		/* number of unpriv getf()s */
 #if defined(sun)
 static void		*dtrace_softstate;	/* softstate pointer */
 #endif
@@ -236,7 +236,9 @@ static dtrace_ecb_t	*dtrace_ecb_create_cache; /* cached created ECB */
 static dtrace_genid_t	dtrace_probegen;	/* current probe generation */
 static dtrace_helpers_t *dtrace_deferred_pid;	/* deferred helper list */
 static dtrace_enabling_t *dtrace_retained;	/* list of retained enablings */
+static dtrace_genid_t	dtrace_retained_gen;	/* current retained enab gen */
 static dtrace_dynvar_t	dtrace_dynhash_sink;	/* end of dynamic hash chains */
+static int		dtrace_dynvar_failclean; /* dynvars failed to clean */
 #if !defined(sun)
 static struct mtx	dtrace_unr_mtx;
 MTX_SYSINIT(dtrace_unr_mtx, &dtrace_unr_mtx, "Unique resource identifier", MTX_DEF);
@@ -468,8 +470,8 @@ static kmutex_t dtrace_errlock;
  * disallow all negative sizes.  Ranges of size 0 are allowed.
  */
 #define	DTRACE_INRANGE(testaddr, testsz, baseaddr, basesz) \
-	((testaddr) - (baseaddr) < (basesz) && \
-	(testaddr) + (testsz) - (baseaddr) <= (basesz) && \
+	((testaddr) - (uintptr_t)(baseaddr) < (basesz) && \
+	(testaddr) + (testsz) - (uintptr_t)(baseaddr) <= (basesz) && \
 	(testaddr) + (testsz) >= (testaddr))
 
 /*
@@ -578,6 +580,8 @@ void dtrace_dynvar_clean(dtrace_dstate_t *);
 dtrace_dynvar_t *dtrace_dynvar(dtrace_dstate_t *, uint_t, dtrace_key_t *,
     size_t, dtrace_dynvar_op_t, dtrace_mstate_t *, dtrace_vstate_t *);
 uintptr_t dtrace_dif_varstr(uintptr_t, dtrace_state_t *, dtrace_mstate_t *);
+static int dtrace_priv_proc(dtrace_state_t *);
+static void dtrace_getf_barrier(void);
 
 /*
  * DTrace Probe Context Functions
@@ -722,7 +726,7 @@ dtrace_canstore(uint64_t addr, size_t sz, dtrace_mstate_t *mstate,
 	 * up both thread-local variables and any global dynamically-allocated
 	 * variables.
 	 */
-	if (DTRACE_INRANGE(addr, sz, (uintptr_t)vstate->dtvs_dynvars.dtds_base,
+	if (DTRACE_INRANGE(addr, sz, vstate->dtvs_dynvars.dtds_base,
 	    vstate->dtvs_dynvars.dtds_size)) {
 		dtrace_dstate_t *dstate = &vstate->dtvs_dynvars;
 		uintptr_t base = (uintptr_t)dstate->dtds_base +
@@ -789,6 +793,7 @@ dtrace_canload(uint64_t addr, size_t sz, dtrace_mstate_t *mstate,
     dtrace_vstate_t *vstate)
 {
 	volatile uintptr_t *illval = &cpu_core[curcpu].cpuc_dtrace_illval;
+	file_t *fp;
 
 	/*
 	 * If we hold the privilege to read from kernel memory, then
@@ -806,10 +811,104 @@ dtrace_canload(uint64_t addr, size_t sz, dtrace_mstate_t *mstate,
 	/*
 	 * We're allowed to read from our own string table.
 	 */
-	if (DTRACE_INRANGE(addr, sz, (uintptr_t)mstate->dtms_difo->dtdo_strtab,
+	if (DTRACE_INRANGE(addr, sz, mstate->dtms_difo->dtdo_strtab,
 	    mstate->dtms_difo->dtdo_strlen))
 		return (1);
 
+	if (vstate->dtvs_state != NULL &&
+	    dtrace_priv_proc(vstate->dtvs_state)) {
+		proc_t *p;
+
+		/*
+		 * When we have privileges to the current process, there are
+		 * several context-related kernel structures that are safe to
+		 * read, even absent the privilege to read from kernel memory.
+		 * These reads are safe because these structures contain only
+		 * state that (1) we're permitted to read, (2) is harmless or
+		 * (3) contains pointers to additional kernel state that we're
+		 * not permitted to read (and as such, do not present an
+		 * opportunity for privilege escalation).  Finally (and
+		 * critically), because of the nature of their relation with
+		 * the current thread context, the memory associated with these
+		 * structures cannot change over the duration of probe context,
+		 * and it is therefore impossible for this memory to be
+		 * deallocated and reallocated as something else while it's
+		 * being operated upon.
+		 */
+		if (DTRACE_INRANGE(addr, sz, curthread, sizeof (kthread_t)))
+			return (1);
+
+		if ((p = curthread->t_procp) != NULL && DTRACE_INRANGE(addr,
+		    sz, curthread->t_procp, sizeof (proc_t))) {
+			return (1);
+		}
+
+		if (curthread->t_cred != NULL && DTRACE_INRANGE(addr, sz,
+		    curthread->t_cred, sizeof (cred_t))) {
+			return (1);
+		}
+
+#if defined(sun)
+		if (p != NULL && p->p_pidp != NULL && DTRACE_INRANGE(addr, sz,
+		    &(p->p_pidp->pid_id), sizeof (pid_t))) {
+			return (1);
+		}
+
+		if (curthread->t_cpu != NULL && DTRACE_INRANGE(addr, sz,
+		    curthread->t_cpu, offsetof(cpu_t, cpu_pause_thread))) {
+			return (1);
+		}
+#endif
+	}
+
+	if ((fp = mstate->dtms_getf) != NULL) {
+		uintptr_t psz = sizeof (void *);
+		vnode_t *vp;
+		vnodeops_t *op;
+
+		/*
+		 * When getf() returns a file_t, the enabling is implicitly
+		 * granted the (transient) right to read the returned file_t
+		 * as well as the v_path and v_op->vnop_name of the underlying
+		 * vnode.  These accesses are allowed after a successful
+		 * getf() because the members that they refer to cannot change
+		 * once set -- and the barrier logic in the kernel's closef()
+		 * path assures that the file_t and its referenced vode_t
+		 * cannot themselves be stale (that is, it impossible for
+		 * either dtms_getf itself or its f_vnode member to reference
+		 * freed memory).
+		 */
+		if (DTRACE_INRANGE(addr, sz, fp, sizeof (file_t)))
+			return (1);
+
+		if ((vp = fp->f_vnode) != NULL) {
+#if defined(sun)
+			if (DTRACE_INRANGE(addr, sz, &vp->v_path, psz))
+				return (1);
+			if (vp->v_path != NULL && DTRACE_INRANGE(addr, sz,
+			    vp->v_path, strlen(vp->v_path) + 1)) {
+				return (1);
+			}
+#endif
+
+			if (DTRACE_INRANGE(addr, sz, &vp->v_op, psz))
+				return (1);
+
+#if defined(sun)
+			if ((op = vp->v_op) != NULL &&
+			    DTRACE_INRANGE(addr, sz, &op->vnop_name, psz)) {
+				return (1);
+			}
+
+			if (op != NULL && op->vnop_name != NULL &&
+			    DTRACE_INRANGE(addr, sz, op->vnop_name,
+			    strlen(op->vnop_name) + 1)) {
+				return (1);
+			}
+#endif
+		}
+	}
+
 	DTRACE_CPUFLAG_SET(CPU_DTRACE_KPRIV);
 	*illval = addr;
 	return (0);
@@ -868,6 +967,58 @@ dtrace_vcanload(void *src, dtrace_diftype_t *type, dtrace_mstate_t *mstate,
 	return (dtrace_canload((uintptr_t)src, sz, mstate, vstate));
 }
 
+/*
+ * Convert a string to a signed integer using safe loads.
+ *
+ * NOTE: This function uses various macros from strtolctype.h to manipulate
+ * digit values, etc -- these have all been checked to ensure they make
+ * no additional function calls.
+ */
+static int64_t
+dtrace_strtoll(char *input, int base, size_t limit)
+{
+	uintptr_t pos = (uintptr_t)input;
+	int64_t val = 0;
+	int x;
+	boolean_t neg = B_FALSE;
+	char c, cc, ccc;
+	uintptr_t end = pos + limit;
+
+	/*
+	 * Consume any whitespace preceding digits.
+	 */
+	while ((c = dtrace_load8(pos)) == ' ' || c == '\t')
+		pos++;
+
+	/*
+	 * Handle an explicit sign if one is present.
+	 */
+	if (c == '-' || c == '+') {
+		if (c == '-')
+			neg = B_TRUE;
+		c = dtrace_load8(++pos);
+	}
+
+	/*
+	 * Check for an explicit hexadecimal prefix ("0x" or "0X") and skip it
+	 * if present.
+	 */
+	if (base == 16 && c == '0' && ((cc = dtrace_load8(pos + 1)) == 'x' ||
+	    cc == 'X') && isxdigit(ccc = dtrace_load8(pos + 2))) {
+		pos += 2;
+		c = ccc;
+	}
+
+	/*
+	 * Read in contiguous digits until the first non-digit character.
+	 */
+	for (; pos < end && c != '\0' && lisalnum(c) && (x = DIGIT(c)) < base;
+	    c = dtrace_load8(++pos))
+		val = val * base + x;
+
+	return (neg ? -val : val);
+}
+
 /*
  * Compare two strings using safe loads.
  */
@@ -1189,8 +1340,7 @@ dtrace_priv_proc_common_zone(dtrace_state_t *state)
 	 */
 	ASSERT(s_cr != NULL);
 
-	if ((cr = CRED()) != NULL &&
-	    s_cr->cr_zone == cr->cr_zone)
+	if ((cr = CRED()) != NULL && s_cr->cr_zone == cr->cr_zone)
 		return (1);
 
 	return (0);
@@ -1289,6 +1439,115 @@ dtrace_priv_kernel_destructive(dtrace_state_t *state)
 	return (0);
 }
 
+/*
+ * Determine if the dte_cond of the specified ECB allows for processing of
+ * the current probe to continue.  Note that this routine may allow continued
+ * processing, but with access(es) stripped from the mstate's dtms_access
+ * field.
+ */
+static int
+dtrace_priv_probe(dtrace_state_t *state, dtrace_mstate_t *mstate,
+    dtrace_ecb_t *ecb)
+{
+	dtrace_probe_t *probe = ecb->dte_probe;
+	dtrace_provider_t *prov = probe->dtpr_provider;
+	dtrace_pops_t *pops = &prov->dtpv_pops;
+	int mode = DTRACE_MODE_NOPRIV_DROP;
+
+	ASSERT(ecb->dte_cond);
+
+#if defined(sun)
+	if (pops->dtps_mode != NULL) {
+		mode = pops->dtps_mode(prov->dtpv_arg,
+		    probe->dtpr_id, probe->dtpr_arg);
+
+		ASSERT((mode & DTRACE_MODE_USER) ||
+		    (mode & DTRACE_MODE_KERNEL));
+		ASSERT((mode & DTRACE_MODE_NOPRIV_RESTRICT) ||
+		    (mode & DTRACE_MODE_NOPRIV_DROP));
+	}
+
+	/*
+	 * If the dte_cond bits indicate that this consumer is only allowed to
+	 * see user-mode firings of this probe, call the provider's dtps_mode()
+	 * entry point to check that the probe was fired while in a user
+	 * context.  If that's not the case, use the policy specified by the
+	 * provider to determine if we drop the probe or merely restrict
+	 * operation.
+	 */
+	if (ecb->dte_cond & DTRACE_COND_USERMODE) {
+		ASSERT(mode != DTRACE_MODE_NOPRIV_DROP);
+
+		if (!(mode & DTRACE_MODE_USER)) {
+			if (mode & DTRACE_MODE_NOPRIV_DROP)
+				return (0);
+
+			mstate->dtms_access &= ~DTRACE_ACCESS_ARGS;
+		}
+	}
+#endif
+
+	/*
+	 * This is more subtle than it looks. We have to be absolutely certain
+	 * that CRED() isn't going to change out from under us so it's only
+	 * legit to examine that structure if we're in constrained situations.
+	 * Currently, the only times we'll this check is if a non-super-user
+	 * has enabled the profile or syscall providers -- providers that
+	 * allow visibility of all processes. For the profile case, the check
+	 * above will ensure that we're examining a user context.
+	 */
+	if (ecb->dte_cond & DTRACE_COND_OWNER) {
+		cred_t *cr;
+		cred_t *s_cr = state->dts_cred.dcr_cred;
+		proc_t *proc;
+
+		ASSERT(s_cr != NULL);
+
+		if ((cr = CRED()) == NULL ||
+		    s_cr->cr_uid != cr->cr_uid ||
+		    s_cr->cr_uid != cr->cr_ruid ||
+		    s_cr->cr_uid != cr->cr_suid ||
+		    s_cr->cr_gid != cr->cr_gid ||
+		    s_cr->cr_gid != cr->cr_rgid ||
+		    s_cr->cr_gid != cr->cr_sgid ||
+		    (proc = ttoproc(curthread)) == NULL ||
+		    (proc->p_flag & SNOCD)) {
+			if (mode & DTRACE_MODE_NOPRIV_DROP)
+				return (0);
+
+#if defined(sun)
+			mstate->dtms_access &= ~DTRACE_ACCESS_PROC;
+#endif
+		}
+	}
+
+#if defined(sun)
+	/*
+	 * If our dte_cond is set to DTRACE_COND_ZONEOWNER and we are not
+	 * in our zone, check to see if our mode policy is to restrict rather
+	 * than to drop; if to restrict, strip away both DTRACE_ACCESS_PROC
+	 * and DTRACE_ACCESS_ARGS
+	 */
+	if (ecb->dte_cond & DTRACE_COND_ZONEOWNER) {
+		cred_t *cr;
+		cred_t *s_cr = state->dts_cred.dcr_cred;
+
+		ASSERT(s_cr != NULL);
+
+		if ((cr = CRED()) == NULL ||
+		    s_cr->cr_zone->zone_id != cr->cr_zone->zone_id) {
+			if (mode & DTRACE_MODE_NOPRIV_DROP)
+				return (0);
+
+			mstate->dtms_access &=
+			    ~(DTRACE_ACCESS_PROC | DTRACE_ACCESS_ARGS);
+		}
+	}
+#endif
+
+	return (1);
+}
+
 /*
  * Note:  not called from probe context.  This function is called
  * asynchronously (and at a regular interval) from outside of probe context to
@@ -1300,12 +1559,12 @@ dtrace_dynvar_clean(dtrace_dstate_t *dstate)
 {
 	dtrace_dynvar_t *dirty;
 	dtrace_dstate_percpu_t *dcpu;
-	int i, work = 0;
+	dtrace_dynvar_t **rinsep;
+	int i, j, work = 0;
 
 	for (i = 0; i < NCPU; i++) {
 		dcpu = &dstate->dtds_percpu[i];
-
-		ASSERT(dcpu->dtdsc_rinsing == NULL);
+		rinsep = &dcpu->dtdsc_rinsing;
 
 		/*
 		 * If the dirty list is NULL, there is no dirty work to do.
@@ -1313,14 +1572,62 @@ dtrace_dynvar_clean(dtrace_dstate_t *dstate)
 		if (dcpu->dtdsc_dirty == NULL)
 			continue;
 
-		/*
-		 * If the clean list is non-NULL, then we're not going to do
-		 * any work for this CPU -- it means that there has not been
-		 * a dtrace_dynvar() allocation on this CPU (or from this CPU)
-		 * since the last time we cleaned house.
-		 */
-		if (dcpu->dtdsc_clean != NULL)
+		if (dcpu->dtdsc_rinsing != NULL) {
+			/*
+			 * If the rinsing list is non-NULL, then it is because
+			 * this CPU was selected to accept another CPU's
+			 * dirty list -- and since that time, dirty buffers
+			 * have accumulated.  This is a highly unlikely
+			 * condition, but we choose to ignore the dirty
+			 * buffers -- they'll be picked up a future cleanse.
+			 */
 			continue;
+		}
+
+		if (dcpu->dtdsc_clean != NULL) {
+			/*
+			 * If the clean list is non-NULL, then we're in a
+			 * situation where a CPU has done deallocations (we
+			 * have a non-NULL dirty list) but no allocations (we
+			 * also have a non-NULL clean list).  We can't simply
+			 * move the dirty list into the clean list on this
+			 * CPU, yet we also don't want to allow this condition
+			 * to persist, lest a short clean list prevent a
+			 * massive dirty list from being cleaned (which in
+			 * turn could lead to otherwise avoidable dynamic
+			 * drops).  To deal with this, we look for some CPU
+			 * with a NULL clean list, NULL dirty list, and NULL
+			 * rinsing list -- and then we borrow this CPU to
+			 * rinse our dirty list.
+			 */
+			for (j = 0; j < NCPU; j++) {
+				dtrace_dstate_percpu_t *rinser;
+
+				rinser = &dstate->dtds_percpu[j];
+
+				if (rinser->dtdsc_rinsing != NULL)
+					continue;
+
+				if (rinser->dtdsc_dirty != NULL)
+					continue;
+
+				if (rinser->dtdsc_clean != NULL)
+					continue;
+
+				rinsep = &rinser->dtdsc_rinsing;
+				break;
+			}
+
+			if (j == NCPU) {
+				/*
+				 * We were unable to find another CPU that
+				 * could accept this dirty list -- we are
+				 * therefore unable to clean it now.
+				 */
+				dtrace_dynvar_failclean++;
+				continue;
+			}
+		}
 
 		work = 1;
 
@@ -1337,7 +1644,7 @@ dtrace_dynvar_clean(dtrace_dstate_t *dstate)
 			 * on a hash chain, either the dirty list or the
 			 * rinsing list for some CPU must be non-NULL.)
 			 */
-			dcpu->dtdsc_rinsing = dirty;
+			*rinsep = dirty;
 			dtrace_membar_producer();
 		} while (dtrace_casptr(&dcpu->dtdsc_dirty,
 		    dirty, NULL) != dirty);
@@ -1768,7 +2075,7 @@ dtrace_dynvar(dtrace_dstate_t *dstate, uint_t nkeys,
 			ASSERT(clean->dtdv_hashval == DTRACE_DYNHASH_FREE);
 
 			/*
-			 * Now we'll move the clean list to the free list.
+			 * Now we'll move the clean list to our free list.
 			 * It's impossible for this to fail:  the only way
 			 * the free list can be updated is through this
 			 * code path, and only one CPU can own the clean list.
@@ -1781,6 +2088,7 @@ dtrace_dynvar(dtrace_dstate_t *dstate, uint_t nkeys,
 			 * owners of the clean lists out before resetting
 			 * the clean lists.
 			 */
+			dcpu = &dstate->dtds_percpu[me];
 			rval = dtrace_casptr(&dcpu->dtdsc_free, NULL, clean);
 			ASSERT(rval == NULL);
 			goto retry;
@@ -2907,7 +3215,7 @@ dtrace_dif_variable(dtrace_mstate_t *mstate, dtrace_state_t *state, uint64_t v,
 #endif
 
 	case DIF_VAR_CURTHREAD:
-		if (!dtrace_priv_kernel(state))
+		if (!dtrace_priv_proc(state))
 			return (0);
 		return ((uint64_t)(uintptr_t)curthread);
 
@@ -3107,7 +3415,10 @@ dtrace_dif_variable(dtrace_mstate_t *mstate, dtrace_state_t *state, uint64_t v,
 		 */
 		return ((uint64_t)curthread->t_procp->p_ppid);
 #else
-		return ((uint64_t)curproc->p_pptr->p_pid);
+		if (curproc->p_pid == proc0.p_pid)
+			return (curproc->p_pid);
+		else
+			return (curproc->p_pptr->p_pid);
 #endif
 
 	case DIF_VAR_TID:
@@ -3263,6 +3574,463 @@ dtrace_dif_variable(dtrace_mstate_t *mstate, dtrace_state_t *state, uint64_t v,
 	}
 }
 
+
+typedef enum dtrace_json_state {
+	DTRACE_JSON_REST = 1,
+	DTRACE_JSON_OBJECT,
+	DTRACE_JSON_STRING,
+	DTRACE_JSON_STRING_ESCAPE,
+	DTRACE_JSON_STRING_ESCAPE_UNICODE,
+	DTRACE_JSON_COLON,
+	DTRACE_JSON_COMMA,
+	DTRACE_JSON_VALUE,
+	DTRACE_JSON_IDENTIFIER,
+	DTRACE_JSON_NUMBER,
+	DTRACE_JSON_NUMBER_FRAC,
+	DTRACE_JSON_NUMBER_EXP,
+	DTRACE_JSON_COLLECT_OBJECT
+} dtrace_json_state_t;
+
+/*
+ * This function possesses just enough knowledge about JSON to extract a single
+ * value from a JSON string and store it in the scratch buffer.  It is able
+ * to extract nested object values, and members of arrays by index.
+ *
+ * elemlist is a list of JSON keys, stored as packed NUL-terminated strings, to
+ * be looked up as we descend into the object tree.  e.g.
+ *
+ *    foo[0].bar.baz[32] --> "foo" NUL "0" NUL "bar" NUL "baz" NUL "32" NUL
+ *       with nelems = 5.
+ *
+ * The run time of this function must be bounded above by strsize to limit the
+ * amount of work done in probe context.  As such, it is implemented as a
+ * simple state machine, reading one character at a time using safe loads
+ * until we find the requested element, hit a parsing error or run off the
+ * end of the object or string.
+ *
+ * As there is no way for a subroutine to return an error without interrupting
+ * clause execution, we simply return NULL in the event of a missing key or any
+ * other error condition.  Each NULL return in this function is commented with
+ * the error condition it represents -- parsing or otherwise.
+ *
+ * The set of states for the state machine closely matches the JSON
+ * specification (http://json.org/).  Briefly:
+ *
+ *   DTRACE_JSON_REST:
+ *     Skip whitespace until we find either a top-level Object, moving
+ *     to DTRACE_JSON_OBJECT; or an Array, moving to DTRACE_JSON_VALUE.
+ *
+ *   DTRACE_JSON_OBJECT:
+ *     Locate the next key String in an Object.  Sets a flag to denote
+ *     the next String as a key string and moves to DTRACE_JSON_STRING.
+ *
+ *   DTRACE_JSON_COLON:
+ *     Skip whitespace until we find the colon that separates key Strings
+ *     from their values.  Once found, move to DTRACE_JSON_VALUE.
+ *
+ *   DTRACE_JSON_VALUE:
+ *     Detects the type of the next value (String, Number, Identifier, Object
+ *     or Array) and routes to the states that process that type.  Here we also
+ *     deal with the element selector list if we are requested to traverse down
+ *     into the object tree.
+ *
+ *   DTRACE_JSON_COMMA:
+ *     Skip whitespace until we find the comma that separates key-value pairs
+ *     in Objects (returning to DTRACE_JSON_OBJECT) or values in Arrays
+ *     (similarly DTRACE_JSON_VALUE).  All following literal value processing
+ *     states return to this state at the end of their value, unless otherwise
+ *     noted.
+ *
+ *   DTRACE_JSON_NUMBER, DTRACE_JSON_NUMBER_FRAC, DTRACE_JSON_NUMBER_EXP:
+ *     Processes a Number literal from the JSON, including any exponent
+ *     component that may be present.  Numbers are returned as strings, which
+ *     may be passed to strtoll() if an integer is required.
+ *
+ *   DTRACE_JSON_IDENTIFIER:
+ *     Processes a "true", "false" or "null" literal in the JSON.
+ *
+ *   DTRACE_JSON_STRING, DTRACE_JSON_STRING_ESCAPE,
+ *   DTRACE_JSON_STRING_ESCAPE_UNICODE:
+ *     Processes a String literal from the JSON, whether the String denotes
+ *     a key, a value or part of a larger Object.  Handles all escape sequences
+ *     present in the specification, including four-digit unicode characters,
+ *     but merely includes the escape sequence without converting it to the
+ *     actual escaped character.  If the String is flagged as a key, we
+ *     move to DTRACE_JSON_COLON rather than DTRACE_JSON_COMMA.
+ *
+ *   DTRACE_JSON_COLLECT_OBJECT:
+ *     This state collects an entire Object (or Array), correctly handling
+ *     embedded strings.  If the full element selector list matches this nested
+ *     object, we return the Object in full as a string.  If not, we use this
+ *     state to skip to the next value at this level and continue processing.
+ *
+ * NOTE: This function uses various macros from strtolctype.h to manipulate
+ * digit values, etc -- these have all been checked to ensure they make
+ * no additional function calls.
+ */
+static char *
+dtrace_json(uint64_t size, uintptr_t json, char *elemlist, int nelems,
+    char *dest)
+{
+	dtrace_json_state_t state = DTRACE_JSON_REST;
+	int64_t array_elem = INT64_MIN;
+	int64_t array_pos = 0;
+	uint8_t escape_unicount = 0;
+	boolean_t string_is_key = B_FALSE;
+	boolean_t collect_object = B_FALSE;
+	boolean_t found_key = B_FALSE;
+	boolean_t in_array = B_FALSE;
+	uint32_t braces = 0, brackets = 0;
+	char *elem = elemlist;
+	char *dd = dest;
+	uintptr_t cur;
+
+	for (cur = json; cur < json + size; cur++) {
+		char cc = dtrace_load8(cur);
+		if (cc == '\0')
+			return (NULL);
+
+		switch (state) {
+		case DTRACE_JSON_REST:
+			if (isspace(cc))
+				break;
+
+			if (cc == '{') {
+				state = DTRACE_JSON_OBJECT;
+				break;
+			}
+
+			if (cc == '[') {
+				in_array = B_TRUE;
+				array_pos = 0;
+				array_elem = dtrace_strtoll(elem, 10, size);
+				found_key = array_elem == 0 ? B_TRUE : B_FALSE;
+				state = DTRACE_JSON_VALUE;
+				break;
+			}
+
+			/*
+			 * ERROR: expected to find a top-level object or array.
+			 */
+			return (NULL);
+		case DTRACE_JSON_OBJECT:
+			if (isspace(cc))
+				break;
+
+			if (cc == '"') {
+				state = DTRACE_JSON_STRING;
+				string_is_key = B_TRUE;
+				break;
+			}
+
+			/*
+			 * ERROR: either the object did not start with a key
+			 * string, or we've run off the end of the object
+			 * without finding the requested key.
+			 */
+			return (NULL);
+		case DTRACE_JSON_STRING:
+			if (cc == '\\') {
+				*dd++ = '\\';
+				state = DTRACE_JSON_STRING_ESCAPE;
+				break;
+			}
+
+			if (cc == '"') {
+				if (collect_object) {
+					/*
+					 * We don't reset the dest here, as
+					 * the string is part of a larger
+					 * object being collected.
+					 */
+					*dd++ = cc;
+					collect_object = B_FALSE;
+					state = DTRACE_JSON_COLLECT_OBJECT;
+					break;
+				}
+				*dd = '\0';
+				dd = dest; /* reset string buffer */
+				if (string_is_key) {
+					if (dtrace_strncmp(dest, elem,
+					    size) == 0)
+						found_key = B_TRUE;
+				} else if (found_key) {
+					if (nelems > 1) {
+						/*
+						 * We expected an object, not
+						 * this string.
+						 */
+						return (NULL);
+					}
+					return (dest);
+				}
+				state = string_is_key ? DTRACE_JSON_COLON :
+				    DTRACE_JSON_COMMA;
+				string_is_key = B_FALSE;
+				break;
+			}
+
+			*dd++ = cc;
+			break;
+		case DTRACE_JSON_STRING_ESCAPE:
+			*dd++ = cc;
+			if (cc == 'u') {
+				escape_unicount = 0;
+				state = DTRACE_JSON_STRING_ESCAPE_UNICODE;
+			} else {
+				state = DTRACE_JSON_STRING;
+			}
+			break;
+		case DTRACE_JSON_STRING_ESCAPE_UNICODE:
+			if (!isxdigit(cc)) {
+				/*
+				 * ERROR: invalid unicode escape, expected
+				 * four valid hexidecimal digits.
+				 */
+				return (NULL);
+			}
+
+			*dd++ = cc;
+			if (++escape_unicount == 4)
+				state = DTRACE_JSON_STRING;
+			break;
+		case DTRACE_JSON_COLON:
+			if (isspace(cc))
+				break;
+
+			if (cc == ':') {
+				state = DTRACE_JSON_VALUE;
+				break;
+			}
+
+			/*
+			 * ERROR: expected a colon.
+			 */
+			return (NULL);
+		case DTRACE_JSON_COMMA:
+			if (isspace(cc))
+				break;
+
+			if (cc == ',') {
+				if (in_array) {
+					state = DTRACE_JSON_VALUE;
+					if (++array_pos == array_elem)
+						found_key = B_TRUE;
+				} else {
+					state = DTRACE_JSON_OBJECT;
+				}
+				break;
+			}
+
+			/*
+			 * ERROR: either we hit an unexpected character, or
+			 * we reached the end of the object or array without
+			 * finding the requested key.
+			 */
+			return (NULL);
+		case DTRACE_JSON_IDENTIFIER:
+			if (islower(cc)) {
+				*dd++ = cc;
+				break;
+			}
+
+			*dd = '\0';
+			dd = dest; /* reset string buffer */
+
+			if (dtrace_strncmp(dest, "true", 5) == 0 ||
+			    dtrace_strncmp(dest, "false", 6) == 0 ||
+			    dtrace_strncmp(dest, "null", 5) == 0) {
+				if (found_key) {
+					if (nelems > 1) {
+						/*
+						 * ERROR: We expected an object,
+						 * not this identifier.
+						 */
+						return (NULL);
+					}
+					return (dest);
+				} else {
+					cur--;
+					state = DTRACE_JSON_COMMA;
+					break;
+				}
+			}
+
+			/*
+			 * ERROR: we did not recognise the identifier as one
+			 * of those in the JSON specification.
+			 */
+			return (NULL);
+		case DTRACE_JSON_NUMBER:
+			if (cc == '.') {
+				*dd++ = cc;
+				state = DTRACE_JSON_NUMBER_FRAC;
+				break;
+			}
+
+			if (cc == 'x' || cc == 'X') {
+				/*
+				 * ERROR: specification explicitly excludes
+				 * hexidecimal or octal numbers.
+				 */
+				return (NULL);
+			}
+
+			/* FALLTHRU */
+		case DTRACE_JSON_NUMBER_FRAC:
+			if (cc == 'e' || cc == 'E') {
+				*dd++ = cc;
+				state = DTRACE_JSON_NUMBER_EXP;
+				break;
+			}
+
+			if (cc == '+' || cc == '-') {
+				/*
+				 * ERROR: expect sign as part of exponent only.
+				 */
+				return (NULL);
+			}
+			/* FALLTHRU */
+		case DTRACE_JSON_NUMBER_EXP:
+			if (isdigit(cc) || cc == '+' || cc == '-') {
+				*dd++ = cc;
+				break;
+			}
+
+			*dd = '\0';
+			dd = dest; /* reset string buffer */
+			if (found_key) {
+				if (nelems > 1) {
+					/*
+					 * ERROR: We expected an object, not
+					 * this number.
+					 */
+					return (NULL);
+				}
+				return (dest);
+			}
+
+			cur--;
+			state = DTRACE_JSON_COMMA;
+			break;
+		case DTRACE_JSON_VALUE:
+			if (isspace(cc))
+				break;
+
+			if (cc == '{' || cc == '[') {
+				if (nelems > 1 && found_key) {
+					in_array = cc == '[' ? B_TRUE : B_FALSE;
+					/*
+					 * If our element selector directs us
+					 * to descend into this nested object,
+					 * then move to the next selector
+					 * element in the list and restart the
+					 * state machine.
+					 */
+					while (*elem != '\0')
+						elem++;
+					elem++; /* skip the inter-element NUL */
+					nelems--;
+					dd = dest;
+					if (in_array) {
+						state = DTRACE_JSON_VALUE;
+						array_pos = 0;
+						array_elem = dtrace_strtoll(
+						    elem, 10, size);
+						found_key = array_elem == 0 ?
+						    B_TRUE : B_FALSE;
+					} else {
+						found_key = B_FALSE;
+						state = DTRACE_JSON_OBJECT;
+					}
+					break;
+				}
+
+				/*
+				 * Otherwise, we wish to either skip this
+				 * nested object or return it in full.
+				 */
+				if (cc == '[')
+					brackets = 1;
+				else
+					braces = 1;
+				*dd++ = cc;
+				state = DTRACE_JSON_COLLECT_OBJECT;
+				break;
+			}
+
+			if (cc == '"') {
+				state = DTRACE_JSON_STRING;
+				break;
+			}
+
+			if (islower(cc)) {
+				/*
+				 * Here we deal with true, false and null.
+				 */
+				*dd++ = cc;
+				state = DTRACE_JSON_IDENTIFIER;
+				break;
+			}
+
+			if (cc == '-' || isdigit(cc)) {
+				*dd++ = cc;
+				state = DTRACE_JSON_NUMBER;
+				break;
+			}
+
+			/*
+			 * ERROR: unexpected character at start of value.
+			 */
+			return (NULL);
+		case DTRACE_JSON_COLLECT_OBJECT:
+			if (cc == '\0')
+				/*
+				 * ERROR: unexpected end of input.
+				 */
+				return (NULL);
+
+			*dd++ = cc;
+			if (cc == '"') {
+				collect_object = B_TRUE;
+				state = DTRACE_JSON_STRING;
+				break;
+			}
+
+			if (cc == ']') {
+				if (brackets-- == 0) {
+					/*
+					 * ERROR: unbalanced brackets.
+					 */
+					return (NULL);
+				}
+			} else if (cc == '}') {
+				if (braces-- == 0) {
+					/*
+					 * ERROR: unbalanced braces.
+					 */
+					return (NULL);
+				}
+			} else if (cc == '{') {
+				braces++;
+			} else if (cc == '[') {
+				brackets++;
+			}
+
+			if (brackets == 0 && braces == 0) {
+				if (found_key) {
+					*dd = '\0';
+					return (dest);
+				}
+				dd = dest; /* reset string buffer */
+				state = DTRACE_JSON_COMMA;
+			}
+			break;
+		}
+	}
+	return (NULL);
+}
+
 /*
  * Emulate the execution of DTrace ID subroutines invoked by the call opcode.
  * Notice that we don't bother validating the proper number of arguments or
@@ -4014,7 +4782,7 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		int64_t index = (int64_t)tupregs[1].dttk_value;
 		int64_t remaining = (int64_t)tupregs[2].dttk_value;
 		size_t len = dtrace_strlen((char *)s, size);
-		int64_t i = 0;
+		int64_t i;
 
 		if (!dtrace_canload(s, len + 1, mstate, vstate)) {
 			regs[rd] = 0;
@@ -4059,6 +4827,65 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		break;
 	}
 
+	case DIF_SUBR_JSON: {
+		uint64_t size = state->dts_options[DTRACEOPT_STRSIZE];
+		uintptr_t json = tupregs[0].dttk_value;
+		size_t jsonlen = dtrace_strlen((char *)json, size);
+		uintptr_t elem = tupregs[1].dttk_value;
+		size_t elemlen = dtrace_strlen((char *)elem, size);
+
+		char *dest = (char *)mstate->dtms_scratch_ptr;
+		char *elemlist = (char *)mstate->dtms_scratch_ptr + jsonlen + 1;
+		char *ee = elemlist;
+		int nelems = 1;
+		uintptr_t cur;
+
+		if (!dtrace_canload(json, jsonlen + 1, mstate, vstate) ||
+		    !dtrace_canload(elem, elemlen + 1, mstate, vstate)) {
+			regs[rd] = 0;
+			break;
+		}
+
+		if (!DTRACE_INSCRATCH(mstate, jsonlen + 1 + elemlen + 1)) {
+			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
+			regs[rd] = 0;
+			break;
+		}
+
+		/*
+		 * Read the element selector and split it up into a packed list
+		 * of strings.
+		 */
+		for (cur = elem; cur < elem + elemlen; cur++) {
+			char cc = dtrace_load8(cur);
+
+			if (cur == elem && cc == '[') {
+				/*
+				 * If the first element selector key is
+				 * actually an array index then ignore the
+				 * bracket.
+				 */
+				continue;
+			}
+
+			if (cc == ']')
+				continue;
+
+			if (cc == '.' || cc == '[') {
+				nelems++;
+				cc = '\0';
+			}
+
+			*ee++ = cc;
+		}
+		*ee++ = '\0';
+
+		if ((regs[rd] = (uintptr_t)dtrace_json(size, json, elemlist,
+		    nelems, dest)) != 0)
+			mstate->dtms_scratch_ptr += jsonlen + 1;
+		break;
+	}
+
 	case DIF_SUBR_TOUPPER:
 	case DIF_SUBR_TOLOWER: {
 		uintptr_t s = tupregs[0].dttk_value;
@@ -4368,6 +5195,28 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		break;
 	}
 
+	case DIF_SUBR_STRTOLL: {
+		uintptr_t s = tupregs[0].dttk_value;
+		uint64_t size = state->dts_options[DTRACEOPT_STRSIZE];
+		int base = 10;
+
+		if (nargs > 1) {
+			if ((base = tupregs[1].dttk_value) <= 1 ||
+			    base > ('z' - 'a' + 1) + ('9' - '0' + 1)) {
+				*flags |= CPU_DTRACE_ILLOP;
+				break;
+			}
+		}
+
+		if (!dtrace_strcanload(s, size, mstate, vstate)) {
+			regs[rd] = INT64_MIN;
+			break;
+		}
+
+		regs[rd] = dtrace_strtoll((char *)s, base, size);
+		break;
+	}
+
 	case DIF_SUBR_LLTOSTR: {
 		int64_t i = (int64_t)tupregs[0].dttk_value;
 		uint64_t val, digit;
@@ -4577,11 +5426,32 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		break;
 	}
 
+	case DIF_SUBR_GETF: {
+		uintptr_t fd = tupregs[0].dttk_value;
+		struct filedesc *fdp;
+		file_t *fp;
+
+		if (!dtrace_priv_proc(state)) {
+			regs[rd] = 0;
+			break;
+		}
+		fdp = curproc->p_fd;
+		FILEDESC_SLOCK(fdp);
+		fp = fget_locked(fdp, fd);
+		mstate->dtms_getf = fp;
+		regs[rd] = (uintptr_t)fp;
+		FILEDESC_SUNLOCK(fdp);
+		break;
+	}
+
 	case DIF_SUBR_CLEANPATH: {
 		char *dest = (char *)mstate->dtms_scratch_ptr, c;
 		uint64_t size = state->dts_options[DTRACEOPT_STRSIZE];
 		uintptr_t src = tupregs[0].dttk_value;
 		int i = 0, j = 0;
+#if defined(sun)
+		zone_t *z;
+#endif
 
 		if (!dtrace_strcanload(src, size, mstate, vstate)) {
 			regs[rd] = 0;
@@ -4680,6 +5550,25 @@ dtrace_dif_subr(uint_t subr, uint_t rd, uint64_t *regs,
 		} while (c != '\0');
 
 		dest[j] = '\0';
+
+#if defined(sun)
+		if (mstate->dtms_getf != NULL &&
+		    !(mstate->dtms_access & DTRACE_ACCESS_KERNEL) &&
+		    (z = state->dts_cred.dcr_cred->cr_zone) != kcred->cr_zone) {
+			/*
+			 * If we've done a getf() as a part of this ECB and we
+			 * don't have kernel access (and we're not in the global
+			 * zone), check if the path we cleaned up begins with
+			 * the zone's root path, and trim it off if so.  Note
+			 * that this is an output cleanliness issue, not a
+			 * security issue: knowing one's zone root path does
+			 * not enable privilege escalation.
+			 */
+			if (strstr(dest, z->zone_rootpath) == dest)
+				dest += strlen(z->zone_rootpath) - 1;
+		}
+#endif
+
 		regs[rd] = (uintptr_t)dest;
 		mstate->dtms_scratch_ptr += size;
 		break;
@@ -5153,102 +6042,95 @@ dtrace_dif_emulate(dtrace_difo_t *difo, dtrace_mstate_t *mstate,
 				pc = DIF_INSTR_LABEL(instr);
 			break;
 		case DIF_OP_RLDSB:
-			if (!dtrace_canstore(regs[r1], 1, mstate, vstate)) {
-				*flags |= CPU_DTRACE_KPRIV;
-				*illval = regs[r1];
+			if (!dtrace_canload(regs[r1], 1, mstate, vstate))
 				break;
-			}
 			/*FALLTHROUGH*/
 		case DIF_OP_LDSB:
 			regs[rd] = (int8_t)dtrace_load8(regs[r1]);
 			break;
 		case DIF_OP_RLDSH:
-			if (!dtrace_canstore(regs[r1], 2, mstate, vstate)) {
-				*flags |= CPU_DTRACE_KPRIV;
-				*illval = regs[r1];
+			if (!dtrace_canload(regs[r1], 2, mstate, vstate))
 				break;
-			}
 			/*FALLTHROUGH*/
 		case DIF_OP_LDSH:
 			regs[rd] = (int16_t)dtrace_load16(regs[r1]);
 			break;
 		case DIF_OP_RLDSW:
-			if (!dtrace_canstore(regs[r1], 4, mstate, vstate)) {
-				*flags |= CPU_DTRACE_KPRIV;
-				*illval = regs[r1];
+			if (!dtrace_canload(regs[r1], 4, mstate, vstate))
 				break;
-			}
 			/*FALLTHROUGH*/
 		case DIF_OP_LDSW:
 			regs[rd] = (int32_t)dtrace_load32(regs[r1]);
 			break;
 		case DIF_OP_RLDUB:
-			if (!dtrace_canstore(regs[r1], 1, mstate, vstate)) {
-				*flags |= CPU_DTRACE_KPRIV;
-				*illval = regs[r1];
+			if (!dtrace_canload(regs[r1], 1, mstate, vstate))
 				break;
-			}
 			/*FALLTHROUGH*/
 		case DIF_OP_LDUB:
 			regs[rd] = dtrace_load8(regs[r1]);
 			break;
 		case DIF_OP_RLDUH:
-			if (!dtrace_canstore(regs[r1], 2, mstate, vstate)) {
-				*flags |= CPU_DTRACE_KPRIV;
-				*illval = regs[r1];
+			if (!dtrace_canload(regs[r1], 2, mstate, vstate))
 				break;
-			}
 			/*FALLTHROUGH*/
 		case DIF_OP_LDUH:
 			regs[rd] = dtrace_load16(regs[r1]);
 			break;
 		case DIF_OP_RLDUW:
-			if (!dtrace_canstore(regs[r1], 4, mstate, vstate)) {
-				*flags |= CPU_DTRACE_KPRIV;
-				*illval = regs[r1];
+			if (!dtrace_canload(regs[r1], 4, mstate, vstate))
 				break;
-			}
 			/*FALLTHROUGH*/
 		case DIF_OP_LDUW:
 			regs[rd] = dtrace_load32(regs[r1]);
 			break;
 		case DIF_OP_RLDX:
-			if (!dtrace_canstore(regs[r1], 8, mstate, vstate)) {
-				*flags |= CPU_DTRACE_KPRIV;
-				*illval = regs[r1];
+			if (!dtrace_canload(regs[r1], 8, mstate, vstate))
 				break;
-			}
 			/*FALLTHROUGH*/
 		case DIF_OP_LDX:
 			regs[rd] = dtrace_load64(regs[r1]);
 			break;
 		case DIF_OP_ULDSB:
+			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
 			regs[rd] = (int8_t)
 			    dtrace_fuword8((void *)(uintptr_t)regs[r1]);
+			DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT);
 			break;
 		case DIF_OP_ULDSH:
+			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
 			regs[rd] = (int16_t)
 			    dtrace_fuword16((void *)(uintptr_t)regs[r1]);
+			DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT);
 			break;
 		case DIF_OP_ULDSW:
+			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
 			regs[rd] = (int32_t)
 			    dtrace_fuword32((void *)(uintptr_t)regs[r1]);
+			DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT);
 			break;
 		case DIF_OP_ULDUB:
+			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
 			regs[rd] =
 			    dtrace_fuword8((void *)(uintptr_t)regs[r1]);
+			DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT);
 			break;
 		case DIF_OP_ULDUH:
+			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
 			regs[rd] =
 			    dtrace_fuword16((void *)(uintptr_t)regs[r1]);
+			DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT);
 			break;
 		case DIF_OP_ULDUW:
+			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
 			regs[rd] =
 			    dtrace_fuword32((void *)(uintptr_t)regs[r1]);
+			DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT);
 			break;
 		case DIF_OP_ULDX:
+			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
 			regs[rd] =
 			    dtrace_fuword64((void *)(uintptr_t)regs[r1]);
+			DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT);
 			break;
 		case DIF_OP_RET:
 			rval = regs[rd];
@@ -5930,7 +6812,7 @@ dtrace_action_chill(dtrace_mstate_t *mstate, hrtime_t val)
 	if (dtrace_destructive_disallow)
 		return;
 
-	flags = (volatile uint16_t *)&cpu_core[cpu->cpu_id].cpuc_dtrace_flags;
+	flags = (volatile uint16_t *)&cpu_core[curcpu].cpuc_dtrace_flags;
 
 	now = dtrace_gethrtime();
 
@@ -6078,6 +6960,63 @@ dtrace_action_ustack(dtrace_mstate_t *mstate, dtrace_state_t *state,
 	mstate->dtms_scratch_ptr = old;
 }
 
+static void
+dtrace_store_by_ref(dtrace_difo_t *dp, caddr_t tomax, size_t size,
+    size_t *valoffsp, uint64_t *valp, uint64_t end, int intuple, int dtkind)
+{
+	volatile uint16_t *flags;
+	uint64_t val = *valp;
+	size_t valoffs = *valoffsp;
+
+	flags = (volatile uint16_t *)&cpu_core[curcpu].cpuc_dtrace_flags;
+	ASSERT(dtkind == DIF_TF_BYREF || dtkind == DIF_TF_BYUREF);
+
+	/*
+	 * If this is a string, we're going to only load until we find the zero
+	 * byte -- after which we'll store zero bytes.
+	 */
+	if (dp->dtdo_rtype.dtdt_kind == DIF_TYPE_STRING) {
+		char c = '\0' + 1;
+		size_t s;
+
+		for (s = 0; s < size; s++) {
+			if (c != '\0' && dtkind == DIF_TF_BYREF) {
+				c = dtrace_load8(val++);
+			} else if (c != '\0' && dtkind == DIF_TF_BYUREF) {
+				DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
+				c = dtrace_fuword8((void *)(uintptr_t)val++);
+				DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT);
+				if (*flags & CPU_DTRACE_FAULT)
+					break;
+			}
+
+			DTRACE_STORE(uint8_t, tomax, valoffs++, c);
+
+			if (c == '\0' && intuple)
+				break;
+		}
+	} else {
+		uint8_t c;
+		while (valoffs < end) {
+			if (dtkind == DIF_TF_BYREF) {
+				c = dtrace_load8(val++);
+			} else if (dtkind == DIF_TF_BYUREF) {
+				DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
+				c = dtrace_fuword8((void *)(uintptr_t)val++);
+				DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT);
+				if (*flags & CPU_DTRACE_FAULT)
+					break;
+			}
+
+			DTRACE_STORE(uint8_t, tomax,
+			    valoffs++, c);
+		}
+	}
+
+	*valp = val;
+	*valoffsp = valoffs;
+}
+
 /*
  * If you're looking for the epicenter of DTrace, you just found it.  This
  * is the function called by the provider to fire a probe -- from which all
@@ -6180,6 +7119,8 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1,
 		uint64_t val = 0;
 
 		mstate.dtms_present = DTRACE_MSTATE_ARGS | DTRACE_MSTATE_PROBE;
+		mstate.dtms_getf = NULL;
+
 		*flags &= ~CPU_DTRACE_ERROR;
 
 		if (prov == dtrace_provider) {
@@ -6713,7 +7654,8 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1,
 				ASSERT(0);
 			}
 
-			if (dp->dtdo_rtype.dtdt_flags & DIF_TF_BYREF) {
+			if (dp->dtdo_rtype.dtdt_flags & DIF_TF_BYREF ||
+			    dp->dtdo_rtype.dtdt_flags & DIF_TF_BYUREF) {
 				uintptr_t end = valoffs + size;
 
 				if (tracememsize != 0 &&
@@ -6722,40 +7664,15 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1,
 					tracememsize = 0;
 				}
 
-				if (!dtrace_vcanload((void *)(uintptr_t)val,
+				if (dp->dtdo_rtype.dtdt_flags & DIF_TF_BYREF &&
+				    !dtrace_vcanload((void *)(uintptr_t)val,
 				    &dp->dtdo_rtype, &mstate, vstate))
 					continue;
 
-				/*
-				 * If this is a string, we're going to only
-				 * load until we find the zero byte -- after
-				 * which we'll store zero bytes.
-				 */
-				if (dp->dtdo_rtype.dtdt_kind ==
-				    DIF_TYPE_STRING) {
-					char c = '\0' + 1;
-					int intuple = act->dta_intuple;
-					size_t s;
-
-					for (s = 0; s < size; s++) {
-						if (c != '\0')
-							c = dtrace_load8(val++);
-
-						DTRACE_STORE(uint8_t, tomax,
-						    valoffs++, c);
-
-						if (c == '\0' && intuple)
-							break;
-					}
-
-					continue;
-				}
-
-				while (valoffs < end) {
-					DTRACE_STORE(uint8_t, tomax, valoffs++,
-					    dtrace_load8(val++));
-				}
-
+				dtrace_store_by_ref(dp, tomax, size, &valoffs,
+				    &val, end, act->dta_intuple,
+				    dp->dtdo_rtype.dtdt_flags & DIF_TF_BYREF ?
+				    DIF_TF_BYREF: DIF_TF_BYUREF);
 				continue;
 			}
 
@@ -8853,6 +9770,20 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
 			    subr == DIF_SUBR_COPYOUTSTR) {
 				dp->dtdo_destructive = 1;
 			}
+
+			if (subr == DIF_SUBR_GETF) {
+				/*
+				 * If we have a getf() we need to record that
+				 * in our state.  Note that our state can be
+				 * NULL if this is a helper -- but in that
+				 * case, the call to getf() is itself illegal,
+				 * and will be caught (slightly later) when
+				 * the helper is validated.
+				 */
+				if (vstate->dtvs_state != NULL)
+					vstate->dtvs_state->dts_getf++;
+			}
+
 			break;
 		case DIF_OP_PUSHTR:
 			if (type != DIF_TYPE_STRING && type != DIF_TYPE_CTF)
@@ -8882,7 +9813,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
 		    "expected 'ret' as last DIF instruction\n");
 	}
 
-	if (!(dp->dtdo_rtype.dtdt_flags & DIF_TF_BYREF)) {
+	if (!(dp->dtdo_rtype.dtdt_flags & (DIF_TF_BYREF | DIF_TF_BYUREF))) {
 		/*
 		 * If we're not returning by reference, the size must be either
 		 * 0 or the size of one of the base types.
@@ -8896,7 +9827,7 @@ dtrace_difo_validate(dtrace_difo_t *dp, dtrace_vstate_t *vstate, uint_t nregs,
 			break;
 
 		default:
-			err += efunc(dp->dtdo_len - 1, "bad return size");
+			err += efunc(dp->dtdo_len - 1, "bad return size\n");
 		}
 	}
 
@@ -9132,7 +10063,9 @@ dtrace_difo_validate_helper(dtrace_difo_t *dp)
 			    subr == DIF_SUBR_INET_NTOA ||
 			    subr == DIF_SUBR_INET_NTOA6 ||
 			    subr == DIF_SUBR_INET_NTOP ||
+			    subr == DIF_SUBR_JSON ||
 			    subr == DIF_SUBR_LLTOSTR ||
+			    subr == DIF_SUBR_STRTOLL ||
 			    subr == DIF_SUBR_RINDEX ||
 			    subr == DIF_SUBR_STRCHR ||
 			    subr == DIF_SUBR_STRJOIN ||
@@ -11512,6 +12445,7 @@ dtrace_enabling_destroy(dtrace_enabling_t *enab)
 		ASSERT(enab->dten_vstate->dtvs_state != NULL);
 		ASSERT(enab->dten_vstate->dtvs_state->dts_nretained > 0);
 		enab->dten_vstate->dtvs_state->dts_nretained--;
+		dtrace_retained_gen++;
 	}
 
 	if (enab->dten_prev == NULL) {
@@ -11554,6 +12488,7 @@ dtrace_enabling_retain(dtrace_enabling_t *enab)
 		return (ENOSPC);
 
 	state->dts_nretained++;
+	dtrace_retained_gen++;
 
 	if (dtrace_retained == NULL) {
 		dtrace_retained = enab;
@@ -11734,7 +12669,8 @@ dtrace_enabling_matchall(void)
 #if defined(sun)
 		cred_t *cr = enab->dten_vstate->dtvs_state->dts_cred.dcr_cred;
 
-		if (INGLOBALZONE(curproc) || getzoneid() == crgetzoneid(cr))
+		if (INGLOBALZONE(curproc) ||
+		    cr != NULL && getzoneid() == crgetzoneid(cr))
 #endif
 			(void) dtrace_enabling_match(enab, NULL);
 	}
@@ -11795,6 +12731,7 @@ dtrace_enabling_provide(dtrace_provider_t *prv)
 {
 	int i, all = 0;
 	dtrace_probedesc_t desc;
+	dtrace_genid_t gen;
 
 	ASSERT(MUTEX_HELD(&dtrace_lock));
 	ASSERT(MUTEX_HELD(&dtrace_provider_lock));
@@ -11805,15 +12742,25 @@ dtrace_enabling_provide(dtrace_provider_t *prv)
 	}
 
 	do {
-		dtrace_enabling_t *enab = dtrace_retained;
+		dtrace_enabling_t *enab;
 		void *parg = prv->dtpv_arg;
 
-		for (; enab != NULL; enab = enab->dten_next) {
+retry:
+		gen = dtrace_retained_gen;
+		for (enab = dtrace_retained; enab != NULL;
+		    enab = enab->dten_next) {
 			for (i = 0; i < enab->dten_ndesc; i++) {
 				desc = enab->dten_desc[i]->dted_probe;
 				mutex_exit(&dtrace_lock);
 				prv->dtpv_pops.dtps_provide(parg, &desc);
 				mutex_enter(&dtrace_lock);
+				/*
+				 * Process the retained enablings again if
+				 * they have changed while we weren't holding
+				 * dtrace_lock.
+				 */
+				if (gen != dtrace_retained_gen)
+					goto retry;
 			}
 		}
 	} while (all && (prv = prv->dtpv_next) != NULL);
@@ -12014,7 +12961,8 @@ dtrace_dof_copyin(uintptr_t uarg, int *errp)
 
 	dof = kmem_alloc(hdr.dofh_loadsz, KM_SLEEP);
 
-	if (copyin((void *)uarg, dof, hdr.dofh_loadsz) != 0) {
+	if (copyin((void *)uarg, dof, hdr.dofh_loadsz) != 0 ||
+	    dof->dofh_loadsz != hdr.dofh_loadsz) {
 		kmem_free(dof, hdr.dofh_loadsz);
 		*errp = EFAULT;
 		return (NULL);
@@ -12824,6 +13772,13 @@ dtrace_dof_slurp(dof_hdr_t *dof, dtrace_vstate_t *vstate, cred_t *cr,
 			}
 		}
 
+		if (DOF_SEC_ISLOADABLE(sec->dofs_type) &&
+		    !(sec->dofs_flags & DOF_SECF_LOAD)) {
+			dtrace_dof_error(dof, "loadable section with load "
+			    "flag unset");
+			return (-1);
+		}
+
 		if (!(sec->dofs_flags & DOF_SECF_LOAD))
 			continue; /* just ignore non-loadable sections */
 
@@ -13758,6 +14713,24 @@ dtrace_state_go(dtrace_state_t *state, processorid_t *cpu)
 
 	state->dts_activity = DTRACE_ACTIVITY_WARMUP;
 
+#if defined(sun)
+	if (state->dts_getf != 0 &&
+	    !(state->dts_cred.dcr_visible & DTRACE_CRV_KERNEL)) {
+		/*
+		 * We don't have kernel privs but we have at least one call
+		 * to getf(); we need to bump our zone's count, and (if
+		 * this is the first enabling to have an unprivileged call
+		 * to getf()) we need to hook into closef().
+		 */
+		state->dts_cred.dcr_cred->cr_zone->zone_dtrace_getf++;
+
+		if (dtrace_getf++ == 0) {
+			ASSERT(dtrace_closef == NULL);
+			dtrace_closef = dtrace_getf_barrier;
+		}
+	}
+#endif
+
 	/*
 	 * Now it's time to actually fire the BEGIN probe.  We need to disable
 	 * interrupts here both to record the CPU on which we fired the BEGIN
@@ -13874,6 +14847,26 @@ dtrace_state_stop(dtrace_state_t *state, processorid_t *cpu)
 	state->dts_activity = DTRACE_ACTIVITY_STOPPED;
 	dtrace_sync();
 
+#if defined(sun)
+	if (state->dts_getf != 0 &&
+	    !(state->dts_cred.dcr_visible & DTRACE_CRV_KERNEL)) {
+		/*
+		 * We don't have kernel privs but we have at least one call
+		 * to getf(); we need to lower our zone's count, and (if
+		 * this is the last enabling to have an unprivileged call
+		 * to getf()) we need to clear the closef() hook.
+		 */
+		ASSERT(state->dts_cred.dcr_cred->cr_zone->zone_dtrace_getf > 0);
+		ASSERT(dtrace_closef == dtrace_getf_barrier);
+		ASSERT(dtrace_getf > 0);
+
+		state->dts_cred.dcr_cred->cr_zone->zone_dtrace_getf--;
+
+		if (--dtrace_getf == 0)
+			dtrace_closef = NULL;
+	}
+#endif
+
 	return (0);
 }
 
@@ -15543,6 +16536,25 @@ dtrace_toxrange_add(uintptr_t base, uintptr_t limit)
 	dtrace_toxranges++;
 }
 
+static void
+dtrace_getf_barrier()
+{
+#if defined(sun)
+	/*
+	 * When we have unprivileged (that is, non-DTRACE_CRV_KERNEL) enablings
+	 * that contain calls to getf(), this routine will be called on every
+	 * closef() before either the underlying vnode is released or the
+	 * file_t itself is freed.  By the time we are here, it is essential
+	 * that the file_t can no longer be accessed from a call to getf()
+	 * in probe context -- that assures that a dtrace_sync() can be used
+	 * to clear out any enablings referring to the old structures.
+	 */
+	if (curthread->t_procp->p_zone->zone_dtrace_getf != 0 ||
+	    kcred->cr_zone->zone_dtrace_getf != 0)
+		dtrace_sync();
+#endif
+}
+
 /*
  * DTrace Driver Cookbook Functions
  */
@@ -15716,10 +16728,8 @@ dtrace_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 #endif
 
 #if !defined(sun)
-#if __FreeBSD_version >= 800039
 static void dtrace_dtr(void *);
 #endif
-#endif
 
 /*ARGSUSED*/
 static int
@@ -15742,30 +16752,11 @@ dtrace_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 	 * If this wasn't an open with the "helper" minor, then it must be
 	 * the "dtrace" minor.
 	 */
-	ASSERT(getminor(*devp) == DTRACEMNRN_DTRACE);
+	if (getminor(*devp) == DTRACEMNRN_DTRACE)
+		return (ENXIO);
 #else
 	cred_t *cred_p = NULL;
-
-#if __FreeBSD_version < 800039
-	/*
-	 * The first minor device is the one that is cloned so there is
-	 * nothing more to do here.
-	 */
-	if (dev2unit(dev) == 0)
-		return 0;
-
-	/*
-	 * Devices are cloned, so if the DTrace state has already
-	 * been allocated, that means this device belongs to a
-	 * different client. Each client should open '/dev/dtrace'
-	 * to get a cloned device.
-	 */
-	if (dev->si_drv1 != NULL)
-		return (EBUSY);
-#endif
-
 	cred_p = dev->si_cred;
-#endif
 
 	/*
 	 * If no DTRACE_PRIV_* bits are set in the credential, then the
@@ -15773,11 +16764,6 @@ dtrace_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 	 */
 	dtrace_cred2priv(cred_p, &priv, &uid, &zoneid);
 	if (priv == DTRACE_PRIV_NONE) {
-#if !defined(sun)
-#if __FreeBSD_version < 800039
-		/* Destroy the cloned device. */
-                destroy_dev(dev);
-#endif
 #endif
 
 		return (EACCES);
@@ -15810,29 +16796,19 @@ dtrace_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 	state = dtrace_state_create(devp, cred_p);
 #else
 	state = dtrace_state_create(dev);
-#if __FreeBSD_version < 800039
-	dev->si_drv1 = state;
-#else
 	devfs_set_cdevpriv(state, dtrace_dtr);
-#endif
 #endif
 
 	mutex_exit(&cpu_lock);
 
 	if (state == NULL) {
 #if defined(sun)
-		if (--dtrace_opens == 0)
+		if (--dtrace_opens == 0 && dtrace_anon.dta_enabling == NULL)
 			(void) kdi_dtrace_set(KDI_DTSET_DTRACE_DEACTIVATE);
 #else
 		--dtrace_opens;
 #endif
 		mutex_exit(&dtrace_lock);
-#if !defined(sun)
-#if __FreeBSD_version < 800039
-		/* Destroy the cloned device. */
-                destroy_dev(dev);
-#endif
-#endif
 		return (EAGAIN);
 	}
 
@@ -15845,9 +16821,6 @@ dtrace_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 #if defined(sun)
 static int
 dtrace_close(dev_t dev, int flag, int otyp, cred_t *cred_p)
-#elif __FreeBSD_version < 800039
-static int
-dtrace_close(struct cdev *dev, int flags, int fmt __unused, struct thread *td)
 #else
 static void
 dtrace_dtr(void *data)
@@ -15861,17 +16834,8 @@ dtrace_dtr(void *data)
 		return (0);
 
 	state = ddi_get_soft_state(dtrace_softstate, minor);
-#else
-#if __FreeBSD_version < 800039
-	dtrace_state_t *state = dev->si_drv1;
-
-	/* Check if this is not a cloned device. */
-	if (dev2unit(dev) == 0)
-		return (0);
 #else
 	dtrace_state_t *state = data;
-#endif
-
 #endif
 
 	mutex_enter(&cpu_lock);
@@ -15890,15 +16854,16 @@ dtrace_dtr(void *data)
 
 #if !defined(sun)
 		kmem_free(state, 0);
-#if __FreeBSD_version < 800039
-		dev->si_drv1 = NULL;
-#endif
 #endif
 	}
 
 	ASSERT(dtrace_opens > 0);
 #if defined(sun)
-	if (--dtrace_opens == 0)
+	/*
+	 * Only relinquish control of the kernel debugger interface when there
+	 * are no consumers and no anonymous enablings.
+	 */
+	if (--dtrace_opens == 0 && dtrace_anon.dta_enabling == NULL)
 		(void) kdi_dtrace_set(KDI_DTSET_DTRACE_DEACTIVATE);
 #else
 	--dtrace_opens;
@@ -15907,12 +16872,7 @@ dtrace_dtr(void *data)
 	mutex_exit(&dtrace_lock);
 	mutex_exit(&cpu_lock);
 
-#if __FreeBSD_version < 800039
-	/* Schedule this cloned device to be destroyed. */
-	destroy_dev_sched(dev);
-#endif
-
-#if defined(sun) || __FreeBSD_version < 800039
+#if defined(sun)
 	return (0);
 #endif
 }
@@ -16801,6 +17761,9 @@ dtrace_detach(dev_info_t *dip, ddi_detach_cmd_t cmd)
 	dtrace_modload = NULL;
 	dtrace_modunload = NULL;
 
+	ASSERT(dtrace_getf == 0);
+	ASSERT(dtrace_closef == NULL);
+
 	mutex_exit(&cpu_lock);
 
 	if (dtrace_helptrace_enabled) {
@@ -16949,24 +17912,14 @@ static d_ioctl_t	dtrace_ioctl;
 static d_ioctl_t	dtrace_ioctl_helper;
 static void		dtrace_load(void *);
 static int		dtrace_unload(void);
-#if __FreeBSD_version < 800039
-static void		dtrace_clone(void *, struct ucred *, char *, int , struct cdev **);
-static struct clonedevs	*dtrace_clones;		/* Ptr to the array of cloned devices. */
-static eventhandler_tag	eh_tag;			/* Event handler tag. */
-#else
 static struct cdev	*dtrace_dev;
 static struct cdev	*helper_dev;
-#endif
 
 void dtrace_invop_init(void);
 void dtrace_invop_uninit(void);
 
 static struct cdevsw dtrace_cdevsw = {
 	.d_version	= D_VERSION,
-#if __FreeBSD_version < 800039
-	.d_flags	= D_TRACKCLOSE | D_NEEDMINOR,
-	.d_close	= dtrace_close,
-#endif
 	.d_ioctl	= dtrace_ioctl,
 	.d_open		= dtrace_open,
 	.d_name		= "dtrace",
@@ -16979,9 +17932,6 @@ static struct cdevsw helper_cdevsw = {
 };
 
 #include <dtrace_anon.c>
-#if __FreeBSD_version < 800039
-#include <dtrace_clone.c>
-#endif
 #include <dtrace_ioctl.c>
 #include <dtrace_load.c>
 #include <dtrace_modevent.c>
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
index b1e65ac5b674..efb470b0d1d8 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
@@ -28,9 +28,9 @@
  * Use is subject to license terms.
  */
 
-#if defined(sun)
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#endif
+/*
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ */
 
 #include <sys/atomic.h>
 #include <sys/errno.h>
@@ -63,6 +63,7 @@
 #if !defined(sun)
 #include <sys/dtrace_bsd.h>
 #include <sys/eventhandler.h>
+#include <sys/u8_textprep.h>
 #include <sys/user.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
@@ -2256,8 +2257,7 @@ fasttrap_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int fflag,
 		fasttrap_probe_spec_t *probe;
 		uint64_t noffs;
 		size_t size;
-		int ret;
-		char *c;
+		int ret, err;
 
 		if (copyin(&uprobe->ftps_noffs, &noffs,
 		    sizeof (uprobe->ftps_noffs)))
@@ -2277,7 +2277,8 @@ fasttrap_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int fflag,
 
 		probe = kmem_alloc(size, KM_SLEEP);
 
-		if (copyin(uprobe, probe, size) != 0) {
+		if (copyin(uprobe, probe, size) != 0 ||
+		    probe->ftps_noffs != noffs) {
 			kmem_free(probe, size);
 			return (EFAULT);
 		}
@@ -2286,18 +2287,16 @@ fasttrap_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int fflag,
 		 * Verify that the function and module strings contain no
 		 * funny characters.
 		 */
-		for (c = &probe->ftps_func[0]; *c != '\0'; c++) {
-			if (*c < 0x20 || 0x7f <= *c) {
-				ret = EINVAL;
-				goto err;
-			}
+		if (u8_validate(probe->ftps_func, strlen(probe->ftps_func),
+		    NULL, U8_VALIDATE_ENTIRE, &err) < 0) {
+			ret = EINVAL;
+			goto err;
 		}
 
-		for (c = &probe->ftps_mod[0]; *c != '\0'; c++) {
-			if (*c < 0x20 || 0x7f <= *c) {
-				ret = EINVAL;
-				goto err;
-			}
+		if (u8_validate(probe->ftps_mod, strlen(probe->ftps_mod),
+		    NULL, U8_VALIDATE_ENTIRE, &err) < 0) {
+			ret = EINVAL;
+			goto err;
 		}
 
 #ifdef notyet
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c
index 66ff8a92a01b..4d53e014c0a6 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c
@@ -21,6 +21,7 @@
 /*
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -85,11 +86,11 @@ static dtrace_pattr_t xpv_attr = {
 
 sdt_provider_t sdt_providers[] = {
 	{ "vtrace", "__vtrace_", &vtrace_attr, 0 },
-	{ "sysinfo", "__cpu_sysinfo_", &info_attr, 0 },
-	{ "vminfo", "__cpu_vminfo_", &info_attr, 0 },
+	{ "sysinfo", "__cpu_sysinfo_", &info_attr, DTRACE_PRIV_USER },
+	{ "vminfo", "__cpu_vminfo_", &info_attr, DTRACE_PRIV_USER },
 	{ "fpuinfo", "__fpuinfo_", &fpu_attr, 0 },
-	{ "sched", "__sched_", &stab_attr, 0 },
-	{ "proc", "__proc_", &stab_attr, 0 },
+	{ "sched", "__sched_", &stab_attr, DTRACE_PRIV_USER },
+	{ "proc", "__proc_", &stab_attr, DTRACE_PRIV_USER },
 	{ "io", "__io_", &stab_attr, 0 },
 	{ "mib", "__mib_", &stab_attr, 0 },
 	{ "fsinfo", "__fsinfo_", &fsinfo_attr, 0 },
@@ -851,6 +852,20 @@ sdt_argdesc_t sdt_args[] = {
 	{ NULL }
 };
 
+/*ARGSUSED*/
+int
+sdt_mode(void *arg, dtrace_id_t id, void *parg)
+{
+	/*
+	 * We tell DTrace that we're in kernel mode, that the firing needs to
+	 * be dropped for anything that doesn't have necessary privileges, and
+	 * that it needs to be restricted for anything that has restricted
+	 * (i.e., not all-zone) privileges.
+	 */
+	return (DTRACE_MODE_KERNEL | DTRACE_MODE_NOPRIV_DROP |
+	    DTRACE_MODE_LIMITEDPRIV_RESTRICT);
+}
+
 /*ARGSUSED*/
 void
 sdt_getargdesc(void *arg, dtrace_id_t id, void *parg, dtrace_argdesc_t *desc)
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 bc4989e32bde..cda427a0dab7 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 (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2014 by Saso Kiselkov. All rights reserved.
- * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
  */
 
 /*
@@ -104,7 +104,7 @@
  * with the buffer may be evicted prior to the callback.  The callback
  * must be made with *no locks held* (to prevent deadlock).  Additionally,
  * the users of callbacks must ensure that their private data is
- * protected from simultaneous callbacks from arc_buf_evict()
+ * protected from simultaneous callbacks from arc_clear_callback()
  * and arc_do_user_evicts().
  *
  * Note that the majority of the performance stats are manipulated
@@ -203,15 +203,17 @@ int zfs_arc_grow_retry = 0;
 int zfs_arc_shrink_shift = 0;
 int zfs_arc_p_min_shift = 0;
 int zfs_disable_dup_eviction = 0;
+uint64_t zfs_arc_average_blocksize = 8 * 1024; /* 8KB */
 
-TUNABLE_QUAD("vfs.zfs.arc_max", &zfs_arc_max);
-TUNABLE_QUAD("vfs.zfs.arc_min", &zfs_arc_min);
 TUNABLE_QUAD("vfs.zfs.arc_meta_limit", &zfs_arc_meta_limit);
 SYSCTL_DECL(_vfs_zfs);
 SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_max, CTLFLAG_RDTUN, &zfs_arc_max, 0,
     "Maximum ARC size");
 SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_min, CTLFLAG_RDTUN, &zfs_arc_min, 0,
     "Minimum ARC size");
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, arc_average_blocksize, CTLFLAG_RDTUN,
+    &zfs_arc_average_blocksize, 0,
+    "ARC average blocksize");
 
 /*
  * Note that buffers can be in one of 6 states:
@@ -782,7 +784,7 @@ typedef struct l2arc_read_callback {
 	arc_buf_t		*l2rcb_buf;		/* read buffer */
 	spa_t			*l2rcb_spa;		/* spa */
 	blkptr_t		l2rcb_bp;		/* original blkptr */
-	zbookmark_t		l2rcb_zb;		/* original bookmark */
+	zbookmark_phys_t	l2rcb_zb;		/* original bookmark */
 	int			l2rcb_flags;		/* original flags */
 	enum zio_compress	l2rcb_compress;		/* applied compress */
 } l2arc_read_callback_t;
@@ -862,8 +864,10 @@ buf_discard_identity(arc_buf_hdr_t *hdr)
 }
 
 static arc_buf_hdr_t *
-buf_hash_find(uint64_t spa, const dva_t *dva, uint64_t birth, kmutex_t **lockp)
+buf_hash_find(uint64_t spa, const blkptr_t *bp, kmutex_t **lockp)
 {
+	const dva_t *dva = BP_IDENTITY(bp);
+	uint64_t birth = BP_PHYSICAL_BIRTH(bp);
 	uint64_t idx = BUF_HASH_INDEX(spa, dva, birth);
 	kmutex_t *hash_lock = BUF_HASH_LOCK(idx);
 	arc_buf_hdr_t *buf;
@@ -895,6 +899,8 @@ buf_hash_insert(arc_buf_hdr_t *buf, kmutex_t **lockp)
 	arc_buf_hdr_t *fbuf;
 	uint32_t i;
 
+	ASSERT(!DVA_IS_EMPTY(&buf->b_dva));
+	ASSERT(buf->b_birth != 0);
 	ASSERT(!HDR_IN_HASH_TABLE(buf));
 	*lockp = hash_lock;
 	mutex_enter(hash_lock);
@@ -1052,10 +1058,11 @@ buf_init(void)
 
 	/*
 	 * The hash table is big enough to fill all of physical memory
-	 * with an average 64K block size.  The table will take up
-	 * totalmem*sizeof(void*)/64K (eg. 128KB/GB with 8-byte pointers).
+	 * with an average block size of zfs_arc_average_blocksize (default 8K).
+	 * By default, the table will take up
+	 * totalmem * sizeof(void*) / 8K (1MB per GB with 8-byte pointers).
 	 */
-	while (hsize * 65536 < (uint64_t)physmem * PAGESIZE)
+	while (hsize * zfs_arc_average_blocksize < (uint64_t)physmem * PAGESIZE)
 		hsize <<= 1;
 retry:
 	buf_hash_table.ht_mask = hsize - 1;
@@ -1643,8 +1650,12 @@ arc_buf_data_free(arc_buf_t *buf, void (*free_func)(void *, size_t))
 	}
 }
 
+/*
+ * Free up buf->b_data and if 'remove' is set, then pull the
+ * arc_buf_t off of the the arc_buf_hdr_t's list and free it.
+ */
 static void
-arc_buf_destroy(arc_buf_t *buf, boolean_t recycle, boolean_t all)
+arc_buf_destroy(arc_buf_t *buf, boolean_t recycle, boolean_t remove)
 {
 	arc_buf_t **bufp;
 
@@ -1697,7 +1708,7 @@ arc_buf_destroy(arc_buf_t *buf, boolean_t recycle, boolean_t all)
 	}
 
 	/* only remove the buf if requested */
-	if (!all)
+	if (!remove)
 		return;
 
 	/* remove the buf from the hdr list */
@@ -1744,6 +1755,8 @@ arc_hdr_destroy(arc_buf_hdr_t *hdr)
 			list_remove(l2hdr->b_dev->l2ad_buflist, hdr);
 			ARCSTAT_INCR(arcstat_l2_size, -hdr->b_size);
 			ARCSTAT_INCR(arcstat_l2_asize, -l2hdr->b_asize);
+			vdev_space_update(l2hdr->b_dev->l2ad_vdev,
+			    -l2hdr->b_asize, 0, 0);
 			kmem_free(l2hdr, sizeof (l2arc_buf_hdr_t));
 			if (hdr->b_state == arc_l2c_only)
 				l2arc_hdr_stat_remove();
@@ -2349,7 +2362,7 @@ arc_do_user_evicts(void)
 		mutex_exit(&buf->b_evict_lock);
 
 		if (buf->b_efunc != NULL)
-			VERIFY(buf->b_efunc(buf) == 0);
+			VERIFY0(buf->b_efunc(buf->b_private));
 
 		buf->b_efunc = NULL;
 		buf->b_private = NULL;
@@ -2983,10 +2996,10 @@ arc_getbuf_func(zio_t *zio, arc_buf_t *buf, void *arg)
 static void
 arc_read_done(zio_t *zio)
 {
-	arc_buf_hdr_t	*hdr, *found;
+	arc_buf_hdr_t	*hdr;
 	arc_buf_t	*buf;
 	arc_buf_t	*abuf;	/* buffer we're assigning to callback */
-	kmutex_t	*hash_lock;
+	kmutex_t	*hash_lock = NULL;
 	arc_callback_t	*callback_list, *acb;
 	int		freeable = FALSE;
 
@@ -3001,12 +3014,22 @@ arc_read_done(zio_t *zio)
 	 * reason for it not to be found is if we were freed during the
 	 * read.
 	 */
-	found = buf_hash_find(hdr->b_spa, &hdr->b_dva, hdr->b_birth,
-	    &hash_lock);
+	if (HDR_IN_HASH_TABLE(hdr)) {
+		ASSERT3U(hdr->b_birth, ==, BP_PHYSICAL_BIRTH(zio->io_bp));
+		ASSERT3U(hdr->b_dva.dva_word[0], ==,
+		    BP_IDENTITY(zio->io_bp)->dva_word[0]);
+		ASSERT3U(hdr->b_dva.dva_word[1], ==,
+		    BP_IDENTITY(zio->io_bp)->dva_word[1]);
 
-	ASSERT((found == NULL && HDR_FREED_IN_READ(hdr) && hash_lock == NULL) ||
-	    (found == hdr && DVA_EQUAL(&hdr->b_dva, BP_IDENTITY(zio->io_bp))) ||
-	    (found == hdr && HDR_L2_READING(hdr)));
+		arc_buf_hdr_t *found = buf_hash_find(hdr->b_spa, zio->io_bp,
+		    &hash_lock);
+
+		ASSERT((found == NULL && HDR_FREED_IN_READ(hdr) &&
+		    hash_lock == NULL) ||
+		    (found == hdr &&
+		    DVA_EQUAL(&hdr->b_dva, BP_IDENTITY(zio->io_bp))) ||
+		    (found == hdr && HDR_L2_READING(hdr)));
+	}
 
 	hdr->b_flags &= ~ARC_L2_EVICTED;
 	if (l2arc_noprefetch && (hdr->b_flags & ARC_PREFETCH))
@@ -3130,18 +3153,27 @@ 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, zio_priority_t priority, int zio_flags, uint32_t *arc_flags,
-    const zbookmark_t *zb)
+    const zbookmark_phys_t *zb)
 {
-	arc_buf_hdr_t *hdr;
+	arc_buf_hdr_t *hdr = NULL;
 	arc_buf_t *buf = NULL;
-	kmutex_t *hash_lock;
+	kmutex_t *hash_lock = NULL;
 	zio_t *rzio;
 	uint64_t guid = spa_load_guid(spa);
 
+	ASSERT(!BP_IS_EMBEDDED(bp) ||
+	    BPE_GET_ETYPE(bp) == BP_EMBEDDED_TYPE_DATA);
+
 top:
-	hdr = buf_hash_find(guid, BP_IDENTITY(bp), BP_PHYSICAL_BIRTH(bp),
-	    &hash_lock);
-	if (hdr && hdr->b_datacnt > 0) {
+	if (!BP_IS_EMBEDDED(bp)) {
+		/*
+		 * Embedded BP's have no DVA and require no I/O to "read".
+		 * Create an anonymous arc buf to back it.
+		 */
+		hdr = buf_hash_find(guid, bp, &hash_lock);
+	}
+
+	if (hdr != NULL && hdr->b_datacnt > 0) {
 
 		*arc_flags |= ARC_CACHED;
 
@@ -3215,7 +3247,7 @@ arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp, arc_done_func_t *done,
 			done(NULL, buf, private);
 	} else {
 		uint64_t size = BP_GET_LSIZE(bp);
-		arc_callback_t	*acb;
+		arc_callback_t *acb;
 		vdev_t *vd = NULL;
 		uint64_t addr = 0;
 		boolean_t devw = B_FALSE;
@@ -3224,15 +3256,17 @@ arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp, arc_done_func_t *done,
 
 		if (hdr == NULL) {
 			/* this block is not in the cache */
-			arc_buf_hdr_t	*exists;
+			arc_buf_hdr_t *exists = NULL;
 			arc_buf_contents_t type = BP_GET_BUFC_TYPE(bp);
 			buf = arc_buf_alloc(spa, size, private, type);
 			hdr = buf->b_hdr;
-			hdr->b_dva = *BP_IDENTITY(bp);
-			hdr->b_birth = BP_PHYSICAL_BIRTH(bp);
-			hdr->b_cksum0 = bp->blk_cksum.zc_word[0];
-			exists = buf_hash_insert(hdr, &hash_lock);
-			if (exists) {
+			if (!BP_IS_EMBEDDED(bp)) {
+				hdr->b_dva = *BP_IDENTITY(bp);
+				hdr->b_birth = BP_PHYSICAL_BIRTH(bp);
+				hdr->b_cksum0 = bp->blk_cksum.zc_word[0];
+				exists = buf_hash_insert(hdr, &hash_lock);
+			}
+			if (exists != NULL) {
 				/* somebody beat us to the hash insert */
 				mutex_exit(hash_lock);
 				buf_discard_identity(hdr);
@@ -3304,7 +3338,8 @@ arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp, arc_done_func_t *done,
 				vd = NULL;
 		}
 
-		mutex_exit(hash_lock);
+		if (hash_lock != NULL)
+			mutex_exit(hash_lock);
 
 		/*
 		 * At this point, we have a level 1 cache miss.  Try again in
@@ -3312,7 +3347,7 @@ arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp, arc_done_func_t *done,
 		 */
 		ASSERT3U(hdr->b_size, ==, size);
 		DTRACE_PROBE4(arc__miss, arc_buf_hdr_t *, hdr, blkptr_t *, bp,
-		    uint64_t, size, zbookmark_t *, zb);
+		    uint64_t, size, zbookmark_phys_t *, zb);
 		ARCSTAT_BUMP(arcstat_misses);
 		ARCSTAT_CONDSTAT(!(hdr->b_flags & ARC_PREFETCH),
 		    demand, prefetch, hdr->b_type != ARC_BUFC_METADATA,
@@ -3442,8 +3477,9 @@ arc_freed(spa_t *spa, const blkptr_t *bp)
 	kmutex_t *hash_lock;
 	uint64_t guid = spa_load_guid(spa);
 
-	hdr = buf_hash_find(guid, BP_IDENTITY(bp), BP_PHYSICAL_BIRTH(bp),
-	    &hash_lock);
+	ASSERT(!BP_IS_EMBEDDED(bp));
+
+	hdr = buf_hash_find(guid, bp, &hash_lock);
 	if (hdr == NULL)
 		return;
 	if (HDR_BUF_AVAILABLE(hdr)) {
@@ -3461,16 +3497,25 @@ arc_freed(spa_t *spa, const blkptr_t *bp)
 }
 
 /*
- * This is used by the DMU to let the ARC know that a buffer is
- * being evicted, so the ARC should clean up.  If this arc buf
- * is not yet in the evicted state, it will be put there.
+ * Clear the user eviction callback set by arc_set_callback(), first calling
+ * it if it exists.  Because the presence of a callback keeps an arc_buf cached
+ * clearing the callback may result in the arc_buf being destroyed.  However,
+ * it will not result in the *last* arc_buf being destroyed, hence the data
+ * will remain cached in the ARC. We make a copy of the arc buffer here so
+ * that we can process the callback without holding any locks.
+ *
+ * It's possible that the callback is already in the process of being cleared
+ * by another thread.  In this case we can not clear the callback.
+ *
+ * Returns B_TRUE if the callback was successfully called and cleared.
  */
-int
-arc_buf_evict(arc_buf_t *buf)
+boolean_t
+arc_clear_callback(arc_buf_t *buf)
 {
 	arc_buf_hdr_t *hdr;
 	kmutex_t *hash_lock;
-	arc_buf_t **bufp;
+	arc_evict_func_t *efunc = buf->b_efunc;
+	void *private = buf->b_private;
 	list_t *list, *evicted_list;
 	kmutex_t *lock, *evicted_lock;
 
@@ -3482,17 +3527,16 @@ arc_buf_evict(arc_buf_t *buf)
 		 */
 		ASSERT(buf->b_data == NULL);
 		mutex_exit(&buf->b_evict_lock);
-		return (0);
+		return (B_FALSE);
 	} else if (buf->b_data == NULL) {
-		arc_buf_t copy = *buf; /* structure assignment */
 		/*
 		 * We are on the eviction list; process this buffer now
 		 * but let arc_do_user_evicts() do the reaping.
 		 */
 		buf->b_efunc = NULL;
 		mutex_exit(&buf->b_evict_lock);
-		VERIFY(copy.b_efunc(&copy) == 0);
-		return (1);
+		VERIFY0(efunc(private));
+		return (B_TRUE);
 	}
 	hash_lock = HDR_LOCK(hdr);
 	mutex_enter(hash_lock);
@@ -3502,50 +3546,21 @@ arc_buf_evict(arc_buf_t *buf)
 	ASSERT3U(refcount_count(&hdr->b_refcnt), <, hdr->b_datacnt);
 	ASSERT(hdr->b_state == arc_mru || hdr->b_state == arc_mfu);
 
-	/*
-	 * Pull this buffer off of the hdr
-	 */
-	bufp = &hdr->b_buf;
-	while (*bufp != buf)
-		bufp = &(*bufp)->b_next;
-	*bufp = buf->b_next;
-
-	ASSERT(buf->b_data != NULL);
-	arc_buf_destroy(buf, FALSE, FALSE);
-
-	if (hdr->b_datacnt == 0) {
-		arc_state_t *old_state = hdr->b_state;
-		arc_state_t *evicted_state;
-
-		ASSERT(hdr->b_buf == NULL);
-		ASSERT(refcount_is_zero(&hdr->b_refcnt));
-
-		evicted_state =
-		    (old_state == arc_mru) ? arc_mru_ghost : arc_mfu_ghost;
-
-		get_buf_info(hdr, old_state, &list, &lock);
-		get_buf_info(hdr, evicted_state, &evicted_list, &evicted_lock);
-		mutex_enter(lock);
-		mutex_enter(evicted_lock);
-
-		arc_change_state(evicted_state, hdr, hash_lock);
-		ASSERT(HDR_IN_HASH_TABLE(hdr));
-		hdr->b_flags |= ARC_IN_HASH_TABLE;
-		hdr->b_flags &= ~ARC_BUF_AVAILABLE;
-
-		mutex_exit(evicted_lock);
-		mutex_exit(lock);
-	}
-	mutex_exit(hash_lock);
-	mutex_exit(&buf->b_evict_lock);
-
-	VERIFY(buf->b_efunc(buf) == 0);
 	buf->b_efunc = NULL;
 	buf->b_private = NULL;
-	buf->b_hdr = NULL;
-	buf->b_next = NULL;
-	kmem_cache_free(buf_cache, buf);
-	return (1);
+
+	if (hdr->b_datacnt > 1) {
+		mutex_exit(&buf->b_evict_lock);
+		arc_buf_destroy(buf, FALSE, TRUE);
+	} else {
+		ASSERT(buf == hdr->b_buf);
+		hdr->b_flags |= ARC_BUF_AVAILABLE;
+		mutex_exit(&buf->b_evict_lock);
+	}
+
+	mutex_exit(hash_lock);
+	VERIFY0(efunc(private));
+	return (B_TRUE);
 }
 
 /*
@@ -3674,6 +3689,8 @@ arc_release(arc_buf_t *buf, void *tag)
 
 	if (l2hdr) {
 		ARCSTAT_INCR(arcstat_l2_asize, -l2hdr->b_asize);
+		vdev_space_update(l2hdr->b_dev->l2ad_vdev,
+		    -l2hdr->b_asize, 0, 0);
 		trim_map_free(l2hdr->b_dev->l2ad_vdev, l2hdr->b_daddr,
 		    hdr->b_size, 0);
 		kmem_free(l2hdr, sizeof (l2arc_buf_hdr_t));
@@ -3693,17 +3710,6 @@ arc_released(arc_buf_t *buf)
 	return (released);
 }
 
-int
-arc_has_callback(arc_buf_t *buf)
-{
-	int callback;
-
-	mutex_enter(&buf->b_evict_lock);
-	callback = (buf->b_efunc != NULL);
-	mutex_exit(&buf->b_evict_lock);
-	return (callback);
-}
-
 #ifdef ZFS_DEBUG
 int
 arc_referenced(arc_buf_t *buf)
@@ -3767,7 +3773,7 @@ arc_write_done(zio_t *zio)
 	ASSERT(hdr->b_acb == NULL);
 
 	if (zio->io_error == 0) {
-		if (BP_IS_HOLE(zio->io_bp)) {
+		if (BP_IS_HOLE(zio->io_bp) || BP_IS_EMBEDDED(zio->io_bp)) {
 			buf_discard_identity(hdr);
 		} else {
 			hdr->b_dva = *BP_IDENTITY(zio->io_bp);
@@ -3779,10 +3785,10 @@ arc_write_done(zio_t *zio)
 	}
 
 	/*
-	 * If the block to be written was all-zero, we may have
-	 * compressed it away.  In this case no write was performed
-	 * so there will be no dva/birth/checksum.  The buffer must
-	 * therefore remain anonymous (and uncached).
+	 * If the block to be written was all-zero or compressed enough to be
+	 * embedded in the BP, no write was performed so there will be no
+	 * dva/birth/checksum.  The buffer must therefore remain anonymous
+	 * (and uncached).
 	 */
 	if (!BUF_EMPTY(hdr)) {
 		arc_buf_hdr_t *exists;
@@ -3843,7 +3849,7 @@ 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 *physdone,
     arc_done_func_t *done, void *private, zio_priority_t priority,
-    int zio_flags, const zbookmark_t *zb)
+    int zio_flags, const zbookmark_phys_t *zb)
 {
 	arc_buf_hdr_t *hdr = buf->b_hdr;
 	arc_write_callback_t *callback;
@@ -4575,6 +4581,7 @@ l2arc_write_done(zio_t *zio)
 	arc_buf_hdr_t *head, *ab, *ab_prev;
 	l2arc_buf_hdr_t *abl2;
 	kmutex_t *hash_lock;
+	int64_t bytes_dropped = 0;
 
 	cb = zio->io_private;
 	ASSERT(cb != NULL);
@@ -4622,6 +4629,7 @@ l2arc_write_done(zio_t *zio)
 			 */
 			list_remove(buflist, ab);
 			ARCSTAT_INCR(arcstat_l2_asize, -abl2->b_asize);
+			bytes_dropped += abl2->b_asize;
 			ab->b_l2hdr = NULL;
 			trim_map_free(abl2->b_dev->l2ad_vdev, abl2->b_daddr,
 			    ab->b_size, 0);
@@ -4642,6 +4650,8 @@ l2arc_write_done(zio_t *zio)
 	kmem_cache_free(hdr_cache, head);
 	mutex_exit(&l2arc_buflist_mtx);
 
+	vdev_space_update(dev->l2ad_vdev, -bytes_dropped, 0, 0);
+
 	l2arc_do_free_on_write();
 
 	kmem_free(cb, sizeof (l2arc_write_callback_t));
@@ -4781,6 +4791,7 @@ l2arc_evict(l2arc_dev_t *dev, uint64_t distance, boolean_t all)
 	arc_buf_hdr_t *ab, *ab_prev;
 	kmutex_t *hash_lock;
 	uint64_t taddr;
+	int64_t bytes_evicted = 0;
 
 	buflist = dev->l2ad_buflist;
 
@@ -4879,6 +4890,7 @@ l2arc_evict(l2arc_dev_t *dev, uint64_t distance, boolean_t all)
 			if (ab->b_l2hdr != NULL) {
 				abl2 = ab->b_l2hdr;
 				ARCSTAT_INCR(arcstat_l2_asize, -abl2->b_asize);
+				bytes_evicted += abl2->b_asize;
 				ab->b_l2hdr = NULL;
 				kmem_free(abl2, sizeof (l2arc_buf_hdr_t));
 				ARCSTAT_INCR(arcstat_l2_size, -ab->b_size);
@@ -4895,7 +4907,7 @@ l2arc_evict(l2arc_dev_t *dev, uint64_t distance, boolean_t all)
 	}
 	mutex_exit(&l2arc_buflist_mtx);
 
-	vdev_space_update(dev->l2ad_vdev, -(taddr - dev->l2ad_evict), 0, 0);
+	vdev_space_update(dev->l2ad_vdev, -bytes_evicted, 0, 0);
 	dev->l2ad_evict = taddr;
 }
 
@@ -5148,15 +5160,13 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz,
 	ARCSTAT_INCR(arcstat_l2_write_bytes, write_asize);
 	ARCSTAT_INCR(arcstat_l2_size, write_sz);
 	ARCSTAT_INCR(arcstat_l2_asize, write_asize);
-	vdev_space_update(dev->l2ad_vdev, write_psize, 0, 0);
+	vdev_space_update(dev->l2ad_vdev, write_asize, 0, 0);
 
 	/*
 	 * Bump device hand to the device start if it is approaching the end.
 	 * l2arc_evict() will already have evicted ahead for this case.
 	 */
 	if (dev->l2ad_hand >= (dev->l2ad_end - target_sz)) {
-		vdev_space_update(dev->l2ad_vdev,
-		    dev->l2ad_end - dev->l2ad_hand, 0, 0);
 		dev->l2ad_hand = dev->l2ad_start;
 		dev->l2ad_evict = dev->l2ad_start;
 		dev->l2ad_first = B_FALSE;
@@ -5192,7 +5202,7 @@ static boolean_t
 l2arc_compress_buf(l2arc_buf_hdr_t *l2hdr)
 {
 	void *cdata;
-	size_t csize, len;
+	size_t csize, len, rounded;
 
 	ASSERT(l2hdr->b_compress == ZIO_COMPRESS_OFF);
 	ASSERT(l2hdr->b_tmp_cdata != NULL);
@@ -5200,7 +5210,13 @@ 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)(1ULL << l2hdr->b_dev->l2ad_vdev->vdev_ashift));
+	    cdata, l2hdr->b_asize);
+
+	rounded = P2ROUNDUP(csize, (size_t)SPA_MINBLOCKSIZE);
+	if (rounded > csize) {
+		bzero((char *)cdata + csize, rounded - csize);
+		csize = rounded;
+	}
 
 	if (csize == 0) {
 		/* zero block, indicate that there's nothing to write */
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c
new file mode 100644
index 000000000000..7e61dc96ff5c
--- /dev/null
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c
@@ -0,0 +1,119 @@
+/*
+ * CDDL HEADER START
+ *
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ */
+
+#include <sys/zfs_context.h>
+#include <sys/zio.h>
+#include <sys/zio_compress.h>
+
+/*
+ * Embedded-data Block Pointers
+ *
+ * Normally, block pointers point (via their DVAs) to a block which holds data.
+ * If the data that we need to store is very small, this is an inefficient
+ * use of space, because a block must be at minimum 1 sector (typically 512
+ * bytes or 4KB).  Additionally, reading these small blocks tends to generate
+ * more random reads.
+ *
+ * Embedded-data Block Pointers allow small pieces of data (the "payload",
+ * up to 112 bytes) to be stored in the block pointer itself, instead of
+ * being pointed to.  The "Pointer" part of this name is a bit of a
+ * misnomer, as nothing is pointed to.
+ *
+ * BP_EMBEDDED_TYPE_DATA block pointers allow highly-compressible data to
+ * be embedded in the block pointer.  The logic for this is handled in
+ * the SPA, by the zio pipeline.  Therefore most code outside the zio
+ * pipeline doesn't need special-cases to handle these block pointers.
+ *
+ * See spa.h for details on the exact layout of embedded block pointers.
+ */
+
+void
+encode_embedded_bp_compressed(blkptr_t *bp, void *data,
+    enum zio_compress comp, int uncompressed_size, int compressed_size)
+{
+	uint64_t *bp64 = (uint64_t *)bp;
+	uint64_t w = 0;
+	uint8_t *data8 = data;
+
+	ASSERT3U(compressed_size, <=, BPE_PAYLOAD_SIZE);
+	ASSERT(uncompressed_size == compressed_size ||
+	    comp != ZIO_COMPRESS_OFF);
+	ASSERT3U(comp, >=, ZIO_COMPRESS_OFF);
+	ASSERT3U(comp, <, ZIO_COMPRESS_FUNCTIONS);
+
+	bzero(bp, sizeof (*bp));
+	BP_SET_EMBEDDED(bp, B_TRUE);
+	BP_SET_COMPRESS(bp, comp);
+	BP_SET_BYTEORDER(bp, ZFS_HOST_BYTEORDER);
+	BPE_SET_LSIZE(bp, uncompressed_size);
+	BPE_SET_PSIZE(bp, compressed_size);
+
+	/*
+	 * Encode the byte array into the words of the block pointer.
+	 * First byte goes into low bits of first word (little endian).
+	 */
+	for (int i = 0; i < compressed_size; i++) {
+		BF64_SET(w, (i % sizeof (w)) * NBBY, NBBY, data8[i]);
+		if (i % sizeof (w) == sizeof (w) - 1) {
+			/* we've reached the end of a word */
+			ASSERT3P(bp64, <, bp + 1);
+			*bp64 = w;
+			bp64++;
+			if (!BPE_IS_PAYLOADWORD(bp, bp64))
+				bp64++;
+			w = 0;
+		}
+	}
+	/* write last partial word */
+	if (bp64 < (uint64_t *)(bp + 1))
+		*bp64 = w;
+}
+
+/*
+ * buf must be at least BPE_GET_PSIZE(bp) bytes long (which will never be
+ * more than BPE_PAYLOAD_SIZE bytes).
+ */
+void
+decode_embedded_bp_compressed(const blkptr_t *bp, void *buf)
+{
+	int psize;
+	uint8_t *buf8 = buf;
+	uint64_t w = 0;
+	const uint64_t *bp64 = (const uint64_t *)bp;
+
+	ASSERT(BP_IS_EMBEDDED(bp));
+
+	psize = BPE_GET_PSIZE(bp);
+
+	/*
+	 * Decode the words of the block pointer into the byte array.
+	 * Low bits of first word are the first byte (little endian).
+	 */
+	for (int i = 0; i < psize; i++) {
+		if (i % sizeof (w) == 0) {
+			/* beginning of a word */
+			ASSERT3P(bp64, <, bp + 1);
+			w = *bp64;
+			bp64++;
+			if (!BPE_IS_PAYLOADWORD(bp, bp64))
+				bp64++;
+		}
+		buf8[i] = BF64_GET(w, (i % sizeof (w)) * NBBY, NBBY);
+	}
+}
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
index 0fb597ba9517..e75ae72f9e9c 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
@@ -192,6 +192,13 @@ bpobj_close(bpobj_t *bpo)
 	mutex_destroy(&bpo->bpo_lock);
 }
 
+static boolean_t
+bpobj_hasentries(bpobj_t *bpo)
+{
+	return (bpo->bpo_phys->bpo_num_blkptrs != 0 ||
+	    (bpo->bpo_havesubobj && bpo->bpo_phys->bpo_num_subobjs != 0));
+}
+
 static int
 bpobj_iterate_impl(bpobj_t *bpo, bpobj_itor_t func, void *arg, dmu_tx_t *tx,
     boolean_t free)
@@ -332,9 +339,11 @@ bpobj_iterate_impl(bpobj_t *bpo, bpobj_itor_t func, void *arg, dmu_tx_t *tx,
 
 out:
 	/* If there are no entries, there should be no bytes. */
-	ASSERT(bpo->bpo_phys->bpo_num_blkptrs > 0 ||
-	    (bpo->bpo_havesubobj && bpo->bpo_phys->bpo_num_subobjs > 0) ||
-	    bpo->bpo_phys->bpo_bytes == 0);
+	if (!bpobj_hasentries(bpo)) {
+		ASSERT0(bpo->bpo_phys->bpo_bytes);
+		ASSERT0(bpo->bpo_phys->bpo_comp);
+		ASSERT0(bpo->bpo_phys->bpo_uncomp);
+	}
 
 	mutex_exit(&bpo->bpo_lock);
 	return (err);
@@ -377,7 +386,7 @@ bpobj_enqueue_subobj(bpobj_t *bpo, uint64_t subobj, dmu_tx_t *tx)
 	VERIFY3U(0, ==, bpobj_open(&subbpo, bpo->bpo_os, subobj));
 	VERIFY3U(0, ==, bpobj_space(&subbpo, &used, &comp, &uncomp));
 
-	if (used == 0) {
+	if (!bpobj_hasentries(&subbpo)) {
 		/* No point in having an empty subobj. */
 		bpobj_close(&subbpo);
 		bpobj_free(bpo->bpo_os, subobj, tx);
@@ -453,13 +462,29 @@ bpobj_enqueue(bpobj_t *bpo, const blkptr_t *bp, dmu_tx_t *tx)
 	ASSERT(!BP_IS_HOLE(bp));
 	ASSERT(bpo->bpo_object != dmu_objset_pool(bpo->bpo_os)->dp_empty_bpobj);
 
+	if (BP_IS_EMBEDDED(bp)) {
+		/*
+		 * The bpobj will compress better without the payload.
+		 *
+		 * Note that we store EMBEDDED bp's because they have an
+		 * uncompressed size, which must be accounted for.  An
+		 * alternative would be to add their size to bpo_uncomp
+		 * without storing the bp, but that would create additional
+		 * complications: bpo_uncomp would be inconsistent with the
+		 * set of BP's stored, and bpobj_iterate() wouldn't visit
+		 * all the space accounted for in the bpobj.
+		 */
+		bzero(&stored_bp, sizeof (stored_bp));
+		stored_bp.blk_prop = bp->blk_prop;
+		stored_bp.blk_birth = bp->blk_birth;
+	} else if (!BP_GET_DEDUP(bp)) {
+		/* The bpobj will compress better without the checksum */
+		bzero(&stored_bp.blk_cksum, sizeof (stored_bp.blk_cksum));
+	}
+
 	/* We never need the fill count. */
 	stored_bp.blk_fill = 0;
 
-	/* The bpobj will compress better if we can leave off the checksum */
-	if (!BP_GET_DEDUP(bp))
-		bzero(&stored_bp.blk_cksum, sizeof (stored_bp.blk_cksum));
-
 	mutex_enter(&bpo->bpo_lock);
 
 	offset = bpo->bpo_phys->bpo_num_blkptrs * sizeof (stored_bp);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
index 83f365864dec..c724ed074103 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/arc.h>
@@ -102,13 +102,27 @@ bptree_free(objset_t *os, uint64_t obj, dmu_tx_t *tx)
 	return (dmu_object_free(os, obj, tx));
 }
 
+boolean_t
+bptree_is_empty(objset_t *os, uint64_t obj)
+{
+	dmu_buf_t *db;
+	bptree_phys_t *bt;
+	boolean_t rv;
+
+	VERIFY0(dmu_bonus_hold(os, obj, FTAG, &db));
+	bt = db->db_data;
+	rv = (bt->bt_begin == bt->bt_end);
+	dmu_buf_rele(db, FTAG);
+	return (rv);
+}
+
 void
 bptree_add(objset_t *os, uint64_t obj, blkptr_t *bp, uint64_t birth_txg,
     uint64_t bytes, uint64_t comp, uint64_t uncomp, dmu_tx_t *tx)
 {
 	dmu_buf_t *db;
 	bptree_phys_t *bt;
-	bptree_entry_phys_t bte;
+	bptree_entry_phys_t bte = { 0 };
 
 	/*
 	 * bptree objects are in the pool mos, therefore they can only be
@@ -122,7 +136,6 @@ bptree_add(objset_t *os, uint64_t obj, blkptr_t *bp, uint64_t birth_txg,
 
 	bte.be_birth_txg = birth_txg;
 	bte.be_bp = *bp;
-	bzero(&bte.be_zb, sizeof (bte.be_zb));
 	dmu_write(os, obj, bt->bt_end * sizeof (bte), sizeof (bte), &bte, tx);
 
 	dmu_buf_will_dirty(db, tx);
@@ -136,7 +149,7 @@ bptree_add(objset_t *os, uint64_t obj, blkptr_t *bp, uint64_t birth_txg,
 /* ARGSUSED */
 static int
 bptree_visit_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
 	int err;
 	struct bptree_args *ba = arg;
@@ -153,10 +166,27 @@ bptree_visit_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
 	return (err);
 }
 
+/*
+ * If "free" is set:
+ *  - It is assumed that "func" will be freeing the block pointers.
+ *  - If "func" returns nonzero, the bookmark will be remembered and
+ *    iteration will be restarted from this point on next invocation.
+ *  - If an i/o error is encountered (e.g. "func" returns EIO or ECKSUM),
+ *    bptree_iterate will remember the bookmark, continue traversing
+ *    any additional entries, and return 0.
+ *
+ * If "free" is not set, traversal will stop and return an error if
+ * an i/o error is encountered.
+ *
+ * In either case, if zfs_free_leak_on_eio is set, i/o errors will be
+ * ignored and traversal will continue (i.e. TRAVERSE_HARD will be passed to
+ * traverse_dataset_destroyed()).
+ */
 int
 bptree_iterate(objset_t *os, uint64_t obj, boolean_t free, bptree_itor_t func,
     void *arg, dmu_tx_t *tx)
 {
+	boolean_t ioerr = B_FALSE;
 	int err;
 	uint64_t i;
 	dmu_buf_t *db;
@@ -182,49 +212,82 @@ bptree_iterate(objset_t *os, uint64_t obj, boolean_t free, bptree_itor_t func,
 		bptree_entry_phys_t bte;
 		int flags = TRAVERSE_PREFETCH_METADATA | TRAVERSE_POST;
 
-		ASSERT(!free || i == ba.ba_phys->bt_begin);
-
 		err = dmu_read(os, obj, i * sizeof (bte), sizeof (bte),
 		    &bte, DMU_READ_NO_PREFETCH);
 		if (err != 0)
 			break;
 
-		if (zfs_recover)
+		if (zfs_free_leak_on_eio)
 			flags |= TRAVERSE_HARD;
+		zfs_dbgmsg("bptree index %d: traversing from min_txg=%lld "
+		    "bookmark %lld/%lld/%lld/%lld",
+		    i, (longlong_t)bte.be_birth_txg,
+		    (longlong_t)bte.be_zb.zb_objset,
+		    (longlong_t)bte.be_zb.zb_object,
+		    (longlong_t)bte.be_zb.zb_level,
+		    (longlong_t)bte.be_zb.zb_blkid);
 		err = traverse_dataset_destroyed(os->os_spa, &bte.be_bp,
 		    bte.be_birth_txg, &bte.be_zb, flags,
 		    bptree_visit_cb, &ba);
 		if (free) {
-			if (err == ERESTART) {
+			/*
+			 * The callback has freed the visited block pointers.
+			 * Record our traversal progress on disk, either by
+			 * updating this record's bookmark, or by logically
+			 * removing this record by advancing bt_begin.
+			 */
+			if (err != 0) {
 				/* save bookmark for future resume */
 				ASSERT3U(bte.be_zb.zb_objset, ==,
 				    ZB_DESTROYED_OBJSET);
 				ASSERT0(bte.be_zb.zb_level);
 				dmu_write(os, obj, i * sizeof (bte),
 				    sizeof (bte), &bte, tx);
-				break;
-			}
-			if (err != 0) {
+				if (err == EIO || err == ECKSUM ||
+				    err == ENXIO) {
+					/*
+					 * Skip the rest of this tree and
+					 * continue on to the next entry.
+					 */
+					err = 0;
+					ioerr = B_TRUE;
+				} else {
+					break;
+				}
+			} else if (ioerr) {
 				/*
-				 * We can not properly handle an i/o
-				 * error, because the traversal code
-				 * does not know how to resume from an
-				 * arbitrary bookmark.
+				 * This entry is finished, but there were
+				 * i/o errors on previous entries, so we
+				 * can't adjust bt_begin.  Set this entry's
+				 * be_birth_txg such that it will be
+				 * treated as a no-op in future traversals.
 				 */
-				zfs_panic_recover("error %u from "
-				    "traverse_dataset_destroyed()", err);
+				bte.be_birth_txg = UINT64_MAX;
+				dmu_write(os, obj, i * sizeof (bte),
+				    sizeof (bte), &bte, tx);
 			}
 
-			ba.ba_phys->bt_begin++;
-			(void) dmu_free_range(os, obj,
-			    i * sizeof (bte), sizeof (bte), tx);
+			if (!ioerr) {
+				ba.ba_phys->bt_begin++;
+				(void) dmu_free_range(os, obj,
+				    i * sizeof (bte), sizeof (bte), tx);
+			}
+		} else if (err != 0) {
+			break;
 		}
 	}
 
-	ASSERT(!free || err != 0 || ba.ba_phys->bt_begin == ba.ba_phys->bt_end);
+	ASSERT(!free || err != 0 || ioerr ||
+	    ba.ba_phys->bt_begin == ba.ba_phys->bt_end);
 
 	/* if all blocks are free there should be no used space */
 	if (ba.ba_phys->bt_begin == ba.ba_phys->bt_end) {
+		if (zfs_free_leak_on_eio) {
+			ba.ba_phys->bt_bytes = 0;
+			ba.ba_phys->bt_comp = 0;
+			ba.ba_phys->bt_uncomp = 0;
+		}
+
 		ASSERT0(ba.ba_phys->bt_bytes);
 		ASSERT0(ba.ba_phys->bt_comp);
 		ASSERT0(ba.ba_phys->bt_uncomp);
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 7215194e082f..92756018475a 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
@@ -40,6 +40,8 @@
 #include <sys/dmu_zfetch.h>
 #include <sys/sa.h>
 #include <sys/sa_impl.h>
+#include <sys/zfeature.h>
+#include <sys/blkptr.h>
 #include <sys/range_tree.h>
 
 /*
@@ -67,6 +69,13 @@ dbuf_cons(void *vdb, void *unused, int kmflag)
 	mutex_init(&db->db_mtx, NULL, MUTEX_DEFAULT, NULL);
 	cv_init(&db->db_changed, NULL, CV_DEFAULT, NULL);
 	refcount_create(&db->db_holds);
+
+#if defined(illumos) || !defined(_KERNEL)
+	db->db_creation = gethrtime();
+#else
+	db->db_creation = cpu_ticks() ^ ((uint64_t)CPU_SEQID << 48);
+#endif
+
 	return (0);
 }
 
@@ -179,8 +188,7 @@ dbuf_hash_insert(dmu_buf_impl_t *db)
 }
 
 /*
- * Remove an entry from the hash table.  This operation will
- * fail if there are any existing holds on the db.
+ * Remove an entry from the hash table.  It must be in the EVICTING state.
  */
 static void
 dbuf_hash_remove(dmu_buf_impl_t *db)
@@ -192,7 +200,7 @@ dbuf_hash_remove(dmu_buf_impl_t *db)
 	dmu_buf_impl_t *dbf, **dbp;
 
 	/*
-	 * We musn't hold db_mtx to maintin lock ordering:
+	 * We musn't hold db_mtx to maintain lock ordering:
 	 * DBUF_HASH_MUTEX > db_mtx.
 	 */
 	ASSERT(refcount_is_zero(&db->db_holds));
@@ -329,7 +337,7 @@ dbuf_verify(dmu_buf_impl_t *db)
 		ASSERT3U(db->db_level, <, dn->dn_nlevels);
 		ASSERT(db->db_blkid == DMU_BONUS_BLKID ||
 		    db->db_blkid == DMU_SPILL_BLKID ||
-		    !list_is_empty(&dn->dn_dbufs));
+		    !avl_is_empty(&dn->dn_dbufs));
 	}
 	if (db->db_blkid == DMU_BONUS_BLKID) {
 		ASSERT(dn != NULL);
@@ -429,7 +437,6 @@ static void
 dbuf_set_data(dmu_buf_impl_t *db, arc_buf_t *buf)
 {
 	ASSERT(MUTEX_HELD(&db->db_mtx));
-	ASSERT(db->db_buf == NULL || !arc_has_callback(db->db_buf));
 	db->db_buf = buf;
 	if (buf != NULL) {
 		ASSERT(buf->b_data != NULL);
@@ -519,7 +526,7 @@ static void
 dbuf_read_impl(dmu_buf_impl_t *db, zio_t *zio, uint32_t *flags)
 {
 	dnode_t *dn;
-	zbookmark_t zb;
+	zbookmark_phys_t zb;
 	uint32_t aflags = ARC_NOWAIT;
 
 	DB_DNODE_ENTER(db);
@@ -803,18 +810,30 @@ dbuf_unoverride(dbuf_dirty_record_t *dr)
  * receive; see comment below for details.
  */
 void
-dbuf_free_range(dnode_t *dn, uint64_t start, uint64_t end, dmu_tx_t *tx)
+dbuf_free_range(dnode_t *dn, uint64_t start_blkid, uint64_t end_blkid,
+    dmu_tx_t *tx)
 {
-	dmu_buf_impl_t *db, *db_next;
+	dmu_buf_impl_t *db, *db_next, db_search;
 	uint64_t txg = tx->tx_txg;
+	avl_index_t where;
 
-	if (end > dn->dn_maxblkid && (end != DMU_SPILL_BLKID))
-		end = dn->dn_maxblkid;
-	dprintf_dnode(dn, "start=%llu end=%llu\n", start, end);
+	if (end_blkid > dn->dn_maxblkid && (end_blkid != DMU_SPILL_BLKID))
+		end_blkid = dn->dn_maxblkid;
+	dprintf_dnode(dn, "start=%llu end=%llu\n", start_blkid, end_blkid);
+
+	db_search.db_level = 0;
+	db_search.db_blkid = start_blkid;
+	db_search.db_creation = 0;
 
 	mutex_enter(&dn->dn_dbufs_mtx);
-	if (start >= dn->dn_unlisted_l0_blkid * dn->dn_datablksz) {
+	if (start_blkid >= dn->dn_unlisted_l0_blkid) {
 		/* There can't be any dbufs in this range; no need to search. */
+#ifdef DEBUG
+		db = avl_find(&dn->dn_dbufs, &db_search, &where);
+		ASSERT3P(db, ==, NULL);
+		db = avl_nearest(&dn->dn_dbufs, where, AVL_AFTER);
+		ASSERT(db == NULL || db->db_level > 0);
+#endif
 		mutex_exit(&dn->dn_dbufs_mtx);
 		return;
 	} else if (dmu_objset_is_receiving(dn->dn_objset)) {
@@ -828,14 +847,18 @@ 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 != NULL; db = db_next) {
-		db_next = list_next(&dn->dn_dbufs, db);
+	db = avl_find(&dn->dn_dbufs, &db_search, &where);
+	ASSERT3P(db, ==, NULL);
+	db = avl_nearest(&dn->dn_dbufs, where, AVL_AFTER);
+
+	for (; db != NULL; db = db_next) {
+		db_next = AVL_NEXT(&dn->dn_dbufs, db);
 		ASSERT(db->db_blkid != DMU_BONUS_BLKID);
 
-		if (db->db_level != 0)
-			continue;
-		if (db->db_blkid < start || db->db_blkid > end)
-			continue;
+		if (db->db_level != 0 || db->db_blkid > end_blkid) {
+			break;
+		}
+		ASSERT3U(db->db_blkid, >=, start_blkid);
 
 		/* found a level 0 buffer in the range */
 		mutex_enter(&db->db_mtx);
@@ -1351,6 +1374,12 @@ dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_t *tx)
 		if (dr->dt.dl.dr_data != db->db_buf)
 			VERIFY(arc_buf_remove_ref(dr->dt.dl.dr_data, db));
 	}
+
+	if (db->db_level != 0) {
+		mutex_destroy(&dr->dt.di.dr_mtx);
+		list_destroy(&dr->dt.di.dr_children);
+	}
+
 	kmem_free(dr, sizeof (dbuf_dirty_record_t));
 
 	ASSERT(db->db_dirtycnt > 0);
@@ -1435,6 +1464,38 @@ dbuf_fill_done(dmu_buf_impl_t *db, dmu_tx_t *tx)
 	mutex_exit(&db->db_mtx);
 }
 
+void
+dmu_buf_write_embedded(dmu_buf_t *dbuf, void *data,
+    bp_embedded_type_t etype, enum zio_compress comp,
+    int uncompressed_size, int compressed_size, int byteorder,
+    dmu_tx_t *tx)
+{
+	dmu_buf_impl_t *db = (dmu_buf_impl_t *)dbuf;
+	struct dirty_leaf *dl;
+	dmu_object_type_t type;
+
+	DB_DNODE_ENTER(db);
+	type = DB_DNODE(db)->dn_type;
+	DB_DNODE_EXIT(db);
+
+	ASSERT0(db->db_level);
+	ASSERT(db->db_blkid != DMU_BONUS_BLKID);
+
+	dmu_buf_will_not_fill(dbuf, tx);
+
+	ASSERT3U(db->db_last_dirty->dr_txg, ==, tx->tx_txg);
+	dl = &db->db_last_dirty->dt.dl;
+	encode_embedded_bp_compressed(&dl->dr_overridden_by,
+	    data, comp, uncompressed_size, compressed_size);
+	BPE_SET_ETYPE(&dl->dr_overridden_by, etype);
+	BP_SET_TYPE(&dl->dr_overridden_by, type);
+	BP_SET_LEVEL(&dl->dr_overridden_by, 0);
+	BP_SET_BYTEORDER(&dl->dr_overridden_by, byteorder);
+
+	dl->dr_override_state = DR_OVERRIDDEN;
+	dl->dr_overridden_by.blk_birth = db->db_last_dirty->dr_txg;
+}
+
 /*
  * Directly assign a provided arc buf to a given dbuf if it's not referenced
  * by anybody except our caller. Otherwise copy arcbuf's contents to dbuf.
@@ -1504,12 +1565,15 @@ dbuf_assign_arcbuf(dmu_buf_impl_t *db, arc_buf_t *buf, dmu_tx_t *tx)
  * 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:
- *	dbuf_clear()->arc_buf_evict()->dbuf_do_evict()->dbuf_destroy()
+ *	dbuf_clear()->arc_clear_callback()->dbuf_do_evict()->dbuf_destroy()
  * For the arc callback, we will usually see:
  *	dbuf_do_evict()->dbuf_clear();dbuf_destroy()
  * Sometimes, though, we will get a mix of these two:
- *	DMU: dbuf_clear()->arc_buf_evict()
+ *	DMU: dbuf_clear()->arc_clear_callback()
  *	ARC: dbuf_do_evict()->dbuf_destroy()
+ *
+ * This routine will dissociate the dbuf from the arc, by calling
+ * arc_clear_callback(), but will not evict the data from the ARC.
  */
 void
 dbuf_clear(dmu_buf_impl_t *db)
@@ -1517,7 +1581,7 @@ dbuf_clear(dmu_buf_impl_t *db)
 	dnode_t *dn;
 	dmu_buf_impl_t *parent = db->db_parent;
 	dmu_buf_impl_t *dndb;
-	int dbuf_gone = FALSE;
+	boolean_t dbuf_gone = B_FALSE;
 
 	ASSERT(MUTEX_HELD(&db->db_mtx));
 	ASSERT(refcount_is_zero(&db->db_holds));
@@ -1544,7 +1608,7 @@ dbuf_clear(dmu_buf_impl_t *db)
 	dn = DB_DNODE(db);
 	dndb = dn->dn_dbuf;
 	if (db->db_blkid != DMU_BONUS_BLKID && MUTEX_HELD(&dn->dn_dbufs_mtx)) {
-		list_remove(&dn->dn_dbufs, db);
+		avl_remove(&dn->dn_dbufs, db);
 		(void) atomic_dec_32_nv(&dn->dn_dbufs_count);
 		membar_producer();
 		DB_DNODE_EXIT(db);
@@ -1563,7 +1627,7 @@ dbuf_clear(dmu_buf_impl_t *db)
 	}
 
 	if (db->db_buf)
-		dbuf_gone = arc_buf_evict(db->db_buf);
+		dbuf_gone = arc_clear_callback(db->db_buf);
 
 	if (!dbuf_gone)
 		mutex_exit(&db->db_mtx);
@@ -1707,7 +1771,7 @@ dbuf_create(dnode_t *dn, uint8_t level, uint64_t blkid,
 		mutex_exit(&dn->dn_dbufs_mtx);
 		return (odb);
 	}
-	list_insert_head(&dn->dn_dbufs, db);
+	avl_add(&dn->dn_dbufs, db);
 	if (db->db_level == 0 && db->db_blkid >=
 	    dn->dn_unlisted_l0_blkid)
 		dn->dn_unlisted_l0_blkid = db->db_blkid + 1;
@@ -1731,8 +1795,7 @@ dbuf_create(dnode_t *dn, uint8_t level, uint64_t blkid,
 static int
 dbuf_do_evict(void *private)
 {
-	arc_buf_t *buf = private;
-	dmu_buf_impl_t *db = buf->b_private;
+	dmu_buf_impl_t *db = private;
 
 	if (!MUTEX_HELD(&db->db_mtx))
 		mutex_enter(&db->db_mtx);
@@ -1767,7 +1830,7 @@ dbuf_destroy(dmu_buf_impl_t *db)
 			DB_DNODE_ENTER(db);
 			dn = DB_DNODE(db);
 			mutex_enter(&dn->dn_dbufs_mtx);
-			list_remove(&dn->dn_dbufs, db);
+			avl_remove(&dn->dn_dbufs, db);
 			(void) atomic_dec_32_nv(&dn->dn_dbufs_count);
 			mutex_exit(&dn->dn_dbufs_mtx);
 			DB_DNODE_EXIT(db);
@@ -1785,7 +1848,6 @@ dbuf_destroy(dmu_buf_impl_t *db)
 	db->db_parent = NULL;
 	db->db_buf = NULL;
 
-	ASSERT(!list_link_active(&db->db_link));
 	ASSERT(db->db.db_data == NULL);
 	ASSERT(db->db_hash_next == NULL);
 	ASSERT(db->db_blkptr == NULL);
@@ -1819,10 +1881,10 @@ dbuf_prefetch(dnode_t *dn, uint64_t blkid, zio_priority_t prio)
 	}
 
 	if (dbuf_findbp(dn, 0, blkid, TRUE, &db, &bp) == 0) {
-		if (bp && !BP_IS_HOLE(bp)) {
+		if (bp && !BP_IS_HOLE(bp) && !BP_IS_EMBEDDED(bp)) {
 			dsl_dataset_t *ds = dn->dn_objset->os_dsl_dataset;
 			uint32_t aflags = ARC_NOWAIT | ARC_PREFETCH;
-			zbookmark_t zb;
+			zbookmark_phys_t zb;
 
 			SET_BOOKMARK(&zb, ds ? ds->ds_object : DMU_META_OBJSET,
 			    dn->dn_object, 0, blkid);
@@ -2095,11 +2157,23 @@ dbuf_rele_and_unlock(dmu_buf_impl_t *db, void *tag)
 			 * block on-disk. If so, then we simply evict
 			 * ourselves.
 			 */
-			if (!DBUF_IS_CACHEABLE(db) ||
-			    arc_buf_eviction_needed(db->db_buf))
+			if (!DBUF_IS_CACHEABLE(db)) {
+				if (db->db_blkptr != NULL &&
+				    !BP_IS_HOLE(db->db_blkptr) &&
+				    !BP_IS_EMBEDDED(db->db_blkptr)) {
+					spa_t *spa =
+					    dmu_objset_spa(db->db_objset);
+					blkptr_t bp = *db->db_blkptr;
+					dbuf_clear(db);
+					arc_freed(spa, &bp);
+				} else {
+					dbuf_clear(db);
+				}
+			} else if (arc_buf_eviction_needed(db->db_buf)) {
 				dbuf_clear(db);
-			else
+			} else {
 				mutex_exit(&db->db_mtx);
+			}
 		}
 	} else {
 		mutex_exit(&db->db_mtx);
@@ -2455,7 +2529,7 @@ dbuf_write_ready(zio_t *zio, arc_buf_t *buf, void *vdb)
 	uint64_t fill = 0;
 	int i;
 
-	ASSERT(db->db_blkptr == bp);
+	ASSERT3P(db->db_blkptr, ==, bp);
 
 	DB_DNODE_ENTER(db);
 	dn = DB_DNODE(db);
@@ -2467,7 +2541,8 @@ dbuf_write_ready(zio_t *zio, arc_buf_t *buf, void *vdb)
 		ASSERT((db->db_blkid != DMU_SPILL_BLKID &&
 		    BP_GET_TYPE(bp) == dn->dn_type) ||
 		    (db->db_blkid == DMU_SPILL_BLKID &&
-		    BP_GET_TYPE(bp) == dn->dn_bonustype));
+		    BP_GET_TYPE(bp) == dn->dn_bonustype) ||
+		    BP_IS_EMBEDDED(bp));
 		ASSERT(BP_GET_LEVEL(bp) == db->db_level);
 	}
 
@@ -2508,12 +2583,13 @@ dbuf_write_ready(zio_t *zio, arc_buf_t *buf, void *vdb)
 		for (i = db->db.db_size >> SPA_BLKPTRSHIFT; i > 0; i--, ibp++) {
 			if (BP_IS_HOLE(ibp))
 				continue;
-			fill += ibp->blk_fill;
+			fill += BP_GET_FILL(ibp);
 		}
 	}
 	DB_DNODE_EXIT(db);
 
-	bp->blk_fill = fill;
+	if (!BP_IS_EMBEDDED(bp))
+		bp->blk_fill = fill;
 
 	mutex_exit(&db->db_mtx);
 }
@@ -2625,7 +2701,8 @@ dbuf_write_done(zio_t *zio, arc_buf_t *buf, void *vdb)
 			    dn->dn_phys->dn_maxblkid >> (db->db_level * epbs));
 			ASSERT3U(BP_GET_LSIZE(db->db_blkptr), ==,
 			    db->db.db_size);
-			arc_set_callback(db->db_buf, dbuf_do_evict, db);
+			if (!arc_released(db->db_buf))
+				arc_set_callback(db->db_buf, dbuf_do_evict, db);
 		}
 		DB_DNODE_EXIT(db);
 		mutex_destroy(&dr->dt.di.dr_mtx);
@@ -2688,7 +2765,7 @@ dbuf_write(dbuf_dirty_record_t *dr, arc_buf_t *data, dmu_tx_t *tx)
 	objset_t *os;
 	dmu_buf_impl_t *parent = db->db_parent;
 	uint64_t txg = tx->tx_txg;
-	zbookmark_t zb;
+	zbookmark_phys_t zb;
 	zio_prop_t zp;
 	zio_t *zio;
 	int wp_flag = 0;
@@ -2751,10 +2828,16 @@ dbuf_write(dbuf_dirty_record_t *dr, arc_buf_t *data, dmu_tx_t *tx)
 	dmu_write_policy(os, dn, db->db_level, wp_flag, &zp);
 	DB_DNODE_EXIT(db);
 
-	if (db->db_level == 0 && dr->dt.dl.dr_override_state == DR_OVERRIDDEN) {
-		ASSERT(db->db_state != DB_NOFILL);
+	if (db->db_level == 0 &&
+	    dr->dt.dl.dr_override_state == DR_OVERRIDDEN) {
+		/*
+		 * The BP for this block has been provided by open context
+		 * (by dmu_sync() or dmu_buf_write_embedded()).
+		 */
+		void *contents = (data != NULL) ? data->b_data : NULL;
+
 		dr->dr_zio = zio_write(zio, os->os_spa, txg,
-		    db->db_blkptr, data->b_data, arc_buf_size(data), &zp,
+		    db->db_blkptr, contents, db->db.db_size, &zp,
 		    dbuf_write_override_ready, NULL, dbuf_write_override_done,
 		    dr, ZIO_PRIORITY_ASYNC_WRITE, ZIO_FLAG_MUSTSUCCEED, &zb);
 		mutex_enter(&db->db_mtx);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c
index 7863e6a66016..df5b77e14e89 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c
@@ -44,8 +44,7 @@ int zfs_dedup_prefetch = 1;
 
 SYSCTL_DECL(_vfs_zfs);
 SYSCTL_NODE(_vfs_zfs, OID_AUTO, dedup, CTLFLAG_RW, 0, "ZFS DEDUP");
-TUNABLE_INT("vfs.zfs.dedup.prefetch", &zfs_dedup_prefetch);
-SYSCTL_INT(_vfs_zfs_dedup, OID_AUTO, prefetch, CTLFLAG_RW, &zfs_dedup_prefetch,
+SYSCTL_INT(_vfs_zfs_dedup, OID_AUTO, prefetch, CTLFLAG_RWTUN, &zfs_dedup_prefetch,
     0, "Enable/disable prefetching of dedup-ed blocks which are going to be freed");
 
 static const ddt_ops_t *ddt_ops[DDT_TYPES] = {
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 4aa1c88d0a1d..e3558f8244ac 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
@@ -20,10 +20,11 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 /* Copyright (c) 2013 by Saso Kiselkov. All rights reserved. */
 /* Copyright (c) 2013, Joyent, Inc. All rights reserved. */
+/* Copyright (c) 2014, Nexenta Systems, Inc. All rights reserved. */
 
 #include <sys/dmu.h>
 #include <sys/dmu_impl.h>
@@ -44,6 +45,7 @@
 #include <sys/zio_checksum.h>
 #include <sys/zio_compress.h>
 #include <sys/sa.h>
+#include <sys/zfeature.h>
 #ifdef _KERNEL
 #include <sys/vm.h>
 #include <sys/zfs_znode.h>
@@ -54,7 +56,6 @@
  */
 int zfs_nopwrite_enabled = 1;
 SYSCTL_DECL(_vfs_zfs);
-TUNABLE_INT("vfs.zfs.nopwrite_enabled", &zfs_nopwrite_enabled);
 SYSCTL_INT(_vfs_zfs, OID_AUTO, nopwrite_enabled, CTLFLAG_RDTUN,
     &zfs_nopwrite_enabled, 0, "Enable nopwrite feature");
 
@@ -129,17 +130,13 @@ const dmu_object_byteswap_info_t dmu_ot_byteswap[DMU_BSWAP_NUMFUNCS] = {
 };
 
 int
-dmu_buf_hold(objset_t *os, uint64_t object, uint64_t offset,
-    void *tag, dmu_buf_t **dbp, int flags)
+dmu_buf_hold_noread(objset_t *os, uint64_t object, uint64_t offset,
+    void *tag, dmu_buf_t **dbp)
 {
 	dnode_t *dn;
 	uint64_t blkid;
 	dmu_buf_impl_t *db;
 	int err;
-	int db_flags = DB_RF_CANFAIL;
-
-	if (flags & DMU_READ_NO_PREFETCH)
-		db_flags |= DB_RF_NOPREFETCH;
 
 	err = dnode_hold(os, object, FTAG, &dn);
 	if (err)
@@ -148,18 +145,37 @@ dmu_buf_hold(objset_t *os, uint64_t object, uint64_t offset,
 	rw_enter(&dn->dn_struct_rwlock, RW_READER);
 	db = dbuf_hold(dn, blkid, tag);
 	rw_exit(&dn->dn_struct_rwlock);
+	dnode_rele(dn, FTAG);
+
 	if (db == NULL) {
-		err = SET_ERROR(EIO);
-	} else {
+		*dbp = NULL;
+		return (SET_ERROR(EIO));
+	}
+
+	*dbp = &db->db;
+	return (err);
+}
+
+int
+dmu_buf_hold(objset_t *os, uint64_t object, uint64_t offset,
+    void *tag, dmu_buf_t **dbp, int flags)
+{
+	int err;
+	int db_flags = DB_RF_CANFAIL;
+
+	if (flags & DMU_READ_NO_PREFETCH)
+		db_flags |= DB_RF_NOPREFETCH;
+
+	err = dmu_buf_hold_noread(os, object, offset, tag, dbp);
+	if (err == 0) {
+		dmu_buf_impl_t *db = (dmu_buf_impl_t *)(*dbp);
 		err = dbuf_read(db, NULL, db_flags);
-		if (err) {
+		if (err != 0) {
 			dbuf_rele(db, tag);
-			db = NULL;
+			*dbp = NULL;
 		}
 	}
 
-	dnode_rele(dn, FTAG);
-	*dbp = &db->db; /* NULL db plus first field offset is NULL */
 	return (err);
 }
 
@@ -656,6 +672,12 @@ dmu_free_long_range_impl(objset_t *os, dnode_t *dn, uint64_t offset,
 		dmu_tx_t *tx = dmu_tx_create(os);
 		dmu_tx_hold_free(tx, dn->dn_object,
 		    chunk_begin, chunk_end - chunk_begin);
+
+		/*
+		 * Mark this transaction as typically resulting in a net
+		 * reduction in space used.
+		 */
+		dmu_tx_mark_netfree(tx);
 		err = dmu_tx_assign(tx, TXG_WAIT);
 		if (err) {
 			dmu_tx_abort(tx);
@@ -707,6 +729,7 @@ dmu_free_long_object(objset_t *os, uint64_t object)
 	tx = dmu_tx_create(os);
 	dmu_tx_hold_bonus(tx, object);
 	dmu_tx_hold_free(tx, object, 0, DMU_OBJECT_END);
+	dmu_tx_mark_netfree(tx);
 	err = dmu_tx_assign(tx, TXG_WAIT);
 	if (err == 0) {
 		err = dmu_object_free(os, object, tx);
@@ -855,6 +878,25 @@ dmu_prealloc(objset_t *os, uint64_t object, uint64_t offset, uint64_t size,
 	dmu_buf_rele_array(dbp, numbufs, FTAG);
 }
 
+void
+dmu_write_embedded(objset_t *os, uint64_t object, uint64_t offset,
+    void *data, uint8_t etype, uint8_t comp, int uncompressed_size,
+    int compressed_size, int byteorder, dmu_tx_t *tx)
+{
+	dmu_buf_t *db;
+
+	ASSERT3U(etype, <, NUM_BP_EMBEDDED_TYPES);
+	ASSERT3U(comp, <, ZIO_COMPRESS_FUNCTIONS);
+	VERIFY0(dmu_buf_hold_noread(os, object, offset,
+	    FTAG, &db));
+
+	dmu_buf_write_embedded(db,
+	    data, (bp_embedded_type_t)etype, (enum zio_compress)comp,
+	    uncompressed_size, compressed_size, byteorder, tx);
+
+	dmu_buf_rele(db, FTAG);
+}
+
 /*
  * DMU support for xuio
  */
@@ -1332,7 +1374,7 @@ dmu_sync_ready(zio_t *zio, arc_buf_t *buf, void *varg)
 			 * block size still needs to be known for replay.
 			 */
 			BP_SET_LSIZE(bp, db->db_size);
-		} else {
+		} else if (!BP_IS_EMBEDDED(bp)) {
 			ASSERT(BP_GET_LEVEL(bp) == 0);
 			bp->blk_fill = 1;
 		}
@@ -1414,7 +1456,7 @@ dmu_sync_late_arrival_done(zio_t *zio)
 
 static int
 dmu_sync_late_arrival(zio_t *pio, objset_t *os, dmu_sync_cb_t *done, zgd_t *zgd,
-    zio_prop_t *zp, zbookmark_t *zb)
+    zio_prop_t *zp, zbookmark_phys_t *zb)
 {
 	dmu_sync_arg_t *dsa;
 	dmu_tx_t *tx;
@@ -1475,7 +1517,7 @@ dmu_sync(zio_t *pio, uint64_t txg, dmu_sync_cb_t *done, zgd_t *zgd)
 	dsl_dataset_t *ds = os->os_dsl_dataset;
 	dbuf_dirty_record_t *dr;
 	dmu_sync_arg_t *dsa;
-	zbookmark_t zb;
+	zbookmark_phys_t zb;
 	zio_prop_t zp;
 	dnode_t *dn;
 
@@ -1603,9 +1645,15 @@ dmu_object_set_checksum(objset_t *os, uint64_t object, uint8_t checksum,
 {
 	dnode_t *dn;
 
-	/* XXX assumes dnode_hold will not get an i/o error */
-	(void) dnode_hold(os, object, FTAG, &dn);
-	ASSERT(checksum < ZIO_CHECKSUM_FUNCTIONS);
+	/*
+	 * Send streams include each object's checksum function.  This
+	 * check ensures that the receiving system can understand the
+	 * checksum function transmitted.
+	 */
+	ASSERT3U(checksum, <, ZIO_CHECKSUM_LEGACY_FUNCTIONS);
+
+	VERIFY0(dnode_hold(os, object, FTAG, &dn));
+	ASSERT3U(checksum, <, ZIO_CHECKSUM_FUNCTIONS);
 	dn->dn_checksum = checksum;
 	dnode_setdirty(dn, tx);
 	dnode_rele(dn, FTAG);
@@ -1617,17 +1665,21 @@ dmu_object_set_compress(objset_t *os, uint64_t object, uint8_t compress,
 {
 	dnode_t *dn;
 
-	/* XXX assumes dnode_hold will not get an i/o error */
-	(void) dnode_hold(os, object, FTAG, &dn);
-	ASSERT(compress < ZIO_COMPRESS_FUNCTIONS);
+	/*
+	 * Send streams include each object's compression function.  This
+	 * check ensures that the receiving system can understand the
+	 * compression function transmitted.
+	 */
+	ASSERT3U(compress, <, ZIO_COMPRESS_LEGACY_FUNCTIONS);
+
+	VERIFY0(dnode_hold(os, object, FTAG, &dn));
 	dn->dn_compress = compress;
 	dnode_setdirty(dn, tx);
 	dnode_rele(dn, FTAG);
 }
 
 int zfs_mdcomp_disable = 0;
-TUNABLE_INT("vfs.zfs.mdcomp_disable", &zfs_mdcomp_disable);
-SYSCTL_INT(_vfs_zfs, OID_AUTO, mdcomp_disable, CTLFLAG_RW,
+SYSCTL_INT(_vfs_zfs, OID_AUTO, mdcomp_disable, CTLFLAG_RWTUN,
     &zfs_mdcomp_disable, 0, "Disable metadata compression");
 
 /*
@@ -1662,8 +1714,16 @@ dmu_write_policy(objset_t *os, dnode_t *dn, int level, int wp, zio_prop_t *zp)
 		 * XXX -- we should design a compression algorithm
 		 * that specializes in arrays of bps.
 		 */
-		compress = zfs_mdcomp_disable ? ZIO_COMPRESS_EMPTY :
-		    ZIO_COMPRESS_LZJB;
+		boolean_t lz4_ac = spa_feature_is_active(os->os_spa,
+		    SPA_FEATURE_LZ4_COMPRESS);
+
+		if (zfs_mdcomp_disable) {
+			compress = ZIO_COMPRESS_EMPTY;
+		} else if (lz4_ac) {
+			compress = ZIO_COMPRESS_LZ4;
+		} else {
+			compress = ZIO_COMPRESS_LZJB;
+		}
 
 		/*
 		 * Metadata always gets checksummed.  If the data
@@ -1789,7 +1849,7 @@ dmu_object_info_from_dnode(dnode_t *dn, dmu_object_info_t *doi)
 	doi->doi_max_offset = (dn->dn_maxblkid + 1) * dn->dn_datablksz;
 	doi->doi_fill_count = 0;
 	for (int i = 0; i < dnp->dn_nblkptr; i++)
-		doi->doi_fill_count += dnp->dn_blkptr[i].blk_fill;
+		doi->doi_fill_count += BP_GET_FILL(&dnp->dn_blkptr[i]);
 
 	mutex_exit(&dn->dn_mtx);
 	rw_exit(&dn->dn_struct_rwlock);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c
index 7d5915926c9e..39faeb5dae94 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/dmu.h>
@@ -130,7 +130,7 @@ report_dnode(struct diffarg *da, uint64_t object, dnode_phys_t *dnp)
 /* ARGSUSED */
 static int
 diff_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
 	struct diffarg *da = arg;
 	int err = 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 ef82f17683f6..73b8e056cc8c 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
@@ -286,7 +286,7 @@ dmu_objset_open_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp,
 	os->os_rootbp = bp;
 	if (!BP_IS_HOLE(os->os_rootbp)) {
 		uint32_t aflags = ARC_WAIT;
-		zbookmark_t zb;
+		zbookmark_phys_t zb;
 		SET_BOOKMARK(&zb, ds ? ds->ds_object : DMU_META_OBJSET,
 		    ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
 
@@ -338,7 +338,7 @@ dmu_objset_open_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp,
 	 * default (fletcher2/off).  Snapshots don't need to know about
 	 * checksum/compression/copies.
 	 */
-	if (ds) {
+	if (ds != NULL) {
 		err = dsl_prop_register(ds,
 		    zfs_prop_to_name(ZFS_PROP_PRIMARYCACHE),
 		    primary_cache_changed_cb, os);
@@ -391,7 +391,7 @@ dmu_objset_open_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp,
 			kmem_free(os, sizeof (objset_t));
 			return (err);
 		}
-	} else if (ds == NULL) {
+	} else {
 		/* It's the meta-objset. */
 		os->os_checksum = ZIO_CHECKSUM_FLETCHER_4;
 		os->os_compress = ZIO_COMPRESS_LZJB;
@@ -435,17 +435,6 @@ dmu_objset_open_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp,
 		    &os->os_groupused_dnode);
 	}
 
-	/*
-	 * We should be the only thread trying to do this because we
-	 * have ds_opening_lock
-	 */
-	if (ds) {
-		mutex_enter(&ds->ds_lock);
-		ASSERT(ds->ds_objset == NULL);
-		ds->ds_objset = os;
-		mutex_exit(&ds->ds_lock);
-	}
-
 	*osp = os;
 	return (0);
 }
@@ -456,11 +445,19 @@ dmu_objset_from_ds(dsl_dataset_t *ds, objset_t **osp)
 	int err = 0;
 
 	mutex_enter(&ds->ds_opening_lock);
-	*osp = ds->ds_objset;
-	if (*osp == NULL) {
+	if (ds->ds_objset == NULL) {
+		objset_t *os;
 		err = dmu_objset_open_impl(dsl_dataset_get_spa(ds),
-		    ds, dsl_dataset_get_blkptr(ds), osp);
+		    ds, dsl_dataset_get_blkptr(ds), &os);
+
+		if (err == 0) {
+			mutex_enter(&ds->ds_lock);
+			ASSERT(ds->ds_objset == NULL);
+			ds->ds_objset = os;
+			mutex_exit(&ds->ds_lock);
+		}
 	}
+	*osp = ds->ds_objset;
 	mutex_exit(&ds->ds_opening_lock);
 	return (err);
 }
@@ -835,7 +832,8 @@ dmu_objset_create(const char *name, dmu_objset_type_t type, uint64_t flags,
 	doca.doca_type = type;
 
 	return (dsl_sync_task(name,
-	    dmu_objset_create_check, dmu_objset_create_sync, &doca, 5));
+	    dmu_objset_create_check, dmu_objset_create_sync, &doca,
+	    5, ZFS_SPACE_CHECK_NORMAL));
 }
 
 typedef struct dmu_objset_clone_arg {
@@ -934,7 +932,8 @@ dmu_objset_clone(const char *clone, const char *origin)
 	doca.doca_cred = CRED();
 
 	return (dsl_sync_task(clone,
-	    dmu_objset_clone_check, dmu_objset_clone_sync, &doca, 5));
+	    dmu_objset_clone_check, dmu_objset_clone_sync, &doca,
+	    5, ZFS_SPACE_CHECK_NORMAL));
 }
 
 int
@@ -986,6 +985,7 @@ dmu_objset_write_ready(zio_t *zio, arc_buf_t *abuf, void *arg)
 	objset_t *os = arg;
 	dnode_phys_t *dnp = &os->os_phys->os_meta_dnode;
 
+	ASSERT(!BP_IS_EMBEDDED(bp));
 	ASSERT3P(bp, ==, os->os_rootbp);
 	ASSERT3U(BP_GET_TYPE(bp), ==, DMU_OT_OBJSET);
 	ASSERT0(BP_GET_LEVEL(bp));
@@ -998,7 +998,7 @@ dmu_objset_write_ready(zio_t *zio, arc_buf_t *abuf, void *arg)
 	 */
 	bp->blk_fill = 0;
 	for (int i = 0; i < dnp->dn_nblkptr; i++)
-		bp->blk_fill += dnp->dn_blkptr[i].blk_fill;
+		bp->blk_fill += BP_GET_FILL(&dnp->dn_blkptr[i]);
 }
 
 /* ARGSUSED */
@@ -1025,7 +1025,7 @@ void
 dmu_objset_sync(objset_t *os, zio_t *pio, dmu_tx_t *tx)
 {
 	int txgoff;
-	zbookmark_t zb;
+	zbookmark_phys_t zb;
 	zio_prop_t zp;
 	zio_t *zio;
 	list_t *list;
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
index d3efa553e4bf..7c5b5f3deff4 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
@@ -21,7 +21,7 @@
 /*
  * 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) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2014, Joyent, Inc. All rights reserved.
  * Copyright (c) 2012, Martin Matuska <mm@FreeBSD.org>. All rights reserved.
  */
@@ -49,7 +49,14 @@
 #include <sys/zfs_onexit.h>
 #include <sys/dmu_send.h>
 #include <sys/dsl_destroy.h>
+#include <sys/blkptr.h>
 #include <sys/dsl_bookmark.h>
+#include <sys/zfeature.h>
+
+#ifdef __FreeBSD__
+#undef dump_write
+#define dump_write dmu_dump_write
+#endif
 
 /* Set this tunable to TRUE to replace corrupt data with 0x2f5baddb10c */
 int zfs_send_corrupt_data = B_FALSE;
@@ -184,7 +191,7 @@ dump_free(dmu_sendarg_t *dsp, uint64_t object, uint64_t offset,
 }
 
 static int
-dump_data(dmu_sendarg_t *dsp, dmu_object_type_t type,
+dump_write(dmu_sendarg_t *dsp, dmu_object_type_t type,
     uint64_t object, uint64_t offset, int blksz, const blkptr_t *bp, void *data)
 {
 	struct drr_write *drrw = &(dsp->dsa_drr->drr_u.drr_write);
@@ -219,13 +226,22 @@ dump_data(dmu_sendarg_t *dsp, dmu_object_type_t type,
 	drrw->drr_offset = offset;
 	drrw->drr_length = blksz;
 	drrw->drr_toguid = dsp->dsa_toguid;
-	drrw->drr_checksumtype = BP_GET_CHECKSUM(bp);
-	if (zio_checksum_table[drrw->drr_checksumtype].ci_dedup)
-		drrw->drr_checksumflags |= DRR_CHECKSUM_DEDUP;
-	DDK_SET_LSIZE(&drrw->drr_key, BP_GET_LSIZE(bp));
-	DDK_SET_PSIZE(&drrw->drr_key, BP_GET_PSIZE(bp));
-	DDK_SET_COMPRESS(&drrw->drr_key, BP_GET_COMPRESS(bp));
-	drrw->drr_key.ddk_cksum = bp->blk_cksum;
+	if (BP_IS_EMBEDDED(bp)) {
+		/*
+		 * There's no pre-computed checksum of embedded BP's, so
+		 * (like fletcher4-checkummed blocks) userland will have
+		 * to compute a dedup-capable checksum itself.
+		 */
+		drrw->drr_checksumtype = ZIO_CHECKSUM_OFF;
+	} else {
+		drrw->drr_checksumtype = BP_GET_CHECKSUM(bp);
+		if (zio_checksum_table[drrw->drr_checksumtype].ci_dedup)
+			drrw->drr_checksumflags |= DRR_CHECKSUM_DEDUP;
+		DDK_SET_LSIZE(&drrw->drr_key, BP_GET_LSIZE(bp));
+		DDK_SET_PSIZE(&drrw->drr_key, BP_GET_PSIZE(bp));
+		DDK_SET_COMPRESS(&drrw->drr_key, BP_GET_COMPRESS(bp));
+		drrw->drr_key.ddk_cksum = bp->blk_cksum;
+	}
 
 	if (dump_bytes(dsp, dsp->dsa_drr, sizeof (dmu_replay_record_t)) != 0)
 		return (SET_ERROR(EINTR));
@@ -234,6 +250,43 @@ dump_data(dmu_sendarg_t *dsp, dmu_object_type_t type,
 	return (0);
 }
 
+static int
+dump_write_embedded(dmu_sendarg_t *dsp, uint64_t object, uint64_t offset,
+    int blksz, const blkptr_t *bp)
+{
+	char buf[BPE_PAYLOAD_SIZE];
+	struct drr_write_embedded *drrw =
+	    &(dsp->dsa_drr->drr_u.drr_write_embedded);
+
+	if (dsp->dsa_pending_op != PENDING_NONE) {
+		if (dump_bytes(dsp, dsp->dsa_drr,
+		    sizeof (dmu_replay_record_t)) != 0)
+			return (EINTR);
+		dsp->dsa_pending_op = PENDING_NONE;
+	}
+
+	ASSERT(BP_IS_EMBEDDED(bp));
+
+	bzero(dsp->dsa_drr, sizeof (dmu_replay_record_t));
+	dsp->dsa_drr->drr_type = DRR_WRITE_EMBEDDED;
+	drrw->drr_object = object;
+	drrw->drr_offset = offset;
+	drrw->drr_length = blksz;
+	drrw->drr_toguid = dsp->dsa_toguid;
+	drrw->drr_compression = BP_GET_COMPRESS(bp);
+	drrw->drr_etype = BPE_GET_ETYPE(bp);
+	drrw->drr_lsize = BPE_GET_LSIZE(bp);
+	drrw->drr_psize = BPE_GET_PSIZE(bp);
+
+	decode_embedded_bp_compressed(bp, buf);
+
+	if (dump_bytes(dsp, dsp->dsa_drr, sizeof (dmu_replay_record_t)) != 0)
+		return (EINTR);
+	if (dump_bytes(dsp, buf, P2ROUNDUP(drrw->drr_psize, 8)) != 0)
+		return (EINTR);
+	return (0);
+}
+
 static int
 dump_spill(dmu_sendarg_t *dsp, uint64_t object, int blksz, void *data)
 {
@@ -354,6 +407,33 @@ dump_dnode(dmu_sendarg_t *dsp, uint64_t object, dnode_phys_t *dnp)
 	return (0);
 }
 
+static boolean_t
+backup_do_embed(dmu_sendarg_t *dsp, const blkptr_t *bp)
+{
+	if (!BP_IS_EMBEDDED(bp))
+		return (B_FALSE);
+
+	/*
+	 * Compression function must be legacy, or explicitly enabled.
+	 */
+	if ((BP_GET_COMPRESS(bp) >= ZIO_COMPRESS_LEGACY_FUNCTIONS &&
+	    !(dsp->dsa_featureflags & DMU_BACKUP_FEATURE_EMBED_DATA_LZ4)))
+		return (B_FALSE);
+
+	/*
+	 * Embed type must be explicitly enabled.
+	 */
+	switch (BPE_GET_ETYPE(bp)) {
+	case BP_EMBEDDED_TYPE_DATA:
+		if (dsp->dsa_featureflags & DMU_BACKUP_FEATURE_EMBED_DATA)
+			return (B_TRUE);
+		break;
+	default:
+		return (B_FALSE);
+	}
+	return (B_FALSE);
+}
+
 #define	BP_SPAN(dnp, level) \
 	(((uint64_t)dnp->dn_datablkszsec) << (SPA_MINBLOCKSHIFT + \
 	(level) * (dnp->dn_indblkshift - SPA_BLKPTRSHIFT)))
@@ -361,7 +441,7 @@ dump_dnode(dmu_sendarg_t *dsp, uint64_t object, dnode_phys_t *dnp)
 /* ARGSUSED */
 static int
 backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
 	dmu_sendarg_t *dsp = arg;
 	dmu_object_type_t type = bp ? BP_GET_TYPE(bp) : DMU_OT_NONE;
@@ -422,11 +502,17 @@ backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
 
 		err = dump_spill(dsp, zb->zb_object, blksz, abuf->b_data);
 		(void) arc_buf_remove_ref(abuf, &abuf);
+	} else if (backup_do_embed(dsp, bp)) {
+		/* it's an embedded level-0 block of a regular object */
+		int blksz = dnp->dn_datablkszsec << SPA_MINBLOCKSHIFT;
+		err = dump_write_embedded(dsp, zb->zb_object,
+		    zb->zb_blkid * blksz, blksz, bp);
 	} else { /* it's a level-0 block of a regular object */
 		uint32_t aflags = ARC_WAIT;
 		arc_buf_t *abuf;
 		int blksz = BP_GET_LSIZE(bp);
 
+		ASSERT3U(blksz, ==, dnp->dn_datablkszsec << SPA_MINBLOCKSHIFT);
 		ASSERT0(zb->zb_level);
 		if (arc_read(NULL, spa, bp, arc_getbuf_func, &abuf,
 		    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL,
@@ -445,7 +531,7 @@ backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
 			}
 		}
 
-		err = dump_data(dsp, type, zb->zb_object, zb->zb_blkid * blksz,
+		err = dump_write(dsp, type, zb->zb_object, zb->zb_blkid * blksz,
 		    blksz, bp, abuf->b_data);
 		(void) arc_buf_remove_ref(abuf, &abuf);
 	}
@@ -459,12 +545,11 @@ backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
  */
 static int
 dmu_send_impl(void *tag, dsl_pool_t *dp, dsl_dataset_t *ds,
+    zfs_bookmark_phys_t *fromzb, boolean_t is_clone, boolean_t embedok,
 #ifdef illumos
-    zfs_bookmark_phys_t *fromzb, boolean_t is_clone, int outfd,
-    vnode_t *vp, offset_t *off)
+    int outfd, vnode_t *vp, offset_t *off)
 #else
-    zfs_bookmark_phys_t *fromzb, boolean_t is_clone, int outfd,
-    struct file *fp, offset_t *off)
+    int outfd, struct file *fp, offset_t *off)
 #endif
 {
 	objset_t *os;
@@ -472,6 +557,7 @@ dmu_send_impl(void *tag, dsl_pool_t *dp, dsl_dataset_t *ds,
 	dmu_sendarg_t *dsp;
 	int err;
 	uint64_t fromtxg = 0;
+	uint64_t featureflags = 0;
 
 	err = dmu_objset_from_ds(ds, &os);
 	if (err != 0) {
@@ -494,13 +580,23 @@ dmu_send_impl(void *tag, dsl_pool_t *dp, dsl_dataset_t *ds,
 			return (SET_ERROR(EINVAL));
 		}
 		if (version >= ZPL_VERSION_SA) {
-			DMU_SET_FEATUREFLAGS(
-			    drr->drr_u.drr_begin.drr_versioninfo,
-			    DMU_BACKUP_FEATURE_SA_SPILL);
+			featureflags |= DMU_BACKUP_FEATURE_SA_SPILL;
 		}
 	}
 #endif
 
+	if (embedok &&
+	    spa_feature_is_active(dp->dp_spa, SPA_FEATURE_EMBEDDED_DATA)) {
+		featureflags |= DMU_BACKUP_FEATURE_EMBED_DATA;
+		if (spa_feature_is_active(dp->dp_spa, SPA_FEATURE_LZ4_COMPRESS))
+			featureflags |= DMU_BACKUP_FEATURE_EMBED_DATA_LZ4;
+	} else {
+		embedok = B_FALSE;
+	}
+
+	DMU_SET_FEATUREFLAGS(drr->drr_u.drr_begin.drr_versioninfo,
+	    featureflags);
+
 	drr->drr_u.drr_begin.drr_creation_time =
 	    ds->ds_phys->ds_creation_time;
 	drr->drr_u.drr_begin.drr_type = dmu_objset_type(os);
@@ -533,6 +629,7 @@ dmu_send_impl(void *tag, dsl_pool_t *dp, dsl_dataset_t *ds,
 	ZIO_SET_CHECKSUM(&dsp->dsa_zc, 0, 0, 0, 0);
 	dsp->dsa_pending_op = PENDING_NONE;
 	dsp->dsa_incremental = (fromzb != NULL);
+	dsp->dsa_featureflags = featureflags;
 
 	mutex_enter(&ds->ds_sendstream_lock);
 	list_insert_head(&ds->ds_sendstreams, dsp);
@@ -585,9 +682,9 @@ dmu_send_impl(void *tag, dsl_pool_t *dp, dsl_dataset_t *ds,
 int
 dmu_send_obj(const char *pool, uint64_t tosnap, uint64_t fromsnap,
 #ifdef illumos
-    int outfd, vnode_t *vp, offset_t *off)
+    boolean_t embedok, int outfd, vnode_t *vp, offset_t *off)
 #else
-    int outfd, struct file *fp, offset_t *off)
+    boolean_t embedok, int outfd, struct file *fp, offset_t *off)
 #endif
 {
 	dsl_pool_t *dp;
@@ -622,10 +719,10 @@ dmu_send_obj(const char *pool, uint64_t tosnap, uint64_t fromsnap,
 		zb.zbm_guid = fromds->ds_phys->ds_guid;
 		is_clone = (fromds->ds_dir != ds->ds_dir);
 		dsl_dataset_rele(fromds, FTAG);
-		err = dmu_send_impl(FTAG, dp, ds, &zb, is_clone,
+		err = dmu_send_impl(FTAG, dp, ds, &zb, is_clone, embedok,
 		    outfd, fp, off);
 	} else {
-		err = dmu_send_impl(FTAG, dp, ds, NULL, B_FALSE,
+		err = dmu_send_impl(FTAG, dp, ds, NULL, B_FALSE, embedok,
 		    outfd, fp, off);
 	}
 	dsl_dataset_rele(ds, FTAG);
@@ -633,7 +730,7 @@ dmu_send_obj(const char *pool, uint64_t tosnap, uint64_t fromsnap,
 }
 
 int
-dmu_send(const char *tosnap, const char *fromsnap,
+dmu_send(const char *tosnap, const char *fromsnap, boolean_t embedok,
 #ifdef illumos
     int outfd, vnode_t *vp, offset_t *off)
 #else
@@ -704,10 +801,10 @@ dmu_send(const char *tosnap, const char *fromsnap,
 			dsl_pool_rele(dp, FTAG);
 			return (err);
 		}
-		err = dmu_send_impl(FTAG, dp, ds, &zb, is_clone,
+		err = dmu_send_impl(FTAG, dp, ds, &zb, is_clone, embedok,
 		    outfd, fp, off);
 	} else {
-		err = dmu_send_impl(FTAG, dp, ds, NULL, B_FALSE,
+		err = dmu_send_impl(FTAG, dp, ds, NULL, B_FALSE, embedok,
 		    outfd, fp, off);
 	}
 	if (owned)
@@ -877,6 +974,7 @@ dmu_recv_begin_check(void *arg, dmu_tx_t *tx)
 	uint64_t fromguid = drrb->drr_fromguid;
 	int flags = drrb->drr_flags;
 	int error;
+	uint64_t featureflags = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo);
 	dsl_dataset_t *ds;
 	const char *tofs = drba->drba_cookie->drc_tofs;
 
@@ -890,11 +988,22 @@ dmu_recv_begin_check(void *arg, dmu_tx_t *tx)
 		return (SET_ERROR(EINVAL));
 
 	/* Verify pool version supports SA if SA_SPILL feature set */
-	if ((DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo) &
-	    DMU_BACKUP_FEATURE_SA_SPILL) &&
-	    spa_version(dp->dp_spa) < SPA_VERSION_SA) {
+	if ((featureflags & DMU_BACKUP_FEATURE_SA_SPILL) &&
+	    spa_version(dp->dp_spa) < SPA_VERSION_SA)
+		return (SET_ERROR(ENOTSUP));
+
+	/*
+	 * The receiving code doesn't know how to translate a WRITE_EMBEDDED
+	 * record to a plan WRITE record, so the pool must have the
+	 * EMBEDDED_DATA feature enabled if the stream has WRITE_EMBEDDED
+	 * records.  Same with WRITE_EMBEDDED records that use LZ4 compression.
+	 */
+	if ((featureflags & DMU_BACKUP_FEATURE_EMBED_DATA) &&
+	    !spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_EMBEDDED_DATA))
+		return (SET_ERROR(ENOTSUP));
+	if ((featureflags & DMU_BACKUP_FEATURE_EMBED_DATA_LZ4) &&
+	    !spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_LZ4_COMPRESS))
 		return (SET_ERROR(ENOTSUP));
-	}
 
 	error = dsl_dataset_hold(dp, tofs, FTAG, &ds);
 	if (error == 0) {
@@ -1087,7 +1196,7 @@ dmu_recv_begin(char *tofs, char *tosnap, struct drr_begin *drrb,
 	drba.drba_cred = CRED();
 
 	return (dsl_sync_task(tofs, dmu_recv_begin_check, dmu_recv_begin_sync,
-	    &drba, 5));
+	    &drba, 5, ZFS_SPACE_CHECK_NORMAL));
 }
 
 struct restorearg {
@@ -1214,7 +1323,6 @@ backup_byteswap(dmu_replay_record_t *drr)
 		break;
 	case DRR_OBJECT:
 		DO64(drr_object.drr_object);
-		/* DO64(drr_object.drr_allocation_txg); */
 		DO32(drr_object.drr_type);
 		DO32(drr_object.drr_bonustype);
 		DO32(drr_object.drr_blksz);
@@ -1252,6 +1360,14 @@ backup_byteswap(dmu_replay_record_t *drr)
 		DO64(drr_write_byref.drr_key.ddk_cksum.zc_word[3]);
 		DO64(drr_write_byref.drr_key.ddk_prop);
 		break;
+	case DRR_WRITE_EMBEDDED:
+		DO64(drr_write_embedded.drr_object);
+		DO64(drr_write_embedded.drr_offset);
+		DO64(drr_write_embedded.drr_length);
+		DO64(drr_write_embedded.drr_toguid);
+		DO32(drr_write_embedded.drr_lsize);
+		DO32(drr_write_embedded.drr_psize);
+		break;
 	case DRR_FREE:
 		DO64(drr_free.drr_object);
 		DO64(drr_free.drr_offset);
@@ -1439,7 +1555,7 @@ restore_write_byref(struct restorearg *ra, objset_t *os,
 	int err;
 	guid_map_entry_t gmesrch;
 	guid_map_entry_t *gmep;
-	avl_index_t	where;
+	avl_index_t where;
 	objset_t *ref_os = NULL;
 	dmu_buf_t *dbp;
 
@@ -1462,8 +1578,9 @@ restore_write_byref(struct restorearg *ra, objset_t *os,
 		ref_os = os;
 	}
 
-	if (err = dmu_buf_hold(ref_os, drrwbr->drr_refobject,
-	    drrwbr->drr_refoffset, FTAG, &dbp, DMU_READ_PREFETCH))
+	err = dmu_buf_hold(ref_os, drrwbr->drr_refobject,
+	    drrwbr->drr_refoffset, FTAG, &dbp, DMU_READ_PREFETCH);
+	if (err != 0)
 		return (err);
 
 	tx = dmu_tx_create(os);
@@ -1482,6 +1599,48 @@ restore_write_byref(struct restorearg *ra, objset_t *os,
 	return (0);
 }
 
+static int
+restore_write_embedded(struct restorearg *ra, objset_t *os,
+    struct drr_write_embedded *drrwnp)
+{
+	dmu_tx_t *tx;
+	int err;
+	void *data;
+
+	if (drrwnp->drr_offset + drrwnp->drr_length < drrwnp->drr_offset)
+		return (EINVAL);
+
+	if (drrwnp->drr_psize > BPE_PAYLOAD_SIZE)
+		return (EINVAL);
+
+	if (drrwnp->drr_etype >= NUM_BP_EMBEDDED_TYPES)
+		return (EINVAL);
+	if (drrwnp->drr_compression >= ZIO_COMPRESS_FUNCTIONS)
+		return (EINVAL);
+
+	data = restore_read(ra, P2ROUNDUP(drrwnp->drr_psize, 8));
+	if (data == NULL)
+		return (ra->err);
+
+	tx = dmu_tx_create(os);
+
+	dmu_tx_hold_write(tx, drrwnp->drr_object,
+	    drrwnp->drr_offset, drrwnp->drr_length);
+	err = dmu_tx_assign(tx, TXG_WAIT);
+	if (err != 0) {
+		dmu_tx_abort(tx);
+		return (err);
+	}
+
+	dmu_write_embedded(os, drrwnp->drr_object,
+	    drrwnp->drr_offset, data, drrwnp->drr_etype,
+	    drrwnp->drr_compression, drrwnp->drr_lsize, drrwnp->drr_psize,
+	    ra->byteswap ^ ZFS_HOST_BYTEORDER, tx);
+
+	dmu_tx_commit(tx);
+	return (0);
+}
+
 static int
 restore_spill(struct restorearg *ra, objset_t *os, struct drr_spill *drrs)
 {
@@ -1677,6 +1836,13 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, struct file *fp, offset_t *voffp,
 			ra.err = restore_write_byref(&ra, os, &drrwbr);
 			break;
 		}
+		case DRR_WRITE_EMBEDDED:
+		{
+			struct drr_write_embedded drrwe =
+			    drr->drr_u.drr_write_embedded;
+			ra.err = restore_write_embedded(&ra, os, &drrwe);
+			break;
+		}
 		case DRR_FREE:
 		{
 			struct drr_free drrf = drr->drr_u.drr_free;
@@ -1915,7 +2081,7 @@ dmu_recv_existing_end(dmu_recv_cookie_t *drc)
 
 	error = dsl_sync_task(drc->drc_tofs,
 	    dmu_recv_end_check, dmu_recv_end_sync, drc,
-	    dmu_recv_end_modified_blocks);
+	    dmu_recv_end_modified_blocks, ZFS_SPACE_CHECK_NORMAL);
 
 	if (error != 0)
 		dmu_recv_cleanup_ds(drc);
@@ -1929,7 +2095,7 @@ dmu_recv_new_end(dmu_recv_cookie_t *drc)
 
 	error = dsl_sync_task(drc->drc_tofs,
 	    dmu_recv_end_check, dmu_recv_end_sync, drc,
-	    dmu_recv_end_modified_blocks);
+	    dmu_recv_end_modified_blocks, ZFS_SPACE_CHECK_NORMAL);
 
 	if (error != 0) {
 		dmu_recv_cleanup_ds(drc);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
index 1f64d73acdd2..fb1ec0755cf1 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
@@ -55,9 +55,10 @@ typedef struct traverse_data {
 	uint64_t td_objset;
 	blkptr_t *td_rootbp;
 	uint64_t td_min_txg;
-	zbookmark_t *td_resume;
+	zbookmark_phys_t *td_resume;
 	int td_flags;
 	prefetch_data_t *td_pfd;
+	boolean_t td_paused;
 	blkptr_cb_t *td_func;
 	void *td_arg;
 } traverse_data_t;
@@ -71,7 +72,7 @@ static int
 traverse_zil_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg)
 {
 	traverse_data_t *td = arg;
-	zbookmark_t zb;
+	zbookmark_phys_t zb;
 
 	if (BP_IS_HOLE(bp))
 		return (0);
@@ -95,7 +96,7 @@ traverse_zil_record(zilog_t *zilog, lr_t *lrc, void *arg, uint64_t claim_txg)
 	if (lrc->lrc_txtype == TX_WRITE) {
 		lr_write_t *lr = (lr_write_t *)lrc;
 		blkptr_t *bp = &lr->lr_blkptr;
-		zbookmark_t zb;
+		zbookmark_phys_t zb;
 
 		if (BP_IS_HOLE(bp))
 			return (0);
@@ -149,7 +150,7 @@ typedef enum resume_skip {
  */
 static resume_skip_t
 resume_skip_check(traverse_data_t *td, const dnode_phys_t *dnp,
-    const zbookmark_t *zb)
+    const zbookmark_phys_t *zb)
 {
 	if (td->td_resume != NULL && !ZB_IS_ZERO(td->td_resume)) {
 		/*
@@ -163,7 +164,6 @@ resume_skip_check(traverse_data_t *td, const dnode_phys_t *dnp,
 		 * If we found the block we're trying to resume from, zero
 		 * the bookmark out to indicate that we have resumed.
 		 */
-		ASSERT3U(zb->zb_object, <=, td->td_resume->zb_object);
 		if (bcmp(zb, td->td_resume, sizeof (*zb)) == 0) {
 			bzero(td->td_resume, sizeof (*zb));
 			if (td->td_flags & TRAVERSE_POST)
@@ -173,17 +173,9 @@ resume_skip_check(traverse_data_t *td, const dnode_phys_t *dnp,
 	return (RESUME_SKIP_NONE);
 }
 
-static void
-traverse_pause(traverse_data_t *td, const zbookmark_t *zb)
-{
-	ASSERT(td->td_resume != NULL);
-	ASSERT0(zb->zb_level);
-	bcopy(zb, td->td_resume, sizeof (*td->td_resume));
-}
-
 static void
 traverse_prefetch_metadata(traverse_data_t *td,
-    const blkptr_t *bp, const zbookmark_t *zb)
+    const blkptr_t *bp, const zbookmark_phys_t *zb)
 {
 	uint32_t flags = ARC_NOWAIT | ARC_PREFETCH;
 
@@ -205,16 +197,25 @@ traverse_prefetch_metadata(traverse_data_t *td,
 	    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
 }
 
+static boolean_t
+prefetch_needed(prefetch_data_t *pfd, const blkptr_t *bp)
+{
+	ASSERT(pfd->pd_flags & TRAVERSE_PREFETCH_DATA);
+	if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp) ||
+	    BP_GET_TYPE(bp) == DMU_OT_INTENT_LOG)
+		return (B_FALSE);
+	return (B_TRUE);
+}
+
 static int
 traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
-    const blkptr_t *bp, const zbookmark_t *zb)
+    const blkptr_t *bp, const zbookmark_phys_t *zb)
 {
-	zbookmark_t czb;
-	int err = 0, lasterr = 0;
+	zbookmark_phys_t czb;
+	int err = 0;
 	arc_buf_t *buf = NULL;
 	prefetch_data_t *pd = td->td_pfd;
 	boolean_t hard = td->td_flags & TRAVERSE_HARD;
-	boolean_t pause = B_FALSE;
 
 	switch (resume_skip_check(td, dnp, zb)) {
 	case RESUME_SKIP_ALL:
@@ -251,14 +252,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
 		return (0);
 	}
 
-	if (BP_IS_HOLE(bp)) {
-		err = td->td_func(td->td_spa, NULL, bp, zb, dnp, td->td_arg);
-		return (err);
-	}
-
-	if (pd && !pd->pd_exited &&
-	    ((pd->pd_flags & TRAVERSE_PREFETCH_DATA) ||
-	    BP_GET_TYPE(bp) == DMU_OT_DNODE || BP_GET_LEVEL(bp) > 0)) {
+	if (pd != NULL && !pd->pd_exited && prefetch_needed(pd, bp)) {
 		mutex_enter(&pd->pd_mtx);
 		ASSERT(pd->pd_blks_fetched >= 0);
 		while (pd->pd_blks_fetched == 0 && !pd->pd_exited)
@@ -268,13 +262,18 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
 		mutex_exit(&pd->pd_mtx);
 	}
 
+	if (BP_IS_HOLE(bp)) {
+		err = td->td_func(td->td_spa, NULL, bp, zb, dnp, td->td_arg);
+		if (err != 0)
+			goto post;
+		return (0);
+	}
+
 	if (td->td_flags & TRAVERSE_PRE) {
 		err = td->td_func(td->td_spa, NULL, bp, zb, dnp,
 		    td->td_arg);
 		if (err == TRAVERSE_VISIT_NO_CHILDREN)
 			return (0);
-		if (err == ERESTART)
-			pause = B_TRUE; /* handle pausing at a common point */
 		if (err != 0)
 			goto post;
 	}
@@ -288,7 +287,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
 		err = arc_read(NULL, td->td_spa, bp, arc_getbuf_func, &buf,
 		    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
 		if (err != 0)
-			return (err);
+			goto post;
 		cbp = buf->b_data;
 
 		for (i = 0; i < epb; i++) {
@@ -304,11 +303,8 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
 			    zb->zb_level - 1,
 			    zb->zb_blkid * epb + i);
 			err = traverse_visitbp(td, dnp, &cbp[i], &czb);
-			if (err != 0) {
-				if (!hard)
-					break;
-				lasterr = err;
-			}
+			if (err != 0)
+				break;
 		}
 	} else if (BP_GET_TYPE(bp) == DMU_OT_DNODE) {
 		uint32_t flags = ARC_WAIT;
@@ -318,7 +314,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
 		err = arc_read(NULL, td->td_spa, bp, arc_getbuf_func, &buf,
 		    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
 		if (err != 0)
-			return (err);
+			goto post;
 		dnp = buf->b_data;
 
 		for (i = 0; i < epb; i++) {
@@ -330,11 +326,8 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
 		for (i = 0; i < epb; i++) {
 			err = traverse_dnode(td, &dnp[i], zb->zb_objset,
 			    zb->zb_blkid * epb + i);
-			if (err != 0) {
-				if (!hard)
-					break;
-				lasterr = err;
-			}
+			if (err != 0)
+				break;
 		}
 	} else if (BP_GET_TYPE(bp) == DMU_OT_OBJSET) {
 		uint32_t flags = ARC_WAIT;
@@ -344,7 +337,7 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
 		err = arc_read(NULL, td->td_spa, bp, arc_getbuf_func, &buf,
 		    ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL, &flags, zb);
 		if (err != 0)
-			return (err);
+			goto post;
 
 		osp = buf->b_data;
 		dnp = &osp->os_meta_dnode;
@@ -359,19 +352,11 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
 
 		err = traverse_dnode(td, dnp, zb->zb_objset,
 		    DMU_META_DNODE_OBJECT);
-		if (err && hard) {
-			lasterr = err;
-			err = 0;
-		}
 		if (err == 0 && arc_buf_size(buf) >= sizeof (objset_phys_t)) {
 			dnp = &osp->os_groupused_dnode;
 			err = traverse_dnode(td, dnp, zb->zb_objset,
 			    DMU_GROUPUSED_OBJECT);
 		}
-		if (err && hard) {
-			lasterr = err;
-			err = 0;
-		}
 		if (err == 0 && arc_buf_size(buf) >= sizeof (objset_phys_t)) {
 			dnp = &osp->os_userused_dnode;
 			err = traverse_dnode(td, dnp, zb->zb_objset,
@@ -383,19 +368,37 @@ traverse_visitbp(traverse_data_t *td, const dnode_phys_t *dnp,
 		(void) arc_buf_remove_ref(buf, &buf);
 
 post:
-	if (err == 0 && (td->td_flags & TRAVERSE_POST)) {
+	if (err == 0 && (td->td_flags & TRAVERSE_POST))
 		err = td->td_func(td->td_spa, NULL, bp, zb, dnp, td->td_arg);
-		if (err == ERESTART)
-			pause = B_TRUE;
+
+	if (hard && (err == EIO || err == ECKSUM)) {
+		/*
+		 * Ignore this disk error as requested by the HARD flag,
+		 * and continue traversal.
+		 */
+		err = 0;
 	}
 
-	if (pause && td->td_resume != NULL) {
-		ASSERT3U(err, ==, ERESTART);
-		ASSERT(!hard);
-		traverse_pause(td, zb);
+	/*
+	 * If we are stopping here, set td_resume.
+	 */
+	if (td->td_resume != NULL && err != 0 && !td->td_paused) {
+		td->td_resume->zb_objset = zb->zb_objset;
+		td->td_resume->zb_object = zb->zb_object;
+		td->td_resume->zb_level = 0;
+		/*
+		 * If we have stopped on an indirect block (e.g. due to
+		 * i/o error), we have not visited anything below it.
+		 * Set the bookmark to the first level-0 block that we need
+		 * to visit.  This way, the resuming code does not need to
+		 * deal with resuming from indirect blocks.
+		 */
+		td->td_resume->zb_blkid = zb->zb_blkid <<
+		    (zb->zb_level * (dnp->dn_indblkshift - SPA_BLKPTRSHIFT));
+		td->td_paused = B_TRUE;
 	}
 
-	return (err != 0 ? err : lasterr);
+	return (err);
 }
 
 static void
@@ -403,7 +406,7 @@ prefetch_dnode_metadata(traverse_data_t *td, const dnode_phys_t *dnp,
     uint64_t objset, uint64_t object)
 {
 	int j;
-	zbookmark_t czb;
+	zbookmark_phys_t czb;
 
 	for (j = 0; j < dnp->dn_nblkptr; j++) {
 		SET_BOOKMARK(&czb, objset, object, dnp->dn_nlevels - 1, j);
@@ -420,36 +423,27 @@ static int
 traverse_dnode(traverse_data_t *td, const dnode_phys_t *dnp,
     uint64_t objset, uint64_t object)
 {
-	int j, err = 0, lasterr = 0;
-	zbookmark_t czb;
-	boolean_t hard = (td->td_flags & TRAVERSE_HARD);
+	int j, err = 0;
+	zbookmark_phys_t czb;
 
 	for (j = 0; j < dnp->dn_nblkptr; j++) {
 		SET_BOOKMARK(&czb, objset, object, dnp->dn_nlevels - 1, j);
 		err = traverse_visitbp(td, dnp, &dnp->dn_blkptr[j], &czb);
-		if (err != 0) {
-			if (!hard)
-				break;
-			lasterr = err;
-		}
+		if (err != 0)
+			break;
 	}
 
 	if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) {
 		SET_BOOKMARK(&czb, objset, object, 0, DMU_SPILL_BLKID);
 		err = traverse_visitbp(td, dnp, &dnp->dn_spill, &czb);
-		if (err != 0) {
-			if (!hard)
-				return (err);
-			lasterr = err;
-		}
 	}
-	return (err != 0 ? err : lasterr);
+	return (err);
 }
 
 /* ARGSUSED */
 static int
 traverse_prefetcher(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
 	prefetch_data_t *pfd = arg;
 	uint32_t aflags = ARC_NOWAIT | ARC_PREFETCH;
@@ -458,10 +452,7 @@ traverse_prefetcher(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
 	if (pfd->pd_cancel)
 		return (SET_ERROR(EINTR));
 
-	if (BP_IS_HOLE(bp) ||
-	    !((pfd->pd_flags & TRAVERSE_PREFETCH_DATA) ||
-	    BP_GET_TYPE(bp) == DMU_OT_DNODE || BP_GET_LEVEL(bp) > 0) ||
-	    BP_GET_TYPE(bp) == DMU_OT_INTENT_LOG)
+	if (!prefetch_needed(pfd, bp))
 		return (0);
 
 	mutex_enter(&pfd->pd_mtx);
@@ -482,7 +473,7 @@ traverse_prefetch_thread(void *arg)
 {
 	traverse_data_t *td_main = arg;
 	traverse_data_t td = *td_main;
-	zbookmark_t czb;
+	zbookmark_phys_t czb;
 
 	td.td_func = traverse_prefetcher;
 	td.td_arg = td_main->td_pfd;
@@ -504,12 +495,12 @@ traverse_prefetch_thread(void *arg)
  */
 static int
 traverse_impl(spa_t *spa, dsl_dataset_t *ds, uint64_t objset, blkptr_t *rootbp,
-    uint64_t txg_start, zbookmark_t *resume, int flags,
+    uint64_t txg_start, zbookmark_phys_t *resume, int flags,
     blkptr_cb_t func, void *arg)
 {
 	traverse_data_t td;
 	prefetch_data_t pd = { 0 };
-	zbookmark_t czb;
+	zbookmark_phys_t czb;
 	int err;
 
 	ASSERT(ds == NULL || objset == ds->ds_object);
@@ -530,6 +521,7 @@ traverse_impl(spa_t *spa, dsl_dataset_t *ds, uint64_t objset, blkptr_t *rootbp,
 	td.td_arg = arg;
 	td.td_pfd = &pd;
 	td.td_flags = flags;
+	td.td_paused = B_FALSE;
 
 	pd.pd_blks_max = zfs_pd_blks_max;
 	pd.pd_flags = flags;
@@ -589,7 +581,7 @@ traverse_dataset(dsl_dataset_t *ds, uint64_t txg_start, int flags,
 
 int
 traverse_dataset_destroyed(spa_t *spa, blkptr_t *blkptr,
-    uint64_t txg_start, zbookmark_t *resume, int flags,
+    uint64_t txg_start, zbookmark_phys_t *resume, int flags,
     blkptr_cb_t func, void *arg)
 {
 	return (traverse_impl(spa, NULL, ZB_DESTROYED_OBJSET,
@@ -603,7 +595,7 @@ int
 traverse_pool(spa_t *spa, uint64_t txg_start, int flags,
     blkptr_cb_t func, void *arg)
 {
-	int err, lasterr = 0;
+	int err;
 	uint64_t obj;
 	dsl_pool_t *dp = spa_get_dsl(spa);
 	objset_t *mos = dp->dp_meta_objset;
@@ -616,16 +608,15 @@ traverse_pool(spa_t *spa, uint64_t txg_start, int flags,
 		return (err);
 
 	/* visit each dataset */
-	for (obj = 1; err == 0 || (err != ESRCH && hard);
+	for (obj = 1; err == 0;
 	    err = dmu_object_next(mos, &obj, FALSE, txg_start)) {
 		dmu_object_info_t doi;
 
 		err = dmu_object_info(mos, obj, &doi);
 		if (err != 0) {
-			if (!hard)
-				return (err);
-			lasterr = err;
-			continue;
+			if (hard)
+				continue;
+			break;
 		}
 
 		if (doi.doi_bonus_type == DMU_OT_DSL_DATASET) {
@@ -636,23 +627,19 @@ traverse_pool(spa_t *spa, uint64_t txg_start, int flags,
 			err = dsl_dataset_hold_obj(dp, obj, FTAG, &ds);
 			dsl_pool_config_exit(dp, FTAG);
 			if (err != 0) {
-				if (!hard)
-					return (err);
-				lasterr = err;
-				continue;
+				if (hard)
+					continue;
+				break;
 			}
 			if (ds->ds_phys->ds_prev_snap_txg > txg)
 				txg = ds->ds_phys->ds_prev_snap_txg;
 			err = traverse_dataset(ds, txg, flags, func, arg);
 			dsl_dataset_rele(ds, FTAG);
-			if (err != 0) {
-				if (!hard)
-					return (err);
-				lasterr = err;
-			}
+			if (err != 0)
+				break;
 		}
 	}
 	if (err == ESRCH)
 		err = 0;
-	return (err != 0 ? err : lasterr);
+	return (err);
 }
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 1213d9137cf4..ed9757ecd457 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
@@ -21,7 +21,7 @@
 /*
  * 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) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/dmu.h>
@@ -583,6 +583,32 @@ dmu_tx_count_free(dmu_tx_hold_t *txh, uint64_t off, uint64_t len)
 	txh->txh_space_tounref += unref;
 }
 
+/*
+ * This function marks the transaction as being a "net free".  The end
+ * result is that refquotas will be disabled for this transaction, and
+ * this transaction will be able to use half of the pool space overhead
+ * (see dsl_pool_adjustedsize()).  Therefore this function should only
+ * be called for transactions that we expect will not cause a net increase
+ * in the amount of space used (but it's OK if that is occasionally not true).
+ */
+void
+dmu_tx_mark_netfree(dmu_tx_t *tx)
+{
+	dmu_tx_hold_t *txh;
+
+	txh = dmu_tx_hold_object_impl(tx, tx->tx_objset,
+	    DMU_NEW_OBJECT, THT_FREE, 0, 0);
+
+	/*
+	 * Pretend that this operation will free 1GB of space.  This
+	 * should be large enough to cancel out the largest write.
+	 * We don't want to use something like UINT64_MAX, because that would
+	 * cause overflows when doing math with these values (e.g. in
+	 * dmu_tx_try_assign()).
+	 */
+	txh->txh_space_tofree = txh->txh_space_tounref = 1024 * 1024 * 1024;
+}
+
 void
 dmu_tx_hold_free(dmu_tx_t *tx, uint64_t object, uint64_t off, uint64_t len)
 {
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 d51a981c1273..77100ef8d71f 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
@@ -55,17 +55,13 @@ SYSCTL_DECL(_vfs_zfs);
 SYSCTL_INT(_vfs_zfs, OID_AUTO, prefetch_disable, CTLFLAG_RW,
     &zfs_prefetch_disable, 0, "Disable prefetch");
 SYSCTL_NODE(_vfs_zfs, OID_AUTO, zfetch, CTLFLAG_RW, 0, "ZFS ZFETCH");
-TUNABLE_INT("vfs.zfs.zfetch.max_streams", &zfetch_max_streams);
-SYSCTL_UINT(_vfs_zfs_zfetch, OID_AUTO, max_streams, CTLFLAG_RW,
+SYSCTL_UINT(_vfs_zfs_zfetch, OID_AUTO, max_streams, CTLFLAG_RWTUN,
     &zfetch_max_streams, 0, "Max # of streams per zfetch");
-TUNABLE_INT("vfs.zfs.zfetch.min_sec_reap", &zfetch_min_sec_reap);
-SYSCTL_UINT(_vfs_zfs_zfetch, OID_AUTO, min_sec_reap, CTLFLAG_RDTUN,
+SYSCTL_UINT(_vfs_zfs_zfetch, OID_AUTO, min_sec_reap, CTLFLAG_RWTUN,
     &zfetch_min_sec_reap, 0, "Min time before stream reclaim");
-TUNABLE_INT("vfs.zfs.zfetch.block_cap", &zfetch_block_cap);
-SYSCTL_UINT(_vfs_zfs_zfetch, OID_AUTO, block_cap, CTLFLAG_RDTUN,
+SYSCTL_UINT(_vfs_zfs_zfetch, OID_AUTO, block_cap, CTLFLAG_RWTUN,
     &zfetch_block_cap, 0, "Max number of blocks to fetch at a time");
-TUNABLE_QUAD("vfs.zfs.zfetch.array_rd_sz", &zfetch_array_rd_sz);
-SYSCTL_UQUAD(_vfs_zfs_zfetch, OID_AUTO, array_rd_sz, CTLFLAG_RDTUN,
+SYSCTL_UQUAD(_vfs_zfs_zfetch, OID_AUTO, array_rd_sz, CTLFLAG_RWTUN,
     &zfetch_array_rd_sz, 0,
     "Number of bytes in a array_read at which we stop prefetching");
 
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 fa976d097862..a378601ed7f6 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
@@ -61,6 +61,43 @@ int zfs_default_ibs = DN_MAX_INDBLKSHIFT;
 static kmem_cbrc_t dnode_move(void *, void *, size_t, void *);
 #endif
 
+static int
+dbuf_compare(const void *x1, const void *x2)
+{
+	const dmu_buf_impl_t *d1 = x1;
+	const dmu_buf_impl_t *d2 = x2;
+
+	if (d1->db_level < d2->db_level) {
+		return (-1);
+	} else if (d1->db_level > d2->db_level) {
+		return (1);
+	}
+
+	if (d1->db_blkid < d2->db_blkid) {
+		return (-1);
+	} else if (d1->db_blkid > d2->db_blkid) {
+		return (1);
+	}
+
+	/*
+	 * If a dbuf is being evicted while dn_dbufs_mutex is not held, we set
+	 * the db_state to DB_EVICTING but do not remove it from dn_dbufs. If
+	 * another thread creates a dbuf of the same blkid before the dbuf is
+	 * removed from dn_dbufs, we can reach a state where there are two
+	 * dbufs of the same blkid and level in db_dbufs. To maintain the avl
+	 * invariant that there cannot be duplicate items, we distinguish
+	 * between these two dbufs based on the time they were created.
+	 */
+	if (d1->db_creation < d2->db_creation) {
+		return (-1);
+	} else if (d1->db_creation > d2->db_creation) {
+		return (1);
+	} else {
+		ASSERT3P(d1, ==, d2);
+		return (0);
+	}
+}
+
 /* ARGSUSED */
 static int
 dnode_cons(void *arg, void *unused, int kmflag)
@@ -115,7 +152,7 @@ dnode_cons(void *arg, void *unused, int kmflag)
 
 	dn->dn_dbufs_count = 0;
 	dn->dn_unlisted_l0_blkid = 0;
-	list_create(&dn->dn_dbufs, sizeof (dmu_buf_impl_t),
+	avl_create(&dn->dn_dbufs, dbuf_compare, sizeof (dmu_buf_impl_t),
 	    offsetof(dmu_buf_impl_t, db_link));
 
 	dn->dn_moved = 0;
@@ -169,7 +206,7 @@ dnode_dest(void *arg, void *unused)
 
 	ASSERT0(dn->dn_dbufs_count);
 	ASSERT0(dn->dn_unlisted_l0_blkid);
-	list_destroy(&dn->dn_dbufs);
+	avl_destroy(&dn->dn_dbufs);
 }
 
 void
@@ -505,7 +542,7 @@ dnode_allocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, int ibs,
 	ASSERT0(dn->dn_assigned_txg);
 	ASSERT(refcount_is_zero(&dn->dn_tx_holds));
 	ASSERT3U(refcount_count(&dn->dn_holds), <=, 1);
-	ASSERT3P(list_head(&dn->dn_dbufs), ==, NULL);
+	ASSERT(avl_is_empty(&dn->dn_dbufs));
 
 	for (i = 0; i < TXG_SIZE; i++) {
 		ASSERT0(dn->dn_next_nblkptr[i]);
@@ -690,8 +727,8 @@ dnode_move_impl(dnode_t *odn, dnode_t *ndn)
 	ndn->dn_dirtyctx_firstset = odn->dn_dirtyctx_firstset;
 	ASSERT(refcount_count(&odn->dn_tx_holds) == 0);
 	refcount_transfer(&ndn->dn_holds, &odn->dn_holds);
-	ASSERT(list_is_empty(&ndn->dn_dbufs));
-	list_move_tail(&ndn->dn_dbufs, &odn->dn_dbufs);
+	ASSERT(avl_is_empty(&ndn->dn_dbufs));
+	avl_swap(&ndn->dn_dbufs, &odn->dn_dbufs);
 	ndn->dn_dbufs_count = odn->dn_dbufs_count;
 	ndn->dn_unlisted_l0_blkid = odn->dn_unlisted_l0_blkid;
 	ndn->dn_bonus = odn->dn_bonus;
@@ -725,7 +762,7 @@ dnode_move_impl(dnode_t *odn, dnode_t *ndn)
 	 */
 	odn->dn_dbuf = NULL;
 	odn->dn_handle = NULL;
-	list_create(&odn->dn_dbufs, sizeof (dmu_buf_impl_t),
+	avl_create(&odn->dn_dbufs, dbuf_compare, sizeof (dmu_buf_impl_t),
 	    offsetof(dmu_buf_impl_t, db_link));
 	odn->dn_dbufs_count = 0;
 	odn->dn_unlisted_l0_blkid = 0;
@@ -989,7 +1026,7 @@ dnode_buf_pageout(dmu_buf_t *db, void *arg)
 		dnh->dnh_dnode = NULL;
 	}
 	kmem_free(children_dnodes, sizeof (dnode_children_t) +
-	    (epb - 1) * sizeof (dnode_handle_t));
+	    epb * sizeof (dnode_handle_t));
 }
 
 /*
@@ -1074,7 +1111,7 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag,
 		int i;
 		dnode_children_t *winner;
 		children_dnodes = kmem_zalloc(sizeof (dnode_children_t) +
-		    (epb - 1) * sizeof (dnode_handle_t), KM_SLEEP);
+		    epb * sizeof (dnode_handle_t), KM_SLEEP);
 		children_dnodes->dnc_count = epb;
 		dnh = &children_dnodes->dnc_children[0];
 		for (i = 0; i < epb; i++) {
@@ -1083,8 +1120,13 @@ dnode_hold_impl(objset_t *os, uint64_t object, int flag,
 		}
 		if (winner = dmu_buf_set_user(&db->db, children_dnodes, NULL,
 		    dnode_buf_pageout)) {
+
+			for (i = 0; i < epb; i++) {
+				zrl_destroy(&dnh[i].dnh_zrlock);
+			}
+
 			kmem_free(children_dnodes, sizeof (dnode_children_t) +
-			    (epb - 1) * sizeof (dnode_handle_t));
+			    epb * sizeof (dnode_handle_t));
 			children_dnodes = winner;
 		}
 	}
@@ -1231,7 +1273,8 @@ dnode_setdirty(dnode_t *dn, dmu_tx_t *tx)
 		return;
 	}
 
-	ASSERT(!refcount_is_zero(&dn->dn_holds) || list_head(&dn->dn_dbufs));
+	ASSERT(!refcount_is_zero(&dn->dn_holds) ||
+	    !avl_is_empty(&dn->dn_dbufs));
 	ASSERT(dn->dn_datablksz != 0);
 	ASSERT0(dn->dn_next_bonuslen[txg&TXG_MASK]);
 	ASSERT0(dn->dn_next_blksz[txg&TXG_MASK]);
@@ -1304,7 +1347,7 @@ dnode_free(dnode_t *dn, dmu_tx_t *tx)
 int
 dnode_set_blksz(dnode_t *dn, uint64_t size, int ibs, dmu_tx_t *tx)
 {
-	dmu_buf_impl_t *db, *db_next;
+	dmu_buf_impl_t *db;
 	int err;
 
 	if (size == 0)
@@ -1327,9 +1370,8 @@ dnode_set_blksz(dnode_t *dn, uint64_t size, int ibs, dmu_tx_t *tx)
 		goto fail;
 
 	mutex_enter(&dn->dn_dbufs_mtx);
-	for (db = list_head(&dn->dn_dbufs); db; db = db_next) {
-		db_next = list_next(&dn->dn_dbufs, db);
-
+	for (db = avl_first(&dn->dn_dbufs); db != NULL;
+	    db = AVL_NEXT(&dn->dn_dbufs, db)) {
 		if (db->db_blkid != 0 && db->db_blkid != DMU_BONUS_BLKID &&
 		    db->db_blkid != DMU_SPILL_BLKID) {
 			mutex_exit(&dn->dn_dbufs_mtx);
@@ -1816,8 +1858,8 @@ dnode_next_offset_level(dnode_t *dn, int flags, uint64_t *offset,
 		*offset = *offset >> span;
 		for (i = BF64_GET(*offset, 0, epbs);
 		    i >= 0 && i < epb; i += inc) {
-			if (bp[i].blk_fill >= minfill &&
-			    bp[i].blk_fill <= maxfill &&
+			if (BP_GET_FILL(&bp[i]) >= minfill &&
+			    BP_GET_FILL(&bp[i]) <= maxfill &&
 			    (hole || bp[i].blk_birth > txg))
 				break;
 			if (inc > 0 || *offset > 0)
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
index 326e96cf9764..ff666b212d5e 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
@@ -233,8 +233,6 @@ free_verify(dmu_buf_impl_t *db, uint64_t start, uint64_t end, dmu_tx_t *tx)
 }
 #endif
 
-#define	ALL -1
-
 static void
 free_children(dmu_buf_impl_t *db, uint64_t blkid, uint64_t nblks,
     dmu_tx_t *tx)
@@ -362,7 +360,6 @@ dnode_sync_free_range_impl(dnode_t *dn, uint64_t blkid, uint64_t nblks,
 
 			free_children(db, blkid, nblks, tx);
 			dbuf_rele(db, FTAG);
-
 		}
 	}
 
@@ -403,16 +400,13 @@ dnode_evict_dbufs(dnode_t *dn)
 	int pass = 0;
 
 	do {
-		dmu_buf_impl_t *db, marker;
+		dmu_buf_impl_t *db, *db_next;
 		int evicting = FALSE;
 
 		progress = FALSE;
 		mutex_enter(&dn->dn_dbufs_mtx);
-		list_insert_tail(&dn->dn_dbufs, &marker);
-		db = list_head(&dn->dn_dbufs);
-		for (; db != &marker; db = list_head(&dn->dn_dbufs)) {
-			list_remove(&dn->dn_dbufs, db);
-			list_insert_tail(&dn->dn_dbufs, db);
+		for (db = avl_first(&dn->dn_dbufs); db != NULL; db = db_next) {
+			db_next = AVL_NEXT(&dn->dn_dbufs, db);
 #ifdef	DEBUG
 			DB_DNODE_ENTER(db);
 			ASSERT3P(DB_DNODE(db), ==, dn);
@@ -432,7 +426,6 @@ dnode_evict_dbufs(dnode_t *dn)
 			}
 
 		}
-		list_remove(&dn->dn_dbufs, &marker);
 		/*
 		 * NB: we need to drop dn_dbufs_mtx between passes so
 		 * that any DB_EVICTING dbufs can make progress.
@@ -479,8 +472,8 @@ dnode_undirty_dbufs(list_t *list)
 			    dr->dt.dl.dr_data == db->db_buf);
 			dbuf_unoverride(dr);
 		} else {
-			list_destroy(&dr->dt.di.dr_children);
 			mutex_destroy(&dr->dt.di.dr_mtx);
+			list_destroy(&dr->dt.di.dr_children);
 		}
 		kmem_free(dr, sizeof (dbuf_dirty_record_t));
 		dbuf_rele_and_unlock(db, (void *)(uintptr_t)txg);
@@ -503,7 +496,7 @@ dnode_sync_free(dnode_t *dn, dmu_tx_t *tx)
 
 	dnode_undirty_dbufs(&dn->dn_dirty_records[txgoff]);
 	dnode_evict_dbufs(dn);
-	ASSERT3P(list_head(&dn->dn_dbufs), ==, NULL);
+	ASSERT(avl_is_empty(&dn->dn_dbufs));
 	ASSERT3P(dn->dn_bonus, ==, NULL);
 
 	/*
@@ -594,11 +587,14 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx)
 		dnp->dn_bonustype = dn->dn_bonustype;
 		dnp->dn_bonuslen = dn->dn_bonuslen;
 	}
-
 	ASSERT(dnp->dn_nlevels > 1 ||
 	    BP_IS_HOLE(&dnp->dn_blkptr[0]) ||
+	    BP_IS_EMBEDDED(&dnp->dn_blkptr[0]) ||
 	    BP_GET_LSIZE(&dnp->dn_blkptr[0]) ==
 	    dnp->dn_datablkszsec << SPA_MINBLOCKSHIFT);
+	ASSERT(dnp->dn_nlevels < 2 ||
+	    BP_IS_HOLE(&dnp->dn_blkptr[0]) ||
+	    BP_GET_LSIZE(&dnp->dn_blkptr[0]) == 1 << dnp->dn_indblkshift);
 
 	if (dn->dn_next_type[txgoff] != 0) {
 		dnp->dn_type = dn->dn_type;
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c
index 35e55ece4f4d..21784630da6b 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c
@@ -13,7 +13,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
@@ -246,7 +246,8 @@ dsl_bookmark_create(nvlist_t *bmarks, nvlist_t *errors)
 	dbca.dbca_errors = errors;
 
 	return (dsl_sync_task(nvpair_name(pair), dsl_bookmark_create_check,
-	    dsl_bookmark_create_sync, &dbca, fnvlist_num_pairs(bmarks)));
+	    dsl_bookmark_create_sync, &dbca,
+	    fnvlist_num_pairs(bmarks), ZFS_SPACE_CHECK_NORMAL));
 }
 
 int
@@ -448,7 +449,8 @@ dsl_bookmark_destroy(nvlist_t *bmarks, nvlist_t *errors)
 	dbda.dbda_success = fnvlist_alloc();
 
 	rv = dsl_sync_task(nvpair_name(pair), dsl_bookmark_destroy_check,
-	    dsl_bookmark_destroy_sync, &dbda, fnvlist_num_pairs(bmarks));
+	    dsl_bookmark_destroy_sync, &dbda, fnvlist_num_pairs(bmarks),
+	    ZFS_SPACE_CHECK_RESERVED);
 	fnvlist_free(dbda.dbda_success);
 	return (rv);
 }
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
index 4172397225be..a97a10a48621 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2011 Martin Matuska <mm@FreeBSD.org>
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2014, Joyent, Inc. All rights reserved.
  * Copyright (c) 2014 RackTop Systems.
  */
@@ -270,6 +270,7 @@ dsl_dataset_evict(dmu_buf_t *db, void *dsv)
 	if (mutex_owned(&ds->ds_opening_lock))
 		mutex_exit(&ds->ds_opening_lock);
 	mutex_destroy(&ds->ds_opening_lock);
+	mutex_destroy(&ds->ds_sendstream_lock);
 	refcount_destroy(&ds->ds_longholds);
 
 	kmem_free(ds, sizeof (dsl_dataset_t));
@@ -398,6 +399,7 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uint64_t dsobj, void *tag,
 		if (err != 0) {
 			mutex_destroy(&ds->ds_lock);
 			mutex_destroy(&ds->ds_opening_lock);
+			mutex_destroy(&ds->ds_sendstream_lock);
 			refcount_destroy(&ds->ds_longholds);
 			bplist_destroy(&ds->ds_pending_deadlist);
 			dsl_deadlist_close(&ds->ds_deadlist);
@@ -454,6 +456,7 @@ dsl_dataset_hold_obj(dsl_pool_t *dp, uint64_t dsobj, void *tag,
 			dsl_dir_rele(ds->ds_dir, ds);
 			mutex_destroy(&ds->ds_lock);
 			mutex_destroy(&ds->ds_opening_lock);
+			mutex_destroy(&ds->ds_sendstream_lock);
 			refcount_destroy(&ds->ds_longholds);
 			kmem_free(ds, sizeof (dsl_dataset_t));
 			if (err != 0) {
@@ -1401,7 +1404,7 @@ dsl_dataset_snapshot(nvlist_t *snaps, nvlist_t *props, nvlist_t *errors)
 	if (error == 0) {
 		error = dsl_sync_task(firstname, dsl_dataset_snapshot_check,
 		    dsl_dataset_snapshot_sync, &ddsa,
-		    fnvlist_num_pairs(snaps) * 3);
+		    fnvlist_num_pairs(snaps) * 3, ZFS_SPACE_CHECK_NORMAL);
 	}
 
 	if (suspended != NULL) {
@@ -1514,7 +1517,7 @@ dsl_dataset_snapshot_tmp(const char *fsname, const char *snapname,
 	}
 
 	error = dsl_sync_task(fsname, dsl_dataset_snapshot_tmp_check,
-	    dsl_dataset_snapshot_tmp_sync, &ddsta, 3);
+	    dsl_dataset_snapshot_tmp_sync, &ddsta, 3, ZFS_SPACE_CHECK_RESERVED);
 
 	if (needsuspend)
 		zil_resume(cookie);
@@ -1603,6 +1606,12 @@ dsl_dataset_stats(dsl_dataset_t *ds, nvlist_t *nv)
 		    ds->ds_phys->ds_unique_bytes);
 		get_clones_stat(ds, nv);
 	} else {
+		if (ds->ds_prev != NULL && ds->ds_prev != dp->dp_origin_snap) {
+			char buf[MAXNAMELEN];
+			dsl_dataset_name(ds->ds_prev, buf);
+			dsl_prop_nvlist_add_string(nv, ZFS_PROP_PREV_SNAP, buf);
+		}
+
 		dsl_dir_stats(ds->ds_dir, nv);
 	}
 
@@ -1701,7 +1710,7 @@ dsl_dataset_space(dsl_dataset_t *ds,
 		else
 			*availbytesp = 0;
 	}
-	*usedobjsp = ds->ds_phys->ds_bp.blk_fill;
+	*usedobjsp = BP_GET_FILL(&ds->ds_phys->ds_bp);
 	*availobjsp = DN_MAX_OBJECT - *usedobjsp;
 }
 
@@ -1879,7 +1888,8 @@ dsl_dataset_rename_snapshot(const char *fsname,
 	ddrsa.ddrsa_recursive = recursive;
 
 	return (dsl_sync_task(fsname, dsl_dataset_rename_snapshot_check,
-	    dsl_dataset_rename_snapshot_sync, &ddrsa, 1));
+	    dsl_dataset_rename_snapshot_sync, &ddrsa,
+	    1, ZFS_SPACE_CHECK_RESERVED));
 }
 
 /*
@@ -2054,7 +2064,8 @@ dsl_dataset_rollback(const char *fsname, void *owner, nvlist_t *result)
 	ddra.ddra_result = result;
 
 	return (dsl_sync_task(fsname, dsl_dataset_rollback_check,
-	    dsl_dataset_rollback_sync, &ddra, 1));
+	    dsl_dataset_rollback_sync, &ddra,
+	    1, ZFS_SPACE_CHECK_RESERVED));
 }
 
 struct promotenode {
@@ -2575,7 +2586,8 @@ dsl_dataset_promote(const char *name, char *conflsnap)
 	ddpa.cr = CRED();
 
 	return (dsl_sync_task(name, dsl_dataset_promote_check,
-	    dsl_dataset_promote_sync, &ddpa, 2 + numsnaps));
+	    dsl_dataset_promote_sync, &ddpa,
+	    2 + numsnaps, ZFS_SPACE_CHECK_RESERVED));
 }
 
 int
@@ -2920,7 +2932,7 @@ dsl_dataset_set_refquota(const char *dsname, zprop_source_t source,
 	ddsqra.ddsqra_value = refquota;
 
 	return (dsl_sync_task(dsname, dsl_dataset_set_refquota_check,
-	    dsl_dataset_set_refquota_sync, &ddsqra, 0));
+	    dsl_dataset_set_refquota_sync, &ddsqra, 0, ZFS_SPACE_CHECK_NONE));
 }
 
 static int
@@ -3035,7 +3047,8 @@ dsl_dataset_set_refreservation(const char *dsname, zprop_source_t source,
 	ddsqra.ddsqra_value = refreservation;
 
 	return (dsl_sync_task(dsname, dsl_dataset_set_refreservation_check,
-	    dsl_dataset_set_refreservation_sync, &ddsqra, 0));
+	    dsl_dataset_set_refreservation_sync, &ddsqra,
+	    0, ZFS_SPACE_CHECK_NONE));
 }
 
 /*
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
index 623eaab85431..bdedccf4d872 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 /*
@@ -282,7 +282,7 @@ dsl_deleg_set(const char *ddname, nvlist_t *nvp, boolean_t unset)
 
 	return (dsl_sync_task(ddname, dsl_deleg_check,
 	    unset ? dsl_deleg_unset_sync : dsl_deleg_set_sync,
-	    &dda, fnvlist_num_pairs(nvp)));
+	    &dda, fnvlist_num_pairs(nvp), ZFS_SPACE_CHECK_RESERVED));
 }
 
 /*
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
index 639412cdeee6..f8a4546535e4 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
  * Copyright (c) 2013 by Joyent, Inc. All rights reserved.
  */
@@ -506,7 +506,7 @@ dsl_destroy_snapshots_nvl(nvlist_t *snaps, boolean_t defer,
 
 	error = dsl_sync_task(nvpair_name(pair),
 	    dsl_destroy_snapshot_check, dsl_destroy_snapshot_sync,
-	    &dsda, 0);
+	    &dsda, 0, ZFS_SPACE_CHECK_NONE);
 	fnvlist_free(dsda.dsda_successful_snaps);
 
 	return (error);
@@ -534,12 +534,12 @@ struct killarg {
 /* ARGSUSED */
 static int
 kill_blkptr(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
 	struct killarg *ka = arg;
 	dmu_tx_t *tx = ka->tx;
 
-	if (BP_IS_HOLE(bp))
+	if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
 		return (0);
 
 	if (zb->zb_level == ZB_ZIL_LEVEL) {
@@ -589,6 +589,7 @@ dsl_destroy_head_check_impl(dsl_dataset_t *ds, int expected_holds)
 	uint64_t count;
 	objset_t *mos;
 
+	ASSERT(!dsl_dataset_is_snapshot(ds));
 	if (dsl_dataset_is_snapshot(ds))
 		return (SET_ERROR(EINVAL));
 
@@ -711,7 +712,7 @@ dsl_destroy_head_sync_impl(dsl_dataset_t *ds, dmu_tx_t *tx)
 	    ds->ds_prev->ds_phys->ds_num_children == 2 &&
 	    ds->ds_prev->ds_userrefs == 0);
 
-	/* Remove our reservation */
+	/* Remove our reservation. */
 	if (ds->ds_reserved != 0) {
 		dsl_dataset_set_refreservation_sync_impl(ds,
 		    (ZPROP_SRC_NONE | ZPROP_SRC_LOCAL | ZPROP_SRC_RECEIVED),
@@ -898,7 +899,8 @@ dsl_destroy_head(const char *name)
 		objset_t *os;
 
 		error = dsl_sync_task(name, dsl_destroy_head_check,
-		    dsl_destroy_head_begin_sync, &ddha, 0);
+		    dsl_destroy_head_begin_sync, &ddha,
+		    0, ZFS_SPACE_CHECK_NONE);
 		if (error != 0)
 			return (error);
 
@@ -922,7 +924,7 @@ dsl_destroy_head(const char *name)
 	}
 
 	return (dsl_sync_task(name, dsl_destroy_head_check,
-	    dsl_destroy_head_sync, &ddha, 0));
+	    dsl_destroy_head_sync, &ddha, 0, ZFS_SPACE_CHECK_NONE));
 }
 
 /*
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 47b85f93688f..74daa537fd17 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
@@ -22,7 +22,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>.
  * All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2014 Joyent, Inc. All rights reserved.
  */
 
@@ -642,7 +642,8 @@ dsl_dir_activate_fs_ss_limit(const char *ddname)
 	int error;
 
 	error = dsl_sync_task(ddname, dsl_dir_actv_fs_ss_limit_check,
-	    dsl_dir_actv_fs_ss_limit_sync, (void *)ddname, 0);
+	    dsl_dir_actv_fs_ss_limit_sync, (void *)ddname, 0,
+	    ZFS_SPACE_CHECK_RESERVED);
 
 	if (error == EALREADY)
 		error = 0;
@@ -1496,7 +1497,7 @@ dsl_dir_set_quota(const char *ddname, zprop_source_t source, uint64_t quota)
 	ddsqra.ddsqra_value = quota;
 
 	return (dsl_sync_task(ddname, dsl_dir_set_quota_check,
-	    dsl_dir_set_quota_sync, &ddsqra, 0));
+	    dsl_dir_set_quota_sync, &ddsqra, 0, ZFS_SPACE_CHECK_NONE));
 }
 
 int
@@ -1617,7 +1618,7 @@ dsl_dir_set_reservation(const char *ddname, zprop_source_t source,
 	ddsqra.ddsqra_value = reservation;
 
 	return (dsl_sync_task(ddname, dsl_dir_set_reservation_check,
-	    dsl_dir_set_reservation_sync, &ddsqra, 0));
+	    dsl_dir_set_reservation_sync, &ddsqra, 0, ZFS_SPACE_CHECK_NONE));
 }
 
 static dsl_dir_t *
@@ -1899,7 +1900,8 @@ dsl_dir_rename(const char *oldname, const char *newname)
 	ddra.ddra_cred = CRED();
 
 	return (dsl_sync_task(oldname,
-	    dsl_dir_rename_check, dsl_dir_rename_sync, &ddra, 3));
+	    dsl_dir_rename_check, dsl_dir_rename_sync, &ddra,
+	    3, ZFS_SPACE_CHECK_RESERVED));
 }
 
 int
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 213c2f2ca82e..ae2420b23963 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
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
@@ -141,23 +141,19 @@ extern int zfs_vdev_async_write_active_max_dirty_percent;
 
 SYSCTL_DECL(_vfs_zfs);
 
-TUNABLE_QUAD("vfs.zfs.dirty_data_max", &zfs_dirty_data_max);
 SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, dirty_data_max, CTLFLAG_RWTUN,
     &zfs_dirty_data_max, 0,
     "The maximum amount of dirty data in bytes after which new writes are "
     "halted until space becomes available");
 
-TUNABLE_QUAD("vfs.zfs.dirty_data_max_max", &zfs_dirty_data_max_max);
 SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, dirty_data_max_max, CTLFLAG_RDTUN,
     &zfs_dirty_data_max_max, 0,
     "The absolute cap on dirty_data_max when auto calculating");
 
-TUNABLE_INT("vfs.zfs.dirty_data_max_percent", &zfs_dirty_data_max_percent);
 SYSCTL_INT(_vfs_zfs, OID_AUTO, dirty_data_max_percent, CTLFLAG_RDTUN,
     &zfs_dirty_data_max_percent, 0,
     "The percent of physical memory used to auto calculate dirty_data_max");
 
-TUNABLE_QUAD("vfs.zfs.dirty_data_sync", &zfs_dirty_data_sync);
 SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, dirty_data_sync, CTLFLAG_RWTUN,
     &zfs_dirty_data_sync, 0,
     "Force a txg if the number of dirty buffer bytes exceed this value");
@@ -333,6 +329,13 @@ dsl_pool_open(dsl_pool_t *dp)
 		    dp->dp_meta_objset, obj));
 	}
 
+	/*
+	 * Note: errors ignored, because the leak dir will not exist if we
+	 * have not encountered a leak yet.
+	 */
+	(void) dsl_pool_open_special_dir(dp, LEAK_DIR_NAME,
+	    &dp->dp_leak_dir);
+
 	if (spa_feature_is_active(dp->dp_spa, SPA_FEATURE_ASYNC_DESTROY)) {
 		err = zap_lookup(dp->dp_meta_objset, DMU_POOL_DIRECTORY_OBJECT,
 		    DMU_POOL_BPTREE_OBJ, sizeof (uint64_t), 1,
@@ -380,6 +383,8 @@ dsl_pool_close(dsl_pool_t *dp)
 		dsl_dir_rele(dp->dp_mos_dir, dp);
 	if (dp->dp_free_dir)
 		dsl_dir_rele(dp->dp_free_dir, dp);
+	if (dp->dp_leak_dir)
+		dsl_dir_rele(dp->dp_leak_dir, dp);
 	if (dp->dp_root_dir)
 		dsl_dir_rele(dp->dp_root_dir, dp);
 
@@ -686,17 +691,12 @@ dsl_pool_adjustedsize(dsl_pool_t *dp, boolean_t netfree)
 	uint64_t space, resv;
 
 	/*
-	 * Reserve about 1.6% (1/64), or at least 32MB, for allocation
-	 * efficiency.
-	 * XXX The intent log is not accounted for, so it must fit
-	 * within this slop.
-	 *
 	 * If we're trying to assess whether it's OK to do a free,
 	 * cut the reservation in half to allow forward progress
 	 * (e.g. make it possible to rm(1) files from a full pool).
 	 */
 	space = spa_get_dspace(dp->dp_spa);
-	resv = MAX(space >> 6, SPA_MINDEVSIZE >> 1);
+	resv = spa_get_slop_space(dp->dp_spa);
 	if (netfree)
 		resv >>= 1;
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
index 54ea0f1a618b..d0e3136a46e6 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
@@ -834,7 +834,7 @@ dsl_props_set(const char *dsname, zprop_source_t source, nvlist_t *props)
 		nblks = 2 * fnvlist_num_pairs(props);
 
 	return (dsl_sync_task(dsname, dsl_props_set_check, dsl_props_set_sync,
-	    &dpsa, nblks));
+	    &dpsa, nblks, ZFS_SPACE_CHECK_RESERVED));
 }
 
 typedef enum dsl_prop_getflags {
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 c62be1adda89..daf87eee8ca4 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
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/dsl_scan.h>
@@ -50,11 +50,10 @@
 #include <sys/zfs_vfsops.h>
 #endif
 
-typedef int (scan_cb_t)(dsl_pool_t *, const blkptr_t *, const zbookmark_t *);
+typedef int (scan_cb_t)(dsl_pool_t *, const blkptr_t *,
+    const zbookmark_phys_t *);
 
-static scan_cb_t dsl_scan_defrag_cb;
 static scan_cb_t dsl_scan_scrub_cb;
-static scan_cb_t dsl_scan_remove_cb;
 static void dsl_scan_cancel_sync(void *, dmu_tx_t *);
 static void dsl_scan_sync_state(dsl_scan_t *, dmu_tx_t *tx);
 
@@ -68,35 +67,26 @@ unsigned int zfs_free_min_time_ms = 1000; /* min millisecs to free per txg */
 unsigned int zfs_resilver_min_time_ms = 3000; /* min millisecs to resilver
 						 per txg */
 boolean_t zfs_no_scrub_io = B_FALSE; /* set to disable scrub i/o */
-boolean_t zfs_no_scrub_prefetch = B_FALSE; /* set to disable srub prefetching */
+boolean_t zfs_no_scrub_prefetch = B_FALSE; /* set to disable scrub prefetch */
 
 SYSCTL_DECL(_vfs_zfs);
-TUNABLE_INT("vfs.zfs.top_maxinflight", &zfs_top_maxinflight);
-SYSCTL_UINT(_vfs_zfs, OID_AUTO, top_maxinflight, CTLFLAG_RW,
+SYSCTL_UINT(_vfs_zfs, OID_AUTO, top_maxinflight, CTLFLAG_RWTUN,
     &zfs_top_maxinflight, 0, "Maximum I/Os per top-level vdev");
-TUNABLE_INT("vfs.zfs.resilver_delay", &zfs_resilver_delay);
-SYSCTL_UINT(_vfs_zfs, OID_AUTO, resilver_delay, CTLFLAG_RW,
+SYSCTL_UINT(_vfs_zfs, OID_AUTO, resilver_delay, CTLFLAG_RWTUN,
     &zfs_resilver_delay, 0, "Number of ticks to delay resilver");
-TUNABLE_INT("vfs.zfs.scrub_delay", &zfs_scrub_delay);
-SYSCTL_UINT(_vfs_zfs, OID_AUTO, scrub_delay, CTLFLAG_RW,
+SYSCTL_UINT(_vfs_zfs, OID_AUTO, scrub_delay, CTLFLAG_RWTUN,
     &zfs_scrub_delay, 0, "Number of ticks to delay scrub");
-TUNABLE_INT("vfs.zfs.scan_idle", &zfs_scan_idle);
-SYSCTL_UINT(_vfs_zfs, OID_AUTO, scan_idle, CTLFLAG_RW,
+SYSCTL_UINT(_vfs_zfs, OID_AUTO, scan_idle, CTLFLAG_RWTUN,
     &zfs_scan_idle, 0, "Idle scan window in clock ticks");
-TUNABLE_INT("vfs.zfs.scan_min_time_ms", &zfs_scan_min_time_ms);
-SYSCTL_UINT(_vfs_zfs, OID_AUTO, scan_min_time_ms, CTLFLAG_RW,
+SYSCTL_UINT(_vfs_zfs, OID_AUTO, scan_min_time_ms, CTLFLAG_RWTUN,
     &zfs_scan_min_time_ms, 0, "Min millisecs to scrub per txg");
-TUNABLE_INT("vfs.zfs.free_min_time_ms", &zfs_free_min_time_ms);
-SYSCTL_UINT(_vfs_zfs, OID_AUTO, free_min_time_ms, CTLFLAG_RW,
+SYSCTL_UINT(_vfs_zfs, OID_AUTO, free_min_time_ms, CTLFLAG_RWTUN,
     &zfs_free_min_time_ms, 0, "Min millisecs to free per txg");
-TUNABLE_INT("vfs.zfs.resilver_min_time_ms", &zfs_resilver_min_time_ms);
-SYSCTL_UINT(_vfs_zfs, OID_AUTO, resilver_min_time_ms, CTLFLAG_RW,
+SYSCTL_UINT(_vfs_zfs, OID_AUTO, resilver_min_time_ms, CTLFLAG_RWTUN,
     &zfs_resilver_min_time_ms, 0, "Min millisecs to resilver per txg");
-TUNABLE_INT("vfs.zfs.no_scrub_io", &zfs_no_scrub_io);
-SYSCTL_INT(_vfs_zfs, OID_AUTO, no_scrub_io, CTLFLAG_RW,
+SYSCTL_INT(_vfs_zfs, OID_AUTO, no_scrub_io, CTLFLAG_RWTUN,
     &zfs_no_scrub_io, 0, "Disable scrub I/O");
-TUNABLE_INT("vfs.zfs.no_scrub_prefetch", &zfs_no_scrub_prefetch);
-SYSCTL_INT(_vfs_zfs, OID_AUTO, no_scrub_prefetch, CTLFLAG_RW,
+SYSCTL_INT(_vfs_zfs, OID_AUTO, no_scrub_prefetch, CTLFLAG_RWTUN,
     &zfs_no_scrub_prefetch, 0, "Disable scrub prefetching");
 
 enum ddt_class zfs_scrub_ddt_class_max = DDT_CLASS_DUPLICATE;
@@ -377,11 +367,11 @@ int
 dsl_scan_cancel(dsl_pool_t *dp)
 {
 	return (dsl_sync_task(spa_name(dp->dp_spa), dsl_scan_cancel_check,
-	    dsl_scan_cancel_sync, NULL, 3));
+	    dsl_scan_cancel_sync, NULL, 3, ZFS_SPACE_CHECK_RESERVED));
 }
 
 static void dsl_scan_visitbp(blkptr_t *bp,
-    const zbookmark_t *zb, dnode_phys_t *dnp, arc_buf_t *pbuf,
+    const zbookmark_phys_t *zb, dnode_phys_t *dnp, arc_buf_t *pbuf,
     dsl_dataset_t *ds, dsl_scan_t *scn, dmu_objset_type_t ostype,
     dmu_tx_t *tx);
 static void dsl_scan_visitdnode(dsl_scan_t *, dsl_dataset_t *ds,
@@ -421,7 +411,7 @@ dsl_scan_sync_state(dsl_scan_t *scn, dmu_tx_t *tx)
 }
 
 static boolean_t
-dsl_scan_check_pause(dsl_scan_t *scn, const zbookmark_t *zb)
+dsl_scan_check_pause(dsl_scan_t *scn, const zbookmark_phys_t *zb)
 {
 	uint64_t elapsed_nanosecs;
 	unsigned int mintime;
@@ -479,7 +469,7 @@ dsl_scan_zil_block(zilog_t *zilog, blkptr_t *bp, void *arg, uint64_t claim_txg)
 	dsl_pool_t *dp = zsa->zsa_dp;
 	dsl_scan_t *scn = dp->dp_scan;
 	zil_header_t *zh = zsa->zsa_zh;
-	zbookmark_t zb;
+	zbookmark_phys_t zb;
 
 	if (BP_IS_HOLE(bp) || bp->blk_birth <= scn->scn_phys.scn_cur_min_txg)
 		return (0);
@@ -511,7 +501,7 @@ dsl_scan_zil_record(zilog_t *zilog, lr_t *lrc, void *arg, uint64_t claim_txg)
 		zil_header_t *zh = zsa->zsa_zh;
 		lr_write_t *lr = (lr_write_t *)lrc;
 		blkptr_t *bp = &lr->lr_blkptr;
-		zbookmark_t zb;
+		zbookmark_phys_t zb;
 
 		if (BP_IS_HOLE(bp) ||
 		    bp->blk_birth <= scn->scn_phys.scn_cur_min_txg)
@@ -561,7 +551,7 @@ static void
 dsl_scan_prefetch(dsl_scan_t *scn, arc_buf_t *buf, blkptr_t *bp,
     uint64_t objset, uint64_t object, uint64_t blkid)
 {
-	zbookmark_t czb;
+	zbookmark_phys_t czb;
 	uint32_t flags = ARC_NOWAIT | ARC_PREFETCH;
 
 	if (zfs_no_scrub_prefetch)
@@ -580,7 +570,7 @@ dsl_scan_prefetch(dsl_scan_t *scn, arc_buf_t *buf, blkptr_t *bp,
 
 static boolean_t
 dsl_scan_check_resume(dsl_scan_t *scn, const dnode_phys_t *dnp,
-    const zbookmark_t *zb)
+    const zbookmark_phys_t *zb)
 {
 	/*
 	 * We never skip over user/group accounting objects (obj<0)
@@ -620,7 +610,7 @@ dsl_scan_check_resume(dsl_scan_t *scn, const dnode_phys_t *dnp,
 static int
 dsl_scan_recurse(dsl_scan_t *scn, dsl_dataset_t *ds, dmu_objset_type_t ostype,
     dnode_phys_t *dnp, const blkptr_t *bp,
-    const zbookmark_t *zb, dmu_tx_t *tx, arc_buf_t **bufp)
+    const zbookmark_phys_t *zb, dmu_tx_t *tx, arc_buf_t **bufp)
 {
 	dsl_pool_t *dp = scn->scn_dp;
 	int zio_flags = ZIO_FLAG_CANFAIL | ZIO_FLAG_SCAN_THREAD;
@@ -643,7 +633,7 @@ dsl_scan_recurse(dsl_scan_t *scn, dsl_dataset_t *ds, dmu_objset_type_t ostype,
 			    zb->zb_object, zb->zb_blkid * epb + i);
 		}
 		for (i = 0, cbp = (*bufp)->b_data; i < epb; i++, cbp++) {
-			zbookmark_t czb;
+			zbookmark_phys_t czb;
 
 			SET_BOOKMARK(&czb, zb->zb_objset, zb->zb_object,
 			    zb->zb_level - 1,
@@ -727,7 +717,7 @@ dsl_scan_visitdnode(dsl_scan_t *scn, dsl_dataset_t *ds,
 	int j;
 
 	for (j = 0; j < dnp->dn_nblkptr; j++) {
-		zbookmark_t czb;
+		zbookmark_phys_t czb;
 
 		SET_BOOKMARK(&czb, ds ? ds->ds_object : 0, object,
 		    dnp->dn_nlevels - 1, j);
@@ -736,7 +726,7 @@ dsl_scan_visitdnode(dsl_scan_t *scn, dsl_dataset_t *ds,
 	}
 
 	if (dnp->dn_flags & DNODE_FLAG_SPILL_BLKPTR) {
-		zbookmark_t czb;
+		zbookmark_phys_t czb;
 		SET_BOOKMARK(&czb, ds ? ds->ds_object : 0, object,
 		    0, DMU_SPILL_BLKID);
 		dsl_scan_visitbp(&dnp->dn_spill,
@@ -749,7 +739,7 @@ dsl_scan_visitdnode(dsl_scan_t *scn, dsl_dataset_t *ds,
  * first 5; we want them to be useful.
  */
 static void
-dsl_scan_visitbp(blkptr_t *bp, const zbookmark_t *zb,
+dsl_scan_visitbp(blkptr_t *bp, const zbookmark_phys_t *zb,
     dnode_phys_t *dnp, arc_buf_t *pbuf,
     dsl_dataset_t *ds, dsl_scan_t *scn, dmu_objset_type_t ostype,
     dmu_tx_t *tx)
@@ -813,7 +803,7 @@ static void
 dsl_scan_visit_rootbp(dsl_scan_t *scn, dsl_dataset_t *ds, blkptr_t *bp,
     dmu_tx_t *tx)
 {
-	zbookmark_t zb;
+	zbookmark_phys_t zb;
 
 	SET_BOOKMARK(&zb, ds ? ds->ds_object : DMU_META_OBJSET,
 	    ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
@@ -1240,7 +1230,7 @@ dsl_scan_ddt_entry(dsl_scan_t *scn, enum zio_checksum checksum,
 	const ddt_key_t *ddk = &dde->dde_key;
 	ddt_phys_t *ddp = dde->dde_phys;
 	blkptr_t bp;
-	zbookmark_t zb = { 0 };
+	zbookmark_phys_t zb = { 0 };
 
 	if (scn->scn_phys.scn_state != DSS_SCANNING)
 		return;
@@ -1308,7 +1298,7 @@ dsl_scan_visit(dsl_scan_t *scn, dmu_tx_t *tx)
 	 * In case we were paused right at the end of the ds, zero the
 	 * bookmark so we don't think that we're still trying to resume.
 	 */
-	bzero(&scn->scn_phys.scn_bookmark, sizeof (zbookmark_t));
+	bzero(&scn->scn_phys.scn_bookmark, sizeof (zbookmark_phys_t));
 
 	/* keep pulling things out of the zap-object-as-queue */
 	while (zap_cursor_init(&zc, dp->dp_meta_objset,
@@ -1389,7 +1379,7 @@ dsl_scan_active(dsl_scan_t *scn)
 	if (spa_shutting_down(spa))
 		return (B_FALSE);
 	if (scn->scn_phys.scn_state == DSS_SCANNING ||
-	    scn->scn_async_destroying)
+	    (scn->scn_async_destroying && !scn->scn_async_stalled))
 		return (B_TRUE);
 
 	if (spa_version(scn->scn_dp->dp_spa) >= SPA_VERSION_DEADLISTS) {
@@ -1404,7 +1394,7 @@ dsl_scan_sync(dsl_pool_t *dp, dmu_tx_t *tx)
 {
 	dsl_scan_t *scn = dp->dp_scan;
 	spa_t *spa = dp->dp_spa;
-	int err;
+	int err = 0;
 
 	/*
 	 * Check for scn_restart_txg before checking spa_load_state, so
@@ -1422,7 +1412,10 @@ dsl_scan_sync(dsl_pool_t *dp, dmu_tx_t *tx)
 		dsl_scan_setup_sync(&func, tx);
 	}
 
-	if (!dsl_scan_active(scn) ||
+	/*
+	 * If the scan is inactive due to a stalled async destroy, try again.
+	 */
+	if ((!scn->scn_async_stalled && !dsl_scan_active(scn)) ||
 	    spa_sync_pass(dp->dp_spa) > 1)
 		return;
 
@@ -1432,10 +1425,11 @@ dsl_scan_sync(dsl_pool_t *dp, dmu_tx_t *tx)
 	spa->spa_scrub_active = B_TRUE;
 
 	/*
-	 * First process the free list.  If we pause the free, don't do
-	 * any scanning.  This ensures that there is no free list when
-	 * we are scanning, so the scan code doesn't have to worry about
-	 * traversing it.
+	 * First process the async destroys.  If we pause, don't do
+	 * any scrubbing or resilvering.  This ensures that there are no
+	 * async destroys while we are scanning, so the scan code doesn't
+	 * have to worry about traversing it.  It is also faster to free the
+	 * blocks than to scrub them.
 	 */
 	if (spa_version(dp->dp_spa) >= SPA_VERSION_DEADLISTS) {
 		scn->scn_is_bptree = B_FALSE;
@@ -1445,48 +1439,96 @@ dsl_scan_sync(dsl_pool_t *dp, dmu_tx_t *tx)
 		    dsl_scan_free_block_cb, scn, tx);
 		VERIFY3U(0, ==, zio_wait(scn->scn_zio_root));
 
-		if (err == 0 && spa_feature_is_active(spa,
-		    SPA_FEATURE_ASYNC_DESTROY)) {
-			ASSERT(scn->scn_async_destroying);
-			scn->scn_is_bptree = B_TRUE;
-			scn->scn_zio_root = zio_root(dp->dp_spa, NULL,
-			    NULL, ZIO_FLAG_MUSTSUCCEED);
-			err = bptree_iterate(dp->dp_meta_objset,
-			    dp->dp_bptree_obj, B_TRUE, dsl_scan_free_block_cb,
-			    scn, tx);
-			VERIFY0(zio_wait(scn->scn_zio_root));
+		if (err != 0 && err != ERESTART)
+			zfs_panic_recover("error %u from bpobj_iterate()", err);
+	}
 
-			if (err == 0) {
-				/* finished; deactivate async destroy feature */
-				spa_feature_decr(spa, SPA_FEATURE_ASYNC_DESTROY,
-				    tx);
-				ASSERT(!spa_feature_is_active(spa,
-				    SPA_FEATURE_ASYNC_DESTROY));
-				VERIFY0(zap_remove(dp->dp_meta_objset,
-				    DMU_POOL_DIRECTORY_OBJECT,
-				    DMU_POOL_BPTREE_OBJ, tx));
-				VERIFY0(bptree_free(dp->dp_meta_objset,
-				    dp->dp_bptree_obj, tx));
-				dp->dp_bptree_obj = 0;
-				scn->scn_async_destroying = B_FALSE;
-			}
+	if (err == 0 && spa_feature_is_active(spa, SPA_FEATURE_ASYNC_DESTROY)) {
+		ASSERT(scn->scn_async_destroying);
+		scn->scn_is_bptree = B_TRUE;
+		scn->scn_zio_root = zio_root(dp->dp_spa, NULL,
+		    NULL, ZIO_FLAG_MUSTSUCCEED);
+		err = bptree_iterate(dp->dp_meta_objset,
+		    dp->dp_bptree_obj, B_TRUE, dsl_scan_free_block_cb, scn, tx);
+		VERIFY0(zio_wait(scn->scn_zio_root));
+
+		if (err == EIO || err == ECKSUM) {
+			err = 0;
+		} else if (err != 0 && err != ERESTART) {
+			zfs_panic_recover("error %u from "
+			    "traverse_dataset_destroyed()", err);
 		}
-		if (scn->scn_visited_this_txg) {
-			zfs_dbgmsg("freed %llu blocks in %llums from "
-			    "free_bpobj/bptree txg %llu",
-			    (longlong_t)scn->scn_visited_this_txg,
-			    (longlong_t)
-			    NSEC2MSEC(gethrtime() - scn->scn_sync_start_time),
-			    (longlong_t)tx->tx_txg);
-			scn->scn_visited_this_txg = 0;
-			/*
-			 * Re-sync the ddt so that we can further modify
-			 * it when doing bprewrite.
-			 */
-			ddt_sync(spa, tx->tx_txg);
+
+		/*
+		 * If we didn't make progress, mark the async destroy as
+		 * stalled, so that we will not initiate a spa_sync() on
+		 * its behalf.
+		 */
+		scn->scn_async_stalled = (scn->scn_visited_this_txg == 0);
+
+		if (bptree_is_empty(dp->dp_meta_objset, dp->dp_bptree_obj)) {
+			/* finished; deactivate async destroy feature */
+			spa_feature_decr(spa, SPA_FEATURE_ASYNC_DESTROY, tx);
+			ASSERT(!spa_feature_is_active(spa,
+			    SPA_FEATURE_ASYNC_DESTROY));
+			VERIFY0(zap_remove(dp->dp_meta_objset,
+			    DMU_POOL_DIRECTORY_OBJECT,
+			    DMU_POOL_BPTREE_OBJ, tx));
+			VERIFY0(bptree_free(dp->dp_meta_objset,
+			    dp->dp_bptree_obj, tx));
+			dp->dp_bptree_obj = 0;
+			scn->scn_async_destroying = B_FALSE;
 		}
-		if (err == ERESTART)
-			return;
+	}
+	if (scn->scn_visited_this_txg) {
+		zfs_dbgmsg("freed %llu blocks in %llums from "
+		    "free_bpobj/bptree txg %llu; err=%u",
+		    (longlong_t)scn->scn_visited_this_txg,
+		    (longlong_t)
+		    NSEC2MSEC(gethrtime() - scn->scn_sync_start_time),
+		    (longlong_t)tx->tx_txg, err);
+		scn->scn_visited_this_txg = 0;
+
+		/*
+		 * Write out changes to the DDT that may be required as a
+		 * result of the blocks freed.  This ensures that the DDT
+		 * is clean when a scrub/resilver runs.
+		 */
+		ddt_sync(spa, tx->tx_txg);
+	}
+	if (err != 0)
+		return;
+	if (!scn->scn_async_destroying && zfs_free_leak_on_eio &&
+	    (dp->dp_free_dir->dd_phys->dd_used_bytes != 0 ||
+	    dp->dp_free_dir->dd_phys->dd_compressed_bytes != 0 ||
+	    dp->dp_free_dir->dd_phys->dd_uncompressed_bytes != 0)) {
+		/*
+		 * We have finished background destroying, but there is still
+		 * some space left in the dp_free_dir. Transfer this leaked
+		 * space to the dp_leak_dir.
+		 */
+		if (dp->dp_leak_dir == NULL) {
+			rrw_enter(&dp->dp_config_rwlock, RW_WRITER, FTAG);
+			(void) dsl_dir_create_sync(dp, dp->dp_root_dir,
+			    LEAK_DIR_NAME, tx);
+			VERIFY0(dsl_pool_open_special_dir(dp,
+			    LEAK_DIR_NAME, &dp->dp_leak_dir));
+			rrw_exit(&dp->dp_config_rwlock, FTAG);
+		}
+		dsl_dir_diduse_space(dp->dp_leak_dir, DD_USED_HEAD,
+		    dp->dp_free_dir->dd_phys->dd_used_bytes,
+		    dp->dp_free_dir->dd_phys->dd_compressed_bytes,
+		    dp->dp_free_dir->dd_phys->dd_uncompressed_bytes, tx);
+		dsl_dir_diduse_space(dp->dp_free_dir, DD_USED_HEAD,
+		    -dp->dp_free_dir->dd_phys->dd_used_bytes,
+		    -dp->dp_free_dir->dd_phys->dd_compressed_bytes,
+		    -dp->dp_free_dir->dd_phys->dd_uncompressed_bytes, tx);
+	}
+	if (!scn->scn_async_destroying) {
+		/* finished; verify that space accounting went to zero */
+		ASSERT0(dp->dp_free_dir->dd_phys->dd_used_bytes);
+		ASSERT0(dp->dp_free_dir->dd_phys->dd_compressed_bytes);
+		ASSERT0(dp->dp_free_dir->dd_phys->dd_uncompressed_bytes);
 	}
 
 	if (scn->scn_phys.scn_state != DSS_SCANNING)
@@ -1653,7 +1695,7 @@ dsl_scan_scrub_done(zio_t *zio)
 
 static int
 dsl_scan_scrub_cb(dsl_pool_t *dp,
-    const blkptr_t *bp, const zbookmark_t *zb)
+    const blkptr_t *bp, const zbookmark_phys_t *zb)
 {
 	dsl_scan_t *scn = dp->dp_scan;
 	size_t size = BP_GET_PSIZE(bp);
@@ -1669,6 +1711,9 @@ dsl_scan_scrub_cb(dsl_pool_t *dp,
 
 	count_block(dp->dp_blkstats, bp);
 
+	if (BP_IS_EMBEDDED(bp))
+		return (0);
+
 	ASSERT(DSL_SCAN_IS_SCRUB_RESILVER(scn));
 	if (scn->scn_phys.scn_func == POOL_SCAN_SCRUB) {
 		zio_flags |= ZIO_FLAG_SCRUB;
@@ -1762,5 +1807,5 @@ dsl_scan(dsl_pool_t *dp, pool_scan_func_t func)
 	(void) spa_vdev_state_exit(spa, NULL, 0);
 
 	return (dsl_sync_task(spa_name(spa), dsl_scan_setup_check,
-	    dsl_scan_setup_sync, &func, 0));
+	    dsl_scan_setup_sync, &func, 0, ZFS_SPACE_CHECK_NONE));
 }
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c
index 58f7d3795282..8e09347678dd 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/dmu.h>
@@ -64,7 +64,8 @@ dsl_null_checkfunc(void *arg, dmu_tx_t *tx)
  */
 int
 dsl_sync_task(const char *pool, dsl_checkfunc_t *checkfunc,
-    dsl_syncfunc_t *syncfunc, void *arg, int blocks_modified)
+    dsl_syncfunc_t *syncfunc, void *arg,
+    int blocks_modified, zfs_space_check_t space_check)
 {
 	spa_t *spa;
 	dmu_tx_t *tx;
@@ -84,6 +85,7 @@ dsl_sync_task(const char *pool, dsl_checkfunc_t *checkfunc,
 	dst.dst_pool = dp;
 	dst.dst_txg = dmu_tx_get_txg(tx);
 	dst.dst_space = blocks_modified << DST_AVG_BLKSHIFT;
+	dst.dst_space_check = space_check;
 	dst.dst_checkfunc = checkfunc != NULL ? checkfunc : dsl_null_checkfunc;
 	dst.dst_syncfunc = syncfunc;
 	dst.dst_arg = arg;
@@ -117,13 +119,14 @@ dsl_sync_task(const char *pool, dsl_checkfunc_t *checkfunc,
 
 void
 dsl_sync_task_nowait(dsl_pool_t *dp, dsl_syncfunc_t *syncfunc, void *arg,
-    int blocks_modified, dmu_tx_t *tx)
+    int blocks_modified, zfs_space_check_t space_check, dmu_tx_t *tx)
 {
 	dsl_sync_task_t *dst = kmem_zalloc(sizeof (*dst), KM_SLEEP);
 
 	dst->dst_pool = dp;
 	dst->dst_txg = dmu_tx_get_txg(tx);
 	dst->dst_space = blocks_modified << DST_AVG_BLKSHIFT;
+	dst->dst_space_check = space_check;
 	dst->dst_checkfunc = dsl_null_checkfunc;
 	dst->dst_syncfunc = syncfunc;
 	dst->dst_arg = arg;
@@ -140,25 +143,34 @@ void
 dsl_sync_task_sync(dsl_sync_task_t *dst, dmu_tx_t *tx)
 {
 	dsl_pool_t *dp = dst->dst_pool;
-	uint64_t quota, used;
 
 	ASSERT0(dst->dst_error);
 
 	/*
-	 * Check for sufficient space.  We just check against what's
-	 * on-disk; we don't want any in-flight accounting to get in our
-	 * way, because open context may have already used up various
-	 * in-core limits (arc_tempreserve, dsl_pool_tempreserve).
+	 * Check for sufficient space.
+	 *
+	 * When the sync task was created, the caller specified the
+	 * type of space checking required.  See the comment in
+	 * zfs_space_check_t for details on the semantics of each
+	 * type of space checking.
+	 *
+	 * We just check against what's on-disk; we don't want any
+	 * in-flight accounting to get in our way, because open context
+	 * may have already used up various in-core limits
+	 * (arc_tempreserve, dsl_pool_tempreserve).
 	 */
-	quota = dsl_pool_adjustedsize(dp, B_FALSE) -
-	    metaslab_class_get_deferred(spa_normal_class(dp->dp_spa));
-	used = dp->dp_root_dir->dd_phys->dd_used_bytes;
-	/* MOS space is triple-dittoed, so we multiply by 3. */
-	if (dst->dst_space > 0 && used + dst->dst_space * 3 > quota) {
-		dst->dst_error = SET_ERROR(ENOSPC);
-		if (dst->dst_nowaiter)
-			kmem_free(dst, sizeof (*dst));
-		return;
+	if (dst->dst_space_check != ZFS_SPACE_CHECK_NONE) {
+		uint64_t quota = dsl_pool_adjustedsize(dp,
+		    dst->dst_space_check == ZFS_SPACE_CHECK_RESERVED) -
+		    metaslab_class_get_deferred(spa_normal_class(dp->dp_spa));
+		uint64_t used = dp->dp_root_dir->dd_phys->dd_used_bytes;
+		/* MOS space is triple-dittoed, so we multiply by 3. */
+		if (dst->dst_space > 0 && used + dst->dst_space * 3 > quota) {
+			dst->dst_error = SET_ERROR(ENOSPC);
+			if (dst->dst_nowaiter)
+				kmem_free(dst, sizeof (*dst));
+			return;
+		}
 	}
 
 	/*
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 7f2c26f766e3..b6878d7ecc44 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
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
@@ -317,7 +317,8 @@ dsl_dataset_user_hold(nvlist_t *holds, minor_t cleanup_minor, nvlist_t *errlist)
 	dduha.dduha_minor = cleanup_minor;
 
 	ret = dsl_sync_task(nvpair_name(pair), dsl_dataset_user_hold_check,
-	    dsl_dataset_user_hold_sync, &dduha, fnvlist_num_pairs(holds));
+	    dsl_dataset_user_hold_sync, &dduha,
+	    fnvlist_num_pairs(holds), ZFS_SPACE_CHECK_RESERVED);
 	fnvlist_free(dduha.dduha_chkholds);
 
 	return (ret);
@@ -600,8 +601,7 @@ dsl_dataset_user_release_impl(nvlist_t *holds, nvlist_t *errlist,
 	ddura.ddura_chkholds = fnvlist_alloc();
 
 	error = dsl_sync_task(pool, dsl_dataset_user_release_check,
-	    dsl_dataset_user_release_sync, &ddura,
-	    fnvlist_num_pairs(holds));
+	    dsl_dataset_user_release_sync, &ddura, 0, ZFS_SPACE_CHECK_NONE);
 	fnvlist_free(ddura.ddura_todelete);
 	fnvlist_free(ddura.ddura_chkholds);
 
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 407c6eaf429f..370556fcfb75 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
@@ -32,6 +32,7 @@
 #include <sys/vdev_impl.h>
 #include <sys/zio.h>
 #include <sys/spa_impl.h>
+#include <sys/zfeature.h>
 
 SYSCTL_DECL(_vfs_zfs);
 SYSCTL_NODE(_vfs_zfs, OID_AUTO, metaslab, CTLFLAG_RW, 0, "ZFS metaslab");
@@ -55,7 +56,6 @@ SYSCTL_NODE(_vfs_zfs, OID_AUTO, metaslab, CTLFLAG_RW, 0, "ZFS metaslab");
 
 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);
 SYSCTL_QUAD(_vfs_zfs_metaslab, OID_AUTO, gang_bang, CTLFLAG_RWTUN,
     &metaslab_gang_bang, 0,
     "Force gang block allocation for blocks larger than or equal to this value");
@@ -67,16 +67,30 @@ 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");
 
+/*
+ * Condensing a metaslab is not guaranteed to actually reduce the amount of
+ * space used on disk. In particular, a space map uses data in increments of
+ * MAX(1 << ashift, SPACE_MAP_INITIAL_BLOCKSIZE), so a metaslab might use the
+ * same number of blocks after condensing. Since the goal of condensing is to
+ * reduce the number of IOPs required to read the space map, we only want to
+ * condense when we can be sure we will reduce the number of blocks used by the
+ * space map. Unfortunately, we cannot precisely compute whether or not this is
+ * the case in metaslab_should_condense since we are holding ms_lock. Instead,
+ * we apply the following heuristic: do not condense a spacemap unless the
+ * uncondensed size consumes greater than zfs_metaslab_condense_block_threshold
+ * blocks.
+ */
+int zfs_metaslab_condense_block_threshold = 4;
+
 /*
  * 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
+ * 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
@@ -87,17 +101,40 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, condense_pct, CTLFLAG_RWTUN,
  * no metaslab group will be excluded based on this criterion.
  */
 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");
 
+/*
+ * Metaslab groups are considered eligible for allocations if their
+ * fragmenation metric (measured as a percentage) is less than or equal to
+ * zfs_mg_fragmentation_threshold. If a metaslab group exceeds this threshold
+ * then it will be skipped unless all metaslab groups within the metaslab
+ * class have also crossed this threshold.
+ */
+int zfs_mg_fragmentation_threshold = 85;
+SYSCTL_INT(_vfs_zfs, OID_AUTO, mg_fragmentation_threshold, CTLFLAG_RWTUN,
+    &zfs_mg_fragmentation_threshold, 0,
+    "Percentage of metaslab group size that should be considered "
+    "eligible for allocations unless all metaslab groups within the metaslab class "
+    "have also crossed this threshold");
+
+/*
+ * Allow metaslabs to keep their active state as long as their fragmentation
+ * percentage is less than or equal to zfs_metaslab_fragmentation_threshold. An
+ * active metaslab that exceeds this threshold will no longer keep its active
+ * status allowing better metaslabs to be selected.
+ */
+int zfs_metaslab_fragmentation_threshold = 70;
+SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, fragmentation_threshold, CTLFLAG_RWTUN,
+    &zfs_metaslab_fragmentation_threshold, 0,
+    "Maximum percentage of metaslab fragmentation level to keep their active state");
+
 /*
  * 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");
@@ -106,7 +143,6 @@ SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, debug_load, CTLFLAG_RWTUN,
  * 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");
@@ -118,8 +154,6 @@ SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, debug_unload, CTLFLAG_RWTUN,
  * aggressive strategy (i.e search by size rather than offset).
  */
 uint64_t metaslab_df_alloc_threshold = SPA_MAXBLOCKSIZE;
-TUNABLE_QUAD("vfs.zfs.metaslab.df_alloc_threshold",
-    &metaslab_df_alloc_threshold);
 SYSCTL_QUAD(_vfs_zfs_metaslab, OID_AUTO, df_alloc_threshold, CTLFLAG_RWTUN,
     &metaslab_df_alloc_threshold, 0,
     "Minimum size which forces the dynamic allocator to change it's allocation strategy");
@@ -131,27 +165,25 @@ SYSCTL_QUAD(_vfs_zfs_metaslab, OID_AUTO, df_alloc_threshold, CTLFLAG_RWTUN,
  * switch to using best-fit allocations.
  */
 int metaslab_df_free_pct = 4;
-TUNABLE_INT("vfs.zfs.metaslab.df_free_pct", &metaslab_df_free_pct);
 SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, df_free_pct, CTLFLAG_RWTUN,
     &metaslab_df_free_pct, 0,
-    "The minimum free space, in percent, which must be available in a space map to continue allocations in a first-fit fashion");
+    "The minimum free space, in percent, which must be available in a "
+    "space map to continue allocations in a first-fit fashion");
 
 /*
  * A metaslab is considered "free" if it contains a contiguous
  * segment which is greater than metaslab_min_alloc_size.
  */
 uint64_t metaslab_min_alloc_size = DMU_MAX_ACCESS;
-TUNABLE_QUAD("vfs.zfs.metaslab.min_alloc_size",
-    &metaslab_min_alloc_size);
 SYSCTL_QUAD(_vfs_zfs_metaslab, OID_AUTO, min_alloc_size, CTLFLAG_RWTUN,
     &metaslab_min_alloc_size, 0,
-    "A metaslab is considered \"free\" if it contains a contiguous segment which is greater than vfs.zfs.metaslab.min_alloc_size");
+    "A metaslab is considered \"free\" if it contains a contiguous "
+    "segment which is greater than vfs.zfs.metaslab.min_alloc_size");
 
 /*
  * Percentage of all cpus that can be used by the metaslab taskq.
  */
 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");
@@ -162,24 +194,14 @@ SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, load_pct, CTLFLAG_RWTUN,
  * keep it loaded.
  */
 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?
- */
-boolean_t zfs_write_to_degraded = B_FALSE;
-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");
@@ -188,21 +210,35 @@ SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, preload_limit, CTLFLAG_RWTUN,
  * 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.
+ * Enable/disable fragmentation weighting on metaslabs.
  */
-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");
+boolean_t metaslab_fragmentation_factor_enabled = B_TRUE;
+SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, fragmentation_factor_enabled, CTLFLAG_RWTUN,
+    &metaslab_fragmentation_factor_enabled, 0,
+    "Enable fragmentation weighting on metaslabs");
 
+/*
+ * Enable/disable lba weighting (i.e. outer tracks are given preference).
+ */
+boolean_t metaslab_lba_weighting_enabled = B_TRUE;
+SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, lba_weighting_enabled, CTLFLAG_RWTUN,
+    &metaslab_lba_weighting_enabled, 0,
+    "Enable LBA weighting (i.e. outer tracks are given preference)");
+
+/*
+ * Enable/disable metaslab group biasing.
+ */
+boolean_t metaslab_bias_enabled = B_TRUE;
+SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, bias_enabled, CTLFLAG_RWTUN,
+    &metaslab_bias_enabled, 0,
+    "Enable metaslab group biasing");
+
+static uint64_t metaslab_fragmentation(metaslab_t *);
 
 /*
  * ==========================================================================
@@ -322,6 +358,121 @@ metaslab_class_get_minblocksize(metaslab_class_t *mc)
 	return (mc->mc_minblocksize);
 }
 
+void
+metaslab_class_histogram_verify(metaslab_class_t *mc)
+{
+	vdev_t *rvd = mc->mc_spa->spa_root_vdev;
+	uint64_t *mc_hist;
+	int i;
+
+	if ((zfs_flags & ZFS_DEBUG_HISTOGRAM_VERIFY) == 0)
+		return;
+
+	mc_hist = kmem_zalloc(sizeof (uint64_t) * RANGE_TREE_HISTOGRAM_SIZE,
+	    KM_SLEEP);
+
+	for (int c = 0; c < rvd->vdev_children; c++) {
+		vdev_t *tvd = rvd->vdev_child[c];
+		metaslab_group_t *mg = tvd->vdev_mg;
+
+		/*
+		 * Skip any holes, uninitialized top-levels, or
+		 * vdevs that are not in this metalab class.
+		 */
+		if (tvd->vdev_ishole || tvd->vdev_ms_shift == 0 ||
+		    mg->mg_class != mc) {
+			continue;
+		}
+
+		for (i = 0; i < RANGE_TREE_HISTOGRAM_SIZE; i++)
+			mc_hist[i] += mg->mg_histogram[i];
+	}
+
+	for (i = 0; i < RANGE_TREE_HISTOGRAM_SIZE; i++)
+		VERIFY3U(mc_hist[i], ==, mc->mc_histogram[i]);
+
+	kmem_free(mc_hist, sizeof (uint64_t) * RANGE_TREE_HISTOGRAM_SIZE);
+}
+
+/*
+ * Calculate the metaslab class's fragmentation metric. The metric
+ * is weighted based on the space contribution of each metaslab group.
+ * The return value will be a number between 0 and 100 (inclusive), or
+ * ZFS_FRAG_INVALID if the metric has not been set. See comment above the
+ * zfs_frag_table for more information about the metric.
+ */
+uint64_t
+metaslab_class_fragmentation(metaslab_class_t *mc)
+{
+	vdev_t *rvd = mc->mc_spa->spa_root_vdev;
+	uint64_t fragmentation = 0;
+
+	spa_config_enter(mc->mc_spa, SCL_VDEV, FTAG, RW_READER);
+
+	for (int c = 0; c < rvd->vdev_children; c++) {
+		vdev_t *tvd = rvd->vdev_child[c];
+		metaslab_group_t *mg = tvd->vdev_mg;
+
+		/*
+		 * Skip any holes, uninitialized top-levels, or
+		 * vdevs that are not in this metalab class.
+		 */
+		if (tvd->vdev_ishole || tvd->vdev_ms_shift == 0 ||
+		    mg->mg_class != mc) {
+			continue;
+		}
+
+		/*
+		 * If a metaslab group does not contain a fragmentation
+		 * metric then just bail out.
+		 */
+		if (mg->mg_fragmentation == ZFS_FRAG_INVALID) {
+			spa_config_exit(mc->mc_spa, SCL_VDEV, FTAG);
+			return (ZFS_FRAG_INVALID);
+		}
+
+		/*
+		 * Determine how much this metaslab_group is contributing
+		 * to the overall pool fragmentation metric.
+		 */
+		fragmentation += mg->mg_fragmentation *
+		    metaslab_group_get_space(mg);
+	}
+	fragmentation /= metaslab_class_get_space(mc);
+
+	ASSERT3U(fragmentation, <=, 100);
+	spa_config_exit(mc->mc_spa, SCL_VDEV, FTAG);
+	return (fragmentation);
+}
+
+/*
+ * Calculate the amount of expandable space that is available in
+ * this metaslab class. If a device is expanded then its expandable
+ * space will be the amount of allocatable space that is currently not
+ * part of this metaslab class.
+ */
+uint64_t
+metaslab_class_expandable_space(metaslab_class_t *mc)
+{
+	vdev_t *rvd = mc->mc_spa->spa_root_vdev;
+	uint64_t space = 0;
+
+	spa_config_enter(mc->mc_spa, SCL_VDEV, FTAG, RW_READER);
+	for (int c = 0; c < rvd->vdev_children; c++) {
+		vdev_t *tvd = rvd->vdev_child[c];
+		metaslab_group_t *mg = tvd->vdev_mg;
+
+		if (tvd->vdev_ishole || tvd->vdev_ms_shift == 0 ||
+		    mg->mg_class != mc) {
+			continue;
+		}
+
+		space += tvd->vdev_max_asize - tvd->vdev_asize;
+	}
+	spa_config_exit(mc->mc_spa, SCL_VDEV, FTAG);
+	return (space);
+}
+
 /*
  * ==========================================================================
  * Metaslab groups
@@ -374,7 +525,15 @@ metaslab_group_alloc_update(metaslab_group_t *mg)
 	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);
+	/*
+	 * A metaslab group is considered allocatable if it has plenty
+	 * of free space or is not heavily fragmented. We only take
+	 * fragmentation into account if the metaslab group has a valid
+	 * fragmentation metric (i.e. a value between 0 and 100).
+	 */
+	mg->mg_allocatable = (mg->mg_free_capacity > zfs_mg_noalloc_threshold &&
+	    (mg->mg_fragmentation == ZFS_FRAG_INVALID ||
+	    mg->mg_fragmentation <= zfs_mg_fragmentation_threshold));
 
 	/*
 	 * The mc_alloc_groups maintains a count of the number of
@@ -395,6 +554,7 @@ metaslab_group_alloc_update(metaslab_group_t *mg)
 		mc->mc_alloc_groups--;
 	else if (!was_allocatable && mg->mg_allocatable)
 		mc->mc_alloc_groups++;
+
 	mutex_exit(&mg->mg_lock);
 }
 
@@ -485,6 +645,7 @@ metaslab_group_passivate(metaslab_group_t *mg)
 	}
 
 	taskq_wait(mg->mg_taskq);
+	metaslab_group_alloc_update(mg);
 
 	mgprev = mg->mg_prev;
 	mgnext = mg->mg_next;
@@ -502,20 +663,113 @@ metaslab_group_passivate(metaslab_group_t *mg)
 	metaslab_class_minblocksize_update(mc);
 }
 
+uint64_t
+metaslab_group_get_space(metaslab_group_t *mg)
+{
+	return ((1ULL << mg->mg_vd->vdev_ms_shift) * mg->mg_vd->vdev_ms_count);
+}
+
+void
+metaslab_group_histogram_verify(metaslab_group_t *mg)
+{
+	uint64_t *mg_hist;
+	vdev_t *vd = mg->mg_vd;
+	uint64_t ashift = vd->vdev_ashift;
+	int i;
+
+	if ((zfs_flags & ZFS_DEBUG_HISTOGRAM_VERIFY) == 0)
+		return;
+
+	mg_hist = kmem_zalloc(sizeof (uint64_t) * RANGE_TREE_HISTOGRAM_SIZE,
+	    KM_SLEEP);
+
+	ASSERT3U(RANGE_TREE_HISTOGRAM_SIZE, >=,
+	    SPACE_MAP_HISTOGRAM_SIZE + ashift);
+
+	for (int m = 0; m < vd->vdev_ms_count; m++) {
+		metaslab_t *msp = vd->vdev_ms[m];
+
+		if (msp->ms_sm == NULL)
+			continue;
+
+		for (i = 0; i < SPACE_MAP_HISTOGRAM_SIZE; i++)
+			mg_hist[i + ashift] +=
+			    msp->ms_sm->sm_phys->smp_histogram[i];
+	}
+
+	for (i = 0; i < RANGE_TREE_HISTOGRAM_SIZE; i ++)
+		VERIFY3U(mg_hist[i], ==, mg->mg_histogram[i]);
+
+	kmem_free(mg_hist, sizeof (uint64_t) * RANGE_TREE_HISTOGRAM_SIZE);
+}
+
+static void
+metaslab_group_histogram_add(metaslab_group_t *mg, metaslab_t *msp)
+{
+	metaslab_class_t *mc = mg->mg_class;
+	uint64_t ashift = mg->mg_vd->vdev_ashift;
+
+	ASSERT(MUTEX_HELD(&msp->ms_lock));
+	if (msp->ms_sm == NULL)
+		return;
+
+	mutex_enter(&mg->mg_lock);
+	for (int i = 0; i < SPACE_MAP_HISTOGRAM_SIZE; i++) {
+		mg->mg_histogram[i + ashift] +=
+		    msp->ms_sm->sm_phys->smp_histogram[i];
+		mc->mc_histogram[i + ashift] +=
+		    msp->ms_sm->sm_phys->smp_histogram[i];
+	}
+	mutex_exit(&mg->mg_lock);
+}
+
+void
+metaslab_group_histogram_remove(metaslab_group_t *mg, metaslab_t *msp)
+{
+	metaslab_class_t *mc = mg->mg_class;
+	uint64_t ashift = mg->mg_vd->vdev_ashift;
+
+	ASSERT(MUTEX_HELD(&msp->ms_lock));
+	if (msp->ms_sm == NULL)
+		return;
+
+	mutex_enter(&mg->mg_lock);
+	for (int i = 0; i < SPACE_MAP_HISTOGRAM_SIZE; i++) {
+		ASSERT3U(mg->mg_histogram[i + ashift], >=,
+		    msp->ms_sm->sm_phys->smp_histogram[i]);
+		ASSERT3U(mc->mc_histogram[i + ashift], >=,
+		    msp->ms_sm->sm_phys->smp_histogram[i]);
+
+		mg->mg_histogram[i + ashift] -=
+		    msp->ms_sm->sm_phys->smp_histogram[i];
+		mc->mc_histogram[i + ashift] -=
+		    msp->ms_sm->sm_phys->smp_histogram[i];
+	}
+	mutex_exit(&mg->mg_lock);
+}
+
 static void
 metaslab_group_add(metaslab_group_t *mg, metaslab_t *msp)
 {
-	mutex_enter(&mg->mg_lock);
 	ASSERT(msp->ms_group == NULL);
+	mutex_enter(&mg->mg_lock);
 	msp->ms_group = mg;
 	msp->ms_weight = 0;
 	avl_add(&mg->mg_metaslab_tree, msp);
 	mutex_exit(&mg->mg_lock);
+
+	mutex_enter(&msp->ms_lock);
+	metaslab_group_histogram_add(mg, msp);
+	mutex_exit(&msp->ms_lock);
 }
 
 static void
 metaslab_group_remove(metaslab_group_t *mg, metaslab_t *msp)
 {
+	mutex_enter(&msp->ms_lock);
+	metaslab_group_histogram_remove(mg, msp);
+	mutex_exit(&msp->ms_lock);
+
 	mutex_enter(&mg->mg_lock);
 	ASSERT(msp->ms_group == mg);
 	avl_remove(&mg->mg_metaslab_tree, msp);
@@ -528,9 +782,9 @@ metaslab_group_sort(metaslab_group_t *mg, metaslab_t *msp, uint64_t weight)
 {
 	/*
 	 * Although in principle the weight can be any value, in
-	 * practice we do not use values in the range [1, 510].
+	 * practice we do not use values in the range [1, 511].
 	 */
-	ASSERT(weight >= SPA_MINBLOCKSIZE-1 || weight == 0);
+	ASSERT(weight >= SPA_MINBLOCKSIZE || weight == 0);
 	ASSERT(MUTEX_HELD(&msp->ms_lock));
 
 	mutex_enter(&mg->mg_lock);
@@ -541,10 +795,43 @@ metaslab_group_sort(metaslab_group_t *mg, metaslab_t *msp, uint64_t weight)
 	mutex_exit(&mg->mg_lock);
 }
 
+/*
+ * Calculate the fragmentation for a given metaslab group. We can use
+ * a simple average here since all metaslabs within the group must have
+ * the same size. The return value will be a value between 0 and 100
+ * (inclusive), or ZFS_FRAG_INVALID if less than half of the metaslab in this
+ * group have a fragmentation metric.
+ */
+uint64_t
+metaslab_group_fragmentation(metaslab_group_t *mg)
+{
+	vdev_t *vd = mg->mg_vd;
+	uint64_t fragmentation = 0;
+	uint64_t valid_ms = 0;
+
+	for (int m = 0; m < vd->vdev_ms_count; m++) {
+		metaslab_t *msp = vd->vdev_ms[m];
+
+		if (msp->ms_fragmentation == ZFS_FRAG_INVALID)
+			continue;
+
+		valid_ms++;
+		fragmentation += msp->ms_fragmentation;
+	}
+
+	if (valid_ms <= vd->vdev_ms_count / 2)
+		return (ZFS_FRAG_INVALID);
+
+	fragmentation /= valid_ms;
+	ASSERT3U(fragmentation, <=, 100);
+	return (fragmentation);
+}
+
 /*
  * 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
+ * group should avoid allocations if its free capacity is less than the
+ * zfs_mg_noalloc_threshold or its fragmentation metric is greater than
+ * zfs_mg_fragmentation_threshold and there is at least one metaslab group
  * that can still handle allocations.
  */
 static boolean_t
@@ -555,12 +842,19 @@ metaslab_group_allocatable(metaslab_group_t *mg)
 	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.
+	 * We use two key metrics to determine if a metaslab group is
+	 * considered allocatable -- free space and fragmentation. If
+	 * the free space is greater than the free space threshold and
+	 * the fragmentation is less than the fragmentation threshold then
+	 * consider the group allocatable. There are two case when we will
+	 * not consider these key metrics. The first is if the group is
+	 * associated with a slog device and the second is if all groups
+	 * in this metaslab class have already been consider ineligible
+	 * for allocations.
 	 */
-	return (mg->mg_free_capacity > zfs_mg_noalloc_threshold ||
+	return ((mg->mg_free_capacity > zfs_mg_noalloc_threshold &&
+	    (mg->mg_fragmentation == ZFS_FRAG_INVALID ||
+	    mg->mg_fragmentation <= zfs_mg_fragmentation_threshold)) ||
 	    mc != spa_normal_class(spa) || mc->mc_alloc_groups == 0);
 }
 
@@ -784,16 +1078,8 @@ metaslab_ff_alloc(metaslab_t *msp, uint64_t size)
 	return (metaslab_block_picker(t, cursor, size, align));
 }
 
-/* ARGSUSED */
-static boolean_t
-metaslab_ff_fragmented(metaslab_t *msp)
-{
-	return (B_TRUE);
-}
-
 static metaslab_ops_t metaslab_ff_ops = {
-	metaslab_ff_alloc,
-	metaslab_ff_fragmented
+	metaslab_ff_alloc
 };
 
 /*
@@ -840,23 +1126,8 @@ metaslab_df_alloc(metaslab_t *msp, uint64_t size)
 	return (metaslab_block_picker(t, cursor, size, 1ULL));
 }
 
-static boolean_t
-metaslab_df_fragmented(metaslab_t *msp)
-{
-	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)
-		return (B_FALSE);
-
-	return (B_TRUE);
-}
-
 static metaslab_ops_t metaslab_df_ops = {
-	metaslab_df_alloc,
-	metaslab_df_fragmented
+	metaslab_df_alloc
 };
 
 /*
@@ -899,15 +1170,8 @@ metaslab_cf_alloc(metaslab_t *msp, uint64_t size)
 	return (offset);
 }
 
-static boolean_t
-metaslab_cf_fragmented(metaslab_t *msp)
-{
-	return (metaslab_block_maxsize(msp) < metaslab_min_alloc_size);
-}
-
 static metaslab_ops_t metaslab_cf_ops = {
-	metaslab_cf_alloc,
-	metaslab_cf_fragmented
+	metaslab_cf_alloc
 };
 
 /*
@@ -964,16 +1228,8 @@ metaslab_ndf_alloc(metaslab_t *msp, uint64_t size)
 	return (-1ULL);
 }
 
-static boolean_t
-metaslab_ndf_fragmented(metaslab_t *msp)
-{
-	return (metaslab_block_maxsize(msp) <=
-	    (metaslab_min_alloc_size << metaslab_ndf_clump_shift));
-}
-
 static metaslab_ops_t metaslab_ndf_ops = {
-	metaslab_ndf_alloc,
-	metaslab_ndf_fragmented
+	metaslab_ndf_alloc
 };
 
 metaslab_ops_t *zfs_metaslab_ops = &metaslab_df_ops;
@@ -1075,6 +1331,7 @@ metaslab_init(metaslab_group_t *mg, uint64_t id, uint64_t object, uint64_t txg)
 	msp->ms_tree = range_tree_create(&metaslab_rt_ops, msp, &msp->ms_lock);
 	metaslab_group_add(mg, msp);
 
+	msp->ms_fragmentation = metaslab_fragmentation(msp);
 	msp->ms_ops = mg->mg_class->mc_ops;
 
 	/*
@@ -1140,69 +1397,113 @@ metaslab_fini(metaslab_t *msp)
 	kmem_free(msp, sizeof (metaslab_t));
 }
 
+#define	FRAGMENTATION_TABLE_SIZE	17
+
 /*
- * 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.
+ * This table defines a segment size based fragmentation metric that will
+ * allow each metaslab to derive its own fragmentation value. This is done
+ * by calculating the space in each bucket of the spacemap histogram and
+ * multiplying that by the fragmetation metric in this table. Doing
+ * this for all buckets and dividing it by the total amount of free
+ * space in this metaslab (i.e. the total free space in all buckets) gives
+ * us the fragmentation metric. This means that a high fragmentation metric
+ * equates to most of the free space being comprised of small segments.
+ * Conversely, if the metric is low, then most of the free space is in
+ * large segments. A 10% change in fragmentation equates to approximately
+ * double the number of segments.
  *
- * 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.
+ * This table defines 0% fragmented space using 16MB segments. Testing has
+ * shown that segments that are greater than or equal to 16MB do not suffer
+ * from drastic performance problems. Using this value, we derive the rest
+ * of the table. Since the fragmentation value is never stored on disk, it
+ * is possible to change these calculations in the future.
+ */
+int zfs_frag_table[FRAGMENTATION_TABLE_SIZE] = {
+	100,	/* 512B	*/
+	100,	/* 1K	*/
+	98,	/* 2K	*/
+	95,	/* 4K	*/
+	90,	/* 8K	*/
+	80,	/* 16K	*/
+	70,	/* 32K	*/
+	60,	/* 64K	*/
+	50,	/* 128K	*/
+	40,	/* 256K	*/
+	30,	/* 512K	*/
+	20,	/* 1M	*/
+	15,	/* 2M	*/
+	10,	/* 4M	*/
+	5,	/* 8M	*/
+	0	/* 16M	*/
+};
+
+/*
+ * Calclate the metaslab's fragmentation metric. A return value
+ * of ZFS_FRAG_INVALID means that the metaslab has not been upgraded and does
+ * not support this metric. Otherwise, the return value should be in the
+ * range [0, 100].
  */
 static uint64_t
-metaslab_weight_factor(metaslab_t *msp)
+metaslab_fragmentation(metaslab_t *msp)
 {
-	uint64_t factor = 0;
-	uint64_t sectors;
-	int i;
+	spa_t *spa = msp->ms_group->mg_vd->vdev_spa;
+	uint64_t fragmentation = 0;
+	uint64_t total = 0;
+	boolean_t feature_enabled = spa_feature_is_enabled(spa,
+	    SPA_FEATURE_SPACEMAP_HISTOGRAM);
+
+	if (!feature_enabled)
+		return (ZFS_FRAG_INVALID);
 
 	/*
-	 * A null space map means that the entire metaslab is free,
-	 * calculate a weight factor that spans the entire size of the
-	 * metaslab.
+	 * A null space map means that the entire metaslab is free
+	 * and thus is not fragmented.
 	 */
-	if (msp->ms_sm == NULL) {
-		vdev_t *vd = msp->ms_group->mg_vd;
-
-		i = highbit64(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))
+	if (msp->ms_sm == NULL)
 		return (0);
 
-	for (i = 0; i < SPACE_MAP_HISTOGRAM_SIZE(msp->ms_sm); i++) {
+	/*
+	 * If this metaslab's space_map has not been upgraded, flag it
+	 * so that we upgrade next time we encounter it.
+	 */
+	if (msp->ms_sm->sm_dbuf->db_size != sizeof (space_map_phys_t)) {
+		uint64_t txg = spa_syncing_txg(spa);
+		vdev_t *vd = msp->ms_group->mg_vd;
+
+		msp->ms_condense_wanted = B_TRUE;
+		vdev_dirty(vd, VDD_METASLAB, msp, txg + 1);
+		spa_dbgmsg(spa, "txg %llu, requesting force condense: "
+		    "msp %p, vd %p", txg, msp, vd);
+		return (ZFS_FRAG_INVALID);
+	}
+
+	for (int i = 0; i < SPACE_MAP_HISTOGRAM_SIZE; i++) {
+		uint64_t space = 0;
+		uint8_t shift = msp->ms_sm->sm_shift;
+		int idx = MIN(shift - SPA_MINBLOCKSHIFT + i,
+		    FRAGMENTATION_TABLE_SIZE - 1);
+
 		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;
+		space = msp->ms_sm->sm_phys->smp_histogram[i] << (i + shift);
+		total += space;
+
+		ASSERT3U(idx, <, FRAGMENTATION_TABLE_SIZE);
+		fragmentation += space * zfs_frag_table[idx];
 	}
-	return (factor * msp->ms_sm->sm_shift);
+
+	if (total > 0)
+		fragmentation /= total;
+	ASSERT3U(fragmentation, <=, 100);
+	return (fragmentation);
 }
 
+/*
+ * Compute a weight -- a selection preference value -- for the given metaslab.
+ * This is based on the amount of free space, the level of fragmentation,
+ * the LBA range, and whether the metaslab is loaded.
+ */
 static uint64_t
 metaslab_weight(metaslab_t *msp)
 {
@@ -1226,6 +1527,29 @@ metaslab_weight(metaslab_t *msp)
 	 * The baseline weight is the metaslab's free space.
 	 */
 	space = msp->ms_size - space_map_allocated(msp->ms_sm);
+
+	msp->ms_fragmentation = metaslab_fragmentation(msp);
+	if (metaslab_fragmentation_factor_enabled &&
+	    msp->ms_fragmentation != ZFS_FRAG_INVALID) {
+		/*
+		 * Use the fragmentation information to inversely scale
+		 * down the baseline weight. We need to ensure that we
+		 * don't exclude this metaslab completely when it's 100%
+		 * fragmented. To avoid this we reduce the fragmented value
+		 * by 1.
+		 */
+		space = (space * (100 - (msp->ms_fragmentation - 1))) / 100;
+
+		/*
+		 * If space < SPA_MINBLOCKSIZE, then we will not allocate from
+		 * this metaslab again. The fragmentation metric may have
+		 * decreased the space to something smaller than
+		 * SPA_MINBLOCKSIZE, so reset the space to SPA_MINBLOCKSIZE
+		 * so that we can consume any remaining space.
+		 */
+		if (space > 0 && space < SPA_MINBLOCKSIZE)
+			space = SPA_MINBLOCKSIZE;
+	}
 	weight = space;
 
 	/*
@@ -1237,19 +1561,19 @@ 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 - (msp->ms_id * weight) / vd->vdev_ms_count;
-	ASSERT(weight >= space && weight <= 2 * space);
+	if (metaslab_lba_weighting_enabled) {
+		weight = 2 * weight - (msp->ms_id * weight) / vd->vdev_ms_count;
+		ASSERT(weight >= space && weight <= 2 * space);
+	}
 
-	msp->ms_factor = metaslab_weight_factor(msp);
-	if (metaslab_weight_factor_enable)
-		weight += msp->ms_factor;
-
-	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
-		 * we'll polish it off.
-		 */
+	/*
+	 * If this metaslab is one we're actively using, adjust its
+	 * weight to make it preferable to any inactive metaslab so
+	 * we'll polish it off. If the fragmentation on this metaslab
+	 * has exceed our threshold, then don't mark it active.
+	 */
+	if (msp->ms_loaded && msp->ms_fragmentation != ZFS_FRAG_INVALID &&
+	    msp->ms_fragmentation <= zfs_metaslab_fragmentation_threshold) {
 		weight |= (msp->ms_weight & METASLAB_ACTIVE_MASK);
 	}
 
@@ -1299,6 +1623,8 @@ metaslab_preload(void *arg)
 	metaslab_t *msp = arg;
 	spa_t *spa = msp->ms_group->mg_vd->vdev_spa;
 
+	ASSERT(!MUTEX_HELD(&msp->ms_group->mg_lock));
+
 	mutex_enter(&msp->ms_lock);
 	metaslab_load_wait(msp);
 	if (!msp->ms_loaded)
@@ -1323,19 +1649,43 @@ metaslab_group_preload(metaslab_group_t *mg)
 		taskq_wait(mg->mg_taskq);
 		return;
 	}
+
 	mutex_enter(&mg->mg_lock);
-
 	/*
-	 * Prefetch the next potential metaslabs
+	 * Load the next potential metaslabs
 	 */
-	for (msp = avl_first(t); msp != NULL; msp = AVL_NEXT(t, msp)) {
+	msp = avl_first(t);
+	while (msp != NULL) {
+		metaslab_t *msp_next = AVL_NEXT(t, msp);
 
-		/* If we have reached our preload limit then we're done */
-		if (++m > metaslab_preload_limit)
-			break;
+		/*
+		 * We preload only the maximum number of metaslabs specified
+		 * by metaslab_preload_limit. If a metaslab is being forced
+		 * to condense then we preload it too. This will ensure
+		 * that force condensing happens in the next txg.
+		 */
+		if (++m > metaslab_preload_limit && !msp->ms_condense_wanted) {
+			msp = msp_next;
+			continue;
+		}
 
+		/*
+		 * We must drop the metaslab group lock here to preserve
+		 * lock ordering with the ms_lock (when grabbing both
+		 * the mg_lock and the ms_lock, the ms_lock must be taken
+		 * first).  As a result, it is possible that the ordering
+		 * of the metaslabs within the avl tree may change before
+		 * we reacquire the lock. The metaslab cannot be removed from
+		 * the tree while we're in syncing context so it is safe to
+		 * drop the mg_lock here. If the metaslabs are reordered
+		 * nothing will break -- we just may end up loading a
+		 * less than optimal one.
+		 */
+		mutex_exit(&mg->mg_lock);
 		VERIFY(taskq_dispatch(mg->mg_taskq, metaslab_preload,
 		    msp, TQ_SLEEP) != 0);
+		mutex_enter(&mg->mg_lock);
+		msp = msp_next;
 	}
 	mutex_exit(&mg->mg_lock);
 }
@@ -1352,6 +1702,8 @@ metaslab_group_preload(metaslab_group_t *mg)
  * times the size than the free space range tree representation
  * (i.e. zfs_condense_pct = 110 and in-core = 1MB, minimal = 1.1.MB).
  *
+ * 3. The on-disk size of the space map should actually decrease.
+ *
  * 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 range tree in the metaslab and calculate the
@@ -1362,24 +1714,33 @@ metaslab_group_preload(metaslab_group_t *mg)
  * To determine the second criterion we use a best-case estimate and assume
  * each segment can be represented on-disk as a single 64-bit entry. We refer
  * to this best-case estimate as the space map's minimal form.
+ *
+ * Unfortunately, we cannot compute the on-disk size of the space map in this
+ * context because we cannot accurately compute the effects of compression, etc.
+ * Instead, we apply the heuristic described in the block comment for
+ * zfs_metaslab_condense_block_threshold - we only condense if the space used
+ * is greater than a threshold number of blocks.
  */
 static boolean_t
 metaslab_should_condense(metaslab_t *msp)
 {
 	space_map_t *sm = msp->ms_sm;
 	range_seg_t *rs;
-	uint64_t size, entries, segsz;
+	uint64_t size, entries, segsz, object_size, optimal_size, record_size;
+	dmu_object_info_t doi;
+	uint64_t vdev_blocksize = 1 << msp->ms_group->mg_vd->vdev_ashift;
 
 	ASSERT(MUTEX_HELD(&msp->ms_lock));
 	ASSERT(msp->ms_loaded);
 
 	/*
 	 * 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.
+	 * obtain the largest segment in the free tree. We always condense
+	 * metaslabs that are empty and metaslabs for which a condense
+	 * request has been made.
 	 */
 	rs = avl_last(&msp->ms_size_tree);
-	if (rs == NULL)
+	if (rs == NULL || msp->ms_condense_wanted)
 		return (B_TRUE);
 
 	/*
@@ -1392,9 +1753,15 @@ metaslab_should_condense(metaslab_t *msp)
 	entries = size / (MIN(size, SM_RUN_MAX));
 	segsz = entries * sizeof (uint64_t);
 
-	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);
+	optimal_size = sizeof (uint64_t) * avl_numnodes(&msp->ms_tree->rt_root);
+	object_size = space_map_length(msp->ms_sm);
+
+	dmu_object_info_from_db(sm->sm_dbuf, &doi);
+	record_size = MAX(doi.doi_data_block_size, vdev_blocksize);
+
+	return (segsz <= object_size &&
+	    object_size >= (optimal_size * zfs_condense_pct / 100) &&
+	    object_size > zfs_metaslab_condense_block_threshold * record_size);
 }
 
 /*
@@ -1414,9 +1781,14 @@ metaslab_condense(metaslab_t *msp, uint64_t txg, dmu_tx_t *tx)
 	ASSERT3U(spa_sync_pass(spa), ==, 1);
 	ASSERT(msp->ms_loaded);
 
+
 	spa_dbgmsg(spa, "condensing: txg %llu, msp[%llu] %p, "
-	    "smp size %llu, segments %lu", txg, msp->ms_id, msp,
-	    space_map_length(msp->ms_sm), avl_numnodes(&msp->ms_tree->rt_root));
+	    "smp size %llu, segments %lu, forcing condense=%s", txg,
+	    msp->ms_id, msp, space_map_length(msp->ms_sm),
+	    avl_numnodes(&msp->ms_tree->rt_root),
+	    msp->ms_condense_wanted ? "TRUE" : "FALSE");
+
+	msp->ms_condense_wanted = B_FALSE;
 
 	/*
 	 * Create an range tree that is 100% allocated. We remove segments
@@ -1509,8 +1881,14 @@ metaslab_sync(metaslab_t *msp, uint64_t txg)
 	ASSERT3P(*freetree, !=, NULL);
 	ASSERT3P(*freed_tree, !=, NULL);
 
+	/*
+	 * Normally, we don't want to process a metaslab if there
+	 * are no allocations or frees to perform. However, if the metaslab
+	 * is being forced to condense we need to let it through.
+	 */
 	if (range_tree_space(alloctree) == 0 &&
-	    range_tree_space(*freetree) == 0)
+	    range_tree_space(*freetree) == 0 &&
+	    !msp->ms_condense_wanted)
 		return;
 
 	/*
@@ -1547,8 +1925,9 @@ metaslab_sync(metaslab_t *msp, uint64_t txg)
 		space_map_write(msp->ms_sm, *freetree, SM_FREE, tx);
 	}
 
-	range_tree_vacate(alloctree, NULL, NULL);
-
+	metaslab_group_histogram_verify(mg);
+	metaslab_class_histogram_verify(mg->mg_class);
+	metaslab_group_histogram_remove(mg, msp);
 	if (msp->ms_loaded) {
 		/*
 		 * When the space map is loaded, we have an accruate
@@ -1568,6 +1947,9 @@ metaslab_sync(metaslab_t *msp, uint64_t txg)
 		 */
 		space_map_histogram_add(msp->ms_sm, *freetree, tx);
 	}
+	metaslab_group_histogram_add(mg, msp);
+	metaslab_group_histogram_verify(mg);
+	metaslab_class_histogram_verify(mg->mg_class);
 
 	/*
 	 * For sync pass 1, we avoid traversing this txg's free range tree
@@ -1580,6 +1962,7 @@ metaslab_sync(metaslab_t *msp, uint64_t txg)
 	} else {
 		range_tree_vacate(*freetree, range_tree_add, *freed_tree);
 	}
+	range_tree_vacate(alloctree, NULL, NULL);
 
 	ASSERT0(range_tree_space(msp->ms_alloctree[txg & TXG_MASK]));
 	ASSERT0(range_tree_space(msp->ms_freetree[txg & TXG_MASK]));
@@ -1690,13 +2073,13 @@ metaslab_sync_done(metaslab_t *msp, uint64_t txg)
 
 	metaslab_group_sort(mg, msp, metaslab_weight(msp));
 	mutex_exit(&msp->ms_lock);
-
 }
 
 void
 metaslab_sync_reassess(metaslab_group_t *mg)
 {
 	metaslab_group_alloc_update(mg);
+	mg->mg_fragmentation = metaslab_group_fragmentation(mg);
 
 	/*
 	 * Preload the next potential metaslabs
@@ -1958,9 +2341,7 @@ metaslab_alloc_dva(spa_t *spa, metaslab_class_t *mc, uint64_t psize,
 		 */
 		if ((vd->vdev_stat.vs_write_errors > 0 ||
 		    vd->vdev_state < VDEV_STATE_HEALTHY) &&
-		    d == 0 && dshift == 3 &&
-		    !(zfs_write_to_degraded && vd->vdev_state ==
-		    VDEV_STATE_DEGRADED)) {
+		    d == 0 && dshift == 3 && vd->vdev_children == 0) {
 			all_zero = B_FALSE;
 			goto next;
 		}
@@ -1985,7 +2366,7 @@ metaslab_alloc_dva(spa_t *spa, metaslab_class_t *mc, uint64_t psize,
 			 * over- or under-used relative to the pool,
 			 * and set an allocation bias to even it out.
 			 */
-			if (mc->mc_aliquot == 0) {
+			if (mc->mc_aliquot == 0 && metaslab_bias_enabled) {
 				vdev_stat_t *vs = &vd->vdev_stat;
 				int64_t vu, cu;
 
@@ -2007,6 +2388,8 @@ metaslab_alloc_dva(spa_t *spa, metaslab_class_t *mc, uint64_t psize,
 				 */
 				mg->mg_bias = ((cu - vu) *
 				    (int64_t)mg->mg_aliquot) / 100;
+			} else if (!metaslab_bias_enabled) {
+				mg->mg_bias = 0;
 			}
 
 			if (atomic_add_64_nv(&mc->mc_aliquot, asize) >=
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
index 15e123ef5fbe..22175e06ab30 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
@@ -81,6 +81,7 @@ range_tree_stat_incr(range_tree_t *rt, range_seg_t *rs)
 	uint64_t size = rs->rs_end - rs->rs_start;
 	int idx = highbit64(size) - 1;
 
+	ASSERT(size != 0);
 	ASSERT3U(idx, <,
 	    sizeof (rt->rt_histogram) / sizeof (*rt->rt_histogram));
 
@@ -95,6 +96,7 @@ range_tree_stat_decr(range_tree_t *rt, range_seg_t *rs)
 	uint64_t size = rs->rs_end - rs->rs_start;
 	int idx = highbit64(size) - 1;
 
+	ASSERT(size != 0);
 	ASSERT3U(idx, <,
 	    sizeof (rt->rt_histogram) / sizeof (*rt->rt_histogram));
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
index 8e80166c7d14..e3aa01a31c77 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
@@ -286,3 +286,91 @@ rrw_tsd_destroy(void *arg)
 		    (void *)curthread, (void *)rn->rn_rrl);
 	}
 }
+
+/*
+ * A reader-mostly lock implementation, tuning above reader-writer locks
+ * for hightly parallel read acquisitions, while pessimizing writes.
+ *
+ * The idea is to split single busy lock into array of locks, so that
+ * each reader can lock only one of them for read, depending on result
+ * of simple hash function.  That proportionally reduces lock congestion.
+ * Writer same time has to sequentially aquire write on all the locks.
+ * That makes write aquisition proportionally slower, but in places where
+ * it is used (filesystem unmount) performance is not critical.
+ *
+ * All the functions below are direct wrappers around functions above.
+ */
+void
+rrm_init(rrmlock_t *rrl, boolean_t track_all)
+{
+	int i;
+
+	for (i = 0; i < RRM_NUM_LOCKS; i++)
+		rrw_init(&rrl->locks[i], track_all);
+}
+
+void
+rrm_destroy(rrmlock_t *rrl)
+{
+	int i;
+
+	for (i = 0; i < RRM_NUM_LOCKS; i++)
+		rrw_destroy(&rrl->locks[i]);
+}
+
+void
+rrm_enter(rrmlock_t *rrl, krw_t rw, void *tag)
+{
+	if (rw == RW_READER)
+		rrm_enter_read(rrl, tag);
+	else
+		rrm_enter_write(rrl);
+}
+
+/*
+ * This maps the current thread to a specific lock.  Note that the lock
+ * must be released by the same thread that acquired it.  We do this
+ * mapping by taking the thread pointer mod a prime number.  We examine
+ * only the low 32 bits of the thread pointer, because 32-bit division
+ * is faster than 64-bit division, and the high 32 bits have little
+ * entropy anyway.
+ */
+#define	RRM_TD_LOCK()	(((uint32_t)(uintptr_t)(curthread)) % RRM_NUM_LOCKS)
+
+void
+rrm_enter_read(rrmlock_t *rrl, void *tag)
+{
+	rrw_enter_read(&rrl->locks[RRM_TD_LOCK()], tag);
+}
+
+void
+rrm_enter_write(rrmlock_t *rrl)
+{
+	int i;
+
+	for (i = 0; i < RRM_NUM_LOCKS; i++)
+		rrw_enter_write(&rrl->locks[i]);
+}
+
+void
+rrm_exit(rrmlock_t *rrl, void *tag)
+{
+	int i;
+
+	if (rrl->locks[0].rr_writer == curthread) {
+		for (i = 0; i < RRM_NUM_LOCKS; i++)
+			rrw_exit(&rrl->locks[i], tag);
+	} else {
+		rrw_exit(&rrl->locks[RRM_TD_LOCK()], tag);
+	}
+}
+
+boolean_t
+rrm_held(rrmlock_t *rrl, krw_t rw)
+{
+	if (rw == RW_WRITER) {
+		return (rrw_held(&rrl->locks[0], rw));
+	} else {
+		return (rrw_held(&rrl->locks[RRM_TD_LOCK()], rw));
+	}
+}
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
index b45bf95e6fc0..5d8c731c886c 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
@@ -1111,6 +1111,9 @@ sa_setup(objset_t *os, uint64_t sa_obj, sa_attr_reg_t *reg_attrs, int count,
 	if (sa->sa_user_table)
 		kmem_free(sa->sa_user_table, sa->sa_user_table_sz);
 	mutex_exit(&sa->sa_lock);
+	avl_destroy(&sa->sa_layout_hash_tree);
+	avl_destroy(&sa->sa_layout_num_tree);
+	mutex_destroy(&sa->sa_lock);
 	kmem_free(sa, sizeof (sa_os_t));
 	return ((error == ECKSUM) ? EIO : error);
 }
@@ -1146,6 +1149,7 @@ sa_tear_down(objset_t *os)
 
 	avl_destroy(&sa->sa_layout_hash_tree);
 	avl_destroy(&sa->sa_layout_num_tree);
+	mutex_destroy(&sa->sa_lock);
 
 	kmem_free(sa, sizeof (sa_os_t));
 	os->os_sa = NULL;
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 6c79a3083e2b..a0e19ec7b865 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
- * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013, 2014, Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2013 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
  */
 
@@ -84,8 +84,7 @@
 static int check_hostid = 1;
 
 SYSCTL_DECL(_vfs_zfs);
-TUNABLE_INT("vfs.zfs.check_hostid", &check_hostid);
-SYSCTL_INT(_vfs_zfs, OID_AUTO, check_hostid, CTLFLAG_RW, &check_hostid, 0,
+SYSCTL_INT(_vfs_zfs, OID_AUTO, check_hostid, CTLFLAG_RWTUN, &check_hostid, 0,
     "Check hostid on import?");
 
 /*
@@ -211,12 +210,10 @@ spa_prop_get_config(spa_t *spa, nvlist_t **nvp)
 {
 	vdev_t *rvd = spa->spa_root_vdev;
 	dsl_pool_t *pool = spa->spa_dsl_pool;
-	uint64_t size;
-	uint64_t alloc;
-	uint64_t space;
-	uint64_t cap, version;
+	uint64_t size, alloc, cap, version;
 	zprop_source_t src = ZPROP_SRC_NONE;
 	spa_config_dirent_t *dp;
+	metaslab_class_t *mc = spa_normal_class(spa);
 
 	ASSERT(MUTEX_HELD(&spa->spa_props_lock));
 
@@ -229,14 +226,10 @@ spa_prop_get_config(spa_t *spa, nvlist_t **nvp)
 		spa_prop_add_list(*nvp, ZPOOL_PROP_FREE, NULL,
 		    size - alloc, src);
 
-		space = 0;
-		for (int c = 0; c < rvd->vdev_children; c++) {
-			vdev_t *tvd = rvd->vdev_child[c];
-			space += tvd->vdev_max_asize - tvd->vdev_asize;
-		}
-		spa_prop_add_list(*nvp, ZPOOL_PROP_EXPANDSZ, NULL, space,
-		    src);
-
+		spa_prop_add_list(*nvp, ZPOOL_PROP_FRAGMENTATION, NULL,
+		    metaslab_class_fragmentation(mc), src);
+		spa_prop_add_list(*nvp, ZPOOL_PROP_EXPANDSZ, NULL,
+		    metaslab_class_expandable_space(mc), src);
 		spa_prop_add_list(*nvp, ZPOOL_PROP_READONLY, NULL,
 		    (spa_mode(spa) == FREAD), src);
 
@@ -258,19 +251,25 @@ spa_prop_get_config(spa_t *spa, nvlist_t **nvp)
 	}
 
 	if (pool != NULL) {
-		dsl_dir_t *freedir = pool->dp_free_dir;
-
 		/*
 		 * The $FREE directory was introduced in SPA_VERSION_DEADLISTS,
 		 * when opening pools before this version freedir will be NULL.
 		 */
-		if (freedir != NULL) {
+		if (pool->dp_free_dir != NULL) {
 			spa_prop_add_list(*nvp, ZPOOL_PROP_FREEING, NULL,
-			    freedir->dd_phys->dd_used_bytes, src);
+			    pool->dp_free_dir->dd_phys->dd_used_bytes, src);
 		} else {
 			spa_prop_add_list(*nvp, ZPOOL_PROP_FREEING,
 			    NULL, 0, src);
 		}
+
+		if (pool->dp_leak_dir != NULL) {
+			spa_prop_add_list(*nvp, ZPOOL_PROP_LEAKED, NULL,
+			    pool->dp_leak_dir->dd_phys->dd_used_bytes, src);
+		} else {
+			spa_prop_add_list(*nvp, ZPOOL_PROP_LEAKED,
+			    NULL, 0, src);
+		}
 	}
 
 	spa_prop_add_list(*nvp, ZPOOL_PROP_GUID, NULL, spa_guid(spa), src);
@@ -684,7 +683,8 @@ spa_prop_set(spa_t *spa, nvlist_t *nvp)
 			 * feature descriptions object.
 			 */
 			error = dsl_sync_task(spa->spa_name, NULL,
-			    spa_sync_version, &ver, 6);
+			    spa_sync_version, &ver,
+			    6, ZFS_SPACE_CHECK_RESERVED);
 			if (error)
 				return (error);
 			continue;
@@ -696,7 +696,7 @@ spa_prop_set(spa_t *spa, nvlist_t *nvp)
 
 	if (need_sync) {
 		return (dsl_sync_task(spa->spa_name, NULL, spa_sync_props,
-		    nvp, 6));
+		    nvp, 6, ZFS_SPACE_CHECK_RESERVED));
 	}
 
 	return (0);
@@ -777,7 +777,7 @@ spa_change_guid(spa_t *spa)
 	guid = spa_generate_guid(NULL);
 
 	error = dsl_sync_task(spa->spa_name, spa_change_guid_check,
-	    spa_change_guid_sync, &guid, 5);
+	    spa_change_guid_sync, &guid, 5, ZFS_SPACE_CHECK_RESERVED);
 
 	if (error == 0) {
 		spa_config_sync(spa, B_FALSE, B_TRUE);
@@ -804,7 +804,7 @@ spa_error_entry_compare(const void *a, const void *b)
 	int ret;
 
 	ret = bcmp(&sa->se_bookmark, &sb->se_bookmark,
-	    sizeof (zbookmark_t));
+	    sizeof (zbookmark_phys_t));
 
 	if (ret < 0)
 		return (-1);
@@ -1867,6 +1867,7 @@ spa_load_verify_done(zio_t *zio)
 	spa_load_error_t *sle = zio->io_private;
 	dmu_object_type_t type = BP_GET_TYPE(bp);
 	int error = zio->io_error;
+	spa_t *spa = zio->io_spa;
 
 	if (error) {
 		if ((BP_GET_LEVEL(bp) != 0 || DMU_OT_IS_METADATA(type)) &&
@@ -1876,23 +1877,65 @@ spa_load_verify_done(zio_t *zio)
 			atomic_add_64(&sle->sle_data_count, 1);
 	}
 	zio_data_buf_free(zio->io_data, zio->io_size);
+
+	mutex_enter(&spa->spa_scrub_lock);
+	spa->spa_scrub_inflight--;
+	cv_broadcast(&spa->spa_scrub_io_cv);
+	mutex_exit(&spa->spa_scrub_lock);
 }
 
+/*
+ * Maximum number of concurrent scrub i/os to create while verifying
+ * a pool while importing it.
+ */
+int spa_load_verify_maxinflight = 10000;
+boolean_t spa_load_verify_metadata = B_TRUE;
+boolean_t spa_load_verify_data = B_TRUE;
+
+SYSCTL_INT(_vfs_zfs, OID_AUTO, spa_load_verify_maxinflight, CTLFLAG_RWTUN,
+    &spa_load_verify_maxinflight, 0,
+    "Maximum number of concurrent scrub I/Os to create while verifying a "
+    "pool while importing it");
+
+SYSCTL_INT(_vfs_zfs, OID_AUTO, spa_load_verify_metadata, CTLFLAG_RWTUN,
+    &spa_load_verify_metadata, 0,
+    "Check metadata on import?");
+ 
+SYSCTL_INT(_vfs_zfs, OID_AUTO, spa_load_verify_data, CTLFLAG_RWTUN,
+    &spa_load_verify_data, 0,
+    "Check user data on import?");
+ 
 /*ARGSUSED*/
 static int
 spa_load_verify_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
-	if (!BP_IS_HOLE(bp)) {
-		zio_t *rio = arg;
-		size_t size = BP_GET_PSIZE(bp);
-		void *data = zio_data_buf_alloc(size);
+	if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
+		return (0);
+	/*
+	 * Note: normally this routine will not be called if
+	 * spa_load_verify_metadata is not set.  However, it may be useful
+	 * to manually set the flag after the traversal has begun.
+	 */
+	if (!spa_load_verify_metadata)
+		return (0);
+	if (BP_GET_BUFC_TYPE(bp) == ARC_BUFC_DATA && !spa_load_verify_data)
+		return (0);
 
-		zio_nowait(zio_read(rio, spa, bp, data, size,
-		    spa_load_verify_done, rio->io_private, ZIO_PRIORITY_SCRUB,
-		    ZIO_FLAG_SPECULATIVE | ZIO_FLAG_CANFAIL |
-		    ZIO_FLAG_SCRUB | ZIO_FLAG_RAW, zb));
-	}
+	zio_t *rio = arg;
+	size_t size = BP_GET_PSIZE(bp);
+	void *data = zio_data_buf_alloc(size);
+
+	mutex_enter(&spa->spa_scrub_lock);
+	while (spa->spa_scrub_inflight >= spa_load_verify_maxinflight)
+		cv_wait(&spa->spa_scrub_io_cv, &spa->spa_scrub_lock);
+	spa->spa_scrub_inflight++;
+	mutex_exit(&spa->spa_scrub_lock);
+
+	zio_nowait(zio_read(rio, spa, bp, data, size,
+	    spa_load_verify_done, rio->io_private, ZIO_PRIORITY_SCRUB,
+	    ZIO_FLAG_SPECULATIVE | ZIO_FLAG_CANFAIL |
+	    ZIO_FLAG_SCRUB | ZIO_FLAG_RAW, zb));
 	return (0);
 }
 
@@ -1903,7 +1946,7 @@ spa_load_verify(spa_t *spa)
 	spa_load_error_t sle = { 0 };
 	zpool_rewind_policy_t policy;
 	boolean_t verify_ok = B_FALSE;
-	int error;
+	int error = 0;
 
 	zpool_get_rewind_policy(spa->spa_config, &policy);
 
@@ -1913,8 +1956,11 @@ spa_load_verify(spa_t *spa)
 	rio = zio_root(spa, NULL, &sle,
 	    ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE);
 
-	error = traverse_pool(spa, spa->spa_verify_min_txg,
-	    TRAVERSE_PRE | TRAVERSE_PREFETCH, spa_load_verify_cb, rio);
+	if (spa_load_verify_metadata) {
+		error = traverse_pool(spa, spa->spa_verify_min_txg,
+		    TRAVERSE_PRE | TRAVERSE_PREFETCH_METADATA,
+		    spa_load_verify_cb, rio);
+	}
 
 	(void) zio_wait(rio);
 
@@ -2431,9 +2477,8 @@ spa_load_impl(spa_t *spa, uint64_t pool_guid, nvlist_t *config,
 
 	if (spa_feature_is_active(spa, SPA_FEATURE_ENABLED_TXG)) {
 		if (spa_dir_prop(spa, DMU_POOL_FEATURE_ENABLED_TXG,
-		    &spa->spa_feat_enabled_txg_obj) != 0) {
+		    &spa->spa_feat_enabled_txg_obj) != 0)
 			return (spa_vdev_err(rvd, VDEV_AUX_CORRUPT_DATA, EIO));
-		}
 	}
 
 	spa->spa_is_initializing = B_TRUE;
@@ -2790,7 +2835,7 @@ spa_load_retry(spa_t *spa, spa_load_state_t state, int mosconfig)
 	spa_unload(spa);
 	spa_deactivate(spa);
 
-	spa->spa_load_max_txg--;
+	spa->spa_load_max_txg = spa->spa_uberblock.ub_txg - 1;
 
 	spa_activate(spa, mode);
 	spa_async_suspend(spa);
@@ -2820,6 +2865,8 @@ spa_load_best(spa_t *spa, spa_load_state_t state, int mosconfig,
 		spa_set_log_state(spa, SPA_LOG_CLEAR);
 	} else {
 		spa->spa_load_max_txg = max_request;
+		if (max_request != UINT64_MAX)
+			spa->spa_extreme_rewind = B_TRUE;
 	}
 
 	load_error = rewind_error = spa_load(spa, state, SPA_IMPORT_EXISTING,
@@ -5536,11 +5583,6 @@ spa_vdev_remove(spa_t *spa, uint64_t guid, boolean_t unspare)
 		ASSERT(!locked);
 		ASSERT(vd == vd->vdev_top);
 
-		/*
-		 * XXX - Once we have bp-rewrite this should
-		 * become the common case.
-		 */
-
 		mg = vd->vdev_mg;
 
 		/*
@@ -6426,6 +6468,22 @@ spa_sync_upgrades(spa_t *spa, dmu_tx_t *tx)
 	    spa->spa_uberblock.ub_version >= SPA_VERSION_FEATURES) {
 		spa_feature_create_zap_objects(spa, tx);
 	}
+
+	/*
+	 * LZ4_COMPRESS feature's behaviour was changed to activate_on_enable
+	 * when possibility to use lz4 compression for metadata was added
+	 * Old pools that have this feature enabled must be upgraded to have
+	 * this feature active
+	 */
+	if (spa->spa_uberblock.ub_version >= SPA_VERSION_FEATURES) {
+		boolean_t lz4_en = spa_feature_is_enabled(spa,
+		    SPA_FEATURE_LZ4_COMPRESS);
+		boolean_t lz4_ac = spa_feature_is_active(spa,
+		    SPA_FEATURE_LZ4_COMPRESS);
+
+		if (lz4_en && !lz4_ac)
+			spa_feature_incr(spa, SPA_FEATURE_LZ4_COMPRESS, tx);
+	}
 	rrw_exit(&dp->dp_config_rwlock, FTAG);
 }
 
@@ -6772,7 +6830,7 @@ spa_upgrade(spa_t *spa, uint64_t version)
 	 * possible.
 	 */
 	ASSERT(SPA_VERSION_IS_SUPPORTED(spa->spa_uberblock.ub_version));
-	ASSERT(version >= spa->spa_uberblock.ub_version);
+	ASSERT3U(version, >=, spa->spa_uberblock.ub_version);
 
 	spa->spa_uberblock.ub_version = version;
 	vdev_config_dirty(spa->spa_root_vdev);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c
index 0dd6c7a489b7..168f3acc2e8e 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  */
 
 /*
@@ -35,7 +35,7 @@
  * deleted from the log when the scrub completes.
  *
  * The log is stored using a ZAP object whose key is a string form of the
- * zbookmark tuple (objset, object, level, blkid), and whose contents is an
+ * zbookmark_phys tuple (objset, object, level, blkid), and whose contents is an
  * optional 'objset:object' human-readable string describing the data.  When an
  * error is first logged, this string will be empty, indicating that no name is
  * known.  This prevents us from having to issue a potentially large amount of
@@ -59,7 +59,7 @@
  * Convert a bookmark to a string.
  */
 static void
-bookmark_to_name(zbookmark_t *zb, char *buf, size_t len)
+bookmark_to_name(zbookmark_phys_t *zb, char *buf, size_t len)
 {
 	(void) snprintf(buf, len, "%llx:%llx:%llx:%llx",
 	    (u_longlong_t)zb->zb_objset, (u_longlong_t)zb->zb_object,
@@ -71,7 +71,7 @@ bookmark_to_name(zbookmark_t *zb, char *buf, size_t len)
  */
 #ifdef _KERNEL
 static void
-name_to_bookmark(char *buf, zbookmark_t *zb)
+name_to_bookmark(char *buf, zbookmark_phys_t *zb)
 {
 	zb->zb_objset = strtonum(buf, &buf);
 	ASSERT(*buf == ':');
@@ -92,7 +92,7 @@ name_to_bookmark(char *buf, zbookmark_t *zb)
 void
 spa_log_error(spa_t *spa, zio_t *zio)
 {
-	zbookmark_t *zb = &zio->io_logical->io_bookmark;
+	zbookmark_phys_t *zb = &zio->io_logical->io_bookmark;
 	spa_error_entry_t search;
 	spa_error_entry_t *new;
 	avl_tree_t *tree;
@@ -165,7 +165,7 @@ process_error_log(spa_t *spa, uint64_t obj, void *addr, size_t *count)
 {
 	zap_cursor_t zc;
 	zap_attribute_t za;
-	zbookmark_t zb;
+	zbookmark_phys_t zb;
 
 	if (obj == 0)
 		return (0);
@@ -182,8 +182,8 @@ process_error_log(spa_t *spa, uint64_t obj, void *addr, size_t *count)
 		name_to_bookmark(za.za_name, &zb);
 
 		if (copyout(&zb, (char *)addr +
-		    (*count - 1) * sizeof (zbookmark_t),
-		    sizeof (zbookmark_t)) != 0) {
+		    (*count - 1) * sizeof (zbookmark_phys_t),
+		    sizeof (zbookmark_phys_t)) != 0) {
 			zap_cursor_fini(&zc);
 			return (SET_ERROR(EFAULT));
 		}
@@ -207,8 +207,8 @@ process_error_list(avl_tree_t *list, void *addr, size_t *count)
 			return (SET_ERROR(ENOMEM));
 
 		if (copyout(&se->se_bookmark, (char *)addr +
-		    (*count - 1) * sizeof (zbookmark_t),
-		    sizeof (zbookmark_t)) != 0)
+		    (*count - 1) * sizeof (zbookmark_phys_t),
+		    sizeof (zbookmark_phys_t)) != 0)
 			return (SET_ERROR(EFAULT));
 
 		*count -= 1;
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
index f6e02770eec8..83e521765ac0 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/spa.h>
@@ -324,7 +324,7 @@ spa_history_log_nvl(spa_t *spa, nvlist_t *nvl)
 
 	/* Kick this off asynchronously; errors are ignored. */
 	dsl_sync_task_nowait(spa_get_dsl(spa), spa_history_log_sync,
-	    nvarg, 0, tx);
+	    nvarg, 0, ZFS_SPACE_CHECK_NONE, tx);
 	dmu_tx_commit(tx);
 
 	/* spa_history_log_sync will free nvl */
@@ -465,7 +465,7 @@ log_internal(nvlist_t *nvl, const char *operation, spa_t *spa,
 		spa_history_log_sync(nvl, tx);
 	} else {
 		dsl_sync_task_nowait(spa_get_dsl(spa),
-		    spa_history_log_sync, nvl, 0, tx);
+		    spa_history_log_sync, nvl, 0, ZFS_SPACE_CHECK_NONE, tx);
 	}
 	/* spa_history_log_sync() will free nvl */
 }
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 dbcb72916f0f..2ab28473be41 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
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2013 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
  */
@@ -244,7 +244,6 @@ int zfs_flags = ~(ZFS_DEBUG_DPRINTF | ZFS_DEBUG_SPA);
 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.");
 
@@ -255,12 +254,42 @@ SYSCTL_INT(_debug, OID_AUTO, zfs_flags, CTLFLAG_RWTUN, &zfs_flags, 0,
  * This should only be used as a last resort, as it typically results
  * in leaked space, or worse.
  */
-int zfs_recover = 0;
+boolean_t zfs_recover = B_FALSE;
 SYSCTL_DECL(_vfs_zfs);
-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.");
 
+/*
+ * If destroy encounters an EIO while reading metadata (e.g. indirect
+ * blocks), space referenced by the missing metadata can not be freed.
+ * Normally this causes the background destroy to become "stalled", as
+ * it is unable to make forward progress.  While in this stalled state,
+ * all remaining space to free from the error-encountering filesystem is
+ * "temporarily leaked".  Set this flag to cause it to ignore the EIO,
+ * permanently leak the space from indirect blocks that can not be read,
+ * and continue to free everything else that it can.
+ *
+ * The default, "stalling" behavior is useful if the storage partially
+ * fails (i.e. some but not all i/os fail), and then later recovers.  In
+ * this case, we will be able to continue pool operations while it is
+ * partially failed, and when it recovers, we can continue to free the
+ * space, with no leaks.  However, note that this case is actually
+ * fairly rare.
+ *
+ * Typically pools either (a) fail completely (but perhaps temporarily,
+ * e.g. a top-level vdev going offline), or (b) have localized,
+ * permanent errors (e.g. disk returns the wrong data due to bit flip or
+ * firmware bug).  In case (a), this setting does not matter because the
+ * pool will be suspended and the sync thread will not be able to make
+ * forward progress regardless.  In case (b), because the error is
+ * permanent, the best we can do is leak the minimum amount of space,
+ * which is what setting this flag will do.  Therefore, it is reasonable
+ * for this flag to normally be set, but we chose the more conservative
+ * approach of not setting it, so that there is no possibility of
+ * leaking space in the "partial temporary" failure case.
+ */
+boolean_t zfs_free_leak_on_eio = B_FALSE;
+
 /*
  * 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
@@ -270,7 +299,6 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, recover, CTLFLAG_RDTUN, &zfs_recover, 0,
  * 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");
@@ -280,7 +308,6 @@ SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, deadman_synctime_ms, CTLFLAG_RDTUN,
  * for hung I/O.
  */
 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");
@@ -290,7 +317,6 @@ SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, deadman_checktime_ms, CTLFLAG_RDTUN,
  * zfs_deadman_init()
  */
 int zfs_deadman_enabled = -1;
-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");
 
@@ -304,7 +330,6 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, deadman_enabled, CTLFLAG_RDTUN,
  *     (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");
 
@@ -328,6 +353,32 @@ zfs_deadman_init()
 #endif	/* _KERNEL */
 #endif	/* !illumos */
 
+/*
+ * Normally, we don't allow the last 3.2% (1/(2^spa_slop_shift)) of space in
+ * the pool to be consumed.  This ensures that we don't run the pool
+ * completely out of space, due to unaccounted changes (e.g. to the MOS).
+ * It also limits the worst-case time to allocate space.  If we have
+ * less than this amount of free space, most ZPL operations (e.g. write,
+ * create) will return ENOSPC.
+ *
+ * Certain operations (e.g. file removal, most administrative actions) can
+ * use half the slop space.  They will only return ENOSPC if less than half
+ * the slop space is free.  Typically, once the pool has less than the slop
+ * space free, the user will use these operations to free up space in the pool.
+ * These are the operations that call dsl_pool_adjustedsize() with the netfree
+ * argument set to TRUE.
+ *
+ * A very restricted set of operations are always permitted, regardless of
+ * the amount of free space.  These are the operations that call
+ * dsl_sync_task(ZFS_SPACE_CHECK_NONE), e.g. "zfs destroy".  If these
+ * operations result in a net increase in the amount of space used,
+ * it is possible to run the pool completely out of space, causing it to
+ * be permanently read-only.
+ *
+ * See also the comments in zfs_space_check_t.
+ */
+int spa_slop_shift = 5;
+
 /*
  * ==========================================================================
  * SPA config locking
@@ -519,6 +570,12 @@ spa_deadman(void *arg)
 	    ++spa->spa_deadman_calls);
 	if (zfs_deadman_enabled)
 		vdev_deadman(spa->spa_root_vdev);
+#ifdef __FreeBSD__
+#ifdef _KERNEL
+	callout_schedule(&spa->spa_deadman_cycid,
+	    hz * zfs_deadman_checktime_ms / MILLISEC);
+#endif
+#endif
 }
 
 /*
@@ -1391,7 +1448,10 @@ snprintf_blkptr(char *buf, size_t buflen, const blkptr_t *bp)
 			(void) strlcpy(type, dmu_ot[BP_GET_TYPE(bp)].ot_name,
 			    sizeof (type));
 		}
-		checksum = zio_checksum_table[BP_GET_CHECKSUM(bp)].ci_name;
+		if (!BP_IS_EMBEDDED(bp)) {
+			checksum =
+			    zio_checksum_table[BP_GET_CHECKSUM(bp)].ci_name;
+		}
 		compress = zio_compress_table[BP_GET_COMPRESS(bp)].ci_name;
 	}
 
@@ -1594,6 +1654,18 @@ spa_get_asize(spa_t *spa, uint64_t lsize)
 	return (lsize * spa_asize_inflation);
 }
 
+/*
+ * Return the amount of slop space in bytes.  It is 1/32 of the pool (3.2%),
+ * or at least 32MB.
+ *
+ * See the comment above spa_slop_shift for details.
+ */
+uint64_t
+spa_get_slop_space(spa_t *spa) {
+	uint64_t space = spa_get_dspace(spa);
+	return (MAX(space >> spa_slop_shift, SPA_MINDEVSIZE >> 1));
+}
+
 uint64_t
 spa_get_dspace(spa_t *spa)
 {
@@ -1693,7 +1765,7 @@ bp_get_dsize_sync(spa_t *spa, const blkptr_t *bp)
 {
 	uint64_t dsize = 0;
 
-	for (int d = 0; d < SPA_DVAS_PER_BP; d++)
+	for (int d = 0; d < BP_GET_NDVAS(bp); d++)
 		dsize += dva_get_dsize_sync(spa, &bp->blk_dva[d]);
 
 	return (dsize);
@@ -1706,7 +1778,7 @@ bp_get_dsize(spa_t *spa, const blkptr_t *bp)
 
 	spa_config_enter(spa, SCL_VDEV, FTAG, RW_READER);
 
-	for (int d = 0; d < SPA_DVAS_PER_BP; d++)
+	for (int d = 0; d < BP_GET_NDVAS(bp); d++)
 		dsize += dva_get_dsize_sync(spa, &bp->blk_dva[d]);
 
 	spa_config_exit(spa, SCL_VDEV, FTAG);
@@ -1866,6 +1938,16 @@ spa_writeable(spa_t *spa)
 	return (!!(spa->spa_mode & FWRITE));
 }
 
+/*
+ * Returns true if there is a pending sync task in any of the current
+ * syncing txg, the current quiescing txg, or the current open txg.
+ */
+boolean_t
+spa_has_pending_synctask(spa_t *spa)
+{
+	return (!txg_all_lists_empty(&spa->spa_dsl_pool->dp_sync_tasks));
+}
+
 int
 spa_mode(spa_t *spa)
 {
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 629870b6784d..d158b246d8c2 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
@@ -202,10 +202,10 @@ space_map_histogram_add(space_map_t *sm, range_tree_t *rt, dmu_tx_t *tx)
 		 * 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) {
+		if (idx < SPACE_MAP_HISTOGRAM_SIZE - 1) {
 			ASSERT3U(idx + sm->sm_shift, ==, i);
 			idx++;
-			ASSERT3U(idx, <, SPACE_MAP_HISTOGRAM_SIZE(sm));
+			ASSERT3U(idx, <, SPACE_MAP_HISTOGRAM_SIZE);
 		}
 	}
 }
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 bc622845d485..8bf07c3ec8c2 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
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  */
 
@@ -95,7 +95,6 @@ boolean_t arc_buf_remove_ref(arc_buf_t *buf, void *tag);
 int arc_buf_size(arc_buf_t *buf);
 void arc_release(arc_buf_t *buf, void *tag);
 int arc_released(arc_buf_t *buf);
-int arc_has_callback(arc_buf_t *buf);
 void arc_buf_freeze(arc_buf_t *buf);
 void arc_buf_thaw(arc_buf_t *buf);
 boolean_t arc_buf_eviction_needed(arc_buf_t *buf);
@@ -105,16 +104,16 @@ int arc_referenced(arc_buf_t *buf);
 
 int arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp,
     arc_done_func_t *done, void *priv, zio_priority_t priority, int flags,
-    uint32_t *arc_flags, const zbookmark_t *zb);
+    uint32_t *arc_flags, const zbookmark_phys_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 *physdone,
     arc_done_func_t *done, void *priv, zio_priority_t priority,
-    int zio_flags, const zbookmark_t *zb);
+    int zio_flags, const zbookmark_phys_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);
-int arc_buf_evict(arc_buf_t *buf);
+boolean_t arc_clear_callback(arc_buf_t *buf);
 
 void arc_flush(spa_t *spa);
 void arc_tempreserve_clear(uint64_t reserve);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/blkptr.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/blkptr.h
new file mode 100644
index 000000000000..b720482a73fe
--- /dev/null
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/blkptr.h
@@ -0,0 +1,38 @@
+/*
+ * CDDL HEADER START
+ *
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ */
+
+#ifndef _SYS_BLKPTR_H
+#define	_SYS_BLKPTR_H
+
+#include <sys/spa.h>
+#include <sys/zio.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+void encode_embedded_bp_compressed(blkptr_t *, void *,
+    enum zio_compress, int, int);
+void decode_embedded_bp_compressed(const blkptr_t *, void *);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _SYS_BLKPTR_H */
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bptree.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bptree.h
index 971507211875..327c128bf493 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bptree.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bptree.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef	_SYS_BPTREE_H
@@ -43,13 +43,14 @@ typedef struct bptree_phys {
 typedef struct bptree_entry_phys {
 	blkptr_t be_bp;
 	uint64_t be_birth_txg; /* only delete blocks born after this txg */
-	zbookmark_t be_zb; /* holds traversal resume point if needed */
+	zbookmark_phys_t be_zb; /* holds traversal resume point if needed */
 } bptree_entry_phys_t;
 
 typedef int bptree_itor_t(void *arg, const blkptr_t *bp, dmu_tx_t *tx);
 
 uint64_t bptree_alloc(objset_t *os, dmu_tx_t *tx);
 int bptree_free(objset_t *os, uint64_t obj, dmu_tx_t *tx);
+boolean_t bptree_is_empty(objset_t *os, uint64_t obj);
 
 void bptree_add(objset_t *os, uint64_t obj, blkptr_t *bp, uint64_t birth_txg,
     uint64_t bytes, uint64_t comp, uint64_t uncomp, dmu_tx_t *tx);
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 207834dfd486..643d9685b61c 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) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  */
 
@@ -213,11 +213,14 @@ typedef struct dmu_buf_impl {
 	/* pointer to most recent dirty record for this buffer */
 	dbuf_dirty_record_t *db_last_dirty;
 
+	/* Creation time of dbuf (see comment in dbuf_compare). */
+	hrtime_t db_creation;
+
 	/*
 	 * Our link on the owner dnodes's dn_dbufs list.
 	 * Protected by its dn_dbufs_mtx.
 	 */
-	list_node_t db_link;
+	avl_node_t db_link;
 
 	/* Data which is unique to data (leaf) blocks: */
 
@@ -274,6 +277,9 @@ void dmu_buf_fill_done(dmu_buf_t *db, dmu_tx_t *tx);
 void dbuf_assign_arcbuf(dmu_buf_impl_t *db, arc_buf_t *buf, dmu_tx_t *tx);
 dbuf_dirty_record_t *dbuf_dirty(dmu_buf_impl_t *db, dmu_tx_t *tx);
 arc_buf_t *dbuf_loan_arcbuf(dmu_buf_impl_t *db);
+void dmu_buf_write_embedded(dmu_buf_t *dbuf, void *data,
+    bp_embedded_type_t etype, enum zio_compress comp,
+    int uncompressed_size, int compressed_size, int byteorder, dmu_tx_t *tx);
 
 void dbuf_clear(dmu_buf_impl_t *db);
 void dbuf_evict(dmu_buf_impl_t *db);
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 e359a83e2194..2c0b5ae2cab6 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
@@ -64,7 +64,7 @@ struct dsl_pool;
 struct dnode;
 struct drr_begin;
 struct drr_end;
-struct zbookmark;
+struct zbookmark_phys;
 struct spa;
 struct nvlist;
 struct arc_buf;
@@ -119,6 +119,14 @@ typedef enum dmu_object_byteswap {
 	((ot) & DMU_OT_METADATA) : \
 	dmu_ot[(ot)].ot_metadata)
 
+/*
+ * These object types use bp_fill != 1 for their L0 bp's. Therefore they can't
+ * have their data embedded (i.e. use a BP_IS_EMBEDDED() bp), because bp_fill
+ * is repurposed for embedded BPs.
+ */
+#define	DMU_OT_HAS_FILL(ot) \
+	((ot) == DMU_OT_DNODE || (ot) == DMU_OT_OBJSET)
+
 #define	DMU_OT_BYTESWAP(ot) (((ot) & DMU_OT_NEWTYPE) ? \
 	((ot) & DMU_OT_BYTESWAP_MASK) : \
 	dmu_ot[(ot)].ot_byteswap)
@@ -245,7 +253,6 @@ void zfs_znode_byteswap(void *buf, size_t size);
 
 #define	DMU_USERUSED_OBJECT	(-1ULL)
 #define	DMU_GROUPUSED_OBJECT	(-2ULL)
-#define	DMU_DEADLIST_OBJECT	(-3ULL)
 
 /*
  * artificial blkids for bonus buffer and spill blocks
@@ -396,6 +403,11 @@ void dmu_object_set_checksum(objset_t *os, uint64_t object, uint8_t checksum,
 void dmu_object_set_compress(objset_t *os, uint64_t object, uint8_t compress,
     dmu_tx_t *tx);
 
+void
+dmu_write_embedded(objset_t *os, uint64_t object, uint64_t offset,
+    void *data, uint8_t etype, uint8_t comp, int uncompressed_size,
+    int compressed_size, int byteorder, dmu_tx_t *tx);
+
 /*
  * Decide how to write a block: checksum, compression, number of copies, etc.
  */
@@ -557,6 +569,7 @@ void dmu_tx_abort(dmu_tx_t *tx);
 int dmu_tx_assign(dmu_tx_t *tx, enum txg_how txg_how);
 void dmu_tx_wait(dmu_tx_t *tx);
 void dmu_tx_commit(dmu_tx_t *tx);
+void dmu_tx_mark_netfree(dmu_tx_t *tx);
 
 /*
  * To register a commit callback, dmu_tx_callback_register() must be called.
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h
index 63440646a423..6f67b5a0b9bb 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h
@@ -297,12 +297,15 @@ typedef struct dmu_sendarg {
 	int dsa_err;
 	dmu_pendop_t dsa_pending_op;
 	boolean_t dsa_incremental;
+	uint64_t dsa_featureflags;
 	uint64_t dsa_last_data_object;
 	uint64_t dsa_last_data_offset;
 } dmu_sendarg_t;
 
 void dmu_object_zapify(objset_t *, uint64_t, dmu_object_type_t, dmu_tx_t *);
 void dmu_object_free_zapified(objset_t *, uint64_t, dmu_tx_t *);
+int dmu_buf_hold_noread(objset_t *, uint64_t, uint64_t,
+    void *, dmu_buf_t **);
 
 #ifdef	__cplusplus
 }
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
index 2b95b8cf7f85..b5d617025bd0 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
@@ -36,19 +36,19 @@ struct dsl_dataset;
 struct drr_begin;
 struct avl_tree;
 
-int dmu_send(const char *tosnap, const char *fromsnap, int outfd,
+int dmu_send(const char *tosnap, const char *fromsnap, boolean_t embedok,
 #ifdef illumos
-    struct vnode *vp, offset_t *off);
+    int outfd, struct vnode *vp, offset_t *off);
 #else
-    struct file *fp, offset_t *off);
+    int outfd, struct file *fp, offset_t *off);
 #endif
 int dmu_send_estimate(struct dsl_dataset *ds, struct dsl_dataset *fromds,
     uint64_t *sizep);
 int dmu_send_obj(const char *pool, uint64_t tosnap, uint64_t fromsnap,
 #ifdef illumos
-    int outfd, struct vnode *vp, offset_t *off);
+    boolean_t embedok, int outfd, vnode_t *vp, offset_t *off);
 #else
-    int outfd, struct file *fp, offset_t *off);
+    boolean_t embedok, int outfd, struct file *fp, offset_t *off);
 #endif
 
 typedef struct dmu_recv_cookie {
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h
index bc1590bc3aa8..544b721e4612 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.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) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef	_SYS_DMU_TRAVERSE_H
@@ -40,7 +40,7 @@ struct zilog;
 struct arc_buf;
 
 typedef int (blkptr_cb_t)(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const struct dnode_phys *dnp, void *arg);
+    const zbookmark_phys_t *zb, const struct dnode_phys *dnp, void *arg);
 
 #define	TRAVERSE_PRE			(1<<0)
 #define	TRAVERSE_POST			(1<<1)
@@ -55,7 +55,7 @@ typedef int (blkptr_cb_t)(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
 int traverse_dataset(struct dsl_dataset *ds,
     uint64_t txg_start, int flags, blkptr_cb_t func, void *arg);
 int traverse_dataset_destroyed(spa_t *spa, blkptr_t *blkptr,
-    uint64_t txg_start, zbookmark_t *resume, int flags,
+    uint64_t txg_start, zbookmark_phys_t *resume, int flags,
     blkptr_cb_t func, void *arg);
 int traverse_pool(spa_t *spa,
     uint64_t txg_start, int flags, blkptr_cb_t func, void *arg);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
index 35501ce022cf..6e4a845a36a1 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
@@ -211,7 +211,7 @@ typedef struct dnode {
 	refcount_t dn_holds;
 
 	kmutex_t dn_dbufs_mtx;
-	list_t dn_dbufs;		/* descendent dbufs */
+	avl_tree_t dn_dbufs;		/* descendent dbufs */
 
 	/* protected by dn_struct_rwlock */
 	struct dmu_buf_impl *dn_bonus;	/* bonus buffer dbuf */
@@ -245,7 +245,7 @@ typedef struct dnode_handle {
 
 typedef struct dnode_children {
 	size_t dnc_count;		/* number of children */
-	dnode_handle_t dnc_children[1];	/* sized dynamically */
+	dnode_handle_t dnc_children[];	/* sized dynamically */
 } dnode_children_t;
 
 typedef struct free_range {
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 752ccadb729d..a9c4f67515a9 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
@@ -160,6 +160,7 @@ boolean_t dsl_dir_is_zapified(dsl_dir_t *dd);
 #define	ORIGIN_DIR_NAME "$ORIGIN"
 #define	XLATION_DIR_NAME "$XLATION"
 #define	FREE_DIR_NAME "$FREE"
+#define	LEAK_DIR_NAME "$LEAK"
 
 #ifdef ZFS_DEBUG
 #define	dprintf_dd(dd, fmt, ...) do { \
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 ea180c9a5b8d..a6fb201047bb 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
@@ -84,6 +84,7 @@ typedef struct dsl_pool {
 	struct dsl_dir *dp_root_dir;
 	struct dsl_dir *dp_mos_dir;
 	struct dsl_dir *dp_free_dir;
+	struct dsl_dir *dp_leak_dir;
 	struct dsl_dataset *dp_origin_snap;
 	uint64_t dp_root_dir_obj;
 	struct taskq *dp_vnrele_taskq;
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h
index bf8c5ac824a1..ee8512c07dac 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef	_SYS_DSL_SCAN_H
@@ -62,7 +62,7 @@ typedef struct dsl_scan_phys {
 	uint64_t scn_errors;	/* scan I/O error count */
 	uint64_t scn_ddt_class_max;
 	ddt_bookmark_t scn_ddt_bookmark;
-	zbookmark_t scn_bookmark;
+	zbookmark_phys_t scn_bookmark;
 	uint64_t scn_flags; /* dsl_scan_flags_t */
 } dsl_scan_phys_t;
 
@@ -114,6 +114,7 @@ typedef struct dsl_scan {
 	/* for freeing blocks */
 	boolean_t scn_is_bptree;
 	boolean_t scn_async_destroying;
+	boolean_t scn_async_stalled;
 
 	/* for debugging / information */
 	uint64_t scn_visited_this_txg;
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h
index ef86fb64cf0c..6139303c1564 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.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) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef	_SYS_DSL_SYNCTASK_H
@@ -38,11 +38,41 @@ struct dsl_pool;
 typedef int (dsl_checkfunc_t)(void *, dmu_tx_t *);
 typedef void (dsl_syncfunc_t)(void *, dmu_tx_t *);
 
+typedef enum zfs_space_check {
+	/*
+	 * Normal space check: if there is less than 3.2% free space,
+	 * the operation will fail.  Operations which are logically
+	 * creating things should use this (e.g. "zfs create", "zfs snapshot").
+	 * User writes (via the ZPL / ZVOL) also fail at this point.
+	 */
+	ZFS_SPACE_CHECK_NORMAL,
+
+	/*
+	 * Space check allows use of half the slop space.  If there
+	 * is less than 1.6% free space, the operation will fail.  Most
+	 * operations should use this (e.g. "zfs set", "zfs rename"),
+	 * because we want them to succeed even after user writes are failing,
+	 * so that they can be used as part of the space recovery process.
+	 */
+	ZFS_SPACE_CHECK_RESERVED,
+
+	/*
+	 * No space check is performed.  Only operations which we expect to
+	 * result in a net reduction in space should use this
+	 * (e.g. "zfs destroy". Setting quotas & reservations also uses
+	 * this because it needs to circumvent the quota/reservation checks).
+	 *
+	 * See also the comments above spa_slop_shift.
+	 */
+	ZFS_SPACE_CHECK_NONE,
+} zfs_space_check_t;
+
 typedef struct dsl_sync_task {
 	txg_node_t dst_node;
 	struct dsl_pool *dst_pool;
 	uint64_t dst_txg;
 	int dst_space;
+	zfs_space_check_t dst_space_check;
 	dsl_checkfunc_t *dst_checkfunc;
 	dsl_syncfunc_t *dst_syncfunc;
 	void *dst_arg;
@@ -50,11 +80,11 @@ typedef struct dsl_sync_task {
 	boolean_t dst_nowaiter;
 } dsl_sync_task_t;
 
-void dsl_sync_task_sync(dsl_sync_task_t *dst, dmu_tx_t *tx);
-int dsl_sync_task(const char *pool, dsl_checkfunc_t *checkfunc,
-    dsl_syncfunc_t *syncfunc, void *arg, int blocks_modified);
-void dsl_sync_task_nowait(struct dsl_pool *dp, dsl_syncfunc_t *syncfunc,
-    void *arg, int blocks_modified, dmu_tx_t *tx);
+void dsl_sync_task_sync(dsl_sync_task_t *, dmu_tx_t *);
+int dsl_sync_task(const char *, dsl_checkfunc_t *,
+    dsl_syncfunc_t *, void *, int, zfs_space_check_t);
+void dsl_sync_task_nowait(struct dsl_pool *, dsl_syncfunc_t *,
+    void *, int, zfs_space_check_t, dmu_tx_t *);
 
 #ifdef	__cplusplus
 }
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 fda9fffc70df..deefb196fdef 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) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_METASLAB_H
@@ -38,23 +38,22 @@ extern "C" {
 
 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_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);
+metaslab_t *metaslab_init(metaslab_group_t *, uint64_t,
+    uint64_t, uint64_t);
+void metaslab_fini(metaslab_t *);
 
-void metaslab_load_wait(metaslab_t *msp);
-int metaslab_load(metaslab_t *msp);
-void metaslab_unload(metaslab_t *msp);
+void metaslab_load_wait(metaslab_t *);
+int metaslab_load(metaslab_t *);
+void metaslab_unload(metaslab_t *);
 
-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);
+void metaslab_sync(metaslab_t *, uint64_t);
+void metaslab_sync_done(metaslab_t *, uint64_t);
+void metaslab_sync_reassess(metaslab_group_t *);
+uint64_t metaslab_block_maxsize(metaslab_t *);
 
 #define	METASLAB_HINTBP_FAVOR	0x0
 #define	METASLAB_HINTBP_AVOID	0x1
@@ -62,29 +61,35 @@ uint64_t metaslab_block_maxsize(metaslab_t *msp);
 #define	METASLAB_GANG_CHILD	0x4
 #define	METASLAB_GANG_AVOID	0x8
 
-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);
-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);
+int metaslab_alloc(spa_t *, metaslab_class_t *, uint64_t,
+    blkptr_t *, int, uint64_t, blkptr_t *, int);
+void metaslab_free(spa_t *, const blkptr_t *, uint64_t, boolean_t);
+int metaslab_claim(spa_t *, const blkptr_t *, uint64_t);
+void metaslab_check_free(spa_t *, const blkptr_t *);
 
-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);
+metaslab_class_t *metaslab_class_create(spa_t *, metaslab_ops_t *);
+void metaslab_class_destroy(metaslab_class_t *);
+int metaslab_class_validate(metaslab_class_t *);
+void metaslab_class_histogram_verify(metaslab_class_t *);
+uint64_t metaslab_class_fragmentation(metaslab_class_t *);
+uint64_t metaslab_class_expandable_space(metaslab_class_t *);
 
-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);
-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);
+void metaslab_class_space_update(metaslab_class_t *, int64_t, int64_t,
+    int64_t, int64_t);
+uint64_t metaslab_class_get_alloc(metaslab_class_t *);
+uint64_t metaslab_class_get_space(metaslab_class_t *);
+uint64_t metaslab_class_get_dspace(metaslab_class_t *);
+uint64_t metaslab_class_get_deferred(metaslab_class_t *);
 uint64_t metaslab_class_get_minblocksize(metaslab_class_t *mc);
 
-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);
+metaslab_group_t *metaslab_group_create(metaslab_class_t *, vdev_t *);
+void metaslab_group_destroy(metaslab_group_t *);
+void metaslab_group_activate(metaslab_group_t *);
+void metaslab_group_passivate(metaslab_group_t *);
+uint64_t metaslab_group_get_space(metaslab_group_t *);
+void metaslab_group_histogram_verify(metaslab_group_t *);
+uint64_t metaslab_group_fragmentation(metaslab_group_t *);
+void metaslab_group_histogram_remove(metaslab_group_t *, metaslab_t *);
 
 #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 36d11d9907b7..eb7c93205929 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
@@ -41,6 +41,23 @@
 extern "C" {
 #endif
 
+/*
+ * A metaslab class encompasses a category of allocatable top-level vdevs.
+ * Each top-level vdev is associated with a metaslab group which defines
+ * the allocatable region for that vdev. Examples of these categories include
+ * "normal" for data block allocations (i.e. main pool allocations) or "log"
+ * for allocations designated for intent log devices (i.e. slog devices).
+ * When a block allocation is requested from the SPA it is associated with a
+ * metaslab_class_t, and only top-level vdevs (i.e. metaslab groups) belonging
+ * to the class can be used to satisfy that request. Allocations are done
+ * by traversing the metaslab groups that are linked off of the mc_rotor field.
+ * This rotor points to the next metaslab group where allocations will be
+ * attempted. Allocating a block is a 3 step process -- select the metaslab
+ * group, select the metaslab, and then allocate the block. The metaslab
+ * class defines the low-level block allocator that will be used as the
+ * final step in allocation. These allocators are pluggable allowing each class
+ * to use a block allocator that best suits that class.
+ */
 struct metaslab_class {
 	spa_t			*mc_spa;
 	metaslab_group_t	*mc_rotor;
@@ -52,8 +69,18 @@ struct metaslab_class {
 	uint64_t		mc_space;	/* total space (alloc + free) */
 	uint64_t		mc_dspace;	/* total deflated space */
 	uint64_t		mc_minblocksize;
+	uint64_t		mc_histogram[RANGE_TREE_HISTOGRAM_SIZE];
 };
 
+/*
+ * Metaslab groups encapsulate all the allocatable regions (i.e. metaslabs)
+ * of a top-level vdev. They are linked togther to form a circular linked
+ * list and can belong to only one metaslab class. Metaslab groups may become
+ * ineligible for allocations for a number of reasons such as limited free
+ * space, fragmentation, or going offline. When this happens the allocator will
+ * simply find the next metaslab group in the linked list and attempt
+ * to allocate from that group instead.
+ */
 struct metaslab_group {
 	kmutex_t		mg_lock;
 	avl_tree_t		mg_metaslab_tree;
@@ -67,12 +94,14 @@ struct metaslab_group {
 	taskq_t			*mg_taskq;
 	metaslab_group_t	*mg_prev;
 	metaslab_group_t	*mg_next;
+	uint64_t		mg_fragmentation;
+	uint64_t		mg_histogram[RANGE_TREE_HISTOGRAM_SIZE];
 };
 
 /*
  * 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).
+ * of 64 was chosen as it covers all power of 2 buckets up to UINT64_MAX.
+ * This is the equivalent of highbit(UINT64_MAX).
  */
 #define	MAX_LBAS	64
 
@@ -135,6 +164,7 @@ struct metaslab {
 	uint64_t	ms_id;
 	uint64_t	ms_start;
 	uint64_t	ms_size;
+	uint64_t	ms_fragmentation;
 
 	range_tree_t	*ms_alloctree[TXG_SIZE];
 	range_tree_t	*ms_freetree[TXG_SIZE];
@@ -142,12 +172,12 @@ struct metaslab {
 	range_tree_t	*ms_tree;
 
 	boolean_t	ms_condensing;	/* condensing? */
+	boolean_t	ms_condense_wanted;
 	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;
 
 	/*
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h
index fb44fbe183ff..5ac2794bd94b 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h
@@ -79,6 +79,31 @@ void rrw_tsd_destroy(void *arg);
 #define	RRW_LOCK_HELD(x) \
 	(rrw_held(x, RW_WRITER) || rrw_held(x, RW_READER))
 
+/*
+ * A reader-mostly lock implementation, tuning above reader-writer locks
+ * for hightly parallel read acquisitions, pessimizing write acquisitions.
+ *
+ * This should be a prime number.  See comment in rrwlock.c near
+ * RRM_TD_LOCK() for details.
+ */
+#define	RRM_NUM_LOCKS		17
+typedef struct rrmlock {
+	rrwlock_t	locks[RRM_NUM_LOCKS];
+} rrmlock_t;
+
+void rrm_init(rrmlock_t *rrl, boolean_t track_all);
+void rrm_destroy(rrmlock_t *rrl);
+void rrm_enter(rrmlock_t *rrl, krw_t rw, void *tag);
+void rrm_enter_read(rrmlock_t *rrl, void *tag);
+void rrm_enter_write(rrmlock_t *rrl);
+void rrm_exit(rrmlock_t *rrl, void *tag);
+boolean_t rrm_held(rrmlock_t *rrl, krw_t rw);
+
+#define	RRM_READ_HELD(x)	rrm_held(x, RW_READER)
+#define	RRM_WRITE_HELD(x)	rrm_held(x, RW_WRITER)
+#define	RRM_LOCK_HELD(x) \
+	(rrm_held(x, RW_WRITER) || rrm_held(x, RW_READER))
+
 #ifdef	__cplusplus
 }
 #endif
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
index 64609c6326cc..f62e3151f871 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  */
 
@@ -170,7 +170,7 @@ typedef struct zio_cksum {
  *	+-------+-------+-------+-------+-------+-------+-------+-------+
  * 5	|G|			 offset3				|
  *	+-------+-------+-------+-------+-------+-------+-------+-------+
- * 6	|BDX|lvl| type	| cksum | comp	|     PSIZE	|     LSIZE	|
+ * 6	|BDX|lvl| type	| cksum |E| comp|    PSIZE	|     LSIZE	|
  *	+-------+-------+-------+-------+-------+-------+-------+-------+
  * 7	|			padding					|
  *	+-------+-------+-------+-------+-------+-------+-------+-------+
@@ -204,7 +204,8 @@ typedef struct zio_cksum {
  * G		gang block indicator
  * B		byteorder (endianness)
  * D		dedup
- * X		unused
+ * X		encryption (on version 30, which is not supported)
+ * E		blkptr_t contains embedded data (see below)
  * lvl		level of indirection
  * type		DMU object type
  * phys birth	txg of block allocation; zero if same as logical birth txg
@@ -212,6 +213,100 @@ typedef struct zio_cksum {
  * fill count	number of non-zero blocks under this bp
  * checksum[4]	256-bit checksum of the data this bp describes
  */
+
+/*
+ * "Embedded" blkptr_t's don't actually point to a block, instead they
+ * have a data payload embedded in the blkptr_t itself.  See the comment
+ * in blkptr.c for more details.
+ *
+ * The blkptr_t is laid out as follows:
+ *
+ *	64	56	48	40	32	24	16	8	0
+ *	+-------+-------+-------+-------+-------+-------+-------+-------+
+ * 0	|      payload                                                  |
+ * 1	|      payload                                                  |
+ * 2	|      payload                                                  |
+ * 3	|      payload                                                  |
+ * 4	|      payload                                                  |
+ * 5	|      payload                                                  |
+ *	+-------+-------+-------+-------+-------+-------+-------+-------+
+ * 6	|BDX|lvl| type	| etype |E| comp| PSIZE|              LSIZE	|
+ *	+-------+-------+-------+-------+-------+-------+-------+-------+
+ * 7	|      payload                                                  |
+ * 8	|      payload                                                  |
+ * 9	|      payload                                                  |
+ *	+-------+-------+-------+-------+-------+-------+-------+-------+
+ * a	|			logical birth txg			|
+ *	+-------+-------+-------+-------+-------+-------+-------+-------+
+ * b	|      payload                                                  |
+ * c	|      payload                                                  |
+ * d	|      payload                                                  |
+ * e	|      payload                                                  |
+ * f	|      payload                                                  |
+ *	+-------+-------+-------+-------+-------+-------+-------+-------+
+ *
+ * Legend:
+ *
+ * payload		contains the embedded data
+ * B (byteorder)	byteorder (endianness)
+ * D (dedup)		padding (set to zero)
+ * X			encryption (set to zero; see above)
+ * E (embedded)		set to one
+ * lvl			indirection level
+ * type			DMU object type
+ * etype		how to interpret embedded data (BP_EMBEDDED_TYPE_*)
+ * comp			compression function of payload
+ * PSIZE		size of payload after compression, in bytes
+ * LSIZE		logical size of payload, in bytes
+ *			note that 25 bits is enough to store the largest
+ *			"normal" BP's LSIZE (2^16 * 2^9) in bytes
+ * log. birth		transaction group in which the block was logically born
+ *
+ * Note that LSIZE and PSIZE are stored in bytes, whereas for non-embedded
+ * bp's they are stored in units of SPA_MINBLOCKSHIFT.
+ * Generally, the generic BP_GET_*() macros can be used on embedded BP's.
+ * The B, D, X, lvl, type, and comp fields are stored the same as with normal
+ * BP's so the BP_SET_* macros can be used with them.  etype, PSIZE, LSIZE must
+ * be set with the BPE_SET_* macros.  BP_SET_EMBEDDED() should be called before
+ * other macros, as they assert that they are only used on BP's of the correct
+ * "embedded-ness".
+ */
+
+#define	BPE_GET_ETYPE(bp)	\
+	(ASSERT(BP_IS_EMBEDDED(bp)), \
+	BF64_GET((bp)->blk_prop, 40, 8))
+#define	BPE_SET_ETYPE(bp, t)	do { \
+	ASSERT(BP_IS_EMBEDDED(bp)); \
+	BF64_SET((bp)->blk_prop, 40, 8, t); \
+_NOTE(CONSTCOND) } while (0)
+
+#define	BPE_GET_LSIZE(bp)	\
+	(ASSERT(BP_IS_EMBEDDED(bp)), \
+	BF64_GET_SB((bp)->blk_prop, 0, 25, 0, 1))
+#define	BPE_SET_LSIZE(bp, x)	do { \
+	ASSERT(BP_IS_EMBEDDED(bp)); \
+	BF64_SET_SB((bp)->blk_prop, 0, 25, 0, 1, x); \
+_NOTE(CONSTCOND) } while (0)
+
+#define	BPE_GET_PSIZE(bp)	\
+	(ASSERT(BP_IS_EMBEDDED(bp)), \
+	BF64_GET_SB((bp)->blk_prop, 25, 7, 0, 1))
+#define	BPE_SET_PSIZE(bp, x)	do { \
+	ASSERT(BP_IS_EMBEDDED(bp)); \
+	BF64_SET_SB((bp)->blk_prop, 25, 7, 0, 1, x); \
+_NOTE(CONSTCOND) } while (0)
+
+typedef enum bp_embedded_type {
+	BP_EMBEDDED_TYPE_DATA,
+	BP_EMBEDDED_TYPE_RESERVED, /* Reserved for an unintegrated feature. */
+	NUM_BP_EMBEDDED_TYPES = BP_EMBEDDED_TYPE_RESERVED
+} bp_embedded_type_t;
+
+#define	BPE_NUM_WORDS 14
+#define	BPE_PAYLOAD_SIZE (BPE_NUM_WORDS * sizeof (uint64_t))
+#define	BPE_IS_PAYLOADWORD(bp, wp) \
+	((wp) != &(bp)->blk_prop && (wp) != &(bp)->blk_birth)
+
 #define	SPA_BLKPTRSHIFT	7		/* blkptr_t is 128 bytes	*/
 #define	SPA_DVAS_PER_BP	3		/* Number of DVAs in a bp	*/
 
@@ -258,20 +353,37 @@ typedef struct blkptr {
 #define	DVA_SET_GANG(dva, x)	BF64_SET((dva)->dva_word[1], 63, 1, x)
 
 #define	BP_GET_LSIZE(bp)	\
-	BF64_GET_SB((bp)->blk_prop, 0, SPA_LSIZEBITS, SPA_MINBLOCKSHIFT, 1)
-#define	BP_SET_LSIZE(bp, x)	\
-	BF64_SET_SB((bp)->blk_prop, 0, SPA_LSIZEBITS, SPA_MINBLOCKSHIFT, 1, x)
+	(BP_IS_EMBEDDED(bp) ?	\
+	(BPE_GET_ETYPE(bp) == BP_EMBEDDED_TYPE_DATA ? BPE_GET_LSIZE(bp) : 0): \
+	BF64_GET_SB((bp)->blk_prop, 0, SPA_LSIZEBITS, SPA_MINBLOCKSHIFT, 1))
+#define	BP_SET_LSIZE(bp, x)	do { \
+	ASSERT(!BP_IS_EMBEDDED(bp)); \
+	BF64_SET_SB((bp)->blk_prop, \
+	    0, SPA_LSIZEBITS, SPA_MINBLOCKSHIFT, 1, x); \
+_NOTE(CONSTCOND) } while (0)
 
 #define	BP_GET_PSIZE(bp)	\
-	BF64_GET_SB((bp)->blk_prop, 16, SPA_PSIZEBITS, SPA_MINBLOCKSHIFT, 1)
-#define	BP_SET_PSIZE(bp, x)	\
-	BF64_SET_SB((bp)->blk_prop, 16, SPA_PSIZEBITS, SPA_MINBLOCKSHIFT, 1, x)
+	(BP_IS_EMBEDDED(bp) ? 0 : \
+	BF64_GET_SB((bp)->blk_prop, 16, SPA_PSIZEBITS, SPA_MINBLOCKSHIFT, 1))
+#define	BP_SET_PSIZE(bp, x)	do { \
+	ASSERT(!BP_IS_EMBEDDED(bp)); \
+	BF64_SET_SB((bp)->blk_prop, \
+	    16, SPA_PSIZEBITS, SPA_MINBLOCKSHIFT, 1, x); \
+_NOTE(CONSTCOND) } while (0)
 
-#define	BP_GET_COMPRESS(bp)		BF64_GET((bp)->blk_prop, 32, 8)
-#define	BP_SET_COMPRESS(bp, x)		BF64_SET((bp)->blk_prop, 32, 8, x)
+#define	BP_GET_COMPRESS(bp)		BF64_GET((bp)->blk_prop, 32, 7)
+#define	BP_SET_COMPRESS(bp, x)		BF64_SET((bp)->blk_prop, 32, 7, x)
 
-#define	BP_GET_CHECKSUM(bp)		BF64_GET((bp)->blk_prop, 40, 8)
-#define	BP_SET_CHECKSUM(bp, x)		BF64_SET((bp)->blk_prop, 40, 8, x)
+#define	BP_IS_EMBEDDED(bp)		BF64_GET((bp)->blk_prop, 39, 1)
+#define	BP_SET_EMBEDDED(bp, x)		BF64_SET((bp)->blk_prop, 39, 1, x)
+
+#define	BP_GET_CHECKSUM(bp)		\
+	(BP_IS_EMBEDDED(bp) ? ZIO_CHECKSUM_OFF : \
+	BF64_GET((bp)->blk_prop, 40, 8))
+#define	BP_SET_CHECKSUM(bp, x)		do { \
+	ASSERT(!BP_IS_EMBEDDED(bp)); \
+	BF64_SET((bp)->blk_prop, 40, 8, x); \
+_NOTE(CONSTCOND) } while (0)
 
 #define	BP_GET_TYPE(bp)			BF64_GET((bp)->blk_prop, 48, 8)
 #define	BP_SET_TYPE(bp, x)		BF64_SET((bp)->blk_prop, 48, 8, x)
@@ -279,9 +391,6 @@ typedef struct blkptr {
 #define	BP_GET_LEVEL(bp)		BF64_GET((bp)->blk_prop, 56, 5)
 #define	BP_SET_LEVEL(bp, x)		BF64_SET((bp)->blk_prop, 56, 5, x)
 
-#define	BP_GET_PROP_BIT_61(bp)		BF64_GET((bp)->blk_prop, 61, 1)
-#define	BP_SET_PROP_BIT_61(bp, x)	BF64_SET((bp)->blk_prop, 61, 1, x)
-
 #define	BP_GET_DEDUP(bp)		BF64_GET((bp)->blk_prop, 62, 1)
 #define	BP_SET_DEDUP(bp, x)		BF64_SET((bp)->blk_prop, 62, 1, x)
 
@@ -289,31 +398,39 @@ typedef struct blkptr {
 #define	BP_SET_BYTEORDER(bp, x)		BF64_SET((bp)->blk_prop, 63, 1, x)
 
 #define	BP_PHYSICAL_BIRTH(bp)		\
-	((bp)->blk_phys_birth ? (bp)->blk_phys_birth : (bp)->blk_birth)
+	(BP_IS_EMBEDDED(bp) ? 0 : \
+	(bp)->blk_phys_birth ? (bp)->blk_phys_birth : (bp)->blk_birth)
 
 #define	BP_SET_BIRTH(bp, logical, physical)	\
 {						\
+	ASSERT(!BP_IS_EMBEDDED(bp));		\
 	(bp)->blk_birth = (logical);		\
 	(bp)->blk_phys_birth = ((logical) == (physical) ? 0 : (physical)); \
 }
 
+#define	BP_GET_FILL(bp) (BP_IS_EMBEDDED(bp) ? 1 : (bp)->blk_fill)
+
 #define	BP_GET_ASIZE(bp)	\
-	(DVA_GET_ASIZE(&(bp)->blk_dva[0]) + DVA_GET_ASIZE(&(bp)->blk_dva[1]) + \
-		DVA_GET_ASIZE(&(bp)->blk_dva[2]))
+	(BP_IS_EMBEDDED(bp) ? 0 : \
+	DVA_GET_ASIZE(&(bp)->blk_dva[0]) + \
+	DVA_GET_ASIZE(&(bp)->blk_dva[1]) + \
+	DVA_GET_ASIZE(&(bp)->blk_dva[2]))
 
 #define	BP_GET_UCSIZE(bp) \
 	((BP_GET_LEVEL(bp) > 0 || DMU_OT_IS_METADATA(BP_GET_TYPE(bp))) ? \
 	BP_GET_PSIZE(bp) : BP_GET_LSIZE(bp))
 
 #define	BP_GET_NDVAS(bp)	\
-	(!!DVA_GET_ASIZE(&(bp)->blk_dva[0]) + \
+	(BP_IS_EMBEDDED(bp) ? 0 : \
+	!!DVA_GET_ASIZE(&(bp)->blk_dva[0]) + \
 	!!DVA_GET_ASIZE(&(bp)->blk_dva[1]) + \
 	!!DVA_GET_ASIZE(&(bp)->blk_dva[2]))
 
 #define	BP_COUNT_GANG(bp)	\
+	(BP_IS_EMBEDDED(bp) ? 0 : \
 	(DVA_GET_GANG(&(bp)->blk_dva[0]) + \
 	DVA_GET_GANG(&(bp)->blk_dva[1]) + \
-	DVA_GET_GANG(&(bp)->blk_dva[2]))
+	DVA_GET_GANG(&(bp)->blk_dva[2])))
 
 #define	DVA_EQUAL(dva1, dva2)	\
 	((dva1)->dva_word[1] == (dva2)->dva_word[1] && \
@@ -321,6 +438,7 @@ typedef struct blkptr {
 
 #define	BP_EQUAL(bp1, bp2)	\
 	(BP_PHYSICAL_BIRTH(bp1) == BP_PHYSICAL_BIRTH(bp2) &&	\
+	(bp1)->blk_birth == (bp2)->blk_birth &&			\
 	DVA_EQUAL(&(bp1)->blk_dva[0], &(bp2)->blk_dva[0]) &&	\
 	DVA_EQUAL(&(bp1)->blk_dva[1], &(bp2)->blk_dva[1]) &&	\
 	DVA_EQUAL(&(bp1)->blk_dva[2], &(bp2)->blk_dva[2]))
@@ -341,11 +459,13 @@ typedef struct blkptr {
 	(zcp)->zc_word[3] = w3;			\
 }
 
-#define	BP_IDENTITY(bp)		(&(bp)->blk_dva[0])
-#define	BP_IS_GANG(bp)		DVA_GET_GANG(BP_IDENTITY(bp))
+#define	BP_IDENTITY(bp)		(ASSERT(!BP_IS_EMBEDDED(bp)), &(bp)->blk_dva[0])
+#define	BP_IS_GANG(bp)		\
+	(BP_IS_EMBEDDED(bp) ? B_FALSE : DVA_GET_GANG(BP_IDENTITY(bp)))
 #define	DVA_IS_EMPTY(dva)	((dva)->dva_word[0] == 0ULL &&	\
 				(dva)->dva_word[1] == 0ULL)
-#define	BP_IS_HOLE(bp)		DVA_IS_EMPTY(BP_IDENTITY(bp))
+#define	BP_IS_HOLE(bp) \
+	(!BP_IS_EMBEDDED(bp) && DVA_IS_EMPTY(BP_IDENTITY(bp)))
 
 /* BP_IS_RAIDZ(bp) assumes no block compression */
 #define	BP_IS_RAIDZ(bp)		(DVA_GET_ASIZE(&(bp)->blk_dva[0]) > \
@@ -399,6 +519,17 @@ typedef struct blkptr {
 			    " birth=%lluL",				\
 			    (u_longlong_t)bp->blk_birth);		\
 		}							\
+	} else if (BP_IS_EMBEDDED(bp)) {				\
+		len = func(buf + len, size - len,			\
+		    "EMBEDDED [L%llu %s] et=%u %s "			\
+		    "size=%llxL/%llxP birth=%lluL",			\
+		    (u_longlong_t)BP_GET_LEVEL(bp),			\
+		    type,						\
+		    (int)BPE_GET_ETYPE(bp),				\
+		    compress,						\
+		    (u_longlong_t)BPE_GET_LSIZE(bp),			\
+		    (u_longlong_t)BPE_GET_PSIZE(bp),			\
+		    (u_longlong_t)bp->blk_birth);			\
 	} else {							\
 		for (int d = 0; d < BP_GET_NDVAS(bp); d++) {		\
 			const dva_t *dva = &bp->blk_dva[d];		\
@@ -432,7 +563,7 @@ typedef struct blkptr {
 		    (u_longlong_t)BP_GET_PSIZE(bp),			\
 		    (u_longlong_t)bp->blk_birth,			\
 		    (u_longlong_t)BP_PHYSICAL_BIRTH(bp),		\
-		    (u_longlong_t)bp->blk_fill,				\
+		    (u_longlong_t)BP_GET_FILL(bp),			\
 		    ws,							\
 		    (u_longlong_t)bp->blk_cksum.zc_word[0],		\
 		    (u_longlong_t)bp->blk_cksum.zc_word[1],		\
@@ -628,6 +759,7 @@ extern spa_load_state_t spa_load_state(spa_t *spa);
 extern uint64_t spa_freeze_txg(spa_t *spa);
 extern uint64_t spa_get_asize(spa_t *spa, uint64_t lsize);
 extern uint64_t spa_get_dspace(spa_t *spa);
+extern uint64_t spa_get_slop_space(spa_t *spa);
 extern void spa_update_dspace(spa_t *spa);
 extern uint64_t spa_version(spa_t *spa);
 extern boolean_t spa_deflate(spa_t *spa);
@@ -668,6 +800,7 @@ extern uint64_t bp_get_dsize(spa_t *spa, const blkptr_t *bp);
 extern boolean_t spa_has_slogs(spa_t *spa);
 extern boolean_t spa_is_root(spa_t *spa);
 extern boolean_t spa_writeable(spa_t *spa);
+extern boolean_t spa_has_pending_synctask(spa_t *spa);
 
 extern int spa_mode(spa_t *spa);
 extern uint64_t zfs_strtonum(const char *str, char **nptr);
@@ -689,7 +822,7 @@ extern void spa_history_log_internal_dd(dsl_dir_t *dd, const char *operation,
     dmu_tx_t *tx, const char *fmt, ...);
 
 /* error handling */
-struct zbookmark;
+struct zbookmark_phys;
 extern void spa_log_error(spa_t *spa, zio_t *zio);
 extern void zfs_ereport_post(const char *cls, spa_t *spa, vdev_t *vd,
     zio_t *zio, uint64_t stateoroffset, uint64_t length);
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 6fd44c89d971..a1943e72b038 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) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2013 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
  */
@@ -39,6 +39,7 @@
 #include <sys/refcount.h>
 #include <sys/bplist.h>
 #include <sys/bpobj.h>
+#include <sys/zfeature.h>
 #include <zfeature_common.h>
 
 #ifdef	__cplusplus
@@ -46,9 +47,9 @@ extern "C" {
 #endif
 
 typedef struct spa_error_entry {
-	zbookmark_t	se_bookmark;
-	char		*se_name;
-	avl_node_t	se_avl;
+	zbookmark_phys_t	se_bookmark;
+	char			*se_name;
+	avl_node_t		se_avl;
 } spa_error_entry_t;
 
 typedef struct spa_history_phys {
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 3691803306d8..67fa2767b1f8 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,7 +24,7 @@
  */
 
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_SPACE_MAP_H
@@ -44,9 +44,7 @@ extern "C" {
  * 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]))
+#define	SPACE_MAP_HISTOGRAM_SIZE	32
 
 /*
  * The space_map_phys is the on-disk representation of the space map.
@@ -68,7 +66,7 @@ typedef struct space_map_phys {
 	 * 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 */
+	uint64_t	smp_histogram[SPACE_MAP_HISTOGRAM_SIZE];
 } space_map_phys_t;
 
 /*
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 e96c1fa8aac1..77e2dba251cd 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) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_TXG_H
@@ -112,6 +112,7 @@ extern boolean_t txg_sync_waiting(struct dsl_pool *dp);
 extern void txg_list_create(txg_list_t *tl, size_t offset);
 extern void txg_list_destroy(txg_list_t *tl);
 extern boolean_t txg_list_empty(txg_list_t *tl, uint64_t txg);
+extern boolean_t txg_all_lists_empty(txg_list_t *tl);
 extern boolean_t txg_list_add(txg_list_t *tl, void *p, uint64_t txg);
 extern boolean_t txg_list_add_tail(txg_list_t *tl, void *p, uint64_t txg);
 extern void *txg_list_remove(txg_list_t *tl, uint64_t txg);
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 768d00e7236f..642a4c05d64e 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
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_VDEV_IMPL_H
@@ -253,8 +253,11 @@ struct vdev {
 #define	VDEV_PHYS_SIZE		(112 << 10)
 #define	VDEV_UBERBLOCK_RING	(128 << 10)
 
+/* The largest uberblock we support is 8k. */
+#define	MAX_UBERBLOCK_SHIFT (13)
 #define	VDEV_UBERBLOCK_SHIFT(vd)	\
-	MAX((vd)->vdev_top->vdev_ashift, UBERBLOCK_SHIFT)
+	MIN(MAX((vd)->vdev_top->vdev_ashift, UBERBLOCK_SHIFT), \
+	    MAX_UBERBLOCK_SHIFT)
 #define	VDEV_UBERBLOCK_COUNT(vd)	\
 	(VDEV_UBERBLOCK_RING >> VDEV_UBERBLOCK_SHIFT(vd))
 #define	VDEV_UBERBLOCK_OFFSET(vd, n)	\
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
index f55251f85728..6dc521baef13 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_ZFS_DEBUG_H
@@ -49,15 +49,17 @@ extern "C" {
 #endif
 
 extern int zfs_flags;
-extern int zfs_recover;
+extern boolean_t zfs_recover;
+extern boolean_t zfs_free_leak_on_eio;
 
-#define	ZFS_DEBUG_DPRINTF	(1<<0)
-#define	ZFS_DEBUG_DBUF_VERIFY	(1<<1)
-#define	ZFS_DEBUG_DNODE_VERIFY	(1<<2)
-#define	ZFS_DEBUG_SNAPNAMES	(1<<3)
-#define	ZFS_DEBUG_MODIFY	(1<<4)
-#define	ZFS_DEBUG_SPA		(1<<5)
-#define	ZFS_DEBUG_ZIO_FREE	(1<<6)
+#define	ZFS_DEBUG_DPRINTF		(1<<0)
+#define	ZFS_DEBUG_DBUF_VERIFY		(1<<1)
+#define	ZFS_DEBUG_DNODE_VERIFY		(1<<2)
+#define	ZFS_DEBUG_SNAPNAMES		(1<<3)
+#define	ZFS_DEBUG_MODIFY		(1<<4)
+#define	ZFS_DEBUG_SPA			(1<<5)
+#define	ZFS_DEBUG_ZIO_FREE		(1<<6)
+#define	ZFS_DEBUG_HISTOGRAM_VERIFY	(1<<7)
 
 #ifdef ZFS_DEBUG
 extern void __dprintf(const char *file, const char *func,
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
index af2def2da677..73fbf3c9c0ea 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.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_ZFS_IOCTL_H
@@ -79,15 +79,19 @@ typedef enum drr_headertype {
  * Feature flags for zfs send streams (flags in drr_versioninfo)
  */
 
-#define	DMU_BACKUP_FEATURE_DEDUP	(0x1)
-#define	DMU_BACKUP_FEATURE_DEDUPPROPS	(0x2)
-#define	DMU_BACKUP_FEATURE_SA_SPILL	(0x4)
+#define	DMU_BACKUP_FEATURE_DEDUP		(1<<0)
+#define	DMU_BACKUP_FEATURE_DEDUPPROPS		(1<<1)
+#define	DMU_BACKUP_FEATURE_SA_SPILL		(1<<2)
+/* flags #3 - #15 are reserved for incompatible closed-source implementations */
+#define	DMU_BACKUP_FEATURE_EMBED_DATA		(1<<16)
+#define	DMU_BACKUP_FEATURE_EMBED_DATA_LZ4	(1<<17)
 
 /*
  * Mask of all supported backup features
  */
 #define	DMU_BACKUP_FEATURE_MASK	(DMU_BACKUP_FEATURE_DEDUP | \
-		DMU_BACKUP_FEATURE_DEDUPPROPS | DMU_BACKUP_FEATURE_SA_SPILL)
+    DMU_BACKUP_FEATURE_DEDUPPROPS | DMU_BACKUP_FEATURE_SA_SPILL | \
+    DMU_BACKUP_FEATURE_EMBED_DATA | DMU_BACKUP_FEATURE_EMBED_DATA_LZ4)
 
 /* Are all features in the given flag word currently supported? */
 #define	DMU_STREAM_SUPPORTED(x)	(!((x) & ~DMU_BACKUP_FEATURE_MASK))
@@ -210,7 +214,7 @@ typedef struct dmu_replay_record {
 	enum {
 		DRR_BEGIN, DRR_OBJECT, DRR_FREEOBJECTS,
 		DRR_WRITE, DRR_FREE, DRR_END, DRR_WRITE_BYREF,
-		DRR_SPILL, DRR_NUMTYPES
+		DRR_SPILL, DRR_WRITE_EMBEDDED, DRR_NUMTYPES
 	} drr_type;
 	uint32_t drr_payloadlen;
 	union {
@@ -222,6 +226,19 @@ typedef struct dmu_replay_record {
 		struct drr_free drr_free;
 		struct drr_write_byref drr_write_byref;
 		struct drr_spill drr_spill;
+		struct drr_write_embedded {
+			uint64_t drr_object;
+			uint64_t drr_offset;
+			/* logical length, should equal blocksize */
+			uint64_t drr_length;
+			uint64_t drr_toguid;
+			uint8_t drr_compression;
+			uint8_t drr_etype;
+			uint8_t drr_pad[6];
+			uint32_t drr_lsize; /* uncompressed size of payload */
+			uint32_t drr_psize; /* compr. (real) size of payload */
+			/* (possibly compressed) content follows */
+		} drr_write_embedded;
 	} drr_u;
 } dmu_replay_record_t;
 
@@ -324,8 +341,8 @@ typedef struct zfs_cmd {
 	dmu_objset_stats_t zc_objset_stats;
 	struct drr_begin zc_begin_record;
 	zinject_record_t zc_inject_record;
-	boolean_t	zc_defer_destroy;
-	boolean_t	zc_temphold;
+	uint32_t	zc_defer_destroy;
+	uint32_t	zc_flags;
 	uint64_t	zc_action_handle;
 	int		zc_cleanup_fd;
 	uint8_t		zc_simple;
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
index 65da239e7ddb..412088324aba 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
@@ -64,7 +64,7 @@ struct zfsvfs {
 	int		z_norm;		/* normalization flags */
 	boolean_t	z_atime;	/* enable atimes mount option */
 	boolean_t	z_unmounted;	/* unmounted */
-	rrwlock_t	z_teardown_lock;
+	rrmlock_t	z_teardown_lock;
 	krwlock_t	z_teardown_inactive_lock;
 	list_t		z_all_znodes;	/* all vnodes in the fs */
 	kmutex_t	z_znodes_lock;	/* lock for z_all_znodes */
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
index 3439641d7889..dae099b7915b 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
@@ -256,7 +256,7 @@ VTOZ(vnode_t *vp)
 /* Called on entry to each ZFS vnode and vfs operation  */
 #define	ZFS_ENTER(zfsvfs) \
 	{ \
-		rrw_enter_read(&(zfsvfs)->z_teardown_lock, FTAG); \
+		rrm_enter_read(&(zfsvfs)->z_teardown_lock, FTAG); \
 		if ((zfsvfs)->z_unmounted) { \
 			ZFS_EXIT(zfsvfs); \
 			return (EIO); \
@@ -265,10 +265,10 @@ VTOZ(vnode_t *vp)
 
 /* Called on entry to each ZFS vnode and vfs operation that can not return EIO */
 #define	ZFS_ENTER_NOERROR(zfsvfs) \
-	rrw_enter(&(zfsvfs)->z_teardown_lock, RW_READER, FTAG)
+	rrm_enter(&(zfsvfs)->z_teardown_lock, RW_READER, FTAG)
 
 /* Must be called before exiting the vop */
-#define	ZFS_EXIT(zfsvfs) rrw_exit(&(zfsvfs)->z_teardown_lock, FTAG)
+#define	ZFS_EXIT(zfsvfs) rrm_exit(&(zfsvfs)->z_teardown_lock, FTAG)
 
 /* Verifies the znode is valid */
 #define	ZFS_VERIFY_ZP(zp) \
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 84187a843b17..df7edf4c1c65 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
@@ -22,8 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  */
 
@@ -85,6 +84,12 @@ enum zio_checksum {
 	ZIO_CHECKSUM_FUNCTIONS
 };
 
+/*
+ * The number of "legacy" compression functions which can be set on individual
+ * objects.
+ */
+#define	ZIO_CHECKSUM_LEGACY_FUNCTIONS ZIO_CHECKSUM_ZILOG2
+
 #define	ZIO_CHECKSUM_ON_VALUE	ZIO_CHECKSUM_FLETCHER_4
 #define	ZIO_CHECKSUM_DEFAULT	ZIO_CHECKSUM_ON
 
@@ -114,6 +119,12 @@ enum zio_compress {
 	ZIO_COMPRESS_FUNCTIONS
 };
 
+/*
+ * The number of "legacy" compression functions which can be set on individual
+ * objects.
+ */
+#define	ZIO_COMPRESS_LEGACY_FUNCTIONS ZIO_COMPRESS_LZ4
+
 /* N.B. when altering this value, also change BOOTFS_COMPRESS_VALID below */
 #define	ZIO_COMPRESS_ON_VALUE	ZIO_COMPRESS_LZJB
 #define	ZIO_COMPRESS_DEFAULT	ZIO_COMPRESS_OFF
@@ -155,19 +166,20 @@ enum zio_flag {
 	ZIO_FLAG_RESILVER	= 1 << 3,
 	ZIO_FLAG_SCRUB		= 1 << 4,
 	ZIO_FLAG_SCAN_THREAD	= 1 << 5,
+	ZIO_FLAG_PHYSICAL	= 1 << 6,
 
 #define	ZIO_FLAG_AGG_INHERIT	(ZIO_FLAG_CANFAIL - 1)
 
 	/*
 	 * Flags inherited by ddt, gang, and vdev children.
 	 */
-	ZIO_FLAG_CANFAIL	= 1 << 6,	/* must be first for INHERIT */
-	ZIO_FLAG_SPECULATIVE	= 1 << 7,
-	ZIO_FLAG_CONFIG_WRITER	= 1 << 8,
-	ZIO_FLAG_DONT_RETRY	= 1 << 9,
-	ZIO_FLAG_DONT_CACHE	= 1 << 10,
-	ZIO_FLAG_NODATA		= 1 << 11,
-	ZIO_FLAG_INDUCE_DAMAGE	= 1 << 12,
+	ZIO_FLAG_CANFAIL	= 1 << 7,	/* must be first for INHERIT */
+	ZIO_FLAG_SPECULATIVE	= 1 << 8,
+	ZIO_FLAG_CONFIG_WRITER	= 1 << 9,
+	ZIO_FLAG_DONT_RETRY	= 1 << 10,
+	ZIO_FLAG_DONT_CACHE	= 1 << 11,
+	ZIO_FLAG_NODATA		= 1 << 12,
+	ZIO_FLAG_INDUCE_DAMAGE	= 1 << 13,
 
 #define	ZIO_FLAG_DDT_INHERIT	(ZIO_FLAG_IO_RETRY - 1)
 #define	ZIO_FLAG_GANG_INHERIT	(ZIO_FLAG_IO_RETRY - 1)
@@ -175,28 +187,27 @@ enum zio_flag {
 	/*
 	 * Flags inherited by vdev children.
 	 */
-	ZIO_FLAG_IO_RETRY	= 1 << 13,	/* must be first for INHERIT */
-	ZIO_FLAG_PROBE		= 1 << 14,
-	ZIO_FLAG_TRYHARD	= 1 << 15,
-	ZIO_FLAG_OPTIONAL	= 1 << 16,
+	ZIO_FLAG_IO_RETRY	= 1 << 14,	/* must be first for INHERIT */
+	ZIO_FLAG_PROBE		= 1 << 15,
+	ZIO_FLAG_TRYHARD	= 1 << 16,
+	ZIO_FLAG_OPTIONAL	= 1 << 17,
 
 #define	ZIO_FLAG_VDEV_INHERIT	(ZIO_FLAG_DONT_QUEUE - 1)
 
 	/*
 	 * Flags not inherited by any children.
 	 */
-	ZIO_FLAG_DONT_QUEUE	= 1 << 17,	/* must be first for INHERIT */
-	ZIO_FLAG_DONT_PROPAGATE	= 1 << 18,
-	ZIO_FLAG_IO_BYPASS	= 1 << 19,
-	ZIO_FLAG_IO_REWRITE	= 1 << 20,
-	ZIO_FLAG_RAW		= 1 << 21,
-	ZIO_FLAG_GANG_CHILD	= 1 << 22,
-	ZIO_FLAG_DDT_CHILD	= 1 << 23,
-	ZIO_FLAG_GODFATHER	= 1 << 24,
-	ZIO_FLAG_NOPWRITE	= 1 << 25,
-	ZIO_FLAG_REEXECUTED	= 1 << 26,
-	ZIO_FLAG_DELEGATED	= 1 << 27,
-	ZIO_FLAG_QUEUE_IO_DONE	= 1 << 28,
+	ZIO_FLAG_DONT_QUEUE	= 1 << 18,	/* must be first for INHERIT */
+	ZIO_FLAG_DONT_PROPAGATE	= 1 << 19,
+	ZIO_FLAG_IO_BYPASS	= 1 << 20,
+	ZIO_FLAG_IO_REWRITE	= 1 << 21,
+	ZIO_FLAG_RAW		= 1 << 22,
+	ZIO_FLAG_GANG_CHILD	= 1 << 23,
+	ZIO_FLAG_DDT_CHILD	= 1 << 24,
+	ZIO_FLAG_GODFATHER	= 1 << 25,
+	ZIO_FLAG_NOPWRITE	= 1 << 26,
+	ZIO_FLAG_REEXECUTED	= 1 << 27,
+	ZIO_FLAG_DELEGATED	= 1 << 28,
 };
 
 #define	ZIO_FLAG_MUSTSUCCEED		0
@@ -252,16 +263,16 @@ extern const char *zio_type_name[ZIO_TYPES];
  * Note: this structure is called a bookmark because its original purpose
  * was to remember where to resume a pool-wide traverse.
  *
- * Note: this structure is passed between userland and the kernel.
- * Therefore it must not change size or alignment between 32/64 bit
- * compilation options.
+ * Note: this structure is passed between userland and the kernel, and is
+ * stored on disk (by virtue of being incorporated into other on-disk
+ * structures, e.g. dsl_scan_phys_t).
  */
-typedef struct zbookmark {
+typedef struct zbookmark_phys {
 	uint64_t	zb_objset;
 	uint64_t	zb_object;
 	int64_t		zb_level;
 	uint64_t	zb_blkid;
-} zbookmark_t;
+} zbookmark_phys_t;
 
 #define	SET_BOOKMARK(zb, objset, object, level, blkid)  \
 {                                                       \
@@ -351,7 +362,7 @@ typedef struct zio_transform {
 	struct zio_transform	*zt_next;
 } zio_transform_t;
 
-typedef int zio_pipe_stage_t(zio_t **ziop);
+typedef int zio_pipe_stage_t(zio_t *zio);
 
 /*
  * The io_reexecute flags are distinct from io_flags because the child must
@@ -405,7 +416,7 @@ extern zio_trim_stats_t zio_trim_stats;
 
 struct zio {
 	/* Core information about this I/O */
-	zbookmark_t	io_bookmark;
+	zbookmark_phys_t	io_bookmark;
 	zio_prop_t	io_prop;
 	zio_type_t	io_type;
 	enum zio_child	io_child_type;
@@ -487,17 +498,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,
-    zio_priority_t priority, enum zio_flag flags, const zbookmark_t *zb);
+    zio_priority_t priority, enum zio_flag flags, const zbookmark_phys_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 *physdone, zio_done_func_t *done,
     void *priv,
-    zio_priority_t priority, enum zio_flag flags, const zbookmark_t *zb);
+    zio_priority_t priority, enum zio_flag flags, const zbookmark_phys_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,
-    zio_priority_t priority, enum zio_flag flags, zbookmark_t *zb);
+    zio_priority_t priority, enum zio_flag flags, zbookmark_phys_t *zb);
 
 extern void zio_write_override(zio_t *zio, blkptr_t *bp, int copies,
     boolean_t nopwrite);
@@ -619,9 +630,9 @@ extern void zfs_ereport_post_checksum(spa_t *spa, vdev_t *vd,
 /* Called from spa_sync(), but primarily an injection handler */
 extern void spa_handle_ignored_writes(spa_t *spa);
 
-/* zbookmark functions */
+/* zbookmark_phys functions */
 boolean_t zbookmark_is_before(const struct dnode_phys *dnp,
-    const zbookmark_t *zb1, const zbookmark_t *zb2);
+    const zbookmark_phys_t *zb1, const zbookmark_phys_t *zb2);
 
 #ifdef	__cplusplus
 }
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 c0be314e63bb..a617735315f2 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
@@ -81,7 +81,7 @@ extern int lz4_decompress(void *src, void *dst, size_t s_len, size_t d_len,
  * Compress and decompress data if necessary.
  */
 extern size_t zio_compress_data(enum zio_compress c, void *src, void *dst,
-    size_t s_len, size_t minblocksize);
+    size_t s_len);
 extern int zio_decompress_data(enum zio_compress c, void *src, void *dst,
     size_t s_len, size_t d_len);
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
index 7e981993ca46..5c52042a0149 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
@@ -85,31 +85,22 @@ static u_int trim_vdev_max_pending = 64;
 SYSCTL_DECL(_vfs_zfs);
 SYSCTL_NODE(_vfs_zfs, OID_AUTO, trim, CTLFLAG_RD, 0, "ZFS TRIM");
 
-TUNABLE_INT("vfs.zfs.trim.txg_delay", &trim_txg_delay);
 SYSCTL_UINT(_vfs_zfs_trim, OID_AUTO, txg_delay, CTLFLAG_RWTUN, &trim_txg_delay,
     0, "Delay TRIMs by up to this many TXGs");
-
-TUNABLE_INT("vfs.zfs.trim.timeout", &trim_timeout);
 SYSCTL_UINT(_vfs_zfs_trim, OID_AUTO, timeout, CTLFLAG_RWTUN, &trim_timeout, 0,
     "Delay TRIMs by up to this many seconds");
-
-TUNABLE_INT("vfs.zfs.trim.max_interval", &trim_max_interval);
 SYSCTL_UINT(_vfs_zfs_trim, OID_AUTO, max_interval, CTLFLAG_RWTUN,
     &trim_max_interval, 0,
     "Maximum interval between TRIM queue processing (seconds)");
 
 SYSCTL_DECL(_vfs_zfs_vdev);
-TUNABLE_QUAD("vfs.zfs.vdev.trim_max_bytes", &trim_vdev_max_bytes);
 SYSCTL_QUAD(_vfs_zfs_vdev, OID_AUTO, trim_max_bytes, CTLFLAG_RWTUN,
     &trim_vdev_max_bytes, 0,
     "Maximum pending TRIM bytes for a vdev");
-
-TUNABLE_INT("vfs.zfs.vdev.trim_max_pending", &trim_vdev_max_pending);
 SYSCTL_UINT(_vfs_zfs_vdev, OID_AUTO, trim_max_pending, CTLFLAG_RWTUN,
     &trim_vdev_max_pending, 0,
     "Maximum pending TRIM segments for a vdev");
 
-
 static void trim_map_vdev_commit_done(spa_t *spa, vdev_t *vd);
 
 static int
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 0201bef3ae9d..5ab32326cd9c 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright 2011 Martin Matuska <mm@FreeBSD.org>
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
@@ -112,8 +112,7 @@ int zfs_txg_timeout = 5;	/* max seconds worth of delta per txg */
 
 SYSCTL_DECL(_vfs_zfs);
 SYSCTL_NODE(_vfs_zfs, OID_AUTO, txg, CTLFLAG_RW, 0, "ZFS TXG");
-TUNABLE_INT("vfs.zfs.txg.timeout", &zfs_txg_timeout);
-SYSCTL_INT(_vfs_zfs_txg, OID_AUTO, timeout, CTLFLAG_RW, &zfs_txg_timeout, 0,
+SYSCTL_INT(_vfs_zfs_txg, OID_AUTO, timeout, CTLFLAG_RWTUN, &zfs_txg_timeout, 0,
     "Maximum seconds worth of delta per txg");
 
 /*
@@ -726,6 +725,24 @@ txg_list_empty(txg_list_t *tl, uint64_t txg)
 	return (tl->tl_head[txg & TXG_MASK] == NULL);
 }
 
+/*
+ * Returns true if all txg lists are empty.
+ *
+ * Warning: this is inherently racy (an item could be added immediately after this
+ * function returns). We don't bother with the lock because it wouldn't change the
+ * semantics.
+ */
+boolean_t
+txg_all_lists_empty(txg_list_t *tl)
+{
+	for (int i = 0; i < TXG_SIZE; i++) {
+		if (!txg_list_empty(tl, i)) {
+			return (B_FALSE);
+		}
+	}
+	return (B_TRUE);
+}
+
 /*
  * Add an entry to the list (unless it's already on the list).
  * Returns B_TRUE if it was actually added.
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 9c26d2c6e505..0c599b172d60 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
@@ -2257,6 +2257,11 @@ vdev_remove(vdev_t *vd, uint64_t txg)
 	tx = dmu_tx_create_assigned(spa_get_dsl(spa), txg);
 
 	if (vd->vdev_ms != NULL) {
+		metaslab_group_t *mg = vd->vdev_mg;
+
+		metaslab_group_histogram_verify(mg);
+		metaslab_class_histogram_verify(mg->mg_class);
+
 		for (int m = 0; m < vd->vdev_ms_count; m++) {
 			metaslab_t *msp = vd->vdev_ms[m];
 
@@ -2264,12 +2269,27 @@ vdev_remove(vdev_t *vd, uint64_t txg)
 				continue;
 
 			mutex_enter(&msp->ms_lock);
+			/*
+			 * If the metaslab was not loaded when the vdev
+			 * was removed then the histogram accounting may
+			 * not be accurate. Update the histogram information
+			 * here so that we ensure that the metaslab group
+			 * and metaslab class are up-to-date.
+			 */
+			metaslab_group_histogram_remove(mg, msp);
+
 			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);
 		}
+
+		metaslab_group_histogram_verify(mg);
+		metaslab_class_histogram_verify(mg->mg_class);
+		for (int i = 0; i < RANGE_TREE_HISTOGRAM_SIZE; i++)
+			ASSERT0(mg->mg_histogram[i]);
+
 	}
 
 	if (vd->vdev_ms_array) {
@@ -2729,7 +2749,10 @@ vdev_accessible(vdev_t *vd, zio_t *zio)
 void
 vdev_get_stats(vdev_t *vd, vdev_stat_t *vs)
 {
-	vdev_t *rvd = vd->vdev_spa->spa_root_vdev;
+	spa_t *spa = vd->vdev_spa;
+	vdev_t *rvd = spa->spa_root_vdev;
+
+	ASSERT(spa_config_held(spa, SCL_ALL, RW_READER) != 0);
 
 	mutex_enter(&vd->vdev_stat_lock);
 	bcopy(&vd->vdev_stat, vs, sizeof (*vs));
@@ -2743,7 +2766,9 @@ vdev_get_stats(vdev_t *vd, vdev_stat_t *vs)
 	    ? vd->vdev_top->vdev_ashift : vd->vdev_ashift;
 	vs->vs_logical_ashift = vd->vdev_logical_ashift;
 	vs->vs_physical_ashift = vd->vdev_physical_ashift;
-	mutex_exit(&vd->vdev_stat_lock);
+	if (vd->vdev_aux == NULL && vd == vd->vdev_top && !vd->vdev_ishole) {
+		vs->vs_fragmentation = vd->vdev_mg->mg_fragmentation;
+	}
 
 	/*
 	 * If we're getting stats on the root vdev, aggregate the I/O counts
@@ -2754,15 +2779,14 @@ vdev_get_stats(vdev_t *vd, vdev_stat_t *vs)
 			vdev_t *cvd = rvd->vdev_child[c];
 			vdev_stat_t *cvs = &cvd->vdev_stat;
 
-			mutex_enter(&vd->vdev_stat_lock);
 			for (int t = 0; t < ZIO_TYPES; t++) {
 				vs->vs_ops[t] += cvs->vs_ops[t];
 				vs->vs_bytes[t] += cvs->vs_bytes[t];
 			}
 			cvs->vs_scan_removing = cvd->vdev_removing;
-			mutex_exit(&vd->vdev_stat_lock);
 		}
 	}
+	mutex_exit(&vd->vdev_stat_lock);
 }
 
 void
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 2ad15fe8227e..a3e9b02a71ce 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
@@ -90,13 +90,10 @@ int zfs_vdev_cache_bshift = 16;
 
 SYSCTL_DECL(_vfs_zfs_vdev);
 SYSCTL_NODE(_vfs_zfs_vdev, OID_AUTO, cache, CTLFLAG_RW, 0, "ZFS VDEV Cache");
-TUNABLE_INT("vfs.zfs.vdev.cache.max", &zfs_vdev_cache_max);
 SYSCTL_INT(_vfs_zfs_vdev_cache, OID_AUTO, max, CTLFLAG_RDTUN,
     &zfs_vdev_cache_max, 0, "Maximum I/O request size that increase read size");
-TUNABLE_INT("vfs.zfs.vdev.cache.size", &zfs_vdev_cache_size);
 SYSCTL_INT(_vfs_zfs_vdev_cache, OID_AUTO, size, CTLFLAG_RDTUN,
     &zfs_vdev_cache_size, 0, "Size of VDEV cache");
-TUNABLE_INT("vfs.zfs.vdev.cache.bshift", &zfs_vdev_cache_bshift);
 SYSCTL_INT(_vfs_zfs_vdev_cache, OID_AUTO, bshift, CTLFLAG_RDTUN,
     &zfs_vdev_cache_bshift, 0, "Turn too small requests into 1 << this value");
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
index 90c9b9669873..1caff2c554c6 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
@@ -684,7 +684,7 @@ vdev_disk_io_intr(buf_t *bp)
 	 * Rather than teach the rest of the stack about other error
 	 * possibilities (EFAULT, etc), we normalize the error value here.
 	 */
-	zio->io_error = (geterror(bp) != 0 ? EIO : 0);
+	zio->io_error = (geterror(bp) != 0 ? SET_ERROR(EIO) : 0);
 
 	if (zio->io_error == 0 && bp->b_resid != 0)
 		zio->io_error = SET_ERROR(EIO);
@@ -730,15 +730,17 @@ vdev_disk_io_start(zio_t *zio)
 	 * Nothing to be done here but return failure.
 	 */
 	if (dvd == NULL || (dvd->vd_ldi_offline && dvd->vd_lh == NULL)) {
-		zio->io_error = ENXIO;
-		return (ZIO_PIPELINE_CONTINUE);
+		zio->io_error = SET_ERROR(ENXIO);
+		zio_interrupt(zio);
+		return (ZIO_PIPELINE_STOP);
 	}
 
 	if (zio->io_type == ZIO_TYPE_IOCTL) {
 		/* XXPOLICY */
 		if (!vdev_readable(vd)) {
 			zio->io_error = SET_ERROR(ENXIO);
-			return (ZIO_PIPELINE_CONTINUE);
+			zio_interrupt(zio);
+			return (ZIO_PIPELINE_STOP);
 		}
 
 		switch (zio->io_cmd) {
@@ -790,7 +792,8 @@ vdev_disk_io_start(zio_t *zio)
 			zio->io_error = SET_ERROR(ENOTSUP);
 		}
 
-		return (ZIO_PIPELINE_CONTINUE);
+		zio_interrupt(zio);
+		return (ZIO_PIPELINE_STOP);
 	}
 
 	vb = kmem_alloc(sizeof (vdev_buf_t), KM_SLEEP);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
index 1d8fa5cbe40e..ab492d80640a 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
@@ -164,7 +164,8 @@ vdev_file_io_start(zio_t *zio)
 
 	if (!vdev_readable(vd)) {
 		zio->io_error = SET_ERROR(ENXIO);
-		return (ZIO_PIPELINE_CONTINUE);
+		zio_interrupt(zio);
+		return (ZIO_PIPELINE_STOP);
 	}
 
 	vf = vd->vdev_tsd;
@@ -180,7 +181,8 @@ vdev_file_io_start(zio_t *zio)
 			zio->io_error = SET_ERROR(ENOTSUP);
 		}
 
-		return (ZIO_PIPELINE_CONTINUE);
+		zio_interrupt(zio);
+		return (ZIO_PIPELINE_STOP);
 	}
 
 	zio->io_error = vn_rdwr(zio->io_type == ZIO_TYPE_READ ?
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 b64ebddbcb1a..b28125ef60b0 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
@@ -53,14 +53,12 @@ DECLARE_GEOM_CLASS(zfs_vdev_class, zfs_vdev);
 
 SYSCTL_DECL(_vfs_zfs_vdev);
 /* Don't send BIO_FLUSH. */
-static int vdev_geom_bio_flush_disable = 0;
-TUNABLE_INT("vfs.zfs.vdev.bio_flush_disable", &vdev_geom_bio_flush_disable);
-SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, bio_flush_disable, CTLFLAG_RW,
+static int vdev_geom_bio_flush_disable;
+SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, bio_flush_disable, CTLFLAG_RWTUN,
     &vdev_geom_bio_flush_disable, 0, "Disable BIO_FLUSH");
 /* Don't send BIO_DELETE. */
-static int vdev_geom_bio_delete_disable = 0;
-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,
+static int vdev_geom_bio_delete_disable;
+SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, bio_delete_disable, CTLFLAG_RWTUN,
     &vdev_geom_bio_delete_disable, 0, "Disable BIO_DELETE");
 
 static void
@@ -751,7 +749,7 @@ vdev_geom_io_intr(struct bio *bp)
 	vd = zio->io_vd;
 	zio->io_error = bp->bio_error;
 	if (zio->io_error == 0 && bp->bio_resid != 0)
-		zio->io_error = EIO;
+		zio->io_error = SET_ERROR(EIO);
 
 	switch(zio->io_error) {
 	case ENOTSUP:
@@ -805,37 +803,38 @@ vdev_geom_io_start(zio_t *zio)
 		/* XXPOLICY */
 		if (!vdev_readable(vd)) {
 			zio->io_error = SET_ERROR(ENXIO);
-			return (ZIO_PIPELINE_CONTINUE);
-		}
-
-		switch (zio->io_cmd) {
-		case DKIOCFLUSHWRITECACHE:
-			if (zfs_nocacheflush || vdev_geom_bio_flush_disable)
-				break;
-			if (vd->vdev_nowritecache) {
+		} else {
+			switch (zio->io_cmd) {
+			case DKIOCFLUSHWRITECACHE:
+				if (zfs_nocacheflush || vdev_geom_bio_flush_disable)
+					break;
+				if (vd->vdev_nowritecache) {
+					zio->io_error = SET_ERROR(ENOTSUP);
+					break;
+				}
+				goto sendreq;
+			default:
 				zio->io_error = SET_ERROR(ENOTSUP);
-				break;
 			}
-			goto sendreq;
-		default:
-			zio->io_error = SET_ERROR(ENOTSUP);
 		}
 
-		return (ZIO_PIPELINE_CONTINUE);
+		zio_interrupt(zio);
+		return (ZIO_PIPELINE_STOP);
 	case ZIO_TYPE_FREE:
-		if (vdev_geom_bio_delete_disable)
-			return (ZIO_PIPELINE_CONTINUE);
-
 		if (vd->vdev_notrim) {
 			zio->io_error = SET_ERROR(ENOTSUP);
-			return (ZIO_PIPELINE_CONTINUE);
+		} else if (!vdev_geom_bio_delete_disable) {
+			goto sendreq;
 		}
+		zio_interrupt(zio);
+		return (ZIO_PIPELINE_STOP);
 	}
 sendreq:
 	cp = vd->vdev_tsd;
 	if (cp == NULL) {
 		zio->io_error = SET_ERROR(ENXIO);
-		return (ZIO_PIPELINE_CONTINUE);
+		zio_interrupt(zio);
+		return (ZIO_PIPELINE_STOP);
 	}
 	bp = g_alloc_bio();
 	bp->bio_caller1 = zio;
@@ -854,14 +853,11 @@ vdev_geom_io_start(zio_t *zio)
 		bp->bio_length = zio->io_size;
 		break;
 	case ZIO_TYPE_IOCTL:
-		if (zio->io_cmd == DKIOCFLUSHWRITECACHE) {
-			bp->bio_cmd = BIO_FLUSH;
-			bp->bio_flags |= BIO_ORDERED;
-			bp->bio_data = NULL;
-			bp->bio_offset = cp->provider->mediasize;
-			bp->bio_length = 0;
-			break;
-		}
+		bp->bio_cmd = BIO_FLUSH;
+		bp->bio_flags |= BIO_ORDERED;
+		bp->bio_data = NULL;
+		bp->bio_offset = cp->provider->mediasize;
+		bp->bio_length = 0;
 		break;
 	}
 	bp->bio_done = vdev_geom_io_intr;
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 0b8d449f4aa1..2fefa609ac0c 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
@@ -74,32 +74,26 @@ static SYSCTL_NODE(_vfs_zfs_vdev, OID_AUTO, mirror, CTLFLAG_RD, 0,
 
 /* 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,
+SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_inc, CTLFLAG_RWTUN,
     &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,
+SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_seek_inc, CTLFLAG_RWTUN,
     &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,
+SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_seek_offset, CTLFLAG_RWTUN,
     &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,
+SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, non_rotating_inc, CTLFLAG_RWTUN,
     &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,
+SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, non_rotating_seek_inc, CTLFLAG_RWTUN,
     &non_rotating_seek_inc, 0,
     "Non-rotating media load increment for seeking I/O's");
 
@@ -456,7 +450,8 @@ vdev_mirror_io_start(zio_t *zio)
 				    zio->io_type, zio->io_priority, 0,
 				    vdev_mirror_scrub_done, mc));
 			}
-			return (ZIO_PIPELINE_CONTINUE);
+			zio_interrupt(zio);
+			return (ZIO_PIPELINE_STOP);
 		}
 		/*
 		 * For normal reads just pick one child.
@@ -483,7 +478,8 @@ vdev_mirror_io_start(zio_t *zio)
 		c++;
 	}
 
-	return (ZIO_PIPELINE_CONTINUE);
+	zio_interrupt(zio);
+	return (ZIO_PIPELINE_STOP);
 }
 
 static int
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c
index 3088ab9e767c..fec0037b2b1c 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c
@@ -71,7 +71,8 @@ static int
 vdev_missing_io_start(zio_t *zio)
 {
 	zio->io_error = SET_ERROR(ENOTSUP);
-	return (ZIO_PIPELINE_CONTINUE);
+	zio_interrupt(zio);
+	return (ZIO_PIPELINE_STOP);
 }
 
 /* ARGSUSED */
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 60fd4c3eedf2..3071d5aa6d2f 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,7 +24,7 @@
  */
 
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
@@ -176,23 +176,18 @@ int zfs_vdev_write_gap_limit = 4 << 10;
 
 #ifdef __FreeBSD__
 SYSCTL_DECL(_vfs_zfs_vdev);
-TUNABLE_INT("vfs.zfs.vdev.max_active", &zfs_vdev_max_active);
-SYSCTL_UINT(_vfs_zfs_vdev, OID_AUTO, max_active, CTLFLAG_RW,
+SYSCTL_UINT(_vfs_zfs_vdev, OID_AUTO, max_active, CTLFLAG_RWTUN,
     &zfs_vdev_max_active, 0,
     "The maximum number of I/Os of all types active for each device.");
 
 #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,	\
+SYSCTL_UINT(_vfs_zfs_vdev, OID_AUTO, name ## _min_active, CTLFLAG_RWTUN,\
     &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,	\
+SYSCTL_UINT(_vfs_zfs_vdev, OID_AUTO, name ## _max_active, CTLFLAG_RWTUN,\
     &zfs_vdev_ ## name ## _max_active, 0,				\
     "Maximum number of I/O requests of type " #name			\
     " active for each device");
@@ -212,16 +207,13 @@ ZFS_VDEV_QUEUE_KNOB_MAX(trim);
 
 #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,
+SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, aggregation_limit, CTLFLAG_RWTUN,
     &zfs_vdev_aggregation_limit, 0,
     "I/O requests are aggregated up to this size");
-TUNABLE_INT("vfs.zfs.vdev.read_gap_limit", &zfs_vdev_read_gap_limit);
-SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, read_gap_limit, CTLFLAG_RW,
+SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, read_gap_limit, CTLFLAG_RWTUN,
     &zfs_vdev_read_gap_limit, 0,
     "Acceptable gap between two reads being aggregated");
-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,
+SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, write_gap_limit, CTLFLAG_RWTUN,
     &zfs_vdev_write_gap_limit, 0,
     "Acceptable gap between two writes being aggregated");
 #endif
@@ -424,14 +416,23 @@ vdev_queue_class_min_active(zio_priority_t p)
 }
 
 static int
-vdev_queue_max_async_writes(uint64_t dirty)
+vdev_queue_max_async_writes(spa_t *spa)
 {
 	int writes;
+	uint64_t dirty = spa->spa_dsl_pool->dp_dirty_total;
 	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;
 
+	/*
+	 * Sync tasks correspond to interactive user actions. To reduce the
+	 * execution time of those actions we push data out as fast as possible.
+	 */
+	if (spa_has_pending_synctask(spa)) {
+		return (zfs_vdev_async_write_max_active);
+	}
+
 	if (dirty < min_bytes)
 		return (zfs_vdev_async_write_min_active);
 	if (dirty > max_bytes)
@@ -464,8 +465,7 @@ vdev_queue_class_max_active(spa_t *spa, zio_priority_t p)
 	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));
+		return (vdev_queue_max_async_writes(spa));
 	case ZIO_PRIORITY_SCRUB:
 		return (zfs_vdev_scrub_max_active);
 	case ZIO_PRIORITY_TRIM:
@@ -796,25 +796,14 @@ vdev_queue_io_done(zio_t *zio)
 
 	vq->vq_io_complete_ts = gethrtime();
 
-	if (zio->io_flags & ZIO_FLAG_QUEUE_IO_DONE) {
-		/*
-		 * Executing from a previous vdev_queue_io_done so
-		 * to avoid recursion we just unlock and return.
-		 */
-		mutex_exit(&vq->vq_lock);
-		return;
-	}
-
 	while ((nio = vdev_queue_io_to_issue(vq)) != NULL) {
 		mutex_exit(&vq->vq_lock);
-		nio->io_flags |= ZIO_FLAG_QUEUE_IO_DONE;
 		if (nio->io_done == vdev_queue_agg_io_done) {
 			zio_nowait(nio);
 		} else {
 			zio_vdev_io_reissue(nio);
 			zio_execute(nio);
 		}
-		nio->io_flags &= ~ZIO_FLAG_QUEUE_IO_DONE;
 		mutex_enter(&vq->vq_lock);
 	}
 
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 6e23e6c8e729..925aaea79f35 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
@@ -1755,7 +1755,9 @@ vdev_raidz_io_start(zio_t *zio)
 			    zio->io_type, zio->io_priority, 0,
 			    vdev_raidz_child_done, rc));
 		}
-		return (ZIO_PIPELINE_CONTINUE);
+
+		zio_interrupt(zio);
+		return (ZIO_PIPELINE_STOP);
 	}
 
 	if (zio->io_type == ZIO_TYPE_WRITE) {
@@ -1787,7 +1789,8 @@ vdev_raidz_io_start(zio_t *zio)
 			    ZIO_FLAG_NODATA | ZIO_FLAG_OPTIONAL, NULL, NULL));
 		}
 
-		return (ZIO_PIPELINE_CONTINUE);
+		zio_interrupt(zio);
+		return (ZIO_PIPELINE_STOP);
 	}
 
 	ASSERT(zio->io_type == ZIO_TYPE_READ);
@@ -1827,7 +1830,8 @@ vdev_raidz_io_start(zio_t *zio)
 		}
 	}
 
-	return (ZIO_PIPELINE_CONTINUE);
+	zio_interrupt(zio);
+	return (ZIO_PIPELINE_STOP);
 }
 
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c
index 26ea561eb1d6..a9cbe4dfe392 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
@@ -28,7 +28,7 @@
 list_t zfs_dbgmsgs;
 int zfs_dbgmsg_size;
 kmutex_t zfs_dbgmsgs_lock;
-int zfs_dbgmsg_maxsize = 1<<20; /* 1MB */
+int zfs_dbgmsg_maxsize = 4<<20; /* 4MB */
 
 void
 zfs_dbgmsg_init(void)
@@ -57,7 +57,10 @@ zfs_dbgmsg_fini(void)
  * echo ::zfs_dbgmsg | mdb -k
  *
  * Monitor these messages by running:
- * 	dtrace -q -n 'zfs-dbgmsg{printf("%s\n", stringof(arg0))}'
+ * dtrace -qn 'zfs-dbgmsg{printf("%s\n", stringof(arg0))}'
+ *
+ * When used with libzpool, monitor with:
+ * dtrace -qn 'zfs$pid::zfs_dbgmsg:probe1{printf("%s\n", copyinstr(arg1))}'
  */
 void
 zfs_dbgmsg(const char *fmt, ...)
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 be96da91c43d..f7c2b6a7e67d 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
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/types.h>
@@ -559,6 +559,7 @@ zfs_purgedir(znode_t *dzp)
 		dmu_tx_hold_zap(tx, zfsvfs->z_unlinkedobj, FALSE, NULL);
 		/* Is this really needed ? */
 		zfs_sa_upgrade_txholds(tx, xzp);
+		dmu_tx_mark_netfree(tx);
 		error = dmu_tx_assign(tx, TXG_WAIT);
 		if (error) {
 			dmu_tx_abort(tx);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
index 4f7c082cbefe..a6246ccc9a85 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
@@ -24,11 +24,13 @@
  * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>.
  * All rights reserved.
  * Copyright 2013 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
+ * Copyright 2014 Xin Li <delphij@FreeBSD.org>. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2014, Joyent, Inc. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
+ * Copyright (c) 2014, Nexenta Systems, Inc. All rights reserved.
  */
 
 /*
@@ -195,8 +197,7 @@ CTASSERT(sizeof(zfs_cmd_t) < IOCPARM_MAX);
 
 static int snapshot_list_prefetch;
 SYSCTL_DECL(_vfs_zfs);
-TUNABLE_INT("vfs.zfs.snapshot_list_prefetch", &snapshot_list_prefetch);
-SYSCTL_INT(_vfs_zfs, OID_AUTO, snapshot_list_prefetch, CTLFLAG_RW,
+SYSCTL_INT(_vfs_zfs, OID_AUTO, snapshot_list_prefetch, CTLFLAG_RWTUN,
     &snapshot_list_prefetch, 0, "Prefetch data when listing snapshots");
 
 static struct cdev *zfsdev;
@@ -1464,7 +1465,7 @@ zfsvfs_hold(const char *name, void *tag, zfsvfs_t **zfvp, boolean_t writer)
 	if (getzfsvfs(name, zfvp) != 0)
 		error = zfsvfs_create(name, zfvp);
 	if (error == 0) {
-		rrw_enter(&(*zfvp)->z_teardown_lock, (writer) ? RW_WRITER :
+		rrm_enter(&(*zfvp)->z_teardown_lock, (writer) ? RW_WRITER :
 		    RW_READER, tag);
 		if ((*zfvp)->z_unmounted) {
 			/*
@@ -1472,7 +1473,7 @@ zfsvfs_hold(const char *name, void *tag, zfsvfs_t **zfvp, boolean_t writer)
 			 * thread should be just about to disassociate the
 			 * objset from the zfsvfs.
 			 */
-			rrw_exit(&(*zfvp)->z_teardown_lock, tag);
+			rrm_exit(&(*zfvp)->z_teardown_lock, tag);
 			return (SET_ERROR(EBUSY));
 		}
 	}
@@ -1482,7 +1483,7 @@ zfsvfs_hold(const char *name, void *tag, zfsvfs_t **zfvp, boolean_t writer)
 static void
 zfsvfs_rele(zfsvfs_t *zfsvfs, void *tag)
 {
-	rrw_exit(&zfsvfs->z_teardown_lock, tag);
+	rrm_exit(&zfsvfs->z_teardown_lock, tag);
 
 	if (zfsvfs->z_vfs) {
 		VFS_RELE(zfsvfs->z_vfs);
@@ -2504,37 +2505,6 @@ zfs_prop_set_special(const char *dsname, zprop_source_t source,
 		}
 		break;
 	}
-	case ZFS_PROP_COMPRESSION:
-	{
-		if (intval == ZIO_COMPRESS_LZ4) {
-			spa_t *spa;
-
-			if ((err = spa_open(dsname, &spa, FTAG)) != 0)
-				return (err);
-
-			/*
-			 * Setting the LZ4 compression algorithm activates
-			 * the feature.
-			 */
-			if (!spa_feature_is_active(spa,
-			    SPA_FEATURE_LZ4_COMPRESS)) {
-				if ((err = zfs_prop_activate_feature(spa,
-				    SPA_FEATURE_LZ4_COMPRESS)) != 0) {
-					spa_close(spa, FTAG);
-					return (err);
-				}
-			}
-
-			spa_close(spa, FTAG);
-		}
-		/*
-		 * We still want the default set action to be performed in the
-		 * caller, we only performed zfeature settings here.
-		 */
-		err = -1;
-		break;
-	}
-
 	default:
 		err = -1;
 	}
@@ -3987,7 +3957,7 @@ zfs_prop_activate_feature(spa_t *spa, spa_feature_t feature)
 	/* EBUSY here indicates that the feature is already active */
 	err = dsl_sync_task(spa_name(spa),
 	    zfs_prop_activate_feature_check, zfs_prop_activate_feature_sync,
-	    &feature, 2);
+	    &feature, 2, ZFS_SPACE_CHECK_RESERVED);
 
 	if (err != 0 && err != EBUSY)
 		return (err);
@@ -4354,6 +4324,7 @@ zfs_ioc_recv(zfs_cmd_t *zc)
  * zc_fromobj	objsetid of incremental fromsnap (may be zero)
  * zc_guid	if set, estimate size of stream only.  zc_cookie is ignored.
  *		output size in zc_objset_type.
+ * zc_flags	if =1, WRITE_EMBEDDED records are permitted
  *
  * outputs:
  * zc_objset_type	estimated size, if zc_guid is set
@@ -4364,6 +4335,7 @@ zfs_ioc_send(zfs_cmd_t *zc)
 	int error;
 	offset_t off;
 	boolean_t estimate = (zc->zc_guid != 0);
+	boolean_t embedok = (zc->zc_flags & 0x1);
 
 	if (zc->zc_obj != 0) {
 		dsl_pool_t *dp;
@@ -4429,9 +4401,9 @@ zfs_ioc_send(zfs_cmd_t *zc)
 		off = fp->f_offset;
 		error = dmu_send_obj(zc->zc_name, zc->zc_sendobj,
 #ifdef illumos
-		    zc->zc_fromobj, zc->zc_cookie, fp->f_vnode, &off);
+		    zc->zc_fromobj, embedok, zc->zc_cookie, fp->f_vnode, &off);
 #else
-		    zc->zc_fromobj, zc->zc_cookie, fp, &off);
+		    zc->zc_fromobj, embedok, zc->zc_cookie, fp, &off);
 #endif
 
 		if (off >= 0 && off <= MAXOFFSET_T)
@@ -5369,6 +5341,8 @@ zfs_ioc_unjail(zfs_cmd_t *zc)
  * innvl: {
  *     "fd" -> file descriptor to write stream to (int32)
  *     (optional) "fromsnap" -> full snap name to send an incremental from
+ *     (optional) "embedok" -> (value ignored)
+ *         presence indicates DRR_WRITE_EMBEDDED records are permitted
  * }
  *
  * outnvl is unused
@@ -5382,6 +5356,7 @@ zfs_ioc_send_new(const char *snapname, nvlist_t *innvl, nvlist_t *outnvl)
 	offset_t off;
 	char *fromname = NULL;
 	int fd;
+	boolean_t embedok;
 
 	error = nvlist_lookup_int32(innvl, "fd", &fd);
 	if (error != 0)
@@ -5389,15 +5364,17 @@ zfs_ioc_send_new(const char *snapname, nvlist_t *innvl, nvlist_t *outnvl)
 
 	(void) nvlist_lookup_string(innvl, "fromsnap", &fromname);
 
+	embedok = nvlist_exists(innvl, "embedok");
+
 	file_t *fp = getf(fd, cap_rights_init(&rights, CAP_READ));
 	if (fp == NULL)
 		return (SET_ERROR(EBADF));
 
 	off = fp->f_offset;
 #ifdef illumos
-	error = dmu_send(snapname, fromname, fd, fp->f_vnode, &off);
+	error = dmu_send(snapname, fromname, embedok, fd, fp->f_vnode, &off);
 #else
-	error = dmu_send(snapname, fromname, fd, fp, &off);
+	error = dmu_send(snapname, fromname, embedok, fd, fp, &off);
 #endif
 
 #ifdef illumos
@@ -5916,6 +5893,7 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t arg, int flag,
 	zfs_iocparm_t *zc_iocparm;
 	int cflag, cmd, oldvecnum;
 	boolean_t newioc, compat;
+	void *compat_zc = NULL;
 	cred_t *cr = td->td_ucred;
 #endif
 	const zfs_ioc_vec_t *vec;
@@ -5924,10 +5902,10 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t arg, int flag,
 
 	cflag = ZFS_CMD_COMPAT_NONE;
 	compat = B_FALSE;
-	newioc = B_TRUE;
+	newioc = B_TRUE;	/* "new" style (zfs_iocparm_t) ioctl */
 
 	len = IOCPARM_LEN(zcmd);
-	cmd = zcmd & 0xff;
+	vecnum = cmd = zcmd & 0xff;
 
 	/*
 	 * Check if we are talking to supported older binaries
@@ -5935,84 +5913,112 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t arg, int flag,
 	 */
 	if (len != sizeof(zfs_iocparm_t)) {
 		newioc = B_FALSE;
-		if (len == sizeof(zfs_cmd_t)) {
-			cflag = ZFS_CMD_COMPAT_LZC;
-			vecnum = cmd;
-		} else if (len == sizeof(zfs_cmd_deadman_t)) {
-			cflag = ZFS_CMD_COMPAT_DEADMAN;
-			compat = B_TRUE;
-			vecnum = cmd;
-		} else if (len == sizeof(zfs_cmd_v28_t)) {
-			cflag = ZFS_CMD_COMPAT_V28;
-			compat = B_TRUE;
-			vecnum = cmd;
-		} else if (len == sizeof(zfs_cmd_v15_t)) {
-			cflag = ZFS_CMD_COMPAT_V15;
-			compat = B_TRUE;
-			vecnum = zfs_ioctl_v15_to_v28[cmd];
-		} else
-			return (EINVAL);
-	} else
+		compat = B_TRUE;
+
 		vecnum = cmd;
 
+		switch (len) {
+		case sizeof(zfs_cmd_zcmd_t):
+			cflag = ZFS_CMD_COMPAT_LZC;
+			break;
+		case sizeof(zfs_cmd_deadman_t):
+			cflag = ZFS_CMD_COMPAT_DEADMAN;
+			break;
+		case sizeof(zfs_cmd_v28_t):
+			cflag = ZFS_CMD_COMPAT_V28;
+			break;
+		case sizeof(zfs_cmd_v15_t):
+			cflag = ZFS_CMD_COMPAT_V15;
+			vecnum = zfs_ioctl_v15_to_v28[cmd];
+
+			/*
+			 * Return without further handling
+			 * if the command is blacklisted.
+			 */
+			if (vecnum == ZFS_IOC_COMPAT_PASS)
+				return (0);
+			else if (vecnum == ZFS_IOC_COMPAT_FAIL)
+				return (ENOTSUP);
+			break;
+		default:
+			return (EINVAL);
+		}
+	}
+
 #ifdef illumos
 	vecnum = cmd - ZFS_IOC_FIRST;
 	ASSERT3U(getmajor(dev), ==, ddi_driver_major(zfs_dip));
 #endif
 
-	if (compat) {
-		if (vecnum == ZFS_IOC_COMPAT_PASS)
-			return (0);
-		else if (vecnum == ZFS_IOC_COMPAT_FAIL)
-			return (ENOTSUP);
-	}
-
-	/*
-	 * Check if we have sufficient kernel memory allocated
-	 * for the zfs_cmd_t request.  Bail out if not so we
-	 * will not access undefined memory region.
-	 */
 	if (vecnum >= sizeof (zfs_ioc_vec) / sizeof (zfs_ioc_vec[0]))
 		return (SET_ERROR(EINVAL));
 	vec = &zfs_ioc_vec[vecnum];
 
-#ifdef illumos
 	zc = kmem_zalloc(sizeof(zfs_cmd_t), KM_SLEEP);
-	bzero(zc, sizeof(zfs_cmd_t));
 
+#ifdef illumos
 	error = ddi_copyin((void *)arg, zc, sizeof (zfs_cmd_t), flag);
 	if (error != 0) {
 		error = SET_ERROR(EFAULT);
 		goto out;
 	}
 #else	/* !illumos */
-	/*
-	 * We don't alloc/free zc only if talking to library ioctl version 2
-	 */
-	if (cflag != ZFS_CMD_COMPAT_LZC) {
-		zc = kmem_zalloc(sizeof(zfs_cmd_t), KM_SLEEP);
-		bzero(zc, sizeof(zfs_cmd_t));
-	} else {
-		zc = (void *)arg;
-		error = 0;
-	}
+	bzero(zc, sizeof(zfs_cmd_t));
 
 	if (newioc) {
 		zc_iocparm = (void *)arg;
-		if (zc_iocparm->zfs_cmd_size != sizeof(zfs_cmd_t)) {
-			error = SET_ERROR(EFAULT);
+
+		switch (zc_iocparm->zfs_ioctl_version) {
+		case ZFS_IOCVER_CURRENT:
+			if (zc_iocparm->zfs_cmd_size != sizeof(zfs_cmd_t)) {
+				error = SET_ERROR(EINVAL);
+				goto out;
+			}
+			break;
+		case ZFS_IOCVER_ZCMD:
+			if (zc_iocparm->zfs_cmd_size > sizeof(zfs_cmd_t) ||
+			    zc_iocparm->zfs_cmd_size < sizeof(zfs_cmd_zcmd_t)) {
+				error = SET_ERROR(EFAULT);
+				goto out;
+			}
+			compat = B_TRUE;
+			cflag = ZFS_CMD_COMPAT_ZCMD;
+			break;
+		default:
+			error = SET_ERROR(EINVAL);
 			goto out;
+			/* NOTREACHED */
 		}
-		error = ddi_copyin((void *)(uintptr_t)zc_iocparm->zfs_cmd, zc,
-		    sizeof(zfs_cmd_t), flag);
-		if (error != 0) {
-			error = SET_ERROR(EFAULT);
-			goto out;
+
+		if (compat) {
+			ASSERT(sizeof(zfs_cmd_t) >= zc_iocparm->zfs_cmd_size);
+			compat_zc = kmem_zalloc(sizeof(zfs_cmd_t), KM_SLEEP);
+			bzero(compat_zc, sizeof(zfs_cmd_t));
+
+			error = ddi_copyin((void *)(uintptr_t)zc_iocparm->zfs_cmd,
+			    compat_zc, zc_iocparm->zfs_cmd_size, flag);
+			if (error != 0) {
+				error = SET_ERROR(EFAULT);
+				goto out;
+			}
+		} else {
+			error = ddi_copyin((void *)(uintptr_t)zc_iocparm->zfs_cmd,
+			    zc, zc_iocparm->zfs_cmd_size, flag);
+			if (error != 0) {
+				error = SET_ERROR(EFAULT);
+				goto out;
+			}
 		}
 	}
 
 	if (compat) {
-		zfs_cmd_compat_get(zc, arg, cflag);
+		if (newioc) {
+			ASSERT(compat_zc != NULL);
+			zfs_cmd_compat_get(zc, compat_zc, cflag);
+		} else {
+			ASSERT(compat_zc == NULL);
+			zfs_cmd_compat_get(zc, arg, cflag);
+		}
 		oldvecnum = vecnum;
 		error = zfs_ioctl_compat_pre(zc, &vecnum, cflag);
 		if (error != 0)
@@ -6108,7 +6114,7 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t arg, int flag,
 		fnvlist_free(lognv);
 
 		/* rewrite outnvl for backwards compatibility */
-		if (cflag != ZFS_CMD_COMPAT_NONE && cflag != ZFS_CMD_COMPAT_LZC)
+		if (compat)
 			outnvl = zfs_ioctl_compat_outnvl(zc, outnvl, vecnum,
 			    cflag);
 
@@ -6133,17 +6139,30 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t arg, int flag,
 out:
 	nvlist_free(innvl);
 
-	if (compat) {
-		zfs_ioctl_compat_post(zc, cmd, cflag);
-		zfs_cmd_compat_put(zc, arg, vecnum, cflag);
-	}
-
 #ifdef illumos
 	rc = ddi_copyout(zc, (void *)arg, sizeof (zfs_cmd_t), flag);
 	if (error == 0 && rc != 0)
 		error = SET_ERROR(EFAULT);
 #else
-	if (newioc) {
+	if (compat) {
+		zfs_ioctl_compat_post(zc, cmd, cflag);
+		if (newioc) {
+			ASSERT(compat_zc != NULL);
+			ASSERT(sizeof(zfs_cmd_t) >= zc_iocparm->zfs_cmd_size);
+
+			zfs_cmd_compat_put(zc, compat_zc, vecnum, cflag);
+			rc = ddi_copyout(compat_zc,
+			    (void *)(uintptr_t)zc_iocparm->zfs_cmd,
+			    zc_iocparm->zfs_cmd_size, flag);
+			if (error == 0 && rc != 0)
+				error = SET_ERROR(EFAULT);
+			kmem_free(compat_zc, sizeof (zfs_cmd_t));
+		} else {
+			zfs_cmd_compat_put(zc, arg, vecnum, cflag);
+		}
+	} else {
+		ASSERT(newioc);
+
 		rc = ddi_copyout(zc, (void *)(uintptr_t)zc_iocparm->zfs_cmd,
 		    sizeof (zfs_cmd_t), flag);
 		if (error == 0 && rc != 0)
@@ -6160,15 +6179,7 @@ zfsdev_ioctl(struct cdev *dev, u_long zcmd, caddr_t arg, int flag,
 			strfree(saved_poolname);
 	}
 
-#ifdef illumos
 	kmem_free(zc, sizeof (zfs_cmd_t));
-#else
-	/*
-	 * We don't alloc/free zc only if talking to library ioctl version 2
-	 */
-	if (cflag != ZFS_CMD_COMPAT_LZC)
-		kmem_free(zc, sizeof (zfs_cmd_t));
-#endif
 	return (error);
 }
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
index 7ce41a137a19..33748fe37b1b 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
@@ -74,8 +74,7 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, super_owner, CTLFLAG_RW, &zfs_super_owner, 0,
     "File system owner can perform privileged operation on his file systems");
 
 int zfs_debug_level;
-TUNABLE_INT("vfs.zfs.debug", &zfs_debug_level);
-SYSCTL_INT(_vfs_zfs, OID_AUTO, debug, CTLFLAG_RW, &zfs_debug_level, 0,
+SYSCTL_INT(_vfs_zfs, OID_AUTO, debug, CTLFLAG_RWTUN, &zfs_debug_level, 0,
     "Debug level");
 
 SYSCTL_NODE(_vfs_zfs, OID_AUTO, version, CTLFLAG_RD, 0, "ZFS versions");
@@ -988,7 +987,7 @@ zfsvfs_create(const char *osname, zfsvfs_t **zfvp)
 	mutex_init(&zfsvfs->z_lock, NULL, MUTEX_DEFAULT, NULL);
 	list_create(&zfsvfs->z_all_znodes, sizeof (znode_t),
 	    offsetof(znode_t, z_link_node));
-	rrw_init(&zfsvfs->z_teardown_lock, B_FALSE);
+	rrm_init(&zfsvfs->z_teardown_lock, B_FALSE);
 	rw_init(&zfsvfs->z_teardown_inactive_lock, NULL, RW_DEFAULT, NULL);
 	rw_init(&zfsvfs->z_fuid_lock, NULL, RW_DEFAULT, NULL);
 	for (i = 0; i != ZFS_OBJ_MTX_SZ; i++)
@@ -1104,7 +1103,7 @@ zfsvfs_free(zfsvfs_t *zfsvfs)
 	mutex_destroy(&zfsvfs->z_znodes_lock);
 	mutex_destroy(&zfsvfs->z_lock);
 	list_destroy(&zfsvfs->z_all_znodes);
-	rrw_destroy(&zfsvfs->z_teardown_lock);
+	rrm_destroy(&zfsvfs->z_teardown_lock);
 	rw_destroy(&zfsvfs->z_teardown_inactive_lock);
 	rw_destroy(&zfsvfs->z_fuid_lock);
 	for (i = 0; i != ZFS_OBJ_MTX_SZ; i++)
@@ -1833,7 +1832,7 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting)
 {
 	znode_t	*zp;
 
-	rrw_enter(&zfsvfs->z_teardown_lock, RW_WRITER, FTAG);
+	rrm_enter(&zfsvfs->z_teardown_lock, RW_WRITER, FTAG);
 
 	if (!unmounting) {
 		/*
@@ -1866,7 +1865,7 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting)
 	 */
 	if (!unmounting && (zfsvfs->z_unmounted || zfsvfs->z_os == NULL)) {
 		rw_exit(&zfsvfs->z_teardown_inactive_lock);
-		rrw_exit(&zfsvfs->z_teardown_lock, FTAG);
+		rrm_exit(&zfsvfs->z_teardown_lock, FTAG);
 		return (SET_ERROR(EIO));
 	}
 
@@ -1893,7 +1892,7 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting)
 	 */
 	if (unmounting) {
 		zfsvfs->z_unmounted = B_TRUE;
-		rrw_exit(&zfsvfs->z_teardown_lock, FTAG);
+		rrm_exit(&zfsvfs->z_teardown_lock, FTAG);
 		rw_exit(&zfsvfs->z_teardown_inactive_lock);
 	}
 
@@ -1970,9 +1969,9 @@ zfs_umount(vfs_t *vfsp, int fflag)
 		 * vflush(FORCECLOSE). This way we ensure no future vnops
 		 * will be called and risk operating on DOOMED vnodes.
 		 */
-		rrw_enter(&zfsvfs->z_teardown_lock, RW_WRITER, FTAG);
+		rrm_enter(&zfsvfs->z_teardown_lock, RW_WRITER, FTAG);
 		zfsvfs->z_unmounted = B_TRUE;
-		rrw_exit(&zfsvfs->z_teardown_lock, FTAG);
+		rrm_exit(&zfsvfs->z_teardown_lock, FTAG);
 	}
 
 	/*
@@ -2076,8 +2075,6 @@ zfs_vget(vfs_t *vfsp, ino_t ino, int flags, vnode_t **vpp)
 		err = vn_lock(*vpp, flags);
 	if (err != 0)
 		*vpp = NULL;
-	else
-		(*vpp)->v_hash = ino;
 	return (err);
 }
 
@@ -2240,7 +2237,7 @@ zfs_resume_fs(zfsvfs_t *zfsvfs, const char *osname)
 	znode_t *zp;
 	uint64_t sa_obj = 0;
 
-	ASSERT(RRW_WRITE_HELD(&zfsvfs->z_teardown_lock));
+	ASSERT(RRM_WRITE_HELD(&zfsvfs->z_teardown_lock));
 	ASSERT(RW_WRITE_HELD(&zfsvfs->z_teardown_inactive_lock));
 
 	/*
@@ -2296,7 +2293,7 @@ zfs_resume_fs(zfsvfs_t *zfsvfs, const char *osname)
 bail:
 	/* release the VOPs */
 	rw_exit(&zfsvfs->z_teardown_inactive_lock);
-	rrw_exit(&zfsvfs->z_teardown_lock, FTAG);
+	rrm_exit(&zfsvfs->z_teardown_lock, FTAG);
 
 	if (err) {
 		/*
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 cc471b0690f2..1553a818136d 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
  */
 
@@ -1568,7 +1568,7 @@ zfs_lookup(vnode_t *dvp, char *nm, vnode_t **vpp, struct componentname *cnp,
  *		cr	- credentials of caller.
  *		flag	- large file flag [UNUSED].
  *		ct	- caller context
- *		vsecp 	- ACL to be set
+ *		vsecp	- ACL to be set
  *
  *	OUT:	vpp	- vnode of created or trunc'd entry.
  *
@@ -1850,7 +1850,7 @@ zfs_remove(vnode_t *dvp, char *name, cred_t *cr, caller_context_t *ct,
 	zfsvfs_t	*zfsvfs = dzp->z_zfsvfs;
 	zilog_t		*zilog;
 	uint64_t	acl_obj, xattr_obj;
-	uint64_t 	xattr_obj_unlinked = 0;
+	uint64_t	xattr_obj_unlinked = 0;
 	uint64_t	obj = 0;
 	zfs_dirlock_t	*dl;
 	dmu_tx_t	*tx;
@@ -1950,6 +1950,14 @@ zfs_remove(vnode_t *dvp, char *name, cred_t *cr, caller_context_t *ct,
 	/* charge as an update -- would be nice not to charge at all */
 	dmu_tx_hold_zap(tx, zfsvfs->z_unlinkedobj, FALSE, NULL);
 
+	/*
+	 * Mark this transaction as typically resulting in a net free of
+	 * space, unless object removal will be delayed indefinitely
+	 * (due to active holds on the vnode due to the file being open).
+	 */
+	if (may_delete_now)
+		dmu_tx_mark_netfree(tx);
+
 	error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT);
 	if (error) {
 		zfs_dirent_unlock(dl);
@@ -1980,7 +1988,6 @@ zfs_remove(vnode_t *dvp, char *name, cred_t *cr, caller_context_t *ct,
 	}
 
 	if (unlinked) {
-
 		/*
 		 * Hold z_lock so that we can make sure that the ACL obj
 		 * hasn't changed.  Could have been deleted due to
@@ -5056,13 +5063,13 @@ zfs_addmap(vnode_t *vp, offset_t off, struct as *as, caddr_t addr,
  * last page is pushed.  The problem occurs when the msync() call is omitted,
  * which by far the most common case:
  *
- * 	open()
- * 	mmap()
- * 	<modify memory>
- * 	munmap()
- * 	close()
- * 	<time lapse>
- * 	putpage() via fsflush
+ *	open()
+ *	mmap()
+ *	<modify memory>
+ *	munmap()
+ *	close()
+ *	<time lapse>
+ *	putpage() via fsflush
  *
  * If we wait until fsflush to come along, we can have a modification time that
  * is some arbitrary point in the future.  In order to prevent this in the
@@ -5555,7 +5562,7 @@ const fs_operation_def_t zfs_dvnodeops_template[] = {
 	VOPNAME_PATHCONF,	{ .vop_pathconf = zfs_pathconf },
 	VOPNAME_GETSECATTR,	{ .vop_getsecattr = zfs_getsecattr },
 	VOPNAME_SETSECATTR,	{ .vop_setsecattr = zfs_setsecattr },
-	VOPNAME_VNEVENT, 	{ .vop_vnevent = fs_vnevent_support },
+	VOPNAME_VNEVENT,	{ .vop_vnevent = fs_vnevent_support },
 	NULL,			NULL
 };
 
@@ -5589,8 +5596,8 @@ const fs_operation_def_t zfs_fvnodeops_template[] = {
 	VOPNAME_GETSECATTR,	{ .vop_getsecattr = zfs_getsecattr },
 	VOPNAME_SETSECATTR,	{ .vop_setsecattr = zfs_setsecattr },
 	VOPNAME_VNEVENT,	{ .vop_vnevent = fs_vnevent_support },
-	VOPNAME_REQZCBUF, 	{ .vop_reqzcbuf = zfs_reqzcbuf },
-	VOPNAME_RETZCBUF, 	{ .vop_retzcbuf = zfs_retzcbuf },
+	VOPNAME_REQZCBUF,	{ .vop_reqzcbuf = zfs_reqzcbuf },
+	VOPNAME_RETZCBUF,	{ .vop_retzcbuf = zfs_retzcbuf },
 	NULL,			NULL
 };
 
@@ -6875,7 +6882,7 @@ vop_setextattr {
 	va.va_size = 0;
 	error = VOP_SETATTR(vp, &va, ap->a_cred);
 	if (error == 0)
-		VOP_WRITE(vp, ap->a_uio, IO_UNIT | IO_SYNC, ap->a_cred);
+		VOP_WRITE(vp, ap->a_uio, IO_UNIT, ap->a_cred);
 
 	VOP_UNLOCK(vp, 0);
 	vn_close(vp, flags, ap->a_cred, td);
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 e78b13ba3a08..c8f86b8316d4 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
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 /* Portions Copyright 2007 Jeremy Teo */
@@ -276,7 +276,7 @@ zfs_znode_move(void *buf, void *newbuf, size_t size, void *arg)
 	 * can safely ensure that the filesystem is not and will not be
 	 * unmounted. The next statement is equivalent to ZFS_ENTER().
 	 */
-	rrw_enter(&zfsvfs->z_teardown_lock, RW_READER, FTAG);
+	rrm_enter(&zfsvfs->z_teardown_lock, RW_READER, FTAG);
 	if (zfsvfs->z_unmounted) {
 		ZFS_EXIT(zfsvfs);
 		rw_exit(&zfsvfs_lock);
@@ -1228,9 +1228,10 @@ zfs_zget(zfsvfs_t *zfsvfs, uint64_t obj_num, znode_t **zpp)
 		vnode_t *vp = ZTOV(zp);
 
 		err = insmntque(vp, zfsvfs->z_vfs);
-		if (err == 0)
+		if (err == 0) {
+			vp->v_hash = obj_num;
 			VOP_UNLOCK(vp, 0);
-		else {
+		} else {
 			zp->z_vnode = NULL;
 			zfs_znode_dmu_fini(zp);
 			zfs_znode_free(zp);
@@ -1510,7 +1511,7 @@ zfs_no_putpage(vnode_t *vp, page_t *pp, u_offset_t *offp, size_t *lenp,
  *	IN:	zp	- znode of file to free data in.
  *		end	- new end-of-file
  *
- * 	RETURN:	0 on success, error code on failure
+ *	RETURN:	0 on success, error code on failure
  */
 static int
 zfs_extend(znode_t *zp, uint64_t end)
@@ -1583,7 +1584,7 @@ zfs_extend(znode_t *zp, uint64_t end)
  *		off	- start of section to free.
  *		len	- length of section to free.
  *
- * 	RETURN:	0 on success, error code on failure
+ *	RETURN:	0 on success, error code on failure
  */
 static int
 zfs_free_range(znode_t *zp, uint64_t off, uint64_t len)
@@ -1630,7 +1631,7 @@ zfs_free_range(znode_t *zp, uint64_t off, uint64_t len)
  *	IN:	zp	- znode of file to free data in.
  *		end	- new end-of-file.
  *
- * 	RETURN:	0 on success, error code on failure
+ *	RETURN:	0 on success, error code on failure
  */
 static int
 zfs_trunc(znode_t *zp, uint64_t end)
@@ -1664,6 +1665,7 @@ zfs_trunc(znode_t *zp, uint64_t end)
 	tx = dmu_tx_create(zfsvfs->z_os);
 	dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE);
 	zfs_sa_upgrade_txholds(tx, zp);
+	dmu_tx_mark_netfree(tx);
 	error = dmu_tx_assign(tx, TXG_WAIT);
 	if (error) {
 		dmu_tx_abort(tx);
@@ -1706,7 +1708,7 @@ zfs_trunc(znode_t *zp, uint64_t end)
  *		flag	- current file open mode flags.
  *		log	- TRUE if this action should be logged
  *
- * 	RETURN:	0 on success, error code on failure
+ *	RETURN:	0 on success, error code on failure
  */
 int
 zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log)
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 ea5bb13a7779..228e4591d50d 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 /* Portions Copyright 2010 Robert Milkowski */
@@ -70,8 +70,7 @@
  */
 int zil_replay_disable = 0;
 SYSCTL_DECL(_vfs_zfs);
-TUNABLE_INT("vfs.zfs.zil_replay_disable", &zil_replay_disable);
-SYSCTL_INT(_vfs_zfs, OID_AUTO, zil_replay_disable, CTLFLAG_RW,
+SYSCTL_INT(_vfs_zfs, OID_AUTO, zil_replay_disable, CTLFLAG_RWTUN,
     &zil_replay_disable, 0, "Disable intent logging replay");
 
 /*
@@ -80,12 +79,10 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, zil_replay_disable, CTLFLAG_RW,
  * out-of-order write cache is enabled.
  */
 boolean_t zfs_nocacheflush = B_FALSE;
-TUNABLE_INT("vfs.zfs.cache_flush_disable", &zfs_nocacheflush);
 SYSCTL_INT(_vfs_zfs, OID_AUTO, cache_flush_disable, CTLFLAG_RDTUN,
     &zfs_nocacheflush, 0, "Disable cache flush");
 boolean_t zfs_trim_enabled = B_TRUE;
 SYSCTL_DECL(_vfs_zfs_trim);
-TUNABLE_INT("vfs.zfs.trim.enabled", &zfs_trim_enabled);
 SYSCTL_INT(_vfs_zfs_trim, OID_AUTO, enabled, CTLFLAG_RDTUN, &zfs_trim_enabled, 0,
     "Enable ZFS TRIM");
 
@@ -149,10 +146,15 @@ int
 zil_bp_tree_add(zilog_t *zilog, const blkptr_t *bp)
 {
 	avl_tree_t *t = &zilog->zl_bp_tree;
-	const dva_t *dva = BP_IDENTITY(bp);
+	const dva_t *dva;
 	zil_bp_node_t *zn;
 	avl_index_t where;
 
+	if (BP_IS_EMBEDDED(bp))
+		return (0);
+
+	dva = BP_IDENTITY(bp);
+
 	if (avl_find(t, dva, &where) != NULL)
 		return (SET_ERROR(EEXIST));
 
@@ -190,7 +192,7 @@ zil_read_log_block(zilog_t *zilog, const blkptr_t *bp, blkptr_t *nbp, void *dst,
 	enum zio_flag zio_flags = ZIO_FLAG_CANFAIL;
 	uint32_t aflags = ARC_WAIT;
 	arc_buf_t *abuf = NULL;
-	zbookmark_t zb;
+	zbookmark_phys_t zb;
 	int error;
 
 	if (zilog->zl_header->zh_claim_txg == 0)
@@ -263,7 +265,7 @@ zil_read_log_data(zilog_t *zilog, const lr_write_t *lr, void *wbuf)
 	const blkptr_t *bp = &lr->lr_blkptr;
 	uint32_t aflags = ARC_WAIT;
 	arc_buf_t *abuf = NULL;
-	zbookmark_t zb;
+	zbookmark_phys_t zb;
 	int error;
 
 	if (BP_IS_HOLE(bp)) {
@@ -843,7 +845,7 @@ zil_lwb_write_done(zio_t *zio)
 	ASSERT(BP_GET_BYTEORDER(zio->io_bp) == ZFS_HOST_BYTEORDER);
 	ASSERT(!BP_IS_GANG(zio->io_bp));
 	ASSERT(!BP_IS_HOLE(zio->io_bp));
-	ASSERT(zio->io_bp->blk_fill == 0);
+	ASSERT(BP_GET_FILL(zio->io_bp) == 0);
 
 	/*
 	 * Ensure the lwb buffer pointer is cleared before releasing
@@ -873,7 +875,7 @@ zil_lwb_write_done(zio_t *zio)
 static void
 zil_lwb_write_init(zilog_t *zilog, lwb_t *lwb)
 {
-	zbookmark_t zb;
+	zbookmark_phys_t zb;
 
 	SET_BOOKMARK(&zb, lwb->lwb_blk.blk_cksum.zc_word[ZIL_ZC_OBJSET],
 	    ZB_ZIL_OBJECT, ZB_ZIL_LEVEL,
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 01946fb2b553..895b0cecf2c6 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
@@ -37,6 +37,7 @@
 #include <sys/arc.h>
 #include <sys/ddt.h>
 #include <sys/trim_map.h>
+#include <sys/blkptr.h>
 #include <sys/zfeature.h>
 
 SYSCTL_DECL(_vfs_zfs);
@@ -46,11 +47,9 @@ 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");
 static int zio_exclude_metadata = 0;
-TUNABLE_INT("vfs.zfs.zio.exclude_metadata", &zio_exclude_metadata);
 SYSCTL_INT(_vfs_zfs_zio, OID_AUTO, exclude_metadata, CTLFLAG_RDTUN, &zio_exclude_metadata, 0,
     "Exclude metadata buffers from dumps as well");
 
@@ -104,15 +103,12 @@ extern vmem_t *zio_alloc_arena;
  * regular blocks are not deferred.
  */
 int zfs_sync_pass_deferred_free = 2; /* defer frees starting in this pass */
-TUNABLE_INT("vfs.zfs.sync_pass_deferred_free", &zfs_sync_pass_deferred_free);
 SYSCTL_INT(_vfs_zfs, OID_AUTO, sync_pass_deferred_free, CTLFLAG_RDTUN,
     &zfs_sync_pass_deferred_free, 0, "defer frees starting in this pass");
 int zfs_sync_pass_dont_compress = 5; /* don't compress starting in this pass */
-TUNABLE_INT("vfs.zfs.sync_pass_dont_compress", &zfs_sync_pass_dont_compress);
 SYSCTL_INT(_vfs_zfs, OID_AUTO, sync_pass_dont_compress, CTLFLAG_RDTUN,
     &zfs_sync_pass_dont_compress, 0, "don't compress starting in this pass");
 int zfs_sync_pass_rewrite = 2; /* rewrite new bps starting in this pass */
-TUNABLE_INT("vfs.zfs.sync_pass_rewrite", &zfs_sync_pass_rewrite);
 SYSCTL_INT(_vfs_zfs, OID_AUTO, sync_pass_rewrite, CTLFLAG_RDTUN,
     &zfs_sync_pass_rewrite, 0, "rewrite new bps starting in this pass");
 
@@ -268,7 +264,7 @@ zio_buf_alloc(size_t size)
 	size_t c = (size - 1) >> SPA_MINBLOCKSHIFT;
 	int flags = zio_exclude_metadata ? KM_NODEBUG : 0;
 
-	ASSERT(c < SPA_MAXBLOCKSIZE >> SPA_MINBLOCKSHIFT);
+	ASSERT3U(c, <, SPA_MAXBLOCKSIZE >> SPA_MINBLOCKSHIFT);
 
 	if (zio_use_uma)
 		return (kmem_cache_alloc(zio_buf_cache[c], KM_PUSHPAGE));
@@ -554,7 +550,7 @@ 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, zio_priority_t priority, enum zio_flag flags,
-    vdev_t *vd, uint64_t offset, const zbookmark_t *zb,
+    vdev_t *vd, uint64_t offset, const zbookmark_phys_t *zb,
     enum zio_stage stage, enum zio_stage pipeline)
 {
 	zio_t *zio;
@@ -663,7 +659,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,
-    zio_priority_t priority, enum zio_flag flags, const zbookmark_t *zb)
+    zio_priority_t priority, enum zio_flag flags, const zbookmark_phys_t *zb)
 {
 	zio_t *zio;
 
@@ -681,7 +677,7 @@ 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 *physdone, zio_done_func_t *done,
     void *private,
-    zio_priority_t priority, enum zio_flag flags, const zbookmark_t *zb)
+    zio_priority_t priority, enum zio_flag flags, const zbookmark_phys_t *zb)
 {
 	zio_t *zio;
 
@@ -703,13 +699,23 @@ zio_write(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
 	zio->io_physdone = physdone;
 	zio->io_prop = *zp;
 
+	/*
+	 * Data can be NULL if we are going to call zio_write_override() to
+	 * provide the already-allocated BP.  But we may need the data to
+	 * verify a dedup hit (if requested).  In this case, don't try to
+	 * dedup (just take the already-allocated BP verbatim).
+	 */
+	if (data == NULL && zio->io_prop.zp_dedup_verify) {
+		zio->io_prop.zp_dedup = zio->io_prop.zp_dedup_verify = B_FALSE;
+	}
+
 	return (zio);
 }
 
 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,
-    zio_priority_t priority, enum zio_flag flags, zbookmark_t *zb)
+    zio_priority_t priority, enum zio_flag flags, zbookmark_phys_t *zb)
 {
 	zio_t *zio;
 
@@ -742,6 +748,14 @@ zio_write_override(zio_t *zio, blkptr_t *bp, int copies, boolean_t nopwrite)
 void
 zio_free(spa_t *spa, uint64_t txg, const blkptr_t *bp)
 {
+
+	/*
+	 * The check for EMBEDDED is a performance optimization.  We
+	 * process the free here (by ignoring it) rather than
+	 * putting it on the list and then processing it in zio_free_sync().
+	 */
+	if (BP_IS_EMBEDDED(bp))
+		return;
 	metaslab_check_free(spa, bp);
 
 	/*
@@ -767,13 +781,13 @@ zio_free_sync(zio_t *pio, spa_t *spa, uint64_t txg, const blkptr_t *bp,
 	zio_t *zio;
 	enum zio_stage stage = ZIO_FREE_PIPELINE;
 
-	dprintf_bp(bp, "freeing in txg %llu, pass %u",
-	    (longlong_t)txg, spa->spa_sync_pass);
-
 	ASSERT(!BP_IS_HOLE(bp));
 	ASSERT(spa_syncing_txg(spa) == txg);
 	ASSERT(spa_sync_pass(spa) < zfs_sync_pass_deferred_free);
 
+	if (BP_IS_EMBEDDED(bp))
+		return (zio_null(pio, spa, NULL, NULL, NULL, 0));
+
 	metaslab_check_free(spa, bp);
 	arc_freed(spa, bp);
 
@@ -803,6 +817,11 @@ zio_claim(zio_t *pio, spa_t *spa, uint64_t txg, const blkptr_t *bp,
 {
 	zio_t *zio;
 
+	dprintf_bp(bp, "claiming in txg %llu", txg);
+
+	if (BP_IS_EMBEDDED(bp))
+		return (zio_null(pio, spa, NULL, NULL, NULL, 0));
+
 	/*
 	 * A claim is an allocation of a specific block.  Claims are needed
 	 * to support immediate writes in the intent log.  The issue is that
@@ -864,8 +883,8 @@ zio_read_phys(zio_t *pio, vdev_t *vd, uint64_t offset, uint64_t size,
 	ASSERT3U(offset + size, <=, vd->vdev_psize);
 
 	zio = zio_create(pio, vd->vdev_spa, 0, NULL, data, size, done, private,
-	    ZIO_TYPE_READ, priority, flags, vd, offset, NULL,
-	    ZIO_STAGE_OPEN, ZIO_READ_PHYS_PIPELINE);
+	    ZIO_TYPE_READ, priority, flags | ZIO_FLAG_PHYSICAL, vd, offset,
+	    NULL, ZIO_STAGE_OPEN, ZIO_READ_PHYS_PIPELINE);
 
 	zio->io_prop.zp_checksum = checksum;
 
@@ -885,8 +904,8 @@ zio_write_phys(zio_t *pio, vdev_t *vd, uint64_t offset, uint64_t size,
 	ASSERT3U(offset + size, <=, vd->vdev_psize);
 
 	zio = zio_create(pio, vd->vdev_spa, 0, NULL, data, size, done, private,
-	    ZIO_TYPE_WRITE, priority, flags, vd, offset, NULL,
-	    ZIO_STAGE_OPEN, ZIO_WRITE_PHYS_PIPELINE);
+	    ZIO_TYPE_WRITE, priority, flags | ZIO_FLAG_PHYSICAL, vd, offset,
+	    NULL, ZIO_STAGE_OPEN, ZIO_WRITE_PHYS_PIPELINE);
 
 	zio->io_prop.zp_checksum = checksum;
 
@@ -1019,20 +1038,27 @@ zio_shrink(zio_t *zio, uint64_t size)
  */
 
 static int
-zio_read_bp_init(zio_t **ziop)
+zio_read_bp_init(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	blkptr_t *bp = zio->io_bp;
 
 	if (BP_GET_COMPRESS(bp) != ZIO_COMPRESS_OFF &&
 	    zio->io_child_type == ZIO_CHILD_LOGICAL &&
 	    !(zio->io_flags & ZIO_FLAG_RAW)) {
-		uint64_t psize = BP_GET_PSIZE(bp);
+		uint64_t psize =
+		    BP_IS_EMBEDDED(bp) ? BPE_GET_PSIZE(bp) : BP_GET_PSIZE(bp);
 		void *cbuf = zio_buf_alloc(psize);
 
 		zio_push_transform(zio, cbuf, psize, psize, zio_decompress);
 	}
 
+	if (BP_IS_EMBEDDED(bp) && BPE_GET_ETYPE(bp) == BP_EMBEDDED_TYPE_DATA) {
+		zio->io_pipeline = ZIO_INTERLOCK_PIPELINE;
+		decode_embedded_bp_compressed(bp, zio->io_data);
+	} else {
+		ASSERT(!BP_IS_EMBEDDED(bp));
+	}
+
 	if (!DMU_OT_IS_METADATA(BP_GET_TYPE(bp)) && BP_GET_LEVEL(bp) == 0)
 		zio->io_flags |= ZIO_FLAG_DONT_CACHE;
 
@@ -1046,9 +1072,8 @@ zio_read_bp_init(zio_t **ziop)
 }
 
 static int
-zio_write_bp_init(zio_t **ziop)
+zio_write_bp_init(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	spa_t *spa = zio->io_spa;
 	zio_prop_t *zp = &zio->io_prop;
 	enum zio_compress compress = zp->zp_compress;
@@ -1077,6 +1102,9 @@ zio_write_bp_init(zio_t **ziop)
 		*bp = *zio->io_bp_override;
 		zio->io_pipeline = ZIO_INTERLOCK_PIPELINE;
 
+		if (BP_IS_EMBEDDED(bp))
+			return (ZIO_PIPELINE_CONTINUE);
+
 		/*
 		 * If we've been overridden and nopwrite is set then
 		 * set the flag accordingly to indicate that a nopwrite
@@ -1125,21 +1153,48 @@ zio_write_bp_init(zio_t **ziop)
 			compress = ZIO_COMPRESS_OFF;
 
 		/* Make sure someone doesn't change their mind on overwrites */
-		ASSERT(MIN(zp->zp_copies + BP_IS_GANG(bp),
+		ASSERT(BP_IS_EMBEDDED(bp) || MIN(zp->zp_copies + BP_IS_GANG(bp),
 		    spa_max_replication(spa)) == BP_GET_NDVAS(bp));
 	}
 
 	if (compress != ZIO_COMPRESS_OFF) {
-		metaslab_class_t *mc = spa_normal_class(spa);
 		void *cbuf = zio_buf_alloc(lsize);
-		psize = zio_compress_data(compress, zio->io_data, cbuf, lsize,
-		    (size_t)metaslab_class_get_minblocksize(mc));
+		psize = zio_compress_data(compress, zio->io_data, cbuf, lsize);
 		if (psize == 0 || psize == lsize) {
 			compress = ZIO_COMPRESS_OFF;
 			zio_buf_free(cbuf, lsize);
+		} else if (!zp->zp_dedup && psize <= BPE_PAYLOAD_SIZE &&
+		    zp->zp_level == 0 && !DMU_OT_HAS_FILL(zp->zp_type) &&
+		    spa_feature_is_enabled(spa, SPA_FEATURE_EMBEDDED_DATA)) {
+			encode_embedded_bp_compressed(bp,
+			    cbuf, compress, lsize, psize);
+			BPE_SET_ETYPE(bp, BP_EMBEDDED_TYPE_DATA);
+			BP_SET_TYPE(bp, zio->io_prop.zp_type);
+			BP_SET_LEVEL(bp, zio->io_prop.zp_level);
+			zio_buf_free(cbuf, lsize);
+			bp->blk_birth = zio->io_txg;
+			zio->io_pipeline = ZIO_INTERLOCK_PIPELINE;
+			ASSERT(spa_feature_is_active(spa,
+			    SPA_FEATURE_EMBEDDED_DATA));
+			return (ZIO_PIPELINE_CONTINUE);
 		} else {
-			ASSERT(psize < lsize);
-			zio_push_transform(zio, cbuf, psize, lsize, NULL);
+			/*
+			 * Round up compressed size to MINBLOCKSIZE and
+			 * zero the tail.
+			 */
+			size_t rounded =
+			    P2ROUNDUP(psize, (size_t)SPA_MINBLOCKSIZE);
+			if (rounded > psize) {
+				bzero((char *)cbuf + psize, rounded - psize);
+				psize = rounded;
+			}
+			if (psize == lsize) {
+				compress = ZIO_COMPRESS_OFF;
+				zio_buf_free(cbuf, lsize);
+			} else {
+				zio_push_transform(zio, cbuf,
+				    psize, lsize, NULL);
+			}
 		}
 	}
 
@@ -1198,9 +1253,8 @@ zio_write_bp_init(zio_t **ziop)
 }
 
 static int
-zio_free_bp_init(zio_t **ziop)
+zio_free_bp_init(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	blkptr_t *bp = zio->io_bp;
 
 	if (zio->io_child_type == ZIO_CHILD_LOGICAL) {
@@ -1283,10 +1337,8 @@ zio_taskq_member(zio_t *zio, zio_taskq_type_t q)
 }
 
 static int
-zio_issue_async(zio_t **ziop)
+zio_issue_async(zio_t *zio)
 {
-	zio_t *zio = *ziop;
-
 	zio_taskq_dispatch(zio, ZIO_TASKQ_ISSUE, B_FALSE);
 
 	return (ZIO_PIPELINE_STOP);
@@ -1354,7 +1406,7 @@ zio_execute(zio_t *zio)
 		}
 
 		zio->io_stage = stage;
-		rv = zio_pipeline[highbit64(stage) - 1](&zio);
+		rv = zio_pipeline[highbit64(stage) - 1](zio);
 
 		if (rv == ZIO_PIPELINE_STOP)
 			return;
@@ -1788,9 +1840,8 @@ zio_gang_tree_issue(zio_t *pio, zio_gang_node_t *gn, blkptr_t *bp, void *data)
 }
 
 static int
-zio_gang_assemble(zio_t **ziop)
+zio_gang_assemble(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	blkptr_t *bp = zio->io_bp;
 
 	ASSERT(BP_IS_GANG(bp) && zio->io_gang_leader == NULL);
@@ -1804,9 +1855,8 @@ zio_gang_assemble(zio_t **ziop)
 }
 
 static int
-zio_gang_issue(zio_t **ziop)
+zio_gang_issue(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	blkptr_t *bp = zio->io_bp;
 
 	if (zio_wait_for_children(zio, ZIO_CHILD_GANG, ZIO_WAIT_DONE))
@@ -1940,9 +1990,8 @@ zio_write_gang_block(zio_t *pio)
  * writes) and as a result is mutually exclusive with dedup.
  */
 static int
-zio_nop_write(zio_t **ziop)
+zio_nop_write(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	blkptr_t *bp = zio->io_bp;
 	blkptr_t *bp_orig = &zio->io_bp_orig;
 	zio_prop_t *zp = &zio->io_prop;
@@ -2013,9 +2062,8 @@ zio_ddt_child_read_done(zio_t *zio)
 }
 
 static int
-zio_ddt_read_start(zio_t **ziop)
+zio_ddt_read_start(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	blkptr_t *bp = zio->io_bp;
 
 	ASSERT(BP_GET_DEDUP(bp));
@@ -2057,9 +2105,8 @@ zio_ddt_read_start(zio_t **ziop)
 }
 
 static int
-zio_ddt_read_done(zio_t **ziop)
+zio_ddt_read_done(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	blkptr_t *bp = zio->io_bp;
 
 	if (zio_wait_for_children(zio, ZIO_CHILD_DDT, ZIO_WAIT_DONE))
@@ -2227,9 +2274,8 @@ zio_ddt_ditto_write_done(zio_t *zio)
 }
 
 static int
-zio_ddt_write(zio_t **ziop)
+zio_ddt_write(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	spa_t *spa = zio->io_spa;
 	blkptr_t *bp = zio->io_bp;
 	uint64_t txg = zio->io_txg;
@@ -2340,9 +2386,8 @@ zio_ddt_write(zio_t **ziop)
 ddt_entry_t *freedde; /* for debugging */
 
 static int
-zio_ddt_free(zio_t **ziop)
+zio_ddt_free(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	spa_t *spa = zio->io_spa;
 	blkptr_t *bp = zio->io_bp;
 	ddt_t *ddt = ddt_select(spa, bp);
@@ -2367,9 +2412,8 @@ zio_ddt_free(zio_t **ziop)
  * ==========================================================================
  */
 static int
-zio_dva_allocate(zio_t **ziop)
+zio_dva_allocate(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	spa_t *spa = zio->io_spa;
 	metaslab_class_t *mc = spa_normal_class(spa);
 	blkptr_t *bp = zio->io_bp;
@@ -2411,19 +2455,16 @@ zio_dva_allocate(zio_t **ziop)
 }
 
 static int
-zio_dva_free(zio_t **ziop)
+zio_dva_free(zio_t *zio)
 {
-	zio_t *zio = *ziop;
-
 	metaslab_free(zio->io_spa, zio->io_bp, zio->io_txg, B_FALSE);
 
 	return (ZIO_PIPELINE_CONTINUE);
 }
 
 static int
-zio_dva_claim(zio_t **ziop)
+zio_dva_claim(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	int error;
 
 	error = metaslab_claim(zio->io_spa, zio->io_bp, zio->io_txg);
@@ -2517,12 +2558,12 @@ zio_free_zil(spa_t *spa, uint64_t txg, blkptr_t *bp)
  * ==========================================================================
  */
 static int
-zio_vdev_io_start(zio_t **ziop)
+zio_vdev_io_start(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	vdev_t *vd = zio->io_vd;
 	uint64_t align;
 	spa_t *spa = zio->io_spa;
+	int ret;
 
 	ASSERT(zio->io_error == 0);
 	ASSERT(zio->io_child_error[ZIO_CHILD_VDEV] == 0);
@@ -2565,7 +2606,10 @@ zio_vdev_io_start(zio_t **ziop)
 
 	align = 1ULL << vd->vdev_top->vdev_ashift;
 
-	if (P2PHASE(zio->io_size, align) != 0) {
+	if ((!(zio->io_flags & ZIO_FLAG_PHYSICAL) ||
+	    (vd->vdev_top->vdev_physical_ashift > SPA_MINBLOCKSHIFT)) &&
+	    P2PHASE(zio->io_size, align) != 0) {
+		/* Transform logical writes to be a full physical block size. */
 		uint64_t asize = P2ROUNDUP(zio->io_size, align);
 		char *abuf = NULL;
 		if (zio->io_type == ZIO_TYPE_READ ||
@@ -2580,8 +2624,22 @@ zio_vdev_io_start(zio_t **ziop)
 		    zio_subblock);
 	}
 
-	ASSERT(P2PHASE(zio->io_offset, align) == 0);
-	ASSERT(P2PHASE(zio->io_size, align) == 0);
+	/*
+	 * If this is not a physical io, make sure that it is properly aligned
+	 * before proceeding.
+	 */
+	if (!(zio->io_flags & ZIO_FLAG_PHYSICAL)) {
+		ASSERT0(P2PHASE(zio->io_offset, align));
+		ASSERT0(P2PHASE(zio->io_size, align));
+	} else {
+		/*
+		 * For physical writes, we allow 512b aligned writes and assume
+		 * the device will perform a read-modify-write as necessary.
+		 */
+		ASSERT0(P2PHASE(zio->io_offset, SPA_MINBLOCKSIZE));
+		ASSERT0(P2PHASE(zio->io_size, SPA_MINBLOCKSIZE));
+	}
+
 	VERIFY(zio->io_type == ZIO_TYPE_READ || spa_writeable(spa));
 
 	/*
@@ -2616,7 +2674,6 @@ zio_vdev_io_start(zio_t **ziop)
 		case ZIO_TYPE_FREE:
 			if ((zio = vdev_queue_io(zio)) == NULL)
 				return (ZIO_PIPELINE_STOP);
-			*ziop = zio;
 
 			if (!vdev_accessible(vd, zio)) {
 				zio->io_error = SET_ERROR(ENXIO);
@@ -2636,13 +2693,15 @@ zio_vdev_io_start(zio_t **ziop)
 			return (ZIO_PIPELINE_STOP);
 	}
 
-	return (vd->vdev_ops->vdev_op_io_start(zio));
+	ret = vd->vdev_ops->vdev_op_io_start(zio);
+	ASSERT(ret == ZIO_PIPELINE_STOP);
+
+	return (ret);
 }
 
 static int
-zio_vdev_io_done(zio_t **ziop)
+zio_vdev_io_done(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	vdev_t *vd = zio->io_vd;
 	vdev_ops_t *ops = vd ? vd->vdev_ops : &vdev_mirror_ops;
 	boolean_t unexpected_error = B_FALSE;
@@ -2720,9 +2779,8 @@ zio_vsd_default_cksum_report(zio_t *zio, zio_cksum_report_t *zcr, void *ignored)
 }
 
 static int
-zio_vdev_io_assess(zio_t **ziop)
+zio_vdev_io_assess(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	vdev_t *vd = zio->io_vd;
 
 	if (zio_wait_for_children(zio, ZIO_CHILD_VDEV, ZIO_WAIT_DONE))
@@ -2837,9 +2895,8 @@ zio_vdev_io_bypass(zio_t *zio)
  * ==========================================================================
  */
 static int
-zio_checksum_generate(zio_t **ziop)
+zio_checksum_generate(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	blkptr_t *bp = zio->io_bp;
 	enum zio_checksum checksum;
 
@@ -2869,9 +2926,8 @@ zio_checksum_generate(zio_t **ziop)
 }
 
 static int
-zio_checksum_verify(zio_t **ziop)
+zio_checksum_verify(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	zio_bad_cksum_t info;
 	blkptr_t *bp = zio->io_bp;
 	int error;
@@ -2913,7 +2969,7 @@ zio_checksum_verified(zio_t *zio)
 /*
  * ==========================================================================
  * Error rank.  Error are ranked in the order 0, ENXIO, ECKSUM, EIO, other.
- * An error of 0 indictes success.  ENXIO indicates whole-device failure,
+ * An error of 0 indicates success.  ENXIO indicates whole-device failure,
  * which may be transient (e.g. unplugged) or permament.  ECKSUM and EIO
  * indicate errors that are specific to one I/O, and most likely permanent.
  * Any other error is presumed to be worse because we weren't expecting it.
@@ -2942,9 +2998,8 @@ zio_worst_error(int e1, int e2)
  * ==========================================================================
  */
 static int
-zio_ready(zio_t **ziop)
+zio_ready(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	blkptr_t *bp = zio->io_bp;
 	zio_t *pio, *pio_next;
 
@@ -3001,9 +3056,8 @@ zio_ready(zio_t **ziop)
 }
 
 static int
-zio_done(zio_t **ziop)
+zio_done(zio_t *zio)
 {
-	zio_t *zio = *ziop;
 	spa_t *spa = zio->io_spa;
 	zio_t *lio = zio->io_logical;
 	blkptr_t *bp = zio->io_bp;
@@ -3025,7 +3079,7 @@ zio_done(zio_t **ziop)
 		for (int w = 0; w < ZIO_WAIT_TYPES; w++)
 			ASSERT(zio->io_children[c][w] == 0);
 
-	if (bp != NULL) {
+	if (bp != NULL && !BP_IS_EMBEDDED(bp)) {
 		ASSERT(bp->blk_pad[0] == 0);
 		ASSERT(bp->blk_pad[1] == 0);
 		ASSERT(bcmp(bp, &zio->io_bp_copy, sizeof (blkptr_t)) == 0 ||
@@ -3311,21 +3365,14 @@ static zio_pipe_stage_t *zio_pipeline[] = {
 
 /* dnp is the dnode for zb1->zb_object */
 boolean_t
-zbookmark_is_before(const dnode_phys_t *dnp, const zbookmark_t *zb1,
-    const zbookmark_t *zb2)
+zbookmark_is_before(const dnode_phys_t *dnp, const zbookmark_phys_t *zb1,
+    const zbookmark_phys_t *zb2)
 {
 	uint64_t zb1nextL0, zb2thisobj;
 
 	ASSERT(zb1->zb_objset == zb2->zb_objset);
 	ASSERT(zb2->zb_level == 0);
 
-	/*
-	 * A bookmark in the deadlist is considered to be after
-	 * everything else.
-	 */
-	if (zb2->zb_object == DMU_DEADLIST_OBJECT)
-		return (B_TRUE);
-
 	/* The objset_phys_t isn't before anything. */
 	if (dnp == NULL)
 		return (B_FALSE);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
index 30994a4ef305..87f3262f3b2b 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
@@ -41,14 +41,12 @@
 typedef struct zcomp_stats {
 	kstat_named_t zcompstat_attempts;
 	kstat_named_t zcompstat_empty;
-	kstat_named_t zcompstat_skipped_minblocksize;
 	kstat_named_t zcompstat_skipped_insufficient_gain;
 } zcomp_stats_t;
 
 static zcomp_stats_t zcomp_stats = {
 	{ "attempts",			KSTAT_DATA_UINT64 },
 	{ "empty",			KSTAT_DATA_UINT64 },
-	{ "skipped_minblocksize",	KSTAT_DATA_UINT64 },
 	{ "skipped_insufficient_gain",	KSTAT_DATA_UINT64 }
 };
 
@@ -99,11 +97,10 @@ zio_compress_select(enum zio_compress child, enum zio_compress parent)
 }
 
 size_t
-zio_compress_data(enum zio_compress c, void *src, void *dst, size_t s_len,
-    size_t minblocksize)
+zio_compress_data(enum zio_compress c, void *src, void *dst, size_t s_len)
 {
 	uint64_t *word, *word_end;
-	size_t c_len, d_len, r_len;
+	size_t c_len, d_len;
 	zio_compress_info_t *ci = &zio_compress_table[c];
 
 	ASSERT((uint_t)c < ZIO_COMPRESS_FUNCTIONS);
@@ -129,12 +126,7 @@ zio_compress_data(enum zio_compress c, void *src, void *dst, size_t s_len,
 		return (s_len);
 
 	/* Compress at least 12.5% */
-	d_len = P2ALIGN(s_len - (s_len >> 3), minblocksize);
-	if (d_len == 0) {
-		ZCOMPSTAT_BUMP(zcompstat_skipped_minblocksize);
-		return (s_len);
-	}
-
+	d_len = s_len - (s_len >> 3);
 	c_len = ci->ci_compress(src, dst, s_len, d_len, ci->ci_level);
 
 	if (c_len > d_len) {
@@ -142,19 +134,7 @@ zio_compress_data(enum zio_compress c, void *src, void *dst, size_t s_len,
 		return (s_len);
 	}
 
-	/*
-	 * Cool.  We compressed at least as much as we were hoping to.
-	 * For both security and repeatability, pad out the last sector.
-	 */
-	r_len = P2ROUNDUP(c_len, minblocksize);
-	if (r_len > c_len) {
-		bzero((char *)dst + c_len, r_len - c_len);
-		c_len = r_len;
-	}
-
 	ASSERT3U(c_len, <=, d_len);
-	ASSERT(P2PHASE(c_len, minblocksize) == 0);
-
 	return (c_len);
 }
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c
index 9f3db704b2fa..b2976111d65e 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 /*
@@ -64,7 +64,7 @@ static int inject_next_id = 1;
  * Returns true if the given record matches the I/O in progress.
  */
 static boolean_t
-zio_match_handler(zbookmark_t *zb, uint64_t type,
+zio_match_handler(zbookmark_phys_t *zb, uint64_t type,
     zinject_record_t *record, int error)
 {
 	/*
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 fb3789f45b11..056efd8a82ec 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
@@ -23,12 +23,12 @@
  *
  * Copyright (c) 2006-2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
  * All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
- * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  *
  * Portions Copyright 2010 Robert Milkowski
  *
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  */
 
 /* Portions Copyright 2011 Martin Matuska <mm@FreeBSD.org> */
@@ -119,7 +119,6 @@ static uint32_t zvol_minors;
 SYSCTL_DECL(_vfs_zfs);
 SYSCTL_NODE(_vfs_zfs, OID_AUTO, vol, CTLFLAG_RW, 0, "ZFS VOLUME");
 static int	volmode = ZFS_VOLMODE_GEOM;
-TUNABLE_INT("vfs.zfs.vol.mode", &volmode);
 SYSCTL_INT(_vfs_zfs_vol, OID_AUTO, mode, CTLFLAG_RWTUN, &volmode, 0,
     "Expose as GEOM providers (1), device files (2) or neither");
 
@@ -305,7 +304,7 @@ struct maparg {
 /*ARGSUSED*/
 static int
 zvol_map_block(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
 	struct maparg *ma = arg;
 	zvol_extent_t *ze;
@@ -315,6 +314,8 @@ zvol_map_block(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
 	    zb->zb_object != ZVOL_OBJ || zb->zb_level != 0)
 		return (0);
 
+	VERIFY(!BP_IS_EMBEDDED(bp));
+
 	VERIFY3U(ma->ma_blks, ==, zb->zb_blkid);
 	ma->ma_blks++;
 
@@ -850,6 +851,7 @@ zvol_update_volsize(objset_t *os, uint64_t volsize)
 
 	tx = dmu_tx_create(os);
 	dmu_tx_hold_zap(tx, ZVOL_ZAP_OBJ, TRUE, NULL);
+	dmu_tx_mark_netfree(tx);
 	error = dmu_tx_assign(tx, TXG_WAIT);
 	if (error) {
 		dmu_tx_abort(tx);
@@ -1628,7 +1630,11 @@ zvol_write(struct cdev *dev, struct uio *uio, int ioflag)
 	}
 #endif
 
+#ifdef sun
 	sync = !(zv->zv_flags & ZVOL_WCE) ||
+#else
+	sync =
+#endif
 	    (zv->zv_objset->os_sync == ZFS_SYNC_ALWAYS);
 
 	rl = zfs_range_lock(&zv->zv_znode, uio->uio_loffset, uio->uio_resid,
@@ -1982,6 +1988,7 @@ zvol_ioctl(dev_t dev, int cmd, intptr_t arg, int flag, cred_t *cr, int *rvalp)
 		rl = zfs_range_lock(&zv->zv_znode, df.df_start, df.df_length,
 		    RL_WRITER);
 		tx = dmu_tx_create(zv->zv_objset);
+		dmu_tx_mark_netfree(tx);
 		error = dmu_tx_assign(tx, TXG_WAIT);
 		if (error != 0) {
 			dmu_tx_abort(tx);
@@ -2106,7 +2113,8 @@ zvol_dump_init(zvol_state_t *zv, boolean_t resize)
 			return (SET_ERROR(ENOTSUP));
 		(void) dsl_sync_task(spa_name(spa),
 		    zfs_mvdev_dump_feature_check,
-		    zfs_mvdev_dump_activate_feature_sync, NULL, 2);
+		    zfs_mvdev_dump_activate_feature_sync, NULL,
+		    2, ZFS_SPACE_CHECK_RESERVED);
 	}
 
 	tx = dmu_tx_create(os);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h b/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
index eea9c5558b1e..10e0ddaeef88 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2014 by Delphix. All rights reserved.
+ */
+
 #ifndef	_AVL_H
 #define	_AVL_H
 
@@ -259,6 +263,11 @@ extern boolean_t avl_update(avl_tree_t *, void *);
 extern boolean_t avl_update_lt(avl_tree_t *, void *);
 extern boolean_t avl_update_gt(avl_tree_t *, void *);
 
+/*
+ * Swaps the contents of the two trees.
+ */
+extern void avl_swap(avl_tree_t *tree1, avl_tree_t *tree2);
+
 /*
  * Return the number of nodes in the tree
  */
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h b/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h
index def14b7a3fbc..8e3f4cad1f0e 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2012, Joyent, Inc.  All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc.  All rights reserved.
  */
 
 /*
@@ -155,6 +155,7 @@ extern ctf_file_t *ctf_bufopen(const ctf_sect_t *, const ctf_sect_t *,
 extern ctf_file_t *ctf_fdopen(int, int *);
 extern ctf_file_t *ctf_open(const char *, int *);
 extern ctf_file_t *ctf_create(int *);
+extern ctf_file_t *ctf_dup(ctf_file_t *);
 extern void ctf_close(ctf_file_t *);
 
 extern ctf_file_t *ctf_parent_file(ctf_file_t *);
@@ -180,6 +181,8 @@ extern ctf_id_t ctf_lookup_by_symbol(ctf_file_t *, ulong_t);
 extern ctf_id_t ctf_type_resolve(ctf_file_t *, ctf_id_t);
 extern ssize_t ctf_type_lname(ctf_file_t *, ctf_id_t, char *, size_t);
 extern char *ctf_type_name(ctf_file_t *, ctf_id_t, char *, size_t);
+extern char *ctf_type_qname(ctf_file_t *, ctf_id_t, char *, size_t,
+    const char *);
 extern ssize_t ctf_type_size(ctf_file_t *, ctf_id_t);
 extern ssize_t ctf_type_align(ctf_file_t *, ctf_id_t);
 extern int ctf_type_kind(ctf_file_t *, ctf_id_t);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
index 295457c634a4..ff8355e4afae 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
@@ -25,8 +25,8 @@
  */
 
 /*
- * Copyright (c) 2011, Joyent, Inc. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_DTRACE_H
@@ -312,8 +312,10 @@ typedef enum dtrace_probespec {
 #define	DIF_SUBR_SX_EXCLUSIVE_HELD	49
 #define	DIF_SUBR_SX_ISEXCLUSIVE		50
 #define	DIF_SUBR_MEMSTR			51
-
-#define	DIF_SUBR_MAX			51	/* max subroutine value */
+#define	DIF_SUBR_GETF			52
+#define	DIF_SUBR_JSON			53
+#define	DIF_SUBR_STRTOLL		54
+#define	DIF_SUBR_MAX			54	/* max subroutine value */
 
 typedef uint32_t dif_instr_t;
 
@@ -375,6 +377,7 @@ typedef struct dtrace_diftype {
 #define	DIF_TYPE_STRING		1	/* type is a D string */
 
 #define	DIF_TF_BYREF		0x1	/* type is passed by reference */
+#define	DIF_TF_BYUREF		0x2	/* user type is passed by reference */
 
 /*
  * A DTrace Intermediate Format variable record is used to describe each of the
@@ -724,6 +727,20 @@ typedef struct dof_sec {
 
 #define	DOF_SECF_LOAD		1	/* section should be loaded */
 
+#define	DOF_SEC_ISLOADABLE(x)						\
+	(((x) == DOF_SECT_ECBDESC) || ((x) == DOF_SECT_PROBEDESC) ||	\
+	((x) == DOF_SECT_ACTDESC) || ((x) == DOF_SECT_DIFOHDR) ||	\
+	((x) == DOF_SECT_DIF) || ((x) == DOF_SECT_STRTAB) ||		\
+	((x) == DOF_SECT_VARTAB) || ((x) == DOF_SECT_RELTAB) ||		\
+	((x) == DOF_SECT_TYPTAB) || ((x) == DOF_SECT_URELHDR) ||	\
+	((x) == DOF_SECT_KRELHDR) || ((x) == DOF_SECT_OPTDESC) ||	\
+	((x) == DOF_SECT_PROVIDER) || ((x) == DOF_SECT_PROBES) ||	\
+	((x) == DOF_SECT_PRARGS) || ((x) == DOF_SECT_PROFFS) ||		\
+	((x) == DOF_SECT_INTTAB) || ((x) == DOF_SECT_XLTAB) ||		\
+	((x) == DOF_SECT_XLMEMBERS) || ((x) == DOF_SECT_XLIMPORT) ||	\
+	((x) == DOF_SECT_XLIMPORT) || ((x) == DOF_SECT_XLEXPORT) ||	\
+	((x) == DOF_SECT_PREXPORT) || ((x) == DOF_SECT_PRENOFFS))
+
 typedef struct dof_ecbdesc {
 	dof_secidx_t dofe_probes;	/* link to DOF_SECT_PROBEDESC */
 	dof_secidx_t dofe_pred;		/* link to DOF_SECT_DIFOHDR */
@@ -1031,7 +1048,11 @@ typedef struct dtrace_fmtdesc {
 #define	DTRACEOPT_AGGSORTPOS	25	/* agg. position to sort on */
 #define	DTRACEOPT_AGGSORTKEYPOS	26	/* agg. key position to sort on */
 #define	DTRACEOPT_TEMPORAL	27	/* temporally ordered output */
-#define	DTRACEOPT_MAX		28	/* number of options */
+#define	DTRACEOPT_AGGHIST	28	/* histogram aggregation output */
+#define	DTRACEOPT_AGGPACK	29	/* packed aggregation output */
+#define	DTRACEOPT_AGGZOOM	30	/* zoomed aggregation scaling */
+#define	DTRACEOPT_ZONE		31	/* zone in which to enable probes */
+#define	DTRACEOPT_MAX		32	/* number of options */
 
 #define	DTRACEOPT_UNSET		(dtrace_optval_t)-2	/* unset option */
 
@@ -1706,7 +1727,22 @@ typedef struct dof_helper {
  *
  * 1.10.3  Return value
  *
- *   A boolean value.
+ *   A bitwise OR that encapsulates both the mode (either DTRACE_MODE_KERNEL
+ *   or DTRACE_MODE_USER) and the policy when the privilege of the enabling
+ *   is insufficient for that mode (a combination of DTRACE_MODE_NOPRIV_DROP,
+ *   DTRACE_MODE_NOPRIV_RESTRICT, and DTRACE_MODE_LIMITEDPRIV_RESTRICT).  If
+ *   DTRACE_MODE_NOPRIV_DROP bit is set, insufficient privilege will result
+ *   in the probe firing being silently ignored for the enabling; if the
+ *   DTRACE_NODE_NOPRIV_RESTRICT bit is set, insufficient privilege will not
+ *   prevent probe processing for the enabling, but restrictions will be in
+ *   place that induce a UPRIV fault upon attempt to examine probe arguments
+ *   or current process state.  If the DTRACE_MODE_LIMITEDPRIV_RESTRICT bit
+ *   is set, similar restrictions will be placed upon operation if the
+ *   privilege is sufficient to process the enabling, but does not otherwise
+ *   entitle the enabling to all zones.  The DTRACE_MODE_NOPRIV_DROP and
+ *   DTRACE_MODE_NOPRIV_RESTRICT are mutually exclusive (and one of these
+ *   two policies must be specified), but either may be combined (or not)
+ *   with DTRACE_MODE_LIMITEDPRIV_RESTRICT.
  *
  * 1.10.4  Caller's context
  *
@@ -2101,6 +2137,12 @@ typedef struct dtrace_pops {
 	void (*dtps_destroy)(void *arg, dtrace_id_t id, void *parg);
 } dtrace_pops_t;
 
+#define	DTRACE_MODE_KERNEL			0x01
+#define	DTRACE_MODE_USER			0x02
+#define	DTRACE_MODE_NOPRIV_DROP			0x10
+#define	DTRACE_MODE_NOPRIV_RESTRICT		0x20
+#define	DTRACE_MODE_LIMITEDPRIV_RESTRICT	0x40
+
 typedef uintptr_t	dtrace_provider_id_t;
 
 extern int dtrace_register(const char *, const dtrace_pattr_t *, uint32_t,
@@ -2321,6 +2363,7 @@ extern void (*dtrace_helpers_cleanup)(void);
 extern void (*dtrace_helpers_fork)(proc_t *parent, proc_t *child);
 extern void (*dtrace_cpustart_init)(void);
 extern void (*dtrace_cpustart_fini)(void);
+extern void (*dtrace_closef)(void);
 
 extern void (*dtrace_debugger_init)(void);
 extern void (*dtrace_debugger_fini)(void);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
index 7355aa898b09..f9e96895c46c 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
@@ -934,6 +934,7 @@ typedef struct dtrace_mstate {
 	uintptr_t dtms_strtok;			/* saved strtok() pointer */
 	uint32_t dtms_access;			/* memory access rights */
 	dtrace_difo_t *dtms_difo;		/* current dif object */
+	file_t *dtms_getf;			/* cached rval of getf() */
 } dtrace_mstate_t;
 
 #define	DTRACE_COND_OWNER	0x1
@@ -1166,6 +1167,7 @@ struct dtrace_state {
 	dtrace_optval_t dts_options[DTRACEOPT_MAX]; /* options */
 	dtrace_cred_t dts_cred;			/* credentials */
 	size_t dts_nretained;			/* number of retained enabs */
+	int dts_getf;				/* number of getf() calls */
 };
 
 struct dtrace_provider {
@@ -1268,7 +1270,11 @@ typedef struct dtrace_toxrange {
 	uintptr_t	dtt_limit;		/* limit of toxic range */
 } dtrace_toxrange_t;
 
+#if defined(sun)
 extern uint64_t dtrace_getarg(int, int);
+#else
+extern uint64_t __noinline dtrace_getarg(int, int);
+#endif
 extern greg_t dtrace_getfp(void);
 extern int dtrace_getipl(void);
 extern uintptr_t dtrace_caller(int);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h b/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
index ef63a575e438..87d0650badd5 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
@@ -151,6 +151,7 @@ typedef enum {
 	ZFS_PROP_FILESYSTEM_COUNT,
 	ZFS_PROP_SNAPSHOT_COUNT,
 	ZFS_PROP_REDUNDANT_METADATA,
+	ZFS_PROP_PREV_SNAP,
 	ZFS_NUM_PROPS
 } zfs_prop_t;
 
@@ -193,6 +194,8 @@ typedef enum {
 	ZPOOL_PROP_COMMENT,
 	ZPOOL_PROP_EXPANDSZ,
 	ZPOOL_PROP_FREEING,
+	ZPOOL_PROP_FRAGMENTATION,
+	ZPOOL_PROP_LEAKED,
 	ZPOOL_NUM_PROPS
 } zpool_prop_t;
 
@@ -596,6 +599,13 @@ typedef struct zpool_rewind_policy {
  */
 #define	SPA_MINDEVSIZE		(64ULL << 20)
 
+/*
+ * Set if the fragmentation has not yet been calculated. This can happen
+ * because the space maps have not been upgraded or the histogram feature
+ * is not enabled.
+ */
+#define	ZFS_FRAG_INVALID	UINT64_MAX
+
 /*
  * The location of the pool configuration repository, shared between kernel and
  * userland.
@@ -737,6 +747,7 @@ typedef struct vdev_stat {
  	uint64_t	vs_configured_ashift;	/* TLV vdev_ashift      */
  	uint64_t	vs_logical_ashift;	/* vdev_logical_ashift  */
  	uint64_t	vs_physical_ashift;	/* vdev_physical_ashift */
+	uint64_t	vs_fragmentation;	/* device fragmentation */
 } vdev_stat_t;
 #define VDEV_STAT_VALID(field, uint64_t_field_count) \
     ((uint64_t_field_count * sizeof(uint64_t)) >= \
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h b/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
index f5156148bcbd..de16611af95e 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
@@ -222,7 +222,7 @@ extern "C" {
  * The following set of definitions characterize Solaris on AMD's
  * 64-bit systems.
  */
-#if defined(__x86_64) || defined(__amd64) || defined(__ia64__)
+#if defined(__x86_64) || defined(__amd64)
 
 #if !defined(__amd64)
 #define	__amd64		/* preferred guard */
diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
index 3d3c43cd2e8a..3bb7a4c0ddec 100644
--- a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
+++ b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
@@ -349,7 +349,8 @@ dtrace_getarg(int arg, int aframes)
 	for (i = 1; i <= aframes; i++) {
 		fp = fp->f_frame;
 
-		if (fp->f_retaddr == (long)dtrace_invop_callsite) {
+		if (P2ROUNDUP(fp->f_retaddr, 16) ==
+		    (long)dtrace_invop_callsite) {
 			/*
 			 * In the case of amd64, we will use the pointer to the
 			 * regs structure that was pushed when we took the
@@ -363,33 +364,33 @@ dtrace_getarg(int arg, int aframes)
 			 * we're seeking is passed in regsiters, we can just
 			 * load it directly.
 			 */
-			struct reg *rp = (struct reg *)((uintptr_t)&fp[1] +
-			    sizeof (uintptr_t));
+			struct trapframe *tf =
+			    (struct trapframe *)((uintptr_t)&fp[1]);
 
 			if (arg <= inreg) {
 				switch (arg) {
 				case 0:
-					stack = (uintptr_t *)&rp->r_rdi;
+					stack = (uintptr_t *)&tf->tf_rdi;
 					break;
 				case 1:
-					stack = (uintptr_t *)&rp->r_rsi;
+					stack = (uintptr_t *)&tf->tf_rsi;
 					break;
 				case 2:
-					stack = (uintptr_t *)&rp->r_rdx;
+					stack = (uintptr_t *)&tf->tf_rdx;
 					break;
 				case 3:
-					stack = (uintptr_t *)&rp->r_rcx;
+					stack = (uintptr_t *)&tf->tf_rcx;
 					break;
 				case 4:
-					stack = (uintptr_t *)&rp->r_r8;
+					stack = (uintptr_t *)&tf->tf_r8;
 					break;
 				case 5:
-					stack = (uintptr_t *)&rp->r_r9;
+					stack = (uintptr_t *)&tf->tf_r9;
 					break;
 				}
 				arg = 0;
 			} else {
-				stack = (uintptr_t *)(rp->r_rsp);
+				stack = (uintptr_t *)(tf->tf_rsp);
 				arg -= inreg;
 			}
 			goto load;
diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
index bdd6fbe6f9b9..c123cc6aa5bf 100644
--- a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
@@ -462,29 +462,25 @@ dtrace_gethrestime(void)
 	return (current_time.tv_sec * 1000000000ULL + current_time.tv_nsec);
 }
 
-/* Function to handle DTrace traps during probes. See amd64/amd64/trap.c */
+/* Function to handle DTrace traps during probes. See amd64/amd64/trap.c. */
 int
-dtrace_trap(struct trapframe *frame, u_int type)
+dtrace_trap(struct trapframe *frame)
 {
 	/*
 	 * A trap can occur while DTrace executes a probe. Before
 	 * executing the probe, DTrace blocks re-scheduling and sets
-	 * a flag in it's per-cpu flags to indicate that it doesn't
+	 * a flag in its per-cpu flags to indicate that it doesn't
 	 * want to fault. On returning from the probe, the no-fault
 	 * flag is cleared and finally re-scheduling is enabled.
 	 *
 	 * Check if DTrace has enabled 'no-fault' mode:
-	 *
 	 */
 	if ((cpu_core[curcpu].cpuc_dtrace_flags & CPU_DTRACE_NOFAULT) != 0) {
 		/*
 		 * There are only a couple of trap types that are expected.
 		 * All the rest will be handled in the usual way.
 		 */
-		switch (type) {
-		/* Privilieged instruction fault. */
-		case T_PRIVINFLT:
-			break;
+		switch (frame->tf_trapno) {
 		/* General protection fault. */
 		case T_PROTFLT:
 			/* Flag an illegal operation. */
diff --git a/sys/cddl/dev/dtrace/dtrace_cddl.h b/sys/cddl/dev/dtrace/dtrace_cddl.h
index b0df2c164352..eed32a8a09ab 100644
--- a/sys/cddl/dev/dtrace/dtrace_cddl.h
+++ b/sys/cddl/dev/dtrace/dtrace_cddl.h
@@ -136,6 +136,7 @@ typedef struct kdtrace_thread {
 #define	t_procp		td_proc
 #define	t_tid		td_tid
 #define	t_did		td_tid
+#define	t_cred		td_ucred
 
 
 int priv_policy(const cred_t *, int, boolean_t, int, const char *);
diff --git a/sys/cddl/dev/dtrace/dtrace_clone.c b/sys/cddl/dev/dtrace/dtrace_clone.c
deleted file mode 100644
index 5009e9d5981c..000000000000
--- a/sys/cddl/dev/dtrace/dtrace_clone.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (C) 2006 John Birrell <jb@freebsd.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible 
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * $FreeBSD$
- *
- */
-
-static void
-dtrace_clone(void *arg, struct ucred *cred, char *name, int namelen, struct cdev **dev)
-{
-	int u = -1;
-	size_t len;
-
-	if (*dev != NULL)
-		return;
-
-	len = strlen(name);
-
-	if (len != 6 && len != 13)
-		return;
-
-	if (bcmp(name,"dtrace",6) != 0)
-		return;
-
-	if (len == 13 && bcmp(name,"dtrace/dtrace",13) != 0)
-		return;
-
-	/* Clone the device to the new minor number. */
-	if (clone_create(&dtrace_clones, &dtrace_cdevsw, &u, dev, 0) != 0)
-		/* Create the /dev/dtrace/dtraceNN entry. */
-		*dev = make_dev_credf(MAKEDEV_REF, &dtrace_cdevsw, u, cred,
-		     UID_ROOT, GID_WHEEL, 0600, "dtrace/dtrace%d", u);
-}
diff --git a/sys/cddl/dev/dtrace/dtrace_ioctl.c b/sys/cddl/dev/dtrace/dtrace_ioctl.c
index 13e8eabb21f9..e26109116131 100644
--- a/sys/cddl/dev/dtrace/dtrace_ioctl.c
+++ b/sys/cddl/dev/dtrace/dtrace_ioctl.c
@@ -78,12 +78,9 @@ static int
 dtrace_ioctl(struct cdev *dev, u_long cmd, caddr_t addr,
     int flags __unused, struct thread *td)
 {
-#if __FreeBSD_version < 800039
-	dtrace_state_t *state = dev->si_drv1;
-#else
 	dtrace_state_t *state;
 	devfs_get_cdevpriv((void **) &state);
-#endif
+
 	int error = 0;
 	if (state == NULL)
 		return (EINVAL);
diff --git a/sys/cddl/dev/dtrace/dtrace_load.c b/sys/cddl/dev/dtrace/dtrace_load.c
index e9cf9aef3ba3..8a622c7906df 100644
--- a/sys/cddl/dev/dtrace/dtrace_load.c
+++ b/sys/cddl/dev/dtrace/dtrace_load.c
@@ -158,18 +158,10 @@ dtrace_load(void *dummy)
 
 	mutex_exit(&cpu_lock);
 
-#if __FreeBSD_version < 800039
-	/* Enable device cloning. */
-	clone_setup(&dtrace_clones);
-
-	/* Setup device cloning events. */
-	eh_tag = EVENTHANDLER_REGISTER(dev_clone, dtrace_clone, 0, 1000);
-#else
 	dtrace_dev = make_dev(&dtrace_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
 	    "dtrace/dtrace");
 	helper_dev = make_dev(&helper_cdevsw, 0, UID_ROOT, GID_WHEEL, 0660,
 	    "dtrace/helper");
-#endif
 
 	return;
 }
diff --git a/sys/cddl/dev/dtrace/dtrace_sysctl.c b/sys/cddl/dev/dtrace/dtrace_sysctl.c
index d98111d4184b..9f8b14fd1c66 100644
--- a/sys/cddl/dev/dtrace/dtrace_sysctl.c
+++ b/sys/cddl/dev/dtrace/dtrace_sysctl.c
@@ -25,8 +25,7 @@
 SYSCTL_NODE(_debug, OID_AUTO, dtrace, CTLFLAG_RD, 0, "DTrace debug parameters");
 
 int	dtrace_debug = 0;
-TUNABLE_INT("debug.dtrace.debug", &dtrace_debug);
-SYSCTL_INT(_debug_dtrace, OID_AUTO, debug, CTLFLAG_RW, &dtrace_debug, 0, "");
+SYSCTL_INT(_debug_dtrace, OID_AUTO, debug, CTLFLAG_RWTUN, &dtrace_debug, 0, "");
 
 /* Report registered DTrace providers. */
 static int
diff --git a/sys/cddl/dev/dtrace/dtrace_unload.c b/sys/cddl/dev/dtrace/dtrace_unload.c
index 41b753821c90..da58b8dbfc04 100644
--- a/sys/cddl/dev/dtrace/dtrace_unload.c
+++ b/sys/cddl/dev/dtrace/dtrace_unload.c
@@ -28,23 +28,8 @@ dtrace_unload()
 	dtrace_state_t *state;
 	int error = 0;
 
-#if __FreeBSD_version < 800039
-	/*
-	 * Check if there is still an event handler callback
-	 * registered.
-	 */
-	if (eh_tag != 0) {
-		/* De-register the device cloning event handler. */
-		EVENTHANDLER_DEREGISTER(dev_clone, eh_tag);
-		eh_tag = 0;
-
-		/* Stop device cloning. */
-		clone_cleanup(&dtrace_clones);
-	}
-#else
 	destroy_dev(dtrace_dev);
 	destroy_dev(helper_dev);
-#endif
 
 	mutex_enter(&dtrace_provider_lock);
 	mutex_enter(&dtrace_lock);
diff --git a/sys/cddl/dev/dtrace/i386/dtrace_asm.S b/sys/cddl/dev/dtrace/i386/dtrace_asm.S
index 1a928187a107..6338719bf968 100644
--- a/sys/cddl/dev/dtrace/i386/dtrace_asm.S
+++ b/sys/cddl/dev/dtrace/i386/dtrace_asm.S
@@ -49,14 +49,8 @@
 	 * dtrace_invop wants us to do.
 	 */
 	call	dtrace_invop
-
-	/*
-	 * We pushed 3 times for the arguments to dtrace_invop,
-	 * so we need to increment the stack pointer to get rid of
-	 * those values.
-	 */
-	addl	$12, %esp
 	ALTENTRY(dtrace_invop_callsite)
+	addl	$12, %esp
 	cmpl	$DTRACE_INVOP_PUSHL_EBP, %eax
 	je	invop_push
 	cmpl	$DTRACE_INVOP_POPL_EBP, %eax
diff --git a/sys/cddl/dev/dtrace/i386/dtrace_isa.c b/sys/cddl/dev/dtrace/i386/dtrace_isa.c
index 3f73a50ef2e3..21a8154cdbda 100644
--- a/sys/cddl/dev/dtrace/i386/dtrace_isa.c
+++ b/sys/cddl/dev/dtrace/i386/dtrace_isa.c
@@ -413,7 +413,8 @@ dtrace_getarg(int arg, int aframes)
 	for (i = 1; i <= aframes; i++) {
 		fp = fp->f_frame;
 
-		if (fp->f_retaddr == (long)dtrace_invop_callsite) {
+		if (P2ROUNDUP(fp->f_retaddr, 4) ==
+		    (long)dtrace_invop_callsite) {
 			/*
 			 * If we pass through the invalid op handler, we will
 			 * use the pointer that it passed to the stack as the
@@ -422,7 +423,7 @@ dtrace_getarg(int arg, int aframes)
 			 * beyond the EIP/RIP that was pushed when the trap was
 			 * taken -- hence the "+ 1" below.
 			 */
-			stack = ((uintptr_t **)&fp[1])[1] + 1;
+			stack = ((uintptr_t **)&fp[1])[0] + 1;
 			goto load;
 		}
 
@@ -438,7 +439,7 @@ dtrace_getarg(int arg, int aframes)
 	 */
 	arg++;
 
-	stack = (uintptr_t *)&fp[1];
+	stack = (uintptr_t *)fp + 2;
 
 load:
 	DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
diff --git a/sys/cddl/dev/dtrace/i386/dtrace_subr.c b/sys/cddl/dev/dtrace/i386/dtrace_subr.c
index 49e5c7699d49..e620a8fe6112 100644
--- a/sys/cddl/dev/dtrace/i386/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/i386/dtrace_subr.c
@@ -473,24 +473,23 @@ dtrace_gethrestime(void)
 
 /* Function to handle DTrace traps during probes. See i386/i386/trap.c */
 int
-dtrace_trap(struct trapframe *frame, u_int type)
+dtrace_trap(struct trapframe *frame)
 {
 	/*
 	 * A trap can occur while DTrace executes a probe. Before
 	 * executing the probe, DTrace blocks re-scheduling and sets
-	 * a flag in it's per-cpu flags to indicate that it doesn't
+	 * a flag in its per-cpu flags to indicate that it doesn't
 	 * want to fault. On returning from the probe, the no-fault
 	 * flag is cleared and finally re-scheduling is enabled.
 	 *
 	 * Check if DTrace has enabled 'no-fault' mode:
-	 *
 	 */
 	if ((cpu_core[curcpu].cpuc_dtrace_flags & CPU_DTRACE_NOFAULT) != 0) {
 		/*
 		 * There are only a couple of trap types that are expected.
 		 * All the rest will be handled in the usual way.
 		 */
-		switch (type) {
+		switch (frame->tf_trapno) {
 		/* General protection fault. */
 		case T_PROTFLT:
 			/* Flag an illegal operation. */
diff --git a/sys/cddl/dev/dtrace/mips/dtrace_subr.c b/sys/cddl/dev/dtrace/mips/dtrace_subr.c
index a7ea375cdd3d..5565a616a17c 100644
--- a/sys/cddl/dev/dtrace/mips/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/mips/dtrace_subr.c
@@ -137,17 +137,20 @@ dtrace_gethrestime(void)
 
 /* Function to handle DTrace traps during probes. See amd64/amd64/trap.c */
 int
-dtrace_trap(struct trapframe *frame, u_int type)
+dtrace_trap(struct trapframe *frame)
 {
+	u_int type;
+
+	type = (trapframe->cause & MIPS_CR_EXC_CODE) >> MIPS_CR_EXC_CODE_SHIFT;
+
 	/*
 	 * A trap can occur while DTrace executes a probe. Before
 	 * executing the probe, DTrace blocks re-scheduling and sets
-	 * a flag in it's per-cpu flags to indicate that it doesn't
+	 * a flag in its per-cpu flags to indicate that it doesn't
 	 * want to fault. On returning from the probe, the no-fault
 	 * flag is cleared and finally re-scheduling is enabled.
 	 *
 	 * Check if DTrace has enabled 'no-fault' mode:
-	 *
 	 */
 	if ((cpu_core[curcpu].cpuc_dtrace_flags & CPU_DTRACE_NOFAULT) != 0) {
 		/*
diff --git a/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c b/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
index d58cf92556ca..5411ece1f335 100644
--- a/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c
@@ -262,24 +262,23 @@ dtrace_gethrestime(void)
 
 /* Function to handle DTrace traps during probes. See powerpc/powerpc/trap.c */
 int
-dtrace_trap(struct trapframe *frame, u_int type)
+dtrace_trap(struct trapframe *frame)
 {
 	/*
 	 * A trap can occur while DTrace executes a probe. Before
 	 * executing the probe, DTrace blocks re-scheduling and sets
-	 * a flag in it's per-cpu flags to indicate that it doesn't
+	 * a flag in its per-cpu flags to indicate that it doesn't
 	 * want to fault. On returning from the probe, the no-fault
 	 * flag is cleared and finally re-scheduling is enabled.
 	 *
 	 * Check if DTrace has enabled 'no-fault' mode:
-	 *
 	 */
 	if ((cpu_core[curcpu].cpuc_dtrace_flags & CPU_DTRACE_NOFAULT) != 0) {
 		/*
 		 * There are only a couple of trap types that are expected.
 		 * All the rest will be handled in the usual way.
 		 */
-		switch (type) {
+		switch (frame->exc) {
 		/* Page fault. */
 		case EXC_DSI:
 		case EXC_DSE:
diff --git a/sys/cddl/dev/fbt/fbt.c b/sys/cddl/dev/fbt/fbt.c
index 7e256e7ba878..a4bffa25372e 100644
--- a/sys/cddl/dev/fbt/fbt.c
+++ b/sys/cddl/dev/fbt/fbt.c
@@ -232,13 +232,18 @@ fbt_provide_module_function(linker_file_t lf, int symindx,
 	int size;
 	u_int8_t *instr, *limit;
 
-	if (strncmp(name, "dtrace_", 7) == 0 &&
-	    strncmp(name, "dtrace_safe_", 12) != 0) {
+	if ((strncmp(name, "dtrace_", 7) == 0 &&
+	    strncmp(name, "dtrace_safe_", 12) != 0) ||
+	    strcmp(name, "trap_check") == 0) {
 		/*
 		 * Anything beginning with "dtrace_" may be called
 		 * from probe context unless it explicitly indicates
 		 * that it won't be called from probe context by
 		 * using the prefix "dtrace_safe_".
+		 *
+		 * Additionally, we avoid instrumenting trap_check() to avoid
+		 * the possibility of generating a fault in probe context before
+		 * DTrace's fault handler is called.
 		 */
 		return (0);
 	}
diff --git a/sys/cddl/dev/sdt/sdt.c b/sys/cddl/dev/sdt/sdt.c
index 6856ec7afc3b..27cb03507536 100644
--- a/sys/cddl/dev/sdt/sdt.c
+++ b/sys/cddl/dev/sdt/sdt.c
@@ -257,27 +257,28 @@ sdt_kld_load(void *arg __unused, struct linker_file *lf)
 	struct sdt_probe **probe, **p_begin, **p_end;
 	struct sdt_argtype **argtype, **a_begin, **a_end;
 
-	if (linker_file_lookup_set(lf, "sdt_providers_set", &begin, &end, NULL))
-		return;
-	for (prov = begin; prov < end; prov++)
-		sdt_create_provider(*prov);
+	if (linker_file_lookup_set(lf, "sdt_providers_set", &begin, &end,
+	    NULL) == 0) {
+		for (prov = begin; prov < end; prov++)
+			sdt_create_provider(*prov);
+	}
 
 	if (linker_file_lookup_set(lf, "sdt_probes_set", &p_begin, &p_end,
-	    NULL))
-		return;
-	for (probe = p_begin; probe < p_end; probe++) {
-		(*probe)->sdtp_lf = lf;
-		sdt_create_probe(*probe);
-		TAILQ_INIT(&(*probe)->argtype_list);
+	    NULL) == 0) {
+		for (probe = p_begin; probe < p_end; probe++) {
+			(*probe)->sdtp_lf = lf;
+			sdt_create_probe(*probe);
+			TAILQ_INIT(&(*probe)->argtype_list);
+		}
 	}
 
 	if (linker_file_lookup_set(lf, "sdt_argtypes_set", &a_begin, &a_end,
-	    NULL))
-		return;
-	for (argtype = a_begin; argtype < a_end; argtype++) {
-		(*argtype)->probe->n_args++;
-		TAILQ_INSERT_TAIL(&(*argtype)->probe->argtype_list, *argtype,
-		    argtype_entry);
+	    NULL) == 0) {
+		for (argtype = a_begin; argtype < a_end; argtype++) {
+			(*argtype)->probe->n_args++;
+			TAILQ_INSERT_TAIL(&(*argtype)->probe->argtype_list,
+			    *argtype, argtype_entry);
+		}
 	}
 }
 
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index 68e761b67a7c..815a9b726a04 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -428,54 +428,6 @@ freebsd32_fexecve(struct thread *td, struct freebsd32_fexecve_args *uap)
 	return (error);
 }
 
-#ifdef __ia64__
-static int
-freebsd32_mmap_partial(struct thread *td, vm_offset_t start, vm_offset_t end,
-		       int prot, int fd, off_t pos)
-{
-	vm_map_t map;
-	vm_map_entry_t entry;
-	int rv;
-
-	map = &td->td_proc->p_vmspace->vm_map;
-	if (fd != -1)
-		prot |= VM_PROT_WRITE;
-
-	if (vm_map_lookup_entry(map, start, &entry)) {
-		if ((entry->protection & prot) != prot) {
-			rv = vm_map_protect(map,
-					    trunc_page(start),
-					    round_page(end),
-					    entry->protection | prot,
-					    FALSE);
-			if (rv != KERN_SUCCESS)
-				return (EINVAL);
-		}
-	} else {
-		vm_offset_t addr = trunc_page(start);
-		rv = vm_map_find(map, NULL, 0, &addr, PAGE_SIZE, 0,
-		    VMFS_NO_SPACE, prot, VM_PROT_ALL, 0);
-		if (rv != KERN_SUCCESS)
-			return (EINVAL);
-	}
-
-	if (fd != -1) {
-		struct pread_args r;
-		r.fd = fd;
-		r.buf = (void *) start;
-		r.nbyte = end - start;
-		r.offset = pos;
-		return (sys_pread(td, &r));
-	} else {
-		while (start < end) {
-			subyte((void *) start, 0);
-			start++;
-		}
-		return (0);
-	}
-}
-#endif
-
 int
 freebsd32_mprotect(struct thread *td, struct freebsd32_mprotect_args *uap)
 {
@@ -484,7 +436,7 @@ freebsd32_mprotect(struct thread *td, struct freebsd32_mprotect_args *uap)
 	ap.addr = PTRIN(uap->addr);
 	ap.len = uap->len;
 	ap.prot = uap->prot;
-#if defined(__amd64__) || defined(__ia64__)
+#if defined(__amd64__)
 	if (i386_read_exec && (ap.prot & PROT_READ) != 0)
 		ap.prot |= PROT_EXEC;
 #endif
@@ -501,80 +453,8 @@ freebsd32_mmap(struct thread *td, struct freebsd32_mmap_args *uap)
 	int flags	 = uap->flags;
 	int fd		 = uap->fd;
 	off_t pos	 = PAIR32TO64(off_t,uap->pos);
-#ifdef __ia64__
-	vm_size_t pageoff;
-	int error;
 
-	/*
-	 * Attempt to handle page size hassles.
-	 */
-	pageoff = (pos & PAGE_MASK);
-	if (flags & MAP_FIXED) {
-		vm_offset_t start, end;
-		start = addr;
-		end = addr + len;
-
-		if (start != trunc_page(start)) {
-			error = freebsd32_mmap_partial(td, start,
-						       round_page(start), prot,
-						       fd, pos);
-			if (fd != -1)
-				pos += round_page(start) - start;
-			start = round_page(start);
-		}
-		if (end != round_page(end)) {
-			vm_offset_t t = trunc_page(end);
-			error = freebsd32_mmap_partial(td, t, end,
-						  prot, fd,
-						  pos + t - start);
-			end = trunc_page(end);
-		}
-		if (end > start && fd != -1 && (pos & PAGE_MASK)) {
-			/*
-			 * We can't map this region at all. The specified
-			 * address doesn't have the same alignment as the file
-			 * position. Fake the mapping by simply reading the
-			 * entire region into memory. First we need to make
-			 * sure the region exists.
-			 */
-			vm_map_t map;
-			struct pread_args r;
-			int rv;
-
-			prot |= VM_PROT_WRITE;
-			map = &td->td_proc->p_vmspace->vm_map;
-			rv = vm_map_remove(map, start, end);
-			if (rv != KERN_SUCCESS)
-				return (EINVAL);
-			rv = vm_map_find(map, NULL, 0, &start, end - start,
-			    0, VMFS_NO_SPACE, prot, VM_PROT_ALL, 0);
-			if (rv != KERN_SUCCESS)
-				return (EINVAL);
-			r.fd = fd;
-			r.buf = (void *) start;
-			r.nbyte = end - start;
-			r.offset = pos;
-			error = sys_pread(td, &r);
-			if (error)
-				return (error);
-
-			td->td_retval[0] = addr;
-			return (0);
-		}
-		if (end == start) {
-			/*
-			 * After dealing with the ragged ends, there
-			 * might be none left.
-			 */
-			td->td_retval[0] = addr;
-			return (0);
-		}
-		addr = start;
-		len = end - start;
-	}
-#endif
-
-#if defined(__amd64__) || defined(__ia64__)
+#if defined(__amd64__)
 	if (i386_read_exec && (prot & PROT_READ))
 		prot |= PROT_EXEC;
 #endif
diff --git a/sys/compat/freebsd32/freebsd32_util.h b/sys/compat/freebsd32/freebsd32_util.h
index 928227513685..a5945cfbbe7e 100644
--- a/sys/compat/freebsd32/freebsd32_util.h
+++ b/sys/compat/freebsd32/freebsd32_util.h
@@ -47,7 +47,7 @@ struct freebsd32_ps_strings {
 	int	ps_nenvstr;	/* the number of environment strings */
 };
 
-#if defined(__amd64__) || defined(__ia64__)
+#if defined(__amd64__)
 #include <compat/ia32/ia32_util.h>
 #endif
 
diff --git a/sys/compat/ia32/ia32_sysvec.c b/sys/compat/ia32/ia32_sysvec.c
index a8e52e82eefa..770bbbf9e462 100644
--- a/sys/compat/ia32/ia32_sysvec.c
+++ b/sys/compat/ia32/ia32_sysvec.c
@@ -89,14 +89,11 @@ extern const char *freebsd32_syscallnames[];
 static SYSCTL_NODE(_compat, OID_AUTO, ia32, CTLFLAG_RW, 0, "ia32 mode");
 
 static u_long	ia32_maxdsiz = IA32_MAXDSIZ;
-SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, "");
-TUNABLE_ULONG("compat.ia32.maxdsiz", &ia32_maxdsiz);
+SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RWTUN, &ia32_maxdsiz, 0, "");
 u_long	ia32_maxssiz = IA32_MAXSSIZ;
-SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, "");
-TUNABLE_ULONG("compat.ia32.maxssiz", &ia32_maxssiz);
+SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RWTUN, &ia32_maxssiz, 0, "");
 static u_long	ia32_maxvmem = IA32_MAXVMEM;
-SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, "");
-TUNABLE_ULONG("compat.ia32.maxvmem", &ia32_maxvmem);
+SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RWTUN, &ia32_maxvmem, 0, "");
 
 struct sysentvec ia32_freebsd_sysvec = {
 	.sv_size	= FREEBSD32_SYS_MAXSYSCALL,
diff --git a/sys/compat/ia32/ia32_util.h b/sys/compat/ia32/ia32_util.h
index fe87b72a0728..6b5f9a11de49 100644
--- a/sys/compat/ia32/ia32_util.h
+++ b/sys/compat/ia32/ia32_util.h
@@ -39,17 +39,10 @@
 #include <sys/sysent.h>
 #include <sys/cdefs.h>
 
-#ifdef __ia64__
-#define	FREEBSD32_MAXUSER	((1ul << 32) - IA32_PAGE_SIZE * 2)
-#define	FREEBSD32_MINUSER	0
-#define	FREEBSD32_SHAREDPAGE	0
-#define	FREEBSD32_USRSTACK	FREEBSD32_MAXUSER
-#else	/* __ia64__ */
 #define	FREEBSD32_MAXUSER	((1ul << 32) - IA32_PAGE_SIZE)
 #define	FREEBSD32_MINUSER	0
 #define	FREEBSD32_SHAREDPAGE	(FREEBSD32_MAXUSER - IA32_PAGE_SIZE)
 #define	FREEBSD32_USRSTACK	FREEBSD32_SHAREDPAGE
-#endif	/* __ia64 */
 
 #define	IA32_PAGE_SIZE	4096
 #define	IA32_MAXDSIZ	(512*1024*1024)		/* 512MB */
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c
index f1e4cd88b394..21e010f970e2 100644
--- a/sys/compat/ndis/kern_ndis.c
+++ b/sys/compat/ndis/kern_ndis.c
@@ -483,14 +483,14 @@ ndis_return(dobj, arg)
 	KeReleaseSpinLock(&block->nmb_returnlock, irql);
 }
 
-int
+void
 ndis_return_packet(struct mbuf *m, void *buf, void *arg)
 {
 	ndis_packet		*p;
 	ndis_miniport_block	*block;
 
 	if (arg == NULL)
-		return (EXT_FREE_OK);
+		return;
 
 	p = arg;
 
@@ -499,7 +499,7 @@ ndis_return_packet(struct mbuf *m, void *buf, void *arg)
 
 	/* Release packet when refcount hits zero, otherwise return. */
 	if (p->np_refcnt)
-		return (EXT_FREE_OK);
+		return;
 
 	block = ((struct ndis_softc *)p->np_softc)->ndis_block;
 
@@ -511,8 +511,6 @@ ndis_return_packet(struct mbuf *m, void *buf, void *arg)
 	IoQueueWorkItem(block->nmb_returnitem,
 	    (io_workitem_func)kernndis_functbl[7].ipt_wrap,
 	    WORKQUEUE_CRITICAL, block);
-
-	return (EXT_FREE_OK);
 }
 
 void
diff --git a/sys/compat/ndis/ndis_var.h b/sys/compat/ndis/ndis_var.h
index 823cfc9a6106..e837dc1575bb 100644
--- a/sys/compat/ndis/ndis_var.h
+++ b/sys/compat/ndis/ndis_var.h
@@ -1743,7 +1743,7 @@ extern int ndis_halt_nic(void *);
 extern int ndis_shutdown_nic(void *);
 extern int ndis_pnpevent_nic(void *, int);
 extern int ndis_init_nic(void *);
-extern int ndis_return_packet(struct mbuf *, void *, void *);
+extern void ndis_return_packet(struct mbuf *, void *, void *);
 extern int ndis_init_dma(void *);
 extern int ndis_destroy_dma(void *);
 extern int ndis_create_sysctls(void *);
diff --git a/sys/compat/ndis/pe_var.h b/sys/compat/ndis/pe_var.h
index 84e016251128..9729f0b5e4bf 100644
--- a/sys/compat/ndis/pe_var.h
+++ b/sys/compat/ndis/pe_var.h
@@ -111,7 +111,6 @@ typedef struct image_file_header image_file_header;
 #define	IMAGE_FILE_MACHINE_AM33         0x01d3
 #define	IMAGE_FILE_MACHINE_POWERPC      0x01f0
 #define	IMAGE_FILE_MACHINE_POWERPCFP    0x01f1
-#define	IMAGE_FILE_MACHINE_IA64         0x0200
 #define	IMAGE_FILE_MACHINE_MIPS16       0x0266
 #define	IMAGE_FILE_MACHINE_ALPHA64      0x0284
 #define	IMAGE_FILE_MACHINE_MIPSFPU      0x0366
@@ -333,7 +332,6 @@ typedef struct image_base_reloc image_base_reloc;
 #define	IMAGE_REL_BASED_SECTION			6
 #define	IMAGE_REL_BASED_REL			7
 #define	IMAGE_REL_BASED_MIPS_JMPADDR16		9
-#define	IMAGE_REL_BASED_IA64_IMM64		9 /* yes, 9 too */
 #define	IMAGE_REL_BASED_DIR64			10
 #define	IMAGE_REL_BASED_HIGH3ADJ		11
 
diff --git a/sys/compat/x86bios/x86bios.c b/sys/compat/x86bios/x86bios.c
index 32b992974c9d..5cd31e8a71bb 100644
--- a/sys/compat/x86bios/x86bios.c
+++ b/sys/compat/x86bios/x86bios.c
@@ -70,12 +70,10 @@ static struct mtx x86bios_lock;
 static SYSCTL_NODE(_debug, OID_AUTO, x86bios, CTLFLAG_RD, NULL,
     "x86bios debugging");
 static int x86bios_trace_call;
-TUNABLE_INT("debug.x86bios.call", &x86bios_trace_call);
-SYSCTL_INT(_debug_x86bios, OID_AUTO, call, CTLFLAG_RW, &x86bios_trace_call, 0,
+SYSCTL_INT(_debug_x86bios, OID_AUTO, call, CTLFLAG_RWTUN, &x86bios_trace_call, 0,
     "Trace far function calls");
 static int x86bios_trace_int;
-TUNABLE_INT("debug.x86bios.int", &x86bios_trace_int);
-SYSCTL_INT(_debug_x86bios, OID_AUTO, int, CTLFLAG_RW, &x86bios_trace_int, 0,
+SYSCTL_INT(_debug_x86bios, OID_AUTO, int, CTLFLAG_RWTUN, &x86bios_trace_int, 0,
     "Trace software interrupt handlers");
 
 #ifdef X86BIOS_NATIVE_VM86
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 9ea428e91fa8..06f75a7b0a7e 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -30,7 +30,7 @@ S=	../../..
 .endif
 .include "$S/conf/kern.pre.mk"
 
-INCLUDES+= -I$S/contrib/libfdt
+INCLUDES+= -I$S/contrib/libfdt -I$S/gnu/dts/include 
 
 SYSTEM_LD:= ${SYSTEM_LD:$S/conf/ldscript.$M=ldscript.$M}
 SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscript.$M=ldscript.$M}
@@ -55,7 +55,7 @@ CFLAGS.clang += -mllvm -arm-enable-ehabi
 # hack because genassym.c includes sys/bus.h which includes these.
 genassym.o: bus_if.h device_if.h
 
-SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader ${LDFLAGS} \
+SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader ${_LDFLAGS} \
 	  -warn-common -export-dynamic -dynamic-linker /red/herring -o \
 	   ${FULLKERNEL}.noheader -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL +=;sed s/" + SIZEOF_HEADERS"// ldscript.$M\
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
deleted file mode 100644
index de4d41c474cb..000000000000
--- a/sys/conf/Makefile.ia64
+++ /dev/null
@@ -1,53 +0,0 @@
-# Makefile.ia64 -- with config changes.
-# Copyright 1990 W. Jolitz
-#	from: src/sys/conf/Makefile.alpha,v 1.76
-# $FreeBSD$
-#
-# Makefile for FreeBSD
-#
-# This makefile is constructed from a machine description:
-#	config machineid
-# Most changes should be made in the machine description
-#	/sys/ia64/conf/``machineid''
-# after which you should do
-#	 config machineid
-# Generic makefile changes should be made in
-#	/sys/conf/Makefile.ia64
-# after which config should be rerun for all machines.
-#
-
-# Which version of config(8) is required.
-%VERSREQ=	600012
-
-STD8X16FONT?=	iso
-
-.if !defined(S)
-.if exists(./@/.)
-S=	./@
-.else
-S=	../../..
-.endif
-.endif
-.include "$S/conf/kern.pre.mk"
-
-INCLUDES+= -I$S/contrib/ia64/libuwx/src
-
-CFLAGS+= -mconstant-gp
-
-ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
-
-%BEFORE_DEPEND
-
-%OBJS
-
-%FILES.c
-
-%FILES.s
-
-%FILES.m
-
-%CLEAN
-
-%RULES
-
-.include "$S/conf/kern.post.mk"
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 4d277130b8cd..695942518946 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1452,6 +1452,20 @@ options 	SC_NO_SUSPEND_VTYSWITCH
 options 	TEKEN_CONS25		# cons25-style terminal emulation
 options 	TEKEN_UTF8		# UTF-8 output handling
 
+# The vt video console driver.
+device		vt
+options		VT_ALT_TO_ESC_HACK=1	# Prepend ESC sequence to ALT keys
+options		VT_MAXWINDOWS=16	# Number of virtual consoles
+options		VT_TWOBUTTON_MOUSE	# Use right mouse button to paste
+
+# The following options set the default framebuffer size.
+options		VT_FB_DEFAULT_HEIGHT=480
+options		VT_FB_DEFAULT_WIDTH=640
+
+# The following options will let you change the default vt terminal colors.
+options		TERMINAL_NORM_ATTR=(FG_GREEN|BG_BLACK)
+options		TERMINAL_KERN_ATTR=(FG_LIGHTRED|BG_BLACK)
+
 #
 # Optional devices:
 #
@@ -1809,7 +1823,7 @@ hint.uart.0.baud="115200"
 #
 
 # Options for serial drivers that support consoles:
-options 	BREAK_TO_DEBUGGER	# A BREAK on a serial console goes to
+options 	BREAK_TO_DEBUGGER	# A BREAK/DBG on the console goes to
 					# ddb, if available.
 
 # Solaris implements a new BREAK which is initiated by a character
diff --git a/sys/conf/files b/sys/conf/files
index 46e7776091c3..7faba40f651c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -86,6 +86,8 @@ cam/ctl/ctl_frontend_cam_sim.c	optional ctl
 cam/ctl/ctl_frontend_internal.c	optional ctl
 cam/ctl/ctl_frontend_iscsi.c	optional ctl
 cam/ctl/ctl_scsi_all.c		optional ctl
+cam/ctl/ctl_tpc.c		optional ctl
+cam/ctl/ctl_tpc_local.c		optional ctl
 cam/ctl/ctl_error.c		optional ctl
 cam/ctl/ctl_util.c		optional ctl
 cam/ctl/scsi_ctl.c		optional ctl
@@ -138,6 +140,7 @@ cddl/contrib/opensolaris/common/zfs/zprop_common.c			optional zfs compile-with "
 cddl/contrib/opensolaris/uts/common/fs/gfs.c				optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/vnode.c				optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c			optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c			optional zfs compile-with "${ZFS_C}"
@@ -1167,7 +1170,7 @@ t4fw.fwo		optional cxgbe					\
 	no-implicit-rule						\
 	clean		"t4fw.fwo"
 t4fw.fw			optional cxgbe					\
-	dependency	"$S/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu"	\
+	dependency	"$S/dev/cxgbe/firmware/t4fw-1.11.27.0.bin.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"t4fw.fw"
@@ -1191,7 +1194,7 @@ t5fw.fwo		optional cxgbe					\
 	no-implicit-rule						\
 	clean		"t5fw.fwo"
 t5fw.fw			optional cxgbe					\
-	dependency	"$S/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu"	\
+	dependency	"$S/dev/cxgbe/firmware/t5fw-1.11.27.0.bin.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"t5fw.fw"
@@ -2511,6 +2514,7 @@ dev/usb/template/usb_template_modem.c	optional usb_template
 dev/usb/template/usb_template_mouse.c	optional usb_template
 dev/usb/template/usb_template_msc.c	optional usb_template
 dev/usb/template/usb_template_mtp.c	optional usb_template
+dev/usb/template/usb_template_phone.c	optional usb_template
 #
 # USB END
 #
@@ -2526,7 +2530,7 @@ dev/vt/font/vt_font_default.c	optional vt
 dev/vt/font/vt_mouse_cursor.c	optional vt
 dev/vt/hw/efifb/efifb.c		optional vt_efifb
 dev/vt/hw/fb/vt_fb.c		optional vt
-dev/vt/hw/vga/vga.c		optional vt vt_vga
+dev/vt/hw/vga/vt_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
@@ -2589,6 +2593,7 @@ dev/xen/netback/netback.c	optional xen | xenhvm
 dev/xen/netfront/netfront.c	optional xen | xenhvm
 dev/xen/xenpci/xenpci.c		optional xenpci
 dev/xen/timer/timer.c		optional xen | xenhvm
+dev/xen/pvcpu/pvcpu.c		optional xen | xenhvm
 dev/xl/if_xl.c			optional xl pci
 dev/xl/xlphy.c			optional xl pci
 fs/deadfs/dead_vnops.c		standard
@@ -3013,7 +3018,7 @@ kern/tty_outq.c			standard
 kern/tty_pts.c			standard
 kern/tty_tty.c			standard
 kern/tty_ttydisc.c		standard
-kern/uipc_accf.c		optional inet
+kern/uipc_accf.c		standard
 kern/uipc_debug.c		optional ddb
 kern/uipc_domain.c		standard
 kern/uipc_mbuf.c		standard
@@ -3810,6 +3815,7 @@ pci/viapm.c			optional viapm pci
 rpc/auth_none.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
 rpc/auth_unix.c			optional krpc | nfslockd | nfsclient | nfscl | nfsd
 rpc/authunix_prot.c		optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
+rpc/clnt_bck.c			optional krpc | nfslockd | nfsserver | nfscl | nfsd
 rpc/clnt_dg.c			optional krpc | nfslockd | nfsclient | nfscl | nfsd
 rpc/clnt_rc.c			optional krpc | nfslockd | nfsclient | nfscl | nfsd
 rpc/clnt_vc.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 6eefb4c816df..b63044d72a0b 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -557,3 +557,6 @@ x86/xen/hvm.c			optional	xenhvm
 x86/xen/xen_intr.c		optional	xen | xenhvm
 x86/xen/pv.c			optional	xenhvm
 x86/xen/pvcpu_enum.c		optional	xenhvm
+x86/xen/xen_apic.c		optional	xenhvm
+x86/xen/xenpv.c			optional	xenhvm
+x86/xen/xen_nexus.c		optional	xenhvm
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 7243c1775882..1f7c71d443d5 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -77,6 +77,7 @@ font.h				optional	sc			\
 	clean	"font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
 kern/subr_busdma_bufalloc.c	standard
 kern/subr_dummy_vdso_tc.c	standard
+kern/subr_sfbuf.c		standard
 libkern/arm/aeabi_unwind.c	standard
 libkern/arm/divsi3.S		standard
 libkern/arm/ffs.S		standard
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index ae0238251d5e..ebc81fccd9bd 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -279,7 +279,6 @@ 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
@@ -521,6 +520,7 @@ isa/vga_isa.c			optional vga
 kern/kern_clocksource.c		standard
 kern/imgact_aout.c		optional compat_aout
 kern/imgact_gzip.c		optional gzip
+kern/subr_sfbuf.c		standard
 libkern/divdi3.c		standard
 libkern/flsll.c			standard
 libkern/memmove.c		standard
@@ -594,3 +594,6 @@ x86/x86/tsc.c			standard
 x86/x86/delay.c			standard
 x86/xen/hvm.c			optional xenhvm
 x86/xen/xen_intr.c		optional xen | xenhvm
+x86/xen/xen_apic.c		optional xenhvm
+x86/xen/xenpv.c			optional xen | xenhvm
+x86/xen/xen_nexus.c		optional xen | xenhvm
diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
deleted file mode 100644
index 71b6232fc54b..000000000000
--- a/sys/conf/files.ia64
+++ /dev/null
@@ -1,137 +0,0 @@
-# This file tells config what files go into building a kernel,
-# files marked standard are always included.
-#
-# $FreeBSD$
-#
-# The long compile-with and dependency lines are required because of
-# limitations in config: backslash-newline doesn't work in strings, and
-# dependency lines other than the first are silently ignored.
-#
-#
-font8x16.o			optional	std8x16font		\
-	compile-with	"uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c"				\
-	no-implicit-rule before-depend					\
-	clean		"${STD8X16FONT}-8x16 font8x16.c"
-#
-atkbdmap.h			optional	atkbd_dflt_keymap	\
-	compile-with	"/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"			\
-	no-obj no-implicit-rule before-depend				\
-	clean		"atkbdmap.h"
-#
-font.h				optional	sc_dflt_font		\
-	compile-with	"uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h"										\
-	no-obj no-implicit-rule before-depend				\
-	clean		"font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
-#
-ukbdmap.h			optional	ukbd_dflt_keymap	\
-	compile-with	"/usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h"			\
-	no-obj no-implicit-rule before-depend				\
-	clean		"ukbdmap.h"
-#
-cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S	optional zfs compile-with "${ZFS_S}"
-compat/ia32/ia32_sysvec.c		optional	compat_freebsd32
-contrib/ia64/libuwx/src/uwx_bstream.c		standard
-contrib/ia64/libuwx/src/uwx_context.c		standard
-contrib/ia64/libuwx/src/uwx_env.c		standard
-contrib/ia64/libuwx/src/uwx_scoreboard.c	standard
-contrib/ia64/libuwx/src/uwx_step.c		standard
-contrib/ia64/libuwx/src/uwx_str.c		standard
-contrib/ia64/libuwx/src/uwx_swap.c		standard
-contrib/ia64/libuwx/src/uwx_trace.c		standard
-contrib/ia64/libuwx/src/uwx_uinfo.c		standard
-contrib/ia64/libuwx/src/uwx_utable.c		standard
-crypto/blowfish/bf_enc.c	optional	crypto | ipsec
-crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
-dev/atkbdc/atkbd.c		optional	atkbd atkbdc
-dev/atkbdc/atkbd_atkbdc.c	optional	atkbd atkbdc
-dev/atkbdc/atkbdc.c		optional	atkbdc
-dev/atkbdc/atkbdc_isa.c		optional	atkbdc isa
-dev/atkbdc/atkbdc_subr.c	optional	atkbdc
-dev/atkbdc/psm.c		optional	psm atkbdc
-dev/fb/fb.c			optional	fb | vga
-dev/fb/vga.c			optional	vga
-dev/hwpmc/hwpmc_ia64.c		optional	hwpmc
-dev/io/iodev.c			optional	io
-dev/kbd/kbd.c			optional	atkbd | sc | ukbd | vt
-dev/syscons/scterm-teken.c	optional	sc
-dev/syscons/scvgarndr.c		optional	sc vga
-dev/syscons/scvtb.c		optional	sc
-dev/uart/uart_cpu_ia64.c	optional	uart
-dev/acpica/acpi_if.m		standard
-ia64/acpica/OsdEnvironment.c	optional	acpi
-ia64/acpica/acpi_machdep.c	optional	acpi
-ia64/acpica/acpi_wakeup.c	optional	acpi
-ia64/acpica/madt.c		optional	acpi
-ia64/disasm/disasm_decode.c	standard
-ia64/disasm/disasm_extract.c	standard
-ia64/disasm/disasm_format.c	standard
-ia64/ia32/ia32_misc.c		optional	compat_freebsd32
-ia64/ia32/ia32_reg.c		optional	compat_freebsd32
-ia64/ia32/ia32_signal.c		optional	compat_freebsd32
-ia64/ia32/ia32_trap.c		optional	compat_freebsd32
-ia64/ia64/autoconf.c		standard
-ia64/ia64/bus_machdep.c		standard
-ia64/ia64/busdma_machdep.c	standard
-ia64/ia64/clock.c		standard
-ia64/ia64/context.S		standard
-ia64/ia64/db_machdep.c		optional	ddb
-ia64/ia64/dump_machdep.c	standard
-ia64/ia64/efi.c			standard
-ia64/ia64/elf_machdep.c		standard
-ia64/ia64/emulate.c		standard
-ia64/ia64/exception.S		standard
-ia64/ia64/gdb_machdep.c		optional	gdb
-ia64/ia64/highfp.c		standard
-ia64/ia64/in_cksum.c		optional	inet | inet6
-ia64/ia64/interrupt.c		standard
-ia64/ia64/iodev_machdep.c	optional	io
-ia64/ia64/locore.S		standard	no-obj
-ia64/ia64/machdep.c		standard
-ia64/ia64/mca.c			standard
-ia64/ia64/mem.c			optional	mem
-ia64/ia64/mp_locore.S		optional	smp
-ia64/ia64/mp_machdep.c		optional	smp
-ia64/ia64/nexus.c		standard
-ia64/ia64/pal.S			standard
-ia64/ia64/physical.S		standard
-ia64/ia64/physmem.c		standard
-ia64/ia64/pmap.c		standard
-ia64/ia64/ptrace_machdep.c	standard
-ia64/ia64/sal.c			standard
-ia64/ia64/sapic.c		standard
-ia64/ia64/setjmp.S		standard
-ia64/ia64/stack_machdep.c	optional	ddb | stack
-ia64/ia64/support.S		standard
-ia64/ia64/sys_machdep.c		standard
-ia64/ia64/syscall.S		standard
-ia64/ia64/trap.c		standard
-ia64/ia64/uio_machdep.c		standard
-ia64/ia64/uma_machdep.c		standard
-ia64/ia64/unaligned.c		standard
-ia64/ia64/unwind.c		standard
-ia64/ia64/vm_machdep.c		standard
-ia64/ia64/xtrace.c		optional	xtrace
-ia64/isa/isa.c			optional	isa
-ia64/isa/isa_dma.c		optional	isa
-ia64/pci/pci_cfgreg.c		optional	pci
-isa/syscons_isa.c		optional	sc
-isa/vga_isa.c			optional	vga
-kern/kern_clocksource.c		standard
-libkern/bcmp.c			standard
-libkern/ffsl.c			standard
-libkern/fls.c			standard
-libkern/flsl.c			standard
-libkern/flsll.c			standard
-libkern/ia64/__divdi3.S		standard
-libkern/ia64/__divsi3.S		standard
-libkern/ia64/__moddi3.S		standard
-libkern/ia64/__modsi3.S		standard
-libkern/ia64/__udivdi3.S	standard
-libkern/ia64/__udivsi3.S	standard
-libkern/ia64/__umoddi3.S	standard
-libkern/ia64/__umodsi3.S	standard
-libkern/ia64/bswap16.S		standard
-libkern/ia64/bswap32.S		standard
-libkern/memmove.c		standard
-libkern/memset.c		standard
-kern/subr_dummy_vdso_tc.c	standard
diff --git a/sys/conf/files.mips b/sys/conf/files.mips
index 6522bb20fa26..3677de43ae1b 100644
--- a/sys/conf/files.mips
+++ b/sys/conf/files.mips
@@ -51,6 +51,7 @@ mips/mips/vm_machdep.c			standard
 kern/kern_clocksource.c			standard
 kern/link_elf_obj.c			standard
 kern/subr_dummy_vdso_tc.c		standard
+kern/subr_sfbuf.c			optional	mips | mipsel | mipsn32
 
 # gcc/clang runtime
 libkern/ffsl.c				standard
@@ -68,7 +69,7 @@ dev/cfe/cfe_env.c			optional	cfe_env
 
 # syscons support
 dev/fb/fb.c				optional	sc
-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.pc98 b/sys/conf/files.pc98
index fff7b3ce8f49..31422231d824 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -205,6 +205,7 @@ i386/svr4/svr4_machdep.c	optional compat_svr4
 kern/kern_clocksource.c		standard
 kern/imgact_aout.c		optional compat_aout
 kern/imgact_gzip.c		optional gzip
+kern/subr_sfbuf.c		standard
 libkern/divdi3.c		standard
 libkern/flsll.c			standard
 libkern/memmove.c		standard
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index 8aed60a3d568..10515a537d10 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -71,6 +71,7 @@ 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
+kern/subr_sfbuf.c		standard
 libkern/ashldi3.c		optional	powerpc
 libkern/ashrdi3.c		optional	powerpc
 libkern/bcmp.c			standard
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64
index ccee247ba4d1..0c160d4a13c9 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -35,6 +35,7 @@ dev/atkbdc/psm.c		optional	psm atkbdc
 dev/auxio/auxio.c		optional	auxio sbus | auxio ebus
 dev/esp/esp_sbus.c		optional	esp sbus
 dev/fb/creator.c		optional	creator sc
+dev/fb/creator_vt.c		optional	creator vt
 dev/fb/fb.c			optional	sc
 dev/fb/gallant12x22.c		optional	sc
 dev/fb/machfb.c			optional	machfb sc
@@ -64,6 +65,7 @@ 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
+kern/subr_sfbuf.c		standard
 libkern/ffs.c			standard
 libkern/ffsl.c			standard
 libkern/fls.c			standard
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index ee9a204c21ed..d8873a69c2ca 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -29,7 +29,7 @@ NO_WSOMETIMES_UNINITIALIZED=	-Wno-error-sometimes-uninitialized
 # enough to error out the whole kernel build.  Display them anyway, so there is
 # some incentive to fix them eventually.
 CWARNEXTRA?=	-Wno-error-tautological-compare -Wno-error-empty-body \
-		-Wno-error-parentheses-equality -Wno-unused-function \
+		-Wno-error-parentheses-equality -Wno-error-unused-function \
 		${NO_WFORMAT}
 .endif
 
@@ -71,15 +71,6 @@ INLINE_LIMIT?=	8000
 INLINE_LIMIT?=	8000
 .endif
 
-#
-# For IA-64, we use r13 for the kernel globals pointer and we only use
-# a very small subset of float registers for integer divides.
-#
-.if ${MACHINE_CPUARCH} == "ia64"
-CFLAGS+=	-ffixed-r13 -mfixed-range=f32-f127 -fpic #-mno-sdata
-INLINE_LIMIT?=	15000
-.endif
-
 #
 # For sparc64 we want the medany code model so modules may be located
 # anywhere in the 64-bit address space.  We also tell GCC to use floating
@@ -147,7 +138,7 @@ CFLAGS+=	-ffreestanding
 #
 # GCC SSP support
 #
-.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
+.if ${MK_SSP} != "no" && \
     ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
 CFLAGS+=	-fstack-protector
 .endif
diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index c7842b65343f..31555cce53c4 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -11,17 +11,42 @@
 # that haven't been converted over.
 #
 
+# Note: bsd.own.mk must be included before the rest of kern.opts.mk to make
+# building on 10.x and earlier work. This should be removed when that's no
+# longer supported since it confounds the defaults (since it uses the host's
+# notion of defaults rather than what's default in current when building
+# within sys/modules).
+.include <bsd.own.mk>
+
 # These options are used by the kernel build process (kern.mk and kmod.mk)
 # They have to be listed here so we can build modules outside of the
 # src tree.
 
 __DEFAULT_YES_OPTIONS = \
     ARM_EABI \
+    BLUETOOTH \
+    CDDL \
+    CRYPT \
     FORMAT_EXTENSIONS \
-    KERNEL_SYMBOLS
+    INET \
+    INET6 \
+    IPFILTER \
+    KERNEL_SYMBOLS \
+    NETGRAPH \
+    PF \
+    SOURCELESS_HOST \
+    SOURCELESS_UCODE \
+    USB_GADGET_EXAMPLES \
+    ZFS
 
-# expanded inline from bsd.mkopt.mk:
+__DEFAULT_NO_OPTIONS = \
+    EISA \
+    NAND \
+    OFED
 
+# expanded inline from bsd.mkopt.mk to avoid share/mk dependency
+
+# Those that default to yes
 .for var in ${__DEFAULT_YES_OPTIONS}
 .if !defined(MK_${var})
 .if defined(WITHOUT_${var})			# WITHOUT always wins
@@ -32,3 +57,29 @@ MK_${var}:=	yes
 .endif
 .endfor
 .undef __DEFAULT_YES_OPTIONS
+
+# Those that default to no
+.for var in ${__DEFAULT_NO_OPTIONS}
+.if !defined(MK_${var})
+.if defined(WITH_${var}) && !defined(WITHOUT_${var}) # WITHOUT always wins
+MK_${var}:=	yes
+.else
+MK_${var}:=	no
+.endif
+.endif
+.endfor
+.undef __DEFAULT_NO_OPTIONS
+
+#
+# MK_*_SUPPORT options which default to "yes" unless their corresponding
+# MK_* variable is set to "no".
+#
+.for var in \
+    INET \
+    INET6
+.if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no"
+MK_${var}_SUPPORT:= no
+.else
+MK_${var}_SUPPORT:= yes
+.endif
+.endfor
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index fd85af4c9315..8f7abaf36063 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -126,7 +126,8 @@ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o ${MFS_IMAGE}
 	@echo linking ${.TARGET}
 	${SYSTEM_LD}
 .if ${MK_CTF} != "no"
-	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
+	@echo ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ...
+	@${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
 .endif
 .if !defined(DEBUG)
 	${OBJCOPY} --strip-debug ${.TARGET}
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index b880f18255e5..434337311edf 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -177,7 +177,7 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
 SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}
 SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
 SYSTEM_OBJS+= hack.So
-SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} ${LDFLAGS} --no-warn-mismatch \
+SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} ${_LDFLAGS} --no-warn-mismatch \
 	-warn-common -export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 06b95e51b7c3..090031c774c3 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -65,9 +65,10 @@ KMODLOAD?=	/sbin/kldload
 KMODUNLOAD?=	/sbin/kldunload
 OBJCOPY?=	objcopy
 
-# Grab all the options for a kernel build.
-.include "kern.opts.mk"
 .include <bsd.init.mk>
+# Grab all the options for a kernel build. For backwards compat, we need to
+# do this after bsd.own.mk.
+.include "kern.opts.mk"
 .include <bsd.compiler.mk>
 
 .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S
@@ -146,11 +147,11 @@ CLEANFILES+=	${KMOD:S/$/.c/}
 ${_firmw:C/\:.*$/.fwo/}:	${_firmw:C/\:.*$//}
 	@${ECHO} ${_firmw:C/\:.*$//} ${.ALLSRC:M*${_firmw:C/\:.*$//}}
 	@if [ -e ${_firmw:C/\:.*$//} ]; then			\
-		${LD} -b binary --no-warn-mismatch ${LDFLAGS}	\
+		${LD} -b binary --no-warn-mismatch ${_LDFLAGS}	\
 		    -r -d -o ${.TARGET}	${_firmw:C/\:.*$//};	\
 	else							\
 		ln -s ${.ALLSRC:M*${_firmw:C/\:.*$//}} ${_firmw:C/\:.*$//}; \
-		${LD} -b binary --no-warn-mismatch ${LDFLAGS}	\
+		${LD} -b binary --no-warn-mismatch ${_LDFLAGS}	\
 		    -r -d -o ${.TARGET}	${_firmw:C/\:.*$//};	\
 		rm ${_firmw:C/\:.*$//};				\
 	fi
@@ -178,7 +179,7 @@ ${PROG}.symbols: ${FULLPROG}
 
 .if ${__KLD_SHARED} == yes
 ${FULLPROG}: ${KMOD}.kld
-	${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
+	${LD} -Bshareable ${_LDFLAGS} -o ${.TARGET} ${KMOD}.kld
 .if !defined(DEBUG_FLAGS)
 	${OBJCOPY} --strip-debug ${.TARGET}
 .endif
@@ -194,7 +195,7 @@ ${KMOD}.kld: ${OBJS}
 .else
 ${FULLPROG}: ${OBJS}
 .endif
-	${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
+	${LD} ${_LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
 .if ${MK_CTF} != "no"
 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
 .endif
@@ -222,6 +223,7 @@ _ILINKS+=${MACHINE_CPUARCH}
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 _ILINKS+=x86
 .endif
+CLEANFILES+=${_ILINKS}
 
 all: objwarn ${PROG}
 
@@ -313,6 +315,34 @@ unload:
 	${KMODUNLOAD} -v ${PROG}
 .endif
 
+# Generate options files that otherwise would be built
+# in substantially similar ways through the tree. Move
+# the code here when they all produce identical results
+# (or should)
+.if !defined(KERNBUILDDIR)
+opt_bpf.h:
+	echo "#define DEV_BPF 1" > ${.TARGET}
+.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
+opt_mrouting.h:
+	echo "#define MROUTING 1" > ${.TARGET}
+opt_natm.h:
+	echo "#define NATM 1" > ${.TARGET}
+opt_scsi.h:
+	echo "#define SCSI_DELAY 15000" > ${.TARGET}
+opt_wlan.h:
+	echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
+	echo "#define IEEE80211_AMPDU_AGE 1" >> ${.TARGET}
+	echo "#define IEEE80211_SUPPORT_MESH 1" >> ${.TARGET}
+.endif
+
 .if defined(KERNBUILDDIR)
 .PATH: ${KERNBUILDDIR}
 CFLAGS+=	-I${KERNBUILDDIR}
diff --git a/sys/conf/ldscript.ia64 b/sys/conf/ldscript.ia64
deleted file mode 100644
index 8e0b297cc2f4..000000000000
--- a/sys/conf/ldscript.ia64
+++ /dev/null
@@ -1,152 +0,0 @@
-/* $FreeBSD$ */
-OUTPUT_FORMAT("elf64-ia64-freebsd", "elf64-ia64-freebsd", "elf64-ia64-freebsd")
-OUTPUT_ARCH(ia64)
-ENTRY(__start)
-SEARCH_DIR(/usr/lib);
-kernel_text = 0x9ffc000000000000;
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = kernel_text + SIZEOF_HEADERS;
-  .interp         : { *(.interp) }
-
-  PROVIDE (btext = .);
-  .text           :
-  {
-    *(.ivt)
-    *(.ivt.text)
-    *(.text .stub .text.* .gnu.linkonce.t.*)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-  } = 0x00300000010070000002000001000400
-  .init           : { *(.init) } = 0x00300000010070000002000001000400
-  .plt            : { *(.plt) }
-  .fini           : { *(.fini) } = 0x00300000010070000002000001000400
-  _etext = .;
-  PROVIDE (etext = .);
-
-  .hash           : { *(.hash) }
-  .dynsym         : { *(.dynsym) }
-  .dynstr         : { *(.dynstr) }
-  .gnu.version    : { *(.gnu.version) }
-  .gnu.version_d  : { *(.gnu.version_d) }
-  .gnu.version_r  : { *(.gnu.version_r) }
-  .rela.init      : { *(.rela.init) }
-  .rela.text      : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
-  .rela.fini      : { *(.rela.fini) }
-  .rela.rodata    : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
-  .rela.data      : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
-  .rela.ctors     : { *(.rela.ctors) }
-  .rela.dtors     : { *(.rela.dtors) }
-  .rela.got       : { *(.rela.got) }
-  .rela.sdata     : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
-  .rela.sbss      : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) }
-  .rela.sdata2    : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
-  .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
-  .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
-  .rela.plt       : { *(.rela.plt) }
-  .rela.IA_64.pltoff   : { *(.rela.IA_64.pltoff) }
-
-  .IA_64.unwind_info   : { *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) }
-  .IA_64.unwind   : { *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) }
-
-  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
-  .rodata1        : { *(.rodata1) }
-  .sdata2         : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) }
-  .sbss2          : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
-  .opd            : { *(.opd) }
-
-  /* Adjust the address for the data segment.  We want to start in the next
-     page in the loader virtual memory. */
-  . = ALIGN(65536);
-
-  PROVIDE (bdata = .);
-  .data           :
-  {
-    *(.ivt.data)
-    *(.data .data.* .gnu.linkonce.d.*)
-    SORT(CONSTRUCTORS)
-  }
-  .data1          : { *(.data1) }
-  .dynamic        : { *(.dynamic) }
-  .ctors          :
-  {
-    *(.ctors)
-    *(SORT(.ctors.*))
-  }
-  .dtors          :
-  {
-    *(.dtors)
-    *(SORT(.dtors.*))
-  }
-  . = ALIGN(16);
-  __gp = . + 0x200000;
-  .got            : { *(.got.plt) *(.got) }
-  .IA_64.pltoff   : { *(.IA_64.pltoff) }
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata          :
-  {
-    *(.sdata .sdata.* .gnu.linkonce.s.*)
-  }
-  _edata = .;
-  PROVIDE (edata = .);
-  __bss_start = .;
-  .sbss           :
-  {
-    PROVIDE (__sbss_start = .);
-    PROVIDE (___sbss_start = .);
-    *(.dynsbss)
-    *(.sbss .sbss.* .gnu.linkonce.sb.*)
-    *(.scommon)
-    PROVIDE (__sbss_end = .);
-    PROVIDE (___sbss_end = .);
-  }
-  .bss            :
-  {
-   *(.dynbss)
-   *(.bss .bss.* .gnu.linkonce.b.*)
-   *(COMMON)
-   /* Align here to ensure that the .bss section occupies space up to
-      _end.  Align after .bss to ensure correct alignment even if the
-      .bss section disappears because there are no input sections.  */
-   . = ALIGN(64 / 8);
-  }
-  . = ALIGN(64 / 8);
-  _end = .;
-  PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-}
diff --git a/sys/conf/options b/sys/conf/options
index 32fb4d439330..8e6f95ea3bc5 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -685,6 +685,7 @@ WITNESS			opt_global.h
 WITNESS_KDB		opt_witness.h
 WITNESS_NO_VNODE	opt_witness.h
 WITNESS_SKIPSPIN	opt_witness.h
+WITNESS_COUNT		opt_witness.h
 OPENSOLARIS_WITNESS	opt_global.h
 
 # options for ACPI support
@@ -736,8 +737,6 @@ SAFE_RNDTEST		opt_safe.h
 
 # 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
@@ -760,13 +759,19 @@ 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
+VT_ALT_TO_ESC_HACK	opt_syscons.h
+VT_FB_DEFAULT_WIDTH	opt_syscons.h
+VT_FB_DEFAULT_HEIGHT	opt_syscons.h
+VT_MAXWINDOWS		opt_syscons.h
+VT_TWOBUTTON_MOUSE	opt_syscons.h
 DEV_SC			opt_syscons.h
 DEV_VT			opt_syscons.h
 
-
 # teken terminal emulator options
 TEKEN_CONS25		opt_teken.h
 TEKEN_UTF8		opt_teken.h
+TERMINAL_KERN_ATTR	opt_teken.h
+TERMINAL_NORM_ATTR	opt_teken.h
 
 # options for printf
 PRINTF_BUFR_SIZE	opt_printf.h
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index fd32e52e854d..545cb451650a 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -1,6 +1,7 @@
 #$FreeBSD$
 ARM9_CACHE_WRITE_THROUGH	opt_global.h
 ARM_CACHE_LOCK_ENABLE	opt_global.h
+ARM_DEVICE_MULTIPASS	opt_global.h
 ARM_KERN_DIRECTMAP	opt_vm.h
 ARM_L2_PIPT		opt_global.h
 ARM_MANY_BOARD		opt_global.h
diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64
deleted file mode 100644
index e5ef143e0b53..000000000000
--- a/sys/conf/options.ia64
+++ /dev/null
@@ -1,33 +0,0 @@
-# $FreeBSD$
-# Options specific to the ia64 platform kernels
-
-ITANIUM			opt_global.h
-ITANIUM2		opt_global.h
-
-LOG2_ID_PAGE_SIZE	opt_global.h
-LOG2_PAGE_SIZE		opt_global.h
-
-UWX_TRACE_ENABLE	opt_global.h
-
-COMPAT_FREEBSD32	opt_compat.h
-
-PV_STATS		opt_pmap.h
-
-XTRACE
-
-VGA_ALT_SEQACCESS	opt_vga.h
-VGA_DEBUG		opt_vga.h
-VGA_NO_FONT_LOADING	opt_vga.h
-VGA_NO_MODE_CHANGE	opt_vga.h
-VGA_SLOW_IOACCESS	opt_vga.h
-VGA_WIDTH90		opt_vga.h
-
-# AGP debugging.
-AGP_DEBUG		opt_agp.h
-
-PSM_HOOKRESUME		opt_psm.h
-PSM_RESETAFTERSUSPEND	opt_psm.h
-PSM_DEBUG		opt_psm.h
-
-# Atkbd options
-ATKBD_DFLT_KEYMAP	opt_atkbd.h
diff --git a/sys/conf/options.mips b/sys/conf/options.mips
index eec1ca41b7bb..93d4ed34f807 100644
--- a/sys/conf/options.mips
+++ b/sys/conf/options.mips
@@ -90,6 +90,11 @@ OCTEON_BOARD_CAPK_0100ND	opt_cvmx.h
 #
 BERI_LARGE_TLB			opt_global.h
 
+#
+# Options that control the NetFPGA-10G Embedded CPU Ethernet Core.
+#
+NF10BMAC_64BIT			opt_netfpga.h
+
 #
 # Options that control the Atheros SoC peripherals
 #
diff --git a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh
index 4a467a1846e7..a6802ef325c7 100755
--- a/sys/contrib/dev/acpica/acpica_prep.sh
+++ b/sys/contrib/dev/acpica/acpica_prep.sh
@@ -85,6 +85,6 @@ rm -rf ${wrk}
 # assist the developer in generating a diff
 echo "Directories you may want to 'svn diff':"
 echo "    sys/contrib/dev/acpica sys/dev/acpica \\"
-echo "    sys/amd64/acpica sys/i386/acpica sys/ia64/acpica sys/x86/acpica \\"
-echo "    sys/amd64/include sys/i386/include sys/ia64/include \\"
+echo "    sys/amd64/acpica sys/i386/acpica sys/x86/acpica \\"
+echo "    sys/amd64/include sys/i386/include include \\"
 echo "    sys/boot sys/conf sys/modules/acpi usr.sbin/acpi"
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_interrupts.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_interrupts.c
index 51ee3cdf87cd..acc14b34e2ca 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_interrupts.c
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_interrupts.c
@@ -142,6 +142,21 @@ ar9300_get_pending_interrupts(
         sync_en_def = AR9340_INTR_SYNC_DEFAULT;
     }
 
+    /* Store away the async and sync cause registers */
+    /* XXX Do this before the filtering done below */
+#ifdef	AH_INTERRUPT_DEBUGGING
+	ah->ah_intrstate[0] = OS_REG_READ(ah, AR_ISR);
+	ah->ah_intrstate[1] = OS_REG_READ(ah, AR_ISR_S0);
+	ah->ah_intrstate[2] = OS_REG_READ(ah, AR_ISR_S1);
+	ah->ah_intrstate[3] = OS_REG_READ(ah, AR_ISR_S2);
+	ah->ah_intrstate[4] = OS_REG_READ(ah, AR_ISR_S3);
+	ah->ah_intrstate[5] = OS_REG_READ(ah, AR_ISR_S4);
+	ah->ah_intrstate[6] = OS_REG_READ(ah, AR_ISR_S5);
+
+	/* XXX double reading? */
+	ah->ah_syncstate = OS_REG_READ(ah, AR_HOSTIF_REG(ah, AR_INTR_SYNC_CAUSE));
+#endif
+
     sync_cause =
         OS_REG_READ(ah, AR_HOSTIF_REG(ah, AR_INTR_SYNC_CAUSE)) &
         (sync_en_def | AR_INTR_SYNC_MASK_GPIO);
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c
index b842993c23f9..5a4623f77bb4 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c
@@ -666,6 +666,7 @@ ar9300_set_power_mode(struct ath_hal *ah, HAL_POWER_MODE mode, int set_chip)
     HALDEBUG(ah, HAL_DEBUG_POWER_MGMT, "%s: %s -> %s (%s)\n", __func__,
         modes[ar9300_get_power_mode(ah)], modes[mode],
         set_chip ? "set chip " : "");
+    OS_MARK(ah, AH_MARK_CHIP_POWER, mode);
     
     switch (mode) {
     case HAL_PM_AWAKE:
@@ -719,8 +720,10 @@ ar9300_set_power_mode(struct ath_hal *ah, HAL_POWER_MODE mode, int set_chip)
     default:
         HALDEBUG(ah, HAL_DEBUG_POWER_MGMT,
             "%s: unknown power mode %u\n", __func__, mode);
+        OS_MARK(ah, AH_MARK_CHIP_POWER_DONE, -1);
         return AH_FALSE;
     }
+    OS_MARK(ah, AH_MARK_CHIP_POWER_DONE, status);
     return status;
 }
 
diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv.c b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv.c
index e13c00bb57d6..c919d3ce0660 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv.c
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv.c
@@ -113,6 +113,8 @@ ar9300_stop_dma_receive(struct ath_hal *ah, u_int timeout)
 #define AH_RX_STOP_DMA_TIMEOUT 10000   /* usec */
 #define AH_TIME_QUANTUM        100     /* usec */
 
+    OS_MARK(ah, AH_MARK_RX_CTL, AH_MARK_RX_CTL_DMA_STOP);
+
     if (timeout == 0) {
         timeout = AH_RX_STOP_DMA_TIMEOUT;
     }
@@ -157,6 +159,9 @@ ar9300_stop_dma_receive(struct ath_hal *ah, u_int timeout)
 
     OS_REG_WRITE(ah, AR_MACMISC, org_value);
 
+    OS_MARK(ah, AH_MARK_RX_CTL,
+        status ? AH_MARK_RX_CTL_DMA_STOP_OK : AH_MARK_RX_CTL_DMA_STOP_ERR);
+
     return status;
 #undef AH_RX_STOP_DMA_TIMEOUT
 #undef AH_TIME_QUANTUM
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 a52f01e227bb..1090c9c59ab7 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
@@ -1987,13 +1987,25 @@ HAL_BOOL
 ar9300_chip_reset(struct ath_hal *ah, struct ieee80211_channel *chan)
 {
     struct ath_hal_9300     *ahp = AH9300(ah);
+    int type = HAL_RESET_WARM;
 
     OS_MARK(ah, AH_MARK_CHIPRESET, chan ? chan->ic_freq : 0);
 
     /*
      * Warm reset is optimistic.
+     *
+     * If the TX/RX DMA engines aren't shut down (eg, they're
+     * wedged) then we're better off doing a full cold reset
+     * to try and shake that condition.
      */
-    if (!ar9300_set_reset_reg(ah, HAL_RESET_WARM)) {
+    if (ahp->ah_chip_full_sleep ||
+        (ah->ah_config.ah_force_full_reset == 1) ||
+        OS_REG_READ(ah, AR_Q_TXE) ||
+        (OS_REG_READ(ah, AR_CR) & AR_CR_RXE)) {
+            type = HAL_RESET_COLD;
+    }
+
+    if (!ar9300_set_reset_reg(ah, type)) {
         return AH_FALSE;
     }
 
diff --git a/sys/contrib/ia64/libuwx/src/Makefile b/sys/contrib/ia64/libuwx/src/Makefile
deleted file mode 100644
index 7cc0f2d5aed7..000000000000
--- a/sys/contrib/ia64/libuwx/src/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# Makefile for IPF unwind express library, libuwx.
-#
-# To build a cross-unwind library (i.e., one hosted on a
-# non-IPF, non-HP-UX system), omit the "self" callbacks
-# and the dependency on libuca by setting SELFOBJS and
-# SELFLIBS to empty strings.
-
-AR = ar
-RANLIB = :
-
-OTHERCFLAGS =
-# OTHERCFLAGS = -DUWX_TRACE_ENABLE	# Enables trace output
-# OTHERCFLAGS = +DD64			# Builds 64-bit library
-
-CFLAGS = -O $(OTHERCFLAGS)
-
-OBJS =		uwx_bstream.o uwx_context.o uwx_env.o uwx_scoreboard.o \
-		uwx_step.o uwx_str.o uwx_swap.o uwx_symbols.o \
-		uwx_trace.o uwx_uinfo.o uwx_utable.o
-
-# SELFOBJS =				# For cross-unwind library
-# SELFOBJS = 	uwx_self.o uwx_self_context.o uwx_ttrace.o
-SELFOBJS = 	uwx_self.o uwx_self_context.o
-
-# SELFLIBS =				# For cross-unwind library
-SELFLIBS =	-luca
-
-libuwx.a:	$(OBJS) $(SELFOBJS)
-	$(AR) rv libuwx.a $?
-	$(RANLIB) libuwx.a
-
-libuwx.so:	$(OBJS) $(SELFOBJS)
-	ld -b -o libuwx.so $(OBJS) $(SELFOBJS) $(SELFLIBS)
-
-libuwx.sl:	$(OBJS) $(SELFOBJS)
-	ld -b -o libuwx.sl $(OBJS) $(SELFOBJS) $(SELFLIBS)
-
-clean:
-	rm -f $(OBJS) $(SELFOBJS) libuwx.a libuwx.so libuwx.sl
-
-uwx_bstream.o:	uwx.h uwx_env.h uwx_bstream.h
-
-uwx_context.o:	uwx.h uwx_env.h uwx_scoreboard.h uwx_step.h uwx_trace.h
-
-uwx_env.o:	uwx.h uwx_env.h uwx_scoreboard.h uwx_str.h uwx_trace.h
-
-uwx_scoreboard.o: uwx.h uwx_env.h uwx_scoreboard.h uwx_trace.h
-
-uwx_step.o:	uwx.h uwx_env.h uwx_context.h uwx_utable.h \
-		uwx_uinfo.h uwx_scoreboard.h uwx_str.h uwx_trace.h
-
-uwx_str.o:	uwx.h uwx_env.h uwx_str.h
-
-uwx_swap.o:	uwx.h uwx_env.h uwx_swap.h
-
-uwx_symbols.o:	uwx.h uwx_env.h uwx_symbols.h
-
-uwx_trace.o:	uwx.h uwx_env.h uwx_uinfo.h uwx_scoreboard.h uwx_trace.h
-
-uwx_uinfo.o:	uwx.h uwx_env.h uwx_uinfo.h uwx_utable.h \
-		uwx_scoreboard.h uwx_bstream.h uwx_trace.h
-
-uwx_utable.o:	uwx.h uwx_env.h uwx_utable.h uwx_swap.h uwx_trace.h
-
-uwx_self.o:	uwx.h uwx_env.h uwx_context.h uwx_trace.h uwx_self.h \
-		uwx_symbols.h
-
-uwx_self_context.o:	uwx_self_context.s
-	$(CC) -c $(CFLAGS) -o uwx_self_context.o uwx_self_context.s
-
-uwx_ttrace.o:	uwx.h uwx_env.h uwx_context.h uwx_trace.h uwx_ttrace.h
diff --git a/sys/contrib/ia64/libuwx/src/uwx.h b/sys/contrib/ia64/libuwx/src/uwx.h
deleted file mode 100644
index 8fdbb432890c..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx.h
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 __UWX_INCLUDED
-#define __UWX_INCLUDED 1
-
-#ifndef _KERNEL
-#include <stdlib.h>
-#include <inttypes.h>
-#else
-#include <sys/param.h>
-#include <sys/systm.h>
-#endif
-
-#if defined(__cplusplus)
-#define __EXTERN_C extern "C"
-#else
-#define __EXTERN_C extern
-#endif
-
-#define UWX_VERSION 3		/* Version id for callback interfaces */
-
-/* Unwind environment structure (opaque) */
-struct uwx_env;
-
-/* Symbol Cache for uwx_find_symbol (opaque) */
-struct uwx_symbol_cache;
-
-/* Allocate and free callbacks */
-typedef void *(*alloc_cb)(size_t size);
-typedef void (*free_cb)(void *ptr);
-__EXTERN_C int uwx_register_alloc_cb(alloc_cb alloc, free_cb free);
-
-/* Allocate and initialize an unwind environment */
-__EXTERN_C struct uwx_env *uwx_init(void);
-
-/* Free an unwind environment */
-__EXTERN_C int uwx_free(struct uwx_env *env);
-
-/* Put unwind express into cross-process mode */
-__EXTERN_C int uwx_set_remote(struct uwx_env *env, int is_big_endian_target);
-
-/* Put unwind express into reduced-context mode (no floating-point regs) */
-__EXTERN_C int uwx_set_nofr(struct uwx_env *env);
-
-/* Copy-in callback */
-typedef int (*copyin_cb)(
-    int request,		/* request code (see below) */
-    char *loc,			/* local (destination) address */
-    uint64_t rem,		/* remote (source) address */
-    int len,			/* number of bytes to copy */
-    intptr_t tok);		/* callback token */
-
-/* Lookup IP callback */
-typedef int (*lookupip_cb)(
-    int request,		/* request code (see below) */
-    uint64_t ip,		/* IP of current frame */
-    intptr_t tok,		/* callback token */
-    uint64_t **vecp);		/* parameter vector (in/out) */
-
-/* Register copy-in and lookup IP callbacks */
-__EXTERN_C int uwx_register_callbacks(
-    struct uwx_env *env,	/* unwind environment */
-    intptr_t tok,		/* callback token */
-    copyin_cb copyin,		/* copy-in callback */
-    lookupip_cb lookupip);	/* lookup IP callback */
-
-/* Initialize a context with the basic info needed to start an unwind */
-__EXTERN_C int uwx_init_context(
-    struct uwx_env *env,	/* unwind environment */
-    uint64_t ip,		/* IP (instruction pointer) */
-    uint64_t sp,		/* SP (stack pointer) */
-    uint64_t bsp,		/* BSP (backing store pointer) */
-    uint64_t cfm);		/* CFM (current frame marker) */
-
-/* Set the value of a specific register in the current context (non fp) */
-__EXTERN_C int uwx_set_reg(
-    struct uwx_env *env,	/* unwind environment */
-    int regid,			/* register id (see below) */
-    uint64_t val);		/* register value */
-
-/* Set the value of a floating-point register in the current context */
-__EXTERN_C int uwx_set_fr(
-    struct uwx_env *env,	/* unwind environment */
-    int regid,			/* register id (see below) */
-    uint64_t *val);		/* register value (ptr to 16 bytes) */
-				/*   (memory spill format) */
-
-/* Initialize the unwind history */
-__EXTERN_C int uwx_init_history(struct uwx_env *env);
-
-/* Step one frame */
-__EXTERN_C int uwx_step(struct uwx_env *env);
-
-/* Get module name and text base, if available, for current frame */
-__EXTERN_C int uwx_get_module_info(
-    struct uwx_env *env,	/* unwind environment */
-    char **modp,		/* load module name (out)  */
-    uint64_t *text_base);	/* base address of text segment (out)  */
-
-/* Get function start address for current frame */
-__EXTERN_C int uwx_get_funcstart(
-    struct uwx_env *env,	/* unwind environment */
-    uint64_t *funcstart);	/* function start address (out)  */
-
-/* Get symbol information, if available, for current frame */
-__EXTERN_C int uwx_get_sym_info(
-    struct uwx_env *env,	/* unwind environment */
-    char **modp,		/* load module name (out)  */
-    char **symp,		/* function name (out)  */
-    uint64_t *offsetp);		/* offset from start of function (out)  */
-
-/* Get symbol information, given module name and IP */
-__EXTERN_C int uwx_find_symbol(
-    struct uwx_env *env,	/* unwind environment */
-    struct uwx_symbol_cache **cachep,
-				/* ptr to symbol cache ptr (in/out) */
-    char *mod,			/* load module name */
-    uint64_t relip,		/* IP, relative to text segment  */
-    char **symp,		/* function name (out) */
-    uint64_t *offsetp);		/* offset from start of function (out) */
-
-/* Release memory used by symbol cache */
-__EXTERN_C void uwx_release_symbol_cache(
-    struct uwx_env *env,	/* unwind environment */
-    struct uwx_symbol_cache *symbol_cache);
-				/* symbol cache ptr */
-
-/* Get the value of a register from the current context */
-__EXTERN_C int uwx_get_reg(
-    struct uwx_env *env,	/* unwind environment */
-    int regid,			/* register id (see below) */
-    uint64_t *valp);		/* register value (out) */
-
-/* Get the NaT bit of a GR from the current context */
-__EXTERN_C int uwx_get_nat(
-    struct uwx_env *env,	/* unwind environment */
-    int regid,			/* register id (see below) */
-    int *natp);			/* NaT value (out: 0 or 1) */
-
-/* Get the spill location for a register in the current context */
-__EXTERN_C int uwx_get_spill_loc(
-    struct uwx_env *env,	/* unwind environment */
-    int regid,			/* register id (see below) */
-    uint64_t *dispp);		/* disposition code (see below) (out) */
-
-/* Get the ABI context code (if uwx_step returned UWX_ABI_FRAME) */
-__EXTERN_C int uwx_get_abi_context_code(struct uwx_env *env);
-
-/* Increment/Decrement the bsp by a number of slots */
-/* (accounts for NaT collections) */
-__EXTERN_C uint64_t uwx_add_to_bsp(uint64_t bsp, int nslots);
-
-/* Return status codes for uwx_ APIs */
-#define UWX_OK			0
-#define UWX_BOTTOM		1	/* Hit bottom of stack */
-#define UWX_ABI_FRAME		2	/* Hit ABI-dependent frame */
-#define UWX_ERR_NOENV		(-1)	/* No uwx_env allocated */
-#define UWX_ERR_IPNOTFOUND	(-2)	/* Lookup IP c/b returned NOTFOUND */
-#define UWX_ERR_LOOKUPERR	(-3)	/* Lookup IP c/b returned ERR */
-#define UWX_ERR_BADKEY		(-4)	/* Bad result vector key */
-#define UWX_ERR_COPYIN_UTBL	(-5)	/* Error reading unwind table */
-#define UWX_ERR_COPYIN_UINFO	(-6)	/* Error reading unwind info */
-#define UWX_ERR_COPYIN_MSTK	(-7)	/* Error reading memory stack */
-#define UWX_ERR_COPYIN_RSTK	(-8)	/* Error reading register stack */
-#define UWX_ERR_COPYIN_REG	(-9)	/* Error reading context register */
-#define UWX_ERR_NOUENTRY	(-10)	/* No unwind table entry for ip */
-#define UWX_ERR_NOUDESC		(-11)	/* No unwind descriptor covers ip */
-#define UWX_ERR_BADUDESC	(-12)	/* Bad unwind descriptor */
-#define UWX_ERR_NOMEM		(-13)	/* Out of memory */
-#define UWX_ERR_PROLOG_UF	(-14)	/* Prologue underflow */
-#define UWX_ERR_UNDEFLABEL	(-15)	/* Undefined label in copy_state */
-#define UWX_ERR_BADREGID	(-16)	/* Bad register identifier */
-#define UWX_ERR_CANTUNWIND	(-17)	/* Can't unwind */
-#define UWX_ERR_NOCALLBACKS	(-18)	/* No callbacks registered */
-#define UWX_ERR_NOCONTEXT	(-19)	/* Context not initialized */
-#define UWX_ERR_UCACCESS	(-20)	/* Failure in libuca */
-#define UWX_ERR_NOSYM		(-21)	/* Symbol not found */
-
-/* Request codes for copyin callback */
-#define UWX_COPYIN_UINFO	1	/* Reading unwind info */
-#define UWX_COPYIN_MSTACK	2	/* Reading memory stack */
-#define UWX_COPYIN_RSTACK	3	/* Reading RSE backing store */
-#define UWX_COPYIN_REG		4	/* Reading initial register state */
-
-/* Request codes for lookup IP callback */
-#define UWX_LKUP_LOOKUP		1	/* Lookup IP */
-#define UWX_LKUP_FREE		2	/* Free result vector */
-#define UWX_LKUP_SYMBOLS	3	/* Lookup symbolic information */
-#define UWX_LKUP_MODULE		4	/* Get module name */
-
-/* Return status codes for lookup IP callback */
-#define UWX_LKUP_NOTFOUND	0	/* IP not found */
-#define UWX_LKUP_ERR		1	/* Other error */
-#define UWX_LKUP_UTABLE		2	/* Returned ref to unwind table */
-#define UWX_LKUP_FDESC		3	/* Returned frame description */
-#define UWX_LKUP_SYMINFO	4	/* Returned symbolic information */
-#define UWX_LKUP_REMAP		5	/* Returned remapped IP */
-#define UWX_LKUP_UINFO		6	/* Returned unw info block ptr */
-
-/* The lookup IP callback receives a parameter vector, and returns */
-/* one on success. This vector is a series of key/value pairs; each */
-/* even-numbered slot is a key, and each odd-numbered slot is a */
-/* corresponding value. The vector is terminated by a pair whose */
-/* key is 0. */
-#define UWX_KEY_END		0	/* End of vector */
-
-/* Keys passed to lookup IP callback */
-#define UWX_KEY_PREDS		1	/* Predicate registers */
-#define UWX_KEY_VERSION		2	/* Version id of unwind engine */
-/* UWX_KEY_FUNCSTART (below) may also be passed with the UWX_LKUP_SYMINFO */
-/* request. */
-
-/* Keys returned with UWX_LKUP_UTABLE */
-/* These key/value pairs describe the unwind table corresponding */
-/* to the load module in which the current IP resides. */
-#define UWX_KEY_TBASE		1	/* Base address of text seg */
-#define UWX_KEY_UFLAGS		2	/* Unwind flags (optional) */
-#define UWX_KEY_USTART		3	/* Base of unwind tbl */
-#define UWX_KEY_UEND		4	/* End of unwind tbl */
-#define UWX_KEY_GP		7	/* GP value for module */
-
-/* Keys returned with UWX_LKUP_FDESC */
-/* These key/value pairs describe the state of the frame at the */
-/* given IP. They are typically used for dynamically-generated code. */
-/* If UWX_KEY_CONTEXT is returned, it must be the only key returned. */
-/* Use UWX_KEY_GP for the module's gp value. */
-#define UWX_KEY_FSIZE		1			/* Frame size */
-#define UWX_KEY_SPILL(reg_id)	(2 | ((reg_id) << 4))	/* Reg spilled */
-#define UWX_KEY_CONTEXT		3 			/* ABI-dep. context */
-
-/* Keys returned with UWX_LKUP_REMAP */
-#define UWX_KEY_NEWIP		5	/* Remapped IP */
-
-/* Keys returned with UWX_LKUP_UINFO */
-/* Use UWX_KEY_GP for the module's gp value. */
-/* Use UWX_KEY_FUNCSTART for the start address of the function */
-/* Use UWX_KEY_UFLAGS for the unwind flags (optional) */
-#define UWX_KEY_UINFO 		6	/* Address of unwind info block */
-
-/* Keys returned with UWX_LKUP_SYMINFO */
-/* These keys may be returned with UWX_LKUP_FDESC or UWX_LKUP_UINFO, */
-/* if the information is cheap to obtain. */
-/* Use UWX_KEY_TBASE for the base of the text segment */
-#define UWX_KEY_MODULE		17	/* Name of load module */
-#define UWX_KEY_FUNC		18	/* Name of function */
-#define UWX_KEY_FUNCSTART	19	/* Address of start of function */
-
-/* Register identifiers */
-/* For use in UWX_LKUP_FDESC result vectors and context access APIs. */
-/* "no spill info": These regs aren't spilled directly, so */
-/*    result vectors must not describe these registers. */
-/*    The result vector must describe the related register or */
-/*    pseudo register instead (ip:rp, sp:psp, bsp/cfm:pfs). */
-/* "pseudo register": Not a machine register, but treated as */
-/*    one for unwind purposes. */
-#define UWX_REG_IP		0	/* ip (no spill info) */
-#define UWX_REG_SP		1	/* sp (no spill info) */
-#define UWX_REG_BSP		2	/* ar.bsp (no spill info) */
-#define UWX_REG_CFM		3	/* cfm (no spill info) */
-#define UWX_REG_RP		4	/* rp (pseudo-register) */
-#define UWX_REG_PSP		5	/* psp (pseudo-register) */
-#define UWX_REG_PFS		6	/* pfs (pseudo-register) */
-#define UWX_REG_PREDS		7	/* p0 - p63 */
-#define UWX_REG_PRIUNAT		8	/* primary unat (pseudo-register) */
-#define UWX_REG_AR_BSPSTORE	9	/* ar.bspstore */
-#define UWX_REG_AR_RNAT		10	/* ar.rnat */
-#define UWX_REG_AR_UNAT		11	/* ar.unat */
-#define UWX_REG_AR_FPSR		12	/* ar.fpsr */
-#define UWX_REG_AR_LC		13	/* ar.lc */
-#define UWX_REG_AR_PFS		14	/* ar.pfs */
-#define UWX_REG_GP		15	/* gp (pseudo-register) */
-#define UWX_REG_GR(gr)		(0x100 | (gr))
-#define UWX_REG_FR(fr)		(0x200 | (fr))
-#define UWX_REG_BR(br)		(0x300 | (br))
-
-/* for backwards compatibility with previous releases... */
-#define UWX_REG_BSPSTORE	UWX_REG_AR_BSPSTORE
-#define UWX_REG_RNAT		UWX_REG_AR_RNAT
-#define UWX_REG_UNAT		UWX_REG_AR_UNAT
-#define UWX_REG_FPSR		UWX_REG_AR_FPSR
-#define UWX_REG_LC		UWX_REG_AR_LC
-
-/* Values corresponding to UWX_KEY_SPILL keys indicate the disposition */
-/* of the spilled register -- either in the memory stack or in another */
-/* register. The PSP register may also have a disposition of "SPPLUS", */
-/* indicating that its value is SP plus a fixed constant. */
-#define UWX_DISP_NONE		0		/* Not spilled */
-#define UWX_DISP_SPPLUS(k)	(1 | (k))	/* PSP = SP+constant */
-#define UWX_DISP_SPREL(disp)	(2 | (disp))	/* Spilled at [SP+disp] */
-#define UWX_DISP_PSPREL(disp)	(3 | (disp))	/* Spilled at [PSP+16-disp] */
-#define UWX_DISP_REG(reg)	(4 | ((reg) << 4)) /* Saved to another reg. */
-
-/* The uwx_get_spill_loc() routine returns a spill location for a */
-/* given register in the current context. It will return a disposition */
-/* code of UWX_DISP_NONE, UWX_DISP_REG(reg), or one of the following */
-/* to indicate that the spilled value can be found in the memory */
-/* stack or the register stack backing store. */
-#define UWX_DISP_MSTK(addr)	(5 | (addr))	/* Spilled in mem. stack */
-#define UWX_DISP_RSTK(addr)	(6 | (addr))	/* Spilled in reg. stack */
-
-/* Extract the disposition code, offset, address, or register id */
-/* from a disposition returned from uwx_get_spill_loc(). */
-/* Compare the extracted disp code against UWX_DISP_REG(0), etc. */
-#define UWX_GET_DISP_CODE(disp)		((int)(disp) & 0x07)
-#define UWX_GET_DISP_OFFSET(disp)	((disp) & ~(uint64_t)0x07)
-#define UWX_GET_DISP_ADDR(disp)		((disp) & ~(uint64_t)0x07)
-#define UWX_GET_DISP_REGID(disp)	((int)(disp) >> 4)
-
-#undef __EXTERN_C
-
-#if defined(__cplusplus)
-
-class UnwindExpress {
-
-public:
-
-    UnwindExpress() {
-	env = uwx_init();
-    }
-
-    ~UnwindExpress() {
-	if (env != 0)
-	    uwx_free(env);
-	env = 0;
-    }
-
-    int init_context(uint64_t ip, uint64_t sp, uint64_t bsp, uint64_t cfm) { 
-	return uwx_init_context(env, ip, sp, bsp, cfm);
-    }
-
-    int init_history() {
-	return uwx_init_history(env);
-    }
-
-    int set_reg(int regid, uint64_t val) {
-	return uwx_set_reg(env, regid, val);
-    }
-
-    int set_fr(int regid, uint64_t *valp) {
-	return uwx_set_fr(env, regid, valp);
-    }
-
-    int step() {
-	return uwx_step(env);
-    }
-
-    int get_module_info(char **modp, uint64_t *text_base_p) {
-	return uwx_get_module_info(env, modp, text_base_p);
-    }
-
-    int get_funcstart(uint64_t *funcstart) {
-	return uwx_get_funcstart(env, funcstart);
-    }
-
-    int get_sym_info(char **modp, char **symp, uint64_t *offsetp) {
-	return uwx_get_sym_info(env, modp, symp, offsetp);
-    }
-
-    int find_symbol(struct uwx_symbol_cache **cachep,
-		char *mod, uint64_t relip, char **symp, uint64_t *offsetp) {
-	return uwx_find_symbol(env, cachep, mod, relip, symp, offsetp);
-    }
-
-    void release_symbol_cache(struct uwx_symbol_cache *symbol_cache) {
-	uwx_release_symbol_cache(env, symbol_cache);
-    }
-
-    int get_reg(int regid, uint64_t *valp) {
-	return uwx_get_reg(env, regid, valp);
-    }
-
-    int get_nat(int regid, int *natp) {
-	return uwx_get_nat(env, regid, natp);
-    }
-
-    int get_spill_loc(int regid, uint64_t *dispp) {
-	return uwx_get_spill_loc(env, regid, dispp);
-    }
-
-    int get_abi_context_code() {
-	return uwx_get_abi_context_code(env);
-    }
-
-    struct uwx_env *get_env() {
-	return env;
-    }
-
-protected:
-
-    struct uwx_env *env;
-
-};
-
-#endif /* __cplusplus */
-
-#endif /* __UWX_INCLUDED */
diff --git a/sys/contrib/ia64/libuwx/src/uwx_bstream.c b/sys/contrib/ia64/libuwx/src/uwx_bstream.c
deleted file mode 100644
index 1495ed3204df..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_bstream.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 "uwx_env.h"
-#include "uwx_bstream.h"
-
-
-/* uwx_init_bstream: initialize a byte stream for reading */
-
-void uwx_init_bstream(
-    struct uwx_bstream *bstream,
-    struct uwx_env *env,
-    uint64_t source,
-    unsigned int len,
-    int request)
-{
-    bstream->buf = 0;
-    if (env->remote) {
-	bstream->source = source;
-	bstream->bufp = (unsigned char *) &bstream->buf;
-	bstream->nbuf = 0;
-	bstream->copyin = env->copyin;
-	bstream->cb_token = env->cb_token;
-	bstream->request = request;
-    }
-    else {
-	bstream->source = 0;
-	bstream->bufp = (unsigned char *) (intptr_t) source;
-	bstream->nbuf = len;
-	bstream->copyin = 0;
-	bstream->cb_token = 0;
-	bstream->request = 0;
-    }
-    bstream->ntotal = len;
-    bstream->peekc = -1;
-}
-
-
-/* uwx_get_byte: read the next byte from the byte stream */
-
-int uwx_get_byte(struct uwx_bstream *bstream)
-{
-    int len;
-    int n;
-    int b;
-
-    if (bstream->peekc >= 0) {
-	b = bstream->peekc;
-	bstream->peekc = -1;
-	return b;
-    }
-    if (bstream->ntotal <= 0)
-	return -1;
-    if (bstream->nbuf <= 0) {
-	if (bstream->source & 0x7 || bstream->ntotal < sizeof(uint64_t))
-	    len = sizeof(uint32_t);
-	else
-	    len = sizeof(uint64_t);
-	n = (*bstream->copyin)(bstream->request, (char *)&bstream->buf,
-		bstream->source, len, bstream->cb_token);
-	if (n != len)
-	    return -1;
-	bstream->bufp = (unsigned char *) &bstream->buf;
-	bstream->nbuf = n;
-	bstream->source += n;
-    }
-
-    b = *bstream->bufp++;
-    bstream->nbuf--;
-    bstream->ntotal--;
-    return b;
-}
-
-
-/* uwx_unget_byte: push a byte back onto the byte stream */
-
-int uwx_unget_byte(struct uwx_bstream *bstream, int b)
-{
-    bstream->peekc = b;
-    return 0;
-}
-
-
-/* uwx_get_uleb128: read a ULEB128 value from the byte stream */
-
-int uwx_get_uleb128(struct uwx_bstream *bstream, uint64_t *valp)
-{
-    uint64_t val;
-    int i;
-    int b;
-
-    b = uwx_get_byte(bstream);
-    val = (uint64_t)(b & 0x7f) << 56;
-    for (i = 0; i < 8; i++) {
-	val = val >> 7;
-	if (b & 0x80) {
-	    b = uwx_get_byte(bstream);
-	    val |= (uint64_t)(b & 0x7f) << 56;
-	}
-    }
-    if (b & 0x80) {
-	b = uwx_get_byte(bstream);
-	val |= (uint64_t)(b & 0x7f) << 63;
-    }
-    if (b & 0x80)
-	return -1;
-    *valp = val;
-    return 0;
-}
-
-#if 0
-int uwx_get_uleb128_alt(struct uwx_bstream *bstream, uint64_t *valp)
-{
-    uint64_t val;
-    int b;
-
-    b = uwx_get_byte(bstream);
-    val = b & 0x7f;
-    if (b & 0x80) {
-	b = uwx_get_byte(bstream);
-	val |= (uint64_t)(b & 0x7f) << 7;
-	if (b & 0x80) {
-	    b = uwx_get_byte(bstream);
-	    val |= (uint64_t)(b & 0x7f) << 14;
-	    if (b & 0x80) {
-		b = uwx_get_byte(bstream);
-		val |= (uint64_t)(b & 0x7f) << 21;
-		if (b & 0x80) {
-		    b = uwx_get_byte(bstream);
-		    val |= (uint64_t)(b & 0x7f) << 28;
-		    if (b & 0x80) {
-			b = uwx_get_byte(bstream);
-			val |= (uint64_t)(b & 0x7f) << 35;
-			if (b & 0x80) {
-			    b = uwx_get_byte(bstream);
-			    val |= (uint64_t)(b & 0x7f) << 42;
-			    if (b & 0x80) {
-				b = uwx_get_byte(bstream);
-				val |= (uint64_t)(b & 0x7f) << 49;
-				if (b & 0x80) {
-				    b = uwx_get_byte(bstream);
-				    val |= (uint64_t)(b & 0x7f) << 56;
-				    if (b & 0x80) {
-					b = uwx_get_byte(bstream);
-					val |= (uint64_t)(b & 0x7f) << 63;
-					if (b & 0x80)
-					    return -1;
-				    }
-				}
-			    }
-			}
-		    }
-		}
-	    }
-	}
-    }
-    *valp = val;
-    return 0;
-}
-#endif
diff --git a/sys/contrib/ia64/libuwx/src/uwx_bstream.h b/sys/contrib/ia64/libuwx/src/uwx_bstream.h
deleted file mode 100644
index c2fe5da0704d..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_bstream.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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.
-*/
-
-struct uwx_bstream {
-    copyin_cb copyin;
-    intptr_t cb_token;
-    uint64_t source;
-    uint64_t buf;
-    unsigned char *bufp;
-    int nbuf;
-    unsigned int ntotal;
-    int request;
-    int peekc;
-};
-
-/* uwx_init_bstream: initialize a byte stream for reading */
-
-extern void uwx_init_bstream(
-    struct uwx_bstream *bstream,
-    struct uwx_env *env,
-    uint64_t source,
-    unsigned int len,
-    int request);
-
-
-/* uwx_get_byte: read the next byte from the byte stream */
-
-extern int uwx_get_byte(struct uwx_bstream *bstream);
-
-
-/* uwx_unget_byte: push a byte back onto the byte stream */
-
-extern int uwx_unget_byte(struct uwx_bstream *bstream, int b);
-
-
-/* uwx_get_uleb128: read a ULEB128 value from the byte stream */
-
-extern int uwx_get_uleb128(struct uwx_bstream *bstream, uint64_t *val);
diff --git a/sys/contrib/ia64/libuwx/src/uwx_context.c b/sys/contrib/ia64/libuwx/src/uwx_context.c
deleted file mode 100644
index 9b1054a12bfd..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_context.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 "uwx_env.h"
-#include "uwx_scoreboard.h"
-#include "uwx_step.h"
-#include "uwx_trace.h"
-
-int uwx_init_context(
-    struct uwx_env *env,
-    uint64_t ip,
-    uint64_t sp,
-    uint64_t bsp,
-    uint64_t cfm)
-{
-    int i;
-
-    if (env == 0)
-	return UWX_ERR_NOENV;
-
-    env->context.special[UWX_REG_IP] = ip;
-    env->context.special[UWX_REG_SP] = sp;
-    env->context.special[UWX_REG_BSP] = bsp;
-    env->context.special[UWX_REG_CFM] = cfm;
-    for (i = UWX_REG_RP; i < NSPECIALREG; i++)
-	env->context.special[i] = 0;
-    for (i = 0; i < NPRESERVEDGR; i++)
-	env->context.gr[i] = 0;
-    env->context.valid_regs = VALID_BASIC4;
-    env->context.valid_frs = 0;
-    env->rstate = 0;
-    (void)uwx_init_history(env);
-    return UWX_OK;
-}
-
-int uwx_get_reg(struct uwx_env *env, int regid, uint64_t *valp)
-{
-    int status;
-    int sor;
-    int rrb_gr;
-    uint64_t bsp;
-    int n;
-
-    if (env == 0)
-	return UWX_ERR_NOENV;
-
-    status = UWX_OK;
-
-    if (regid == UWX_REG_GR(12))
-	regid = UWX_REG_SP;
-    if (regid < NSPECIALREG && (env->context.valid_regs & (1 << regid)))
-	*valp = env->context.special[regid];
-    else if (regid == UWX_REG_PSP || regid == UWX_REG_RP ||
-					regid == UWX_REG_PFS) {
-	status = uwx_restore_markers(env);
-	if (status != UWX_OK)
-	    return status;
-	*valp = env->context.special[regid];
-    }
-    else if (regid >= UWX_REG_GR(4) && regid <= UWX_REG_GR(7) &&
-		(env->context.valid_regs &
-		    (1 << (regid - UWX_REG_GR(4) + VALID_GR_SHIFT))) )
-	*valp = env->context.gr[regid - UWX_REG_GR(4)];
-    else if (regid >= UWX_REG_GR(32) && regid <= UWX_REG_GR(127)) {
-	if (env->copyin == 0)
-	    return UWX_ERR_NOCALLBACKS;
-	bsp = env->context.special[UWX_REG_BSP];
-	TRACE_C_GET_REG(regid, bsp)
-	regid -= UWX_REG_GR(32);
-	sor = (((int) env->context.special[UWX_REG_CFM] >> 14) & 0x0f) * 8;
-	rrb_gr = ((int) env->context.special[UWX_REG_CFM] >> 18) & 0x7f;
-	if (sor != 0 && rrb_gr != 0 && regid < sor) {
-	    TRACE_C_ROTATE_GR(regid, sor, rrb_gr, (regid+rrb_gr)%sor)
-	    regid = (regid + rrb_gr) % sor;
-	}
-	bsp = uwx_add_to_bsp(bsp, regid);
-	n = (*env->copyin)(UWX_COPYIN_RSTACK, (char *)valp,
-		    bsp, DWORDSZ, env->cb_token);
-	if (n != DWORDSZ)
-	    status = UWX_ERR_COPYIN_RSTK;
-    }
-    else if (regid == UWX_REG_GR(0))
-	*valp = 0;
-    else if (regid >= UWX_REG_BR(1) && regid <= UWX_REG_BR(5) &&
-		(env->context.valid_regs &
-		    (1 << (regid - UWX_REG_BR(1) + VALID_BR_SHIFT))) )
-	*valp = env->context.br[regid - UWX_REG_BR(1)];
-    else if (regid >= UWX_REG_FR(2) && regid <= UWX_REG_FR(5) &&
-	    (env->context.valid_frs & (1 << (regid - UWX_REG_FR(2)))) ) {
-	valp[0] = env->context.fr[regid - UWX_REG_FR(2)].part0;
-	valp[1] = env->context.fr[regid - UWX_REG_FR(2)].part1;
-    }
-    else if (regid >= UWX_REG_FR(16) && regid <= UWX_REG_FR(31) &&
-	    (env->context.valid_frs & (1 << (regid - UWX_REG_FR(16) + 4))) ) {
-	valp[0] = env->context.fr[regid - UWX_REG_FR(16) + 4].part0;
-	valp[1] = env->context.fr[regid - UWX_REG_FR(16) + 4].part1;
-    }
-    else if ( (regid < NSPECIALREG) ||
-		(regid >= UWX_REG_GR(1) && regid <= UWX_REG_GR(31)) ||
-		(regid >= UWX_REG_BR(0) && regid <= UWX_REG_BR(7)) ) {
-	if (env->copyin == 0)
-	    return UWX_ERR_NOCALLBACKS;
-	n = (*env->copyin)(UWX_COPYIN_REG, (char *)valp,
-			    regid, DWORDSZ, env->cb_token);
-	if (n != DWORDSZ)
-	    status = UWX_ERR_COPYIN_REG;
-    }
-    else if (regid >= UWX_REG_FR(2) && regid <= UWX_REG_FR(127)) {
-	if (env->copyin == 0)
-	    return UWX_ERR_NOCALLBACKS;
-	n = (*env->copyin)(UWX_COPYIN_REG, (char *)valp,
-			    regid, 2*DWORDSZ, env->cb_token);
-	if (n != 2*DWORDSZ)
-	    status = UWX_ERR_COPYIN_REG;
-    }
-    else if (regid == UWX_REG_FR(0)) {
-	valp[0] = 0;
-	valp[1] = 0;
-    }
-    else if (regid == UWX_REG_FR(1)) {
-	valp[0] = 0x000000000000ffffULL;
-	valp[1] = 0x8000000000000000ULL;
-    }
-    else
-	status = UWX_ERR_BADREGID;
-    return status;
-}
-
-int uwx_get_nat(struct uwx_env *env, int regid, int *natp)
-{
-    int status;
-    int sor;
-    int rrb_gr;
-    uint64_t bsp;
-    uint64_t natcollp;
-    uint64_t natcoll;
-    int n;
-
-    if (env == 0)
-	return UWX_ERR_NOENV;
-
-    status = UWX_OK;
-
-    if (regid >= UWX_REG_GR(4) && regid <= UWX_REG_GR(7) &&
-		(env->context.valid_regs &
-		    (1 << (regid - UWX_REG_GR(4) + VALID_GR_SHIFT))) ) {
-	*natp = (env->context.special[UWX_REG_PRIUNAT] >>
-				(regid - UWX_REG_GR(4)) ) & 0x01;
-    }
-    else if (regid >= UWX_REG_GR(32) && regid <= UWX_REG_GR(127)) {
-	if (env->copyin == 0)
-	    return UWX_ERR_NOCALLBACKS;
-	bsp = env->context.special[UWX_REG_BSP];
-	regid -= UWX_REG_GR(32);
-	sor = (((int) env->context.special[UWX_REG_CFM] >> 14) & 0x0f) * 8;
-	rrb_gr = ((int) env->context.special[UWX_REG_CFM] >> 18) & 0x7f;
-	if (sor != 0 && rrb_gr != 0 && regid < sor) {
-	    regid = (regid + rrb_gr) % sor;
-	}
-	bsp = uwx_add_to_bsp(bsp, regid);
-	natcollp = bsp | 0x01f8;
-	n = (*env->copyin)(UWX_COPYIN_RSTACK, (char *)&natcoll,
-			natcollp, DWORDSZ, env->cb_token);
-	if (n != DWORDSZ)
-	    return UWX_ERR_COPYIN_RSTK;
-	*natp = (int)(natcoll >> (((int)bsp >> 3) & 0x3f)) & 0x01;
-    }
-    else if (regid == UWX_REG_GR(0))
-	*natp = 0;
-    else
-	status = UWX_ERR_BADREGID;
-    return status;
-}
-
-int uwx_get_spill_loc(struct uwx_env *env, int regid, uint64_t *dispp)
-{
-    int status;
-    int sor;
-    int rrb_gr;
-    uint64_t bsp;
-
-    if (env == 0)
-	return UWX_ERR_NOENV;
-
-    status = UWX_OK;
-
-    if (regid == UWX_REG_GR(12))
-	regid = UWX_REG_SP;
-    if (regid < NSPECIALREG) {
-	if (regid == UWX_REG_PSP || regid == UWX_REG_RP ||
-						regid == UWX_REG_PFS) {
-	    if (!(env->context.valid_regs & (1 << regid))) {
-		status = uwx_restore_markers(env);
-		if (status != UWX_OK)
-		    return status;
-	    }
-	}
-	*dispp = env->history.special[regid];
-    }
-    else if (regid >= UWX_REG_GR(4) && regid <= UWX_REG_GR(7))
-	*dispp = env->history.gr[regid - UWX_REG_GR(4)];
-    else if (regid >= UWX_REG_GR(32) && regid <= UWX_REG_GR(127)) {
-	bsp = env->context.special[UWX_REG_BSP];
-	regid -= UWX_REG_GR(32);
-	sor = (((int) env->context.special[UWX_REG_CFM] >> 14) & 0x0f) * 8;
-	rrb_gr = ((int) env->context.special[UWX_REG_CFM] >> 18) & 0x7f;
-	if (sor != 0 && rrb_gr != 0 && regid < sor)
-	    regid = (regid + rrb_gr) % sor;
-	bsp = uwx_add_to_bsp(bsp, regid);
-	*dispp = UWX_DISP_RSTK(bsp);
-    }
-    else if (regid >= UWX_REG_BR(1) && regid <= UWX_REG_GR(5))
-	*dispp = env->history.br[regid - UWX_REG_BR(1)];
-    else if (regid >= UWX_REG_FR(2) && regid <= UWX_REG_FR(5))
-	*dispp = env->history.fr[regid - UWX_REG_FR(2)];
-    else if (regid >= UWX_REG_FR(16) && regid <= UWX_REG_FR(31))
-	*dispp = env->history.fr[regid - UWX_REG_FR(16) + 4];
-    else if ( (regid >= UWX_REG_GR(1) && regid <= UWX_REG_GR(31)) ||
-		(regid >= UWX_REG_BR(0) && regid <= UWX_REG_BR(7)) ||
-		(regid >= UWX_REG_FR(2) && regid <= UWX_REG_FR(127)) )
-	*dispp = UWX_DISP_REG(regid);
-    else
-	status = UWX_ERR_BADREGID;
-    return status;
-}
-
-int uwx_set_reg(struct uwx_env *env, int regid, uint64_t val)
-{
-    int status;
-
-    if (env == 0)
-	return UWX_ERR_NOENV;
-
-    if (regid == UWX_REG_GR(12))
-	regid = UWX_REG_SP;
-    if (regid < NSPECIALREG) {
-	env->context.special[regid] = val;
-	env->context.valid_regs |= 1 << regid;
-	status = UWX_OK;
-    }
-    else if (regid >= UWX_REG_GR(4) && regid <= UWX_REG_GR(7)) {
-	env->context.gr[regid - UWX_REG_GR(4)] = val;
-	env->context.valid_regs |=
-			1 << (regid - UWX_REG_GR(4) + VALID_GR_SHIFT);
-	status = UWX_OK;
-    }
-    else if (regid >= UWX_REG_GR(32) && regid <= UWX_REG_GR(127)) {
-	status = UWX_ERR_BADREGID;
-    }
-    else if (regid >= UWX_REG_BR(1) && regid <= UWX_REG_BR(5)) {
-	env->context.br[regid - UWX_REG_BR(1)] = val;
-	env->context.valid_regs |=
-			1 << (regid - UWX_REG_BR(1) + VALID_BR_SHIFT);
-	status = UWX_OK;
-    }
-    else
-	status = UWX_ERR_BADREGID;
-    return status;
-}
-
-int uwx_set_fr(struct uwx_env *env, int regid, uint64_t *val)
-{
-
-    if (regid >= UWX_REG_FR(2) && regid <= UWX_REG_FR(5))
-	regid -= UWX_REG_FR(2);
-    else if (regid >= UWX_REG_FR(16) && regid <= UWX_REG_FR(31))
-	regid -= UWX_REG_FR(16) - 4;
-    else
-	return UWX_ERR_BADREGID;
-
-    env->context.fr[regid].part0 = val[0];
-    env->context.fr[regid].part1 = val[1];
-    env->context.valid_frs |= 1 << regid;
-    env->nsbreg = NSBREG;
-    return UWX_OK;
-}
-
-uint64_t uwx_add_to_bsp(uint64_t bsp, int nslots)
-{
-    int bias;
-
-    /*
-     *  Here's a picture of the backing store as modeled in
-     *  the computations below. "X" marks NaT collections at
-     *  every 0x1f8 mod 0x200 address.
-     *
-     *  To make the NaT adjustments easier, we bias the current bsp
-     *  by enough slots to place it at the previous NaT collection.
-     *  Then we need to add the bias to the number of slots,
-     *  then add 1 for every 63 slots to account for NaT collections.
-     *  Then we can remove the bias again and add the adjusted
-     *  number of slots to the bsp.
-     *
-     *   0                           1f8                             3f8
-     *  +---------------------------------------------------------------+
-     *  |                              X                               X|
-     *  +---------------------------------------------------------------+
-     *   <-------- bias -------->
-     *                           <--- nslots --->
-     *                           ^
-     *                           |
-     *                          bsp
-     *   <------------ nslots + bias ----------->
-
-     *  When subtracting from bsp, we avoid depending on the sign of
-     *  the quotient by adding 63*8 before division and subtracting 8
-     *  after division. (Assumes that we will never be called upon
-     *  to subtract more than 504 slots from bsp.)
-     *
-     *   0                           1f8                             3f8
-     *  +---------------------------------------------------------------+
-     *  |                              X                               X|
-     *  +---------------------------------------------------------------+
-     *                                  <-- bias -->
-     *                           <--- (-nslots) --->
-     *                                              ^
-     *                                              |
-     *                                             bsp
-     *                           <----------------->
-     *                             -(nslots + bias)
-     */
-
-    bias = ((unsigned int)bsp & 0x1f8) / DWORDSZ;
-    nslots += (nslots + bias + 63*8) / 63 - 8;
-    return bsp + nslots * DWORDSZ;
-}
-
-#if 0
-int uwx_selftest_bsp_arithmetic()
-{
-    int i;
-    int j;
-    int r;
-    uint64_t bstore[161];
-    uint64_t *bsp;
-    uint64_t *p;
-    int failed = 0;
-
-    printf("uwx_selftest_bsp_arithmetic: bsp at %08lx\n", (unsigned int)bstore);
-    r = 0;
-    bsp = bstore;
-    for (i = 0; i < 161; i++) {
-	if (((unsigned int)bsp & 0x1f8) == 0x1f8)
-	    *bsp++ = 1000 + r;
-	else
-	    *bsp++ = r++;
-    }
-
-    printf("uwx_selftest_bsp_arithmetic: plus tests...\n");
-    bsp = bstore;
-    for (i = 0; i < 64; i++) {
-	r = (int)*bsp;
-	if (r >= 1000)
-	    r -= 1000;
-	for (j = 0; j < 96; j++) {
-	    p = (uint64_t *)(intptr_t)uwx_add_to_bsp((uint64_t)bsp, j);
-	    if (*p != (r + j)) {
-		failed++;
-		printf("%d [%08lx] + %d -> %08lx ",
-				i, (unsigned int)bsp, j, (unsigned int)p);
-		printf("(read %d instead of %d)\n", (int)*p, r + j);
-	    }
-	}
-	bsp++;
-    }
-
-    printf("uwx_selftest_bsp_arithmetic: minus tests...\n");
-    bsp = &bstore[161];
-    for (i = 63; i >= 0; i--) {
-	bsp--;
-	r = (int)*bsp;
-	if (r >= 1000)
-	    r -= 1000;
-	for (j = 0; j < 96; j++) {
-	    p = (uint64_t *)(intptr_t)uwx_add_to_bsp((uint64_t)bsp, -j);
-	    if (*p != (r - j)) {
-		failed++;
-		printf("%d [%08lx] - %d -> %08lx ",
-				i, (unsigned int)bsp, j, (unsigned int)p);
-		printf("(read %d instead of %d)\n", (int)*p, r - j);
-	    }
-	}
-    }
-
-    return failed;
-}
-#endif
diff --git a/sys/contrib/ia64/libuwx/src/uwx_context.h b/sys/contrib/ia64/libuwx/src/uwx_context.h
deleted file mode 100644
index 1f172db5b539..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_context.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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.
-*/
-
-extern uint64_t uwx_add_to_bsp(uint64_t bsp, int nslots);
diff --git a/sys/contrib/ia64/libuwx/src/uwx_env.c b/sys/contrib/ia64/libuwx/src/uwx_env.c
deleted file mode 100644
index 252e3972cfc8..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_env.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 _KERNEL
-#include <stdlib.h>
-#endif
-
-#include "uwx_env.h"
-#include "uwx_scoreboard.h"
-#include "uwx_str.h"
-#include "uwx_trace.h"
-
-#ifdef _KERNEL
-static struct uwx_env uwx_env;
-#define	free(p)		/* nullified */
-#define	malloc(sz)	((sz == sizeof(uwx_env)) ? &uwx_env : NULL)
-#endif
-
-alloc_cb uwx_allocate_cb = 0;
-free_cb uwx_free_cb = 0;
-
-int uwx_register_alloc_cb(alloc_cb alloc, free_cb free)
-{
-    uwx_allocate_cb = alloc;
-    uwx_free_cb = free;
-    return UWX_OK;
-}
-
-int uwx_init_history(struct uwx_env *env)
-{
-    int i;
-
-    if (env == 0)
-	return UWX_ERR_NOENV;
-
-    for (i = 0; i < NSPECIALREG; i++)
-	env->history.special[i] = UWX_DISP_REG(i);;
-    for (i = 0; i < NPRESERVEDGR; i++)
-	env->history.gr[i] = UWX_DISP_REG(UWX_REG_GR(4+i));
-    for (i = 0; i < NPRESERVEDBR; i++)
-	env->history.br[i] = UWX_DISP_REG(UWX_REG_BR(1+i));
-    for (i = 0; i < 4; i++)
-	env->history.fr[i] = UWX_DISP_REG(UWX_REG_FR(2+i));
-    for ( ; i < NPRESERVEDFR; i++)
-	env->history.fr[i] = UWX_DISP_REG(UWX_REG_FR(12+i));
-
-    return UWX_OK;
-}
-
-int uwx_init_env(struct uwx_env *env, size_t total_size)
-{
-    int i;
-    struct uwx_str_pool *str_pool;
-    struct uwx_scoreboard *scoreboards;
-
-    str_pool = (struct uwx_str_pool *)(env + 1);
-    scoreboards = (struct uwx_scoreboard *)(str_pool + 1);
-
-    if (sizeof(struct uwx_env) + sizeof(struct uwx_str_pool) > total_size)
-	return UWX_ERR_NOMEM;
-    total_size -= sizeof(struct uwx_env) + sizeof(struct uwx_str_pool);
-
-    env->context.valid_regs = 0;
-    env->context.valid_frs = 0;
-    for (i = 0; i < NSPECIALREG; i++)
-	env->context.special[i] = 0;
-    for (i = 0; i < NPRESERVEDGR; i++)
-	env->context.gr[i] = 0;
-    for (i = 0; i < NPRESERVEDBR; i++)
-	env->context.br[i] = 0;
-    for (i = 0; i < NPRESERVEDFR; i++) {
-	env->context.fr[i].part0 = 0;
-	env->context.fr[i].part1 = 0;
-    }
-    env->rstate = 0;
-    env->remapped_ip = 0;
-    env->function_offset = 0;
-    env->ptr_size = DWORDSZ;
-    env->uinfo_hdr = 0;
-    env->uinfo_end = 0;
-    env->code_start = 0;
-    env->text_base = 0;
-    (void)uwx_init_history(env);
-    if (uwx_allocate_cb != NULL)
-	env->allocate_cb = uwx_allocate_cb;
-    else
-	env->allocate_cb = NULL;
-    if (uwx_free_cb != NULL)
-	env->free_cb = uwx_free_cb;
-    else
-	env->free_cb = NULL;
-    env->free_scoreboards = 0;
-    env->used_scoreboards = 0;
-    env->labeled_scoreboards = 0;
-    (void)uwx_init_str_pool(env, str_pool);
-    env->module_name = 0;
-    env->function_name = 0;
-    env->cb_token = 0;
-    env->copyin = 0;
-    env->lookupip = 0;
-    env->remote = 0;
-    env->byte_swap = 0;
-    env->abi_context = 0;
-    env->nsbreg = NSBREG;
-    env->nscoreboards = 0;
-    env->on_heap = 0;
-    env->trace = 0;
-    TRACE_INIT
-    for (i = 0; total_size >= sizeof(struct uwx_scoreboard); i++) {
-	(void) uwx_prealloc_scoreboard(env, &scoreboards[i]);
-	total_size -= sizeof(struct uwx_scoreboard);
-    }
-    return UWX_OK;
-}
-
-int uwx_set_nofr(struct uwx_env *env)
-{
-    if (env == 0)
-	return UWX_ERR_NOENV;
-
-    env->nsbreg = NSBREG_NOFR;
-    return UWX_OK;
-}
-
-struct uwx_env *uwx_init()
-{
-    struct uwx_env *env;
-    size_t total_size;
-
-    total_size = sizeof(struct uwx_env) +
-		    sizeof(struct uwx_str_pool) +
-			NSCOREBOARDS * sizeof(struct uwx_scoreboard);
-
-    if (uwx_allocate_cb == 0)
-	env = (struct uwx_env *) malloc(total_size);
-    else
-	env = (struct uwx_env *) (*uwx_allocate_cb)(total_size);
-    if (env != 0) {
-	uwx_init_env(env, total_size);
-	env->on_heap = 1;
-    }
-    return env;
-}
-
-int uwx_set_remote(struct uwx_env *env, int is_big_endian_target)
-{
-    int is_big_endian_host;
-    char *p;
-
-    if (env == 0)
-	return UWX_ERR_NOENV;
-
-    env->remote = 1;
-
-    is_big_endian_host = 1;
-    p = (char *)&is_big_endian_host;
-    *p = 0;
-    if (is_big_endian_target == is_big_endian_host)
-	env->byte_swap = 0;
-    else
-	env->byte_swap = 1;
-
-    return UWX_OK;
-}
-
-int uwx_register_callbacks(
-    struct uwx_env *env,
-    intptr_t tok,
-    copyin_cb copyin,
-    lookupip_cb lookupip)
-{
-    if (env == 0)
-	return UWX_ERR_NOENV;
-    env->cb_token = tok;
-    env->copyin = copyin;
-    env->lookupip = lookupip;
-    return UWX_OK;
-}
-
-int uwx_get_abi_context_code(struct uwx_env *env)
-{
-    if (env == 0)
-	return UWX_ERR_NOENV;
-    return env->abi_context;
-}
-
-int uwx_free(struct uwx_env *env)
-{
-    if (env != 0) {
-	uwx_free_scoreboards(env);
-	uwx_free_str_pool(env);
-	if (env->on_heap) {
-	    if (env->free_cb == 0)
-		free((void *)env);
-	    else
-		(*env->free_cb)((void *)env);
-	}
-    }
-    return UWX_OK;
-}
diff --git a/sys/contrib/ia64/libuwx/src/uwx_env.h b/sys/contrib/ia64/libuwx/src/uwx_env.h
deleted file mode 100644
index 71b9d663e07a..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_env.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 "uwx.h"
-
-#define WORDSZ			4
-#define DWORDSZ			8
-#define BUNDLESZ		16
-#define SLOTSPERBUNDLE		3
-
-#define UNWIND_TBL_32BIT	0x8000000000000000LL
-
-#define UNW_VER(x)		((x) >> 48)
-#define UNW_FLAG_MASK		0x0000ffff00000000LL
-#define UNW_FLAG_EHANDLER	0x0000000100000000LL
-#define UNW_FLAG_UHANDLER	0x0000000200000000LL
-#define UNW_LENGTH(x)		((x) & 0x00000000ffffffffLL)
-
-struct uwx_scoreboard;
-
-#define NSCOREBOARDS	8	/* Initial allocation of scoreboards */
-
-#define NSPECIALREG	16	/* Must be even, so FRs are aligned */
-#define NPRESERVEDGR	4
-#define NPRESERVEDBR	5
-#define NPRESERVEDFR	20
-
-struct uwx_fpreg {
-    uint64_t part0;
-    uint64_t part1;
-};
-
-struct uwx_context {
-    unsigned int valid_regs;
-    unsigned int valid_frs;
-    uint64_t special[NSPECIALREG];
-    uint64_t gr[NPRESERVEDGR];
-    uint64_t br[NPRESERVEDBR];
-    struct uwx_fpreg fr[NPRESERVEDFR];
-};
-
-#define VALID_GR_SHIFT	NSPECIALREG
-#define VALID_BR_SHIFT	(NSPECIALREG + NPRESERVEDGR)
-
-#define VALID_BASIC4	0x0f	/* IP, SP, BSP, CFM */
-#define VALID_MARKERS	0x70	/* RP, PSP, PFS */
-
-struct uwx_history {
-    uint64_t special[NSPECIALREG];
-    uint64_t gr[NPRESERVEDGR];
-    uint64_t br[NPRESERVEDBR];
-    uint64_t fr[NPRESERVEDFR];
-};
-
-struct uwx_str_pool;
-
-struct uwx_env {
-    struct uwx_context context;
-    uint64_t *rstate;
-    uint64_t remapped_ip;
-    int64_t function_offset;
-    uint64_t ptr_size;
-    uint64_t uinfo_hdr;
-    uint64_t uinfo_end;
-    uint64_t code_start;
-    uint64_t text_base;
-    struct uwx_history history;
-    alloc_cb allocate_cb;
-    free_cb free_cb;
-    struct uwx_scoreboard *free_scoreboards;
-    struct uwx_scoreboard *used_scoreboards;
-    struct uwx_scoreboard *labeled_scoreboards;
-    struct uwx_str_pool *string_pool;
-    char *module_name;
-    char *function_name;
-    intptr_t cb_token;
-    copyin_cb copyin;
-    lookupip_cb lookupip;
-    int remote;
-    int byte_swap;
-    int abi_context;
-    int nsbreg;
-    int nscoreboards;
-    int on_heap;
-    int trace;
-};
-
-extern alloc_cb uwx_allocate_cb;
-extern free_cb uwx_free_cb;
-extern int uwx_init_env(struct uwx_env *env, size_t total_size);
diff --git a/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c b/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c
deleted file mode 100644
index d68a6e18f3df..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 _KERNEL
-#include <stdlib.h>
-#endif
-
-#include "uwx_env.h"
-#include "uwx_scoreboard.h"
-#include "uwx_trace.h"
-
-#ifdef _KERNEL
-static unsigned short uwx_allocated;
-static struct uwx_scoreboard uwx_scoreboard[sizeof(uwx_allocated) << 3];
-
-static void
-free(struct uwx_scoreboard *p)
-{
-	int idx = p - uwx_scoreboard;
-	uwx_allocated &= ~(1 << idx);
-}
-
-static struct uwx_scoreboard *
-malloc(size_t sz)
-{
-	int idx;
-	if (sz != sizeof(struct uwx_scoreboard))
-		return (NULL);
-	for (idx = 0; idx < (sizeof(uwx_allocated) << 3); idx++) {
-		if ((uwx_allocated & (1 << idx)) == 0) {
-			uwx_allocated |= 1 << idx;
-			return (uwx_scoreboard + idx);
-		}
-	}
-	return (NULL);
-}
-#endif
-
-
-void uwx_prealloc_scoreboard(struct uwx_env *env, struct uwx_scoreboard *sb)
-{
-    sb->id = env->nscoreboards++;
-    sb->nextused = env->used_scoreboards;
-    sb->prealloc = 1;
-    env->used_scoreboards = sb;
-    TRACE_B_PREALLOC(sb->id)
-}
-
-struct uwx_scoreboard *uwx_alloc_scoreboard(struct uwx_env *env)
-{
-    struct uwx_scoreboard *sb;
-    int i;
-
-    if (env->free_scoreboards != 0) {
-	sb = env->free_scoreboards;
-	env->free_scoreboards = sb->nextfree;
-	TRACE_B_REUSE(sb->id)
-    }
-    else {
-	if (env->allocate_cb == 0)
-	    sb = (struct uwx_scoreboard *)
-			malloc(sizeof(struct uwx_scoreboard));
-	else
-	    sb = (struct uwx_scoreboard *)
-			(*env->allocate_cb)(sizeof(struct uwx_scoreboard));
-	if (sb == 0)
-	    return 0;
-	sb->id = env->nscoreboards++;
-	sb->nextused = env->used_scoreboards;
-	sb->prealloc = 0;
-	env->used_scoreboards = sb;
-	TRACE_B_ALLOC(sb->id)
-    }
-
-    sb->nextstack = 0;
-    sb->nextlabel = 0;
-    for (i = 0; i < env->nsbreg; i++)
-	sb->rstate[i] = UWX_DISP_NONE;
-    sb->rstate[SBREG_RP] = UWX_DISP_REG(UWX_REG_BR(0));
-    sb->rstate[SBREG_PSP] = UWX_DISP_SPPLUS(0);
-    sb->rstate[SBREG_PFS] = UWX_DISP_REG(UWX_REG_AR_PFS);
-    sb->rstate[SBREG_PRIUNAT] = UWX_DISP_REG(UWX_REG_AR_UNAT);
-    sb->label = 0;
-    return sb;
-}
-
-static
-void uwx_reclaim_scoreboards(struct uwx_env *env)
-{
-    struct uwx_scoreboard *sb;
-
-    env->free_scoreboards = 0;
-    for (sb = env->used_scoreboards; sb != 0; sb = sb->nextused) {
-	sb->nextfree = env->free_scoreboards;
-	env->free_scoreboards = sb;
-    }
-    env->labeled_scoreboards = 0;
-}
-
-struct uwx_scoreboard *uwx_init_scoreboards(struct uwx_env *env)
-{
-    struct uwx_scoreboard *sb;
-
-    uwx_reclaim_scoreboards(env);
-    sb = uwx_alloc_scoreboard(env);
-    return sb;
-}
-
-struct uwx_scoreboard *uwx_new_scoreboard(
-    struct uwx_env *env,
-    struct uwx_scoreboard *prevsb)
-{
-    int i;
-    struct uwx_scoreboard *sb;
-
-    sb = uwx_alloc_scoreboard(env);
-    if (sb == 0)
-	return 0;
-    sb->nextstack = prevsb;
-    for (i = 0; i < env->nsbreg; i++)
-	sb->rstate[i] = prevsb->rstate[i];
-    return sb;
-}
-
-struct uwx_scoreboard *uwx_pop_scoreboards(
-    struct uwx_env *env,
-    struct uwx_scoreboard *sb,
-    int ecount)
-{
-    struct uwx_scoreboard *next;
-
-    while (ecount > 0) {
-	next = sb->nextstack;
-	TRACE_B_POP(sb->id)
-	sb->nextstack = 0;
-	sb->nextfree = env->free_scoreboards;
-	env->free_scoreboards = sb;
-	sb = next;
-	if (sb == 0)
-	    return 0;
-	ecount--;
-    }
-    return sb;
-}
-
-int uwx_label_scoreboard(
-    struct uwx_env *env,
-    struct uwx_scoreboard *sb,
-    int label)
-{
-    struct uwx_scoreboard *new;
-    struct uwx_scoreboard *back;
-    struct uwx_scoreboard *next;
-    int i;
-
-    TRACE_B_LABEL(label)
-
-    /* Copy the current stack, storing reverse links */
-    /* in the "nextstack" field. */
-
-    back = 0;
-    new = 0;
-    while (sb != 0) {
-	TRACE_B_LABEL_COPY(sb->id)
-	new = uwx_alloc_scoreboard(env);
-	if (new == 0)
-	    return UWX_ERR_NOMEM;
-	new->nextstack = back;
-	for (i = 0; i < env->nsbreg; i++)
-	    new->rstate[i] = sb->rstate[i];
-	sb = sb->nextstack;
-	back = new;
-    }
-
-    /* The "new" pointer now points to the bottom of the new stack, */
-    /* and the "nextstack" links lead towards the top. */
-    /* Now go back down the stack, reversing the stack links to their */
-    /* proper direction. */
-
-    back = 0;
-    while (new != 0) {
-	next = new->nextstack;
-	new->nextstack = back;
-	TRACE_B_LABEL_REVERSE(back, new)
-	back = new;
-	new = next;
-    }
-
-    /* The "back" pointer now points to the top of the stack. */
-
-    back->label = label;
-    back->nextlabel = env->labeled_scoreboards;
-    env->labeled_scoreboards = back;
-    return UWX_OK;
-}
-
-int uwx_copy_scoreboard(
-    struct uwx_env *env,
-    struct uwx_scoreboard *sb,
-    int label)
-{
-    struct uwx_scoreboard *next;
-    struct uwx_scoreboard *next2;
-    struct uwx_scoreboard *lsb;
-    struct uwx_scoreboard *new;
-    struct uwx_scoreboard *back;
-    int i;
-
-    TRACE_B_COPY(label, sb->id)
-
-    /* Free the existing stack. */
-
-    next = sb->nextstack;
-    while (next != 0) {
-	TRACE_B_COPY_FREE(next->id)
-	next2 = next->nextstack;
-	next->nextstack = 0;
-	next->nextfree = env->free_scoreboards;
-	env->free_scoreboards = next;
-	next = next2;
-    }
-
-    /* Find the scoreboard with the requested label. */
-
-    for (lsb = env->labeled_scoreboards; lsb != 0; lsb = lsb->nextlabel) {
-	if (lsb->label == label)
-	    break;
-    }
-
-    if (lsb == 0)
-	return UWX_ERR_UNDEFLABEL;
-
-    TRACE_B_COPY_FOUND(lsb->id)
-
-    /* Copy the labeled scoreboard. */
-
-    sb->nextstack = 0;
-    sb->nextlabel = 0;
-    for (i = 0; i < env->nsbreg; i++)
-	sb->rstate[i] = lsb->rstate[i];
-    sb->label = 0;
-
-    /* Now copy its stack, storing reverse links in the nextstack field. */
-
-    back = sb;
-    new = 0;
-    for (next = lsb->nextstack; next != 0; next = next->nextstack) {
-	TRACE_B_COPY_COPY(next->id)
-	new = uwx_alloc_scoreboard(env);
-	if (new == 0)
-	    return UWX_ERR_NOMEM;
-	new->nextstack = back;
-	for (i = 0; i < env->nsbreg; i++)
-	    new->rstate[i] = next->rstate[i];
-	back = new;
-    }
-
-    /* The "new" pointer now points to the bottom of the new stack, */
-    /* and the "nextstack" links lead towards the top. */
-    /* Now go back down the stack, reversing the nextstack links to their */
-    /* proper direction. */
-
-    back = 0;
-    while (new != 0) {
-	next = new->nextstack;
-	new->nextstack = back;
-	TRACE_B_COPY_REVERSE(back, new)
-	back = new;
-	new = next;
-    }
-
-    return UWX_OK;
-}
-
-void uwx_free_scoreboards(struct uwx_env *env)
-{
-    struct uwx_scoreboard *sb;
-    struct uwx_scoreboard *next;
-
-    for (sb = env->used_scoreboards; sb != 0; sb = next) {
-	TRACE_B_FREE(sb->id)
-	next = sb->nextused;
-	if (!sb->prealloc) {
-	    if (env->free_cb == 0)
-		free((void *)sb);
-	    else
-		(*env->free_cb)((void *)sb);
-	}
-    }
-    env->free_scoreboards = 0;
-    env->used_scoreboards = 0;
-    env->labeled_scoreboards = 0;
-}
-
diff --git a/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h b/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h
deleted file mode 100644
index 752b8fb479bc..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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.
-*/
-
-#define NSB_SPECIAL	9
-#define NSB_GR		4
-#define NSB_BR		5
-#define NSB_FR		20
-
-#define SBREG_RP	0
-#define SBREG_PSP	1
-#define SBREG_PFS	2
-#define SBREG_PREDS	3
-#define SBREG_UNAT	4
-#define SBREG_PRIUNAT	5
-#define SBREG_RNAT	6
-#define SBREG_LC	7
-#define SBREG_FPSR	8
-#define SBREG_GR	(0 + NSB_SPECIAL)
-#define SBREG_BR	(SBREG_GR + NSB_GR)
-#define SBREG_FR	(SBREG_BR + NSB_BR)
-
-#define NSBREG_NOFR	(NSB_SPECIAL + NSB_GR + NSB_BR)
-#define NSBREG		(NSB_SPECIAL + NSB_GR + NSB_BR + NSB_FR)
-
-struct uwx_scoreboard {
-    struct uwx_scoreboard *nextused;
-    struct uwx_scoreboard *nextfree;
-    struct uwx_scoreboard *nextstack;
-    struct uwx_scoreboard *nextlabel;
-    uint64_t rstate[NSBREG];
-    int label;
-    int id;
-    int prealloc;
-};
-
-extern void uwx_prealloc_scoreboard(
-    struct uwx_env *env,
-    struct uwx_scoreboard *sb);
-
-extern struct uwx_scoreboard *uwx_alloc_scoreboard(struct uwx_env *env);
-
-extern struct uwx_scoreboard *uwx_init_scoreboards(struct uwx_env *env);
-
-extern struct uwx_scoreboard *uwx_new_scoreboard(
-    struct uwx_env *env,
-    struct uwx_scoreboard *prevsb);
-
-extern struct uwx_scoreboard *uwx_pop_scoreboards(
-    struct uwx_env *env,
-    struct uwx_scoreboard *sb,
-    int ecount);
-
-extern int uwx_label_scoreboard(
-    struct uwx_env *env,
-    struct uwx_scoreboard *sb,
-    int label);
-
-extern int uwx_copy_scoreboard(
-    struct uwx_env *env,
-    struct uwx_scoreboard *sb,
-    int label);
-
-extern void uwx_free_scoreboards(struct uwx_env *env);
diff --git a/sys/contrib/ia64/libuwx/src/uwx_self.c b/sys/contrib/ia64/libuwx/src/uwx_self.c
deleted file mode 100644
index 5f47205f218c..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_self.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 <stdlib.h>
-#include <string.h>
-#include <crt0.h>
-#include <dlfcn.h>
-#include <sys/uc_access.h>
-
-#include "uwx_env.h"
-#include "uwx_context.h"
-#include "uwx_trace.h"
-#include "uwx_self.h"
-#include "uwx_self_info.h"
-
-#define UWX_ABI_HPUX_SIGCONTEXT 0x0101	/* abi = HP-UX, context = 1 */
-
-void uwx_free_load_module_cache(struct uwx_self_info *info);
-
-int uwx_self_init_info_block(struct uwx_env *env, struct uwx_self_info *info)
-{
-    info->env = env;
-    info->ucontext = 0;
-    info->bspstore = 0;
-    info->sendsig_start = __load_info->li_sendsig_txt;
-    info->sendsig_end = __load_info->li_sendsig_txt +
-				__load_info->li_sendsig_tsz;
-    info->on_heap = 0;
-    info->trace = env->trace;
-    info->load_module_cache = NULL;
-
-    return UWX_OK;
-}
-
-struct uwx_self_info *uwx_self_init_info(struct uwx_env *env)
-{
-    struct uwx_self_info *info;
-
-    info = (struct uwx_self_info *)
-			(*env->allocate_cb)(sizeof(struct uwx_self_info));
-    if (info == 0)
-	return 0;
-
-    uwx_self_init_info_block(env, info);
-    info->on_heap = 1;
-    return info;
-}
-
-int uwx_self_free_info(struct uwx_self_info *info)
-{
-    int i;
-
-    if (info->load_module_cache != NULL)
-	uwx_free_load_module_cache(info);
-    if (info->on_heap)
-	(*info->env->free_cb)((void *)info);
-    return UWX_OK;
-}
-
-int uwx_self_init_from_sigcontext(
-    struct uwx_env *env,
-    struct uwx_self_info *info,
-    ucontext_t *ucontext)
-{
-    int status;
-    uint16_t reason;
-    uint64_t ip;
-    uint64_t sp;
-    uint64_t bsp;
-    uint64_t cfm;
-    unsigned int nat;
-    uint64_t ec;
-    int adj;
-
-    info->ucontext = ucontext;
-    status = __uc_get_reason(ucontext, &reason);
-    if (status != 0)
-	return UWX_ERR_UCACCESS;
-    status = __uc_get_ip(ucontext, &ip);
-    if (status != 0)
-	return UWX_ERR_UCACCESS;
-    status = __uc_get_grs(ucontext, 12, 1, &sp, &nat);
-    if (status != 0)
-	return UWX_ERR_UCACCESS;
-    status = __uc_get_cfm(ucontext, &cfm);
-    if (status != 0)
-	return UWX_ERR_UCACCESS;
-#ifdef NEW_UC_GET_AR
-    status = __uc_get_ar_bsp(ucontext, &bsp);
-    if (status != 0)
-	return UWX_ERR_UCACCESS;
-    status = __uc_get_ar_bspstore(ucontext, &info->bspstore);
-    if (status != 0)
-	return UWX_ERR_UCACCESS;
-    status = __uc_get_ar_ec(ucontext, &ec);
-    if (status != 0)
-	return UWX_ERR_UCACCESS;
-#else
-    status = __uc_get_ar(ucontext, 17, &bsp);
-    if (status != 0)
-	return UWX_ERR_UCACCESS;
-    status = __uc_get_ar(ucontext, 18, &info->bspstore);
-    if (status != 0)
-	return UWX_ERR_UCACCESS;
-    status = __uc_get_ar(ucontext, 66, &ec);
-    if (status != 0)
-	return UWX_ERR_UCACCESS;
-#endif
-    /* The returned bsp needs to be adjusted. */
-    /* For interrupt frames, where bsp was advanced by a cover */
-    /* instruction, subtract sof (size of frame). For non-interrupt */
-    /* frames, where bsp was advanced by br.call, subtract sol */
-    /* (size of locals). */
-    if (reason != 0)
-	adj = (unsigned int)cfm & 0x7f;		/* interrupt frame */
-    else
-	adj = ((unsigned int)cfm >> 7) & 0x7f;	/* non-interrupt frame */
-    bsp = uwx_add_to_bsp(bsp, -adj);
-    cfm |= ec << 52;
-    uwx_init_context(env, ip, sp, bsp, cfm);
-    return UWX_OK;
-}
-
-int uwx_self_do_context_frame(
-    struct uwx_env *env,
-    struct uwx_self_info *info)
-{
-    int abi_context;
-    int status;
-    uint64_t ucontext;
-
-    abi_context = uwx_get_abi_context_code(env);
-    if (abi_context != UWX_ABI_HPUX_SIGCONTEXT)
-	return UWX_SELF_ERR_BADABICONTEXT;
-    status = uwx_get_reg(env, UWX_REG_GR(32), (uint64_t *)&ucontext);
-    if (status != UWX_OK)
-	return status;
-    return uwx_self_init_from_sigcontext(env, info,
-					(ucontext_t *)(intptr_t)ucontext);
-}
-
-int uwx_self_copyin(
-    int request,
-    char *loc,
-    uint64_t rem,
-    int len,
-    intptr_t tok)
-{
-    int status;
-    int regid;
-    unsigned int nat;
-    struct uwx_self_info *info = (struct uwx_self_info *) tok;
-    unsigned long *wp;
-    uint64_t *dp;
-
-    status = -1;
-
-    dp = (uint64_t *) loc;
-
-    switch (request) {
-	case UWX_COPYIN_UINFO:
-	case UWX_COPYIN_MSTACK:
-	    if (len == 4) {
-		wp = (unsigned long *) loc;
-		*wp = *(unsigned long *)(intptr_t)rem;
-		TRACE_SELF_COPYIN4(rem, len, wp)
-		status = 0;
-	    }
-	    else if (len == 8) {
-		*dp = *(uint64_t *)(intptr_t)rem;
-		TRACE_SELF_COPYIN8(rem, len, dp)
-		status = 0;
-	    }
-	    break;
-	case UWX_COPYIN_RSTACK:
-	    if (len == 8) {
-		if (info->ucontext == 0 && rem == (info->bspstore | 0x1f8)) {
-		    *dp = info->env->context.special[UWX_REG_AR_RNAT];
-		    status = 0;
-		}
-		else if (info->ucontext == 0 || rem < info->bspstore) {
-		    *dp = *(uint64_t *)(intptr_t)rem;
-		    TRACE_SELF_COPYIN8(rem, len, dp)
-		    status = 0;
-		}
-		else {
-		    status = __uc_get_rsebs(info->ucontext,
-					    (uint64_t *)(intptr_t)rem, 1, dp);
-		}
-	    }
-	    break;
-	case UWX_COPYIN_REG:
-	    regid = (int)rem;
-	    if (info->ucontext != 0) {
-		if (len == 8) {
-		    if (rem == UWX_REG_PREDS)
-			status = __uc_get_prs(info->ucontext, dp);
-		    else if (rem == UWX_REG_AR_PFS)
-			status = __uc_get_ar(info->ucontext, 64, dp);
-		    else if (rem == UWX_REG_AR_RNAT)
-			status = __uc_get_ar(info->ucontext, 19, dp);
-		    else if (rem == UWX_REG_AR_UNAT)
-			status = __uc_get_ar(info->ucontext, 36, dp);
-		    else if (rem == UWX_REG_AR_FPSR)
-			status = __uc_get_ar(info->ucontext, 40, dp);
-		    else if (rem == UWX_REG_AR_LC)
-			status = __uc_get_ar(info->ucontext, 65, dp);
-		    else if (regid >= UWX_REG_GR(1) &&
-						regid <= UWX_REG_GR(31))
-			status = __uc_get_grs(info->ucontext,
-					    regid - UWX_REG_GR(0), 1, dp, &nat);
-		    else if (regid >= UWX_REG_BR(0) &&
-						regid <= UWX_REG_BR(7))
-			status = __uc_get_brs(info->ucontext,
-					    regid - UWX_REG_BR(0), 1, dp);
-		}
-		else if (len == 16) {
-		    if (regid >= UWX_REG_FR(2) && regid <= UWX_REG_FR(127)) {
-			status = __uc_get_frs(info->ucontext,
-				regid - UWX_REG_FR(0), 1, (fp_regval_t *)dp);
-		    }
-		}
-	    }
-	    break;
-    }
-    if (status != 0)
-	return 0;
-    return len;
-}
-
-#define MODULE_CACHE_SIZE 4
-
-struct load_module_cache {
-    int clock;
-    char *names[MODULE_CACHE_SIZE];
-    struct load_module_desc descs[MODULE_CACHE_SIZE];
-    struct uwx_symbol_cache *symbol_cache;
-};
-
-void uwx_free_load_module_cache(struct uwx_self_info *info)
-{
-    int i;
-
-    for (i = 0; i < MODULE_CACHE_SIZE; i++) {
-	if (info->load_module_cache->names[i] != NULL)
-	    (*info->env->free_cb)((void *)info->load_module_cache->names[i]);
-    }
-
-    if (info->load_module_cache->symbol_cache != NULL)
-	uwx_release_symbol_cache(info->env,
-				    info->load_module_cache->symbol_cache);
-
-    (*info->env->free_cb)((void *)info->load_module_cache);
-}
-
-struct load_module_desc *uwx_get_modinfo(
-    struct uwx_self_info *info,
-    uint64_t ip,
-    char **module_name_p)
-{
-    int i;
-    UINT64 handle;
-    struct load_module_cache *cache;
-    struct load_module_desc *desc;
-    char *module_name;
-
-    cache = info->load_module_cache;
-    if (cache == NULL) {
-	cache = (struct load_module_cache *)
-		(*info->env->allocate_cb)(sizeof(struct load_module_cache));
-	if (cache == NULL)
-	    return NULL;
-	for (i = 0; i < MODULE_CACHE_SIZE; i++) {
-	    desc = &cache->descs[i];
-	    desc->text_base = 0;
-	    desc->text_size = 0;
-	    cache->names[i] = NULL;
-	}
-	cache->clock = 0;
-	cache->symbol_cache = NULL;
-	info->load_module_cache = cache;
-    }
-    for (i = 0; i < MODULE_CACHE_SIZE; i++) {
-	desc = &cache->descs[i];
-	if (ip >= desc->text_base && ip < desc->text_base + desc->text_size)
-	    break;
-    }
-    if (i >= MODULE_CACHE_SIZE) {
-	i = cache->clock;
-	cache->clock = (cache->clock + 1) % MODULE_CACHE_SIZE;
-	desc = &cache->descs[i];
-	handle = dlmodinfo(ip, desc, sizeof(*desc), 0, 0, 0);
-	if (handle == 0)
-	    return NULL;
-	if (cache->names[i] != NULL)
-	    (*info->env->free_cb)(cache->names[i]);
-	cache->names[i] = NULL;
-    }
-    if (module_name_p != NULL) {
-	if (cache->names[i] == NULL) {
-	    module_name = dlgetname(desc, sizeof(*desc), 0, 0, 0);
-	    if (module_name != NULL) {
-		cache->names[i] = (char *)
-			    (*info->env->allocate_cb)(strlen(module_name)+1);
-		if (cache->names[i] != NULL)
-		    strcpy(cache->names[i], module_name);
-	    }
-	}
-	*module_name_p = cache->names[i];
-    }
-    return desc;
-}
-
-int uwx_self_lookupip(
-    int request,
-    uint64_t ip,
-    intptr_t tok,
-    uint64_t **resultp)
-{
-    struct uwx_self_info *info = (struct uwx_self_info *) tok;
-    UINT64 handle;
-    struct load_module_desc *desc;
-    uint64_t *unwind_base;
-    uint64_t *rvec;
-    char *module_name;
-    char *func_name;
-    uint64_t offset;
-    int i;
-    int status;
-
-    if (request == UWX_LKUP_LOOKUP) {
-	TRACE_SELF_LOOKUP(ip)
-	if (ip >= info->sendsig_start && ip < info->sendsig_end) {
-	    i = 0;
-	    rvec = info->rvec;
-	    rvec[i++] = UWX_KEY_CONTEXT;
-	    rvec[i++] = UWX_ABI_HPUX_SIGCONTEXT;
-	    rvec[i++] = UWX_KEY_END;
-	    rvec[i++] = 0;
-	    *resultp = rvec;
-	    return UWX_LKUP_FDESC;
-	}
-	else {
-	    desc = uwx_get_modinfo(info, ip, NULL);
-	    if (desc == NULL)
-		return UWX_LKUP_ERR;
-	    unwind_base = (uint64_t *) (intptr_t) desc->unwind_base;
-	    TRACE_SELF_LOOKUP_DESC(desc->text_base,
-					desc->linkage_ptr, unwind_base)
-	    i = 0;
-	    rvec = info->rvec;
-	    rvec[i++] = UWX_KEY_TBASE;
-	    rvec[i++] = desc->text_base;
-	    rvec[i++] = UWX_KEY_UFLAGS;
-	    rvec[i++] = unwind_base[0];
-	    rvec[i++] = UWX_KEY_USTART;
-	    rvec[i++] = desc->text_base + unwind_base[1];
-	    rvec[i++] = UWX_KEY_UEND;
-	    rvec[i++] = desc->text_base + unwind_base[2];
-	    rvec[i++] = UWX_KEY_GP;
-	    rvec[i++] = desc->linkage_ptr;
-	    rvec[i++] = UWX_KEY_END;
-	    rvec[i++] = 0;
-	    *resultp = rvec;
-	    return UWX_LKUP_UTABLE;
-	}
-    }
-    else if (request == UWX_LKUP_FREE) {
-	return 0;
-    }
-    else if (request == UWX_LKUP_MODULE) {
-	desc = uwx_get_modinfo(info, ip, &module_name);
-	if (desc == NULL)
-	    return UWX_LKUP_ERR;
-	if (module_name == NULL)
-	    return UWX_LKUP_ERR;
-	i = 0;
-	rvec = info->rvec;
-	rvec[i++] = UWX_KEY_MODULE;
-	rvec[i++] = (uint64_t)(intptr_t)module_name;
-	rvec[i++] = UWX_KEY_TBASE;
-	rvec[i++] = desc->text_base;
-	rvec[i++] = UWX_KEY_END;
-	rvec[i++] = 0;
-	*resultp = rvec;
-	return UWX_LKUP_SYMINFO;
-    }
-    else if (request == UWX_LKUP_SYMBOLS) {
-	rvec = *resultp;
-	for (i = 0; rvec[i] != UWX_KEY_END; i += 2) {
-	    if (rvec[i] == UWX_KEY_FUNCSTART)
-		ip = rvec[i+1];
-	}
-	desc = uwx_get_modinfo(info, ip, &module_name);
-	if (desc == NULL)
-	    return UWX_LKUP_ERR;
-	if (module_name == NULL)
-	    return UWX_LKUP_ERR;
-	status = uwx_find_symbol(info->env,
-			&info->load_module_cache->symbol_cache,
-			module_name, ip - desc->text_base,
-			&func_name, &offset);
-	i = 0;
-	rvec = info->rvec;
-	rvec[i++] = UWX_KEY_MODULE;
-	rvec[i++] = (uint64_t)(intptr_t)module_name;
-	rvec[i++] = UWX_KEY_TBASE;
-	rvec[i++] = desc->text_base;
-	if (status == UWX_OK) {
-	    rvec[i++] = UWX_KEY_FUNC;
-	    rvec[i++] = (uint64_t)(intptr_t)func_name;
-	    rvec[i++] = UWX_KEY_FUNCSTART;
-	    rvec[i++] = ip - offset;
-	}
-	rvec[i++] = UWX_KEY_END;
-	rvec[i++] = 0;
-	*resultp = rvec;
-	return UWX_LKUP_SYMINFO;
-    }
-    return UWX_LKUP_ERR;
-}
diff --git a/sys/contrib/ia64/libuwx/src/uwx_self.h b/sys/contrib/ia64/libuwx/src/uwx_self.h
deleted file mode 100644
index ada318442ead..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_self.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 __UWX_SELF_INCLUDED
-#define __UWX_SELF_INCLUDED 1
-
-#include <signal.h>
-
-#ifndef __UWX_INCLUDED
-#include "uwx.h"
-#endif /* __UWX_INCLUDED */
-
-#if defined(__cplusplus)
-#define __EXTERN_C extern "C"
-#else
-#define __EXTERN_C extern
-#endif
-
-struct uwx_self_info;
-
-__EXTERN_C struct uwx_self_info *uwx_self_init_info(struct uwx_env *env);
-
-__EXTERN_C int uwx_self_free_info(struct uwx_self_info *info);
-
-__EXTERN_C int uwx_self_init_context(struct uwx_env *env);
-
-__EXTERN_C int uwx_self_init_from_sigcontext(
-    struct uwx_env *env,
-    struct uwx_self_info *info,
-    ucontext_t *ucontext);
-
-__EXTERN_C int uwx_self_do_context_frame(
-    struct uwx_env *env,
-    struct uwx_self_info *info);
-
-__EXTERN_C int uwx_self_copyin(
-    int request,
-    char *loc,
-    uint64_t rem,
-    int len,
-    intptr_t tok);
-
-__EXTERN_C int uwx_self_lookupip(
-    int request,
-    uint64_t ip,
-    intptr_t tok,
-    uint64_t **resultp);
-
-#define UWX_SELF_ERR_BADABICONTEXT  (-101)
-
-#undef __EXTERN_C
-
-#if defined(__cplusplus)
-
-class UnwindExpressSelf : public UnwindExpress {
-
-public:
-
-    UnwindExpressSelf() {
-	info = uwx_self_init_info(env);
-	(void)uwx_register_callbacks(env, (intptr_t)info,
-				uwx_self_copyin, uwx_self_lookupip);
-    }
-
-    ~UnwindExpressSelf() {
-	if (info != 0)
-	    uwx_self_free_info(info);
-	info = 0;
-    }
-
-    int init_context() {
-	return uwx_self_init_context(env);
-    }
-
-    int init_context(ucontext_t *ucontext) {
-	return uwx_self_init_from_sigcontext(env, info, ucontext);
-    }
-
-    int do_context_frame() {
-	return uwx_self_do_context_frame(env, info);
-    }
-
-protected:
-
-    struct uwx_self_info *info;
-
-};
-
-#endif /* __cplusplus */
-
-#endif /* __UWX_SELF_INCLUDED */
diff --git a/sys/contrib/ia64/libuwx/src/uwx_self_context.s b/sys/contrib/ia64/libuwx/src/uwx_self_context.s
deleted file mode 100644
index e2986eb4139b..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_self_context.s
+++ /dev/null
@@ -1,383 +0,0 @@
-// Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-// 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 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.
-
-#ifdef _LP64
-#define SWIZZLE add
-#define STPTR st8
-#else
-#define SWIZZLE addp4
-#define STPTR st4
-#endif
-
-rRP	= r14
-rPFS	= r15
-rUNAT	= r16
-rRNAT	= r17
-rENV0	= r18
-rENV1	= r19
-rENV2	= r20
-rNSLOT	= r21
-rBSP	= r22
-rPBSP	= r23
-rRSC	= r24
-rNATP	= r25
-rBIAS	= r26
-rRSC0	= r27
-rTMP1	= r28
-rTMP2	= r29
-rTMP3	= r30
-rTMP4	= r31
-rTMP5	= r8
-rMYPFS	= r9
-rPSP	= r10
-
-VALID_IP      = 1
-VALID_SP      = 1 << 1
-VALID_BSP     = 1 << 2
-VALID_CFM     = 1 << 3
-VALID_PREDS   = 1 << 7
-VALID_PRIUNAT = 1 << 8
-VALID_RNAT    = 1 << 10
-VALID_UNAT    = 1 << 11
-VALID_FPSR    = 1 << 12
-VALID_LC      = 1 << 13
-VALID_GRS     = 0xf << 16
-VALID_BRS     = 0x1f << 20
-VALID_BASIC4  = VALID_IP | VALID_SP | VALID_BSP | VALID_CFM
-VALID_SPEC    = VALID_PREDS | VALID_PRIUNAT | VALID_RNAT | VALID_UNAT | VALID_FPSR | VALID_LC
-VALID_REGS    = VALID_BASIC4 | VALID_SPEC | VALID_GRS | VALID_BRS
-VALID_FRS     = 0xfffff
-// valid_regs and valid_frs are separate unsigned int fields.
-// In order to store them with a single st8, we need to know
-// the endianness.
-#ifdef __LITTLE_ENDIAN__
-VALID_BITS   = (VALID_FRS << 32) | VALID_REGS
-#else
-VALID_BITS   = (VALID_REGS << 32) | VALID_FRS
-#endif
-
-	.text
-
-// int uwx_self_init_context(struct uwx_env *env);
-//
-// Stores a snapshot of the caller's context in the uwx_env structure.
-
-	.proc	uwx_self_init_context
-	.global uwx_self_init_context
-uwx_self_init_context:
-	.prologue
-	alloc	rPFS = ar.pfs, 1, 0, 0, 0
-	mov	rUNAT = ar.unat
-	.body
-	SWIZZLE	rENV0 = r0, r32		// rENV0 = &env
-	;;
-	flushrs
-	extr.u	rNSLOT = rPFS, 7, 7 	// nslots = pfs.sol
-	mov	rRP = b0
-	;;
-	mov	rRSC = ar.rsc
-	add	rENV1 = 136, rENV0	// rENV1 = &env->context.gr[0]
-	add	rENV2 = 144, rENV0	// rENV2 = &env->context.gr[1]
-	;;
-	and	rRSC0 = -4, rRSC	// clear ar.rsc.mode
-	adds	rNATP = 0x1f8, r0
-	mov	rTMP1 = b1
-	;;
-	st8.spill [rENV1] = r4, 16	// env+136: r4
-	st8.spill [rENV2] = r5, 16	// env+144: r5
-	mov	rTMP2 = b2
-	;;
-	st8.spill [rENV1] = r6, 16	// env+152: r6
-	st8.spill [rENV2] = r7, 16	// env+160: r7
-	mov	rTMP3 = b3
-	;;
-	st8	[rENV1] = rTMP1, 16	// env+168: b1
-	st8	[rENV2] = rTMP2, 16	// env+176: b2
-	mov	rTMP1 = b4
-	;;
-	st8	[rENV1] = rTMP3, 16	// env+184: b3
-	st8	[rENV2] = rTMP1, 16	// env+192: b4
-	mov	rTMP2 = b5
-	;;
-	st8	[rENV1] = rTMP2		// env+200: b5
-	mov	ar.rsc = rRSC0		// enforced lazy mode
-	add	rENV1 = 8, rENV0
-	;;
-	mov	rRNAT = ar.rnat		// get copy of ar.rnat
-	movl	rTMP1 = VALID_BITS	// valid_regs: ip, sp, bsp, cfm,
-					// preds, priunat, rnat, unat, fpsr,
-					// lc, grs, brs
-					// = 0x1ff3d8f00000000 
-	;;
-	mov	ar.rsc = rRSC		// restore ar.rsc
-	mov	rBSP = ar.bsp
-	add	rTMP3 = 136, rENV0	// spill_loc = &env->context.gr[0]
-	;;
-	mov	rTMP2 = ar.unat
-	nop
-	extr.u	rTMP3 = rTMP3, 3, 6	// bitpos = spill_loc{8:3}
-	;;
-	and	rBIAS = rBSP, rNATP	// bias = (bsp & 0x1f8) ...
-	sub	rTMP4 = 64, rTMP3	// (64 - bitpos)
-	shr	rTMP5 = rTMP2, rTMP3	// (unat >> bitpos)
-	;;
-	nop
-	extr.u	rBIAS = rBIAS, 3, 6	//   ... div 8
-	shl	rTMP2 = rTMP2, rTMP4	// (unat << (64 - bitpos))
-	;;
-	or	rTMP2 = rTMP2, rTMP5	// rotate_right(unat, bitpos)
-	nop
-	mov	rTMP4 = pr
-	;;
-	st8	[rENV0] = rTMP1, 16	// env+0: valid_regs mask
-	st8	[rENV1] = rRP, 24	// env+8: ip (my rp)
-	sub	rBIAS = rNSLOT, rBIAS	// bias = nslots - bias
-	;;
-	cmp.lt	p6, p0 = 0, rBIAS	// if (0 < bias) ...
-	cmp.lt	p7, p0 = 63, rBIAS	// if (63 < bias) ...
-	;;
-	st8	[rENV0] = r12, 48	// env+16: sp
-	st8	[rENV1] = rPFS, 40	// env+32: cfm (my pfs)
-(p6)	add	rNSLOT = 1, rNSLOT	//   ... nslots++
-	;;
-	st8	[rENV0] = rTMP4, 24	// env+64: preds
-	st8	[rENV1] = rTMP2, 24	// env+72: priunat
-(p7)	add	rNSLOT = 1, rNSLOT	//   ... nslots++
-	;;
-	st8	[rENV0] = rRNAT, -64	// env+88: ar.rnat
-	st8	[rENV1] = rUNAT, 8	// env+96: ar.unat
-	dep.z	rTMP3 = rNSLOT, 3, 7 	// (nslots << 3)
-	;;
-	sub	rPBSP = rBSP, rTMP3	// prev_bsp = bsp - (nslots << 3)
-	mov	rTMP3 = ar.fpsr
-	mov	rTMP1 = ar.lc
-	;;
-	st8	[rENV0] = rPBSP, 184	// env+24: bsp (my prev bsp)
-	st8	[rENV1] = rTMP3, 8	// env+104: ar.fpsr
-	add	rENV2 = 320, rENV2	// rENV2 = &env->context.rstate
-	;;
-	st8	[rENV1] = rTMP1, 112	// env+112: ar.lc
-	STPTR	[rENV2] = r0		// env+528: env->rstate = 0
-	nop
-	;;
-	// THIS CODE NEEDS TO BE SCHEDULED!!!
-	stf.spill [rENV0] = f2, 32	// env+208: f2
-	stf.spill [rENV1] = f3, 32	// env+224: f3
-	;;
-	stf.spill [rENV0] = f4, 32	// env+240: f4
-	stf.spill [rENV1] = f5, 32	// env+256: f5
-	;;
-	stf.spill [rENV0] = f16, 32	// env+272: f16
-	stf.spill [rENV1] = f17, 32	// env+288: f17
-	;;
-	stf.spill [rENV0] = f18, 32	// env+304: f16
-	stf.spill [rENV1] = f19, 32	// env+320: f17
-	;;
-	stf.spill [rENV0] = f20, 32	// env+336: f16
-	stf.spill [rENV1] = f21, 32	// env+352: f17
-	;;
-	stf.spill [rENV0] = f22, 32	// env+368: f16
-	stf.spill [rENV1] = f23, 32	// env+384: f17
-	;;
-	stf.spill [rENV0] = f24, 32	// env+400: f16
-	stf.spill [rENV1] = f25, 32	// env+416: f17
-	;;
-	stf.spill [rENV0] = f26, 32	// env+432: f16
-	stf.spill [rENV1] = f27, 32	// env+448: f17
-	;;
-	stf.spill [rENV0] = f28, 32	// env+464: f16
-	stf.spill [rENV1] = f29, 32	// env+480: f17
-	;;
-	stf.spill [rENV0] = f30, 32	// env+496: f16
-	stf.spill [rENV1] = f31, 32	// env+512: f17
-	;;
-	mov	ar.unat = rUNAT
-	mov	ret0 = r0		// return UWX_OK
-	br.ret.sptk b0
-	.endp
-
-// uwx_self_install_context(
-//		struct uwx_env *env,
-//		uint64_t r15,
-//		uint64_t r16,
-//		uint64_t r17,
-//		uint64_t r18,
-//		uint64_t ret
-//		);
-//
-// Installs the given context, and sets the landing pad binding
-// registers r15-r18 to the values given.
-// Returns the value "ret" to the new context (for testing --
-// when transferring to a landing pad, the new context won't
-// care about the return value).
-
-	.proc	uwx_self_install_context
-	.global uwx_self_install_context
-uwx_self_install_context:
-	.prologue
-	alloc	rMYPFS = ar.pfs, 6, 0, 0, 0
-	.body
-	SWIZZLE	rENV0 = r0, r32		// rENV0 = &env
-	;;
-
-	// THIS CODE NEEDS TO BE SCHEDULED!!!
-
-	// Restore GR 4-7 and ar.unat
-	add	rENV1 = 136, rENV0	// &env->context.gr[0]
-	add	rENV2 = 72, rENV0	// &env->context.priunat
-	;;
-	ld8	rTMP2 = [rENV2], 24	// env+72: priunat
-	extr.u	rTMP3 = rENV1, 3, 6	// bitpos = spill_loc{8:3}
-	;;
-	ld8	rUNAT = [rENV2], 48	// env+96: ar.unat
-	sub	rTMP4 = 64, rTMP3	// (64 - bitpos)
-	shl	rTMP5 = rTMP2, rTMP3	// (unat << bitpos)
-	;;
-	shr	rTMP2 = rTMP2, rTMP4	// (unat >> (64 - bitpos))
-	;;
-	or	rTMP2 = rTMP2, rTMP5	// rotate_left(unat, bitpos)
-	;;
-	mov	ar.unat = rTMP2		// put priunat in place
-	;;
-	ld8.fill r4 = [rENV1], 16	// env+136: r4
-	ld8.fill r5 = [rENV2], 16	// env+144: r5
-	;;
-	ld8.fill r6 = [rENV1], 16	// env+152: r6
-	ld8.fill r7 = [rENV2], 16	// env+160: r7
-	;;
-	mov	ar.unat = rUNAT		// restore real ar.unat
-
-	// Restore BR 1-5
-	ld8	rTMP1 = [rENV1], 16	// env+168: b1
-	ld8	rTMP2 = [rENV2], 16	// env+176: b2
-	;;
-	ld8	rTMP3 = [rENV1], 16	// env+184: b3
-	ld8	rTMP4 = [rENV2], -168	// env+192: b4
-	mov	b1 = rTMP1
-	;;
-	ld8	rTMP1 = [rENV1], -168	// env+200: b5
-	mov	b2 = rTMP2
-	mov	b3 = rTMP3
-	mov	b4 = rTMP4
-	;;
-	mov	b5 = rTMP1
-
-	// Restore ar.bsp, ar.pfs, and ar.rnat
-	ld8	rPFS = [rENV1], 56	// env+32: cfm (+saved ar.ec)
-	mov	rRSC = ar.rsc
-	adds	rBIAS = 0x1f8, r0
-	;;
-	flushrs
-	ld8	rRNAT = [rENV1], -24	// env+88: ar.rnat
-	ld8	rPBSP = [rENV2], 88	// env+24: prev_bsp
-	and	rRSC0 = -4, rRSC	// clear ar.rsc.mode
-	;;
-	mov	ar.rsc = rRSC0		// enforced lazy mode
-	extr.u	rNSLOT = rPFS, 7, 7 	// nslots = pfs.sol
-	;;
-	invala
-	and	rBIAS = rPBSP, rBIAS	// bias = prev_bsp & 0x1f8 ...
-	;;
-	extr.u	rBIAS = rBIAS, 3, 6	// ... div 8
-	;;
-	add	rBIAS = rNSLOT, rBIAS	// bias += nslots
-	;;
-	cmp.lt	p6, p0 = 63, rBIAS	// if (63 < bias) ...
-	cmp.lt	p7, p0 = 126, rBIAS	// if (126 < bias) ...
-	;;
-(p6)	add	rNSLOT = 1, rNSLOT	//   ... nslots++
-	;;
-(p7)	add	rNSLOT = 1, rNSLOT	//   ... nslots++
-	;;
-	dep.z	rTMP3 = rNSLOT, 3, 7 	// (nslots << 3)
-	;;
-	add	rBSP = rPBSP, rTMP3	// bsp = prev_bsp + (nslots << 3)
-	;;
-	mov	ar.bspstore = rBSP	// restore ar.bsp
-	;;
-	mov	ar.rnat = rRNAT		// restore ar.rnat
-	mov	ar.pfs = rPFS		// restore ar.pfs
-	;;
-	mov	ar.rsc = rRSC		// restore ar.rsc
-
-	// Restore preds and ar.lc
-	ld8	rTMP1 = [rENV1], -56	// env+64: preds
-	ld8	rTMP2 = [rENV2], -96	// env+112: ar.lc
-	;;
-	mov	pr = rTMP1
-	mov	ar.lc = rTMP2
-
-	// Get previous sp and ip
-	ld8	rRP = [rENV1], 96	// env+8: ip (my rp)
-	ld8	rPSP = [rENV2], 112	// env+16: sp
-	;;
-
-	// Restore ar.fpsr and gp
-	ld8	rTMP1 = [rENV1], 104	// env+104: ar.fpsr
-	ld8	r1 = [rENV2], 96	// env+128: gp
-	;;
-	mov	ar.fpsr = rTMP1		// restore ar.fpsr
-
-	// Restore FR 2-5 and 16-31
-	ldf.fill f2 = [rENV1], 32	// env+208: f2
-	ldf.fill f3 = [rENV2], 32	// env+224: f3
-	;;
-	ldf.fill f4 = [rENV1], 32	// env+240: f4
-	ldf.fill f5 = [rENV2], 32	// env+256: f5
-	;;
-	ldf.fill f16 = [rENV1], 32	// env+272: f16
-	ldf.fill f17 = [rENV2], 32	// env+288: f17
-	;;
-	ldf.fill f18 = [rENV1], 32	// env+304: f16
-	ldf.fill f19 = [rENV2], 32	// env+320: f17
-	;;
-	ldf.fill f20 = [rENV1], 32	// env+336: f16
-	ldf.fill f21 = [rENV2], 32	// env+352: f17
-	;;
-	ldf.fill f22 = [rENV1], 32	// env+368: f16
-	ldf.fill f23 = [rENV2], 32	// env+384: f17
-	;;
-	ldf.fill f24 = [rENV1], 32	// env+400: f16
-	ldf.fill f25 = [rENV2], 32	// env+416: f17
-	;;
-	ldf.fill f26 = [rENV1], 32	// env+432: f16
-	ldf.fill f27 = [rENV2], 32	// env+448: f17
-	;;
-	ldf.fill f28 = [rENV1], 32	// env+464: f16
-	ldf.fill f29 = [rENV2], 32	// env+480: f17
-	;;
-	ldf.fill f30 = [rENV1], 32	// env+496: f16
-	ldf.fill f31 = [rENV2], 32	// env+512: f17
-
-	// Set landing pad parameter registers
-	mov	r15 = r33
-	mov	r16 = r34
-	mov	r17 = r35
-	mov	r18 = r36
-
-	// Restore previous sp and Return
-	mov	ret0 = r37
-	mov	sp = rPSP
-	mov	b0 = rRP
-	br.ret.sptk b0
-
-	.endp
diff --git a/sys/contrib/ia64/libuwx/src/uwx_self_info.h b/sys/contrib/ia64/libuwx/src/uwx_self_info.h
deleted file mode 100644
index 1d1cc57cca4b..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_self_info.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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.
-*/
-
-#define MAX_RVEC_SIZE 12
-
-struct load_module_cache;
-
-struct uwx_self_info {
-    struct uwx_env *env;
-    ucontext_t *ucontext;
-    uint64_t bspstore;
-    uint64_t rvec[MAX_RVEC_SIZE];
-    uint64_t sendsig_start;
-    uint64_t sendsig_end;
-    int on_heap;
-    int trace;
-    struct load_module_cache *load_module_cache;
-};
-
-extern int uwx_self_init_info_block(
-    struct uwx_env *env,
-    struct uwx_self_info *info
-    );
diff --git a/sys/contrib/ia64/libuwx/src/uwx_step.c b/sys/contrib/ia64/libuwx/src/uwx_step.c
deleted file mode 100644
index 42b8c93869e3..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_step.c
+++ /dev/null
@@ -1,827 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 "uwx_env.h"
-#include "uwx_utable.h"
-#include "uwx_uinfo.h"
-#include "uwx_scoreboard.h"
-#include "uwx_str.h"
-#include "uwx_step.h"
-#include "uwx_trace.h"
-
-/*
- *  uwx_step.c
- *
- *  This file contains the routines for stepping from one frame
- *  into its callers frame. The context for the current frame
- *  is maintained inside the current unwind environment
- *  (struct uwx_env), and is updated with each call to
- *  uwx_step() to refer to the previous frame.
- */
-
-
-/* Forward Declarations */
-
-int uwx_decode_uvec(struct uwx_env *env, uint64_t *uvec, uint64_t **rstate);
-int uwx_restore_reg(struct uwx_env *env, uint64_t rstate,
-					uint64_t *valp, uint64_t *histp);
-int uwx_restore_freg(struct uwx_env *env, uint64_t rstate,
-					uint64_t *valp, uint64_t *histp);
-int uwx_restore_nat(struct uwx_env *env, uint64_t rstate, int unat);
-
-
-/* uwx_lookupip_hook: Hook routine so dynamic instrumentation */
-/*      tools can intercept Lookup IP events. When not */
-/*      intercepted, it just returns "Not found", so that */
-/*      the callback routine is invoked. */
-
-/*ARGSUSED*/
-int uwx_lookupip_hook(int request, uint64_t ip, intptr_t tok, uint64_t **vecp,
-			size_t uvecsize)
-{
-    return UWX_LKUP_NOTFOUND;
-}
-
-
-/* uwx_get_frame_info: Gets unwind info for current frame */
-static
-int uwx_get_frame_info(struct uwx_env *env)
-{
-    int i;
-    int status;
-    int cbstatus;
-    int cbcalled = 0;
-    uint64_t ip;
-    uint64_t *uvec;
-    uint64_t *rstate;
-    struct uwx_utable_entry uentry;
-    uint64_t uvecout[UVECSIZE];
-
-    if (env->copyin == 0 || env->lookupip == 0)
-	return UWX_ERR_NOCALLBACKS;
-
-    env->ptr_size = DWORDSZ;
-    env->code_start = 0;
-    env->function_offset = -1LL;
-    env->function_name = 0;
-    env->module_name = 0;
-    env->abi_context = 0;
-    uwx_reset_str_pool(env);
-
-    /* Use the lookup IP callback routine to find out about the */
-    /* current IP. If the predicate registers are valid, pass them */
-    /* in the uvec. */
-
-    /* When self-unwinding, we call a hook routine before the */
-    /* callback. If the application is running under control of */
-    /* a dynamic instrumentation tool, that tool will have an */
-    /* opportunity to intercept lookup IP requests. */
-
-    i = 0;
-    uvecout[i++] = UWX_KEY_VERSION;
-    uvecout[i++] = UWX_VERSION;
-    if (env->context.valid_regs & (1 << UWX_REG_PREDS)) {
-	uvecout[i++] = UWX_KEY_PREDS;
-	uvecout[i++] = env->context.special[UWX_REG_PREDS];
-    }
-    uvecout[i++] = UWX_KEY_END;
-    uvecout[i++] = 0;
-    uvec = uvecout;
-    cbstatus = UWX_LKUP_NOTFOUND;
-    ip = env->context.special[UWX_REG_IP];
-    env->remapped_ip = ip;
-
-    /* Call the hook routine. */
-
-    if (env->remote == 0)
-	cbstatus = uwx_lookupip_hook(UWX_LKUP_LOOKUP, ip, env->cb_token, &uvec,
-		sizeof(uvecout));
-
-    /* If the hook routine remapped the IP, use the new IP for */
-    /* the callback instead of the original IP. */
-
-    if (cbstatus == UWX_LKUP_REMAP) {
-	for (i = 0; uvec[i] != UWX_KEY_END; i += 2) {
-	    switch ((int)uvec[i]) {
-		case UWX_KEY_NEWIP:
-		    ip = uvec[i+1];
-		    break;
-	    }
-	}
-	env->remapped_ip = ip;
-    }
-
-    /* Now call the callback routine unless the hook routine gave */
-    /* us all the info. */
-
-    if (cbstatus == UWX_LKUP_NOTFOUND || cbstatus == UWX_LKUP_REMAP) {
-	cbcalled = 1;
-	cbstatus = (*env->lookupip)(UWX_LKUP_LOOKUP, ip, env->cb_token, &uvec);
-    }
-
-    /* If the callback routine remapped the IP, call it one more time */
-    /* with the new IP. */
-
-    if (cbstatus == UWX_LKUP_REMAP) {
-	for (i = 0; uvec[i] != UWX_KEY_END; i += 2) {
-	    switch ((int)uvec[i]) {
-		case UWX_KEY_NEWIP:
-		    ip = uvec[i+1];
-		    break;
-	    }
-	}
-	env->remapped_ip = ip;
-	cbstatus = (*env->lookupip)(UWX_LKUP_LOOKUP, ip, env->cb_token, &uvec);
-    }
-
-    /* If NOTFOUND, there's nothing we can do but return an error. */
-
-    if (cbstatus == UWX_LKUP_NOTFOUND) {
-	status = UWX_ERR_IPNOTFOUND;
-    }
-
-    /* If the callback returns an unwind table, we need to */
-    /* search the table for an unwind entry that describes the */
-    /* code region of interest, then decode the unwind information */
-    /* associated with that unwind table entry, and store the */
-    /* resulting register state array in the unwind environment */
-    /* block. */
-
-    else if (cbstatus == UWX_LKUP_UTABLE) {
-	status = uwx_search_utable(env, ip, uvec, &uentry);
-	if (cbcalled)
-	    (void) (*env->lookupip)(UWX_LKUP_FREE, 0, env->cb_token, &uvec);
-	if (status == UWX_OK) {
-	    env->ptr_size = uentry.ptr_size;
-	    env->code_start = uentry.code_start;
-	    status = uwx_decode_uinfo(env, &uentry, &rstate);
-	}
-	if (status == UWX_ERR_NOUENTRY || status == UWX_ERR_NOUDESC)
-	    status = uwx_default_rstate(env, &rstate);
-	if (status == UWX_OK)
-	    env->rstate = rstate;
-    }
-
-    /* If the callback returns an unwind info block, we can */
-    /* proceed directly to decoding the unwind information. */
-
-    else if (cbstatus == UWX_LKUP_UINFO) {
-	uentry.ptr_size = DWORDSZ;
-	uentry.code_start = 0;
-	uentry.code_end = 0;
-	uentry.unwind_info = 0;
-	uentry.unwind_flags = 0;
-	for (i = 0; uvec[i] != UWX_KEY_END; i += 2) {
-	    switch ((int)uvec[i]) {
-		case UWX_KEY_UFLAGS:
-		    uentry.unwind_flags = uvec[i+1];
-		    if (uentry.unwind_flags & UNWIND_TBL_32BIT)
-			uentry.ptr_size = WORDSZ;
-		    break;
-		case UWX_KEY_UINFO:
-		    uentry.unwind_info = uvec[i+1];
-		    break;
-		case UWX_KEY_GP:
-		    uwx_set_reg(env, UWX_REG_GP, uvec[i+1]);
-		    break;
-		case UWX_KEY_MODULE:
-		    env->module_name =
-			    uwx_alloc_str(env, (char *)(intptr_t)(uvec[i+1]));
-		    break;
-		case UWX_KEY_FUNC:
-		    env->function_name =
-			    uwx_alloc_str(env, (char *)(intptr_t)(uvec[i+1]));
-		    break;
-		case UWX_KEY_FUNCSTART:
-		    uentry.code_start = uvec[i+1];
-		    env->code_start = uentry.code_start;
-		    break;
-	    }
-	}
-	env->ptr_size = uentry.ptr_size;
-	if (cbcalled)
-	    (void) (*env->lookupip)(UWX_LKUP_FREE, 0, env->cb_token, &uvec);
-	status = uwx_decode_uinfo(env, &uentry, &rstate);
-	if (status == UWX_ERR_NOUDESC)
-	    status = uwx_default_rstate(env, &rstate);
-	if (status == UWX_OK)
-	    env->rstate = rstate;
-    }
-
-    /* If the callback returns a frame description (in the form */
-    /* of an update vector), convert the update vector into a */
-    /* register state array, then invoke the callback again to */
-    /* let it free any memory it allocated. */
-
-    else if (cbstatus == UWX_LKUP_FDESC) {
-	status = uwx_decode_uvec(env, uvec, &rstate);
-	if (cbcalled)
-	    (void) (*env->lookupip)(UWX_LKUP_FREE, 0, env->cb_token, &uvec);
-	if (status == UWX_OK)
-	    env->rstate = rstate;
-    }
-
-    /* Any other return from the callback is an error. */
-
-    else {
-	status = UWX_ERR_LOOKUPERR;
-    }
-    return status;
-}
-
-
-/* uwx_restore_markers: Restores the stack markers -- PSP, RP, PFS */
-
-int uwx_restore_markers(struct uwx_env *env)
-{
-    int status;
-    uint64_t val;
-    uint64_t hist;
-
-    if ((env->context.valid_regs & VALID_BASIC4) != VALID_BASIC4)
-	return UWX_ERR_NOCONTEXT;
-
-    /* If we haven't already obtained the frame info for the */
-    /* current frame, get it now. */
-
-    if (env->rstate == 0) {
-	status = uwx_get_frame_info(env);
-	if (status != UWX_OK)
-	    return status;
-    }
-
-    TRACE_S_STEP(env->rstate)
-
-    if (env->rstate[SBREG_PSP] != UWX_DISP_NONE) {
-	status = uwx_restore_reg(env, env->rstate[SBREG_PSP], &val, &hist);
-	if (status != UWX_OK)
-	    return status;
-	env->context.special[UWX_REG_PSP] = val;
-	env->history.special[UWX_REG_PSP] = hist;
-	env->context.valid_regs |= 1 << UWX_REG_PSP;
-	TRACE_S_RESTORE_REG("PSP", env->rstate[SBREG_PSP], val)
-    }
-
-    if (env->rstate[SBREG_RP] != UWX_DISP_NONE) {
-	status = uwx_restore_reg(env, env->rstate[SBREG_RP], &val, &hist);
-	if (status != UWX_OK)
-	    return status;
-	env->context.special[UWX_REG_RP] = val;
-	env->history.special[UWX_REG_RP] = hist;
-	env->context.valid_regs |= 1 << UWX_REG_RP;
-	TRACE_S_RESTORE_REG("RP", env->rstate[SBREG_RP], val)
-    }
-
-    if (env->rstate[SBREG_PFS] != UWX_DISP_NONE) {
-	status = uwx_restore_reg(env, env->rstate[SBREG_PFS], &val, &hist);
-	if (status != UWX_OK)
-	    return status;
-	env->context.special[UWX_REG_PFS] = val;
-	env->history.special[UWX_REG_PFS] = hist;
-	env->context.valid_regs |= 1 << UWX_REG_PFS;
-	TRACE_S_RESTORE_REG("PFS", env->rstate[SBREG_PFS], val)
-    }
-
-    return UWX_OK;
-}
-
-/* uwx_get_module_info: Gets module name and text base for current frame */
-
-int uwx_get_module_info(
-    struct uwx_env *env,
-    char **modp,
-    uint64_t *text_base)
-{
-    int i;
-    int status;
-    int cbstatus;
-    uint64_t ip;
-    uint64_t *uvec;
-    uint64_t uvecout[UVECSIZE];
-
-    if (env == 0)
-	return UWX_ERR_NOENV;
-
-    /* If we haven't already obtained the frame info for the */
-    /* current frame, get it now. */
-
-    if (env->rstate == 0) {
-	status = uwx_get_frame_info(env);
-	if (status != UWX_OK)
-	    return status;
-    }
-
-    /* Get the module name from the lookup IP callback. */
-    if (env->module_name == 0) {
-	ip = env->remapped_ip;
-	i = 0;
-	if (env->function_offset >= 0) {
-	    uvecout[i++] = UWX_KEY_FUNCSTART;
-	    uvecout[i++] = ip - env->function_offset;
-	}
-	uvecout[i++] = UWX_KEY_END;
-	uvecout[i++] = 0;
-	uvec = uvecout;
-	cbstatus = (*env->lookupip)(UWX_LKUP_MODULE, ip, env->cb_token, &uvec);
-
-	if (cbstatus == UWX_LKUP_SYMINFO) {
-	    for (i = 0; uvec[i] != UWX_KEY_END; i += 2) {
-		switch ((int)uvec[i]) {
-		    case UWX_KEY_TBASE:
-			env->text_base = uvec[i+1];
-			break;
-		    case UWX_KEY_MODULE:
-			env->module_name =
-			    uwx_alloc_str(env, (char *)(intptr_t)(uvec[i+1]));
-			break;
-		    case UWX_KEY_FUNC:
-			env->function_name =
-			    uwx_alloc_str(env, (char *)(intptr_t)(uvec[i+1]));
-			break;
-		    case UWX_KEY_FUNCSTART:
-			env->function_offset = ip - uvec[i+1];
-			break;
-		}
-	    }
-	    (void) (*env->lookupip)(UWX_LKUP_FREE, 0, env->cb_token, &uvec);
-	}
-    }
-
-    *modp = env->module_name;
-    *text_base = env->text_base;
-
-    return UWX_OK;
-}
-
-/* uwx_get_funcstart: Gets start address of function from current frame */
-
-int uwx_get_funcstart(
-    struct uwx_env *env,
-    uint64_t *funcstart)
-{
-    int status;
-
-    if (env == 0)
-	return UWX_ERR_NOENV;
-
-    /* If we haven't already obtained the frame info for the */
-    /* current frame, get it now. */
-
-    if (env->rstate == 0) {
-	status = uwx_get_frame_info(env);
-	if (status != UWX_OK)
-	    return status;
-    }
-
-    *funcstart = env->remapped_ip - env->function_offset;
-
-    return UWX_OK;
-}
-
-/* uwx_get_sym_info: Gets symbolic info from current frame */
-/* (Will make a UWX_LKUP_SYMBOLS callback if info */
-/* was not provided by UWX_LKUP_LOOKUP callback) */
-
-int uwx_get_sym_info(
-    struct uwx_env *env,
-    char **modp,
-    char **symp,
-    uint64_t *offsetp)
-{
-    int status;
-    int cbstatus;
-    uint64_t ip;
-    uint64_t *uvec;
-    uint64_t uvecout[UVECSIZE];
-    int i;
-
-    if (env == 0)
-	return UWX_ERR_NOENV;
-
-    /* If we haven't already obtained the frame info for the */
-    /* current frame, get it now. */
-
-    if (env->rstate == 0) {
-	status = uwx_get_frame_info(env);
-	if (status != UWX_OK)
-	    return status;
-    }
-
-    /* Get the symbolic information from the lookup IP callback. */
-    if (env->function_name == 0) {
-	ip = env->remapped_ip;
-	i = 0;
-	if (env->function_offset >= 0) {
-	    uvecout[i++] = UWX_KEY_FUNCSTART;
-	    uvecout[i++] = ip - env->function_offset;
-	}
-	uvecout[i++] = UWX_KEY_END;
-	uvecout[i++] = 0;
-	uvec = uvecout;
-	cbstatus = (*env->lookupip)(UWX_LKUP_SYMBOLS, ip, env->cb_token, &uvec);
-
-	if (cbstatus == UWX_LKUP_SYMINFO) {
-	    for (i = 0; uvec[i] != UWX_KEY_END; i += 2) {
-		switch ((int)uvec[i]) {
-		    case UWX_KEY_MODULE:
-			env->module_name =
-			    uwx_alloc_str(env, (char *)(intptr_t)(uvec[i+1]));
-			break;
-		    case UWX_KEY_FUNC:
-			env->function_name =
-			    uwx_alloc_str(env, (char *)(intptr_t)(uvec[i+1]));
-			break;
-		    case UWX_KEY_FUNCSTART:
-			env->function_offset = ip - uvec[i+1];
-			break;
-		}
-	    }
-	    (void) (*env->lookupip)(UWX_LKUP_FREE, 0, env->cb_token, &uvec);
-	}
-    }
-
-    *modp = env->module_name;
-    *symp = env->function_name;
-    *offsetp = env->function_offset;
-
-    return UWX_OK;
-}
-
-
-/* uwx_step: Steps from the current frame to the previous frame */
-
-int uwx_step(struct uwx_env *env)
-{
-    int i;
-    int status;
-    int pfs_sol;
-    int dispcode;
-    uint64_t val;
-    uint64_t fval[2];
-    uint64_t hist;
-    uint64_t tempgr[NPRESERVEDGR];
-    int needpriunat;
-    int unat;
-    int tempnat;
-
-    if (env == 0)
-	return UWX_ERR_NOENV;
-
-    /* Complete the current context by restoring the current values */
-    /* of psp, rp, and pfs. */
-
-    if (env->rstate == 0 ||
-	    (env->context.valid_regs & VALID_MARKERS) != VALID_MARKERS) {
-	status = uwx_restore_markers(env);
-	if (status != UWX_OK)
-	    return status;
-    }
-
-    /* Check for bottom of stack (rp == 0). */
-
-    if (env->context.special[UWX_REG_RP] == 0)
-	return UWX_BOTTOM;
-
-    /* Find where the primary unat is saved, get a copy. */
-    /* Then, as we restore the GRs, we'll merge the NaT bits into the */
-    /* priunat register in the context. */
-    /* (Make sure we need it, though, before we try to get it, */
-    /* because the attempt to get it might invoke the copy-in callback. */
-    /* We don't need the priunat unless one of GR 4-7 was */
-    /* saved to the memory stack.) */
-
-    needpriunat = 0;
-    for (i = 0; i < NSB_GR; i++) {
-	dispcode = UWX_GET_DISP_CODE(env->rstate[SBREG_GR + i]);
-	if (dispcode == UWX_DISP_SPREL(0) || dispcode == UWX_DISP_PSPREL(0))
-	    needpriunat = 1;
-    }
-    unat = 0;
-    if (needpriunat && env->rstate[SBREG_PRIUNAT] != UWX_DISP_NONE) {
-	status = uwx_restore_reg(env, env->rstate[SBREG_PRIUNAT], &val, &hist);
-	if (status != UWX_OK)
-	    return status;
-	unat = (int) val;
-	env->history.special[UWX_REG_PRIUNAT] = hist;
-	TRACE_S_RESTORE_REG("PRIUNAT", env->rstate[SBREG_PRIUNAT], val)
-    }
-
-    /* Retrieve saved values of the preserved GRs into temporaries. */
-
-    tempnat = (int) env->context.special[UWX_REG_PRIUNAT];
-    for (i = 0; i < NSB_GR; i++) {
-	if (env->rstate[SBREG_GR + i] != UWX_DISP_NONE) {
-	    status = uwx_restore_reg(env,
-			env->rstate[SBREG_GR + i], &val, &hist);
-	    if (status != UWX_OK)
-		return status;
-	    tempgr[i] = val;
-	    if (uwx_restore_nat(env, env->rstate[SBREG_GR + i], unat))
-		tempnat |= 1 << i;
-	    else
-		tempnat &= ~(1 << i);
-	    env->history.gr[i] = hist;
-	    env->context.valid_regs |= 1 << (i + VALID_GR_SHIFT);
-	    TRACE_S_RESTORE_GR(i, env->rstate[SBREG_GR + i], val)
-	}
-    }
-
-    /* Now we have everything we need to step back to the previous frame. */
-
-    /* Restore preserved BRs. */
-
-    for (i = 0; i < NSB_BR; i++) {
-	if (env->rstate[SBREG_BR + i] != UWX_DISP_NONE) {
-	    status = uwx_restore_reg(env,
-			env->rstate[SBREG_BR + i], &val, &hist);
-	    if (status != UWX_OK)
-		return status;
-	    env->context.br[i] = val;
-	    env->history.br[i] = hist;
-	    env->context.valid_regs |= 1 << (i + VALID_BR_SHIFT);
-	    TRACE_S_RESTORE_BR(i, env->rstate[SBREG_BR + i], val)
-	}
-    }
-
-    /* Restore preserved FRs. */
-
-    if (env->nsbreg == NSBREG) {
-	for (i = 0; i < NSB_FR; i++) {
-	    if (env->rstate[SBREG_FR + i] != UWX_DISP_NONE) {
-		status = uwx_restore_freg(env,
-			    env->rstate[SBREG_FR + i], fval, &hist);
-		if (status != UWX_OK)
-		    return status;
-		env->context.fr[i].part0 = fval[0];
-		env->context.fr[i].part1 = fval[1];
-		env->history.fr[i] = hist;
-		env->context.valid_frs |= 1 << i;
-		TRACE_S_RESTORE_FR(i, env->rstate[SBREG_FR + i], fval)
-	    }
-	}
-    }
-
-    /* Restore other preserved regs. */
-
-    if (env->rstate[SBREG_PREDS] != UWX_DISP_NONE) {
-	status = uwx_restore_reg(env, env->rstate[SBREG_PREDS], &val, &hist);
-	if (status != UWX_OK)
-	    return status;
-	env->context.special[UWX_REG_PREDS] = val;
-	env->history.special[UWX_REG_PREDS] = hist;
-	env->context.valid_regs |= 1 << UWX_REG_PREDS;
-	TRACE_S_RESTORE_REG("PREDS", env->rstate[SBREG_PREDS], val)
-    }
-    if (env->rstate[SBREG_RNAT] != UWX_DISP_NONE) {
-	status = uwx_restore_reg(env, env->rstate[SBREG_RNAT], &val, &hist);
-	if (status != UWX_OK)
-	    return status;
-	env->context.special[UWX_REG_AR_RNAT] = val;
-	env->history.special[UWX_REG_AR_RNAT] = hist;
-	env->context.valid_regs |= 1 << UWX_REG_AR_RNAT;
-	TRACE_S_RESTORE_REG("RNAT", env->rstate[SBREG_RNAT], val)
-    }
-    if (env->rstate[SBREG_UNAT] != UWX_DISP_NONE) {
-	status = uwx_restore_reg(env, env->rstate[SBREG_UNAT], &val, &hist);
-	if (status != UWX_OK)
-	    return status;
-	env->context.special[UWX_REG_AR_UNAT] = val;
-	env->history.special[UWX_REG_AR_UNAT] = hist;
-	env->context.valid_regs |= 1 << UWX_REG_AR_UNAT;
-	TRACE_S_RESTORE_REG("UNAT", env->rstate[SBREG_UNAT], val)
-    }
-    if (env->rstate[SBREG_FPSR] != UWX_DISP_NONE) {
-	status = uwx_restore_reg(env, env->rstate[SBREG_FPSR], &val, &hist);
-	if (status != UWX_OK)
-	    return status;
-	env->context.special[UWX_REG_AR_FPSR] = val;
-	env->history.special[UWX_REG_AR_FPSR] = hist;
-	env->context.valid_regs |= 1 << UWX_REG_AR_FPSR;
-	TRACE_S_RESTORE_REG("FPSR", env->rstate[SBREG_FPSR], val)
-    }
-    if (env->rstate[SBREG_LC] != UWX_DISP_NONE) {
-	status = uwx_restore_reg(env, env->rstate[SBREG_LC], &val, &hist);
-	if (status != UWX_OK)
-	    return status;
-	env->context.special[UWX_REG_AR_LC] = val;
-	env->history.special[UWX_REG_AR_LC] = hist;
-	env->context.valid_regs |= 1 << UWX_REG_AR_LC;
-	TRACE_S_RESTORE_REG("LC", env->rstate[SBREG_LC], val)
-    }
-
-    /* Restore preserved GRs from temporaries. */
-
-    for (i = 0; i < NSB_GR; i++) {
-	if (env->rstate[SBREG_GR + i] != UWX_DISP_NONE)
-	    env->context.gr[i] = tempgr[i];
-    }
-    env->context.special[UWX_REG_PRIUNAT] = tempnat;
-
-    /* Restore the frame markers. */
-
-    env->context.special[UWX_REG_IP] = env->context.special[UWX_REG_RP];
-    env->history.special[UWX_REG_IP] = env->history.special[UWX_REG_RP];
-
-    env->context.special[UWX_REG_SP] = env->context.special[UWX_REG_PSP];
-    env->history.special[UWX_REG_SP] = env->history.special[UWX_REG_PSP];
-
-    pfs_sol = ((unsigned int)env->context.special[UWX_REG_PFS] >> 7) & 0x7f;
-    env->context.special[UWX_REG_BSP] = uwx_add_to_bsp(
-				env->context.special[UWX_REG_BSP],
-				-pfs_sol);
-
-    env->context.special[UWX_REG_CFM] = env->context.special[UWX_REG_PFS];
-    env->history.special[UWX_REG_CFM] = env->history.special[UWX_REG_PFS];
-
-    env->context.special[UWX_REG_RP] = 0;
-
-    /* The frame info for the new frame isn't yet available. */
-
-    env->rstate = 0;
-    env->context.valid_regs &= ~VALID_MARKERS;
-
-    return UWX_OK;
-}
-
-
-/* uwx_decode_uvec: Converts the update vector into a register state array */
-
-int uwx_decode_uvec(struct uwx_env *env, uint64_t *uvec, uint64_t **rstate)
-{
-    int i;
-    int status;
-
-    status = uwx_default_rstate(env, rstate);
-    if (status != UWX_OK)
-	return status;
-
-    for (i = 0; uvec[i] != UWX_KEY_END; i += 2) {
-	switch ((int)uvec[i]) {
-	    case UWX_KEY_CONTEXT:
-		env->abi_context = (int)(uvec[i+1]);
-		status = UWX_ABI_FRAME;
-		break;
-	    case UWX_KEY_GP:
-		uwx_set_reg(env, UWX_REG_GP, uvec[i+1]);
-		break;
-	    case UWX_KEY_MODULE:
-		env->module_name =
-			    uwx_alloc_str(env, (char *)(intptr_t)(uvec[i+1]));
-		break;
-	    case UWX_KEY_FUNC:
-		env->function_name =
-			    uwx_alloc_str(env, (char *)(intptr_t)(uvec[i+1]));
-		break;
-	    case UWX_KEY_FUNCSTART:
-		env->function_offset = env->remapped_ip - uvec[i+1];
-		break;
-	    default:
-		return UWX_ERR_CANTUNWIND;
-	}
-    }
-    return status;
-}
-
-
-/* uwx_restore_reg: Restores a register according to the scoreboard */
-
-#define COPYIN_MSTACK_8(dest, src) \
-    (env->remote? \
-	(*env->copyin)(UWX_COPYIN_MSTACK, (dest), (src), \
-						DWORDSZ, env->cb_token) : \
-	(*(uint64_t *)(intptr_t)(dest) = \
-				*(uint64_t *)(intptr_t)(src), DWORDSZ) )
-
-int uwx_restore_reg(struct uwx_env *env, uint64_t rstate,
-				uint64_t *valp, uint64_t *histp)
-{
-    int status;
-    uint64_t p;
-    int n;
-    int regid;
-
-    status = UWX_OK;
-
-    switch (UWX_GET_DISP_CODE(rstate)) {
-	case UWX_DISP_SPPLUS(0):
-	    *valp = env->context.special[UWX_REG_SP] +
-				UWX_GET_DISP_OFFSET(rstate);
-	    *histp = UWX_DISP_NONE;
-	    break;
-	case UWX_DISP_SPREL(0):
-	    p = env->context.special[UWX_REG_SP] +
-				UWX_GET_DISP_OFFSET(rstate);
-	    n = COPYIN_MSTACK_8((char *)valp, p);
-	    if (n != DWORDSZ)
-		status = UWX_ERR_COPYIN_MSTK;
-	    *histp = UWX_DISP_MSTK(p);
-	    break;
-	case UWX_DISP_PSPREL(0):
-	    p = env->context.special[UWX_REG_PSP] + 16 -
-				UWX_GET_DISP_OFFSET(rstate);
-	    n = COPYIN_MSTACK_8((char *)valp, p);
-	    if (n != DWORDSZ)
-		status = UWX_ERR_COPYIN_MSTK;
-	    *histp = UWX_DISP_MSTK(p);
-	    break;
-	case UWX_DISP_REG(0):
-	    regid = UWX_GET_DISP_REGID(rstate);
-	    status = uwx_get_reg(env, regid, valp);
-	    (void) uwx_get_spill_loc(env, regid, histp);
-	    break;
-    }
-    return status;
-}
-
-#define COPYIN_MSTACK_16(dest, src) \
-    (env->remote? \
-	(*env->copyin)(UWX_COPYIN_MSTACK, (dest), (src), \
-						2*DWORDSZ, env->cb_token) : \
-	(*(uint64_t *)(intptr_t)(dest) = *(uint64_t *)(intptr_t)(src), \
-	    *(uint64_t *)(intptr_t)((dest)+8) = \
-					*(uint64_t *)(intptr_t)((src)+8), \
-	    2*DWORDSZ) )
-
-int uwx_restore_freg(struct uwx_env *env, uint64_t rstate,
-				uint64_t *valp, uint64_t *histp)
-{
-    int status;
-    uint64_t p;
-    int n;
-    int regid;
-
-    status = UWX_OK;
-
-    switch (UWX_GET_DISP_CODE(rstate)) {
-	case UWX_DISP_SPREL(0):
-	    p = env->context.special[UWX_REG_SP] +
-				UWX_GET_DISP_OFFSET(rstate);
-	    n = COPYIN_MSTACK_16((char *)valp, p);
-	    if (n != 2*DWORDSZ)
-		status = UWX_ERR_COPYIN_MSTK;
-	    *histp = UWX_DISP_MSTK(p);
-	    break;
-	case UWX_DISP_PSPREL(0):
-	    p = env->context.special[UWX_REG_PSP] + 16 -
-				UWX_GET_DISP_OFFSET(rstate);
-	    n = COPYIN_MSTACK_16((char *)valp, p);
-	    if (n != 2*DWORDSZ)
-		status = UWX_ERR_COPYIN_MSTK;
-	    *histp = UWX_DISP_MSTK(p);
-	    break;
-	case UWX_DISP_REG(0):
-	    regid = UWX_GET_DISP_REGID(rstate);
-	    status = uwx_get_reg(env, regid, valp);
-	    (void) uwx_get_spill_loc(env, regid, histp);
-	    break;
-    }
-    return status;
-}
-
-/* uwx_restore_nat: Returns the saved NaT bit for a preserved GR */
-
-int uwx_restore_nat(struct uwx_env *env, uint64_t rstate, int unat)
-{
-    int nat;
-    uint64_t p;
-
-    nat = 0;
-    switch (UWX_GET_DISP_CODE(rstate)) {
-	case UWX_DISP_SPREL(0):
-	    p = env->context.special[UWX_REG_SP] +
-				UWX_GET_DISP_OFFSET(rstate);
-	    nat = (unat >> (((int)p >> 3) & 0x3f)) & 0x01;
-	    break;
-	case UWX_DISP_PSPREL(0):
-	    p = env->context.special[UWX_REG_PSP] + 16 -
-				UWX_GET_DISP_OFFSET(rstate);
-	    nat = (unat >> (((int)p >> 3) & 0x3f)) & 0x01;
-	    break;
-	case UWX_DISP_REG(0):
-	    (void) uwx_get_nat(env, UWX_GET_DISP_REGID(rstate), &nat);
-	    break;
-    }
-    return nat;
-}
-
diff --git a/sys/contrib/ia64/libuwx/src/uwx_step.h b/sys/contrib/ia64/libuwx/src/uwx_step.h
deleted file mode 100644
index 0f41521a3ba4..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_step.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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.
-*/
-
-#define UVECSIZE 20	/* Size of uvec supplied by unwind engine */
-			/* for callback's use. */
-
-extern int uwx_lookupip_hook(int request, uint64_t ip, intptr_t tok,
-    uint64_t **vecp, size_t uvecsize);
-extern int uwx_restore_markers(struct uwx_env *env);
diff --git a/sys/contrib/ia64/libuwx/src/uwx_str.c b/sys/contrib/ia64/libuwx/src/uwx_str.c
deleted file mode 100644
index 8e66f1cd3cc3..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_str.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 _KERNEL
-#include <string.h>
-#endif
-
-#include "uwx_env.h"
-#include "uwx_str.h"
-
-#ifdef _KERNEL
-static struct uwx_str_pool	uwx_str_pool;
-#define	free(p)		/* nullified */
-#define	malloc(sz)	((sz == sizeof(uwx_str_pool)) ? &uwx_str_pool : NULL)
-#endif
-
-/*
- *  uwx_str.c
- *
- *  This file contains the routines for maintaining a string
- *  pool for the unwind environment. We preallocate enough
- *  space for most purposes so that no memory allocation is
- *  necessary during a normal unwind. If we do need more,
- *  we use the allocate callback, if one is provided.
- *
- *  The string pool is reused with each call to step(),
- *  and is completely freed when the unwind environment is
- *  freed.
- */
-
-
-int uwx_init_str_pool(struct uwx_env *env, struct uwx_str_pool *pool)
-{
-    if (pool == 0)
-	return UWX_ERR_NOMEM;
-
-    pool->next = 0;
-    pool->size = STRPOOLSIZE;
-    pool->used = 0;
-
-    env->string_pool = pool;
-
-    return UWX_OK;
-}
-
-void uwx_free_str_pool(struct uwx_env *env)
-{
-    struct uwx_str_pool *pool;
-    struct uwx_str_pool *next;
-
-    /* The first pool is preallocated as part of the uwx_env. Don't free it! */
-    pool = env->string_pool;
-    if (pool != 0)
-	pool = pool->next;
-    for (; pool != 0; pool = next) {
-	next = pool->next;
-	if (env->free_cb == 0)
-	    free(pool);
-	else
-	    (*env->free_cb)(pool);
-    }
-}
-
-char *uwx_alloc_str(struct uwx_env *env, char *str)
-{
-    int len;
-    int size;
-    struct uwx_str_pool *pool;
-    struct uwx_str_pool *prev;
-    char *p;
-
-    len = strlen(str) + 1;
-    prev = 0;
-    for (pool = env->string_pool; pool != 0; pool = pool->next) {
-	prev = pool;
-	if (pool->size - pool->used >= len)
-	    break;
-    }
-    if (pool == 0) {
-	size = STRPOOLSIZE;
-	if (len > size)
-	    size = len;
-	size += sizeof(struct uwx_str_pool) - STRPOOLSIZE;
-	if (env->allocate_cb == 0)
-	    pool = (struct uwx_str_pool *) malloc(size);
-	else
-	    pool = (struct uwx_str_pool *) (*env->allocate_cb)(size);
-	if (env->string_pool == 0)
-	    return 0;
-	pool->next = 0;
-	pool->size = size;
-	pool->used = 0;
-	prev->next = pool;
-    }
-    p = pool->pool + pool->used;
-    strcpy(p, str);
-    pool->used += len;
-    return p;
-}
-
-void uwx_reset_str_pool(struct uwx_env *env)
-{
-    struct uwx_str_pool *pool;
-
-    for (pool = env->string_pool; pool != 0; pool = pool->next)
-	pool->used = 0;
-}
diff --git a/sys/contrib/ia64/libuwx/src/uwx_str.h b/sys/contrib/ia64/libuwx/src/uwx_str.h
deleted file mode 100644
index 5e85d6af6085..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_str.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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.
-*/
-
-#define STRPOOLSIZE (400-sizeof(void *)-2*sizeof(int))
-
-struct uwx_str_pool {
-    struct uwx_str_pool *next;
-    int size;
-    int used;
-    char pool[STRPOOLSIZE];
-};
-
-extern int uwx_init_str_pool(struct uwx_env *env, struct uwx_str_pool *pool);
-extern void uwx_free_str_pool(struct uwx_env *env);
-extern char *uwx_alloc_str(struct uwx_env *env, char *str);
-extern void uwx_reset_str_pool(struct uwx_env *env);
diff --git a/sys/contrib/ia64/libuwx/src/uwx_swap.c b/sys/contrib/ia64/libuwx/src/uwx_swap.c
deleted file mode 100644
index 591739367514..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_swap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 "uwx_env.h"
-#include "uwx_swap.h"
-
-void uwx_swap4(uint32_t *w)
-{
-    unsigned char *p;
-    unsigned char t[4];
-
-    p = (unsigned char *) w;
-
-    t[0] = p[0];
-    t[1] = p[1];
-    t[2] = p[2];
-    t[3] = p[3];
-
-    p[0] = t[3];
-    p[1] = t[2];
-    p[2] = t[1];
-    p[3] = t[0];
-}
-
-void uwx_swap8(uint64_t *dw)
-{
-    unsigned char *p;
-    unsigned char t[8];
-
-    p = (unsigned char *) dw;
-
-    t[0] = p[0];
-    t[1] = p[1];
-    t[2] = p[2];
-    t[3] = p[3];
-    t[4] = p[4];
-    t[5] = p[5];
-    t[6] = p[6];
-    t[7] = p[7];
-
-    p[0] = t[7];
-    p[1] = t[6];
-    p[2] = t[5];
-    p[3] = t[4];
-    p[4] = t[3];
-    p[5] = t[2];
-    p[6] = t[1];
-    p[7] = t[0];
-}
diff --git a/sys/contrib/ia64/libuwx/src/uwx_swap.h b/sys/contrib/ia64/libuwx/src/uwx_swap.h
deleted file mode 100644
index 70d921c9a217..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_swap.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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.
-*/
-
-extern void uwx_swap4(uint32_t *w);
-extern void uwx_swap8(uint64_t *dw);
diff --git a/sys/contrib/ia64/libuwx/src/uwx_symbols.c b/sys/contrib/ia64/libuwx/src/uwx_symbols.c
deleted file mode 100644
index b91c2db72eed..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_symbols.c
+++ /dev/null
@@ -1,850 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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.
-*/
-
-#ifdef USE_CLEAN_NAMESPACE
-#define fopen _fopen
-#define fseek _fseek
-#define fread _fread
-#define fclose _fclose
-#endif /* USE_CLEAN_NAMESPACE */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-#include <elf.h>
-
-#include "uwx.h"
-#include "uwx_env.h"
-
-#ifdef USE_CLEAN_NAMESPACE
-/*
- * Moved the defines above the include of stdio.h,
- * so we don't need these unless that causes problems
- * and we have to move them back down here.
- * #define fopen _fopen
- * #define fseek _fseek
- * #define fread _fread
- * #define fclose _fclose
- * extern FILE *_fopen(const char *, const char *);
- * extern int _fseek(FILE *, long int, int);
- * extern size_t _fread(void *, size_t, size_t, FILE *);
- * extern int _fclose(FILE *);
- */
-#endif /* USE_CLEAN_NAMESPACE */
-
-struct uwx_symbol_cache {
-    char *module_name;
-    int nsyms;
-    uint64_t *sym_values;
-    char **sym_names;
-    char *strings;
-};
-
-
-int uwx_read_func_symbols(
-    struct uwx_env *env,
-    struct uwx_symbol_cache *cache,
-    char *module_name);
-
-
-int uwx_find_symbol(
-    struct uwx_env *env,
-    struct uwx_symbol_cache **symbol_cache_p,
-    char *module_name,
-    uint64_t relip,
-    char **func_name_p,
-    uint64_t *offset_p)
-{
-    int status;
-    int i;
-    uint64_t offset;
-    uint64_t best_offset;
-    char *best_name;
-    struct symbol *sym;
-    struct uwx_symbol_cache *cache = NULL;
-
-    /* Allocate a symbol cache on first call */
-    if (symbol_cache_p != NULL)
-	cache = *symbol_cache_p;
-    if (cache == NULL) {
-	cache = (struct uwx_symbol_cache *)
-			(*env->allocate_cb)(sizeof(struct uwx_symbol_cache));
-	if (cache == NULL)
-	    return UWX_ERR_NOMEM;
-	cache->module_name = NULL;
-	cache->nsyms = 0;
-	cache->sym_values = NULL;
-	cache->sym_names = NULL;
-	cache->strings = NULL;
-	if (symbol_cache_p != NULL)
-	    *symbol_cache_p = cache;
-    }
-
-    /* Read function symbols from the object file */
-    status = uwx_read_func_symbols(env, cache, module_name);
-    if (status != UWX_OK)
-	return status;
-
-    /* Search for best match */
-    best_offset = ~(uint64_t)0;
-    best_name = NULL;
-    for (i = 0; i < cache->nsyms; i++) {
-	if (cache->sym_values[i] == relip) {
-	    *func_name_p = cache->sym_names[i];
-	    *offset_p = 0;
-	    if (symbol_cache_p == NULL)
-		uwx_release_symbol_cache(env, cache);
-	    return UWX_OK;
-	}
-	if (relip > cache->sym_values[i]) {
-	    offset = relip - cache->sym_values[i];
-	    if (offset < best_offset) {
-		best_offset = offset;
-		best_name = cache->sym_names[i];
-	    }
-	}
-    }
-    if (best_name == NULL)
-	return UWX_ERR_NOSYM;
-
-    if (symbol_cache_p == NULL)
-	uwx_release_symbol_cache(env, cache);
-
-    *func_name_p = best_name;
-    *offset_p = best_offset;
-    return UWX_OK;
-}
-
-
-void uwx_release_symbol_cache(
-    struct uwx_env *env,
-    struct uwx_symbol_cache *symbol_cache)
-{
-    if (symbol_cache->module_name != NULL)
-	(*env->free_cb)(symbol_cache->module_name);
-    if (symbol_cache->sym_values != NULL)
-	(*env->free_cb)(symbol_cache->sym_values);
-    if (symbol_cache->sym_names != NULL)
-	(*env->free_cb)(symbol_cache->sym_names);
-    if (symbol_cache->strings != NULL)
-	(*env->free_cb)(symbol_cache->strings);
-    (*env->free_cb)(symbol_cache);
-}
-
-
-#define ELF_ERR_NOMEM		UWX_ERR_NOMEM  /* Out of memory */
-#define ELF_ERR_OPEN		UWX_ERR_NOSYM  /* Can't open file */
-
-#define ELF_ERR_NOHEADER	UWX_ERR_NOSYM  /* Can't read ELF header */
-#define ELF_ERR_NOTELF		UWX_ERR_NOSYM  /* Not an ELF file */
-#define ELF_ERR_HEADER_SIZE	UWX_ERR_NOSYM  /* Invalid e_ehsize */
-#define ELF_ERR_INVALID_CLASS	UWX_ERR_NOSYM  /* Invalid EI_CLASS */
-#define ELF_ERR_INVALID_DATA	UWX_ERR_NOSYM  /* Invalid EI_DATA */
-
-#define ELF_ERR_READ_SECTHDR	UWX_ERR_NOSYM  /* Can't read section headers */
-#define ELF_ERR_SECTHDR_SIZE	UWX_ERR_NOSYM  /* Invalid e_shentsize */
-
-#define ELF_ERR_READ_PROGHDR	UWX_ERR_NOSYM  /* Can't read program headers */
-#define ELF_ERR_PROGHDR_SIZE	UWX_ERR_NOSYM  /* Invalid e_phentsize */
-
-#define ELF_ERR_READ_SECTION	UWX_ERR_NOSYM  /* Can't read section contents */
-
-#define ELF_ERR_READ_SYMTAB	UWX_ERR_NOSYM  /* Can't read symbol table */
-#define ELF_ERR_SYMTAB_SIZE	UWX_ERR_NOSYM  /* Invalid sh_entsize for symtab */
-
-
-struct elf_file {
-    uint64_t phoff;
-    uint64_t shoff;
-    uint64_t text_base;
-    uint64_t text_end;
-    alloc_cb allocate_cb;
-    free_cb free_cb;
-    const char *filename;
-    FILE *fd;
-    struct elf_section *sections;
-    struct elf_symbol *symbols;
-    char *symbol_strings;
-    int native_data;
-    int source_class;
-    int source_data;
-    int ehsize;
-    int phentsize;
-    int phnum;
-    int shentsize;
-    int shnum;
-    int nsyms;
-};
-
-struct elf_section {
-    uint64_t flags;
-    uint64_t addr;
-    uint64_t offset;
-    uint64_t size;
-    uint64_t entsize;
-    char *contents;
-    struct elf_symbol *symbols;
-    int type;
-    int link;
-    int info;
-    int nelems;
-};
-
-struct elf_symbol {
-    uint64_t value;
-    char *namep;
-    int name;
-    int type;
-    int shndx;
-};
-
-
-static void elf_swap_bytes(char *buf, char *template)
-{
-    int i;
-    int sz;
-    char temp[16];
-
-    while (sz = *template++) {
-	if (sz > 16)
-	    exit(1);
-	for (i = 0; i < sz; i++)
-	    temp[i] = buf[i];
-	for (i = 0; i < sz; i++)
-	    buf[i] = temp[sz-i-1];
-	buf += sz;
-    }
-}
-
-
-static int elf_read_section(struct elf_file *ef, int shndx)
-{
-    struct elf_section *sect;
-
-    if (shndx < 0 || shndx > ef->shnum)
-	return 0;
-
-    sect = &ef->sections[shndx];
-
-    /* Return if section has already been read */
-    if (sect->contents != NULL)
-	return 0;
-
-    sect->contents = (*ef->allocate_cb)(sect->size);
-    if (sect->contents == NULL)
-	return ELF_ERR_NOMEM;
-
-    fseek(ef->fd, (long)sect->offset, SEEK_SET);
-    if (fread(sect->contents, 1, sect->size, ef->fd) != sect->size)
-	return ELF_ERR_READ_SECTION;
-
-    return 0;
-}
-
-
-static char template_elf32_sym[] = {4, 4, 4, 1, 1, 2, 0};
-static char template_elf64_sym[] = {4, 1, 1, 2, 8, 8, 0};
-
-static int elf_read_symtab_section(struct elf_file *ef, int shndx)
-{
-    int i;
-    int nsyms;
-    long size;
-    union {
-	Elf32_Sym sym32;
-	Elf64_Sym sym64;
-    } sym;
-    struct elf_section *sect;
-    struct elf_symbol *syms;
-    struct elf_symbol *symp;
-    char *strtab;
-
-    sect = &ef->sections[shndx];
-
-    /* Return if section has already been read */
-    if (sect->symbols != NULL)
-	return 0;
-
-    if (ef->source_class == ELFCLASS32) {
-	if (sect->entsize != sizeof(sym.sym32))
-	    return ELF_ERR_SYMTAB_SIZE;
-    }
-    else {
-	if (sect->entsize != sizeof(sym.sym64))
-	    return ELF_ERR_SYMTAB_SIZE;
-    }
-
-    nsyms = sect->nelems;
-    syms = (struct elf_symbol *)
-			(*ef->allocate_cb)(sizeof(struct elf_symbol) * nsyms);
-    if (syms == NULL)
-	return ELF_ERR_NOMEM;
-
-    /* Read the symbol table */
-    fseek(ef->fd, (long)sect->offset, SEEK_SET);
-    for (i = 0; i < nsyms; i++) {
-
-	symp = &syms[i];
-
-	/* Read the next symbol table entry */
-	if (fread((char *)&sym, sect->entsize, 1, ef->fd) != 1) {
-	    (*ef->free_cb)(syms);
-	    return ELF_ERR_READ_SYMTAB;
-	}
-
-	/* Get fields from appropriate structure */
-	if (ef->source_class == ELFCLASS32) {
-	    /* Swap bytes if necessary */
-	    if (ef->source_data != ef->native_data)
-		elf_swap_bytes((char *)&sym, template_elf32_sym);
-	    symp->name = sym.sym32.st_name;
-	    symp->type = sym.sym32.st_info & 0x0f;
-	    symp->shndx = sym.sym32.st_shndx;
-	    symp->value = sym.sym32.st_value;
-	}
-	else {
-	    /* Swap bytes if necessary */
-	    if (ef->source_data != ef->native_data)
-		elf_swap_bytes((char *)&sym, template_elf64_sym);
-	    symp->name = sym.sym64.st_name;
-	    symp->type = sym.sym64.st_info & 0x0f;
-	    symp->shndx = sym.sym64.st_shndx;
-	    symp->value = sym.sym64.st_value;
-	}
-	symp->namep = NULL;
-
-    }
-
-    /* Read the symbol string table and convert section names */
-    /* from string table offsets to pointers */
-    if (sect->link > 0 && sect->link < ef->shnum) {
-	if (elf_read_section(ef, sect->link) == 0) {
-	    strtab = ef->sections[sect->link].contents;
-	    for (i = 0; i < nsyms; i++) {
-		symp = &syms[i];
-		symp->namep = strtab + symp->name;
-	    }
-	    ef->symbol_strings = strtab;
-	    ef->sections[sect->link].contents = NULL;
-	}
-    }
-
-    sect->symbols = syms;
-    return 0;
-}
-
-
-static char template_elf32_phdr[] = {4, 4, 4, 4, 4, 4, 4, 4, 0};
-static char template_elf64_phdr[] = {4, 4, 8, 8, 8, 8, 8, 8, 0};
-
-static int elf_read_prog_hdrs(struct elf_file *ef)
-{
-    int i;
-    union {
-	Elf32_Phdr hdr32;
-	Elf64_Phdr hdr64;
-    } header;
-    uint64_t vaddr;
-    uint64_t memsz;
-    uint64_t unwind_base;
-    int type;
-
-    if (ef->phnum == 0)
-	return 0;
-
-    if (ef->source_class == ELFCLASS32) {
-	if (ef->phentsize != sizeof(header.hdr32))
-	    return ELF_ERR_PROGHDR_SIZE;
-    }
-    else {
-	if (ef->phentsize != sizeof(header.hdr64))
-	    return ELF_ERR_PROGHDR_SIZE;
-    }
-
-    /* Look for the PT_IA_64_UNWIND segment */
-    /* (That will help us identify the text segment) */
-
-    fseek(ef->fd, (long)ef->phoff, SEEK_SET);
-    for (i = 0; i < ef->phnum; i++) {
-
-	/* Read the next program header */
-	if (fread((char *)&header, ef->phentsize, 1, ef->fd) != 1)
-	    return ELF_ERR_READ_PROGHDR;
-
-	/* Get fields from appropriate structure */
-	if (ef->source_class == ELFCLASS32) {
-	    /* Swap bytes in header fields if necessary */
-	    if (ef->source_data != ef->native_data)
-		elf_swap_bytes((char *)&header, template_elf32_phdr);
-	    type = header.hdr32.p_type;
-	    vaddr = header.hdr32.p_vaddr;
-	}
-	else {
-	    /* Swap bytes in header fields if necessary */
-	    if (ef->source_data != ef->native_data)
-		elf_swap_bytes((char *)&header, template_elf64_phdr);
-	    type = header.hdr64.p_type;
-	    vaddr = header.hdr64.p_vaddr;
-	}
-
-	if (type == PT_IA_64_UNWIND) {
-	    unwind_base = vaddr;
-	    break;
-	}
-
-    }
-
-    /* Now look for the PT_LOAD segment that includes the unwind segment */
-
-    fseek(ef->fd, (long)ef->phoff, SEEK_SET);
-    for (i = 0; i < ef->phnum; i++) {
-
-	/* Read the next program header */
-	if (fread((char *)&header, ef->phentsize, 1, ef->fd) != 1)
-	    return ELF_ERR_READ_PROGHDR;
-
-	/* Get fields from appropriate structure */
-	if (ef->source_class == ELFCLASS32) {
-	    /* Swap bytes in header fields if necessary */
-	    if (ef->source_data != ef->native_data)
-		elf_swap_bytes((char *)&header, template_elf32_phdr);
-	    type = header.hdr32.p_type;
-	    vaddr = header.hdr32.p_vaddr;
-	    memsz = header.hdr32.p_memsz;
-	}
-	else {
-	    /* Swap bytes in header fields if necessary */
-	    if (ef->source_data != ef->native_data)
-		elf_swap_bytes((char *)&header, template_elf64_phdr);
-	    type = header.hdr64.p_type;
-	    vaddr = header.hdr64.p_vaddr;
-	    memsz = header.hdr64.p_memsz;
-	}
-
-	if (type == PT_LOAD &&
-		vaddr <= unwind_base && unwind_base < vaddr + memsz) {
-	    ef->text_base = vaddr;
-	    ef->text_end = vaddr + memsz;
-	    break;
-	}
-
-    }
-
-    return 0;
-}
-
-
-static char template_elf32_shdr[] = {4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 0};
-static char template_elf64_shdr[] = {4, 4, 8, 8, 8, 8, 4, 4, 8, 8, 0};
-
-static int elf_read_sect_hdrs(struct elf_file *ef)
-{
-    int i;
-    long size;
-    int err;
-    union {
-	Elf32_Shdr hdr32;
-	Elf64_Shdr hdr64;
-    } header;
-    struct elf_section *sect;
-    char *shstrtab;
-
-    if (ef->source_class == ELFCLASS32) {
-	if (ef->shentsize != sizeof(header.hdr32))
-	    return ELF_ERR_SECTHDR_SIZE;
-    }
-    else {
-	if (ef->shentsize != sizeof(header.hdr64))
-	    return ELF_ERR_SECTHDR_SIZE;
-    }
-
-    fseek(ef->fd, (long)ef->shoff, SEEK_SET);
-    ef->sections = (struct elf_section *)
-		    (*ef->allocate_cb)(sizeof(struct elf_section) * ef->shnum);
-    if (ef->sections == NULL)
-	return ELF_ERR_NOMEM;
-
-    /* Read the section header table */
-    for (i = 0; i < ef->shnum; i++) {
-
-	sect = &ef->sections[i];
-
-	/* Read the next section header */
-	if (fread((char *)&header, ef->shentsize, 1, ef->fd) != 1) {
-	    (*ef->free_cb)(ef->sections);
-	    return ELF_ERR_READ_SECTHDR;
-	}
-
-	/* Get fields from appropriate structure */
-	if (ef->source_class == ELFCLASS32) {
-	    /* Swap bytes in header fields if necessary */
-	    if (ef->source_data != ef->native_data)
-		elf_swap_bytes((char *)&header, template_elf32_shdr);
-	    sect->type = header.hdr32.sh_type;
-	    sect->flags = header.hdr32.sh_flags;
-	    sect->addr = header.hdr32.sh_addr;
-	    sect->offset = header.hdr32.sh_offset;
-	    sect->size = header.hdr32.sh_size;
-	    sect->link = header.hdr32.sh_link;
-	    sect->info = header.hdr32.sh_info;
-	    sect->entsize = header.hdr32.sh_entsize;
-	}
-	else {
-	    /* Swap bytes in header fields if necessary */
-	    if (ef->source_data != ef->native_data)
-		elf_swap_bytes((char *)&header, template_elf64_shdr);
-	    sect->type = header.hdr64.sh_type;
-	    sect->flags = header.hdr64.sh_flags;
-	    sect->addr = header.hdr64.sh_addr;
-	    sect->offset = header.hdr64.sh_offset;
-	    sect->size = header.hdr64.sh_size;
-	    sect->link = header.hdr64.sh_link;
-	    sect->info = header.hdr64.sh_info;
-	    sect->entsize = header.hdr64.sh_entsize;
-	}
-	sect->contents = NULL;
-	sect->symbols = NULL;
-	if (sect->entsize > 0)
-	    sect->nelems = sect->size / sect->entsize;
-
-    }
-
-    return 0;
-}
-
-
-static char template_elf32_ehdr[] = {2, 2, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 0};
-static char template_elf64_ehdr[] = {2, 2, 4, 8, 8, 8, 4, 2, 2, 2, 2, 2, 2, 0};
-
-static int elf_read_header(struct elf_file *ef)
-{
-    union {
-	char ident[EI_NIDENT];
-	Elf32_Ehdr hdr32;
-	Elf64_Ehdr hdr64;
-    } header;
-
-    /* Read the ELF header */
-    fseek(ef->fd, 0L, SEEK_SET);
-    if (fread((char *)header.ident, EI_NIDENT, 1, ef->fd) != 1) {
-	return ELF_ERR_NOHEADER;
-    }
-
-    /* Verify that this is an ELF file */
-    if (header.ident[EI_MAG0] != ELFMAG0 ||
-	header.ident[EI_MAG1] != ELFMAG1 ||
-	header.ident[EI_MAG2] != ELFMAG2 ||
-	header.ident[EI_MAG3] != ELFMAG3) {
-	return ELF_ERR_NOTELF;
-    }
-
-    /* Get header fields from the byte array e_ident */
-    /* (These are independent of EI_CLASS and EI_DATA) */
-    ef->source_class = header.ident[EI_CLASS];
-    ef->source_data = header.ident[EI_DATA];
-
-    /* Verify EI_CLASS and EI_DATA */
-    if (header.ident[EI_CLASS] != ELFCLASS32 &&
-	header.ident[EI_CLASS] != ELFCLASS64) {
-	return ELF_ERR_INVALID_CLASS;
-    }
-    if (header.ident[EI_DATA] != ELFDATA2LSB &&
-	header.ident[EI_DATA] != ELFDATA2MSB) {
-	return ELF_ERR_INVALID_DATA;
-    }
-
-    /* Get remaining header fields from appropriate structure */
-    if (ef->source_class == ELFCLASS32) {
-	if (fread((char *)&header.hdr32 + EI_NIDENT,
-			sizeof(header.hdr32) - EI_NIDENT, 1, ef->fd) != 1)
-	    return ELF_ERR_NOHEADER;
-	/* Swap bytes in header fields if necessary */
-	if (ef->source_data != ef->native_data)
-	    elf_swap_bytes((char *)&header + EI_NIDENT, template_elf32_ehdr);
-	ef->phoff = header.hdr32.e_phoff;
-	ef->shoff = header.hdr32.e_shoff;
-	ef->ehsize = header.hdr32.e_ehsize;
-	ef->phentsize = header.hdr32.e_phentsize;
-	ef->phnum = header.hdr32.e_phnum;
-	ef->shentsize = header.hdr32.e_shentsize;
-	ef->shnum = header.hdr32.e_shnum;
-	if (ef->ehsize != sizeof(header.hdr32)) {
-	    return ELF_ERR_HEADER_SIZE;
-	}
-    }
-    else {
-	if (fread((char *)&header.hdr64 + EI_NIDENT,
-			sizeof(header.hdr64) - EI_NIDENT, 1, ef->fd) != 1)
-	    return ELF_ERR_NOHEADER;
-	/* Swap bytes in header fields if necessary */
-	if (ef->source_data != ef->native_data)
-	    elf_swap_bytes((char *)&header + EI_NIDENT, template_elf64_ehdr);
-	ef->phoff = header.hdr64.e_phoff;
-	ef->shoff = header.hdr64.e_shoff;
-	ef->ehsize = header.hdr64.e_ehsize;
-	ef->phentsize = header.hdr64.e_phentsize;
-	ef->phnum = header.hdr64.e_phnum;
-	ef->shentsize = header.hdr64.e_shentsize;
-	ef->shnum = header.hdr64.e_shnum;
-	if (ef->ehsize != sizeof(header.hdr64)) {
-	    return ELF_ERR_HEADER_SIZE;
-	}
-    }
-
-    return 0;
-}
-
-
-static struct elf_file *elf_new(struct uwx_env *env)
-{
-    int native_be;
-    char *p;
-    struct elf_file *ef;
-
-    ef = (struct elf_file *)(*env->allocate_cb)(sizeof(struct elf_file));
-    if (ef == NULL)
-	return NULL;
-
-    /* Determine the native byte order */
-    p = (char *)&native_be;
-    native_be = 1;	/* Assume big-endian */
-    *p = 0;		/* Sets be == 0 only if little-endian */
-
-    ef->allocate_cb = env->allocate_cb;
-    ef->free_cb = env->free_cb;
-    ef->filename = NULL;
-    ef->native_data = (native_be ? ELFDATA2MSB : ELFDATA2LSB);
-    ef->fd = NULL;
-    ef->source_class = 0;
-    ef->source_data = 0;
-    ef->phoff = 0;
-    ef->shoff = 0;
-    ef->text_base = 0;
-    ef->text_end = 0;
-    ef->ehsize = 0;
-    ef->phentsize = 0;
-    ef->phnum = 0;
-    ef->shentsize = 0;
-    ef->shnum = 0;
-    ef->sections = NULL;
-    ef->symbols = NULL;
-    ef->symbol_strings = NULL;
-    ef->nsyms = 0;
-    return ef;
-}
-
-
-static int elf_open(struct elf_file *ef, const char *filename)
-{
-    int err;
-
-    ef->filename = filename;
-
-    ef->fd = fopen(filename, "r");
-    if (ef->fd == NULL)
-	return ELF_ERR_OPEN;
-
-    if ((err = elf_read_header(ef)) != 0)
-	return err;
-
-    if ((err = elf_read_sect_hdrs(ef)) != 0)
-	return err;
-
-    if ((err = elf_read_prog_hdrs(ef)) != 0)
-	return err;
-
-    return 0;
-}
-
-
-static void elf_free_sections(struct elf_file *ef)
-{
-    int i;
-    struct elf_section *sect;
-
-    for (i = 0; i < ef->shnum; i++) {
-	sect = &ef->sections[i];
-	if (sect->contents != NULL)
-	    (*ef->free_cb)(sect->contents);
-	if ((sect->type == SHT_SYMTAB || sect->type == SHT_DYNSYM)
-						&& sect->symbols != NULL)
-	    (*ef->free_cb)(sect->symbols);
-    }
-    (*ef->free_cb)(ef->sections);
-}
-
-
-static void elf_close(struct elf_file *ef)
-{
-    if (ef->fd != NULL) {
-	fclose(ef->fd);
-	ef->fd = NULL;
-    }
-}
-
-
-static void elf_free(struct elf_file *ef)
-{
-    elf_close(ef);
-    if (ef->sections != NULL)
-	elf_free_sections(ef);
-    (*ef->free_cb)(ef);
-}
-
-
-static int elf_read_symbols(struct elf_file *ef)
-{
-    int i;
-    int err;
-    struct elf_section *sect;
-
-    for (i = 1; i < ef->shnum; i++) {
-	sect = &ef->sections[i];
-	if (sect->type == SHT_SYMTAB) {
-	    if (elf_read_symtab_section(ef, i) == 0) {
-		ef->symbols = sect->symbols;
-		ef->nsyms = sect->nelems;
-#ifdef DEBUG_SYMBOLS
-		printf("Read %d symbols from SHT_SYMTAB section\n", ef->nsyms);
-#endif /* DEBUG_SYMBOLS */
-		return 0;
-	    }
-	}
-    }
-    for (i = 1; i < ef->shnum; i++) {
-	sect = &ef->sections[i];
-	if (sect->type == SHT_DYNSYM) {
-	    if (elf_read_symtab_section(ef, i) == 0) {
-		ef->symbols = sect->symbols;
-		ef->nsyms = sect->nelems;
-#ifdef DEBUG_SYMBOLS
-		printf("Read %d symbols from SHT_DYNSYM section\n", ef->nsyms);
-#endif /* DEBUG_SYMBOLS */
-		return 0;
-	    }
-	}
-    }
-    return UWX_ERR_NOSYM;
-}
-
-
-#define SYM_IS_DEFINED(sym) \
-		((sym)->shndx != SHN_UNDEF)
-
-#define SYM_IS_IN_TEXT_SEGMENT(value) \
-		((value) >= ef->text_base && (value) < ef->text_end)
-
-#define SYM_HAS_INTERESTING_TYPE(type) ( \
-		(type) == STT_FUNC || \
-		(type) == STT_OBJECT || \
-		(type) == STT_HP_STUB \
-		)
-
-#define SYM_IS_INTERESTING(sym) ( \
-		SYM_IS_DEFINED(sym) && \
-		SYM_IS_IN_TEXT_SEGMENT((sym)->value) && \
-		SYM_HAS_INTERESTING_TYPE((sym)->type) \
-		)
-
-int uwx_read_func_symbols(
-    struct uwx_env *env,
-    struct uwx_symbol_cache *cache,
-    char *module_name)
-{
-    int i, j;
-    int status;
-    struct elf_file *ef;
-    struct elf_symbol *sym;
-    int nfuncsyms;
-    char **names;
-    uint64_t *values;
-
-    if (module_name != NULL &&
-	    cache->module_name != NULL &&
-		strcmp(module_name, cache->module_name) == 0)
-	return UWX_OK;
-
-    if (cache->sym_names != NULL)
-	(*env->free_cb)(cache->sym_names);
-    if (cache->sym_values != NULL)
-	(*env->free_cb)(cache->sym_values);
-    if (cache->strings != NULL)
-	(*env->free_cb)(cache->strings);
-
-    ef = elf_new(env);
-    if (ef == NULL)
-	return UWX_ERR_NOMEM;
-    status = elf_open(ef, module_name);
-    if (status != 0)
-	return UWX_ERR_NOSYM;
-    status = elf_read_symbols(ef);
-    if (status != 0)
-	return UWX_ERR_NOSYM;
-
-    nfuncsyms = 0;
-    for (i = 0; i < ef->nsyms; i++) {
-	sym = &ef->symbols[i];
-	if (SYM_IS_INTERESTING(sym))
-	    nfuncsyms++;
-    }
-
-    names = (char **)(*env->allocate_cb)(nfuncsyms * sizeof(char *));
-    if (names == NULL)
-	return UWX_ERR_NOMEM;
-    values = (uint64_t *)(*env->allocate_cb)(nfuncsyms * sizeof(uint64_t));
-    if (values == NULL)
-	return UWX_ERR_NOMEM;
-
-    j = 0;
-    for (i = 0; i < ef->nsyms; i++) {
-	sym = &ef->symbols[i];
-	if (SYM_IS_INTERESTING(sym)) {
-	    if (j >= nfuncsyms) /* should not happen! */
-		break;
-	    names[j] = sym->namep;
-	    values[j] = sym->value - ef->text_base;
-	    j++;
-	}
-    }
-
-    cache->module_name = (char *)(*env->allocate_cb)(strlen(module_name)+1);
-    if (cache->module_name != NULL) {
-	strcpy(cache->module_name, module_name);
-	cache->nsyms = nfuncsyms;
-	cache->sym_names = names;
-	cache->sym_values = values;
-	cache->strings = ef->symbol_strings;
-	ef->symbol_strings = NULL;
-    }
-
-    elf_close(ef);
-    elf_free(ef);
-
-#ifdef DEBUG_SYMBOLS
-    printf("Cached %d interesting symbols\n", nfuncsyms);
-#endif /* DEBUG_SYMBOLS */
-
-    return UWX_OK;
-}
diff --git a/sys/contrib/ia64/libuwx/src/uwx_symbols.h b/sys/contrib/ia64/libuwx/src/uwx_symbols.h
deleted file mode 100644
index 83b0bfef24cc..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_symbols.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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.
-*/
-
-struct uwx_env;
-struct uwx_symbol_cache;
-
-extern int uwx_find_symbol(
-    struct uwx_env *env,
-    struct uwx_symbol_cache **symbol_cache_p,
-    char *module_name,
-    uint64_t relip,
-    char **func_name_p,
-    uint64_t *offset_p);
-
-extern void uwx_release_symbol_cache(
-    struct uwx_env *env,
-    struct uwx_symbol_cache *symbol_cache);
diff --git a/sys/contrib/ia64/libuwx/src/uwx_trace.c b/sys/contrib/ia64/libuwx/src/uwx_trace.c
deleted file mode 100644
index 0338dbe88b23..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_trace.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 "uwx_env.h"
-#include "uwx_utable.h"
-#include "uwx_uinfo.h"
-#include "uwx_scoreboard.h"
-#include "uwx_trace.h"
-
-#ifdef UWX_TRACE_ENABLE
-
-void uwx_trace_init(struct uwx_env *env)
-{
-    char *tstr;
-
-    tstr = getenv("UWX_TRACE");
-    if (tstr != NULL) {
-	while (*tstr != '\0') {
-	    switch (*tstr) {
-		case 'i': env->trace |= UWX_TRACE_UINFO; break;
-		case 't': env->trace |= UWX_TRACE_UTABLE; break;
-		case 'b': env->trace |= UWX_TRACE_SB; break;
-		case 'r': env->trace |= UWX_TRACE_RSTATE; break;
-		case 's': env->trace |= UWX_TRACE_STEP; break;
-		case 'c': env->trace |= UWX_TRACE_CONTEXT; break;
-		case 'C': env->trace |= UWX_TRACE_COPYIN; break;
-		case 'L': env->trace |= UWX_TRACE_LOOKUPIP; break;
-		case '?':
-#ifdef _KERNEL
-		    fprintf(stderr, "UWX_TRACE flag `%c' unknown.\n", *tstr);
-#else
-		    fprintf(stderr, "UWX_TRACE flags:\n");
-		    fprintf(stderr, "  i: unwind info\n");
-		    fprintf(stderr, "  t: unwind table searching\n");
-		    fprintf(stderr, "  b: scoreboard management\n");
-		    fprintf(stderr, "  r: register state vector\n");
-		    fprintf(stderr, "  s: step\n");
-		    fprintf(stderr, "  c: context\n");
-		    fprintf(stderr, "  C: copyin callback\n");
-		    fprintf(stderr, "  L: lookup ip callback\n");
-		    exit(1);
-#endif
-	    }
-	    tstr++;
-	}
-    }
-}
-
-char *uwx_sb_rnames[] = {
-    "RP", "PSP", "PFS",
-    "PREDS", "UNAT", "PRIUNAT", "RNAT", "LC", "FPSR",
-    "GR4", "GR5", "GR6", "GR7",
-    "BR1", "BR2", "BR3", "BR4", "BR5",
-    "FR2", "FR3", "FR4", "FR5",
-    "FR16", "FR17", "FR18", "FR19",
-    "FR20", "FR21", "FR22", "FR23",
-    "FR24", "FR25", "FR26", "FR27",
-    "FR28", "FR29", "FR30", "FR31",
-};
-
-void uwx_dump_rstate(int regid, uint64_t rstate)
-{
-    int reg;
-
-    if (rstate == UWX_DISP_NONE)
-	return;
-    fprintf(stderr, "    %-7s", uwx_sb_rnames[regid]);
-    switch (UWX_GET_DISP_CODE(rstate)) {
-	case UWX_DISP_NONE:
-	    fprintf(stderr, "    unchanged\n");
-	    break;
-	case UWX_DISP_SPPLUS(0):
-	    fprintf(stderr, "    SP + %d\n", (int)rstate & ~0x07);
-	    break;
-	case UWX_DISP_SPREL(0):
-	    fprintf(stderr, "    [SP + %d]\n", (int)rstate & ~0x07);
-	    break;
-	case UWX_DISP_PSPREL(0):
-	    fprintf(stderr, "    [PSP + 16 - %d]\n", (int)rstate & ~0x07);
-	    break;
-	case UWX_DISP_REG(0):
-	    reg = UWX_GET_DISP_REGID(rstate);
-	    if (reg == UWX_REG_AR_PFS)
-		fprintf(stderr, "    AR.PFS\n");
-	    else if (reg == UWX_REG_AR_UNAT)
-		fprintf(stderr, "    AR.UNAT\n");
-	    else if (reg >= UWX_REG_GR(0) && reg < UWX_REG_GR(128))
-		fprintf(stderr, "    GR%d\n", reg - UWX_REG_GR(0));
-	    else if (reg >= UWX_REG_FR(0) && reg < UWX_REG_FR(128))
-		fprintf(stderr, "    FR%d\n", reg - UWX_REG_FR(0));
-	    else if (reg >= UWX_REG_BR(0) && reg < UWX_REG_BR(8))
-		fprintf(stderr, "    BR%d\n", reg - UWX_REG_BR(0));
-	    else
-		fprintf(stderr, "    <reg %d>\n", reg);
-	    break;
-	default:
-	    fprintf(stderr, "    <%08lx>\n", (long)rstate);
-	    break;
-    }
-}
-
-void uwx_dump_scoreboard(
-    struct uwx_scoreboard *scoreboard,
-    int nsbreg,
-    struct uwx_rhdr *rhdr,
-    int cur_slot,
-    int ip_slot)
-{
-    int i;
-
-    if (rhdr->is_prologue)
-	fprintf(stderr, "  Prologue region (start = %d, length = %d)\n",
-		    (int)cur_slot, (int)rhdr->rlen);
-    else
-	fprintf(stderr, "  Body region (start = %d, length = %d, ecount = %d)\n",
-		    cur_slot, (int)rhdr->rlen, rhdr->ecount);
-    if (ip_slot < rhdr->rlen)
-	fprintf(stderr, "    IP is in this region (offset = %d)\n", ip_slot);
-    for (i = 0; i < nsbreg; i++)
-	uwx_dump_rstate(i, scoreboard->rstate[i]);
-}
-
-void uwx_dump_uinfo_block(
-	struct uwx_utable_entry *uentry,
-	unsigned int ulen)
-{
-    int i;
-    uint32_t *uinfo = (uint32_t *)(intptr_t)uentry->unwind_info;
-
-    ulen += DWORDSZ;		/* Include unwind info header */
-    if (uentry->unwind_flags & UNWIND_TBL_32BIT) /* and personality routine */
-	ulen += WORDSZ;
-    else
-	ulen += DWORDSZ;
-    while (ulen >= WORDSZ) {
-	fprintf(stderr, "  %08lx: ", (unsigned long)uinfo);
-	for (i = 0; i < 4 * WORDSZ && ulen >= WORDSZ; i += WORDSZ) {
-	    fprintf(stderr, " %04x", *uinfo++);
-	    ulen -= WORDSZ;
-	}
-	fprintf(stderr, "\n");
-    }
-}
-
-#endif /* UWX_TRACE_ENABLE */
diff --git a/sys/contrib/ia64/libuwx/src/uwx_trace.h b/sys/contrib/ia64/libuwx/src/uwx_trace.h
deleted file mode 100644
index 9202a38a9a7d..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_trace.h
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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.
-*/
-
-#define UWX_TRACE_SB		1	/* UWX_TRACE=b: scoreboard mgmt */
-#define UWX_TRACE_UINFO		2	/* UWX_TRACE=i: unwind info */
-#define UWX_TRACE_RSTATE	4	/* UWX_TRACE=r: reg state vector */
-#define UWX_TRACE_STEP		8	/* UWX_TRACE=s: step */
-#define UWX_TRACE_UTABLE	16	/* UWX_TRACE=t: unwind tbl search */
-#define UWX_TRACE_CONTEXT	32	/* UWX_TRACE=c: context */
-#define UWX_TRACE_COPYIN	64	/* UWX_TRACE=C: copyin callback */
-#define UWX_TRACE_LOOKUPIP	128	/* UWX_TRACE=L: lookupip callback */
-
-#ifdef UWX_TRACE_ENABLE
-
-#ifdef _KERNEL
-#define	fprintf(f, ...)		printf(__VA_ARGS__)
-#endif
-
-extern void uwx_trace_init(struct uwx_env *env);
-
-struct uwx_utable_entry;
-
-extern void uwx_dump_uinfo_block(struct uwx_utable_entry *, unsigned int);
-
-extern void uwx_dump_rstate(int regid, uint64_t rstate);
-
-struct uwx_rhdr;
-
-extern void uwx_dump_scoreboard(
-    struct uwx_scoreboard *scoreboard,
-    int nsbreg,
-    struct uwx_rhdr *rhdr,
-    int cur_slot,
-    int ip_slot);
-
-#define TRACE_INIT uwx_trace_init(env);
-
-#define TRACE_B_REUSE(id) \
-    if (env->trace & UWX_TRACE_SB) \
-	fprintf(stderr, "uwx_alloc_scoreboard: reuse id %d\n", (id));
-
-#define TRACE_B_PREALLOC(id) \
-    if (env->trace & UWX_TRACE_SB) \
-	fprintf(stderr, "uwx_prealloc_scoreboard: prealloc id %d\n", (id));
-
-#define TRACE_B_ALLOC(id) \
-    if (env->trace & UWX_TRACE_SB) \
-	fprintf(stderr, "uwx_alloc_scoreboard: alloc id %d\n", (id));
-
-#define TRACE_B_POP(id) \
-    if (env->trace & UWX_TRACE_SB) \
-	fprintf(stderr, "uwx_pop_scoreboards: free id %d\n", (id));
-
-#define TRACE_B_LABEL(label) \
-    if (env->trace & UWX_TRACE_SB) \
-	fprintf(stderr, "uwx_label_scoreboard: label %d\n", (label));
-
-#define TRACE_B_LABEL_COPY(id) \
-    if (env->trace & UWX_TRACE_SB) \
-	fprintf(stderr, "uwx_label_scoreboard: copy id %d\n", (id));
-
-#define TRACE_B_LABEL_REVERSE(back, new) \
-    if (env->trace & UWX_TRACE_SB) \
-	fprintf(stderr, "uwx_label_scoreboard: reverse link %d -> %d\n", \
-			    (new)->id, ((back) == 0) ? -1 : (back)->id);
-
-#define TRACE_B_COPY(label, id) \
-    if (env->trace & UWX_TRACE_SB) \
-	fprintf(stderr, "uwx_copy_scoreboard: label %d, cur sb id %d\n", (label), (id));
-
-#define TRACE_B_COPY_FREE(id) \
-    if (env->trace & UWX_TRACE_SB) \
-	fprintf(stderr, "uwx_copy_scoreboard: free id %d\n", (id));
-
-#define TRACE_B_COPY_FOUND(id) \
-    if (env->trace & UWX_TRACE_SB) \
-	fprintf(stderr, "uwx_copy_scoreboard: found id %d\n", (id));
-
-#define TRACE_B_COPY_COPY(id) \
-    if (env->trace & UWX_TRACE_SB) \
-	fprintf(stderr, "uwx_copy_scoreboard: copy id %d\n", (id));
-
-#define TRACE_B_COPY_REVERSE(back, new) \
-    if (env->trace & UWX_TRACE_SB) \
-	fprintf(stderr, "uwx_copy_scoreboard: reverse link %d -> %d\n", \
-			    (new)->id, ((back) == 0) ? -1 : (back)->id);
-
-#define TRACE_B_FREE(id) \
-    if (env->trace & UWX_TRACE_SB) \
-	fprintf(stderr, "uwx_free_scoreboards: free id %d\n", (id));
-
-#define TRACE_I_DECODE_RHDR_1(name, b0) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_rhdr:     %02x                   %s\n", \
-			(b0), (name));
-
-#define TRACE_I_DECODE_RHDR_1L(name, b0, val) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_rhdr:     %02x %08x          %s\n", \
-			(b0), (int)(val), (name));
-
-#define TRACE_I_DECODE_RHDR_2L(name, b0, b1, val) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_rhdr:     %02x %02x %08x       %s\n", \
-			(b0), (b1), (int)(val), (name));
-
-#define TRACE_I_DECODE_PROLOGUE_1(name, b0) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_prologue: %02x                   %s\n", \
-			(b0), (name));
-
-#define TRACE_I_DECODE_PROLOGUE_1L(name, b0, val) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_prologue: %02x %08x          %s\n", \
-			(b0), (int)(val), (name));
-
-#define TRACE_I_DECODE_PROLOGUE_1LL(name, b0, val1, val2) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_prologue: %02x %08x %08x %s\n", \
-			(b0), (int)(val1), (int)(val2), (name));
-
-#define TRACE_I_DECODE_PROLOGUE_2(name, b0, b1) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_prologue: %02x %02x                %s\n", \
-			(b0), (b1), (name));
-
-#define TRACE_I_DECODE_PROLOGUE_2L(name, b0, b1, val) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_prologue: %02x %02x %08x       %s\n", \
-			(b0), (b1), (int)(val), (name));
-
-#define TRACE_I_DECODE_PROLOGUE_3(name, b0, b1, b2) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_prologue: %02x %02x %02x             %s\n", \
-			(b0), (b1), (b2), (name));
-
-#define TRACE_I_DECODE_PROLOGUE_4(name, b0, b1, b2, b3) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_prologue: %02x %02x %02x %02x          %s\n", \
-			(b0), (b1), (b2), (b3), (name));
-
-#define TRACE_I_DECODE_PROLOGUE_SPILL_BASE(spill_base) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_prologue: spill base = %08x\n", (int)(spill_base));
-
-#define TRACE_I_DECODE_PROLOGUE_MASKS(gr_mem_mask, gr_gr_mask) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_prologue: gr_mem_mask = %02x; gr_gr_mask = %02x\n", \
-			(gr_mem_mask), (gr_gr_mask));
-
-#define TRACE_I_DECODE_PROLOGUE_NSPILL(ngr) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_prologue: ngr = %d\n", (ngr));
-
-#define TRACE_I_DECODE_BODY_1(name, b0) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_body:     %02x                   %s\n", \
-			(b0), (name));
-
-#define TRACE_I_DECODE_BODY_1L(name, b0, val) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_body:     %02x %08x          %s\n", \
-			(b0), (int)(val), (name));
-
-#define TRACE_I_DECODE_BODY_1LL(name, b0, val1, val2) \
-    if (env->trace & UWX_TRACE_UINFO) \
-	fprintf(stderr, "uwx_decode_body:     %02x %08x %08x %s\n", \
-			(b0), (int)(val1), (int)(val2), (name));
-
-#define TRACE_R_UIB(uentry, ulen) \
-    if (env->trace & UWX_TRACE_RSTATE) { \
-	fprintf(stderr, "Unwind info block (info = %08x %08x, flags = %08x %08x, ulen = %d)\n", \
-		    (unsigned int)((uentry)->unwind_info >> 32), \
-		    (unsigned int)(uentry)->unwind_info, \
-		    (unsigned int)((uentry)->unwind_flags >> 32), \
-		    (unsigned int)(uentry)->unwind_flags, \
-		    (ulen)); \
-	if (!env->remote) uwx_dump_uinfo_block(uentry, ulen); \
-    }
-
-#define TRACE_R_DUMP_SB(scoreboard, rhdr, cur_slot, ip_slot) \
-    if (env->trace & UWX_TRACE_RSTATE) \
-	uwx_dump_scoreboard(scoreboard, env->nsbreg, \
-				&(rhdr), cur_slot, ip_slot);
-
-#define TRACE_S_STEP(rstate) \
-    if (env->trace & UWX_TRACE_STEP) { \
-	fprintf(stderr, "uwx_restore_markers:\n"); \
-	uwx_dump_rstate(SBREG_RP, (rstate)[SBREG_RP]); \
-	uwx_dump_rstate(SBREG_PSP, (rstate)[SBREG_PSP]); \
-	uwx_dump_rstate(SBREG_PFS, (rstate)[SBREG_PFS]); \
-    }
-
-#define TRACE_S_RESTORE_REG(regname, rstate, val) \
-    if (env->trace & UWX_TRACE_STEP) \
-	fprintf(stderr, "  restore %-7s (rstate = %08x %08x) = %08x %08x\n", \
-			regname, \
-			(unsigned int) ((rstate) >> 32), \
-			(unsigned int) (rstate), \
-			(unsigned int) ((val) >> 32), \
-			(unsigned int) (val));
-
-#define TRACE_S_RESTORE_GR(regid, rstate, val) \
-    if (env->trace & UWX_TRACE_STEP) \
-	fprintf(stderr, "  restore GR%d     (rstate = %08x %08x) = %08x %08x\n", \
-			(regid) + 4, \
-			(unsigned int) ((rstate) >> 32), \
-			(unsigned int) (rstate), \
-			(unsigned int) ((val) >> 32), \
-			(unsigned int) (val));
-
-#define TRACE_S_RESTORE_BR(regid, rstate, val) \
-    if (env->trace & UWX_TRACE_STEP) \
-	fprintf(stderr, "  restore BR%d     (rstate = %08x %08x) = %08x %08x\n", \
-			(regid) + 1, \
-			(unsigned int) ((rstate) >> 32), \
-			(unsigned int) (rstate), \
-			(unsigned int) ((val) >> 32), \
-			(unsigned int) (val));
-
-#define TRACE_S_RESTORE_FR(regid, rstate, fval) \
-    if (env->trace & UWX_TRACE_STEP) \
-	fprintf(stderr, "  restore FR%d     (rstate = %08x %08x) = %08x %08x %08x %08x\n", \
-			(regid) + 1, \
-			(unsigned int) ((rstate) >> 32), \
-			(unsigned int) (rstate), \
-			(unsigned int) ((fval[0]) >> 32), \
-			(unsigned int) (fval[0]), \
-			(unsigned int) ((fval[1]) >> 32), \
-			(unsigned int) (fval[1]));
-
-#define TRACE_T_SEARCH32(ip) \
-    if (env->trace & UWX_TRACE_UTABLE) \
-	fprintf(stderr, "uwx_search_utable32 (relative ip = %08x)\n", (ip));
-
-#define TRACE_T_BINSEARCH32(lb, ub, mid, code_start, code_end) \
-    if (env->trace & UWX_TRACE_UTABLE) \
-	fprintf(stderr, "    lb/ub = %d/%d, mid = %d, start/end = %08x %08x\n", \
-			    lb, ub, mid, code_start, code_end);
-
-#define TRACE_C_GET_REG(regid, bsp) \
-	if (env->trace & UWX_TRACE_CONTEXT) \
-	    fprintf(stderr, "uwx_get_reg (gr%d, bsp = %08x %08x)\n", \
-			(regid) - UWX_REG_GR(0), \
-			(unsigned int) ((bsp) >> 32), \
-			(unsigned int) (bsp));
-
-#define TRACE_C_ROTATE_GR(regid, sor, rrb_gr, newregid) \
-	if (env->trace & UWX_TRACE_CONTEXT) \
-	    fprintf(stderr, "uwx_get_reg (gr%d, sor = %d, rrb = %d) --> gr%d\n", \
-			(regid) + 32, \
-			(sor), \
-			(rrb_gr), \
-			(newregid) + 32);
-
-#define TRACE_SELF_COPYIN4(rem, len, wp) \
-    if (info->trace & UWX_TRACE_COPYIN) \
-	fprintf(stderr, "copyin (rem = %08x %08x, len = %d, val = %08x)\n", \
-			(unsigned int) ((rem) >> 32), \
-			(unsigned int) (rem), \
-			(len), *(wp));
-
-#define TRACE_SELF_COPYIN8(rem, len, dp) \
-    if (info->trace & UWX_TRACE_COPYIN) \
-	fprintf(stderr, "copyin (rem = %08x %08x, len = %d, val = %08x %08x)\n", \
-			(unsigned int) ((rem) >> 32), \
-			(unsigned int) (rem), \
-			(len), \
-			((unsigned int *)(dp))[0], \
-			((unsigned int *)(dp))[1]);
-
-#define TRACE_SELF_LOOKUP(ip) \
-    if (info->trace & UWX_TRACE_LOOKUPIP) \
-	fprintf(stderr, "Lookup IP callback: ip = %08x %08x\n", \
-			(unsigned int) ((ip) >> 32), \
-			(unsigned int) (ip));
-
-#define TRACE_SELF_LOOKUP_DESC(text_base, linkage_ptr, unwind_base) \
-	if (info->trace & UWX_TRACE_LOOKUPIP) { \
-	    fprintf(stderr, "  text base:    %08x %08x\n", \
-			(unsigned int) ((text_base) >> 32), \
-			(unsigned int) (text_base)); \
-	    fprintf(stderr, "  linkage ptr:  %08x %08x\n", \
-			(unsigned int) ((linkage_ptr) >> 32), \
-			(unsigned int) (linkage_ptr)); \
-	    fprintf(stderr, "  unwind base:  %08x %08x\n", \
-			(unsigned int) ((uint64_t)(unwind_base) >> 32), \
-			(unsigned int) (unwind_base)); \
-	    fprintf(stderr, "  unwind flags: %08x %08x\n", \
-			(unsigned int) ((unwind_base)[0] >> 32), \
-			(unsigned int) (unwind_base)[0]); \
-	    fprintf(stderr, "  unwind start: %08x %08x\n", \
-			(unsigned int) (((text_base)+(unwind_base)[1]) >> 32), \
-			(unsigned int) ((text_base)+(unwind_base)[1])); \
-	    fprintf(stderr, "  unwind end:   %08x %08x\n", \
-			(unsigned int) (((text_base)+(unwind_base)[2]) >> 32), \
-			(unsigned int) ((text_base)+(unwind_base)[2])); \
-	}
-
-#else /* !UWX_TRACE_ENABLE */
-
-#define TRACE_INIT
-#define TRACE_B_REUSE(id)
-#define TRACE_B_PREALLOC(id)
-#define TRACE_B_ALLOC(id)
-#define TRACE_B_POP(id)
-#define TRACE_B_LABEL(label)
-#define TRACE_B_LABEL_COPY(id)
-#define TRACE_B_LABEL_REVERSE(back, new)
-#define TRACE_B_COPY(label, id)
-#define TRACE_B_COPY_FREE(id)
-#define TRACE_B_COPY_FOUND(id)
-#define TRACE_B_COPY_COPY(id)
-#define TRACE_B_COPY_REVERSE(back, new)
-#define TRACE_B_FREE(id)
-#define TRACE_I_DECODE_RHDR_1(name, b0)
-#define TRACE_I_DECODE_RHDR_1L(name, b0, val)
-#define TRACE_I_DECODE_RHDR_2L(name, b0, b1, val)
-#define TRACE_I_DECODE_PROLOGUE_1(name, b0)
-#define TRACE_I_DECODE_PROLOGUE_1L(name, b0, val)
-#define TRACE_I_DECODE_PROLOGUE_1LL(name, b0, val1, val2)
-#define TRACE_I_DECODE_PROLOGUE_2(name, b0, b1)
-#define TRACE_I_DECODE_PROLOGUE_2L(name, b0, b1, parm1)
-#define TRACE_I_DECODE_PROLOGUE_3(name, b0, b1, b2)
-#define TRACE_I_DECODE_PROLOGUE_4(name, b0, b1, b2, b3)
-#define TRACE_I_DECODE_PROLOGUE_SPILL_BASE(spill_base)
-#define TRACE_I_DECODE_PROLOGUE_MASKS(gr_mem_mask, gr_gr_mask)
-#define TRACE_I_DECODE_PROLOGUE_NSPILL(ngr)
-#define TRACE_I_DECODE_BODY_1(name, b0)
-#define TRACE_I_DECODE_BODY_1L(name, b0, parm1)
-#define TRACE_I_DECODE_BODY_1LL(name, b0, parm1, parm2)
-#define TRACE_R_UIB(uentry, ulen)
-#define TRACE_R_DUMP_SB(scoreboard, rhdr, cur_slot, ip_slot)
-#define TRACE_S_STEP(rstate)
-#define TRACE_S_RESTORE_REG(regname, rstate, val)
-#define TRACE_S_RESTORE_GR(regid, rstate, val)
-#define TRACE_S_RESTORE_BR(regid, rstate, val)
-#define TRACE_S_RESTORE_FR(regid, rstate, val)
-#define TRACE_T_SEARCH32(ip)
-#define TRACE_T_BINSEARCH32(lb, ub, mid, code_start, code_end)
-#define TRACE_C_GET_REG(regid, bsp)
-#define TRACE_C_ROTATE_GR(regid, sor, rrb_gr, newregid)
-#define TRACE_SELF_COPYIN4(rem, len, wp)
-#define TRACE_SELF_COPYIN8(rem, len, dp)
-#define TRACE_SELF_LOOKUP(ip)
-#define TRACE_SELF_LOOKUP_DESC(text_base, linkage_ptr, unwind_base)
-
-#endif /* UWX_TRACE_ENABLE */
-
diff --git a/sys/contrib/ia64/libuwx/src/uwx_uinfo.c b/sys/contrib/ia64/libuwx/src/uwx_uinfo.c
deleted file mode 100644
index 5f63b7e74c0c..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_uinfo.c
+++ /dev/null
@@ -1,1119 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 "uwx_env.h"
-#include "uwx_uinfo.h"
-#include "uwx_utable.h"
-#include "uwx_scoreboard.h"
-#include "uwx_bstream.h"
-#include "uwx_trace.h"
-#include "uwx_swap.h"
-
-int uwx_count_ones(unsigned int mask);
-
-/*
- *  uwx_uinfo.c
- *
- *  This file contains the routines for reading and decoding
- *  the unwind information block. 
- *
- *  The main entry point, uwx_decode_uinfo(), is given a pointer
- *  to an unwind table entry and a pointer (passed by reference)
- *  to be filled in with a pointer to an update vector. It will
- *  read and decode the unwind descriptors contained in the
- *  unwind information block, then build the register state array,
- *  which describes the actions necessary to step from the current
- *  frame to the previous one.
- */
-
-#define COPYIN_UINFO_4(dest, src) \
-    (env->remote? \
-      (*env->copyin)(UWX_COPYIN_UINFO, (dest), (src), \
-						WORDSZ, env->cb_token) : \
-      (*(uint32_t *)(intptr_t)(dest) = *(uint32_t *)(intptr_t)(src), WORDSZ) )
-
-#define COPYIN_UINFO_8(dest, src) \
-    (env->remote? \
-      (*env->copyin)(UWX_COPYIN_UINFO, (dest), (src), \
-						DWORDSZ, env->cb_token) : \
-      (*(uint64_t *)(intptr_t)(dest) = *(uint64_t *)(intptr_t)(src), DWORDSZ) )
-
-
-/* uwx_default_rstate: Returns the default register state for a leaf routine */
-
-int uwx_default_rstate(struct uwx_env *env, uint64_t **rstatep)
-{
-    struct uwx_scoreboard *sb;
-
-    sb = uwx_init_scoreboards(env);
-    *rstatep = sb->rstate;
-    return UWX_OK;
-}
-
-
-/* uwx_decode_uinfo: Decodes unwind info region */
-
-int uwx_decode_uinfo(
-    struct uwx_env *env,
-    struct uwx_utable_entry *uentry,
-    uint64_t **rstatep)
-{
-    uint64_t uinfohdr;
-    unsigned int ulen;
-    int len;
-    struct uwx_bstream bstream;
-    struct uwx_scoreboard *scoreboard;
-    int ip_slot;
-    int cur_slot;
-    int status;
-    struct uwx_rhdr rhdr;
-
-    /* Remember the offset from the start of the function */
-    /* to the current IP. This helps the client find */
-    /* the symbolic information. */
-
-    env->function_offset = env->remapped_ip - uentry->code_start;
-
-    /* Read the unwind info header using the copyin callback. */
-    /* (If we're reading a 32-bit unwind table, we need to */
-    /* read the header as two 32-bit pieces to preserve the */
-    /* guarantee that we always call copyin for aligned */
-    /* 4-byte or 8-byte chunks.) */
-    /* Then compute the length of the unwind descriptor */
-    /* region and initialize a byte stream to read it. */
-
-    if (uentry->unwind_flags & UNWIND_TBL_32BIT) {
-	len = COPYIN_UINFO_4((char *)&uinfohdr, uentry->unwind_info);
-	len += COPYIN_UINFO_4((char *)&uinfohdr + WORDSZ,
-					uentry->unwind_info + WORDSZ);
-	}
-    else
-	len = COPYIN_UINFO_8((char *)&uinfohdr, uentry->unwind_info);
-    if (len != DWORDSZ)
-	return UWX_ERR_COPYIN_UINFO;
-    if (env->byte_swap)
-	uwx_swap8(&uinfohdr);
-    if (uentry->unwind_flags & UNWIND_TBL_32BIT)
-	ulen = UNW_LENGTH(uinfohdr) * WORDSZ;
-    else
-	ulen = UNW_LENGTH(uinfohdr) * DWORDSZ;
-    uwx_init_bstream(&bstream, env,
-		uentry->unwind_info + DWORDSZ, ulen, UWX_COPYIN_UINFO);
-
-    /* Save the header and a pointer to the personality routine ptr */
-    /* for later use in exception handling. */
-
-    env->uinfo_hdr = uinfohdr;
-    env->uinfo_end = uentry->unwind_info + DWORDSZ + ulen;
-
-    TRACE_R_UIB(uentry, ulen)
-
-    /* Create an initial scoreboard for tracking the unwind state. */
-
-    scoreboard = uwx_init_scoreboards(env);
-
-    /* Prepare to read and decode the unwind regions described */
-    /* by the unwind info block. Find the target "ip" slot */
-    /* relative to the beginning of the region. The lower 4 bits */
-    /* of the actual IP encode the slot number within a bundle. */
-
-    cur_slot = 0;
-    ip_slot = (int) ((env->context.special[UWX_REG_IP] & ~0x0fLL)
-							- uentry->code_start)
-		/ BUNDLESZ * SLOTSPERBUNDLE
-		+ (unsigned int) (env->context.special[UWX_REG_IP] & 0x0f);
-
-    /* Loop over the regions in the unwind info block. */
-
-    for (;;) {
-
-	/* Decode the next region header. */
-	/* We have an error if we reach the end of the info block, */
-	/* since we should have found our target ip slot by then. */
-	/* We also have an error if the next byte isn't a region */
-	/* header record. */
-
-	status = uwx_decode_rhdr(env, &bstream, &rhdr);
-	if (status != UWX_OK)
-	    return status;
-
-	/* If a prologue region, get a new scoreboard, pushing */
-	/* the previous one onto the prologue stack. Then read */
-	/* and decode the prologue region records. */
-
-	if (rhdr.is_prologue) {
-	    scoreboard = uwx_new_scoreboard(env, scoreboard);
-	    if (scoreboard == 0)
-		return UWX_ERR_NOMEM;
-	    status = uwx_decode_prologue(env, &bstream,
-					    scoreboard, &rhdr, ip_slot);
-	}
-
-	/* If a body region, read and decode the body region */
-	/* records. If the body has an epilogue count, */
-	/* uwx_decode_body will note that in the region header */
-	/* record for use at the bottom of the loop. */
-
-	else {
-	    status = uwx_decode_body(env, &bstream, scoreboard, &rhdr, ip_slot);
-	}
-
-	if (status != UWX_OK)
-	    return status;
-
-	TRACE_R_DUMP_SB(scoreboard, rhdr, cur_slot, ip_slot)
-
-	/* If the target ip slot is within this region, we're done. */
-	/* Return the scoreboard's register state array. */
-
-	if (ip_slot < rhdr.rlen) {
-	    *rstatep = scoreboard->rstate;
-	    return UWX_OK;
-	}
-
-	/* Otherwise, update the current ip slot, pop the */
-	/* scoreboard stack based on the epilogue count, */
-	/* and loop back around for the next region. */
-
-	cur_slot += rhdr.rlen;
-	ip_slot -= rhdr.rlen;
-	if (rhdr.ecount > 0) {
-	    scoreboard = uwx_pop_scoreboards(env, scoreboard, rhdr.ecount);
-	    if (scoreboard == 0)
-		return UWX_ERR_PROLOG_UF;
-	}
-    }
-    /*NOTREACHED*/
-}
-
-
-/* uwx_decode_rhdr: Decodes a region header record */
-
-int uwx_decode_rhdr(
-    struct uwx_env *env,
-    struct uwx_bstream *bstream,
-    struct uwx_rhdr *rhdr)
-{
-    int b0;
-    int b1;
-    uint64_t val;
-    int status;
-
-    /* Get the first byte of the next descriptor record. */
-    b0 = uwx_get_byte(bstream);
-    if (b0 < 0)
-	return UWX_ERR_NOUDESC;
-
-    /* Initialize region header record. */
-
-    rhdr->is_prologue = 0;
-    rhdr->rlen = 0;
-    rhdr->mask = 0;
-    rhdr->grsave = 0;
-    rhdr->ecount = 0;
-
-    /* Format R1 */
-
-    if (b0 < 0x40) {
-	if ((b0 & 0x20) == 0) {
-	    TRACE_I_DECODE_RHDR_1("(R1) prologue", b0)
-	    rhdr->is_prologue = 1;
-	}
-	else {
-	    TRACE_I_DECODE_RHDR_1("(R1) body", b0)
-	}
-	rhdr->rlen = b0 & 0x1f;
-    }
-
-    /* Format R2 */
-
-    else if (b0 < 0x60) {
-	b1 = uwx_get_byte(bstream);
-	if (b1 < 0)
-	    return UWX_ERR_BADUDESC;
-	status = uwx_get_uleb128(bstream, &val);
-	if (status != 0)
-	    return UWX_ERR_BADUDESC;
-	TRACE_I_DECODE_RHDR_2L("(R2) prologue_gr", b0, b1, val)
-	rhdr->is_prologue = 1;
-	rhdr->rlen = (unsigned int) val;
-	rhdr->mask = ((b0 & 0x07) << 1) | (b1 >> 7);
-	rhdr->grsave = b1 & 0x7f;
-    }
-
-    /* Format R3 */
-
-    else if (b0 < 0x80) {
-	status = uwx_get_uleb128(bstream, &val);
-	if (status != 0)
-	    return UWX_ERR_BADUDESC;
-	if ((b0 & 0x03) == 0) {
-	    TRACE_I_DECODE_RHDR_1L("(R3) prologue", b0, val)
-	    rhdr->is_prologue = 1;
-	}
-	else {
-	    TRACE_I_DECODE_RHDR_1L("(R3) body", b0, val)
-	}
-	rhdr->rlen = (unsigned int) val;
-    }
-
-    /* Otherwise, not a region header record. */
-
-    else {
-	TRACE_I_DECODE_RHDR_1("(?)", b0)
-	return UWX_ERR_BADUDESC;
-    }
-
-    return UWX_OK;
-}
-
-
-/* uwx_decode_prologue: Decodes a prologue region */
-
-int uwx_decode_prologue(
-    struct uwx_env *env,
-    struct uwx_bstream *bstream,
-    struct uwx_scoreboard *scoreboard,
-    struct uwx_rhdr *rhdr,
-    int ip_slot)
-{
-    int status;
-    int reg;
-    int mask;
-    int b0;
-    int b1;
-    int b2;
-    int b3;
-    int r;
-    int t;
-    int i;
-    uint64_t parm1;
-    uint64_t parm2;
-    uint64_t newrstate[NSBREG];
-    int tspill[NSBREG];
-    int priunat_mem_rstate;
-    int t_priunat_mem;
-    unsigned int gr_mem_mask;
-    unsigned int br_mem_mask;
-    unsigned int fr_mem_mask;
-    unsigned int gr_gr_mask;
-    unsigned int br_gr_mask;
-    int ngr;
-    int nbr;
-    int nfr;
-    unsigned int spill_base;
-    unsigned int gr_base;
-    unsigned int br_base;
-    unsigned int fr_base;
-
-    /* Initialize an array of register states from the current */
-    /* scoreboard, along with a parallel array of spill times. */
-    /* We use this as a temporary scoreboard, then update the */
-    /* real scoreboard at the end of the procedure. */
-    /* We initialize the spill time to (rhdr.rlen - 1) so that */
-    /* spills without a "when" descriptor will take effect */
-    /* at the end of the prologue region. */
-    /* (Boundary condition: all actions in a zero-length prologue */
-    /* will appear to have happened in the instruction slot */
-    /* immediately preceding the prologue.) */
-
-    for (i = 0; i < env->nsbreg; i++) {
-	newrstate[i] = scoreboard->rstate[i];
-	tspill[i] = rhdr->rlen - 1;
-    }
-    priunat_mem_rstate = UWX_DISP_NONE;
-    t_priunat_mem = rhdr->rlen - 1;
-
-    fr_mem_mask = 0;
-    gr_mem_mask = 0;
-    br_mem_mask = 0;
-    gr_gr_mask = 0;
-    br_gr_mask = 0;
-    nfr = 127;
-    ngr = 127;
-    nbr = 127;
-    spill_base = 0;
-
-    /* If prologue_gr header record supplied mask and grsave, */
-    /* record these in the scoreboard. */
-
-    reg = rhdr->grsave;
-    mask = rhdr->mask;
-    if (mask & 0x8) {
-	newrstate[SBREG_RP] = UWX_DISP_REG(UWX_REG_GR(reg));
-	reg++;
-    }
-    if (mask & 0x4) {
-	newrstate[SBREG_PFS] = UWX_DISP_REG(UWX_REG_GR(reg));
-	reg++;
-    }
-    if (mask & 0x2) {
-	newrstate[SBREG_PSP] = UWX_DISP_REG(UWX_REG_GR(reg));
-	reg++;
-    }
-    if (mask & 0x1) {
-	newrstate[SBREG_PREDS] = UWX_DISP_REG(UWX_REG_GR(reg));
-	reg++;
-    }
-
-    /* Read prologue descriptor records until */
-    /* we hit another region header. */
-
-    for (;;) {
-
-	b0 = uwx_get_byte(bstream);
-
-	if (b0 < 0x80) {
-	    /* Return the last byte read to the byte stream, since it's */
-	    /* really the first byte of the next region header record. */
-	    if (b0 >= 0)
-		(void) uwx_unget_byte(bstream, b0);
-	    break;
-	}
-
-	switch ((b0 & 0x70) >> 4) {
-
-	    case 0:			/* 1000 xxxx */
-	    case 1:			/* 1001 xxxx */
-		/* Format P1 (br_mem) */
-		TRACE_I_DECODE_PROLOGUE_1("(P1) br_mem", b0)
-		br_mem_mask = b0 & 0x1f;
-		break;
-
-	    case 2:			/* 1010 xxxx */
-		/* Format P2 (br_gr) */
-		b1 = uwx_get_byte(bstream);
-		if (b1 < 0)
-		    return UWX_ERR_BADUDESC;
-		TRACE_I_DECODE_PROLOGUE_2("(P2) br_gr", b0, b1)
-		mask = ((b0 & 0x0f) << 1) | (b1 >> 7);
-		reg = b1 & 0x7f;
-		br_gr_mask = mask;
-		for (i = 0; i < NSB_BR && mask != 0; i++) {
-		    if (mask & 0x01) {
-			newrstate[SBREG_BR + i] = UWX_DISP_REG(UWX_REG_GR(reg));
-			reg++;
-		    }
-		    mask = mask >> 1;
-		}
-		break;
-
-	    case 3:			/* 1011 xxxx */
-		/* Format P3 */
-		if (b0 < 0xb8) {
-		    b1 = uwx_get_byte(bstream);
-		    if (b1 < 0)
-			return UWX_ERR_BADUDESC;
-		    r = ((b0 & 0x7) << 1) | (b1 >> 7);
-		    reg = b1 & 0x7f;
-		    switch (r) {
-			case 0:		/* psp_gr */
-			    TRACE_I_DECODE_PROLOGUE_2("(P3) psp_gr", b0, b1)
-			    newrstate[SBREG_PSP] = UWX_DISP_REG(UWX_REG_GR(reg));
-			    break;
-			case 1:		/* rp_gr */
-			    TRACE_I_DECODE_PROLOGUE_2("(P3) rp_gr", b0, b1)
-			    newrstate[SBREG_RP] = UWX_DISP_REG(UWX_REG_GR(reg));
-			    break;
-			case 2:		/* pfs_gr */
-			    TRACE_I_DECODE_PROLOGUE_2("(P3) pfs_gr", b0, b1)
-			    newrstate[SBREG_PFS] = UWX_DISP_REG(UWX_REG_GR(reg));
-			    break;
-			case 3:		/* preds_gr */
-			    TRACE_I_DECODE_PROLOGUE_2("(P3) preds_gr", b0, b1)
-			    newrstate[SBREG_PREDS] =
-					UWX_DISP_REG(UWX_REG_GR(reg));
-			    break;
-			case 4:		/* unat_gr */
-			    TRACE_I_DECODE_PROLOGUE_2("(P3) unat_gr", b0, b1)
-			    newrstate[SBREG_UNAT] =
-					UWX_DISP_REG(UWX_REG_GR(reg));
-			    break;
-			case 5:		/* lc_gr */
-			    TRACE_I_DECODE_PROLOGUE_2("(P3) lc_gr", b0, b1)
-			    newrstate[SBREG_LC] =
-					UWX_DISP_REG(UWX_REG_GR(reg));
-			    break;
-			case 6:		/* rp_br */
-			    TRACE_I_DECODE_PROLOGUE_2("(P3) rp_br", b0, b1)
-			    scoreboard->rstate[SBREG_RP] =
-					UWX_DISP_REG(UWX_REG_BR(reg));
-			    if (newrstate[SBREG_RP] ==
-						UWX_DISP_REG(UWX_REG_BR(0)))
-				newrstate[SBREG_RP] =
-					UWX_DISP_REG(UWX_REG_BR(reg));
-			    break;
-			case 7:		/* rnat_gr */
-			    TRACE_I_DECODE_PROLOGUE_2("(P3) rnat_gr", b0, b1)
-			    newrstate[SBREG_RNAT] =
-					UWX_DISP_REG(UWX_REG_GR(reg));
-			    break;
-			case 8:		/* bsp_gr */
-			    TRACE_I_DECODE_PROLOGUE_2("(P3) bsp_gr", b0, b1)
-			    /* Don't track BSP yet */
-			    return UWX_ERR_CANTUNWIND;
-			    /* break; */
-			case 9:		/* bspstore_gr */
-			    TRACE_I_DECODE_PROLOGUE_2("(P3) bspstore_gr", b0, b1)
-			    /* Don't track BSPSTORE yet */
-			    return UWX_ERR_CANTUNWIND;
-			    /* break; */
-			case 10:	/* fpsr_gr */
-			    TRACE_I_DECODE_PROLOGUE_2("(P3) fpsr_gr", b0, b1)
-			    newrstate[SBREG_FPSR] =
-					UWX_DISP_REG(UWX_REG_GR(reg));
-			    break;
-			case 11:	/* priunat_gr */
-			    TRACE_I_DECODE_PROLOGUE_2("(P3) priunat_gr", b0, b1)
-			    newrstate[SBREG_PRIUNAT] =
-					UWX_DISP_REG(UWX_REG_GR(reg));
-			    break;
-			default:
-			    TRACE_I_DECODE_PROLOGUE_2("(P3) ??", b0, b1)
-			    return UWX_ERR_BADUDESC;
-		    }
-		}
-
-		/* Format P4 (spill_mask) */
-		else if (b0 == 0xb8) {
-		    TRACE_I_DECODE_PROLOGUE_1("(P4) spill_mask", b0)
-		    /* The spill_mask descriptor is followed by */
-		    /* an imask field whose length is determined */
-		    /* by the region length: there are two mask */
-		    /* bits per instruction slot in the region. */
-		    /* We decode these bits two at a time, counting */
-		    /* the number of FRs, GRs, and BRs that are */
-		    /* saved up to the slot of interest. Other */
-		    /* descriptors describe which sets of these */
-		    /* registers are spilled, and we put those */
-		    /* two pieces of information together at the */
-		    /* end of the main loop. */
-		    t = 0;
-		    nfr = 0;
-		    ngr = 0;
-		    nbr = 0;
-		    while (t < rhdr->rlen) {
-			b1 = uwx_get_byte(bstream);
-			if (b1 < 0)
-			    return UWX_ERR_BADUDESC;
-			for (i = 0; i < 4 && (t + i) < ip_slot; i++) {
-			    switch (b1 & 0xc0) {
-				case 0x00: break;
-				case 0x40: nfr++; break;
-				case 0x80: ngr++; break;
-				case 0xc0: nbr++; break;
-			    }
-			    b1 = b1 << 2;
-			}
-			t += 4;
-		    }
-		}
-
-		/* Format P5 (frgr_mem) */
-		else if (b0 == 0xb9) {
-		    b1 = uwx_get_byte(bstream);
-		    if (b1 < 0)
-			return UWX_ERR_BADUDESC;
-		    b2 = uwx_get_byte(bstream);
-		    if (b2 < 0)
-			return UWX_ERR_BADUDESC;
-		    b3 = uwx_get_byte(bstream);
-		    if (b3 < 0)
-			return UWX_ERR_BADUDESC;
-		    TRACE_I_DECODE_PROLOGUE_4("(P5) frgr_mem", b0, b1, b2, b3)
-		    gr_mem_mask = b1 >> 4;
-		    fr_mem_mask = ((b1 & 0x0f) << 16) | (b2 << 8) | b3;
-		}
-
-		/* Invalid descriptor record */
-		else {
-		    TRACE_I_DECODE_PROLOGUE_1("(?)", b0)
-		    return UWX_ERR_BADUDESC;
-		}
-
-		break;
-
-	    case 4:			/* 1100 xxxx */
-		/* Format P6 (fr_mem) */
-		TRACE_I_DECODE_PROLOGUE_1("(P6) fr_mem", b0)
-		fr_mem_mask = b0 & 0x0f;
-		break;
-
-	    case 5:			/* 1101 xxxx */
-		/* Format P6 (gr_mem) */
-		TRACE_I_DECODE_PROLOGUE_1("(P6) gr_mem", b0)
-		gr_mem_mask = b0 & 0x0f;
-		break;
-
-	    case 6:			/* 1110 xxxx */
-		/* Format P7 */
-		r = b0 & 0xf;
-		status = uwx_get_uleb128(bstream, &parm1);
-		if (status != 0)
-		    return UWX_ERR_BADUDESC;
-		switch (r) {
-		    case 0:		/* mem_stack_f */
-			status = uwx_get_uleb128(bstream, &parm2);
-			if (status != 0)
-			    return UWX_ERR_BADUDESC;
-			TRACE_I_DECODE_PROLOGUE_1LL("(P7) mem_stack_f", b0, parm1, parm2)
-			newrstate[SBREG_PSP] = UWX_DISP_SPPLUS(parm2 * 16);
-			tspill[SBREG_PSP] = (int) parm1;
-			break;
-		    case 1:		/* mem_stack_v */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) mem_stack_v", b0, parm1)
-			tspill[SBREG_PSP] = (int) parm1;
-			break;
-		    case 2:		/* spill_base */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) spill_base", b0, parm1)
-			spill_base = 4 * (unsigned int) parm1;
-			break;
-		    case 3:		/* psp_sprel */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) psp_sprel", b0, parm1)
-			newrstate[SBREG_PSP] = UWX_DISP_SPREL(parm1 * 4);
-			break;
-		    case 4:		/* rp_when */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) rp_when", b0, parm1)
-			tspill[SBREG_RP] = (int) parm1;
-			break;
-		    case 5:		/* rp_psprel */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) rp_psprel", b0, parm1)
-			newrstate[SBREG_RP] = UWX_DISP_PSPREL(parm1 * 4);
-			break;
-		    case 6:		/* pfs_when */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) pfs_when", b0, parm1)
-			tspill[SBREG_PFS] = (int) parm1;
-			break;
-		    case 7:		/* pfs_psprel */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) pfs_psprel", b0, parm1)
-			newrstate[SBREG_PFS] = UWX_DISP_PSPREL(parm1 * 4);
-			break;
-		    case 8:		/* preds_when */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) preds_when", b0, parm1)
-			tspill[SBREG_PREDS] = (int) parm1;
-			break;
-		    case 9:		/* preds_psprel */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) preds_psprel", b0, parm1)
-			newrstate[SBREG_PREDS] = UWX_DISP_PSPREL(parm1 * 4);
-			break;
-		    case 10:	/* lc_when */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) lc_when", b0, parm1)
-			tspill[SBREG_LC] = (int) parm1;
-			break;
-		    case 11:	/* lc_psprel */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) lc_psprel", b0, parm1)
-			newrstate[SBREG_LC] = UWX_DISP_PSPREL(parm1 * 4);
-			break;
-		    case 12:	/* unat_when */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) unat_when", b0, parm1)
-			tspill[SBREG_UNAT] = (int) parm1;
-			break;
-		    case 13:	/* unat_psprel */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) unat_psprel", b0, parm1)
-			newrstate[SBREG_UNAT] = UWX_DISP_PSPREL(parm1 * 4);
-			break;
-		    case 14:	/* fpsr_when */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) fpsr_when", b0, parm1)
-			tspill[SBREG_FPSR] = (int) parm1;
-			break;
-		    case 15:	/* fpsr_psprel */
-			TRACE_I_DECODE_PROLOGUE_1L("(P7) fpsr_psprel", b0, parm1)
-			newrstate[SBREG_FPSR] = UWX_DISP_PSPREL(parm1 * 4);
-			break;
-		}
-		break;
-
-	    case 7:			/* 1111 xxxx */
-		/* Format P8 */
-		if (b0 == 0xf0) {
-		    b1 = uwx_get_byte(bstream);
-		    if (b1 < 0)
-			return UWX_ERR_BADUDESC;
-		    status = uwx_get_uleb128(bstream, &parm1);
-		    if (status != 0)
-			return UWX_ERR_BADUDESC;
-		    switch (b1) {
-			case 1:		/* rp_sprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) rp_sprel", b0, b1, parm1)
-			    newrstate[SBREG_RP] = UWX_DISP_SPREL(parm1 * 4);
-			    break;
-			case 2:		/* pfs_sprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) pfs_sprel", b0, b1, parm1)
-			    newrstate[SBREG_PFS] = UWX_DISP_SPREL(parm1 * 4);
-			    break;
-			case 3:		/* preds_sprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) preds_sprel", b0, b1, parm1)
-			    newrstate[SBREG_PREDS] = UWX_DISP_SPREL(parm1 * 4);
-			    break;
-			case 4:		/* lc_sprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) lc_sprel", b0, b1, parm1)
-			    newrstate[SBREG_LC] = UWX_DISP_SPREL(parm1 * 4);
-			    break;
-			case 5:		/* unat_sprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) unat_sprel", b0, b1, parm1)
-			    newrstate[SBREG_UNAT] = UWX_DISP_SPREL(parm1 * 4);
-			    break;
-			case 6:		/* fpsr_sprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) fpsr_sprel", b0, b1, parm1)
-			    newrstate[SBREG_FPSR] = UWX_DISP_SPREL(parm1 * 4);
-			    break;
-			case 7:		/* bsp_when */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) bsp_when", b0, b1, parm1)
-			    /* Don't track BSP yet */
-			    return UWX_ERR_CANTUNWIND;
-			    /* break; */
-			case 8:		/* bsp_psprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) bsp_psprel", b0, b1, parm1)
-			    /* Don't track BSP yet */
-			    return UWX_ERR_CANTUNWIND;
-			    /* break; */
-			case 9:		/* bsp_sprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) bsp_sprel", b0, b1, parm1)
-			    /* Don't track BSP yet */
-			    return UWX_ERR_CANTUNWIND;
-			    /* break; */
-			case 10:	/* bspstore_when */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) bspstore_when", b0, b1, parm1)
-			    /* Don't track BSP yet */
-			    return UWX_ERR_CANTUNWIND;
-			    /* break; */
-			case 11:	/* bspstore_psprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) bspstore_psprel", b0, b1, parm1)
-			    /* Don't track BSP yet */
-			    return UWX_ERR_CANTUNWIND;
-			    /* break; */
-			case 12:	/* bspstore_sprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) bspstore_sprel", b0, b1, parm1)
-			    /* Don't track BSP yet */
-			    return UWX_ERR_CANTUNWIND;
-			    /* break; */
-			case 13:	/* rnat_when */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) rnat_when", b0, b1, parm1)
-			    tspill[SBREG_RNAT] = (int) parm1;
-			    break;
-			case 14:	/* rnat_psprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) rnat_psprel", b0, b1, parm1)
-			    newrstate[SBREG_RNAT] = UWX_DISP_PSPREL(parm1 * 4);
-			    break;
-			case 15:	/* rnat_sprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) rnat_sprel", b0, b1, parm1)
-			    newrstate[SBREG_RNAT] = UWX_DISP_SPREL(parm1 * 4);
-			    break;
-			case 16:	/* priunat_when_gr */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) priunat_when_gr", b0, b1, parm1)
-			    tspill[SBREG_PRIUNAT] = (int) parm1;
-			    break;
-			case 17:	/* priunat_psprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) priunat_psprel", b0, b1, parm1)
-			    priunat_mem_rstate = UWX_DISP_PSPREL(parm1 * 4);
-			    break;
-			case 18:	/* priunat_sprel */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) priunat_sprel", b0, b1, parm1)
-			    priunat_mem_rstate = UWX_DISP_SPREL(parm1 * 4);
-			    break;
-			case 19:	/* priunat_when_mem */
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) priunat_when_mem", b0, b1, parm1)
-			    t_priunat_mem = (int) parm1;
-			    break;
-			default:
-			    TRACE_I_DECODE_PROLOGUE_2L("(P8) ??", b0, b1, parm1)
-			    return UWX_ERR_BADUDESC;
-		    }
-		}
-
-		/* Format P9 (gr_gr) */
-		else if (b0 == 0xf1) {
-		    b1 = uwx_get_byte(bstream);
-		    if (b1 < 0)
-			return UWX_ERR_BADUDESC;
-		    b2 = uwx_get_byte(bstream);
-		    if (b2 < 0)
-			return UWX_ERR_BADUDESC;
-		    TRACE_I_DECODE_PROLOGUE_3("(P9) gr_gr", b0, b1, b2)
-		    mask = b1 & 0x0f;
-		    reg = b2 & 0x7f;
-		    gr_gr_mask = mask;
-		    for (i = 0; i < NSB_GR && mask != 0; i++) {
-			if (mask & 0x01) {
-			    newrstate[SBREG_GR + i] =
-					UWX_DISP_REG(UWX_REG_GR(reg));
-			    reg++;
-			}
-			mask = mask >> 1;
-		    }
-		}
-
-		/* Format X1 */
-		else if (b0 == 0xf9) {
-		    TRACE_I_DECODE_PROLOGUE_1("(X1)", b0)
-		    b1 = uwx_get_byte(bstream);
-		    if (b1 < 0)
-			return UWX_ERR_BADUDESC;
-		    /* Don't support X-format descriptors yet */
-		    return UWX_ERR_CANTUNWIND;
-		}
-
-		/* Format X2 */
-		else if (b0 == 0xfa) {
-		    TRACE_I_DECODE_PROLOGUE_1("(X2)", b0)
-		    b1 = uwx_get_byte(bstream);
-		    if (b1 < 0)
-			return UWX_ERR_BADUDESC;
-		    b2 = uwx_get_byte(bstream);
-		    if (b2 < 0)
-			return UWX_ERR_BADUDESC;
-		    /* Don't support X-format descriptors yet */
-		    return UWX_ERR_CANTUNWIND;
-		}
-
-		/* Format X3 */
-		else if (b0 == 0xfb) {
-		    TRACE_I_DECODE_PROLOGUE_1("(X3)", b0)
-		    b1 = uwx_get_byte(bstream);
-		    if (b1 < 0)
-			return UWX_ERR_BADUDESC;
-		    b2 = uwx_get_byte(bstream);
-		    if (b2 < 0)
-			return UWX_ERR_BADUDESC;
-		    /* Don't support X-format descriptors yet */
-		    return UWX_ERR_CANTUNWIND;
-		}
-
-		/* Format X4 */
-		else if (b0 == 0xfc) {
-		    TRACE_I_DECODE_PROLOGUE_1("(X4)", b0)
-		    b1 = uwx_get_byte(bstream);
-		    if (b1 < 0)
-			return UWX_ERR_BADUDESC;
-		    b2 = uwx_get_byte(bstream);
-		    if (b2 < 0)
-			return UWX_ERR_BADUDESC;
-		    b3 = uwx_get_byte(bstream);
-		    if (b3 < 0)
-			return UWX_ERR_BADUDESC;
-		    /* Don't support X-format descriptors yet */
-		    return UWX_ERR_CANTUNWIND;
-		}
-
-		/* Format P10 */
-		else if (b0 == 0xff) {
-		    b1 = uwx_get_byte(bstream);
-		    if (b1 < 0)
-			return UWX_ERR_BADUDESC;
-		    b2 = uwx_get_byte(bstream);
-		    if (b2 < 0)
-			return UWX_ERR_BADUDESC;
-		    TRACE_I_DECODE_PROLOGUE_3("(P10) abi", b0, b1, b2)
-		    env->abi_context = (b1 << 8) | b2;
-		    return UWX_ABI_FRAME;
-		}
-
-		/* Invalid descriptor record */
-		else {
-		    TRACE_I_DECODE_PROLOGUE_1("(?)", b0)
-		    return UWX_ERR_BADUDESC;
-		}
-		break;
-	}
-    }
-
-    /* Process the masks of spilled GRs, FRs, and BRs to */
-    /* determine when and where each register was saved. */
-
-    fr_base = spill_base + 16 * uwx_count_ones(fr_mem_mask);
-    br_base = fr_base + 8 * uwx_count_ones(br_mem_mask);
-    gr_base = br_base + 8 * uwx_count_ones(gr_mem_mask);
-    TRACE_I_DECODE_PROLOGUE_SPILL_BASE(spill_base)
-    TRACE_I_DECODE_PROLOGUE_MASKS(gr_mem_mask, gr_gr_mask)
-    TRACE_I_DECODE_PROLOGUE_NSPILL(ngr)
-    for (i = 0; ngr > 0 && i <= NSB_GR; i++) {
-	if (gr_mem_mask & 1) {
-	    newrstate[SBREG_GR + i] = UWX_DISP_PSPREL(gr_base);
-	    tspill[SBREG_GR + i] = 0;
-	    gr_base -= 8;
-	    ngr--;
-	}
-	else if (gr_gr_mask & 1) {
-	    tspill[SBREG_GR + i] = 0;
-	    ngr--;
-	}
-	gr_gr_mask = gr_gr_mask >> 1;
-	gr_mem_mask = gr_mem_mask >> 1;
-    }
-    for (i = 0; nbr > 0 && i <= NSB_BR; i++) {
-	if (br_mem_mask & 1) {
-	    newrstate[SBREG_BR + i] = UWX_DISP_PSPREL(br_base);
-	    tspill[SBREG_BR + i] = 0;
-	    br_base -= 8;
-	    nbr--;
-	}
-	else if (br_gr_mask & 1) {
-	    tspill[SBREG_BR + i] = 0;
-	    nbr--;
-	}
-	br_gr_mask = br_gr_mask >> 1;
-	br_mem_mask = br_mem_mask >> 1;
-    }
-    for (i = 0; nfr > 0 && i <= NSB_FR; i++) {
-	if (fr_mem_mask & 1) {
-	    newrstate[SBREG_FR + i] = UWX_DISP_PSPREL(fr_base);
-	    tspill[SBREG_FR + i] = 0;
-	    fr_base -= 16;
-	    nfr--;
-	}
-	fr_mem_mask = fr_mem_mask >> 1;
-    }
-
-    /* Update the scoreboard. */
-
-    for (i = 0; i < env->nsbreg; i++) {
-	if (ip_slot >= rhdr->rlen || ip_slot > tspill[i])
-	    scoreboard->rstate[i] = newrstate[i];
-    }
-    if (priunat_mem_rstate != UWX_DISP_NONE && ip_slot > t_priunat_mem)
-	scoreboard->rstate[SBREG_PRIUNAT] = priunat_mem_rstate;
-
-    return UWX_OK;
-}
-
-int uwx_count_ones(unsigned int mask)
-{
-    mask = (mask & 0x55555555) + ((mask & 0xaaaaaaaa) >> 1);
-    mask = (mask & 0x33333333) + ((mask & 0xcccccccc) >> 2);
-    mask = (mask & 0x0f0f0f0f) + ((mask & 0xf0f0f0f0) >> 4);
-    mask = (mask & 0x00ff00ff) + ((mask & 0xff00ff00) >> 8);
-    return (mask & 0x0000ffff) + ((mask & 0xffff0000) >> 16);
-}
-
-/* uwx_decode_body: Decodes a body region */
-
-int uwx_decode_body(
-    struct uwx_env *env,
-    struct uwx_bstream *bstream,
-    struct uwx_scoreboard *scoreboard,
-    struct uwx_rhdr *rhdr,
-    int ip_slot)
-{
-    int status;
-    int b0;
-    int b1;
-    int b2;
-    int b3;
-    int label;
-    int ecount;
-    int i;
-    uint64_t parm1;
-    uint64_t parm2;
-    uint64_t newrstate[NSBREG];
-    int tspill[NSBREG];
-    int t_sp_restore;
-
-    /* Initialize an array of register states from the current */
-    /* scoreboard, along with a parallel array of spill times. */
-    /* We use this as a temporary scoreboard, then update the */
-    /* real scoreboard at the end of the procedure. */
-    /* We initialize the spill time to (rhdr.rlen - 1) so that */
-    /* spills without a "when" descriptor will take effect */
-    /* at the end of the prologue region. */
-    /* (Boundary condition: all actions in a zero-length prologue */
-    /* will appear to have happened in the instruction slot */
-    /* immediately preceding the prologue.) */
-
-    for (i = 0; i < env->nsbreg; i++) {
-	newrstate[i] = scoreboard->rstate[i];
-	tspill[i] = rhdr->rlen - 1;
-    }
-    t_sp_restore = rhdr->rlen - 1;
-
-    /* Read body descriptor records until */
-    /* we hit another region header. */
-
-    for (;;) {
-
-	b0 = uwx_get_byte(bstream);
-
-	if (b0 < 0x80) {
-	    /* Return the last byte read to the byte stream, since it's */
-	    /* really the first byte of the next region header record. */
-	    if (b0 >= 0)
-		(void) uwx_unget_byte(bstream, b0);
-	    break;
-	}
-
-	/* Format B1 (label_state) */
-	if (b0 < 0xa0) {
-	    TRACE_I_DECODE_BODY_1("(B1) label_state", b0)
-	    label = b0 & 0x1f;
-	    status = uwx_label_scoreboard(env, scoreboard, label);
-	    if (status != UWX_OK)
-		return (status);
-	}
-
-	/* Format B1 (copy_state)  */
-	else if (b0 < 0xc0) {
-	    TRACE_I_DECODE_BODY_1("(B1) copy_state", b0)
-	    label = b0 & 0x1f;
-	    status = uwx_copy_scoreboard(env, scoreboard, label);
-	    if (status != UWX_OK)
-		return (status);
-	    for (i = 0; i < env->nsbreg; i++) {
-		newrstate[i] = scoreboard->rstate[i];
-		tspill[i] = rhdr->rlen;
-	    }
-	}
-
-	/* Format B2 (epilogue) */
-	else if (b0 < 0xe0) {
-	    ecount = b0 & 0x1f;
-	    status = uwx_get_uleb128(bstream, &parm1);
-	    if (status != 0)
-		return UWX_ERR_BADUDESC;
-	    TRACE_I_DECODE_BODY_1L("(B2) epilogue", b0, parm1)
-	    rhdr->ecount = ecount + 1;
-	    t_sp_restore = rhdr->rlen - (unsigned int) parm1;
-	}
-
-	/* Format B3 (epilogue) */
-	else if (b0 == 0xe0) {
-	    status = uwx_get_uleb128(bstream, &parm1);
-	    if (status != 0)
-		return UWX_ERR_BADUDESC;
-	    status = uwx_get_uleb128(bstream, &parm2);
-	    if (status != 0)
-		return UWX_ERR_BADUDESC;
-	    TRACE_I_DECODE_BODY_1LL("(B3) epilogue", b0, parm1, parm2)
-	    t_sp_restore = rhdr->rlen - (unsigned int) parm1;
-	    rhdr->ecount = (unsigned int) parm2 + 1;
-	}
-
-	/* Format B4 (label_state) */
-	else if (b0 == 0xf0) {
-	    status = uwx_get_uleb128(bstream, &parm1);
-	    if (status != 0)
-		return UWX_ERR_BADUDESC;
-	    TRACE_I_DECODE_BODY_1L("(B4) label_state", b0, parm1)
-	    label = (int) parm1;
-	    status = uwx_label_scoreboard(env, scoreboard, label);
-	    if (status != UWX_OK)
-		return (status);
-	}
-
-	/* Format B4 (copy_state) */
-	else if (b0 == 0xf8) {
-	    status = uwx_get_uleb128(bstream, &parm1);
-	    if (status != 0)
-		return UWX_ERR_BADUDESC;
-	    TRACE_I_DECODE_BODY_1L("(B4) copy_state", b0, parm1)
-	    label = (int) parm1;
-	    status = uwx_copy_scoreboard(env, scoreboard, label);
-	    if (status != UWX_OK)
-		return (status);
-	    for (i = 0; i < env->nsbreg; i++) {
-		newrstate[i] = scoreboard->rstate[i];
-		tspill[i] = rhdr->rlen;
-	    }
-	}
-
-	/* Format X1 */
-	else if (b0 == 0xf9) {
-	    TRACE_I_DECODE_BODY_1("(X1)", b0)
-	    b1 = uwx_get_byte(bstream);
-	    if (b1 < 0)
-		return UWX_ERR_BADUDESC;
-	    /* Don't support X-format descriptors yet */
-	    return UWX_ERR_CANTUNWIND;
-	}
-
-	/* Format X2 */
-	else if (b0 == 0xfa) {
-	    TRACE_I_DECODE_BODY_1("(X2)", b0)
-	    b1 = uwx_get_byte(bstream);
-	    if (b1 < 0)
-		return UWX_ERR_BADUDESC;
-	    b2 = uwx_get_byte(bstream);
-	    if (b2 < 0)
-		return UWX_ERR_BADUDESC;
-	    /* Don't support X-format descriptors yet */
-	    return UWX_ERR_CANTUNWIND;
-	}
-
-	/* Format X3 */
-	else if (b0 == 0xfb) {
-	    TRACE_I_DECODE_BODY_1("(X3)", b0)
-	    b1 = uwx_get_byte(bstream);
-	    if (b1 < 0)
-		return UWX_ERR_BADUDESC;
-	    b2 = uwx_get_byte(bstream);
-	    if (b2 < 0)
-		return UWX_ERR_BADUDESC;
-	    /* Don't support X-format descriptors yet */
-	    return UWX_ERR_CANTUNWIND;
-	}
-
-	/* Format X4 */
-	else if (b0 == 0xfc) {
-	    TRACE_I_DECODE_BODY_1("(X4)", b0)
-	    b1 = uwx_get_byte(bstream);
-	    if (b1 < 0)
-		return UWX_ERR_BADUDESC;
-	    b2 = uwx_get_byte(bstream);
-	    if (b2 < 0)
-		return UWX_ERR_BADUDESC;
-	    b3 = uwx_get_byte(bstream);
-	    if (b3 < 0)
-		return UWX_ERR_BADUDESC;
-	    /* Don't support X-format descriptors yet */
-	    return UWX_ERR_CANTUNWIND;
-	}
-
-	/* Invalid descriptor record */
-	else {
-	    TRACE_I_DECODE_BODY_1("(?)", b0)
-	    return UWX_ERR_BADUDESC;
-	}
-    }
-
-    /* Update the scoreboard. */
-
-    for (i = 0; i < env->nsbreg; i++) {
-	if (ip_slot > tspill[i])
-	    scoreboard->rstate[i] = newrstate[i];
-    }
-
-    /* If we've passed the point in the epilogue where sp */
-    /* is restored, update the scoreboard entry for PSP */
-    /* and reset any entries for registers saved in memory. */
-
-    if (rhdr->ecount > 0 && ip_slot > t_sp_restore) {
-	scoreboard->rstate[SBREG_PSP] = UWX_DISP_SPPLUS(0);
-	for (i = 0; i < env->nsbreg; i++) {
-	    if (UWX_GET_DISP_CODE(scoreboard->rstate[i]) == UWX_DISP_SPREL(0) ||
-		UWX_GET_DISP_CODE(scoreboard->rstate[i]) == UWX_DISP_PSPREL(0))
-		scoreboard->rstate[i] = UWX_DISP_NONE;
-	}
-    }
-
-    return UWX_OK;
-}
-
diff --git a/sys/contrib/ia64/libuwx/src/uwx_uinfo.h b/sys/contrib/ia64/libuwx/src/uwx_uinfo.h
deleted file mode 100644
index 1bb477c4e9b1..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_uinfo.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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.
-*/
-
-struct uwx_utable_entry;
-
-extern int uwx_decode_uinfo(
-    struct uwx_env *env,
-    struct uwx_utable_entry *uentry,
-    uint64_t **rstatep);
-
-extern int uwx_default_rstate(
-    struct uwx_env *env,
-    uint64_t **rstatep);
-
-/* Region header record */
-
-struct uwx_rhdr {
-    int is_prologue;		/* true if prologue region */
-    unsigned int rlen;		/* length of region (# instruction slots) */
-    int mask;			/* register save mask */
-    int grsave;			/* first gr used for saving */
-    unsigned int ecount;	/* epilogue count (0 = no epilogue) */
-    unsigned int epilogue_t;	/* epilogue "t" value */
-};
-
-struct uwx_bstream;
-
-extern int uwx_decode_rhdr(
-    struct uwx_env *env,
-    struct uwx_bstream *bstream,
-    struct uwx_rhdr *rhdr);
-
-extern int uwx_decode_prologue(
-    struct uwx_env *env,
-    struct uwx_bstream *bstream,
-    struct uwx_scoreboard *scoreboard,
-    struct uwx_rhdr *rhdr,
-    int ip_slot);
-
-extern int uwx_decode_body(
-    struct uwx_env *env,
-    struct uwx_bstream *bstream,
-    struct uwx_scoreboard *scoreboard,
-    struct uwx_rhdr *rhdr,
-    int ip_slot);
diff --git a/sys/contrib/ia64/libuwx/src/uwx_utable.c b/sys/contrib/ia64/libuwx/src/uwx_utable.c
deleted file mode 100644
index 908a3ae64c57..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_utable.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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 "uwx_env.h"
-#include "uwx_utable.h"
-#include "uwx_swap.h"
-#include "uwx_trace.h"
-
-/*
- *  uwx_utable.c
- *
- *  This file contains the routines for searching an unwind table.
- *  The main entry point, uwx_search_utable(), gets the
- *  necessary information from the lookup ip callback's result
- *  vector, determines whether the table is 32-bit or 64-bit,
- *  then invokes the binary search routine for that format.
- */
-
-
-/* Forward declarations */
-
-int uwx_search_utable32(
-    struct uwx_env *env,
-    uint32_t ip,
-    uint32_t text_base,
-    uint32_t unwind_start,
-    uint32_t unwind_end,
-    struct uwx_utable_entry *uentry);
-
-int uwx_search_utable64(
-    struct uwx_env *env,
-    uint64_t ip,
-    uint64_t text_base,
-    uint64_t unwind_start,
-    uint64_t unwind_end,
-    struct uwx_utable_entry *uentry);
-
-
-/* uwx_search_utable: Searches an unwind table for IP in current context */
-
-int uwx_search_utable(
-    struct uwx_env *env,
-    uint64_t ip,
-    uint64_t *uvec,
-    struct uwx_utable_entry *uentry)
-{
-    uint64_t text_base;
-    uint64_t unwind_flags;
-    uint64_t unwind_start;
-    uint64_t unwind_end;
-    int keys;
-    int status;
-
-    /* Get unwind table information from the result vector. */
-    /* Make sure all three required values are given. */
-
-    keys = 0;
-    text_base = 0;
-    unwind_flags = 0;
-    unwind_start = 0;
-    unwind_end = 0;
-    while (*uvec != 0) {
-	switch ((int)*uvec++) {
-	    case UWX_KEY_TBASE:
-		keys |= 1;
-		env->text_base = text_base = *uvec++;
-		break;
-	    case UWX_KEY_UFLAGS:
-		unwind_flags = *uvec++;
-		break;
-	    case UWX_KEY_USTART:
-		keys |= 2;
-		unwind_start = *uvec++;
-		break;
-	    case UWX_KEY_UEND:
-		keys |= 4;
-		unwind_end = *uvec++;
-		break;
-	    case UWX_KEY_GP:
-		uwx_set_reg(env, UWX_REG_GP, *uvec++);
-		break;
-	    default:
-		return UWX_ERR_BADKEY;
-	}
-    }
-    if (keys != 7)
-	return UWX_ERR_BADKEY;
-
-    /* Copy the unwind flags into the unwind entry. */
-    /* (uwx_decode_uinfo needs to know whether it's 32-bit or 64-bit.) */
-
-    uentry->unwind_flags = unwind_flags;
-
-    /* Call the appropriate binary search routine. */
-
-    if (unwind_flags & UNWIND_TBL_32BIT)
-	status = uwx_search_utable32(env,
-			(uint32_t) ip,
-			(uint32_t) text_base,
-			(uint32_t) unwind_start,
-			(uint32_t) unwind_end,
-			uentry);
-    else
-	status = uwx_search_utable64(env,
-			ip, text_base, unwind_start, unwind_end, uentry);
-
-    return status;
-}
-
-
-/* uwx_search_utable32: Binary search of 32-bit unwind table */
-
-#define COPYIN_UINFO_4(dest, src) \
-    (env->remote? \
-	(*env->copyin)(UWX_COPYIN_UINFO, (dest), (src), \
-						WORDSZ, env->cb_token) : \
-	(*(uint32_t *)(dest) = *(uint32_t *)(src), WORDSZ) )
-
-#define SWIZZLE(x) (((uint64_t)((x) & 0xc0000000) << 31) | (x))
-
-int uwx_search_utable32(
-    struct uwx_env *env,
-    uint32_t ip,
-    uint32_t text_base,
-    uint32_t unwind_start,
-    uint32_t unwind_end,
-    struct uwx_utable_entry *uentry)
-{
-    int lb;
-    int ub;
-    int mid;
-    int len;
-    uint32_t code_start;
-    uint32_t code_end;
-    uint32_t unwind_info;
-
-    /* Since the unwind table uses segment-relative offsets, convert */
-    /* the IP in the current context to a segment-relative offset. */
-
-    ip -= text_base;
-
-    TRACE_T_SEARCH32(ip)
-
-    /* Standard binary search. */
-    /* Might modify this to do interpolation in the future. */
-
-    lb = 0;
-    ub = (unwind_end - unwind_start) / (3 * WORDSZ);
-    mid = 0;
-    while (ub > lb) {
-	mid = (lb + ub) / 2;
-	len = COPYIN_UINFO_4((char *)&code_start,
-	    (uintptr_t)(unwind_start+mid*3*WORDSZ));
-	len += COPYIN_UINFO_4((char *)&code_end,
-	    (uintptr_t)(unwind_start+mid*3*WORDSZ+WORDSZ));
-	if (len != 2 * WORDSZ)
-	    return UWX_ERR_COPYIN_UTBL;
-	if (env->byte_swap) {
-	    uwx_swap4(&code_start);
-	    uwx_swap4(&code_end);
-	}
-	TRACE_T_BINSEARCH32(lb, ub, mid, code_start, code_end)
-	if (ip >= code_end)
-	    lb = mid + 1;
-	else if (ip < code_start)
-	    ub = mid;
-	else
-	    break;
-    }
-    if (ub <= lb)
-	return UWX_ERR_NOUENTRY;
-    len = COPYIN_UINFO_4((char *)&unwind_info,
-	(uintptr_t)(unwind_start+mid*3*WORDSZ+2*WORDSZ));
-    if (len != WORDSZ)
-	return UWX_ERR_COPYIN_UTBL;
-    if (env->byte_swap)
-	uwx_swap4(&unwind_info);
-    uentry->ptr_size = WORDSZ;
-    uentry->code_start = SWIZZLE(text_base + code_start);
-    uentry->code_end = SWIZZLE(text_base + code_end);
-    uentry->unwind_info = SWIZZLE(text_base + unwind_info);
-    return UWX_OK;
-}
-
-
-/* uwx_search_utable64: Binary search of 64-bit unwind table */
-
-#define COPYIN_UINFO_8(dest, src) \
-    (env->remote? \
-      (*env->copyin)(UWX_COPYIN_UINFO, (dest), (src), \
-						DWORDSZ, env->cb_token) : \
-      (*(uint64_t *)(intptr_t)(dest) = *(uint64_t *)(intptr_t)(src), DWORDSZ) )
-
-int uwx_search_utable64(
-    struct uwx_env *env,
-    uint64_t ip,
-    uint64_t text_base,
-    uint64_t unwind_start,
-    uint64_t unwind_end,
-    struct uwx_utable_entry *uentry)
-{
-    int lb;
-    int ub;
-    int mid;
-    int len;
-    uint64_t code_start;
-    uint64_t code_end;
-    uint64_t unwind_info;
-
-    /* Since the unwind table uses segment-relative offsets, convert */
-    /* the IP in the current context to a segment-relative offset. */
-
-    ip -= text_base;
-
-    /* Standard binary search. */
-    /* Might modify this to do interpolation in the future. */
-
-    lb = 0;
-    ub = (unwind_end - unwind_start) / (3 * DWORDSZ);
-    mid = 0;
-    while (ub > lb) {
-	mid = (lb + ub) / 2;
-	len = COPYIN_UINFO_8((char *)&code_start, unwind_start+mid*3*DWORDSZ);
-	len += COPYIN_UINFO_8((char *)&code_end,
-				unwind_start+mid*3*DWORDSZ+DWORDSZ);
-	if (len != 2 * DWORDSZ)
-	    return UWX_ERR_COPYIN_UTBL;
-	if (env->byte_swap) {
-	    uwx_swap8(&code_start);
-	    uwx_swap8(&code_end);
-	}
-	if (ip >= code_end)
-	    lb = mid + 1;
-	else if (ip < code_start)
-	    ub = mid;
-	else
-	    break;
-    }
-    if (ub <= lb)
-	return UWX_ERR_NOUENTRY;
-    len = COPYIN_UINFO_8((char *)&unwind_info,
-			unwind_start+mid*3*DWORDSZ+2*DWORDSZ);
-    if (len != DWORDSZ)
-	return UWX_ERR_COPYIN_UTBL;
-    if (env->byte_swap)
-	uwx_swap8(&unwind_info);
-    uentry->ptr_size = DWORDSZ;
-    uentry->code_start = text_base + code_start;
-    uentry->code_end = text_base + code_end;
-    uentry->unwind_info = text_base + unwind_info;
-    return UWX_OK;
-}
diff --git a/sys/contrib/ia64/libuwx/src/uwx_utable.h b/sys/contrib/ia64/libuwx/src/uwx_utable.h
deleted file mode 100644
index 69f1cc7b758b..000000000000
--- a/sys/contrib/ia64/libuwx/src/uwx_utable.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
-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 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.
-*/
-
-struct uwx_utable_entry {
-    uint64_t ptr_size;
-    uint64_t code_start;
-    uint64_t code_end;
-    uint64_t unwind_info;
-    uint64_t unwind_flags;
-};
-
-extern int uwx_search_utable(
-    struct uwx_env *env,
-    uint64_t ip,
-    uint64_t *uvec,
-    struct uwx_utable_entry *uentry);
diff --git a/sys/contrib/ia64/libuwx/test/Makefile b/sys/contrib/ia64/libuwx/test/Makefile
deleted file mode 100644
index 11251d40d830..000000000000
--- a/sys/contrib/ia64/libuwx/test/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-UWXINCDIR = ../include
-UWXLIBDIR = ../lib/ipf32
-
-CFLAGS = -O -I $(UWXINCDIR)
-LDFLAGS = -L $(UWXLIBDIR)
-
-dumpmyself:	dumpmyself.o dump_context.o primeregs.o
-	$(CC) -o dumpmyself $(LDFLAGS) dumpmyself.o dump_context.o primeregs.o -luwx
-
-
-dumpmyself.o:	$(UWXINCDIR)/uwx.h $(UWXINCDIR)/uwx_self.h
-
-dump_context.o:	
-primeregs.o:
diff --git a/sys/contrib/ia64/libuwx/test/dump_context.c b/sys/contrib/ia64/libuwx/test/dump_context.c
deleted file mode 100644
index db46e3d219d2..000000000000
--- a/sys/contrib/ia64/libuwx/test/dump_context.c
+++ /dev/null
@@ -1,100 +0,0 @@
-#include <stdio.h>
-#include <inttypes.h>
-
-#define IP 0
-#define SP 1
-#define BSP 2
-#define CFM 3
-#define RP 4
-#define PSP 5
-#define PFS 6
-#define PREDS 7
-#define PRIUNAT 8
-#define AR_BSPSTORE 9
-#define AR_RNAT 10
-#define AR_UNAT 11
-#define AR_FPSR 12
-#define AR_LC 13
-#define AR_PFS 14
-#define GR4 16
-#define GR5 17
-#define GR6 18
-#define GR7 19
-#define BR1 20
-#define BR2 21
-#define BR3 22
-#define BR4 23
-#define BR5 24
-
-void dump_context(uint64_t *context)
-{
-    int i, j;
-    unsigned int valid;
-    uint64_t val;
-    static char *names[] = {
-	/*  0 */ "ip", "sp", "bsp", "cfm",
-	/*  4 */ "rp", "psp", "pfs", "preds",
-	/*  8 */ "priunat", "ar.bspstore", "ar.rnat", "ar.unat",
-	/* 12 */ "ar.fpsr", "ar.lc", "ar.pfs", "(pad)",
-	/* 16 */ "gr4", "gr5", "gr6", "gr7",
-	/* 20 */ "br1", "br2", "br3", "br4", "br5"
-    };
-    static int col1[] = {
-	IP,
-	SP,
-	BSP,
-	CFM,
-	RP,
-	PSP,
-	PFS,
-	AR_RNAT,
-	AR_UNAT,
-	AR_FPSR,
-	AR_LC,
-	AR_PFS,
-    };
-    static int col2[] = {
-	PREDS,
-	PRIUNAT,
-	GR4,
-	GR5,
-	GR6,
-	GR7,
-	BR1,
-	BR2,
-	BR3,
-	BR4,
-	BR5,
-    };
-
-#define NCOL1 (sizeof(col1)/sizeof(int))
-#define NCOL2 (sizeof(col2)/sizeof(int))
-#define NPRINT (NCOL1 > NCOL2 ? NCOL1 : NCOL2)
-
-    valid = (unsigned int)(context[0] >> 32);
-    printf("  valid_regs (%08lx):", valid);
-    for (i = 0; i <= BR5; i++) {
-	if (valid & 1) printf(" %s", names[i]);
-	valid >>= 1;
-    }
-    printf("\n");
-    for (i = 0; i < NPRINT; i++) {
-	if (i < NCOL1) {
-	    j = col1[i];
-	    val = context[j+1];
-	    printf("  %-8s %08x %08x", names[j],
-			(unsigned int)(val >> 32),
-			(unsigned int)val);
-	}
-	else
-	    printf("                            ");
-	if (i < NCOL2) {
-	    j = col2[i];
-	    val = context[j+1];
-	    printf("      %-8s %08x %08x", names[j],
-			(unsigned int)(val >> 32),
-			(unsigned int)val);
-	}
-	putchar('\n');
-    }
-}
diff --git a/sys/contrib/ia64/libuwx/test/dumpmyself.c b/sys/contrib/ia64/libuwx/test/dumpmyself.c
deleted file mode 100644
index c2b63d076d5f..000000000000
--- a/sys/contrib/ia64/libuwx/test/dumpmyself.c
+++ /dev/null
@@ -1,106 +0,0 @@
-#include "uwx.h"
-#include "uwx_self.h"
-
-struct uwx_env *uenv;
-struct uwx_self_info *cbinfo;
-
-extern int uwx_get_frame_info(struct uwx_env *uenv);
-
-extern void dump_context(uint64_t *context);
-
-extern void prime_registers();
-
-int main(int argc, char **argv)
-{
-    int status;
-    unsigned int *wp;
-    uenv = uwx_init();
-    printf("uwx_init returned %08x\n", uenv);
-    cbinfo = uwx_self_init_info(uenv);
-    status = uwx_register_callbacks(
-		uenv,
-		(intptr_t)cbinfo,
-		uwx_self_copyin,
-		uwx_self_lookupip);
-    printf("uwx_register_callbacks returned %d\n", status);
-    uwx_self_init_context(uenv);
-    printf("In main():\n");
-    dump_context((uint64_t *)uenv);
-    prime_registers();
-    uwx_free(uenv);
-    return 0;
-}
-
-int func1(void)
-{
-    uwx_self_init_context(uenv);
-    printf("In func1():\n");
-    dump_context((uint64_t *)uenv);
-    return func2();
-}
-
-int func2(void)
-{
-    uwx_self_init_context(uenv);
-    printf("In func2():\n");
-    dump_context((uint64_t *)uenv);
-    return func3();
-}
-
-int func3(void)
-{
-    uwx_self_init_context(uenv);
-    printf("In func3():\n");
-    dump_context((uint64_t *)uenv);
-    return func4();
-}
-
-int func4(void)
-{
-    int status;
-    int foo[10];
-    uint64_t *p;
-    uint64_t disp;
-    uint64_t val;
-
-    func5(foo);
-    uwx_self_init_context(uenv);
-    uwx_init_history(uenv);
-    printf("In func4():\n");
-    dump_context((uint64_t *)uenv);
-    for (;;) {
-	status = uwx_step(uenv);
-	if (status != UWX_OK) {
-	    printf("uwx_step returned %d\n", status);
-	    break;
-	}
-	status = uwx_get_reg(uenv, UWX_REG_PFS, &val);
-	if (status != UWX_OK) {
-	    printf("uwx_get_reg returned %d\n", status);
-	    break;
-	}
-	printf("After step:\n");
-	dump_context((uint64_t *)uenv);
-	status = uwx_get_spill_loc(uenv, UWX_REG_IP, &disp);
-	if (status == UWX_OK) {
-	    p = (uint64_t *)(disp & ~0x7LL);
-	    if ((disp & 0x7) == UWX_DISP_RSTK(0))
-		printf("IP spilled to backing store %08x = %08x\n",
-						    (int)p, (int)(*p));
-	    else if ((disp & 0x7) == UWX_DISP_MSTK(0))
-		printf("IP spilled to mem stack %08x = %08x\n",
-						    (int)p, (int)(*p));
-	    else if ((disp & 0x7) == UWX_DISP_REG(0))
-		printf("IP found in register %08x\n", (int)disp >> 4);
-	    else
-		printf("IP history not available\n");
-	}
-    }
-    return 0;
-}
-
-int func5(int *foo)
-{
-    foo[0] = 0;
-    return 0;
-}
diff --git a/sys/contrib/ia64/libuwx/test/primeregs.s b/sys/contrib/ia64/libuwx/test/primeregs.s
deleted file mode 100644
index 12444a21c4d4..000000000000
--- a/sys/contrib/ia64/libuwx/test/primeregs.s
+++ /dev/null
@@ -1,93 +0,0 @@
-	.text
-	.proc	prime_registers
-	.global prime_registers
-
-prime_registers:
-
-	.prologue
-
-	.save ar.pfs, r32
-	alloc	r32 = ar.pfs, 0, 3, 0, 0
-	.save rp, r33
-	mov	r33 = b0
-	.save ar.unat, r34
-	mov	r34 = ar.unat
-	add	r14 = -56, sp
-	add	r15 = -48, sp
-	.fframe 80
-	add	sp = -80, sp
-	mov	r16 = b1
-	;;
-
-	.save.g 0x1
-	st8.spill [r14] = r4, 16
-	.save.g 0x2
-	st8.spill [r15] = r5, 16
-	mov	r17 = b2
-	;;
-	.save.g 0x4
-	st8.spill [r14] = r6, 16
-	.save.g 0x8
-	st8.spill [r15] = r7, 16
-	mov	r18 = b3
-	;;
-	.save.b 0x1
-	st8	[r14] = r16, 16
-	.save.b 0x2
-	st8	[r15] = r17, 16
-	mov	r19 = b4
-	;;
-	.save.b 0x4
-	st8	[r14] = r18, 16
-	.save.b 0x8
-	st8	[r15] = r19
-	mov	r20 = b5
-	;;
-	.save.b 0x10
-	st8	[r14] = r20
-
-	.body
-
-	dep.z	r4 = -0x34, 16, 32
-	;;
-	add	r5 = 1, r4
-	add	r6 = 2, r4
-	;;
-	add	r7 = 3, r4
-	;;
-
-	.global func1
-	.type	func1, @function
-	br.call.sptk b0 = func1
-	;;
-
-	add	r14 = 80, sp
-	add	r15 = 88, sp
-	;;
-	ld8	r20 = [r15], -16
-	;;
-	ld8	r19 = [r14], -16
-	ld8	r18 = [r15], -16
-	mov	b5 = r20
-	;;
-	ld8	r17 = [r14], -16
-	ld8	r16 = [r15], -16
-	mov	b4 = r19
-	;;
-	ld8.fill r7 = [r14], -16
-	ld8.fill r6 = [r15], -16
-	mov	b3 = r18
-	;;
-	ld8.fill r5 = [r14]
-	ld8.fill r4 = [r15]
-	mov	b2 = r17
-	mov	b1 = r16
-
-	.restore sp
-	mov	ar.pfs = r32
-	;;
-	add	sp = 80, sp
-	mov	ar.unat = r34
-	mov	b0 = r33
-	br.ret.sptk	b0
-	.endp
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h
index d0b26af2aa8e..6d744683d467 100644
--- a/sys/contrib/ipfilter/netinet/ip_compat.h
+++ b/sys/contrib/ipfilter/netinet/ip_compat.h
@@ -33,10 +33,6 @@
 #endif
 
 #define	SOLARIS	(defined(sun) && (defined(__svr4__) || defined(__SVR4)))
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \
-    !defined(_KERNEL) && !defined(USE_INET6) && !defined(NOINET6)
-# define	USE_INET6
-#endif
 
 
 #if defined(__SVR4) || defined(__svr4__) || defined(__sgi)
@@ -122,6 +118,10 @@ struct  ether_addr {
 #  if defined(INET6) && !defined(USE_INET6)
 #   define USE_INET6
 #  endif
+# else
+#  if !defined(USE_INET6) && !defined(NOINET6)
+#   define	USE_INET6
+#  endif
 # endif
 
 # if defined(_KERNEL)
diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
index bde63aaab66e..e9e7051d664e 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
@@ -787,7 +787,7 @@ ipf_fastroute(m0, mpp, fin, fdp)
 		dst->sin_addr = fdp->fd_ip;
 
 	dst->sin_len = sizeof(*dst);
-	in_rtalloc(ro, 0);
+	in_rtalloc(ro, M_GETFIB(m0));
 
 	if ((ifp == NULL) && (ro->ro_rt != NULL))
 		ifp = ro->ro_rt->rt_ifp;
diff --git a/sys/crypto/aesni/aesni.c b/sys/crypto/aesni/aesni.c
index 723ccc0ea5a1..7d7a7405e031 100644
--- a/sys/crypto/aesni/aesni.c
+++ b/sys/crypto/aesni/aesni.c
@@ -53,6 +53,10 @@ static int aesni_newsession(device_t, uint32_t *sidp, struct cryptoini *cri);
 static int aesni_freesession(device_t, uint64_t tid);
 static void aesni_freesession_locked(struct aesni_softc *sc,
     struct aesni_session *ses);
+static int aesni_cipher_setup(struct aesni_session *ses,
+    struct cryptoini *encini);
+static int aesni_cipher_process(struct aesni_session *ses,
+    struct cryptodesc *enccrd, struct cryptop *crp);
 
 MALLOC_DEFINE(M_AESNI, "aesni_data", "AESNI Data");
 
@@ -354,3 +358,91 @@ static devclass_t aesni_devclass;
 DRIVER_MODULE(aesni, nexus, aesni_driver, aesni_devclass, 0, 0);
 MODULE_VERSION(aesni, 1);
 MODULE_DEPEND(aesni, crypto, 1, 1, 1);
+
+static int
+aesni_cipher_setup(struct aesni_session *ses, struct cryptoini *encini)
+{
+	struct thread *td;
+	int error;
+
+	td = curthread;
+	error = fpu_kern_enter(td, ses->fpu_ctx, FPU_KERN_NORMAL |
+	    FPU_KERN_KTHR);
+	if (error != 0)
+		return (error);
+	error = aesni_cipher_setup_common(ses, encini->cri_key,
+	    encini->cri_klen);
+	fpu_kern_leave(td, ses->fpu_ctx);
+	return (error);
+}
+
+static int
+aesni_cipher_process(struct aesni_session *ses, struct cryptodesc *enccrd,
+    struct cryptop *crp)
+{
+	struct thread *td;
+	uint8_t *buf;
+	int error, allocated;
+
+	buf = aesni_cipher_alloc(enccrd, crp, &allocated);
+	if (buf == NULL)
+		return (ENOMEM);
+
+	td = curthread;
+	error = fpu_kern_enter(td, ses->fpu_ctx, FPU_KERN_NORMAL |
+	    FPU_KERN_KTHR);
+	if (error != 0)
+		goto out1;
+
+	if ((enccrd->crd_flags & CRD_F_KEY_EXPLICIT) != 0) {
+		error = aesni_cipher_setup_common(ses, enccrd->crd_key,
+		    enccrd->crd_klen);
+		if (error != 0)
+			goto out;
+	}
+
+	if ((enccrd->crd_flags & CRD_F_ENCRYPT) != 0) {
+		if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0)
+			bcopy(enccrd->crd_iv, ses->iv, AES_BLOCK_LEN);
+		if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0)
+			crypto_copyback(crp->crp_flags, crp->crp_buf,
+			    enccrd->crd_inject, AES_BLOCK_LEN, ses->iv);
+		if (ses->algo == CRYPTO_AES_CBC) {
+			aesni_encrypt_cbc(ses->rounds, ses->enc_schedule,
+			    enccrd->crd_len, buf, buf, ses->iv);
+		} else /* if (ses->algo == CRYPTO_AES_XTS) */ {
+			aesni_encrypt_xts(ses->rounds, ses->enc_schedule,
+			    ses->xts_schedule, enccrd->crd_len, buf, buf,
+			    ses->iv);
+		}
+	} else {
+		if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0)
+			bcopy(enccrd->crd_iv, ses->iv, AES_BLOCK_LEN);
+		else
+			crypto_copydata(crp->crp_flags, crp->crp_buf,
+			    enccrd->crd_inject, AES_BLOCK_LEN, ses->iv);
+		if (ses->algo == CRYPTO_AES_CBC) {
+			aesni_decrypt_cbc(ses->rounds, ses->dec_schedule,
+			    enccrd->crd_len, buf, ses->iv);
+		} else /* if (ses->algo == CRYPTO_AES_XTS) */ {
+			aesni_decrypt_xts(ses->rounds, ses->dec_schedule,
+			    ses->xts_schedule, enccrd->crd_len, buf, buf,
+			    ses->iv);
+		}
+	}
+	if (allocated)
+		crypto_copyback(crp->crp_flags, crp->crp_buf, enccrd->crd_skip,
+		    enccrd->crd_len, buf);
+	if ((enccrd->crd_flags & CRD_F_ENCRYPT) != 0)
+		crypto_copydata(crp->crp_flags, crp->crp_buf,
+		    enccrd->crd_skip + enccrd->crd_len - AES_BLOCK_LEN,
+		    AES_BLOCK_LEN, ses->iv);
+out:
+	fpu_kern_leave(td, ses->fpu_ctx);
+out1:
+	if (allocated) {
+		bzero(buf, enccrd->crd_len);
+		free(buf, M_AESNI);
+	}
+	return (error);
+}
diff --git a/sys/crypto/aesni/aesni.h b/sys/crypto/aesni/aesni.h
index 99edd42f1500..ff1d1a2db551 100644
--- a/sys/crypto/aesni/aesni.h
+++ b/sys/crypto/aesni/aesni.h
@@ -96,11 +96,8 @@ 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);
-int aesni_cipher_process(struct aesni_session *ses,
-    struct cryptodesc *enccrd, struct cryptop *crp);
-
+int aesni_cipher_setup_common(struct aesni_session *ses, const uint8_t *key,
+    int keylen);
 uint8_t *aesni_cipher_alloc(struct cryptodesc *enccrd, struct cryptop *crp,
     int *allocated);
 
diff --git a/sys/crypto/aesni/aesni_wrap.c b/sys/crypto/aesni/aesni_wrap.c
index 4f5acf3e5f43..39819a69d1f7 100644
--- a/sys/crypto/aesni/aesni_wrap.c
+++ b/sys/crypto/aesni/aesni_wrap.c
@@ -329,7 +329,7 @@ aesni_decrypt_xts(int rounds, const void *data_schedule,
 	    iv, 0);
 }
 
-static int
+int
 aesni_cipher_setup_common(struct aesni_session *ses, const uint8_t *key,
     int keylen)
 {
@@ -377,102 +377,3 @@ aesni_cipher_setup_common(struct aesni_session *ses, const uint8_t *key,
 
 	return (0);
 }
-
-int
-aesni_cipher_setup(struct aesni_session *ses, struct cryptoini *encini)
-{
-	struct thread *td;
-	int error, saved_ctx;
-
-	td = curthread;
-	if (!is_fpu_kern_thread(0)) {
-		error = fpu_kern_enter(td, ses->fpu_ctx, FPU_KERN_NORMAL);
-		saved_ctx = 1;
-	} else {
-		error = 0;
-		saved_ctx = 0;
-	}
-	if (error == 0) {
-		error = aesni_cipher_setup_common(ses, encini->cri_key,
-		    encini->cri_klen);
-		if (saved_ctx)
-			fpu_kern_leave(td, ses->fpu_ctx);
-	}
-	return (error);
-}
-
-int
-aesni_cipher_process(struct aesni_session *ses, struct cryptodesc *enccrd,
-    struct cryptop *crp)
-{
-	struct thread *td;
-	uint8_t *buf;
-	int error, allocated, saved_ctx;
-
-	buf = aesni_cipher_alloc(enccrd, crp, &allocated);
-	if (buf == NULL)
-		return (ENOMEM);
-
-	td = curthread;
-	if (!is_fpu_kern_thread(0)) {
-		error = fpu_kern_enter(td, ses->fpu_ctx, FPU_KERN_NORMAL);
-		if (error != 0)
-			goto out;
-		saved_ctx = 1;
-	} else {
-		saved_ctx = 0;
-		error = 0;
-	}
-
-	if ((enccrd->crd_flags & CRD_F_KEY_EXPLICIT) != 0) {
-		error = aesni_cipher_setup_common(ses, enccrd->crd_key,
-		    enccrd->crd_klen);
-		if (error != 0)
-			goto out;
-	}
-
-	if ((enccrd->crd_flags & CRD_F_ENCRYPT) != 0) {
-		if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0)
-			bcopy(enccrd->crd_iv, ses->iv, AES_BLOCK_LEN);
-		if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0)
-			crypto_copyback(crp->crp_flags, crp->crp_buf,
-			    enccrd->crd_inject, AES_BLOCK_LEN, ses->iv);
-		if (ses->algo == CRYPTO_AES_CBC) {
-			aesni_encrypt_cbc(ses->rounds, ses->enc_schedule,
-			    enccrd->crd_len, buf, buf, ses->iv);
-		} else /* if (ses->algo == CRYPTO_AES_XTS) */ {
-			aesni_encrypt_xts(ses->rounds, ses->enc_schedule,
-			    ses->xts_schedule, enccrd->crd_len, buf, buf,
-			    ses->iv);
-		}
-	} else {
-		if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0)
-			bcopy(enccrd->crd_iv, ses->iv, AES_BLOCK_LEN);
-		else
-			crypto_copydata(crp->crp_flags, crp->crp_buf,
-			    enccrd->crd_inject, AES_BLOCK_LEN, ses->iv);
-		if (ses->algo == CRYPTO_AES_CBC) {
-			aesni_decrypt_cbc(ses->rounds, ses->dec_schedule,
-			    enccrd->crd_len, buf, ses->iv);
-		} else /* if (ses->algo == CRYPTO_AES_XTS) */ {
-			aesni_decrypt_xts(ses->rounds, ses->dec_schedule,
-			    ses->xts_schedule, enccrd->crd_len, buf, buf,
-			    ses->iv);
-		}
-	}
-	if (saved_ctx)
-		fpu_kern_leave(td, ses->fpu_ctx);
-	if (allocated)
-		crypto_copyback(crp->crp_flags, crp->crp_buf, enccrd->crd_skip,
-		    enccrd->crd_len, buf);
-	if ((enccrd->crd_flags & CRD_F_ENCRYPT) != 0)
-		crypto_copydata(crp->crp_flags, crp->crp_buf,
-		    enccrd->crd_skip + enccrd->crd_len - AES_BLOCK_LEN,
-		    AES_BLOCK_LEN, ses->iv);
- out:
-	if (allocated) {
-		bzero(buf, enccrd->crd_len);
-		free(buf, M_AESNI);
-	}
-	return (error);
-}
diff --git a/sys/crypto/via/padlock.c b/sys/crypto/via/padlock.c
index f601d2a5c4b1..65a7b5dd9fb5 100644
--- a/sys/crypto/via/padlock.c
+++ b/sys/crypto/via/padlock.c
@@ -171,7 +171,7 @@ padlock_newsession(device_t dev, uint32_t *sidp, struct cryptoini *cri)
 	struct padlock_session *ses = NULL;
 	struct cryptoini *encini, *macini;
 	struct thread *td;
-	int error, saved_ctx;
+	int error;
 
 	if (sidp == NULL || cri == NULL)
 		return (EINVAL);
@@ -246,18 +246,11 @@ padlock_newsession(device_t dev, uint32_t *sidp, struct cryptoini *cri)
 
 	if (macini != NULL) {
 		td = curthread;
-		if (!is_fpu_kern_thread(0)) {
-			error = fpu_kern_enter(td, ses->ses_fpu_ctx,
-			    FPU_KERN_NORMAL);
-			saved_ctx = 1;
-		} else {
-			error = 0;
-			saved_ctx = 0;
-		}
+		error = fpu_kern_enter(td, ses->ses_fpu_ctx, FPU_KERN_NORMAL |
+		    FPU_KERN_KTHR);
 		if (error == 0) {
 			error = padlock_hash_setup(ses, macini);
-			if (saved_ctx)
-				fpu_kern_leave(td, ses->ses_fpu_ctx);
+			fpu_kern_leave(td, ses->ses_fpu_ctx);
 		}
 		if (error != 0) {
 			padlock_freesession_one(sc, ses, 0);
diff --git a/sys/crypto/via/padlock_cipher.c b/sys/crypto/via/padlock_cipher.c
index 71702116efa0..0e4beb85dc58 100644
--- a/sys/crypto/via/padlock_cipher.c
+++ b/sys/crypto/via/padlock_cipher.c
@@ -205,7 +205,7 @@ padlock_cipher_process(struct padlock_session *ses, struct cryptodesc *enccrd,
 	struct thread *td;
 	u_char *buf, *abuf;
 	uint32_t *key;
-	int allocated, error, saved_ctx;
+	int allocated, error;
 
 	buf = padlock_cipher_alloc(enccrd, crp, &allocated);
 	if (buf == NULL)
@@ -250,21 +250,13 @@ padlock_cipher_process(struct padlock_session *ses, struct cryptodesc *enccrd,
 	}
 
 	td = curthread;
-	if (!is_fpu_kern_thread(0)) {
-		error = fpu_kern_enter(td, ses->ses_fpu_ctx, FPU_KERN_NORMAL);
-		saved_ctx = 1;
-	} else {
-		error = 0;
-		saved_ctx = 0;
-	}
+	error = fpu_kern_enter(td, ses->ses_fpu_ctx, FPU_KERN_NORMAL |
+	    FPU_KERN_KTHR);
 	if (error != 0)
 		goto out;
-
 	padlock_cbc(abuf, abuf, enccrd->crd_len / AES_BLOCK_LEN, key, cw,
 	    ses->ses_iv);
-
-	if (saved_ctx)
-		fpu_kern_leave(td, ses->ses_fpu_ctx);
+	fpu_kern_leave(td, ses->ses_fpu_ctx);
 
 	if (allocated) {
 		crypto_copyback(crp->crp_flags, crp->crp_buf, enccrd->crd_skip,
diff --git a/sys/crypto/via/padlock_hash.c b/sys/crypto/via/padlock_hash.c
index 924a9ec88869..9dffc40a6824 100644
--- a/sys/crypto/via/padlock_hash.c
+++ b/sys/crypto/via/padlock_hash.c
@@ -366,24 +366,18 @@ padlock_hash_process(struct padlock_session *ses, struct cryptodesc *maccrd,
     struct cryptop *crp)
 {
 	struct thread *td;
-	int error, saved_ctx;
+	int error;
 
 	td = curthread;
-	if (!is_fpu_kern_thread(0)) {
-		error = fpu_kern_enter(td, ses->ses_fpu_ctx, FPU_KERN_NORMAL);
-		saved_ctx = 1;
-	} else {
-		error = 0;
-		saved_ctx = 0;
-	}
+	error = fpu_kern_enter(td, ses->ses_fpu_ctx, FPU_KERN_NORMAL |
+	    FPU_KERN_KTHR);
 	if (error != 0)
 		return (error);
 	if ((maccrd->crd_flags & CRD_F_KEY_EXPLICIT) != 0)
 		padlock_hash_key_setup(ses, maccrd->crd_key, maccrd->crd_klen);
 
 	error = padlock_authcompute(ses, maccrd, crp->crp_buf, crp->crp_flags);
-	if (saved_ctx)
-		fpu_kern_leave(td, ses->ses_fpu_ctx);
+	fpu_kern_leave(td, ses->ses_fpu_ctx);
 	return (error);
 }
 
diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c
index ccf537ed31f6..83e7e63fda8e 100644
--- a/sys/dev/aac/aac_pci.c
+++ b/sys/dev/aac/aac_pci.c
@@ -61,7 +61,6 @@ static int	aac_pci_probe(device_t dev);
 static int	aac_pci_attach(device_t dev);
 
 static int aac_enable_msi = 1;
-TUNABLE_INT("hw.aac.enable_msi", &aac_enable_msi);
 SYSCTL_INT(_hw_aac, OID_AUTO, enable_msi, CTLFLAG_RDTUN, &aac_enable_msi, 0,
     "Enable MSI interrupts");
 
diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c
index e5d3d51d19fe..d49f886c9b8b 100644
--- a/sys/dev/acpica/Osd/OsdSchedule.c
+++ b/sys/dev/acpica/Osd/OsdSchedule.c
@@ -56,7 +56,6 @@ ACPI_MODULE_NAME("SCHEDULE")
  * Allow the user to tune the maximum number of tasks we may enqueue.
  */
 static int acpi_max_tasks = ACPI_MAX_TASKS;
-TUNABLE_INT("debug.acpi.max_tasks", &acpi_max_tasks);
 SYSCTL_INT(_debug_acpi, OID_AUTO, max_tasks, CTLFLAG_RDTUN, &acpi_max_tasks,
     0, "Maximum acpi tasks");
 
@@ -65,7 +64,6 @@ SYSCTL_INT(_debug_acpi, OID_AUTO, max_tasks, CTLFLAG_RDTUN, &acpi_max_tasks,
  * some systems have problems with increased parallelism.
  */
 static int acpi_max_threads = ACPI_MAX_THREADS;
-TUNABLE_INT("debug.acpi.max_threads", &acpi_max_threads);
 SYSCTL_INT(_debug_acpi, OID_AUTO, max_threads, CTLFLAG_RDTUN, &acpi_max_threads,
     0, "Maximum acpi threads");
 
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index a5b65857a74a..b37e252f2138 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -1196,15 +1196,24 @@ acpi_set_resource(device_t dev, device_t child, int type, int rid,
 	return (0);
 
     /*
-     * Ignore memory resources for PCI root bridges.  Some BIOSes
+     * Ignore most resources for PCI root bridges.  Some BIOSes
      * incorrectly enumerate the memory ranges they decode as plain
-     * memory resources instead of as a ResourceProducer range.
+     * memory resources instead of as ResourceProducer ranges.  Other
+     * BIOSes incorrectly list system resource entries for I/O ranges
+     * under the PCI bridge.  Do allow the one known-correct case on
+     * x86 of a PCI bridge claiming the I/O ports used for PCI config
+     * access.
      */
-    if (type == SYS_RES_MEMORY) {
+    if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
 	if (ACPI_SUCCESS(AcpiGetObjectInfo(ad->ad_handle, &devinfo))) {
 	    if ((devinfo->Flags & ACPI_PCI_ROOT_BRIDGE) != 0) {
-		AcpiOsFree(devinfo);
-		return (0);
+#if defined(__i386__) || defined(__amd64__)
+		if (!(type == SYS_RES_IOPORT && start == CONF1_ADDR_PORT))
+#endif
+		{
+		    AcpiOsFree(devinfo);
+		    return (0);
+		}
 	    }
 	    AcpiOsFree(devinfo);
 	}
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
index f95510cf6901..935093548eb6 100644
--- a/sys/dev/acpica/acpi_cpu.c
+++ b/sys/dev/acpica/acpi_cpu.c
@@ -129,11 +129,13 @@ struct acpi_cpu_device {
 
 /* Allow users to ignore processor orders in MADT. */
 static int cpu_unordered;
-TUNABLE_INT("debug.acpi.cpu_unordered", &cpu_unordered);
 SYSCTL_INT(_debug_acpi, OID_AUTO, cpu_unordered, CTLFLAG_RDTUN,
     &cpu_unordered, 0,
     "Do not use the MADT to match ACPI Processor objects to CPUs.");
 
+/* Knob to disable acpi_cpu devices */
+bool acpi_cpu_disabled = false;
+
 /* Platform hardware resource information. */
 static uint32_t		 cpu_smi_cmd;	/* Value to write to SMI_CMD. */
 static uint8_t		 cpu_cst_cnt;	/* Indicate we are _CST aware. */
@@ -221,7 +223,8 @@ acpi_cpu_probe(device_t dev)
     ACPI_OBJECT		   *obj;
     ACPI_STATUS		   status;
 
-    if (acpi_disabled("cpu") || acpi_get_type(dev) != ACPI_TYPE_PROCESSOR)
+    if (acpi_disabled("cpu") || acpi_get_type(dev) != ACPI_TYPE_PROCESSOR ||
+	    acpi_cpu_disabled)
 	return (ENXIO);
 
     handle = acpi_get_handle(dev);
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c
index 6e2f0dd28463..6537e4062b4d 100644
--- a/sys/dev/acpica/acpi_ec.c
+++ b/sys/dev/acpica/acpi_ec.c
@@ -181,16 +181,13 @@ ACPI_SERIAL_DECL(ec, "ACPI embedded controller");
 static SYSCTL_NODE(_debug_acpi, OID_AUTO, ec, CTLFLAG_RD, NULL, "EC debugging");
 
 static int	ec_burst_mode;
-TUNABLE_INT("debug.acpi.ec.burst", &ec_burst_mode);
-SYSCTL_INT(_debug_acpi_ec, OID_AUTO, burst, CTLFLAG_RW, &ec_burst_mode, 0,
+SYSCTL_INT(_debug_acpi_ec, OID_AUTO, burst, CTLFLAG_RWTUN, &ec_burst_mode, 0,
     "Enable use of burst mode (faster for nearly all systems)");
 static int	ec_polled_mode;
-TUNABLE_INT("debug.acpi.ec.polled", &ec_polled_mode);
-SYSCTL_INT(_debug_acpi_ec, OID_AUTO, polled, CTLFLAG_RW, &ec_polled_mode, 0,
+SYSCTL_INT(_debug_acpi_ec, OID_AUTO, polled, CTLFLAG_RWTUN, &ec_polled_mode, 0,
     "Force use of polled mode (only if interrupt mode doesn't work)");
 static int	ec_timeout = EC_TIMEOUT;
-TUNABLE_INT("debug.acpi.ec.timeout", &ec_timeout);
-SYSCTL_INT(_debug_acpi_ec, OID_AUTO, timeout, CTLFLAG_RW, &ec_timeout,
+SYSCTL_INT(_debug_acpi_ec, OID_AUTO, timeout, CTLFLAG_RWTUN, &ec_timeout,
     EC_TIMEOUT, "Total time spent waiting for a response (poll+sleep)");
 
 static ACPI_STATUS
diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c
index 4d600f5a24fb..ae06406d6fbc 100644
--- a/sys/dev/acpica/acpi_hpet.c
+++ b/sys/dev/acpica/acpi_hpet.c
@@ -29,7 +29,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_acpi.h"
-#if defined(__amd64__) || defined(__ia64__)
+#if defined(__amd64__)
 #define	DEV_APIC
 #else
 #include "opt_apic.h"
@@ -113,6 +113,9 @@ static void hpet_test(struct hpet_softc *sc);
 
 static char *hpet_ids[] = { "PNP0103", NULL };
 
+/* Knob to disable acpi_hpet device */
+bool acpi_hpet_disabled = false;
+
 static u_int
 hpet_get_timecount(struct timecounter *tc)
 {
@@ -360,7 +363,7 @@ hpet_probe(device_t dev)
 {
 	ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__);
 
-	if (acpi_disabled("hpet"))
+	if (acpi_disabled("hpet") || acpi_hpet_disabled)
 		return (ENXIO);
 	if (acpi_get_handle(dev) != NULL &&
 	    ACPI_ID_PROBE(device_get_parent(dev), dev, hpet_ids) == NULL)
@@ -555,7 +558,8 @@ hpet_attach(device_t dev)
 			    device_get_parent(device_get_parent(dev)), dev,
 			    &t->irq))) {
 				device_printf(dev,
-				    "Can't allocate interrupt for t%d.\n", j);
+				    "Can't allocate interrupt for t%d: %d\n",
+				    i, j);
 			}
 		}
 #endif
diff --git a/sys/dev/acpica/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c
index aa343a6b197b..765825e0ec25 100644
--- a/sys/dev/acpica/acpi_powerres.c
+++ b/sys/dev/acpica/acpi_powerres.c
@@ -64,7 +64,6 @@ ACPI_MODULE_NAME("POWERRES")
 /* Return values from _STA on a power resource */
 #define ACPI_PWR_OFF	0
 #define ACPI_PWR_ON	1
-#define ACPI_PWR_UNK	(-1)
 
 /* A relationship between a power resource and a consumer. */
 struct acpi_powerreference {
@@ -90,13 +89,12 @@ struct acpi_powerresource {
     ACPI_HANDLE				ap_resource;
     UINT64				ap_systemlevel;
     UINT64				ap_order;
-    int					ap_state;
 };
 
 static TAILQ_HEAD(acpi_powerresource_list, acpi_powerresource)
-	acpi_powerresources;
+    acpi_powerresources = TAILQ_HEAD_INITIALIZER(acpi_powerresources);
 static TAILQ_HEAD(acpi_powerconsumer_list, acpi_powerconsumer)
-	acpi_powerconsumers;
+    acpi_powerconsumers = TAILQ_HEAD_INITIALIZER(acpi_powerconsumers);
 ACPI_SERIAL_DECL(powerres, "ACPI power resources");
 
 static ACPI_STATUS	acpi_pwr_register_consumer(ACPI_HANDLE consumer);
@@ -117,15 +115,6 @@ static struct acpi_powerresource
 static struct acpi_powerconsumer
 			*acpi_pwr_find_consumer(ACPI_HANDLE consumer);
 
-/* Initialise our lists. */    
-static void
-acpi_pwr_init(void *junk)
-{
-    TAILQ_INIT(&acpi_powerresources);
-    TAILQ_INIT(&acpi_powerconsumers);
-}
-SYSINIT(acpi_powerresource, SI_SUB_TUNABLES, SI_ORDER_ANY, acpi_pwr_init, NULL);
-
 /*
  * Register a power resource.
  *
@@ -173,7 +162,6 @@ acpi_pwr_register_resource(ACPI_HANDLE res)
     }
     rp->ap_systemlevel = obj->PowerResource.SystemLevel;
     rp->ap_order = obj->PowerResource.ResourceOrder;
-    rp->ap_state = ACPI_PWR_UNK;
     
     /* Sort the resource into the list */
     status = AE_OK;
@@ -638,22 +626,20 @@ acpi_pwr_switch_power(void)
 	    continue;
 	}
 
-	/* We could cache this if we trusted it not to change under us */
 	status = acpi_GetInteger(rp->ap_resource, "_STA", &cur);
 	if (ACPI_FAILURE(status)) {
 	    ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "can't get status of %s - %d\n",
 			      acpi_name(rp->ap_resource), status));
 	    /* XXX is this correct?  Always switch if in doubt? */
 	    continue;
-	} else if (rp->ap_state == ACPI_PWR_UNK)
-	    rp->ap_state = cur;
+	}
 
 	/*
 	 * Switch if required.  Note that we ignore the result of the switch
 	 * effort; we don't know what to do if it fails, so checking wouldn't
 	 * help much.
 	 */
-	if (rp->ap_state != ACPI_PWR_ON) {
+	if (cur != ACPI_PWR_ON) {
 	    status = AcpiEvaluateObject(rp->ap_resource, "_ON", NULL, NULL);
 	    if (ACPI_FAILURE(status)) {
 		ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS,
@@ -661,7 +647,6 @@ acpi_pwr_switch_power(void)
 				 acpi_name(rp->ap_resource),
 				 AcpiFormatException(status)));
 	    } else {
-		rp->ap_state = ACPI_PWR_ON;
 		ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "switched %s on\n",
 				 acpi_name(rp->ap_resource)));
 	    }
@@ -682,22 +667,20 @@ acpi_pwr_switch_power(void)
 	    continue;
 	}
 
-	/* We could cache this if we trusted it not to change under us */
 	status = acpi_GetInteger(rp->ap_resource, "_STA", &cur);
 	if (ACPI_FAILURE(status)) {
 	    ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "can't get status of %s - %d\n",
 			      acpi_name(rp->ap_resource), status));
 	    /* XXX is this correct?  Always switch if in doubt? */
 	    continue;
-	} else if (rp->ap_state == ACPI_PWR_UNK)
-	    rp->ap_state = cur;
+	}
 
 	/*
 	 * Switch if required.  Note that we ignore the result of the switch
 	 * effort; we don't know what to do if it fails, so checking wouldn't
 	 * help much.
 	 */
-	if (rp->ap_state != ACPI_PWR_OFF) {
+	if (cur != ACPI_PWR_OFF) {
 	    status = AcpiEvaluateObject(rp->ap_resource, "_OFF", NULL, NULL);
 	    if (ACPI_FAILURE(status)) {
 		ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS,
@@ -705,7 +688,6 @@ acpi_pwr_switch_power(void)
 				 acpi_name(rp->ap_resource),
 				 AcpiFormatException(status)));
 	    } else {
-		rp->ap_state = ACPI_PWR_OFF;
 		ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "switched %s off\n",
 				 acpi_name(rp->ap_resource)));
 	    }
diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c
index b974f1f15bcf..03ef6861eb41 100644
--- a/sys/dev/acpica/acpi_timer.c
+++ b/sys/dev/acpica/acpi_timer.c
@@ -65,6 +65,9 @@ static eventhandler_tag		acpi_timer_eh;
 
 static u_int	acpi_timer_frequency = 14318182 / 4;
 
+/* Knob to disable acpi_timer device */
+bool acpi_timer_disabled = false;
+
 static void	acpi_timer_identify(driver_t *driver, device_t parent);
 static int	acpi_timer_probe(device_t dev);
 static int	acpi_timer_attach(device_t dev);
@@ -125,7 +128,7 @@ acpi_timer_identify(driver_t *driver, device_t parent)
     ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     if (acpi_disabled("timer") || (acpi_quirks & ACPI_Q_TIMER) ||
-	acpi_timer_dev)
+	acpi_timer_dev || acpi_timer_disabled)
 	return_VOID;
 
     if ((dev = BUS_ADD_CHILD(parent, 2, "acpi_timer", 0)) == NULL) {
diff --git a/sys/dev/adb/adb_buttons.c b/sys/dev/adb/adb_buttons.c
index 92cdda169bae..b311b28daec0 100644
--- a/sys/dev/adb/adb_buttons.c
+++ b/sys/dev/adb/adb_buttons.c
@@ -118,37 +118,32 @@ abtn_receive_packet(device_t dev, u_char status,
 
 	switch (cmd) {
 	case 0x0a:	/* decrease brightness */
-		if (devctl_process_running())
-			devctl_notify("PMU", "keys", "brightness",
-			    "notify=down");
+		devctl_notify("PMU", "keys", "brightness",
+		    "notify=down");
 		break;
 
 	case 0x09:	/* increase brightness */
-		if (devctl_process_running())
-			devctl_notify("PMU", "keys", "brightness", "notify=up");
+		devctl_notify("PMU", "keys", "brightness", "notify=up");
 		break;
 
 	case 0x08:	/* mute */
 	case 0x01:	/* mute, AV hardware */
-		if (devctl_process_running())
-			devctl_notify("PMU", "keys", "mute", NULL);
+		devctl_notify("PMU", "keys", "mute", NULL);
 		break;
 	case 0x07:	/* decrease volume */
 	case 0x02:	/* decrease volume, AV hardware */
-		if (devctl_process_running())
-			devctl_notify("PMU", "keys", "volume", "notify=down");
+		devctl_notify("PMU", "keys", "volume", "notify=down");
 		break;
 	case 0x06:	/* increase volume */
 	case 0x03:	/* increase volume, AV hardware */
-		if (devctl_process_running())
-			devctl_notify("PMU", "keys", "volume", "notify=up");
+		devctl_notify("PMU", "keys", "volume", "notify=up");
 		break;
 	case 0x0c:	/* mirror display key */
 		/* Need callback to do something with this */
 		break;
 	case 0x0b:	/* eject tray */
-		if (devctl_process_running())
-			devctl_notify("PMU", "keys", "eject", NULL);
+		devctl_notify("PMU", "keys", "eject", NULL);
+		break;
 	case 0x7f:	/* numlock */
 		/* Need callback to do something with this */
 		break;
diff --git a/sys/dev/adb/adb_kbd.c b/sys/dev/adb/adb_kbd.c
index 76d4e882b139..2fe760932039 100644
--- a/sys/dev/adb/adb_kbd.c
+++ b/sys/dev/adb/adb_kbd.c
@@ -424,7 +424,7 @@ adb_kbd_receive_packet(device_t dev, u_char status,
 
 	mtx_lock(&sc->sc_mutex);
 		/* 0x7f is always the power button */
-		if (data[0] == 0x7f && devctl_process_running()) {
+		if (data[0] == 0x7f) {
 			devctl_notify("PMU", "Button", "pressed", NULL);
 			mtx_unlock(&sc->sc_mutex);
 			return (0);
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c
index 597094399f2d..9eed7740aa16 100644
--- a/sys/dev/agp/agp.c
+++ b/sys/dev/agp/agp.c
@@ -629,7 +629,7 @@ agp_generic_bind_memory(device_t dev, struct agp_memory *mem,
 		if (k >= i)
 			vm_page_xunbusy(m);
 		vm_page_lock(m);
-		vm_page_unwire(m, 0);
+		vm_page_unwire(m, PQ_INACTIVE);
 		vm_page_unlock(m);
 	}
 	VM_OBJECT_WUNLOCK(mem->am_obj);
@@ -663,7 +663,7 @@ agp_generic_unbind_memory(device_t dev, struct agp_memory *mem)
 	for (i = 0; i < mem->am_size; i += PAGE_SIZE) {
 		m = vm_page_lookup(mem->am_obj, atop(i));
 		vm_page_lock(m);
-		vm_page_unwire(m, 0);
+		vm_page_unwire(m, PQ_INACTIVE);
 		vm_page_unlock(m);
 	}
 	VM_OBJECT_WUNLOCK(mem->am_obj);
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index 725aa992903f..dbf34e326583 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -2009,7 +2009,7 @@ agp_i810_free_memory(device_t dev, struct agp_memory *mem)
 			VM_OBJECT_WLOCK(mem->am_obj);
 			m = vm_page_lookup(mem->am_obj, 0);
 			vm_page_lock(m);
-			vm_page_unwire(m, 0);
+			vm_page_unwire(m, PQ_INACTIVE);
 			vm_page_unlock(m);
 			VM_OBJECT_WUNLOCK(mem->am_obj);
 		} else {
diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c
index df504c0f49a7..0691b77489fd 100644
--- a/sys/dev/ahci/ahci.c
+++ b/sys/dev/ahci/ahci.c
@@ -1394,14 +1394,12 @@ ahci_dmafini(device_t dev)
 		bus_dmamap_unload(ch->dma.rfis_tag, ch->dma.rfis_map);
 		bus_dmamem_free(ch->dma.rfis_tag, ch->dma.rfis, ch->dma.rfis_map);
 		ch->dma.rfis_bus = 0;
-		ch->dma.rfis_map = NULL;
 		ch->dma.rfis = NULL;
 	}
 	if (ch->dma.work_bus) {
 		bus_dmamap_unload(ch->dma.work_tag, ch->dma.work_map);
 		bus_dmamem_free(ch->dma.work_tag, ch->dma.work, ch->dma.work_map);
 		ch->dma.work_bus = 0;
-		ch->dma.work_map = NULL;
 		ch->dma.work = NULL;
 	}
 	if (ch->dma.work_tag) {
diff --git a/sys/dev/aic7xxx/aic79xx_pci.c b/sys/dev/aic7xxx/aic79xx_pci.c
index 2f02cc678352..cb2dbc31b42b 100644
--- a/sys/dev/aic7xxx/aic79xx_pci.c
+++ b/sys/dev/aic7xxx/aic79xx_pci.c
@@ -320,14 +320,12 @@ ahd_find_pci_device(aic_dev_softc_t pci)
 int
 ahd_pci_config(struct ahd_softc *ahd, struct ahd_pci_identity *entry)
 {
-	struct scb_data *shared_scb_data;
 	u_int		 command;
 	uint32_t	 devconfig;
 	uint16_t	 device; 
 	uint16_t	 subvendor; 
 	int		 error;
 
-	shared_scb_data = NULL;
 	ahd->description = entry->name;
 	/*
 	 * Record if this is a HostRAID board.
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 03a69858d053..faa92d07e436 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -563,7 +563,7 @@ amr_linux_ioctl_int(struct cdev *dev, u_long cmd, caddr_t addr, int32_t flag,
     struct amr_linux_ioctl	ali;
     void			*dp, *temp;
     int				error;
-    int				adapter, len, ac_flags = 0;
+    int				len, ac_flags = 0;
     int				logical_drives_changed = 0;
     u_int32_t			linux_version = 0x02100000;
     u_int8_t			status;
@@ -606,8 +606,6 @@ amr_linux_ioctl_int(struct cdev *dev, u_long cmd, caddr_t addr, int32_t flag,
 	else
 	    len = ali.ui.fcs.length;
 
-	adapter = (ali.ui.fcs.adapno) ^ 'm' << 8;
-
 	mb = (void *)&ali.mbox[0];
 
 	if ((ali.mbox[0] == FC_DEL_LOGDRV  && ali.mbox[2] == OP_DEL_LOGDRV) ||	/* delete */
@@ -761,7 +759,7 @@ amr_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int32_t flag, struct threa
     void			*dp, *au_buffer;
     unsigned long		au_length, real_length;
     unsigned char		*au_cmd;
-    int				*au_statusp, au_direction;
+    int				*au_statusp;
     int				error;
     struct amr_passthrough	*ap;	/* 60 bytes */
     int				logical_drives_changed = 0;
@@ -793,7 +791,6 @@ amr_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int32_t flag, struct threa
 	au_cmd = arg.au32->au_cmd;
 	au_buffer = (void *)(u_int64_t)arg.au32->au_buffer;
 	au_length = arg.au32->au_length;
-	au_direction = arg.au32->au_direction;
 	au_statusp = &arg.au32->au_status;
 	break;
 #endif
@@ -803,7 +800,6 @@ amr_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int32_t flag, struct threa
 	au_cmd = arg.au->au_cmd;
 	au_buffer = (void *)arg.au->au_buffer;
 	au_length = arg.au->au_length;
-	au_direction = arg.au->au_direction;
 	au_statusp = &arg.au->au_status;
 	break;
 
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index 2f11f501284b..9346e8c5090b 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -92,7 +92,6 @@ static int		amr_setup_mbox(struct amr_softc *sc);
 static int		amr_ccb_map(struct amr_softc *sc);
 
 static u_int amr_force_sg32 = 0;
-TUNABLE_INT("hw.amr.force_sg32", &amr_force_sg32);
 SYSCTL_DECL(_hw_amr);
 SYSCTL_UINT(_hw_amr, OID_AUTO, force_sg32, CTLFLAG_RDTUN, &amr_force_sg32, 0,
     "Force the AMR driver to use 32bit scatter gather");
@@ -477,20 +476,25 @@ amr_pci_free(struct amr_softc *sc)
 	bus_dma_tag_destroy(sc->amr_buffer64_dmat);
 
     /* free and destroy DMA memory and tag for passthrough pool */
-    if (sc->amr_ccb)
+    if (sc->amr_ccb) {
+	bus_dmamap_unload(sc->amr_ccb_dmat, sc->amr_ccb_dmamap);
 	bus_dmamem_free(sc->amr_ccb_dmat, sc->amr_ccb, sc->amr_ccb_dmamap);
+    }
     if (sc->amr_ccb_dmat)
 	bus_dma_tag_destroy(sc->amr_ccb_dmat);
 
     /* free and destroy DMA memory and tag for s/g lists */
-    if (sc->amr_sgtable)
+    if (sc->amr_sgtable) {
+	bus_dmamap_unload(sc->amr_sg_dmat, sc->amr_sg_dmamap);
 	bus_dmamem_free(sc->amr_sg_dmat, sc->amr_sgtable, sc->amr_sg_dmamap);
+    }
     if (sc->amr_sg_dmat)
 	bus_dma_tag_destroy(sc->amr_sg_dmat);
 
     /* free and destroy DMA memory and tag for mailbox */
     p = (void *)(uintptr_t)(volatile void *)sc->amr_mailbox64;
     if (sc->amr_mailbox) {
+	bus_dmamap_unload(sc->amr_mailbox_dmat, sc->amr_mailbox_dmamap);
 	bus_dmamem_free(sc->amr_mailbox_dmat, p, sc->amr_mailbox_dmamap);
     }
     if (sc->amr_mailbox_dmat)
diff --git a/sys/dev/amr/amrio.h b/sys/dev/amr/amrio.h
index bc06a863268d..9c81d2d9f268 100644
--- a/sys/dev/amr/amrio.h
+++ b/sys/dev/amr/amrio.h
@@ -108,7 +108,7 @@ struct amr_user_ioctl {
 
 #define AMR_IO_COMMAND	_IOWR('A', 0x201, struct amr_user_ioctl)
 
-#if defined(__amd64__) || defined(__ia64__)
+#if defined(__amd64__)
 
 struct amr_user_ioctl32 {
     unsigned char	au_cmd[32];	/* command text from userspace */
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index e9c0ed53c498..7067520a8398 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -270,9 +270,7 @@ SYSCTL_PROC(_hw_an, OID_AUTO, an_dump, CTLTYPE_STRING | CTLFLAG_RW,
 static int
 sysctl_an_cache_mode(SYSCTL_HANDLER_ARGS)
 {
-	int	error, last;
-
-	last = an_cache_mode;
+	int	error;
 
 	switch (an_cache_mode) {
 	case 1:
diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c
index bc4c4e9b841f..099e7f17a988 100644
--- a/sys/dev/asmc/asmc.c
+++ b/sys/dev/asmc/asmc.c
@@ -206,6 +206,15 @@ struct asmc_model asmc_models[] = {
 	  ASMC_MM_TEMPS, ASMC_MM_TEMPNAMES, ASMC_MM_TEMPDESCS
 	},
 
+	/* The Mac Mini 3,1 has no SMS */
+	{ 
+	  "Macmini3,1", "Apple SMC Mac Mini 3,1",
+	  NULL, NULL, NULL,
+	  ASMC_FAN_FUNCS,
+	  NULL, NULL, NULL,
+	  ASMC_MM31_TEMPS, ASMC_MM31_TEMPNAMES, ASMC_MM31_TEMPDESCS
+	},
+
 	/* Idem for the MacPro */
 	{
 	  "MacPro2", "Apple SMC Mac Pro (8-core)",
diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h
index 11156d712b01..67e7f3b1ded2 100644
--- a/sys/dev/asmc/asmcvar.h
+++ b/sys/dev/asmc/asmcvar.h
@@ -180,6 +180,25 @@ struct asmc_softc {
 #define ASMC_MM_TEMPDESCS	{ "Northbridge Point 1", \
 				  "Northbridge Point 2" }
 
+#define ASMC_MM31_TEMPS		{ "TC0D", "TC0H", \
+				  "TC0P", "TH0P", \
+				  "TN0D", "TN0P", \
+				  "TW0P", NULL }
+
+#define ASMC_MM31_TEMPNAMES	{ "cpu0_die", "cpu0_heatsink", \
+				  "cpu0_proximity", "hdd_bay", \
+				  "northbridge_die", \
+				  "northbridge_proximity", \
+				  "wireless_module", }
+
+#define ASMC_MM31_TEMPDESCS	{ "CPU0 Die Core Temperature", \
+				  "CPU0 Heatsink Temperature", \
+				  "CPU0 Proximity Temperature", \
+				  "HDD Bay Temperature", \
+				  "Northbridge Die Core Temperature", \
+				  "Northbridge Proximity Temperature", \
+				  "Wireless Module Temperature", }
+
 #define ASMC_MP_TEMPS		{ "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \
 				  "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \
 				  "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index b45c868d63f7..579a2c5e6f7a 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -80,9 +80,8 @@ int ata_dma_check_80pin = 1;
 
 /* sysctl vars */
 static SYSCTL_NODE(_hw, OID_AUTO, ata, CTLFLAG_RD, 0, "ATA driver parameters");
-TUNABLE_INT("hw.ata.ata_dma_check_80pin", &ata_dma_check_80pin);
 SYSCTL_INT(_hw_ata, OID_AUTO, ata_dma_check_80pin,
-	   CTLFLAG_RW, &ata_dma_check_80pin, 1,
+	   CTLFLAG_RWTUN, &ata_dma_check_80pin, 0,
 	   "Check for 80pin cable before setting ATA DMA mode");
 FEATURE(ata_cam, "ATA devices are accessed through the cam(4) driver");
 
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index ee41c6055d9e..56332a19dd6a 100644
--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@@ -132,7 +132,6 @@ ata_dmafini(device_t dev)
 	bus_dmamap_unload(ch->dma.work_tag, ch->dma.work_map);
 	bus_dmamem_free(ch->dma.work_tag, ch->dma.work, ch->dma.work_map);
 	ch->dma.work_bus = 0;
-	ch->dma.work_map = NULL;
 	ch->dma.work = NULL;
     }
     if (ch->dma.work_tag) {
diff --git a/sys/dev/ata/chipsets/ata-ati.c b/sys/dev/ata/chipsets/ata-ati.c
index e8e02371be64..475bee56f6b9 100644
--- a/sys/dev/ata/chipsets/ata-ati.c
+++ b/sys/dev/ata/chipsets/ata-ati.c
@@ -98,7 +98,7 @@ ata_ati_probe(device_t dev)
      { ATA_AMD_HUDSON2_S5,  0x00, ATI_AHCI, 0, ATA_SA300, "Hudson-2" },
      { 0, 0, 0, 0, 0, 0}};
 
-    if (pci_get_vendor(dev) != ATA_ATI_ID)
+    if (pci_get_vendor(dev) != ATA_AMD_ID && pci_get_vendor(dev) != ATA_ATI_ID)
 	return ENXIO;
 
     if (!(ctlr->chip = ata_match_chip(dev, ids)))
diff --git a/sys/dev/ata/chipsets/ata-promise.c b/sys/dev/ata/chipsets/ata-promise.c
index 62f25bd28052..fbcd16c6cb1f 100644
--- a/sys/dev/ata/chipsets/ata-promise.c
+++ b/sys/dev/ata/chipsets/ata-promise.c
@@ -957,9 +957,9 @@ ata_promise_mio_softreset(device_t dev, int port)
 
     /* wait for BUSY to go inactive */
     for (timeout = 0; timeout < 100; timeout++) {
-	u_int8_t err, stat;
+	u_int8_t /* err, */ stat;
 
-	err = ATA_IDX_INB(ch, ATA_ERROR);
+	/* err = */ ATA_IDX_INB(ch, ATA_ERROR);
 	stat = ATA_IDX_INB(ch, ATA_STATUS);
 
 	//if (stat == err && timeout > (stat & ATA_S_BUSY ? 100 : 10))
diff --git a/sys/dev/ath/ah_osdep.c b/sys/dev/ath/ah_osdep.c
index 8e9edd139be4..fe4a657c98c8 100644
--- a/sys/dev/ath/ah_osdep.c
+++ b/sys/dev/ath/ah_osdep.c
@@ -96,9 +96,8 @@ static SYSCTL_NODE(_hw_ath, OID_AUTO, hal, CTLFLAG_RD, 0,
 
 #ifdef AH_DEBUG
 int ath_hal_debug = 0;
-SYSCTL_INT(_hw_ath_hal, OID_AUTO, debug, CTLFLAG_RW, &ath_hal_debug,
+SYSCTL_INT(_hw_ath_hal, OID_AUTO, debug, CTLFLAG_RWTUN, &ath_hal_debug,
     0, "Atheros HAL debugging printfs");
-TUNABLE_INT("hw.ath.hal.debug", &ath_hal_debug);
 #endif /* AH_DEBUG */
 
 static MALLOC_DEFINE(M_ATH_HAL, "ath_hal", "ath hal data");
diff --git a/sys/dev/ath/ath_hal/ah.c b/sys/dev/ath/ath_hal/ah.c
index bbfc09b84f3f..750248e1e0a1 100644
--- a/sys/dev/ath/ath_hal/ah.c
+++ b/sys/dev/ath/ath_hal/ah.c
@@ -850,10 +850,11 @@ ath_hal_getregdump(struct ath_hal *ah, const HAL_REGRANGE *regs,
 	int i;
 
 	for (i = 0; space >= 2*sizeof(uint32_t); i++) {
-		u_int r = regs[i].start;
-		u_int e = regs[i].end;
-		*dp++ = (r<<16) | e;
-		space -= sizeof(uint32_t);
+		uint32_t r = regs[i].start;
+		uint32_t e = regs[i].end;
+		*dp++ = r;
+		*dp++ = e;
+		space -= 2*sizeof(uint32_t);
 		do {
 			*dp++ = OS_REG_READ(ah, r);
 			r += sizeof(uint32_t);
diff --git a/sys/dev/ath/ath_hal/ah_decode.h b/sys/dev/ath/ath_hal/ah_decode.h
index 07c4ac73d41b..3aca9750448c 100644
--- a/sys/dev/ath/ath_hal/ah_decode.h
+++ b/sys/dev/ath/ath_hal/ah_decode.h
@@ -53,6 +53,8 @@ enum {
 	AH_MARK_ANI_POLL,		/* ar*AniReset, listen time */
 	AH_MARK_ANI_CONTROL,		/* ar*AniReset, cmd */
 	AH_MARK_RX_CTL,			/* RX DMA control */
+	AH_MARK_CHIP_POWER,		/* chip power control, mode */
+	AH_MARK_CHIP_POWER_DONE,	/* chip power control done, status */
 };
 
 enum {
@@ -61,6 +63,7 @@ enum {
 	AH_MARK_RX_CTL_DMA_START,
 	AH_MARK_RX_CTL_DMA_STOP,
 	AH_MARK_RX_CTL_DMA_STOP_ERR,
+	AH_MARK_RX_CTL_DMA_STOP_OK,
 };
 
 #endif /* _ATH_AH_DECODE_H_ */
diff --git a/sys/dev/ath/ath_hal/ah_internal.h b/sys/dev/ath/ath_hal/ah_internal.h
index 9e3c83b3098d..2e35148636b4 100644
--- a/sys/dev/ath/ath_hal/ah_internal.h
+++ b/sys/dev/ath/ath_hal/ah_internal.h
@@ -50,8 +50,8 @@
 #endif
 
 typedef struct {
-	uint16_t	start;		/* first register */
-	uint16_t	end;		/* ending register or zero */
+	uint32_t	start;		/* first register */
+	uint32_t	end;		/* ending register or zero */
 } HAL_REGRANGE;
 
 typedef struct {
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index a3ab2f61dbfa..3d26bafadd59 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -240,17 +240,14 @@ SYSCTL_INT(_hw_ath, OID_AUTO, anical, CTLFLAG_RW, &ath_anicalinterval,
 	    0, "ANI calibration (msecs)");
 
 int ath_rxbuf = ATH_RXBUF;		/* # rx buffers to allocate */
-SYSCTL_INT(_hw_ath, OID_AUTO, rxbuf, CTLFLAG_RW, &ath_rxbuf,
+SYSCTL_INT(_hw_ath, OID_AUTO, rxbuf, CTLFLAG_RWTUN, &ath_rxbuf,
 	    0, "rx buffers allocated");
-TUNABLE_INT("hw.ath.rxbuf", &ath_rxbuf);
 int ath_txbuf = ATH_TXBUF;		/* # tx buffers to allocate */
-SYSCTL_INT(_hw_ath, OID_AUTO, txbuf, CTLFLAG_RW, &ath_txbuf,
+SYSCTL_INT(_hw_ath, OID_AUTO, txbuf, CTLFLAG_RWTUN, &ath_txbuf,
 	    0, "tx buffers allocated");
-TUNABLE_INT("hw.ath.txbuf", &ath_txbuf);
 int ath_txbuf_mgmt = ATH_MGMT_TXBUF;	/* # mgmt tx buffers to allocate */
-SYSCTL_INT(_hw_ath, OID_AUTO, txbuf_mgmt, CTLFLAG_RW, &ath_txbuf_mgmt,
+SYSCTL_INT(_hw_ath, OID_AUTO, txbuf_mgmt, CTLFLAG_RWTUN, &ath_txbuf_mgmt,
 	    0, "tx (mgmt) buffers allocated");
-TUNABLE_INT("hw.ath.txbuf_mgmt", &ath_txbuf_mgmt);
 
 int ath_bstuck_threshold = 4;		/* max missed beacons */
 SYSCTL_INT(_hw_ath, OID_AUTO, bstuck, CTLFLAG_RW, &ath_bstuck_threshold,
@@ -4430,14 +4427,12 @@ ath_tx_process_buf_completion(struct ath_softc *sc, struct ath_txq *txq,
     struct ath_tx_status *ts, struct ath_buf *bf)
 {
 	struct ieee80211_node *ni = bf->bf_node;
-	struct ath_node *an = NULL;
 
 	ATH_TX_UNLOCK_ASSERT(sc);
 	ATH_TXQ_UNLOCK_ASSERT(txq);
 
 	/* If unicast frame, update general statistics */
 	if (ni != NULL) {
-		an = ATH_NODE(ni);
 		/* update statistics */
 		ath_tx_update_stats(sc, ts, bf);
 	}
diff --git a/sys/dev/ath/if_ath_ahb.c b/sys/dev/ath/if_ath_ahb.c
index 362257fd679a..4511ae446fa5 100644
--- a/sys/dev/ath/if_ath_ahb.c
+++ b/sys/dev/ath/if_ath_ahb.c
@@ -164,8 +164,7 @@ ath_ahb_attach(device_t dev)
 		goto bad0;
 	}
 
-	/* XXX uintptr_t is a bandaid for ia64; to be fixed */
-	sc->sc_st = (HAL_BUS_TAG)(uintptr_t) rman_get_bustag(psc->sc_sr);
+	sc->sc_st = (HAL_BUS_TAG) rman_get_bustag(psc->sc_sr);
 	sc->sc_sh = (HAL_BUS_HANDLE) rman_get_bushandle(psc->sc_sr);
 	/*
 	 * Mark device invalid so any interrupts (shared or otherwise)
diff --git a/sys/dev/ath/if_ath_debug.c b/sys/dev/ath/if_ath_debug.c
index e3c73f561b8b..d21ad6fea6f0 100644
--- a/sys/dev/ath/if_ath_debug.c
+++ b/sys/dev/ath/if_ath_debug.c
@@ -92,9 +92,8 @@ __FBSDID("$FreeBSD$");
 uint64_t ath_debug = 0;
 
 SYSCTL_DECL(_hw_ath);
-SYSCTL_QUAD(_hw_ath, OID_AUTO, debug, CTLFLAG_RW, &ath_debug,
+SYSCTL_QUAD(_hw_ath, OID_AUTO, debug, CTLFLAG_RWTUN, &ath_debug,
 	    0, "control debugging printfs");
-TUNABLE_QUAD("hw.ath.debug", &ath_debug);
 
 void
 ath_printrxbuf(struct ath_softc *sc, const struct ath_buf *bf,
diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c
index 0b1153cdd7c1..dbbc411cdeaf 100644
--- a/sys/dev/ath/if_ath_pci.c
+++ b/sys/dev/ath/if_ath_pci.c
@@ -173,8 +173,7 @@ ath_pci_attach(device_t dev)
 		device_printf(dev, "cannot map register space\n");
 		goto bad;
 	}
-	/* XXX uintptr_t is a bandaid for ia64; to be fixed */
-	sc->sc_st = (HAL_BUS_TAG)(uintptr_t) rman_get_bustag(psc->sc_sr);
+	sc->sc_st = (HAL_BUS_TAG) rman_get_bustag(psc->sc_sr);
 	sc->sc_sh = (HAL_BUS_HANDLE) rman_get_bushandle(psc->sc_sr);
 	/*
 	 * Mark device invalid so any interrupts (shared or otherwise)
diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c
index 460626c7cbae..9368dbeb1018 100644
--- a/sys/dev/atkbdc/atkbdc.c
+++ b/sys/dev/atkbdc/atkbdc.c
@@ -176,8 +176,6 @@ atkbdc_configure(void)
 	/* XXX: tag should be passed from the caller */
 #if defined(__amd64__) || defined(__i386__)
 	tag = X86_BUS_SPACE_IO;
-#elif defined(__ia64__)
-	tag = IA64_BUS_SPACE_IO;
 #elif defined(__sparc64__)
 	tag = &atkbdc_bst_store[0];
 #else
diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c
index c888b499b19f..dfb1dc4a5249 100644
--- a/sys/dev/bce/if_bce.c
+++ b/sys/dev/bce/if_bce.c
@@ -535,44 +535,37 @@ static SYSCTL_NODE(_hw, OID_AUTO, bce, CTLFLAG_RD, 0, "bce driver parameters");
 
 /* Allowable values are TRUE or FALSE */
 static int bce_verbose = TRUE;
-TUNABLE_INT("hw.bce.verbose", &bce_verbose);
 SYSCTL_INT(_hw_bce, OID_AUTO, verbose, CTLFLAG_RDTUN, &bce_verbose, 0,
     "Verbose output enable/disable");
 
 /* Allowable values are TRUE or FALSE */
 static int bce_tso_enable = TRUE;
-TUNABLE_INT("hw.bce.tso_enable", &bce_tso_enable);
 SYSCTL_INT(_hw_bce, OID_AUTO, tso_enable, CTLFLAG_RDTUN, &bce_tso_enable, 0,
     "TSO Enable/Disable");
 
 /* Allowable values are 0 (IRQ), 1 (MSI/IRQ), and 2 (MSI-X/MSI/IRQ) */
 /* ToDo: Add MSI-X support. */
 static int bce_msi_enable = 1;
-TUNABLE_INT("hw.bce.msi_enable", &bce_msi_enable);
 SYSCTL_INT(_hw_bce, OID_AUTO, msi_enable, CTLFLAG_RDTUN, &bce_msi_enable, 0,
     "MSI-X|MSI|INTx selector");
 
 /* Allowable values are 1, 2, 4, 8. */
 static int bce_rx_pages = DEFAULT_RX_PAGES;
-TUNABLE_INT("hw.bce.rx_pages", &bce_rx_pages);
 SYSCTL_UINT(_hw_bce, OID_AUTO, rx_pages, CTLFLAG_RDTUN, &bce_rx_pages, 0,
     "Receive buffer descriptor pages (1 page = 255 buffer descriptors)");
 
 /* Allowable values are 1, 2, 4, 8. */
 static int bce_tx_pages = DEFAULT_TX_PAGES;
-TUNABLE_INT("hw.bce.tx_pages", &bce_tx_pages);
 SYSCTL_UINT(_hw_bce, OID_AUTO, tx_pages, CTLFLAG_RDTUN, &bce_tx_pages, 0,
     "Transmit buffer descriptor pages (1 page = 255 buffer descriptors)");
 
 /* Allowable values are TRUE or FALSE. */
 static int bce_hdr_split = TRUE;
-TUNABLE_INT("hw.bce.hdr_split", &bce_hdr_split);
 SYSCTL_UINT(_hw_bce, OID_AUTO, hdr_split, CTLFLAG_RDTUN, &bce_hdr_split, 0,
     "Frame header/payload splitting Enable/Disable");
 
 /* Allowable values are TRUE or FALSE. */
 static int bce_strict_rx_mtu = FALSE;
-TUNABLE_INT("hw.bce.strict_rx_mtu", &bce_strict_rx_mtu);
 SYSCTL_UINT(_hw_bce, OID_AUTO, strict_rx_mtu, CTLFLAG_RDTUN,
     &bce_strict_rx_mtu, 0,
     "Enable/Disable strict RX frame size checking");
@@ -585,7 +578,6 @@ static int bce_tx_quick_cons_trip_int = 1;
 /* Generate 1 interrupt for every 20 transmit completions. */
 static int bce_tx_quick_cons_trip_int = DEFAULT_TX_QUICK_CONS_TRIP_INT;
 #endif
-TUNABLE_INT("hw.bce.tx_quick_cons_trip_int", &bce_tx_quick_cons_trip_int);
 SYSCTL_UINT(_hw_bce, OID_AUTO, tx_quick_cons_trip_int, CTLFLAG_RDTUN,
     &bce_tx_quick_cons_trip_int, 0,
     "Transmit BD trip point during interrupts");
@@ -598,7 +590,6 @@ static int bce_tx_quick_cons_trip = 1;
 /* Generate 1 interrupt for every 20 transmit completions. */
 static int bce_tx_quick_cons_trip = DEFAULT_TX_QUICK_CONS_TRIP;
 #endif
-TUNABLE_INT("hw.bce.tx_quick_cons_trip", &bce_tx_quick_cons_trip);
 SYSCTL_UINT(_hw_bce, OID_AUTO, tx_quick_cons_trip, CTLFLAG_RDTUN,
     &bce_tx_quick_cons_trip, 0,
     "Transmit BD trip point");
@@ -611,7 +602,6 @@ static int bce_tx_ticks_int = 0;
 /* Generate an interrupt if 80us have elapsed since the last TX completion. */
 static int bce_tx_ticks_int = DEFAULT_TX_TICKS_INT;
 #endif
-TUNABLE_INT("hw.bce.tx_ticks_int", &bce_tx_ticks_int);
 SYSCTL_UINT(_hw_bce, OID_AUTO, tx_ticks_int, CTLFLAG_RDTUN,
     &bce_tx_ticks_int, 0, "Transmit ticks count during interrupt");
 
@@ -623,7 +613,6 @@ static int bce_tx_ticks = 0;
 /* Generate an interrupt if 80us have elapsed since the last TX completion. */
 static int bce_tx_ticks = DEFAULT_TX_TICKS;
 #endif
-TUNABLE_INT("hw.bce.tx_ticks", &bce_tx_ticks);
 SYSCTL_UINT(_hw_bce, OID_AUTO, tx_ticks, CTLFLAG_RDTUN,
     &bce_tx_ticks, 0, "Transmit ticks count");
 
@@ -635,7 +624,6 @@ static int bce_rx_quick_cons_trip_int = 1;
 /* Generate 1 interrupt for every 6 received frames. */
 static int bce_rx_quick_cons_trip_int = DEFAULT_RX_QUICK_CONS_TRIP_INT;
 #endif
-TUNABLE_INT("hw.bce.rx_quick_cons_trip_int", &bce_rx_quick_cons_trip_int);
 SYSCTL_UINT(_hw_bce, OID_AUTO, rx_quick_cons_trip_int, CTLFLAG_RDTUN,
     &bce_rx_quick_cons_trip_int, 0,
     "Receive BD trip point duirng interrupts");
@@ -648,7 +636,6 @@ static int bce_rx_quick_cons_trip = 1;
 /* Generate 1 interrupt for every 6 received frames. */
 static int bce_rx_quick_cons_trip = DEFAULT_RX_QUICK_CONS_TRIP;
 #endif
-TUNABLE_INT("hw.bce.rx_quick_cons_trip", &bce_rx_quick_cons_trip);
 SYSCTL_UINT(_hw_bce, OID_AUTO, rx_quick_cons_trip, CTLFLAG_RDTUN,
     &bce_rx_quick_cons_trip, 0,
     "Receive BD trip point");
@@ -661,7 +648,6 @@ static int bce_rx_ticks_int = 0;
 /* Generate an int. if 18us have elapsed since the last received frame. */
 static int bce_rx_ticks_int = DEFAULT_RX_TICKS_INT;
 #endif
-TUNABLE_INT("hw.bce.rx_ticks_int", &bce_rx_ticks_int);
 SYSCTL_UINT(_hw_bce, OID_AUTO, rx_ticks_int, CTLFLAG_RDTUN,
     &bce_rx_ticks_int, 0, "Receive ticks count during interrupt");
 
@@ -673,7 +659,6 @@ static int bce_rx_ticks = 0;
 /* Generate an int. if 18us have elapsed since the last received frame. */
 static int bce_rx_ticks = DEFAULT_RX_TICKS;
 #endif
-TUNABLE_INT("hw.bce.rx_ticks", &bce_rx_ticks);
 SYSCTL_UINT(_hw_bce, OID_AUTO, rx_ticks, CTLFLAG_RDTUN,
     &bce_rx_ticks, 0, "Receive ticks count");
 
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 40f562ede6de..80715ef97236 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -422,18 +422,18 @@ static int bge_encap(struct bge_softc *, struct mbuf **, uint32_t *);
 static void bge_intr(void *);
 static int bge_msi_intr(void *);
 static void bge_intr_task(void *, int);
-static void bge_start_locked(struct ifnet *);
-static void bge_start(struct ifnet *);
-static int bge_ioctl(struct ifnet *, u_long, caddr_t);
+static void bge_start_locked(if_t);
+static void bge_start(if_t);
+static int bge_ioctl(if_t, u_long, caddr_t);
 static void bge_init_locked(struct bge_softc *);
 static void bge_init(void *);
 static void bge_stop_block(struct bge_softc *, bus_size_t, uint32_t);
 static void bge_stop(struct bge_softc *);
 static void bge_watchdog(struct bge_softc *);
 static int bge_shutdown(device_t);
-static int bge_ifmedia_upd_locked(struct ifnet *);
-static int bge_ifmedia_upd(struct ifnet *);
-static void bge_ifmedia_sts(struct ifnet *, struct ifmediareq *);
+static int bge_ifmedia_upd_locked(if_t);
+static int bge_ifmedia_upd(if_t);
+static void bge_ifmedia_sts(if_t, struct ifmediareq *);
 
 static uint8_t bge_nvram_getbyte(struct bge_softc *, int, uint8_t *);
 static int bge_read_nvram(struct bge_softc *, caddr_t, int, int);
@@ -474,7 +474,7 @@ static int bge_miibus_readreg(device_t, int, int);
 static int bge_miibus_writereg(device_t, int, int, int);
 static void bge_miibus_statchg(device_t);
 #ifdef DEVICE_POLLING
-static int bge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count);
+static int bge_poll(if_t ifp, enum poll_cmd cmd, int count);
 #endif
 
 #define	BGE_RESET_SHUTDOWN	0
@@ -542,10 +542,8 @@ DRIVER_MODULE(miibus, bge, miibus_driver, miibus_devclass, 0, 0);
 
 static int bge_allow_asf = 1;
 
-TUNABLE_INT("hw.bge.allow_asf", &bge_allow_asf);
-
 static SYSCTL_NODE(_hw, OID_AUTO, bge, CTLFLAG_RD, 0, "BGE driver parameters");
-SYSCTL_INT(_hw_bge, OID_AUTO, allow_asf, CTLFLAG_RD, &bge_allow_asf, 0,
+SYSCTL_INT(_hw_bge, OID_AUTO, allow_asf, CTLFLAG_RDTUN, &bge_allow_asf, 0,
 	"Allow ASF mode if available");
 
 #define	SPARC64_BLADE_1500_MODEL	"SUNW,Sun-Blade-1500"
@@ -1246,7 +1244,7 @@ bge_miibus_statchg(device_t dev)
 	uint32_t mac_mode, rx_mode, tx_mode;
 
 	sc = device_get_softc(dev);
-	if ((sc->bge_ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+	if ((if_getdrvflags(sc->bge_ifp) & IFF_DRV_RUNNING) == 0)
 		return;
 	mii = device_get_softc(sc->bge_miibus);
 
@@ -1322,7 +1320,7 @@ bge_newbuf_std(struct bge_softc *sc, int i)
 	int error, nsegs;
 
 	if (sc->bge_flags & BGE_FLAG_JUMBO_STD &&
-	    (sc->bge_ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN +
+	    (if_getmtu(sc->bge_ifp) + ETHER_HDR_LEN + ETHER_CRC_LEN +
 	    ETHER_VLAN_ENCAP_LEN > (MCLBYTES - ETHER_ALIGN))) {
 		m = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUM9BYTES);
 		if (m == NULL)
@@ -1600,14 +1598,14 @@ bge_init_tx_ring(struct bge_softc *sc)
 static void
 bge_setpromisc(struct bge_softc *sc)
 {
-	struct ifnet *ifp;
+	if_t ifp;
 
 	BGE_LOCK_ASSERT(sc);
 
 	ifp = sc->bge_ifp;
 
 	/* Enable or disable promiscuous mode as needed. */
-	if (ifp->if_flags & IFF_PROMISC)
+	if (if_getflags(ifp) & IFF_PROMISC)
 		BGE_SETBIT(sc, BGE_RX_MODE, BGE_RXMODE_RX_PROMISC);
 	else
 		BGE_CLRBIT(sc, BGE_RX_MODE, BGE_RXMODE_RX_PROMISC);
@@ -1616,16 +1614,27 @@ bge_setpromisc(struct bge_softc *sc)
 static void
 bge_setmulti(struct bge_softc *sc)
 {
-	struct ifnet *ifp;
-	struct ifmultiaddr *ifma;
+	if_t ifp;
+	int mc_count = 0;
 	uint32_t hashes[4] = { 0, 0, 0, 0 };
-	int h, i;
+	int h, i, mcnt;
+	unsigned char *mta;
 
 	BGE_LOCK_ASSERT(sc);
 
 	ifp = sc->bge_ifp;
 
-	if (ifp->if_flags & IFF_ALLMULTI || ifp->if_flags & IFF_PROMISC) {
+	mc_count = if_multiaddr_count(ifp, -1);
+	mta = malloc(sizeof(unsigned char) *  ETHER_ADDR_LEN *
+	    mc_count, M_DEVBUF, M_NOWAIT);
+
+	if(mta == NULL) {
+		device_printf(sc->bge_dev, 
+		    "Failed to allocated temp mcast list\n");
+		return;
+	}
+
+	if (if_getflags(ifp) & IFF_ALLMULTI || if_getflags(ifp) & IFF_PROMISC) {
 		for (i = 0; i < 4; i++)
 			CSR_WRITE_4(sc, BGE_MAR0 + (i * 4), 0xFFFFFFFF);
 		return;
@@ -1635,32 +1644,30 @@ bge_setmulti(struct bge_softc *sc)
 	for (i = 0; i < 4; i++)
 		CSR_WRITE_4(sc, BGE_MAR0 + (i * 4), 0);
 
-	/* Now program new ones. */
-	if_maddr_rlock(ifp);
-	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
-		if (ifma->ifma_addr->sa_family != AF_LINK)
-			continue;
-		h = ether_crc32_le(LLADDR((struct sockaddr_dl *)
-		    ifma->ifma_addr), ETHER_ADDR_LEN) & 0x7F;
+	if_multiaddr_array(ifp, mta, &mcnt, mc_count);
+	for(i = 0; i < mcnt; i++) {
+		h = ether_crc32_le(mta + (i * ETHER_ADDR_LEN),
+		    ETHER_ADDR_LEN) & 0x7F;
 		hashes[(h & 0x60) >> 5] |= 1 << (h & 0x1F);
 	}
-	if_maddr_runlock(ifp);
 
 	for (i = 0; i < 4; i++)
 		CSR_WRITE_4(sc, BGE_MAR0 + (i * 4), hashes[i]);
+
+	free(mta, M_DEVBUF);
 }
 
 static void
 bge_setvlan(struct bge_softc *sc)
 {
-	struct ifnet *ifp;
+	if_t ifp;
 
 	BGE_LOCK_ASSERT(sc);
 
 	ifp = sc->bge_ifp;
 
 	/* Enable or disable VLAN tag stripping as needed. */
-	if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING)
+	if (if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING)
 		BGE_CLRBIT(sc, BGE_RX_MODE, BGE_RXMODE_RX_KEEP_VLAN_DIAG);
 	else
 		BGE_SETBIT(sc, BGE_RX_MODE, BGE_RXMODE_RX_KEEP_VLAN_DIAG);
@@ -1996,7 +2003,7 @@ bge_blockinit(struct bge_softc *sc)
 	/* Configure mbuf pool watermarks */
 	if (BGE_IS_5717_PLUS(sc)) {
 		CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_READDMA_LOWAT, 0x0);
-		if (sc->bge_ifp->if_mtu > ETHERMTU) {
+		if (if_getmtu(sc->bge_ifp) > ETHERMTU) {
 			CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_MACRX_LOWAT, 0x7e);
 			CSR_WRITE_4(sc, BGE_BMAN_MBUFPOOL_HIWAT, 0xea);
 		} else {
@@ -3296,7 +3303,7 @@ bge_devinfo(struct bge_softc *sc)
 static int
 bge_attach(device_t dev)
 {
-	struct ifnet *ifp;
+	if_t ifp;
 	struct bge_softc *sc;
 	uint32_t hwcfg = 0, misccfg, pcistate;
 	u_char eaddr[ETHER_ADDR_LEN];
@@ -3725,28 +3732,27 @@ bge_attach(device_t dev)
 		error = ENXIO;
 		goto fail;
 	}
-	ifp->if_softc = sc;
+	if_setsoftc(ifp, sc);
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
-	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
-	ifp->if_ioctl = bge_ioctl;
-	ifp->if_start = bge_start;
-	ifp->if_init = bge_init;
-	ifp->if_snd.ifq_drv_maxlen = BGE_TX_RING_CNT - 1;
-	IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen);
-	IFQ_SET_READY(&ifp->if_snd);
-	ifp->if_hwassist = sc->bge_csum_features;
-	ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_VLAN_HWTAGGING |
-	    IFCAP_VLAN_MTU;
+	if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
+	if_setioctlfn(ifp, bge_ioctl);
+	if_setstartfn(ifp, bge_start);
+	if_setinitfn(ifp, bge_init);
+	if_setsendqlen(ifp, BGE_TX_RING_CNT - 1);
+	if_setsendqready(ifp);
+	if_sethwassist(ifp, sc->bge_csum_features);
+	if_setcapabilities(ifp, IFCAP_HWCSUM | IFCAP_VLAN_HWTAGGING |
+	    IFCAP_VLAN_MTU);
 	if ((sc->bge_flags & (BGE_FLAG_TSO | BGE_FLAG_TSO3)) != 0) {
-		ifp->if_hwassist |= CSUM_TSO;
-		ifp->if_capabilities |= IFCAP_TSO4 | IFCAP_VLAN_HWTSO;
+		if_sethwassistbits(ifp, CSUM_TSO, 0);
+		if_setcapabilitiesbit(ifp, IFCAP_TSO4 | IFCAP_VLAN_HWTSO, 0);
 	}
 #ifdef IFCAP_VLAN_HWCSUM
-	ifp->if_capabilities |= IFCAP_VLAN_HWCSUM;
+	if_setcapabilitiesbit(ifp, IFCAP_VLAN_HWCSUM, 0);
 #endif
-	ifp->if_capenable = ifp->if_capabilities;
+	if_setcapenable(ifp, if_getcapabilities(ifp));
 #ifdef DEVICE_POLLING
-	ifp->if_capabilities |= IFCAP_POLLING;
+	if_setcapabilitiesbit(ifp, IFCAP_POLLING, 0);
 #endif
 
 	/*
@@ -3754,9 +3760,9 @@ bge_attach(device_t dev)
 	 * to hardware bugs.
 	 */
 	if (sc->bge_chipid == BGE_CHIPID_BCM5700_B0) {
-		ifp->if_capabilities &= ~IFCAP_HWCSUM;
-		ifp->if_capenable &= ~IFCAP_HWCSUM;
-		ifp->if_hwassist = 0;
+		if_setcapabilitiesbit(ifp, 0, IFCAP_HWCSUM);
+		if_setcapenablebit(ifp, 0, IFCAP_HWCSUM);
+		if_sethwassist(ifp, 0);
 	}
 
 	/*
@@ -3831,7 +3837,7 @@ bge_attach(device_t dev)
 		sc->bge_phy_flags |= BGE_PHY_NO_WIRESPEED;
 
 	if (sc->bge_flags & BGE_FLAG_TBI) {
-		ifmedia_init(&sc->bge_ifmedia, IFM_IMASK, bge_ifmedia_upd,
+		ifmedia_init_drv(&sc->bge_ifmedia, IFM_IMASK, bge_ifmedia_upd,
 		    bge_ifmedia_sts);
 		ifmedia_add(&sc->bge_ifmedia, IFM_ETHER | IFM_1000_SX, 0, NULL);
 		ifmedia_add(&sc->bge_ifmedia, IFM_ETHER | IFM_1000_SX | IFM_FDX,
@@ -3852,9 +3858,10 @@ bge_attach(device_t dev)
 again:
 		bge_asf_driver_up(sc);
 
-		error = mii_attach(dev, &sc->bge_miibus, ifp, bge_ifmedia_upd,
-		    bge_ifmedia_sts, capmask, sc->bge_phy_addr, MII_OFFSET_ANY,
-		    MIIF_DOPAUSE);
+		error = mii_attach(dev, &sc->bge_miibus, ifp, 
+		    (ifm_change_cb_t)bge_ifmedia_upd,
+		    (ifm_stat_cb_t)bge_ifmedia_sts, capmask, sc->bge_phy_addr, 
+		    MII_OFFSET_ANY, MIIF_DOPAUSE);
 		if (error != 0) {
 			if (trys++ < 4) {
 				device_printf(sc->bge_dev, "Try again\n");
@@ -3891,7 +3898,7 @@ bge_attach(device_t dev)
 	ether_ifattach(ifp, eaddr);
 
 	/* Tell upper layer we support long frames. */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	if_setifheaderlen(ifp, sizeof(struct ether_vlan_header));
 
 	/*
 	 * Hookup IRQ last.
@@ -3938,13 +3945,13 @@ static int
 bge_detach(device_t dev)
 {
 	struct bge_softc *sc;
-	struct ifnet *ifp;
+	if_t ifp;
 
 	sc = device_get_softc(dev);
 	ifp = sc->bge_ifp;
 
 #ifdef DEVICE_POLLING
-	if (ifp->if_capenable & IFCAP_POLLING)
+	if (if_getcapenable(ifp) & IFCAP_POLLING)
 		ether_poll_deregister(ifp);
 #endif
 
@@ -4300,7 +4307,7 @@ bge_rxreuse_jumbo(struct bge_softc *sc, int i)
 static int
 bge_rxeof(struct bge_softc *sc, uint16_t rx_prod, int holdlck)
 {
-	struct ifnet *ifp;
+	if_t ifp;
 	int rx_npkts = 0, stdcnt = 0, jumbocnt = 0;
 	uint16_t rx_cons;
 
@@ -4317,8 +4324,8 @@ bge_rxeof(struct bge_softc *sc, uint16_t rx_prod, int holdlck)
 	bus_dmamap_sync(sc->bge_cdata.bge_rx_std_ring_tag,
 	    sc->bge_cdata.bge_rx_std_ring_map, BUS_DMASYNC_POSTWRITE);
 	if (BGE_IS_JUMBO_CAPABLE(sc) &&
-	    ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN + ETHER_VLAN_ENCAP_LEN >
-	    (MCLBYTES - ETHER_ALIGN))
+	    if_getmtu(ifp) + ETHER_HDR_LEN + ETHER_CRC_LEN + 
+	    ETHER_VLAN_ENCAP_LEN > (MCLBYTES - ETHER_ALIGN))
 		bus_dmamap_sync(sc->bge_cdata.bge_rx_jumbo_ring_tag,
 		    sc->bge_cdata.bge_rx_jumbo_ring_map, BUS_DMASYNC_POSTWRITE);
 
@@ -4330,7 +4337,7 @@ bge_rxeof(struct bge_softc *sc, uint16_t rx_prod, int holdlck)
 		int			have_tag = 0;
 
 #ifdef DEVICE_POLLING
-		if (ifp->if_capenable & IFCAP_POLLING) {
+		if (if_getcapenable(ifp) & IFCAP_POLLING) {
 			if (sc->rxcycles <= 0)
 				break;
 			sc->rxcycles--;
@@ -4342,7 +4349,7 @@ bge_rxeof(struct bge_softc *sc, uint16_t rx_prod, int holdlck)
 		rxidx = cur_rx->bge_idx;
 		BGE_INC(rx_cons, sc->bge_return_ring_cnt);
 
-		if (ifp->if_capenable & IFCAP_VLAN_HWTAGGING &&
+		if (if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING &&
 		    cur_rx->bge_flags & BGE_RXBDFLAG_VLAN_TAG) {
 			have_tag = 1;
 			vlan_tag = cur_rx->bge_vlan_tag;
@@ -4357,7 +4364,7 @@ bge_rxeof(struct bge_softc *sc, uint16_t rx_prod, int holdlck)
 			}
 			if (bge_newbuf_jumbo(sc, rxidx) != 0) {
 				bge_rxreuse_jumbo(sc, rxidx);
-				ifp->if_iqdrops++;
+				if_inciqdrops(ifp, 1);
 				continue;
 			}
 			BGE_INC(sc->bge_jumbo, BGE_JUMBO_RX_RING_CNT);
@@ -4370,13 +4377,13 @@ bge_rxeof(struct bge_softc *sc, uint16_t rx_prod, int holdlck)
 			}
 			if (bge_newbuf_std(sc, rxidx) != 0) {
 				bge_rxreuse_std(sc, rxidx);
-				ifp->if_iqdrops++;
+				if_inciqdrops(ifp, 1);
 				continue;
 			}
 			BGE_INC(sc->bge_std, BGE_STD_RX_RING_CNT);
 		}
 
-		ifp->if_ipackets++;
+		if_incipackets(ifp, 1);
 #ifndef __NO_STRICT_ALIGNMENT
 		/*
 		 * For architectures with strict alignment we must make sure
@@ -4391,7 +4398,7 @@ bge_rxeof(struct bge_softc *sc, uint16_t rx_prod, int holdlck)
 		m->m_pkthdr.len = m->m_len = cur_rx->bge_len - ETHER_CRC_LEN;
 		m->m_pkthdr.rcvif = ifp;
 
-		if (ifp->if_capenable & IFCAP_RXCSUM)
+		if (if_getcapenable(ifp) & IFCAP_RXCSUM)
 			bge_rxcsum(sc, cur_rx, m);
 
 		/*
@@ -4405,13 +4412,13 @@ bge_rxeof(struct bge_softc *sc, uint16_t rx_prod, int holdlck)
 
 		if (holdlck != 0) {
 			BGE_UNLOCK(sc);
-			(*ifp->if_input)(ifp, m);
+			if_input(ifp, m);
 			BGE_LOCK(sc);
 		} else
-			(*ifp->if_input)(ifp, m);
+			if_input(ifp, m);
 		rx_npkts++;
 
-		if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
+		if (!(if_getdrvflags(ifp) & IFF_DRV_RUNNING))
 			return (rx_npkts);
 	}
 
@@ -4439,7 +4446,7 @@ bge_rxeof(struct bge_softc *sc, uint16_t rx_prod, int holdlck)
 	 * If you need correct statistics, you can enable this check.
 	 */
 	if (BGE_IS_5705_PLUS(sc))
-		ifp->if_ierrors += CSR_READ_4(sc, BGE_RXLP_LOCSTAT_IFIN_DROPS);
+		if_incierrors(ifp, CSR_READ_4(sc, BGE_RXLP_LOCSTAT_IFIN_DROPS));
 #endif
 	return (rx_npkts);
 }
@@ -4483,7 +4490,7 @@ static void
 bge_txeof(struct bge_softc *sc, uint16_t tx_cons)
 {
 	struct bge_tx_bd *cur_tx;
-	struct ifnet *ifp;
+	if_t ifp;
 
 	BGE_LOCK_ASSERT(sc);
 
@@ -4505,7 +4512,7 @@ bge_txeof(struct bge_softc *sc, uint16_t tx_cons)
 		idx = sc->bge_tx_saved_considx;
 		cur_tx = &sc->bge_ldata.bge_tx_ring[idx];
 		if (cur_tx->bge_flags & BGE_TXBDFLAG_END)
-			ifp->if_opackets++;
+			if_incopackets(ifp, 1);
 		if (sc->bge_cdata.bge_tx_chain[idx] != NULL) {
 			bus_dmamap_sync(sc->bge_cdata.bge_tx_mtag,
 			    sc->bge_cdata.bge_tx_dmamap[idx],
@@ -4519,22 +4526,22 @@ bge_txeof(struct bge_softc *sc, uint16_t tx_cons)
 		BGE_INC(sc->bge_tx_saved_considx, BGE_TX_RING_CNT);
 	}
 
-	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+	if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
 	if (sc->bge_txcnt == 0)
 		sc->bge_timer = 0;
 }
 
 #ifdef DEVICE_POLLING
 static int
-bge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
+bge_poll(if_t ifp, enum poll_cmd cmd, int count)
 {
-	struct bge_softc *sc = ifp->if_softc;
+	struct bge_softc *sc = if_getsoftc(ifp);
 	uint16_t rx_prod, tx_cons;
 	uint32_t statusword;
 	int rx_npkts = 0;
 
 	BGE_LOCK(sc);
-	if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
+	if (!(if_getdrvflags(ifp) & IFF_DRV_RUNNING)) {
 		BGE_UNLOCK(sc);
 		return (rx_npkts);
 	}
@@ -4566,12 +4573,12 @@ bge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
 
 	sc->rxcycles = count;
 	rx_npkts = bge_rxeof(sc, rx_prod, 1);
-	if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
+	if (!(if_getdrvflags(ifp) & IFF_DRV_RUNNING)) {
 		BGE_UNLOCK(sc);
 		return (rx_npkts);
 	}
 	bge_txeof(sc, tx_cons);
-	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
+	if (!if_sendq_empty(ifp))
 		bge_start_locked(ifp);
 
 	BGE_UNLOCK(sc);
@@ -4597,7 +4604,7 @@ static void
 bge_intr_task(void *arg, int pending)
 {
 	struct bge_softc *sc;
-	struct ifnet *ifp;
+	if_t ifp;
 	uint32_t status, status_tag;
 	uint16_t rx_prod, tx_cons;
 
@@ -4605,7 +4612,7 @@ bge_intr_task(void *arg, int pending)
 	ifp = sc->bge_ifp;
 
 	BGE_LOCK(sc);
-	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
+	if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) {
 		BGE_UNLOCK(sc);
 		return;
 	}
@@ -4634,17 +4641,17 @@ bge_intr_task(void *arg, int pending)
 	/* Let controller work. */
 	bge_writembx(sc, BGE_MBX_IRQ0_LO, status_tag);
 
-	if (ifp->if_drv_flags & IFF_DRV_RUNNING &&
+	if (if_getdrvflags(ifp) & IFF_DRV_RUNNING &&
 	    sc->bge_rx_saved_considx != rx_prod) {
 		/* Check RX return ring producer/consumer. */
 		BGE_UNLOCK(sc);
 		bge_rxeof(sc, rx_prod, 0);
 		BGE_LOCK(sc);
 	}
-	if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+	if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
 		/* Check TX ring producer/consumer. */
 		bge_txeof(sc, tx_cons);
-		if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
+		if (!if_sendq_empty(ifp))
 			bge_start_locked(ifp);
 	}
 	BGE_UNLOCK(sc);
@@ -4654,7 +4661,7 @@ static void
 bge_intr(void *xsc)
 {
 	struct bge_softc *sc;
-	struct ifnet *ifp;
+	if_t ifp;
 	uint32_t statusword;
 	uint16_t rx_prod, tx_cons;
 
@@ -4665,7 +4672,7 @@ bge_intr(void *xsc)
 	ifp = sc->bge_ifp;
 
 #ifdef DEVICE_POLLING
-	if (ifp->if_capenable & IFCAP_POLLING) {
+	if (if_getcapenable(ifp) & IFCAP_POLLING) {
 		BGE_UNLOCK(sc);
 		return;
 	}
@@ -4714,18 +4721,18 @@ bge_intr(void *xsc)
 	    statusword || sc->bge_link_evt)
 		bge_link_upd(sc);
 
-	if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+	if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
 		/* Check RX return ring producer/consumer. */
 		bge_rxeof(sc, rx_prod, 1);
 	}
 
-	if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+	if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
 		/* Check TX ring producer/consumer. */
 		bge_txeof(sc, tx_cons);
 	}
 
-	if (ifp->if_drv_flags & IFF_DRV_RUNNING &&
-	    !IFQ_DRV_IS_EMPTY(&ifp->if_snd))
+	if (if_getdrvflags(ifp) & IFF_DRV_RUNNING &&
+	    !if_sendq_empty(ifp))
 		bge_start_locked(ifp);
 
 	BGE_UNLOCK(sc);
@@ -4789,7 +4796,7 @@ bge_tick(void *xsc)
 		 */
 #ifdef DEVICE_POLLING
 		/* In polling mode we poll link state in bge_poll(). */
-		if (!(sc->bge_ifp->if_capenable & IFCAP_POLLING))
+		if (!(if_getcapenable(sc->bge_ifp) & IFCAP_POLLING))
 #endif
 		{
 		sc->bge_link_evt++;
@@ -4810,7 +4817,7 @@ bge_tick(void *xsc)
 static void
 bge_stats_update_regs(struct bge_softc *sc)
 {
-	struct ifnet *ifp;
+	if_t ifp;
 	struct bge_mac_stats *stats;
 	uint32_t val;
 
@@ -4910,9 +4917,9 @@ bge_stats_update_regs(struct bge_softc *sc)
 	stats->RecvThresholdHit +=
 	    CSR_READ_4(sc, BGE_RXLP_LOCSTAT_RXTHRESH_HIT);
 
-	ifp->if_collisions = (u_long)stats->etherStatsCollisions;
-	ifp->if_ierrors = (u_long)(stats->NoMoreRxBDs + stats->InputDiscards +
-	    stats->InputErrors);
+	if_setcollisions(ifp, (u_long)stats->etherStatsCollisions);
+	if_setierrors(ifp, (u_long)(stats->NoMoreRxBDs + stats->InputDiscards +
+	    stats->InputErrors));
 
 	if (sc->bge_flags & BGE_FLAG_RDMA_BUG) {
 		/*
@@ -4978,7 +4985,7 @@ bge_stats_clear_regs(struct bge_softc *sc)
 static void
 bge_stats_update(struct bge_softc *sc)
 {
-	struct ifnet *ifp;
+	if_t ifp;
 	bus_size_t stats;
 	uint32_t cnt;	/* current register value */
 
@@ -4990,21 +4997,21 @@ bge_stats_update(struct bge_softc *sc)
 	CSR_READ_4(sc, stats + offsetof(struct bge_stats, stat))
 
 	cnt = READ_STAT(sc, stats, txstats.etherStatsCollisions.bge_addr_lo);
-	ifp->if_collisions += (uint32_t)(cnt - sc->bge_tx_collisions);
+	if_inccollisions(ifp, (uint32_t)(cnt - sc->bge_tx_collisions));
 	sc->bge_tx_collisions = cnt;
 
 	cnt = READ_STAT(sc, stats, nicNoMoreRxBDs.bge_addr_lo);
-	ifp->if_ierrors += (uint32_t)(cnt - sc->bge_rx_nobds);
+	if_incierrors(ifp, (uint32_t)(cnt - sc->bge_rx_nobds));
 	sc->bge_rx_nobds = cnt;
 	cnt = READ_STAT(sc, stats, ifInErrors.bge_addr_lo);
-	ifp->if_ierrors += (uint32_t)(cnt - sc->bge_rx_inerrs);
+	if_incierrors(ifp, (uint32_t)(cnt - sc->bge_rx_inerrs));
 	sc->bge_rx_inerrs = cnt;
 	cnt = READ_STAT(sc, stats, ifInDiscards.bge_addr_lo);
-	ifp->if_ierrors += (uint32_t)(cnt - sc->bge_rx_discards);
+	if_incierrors(ifp, (uint32_t)(cnt - sc->bge_rx_discards));
 	sc->bge_rx_discards = cnt;
 
 	cnt = READ_STAT(sc, stats, txstats.ifOutDiscards.bge_addr_lo);
-	ifp->if_oerrors += (uint32_t)(cnt - sc->bge_tx_discards);
+	if_incoerrors(ifp, (uint32_t)(cnt - sc->bge_tx_discards));
 	sc->bge_tx_discards = cnt;
 
 #undef	READ_STAT
@@ -5331,29 +5338,29 @@ bge_encap(struct bge_softc *sc, struct mbuf **m_head, uint32_t *txidx)
  * to the mbuf data regions directly in the transmit descriptors.
  */
 static void
-bge_start_locked(struct ifnet *ifp)
+bge_start_locked(if_t ifp)
 {
 	struct bge_softc *sc;
 	struct mbuf *m_head;
 	uint32_t prodidx;
 	int count;
 
-	sc = ifp->if_softc;
+	sc = if_getsoftc(ifp);
 	BGE_LOCK_ASSERT(sc);
 
 	if (!sc->bge_link ||
-	    (ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) !=
+	    (if_getdrvflags(ifp) & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) !=
 	    IFF_DRV_RUNNING)
 		return;
 
 	prodidx = sc->bge_tx_prodidx;
 
-	for (count = 0; !IFQ_DRV_IS_EMPTY(&ifp->if_snd);) {
+	for (count = 0; !if_sendq_empty(ifp);) {
 		if (sc->bge_txcnt > BGE_TX_RING_CNT - 16) {
-			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+			if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0);
 			break;
 		}
-		IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head);
+		m_head = if_dequeue(ifp);
 		if (m_head == NULL)
 			break;
 
@@ -5365,8 +5372,8 @@ bge_start_locked(struct ifnet *ifp)
 		if (bge_encap(sc, &m_head, &prodidx)) {
 			if (m_head == NULL)
 				break;
-			IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
-			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+			if_sendq_prepend(ifp, m_head);
+			if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0);
 			break;
 		}
 		++count;
@@ -5375,11 +5382,7 @@ bge_start_locked(struct ifnet *ifp)
 		 * If there's a BPF listener, bounce a copy of this frame
 		 * to him.
 		 */
-#ifdef ETHER_BPF_MTAP
-		ETHER_BPF_MTAP(ifp, m_head);
-#else
-		BPF_MTAP(ifp, m_head);
-#endif
+		if_bpfmtap(ifp, m_head);
 	}
 
 	if (count > 0) {
@@ -5405,11 +5408,11 @@ bge_start_locked(struct ifnet *ifp)
  * to the mbuf data regions directly in the transmit descriptors.
  */
 static void
-bge_start(struct ifnet *ifp)
+bge_start(if_t ifp)
 {
 	struct bge_softc *sc;
 
-	sc = ifp->if_softc;
+	sc = if_getsoftc(ifp);
 	BGE_LOCK(sc);
 	bge_start_locked(ifp);
 	BGE_UNLOCK(sc);
@@ -5418,7 +5421,7 @@ bge_start(struct ifnet *ifp)
 static void
 bge_init_locked(struct bge_softc *sc)
 {
-	struct ifnet *ifp;
+	if_t ifp;
 	uint16_t *m;
 	uint32_t mode;
 
@@ -5426,7 +5429,7 @@ bge_init_locked(struct bge_softc *sc)
 
 	ifp = sc->bge_ifp;
 
-	if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+	if (if_getdrvflags(ifp) & IFF_DRV_RUNNING)
 		return;
 
 	/* Cancel pending I/O and flush buffers. */
@@ -5452,9 +5455,9 @@ bge_init_locked(struct bge_softc *sc)
 	ifp = sc->bge_ifp;
 
 	/* Specify MTU. */
-	CSR_WRITE_4(sc, BGE_RX_MTU, ifp->if_mtu +
+	CSR_WRITE_4(sc, BGE_RX_MTU, if_getmtu(ifp) +
 	    ETHER_HDR_LEN + ETHER_CRC_LEN +
-	    (ifp->if_capenable & IFCAP_VLAN_MTU ? ETHER_VLAN_ENCAP_LEN : 0));
+	    (if_getcapenable(ifp) & IFCAP_VLAN_MTU ? ETHER_VLAN_ENCAP_LEN : 0));
 
 	/* Load our MAC address. */
 	m = (uint16_t *)IF_LLADDR(sc->bge_ifp);
@@ -5475,10 +5478,10 @@ bge_init_locked(struct bge_softc *sc)
 		sc->bge_csum_features &= ~CSUM_UDP;
 	else
 		sc->bge_csum_features |= CSUM_UDP;
-	if (ifp->if_capabilities & IFCAP_TXCSUM &&
-	    ifp->if_capenable & IFCAP_TXCSUM) {
-		ifp->if_hwassist &= ~(BGE_CSUM_FEATURES | CSUM_UDP);
-		ifp->if_hwassist |= sc->bge_csum_features;
+	if (if_getcapabilities(ifp) & IFCAP_TXCSUM &&
+	    if_getcapenable(ifp) & IFCAP_TXCSUM) {
+		if_sethwassistbits(ifp, 0, (BGE_CSUM_FEATURES | CSUM_UDP));
+		if_sethwassistbits(ifp, sc->bge_csum_features, 0);
 	}
 
 	/* Init RX ring. */
@@ -5508,8 +5511,8 @@ bge_init_locked(struct bge_softc *sc)
 
 	/* Init jumbo RX ring. */
 	if (BGE_IS_JUMBO_CAPABLE(sc) &&
-	    ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN + ETHER_VLAN_ENCAP_LEN >
-	    (MCLBYTES - ETHER_ALIGN)) {
+	    if_getmtu(ifp) + ETHER_HDR_LEN + ETHER_CRC_LEN + 
+     	    ETHER_VLAN_ENCAP_LEN > (MCLBYTES - ETHER_ALIGN)) {
 		if (bge_init_rx_ring_jumbo(sc) != 0) {
 			device_printf(sc->bge_dev,
 			    "no memory for jumbo Rx buffers.\n");
@@ -5570,7 +5573,7 @@ bge_init_locked(struct bge_softc *sc)
 
 #ifdef DEVICE_POLLING
 	/* Disable interrupts if we are polling. */
-	if (ifp->if_capenable & IFCAP_POLLING) {
+	if (if_getcapenable(ifp) & IFCAP_POLLING) {
 		BGE_SETBIT(sc, BGE_PCI_MISC_CTL,
 		    BGE_PCIMISCCTL_MASK_PCI_INTR);
 		bge_writembx(sc, BGE_MBX_IRQ0_LO, 1);
@@ -5584,8 +5587,8 @@ bge_init_locked(struct bge_softc *sc)
 	bge_writembx(sc, BGE_MBX_IRQ0_LO, 0);
 	}
 
-	ifp->if_drv_flags |= IFF_DRV_RUNNING;
-	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+	if_setdrvflagbits(ifp, IFF_DRV_RUNNING, 0);
+	if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
 
 	bge_ifmedia_upd_locked(ifp);
 
@@ -5606,9 +5609,9 @@ bge_init(void *xsc)
  * Set media options.
  */
 static int
-bge_ifmedia_upd(struct ifnet *ifp)
+bge_ifmedia_upd(if_t ifp)
 {
-	struct bge_softc *sc = ifp->if_softc;
+	struct bge_softc *sc = if_getsoftc(ifp);
 	int res;
 
 	BGE_LOCK(sc);
@@ -5619,9 +5622,9 @@ bge_ifmedia_upd(struct ifnet *ifp)
 }
 
 static int
-bge_ifmedia_upd_locked(struct ifnet *ifp)
+bge_ifmedia_upd_locked(if_t ifp)
 {
-	struct bge_softc *sc = ifp->if_softc;
+	struct bge_softc *sc = if_getsoftc(ifp);
 	struct mii_data *mii;
 	struct mii_softc *miisc;
 	struct ifmedia *ifm;
@@ -5704,14 +5707,14 @@ bge_ifmedia_upd_locked(struct ifnet *ifp)
  * Report current media status.
  */
 static void
-bge_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
+bge_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr)
 {
-	struct bge_softc *sc = ifp->if_softc;
+	struct bge_softc *sc = if_getsoftc(ifp);
 	struct mii_data *mii;
 
 	BGE_LOCK(sc);
 
-	if ((ifp->if_flags & IFF_UP) == 0) {
+	if ((if_getflags(ifp) & IFF_UP) == 0) {
 		BGE_UNLOCK(sc);
 		return;
 	}
@@ -5744,9 +5747,9 @@ bge_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
 }
 
 static int
-bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
+bge_ioctl(if_t ifp, u_long command, caddr_t data)
 {
-	struct bge_softc *sc = ifp->if_softc;
+	struct bge_softc *sc = if_getsoftc(ifp);
 	struct ifreq *ifr = (struct ifreq *) data;
 	struct mii_data *mii;
 	int flags, mask, error = 0;
@@ -5765,10 +5768,10 @@ bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 			break;
 		}
 		BGE_LOCK(sc);
-		if (ifp->if_mtu != ifr->ifr_mtu) {
-			ifp->if_mtu = ifr->ifr_mtu;
-			if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
-				ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
+		if (if_getmtu(ifp) != ifr->ifr_mtu) {
+			if_setmtu(ifp, ifr->ifr_mtu);
+			if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
+				if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
 				bge_init_locked(sc);
 			}
 		}
@@ -5776,7 +5779,7 @@ bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		break;
 	case SIOCSIFFLAGS:
 		BGE_LOCK(sc);
-		if (ifp->if_flags & IFF_UP) {
+		if (if_getflags(ifp) & IFF_UP) {
 			/*
 			 * If only the state of the PROMISC flag changed,
 			 * then just use the 'set promisc mode' command
@@ -5785,8 +5788,8 @@ bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 			 * waiting for it to start up, which may take a
 			 * second or two.  Similarly for ALLMULTI.
 			 */
-			if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
-				flags = ifp->if_flags ^ sc->bge_if_flags;
+			if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
+				flags = if_getflags(ifp) ^ sc->bge_if_flags;
 				if (flags & IFF_PROMISC)
 					bge_setpromisc(sc);
 				if (flags & IFF_ALLMULTI)
@@ -5794,17 +5797,17 @@ bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 			} else
 				bge_init_locked(sc);
 		} else {
-			if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+			if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
 				bge_stop(sc);
 			}
 		}
-		sc->bge_if_flags = ifp->if_flags;
+		sc->bge_if_flags = if_getflags(ifp);
 		BGE_UNLOCK(sc);
 		error = 0;
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
-		if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+		if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
 			BGE_LOCK(sc);
 			bge_setmulti(sc);
 			BGE_UNLOCK(sc);
@@ -5823,18 +5826,18 @@ bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		}
 		break;
 	case SIOCSIFCAP:
-		mask = ifr->ifr_reqcap ^ ifp->if_capenable;
+		mask = ifr->ifr_reqcap ^ if_getcapenable(ifp);
 #ifdef DEVICE_POLLING
 		if (mask & IFCAP_POLLING) {
 			if (ifr->ifr_reqcap & IFCAP_POLLING) {
-				error = ether_poll_register(bge_poll, ifp);
+				error = ether_poll_register_drv(bge_poll, ifp);
 				if (error)
 					return (error);
 				BGE_LOCK(sc);
 				BGE_SETBIT(sc, BGE_PCI_MISC_CTL,
 				    BGE_PCIMISCCTL_MASK_PCI_INTR);
 				bge_writembx(sc, BGE_MBX_IRQ0_LO, 1);
-				ifp->if_capenable |= IFCAP_POLLING;
+				if_setcapenablebit(ifp, IFCAP_POLLING, 0);
 				BGE_UNLOCK(sc);
 			} else {
 				error = ether_poll_deregister(ifp);
@@ -5843,53 +5846,55 @@ bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 				BGE_CLRBIT(sc, BGE_PCI_MISC_CTL,
 				    BGE_PCIMISCCTL_MASK_PCI_INTR);
 				bge_writembx(sc, BGE_MBX_IRQ0_LO, 0);
-				ifp->if_capenable &= ~IFCAP_POLLING;
+				if_setcapenablebit(ifp, 0, IFCAP_POLLING);
 				BGE_UNLOCK(sc);
 			}
 		}
 #endif
 		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 |= sc->bge_csum_features;
+		    (if_getcapabilities(ifp) & IFCAP_TXCSUM) != 0) {
+			if_togglecapenable(ifp, IFCAP_TXCSUM);
+			if ((if_getcapenable(ifp) & IFCAP_TXCSUM) != 0)
+				if_sethwassistbits(ifp,
+				    sc->bge_csum_features, 0);
 			else
-				ifp->if_hwassist &= ~sc->bge_csum_features;
+				if_sethwassistbits(ifp, 0,
+				    sc->bge_csum_features);
 		}
 
 		if ((mask & IFCAP_RXCSUM) != 0 &&
-		    (ifp->if_capabilities & IFCAP_RXCSUM) != 0)
-			ifp->if_capenable ^= IFCAP_RXCSUM;
+		    (if_getcapabilities(ifp) & IFCAP_RXCSUM) != 0)
+			if_togglecapenable(ifp, IFCAP_RXCSUM);
 
 		if ((mask & IFCAP_TSO4) != 0 &&
-		    (ifp->if_capabilities & IFCAP_TSO4) != 0) {
-			ifp->if_capenable ^= IFCAP_TSO4;
-			if ((ifp->if_capenable & IFCAP_TSO4) != 0)
-				ifp->if_hwassist |= CSUM_TSO;
+		    (if_getcapabilities(ifp) & IFCAP_TSO4) != 0) {
+			if_togglecapenable(ifp, IFCAP_TSO4);
+			if ((if_getcapenable(ifp) & IFCAP_TSO4) != 0)
+				if_sethwassistbits(ifp, CSUM_TSO, 0);
 			else
-				ifp->if_hwassist &= ~CSUM_TSO;
+				if_sethwassistbits(ifp, 0, CSUM_TSO);
 		}
 
 		if (mask & IFCAP_VLAN_MTU) {
-			ifp->if_capenable ^= IFCAP_VLAN_MTU;
-			ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
+			if_togglecapenable(ifp, IFCAP_VLAN_MTU);
+			if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
 			bge_init(sc);
 		}
 
 		if ((mask & IFCAP_VLAN_HWTSO) != 0 &&
-		    (ifp->if_capabilities & IFCAP_VLAN_HWTSO) != 0)
-			ifp->if_capenable ^= IFCAP_VLAN_HWTSO;
+		    (if_getcapabilities(ifp) & IFCAP_VLAN_HWTSO) != 0)
+			if_togglecapenable(ifp, IFCAP_VLAN_HWTSO);
 		if ((mask & IFCAP_VLAN_HWTAGGING) != 0 &&
-		    (ifp->if_capabilities & IFCAP_VLAN_HWTAGGING) != 0) {
-			ifp->if_capenable ^= IFCAP_VLAN_HWTAGGING;
-			if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) == 0)
-				ifp->if_capenable &= ~IFCAP_VLAN_HWTSO;
+		    (if_getcapabilities(ifp) & IFCAP_VLAN_HWTAGGING) != 0) {
+			if_togglecapenable(ifp, IFCAP_VLAN_HWTAGGING);
+			if ((if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) == 0)
+				if_setcapenablebit(ifp, 0, IFCAP_VLAN_HWTSO);
 			BGE_LOCK(sc);
 			bge_setvlan(sc);
 			BGE_UNLOCK(sc);
 		}
 #ifdef VLAN_CAPABILITIES
-		VLAN_CAPABILITIES(ifp);
+		if_vlancap(ifp);
 #endif
 		break;
 	default:
@@ -5903,7 +5908,7 @@ bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 static void
 bge_watchdog(struct bge_softc *sc)
 {
-	struct ifnet *ifp;
+	if_t ifp;
 	uint32_t status;
 
 	BGE_LOCK_ASSERT(sc);
@@ -5942,10 +5947,10 @@ bge_watchdog(struct bge_softc *sc)
 
 	if_printf(ifp, "watchdog timeout -- resetting\n");
 
-	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
+	if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
 	bge_init_locked(sc);
 
-	ifp->if_oerrors++;
+	if_incoerrors(ifp, 1);
 }
 
 static void
@@ -5969,7 +5974,7 @@ bge_stop_block(struct bge_softc *sc, bus_size_t reg, uint32_t bit)
 static void
 bge_stop(struct bge_softc *sc)
 {
-	struct ifnet *ifp;
+	if_t ifp;
 
 	BGE_LOCK_ASSERT(sc);
 
@@ -6059,7 +6064,7 @@ bge_stop(struct bge_softc *sc)
 		if_printf(sc->bge_ifp, "link DOWN\n");
 	sc->bge_link = 0;
 
-	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
+	if_setdrvflagbits(ifp, 0, (IFF_DRV_RUNNING | IFF_DRV_OACTIVE));
 }
 
 /*
@@ -6096,14 +6101,14 @@ static int
 bge_resume(device_t dev)
 {
 	struct bge_softc *sc;
-	struct ifnet *ifp;
+	if_t ifp;
 
 	sc = device_get_softc(dev);
 	BGE_LOCK(sc);
 	ifp = sc->bge_ifp;
-	if (ifp->if_flags & IFF_UP) {
+	if (if_getflags(ifp) & IFF_UP) {
 		bge_init_locked(sc);
-		if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+		if (if_getdrvflags(ifp) & IFF_DRV_RUNNING)
 			bge_start_locked(ifp);
 	}
 	BGE_UNLOCK(sc);
@@ -6237,7 +6242,6 @@ bge_add_sysctls(struct bge_softc *sc)
 {
 	struct sysctl_ctx_list *ctx;
 	struct sysctl_oid_list *children;
-	char tn[32];
 	int unit;
 
 	ctx = device_get_sysctl_ctx(sc->bge_dev);
@@ -6276,18 +6280,14 @@ bge_add_sysctls(struct bge_softc *sc)
 	 * consumes a lot of CPU cycles, so leave it off by default.
 	 */
 	sc->bge_forced_collapse = 0;
-	snprintf(tn, sizeof(tn), "dev.bge.%d.forced_collapse", unit);
-	TUNABLE_INT_FETCH(tn, &sc->bge_forced_collapse);
 	SYSCTL_ADD_INT(ctx, children, OID_AUTO, "forced_collapse",
-	    CTLFLAG_RW, &sc->bge_forced_collapse, 0,
+	    CTLFLAG_RWTUN, &sc->bge_forced_collapse, 0,
 	    "Number of fragmented TX buffers of a frame allowed before "
 	    "forced collapsing");
 
 	sc->bge_msi = 1;
-	snprintf(tn, sizeof(tn), "dev.bge.%d.msi", unit);
-	TUNABLE_INT_FETCH(tn, &sc->bge_msi);
 	SYSCTL_ADD_INT(ctx, children, OID_AUTO, "msi",
-	    CTLFLAG_RD, &sc->bge_msi, 0, "Enable MSI");
+	    CTLFLAG_RDTUN, &sc->bge_msi, 0, "Enable MSI");
 
 	/*
 	 * It seems all Broadcom controllers have a bug that can generate UDP
@@ -6300,10 +6300,8 @@ bge_add_sysctls(struct bge_softc *sc)
 	 * dev.bge.0.forced_udpcsum.
 	 */
 	sc->bge_forced_udpcsum = 0;
-	snprintf(tn, sizeof(tn), "dev.bge.%d.bge_forced_udpcsum", unit);
-	TUNABLE_INT_FETCH(tn, &sc->bge_forced_udpcsum);
 	SYSCTL_ADD_INT(ctx, children, OID_AUTO, "forced_udpcsum",
-	    CTLFLAG_RW, &sc->bge_forced_udpcsum, 0,
+	    CTLFLAG_RWTUN, &sc->bge_forced_udpcsum, 0,
 	    "Enable UDP checksum offloading even if controller can "
 	    "generate UDP checksum value 0");
 
diff --git a/sys/dev/bwn/if_bwn.c b/sys/dev/bwn/if_bwn.c
index cc34b12095e0..4e9a8d9ba36c 100644
--- a/sys/dev/bwn/if_bwn.c
+++ b/sys/dev/bwn/if_bwn.c
@@ -83,9 +83,8 @@ static SYSCTL_NODE(_hw, OID_AUTO, bwn, CTLFLAG_RD, 0,
 
 #ifdef BWN_DEBUG
 static	int bwn_debug = 0;
-SYSCTL_INT(_hw_bwn, OID_AUTO, debug, CTLFLAG_RW, &bwn_debug, 0,
+SYSCTL_INT(_hw_bwn, OID_AUTO, debug, CTLFLAG_RWTUN, &bwn_debug, 0,
     "Broadcom debugging printfs");
-TUNABLE_INT("hw.bwn.debug", &bwn_debug);
 enum {
 	BWN_DEBUG_XMIT		= 0x00000001,	/* basic xmit operation */
 	BWN_DEBUG_RECV		= 0x00000002,	/* basic recv operation */
diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c
index feae5bcf78c7..fe7b49ed6df1 100644
--- a/sys/dev/bxe/bxe.c
+++ b/sys/dev/bxe/bxe.c
@@ -297,67 +297,56 @@ SYSCTL_NODE(_hw, OID_AUTO, bxe, CTLFLAG_RD, 0, "bxe driver parameters");
 
 /* Debug */
 unsigned long bxe_debug = 0;
-TUNABLE_ULONG("hw.bxe.debug", &bxe_debug);
-SYSCTL_ULONG(_hw_bxe, OID_AUTO, debug, (CTLFLAG_RDTUN),
+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_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_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 int bxe_max_rx_bufs = 0;
-TUNABLE_INT("hw.bxe.max_rx_bufs", &bxe_max_rx_bufs);
 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 int bxe_hc_rx_ticks = 25;
-TUNABLE_INT("hw.bxe.hc_rx_ticks", &bxe_hc_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 int bxe_hc_tx_ticks = 50;
-TUNABLE_INT("hw.bxe.hc_tx_ticks", &bxe_hc_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 int bxe_rx_budget = 0xffffffff;
-TUNABLE_INT("hw.bxe.rx_budget", &bxe_rx_budget);
 SYSCTL_INT(_hw_bxe, OID_AUTO, rx_budget, CTLFLAG_TUN,
            &bxe_rx_budget, 0, "Rx processing budget");
 
 /* Maximum LRO aggregation size */
 static int bxe_max_aggregation_size = 0;
-TUNABLE_INT("hw.bxe.max_aggregation_size", &bxe_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_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_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_INT(_hw_bxe, OID_AUTO, udp_rss, CTLFLAG_RDTUN,
            &bxe_udp_rss, 0, "UDP RSS support");
 
@@ -11482,6 +11471,10 @@ bxe_process_kill(struct bxe_softc *sc,
     bxe_process_kill_chip_reset(sc, global);
     mb();
 
+    /* clear errors in PGB */
+    if (!CHIP_IS_E1(sc))
+        REG_WR(sc, PGLUE_B_REG_LATCHED_ERRORS_CLR, 0x7f);
+
     /* Recover after reset: */
     /* MCP */
     if (global && bxe_reset_mcp_comp(sc, val)) {
diff --git a/sys/dev/bxe/bxe.h b/sys/dev/bxe/bxe.h
index 039a07a6176d..f37b93f56e73 100644
--- a/sys/dev/bxe/bxe.h
+++ b/sys/dev/bxe/bxe.h
@@ -2301,11 +2301,20 @@ void ecore_storm_memset_struct(struct bxe_softc *sc, uint32_t addr,
         }                                             \
     } while(0)
 
+#ifdef ECORE_STOP_ON_ERROR
+
 #define bxe_panic(sc, msg) \
     do {                   \
         panic msg;         \
     } while (0)
 
+#else
+
+#define bxe_panic(sc, msg) \
+    device_printf((sc)->dev, "%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
+
+#endif
+
 #define CATC_TRIGGER(sc, data) REG_WR((sc), 0x2000, (data));
 #define CATC_TRIGGER_START(sc) CATC_TRIGGER((sc), 0xcafecafe)
 
diff --git a/sys/dev/bxe/bxe_stats.c b/sys/dev/bxe/bxe_stats.c
index e7a890292278..f6b23975cfed 100644
--- a/sys/dev/bxe/bxe_stats.c
+++ b/sys/dev/bxe/bxe_stats.c
@@ -1302,7 +1302,10 @@ bxe_stats_update(struct bxe_softc *sc)
 
         if (bxe_storm_stats_update(sc)) {
             if (sc->stats_pending++ == 3) {
-                bxe_panic(sc, ("storm stats not updated for 3 times\n"));
+		if (if_getdrvflags(sc->ifp) & IFF_DRV_RUNNING) {
+			atomic_store_rel_long(&sc->chip_tq_flags, CHIP_TQ_REINIT);
+			taskqueue_enqueue(sc->chip_tq, &sc->chip_tq_task);
+		}
             }
             return;
         }
diff --git a/sys/dev/bxe/ecore_reg.h b/sys/dev/bxe/ecore_reg.h
index 916df8f33981..b256e7843ecc 100644
--- a/sys/dev/bxe/ecore_reg.h
+++ b/sys/dev/bxe/ecore_reg.h
@@ -1039,6 +1039,8 @@ __FBSDID("$FreeBSD$");
 	0x942cUL
 #define PGLUE_B_REG_INTERNAL_PFID_ENABLE_TARGET_READ \
 	0x9430UL
+#define PGLUE_B_REG_LATCHED_ERRORS_CLR \
+	0x943CUL
 #define PGLUE_B_REG_PGLUE_B_INT_STS \
 	0x9298UL
 #define PGLUE_B_REG_PGLUE_B_INT_STS_CLR \
diff --git a/sys/dev/bxe/ecore_sp.h b/sys/dev/bxe/ecore_sp.h
index c3d9c3a85399..f07921e20481 100644
--- a/sys/dev/bxe/ecore_sp.h
+++ b/sys/dev/bxe/ecore_sp.h
@@ -223,6 +223,8 @@ ECORE_CRC32_LE(uint32_t seed, uint8_t *mac, uint32_t len)
 #define ecore_sp_post(_sc, _a, _b, _c, _d) \
     bxe_sp_post(_sc, _a, _b, U64_HI(_c), U64_LO(_c), _d)
 
+#ifdef ECORE_STOP_ON_ERROR
+
 #define ECORE_DBG_BREAK_IF(exp)     \
     do {                            \
         if (__predict_false(exp)) { \
@@ -242,6 +244,20 @@ ECORE_CRC32_LE(uint32_t seed, uint8_t *mac, uint32_t len)
         }                                                \
     } while (0)
 
+#else
+
+#define ECORE_DBG_BREAK_IF(exp)     \
+    printf("%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
+
+#define ECORE_BUG(exp)     \
+    printf("%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
+
+#define ECORE_BUG_ON(exp)     \
+    printf("%s (%s,%d)\n", __FUNCTION__, __FILE__, __LINE__);
+
+
+#endif /* #ifdef ECORE_STOP_ON_ERROR */
+
 #define ECORE_ERR(str, ...) \
     BLOGE(sc, "ECORE: " str, ##__VA_ARGS__)
 
diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c
index 55b0ee81ddb8..593478a6db8e 100644
--- a/sys/dev/cadence/if_cgem.c
+++ b/sys/dev/cadence/if_cgem.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012-2013 Thomas Skibo
+ * Copyright (c) 2012-2014 Thomas Skibo
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -108,6 +108,7 @@ struct cgem_softc {
 	void			*intrhand;
 	struct callout		tick_ch;
 	uint32_t		net_ctl_shadow;
+	int			ref_clk_num;
 	u_char			eaddr[6];
 
 	bus_dma_tag_t		desc_dma_tag;
@@ -149,6 +150,9 @@ struct cgem_softc {
 #define CGEM_LOCK_DESTROY(sc)	mtx_destroy(&(sc)->sc_mtx)
 #define CGEM_ASSERT_LOCKED(sc)	mtx_assert(&(sc)->sc_mtx, MA_OWNED)
 
+/* Allow platforms to optionally provide a way to set the reference clock. */
+int cgem_set_ref_clk(int unit, int frequency);
+
 static devclass_t cgem_devclass;
 
 static int cgem_probe(device_t dev);
@@ -707,47 +711,18 @@ cgem_start(struct ifnet *ifp)
 	CGEM_UNLOCK(sc);
 }
 
-/* Respond to changes in media. */
-static void
-cgem_media_update(struct cgem_softc *sc, int active)
-{
-	uint32_t net_cfg;
-
-	CGEM_ASSERT_LOCKED(sc);
-
-	/* Update hardware to reflect phy status. */
-	net_cfg = RD4(sc, CGEM_NET_CFG);
-	net_cfg &= ~(CGEM_NET_CFG_SPEED100 | CGEM_NET_CFG_GIGE_EN |
-		     CGEM_NET_CFG_FULL_DUPLEX);
-
-	if (IFM_SUBTYPE(active) == IFM_1000_T)
-		net_cfg |= (CGEM_NET_CFG_SPEED100 | CGEM_NET_CFG_GIGE_EN);
-	else if (IFM_SUBTYPE(active) == IFM_100_TX)
-		net_cfg |= CGEM_NET_CFG_SPEED100;
-
-	if ((active & IFM_FDX) != 0)
-		net_cfg |= CGEM_NET_CFG_FULL_DUPLEX;
-	WR4(sc, CGEM_NET_CFG, net_cfg);
-}
-
 static void
 cgem_tick(void *arg)
 {
 	struct cgem_softc *sc = (struct cgem_softc *)arg;
 	struct mii_data *mii;
-	int active;
 
 	CGEM_ASSERT_LOCKED(sc);
 
 	/* Poll the phy. */
 	if (sc->miibus != NULL) {
 		mii = device_get_softc(sc->miibus);
-		active = mii->mii_media_active;
 		mii_tick(mii);
-		if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) ==
-		    (IFM_ACTIVE | IFM_AVALID) &&
-		    active != mii->mii_media_active)
-			cgem_media_update(sc, mii->mii_media_active);
 	}
 
 	/* Next callout in one second. */
@@ -894,7 +869,6 @@ cgem_init_locked(struct cgem_softc *sc)
 
 	mii = device_get_softc(sc->miibus);
 	mii_pollstat(mii);
-	cgem_media_update(sc, mii->mii_media_active);
 	cgem_start_locked(sc->ifp);
 
 	callout_reset(&sc->tick_ch, hz, cgem_tick, sc);
@@ -1073,12 +1047,13 @@ cgem_ifmedia_upd(struct ifnet *ifp)
 {
 	struct cgem_softc *sc = (struct cgem_softc *) ifp->if_softc;
 	struct mii_data *mii;
+	int error;
 
 	mii = device_get_softc(sc->miibus);
 	CGEM_LOCK(sc);
-	mii_mediachg(mii);
+	error = mii_mediachg(mii);
 	CGEM_UNLOCK(sc);
-	return (0);
+	return (error);
 }
 
 static void
@@ -1148,6 +1123,60 @@ cgem_miibus_writereg(device_t dev, int phy, int reg, int data)
 	return (0);
 }
 
+/*
+ * Overridable weak symbol cgem_set_ref_clk().  This allows platforms to
+ * provide a function to set the cgem's reference clock.
+ */
+static int __used
+cgem_default_set_ref_clk(int unit, int frequency)
+{
+
+	return 0;
+}
+__weak_reference(cgem_default_set_ref_clk, cgem_set_ref_clk);
+
+static void
+cgem_miibus_statchg(device_t dev)
+{
+	struct cgem_softc *sc;
+	struct mii_data *mii;
+	uint32_t net_cfg;
+	int ref_clk_freq;
+
+	sc  = device_get_softc(dev);
+
+	mii = device_get_softc(sc->miibus);
+
+	if ((mii->mii_media_status & IFM_AVALID) != 0) {
+		/* Update hardware to reflect phy status. */
+		net_cfg = RD4(sc, CGEM_NET_CFG);
+		net_cfg &= ~(CGEM_NET_CFG_SPEED100 | CGEM_NET_CFG_GIGE_EN |
+			     CGEM_NET_CFG_FULL_DUPLEX);
+
+		switch (IFM_SUBTYPE(mii->mii_media_active)) {
+		case IFM_1000_T:
+			net_cfg |= (CGEM_NET_CFG_SPEED100 |
+				    CGEM_NET_CFG_GIGE_EN);
+			ref_clk_freq = 125000000;
+			break;
+		case IFM_100_TX:
+			net_cfg |= CGEM_NET_CFG_SPEED100;
+			ref_clk_freq = 25000000;
+			break;
+		default:
+			ref_clk_freq = 2500000;
+		}
+
+		if ((mii->mii_media_active & IFM_FDX) != 0)
+			net_cfg |= CGEM_NET_CFG_FULL_DUPLEX;
+		WR4(sc, CGEM_NET_CFG, net_cfg);
+
+		/* Set the reference clock if necessary. */
+		if (cgem_set_ref_clk(sc->ref_clk_num, ref_clk_freq))
+			device_printf(dev, "could not set ref clk%d to %d.\n",
+				      sc->ref_clk_num, ref_clk_freq);
+	}
+}
 
 static int
 cgem_probe(device_t dev)
@@ -1165,12 +1194,20 @@ cgem_attach(device_t dev)
 {
 	struct cgem_softc *sc = device_get_softc(dev);
 	struct ifnet *ifp = NULL;
+	phandle_t node;
+	pcell_t cell;
 	int rid, err;
 	u_char eaddr[ETHER_ADDR_LEN];
 
 	sc->dev = dev;
 	CGEM_LOCK_INIT(sc);
 
+	/* Get reference clock number and base divider from fdt. */
+	node = ofw_bus_get_node(dev);
+	sc->ref_clk_num = 0;
+	if (OF_getprop(node, "ref-clock-num", &cell, sizeof(cell)) > 0)
+		sc->ref_clk_num = fdt32_to_cpu(cell);
+
 	/* Get memory resource. */
 	rid = 0;
 	sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
@@ -1314,10 +1351,14 @@ cgem_detach(device_t dev)
 	}
 
 	/* Release DMA resources. */
-	if (sc->rxring_dma_map != NULL) {
+	if (sc->rxring != NULL) {
+		if (sc->rxring_physaddr != 0) {
+			bus_dmamap_unload(sc->desc_dma_tag, sc->rxring_dma_map);
+			sc->rxring_physaddr = 0;
+		}
 		bus_dmamem_free(sc->desc_dma_tag, sc->rxring,
 				sc->rxring_dma_map);
-		sc->rxring_dma_map = NULL;
+		sc->rxring = NULL;
 		for (i = 0; i < CGEM_NUM_RX_DESCS; i++)
 			if (sc->rxring_m_dmamap[i] != NULL) {
 				bus_dmamap_destroy(sc->mbuf_dma_tag,
@@ -1325,10 +1366,14 @@ cgem_detach(device_t dev)
 				sc->rxring_m_dmamap[i] = NULL;
 			}
 	}
-	if (sc->txring_dma_map != NULL) {
+	if (sc->txring != NULL) {
+		if (sc->txring_physaddr != 0) {
+			bus_dmamap_unload(sc->desc_dma_tag, sc->txring_dma_map);
+			sc->txring_physaddr = 0;
+		}
 		bus_dmamem_free(sc->desc_dma_tag, sc->txring,
 				sc->txring_dma_map);
-		sc->txring_dma_map = NULL;
+		sc->txring = NULL;
 		for (i = 0; i < CGEM_NUM_TX_DESCS; i++)
 			if (sc->txring_m_dmamap[i] != NULL) {
 				bus_dmamap_destroy(sc->mbuf_dma_tag,
@@ -1364,6 +1409,7 @@ static device_method_t cgem_methods[] = {
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	cgem_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	cgem_miibus_writereg),
+	DEVMETHOD(miibus_statchg,	cgem_miibus_statchg),
 
 	DEVMETHOD_END
 };
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 00d4a19e8cf6..c591fe98042e 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -57,16 +57,12 @@ __FBSDID("$FreeBSD$");
 static SYSCTL_NODE(_hw, OID_AUTO, cardbus, CTLFLAG_RD, 0, "CardBus parameters");
 
 int    cardbus_debug = 0;
-TUNABLE_INT("hw.cardbus.debug", &cardbus_debug);
-SYSCTL_INT(_hw_cardbus, OID_AUTO, debug, CTLFLAG_RW,
-    &cardbus_debug, 0,
-  "CardBus debug");
+SYSCTL_INT(_hw_cardbus, OID_AUTO, debug, CTLFLAG_RWTUN,
+    &cardbus_debug, 0, "CardBus debug");
 
 int    cardbus_cis_debug = 0;
-TUNABLE_INT("hw.cardbus.cis_debug", &cardbus_cis_debug);
-SYSCTL_INT(_hw_cardbus, OID_AUTO, cis_debug, CTLFLAG_RW,
-    &cardbus_cis_debug, 0,
-  "CardBus CIS debug");
+SYSCTL_INT(_hw_cardbus, OID_AUTO, cis_debug, CTLFLAG_RWTUN,
+    &cardbus_cis_debug, 0, "CardBus CIS debug");
 
 #define	DPRINTF(a) if (cardbus_debug) printf a
 #define	DEVPRINTF(x) if (cardbus_debug) device_printf x
diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c
index 08d615f4afa1..0c6988020da6 100644
--- a/sys/dev/cas/if_cas.c
+++ b/sys/dev/cas/if_cas.c
@@ -133,7 +133,7 @@ static void	cas_detach(struct cas_softc *sc);
 static int	cas_disable_rx(struct cas_softc *sc);
 static int	cas_disable_tx(struct cas_softc *sc);
 static void	cas_eint(struct cas_softc *sc, u_int status);
-static int	cas_free(struct mbuf *m, void *arg1, void* arg2);
+static void	cas_free(struct mbuf *m, void *arg1, void* arg2);
 static void	cas_init(void *xsc);
 static void	cas_init_locked(struct cas_softc *sc);
 static void	cas_init_regs(struct cas_softc *sc);
@@ -1888,7 +1888,7 @@ cas_rint(struct cas_softc *sc)
 #endif
 }
 
-static int
+static void
 cas_free(struct mbuf *m, void *arg1, void *arg2)
 {
 	struct cas_rxdsoft *rxds;
@@ -1905,7 +1905,7 @@ cas_free(struct mbuf *m, void *arg1, void *arg2)
 	rxds = &sc->sc_rxdsoft[idx];
 #endif
 	if (refcount_release(&rxds->rxds_refcount) == 0)
-		return (EXT_FREE_OK);
+		return;
 
 	/*
 	 * NB: this function can be called via m_freem(9) within
@@ -1916,7 +1916,6 @@ cas_free(struct mbuf *m, void *arg1, void *arg2)
 	cas_add_rxdesc(sc, idx);
 	if (locked == 0)
 		CAS_UNLOCK(sc);
-	return (EXT_FREE_OK);
 }
 
 static inline void
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index c8dee7059aa4..5240051a611c 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -1220,7 +1220,7 @@ ciss_identify_adapter(struct ciss_softc *sc)
     }
 
     /* sanity-check reply */
-    if (!sc->ciss_id->big_map_supported) {
+    if (!(sc->ciss_id->controller_flags & CONTROLLER_FLAGS_BIG_MAP_SUPPORT)) {
 	ciss_printf(sc, "adapter does not support BIG_MAP\n");
 	error = ENXIO;
 	goto out;
@@ -1250,7 +1250,7 @@ ciss_identify_adapter(struct ciss_softc *sc)
 		    sc->ciss_id->configured_logical_drives,
 		    (sc->ciss_id->configured_logical_drives == 1) ? "" : "s");
 	ciss_printf(sc, "  firmware %4.4s\n", sc->ciss_id->running_firmware_revision);
-	ciss_printf(sc, "  %d SCSI channels\n", sc->ciss_id->scsi_bus_count);
+	ciss_printf(sc, "  %d SCSI channels\n", sc->ciss_id->scsi_chip_count);
 
 	ciss_printf(sc, "  signature '%.4s'\n", sc->ciss_cfg->signature);
 	ciss_printf(sc, "  valence %d\n", sc->ciss_cfg->valence);
@@ -1274,6 +1274,10 @@ ciss_identify_adapter(struct ciss_softc *sc)
     	ciss_printf(sc, "  max logical logical volumes: %d\n", sc->ciss_cfg->max_logical_supported);
     	ciss_printf(sc, "  max physical disks supported: %d\n", sc->ciss_cfg->max_physical_supported);
     	ciss_printf(sc, "  max physical disks per logical volume: %d\n", sc->ciss_cfg->max_physical_per_logical);
+	ciss_printf(sc, "  JBOD Support is %s\n", (sc->ciss_id->uiYetMoreControllerFlags & YMORE_CONTROLLER_FLAGS_JBOD_SUPPORTED) ?
+			"Available" : "Unavailable");
+	ciss_printf(sc, "  JBOD Mode is %s\n", (sc->ciss_id->PowerUPNvramFlags & PWR_UP_FLAG_JBOD_ENABLED) ?
+			"Enabled" : "Disabled");
     }
 
 out:
@@ -3387,25 +3391,28 @@ ciss_cam_complete_fixup(struct ciss_softc *sc, struct ccb_scsiio *csio)
 	bus = cam_sim_bus(xpt_path_sim(csio->ccb_h.path));
 
 	/*
-	 * Don't let hard drives be seen by the DA driver.  They will still be
-	 * attached by the PASS driver.
+	 * If the controller is in JBOD mode, there are no logical volumes.
+	 * Let the disks be probed and dealt with via CAM.  Else, mask off 
+	 * the physical disks and setup the parts of the inq structure for
+	 * the logical volume.  swb
 	 */
-	if (CISS_IS_PHYSICAL(bus)) {
-	    if (SID_TYPE(inq) == T_DIRECT)
-		inq->device = (inq->device & 0xe0) | T_NODEVICE;
-	    return;
+	if( !(sc->ciss_id->PowerUPNvramFlags & PWR_UP_FLAG_JBOD_ENABLED)){
+		if (CISS_IS_PHYSICAL(bus)) {
+	    		if (SID_TYPE(inq) == T_DIRECT)
+				inq->device = (inq->device & 0xe0) | T_NODEVICE;
+	    		return;
+		}
+		cl = &sc->ciss_logical[bus][target];
+
+		padstr(inq->vendor, "HP",
+	       		SID_VENDOR_SIZE);
+		padstr(inq->product,
+	       		ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance),
+	       		SID_PRODUCT_SIZE);
+		padstr(inq->revision,
+	       		ciss_name_ldrive_status(cl->cl_lstatus->status),
+	       		SID_REVISION_SIZE);
 	}
-
-	cl = &sc->ciss_logical[bus][target];
-
-	padstr(inq->vendor, "HP",
-	       SID_VENDOR_SIZE);
-	padstr(inq->product,
-	       ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance),
-	       SID_PRODUCT_SIZE);
-	padstr(inq->revision,
-	       ciss_name_ldrive_status(cl->cl_lstatus->status),
-	       SID_REVISION_SIZE);
     }
 }
 
@@ -3429,13 +3436,17 @@ ciss_name_device(struct ciss_softc *sc, int bus, int target)
 			     target, 0);
 
     if (status == CAM_REQ_CMP) {
+	mtx_lock(&sc->ciss_mtx);
 	xpt_path_lock(path);
 	periph = cam_periph_find(path, NULL);
-	sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d",
-		periph->periph_name, periph->unit_number);
 	xpt_path_unlock(path);
+	mtx_unlock(&sc->ciss_mtx);
 	xpt_free_path(path);
-	return(0);
+	if (periph != NULL) {
+		sprintf(sc->ciss_logical[bus][target].cl_name, "%s%d",
+			periph->periph_name, periph->unit_number);
+		return(0);
+	}
     }
     sc->ciss_logical[bus][target].cl_name[0] = 0;
     return(ENOENT);
diff --git a/sys/dev/ciss/cissreg.h b/sys/dev/ciss/cissreg.h
index 4a3349f8eaea..bd85942925e2 100644
--- a/sys/dev/ciss/cissreg.h
+++ b/sys/dev/ciss/cissreg.h
@@ -615,26 +615,124 @@ struct ciss_bmic_id_table {
     char	running_firmware_revision[4];
     char	stored_firmware_revision[4];
     u_int8_t	hardware_revision;
-    u_int8_t	res1[4];
+    u_int8_t	boot_block_revision[4];
     u_int32_t	deprecated_drive_present_map;
     u_int32_t	deprecated_external_drive_present_map;
     u_int32_t	board_id;
-    u_int8_t	res2;
+    u_int8_t	swapped_error_cable;
     u_int32_t	deprecated_non_disk_map;
-    u_int8_t	res3[5];
+    u_int8_t	bad_host_ram_addr;
+    u_int8_t	cpu_revision;
+    u_int8_t	res3[3];
     char	marketting_revision;
-    u_int8_t	res4:3;
-    u_int8_t	more_than_seven_supported:1;
-    u_int8_t	res5:3;
-    u_int8_t	big_map_supported:1;		/* must be set! */
-    u_int8_t	res6[2];
-    u_int8_t	scsi_bus_count;
-    u_int32_t	res7;
+    u_int8_t	controller_flags;
+#define	CONTROLLER_FLAGS_FLASH_ROM_INSTALLED	0x01
+#define	CONTROLLER_FLAGS_DIAGS_MODE_BIT		0x02
+#define	CONTROLLER_FLAGS_EXPAND_32MB_FX 	0x04
+#define	CONTROLLER_FLAGS_MORE_THAN_7_SUPPORT 	0x08
+#define	CONTROLLER_FLAGS_DAISY_SUPPORT_BIT 	0x10
+#define	CONTROLLER_FLAGS_RES6 			0x20
+#define	CONTROLLER_FLAGS_RES7 			0x40
+#define	CONTROLLER_FLAGS_BIG_MAP_SUPPORT 	0x80
+    u_int8_t	host_flags;
+#define HOST_FLAGS_SDB_ASIC_WORK_AROUND 	0x01
+#define HOST_FLAGS_PCI_DATA_BUS_PARITY_SUPPORT	0x02
+#define HOST_FLAGS_RES3				0x04
+#define HOST_FLAGS_RES4				0x08
+#define HOST_FLAGS_RES5				0x10
+#define HOST_FLAGS_RES6				0x20
+#define HOST_FLAGS_RES7				0x30
+#define HOST_FLAGS_RES8				0x40
+    u_int8_t	expand_disable_code;
+#define EXPAND_DISABLE_NOT_NEEDED		0x01
+#define EXPAND_DISABLE_MISSING_CACHE_BOARD	0x02
+#define EXPAND_DISABLE_WCXC_FATAL_CACHE_BITS	0x04
+#define EXPAND_DISABLE_CACHE_PERM_DISABLED	0x08
+#define EXPAND_DISABLE_RAM_ALLOCATION_FAILED	0x10
+#define EXPAND_DISABLE_BATTEREIS_DISCHARGED	0x20
+#define EXPAND_DISABLE_RES7			0x40
+#define EXPAND_DISABLE_REBUILD_RUNNING		0x80
+    u_int8_t	scsi_chip_count;
+    u_int32_t	maximum_blocks;
     u_int32_t	controller_clock;
     u_int8_t	drives_per_scsi_bus;
     u_int8_t	big_drive_present_map[CISS_BIG_MAP_ENTRIES / 8];
     u_int8_t	big_external_drive_present_map[CISS_BIG_MAP_ENTRIES / 8];
     u_int8_t	big_non_disk_map[CISS_BIG_MAP_ENTRIES / 8];
+
+    u_int16_t	task_flags;		/* used for FW debugging */
+    u_int8_t	ICL_bus_map;		/* Bitmap used for ICL between controllers */
+    u_int8_t	redund_ctlr_modes_support;	/* See REDUNDANT MODE VALUES */
+    u_int8_t	curr_redund_ctlr_mode;
+    u_int8_t	redund_ctlr_status;
+    u_int8_t	redund_op_failure_code;
+
+    u_int8_t	unsupported_nile_bus;
+    u_int8_t	host_i2c_autorev;
+    u_int8_t	cpld_revision;
+    u_int8_t	fibre_chip_count;
+    u_int8_t	daughterboard_type;
+    u_int8_t	more_swapped_config_cable_error;
+
+    u_int8_t	license_key_status;
+    u_int8_t	access_module_status;
+    u_int8_t	features_supported[12];
+    u_int8_t	rec_rom_inact_rev[4];    /* Recovery ROM inactive f/w revision  */
+    u_int8_t	rec_rom_act_status;      /* Recovery ROM flags                  */
+    u_int8_t	pci_to_pci_status;       /* PCI to PCI bridge status            */
+    u_int32_t	redundant_server_info;   /* Reserved for future use             */
+    u_int8_t	percent_write_cache;     /* Percent of memory allocated to write cache */
+    u_int16_t	daughterboard_size_mb;   /* Total size (MB) of cache board      */
+    u_int8_t	cache_batter_count;      /* Number of cache batteries           */
+    u_int16_t	total_controller_mem_mb; /* Total size (MB) of atttached memory */
+    u_int8_t	more_controller_flags;   /* Additional controller flags byte    */
+    u_int8_t	x_board_host_i2c_rev;    /* 2nd byte of 3 byte autorev field    */
+    u_int8_t	battery_pic_rev;         /* BBWC PIC revision                   */
+/*
+ * Below here I have no documentation on the rest of this data structure.  It is
+ * inferred from the opensource cciss_vol_status application.  I assume that this 
+ * data strucutre is 512 bytes in total size, do not exceed it.
+ */
+    u_int8_t	bDdffVersion[4];         /* DDFF update engine version          */
+    u_int16_t	usMaxLogicalUnits;       /* Maximum logical units supported */
+    u_int16_t	usExtLogicalUnitCount;   /* Big num configured logical units */
+    u_int16_t	usMaxPhysicalDevices;    /* Maximum physical devices supported */
+    u_int16_t	usMaxPhyDrvPerLogicalUnit; /* Max physical drive per logical unit */
+    u_int8_t	bEnclosureCount;         /* Number of attached enclosures */
+    u_int8_t	bExpanderCount;          /* Number of expanders detected */
+    u_int16_t	usOffsetToEDPbitmap;     /* Offset to extended drive present map*/
+    u_int16_t	usOffsetToEEDPbitmap;    /* Offset to extended external drive present map */
+    u_int16_t	usOffsetToENDbitmap;     /* Offset to extended non-disk map */
+    u_int8_t	bInternalPortStatus[8];  /* Internal port status bytes */
+    u_int8_t	bExternalPortStatus[8];  /* External port status bytes */
+    u_int32_t	uiYetMoreControllerFlags;/* Yet More Controller flags  */
+#define YMORE_CONTROLLER_FLAGS_JBOD_SUPPORTED \
+	( 1 << 25 )			 /* Controller has JBOD support */
+
+    u_int8_t	bLastLockup;              /* Last lockup code */
+    u_int8_t	bSlot;                    /* PCI slot according to option ROM*/
+    u_int16_t	usBuildNum;               /* Build number */
+    u_int32_t	uiMaxSafeFullStripeSize;  /* Maximum safe full stripe size */
+    u_int32_t	uiTotalLength;            /* Total structure length */
+    u_int8_t	bVendorID[8];             /* Vendor ID */
+    u_int8_t	bProductID[16];           /* Product ID */
+/*
+ * These are even more obscure as they seem to only be available in cciss_vol_status
+ */
+    u_int32_t	ExtendedLastLockupCode;
+    u_int16_t	MaxRaid;
+    u_int16_t	MaxParity;
+    u_int16_t	MaxADGStripSize;
+    u_int16_t	YetMoreSwappedCables;
+    u_int8_t	MaxDevicePaths;
+    u_int8_t	PowerUPNvramFlags;
+#define PWR_UP_FLAG_JBOD_ENABLED	0x08	/*JBOD mode is enabled, all RAID features off */
+
+    u_int16_t	ZonedOffset;
+    u_int32_t   FixedFieldsLength;
+    u_int8_t	FWCompileTimeStamp[24];
+    u_int32_t	EvenMoreControllerFlags;
+    u_int8_t	padding[240];
 } __packed;
 
 /* CISS_BMIC_ID_PDRIVE */
diff --git a/sys/dev/cpuctl/cpuctl.c b/sys/dev/cpuctl/cpuctl.c
index 236d687c4180..96ceb0daacb5 100644
--- a/sys/dev/cpuctl/cpuctl.c
+++ b/sys/dev/cpuctl/cpuctl.c
@@ -67,7 +67,9 @@ static d_ioctl_t cpuctl_ioctl;
 
 static int cpuctl_do_msr(int cpu, cpuctl_msr_args_t *data, u_long cmd,
     struct thread *td);
-static int cpuctl_do_cpuid(int cpu, cpuctl_cpuid_args_t *data,
+static void cpuctl_do_cpuid(int cpu, cpuctl_cpuid_args_t *data,
+    struct thread *td);
+static void cpuctl_do_cpuid_count(int cpu, cpuctl_cpuid_count_args_t *data,
     struct thread *td);
 static int cpuctl_do_update(int cpu, cpuctl_update_args_t *data,
     struct thread *td);
@@ -169,7 +171,8 @@ cpuctl_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
 		ret = cpuctl_do_msr(cpu, (cpuctl_msr_args_t *)data, cmd, td);
 		break;
 	case CPUCTL_CPUID:
-		ret = cpuctl_do_cpuid(cpu, (cpuctl_cpuid_args_t *)data, td);
+		cpuctl_do_cpuid(cpu, (cpuctl_cpuid_args_t *)data, td);
+		ret = 0;
 		break;
 	case CPUCTL_UPDATE:
 		ret = priv_check(td, PRIV_CPUCTL_UPDATE);
@@ -177,6 +180,11 @@ cpuctl_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
 			goto fail;
 		ret = cpuctl_do_update(cpu, (cpuctl_update_args_t *)data, td);
 		break;
+	case CPUCTL_CPUID_COUNT:
+		cpuctl_do_cpuid_count(cpu, (cpuctl_cpuid_count_args_t *)data,
+		    td);
+		ret = 0;
+		break;
 	default:
 		ret = EINVAL;
 		break;
@@ -188,8 +196,9 @@ cpuctl_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
 /*
  * Actually perform cpuid operation.
  */
-static int
-cpuctl_do_cpuid(int cpu, cpuctl_cpuid_args_t *data, struct thread *td)
+static void
+cpuctl_do_cpuid_count(int cpu, cpuctl_cpuid_count_args_t *data,
+    struct thread *td)
 {
 	int is_bound = 0;
 	int oldcpu;
@@ -199,14 +208,25 @@ cpuctl_do_cpuid(int cpu, cpuctl_cpuid_args_t *data, struct thread *td)
 
 	/* Explicitly clear cpuid data to avoid returning stale info. */
 	bzero(data->data, sizeof(data->data));
-	DPRINTF("[cpuctl,%d]: retriving cpuid level %#0x for %d cpu\n",
-	    __LINE__, data->level, cpu);
+	DPRINTF("[cpuctl,%d]: retrieving cpuid lev %#0x type %#0x for %d cpu\n",
+	    __LINE__, data->level, data->level_type, cpu);
 	oldcpu = td->td_oncpu;
 	is_bound = cpu_sched_is_bound(td);
 	set_cpu(cpu, td);
-	cpuid_count(data->level, 0, data->data);
+	cpuid_count(data->level, data->level_type, data->data);
 	restore_cpu(oldcpu, is_bound, td);
-	return (0);
+}
+
+static void
+cpuctl_do_cpuid(int cpu, cpuctl_cpuid_args_t *data, struct thread *td)
+{
+	cpuctl_cpuid_count_args_t cdata;
+
+	cdata.level = data->level;
+	/* Override the level type. */
+	cdata.level_type = 0;
+	cpuctl_do_cpuid_count(cpu, &cdata, td);
+	bcopy(cdata.data, data->data, sizeof(data->data)); /* Ignore error */
 }
 
 /*
@@ -271,12 +291,7 @@ cpuctl_do_update(int cpu, cpuctl_update_args_t *data, struct thread *td)
 	    ("[cpuctl,%d]: bad cpu number %d", __LINE__, cpu));
 	DPRINTF("[cpuctl,%d]: XXX %d", __LINE__, cpu);
 
-	ret = cpuctl_do_cpuid(cpu, &args, td);
-	if (ret != 0) {
-		DPRINTF("[cpuctl,%d]: cannot retrive cpuid info for cpu %d",
-		    __LINE__, cpu);
-		return (ENXIO);
-	}
+	cpuctl_do_cpuid(cpu, &args, td);
 	((uint32_t *)vendor)[0] = args.data[1];
 	((uint32_t *)vendor)[1] = args.data[3];
 	((uint32_t *)vendor)[2] = args.data[2];
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index b6a3d3b91f63..502c2b34be73 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -107,14 +107,12 @@ driver_intr_t	csintr;
 static SYSCTL_NODE(_hw, OID_AUTO, cs, CTLFLAG_RD, 0, "cs device parameters");
 
 int	cs_ignore_cksum_failure = 0;
-TUNABLE_INT("hw.cs.ignore_checksum_failure", &cs_ignore_cksum_failure);
-SYSCTL_INT(_hw_cs, OID_AUTO, ignore_checksum_failure, CTLFLAG_RW,
+SYSCTL_INT(_hw_cs, OID_AUTO, ignore_checksum_failure, CTLFLAG_RWTUN,
     &cs_ignore_cksum_failure, 0,
   "ignore checksum errors in cs card EEPROM");
 
 static int	cs_recv_delay = 570;
-TUNABLE_INT("hw.cs.recv_delay", &cs_recv_delay);
-SYSCTL_INT(_hw_cs, OID_AUTO, recv_delay, CTLFLAG_RW, &cs_recv_delay, 570, "");
+SYSCTL_INT(_hw_cs, OID_AUTO, recv_delay, CTLFLAG_RWTUN, &cs_recv_delay, 570, "");
 
 static int cs8900_eeint2irq[16] = {
 	 10,  11,  12,   5, 255, 255, 255, 255,
diff --git a/sys/dev/cxgb/cxgb_include.h b/sys/dev/cxgb/cxgb_include.h
index 90080b531317..d98ef5771baa 100644
--- a/sys/dev/cxgb/cxgb_include.h
+++ b/sys/dev/cxgb/cxgb_include.h
@@ -5,6 +5,7 @@
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/types.h>
+#include <sys/sysctl.h>
 #include <machine/bus.h>
 #include <cxgb_osdep.h>
 #include <common/cxgb_common.h>
@@ -16,3 +17,5 @@
 #include <common/cxgb_sge_defs.h>
 #include <common/cxgb_firmware_exports.h>
 #include <common/jhash.h>
+
+SYSCTL_DECL(_hw_cxgb);
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index 6ccf6e3774a3..30001293b2bb 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -208,7 +208,6 @@ static SLIST_HEAD(, uld_info) t3_uld_list;
  */
 static int msi_allowed = 2;
 
-TUNABLE_INT("hw.cxgb.msi_allowed", &msi_allowed);
 SYSCTL_NODE(_hw, OID_AUTO, cxgb, CTLFLAG_RD, 0, "CXGB driver parameters");
 SYSCTL_INT(_hw_cxgb, OID_AUTO, msi_allowed, CTLFLAG_RDTUN, &msi_allowed, 0,
     "MSI-X, MSI, INTx selector");
@@ -218,7 +217,6 @@ SYSCTL_INT(_hw_cxgb, OID_AUTO, msi_allowed, CTLFLAG_RDTUN, &msi_allowed, 0,
  * To disable it and force a single queue-set per port, use multiq = 0
  */
 static int multiq = 1;
-TUNABLE_INT("hw.cxgb.multiq", &multiq);
 SYSCTL_INT(_hw_cxgb, OID_AUTO, multiq, CTLFLAG_RDTUN, &multiq, 0,
     "use min(ncpus/ports, 8) queue-sets per port");
 
@@ -228,17 +226,14 @@ SYSCTL_INT(_hw_cxgb, OID_AUTO, multiq, CTLFLAG_RDTUN, &multiq, 0,
  * 
  */
 static int force_fw_update = 0;
-TUNABLE_INT("hw.cxgb.force_fw_update", &force_fw_update);
 SYSCTL_INT(_hw_cxgb, OID_AUTO, force_fw_update, CTLFLAG_RDTUN, &force_fw_update, 0,
     "update firmware even if up to date");
 
 int cxgb_use_16k_clusters = -1;
-TUNABLE_INT("hw.cxgb.use_16k_clusters", &cxgb_use_16k_clusters);
 SYSCTL_INT(_hw_cxgb, OID_AUTO, use_16k_clusters, CTLFLAG_RDTUN,
     &cxgb_use_16k_clusters, 0, "use 16kB clusters for the jumbo queue ");
 
 static int nfilters = -1;
-TUNABLE_INT("hw.cxgb.nfilters", &nfilters);
 SYSCTL_INT(_hw_cxgb, OID_AUTO, nfilters, CTLFLAG_RDTUN,
     &nfilters, 0, "max number of entries in the filter table");
 
diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c
index 42744faa44de..fcc0376fab76 100644
--- a/sys/dev/cxgb/cxgb_sge.c
+++ b/sys/dev/cxgb/cxgb_sge.c
@@ -86,13 +86,11 @@ CTASSERT(NUM_CPL_HANDLERS >= NUM_CPL_CMDS);
 
 extern struct sysctl_oid_list sysctl__hw_cxgb_children;
 int cxgb_txq_buf_ring_size = TX_ETH_Q_SIZE;
-TUNABLE_INT("hw.cxgb.txq_mr_size", &cxgb_txq_buf_ring_size);
 SYSCTL_INT(_hw_cxgb, OID_AUTO, txq_mr_size, CTLFLAG_RDTUN, &cxgb_txq_buf_ring_size, 0,
     "size of per-queue mbuf ring");
 
 static int cxgb_tx_coalesce_force = 0;
-TUNABLE_INT("hw.cxgb.tx_coalesce_force", &cxgb_tx_coalesce_force);
-SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_coalesce_force, CTLFLAG_RW,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_coalesce_force, CTLFLAG_RWTUN,
     &cxgb_tx_coalesce_force, 0,
     "coalesce small packets into a single work request regardless of ring state");
 
@@ -106,19 +104,15 @@ SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_coalesce_force, CTLFLAG_RW,
 
 
 static int cxgb_tx_coalesce_enable_start = COALESCE_START_DEFAULT;
-TUNABLE_INT("hw.cxgb.tx_coalesce_enable_start",
-    &cxgb_tx_coalesce_enable_start);
-SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_coalesce_enable_start, CTLFLAG_RW,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_coalesce_enable_start, CTLFLAG_RWTUN,
     &cxgb_tx_coalesce_enable_start, 0,
     "coalesce enable threshold");
 static int cxgb_tx_coalesce_enable_stop = COALESCE_STOP_DEFAULT;
-TUNABLE_INT("hw.cxgb.tx_coalesce_enable_stop", &cxgb_tx_coalesce_enable_stop);
-SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_coalesce_enable_stop, CTLFLAG_RW,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_coalesce_enable_stop, CTLFLAG_RWTUN,
     &cxgb_tx_coalesce_enable_stop, 0,
     "coalesce disable threshold");
 static int cxgb_tx_reclaim_threshold = TX_RECLAIM_DEFAULT;
-TUNABLE_INT("hw.cxgb.tx_reclaim_threshold", &cxgb_tx_reclaim_threshold);
-SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_reclaim_threshold, CTLFLAG_RW,
+SYSCTL_INT(_hw_cxgb, OID_AUTO, tx_reclaim_threshold, CTLFLAG_RWTUN,
     &cxgb_tx_reclaim_threshold, 0,
     "tx cleaning minimum threshold");
 
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
index 9afad627d5ae..fea86eba709d 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c
@@ -106,43 +106,35 @@ static char *states[] = {
 SYSCTL_NODE(_hw, OID_AUTO, iw_cxgb, CTLFLAG_RD, 0, "iw_cxgb driver parameters");
 
 static int ep_timeout_secs = 60;
-TUNABLE_INT("hw.iw_cxgb.ep_timeout_secs", &ep_timeout_secs);
-SYSCTL_INT(_hw_iw_cxgb, OID_AUTO, ep_timeout_secs, CTLFLAG_RW, &ep_timeout_secs, 0,
+SYSCTL_INT(_hw_iw_cxgb, OID_AUTO, ep_timeout_secs, CTLFLAG_RWTUN, &ep_timeout_secs, 0,
     "CM Endpoint operation timeout in seconds (default=60)");
 
 static int mpa_rev = 1;
-TUNABLE_INT("hw.iw_cxgb.mpa_rev", &mpa_rev);
-SYSCTL_INT(_hw_iw_cxgb, OID_AUTO, mpa_rev, CTLFLAG_RW, &mpa_rev, 0,
+SYSCTL_INT(_hw_iw_cxgb, OID_AUTO, mpa_rev, CTLFLAG_RWTUN, &mpa_rev, 0,
     "MPA Revision, 0 supports amso1100, 1 is spec compliant. (default=1)");
 
 static int markers_enabled = 0;
-TUNABLE_INT("hw.iw_cxgb.markers_enabled", &markers_enabled);
-SYSCTL_INT(_hw_iw_cxgb, OID_AUTO, markers_enabled, CTLFLAG_RW, &markers_enabled, 0,
+SYSCTL_INT(_hw_iw_cxgb, OID_AUTO, markers_enabled, CTLFLAG_RWTUN, &markers_enabled, 0,
     "Enable MPA MARKERS (default(0)=disabled)");
 
 static int crc_enabled = 1;
-TUNABLE_INT("hw.iw_cxgb.crc_enabled", &crc_enabled);
-SYSCTL_INT(_hw_iw_cxgb, OID_AUTO, crc_enabled, CTLFLAG_RW, &crc_enabled, 0,
+SYSCTL_INT(_hw_iw_cxgb, OID_AUTO, crc_enabled, CTLFLAG_RWTUN, &crc_enabled, 0,
     "Enable MPA CRC (default(1)=enabled)");
 
 static int rcv_win = 256 * 1024;
-TUNABLE_INT("hw.iw_cxgb.rcv_win", &rcv_win);
-SYSCTL_INT(_hw_iw_cxgb, OID_AUTO, rcv_win, CTLFLAG_RW, &rcv_win, 0,
+SYSCTL_INT(_hw_iw_cxgb, OID_AUTO, rcv_win, CTLFLAG_RWTUN, &rcv_win, 0,
     "TCP receive window in bytes (default=256KB)");
 
 static int snd_win = 32 * 1024;
-TUNABLE_INT("hw.iw_cxgb.snd_win", &snd_win);
-SYSCTL_INT(_hw_iw_cxgb, OID_AUTO, snd_win, CTLFLAG_RW, &snd_win, 0,
+SYSCTL_INT(_hw_iw_cxgb, OID_AUTO, snd_win, CTLFLAG_RWTUN, &snd_win, 0,
     "TCP send window in bytes (default=32KB)");
 
 static unsigned int nocong = 0;
-TUNABLE_INT("hw.iw_cxgb.nocong", &nocong);
-SYSCTL_UINT(_hw_iw_cxgb, OID_AUTO, nocong, CTLFLAG_RW, &nocong, 0,
+SYSCTL_UINT(_hw_iw_cxgb, OID_AUTO, nocong, CTLFLAG_RWTUN, &nocong, 0,
     "Turn off congestion control (default=0)");
 
 static unsigned int cong_flavor = 1;
-TUNABLE_INT("hw.iw_cxgb.cong_flavor", &cong_flavor);
-SYSCTL_UINT(_hw_iw_cxgb, OID_AUTO, cong_flavor, CTLFLAG_RW, &cong_flavor, 0,
+SYSCTL_UINT(_hw_iw_cxgb, OID_AUTO, cong_flavor, CTLFLAG_RWTUN, &cong_flavor, 0,
     "TCP Congestion control flavor (default=1)");
 
 static void ep_timeout(void *arg);
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index d22bc17cdaa2..316852b65e6e 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -125,16 +125,24 @@ struct adapter;
 typedef struct adapter adapter_t;
 
 enum {
+	/*
+	 * All ingress queues use this entry size.  Note that the firmware event
+	 * queue and any iq expecting CPL_RX_PKT in the descriptor needs this to
+	 * be at least 64.
+	 */
+	IQ_ESIZE = 64,
+
+	/* Default queue sizes for all kinds of ingress queues */
 	FW_IQ_QSIZE = 256,
-	FW_IQ_ESIZE = 64,	/* At least 64 mandated by the firmware spec */
-
 	RX_IQ_QSIZE = 1024,
-	RX_IQ_ESIZE = 64,	/* At least 64 so CPL_RX_PKT will fit */
 
-	EQ_ESIZE = 64,		/* All egress queues use this entry size */
-	SGE_MAX_WR_NDESC = SGE_MAX_WR_LEN / EQ_ESIZE, /* max WR size in desc */
+	/* All egress queues use this entry size */
+	EQ_ESIZE = 64,
+
+	/* Default queue sizes for all kinds of egress queues */
+	CTRL_EQ_QSIZE = 128,
+	TX_EQ_QSIZE = 1024,
 
-	RX_FL_ESIZE = EQ_ESIZE,	/* 8 64bit addresses */
 #if MJUMPAGESIZE != MCLBYTES
 	SW_ZONE_SIZES = 4,	/* cluster, jumbop, jumbo9k, jumbo16k */
 #else
@@ -142,9 +150,7 @@ enum {
 #endif
 	CL_METADATA_SIZE = CACHE_LINE_SIZE,
 
-	CTRL_EQ_QSIZE = 128,
-
-	TX_EQ_QSIZE = 1024,
+	SGE_MAX_WR_NDESC = SGE_MAX_WR_LEN / EQ_ESIZE, /* max WR size in desc */
 	TX_SGL_SEGS = 36,
 	TX_WR_FLITS = SGE_MAX_WR_LEN / 8
 };
@@ -290,7 +296,7 @@ struct cluster_metadata {
 
 struct fl_sdesc {
 	caddr_t cl;
-	uint8_t nmbuf;
+	uint16_t nmbuf;	/* # of driver originated mbufs with ref on cluster */
 	struct cluster_layout cll;
 };
 
@@ -317,6 +323,16 @@ struct tx_sdesc {
 	uint8_t credits;	/* NIC txq: # of frames sent out in the WR */
 };
 
+
+#define IQ_PAD (IQ_ESIZE - sizeof(struct rsp_ctrl) - sizeof(struct rss_header))
+struct iq_desc {
+	struct rss_header rss;
+	uint8_t cpl[IQ_PAD];
+	struct rsp_ctrl rsp;
+};
+#undef IQ_PAD
+CTASSERT(sizeof(struct iq_desc) == IQ_ESIZE);
+
 enum {
 	/* iq flags */
 	IQ_ALLOCATED	= (1 << 0),	/* firmware resources allocated */
@@ -334,27 +350,25 @@ enum {
  * Ingress Queue: T4 is producer, driver is consumer.
  */
 struct sge_iq {
-	bus_dma_tag_t desc_tag;
-	bus_dmamap_t desc_map;
-	bus_addr_t ba;		/* bus address of descriptor ring */
 	uint32_t flags;
-	uint16_t abs_id;	/* absolute SGE id for the iq */
-	int8_t   intr_pktc_idx;	/* packet count threshold index */
-	int8_t   pad0;
-	__be64  *desc;		/* KVA of descriptor ring */
-
 	volatile int state;
 	struct adapter *adapter;
-	const __be64 *cdesc;	/* current descriptor */
+	struct iq_desc  *desc;	/* KVA of descriptor ring */
+	int8_t   intr_pktc_idx;	/* packet count threshold index */
 	uint8_t  gen;		/* generation bit */
 	uint8_t  intr_params;	/* interrupt holdoff parameters */
 	uint8_t  intr_next;	/* XXX: holdoff for next interrupt */
-	uint8_t  esize;		/* size (bytes) of each entry in the queue */
 	uint16_t qsize;		/* size (# of entries) of the queue */
+	uint16_t sidx;		/* index of the entry with the status page */
 	uint16_t cidx;		/* consumer index */
 	uint16_t cntxt_id;	/* SGE context id for the iq */
+	uint16_t abs_id;	/* absolute SGE id for the iq */
 
 	STAILQ_ENTRY(sge_iq) link;
+
+	bus_dma_tag_t desc_tag;
+	bus_dmamap_t desc_map;
+	bus_addr_t ba;		/* bus address of descriptor ring */
 };
 
 enum {
@@ -430,43 +444,55 @@ enum {
 	FL_STARVING	= (1 << 0), /* on the adapter's list of starving fl's */
 	FL_DOOMED	= (1 << 1), /* about to be destroyed */
 	FL_BUF_PACKING	= (1 << 2), /* buffer packing enabled */
+	FL_BUF_RESUME	= (1 << 3), /* resume from the middle of the frame */
 };
 
-#define FL_RUNNING_LOW(fl)	(fl->cap - fl->needed <= fl->lowat)
-#define FL_NOT_RUNNING_LOW(fl)	(fl->cap - fl->needed >= 2 * fl->lowat)
+#define FL_RUNNING_LOW(fl) \
+    (IDXDIFF(fl->dbidx * 8, fl->cidx, fl->sidx * 8) <= fl->lowat)
+#define FL_NOT_RUNNING_LOW(fl) \
+    (IDXDIFF(fl->dbidx * 8, fl->cidx, fl->sidx * 8) >= 2 * fl->lowat)
 
 struct sge_fl {
-	bus_dma_tag_t desc_tag;
-	bus_dmamap_t desc_map;
-	struct cluster_layout cll_def;	/* default refill zone, layout */
-	struct cluster_layout cll_alt;	/* alternate refill zone, layout */
 	struct mtx fl_lock;
-	char lockname[16];
-	int flags;
-
 	__be64 *desc;		/* KVA of descriptor ring, ptr to addresses */
-	bus_addr_t ba;		/* bus address of descriptor ring */
 	struct fl_sdesc *sdesc;	/* KVA of software descriptor ring */
-	uint32_t cap;		/* max # of buffers, for convenience */
-	uint16_t qsize;		/* size (# of entries) of the queue */
-	uint16_t cntxt_id;	/* SGE context id for the freelist */
-	uint32_t cidx;		/* consumer idx (buffer idx, NOT hw desc idx) */
-	uint32_t rx_offset;	/* offset in fl buf (when buffer packing) */
-	uint32_t pidx;		/* producer idx (buffer idx, NOT hw desc idx) */
-	uint32_t needed;	/* # of buffers needed to fill up fl. */
-	uint32_t lowat;		/* # of buffers <= this means fl needs help */
-	uint32_t pending;	/* # of bufs allocated since last doorbell */
-	TAILQ_ENTRY(sge_fl) link; /* All starving freelists */
+	struct cluster_layout cll_def;	/* default refill zone, layout */
+	uint16_t lowat;		/* # of buffers <= this means fl needs help */
+	int flags;
+	uint16_t buf_boundary;
 
-	struct mbuf *m0;
-	struct mbuf **pnext;
-	u_int remaining;
+	/* The 16b idx all deal with hw descriptors */
+	uint16_t dbidx;		/* hw pidx after last doorbell */
+	uint16_t sidx;		/* index of status page */
+	volatile uint16_t hw_cidx;
+
+	/* The 32b idx are all buffer idx, not hardware descriptor idx */
+	uint32_t cidx;		/* consumer index */
+	uint32_t pidx;		/* producer index */
+
+	uint32_t dbval;
+	u_int rx_offset;	/* offset in fl buf (when buffer packing) */
+	volatile uint32_t *udb;
 
 	uint64_t mbuf_allocated;/* # of mbuf allocated from zone_mbuf */
 	uint64_t mbuf_inlined;	/* # of mbuf created within clusters */
 	uint64_t cl_allocated;	/* # of clusters allocated */
 	uint64_t cl_recycled;	/* # of clusters recycled */
 	uint64_t cl_fast_recycled; /* # of clusters recycled (fast) */
+
+	/* These 3 are valid when FL_BUF_RESUME is set, stale otherwise. */
+	struct mbuf *m0;
+	struct mbuf **pnext;
+	u_int remaining;
+
+	uint16_t qsize;		/* # of hw descriptors (status page included) */
+	uint16_t cntxt_id;	/* SGE context id for the freelist */
+	TAILQ_ENTRY(sge_fl) link; /* All starving freelists */
+	bus_dma_tag_t desc_tag;
+	bus_dmamap_t desc_map;
+	char lockname[16];
+	bus_addr_t ba;		/* bus address of descriptor ring */
+	struct cluster_layout cll_alt;	/* alternate refill zone, layout */
 };
 
 /* txq: SGE egress queue + what's needed for Ethernet NIC */
@@ -570,23 +596,10 @@ struct sge_wrq {
 
 
 #ifdef DEV_NETMAP
-#define CPL_PAD (RX_IQ_ESIZE - sizeof(struct rsp_ctrl) - \
-    sizeof(struct rss_header))
-struct nm_iq_desc {
-	struct rss_header rss;
-	union {
-		uint8_t cpl[CPL_PAD];
-		struct cpl_fw6_msg fw6_msg;
-		struct cpl_rx_pkt rx_pkt;
-	} u;
-	struct rsp_ctrl rsp;
-};
-CTASSERT(sizeof(struct nm_iq_desc) == RX_IQ_ESIZE);
-
 struct sge_nm_rxq {
 	struct port_info *pi;
 
-	struct nm_iq_desc *iq_desc;
+	struct iq_desc *iq_desc;
 	uint16_t iq_abs_id;
 	uint16_t iq_cntxt_id;
 	uint16_t iq_cidx;
@@ -734,6 +747,7 @@ struct adapter {
 	void *tom_softc;	/* (struct tom_data *) */
 	struct tom_tunables tt;
 	void *iwarp_softc;	/* (struct c4iw_dev *) */
+	void *iscsi_softc;
 #endif
 	struct l2t_data *l2t;	/* L2 table */
 	struct tid_info tids;
@@ -846,6 +860,12 @@ struct adapter {
 	for (q = &pi->adapter->sge.nm_rxq[pi->first_nm_rxq], iter = 0; \
 	    iter < pi->nnmrxq; ++iter, ++q)
 
+#define IDXINCR(idx, incr, wrap) do { \
+	idx = wrap - idx > incr ? idx + incr : incr - (wrap - idx); \
+} while (0)
+#define IDXDIFF(head, tail, wrap) \
+	((head) >= (tail) ? (head) - (tail) : (wrap) - (tail) + (head))
+
 /* One for errors, one for firmware events */
 #define T4_EXTRA_INTR 2
 
@@ -984,6 +1004,8 @@ void t4_nm_intr(void *);
 
 /* t4_sge.c */
 void t4_sge_modload(void);
+void t4_sge_modunload(void);
+uint64_t t4_sge_extfree_refs(void);
 void t4_init_sge_cpl_handlers(struct adapter *);
 void t4_tweak_chip_settings(struct adapter *);
 int t4_read_chip_settings(struct adapter *);
diff --git a/sys/dev/cxgbe/common/common.h b/sys/dev/cxgbe/common/common.h
index d2e2c8fddb55..7a88462a2c5b 100644
--- a/sys/dev/cxgbe/common/common.h
+++ b/sys/dev/cxgbe/common/common.h
@@ -581,16 +581,20 @@ int t4_set_addr_hash(struct adapter *adap, unsigned int mbox, unsigned int viid,
 		     bool ucast, u64 vec, bool sleep_ok);
 int t4_enable_vi(struct adapter *adap, unsigned int mbox, unsigned int viid,
 		 bool rx_en, bool tx_en);
-int t4_enable_vi_ns(struct adapter *adap, unsigned int mbox, unsigned int viid,
-		 bool rx_en, bool tx_en);
 int t4_identify_port(struct adapter *adap, unsigned int mbox, unsigned int viid,
 		     unsigned int nblinks);
-int t4_i2c_rd(struct adapter *adap, unsigned int mbox, unsigned int port_id,
-	      u8 dev_addr, u8 offset, u8 *valp);
 int t4_mdio_rd(struct adapter *adap, unsigned int mbox, unsigned int phy_addr,
 	       unsigned int mmd, unsigned int reg, unsigned int *valp);
 int t4_mdio_wr(struct adapter *adap, unsigned int mbox, unsigned int phy_addr,
 	       unsigned int mmd, unsigned int reg, unsigned int val);
+int t4_i2c_rd(struct adapter *adap, unsigned int mbox,
+	      int port, unsigned int devid,
+	      unsigned int offset, unsigned int len,
+	      u8 *buf);
+int t4_i2c_wr(struct adapter *adap, unsigned int mbox,
+	      int port, unsigned int devid,
+	      unsigned int offset, unsigned int len,
+	      u8 *buf);
 int t4_iq_start_stop(struct adapter *adap, unsigned int mbox, bool start,
 		     unsigned int pf, unsigned int vf, unsigned int iqid,
 		     unsigned int fl0id, unsigned int fl1id);
@@ -610,8 +614,10 @@ 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_config(struct adapter *adapter, int type, int minmaxen,
+		    int sleep_ok);
 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);
+		    int minrate, int maxrate, int weight, int pktsize,
+		    int sleep_ok);
 #endif /* __CHELSIO_COMMON_H */
diff --git a/sys/dev/cxgbe/common/t4_hw.c b/sys/dev/cxgbe/common/t4_hw.c
index 8b32bbb48370..d81f45ee8e89 100644
--- a/sys/dev/cxgbe/common/t4_hw.c
+++ b/sys/dev/cxgbe/common/t4_hw.c
@@ -2077,15 +2077,18 @@ static void pcie_intr_handler(struct adapter *adapter)
 
 	int fat;
 
-	fat = t4_handle_intr_status(adapter,
-				    A_PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
-				    sysbus_intr_info) +
-	      t4_handle_intr_status(adapter,
-				    A_PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
-				    pcie_port_intr_info) +
-	      t4_handle_intr_status(adapter, A_PCIE_INT_CAUSE,
-				    is_t4(adapter) ?
-				    pcie_intr_info : t5_pcie_intr_info);
+	if (is_t4(adapter))
+		fat = t4_handle_intr_status(adapter,
+					    A_PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
+					    sysbus_intr_info) +
+		      t4_handle_intr_status(adapter,
+					    A_PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
+					    pcie_port_intr_info) +
+		      t4_handle_intr_status(adapter, A_PCIE_INT_CAUSE,
+					    pcie_intr_info);
+	else
+		fat = t4_handle_intr_status(adapter, A_PCIE_INT_CAUSE,
+					    t5_pcie_intr_info);
 	if (fat)
 		t4_fatal_err(adapter);
 }
@@ -2466,9 +2469,15 @@ static void ma_intr_handler(struct adapter *adapter)
 {
 	u32 v, status = t4_read_reg(adapter, A_MA_INT_CAUSE);
 
-	if (status & F_MEM_PERR_INT_CAUSE)
+	if (status & F_MEM_PERR_INT_CAUSE) {
 		CH_ALERT(adapter, "MA parity error, parity status %#x\n",
-			 t4_read_reg(adapter, A_MA_PARITY_ERROR_STATUS));
+			 t4_read_reg(adapter, A_MA_PARITY_ERROR_STATUS1));
+		if (is_t5(adapter))
+			CH_ALERT(adapter,
+				 "MA parity error, parity status %#x\n",
+				 t4_read_reg(adapter,
+				 	     A_MA_PARITY_ERROR_STATUS2));
+	}
 	if (status & F_MEM_WRAP_INT_CAUSE) {
 		v = t4_read_reg(adapter, A_MA_INT_WRAP_STATUS);
 		CH_ALERT(adapter, "MA address wrap-around error by client %u to"
@@ -2685,10 +2694,8 @@ void t4_intr_clear(struct adapter *adapter)
 {
 	static const unsigned int cause_reg[] = {
 		A_SGE_INT_CAUSE1, A_SGE_INT_CAUSE2, A_SGE_INT_CAUSE3,
-		A_PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
-		A_PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
 		A_PCIE_NONFAT_ERR, A_PCIE_INT_CAUSE,
-		A_MA_INT_WRAP_STATUS, A_MA_PARITY_ERROR_STATUS, A_MA_INT_CAUSE,
+		A_MA_INT_WRAP_STATUS, A_MA_PARITY_ERROR_STATUS1, A_MA_INT_CAUSE,
 		A_EDC_INT_CAUSE, EDC_REG(A_EDC_INT_CAUSE, 1),
 		A_CIM_HOST_INT_CAUSE, A_CIM_HOST_UPACC_INT_CAUSE,
 		MYPF_REG(A_CIM_PF_HOST_INT_CAUSE),
@@ -2710,6 +2717,14 @@ void t4_intr_clear(struct adapter *adapter)
 	t4_write_reg(adapter, is_t4(adapter) ? A_MC_INT_CAUSE :
 				A_MC_P_INT_CAUSE, 0xffffffff);
 
+	if (is_t4(adapter)) {
+		t4_write_reg(adapter, A_PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
+				0xffffffff);
+		t4_write_reg(adapter, A_PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
+				0xffffffff);
+	} else
+		t4_write_reg(adapter, A_MA_PARITY_ERROR_STATUS2, 0xffffffff);
+
 	t4_write_reg(adapter, A_PL_INT_CAUSE, GLBL_INTR_MASK);
 	(void) t4_read_reg(adapter, A_PL_INT_CAUSE);          /* flush */
 }
@@ -4147,36 +4162,6 @@ int t4_fwaddrspace_write(struct adapter *adap, unsigned int mbox, u32 addr, u32
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
-/**
- *	t4_i2c_rd - read a byte from an i2c addressable device
- *	@adap: the adapter
- *	@mbox: mailbox to use for the FW command
- *	@port_id: the port id
- *	@dev_addr: the i2c device address
- *	@offset: the byte offset to read from
- *	@valp: where to store the value
- */
-int t4_i2c_rd(struct adapter *adap, unsigned int mbox, unsigned int port_id,
-	       u8 dev_addr, u8 offset, u8 *valp)
-{
-	int ret;
-	struct fw_ldst_cmd c;
-
-	memset(&c, 0, sizeof(c));
-	c.op_to_addrspace = htonl(V_FW_CMD_OP(FW_LDST_CMD) | F_FW_CMD_REQUEST |
-		F_FW_CMD_READ |
-		V_FW_LDST_CMD_ADDRSPACE(FW_LDST_ADDRSPC_FUNC_I2C));
-	c.cycles_to_len16 = htonl(FW_LEN16(c));
-	c.u.i2c_deprecated.pid_pkd = V_FW_LDST_CMD_PID(port_id);
-	c.u.i2c_deprecated.base = dev_addr;
-	c.u.i2c_deprecated.boffset = offset;
-
-	ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
-	if (ret == 0)
-		*valp = c.u.i2c_deprecated.data;
-	return ret;
-}
-
 /**
  *	t4_mdio_rd - read a PHY register through MDIO
  *	@adap: the adapter
@@ -4236,6 +4221,87 @@ int t4_mdio_wr(struct adapter *adap, unsigned int mbox, unsigned int phy_addr,
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
+/**
+ *	t4_i2c_rd - read I2C data from adapter
+ *	@adap: the adapter
+ *	@port: Port number if per-port device; <0 if not
+ *	@devid: per-port device ID or absolute device ID
+ *	@offset: byte offset into device I2C space
+ *	@len: byte length of I2C space data
+ *	@buf: buffer in which to return I2C data
+ *
+ *	Reads the I2C data from the indicated device and location.
+ */
+int t4_i2c_rd(struct adapter *adap, unsigned int mbox,
+	      int port, unsigned int devid,
+	      unsigned int offset, unsigned int len,
+	      u8 *buf)
+{
+	struct fw_ldst_cmd ldst;
+	int ret;
+
+	if (port >= 4 ||
+	    devid >= 256 ||
+	    offset >= 256 ||
+	    len > sizeof ldst.u.i2c.data)
+		return -EINVAL;
+
+	memset(&ldst, 0, sizeof ldst);
+	ldst.op_to_addrspace =
+		cpu_to_be32(V_FW_CMD_OP(FW_LDST_CMD) |
+			    F_FW_CMD_REQUEST |
+			    F_FW_CMD_READ |
+			    V_FW_LDST_CMD_ADDRSPACE(FW_LDST_ADDRSPC_I2C));
+	ldst.cycles_to_len16 = cpu_to_be32(FW_LEN16(ldst));
+	ldst.u.i2c.pid = (port < 0 ? 0xff : port);
+	ldst.u.i2c.did = devid;
+	ldst.u.i2c.boffset = offset;
+	ldst.u.i2c.blen = len;
+	ret = t4_wr_mbox(adap, mbox, &ldst, sizeof ldst, &ldst);
+	if (!ret)
+		memcpy(buf, ldst.u.i2c.data, len);
+	return ret;
+}
+
+/**
+ *	t4_i2c_wr - write I2C data to adapter
+ *	@adap: the adapter
+ *	@port: Port number if per-port device; <0 if not
+ *	@devid: per-port device ID or absolute device ID
+ *	@offset: byte offset into device I2C space
+ *	@len: byte length of I2C space data
+ *	@buf: buffer containing new I2C data
+ *
+ *	Write the I2C data to the indicated device and location.
+ */
+int t4_i2c_wr(struct adapter *adap, unsigned int mbox,
+	      int port, unsigned int devid,
+	      unsigned int offset, unsigned int len,
+	      u8 *buf)
+{
+	struct fw_ldst_cmd ldst;
+
+	if (port >= 4 ||
+	    devid >= 256 ||
+	    offset >= 256 ||
+	    len > sizeof ldst.u.i2c.data)
+		return -EINVAL;
+
+	memset(&ldst, 0, sizeof ldst);
+	ldst.op_to_addrspace =
+		cpu_to_be32(V_FW_CMD_OP(FW_LDST_CMD) |
+			    F_FW_CMD_REQUEST |
+			    F_FW_CMD_WRITE |
+			    V_FW_LDST_CMD_ADDRSPACE(FW_LDST_ADDRSPC_I2C));
+	ldst.cycles_to_len16 = cpu_to_be32(FW_LEN16(ldst));
+	ldst.u.i2c.pid = (port < 0 ? 0xff : port);
+	ldst.u.i2c.did = devid;
+	ldst.u.i2c.boffset = offset;
+	ldst.u.i2c.blen = len;
+	memcpy(ldst.u.i2c.data, buf, len);
+	return t4_wr_mbox(adap, mbox, &ldst, sizeof ldst, &ldst);
+}
+
 /**
  *	t4_sge_ctxt_flush - flush the SGE context cache
  *	@adap: the adapter
@@ -5155,19 +5221,6 @@ int t4_enable_vi(struct adapter *adap, unsigned int mbox, unsigned int viid,
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
-int t4_enable_vi_ns(struct adapter *adap, unsigned int mbox, unsigned int viid,
-		 bool rx_en, bool tx_en)
-{
-	struct fw_vi_enable_cmd c;
-
-	memset(&c, 0, sizeof(c));
-	c.op_to_viid = htonl(V_FW_CMD_OP(FW_VI_ENABLE_CMD) | F_FW_CMD_REQUEST |
-			     F_FW_CMD_EXEC | V_FW_VI_ENABLE_CMD_VIID(viid));
-	c.ien_to_len16 = htonl(V_FW_VI_ENABLE_CMD_IEN(rx_en) |
-			       V_FW_VI_ENABLE_CMD_EEN(tx_en) | FW_LEN16(c));
-	return t4_wr_mbox_ns(adap, mbox, &c, sizeof(c), NULL);
-}
-
 /**
  *	t4_identify_port - identify a VI's port by blinking its LED
  *	@adap: the adapter
@@ -5679,7 +5732,8 @@ 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)
+int t4_sched_config(struct adapter *adapter, int type, int minmaxen,
+    		    int sleep_ok)
 {
 	struct fw_sched_cmd cmd;
 
@@ -5694,12 +5748,13 @@ int t4_sched_config(struct adapter *adapter, int type, int minmaxen)
 	cmd.u.config.minmaxen = minmaxen;
 
 	return t4_wr_mbox_meat(adapter,adapter->mbox, &cmd, sizeof(cmd),
-			       NULL, 1);
+			       NULL, sleep_ok);
 }
 
 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)
+		    int minrate, int maxrate, int weight, int pktsize,
+		    int sleep_ok)
 {
 	struct fw_sched_cmd cmd;
 
@@ -5723,5 +5778,5 @@ int t4_sched_params(struct adapter *adapter, int type, int level, int mode,
 	cmd.u.params.pktsize = cpu_to_be16(pktsize);
 
 	return t4_wr_mbox_meat(adapter,adapter->mbox, &cmd, sizeof(cmd),
-			       NULL, 1);
+			       NULL, sleep_ok);
 }
diff --git a/sys/dev/cxgbe/firmware/t4fw-1.11.27.0.bin.uu b/sys/dev/cxgbe/firmware/t4fw-1.11.27.0.bin.uu
new file mode 100644
index 000000000000..4c26f91527eb
--- /dev/null
+++ b/sys/dev/cxgbe/firmware/t4fw-1.11.27.0.bin.uu
@@ -0,0 +1,9019 @@
+/*-
+ * Copyright (c) 2014 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
+AAAD6QELGwAAAQkEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAA8wD2wPjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAENoZWxzaW8gRlcgUlVOTUVNIERFQlVHPTAgKEJ1aWx0IFdlZCBKdW4gMTggMTc6
+MTk6MzMgUERUIDIwMTQgb24gY2xlb3BhdHJhLmFzaWNkZXNpZ25lcnMuY29tOi9ob21lL2Zpcm13
+YXJlL2N2cy9mdy1yZWxlYXNlKSwgVmVyc2lvbiBUNHh4IDAxLjBiLjFiLjAwAAAAAAAAAG/bT/dg
+AMgA4QB78AAQAADhADC4eP///x/84UCAAAAB4QB7cAAAEAAf//zc4QGUcCAAAADhAZwE4QB5AAAC
+AEDhAHmAAAYAQAACAAoABgAK4QB5BAAMAACAAAEC4QB7POEAe0ThAHvk4gAAAAABAADhAHuQIAAA
+AAAAgADhAHsAAABAAeEAe5wAAEAAREREQuAAAADjAARzREREQOMACAAgAAJcAAAAAB//khAAAAAA
+H/+SFAAAAAAf/5IYAAAAAB//khwf/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/l8AwKDcwKDc0KDc4KDc8Iz0BcjPtEv+VwDAnNwAnNxAn
+NyAnNzAjPQFyM+0S/5AV/5AW/5HAMNcgBWYBYAAZAAAAAAAAAAQ2BQACANMP0w8FMwxuOxQHRxQH
+BEN2MeYENgUFMwxvO+0AAgAS/4MV/4EjCgACJwIHBEMEPgUFMwwHRxRvO/ADAgAS/33JLoMghCGF
+IrwidDsOhlC0VZYwtDN0M/Rj/+YAZT/iZV/fEv9xwDIDLgUDAgAS/2jAMCg3QCg3RCg3SCg3TCM9
+AXIz7QACABL/ay0nAMARAUkxAEgxAQIAwAAU/2gE0jEV/2eUUBT/ZwTTMRX/ZpRQFP9mBNQxFf9m
+lFAU/2UE1TEV/2WUUBD/ZQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/AAA
+H/wAAOMACfgf/AAAH/wAAOMACfgf/AAAH/wAAOMACfgf/4AAH/+KMOMACfgf/4owH/+KMOMAFCgf
+/4owH/+KMOMAFCgf/4owH/+LuOMAFCgf/4u4H/+SCOMAFbAf/5IQH/+xHOMAHAgf/7EcH/+xHOMA
+OxQf/8AAH//9yeMAOxQgAAAAIAABauMAeOAgAAF4IAABfOMAekwgAAF8IAABheMAelAgAAGYIAAB
+nOMAelwgAAGcIAABpeMAemAgAAG4IAABvOMAemwgAAG8IAABxeMAenAgAAHYIAAB2OMAenwgAAHc
+IAAB4uMAenwgAAH4IAAB+OMAeoQgAAH8IAAB/OMAeoQgAAIYIAACGOMAeoQgAAIcIAACHOMAeoQg
+AAI4IAACOOMAeoQgAAI8IAACPOMAeoQgAAJYIAACWOMAeoQgAAJcIAACYuMAeoQgAAJ4IAACeOMA
+eowgAAJ8IAACguMAeowgAAKYIAHZmeMAepQgAwAAIAMT/OMCUZggAxP8IAMT/OMCZZQgAxQAIAaQ
+XOMCZZggBpBgIAaWEOMF4fggCAAAIAgOMOMF56ggCA4wIAkeUOMF9dggCR5QIAkfHOMHBfggCwAA
+IAsAAOMHBsQgCwAAIAsAAOMHBsQgCwAAIAuPr+MHBsQAAAAAAAAAAAAAAAAgABGWIAARiCAAFXog
+ABGIIAAU9SAAEYggABI9IAAUjSAAFBIgABGIIAATvSAAE3QgABMJIAARdSAAErQgABGIIAARiCAA
+EYggABJcAAAAAP///////w/8///w////APwgAKejIACo4yAAqRMgAKjZIAComSAAqI8gAKhUIACo
+SiAAqEAgAKfwIACpESAAp+YgAKfMAAAAAAAAAAAAAAAAAAAACgAAAAoAAAAUAAAACgAAAAoAAAAK
+AAAACgAAAAoAAAAKAAAAAAAAAAAAAAAAAAEAAQABAAEAAQABAAEAAQABAAIAAwAEAAUABgAHAAgA
+CQAKAA4AEQAVABkAHgAjAC0APABQAGQAyAEsAZAB9AAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAgAC
+AAMAAwADAAMABAAEAAQABAAEAAUABQAFAAUABQAFAAYABgAHAAcAAAACAAAABgAAAAoAAAAOAAAA
+FAAAABwAAAAoAAAAOAAAAFAAAABwAAAAoAAAAOAAAAFAAAABwAAAAoAAAAOAAAAFAQAABwAAAAoA
+AAAOAAAAFAAAABwAAAAoAAAAOAAAAFAAAABwAAAAoAAAAOAAAAFAAAABwAAAAoAAAAOAAP8AAQIC
+AAAAAAAAAAAAAAAQIEAAAAAAAAAAAAAAAAAABAACAAEAAIAAQAAgABAACCBAgAAAAAAAAAAAAAAA
+AAAgCJ5CIAieQiAIngEgCJ3RIAidmiAInYAgCJ2AIAie9iAInvYgCJ2AIAie9iAInvYgCJ2AIAie
+9iAInUwgCJ72IAie9iAInvYgCJ72IAie9iAInvYgCJ72IAie9iAInvYgCJ72IAie9iAInvYgCJ72
+IAie9iAInvYgCJ72IAidYSADCawAAAAAIAMJsAAAAAEgAwm4AAAAAgAAAAAAAAAAIAMJlAAAAAEg
+AwmYAAAAAiADDbgAAAD/IAMHrAAAAP8gAwesAAAAACADDbgAAAAAIAMIvAAAAAEgAwjEAAAABCAD
+CMwAAAAIIAMI2AAAACAgAwjoAAAAQCADCPAAAACAIAMI+AAAAQAgAwkAAAACACADCRQAAAQAIAMJ
+KAAACAAgAwlAAAAQACADCVQAACAAIAMJZAAAQAAgAwlwAACAACADCYQAAQAAAAAAAAAAAAAgAwio
+AAAAECADCLAAAAARIAMIkAAAAAAgAwiUAAAAASADCJgAAAACIAMIoAAAAAMAAAAAAAD//wAAAAAA
+AP//IAMIEAAAAQAgAwgcAAAAgCADCCwAAABAIAMIPAAAACAgAwhMAAAAECADCFwAAAAIIAMIaAAA
+AAQgAwh0AAAAAiADCIAAAAABAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAA
+AQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAABwAAAAcAAAAGAAAABgAMNQAAEEaq
+ABRYVQAYagAAACtoAAAjgwAAGGoAAA0GAAALKgAAAAAAAAAAAAAAAAAAaCsAAGgrAABsggAAb5wA
+AEpoAABKaAAATSkAAEpoAABO6gAATJgAAFI9AABPuAABhqAAAYagAAII1gACCNYAAgjVAAII1QAC
+iwsAAosLAAII1QACtnIAArZyAAMNQAAEBgcAAAAAAAAAAAAAAAAgCRYVIAkWFSAJFgogCRX/IAkV
+8SAJFekgCRXpIAkWGCAJFhggCRXpIAkWGCAJFhggCRXpIAkWGCAJFekgCRYYIAkWGCAJFhggCRYY
+IAkWGCAJFhggCRYYIAkWGCAJFhggCRYYIAkWGCAJFhggCRYYIAkWGCAJFhggCRYYIAkWGAACAgUF
+CAgLCw4OEREUFBcXGhodHSAgIyMmJikpLCwvLzIyNTU4ODs7AAAAAAAAAAEDEREICBAJAwEAAAAA
+AAAgBLdgIAGTPCAANnggAWi8IAGPhCABiXwgAUegIAPaHB//6jQgAJRkIACppB//3RAgAGG8IABT
+IAAAAAAAAAAAIAFqcCAAgbAAAAAAAAAAAB//1fQf/8V8H//ClB//wDAgAE4gIABGRCAAQoAgAKBk
+H//j6CAGZ7gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAGbACABergg
+ALNIIACyfB//8Ggf/9CgH//MOCAAfyggBRkwIAEoGCABB6QgAPCgIADkqCAA2CwgAMqkIAC2ICAE
+uxggA/YcIAEcmCAEFzQgAccsIABhfAAAAAAgALOkIAWDDCAApyAgAXK4IAACmCAAmiQAAAAAAAAA
+AB//87AgALNkIAP4zAAAAAAAAAAAIANWRCAAJtQgAB0MIAAlwAAAAAAgADFwIAAuyCAAK8gAAAAA
+IAA2OCABIFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgADPIIAS3AAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAA1eCADXdAgADSAAAAAAAAAAAAAAAAAAAAAAAAA
+AAQAAAAEAAAACAsAAAAgAxFQCAAAACADEVwIAAAAIAMRaAoAAAAgAxF0DAAAACADEYASAAAAIAMR
+kA0AAAAgAxGkDgAAACADEbQTAAAAIAMRxAoAAAAgAxHYDgAAACADEeQYAAAAIAMR9A0AAAAgAxIQ
+DgAAACADEiAQAAAAIAMSMBIAAAAgAxJEDgAAACADElgQAAAAIAMSaBEAAAAgAxJ8CgAAACADEpAL
+AAAAIAMSnA0AAAAgAxKoFAAAACADErgKAAAAIAMS0A8AAAAgAxLcBgAAACADEuwGAAAAIAMS9AYA
+AAAgAxL8BgAAACADEwQGAAAAIAMTDAkAAAAgAxMUBgAAACADEyAEAAAAIAMTKAYAAAAgAxMwCwAA
+ACADEzgLAAAAIAMTRAQAAAAgAxMoBAAAACADE1AJAAAAIAMTWAkAAAAgAxNkAAAAAAAAAAANAAAA
+IAMTcAoAAAAgAxOABgAAACADE4wCAAAAIAMTlAMAAAAgAw2MAQAAACADE5gAAAAAAAAAANdqpHjo
+x7dWJCBw28G9zu71fA+vR4fGKqgwRhP9RpUBaYCY2ItE96///1uxiVzXvmuQESL9mHGTpnlDjkm0
+CCH2HiViwECzQCZeWlHptseq1i8QXQJEFFPYoeaB59P7yCHhzebDNwfW9NUNh0VaFO2p4+kF/O+j
++GdvAtmNKkyK//o5Qodx9oFtnWEi/eU4DKS+6kRL3s+p9rtLYL6/vHAom37G6qEn+tTvMIUEiB0F
+2dTQOebbmeUfonz4xKxWZfQpIkRDKv+Xq5Qjp/yToDllW1nDjwzMkv/v9H2FhF3Rb6h+T/4s5uCj
+AUMUTggRofdTfoK9OvI1KtfSu+uG05EHDBEWBwwRFgcMERYHDBEWBQkOFAUJDhQFCQ4UBQkOFAQL
+EBcECxAXBAsQFwQLEBcGCg8VBgoPFQYKDxUGCg8VH//AAAAEACAgBpYQIAaZwB/83gAf/53UIAaW
+QB//nuQf/6IwA4AAAIEAAAAf/6IgAP/4AAEAAAAAEAAAgQQBAIEEAAABBAAAAQQBAIAAAAAABf//
+H/+FYAYAAAAqAAAAH//P+CAEMngCAAAAgBAAAEFAAABBQAEAgwAAAf//v/+/////H/+XcAQAAAgg
+AwuggYAAAAwAAAAf/5Jg//8AAP//AP8AAQAAAAD//x//raAf/5q0D////x//n+gf/OIAH/+kHB//
+oOQf/6OQH/+kFB/84ODg//4A4QGSAB//l+QA////H/+fnB//m/QEQQAIBAEACKUAAADAAAAAwAQA
+ADAAAAAf/6AgAAAPoAAA/4AgBpBgIAtUYOEALgAf/6AUH/+b/B//oPAf/5xgH/+gQOAAAKDhADC4
+AACAAOEAYBAAAEAA4QIQAOECMADhAlAA4QJwAOEAEAgf/OFA4QB7cB//sNwf/7DUH/zgCB//sNgf
+/7D0H/+w7B//sPAf/7EMH/+xBB//sQgf/53UH/+toCAGlkAf/N4AH/+e5AEAAAAf/6BgH/+fbB//
+nAQf/6DsAAD/gAAAEIAf/5JgH/+g+B//oPQf/6FYBAAACAUAAACD/wAAgQAAAAAQAAAqAAAAIAAH
+7CADCsgf/4lwH/+FYB//ojBnRSMB782riZi63P4QMlR2H/+AAAAAPyggAw2Mz////yALBhAQAAAA
+P////wIAAABAAAAA//9//yALBzAf/6IgIAAhsCALB9AIAAAAAP///yALCEAgCwdg9////yALCjAg
+AB5Y//7//yALFCAAIAAAAABAAAwAAAAAAP//AACAAA0AAAAgACRg//v//w/2gAAAA///AAAn/yAL
+GFAgCxiAAAEAAAAEAAAfgAA/H/+feCAAMXAgADOEIAAuyCALGRAgCxmwIAAryCALGgAgCxqQBAEA
+COAAAAAf/5+EUwAAAFIAAABRAAAAIAHRpB//nFggCx0wIAsdkCALHWAgCyAQH/+fnCALIGAf/5v8
+H/+fUCALIgAUAAAAgAAAAIAAAAJ4AAAAgAAABoAAsAAAAAoAAOMwkv//8ACAALEA4QGaAAACAAAg
+CyHAH/+ZmAAAfkAf/5+IAP/AAB//n4wf/5LkKAAAACYAAAAgCyIwH/+TIAYAAAAFgAAAIAtoEB//
+m8ArAAAAIABJCB//nVA1AAAAA4AAAAMAAAAH////AD///4BAAAAID///H////yAAAAAAAMAAPQAA
+AB//mBAHAAAAgQQBAIEEAAAf/52wAAA6mMMAAAAAAA//AEMAAAAACAAEAAAAIAtocB//sFAf/63A
+H/+XcAAGAADhAHoAH/+X4B//n3AgoAAAH/+cCB//newf/534IAtooAADB4AgC2kQH/+Z4ABAAAAA
+AAkAAAAwAv/8+H/AAAAAo/+7AKP/ugDgAwAAg/+2AA////8P//gA/wAAACALaVAgCyQwIAskYCAL
+aeAADwAAAAoAAP//AA8f/590A//AAIP/wAAgC2pgIAtq0B//oAQf/OIAH/+kHB//rjD/YPAAH/+u
+EB//pCAf/5IgBIAACB//gFAARAAA/x///wDAAAAAAIEA8AAAAIGAAAD/f///H/zgdB//mrT/v///
+//8AAACAAAAAAIbdH/+TEB/84gzuAAAADwAAAB//n5Qf/6QYAAAPSB/84ggf/5gMH/+AYCAGkkAA
+ADAAAAAnEB//3IAgC3LwH/+g5B//oEQAAP/+H/+b8N6tvu8gAwYQNAAAAD8AAAAAAIkGAJkAAB//
+rXgQAAcCAcCAAB//rEiZAAAAH/+uNACIAAiCgAABH/+tyB//rNQDFQAAAxEAAAAPA/8gCyjQIAsp
+MCALKYAgCyngIAspACAA30QgCyuAIAsrsCALLAAgCyxgIADk8CkAAAAgAOtsIAtzQCALc6AgC3QQ
+8PDw8P8A/wCqqqqqzMzMzB//sEAAAB3gH/+uSCAA/EggC3SgIAt1EAAPQkAgBB3QH/+fzB//oDAA
+CQAAAABIAIIAAAAgASBYIAt1kCALdgAACQAIH/+tPDAAAAAf/62IAAAIBgAAiMwAAIkUfwAAACAL
+enAgC3sAAADgACALeLAgC3rQH/+ZnAAEA/8KAAAAH/+sZB//n0Af/5tgg/+3AIP/tiAgCzSw4QAA
+ADMAAAAf/6xUH/+uhAP/4AAAP/aQAAAdKB//rZAD//AAIAtlYCALZSAgC2WAH/+vkCALNPAaAAAA
+H/+b+CALNUAgAWAwH/+tjB//ncQAD///AADerR//rUAgC3uQH/+cICADB2Af/5wQH/+eBCAAZeAf
+/5zsIAAFzB//mSwf/5esIAt8oB//nGwf/6L0H/+jgCALfPDABAAAH/+eECADDFAgAGbA4AEAACAL
+fjAgCzhAIACkrCAAojAgC32wIAt+ACAGkGAf/5m8IAs5sOD//gAgC1iAH/+kLCALQfAf/5RIIAtM
+wCALTVAgC1AAIAtQMEgAAAAgAaMgH/+dYCABpSQf/5hgH/+a9B//neQf/5tMAAAK4AAACOwf/54c
+IAaWNB//m9Qf/5fk4QAuAB//nijhAF4A4QIOAP//v//hAA4A4QGOAP//vv8f/5v0IAGqQCABtmjg
+BQAAA/8AAB//m5QgAwugPAAAAAAF//+DAAAAH/+a/CABy+wf/6BUIAtXoAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAgYAAAAAAAAD/////////////////////H//70B//+9Af//uYH//7mB//+5gf//uY
+H//1KB//+FAf//asH//2rB//9qwgBmmoAAAAAAAAAAAAAAAAAAAAACAGbSggBm0oAAAAAAAAAAAA
+AAAAAAAAACAGaaggBmmoH//5RB//+UQf//lEH//5RB//+UQf//lEAAAAACABq1gAAAAAAAAAAAAA
+AAAAAAAAAgEAAAAAAAAAAAAAAAAAAAQAAAAAAAAAgYAAAAAAABAFAAAAAAAABAAAAAAAAAAAAAAA
+AAAAAACBAAAAAAAAGAUAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAACAKABHyixPyi9MPA+YxAQIAFvKJF/KKd2sGkGC0Zndj+FQPBVWz
+4A8UAGP/+QAAAGwQCCggBScgBykxBfgghhXgGUUA+QAOhWF3AQCKIhbyfP3k+gXgDJUA8Ve8DeAP
+pQDq8ngbxwKAAKaIK4KeCnkKKZK//WANg6IAnQAogp0JiAHoFgUkDVGAACjSCPcADaiSAJ0AK2Ku
+7PJtFYq5gAAqYq0swn/sqwEEc/0AAP1ACh4iAJ0ALtYI/UAKHiIAnQAvIBSk/w8PRy8kFPXgDF3S
+AJ0AGfJfLiIWLCEpiBUf8l2uzJ+A6iIeLmfCgAD9AGYVoA0lAP0ARhXgC2UA7fJWHVYCgAALqgKL
+FJqB6QAVBEBBAACJFQgAiig8EP0gxhXgTAUA/SDmFaAMRQDsuzYEyIEAAG25BQgAhgkCYe7yRxWg
+h4AAiBXuAAUNzwKAAKmI6IwgJaQ1AAALyQxtmQIIAmEtISnTD+ohKCboBQAADQ1PLSUp/UAHdGIA
+nQD/5HAF4AwVAPogqBXgHuUA6iIeLs1CgAD4ICYV4AgFAPggBhWgDQUA6BYCJdmBAABYfoL+4AAX
+N8UBAPfAAEcwDZUA7eadKAQKgAD5gAVZUgCdAMAg0Q8AAADqJAAJ2ASAAOxEAAroBIAAWIBp0qDR
+DwAAAADAsA+JNOnWCC32LgAA+kBoHaAbxQD8AAIdoA0VAFiDnmP/wQAA6iQACtgEgABYgerSoNEP
+AP/5WA2gCAUA6iQAA9hhAAD8AAIdoA2VAFiDkmP/kcCgWa5sHfH/iNj5H/IIkA+lAGP/pNogWAti
+Y/5wAAAAAAD8AAId4AoFAPpFJB2v/CoAiifrRAAKaASAAPtEABWgDAUAWHn90qDRDwAAAGwQBi4i
+EJQR5SEaKtAEgAAmIAf2QSgV4B/FAOoWACrHwoAA/wJSDeFmAQAHCULxIHAN4oUBAGSB8tTwKSAF
+/EBIFaAbhQD+ngANsBpFAPsgD5UiAJ0A5/HWHgvWAADl8dMbTwKAAPTADBISAJ0ApZktkp4Hagoq
+or/3oBG7UgCdACmSnQqZAe6UAASOSYAAjCmLKgwHPgy7DPdgCQPiAJ0AKiBOLSBMsaj7oA3sIAsV
+ACgkTiowASkiGPNADfaSAJ0AKyAHLSEk+GAkFaAMVQD9QAQFMLsRAOCqEQ3agoAAC6oCG/G7CogC
+KiEHLCEJC90C+wYADHqqAQDr8bYdUwKAAArMAiohIpjgiCCc453kC6oCmuL9AAAUMAplAAqIApjh
+LSIQneUsIDgb8av4ACIdoE0VAPnBJhWgzBkADNg5HfGnlOgMvTn5pgAOsAsFAJvnGPGanebt8ZsU
+4AUAACwmGJvrmeroABUHSMEAAAkAiu3mDiHIQQAA7+YPJ3kBAAAJIIYPAmMJAIYPAmEMbhGl7urm
+nSOAsYAAiCkvIDiniCgmCfPgCBeSAJ0AiRAJCUf5IAcBUgCdAMAg0Q+eEuokAAvYBIAAWILMjhL/
+TRAN4B/FAOwSASlQBIAA7RIAKdgEgABYf8XSoNEPAB7xcoro90AGOJIAnQAMaRGlmSuSnvdgBotS
+AJ0AKZKdB2sKK7K/C5kBZJC/sKyc6O6UAAzzfgAAYAAsAAAAAADz3/BIUgCdAAlUDPSdABWv+AIA
+AAAAAADrEgApUASAAFiBOtKg0Q8A6iQAA1hhAAD8ACIdoA1lAFiC5GP/aY0iwOQO3QL8QEYV7/1+
+AAAAAPhDqBWk2QEAANEEALwaDIgC+EOmFa/4xgCKJ40RwMDqrCAu2ASAAFh5UtKg0Q/aIFh/W2P+
++QAA//c8DaAJBQDAoFmtqh7xPIro+V/5eJAfxQD//SgNoAkFAMCQwLoLqzT7wQYV7/zuAAAAAGwQ
+DpUcKCIQLiIJJyE1KSAHIxYOKjIC/mCIFeANFQD8YGgdp7UBAOMhGiXb+QAAC9s5+iGmFeGZAQDn
+/zYJt8KAAP7CUg3jqgEADg5C8cBwDeLTAQBk1GMmIAXB6Pn+AA8wF0UA9sAkHWIAnQCHIose9OX8
+DeAOhQArsAGfEfNgIScSAJ0AmRCZGpoUGPEO7fEOEjANAADmFgssrwKAAOhVCAzfgoAArbvrFgki
+cAUAAIkanhiNG/UgBqoSAJ0AK1Kehhn9YAoj4gCdAC9SnSZivwb/AWT0ORnw/YmY9yAJmJIAnQAq
+gq5koVIa8Pkjgq0qon8d8PYKOwHrFgUk2/0AAPpgCeYiAJ0Am9j6YB9mIgCdAIcphioMAz4HZgzy
+wAmr4gCdACkaAPMiMg3g+vUAKyAWnBP7YAn9IgCdAIsRhsMqIDj34OYVoAYFAPfhJhWgRwUA++EG
+FeCqGQAKdjkX8OeWFi0iFxbw5J36LSIbnfuJxAp2OZYX+WARSuIAnQCGHZ4f7BYDIw3ZgABgAQgZ
+8M+JmGqRLosbKlKejxl7o0stUp0v8r8P3QGdFYYV6/DHFNP9AADvZAADAemAAJq4Zf8TYANKnh/8
+IGYVoAoFAFmtKxnwvomYGPC6jBPuEg8kjtsAAP//XA2gDwUAwKD6IKYVr/7mAB3wtcC6C5s0+6EG
+Fe/+9gAAAAAA//sUDaAPBQCeHy8WEPwgZhWgCgUAWa0XGfCqjBMvEhCJmI4fGPCl+T/1cJIAnQBg
+Ar3AoJoVixUW8KLA2g2dNO1mCC32JgAAYAKknh8vFhCcE+okAAnYBIAAWIHqjBMvEhDuEg8ldaGA
+AGACWp4fLxYQ+kDwFaAMBQBYgcCMEy8SEO4SDy11ZgAAYAPHjheLE4gUjBH2IMgVr4oFACokOwyZ
+DAhmApm0rNgG7gItIhDoJhspUASAAFiAZI4fjBMY8H76s6YVoQkFAHObDSsgFioK//tgBE0iAJ0A
+iikrIDgPAgCjquomCSgECoAA82AEP5IAnQAmITUvwgQrIRopIhDm/zYN78KAAH/bCwoKQmSgBQsN
+QmTQc/4gJhXgHYUA+f4ADvAKFQD6IaYVoAY1APYhhhWv9cYAiicvFhCLHuqsICpgBIAAWH0OLxIQ
+mhMtIhv5QIgV7/zeAAAAAAAAAOogByngBIAAWIFvGPBTjBP+IegVr/2eANogWH5rGPBOjBOOH/pB
+KBWv/bYAcZ6ICr8M//0AFe/+CgCLFIoWLSIQGfBUC6oCG/BUCmgChh0a8EsJiALp8EobCz4AACMW
+ESUWEiYgB4XAIyEH9kEkFeBmEQDrVQELMoKAAPamAAq6MwEA5iEiKZsCgAADdwIKVQIjISQJZgKV
+8IUgl/OW8v3gphXjmAEA6PYGLMoCgAAJOQLjEhEiU/kAAOn2BCquAoAA5eUCBkCBAADl9gEnyMEA
+AOUSEiIUNQAAbakFCACGCQJhJiAUpGYGBkcmJBT0wAg10gCdAIgY+LOmFaEHBQDy4fIN4Pn1ACsg
+FvlgCM1iAJ0AKiIXsarqJhchgKmAAIwpKyA4o8ycKfNgB5+SAJ0AjR1l0M/AINEPLyBOZPvZDngC
++EBGFaAAhgAAAAAAAPMf3MBSAJ0ADj8M//0AFe/uNgAAAAAAAOsSDilQBIAA7RIMKmAEgABYfkvS
+oNEPAOsSDClQBIAAWH/W0qDRDwD6QGgdoBvFAPwAIh2gDRUAWIGAY//BixD6QGgdoAwVAO0SCyXY
+YQAAWIF6Y/+pAAAmIDtkYHHqJAAOWASAAPwgKBWviQUA6SQ7LHAEgABYf8P6IQYVoAsFACsmG/pH
+Zh3v+84AAAAAAOsSBSlQBIAAWAk/Y/7viifrRAAKaASAAPtEABWgDAUAWHff0qDRDwDaIFh96WP/
+COogByngBIAAWIDlY/7cAAAnIQklFhIjFhEkFhMmIAeEwCMhJPRA5BXgZhEA60QBCzKCgAAGRAIK
+RAL2REQVqrUBAOsiBy3TAoAACncCCWYCKrEVmhKU8IUgl/OW8v3gphXjSAEA6PYGKiICgAAEMwLj
+9gQl2IEAAPQiaBWvwwUAA7sBIxIR66kICq4CgAAF5QLl9gEmYIEAAOUSEiTJAQAA6ctDfkAEgAAt
+TP4M1hGmhuaTO3fgwQAA9J/v8RIAnQBt2QUIAIYMAmFj/e2LEPpAaB2gDBUA+2JAFeANBQBYgSdj
+/loAAAD7jwAMP/72AAidDA1JFG2ZBQgghgwCY+/aCAXBAQAA6UwMBUjBAAD1n+1BEgCdACvM/m25
+BQhAhgkCZWP9lAAAbBAGKCAFHO+C997+BeAaRQD7AAqdIgCdACsgTonIsLsrJE73IAjIkgCdAC5y
+ru3veRcRcYAAK3KtLdJ/DbsB5rQABZEpgACwnu7GCCWIOYAALyAUs/8PD0cvJBT14BDF0gCdAC4g
+c/hDqBXv+vUA+8AEANALFQDguBoHaAUAAPsXAA003QEALSRzCYgBCLg5CpkB6SYdLAcOAACKInyn
+BCggTsmPfacIKyBMKSBOe5MUzGwsIBTtIgIuWBwAAGTRycAg0Q8AjifH8w+vAe8mAidQwQAAWG6V
+4+9dFQE5gAAooADTD9MPA4gKKIIQ7KAHLVgEgAD6QGgdoA1FAAuAAGWv3Ikn0w9kn6YqmRTKp4qZ
+ZK+cKKAAA4gKKIIQ7KAHLVgEgAD6QGgdoA01AAuAAGWv4GP/egAA//9UDaAKBQDAoFmroBzvMonI
++T/26JIAnQDAYCkgFLOZ+EKGHe/8HgAAAAAAAAAA6iQACtgEgABYfwjSoNEPACogBSsgB8HU/UAO
+ZWG7AQAFBUf4oA55UgCdAJMQjTadEu3vHB2YBIAA9WAJihIAnQAMuhGnqi6invfADZzSAJ0AKqKd
+DbwKLMK/DKoBZKE9+kAIFeAMFQBYILcd7xEpIQkY7xErISIvIAce7xssIST5ZgANsP8RAOgSAi/6
+goAAD8wCDswCLKYAjiCbovlAphWgDyUA6aYDL3YCgAAP7gL/QCYVoAkFAO0AFQVQYQAAsZnqgx4M
+j+gAAAw5EfcgAETwCKUAKJad9L/yuRIAnQCKJ+tEAApoBIAA+0QAFaAMBQBYdvtj/jr/92wNoAsF
+AMC6C5s068YIK28GAABj/tvqJAALWASAAFgIS/3dxgWv93YAiifAsPtEABWgDBUAWH+KGe7umaD+
+QAgVoBvFAPnd2AWgDBUA+UBGFaANFQD9wAAXMAgVAOjuAg14BIAA7vYBKVAEgABYgGHAINEPicj3
+IASgkgCdAAw6EaeqLqKe98AFVNIAnQAqop0NPgou4r8OqgFkoJiwn5/IZa7BiCLrFgEkBOGAAPi/
+7DlSAJ0AiicrCgD7RAAVoAwVAFh7aosQHu7KnqCMIB3uyp2i/YAAFjANFQANzAKcoYu2+0BmFe/1
+SgAAAADrVAAJUASAAFh+jmP9PI8z/iBGFe/41gD/+WQNoAoFAPogJhXgCgUAWasSHO6liciLER3u
+ovk/+riSAJ0A//3IDaAKBQAAwKDAigiYNPmBBhWv/YoAAAAA6iQABdhhAAD8ACIdoA2lAFiAJmP/
+UQAAbBAEKCAU74seahgEgACKJ/pgaB3gDAUA6qwgKegEgABYdpnSoNEPAIsic75LFO6IikhqoUcb
+7oQssq7Kxx3uhSyyrS3Sfw3LAX3AG7Cunkh9wCEvIBTvJBQv2tAAANogWAfjY/+nwLDAigioNOhG
+CC3/FgAAiSLJlcAg0Q/AoFmq4YpIa6GtY//qAAAAAAAA+kBoHaAbxQD8ACIdoA0VAFh//MAg0Q8A
+bBAILCIPLyAHKCE0JzIH/kNEFafVAQD5v8AV4AsVAOm5OQmwBIAA6yIJKlAEgAD4IIYV4AQVAOh3
+Ng9PwoAA9yJSDeH/AQALCULxIHAN4o4BAGSCcsG07HsfDpR0AAAsIE/pIE0mYAUAAAwMRywkT/0g
+FKOiAJ0ALCAF+4AS/WIAnQCNIvogBhWv+zUA/WAOWOIAnQAoIhmOMvnAFNUiAJ0AiTgY7kMc7j/k
+kmJv34KAAJoQmBGsu+juOhVIDQAAmRPrFgIvpwKAAKhE9eANIhIAnQCLEypCnvtAGxviAJ0AihIp
+Qp3TDyqivwqZAe6UAASScYAAjCmLKgwFPtMPDLsM9WAJ2+IAnQAtGgD1ofIN4Pj1ACsgFvlgGXUi
+AJ0ALCEiGe41KCEHKiEkKyEJ/EDwFeqIAQDpqgIMQwKAAAi7AhnuLhjuHw0tQOnMAg7qgoAACN0C
+neCJIJzimuT7wGYV4ApVAOvuJhzOAoAACpkCmeGIL5jlLCA498EGFeANBQD9wOYV4AolAP3cPAXg
+SSUA+MCIFaDMGQAMmjmY6QzbOY1lneod7hj8wMgVoAkFAOzmCyOH4YAACpwQDcwCnOyMEYlol++Z
+7ohpKOYQjWot5hHsABUHSSEAAAkAiohn+OALo6IAnQAf7f0KvQIP3QKd5sDF/JOmFaEJBQD1IfIN
+4Pj1ACsgFvlgE6UiAJ0ALCIZiikrIE8pIDjlqggGYAUAAOwmGSXb/QAAKyRPminzIA+PkgCdAIsU
+ZbHvwCDRD58VnxaeF+okAArYBIAAWH8njhfvEgUldZGAAIwUZc/biifbMOwSACVQwQAAWHpEwCDR
+DxrtzYqo90AQiJIAnQCMEytCnv1gEUOiAJ0AixIpQp0rsr8d7cQLmQHkkhRlY/0AAJzY7pQADPJm
+AABgAI4oIDnxH/gOEgCdAP/75A2gCRUAAAAAAPOf7EhSAJ0ACecM9v2AFe/1+gAAAADBs3vJFCkg
+OpoQ/iDGFeAM9QD9IBD9IgCdAOokAArYBIAAWH2K0qDRDwDwABgNoBrVAMChjDcrIQmNOI4y668R
+Dd0CgAAPuwLkuwIJUASAAFh9bsAg0Q8AAAD//1gNoBqFAOokAAfYYQAA/CBoFeAMFQBYfyZj/wUA
+AAq4ApjmwNX8k6YV4QwFAHXLDSsgFikK//lgDjViAJ0AihRkoV2LaoxnimmrewfMDJxn92DSDeAO
+BQCxqoxlm2qLZppprOqre3e7AbGqjimbZpplLSA4pe6eKfOgCjeSAJ0AiScomRTKgouZyb4Z7Yco
+sACfFZ8WCYgKKIIQLLAH+kBoHaANNQALgACPFYsix6P7X/KA4gCdACghNIdnLiEaii+LKeh3Ng9n
+woAAd8sKCwlCyJQOC0JksLTB1Pr+AA6wDBUA/CCGFa/yrgDaIFh7emP+Coon6qwwK1gEgABYZwXS
+oNEPAAD/8qgNoAkFAAAAnxWfFp4X+kDwFaAMBQBYfoKOF+8SBS1l/gAA6iQAB9hJAAD8ACIdoA0F
+AFh+3WP94AAAAAAA6iAHKuAEgABYfmFj/YGfFf4gxhXgCgUAWamwGu1DiqiPFflf7tiSAJ0A//fg
+DaAJBQDAkBztPcC6C6s0+4EGFe/3mgAAAAAA81/6OFIAnQAJ5wz2/YAV7/zyAIonnxXvFgYp2ASA
+AOwSACVQwQAAWHmk1qD+IKgV7/oWAJ8V7xYGKVAEgABYe0L+IKgV7/q2AAAAwVP6QGgdoAsFAPwA
+Ah2gDTUAWHPXKyAFjxaKEPV/2oViAJ0AY/0hnxWfFuogByrgBIAAWH4y/iCoFe/4rgAAAABsEA6T
+HJUaiC+KKS4hGichNC8yBPhA8BXntQEA+3/AFeANFQAL2znrFgsp4ASAAPfhAA/xmQEA5yAFLzfC
+gAD+wfIN4qoBAPFAcA3ibgEAZGRBwaQI+o364CNNIgCdAI4iixz1xFwN4AqFACuwAZ8S82AgVxIA
+nQCZEZkYGOz06+z0EmgNAADtFgksrwKAAOhVCAzXgoAAq6rqFgcicAUAAIYYnhaLGfTABeoSAJ0A
+KlKehhf7QAlj4gCdAC9SnSZivwb/AWT0IRns44mY9yAI4JIAnQAqgq5koTka7N8jgq0qon8d7NwK
+OwHrFgMk2/0AAPpgCR4iAJ0Am9j6YB6mIgCdAIcphioMAz4HZgzywAjj4gCdACkaAPMiMg3g+vUA
+KyAWnBD7YAklIgCdABvs4CkgOPvZvAWgBgUA9+DmFaBHBQD9gIgV4JkZAAl2OQm6OYsSmhSWFf1g
+EdLiAJ0AhhtkYdNgAQMZ7LuJmGqRLosZKlKejxd7o0stUp0v8r8P3QGdE4YT6+yzFNP9AADvZAAD
+AemAAJq4Zf8rYANKnh38IAYVoAoFAFmpFxnsqomYjBAY7KbuEg0kjtsAAP//XA2gDwUAwKD6IGYV
+r/7mAB3socC6C5s0+6EGFe/+9gAAAAAA//t0DaAPBQAAnh2fHvwgBhWgCgUAWakDGeyWjBCPHomY
+jh0Y7JH5P/Y4kgCdAGACvsCgmhOLExbsjsDaDZ007WYILfbuAABgAqWeHZ8enBDqJAAJ2ASAAFh9
+1owQjx7uEg0ldnmAAGACXZ4dnx76QPAVoAwFAFh9rYwQjx7uEg0tdk4AAGADxJwQ/iGmFa+JBQDp
+JDsmOEEAAAcAhucSAiewgQAABgJhjceX+IrEicatfQeqDJrEd9sJnh3sFgAkyAUAAIwSixCGFY4U
+mbadtwbuAu0iDylQBIAAWHxIjh0Y7GKMEPqzphWhBwUAc3sIKyAWKQr/ebl+iikrIDijquomCSgE
+CoAA82AEJ5IAnQAmITSPxCshGokv5v82De/CgAB/2woKCkLIpAsNQmTQc/4gRhXgHUUA+f4ADvAK
+FQD6IWYVoAY1APYhRhWv9cYAAAAAAACeHYonnx6LHOqsICpgBIAAWHjy7xIOLWAEgAD+IagVr/xS
+AOogByngBIAAWH1VjBAY7Dj+IagVr/22ANogWHpRjBAY7DSOHfpBKBWv/cIAcZ6ICr8M//2AFe/+
+CgAX7DYb7DYd7DsGqQKGGxrsOu2ZAgZAQQAA5WFUZ+iBAAAlFhCTHyUgB4PABSVA6jMBCqqCgAAF
+MwIHMwInIQcqISImIQn0QegV6ncBAOuqAgu7AoAAB2YCJyEkk/CDIJbzmfaa8vXgphXjqQEA5RIQ
+LVICgAAKdwLn9gQpngKAAAPjAuP2ASJT/QAA4xIPIgw1AABtqQUIAIYNAmEmIBSkZgYGRyYkFPTA
+CB3SAJ0AiBb4s6YVoQcFAPLh8g3g+fUAKyAW+WAItWIAnQDIP4spKiA4o7ubKfNAB9+SAJ0AjBtl
+wNfAINEPLSBOZNvzCugC+EBGFaAAhgAAAAAAAPMf3dBSAJ0ACu8M//2AFe/uvgAAAAAAAOsSDClQ
+BIAA7RIKKmAEgABYejfSoNEPAOsSCilQBIAAWHvC0qDRDwD6QGgdoBvFAPwAIh2gDRUAWH1sY//B
+ixH6QGgdoAwVAO0SCSXYYQAAWH1mY/+pAAAAAAAmIDtkYHcr+oArJDvsEgIuWASAAAgghg0CY+z2
+CCzwBIAA7SIPKVAEgABYe6v6IMYVoAwFAPxHZh2v+8oA6xIDKVAEgABYBSlj/vKKJ+tEAApoBIAA
++0QAFaAMBQBYc8nSoNEPANogWHnTY/8A6iAHKeAEgABYfM9j/t8AAAAnIQckFhEmIAeEwJMf8kRE
+FeBmEQDqRAELMoKAAAZEAhbrsiwhJIonBkQCJiEJ+mYACfp3AQDroRUruwKAAAdmAocvlPCEIJf1
+k/L34GYVozkBAOn2BimaAoAAA8wC4xIPKiYCgAAE5ALs9gQlUIEAAPXgJhWvzAUADKoBqrzkEhEm
+YQEAAOyLPXxIBIAAsEgMhhGmlnbDNvSf8IiSAJ0AbYkFCUCGDQJlY/4AixH6QGgdoAwVAPtiQBXg
+DQUAWH0VY/5iAAAA+w8ADP//DgAJzAwMSBRtiQUJYIYNAmfvzQgFSQEAAOhMDAbAgQAA9Z/t2JIA
+nQCwzm3pBQmAhggCaWP9qAAAAGwQBiggBSMgByQKA/0PQERRMwEAKCAiZIBvAioCWHGQ/UzAgNAN
+FQAsICEY62UPAgDsMxEGfVaAAKgzKTKeDwIAbpNFKzKdZLA/+kAIFaD+5QAOzgH9xgAO8A8FAPxE
+Jh3gCQUA+CAGFeAMBQD4ICYV4A6VAPggRhXgDQUAWHeu9HOmFaACBQDRD8Ag0Q8AAGwQCiogBfhA
+8BXgDBUA+GBoHae1AQDoFgAl2/kAAOvLOQoYBIAA6xYFLCAEgAD9QcAEUZkBAMHD/UAf5SIAnQCN
+Iu/rPB6b3gAA6+s5EbARAADmFgQs94KAAK/u7hYDLNcCgACrquoWByzABIAAhxf1AAQiEgCdAIoU
+J3KehhOPF/rgB1uiAJ0AJmK/L/KdBv8B7xYGJ5nRgAAlIRuKQocphioFpTb1TwAOcQsFAHyzAdWg
+mBoHZgz0wAXj4gCdACoaAPVCMg3g/PUAKyAWmBr9YAX9IgCdAIpC+qAOeqIAnQCMFRvrLodDmBrr
+dwEGCPmAAGAAtgAAGusQiqjoFgolDN+AAIsXjBSGEyuyno8XJmK/fLNDL/KdHOsHBv8B5PA5ZVv9
+AACbyO8WBi/7bgAAYAKbAAAAAPghZhXgCgUAWadqGur9iqiJG+gSCiUO3wAA//9MDaAPBQDA8Bzq
+98C6C6s0+4EGFe//BgAAAAAA//x4DaAPBQCZG+okAArYBIAAWHw+iRvoEgoleamAAGACLgCZG/pA
+8BWgDAUAWHwViRvoEgoteZYAAGADEvDgBIhSAJ0ALSEajCmXGPghRhWi7QEA6RYLLwQWAACXGPgh
+RhWi7AEA6RYLJwOBgACYGukWCy7/woAAdfteDtUM+dXYBaC36QDmQgMt3IKAAAt5ApkYCGYB9oBm
+FaABAgCKJ5kbKxIA6qwgKeAEgABYd3aJG/ghSBWgCyUA66QCLSAEgADqogIoBAqAAPL/+7hSAJ0A
+jCmXGJgamRuOGI8W5a0MClgEgADlzAgJUASAAO1GAiroBIAA7CYJKeAEgABYd5GIGokbjxf786YV
+oQ4FAHXrCCsgFiYK/3a5DMCh+iCmFa/3dgAAAADqIAcq4ASAAFh7v4kb+CFIFa//igCPKRjqvYkW
+pf+fKYxDi0CNFefEAATIgQAA/A4ABTfrAQDuFgEuiKYAACcgBwcHQQh3Cidyn+6tEA1TwoAA7aoC
+AkBBAADqdwEB0/0AAOfHAgGMPQAAbakFCACGCQJhi0DAgJgSGeqoGuqnLyEahhYe6qQkIQcY6qH8
+ICgVodcxAP+gAEa6RAEA7dCAKicCgADszA8mcEEAAPiGAAo0zB0A5GYAJmAFAAAMPAwU6nwNXQyI
+IJ9ml2eeY51lDKQ5CYkC6WYELEYCgADkZgIh0AUAAAioAphhJiAU42YIDSAEgADmJBQoBAqAAPNg
+BAqSAJ0AiBf1E6YVoQcFAPTh8g3g+fUAKyAW+WAFDWIAnQCIEtKA0Q+KFWSgosAg0Q8AAAAAAADq
+JAAE2GEAAPwgiBXgDBUAWHvmY//aiif8ISYVp9tBAOqsICgECoAA9aAEYdIAnQCMFisKAezMICno
+BIAAWHJYmhL6gAgV7/vuAACLFuxNEQlQBIAA/WAARfAMFQBYcDr0gGAVr/2qAGW8BPlf4AjSAJ0A
+LyAg8f/ft5IAnQBj/3QAAAAAAAAA6iAHKuAEgABYe0+IEtKA0Q+KJ9ww6xIAJVCBAABYduDAsvtA
+Rh3gAgUA0Q8AAAAA6zQADjgEgAD8YGgd4AwFAFhyNdtA7DQACugEgADqFgIr8ASAAO8SBilQBIAA
+WHb/+oAIFe/7HgDqJAAE2EkAAPwAIh2gDQUAWHuqY/7qAABsEAiSFJMVGeoliED4IEYVr8sFAOsq
+AQJwIQAA+iBmFaeIQQDkgcBiUBEAAI8TLSEFqYwswACv3wTMC+/8QC5YBIAA/4ANiuIAnQD6ICYV
+oGgBAP4AIh3gDQUABv04C98L690KB9ghAACCFZ4Q+QAARXAMJQDyQQAV4A8FAPJAgBWgAg4AjRQO
+VQz/4CAVoAMFAO/kAARABQAA8Q5gDeB+AQCGEyKgAC3RBQQiC+bWCAlYBIAA4hYGIzEBAAD2QAZ6
+ogCdAAgGQPIAIh2gDQUABi04C9IL690KAVghAAD3IBAVoAIVAAcjOIcVB2YLF+n8pzcncKAGMgoG
+MwvsfAgBmCEAAI7QCwCJBe42LiYAAwCLItIA6qwBJMgFAAD0X/sj4gCdAAUpDA4qDPugBhWgBxUA
+9WAoFeAGBQAJdjgIaAgisgAF5QgltgF+WwIiLAHitgAmfRKAABbp44sSHuni5rYBB5AFAAAGIgKG
+Fe67AQxuAoAADbsCkmD6gAYV4SwdANEPixD8ICgV7/1SAAAA/E8ADf/8xgCFFRnpswXFC/gAChXg
+AgUAsSLlgx4JD+gAAB3pzIYSGunM7W0BB9gFAAANuwKNFepmAQxOAoAACWYC69YAJhAFAAD2gAYV
+oSIdANEPAAAAAOoWAS1oBIAA+8BoHe/51gD9jwAN//k+AGwQDPhASBWgCgUA6yAHKcgEgADygGgd
+58UBAP2fwBWgBBUA7Ew5DLgEgAD8ISYVobsBAPMbXA3gDAUAmhacFZkTmxSbGy4gFhXphB3phB/p
+p+8WCC3HgoAA7YgIDacCgAClRB3poygWCvnS+gWg//UAf+ETAioCWCvgGOl5Hemc6hYIJSn5gABg
+ABcAAGZjy/jAHyiQ+vUAKSAW+yAZTSIAnQCJiPcgBhCSAJ0AK1KuHOltZLDRLMJ/K1KtDLsBZLDH
+sJmZiBzpi2SzSyzAgCzMN/4haBWkzB0ArDzrFgImYB0AAPXABYISAJ0ALkKe/cAIK6IAnQCMGitC
+nSzCvwy7AesWACWZUYAAKnEMiXeZEf1ADpxiAJ0ALHAQ63IDJglBgAD5n/so0gCdAC5yA2Tg0I8W
+ZfGuhhGPGI0U7hIAKVAEgADm/zYL2ASAAO8WASngBIAAWClqGOlCHell568ubTAEgABgAvIAAMCg
+WaWpGOk8iYgd6V75P/mIkgCdAP/9CA2gCwUAwLDAqgqZNPkBBhXv/M4AAGqRJCtCnnyzQYwaK0Kd
+LMK/DLsB5LA1ZPP9AAD/AQYVr/0qAAAAAAD8IaYVoAoFAFmlkhjpJYmIHelI7BINJI8TAAD//IwN
+oAsFAMCwwPoPnzT/AQYV7/xSAAAAAAAAAP/8GA2gCwUAAAAAihjAsZsW+V/5KuIAnQDA4J4W+V/4
+yuIAnQDrdAAJUASAAO0SCSngBIAAWCmm/gAiHeAHFQDnFgktOASAAP9AZhXv+7oAZLBJjxX+ACId
+oAwFAA/sOGTAiogRhhjqJAAL2ASAAO0SBCngBIAA6GY2CPAEgADmFgEg+BEAAFgqMujo9x0wBIAA
+/dIyBe/3/gAAAACLGA8CAPlhVg3gDAUAeaMCLAoB+AAiHeAOBQAMnjjsFgUnfKGAAOt0AAlQBIAA
+7RIJKeAEgABYKtH3QGgd4AsVAPohJhXgChUA+uBmFa/9pgCLEBXo/CohB4lwHOj4/9G+BeqqAQD/
+QAAVOJkBAOyqAgTAPQAA/CEoFaSIHQDqtgAkQAkAAAg4DI4gmbPoXzkBs/0AAO+2Ai92AoAA7m4C
+BahBAADutgEuDtYAACgSA+iMICGUVQAA6jz+KsgEgABtqQUIAIYJAmErPP4MuxGrW5sQKCAULCAE
+o4j1gAihEgCdAAgJRykkFPUgCjZSAJ0AiHIoJhwpcgHoFgctqASAAPMgCjBSAJ0A8TYYDeAHBQCn
+ZiZGnSogFisK/3uhCusSASlQBIAAWC32jBllwOPAINEP6xIBKVAEgABYLfEuIBYY6KL90YoF4P/1
+AP/f5RxiAJ0AY/yHiBllj9IqcBDbcPxgaB2gCRUA+1/gFaANBQDqnTgJUASAAFgoXcAg0Q8AAAD6
+QGgdoBvFAPwAIh2gDRUAWHoeY/+9AAAd6LEt0IDrEgQm6N0AAPpAaB2k3R0A/GAARvAMFQDt3Acl
+2GEAAFh6E2P/jy4gFi8K///f+vRiAJ0A6xIBKVAEgABYLcnAINEPixAMbBGsu/ogBhXv+5IAKCQU
+jXDxv/i6kgCdAPpAaB2gDAUAWG5o9sBgFa/8EgCKJ+s0AAnoBIAA+0QAFaAMBQBYcHfSoNEPAAAA
+AAAAAOsSAilQBIAAWAHL+iAIFe/6vgAAAAAAAOokAAxgBIAAWANOiBcpcgEqFgznpAANXwKAAOtV
+CAT1PYAA21DqJAAMYASAAFgDFPdAAEP/+koAiif8oGgdoAslAOqsICnoBIAAWChPK3AQ+X/xUNIA
+nQApcBUJCEVkjhwrcQkc6GsqcQwvcBGOJwyqDKv/D4gJ/cKkFa/NBQDu7CAkeIkAAO3uAQRASQAA
+Cvg5qH2uzu7sQCbogQAA7tteftAEgAAO6jAb6FstoQH9QAQVofkxAAv/CisiF+/yny5kAoAADN0C
+C+4MD+4srt2oXv3AJB3v3YEA/cAEHe/2ggAAixT6QGgdoAwVAPtiQBXgDQUAWHmzY/4QAAAAAAD9
+rwANP/6KAGwQBCMgACQK7XQxBiIhA7wi0Q+EIYYg8kBoFaAIJQD3ZAACsJRxAPkPAAxzNgEA9GAA
+QfNmgQDl6DccAQqAAABmGvZgAQG9RAEA5SIBAag5AADlIgwBmGkAAAQkLAQzKKMi0Q9sEAiKIicg
+B4kwlRX4QtAVoXcBAPFdTA3omQEA+CAmFeD89QB8gR0FC0f7f8AV4AkVAOubOQlQBIAAWC1a81Mw
+DeD89QAa5/OIqBbn8PcADZiSAJ0ALmKuGefwZOHbKZJ/JWKtCVUBZFHRKIz/KKYI6VQAAo2BgAAb
+6AwlsIDt5+QSqN0AAPggBhXkVR0A5UUIC88CgADmmQgCqA0AAPTgCJISAJ0AKJKe9QATO+IAnQAl
+kp0NeAoogr8IVQFkUYgpIBb9IyYNoOvVACowEPtAElRiAJ0AKzELvLvaIFgtGyggFCwgBKSI9YAM
+QReYAQApJBT1IA4uUgCdAIoVHufjjREoIQcc58cZ59//oeAV6ogBAP8AABQ0/x0A6YgCB/gFAAAP
+TwyYUIsgD+w5/KBmFeeqAQDsVgIt3gKAAOtLAgLIQQAA61YBIcBBAAD5QAlxUgCdAOhBDWJT/QAA
+bakFCACGCQJhwICYFOkgBCJb/QAADLsRq1v1IAkJEgCdAIgyKCYc6TIBJdhBAACbEygWAvMgCbhQ
+BQUAZpFQpUyIFAx9Eabd7NadLBAEgADRDwAAAAAA9wAOkJIAnQAMeRGmmS6SnvXADvviAJ0AJZKd
+DXsKK7K/C1UBZFHNsI2dqGVe3WAAYwAAAAAAAADqJAAJ2ASAAO0SBSpgBIAAWHXX0qDRDwDAoFmj
+8Brngoio+R/yGJD89QD/+VgNoAUFAAAAAAAAAPpAaB2gG8UA/AAiHaANFQBYeQhj/7HAUMDqDog0
++UEGFa/4rgAd55ct0IAt3Df64wAV5N0dAO1NCAlQBIAA/aBgFeAMFQBYePtj/3sAAAAA+EKGHa/6
+DgAAAACKJ/0gaB2gCxUA6qwgKmgEgABYb276IIYVr/tKAIsw82AIopIAnQDiEgQr5wKAAKbMJMad
+0Q8AAAAAAAAA6xIAKVAEgABYALtj/jAAAOokAAxgBIAAWAJAiTGLE4gS7KwRDSgEgADsuwgE9Z2A
+AOokAAxgBIAAWAIHiBSlpaVMDH0Rpt3s1p0sEASAANEPAAAAAAAAAP/2lA2gBQUAjTWMNB7nZPpg
+6BXgCSUA/HAAB7CtcQD7LwAMu4whAPsgBADTzAEA6MwID/gKgAD/gAEGfd0BAO67AQZwOQAA7rsM
+BmBpAAANvSwNzCj9YABFv/W6AAAAAOokAAPYSQAA/AAiHaANBQBYeLRj/mHAoFmjjhrnIYioHecf
++R/xCJD89QD/+PANoAUFAMBQwLoLizT7QQYV7/i2ALBLDLsR61sICVAEgAD7YgAV4AwFAFhtCrNM
+4hIEK+8CgACm3SzWndEPAGwQBgIqAlgtAyQwFvnOVAWipgUABqYohTeoaARECghEC+RNESlQBIAA
+5EwwIqghAABYLPiIQB3nJyswFvUMHg2gBxUALNJsLdJpqt0J3RGtzBjnIh7nIaho6YJ9LW8CgADu
+3QgNgQqAAO/SASvwCoAADpkCHucRDv8BLoJ/D+4CH+b6KYZ9Dv44DpkCmdIogn/Ii4bHJmwQ2mBY
+BddooRuIMupCASkBCoAAAHkaCYgClaCaUZRQlUGYMtEP2mBYBesW5wcLqBGoZuYWASUCeYAAFucA
+DOowixErsoWLsLCqmhAMuwhZqBuMECpilgDBBAB7GguqAipmllmoUY0y70IBKQEKgAAAfhoO3QKV
+8JRQn1GVQZ0y0Q8AAAAA+gDiHaALFQBYcbiIMitifytmg+pCASkBCoAAAHkaCYgClaCUUJpRlUGY
+MtEPAAAAbBAI2iBYLLDUoBvm5fnNxgXipgUABkQoFebU6UkICVcCgACrqoqgKZJ/GObbpUX7IAQE
+sGMFAPggBhXgBxUA4QAFATO5AAD4gABCMADCAAAAAAM8CuXMCwtoBIAA6MKQKVAEgADszQIqWASA
+AO48oCZgwQAAC4AAAQGHAzdg4QEHCfdAAADRD2wQBCYhCfhCkBXv+AUAJyAV6JgBCzYCgADomQwL
+uQKAAAdmAvhChh3gBwUAJzQA+GBmHaAEFQAEZgKWMRXmhyRWrdEPAAAAAGwQBBbmtBXmkdMPpiIF
+NQIlJoAkIoBnQAttCAUoIoBngAJj//PRDwBsEAQT5qsiNopj//wAAAAAbBAEKCAFJSAH+mCoFa/0
+1QD6QEgV4AMlAP0BIBHRVQEAwCDRDwCIKZorDwIA+wAIPCIAnQAa5psKWgnpofwlUAsAACqhAPsg
+BLOiAJ0A82AEcBIAnQACKgJYbHgrIgIPAgADugFkr7iKJwS7AesmAiVQwQAAWGWh4+ZpFQE5gAAo
+oADTD9MPA4gKKIIQ7KAHLVgEgAD6QGgdoA1FAAuAAGWv3Ikn0w9kn3YqmRTKp4qZZK9sKKAAA4gK
+KIIQ7KAHLVgEgAD6QGgdoA01AAuAAGWv4GP/SgAA//9UDaAKBQDaIFhsZSsgIuq7DAlQBIAAWG2v
+2lD6ACId4AwFAFhvXosiA7oB83/65mIAnQAvIAfaIPwAIh2gDQUA9WAEBzG/AQDuJgIl2H0AAFh3
+vsAg0Q8AAAAAAAAA6yAiKVAEgABYbZsqIAXBg3ihDGioKYsi82AEBX/8RgApIDrAv3uZ6vpAaB2g
+CwUA/AACHaANJQBYbNJj/9cAAPpAaB2gCwUA/AACHaANJQBYbEtj/78AAGwQCogrHeY5LiAhizf8
+YMgVoP/lAA/uAS4kIQ3MAQy7DOuJCHjIBIAAwCDRDwMAhgkCYZsVKCAFJSAH+CEGFe/01QD8QEgV
+4AMlAP0bQEHRVQEAiikc5i+bK/tACBRiAJ0ADFwJ68H8JmALAAAswQD9YASjogCdAPOgBGASAJ0A
+2iBYbAqLIgO6AWSvm4onBLsB6yYCJVDBAABYZTQKqwLj5fsVASmAACiwANMPA4gKKIIQLLAH+kBo
+HaANRQALgADrpAANfx4AAIknZJ9aKpkUK5IJyqhkv08osAADiAooghAssAf6QGgdoA01AAuAAOuk
+AA1/LgAAY/8tAAAAAAD//0gNoAsFANogWGv3KyAi6rsMCVAEgABYbUHaUPoAIh3gDAUAWG7wiyID
+ugHzf/rOYgCdAC8gB9og/AAiHaANBQD1YAQHMb8BAO4mAiXYfQAAWHdQwCDRDwAAAAAAAADrICIp
+UASAAFhtLSogBcGDeKEMaKgpiyLzYAQFf/w6ACkgOsC/e5nq+kBoHaALBQD8AAIdoA0lAFhsZGP/
+1wAA+kBoHaALBQD8AAIdoA0lAFhr3WP/vwAAbBAEHOXXizQpMBb9YAQFtZkdAPUgCAiSAJ0A7uXS
+FIiJgAD7y6IFr/3lAOTlqhSkuQAAaZUiLKF+7LMMdlARAAD7YAibogCdACsgBrC7CwtH6yQGJYLJ
+gADAINEPLKF+0w/sswx2eBEAAP9gB9PiAJ0AKCAGsIgICEfoJAYsft4AAIkniyIqmRQNuwGbIouZ
+ZKC0KLAABIgKKIIQ2iD9YPAVoA01AAuAAMAg0Q8AiyKKJw8CAA27AesmAiVQwQAAWGS8ya0ooAAE
+iAooghDsoActWASAAPpAaB2gDUUAC4AAZa/giSdkn28qmRRkoGCKmWSvZCigAASICiiCEOygBy1Y
+BIAA+kBoHaANNQALgABlr+Bj/0IAAOokAAnYBIAA7EQACugEgABYbOXAINEPAOokAAnYBIAA7EQA
+CugEgABb/0HAINEPAP/9HA2gCwUA//50DaAKBQCINyLifwmIEfhAAEE/+5YAiDci4n8JiBH4QABB
+P/v6AGwQBBrlZyiis2SACwnqMCuitAuZDGeQAdEPWG8G0Q8AbBAEHOV0JiAHG+VzH+V1/kEEFaDW
+EQANyzmbMIcg+8p4BaAJJQD6YEYVoBgFAOg2Ayu+AoAA+OYADHFmAQD4YCYVoAwFAOUgeSs0AoAA
+98YADrArBQD/pgAO8Ao1AOjlXxKCAYAAnDWcN5szGeVeCnUClTGZNiUhCZ00LyAHnDmUO/imAAkx
+/wEA4jYKL/wCgAAP7gII7gLuNggtEASAANEPJyEIKiEJnDWUNwZ3AgiqApo2CHcC5zYELJAEgADR
+DwAAAGwQBBjlSB3lQisgBxzlQiohCPoCAAdxuwEA7tw5DdwCgAALqgKcMOPlKhmwBIAACKoCHOUG
+IzCA+kAIFeANBQCdZexmAiG43QAA+sCGFaR3HQDpfP8t3gKAAOt7AgzPAoAA62YBJMvhAACZYwIE
+iZNnKGYGBiCLGOT2JSEJ9MFmFaQzHQDlZgorkASAAOgABQMowQAAbTkCBQJh0Q8AAABsEAYd5SEL
+KxGtsyoyfxnlHxflAoigwED44ABE8AYVAOm5CAQBqYAALDJ4LzJ7+YAFfGIAnQBl8RQsNnwrMnkr
+NnvdQA3kFgECAJSgDeQWwMn8QAXcIgCdAC8ye8HA7eUMF4ORgAAiMnwqIQSOIPPh/g2mugEAJDZ8
+9G9mFaAAHgAuNnztrwEFw/0AAAj/Au8lBCWMWQAAIjJ8sMzvMnshAPGAAMnGY/+/2iBYbyFloMIq
+IQT/QQAMFpoBAMiX0Q/aIFhvFNEP2iBYbtbRDwAAAAAAAPpAaB2gCwUAWG+k0Q8uLPjq0ogvAQqA
+APzAAQXf/PUADLsDC6oBKtaIWaYqJDZ8JDZ7+m/oFa/84gAAABXkoy9QaWTwalmcolhujShys9MP
+yIFYbmIpUGlknylYblzIrhXk2CxSeLDM7FZ4JgLJgABYbeNj/w4AAAAAHOTS/m+IFaAKVQD8b0gV
+4AtFAO0WACFr5QAAWaRb+m/oFa/7MgAuMnviNnwveh4AACI2e9EPH+TGL/KucfaL9q0mHa/+IgAA
+AAAAWZxs+q8GFa/+kgBsEAQU5L4Z5Ljo5JsZXsKAAKS0I0J/qYjouAgBgiGAACoyAHipAipCexzk
+sCsxBCpGfwy6Aeo1BCnQBIAAWG7TzqkpMQT/IQAMFtkBAMjX0Q/aMFhux9EP2jBYbonRDwD6QGgd
+oAsFAFhvWNEPI0Z/0Q8AAGwQBPBg4A3v+fUAiCIJOQMJiAGYIoonKqwwWGOh4+RoFQEZgAAooAAD
+iAooghDsoActWASAAPpAaB2gDUUAC4AAZa/giSfLkiqZFMqlipnJrSigAAOICiiCEOygBy1YBIAA
++kBoHaANNQALgABlr+DRDwAA//9cDaAKBQDRDwAAbBAIHeRgG+SCFOQ898kABaAYxQDjLOgl04EA
+APhADcwnMwEADDURpFXoUp4pZsKAAKbEKUB/+QAQU+IAnQAoUp1kgf+bEeoLHg1IBIAAmRAKIIYL
+AmULAmMNAIcJAmEJAmHtxwgJAQqAAP/I1AXgDhUA4+QzH3AKgACeE6/P/iCGFe//9QD/1wAPcAZF
+AP4gRhWgAMIAAAAAipnJrSigAAOICiiCEOygBy1YBIAA+kBoHaANNQALgABlr+ApQiBkkO8tQHws
+QH0e5FQN2wkHuwru3ggF2CsAAIqyLuCAZKE4/cf+DaAIFQAvCgANjzgP/wkH/wov/Qov/Jwv8hss
+CgEM3APx4SAN58wBAAzLCQe7CuxEfCXYKwAAwND8j6Yd4AwFAI2w71KeJvP/AAAu4P//4AR7ogCd
+AC9Snfbf4BWg+PUA8efADedmAQB4YXTqEgQmQAUAAOhEfSbj4QAAWG5YiRPSoOsSAiSAYYAAiqIL
+qgEqJgKKJyqsMFhjKcmtKKAAA4gKKIIQ7KAHLVgEgAD6QGgdoA1FAAuAAGWv4IknZJ8XKpkUZa7u
+//u0DaAKBQCMEYsQDICGDGCGCwJpCwJn0Q+PEY0QLkR/D8CGD6CGDQJtDQJr0Q+bEeoHHg1ABIAA
+mBAKAIYLAmMLAmEN4IcIAm/o7AAJ0ASAAFmbzGSvr+3j4BmvAoAA5FUICWbCgAD3gABCP/kyAMCx
++7cADfAMBQD8j6Ydp7sBACtEfAu7CfdgAQXwDAUA+2FAJe/7mgAAAAtghgtAhgoCZwoCZdEPAABs
+EAQY46kCA0cMMxGoMysyhBnjtiiwAIqxCYgKCiGMAgo+KIIQAwI+/EBoHaANJQALgAAiNoTRD2wQ
+BBTjmwIDRwwzEQQzCCQyhCpCASZAAChACPqYaB2gqSUAAgU+AwI+eYEjGOOiCGgKKIIQ6lQAClgE
+gAD8QGgdoA0lAAuAACI2hNEPAAAA6yQAClAEgABYbh/zQGgdr/82AAAAAAAAbBAEWZ8cEuOAE+Oh
+DAIAKSKCCRqOA6gKiIQLgABj/+sS48ID6DAE7jAFsTCTIJQhlSIS474T44OEIAQzApMgEuO8wDAo
+N0AoN0QoN0goN0wjPQFyM+0S47fAMJMgxy8T47YDIwMS47WEIAQ0AZQgEuO0hCAENAGUIBLjsoQg
+BDQBlCAS47GEIAQ0AZQgxy/AMQMjAxLjroQgBDQBlCBj//wAAAAS46uDIAMTFA8zEZMgEuOowDAj
+JgBX/9kQ46eRAJIBkwKUAxHjpYIQAeowohEB8DHAQATkFgACABHjoYIQIxoAAyICkhAR457AIZIQ
+BOQxhAODAoIBgQAA0jABIwAAAAAQ45mRAJIBkwKUAxHjl4IQAeowohEB8THAQATkFgACABHjj4IQ
+IyoAAyICkhAR44/AIZIQBOQxhAODAoIBgQAA0zABMwAAAAAQ44qRAJIBkwKUAxHjiIIQAeowohEB
+8jHAQATkFgACABHjfYIQI0oAAyICkhAR44DAIZIQBOQxhAODAoIBgQAA1DABQwAAAAAAXJQBXZQC
+XpQDX5QAQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AFyQAV2QAl6QA1+QAFMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAACclAAdkAGdlAKelAOflAQIlAUJlAYKlAcLlABDAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAnJABnZACnpAHHZADn5AEeJAFeZAGepAHe5AAUwAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAANyUAB2QAd2UAt6UA9+UBASUBQWUBgaUBweUCAiUCQmUCgqU
+CwuUAEMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADckAHdkALekAsdkAPfkAS0kAW1kAa2kAe3kAi4
+kAm5kAq6kAu7kABTAAAAH//89ADSMRD//goAAAAAAB///TwA0zEQ//4KAAAAAAAf//2EANQxEP/+
+CgAAAAAAAPQwCgAAAAAA9DAKAAAAAAD0MAoAAAAAbBAIiCInIAcpIhmZFfEVfA3hdwEAHeJDZJEl
+FuJELdCA6+I/G9cCgADmqggG6N0AAP1TyBWk3R0ArU3p4jsW6AkAAP2ACwvgCKUAKqKdC3wKLMK/
+DKoB6hYGJQqpgACKmPdACwiSAJ0ALmKu7eIxFwiJgAAsYq0t0n/tywEFc/0AAP2AB+5iAJ0Anpj9
+gAf2YgCdAC8gFKT/Dw9HLyQU9eAJxlIAnQArMgn4IMgV54UBAPkACWlWux0A6DwQIgxBAAAqTP9t
+qQUIAIYJAmHAUIkVGuIYDwIAiZDoEgYia/0AAOqZAgzmAoAADNwC/QAmFaAKBQBtuQfphgYkQQEA
+AIgWjDKcFCwmHOsyAS7PAoAAqYiYE/NgCrhSAJ0A6hYALYuCAACLEOtLCAvnAoAA5swIBdv9AADr
+xp0qkASAANEPBQxHaMIYiif6gGgd4AwFAOqsICpoBIAAWGmj0qDRD8Ag0Q8AAAAA6iQACdgEgADs
+RAAK6ASAAFhv39Kg0Q8AAMCwCKw07JYILfhWAACNImXf1Nog/EBoHaAbxQBYbHNj/8QAAAAAAP/6
+rA2gCgUAjiJl77IrfBjqJAAJYASAAFhsamP/ocCgWZ3mGeHXipj5X/SokAilAGP/stogW/rcY/7D
+jyefEYX5+eKCFa/JBQDs8RUn6IEAAAnZAZkS6ckIClcCgADqiAwCqEEAAJX5CIgy6PUUJMkBAAD4
+oAfS4gCdAGirQaWsLMzw/SAEY6IAnQDvEgYiDIUAALBObekFBQCGDwJhjNEPAgAPAgCsrOjZBCZj
+wQAA+YAGRGIAnQDs1gEuKASAAGWOZGAAlAAA6iQADFgEgABb/D6LMYgTjBTqFgAtbwKAAO2ICAX0
+xYAA6iQADFgEgABb/AWOEO6uCAqQBIAA7k4IC/8CgADm/wgHc/0AAC72ndEPBZkM/CDIFaT5HQBt
++QUFIIYMAmOMEg9FDC8SBizMQOn/CAKMQQAAKFz/bYkFDECGDwJlhRIs2QQJqAyoVSVcMOXWAS5u
+jgAAiRLAUOXVBCTJAQAAmdH5oAYV7/buAAxVDPXhJhXv/A4AhRIlXED1oCYV7/zuAAAAAGwQBB3h
+gBrhgRzhfy3SNiqhfizCi6Pd6joMDu5CgAD9gABGcAsFACvEBCvEBVkMbPpAaB2gCwUAW/yv0Q8A
+AABsEASFI4MgFOFy+ECEFaFVAQDq4XAarsKAAORUCAGAuYAA+wAEBDaYOQAJiAIoJQQiQn/RDx3h
+ZxPhaB/haCZCfishBC5Cf5JgliGj//1gBAX2yzkADLsCr1/vJgAnKAUAACVGfyJGfuslBCqQBIAA
+0Q8AAGwQBIIjAgJB0Q8AAGwQBIogZaBQHeFW6iIDKfbCgACu3f2v6BXgDBUA/IBABjGqAQAGqgIN
+yCwI3SgnJQXtzAwEWAUAAP1tAAw/+8UA66oBDE5CgAAJWQIDqgKaIwmIAiglBNEPjyMb4UIPD0EL
+/hGr6y2yfxnhPCyyfnLZGdnA8yPeDaAMBQDAwCy2fyy2fvpACBWgAEYA2MDzDEYNoAwFAHLRHI0h
+mtCOICmyfZ3hnCDsJgEky/0AAPlvphXv/VoAGeEoGOEoqYio6HihIOq2fy+BLgAAza0qsn1qohgt
+snv9b+YV4ABKAAAAAAAAAOy2fyf/KYAA+kAIFa/+pgAc4RmIIayZqen5DwAM8AwFAAnIOPlvxhWv
+/ioAbBAE9cIqBeAGFQD0QGgdoAI1APaAQAMwAB4AALAiKFJ/6GP3cquBAADRDwBsEAT0QggVpCNB
+APJaAAk/U4EABCIKhCaCIQVEKApEEaQi0Q9sEAQpIhIjIAfUUPg+AARwBTUA9QAIcJEzAQAX4Oz3
+wdwFoYnhAPUACFCSAJ0A9GAGIhIAnQAMORGmmSqSngc7Ciuyv/dACGHSAJ0AKpKdC6oB8U7ADedE
+AQAoIQcZ4Ov/wdgFqogBAOvg6xxHAoAACYgCmKAY4Oj8QAgV4DwFAJyn+0CmFeAZhQCZo/lARhWg
+CAUAmKbu3QIO/gKAAJ2kBf8Cn6EvIhIPj0Hopggv/wKAAJ+p7eDZGfcCgACm7iXmnSwiEioiEA3M
+AuwmEilYBIAAWNCAaEIYiif6ACId4AwFAPtEABWgDRUAWGhq0qDRD8Ag0Q8c4LeLyGqxXQw5EaaZ
+LZKebtNoKpKdBz0KLdK/DaoB5KBbZfP9AAD/gQYVr/zGAC8aAA+ZAvhCRhXv+7IAACgqAAiYAvhC
+RhWv+8IAiSLLnGhCUMAg0Q8AAAAAAAAA//voDaAKBQDAoFmcrBzgnIvIa7GU//uUDaAKBQAAwKDA
+2g29NP2BBhXv+1YAAAAA6iQAAdhhAAD8AAIdoA01AFhxwmlCrownL8kUisn/hAAVr8gFAOjuAQf4
+QQAA78UUJVPBAADqxgkncQEAAH6rKinBFR3glqqamsmdoIwg+8EoBeANFQDrpgIuZgKAAA3MAv1A
+JhWgAgUA0Q8d4IydoIwg+8EWBeANFQDrpgIuZgKAAA3MAv1AJhWgAgUA0Q8AbBAYkhCOIBXgg4kj
+iyGKIioWIisWJPgkZhXgBBUA9CDmFaAIBQD4IKYVoAxFAPwhRhWgDTUALRYJ9CDGFeAPJQAvFgj1
+wOoF4A+lAP4iBhXgDbUA/CImFeAMxQD8IkYVoAiFAPghxhWgBJUA9CHmFaAJdQD4IaYV4AtVAPoh
+ZhXgCmUA+iGGFaAL1QD6ImYV4ArlACoWFPXAwgWgCfUA+CKmFeAIRQCYFIYWKxIkiRUnYX4sEiIi
+YX8HmSgvUIAJKQj4nIgVo5kBAAOZCu6SAC9QBIAAJmI+LRIjCO4IC2AAjhcsEiQtEiIH7igvUIGu
+LvicqBWj7gEAA+4KjuAqFhbqEiMtWASAAKjuC2AAjhgsEhYtEiQH7igvUIKuLvicyBWj7gEAA+4K
+juAqFhfqEiItWASAAAjuCAtgAI4ZLBIXLRIWB+4oL1CDri74nOgVo+4BAAPuCo7gKhYY6hIkLVgE
+gACo7gtgAI4aLBIYLRIXB+4oL1CEri74nQgVo+4BAAPuCo7gKhYZ6hIWLVgEgACo7gtgAI4bLBIZ
+LRIYB+4oL1CFri74nSgVo+4BAAPuCo7gKhYa6hIXLVgEgAAI7ggLYACOHCwSGi0SGQfuKC9Qhq4u
++J1IFaPuAQAD7gqO4CoWG+oSGC1YBIAAqO4LYACOHSwSGy0SGgfuKC9Qh64u+J1oFaPuAQAD7gqO
+4CoWHOoSGS1YBIAAqO4LYACOHiwSHC0SGwfuKC9QiA4uCPidiBWj7gEAA+4KLuIAKhYd6hIaLVgE
+gAAI7ggLYACOHywSHS0SHAfuKC9Qia4u+J2oFaPuAQAD7gou4gAqFh7qEhstWASAAAjuCAtgAC4S
+ECwSHi0SHQfuKC9Qiq4u+J3IFaPuAQAD7gqO4CoWH+oSHC1YBIAACO4IC2AALhIRLBIfLRIeB+4o
+L1CLri74negVo+4BAAPuCo7gKhYg6hIdLVgEgACo7gtgAC4SEiwSIC0SHwfuKC9QjK4u+J4IFaPu
+AQAD7gqO4CoWIeoSHi1YBIAAqO4LYAAsEiEuEhMtEiAvUI0H7igoQvGuLvogZhWj7gEAA+4KjuDq
+Eh8tWASAAJsRqO4LYACMES4SFC0SIS9QjgfuKChC8q4u+iBGFaPuAQAD7gqO4OoSIC1YBIAAKxYj
+qO4LYAAuEhUsEiONEwfuKC9Qj64u+J5oFaPuAQAD7gqO4OoSIS04BIAAJxYi6O4IC9gEgAALYACO
+ESoWJCkSEi0SFY8VKxITLBIU6BIRJ/hBAADvFgUl2EEAAOsWEyZgQQAA7BYUJEBBAADoFhEm6EEA
+AO0WFSTIQQAAKRYSjR+JHIgbjB6LHe8SECRAQQAA6BYLJmBBAADsFg4l2EEAAOsWDSf4QQAA7xYQ
+JMhBAADpFgwm6EEAAJ0fiRaNGY8a6xIHIiEBAADsEggm6EEAAO0WCSf4QQAA7xYKIqhBAADvEgQm
+YEEAAOwWCCXYQQAA6xYHJMghAADpFgYn+/0AAO8WBC/iFgAAiRCPE4sSjpCIk4ySjZGriKfMqt2v
+7p6QnZGckpiT0Q8AbBAEKSIV+KAABPA4dQDpjAwBIEEAAPMgAEU/iwUA66QQJVBFAAD5AAXTYgCd
+ACsKAFmYgSwiFSsiFO3NEQlABIAA/EJGFe6APQD9awANsAk1APpCZhXgCiUAbaoMjoQODo7uhgQk
+QBEAAA8CANMP0w9tmiHpggQkQEEAAIqBi4KMgwkJjgoKjgsLjgwMjpmAmoGbgpyD60QACVAEgABb
+/rWKIIgiiSGPIwgIjgkJjg8PjgoKjpognyMpJgHoJgIpQASAABnfNAIAhgMCYfgAChXgCbUAbZoC
+CACK0Q8AAAAAAAAA/YEAFaALBQBZmFL4QGgdoAlFANMPbZoh6YIEJEBBAACKgYuCjIMJCY4KCo4L
+C44MDI6ZgJqBm4Kcg+okAApYBIAAW/6T2kD/+/wNoDyFAABsEAYpIhX4QogVoEYFANMP+IAARXWZ
+AQAJZgx0qwGxiComFQYqDOgmFCVRQQAA9oAHs6IAnQDrNAALYASAAFmYJfhAaB2gCUUA0w/TD22a
+IemCBCRAQQAAioGLgoyDCQmOCgqOCwuODAyOmYCagZuCnIMlLBDqJAAK2ASAAFv+cAZHDPbgBY7S
+AJ0A5jQICtAEgAD24GgdoAMFAOQWACpABIAA+MhoHaAJRQAKAmcIQIYKAmUIIIYKAmMIAIbqDAAJ
+QASAAG2aIemCBCRAQQAAioGLgoyDCQmOCgqOCwuODAyOmYCagZuCnIPqJAAK2ASAAFv+U+pUAAGY
+BQAA5mzAIiEBAADvbZpqQASAAIsQCjwRC8sI7HwMCtAEgABZl+3RDwAAAAAAAOs0AApgBIAAWZfo
+0Q8AAAD2YABGMAMFAPwgBhWv/yYAbBAEGN7IGd7GGt7EE97HkyOYIpkh+kAGFaALBQArJhUrJhTR
+DwAAAGwQBt4g5OIQKmAEgADnQgcr0ASAAPu9agXgGDUA40IVKZAEgADncg4i++kAAHj7JxjetQj4
+CoiAmhOcEu4WASwAIoAAAJMQKrKV7FQACVgEgABZmZlkpc/ygqYV4AIFANEPAAAAACviEgubUu4W
+ASX/QYAAGt6e4xYAKVgEgADqorcq4ASAAFmZjGSlghrel9sg6qK5KuAEgABZmYdkpuAa3pPbIOqi
+uyrgBIAAWZmC90jgDeN2xQAa3o3bIOqivSrgBIAAWZl8ZKbhGt6I2yDqor8q4ASAAFmZdyN9A+8C
+AAGaAQAA+0BDcBIAnQArMNnBWPVgLAhiAJ0AabchJTTZixD6gqYV4AIFANEPkxAqso3sVAAJWASA
+AFmZZ2SnH4sQ+oKmFeACBQDRD5MQKrKb7FQACVgEgABZmV9lrxj6IGgdoAu1AFjMifoAIh3gAwUA
+6rM4BQDhgADqEgIrWASAAFmX8sipHN5ojREMrDYs1hdlMyuNEPyCphXgAgUA0Q8AAAAuQG5k7s2T
+ECqysexUAAlYBIAAWZlIZa66+iBoHaAbZQBYzHH6ACId4AIFAOqyOAUAqYAA6hICK1gEgABZl9os
+fQMqxShlItSNEPyCphXgAgUA0Q8AkxAqsqPsVAAJWASAAFmZNGSiuxreQNsg6qKPKuAEgABZmS9l
+rlj6IGgdoAtVAFjMWfoAIh3gAgUA6rI4BSgZgADqEgIrWASAAFmXwixAb/GAJ27SAJ0AZKTlihP6
+AKId4AzVAFjMNdKg0Q+TECqyqexUAAlYBIAAWZkZZa7I+iBoHaAbJQBYzENkojsrQG7TD2S3kuoS
+AitYBIAAWZetLEIWCsw2LEYWixD6gqYV4AIFANEPkxAqsqfsVAAJWASAAFmZB2SiNxreEwIrAg8C
+AOqioSrgBIAAWZkBZa5o+iBoHaAL5QBYzCtkodvqEgIrWASAAFmXlyt9Aiq1FIsQ+oKmFeACBQDR
+D5MQKrKZ7FQACVgEgABZmPJkoioa3f3bIOqipSrgBIAAWZjtZKOHGt352yDTD+qikyrgBIAAWZjo
+Za4C+iBoHaALdQBYzBFkoXUrQG5ktwIa3e6LEuqi3ytgBIAAWZjeZaZkK0BvwMgMuwIrRG+LEPqC
+phXgAgUA0Q8AAJMQKrKv7FQACVgEgABZmNNkoe8a3d/bINMP6qKRKuAEgABZmM5lrZr6IGgdoAtl
+AFjL92ShDStAbmS2iRrd1IsS6qLfK2AEgABZmMRkppgrQG8sCv0MuwErRG+LEPqCphXgAgUA0Q8A
+kxAqspfsVAAJWASAAFmYuWShtxrdxdsg0w/qoosq4ASAAFmYtGSi2hrdv9sg6qKrKuAEgABZmK9k
+rFca3bvbIOqisyrgBIAAWZiqZaxEGt22ixLqos0rYASAAFmYpWWkaosRK7ISC5lSyJlokgf5IA9h
+0gCdAIwRK8YS8oKmFeACBQDRD5MQKrKH7FQACVgEgABZmJhkoXoa3aPbIOqiiSrgBIAAWZiTZayv
++iBoHaALJQBYy7zKohrdm4sS6qLfK2AEgABZmItlrI+KE/oAQh3gDNUAWMue0qDRD8Ag0Q8AAAD6
+IGgdoAv1AFjLrmSv6uoSAitYBIAAWZcb6xIAI+ALAAAqxRX6gqYV4AIFANEPAAD6IGgdoBsVAFjL
+omSvui1AbmTVJClAb/E/4W+SAJ0A8T/hL9IAnQDqEgIrWASAAFmXCS5CFwruNi5GF4sQ+oKmFeAC
+BQDRDwD6IGgdoAulAFjLkGSvci9AbtMPZPSV6hICK1gEgABZlvsoQTT7AA8CogCdAIoT+gFCHeAM
+1QBYy2/SoNEPAAAA+iBoHaAbVQBYy4BkrzLqEgEqWASAAOwSAitoBIAAWMsIixD6gqYV4AIFANEP
+AAAA+iBoHaALlQBYy3RkrwIpQG5klDga3VKLEuqi3ytgBIAAWZhBZaJzK0BvjRD8gqYV4AwVAAy7
+AvqN5h3gAgUA0Q8AAAAAAAAA+iBoHaALFQBYy2Jkrroa3UGLEtMP6qLfK2AEgABZmDBlqySKE/oA
+Ih3gDNUAWMtD0qDRDwAAAADqEgIrWASAAFmWxPVAFrKSAJ0Axy/RDwD6IGgdoAuFAFjLTvoAIh3g
+AgUA6rI4BQFJgAAsQG4PAgBkw6Ea3TDrEgIrYASAAFmYGGWihi1Ab8DoDt0CLURvZS41jxD+gqYV
+4AIFANEPAOoSASpYBIAAWMtDZa+cKzDZY/puAAAAAPogaB2gGwUAWMs0ZK4CKEBu0w9kgxTqEgIr
+WASAAFmWnylCGIsQK0YVCpk2+IMGFeACBQDRDwAA+iBoHaALNQBYyyZkrcoa3QWLEtMP6qLFK2AE
+gABZl/Tj3QodB+YAAIsRK7ISC8lRyJlokgf5P/kR0gCdAI4RjBADvQEt5hL8gqYVoAIFANEPZS2E
+jxD+gqYV4AIFANEP6hICK1gEgABZln4qRTSCEPKCphWgAgUA0Q8jfQPyb4AV4AsFAPpgaB2gjAUA
+WZYP6hICKdgEgABYy10jfQMjPIArMNnAxAy7Avp/Zh2nuwEA+nsmHe/l0gAjfQMjPIAoMNn6IEgV
+oAklAAmIAug02StYBIAAWZZjKzDZ+nsGHa/lKgAAAIoSWYxqKH0DKID8eKkaihJZjGbspAAD2BMA
+AOoSAiXb9QAAWZe5ZKG5wKL9uZ4FoDsFAFmcHMcv0Q8AGtzBixLqoscrYASAAFmXsGWuJ4sRK7IS
+C8lRaJEKaJIH+T/wsdIAnQAe3MEDvQEO3QKOEYwQLeYS/IKmFaACBQDRD4oT+gEiHeAM1QBYyrfS
+oNEPAAAAAPogaB2gC0UAWMrIZKxSGtynixLTD+qixStgBIAAWZeW49yvHQVmAACLESuyEgvpUciZ
+aJIH+T/tUdIAnQCOEYwQA70BLeYS/IKmFaACBQDRDxrclosS6qLPK2AEgABZl4ZlrX6LESuyEguZ
+UmiRCmiSB/k/62nSAJ0AH9yZghHvvwID6A8AAO8mEibqAQAALNDZwOEOzAIs1NnygqYV4AIFANEP
+ihP6AQId4AzVAFjKidKg0Q8jfQMjPIArMNnAwQy7AgsLR/p7Jh3v354AAAAa3HeLEuqixytgBIAA
+WZdmZaz/ixErshIL6VFokQpokgf5P+dx0gCdAB3cegO8AQ3MAo0RLNYSixD6gqYV4AIFANEPAAAA
+AAD24ABCsAsFAPqgaB2gjAUAWZWKwWDqEgIq2ASAAFjK2Csw2Qa7Avp/Zh2nuwEA+nsmHe/dngAA
+ACN9AyM8gCsw2cDIDLsCCwtH+nsmHe/dMgCKE/oA4h3gDNUAWMpY0qDRDwCKE/oCAh3gDMUAWMpT
+0qDRD4oT+gFCHeAMxQBYyk/SoNEPihP6ASId4AzFAFjKS9Kg0Q+KE/oBAh3gDMUAWMpG0qDRDwCK
+E/oCQh3gDMUAWMpC0qDRD4oT+gIiHeAMxQBYyj7SoNEPAIoT+gDCHeAMxQBYyjnSoNEPihP6AOId
+4AzFAFjKNdKg0Q+KE/oAwh3gDNUAWMox0qDRDwAAbBAEJCIQZEBsKTAQKjARLDAa6zASLM4CgAAK
+mQLqMBMszgKAAAuZAuswGSzOAoAACpkC6jAYJIURAAAIqhELqgLrMBstVgKAAAyqAgiqEQuqArGq
+6iYWJISNAAApIhLr3BwUwCiAAAubASsmEixABS0KlX3BScAg0Q8ALjAULzAV6DAWL3YCgAAP7gLv
+MBcvdgKAAAjuAgjuEQ/uAv3XYABQjQUALyISePckwKX9uBIFoDsFAFmbUcAg0Q8AAAAA+oBoHaAL
+ZQBY5KDAINEPAIwnKckUi8n5hAAVr8oFAOqIAQTJAQAA6cUUJdsBAADrxgkkQQEAAHi7Bi7BFavr
+m8kY2/XZsPgACB2gD0UAbfoCCQJhHNvcnLCKIP1AABUwDEUADKoCmrEpMBQqMBUe2+vvMBYszgKA
+AAqZAuowFyzOAoAAD5kC7rYCLM4CgAAKmQLptgQhwCEAAOgGAAX4YQAADwCKKiISiSINqgLqJhIs
+9+YAAPpAaB2gDTUAC+AAY/7pAGwQBiQiEC9AbvXgBtiQnFUAHNvSjSCONi8xC/hj8BWgClUA+CAG
+FaA7BQBZmxMa28wkIhgsMQuILIlKhUf9AABEMAsFAPhBhhWgDQUA5VIOJJBWgAAtRhcKngL+gUYV
+oAAqAAAAACtCF+taCAHYgQAAWZTFL0IXLjELjUCv7i5GFypQBCxQBRjbt+tQBi1WAoAADKoC6VAH
+LVYCgAALqgLs27IdLgKAAAlVAghVAfSgYBXv+MUA+KAEArA7BQD+oGgd4ApVAFma7CoiEykxCytC
+F6qZ6SYTIsDBAAB4sUHAINEPAAAAAAArQAV8sfAc25/8QAgV4AolAP6ACBWgOwUAWZrd+oBoHaAN
+JQD8TIYd4AsVAFjkLMAg0Q8AAAAAAAAf25OOSg/uAe5GCilQBIAAWOFo+kBoHaALBQD8AAIdoA0l
+AFgBg8Ag0Q8AbBAGHNuJLSIALjIF9EDoFadVAQD+v8AV4AgVAA+POfSCghWgClUA9CAGFaA7BQBZ
+mr+JImWQmCYgBxfbTAYGQeoyBStHAoAAp4grgp4krB/5togF5EQdAHSzfCiCnQlrCiuyvwuIAe2E
+AAQDqYAAHNtmDACHbUkCCAJhiDQe20ie0IkgHNtK6tYDJthBAADs1gIszgKAAOlJAgHggQAA6dYB
+KVAEgAALgAAMbxGn/+T2nSKUdQAAiif6AUId4AwFAPtEABWgDaUAWGLX0qDRD8Ag0Q8AAAAA//4s
+DaAIBQDqJAAKaASAAPrDABXgDAUAWGxQwCDRDwBsEASHJyp5FB/bQvjipBXvzQUA6HIIJVAHAADs
+cgslUoEAAOqTd3PYgQAADbsBq5nowXR0yQEAAC6NAep1FCdSgQAA6pNxfDAEgAB5oX2aeO8ABQs4
+BIAABwJhBwJhBwJhBwJhBwJhBwJhBwJhBwJhBwJhBwJhF9sRl2CFIJNllGTztlgFoAelAOJmAiqu
+AoAAB1UC5WYBKxAEgADRD8Ag0Q8AAAAAAAD3gGgdoAgFAPjhZhWv/nIACJoMCroMKq0BKqzg+uEG
+Fa/+IgAsvED84QYVr/32AABsEATHjwhYAwg4AghIA6ho6CIIC4EKgAACIhiiMtEPAGwQBAQ4AwhY
+A6ho6CIIC4EKgAACIhiiMtEPAABsEAQEOAMIWAEISAOoaOgiCAuBCoAAAiIYojLRDwAAAGwQBAVI
+Awg4AQhYA6ho6CIIC4EKgAACIhiiMtEPAAAAbBAEIyIQKDAF+EJIFeCUJQB0iUj/KKADEI0FAHif
+PXCfGera8BS9WIAACpoB+kJGFaACBQDRDwAAAAAA/bXWBaAKVQD8YAgV4DsFAFmaJCswbtMPabEF
+LDAFdMEGwCDRDwAAAPpgaB2gDSUA/EyGHeALFQBY427AINEPAIwnL8kUi8n/hAAVr8gFAOjuAQf5
+AQAA78UUJdsBAADrxgkncQEAAH67BinBFaubm8kc2sPZsPwACB2gCkUAbaoCCQJhHNqqnLCJIB7a
+vvv/4h2gDEUA6rYELM4CgAAMmQKZsSgiEo8inrINiALoJhIv+4YAAPpAaB2gDTUAC+AAwCDRD2wQ
+BBPaugMiAtEPAGwQBCcgB4giHNqD9kIIFaF3AQDlgmNrzwKAAAyZCCiSnhraefcAEsLSAJ0AJJKd
+CngKKIK/CEQB6NqNEhIhgAAlIhIqIgn4QUgV4FVBAAhVCiVSgOqZDAKowQAA9SAOw+IAnQArIBYt
+Cv99sRX6QPAVoAwFAFhrNxzaZ/NBkA3g/fUAG9qYLyEHGtqXGNpv/7TiBar/AQDpIRov/wKAAAj/
+Ap9A+EAIFaBPBQCfQ55C+wYADTAOVQDqRgQsRgKAAA6IAphBKCIS+IDGFeA6BQCaRfgIAAUyiFEA
+5ogRDVaCgAAIqgILqgKaR4opKSIVG9pwpaqlmfhCphXv6AUA6iYJIkiBAAD4gAuEIgCdAPoACB3v
+iAUACQJhCQJhCQJhL0Qg+IQmHaAPBQAvRCQvRCcvRCYvRCUpYhH4h2Yd6JkdAPiHRh3omR0A+Icm
+HeiZHQApRDgoIhb4h+YdqIgdAPiHxh2oiB0A+IemHaiIHQAoRDyKNCg8GPVABpgQ+fUACACI6Npa
+ElChAAAKAIoa2kwpRDD4hiYdr/n1AClEMypEMoo0L0Qj+obmHaiPHQD4hEYdqJodAPiGxh3omR0A
++IamHeiZHQApRDTrAAUCQQEAAAgCYSkgBwkJQQyZEayZLpadKyAWfbEK+kDwFaA8BQBYasOJNGiQ
+J4on+gCCHeAMBQD7RAAVoA1FAFhhsSsiEiz6fwy7AfpCRhXgAgUA0Q8e2jQtIhIO3QL8QkYV7/8u
+AAAAAAAAAADqJAAK2ASAAFhq5uzZ9BVw6YAAYAAriW4Y2iSxmZluCJkC+IZmHeiJHQD4hkYdqIgd
+APiGJh2oiB0A+IYGHa/8tgDAINEPAADrfBgpUASAAPwAIh2gDVUAWGsSwCDRDwDrfBIpUASAAPwA
+Ih2gDQUAWGsMwCDRDwBsEAQqIhQpIhMc2db9s6YF5zUBAOqZDAGUHQAAZJCAKiAHCgpBDKsRrLsu
+sp5u4ngrsp0Nrgou4r8f2esY2dr/YAQFsBQFAO7Z1BWC8YAALSEHDQ1K758CDu8CgAAO3QIe2fmd
+sI0gn7WYspSzGNnU/6YADzAEJQDutgQu7gKAAATdAp2x6AAVBdhhAAALAIoMrxGs/yT2nS4iFKnu
+LiYUaTIQwCDRDwAAiCLKgWgyNcAg0Q+KJ/oAIh3gDAUA+0QAFaANFQBYYVbSoNEPAAAA+0MAFeAM
+FQD6QGgdoA0lAFhq0mkyyYwnLckUisn7hAAV784FAO67AQboQQAA7cUUJVPBAADqxgkl2QEAAHur
+Ki/BFRnZpqr6msmZoIgg87OUBaAJFQDipgIsRgKAAAmIAvlAJhWgAgUA0Q8Z2ZyZoIgg87OCBaAJ
+FQDipgIsRgKAAAmIAvlAJhWgAgUA0Q8AbBAGLyIYL/BYKAqOePF5KCAF6dm3FAOZgAAY2bQkIhII
+RAEkJhKNOSsxCy4iEX2YfikiE6uZKSYT8oAFHlIAnQBk4MYq4gx9pz4o4gv7wGgdoAsFAPwAAh2g
+DSUAC4AAKyIUKiITGdmjC6oM7NmjFVkDAAB7kxj7grYNoAkFAOkmESyQBIAA0Q/AINEPAAAA+kBo
+HaALBQD8AAIdoA0lAFv/f8CQ6SYRLJAEgADRDwD9syYFoAolAP5ACBWgOwUAWZjAKiIQLaAFLgqV
+ftG5wPL+TIYd4AsVAFjiDsAg0Q8c2YiN4P/AsBWgClUA9CAGFaA7BQBZmLMoIhIp+r8JiAH4QkYV
+r/1uAAAA2iBY30Rj/0wAbBAILSIYK9BYKAqOeLENKSAFGNl37Nl3HIBGAADAINEPJCISKSIRCEQC
+5CYSIjT6gACPLIk2JTAgJjEK/hFiHa/4xQD/KMYN5aUBACoiECugBSwKlXyxxMDS/EyGHeALFQBY
+4efAINEPAAAA5JKCYdCBAACJl4me+SYAFeALZQDAIG25BQoAhgkCYdEPAAYGTiZs2whmAf9gE4wg
+NxUApvj8hgAKMCslAPhBhhWgLFUA9EJGFaAmFQD3QkYNoA8FAHyhCnehB/tAILViAJ0ALzAwKDAx
+GdlI7jAyL/4CgAAI/wLoMDMv/gKAAA7/AuvZQx/+AoAACP8C+eAcPmiPuQD9EAAUNe8BAAjuAhjY
+/CiCPSuyiK6OCe4Rrrvt0Fgl2gEAACsmEf9gsBWgibUA+aAZDWIAnQApCpr5wBi0YJi1APnAGHQg
+mWUA+cAYNGIAnQAtCpn9wBmdYARFAPdABjQiAJ0A/UAF9CIAnQApMEEuMEAvMDwtMD3oMD4vdgKA
+AOnuAg/+AoAADf8CKTA/7TBCL/4CgAAI/wLoMEMvdgKAAO3uAg/+AoAA6f8CD3YCgAAI7gIP6Azt
+IhAkBJuAACXSEn9RCAX4DGaAAi/WEi/SE9MP0w9+8QgP6QxmkAIu1hONvATdAp28fKFQ90AK5GIA
+nQD3QBEEIgCdAMLi/0AVVCIAnQAvEBBk/hCKtyk8IPtByBWgCDUAbYoFCSCGCgJjwCDRDwAtMCPA
+4Q3tOS20QS0UEP1f+aUiAJ0ALzAhf/eoLzBBLDBALTA8KDA97jA+LmYCgADvzAIO7gKAAAjdAi8w
+P+gwQi7uAoAADt0C7jBDLmYCgADozAIO7gKAAO/dAg5mAoAADswCDcgM6iIQJASLgAAuohJ94QgO
+3wxm8AItphItohN80QgNyAxmgAIsphMsMDgtMDmKvO4wOi5mAoAADcwC7TA7LmYCgAAOzALp2Mse
+ZgKAAA3MAuSqAgZgBQAALCYWmrz5YWYV7/xiAInXKzELiZ6/uwtLS+W9fmTIwQAAY/0TAAAA+gBi
+HeOE4QD5f+w+IgCdACswJCgwJekwJi3eAoAACLsC6DAnLd4CgAAJuwIIuxHouwIDSBEAAPstAAt/
+9WIAACwwIfGADM4SAJ0ALTAkLjAl7zAmLu4CgAAO3QLuMCcu7gKAAA/dAgjdEQ7dAmXRbywwTC0w
+Te4wTi5mAoAADcwC7TBPLmYCgAAOzALqIhAuZgKAAA3MAmTMqC2iGP2/5ROiAJ0ALLYSLzBIKTBJ
+6jBKL/4CgAAJ/wLpMEsv/gKAAAr/AujYjR/+AoAACf8CL7YUKTA2LjA0LTA1/mbwFeAKBQDqthUv
+dgKAAA3uAuq2Ey92AoAACe4C6LYLL3YCgAAP7gL/YaYVr/fKACkwOCowOewwOizOAoAACpkC6jA7
+LM4CgAAMmQIImREKmQLo2HMUyAUAACkmFvlhZhWv9vYAAAAAAAAAAOzYbh74BIAA/WAIFeAKVQD0
+IAYVoDsFAFmXkCoiEsSwC6oC+kJGFaACBQDRDwAAAP/yEA2v7qUA7NhhH2gEgAD/YAgVoAolAPQg
+BhXgOwUAWZeCY/uhAAAtMDguMDnvMDou7gKAAA7dAu4wOy7uAoAAD90CCN0RDt0C7NhRFugFAAAt
+Jhb9YWYVr/S+AC8mEfugaB3v9JIAKiIQY/tcAABsEAgrIgcmIAcPAgAouRQFDUf1YcgVoWYBAOOy
+CSQREYAA+aATEVIAnQAc2D6IIP9gSBWgClUA/b/AFeAJFQDtnTkJeASAAPggBhWgOwUAWZdbHNg1
+/GAQFeAKVQD+ShAVoDsFAFmXVRXX4uvX5BtQBIAA9MAOihIAnQAMaRGrmSySnveAEgpSAJ0AKZKd
+BWwKLMK/DJkBZJH7LiEHLCBAJiAH96/MBeruAQDv2CAfdwKAAPWADkiRVgEA9YALyRIAnQD1oAuK
+kgCdAMDQ+bAwBaBmEQDsIQgrMoKAAAbuAu/uAgqsAoAABcwCCMwCnpCPIPcgRhXgNgUA9yBmFaAF
+BQCVlZWX/SCGFaAORQDolgYv/gKAAP/mAA+wCCUA75YBLv4CgADo/wIE4IEAAAMghgwCYwMAhgwC
+YZ+Z5BMeBMkBAAAJAmkEYIYJAmcEQIYJAmXpIhItZwKAAOvMCAE5IQAA/5OmFa+aZQD3IAYUb2tF
+APev4AWvmXUAJCISq0QvQigpRIEoQieY8CNCJy5CK58xJUYnJUYoI2KL6kSBJ3ysgAArQjEuMiQL
+ikT7WgANMAwFAP9AAQUwDRUA+0AIFa+7gQBYXsUlRjEoQiYrQh8lRiv/BAAV78kFAAn/AeWFFCf5
+AQAAn4mfiC5idPpiKBWgDAUA/28ADbANFQBYXrf+QkgV75l1APxiSBXvmmUA/gAiHa9rRQD37wAP
+8AwFAO/sOAbr/QAA7TYSJnpxgADAINEPAAAA/IBQFe/6RgD/93gNoAMFABfXbIx45hYEJg3/gAAM
+qRGrmSiSnvcABIJSAJ0AKZKdBa0KLdK/DZkBZJB+sM6eeGWeHmAAFwAA/BBCHe/5JgAvIEAI/xD+
+YAYV7/ZiAIgiZY+VjTDrbBgpUASAAPmvSAXn3cEA/EgGHeAMFQD4YAYV4A1FAFhogcAg0Q8AAAAA
+//csDaAJBQDAoFmTWIx4ihTr10gYBAqAAPmf+4CSAJ0A//4sDaAJBQDAkMDqDs40/uEGFa/98gBs
+EAaJJyMgByiZFAMDQeeSCSQLsYAABQhH+QANcVIAnQAqIEEV1zP2AIIdoAQFAPFabA3gDAUAG9cx
+DDoR9GAKehIAnQCrqi2invegENOiAJ0AKaKdBT0KLdK/DZkB6pQABI2hgAAuIEHsFgAvDp4AABjX
+Mh/Xbi4hByUgBxnXbPxBBBXq7gEA9CAAAnBVEQDqVRAPdwKAAOXuAgokAoAABN0CCd0CD+4CnqCP
+IJ2k+UBGFaAEBQCUpZSn+UDGFeA1BQCVo/3gABewBUUA5f8CDnYCgADl11cVSIEAAP9AJhXgDyUA
+ByCGCQJjBwCGCQJhD+4CnqkMPRGr3SbWnf5BiBXvmXUAKSQF8rFoFe+YZQDoJAUn/KyAACsiEi4y
+JAuKRPtaAA0wDAUA/0ABBTANFQD7QAgVr7uBAFheKCQmEogniyCULP8EABXvyQUACf8B5IUUJ/kB
+AACfiZ+ILlJ0+mIoFaAMBQD/bwANsA0VAFheGioyErCq+mJGFaACBQDRDwAAAAAAAP/6KA2gBwUA
+Htbajej3oAa4kgCdAAw6EauqL6Ke9+AHa6IAnQAqop0FPwov8r8PqgHkoNtmw/0AAJjo+UBoHe/6
+XgAqIEAIqhD64AYVr/kyAIieJIAEK4AFFtbx6oAGKiYCgAALRALogAcqJgKAAApEAghEEQhEAgZE
+ASZMZ/aOAAswjJUA9sCAFa/4lgCJcO1kAAlQBIAA+a4OBaeZwQDpJEAh2GEAAPjgBhWgDBUAWGfi
+wCDRDwDtRAACYSEAAOtMZylwBIAA/uBoHeS7HQBZlfMb1qj8IAgVr/g+AAAA//fIDaAJBQD8IAYV
+oAoFAFmSrh7Wn43oG9afjBD5v/igkgCdAP/8yA2gCgUAAMCgwPoP3zT/wQYV7/yKAAAAAGwQBCki
+ByMgByiZFAMDQeeSCSQK6YAAFNaM960cBaeFAQD5AAwRUgCdAPRgClISAJ0ADDkRBpkIKpKe90AN
+SlIAnQApkp0EOgoqor8KmQFkkWMqIAcoIQcf1o8b1sr5QAAEMMoRAOrMEAxHAoAADIgCC4gCmJCM
+IP8gRhXgPgUA/yBmFaANRQDu1sAeZgKAAA3MApyRKyBB/EEEFaAEBQD/IMYVofoBAOSWBS/8AoAA
+78wCBNCBAADuzAINiSYAAMCwlJf9IIYVoAUlAAcghgoCYwcAhgoCYQi/EQX/AhXWq5+ZDD4Rpu4t
+5p34QYgVr5x1ACwkBfKxaBXvmmUA6iQFJHysgAArIhIuMiQLikT7WgANMAwFAP9AAQUwDRUA+0AI
+Fa+7gQBYXYMkJhKIJ4sglCz/BAAV78kFAAn/AeSFFCf5AQAAn4mfiC5SdPpiKBWgDAUA/28ADbAN
+FQBYXXUqMhKwqvpiRhWgAgUA0Q8A//qMDaAHBQAV1jaKWGqhbww5EaaZK5KebrR2KZKdBDsKK7K/
+C5kB5JBpZWP9AACcWGWerWAADgAtIEAI3RD84AYV7/niAI9w6zwYKVAEgAD/rOwFp//BAP5IBh3g
+DBUA/uAGFaANRQBYZ1DAINEPAPoRIh3v+3oA//mMDaAJBQDAoFmSJopYa6GF//6MDaAJBQDAkMCK
+CKg0+KEGFa/+UgAAAABsEASKKo6vGNZg6CYLIUiBAADp5gAleOEAAO8mCClYBIAA/kEmFaAMBQD5
+QeYV75iFAPhAph2gDSUAWGd5wCDRDwAAAGwQBBvWUSoxDCuyfxzWMvhiEBXgFGUA+0PWDeAFBQB8
+oRbqJAAK2ASAAOw0AApoBIAAWN4QwCDRD2iRSGiSKGiUCsBA//9oDaAFBQAAfKHRe6vO2jBY3j3V
+oP//EA2gBAUAAAAAAAAA/UDmDaAUZQB7owJgAAHAQNowWN5T//6EDaAFBQDaMFjeZuWkAAUBEYAA
+/axcBaAKVQD8YCgV4DsFAFmVRv/95A2gBAUAAAAA//24DaAExQBsEAQpMBPxJrAN4PWFAGiRBMAg
+0Q8AhCeEThzWH+0wESJIDwAA/T+GHeAKVQDuMBIiQBMAAP8bph2gOwUAWZUx6zwYIlATAADsMBEl
+U/UAAFjedeU7CAJQFwAA7DASJVN5AABY3nHqJAAKWASAAFjf8sAg0Q+EJw8CAIROHNYILTARLUQC
+/mJQFaAKVQD+gGYdoDsFAFmVG+s8GCJQCwAA7DARJVMhAABY3l/lOwgCUA8AAOwwEiVSoQAAWN5b
+wCDRDwAAbBAE9EBgJeizHQAjVFf6qsYd4EQ1APSqph2gCHUA+KqGHaAJBQD4qmYd4EoFACpUUtEP
+AGwQBI84/avQBaAKVQD8YhAV4DsFAP/gaB2h//EAWZT7KTAQ6tXiFIyRAABokllplBKINiKifwmI
+EagiKCAFKQqVeYFewCDRDwAAANowWOB8/18ADeAJdQCLp4u+LLKODJ1W/SNAHejsuQDA037QEPtg
+QCXgDAUAWOBGwCDRDwAAWN+vwCDRDwCLNiqifwm7EftAAEVwCwUAWN8uwCDRDwAAAADApf2rhAWg
+OwUAWZTX+kBoHaALJQBY3ijAINEPAGwQBIguIyw4c4kFwCDRDwAAiy6Is+xEAAroBIAA67zgKVAE
+gAALgACMIu0gBS5+7gAAZN/Vji5z6dZj/80AAABsEBYlFheHNSYxDysgB4g04xYaKkgEgACZHP4j
+SBXgChUAmh/7q0gFoMhZAPwjZhWhuwEA+iLGFeP+9QD7T8QVoLZ5APoiZhXgd/kA+eOwFexIHQD6
+jwANMDhRAPggBh3vqgEA6hYUJFRWgAAGDEn8IcYVoAAyAAAAAAAAAJ4eLhIXKPE9KBYSL/If/iIG
+FefuAQAuFhX1wDwhEgCdAIoi+0BBoJIAnQDw5WAN4A0FAO0WESOASYAA2kBY6Hf0AAId4AYFAC8S
+G9pw/gBiHaAMJQDv7DkJ2ASAAFjoX/dAAEMwCPUAdoBV9CFmFaSWHQDjFgokyAUAAPgjBhXgAT4A
+AAAqEhJkp2MrEhqLtX22n/oiSBXgDBUA7BYRKlAEgADsEhAo6ASAAFjojGankfwAYh3gBQUACtU6
+ZFd7w2CUG/IhRhXk5h0ALhYYKBIWHtT8HNT949T+HCAEgAD1AAkyEgCdAOoSGCw3AoAAo2YpYp4O
+iAoogr/7IEDrogCdACZinQhmAdtg5rQABb15gACPyJsV9+A94JIAnQApMq7q1UYUu3mAAC4yrS2i
+ZO3rAQfT/QAA/cA63mIAnQCayP3AOvZiAJ0AjRwsIBTTD63MDAxHLCQU9YA8flIAnQAuEhspEhTx
+wMAN4Ag1APkAPYjiAJ0AZFDOihoPAgDIoWRQY+tkAAlQBIAA/ABiHaAdhQBY6ITuEg4teASAAOYS
+CyKvmYAAHNUmLRIT+amsBeAKBQCa8przmvSa9elpAg9EAoAA6fYALuiCgADo3QIK9sKAAP+mAA6w
+G8UA/eAmFeAKVQBZlCorEhX5YDgpUgCdAMAg7BIYKm8CgACj3SzWndEPAAAAAAAAj8j34DjgkgCd
+AOkSGCo3AoAAo2YoYp75ADk74gCdACtinQ5NCi3Svw27Aea0AAW42YAAsP6eyPrAaB3v+xoALxIR
+0w9k8HfrEgUpUASAAPwAYh2gHYUAWOhRGdT4FtT1jhsoEAAmYpsJ7gIZ1PQIHxTmhgsP+wKAAOn/
+AgR8oIAALBIQ7RISI1v/AAAosj8rsX2eoJ+hnaKco5uk+UCmFaAAcgAALBIQLRISK2EFiGOeoJ+h
+m6KYo52knKUmrBgtEhOMHgLdEO0WBy5kAoAA7BYIK6b+AAAa1In4IWgVoA8FAP4gxhXgDyUAnx0K
+iAIoFgnrZAAJUASAAPwAYh2gHYUAWOgmjRkvEhqJFisSGo/18TXQDeP+9QAc1MqLtP9ARhWgj5kA
+/UAGFeBviQD9QCYVoN+hAPDQABMwz5EA7tTCHulCgADupgMsQQKAAP0GAAx5uwEA66YELmDCgAAM
+ZgIIZgImpgUsEg3pnAElMGEAAOkWBiZj/QAA7BYNLnumAADrZAAJUASAAPwAYh2gHYUAWOgCFtSt
+iRePGPohKBXgDQUAnRGdEp0TnRSdpP1AphXv/vUAnqKeo5ugLhIa6f8CCsbCgADo/wIA4DEAAOb/
+AgDYIQAA7RwQJTBhAADvpgEg0BEAAFjmzvlAaB3gDBUA6sk5DSgEgADpFh4lIAmAACQWH/4AIh2g
+DQUACe045RYgJurhgAAT1I2IGIwXGtSMKxIbhBsV1IXxeAAUsA4VAOvrOQongoAA9IYACnYPBQAL
+rzn9JgAMsA01APkmAAwwDCUAC9w5LBYdCfkCKRYZ+eYAD7AFBQD+I4YV4AMKAAAPVlD+GAAF8M/J
+APwhKBXgj7EA/UAGFeDveQDs7hEMRAKAAOvMEA3agoAA7LsCCzPCgAD4xgALMM+BAP2IABYxj2kA
+7O4CDEUCgAAI7gIc1F+coSgQAAbuAvvGAA9wb7kA9MgAEzu/AQD3xgAPMAYlAObuAg3dAoAA7qYE
+LEICgAALiAKYpRvUV5uiGNRX+UBmFa/5jgCZoZSgnqKeo56knqWdpp2nnaidqS8SHeVcASUwoQAA
+/qARnGIAnQDrZAAJUASAAPwAgh2gLYUAWOeX5FBRas7CgAD0oApgkgCdACsSHMfv+yYADPANBQDj
+mQIL/S4AAI0TLBIajhKPEYvMLMIQmaGbqfVABhWgCAUAmKKYpp+jnqSdp5yljBT9QQYVr/4mAC0S
+GywSGRvUMAyZAuuZAgaEGYAA8OJADe/+9QCZoZSgnqKeo56k/0CmFaANBQCdpp2nnaj9QSYV7/02
+AC8SGiIWISvyFibxOCLxOizyFejxOSs0AoAABiICJvE7LfIb7vIaLEQCgAAIZgIo8hcv8hmfop6j
+naScppunmKiWpZmhlKCSqfIkKBWv+/YAAAAAAAAAAPDiQA3v+/UAmaGUoJuim6ObpPtAphXgCAUA
+mKaYp5io+UEmFa/7OgAsEhqNEi/BOybBOSjBOC7BOuvCGCs0AoAA5v8CDEQCgAAI7gImwhSIzCzC
+EJukmKeWqJmhnaKUoJyjn6WeqYwU/UDGFa/6GgArEhvsEhklg1GAABvT7sfv/SYADLANBQDrmQID
+gPGAAJmhlKCeop6jnqSepZ2mnaedqP1BJhXv+TIALhIaIhYhLeISLOITK+IYiO2G7i/iFILvLuIR
+nqKdo5ykm6WYppann6mZoZSgkqjyJCgVr/hWACsSHMff+yYADPAMBQDjmQIDgPGAAJmhlKCdop2j
+naSdpZymnKecqP1BJhWv95oAmaGUoI4T/iAoFeAIBQCYopijmKSYppinmKifpf9BJhWv9woAKhIa
+GdPAiqUT01glEiDkEh8lTDCAAOPTVBODuYAAHNO6ixsMuwL7P0YV7+eiAIUfwNL3rQAK/+gmAMCl
+/adoBaAbxQDuThEKaASAAFmStmP4ZwAA+iKIFaAOBQCeEZ4SnhOeFFjl0iQWH+UWICViYYAA+iKI
+FaALBQBY5cUkFh/0JAYV7/DaAC8SEGX4lWP4OhrTdYgbCogC+T9GFa/l1gDAoFlQ+sinG9OaK7CA
+ZLBaKhIUWOW+6RIeLV9OAAD6IogVoAsVAFjlsvgjyBXv71oAAAD/4CQNoDYFAOsSEipQBIAA7BIQ
+KOgEgABY5oFj+FcAACsSGowc7RIXKVAEgABYYQzSoNEPAAAAAPunBAWhSxUAWX9GLBoADKwC+6b6
+BaFLFQBZf0Zj/4UAAMCwwNoN/TTtxggtxVYAAPpAaB2gG8UA/AACHaANFQBYZDhj/6EAAAAAKxIW
++kBoHaAMBQDtEhgl2GEAAFhkMWP/hMCgWY8LHNL8j8j5/8HQkgCdAGP/t9ogW+wBY/hsiieNHMDA
+6qwgLtgEgABYWqLSoOsSGCpnAoAAo8wrxp3RDwAAAAAAAP/fpA2gBgUA/+FIDaAFRQDAoFmO9hzS
+5o/IHtLj+f/GuJIAnQD/4/ANoAYFAAAAAP/jlA2gCwUAwNoN/TT9gQYV7+OSAAAAAGwQBBTTRoIg
+JEJ/E9NFBCIMAyIC0Q8AAGwQDBjTQxrS1hnTQCiAfSqiRimSgwmqEeqZCAR8RIAAJJ0B9JAAFaAA
+MgAAACSdAyRMgBnS/ihBK/kACAxiAJ0AGtLr6gAFCMgEgAAJAmEJAmEJAmEJAmEZ0y8Y0wsf0r+O
+IJ8S+CDGFaAKRQDpFgAvdgKAAArqApoRKUAHL0Er/aZMBaGZAQDj7gIMzAKAAAn/Agj/Ap8UKyA5
+/iFmFaANJQCdGQy7AusWCCgECoAA9GAEsZIAnQCJRyqZFOSgf2TggQAAjZmLwP/4Ah2gJYUA7s4B
+BoIZgABtCC59sTgv0AAp0Ad18S8vwQXu+AgMzwKAAOndCARBAQAA6NsRftAEgADtpAAFAImAAGP/
+ygAA/68ADX//vgD9bwANcAkFAAqdOObUAA6BpgAA6kQACNgEgAD8AIIdoA0lAFhWVdEP//4MDaAN
+BQAAACocOvpHQBXgDGUAWYuzY/9cwnaOaPoAoh2gOwUA7NLtG2gEgAD+RzAV4+4BAFmR54poCo9X
+d/FtikcuoRX7RAAVr8sFAAurAavr62pwc2kBAADvogAmgYGAAH3xKCzQANMPDwIAdcEdKdAHDJkR
+6d0IBcEBAADo2yR+0ASAAO2kAA1+xgAA/e8ADfAKBQALrTjm1AAG+mGAAGP/dgAA/68ADT//cgAs
+IDkKDUN9yYiOIAjuEQ4+Ap5r0Q8AAAD/rwAOv/5CAGwQBiggBSwgB8GUDwIA+QAQdWHMAQApIgJl
+kcMtMAEb0kbm0kgeOASAAP+hQAbQD6UALiBOZeJX7tJCHk8CgAD1gArSEgCdAKaZKJKenBALywr3
+ABGU0gCdACuyvyqSnQurAesWASWOSYAAiuj3QA64kgCdAChiru3SNBQL+YAALGKtLdJ/7csBBUP9
+AAD9gAteYgCdAJjo/YALZmIAnQApIBSkmQkJRykkFPUgDXXSAJ0AHtIyG9IsjCD4ICgV4AoFACq2
+Mu7MAg5uAoAA/WcGFaAORQAO3QIttjEb0o3ckOsPHg3QBIAADAJnC0CGDAJlCyCGDAJjCwCG7AwA
+BNkBAAAK4IYLAm8KwIYLAm0KoIYLAmsKgIYLAmkuMQEoIQktIAcsMAEb0nsqIST8IAAGMN0RAOrd
+EA5kAoAADcwCDKoCHdJ1LCEiC6oCKpYgDcwCiyAd0hMoliMuliQsliL9YAAVsAwlAAy7AiuWIYoz
+6pYlJMgHAADtABUEymEAAAkAigx4EaaI/xOmFeflAQD5wAa5UgCdAMAg0Q8AAIro90AH4JIAnQAM
+eRGmmS2Sngt7Ciuyv/egCGTSAJ0ALZKdC9sBZLEAsK2d6OsWAS305gAA/CAGFaABZgAAAAAAAOok
+AAnYBIAA7EQACugEgABYX8fSoNEPAAAAAMCwD6k06eYILfTmAAD6QGgdoBvFAPwAIh2gDRUAWGL8
+Y//BAADqJAAK2ASAAFhhSNKg0Q8AixD6QGgdoAwVAPtjABXgDaUAWGLyY/+XwKBZjcwe0byK6Plf
+8PiQD6UAY/+q2iBb6sL/+TQNoA+lAACKJ+tEAApoBIAA+0QAFaAMBQBYWWDSoNEPAAAAAP/3XA2g
+CwUAwLgLmwL6QEYV7/0eAAAAAPwgBhWgCgUAWY20HtGliuiMEBvRoflf93iQD6UA//woDaALBQAA
+wLAPrTT9wQYV7/vyAABsEAYS0ZsX0hD1o0QFoBOVAPhQyBWgpiUAKiKCf6cgKyKCf7cYKiKELKAI
+JaAHdsE3iETAoAuAAAUzDGU/2tEPLSKEKSKHKiKH+WAABPuqgQB6mS8K6jArQkHDwgy7KKuq+paG
+Fa/+6gAuoQsu7PgODkPu7Pwi6/0AAP+iAAq//s4AAAAMAgAvIoJ//8Yl0AduW8DccPoAoh2gCwUA
+/qAAFzD/BQBZkOIlXPHKWygKcZgRwKFZhk/6ICgV4An1AAlZNpkQCbsM+iAmFeAKBQBZbQKKEApV
+DGVf18ChWYZF+g4iHeAKBQBZbPxj/2YAAABsEAYoIAUmIAfnNAAK2ASAAPgCgh3gBTUA+QAPnWFm
+AQALCEdoghSKIhjRUhfRVeRkAAUDyYAAwCDRDwArIh1lseGIJ4OI+wKkFe/MBQDpggskcIEAAAzs
+Aey7CAp/AoAA7BYAJdkBAADzIA38YgCdAC2JFKP6r90thRT7YA3rogCdAMl1yUPZMG1JBQcAhgkC
+YYrgDwIADwIAr6r7QBCsYgCdAPvABhWv/f4A7GoRAyTxAAAHqggrop4PAgD3YArZ0gCdACqinQhr
+CiuyvwuqAWWgT+tsGClQBIAA/AAiHaANNQBYYljAINEPABvRJIm49yAMoJIAnQAMShEHqggsop73
+gA0B0gCdACqinQhMCizCvwyqAeShjmTr/QAALbYIZK+vGdE6maCIIP+jGAXgCxUA66YCLEYCgAAF
+iAKYoYgzL/J//6JKBaiIHQCo/5+j7gAVBUhBAAD/ojIF4AgFALGI6YMeDA/oAACfphnRfPlBBhXg
+GAUAmKeOIAjuEQXuAp6pDE0Rp90l1p2OIiwgBoknC+4C69FzFmAFAADsJAYkyIEAAIiR/SCCFe/M
+BQAMnAHuJgIkQ0EAAOiWASbowQAA7ZUEJmEBAAB8iyIqkQUd0P2oqJiRnYCMIOuGAi5mAoAABcwC
+/QAmFaACBQDRDx3Q9Z2AjCAb0VvrhgIuZgKAAAXMAv0AJhWgAgUA0Q/aIFhgXdKg0Q8AAAD/+sQN
+oAoFAFv/OmP+FwAA8yBoHeAOBQD/AWYVr/e+AOO6DAOBuYAACksU7LwIK8AEgADsTDYJyASAANMP
+bckFCACGCQJhiRCqeOtNDATJAQAAbdkFCCCGCQJjixAK/Aysuyu8QPvABhXv9ooAwKBZjMsb0LuJ
+uBjQuPk/8viSAJ0A//n8DaAKBQDAoMDaDZ00/WEGFe/5wgCPEC/8QP/ABhXv9aYAAABsEAyIJ/hA
+SBXvygUA64EVKmcCgADsPAgEQIEAAAqIAai46IxALngEgAD5gCQSogCdAC3wBysgBxbQoezc/i+o
+BIAA+6BgFeH7AQDkkAlvxwKAAMAg0Q8A5o0IBsgZAAAo0p4e0JXrFgEv0ASAAPkAIjPiAJ0AG9CO
+KdKdC/sKK7K/C5kB55QABKG5gAAt4ggqFgz3oCJIkgCdAC9iruvRARee4YAALmKtL7LkD+gB6BYJ
+Jsv9AAD/wB4+YgCdABjQfpmI/8AeZmIAnQAtIBQpUAetmfohhhWnmQEAKSQU9SAg7dIAnQAZ0MEf
+0O/qIgAtbwKAAIg0HtCB5t0IDVYCgADxAAUCUgCdACggByshJPygJBWgFIUAlHP+4EYVoAQ1AASj
+AvuhGAWgiBEA43YBLEKCgAD5BgAMcAMFAPjgBhWgCCUA6gAFA9BBAABtigIKAmEuIQkpIAfy4KYV
+4DilAOx2CS91AoAA+cYADzHJAQDudgYuZAKAAAy8Ag/MApx0KyEJ2iD+oCQVoAwFAOTWnS3dAoAA
++WYADbANBQBYX7jAINEPAIYnKGEV6BYDIzCBAAD2IMYVr8kFAAlmAaaI71wgJEEBAAB48wSIEwj/
+DOnyACZABQAACKgCmBf4+AAE8IgVAHiZHB/QsYgX6HYBJkv9AAD+4AYV4ZkdAPjgRhXgAFIAiRcY
+0KqYcJlxifEJWRSZco8WiTYb0KaWEPngpBWimR0AC5kBG9CemBSmiCuyHe/yASRBAQAAKBYKCbsI
+63YDIkgJAADr0JYczwKAAAn/CCkWCAxJCOYSCCTICQAA6PMKfM8CgAAoEgQI/wzmmQwDwEEAAOSQ
+TG43AoAAmBWIGg9pCPkADuriAJ0AKRIFD4oM+iBGFaSqHQBtqQUPAIYJAmGIEikSAArPDAeICOmc
+QCRQQQAAbfkFCSCGCgJjKiIACKoRGNB59uAARLAPFQD/IMYV4AxFAAyqApqVmJSIUy+yGxbQdP2g
+FgWoiB0AqP+fl/wAChWgCgUA7NBwFNiBAACxquuDHg0P6AAA/yFGFaAoBQCYm480iFOKNQb/ARbQ
+ZuyqAQxCQoAACP8CBv8Cn5woUAkrUAsvUAomUAjs0GAd2QKAAOb/EAxDAoAA+wYADDCmMQDr/wIN
+UcKAAAr/Agj/Aoo2GM//n53+YUgV5bYdAOyqAQ3YQoAAC6oC+yHGFaRmAQDo/wELMgKAAAb/AohV
+mJ+GViaWEIxXL5YSLJYRi1QrlhMqUAEvUQHr0A4YBAqAAPFABDfSAJ0AKiAHCipA7CEkLVKCgAAL
+qgIqlhSIIPoDAh3gCjUA65YXLEYCgAAKiAIaz9v/IsYVoAsFAPkiphWgCCUA6gAFBNGBAABtigIK
+AmEoIQkuIAf7AAAUMBqlAAqIAiiWGvmgRAWh7gEAAO4RDs4CCO4CiBErlhkvlh3ulhgkQA0AACgW
+AY4RLtadLVAHiif1oABGsAwFAOvUAAVQgQAAWFdG0qDRDwAAAADpEgUmcuGAANMPbckFD0CGCQJl
+Y/5DwPCfGYgZH8+NwJoJ2TTp9ggsYeYAAPpAaB2gG8UA/AAiHaANFQBYYLfAINEPAAAAAAD7jwAP
+/+36AP/vJA2gCQUAjRHr/BgpUASAAP2gYBXgDBUAWGCswCDRDwAAAAAAAAD8IWYVoAoFAFmLgh7P
+c43oihyMG/m/3RiSAJ0AY/+UAJwb6xIJKVAEgABb6HWKHPwhaBWv71IAAGwQBikgBSYgB9gw9gBi
+HeAaRQD7IA/NIWYBAAUJR/0jAAFfxQUAiyIZz1wTz17kZAAFg7GAAMAg0Q+IJ4uILoEV6YILJHiB
+AAAF+gHq7ggKbwKAAOoWACdxAQAA+yAORGIAnQAsiRSdEavarcwshRT7wA4jogCdAMk0yULZsG1J
+BQMAhgkCYSwSASryAAyqCP9AESQiAJ0AmvDTsPhgaB2v/hoAAAAAAOxqEQMk/QAAA6oILaKeCWsK
+K7K/96ALAdIAnQAqop0PAgALqgFloE/rbBgpUASAAPwAIh2gDTUAWGBiwCDRDwAAAAAdzy2L2JgS
+92AMkJIAnQAMShGjqiyinveADRHSAJ0AKqKdCUwKLMK/DKoBZKGQsL6e2GSvrx7PRJ6gjSD9nywF
+oAsVAOumAi7uAoAAB90CnaGJgyjCf/+eXgXomR0AqYiYo+8AFQVIQQAA/55GBeAIBQCxiOmDHgwP
+6AAAn6YZz4b5QQYV4BgFAJinjiAI7hEH7gKeqekiBypvAoAAo90n1p0sIAbtIgIkyIEAAOWfAQZg
+BQAALCQGiJEsmQQL3QLtJgIkQ0EAAOiWASZgwQAA7JUEJ/kBAAD/BTIN4AwFACqRBR3PB6iomJGd
+gIsg7IYCLd4CgAAHuwL7ACYV4AIFANEPAAAdzv+dgIsgwMDshgIt3gKAAAe7AvsAJhXgAgUA0Q8A
+AOokAArYBIAAWF5k0qDRDwD/+qQNoAoFAPMgaB3gDgUA/wFmFa/5ogDr6gwBgbmAAApNFOzcCCnA
+BIAA7Ew2DcgEgADTD23JBQgAhgkCYYkQqjjtTgwEyQEAAG3pBQgghgkCY40RjBAK3QytzCzMQP3g
+BhWv+F4AAMCgWYrUHc7Ei9iIEhnOwfl/8viSAJ0A//noDaAKBQAAwKDA6g6+NP+hBhWv+aoAAIgQ
+KIxA+eAGFa/3ZgAAAABsEAQVzsQWzr7wiAATsAlFAOTPJRnGAoAACYgCKGYxBTUC52YyKhgEgADl
+ZjgpMASAAANghgYCZwNAhgYCZQMghgYCYwMAhuYMAAEZAQAAIi0B5B8eARIBAAADAm8EwIYDAm0E
+oIYDAmsEgIYDAmnRDwAAAGwQBiMgBxTOmAMDQerOlBnPAoAApJkokp76YAEGMAU1AOzCvywZHAAA
+K5KdDLsBy7kfzxAdzxD6QAgVoA4FAJ4QnhL8ICYV4AwFAPwAoh3gHuUAWFqCDD8RpP/186YV4AIF
+ANEPAAAAAAAAAOs8GClQBIAA/AAiHaANNQBYX6zHJNEPAGwQBiggcPWc7gXgBkUA6s5yFHXkgAAj
+IAcDA0EMOREFmQgrkp4kIgAKOgrqor8toYQAACiSndMPCooBZKBR20BY+IvAwfwAAh3gDhUA+Z3S
+BaAJBQD4ICYV4A8FAOkWAi1YBIAA6BYAKlAEgABYWloMPBGlzCbGnSogcCsK+wuqAfpOBh2gAgUA
+0Q/AINEPAOs8GClQBIAA/AAiHaANRQBYX4LHJNEPAGwQBCMgBxTOURXOTPuckgWhMwEA5EJ/Kc8C
+gAClmSiSngo6Ciqiv+NECAwRVAAAKJKdDwIACooBZKBE20D8AAIdoA0lAP4AQh2gHwUAWYv7/52A
+BaAIFQDupgAqfgKAAAj/Ap+hjSCdogw8EfWAAEZwCyUA+5OmFeACBQDRDwAA6zwYKVAEgAD8ACId
+oA0lAFhfXMck0Q8AbBAULzAQ95xOBeAKdQDz5PAN4AYFAPXgRXCSAJ0AaPIDwCDRDysgB/ogphWn
+lQEA+CNmFeG7AQDrFhwslGgAACwgBfeAYIxSAJ0ALSBy86BgN5IAnQDaIFhcXftAQoiSAJ0AjiL7
+wEI4kgCdACoiECwhGog1iynoFg0uf8KAAHj7DwsJQsiZDAtC+2BaEBIAnQCOHfwjiBWgH4UA7BYZ
+J2hdAAD73gAPtN0dAO0WCCboDQAAnRqdGfWAT4ISAJ0ADMsRp7sosp63SfkAYpPiAJ0AHc3xK7Kd
+DcwKLMK/DLsB+2Bf6BIAnQCMKY4qDA8+LxYXDO4Mf+t3KiAiKSAjCpkM+yBh2BIAnQAoIAcazmv9
+WgAV4YgBAA2ICS6B/gnvNg/uDC6F/i0gIq/dDQ1HLSQi+6BhKBIAnQAoon/uIgsmy/0AAPsABADQ
+CBUA4JkaDEAKgADp7ggEQ/0AAAjuAi4mCigSFwzpDPkgX8OiAJ0AiRoezlMsIAcoIQcdzcz+QSQV
+4MwRAPWQABY6iAEA7cwCDEMCgAAI/wItISScsIogiB0czdHu3QINVgKAAAqZApmxKiEinbSfswyq
+AhzOQZqyKSIQihWZtRnOP/xHEBXgDyUAn7mWt/lhBhWgDhUAnrr8AwAG8E51AA3qOQ3JOQqZAooY
+5rYLIcBBAADptgYlyMEAAG2pBQgAhgkCYR7NtZ68jTDzoELSkgCdACoSGekSCS1XAoAAp6oppp0o
+IBQvEhekiOgkFCeAwYAALRIXjCkrIDitzJwp82BWP5IAnQAuEhv5wFUZUgCdAMAg0Q8ALiAHLyAF
+LTARDg5BLhYc+eAxZFDdOQCPItzg/8AAFbAZxQDnuwgIBAqAAPvgTICSAJ0ALRYWKLKeKhYFLBYZ
++QBN4+IAnQAazXwpsp0PAgAK6goqor8KmQEpFg7pFhooBAqAAPsgTQgSAJ0A+kBoHaALRQBZiZL7
+QE1gUAsVABzNcIzI94BNqJIAnQAtcq4ezffTD/egSf1SAJ0AKnKtLeLMGc1n0w8NrwHvFhUmQ/0A
+AP1ATa5iAJ0AmJj9QEkOYgCdACkwFCkkOCgwFSgkOSYkO484jjaNOYw6iTyKOyolJSwlJC0lIy4l
+Ii8lCSkkTIg9KCRNLzIQLjIRLiYVJiRxJiRyJiRwKyRzJiYdKyYZKyYYKyYXJiYbJiRPJiROKyUp
+LyUoLTARKhIFLiEaDQ1DLSQ6/0Av8KIAnQAtIDgq+vz7wAQFMA8lAA/cAe/QHXVTsQAA/wAAB7AJ
+FQD/LQAP+Y4dAAj/CA7/EQ+qDP+bgAWgCRUA/S0ADjAIRQAI2AEK7ywImDkK7i4OnjkZzYvv7ggL
+eASAAAifORjNTd1gDI05D90CKCAUDq8c7yU0JUvxAAAOnhykjO4lNSzMAoAA6dkCDXQCgAAO3QIu
+EhYpJhAsJBTtJg8nLSmAABrNZS8gB40pnSyOPp4f/iHIFaCfEQDoIQgsyoKAAAqZApng+Zs4BeH/
+AQDqIgAv/AKAAA+IAvkGAAxwDzUA6akCDVYCgAAPqgKa4f+aLAXgKgUAmuPv5gIuUgKAAAuqAo8r
+luUo5gQp5gYq5gcv5gnt5ggneMEAAP4jRhXgHUUA/CCGFeAKBQD6IgYVoBmFACkWGCYkFCsSGvph
+6BWgDBUA+iImFaANBQD6QAgVoAkFAPggBhXgDgUA+CBGFeAIFQD4ICYVoA8VAFhY4ywgOPrAaB3g
+HwUA8iPmFeANJQD9gAQB8OwRAO7bOQtIBIAA8+0ADPDsGQD7xgAPcMwBAPLAaB3gKwUADLM5KyA5
+6GQAC3gEgAD4ZgAJ8EkFAP1gBAbwuwEA+yIAD/CMBQDtyDgNWASAAPpACBWgDQUAnREczVacEAj/
+AgP/AvIj6BXgDQUA/8YAD3AMFQD/wAAXMA9FAP/GAA9wDwUA/iBGFaAOBQBYWLnAwe/NSR1YBIAA
++kAIFaQJBQD4IAYV4A0FAPggRhXgCAUA+CAmFaAOFQBYWK4oEhHpEg8tWASAAPpACBWv/vUAnhD8
+RKQV7//1APxEhBWomQEA+zgAFLiIAQDpiAIO7AKAAP2GAA5wHqUA+CBGFaANBQD8ICYVoAwVAFhY
+mgqrAvpACBWv/fUA/CAGFeAMBQAsFgEpISIoIQkuChz5IAAUv//1APkGAAxwDBUA+CBGFaANBQBY
+WIsqFhIqIShZivntzRYdYASAAPpACBWv/vUAnhAuEhAt0CwbzRXu3QIGY/0AAOLpEA7oQoAA7ZkC
+DmZCgAAMmQILmQKZESgiFRnNDP//4h3gHuUA+iJIFeaIHQD5BgAMcA0FAPggRhWgDBUAWFhw+0Bo
+HeAMFQD6QAgVoAgFAPggBhWgDQUA+CAmFaAOBQD4IEYVoA8VAFhYZYkw8yAVepIAnQAuEhkbzGgs
+IQftEhgvdwKAAKfuLeadKCANK7I4HczojyCOICkgDCrS+g67CO4gFS3eQoAAC6oIKhYTKyAHK6QH
+KaQMLKUHKKQNLDIJLKUJLqQVLjIR+GIIFa/MAQAsFhQopSgspSP9oIgV4AkVAPlFJB3gG0UAK6QF
+/0PGFebuHQD6IqgV4P/1AP+gAEawDgUA/ULGFeANFQBY9m4rEhMvEhYoEhQpsBX3YoYdoCsFAOuk
+AyxGAoAA5qQALMkCgAD5BgAMcAkVAAmIAuimASeUIYAALCA6wN/9gBP8YgCdAC8wV8TgD+4MnhvA
+0f4f4h3gDgUA7CEJJVhBAADsFgwpUASAAFj2U4kcixsmJBQoIBUmpAArpAPomREMQQKAAPkGAAxw
+CRUACYgC+UAmFaALxQCKJxzMP4quiRQMAIcKAmEKAmEKAmEKAmEKAmEKAmEKAmEKAmEtEhYrdq34
+QKYd4A4VAO4kFyaBWYAALyA6wI948R4ZzB4oMFAJiAooghDsMFch2UEAAPpAaB2gDSUAC4AABQpH
++UAgYVIAnQDAINEPAOokAAnYBIAA7EQACugEgABYWevSoNEPAAULR+sWGy2UfAAAKiAFwcT9QBDM
+IgCdAPdABDxSAJ0ALSByft982iBYWjdloImOImXghCggFKSIKCQUjzB69mIqIAcKCkEMqxGnuyyy
+ntmg94AlolIAnQAcy94rsp0MrAoswr8MuwHpFh0lpSmAAC8gceWUAAngBIAA+kBoHaDupQDv5jkK
+aASAAP7AaB2gDxUAWFn0DFkR9yAARPAIRQAolp0qEhv5QB2xUgCdAMAg0Q8AAAAAAADqJAAJ2ASA
+AOxEAAroBIAAWFm30qDRDwD9mKgFoApFAPxACBXgK6UAWYsuwLH+Q0QVr+e2AAAAAOw0AApoBIAA
++0BoHeAOBQD6QGgdoA8VAFhZ1isSGLS7+iMGFe/0xgAsEhwazEIezELqoIAuAQqAAP1gAQbQDDUA
+/dAGHafNAQDqyDR9cASAABnMOvgjiBWv//UAD88DD6oBH8w3CYgKGcwzCtoC/xPmFeeqAQDqlIAn
+DfGAAGShwcHD/CCGFaAKFQD6IgYVoAkFAPgh5hXgGFUA+CMGFa/p+gAAAAAAAP/3bA2gC2UAxND8
+IWYV7/YmAACOGukgcSngBIAA6iQACmgEgAD4HUIdoA8VAOmGOQ93AoAA7rsIC3AEgABYWaOPGrT/
+/iEmFe/d1gAcy32MyPeAGciSAJ0AKxIZDLsRp7stsp63Tv+gGfOiAJ0AHstyLRIZK7KdDt0KLdK/
+DbsBZLMmGMtvsM+fiPt/r9iSAJ0AYAHsiScrmRQunCDksRdk+MEAAI2ZjPAp+sD5wAQE8AsFAO/I
+DAZjIQAA6Ms5BoOhgACZFojgfYFoLNAAwZT5gAWkYgCdAMGF+YAFVCIAnQDBlvmABQRiAJ0AwYj5
+gAS0IgCdAMGZ+YAEZGIAnQDBivmABBQiAJ0AiBYs0Acp4QWZF+iZCA5nAoAA7N0IBMkBAADp2zt+
+4ASAAO3EAA58tgAAybjC3SywAH3BSY6+wLDu+AwHcyEAAAjrOWW/5yggTvzAaB2gH2UA+e0ADjAA
+pgCMF/2vAA4//w4AAAAA81+l8FIAnQAJzgwu7Oj+IaYVr9LCAAAA/E4mHa/z0gBkrkXwABgNoAkV
+AMCQHsu/LeLSx/4P3QENnQL92kYV7/iqAAAAAAAA//usDaANBQDqJAAJ2ASAAOxEAAroBIAAWFkP
+0qDRDwAZyxrAigjINJiY+kBoHaAbxQD8ACIdoA3FAFhcRmP/x8Ag0Q8AAAAA/9lYDaAJBQAAACsS
+HPpAaB2gDBUA+2MAFeAdxQBYXDtj/5wAAAAAAPpAaB2gG8UA/AAiHaAtBQBYXDRj/4HAoFmHDhzK
+/4zI+Z+yCJALFQBj/46KJ/qAaB3gDAUA6qwgKmgEgABYUqbSoNEPH8r1wOoOzjSe+P1fsljiAJ0A
+Y/9gACsSHPpAaB2gDBUA67wYImgdAABYXB1j+7SKJ/qAaB3gDAUA6qwgKmgEgABYUpTSoNEP2iBY
+WJ5j9TQAAAAA/870DaALBQCKJ+tEAApoBIAA+0QAFaAMBQBYUonSoNEPKyAF9X/bQJIAnQCMIsDS
+DcwC/EBGFa/tZgCcKv+AaB2v0AoAKyAHGMtmD9wM/ERGHaG7AQAIuAkugf6v7i6F/i0gIszYjSn8
+QUYV4ACyACmif/5BaBWgDxUA4JEEBsP9AADgiBoP+AqAAOjuCAf7/QAAD+4CnirqJAAF2H0AAPwA
+Ih2gDQUAWFvoY/rhAAD/7WwNoAsFAPtDABXgDBUA+kBoHaANRQBYW+Bj+5HAoFmGuhzKq4zI+Z/l
+6JIAnQD/85gNoAsFAMCwHsqlwNoNzTT9wQYV7/NSAAAAAAAAAGwQBBvKoykiABjLNiuyOCiCivsg
+AETwCwUA6yQULM5CgAD5AABEcBkFACkkBeuEFClQBIAAW+XT0Q8AAGwQBBnK6YoyKZJ/CaoRqpks
+kAaIksDb/SCmHe/75QDriAEGY/0AAOyUBizQBIAA+SBGFaALBQBb5cTAINEPAABsEAiIIi8gB4cw
+lRL0IIYVof8BAPMGfA3ndwEA7xYBI4jhgADrfAEpUASAAFmGrOaiKW0gBIAA9mBoHa+F1QDiFgAj
+homAAAdyCec8ECkXAoAA8kAAQXAAmgAAAABpgQiKEItlWPTL1KBmQNfnfDAjMMEAAPLABOQiAJ0A
+KGAQyI1ogUBpguQoYBFlj89gAG4oYBHIimiBHWdP0HVBzWAAoooQ62IFK+AEgABY9Qr1QGgdr/+a
+AIoQi2VY9QH1QGgdr/9eAChgEciLaIEfZ0+bdUGYYABtAIoQ62IFK+AEgABY9Pz1QGgdr/+WAACK
+EItlWPTz9UBoHa//VgAAAACKEOtiBSvgBIAAWPSn9UBoHa/9ZgCKEPwfoh2gCwUAWYe61KD1QAuM
+bwYFAIgwBogB+GAGFaAAQgAAAAAA8iAGFaAEBQCJERbKLx/KLOfKLxyoBIAA9SAGQhAKpQDiEgAs
+zwKAAAeZCCuSng9cCizCv/dgEAJSAJ0AK5KdDLsB6xYDJY4BgACIaPcADnCSAJ0ALnKuHMoe7xIE
+JwwpgAApcq0swn/smwEEa/0AAP0gC44iAJ0AnWj9IAuWIgCdAC4gFK/uDg5HLiQU9cAM/lIAnQDr
+EgMp4ASAAPpAaB2n5AEA/CCIFeAPFQBYWCmIEv6gABUwCUUA90AARXeIAQDppp0kFGkAAIonjRTA
+wOqsIC7YBIAAWFGr0qDRDwDAINEPiGiCEPcACqCSAJ0ADFkRp5krkp73YAryUgCdACuSnQ9cCizC
+vwy7AWSxTLCNnWjrFgMt+Z4AAGAA5wAA8iAGFa//RQD/X/blYgCdAPpAaB2gG8UA/AACHaAtBQBY
+WxTsEgQpUASAAO0SAinYBIAAWFfR0qDRDwAAiBIICEdpgmyIEIiHgoj3AqQV78wFAOmCCyRogQAA
+DNwBrHcnfEDzIAcUIgCdAIQUKYkUDEQRokWkmSmFFPTgBxviAJ0AyTOIFMiP2SBtiQUDAIYJAmEl
+0gAEVQj2oAjEYgCdAIggldAGiAH4QAYVoAIFANEPiTAGmQH4YAYV4AIFANEPAAAAwLAKjDTsZggt
+9LYAAPpAaB2gG8UA/AACHaANFQBYWuRj/zyLEfpAaB2gDAUA+2MAFeANRQBYWt5j/yTAoFmFuIho
++R/xWJAKpQBj/7/aIFvir2P+XP/4GA2gCwUAwKBZhbCIaB/Jnvkf9RCQCqUA//r0DaALBQDAsAqM
+NPzBBhWv+sIAAMDQnYuIkAaIAfkgBhWgAgUA0Q8AAAAAAOJ/DAGBuYAAjhQPRRTqXAgpwASAAOru
+NglIBIAAbekFCACGCQJhixSvOOW7DAZJAQAAbbkFCCCGCQJjiCAPTgyuzi7sQJ7QBogB+EAGFaAC
+BQDRD4ggL8xAn9AGiAH4QAYVoAIFANEPbBAEKCAFzY4qIgcrogwtqRTuogklSMEAAOmxB3XjIQAA
+ZcADyN3I6/pAaB2gCwUAW+Ss0Q8bygX/lAgF7/j1APlABhWgDQUAnSfq80J1YCEAACiyeR/J/pyB
+n6Musnmeoimye+y2eSTIBQAAKbZ7KbGKZJ+9LLFziiB8q7UpIRpulDQtJRrwANgNoAkFAAAAKbJ8
+GMnwnJGYoy+yfJ+iLrJ+7LZ8J3AFAAD/b8YVr/8GAAAAAAAAAPU/+7mSAJ0AwMEMnAIMDE8sJRr5
+n/sh0gCdAC2xfA2qDFj0PNEPAABsEAQcyUMbyUMswjYrsoujzAnMEay7KbEawPL9IaBCUA0FAP1j
+RB3gACIAAGiTEC6xGg/uAg4OT+61GiccRQAA+kBoHaALBQBb5G7RDxzJMoqwK8F+C6oMWPQkY//h
+AABsEDItIAceyScNDUEM2hH/QABFMEmlAOiinilgBIAA4skeGdgEgADrFiYumASAAPkAfqviAJ0A
+K6KdAtgKKIK/CLsB6bQADbgEgAD7YH4IH//1ABXJbotIHskqKRYs8WAEMBAr+QDW4O4AFQDIwQAA
+CQCKBgCJLkISKEITKkIRi0kpQhCbHotNmR8qFhCJT4pMKBYSLhYRiE4qFhMrFhQoFhUpFhaOS+4W
+FyDJgQAACQCKLxYbLxYcLxYdLxYeLxYfLxYgLxYhLxYiLxYjLRYrLBZTLlJHKFJGKBYZ/iNGFaAB
+UgAAAAAA7uMFAMjBAAAJAmEJAmEOH4eISSgWFItNKxYVikwqFhYpQgvpFhcgyYEAAAkCYQkCYS8W
+IS8WIi8WIy0WKywWUylSRypSRioWHykWICv6/ysWI+sWIiDQwQAA6xYhINmBAABY8+gvUXnWoP9A
+cbniAJ0AL1GCf6IMKFGDr4j5QHEjIgCdAFjz//tAdbAf9kUA2iBZRm8lUYIjFicFpQj6oHZIUgCd
+ABjI8B/IxywSJh7Ixy/yNiNCGC7iiw9fCOdCGS/+QoAA/8AAR3ANFQAt5RovQSslxgEvFkEcyVUm
+QhouQhQrQhcpQhYpFkQrFkMI6AEpFgL4KKYVo67BACoWQuoWACroBIAA+iAmFePu4QD+JUYVoAsF
+APggZhWgClUAWYgWwKX9kogFoAsFAOnJQRnoBIAA+CAmFeeCAQDoFkYr8ASAAOgWACt4BIAAWYgL
+/BACHaAJFQD84AQGMA4FAOycOQ9YBIAAC5s5DLsCLBIq9YBSQRAPJQApFjUiFi35n6AVoA2lAPmi
+AA4wCAUA+CaGFaANBQAtFjMSySgZyLH8ACId4AoFAAraOQk5AQnZOfsmAAy0AD0A5z0YCAQKgAD7
+IFCwEgCdAAN6UyoWNvDASmpSAJ0ABlpQ+ijmFaCGoQAoFkjywEfLEgCdACgiM9MP0w8IiEEoFknw
+wEeVEgCdAAbJQSkWSvLASCtSAJ0AKiIzCipB+AAiHeAPBQD/LQAP8BgFAAh4AQiYOQj/AvvgTbAS
+AJ0AH8iU/ibmFeAJBQApFjgGyVAJ+BMJiAL7AE1IEgCdAP+Q1AXgCAUAKBY5LxY6Bt9QD/kTD5kC
++yBM4BIAnQD5kQgFoAkFACkWOygWPAboUAj/Ewj/AvvgTIASAJ0A+ZHWBeAPBQAvFj0pFj4GuVAJ
++BMJiAL7AExIEgCdACwWKv+Q1gXgCAUAKBY/LxZA/CqmFeAMFQD6KoYVoA4FAP+NAA8wKgUA+uAE
+BTAZBQD7jQANMA0FAOrqAg74BIAA6p05DsAEgAAayJgKOgEKyjn/RgANMIkFAAqYORrIzAjdAgo6
+AfuNAA0wCYUA/0YADTAIZQD7LQAPsA5FAAuOOQ/rAg27Ai4SRy0SSCoSSR/IrufuEQ7tgoAADt0C
+Hsi8D28B/WYADfENBQD/zQAO8QA9AAc+GO27Ag1UAoAA9lcABr+bjQD3sAAWse4BAO2tAg91AoAA
+/2YADb+qjQAKmQINuwItElQuEjf6JwgVrgA9AOc/GA7qgoAA/cYAD3/djQANqgIOuwItEkouEjQK
+mQLuFksu6MKAAO27Ag93goAA/CcoFe+tjQAOqgL+KqgVq4MhAOSIEQ/6AoAACP8C/WYADfPuAQAu
+FiktEjsP7gKeEi4SPQ7dAg27Ai0SPwqZAioSNQ27ApsRKxI6DaoRC6oCCpkCKxI+KhI8C6oCCpkC
+KxJGKhIz5rsQDVJCgAALqgIKmQIbyH8qEkAo+v8oFgD7RgANf//1APoliBXgDgUA+yYADLANBQDp
+Fkwq0ASAAFhTzvopiBXjg+EA+ZDmBeD2UQD4IAYV5+YBAPogRhXrAD0A9msADvAMBQD/zQAOdd0B
+AO8SKi7tgoAA7cwCDEICgAD8JsgV7eORAOTuEA1YBIAA6O4CCtAEgADg/xEO6wKAAP+mAA7///UA
+/6YADrAOJQD9hgAOcA0FAPwgJhWgDBUAWFOtJhIpKRJBKCFr+CmmFaAMFQD4ICYVoA0FAPgoSBWg
+DkUA///iHe/79QDrFgAszAKAAOmIAg1YBIAA6BYCKtAEgABYU5z+AMIdr//1AO0SRS1YBIAA/CBG
+FeAKBQD6ICYVr/z1AOwWACrQBIAA/AAiHaANBQBYU5D4KGgVoAwVAP4pqBXgDQUA+0BoHe/+9QDu
+FgAq0ASAAP4gRhXgDoUA+CAmFa//9QBYU4MsEkvA6v//4h3v+fUA6RYALlkCgADrywIOagKAAPog
+RhXkzB0A7cwCDVgEgAD6oGgdoA0FAPwgJhWgDBUAWFNzwOz7QGgd7//1APxGKBWv/fUA/CAGFeAN
+BQDtFgIq0ASAAPxYAAYwDQUA7BZOLmQCgAD8ICYVoAwVAFhTZC4STi0hZftAaB3v/PUA7BYAKtAE
+gAD7oAAXsAwVAP10AAb/7oEA/8YAD3//9QD+IEYVrw4FAP+mAA6wDuUA/CAmFeANBQBYU1EtEkT9
+/+IdpgA9AOwWAC1YBIAA5z8YCtAEgAD/IAAH8AwVAP4p5hXp7bEA5t0RD/sCgAD/xgAPf//1AP4g
+JhWj/vUA/6YADrAeBQD8IEYV4A0FAFhTPMAw9//iHeAMFQD6KegV4A0FAP4CQh2v+fUA+CAGFeAI
+BQD4ICYVqbthAPogRhXv//UA66QACtAEgABYUy3AwfwAAh3gHkUA///iHeAJBQD4ICYV7/j1AOkW
+Ai1YBIAA6BYAKtAEgABYUyH9j5IFoB5lAPtAaB3v/fUA/CAGFeAKBQD6IEYVr//1AOwWASrQBIAA
+/AAiHaANBQBYUxXAwfwAAh3gHoUA///iHe/59QD4IAYV4AgFAOkWAi1YBIAA6BYBKtAEgABYUwnp
+pAADLsmAAPTALokSAJ0A9MAzSJIAnQD0wDMKkgCdACMWGOMWGSDZgQAA57YCIOH9AACXs5e0l7WX
+tpe3l7iXuZe6l7vtxwgU8CEAAOqcICTYBwAA6BItJjAFAADsxwUV2gEAAOsWMiC5QQAA5IRUZNjB
+AAApFigYx0zvEisrGASAAObHAhqXgoAACCIC/KAAFDH/AQDyKkYVoAIFAP4qBhXgD0UA74gCDPgE
+gAD4KiYVoAg1AG2KdJ3w6BJRL0gEgADo9gEncQEAAPYAChWgKIUACQCKmPUoElApElLp9gYpTsKA
+AAmIAhnHeJz06YgCARAFAADjPPApyASAAOj2ByvABIAA6QseA7vBAADppAAH+QEAAOlMAAVRAQAA
+6AceDcgEgADpLAAF2QEAACsSKBfHYP4AAh3gCQUA+CMGFeAKJQDjcs4t8ASAAOMWGiXYBwAADwIA
+53LNLZgEgAAPAgDnFhkluyEAAOu84CGbwQAAbaqE/cYGFeAqhQDoElEryASAAOjmMSO5AQAA5gAV
+B8ANAAAJAIos5jTpElIsFsKAACrmNenmNif4BQAA/QDAQlAJFQDAkCgSUAiZEQKZAgmIAhnHQi7s
+QOmIAgCRgQAA6OYnKcgEgADiBx4NwASAAOgsAACQwQAA4gMeAZkBAADpDAAF2QEAACcSKPbgICXg
+Q0UA4hImI7kBAAApQSorElPxIA20EgCdABjGvR7HFJ1wibCccv7gphWgCoUAKnYD+KYADDAKJQDo
+dgQszgKAAAqZAil2AeYAFQPIYQAACQCK4zwCI7iBAACPQA8CAPHgDYqSAJ0AKSABAJkyhSEuQhkt
+Qhj8g0gVp6kBAPol5hWhAD0ADt0Y/SAAAzHdAQDtFi4lAMGAAC9CFBnGkA/IU+n/AQRD+QAACPU4
+67IAK9AEgAD8ACId4MzRAP4Agh2gPwUAWYQaHcaBKxIu/CXoFaAJRQDtAAUNaASAAA0CYQ0CYQ0C
+YR7GnxjG+eimAi3sAoAADW0CDt0C7aYAInghAADvBgAFcEEAAA4AipWmKEIUDA0G/UOmHeOI4QDo
+pBwh8BEAAC8SJxjGQgz/Eaj/Lvad+EAGHeACBQDRDwAAACgiMAiYUCgWSMCQKRZH8N+4exIAnQAG
+ClEqFkny37i1EgCdACgiM/nAaB3gqAEA++0ADLCICQAJiAIoFkrw37gbUgCdAP/cBA2hpnEAAAAA
+AAAAAPgAIh3gCAUA8isGFaOtAQD7X+AVoAIFAPsiAAwwCgUAApo4IhJYeKCCwIH4KQYVr/4aAAAA
+AAAA8T/0VFIAnQAfxjouQhqdcIqw/OBGFaAYBQD44GYVoAkFAJl2nnWedw9fAp90/UAAFTAOJQAO
+qgLqdgEhmAkAAPbkABXv+SoAKRInGsYGDJkRqpnzM6YV4AhFAPhABh2gAgUA0Q8pFjTyJaYVoAoF
+AOoWNS/oBIAAC+05/CZmFe/XDgApIjQJCVP4JsYV79eqAMCA+CbmFaAPBQD+JwYV79k6AMDw/icm
+FeAJBQD4J0YV79luAMCQ+CdmFeAIBQD4J4YVr9miAADAgPgnphWgDwUA/ifGFe/Z0gAAAAAAAAD8
+JUYVoA8FAP4n5hXgCQUA+CgGFe/Z4gATxgIqFjHjCAUA0cEAAAoCZSgizSMiziMWIPgj5hWgCkUA
+48YwGsYCgAD7BgAMMAIFACIWMCoSKygWUejF4xqXgoAAAyIC8ipGFaGqAQDqFlArGASAAOISJizQ
+BIAA9wBoHaAIJQBtipwvEjGdoCgSUZih5gAVD0gEgAAJAIr4JggVoAkFACIWWO/8QC+QBIAA/iYm
+FeAPFQAInznojAEsTsKAACgWMCgSUOymBC/+AoAAD5kCCYgCGcZWLxJS76YGJ3EBAADpiAIL+ASA
+APlA5hWgKYUA6aYFKcAEgADoFx4Du8EAAOKsAAGbwQAA4hJYLcgEgADvEx4F2QEAAOmMAAVRAQAA
+JxIy//DsDaAzhQAAAAAAAAAA/AACHeAepQD9jHoFr//1APmMeAXgCAUA6RYBLVgEgADsFgAq0ASA
+APggRhWgDBUAWFGF/j/iHaAMFQD9jGQF7//1AO8WAC1YBIAA7RYCKtAEgAD+ICYVoA0FAP+MUAXg
+HsUAWFF5wMH8AAId4B7lAPgAAh3uDxUA+CAmFe/49QDpFgItWASAAOgWACrQBIAAWFFt+UBoHe/m
+sgAAAAAAAPwAIh2gDQUA+EZoFaAepQD7QGgd7//1APqgaB2gCQUA+CBGFeCIwQDvFgAsQ4KAAPgg
+JhWv//UAWFFbwMH8AAId4B7FAP//4h3gCQUA+CAmFe/49QDpFgItWASAAOgWACrQBIAAWFFQwMH8
+AAId4B7lAP//4h3gCQUA+CAmFe/49QDpFgItWASAAOgWACrQBIAAWFFF+UBoHe/kKgCLSS1BFu5B
+FyEHMYAAHMXvKUIRik6PTShCEpYZmBObGJoX+CAmFeAKVQD+IKYV4AkFAPggBhXgDwUA/iCGFeAL
+BQD6IMYV4AgFAPggRhWgK4UAWYShIxYn+t+MIFIAnQAiEib6KmgV75nlAPvzwh2gAwUA+kAmHa/r
+dgD/wNwNoAsFAOrEAAbYYQAA/AACHaBNpQBYVlLHJNEPAAAAIhIm/YuWBaAKVQDyJOYV4BuFAFmE
+iSsSU/ZAJh2v+UUA/+pIDaADBQAiEib9i4QFoApVAPIk5hXgG4UAWYR/KxJT9kAmHa/5RQD/6aQN
+oAMFABzFuohMj02WEvogJhXgClUA+CAGFaArhQBZhHP634aIUgCdAPIk5hXv/SYAbBAKJiAHHMT9
+BgZB68T5G1cCgACsqiiingtrCvt36BXgGVUA+QAWw+AONQAoop0LiwHqtAAFlpGAACswAxfFf+3F
+Gh2W5gAAJUIUBYhTmBf8oAQC8+XhAPXADGGSAJ0AwFAuQSobxPIZxPXxwAjMEA8lAI4xm6CIIAiI
+EQ+IApihGMUWmaKXpQjpAh7E8/lAhhXgCIUA6KYDJUhhAADuABUFUIEAAAkAiiVcAolA8SAI8pIA
+nQApMAEAmTIoQhknQhguQhoJC0f6IUYV4QA9APjrAAu5/gEA/iEGFeF3AQCXGecyASWAqYAAKUIU
+CctT7ZkBBdv5AAALlziLIP4aAAYwDRUA/gYCHeAORQBZgnuJGIsZjBodxOAexQUYxWDtAAUNaASA
+AA0CYQ0CYQ0CYeimAi3sAoAADZ0CDt0C7aYAIhAhAADiBgAFeEEAAA8AipemLUIUDA4G/0OmHaPd
+4QDtpBwi+BEAABjEpAxiEagi/lOmFeAORQD+YAYdoAIFANEPAAAAAADx3/kEUgCdAC5CGogxm6CH
+IJminqWep+7Euhu+AoAAD3cC90AmFeAXBQCXow6IAvlAhhWgDgUA7qYGIqgJAAD7RAAVr/uGAAAM
+YhGsIvRTphXgD0UA/mAGHeACBQDRDwAfxTYYxTYpQhbqQSstWASAAJkVmhT6YCgVoAwVAPogxhWg
+CYUA+CBGFeAOxQD+IAYVoA0FAPggJhWgDiUAWFByjhePFO3FJx1YBIAA+iDIFaAMBQCcEfwgBhXg
+DBUA+eAAF7ANBQD/xgAPcA8FAP4gRhWgDkUAWFBklRL8ACIdoA0FAPtAaB3gDmUA+iDIFa/59QD4
+IAYV4AgFAPggJhWgDwUAWFBZixXA0PQgyBXgHgUA+3AAFbnLsQD6IEYV4//1AOwWAS1YBIAA+4AC
+HaAMFQDqFgAq0ASAAFhQS/wAIh2gDQUA/gACHaAIBQD4IAYVoA8lAOgWAS1YBIAA6BYCKtAEgABY
+UEAcxEMdxG3/9aANoAX1AAAA//S4DaALBQDrbBgpUASAAPwAAh2gHVUAWFVqxyTRDwBosyzBlnmx
+F8a6+mAmHe/ppQD/9hgNoAUFAAAAAAAAAPnzwh3vnuUA/mAmHa//mgD+YAYdoAIFANEPAABsEBgl
+IAcZxCb2gQgVoVUBAOvEIBrXAoAAqaooop4LXAoswr/3ABci0Gb5ACqinQyqAeykAAUW8YAAF8Sz
+LXGKGcQ/8atgDe/79QDkYUVg0MEAAAkCiQoAiihCECpCES9CEy5CEo1JCQKJnR6NTSoWEJgfikyI
+Ty8WEi4WEY9OKBYWLxYVLRYUKhYTLkIL7hYXINGBAAAKAIosFiUrFhsrFhwrFh0rFh4rFh8rFiAr
+FiErFiIrFiMuckQvckMvFhkuFhorFiMrFiIrFiHqHDAg2YEAAFjvBChxc+wSJS1YBIAA+UAH2aIA
+nQAqcXwpcX16sgmqmflgB0NiAJ0AwHDrIgArEU4AAMDQ+4BoHaAONQD84GgdoC8FAFmBoRvElokg
+HMSTL0IYLkIZLMJ/9+YAD/CIBQAI7gIMmQwLmQIrQRaZoIhNK6UCKUEXKaUDmKKNTJ6ln6Sdo4xJ
+nKb6g0gV4A0VAPtA5hXgDzUAGcPNDFgRqYgvhp0tNAAuIAaMIu3MAgdwBQAALiQG/EBGFaACBQDR
+D+kABQDQwQAACgJhCgJhLBYlCQCHiEkoFhSPTS8WFY5MLhYWjUvtFhcgyYEAAAkCYQkCYSsWISsW
+IisWIylyRCpyQyoWH/gkBhXv+5oALUEWLkEXh0nrFiQjD0mAABzEWCpCEY9OiE0pQhL2IQYV4AsF
+AJsQnxeaESkWA/ggphWgCQUA+CCGFeAIBQAoFgb+JIgV4AoFAPogRhWgK4UA/iEmFeAKVQBZgwkr
+EiTsEiUt9coAAIYx/YeABe+e5QAuNAH6gogVoD8FAPiDKBWhAD0A9oMIFeAORQD4g0gV47rhAP1A
+BAVwDRUA6HcYBdv5AADrpjgOUASAAPgaAAZxdwEA+kAIFekpAQBZgUAYw6fZoPgACB2gDzUAbfoC
+CQJhG8PIGMQi6KYCK8wCgAAJKQILmQLppgAiECEAAOIGAAV4QQAADwCKlqYuQhQtCmL9Q6Yd4+7h
+AP9Dhh2gCUUAHMNrDFsRrLsptp34YAYd4AIFANEPAAAAAAD/9IgNoAoFAOtcGClQBIAA/AACHaAN
+VQBYVJDHJNEPAMDQ+4BoHaAOVQD84GgdoD+FAFmBGB3EC4wgL0EWLdJ/L6UCLkEXDcwMLqUDHcQI
+LkIRnqMNzAItQhCdoitCE5ulKUISmaSITZinj0yfpo5PnqmNTp2oKUIYKEIZnKD3JgAM8IsFAAuI
+AoxJnKwrQhqYq/tBphXgDVUA+UFGFeALFQAfwzwMXhGv7i3mnSs0ACwgBooi66oCBmAFAAAsJAb6
+QEYVoAIFANEPHMPiKBIkj02JTJkQ9iAmFeAKVQD4IEYVoCuFAFmCmyoSJOwSJS1oCgAAY/5EAGwQ
+CvZgaB2nhQEA9QAICRIAnQCJIs2SKTAYZJCH9SAEuJIAnQBokwlolBzAINEPAAAAJTwY21DqJAAJ
+4ASAAFv57mSgk2av4hPDFIo490ANeJIAnQAbwxEdwxIssq7t0n8mBDmAACyyrQ3LAe3Ae3Vz/QAA
+njh9wH4vIBSk/w8PRy8kFPXgDF5SAJ0Aiif6gGgd4AwFAOqsICpoBIAAWEqu0qDRD9og7DQAAdhh
+AABb/tNj/4wAAADlPBgpUASAAOw0AArYBIAAW/31KzAY+X/7gdIAnQBj/1ssMBj5n/paUgCdAGP/
+XQAAwLDA2g2tNO02CC38LgAA+kBoHaAbxQD8AAIdoA0VAFhUFsAg0Q8ALTEWjzguMReDOf/pwAAQ
+X/EAHMOVK2IRiG6JbSpiEvIhBhXgDwUAnxCYF5oT+CCmFeAKVQD6ICYV4AkFAPgghhXgCwUA+iBG
+FeAIBQD4IMYVoCuFAFmCPWAAGgAcw4SIbI9t8iAmFeAKVQD4IAYVoCuFAFmCNoMnjDj6YqQV78cF
+AOoyCyHogQAAB9cB92AARfAPBQDsoXJ12QEAACg5FAxOEazqrogoNRR6s3LJZ9Ng6cQAAgCZgABt
+SQUDAIYJAmEq0gAOqgj7QAT0YgCdAJrQ48QAAoH5gAAvNBgvNBn+Y2Yd7/v1APpg5hXv+F4AwKBZ
+frSKOPlf8lCSAJ0AY/7lANogW9uqY/5wnzvjpAAK/k4AAMDD/GMGHa//CgAA7LsMAwGxgAALQxTo
+PAgrSASAAOhINg5QBIAA0w9tiQUJIIYKAmMLaQjjSAwD0QEAAG2JBQlAhgoCZQvpDKl5KZxA+aAG
+Fe/9sgAqfED7oAYVr/2GAAAAAGwQEB3DPSggBSwgB+XRkCrIBIAAKzAD9oBAFeGsAQD9AQAEUFUJ
+AMAg0Q+IIukWCCwc1gAALiAWHcMx+iDGFeD59QD5ziYN4A8VABnDLfuE9AXiqAUACMgdq4vpiAgH
+MEEAAOaCfisBCoAADukK65kLD9gKgAALZgErgn8GuwLrhn8kyD8AACuSkbG7K5aRKIKAAOEE7pxI
+L9gKgAD7ABoI4gCdAAzJEa2ZKZIACbsB6hYEJZphgAAewlUr4IAcwlTmwlQV2N0AAPog5hWkux0A
+63sJC8fCgADoFgkl2A0AAPVAE5oSAJ0ADK4Rpu4o4p6aF/sAJyPiAJ0A7MJDHkgEgAAr4p0MrAos
+wr+aFwy7Ad+w6hYEJZgZgACMmPeAGTiSAJ0ALmKuZOJ2HsLzKmKtLuI3DqgBmBr/QBNOIgCdABnC
+M7DImJj/QBNmIgCdAO7C7RqapgAAKjAgKwrt+0AbNGIAnQDAznyhCigK7vlAI7UiAJ0AwKDqFg4h
+4IEAAPwiJhWgCQUAmR0ewuAqICwoIRcbwt3pwgAtVAKAAAqIAhrCHwuZAYssKqJPDgCHCroM+s4A
+DTAOFQAK7mAJiAIoFhD/QBmMIgCdAMDALiAWKAr/0w/5yiYNoAsFACwWEy8WFyoSEVvZji8SFy0g
+By4gFvmFjgWiqQUACdkdmRWomSmSf/wiaBWgGPUADogM+SAfKiALBQAYwrkM2RHomQgPQgKAAAio
+ApiTGcK8LSEHGsK5HsK5+YABBPrdAQDpkgAu7wKAAA7dAp2gKCIAK6UFKaYD6RIGLEYCgAAIeALo
+pgEh8EEAAO4HHgVoQQAADQJj6aYPKpVWAAAuCgAoIBQEiAgICEcoJBT1ABd2UgCdACwSCCVM/gxa
+EfohhhWnzAEALBYLGsKb/eBoHeAMBQDoEgstWASAAOsLHgZgBQAA7UwADifQAADtEhEn4QEAAPkA
+DKFQCwUA/IJAAVAJBQANYIbsbAAF2AUAAHW58YodZaGhixyNHiwSEK+7rf3s1hAl+QEAAO8WDycA
+0YAAHcKED3cR/YYADnAOBQD8IgYVr/4WAIQyJCYcjDHpFgEv2ASAAPOAEwhSAJ0AwDDpFgEuE9IA
+AKN+jxcM/xGm/+72nSyQBIAA0Q+MyJoU94AWwJIAnQCOFwzuEabuKOKe+wAXc+IAnQAbwaSJFyji
+nQuZCimSvwmIAZgaGcGhjhrr5AAHFvGAALDI+SEGFa/11gAAAMCgmhqLGhjBmsDqDs407oYILezm
+AAD6QGgdoBvFAPwAIh2gDRUAWFLE6iQACdgEgADtEggqYASAAFhPgdKg0Q8p7QIrkQIokQEpkQWa
+FOuIAQ/YBIAA+R/louIAnQCLFPpAaB2gDBUA+2JAFeANBQBYUrJj/7IAAB7BfC7ggI0ZLuw3/o4A
+DzAMFQDu3QgFWGEAAO3cAylQBIAAWFKnY/+HAAAAAAD6IuYV4AoFAFl9fhnBb4yYLxIX+Z/mMJIA
+nQBj/1EAAC4WFYonmREvFhfl4iJlUIEAAPyAaB3gCyUAWEkTix0vEhcuEhXppAAF8xGAAI0Q/eIG
+FeAMBQD94kYVr/lCAAAoICwZwVgDAonuABcMQMKAACiWJg6Ah/oQIADf8lYAABrCGB7CFvhhCBXg
+GAUA6BYOIdiBAAArFhGbHQ6ZAeqZAgHgwQAA+CAGFe/yYgAAACqwAPNADY4SAJ0AwKAusAHzwA6W
+EgCdAMCQD5wRDKwCZ8yxY/sIAAAdwfkcwToDo4wNAGsoICwswiT7AAQA0A4VAP3AAQdYjLkA+cAE
+BzAN9QD/oAaWIgCdAC4wEPPAD//SAJ0ADAlC9SAIyJIAnQAqnP74ACIdoA4FAPsCAA8/9BoALhYV
+LxYX6xIKKVAEgABb2isvEhf+IqgVr/P6AADaIOv0AApgBIAAW9uuix+MMYkR46QADW8CgADtuwgG
+bHWAAOokAApgBIAAW9t1o66ufo8X4hIBL/8CgACm/y72ndEP2cD/7MANoAsFAAAAAOokAAnYBIAA
+WOyOwCDRDwAYwRCNFQ7pCqjdDZkLKZ0QKJGlCogMC4g1+TSkHa/wVgAAAAAAAAAA/EAABTAJFQD7
+X2AVoA4FAPsiAA8/8SYA+iLGFeAKBQBZfQIZwPOMmIoUKxIW+Z/omJIAnQD/6uANoAsFAAAAAPmB
+2AXgCwUA+iFGFe/0ggDA6g7ONP8hBhWv6mIAGcEmKBIQ+QYADHAOBQD4IgYVr++6AAAAAAAA/IBo
+HeALJQBYAH8vEheJEf4iqBWv8QoAC+GHLjELnhMODj+ONg4NPwvAhywWFPmdCB2kmgEA+QAEcuIA
+nQD/+KwNoAoVAInC8SAFINIAnQAJzBQLI4cLAocMCEmYEvhAiB2kngEA+QDWDeAMFQDAwHrnDPmA
+aB3gAFIAAAAAAAD6ACId4AkFAAy5OCoWEu8WFyzvNgAAjDLaIPoAIh3gDQUA/iBIFa/MgQBY7CIv
+EhcqEhL/9wwNr/n1AAAAAAAA/+yEDaAOFQCMMi8WF/pAaB2gCwUA/CBoFe/MgQBY7BUvEhcsEhSL
+LP/2BA2v+vUAGcFpKDEOeYkO/GHkFa/9WgAAAAAAAAAA8d/rZlIAnQAqFhL+IuYV6aoBAPogRhWv
+/d4AAGwQBI0n+aEIFa/PBQDq0RUpWASAAOLSCybggQAAD88B76oICncCgADoIUh1UQEAACbZFKjp
+rmYm1RR5o07JNeI0AAIAmYAA04BtSQUCAIYDAmGJwK6ZepF8mcDIWwrqMOq2FywQBIAA0Q/SgNEP
+AAAAAAAA+EBoHaAMBQDs1gsq/u4AAGP/4gAAAAAA6KkMAYGxgAAJShTtrAgpkASAAO1NNgw4BIAA
+0w9t2QUCAIYHAmEJMgjqRgwHmQEAAG1pBQIghgMCYwnqDKr6KqxA+4AGFa/+JgAt/ED9gAYV7/36
+AAAAAGwQBIwh7SEFKlgEgADyrwAKf84FAO4uAQlABIAA7toICc8CgADpwggFUQEAAOorL3r/AoAA
+6f8MCjcCgADmJggHgLmAAHajIchMbUkFAgCGCwJhgoHRDwDSwNEPAAAAAPxPAAl//0YAAAACpwzz
+YGgd5FcdAG1ZBQIAhgMCYQtzCOVJDAcRAQAAbZkFAiCGAwJjgoHRDwAAbBAGHcD94sBCGSAEgADl
+wPsayASAAJkQikcoQSgvQQf+hSQVr8sFAOh4CAVQgQAA+0AEBfr/AQDlZgInYIEAAOxmAy//AoAA
+Av8Cn2AsMgclMgsoNRsHzAz8oAQC8AIlAOhVAgH5AQAA7DYHI2hBAADlNgsh4IEAAG0qBQwAhg0C
+YeXgjWMQwQAALExADCCGAgJjLaEF/eBoHaAFFQDr2QgDWQEAAPhgBnHgAkUA3XBb1ZOPQKKipa7o
+/xEHcA0AAA/uAp5hjTcYwM6KOekyCCaEuYAAjDr5IAQEP7qBAPhhBhWvqgEA58wIBdgFAADsNgot
+3AKAAAuqApo5jxAYwMEPD0cM/xGo//PgBhWgAgUA0Q8toQWr2Og6ZH/gBIAAv+75gGgd5F4dAG1Z
+BQlAhgICZSlBLGWQTv1ApBXv/wUAD+8BrPyr2eb7CAKQDQAA6ZxAJdjBAAD5n/qT4gCdAP2PAA5/
+/SoAGMB+CJgCmGTRDwAAAAAAAP3vAA5//MoA/e8ADn/+cgCmkiIsMAjqMC1CFw2IDC0wFR/Amw1t
+QQ/dCi3Snw2ILC1BMC9BMQDdEQ3/Aqj//kAkHe//gQD+QAQd7/3eAAAAbBAEKTAViyfYIPigAAT/
+zAUA5FCuZdCBAAAWwIoewGeNO4swjziHOfsAAAXwBSUA/nAAAXtPIQD/oAQGsHdxAPavAArz7wEA
+5v8BCoEKgADk7ggJEAqAAOLuCgXbgQAA64UpJ3A5AAAuhSj+YQYV7+4BAP+vAA6/uwEA7TYHJYVJ
+gADsrQEEi1GAACQxCSIwEaQiApIJsiICAk8ihSwkoQUiLBCiMq1N5SwwJukBAAD8oApK4gCdAIYs
+5oYYKZAEgADRD4W4LbEVDK8Bgruv3ea5FCbpAQAA9EAJpGIAnQAMThGl4q5mJrUU86AJ06IAnQDJ
+OslI4jQACpgEgABtSQUCAIYDAmEiogAPAgAOIgj8QAr0YgCdAJKg01AG6jD3AuYVr/veAAAkoQXs
+pwEBkQEAAOdHCARJAQAA9mAHCeALFQDaIAoAhgkCYYUhJIEoiiMZwD11S1eFIiSGEYwhHcA7qkoE
+zAycIXSrIx3AOCyCEOomAyKoBQAAlSIJzAELzAINzALshhApkASAANEPACyCEJUimiMJzAELzAIN
+zALshhApkASAANEPAAAAAAAA9ILmDeEOBQAWwCUighAGIgLihhApkASAANEPL4IQCf8BC/8CL4YQ
+jSAWwBwO3QKdICKCEAYiAuKGECmQBIAA0Q/AkOmFLCmQBIAA0Q8EWgyKoOqGGCmQBIAA0Q8AAAAA
+8kBoHeANBQD9YWYV7/wCAPRPAAk//H4A5dsMAYGxgAALTRTm3AgpkASAAOZGNgq4BIAA0w9taQUC
+IIYHAmMLMgjtRgwHmQEAAG1pBQJAhgMCZQvtDK39LdxA/UAGFe/6sgAu/ED/QAYVr/qGAAAAAGwQ
+DJQYkh3uEg0pkASAAOUiACrQBIAA8uAIFe/JBQD0wAgVr/0FAP/A6BWoVQEA5RYJIqg9AADtXQEL
++ASAAObhFStABIAA4tcIB3CBAAAJ6QHpaQgDuIEAAOmcQCvgBIAA+OAQEuIAnQCYFJ8TnhKdEZwQ
+mhX5fggF5GUdAOsSDSEogQAAlRqWG/V+HgXnagEA67EHKz+CgACpd5cW9336Beq7AQDmFgct3wKA
+AOW7Ags3AoAAp2b6IYYV4AcFAPRBhBXgAIoAKGKejBb1AAr7ogCdACtinSzCvwy7AeS0AAWIeYAA
+ihKLEYwQA1U2pLvrvBAq6ASAAFvUbwUzDKdXix2MGR6/q48d6hILLWgEgACJJ4gcqt0FmQyZJ5hA
+j/CIGu5GAiboBQAA7EYDL/4CgAAP3wLvRgEiSEEAAG2pBQgAhgkCYSuyFewiBy2D7gAAZMCCLiEM
+GL7NLWadfjNZKICAhBjtvsoUQN0AAP4g6BXkiB0AqETt0ggiIB0AAPn/+iJSAJ0A96AFYJIAnQAu
+Yp6IFvXABcuiAJ0AJGKdKIK/Gr67CEQB5ECnZsv9AACZqPqAaB3v/J4AjBSLE5TA92AGFeACBQDR
+Dy6xALHu/2AEHa/9+gAvIQwF/wxl8I6CE4gUlyDkhgAukASAANEPHr6mLuCAjRjrEgUncN0AAPoh
+qBWk7h0A/6AARrAMFQDt3Acl2GEAAFhP0IIUjxOUIPfgBhXv8kUA0Q8AAAAA//qoDaALBQDAoFl6
+pB2+lI3Y+b/6UJIAnQD//ZQNoAQFAMBAH76PwOoO3jT/4QYVr/1OAAAAAAD27wAOP/f6ABm/WC8h
+Hi4gFSogFCghCSwgEa6qqlqsQqgrqMysrKioLEULKrUSefESjxSOEyglEZTw5+YALpAEgADRD4sU
+6hIDJEthAAApJRKUsOemAC6QBIAA0Q8AAABsEAaKJ9sg+UQAFa/JBQDpiQEChjGAACoxCS4xDCQw
+FS8wFCKBBSwwEZIQqSWsNuT/CAHo8QAA5mwyLqAEgADmFgEiqQEAAPWgB+riAJ0A7UQACyAEgAD0
+wAeq4gCdAKrCoyfnfDQqYASAAOcWAiugBIAA9OAHGuIAnQCvJybRAK7yp+cnNRMXvyAiRQCqIvbA
+BoxiAJ0AIsUAKjAVJzEJJjAR4jAUJQSZgAAsgQWnZpwQpiLpzAgBEEkAAKMi7MxAIRCBAAD8QAUy
+ogCdAOK2FSmQBIAA0Q8AhagtoRWCqy+pFOndCAp3AoAA7wIABukBAAD0QARMYgCdAKXsrv8vpRT9
+oARTogCdAMk64jQAAgDBgADTUG1JBQIAhgMCYSyCAA8CAA7MCP2ABXRiAJ0AnIDyoGgd7/uGAMDQ
+7bYVKZAEgADRDwAA868ACj/8DgCSEPLPAAo//CYAhhD27wAKP/xuACos2PuAJB2v/L4AAIwQDCwM
+7LYVKZAEgADRDwDyQGgd4A0FAP1BZhXv+i4A5doMAYGxgAAKTBTvzAgpkASAAO9PNgq4BIAA0w9t
++QUCAIYHAmEKMgjsRgwEmQEAAG1pBQIghgMCYwrsDKycLMxA/QAGFa/9cgAtnED9AAYV7/1GAAAA
+AGwQBBS+syUgBysgFv17/gWiowUAA1MdC7kKrDz0YABBsAoVAOcyfiXoQQAA5jJ/LoEKgADsmQsN
+QAqAAAh3AQdmAuY2fyTIPwAAJJKRsUQklpEjMoAAsQQAohriOBZ0ySEAABi+mgxTEagzgzADIgEA
+IhHRDyKdAiMhAiIhAQMiAdEPAGwQDpUZiiInMA4pIAeXHed3CQJ7/QAA8VecDeGZAQAavc+ZFhW9
+zRu9yxa9zSVQgJ8b7383DMcCgADmiAgCqN0AAP8TyBWkVR0A5f8IDKgEgADrmQoH+A0AAP/AC/Pi
+AJ0AKZK/KIKdCYgB24DoFg8kC5mAAIio9wAMyJIAnQAtYq7xsoAN4P/1AB29tixirS3Sfw3OAe4W
+DiRz/QAA/YAIhmIAnQCeqP2ACK5iAJ0AKCAWHb20/wAL3WIAnQAuMA+MGft7aAWvyQUA88GwDefM
+AQAoIQcICEoMiBEKiAIo1iyPIB6+b4od/eAAF7AINQAI/wIv1i3uCAUBwEEAAPmAEbFSAJ0AiR9t
+qQ4IAIYIIIYJAmUJAmEJAmP4IeYV4AkFAJkcLCAUKiAEjx71gABGMA0FAPVADyEQDhUAJCEJLCQU
+KCAVix+bGi30ACz0A+SIEAomAoAACEQCDkQClPEuZq0tJBSEMiQmHIwx84AQ2FAJBQDpFgAuEaIA
+AIoQqnriEgwq3wKAAKa7Krad0Q8AAAAA6iQACdgEgADtEgkqYASAAFhLYdKg0Q8AAADAwJwejR7A
+6g6ONO6mCC73ngAA+kBoHaAbxQD8ACIdoA0VAFhOlWP/vAAAAAAA//osDaAIBQAdvV0t0IDrEgYm
+6N0AAPpAaB2k3R0A/OAARvAMFQDt3AMl2GEAAFhOh2P/gwAAAAD6IgYV4AoFAFl5Xhq9T4ioKxIQ
++R/yoJIAnQBj/44AAAAqIAf/fAoFoqkFAAmpHQiMCq2drp7p4n4keEEAAPvgBADQDxUA7cwLD+gK
+gAANmQEt4n8J3QIpMQbt5n8mYD8AAC3CkeCBBAZBIQAA6BYIJugFAAAtxpEu4oAcve7tvTwfwAqA
+APnACYiiAJ0ADK4RrO6O4A6IAWSBOCogByggFv970gWirwUAD68dnxeu/y/yf8HvCO4M/+ASSiIA
+nQAMrxHs/wgMcgKAAA6eAv/gZhWv92IAhxv5gAiRUgCdANmw6DwQIgxBAAAqTP9tqQUIAIYJAmHA
+wJwcjRsM3RGtvfwh5hXv+DIALCQUjjDzwAuykgCdAOISDCr/AoAApv8n9p3RD4onLaEV6xINJVCB
+AAAJrAGs3CzMQG25F4sfCGCGCCCGCwJlCwJnCwJjmx98ixzTD9tA/IBoHeAMBQBYRKr6IYYVr/au
+AAAAAAAAAP0PAAx//34A2iDrEgoqYASAAFvXhIwxixrqFgAtbwKAAO27CAZupYAA6iQACmAEgABb
+10uOEK6urnqeEOISDCrfAoAAprsqtp3RD4oYKq0CKKECL6EBKqEFCP8B+//2QqAIFQCLFvpAaB2g
+DBUA+2JAFeANBQBYTgtj/ZMAAI4nnhGI6S3pFC/hFe8WAidQgQAACakBmRXp+QgKZwKAAOzdDARA
+QQAAmOkI3TLt5RQkyQEAAPkACyLiAJ0AnRTpFgMmXS0AAKjNLdzw/SAHW+IAnQDoQR5tyASAALBO
+bekFCICGCQJpjaEvqQStze8WBCbrwQAAjhMPAgD/oAlUIgCdAC2mAe0SBC7ABIAAZNDv+CGGFa/5
+2gAuIAcZvPwOKEDqIQgsQoKAAAmIAvgh6BXh7gEA7b02H3QCgAAOqgKYkIsg/UYADXAoBQD5IGYV
+oAM1AO27Ag3+AoAAA/8Cn5ETvK+Tko8r/kEoFaAIBQCYlZqU65YGLmoCgACdl56Yn5noJBQjkA0A
+AAxTEaYzIjadghzRD44XCIwKre4OzAsszRAqwaX5TwANcA4FAA6qNfuUpB2v7hoAAAAInQz5YGgd
+5P0dAG35BQighgkCa4gVDbkID08M6IxAJ4xBAAAu/P9t6QUIwIYJAm2IFS+pBA3JDAmICCiMMOim
+AS/4pgAAjBXA0O2lBCZhAQAA/UAmFaAIBQD9QAYVr/viAA+IDPnBJhWv+mYAAIgV7RIEJEEBAAD5
+QCYVr/teAAAAbBAMlRGMIiogB+kyACJoBQAAnRn8IQYV4aoBAPOBzA3omQEAHLxemhOIyBa8XZkS
+9wARAJANpQAuYq4ZvFpk4kgpkn8lYq0JVQFkUj6wiJjI6VQAApD5gAAbvE8lsICOExq8TOkWACKo
+3QAA98BoHeRVHQDlRQgPTwKAAOaZCAKoEQAA9cAL4hIAnQAokp7TD/UAGvviAJ0AJZKdCugKKIK/
+CFUBZFHwKSAWKgr/0w96kToqPBBb070pIAf9efAF4qwFAAycHSggFq3NLdJ/we8I7gz/oBkiIgCd
+AB+9AgiNEO2tAgz3AoAAr+6d4CggFC4gBKSI9cAOkReYAQApJBT1IBQ+UgCdABu87S0hB48SHrww
++3hmBardAQDs3REH4D0AAP+mAA60zB0A7hIJJmAFAAAMTAydUIgg7Lo5B8hBAACZU+pWAixGAoAA
+CO4CnlEtICwrIRccvOTqEgEu7AKAAA27Agy7AutWBCLIgQAA7DIDIcBBAAD+oWQd4A4FAP6hRB2v
+DQUA/YAEBne8AQDsVgYt2wKAAPqg5hXnqgEA+UAJiVIAnQDoQQ1iU/0AAG2pBQgAhgkCYcCALSAE
+sEoMqhH1oA0pEgCdAIkyKSYcizGqVegWDCKogQAA82AN2FIAnQDAMOgWDC2O4gAAo0uxuwx8EabM
+68adLBAEgADRDwAA9wAQwJIAnQAMeRGmmS6SnvXAESviAJ0AJZKdCnsKK7K/C1UBZFITsI2dyGVe
+dWAAYwAAAAAAAADqJAAJ2ASAAO0SASpgBIAAWEnH0qDRDwDAoFl34By70IjI+R/usJANpQD/95wN
+oAUFAAAAAAAAAPpAaB2gG8UA/AAiHaANFQBYTPhj/7HAUA2INPmBBhWv9voAAAAeu78u4ICNGesS
+Aydw3QAA+kBoHaTuHQD/oABGsAwVAO3cAyXYYQAAWEzpY/90AAAAAAD4QoYdr/jmAAAAjyefFIj5
+++KCFe/NBQDq8RUn4IEAAA3NAZ0V7a0ICk8CgADpuwwEQEEAAJj5CLsy6/UUJukBAAD9AA0S4gCd
+AGibTZsb6JoIAvCBAADuFgYlU8EAAPugCPuiAJ0A6EEeb1gEgACwTm3pBQgAhgsCYYrBL8kEqprv
+FgslU8EAAIsb/UAPjGIAnQDqxgEtQASAAGW+UWABKYsw82AKYpIAnQDsEggr7wKAAKbd7NadLBAE
+gADRDwDrEgApUASAAFvUi2P9bgAA6RYHKVAEgADrVAAM4ASAAFvWDogciReaGosx46QADXcCgAD+
+oABCv/iSANog61QADOAEgABb1dSjo6NL6BIMJdgFAAAMfBGmzOvGnSwQBIAA0Q8AAAAAAP/ytA2g
+BQUAG7tyCIkKq8sLmQspnRAvkaX77wAPsAsFAAv/Nf80pB3v80oAwKBZd20cu12IyBq7Wvkf7tiQ
+DaUA//fYDaAFBQDAUA2ONP+BBhWv96YAAAAAAAjdDPvAaB3krR0AbakFCCCGCwJjiBWtXupLDAdQ
+gQAA6IxAJYxBAAAvvP9t+QUIQIYKAmWIFSrJBA2bDKuIKIww6MYBLWlOAACNFcDg7sUEJukBAAD9
+gCYV4AgFAP2ABhXv9DYAAAqIDPnhJhWv+W4ALyAHHLtH7ruCElP9AAD/QAAVMN8RAOpaCA7qgoAA
+Dt0CHru8naiNIP1BRhWgCzUA/EEEFaH/AQDu3QIOzgKAAOuZAg/8AoAAD8wCman/hgAOMCkFAJmr
+KyAUjyv+QSgVoAkFAJmtnKydri6mEO+mES3aAoAAm68pJBSCGbMiDHkRppnilp0sEASAANEPiBUo
+jED5gCYVr/hKAAAAAGwQBCYgB/V3nAWipwUAB2cdIiAWpHQkQn/BXwJVDHVNExq72QgoEOg4AgtP
+AoAAqpmYkNEPG7sMAioKq3sLqgsqrRApoaXzLwAM8AsFAAuZNSmlpdEPAABsEAQUu7UmIAcqIBb7
+dgIF4qMFAANjHQqpCqs79GAAQbACFQDnMn4lYEEAAOUyfy4BCoAA65kLCUAKgAAIdwEHVQLlNn8k
+yD8AACSSkbFEJJaRIzKAAKEEACUa5TgTdMkhAAATu5wMYhGjIoIgAlIB0Q8lnQIoUQIkUQElUQUI
+RAF1SwPAINEP0Q8AAGwQBiogB4giHLrU93WqBaGqAQDlgOVtXwKAACnAgOa7CA04BIAA6LKeJMjd
+AAD/dZYFpJkdAO26xxTIDQAA+QAH0+APpQArsp0NqAoogr8IuwFksPCK6JsQ90AIUJIAnQApYq4d
+usBkkKwt0n8sYq0NywH9gAUWYgCdALCvn+j9gAUOYgCdACggFKSICAhHKCQU9QAHNlIAnQApIAT9
+JOAEUPz1AAUKR2iiGIon+oBoHeAMBQDqrCAqaASAAFhCV9Kg0Q/AINEPKyAsfLHWjDIsJhyJMYsQ
+7BYBKAQKgADzIAUIUgCdAPEraA3gAwUADH0Rpt3zs6YV7/62AOokAAnYBIAA7EQACugEgABYSIfS
+oNEPAAAAAMCwD6g06OYILfs+AAD6QGgdoBvFAPwAIh2gDRUAWEu8Y//BAAD//EgNoAsFAAAALcCA
+66wYJujdAAD6QGgdpN0dAP2gYBXgDBUAWEuxY/+UwKBZdoseunyK6Plf92CQD6UAY/+n2iBb04Fj
+/xXaIFvVCIwRixCJMZoS46QADW8CgADtuwgE+pWAANogW9TQ80AAQf/9FgAAAGwQBBO6biMyTwMi
+DAJiFNEPAAAAbBAEIizu0Q9sEAqVEY1C5hYAKfgEgADvFgIiOCEAAPegENRgAxUAFbqT+XVoBe//
+1QD6QAQA0AsFAOsWBCmwCoAA9iBmFa/49QD41wALMA4FAIrRjNCcoIvQ7RYFJsP7AACYFpqxntGe
+0IxCI5J/+Q/IFaALFQD3jwAOcAoFAAy6OOxBDSxGQoAAqDOIMpoXijcGiAH4YEYVoAIFAOiiDCVY
+wQAA5UUOJgV5gAAtqRQLiwzqogkkQyEAAOuCOQaEiYAAmhhlIEqNGOW6ahaBsYAAGbpIKNAAFbpn
+CYgKKIIQ7NAHLtgEgAD6YGgdoA01AAuAACxBEStBDZoY/WyWDa//1QDMK4gYZY+5/GBIFaABegAZ
+ujgoIAAJiAooghDsIAcpWASAAPpgaB2gDUUAC4AALEERK0ENx/3su4p9EASAAIwyzsVgAQ4AAAAA
+AAAA//28DaAKBQAtQQz8gaQd7/06AACMMszDZSA/z6weut584C/awFl4dtug+mBoHaACBQBYSduI
+FosyihOPFYlCC6oCmjKfkSeGgSmGgJ9CIkUO0Q9+xxsPzAGcMo4WiRONFYhBDJkCmTKdgCTmgCjm
+gZ1BihfA4O5FDS0EzgAAixSxu+sWBCWgQ4AAjUL5dJAF7/nKAAAAjEB0yU+NF2TQShu6uIkQjBKP
+ERi6ou7CoCyBCoAA/+AAF7/59QD54ABHsAgVAOryASxACoAACYgDCO4BGbo8KMKiLsagC6oBCogC
+CJg4CO4CnvLRD9EPiEAPAgB0garqRAAL2ASAAFjmYvyASBXv904AZa9PiRhln0pj/wkqQQwduoeL
+EYwQDLsR7bsIDmICgAAMqgL7YGYVr/2eAABsEAgGZAoDRAuLQJMQHLp8+oALBGANFQD+oAAXP/j1
+AP3AAEcwAwUA4xYBKQEKgADjuhIeqAqAAO4WAysBCoAA6FUDDtAKgAD6IEYVoAkFAIexirCacIiw
+l4GZsZmw6EIAJZP7AAAiIn4uMn/kiAwJFkKAAKLunhT9wEgV4AcFAPvA6BXgAhUACCc4Bd0Birz5
+YoIVoAIFAO3mAiXgwQAA7KwMBVMhAADsojkEA0GAAIq51qDPJclvGbmuKGAACYgKKIIQ7GAHK1gE
+gAD6IIgVoA01AAuAANagzSBlb9WLE4wSi7B8sE9gADEAAAAZuaAoIAAJiAooghDsIAcpWASAAPog
+iBWgDUUAC4AA80BoHa/+mgD//mgNoAoFAM13jBGxzOwWASYgR4AAE7nTi0D//HQNoAkFAI1AdNkv
+jBCPEi7CoMePCP8DD+4BjxMZudAbuj+K8SjCoi7GoAuqAQqIAgiYOAjuAp7y0Q8A0Q8AAAAAAADg
+YQQKzwKAAOyZCA7QCoAAmhL4IGYV7/7KAAAAbBAEFLo1gyAoQn4dujT4bwAJsqkFAAk5KK2SLCJ/
+DAxf8YYQDeALBQAeui0auWDH//9AAEUwDQUA+yAARTAOFQBtCBcoon/xAUAN4cwdAC2mf7G75MAu
+ZVChAABj/+EpIn7BjwuIDHid5Cm8EOkigCyBCoAAAOgaD4gDCJkB+FAGFe//QgApIoDJlyoifgmq
+Ahy6FAw7Eay7+2AGFaACBQDRDwAbuTwrsksqQoGjuwm7EauqiqcqrBBYQvYeuZEtIoAsIn4O3QIN
+zAIeugYMPRGu3f2gBhWgAgUA0Q8AAAAAAAAAbBAEwCDRDwBsEAT1c8oFoqUFAAUiKBi5LKQk9I/o
+FaAV9QADVQyoInVFDQM0CgJCCyItESIhJNEPErla0Q8AAGwQBNUg+mBwFa/79QD6QsYd4AIFAPKj
+ZB2gCQUA67npFQz5gADzQAICcA3VACowCB655v1AC9LiAJ0ADq4KjuAK4ACGM/ZIAAO3ZgEA6nQA
+C1gEgABZdtAbudsnVAwmVA0ooQf4oOQdoAUuACpQB/pgaBXhqgEAWT6UG7nS+qLGHaAEygAAjDP8
+osYdoASeAIoz9UAI6hIAnQD1QAirEgCdAGilKminJ/1EgARQDZUA/UAH/WIAnQAuUCDAgvigph2g
+D0UAD+4C/qQGHaADngApUCDAqAqZAvikBh3gA14AjDP8o2QdoAM2AI0z/KNEHeADDgAosn2OMy+y
+gimygKju/9/gFaCITQDo7gEMggqAAP6fAA8wCCUACO43/8EAD3D/9QAP7jb+pGYdoAIiAI8z/qGG
+FeAB+gApUCKKM5pb6lYJJIFhgAAssoCwmPuABADQDBUA4IgaDmAKgADoqAgGY/0AAAyIAvihRhWg
+AR4A+qFGFaAA/gAAjTP8oQQd4ADSABi5ko8zLlAHqPgogIApCvvp7gEMR4KAAPnGAA8w+MUACO4B
+D+4C/qDmHaAAGgDGKrgz9H/zpSAN1QApURtlkFwcuYMtsn0qUBYrURr9gQAOcPn1APlLpg3irwUA
+LVAH/3K+BaHdAQAP3Ryu3i7if/tAAQSwH/UACv8Mf+UhHriirt4OmQspnREpkSQJzzYL/zcL/ywP
+vxwvVRvRDwDRDxm40AnPNgv/Nwv/LA+/HC9VG9EPAAALyCwIuBwoVRvRDwBsEA4oIAT7cQwFp5UB
+APc/wBXgCxUA9QAPkRAGBQDntzkJsASAAPUgBSEQ/hUALyAHjiIPDUHp1AAPDdYAACsgIQscQmXC
+JMDVCQtH9WAKqhIAnQDuuHAd5wKAAArMCC/CnikWBw6+CvfgF0HSAJ0ALuK/LMKdDswBZMI0KSAU
+pJkpJBSPYPPgEfqSAJ0AKyAh+i4ADnAKdQD9QBUYogCdAMp1+kDoFaD8FQDsuwEKaASAAPpEJh3g
+DAUA6qwgKlgEgABYQAbSoNEPwCDRDykgBRu47fUgFMiSAJ0A9SAVI5IAnQD1IB2EEgCdAGWfPi2y
+e2TWFimyeYyRj5CfwI2Q/aAmFaAIBQCYkJiRL7J7sP8vtnvrIgAk4/8AAOvGPiTb4QAA+kDmFeAI
+BQAoJCAoJCH7ci4FoA4FAP5Chh2gD4UALyQFLiQXLiUb7iUaJehBAACdH1vXKBy5Dh24aB65DY8g
+6hIPLVgEgABb1t+KJw8CACqsECoWDlvWu/VAKjiSAJ0AKyAhLAr+7LsBCVAEgADrJCEp2ASAAFv/
+CPtwQAWv+jYAHrgdjuiZF/fAFTCSAJ0ADLwRqswvwp734BYh0gCdAB+4FCzCnQ+/Ci/yv+/MAQdD
+/QAA77gRFhVRgACY+GXOlvgg5hXgAyIAAAAAAAAAAOokAAnYBIAA7EQACugEgABYRfnSoNEPAIsw
+mRb1IApBF7sBAIwiKyAH9ZPsDeG7AQAMuRGqmSySnveAKlnSAJ0AHLf3KZKdDLwKLMK/DJkBZJUE
+LCAUpMwsJBSNMPOgKXqSAJ0AjRb5oCzxUgCdAMAg0Q8AAAAAAPWACOCSAJ0A9YAJsRIAnQD1gBzh
+kgCdAPWAHpISAJ0Ax5X4HwAF8A91APgAIh2gDgUA+wIAD3ANVQDp/TsPbP4AAGP/QosX+kBoHaAM
+FQD7YwAV4A01AFhJCWP/KiggBy4hCB+4IPggAAGwiBEACogQ74gCCZwCgAAD7gIfuFoTt92YwPhA
+CBWgJQUAlcOTwv/GAA9wAzUA748CDEYCgAADiAKYwYUriCmexJ/GmMj1gSYV4AgFAOjGBSyqAoAA
+BdUClccoJBQMtRGqVfKzphXv9UoAKQrxCbsB+kQmHe/1XgAAAAAAAAD/9IQNoAwFAGS+uAO3Cx+4
+jZ8alx32YGgd4Ad6ACmxc4ggeYsFKrGKZaUJwCDRDwD6QOgV7/aqAI4rjCl+wQnA8v5ARhXv+84A
+KArx+WAEBDAJRQAJiAIoJCHZ0PWgFYoSAJ0ADNsRqrsssp73gCLB0gCdABy3kyuynQzcCizCvwy7
+AZkZ7RYIJZZRgAAZuGr6QAgVoAwFAJwRmRAoYAP+ACIdoI0VAPsAABQwDwUA+CBGFaAMBQBYQ4KI
+GRq3hAyIEfsAAEQwDzUAL4adKCAGLSAhjyIuCvH/oAQGsAkVAOn/AgRABQAAKCQGnyL8RCYd4A5l
+AA7dAvxEJh3v+PIAAAAtFhD6IiYV4AoFAFlzfR63bhq3bokXjugtEhArEhH53+ngkgCdAP/1iA2g
+DAUAwMAYt2XA+g/vNP8BBhXv9UIAAACLJ4y4/2KkFe/HBQDtsgslqIEAAAdXAaf/L/xA/aAbZCIA
+nQAouRQMRhGsbaaIKLUU/eAbO+IAnQDJN9kw68QAAgCZgABtSQUJAIYLAmEtUgAG3Qj/oBx0YgCd
+AJ1Qi8DA0veAaB2vDwUA+YBoHeeLAQBtiQcokAhogQu4mcBx/+xMDaAFNQCIkw+7AQi7ApvAKCAh
+DogBDYgC+EQmHa//dgDAm3mhRIoduHf64AZsIgCdACpwCGSgmGihZ2ii52ijVmmp3IlzbpPcaZPZ
+jCf7hAAV780FAA27AebFFCXZAQAAm8n7gQYV7/7+AIwajiKPJ40gKSAWL/kUmRD44GgVoApVAPgg
+JhWgCwUAWXaOiHP4QsYdr/5KAIlz+EEEHe/+IgAAHLfzi3MqIAesvCzAgC0K++2qAQ5ngoAA/UYA
+DTD8xQAMqgELqgL6QOYdr/1mAItzC4pC+iFmFae7AQCbHFl01iyhB40cjhsuJAwtJA38QOQdr/zK
+AAAAAPtuBgWv8AIA89/jZ9IAnQD8wAgVoP7FAP/gBAcw+BUA+WAEBDAJhQD5BgAMfwkFAAnJAQ2Z
+Ag7MAiwkB5lg+EQmHaAAGgCJYP/wuA2nmQEAAB627Y7onRn3wBFgkgCdAAybEaq7L7Ke9+ASIdIA
+nQActuQrsp0MnAoswr8MuwFksi8YtuGw75+ImRntFggt6fYAAIsY+kBoHaAMFQD7YwAV4A01AFhI
+Cxq22f/vLA2v+UUAih5b1YQbt7QLrBGsu+sWBSUC4YAADOowK7KFi7CwqpoUrLtZd7Yct6yNFCrC
+f/ugBADQCxUAALsaC6oCKsZ/WXfqY/p3KbJ8jJGPkJ/AjZD9oCYVoAgFAJiQmJEvsn6w//9vxhXv
+56IAAAAAAPoA4h2gCxUAWEFOiRUokn/5MGYVr+jyAOokAAXYYQAA/AAiHaANNQBYR+LqJAAJ2ASA
+AOxEAAroBIAAWESf0qDRDwAAAAAAAP/rEA2gCQUAKCAHLiEI/W3iBeH4AQD54AAXsIgRAO/uAgxC
+goAADYgCmJD4QAgVoCMFAJOTE7cnH7arn5LzxgAPcA81AOODAgxGAoAAD4gCmJGNK4gplpWelJ2Z
+8yDGFeANRQDolgguQgKAAA2IApiXJiQUDLMRqjP+c6YV7+mCAIon+oBoHeAMBQDqrCAqaASAAFg+
+M9Kg0Q8AAAAAAAD/7twNoAsFAMDAnLv9oGgdr/MqAAAAAADs/QwBgbGAAA1PFOj8CCnIBIAA6Eg2
+DlgEgADTD22JBQkghgsCYw05CO9IDAPZAQAAbYkFCUCGCwJlDWkMqXkpnED4oAYV7/HyACt8QPqg
+BhXv8cYAHbdGLCEaDcwB/ENEHaACBQDRD/whBhXgCgUAWXJsHrZdGrZdjuiNGIkZ+d/t6JIAnQD/
+93gNoAsFAADAsBi2VcD6D+80/wEGFe/3LgAAAGwQBIknKCAGK5kUKpwg7ZIJJEP9AADxZyAN54gB
+AOgkBiQAUYAAwCDRDwAA8aSwDeAspQAr0AB8uUD/IqQVr/gFAPmiABXvzwUA768BAlP9AADv7ggN
+XwKAAOgxHXdxAQAAq9srvBDr4yxxwEEAAGhBCG2pBQgAhgkCYfpAaB2gCxUAW9FxwCDRDwAA6CQG
+LHy2AABj/+MN7Qws3PAMTBS4ywurNm25BQgAhgkCYaPYDEoM6fxAJQ8RAACwrW3ZBQgghgkCY2P/
+sQAAAGwQBIgy6iQACdgEgAD8YPAVoA01AAuAANKg0Q9sEAQoIAQjIAf9AQADUTMBAMAg0Q8btvQr
+sX76QGgdorsdAFkA+GWv5+okAApoBIAA+mMAFeAMFQBYRzvAINEPbBAGGLbqii4tIAf9bLoFoAQF
+APlAB8wh3QEAJMJ/CagRqESOR47unhCKJympFOuiCSSHEYAALrAU77AVLbgEgADltAAHAHmAACqs
+EFg/t8Ag0Q8A5tQAB4YhgAApwn+JlyiZFPoBAh2gA0UA65IJJAehgAAssBawzOyjOA2oBIAAG7Xk
+6rXnHv8CgAD1oASiEgCdAAr6CC6ini0WAfPADNviAJ0ALKKdC94KLuK/DswBZMFjKSAFGra+LVAH
+75y1LM+CgADqmQgHmDeAAPk+qBXgAB4AAMCQH7a371YALPYCgAAO3QKdUStwFOhwFS2ArgAAZIDL
+KVAW6JFvZNP9AAAqVBaKJyqsEFg/iMAg0Q9j/xUA//x4DaALBQD//YQNoANFAB+1vo7498AIuJIA
+nQAMaBGqiiyinvOACXviAJ0ALKKdC2gKKIK/CMwBZMEdsOmZ+GXPXPwgJhXgAvYAAAAAAAD//DAN
+oAsFANog61QACegEgABZK91kT4eLECqwKCywKe2wKi1WAoAADKoC7LArLVYCgAANqgIIqhEMqgKx
+qvtlZh2oqh0A+2VGHaiqHQD7ZSYdqKodAPtlBh2v/RoA2iDrVAAJ6ASAAFkrx2RPMYwQK8AoLcAp
+7sAqLd4CgAANuwLtwCst3gKAAA67Agi7EQ27ArG7+4VmHei7HQD7hUYd6LsdAPuFJh3oux0A+4UG
+He/7wgCLEey2ZxlQBIAA7HYAKegEgAD7YwAV4AwVAFhGrcAg0Q8AAAD/+cQNoAwFAPwgJhXgCgUA
+WXGCH7VzjRGO+Bq1chu1bvnf9oiSAJ0A//uwDaAMBQDAwMCKCOg0+eEGFa/7dgAAbBAKKCAE+QAd
+O5IAnQD3ABz6F9UBACggBwgIQZgY9aAcmRAHBQAqMQgZtbYqJQiKLimSfwmqEaqZKZAFw677ICD0
+IEglAPkgILQgO9UA+yAhdWD89QCIOfggAASwBEUACUQM+kLQFeFEAQD0geAVr/mFAAlEAQSICCiM
+NOgWAyIh/QAA/WMGDaREHQD9v8AVoAoVAAysOSogQVhGEmSkHysSCBa1PeW1PxJoEQAA6bQADccC
+gAD1YBtKEgCdAAWICCyCnv2AH4PiAJ0ABroKKqK/JoKdCmYBZGPEGLYaGbYYKyEilxCOOSogQR+2
+F/oghhXgDUUA+0AAhTG+AQDr3QwNVwKAAPvgAEex3QEAnRat7i/yf/hFRB3gDDUA7xYFJ3DxAAD+
+IOYVoA+FAO8kZCjYBIAA+aYADrAIdQDoJFwu7gKAAO0WACFRlQAAWW5JJyU1JyRoLhIEKyEH/iCo
+FeAs5QD8SuYdoF0lAC0kBf1qNAWgTSUALSR0/sAABHKfQQD7QAAF/d4dAOTdEQ3fAoAA7LsCDM4C
+gAD5BgAMcP85AOm1yB/9QoAAD90CCN0CH7XnK2YAKiIAKxIH6WYCL3UCgADv7gINVgKAAApKAvrA
+JhWgSkUAKmYDLCBBGrXcLmYG62ULLmQCgAANzAIdtb8nZQoqZgcNzALsZgQhSSEAAOkHHgNAgQAA
+CAJj/EVEFeAPBQAvZDEvZDL+xmYd4A4FAC5kNS5kNv7G5h2gDAUA/MYGHaALBQD6xoYd6KcdACpk
+Li1kLfbF5h3o3R0ALWQsKSBX6mw8IVlxAAD4x2Yd6JkdAPjHRh3omR0A+McmHeiZHQD4xwYd4AxF
+AFlt/elsQCFBgQAA+FBoHajnHQAJBIoIAIjpgx4BwIEAACdkU48WLmRS/WmeBajuHQD+yiYdqO4d
+AC5kUO61BhNJYQAACGCICQyKCECI6YseCkcCgAAZtQGvbexmGif4IQAAL2YbKyB0K9R0LSEHKjAH
+mjErIAeoaPpBBBWq3QEA/6AAFrBrEQD00AATMbsBAObdAg38AoAAD6oCCaoCDt0CnYCPIJyCmoSZ
+hieGBfcA5hXgNgUAJoYD/eAAF7AGRQAG/wLvhgEkMIEAAANghgYCZwNAhgYCZQy6EeWqCAJIEQAA
+KaadKyAWKAr/eLEIKiBBLBIDWEVHJiEUIyES8MLQDeAEBQAVtXTKYupSfynYBIAA/AACHaANFQBY
+O7ooUoDkTAEhmAUAAAgzLnZJ29ogWDlTwCDRD4gni4j9AqQVr84FAOmCCyQwgQAADm4BrszuFgEm
+YQEAAPsgB/xiAJ0A74kUKk8CgACZEquaqf8vhRT7gAerogCdAMk1yUPZsG1JBQMAhgkCYY4SimAP
+AgAOqgj9QAkkIgCdAJpg82BoHe/wIgAAG7Rfirj3QAjgkgCdAAyYEaWIL4KetEz94AljogCdAAac
+CizCvyaCnQxmAWRhGrCtnbhlbIJgAEQAAAAAAOokAAnYBIAA/IBoHaCORQDuNQgq6ASAAFkyHMAg
+0Q8A6iQACdgEgAD8gGgdoI9VAO81CCroBIAAWTIUwCDRDwCIImWPC4sY2iDrvBgpYASAAFg+zMAg
+0Q//8HANoAYFAIwiZc7rKyBB2iDrvBIpYASAAFg+xMAg0Q/TkPcBZhXv7R4AAAAAAADrygwBgbmA
+AApMFO7MCCnABIAA7k42DcgEgADTD23pBQiAhgkCaYkRqjjsTwwEyQEAAG35BQighgkCa44SjBEK
+7gyuzCzMQPzABhWv+54AAI8RL/xA/sAGFe/7ZgAAAAD4ISYV4AoFAFlwIhu0E4q4iRn5X/aQkgCd
+AP/7vA2gBgUAwGDAigioNPlhBhWv+4IAAAAAbBAG+EDoFaANBQCdECogQRu07yYgBwqsCemJFC5n
+AoAArLv7b+gV4WYBAOsWASSaaYAAJIIJ8pQgDeBIlQAuQBLz07AN4FtVACkgBfsgGYRg/PUAKyAW
+KCQFfLETBQxH/Z/AFaANFQAM3DlYRL9ko5LAMRWz6hez7OlkAAtHAoAA9MAYOhIAnQCniC+CnvoB
+gh3gCkUAA7o5++Aa+6IAnQAFagoqor8lgp0KVQHrtAUSmYmAAPigaB2gDMUA+gAIHeAJRQDjyTkK
+0ASAAOkWAiKwgQAAbZkCCAJhZDGxLiEHGLPe/2l8BeruAQDqtLYfdwKAAAjuAi5WACsiAP1ntAXg
+bEUA/KBGFeAIhQDsVgMt3gKAAAi7AvqgJhXgCXUAKSRc+EyGHaAMNQDqJSoo2ASAAO8WACFRlQAA
+WWzvKyEi/CAoFaBfJQD+QKYd4CjlAPhK5h2gSSUA+E6GHeAIBQAoJTUoJGj4SDAV5twBAPxIAAc9
+qx0A5KoRD3YCgAD/pgAOsMw5AO60kx5lQoAADKoC+KFEHaBfRQAvVQsctIwNqgLuVgcszAKAAAqZ
+Auq0cB3dAoAADLsCm1YKmQLpVgQhaSEAAO0HHgtgBIAADAJj/kVEFeALBQArVDErVDL6pmYd4AoF
+ACpUNSpUNvqm5h2gCQUAKVQu+KXmHaAOBQAuVDD+paYd4A0FAPymhh3o/x0AL1QsLCBX6lw8IVlx
+AAD8p2YdqMwdAPynRh2ozB0A/KcmHajMHQD8pwYdoAxFAFlsrSgsYOgmAALRAQAACgSKCACICgCK
+9sAgJaALBQD6qmYd4AsFAPqqRh3gCwUA+qomHeALBQDrVFAi0AcAAOsgdCVSAQAA61RwIzIBAACP
+QB2zsSwhBy5AB55BKCAHFbOv+EEEFerMAQD/gAAWMOgRAPXQABcxiAEA7swCDFwCgAALmQIFmQIb
+s2cNzAKcoIwgm6KZpPVAxhXgDgUAnqX/QOYVoD0FAJ2j/YAAFjANRQANzAL9QCYVp//BAARghgYC
+ZwRAhgYCZYsn7BICLG8CgAD3oABG/8oFAOzWnSXYgQAA+2AEBTAMBQDstQQlUQEAACq2AftgBhWg
+OWUA+eAEVGA+VQD/4ARsIgCdAMo5KyAWLwr/f7Eh+kgwFaBcRQBYQ+zAINEPAMSPKCQFKSBosZnp
+JGgp/s4AAMAg0Q8oJAX/87ANoAMFAAAbsyaKuPdABHiSAJ0ADJgRp4gsgp7+AYIdoA1FAAPtOf2A
+BLPiAJ0ABZwKLMK/JYKdDFUBZFCEsK39YQYV7/OSAGQ/mdogWDfrY/+WxeL+QKYdr/3GAI8iZf+U
+2iDsJAADWGEAAFg9ncAg0Q8AAAAA//K0DaAFBQCIImWPcisgQdog67wSKWAEgABYPZTAINEPAAAA
+AAAAAPYgZhWgCgUAWW8MG7L9iriJE/lf+viSAJ0A//GsDaAFBQDAUMDKDKw0/WEGFa/xcgAAAABs
+EBSVFpcUIhYe4xYFKlgEgADrFgcp+ASAACzwA+IhIikYBIAA5zIOK6AEgADmMAcraASAAJIaKDBB
+ErPO/4AARn/5BQDoiAkGYP0AAAnMAewWCSxHAoAA+EAAQTFmAQDqwgEjQGEAACgWCOIifyZgQQAA
++6Ax2qIAnQAuCgDyICYVoAsFAA7SDB6zKS7ifwl/Ea/uLuE3KHr//wAzMqIAnQAVs1qWExezuCdy
+f+8CAAuwBIAA+6AEcqIAnQCOGQKqDI/jlxKO4g8vCHL7Ai7sAYgU9wAsqJAHBQD3QCxokgCdAMAg
+bQhbCkk0BigKCVk0mYAGKQufk56SiIAPAgAPAgAIRAwIqgyviekWCyEQBQAA6JsGf3gEgACx7+70
+AAO4BQAA7xILIQwxAAD2wwAVoAIFAPaAKRCSAJ0A90Ao0JIAnQBj/52XEgy+Cwy6Coqgj+OO4gKq
+DK8vcvsBse7AIPIiJhWgAgUA9oAE+JIAnQD8I4YV4ADGACgSEeh4CAXYBQAA6BYRJYwxAAD9gwAV
+oAsFAAy+Cwy6Coqgj+Pu4gIiDZ+AAP9c8A3gBwUAakHHbQhMBikLBi0KCkg0CFg0CEQMCKoMmNCe
+kp+T740IARAFAADo2wZ/eASAALHv7vQAA7gFAADoIQxu+ASAAPbDABWgAgUAZK9/9p/74JIAnQBj
+/6wAAAAAAC0SHPQgiBWgCwUAmxArMBaGEvwjJhXg+fUAebEajBb6aDAVp8wBAP2fwBWgDRUADNw5
+WEM1ZKTVLRIR6bJjFp6BgAAVs0uKER2yXIwTghqcHuzPEQ5ngoAA+eAAR/1yHQDtzAgJFQKAAPRG
+AAl2igEA/CGGFaAFBQD0I0YV4rpBAO8WEC3eAoAAC4gC4hYVIdkhAADrFhIrvQKAAPIh5hWgqjkA
+7xIRLVVCgAAKdwLodwIB0XEAAOoWEyHBgQAAKBYUJxYW57JnF/gVAAD+IwYV4AVVAPYhphXgAgUA
+8ABIDaAHBQAAAAAsEhj8oBm8IgCdAMDVDV0v5NJzYqgFAAAnfQEnfIAvMQcYsjz2QAEEuv8BAO6y
+9B//AoAACP8Cn3CMMP7gRhWgTUUAnXP9gAAWMA2FAA3MApxxi5DApPxoMBWhuwEAC6oMKxIW6RYX
+LmQCgAAMuwIcsu7+IkgVoaoBACoWGwy7Apt0KxIV+SAIFeAMBQAsdQqbdqqZ6rL9FMjxAAApdQua
+d+4DHgPogQAADQJh+mVEFaAOBQD+5oYdoA8FAC90Nfrlph2gCAUA+ObmHaALBQArdC785eYdoA0F
+APzmZh3gDAUA/OYmHaANBQD85kYd4AsFAPrmBh3gCAUAKHQ2KxIT+CNIFaiqHQAqdCwvMFepiPgj
+RhWgDEUA/udmHej/HQD+50Yd6P8dAP7nJh3o/x0A73Q4I9DxAABZax3pEhQj0QEAAAkgiAoEigkA
+iAoAiikyHCgSGPjqZh3omR0A+OpGHeiZHQD46iYd6JkdACl0UHhZM/ojaBWgSyUAKzR0G7LHCgpB
++0YADXALhQD6bKYd4Aw1AOiqEQjYBIAA6hYAI9EVAABZawIsMTX2QAIEMD1lAC00V+qCAyZgBQAA
+LDU1LBIXG7K3K3YWicAqdhkpdhePwC4yHI0/iIIodhiv7i42HIzALhIZD0QMrcyu/u4WGSEQBQAA
+7DYPIQwxAAD2wwAVoAIFAB+xxvgjaBWgDlUADl4vL3Ya54gIBEghAAApdhsvMHTvhHQvbr4AACoS
+EQWqDLaq91/uOVIAnQAuEhCNHy3mnSswFiwK/3yxCCowQSwSGlhCXYkV+iMoFaBLdQArNAWal48y
+9SEmFa+EjQDolggvh54AANow6xIIKeAEgABYPCfRDy8SEYweBf8M/+DAFeAKVQAK/zYN/xHvFg8m
+JTUAACgSECiCnv8ABqPiAJ0AKBIMJxIQKIK/J3KdCHcBZH+RKRIN/uBoHaAKBQDpAAUH6lGAAG0I
+D+4MAAVQBQAA/1/pvGIAnQBj/+kasXuKqPdABKCSAJ0AKxIQK7Ke/2AFS+IAnQCIHCcSECiCvydy
+nQh3AWRwlRuxcLCp+WEGFe/+fgCOE/wh5hXgDAUA7BYaL3cCgACp7i4WECkSEIgfKJadKzAWLwr/
+f7EIKjBBLBIaWEIdixWMF+0SBinQBIAAW/1U0Q+PwycWEY7C+4AIFa/sEgAAAAD//6gNoAIFAP/8
+7A2gBwUA/iOmFeAKBQBZbWAasVGKqC8SHflf+siSAJ0A//xgDaAHBQDAcByxSsC6C6s0+4EGFe/8
+GgAAjxmP9JIRqv/v0259cASAAMCw8+BoHaAPBQDv/AQpcASAAOj0D2XYBQAALMwY/gACHeALBQCs
+8oIgriJy29v/v8ySogCdAP3PAAl/5jYAAAAAAPYgZhWkBQUABeU2/+ZQDa9VAQAoMEEojBL4IQYV
+r/ieAAAAAAAAAAD//wANoAsFAGwQCi8hIiogQeMWASpgBIAA7VQAC6AEgADnsgkbKASAAJUVlBSc
+E+0WAinwBIAAJuADIyAHCqkJ/sAAQzALBQD6IAYV7/gFAOsgFizPAoAA+OAAQ/EzAQDncn8hyGEA
+AOkWBiMw/QAA+MAEAzD49QB4sR3+IQYV580BAP2fwBWgCBUADIw5WEHV7xIIJRNZgAAUsQLqsP8Z
+zwKAAPRgERISAJ0ABJkILZKe96AUVFIAnQAlkp0KOAoogr8IVQFkUj4dsQP8QOQVpqcBAPZIAAX9
+nx0A5JkRDd4CgAD7RgANcLc5APtoABW6zAEA65kCDmcCgAANzAIKmQKcUByxsPpACBXgTUUAnVOc
+Uv1gABWwDIUADLsCm1GNYftjlAXgDgUA6CBBL9UCgAD+oUQdoAxFAPtGAA1xfQEA58cMDEQCgAAJ
+iAL5Y04F4XcBAKfd6lYGJujxAACdFwmIAi1VC5hUGLG56FYHIVkhAADrAx4C0IEAAAoCYfxFRBXg
+CAUAKFQ1KFQ2+KbmHaAPBQAvVC7+peYdoAsFAPqmBh3gCgUA+qaGHaAJBQApVDEpVDItVC34pmYd
+6N0dAC1ULCkgVypcPPinZh3omR0A+KdGHeiZHQD4pyYd6JkdAOlUOCFZcQAAWWniKSxg6SYAAtEB
+AAAKBIoJAIgKAIooIhwesZfrFAAC0RUAAPiqZh2h1wEA/6YADriIHQD4qkYdqIgdAPiqJh2oiB0A
++KoGHaAPhQD+TKYd4E4lAO4kdC7uAoAA/CAGFeAMNQBZacmnWx2wpP5GpBWgP2UALyRXiWOKYexi
+ACdwBQAALiU1LFYWKlYXj2EpVhmIYihWGC8mHI5hni/tVhoj4CEAACxWGyogdCq0dAw5EfUgAESw
+CIUAKJadKyAWLwr/f7EIKiBBLBIHWEE2ixGME+0SAilQBIAAW/xt0Q8dsHWO2GrhdQw5EaSZKJKe
+9wAEpFIAnQAlkp0KOAoogr8IVQHkUIJnS/0AAJnYZV3NYAAJAAAqIEEqrBKaFo0R/iCoFeBIdQAo
+JAWf14sijhT/oSYVoAwFAOzWCC39DgAA2iDrEgYpYASAAFg669EPAAAAAAAA//YIDaAFBQD+IQYV
+4AoFAFlsYh2wU47YjxjqsE8YBAqAAPnf+2CSAJ0A//4oDaAFBQDAUMCaCek0+aEGFe/97gAAAABs
+EAYoIAT5AAd7kgCdAPcABzoQDQUA+mBoHeeFAQD1AAexEgCdACqwAyyxCBmwlSwlCCwiDimSf+uq
+CA5mQoAADJkIKJAF+0fgFa/8BQD9QAQFMDzlAP0ACVQgTiUA/wAJFCA/1QD/AAmdYE51ACggBeyw
+uhSxoQAA/wAJzCBPlQD/AAs8YA6FAC0kaC0kZi0lNS4kZC4kZ/liEgXviAUA+EymHaAv5QAvJFcp
+JSopIhz+CkId4AgVAPhLhh2gThUA7iR0JIA5gAAoJGgvJAWIu3jDKCmgA2mRIiphA3ijHNog7EQA
+CugEgAD/YMgV4A4FAFv+5MAg0Q/AINEP2iDsRAAK6ASAAP9gyBXgDgUAW/0QwCDRDwAAiCeLiP0C
+pBWvzgUA6YILJDCBAAAObgHuzAgKPwKAAO4WACZhAQAA+yAHjGIAnQAviRSreqf/L4UU+4AHe6IA
+nQDJN+m0AAIAqYAA2DBtSQUIAIYJAmEqYgAHqgj9QAjMIgCdAPrABhWv+poA2iD8oGgd4IxFAOy1
+CCpgBIAAWS20wCDRD9og/IBoHaCNVQDttQgq6ASAAFktrsAg0Q+IJy6JFGTgRYuJiLt4w1QvoANp
+8U4qkTd4o0jaIO6yBypgBIAA77IJKugEgABb/qjAINEPAADqJAAJ2ASAAOxEAAroBIAAW/u+wCDR
+DwCI2/mCFg2gCwUALKADacEFLZE3eNu22iDusgcqYASAAO+yCSroBIAAW/zIwCDRDwDbkP0BZhXv
+97IAAAAAAAAA68oMAYG5gAAKTBTuzAgpwASAAO5ONg3IBIAA0w9t6QUIAIYJAmGJEKo47E8MBMkB
+AABt+QUIIIYJAmOMEAp+DK7MLMxA/MAGFa/2ZgCPEC/8QP7ABhXv9jIAAABsEBgiFiMjFiItIRUk
+FhSILy4gBysiHCwwAysWG/ojphXv+gUA/GAAQ7HuAQDuFhwjuP0AAOp3AQQkqYAALBIjjnMrEiIs
+wRMTsH/7YWgV4AkFAPWB0A3r7gEAm1GZUC4yZCgSIw3KDCoWHiKBEC+BEiaBESiCFugWAC/+goAA
+r+4uFh8qMprtr+MZYASAAPRFEA3v9fUA+0BoHeAOBQBtKSCCc49youJ+KwGx/wX4AQ0pAem2ASdw
+QwAA6LYAJdghAAD3gATqogCdAG0IZYl0+WAABfAOFQD7zQAN9pkNAPsgAETwDgUA5JANbJ0CgAD7
+gAIFsAEWAAB2wWeJdflgAAXwDhUA+80ADfaZDQD7IABE8A4FAOSQEmydAoAA+4ACBbAIFgAAAAAA
+AADmyzRzuGEAAGP/kwAAgnePdqLi7isGdmAFAACx/wX4AQ0pAZmx6LYAJ3BDAADj49x12CEAAHbJ
+lxWvRByvRR+vRx6vwBSvVC0SIxOvQhuvaCnRIygSHy3QQP0wABSwAqUA+QAARHAHBQDoFh8umr4A
+ACkSGwlmDCgSHS0SHgqIC+gWISafYYAAKRIcAtU2BV0J7JQADu/CgAD1IBYaEgCdAAybEaO7KLKe
+/QAoW+IAnQAYryUisp0ImAoogr8IIgHnJAABFtGAACsSHigSIwW7DCmBIyqBFSKCHKWZpaoCUgoq
+hRUar0MihhwphSPqAAULyASAAG3ZAgkCYScWE+sWHiKVcYAAJRYaKhIfiBAtFiT8IyYVoAIFAOqI
+EQuYBIAA+CQGFaAHBQBtWY0tEiCeMPwkKBWlih0A+GBmFaAJJQCZMigSIykSIqx8i4D0YIYVoEUF
+AJU1nTf/ZgAK8A1lAOU2Bi3eAoAADbsCmzGJm+k2CCnoBIAA+QHoFaAFBQDoNgkpWASAAPRhZhXg
+CQUA6TYKIaihAAD3Z1INoA8FAI/B/4AIFaAAygDnfCAhEBEAAOqsQCGZgQAALRIkKxIaJxIT813I
+BeAMBQAMuzX8IygVoAFSAMDg79YNJdgFAADu1gwm6CEAAOXZrHZgIQAAHq9V/120Be/+zgCCeY94
+ouINKQGZse4rBnZgBQAAsf8F+AHotgAncEMAAOPj3HXYIQAAY/3ZKhIeDM4Ro+7t5p0tCJYAAC8S
+FCgSIwuyCe4SACkWwoAA8uAAQTANBQAthRUthRP9A4YV4AwVACyEQCqBIemBES92goAA/+AGFaBf
+FQAvhAUKmQwphSHRD8BgasEU/WAAB7AKFQD/TQAP9owNAKj/D2YILHADDwIADwIAsMzqwUlrEASA
+AAd9AojU+WAABzAPFQD/7QAPNogNAOjuCAZj/QAA7mYIBgDhgACO1Q4KS/vtAA027g0ADqoI6mYI
+BmP9AADt3BgmDwsAACgSI5tRmVAvgRTihRAjKA0AAPcCJB2iVR0A5RYeL5WWAAALxBSzRAQkFORM
+AyjgBIAA6oQAClgEgABYCRsoEiMqFh8khRQpEh8qEiPlpRMs4MYAAMAg0Q/scgEneZGAAP+AAEYw
+BhUA/Z4AJa/8kgAarnyKqPdAGViSAJ0ADMsRo7sosp79ABpT4gCdABiucimynQjICiiCvwiZAWST
+NRiucLCrm4jnlAAM6XYAANJw0Q+JcwkJS/hB5hXv7ZoAAP/5yA2gCwUA+t48DeAMBQBj/HQALRIj
+KBIijd+Ih/oACB3gCRUADZ05+CEAFeyIHQD5oABGsAhFAG2KAgkCYS3c/w0NQWTR4u0WFSbABQAA
+KBYY9QAFEtALBQAoEhUpCgTomQwNaASAAG2ZSSkSGCkWFna7C4nQiNH4IuYVoAA6AMCQ+CLmFeAJ
+BQAoEhbiFiYkEAUAAOIWGCCQIQAAAogLmYYiEhfihgcl2AUAAOISJiboIQAA/CKoFeAA/gAAACoS
+IyISEogQJ6UVJ6UT90OGFeBZFQAppAUsoSEpEhT7QiQV4A0VAO2kQCxGgoAAmJAMuwwrpSHRD8Cz
+DbsMdrsH+iOmFeAAHgAmFh0pEhwpFhn1IAxqEgCdAAybEaO7LbKe96AQ01IAnQAisp0FmAoogr8I
+IgH4QGgd4AKlAGSR6y0SH8CCmJLoEiMm6wEAAP8gBhWl3R0AnZONgA/bApuW/aAAFrALZQAL3QKL
+ECkWEuSWBC3egoAAm5crEiL9ICYV4E0FAJ2Vi7ubmPkB6BWgCwUA+yFGFeANBQCdm+2cMCDYgQAA
++SEmFaAIVQBtigULAIgNAIotEhnpEh0u7wKAAPOgAEbwC2UAK9adeWsH8AAoDaAGBQAoEh0IZgzt
+EiMjSA0AAPgjqBWimR0AKRYeKNYcKNUhJ9RA+aJkHe/rJgAAAAAAAAD/7BANoAIFACqBEikyZCuC
+FusWAC1WgoAAqpn4I+YV7/V+AMDTDW027RYdIwd5gACLoYmgmxvpFgorEDgAAIuj+UBIFeAAMgD6
+AAId4AkFAJsd6RYMKxhIAACLpflAiBXgAEIAAAAAAPoAAh3gCQUAmx/pFg4rIEgAAIun+UDIFeAA
+QgAAAAAA+gACHeAJBQArFhH4IgYV7/m2AI3I6hYlKAQKgAD3oAS4kgCdACsSGQy7EaO7KLKe9wAF
+O1IAnQAoEhkpsp0FiAoogr8ImQFkkJKw2/uBBhXv+XoALRYk+CMmFeAKBQBZabsarasericfra2K
+qC0SJCwSGflf5bCSAJ0A//NcDaAJBQDAkBitogKrNPsBBhXv8x4AwLD//EwNoAkFACoSI+elEyyQ
+BIAA0Q8AAAAAAAD/98gNoAIFAMCgWWmkHK2UHq4RjcgfrZUqEiX5v/qwkgCdAP/3XA2gCQUAwJAC
+2zT7gQYV7/cqAGwQBogvF657JjADLiAH6nJcKSgEgADywABDf/kFAPbH4BWh7gEA6WYBBA75gAAv
+oQIsoQSJoPtApBXgDQUA7Mz/J/v9AADvpQIuZwKAAOyZCA3fAoAA+y8ADPAA3gAAACuhBSyhBOmi
+ACXYBQAA+Z/gFa+7AQDrpQUsRwKAAP1gCJwiAJ0A6JkIDf8CgAAPmQwJAIcNvWDpAAcF8xeAACxy
+oS+hBfz0SBXgCBUAKFUT6FUUL/5CgACvvy9VEu/dCA/+goAA78wID1AEgADtVhYmCimAAButVe+t
+Uh9PAoAA9cAG+hIAnQCrmS6SnvfACvtSAJ0AIpKdD6gKKIK/CCIBZCEVGa1MHq1ZH63E/kAGFeAI
+JQD4QEYVpfwdAJ8jiFD+QIYVoEwFAOwmBS72goAAnif5BgAM8A9lAOkmBixGAoAAD4gCmCGNO50o
+/KHoFeAMBQCcKpwriWOZLYhimCyJYxitl4xi7SYJJOhDAAB52y3o2AEGSAUAAJkumC/uRgAtTwKA
+AKuZ/zOmFeBYFQAoVAXRDy2lBf/7qA2gCwUAGK2InC4I2AGYL+5GAC1PAoAAq5n/M6YV4FgVAChU
+BdEPAAASrRmOKOoWAigECoAA98AEIJIAnQAMqRGrmSiSnvcABPtSAJ0AKZKdD6gKKIK/CJkB5JCN
+Z3v9AACfKOKUAAz4FgAAYAAQiGMICEv4QeYVr/hyAMAg0Q8mURQjURLwwoAN4AQFAOpyXCnYBIAA
+/AACHaANFQBYNDQocl3kTAEhmAUAAAgzLnZJ29EPAAD/+rQNoAIFAJ0Q/CAmFaAKBQBZaQAbrPGM
+EY0QjigfrOyKEvnf+wiSAJ0A//38DaAJBQDAkMD6D+80/kEGFe/9wgAAAGwQGiggBOkgByk4BIAA
++QAn85IAnQD3ACeyEAoVACMWKfTgAARxmQEA6RYoJGP5AADsrDkMFcQAAIgni4j9AqQVr8IFAOmC
+CyRogQAAAtIB4swICn8CgADmiRQmYQEAAPsgLIRiAJ0AC/oID2YIJoUU+4Ase6IAnQDJN8lF6bQA
+CcAEgABtSQUIAIYJAmEq0gAPqgj9QC6kIgCdAJrQ+iUmFeAMFQApEikYrRMpkQgpdQiJfiiCfwmZ
+EamIKIAFw979ACh8YEolAPsAKDwgO9UA+wArzWBOlQAtcAX/oCzkIP/1ACtwFn+xCypwQVg9emSl
+sy1wBSJwB8Vh96umDaEiAQAoClR40VIqEikZrTIqogt6kx4sEikrwAMMuwj7Z+AV7/wFAAy7ASuw
+A/VgI6CSAJ0A6xIpK9AEgADtHAgo4ASAAFv89GSkby4SKY8Q/8EmFeANBQCd6C1wBfIk5hWgVkUA
+96AKtCADFQCTFBasyyVxCC0SKRutfRStexqsvP9a8gXgAgUAkheSFpIYkh4iFhIiFhQiFhovFhX6
+JAYVr/j1ACgWGygWISQWE/oh5hXgDjUA/iFGFaAbpQArFhz0JOgVoA4lAP4hJhWgGLUA+CIGFaAe
+5QAuFhaJ24zYLBYYBlUCjdmVHfwjJhXvVY0A5RYMLNICgAD6I+YVqJkdACkWHvSAGooSAJ0AHaxj
+DEwRrcwvwp4mCg928w4ZrFsiwp0JSAoogr8IIgFkI4ofrGqLcBysZyRxB/1gABGwBTUA5TMCAMhB
+AAD1WMAF4BaFAPVAAAIwClUA7LsCCicCgADlRAIJQASAAOWsWh2QBIAAbaoslICTgZ+CloOShIqU
+i5WMko2Q7pIDJMhhAACahpuHnIieiQXaAuqGBSRAwQAAKhInG6w8DKoR+0AARXAJ9QD5U6YV4FhF
+ACh0BSsSJ/VgEnoSAJ0AHawzDLwRrcwtwp73oB3j0gCdABmsLCLCnQm4CiiCvwgiAWQiyxmtEy5x
+Bx+tEBOsNfYlKBWq7gEA7HEiL3cCgAAD7gKeIIpw+1hiBeBdhQD8QGYV4AN1AOsmAi1WAoAAA6oC
+miGIZygWJIZm9iSmFaAKBQAqFib84LAV74iVAPjsph2gJuUAJnRXKnU1KnRn/uVEHeALhQD67IYd
+4A5VAC50XCtwQS5waPrsxh2gTyUAL3R067oJB3AFAADudGgtVwKAAKqZ+S/oFeBaBQB60Q7E/n/R
+CcVm96AXvSIAnQAJDkb5YAAWsvlBAPoJAh3tjB0A6yULLEUCgAD94AAXsAsFAP/GAA9w+TkA6yUK
+L/1CgAAI/wIP7gIYrNfsrNcefQKAAJwnDt0CHqy7CP8CnyYO3QLtJgQj0SEAAOoHHgFAgQAACAJj
++uVEFaAIBQD4RoYdoA0FAC0kN/pF5h3gCQUAKSQz+kWmHaAMBQD8RkYdoA8FAP5GBh3gDgUA/kYm
+HaAPBQD+RqYd4A4FAP5Gxh2gDAUA/EXGHaiqHQAqJCwpcFf664AV4AxFAPhHZh3omR0A+EdGHeiZ
+HQD4RyYd6JkdAOkkOCFQ8QAAWWT0KHxg6CYAAUkBAAAJBIoIAIgJAIoochwqLFT6L+AV4AzFAPhK
+Zh2oiB0A+EpGHaiIHQD4SiYdqIgdAOgkUCXYRQAAWWTjK3B0KyRkKhIoG6usDKoRq6ojpp0rcBYp
+Cv95sQr66DAVoEyFAFg8YMTF/OCmHaACBQDRD8Ag0Q8dq6CN2PegDRiSAJ0ALBInHqudDMwRrswu
+wp73wA070gCdABmrlSgSJyLCnQmICiiCvwgiAWQhjxurkrDamrhlLZdgAGAdq46N2PegDFCSAJ0A
+LBInHquLDMwRrswuwp7A///ADGPiAJ0AGauDKBInIsKdCYgKKIK/CCIBZCF0G6uAsNr7YQYVr/JC
+AAAAAADrEikr0ASAAO0cCCjgBIAAW/3tZauPjHJlz1ArEijacOu8GCvgBIAAWDYCwCDRDwArEina
+cPygaB3gjEUA7LUIKmAEgABZKT3AINEPAAAAAPsgaB3gDQUA/QFmFe/qegDrygwBgbGAAApMFO7M
+CCnABIAA7k42DcgEgADTD23pBQhAhgkCZQo4COxODAFJAQAAbekFCGCGCQJnCvgMqCgojED5oAYV
+r+lSACsSKdpw/IBoHaCJVQDptQgq6ASAAFkpH8Ag0Q8AACosQPugBhWv6K4AAAAAAADqdAAJ2ASA
+AOxEAAroBIAAWPl7wCDRDwD/8UwNoAIFAMXS/OCmHe/0HgAAjnJl7mMrcEHacOu8EivgBIAAWDXH
+wCDRD8CgWWdDHaszjdj5v/KYkgCdAP/59A2gAgUAwCAfqy7A6g7eNP/hBhWv+a4A2iBZZzgdqyiN
+2Pm/82CSAJ0A/+yoDaACBQDAIB+rI8DqDt40/+EGFa/sYgBsEAjApf1YKAWnVQEA/L/AFeAIFQD9
+DQAO8DsFAFlqiCciEPigI4FQBgUAFatj0w8lUosqUhEpoQJklHdYLqItUhIcqxIbq1wswj3rsoUm
+6AUAAC1WEqrM7iAHLmZCgACsuy2wBy8K+/xBkBWg7hEA790BD3eCgAD/pgAOsPjFAAjYAS20Bykg
+B/1hhh2vmoUAKrQFkrqWuPdhJhWhmQEACYgCKLQH5bQABaCRgACIt4yI+wKkFe/OBQDpggskaIEA
+AA7eAe67CAp/AoAA7hYFJdkBAAD9IB9cIgCdACaJFKz6r2YmhRT7YB+LogCdAMk56cQAAgC5gABt
+SQUDAIYJAmGK0A8CAA8CAK+q+0AgzGIAnQCa0NPAiFAZqyfqMQgsXgKAAAtLApsxKlUIKZJ06YgM
+AqEhAADkVhIkQAUAAPlgAAW2mB0A5LOIbMpCgAAICEUJiAIkVhMoVg4vMCEPD0bvVFAhoIEAAPXg
+FMiSAJ0A9eAUiRIAnQC4SllpPhyrty1AAP6AMBWgOwUA71BQLTAEgAD2IAYVoApVAFlqKC0xCByr
+r/6hBBWgClUA/qGIFeA7BQBZaiKIIiogBxmqsOuqrBwVVgAACgpBDKgRqYgsgp6aFPeAGxLSAJ0A
+I4KdC6wKLMK/DDMBZDJsLiISFqq6jyn8QUgV4O5BAAbuCi7igO/dDAdwwQAAnhb/oBGbogCdACsg
+Fi8K/3+xFfpA8BWgDAUAWDtmGaqV81FADeD/9QAbqscmIQcaqsYYqp39VUAF6mYBAO4hGis3AoAA
+CGYCljD4QAgVoEwFAJwznTL7BgANMA1VAOo2BCxGAoAADYgCmDH8QkgVoDYFAJY1njb8CAAFMsxR
+AObMEQ1WgoAADKoCC6oCixaaNygiFYopq4irqpop+EKmFa/mBQD2YA3kIgCdAMCA5AseAdCBAAAK
+AmUEIIYKAmMEAIYKAmEsIhYbqoL8Z+YdqMwdAPxnxh2ozB0A/GemHajMHQAsNDyMXig0I/hk5h2g
+CgUA7DQzLXAEgAAuNCL6ZMYdoA4FAP5khh2gCgUA+mSmHajMHQD8ZkYdqMwdAPxmJh2ozB0ALDQw
+6wAVAdEhAAAKAIoqchEmUhL6Z2YdqLodAPpnRh3oux0A+mcmHei7HQArNDiIZppf+GbmHaiIHQD4
+ZsYdqIgdAPhmph2oiB0AKDQ0JmIH9mhmHahmHQD2aEYdqGYdAPZoJh2oZh0AJjRALiAHDg5BDO4R
+qe4t5p0rIBbTD3+xCvpA8BWgPAUAWDrsyVKIWMiOjVnAwJxbmNCOWJ3hnFicWRyrJI0gL3IULnIR
+KHITmBD2ocgVoApVAPYgJhWgOwUAWWmSKfqZ+KCmHeACBQDRDwAAAI037DIGKVAEgAD6oGgd7/71
+AFlop+2kAAVq0YAAwKX9ViAFoDsFAFlphMHW2iDrVAAJ4ASAAFg6gMAg0Q/r5AAJUASAAFg6/umq
+DBVuEYAAYAAUixT6QGgdoAwVAPtjABXgDVUAWDs2jFhlz8uPLxiq/ehWCyLogQAA7fYAIXDhAACe
+WJ9Z/EHmFeACBQDRD4g3KYkU5TQABIXhgACDifRkABWv80IAAAAAAAAA+sBoHe/vugD8EcId7/3O
+APMgaB3gCgUA+wFmFa/xIgD/8fgNr+ilAOy6DAGBuYAACksU7rwIKcAEgADuTjYOSASAANMPbekF
+CGCGCQJniRWqOOtODATJAQAAbekFCICGCQJpixUK/gyuuyu8QPugBhXv78YAjxUv/ED/oAYV7++S
+AAAAAAAAAP/yqA2gAwUAixT6QGgdoAwVAPtiQBXgDQUAWDr8Y/8S//0YDaADBQBsEAQqIAT9QOAL
+0BiFAGukBnihG8Ag0Q/qJAAJ2ASAAOxEAAroBIAAWPlBwCDRDwDqJAAJ2ASAAOxEAAroBIAAW/6W
+wCDRDwBsEAjApf1VXgWnVQEA/L/AFeAIFQD9DQAO8DsFAFlpHSciEPigIaFSAJ0AFqn4JWKLKlIR
+K6ECZLQ9WC04HKmoLVISLMI962KFJugFAAAtVhKqzOogBy5mQoAArLspsAcoIAz6AgAFMPy1AOyZ
+AQ1XgoAA+yYADLD8xQAMnAEptActIAf5YYYdr5+FAC+0BfNhRhWgDgUAnrj/YSYVod0BAA3MAiy0
+B+W0AAWeqYAAhreMaPrCpBXvzgUA6WILI2iBAAAO3gHuuwgKRwKAAO4WBSXZAQAA/SAddCIAnQAv
+aRSYFqyKqP8vZRT7YB2TogCdAMk66cQAAgDBgACOFm1JBQMAhgkCYSrSAA8CAA6qCPtAHuRiAJ0A
+mtDTwIhQGam76jEILF4CgAALSwKbMSpVCCmSdCtcSCtWE+mIDAGgwQAA61YSJEAFAAD5YAAHtpgd
+AOTzQmzKQoAACAhFCYgCmF4qMDEKCkbqVFAhyOEAAPVAEqKSAJ0A2pBZZ9QcqlItQAD+gDAVoDsF
+AO9QUC0wBIAA9iAGFaAKVQBZaL4tMQgcqkr+oQQVoApVAP6hiBXgOwUAWWi3iCIqIAfrqUMcE54A
+ABipRAoKQQypEaiZLJKemhT3gBlC0gCdACOSnQusCizCvwwzAWQyMiYiEhmpT44p/EFIFeBmQQAJ
+ZgomYoDu3QwDMMEAAPegD9uiAJ0AKyAWLQr/fbEV+kDwFaAMBQBYOfwYqSvzTcAN4P31AB6pXSoh
+Bx+pXBupM/1SbAWqqgEA6SEaLVcCgAALqgKaMPpACBXgSgUAmjOcMv9mAA/wDFUA7zYELd4CgAAM
+uwKbMS8iEvhgxhXgOgUAmjX+CAAF8v9RAOb/EQ3egoAAD7sCDrsCmzcqIhWLKaaqprsrJgn6QqYV
+r+kFAPhgDCRiAJ0A5AseAciBAAAJAmUEIIYJAmMEAIYJAmEqIhYbqRj6Z+YdqKodAPpnxh2oqh0A
++memHaiqHQAqNDz+ocgVoA8FAC80JP5mZh2gCQUAKTQn+GRmHeAJBQDpNCYs0ASAAPpkRh2o7h0A
+/mZGHaAJBQD4ZKYd6O4dAP5mJh2o7h0ALjQw6wAVAckhAAAJAIouchH+Z2YdqP4dAP5nRh3o/x0A
+/mcmHej/HQAvNDgrIAf+oeYVobsBAAy7EQi7CCy2nSsgFn2xCvpA8BWgPAUAWDmQyVKIWMiOilnA
+kJlbmKCLWJqxmViZWRypzo0gL3IULnIRKHITmBD2ocgVoApVAPYgJhWgOwUAWWg2KfqZ+KCmHeAC
+BQDRD+kWByzQBIAAWWc++qBoHe/99QD/QGgdr/z1AO9QUClQBIAAWWdIiRdkrYTB1tog61QACeAE
+gABYOSXAINEPAADqJAALWASAAFg5ouiosBVv0YAAYAAUixT6QGgdoAwVAPtjABXgDVUAWDnajFhl
+z8mPLxippuhWCyLogQAA7fYAIXDhAACeWJ9Z/EHmFeACBQDRD4g3KYkU5TQABIXhgACDiSQ8MPhn
+ABXv9B4AAAAA//CsDaALBQD8EcId7/3GAPMgaB3gCgUA+sFmFa/yIgD/8xANr+ilAOy6DAGBuYAA
+CksU7rwIKcAEgADuTjYOSASAANMPbekFCGCGCQJniRWqOOtPDATJAQAAbfkFCICGCQJpjhaLFQru
+DK67K7xA+6AGFe/wvgAAjxUv/ED/oAYV7/CGAAAAAP/zkA2gAwUAixT6QGgdoAwVAPtiQBXgDQUA
+WDmgY/8S//0YDaADBQBsEAbEcvlSoAXgBgUA9iAGFaAFNQD4RUQd4AsVAPpisBWgKOUA6CRXIgMh
+gAD0gATIkgCdAGhCQPSAByGSAJ0ACmsUe1AFLDAULCRgKixl7alYGNgEgAD8IAYV4Aw1AFlhhyYk
+aCYkaSYlNSYmHCckdB6ohC4lN9EPwIb4S4YdoA+FAP5Mhh3v/uYAAAApMDDBotMPepFo6yRkIVF1
+AAD8AGIdoCslAOskXCHYdQAAWWFzKixh+mMgFeAMNQBZYW8qMBVj/3kAAAAAKixd+mOgFeAsBQD8
+TIYdoA0lAO0kXCrgBIAAWWFlLjAYf+fRKixh+mMgFeAMNQBZYWBj/8AAH6iDKDEcL/J/CYgRqP8o
+8TYoNRyP8P5DxhXv/fYAAADoqRAa4ASAAPpMhh3gKTUA6SRcIVGVAADoFgAo2ASAAFlhTiYkaCYk
+aSYlNSYmHCckdNEPbBAIJyIQ0w/TD/rgaB2nhQEA+QAesVBLJQAoMDAWqFz5YB7oogCdACViiypS
+ESyhAmTEJ1grmhioCylSEiiCPexihSTIBQAAKVYSqoXrIAcqrkKAAKXFKlAHKSAM+gIABfD8tQDs
+qgEN34KAAPtGAA1w/cUADa0BKlQHLiAH+KGGHe+YhQAoVAXyoUYVoA8FAJ9Y/qEmFeHuAQAO3QIt
+VAfyrvAN784FAItXjLgtsRXpsgslsIEAAA5uAe7dCApHAoAA7hYFJukBAAD9IBysIgCdAC+5FJgW
+rIqo/y+1FPugHkuiAJ0AyTHIT9nAbUkFAwCGCQJhixaKYKuq/UAgJGIAnQCaYNPAiFAZqCHqMQgs
+XgKAAAtLApsxKlUIKZJ0CYgM6iIQJEAFAAD5YAAGNpgdAOTDPWzKQoAACAhFCYgCmF4roAUsCpX9
+YBdMIgCdAI0iZdJqL6ITLqIUGKe/G6e7D+4M+cAYmJIAnQAqIAcKCkEMqRGomSySnpoU94Ab2tIA
+nQAkkp0LrAoswr8MRAHpp8cSELmAACYiEi4iCfxBSBXgZkEACWYKJmKA7t0MAzDBAAD3oA2bogCd
+ACsgFi0K/32xFfpA8BWgDAUAWDhyGKeh81OQDeD99QAep9MqIQcfp9Ibp6n9T1gFqqoBAOkhGi1X
+AoAAC6oCmkD6QAgV4EoFAJpDnEL/ZgAP8AxVAO9GBC3eAoAADLsCm0EvIhL4gMYV4DoFAJpF/ggA
+BfL/UQDm/xEN3oKAAA+7Ag67AptHKiIViymmqqa7myn6QqYVr+kFAPiACzxiAJ0AKTww6QseAlCB
+AAAKAmUJIIYKAmMJAIYKAmErMDBksQPAoPqExh2gCwUA+oTmHeAJBQD4hKYd4AkFAClEJC8iFv6H
+5h3o/x0A/ofGHej/HQD+h6Yd6P8dAC9EPI5e/oZmHajuHQD+hkYdqO4dAP6GJh2o7h0ALkQwL3IR
+KkQiK0Qj/odmHeifHQD4h0Yd6JkdAPiHJh3omR0AKUQ4LiAH/qHmFeHuAQAM7hGo7izmnSsgFn2x
+CvpA8BWgPAUAWDgKyVKIWMiOi1nAoJpbmLCMWJvBmliaWS0wMMjbLvqZ/qCmHaACBQDRDyhyFCJy
+EbGI6HYUIRAFAADy4iYVr5+VAP6gph3gAgUA0Q8AAAAA6iQAC1gEgABYOCropzgVchGAAGAAPsCh
++oQGHa+JFQD4hCYd7/u6AOokAArYBIAA/GBoHaCN5QBYN5zAINEPAIsU+kBoHaAMFQD7YwAV4A1V
+AFg4WIxYyMLAINEPjy8YqCXoVgsi6IEAAO32ACFw4QAAnlifWfxB5hXgAgUA0Q+INymJFOU0AASJ
+uYAA8wEoFe/1GgAuMDH9UDAFoApVAP5ACBXgOwUA+KAABrbuAQBZZn7qJAAJ2ASAAOxEAAroBIAA
+W/1VwCDRDxyoDI0gLiIYhlCPoP/LEBWgOwUA9iAGFaAKVQBZZnHAINEPAAAA//EEDaAFBQDzIGgd
+4A8FAP9hZhXv8mIA//MkDa/opQAcp/wvchEuMDCNIClyFJkQKHITmBH2ocgVoApVAPYgRhWgOwUA
+WWZdY/7sAAAAAADs2gwBgbmAAApLFO28CCnABIAA7U02DkgEgADTD23ZBQhghgkCZ4kVqjjrTgwE
+yQEAAG3pBQiAhgkCaY0WixUK3Qytuyu8QPrABhXv8D4AAP/yRA2gBAUAjhUu7ED+wAYVr+/mAIsU
++kBoHaAMFQD7YkAV4A0FAFg3/2P+lwAAAP/wTA2gAwUAbBAIKCAE0w/xAcAN57UBAP0BgAvQGYUA
++QAcohIAnQB5gQTAINEPACciEAd6AvlgH1lQTiUAKDAwFqcI+cAfkKIAnQAlYosqUhEvoQJk9D9Y
+KkYYprcpUhIogj3vYoUkyAUAAClWEqqF7iAHKq5CgACl9S1QBywgDP4CAAcw/7UA790BD3eCgAD/
+pgAOsPjFAAjYAS1UBykgB/yhhh2vm4UAK1QF8qFGFaAKBQCaWPqhJhWhmQEACYgCKFQH8rBwDe/O
+BQCMV4vILcEV6cILJjCBAAAObgHu3QgKRwKAAO4WBSbpAQAA+yAdbGIAnQAvyRSYFquKqP8vxRT7
+oB8LogCdAMkxyE/ZsG1JBQMAhgkCYYwWimCsqv1AIORiAJ0AmmDTsIhQGabN6jEILF4CgAALSwKb
+MSpVCCmSdAmIDOoiECRABQAA+WAABraYHQDk01VsykKAAAgIRQmIApheK6AFLAqV/WAYBCIAnQCN
+ImXSgi+iEy6iFBimaxumZw/uDPnAGViSAJ0AKiAHCgpBDKkRCJkILJKeKhYE94AcitIAnQAkkp0L
+rAoswr8MRAFkQi0mIhIZpnEuIgn8QUgV4GZBAAlmCiZigO7dDAMwwQAA96ANm6IAnQArIBYtCv99
+sRX6QPAVoAwFAFg3HhimTfNVEA3g/fUAHqZ/KiEHH6Z+G6ZV/UywBaqqAQDpIRotVwKAAAuqAppA
++kAIFeBKBQCaQ5xC/2YAD/AMVQDvRgQt3gKAAAy7AptBLyIS+IDGFeA6BQCaRf4IAAXy/1EA5v8R
+Dd6CgAAPuwIOuwKbRyoiFYsppqqmu5sp+kKmFa/pBQD4gAv8YgCdACk8MOkLHgJQgQAACgJlCSCG
+CgJjCQCGCgJhKzAwZLEDwKD6hMYdoAsFAPqE5h3gCQUA+ISmHeAJBQApRCQvIhb+h+Yd6P8dAP6H
+xh3o/x0A/oemHej/HQAvRDyOXv6GZh2o7h0A/oZGHajuHQD+hiYdqO4dAC5EMC9yESpEIitEI/6H
+Zh3onx0A+IdGHeiZHQD4hyYd6JkdAClEOC4gB/6h5hXh7gEADO4RqO4s5p0rIBZ9sQr6QPAVoDwF
+AFg2tslSiFjIjotZwKCaW5iwjFibwZpYmlktMDDI2y76mf6gph2gAgUA0Q8ochQichGxiOh2FCEQ
+BQAA8uImFa+flQD+oKYd4AIFANEPAAAAAOokAAtYBIAAWDbW6KXkFXIRgABgAFbAofqEBh2viRUA
++IQmHe/7ugDqJAAJ2ASAAOxEAAroBIAAWPfNwCDRDwDqJAAK2ASAAPxgaB2gjeUAWDZCwCDRDwCL
+FPpAaB2gDBUA+2MAFeANVQBYNv6MWGXMKI8vGKbM6FYLIuiBAADt9gAhcOEAAJ5Yn1n8QeYV4AIF
+ANEPiDcpiRTlNAAEidGAAPMBKBXv9MYALjAx/U18BaAKVQD+QAgV4DsFAPigAAa27gEAWWUl6iQA
+CdgEgADsRAAK6ASAAFv7+8Ag0Q8AABymso0gLiIYhlCPoP/LEBWgOwUA9iAGFaAKVQBZZRfAINEP
+AAAAAP/wpA2gBQUA8yBoHeAPBQD/gWYV7/ICAP/yxA2v6KUAHKaiL3IRLjAwjSApchSZEChyE5gR
+9qHIFaAKVQD2IEYVoDsFAFllA2P+7AAAAAAA69oMAYG5gAAKTBTtzAgpwASAAO1NNg3IBIAA0w9t
+2QUIYIYJAmeJFao47E4MBMkBAABt6QUIgIYJAmmNFowVCt0MrcwszED8wAYVr+/eAAD/8ewNoAQF
+AI4VLuxA/sAGFa/vhgCLFPpAaB2gDBUA+2JAFeANBQBYNqVj/pcAAAD/7+wNoAMFAGwQBhmmYOKS
+XSlwBIAA7UQACeAEgADyYAiSoA8FACWSXJUQK1EE5VIAJiP9AADyTwAJ8AgVAOy7EQ4QBIAA9WAA
+RfAAOgCx//PgBwRiAJ0AD1YUDmYRBrYMJm3/9sfoFaSvAQAAoQQAiRrpZgENAgqAAPJAIBWhZp0A
+/tyMDeAJBQDowTxnsAUAAG1JLgZXFA53EQe3DCd9//bn6BXkVgEAAFEEAIoa6ncBCoIKgAAHBxnl
+cAZjMAUAALGZCcoMaaGDZMBHhxAqcQQp+v/sqhEPmASAAG3JNPLgCBWlQx0A/pAAEjRTAQDgUQQB
+mAUAAOoiCAwoCoAABCIM6VIDASPxAACGQAJiAQJSApJAEqYdLOUTKCKiL+USIiKhqPiY0OjmFi+u
+goAApSLRDxmmFimSoizlEy/lEqn5mdD5wsYV4AIFANEPAABsEAySHYwdlBEiMAMrwRMkwAfyYABB
+P/kFAOzBFSEQ/QAACSIBiiMZpgTsFgIpwASAAPQgAAI7qgEA6hYMLaFWAACLIee0AAUdAYAAqrv7
+fgAl4AYVAGqxE/tgAAbwDxUA/e0ADvbrDQCu3a1mKSADDwIADwIAsJnqkVhrGASAANsgbQhKjLQp
+nP//YKgV4A4VAPeAAEP7rAEA+80ADTbMDQD9QABFO98BAOpmCASA0YAADe059+AAQ/b/DQAP3Qjt
+ZggEy/0AAOu8GCSMI4AAY/+uAIodI6UQJqURKYATZJNVl1GKHfrAYBXgDAUA/KAGFaK7HQDrFggo
+4ASAAFv/bo4dmhONGO3lFCUVQYAA7qU+GcgEgADyctAN7/X1ABqlxiqimvlAaB2gDwUAbTkgiyOD
+Iqv7f7sBsTMFPAEOvQHthgEn+EMAAOyGACRAIQAAlB73IAXCogCdAPQAIh2gDBUAiCQIC0v7jQAN
+9ogNAPsAAERwDwUA5I01BAGhgAAKmAtt2imLJ4MmDwIAq/sOvQEthgHvuwd0yAUAACM8AeU8AQf4
+QwAA7IYAJEAhAAD3KyYNoAwVACgiBQgLS/uNAA32iA0A+wAARHAPBQDkjTUEAYGAAAqYC23aJYsp
+gyir+++7BnTIBQAAsTMFPAEOvQHthgEn+EMAAOyGACRAIQAAIiwY9z/606AMFQCEHo8S7hIIL8bC
+gACoqJgZiBPq+REP/4KAAA9mDKmI6BYDJxQBgADzSRoF4AKlAALqNpoXCqoJ5BYGLVfCgACaFfSA
+DPISAJ0AGaSHDEgRqYgsgp77gBIbogCdACiCnQNJCimSvwmIAegWBCQRIYAAiBSJFY0Xjx2MGBuk
+oi7xFQ3MDJwYre4u9RULAIdtmQIIAmGPF2TxmhSkgxik7xKkdPwgiBXgCQUA/+AAh3AFBQD8IAgV
+oAMlAOoSAy92woAA7t0IDtgEgADtFgsuZoKAAPwhRhWl6h0AjByYsJOyjxkutgMtEg0uEgoPXwgt
+0gDktgQlUQEAAPdhBhXgQwUA7LYJIqiBAADzYKYV4AxlAP9g5hWgAwUA82FmFeAOBQDutgotmASA
+AOLeAg7uAoAA7rYGLPAEgADs3QIEyBEAAP1gJhXgDFUAbcol98HSDaAEBQCE8f3gCBXgABoAwNCU
+Pe02DCdwBQAA7/wIIZghAACMGxSkTftsABXgAyUA/X/6vSXqHQCNF8DgDt01iRYapDaPGOgSBSzP
+AoAAqpnolp0ngEmAAMAg0Q8AihCLEYIU7dgJDVaCgACasIsdC4gR+EAAQTAJBQD5YqQd4FoVACq0
+BdEPAAAAAAAA//GoDaAGBQAVpCCOWPfABriSAJ0AiBYZpB3sEgUsRwKAAKmIK4Ke/WAGq6IAnQCJ
+FiiCnQOZCimSvwmIAWSAwbDqmljoFgQscm4AAGAAZQD3AMYV7/KaAP/9WA2gDQUA8MEQDeAJBQAa
+pPqUHvtTSBWv9AoAGqT2+1NIFa/2rgApkmSKEoYd9mDIFeAMBQCcUJdRLGIWCroMmhgqYRKcECNh
+EOZhES1WgoAAqpn4IGYV7/HaAIIU0Q8AAAAAAAAA//ckDaAIBQCOHYIQ+CAoFaAPBQD/wqQd4F0V
+AO3kBSkWgoAAkoDRD8CgWV/2jlj53/kQkgCdAP/9JA2gCAUAAMCAAuk0+KEGFe/87gAAAABsEBYb
+pCwnsosiFhv04ogV54UBACJyFiZyHyxyFSwWF/UASGESAJ0AiTctmRQjFhr7oFDgEgCdAIOZ3TAu
+Ehsu4hAv4AUoCpX54FO8IgCdAC8SG4/y++BRCJIAnQAk4hMv4hSdFQT4DPkAVACSAJ0AKRIaiZz1
+oHAVoAslAPMgDyff//UApNmJnygSGg8qAwqZASmGFC7QRCrQRezQRi92AoAACu4C6tBHL3YCgAAM
+7gII7hEK7gKp7ikSF65e4JAEB3P9AAAODhkODk+z7P8FZB2hzA0A/QVEHa+6BQD64E68IgCdACz6
+tP0ATmQiAJ0A+8BOIBIAnQCw6AjsAXjgFm0IDLDJ6cwBDnAEgAB54ANj/+wAD+4RGKSiGqSeJxYh
+E6Se7KRjF0gNAAD/STYFopkdAAOTAQycAQ6eAfsgBAUwBxUACno5Dn45DHw5A3M5CJkB+O0ADPAH
+BQDYcOm4OQvIBIAA+GYACbAYBQAMiTn44GgdoAyFAA7IOQmIAvwkKBWgCUUACpc5CHcCLMIjBzMC
+JxIh84BI++IAnQAqciQDPg8K6gqKoCyhAg7uEZ4X+4BM2BIAnQCdFVgnAo8XLnIkKBIar+6J5ug9
+EQ1kAoAADcwC7+IBLM6CgAAJqSgdo56p/y+GE4/mDcwCjuQK/yj8IKgV4AslAP/AAEdwCQUA/iCG
+Fa//9QAuEhoMmgL7wkYVp4oBAPsASSCSAJ0AGqOlieAqonQKmQyxmQkIS/sASKASAJ0ALBEJCW4U
+9cgAFzWpAQDuqgIOToKAAAqZAioSGoisma77BgAMcAwVAAyIApisLhIaLuEqZOS5E6ROJhYZG6NZ
+DywDGqRKKhYVnBubHvwjSBWgCwUAmxyk2uoWECVZAQAA6xYNJVDhAACaGCzCE/wiJhWgBeoALhIY
+rf39wBmdYgCdAGSzKy8SEIgaif8phn+P/i+Gfi8SGygSE4wfKRIRGqOl+4AGFaWIHQD5gEYVpZkd
+AJnDj/AuEhKNFeoSDi/+AoAAD+4CnsH6AAoVoAkFAO6jLRZgQQAAsZnsgx4Mj+gAAI8fKxIULBIT
+/+DGFaAEBQDs9gclhbmAAB+jG4cfHqMT/oACAnALRQDsfAgLkASAAOd8OCZg4QAAKhIbiqAOqgIq
+JggqEhopEhkoog4JiAEoJgkm0EQo0EXp0EYrNgKAAAhmAujQRys2AoAACWYC40QICzYCgAD4xgAL
+MAkFAPZBRhWgCAUA6qIUK7AEgADpJg0juQEAAPpBZhWgCQUA6CYMIREBAADkBgAEyAUAAOaDHgyv
+0AAA1LAPRAvvAgAF2BEAAPz/+40iAJ0AKBIbKIAHCAhBKxIaLxIUGaLiLrEqDIgRqYgP7gwvEhL/
+E6YV7+4BAO61KicYuYAAKhIUKRIRCqoRqpkpFhEvEhscotX/4PAV4ARFAAToNigWFP0QABQx/wEA
+6BYTL/cCgACs7uviniRAvQAACEgUKBYS+WAxa6IAnQAYosQi4p0I+Aoogr8IIgFkJeYqEhosEhAu
+EhQvoSuSH+zAMy93goAAD+42H6PIiqwuFhj/wAIHcA8FAP/P5hXgCwUAK+Z+8UAFx5IAnQAqEhCe
+Gogbia+PHIqu+QAEBHAJFQAImDkK/wEPnzkI/wLsFgknkPGAABqjDiwSEIgYLxIVLhIaCCCIDwSK
+LuIUGKOvi80OXgwpgn8L7jYOuwwKmQEphn/rxg0lgMGAAI/PjM6v7377AizMAS4SEJ/vLOYOLhIa
+jOydFfoiCBXv/9UAD8wBnOyLvSoSFygSGKW56Zz/LQIKgAD5H+AVoZmdAAmINvEcsA3gDwUA8ADU
+DaANFQArEhCeGou9KhIXKBIYpbnpnP8tAgqAAPwhJhWhmZ0A+QEADHAPBQDtFgUkDGGAAMDQLhIQ
+KhIYjBgSooH9TwANcA8FAOmqNg5ABIAACECIrfYCZgujZgYIiovth++E7utWNgf4BQAA5rsMDkAE
+gADr5g0lgHmAAKdnl+92ewGxRJTuevnGY/zDiBmKHfojxhWgCQUA6RYdJEP9AADoFhYsAX4AAGP8
+wwApEh0rEh4uEhzqEhYkyAUAAOkWHSXgYQAADss5KxYe+z/lBCIAnQArEh0sEh74IugV4LsBACsW
+HAy7CoKwLhIVLxIY5SgIDIIKgADmEhwkQ/0AAP3vAA/xiJ0A+eEAD7AJBQDsZgsHgpmAAC8WH636
+7qoLA2AhAADu3gsOQASAAOhmAA8gBIAABAyKgrDiVDYHcCEAAOQiDA5ABIAA4rYAIQCZgACHY49i
+p0eXY3R7AbH/n2J66cgvEh8oEhgP+Tmp3f0f+dViAJ0AZC8yKxIeKhIcC6oLixqMoyy2f4qi+2/G
+Fa/vggArEhCLvSoSFywSGKW56Zz/LQIKgAAJCRn5gQAOcA8FAO0WBS5z5gAA/+5EDaANBQD/7iQN
+oA0VACYSG4xiJmAHnRXzlEwN4WYBABqiEAxpEaqZKJKe9wAeOtIAnQAYoggkkp0IaAoogr8IRAFk
+Q7ApEhslkhIYohuKmfkhSBXgVUEACFUKJVKA6pkMAqjBAAD1IBRj4gCdACsSGyuwFicK/3exECoS
+G/tA8BWgDAUAWDLHZKOCLRIbGKIpK9EHHqIoHKH//0QEBeq7AQDq0Rot3wKAAAy7AptA/aAIFaBJ
+BQCZQ59C/4YADzAPVQDuRgQuZgKAAA/MApxBKdIS+oDGFaA7BQCbRfgIAAdymVEA5pkRD3aCgAAJ
+7gII7gKeRyzSFY7Zpcyl7i7WCf2iphWv6wUA+oASnGIAnQApEgUsTCD5JgAV4A01AG3aBQkAhgwC
+YSsSG8ChKkQgKbIWLhIa+IfmHeiZHQD4h8Yd6JkdAPiHph3omR0AKUQ8iO4tshD4hmYdqIgdAPiG
+Rh2oiB0A+IYmHaiIHQAoRDD9oigV4AkFAClEI/yHZh3gCgUA+oRGHaiNHQD4h0YdqIgdAPiHJh2o
+iB0AKEQ4LLAH/cHmFeHMAQAdoa4MzBGtzC/GnSuwFnexDSoSG/tA8BWgPAUAWDJhKxIaZLD3ibhk
+kPItEhvzYSgVoA8FAJ+7LdIQmSCIuCzSES7SFJKBn7jvtgkmYAUAAOzWESdwBQAA/6KGFa+alQD7
+YKYdoAIFANEPAAAqchEuoQLtNAAPAGYAAPAB7A2gCQUAkxVYJR6NFS5yEhyhjhmh2CsSGyzCPemS
+hSdwBQAALnYSqszqsAcuZkKAAKyZKJAHLrAM+gIABTD8tQDsiAENV4KAAPsGAAww/8UAD48BKJQH
+KLAH/yGGHa+chQAslAX7IUYV4AoFAJqY+yEmFaGIAQAI/wIvlAeZFukWGiyC9gAALgqO6hIbLuAE
+gADrEhovaASAAFgx2MAg0Q8pEhspkhAokhEqkhTiEhokQAUAAOiWESVQBQAA+yKGFa+flQD+QKYd
+4AIFANEPAOoSGyrYBIAAWDJKZK1pYABYipfbMOqsICpgBIAAWC2kjBaOwOuhCC92AoAADk4C7qYB
+LWgEgAD7gQQd79fGAAD/15gNoAMFACoSGyugB/ogAAXwDBUA7RISJdhhAABYMnUtEhosEhEs1hMu
+EhqO6MjtwCDRDwAAAP/niA2gAgUAIhIbKRIaii8bokbrlgsk+IEAAO+mACFA4QAAmJiamf5B5hXg
+AgUA0Q/AwP/dLA2gGWUAKRIbHKI7KBIajZApkhiP4IiA/ysQFaAKVQD4IAYVoDsFAFlglcAg0Q8t
+EhscojIu4hH9oAgV4ApVAPQgBhWgOwUAWWCN/CCoFe/67gDqEhsjWGEAAPwAIh2gDVUAWDJIY/9T
+AADqEhsjWEkAAPwAIh2gDQUAWDJCY/87AAD+EaIdr/oaAP/cFA2v6aUAwMD/2tANoAklAAAAbBA6
+IxZR5CAEKhgEgAAiFmPlFlAiOXmAAPiALduQEoUA9oAtmhIAnQAtElEsEmMp0gAqwActFkwsFlT6
+IAAFN5kBAOkWTSTJrQAA+ilmFaSZHQApFk70gDFSEgCdACgSVCiABS4KTv8AK0wiAJ0AKQpReYEr
+KwpUe4ElKhJUKxJM7BwUIOhhAABb+8j7QJiwEgCdACoSTCgSVIkVmacogAXFtPsAD2RiAJ0AJRJU
+H6HQHaHOE6GM8iJmFeAJBQCZG/gl5hXgBjUAlh72JwYVoAgFACgWCvglxhWgPPUALBYo/CVGFa/0
+9QAkFh8kFiX8IyYV4AcFAPYmRhXgGwUAKxYs/iLmFeAKFQD6IQYVoB+1AC8WFPopiBXsCgUAKhYp
+KhYrKhYx/CloFeAHJQD2IaYV4AQFACQWDCQWECQWEiQWFvQjBhWgHOUALBYaJBYc9CPGFaAHZQAn
+FjUkFjQkFjYtFk8kFjr0J4YVo/j1ACgWMCgWPRag6yVRCBmg3ykWJCUWO/YiJhWgGqUA+iQGFaAY
+FQAoFib/YMgVoAb1ACYWNyuyB+sWHS96AoAA/iRmFejuHQAuFiL1oCPaEgCdABagmAzTEQYzCCwy
+ni0KG33DERigkCYSTyQynQhmCiZivwZEAfqAiWASAJ0AGaC02ED4AAgd4Bm1AG2aAggCYSUSVBag
+lYNQH6CW5VEHIMiBAADmMwIJ3gKAAPdBHAWgCpUA9UAAAvAMNQDsuwIKrwKAAOZVAgpABIAA5qCI
+HaAEgABtqiyVgJSBn4KSg5OEipSLlYySjZDukgMkyGEAAJqGm4eciJ6JBtoC6oYFJEDBAAAqEk8b
+oGroElQtVwKAAPtAAEVwGbUA+VOmFeBWRQAmhAUrElTTD9MPK7AWLAr/0w98sSYsElAqElQPAgD8
+4AAGMA0VAOqgQSZj+QAADNw5WDEn+0B/sBIAnQAtEkstFk/1oBiSEgCdABagUQzTEaYzJhJOLzKe
+9+CBA6IAnQAYoEkkMp0I1gomYr8GRAH6gHzIEgCdABmgbQkAhykSTthAbZkCCAJhKxJRLRJU/UJO
+BaAHBQAnFkT9pUQdoC7lAP+q5h2gD2UA/6uGHeAGhQAm1GQrsBX6zgAN8Ao1APtAfGjiAJ0AKhJU
+7KEyENgHAADsFkQl2EEAAPtMoBWgDDUAWVlfKRJOKBJULBJN/0C8BaBPJQD/DoYd4AYFACaGHC2B
+By6FNyaFNR6gLvcNJh2q3QEA5oRoLu8CgAAO3QKdQIqAG6Ar60YCJmExAADsRgMtVgKAAAqZAplB
+LoBBL4EiHaD8DuYJ6IAFKzcCgACm3f2v6BXgVgUAdoEOxH53gQnFlvkAfC1iAJ0AGaDbIhJNFaDx
+/MAABXJtQQD5Qd4FoAMFAPKBRB3gvTkA+IDmFa3PHQDkzBEN3UKAAOy7AgtuAoAA7aoCD+UCgAAF
+zALsRgYhEPEAACJFCwuqAusSVC9EAoAACogCCYgC6EYEJbEhAADmAx4CKIEAAAUCYf1lRBWgDgUA
+/oYmHaAPBQD+hkYd4AUFAPSGhh3gBgUA9oamHaAIBQD4hsYdoAkFAPiG5h3gCgUA+oXGHaANBQAt
+RDAsRC3yheYd4AMFAPKGZh3ozB0ALEQsLbBX+oeAFaAMRQD8h2Yd6N0dAPyHRh3o3R0A/IcmHejd
+HQDtRDgl2XEAAFlY/ygSVO1MQCRBgQAACCCIDQSKCACIDQCKLBJULMIcKxJM/IpmHajMHQD8ikYd
+qMwdAPyKJh2ozB0A7ERQIlFRAADsEk0l2MEAAFlY7C8STSsSVK9PLrB0LvRYLRJPHp+z7BJOLu8C
+gACu3SzWnSuwFi0K/32xDSoSVOqgQSlgBIAAWDBlKhJUKBJMxJUppAUogBIPAgBkgEYUoLQjogcE
+hCjqRAABmEEAAFu+li8SVO2f0xpgBIAA7qCuHVgEgADv8gAp0ASAAFu+SiISVIInIiwQ2iBbvif1
+QGs4kgCdAMAg0Q/BaXRi9vKACxmiAJ0AY//rG5+Ni7j3YG64kgCdACMSTxafiu0STimfAoAApjMs
+Mp79gG6z4gCdABifgSYSTyQynQhmCiZivwZEAfqAbfASAJ0AGp98sLmZqGVM0mAMZBufeYu492Bt
+oJIAnQAjEk8Wn3YMMxGmMywynsHb/YBts+IAnQAYn24mEk8kMp0IZgomYr8GRAH6gGzwEgCdABqf
+abC5mahlS2tgDJAA3lDrHBAuUASAAO3RCC7gBIAAWBKJLQqI/UBs5GIAnQCMFGTPKojHi4j/AqQV
+78UFAOmCCyRogQAABdUBpf8v/ED7IG0cYgCdACaJFAw+EavkDmYIJoUU9eBs66IAnQAoElHJgskw
+C7kCbTkFCACGCQJhJNIADkQI/oBuZGIAnQCU0InA6BJjLM4CgAAJOQKZsSiABfophhXgNuUA9wBp
+VCIAnQDEovsAaQQiAJ0Aw939AGz9YgCdAPwqhhWv5HoAFKBJJEJ5LxJQIkIUKUIWJUIVJRZf9IPo
+Fef/AQD14EnJEgCdACgSUY2HJtkUKRZHKBZi+sBSSBIAnQCD2d0wKRJjKZIQKpAFKwqV+0BVJGIA
+nQAqEmOKovtAUnCSAJ0AJ5ITL5IULRZGB/sM+WBVYJIAnQAmEmKGbP+gcBWgDyUA8sAO99/89QAm
+Ekeu24u/KhJiDGYDBrsBK6YUKdBEJtBF59BGLM4CgAAGmQLm0EcszgKAAAeZAgiZEQaZAquZKxJf
+qSngsAQEy/0AAAkJGQkJT7OY+UVkHeGIDQD5RUQdr7cFAPaAT/xiAJ0AJ/q090BPpGIAnQD7IE9g
+EgCdACqc/wqYAXqQD7CL64gBDEgEgAB7mPIPmREXn/kbn/cTn/fqn7sUwA0AAPk/5AXiiB0AA4MB
+CooBC4sB+QAEBPAGFQAJaTkLazkKajkDYzkHiAH4zQAMMAYFANdg6Pc5C0AEgAD2ZgAJ8BcFAAp4
+OfbAaB3gCoUAC6c5KkIj+OYAC7AIRQAJhjkHZgIGMwLzQEqz4gCdACpCJAM3Dwp6CoqgKaECDncR
++yBVaBIAnQAuFmctFkZYIlsrQiSnu4627LIBL3aCgAAOrigtEmKuzC4SZyzWE4y2LRJG67IELUwC
+gADqzCgJ1gKAAAqZAhqe8v1gAEWwDyUA+iimFeAIBQD7JgAMv/z1ACoSYgmGAvdCRhWnNgEA+mBR
+cJIAnQAZn8GIoCmSYgmIDLGICAtL+2BQ8BIAnQAqEYsIaxT1aAAVtZgBAOuZAg1GgoAACYgCKRJi
+hpyYnv7GAAtwChUACmYClpwoEmIogSpkhNsTn6clFmErEkcZn6ManrAqFlb4K6YV4AoFACoWU67Z
+KRZYDLsDKxZS6xJiJNEBAADqFlUkyOEAACkWSCuyE/orJhXgBeoALBJgre39gBpFYgCdAGSzQC4S
+WC8SSobvJvZ/ju4u9n4mEmMoElsuElcpElkanvv7wAYVpYgdAPnARhWlmR0AmeOGYC8SWi0SRugS
+Vis2AoAABv8C/8AmFeAJBQDoABUHcEEAALGZ7oMeDI/oAAAsElsuElcrElwfnnz/wMYV4AQFAOzm
+ByWFkYAALxJXGZ5p/zzeBaALRQDs/AgPwASAAO/8OCZg4QAAJhJjhmAJZgKWiCYSYiUSYYpuBaoB
+mokn0EQq0EUORQvk0EYrvgKAAAp3AurQRyu+AoAABHcC41UIC74CgAD65gALsAoFAOeGCi+4BIAA
+5GIUJ/kBAAD1AWYVoAYFAPsBphWgBAUA5oYMJEEBAADlRgACIAUAAOeLHgov0AAA1LDvAgAF2BEA
+AP3/+6UiAJ0AKxJjK7AHCwtBKRJiKhJcHJ44KJEqDLsRrLsKiAwqElr7c6YVr4gBAOiVKiQZkYAA
+LhJcLBJZCu4RrswsFlkpEmManiz5IPAV4A5FAA6GNiYWXPzQABMxmQEA5hZbLMcCgACqiO+CniMw
+vQAABkYUJhZa9+A0A6IAnQAanhsogp0Kmgoqor8KiAFkhhErEmIpElglElwmsSsoFlfpkDMqr4KA
+AAZVNhafH4u8JRZg9qACArAOBQD+r+YVoAwFACxWfvFgBfeSAJ0ALhJYJRZKKxJSjO8qElOO7v1g
+BAWwDBUAC8s5DqoBCso5C6oC6RZJJRGpgAAanmQkEkgvEl0uEmIEYIgPDIou4hQkElgpYn8OLgyP
+TQqZASlmfw/uNg7/DO9GDSeA4YAA5EIPKkgEgACJnqTkfksBsZkqEliUr5muLhJijOwtFkb6KwgV
+7//VAA/MAZzsi70mEl8sEmCitORM/ysCCoAA/Z/gFaFEnQAEzDbxnfAN4A4FAPAA8A2gDRUAKxJY
+JhJfDwIAi73mEmArAgqAAAK0COUWSiIj/QAA+CkmFeFEnQD0wQALMA4FAO0WRiMMyYAAwNApElgq
+EmAsEkgYndT9TwANcA4FAOSqNg4oBIAABYCIre8I/wuj/w8QiiuSDS+SDySSDgslNuW7DAdwBQAA
+65YNJYCRgAAPXwgvlg91+wIkTAGUnurpxX4oBIAAY/yuJhJJKRJV+CzGFeAIBQDoFmUjM/0AAOYW
+XisBdgAAY/ytJxJlKRJmKxJk6BJeI7gFAADnFmUk0GEAAAupOSkWZvj/5FwiAJ0AKxJlKRJdLBJm
+9ivoFaC7AQArFmQMuwqIsC4SYOYSYCsCCoAAAo8I5RJkJ/v9AAD9zwAPcf+dAP/BAA9wBwUA7FUL
+BwKpgAAuFmgN6gjpqgsC4CEAAOnZCw54BIAA76YADPAEgAAOFIqIsAgkNuSIDATIIQAA6LYAJACh
+gACPU45Sr090+wIu7AGfU55S6pnMfngEgAAuEmgO5zmn3fzf+cViAJ0AZI8wKRJmKBJkCYgLKRJK
+ioMqln+IgvkvxhWv7yIAAAArEliLvSYSXyoSYKK05Ez/KwIKgAAEBBn1QQANMA4FAO0WRi1zfgAA
+/+3YDaANBQD/7bgNoA0VACISY4wiIiAHLRZG85U8DeEiAQAanWAMKRGqmSaSnvbAHrLSAJ0AFp1Y
+JJKdBiYKJmK/BkQBZEO/JxJjJXISFp1riHn24UgV4FVBAAZVCiVSgNMP6HcMAqjBAAD04BTL4gCd
+ACsSYyuwFigK/3ixECoSY/tA8BWgDAUAWC4WZKPnLRJjFp14L9EHG513F51P/TqiBar/AQDo0Rov
+/wKAAAf/Ap9AitD8gEYVoE4FAJ5D+0YADfAOVQDrRgQtVgKAAA6qAppBJ9IS+IDGFaA5BQCZRfYI
+AAfyd1EA5ncRD/6CgAAH/wIG/wKfRyzSFY/ZpcwF/wgv1gn9oqYVr+sFAPqAEvxiAJ0AKBJGKUwg
++QYAFaAGNQBtagUIIIYJAmMrEmPAgShEICeyFi8SYvaH5h3odx0A9ofGHeh3HQD2h6Yd6HcdACdE
+PIb+LbIQ9oZmHahmHQD2hkYdqGYdAPaGJh2oZh0AJkQw/aIoFeAHBQAnRCP8h2Yd4AgFAPiERh2o
+bR0A9odGHahmHQD2hyYdqGYdACZEOCywB/3h5hXhzAEAHZz9DMwRrcwuxp0rsBYpCv95sQ0qEmP7
+QPAVoDwFAFgtsCsSYmSw/4i4ZID6LBJj/2EoFeAOBQCeuyzCEJjwgrjrwhEt0ASAAC3CFJ8hnqju
+pgkl2AUAAOvGESboBQAA/YKGFe+ZlQD5QKYd4AIFANEPKkIRLqECLRJR6RZHLwBmAADwAfQNoAcF
+AC0WRlggaxic2xed6ilCEidyc+iCPSTIBQAAKUYSKRJjqogJiBGody6QByxwB/woyBXg/7UA+yGQ
+FeDuEQDvzAEPd4KAAP+GAA4w/8UAD88BLHQHJpAH+uGGHe+ahQAqdAX44UYV4AgFAJh4+OEmFaFm
+AQAG/wIvdAfnFmIrgw4AACgKjuoSYy7gBIAA6xJiLGgEgABYLSXAINEPAAAtEmMt0hAs0hEu0hTr
+EmImYAUAAOzWESdwBQAA/6KGFa+alQD7YKYdoAIFANEPAADqEmMq2ASAAFgtlmStXGAAWIp3KxJR
+6qwgKeAEgABYKPCMcOuhCC5mAoAADDwC7KYBLWgEgAD64QQd79cWAAAA/9bkDaADBQAqEmMroAf6
+IAAF8AwVAO0SWiXYYQAAWC3BLRJiLBJZLNYTLhJijuj7357okgCdACISYygSYokvGp2U6oYLJHiB
+AADvlgAhMOEAAJaImYn+QeYV4AIFANEP/+Y8DaAIBQDAkP/caA2gGGUAAC4SYxydhyYSYo3gLuIY
+j5CGYP/LEBWgClUA9iAGFaA7BQBZW+HAINEPLRJjHJ1+LpIR/aAIFeAKVQD2IAYV4DsFAFlb2fwo
+yBXv+uIA6hJjIVhhAAD8ACIdoA1VAFgtlGP/UwAALhJUjuL735l4kgCdACsSSywSVOu8GC5QBIAA
+WCbqwCDRDywSVIzC+5+YaJIAnQAsElQrwEHrvBIuUASAAFgm4cAg0Q8sElEswBT9rAYdr8G2AAAA
+AAAAAOoSYyFYSQAA/AAiHaANBQBYLXhj/uMAAP+/vA2gBAUALRJUjdL7v5W4kgCdACsSSywSVOu8
+GC5QBIAAWCbMwCDRDwDaIFu66BKdGAumEeYiCAUG8YAADOowKyKFi7Cwouy7CAlQBIAAWV0ZHJ1C
+KsKd+kAEANALFQAAuxoLqgIqxp1ZXU7AINEPJhJUxcL8wKYdr8HaAAAA+BGiHa/2rgD/1+wNr+il
+AMCQ/9aoDaAIJQAoElSIgvsfkSiSAJ0AKxJLLBJU67wYLlAEgABYJqfAINEPwKBZWCMbnBOLuPl/
+kPiSAJ0A/8lMDaAEBQDAQB2cDsDKDLw0/aEGFa/JBgDaQFlYGBucCIu4+X+SEJIAnQD/ycwNoAQF
+AMBAHZwDwMoMvDT9oQYVr8mGAAAAAAD6AOIdoAsVAFgmki0if/xQZhXgAgUA0Q8qEmPrElEp4ASA
+AFka8cAg0Q8tElD7gGgdoI5FAO61CCngBIAAWRnBwCDRDwAAAAD7IGgd4A8FAP8BZhXvyjoAJhJR
+6/gMAwG5gAAIShTprAgrIASAAOk5Ng24BIAAbZkFBECGBwJlJBJRCj8M6EQIArkBAABt+QUEYIYH
+AmcI5gymViZsQPegBhWvyQIAAAAoXED5oAYVr8jOAC0SUPuAaB2giVUA6bUIKeAEgABZGZ/AINEP
+AAAAbBAIHZzdDwIAKNF/xGXlm/IRIZUAAPEADQ+QJ+UAuBr6gGgd4Aw1AFlU9IwSDIwUnBKKNgWr
+AZsTKSAFLDAeKzAidplK94AK3GA9ZQD9gAr9YgCdAC4gaC8hNfvACo1iAJ0ALDEQsf//gAolYgCd
+ACwlNeskaCpQBIAA6DIJINgxAAD4Q4YVoAw1AFlU3Io280AIYhIAnQAZnLn5QAgM4EslACowH/tA
+B7ViAJ0ALCAF94AHXSIAnQCJJyogBy2ZFImZKCEI8a1gDeGqAQAem5dkkMsMqxGuuy2ynhybkfeg
+EipSAJ0AK7KdDK0KLdK/FJufFZvbDbsB7ZvYFZFZgAAqIQcskAeckSwgBwoKSv9AABUwPBEA9HAA
+EbHMAQDjqgIOfAKAAA+IAgWIAg2qApqwjyCYtPVgRhWgMwUA82BmFeANBQCdtZ23lbb94AAXsAVF
+AAX/Au+2ASXQgQAACSCGCgJjCQCGCgJhiScMyhH/QABFP8gFAOWmnSTIgQAACJgB7ZUEJEEBAACY
+kPkgJhWgXyUA7yQFLpAEgADRDwDAINEPLDEQ+mRQFe/7FgAAxbX6QKYd7/tqAACOJy/pFGTxT4jp
+mBQam48pITf7IApkIgCdAI022hD6gGgd593BAPwgphXgDDUAWVSEihAKjRSdEI82jhUF/wGfESsg
+BfnACejSAJ0AdrmVLDAed8EH80AJYdIAnQB73hkoIHTEknmIESogV3ehFi4gaC0wIn7RDWABCi8g
+V/fgCCViAJ0Aji8tMQuKFK7dnS8ooBNkgK6KpvugBTUiAJ0AxPgvJAX3gAUkYEuFAMOG+YAGlSIA
+nQAqMCIpIGj7IAYlIgCdAC0hNSwxELHd/YAFpWIAnQAdm/UsJTUenDgqJGiKES7hfw2sAfPABm+S
+AJ0A/UAEhmIAnQAfm1QtITcsMQp/2XwsJTd8p3l5rnZ/rnN6rnB7rm18pgcoMB/EknmAYrQb+mEo
+FaAMNQDqJhwqUASAAFlUQ8Ag0Q8AAAAAAAAAfaM/95/7JWIAnQAsMRD6ZFAVr/4GAMCw+iCGFe/6
+ugAsMQr8RuQdr/rGAI0iytbE6f5Aph2gAgUA0Q8AAAAAAHzRgvd/8uUiAJ0AxfX+QKYd4AIFANEP
+K6wY7CQACVAEgABYJYPE6f5Aph2gAgUA0Q8AAAAAAAAAGJu7/YBoHeAJFQAMnTl4qBEfmx8uITYs
+MQp/4R0oITd8iaf8ACIdoAkFAA3JOGWfHGP/lgAAAAAAAAD8RsQdr/+SAGwQBMAg0Q8AbBAQ5CIQ
+KjgEgAAZmyb+gGgdp4UBAPkANxFQBgUAJZKLKlIRLKECZMcNWB5iK1ISGJrSGZscKII97JKFJdgF
+AAArVhKqhesgByquQoAApcUqUAcoIAz6AgAF8Py1AOyqAQ3fgoAA+0YADXD9xQANrQEqVAcuIAf4
+oYYdr5+FAC9UBZJallj2oSYVoe4BAA7dAi1UB2RV+IpX2zDqrCAr4ASAAFgnA4lQCJsRC3sCm6Hq
+mv0dGASAACqidAqZDO4iECTIBQAA+WAABfapHQDktm5tUkKAAAkJRQqZApleKzEIK1UILOAFLQqV
+/YAxHGIAnQCPImXzrCniEyjiFAmIDPkAMiCQCiUALCISK0Bv/Q4ADLDMQQDqtwEF+CiAAAqdAQ3M
+Ai0gBxmakQ0NQeuajB7XAoAAqaouop6UGp0d98AxdVIAnQAqop0L3gou4r8OqgHmpAAFMRGAABSa
+mgTECiRCgJQc5HO/YiDBAAArMEQvMEUuIhfoMEYt3gKAAA+7Au8wRy3eAoAACLsCCLsRD7sCDrs2
+pLSPKY4qKxYRD+4M9cAXC6IAnQAqIBYZmnn/NlIF4Pj1APlABGwiAJ0AGJsmJRYULiAHJBYT8iJG
+FeKkBQAE5B0KowroSAgFKEEAAOWCfiqBCoAA+IAAQnAJFQDkMwsMoAqAAARVASSCfwVEAuSGfyGY
+PwAAJDKR5RIUIiAFAAAkNpEkEhPogoAhmSEAAOMWCC0BCoAA4xISLNAKgAD7ACSgogCdAAzoEa+I
+iIAIqgFkpJspPDDpCx4DUIEAAAoCZQkghgoCYwkAhgoCYcCRKWQgKCIW+MfmHaiIHQD4x8YdqIgd
+APjHph2oiB0AKGQ8jl6KGv7GZh2o7h0A/sZGHajuHQD+xiYdqO4dAC5kMCqiERmaQZkb+sdmHajq
+HQD+x0YdqO4dAP7HJh2o7h0ALmQ4+qHmFaAIBQDoVhcjjtmAAOtkJyNBgQAA6BYFI1FBAAD6IIYV
+qJsdAPjExh3omR0A+MSmHeiZHQApZCT6YygVoAkFAPjEZh3gCQUAKWQi5KIXYcnBAAD7YQANMAgF
+AChWFupmFSHxoQAA7gYAA0FhAAAIAIouMhkKuwwK7gzuNhknExGAAC4yGysyGq6ueusBsbsuNhsr
+NhrA4BiayishB4obE5oN+ENEFeq7AQDnijkN3wKAAAO7Aptg+kAIFeBDBQCTY5piE5os/8AAhTBo
+BQAIqgromogVUD0AAOOzAg3eAoAA8sCGFeSqHQALqwKDHZthixwIMwoYmoAjMp8LSwzoMwEORoKA
+AAgzAhia+5lmm2XoMwIHcAUAAONmByOAcYAAHJr2iBQM7AKcgIspLCIVpLukzCwmFZspGZnaDNgR
+qYgqhp0qIBYuCv9+oS8rIAf9NSYF4qwFAAy8Ha3NLdJ/we8K7gz/oBryIgCdAAy+Ee/uCA1qAoAA
+DU0CneOKGiuiFCiiEelSCCXYBQAA66YUJEAFAAD5QiYVr5+VAO9UBSSB+YAAjVnAwJxbmdCOWJ3h
+nFj8oSYVoAIFANEPnR8sFhDqJAAKWASAAFgqqCsSESwSEO0SDyVoSYAAj1hk8f7AINEPAMDgZX6t
+GJpCgx2JGwgzChiacyohBweJORiZtgoKSushGi1XAoAACKoCmmCIIJliGZnY/iGIFaBKBQCaY/kG
+AAzwClUA6WYELEYCgAAKiAIZmjCYYSMynw5ODOkzAQ5GgoAACDMCGJqrnmWbZggzAvLA5hXv+04A
+AAAA//GsDaALBQAqUhYDqgoqohxkoG0KujYqZhUuUhYJ7gu47u4mAANBYQAACASKLlIWCe4KiOAK
+iAyY4C5SFp4ZCe4KjuCZHuq7DAcA8YAAixkJuwuDs46yo6N6OwGx7pOz/2BGFa/3TgCIGWSA6ipS
+F8Dg7lYWJVAFAADqVhckyGEAAIMV/3AADeAOBQAoUhaYGYgZLhYVCYoKiqD0IsYV4O4BAAPlCgq6
+NppQJRIWJVIWCVUL7hYHIqghAAAFQIgD5QsuEha4VQUIii7iFgnuCoXgClUMleAuEhaZHijiFi4S
+FZgZCYgKiIAKuwwlEhblgEdncAUAAIgZyosqUhfAgPiixhWgCAUA6BYJJVAFAADqVhckyGEAAIgX
+KjwY6KM5DfuGAABj/l/AgfiixhWgChUA+iEmFa//igCLGQm7C4mzg7KpqZkWepsBsTOTsogW+WBm
+Fa/40gDAofqixhWv/JIAAAAAAAAA6iQACtgEgAD8YGgdoI3lAFgposAg0Q8AjS8emkfuVgsi2IEA
+AOvWACFg4QAAnFidWfpB5hXgAgUA0Q+JGCmdAiqRAiiRASmRBQqIAfkf2yrgChUAix36QGgdoAwV
+APtiQBXgDQUAWCpPY/2niTcsmRTlNAAGBZmAAPMhKBXv514AHJoujSApIhiIUI/g/ysQFaAKVQD4
+IAYVoDsFAFlYf8Ag0Q8AAAAA9MBoHe/lYgD/5mANr+mlAByaIi9CFC5CEY0gKUITmRD4ocgVoApV
+APggJhWgOwUAWVhwY/8hAAD/53gNoAoFAIsd+kBoHaAMFQD7YwAV4A3FAFgqKmP9Ex+ZAAquCq/P
+D+4LLu0QLeGl9a8ADrAPBQAP3TX91KQd7/JaAAAAAADywGgd7+SiAGwQGiogBOeY6RpABIAA+zHu
+BeAEBQDrFh4lGsGAAPlAGkuQFoUA90AaChIAnQCLMCwgByMWGpgd/CAABje7AQDrFhwl2a0AAPwi
+RhWkux0AKxYd9UBS+hIAnQAoIAXEbg8CAPcAGDwiAJ0AKQpH+QBhtGIAnQArIBYqCv8PAgB6sR36
+SDAVp8UBAP2fwBWgDRUADNw5WCmV+0BiUBIAnQAtEhItFhn1oE2KEgCdAOYSHS7HAoAAB4gIL4Ke
+9+Big6IAnQAamLclgp0K2Qopkr8JVQH6oF+IEgCdABuY2ykSHesABQrABIAAbZkCCAJhHpmW9CCm
+FaAv5QD+SuYd4AZlAPZLhh2gCIUAKCRkLiUqLTAV0w/TD/zOAA7wDDUA/YBfCOIAnQAqLGXpmaEQ
+2FEAAPggphXgDDUAWVHQKhIaLRIeLhIcJCYcJCU1JCRpJCRoGJjMLyEHKCU3GJih/0AAB/BJJQDp
+JHQv/wKAAAj/Ap9QjCArEh3tVgIncTEAAO5WAy5mAoAADLsCm1EqoBP7QEigEgCdAC0gQS4hIhqZ
+bA3bCeggBS3fAoAAq6r7T+gVoFsFAHuBECwKTnyBCi8KVv8AXMViAJ0AJFUKGJlJHJlhIxIc+sAA
+BLL6QQD3MrwFrb4dAOZWBy3dAoAA/eAAF7CqOQDvmQINVUKAAOuqAgGY8QAAI1UL6pkCD10CgAAM
+uwLrVgYutAKAAAlmAghmAuZWBCF5IQAA7wMeAvCBAAAOAmH4RUQVoAkFAClUMSlUMvimZh3gCgUA
+KlQ1KlQ2+qbmHai0HQArVC70peYdoAwFACxUMPilph2gDQUA/KaGHeiIHQAoVCwmIFf6S4AV4AxF
+APanZh2oZh0A9qdGHahmHQD2pyYdqGYdAOZUOCLQ8QAAWVF16lxAIUGBAAAIIIgKBIoIAIgKAIos
+IhwrEhr8qmYdqMwdAPyqRh2ozB0A/KomHajMHQDsVFAi0VEAAOwSHCXYwQAAWVFkKBIcJiB0qFgm
+hFgvEhnuEh0v/wKAAKf/LvadKyAWLQr/fbEK6iBBKeAEgABYKN8oEhrElikkBSiAEg8CAGSAQBSZ
+L4MnBIQo6kQAAZhBAABbtxHtmE8aYASAAO6ZKh1YBIAA7yIAKdAEgABbtsaCJyIsENogW7akaaEF
+YAmsdqEDwCDRDyYiEPUyPgXnpQEA2WD5QENBUgCdACVSeSpSESuhAugWDSgECoAA+2BEYBIAnQBY
+G5QpUhIYmAQemRIogj3u4nMkyAUAAClWEqqF7SAHKq5CgACl5SxQBysgDPwCAAbw/rUA7swBDu+C
+gAD9hgAOcPjFAAjIASxUBykgB/qhhh3vmoUAKlQFklqUWPShJhWhmQEACYgCKFQHZFeSilfbMOwS
+DSVQgQAAWCQ1iFDqEg0tGASAAOmY8xxeAoAAC6oCmjEpkmIJiAyxiPlgAAW2mB0A5LfpbMpCgAAI
+CEUJiAImFhspIhAqMQgoVg4qVQgrkAUsCpX9YDzEIgCdAC0iAmXTty+SEy6SFCoSGw/uDPnAPbCQ
+CSUALSISKqBv/Q4ADHDdQQDpqwEFeCiAAAmMAQzdAiggB/svfAWhiAEA6BYYLE8CgACnmS6SngqK
+Ciqiv/fAPP1SAJ0AKZKdCpkB6BYWJLyhgAAYl8sI2AoogoArFiIoFhfks+VkQMEAACwwRC8wRS4i
+F+owRi5mAoAAD8wC7zBHLmYCgAAKzAIIzBEPzAIOzDaoyI8pjiooFhUP7gz5wBbrogCdAC4gFvsw
+sgWg9vUA98AEjCIAnQAlFiYkFiUlIAcfmFT0IoYV4qYFAAZVHRaXniMWJK9f5lUIBzBBAADm8n4r
+AQqAAP/AAQIwAxUA5UQLCagKgAAFZgEl8n8GVQLl9n8iID8AACVCkQDhBAA+GuMSJCKoBQAA5UaR
+IiEhAAAkFhAv8oAlEiYkEiX/4DAIogCdAC8SFAz/Ear/j/AP7gFk5gYuPDDuDx4EsIEAAAYCZw5A
+hgYCZQ4ghgYCY8BhJpQgLyIW/yfmHej/HQD/J8Yd6P8dAP8nph3o/x0AL5Q8jl4mEhv/JmYdqO4d
+AP8mRh2o7h0A/yYmHajuHQAulDAmYhH3J2YdqOYdAP8nRh2o7h0A/ycmHajuHQAulDiWX+RWFyWQ
+QYAA7JQnJPmBAADvFg8k8UEAAP4gxhWobB0A9yTGHahmHQD3JKYdqGYdACaUJC4yGfUkZh2oZB0A
+JpQi5OJLYbHBAAAkVhYOzjbulhUh+aEAAO/mAAShYQAABByKLzIZDswM/+8AD7AEBQDvNhknlSGA
+ACYyGywyGqbmJhYRfmsBscwsNhouEhEuNhvAoBOX/C4hBywSHh+XP/ZDRBWq7gEA6zw5D3cCgAAP
+7gKekP5ACBWgTwUAn5Ockh+XXvtAAIYwYwUAA8wK45e5FmA9AADv7wIPdgKAAP8ghhXkzB0ADs4C
+LxIYnpEuEhcD/woTl7Ev8p8Ojgzj/wEOnoKAAAP/AhOYLJaWnpXj/wIFUAUAAO+WByWAcYAAH5gn
+iRYPrwKfkIopKyIVqKqouysmFZopKRIWDJkRp5kslp0pIBYmCv92kTEqIAf9L4gFoqsFAAurHay8
+LMJ/wd8J3Qz9gCaiYgCdAB6XuAicEOyMAg1vAoAArt2c0yoSGyuiFCmiEehSCCXYBQAA66YUJMgF
+AAD5QiYV75+VAO9UBSRcIYAAjFmUW5jAjVic0ZRY9KEmFaACBQDRDy0WICwWISkWI+okAAxYBIAA
+WCfXKBIVKRIjKxIiLBIh7RIgJWgZgACOWGXrPIkvGpf16lYLIviBAADvlgAhQOEAAJhYmVn+QeYV
+4AIFANEPwKBlvoEfl2guEhgjEh4P7gofl5ksIQcL8zkfltwMDErmIRouZwKAAA/MApyQjyCTkhOW
+/voi6BWgTAUAnJPz5gAJ8AxVAOOWBC/+AoAADP8CE5dWn5Eu4p8Kigzj7gEO/oKAAA/uAh+X0ZqV
+lpYP7gL/IOYVr/qiAAAAAP/xFA2gDAUALlIWA+4KLuIcZOB7Ds42LpYVL1IWBv8LuP/vBgAEmWEA
+AAMAii9SFgb/CoPwDjMMk/AvUhYvFhMG/wqP8CYWH+7MDAeBKYAALBITBswLhsODwqbmlhp+awGx
+M5PCjhr/gGYVr/Z6AAAALxITDwIADwIAZPJCLlIX5FYWJ3AFAADuVhcjMGEAAPIh6BXgDwUA7xYO
+JgWhgAAuUhYuFhMvEhMiFimKHgbyCoIg9CTmFeBaAQADXgoCwjaS4C4SJy7iFiIWKAbuC+NSCwdw
+IQAADiCILhInuCICBIou4haVHCISKAbuCoXgAlUMIhInleAvIhYuEigvFhMG/wqP8OYWHyVQBQAA
+7swMCSgEgADiEikvgo4AAC4SE8vkL1IX9KLGFaAOBQDuFhMn+AUAAO9WFyMwYQAALxIM6hYOIfBh
+AADv4zkOetYAAPohyBWv+MoAwOH+osYVoA8VAP4iZhXv/14ALBITBswLj8ODwq/vnxt++wGxM5PC
+jhv/gGYVr/gGAAAAGpZTiqj3QBhgkgCdACgSGewSHSxHAoAAp4grgp79YBhzogCdABuWSCkSGSWC
+nQuZCimSvwlVAWRS9h2WRLCsnNj6v7HYkgCdAGACIAAvEhou8hP/4MYVr9uaANog7DQAANhBAADt
+MQgq8ASAAFgJXy0KiP1AFzRiAJ0AjBRkyJKIx4uIiYvugRUkeIEAAP4hJhXvxgUABv8Br+7vFgcn
+cQEAAPsgFwRiAJ0Aih3piRQtVwKAAJoYq60KmQgphRT9wBaT4gCdAMoyLxINyf3ptAAJwASAAG35
+BQgAhgkCYY0ZjxgPAgCN0A8CAK/d/6AXxCIAnQCOGZ3gicCIHQiZEQmIApixKCAF+iNGFeA/5QD/
+ABLUYgCdAMSi+wAShCIAnQDD3f0AFoViAJ0A84BoHa/TrgAAwOH+osYVr/cqAAAAAAAAAOokAArY
+BIAA/GBoHaCN5QBYJm7AINEPACYSECZtAi5hAi9hASZhBQ7/Aff/z9KgDhUAKxIY+kBoHaAMFQD7
+YkAV4A0FAFgnI2P8QIg3LIkU1TDmFhsmC5GAAPMBKBXv4YoAHJcCj5AuIhiNIIZQ/8sQFaAKVQD2
+IAYVoDsFAFlVU8Ag0Q8AAAD/33gNoAUFAP/gdA2v6KUAAAAoEhsclvSNIC6CES+CFCiCE5gQ9qHI
+FaAKVQD2ICYVoDsFAFlVQ2P/PAAAKBYWKxIY+kBoHaAMFQDTD/tjABXgDcUAWCb9Y/uoHpXTCZ0K
+rr4O3Qst3RAs0aUIzAwEzDX9tKQdr+yeAAAAAAAAAOwSDSlQBIAA7jILKugEgADvMgcp2ASAAFgA
+a8Ag0Q8AjyL7/7UAkgCdACsSEtog67wYKWAEgABYIEPAINEPjCL7n7QQkgCdACsgQdog67wSKWAE
+gABYIDvAINEPLDAU/EwGHa/QcgAA/878DaAFBQDaIFu0UxKWgguoEegiCAUDyYAADOowKyKFi7Cw
+ouy7CAlQBIAAWVaEHJatKsKd+kAEANALFQAAuxoLqgIqxp1ZVrnAINEPxcL8QKYdr9GaAP/b0A2g
+AwUAwKBZUZwalYyKqPlf51CSAJ0A//RYDaAFBQDAUByVh8C6C6s0+4EGFe/0EgAAAAAA+gDiHaAL
+FQBYIBYsIn/8UGYVoAIFANEP2iDsEg0p2ASAAFkUdcAg0Q/awPwhqBWgjUUA7bUIKugEgABZE0bA
+INEP25D1AWYVr/WyAAAAAADr7gwBgdGAAI8dDkYU6WwIKcAEgADp/zYN6ASAAG35BQiAhg0CaYod
+jRcOOAjmqgwG6QEAAG2pBQighg0Ca48YjRcO/wyv3Y8ZLdxA/eAGFe/0UgCIF4kZKIxA+SAGFa/0
+FgDawPwhqBWgiVUA6bUIKugEgABZEyPAINEPAAAAAGwQFiIWIucSIivoBIAAKHAH3mD8IIYV4Ep1
+AP7gsBXhiAEA6BYOJEBhAAD4IWYVoExlAOzxDHmQBIAA++A6LSIAnQAkcSKMfpUYIyAVGZYkiBQv
+IAMrcEEmIhOi/wu7CQhmNv9gABW/+AUA65kIB/j9AAAI/wGK8SmSf+kWDSfYQQAA+8A08qEzIQDA
+0P4g5hXgBQUADe8MHZWBLdJ/CcwRrNwswTf0IMYVp/n1AHybChSVsfIgphXgAEoAJEoABMQ28iCm
+Fe9EAQAclgoswn/vAgAOGASAAPvABLqiAJ0AjRcPqgyI05wTjdKo+JgZf4sBsd2SHO0SCS7gBIAA
+9sAucJAPBQCSHPdALiCSAJ0AwCBtCFoKaDQDKQoISDSYkAMoCy2GAyyGAimSAAlmDAmqDA2YCOgW
+DyEQBQAA6YsHfmgEgAAtzAHs1AAH+AUAAO0SDyEMMQAA8mMAFeACBQD2wCrgkgCdAPdAKqCSAJ0A
+Y/+enBOSHAtdCwtaCoqgidON0g+qDKn5mRp/mwfiFgwm6AUAANzQ/CFIFeAPBQD+I+YV4AIFAPbA
+BQCSAJ0A/iQGFaAAzgAAACgSH+joCAKoBQAA6BYfIowxAAD7YwAV4AUFAAtcCwtaCoqgjcPswgIj
+DZuAAP9c8A3gDgUAamHHbQhOAykLAy8KCmg0CEg0CGYMCKoMmPCcki2WA+2PCAEQBQAA6PsHfmgE
+gAAtzAHs1AAHcAUAAOghDG/oBIAA8mMAFeACBQBkr3323/vQkgCdAGP/qgAALhIggxP2IYgVoAgF
+AJgQiBQmYhMrcBYuFhz4wQALMPn1AHmxGowY+ugwFafMAQD9n8AVoAkVAAycOVglfmSk/y0SH+mU
+rBae+YAAFZWUix0elKaNHoQWLRYS7NIRDu+CgAD4QABBfYQdAO7dCAolAoAA9IYACnarAQD8IgYV
+4AUFAPQjphXiy0EA4hYULmYCgAD9RgANMA8VAOQWGCPhIQAA7BYVLEUCgADyIKgVoLs5AOQWEy3d
+QoAA+wYADHAOBQD7KWYF4AUFAPsGAAwwPVUA6xYRI9FxAAD6IsYVoAQFAOgWGiPBgQAA6BYXIRNJ
+AADz4gAPMDxlAP+tAA4wAgUA/CMmFaAAPgAtEh/8oBlkYgCdAMDlDl4v5OJiYqgFAAAkTQEkTIAq
+cQcblH/yQAEGeqoBAOmVNx1XAoAAC6oCmkCPcPiARhXgSEUAmEP94AAXsAiFAAj/Ap9BjsAtCgT+
+6DAV4e4BAA7dDC4SGuwWGy/8AoAAD+4CH5Uw+CKoFeHdAQAtFh4P7gIuRgQuEhj9gAgVoA8FAC9F
+Ci5GBg3MCO2VPxZg8QAALEULLUYH6QMeAkCBAAAIAmH85UQV4AoFACpENfyFph3gCwUA+obmHeAI
+BQAoRDP+heYd4AkFAPiGhh3gDgUALkQu+COoFeAOBQD+hgYdoA8FAP6GJh3gCAUA+IZGHaALBQAr
+RDb6IsgV6N0dAC1ELPjq8BWvzAEACckI6RYdIlDxAAD4h2YdqIgdAPiHRh2oiB0A+IcmHaiIHQD4
+hwYdoAxFAFlNXekSFyJRAQAACSCICgSKCQCICgCKLHIcKxIf/IpmHajMHQD8ikYdqMwdAPyKJh2o
+zB0ALERQe1kz/CPIFeBOJQAudHQelTIqTEX6IGgd4d0BAP+mAA6wDpUA7nRlLu4CgAD8IAYV4Aw1
+AFlNQioSHC9xNQMrCygSGSh0V+2yAyf4BQAAL3U1LxIbHpT2LkYWjPAtRhksRheIf4nwi7IrRhiq
+mip2HI/wCWYMKhYc6P8IARAFAADvdg8hDDEAAPJjABXgAgUAGpQH+iPIFeAJVQAJWS8qRhrkuwgF
+4CEAACxGGypwdOq0dCzulgAALRIfBd0MLdwB97/uCVIAnQAoEhQvEhMvhp0rcBYuCv9+sQgqcEEs
+Eh1YJJ6MHCsSHJvLlseJcsSn6nQFJIi5gADRDwAuEh8tEhIPAgAF7gz/wCAVoApVAAruNg3uEe4W
+EyalNQAALxIUL/Ke/+AHo6IAnQAoEhAkEhQogr8kQp0IRAFkT6UpEhH8gGgd4AoFAOkABQdquYAA
+bQgP7QwABVAFAAD/X+okIgCdAGP/6RqTwYqo90AFoJIAnQArEhQrsp7/YAZLogCdACgSECQSFCiC
+vyRCnQhEAWRAtBuTtrCp+WEGFe/+egAAjh78ImYV4AwFAOwWHS93AoAAqe4uFhQpEhQoEhMolp0r
+cBYvCv9/sQgqcEEsEh1YJGKKHCqgE8ivixyMf4u2fLkHxMgsdAXRDwDE1i10BdEPAI2zLxYfjLL7
+YAgVr+tyAAD//7ANoAIFANpw6xILK+AEgABYHibRDwD//GwNoAQFAP4kJhWgCgUAWU+eGpOPiqgu
+EiH5X/nIkgCdAP/74A2gBAUAwEAck4jAugurNPuBBhXv+5oAhfSqVeXja31oBIAA9CBGFeAIBQD4
+ICYVoAUFAIgRjRLlXAEkQBEAAOgWASQkUQAA+2MAFeAJBQD4ICYV4AUFAIgRq4iIgK2ImBJ4686f
+F/3fyOriAJ0A/68AD7/kYgDRDwAAKXBBKZwS+CFmFe/4egAAAP//WA2gBQUAbBAIlBEnIgcmMQv4
+QPAV4EqFAPzighXgTGUA+ECwFaBLVQD22IAVoZkBAOVyCSaMSYAA+wARTSIAnQAoUBLIi+kWBSPQ
+QQAAWB0XiRWEUJUS9CBmFedEwQD0gBabH80FACgSAyiCCiowX/cAF9OiAJ0A7JNHHKgEgADkoU1j
+ON0AAAdHFLR39SAKghIAnQAak0MMmBGqiCqCnvdAH9PiAJ0AKIKdDJoKKqK/CogBFZRWmBDoFgQk
+FdmAAByTXwwAh215AggCYfSAHYsSAJ0ALTBfHJNCGZN96zBeLo1+AADD4/6ACxwiAJ0A9IALExIA
+nQCPEi/wE2TxXYQSjS+ERvyAHOViAJ0AZbF/wPCNEyjQB+4hBy/WAoAACogCmNEoIAcrIQj/QAAH
+MKgRAOzuEQ1SgoAACu4C+cYAD3GIAQDqEgQsTAKAAAm5AhuTYZ6gjiCcopumC5kC+UCGFeALBQCb
+pZun/cAAFzALRQDr7gIFYIEAAP9AJhWgOwUA66YDLsgEgAAJIIYMAmMJAIYMAmEdkwLrEgMsZwKA
+AK3MJ8adi7D6+AAF8DwlAHyxZdogWBfQ0Q8AAAD7AAXlIAUFAMDgLuASZe53Y/6BLzBeZf6w//rI
+DaAHRQAAABuS74q490AXYJIAnQAeku0MWBGuiC6CnvfAF/viAJ0AKIKdDF4KLuK/DogBZILtsK//
+YQYV7/p6ACYhFCMhEv7ZAA3gBAUA6lJCKdgEgAD8AAIdoA0VAFgaEihSQ+RMASGYBQAACDMudknb
+Y/9kZL6+YAA7AGS+t2AANAAAZL6vYAAsAAD9H+68IgCdAPsf7nxiAJ0AY/8/AAAAAAD9H/okIgCd
+APsf+eRiAJ0AY/8nLCAHihAekw/6QQQV4NwRAPWwABaxzAEA7t0CDmQCgAAMuwKdoB2Sy/xACBWg
+DwUA76YFI3BhAACeo+4SAyMg3QAA/UBGFeREHQDtk80eZgKAAAxMApyhDbsCm6QOBImWp52mCiCL
+LCAM5qYHLmQCgAAMuwLrpgQrYASAAOs8VCVQoQAAWUvXjhAZku7skrEaRwKAAPnAAEcwj5UA/iCG
+Fa/3igAAiieHEeyhFSu/AoAA5zcIBVCBAAANqgGqyuqsQCvABIAA+uAOmqIAnQD4IGYVr/QSAAAA
+AAAAAAD3AGgdr/QaAAAAjCJkwZr0n/HDEgCdAIcnLnkUJlK95OF9Y9CBAACFeSVQB8Cw7GQACugE
+gABYGi6HJ4l4+OKkFa/NBQDqcgsj2IEAAA20AaSI6IxALeAEgAD5QAtUYgCdAI0RLnkUDN0RrZqt
+7i51FPsAC1uiAJ0AyjOOEe+UAAcA+YAAbekFA0CGDwJljCeKsA8CAA8CAO2qCAZggQAA+UAOpCIA
+nQCasC36wIfAi8OOICjBBYoRDcIB4ogID3YCgAAOqgLqlgEkQQEAAPdgCDRiAJ0AL8kEDFkRqXoJ
+/wgvxQT7AApDogCdAMloBmMC73QAAoCZgABtWQUDYIYPAmcqwgAJqgj5QAu8IgCdAJrA0Q+KJ40R
+wMDqrCAu2ASAAFgZ85oS+iBmFa/w8gAA//BIDaAIBQB02xSPEg1ODO72Bi3u/gAA/hFiHe/xZgCK
+EgTYDOimBi3uVgAA/hGCHe/xEgAAAAD4IKYV4AoFAFlOPhuSL4q4iRUckiv5X+f4kgCdAP/u9A2g
+CAUAAMCAwMoMrDT9YQYVr+62AAAAAP/6FA2gBQUAAAArnBjqJAAJYASAAFgcr2P+UwAAAAAA/O8A
+DD/4tgD5QGgd4A4FAP7hZhWv+2YAwPCfw9EPAADphwwBgeGAAIwRB0oU7qwIKcAEgADuzDYM+ASA
+AG3JBQiAhg8CaY8Rpzjq/wwCUQEAAG35BQighgoCa4wnLMwgB94Mrk4u7ED/YAYVr/n6AOeLDAMB
+sYAAC0oU7awIK/gEgADtXTYLQASAANMPbdkFCMCGDwJtC2gI6l4MAVEBAABt6QUI4IYKAm8Lnwyv
+Ly/8QJ/A0Q8AAChMQPlgBhWv+K4AKSxAmcDRDwAAAAAAAGwQCBmS+ysxCicwRPxgiBXgLiUA7zBF
+KWAEgADygGgdoAoFAPUlXAWj3YEA4PYRB+AegAB6/3KMMo8z8YAWC1IAnQDxgBXLEgCdABuR2Suy
+NiiSWq+76hYALd5CgACriJgRZHL6HJKUDGwBdMk2KjA8aKEz9UARAZIAnQBopVX1QBFrkgCdAH6h
+HcLTfakY6hIBKdgEgADsJAAK6ASAAFkHA9EPAHlmF9EPGJH0LzEn+eAGTCIAnQD6IAYVr/6aAOoS
+ASnYBIAA7CQACugEgABYBD/RD40RKdAFxKZ6mciJ1yuZFGSx4IuZL9BoGZKVLLAH6rAVJ/gFAAD/
+rQYd4A4VAP+rhh2gCIUAKNRnKNRk+aVEHeAIBQAo1Gb5rKYdoCnVAP5p0BWhqiEA7zBPJVNJAAD5
+pqQdoCjlAOqYOA92AoAAD+4C+armHaBPFQAv1HQu1TcusBX+zgAPMAo1AH6gBSmwFCnUYO4yFS7Q
+BIAA7zIWKugEgABb/DvRDy8wPGj2YX7xXpoQ7tE3IcjxAADpAx4GwXEAAAgCYe8xJibZdQAA79U2
+INAhAAD/puQdoAw1AFlKsIsRwMPqvF0l2YUAAFlKrIoRKxwIDwIA+0wgFaAMNQBZSqf+6JwN4C4l
+AGABfAAAL8AE9eAHcxIAnQAakooN3AkMzBGsqiqif2Supow2+2AABvjMQQAvoRkPD0t/2Q6Lqsi5
+KLE/fIELi7llv/SKqWWv4tEPirqbFOoWACUBWYAAKzxBmxMqrE76IGgV4Aw1AFkKhvFIMA3gLiUA
+ihCKqOoWAC1/FgAAixRkvkUdkmMt0X/sMDwm+ByAAGjGf37BcY0ULdEI6hIEINgRAADsNAAK8ASA
+AFgEbY0RZd70Y/4RAADqEgEp2ASAAOwkAAroBIAAWQaA0Q8AAADqEgEp2ASAAOwkAAroBIAAW/3R
+0Q8AAAD/+HQNoAsFAI8Q/iCGFe/+HgCaEJwR/YBoHe/6mgAAAH3Xivx/4h3v/jIAKLAE9R/7yhIA
+nQDRDxmSPNMP0w8pkX8PAgDxP+y/kgCdAOoWACHggQAA6tQACOgEgABZCx7tpAANAk4AACowPCsK
+gftf63ViAJ0AihBkrWTbMO0WASlgBIAA/KBoHeCORQBZCk7RDwAAAAAAAOoSASnYBIAA7CQACugE
+gABZCTTRD8Li+iAmFa/zngAAbBAIKTEPHZFKKjAs6zAtLKPmAAAfkZPskQYdVgKAAAuqAv9Ghg3v
+/rUAG5Ic+0AFLGIAnQAckhodkeL9QBZMIgCdAP1AGExiAJ0AHpIW/0AU9CIAnQDAINEPizQowjz3
+sQgVo6uBAO2nB31IBIAADqkBqYgJiBGoZvNgFRpSAJ0AKzA39WAXAJIAnQD9eMADUBkVAHm5viow
+QiswQwiqEftGAA1wSzUAe6mqKzBELDBFCLsR/WYADbBMRQB8uZbqJAAJ2ASAAOxEAAroBIAAWOvq
+wCDRD4s0KTAuKjAv0w/oMDAszgKAAPsmAAyzq4EA6JEMbRAEgAD5P/rTUgCdACkwMQiIEQmIAv8f
++k1iAJ0AJTA0KDA1CFURCFUCaFEH+L/5kVIAnQAnMEYvMEcYkWnkMEgrvgKAAA93Au8wSSu+AoAA
+BHcC6ZHYG74CgAAPdwIIeAH5H/fsYgCdABiReBmQ/gh4Afkf92RiAJ0AfacCDqIBKMI8JNKIoogJ
+iBGoRPNgEipSAJ0AFpEzHJHIKTA+jkcvMDwoMD2O7u4WBC/+AoAACP8C6DA/L/4CgAAJ/wL/1+gV
+oApVAPYgBhXgOwUA5RYBL/4CgADo/wIJaASAAFlQBCswRiwwR4UU7TBILd4CgAAMuwLsMEkt3gKA
+AA27Agi7Eey7AgrQBIAAWOr6ZK5RKlKo9UALyRIAnQD1QAuJkgCdACswPCwwPe0wPi3eAoAADLsC
+7DA/Ld4CgAANuwIIuxEMuwIoMDUvMDSbECUwRicwR+yRmhloBIAA6TBIKq4CgAD2pgAK8ApVAOcw
+SSquAoAA6VUCD/4CgADo/wIKrgKAAOdVAgtwBIAA9CAmFeA7BQBZT9cpMDQqMDUImREKmQL1IAyI
+kgCdAPk/7aFSAJ0AHpGDLUEbLDA9KzA8/6AEBrvmAQAO3QLuMD4t3gKAAAy7AuwwPy3eAoAA7rsC
+ClAEgAD9YAAVv90BAOy7AgHg2QAAWOphwCDRDwDqJAAJ2ASAAOxEAAroBIAAWQv9wCDRDwDqJAAJ
+2ASAAOxEAAroBIAAWQqcwCDRDwDrMQorUASAAFjrpfgAIh2gCQUA+wIADLAPBQAJjzjqpjkP6f4A
+AGP9DAAAAAAAAADqJAAJ2ASAAOxEAAroBIAAW/5HwCDRDwCNYC5gOf5oUBXgClUA/SKgBaA7BQBZ
+T5nAINEPKzA8LTA9LFKS7jA+Ld4CgAANuwLtMD8t3gKAAA67Agi7EQ27Avuf9GViAJ0AaKMEwMMs
+VqjApf0igAWgOwUAWU+IwCDRDyYxCupEAAtYBIAAWOt6/gAiHaAPBQD7wgAPsA0FAA/tOOqkOQbj
+OYAAKTA1JzBGKDBHKjBI5TA0K74CgAAIdwLoMEkrvgKAAOp3AgquAoAA6VUCC74CgAD45gALv/Wa
+AAAvMD0sMDwtMEYoMEfuMEguZgKAAO/MAg7uAoAACN0CLzBJ6DA+Lu4CgADu3QIKUASAAO4wPy5m
+AoAA6MwCDu4CgAD/pgAO8AslAO88Ni5mAoAA7swCD/AEgABY6jzAINEPH5ENIvF+LvJAKfV/CSIC
+4vV+J3AFAAD/6AYVoAIFANEPAAAAbBAMiSfukCcZOASAAONyBynYBIAAKJkUjJniMgkq0ASAAO8x
+FSQAOYAAYAABwMAtcAcpwRf4YoIVoV0BAPigABYw3REA7JkCDuqCgAAO3QIckBadoP7gCBWgPQUA
+naOcpgyZAhyP1Jmk/cAAFzAJRQAJ7gL9QEYVoAkFAOmmBSHggQAA/0AmFa/OBQAOzgHu/QgEQ0EA
+AOg1FCbpAQAA/EAI6uIAnQDvLDAoyASAAP+gCMPiAJ0AAkCGCQJlAiCGCQJjAgCGCQJhgsEiLDD8
+QAm8YgCdAJLBKMkE2RDkgHxlGIEAAOkTHgngBIAADAJpCWCGDAJnjazH6A7dAZ2sLnAs7KIKLf0C
+gAAP7gIO3QKdrOx2HCJb/QAA7aIJLd8CgAD7QABF8AkFAOwWDCXYgQAA6xYNJoUKgADpFg4ugtoA
+AIsxCGwRDLsCmzEakFTpTwgKxwKAAKqIn4DRD8Dw78UEJ2kBAAD9gCYV4AIFAP2ABhXv/coAANpw
+W6oQiDGLHewSDC1IBIAA6hYOLW8CgADtuwgEfW2AANpwW6nXjh6PMe6uCAtGAoAACP8CnzEYkDvu
+TggK/wKAAKj/nvDRDw8iDPJhJhWv+4IAAt0M+CBoHeT9HQBt+QUCoIYJAmvxoABBcAM1AOnsQCec
+QQAADzgMbYkFCcCGAgJtDeIMIixw84AmFa/7TgAi7EDzgCYVr/siAGwQBiQwBxmPVBWPVfkwEBXh
+RAEA649QGlcCgAClquiiniTI3QAA+oABBnSZHQDswr8kyCEAAPkABdPiAJ0AKaKdDJkB65QABIWh
+gAAdj2wNAIcJAmEJAmEJAmEJAmEJAmEYkGf5IGgF4AwVAPpACBWgDgUA/iAmFaANBQD4IAYV4A8F
+APggRhWgDjUAWBsxKDEHGY9A/yC2BeqIAQDrj0AcRwKAAAmIApig/kAIFaANFQD9QyYd4BwFAJyj
+m6Lv7wIPdgKAAP9AhhXgDyUAD+4CnqEMSRH1IABE8AhVAPkzphWgD3UA7yQEJRCBAADRDwAAAAD/
+/TANoAkFANKQ0Q9sEAgdjxYvIAeM2BSPFfeAC9CR/wEAKUKuG48SZJGeK7J/KkKtC6oBZKGUsMyc
+2O6PCh1IBIAA8VdADeAGFQAn4IDV8OqPBBO43QAA+CCGFeR3HQDs+REDuFkAAPXgB6ISAJ0ApJQo
+Qp73AAz74gCdAAr7CiuyvypCnQuqAeekAAUKYYAAiSfAYCYkdiyZFO0gFCYAOYAAJpIJj2Gv3Q0N
+Ry0kFPWgCmZSAJ0AFJAXGY8tKGEXimn8wQgVoAsFACvmMuzmMy1aAoAA+8cmFeiqHQAq5jgJiAL5
+x+YVr4iNAOjmPiIp4QAAKEKCijAuQn8tQoQvQoMpQoHpFgEr2ASAAPwgBhXgDBUA+CBGFaANBQBY
+GtDkTBgtWASAAOVJyH04BIAAjmT6QGgdoB8FAP/GAA9wHDUA7mYELegEgAD6YAgV4A4FAFv+6dKg
+0Q8AAAAAAAAA94AF4JIAnQAMWRGklChCngpbCiuyv/cABnPiAJ0AKkKdC6oB5KDCZkP9AAD5oQYV
+r/vmAAAAAAD+IKYV4AoFAFlKwB2OsYzYjxX5n/OgkgCdAP/6FA2gCgUAAIkiZJCa9k7GHaACBQDR
+D8CgwLoLzDT9oQYVr/maAIwi7xYFLn8OAAAr/BjqJAAJYASAAFgZL/ZOxh2gAgUA0Q8AAAAAAOsS
+BClQBIAAW6eh/x0sBa/6pgAAAAAAAP/5tA2gCgUA/iCmFeAKBQBZSp4djo8ejo2M2I8VGo6K+Z/5
+YJIAnQD/+RQNoAoFAMCgwIoIyDT5oQYVr/jaAAAAAADaIPxAaB2gG8UAWBkR9k7GHaACBQDRDwAA
+bBAKiScbjnskIAcomRQWj6XzHPIF4UQBAOqyCCQRuYAAh5kscgElcQr0IMYV4AUFACUmGfdAEuCQ
+D6UAKDKu7mJoJBQ5gAAtMq0O3QFk0nuwqpq46dQABpL5gAAfjmUv8IDeQO2OYhf43QAA+CCGFeT/
+HQDsSREH+J0AAPSADuISAJ0Ao5MoMp7/ABT74gCdACMynQ1ICiiCvwgzAWQyNikgFKyZCQlHKSQU
+9SASblIAnQDAolkMGWWiUPQgphWgCgUAWQvyFI92K3IJFY92Fo92GY5HJVKW6GHQLeICgAD9JyYV
+qLsdAOuWOCMwFwAAJmI2G46CCKgIKnEX+MAAQzAIBQDoljIrNkKAAKZVC6oC+yfmFa+qjQAqlj6K
+eCqWMyUmGeJWCCSyEQAAKEKCilAuQn8tQoQvQoMpQoHpFgEp2ASAAPwgBhXgDBUA+CBGFaANBQBY
+GiUkTBjmSc19GASAACwhB4QVHY4x8xxmBerMAQDocQouZwKAAA3MApyg/qAIFaANBQCdq52q/UDG
+Fe//9QCfqZ+on6f/HOoF4AlFAOOmAi8uAoAA6VUCD3eCgAAP7gIfjz2VoZ6kD08C/0CmFeAvhQCf
+o4l3i3YvphMtphYtphctphgtphktphotphstphwtph0jphIuphQsphAlphHljy8d5gKAAP0GAAw3
+u8EA+yYADPAOBQDppgwlGAcAAOimDSGaAQAA9IYACnAsRQD1QqYVoAUFACUkd410+kBoHaAfBQD/
+pgAO8AsFAO12BCnoBIAAW/4O0qDRDwAAAAD/9ywNoAcFAPdABqiSAJ0ADOkRo5MoMp7/AAeT4gCd
+AA3vCi/yvy0ynQ/dAeTQ4GVD/QAAmLjzoGgd7/g+AAAA7BYJKtAEgABZSeQbjdWKuIwZ+V/skJAP
+pQD/9ogNoA0FAACJImSQtMCh+k7mHaACBQDRDwAAwNAPqjT7YQYVr/YGAIsiZb/fK0wY6iQACWAE
+gABYGFTAwfxO5h2gAgUA0Q8AAAAAAADrEgQpUASAAFumxWP9qAAA/R3UBaAKRQD8IMgV4CvlAFlN
+JsDE/hECHa/8HgAAAAD/9bQNoAMFAACfF5QY/CEmFaAKBQBZSbsbjayMGY8XirgdjaeOGPlf+HCS
+AJ0A//ywDaANBQDA0MDqDq40/2EGFa/8dgDaIPxAaB2gG8UAWBgvwKH6TuYdoAIFANEPAABsEASG
+MMSC+BCCHeA35QD2+AADMDQFAPTHpg2gOjUA90EuDaA8dQDDsXtqCveHLg2gPVUAfWIxIiAFdyFK
++EjmDaA+1QD+RAYNoI9VAP5hBB3gAhUA0Q8AIiAFdyEO+EFmDaAk1QB0IQPAINEPKDAw/R6gAtP7
+9QAqMQj7QmYN4AIVACk1CNEP+GEEHeACFQDRD8Ah0Q8AAGwQBCswPC8xCyYgB/xByBXvxwUA6iIA
+J+MRAAD1YA0okWYBAB6Of/lgDatQOdUAK+Ja7o1oHsZCgACou+iwBSe4TQAA741hG28CgACu3fkA
+DbVkdx0AKdKe9yAN2+IAnQAt0p0PaAoogr8I3QFl0HOJImSRPgUKR/lACbFSAJ0AjieM6PvCpBXv
+wgUA7+ILJ2iBAAAC0gGiu+jpFCXZAQAA/eAL3CIAnQAMTxGvyq+IKOUU+2ALi6IAnQDpxAABgMmA
+AMlBbUkFAwCGCQJhitAPAgAPAgCvqvtADGRiAJ0AmtDRDyggBykhBx6NhvlAAATw+BEA6v8QDM8C
+gAAPmQIOmQIusQj+QQQdoYgBAOnWACxEAoAA6O4CDVYCgAD+QAgV7+kVAOnUGCZI/QAA+WPoFaSZ
+HQAKmQLo1gsv/gKAAA9/Ap/RL7Iemdks1Q8bjlHv1gomQMEAAJjTH45PC+sCHo0sD88Cm9T/oQYV
+4AsFAOvWBSbRAQAA7tYCIdlRAABZRkgejRSLJwxtEf+gAEa/zAUA59adJdCBAAD9QAQFMAwFAOy1
+FCVRAQAAmrmauNEP0Q8rbBjqJAAJYASAAFgXlWP+r4gnL4wg9+AEB/AJBQDphRQn+QEAAJ+Jn4jR
+D8KCeLnfKeF/fZfZ6zQACmAEgAD8oGgd4/r1AOolCClQBIAAWPYE0Q/FteskBSlQBIAAWBHG0Q8A
+//lEDaANBQDAwJzr0Q8AAOy7DAGBcYAAC0kUuJ7uTjYJ0ASAAG3pBQoghgwCYwlIDOs5CAFRAQAA
+bYkFCUCGCgJlC/kMqSkpnECZ0NEPAAAqLECa0NEPAGwQGP8cFAXgBQUAlRCVESzyfycgB+ZCACtQ
+BIAALsEC5TYAKkAEgAD0gPAVoXcBAPXQwA3nZsEAK8EEI8EF7sIAJ2v9AADqFhIl2/0AAO3FAi3f
+AoAA6+4ICZ8CgADzzwAPcADqAAAAAAAAKcEFKsEE7sIAJMgFAAD9X+AV75kBAOnFBS7vAoAA+yAU
+rCIAnQDt7ggM3wKAAAvuDA4AhwWVYO4ABwTzF4AAKsEFHI037sIRLVZCgACqmfgkBhXvmQEA6sIP
+JyP5gACNoYugm9COoJ3hlaCVoSvCEbC7K8YR9UAkRBIAnQD1QgQd78MFAPxACBXlTwUA76URJXBh
+AAAD7gHuFh8ncQEAAC4WGp6n7qYGJRv/AAAtNj70wBBzEgCdACoWJCgWEykgBCsSICsVBPUgHcIS
+AJ0A+E+QFeA8BQD8wBZ0IgCdAB2Mho8Q7xYeK+cCgADvEgEr8ASAAPTgEPoSAJ0Arcwrwp73YCpB
+0gCdABuMeSzCnQt7CiuyvwvMAeuMhRYHyYAAJBYmJCEH+iSGFapEAQDjFiUqJwKAAAtEApTAgyD4
+ImYVoCsFAPIjZhXgBDUA68YDKZ4CgAAEMwKTwRSMdyMSJZTCKyAEJBImKxYc9WATdBIAnQAiFicS
+jZMJmwkMuxELIggiIX8rEhwiFh0iEif1YBAqkgCdACsiEisWESkgTCkWEBmNiQl5AisSHvmAhhXo
+Wx0A9YFEHee7wQD75gAN8AUFACXGBivGBxWNgSsSEevGCivfgoAABbsCK8YJKxIdJREE5cULLd8C
+gAArxgglIAcFJUDysAASt/v1AAtVAiXGCwzrEf1gAEXwBTUA9XOmFeAFBQDpEh8mGSGAAB6NbR2M
+PxuNbAd8Ce8xkS5nAoAAq8uu3S6yf63MLTJJmuAsNkAuNkEqtn8sMkap/+0WGSf5AQAA/aAcZCIA
+nQAtOZAMThEOyggO3QgtNZD74BwrogCdAOnEAAQAqYAAyE1tSQUIAIYJAmEqMkYOqgj/QB10YgCd
+ACo2RikSIPTABvMfmQEAmcuKIAiqEQpKAvuAJhWgAgUA0Q8lxQX/9aANoAkFAByMQyuBJ/1/8J0i
+AJ0AKhYkKBYTLCAELRIgLRUE9YAgOpIAnQApFhQqFiQoFhP1gA46EgCdACsSE7Qa+2ggFeAMNQBZ
+RTAoEhMqEiT4IogV7/c2AAAbi/cqFiSLuCgWEysWFfdgGfiSAJ0ADOwRrcwrwp73YBth0gCdABuL
+7CIWJyLCnQvrCiuyvwsiASIWFiISJysSFiwSFesWFyWagYAAG4vk4hYnJhP9AACSuCISJ/wi6BWv
+9oYAAAAIbhAOngKewI0gCN0RDU0C/YAmFeACBQDRDysiEysWESkgUPgiBhXv9/oAACgWEyyAGCkW
+FCoWJPOAB5fSAJ0AKxITtBr7Y6AV4Aw1AFlE/ygSEyoSJPgiiBXv9CIAAAAYjP8sFiMZjE8vFiEu
+FiIvEhvuIRcg0EEAAJWplaiVp5WmlaWVpJWjlaKVoSmS8JWg/sAABjDeOQD57wAP8u5BAOj/Ag92
+QoAA7swCDuwCgAANzAL+IwYV4A0VAJ0U7BYGINkBAABYDstloNMcjOX8IggV4ApVAP4iKBWgOyUA
+WUsXKBITKhIkLBIjHYukLhIiLxIh+CMIFeALBQD6I6YV7/SuAAAA2hD6SiAV4Aw1AFlEzrQa+knA
+FeAMNQBZRMsoEhMqEiT4SrAV7/DiANoQ+wMgFeAMNQBZRMRj/wHaEPpKIBXgDDUAWUTALCBV/CKG
+Fa/4pgAAACIKiNEPKsISi6GNoJ2w7KIALnAEgACbwZWglaEt4hSw3S3mFPlf3ARSAJ0AKxIg++/o
+FaAMBQD74AAF8A0VAFgSsSIKiNEPAMCl/RlgBaA7JQBZSuTApf0ZXAWgOyUAWUrhKBITKhIkHYyr
+B3wJ7MwRBrv7AACnx63MLRIS9aAH+ZIAnQAtcoGa0C02QSw2QCp2gSoSHy8xkSwyRikySar/L/xA
+/SAMLCIAnQArOZAMThEM6ggOuwgrNZD74AvLogCdAMmJ6cQAAgC5gABtSQUIIIYJAmMqMkbTDw8C
+AK6q/0AM9GIAnQAqNkYqcoKLoi0SIC01iePEAAWHwYAAjiAI7hEOTgL/gCYVoAIFANEPJTZJ/aBo
+Ha/ysgAAAAAAAOz9DAQBmYAADU8U6/wILEgEgADrSzYOUASAANMPbbkFCUCGCgJlrYgpEhoPSgxt
+qQUIYIYJAmcrEh8N7wyvuyu8QPpoxhXv8XYAKBIa+GjGFa/xSgAAAAD/6xwNoAwFAClygJqRLDZB
+KTZA+vAGFa/8EgAvFiEnFiL4IoYV4AoFAFlHLigSEyoSJCkSFBuLHB2LHS4SIou4LxIhKxYV+X/k
+sJIAnQDAwPwi5hWv80oAwLD6IsYV7/KqABuLEfIk5hWgAqUAAsI0krjyJOgVr/LCACugBwsLQeu8
+GC1gBIAAWBWYjCAIzBEMTAL8YCYVoAIFANEP2hD6SQAV4Aw1AFlENS0gfPwihhXv7+oA3JD0aSYV
+7/riAADs/QwEAZmAAA1PFOv8CCxIBIAA60s2DlAEgADTD225BQmAhgoCaa2IKRIaD0oMbakFCKCG
+CQJrKxIfDe8Mr7srvED6aMYV7/m2ACgSGvhoxhWv+YoAAAAAbBAGHIwhjSD+QEgVp1UBAP6/wBXg
+AxUA/m0AD/AKVQDyQwgV4DsFAFlKSooix43oqAEFeECAAPhARhWgAGIAAAAAAMisWUlA66QACVAE
+gABYGqUkIAfaIPQgAAIwC4UA7RQACmAEgABYHfzxTzAN78YFAB2MBowgDcwCnKAbi4+MPugSACpP
+AoAAC5kI6JYAJgB5gADrMhApUASAAAvAAIon/Rf2BaAEBQD/FqYFr/j1AOSgQ2V4gQAAJKUUBv8B
+6KYAJ/kBAACfqJ+p5CYHJVghAAD7wASLogCdAC7CfR2LSJvhnaMpwn2ZoijCf+vGfSRABQAAKMZ/
+lC6ULyQmECQmESQmEiQmEyQmFCQmFSQmFiQmFyQmGCQmGSQmGiQmG/0XuAWgClUA+gYCHeA9hQBZ
+SggkJAQkJAWUIiQkICQkISQkIiQkI5QplCqUK5QsJCUa5CUbKdAEgABZCcHAINEPaFIowCDRDy3C
+gOvWASZICwAAmaMowoCYoi/CguvGgCf4BQAA/5BGFe/9vgCLJy+5FIq5Lrwg5u4BB/hBAADvtRQl
+U8EAAOq2CSdxAQAAfqssKLEVHIqJqoiYuZyAiSD/F2oF4AwVAO+GAizOAoAADJkC+QAmFeACBQDR
+DwAAHIp/nKCLIPkXWAXgDBUA6aYCLd4CgAAMuwL7QCYV4AIFANEPbBAKjDUai5j/F0gFq4xBAAiI
+CemKaBxHAoAAro4u4n+qmamI+cAhdC8bBQCK4Y/gn6CN4KvrKekQ+6AmFaAKBQD7wAYVp8wBAOrm
+ASSOuYAAheePUBmLkYdb9qAoFadPwQDti48SG+kAAAP3OPM+qBXohh0ADYgB6YuLHEZCgACoMyix
+gQYGR++LiBdr4QAA+QANhG93AQCeGC0WBesWBC4gHgAAHotN9IAMAxIAnQAoUQiYEhmKXYwg7LY6
+IVkhAACbFp0n6QAFAUiBAADpDAABaTkAAAkCYQkCYQkCYQkCYQkCYSgwBPUAI4KSAJ0AiDAr4los
+MhYvMSIvJSIsJg3oJg4uZkKAAAy7COsWBy7QBIAA+W+QFeAMZQDpJEEl2bEAAFlDTosXihb7bkAV
+4AxlAFlDSyosYfpqIBXgDDUAWUNHKixd+mnAFeAMNQBZQ0SNOfggSBXgS/UA/EFmFeAMBQDsJgwm
+gDmAACLWDJI5HItNLTEHjiAqwkMoMBbvMAcvdgKAAO5uAgVQBQAAKsZDLDANKjAMKSUIKyQFKiQM
+LCQNLSUHLyQH+ELGHaAPBQD+QEYV4AhlACgkBJ5RJyUJ9IARMxA7BQD6gAZ0YDw1APWFTg2gPRUA
+/IRODeA+5QAqMAUnJTb/QBTEIE8lAP9AFIRgONUA+UAeBSIAnQAYifoISAooghDqJAAK2ASAAPzA
+aB2gDSUAC4AAwCDRDwAAAAD1QGgd7/iuACnhf/E/8+9SAJ0ALDr//CBGFa/53gAAACjyQ+q1gSRD
+/QAA6PZDJgPxgAAZimf9IBvz4gCdAByLDonK7pYBJkChAAAotj2Nyi22PIrM7sYKJVAFAACazOry
+RCvYBIAA/AACHaANFQBYEPfAINEPAAAqMAQnJTb1QA3SEgCdANow61QACWAEgABb/Btkr0XqJAAK
+2ASAAPzAaB2gDSUAWQeDwCDRDxyJ1o4gLrY6nSfsAAUBSIEAAAkCYQkCYQkCYQkCYQkCYQkCYSgw
+BCksSOkWBiEhOQAA9QAX+pIAnQAtMSIbiuMsMhaOMCuy9Z4uLCYN7SUiLmZCgAAMuwgrFgfssHwv
+qASAAOwkQSpQBIAA+22AFeAMZQBZQsaLF4oW+25AFeAMZQBZQsMqLGH6aiAV4Aw1AFlCvyosXfpp
+wBXgDDUAWUK8jTn8QWYV4AwFAOwmDCaAMYAAktySOSgwBykxCS9SQysxBywwDS0wDPxBhh3gDmUA
+LiQELCQN+kDkHeP69QAqJQjpJQkn+AUAAC9WQygkBy8wFv5Cxh3gTvUA/kCmHaANBQCdIuclCSlQ
+BIAAWA5CwCDRDwAAAAAAAADnJTci0PEAAOoDHgFJcQAA+ACoHeAMNQDoUSYhGXUAAOclNynYBIAA
+6CU2INARAABZQpAvIGEuIGIuNAHvNAAg2BEAAPxMcBXgDDUA7TQCIVGFAABZQofqJAAK2ASAAPzA
+aB2gDSUAW/vawCDRDwAAAAAAACpcGfpqIBXgDDUAWUJ9Klwd+mnAFeAMNQBZQnlj/ioAAAAAAOok
+AArYBIAA/MBoHaCIRQD4oQQdoA0lAFkHDsAg0Q8AKPJD5fK8LxAEgAD7wwAVoAsFAOiM/ytoBIAA
+6PZDKuAEgABYEOGKFRmJyg8CAPsgDDuiAJ0AHIpwiMouEgTihgEmeKEAAC/mPS3CCi3mPCvCDOLG
+CiXYBQAAK8YM4oppGdAEgADrFAAK4ASAAPwAAh3gDiUAW/xE++AABLCNhQB9mRxoRhkqUQgrOv8P
+AgB7oQ0DOgLrVAALYASAAFkIDuoiRCvYBIAA/AACHaANFQBYEEbAINEPAB+J8IgwnRMuMSktMHwu
+JSL8SCYd4AxlAOgmDS3QBIAA7yYOIdnJAABZQjaKE/ptgBXgDGUAWUIzjTv8QWYV4AkFAA8CAOkm
+DCaAOYAAItYM+CBIFeBL9QDyYWYVr+7mAOokAAtgBIAA+hCiHeANJQDrVQgq2ASAAFkGwMAg0Q8A
+HYowit3upgEmyNEAACm2PYjdKLY8jN/u1g0mYAUAAP2h5hWv8hIAAAAAKzB8HYnELDEpjjDuJg0v
+qASAAOwlIizQBIAA/EHGFeAMZQDrJEEh2ckAAFlCC9pA+m2AFeAMZQBZQgiNO/xBZhXgDwUA7yYM
+JoAxgACS3PJhZhWv9L4AGYoPjZ2LFOLWASTg0QAALLY9ip0qtjyIn+KWDSRABQAA+SHmFa/5/gAA
+AGwQBIo1/RJYBaGaoQDriMEUidmAAPUgC9iSAJ0A9SAImRIAnQD5IAS50gCdACiyRPWQiBXrmkEA
+qYgJiBGoVYhSx575AAQEd6oBAOhWAiUCqYAA/U2gAdAbZQB7qUWJVyyZFIOZZMBzHInvLzIELTEK
+/mEIFaAYBQD55gAPsAolAP5ghhXgK+UAWUgP6lQACdgEgAD8YPAVoA1VAFgCV8Ag0Q8A4lYZKtAE
+gADlJggpWASAAFv5fIsoyKOJsmSQU8Ag0Q8aidkqoX7AwfFBoA3gAwUA2lBb+g5j/9r//iANoAMF
+AAAAAAAAAIlXLFR4K5kU41YZJYAxgACDmfqgaB2gDTUA7DAHKdgEgABYAjtj/6QAACywB9qw/IBo
+HeG8AQD7YwAV4AwVAFgZqcAg0Q8AAAAA6iQACdgEgADsRAAK6ASAAFv+DMAg0Q8AKLJE9ZCIFeua
+QQCpiAmIEahViVceiJWMNC2ZFO7MAQaCAYAAi5kqtBuctyxQBuzM/yrQBIAA/KDGHaALFQBbo5/A
+INEPAAAA6iQACdgEgADsRAAK6ASAAFkIRsAg0Q8A//8IDaALBQBsEEgbiLwlFoPjIAcpyASAACqS
+AOgSgyI7/QAAJxaE66oBDKgEgAD6MKYVp4gBAPUACskRMwEAKSICKhKEKxKF7IhEHJDuAADmiEMV
+UA0AAOunOQnPAoAA6og8E/ANAAD0YAzSEA2lAAaZCCuSnv9gErOiAJ0AK5KdCj4KLuK/DrsB6xaC
+JZBRgACIyPcAEMCSAJ0AKWKuGogwZJHIKqJ/KWKtCpsB+yAN9iIAnQCwjZ3I+yAN7iIAnQAuIBSk
+7g4ORy4kFPXAD6ZSAJ0A6FwQIgxVAADqTP8oyASAAG2pBQgAhgkCYSIWgOsUAADQCwAAWUAK2KDq
+FoYlCfGAAMCj6xQADGAEgABZRe0rEoXTDw8CAMm56xKCKVAEgADtdAAC4CEAAFgT6/tAaB3gABIA
+6EEXaMAEgADqTP8tyASAANMPbakFCACGCQJhLBKE7VIDLmcCgACsu+xSAilQBIAAWBOk3UDqIgcp
+5wKAAObMCAPYDQAA68adKlgEgAD7RAAVoAwFAFgPotKg0Q+GJ4Vo+sKkFe/NBQDoYgsjYIEAAA3N
+Aa277RaBJdkBAAD1AAj8YgCdAC5pFAxNEaXare4uZRT7YAnTogCdAMmayUjolAAKyASAAG1JBQgA
+hgkCYSrCAA8CAA2qCPtAC6RiAJ0AmsDZUPUgaB3v+P4AAACIyPcABuCSAJ0ADDkRppkrkp6zfv9g
+CduiAJ0AK5KdCj4KLuK/DrsBZLEpsI+fyOsWgi3yzgAAYABXiBAZiQ/8MGgV54jBAAmICiiCnCoS
+gOwQByjYBIAAC4AA+DDIFa/6hgDAINEPAMCwDYk06cYILfJeAAD6QGgdoBvFAPwAAh2gDRUAWBjm
+wCDRDwAAAAAAAOs8GClQBIAA/OBgFeAMBQBYGN7AINEPAMCgWUO4HIeoiMj5H+7wkA2lAGP/tdog
+W6CuY/4HAAAA//bYDaALBQD5AGgd4AoFAPrBZhWv/GIAwKBZQ6och5qIyBqHl/kf+LiQDaUA//zQ
+DaALBQAAAADluwwEgdGAAAtPFO78CCzABIAA7k42CtAEgADTD23pBQgAhgoCYauYKRKB0w/vSgwE
+yQEAAG2pBQgghgkCYyoSgQveDK6qKqxA+4AGFa/6lgDAsA2PNP+BBhXv+04AAAAoEoEojED5gAYV
+r/oiAAAAbBAGJiBy+kCwFaAIhQD4xgALMAQFAPZORh2gFUUA9UAHRG/GBQD3ETQF4BMlAPpmNg2g
+BbUAc6Fn9UAM3ZADlQB1oXn1QAR0kgCdAHOpW4kiZZBWwKgqJAXwATgNoAqFAAAA2iBYsb36QGgd
+oAsFAFgVHRyHX40gIyQFLMI4K3KWrcwJzBGsuy2yByzcIAbMAeTVFCZhAQAALNYJnNgktAWNItMP
+ZNF3KiAFwOn/QPYNr/JVANEPANJA0Q8AAI8iZf/nAioCW7jOZa/bwIr4QKYdoAqlAIkiZZ/P2iBb
+uKdlr8QsIAaLIvJAph3gDRUA7bsCBmAFAAD8QMYdoAqVAPpARhXv/p4AAACJJyiZFMCw7pwgJPjB
+AADtkgkkB9mAAIPw7zcMAZshAAD2bQAN8BdlAObjAQaDSYAAiODTDw8CAH2BWizQAPWABiRgGVUA
++YAF5GIAnQD3gAWkYBiFAPmABWQgGZUA+YAFJGAYpQD5gATkIgCdACzQBynhBZkQ45kIDmcCgADs
+3QgEyQEAAOnbOX7gBIAA7cQADnz+AADxYcAN4C3VACywAH3BYY6+wLDu+AwHcyEAAAjrOWW/5y8g
+TtxA/u0ADnABHgCMEP2vAA4//xYAAI0iZd7N2iBbuLJlrsIvIAaOIsCc+ECmHeAIFQDo7gIH+AUA
+AP5Axh3gCsUA/kBGFa/6jgAAAAAA/E4mHa/4SgD8gGgd7/wWAPpAaB2gCzUAWUMN5qCxbRgEgAAW
+huuKaPdABeiSAJ0AE4bpKzKudbNsLXJoLDKtDcsBfcBisK6eaH3AaNog/EEkFaANBQD+H+Id4A4F
+AFixDPxEZBWgDQUA+0BoHeAOFQD6QGgdoA8lAFixBSU2rSggBo8iwaH6QKYdoAkVAOn/AgRABQAA
++EDGHaAaFQD+QEYV7/fmAMCwwMoMrDTsZggt/N4AAPpAaB2gG8UA/AAiHaANtQBYF/Vj/cwAAAAA
+APpAaB2gG8UA/AAiHaAtBQBYF+5lPbFj/5XAoFlCyIpo+V/54JIAnQBj/7kAbBAEGof/hj8Uh02J
+Pplg+GHIFaAHBQDimwwEyyEAAAuXOfcAJhWgBQUAlT/lNg4rkASAAONDJHGw4QAALqJ9HYfxluGd
+PyyifZw+K6J/5qZ9JdgFAAArpn/RDwAoooDmhgElIAsAAJQ/IqKAkj4vooLmpoAn+AUAAO+mgiuQ
+BIAA0Q8AbBAEiiLHjf9BYAeTmpEACKgBmCLRD8ieWUT726DsIgIpUASAAFlCXdEPAABsEASJJ4ic
+9ARiHeAmRQDzJgAVoAsFAOKJDARDIQAA+Q0ADfAjlQDxY7AN4CS1AGAAEYq+KwoA6iwMBVMhAAAM
+qznKsiywAHPJ5y2wECqwH3TZ3nWhAnap2NogW/+966QADX8WAADRD9EPAABsEAQVhwgjUYroUXMh
+gUmAAIQghScq+sDoQzxykIEAAPpABAUwCQUA6SUEJVEBAACaIZog0Q+MJ/2EABXvzgUA/6AEBrAL
+BQDrxRQm6QEAAJ3JncjRDwAAL1kUZP/BhVlkX7wjUADCSnQ5tBmHoIhUeYms0Q8AAABsEAQoIHDT
+D3yHFCogB/pACBXgqhEAWQaAyKfSoNEPAMAg0Q8rIHAsCvcMuwHrJHAtEASAANEPAGwQEoo29mDo
+FeAJBQD6QPAV7wwFAP1ABAU/xgUA/OAEA7eFAQD5AAUpUVsBAI0njNgr0RXv0gsm8IEAAAbmAfdg
+AEWwCQUA7PkVddkBAADT8PmhZhXgAeYAAAAAAAAAAOjZFCpPAoAArJ8pFhKpiCjVFP9gERLgCQUA
+LRIS7LsMAYIJgAD8ImYVpIsdAOgWESRAIQAA6Eg2CfgEgABtiQsoEhMPAIYIAmEoFhMoEhGrP+hI
+DAMZAQAAbYkFDyCGAwJjC98Mr28v/ECf4NPAiCLIhMAg0Q8AAB+GChyGC440HYYPFoYK8cAIttIA
+nQApJhkuMQvtMQoqoASAAPSgFTISAJ0ADFwRpswowp73ACXB0gCdACvCnQ9YCiiCvwi7Ae+GCBWF
+6YAALCEHDAxKDMwRD8wCnLCPIPkMCgWgLAUA+WBGFaAINQDstgMv5gKAAAjMApyxLCAEKxYYKhYZ
+9YANfBIAnQAO7wkehxsM/xGv7i7hf/WAE0qSAJ0ALCISnB0oIEyYHByHFQxcApm2/WCGFaj6HQD/
+YUQd54rBAAh4Api36BINL38CgACfuB+HDC21C+i2CirHgoAAD4gCmLkvIAcPL0Dz8AAXt/j1AAj/
+Ap+7DEgR9wAARDAPNQAvhp1ksauKNMa/C6oBmjSIIsCRCYgC+EBGFaACBQDRDwAAGocQ8cAF9xIA
+nQAZhcMpkjb5sWgVrH4dAKeeCe4Rro4uJhmS6PSgDkIQC+UADFwRpswtwp77oB574gCdAC3CnQ9Y
+CiiCvwjdAWTR2SmhGA8CAA8CAPEg8A3v9nUAK6EB+uAbe+IAnQDq5AAJWASAAOw0AApoBIAAW/ZM
+6SICLQPOAABlnkvaIOwkAALYYQAAWBAuwCDRDwDpxAABgLGAAMhOLRISbUkFA0CGCQJlj+Ct/3v5
+OPjIABWgCQUA+cAGFa/4LgArIHbIvesiGSlQBIAAW/Z20qDRDy0gd2TRWC6hGGTt7NogW/cL0qDR
+D8CQ/8AGFe/3YgDAgSgkeAiYApgijzQG/wH+YIYV4AIFANEPLRYXHIWC+kLkFeAOBQCeGZ4Ynhee
+Fp4VnhSeE54RLMKB/Q1cBeabAQD6BwAFcrtBAOz8DA3eQoAA65kCDVQCgAAKmQINzAL8IgYVoAsV
+AOsWACjQBIAA6RYCINjBAABYCIRkohvApf0NPgWgOyUAWUTSwKX9DTgFoDslAFlEz40iZd082iDs
+JAAC2GEAAFgP68Ag0Q+LyCoWGfdgExiSAJ0ADEwRpswowp73ABQR0gCdACzCnQ9ICiiCvwjMAWTC
+cBiFTbC/n4j7gGgd7/UOAC8iE58dLCBQ/CGGFa/2ZgCLyPdgEwiSAJ0ADFwRpswowp7AnvkAE8Pi
+AJ0ALcKdD1gKKIK/CN0BZNJmHIU7sLmZyGXeJdog7CQAAthhAABYD8bAINEPAC0geGTck4vI92AS
+eJIAnQAuYq5k4nouov0tYq0O3QFk0nCwu5vIZNJRF4UoJ3CAJ3w3B0cU7RYOI7gdAAD0oAW6EgCd
+AAxcEabMKMKe9wAVO+IAnQAtwp0PXgou4r8O3QHn1AAGkdmAAC8gFKT/Dw9HLyQU9eASBlIAnQAo
+IhnuMgQkBWmAAMCY+cYADPy+HQD4YIYV4A4FAMDALCR4ijDsJhkoBAqAAPNABOKSAJ0AjDIsJhwp
+MgHsFg8r2ASAAPMgECBSAJ0A8yH4DeADBQDqIgcq3wKAAPdgAEWwDAUA47adKmgEgADqrCAqWASA
+AFgMp9Kg0Q8A92AQIJIAnQAMXBGmzC3CnvegEJPiAJ0ALcKdD14KLuK/Dt0BZNIAGITssL//AQYV
+7/zmAAAAAAD6AAId4BkFAPnGAAzwjoUA+GCGFe/9VgDaIPzgaB3gDEUAW/UD0qDRDwAchhf8IYgV
+4ApVAP4hqBWgOyUAWURJKhIZLRIXLBIQ+iMIFeAJBQD/7zwNoA4FAAAAAAAAAAD/7VANoAsFAAAA
+ANpw61QADuAEgABYAlbrVAAJUASAAOyGFxvoBIAAWA/mwLErJHiKNAaqAfpghhWgAgUA0Q8A//D0
+DaANBQAAAC4WFvwi5hXgCgUAWUDJG4S6KhIZLRIXi7guEhYfhLT5f+vwkAkFAP/2cA2gDAUAwMAY
+hLHA+g+/NP8BBhXv9ioAAAAAAAD+IqYVoAoFAFlAuBuEqR+Epou4GoX1LhIV+X/sMJIAnQD/9pgN
+oA0FAMDQH4ShwMoMvDT94QYVr/ZSAMCgWUCrHISci8gfhJgahej5f+0IkgCdAP/2vA2gDQUAjSJl
+2hnaIPxAaB2gG8UAWA8iwCDRD8DQwOoOuzT7gQYV7/YqAI8iZfn02iDrXBgpYASAAFgPGcAg0Q8A
+AOsSDilQBIAAW52NY/21AADqJAAL2ASAAFufEowfKTIBKhYU46QADV8CgADrewgE702AANogW57a
+80AAQf/3cgD/9ZQNoA0FAMCgWUCCG4Ryi7gfhG/5f+94kgCdAP/1IA2gDQUAAMDQHoRswMoMvDT9
+wQYVr/TWAGwQBBWFpyJSf/BCQA3gBgUAIlJ9hCGJIJlAiCCUgZYhliAjUn+wM+NWfyET4QAA0Q8i
+UoCEIYkgmUCIIJSBliCWISNSgrAz41aCIRPhAADRDwAAAGwQBIooiacomRTrkgkkAXGAAPlASBXg
+DQUALSQELSQF80MmFa/85QAMmQGZov1g8BWgDTUAW/4D0qDRD///SA2gCwUAbBAILiAElRL1wBqj
+kBeFAPfAG5RgJbUAjBIMDEcsFgP1gAtREgCdACswEP8LDgXgCBUA9WAlDGAu1QD/YCaMIDYlAPdg
+EHwgJ2UA92AVjGIAnQCKEykgB/VADMkRmQEAiiLAsOsWAS0iHgAAb0NxLSEIJfB9/wrqBaAKBQD7
+75AV4AyFAG3KLQ5cCufB/yqBCoAAAIYa5rAXdVAFAADn0w92MAsAACZhAPzAEkLiAJ0AsVUFBUL4
+IKYV4AcFACoKBf0KxgWgCwUA7nQACvgEgABZQ34WhV2JFeVkfSun3gAA1UAahVzpFgAsxwKAAPUg
+CRISAJ0AG4QFq4gsgp71gCZz4gCdAAqbCuiCnSXYEwAAK7IZC4gBZIN9KSAHH4RHCS5ACu4QD+4C
+noCMIB2EB+2GAi5mAoAADFwCnIH0gB8lYgCdAC8wA++GAyRIQQAAhhMoPBD4wCBBUgCdAOhBDWJT
+/QAAbakFCACGCQJhwDCJEBqD5gyZEaqZJZadKCAEzIYqIAXMoWQ1KtIw0Q+MJ4Qy9YTADee0wQAd
+hS8ehS8fhAL4YQAVoKYlAOzs4CdLwQAA92AjDCIAnQAPAIcOAmHjBgAOUASAAPqCaB2j5OEAbekF
+CACICQCKDeYRv2QERBTm1G8iIAUAACTUc/OAaB3v+OoAhieKbCZsMPdf8wQiAJ0AK6zIZL5VwGH2
+ICYVoApuAByDvYvI92AjGJIAnQCIEB2DugyIEa2ILYKe9aAjo+IAnQCNEArdCuiCnSboEwAALdIZ
+DYgBZIRbsL6eyGWOxmACQYYT+N/vuVIAnQApICJkkEYqIAcbhD/AwPxERh2hqgEAC6oJK6H+qbkp
+pf4pICJklFUq8jiNKw8CAOChBASz/QAA4GYaDHAKgADm3QgHc/0AAA7dAi0mCikgIPpAsBXgCkUA
+CpkCKSQg+X/siVIAnQAJC0P5f+w1UgCdAIonwLDrJCAlUEEAAFgNTv8JtAXgCBUAwMAsJBT8QKYd
+r/WKAMBx+CCmFe/3DgAAjRP5v+ppUgCdAI4nyeDaIFv8BdogW/0s/wmYBeAIFQAqIAXxTRAN4AmF
+ACYgIAlpAikkIPlf6NlSAJ0ACQpD+V/ohVIAnQCKJ8Cw6yQgJVBBAABYDTHAgf8JeAXv/jIA6iQA
+CdgEgADsRAAK6ASAAFv/Etyg6iIILgMmAACNomTQWsAg0Q+PMv0JbAWgClUA/EAIFef/wQD+IIYV
+4DsFAFlCyogUwmb3AAUsIgCdAPUABaxiAJ0Awn33AAYcYgCdAMOSeYm76iQACdgEgADtEgIqYASA
+AFkD4sAg0Q8roAf6IAAF8AwVAOu8GCpoBIAAWBR4wCDRDwAcg98swntkwuYeg9wq4nmLoY2gnbCM
+oPuAJhXgBgUAlqCWoS3ie7DdLeZ77CIAJWv/AADs1j4lW+EAAJsn+EQGHeAGdQD2QKYdoA4FAP5E
+Jh2v8CoAAAAA6iQACdgEgADtEgIqYASAAFkEPcAg0Q8A6iQACdgEgADtEgIqYASAAFkD+8Ag0Q8A
+6iQACdgEgADtEgIqYASAAFkD48Ag0Q8A6iQABNhhAAD8oGgd4AwFAFgUSuokAAnYBIAA7RICKmAE
+gABYD0eOImXuvo8RZP65+kBoHaALBQBbnk7AINEPACkwH8Jj9z/1DCIAnQDCdPc/9LxiAJ0AwqX7
+P/RsIgCdAPpAaB2gCyUAWAIfwIH/CKAF7+0mAAAA+kBoHaALJQBYAenAgf8IlAXv7MoAHIOeHoRP
++kEEFeAmBQD3AGYVoA8FAJ+F/wDmFeHZAQDuhgYu7AKAAA27Auy7AgRIgQAA+wCGFe/v0gAAiyeK
+vIyhjqCewI2g/aAmFaAMBQDspgAl2MEAAOymASVDYQAAbUkFCCCGCQJjH4N4JqzI9+ALw6IAnQAZ
+g3Yukn8dhCWa4Z2hLJJ/nKAokoHqln8kQAUAACiWgY+wwDDr9gwH+yEAAPftAAm/7pIA/+0MDaAI
+BQDAU/SAQAL/7BYAGoOk9kDwFaGEgQCqiiqggPRBBB2g+bUA6WYBDVeCgAD6xgALMPnFAAlmAQhm
+AvZA5h2v7hoAJDELD0CH7kwAAlPhAADykGgd46oBAOdM/CVT8QAA6nQ4DlAEgAD6kmgdoBYFAAZO
+Nv5uAA0/9+UAd6EKsq9t+QUIYIgJDIqypg1mEb9k/7FmHaREHQDm1G8iIAUAAPWuZh2v7c4AAAD4
+IKYV4AoFAFk+rhyCn4vIiRUag/D5f9xAkgCdAP/uvA2gCAUAAMCAwKoKujT7gQYVr+5+ABuDLyux
+ism1HYMtjCAt0XN9ywuIJy6JFMjjj4ll+rXaIFgAxdIw0Q+JKfhBRhXv7yoAAByDIyrCfI6hi6Cb
+4Iag/sAmFaANBQCdoJ2hK8J+sLv7j8YV7/RiAAAdgxkm0oIfg9SaYZ+hLtKCnqAs0oTq1oImYAUA
+AP2whhWv+i4AAAAAbBAOGIPMH4Kn5IKmGlgEgACNgomD7oIBIOBBAACewZnDncLoggApUASAAPmA
+BhWgDQUA9CAmFaAIBQD4IAYVoA4FAPggRhWgDBUAWA5fwND+AGIdoA8FAPkGIAXgDAUA7BYBLVgE
+gADsFgIpUASAAPggBhXgDBUAWA5TKhYQFIJi6awILVgEgAD/BPIF4WMBAPMF8gXgCEUA7xYPKT4C
+gADodwIFaIEAAOiCqBVgwQAA7wAFAPCBAADuDAAJL4KAAP8EqAXgDgUA+KYACrAIJQBtiniKH5Sw
+57YBLJAEgAD6BAoVoCiFAAIAivVgxhXgAgUAn7T5YKYVoAoVAO4qOQTJAQAA6+gRDVYCgADqiAIO
+EASAAOhoAgZhAQAA44gCB3AFAADotgcgwEEAAOgLHg7QBIAA6kwAAMCBAADoBx4G6QEAAOIsAAXZ
+AQAAIhIQIi0BIiyA0Q9sEAwfglIVglEZgkcdg3QoIAfjQgQp2ASAAIzRhtLq0gMg8EEAAJrjCTMB
+luL9wCYVoSgBAP2gCBXgDBUA/cAGFeAGBQDmFgAp0ASAAPYgRhWgDQUA9CAmFeAOBQBYDgTAwf8F
+bgWgDwUA/iAmFeANBQDvFgItWASAAO4WACnQBIAA/gBiHaAPBQBYDfkfgqQYglkcgiH8YAASsAZF
+AAZVAuOCBhmngoAA8wQCBaFiAQD8IeYVoA0FAOhEAgVIIQAA7AAFANiBAADrDAAFYIEAAPtGABXg
+CCUAbYp4iB+SoOWmASzwBIAA+AQKFaAnhQAOAIr1QMYVoA4FAJOk90CmFeAIFQDt6DkEyQEAAOvX
+EQxGAoAA6HcCDfAEgADnZwIF2QEAAO93AgboBQAA56YHILhBAADnCx4OQASAAOhMAAC4gQAA5wce
+BmEBAADuLAAFUQEAAMAu0Q8AAABsEASMJxqCYPkEvgWv+fUA+YAGFeANBQCdJ+yDM3ZYIQAAKaJ5
+GIJZm5GYwy+ieZ/CLqJ766Z5J3AFAAAupnsroYrsoXMlgEmAAIsgfLMk0Q8ponwYgk+bkZjDL6J8
+n8Iuon7rpnwncAUAAP9PxhWv/0IAACkhGm6UCi0lGvAAHA2gCQUAaJPGwMEMnAIMDE/sJRouHuwA
+ACqhfAq6DFismtEPAGwQBCsgB+yC6RlQBIAA+iAABfANBQBYDLnRDwBsEAgdgZYcgZMagcApIAeH
+NPkDJgWgC+UA9WBAB7GZAQDpFgEstwKAAKhmLmKeCncBlxL/wAtr4gCdAC5inQycCizCvwzsAefE
+AAYLCYAAitj3QAt4kgCdAC6CruuCzhcIMYAALIKtJrL9Bs8B7xYAJXP9AAD3gAeOIgCdAJ7Y94AH
+tiIAnQAvIBSk/w8PRy8kFPXgCnZSAJ0ALLEBihLtgX0ctwKAAPjAAEM3VQEA7KNVc8hBAAAsMAOd
+cIogG4F4nHPrdgItVgKAAOpKAgHAQQAA6nYBIgw9AACwSm2pBQgAhgkCYeRmnSKV1QAAKiIH+oBo
+HeAMBQDqrCAqaASAAFgJBtKg0Q8cgYGLNOokAApoBIAA7LsBCeAEgADrFgMr2ASAAFv/LyMSA+pm
+nSKUdQAAKiIH+oBoHeAMBQAPAgDqrCAqaASAAFgI9OsSASlQBIAA7IKcGegEgABYDGDAINEPAAAA
+wMCcEI4QwPoPrzTv1ggveJYAAPpAaB2gG8UA/AACHaANFQBYEmfqJAAJ2ASAAOxEAAroBIAAWA8j
+0qDRDwD/+nwNoAwFAAS9N4sR2iD7YwAV4AwFAFgSW2P/ygAAAPgghhXgCgUAWT0yHYEjitiJFBiB
+Ivlf8+CSAJ0AY/+UmRTrEgApUASAAFuaJRiBGxuCaPggiBXv+n4AAGwQBIUg4lQMApshAADAIAQy
+OdEPbBAEKiAgKwrz0w/7QAQFcAQFAOokICGUpQAAaTEZ/0LAB5D81QAMrAEsJCACKgJb+pgtICBk
+0GrRDwAAAAAAAP9egAfQAxUALgr+Dq4B7iQgKVAEgABb+qwoIAccgZMpICL0REYdoYgBAAyICS+B
+/qn/L4X+KSAiiisuwovkkDJk6/0AAADhBODdGgnYCoAA7aoIBdv9AAALqgL6QUYVr/42AIonKqwQ
+WAqrJCQUJCQF0Q+LKfpBRhXv/c4AAAAAbBAEKiAFwIh6gzTxRFAN4AUFACogIPNEQIXgBBUAA6kC
+6SQgIZWhAADaIFv6adogW/pMKiAgCgpBaqNG0Q8AAOokAAnYBIAAWQETZa/tKiAFY/+2iyfqgWcV
+hBGAACyhiu6hcyZ9cYAAjSB+26RpMqEbgacqIRoLqgH6Q0Qdr/5WAADaIFv6LCQkBdEP2iBb+m4o
+IAccgVQpICL0REYd4YgBAAyICS+B/qn/L4X+KSAiiisuwovkkGBk6/0AAADhBODdGgpYCoAA7aoI
+Bdv9AAALqgL6QUYVr/1GAC+ie+mieSeCCYAAi5GNkJ2wjJCbwZWQlZEoonuwiCime+8iACTD/wAA
+74Y+JPPhAACeJyUkIPREJh3v/SIAiSn4QUYV7/wmACmifI2Rj5Cf0I6QneGVkJWRLKJ+sMz9T8YV
+r/7+AAAAbBAMlBiVFikgBycwECowA/og5hWhmQEAmRn04Bb0kA61AP7gFzQgDwUAnxWIIhyAhfsD
+rgWgCQUA6RYELA/GAAArEgkVgIHrFgoieCkAAPVgCUoQDaUADLkRBZkILpKe/8Agw+IAnQAKuArm
+kp0kQBMAACiCGQhmAWRhmPsDgAWgGaUA+OAJvGIAnQArIATowggliamAAPcAHiCSAJ0ALlKuGoG2
+ZOFJKqL9KVKtCpsB+yAJ/iIAnQCwjZ3I+yAJ9iIAnQAuIBSk7g4ORy4kFPXAHQZSAJ0A9OASnBIA
+nQCIFhuAaR6AZZ5giiCMF5xj62YCLVYCgADqSgIDSEEAAPrAJhWniAEA+QARqVIAnQDoPBAiDD0A
+ALBKbakFCACGCQJhwICwSe8yACzPAoAAqWnoFgsk2EEAAPPgE9qQDRUAKgqB+uAI9CCMNQCYG/zg
+CKQiAJ0AjxruEggv/wKAAKX/LvadLSAEzNvAm3lxZSogBcyhZIOk0oDRDwCIyPcAGdCSAJ0AiRoM
+mRGlmSuSnrpO/2AaM6IAnQCOGgruCuuSnSdwEwAALuIZDrsB5rQABZmZgACwj5/IZW6/YABVKKEY
+ZI7GYAMmKSAUpJn4QoYd7/weABqBaSqhGGSvkByBZ4sgLMEBfLuF2iBb/njAINEPwLANjjTuxggt
+9lYAAPpAaB2gG8UA/AACHaANFQBYEUBgAB8oIASLGe1MCilQBIAA/gAiHeAMBQDo/DgF2GEAAFgR
+N4wVZMJp6iQACdgEgADtEgYqYASAAFgMMo0iZd+bjhRk75b6QGgdoAsFAFubOsAg0Q8UgUXAMfYh
+KBWgDBUA9IBEFaAIBQD4ICYVr/n1APggBhXgDVUA9oAAQjAOBQD2QAgVoA8FAOYWAipQBIAAWAvm
+/AACHaANVQD+AAIdoAYFAPYgBhWgDwUA5hYBLVgEgADmFgIqUASAAFgL24sYiSIqIAaIG+OZAgXY
+GQAA6xYIJVAFAAAqJAb4QEYV7/mWAAAAAAAAAAD6QGgdoAsVAFv+7WAADAAA+kBoHaALFQBb/rmK
+FgoKR/VACyESAJ0AwLH6IKYV7/QKAADaIFkBB2ShzowiZM2jY/71AACNFegiByaQqYAAioyPoYyg
+nPCLoP9gJhXgDgUA7qYAJFjBAADupgElQ2EAAG1JBQgAhgkCYR2ATS6syP+gEwuiAJ0AGID+LYJG
+HID6mtGcoSmCRpmgL4JI6oZGJ/gFAAAvhkiOsMCA6+8MB3MhAAD/zQAMf/XGACYgBy4gBBx/7v5A
+CBXgphEACqoQDKoC5OGkb+YCgAAff8Mef6ualP8gxhWgOgUA+yDmFaAORQAOzgLulgUk0IEAAP4A
+CB3gDjUAbeoCCgJhGX/dKiAHJiEI/QHOBaAPJQD14QAPsaoBAOy2Bi1UAoAACmYC6WYCBdCBAADm
+tgQtSASAANMPbfkFAyCGCQJj+2gAFeAMBQDspAYiSBEAAPghBhXv85oAwKBZO4ccf3iIyPkf4ZCQ
+DaUAY/2K2iBbmH1j/Fv/7+QNoAYFAI0niNwt3DD9H/SsYgCdAC6MyGTuisDx/iCGFe/2bgAA6iQA
+CdgEgADtEgYqYASAAFgNV9Kg0Q8AwKBZO3Acf2CIyBqAsvkf5ciQDaUA//OQDaAGBQAAAAD/8zQN
+oAsFAA2JNPmBBhXv8zoA6iQACdgEgADtEgYqYASAAFv9utKg0Q8qIAX5X/FUUgCdAMCy+kCmHe/4
+ggAAHICYLMEY6BYLJgFJgAAegJSNIC7hAZgbftsXiScvmRToFgsngHmAACqSCegWCy1hZgAA2iBb
+/XWCG9EPAAAAAP0gaB2gCxUA6owgKmgEgABYBuX5QGgdr+7KAJqUKyEI5H9DEhgNAADyIQYV4eYB
+APUgxhWgAzUA48MCD3QCgAAOuwLzIKYV4C4FAJ6XJCAUjimDK5Od/yGGFaADBQCTme5/rxoiAoAA
+DUQClJsOuwKbmA7+Au6WCiTZAQAA8kKGHe/tkgAZgGYukkkdgG+a4Z2hLJJJnKAokkvqlkkkQAUA
+APkpZhWv9ooAAABsEAgnIAfoIgIiS/0AAOkWASJgDQAA+CBGFeF3AQDpfwUcBtYAABZ/Bu1/BBvH
+AoAADwIApogrgp4JeQopkr/9YAfLogCdACuCnQm5ASggBOkWAySHgYAAZICQKNII9wASKJIAnQAr
+Yq7sfvYVhUGAACpirSzCfwyrAe8CAARz/QAA/UAEjiIAnQCe2P1ABKYiAJ0ALyAUpP8PD0cvJBT1
+4BDOUgCdAPggaBXnhQEA+QAFkVIAnQDoPBAiDD0AALBKbakFCACGCQJhwICKMPNACOKSAJ0A6xIC
+K+cCgACmzOvGnSwQBIAA0Q8AAC0gFKTd/EKGHe/+ygAAAADqJAAJ2ASAAOxEAAroBIAAWAy/0qDR
+DwAAwLDA6g6ONO7WCC37pgAA+kBoHaAbxQD8AAIdoA0VAFgP9GP/wQAA//w0DaAJBQCNEeokAAPY
+YQAA/gAiHeAMBQDo/DgG6BEAAFgP6mP/lwCNJ4jZ+aKCFe/FBQDr0RUm4IEAAAXFAZUQ5bUIClcC
+gADqmQwEQEEAAJjZCJky6dUUIqkBAAD1AAxC4gCdAGirPairK7zw+qAIu+IAnQDtEgMiDHUAALBO
+bekFCACGDQJhK8IBC6sI6ckEJdvBAAD1YA6UYgCdAOvGAS3ABIAAZZ7kYAEgAAAAAC4gBC0gB4oR
+iRMbft7vIgAtVwKAAPsgAESwrREACqoQ66oCD+YCgADrfpoXCNGAAJuSmpD+/VwFoDoFAPsgZhWg
+D0UAD88C/yAmFeANNQDuAAUE0EEAAG3aAgoCYR1+yi4gBywhCP7/qgXgCyUA9WEADbHuAQDvlgYv
+dAKAAA7MAu3MAgT4gQAA7JYEL9AEgADTD225BQMghgoCY4wRwNDt9AYmYBEAAAx9Eabd7NadLBAE
+gADRDwAAwKBZOnMdfmSI2Pkf7YiSAJ0AY/5n2iBbl2lj/eIAAAhdDPogaBXk/R0AbfkFCECGCwJl
+ixOIEA9PDK276IxAJ4w9AACw/m3pBQhghgsCZ4gQL8kEDakMqYgojDDoxgEv7i4AAIoQwLDrxQQl
+UQEAAPuAJhWgCAUA+4AGFa/2pgALiAz5oSYVr/nWAAAAE37PmpD+QQQVoCoFAJqT+yBGFeFNAQDj
+9QIKJAKAAATuAvPGAA9wAzUAA8MCk5GEKSogFIMrk5mUmJ6U9SDGFeAOFQD0ICgVoAUFAOWWBS1S
+AoAADqoC6pYHIiANAADlJBQsEASAAOoSBCuvAoAAplUkVp3RD4gQKIxA+YAmFa/4xgAAbBAEaEMG
+aEJCwCDRDyggBrCICAhH6CQGLH+GAACJIiwwAceu+yAEBLD71QDpJgIuGLAAAHvJ0fpAaB2gCwUA
+W5lSwCDRDwAAAAAAAOs8EClQBIAAWP/owCDRDwDqJAAJ2ASAAFj/+MAg0Q8AbBAG+P22BaKlBQAF
+JSjAkehVCAHQQQAA6lJ/LQEKgAD9IAEE3/v1AAubAwq6AepWfyoBhgAAKFKACLoBKlaA+WqgHaAJ
+BQAtUn4JqgIK2gIcfsoMKxGsu5qw+q/oFaAAKgAKmgIqVn8cf0j8QGgd4CsFAOoWACnwBIAA/oBo
+HeAKRQBZPVbaIOs0AApgBIAAWRmHwCDRDwAbfeQafrQrsksqooGiuwm7EauqiqcqrBBYB50Zfjj6
+sAgVr/42AAAAbBAIHH8yJxYAKBIRKRIQ+CCGFeArBQDpFgEpaASAAOgWBSrWAoAA6BYCKnwCgADq
+/wIJ8ASAAP7GAA/wCkUAWT03Hn3P+P0IBeAPFQD6/kAFoA0FAPCKcA3v/PUAaEEHxirRDwAAAAD6
+IkgV4qgFAAgoKAM3Cq6OCYQIKRIF7n4LCYEKgADoEgQv+AqAAO7tECzPgoAA65s4BzlRAADrmzgE
+BrmAACvlpC1Cfxp/CiwSBQ39Ai1GfyzlqermUCKGiYAAaVGZihSLFVk+Z/wBAh3gDAUAWT2Q/AAC
+HaPthQBZPZvaIO1xei3gBIAA7kJ/KdgEgABZCXLAINEPAAAAAPJgAQP/9PUA+mAEANKsBQDsLCgP
+2AqAAAS7A6nEKEJ/rswMdwsLiAHoRn8juEMAACp2UO11qSKD4YAA+L/5CNIAnQCKFIsVWT5I/AEC
+HeAMBQBZPXH8AAIdo+2FAFk9fNog7kJ/LeAEgAD6YGgd4A0FAFkJU8Ag0Q8oQn8M+QMJiAEoRn8t
+5anq5lAq+b4AAPjf9mDSAJ0ALXF67BIEKVAEgADuQn8p2ASAAFkJRcAg0Q8AyW343/U40gCdAOwS
+BClQBIAA7kJ/KdgEgABZCTzAINEP2iDsEgQp2ASAAFiUR8Ag0Q8AAABsEAYpMAJkkRZokTv9IQAB
+X+KlANEPAAAiMAb4/CoFoqkFAAkpHamIKIJ/JDAF4zIDJARxgADApPz9XAWgKwUAWTy8xirRDwAi
+MAYYfh/0YPAVoqUFAAUlHfv/4h3gCRUA6FUIAlBBAADqUn8tAQqAAOMxCCzICoAAC5sDCroB6lZ/
+IYORgAAKmgIqVn8cfpT8QGgd4CsFAOoWACpwBIAA/mBoHeAKRQBZPKLaIOtEAAngBIAAWRjUwCDR
+DwAAAAD6AIIdoCsFAOx+ixloBIAA7kQACfgEgABZPJZkQJH4n/sI0gCdAOokAAnYBIAAWP8YwCDR
+DyhSgAi6ASpWgHiwRsCQLVJ+CaoCCtoCHH3xDCsRrLuasPqv6BWv/c4AAAAqMAYrMAcsMAMtMAQu
+MAWPMogzmBApMQmZESgxCpgSW/820qDRDwAAG30OGn3eK7JLKqKBorsJuxGrqoqnKqwQWAbHGX1i
++rAIFa/+ZgAAAOokAAnYBIAAWP8wwCDRDwBsEAQSfl0iIAAiNAgiNAkiNAryYWYdoAIFACI0AtEP
+AGwQBMAg0Q8AbBAEJiIR8MMADeAFBQAoIhInIHoafPEZfVltCBkjokQikoSoVKQzCTMRoyLnJBYi
+qAUAAHZbAmP/39EPbBAEIiEF0Q9sEAYVfPf0AAIdoAYFAP78gAWgBwUA+GBoHeAMFQD4IAYV4AMF
+AP/PxBWgAN4AAAAAAAAA/MBoHaAKBQBZPaeOEo8RCzMCCncC9+AAQzAMFQDlXAEiIAUAAOhJL2EQ
+EQAAAEAEDggbf4fmiyBosCwqUDAAoQTuFgIuSAqAAPogJhWgmU0Ae5CrxirRD4sQk7H3YAYV4AIF
+ANEPAAD8gGgd4AolAPz8OAWgCwUAWTwmxirRDwBsEAQEAIfIVgIjYAQAYdEPAiNg0Q8AAABsEAga
+fhIoEhCSFed8rBvIBIAA5hIFKxAEgACYF5kU+sAAQzAAKgAAZFBszSsqYoAKPAHsSfFyq/0AAI0U
+ZNBK+6AGFaACBQDRD48XZPBACOowGXyjKZJBwKUKKjcKmSipiJgWDAIAihcpcoIYfJ0KmQEJGo4I
+qAqIhAuAAAzqMIsWDLsMa7HbY/+hwCDRDwDaIFkxa2P/lN4w7RIFKngEgAD6IAYVoAuFAPz70gWg
+ChUAWTvyxyvRDwAAAGwQBAXqMBZ8hyhiQcCVCSk3CYgoFHx7+KAAQrAAVgAGqAqIhAuAAAnqMAlZ
+DGqREwwCACpCggo6AQoajmUv32mm3NEP0Q8AAGwQBCkhAiYhBIQg9ECkFeAIBQDmbP8ky/0AAOkl
+Ais3AoAA5kQICq8CgAD0jwAKcADCAAAlIQUmIQSxVfRACBWvVQEA5SUFI0v9AADlYSd8zwKAAOlE
+CAq/AoAAB0QMBACHCFhg5AAHAvMvgAAiIQUJIhGiUtEPKCUF//9YDaAFBQAAAGwQBPT7ZAXiqAUA
+CCgoqFUuUn8pUnxz4QHIkNEPwKT8+1gFoCsFAO0kAAn4BIAAWTuxI1Z/6iQACdgEgABZCJYWfZ4q
+YAD/XRAN4AQFANog7DQAClgEgAD+r4gVoA0FAFkIDStgALFEe0PiY/+sAABsEASIIisgBxl8LBx8
+LvEKbA3huwEADLgRrIgtgp71oAVzogCdACiCnQm6Ciqivx18MgqIAel8MxQEuYAAjzIuIQcqIAcO
+Dkr6AgAFN//BAOD/EQ1SgoAA76oCD3cCgAAOqgINqgKagO4iACJT/QAADK8R/wBmFefVAQDphgIv
+dgKAAO5OAgRIQQAA7oYBLpVcAAAoPBD8gaAA0AIFAG2pBQgAhgkCYQy/Eaz/JPad0Q8AAAAAAAAA
+6iQACdgEgADsRAAK6ASAAFgJ8dKg0Q8A6iQABdhhAAD8gGgd4AwVAFgNKmP/0Ycngnn64qQVr8YF
+AOV5FCPogQAABtYB5qMICk8CgADpVQwBEEEAAJJ5CFUy5XUUIZkBAADyQAU64gCdAGibN6KaKqzw
+6jM9dDhBAADoQRxrwASAAC5M/23pBQIAhggCYYrRqprl2QQlU8EAAHOheurWAS0QBIAAZFBMDL0R
+rN0k1p3RDwACOgwKTxRt+QUCIIYHAmMPQgzqjggDQQEAAO/sECEMRQAAsC7TD23pBQhAhg8CZS/Z
+BAqSDKJiIiww4tYBL/2+AADAIOLVBCNBAQAAmNCY0Qy9EazdJNad0Q8KIgzy4SYVr/1aACJsQPOg
+JhWv/hoAAAAAAABsEAQTfFEWfPYafFHiMyBxKCEAACtifZWxmiMpYn2ZIihif+VmfSRABQAAKGZ/
+0Q8vYoDl9gEjcAsAAJ4jLWKAnSIsYoLlZoAmYAUAACxmgtEPAABsEAQTfDwWfOwafOziMyBxKOEA
+ACtifZWxmi8pYn2ZLihif+VmfSRABQAAKGZ/0Q8vYoDl9gEjcAsAAJ4vLWKAnS4sYoLlZoAmYAUA
+ACxmgtEPAABsEAYYe/0ae5AZe9oogH0qokYmkospkoXmYBQtVkKAAOqZCAR8PIAAJ50B9vAAFeAA
+KgAnnQMnfID2wAdIkgCdANRg9PnMBeADBQDwAZQNoAIFACOkOS6gDI2g+UDwFe/49QD5QsYdoAwF
+ACylG/z5uAWg+8UAC5kBCSkCKaQHkhKdEZMQ+LAQFaA7BQD4IGYVoApVAFk62SlQgAAwBAkJG3+f
+a+IsASGYBQAA42F2ciAFAAAbe7AvcA0qsnMtcAwrsoWqTOo6CA5mQoAA7LwIDVZCgACrqiymEP1B
+hh3l3sUALqUaL6QNKVCAACAECQsb83/699IAnQBtCA+xIgAgBAkMG/Of+l/SAJ0AY//pAPoAoh2g
+OwUA7HyzGegEgABZOrZj/33RD2wQBIgnG3tq9QKCFe/HBQDiggkpMASAAOmBFSQggQAA50QBAqkB
+AADlhRQhEwEAAOKGCSIhAQAA9EESDaAKRQCikpKJCwCH7XtFGSgEgADTD22qAgUCYZ0gjGDA1OMm
+Ai5mAoAADcwCnCHRD2wQBBh8DB97a44rjS76QYgVoAMFAOzyiC9YBIAA+aAIrCBUZQAJ2RHpzAgF
+A3GAAJ6riyvIsJq8iieTK+MmDCVQQQAAWATbjSf9pAAVr8YFAAbMAePVFCZhAQAAnNmc2CsgBSMk
+FfVgCWwiAJ0AJSAHG3vv9Pf2BaBM9QAsJAUrsX7kQn8pUASAAPQgAALyux0AWI9RZKEW0Q+NyYrL
+ctla7sYJL1gEgAAuwAXxYGAN4EglAJO8+d/79SIAnQCJyerCCyz7pgAAZa9s+4AIFeA49QAoxAUu
+8nP78WgVoA0VAP9vAA2wDAUAWAInGnruia6wmflBxhXv/QYAAHKpCZ7L+kFoFe/+kgCNynLZCdvg
+/4FGFa/+VgAuIAV06YotITb+RuQVoApVAPz4lAWgOyUAWTpN0Q+ILQmIEejMCA13jgAAicvzIAbN
+IgCdAJ7LiyvIsJO8KsAFw7D7X/bVYgCdAI3LZd7QLsIMZe7KKMINZY7E+4AIFeAotQAoxAUu8nT7
+8YgVoA0VAP9vAA2wDAUAWAH9Y/6gLSE2/kbkFaAKVQD8+FoFoDslAFk6L9EPjScZfCqZQIvYKCIA
+LNEV6dILJvCBAAD3wAQHsAcVAO/MCAxGAoAAB4gCKEYB65FsdmEBAAAq2RQqrBDq1RQl0EEAAHrD
+XmRACwQAhgsCYSrSCCqsEP1ABIQiAJ0AmuCLImW+hNog61wYKWAEgABYBTLRD43NctkJ2+D/gaYV
+r/ySAIjM8x/41SIAnQDb4P+BhhWv/EIAAAAAAAAAAPOhZhXv/voA68wMAgGRgAAMTRS42up6NgpI
+BIAAbakFCSCGCwJjrEnq/EAmjEkAAA17DNMPbbkFCUCGCgJlDP0MLdxQ/cAGFe/96gAo/ED5wAYV
+r/2+AABsEAT4QAgVr8kFAOkpAQGCSYAA0w9tCC5zgTwqMAAsMAd0oTMqIQXpqwgOZwKAAOwzCAXZ
+AQAA6zsVebgEgADjdAADgKmAAGP/yAAAAAAAAPpvAAu//64A8w8AD3ANBQAO0zjSMNEPAGwQBCkg
+Bxt6sSchCPgCAAVxmQEA6HruHMwCgADpdwINUoKAAAuqAht6bfpgBhWgLAUACHcCjSCbMvxgZhWg
+DjUA6NgCDu4CgAAO3QKdMYorJiAU+EEoFeAFBQCVNZc0mDaZOOo2CSsyAoAABkYCljflJBQhkMEA
+ANEPAABsEAQkICIYeszyQWgV4AUVAORAIWIz/QAAKIJ/AIEE4GYaCqgKgADmMwgCq/0AAAUzApMq
+0Q+JKZkq0Q9sEAT09XwF4AQVACVSf4YrgykAUQT8gAED3/j1AOYyDAO7/QAACHcDB2YB5jMMCoIK
+gADyjQAJMTOdAKMi0Q8AbBAGKCAFKyAH01D5AAYUUbsBAI0rjCn9gAW1YgCdAI8nL/EUweD/wAU7
+4gCdABd6HQy6EaeqKKKe7HoXHcgEgAD3AAWZ0gCdACqinQy9Ci3Svw2qAcBh8UpQDeAFBQAbeiEo
+IAcdepseelv+QQQV4MgRAPWQABYxiAEA7swCDEQCgAAI/wIN/wKcoPhACBWgLgUAnqP7QEYV4A41
+AO2NAgxGAoAADogCmKGMKSggFIsrm6mcqJ2mn6TlpgUsQgKAAAaIApinJSQUDJ8Rp/8u9p0DCUdp
+kgPAINEPiif6gGgd4AwFAOqsICpoBIAAWAGc0qDRDwAAAAD//WQNoAoFAIwiZMCKAw1HadJtiScu
+mRQtnCDuFgAnA4mAAIqZFHtP8UggDe/HBQDwABwNoCOlAGSgcovQ594BBQGZgAB6sSsvoABz8SUv
+0QUpoAfu+AgMzwKAAOmqCARBAQAA6KsgfWAEgADqxAAOfq4AAAq8DAxaOMugjqJ06bbAINEPAAAA
+/08ADn//ggD//kQNoAoFAOokAAXYYQAA/MBoHaANNQBYCvJj/16LEIrR598BBdhBAADr1QQlU8EA
+AOrWASf5AQAAf6siLNEFHnnJqsqa0Z6gjSDkpgIu7gKAAAbdAv1AJhXgAgUA0Q8eecGeoI0g5KYC
+Lu4CgAAG3QL9QCYV4AIFANEPbBAIKCAFJiAH9CCGFaAZNQAPAgD5AAplYWYBAIgi8RWsDeAKBQAT
+eZ4MbhGj7ivinh95mBd5mvdgEEtSAJ0AJOKdD2gKKIK/CEQBZEH1+kBoHaALJQBZNbFmogeMePeA
+DRiSAJ0AKTKuGnr89yAN+1IAnQArMq0touANtwH9YA2GYgCdAB95hbDOnvhkcYTbQPwAIh2gDQUA
++EEoFaAepQD6QAgVrg8FAPhBhhWgCQUA+CAmFeiIAQDvFgAsRcKAAPggRhWgDwUAWAVy6HrkHVgE
+gAD6QAgVoAkFAJkQKIB8LAoB/vQoBeANBQDpFgIsQEKAAPggJhWgHuUAWAVlwEbqJAAL2ASAAPZB
+JBXgDRUA/sAAFLAOBQDzIABE8P/1AOSWnSvgBIAAWKOM/EKwFeAOBQD+QoYdoEsFAOukAyvmAoAA
+7qQALukCgAD9hgAOcA0VAA3MApyh9HWmFaAaRQAqJAUFD0do8gwoIDrAn/kACGRiAJ0AwCDRDwAF
+C0dpsvSJJyeZFORwcWTwgQAAi5kVerPxb8AN78YFAPfABAewJKUAjODKvXvBKy2wACmwB3TRIiPh
+Be84CAzPAoAA6bsIBEEBAADouyl96ASAAOvUAA7+rgAAC80MDas4ZLCzj7J18ZHm7wEN/d4AAGAA
+owAAAADzbwAO//9eAP/+RA2gCwUAAMCgWTU0jHj5n/KwkgCdAPpAaB2gG8UA/AAiHaANZQBYClD/
+/UQNoAoFAMBwGXkawIoIyDT5IQYVr/k+AAAAAOokAANYYQAA/AAiHaANZQBYCkT//IQNoAoFAAAA
+AAAA+kBoHaAbxQD8ACIdoC0FAFgKPP/8BA2gCgUAiieNFMDA6qwgLtgEgABYALPSoNEPiuErfBAr
+5QTm6wEFU8EAAOrmASXZAQAAe6skLOEFqsqa4R55DJ6gjSDA4eWmAi7uAoAADt0C/UAmFeACBQDR
+Dx55BZ6gjSDA4eWmAi7uAoAADt0C/UAmFeACBQDRDwAAbBAEKCAiJSAHF3l/A4gM+ERGHaFVAQAH
+VQkkUf6jRCRV/iMgIokr/PFoFaAKFQDkMB5h2/0AAADBBOC7Gg1QCoAA65kIBVP9AAAKmQKZKtEP
+jSmdKtEPAGwQBCggBuiM/ylQBIAA+EDGHaALFQBblA/AINEPAAAAbBAEwFEDJCwDIi4CUjmkItEP
+AABsEAQpIQSHIP8gABS1gx0A6XcIDEeCgAD47wALsAoVAPb/gBXkkwEA5nIALIEKgAD9QAEFX/j1
+AAioA+aqAQyCCoAA+yAEANE6nQDoZgEKQAqAAAhmAuZ2ACKBEYAAJSECyEqwWuolAimQBIAA0Q+x
+W+slAimQBIAA0Q8A0jDRD2wQBPRAhBXlQx0A4iIAKieCgAAMVRGlIgQiDCIt//JH6BWkQwEA+oAE
+ANAFFQAAVRrlIgEKAgqAAAICGdEPAABsEAQnIQSIIA8CAPb/4BWvkzkA6SUFKy8CgADlhQgM7wKA
+AA1dDA0AhyohA/oAIh3mwwEADDtgCgpGDwIA/GJgR1AMBQAMnRENXQwNIIcMO2JvPhf4wT4N7/31
+AMihc6EqCZIRojLRDwAAAADnIQQkyAUAAAkJTyklBXeRUbB2DGUR9QAAQv/+/gAAAAmUEaQ0/uAA
+FzWUHQDuiAgMz4KAAAmIDPkfgBWkRAEA7oIAKgEKgADpIQUtsAqAAA1vAw/uAQ5mApaA+EAIFa/+
+hgAsJQX//pwNoAkFAAAAbBAEiDMPAgAIiFdvhASJImWQJ4on5TIEKlgEgADjMgUqaASAAPtEABWg
+DAUAWAAE6iQACdgEgAALUADAINEPAGwQBPhAaB2vzAUADIwB64kEKZAEgADiVAwKGASAAO2CASqv
+AoAABbsM6LsyCVcCgACq0i2BBZKBK4UErNnqWgwEyQEAAHkrOcqgqiV1kz3ITm1JBQIAhgMCYYWB
+K4kEqlV5UWjlhgEqkASAAMiw0Q8mzECWgfcABhWgAgUAIoUE0Q8NIgzzACYVr/7+AAKXDAdLFOtE
+DAmoBIAA0w9tuQUCAIYFAmHnMwgGEQEAAG1JBQIghgMCYy2JBAeiDKLCIixA4oYBLv1GAABj/6Ii
+zEDzACYVr/5iAGwQBhN5i/IgBhWgBQUA+iAIFeAJBQD08w4FoAdFAPjw2gWgDBUA4LEEDbbCgADk
+ZAgOUAqAAPogJhWgAgUA+MAAQzAAmgAAAAAAAAAAAMIa5mwgIqgFAADnfP8iIIEAAORw7WGYCQAA
+KDG+LUJi4FEEDCNsAADqeFUW/rGAAC5CXiJCYCqif4jh6+IAJ3v/AAAv8j6bgIvg6RYCL/5CgACv
+qii2AenmASET/QAA6eYAJtv9AADrRmInc/8AAOJGYCdz8QAA6eWBJYERgAD6oAQA0AIVAOsSASkQ
+CoAAW5MjiRL//agNoAwVAAAtYH4u3OgODkfpZH8nMGOAABh5T/nAAQQ///UAL4a7L4bDLWB+6RYC
+LPgEgAAP5BYBAgAYd9MogoIA0QTgmxoOgQqAAP2AAQbf/vUADt0DDYgBC4gCG3fLKLaCD+QW/CBo
+Fe/+AgAJ5BYBAgAbd8UqsoKNEcfvDt0DjhDA8eLyOQ8BCoAA7aoBCWAKgAAMqgIqtoIJ5BbRDwBs
+EAQpITkoITgqIAf5AQYN4aoBAMAg0Q8ed7IVd7Mu4IAMqxGlu+2ynidw3QAADk4U7HeqF3ANAADv
+AgANGASAAP+gBDuiAJ0AKbKdDKoKKqK/CpkBCZQC65QABIPBgAAsIHVkwB0CKgLsIhws2ASAAFuS
+L+yrEQ0wBIAA+oAARfAAGgDAYCwgdMrH7CIcKVAEgABbkfamru13yhn/AoAApf8u9p38Q4YV4AIF
+ANEPAAAAAADod8MZzwKAAKWZJpad+EOGFaACBQDRDwD//hQNoAkFAMck0Q9sEAgqIAeIIux49hlI
+BIAA+iAABTAPRQDqqwoMBUYAAA67Eay8Lc0CLtECJ9ED/8EAD3AEBQDuFgMnBVGAABZ46hN46JwS
+End7mhGZEKKyIhYEAnIL4hYFIRAjAADyXIAVoAsVAIkVJSK/o5l5UViMUYtQm8CNUCr6gApaAf2g
+JhWgCwUAm1CbUVv/p/FF6A3gCxUAiBQLfwMI/wum/S7SfowTo/+V4J9QnlHl1n4iIAUAAHxJrikS
+AimdAueVAy0CIgAAwCDRD4IUC3cDAnIL4hYFIRAjAAAiLOQlIr9j/40AAAD3oGQd4AIFANEPiBUp
+Ir+jiJWRmVCYUfRX5hXv/t4AAB13QS3QgIsR6hIAJujdAAD8jgAO8AwVAO3cAiXYYQAAWAhswCDR
+DwBsEAQad8sbd8sZd8j5UBAVr/71AOsrCgkBCoAA9zAQFeAMFQDkSDkOMAqAAPlQBh2nRgEA50UB
+CeuCgADlxTkJ08KAAONRJ3vABIAADaoCDk4D7ncBCegKgAANdwL7c+YVp3cBAOeUgCQAeYAAyX/R
+DwAAAAAAAADvd7ET/5mAAC7y0scuAu4BDs4CLvbS0Q8Vd6sjUtLHjggzASNW0tEPbBAIG3iHGXiH
+0w8osh/+8QwFoAoFAOyQACRr/QAAbYkbDM8KDv8KL/G+5fASZVAFAACxzAzcAQwMRyyUANEPAB53
+BC/iRSqy36z/Cf8Rr6qPoimgB8Aw8fDcDeGZAQAdeG0JnArieGweX4KAAK275XhrFegLAADo0QIn
+O8sAAAfHCvegZBWgD0UAD4g26BYDJAW5gACaEJsSlxQHZwvnFgUjuCMAAOkWASO7kQAAiRUkcr+i
+mXlBdIxBi0CbwC1CACr6gApKAf2gJhWgCwUAK0YAK0YBW/8h6BIELQTKAADA8Q9vAwj/C6X9LtJ+
+jBOi/5Tgn0CeQeTWfiGYBQAAfDmriBLpeEcUQAsAAOaFAy0D0gAAGnhEKZIfK6AA6Zz/JdgFAAAL
+mQEppADRD4cUwIEIZgMHZwvnFgUjuCMAACd85CRyv2P/bxl4Nhp4NibVAymSHyugAOu8ASTL/QAA
+C5kBKaQA0Q8AG3gvscoK2gEqtADRD4sVLHK/oruUwZxAm0H09+YVr/3yAB12rC3QgIsR6hIAJujd
+AAD8jgAO8AwVAO3cAiXYYQAAWAfYHngcH3gdLuIfKPAA6IwBJ3P9AAAI7gEu9ADRDwAAAGwQBBJ2
+piIikwLCUNEPAABsEAQadpnTDy2ihCiihymih/lgAAQ7mYEAeYkUCeowGnabK6JBw8IMuyirmSmm
+tNEPDAIALqKCf+/hItAHbivbwKX87f4FoAsFAP5AABcw/wUAWTX1IizxyiL0AeId4HMVAMChWSth
+BSQ2BDMM+mBoHeAKBQBZEhYEIgxlL+PAoVkrWvoOIh3gCgUAWRIRCeowGnZ+K6JBw8IMuyirmSmm
+tNEPAGwQBBR3Axt3ARV36CNAgP7uBgWv/+UA/f/iHeAMFQDkMA1iujEAALAyIkSA0Q8AAPQAAh2g
+CEUADwIA0w9timrpUfwi0AsAACqhACiwgPqABADQBhUA+yDWDaADFQDAYADJGgkJRwiSAeIyOQxQ
+BIAA5iEsexuCgAANkgPiiAELE8KAAOMiAgsYCoAAA4gC8vPmFaeIAQDotIAlAKmAAMmIsUTnfAQi
+qAkAANEPAAAA/x7QDeADFQBgAAHAMCji0g+IAQg4AvnaRhWv/14AAABsEASFI4ggFnZG/OyEBaFV
+AQDkgGdq1sKAAKamKWJ/J2J+HXY98yX+DaALBQByeS8rZn8rZn6EIYggmECFICNifZRRmyDrJgEh
+m/0AACNmfdEPAAAAAAAA8uAEBCIAnQBykRyKIZigjCApYn2awZsh6yYAJMv9AAApZn3RD9EPAKze
+rq5+gTDoZn8qga4AAM6NL2J9avIoI2J7I2Z/hSGJIJlQiCCVgZsg6yYBJ6P9AAAkZn3RDwAA62Z/
+Iv6pgACFIYkgmVCIICRifZWBmyDrJgEiI/0AACRmfdEPjiGs36+vD+8MD744/s/GFa/90gBsEAQj
+IQQVdgb0YAQB9kM5AAQzAiMlBNEPAAAAbBAEGnZR6CIDIVv7AAArsnwqon/HnOmIAQ3eQoAAC6oI
+C4AA0qDRD2wQBIkwFnZGh0CKkSZif4yQnKCLkIgy+2AmFaALBQCbkeuWACRD/QAAmDKFJwl3Eedj
+CAKr/QAAlSfrRQMigEmAANIw0Q8AJCAaJkzo+kNmHedmAQD8wmATX/n1ABh3SwhoCimGuymGwyQg
+GuI0AA3QBIAACuQWAQIAHXXRLNKC+oAEANAPFQDgvhoKAQqAAAD/Ggn/Aw/MAQ7MAizWggrkFtEP
+bBAEJCELJEz4BARDIkz8sDgCgzjSMNEPbBAIGHckkhTmEgQrEASAAPjAAEMwACIAylnNJypigAo5
+AelJ8nKr/QAA8OEwDeACBQBgAAfaIFkqlGP/3ppw0Q/AINEP3jDtEgQqeASAAPogBhWgC4UA/O4g
+BaAKFQBZNRnHK9EPAABsEAYadaYVdyD1/8IdoAcFANMPI1KuAAIAKaLQ0w8EmQEpptAYdjQnhlxY
+h+VZMMtZNpOSEBZ3FR119wgsEAw8Ag3MAixWrht3EtMPJ7aEKmIi9O4iBeADBQDndvgVAnmAABJ1
+kRR3CysiSipi3Ks7CbsRq6ouQoAtcIAAMAT1wAQHcN2dAO5GgCb8OIAALKIeyMPAsVkOsC1iIrEz
+7TPHciCDAADyIAgVr/TlAB92+y7yggTuAe72giEsLQAAWIe+0Q8AAFkSDBh29i+CyBl29Qn/Af8Z
+BhXv/5oAbBAE6iQACdgEgAD8ACIdoE0FAFgGndEPbBAEwEAE5BYBAgAWdWclYoL6QAQA0AgVAOA3
+GgkBCoAA/QABBF/59QAJiAMIVQEHVQIlZoIE5BbRDwAAbBAEE3bdIzF+ojLRDwAAAGwQBokiJDID
+DwIADwIA8TgcDedEwQD0gAk6UgCdABV1T+Z1SxpPAoAA9IAJuhIAnQClmSiSnvcAC7NSAJ0AK5Kd
+BkwKLMK/DLsBZLFKFnbGiiAtYpD9QAS74gCdAPwAIh2gDUUA9s/EFaAOBQD6IEYVr/j1APggBhWg
+DwUA9MAAQzAIBQDoFgErUASAAFgBMPwAAh2gDUUA/gACHaAJBQD4IAYV4A8FAOkWAS1YBIAA6RYC
+K1AEgABYASXAlgxOEaXuKeadLSAGiyL67VAFoAwVAOy7AgboBQAALSQGmyL6YEYVoAIFANEPAAAA
+AAAAAPwAAh2gCAUA+CAGFaANRQD4ICYVoA4FAPggRhWgDwUAWAEPwJMMThGl7inmnS0gBosi+u0k
+BaAMFQDsuwIG6AUAAC0kBpsi+mBGFaACBQDRDysgBv7tFAXgChUACpgC6CYCJdgFAAArJAb+YEYV
+4AIFANEPF3T9inhqoUsMSRGlmSySnm7GUiuSnQZMCizCvwy7AeSwRWVr/QAAnXhlvrxgAATAINEP
+AOtMGClQBIAA/AAiHaANZQBYBh7AINEPAP/6WA2gCwUAwKBZMPaKeGuhqf//HA2gCwUAwLDA6g6u
+NP7hBhWv/uIAAAAAbBAGjCfudmMa0ASAAPWBKBXvywUA6ckUJkCBAAALiAHrdOoSq4EAAOXGCSTI
+gQAA6cUUJEEBAADoWwt5ygKAAC3BFaXVlcmbUI8g+qCmFaAIJQDpVgMv/gKAAAj/Ap9RiSL0oIYV
+pzMBAO5WAiyMHgAA9GAIylIAnQAUdMHmdL0ZzwKAAPRgCToSAJ0ApJkskp73gArzUgCdACuSnQY8
+CizCvwy7AWSxMhx2OIogLcKQ/UAEe+IAnQD8AIId4A4FAPePxBWv+fUA+CAGFeAPBQD6IEYVoAgF
+APLAAENwDBUA6BYBK1AEgABYAKL8AAIdoA1FAP4AAh2gCAUA+CAGFaAPBQDoFgEtWASAAOgWAitQ
+BIAAWACXwNYMPhGk7i3mnSwgBooi+Ow0BeALFQDrqgIGYAUAACwkBpoimVLRDwAAAAAA/AACHaAI
+BQD4IAYVoA1FAPggJhWgDgUA+CBGFaAPBQBYAIPA0ww+EaTuLeadLCAGiiL47AwF4AsVAOuqAgZg
+BQAALCQGmiKZUtEPKyAG/uv+BeAKFQAKmALoJgIl2AUAACskBp9S0Q8AAAAAF3RzinhqoUMMORGk
+mSySnm7GSiuSnQY8CizCvwy7AeSwPWVr/QAAnXhlvszrPBgpUASAAPwAIh2gDWUAWAWW0Q/RDwD/
++rgNoAsFAMCgWTBuinhrobH//zwNoAsFAMCwwOoOrjT+4QYVr/8CAAAAAGwQBCsgBxZ0Zhl0+vzp
+QgXgyxEA6iEILmKCgAD9hgAOcbsBAOw2AC3cAoAAC6oCCaoChyCZNpQ4lTn2YEYVoCIFAPJgZhWg
+CAUAmDqYO5o0/OAAE7AINQAIdwLnNgEhkMEAANEPAAAAbBAELCAH6yIAKdAEgAD8ACId4A5FAPwC
+AAYwPwUAWTH2HXRcGHSCHnW67QAFDUgEgAAJAmEJAmEJAmEpIAcvIQgJCUHupgIszAKAAPnmAA/w
+CwUA6P8CBRDBAADvpgAlSEEAAAQghgkCYwQAhgkCYSukFtEPAAAAbBAEKCAHGnRqCChACokQCpkC
+mTCHIB10KhZ0MOp1NRu+AoAAB1cClzHmABUBuCEAAAcAiishCO02BCxkAoAA7LsCCs8CgADquwIE
+46EAAJw1+mDGFeAOBQCeNwQAieo2CCTLQQAAmTnjIRcBkMEAANEPAABsEASXNhl0Dxx0DvzoIAXg
+HoUA/mBmFaALNQDtNgIqxsKAAOw2ACp4QoAA6P8CCVYCgAALqgIYdXwPbwKaMYsamzmKGQkpApk0
+mjiJGAj/Ahh0Bpk3nzXoABUBkKEAAAIAiiI8MNEPAGwQBBh1MiWCf8CQ5oJ9IoIJgACKYYxgnKCL
+YJqxmWCZYSeCf7B3J4Z/jiGW4J5hkmDmJgEjMyEAAOI0AAsYBIAAbUkFAgCGAwJh0mDRDwAAJoKA
+hWGKYJpQh2CVcZlhmWAvgoKw//8QRhXv/v4AAABsEAQFBkdpYkgYdRSFJyqCf/SmABXgCQUA4oJ9
+JQHZgACHIYsgm3CKIJehmSCZISaCf7BmJoZ/jVGS0C0mASUmAOJWASFjIQAAbUkFAwCGDAJhwCDR
+DwAAIoKAjyGHIJfwhiCfYZkhmSAugoKw7v8QRhWv/xYAAABsEASIIPpApBWvzAUA4iIDKTgEgAAM
+fAHsqggKXwKAAOghOHVRAQAALXkEqLmr3S11BHmjLck3yUXiNAAMGASAAG1JBQIAhgMCYSlyAAuZ
+COqRWXwQBIAAmXDRD8CgmnPRDwAIqQzpugwBgaGAAAlLFO28CCmQBIAA7U02DDAEgABt2QUCAIYG
+AmEJMgjrTgwGGQEAAG3pBQIghgMCY6rPL/xA73YALBAEgADRDyLMQOJ2ACwQBIAA0Q8AAGwQDJIb
+lBeVGZYYKCIHKTAD6zACKfAEgADnFgwkQIEAAOgWDSq4BIAA9WAcYRIAnQAiCgL7IeAVoBwFAPwg
+hhWkqh0A5RIMJWAFAADmEg0ubwKAAO3tCAlHAoAAqFXywKQV78gFAAhmAZYapjbmbEAu0ASAAPeg
+ItqiAJ0A36DstAAOT8KAAPlgFbViAJ0AiKGJoJlQCHg2CHcM6FYBJUghAADpBgACmCEAAAMAio2h
+g/KKowjdDJ3xqop4qwIjPAGa85Py9CAGFeAJFQD9LQAO8AgFAO2YOAZICQAA6Js5BBYZgACFEORy
+uWKYQQAAhBfvRBEF0AUAAPVAFTqiAJ0AGHNmwNDoFgUkQEEAAPggxhWgDwUAbQgXAAEwAAAxIAwJ
+IA0BAAExAAIAAAIwIAwBjB2JGizBBQ62C6nJ6ZxAK1AEgAD4wAfa4gCdAIygA9kL49YKBMghAADs
+eDYGAtGAAAh3DOhmACVgIQAADCCICQSKhqOJoIyipoYImQyZoJaj6GsGd/gFAACxzOymAiOIoYAA
+ZNC06BIGIZhhAADwYAWPEA0FAOgAFQnIBIAACQCKCQCKCQCKjKHseTYGA2GAAAl3DAPYCwPWCulm
+ACVgQQAA7EYABEAhAAAICIqGpYihLKIEBpYICYgMKKYBJqYF6WsHd/gFAAAszAHspgQjhSGAAGTQ
+ZOgSBiGYYQAA7RIFIfGEgADoABUJyASAAAkAigkAigkAisDQiaBkkFTkcHFl0AUAAHSraWP+2AAA
+AAAAAAD8zwANP/wWAP/9oA2gDRUAjBXsAAUJyASAAPgAqB3gAMoAAAAAAAAA//7oDaANFQDtAAUJ
+yASAAPgAqB3gAHIAiaGzuPkCAA3//o4AAAAAAPgAqB3v/IIA+ACoHe/+IgD/4ACB8Aj1AAgzCvvA
+Rh3kMx0A4yIIB/gFAADvVQEhEAUAAIMbGXRVjBQkMQcec5MYctj6IYgV6kQBAO1y2BonAoAACEQC
+lLCDMA/tOZyz7bYCKdYCgAAKKgKasSmSf/MgDNfSAJ0AiBhmgZCOGx90RBly7//DRBWhyDEAr8ws
+wICetpi36xIJLdAEgAAJOQKZpAy7DJul0Q8AAAAAmxKEF5MRlRDvRBEF0AUAAPVK8g2gDQUA6xYC
+LRgEgADvFgMtqASAAG0IKu68Cw34BIAA5ssiflAEgACMoGXAmIyhsd3lwMhhmA0AALP75DsZfagE
+gABj/86KEfuPAA0//3IA//vwDaAPBQCLEg3cCf1gAEW/9MIAv5rxMdAN5KodAIMc4uwQIZiBAABt
+qQUCAIYDAmGHGQurCfNAQBWgAxUA6XcMBMBBAADoFgQjgKmAACwSBw/MEf1vAA4wCQUADJM5/gAi
+HeANBQAD/Thl3DH/+sQNoA8FAI0QDHg2CHcM6NYBJXghAADvZgAG6CEAAA0MioyjiaCDoqyMCJkM
+maB4ywGxM5yj80BGFeAA1gCNEAx/Ng93DO/WASUYQQAA44YABughAAANEIqMpYihg6Ss/A+IDJih
+f8sBsTOcpZOkgxMYcyuDMAgzAYgQk4CPoGX8T4mhs1j5AgAN//EiAI0ZHHKMixyPGBRz3v9g5hXg
+CgUA+2DGFaHvMQCk7i7ggAw8Apy0Dt0MnbXRDwAAAAAAAPOvAA1/7pYA8gBCHaAYBQD4IIYVr+1y
+AGwQBIQpgywEMwwDA0gjJR8jJSHRDwAAAGwQBIknKpIM+SKCFaACBQDlnCAkoMEAAOSrDAVTIQAA
+66I5BAThgAAqkgnxRRAN4AbVACcKPM02K6AAd7FBaLUrdrkLLKAQaME1drkCaMIvLaAHwMDqVAAO
+2ASAAFv51itZBIpRyL9lr8tgABIsoBBpyM1gAAkAAP//rA2gCgUA8EHADeAj1QAtIABz0RmOLsAg
+7k8MB3MhAAAP4jllL+fAINEPAAAAAOskAApQBIAAW+tc4qQADX6OAABj/+EAAP/9nA2gCgUAbBAE
+BQZHaWJSiyeIuPlipBXvzQUA57ILJdCBAAANrQHtmQgKZwKAAOhxNHTJAQAALrkUrIWs7i61FHWT
+Ksg/yE1tSQUDAIYIAmElogAMVQj4qwYN4AIFAJWg0Q/AINEPwCCSu9EPAADolQwBgXGAAAVHFLh2
+5kY2CZAEgABtaQUCAIYIAmEFMgjnSAwGmQEAAG2JBQIghgMCYwXJDKnZKZxA+UAGFeACBQDRDyvc
+QPtABhXgAgUA0Q8AAABsEAQuIAcfcigOLkDtcesfcoKAAA/uAp4w6CIAKlAEgAD04/gFoAtFAPxg
+RhXgPAUA7DYDLEYCgAALiAIbchzoNgEpyASAAOQABQGYQQAAAwJhAwJhAwJhLCAHKCEI/CAABjAE
+JQDlRDYOZAKAAP0GAAww1k0A64gCC+QCgADrzAIEkQEAAOyWBiSogQAA6JYEKpgEgABtSQUKAIYD
+AmEtVAbRD2wQBPpAsBXgBbUA9uW6BaAMhQD2ACId4BMlAPpllg3gBAUAc7Fl9WAGDZADlQB1sXT1
+YARMkgCdAHO5V4giZYBS28D8QKYdoAE2ANogWJv/+kBoHaALBQBb/18acaGLICMkBSqiOClilquq
+CaoRqpmLl/tkABWvzAUADKoB5LUUJVEBAACauZq4JJQFiyJksI4rIAXAyf1g1g2v8lUA0Q/SQNEP
+AACNImXf6AIqAlujEGWv3MDq/kCmHaALpQCPImX/0NogW6LpZa/FKSAGiCIjJAXniAIEyAUAAPhA
+xh3gC5UA+EBGFa/+tgCJImWfo9ogW6MpZa+YLCAGiiLAvCskBeeqAgZgBQAA/EDGHaALxQD6QEYV
+r/36AAAAAAAAAPpAaB2gCzUAWS2J5qCpbRgEgAAecWeK6PdABbiSAJ0AE3FlLDKudcNnLWJoLDKt
+DcsBfcBdsK+f6H3AY9og/EEkFaANBQD+H+Id4A4FAFibiPxEZBWgDQUA+0BoHeAOFQD6QGgdoA8l
+AFibgSU2rSkgBogiwaEqJAXniAIEyAUAAPhAxh3gGxUA+EBGFa/7ngDAsMDKDKw07OYILf0GAAD6
+QGgdoBvFAPwAIh2gDbUAWAJyY/66AAD6QGgdoBvFAPwAIh2gLQUAWAJsZT6iY/+dAADAoFktRR5x
+Noro+V/5+JIAnQBj/7dsEATiIHApIASAAOI4AgEASYAAKERw0Q/6gGgdoAsFAFv+6ypAcAw5EQk5
+AgqZAilEcNEPbBAGJiAHiif4YGgd5zUBAPggBhXhZgEA56IOKZXgAAD0gAuZEgCdAPiACADSAJ0A
+KKkUZIANLCAGKqIJ9YAMYJIAnQD6QGgdoAtFAFv/32Wg54oQiqMpIQkKCkPkmRENVsKAAPsmAAyw
+GgUACpkC+OAGFeAAVgAAjBAszBDsAx4L2ASAAAsCYS0gBW7YfS4gcn7vd9ogW/9LZaCnLyAF6SIC
+L8GkAAAoIHJ+j17scPcchJ4AAOlw+BgECoAA9MAE+hIAnQAMahGpqiuingxtCi3Sv/dgCmpSAJ0A
+K6KdDbsBZLEn3HD6QGgdoA0lAP4AAh2gDyUAW/8KGHDnDG8R0w/54ABHsA5FAC72nWgyTIon+oBo
+HeAMBQDqrCAqaASAAFv4jNKg0Q8AAAAA+kBoHaALJQBb/6Vkrz3AINEPAAAAAAAA6xIAKVAEgADs
+RAAK6ASAAFv+w9Kg0Q8AwCDRDx5wzY3o96AGGJIAnQAMahGpqiuinvdgBppSAJ0AK6KdDG8KL/K/
+D7sBZLDBsNiY6GW/UGAAdQCJkvj4AATwO3UA+z/0HWIAnQD6QGgdoAuFAFv/hmWvgosQK7wQ6wce
+C9AEgAD6BKgdr/sCAGSudI2g/PgABvAupQD/v/M9IgCdAB9xJo6i/9/y1WIAnQCJIrDL+kDGHe/6
+5QAKmQH4QEYV7/kOAAAAAAAAAADqJAADWGEAAPwAIh2gDUUAWAHQY/8hAAD/+uQNoAsFAMCgWSyo
+HnCYjegZcJgccJT5v/lokgCdAP/9IA2gCwUAwLDAigjYNPnBBhWv/OYAAGwQCBtyGJsQ+EAIFaAJ
+BQCZEpkTkxTkFgUpUASAAPQgxhXgDCUA5hYHLEYCgAD9BgAMMA0lAOgWASjYBIAAW/9Z0Q8AbBAE
+wCDRDwBsEAaWESwgO4Yn4xYCI9kBAAD0IAYV78gFAPTEABXj7AEA6FUBD3cCgAD+YABFMA0VAPtF
+ABWgAK4AAAAsIDux3bHMLCQ7LmEV5egIBXhBAADojEAv0ASAAPngBvqiAJ0AiaHpTzYE/tGAAO9E
+DA1IBIAA6SYADeAEgAAMBIoJAIgMAIouogMjogIvtgEpogEO/ggupgMPmQzppgEl2EEAAO/rB3ng
+BIAALDwB7KYCIg4zAACOEC8hIoURGnHYJCEHiRIjIQn6QPAV6kQBAOmSACojAoAABDMCJCEk+yAE
+BLC7EQDqcEUd2oKAAPsmAAzzhQEA63BWHEICgAAIRAIYccgKmQKZcIwgnnWTcxJwSZR0lXbi/wIO
+ZgKAAO92AiaQEQAADCwCnHHrABUDqMEAAAUAigjYAph+0Q8A/+8ADT/8hgBsEAT84GYFoBgVAOOL
+CXnewoAAwZVzm1eNJyjRA4nTrLyK0vsgBhWgiHEACIgJitIMiAoccav5QCYV4A8FAJ/Tn9LvJgIk
+QB8AACKCwuy+CAET/QAAIobCKuJgsKr7zAYVoAIVAO/VAyUAuYAA0Q8A2zDsIgIpUASAAFkr3tEP
+AC3NAa27KbB+KpzoCgpH/UJgE1/+9QAYcXgIqAouhrsuhsMpsH7a8ArkFgECABxv/yvCggCRBOD9
+GgyBCoAAACgaDogDCLsBDbsCK8aCCuQW0Q8AAGwQBCsgBx5v9P5A5BXhuwEA7G/uHc8CgACumfkz
+yBWq/wEA7L0KDdAEgADt0r8v/wKAAPcABWpSAJ0AKZKdDZkB7JQABIU5gAAYb/MpIAcUcC4tMRD4
+IAAC8JkRAOtwKxzKgoAA6f8CCqwCgAAF3QIL3QIE/wKfwI8gncT5gEYVoDQFAPWAZhWgCQUAmcX5
+gOYV4AVFAOvGBi/+AoAA5f8CBliBAADvxgEhyEEAAAkghgsCYwkAhgsCYfhA6BWgCzUA/0AAFLAM
+BQD/IABEsA01AOWWnSRQgQAAW/du0qDRDwAAAP/9ZA2gCQUAiiLIosAg0Q/rvBgpUASAAPwAAh2g
+DUUAWADmwCDRDwBsEAQoIQWHIfRAghXvyQUA6SkBClcCgAAKdwwKVQglJQTnJgEk2QEAAHt7BQh3
+CCcmAaiS5DAaYREBAACnpXUjFuI0AAuYBIAAbUkFAgCGAwJh0nDRDwAABykMCUgU6owIK7AEgADq
+SjYJkASAAG2pBQIAhgYCYQOSCAhMDG3JBQIghgsCY9Jw0Q8AAGwQBIsnH2+gHnEchrkpuRT5ZAAV
+r8oFAOqIAQMzQQAA5rYJJMjBAADptRQkQQEAAPjBcg2gDTUAKbEVppaWuZ9gjCApbBDuZgIuZgKA
+AO3MAgrGAoAA/MAmFaALJQBtugUEAIYJAmHAkvkGAAxwBQUA6GYFIYT5gACJOPbffgXvnmUA6zIJ
+JICBgACVO5mwjDibwZU4lTmNPCRyi9MP7jQFJvzIgAArMhIuQiTTDwuKRPtaAA0wDAUA/0ABBTAN
+FQD7QAgVr7uBAFv2lfRiRhXvygUAiDeLMOU2DCR4gQAACv8B5YUUJ/kBAACfiZ+ILnJ0+oIoFaAM
+BQD/bwANsA0VAFv2hyhCEg8CAA8CACiM/yhGEuokAAtYBIAA/ABiHaANNQBb/1DRDwAAAGwQBPTg
+BgXipwUABycopXUlUn/BbwNmDHZdFBpwDwg4EOhIAglPAoAAqpmYkNEPABtvQgM6Cqt7C6oLKq0Q
+KaGl9S8ADLALBQALmTUppaXRDwAAAGwQBBVv6vrebgXipAUABCQoAzgKq0v0gABCcAoVAOdCfiHg
+QQAA5kJ/LgEKgADriAsNSAqAAAl3AQdmAuZGfyRAPwAAJYKRsVUlhpEkQoAAMQQAoxrjSBN0QSEA
+ABRv0gwiEaQigiACMgHRDymNAiuRAiWRASmRBQtVAXlbA8Ag0Q/SoNEPAABsEAQqICIpICMeb5H7
+LwAMsA8VAOSQXGcjQQAALCAHDAxBBMwJK8H+Cb02DbsMK8X+KiAijCmtqvpBaBXnqgEA6iQiJQJB
+gAAo4n/ggQQFS/0AAOCZGg/ACoAA6bsIBEP9AAAIuwKbKgy5DHOTKsAg0Q8AACogBWihdYsiwMIM
+uwL6QEYV7/JFANEPAIspmyr9YGgdr/9SAAArIAcNrAz8REYdobsBAAS5CSiR/q2IKJX+KiAiy6ss
+4n+NK+DBBAVL/QAA4JkaD8AKgADp3QgEQ/0AAAjdAp0q67wfKVAEgAD8ACIdoA0FAFgABcck0Q/H
+JNEPjSn8QUYV7/9+AAAAbBAE+OC0BeAYFQDzAAP74AYVAAs7Eam6LKJgKZ0B6bkIBgTZgAAfbs2N
+JwROCa+/D+4K6DwRB0AfAADngsEqfIKAAA/MAuxcAgb4IQAA73YAJ3ArAACe0pfTHm7uJ4LCL4bB
+DswC7NUDI7gFAAAnhsIvomDukH4n+AUAAC+mYIwiAOEEAG0aDcwCnCLRD8GF8x/7++IAnQAYcDcI
+OAoogn/aMPpAaB3gDAUAC4AAiSIAMQQAahoKmQKZItEPLJB+9S/mHeAHBQAnlHznlH0rwASAAAjk
+FgECAB1uly7SggDBBPzAAQZf//UAD88DD+4BDswCLNaCCOQWLzzoDw9H9f/5G1IAnQAdb/8N/Qon
+1rv3uGYV7/xKAGwQECoiECigBSkKlfkAMTxiAJ0AjCJlxl0tIhIebzv+3SwF4d1BAOdufh7GgoAA
+6BYJLu+CgAD/oABG8BvlAPwhRhXgBDIAL0IbLUIar696+wGx3S9GG/yDRhXgBAUAKCEHGW58+t5s
+BaqIAQDvIRosRwKAAAmIAphQBEgJiSCaUvrdOAWgTQUA7VYDLEeCgADtbvcUQb0AAPsmAA00iB0A
+6lYELM4CgAAJiQKKHZlRGW9yDaoKKqKf71YGI2jBAADtVgUieAUAAAn/Ah1u6i9WFI8ZGW9oDaoB
+Cv8CCf8Cn1ePHC0iFYopr93vqggG6MEAAO0mFSVQwQAAmikMyRGnmSiWnSwgFi0qoPpA8BWg//UA
+/4VGDeAY9QAfbwANrR2v2SmSfwyIDPkgJtoiAJ0ADKkR7pkIDkICgAAIuAKYkyoyEykyEvsgIEwg
+G+UALCAH+NxgBaHMAQDsFg0uVwKAAKeqLaKeCMgKKIK/+6Aj8+IAnQAlop0IVQHkVHBi0YEAAC8y
+F5oVKDITiTcmMhItIhcrmRQIZgz4QUgVoAQFAO1mNgWdWYAAhJmLGikiCQ//CSuygAT/CwmIDOa7
+CAtoBIAA6xYMJdjBAADrFgQn+cEAAPsAFoviAJ0AKiAWKAr/7wIABUhBAAD5QARMIgCdABhuxiQW
+EyMWEiQgByUWFPQhZhWipQUABUQdFW4OCqMKqEilRAQzCySCfvsgBADQCRUAAJUaBUQBJYJ/5FUC
+AZg/AADlhn8hmSEAACQyf5MY5RIUIiAFAAAkNn8ogoDjEhItAQqAAOQSEyzQCoAA+wAawKIAnQCI
+GwyIEa6IiIAIqgFko10mVCcnFhX6IsYV4AgFAChUI/ikJh2oth0A+qTGHeAKVQD6pAYdqLsdAPqk
+ph3gCgUA+qRGHai7HQDrVCQiSOEAAOkGAAK4oQAABwCKiz76pmYd6LsdAPqmRh3oux0A+qYmHei7
+HQArVDCJPfqnRh2gCwUAK1Q5KVQ3+KdmHaAIBQD4pwYdqJkdAPimxh3omR0A+KamHeiZHQApVDQp
+IhYoVEwoVEArVE0rVEEqVE4qVEL4p+Yd4AoFACpUT/qoZh2omR0A+KfGHeiZHQD4p6Yd6JkdAClU
+PCcyFbF4KDYV9qjmHeh3HQD2qMYd6HcdAPaoph3odx0AJ1REKTITKzIUqbv6qWYd6LsdAPqpRh3o
+ux0A+qkmHei7HQArVEgoMhInEhUrEhYJiAx4aQsoUCEpCoAJiAIoVCEqQhnAkOShGGJBoQAAKTYW
+KTYXCmo2KlYV6CYAAulhAAANBIopMhOqmSk2EyhCGQptDAqIDOhGGSxi/gAA8bjADeAEBQD4YsgV
+4IQBAA+aCokViqAiFhcJggoK2jaaICIyFpgXDyIL6YkLARAhAADixgAEyCEAAAkYiiIyFigyEw8i
+CqqIKDYTiSAKmQyZICkyFg+YCoiACt0M4hIXIiAFAADpFg4sBv4AAOoSBSSB+YAAKDIX/+MAFeAJ
+BQDpNhYkQAUAAPhi5hWgCQUAiBfiFhclEGEAAAgqOfIi6BWghAEA6hYFLvs+AABj+8LAkSk2Fv//
+XA2gCRUAnx8mFhDsFhEpUASAAFv+TCwSES0SEB5uEo8f6xIEJWihgADAINEPKjIWD6oKiqDkrxBi
+wWEAAApqNipWFSkyFg+ZC7iZCeCICByKLTIWJDITD90KqkQkNhOJ0AqZDJnQJDIWD0gKiIDqbQwE
+A3mAAA9NC4TTj9KkpHpLAbH/n9KU0//swA2gBAUAAA+dC4jTj9KoqJgWeosBsf+f0ogW+aBmFa/s
+TgBj/FcAiThkkEqMOcCwmzuZwI04nNGbOPphJhXvmpUA+mCmHaACBQDRDwAAAP/rfA2gBAUA8IKQ
+DeAJBQAoMhcv/BjpNhYkQAUAAPhi5hWv+ToAAAAq+pn6YKYdoAIFANEPwIH4YsYVr/jWAACIGCiN
+AiqBAimBASiBBQqZAfk/5RqgChUAix36QGgdoAwVAPtiQBXgDQUAW/5AwCDRDwCLHfpAaB2gDBUA
++2MAFeAd5QBb/jnAINEPGW0PDMgKqdkJiAsojRDpEgwkQTEAAC+Bfwn/DP/6ABXgCQUACf81/w/k
+He/sOgAcboqNIC4iGIgwj6D/yxAVoDsFAPggBhWgClUAWSxjiThknnCCOZkgiDjzACYVoA8FAJ84
+nzn+YWYV4AIFANEPwCDRDwBsEATIMdEPAIgnJokUg4n1BAAV78cFAOdVAQMwQQAA5oUUIZvBAADj
+hgkiqQEAAHU7HiqBFRts7aOqmomboIkgwLHkpgIszgKAAAuZApmh0Q8cbOacMIsgwMHkNgIt3gKA
+AAy7Apsx0Q8AAABsEARkILZkMLNkULAoIgL42Y4F52QBAA8CAOdsxxwE/gAA7TwfIyV5AAAMaBEH
+iAgqgp4Jawr7d+gV5N0dAP1ABJPiAJ0AKoKdC6oBZKBxHGzhHmzJ7AAFDUAEgABt2QIIAmEYbMKY
+oI8gnVCTo+6mAi/+AoAAD98C76YBJRBBAADRDwAfbKyO+GrhTwxoEaeIKoKe6WsKAeh9AAD7d+gV
+5N0dAH2jViqCnQuqAeSgT2dj/QAAnPhlr5RgAAPAINEP2iD6gwAV4AwFAFv9zcAg0Q8AAP/90A2g
+CgUAwKBZKKQfbJSO+OlskRcOiwAA/GPgFeAKBQD//vQNpN0dAMCgwIoI6DT54QYVr/66AAAAAAEQ
+GAEAAQAAAAAAAAAAAAAgBB//IAQf/yAEHhMgBB//IAQeEyAEH9wgBB+1IAQeEyAEHukgBB4TIAQe
+EyAEHuAgBB4TIAQf/yAEHhMgBB4TIAQf/yAEHhwDAQACAAAAACAErbggBK7/IASwDiAErbggBLAG
+IASv8CAErbggBK24IAStuCAErbggBK24IAStuCAErbggBK24IAStuCAErbggBK/gIASv1SAErbgg
+BK24IAStuCAErbggBK24IAStuCAErbggBK24IAStuCAErbggBK24IAStuCAErbggBK24IASu6CAE
+rbggBK7iIASu4iAErbggBK7iIASu4iAEr7ggBK7iAAAAAAAAAAAAAAAAIATRjiAE0Y4gBNBKIATR
+jiAEzQ0gBNGEIATRYCAEzQ0gBM0NIATNDSAEzQ0gBM0NIATQLiAE0Y4gBM0NIATQLiAE0Y4AAAAA
+AAAAAAAAAAAgBNrQIATfHSAE3sAgBN5XIATd8iAE3ZsgBN1dIATZiCAE3R4gBNuwIATclyAE3BAg
+BNs/IATa/wAAAAAAAAAAARAYAQACAAABEBgBAAIAACAFW6sgBVdsIAVbfyAFW1MgBVsnIAVXkyAF
+V5MgBVeqIAVbDiAFV98gBVfLIAVXkyAFV98gBVeTIAVXkyAFV5MgBVurAAAAAAAAAAAAAAAAAAAA
+ACAFraAgBafwIAWnmCAFpXgAAAAAAAAAAAAAAAAgBafYIAWn0iAFp9IgBafSIAWn2CAFp9IgBafS
+IAWn0iAFp9IgBafSIAWn0iAFp9IgBafYIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9Ig
+BafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAF
+p9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn
+0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafYIAWn0iAFp9IgBafS
+IAWn2CAFp9IgBafSIAWn0iAFp9ggBafSIAWn0iAFp9IgBafYIAWn0iAFp9IgBafSIAWn2CAFp9Ig
+BafSIAWn0iAFp9ggBafSIAWn0iAFp9IgBafYIAWn0iAFp9IgBafSIAWn2CAFp9IgBafSIAWn0iAF
+p9ggBafSIAWn0iAFp9IgBafYIAWn0iAFp9IgBafSIAWn2CAFp9IgBafSIAWn0iAFp9ggBafSIAWn
+0iAFp9IgBafYIAWn0iAFp9IgBafSIAWn2CAFp9IgBafSIAWn0iAFp9ggBafSIAWn0iAFp9IgBafY
+IAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9Ig
+BafSIAWn0iAFp9IgBafSIAWn0iAFp9ggBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAF
+p9IgBafSIAWn0iAFp9ggBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn
+0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9ggBafS
+IAWn0iAFp9IgBafYIAWn0iAFp9IgBafSIAWn2CAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9Ig
+BafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAF
+p9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn
+0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafSIAWn0iAFp9IgBafS
+IAWn0iAFp9IgBafSIAWn0iAFp9IgBafYAAAAAAAAAAAAAAAAIAWoIiAFqX0gBasrIAWrHSAFqwgg
+Bar6IAWq5SAFqtcgBarCIAWqtSAFqqIgBaqVIAWqgiAFqnUgBapiIAWoGyAFqk8gBapCIAWqLyAF
+qiIgBaoOIAWqBCAFqfMgBanpIAWp2CAFqBsgBagbIAWoGyAFqBsgBagbIAWoGyAFqcsgBag7IAWo
+GyAFqBsgBagbIAWpriAFqZUgBamLIAWpbCAFqBsgBalZIAWpPyAFqSwgBakSIAWo/yAFqOcgBajU
+IAWowSAFqFgAAAAAAAAAACAFreMgBa3tIAWvQiAFrxcgBa8QIAWvCSAFrwIgBa77IAWu9CAFru0g
+Ba7mIAWu3CAFrtIgBa68IAWulSAFrmogBa5hIAWuRiAFrjwgBa4rIAWuGyAFrhQgBa4BIAWt+iAF
+rdUAAAAAAAAAAAAAAAAgBkDIIAY+HCAGPKwgBjpEIAY4QCAGKkwgBizgIAY22CAGKPQAAAAAAw8I
+EoOOk5JSVgAAY29uZmlndXJhdGlvbiBmaWxlIHBhcnNlciBmb3VuZCBhZGRpdGlvbmFsIGNvbmZp
+Z3VyYXRpb24gYWZ0ZXIgW2ZpbmldCgAAMAAAAGZjb2UAAAAAdm5pY19pZAB2bGFuAAAAAHRvcwBl
+dGhlcnR5cGUAAABtYWNtYXRjaAAAAABtcHNoaXR0eXBlAABmcmFnbWVudGF0aW9uAAAAYmFzaWN2
+aXJ0dWFsAAAAAHN5bm1hcGVuAAAAAHN5bjR0dXBlbmlwdjYAAABzeW4ydHVwZW5pcHY2AAAAc3lu
+NHR1cGVuaXB2NAAAAHN5bjJ0dXBlbmlwdjQAAABvZmRtYXBlbgAAAAB0bmxtYXBlbgAAAAB0bmxh
+bGxsa3AAAABoYXNodG9lcGxpdHoAAAAAbGFuAHdhbgBjbHVzdGVyAG1hbnVhbAAAdHBfcGlvAAB0
+cF90bV9waW8AAABuaWNfdm0AAG5pY191bQAAbmljX3VtX2lzZ2wAbmljX2hhc2hmaWx0ZXIAAG9m
+bGQAAAAAcmRkcAAAAAByZG1hYwAAAGlzY3NpX2luaXRpYXRvcl9wZHUAaXNjc2lfdGFyZ2V0X3Bk
+dQAAAABpc2NzaV9pbml0aWF0b3JfZm9mbGQAAABpc2NzaV90YXJnZXRfZm9mbGQAAGZjb2VfaW5p
+dGlhdG9yAABmY29lX3RhcmdldABwb2Zjb2VfaW5pdGlhdG9yAAAAAHBvZmNvZV90YXJnZXQAAABw
+cHAAZGNieAAAAABzb2NrZXRudW0AAABjZWUAaWVlZQAAAABhdXRvAAAAACADE5wABAAAAAAEAAAE
+AAAAAAAAIAYouAAAAAAgBigQIAYlqCAGJJggBgQAIAWxsCAFoYAgBaBYAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAIAQ//CAET0ggBE9IIARPSCAEYNAgBHewIASGkCAEjYggBDzAIAQ6MCAD9EQgBKz0
+IAPx9CAD7rggBaAsIAWfBCAFmFAgBE9IIAWXeCAFljQgBZVkIAZwQCADZsAgA7twIAZLJAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAQWzCAEARwgBBDcIAQOUCAEDNQAAAAAIAQKfCAE
+FggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAZ3vCAGXkAgBnesIAZeUCAGXmQgBl1wIAZf
+DCAGXQT/GDBgYAAAAAABAgMAAAAAIAZBcCAEPiAgAGFAAAAAAAAAAIEAAAAAAAAAAAAAAAAgA+e0
+IAPm9CAD5hAAAAAAIAPc7CAD3OQgA9zcAAAAACAD1PwgA9V4IAPVGCAD1YwwMTIzNDU2Nzg5YWJj
+ZGVmQUJDREVGAAAAAAAAAAAAAEFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaYWJjZGVmZ2hpamts
+bW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5Ky8AAAAAAAAAAAAAAAAAAAAAIAAghAABAAAgACBkAAUA
+ASAAIEgAAwAFIAAgKAAHAABjglNjAAAAAP///////wAAAAAACAAAAAUAAAAHAAAAAAAAAIgAAACF
+AAAAhwAAAAAAAABAAAABAAAAAoAAAAAAAAQECAAAAAAAAAAAAAAAAAAAAAAAAACAAAACAAAAAoAA
+B0MAAAAAAAAAAAAAAAAA/////////////////////wAhAAkAgQBBACEACQAhAAkAgQBBAIEAQQCB
+AEEAgQBBACEACQCBAEEAIQAJACEAEQCBAEEAgQBBACEACQCBAEEAIQAJACEACQEBAEEAgQAhAIEA
+IQAQEGEBAQCBAQEAgQMCAQAAAAAAAAAAAAAAAAAAAACAAAABAAAAAgAAAAQAAAAIAAAAEAAAAAAA
+AAAAACADB6wAAAAAIAMNuAAAAAAgAwewAAAAASADDiQAAAACIAMHuAAAAAQgAwfAAAAACCADB8gA
+AAAQIAMOLAAAACAgAwfMAAAAQCADB9gAAACAIAMH5AAAAQAgAwfwAAACAAAAAAUAAAADAAAAAQAA
+AAIgBkTcIAZElCAGQ4QgBkI8IAZB/CAGQdAgBkIkAAAAAAAAAgAAAAQAAAAIAFllcwAwMTIzNDU2
+Nzg5YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoAAAAAbm9uZQAAAABhbGwAKgAAAGRpc2FibGVk
+AAAAAGVuYWJsZWQAMHgAAE5BAABWMAAAVjEAAFYyAABWMwAAVjQAAFY1AABWNgAAVjcAAFY4AABW
+OQAAVkEAAFZCAABWQwAAVkQAAFZFAABWRgAAcG9ydAAAAABwcm90b2NvbAAAAABnbG9iYWwAAGZ1
+bmN0aW9uAAAAAGZpbmkAAAAAcmVnAGZpbHRlck1vZGUAAGZpbHRlck1hc2sAAHJzc19nbGJfY29u
+ZmlnX21vZGUAcnNzX2dsYl9jb25maWdfb3B0aW9ucwAAc2dlX3RpbWVyX3ZhbHVlAHRwX3BtcngA
+dHBfcG1yeF9wYWdlc2l6ZQAAAAB0cF9wbXJ4X2ZsYWdzAAAAdHBfbnJ4Y2gAAAAAdHBfcG10eAB0
+cF9wbXR4X3BhZ2VzaXplAAAAAHRwX250eGNoAAAAAHRwX210dXMAdHBfdGNwdHVuaW5nAAAAAHRw
+X3RpbWVycmVzAHRwX3RpbWVydmFscwAAAABzY2hlZF9pb3F0eF9icF9wcmlvcml0eQBudmYAd3hf
+Y2FwcwByX2NhcHMAAG5pcWZsaW50AAAAAG5lcQBuZXRoY3RybAAAAABudmkAcnNzbnZpAABuZXhh
+Y3RmAGNtYXNrAAAAcG1hc2sAAABuZXRob2ZsZAAAAABucm91dGUAAG5jbGlwAAAAbmZpbHRlcgBu
+c2VydmVyAG5oYXNoAAAAdHBfbDJ0AAB0cF9kZHAAAHRwX2RkcF9pc2NzaQAAAAB0cF9zdGFnAHRw
+X3BibAAAdHBfcnEAAABpc2NzaV9udGFzawBpc2NzaV9uc2VzcwBpc2NzaV9uY29ubl9wZXJfc2Vz
+c2lvbgBpc2NzaV9uaW5pdGlhdG9yX2luc3RhbmNlAAAAaXNjc2lfbWF4X3NnZQAAAHBwbV9tYXhf
+em9uZXMAAABwcG1fem9uZV9yYW5nZTAAcHBtX3pvbmVfcmFuZ2UxAHBwbV96b25lX3JhbmdlMgBw
+cG1fem9uZV9yYW5nZTMAZmNvZV9uZmNmAAAAZmNvZV9udm5wAAAAZmNvZV9uc3NuAAAAZGNiAGRj
+Yl9hcHBfdGx2AGRjYl9kY2J4X3Byb3RvY29sAAAAYmdfbWVtAABscGJrX21lbQAAAABod20AbHdt
+AGR3bQBkZWJvdW5jZXRpbWUAAAAAdmVyc2lvbgBjaGVja3N1bQAAAABTZXNzaW9uVHlwZQBPRk1h
+cmtlcgAAAABJRk1hcmtlcgAAAABEYXRhRGlnZXN0AABIZWFkZXJEaWdlc3QAAAAARXJyb3JSZWNv
+dmVyeUxldmVsAABJbW1lZGlhdGVEYXRhAAAARGF0YVBEVUluT3JkZXIAAERhdGFTZXF1ZW5jZUlu
+T3JkZXIASW5pdGlhbFIyVAAATWF4Q29ubmVjdGlvbnMAAE1heFJlY3ZEYXRhU2VnbWVudExlbmd0
+aAAAAABJbml0aWF0b3JOYW1lAAAASW5pdGlhdG9yQWxpYXMAAERlZmF1bHRUaW1lMldhaXQAAAAA
+RGVmYXVsdFRpbWUyUmV0YWluAABNYXhCdXJzdExlbmd0aAAARmlyc3RCdXJzdExlbmd0aAAAAABN
+YXhPdXRzdGFuZGluZ1IyVAAAAFRhcmdldE5hbWUAAFRhcmdldEFsaWFzAFRhcmdldEFkZHJlc3MA
+AABUYXJnZXRQb3J0YWxHcm91cFRhZwAAAABBdXRoTWV0aG9kAABTZW5kVGFyZ2V0cz1BbGwAQ0hB
+UF9BAABDSEFQX0kAAENIQVBfQwAAQ0hBUF9OAABDSEFQX1IAAERpc2NvdmVyeQAAAE5vcm1hbAAA
+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
+NAAACNAAAAAAAIkUOwAACDSQAAAFXUqAIAQkEAAYAAD/B///ADgAAAAwAAAgC2fABgAAACAEMnj4
+AAAAAf//5wABwAAgAACABAAQAB//nDDhAZoA4QGaQOEBmjzhAZo44QGaNOEBmjAf/6CQgAAAA4AA
+AAIf/54g//z//+EBDgAf/5PwH/+UcCAEP/wgC23AIAtrcCALa7AgC21gIAttkCALa+AgC2wgIAts
+UCALbJAgC2zAIAttACALa0AP///w//AAACALbkAf/62gH/+ZKCALbgAf/5tUIARPSCALb0AgC29w
+IAtu4CALboAf/5i0H/+axAAA/4Af/5LgAAAjKCALJKAgCyTQ4QH+AAAEAAD/+///4QHiwB//njiQ
+AADw/P+A7yALJSAgCyVgAAD4AAACAQwAAgEIj////x//nizhAZgAIAslsCALJgAgCyYwIAsmcOEA
+3gAAAgMIAAICAP//8ADhAO4AH/+fpP//f/8AAOAAAAD8AAACAwR/////AAERHAABERgAEAgAgAAI
+AAACAQQf/5ys///AAAAA//4AACWAAAIDAB//niTg/+LAIAtvoCALcDAgC3BgIAtwgCALcBAgAwBY
+AAD/8yALcKAgC3DAAAAqMCALcOAAAP+PAABStQAASAoAAI+CAACPhgAAOAAAAI+KAADjPwAAg64A
+AP/xIAsmwP//z78AABBAIAtxACALcTAAABIAIAsm8CADDDAAAhkEIAsnECADAGAgCydwIAsnQACA
+AAAgC3GAAAIWCH8///8AAP7/AAD/wAAA/z8AAPn/IAtx0CALcoAgC3IwIAsoICALJ+AgCyewIAso
+QCALKJDuAAAAAcCAABAABQ0JAAAAAADerR//rTwgAwEQAACDACALKyAAAIIAIAsqQCALKpAgCyrQ
+EAAHAiADAWAgCzAgIAsswCALL+AgCy+gIAsu4CALL2AgCy8gIAsuoCALLlAgCy4QIAstwCALLXAg
+Cy0wIAss8CALdoAgC3awIAt24CALdyAgC3dgIAt3kAAFAAIbAAAAIAswUCAD7QAgA+xoIAPr6AAA
+GyEAAIDCIAt3wCALeAAgCzCgIAaWMAD/wAASAAAAIATx6CALMVAgCzEQIAsxkCALMfAgC3ggIAsz
+ECADC2AgCzJAIAszMCALMqAA///8MgAAAAAAEDb//+//IAMBoDOQAAAgC3kAIAt5YCALeUAgC3mg
+IAszcB//rYggBC6EAAAIUCADAagAAAhAAP//+gAAgAXerb7vgYAAAAAAg/0wAAAcMAAABDAAABQA
+AP/v//7//x//rjQA//AAACgAACALM7AwAAAAMAAANAAAgAEgAwGwAACAAhAABRCZAAAANAAAACAL
+eiAgCzPwABkAACALNEAgAwxAAAASDyALNHAAAIAHIAt54B//m6ADFQAABQAAAIP/ABv//0AAIAt7
+UCALNZAgCzYQIAs2YOEBkawAAZGsv////9////8gCzaQCwAAACAFjSwgCzcAIAs3cCALN+AgCzgQ
+IAt70CALfFAf/5RUIASQBB//myQAATiA4AAGAAACJxAgC31Af///Dx//nwD8AP//4QCWAOEAmgAA
+AAn/AACwAB//oCggAwIA4QAOAAMAAADhABIAEwAAABEAAAAf/AAAH/+faCALOJAgC35wAAGUjwAB
+lM8gAwIgH/+cECADBfAgCzjQIAaQYCALOQAf/5usH/+dpCADBsAf/5MUH/+bGB//mbwf/59gIAs8
+IAA///8f/5sAAAD/lwAA//0AAP/V//+rk8IAAA4F3AEAA/8AAMAAAAEgCzyAIAs8wCALPRAgCz1Q
+IAs9oCALPeAf///wH/+gVP3//9Af/5KAH/+cYB//lDgAAv//AACcQCALZ2AgC0EAIAtBcB//nggg
+C0IwIAtkYCALQsAgC2cgAAD+ACAFwNAgC0MAAAAhACALQ6AgC0MwIAtDcCAFz0AgBpH4IAaSCCAG
+khggBpIoAADAEAACYloAAMMwIAAAAPAAw3AQEAAAIBAAAAAQB2D/7/ifHv4AAOECGAwgC0PgH/+e
+KB//lEwgC0QQAAMAAiALRJAgC0RAIAtEsCALcVAgC0TwAAAYIB//nTQgC4WA9////wEw+MAAAhDc
+AAGGoP4AAAAAX/anALI3x2IAAAAd////ACYloACYloACYloABfXhACALRRAgC4VAIAtFkCALRgAg
+C0UwIAtFYCALhcAgC4ZAIAuGACALRdAgBexoIAMKFAAAGQAd//DvAAAKAOECAAQABAXu4QIBBOEB
+4gDgAAkIAGQAAABQAAAAoAAAAAB2AB//nAQf/5wIH/+ZZOEAcgAgCAAAIAguoCAIBmAf/534IAhu
+8CAIBVAgCARAIAgDMCAIAiAf/5wMIAgBEB//oCwf/5sQIAaSRB//mkgf/51AIAGttOEAdgD///AP
+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
+IAghmCAIIfggAyrQIAMoJCADJnAAAAAAAAAAACADKMgAAAAAAAAAAAAAAAAAAAAAIAMjmCADuQwg
+AyVYIAO6LCADJNggAyZoAAAAACADPfggCCSsIAgiCCADP2AgAzN4IAMs1CADMPAgAy6EIAM2GCAD
+K5wAAAAAIAM3bCADL9ggAzJIIAM4+AAAAAAgA7osIAMsUCADKtgAAAAAAAAAAAAAAQIAAQAAAAAA
+AAAAAAABAAECAwQFAjIyAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAB
+/wAAAAAAAAEAAAAAAAAAAAAAAAAf/OEwAAAAAOAAAOABAAAAIAj+oAAAAAEgCPzYAAAAAiAI+CAA
+AAABIAj1mAAAAAEgCPOEAAAAASAI8XgAAAABIAju5AAAAAEgCOIIAAAAASAI6QAAAAABIAjg0AAA
+AAEgCODIAAAAAQAAAAAAAAAAAAEAAQAAAAAAAAAAAAAAAAQAAAAIAIkGAAAAAAAAAAAEAAABCACJ
+FAAAAAAAAAAABAAAAiABDLwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAgAiQYA
+AAAAAAAAAAQAAAEIAIkUAAAAAAAAAAAEAAACIAEMvAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAEAAAACACJBgAAAAAAAAAABAAAAQgAiRQAAAAAAAAAAAQAAAIgAQy8AAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAIkGAAAAAAAAAAAEAAABCACJFAAAAAAAAAAABAAAAiAB
+DLwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAADv8AAQAAAAAAAAoBAIEACgEA
+AQAKAQABAAoBAAEADgMBAQAe/4GBAB4CgQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB
+GwQDAwEbAgMDARsDAwMBGwIBAQEfBIGBASv/gYEBKgGBgQEpAYGBAR8DgQEBHwOBAQEs/4GBAT0C
+gQUBPP+FAAE8/4UAATkBBQUBPg8FBQEuBIGBARsCAQEADgKBAQEuAoGBAA4CAAEADgKBAQAOAgEB
+ARoBgYEBDgIBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAMBAAAO
+AwEBAE8EAQEAXwQBAQA8BAEAAAAAAAAAbP8BAQBMBAEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAADy1RKY8tUSmPLVEpjy1RKY8tUSmPLVEpjy1RKY8tUSmPLVEpjy1RKY8tUSmAOF
+GxgDhRuY8tUSmPLVEpjy1RKY8tUSmPLVEpjy1RKY8tUSmPLVEpgAAAAAAAAAAAAAAAD//wAFAAYA
+BwAIAAkACgALAAwADQAOAA8AEP///////wAAADIAAAPoAAAAKAAATiAAAAAAAAPQkACYloAAAYag
+AJiWgAAAHCAAAABLAD0JAAAD0JAAmJaAAQEAAAMDAgIFBQQEBwcGBgAAADIAAAPoAAAAZAAAw1AA
+AAAAAAPQkAPQkAAATEtAA9CQAAAAHCAAAABLAD0JAAAPQkAjw0YAAwIBAAcGBQQLCgkIDw4NDAAA
+ADIAAAPoAAAACgAAAfQAAAAAAAAD6ACYloAAAAPoAJiWgAAAHCAAAABLAD0JAAAD0JAAmJaAAQEA
+AAMDAgIFBQQEBwcGBgAAAAAAAAAAAAoAFACMAIIAZABaAKAAlgB4AG4AUABGADwAMgAoAB4ACgTO
+BJIJzgmSArIEVgTiBKYDtgQaB7IJVgZeAnYJ4gmmB04COgi2CRoIFgYiAsYEagCWA3oBcgd2AL4D
+3gT2BLoEQgOiAmIHOgYOAIIDygQuAG4AWgMqATYB6gM+B8YJagFKBxIFlgh6BsIB/gZyAooDUgXm
+Bb4I3gGaB9oJ9gm6CX4HnglCCKIJBgFeB2ICTgcmAxYBIgWCCGYFqgjKCS4IjgEOBW4FWgVGBtYI
+KgY2AhIBwgbqCD4A5gaGAtoEfgKeBAYGSgImCAIDZgCqA44F+gBGAdYG/gauBdIBhgeKCPIDAghS
+APoFMgGuANID8gfuADIGmgLuBR4AHgUKAAAJxAmIBNgEnAeoCUwJ2AmcCKwJEAK8BGABaAdsBOwE
+sAJYBzADwAQkAyABLAe8CWAFjAhwBmgCgAW0CNQJ7AmwCTgImAdYAkQBGAV4CMAJJAVkBVAIIAYs
+BuAINALQBHQGQAIcAKADhAHMBvQBfAeACEgA8ADIA+gGkALkBQAExASIAqgETAOsBBAGVAJsB0QC
+MAgMBhgAjANwALQD1AQ4A5gGBAB4AGQAUAHgAzQBQAcIBrgB9ANIBdwBkAfQCXQHlAj8AVQHHAMM
+CFwFoAiEAQQFPAbMAggBuADcBnwClAP8B/gDXAXwADwGpAXICOgC+AUoAaQH5AAoBRQAFAAABMkE
+jQnJCY0CrQRRBN0EoQOxBBUHrQlRBlkCcQndCaEHSQI1CLEJFQgRBh0CwQRlAJEDdQFtB3EAuQPZ
+BPEEtQQ9A50CXQc1BgkAfQPFBCkAaQBVAyUBMQHlAzkHwQllAUUHDQWRCHUGvQH5Bm0ChQNNBeEF
+uQjZAZUH1QnxCbUJeQeZCT0InQkBAVkHXQJJByEDEQEdBX0IYQWlCMUJKQiJAQkFaQVVBUEG0Qgl
+BjECDQG9BuUIOQDhBoEC1QR5ApkEAQZFAiEH/QNhAKUDiQX1AEEB0Qb5BqkFzQGBB4UI7QL9CE0A
+9QUtAakAzQPtB+kALQaVAukFGQAZBQUAAAm/CYME0wSXB6MJRwnTCZcIpwkLArcEWwFjB2cE5wSr
+AlMHKwO7BB8DGwEnB7cJWwWHCGsGYwJ7Ba8IzwnnCasJMwiTB1MCPwETBXMIuwkfBV8FSwgbBicG
+2wgvAssEbwY7AhcAmwN/AccG7wF3B3sIQwDrAMMD4waLAt8E+wS/BIMCowRHA6cECwZPAmcHPwIr
+CAcGEwCHA2sArwPPBDMDkwX/AHMAXwBLAdsDLwE7BwMGswHvA0MF1wGLB8sJbwePCPcBTwcXAwcI
+VwWbCH8A/wU3BscCAwGzANcGdwKPA/cH8wNXBesANwafBcMI4wLzBSMBnwffACMFDwAAAAoAjABu
+AJYAeAA8AFAAoACCAGQAMgBGAFoAKAAeABQAAACHAGkAkQBzADcASwCbAH0AXwAtAEEAVQAjABkA
+ACADDlQgCM64IAMOWCAI3RggAw5kIAjcQCADDnAgCNvwIAMOhCAI20AgAw6cIAjZ2CADDqwgCNjA
+IAMOtCAI2JggAw7IIAjYcCADDtggCNhAIAMO5CAI1yQgAw7sIAjW/CADDwAgCNbIIAMPDCAI1Vwg
+Aw8UIAjUtCADDyQgCNOwIAMPMCAI0qAgAw9AIAjRdCADD1ggCM58IAMPXCAIzgAgAw9kIAjNyCAD
+D2wgCM2QIAMPeCAIzVggAw98IAjNICADD4ggCMzoIAMPjCAIzjggAw+UIAjMsCADD5wgCMx4IAMP
+pCAIyaggAw+sIAjMKCADD7ggCMwgIAMPwCAIy+ggAw/IIAjLsCADD9AgCMt4IAMP2CAIy0AgAw4s
+IAjHiCADD+AgCMdQIAMP6CAIxxggAw/wIAjG4CADEAAgCMaoIAMQCCAIxnAgAxAQIAjGOCADEBgg
+CMYQIAMQJCAIxeggAxAwIAjFuCADEEggCMWQIAMQZCAIxWggAxB0IAjFQCADEIQgCMUYIAMQlCAI
+xPAgAxCkIAjEyCADELQgCMSgIAMQxCAIxHggAxDQIAjEUCADENwgCMQoAAAAAAAAAAAgAxDoIAjD
+ECADEOwgCMEcIAMQ+CAIwDwgAxEMIAjADCADERQgCL/cIAMRICAIv6wgAxEkIAi/fCADESggCL9M
+IAMRLCAIvyAAAAAAAAAAACADETwgCL74IAMRRCAIvtAgAw44IAjgGCADDkAgCN9EIAMOJCAI3owg
+Aw5MIAjd4AAAECEgQjBjQIRQpWDGcOeBCJEpoUqxa8GM0a3hzvHvEjECEDJzIlJStUKUcvdi1pM5
+gxize6Na073DnPP/494kYjRDBCAUAWTmdMdEpFSFpWq1S4UolQnl7vXPxazVjTZTJnIWEQYwdtdm
+9laVRrS3W6d6lxmHOPff5/7Xnce8SMRY5WiGeKcIQBhhKAI4I8nM2e3pjvmviUiZaakKuSta9UrU
+erdqlhpxClA6MyoS2/3L3Pu/656beYtYuzurGmymfIdM5FzFLCI8AwxgHEHtrv2Pzezdza0qvQuN
+aJ1Jfpdutl7VTvQ+Ey4yHlEOcP+f777f3c/8vxuvOp9Zj3iRiIGpscqh69EMwS3xTuFvEIAAoTDC
+IONQBEAlcEZgZ4O5k5ij+7Pawz3THON/814CsRKQIvMy0kI1UhRid3JWteqly5WohYn1buVP1SzF
+DTTiJMMUoASBdGZkR1QkRAWn27f6h5mXuOdf937HHdc8JtM28gaRFrBmV3Z2RhVWNNlMyW35Dukv
+mciJ6bmKqatYREhleAZoJxjACOE4giijy33bXOs/+x6L+ZvYq7u7mkp1WlRqN3oWCvEa0CqzOpL9
+Lu0P3WzNTb2qrYud6I3JfCZsB1xkTEU8oiyDHOAMwe8f/z7PXd98r5u/uo/Zn/huF342TlVedC6T
+PrIO0R7wAAAwBAAAMBAAAFkIAABZpAABlDAAABAkAAAQMAAAEDwAABDcAAB7LAAAezQAAeKMAAHm
+jAAB6owAAe6MAAHyjAAB9owAAfqMAAH+jAAAjcwAAH50AACP3AABkVgAAI/8AAB1HAAAdRgAAHUQ
+AAB34AAAd+QAAHf0AAGcPAABEHQAARCEAACUCAAAmFwAAJYMAACWFAAAliAAAJYsAADQKAAAkAgA
+AhDcAAIw3AACUNwAAnDcAAGQVAAAYBwAAaDYAAGQkAAAd+AAAHfkAAB39AAAeXgAAHn4AAGUBAAB
+48AAAefAAAHrwAAB78AAAfPAAAH3wAAB+8AAAf/AAAGUDAAAAAAfAAAAAAAAAQAAAAAAAAACAQAA
+AAAAAAQCAAAAAAAABxIAAAAAAAAIAwAAAAAAAA8TAAAAAAAAEAQAAAAAAAAfFAAAAAAAACAFAAAA
+AAAAPxUAAAAAAABABgAAAAAAAIAHAAAAAAAAwBYAAAAAAAEACAAAAAAAAgAJAAAAAAADABcAAAAA
+AAQACgAAAAAACAALAAAAAAAMABgAAAAAABAADAAAAAAAGAAaAAAAAAAgAA0AAAAAAEAADgAAAAAA
+gAAPAAAAAADAABoAAAAAAOAAGwAAAAABAAAQAAAAAAGAABwAAAAAAcAAHQAAAAAB4AAeAAAAAAIA
+ABEAAAAAADAAP///wAAAMAg////AAABZEKyAAAAAAFmsfiUAAAABlBAf////AAGUNAAAABEAAZQI
+H////wABlDgAAAARAAAQKH////8AABAsf////wAAEDR/////AAAQOH////8AABBAD0QAAAAAeygA
+H//iAAB7MD//7v8AAHs4AAAAAQAAe0A//+7/AAB8JAAf/+IAAeKIAAgAAAAB5ogACAAAAAHqiAAI
+AAAAAe6IAAgAAAAB8ogACAAAAAH2iAAIAAAAAfqIAAgAAAAB/ogACAAAAACNyP////8AAI3Q////
+/wAAfnB/v///AAB+eH+///8AAH4AAMAAAAABkVQB////AAGRnAH///8AAI/YAH///QAAj/j////9
+AAB1FAAAAAcAAHUMAAAACwAAd9wAAAADAAB38P////8AAZw4AAGAQAABnPgAAAADAACQBAAAAD4A
+ARB4AP///wABEHwA////AAEQiAAAAAAAAJQEAAD//wAAlBAAAP//AACYVAAAAf8AAJhYAAAB/wAA
+lggAAAAAAACWEAAf//8AAJYYAB///wAAlhwAD///AACWJAAP//8AAJYoAP///wAAljAA////AADQ
+IAAAAAcAANAkAAAABwACENgAAAADAAIw2AAAAAMAAlDYAAAAAwACcNgAAAADAAGQUAAAAC8AAaDU
+AAABgwABkIwAOAAAAAGQmAA4AAAAAHl0AAAALwAAeXAAAAAFAAB59AAAAC8AAHnwAAAABSALAAAf
+/5RMH/+ctAAAE4gf/5MsAAALuAAAQA0gCwCQIAsAICALAHAgCwCwH/+USAAAQR4AAPADAABBDgAA
+QEAAAKAAAACgIAAAQYgAAH//AABBhgAAgAAAAEGBAACoGQAAqBoAAMMAAACoGwAAqBwAAKgXAAD/
+/wAAEAQAAOWfAAAfEQAA7gkAAP/+AADq/yALAOAAAP8AIAsBIOEAXgAADwAPIFAAAAAAMNThAg4A
+AABAAAAIAAgAAOQAAADEMAAAxDEgCwJwAAmJaAAAxFAgCwKgIAsCwCALAuAAACAAAADEUQAAwAEA
+AMRSIE//gCAIBwQgC1nQIAtaMCALWYAAAMAGAAgAAiALWnAAAIDXAAMHgAAAxIIAAECCAACEAyAL
+W2AgC1xgAACApgAAgD0gC1rAAACAQCALW8AgC1wQIAtbECALOVAf/5tU4QByAOEAYgAAAGJIAAQA
+KYYQAAAAAGJAgAAAAIAUAAOAFgADgBIAQ4AR0gOAEAAFH/+a3CAGlkAf/5/cIAt/UOAAAADhAHYA
+IAt+wCALfwAgCzlwH/+SYAAPQkDhAHoAIAs6ACALOlAgCzqwH/+a2CADDMAgAwxgH/+S5B//m2Dh
+AZoA/8D//wAQAAAf/5/sAAAIAAAGCAAf/50UP////wABngzhAZ4AAAGedAABnqwAAZ7UAAGe7AAB
+nxQgCzsQIAs7cCALgOAgC4BwIAt/kCALf9AgC4Ag4QAuACADDNAAAJAAH/+UaAAsFACAAACA4QBa
+AIHw4IAgAAAA4QBWAAwAAAD/84AAAAw4AEYAAAA/P///gIAAAPP/////4P//AAEAACAIBeQgCAAA
+H/+gLOEBkgAf/5pg4QAOAAACAAAAfwBAAAMAAACAAIAAwQDA//8j/wAAyAAQIAEg4QCKAOEAfgDh
+AI4APAAAAP//v/9QaOhH+P///wQAAACSAAAA8ADwAJ+///sgAAAEH/+S4H/3//+AAAIA///v////
+gP//9/9/AAYAAP//8AD/AAAAAEkkkgAAfhgIAQgBEAEQAQAAfkAgASABFRUVFYQhhCEQEBAQ4QGO
+AAAA/n8EBAGA4QDOAOEAjgThAI4I4QCODOD//gCAAAEAIAgIBAAAkAgAAAjAgAHEEcQRxBEA/wD/
+AEAAQP//P/8gC4GQIAuBwB//muD/D///IiIiIjMiEQAgC4FQCAgICCALgfAREQAAMzMiIhEREREz
+MzMz//D/AAACADMqKhUVH/+csB//mcgf/6AkAAD//SALgiAf/50kIAs74CAI3eAAUAAAAKAAACCg
+AADjAAIA4v//ANAAAADP//4AIAMHZB//nhwf/6BgH/+AoB//nmAAABAAIAuD0CALPiAgCz5gIAs+
+gCALPqAgCz8AIAs/UCALP7AAAB//IAs/4CALQAAgC0BAIAuDgCALg0AgC4OgH/+eMCALQGAf/6Ig
+4QA5AB//gNAf/4EQH/+BUB//mUAf/5RQ4QGWAOEA3gDhAO4A4QH+AOECXgDhAj4A4QIeAOEB4gDh
+AQ4A4QCSAAgAAAD///D/H/+awOEBDgThAQ4I4QEODP/wAAAAAoAG//v//yALRlAgC0awH/+B0B//
+mrwf/5nEH/+gKBAAAAD/8P//IAMKcB//mGAAAH5MAPAA8CALRyAgC0eAIAtH4OEALgjhAC4Q4QAu
+GB//lIiAAIAAH/+toB//myQf/5Q4H/ziAP//AAAgBpBgAAB7YB/83gDhAZgAH/+f8B//nhAf/5wI
+IAtIICALSKAgC4jAIAtIUB//ngwgC0kgIAtI4CALh0Af/5n0IAtJkCALSdAAKAAAIAuJsCALiRDf
+sAAAIAuJUB//nez/gAAA///gACALShAgC0pAH/+b8CAGkkQgC4bwIAMKfAAEAAAf/4Hg///H/yAL
+ihAf/5xgIAuKUB//n+AgC0qAH/+eKB//rvAf/69wH/+u9BIAAAAf/53UH/+t6CALhRAEAAAIgQAA
+AAAAD/8AADAAH/+gMCADCngf/62MH/+wSB//r4hJAAAAIAuEoCALg/AgC4RQAA8D/wMRAAADFQAA
+H/+rYCALSsAf/51MH/+Y5B//phAf/6GUH/+jkCAApKwf/+9gH//uFB//n5QgAKY8H/+dNAIAghAC
+AAIQAgAAEAEAAAAAGgAAAPrGiAAgAAAAAPAAH/+eJCAGkVQgBpC0H/+CECALS0AgC0sQIAtK4CAL
+S3Af/5v8H/+aSCALhoDhABIAiAACECAICgQf/524AAD4AOEANgDhAEX8H/+YZB//n4wAEEEEAAgA
+AB//niAgBpHgH/+TYB//mZggC4hwIAuIECALixAf/5pAIAtMECALirAgC4qAIAtLoCALiuAgC4eg
+H/+aPB//mjQf/5o4H/+dqB//mggf/5esIAgJBB//m6gf/5ukH/+axB//gpAf/504IAMHzCADCaAg
+BpJQH/+CsB//nKwf/5xEH/+cSB//nEwf/5x8H/+ceB//nHQf/5xwH/+cbB//nGQf/5xYH/+cXB//
+gtAf/59gH/+b3B//g2Af/6BEIAtQkB//muwgC1DgIAtREB//g3Af/5pcAAAlgCALUUAgC1GAH/+Y
+BB//g5Af/5oEH/+YmB//mAAf/4OYA+f8GCALUbAf/4OgH/+dCCADCAAf/50ED////yADDPAf/5m8
+IAtSECAIBdQgCAWEIAgEVCAIBXwf/5ygIAgDxOEAagAAAICA//8I+gAAQwQAAH0z///D/wCAAAD/
+AP8AH/+D8AEBAQEAAGQMH/+EEFWqVaoAAKqqWlpaWqWlpaUAESIziBIAAyADDVDhAGYAAABqGP//
+f3+AEAAAH/+EMAAAamAAACEBAABigB//hEAACAApAAB0BAAAYkQAAGIAAABi1B//hFAAAGLYAABi
+6AAAYtwAAGL4AABi5B3NZQAAAAnDAABi7B//hHAAAGLwH/+EgAAAYvQf/4SgAABi/AACCNUAAGMA
+AAEEawAAYwQAAgjWAABjCAAAYwwf/4SwAABjEAAAosMAAGMUAABjGAAAYyAAAYagAABjJAAAYygf
+/4TAAABjLAAAYzAAACcQAABjNAAAYzgAAGKQABEREwF9eEAAAGoAAAB1AB//hNAAAGKMAABhqAAA
+dFAAAE4gAAB0HAAAYsAAAGLMAABixAAAYsgf/5RgIAtU0OEB3gDhAeYA4QHqAOEB7gDhAfIA4QH2
+AOEB+gAf/55w//x//x//kvwAAH7ogAAHAIAABQCAAAYAgAAEAA//8A//8PAA3//+AB/8wAAAAIBg
+///X3yAJHlAgC1UgH/+TcCAJHxwgAwdgH/+S+CALVVAf/5+YQAAAACAGkdgf/564H/+dsB//oNAf
+/6DwH/+UTx//nhQAlAAAIAwAAAAMAAAf/4TgH/+S8ABEAAAAAEAJCAAAAQAACcQf/5so3q2+7yAI
+BIQAAmJaIAMNgCALjzAgC1WAH/+dfCAKAAAgC1Ww4v/+AB//nxgf/5v4H/+XoCAKkAAf/5+8IArQ
+QAAAAABsEAbApP362AWgG0UAW5w/wFD3+tQFoAQFAPf60gXgAJoAAAAAKmB89UAEdCIAnQDAoVuR
+pxv9Y7FV0w/6oAlEYgCdACtyf2S/2vP6vgXgAgUAKmB8bQgaACAECgwb/4DgB9DUnQB/1w6xIusr
+uXGYBQAAY//eAAD6cBAVoAsVAPwgaB3gDAUAW4gBLhkAZuAQ+kAEANAIFQAAiBoIRAIEBEcrcn+x
+Iusjp3GYBQAAKWB89T/71SIAnQDAUPAAdA2gBAUAACpgfHShccChW5GAG/0/sVX6oAWMYgCdACty
+f2S/4fP6cgXgAgUAKmB8bQgaACAECgwb/4DgB9DUnQB/1w2xIusrwHGYBQAAY//eACowgBz9L/wg
+aB3gG+UAW4fcLhEADu4UaOElK3J/sSLrI7hxmAUAAC9gfHT5jcCk/fpKBaAbRQBbm/HAINEPAAD6
+QAQA0AgVAACIGghEAv//IA2nRAEAAAApYHz1P/pcIgCdAPoAQh2gG0UA7P0XGmgEgABbm+LHK9EP
+KmB8dKGs/IBoHeAKJQD9+iIFoBtFAFub2scr0Q8AbBAG/foaBaAKRQDyICYVoBtFAFub1BL9AA8C
+AC0ifxb9AOf9BhaCUYAA9MBoHeAEBQAscIBtCBkAQAQMCBvqUIAkfBiAAMyrsUTtSyJyqAUAAGP/
+3xz8+v359gXgG+UAW4fJLSJ/sUTtQ8ZyqAUAAPGkQA3gBAUA1WAscIBtCBkAQAQMCRvqUIAk/BiA
+AMyrsUTtSyJyqAUAAGP/3xz86vyAIh3gG+UAW4e3LSJ/sUTtQ8ZyqAUAAPGkQA3gBAUA1WAscIBt
+CBIAQAQMCht/rxCxRO1LKXKoBQAAY//mAAAAACpQgBz82foAIh3gHQUAW4elLSJ/sUTtQ8ZyqAUA
+APGkQA3gBAUA1WAscIBtCBIAQAQMCxt/vxCxRO1LKXKoBQAAY//mAAAAACpQgBz8yPoAIh3gDQUA
+W4eTLSJ/sUTtQ8ZyqAUAAPGkQA3gBAUA1WAscIBtCBIAQAQMDht/7xCxRO1LKXKoBQAAY//mAAAA
+ACpQgBz8t/oAIh3gDQUAW4eBLSJ/sUTtQ8ZyqAUAAPGkQA3gBAUA1WAscIBtCBIAQAQMDxt//xCx
+RO1LKXKoBQAAY//mAAAAACpQgBz8pv35TgXgG+UAW4dvLSJ/sUTtQ8ZyqAUAAPGkQA3gBAUA1WAs
+cIBtCBIAQAQMCBt/jxCxRO1LKXKoBQAAY//mAAAAACpQgBz8lv35LgXgG+UAW4ddLSJ/sUTtQ8Zy
+qAUAAPGkQA3gBAUA1WAscIBtCBIAQAQMCRt/nxCxRO1LKXKoBQAAY//mAAAAACpQgBz8hvwvgh3g
+G+UAW4dLLSJ/sUTtQ8ZyqAUAAPGkQA3gBAUA1WAscIBtCBIAQAQMCht/rxCxRO1LKXKoBQAAY//m
+AAAAACpQgBz8dPoDwh3gTQUAW4c5LSJ/sUTtQ8ZyqAUAAPGkQA3gBAUA1WAscIBtCBIAQAQMCxt/
+vxCxRO1LKXKoBQAAY//mAAAAACpQgBz8W/oAIh3gHQUAW4cnLSJ/sUTtQ8ZyqAUAAPGkQA3gBAUA
+1WAscIBtCBIAQAQMDht/7xCxRO1LKXKoBQAAY//mAAAAACpQgBz8TP34mgXgG+UAW4cVLSJ/sUTt
+Q8ZyqAUAAP34lgWgCgUA+gAiHeANBQBbhw39+I4FoAoFAP34jAXgCxUAW4cJ/fiIBaAKBQD6ACId
+4B3lAFuHBP34gAWgCgUA+gAiHeANBQBbhv/9+HoFoAoFAPoAIh3gDZUAW4b6/fhmBaAKBQD6ACId
+4A0FAFuG9v34XgWgCgUA/fhkBeALFQBbhvH9+FgFoAoFAP34XAXgCxUAW4bs/fhSBaAKBQD9+FYF
+4AsVAFuG5/34SgWgCgUA+gAiHeANlQBbhuP9+DYFoAoFAPoAIh3gDUUAW4be/fguBaAKBQD9+DQF
+4AsVAFuG2f34KgWgCgUA/fgyBeALFQBbhtT9+CIFoAoFAP34KgXgCxUAW4bQ/fgaBaAKBQD6ACId
+4A2VAFuGy/34BgWgCgUA+gAiHeANhQBbhsb9+AAFoAoFAP34BgXgCxUAW4bB/ff6BaAKBQD9+AYF
+4AsVAFuGvf338gWgCgUA/ff+BeALFQBbhrj99+oFoAoFAPoAIh3gDZUAW4az/ffYBaAKBQD6ACId
+4A3FAFuGrv330AWgCgUA/ffWBeALFQBbhqr998oFoAoFAPoAIh3gLRUAW4al/ffCBaAKBQD6ACId
+4A0lAFuGoP33vAWgCgUA+gAiHeANlQBbhpstIn/TD/GkIA3gBAUA1WAscIBtCBIAQAQMDxt//w6x
+RO1LJ3KoBQAAY//mAAAqUIAc+8f6A8Id4A0FAFuGjC0if7FE7UPIcqgFAADApP33nAWgG0UAW5p8
+/fd+BaAKBQD6ACId4A0FAFuGgf33cgWgCgUA+gAiHeANBQBbhnxkMdPyICgVoAQFAPf3gAWgBQUA
+2hD6QGgd4AxFAFuUL48Q0w/s+68f8gKAAPfgBAQ43x0A5t0BDEYCgAD5xgAPN//BAP+mAA7wCgUA
+/6YADrALFQD8IAYV792BAFuGZP33QAWgCgUA/CAkFeALFQBbhl/99zoFoAoFAPoAIh3gLZUAW4Zb
+5EwBIqgRAADjU4JxEBEAABb7fP6QABawCkUA/fc2BaAbRQBbmkj99x4FoAoFAPoAIh3gDQUAW4ZM
+/fcKBaAKBQD6ACId4A0FAFuGSP33AgWgCgUA/fcABeALFQBbhkP99vwFoAoFAPoAIh3gDcUAW4Y+
+/fb2BaAKBQD6ACId4A0FAFuGOf327gWgCgUA+gAiHeANlQBbhjUb+1gPAgAtsn/xqnAN4AIFAAZj
+AixwgG0IGQAgBAwOG+owgCd8GIAAzKuxIu0rJ3GYBQAAY//fHPtW+gPCHeANBQBbhiMb+0fTDy2y
+f7Ei7SPBcZgFAABk0Fnz9ogF4AIFACxwgNMPbQgSACAEDA8bf/8OsSLtKwdxmAUAAGP/5NEPKjCA
+HPtL+gPCHeBNBQBbhhAqMIAc+0f6A8Id4A0FAFuGDBv7Ly2yf7Ei7SOycZgFAADRDwAAAAD/+vQN
+oAQFAGwQBPxgwADf4qUA0Q8W+0koYoQZ+0kJiAL40IYVoBpFAFuPYypihCv68A8CAPtABAVwAgUA
++tCGFaBjRQDBpFuPXLEicyn1G/s9AEoR66oICtgEgABb/gxb/aHSoNEPAGwQBBP7N/JGZB3gAgUA
+0Q9sEAQoICIb+zMDiRGrmSuSgBz7MQy7AiuWgOmSgCQBOYAAHvsoLeKEH/stHPspD90CLeaELCUz
+KiAhWsaJyaPHK9EPAABaxsNnr9bSoNEPAAAAAAAqICFaxj4qICH99kAFoAsVAPwAQh3gDgUAWx9l
+KiAhHPsc+gPCHeANBQBbhcgqICEc+xn6A8Id4A0FAFuFxMAg0Q8AAGwQCOlEAAnQBIAA/KBoHecy
+AQD8IKYV4AIFAPoghhWhBQUA+CBmFeAURQD6YGgdoBvlAPwgaB3hDAUAW4WLLhEAsSL1w+Ad7yIB
+AHJL3PoAgh2gG0UA7Pr/GWgEgABbmaHAINEPAIoUGPr8HPr8/CCoFeAJBQD7LQAMMBvlAOgWAinQ
+BIAAW4WgwLCbEfpgaB2gG+UA/CBoFeEMBQBbhZrAIPpgaB2gG+UA/CBoHeEMBQBbhW0sEQB1wByx
+IgICT3JL3sCi/fXMBaAbRQBbmYXAINEPAAAAAPpgaB2gG+UA/CBAFeEMVQBbhV8qEQHLcXaoMokS
+6PrYEVARAACqmZkSeYuIixHsEgQl6AUAAA0LT5sR/WKSDaAOBQD+IEYVr/26AHaozMAh0Q8AwKL9
+9ZoFoBtFAFuZa8Ag0Q9sEATApP31kgWgG0UAW5lm/fWQBeAb5QDy4AABMQwFAO40AAlQBIAAWx8B
+7TQACVAEgAD8IAIdoBvlAFuFZO1kAAlQBIAA/fV2BaAb5QBbhV/tVAAJUASAAP31YgWgG+UAW4Va
+7UQACVAEgAD99WYFoBvlAFuFVdog/fVgBaAb5QD8ACId4A4FAFse6dEPAABsEAb0AoId4QQFAPIA
+Ah2nMgEA+mBoHaAb5QD8IGgd4QwFAFuFHigRALEi9QFgHa8iAQByW9zAINEPwCHRDwAAbBAOIhYQ
+JRYPWsYp6hYLKAQKgAD7QEwoUgCdACoSEFrF5+oWCiGMIQAAxirRD4of7PqQGlwCgACbHKq7rLss
+sH4rsH8IzBHsuwIFU/kAAPohphWvuwEA6xYJJRgpgAAd+oSMHO3MCA1IBIAA/0MAB9ANBQAe+oAt
+wIAO3Qkt0X79gCAVr90BAAkfFGTwiCjAgB76eA2JFAmIAw6ICSiBfurAgS7uAoAADY0D+YBAFafN
+QQDsrAMHy/0AAP+AAIY/3QEA7MF+Lu4CgAAPAgAPAgBtmTzpgIAkQAkAAA3NA/0P8BXvrQEA/UAA
+Fji6HQALmQMOmQkpkX4MmQP54AAE98lBAOzZAwzuAoAADpkJLJF+Dc0DDQ1Pjhl94Rf99K4FoAol
+AP4hKBWgG0UAW5jqxyvRDwDApP30ogWgG0UAW5jmIxIQHPpK0w/y4AAB8BvlAPpgaB2gDTUAW4To
+7PpDGdAEgAD8IgAV4BvlAFuEu+z6OBnQBIAA/CJAFeAb5QBbhLfs+jgZ0ASAAPwigBXgG+UAW4Sy
++mBoHaAb5QD8IsAV4QwFAFuErRz6Ni8RCi4RCS0RCPghZBWgCkUA+CAGFaAbRQBbmMTaMP30SgXg
+G+UA//RGBaEMBQBbHmHaMP30RAWgG+UA/AgiHeBOFQBbHlwc+iTt+hAZ0ASAAP/0HAWgG+UAWx5W
+AzoC/fPmBeAb5QD8AAIdoA4FAFseUdow/fPcBeAb5QD/89gFoAwFAFseTNow/fPSBeAb5QD8AAId
+oA4FAFseRsBA+mBoHaAb5QD8AAId4wwFAFuEqLFEaU3nHPoI7fn0GdAEgAD6A8Id4A4FAFseOuz5
++xnQBIAA/CICHeAb5QBbhJ2KHxn5/3qbCccr0Q8AAAAAAAD0AAIdoBZFAPpgaB2gG+UA/CMAFeEM
+BQBbhGksEQz0gCAVoQ0FAP2GwB3vRAEAdGvW/fPeBaAKJQD8O6Id4BtFAFuYfisRCywRCC0RCSoS
+EC4RClv/EMcr0Q8AAAAAAADs+dUZ0ASAAPwgAh3gG+UAW4R7+mBoHaAb5QD987wF4QwFAFuEdyoS
+EFv/JmSlqPpgaB2gG+UA/CNAFeEMVQBbhEgoEQ3xACj/0gCdAIkdZJLuix/7f0AV4AQFAPohxhXg
+AY4AZL3Q//bUDaANBQAAiR8EmQwpnP71IAuwkgCdAPUgDUESAJ0A9SAPIZIAnQD1IBHyEgCdANow
+/fMgBeAb5QD/8xwFoQwFAFsd7vvzdAXgCgUAWlxZKhIN+oAUEqIAnQAqEhAc+bP8IAId4AulAP4A
+Ih3gjgUAW/6HZKOo7PmdGdAEgAD8gGId4BvlAFuERPpgaB2gG+UA9PAABrEMJQBbhD/6YGgdoBvl
+APXgAAaxDDUAW4Q6ix6FHPfzLAWgBwUA7wIAChAEgAD6gARy4gCdAKRVplXwADQNoAYFAAAAAACI
+HngrdC1QgihQgy9QgS5QgOiIEQnQBIAA6N0CD/4CgAD/xgAPcBvlAP4h5B2v3QEA/CHEHeEMRQBb
+hCD6YGgdoBvlAPwh5BXhDFUAW4Qb+mBoHaAb5QD98wAF4QwFAFuEF+d8ASEQEQAA9sCAFaD7xQDr
+Y4pyqBEAAOR0Cgu3goAA+mBoHaAb5QD98ugF4QwFAFuECikK/Pjf9IPiAJ0AKRoABpkM+T/0kNIA
+nQCNHB75YNow9aAARrAb5QD/oABGsQxVAO3QgCIgBQAAW4P72jD98p4FoBvlAPzgAh3hDgUAWx2P
+Y/5rjRwe+VGk3a7dLtCBLdCA2jD9wAAXMBvlAP+mAA6xDFUA9IBAFa/dAQBbg+raMP3yfAWgG+UA
+/OACHeIOBQBbHX5j/ieGHBj5QORmCAnQBIAA+MAAQzAb5QD80FAV4QxFAFuD3C5ggS1ggOjuEQnQ
+BIAA/6YADrAb5QD94AAG8QxVAFuD1Oo0AAIgDQAA/fJMBaAb5QD84AId4w4FAFsdZmP9yAAAAIYc
+GPkopGaoZi5ggy1ggujuEQnQBIAA/6YADrAb5QD94AAG8QxFAFuDwS5ggS1ggA8CAOjuEQnQBIAA
+/6YADrAb5QD94AAG8QxVAFuDuOo0AAIgEQAA/fIWBaAb5QD84AId5A4FAFsdSmP9WQAAACoSEBz5
+FPwgAh3gC6UA/gAiHeCOBQBb/ehkoxrs+P0Z0ASAAPyAYh3gG+UAW4Ok+mBoHaAb5QD8AAId4Qwl
+AFuDn/pgaB2gG+UA/AACHeEMNQBbg5uEH9MPDwIAJEz99E4ACTAGBQDkFhEhCHmAAPXx5AXgB0UA
+9kABA/AERQD6YGgdoBvlAP3x7gXhDAUAW4OL+mBoHaAb5QD8I8AV4QxVAFuDXykRD/cOAA03uQEA
+C6oDBaoJKqF+CGgRCogDCAZPBpYDBoZPBWYJJmF+LBoE7RwcLEYCgAD41wALMBvlAPpgaB2vZgEA
+W4NNKREO9w4ADbepAQALqgMFqgkqoX4IaBEKiAMIBk8GlgMGhk8FZgkmYX4IiBH41wALN8QBAPGA
+/A3vZgEA+/GWBeAKBQBaW2q0RPaf+jViAJ0A9CIoFaAA5gAAAPoAQh2gG0UA/fGMBaItpQD+gGgd
+4A4FAFuXTisRCywRCC0RCSoSEC4RClv94Mcr0Q8AANow/CACHaAb5QD+AAIdpA0FAFsc5fpgaB2t
+1JEA/CBCHaAb5QBbg0f6YGgdr9IBAPwgYh2gG+UAW4ND2jD98PIF4BvlAP/w7gWhDAUAWxzWKhIQ
+W/3tZKGTiR0JCUFkkbv1IBKAkgCdAPUgFAESAJ0A9SAWQZIAnQArEQssEQgtEQkqEhAuEQpb/byK
+GfdABbwiAJ0AwKL98SwFoBtFAFuXIMcr0Q8AAAAAAAAA7Ph7GdAEgAD6A8Id4A01AFuDIfpgaB2g
+G+UA/AVCHeEMJQBbgx36YGgdoBvlAP3xDAXhDDUAW4MY+mBoHaAb5QD98QQF4QwFAFuDEyoSEBz4
+d/wgAh3gC6UA/gAiHeCOBQBb/UtkoqfHK9EPAAAAAP3w8AWgCiUA/D3CHeAbRQBblvwrEQssEQgt
+EQkqEhAuEQpb/Y7HK9EPAADaMP3wsgWgG+UA/AgiHeBOFQBbHJMc+FXt+DAZ0ASAAP/wXAWgG+UA
+WxyOwED6YGgdoBvlAPwAAh3jDAUAW4LvsURpTecc+Ent+FwZ0ASAAPoDwh3gDgUAWxyCjRqLG8fL
+Dcs56xYLLZAEgADRDwAAAAAAAAD98KQFoAolAPxSgh3gG0UAW5bUKxELLBEILREJKhIQLhEKW/1m
+xyvRD9Kg0Q8AAAD98I4FoAolAPxcAh3gG0UAW5bIKxELLBEILREJKhIQLhEKW/1axyvRDwAAAAAA
+AAD6YGgdoBvlAPwkABXhDFUAW4KdJBEQGfgi9w4ADbekAQALqgMJqgkqoX4IaBEKiAMICk8KRAME
+hE8JRAkkQX4sGgTtHCAsRgKAAPiXAAowG+UA+mBoHa9EAQBbgosmERAZ+BD1DgANt6YBAAuqAwmq
+CSqhfghIEQqIAwgKTwpmAwaGTwlmCSZhfgiIEQhmA//3JA2vZgEAAPpgaB2gG+UA/CQAFeEMVQBb
+gncoECEGiRQJiAMZ9/sJiAkogX4IZhEGhgP/9lQNr2YBAAAAAAAA+mBoHaAb5QD8JAAV4QxVAFuC
+aSoREBn37vcOAA43ugEADLsDCbsJK7F+CGgRC4gDCAZPBqYDBoZPCWYJJmF+CIgRCGYD//UMDa9m
+AQAAAAD6YGgdoBvlAPwkABXhDFUAW4JVJBEQGffa9w4ADbekAQALqgMJqgkqoX4IaBEKiAMICk8K
+RAMEhE8JRAkkQX4sGgTtHCAsRgKAAPiXAAowG+UA+mBoHa9EAQBbgkMmECEEiBQIZgMY98YIZgkm
+YX4ISBEIZgP/8wwNr2YBAAAAAP3vqAWgCiUA/ELCHeAbRQBbllQrEQssEQgtEQkqEhAuEQpb/ObH
+K9EPAAAAAAAAAGwQBPoAoh2gC4UA7PfGGWgEgABblkjIJsAg0Q8AAAAA8++EBeDExQAEJCj0YABB
+v/S1AOokAAnYBIAAW18TdKECZa/u0qDRD2wQBvhAaB3gAgUA4hYAJIBJgADRDwAAAPJAaB3gxIUA
+wKFbi6OxM3Q59fnvXAXgBRUA8+9aBeAGRQD2AeId4CgFACoKKCo2MCY2MyQ2MSU2MieWwCg2yCg2
+yRr3pPoAYh3gDDUA/qBoHaPthQDlNhEo+ASAAFpg7GahhPQAYh2gDlUA+gDCHeAIhQAd95ktNiAc
+95XEoZrAKDYjIjYjJjY1xZgpNjYoNjfA9y82OCI2OSs2Oi42Oyc2PMHXLTY9KzY+KzY/KzZAwMws
+NkErNkIqKgAqNkMmNkTBkCk2RSgKZCg2Ri86IC82RyU2SC42SS42SiQ2Sy0KEi02TCc2TSw6ACw2
+Tvvu+AWgDAUA++7yBePthQD6YgYV4A4VAOv3dxj4BIAAWmDAZqDUGvdzG/dz/H0CHeAMBQDu93EY
++ASAAP5iBhWgDhUAWmC3ZqCwGvdqG/dq/H0CHeAMBQD/7tIF4A4VAO82ECj4BIAAWmCuZqCMGvdh
+G/dh/H0CHeAMBQD57sIFoA4VAOg2ECj4BIAAWmClZqBoGvdYG/dY/H0CHeAMBQD57rIF4A4VAOk2
+ECj4BIAAWmCcZqBE++6gBeAMBQD77qYFo+2FAPpiBhWgDhUA6vdJGPgEgABaYJNmoB7E0C02NJUx
+Hfc/LNLBBMwCLNbBwLLrNgEtEASAANEP0qDRD2wQBBn3QyiQgOqSISwAjgAAyKnIJ8CgW5DP0qDR
+D8Ag0Q8AAGwQBBP3OwIiCgMiCiIioNEPAAAAbBAEGPc2AiMKCDMKIjKfIzKe/GAAEb8igQADIgLR
+DwBsEAQb9y8V9y37cEgVr+wFAOiyfSHofQAADN0BDaoM7KQBBACpgAAvsoEusn4P/jn+gAUqogCd
+AMBAwKD97kQFoAtlAFuVkgIqCgWqCuSmnSIGWYAAHfccHPcd0w/8gABG8AUVAOOmoC74BIAAK8J2
+f7cQLsJwDO4Q7et3fvgEgAAO3wz/ZMAHkAIlAC7CcQzuEH/rce7/DAX0YoAAwKH97hgFoAsFAFuV
+esYq0Q99t+sownIICF8MiBD/G/YN4A4lACKmni+mn8Cl/e4EBaALBQBblW/AINEPJLaC/V/61iIA
+nQACKgoFqgr1U6YVr/2eAAAALaaf/gACHaALBQD7U8YV7/8WACWmni+mn//+3A2gDhUAAAAAAAAA
+AP3t3gWgChUA+gACHe/9RQBblVjHJNEPAGwQCBP26Yog0w8rMkILqihbYQEtMkKMIe3KKA0wBIAA
+W2D9LzJCjiLv6igNKASAAFtg+Rz23isyQuy2KANL/QAAAJAE9e22BaE2nQAc9tqNIO4iASzMAoAA
+7yICKsYCgADpiAIFK/0AAPimAAwwClUA+JyGFaALhQBblTgc9s+NI44kjyWKJpoQiSeZEfhBCBWg
+C4UA+CBGFaAKVQBblS8c9seNKY4qjyuJLJkQ+EGoFaAKVQD4ICYVoAuFAFuVJ40jGva6AFAE/ECo
+FaG2nQANrSwNuyyNJpsVfKsKCsws/GMADjAAKgAMrCwMPCyLJ32rDRf2rgfXLPZjAAvwADYAF/aq
+DXcsBzcse6sNFvanBrYs9mMACzAANgAW9qQLZiwGNiyLKI4qjyl7qw0V9p8FtSz0YwAK8AA2ABX2
+nAtVLAU1LIsrA+4oA/8oe6sNHfaXDb0s/GMADvAANgAd9pML3SwNPSyLLJwUe6sNHPaPDLws/GMA
+DjAANgAc9owLzCwMPCyLLXurERj2iIkUihUIuyz6YwAN8ABGABj2hIkUihULiywLOywqRu3AoCpG
+5SlG5idG5yZG6CVG6S9G6i5G6xj2LgjYNgCIEQjIAihG7CtG7o0uBK4K7ebUIWARAADswg4laAUA
+AATdCuzW1CFYIQAA67IOJWAJAAAEzArrxtQhSDEAAOmSDiVYDQAABLsKKbbUwCDRDwAAAGwQEhj2
+aRv2Zx32XIiAKrB/K7Ii+CAGFaAPBQAuCgTp0nElg9mAAPlwAAZ7iQEADIgI+QAAFDvLoQAIzAIs
+1nIBqAgogAAOiAIo1nQs0nYOzAIs1nYv1nMvCggv1nob9lP6IgAVoA5VAP+vZhWgbAUAW4536vZC
+EMBBAADyAAIdoBmFAA8CANMPbZoP6YIAJVARAADppj8kQBEAANEPL9ZyKNJ2x5sJiAH5rsYVr/6i
+AAAAAGwQEBj2PtMPKIB98+x6BeAa9QD97HgFoA8VAPMABE/QBwUAiTBklBIuMccoMmklMckrMcsm
+Mc0iMc+lvabd4t0IBAPZgAB+0XMvNd79wCQb4gCdAAUPRGX0UAsIRGWESgYJRGWURPNAIgiiAJ0A
+DeoMBe0MLTXI+nokHa/dAQAL2QwpNcoGmQwpNcwKmQz4egQd75kBAPMvAA+wCgUA/nnEHeAB5gAA
+AC4xxyUxySsxyyYxzSIxz6W9pt2i3Sc13v3AIHvk9QEAZfPfCwhEZYPZBglEZZPT80AegKIAnQAF
+6gwN6QwpNdH6eQQdr9oBAAvfDC81yio1yAuuDAbuDC41zALoDAmIDPh6BB2vngEAApoM+nnEHaAK
+BQAO3xEuMcoPAgDvxoQvd4KAAC7Ghysxzg6YEejGhS3fgoAAK8aGLzHO6Mb9L/+CgAAvxvzmoqpt
+SASAACQyactO9oAdzdIAnQCwSPUAHjiiAJ0A2kBbk0Qb9eQtsoof9eQsMcbv3QENdAKAAA7dAi22
+iiy2/imygRr13gqZAim2gcCoW4SdFvXcFfXcK2KH/tDIFeACBQDoYoItbUKAAP1vAA3//AUA7LsB
+DSAEgADqtAAEALGAAC5igw/+OX6zCPrQ5hXgAB4AAMCg6aQABRC5gADpFhUkmDmAAPjO5hXgAwUA
+KmJ3wLgPAgDzQABFMAwFAFuOhuJCCAGYBQAAdTnh8+tyBeACBQDmIdVpSASAABz1tivCgR31uS76
+/g67AQ27AuvGgSDQgQAAW1305qEnbRAEgADr9bMQ0IEAAFpXuuahFG0QBIAAGfWvKDJuJzZt/etM
+BaAKBQD5AAQEf/T1APhtxhWgHxUA0w9t+hjbQMDZfaMB23DuzQQlUBEAAOvmACZgEQAAGvWgW13V
+HPWg+gACHaAfFQBt+hTbQMKBeKMCB3sCK8YU6qwEJmARAAAa9ZhbXcsc9ZX6AAIdoAlFANMPbZoT
+20DA2X2jAdtwK8Yo6qwEJmARAAAa9Y5bXcAc9Yv6AAIdoA7FAG3qE9tAwvF/owHbcCvGLOqsBCZg
+EQAAGvWFW122HPWB+gACHaAIRQBtihPbQMCZeaMB23ArxjjqrAQmYBEAABr1fFtdrBz1d/oAAh2g
+C8UAbboT20DC0X2jAdtwK8Y86qwEJmARAAAa9XNbXaLmIIVpSASAACUxySsxyyYxzS4xxycx0S8x
+3iQyaSIxz+kWFCeBcYAAlhCXESIWAiQWA/3qzAWgCkUA77QAD2gEgAD+oGgdoAtlAFuTsyISFNEP
+HPVflBP2IEYV4ApFAOIWAS34BIAA5hYAL2gEgADoMdQq8ASAAPgghhWgC2UAW5OmKRIU0pDRD9KQ
+0Q8qYn0uYn7pYnslUD0AAOyqAQcEcYAALGJ8DJwMDOw2LmJ5yOuq23vDB/rPphXgABoAwKD5QGgd
+7/baACgyM2WL5ic2aSc13i4xxyUxyfoEAh3iAgUA+nlkHeTGBQDmNc0i6B8AAOI1zybrgQAA/cxW
+DebvBQAFCETOjw3pDAXqDA+tDPx6JB3v2gEA6jXIJsOBAAD4eUQdr/F+AAAAAAAA/SBoHa/97gAA
+AADdUOIWACt4BIAA/2BoHaAKJQD96kQFoAtlAFuTcf/yCA2v6qUAAAAAlhHiFgIq+ASAAPogBhXg
+CiUA/eoyBaALZQBbk2f/8WgNr/pFAPMgaB2gCgUA/eooBaALZQBbk2AiZnf/9EQNr/JFAAAA/IBo
+HeAKJQD96hoFoAtlAFuTWGP8bAAA/IBoHeAKJQD96hAFoAtlAFuTUmP8VAAAbBAMFPUE9ABCHeAI
+ZQAd9QIuKkAuRqqM0YvSitOJ1IfVlxWZFJoTmxKcEY3QnRAS9OEf9PokQoUiIH34IQYVoAYFAPQh
+JhXiNKEA5T42AXxYgAAB4gqCIAL/LMIg8+EAD7AAYgAf9O0FPjYB5wqHcCIKgAf/LAL/Nvfp0gXg
+AjUA9eAM3hADNQD14Av3EAW1AJUa8iFmFeAYNQD47+YdoAmVACl0fhX04Rr03yxwf/rv0BXihLkA
+5PTXHEECgADoFgwvScKAAAmIAqy7GfTWLEKHC4sCCbsCCswBDLsC+pDmFe4MBQD2pwgVoAtVAA8C
+ANMP0w9tKi/icH8iICEAAONwfiKoIQAADGYBC2YCojICggIJIgImVjYjQocKMwEDIgIiRocmUjgS
+9Lsa9KiIHPzABAawCRUACek2690CAKCBAADtVjgsycKAAPkGAAxwAyUA6fS3ELChAADTD206LCMi
+kOVCACEQIQAA52IAIiARAADpMwEDMBEAAABVEQWFAgV1AgUzAgozAiMmjhP0qhr0qSUywBj0qQhV
+AiU2wBv0nSKyuRT0pgQiART0pgLiAgQiAiK2uR30pC022io23Co23io24sLADPw2CMwQLDbkKjbm
+JTLoGfSdGPSdCVUBCFUCJTboIjLAFPSaBCIBIjbAKrKsHfSYHPSZDaoBDKoC+3WGFaACBQDRD5Ua
+kxv27+YdoBm1APjvxh3v+i4AAJUbKHR+9u/mHaAKRQD6IUYVr/nWAAAAAGwQCMBg4xYCKtgEgADn
+9IYaUASAAOIWBSkgBIAA6xYEIRAFAADqFgMjqIEAACpyf1uC9+skAA0YBIAA6nJ/KeAEgABbjkvk
+oBJjuCEAAOV523MwIQAAwCDRDwAAsTysTCrAAMXd/UAIfGAPBQDl9AAI8ASAAPIAAh3gAgUA9ARC
+HaAn9QBtCBRkoHzJIXehL2giTLHK3KAqoAB9oVBj/+R0qeziLAEmUAUAAOrmACdwEQAA/UBoHa//
+ggAAAAAAAO/EACEQBQAA6swBLhgEgADq5gAncBEAAP1AaB2v/u4AdKmvL8QA9YBoHe/+pgDKKWgh
+VWgiRcgxJzQAZF9X9KAGHaACBQDRD8gxJzQAZF9F9KAGHaACBQDRDwCNEuLWACGAOYAAJzQAZFA/
+EvRA9KAGHafoBQCoIqJi0Q+LFPogKBWgDAUAW4FSixP6IAgVoAwFAFuBT4kS4pYAIYA5gAAnNADI
+USRUAGau6hL0MCh64KgiomLRDwCJEhL0LP8gBhXn6AUAqCKiYtEPAAAAAABsEASLMCawAMBw6GlH
+bcgEgADLb9mw+CACHaAKBQD8ASIdoC01AG0IKGhsFXxhEn1hNuiM/yVQBQAA5iQAIRAFAACxd6t5
+JpAAaGlXZIBqZGBRY//QwEDkJAAkwAUAAPhgBhWgAgUA0Q8skAAPAgAPAgD9hUAE0AUFAAt7COaw
+AC24BIAAbQgU5GAYYqgFAAAmcAGxd+hpCWvIBIAAY//kq3urWcmCwNDtJAAk8AUAAO42AC0QBIAA
+0Q/GKtEPAABsEAhb/t3mpn5tEASAABXz9hfz8xzz8Pnn5gXgBAUA++fmBeAKFQAY8/IolqUslqQk
+lqcf8/AvlqYe8+8ulqkd8+8tlqgslqsY8+4olqotsoIf8+we8+3TDw/dAQ7dAi22ghzz6iy2hiq2
+hyhSQClKRem2pSQzWYAAEvPm/efKBa/z9QD350YFoAlFACjC8AmIAijG8B/z4B7z4Z7wLGLAHfPg
+DcwBLGbAL2LQKOrA+eAEB7EYVQAI/wIvZtAe89kuZtEoYtgd89gc89gNiAEMiAIoZtguYtsf89YP
+7gIuZtsd89QtJjUvYtIc89MY89MM/wEI/wIvZtItYtIuSgAO3QItZtItYtIc884swIDH7g7dAe1m
+0i4QcAAALGLTHvPJHfPJDswBDcwCLGbTI2b0I2b1LwqALWLeHvPEDwIA0w8O3QEtZt4rYt7AxAy7
+Aitm3iliwxrzvvsgBAS1CgUACpkCKWbDLmLBGPO6CO4BD+4CLmbBLGLCHfO4DcwCLGbCKiIsG/O2
++0AEBXQbBQALqgIqJiwvIi0a87QZ87EY87Ec87IJ/wEI/wL+RaYV4AtVAFt+iBrzrP3nWgWgC2UA
+W36EGvOp/edSBaALdQBbfoEa86X950wFoAuFAFt+fRrzov3nRgWgC5UAW356GvOe/ec+BaALpQBb
+fnYa85v95zYFoAu1AFt+cxrzmhzznB/zmv5BxhXgKwUAW35u++cqBaJLRQD8AEIdoA0lAFuAe/vn
+IgWhSxUA/AACHeD89QBbgHb75xgFoUsVAPwAAh3g/PUAW4ByGvOH/ecSBaDoRQD4QUYVoCs1AFt+
+Whrzgv3nCAWgK0UAW35XGvN+/ecABaArVQBbflMb83+bLJsrmy0pUHyZEC1i3J0RLGLYDExT7BYC
+JKYZgACZEPUgJyiSAJ0AmRD1ICx5EgCdAPUgLVmSAJ0AxioZ8wdmI7oukIBk5IHAIGYjrxLzbC8i
+1Bnzaxjzawn/AfnmAA+wKuUA/lqGFeALdQBbW3gqcX3xQB/+kgCdAPoFYh2gCxUAW1tj+gViHaAr
+lQBbW2/6BkIdoAsVAFtbXvoGQh2gK5UAW1tq+gXiHaALFQBbW1j6BeIdoCvFAFtbZPoEwh2gCxUA
+W1tT+gTCHaArlQBbW1/6B0IdoEt1AFtbXPoAIh3gagUAW1tK+gWiHeBqBQBbW1f6BsIdoAs1AFtb
+RfoGwh2gK+UAW1tR+gbiHaALFQBbWz/6BuIdoDvFAFtbTPoAIh3gqiUAW1s6+gUiHeCqJQBbW0b6
+BKIdoAslAFtbNPoEoh2gCzUAW1tB+gdiHaALJQBbWy/6B2IdoAtlAFtbO/oAIh3gujUAW1spK3GB
+IgoY+kAY+OIAnQD6CsId4Lo1AFtbMvoI4h2gCxUAW1sgLHGB/EAYcKIAnQD6COIdoDulAFtbKvoI
+wh2gCxUAW1sYLXGBDwIADwIA/EAXuOIAnQD6CMIdoDuVAFtbIPoIAh2gS8UAW1sd+gZiHaBL1QBb
+Wxv6CEIdoEv1AFtbGPoHIh2gS+UAW1sV+gmiHaALFQBbWwMS8v76DCId4ErVAFtbDyhi/hnypwmI
+Aihm/i4ikC8KLw/uAi4mkFv8XuahzG0QBIAAGPI10w/TDyiAgPLvZBWgCTUA/ABCHaAPFQD4AQAH
+MLgBAPvtAA1wuBEA/40ADTCIGQD7LQANcA9FAAj6Oe3y5RVD9QAA+eIADTAiEQDi+jkNSASAACzS
+gPrvZBXv/rUA0w8OzAEs1oDxYAtP0gCdAPUgGEiSAJ0A9SAaKRIAnQD1IBpyEgCdABvyNBrysxny
+GymmjCumkB7y0A8CACnmjCvmkB3yzinWjCvWkBzyzSnGjCvGkFv8AeahDG0QBIAAFfLJHPKlDwIA
+KsJxG/KX+WgIFa/t5QANqgEqxnHoFgMkAPmAAMCgW22uG/KPpa4k5oGPEy/mgiTmgxnyuynmgCiy
+c+gWBCQA4YAAwKFbbaSlqiSmgYsUK6aCJKaDGfKyKaaAGvKy/eVkBaBNBQBt2hEron/9YASUIgCd
+AKW+I+aAtKovcX5k8d/A0Brymvwf4h2gK3UAW3+BGvKWG/KmHPKmW31sGfJ8GvKkKpZwGvKRHPKj
+HfKkGPKh+S8GFaJLBQBbf3bEwMDTDcws/C4ADr/+xQDrcX4m6A0AAA7dAe7MEQ7uAoAA/YYADnAN
+FQANzAId8l7s1qUtgH4AAC5xf8zkL3GAZPI60Q+luPUQBhWv/cYAACRWNPUgCzkSAJ0A9SAQQhIA
+nQD1QAsokgCdAPlf9KFSAJ0AJFTmJFTwLFDgKVDqK1DvLVDlJFTlJFTvq5mtzCxU4Pi9Rh3v+bYA
+AC5Sc2Xpki9xfmTyFiiypBnydgmIAfl0hhWv5gIAAAAA+gWiHaALFQBbWmT6BaIdoCuVAFtacWP7
+6wAAAAAAAAD6AEId4Lo1AFtaXGP81gAA+gjiHaALJQBbWlhj/OcAAPoIwh2gCyUAW1pUY/z+AAAA
+AAAAACqSIWSrd8CgW4ty80BoHa/txgDApP3ksAWgC4UAW5BSixCMEh/yQv4gKBWgDRUADcw2nBIP
+7gLuFgEtjEQAAMCk/eScBaALhQBbkEca8kzSoCxi2B7yS40S7swBDusCgAANzAIsZtiLEBzyB40R
+C7sLDLsL7WbcJdgHAAD7cAAV4EyFAFuJ/NogW/rg80BoHa/rigAucX9l7hkvcYBl/hMocYFljg3/
++DANoA3FABnyNilWNflf9RjSAJ0AJFTmJFTrJFTwLVDgK1DvLFDqLlDlJFTlJFTqJFTvrt2tzKy7
++rwGHe/0PgAf8ij+poYV7/QSAMCk/eRMBaALhQBbkBqKEhnyJIgRBKo2mhIJiAL4ICYVr/w2AMCk
+/eQ+BaALhQBbkBHz5CwFr/1+ABvyHBzyGyxWNPqmphXv8uoAJFY0HfIZHvIRH/IXL1Y1LlY2/Kbm
+Fe/yggAY8hQZ8gsb8hErVjUpVjb4puYVr/emACxxgWXNvili4BvyDRryDQuZAQqZAilm4C9iwBjx
+Tgj/Ai9mwC1i2B7xlhrx4RzyBg7dAvzbBhXgKwUAW3y10Q8scX9lzeItcYBl3dwucYFl7dZj92Bs
+EAQU8bEiQXv54/QFoANVAPJCAIXgBQUAJYR8JYR9JYR+JYR/I0F9eT8e6UF+IehugADqQX8sgJ4A
+AOtBgC0AXgAAzLMsQYHIwNEPHfHrJdZmJdaZ0Q8AbBAEE/HoFPHoIjF/BCIBIjV/0Q9sECjwU1AN
+4AcVAPRAE2iSAJ0A9EATwRIAnQD0QBeCEgCdAPRAE+qf5qUA8AP0DaADBQAAAMBw/KAAQr/mpQD8
+4Ggd4AolAP3jqAWgCxUAW4+6wKL6ACId4AkFAPivph3gCKUA6FR8KOAEgABbj7Ib8csqCgHqtIwr
+BVoAAB/xxy/yHfwAAh2gDgUA/k4ADHAEFQDqhAAEFWmAAO33D3nABIAABEwC7jIAIcARAAAKGhTk
+oC9lW/0AAOmCACZgCQAAbbkT64IBJmAJAADunggEQCEAAImArr7uggEvUASAAKqYqO7941wF4Y8B
+AOSAMWDIBwAA84ABBfAKRQAIqgzrsgAkyEEAAKmI+iiGFeAJBQBtqQfphAAkQAUAACwSRK7OLtYe
+H/GewOEu9IzINvRADZISAJ0A0mDRDwAAGPE7ADURqFP+oGgdoApFAP3jKgWgCxUA7SQACfgEgABb
+j3bApfxgaB2gCxUAW49zKjAAIxZA/DCAFaAFBQD/S3AN4Pv1APtf9XxiAJ0A9/1CHaAJBQD4KKYV
+4AgFAPgo5hWgAQ4AAAAAAAAqEkcPAgAPAgBkoLgrEkGIoSwSQu0SQyjQBIAAC4AA5qEFbTAEgAAo
+EkAogADVcPEIIA3g+fUAeYF66hQAANgHAABb/PQoEADqFkYiuAUAAA8CAP8dAA3gXLUAfImhKByE
+qKUtUHsuCl0PAgB+2ZAtHQHr3AQo0ASAAOzcCCboMQAAW/yA6hZHJQmhgAAvEkVl8RwY8VqEoXhJ
+i/goCBXgChUAKhZFGvFTA5kM+UOmFe/93gAAZmBvHPFPwLH7kYYd7/hWACUSRiYchKZV//ccDa/m
+pQAV8UsY8IIAMxGlNfhgAEG/+uYAFfFHGPFHADMRpTX4YABBv/qaAAAAGvDBKqB9GfFC6PFCFXxM
+gAAjgcQHMxH4YABB8AA2AAAjgcMHMxGpM2P+dCUSRigchPigAEK/9ZoAAAAAAAAAAOvw2xnQBIAA
+W5Cv+gDCHaALBQD8AAIdoA0FAP4AAh2gDwUAW2u90mDRDwDdcPviVAXgCmUA7/DNGawCgAD8oGgd
+oA4VAFtrtBnxJSmSgGiQFvPiQgXv+C4AAAAAAAAAAP/2cA2gDgUAE/Ec//dkDa/25QDAov3iNAWg
+CxUAW471//NcDa/mpQBsEAQV8RbTDyRSISNSICJSIvfiJgWv9/UA9GAAQbAIBQDyQABBcAQFAG0p
+XyJiRiNS3+JCCAIgBQAACSIRojIoJCEoJCAoJRMoJRKYLJgrmC+YLigmESgmEigkVSgkVCgkYigk
+YyglLCckeiglMyglNCglNSgmGygkcCgkcSgkcigkcygkdCgkeSglO9EPAABsEA4f8PTiFhEpyASA
+ACkWEIP3hfaI9Yr0jPON8o7xnhGdEpwTmhSYFZUWgviTFyMSEZIY7/IAKlgEgADvFgAhjcGAAOjw
+5RINgYAA+GCmFe/NBQD8kAAWMAqVAOo2DyZg/QAADcwBrJycNiWC6h7w2vkcqBWvCkUA+qAAQr/9
+BQANVQHqVAAEAOGAAC/i6S7i5g/+OX5TCx/w0PX9RhXgAB4AAMCg5aQABQtJgADs8FQSjYmAANYQ
+9GIGFeAHBQD6IaYV4AkFAPgh5hXgBAUAiB2FYAhVKCgKZAhVLOIyECKo/QAA+oAIANZVHQD0IcYV
+4VWdAOciCArQBIAAW37xHvC2lRwv4uoo4uYp4uX77wAPv/uFAOv/AQ1oBIAA6vQABICxgAAp4ukJ
+mDl48wj/3UYV4AAeAADAoOWkAAUDkYAAZFC25SYAKtAEgAD6IYgV4AwFAFuI4CsSEIwfjh7uJgMq
+AQqAAPxAhhWgDRUA6yYBLugKgADtJgYvfoKAAK+7KxYQ7OwIBdsBAACbIuwWDyZj/QAAnCWKP7Rm
+5EwBI7hxAAD6n/lDogCdAMAg0Q8l4uAs4uEo4t/p4t4iqB0AAOtVAQYBGYAACJgMCMw2KeLc5d8I
+BIDRgAB/wxL/3AYV7/2GAAAAAP0gaB2v/44A//04DaAFBQDBJtEPwKD94AAFoAtlAFuOTfRABhXv
+8kUA0Q8Z8HEa8HAlkuAqot8skuHpkt4iqD0AAA1VAR3wagqaDO3S3CYCSYAACsw25NAWYtAHAAAq
+rPx6wwsc8GP7nAYVr/luAAD/+UgNoAUFAAAAAMCg/B+CHeALZQBbjjP0YgYV4ALFANEPAAAAAAAA
+/SBoHa/+6gBsEBBbWfgqJhlbWfP+QygVoAzVAPXfZgXgDcUA9eCcBaAIRQD/TwAPMAMVAOomGidw
+BQAA7iYbKVAEgAAZ77Mb8AUoVEUoJIcoJIEkJhQjJIUsVEQsJIktJhUrJhb8UQYd4BsFACski/k7
+SBXgDSUA/FDGHeAM5QD8UUYdoAsFAPpQhh3vmYEAKRYVKSYXKSYYbYoSKKCIAIEEAD8a5PEIdVAF
+AACxu8C0Cw5HLiSB9cAP6hIAnQD94FAFoApVAP3gSgXgOwUAW437LiIZLSIaDt0Msd0NbRTp1AAG
+kWGAAA0PX2TyvsKgCYhXZILBCctTZLLGCexRZMLNsK4J6jsKpAIqCgX94CoFoDsFAP6AaB2gHxUA
+W43n/lCQFeAXFQAHRzbvFhYjy/0AAOCRBAPAGQAA5ySAKaAKgADnIIUrgQqAAOA1GgwBCoAA4DYa
+AiP9AADlIIcim/0AACQmHCQmHSMWFOMmHiMz/QAAJiYfE+/EJiCG/d/0BaAKVQD8eygV4DsFAFuN
+yygiHgqIESg22f3f6AWgClUA/HsoFeA7BQBbjcQc7/EtIhkuIhovIhspEhboWBALXAKAAOi7AgvW
+AoAACpkC+yYADPAKVQD4e0YV4DsFAFuNtyMSFBzv5C0iF/5DCBWgClUA/iKoFeA7BQBbjbAV7zoc
+794vIh7+UBAVoApVAPxD6BXgOwUA7RYAKc6CgADpFgEqaASAAFuNpRzv1B3v1f6okBWgClUA+Kiw
+FaA7BQD4IAYVoA/1AFuNnewUAAFZQQAA+AACHaAZFQBtmg2rieyKCARAEQAAiZCZoMCl/d+KBaA7
+BQBbjZHApf3fhgWgOwUA/D4CHeH+BQBbjYz9334FoApVAPoGAh3gDVUAW42HKixQ6yIZKmaCgABb
+/rXAINEPAAAAAAAA/d9sBaAKVQD9304F4DsFAFuNfCogiC0iFNMPAKEE4D4aDQIKgAANCRlkkPYs
+IhWwy+CwBAdL/QAA+J8ADP/69QBtCAoJGRTkkBVlUAUAAGP/7gAAAAAAAP/32A2gBAUAAMEEAD0a
+69z/LYIKgAD6nwAN//n1AG0ICgsbFOSwCGTIBQAAY//uAOwkiClYBIAA6p8MBnANAADuJIsmUAUA
+AOokiSZACQAA/lCGHeAKBQDoJIon6AUAAO0khSfACQAA6CSGJ/gNAAD+UOYd4A5FANMPbeoSLbCI
+ANEEADwa5MEIddgFAACxqsCkCg5H/lAmHa/0WgAA2RH/9PANoBoFAAiZEftfABWv9N4ADJkR+1+A
+Fa/0ygAAAA6ZEftfwBWv9K4AwKL93toFoAsFAFuNNf3e2AWgClUA/d62BeA7BQBbjTBj/NMAAGwQ
+CBjuyhzvUhbvZCiAfSzCRipi2tMP6cwRCagEgADsqggEfECAACqtASqsgFtxEmAACCqtAyqsgFtx
+Dxnuqy2SEu5iCyaBOYAAwCCEaYtoj2qOa5QRkhL6IAYV4ApVAP3eoAWgOwUAW40U0Q8a7rXK5H6j
+Io9qyvt/oymLaMuwe6MuhGnwgHAN4EkFAHSbL///AA2v4qUAhGmLaI9q//7IDa/ipQCEaYto//6Y
+Da/ipQCEaf/+cA2v4qUAAAAAAOvuVhEYkQAAkynjJgohILEAACQmC/RBhhWiSgUAW2nB90BoHeKL
+BQD0IMYVokoFAFtpvItpmhX3YwANcIsFAFgGVORiCSULqYAA5RYEIgHBgAD1QGgd4AQFAPqgaB2v
++/UA/dx6BeJMBQBYBi2OKbitneGeopOjnSmMaeV1CAIgBQAAfEPThxWKaPdDAA1wiwUAWAY/1aDr
+YgglCEmAAMuy8iDIFeAEBQD6oGgdr/v1APxIAh2ijQUAWAYZjCu4q5vBnKKTo5sri2jldQgCIAUA
+AHtD09qwW30rJGL2LmLx3aD6jwAKP/UFAOVEAQcAwYAAKWL1KGLyCZg5eEMH9N7GFaAAGgDAQGRB
+kOfubRIGIYAA5CYOKlAEgAD6wQgV4AwFAFuHHYpqW30WJGL26mLxLWgEgAANRAzlRAEFAMmAACli
+9Shi8gmYOXhDCPTexhWgAB4AAMBAZEF8ZEEU5CYQKlAEgAD6wUgV4AwFAFuHCoppW30EwbBYBgWa
+L+RiCSUB0YAA+oBoHeAMBQBbhwKKaFt8/MGwWAX+mi3rYggtAt4AAIRpHe4gj2r+wWgVr/JFAP2i
+SBXv93YAi2gd7hqPav7BaBWv8kUA/aJIFe/3GgAAwKD84GgdoAtlAFuMhx3uEpQuhGmLaI9q/sFo
+Fa/yRQD9okgV7/Z2AMDAW4bmimtbfOAkYvYuYvHqRAwNaASAAOVEAQcA8YAAKWL1KGLyCZg5eEMN
+9N7GFaAAMgAAAAAAAADAQGRBBmRA2uQmESpQBIAA+sFoFeAMBQBbhtLrEgQpUASAAFv+Oxvt8y2y
+EsDB6s04DRAEgAD9YkYV7/R2ANxw+gACHaALZQBbjF8d7eokJhCEaYtoj2r+wWgVr/JFAP2iSBXv
+8/IAJGLsKmLt6WLqIiA9AADlRAEFBpGAACxi6wycDAysNi5i6MjupNp6wwr63YYVr/kKAAAAAP/4
+3A2gBAUAJGLsKmLt6WLqIiA9AADlRAEFBPGAACxi6wycDAysNi5i6MnipNp6ww763YYVr/laAAAA
+AAAAAAD/+RwNoAQFANxw+gACHaALZQBbjDYd7cAkJhGEaYtoj2r+wWgVr/JFAP2iSBXv8V4AJGLs
+KmLt6WLqIiA9AADlRAEFAemAACxi6wycDAysNi5i6MnhpNp6ww363YYVr/syAAAAAAAAAP/6+A2g
+BAUA/SBoHa/83gD9IGgdr/2uAP0gaB2v/zIAbBAGGe20Fe4+0w8pkH0qUsYoUs7kXQItVkKAAOqI
+CAT80IAAKo0B+1AAFaCGBQBbb/csQkYrUs4JzBGsu+a6CA0gBIAAW2/u+o8ACzAAvgAAAAAAKo0D
++1AAFaKGBQBbb+suQkYtUs4J7hGu3ebaCA0gBIAAW2/iCkYMKFLqL1Ll6lLpK28CgAD9DwAMf/cF
+AOeIAQeAqYAAKVLmCqk5eYMH+L1GFaAAGgDAgOSEAAQKYYAAHO4mZEJI9EBmFaSdHQD8AAgdoD1F
+AG2ZAgQCYS5S5ShS6g1tKC9S6Q2IDOeIAQcAqYAALlLmD/45foMH+L1GFaAAGgDAgOSEAAQKoYAA
+ZEDf5CYEKlAEgAD9oGgdoAsFAFuFow9kEdpAW3wzKFLqKVLllBDqiAwNaASAAOeIAQSAwYAAKlLp
+KVLmCqk5eYMH+L1GFaAAGgDAgOSEAAQJ2YAAZEDh5CYBKlAEgAD6IAgV4AwFAFuGJdpgW3wfKFLq
+K1Ll6ogMDWgEgADniAEFgMGAACpS6SlS5gqpOXmDB/i9RhWgABoAwIDkhAAECTmAAM1HwKD92r4F
+oAtlAFuLrPRARhWv8kUA0Q8AAOQmAipQBIAA+sBoHeAMBQBbhgsrUhTrJBQp0ASAAFpQosAg0Q/A
+oP3aoAWgC2UAW4ud9ECGFa/yRQDRDyhS4C9S4e5S3iRAPQAA54gBB4iRgAApUt8J6QwJ/zYqUtzI
+q6jaevMH+rwGFaAAGgDAgPUAaB2v+gYAAAAAAMCg/dp0BaALZQBbi4f0QCYVr/JFANEPKFLgL1Lh
+7lLeJEA9AADniAEHhiGAAClS3wnpDAn/NipS3MirqNp68wf6vAYVoAAaAMCA9QBoHa/55gAoUuAv
+UuHuUt4kQD0AAOeIAQeEiYAAKVLfCekMCf82KlLcyKuo1HTzB/S8BhWgABoAwID1AGgdr/pKAChS
+4C9S4e5S3iRAPQAA54gBB4LxgAApUt8J6QwJ/zYqUtzIq6jaevMH+rwGFaAAGgDAgPUAaB2v+poA
+wKD92hAFoAtlAFuLVfRAZhWv8kUA0Q8AAAAAAAD/wGgd7/veAP/AaB3v/RYA/8BoHe/94gD/wGgd
+7/6uAGwQBBftgwg1EeVFAgk3goAAp2aVYNEPAGwQJBvtfvogaB2gTAUAW4UDG+17+igAFaBMBQBb
+hP/r7XkQ0f0AAPtAIBWgjAUAW4T7Fu11EuzK9gACHeADJQAkYb7aQFuKLv1f4BWgG/UADLsM60UG
+fWAEgACxrPggaB2gDgUA/PgAErApBQDgzBEL2gKAAOy7AgDR/QAA7BxAJVAFAADrSwIDuAUAAOsm
++SIjYQAAbZo76YEAJEAJAADrogAlUBEAAO3BACZgCQAACUko5e8CB3AFAAALmSzjmTUO3MKAAOuZ
+Ag/cAoAAC5kCKSb37wIAAzAJAAD4//sF0gCdAMAg0Q9sEAb32pAFoAcFAPXajgXgCQUA+CAmFeAD
+BQArYH3yACIdoAyFAOx8AgWB8YAAnBDqdAAJWASAAFuF89Sg/CAIFaAL9QBbgOGOEQVPCv5gAEcw
+igUACu4CLvaALWB9sTPtM8xxEAUAAI8R5mwBI7gFAAD+YABH8AMFAO8WASumdAAA0Q9sEBIX7B3T
+DypwgMCE+gBiHeAGJQD6AAAHsA4VAP/NAAnw2gkA/M0ACfDKEQD9bQAJsKoZAAqDORrsIuvssBHL
+9QAACYM4GO0Y+dowBeEzHQDzcAYV4V0FAPv/4h3gAwUAbdoZI4aBI4aAKpaDK5aCKpaB65aAJEAh
+AAApnBAb7Qwc7Qwd7Q0e7Q34AAIdoEkFAG2aJAuJCimdBJOQDokKKZ0Ek5ANiQopnQSTkOyJCgRA
+BQAAKZ0Ek5BbZpT52gAFoAqFANMP0w9tqgfjhjAkQBMAABLs9/XZAgXgBAUAIybCIybDIybEIybF
+4ybGKlAEgABbZlwoIsDTDw8CAAWIAugmwCIgBQAA4i0gKidIAAD52PQFoAqFAG2qB+OGhCRAEQAA
+GuzowIDzVeYV4luFAG26FiOmxiOmxyOmyCOmySOmyuimxSRABQAA+CBoHaAaBQAPAgAPAgBtqgfj
+hgAkQBEAAPQRAh2gAgUA6iQACNgEgABbZimxInQp7xjszRXs0h3s0voAAh2gCUUAbZoYKYKADZkC
+KYaA5akKBVAFAADmlo0kQIMAACtwgPXZggWgAgUAACAECwkb8yAJD9IAnQCxIuRNICknsAAACL0R
+Huy90w8PAgAv4oAS7L0C/wEP3QLt5oAreASAABjsuiyAgC2AgfKxZhXv9OUA/YAAhjBmRQDtbgwO
+ZcKAAAbMLATMAQ3NKP+DAA4wBWUABt0s9aAEBf/zhQAGzCwD3QEEzAH94EAGMAk1AOy7CARAFQAA
+69oIAOGBAAD9gAYV4A4FAO0cUCZgEQAAbZpJ6YCAJEAVAACq7uvWACboEQAACZkJ6YB8LNXCgAAG
+qiwEqgEJqygJaQwGuywJqSgDugEFuwEGmSwEmQHqxgAmYBEAAAn5N6m7q6qb0PvAAES2DgUA6etg
+cPlBAADAsG0IHA+9CozQsbsLC0HozP4mFDEAAOjWACTL+QAAees5Y//cAADaIPwoABWgCwUAW4jq
+LhEgLkaKLRxCLNEALdEB63CALmQCgAANzAL8kSYVr/riAAAAAAAAAP8lkg2gCwUA0w9tCB0PvQqM
+0Cu8AQsLQejCDGZACQAA6NYAJMgJAAB+mwRj/9kAACkcUB3sX4iQ6NaEJPgRAAAY7GGP8O+GhCTw
+IQAAH+xejuDu9oQk4DEAAB3sXIzALNaEKRxgHOxSj5Dvxogk8BEAAB/sVI7g7vaIJOghAAAe7FKN
+0O3miCTYMQAAHOxQK7IAK8aILxIbLhIZLBIYLRIaGuvo/G4ADjPuHQD8bgAO8/8dAO7/EA7tAoAA
+790CD3aCgAAOzAL9hgAOcCuVAFt2tcAg2iBbZQaxImkk9cAg+kBoHaXr5QBbZVyxImkk78Ag0Q9s
+EAgU64IX64Mc65MoQd7z1wAF4BL1AO5BxyZhwQAA5UHJJAyJgAArQcsmQc0qQc+lvabdqt39wBvD
+5PUBAPP0rA3kiwEA8xQsDeSWAQBlkzr6QBm4ogCdAAXoDA3iDCJF0ShFyAuPDAb/DP6ZhB3viAEA
+C4kMKUXKAv8M/poEHe//AQAK+QzpRc4sR4KAACJByug2hCkXgoAAIjaHIkHODv8R7zaFKReCgAAi
+NoYsQc7vNv0uZ4KAAPx/hhWgAgUAZiLBIkJpyyn2QBg90gCdALAo8wAYqKIAnQACKgJbiKstMoos
+Qcbn3QENdAKAAA7dAi02iiw2/ikygRvrRwuZAik2gSpBxvfX6gWgAgUA5ev0FQGpgABgAAoAAAAA
+ACpBxnorIi8yveb/AQlHAoAACP8CLza9JTa8W3no5K/fYRAFAADHLtEPCqsKGutcKaF+6zaNJI35
+gAAsMoEd6+INzAEsNoEiQmknQdEqQc8mQc0vQd4rQcsuQcflQcknjVmAAJYQlxGSExzr2OoWAi34
+BIAA/cBoHeAKRQD+oGgdoAtlAFuJfSJCa/JxhhWgAgUA0Q8AKzKEKkHGKUHHC6oMCioUKkXJCpkM
+KUXIJjKEKDKHJUHICGYMBiYUJkXLBlUMJUXKLjKHLzKFD+4MDi4ULkXNLDKFLkHHLTKGJUHJK0HL
+DcwM9pmkFa+sEQAqRc+lvfegAEa/zBEArNj5wBBDpPUBAGXx2gsIRGWB1AYJRGWRzvpADliiAJ0A
+LEHeqtkF7wwvRcgJ6Qz4miQd798BAAveDO5FyiYIYYAABusMK0XMCbkM+JoEHe+ZAQAKmwwrRc4O
+2BEiQcroNoQpF4KAACI2hy9Bzg6eEe42hS//goAALzaGLEHO7jb9LmeCgAD8f4YVoAIFAGYg2iky
+gXuWVygyiggIVfsABADQAhUAACIa4kZpIXHxgAD2QAv10gCdALAp8yAMYKIAnQDaIFuIKy4yii1B
+xufuAQ18AoAAD+4CLjaKLTb+KzKBHOrHDLsC+nAmFe/3/gDAgPiNJhWv99YAACmhf2WePiuhgGW+
+OCyhgWXOMmP+OxzrcJITlxKWEOoWAS9oBIAA/2BoHeAKRQD4moQVoAtlAOgWBCrwBIAAW4kRIkJr
+8nGGFaACBQDRDwAAC/gMBogMKEXMCowMCcwM/JoEHa+YAQAKngz+mcQdr/vGANEPAAAAAO1UAAt4
+BIAA6hYALfAEgAD6AEIdoAtlAFuI/P/0WA2v4qUAAAAAlhEc6qmbEOoWAir4BIAA+gBCHaALZQBb
+iPP/88QNr/JFAPoAQh2gC2UA7OqhGWgEgABbiOxj/RkAAPoAQh2gC2UA7OqcGWgEgABbiOZj/QHd
+UP7AaB3gCiUA7BYALfAEgAD91SAFoAtlAFuI3v/6FA2v4qUAAJYRHOqLqt2aEusWACr4BIAA+gDC
+HeAKJQBbiNX/+YANr/JFAPoAQh2gC2UA7OqDGWgEgABbiM5j/KEAAPoAQh2gC2UA7Op+GWgEgABb
+iMhj/IkAAGwQBhnrHBrrHCiQBCgUBCmSACkWAFv9fhXrGRrqrvyvRBWhSwUAW3WDGusVDwIADwIA
+KqF/80AXfpECBQD71UoFoUsVAFt1d/XUlAWgykEALFRUK0LTZrL2H+sKLkLCLlY3LULYLVY4LELZ
+LFY5K0LbK1Y6KkLwKlY7LlIbLVIaKULsKVY8rtj54Ba7ogCdAMd/KVIY7UbEJJV5gAApRsYsUhzm
+6nQWEpmAAChSHmSCSItfwDH9Y2BBUAoFAG0ICrGqAKEEADkae5sIY//uAAAAAAAALVDCGerrKFIR
+KlYSC5ksDYgs6VYUJEP5AAAoVhMsRsiIXy5QwqHuLuAALVIR6EbNL3CCgAAO3QIpUhIpnPXtRs4s
+zAKAAC1C2x7q2ihSHg7dAQ2ZAilG2yhGyo5eLVDDod0t0AApUhDuRssu6EKAAA2ZAi5SIS1SIClG
+zK7Y+eAQ86IAnQAvUhEY6ssqUMIuUMMsUhCoqqjuLuCAKqCAG+rHr8yuqqyqKFDDL1IQLlIR+LhQ
+FeAchQAM/ywM7iwJ7iwI/yzqZhsv/AKAAA/uAi5GxwqqEaraLUbFLbJpDN0s6mYYLu6CgACtqiuy
+agy7LOpmGS3egoAAq6oqZhoa6rD8QAId4AwFAP4AIh2gCyUA+sJmFeAPBQBaUxrmoZFtEASAACNm
+E8SwK2YhK1IlKVIkHOoaH+o3C3k4KVYkKlIlKFIkqojp9tskQ/0AAC5SJytSJij23A57OCtWJi1S
+JypSJq2q6/bXJVP9AAApUikuUigq9tgJfjguVigoUiktUiio3e7G9Sbr/QAAKlIoLcb2K1IpKVIo
+q5nq9t8ky/0AAChSKy1SKin24Ah9OC1WKi5SKytSKq677cb3Jdv9AAApUiorxvgqUisoUiqqiOn2
+4yRD/QAALlItLFIsKPbkDnw4LFYsLVItK1Isrbvs9uEl2/0AACpSLyhSLiv24gp4OChWLilSLy5S
+Lqnu6PbpJ3P9AAAu9uosQvAd6moNzAIsRvDRD8AgJ0bGJ0bIIkbNIkbOJ0bKIkbLIkbMImYbIkbH
+J0bFJ2YYJ2YZ9sNGFe/7cgD709YFoUsVAFt0vAKsAvvTzgWhSxUAW3S9Y/z4AAAAAPaYxhXv9VIA
+HemPLNB9wOQOzAL9r6Ydr/PqAMCh/dSaBaALZQBbh+vGKtEPwKH91JQFoAtlAFuH58Yq0Q/Aof3U
+jgWgC2UAW4fj0Q9sEAYZ6Wz70ygFr/j1AJiQmJGYkpiTmJSYlZiWmJcroof/1HgF6LuBAOsWACDA
+EQAAL/KH/dRyBej/gQDvhgAg8CEAAC3Sh/vUagXo3YEA7eYAIOAxAAAS6jIrsocpIF7z0ywF6LuB
+AJvAypDonxAM9AKAAO/uAgzuAoAADZ0CDt0CLCBfLTbBLDbCKSBeHeolLiBfjxCKEanu4PkRD3oC
+gADp+QIPdgKAAAnpAgmpAg2ZAik2sYgSDwIADwIA7BIDLEQCgAAI/wIP7gIOzAINzAIsNrIb6WAr
+socvMoIqynH6XAAE8rvJAOuZNwXACQAA6v8BBMgJAADviBEMzkKAAAmIAgj/Ai82ghrqBx3pa/xw
+SBWgDhUALiSg+EPIFeCLBQD9gAQGcEgFAAy4OeikgCSBOYAAKTahLyIa8eGQDeAEBQD6gGgd4AoF
+AFtjjigiGrFE0w94Q+opIiDKkSk2oioiG/FBkA3gBAUA+oBoHeAKFQBbY4QrIhuxRNMPe0PqKSIi
+ypEpNqMsIh3xgZAN4AMFAPpgaB3gCiUAW2N6LSIdsTPTD30z6i4iHPHBcA3gAwUA+mBoHeAKNQBb
+Y3IvIhyxM38z7MAg0Q8AbBAEGunX0w8qon8rOugLqiworf0ojOBuiAorGpf7YA5KogCdACoKZBLp
+z9MP+k/EHaALFQBbY90qJX8U6cv305YFoAMFAPXRwgXgB/UA2jBbY80DOgJbY8XAINow+kBoHeBs
+RQBbY4rqNAAJWASAAPwAQh2gDSUAW2OqsSJpK9raMFtjfvaARhWgChUAW3y82jD6AeId4A4FAP6A
+RhWgbEUAW2N7+mBoHaAL9QD8AGIdoA0lAFtjmxLprpVCJyQAwPD+gEYV4AIFAOo0AAlYBIAA/ABi
+HaANFQBbY5IiLAFpK+bjPAEiIEEAAPh/+vpSAJ0A89GOBeAHBQD2AKIdoCwFAAcCR/j/oBXgCwUA
+6cs4CVAEgABbY1PAiAh4AggIRyg2UiUyUwUkEfRuAAowCgUA6jZWIigHAAAa6Y76AEId4AwFAPaY
+ABSwDVUA9yYADLAOFQD4awYV4A8FAFpR5uaggW0QBIAAsUR1SczCwCsKACs2WCd8AeoyWCkDSgAA
++P/7+1IAnQAf6Uce6Xv90qwF4AsFAPoAAh2gFAUABLwCDAxHLDZSCokUAJkRDZkCKTZTCwhH7wAF
+BdgFAADpMlMsRwKAAO6ICAVQIwAA+ROoFaCJBQBtmgIIAmFptr5mIAJbY37RDwAAAC3qcK2tbtgF
+LgrPeusK//iwDaA6JQAAAAAv+jivr274BMWHeosH//hQDaAalQD/+DANoAqlAGwQBBvodf5AaB3g
+DhUADwIAKrJ2f6cQLLJwDMwQ84zyDaAPBQAMLwz/RYAHkA0lACyycQzMEH/LYOz/DAV0eoAA+gAi
+HaALBQDs6GQZaASAAFuG0sYq0Q99p+UusnIODl8M7hB/49mdMP6ABhXgDiUA/EBoHeAKVQD90LIF
+oAsFAFuGxsAg0Q+SQP5gBhXgDgUA/kBoHe//bgCfQJ4w//88DaAOFQAAAGwQBBfpLAk1EeVFAgk3
+goAAp2aVYNEPAGwQBPJABhXlRgUA+AACHe/MBQDpJRQhWIEAAP1gBAWwigUA5aU6AWDBAADsJgwq
+QASAAPxBphWgNPkA42g5BdkBAACbKesmCCFQ4QAA6CUVKtgEgABbUnADZDnrVAAKUASAAFtjaApt
+FC0lAtEPAABsEAQa6QviooYpaASAACiigSmihfxPAAlws00A4rIBBACpgAAoooIJmDl4IwfzUMYV
+oAAaAMAgzyMionwson2jIumieiET/QAA4rIBBgHZgAAronsLmwwLyzYsonjIy60sfLMH/U+GFaAA
+GgDAIMgh0Q8AwKD90FwFoAtlAFuGe9EPAAAAAAAA+yBoHe//OgBsEAYY6JrTDyiCI/EEwA3gAgUA
+FOiXE+iVJEJJIzLfpCQJRBGkM4Q3hE4rGlD6gGgdoAwFAFuA0PphxhWgSwUA+ogAFaAMBQBbgMsY
+6IiaPw8CACiCI7EieCO3EuigwJD4IEYV4AMFAOsgfSnQBIAAW4FTixKxIuq7NwGYBQAA6xYCKaeU
+AAAc6HktwiAuwiGeECzCIu7dCAXwBQAAnhL9gABGcA0FAO0WAyYJ6YAA89EYBeCCBQD10NwF4A0F
+APwgJhXgAioAAAAvQFQuRFWu/u4WAC9QBIAA/uAIGqIAnQAd6GMe6GKPEvdPAAxwCgUAbYkuKNJJ
+p6sp4t+riOhCACxmQoAArJmYmCaUDSWUDK+oKJQ34rsCBVAFAAADiAorhoCIEqiomBIa6FAV6FGJ
+EyyiISuiIOqiIiTIBQAAmROsu6uq+yAE+qIAnQAlUkYa6EeEEyqi36VE7hIAKiZCgACqRCZADdfg
+5UAMI3rhgAAX6D+IESdySah36EIAK75CgACnpyV0DOZ0DStYBIAA6HYIKtAEgABbgQmIEepAVC1I
+BIAAKXQ36ERVJEAFAADoFgEoBAqAAPdf+2lSAJ0AhxAPAgAHrAjnRFUmW/0AAOsWAC3QBIAA+v/4
+K+IAnQD//PwNoAoFANEPAABsEATm6G0ZaASAAPfQ2AXgClUA/dDWBaALBQDmZgAjI9EAAOR2fynw
+BIAA5HaAKT6CgADmZgEroASAAFuF7fzeqBWvyQUACTMB8uEACfACBQDrYvIhgzmAACpi9C5i8O1i
+8yVQ/QAACaoB5KQABgBRgAANuwwLyzbjqggHAIGAAHqzCPrehhWgAB4AAMBAZEDCZEEf5TQAAYDh
+gACSTuJGDypQBIAAWkq+JVzA5V/sYiEBAADy7wAKf8kFAOpi/iICeYAAL2L5LGL9BKoM6aoBB4Cp
+gAArYvoMyzl7owf638YVoAAaAMCgyqhkoJ7jRAACAPGAANSgkk7iRg8qUASAAFpKpyM8wOU/7GIh
+AQAAwCDRDwArYvIqYvQsYvUuYvD7R+AVr80FAO2qAQYAaYAALWLzDbsMC8s2yO+krHyzC/zehhWv
+/poAAAAAAP/+aA2gCgUAJGL+L2L58o8ACn/IBQDoRAEHgPGAACli/Shi+gmYOXhDDfTfxhWv/F4A
+AAAAAAAA//wkDaAEBQD6AAIdoAtlAOznSBpoBIAAW4WUwKH90BAFoAtlAFuFkcck0Q8AAAAA/GBo
+HeAKBQD90AYFoAtlAFuFisCh/dAABaALZQBbhYfHJNEPbBASGOdO0w8ogX8iFhr8YGgdoIUFAPgg
+AAQwAwUA+K0ACb/69QDsFgQp2ASAAFtiRNKg+gACHe/69QBbYkEqFhj6SAIdoAsFAFtiPSoWF/v/
+4h2hCwUAW2I6KhYW+//iHaELBQBbYjYqFhX7/+IdoQsFAFtiMyoWE/oAAh3v+vUAW2Ivmh76AAId
+4EoFAFtiLJod+//iHaQLBQBbYikqFhL6IAId4koFAFtiJSoWEfqwAh3iSgUAW2IiKhYQ+nACHeJK
+BQBbYh6aH/oAAh3v+vUAW2Ibmhz6AAId7/r1AFtiGCoWC/oAAh3v+vUAW2IUmhr7/+IdpwsFAFti
+EZoZ+//iHacLBQBbYg4qFgj7/+IdpwsFAFtiCpoX+//iHaCLBQBbYgeaFvv/4h2hCwUAW2IEmhX6
+AAId7/r1AFtiANSg+//iHaOLBQBbYf3WoPoAAh3v+vUAW2H6HubMLRIYLOK2DcwoLeK1LxIXDSso
+mxOsuyzityUSFQ/MKC/iuay7Bf8oLOK4JRIWBcwoJRISr8wv4rusuyziugX/KCUSEwXMKCUSEa/M
+L+K/rLss4r4F/yglEhAFzCiFHq/ML+LNrLss4r0F/yiFHwXMKIUdr8wv4s6suyzixwX/KIUcBcwo
+hRqvzC/iyay7LOLIBf8ohRsFzCiFGK/ML+LQrLss4s8F/yiFGQXMKIUWr8wv4tKsuyzi0QX/KIUX
+Bcwor8ysu48VLOLUD8woL+LVlBGWEgT/KCXi2K/ML+LWBlUorLsK/ygu4cel/6+77tsMfWAEgAD0
+IGgV4AAaAMBQpbr8IAYVoIsFAFgCYNmg56QACAQKgAD7QEsIEgCdAOTnXxKCIYAAjkrxw1AN4AYF
+AOoWGy0oBIAA+qBoHa/79QD8YGgd7/z1AFv+JVpJs49K5SUIAzAFAAAPAgB/Y9kpEhsCZyinl4gU
+0w8PAgBkgGklEgQoigAPAgAIVQECVSwlFhkFJSj6oGgdoIsFAFgCP/tARbASAJ0AKRIZDwIA4xYU
+JIHBgADAUOY0AA0YBIAA+mBoHa/79QD8wGgd7/z1AFv+B1pJlSoSGeMjCAKoBQAADwIAelnYIxIU
+KxIaLAqA4xYUJbQJgADyAAId4AUFACZC46Vmk2AuQsuISn4zCa6I+GAGm6IAnQAuQsyJS34zCa6Z
++GAIi+IAnQAuQs2KTH4zCa6q+mAJe6IAnQAuQs6LTQ8CAH4zCg67CPpgCkviAJ0ALkLPjU5+Mwmu
+3fxgCzviAJ0ALkLQj08PAgB+Mwmu//5gDBPiAJ0ALkLRKEIQfjMJroj4YAz7ogCdAC5C0ilCFNMP
+fjMJrpn4YA4T4gCdAC5C1CpCE34zCa6q+mAPO6IAnQAuQtUrQhJ+Mwmuu/pgEGPiAJ0ALkLTLUIR
+/mARm6IAnQCu3fxgEUrgHlUA/sCGHaAA3gDqdAAJ2ASAAPwiiBXgDwUA/sCGHe/89QBb/bv2QABD
+//n1APlABhXgCAUAmGdaSUQsCoAqEhrsVQgBmAUAAPp/9rUiAJ0AYAVDAAAAAAAAAPrgaB2v/PUA
+/AACHeALJQDrZAQp2ASAAFv9py0SGPrA5hWgjAUA96AAQ//+5gAAAOp0AAnYBIAA/gBiHaJMBQD+
+wIYdoA0FAFv9my8SF/rA5hWgjAUA9+AAQ//+JgAAAOp0AAnYBIAA/f/iHaAIRQD4wIYdoQ0FAFv9
+jykSFvrA5hWgjAUA9yAAQ//9ZgAAAPpgaB3v/PUA+gCiHaENBQDqZAQr0ASAAFv9gysSFfrA5hWg
+jAUA92AAQ//8pgAAAOp0AAnYBIAA/AAiHaENBQD8wIYdr/z1AFv9dy0SE/rA5hWgjAUA96AAQ//7
+5gAAAOp0AAnYBIAA/f/iHaAeNQD+wIYdpA0FAFv9aygSEppnj673AABD8IwFAPfgBhWv+xYAAAAA
+AAAA+mBoHeJMBQD6AyIdoQ0FAPrAhh2vmWUA6WQFK9AEgABb/VsrEhH6wOYVoIwFAPdgAEP/+iYA
+AAD64GgdoB11APzAhh3vnAUA7GQFKdgEgAD8SAIdpY0FAFv9TS4SEPrA5hWgjAUA98AAQ//5RgAA
+AOp0AAnYBIAA/EgCHa+PVQD+wKYd4BhlAPjAhh2jjQUAW/0/iR/6wOYVoIwFAPcgAEP/+GoALkLZ
+KkIi0w9+MwmuqvpgCROiAJ0ALkLaK0IjfjMJrrv6YAn74gCdAC5C1i1CHNMPfjMJrt38YArT4gCd
+AC5C1y9CHX4zCa7//mALu+IAnQAuQtgoQh7TD34zCa6I+GAMk6IAnQAuQtspQiR+MwmumfhgDXvi
+AJ0ALkLcKkIl0w9+MwmuqvpgDlOiAJ0ALkLdK0ImfjMJrrv6YA874gCdAC5C3i1CJ9MPfjMJrt38
+YBAT4gCdAC5C3y9CKX4zCa7//mAQ++IAnQAuQuAoQip+MwmuiPhgEeOiAJ0ALkLhKUItfjMJrpn4
+YBLL4gCdAC5C4ipCK/5/6POiAJ0Arqr6f+iiogCdAPrgaB2v/PUA/AACHeAbtQDrZAQp2ASAAFv8
+840Q+sDmFaCMBQD3oABD//OeAOp0AAnYBIAA/f/iHaAOhQD+wIYdoA0FAFv8548e+sDmFaCMBQD3
+4ABD//LqAAAAAOp0AAnYBIAA/AgCHaAIlQD4wIYdoA0FAFv824kd+sDmFaCMBQD3IABD//IqAAAA
+APpgaB3v/PUA/AACHeAKpQDqZAQr0ASAAFv8z4sc+sDmFaCMBQD3YABD//FqAAAAAOp0AAnYBIAA
+/AACHeAMtQD8wIYdr/z1AFv8w40b+sDmFaCMBQD3oABD//CqAAAAAOp0AAnYBIAA/f/iHaAOxQD+
+wIYdoA0FAFv8t48a+sDmFaCMBQD34ABD/+/qAAAAAOp0AAnYBIAA/f/iHaAI1QD4wIYdpw0FAFv8
+q4kZ+sDmFaCMBQD3IABD/+8qAAAAAPpgaB3v/PUA+gHCHacNBQDqZAQr0ASAAFv8n4sY+sDmFaCM
+BQD3YABD/+5qAAAAAOp0AAnYBIAA/AHiHacNBQD8wIYdr/z1AFv8k40X+sDmFaCMBQD3oABD/+2q
+AAAAAOp0AAnYBIAA/f/iHaAeBQD+wIYdoI0FAFv8h48W+sDmFaCMBQD34ABD/+zqAAAAAOp0AAnY
+BIAA/f/iHaAYFQD4wIYdoQ0FAFv8e4kV+sDmFaCMBQD3IABD/+wqAAAAAPpgaB3v/PUA/AACHeAa
+JQDqZAQr0ASAAFv8b4sR+sDmFaCMBQD3YABD/+tqAAAAAOp0AAnYBIAA/ANCHaONBQD8wIYdr/z1
+AFv8Y40S+sDmFaCMBQD3oABD/+qqAC5CJPZSAh3icwUA8clgDeAFBQAW5TYmYkYiQuOmVglmEaYi
+hieGbsDA6yESI1GBAABbfXCLK+NqCA1ABIAA+EFGFaAMBQBbfWuLLudqCA1IBIAA+EGmFeAMBQBb
+fWX6QigV4AwFAOptBS1oBIAA7SYQJVKBAABbfV/6SpAV4AwFAOptBy1oBIAA7SYTJVLBAABbfVgq
+JhQrQiQlXAH6v/uT4gCdACxCJfGJkA3gBQUAFuUOJmJHIkLjplYJZhGmIoYnhm7AwOshEiNRgQAA
+W31JiyvjaggNQASAAPhBRhWgDAUAW31Diy7naggNSASAAPhBphXgDAUAW30++kIoFeAMBQDqbQUt
+aASAAO0mECVSgQAAW303+kqQFeAMBQDqbQctaASAAO0mEyVSwQAAW30xKiYUK0IlJVwBDwIA+r/7
+e+IAnQAsQibxiVAN4AUFABbk5iZiSCJC46ZWCWYRpiKGJ4ZuwMDrIRIjUYEAAFt9IYsr42oIDUAE
+gAD4QUYVoAwFAFt9G4su52oIDUgEgAD4QaYV4AwFAFt9FvpCKBXgDAUA6m0FLWgEgADtJhAlUoEA
+AFt9D/pKkBXgDAUA6m0HLWgEgADtJhMlUsEAAFt9CSomFCtCJrFV+r/7m+IAnQDAINEPjRQc5RUp
+QvQvQvMoQvXjFhQq8ASAAPnvAA/wCkUA+e8AD7ALZQBbgpLyIogV792OAMCh/coSBaALZQBbgo3H
+JNEPbBAEGuT84qJ8KWgEgAAoonsron3yQABBcMNNAOmieiET/QAA4sIBBYKhgAAImAwIuzYponjt
+LggEgHmAAH6zB/9PhhWgABoAwCDOJiKihiuigSmihQ0iDOLCAQWAsYAAKKKCCZg5eCMI81DGFaAA
+HgAAwCDILNEPAAAAAPsgaB3v/soAwKD9ycAFoAtlAFuCaNEPAGwQCBzk4Rfk4ZIUkxUpcJgocJkt
+cJQucJUvcJYkcJet5q9mlBCZEZgSpGapZvjAAEMwClUA9iBmFaALZQBbgldkYd0c5NP4IIgVoApV
+APJgAEewC2UA7xYGKWgEgADo/wwJ8ASAAFuCTeocECDYUQAA/AgCHaBNBQBbXtUqcJSEFOR2GC0A
+ngAA8ACwDaAMBQAAAAAAAAAA+iCoFeBFBQBbg5H8wGgd4AwFAFuCyfVgQAZw1U0ADcwBKnCVLHYZ
+pMTkdhotAJ4AAPAAsA2gCQUAAAAAAAAAAPogqBXgRQUAW4OB/MBoHeAMBQBbgrn1YEAE8KVNAAqZ
+ASpwlil2G6SU5HYcLQCeAADwALANoAkFAAAAAAAAAAD6IKgV4EUFAFuDcfzAaB3gDAUAW4Kp9WBA
+BPClTQAKmQEqcJcpdh2klOR2Hi0AngAA8ACwDaAJBQAAAAAAAAAA+iCoFeBFBQBbg2H8wGgd4AwF
+AFuCmfVgQATwpU0ACpkBKnCYKXYfpJTkdiAtAJ4AAPAAsA2gCQUAAAAAAAAAAPogqBXgRQUAW4NR
+/MBoHeAMBQBbgon1YEAE8KVNAAqZASpwmSl2IaSU5HYiLQCeAACGFvAAsA2gCgUAAAAAAAD6IKgV
+4EUFAFuDQfzAaB3gDAUAW4J5hhb1YEAFcLVNAAuqARzkZup2IyloBIAA5K8ICfAEgAD+IIYV4Atl
+AP7PAA/wClUAW4HfghTRDwAAAGwQDhfj1hbjeOMWBSlIBIAAmRbtYgAjKBMAAONSjiNYFwAAIrJI
+KrJHLLJG6LJNKRZCgADiMggNVkKAAOo6CA5mQoAArDz8IiYVr8QFAOoWEixGQoAA6DMIDoCWAAAu
+YjPO5/ggqBXgAj4AAMCgW16qp6kvkoBn8AttCAUokoBngAJj//MpYjPTD8mawKFbXqKnqSqSgGeg
+C20IBSuSgGewAmP/8yliM49gHOPPG+PPK1ak+rTGFeAKJQAqVqssVqyp/y9WpfvgAERwDQUA+LTm
+Fa/EBQDoVqon+P0AAPXgBAewDhUAW15UiRUb48f8wAgV78QFACmcPwSZAelWnyahUYAALrJeL7Jg
+Ce4MD+4Mse0O7Tse5BYNHRIO3TRm1GkvCmQP3yz/4AEH8ApVAOzkER/3AoAA7hYIL/+CgAD+IOYV
+4AsFAFuBi1tedShivyliuypiuitiuSxiuC5iti9itS1ity9Wd6/uL2K8LlZ4rt0tVnmtzC5ivixW
+eqy7LWK9K1Z7q6osYscqVnyqmStiyClWfamIKmLJKFZ+qP8pYs0vVn+v7ihizi5WgK7dL2LPLVaB
+rcwuYtAsVoKsuy1i0StWg6uqLGLSKlaEqpkrYtQpVoWpiCpi1ShWhqj/L1aHKWLYr+7+sQYVoAgF
+AChWdq7dLVaJDcwILFaKDLsIK1aLC6oIKlaMCpkIKVaNW3w9KhYQW3w7KVKgJFKhLVKe+S/gFe+O
+BQDumQECAGmAAC9Snw/dDA1NNihSnMmACagRqJh40wn4tAYVoAAiAAAAwJDpFg8klwmAAIwfZMM/
+HuNqLFaOL+JNKuJG6OJHJyPzAAAtQo/u4kgtVkKAAOrJCAxGQoAA6MgID/5CgACvz58amBnoEhEv
+dkKAAO7OCA7uQoAA/iFmFaStHQBtqQUIAIYJAmH6IigVpr0dAFteEC1CkNMP6RIJLu5CgAD4IkgV
+pK0dAG2pBQgAhgkCYfoiSBWmvR0AW14GLUKR6RILLu5CgAD4QGgdpK0dAG2pBQgAhgkCYfpAaB2m
+vR0AW138LUKW0w/pEgou7kKAAPhgaB2krR0AbakFCACGCQJh+mBoHaa9HQBbXfIjUp4qUqGaHPpv
+AAmwBAUABOQWAQIA2zBbgqUE5BYqCgFbXeUjFgAU44YvEgz9xwgFoAuFAPNAaB2gDRUA9eAAR7AK
+VQDvFg0pcASAAFuA+8Cg2aCnJ4sdK3aBI3aCKnaDCeQWmR4BAgAocoME6jD6QGgdoQslAFtdywjq
+MCxyiOwWBCYAqYAABOow+kBoHaELJQBbXcQI6jCCFI0eDeQWBIoMW1242KD+QGgdoApVAP3GygWg
+C4UA73KIKadCgAAIRCz0IAYVoA0VAFuA2ylitSpSnvqz6BXgDAUALFahLFafC6oM6laeJIqpgAAu
+UeXA037QEMJw8ABMDaAEJQAAAAAAAAAA9gACHeAEZQAjEgcqEhAf400rEggvZqPvZqQn+DEAAC9m
+pi9mp1v7PSpitaR766ooCdgEgABb+sPmoKZtEASAAFv6RSxSpWTARipSqyxSrCRSpB7jPStSqh3j
+PS9Spw67CA27AStWpitWqQv/DPVvAAowDhUA9YAARj/EBQDsVqwn+P0AAPXgBAewDQUAW11aj2Bk
+8JTAgClSnMyW8ADsDaAIBQAqUqIjUqAsUqMrUp2oM/Jn4BXvxAUABDMB+m8AD/ANBQDjVp4n+P0A
+APXgBAewDhUAW11IAzgCiRbTDyiWAFt8VFuCHNEPKmIzZavT/++0DaANBQApUqorUqUJrBEMmQzu
+mQEFgMGAAC5SqS1Spg7tOX2TB/i1RhXgABoAwJD4IeYV7/PWAChiM2WPZPnEnAWv/Y4A+iIIFaAL
+BQBb+vb/++QNoAIFAMCl/cYABaALZQBbgHf9xIgF7+4WAP1IABawC2UA/cXSBaAKBQBbgHAc4vj4
+IegV4AoVAPixxhXgC2UAW4BrxyTRDwAAAGwQBltdeBbi8CZhfwamN1tdYxzi7hvhmRfi7h3i7hji
+KhTiuApvNyiBfv3oABewDhUA/oNmFeAFBQDlgB9ms9EAABriIdMPDwIAL6F/6KGAL4BmAADpoX0k
+DLmAAFtdS/vDUAXkDAUA+4AJM6A+9QD5gGgd4AoVAAmdD/+gAga/zgUADt0BLUYZHOHbKUIZ+54m
+FaAPJQDs4XkcinoAABnizSiQfCqQfSzAgAhYNwqINyqQfimQfwwNQPsAQAQw7BEA+QBABHAKFQD5
+ACAVoJwJAP1NAAxwzBkA+e0ADHANNQD/rQAMMAlFAAyYOSqM/QqYOBriti5Awy+gfCmgfiygfQ9f
+NyWgfwz/Nwn/NwX/N+VAwif4BQAAD+43L0Jn+KBAArfuAQD+mGYdp1UBAOVEwieEKYAAjE6KT6bv
+DDgsCi0sL/CAqNsGWgj7UBAVoBKFAALZLAKOLAuqCAr/CALyLA/uCO6ZCAvgBIAA+EAAQXALZQD8
+UAARMApVAOIWACxwBIAAW4AH8oQmFaACBQDRDxziLOrDD35IBIAA//tcDaAKJQAAAADqsyl9yASA
+AP/7EA2gCjUAKEKajE7qQg8se9YAAAy8Ngq6NpxO+oHmFa/9qgAc4bn7gAizogCdANnA//pIDaAK
+RQDSkNEPAADvoYEk6B6AAGTxESjQfCnQfSrQfghYNwmINynQfy2wgAqIN/kAQARwAiUA+QAgFaCd
+AQD5zQAMcP0RAPmPkBXgPQkA8k0ADHAONQD/zQAMcApFAPKYUBXg3RkADag5LcB96Vk3BFv1AAAL
+qDglQMMqwH8IMzf7j9AV5zMBAKYyDZk3C5k3Cpk34iCAJMgFAAAJVTfymEYd51UBAOZfCAltQoAA
+//AQFevdHQD0mGYd4BWFAAXYLOrhYR/1QoAA+oHmFavuHQAF6Syt46Miov8F9SwPmQjpiAgL4ASA
+APigAEKwC2UA6kYOKq6CgAD0IAYV4ApVAFt/r/SEJhXgAgUA0Q8c4jl6wwnZwP/16A2gClUAGeFI
+//W8DaAKBQDSUNEPAAAAbBAMFOFvG+IwE+IuFeE+jLeCtY+2h7QosALqsQAgyEEAACqVAOiUAiDo
+gQAAl9Cf0vOgJhWgDjUA7NYDIpPnAAAsUsrnQqQl2IEAAOiwAiDQwQAAKKQC67EAIMhBAAD7QAQd
+4A0VAPLgBAfwCwUA/6IADfF3cQCpefkgEBXgCIUA6ySNINCBAAD4UYYd4At1AG2KDy2hBy0lR+zb
+CHVT+QAAsLvHvxzhQy9CpBjiCCzBfy0hRypSzCYgjSomJOj/AQ3FQoAA6P8CCwEKgADvRqQu6AqA
+AC0mJy1Syi1Wyy0mJS0mJv3ADTiiAJ0ALyIvLVKeDwIADD857yYvJpF5gAD1oBKAkgCdAPWgE4kS
+AJ0A9aAUkZIAnQD1oBWaEgCdAPWgFrqSAJ0A9aAXwxIAnQD1oBjLkgCdAPhhYBWgCkUA+wAEANAD
+FQD8YAEB0AtlAOzh3xnwBIAAW39N+kXoFaA49QDu4N4Q+MEAAP7gAEfxkx0A6pM5CwIKgAD51KgV
+4TOdAOripCGF8YAAKiIk0w8DqixbfjsW4c8oYl4OiBH7AAQA0AX1AOCrGgqoCoAALEKE+kSoFa/4
+9QAIVQMMXAEMuwIrRoQDqixbfi4tYl4O3REA0QQAqxosQr3p4MAQ0MEAAKp6KqAADFwBLZKkDLsC
+K0a9LJKlKZKnDd0J/YAAhjA79QDqmSgO7oKAAPxuAA7/ygUA65kLBuj9AADq3QEOZoKAAPxFJhXj
+zB0A6pkBBmD9AAAKzAEsJiv4RaYV4AIFANEPL/AALuKnCZkJ6qoJDM6CgAD9UAAVM5kdAPkn4BXj
+qh0A/8MAD3/PBQDvmQEFUP0AAA+qASomKSkmKwjuCw/uAf5FphWgAgUA0Q8oSgAI2DcoJiUIqjdb
+XBgqJiQpUmkqJiXqVpotMASAAOpWnCSOGYAAK1HRCZwJD8wR+8BmBaLMHQCsu6trC6o2KiYkKiYl
+W1wKLiIlHOF//ESIFeALZQDm6AwNeASAAPggBhWgCkUAW37mKiIkW1wA6iIlLUgEgAApJiRbW/0q
+JiUc4KgGrQwrIiQtVp0swX8Gugz6s2YVr/caAAAmQoMqCnj2YAADMAtlAPbBQBWgHPUAW3qH7VKe
+LRgEgAD+RegV7/eiACZCgyoKmPZkAAMwC6UA9sFAFaAc9QBben3tUp4tGASAAP5F6BXv9v4AJkKD
+Kgq49mgAAzAL5QD2wUAVoBz1AFt6cu1Sni0YBIAA/kXoFe/2WgAmQoMqCtj2bAADMBslAPbBQBWg
+HPUAW3po7VKeLRgEgAD+RegV7/W2ACZCgyoK+A8CAPZwAAMwG2UA9sFAFaAc9QBbel3tUp4tGASA
+AP5F6BXv9QYAJkKDKhoM9nQAAzAbtQD2wUAVoBz1AFt6U+1Sni0YBIAA/kXoFe/0YgAmQoMqGiT2
+eAADMAsFAPbBQBWgHPUAW3pJ7VKeLRgEgAD+RegV7/O+ACZCgyoaOPZ8AAMwC1UA9sFAFaAc9QBb
+ej7tUp4tGASAAP5F6BXv8xoAKlK1BqoJKiYk+kSmFa/5SgBsEAYZ4Azi4RMZOASAACiSE+YidCQA
++YAAIgoA3WD+wQgVoApVAP3CGAWgOwUAW3520Q8AJiKKKyKF+FDIFe9oxQD4wABDP/oFAOpmAQWA
+uYAAKyKJC7k5eWMJ9lFGFaAAIgAAAMBgZGBj5hYBIwUxgADaYPwSgh2gCwUAW3gyjREa4E/8ToYV
+4UsFAFtrIOoSAS1wBIAA23DsNAAKaASAAO6mCCrwBIAAW/I++UBoHeALFQDquTkNEASAAOkWACUD
+YYAAwPAJvzhl/0/RDyYigCsigSgif+kifiMwPQAA6mYBBYUJgAAImAwIuzYpInwqbQHkkBVlUlEA
+AHqzDfpQBhWv/aIAAAAAAAAA//1oDaAGBQD9v9wFoAoFAPwSgh3gC2UAW344xyTRDwCKEet0AAng
+BIAA7UQACvAEgABb8QMd37z+IAgV4AsFAPNAaB2gDhUA7NITKUgEgADzzQAMsAoVAA+rOALsOOzW
+EyX68YAAwIAJqDhljqFj/04AAAAAAAAA+yBoHe/9lgBsEAwZ4LMrIAwY36cqktwpktTogg0ltLEA
+ABvftOuwfSzOQoAAqakjnQHjPIAl/ByAAGAAAiOdA/EBgA3gAgUA0Q+pswkzEfNAAEH//7YAAAAA
+AAAb4J/TD+uyCCnQBIAAW0nlHeCb69IHLWAEgADs1uEp0ASAAFtJ4B/glevyBi1wBIAA7vbgKdAE
+gABbSdoY4JAZ4I8rgvgqht8ogvP7egAl7/wFAAy7Aeq0AAQA4YAALJL3KZL0DMk5ebMLHOCE+58G
+FeAAHgAAwKDipAAFC5GAAO3fmxENwYAAGOB/HuAhFuB8/iGGFaAEBQD+AAgdr/X1APLKBhWgCcUA
+bZoCCAJhEuB2JSR+9E+GHaAINQDoJH8p0ASAAFthv+olRyIgBQAA4iwwKid4AAAX4G0a4G0Y4EEl
+YIAb4Gz5wNgF4I4FAJ4amR4rsc3rFg0qpwKAAOhECATLQQAA6RYJKs+CgAD7IABEsAIlAPghZhXg
+AhYAAChCno4b9wAn4VIAnQAtQp0u4r8O3QFk1K2PHO8ABQ7IBIAACQJhCQJhHOBWGt73GOBVHuBS
+iR2e0B7gT48wl9Qp1Qv5oYQdoBsFAJvTKtUKnNLsEg4v/gKAAPPmAA+wClUA/6AmFeA7JQDu4c0q
+6ASAAFt9pfKTphWgCQUAZGBE+L/74lAGBQAa3yuKqJkf90Aj0JIAnQArQp6OG/dgJFlSAJ0ALUKd
+LuK/GN8iDt0B5NR5ZXv9AACfiGXfW2AEBgAAAAAA4pQABINhgADRDxngIyqS7iuS78fA6ZLsJVA9
+AADsqgEFjbmAABzgHCzC7QycDAy7Nh3gGS3S6sjfLK0wfLMKHuAW/d3GFaAAGgDAoPNAaB2v+TIA
+AAAAAPoAAh2gC2UA7eAZHuAEgABbfXZj/jUAABjgCoiIwSAIIjbqNAAJWASAAFtJTxne+uqWCy0A
+RgAAxyTRDxTgDSpCditCcQItEf1PAA1//AUA7KoBBYDBgAAsQnUrQnIMyzl7owf6jsYVoAAaAMCg
+5aQABQjRgABkoVEd3uf7/oIdoAIFAAWiOOXWDCEAOYAA0Q8AFt/6lhgW3/oX3/bi3/YTKCEAACpC
+XiYmf9MPKKECJiaAJSaB5SaCJAZxgABaQW0d328t0josQlqq3QndEa3MLsAH/vAQFeD4xQAI7gH9
+v9IF5+4BAA/uAi7EB50UicCKx/oiABXgDRUA7CaDLM4CgADtmQIFUIEAAPggphXgDBUAWkoXjhix
+d+IsMCMwwQAA7wIAAqjBAAD+3/u9IgCdAAM6AlthHOukAAnQBIAAW0kJH9/F6vYaKdAEgABbYRb9
+QGgd4DslAP2/lgWgClUAW30iGd+9KZIa+f6CHaACBQAJgjhkIHHRDwAAAAAAAPsgaB3v+VYAxyTR
+DypCbCtCbSlCavtB4BWv/AUA7KoBBYH5gAAsQmsMnAwMuzYuQmjI7KrefrMI/o2GFaAAHgAAwKDl
+pAANdZYAAMCg/b1wBaALZQBbfQVj/p0AAAAAAPsgaB3v/yoAAAAV3vMiUtvlUtwp0ASAAFtI2Bjf
+l+qGWinQBIAAW0jQHN+TwJApxl4twloqxlstxlwNqwzzrwAOtrsdAPuDBhXm3R0A7cZdKdAEgABb
+SMwe34jq5hctAG4AAMck0Q8AAAAAABzfkO3iWil4BIAA/8toFaAKVQD0IAYV4GgFAPggJhWgOyUA
+W3zfH995HN+GLfJd/+uIFaAKVQD/4wgV4DslAFt82MAg+72KBaFLBQBbaZYY328qhpP7vYAFoUsV
+AFtpkilBfywaAOysAgT4KIAAHd70DcwC+71yBaFLFQBbaY76B+IdrA8FAPwAwh3gDAUAGN9fHt5O
+LIYhLIYgLIYiLIYnLIYmLIYsLIYuLIYzLIYyLIY0LIY4LIY6LIZFLIZELIZKLIZML4Y/L4ZBL4ZH
+KoY++wgGFa/79QArhiMrhikthjX9CWYV4Ak1APkFRhXgGQUA+QhGFeAdtQD9BsYV4AsVACuGMPm7
+3AXgGqUAKoYk+8GmFeAaFQAqhjwf3y75BQYV4A4FAP8JBhWj+fUA+QjGFeAb5QArhh4e30Mvhi3/
+BeYVoA/1AC+GTR7eKhvfQCuGOy7iwhzfPSyGOdEPjBoPAgAPAgD9n+AVoA0VAOwWCiYwBQAABtY5
++Z/cuFIAnQD6AKIdoDslAOwSCSroBIAAW3yD/+3wDaAZBQD/7DQNoA0FAMCgW3kcGt4IiqiJH/lf
+29CSAJ0A/+5UDaANBQAAAMDQHN4CwLoLqzT7gQYV7+4GAGwQBBTd/ShCFvEAsA3gAgUA0Q8AAAAA
+APu8tgWhSxUAW2ksGd8L0w/TD/kv5BXgEwUA+70cBeEMBQD9RgAOMAIFAOrezxTsKIAAC8wCIqZ2
++7yaBaFLFQBbaSIY3wnTD/MchhXgDQUALYbDLYbCLYbELYbJLYbILYbOLYbQLYbVLYbULYbWLYba
+LYbcLYbnLYbmLYbs/R3GFewPBQAvhuEvhuP/HSYV4Dn1ACmG4PkcRhXv+vUAKobF+xlmFaAOZQAu
+htcuhu3zHUYVoBulAPsYxhXgHOUA/RgGFaAbFQArht4c3ubzvYwFoB61AC6G2BrdfyKGz/0bphWg
+CTUAKYbM/b3ABaAJ9QD5HeYV4AIVACKG0h/e2CqGyv8aJhXj+vUAKobo/b2oBeAr5QD9G2YV4ApF
+AFt8JfKCxhWgAgUA0Q8AAGwQBPO9oAXh+sUAFN4SCgs/KULfCVkUKTYcKELhCGgUKDYdJELjBFQU
+JDYeEt2sIiLeAgJA8nIGHaACBQDRDwBsEAT1vYIFoAIFACJGRSJGRCJGQyJGQiNCSyNFfCNFfSNF
+fvKP5B3jMx0AI0WAI0WBI0WCI0WD0Q8AAABsEAQX3rMc3rUU3rIV3rP9uo4F4AIFAPaAaB2gGwUA
+41wIKsgEgADoRAAJ0ASAAA8CAA8CAG26JeyGgyRYCwAA6YZ/JEChAADphnYkyKEAACqGd+qGeCVQ
+oQAALbUMG96gHN6g+MCAJeAIBQDolh8hUEkAAFtH3xrdGyqggAAgBAoKG3+vURzelR3dKPJAIBWg
+GwUA4z0DIqgPAADkTQMjMA8AAOd9AyMygQAA53ygIiKBAADlXKAhmoEAAOo0AArIBIAA7wIACkAE
+gAD4X/r6UgCdAMAg0Q8b3fIa3oMrsksqooGrKwm7EauqG96AW3g0Y/+RbBAEFN5+KkJz87qwBaAJ
+BQD6fAAFNAgFAG2KCgybEOsm+yTIBQAAZKBRaaFOI0J0KkJeW1jVW3q1/AQCHaALhQDnNzx9KASA
+AB3ebRrebv+6EgXg4zkA0w/u2jkB5ByAAA+qAno3BRjdDgiqAns3Exnd0vlGAA1wADYAAMAg0Q8A
+Gt5h/mGABxAJRQAd3XDTDw2qAu7eXhH0YIAA7qoCAfhAgAAvQH0PAgB//wIMqgJ/NwIJqgILqAIo
+JvzAawVmDARjECMm/RneUgk5Aikm/iMm/ygtBIiAGt1+G95P/byaBa859QAJiAHriAIBSBMAAPkg
+BhWgO4UAW2hN6t11G0MCgADkbxELZwKAAOxsAgt2AoAA7+4CC2oCgADtPQILfAKAAAj/Ag/dAg7d
+Av2GAA5wO5UAW2g+KEJa9qAAEzAzBQDTD/ECkA3gBQUAGNz20w8PAgAIZgLcYOrdXRnYBIAAW2gz
+KUJasVXpU+pxmAUAAMAw+mBoHaALBQD8AAIdoA0FAFtHb7EzaT7nIwoA2jBbR2KxM2k79SoiwRve
+IAuqAvpYJhWgAgUA0Q9sEATAINEPAGwQCBbeGhXchihiIx3eGvO5VgWgBAUA6t4WFBaJgACaEe0W
+AybxQQAA/iAGFaALFQD6IIYV4AwFAOwWBibqwQAA7RYFJVFBAACaEhfdaydySiNi3adHCXcRBzMI
+JzIHJ3IOK2Ih+uBoHaAMBQBbdaT6Y4YVoAwFAOtiISPQgQAAW3Wf+mOmFaAJBQApdjIpdjMnYtnB
+4S40BKdHlzAnUIDAsfwCAh3gD1UA9sAABHXs5QD9AoAmVOcBAPhkhh3gGPUA+GQmHaAAKgArNCQu
+NCEY3eokNCIuUFApNRwrNC0pNCApNR0pNR4pNR8pNEMpNCopNCspNGQpNh4pNDQvNCkpNCwpNDUp
+NEEpNTP8bUYd5O4BAAjoCoiALDUZKzRr7jQjLAAigAAAAAAAAC01H4gV+GPGFaDPBQD+Y8Qd4APq
+AG9DCykiuBrcqQqZAikmuPqAaB2gCwUAW1XFYAE6AACOFf5jxhWgDIUA/GPkHaDLBQD6Y8Qd4AMG
+AC5QiPggSBXgCIUA/cNAAdDPBQD6AEIdoBuFAOzduRpoBIAAW3rxYAD1KTYeKDUf/mPEHeACKgAu
+UIiLEf3DQALQCoUA+gBCHaAbhQDs3a4aaASAAFt65WAAxCs2Hvpj5B2gAXIAAACMFMjNW1W+6hYG
+LQhqAADA0J0ULlCI/cNABFAPJQD6AEIdoBuFAOzdnxpoBIAAW3rVYACDLzUfjhD+Y8YVoABmAIoT
++mPGFaAJhQD4Y+Qd4MgFACg1HtowW1WHKjUc6jUdKdAEgABbVX7qFgYtBVoAACwxH9pA+mRwFeXM
+AQBbVPvqFgYtBJoAAPpgaB2gCxUAW1R76hYGLQQCAADaMFtTcikxHHufL3yfPH6XbvqAaB2gCyUA
+W1V2LWIjIi0g5VwBIiAFAAD8n+0D4gCdAGAAPQAAAAAAAPqAaB2gGwUAW1VrY//SAAD6gGgdoAuF
+AFtVZ2P/wvoAQh2gG4UA7N1qGmgEgABbep9j/6zA4J4WH9w5L/B9e/8HghbRD8Yq0Q9bUy6CFtEP
+bBAUHty6FN1gHN1eK+IhKuIgKeIiLcF+iEsvwXyfEigWEp0RLMGAjUOdFJwQLuLILhYWq6qMRSwW
+FQqZCCtCB/oihhXgBwUA+oEoFaACBQDqFhMknZGAAPggphXvxgUA/7qWBaANBQD8IGYV7/L1AP4i
+5hWgCwUAGNyeFdycKIJGJVLfqHjvQvwsRkKAAKhVg1eKFPgiyBXgDQUA4zIOJ4GBgAAd3BAsUTKc
+M5kyqckuQvvpFhYlSP0AAAaZAX7TGP5ghhWgAGoAAAAAAAAAAPymRB3v/0IAAAAuUhueNJk1L0BA
+7xYbJ4MpgACLRCpQcJoemx9be6z8I2gV4AwFAFt64wKqAfwAIh3gDAUADNw5Cto5DKoC5r4BBQEp
+gAAsEhctEg/+IcgVoAolAP4jaBXgCwUAW3pJ8AAwDa/rpQD+YMYVoAsFAGaytok1KhIViDbpiAgF
+UP0AAAaqAZo370BBJED9AAAGiAGYFO8WGieDKYAAi0YqUHGaHJsdW3uK/CNIFeAMBQBbesECrAH+
+ACIdoA0FAA3tOQzsOQ3MAua/AQYBKYAALBIXLRIN/iGIFaAKJQD+I0gV4AsFAFt6J/AAMA2v66UA
+/mEGFeALBQBmsi6KNykSFIw4DwIA6swIBMj9AAAGmQEpNgnoQEImYP0AAAbMASwWFegWGSQDQYAA
+K0IIKlByKhYKKxYLW3tm/CMoFeAMBQBbep0CqgH8ACId4AwFAAzcOQraOQyqAua9AQUBKYAALBIX
+LRIL/iFIFaAKJQD+IygV4AsFAFt6A/AAMA2v66UA/GFGFeALBQBmsZ6JOS4SE4g6DwIA6YgIB3D9
+AAAG7gEuNgvvQEMkQP0AAAaIASgWFO8WGCeDSYAAK0IKKlBzKhYIKxYJW3tC/CMIFeAMBQBbenkC
+rwH4ACId4AgFAAiYOQ+fOQj/Aua5AQeBKYAALBIXLRIJ/iEIFaAKJQD+IwgV4AsFAFt53/AAMA2v
+66UA+GGGFeALBQBmsQ4uMguNPCoSEo8Srt3uEgElUP0AAAaqASo2DSxAQ+oWHCbo/QAABt0B7RYT
+JgQ5gAAsQEQrQgwqUHQqFgYrFgcsFhBbexz8IggV4AwFAFt6UwKtAf4AIh3gDgUADv45Df05Dt0C
+6hIcJoF5gAAsEhctEgf+IMgVoAolAP4iCBXgCwUAW3m5ij3+YcgV7+ulAP4iJhXgAEoABrgBKBYR
++GHGFaALBQCNEI4RjxL8IGgVoAA2AI0QjBOJPikWEZw/KFE7KDYQLzUkKVEzLjUmKTUlrIycE6+f
+nxIoUTQtNSgoNScpUTWujp4RKTUpKBIRrZ2dEKio6RIFJED9AAAGiAHoFhIjuAUAAPj/49ViAJ0A
+0rDRD9EPbBAEGtu40w8loiAZ3F/woyAN4AQFABfcXfe1dAWgCAUAbQgcImCAAEAEAgIbfycLCUUL
+J1ZAKFZBJaIgsUR1SwJj/9wooiHTD/ELgA3gBwUAGNxP/bdKBaGLBQD5H+AloC4FAPUAaB2gLwUA
+LcJHJqLfrX0J3RGtZvTByBXgLQUAbdoMLUJ/9aAEmuIAnQC4RMLQ5WILLCAEgADTD23qBy5Cf3Xr
+YbhEwuDlYRIsIASAAG36ByJCf3UrWLhEwkCDb4JsJWET5jMRDvlCgADj/wIPHsKAAANDAu8zAgP4
+IQAACf8LI/ZAACIRAlUCJfZBI6Ih1ID24CAV4C4FAPL/+1vgLwUA0Q8AnmurTv/QEBWv/moAq0T0
+kBAVr/6WAJ1uq039sBAV7/22AAAAbBAGGtwZKqI58UGMDeAEBQBgAHUa3BUqojnjswgCIAUAAHpL
+ZBPbZRLcECMyRiIi+KNDCTMRoyIlIQcjIRMqIAz6QbAV41VhAFt0MBvcCCkhByghEguZAfMmAAzw
+CwUA6SUHJH2BgAAIXBEMqgJtCBUf2/+jvi0hEg/uCurmwCXYBQAAfbuMY//jwMT9QQAOMAgFAOgW
+ACYGCYAAGtvzHdtinRIZ20aIEI4SKZJGL6L4LuB9qYgJiBH54ABHsAsFAO8WAScD4YAAihHqoAwl
+uAUAANtwW3dxJqEH46ETLSAEgAArQA37QZAVo2ZhAFt0BylBB+rb3h0oBIAAKEESCpkB8yYADPAC
+BQDpRQckAMmAANtg4yoICuAEgABb7bkrQRKxInsj6owSLMB9oyPsc5d72ASAABrbzCyiOcDUDcw2
+jhCPErHu7hYAJ/gFAACfEv3f+nuiAJ0AH9qV/bV4Baf49QBzgyYa28Ib28Lz7wAM8A5VAPpgAQUw
+DXUAbZkNKMGAboQCe6FqLabAtKoqwX/Ak3qQVR3bdRvbs+3SXibgEwAAgrYswkaEtyuy+A3MCOJE
+CA5mQoAADLsII7EHD0Q2KrAM+2GwFeMzYQBbc88Y26jiTQwJzgKAAAmpAggoCm3aB+mGwCRAEQAA
+0Q8AAAAAAAD/WAYVr/5SAGwQBlvxW+ahyG0QBIAAW/Dl5qG9bRAEgAAT25gV2psoMk8oVgFb7/rm
+oaZtEASAABrashbbkysysdMPKWJ2DwIA66blLM4CgAAropALC0cLmQIpppBb7s/moXZtEASAAFvt
+yuaha20QBIAAHdo+LDJODwIADcwIHdphLNarW+2i87Y0BeACBQD9/oIdoIoFAPQAAh2gBzUALjKe
+KGJR0w/3wAg50gCdAC8yndMPCPsB+eAHviIAnQD6AAIdoAwVAPwAAh3gDwUA/iAmFeAOBQD+IEYV
+4AkVAPggBhXgDwUAWkUfJzad69omGQdGAAAc2mUa22Qqxi0oUnnHlwmIAShWeSmy0xrahR/bYB3a
+hRzagf8mAAz//vUA+XpmFeBIBQBtihEron/9YATsYgCdAKy/LvaAtKoY20zTDyuCf/sQCBWgSVUA
+7LsIBEAhAABtmhApgn8qtoAqgoDsmwgEQCEAABzaUyzAgCq2gP2CwEFQDiUAL1J2Dv8CL1Z2LVJ+
+Dt0CLVZ+KmKtxr/7QAQFcBsFAAuqAipmrVt6GB3aMCzSgsDhDswCLNaC0Q+wqv9AIBXgCRUA7585
+BUAFAADowjgP9r4AAGP/Hay/9fAGFa/9mgDRD2wQBB3bLSzSIMvLKMz/CMoB6MAaflgEgABtCAyw
+qemqAQ1YBIAAebACY//sD7sRHtsjL8wf+8+GHeX/HQD/z6Yd4AoFACrkfvm7yBWgigUACAA/W3c+
+CgE/0Q8AbBAiW/ia5qRobRAEgAAU2xUlTQgnUtgmUtUoUtSnZidS0ilS0ah3KFLQKlLPqYgpUs4r
+Us2qmSpSySxSyKuqK1LHLVK+rLssUr0vUrsuUr+tzC1SvCNSuSJSuK7dLlK6oyIjUrWv7i9Stq8z
+L1K3JVLWo/+i/xPa/K/urt2tzC0ypay7LzJyq6qqmamIqHenZqZV9KfgFe/HBQD2oAQC8AkFAOU2
+Ay6wBIAA9eCQDeAFhQAoMO1k1AbxAbwN4y8dACUxfN2Q9qAAErAPBQD1IQAK8AJuAAAALDDzKzD0
+LTDwLjDxLzDyKjD1remvmZoSmxGcEKyZq5kc2nyqmfglhhXgC2UA+CBmFeAKVQBbd/sqEizMpvAA
+wA2gDwUAwLH6JWYV4AuFAFt5SC4w7S0SLP+gAEawDAUAW3h9KBIr+WBAB7CITQAI/wEoMXz4gDAV
+4A2FAA/dDPxDAArwSgUA6pkCDEMCgAAIVTYpRAEPKCj6AKIdq+WhAP21egWriKEA+CAGFaALZQBb
+d9wGMhTqJAAJWASAAFo/nCsw7Ckxe/yAMBWgDoUA+88ADrCOBQDkt5NsywKAAA0rKAm7NtawDswC
+LEQB/bVUBauCoQD6ICYVoA8FAPoAoh2r66EA/iAGFeALZQD4IEYVoA8FAFt3w+pkAArYBIAAW/dX
+5qJzbRAEgABbVM4pMtvvMnIlaP0AAAfdAe02ZSSAUYAADJ4RLjbeFdoPZPc0LFF/JjIsKUJtGtlF
+iDMrQmsqoq8JiAgpQmkLqgkrMiYKmQgJiAgqMt4LZggIZggK0gjmIggGaCiAAAsiDAoiDPoAoh2g
+C2UA7NqBGWgEgABbd6DqHCApWASAAFv1weah6G0QBIAAHNomFtn2GNkoiRga2nclMnIf2fDomQgF
+U9EAAOkWCCK16YAAKPF/8QAN/pIAnQAvQm/ulAAHgLGAAK+e/9/gFaCPTQAI7gEuRm6v7ihCcStC
+bS1Caykw7u5CaSd4/QAAB/8BL0Zor+6mmSmQgI8zLkZqrt0tRmytuytGcC4yZauIr4gtMhotFjco
+NmSo7p4yDZkoKRYur+77IFmwEgCdACk2KK3l/L/gFeD9TQAP3QHtNicsqASAAC8w7yQyGab/L/CA
+rV4E+SiZGfsgWXASAJ0AKTYqLxYbpO7/3+AVoIRNAAjuAe42KSzoBIAALxIbKDIaKjDu/6AARLAb
+hQAE3iwL7SzuNhskoP0AAAdEAaaqCFgsKDYcKqCAC4ksroWqVaX/C/Usr92tmfigAELwClUA/LAA
+ErALZQDlFgAsaASAAFt3SiQ2KyU2LCoyJisy3qRcLDbdrLv7b+AV74wFAAy7ASs2JauqW1Pd0Q+l
+7f2/4BXgxU0ADc0Bf9tmKDI/f49gGNlWnhgtMO8O/gwI7jam3S3QgA7+DK5e6TIqJ3P9AAAOzgEF
+3SguNin9IE7S4gCdAK5e7TYqJ3P9AAAOzgEuNikoQAHApP20EgWgKQUA+QYADHALZQDoRAEv6ASA
+AFt3I9EPAAAAAO0ypSK9OYAA6dQABrz5gAAoMO34JaYV49UdAO0WNSwGjgAAKDF8+gACHeAPBQD3
+AAAUMAoFAPlBAA0wBUoAAADm1AAGtTmAAAb7Nws7FOsWKC3QBIAAWj7OLDDzKzD0LTDwLjDxLzDy
+KTD1reiviJkSmxGcEKyIC4gIHNl96YgIDRAEgAD4JEYVoApVAPggZhWgC2UAW3b7KTDtAlsM5jDs
+LegEgAD7IEjgEgCdACkWHyoSIvjAAEbwDAUALBYh7a0IDfAEgADtFiAtKi4AAP8gaB3gCgUA+iRm
+FaAIFQD4JWYVr/j1APgkphWgFW4AACsw9Cww8y0w8C4w8S8w8iow9a3pr5maEpsRnBCsmauZHNlY
+qpn4JSYV4AtlAPggZhXgClUAW3bXKhIpzKbwANANoA8FAMCx+iVmFeALhQBbeCQuMO0tEinTD/+g
+AEawDAUAW3dZKBIr0w/5YEAHsIhNAAj/ASwxfC5AAfwmqBXgC4UA/28ADfBIBQAI7gIL2ijuRAEu
+YwKAAAyqNhzZmioWNv+jAAx76qEA/WBoHeALZQD4IgYVq4ihAPggBhWgClUAW3a0KRI2ZJU8HtjP
+KTYqLjYprp4pEhAtEi3v2QcUgFGAAC42LSk2LivydCrydQuqDPomZhWjvR0AKxYqWj5oLjDsKTF7
+/CZoFaANhQAK3Qzk5PpsywKAAC4SKg3uKAnuNi9AASgKgAj/Ai9EAcDw+iAmFaAJBQD+IeYVq7yh
+AP2y4gWr7qEA+iBGFeAKVQD4IAYV4AtlAFt2jokfyJkc2KopNiisXCw2Jy0yJ2TQqC0yKWTQoi0W
+NBzZZ/5lSBWgClUA/iTGFaALZQBbdoEvMO8oMiQlMhmm/y/wgC4SJi0SNAX/KAjuDP/AJPLiAJ0A
+LzYqpd7/3+AVoIVNAAjuAe42KS/oBIAAHNlUrt8vNiMtMicuMij+JkYVoApVAPwk5hXgC2UAW3Zq
+LzDuJTIapv8v8IAuEjIF/yj/wCOS4gCdACgSJy82KKWI+R/gFaCVTQAJiAEoNicqMi3IpCsyLlvz
+9S9Cb+USCCeAsYAAr1X0v+AV4I9NAAhVASVGbq9VKEJoJVw/51UBBB7JgAAoQmwpQmslRmrllQgE
+HrGAAClCcciUKkJwZKPUKzIniDOVMiwyZaWFJTZk5cUIBYPhgAApMilkkHEc2M0vMhkuMiopMO4o
+MhotMiimmSmQgAjdLA/uLC42Gy8w767YqYim///wEBXgGYUACessCdosqP8J+SyvuwuqCAqZCO02
+HCzOgoAA+CSGFeALZQD4IAYV4ApVAFt2KygSJOg2LCKo/QAAB1UBJTYrqFUrMt4lNt0qMialu/tv
+4BXvjAUADLsBKzYlq6oqFjhbUrovMinuEjgn3zmAACUyGf//2yqiAJ0AJDDvpkQkQICeGCwyKgVN
+KC42Kf2AGlriAJ0ALTYqLxYYpej5H+AVoJVNAAmIASg2KSkyGigyKCwyKyow7gXeLP5jZhWgG4UA
+C+0spqrs2JAWKP0AACqggAmILAdVASg2HAuJLK6Pqv+vTwv0LA/dCA2ZCPiAAEJwClUA/JAAEjAL
+ZQDkFgAsaASAAFt19SU2KyQ2LC0SGP5lKBWgCkUA/bGmBaALZQBbde7RD8BgCWY29aAnLBIAnQDb
+YP/hmA2gDQUAKDKlZYjE/+RQDaACBQAoMqXpFgssSgYAAB7X/u2UAAyQBIAA7NjCHKgEgAD5zwAP
+cApVAP4hxhWgC2UAW3XYL0JvyfCvJfS/4BXgj00ACFUBJUZur1UpMiQqMt4rMmWMMy1CcS5CbS9C
+a+VCaSLA/QAAB4gBKEZoqFUoMOwlRmql/y9GbK/uLkZwJTImrt2dMq3MLDZkrLsrNt2rqio2I6qZ
++S/gFe+KBQAKmQEpNiXpVQgMAFYAACkw7WSWZJUcKzD0LDDzLTDwLjDxLzDyKjD1remvmZoSmxGc
+EKyZq5kc2CqqmfghphXgC2UA+CBmFeAKVQBbdaoiMO4lMhoqMOymIiIggCoWEeUiKA0lngAA9kfg
+DeAPBQAiFi4oMO34I+YVoBOmAAAAAAD6I6YV4AkVAPglZhXv+fUAKRYlW3brLRIgLBIhW3YiLBIr
+0w8MvDcrEiUuEh0vEh8MuwErFiPtEiMv0ASAAO0WHi9YBIAAW3beLRIgLBIhW3YWLBIeLRIjLxIr
+KBIlrS0PvzcI/wGt/Q1dDCkxe+RjTmzLAoAAKhIoCtooCao21qArMnJksvAuQAEoCkAI7gIuRAEp
+EigoMXySE5wR/yMACvvqoQD9IwANsApVAP2wrAWrmaEA6RYELEMCgAD4oQAKu7uhAPogRhXrlaEA
++CAGFeALZQBbdWdj9owV14MW14Jj9oMAAAAA/68ABa/rKgDA4AnuNvWgGjwSAJ0A/+wIDaANBQAv
+QmklRmj14ABC//CGAChCbSVGbPUAAEL/8JIAJUZw+KAAQv/wkgAa2DguNirtNikq4ASAAOusBC/o
+BIAAW1HZLTIq/mUoFa/tegAAABrYL+42KCrgBIAA6RInL+gEgADpNiclWBEAAFtRzmP7hgAa2CYv
+FhguNinrrAQq4ASAAFtRyCQw7yUyGS0yKqZE9JAQFa/ysgAs8nQq8nUNWzcLOxQrFhoMqgwqFhVa
+PPMsMPMrMPQtMPAuMPEqFhwvMPIqMPWt6a+ZmhKbEZwQrJmrmRzXovsgAESwC2UA+CXmFeAKVQDp
+FgMmKYEAAFt1IC8SLy4w7CwSHCow7foj5hWgC4UADLsM7bQABRMJgAD7wABEsAgFACgWF++ZCA3o
+BIAA6RYWL4FGAAD+IiYVoAsFAPojJhXgChUA+iVmFa/69QD6JKYVoAEGAAAAAAArFhL+IiYVoAwV
+APwlZhWv/PUA7BYlL9AEgABbdlQtEhYsEhdbdYwvEisuEiUtEhIPvzcP7gEuFhkqEh8oEhnoFhMu
+2ASAAFt2SS0SFiwSF1t1gSkSGSgSHC8SK6mIKRIlLhIRD783Cf8B+eAARDANhQAI3QwpMXsrEhPk
+4a9sywKAAC4SGg7eKAnuNigycmSBbilAASoKQAqZAilEAS4WFCoSGigxfJsR66UoCuAEgADoEhws
+WwKAAA+qKJgTC6o2KhYx+iKoFeuqoQD6IAYVq6WhAPogRhWr7qEA+3QABfAKVQD6IIYV4AtlAFt0
+zSkSMWSRACk2Kh7W5yUWMC42Ka6eLRIw6RIUJoBhgAAtNi4uNi2u3mSY3y42J/hlBhXv42YAAAAo
+MqVkjRQpQAErCoALmQL4gCYd7/QiAAAa158vFhjrrAQq4ASAAFtRQi8SGP5lKBWv2IoA22D/ziwN
+oA0FAMDw//K8DaAMBQDAYAlmNvWgEnwSAJ0A2mD/8rgNoA0FAAAuNicb1479oGgdoAgFAOg2KCzo
+BIAAW1EuHNcrJTIo/GToFe/TDgAAAAAa14LuNikqYASAAPwhKBXgCQUA6TYqJVgRAABbUSIc1yAk
+MhktMioqMO8uMiklMiimqiqggPojZhWv0uIAAP/fLA2gDQUAHtao9CYGFe/8GgAsMqVkzpYoQAEp
+CoAJiAL4gCYdr/oqAAAAAAAAAP4AAh3gCgUA+iJmFa/5LgDA4AnuNvWgDrwSAJ0A//k0DaANBQCL
+Ho0cLBILLzDt/iPmFeAIFQAoFisNzAwMuwhbdcMvEh8uEhGNHa/u/6AARrAMBQBbdPgoEisiFi75
+YEAHsIhNAAj/AfPgDFqiAJ0AjRwiEi71oABG8OVNAOI2KCbr/QAADt0BLTYnLzDvLhIfJTIZpv8v
+8IAvFhvl/ygPAKYAAPHwkA3gDAUA/EAARvABMgCfGSoSH4sejBv8QABG8A4VAC4WK50aDcwMrLtb
+dZ8uEh+NHf+gAEawDAUAW3TVLhIrjRqPGf9gQAYw7k0ADswB/4AF2uIAnQAvNiql3v/f4BWghU0A
+CO4B7jYpL+gEgAAc1sYvEhsoMhoqMO7/oABEsBuFAAXeLAvtLO42GySo/QAAB1UBpqoIKCwoNhwq
+oIALiSyugqoiov8L8iwP3QgNmQj4QABBcApVAPxQABEwC2UA4hYALGgEgABbdCUlNisiNiyMG4se
+pSoKzAysu1vxudWgHdY7ddsKLkABwvAP7gIuRAEY1jf1H57S4AIFAMck0Q/aYP/p1A2gDQUArS0a
+1votNinsNiov6ASAAOusBCrgBIAAW1CbJTIZLTIqKTDvLjIpIjIoppkpkID4I2YV7/zCAAAAAAAA
+AAD/8jANoA0FAIocKjYnGtbo7FQACWgEgADvNiglWBEAAFtQiSIyKC0yJysw7foj5hXv+bIAbBAO
+GdWUKJLPG9be79bfFCJpgADA8PgAAh3gCgUA+gACHeAHBQD2AAIdoAUFAPOtrgXgBAUA/AACHaAC
+BQDyIQYVoA4FAP4hJhWgDQUA/CFGFeAOBQD8IWYVoA0FAPwAAh2gAgUA8iDmFeADBQBtCPySHRLW
+ACIiRp8eovIf1sEv8vzkFhMpFkKAAKL/JPUTIvIRiPsoFhGSH4T+ghckFhAo8hsoFhIk8RMo8RIk
+Jf+oRORM/yEQCwAAJCUAJ/YSlv8kEhOV/CISEqhEKBIRqioiEhCoVYgfomYi8HCod4gbqCiYGyLw
+cogaqCiYGiLwc4gZqCiYGSLwdIgYnxUj9FWoKCLxMpgYKPEzqysi8TSsjCjxNa0tIvBxro4v8FQY
+1pmfE6kpKIAJgh2vM+8SDiR8ZoAAmRGSHYgVghOSFiKEYvIhqBWgADYAiBWZESiAYpgWiBYZ1T+o
+IogXKZLPtIjoFgcn+AUAAHn7BIkRY/78H9U4L/LRZPC+LwoAbQi1kh0S1bwZ1n8iIkgpkvyi8gki
+EaKZKJBwIpBUI5RVkhKiM4IbooKSGyiQcYIRooKSESiQcoIaooKSGiiQc4IZJ5YSlp+igpIZKJB0
+ghiVnCSVE6KCKJEykhgikTOriyiRNKwsIpE1rY0okhuuLiKREqqKiJuiRIKeqFUY1mKiZiKSESiA
+CeJ3CAf4BQAA4hINJHxOgACIEiiUYvgghhWgAC4AAAAokGKYFBnVCogUKZLRqCJ5+wJj/0MZ1Qbv
+1lMWDmmAACyVyy2Vze6VzyUBGYAAKxYMG9T/LrXPLbXNLLXLW1B7ixwZ1Pv/rI4F4AA2AC6Vzy2V
+zSyVyyr2vxrVIdMPLaF+7KF/JosZgACIES7wgSqhgJoQCo45LvSBihsq9IDq1RgWAJmAAI4aiBko
+9IMu9IKOGC70hC6hfXrnEcDALPR9LPR8/TnkHaAAJgAAAGTRUh/WLC3yPuP2RSaO8YAAHtYo/arG
+BeAPBQDwAFwNoCgFACrAYiniPh3VXqoi+eAFwuIAnQAt0kcs4vyt/erWIB7uQoAArcwtwRJtigou
+on/t6311UCEAAC3FEhrWGP+BaBWgKAUAbYoKLaJ/7ttpdVAhAAAa1hL/gcgVoCkFAG2aCi2if+7b
+WHVQIQAAiM4jxFWWzx7WByTFEyrBEonLLcIRJ8YSlcytd6lVqkQpwFQq4AmoZukzCAf4BQAA81/7
+D9AoBQApxGL7IGgdr/1mAAD9wGgd7/4OAP2BZhXv/l4A/YHGFe/+ogAd1fIe1NEk1jgl1jkm1jon
+1jsu4X0s0iQj1kDzqCYVoO4xAA68Of2khhWgAgUA0Q9lzp0ooYFljpeIES7wgSqhgJoQCo45GtTA
+//AmHa/6wgBl3jNl7jBkrmYslcstlc0ulc/6IYYV7/i+AGXOqSyhgWXOo40QZd6e+TjkFaANBQAt
+9H0t9Hwtlc8tlmktkckskcsNiAwMiAz5OaQdr/nuAC6yP2TggPoAAh2gDgUA/AACHeAMBQD6AAId
+4AcFAPQAAh2gBQUA9gACHaACBQDyIWYVoAMFAPIgJhXgAgUA9iEGFaADBQD0ISYV4AYFAPQhRhWg
+BQUA//MMDaAEBQAAJPY4JfY5JvY6J/Y7KPIkI/ZA8+gmFaCuMQAKuDn55IYVoAIFANEPAPIAAh3g
+BwUA9gACHaAFBQD0AAIdoA4FAP4hJhWgDQUA/CFGFeAMBQD8ICYVoAsFAPohZhXgAgUA8iEGFaAL
+BQD/9VQNoAIFAGwQBtog+iBoHeA81QBbYYoY1ZaJECKCfwqSO+KGfy0QBIAA0Q8AAABsEAbaIPog
+aB3gPNUAW2GAGNWNiRAign8Kkjvihn8tEASAANEPAAAAbBAG2iD6IGgd4DzVAFthdujVTh0AkgAA
+ghCoSOKEgC0QBIAA0Q/SoNEPAABsEAbaIPogaB3gPNUAW2Fr6dV5HQCqAACCEARICqmI4oSALRAE
+gADRD9Kg0Q8AAABsEAbaIPogaB3gPNUAW2Ff6dVtHQCqAACCEARICqmI4oR/LRAEgADRD9Kg0Q8A
+AABsEAbaIPogaB3gPNUAW2FT6dVhHQCqAACCEARICqmI4oR+LRAEgADRD9Kg0Q8AAABsEAbaIPog
+aB3gPNUAW2FH6dVVHQCqAACCEARICqmI4oR9LRAEgADRD9Kg0Q8AAABsEAbaIPogaB3gPNUAW2E7
+6dSnHQCqAACCEARICqmI4oSALRAEgADRD9Kg0Q8AAABsEAoe1UGL44jlieSM4o3hnRGcEpkUKBYF
+6xYDKVAEgADu4gAqGASAAP4gBhWgO9UAW2J45aQABQRpgAAvoABk8Ib2IwAV4AQFAPIhBhXgAU4A
+uCJ3IW2DIA8CAA8CANowW2J66zQADTAEgADqVAALYASAAFttzWWv16VsK8AAwpzpsSd+UASAAGW/
+xekiASUBqYAAK6AA1aDklAIFgLmAAPIgaB2v/soAAAAA+4AgFa//cgAd1RaMGK3M9ZAGHaACBQDR
+D8Yq0Q8f1RD+gABH8A4FAP/wBh2gAgUA0Q8AAGwQCCYKACYWAOYWASlQBIAA9iBGFaBbtQBbYkbj
+pAAFDiGAAMCw/iIAFeBa1QD14Ggd4Ai1AG2KHKO+LeAA6tEcfeAEgADk0C9l2AUAAO30ACf4BQAA
+/mFgFaAMtQDqHBAnGAUAAOXJCAjYBIAA9yAGHaAMBQBbYN36YGgdoDvVAFtiLOOkAAUK4YAAihDA
+wA8CAOWgNWDoQQAAGdRg69QsGlZCgAAKmQgpnQLrAAUEycEAAAkCYQkCYQkCYQkCYQkCYQkCYQkC
+YQkCYfoFgh2gC7UA0w9tuhejzivgAHqxF+SxA2ZgBQAA69QAJugFAAD+YWAVoAy1AOocECcYBQAA
+5c0IANgRAAD3oAYdoAwFAFtgtmag1hLUxtogW2IT3KDrJAAJ0ASAAFttaMyn8AB8DaAHBQAAEtS/
+2iBbYgvcoOskAAnQBIAAW21gZaCUwHH6YGgdoCvFAFth9vFIQA3gDAUA+CIAFeAOtQDTD23qFSug
+AOSwEWVQBQAAK5QA7MwBJMgFAADAyyocEOXPCADYIQAA9+AGHaAMBQBbYJPtEgAtAloAAIsRGNSj
+DUkL7BICLM8CgACpiP0QZh3gAkUA54SFLgEKgAD7CGQd4AkVAOKEgCzICoAA6YSELRAEgADRDwDG
+KtEPxqrSoNEP0qDRDwAAbBAKH9SRi/SI9uLyBylQBIAAifWM843yjvGeEZ0SLBYDKRYFIhYHKBYG
+KxYE7/IAKhgEgAD+IAYV4DvVAFthwOakAAUCMYAAKKAAwJDq1H8UBTmAAAmUAuMWCCC4gQAA0xCF
+MA8CAA8CAAVaAlthwutUAA0QBIAA6mQACWAEgABbbRXIp7gzdznXxirRD6YsK8AAwtztsQp+UASA
+AGW/5GAAAbHK6TIBJX8JgAAuoADWoOSUAg99VgAAG9Rkihj7QABFcP/1AH9BPhnTgCSkgP6BoAfQ
+ChUALJF/CswCLJV/fkcgLZF/wOQO3QL9L+Qd4AIFANEPAAD6gABHsAIFACL0gNEPwCDRD8Ag81AG
+HaACBQDRDwAAAGwQBtog+iBoHeA81QBbYDQY1EqJECKCfwqSO+KGfy0QBIAA0Q8AAABsEAbaIPog
+aB3gPNUAW2AqGNRBiRAign8Kkjvihn8tEASAANEPAAAAbBAG2iD6IGgd4DzVAFtgIBjUOIkQIoJ/
+CpI74oZ/LRAEgADRDwAAAGwQBtog+iBoHeA81QBbYBYY1C+JECKCfwqSO+KGfy0QBIAA0Q8AAABs
+EAbaIPogaB3gPNUAW2AMGNQmiRAign8Kkjvihn8tEASAANEPAAAAbBAG2iD6IGgd4DzVAFtgAhjU
+HYkQIoJ/CpI74oZ/LRAEgADRDwAAAGwQBtog+iBoHeA81QBbX/gY1BSJECKCfwqSO+KGfy0QBIAA
+0Q8AAABsEAbaIPogaB3gPNUAW1/uGNQLiRAign8Kkjvihn8tEASAANEPAAAAbBAG2iD6IGgd4DzV
+AFtf5BjUAokQIoJ/CpI74oZ/LRAEgADRDwAAAGwQBtog+iBoHeA81QBbX9oY0/mJECKCfwqSO+KG
+fy0QBIAA0Q8AAABsEAbaIPogaB3gPNUAW1/Q6NPvHQCyAACJECKCgAkiKOKGfi0QBIAA0Q/SoNEP
+AABsEAbaIPogaB3gPNUAW1/EGNPkiRAign8Kkjvihn8tEASAANEPAAAAbBAG2iD6IGgd4DzVAFtf
+uhjTaokQIoJ/CpI74oZ/LRAEgADRDwAAAGwQBtog+iBoHeA81QBbX7DmoB9tEASAAOo0AApYBIAA
+/KBoHaB9RQD+IAgV4A4VAFgVvdEPAAAAbBAG2iD6IGgd4DzVAFtfouagH20QBIAA6jQAClgEgAD8
+oGgdoH01AP4gCBXgDhUAWBWv0Q8AAABsEAbaIPogaB3gPNUAW1+U5qAfbRAEgADqNAAKWASAAPyg
+aB2gfSUA/iAIFeAOFQBYFaHRDwAAAGwQBtog+iBoHeA81QBbX4bmoB9tEASAAOo0AApYBIAA/KBo
+HaB9FQD+IAgV4A4VAFgVk9EPAAAAbBAG2iD6IGgd4DzVAFtfeOagH20QBIAA6jQAClgEgAD8oGgd
+oH0FAP4gCBXgDhUAWBWF0Q8AAABsEAbaIPogaB3gPNUAW19q5qAfbRAEgADqNAAKWASAAPygaB2g
+fWUA/iAIFeAOJQBYFXfRDwAAAGwQGBvTgPogaB2gjIUAW2o/+kBoHaA71QBbYKvipAAFD8GAACig
+ACMWJiUWJeQWJCQEOYAA9C/gFaAlxQD0gSAVoAkFAPgk5hXgAW4AuGb0wA4sIgCdACdiAAd6Altg
+qOt0AA0YBIAA6iQACeAEgABba/tlr9aiNy1wAOXRMXvwBIAAZd/G6WIBJwxxgAAqEico4ADqmgIP
+EASAAOoWJyQA6YAA9iBoHa/+vgAAAAAA/uAgFa//SgDAsCsWJyoSJiwSJfokiBXgXcUA/iToFeAO
+RQBYFUEsEif5ppYF4AIlAA8CAP+BoAfQDhUALZHjAt0CLZXjLxIn/+GgB1ADhQAokeMDiAIoleMq
+Eif/QaAHEB0FACuR4w27AiuV4ywSJ9MP0w//gaAGkCUFAC+R4wX/Ai+V4ygSJ9MP0w95hw0qkeTT
+Dw8CAA6qAiqV5CsSJ9MP0w94tw0skeXTDw8CAA7MAiyV5S8SJ9MP0w939w0okeXTDw8CAAKIAiiV
+5RzTIy8SJCoSJyvCfygagAioAQj7OevGfyVYNIAAKpHmDqoCKpXmKxIndbcILJHmAswCLJXmLhIn
+dOcIL5HmDf8CL5XmKBInc4cIKpHmBaoCKpXmKxIncrcKLJHnwOUOzAIslecvEidx9wookefApgqI
+AiiV5ysSJ3C3CCyR5wPMAiyV5y4SJ3/mFC+R5w3/Av885B3gAgUA0Q8AxirRD8Ag0Q9sEAraIPog
+aB3gPNUAW17U5qC9bRAEgAAb0ScrsID8IgAVoA8VAPoAAAPwDkUA9iEGFeAJJQD5YAQD8A2FAPFg
+BLfQBiUAnxTxYAWnkgCdANrwnxQMrwqW8O62AQVQBQAA7rAOd/gRAACxqu72ACf4EQAADbwBfbAH
+7fYAJVAFAABkoEyJEP8iQAfQDwUAixiIFMDx+wIAD/AAEgB+lwrw69AN4AglAAj/An2XBWRgxw7/
+AnyXBWTAdg3/Atow60QACuAEgAD+ACIdoG0VAFgUutEPAAAAAAD/YYAHkAoFAGP/bgAAAAAA7rYB
+BfSwgADfwP/9zA2gCgUAAAAAAAAA7rYBBfUQgADa8P4igBXv/W4AAAAAAAAA7bwBBfLUgAAvHBD/
+/UgNoAoFAAAAAAAA+iIAFeAJNQAKmS4LmQqJkP8mAA///eIA7bwBBfEQgADa8P4igBXv/I4AAAAA
+AAAA+CIAFaALFQAKuy4IuwqLsP9mAA///NoA+CIAFaAOJQAK7i4I7gqO4P/GAA///J4A++BoHa/7
+wgBsEAbaIPogaB3gPNUAW15u5qAfbRAEgADqNAAKWASAAPygaB2gbcUA/iAIFeAORQBYFHvRDwAA
+AGwQBtog+iBoHeA81QBbXmDmoB9tEASAAOo0AApYBIAA/KBoHaBtpQD+IAgV4A4lAFgUbdEPAAAA
+bBAG2iD6IGgd4DzVAFteUuagH20QBIAA6jQAClgEgAD8oGgdoG2FAP4gCBXgDiUAWBRf0Q8AAABs
+EAbaIPogaB3gPNUAW15E5qAfbRAEgADqNAAKWASAAPygaB2gbWUA/iAIFeAOJQBYFFHRDwAAAGwQ
+BMAg0Q8AbBAG2iD6IGgd4DzVAFteNOagN20QBIAA6jQAClgEgAD8oGgdoG1FAP4gCBXgDiUAWBRB
+iBAa0aLxAPAN4EsFACmhfwuZAimlf9EP0Q8AAABsEAbaIPogaB3gPNUAW14g5qAfbRAEgADqNAAK
+WASAAPygaB2gbQUA/iAIFeAOFQBYFC3RDwAAAGwQBtog+iBoHeA81QBbXhLmoB9tEASAAOo0AApY
+BIAA/KBoHaBdhQD+IAgV4A4lAFgUH9EPAAAAbBAG2iD6IGgd4DzVAFteBOagH20QBIAA6jQAClgE
+gAD8oGgdoF1FAP4gCBXgDhUAWBQR0Q8AAABsEAbaIPogaB3gPNUAW1325qAfbRAEgADqNAAKWASA
+APygaB2gTUUA/iAIFeAORQBYFAPRDwAAAGwQBtog+iBoHeA81QBbXejmoB9tEASAAOo0AApYBIAA
+/KBoHaA9hQD+IAgV4A5FAFgT9dEPAAAAbBAG2iD6IGgd4DzVAFtd2uagH20QBIAA6jQAClgEgAD8
+oGgdoC1FAP4gCBXgDiUAWBPn0Q8AAABsEAbaIPogaB3gPNUAW13M5qAfbRAEgADqNAAKWASAAPyg
+aB2gLRUA/iAIFeAOFQBYE9nRDwAAAGwQBtog+iBoHeA81QBbXb7moB9tEASAAOo0AApYBIAA/KBo
+HaAtBQD+IAgV4A4VAFgTy9EPAAAAbBAG2iD6IGgd4DzVAFtdsOagH20QBIAA6jQAClgEgAD8oGgd
+oG0lAP4gCBXgDhUAWBO9GdF/KJB9wKEKiAIolH3RDwBsEAZpMQJuRAXGKtEPAADaIPogaB3gPNUA
+W12c6ND7HQDCAACJEKhIIoB9CSI24oR9LRAEgADRD9Kg0Q9sEAwc0bfH3y0WBCvCASjCAynCAikW
+AigWAysWAezCAClQBIAA/CAGFaBbtQBbXtripAAFCtGAACqgAC4KYHrrbC8KenrzZtMQ9CIAFeA3
+pQCEMNpAW17e60QADTAEgADqJAALYASAAFtqMcqjuDN1Od7yAAIdoAMFAPgAIh3gCgUA8yIADTAI
+BQAKmDjNj2AA+6JsK8AA2sD3YA9cYgCdAGW/yGAB4gAAAAAAAADAMPwAAh2gXdUA+iQAFeAEBQD1
+YGgd4A61ANMPbeoXos4q4AB9oRfkoC9mYAUAAOq0ACXYBQAA/kFgFaAMtQDqHCAnEAUAAOXPCADY
+wQAA9eAGHaAMBQBbXVL6QGgdoDvVAFteoeKkAAUDuYAAK6AA8WHADeAt9QAKrAJtCA19sWIrwAHk
+sAhmYAUAAGP/6wCIFGSAUMDA+CQAFeAKtQBtqhUqIADkoBFhEAUAACqUAOzMASTIBQAAwMuly/ok
+ABWgDAUA5LQAINjRAABbXTUK/lD8ACId4AwFAA7cOGXAqsYq0Q+UFMDA+iQAFaAPtQBt+heizivg
+AH2xF+Swm2ZgBQAA66QAJVAFAAD+QWAVoAy1AOocICcQBQAA5cgIANjRAAD1AAYdoAwFAFtdHfFM
+iA3gavkAwMD4JAAV4Aq1AG2qFSogAOSgEWEQBQAAKpQA7MwBJMgFAADAy6XL+iQAFaAMBQDktAAg
+2EEAAFtdDfoAIh3gDAUABrw4/5YQDeCa+QDA0Am9OGTfVMkzaDtVweF+MTTAINEPAP/+QA2v6qUA
+GNAZghyoIigigIkU/iGoFe/69QAKmQMJiAEI/wL+UAYV4AIFANEPABrQAIscjBSNHVtc6sAg0Q+x
+ytKg8mAoFe/3qgAaz/yLHIwUjR1bXOPAINEPAAAAAPoAIh2gCQUABqk4ZZ+CY/7UAAAAbBAK+kBo
+HaA71QBbXjTjpAAFCHmAAPYgaB2gBQUA8iIAFaAHBQD0BYIdoAoFAP4iABWgCLUAbYoco6wrwADk
+sRx9aASAAOSwYmVQBQAA6+QAJ3AFAAD8YWAVoA21AOocECDYgQAA4tkIBhgFAAD3IAYd4AwFAFtc
+x2agL+oSCCKoBQAA6mQAIzAFAAD8s8CBUAoFABzQ5SsQAS0QAC3EfPuPph3gAgUA0Q8AAPhgaB3g
+CgUA+iIAFeAOtQDTD23qHC6QAN2g6qwBLOAEgADk4BRkyAUAAO60ACXYBQAA/GFgFaANtQDqHBAg
+2IEAAOLfCAYYBQAA9+AGHeAMBQBbXKVmoCD0v/ugkgCdALFd/aGOBaAKRQD6ACId4A4lAFttvMYq
+0Q/SoNEPAAAAbBAG+kBoHaA71QBbXenjpAAFB9GAABXQu/IgaB2gBgUA9gACHeAkxQDwAFgNoAm1
+ALRV9sAgFaAItQD4wAZMIAm1AP4gaB2gCgUAbZoco6wrwADksRx9aASAAOSwoWVQBQAA6+QAJ3AF
+AAD8YWAVoA21AOoUAArYBIAA4t0IBhgFAAD3oAYd4AwFAFtcd/9Z9A3gDQUAAzwC+CBoHeAOtQBt
+6hQqwADJpuqUACboBQAA7MwBJMgFAAD8YWAVoA21AOoUAArYBIAA4t8IBhgFAAD34AYd4AwFAFtc
+Y2evUcCLeGEj3WD9oRAFoAolAPoAIh3gDrUAW217xirRDwAAAP/+KA2v6qUA0qDRD8Ag0Q9sEAb6
+QGgdoDvVAFtdpeOkAAUHcYAA9Z7qBeAGBQDyIGgdoAcFAPQFgh2gCLUA/CBoHaAKBQBtihyjrSvQ
+AOSxHH1wBIAA5LCWZVAFAADrxAAmYAUAAPxhYBXgDrUA6hQABpgFAADi6QgK2ASAAPcgBh3gDAUA
+W1w48UTkDeAOBQDZEPxgaB3gCrUA0w9tqhQq0ADJpuqUACdwBQAA7dwBJMgFAAD8YWAV4A61AOPc
+ASjQBIAA4u0ICtgEgAD3oAYd4AwFAFtcJGagHOVcBCMwBQAA+N/6udAItQDSoNEPAP/+VA2v6qUA
+aGPv3WD9oIYFoAolAPoAIh3gDjUAW201xirRD2wQCB/QPov0iPbi8gcpUASAAIn1jPON8o7xnhEt
+FgIsFgMpFgUiFgcoFgYrFgQv8gD+IAYV4DvVAFtdWOSkAAUBsYAAwnziFAAAqIEAAIMgDwIADwIA
+AzoCW11e6zQADTAEgADqRAALYASAAFtoscinuCJ1KdfGKtEPpGwrwADnsQp+UASAAGW/5mAAAbHK
+6NAcFX8ZgACJIcAgCpI58xAGHaACBQDRD2wQDPpAaB2gO9UAW1065KQABQh5gAD2IGgdoAMFAPeg
+HgXgAgUA9AWCHeAKBQDwALANoAu1AACOHMWn/0AHaqIAnQD+4AcroAoFAC5lAOM8ASMwCQAA9GAH
+ZZALtQAtHCBtuhykrCvAAOWxHH1wBIAA5LAyZVAFAADr1AAm6AUAAPyBYBWgDrUA6xwwINCBAADq
+7QgGIAUAAPOgBh2gDAUAW1vCZ6+P+IBoHeAKBQD6JAAV4A61ANMPbeocLZAA3qDqrAEs4ASAAOTQ
+FGTIBQAA7bQAJdgFAAD8gWAVoA61AOscMCDQgQAA6u8IBiAFAADz4AYdoAwFAFtbrPFGiA3gCPUA
++H/5fCIAnQCxPf2fqAWgCkUA+gAiHeAeBQBbbMLGKtEPAAAAAAAAAPoAgh2gCxUA7M/MGegEgABb
+bLrGKtEPAAAAGs73+CBoHaAZBQBtmg/pgQAlUAkAAOmlvSRACQAAwCDRD9Kg0Q9sEAbaIPogaB3g
+PNUAW1uM5qAXbRAEgACIEBvPkggJR+i0fiSoJ4AAaJMB0Q/GKtEPAAAAbBAG2iD6IGgd4DzVAFtb
+fxjProkQIoJ/CpI74oZ/LRAEgADRDwAAAGwQCBnPqA8CAA8CAIiRKBYB6ZIAKVAEgAD4IAYV4DvV
+AFtcwuOkAAUHgYAAwFDnFAAAkEEAAPYAAh2gJMUA8AA8DaALtQAAsVX0oAW5UAu1APwiABWgCgUA
+bboco60r0ADksRx9cASAAOSwj2VQBQAA68QAJmAFAAD8YWAV4A61AOdbCgaYBQAA4u0IANBBAAD3
+oAYdoAwFAFtbUv9adA3gDgUAKRwQ/GBoHeAPtQDTD236FCrQAMmm6pQAJ3AFAADt3AEkyAUAAPxh
+YBXgDrUA51sKBpgFAADi6AgA0EEAAPcABh2gDAUAW1s+/1V0DeAFJQDSoNEPAAAAAP/+cA2v6qUA
+G89piRGMECy0gOm1RS0QBIAA0Q/GKtEPbBAG2iD6IGgd4DzVAFtbLuagFG0QBIAAiRAbzzQJCEfp
+tH8kGBuAANEPxirRDwAAbBAG2iD6IGgd4DzVAFtbIhjPVIkQIoJ/CpI74oZ/LRAEgADRDwAAAGwQ
+Btog+iBoHeA81QBbWxgYz0uJECKCfwqSO+KGfy0QBIAA0Q8AAABsEAgZz0UPAgCIkZgR6ZIAKVAE
+gAD4IAYV4DvVAFtcXOOkAAUHgYAAwFDnFAAAkEEAAPYAAh2gJMUA8AA8DaALtQAAsVX0oAW5UAu1
+APwiABWgCgUAbboco60r0ADksRx9cASAAOSwj2VQBQAA68QAJmAFAAD8YWAV4A61AOdbCgaYBQAA
+4u0IANBBAAD3oAYdoAwFAFta7P9adA3gDgUAKRwQ/GBoHeAPtQDTD236FCrQAMmm6pQAJ3AFAADt
+3AEkyAUAAPxhYBXgDrUA51sKBpgFAADi6AgA0EEAAPcABh2gDAUAW1rY/1V0DeAFJQDSoNEPAAAA
+AP/+cA2v6qUAG87biRGMECy0fem1RC0QBIAA0Q/GKtEPbBAI+kBoHaA71QBbXBvjpAAFComAABfN
+sfeaWAWgBAUA9AWCHeAKBQD4AWId4AwFAPwgphWgANoAABnNJAQfFAf/Ci3yrsfvDpgDCN0B/WYA
+DvAKBQDt9q4iIAUAAPSAB/tQCbUAiBVlgPXdEG2aHKOuK+AA5bEcfXgEgADksLdlUAUAAOvUACbo
+BQAA/mFgFaAPtQDaEOPsASDYQQAA8eAAR3ANBQD9wAYd4AwFAFtaoNKg5yBYafAEgADZEP4AAh3g
+CLUAbYoUK+AAybbrlAAn+AUAAO7sASTIBQAA/mFgFaAPtQCx4+scECjQBIAA8eAARvAJBQD5oAYd
+4AwFAFtai+agWm0QBIAAwOEuFgUazhCOFCqifw6rKCw66Ay7LHtjG/Kf+JfSAJ0AGc4M+WAAFb/8
+KgAA//3gDa/ipQAfzrH9nWIFoAsVAAr/LPyAaB3gCkUAW2uV+5m4Be//HgDRD9EPAAAAbBAOG86o
++iBoHaBMhQBbZVH6QGgdoDvVAFtbveKkAAUEAYAAKKAADwIADwIAZIBv9ikAFaAHBQDyIGgd4AA2
+AAAAAAC4M3YxVoQw2kBbW77rRAANKASAAOokAArgBIAAW2cRZa/dolwqwADC3O2hN35YBIAAZa/L
+6TIBJYEhgAAusADSsOeXAg99fgAALxoMf3AMEs6F9k/mFeACBQDRD8Yq0Q8AAAAA+4AgFe//MgBs
+EAT6QGgdoDvVAFtbleKkAAUA2YAAE8552jBbW5/coOs0AAlQBIAAW2bzyKLGKtEPGM5zGs50IoJ/
+Gc2wCiIBCSIC8w/mFaACBQDRDwAAAGwQEhvObfogaB2gbAUAW2UR+kBoHaA71QBbW33kpAAFA4GA
+ACigAA8CAA8CAGSAmfYsABWgBwUA8iBoHaAANgAAAAAAuCJ2IUaDINowW1t+6zQADSgEgADqRAAK
+4ASAAFtm0WWv3aRcKsAAwtztoU9+WASAAGWvy+kiASWAoYAALrAA1LDnlwIPfX4AAGAAO8YqZiAy
+Gs5JLRIYL6F+ffwGLaV/0Q8AAP9P5BWgCxUA/ZyIBaAKRQBbayLGKtEPAPuAIBXv/tIA0Q/AcCcW
+GP/+/A2gAgUAAGwQEBvON/ogaB2gbAUAW2Tb+kBoHaA71QBbW0fkpAAFA9GAACigAA8CAA8CAGSA
+h/YsABWgBwUA8iBoHaAANgAAAAAAuCJ2IVCDINowW1tI6zQADSgEgADqRAAK4ASAAFtmm2Wv3aRc
+KsAAwtztoT9+WASAAGWvy+kiASWA8YAALrAA1LDnlwIPfX4AABLOFfZPxB3gAgUA0Q8ZzhIokX75
+L8Qdr+KlANEPAAAAAAAA+4AgFe//EgAbzgvAoPtvxB2gAgUA0Q8AbBAGLSAA6zQACmAEgAD6oGgd
+oD/VAP+lJg3gBgUAxTtz0R/eIG0IFeTQSGMwBQAALeAB79EMd3AFAABz0QRj/+MAABfN+JsS/CAm
+FaADBQDqFgAjoEEAACVyf9sg7GQACtAEgABbZmjIrLh35HnocZghAADGKtEP2lBbWwt2qekazJH6
+YABFODgFAHih5esSAiVAHwAAKII1jBHtEgApUASAAAuAANKg0Q8AAGwQBtxA6iAAKugEgADyIGYV
+oAcFAP5gaB2gP9UA76EueRgEgADFK3KhJNswDwIA0w9tCBXkoEhjuAUAACqwAe+hDHXYBQAAcqEE
+Y//eAAAWzcueEvwgJhWgAgUA7RYAIykhAAAkYn/bMOx0AApQBIAAW2Y6yKy4ZuVp6HEQIQAAxirR
+D9pAW1rdd6npGsxj+kAARTiIBQB4oeXrEgIlQB8AACiCIYwR7RIAKdAEgAALgADSoNEPAABsEAbc
+QOogACroBIAA/mBoHaA/1QDiFgMpGASAAP9Fhg3gAgUAxUt0oSLbMA8CANMPbQgV5KCYYRAFAAAq
+sAHvoQp12AUAAHShAmP/3hXNn50SnBH3mzoFoAcFAP4gBhWgADoAuGblYWZzuCEAACRif9sw7CQA
+ClAEgABbZgplr+LaQFtasHKp2hrMNfrgAEU5uAUAeKE4ixBpsRcsEgEtOv99yQ4ezYov4oAu4n8P
+7gguFgHrEgAlQBsAACiCFYwR7RICKdAEgAALgADSoNEPxirRD2wQBtxA6iAAKugEgAD+YGgdoD/V
+AOIWAykYBIAA/0UmDeACBQDFS3ShHwM7Am0IFeSgRGEQBQAAKrAB76ELddgFAAB0oQNj/+MAFc1q
+nhIWzWycEfwgBhXgBwUAJGJ/2zDsJAAKUASAAFtl2cisuGblaehzuCEAAMYq0Q/aQFtafHKp6RrM
+AvrgAEU6SAUAeKHl6xICJUAXAAAogjGMEe0SACnQBIAAC4AA0qDRDwAAbBAEwCDRDwBsEAQjIAb0
+QPAVoAoVAFgEu/OXTgWv9bUA9UAHPGAGBQAazUoDSQwmJoLkOx15xgKAAPsAAEQwGvUAbZkNKYJA
+CpkC6YZAJEAHAAAsIsAdzUANzAIsJsApIscbzT4azT4LmQEKmQL4WOYV4AQFAMChW1+BJEwBaUn0
+/ljoFaAEBQDAoVtffbFEaUn1FM00JCbKLwpO/kaGFeAEBQDAoVtfdrFEaUn1+EaIFaAEBQDAoVtf
+cbFEaUn1KRoA+EjmFeAEBQDAoVtfbLFEaUn1+kjoFaACBQDAoVtfaLEiaSn1wKNYBIZ1oRz5mjIF
+oAIFANMPbTkNJoZAJoZ85oZ+JEAHAADRD8cl0Q9sEAQTy2kZzQ8IKBGpiCmCQSiCUSQyghXNEOVE
+AQkVgoAABCIC8nBGFaACFQDRDwBsEBgcy12KJiYgBiggB/gkRhWgCxUAKcKCC5kCKcaC+MAqaqIA
+nQAUzPsnEiIIbRGk3QZ3DG15Ii7SQSzSQw7oCXyLEw7uEXzrCP+PAAywAB4AAMCQKdZDLd0B+iMG
+FaADBQCmNdpQW//aZKDU4lsJCuYCgACkzC3CUS21HsCgKsZRKrUnKrUw6rU5IZgFAAB3Oc8YzOYv
+EhjAwCwWGfngBAewDhUA/iKGFeANBQAP7TgtFhUeyzEt4oIjEhkfzNorEiKmM+/dAQn9goAAD90C
+7eaCK1AEgABYAunAoP2ZqAWgCwUAWAFwZqBW6xIiK1AEgABYAuPAoP2XRAWgCwUAWAFpZqA7IxYT
+WAFIZKSlGsuc/CJoFaALBQD6JGYV4AMFAPokJhWgCQUA6RYgLmaCgAD1gAEGMAUFAPwj5hWgAI4A
+xyvRD7FVLhIjLRIgDwIA7uwBIZhBAADuFiMug94AACkSH+WWUiTwEQAA5eZSJOghAADl1lIk4DEA
+AOXGUiTYQQAA5bZSJNBRAADlplIkwGEAAOWGUiT4cQAAJfZS6xIiK1AEgABYArYsEiHH/+/MAwnQ
+BIAA7BYhKdgEgABYATpmr3xYARllr3rAkfgkBhXv/d4AAAAA4xIhL18CgAArFh4rFhL8ImgV4AkF
+APgjphXgDwUA/iFmFeAOBQD+IuYVoAUFAPQjZhXgDgUALhYaAtgJ6BYWLu4CgAD1oABGsAwFAPwi
+BhXgBQUA/aomFaAA3gAAAAAA9KAFYZIAnQArCgHrFhsiqAUAAC4SHC0SHSwSGi7sEO4WHibIBQAA
+6RYdLgS2AAD6JEgV7//1AO8zAwtQBIAAWAKCKxIe3DDrFhwt0ASAAFgBCGautFgA52WvpIobDwIA
+DwIA9V/1HdIAnQAtEhsrEhaxrA3KOSuxHiwSF+oWCy3fwoAA/WAXQ6IAnQCxzCwWFy4SEC0SFisS
+IizmUezVJytQBIAAWAJo//2cDaAFBQApEh0rEhYqEhfqtSckyAUAAB/MTo3yjvGL9IjwjPOK9ZoV
+nBOYEJsUnhH8IEYV4A4FAJ4eLRITKxISiPboFgYs5wKAAOy7CA7ugoAABN0KLRYfj/efF9Ow6xIi
+K1AEgABYAk3aMOzMOBnYBIAAWADUZq3m8iGmFeAMhQD5mGYF4AsFAPoiJhXgCgUA6hYPKegEgADp
+FiEumASAAO0SHyjwBIAA0w9tyiIv0lIoCn/5/+1EIgCdAIngCQlA6fkIB3ARAADp1lIm6BEAAOsS
+IitQBIAAWAIxLBIh8iGGFe/69QDqzAMJ2ASAAOwWISnQBIAAWACz7RIfLWsSAADyIGgd4AUFAIsw
+0w/1YAxgkgCdAOM8BCKoBQAA6VjoZugRAACNEPghABWgDgUA/gAiHeAMBQD94gAOcAk1APwgKBXg
+zAEADwIAbZog+QAIFeAKBQAN/jjtggEkQCEAAAzrAfniAA1wDgUAC6wBDf44jRx84Ar+IcYV4A4V
+AC4WDy4SEYkf/aIAFeAMhQDu7AEumASAAO4WEST4MYAAgx2PHgzoEagz6zQAB/WBgAArEiIpEhXp
+FggrUASAAFgB9yUSIceP6FUDCdAEgADrNAAK4ASAAFgAe+UWJC1kGgAAJRIWKRIUDwIAJVEe5JBl
+YqvBAACTGiMSJCgSECsSIuWGUStQBIAAWAHlixr6ISYV7/n1AAkzA+w0AA3QBIAAWABpZqw5WABI
+ZKCxLBIWLMEe78wRAqgFAAD1gAUD4gCdAI4ZjRjjFiQncEEAAO4WCib9QYAA6xIiK1AEgABYAc8p
+EhYPAgAqkTkokSeqiAgYEioSEC8SGSimUeiVMCf4BQAALxYZ9//aRWIAnQDrEiIrUASAAFgBwcAg
+0Q8A7RYlKtAEgABYABDtEiUtc04AAMDgnjAr0lKwvAvLOPuqRhXv+VYAACISFvxE5B2v8rUA0Q8T
+ynL/8JANoAsFACgSFvUHJB3v/cYAAGwQBOjLmhFBQ4AAwGDlyecZAQqAAP0AAQFQA0UAbToYKVKE
+CSkBKlKJ6ioBAzARAADqmSJyqBEAABzJ3CrCJfpABAUwCwUA+4SmFeeqAQDxQJAN4AIVAMAg0Q8A
+0Q8AAGwQBBvJ0tewJrKIx48IZgP34AADMAIFAChyhPpAgBWgBQUA+PEoFeAMRQDTD23KJQAgBAYN
+Ge/XGnEQBQAAAFAE+J8AD3H4nQD+4AAH9+4BAH/pH7hVJ3wE6au7bRAEgAAisiXy4AABMAMFAOO2
+JSEAQYAAwCDRD8Ah0Q9sEAQZybPTDySWhCSWhSSWhiSWhyKWgCOWgSiSg/uWugWgDAUA+gAiHePt
+hQD7BgAMcA4VAPkwZhWgDwUAWjL0+AACHe/yVQAKkjvRDwAAAGwQFCQgByUgBiIWGnRbORnLQwJa
+CeVMDArGAoAA+QAARHALBQBtyRspgkEppULrhkElUAkAAOulSiRABwAAK6VTK6VcCQpPmhAZyY3A
+wSuSggy7AiuWgvSgJWqgCgUAIhIAKhYPBU8MLxYXGcmFKJKCIxIPGssvBTMI6ogBCdWCgADqiAIK
+WASAAOiWgirQBIAAWAE9wKD9llAFoAsFAFv/xGakoupUAApYBIAAWAE2wKD9k+oFoAsFAFv/vWak
+h9pQ4xYRKlgEgABYAS8oEhopEhEPAgAPAgAImAkoFhsogULAoCoWHRrLDePJ5xzOAoAADwIACpkI
++COGFeAKBQD6IwYVoAYFAPkoJhWgBwUA6lQAClgEgABYARvHn+kzAwtQBIAA62QACeAEgABb/6Bm
+pBRb/4DsEhslIJGAACzBQg8CAA/MESzMEPOAH9OiAJ0AsSIuEh0vEhwtEhj2wgAVoAcFAOL2QSdI
+BQAA6RYdJvz5gAAnCgD4IYYV4AYFAOYWGSy3AoAA6lQAClgEgABYAP3Hj+gzAwtQBIAA62QACeAE
+gABb/4Jmo5xb/2Lko2ZjuAUAACwSHCsSGy0SGSzCQSuxXfbCABWgGgUA7LsMBugFAAD7QBt74gCd
+AO0WGSvCnAAAKRIbHsrYIpVdiOCK5IvjjOLt4gEg+EEAAJ3xnPKb85r0mPCJ5Zn1iOaY9u7iByrQ
+BIAA7vYHKlgEgABYANmIHCcSGah37MrIG58CgADqNAAJ2ASAAFv/XWajByISHCIiT7Eilx0ayQ35
+lYAF4AsFACsWFvlRBhXgBgUA6lQAClgEgABYAMcZyQXaMP2TDAWgCAUA6JaIKdgEgABb/0tmosHq
+VAAKWASAAFgAvh7I+xzKqe3KrxnQBIAA7eaIKdgEgABb/0Jmoppb/yHXoBnI8xzJdOjKqBnQBIAA
+6JaIKdgEgABb/zlmonlb/xn3QBSeYgCdALEiLBIWLRIcsWnmlAABmEEAAOLWTyZ7iYAAHcllnR4s
+EhzAgCjGTy8SEf4hqBWgCgUAKhYTGsjcrp4uFhD5UQYVoAsFAOjKfx93AoAA6xYSJ3BBAADuFhQv
+/oKAAAj/Cv4iphXgD4UA6RIVIPBBAABt+iIvkkcoCn/54A+UIgCdAIrgCgpA6voIB3ARAADqlkck
+yBEAAOpUAApYBIAAWACEgx4r+v8LMwMrEhTsNAAN0ASAAFv/COMWDi0NogAAIxwQ9iKoFeAGBQCM
+MA8CAPWADBCSAJ0A53wEIzAFAADpaOdhmBEAACgcEImA/gACHaAPFQD9ACgV4AwFAOn8OARAIQAA
+/AAABjAJNQBtmiD5AAgV4AoFAA3+OO2CASRAIQAADOsB+eIADXAOBQALrAErEhQqEhIN/jgM7QH+
+ImgVoAwVAP2NAA1wD4UA6hYSJdhBAADrFhQncAUAAO4WEyV4QYAALxIc+qBoHaAGBQDi9k8qWASA
+AFgATScSECMSE6czJxIODDMR8mIAFe/49QDodwMJ0ASAAOs0AAvgBIAAW/7NIxYe5hYfLQYqAADi
+ZAAJsASAACMSHCMyQSM88CgSHNpQ44ZBKlgEgABYADjHn+l3AwtQBIAA62QAC+AEgABb/r1moIdb
+/pxkoLGwM2QwrOQvyWMwQQAAKRIbDwIADwIAKZFLLBIbIsFdqSICEhItEhyKHysSFyLWQeLFVCVQ
+BQAAKhYP+1/bPWIAnQDqVAAKWASAAFgAHcAg0Q8AKRIcKJJB+R/gFaAHBQD5KCYVr/IyANpgW/5o
+Za55wKCaMClyR7CZ+OjmFe/5tgAAxyXRDywSHCkSHSsSG+LGQSTIBQAA82ukHa/wXgAAAADpbAEh
+U/0AAPNNAAk/9f4AKxIbAwlP+WlkHe/9dgAAAGwQBOTJ5BlGAoAA8kNyDe369QACOQwEiAhtmQ0p
+gnwKmQHphnwkQAcAAMChW1wk4jkMCUYCgAD1AABEMgoFANMPbZoNKYJ8CpkC6YZ8JEAHAAAqCgFb
+XBrAINEPbBAK5iAGKSAEgAD2QPAV4Ao1AFgBNccr80AIlCIAnQDzkD4F4AoVAPXgAh3gDQUALTaC
+LTaIKDKCCogCKDaC9sAL+uIAnQAcycGdFSQWAgZ+DJ4WLzKChRUpEgIM/wEGVQjpWQgKrYKAAPXm
+AA/wBAUA/nBGFeAFBQCZESWUIYgR9QVGHaAKFQBYARfzQAT0IgCdACkyJAxKEfqmAA0/CwUAC5kB
+CpkC+GSGFeAKNQBYAQ1yoXfqZAAL2ASAAFv/uc1azUjA0C02gC02gRzIfSw2hBvJqSs2hSw2his2
+hygygxrJn/oAIh3gDAUA+AAiHePthQD5BgAMcA4VAPhwZhWgDwUAWjE1ZqAiKjIl4qcgciAFAAD4
+n/st0gCdAOkSASKoBQAA+L/6glAEBQDHJdEPixWNFuzJhRXYBQAAmxX9f/iFYgCdAI4W+CBIFaAP
+FQD+IGYV4AUVACUWBPjAAEQwCgUA+CAGFa8FBQBt6UCEEqappJQrQCovQCGr/g4ORy5EM3lrHihA
+IClAKQ+EDIgU+y8ADPAPBQAJ+DmJE5gUBPk5mRNkoK0MvDYN7TexqokUZJDVihPTD+QSAiUGcYAA
+p2oKGhKqSiygKiqgISsyJAzMEQysAgW7AQy7Ais2JPRkiBWgChUAWAC/81/59CIAnQDAwy4yJMDw
+9CAABbOEIQDl7gEEQ/0AAOj/NQXYCQAA7Ls0D/8CgAAPvwIP7gIuNiQsMjotMjsNzAz7YEAVoMwB
+AAyqAwoKQKq6sqoqNjgpMkj9ZCBBUpkBAKm6+1/gFaAAZgCNECzQKv2mcBXv/T4AAAAAAAAA2pAq
+NkjA4P5wRhWgCjUAWACb81/1dCIAnQDAINEPAAAAAP2vAA0//P4AbBAOGMkoIyAG5CAHKNAEgAD2
+QHAV4AsFAPxAqBXgDDUA847yBaAJlQBtmg4pgkGZoOuGQSRABwAAtKoZySsYySvAoComI46DhYLm
+ggEg+MEAAJbxlfKe84iAmPANWkHsqjYA2MEAAAuqCoqgDfVQ/rgAErBqCQD80AATMIoBAP8QABQw
+qhEA6FUCDVXCgAAKZgL2pgAKsIgFAAhYAgyIEQmIAvhCBhWgBgUAwKFbW0ixZmlp9fpCCBXgBgUA
+wKFbW0SxZmlp9RrHVBvHVPx9Ah3gDAUA/igAFeAOFQBaMJrxUhgN4BwFAPxEZhWgBgUAwKFbWzcm
+bAFpafT8RGgV4AYFAMChW1sysWZpafXAoVtbMBbI9xjI49MPDwIAiIAayPX5kcAF4AxFAPoAgh3j
+7YUA+wYADHAOFQD5IAYVoA8FAFowgWagueQ7HnnOAoAAG8jVA0oMC5kIbakNLJJhKZ0B84AE/tIA
+nQAubQSO4MeL6O4BA3gTAACe8MDQ/ERmFeAKFQBbWxITyNgMXxED/wL+QgYV4AMFAMChW1sNsTNp
+OfX4QggVoAMFAMChW1sIsTNpOfUaxxgbxxn8fQId4AwFAP4oABXgDhUAWjBfZqAz+5FoBaAJhQDp
+JiMowASAAPIAAh2gCZUA0w/TD22aD+mCACRAEQAA6aZBJVAHAADRD2V/Qscr0Q8AAABsEAQjIAck
+IAYYyKMZxvzkMwwKLgKAAPigAEE/5AUA0w9tOg0jIkAEMwHjJkAhEAcAACiSwBrIrQqIAfk4BhWg
+AgUA0Q8AAABsEAQUxuzCMCpCAg8CAAoKQsinaKEFaKMCaaUX80bGDa/1tQBkIJFoITFoI19pJRhg
+APQAsDNkMOrAoVta0GP/xmQw38ChW1rNi0ILC0LrKe9xm/0AAMAg0Q8AAPVABbqSAJ0AwMH8gCYV
+oAUFAMChW1rCsVVpWfX8gCgV4AUFAMChW1q+sVVpWfVj/7tppVPA5P6AJhWgBQUAwKFbWrexVWlZ
+9f6AKBXgBQUAwKFbWrOxVWlZ9WP/j8ChW//RdaFiwFCVQcChW1qtsVVpWfX4gCgVoAUFAMChW1qo
+sVVpWfVj/2TAoVv/xnWhNykKAviAJhXgBQUAwKFbWqCxVWlZ9fqAKBWgBQUAwKFbWpyxVWlZ9WP/
+MgDAo1v/ufVf+iViAJ0AxyvRD8CjW/+1daHzwLP6gCYV4AUFAMChW1qPsVVpWfX8gCgVoAUFAMCh
+W1qLsVVpWfVj/u8AAABsEAYWxpXoWRAKQ8KAAOmIAgnPAoAACYgCGchMCCgCCYgC+MIGFaACBQDA
+oVtafLEiaSn1+sIIFaACBQDAoVtaeLEiaSn1+40SBeAMBQD+ACIdo+2FAOrGhBj4BIAAWi/O+gAC
+He/ytQAKsjvRDwAAbBAKG8g3giWIs4myirGaEZkSKBYD+2AIFeAMVQDrFgAhXByAACwWAwKNUQHd
+Co3Q+5BaBaADNQD8IAAGct0dAOfdEQ5mQoAA/YYADnOLBQBYAaoUxmXAUCVGIytCOyu8+/NggAXw
+CjUA+kAABfAMJQD/aAAVsA2lAFv/xcioxyvRDwAAAAAAAPoAYh2gCwUA/ABiHaANpQBb/71lr9/9
+kBYFofIpAOP/NgDIQQAACf8Ki8GKwojDmJOakpuRjMCckC/yAAL9UA/dEf4BAAdwCjUA/dAAFzC/
+AQD/cAAVsP8RAO27Ag/9woAA/8YAD3AMFQD/ZgANsA2lAFv/pWWvffIAAh2gBvUAwKFbWimxInYp
+9cCIJ0I6KkJBeotA/0egB9CaAQCaGZkY/UBAFaAaBQAMqjT6iCYVoAIFAMChW1ocsSJpKfX8iCgV
+4AIFAMChW1oXsSJpKfWLGYoYq6rAyHrDDyqs+/AAMA2iqgEAAAAAAAAKGkLsQiAj6/EAAPoAYh2i
+6gEA+9gAFzK9AQD/YAAVsN0ZAO67Ag7vgoAA/WYADfDMiQD7gAAWMA2lAP1mAA2xDAUA/WYADbAM
+BQBb/3RlrrnAIMChW1n5IiwBdin0+gCiHaALBQD8AAIdoA0FAFv/a2WulsAgwKFbWfEiLAF2KfT0
+hoYV4AIFAMChW1nssSJpKfX+hogV4AIFAMChW1nnsSJpKfUSx7TymOYVoAIFAMChW1niIiwBaSn0
++JjoFaACBQDAoVtZ3bEiaSn1wKFb/vzHm3mhOBXF5ipSwQOqAvq4JhWgAgUAwKFbWdSxImkp9fq4
+KBXgAgUAwKFbWdCxImkp9cDI/IRmFaACBQDRD8cl0Q8AbBAYhiSHJoUlHceXGseWG8eXiNOJ0ozR
+nBGZEpgTjdCdEFgBiwWaQfVAIUFSAJ0A+gACHaALBQAFzEdbWbLSoPuPGAWhCwUAWAGB+48UBaAL
+FQBYAX/7i4YFoAs1APx9Ah3gDDUA/gAiHaAPBQBaLwxmo+j7jwIFoCsFAFgBdB/HX8DgKvIeK+oH
++0AEBXH7BQALqgIq9h6I8Snq2wmIAZjxnvIu9gMax3X/4IYVoAt1AFgBZxvFqRnHciuyyYKSjZSP
+k+iSASDwQQAAmOGf4+3mBCDgQQAA88BGFaK7MQAMuwqJkOnmACsXwoAA67IAKVAEgABaK97qx2Md
+WASAAFgBUxvF4Ad6QwuqCSqhMAeLUSsWJApqKOG7Cg2ngoAA67IALVeCgABaK9HoXxR9GASAAAoJ
+QPgAIh2gAwUACYM4qjPqx1EZ2ASAAFgBQX83AbEz6sdOGdgEgABYAT3qx0wZ2ASAAFgBOiMSJPuO
+lAWgCwUAWAE2HMdI/46QBaALdQD6AKIdoAVlAAbMLOzrB3roBIAACq0CLnpS/cDyDaXftQAN2wLA
+2P3g0g2k6BUA3bD9ANINoAuVANvQGsc5WAEkHMc4jcGOwu/CAyDYwQAAn7Oesp2xjMCcsKtL67IA
+KVAEgABaK6LvpwZ9WASAALGrGsctWAEW/Y5aBeC3cQDrOwkA4QEAAAy7Co7Wj9eK1YnUiNOYw5nE
+msWfx57Gj9KO0S7GAS/GAi3SAJ3A67IAKVAEgABaK44WxUnTDytiPCxiNxrHG6y7WAEBHMcajcGO
+wu/CAyDZgQAAn7Oesp2xLMIALLYAC0sI67IAKVAEgABaK3/ANAOpN++XB3zQBIAAKpwBwH4HqzQa
+xwtYAPDrxwsZUASAAFordQOpN++XBnzQBIAAsZoFqzQaxwVYAOjrxwQZUASAAForbdOgJmI7/sEg
+D9CWAQB/pwGxo8iTfz8BsTP7jfgFoBsFAAO7NFgA28Az68b5GVAEgABaK2AGqwMLC0CrqxrG9lgA
+1fuN6gWiCwUAWADSHMbzjcGOwu/CAyDZwQAAn7MutgIttgEswgAstgCrS+uyAClQBIAAWitPA6k3
+75cGfNAEgACxmgWrNBrG5lgAwuvG5RlQBIAAWitHKQoKCak375cHfNAEgAAqnAHDvgurNBrG3lgA
+uPuNvAWgSwUAWAC1+424BaALJQBYALPAZevG2hlQBIAAWis3Bqk375cGfNAEgACxmgejNOrG1BnY
+BIAAWACp6sbSGdgEgABYAKYcxtCNwe7CAiDZ/QAA78IDJdgFAACfs56ynbGMwJywC0sI67IAKVAE
+gABaKyPAkwmpN++XBnzQBIAAsZoFqzQaxsJYAJXrxrEZUASAAForGsCcCak375cGfNAEgACxmger
+NBrGulgAjOvGuRlQBIAAWisR76cGfVgEgACxqxrGtVgAhfuNagWiCwUAWACCGsazG8azWACAwCDR
+D2iiCGijD2P72tEPAMCg/+9IDaALFQDAof/vIA2gCxUAbBAEFcU1pSUoUoAp+v8JOQMJiAEISAL4
+sAYVoAIFAMChW1iksSJpKfX4sAgVoAIFAMChW1igsSJpKfXRDwAAAAAAAABsEASLJBrGl1oq6xTG
+TvNAaB3g1gUA9oNGFaACBQDAoVtYkyIsAWkp9PiDSBWgAgUAwKFbWI+xImkp9cChW1iMGsZZ+gCC
+HeAMRQBb/9wpKtH4g0YV4AIFAMChW1iFIiwBaSn0+oNIFaACBQDAoVtYgLEiaSn18gACHaBVBQDA
+oVtYe7EidSn1KwrX+oNGFeACBQDAoVtYdrEiaSn1/INIFaACBQDAoVtYcrEiaSn1wCDAoVtYb7Ei
+aSX1LQrV/INGFeACBQDAoVtYaSIsAWkp9P6DSBWgAgUAwKFbWGWxImkp9cChW1hi9oNGFaACBQDA
+oVtYX7EiaSn1/oNIFeACBQDAoVtYWrEiaSn1wKFbWFgiCtHyg0YVoAIFAMChW1hUsSJpKfX4g0gV
+oAIFAMChW1hPsSJpKfX0DIId4AIFAMChW1hLsSJ1KfUaxkf6GEId4IwlAFv/mWQwDCIKAMChW1hD
+sSJzKfXziKAF4AIFAPAAOA2gNSUAwKpbWD2xInUhEYlGf5fwfJftKTISfpfnwCDRD8cl0Q9sEAQU
+xL4EJAjykAYV4AIFAMChW1gxsSJpKfX4kAgVoAIFAMChW1gssSJpKfXRDwBsEAYTxUkUxDXjMjIh
+49sAACzCVh3EfPxAphWiMx0A8kCGFeTMAQANzAqMwJwmGsYdGcYd+JkoFaALlQArJAeJkPggBhXi
+iAkAKCQDAYgIKIAA+EDGHaALNQBb/93AoVtYEvuMJAWgGwUAW//Z6sYLGdgEgABaKl4bxg4LOyzq
+xg0V2AkAAFv/0vWHiAXgAgUAwKFbWAWxInUp9SwKAfyQBhWgAgUAwKFbV/8iLAFpKfT8kAgV4AIF
+AMChW1f7sSJpKfX0DIId4AIFAMChW1f2sSJ1KfXAYNJgJkaAwKFbV/KxImkp9f6QCBWgAgUAwKFb
+V+2xImkp9fWL4AXgAgUAwKFbV+mxInUp9fuL2AWhCwUA/CACHaPthQD+ACIdoA8FAFotP/FO+A3g
+AgUAJTrowKFbV92xInUp9cDy/pgGFeACBQDAoVtX2LEiaSn1+JgIFaACBQDAoVtX0yIsAWkp9CIK
+AMChW1fQsSJpJfUpCgP4mAYV4AIFAMChW1fLIiwBaSn0+pgIFaACBQDAoVtXxrEiaSn1wCDAoVtX
+w7EiaSn1HcV2j9Ei6tsC/wGf0ZbSltOW1CzSBfp9Ah3uzpUA/4AEBjEjHQDs1gUpUASAAFoqB3+n
+AbGq+4t0Ba+6AQBb/3vrxakZUASAAFoqAX+nAbGq+4toBa+6AQBb/3X7i2QFoMuFAFv/cvuLYAWh
++0UAW/9vwCDRD8cl0Q9sEAQdw78bw7/TD60t/6BoHeACFQAqsnYPAgB/pxUssnD3gAAWMAkFAO3L
+W374BIAADN8M/0TAB5AOJQAssnEMzBB/y0zs/wwFdGKAAMCh/YdcBaALBQBbYhzGKtEPfafrKLJy
+CAhfDIgQf4PfnjCfQP5gCBWgClUA/YdIBaALBQBbYhHAINEPmTD8gAYV7/+OAJIw/oAGFe//ZgBs
+EAQcw5b8Q+AV7+4FAA7dASrCgujCfSHYfQAADrsB/U8ADXC7TQDqsgEEAIGAAC/CgS7Cfg/+OX4r
+EMAgwKD9hxAFoAtlAFth+dEPIsaCerj3Y//nAAAAbBAGW12GFcVu84osBaAJBQD/QGgdoAMVAPqt
+hh2gCIUAbYoSAJAEDgob76cHdNgFAAArJn+xmfWJggWgBrUA88AGD9AH1QDAMPPACX+SAJ0A88AN
+B1IAnQDzwBCHEgCdAPPAE/bSAJ0A88AWRpIAnQDzwBiuUgCdAHjnTyoaMP2GOgWgC7UAW12H6kXC
+LWAEgAD6YAAEt7oBAPdhRg3gDuUAfrECab4KL0ABwIgI/wIvRAH3IOYNo6wBAGmqCitAAcHADLsC
+K0QBLlBsHMU+LSJ/IyaAK1BtmxAqUG6aESlQb+kWAin4BIAA+K4QFaALBQD4IGYVoApFAFthttEP
+AAAAAAAqCnD9hfYFoAvFAFtdZRzC+P1AaB3gGyUA/JdkHeCKRQBbXV8qVG0rQbsjVHXzQGgd4AgF
+APiuJh2nqwEA90GGDeczAQDAnnmhAmmuDipAASwKCA8CAAyqAipEAf6tkBWjqwEA90ATDCIAnQD1
+QBLNEgCdAGP+zQAqCpD9hboFoBsFAFtdRxzC2v1AaB3gG2UA/JeEHeCqRQBbXUEqVG4rQbzyrkYd
+4A8lAP6uph3n6gEA/mAAQberAQB3oQfAjnihAmmuCilAAcCoCpkCKUQBCwpD90AQFCIAnQD1QA/V
+EgCdAP6tkBWv+ZoAAAAAAAAAKgqw/YV+BaAbRQBbXSgcwrz9QGgd4BulAPyXpB3gykUAW10jKlRv
+K0G98q5mHef6AQD+YABB8A41AP6uph2nqwEAd6EHwI54oQJprgopQAHAqAqZAilEAQsKQ/dADMwi
+AJ0A9UAMjRIAnQAuUGzTD/Hf78cSAJ0AKgrQ/YVCBaAbhQBbXQocwp79QGgd4BvlAPyXxB3g6kUA
+W10FKlRwK0G+8q6GHeAPRQD+rqYd5+oBAP5gAEG3qwEAd6EHwI54oQJprgopQAHAqAqZAilEAQsK
+Q/dACYwiAJ0A9UAJTRIAnQAuUGzx3+xW0gCdACoK8P2FBgWgG8UAW1zt+pfkHae6AQDnsQx9YASA
+AMDefbECab4KLkABwPgP7gIuRAEKCEP3AAeUIgCdAAwJQ/UgBz0SAJ0ALlBs8d/qBpIAnQAqGgj9
+hN4FoAsVAFtc2PqYBB2nugEA57EMfWAEgADA3n2xAmm+DS5AAcD4DwIAD+4CLkQBCghD9wAFbCIA
+nQAMCUP1IAUVEgCdAC5QbPHf555SAJ0AKhoc/YSyBaALZQBbXMP6mCQdp7oBAOexDH1gBIAAwN59
+sQJpvgouQAHA+A/uAi5EAQoIQ3aBawwJQ2iaZS5QbGP8qypAAcGwC6oC+oAmHa/2fgAsQAHB0A3M
+AvyAJh2v9/oALkABwfAP7gL+gCYdr/meAChAAcGQCYgC+IAmHa/7PgAqQAHBsAuqAvqAJh2v/EYA
+LEABwdANzAL8gCYdr/1aAC5AAcHwD+4C/oAmHa/+OgAAAABsEAoZwhAjCgDnHAEooASAAOqQgCCw
+CQAA9YUkBeACBQAAMAQKCBt/h1P6YGgdoAsFAFtb0ZoY60QAC+AEgAD8wGgd4A4FAFtbuytAACoS
+CC1AASxBAQWqC+jdEA3ZAoAA7bsCDk0CgAAJKQILmQIppsAZwfQszAEMIggqkIC0ROZsBCGYBQAA
+6TiVY7gRAADzQAYP3/M1APNAB7eSAJ0A80AJT1IAnQDzQAr3EgCdAPNADI7SAJ0A80AONpIAnQDz
+QA/OUgCdAPNAEXYSAJ0AFsLx9iBoHeALBQD6ISYV4AQFACxgfdMP8YTADeADFQDqEgkp2ASAAFtb
+n9igKXAAKnABLnEBBYgL6KoQDMkCgADqmQIPfQKAAA8vAgn/Ai+GwC1gfS7sAe4iCAIgBQAA7UO8
+cZgFAACJGed8BCMwBQAA+SAgFeAEBQDpFgksplQAANEPACoKfPwf4h2gG0UAW1xA7MQJFVv9AADu
+rhEN34KAAArrOC3CkBnBstMPA90BKpCADbsCK8aQ8V/4l5IAnQAqCpz8H+IdoBuFAFtcMe3CxRVj
+/QAA7q8RDmeCgAAK/Dgu0pAZwaMD7gEqkIAOzAIs1pDxX/b/UgCdACoKvPwf4h2gG8UAW1wi7sPs
+FWv9AADuqBEO74KAAAqNOC/ikBnBlNMPA/8BKpCAD90CLeaQ8V/1VxIAnQAqCuD8H+IdoAsFAFtc
+E+/D3hVz/QAA7qkRD3eCgAAKnjgo8pAZwYUDiAEqkIAI7gIu9pDxX/O+0gCdACoaAPwf4h2gC0UA
+W1wE6MPQFXv9AADurBEP/4KAAArPOCuCkBnBdtMPA7sBKpCAC/8CL4aQ8V/yFpIAnQAqGhT8H+Id
+oAuVAFtb9evDwhVD/QAA7q0RDEeCgAAK2DgsspAZwWcDzAEqkIAMiAIotpDxX/B+UgCdACoaKPwf
+4h2gC+UAW1vm68O0FUv9AADurBEMz4KAAArJOCyykBrBWNMPA8wBKqCADJkCKbaQ8V/u1hIAnQAq
+Gjz8H+IdoBs1AFtb1xvDpuqs/y1wBIAA7u0RDVeCgAAO2jgsspADzAEMqgL7cgYVr/aWAABsEAQY
+wbQVwWkTwan5D7AVoAYVAPmHMAXv9/UA+gGiHeASFQDzAAsP0AQFAPUj5hWgGnUA9SPGFaAcNQD1
+MAYdoAEKAABr1gJr1BRo2BFo2Q5o2j59IgJ72gV9ohp80hcuUoQAQQQAbRoA3REH3wMP7gEO3QIt
+VoSxROhLKmGYCQAALTGQ0w8NPURo0dJr1LRq0rHaQFtbcvoC4h2gC9UA//9QDaAcNQDzgwQFoAMF
+APYCgh3gJnUA8AC8DaAUBQAACjpEaKJQaKp5d6ECaaEK+mBoHaALFQBbWzPjPAEiI/0AAORAhmEQ
+CQAAKiGQdqnPGMF4KIJaGcGoCOhRAYgRCYgCKVKWHMNcDJkBCYgC+LLGFa//IgAA2jBbW0plr7ov
+IZAdw1T9sBAVov8BAPvgBADQDhUAAO4aDswC/bAGHa/+bgDaMFtbP2WvjiohkBvDSwoKQqurK7CA
+CwtEW1seHcNFwM/9sAYdr/3KAFtcFVtcCx/DQCr2Hiv2Hy5Sh/6w5hWgAgUA0Q/AINEPAAAAbBAG
+GsHzG8GcHMFH+AACHaAZBQDTD22aFQuJAinG+enC+SVQCQAAsYgJCU0ppb0WwckmYcIYwcbjwX0b
+NcKAAKhm+4ZWBaALFQD8ACIdoA2lAPhAAh2gDgUA+GdGFaAPBQBaKmsZwTcokH7iwyIbIASAAPeG
+QgXgCxUA+2kADDAFBQDolH4tFIoAAJYQi0KKQSs2O4lAKjY8KTY9GsMV+gAiHeAMFQD+uAATMA2l
+APbGAAxwDgUA+GdGFaAPBQBaKlRmolL7hhQFoAsVAPwBQh3gDgUA8sYADjAPBQD8Z0YVoAwVAFoq
+SuaiLGKoBQAA6V6ZYiAxAACNEPeGAAXgBQUA4sL/FugbAADtFgAtEFIAAA3UAotCikErNjuJQCo2
+PCk2PRrC8/oAIh3gDBUA/rgAEzANpQDyxgAMMA4FAPhnRhWgDwUAWioyZqHK+4XQBaALFQD8AUId
+4A4FAPbGAA5wDwUA/GdGFaAMFQBaKijmoaRiqAUAAOlemWIgMQAAjRDAUObA2BboGwAA7RYALQxC
+AADU0I1EjEMtNjsrQgIsNjwqQgErNj0pQgAqNj4pNj8aws/6ACId4AwVAP64ABQwDaUA9wYADDAO
+BQD4Z0YVoA8FAFoqDuahOGKoBQAA5EwUKvbIAACEEPeCagWgBQUALU0KjdQsTQqMwy02OytNCouy
+LDY8Kk0KiqErNj0pTQqJkCo2Pik2PxrCtfoAIh3gDBUA/rgAFDANpQD3BgAMMA4FAPhnRhWgDwUA
+Win05qDYYqgFAADkTBQq5pgAAIQQ94IGBaAFBQAtTQwt0iQsTQwswiMtNjsrTQwrsiIsNjwqTQwq
+oiErNj0pTQwpkiAqNj4pNj8awpr6ACId4AwVAP64ABQwDaUA9wYADDAOBQD4Z0YVoA8FAFop2eag
+b2KoBQAA5EwUKuaEAAAewKEu4H3v5119EASAABLAlygi4C8i4PuFGAXjmCEA+SAgFePI4QD9gCAV
+o4hBAOiMAS5hAoAA6/8BDEYCgADsiAIMzwKAAAn/Agj/Au8m4C0QBIAA0Q/SoNEP0qDRD9Kg0Q/S
+oNEPG8CBKbLgLbLg+HAAB3PJQQDszAIncAkAAODuEQ5mAoAA/4YADjP5IQDuwm4X+AkAAAz/Ef+G
+AA5zmQEA7t0BBMgJAAANmQIMmQIptuDRDwBsEAQUwmUTwRD1hMgF4AgVAPiQBhWgAgUA2iBbWl8K
+CUFpkSPqKREFcIKAAAMAh6WZCQJhCQJhCQJhCQJh+kBoHaALBQBbWlCxImkoyypCgBvCVAuqAvqQ
+BhWgAgUA0Q9sEARb/MoawHLTDymihRzCTf0gBASwKwUAC5kCKaaFKaKXGMCYG8DeHsBwKICA+yYA
+DP/99QD5UuYV7/rVAP0DABFQCYUAGMIrbZoNKYKQCpkB6YaQJEATAAAt5iAt5iEt5iIt5iMt5iQt
+5iUt5ib9xOYV4AIFANEPAAAAbBAIAioCWzt+lBAcwR/8QGgd4AuFAO80AA0wBIAA/sBoHaAKVQBb
+XpfAgBXAkKVlI1aBJFaCKFaDCOQWmBQBAgAjUoMD6jD6wGgdoQslAFs7aArqMCdSiMh82mAD6jAr
+GgJbO2MK6jCIFAjkFgOqDFs7V9ig7SQAC/AEgAD9gggFoApVAO9SiCpPQoAACJks+CAGFeALhQBb
+XnrAINEPAGwQBBPCCv1/WgWgDRUA+mBoHaAYFQBtigoroAV7IAJ/t2K8qhrB9i7AgCmggC2keP9Q
+MBXgG+UAebMFDe4CLsSALaCC/2G2DeAJJQAowIAJiAIoxIAooIP9YbYN4A9FAC7AgA/uAi7EgPli
+lg2gCoUAKcCACpkC+ZAGHeACBQDRD8Ag0Q+OoBzB6v3AEBXgC4UA/8AwFaAKJQBbXlLZMP4CIh3g
++uUA0w9t+g0okAUKiAHolAUkyDEAAMcr0Q8AAGwQBiggAPpAaB2giSUA6YEIcRATAADHLtEPJqwW
+8sAHuqIAnQAUwdQTwdOTEfODpgXghQUA+iAGFaABsgC8M3QxVSgwBQWIAekwBCx3xAAAd5np2mD6
+YAgV4AwlAFtZyvwAAh2v66UACss4Zr/OjREsMQOIMtpw7cwIA1gNAAALgADxSqgN4A8VAC4wBdMP
+D+4CLjQFJ2AC48G5E8ANAACoZnJrctsw+sBoHaAMJQBbWbbjwa4VAGmAAPbAUBXv/hIAAIkQtGp6
+m10JaQy0mf8iAAfQCgUAixDqsAAl2AUAAJsQCRsUyriIEC2AAOyAASXL/QAA6t0IBEAJAABtmQ4p
+gACtyuyAASRACQAAqp0NyggewZsq5H0qCoBb/4nSoNEPAAAAAAAA//+YDaAKBQCOMBzBlP3AEBXg
+CiUA/8AwFaALhQBbXfdj/0kAbBAEGcGOKpJ/KZKACasRq5n7IAYVoBi1ACiUBFtYrMCgW1ilG7+3
+GsGGKraDW1hqwCDRD2wQBPOB3AXgqaUA9ADCHaAFBQAFCT8FBj8FBz8FCj8ECD8JBD8FBT/4aqgV
+oIoFAAgAP9MPW1zYGMF4G8F1CgE/7cF0GvAEgAD+A+Id4AoVAPtvph2gDIUA5bR+JtGhAADstHwm
+ydEAAPwBoh2gCwUA0w/TD23KPu6GYSXgWQAA6YZgJECBAADphlcm6IEAAO6GViXYBQAA6oZVJMiB
+AADqhlQlUIEAAC7UYC7UYS7WGQ/MNizUYvRvhh2gDSUALTR9W1h6GL9KH8FVHsFVCACHDwJhDwJh
+DgJhDgJh0Q8AbBAEGb/UIpIg+33sBeAOBQDwVVAN7//1APfAaB2gCAUA9gACHeAEBQD8ACIdoArV
+AG0ITi2S1yKS361tCdMRoyKdIC8keislK5gvlywmJCIsJCAsJCEuJA32QYYdoAWFACUkBSMhEiQl
+EyokBKNEgyuCLi2SIKN34ogIAzAFAAB9awRj/6oAACKSIWQgmRXBLfX/4h2gCgUA8AEADaAGBQAA
+ACTUDCzUDSbUIpjfK9UrL9R6l9zzoWgV74IFACLUICLUIYLeo3cjkiGwquKICAMwBQAA42tPdmAF
+AAAiktgtkt+iYgkjEaPd86AGFaAD5QDzoIYd4AOFAOPUBS19LgAAKlB+9IAgFaAMFQDlr5JiqAUA
+AG0IDCpQfrFE5a+CYqgFAABj/+wokiLLh/V90gXgBgUA+ADiHaAH9QBtCCIsktkrkt+sbAnNEa27
+nLAlthcutA0otAwntAQqkiKxZnprAmP/1sAg0Q/Y4P/8YA2gBwUAbBAEGL9xHMD2E8DyG8D0H8Dy
+Lzbv+n3GFeAKFQAqNvUrNvArNvMsNvb4fiYVoA0FAPh+hhWgDhUAWzn2KTISij6LPYw8jTuPOYg4
+jjooNsqo/4g/LzbLr+4uNsyu3S8yES02za3MLjIQLDbOrLstMhorNs+rqiwyGyo20KqZKzIcKTbR
+qYgqMiAoNtKo/ykyIS8206/uKDIiLjbUrt0vMiMtNtWtzC4yJCw21qy7LTIlKzbXq6osMicqNtiq
+mSsyKCk22QmICCg22ioyKwj/CP57ZhXgCQUAKTbJD+4ILjbcDt0ILTbdDcwILDbeDLsIKzbfC6oI
+KjbgW1f56TLvLWgEgADqMvQu7kKAAP2j4BXv7gUADt0B/U8ADX+LBQDrogEEgJGAAC8y8y4y8NMP
+D/45fisawCDAoP19JAWgC2UAW10DySTyfCYVoAIFANEPIjb0e6jvY//dAAAA8nwmFa/yRQDRDwAA
+bBAEE74mGr+7GL+7IzJ/9YD4BaACBQDlvn8UWUEAAOQwaWQ6wQAApDbtwJQVSUEAACxAgAwMRA3M
+CozALkC470C4LgAigAAAAAAAAAD2s4YV4ACuAC1AuGnTIPizhhXgAHYAaeUV+rOGFaAASgBp+Ar6
+s4YV4AAeAChWnO3AgBIgBQAA5kmpcqhRAADRDwAAbBAEE8B7+3xMBaAGBQDkvmERqCcAACamgSam
+gyamgCamgigwcf98wAWg31UA/KmIFeAZBQDppookfKKAAA/dKB+/Mg7dLChCwA+IAQjYAihGwC5C
+4A/uAQ7dAi1G4CxC4BvAYf2AyAWgCgUAW/4ZwKH9faoFoAsFAFv+Flv99um+gB0L6gAAwCgqko8K
+CkMqNHAokoobv30CiAIolor4EQId4AgFAG2aDQuJCyaWQOaWQSRABQAA2mBb/c9moUBb/PFmoToc
+vgYuMHEbvkX4BAIdoQ8FAPiwJB2g7gEA/+0ADbQNBQAO3DksVX4rVX9b/IFmoQopUkwXvov6DIId
+4Ao1AAuZLAqZLPj3hhXgCgUAW1fD7DBxLQdCAAB/xwwdvgzA4dMPLtbALdLAH7870w8PAgAv8p/x
+4JAN4AoFAMCgW1eg8UuIDeD89QD7e2QFoAhFANMPbYoMK6CAsar9YAWVIgCdACkKACowcQ8CAPFA
+BU/SAJ0AG8AgK3bAK3bAEr2iFb3L94A6BeADBQAsIHwAMAQPAgAMDBt/z06xM+VdICmnrAAAJkZy
+LUJ2+lAQFa/+tQAO3QH8jsYV4AMFAAAwBAoPG3/3GPpgaB2gCwUAW1da/GBoHaAL9QBbUkgqIICx
+M2k42GAAGQAAKFKAB4gC6FaAKdAEgABbV1lj/5zSoNEPGb4fKpacW/tuwCDRDwAAAP/9RA2nmx0A
+HL/5K1JMDLssK7z+CxsU6jCMLd7CgAALmwICuwLrdsAlJDEAAPlf+dnSAJ0ALXLAxuL/oAQGsA5V
+AA7dAvz4BhXv/I4AAAAAbBAIEr3YKCB9E7/l+X/MBePqhQDmIjEkfHSAACY2fiY2fyk2gApqLCom
+IfpEBhWgAgUA0Q8qGmz8P+IdoBslAFtX4PVAaB3gG7UA+i2CHaAc9QBbV9zAtPVAaB2gDPUA9CCG
+FeF6BQBbV9bBsvVAaB3gDBUA9CBmFaF6BQBbV9H1QGgdoBulAPovgh2gDDUAW1fMF73gGb/EB1sJ
+K7Gw5mwKDWgEgADkQUpuV8KAAAusLCYiMfugCADRaoUA/J8ADrAbBQD8b8YV4fz1AFtXvfVAaB3g
+G5UA+i0CHaAc9QBbV7jBvvVAaB2gDPUA9CBGFeFqhQBbV7PBsPVAaB3gDBUA9CAmFaFqxQBbV671
+QGgdoBvFAPovgh2gDDUAW1epB1kJKZGw5msKDWgEgADkQN9t38KAAAm8LPugCADResUA/J8ADrAb
+5QD8b+YV4AwVAFtXnPVAaB3gG0UA/D/iHaF6BQBbV5f1QGgdoBvVAPouAh2gHPUAW1eTKwoC90Bo
+HaAM9QD0IAYVoXpFAFtXjfVAaB2gG0UA+i6CHaAMFQBbV4gsIjEbv4H2gACE8A0VAAXVOQXLOeu6
+Cg1wBIAA6ZGwLVfCgADrMn8nAymAAAmtLOwyfi7vgoAA/HAGFePthQANuywNzCwsJiH6RAYV4AIF
+ANEPjhSMEwfuCQnMCSzBfi7hwAysLA7MKAvMLGP+oB+/ZY4SjBEH7gkPzAkswX4u4cAMvCwOzCgJ
+zCxj/wiIEB+/XSwyfgeICQ9vCS/xfvkYBBWj64UAC8wsD68sCP8oKDJ/Cf8s7CYhL/+CgAAvNoAL
+iCz4RAYVoAIFANEPbBAGwKD6AQId4Az1AFtXURi/TAGiCg8CAIuBLIIALBYAKxYB6IICLWgEgADo
+FgIlGc+AACIiABO9JvBF6A3kCAUAcoJu8miIFaQKBQBbVz79QGgdoQkFAOokAA5ABIAADwIA0w9t
+mhLpggAkQBEAAAkJjummACVQEQAA+4BoHaQLBQBbXR3iNkQhAKGAANogW/0z0qDHnnkhYNEP0Q/H
+K9EPAMCi/X5OBaALhQBbW3XHK9EPIjJEGr0VW1cj2CD7QGgd4QwFAG3KEY2w7Q0WBdgRAADthgAk
+QBEAACtKAFtdBuI2RCF9wYAAAioCW/0c56+hbRAEgABj/0nAov1+JAWgC4UAW1tf0Q8AAGwQBBO8
+8A8CAPJoaBWgCgUAW1cK/UBoHaCJBQDqJAAOQASAAA8CANMPbZoP6YIAJEARAADppgAlUBEAAPuA
+aB2iCwUAW1zp4jZDIQBJgADAINEPAMcr0Q9sEAYZvvkevIYdvvgtlhn/I0YVoAsFAPsmxB3gCkUA
+KpRuGLzzHL7yKZLmKIKuKRYA+CAmFaCPBQBbWznAINEPbBAEGb7sGr7sFr7sK5KBK6Z/KZKC+VAG
+FeADhQDy0qYV4AhFAChmoihmoShmqChmsvjVxhWgBwUAJ2bC93mKBeAIFQAoZrAoZqsSvMMcvIYj
+cH0iIoH/eQgF5A0FAPhmAAow4wEA7tw5ATwqgAAsZXrRDwAkdH30AAACNAIFAAQvOS9letEPAGwQ
+BBu+zRq+zRi+zcDA6rZ/JVEDAAD7D+YVoIuFAFtVdR28oBy+yOzWQyZgCwAALNZE0Q9sEAQavS3r
+vdwRDVkAAGgibuSQe2SQBQAA/EJgEVAEFQBgADhpZAUFqAgnhgBySyzqNAAKWASAAFtZV+hhFGIg
+BQAA5akICxd0AAD3IAQd7/96AKWr92AGHe//UgDRDwAsokYpsoOjzAnMEeyZCAMNzQAAaGJyaWTj
+pZ2X0NEPAOhANWIQBQAAckOkY//OAAAsokYpsoOjzOnMEQIgBQAA7JkIAwyBAABoYiJoZCnyn/vz
+ogCdAGP/oxm9Gqk5KZB9Y/9MpZr3QAYd7/+SAKWb92AEHe//agClnPeABhXv/0IApZ0n1ADRD6We
+J+UA0Q8gAw3gDMAABiAGcVQgAw3kCMAADCAGcVQgAw3oIMAAECAGcNwgAw3sBsAAOCAGcrggAw3w
+CMAAPCAGcVQgAw30AsAAQCAGcrggAw34CMAARCAGcVQgAw38CIAASCAGceQgAw4AGIAAXCAGceQg
+Aw4EGIAAbCAGceQgAw4IGIAAfCAGceQgAw4MGIAAjCAGceQgAw4QGIAA3CAGceQgAw4UGIAA6CAG
+ceQgAw4YGIAA9CAGceQgAw4cGIABACAGceQgAw4gCIABPCAGceRod19iY204NDM0X2NoZWNrcmFt
+OiBTdGFydAoAAAAAAFBIWSBwcm9jZXNzb3Igbm90IHJ1bm5pbmcsIHN0aWxsIGluIHJlc2V0IGZv
+ciA1bXMsIHBvcnRfYml0X21hcD0ldSAKAAAAAAAAAAAAAAAAUEhZIEZXIGhhcyBiYWQgQ1JDLCBv
+a19jcmM9JXUKAABQSFkgZmlybXdhcmUgbG9hZCBzdWNjZXNzZnVsIQoAAGh3X2JjbTg0ODM0X2xv
+YWRzZXF1ZW5jZTogU3RhcnRlZAoAAAAAAAAAAAAAAAAAAGh3X2JjbTg0ODM0X2xvYWRzZXF1ZW5j
+ZTogVXBsb2FkIGltYWdlIHRvIFBIWSBvbi1jaGlwIG1lbW9yCgAAAABod19iY204NDgzNF9sb2Fk
+c2VxdWVuY2U6IGRvbmUgbG9hZGluZyBpbWFnZSAoaSA9ICV1KQoAAAAAAAAAAAAAaHdfYmNtODQz
+NF9sb3dwb3dlclsldV06IGVuYWJsZT0lZAoAAAAAAAAAAAAAAAAAaHdfYmNtODQzNF9sb3dwb3dl
+clsldV0sIGZhaWxlZCB0byBzZXQgMzAuMHg0MDBBIGJpdCA3IHNpbmNlIDMwLjB4NDAwRSBiaXQ9
+MSBhZnRlciA1bXMsCXJlZz0leAoAaHdfY2w0NV91cGRfc3BkX2FkdiAlI3gKAAAAAAAAAABod19h
+cTEyMDJfbGlua191cFsldV0gdXAKAAAAAAAAAHBbJXVdIFBIWSBPVkVSSEVBVEVEIC0gZm9yY2Vk
+IHBvd2VyIGRvd24gKHRlbXA9JWQpCgAAAAAAAAAAAAAAAABGTEFTSCBub3QgcmVhZHk6IGkgJXUg
+bnZyUmVnICUjeAoAAAAAAAAAAAAAAAAAAABBUV9GTEFTSF9SZWFkeSAtIFRpbWVvdXQgKDEpCgAA
+AEFRX0ZMQVNIX1JlYWR5IC0gVGltZW91dCAoMikKAAAACUFRX1JldHVybkNvbnRyb2xPZkZMQVNI
+CgAAAAAAAABnYXRoZXJfdGFza3NfdG9fdHhfbGlzdDogdGFzayBpbiB1c2UgWyV1XQoAAAAAAABn
+YXRoZXJfdGFza3NfdG9fdHhfbGlzdDogaWR4IFsldV0sIHRhc2sgZmlkIFsweCV4XSwgdGFzayBz
+dGF0ZSBbMHgleF0sIHRhc2sgY29ubiBbMHgleF0sIHRhc2sgZmZsYWdzIFsweCV4XSwgY29ubiBm
+aWQgWzB4JXhdLCBkZHAgWyVkXQoAAAAAAAAAAABnYXRoZXJfdGFza3NfdG9fdHhfbGlzdDogdGFz
+ayBbMHgleF0sIHN0YXRlIFsweCV4XSBvbiBjb25uIFsweCV4XSBub3QgdmFsaWQgdG8gZ2F0aGVy
+LCBza2lwcGluZwoAAAAAAAAAAAAAAAAAAAAAZ2F0aGVyX3Rhc2tzX3RvX3R4X2xpc3Q6IHRhc2sg
+WzB4JXhdLCBzdGlsbCBxdWV1ZWQgb24gdHggcGVuZGluZyBsaXN0LiBSZW1vdmluZyBpdC4KAAAA
+AAAAAAAAAAAAZ2F0aGVyX3Rhc2tzX3RvX3R4X2xpc3Q6IGNvbm5fZmMtPmZsb3djX2ZsYWdzIFsw
+eCV4XSwgbGlzdF9lbXB0eSBbMHgleF0sIGFkZF90YXNrX2NvdW50IFsweCV4XQoAdG9fdHhfbGlz
+dDogbm8gdGFzayB0byBjbG9zZSBmb3IgY29ubiBbMHgleF0sIGJhaWxpbmcgdG8gcmVjb3Zlcnkg
+c3RhdGUgWzB4JXhdCgBhdXRoZW50aWNhdGVfdGFyZ2V0OiBLRVlfQ0hBUF9SRVNQIC0gWzB4JXgl
+eCV4JXgleCV4JXgleF0KAAAAAAAAYXV0aGVudGljYXRlX3RhcmdldDogS0VZX0NIQVBfUkVTUCAt
+IFsweCV4JXgleCV4JXgleCV4JXhdCgAAAAAAAGF1dGhlbnRpY2F0ZV90YXJnZXQ6IEluY29ycmVj
+dCBwYXNzd29yZAoAAAAAAAAAAENIQVBfQzogZGlnZXN0IGV4cGFuc2lvbiBlcnJvcgoAQ0hBUF9O
+OiBUYXJnZXQgdXNlcmlkIG1pc21hdGNoCgBDSEFQX1I6IGRpZ2VzdCBleHBhbnNpb24gZXJyb3IK
+AGlTQ1NJIFNlYy1wYXJhbXMgcmVjZWl2ZWRoYXZlIGVycm9ycyEhCgAAAAAAAAAAAFRhcmdldCBt
+b3ZlZCB0ZW1wLiBjb25uICV4LCBzZXNzICV4CgAAAAAAAAAAAAAAAExvZ2luIEZhaWxlZCEhLiBj
+b25uX2ZjIFsweCV4XSwgc2Vzc19mYyBbMHgleF0sIHN0YXR1c19jbGFzcyBbMHgleF0KAAAAAAAA
+AAAAAAAAUHJvdG9jb2wgRXJyb3IgY2JpdCAlZCB0Yml0ICVkIGNzZyAlZCBuc2cgJWQKAAAAcmVj
+dl9ub3BpbjogY3RybCB0YXNrIGFscmVhZHkgcGVuZGluZwoAAAAAAAAAAAAAb2ZsZF9yeF9kYXRh
+OiBhaWVlLCBpc2NzaSBjb25uIFsweCV4XSBmb3Igc2VzcyBbMHgleF0sIHR5cGUgWzB4JXhdIHRy
+YW5zaXRlZCBpbiB0b2UgbW9kZS4gS2lja2luZyByZWNvdmVyeSAKAAAAAG9mbGRfcnhfZGF0YTog
+Y29ubiB0aWQgWzB4JXhdLCByeF9kYXRhLT5zZXEgWzB4JXhdLCByeF9kYXRhLT5sZW4gWzB4JXhd
+LCByeF9kYXRhLT5zdGF0dXMgWzB4JXhdCgAAAAAAAAAAAAAAAAAAAABvZmxkX3J4X2RhdGE6IGNz
+ayB7IGlkIFsweCV4XSwgY3NvY2tfb2Zmc2V0IFsweCV4XSwgZGxlbiBbMHgleF0gfQoAAAAAAAAA
+AAAAAAAAAGFjdF9lc3Q6IHRjYl9mYyBbMHgleF0sIGZsb3djX2ZvaXNjc2lfY29ubl9mbGFncyBb
+MHgleF0KAAAAAAAAAABhY3RfZXN0YWI6IHRjYl9mYy0+Zmxvd2NfYnVmIFsweCV4XSwgdGNiX2Zj
+LT5mbG93Y190eXBlIFsweCV4XSB0Y2JfZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgbnBhZ2VzIFsw
+eCV4XSwgZmxvd2NfdHBfc25kX21heCBbMHgleF0KAAAAAAAAAAAAAAAAAABhY3RfZXN0YWI6IGF0
+aWQgWzB4JXhdLCB0aWQgWzB4JXhdLCBvcCBbMHgleF0sIHJjdl9pc24gWzB4JXhdLCBzbmRfaXNu
+IFsweCV4XSwgY3NvY2stPmZsb3djX3N0YXRlIFsweCV4XSwgdGNwX29wdCBbMHgleF0sIHRjYl9m
+Yy0+Zmxvd2NfaWQgWzB4JXhdIAoAAAAAAAAAAAAAAAAAY3NrX2ZjLT5mbG93Y19jc29ja19jb29r
+aWUgWzB4JXhdIAoAAAAAAAAAAAAAAAAAY2huZXRfcXVldWVfeG1pdDogZmMtPmZsb3djX2lkIFsw
+eCV4XSwgYnVmX2xlbiBbMHgleF0sIGJ1ZmZlcmVkIFsweCV4XSwgZmlmby5udW1fYnl0ZXMgWyUw
+eF0KAAAAbDNpbjRfZGV2X2NvbmZpZzogd3ItPnBhcmFtLnZsYW5pZCBbJXVdLCBsMmRldl9mYy0+
+Zmxvd2NfbmV0X2wyZGV2X3ZsYW5kZXYgWzB4JXhdCgAAAAAAAAAAAAAAAAAAbmV0X2wzaW40X2Rl
+dl9jb25maWc6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIGFkZHJlc3MgYWxyZWFkeSB1c2Vk
+IGJ5IHBvcnQgJWQKAAAAAAAAAAAAAAAAAAAAbmV0X2wzaW40X2Rldl9jb25maWc6ICBhZGRyIFsw
+eCV4XSwgbWFzayBbMHgleF0sIGd3IFsweCV4XSwgcmVmX2NudCBbMHgleF0gaW4gdXNlCgAAAAAA
+AAAAAAAAAAAAd3JoX2NobmV0X2lmY29uZjogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgbDJk
+ZXZfZmMtPmZsb3djX3R5cGUgWyUweF0sIGlmY29uZl93ci0+c3Vib3AgWzB4JXhdCgAAAAAAAAAA
+AAAAAAAAAHdyaF9jaG5ldF9pZmNvbmY6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIHVua25v
+d24gc3Vib3AgWzB4JXhdCgAAAAAAAAAAAAAAAAAAd3JoX2NobmV0X2lmY29uZjogbDJkZXZfZmMt
+PmZsb3djX2lkIFsweCV4XSwgcmMgJWQKAAAAAAAAAAAAAAAAAG5ldGlmX2lwX2NvbmZsaWN0X3Rp
+bWVyX2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBpbmRldmN0eHQtPnN0YXRlIFslZF0s
+IGluZGV2Y3R4dC0+cmV0cnlfY250IFslZF0KAAAAAAAAAABuZXRpZl9pcF9jb25mbGljdF90aW1l
+cl9jYjogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgaW5kZXZjdHh0IFsweCV4XSwgaW4gZnJl
+ZSBzdGF0ZQoAAAAAAAAAAABjbWRoX2NobmV0X2lmYWNlOiBmYyBbMHgleF0sIGZjLT5mbG93Y19p
+ZCBbMHgleF0sIGZjLT5mbG93Y190eXBlIFsweCV4XSwgcCBbMHgleF0sIGxlbjE2IFsldV0sIGxv
+YyBbMHgleF0KAAAAAAAAY21kaF9jaG5ldF9pZmFjZTpsMmRldl9mYyBbMHgleF0sIGwyZGV2X2Zj
+LT5mbG93Y19pZCBbMHgleF0sIGwyZGV2LT5mbG93Y190eXBlIFsldV0sIGwyZGV2X2ZjLT5mbG93
+Y19uZXRfbDJkZXZfZmxhZ3MgWyUweF0KAAAAAABjbWRoX2NobmV0X2lmYWNlOiByMlswXSAldSBy
+MlsxXSAldQoAAAAAAAAAAAAAAABjbWRoX2NobmV0X2lmYWNlOiBsMmRldl9mYy0+Zmxvd2NfbmV0
+X2wyZGV2X2ZsYWdzIGNoYW5nZWQgZnJvbSBbJTB4XSB0byBbJTB4XSwgcmMgWyVkXQoAAAAAAAAA
+AABjaG5ldF9sMmRldl91cF9tYl9jYjogcmMgWyVkXSwgcG9ydCBbJXVdLCBzdGF0ZSBbJXVdLCBj
+b29raWUgWzB4JXhdCgAAAAAAAAAAAAAAAGRoY3BfcHJvY2Vzc19jYjogbDJkZXZfZmMtPmZsb3dj
+X2lkIFsweCV4XSwgZGhjdHh0LT5zdGF0ZSBbJTB4XSwgZGhjdHh0LT5ydHJ5X2NudCBbJXVdCgAA
+AAAAAAAAAGRoY3BfdGltZXJfY2I6IERIQ1BESVNDT1ZFUiBzZW50LCBidXQgbm8gcmVwbHkgZnJv
+bSBhbnkgcG9zc2libGUgc2VydmVyIG9uIHRoZSBuZXR3b3JrLiBSZXRyeWluZyBhZ2FpbgoAAAAA
+AAAAAABkaGNwX3RpbWVyX2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBzZW5kaW5nIERI
+Q1BESVNDT1ZFUiBmb3IgZGhjdHh0IFsweCV4XSBvbiBwaWQgWyVkXQoAAABkaGNwX3RpbWVyX2Ni
+OiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBESENQT0ZGRVIgcmVjZWl2ZWQgZm9yIGRoY3R4
+dCBbJXhdIHBpZCBbJWRdCgAAAAAAAAAAAABkaGNwX3RpbWVyX2NiOiBsMmRldl9mYy0+Zmxvd2Nf
+aWQgWzB4JXhdLCAgREhDUEFDSyByZWNlaXZlZCBmb3IgZGhjdHh0IFsleF0sIHBpZCBbJWRdCgAA
+AAAAAAAAAABkaGNwX3RpbWVyX2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBkaGN0eHQt
+PmlwYWRkciBbMHgleF0KAAAAAAAAAAAAAAAAAAAAAGRoY3BfdGltZXJfY2I6IGwyZGV2X2ZjLT5m
+bG93Y19pZCBbMHgleF0sIG5vIHJlcGx5IGZyb20gZGhjcCBzZXJ2ZXIsIHRpbWluZyBvdXQKAAAA
+AAAAAAAAAAAAAAAAAGF1dGhfbmVnb19zZWN1cml0eTogc2VuZF9mbGFnIFsweCV4XSwgYXV0aF9w
+b2xpY3kgWzB4JXhdCgAAAAAAAABhdXRoX25lZ29fc2VjdXJpdHk6IEtFWV9DSEFQX1JFU1AgLSBo
+YXNoWzB4JXgleCV4JXgleCV4JXgleF0KAAAAYXV0aF9uZWdvX3NlY3VyaXR5OiBLRVlfQ0hBUF9S
+RVNQIC0gaGFzaFsweCV4JXgleCV4JXgleCV4JXhdCgAAAGF1dGhfbmVnb19zZWN1cml0eTogS0VZ
+X0NIQVBfUkVTUCAtIGVycm9yIGVuY29kaW5nIHRvIGhleAoAAAAAAABhdXRoX25lZ29fc2VjdXJp
+dHk6IEtFWV9DSEFQX1JFU1AgLSBlbGVuIFsweCV4XQoAAAAAAAAAAAAAAAAAAAAAYXV0aF9uZWdv
+X3NlY3VyaXR5OiBLRVlfQ0hBUF9DSEFMIC0gZXJyb3IgZW5jb2RpbmcgdG8gaGV4CgAAAAAAAGF1
+dGhfbmVnb19zZWN1cml0eTogS0VZX0NIQVBfQ0hBTCAtIGVsZW4gWzB4JXhdCgAAAAAAAAAAAAAA
+AAAAAABsb2dvdXRfdGltZWRvdXQ6IGxvZ291dCByZXF1ZXN0IHRpbWVkb3V0LCBwb3NzaWJsZSBu
+ZXR3b3JrIGlzc3Vlcy4gRm9yY2VmdWxseSBicmVha2luZyBwYXRoIGZvciBzZXNzIFsweCV4XQoA
+AAAAcGluZ190YXJnZXQ6IHBpbmcgdGltZW91dCwga2lja2luZyByZWNvdmVyeSBmb3Igc2VzcyBb
+MHgleF0KAAAAAGNzb2NrX2ZhaWxlZDogY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+
+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBzZXNzX2ZjLT5mbG93Y19pZCBbMHgleF0sIHNlc3NfZmMtPmZs
+b3djX3N0YXRlIFsweCV4XSwgZXZ0IFsweCV4XQoAAAAAAAAAAAAAAGNobmV0X2ZpbmRfbDJ0X2Vu
+dHJ5OiBkYWRkciBbJTA4eF0sIFsweCUwOHhdLCBsb2NhbCBuZXR3b3JrIFslZF0KAAAAAAAAAAAA
+AAAAAAAAbDJ0ZW50IFslMHhdLCBsMnRlbnQtPmlkeCBbJWRdCgByYyBbJWRdLCBjc2tfZmMgWzB4
+JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsweCV4XQoAAAAAAAAAAAAAAAAAAAAAcmVjb3ZlcnlfdGlt
+ZW91dDogc2VzcyBpZCBbMHgleF0gc3RhdGUgWzB4JXhdLCBmbGFncyBbMHgleF0KAAAAAHJlY292
+ZXJ5X3RpbWVvdXQ6IHNlc3MgaWQgWzB4JXhdIGluIGxvZ291dCwgYWJvcnQgdGhlIGNvbm5lY3Rp
+b24KAAAAAAAAAAAAAAAAAAAAZm9pc2NzaTogUmVjb3ZlcnkgdGltZWQgb3V0IGFmdGVyIFsldV0g
+cmV0cnksIGJhaWxpbmcgb3V0CgAAAAAAAHJlY292ZXJ5X3RpbWVvdXQ6IHNlc3NfZmMtPmZsb3dj
+X2lkIFsweCV4XSwgcmV0cnkgY291bnQgWyVkXSwgc2Vzc19mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhd
+CgAAAAAAAHJlY292ZXJ5X3RpbWVvdXQ6IHNlc3NfZmMtPmZsb3djX2ZvaXNjc2lfc2Vzc19mbGFn
+cyBbMHgleF0sIGNvbm5lY3Rpb24gcmVxdWVzdCBwZW5kaW5nLCBiYWlsaW5nIG91dAoAAAAAAAAA
+AAAAAABUQ1AgY29ubiBlc3RhYmxpc2htZW50IGZhaWxlZCAlZAoAAAAAAAAAAAAAAAAAAABkaXNj
+b3ZlcnlfZGF0YTogc2VzcyB7IGlkIFsweCV4XSwgZmxhZ3MgWzB4JXhdLCBidWZmZXJlZCBbJXVd
+LiB9CgAAAAAAAAAAAAAAAAAAAGRpc2NvdmVyeV9kYXRhOiBzZXNzIHsgaWQgWzB4JXhdIH0sIHVs
+cHR4Y2ggWyV1XSBubyBjcmVkaXRzIGF2YWlsYWJsZSwgcmVzY2hlZHVsaW5nIHJlcXVlc3QuCgAA
+AEludmFsaWQgb3Bjb2RlIDB4JXggaW4gY3RybCBwYXRoCgAAAAAAAAAAAAAAAAAAAEREUCBlcnJv
+ciBbMHgleF0sIGFib3J0aW5nIGNvbm5uIFsweCV4XQoAAAAAAAAAAHJ4X2RhdGFfZGRwOiBSZXNw
+b25jZSByZWNpZXZlZCBmb3IgdGFzayBbMHgleF0gd2hpbGUgaW52YWxpZCB0YXNrIG9yIGNvbm5l
+Y3Rpb24gc3RhdGUuIHRhc2sgc3RhdGUgWzB4JXhdLCBjb25uIHN0YXRlIFsweCV4XSwgY29ubiBm
+bGFncyBbMHgleF0KAGlzY3NpX2hkcl9yeDogUmVzcG9uY2UgcmVjaWV2ZWQgZm9yIHRhc2sgWzB4
+JXhdIHdoaWxlIGludmFsaWQgdGFzayBvciBjb25uZWN0aW9uIHN0YXRlLiB0YXNrIHN0YXRlIFsw
+eCV4XSwgY29ubiBzdGF0ZSBbMHgleF0sIGNvbm4gZmxhZ3MgWzB4JXhdCgAAAAAAAAAAAAAAAAAA
+AABpc2NzaV9oZHJfcng6IEludmFsaWQgdGFzayBzdGF0ZSAweCV4IGZvciB0YXNrIDB4JXgsIGl0
+dCBbMHgleF0sIG9wYyBbMHgleF0KAAAAAHByb2Nlc3NfdG1mX3Jlc3BvbnNlOiBidWZmZXJlZCBb
+MHgleF0sIGlzdGFza19mYy0+Zmxvd2NfYnVmLT5zY2hlZF9ub2RlLm5leHQgWzB4JXhdLCBpc3Rh
+c2tfZmMgWzB4JXhdLCBpc3Rhc2tfZmMtPmZsb3djX2lkIFsweCV4XQoAAAAAAAAAAAAAAAAAAHBy
+b2Nlc3NfdG1mX3Jlc3BvbnNlOiB3ciBvcCBbMHgleF0sIHRtZiBvcCBbMHgleF0KAAAAAAAAAAAA
+AAAAAAByZXR1cm5fcGVuZGluZ190YXNrOiBjb29raWUgWzB4JTA4eF0sIFsweCUwOHhdCgByZXR1
+cm5fcGVuZGluZ190YXNrOiBkZWxheSBwcm9jZXNzaW5nLCBjb25uIGZsYWdzIFsweCV4XQoAAAAA
+AAAAcmV0dXJuX3BlbmRpbmdfdGFzazogRG9uZSBzZW5kaW5nIHRhc2sgZXJyb3IgdG8gaG9zdCwg
+dWxwdHhsZW4xNiBbJXVdCgAAAAAAAAAAAAByZXR1cm5fcGVuZGluZ190YXNrOiBkZXF1ZXVlIHRh
+c2sgWzB4JXhdLCBzdGF0ZSBbMHgleF0gZnJvbSB0eF9saXN0CgAAAAAAAAAAAAAAAHJldHVybl9w
+ZW5kaW5nX3Rhc2s6IGFsbCB0YXNrcyByZXR1cm5lZCwgcmVjb3Zlcnkgc3RhdGUgdHJhbnMgdG8g
+WzB4JXhdCgAAAAAAAAAAY2xlYXJfZGRwX21hcDogaXN0YXNrX2ZjIFsweCV4XSwgaXN0YXNrX2Zj
+LT5mbG93Y19pZCBbMHgleF0gYnVmZmVyZWQgJXUKAAAAAAAAAABjbGVhcl9kZHBfbWFwOiBpc3Rh
+c2tfZmMtPmZsb3djX2ZvaXNjc2lfdGFza19ucHBvZCAldSwgbnBwb2QgJXUsIHBwZGFkZHIgWzB4
+JXhdCgAAAAAAAAAAAAAAAAAAAABjbGVhcl9kZHBfbWFwOiBhbGwgcmV0dXJuZWQgdGFza3MgZGRw
+IGNsZWFyZWQsIHJlY292ZXJ5IHN0YXRlIHRyYW5zIHRvIFsweCV4XQoAAHdyaF9mb2lzY3NpX25v
+ZGU6IG5vZGVfd3ItPmZsb3dpZF9sZW4xNiAyIFsleF0KAHdyaF9mb2lzY3NpX2NoYXA6IGlkX2xl
+biBbJXhdLCBzZWNfbGVuIFsleF0KAAAAAHdyaF9mb2lzY3NpX2NoYXA6IHRndF9pZF9sZW4gWyV4
+XSwgdGd0X3NlY19sZW4gWyV4XQoAAAAAAAAAAAAAAABzZXNzaW9uX2Jsb2NrOiBzZXNzX2ZjLT5m
+bG93Y19pZCBbMHgleF0sIHNlc3NfZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgY29ubl9mYy0+Zmxv
+d2NfaWQgWzB4JXhdLCBjb25uX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0sIGNza19mYy0+Zmxvd2Nf
+aWQgWzB4JXhdLCBjc2tfZmMtPmZsb3djX3N0YXRlIFsweCV4XQoAAAAAAAAAAAAAAAAAAABzZXNz
+aW9uX3VuYmxvY2s6IHNlc3NfZmMtPmZsb3djX2lkIFsweCV4XSwgc2Vzc19mYy0+Zmxvd2Nfc3Rh
+dGUgWzB4JXhdLCBjb25uX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNvbm5fZmMtPmZsb3djX3N0YXRl
+IFsweCV4XSwgY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+Zmxvd2Nfc3RhdGUgWzB4
+JXhdCgAAAAAAAAAAAAAAAABzdGFydF9sb2dvdXQ6IFNlc3MtaWQgWzB4JXhdIGFscmVhZHkgbG9n
+Z2luIG91dC4KAAAAAAAAAAAAAAAAAAAAcGVlcl9jb246IGNza19mYyA9PiBmbG93aWQgWzB4JXhd
+LCBmbG93Y19idWYgWzB4JXhdCgAAAAAAAAAAAAAAAGFsbG9jX3Nlc3M6IGxvZ2luX3JldHJ5IFsl
+ZF0sIHJlY292X3RpbWVvdXQgWyVkXQoAAAAAAAAAAAAAAAAAAABmb2lzY3NpX2N0cmw6IHN1Ym9w
+IFsweCV4XSwgc2Vzc190eXBlX3RvX2VybCBbMHgleF0sIHNlc3NfdHlwZSBbMHgleF0KAAAAAAAA
+AAAAAGZvaXNjc2lfY3RybDogcmVjZWl2ZWQgYmxvY2tlZCBmcm9tIGRyaXZlciwgdHJpZ2dlcmlu
+ZyByZXR1cm4gdGFza3Mgbm93LgoAAAAAAAAAd2F0Y2hkb2cgY21kIGhhbmRsZXIgKHRpbWUgJXUg
+YWN0aW9uICV1KQoAAAAAAAAAeGdtYWNbJXVdIHNldHRpbmcvdW5zZXR0aW5nIGhzcyByZXN5bmMg
+Yml0CgAAAAAAV0FUQ0hET0c6IGRldmljZSBzaHV0ZG93bgoAAAAAAABXQVRDSERPRzogYnlwYXNz
+IHRpbWVvdXQKAAAAAAAAAFdBVENIRE9HOiBGTFIgLSBub3QgaW1wbGVtZW50ZWQgeWV0CgAAAAAA
+AAAAAAAAAFdBVENIRE9HOiB0ZW1wZXJhdHVyZSBvZiAlZEMgZXhjZWVkcyB0aHJlc2hvbGQgb2Yg
+JWRDCgAAAAAAAAAAAABmaWx0ZXI6IHBvcmdyYW1taW5nIHRpZCAldSAobGUgdGNhbSBpbmRleCAl
+dSkuLi4KAAAAAAAAAAAAAAAAAAAAZmlsdGVyOiByZXF1ZXN0aW5nIGNvbXBsZXRpb24uLi4KAAAA
+AAAAAAAAAAAAAAAAbDJkZXZfc2VuZF9wb3J0X2V2ZW50OiB3ciBbMHgleF0gcGVuZGluZyBvbiBw
+b3J0IFslZF0sIGN1cnJlbnQgdHJ5IFslZF0KAAAAAAAAAABGQ09FIEZyZWU6IHN0aWxsIHlpZWxk
+ZWQgd2hlbiBmcmVlaW5nLi4uZmxvd2NfaWQgJXggZmxvd2NfZmxhZ3MgJXggCgAAAAAAAAAAAAAA
+AHBvcnQgJWQgc2V0IHBmY19lbiA9IDB4JXgKAAAAAAAAQXBwbHkgQVBQOiBwb3J0ICVkIHByaW9y
+ICVkIHNlbGVjdCAlZCBwcm90b2NvbElEIDB4JTA0eAoAAAAAAAAAAHBvcnQgJWQgc2V0IHBmY19l
+biA9IDB4JXgKAAAAAAAAZXRzX3NldF9jZmdfaWVlZVsldV0gdW5rbm93biBUU0EgYWxnIGZvciBw
+cmlvICV1OiAldQoAAAAAAAAAAAAAAEZDb0UgRERQIGZhaWxlZCA6IG94X2lkIDB4JXggcnhfaWQg
+MHgleAoAAAAAAAAAAEZDb0UgRERQIGZhaWxlZCA6IERkcFJlcG9ydCAweCV4IERkcFZhbGlkIDB4
+JXgKAFBSTEkgUnNwIHRpbWVkb3V0IDogZmxvd2NfaWQgMHgleCBveF9pZCAweCV4IHJ4X2lkIDB4
+JXggCgAAAAAAAABjYW5ub3QgYWxsb2NhdGUgb2ZmbG9hZGVkIGZpbHRlciBjb25uZWN0aW9uCgAA
+AABjYW5ub3QgYWxsb2NhdGUgb2ZmbG9hZGVkIGZpbHRlciBJUHY2IGNvbm5lY3Rpb24KAAAAAAAA
+AAAAAAAAAAAAbG9vcGJhY2sgYnVmZmVyIGdyb3VwWyV1XSBpcyBkaXNhYmxlZAoAAAAAAAAAAAAA
+aW52YWxpZCBidWZmZXIgZ3JvdXBbJXVdIGNvbmZpZ3VyYXRpb246IG10dSAldSBsd20gJXUgaHdt
+ICV1IGR3bSAldQoAAAAAAAAAAAAAAABmYyAldSB2ZiAldSBnb3QgaXZmPTB4JXgscmFuZ2U6ICUj
+eC0lI3ggKCV1LyV1IHVzZWQpCgAAAAAAAAAAAAAAVkkgJXUgY2Fubm90IGdldCBSU1Mgc2xpY2U6
+IE5vIG1vcmUgc2xpY2VzIGF2YWlsYWJsZSAodXNlZCAldS8ldSkKAAAAAAAAAAAAAAAAAABwZm4g
+JXUgdmZuICV1IHdpdGggcG9ydCBtYXNrIDB4JXggY2Fubm90IGFjY2VzcyBwb3J0ICV1LCByZXQg
+JWQKAAAAAAAAAAAAAAAAAAAAAHBmbiAldSB2Zm4gJXUgY291bGQgbm90IGFsbG9jYXRlIHZpaWQs
+IHJldCAlZAoAAHBmbiAldSB2Zm4gJXUgY291bGQgbWFwIHZpaWQgIDB4JXggdG8gZmxvd2MsIHJl
+dCAlZAoAAAAAAAAAAAAAAABwZm4gJXUgdmZuICV1IGNvdWxkIG5vdCBhbGxvY2F0ZSB1d2lyZSBm
+dW5jICVkIG1hYyBhZGRyLCByZXQgJWQKAAAAAAAAAAAAAAAAAAAAAG1paV9mb3JjZV9zcGVlZFsl
+dV06IHJjYXBzIDB4JXgKAAAAAAAAAAAAAAAAAAAAAG1paV9wZG93blsldV06IHBvd2VyZG93biBl
+biAldQoAcG9ydF9jbWRfaGFuZGxlcjogdW5rbm93biB1LmRjYi50eXBlIDB4JXgKAAAAAAAAcG9y
+dFsldToweCUwMng6MHglMDJ4XTogdW5rbm93biBhY3Rpb24gMHgleAoAAAAAcG9ydFsldToweCUw
+Mng6MHglMDJ4XTogdW5rbm93biByZWFkIGFjdGlvbiAweCV4CgAAAAAAAAAAAAAAAAAAAGNwbF9l
+cnJfbm90aWZ5OiB0aWQgJXUgY3BsIDB4JTA4eCUwOHgKAAAAAAAAAAAAAGNwbF9lcnJfbm90aWZ5
+OiB0aWQgJXUgY3BsIDB4JTA4eCUwOHggMHglMDh4JTA4eAoAAAAAAAAAAAAAAAAAAABjcGxfZXJy
+X25vdGlmeTogdGlkICV1IGxlbiAldQoAAEZDT0UgRnJlZTogc3RpbGwgeWllbGRlZCB3aGVuIGZy
+ZWVpbmcuLi5mbG93Y19pZCAleCBmbG93Y19mbGFncyAleCAKAAAAAAAAAAAAAAAARkNPRSBCUCBX
+UiBFUlI6IFdSIHdpdGggY29va2llICV4JXggZXJyb3JlZCBiYWNrIAoAAAAAAAAAAAAAAAAAAHNj
+c2lfYWJvcnQ6IEVudGVyaW5nIEFib3J0X3Rhc2ssIGJ1ZmZlcmVkIFsldV0KAHNjc2lfYWJvcnQ6
+IHJjIFsweCV4XSByZWYgdGFzayBub3Qgb3V0c3RhbmRpbmcKAHNjc2lfYWJvcnQ6IGlkYXRhLT5v
+cCBbMHgleF0sIGZsYWdzIFsweCV4XSwgZnVuYyBbMHgleF0sIGx1bl9pZHggWzB4JXhdCgAAAAAA
+AAAAc2NzaV9hYm9ydDogd3ItPmlxaWQgWzB4JXhdLCBpc3Rhc2tfZmMtPmZsb3djX3NnZV9pcWlk
+IFsweCV4XSwgaXN0YXNrX2ZjIHRhc2sgZmxhZ3MgWzB4JXhdCgAAAAAAc2NzaV9hYm9ydDogY29u
+biBbMHgleF0sIGNtZHNuIFsweCV4XSwgc2VudF9jbWRzbiBbMHgleF0sIG1heF9jbWRzbiBbMHgl
+eF0sIGl0dCBbMHgleF0KAAAAAAAAAAAAYWJvcnQvY2xvc2UgV1Igd2l0aCBjb29raWUgMHglbHgg
+d2FzIGlzc3VlZCBvbiBzc24gMHgleCBpbiB3cm9uZyBzdGF0ZSAweCV4CgAAAABhYm9ydCBXUiBv
+biBzc24gMHgleCBkaWQgbm90IGZpbmQgV1Igd2l0aCBjb29raWUgMHgleCV4CgAAAAAAAAAAY2xv
+c2UgV1Igd2l0aCBjb29raWUgMHglbHggb24gc3NuIDB4JXg7ZGlkIG5vdCBmaW5kIFdSIHdpdGgg
+Y29va2llIDB4JWx4CgAAAAAAAABhYm9ydCBXUiBvbiBzc24gMHgleCB3YXMgaXNzdWVkIG9uIHhj
+aGcgMHgleCB3aXRoIHJ4X2lkIDB4JXggaW4gd3Jvbmcgc3RhdGUgMHgleAoAAAAAAAAAAAAAAAAA
+AABzY3NpX2x1cjogRW50ZXJpbmcgTFVSIGhhbmRsZXIsIGJ1ZmZlcmVkIFsldV0KAABzY3NpX2x1
+cjogaWRhdGEtPm9wIFsweCV4XSwgZmxhZ3MgWzB4JXhdLCBmdW5jIFsweCV4XSwgbHVuX2lkeCBb
+MHgleF0KAAAAAAAAAAAAAHNjc2lfbHVyOiB3ci0+aXFpZCBbMHgleF0sIGlzdGFza19mYy0+Zmxv
+d2Nfc2dlX2lxaWQgWzB4JXhdLCBpc3Rhc2tfZmMgdGFzayBmbGFncyBbMHgleF0KAAAAAAAAAHNj
+c2lfbHVyOiBjb25uIFsweCV4XSwgY21kc24gWzB4JXhdLCBzZW50X2NtZHNuIFsweCV4XSwgbWF4
+X2NtZHNuIFsweCV4XSwgaXR0IFsweCV4XQoAAAAAAAAAAAAAAGRjYnhfY2VlX2ZlYV9zbVsldV0g
+RmVhdHVyZVsldV0gRkVBVFVSRV9MSU5LVVAKAGRjYnhfY2VlX2ZlYV9zbVsldV0gRmVhdHVyZVsl
+dV0gU0VUX0xPQ0FMX1BBUkFNRVRFUlMKAAAAAAAAAAAAAABkY2J4X2NlZV9mZWFfc21bJXVdIEZl
+YXR1cmVbJXVdIEZFQVRVUkVfTk9fQURWRVJUSVNFCgAAAAAAAAAAAAAAZGNieF9jZWVfZmVhX3Nt
+WyV1XSBGZWF0dXJlWyV1XSBGRUFUVVJFX1BFRVJfTk9UX0FEVkVSVElTRV9EQ0JYCgAAAAAAAAAA
+AAAAAAAAAABkY2J4X2NlZV9mZWFfc21bJXVdIEZlYXR1cmVbJXVdIEZFQVRVUkVfUEVFUl9OT1Rf
+QURWRVJUSVNFX0ZFQVRVUkUKAAAAAAAAAAAAAAAAAGRjYnhfY2VlX2ZlYV9zbVsldV0gRmVhdHVy
+ZVsldV0gRkVBVFVSRV9VUERBVEVfT1BFUl9WRVJTSU9OCgAAAABkY2J4X2NlZV9mZWFfc21bJXVd
+IEZlYXR1cmVbJXVdIEZFQVRVUkVfUEVFUl9VUERBVEVfT1BFUl9WRVJTSU9OCgAAAAAAAAAAAAAA
+AAAAAGRjYnhfY2VlX2ZlYV9zbVsldV0gRmVhdHVyZVsldV0gRkVBVFVSRV9HRVRfUEVFUl9DRkcK
+AAAAAAAAAAAAAABkY2J4X2NlZV9mZWFfc21bJXVdIEZlYXR1cmVbJXVdIEZFQVRVUkVfQ0ZHX05P
+VF9DT01QQVRJQkxFCgAAAAAAZGNieF9jZWVfZmVhX3NtWyV1XSBGZWF0dXJlWyV1XSBGRUFUVVJF
+X1VTRV9MT0NBTF9DRkcKAAAAAAAAAAAAAGRjYnhfY2VlX2ZlYV9zbVsldV0gRmVhdHVyZVsldV0g
+RkVBVFVSRV9VU0VfUEVFUl9DRkcKAAAAAAAAAAAAAABkY2J4X2NlZV9mZWFfc21bJXVdIEZlYXR1
+cmVbJXVdIEZFQVRVUkVfRkVBVFVSRV9ESVNBQkxFRAoAAAAAAAAAZGNieF9jZWVfZmVhX3NtWyV1
+XSBGZWF0dXJlWyV1XSBGRUFUVVJFX0VSUk9SX0NIQU5HRQoAAAAAAAAAAAAAAEZlYXR1cmUgJXUg
+c3luYydkPSV1IChlcnJvciAldSkKAAAAAAAAAAAAAAAAAAAAAGRjYnggdXBkYXRlWyV1XSBzZW50
+IHRvIGRyaXZlciAodHlwZSAlI3ggc3VidHlwZSAlI3ggZmxvd2NpZCAldSkKAAAAAAAAAAAAAAAA
+AAAAY2huZXRfbDJ0X3VwZGF0ZTogbDJkZXZfZmMgWzB4JXhdLCBsMmRldl9mYy0+Zmxvd2NfaWQg
+WyV1XSBsMmRldl9mYy0+Zmxvd2NfZmxhZ3MgWzB4JXhdLCBpbnRmIFsweCV4XQoAAAAAAAAAAAAA
+AGNobmV0X2wydF91cGRhdGU6IGwyZGV2X2ZjLT5mbG93Y19pZCBbJXVdIGFscmVhZHkgc2NoZWR1
+bGVkCgAAAABjaG5ldF9sMnRfdXBkYXRlOiBpbiBkZWxheWVkX3Byb2Nlc3NpbmcsIGwydGVudCBb
+JTA4eF0KAAAAAAAAAAAAY2huZXRfbDJ0X3VwZGF0ZTogbDJ0X3VwZGF0ZSByZXF1ZXN0IHNlbnQg
+bDJ0ZW50IFslMDh4XSwgbDJ0ZW50LT5pZHggWyVkXSwgbDJ0ZW50LT52bGFuIFslZF0KAAAAbmV0
+aWZfcHJvY2Vzc19kaGNwOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBwcm9jZXNzaW5nLCBv
+cHRfbGVuICV1CgAAAAAAAAAAAABjaG5ldF9kaGNwX3JlY3Y6IHZsYW5pZCBbJXVdLCBsMmRldl9w
+aWRfZmMtPmZsb3djX25ldF9sMmRldl92bGFuZGV2IFsweCV4XSwgbDJkZXZfZmMgWzB4JXhdCgAA
+AABjaG5ldF9kaGNwX3JlY3Y6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIGRoY3R4dC0+c3Rh
+dGUgWyVkXSwgbWFsYWNpb3VzIGRoY3AgcmVjdiBmb3Igbm8gcmVxdWVzdAoAAAAAAAAAAAAAAAAA
+ZGhjdHh0LT5zdGF0ZSA6ICVkCgAAAAAAAAAAAAAAAABsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhd
+LCBCYWQgREhDUCBjb29raWUgcmVjaWV2ZWQsIGFib3J0aW5nCgAAaWdub3JpbmcgZmlwIHJlY3Yg
+Zm9yIHBjYiBmbG93OiV4IGluIG9mZmxpbmUgc3RhdGUKAAAAAAAAAAAAAAAAAE5fUE9SVCAweCV4
+JXgleCByZWplY3RlZCBQTE9HSSB3aXRoIHJlYXNvbiBjb2RlICV4CgAAAAAAAAAAAAAAAABBQlRT
+IHdoaWxlIGF3YWl0aW5nIFBSTEkgUnNwOiBmbG93Y19pZCAweCV4IG94X2lkIDB4JXggcnhfaWQg
+MHgleCAKAAAAAAAAAAAAAAAAAEFCVFMgZmFrZSBSc3A6IGxvYyAweCV4IG94X2lkIDB4JXggcnhf
+aWQgMHgleAoAAGxsZHBfcnhfcGt0X2hhbmRsZXJbJXVdIGRyb3AgcHJlLWluaXQgKGNvdW50ID0g
+JXUpCgAAAAAAAAAAAAAAAABjYW5ub3QgYWxsb2NhdGUgUE9GQ09FIGZpbHRlciBjb25uZWN0aW9u
+IGZvciB4X2lkICV4IAoAAAAAAAAAAAAAdGNwX3JlbGVhc2VfdGlkOiB0aWQgWzB4JXhdLCBmbG93
+YyBmbGFncyBbMHgleF0sIGJ1ZmZlcmVkIFsweCV4XQoAAAAAAAAAAAAAAAAAAAB0Y3BfcmVsZWFz
+ZV90aWQ6IHNpemVvZih0Y2JfZmMtPmZsb3djX2ZvaXNjc2lfY29ubikgWyV1XSwgYnl0ZXMKAAAA
+AAAAAAAAAAAAAAAAAGFjdF9vcGVuX3JwbDogYXRpZCBbMHgleF0sIHRpZCBbMHgleF0sIHRjYl9m
+Yy0+eyBpZCBbMHgleF0sIHN0YXRlIFsweCV4XSwgdHlwZSBbMHgleF0gfSwgY3BsX29wIFsweCV4
+XSwgc3RhdHVzIFsweCV4XQoAAAAAAAAAAAAAYWN0X29wZW5fcnBsOiBjc2tfZmMtPnsgaWQgWzB4
+JXhdLCBzdGF0ZSBbMHgleF0sIGNzb2NrX2ZsYWdzIFsweCV4XSB9IAoAAAAAAAAAAABhY3Rfb3Bl
+bl9ycGw6IHJlY3ZkIG5lZyBhZHZpY2UgWzB4JXhdCgAAAAAAAAAAAABzZW5kX2Fib3J0X3JwbDog
+Y3NrX2ZjLT5mbG93Y190eXBlIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIHRpZCBb
+MHgleF0sIHVscHR4Y2ggWyV1XSwgYnVmZmVyZWQgWyV1XQoAAAAAd3JoX29mbGRfdGNwX2Nsb3Nl
+X2Nvbl9yZXBseTogdGNiX2ZjLT5mbG93Y19pZCBbMHgleF0sIHRjYl9mYy0+Zmxvd2NfdHlwZSBb
+MHgleF0sIGxlbjE2IFsldV0sIGxvYyBbJXVdCgAAAAAAAAAAAHdyaF9vZmxkX3RjcF9jbG9zZV9j
+b25fcmVwbHk6IHJwbC0+b3BfVGlkIFsweCV4XSwgcnBsPnN0YXR1cyBbMHgleF0sIHJwbC0+c25k
+X254dCBbMHgleF0sIHJwbC0+cmN2X254dCBbMHgleF0KAAB0Y3BfYWJvcnRfcnBsX3JzczogdGlk
+IFsweCV4XSwgc3RhdHVzIFsweCV4XQoAAAB0Y3BfYWJvcnRfcmVxX3JzczogdGlkIFsweCV4XSwg
+c3RhdHVzIFsweCV4XQoAAABwa3RzY2hlZF9jbF9ybFsldToldV06IG1vZGUgfCB1bml0IHwgcmF0
+ZSAweCUwNnggbWluICV1IG1heCAldSBwa3RzaXplICV1CgAAAAAAAHBhcmFtX2RtYXFbMHgleDow
+eCV4XTogZG1hcSAweCV4IHJlYWQgJXUgcGYgJXUgcmV0ICVkCgAAAAAAAAAAAABNQ1sldV0gaW5p
+dF9zdGF0ZV9tYWNoaW5lIDB4JTAyeAoAAAAAAAAAAAAAAAAAAABNQyBpbml0aWFsaXphdGlvbiBu
+b3QgY29tcGxldGluZywgTUMgY3VycmVudCBpbml0IHN0YXRlIGlzIDB4JTAyeAoAAAAAAAAAAAAA
+AAAAAE1DWyV1XSBfaHdfbWNfaW5pdF9tYwoAAAAAAAAAAAAAcGh5OiBmYWlsZWQgdG8gYWxsb2Nh
+dGVkIG1lbW9yeSBmb3IgcGh5IGZ3IGZpbGUsIHJldCAlZAoAAAAAAAAAAGh3X2xlX2ZpbHRlcl9j
+dHVwbGU6IHR1cGxlICV1IG5vdCBzcGVjaWZpZWQgYnV0IHJlcXVpcmVkIGZvciBtYXNrIDB4JXgK
+AAAAAAAAAAAAaHdfdHBfdGNwX3NldHRpbmdzX3c6IHRpbWVyX3JzICV1dXMgdGltZXN0YW1wX3Jl
+cyAldXVzIGRlbGF5ZWRhY2tfcmVzICV1dXMKAAAAAABod190cF90Y3Bfc2V0dGluZ3NfdzogZGFj
+a190aW1lciAldXVzIG1zbCAldXVzIHJ4dF9taW4sbWF4ICV1LCV1dXMgcGVyc19taW4sbWF4ICV1
+LCV1dXMKAAAAAAAAAABod190cF90Y3Bfc2V0dGluZ3Nfdzoga2VlcF9pZGxlLGludHZsICV1LCV1
+cyBtYXhydHQgJXV1cyBpbml0c3J0dCAldXVzIGZpbndhaXQyX3RpbWVyICV1dXMKAAAAAABsZSBj
+b25maWd1cmF0aW9uOiBuZW50cmllcyAldSByb3V0ZSAldSBjbGlwICV1IGZpbHRlciAldSBhY3Rp
+dmUgJXUgc2VydmVyICV1IGhhc2ggJXUKAAAAAAAAAAAAAABsZSBjb25maWd1cmF0aW9uOiBuZW50
+cmllcyAldSByb3V0ZSAldSBjbGlwICV1IGZpbHRlciAldSBzZXJ2ZXIgJXUgYWN0aXZlICV1IGhh
+c2ggJXUgbnNlcnZlcnNyYW0gJXUKAAAAAAAAAAAAAAAAY2ZfcGFyc2U6IGZpbGUgbWVtdHlwZSAw
+eCV4IG1lbWFkZHIgMHgleCBtYXBwZWQgQCAlcDoKAAAAAAAAAAAAAGNvbmZpZ3VyZWQgd2l0aCBj
+YXBzIG5ibXxsaW5rIDB4JTA4eCBzd2l0Y2h8bmljIDB4JTA4eCB0b2V8cmRtYSAweCUwOHggaXNj
+c2l8ZmNvZSAweCUwOHgKAAAAAAAAAG5ldCBWSSBhbGxvY2F0aW9uIGZhaWxlZCBmb3IgZmNfaWQg
+JXUgd2l0aCBlcnJvciAlZAoAAAAAAAAAAAAAAABuZXQgVkkgbWFjIGFkZHJlc3MgcHJvZ3JhbW1p
+bmcgZmFpbGVkIGZvciBmY19pZCAldSB3aXRoIGVycm9yICVkCgAAAAAAAAAAAAAAAAAAAG5ldCBW
+SSByeG1vZGUgcHJvZ3JhbW1pbmcgZmFpbGVkIGZvciBmY19pZCAldSB3aXRoIGVycm9yICVkCgAA
+AABuZXQgVkkgcnNzIGluZGlyZWN0aW9uIHRhYmxlIHByb2dyYW1taW5nIGZvciBmY19pZCAldSBm
+YWlsZWQgd2l0aCBlcnJvciAlZAoAAAAAAG5ldCBWSSByc3MgY29uZmlnIGNvbW1hbmQgZmFpbGVk
+IGZvciBmY19pZCAldSB3aXRoIGVycm9yICVkCgAAAABuZXQgVkkgY29tbWFuZCBmYWlsZWQgZm9y
+IGZjX2lkICV1IHdpdGggZXJyb3IgJWQKAAAAAAAAAAAAAAAAAAAAcHBtYXggWyV1XSwgYml0cyBb
+JXVdLCBGV19JU0NTSV9QQUdFUE9EX1RBR19JRFhfTUFYX1NJWkUgWyV1XQoAAGRlZmF1bHQgdGFn
+bWFzayBbMHglMHhdCgAAAAAAAAAAcHJvZ3JhbW1lZCB0YWdtYXNrIFsweCUweF0KAAAAAABwcG0t
+PmRkcF9pbmZvLmxsaW1pdCBbMHglMHhdLCBwcG0tPmRkcF9pbmZvLnVsaW1pdCBbMHglMHhdLCBw
+cG0tPmRkcF9pbmZvLnNpemUgWzB4JTB4XQoAAAAAAAAAAABwcG0tPmRkcF9pbmZvLm1heF90eHN6
+IFsweCUweF0gcHBtLT5kZHBfaW5mby5tYXhfcnhzeiBbMHglMHhdIGlvc2l6ZSBbMHglMHhdCgAA
+AHBwbWF4IFsldV0sIGlkeF9iaXRzIFsldV0sIGlkeF9tYXNrIFsweCUweF0sIHJlc3ZkX3RhZ19t
+YXNrIFsweCUweF0sIHRhZ21hc2sgWzB4JTB4XQoAAAAAAAAAAAAAAHRhZyBpdHQgMHglMHgsIGJp
+dHMgJXUsIGFnZSAweCUweCwgYml0cyAldQoAAAAAAGN4Y25pYy0+aXNjc2lfcHBtIFsweCUweF0K
+AAAAAAAAc2NzaV9wbGRfc2l6ZSBbJXVdLCBBTElHTihzY3NpX3BsZF9zaXplLCAxNikgWyV1XQoA
+AAAAAAAAAAAAAAAAAG1heF9wcG9kX3pvbmVzIFsldV0KAAAAAAAAAAAAAAAAZm9pc2NzaV9pbml0
+OiBmb2lzY3NpX2luaXRfZG9uZSBbJXVdLCBkZXYucmVzLmZvaXNjc2lfbnRhc2tzIFsldV0sIGRl
+di5yZXMuZm9pc2NzaV9uc2VzcyBbJXVdLCBkZXYucmVzLm5jc29jayBbJXVdLCBkZXYucmVzLmZv
+aXNjc2lfbmluaXQgWyV1XSwgcmMgWyVkXQoAAAAAAAAAAGNoX2NsX3JhdGVbJXUvJXVdOiBjYXBw
+ZWQgY2xhc3MgcmF0ZSBmcm9tIHJlcXVlc3RlZCAldSB0byBjb25maWd1cmVkIChlZmZlY3RpdmUp
+IGNoYW5uZWwgcmF0ZSAldQoAAAAAAAAAAAAAAAAAAABjaF9jbF9yYXRlWyV1LyV1XTogaW5jcmVh
+c2VkIGRlZmljaXRfaW5jciBmcm9tIHJlcXVlc3RlZCAldSB0byByZXF1aXJlZCBtaW4gb2YgJXU7
+IHJhdGUgJXUgKGVmZiAldSkgZGVmaWNpdF9tYXggJXUKAAAAAAAAAAAAAAAAAHBrdHNjaGVkIGNo
+YW5uZWwgJXUgc2V0cyBzcGVlZCAoZnJvbSAldSkgdG8gJXUga2JwcwoAAAAAAAAAAAAAAABuZXRf
+bDJkZXZfbm90aWZ5OiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBwb3J0IFslZF0sIGV2ZW50
+IFsweCV4XSwgdWxwdHhjaCBbJXVdLCBjbGFzcyBbMHgleF0sIHZwcmlvIFsweCV4XSwgdmlkIFsw
+eCV4XSwgdmlfcmVhZHkgWyV1XQoAAAAAAABuZXRfbDJkZXZfbm90aWZ5OiBwZ2lkIFsweCV4XSwg
+cHJpbyBbMHgleF0sIGNoIFsweCV4XQoAAAAAAAAAAAAAcG9ydF9jbWRfaGFuZGxlcjogdW5rbm93
+biB1LmRjYi50eXBlIDB4JXgKAAAAAAAAZGNieF9ydW5fdmVyc2lvbl9zbVsldV0gRENCWF9WRVJf
+U1RBVEVfUlVOX0lFRUUKAAAAAAAAAAAAAAAAAAAAAGRjYnhfcnVuX3ZlcnNpb25fc21bJXVdIERD
+QlhfVkVSX1NUQVRFX1JVTl9DRUUKAGRjYnhfcnVuX3ZlcnNpb25fc21bJXVdIERDQlhfVkVSX1NU
+QVRFX1JVTl9OT05FCgAAAAAAAAAAAAAAAAAAAABwb3J0WyV1XSBsaW5rIGRvd24gKCV1KSAobHN0
+YXR1cyAlI3gpCgAAAAAAAAAAAABpMmMgZXJyb3IgY2F1c2VkIGJ5IG1vZHVsZSB1bnBsdWcKAAAA
+AAAAAAAAAAAAAABzZW5kdG8gcGVuZGluZzogd3JfcGVuZCAlcCBmb3IgcG9ydCAldSwgIHdhbnQg
+dG8gc2VuZCB0byBwb3J0ICV1CgAAAAAAAAAAAAAAAAAAAHBvcnRbJXVdIHVwZGF0ZSAoZmxvd2Np
+ZCAldSkKAAAAcG9ydF9zZXRfbG9vcGJhY2sgcG9ydCAlI3ggY3VycmVudCAlI3ggbW9kZSAlI3gK
+AAAAAAAAAAAAAAAAAAAAAHBvcnRbJXVdIHNwZWVkIHVwZGF0ZTogJSN4CgAAAAAAcG9ydFsldV0g
+YmVnaW5uaW5nIGRlYm91bmNlCgAAAABwb3J0X2xpbmtfc3RhdGVfaGFuZGxlclsldV0gcG93ZXJp
+bmcgZG93bgoAAAAAAABwb3J0X2xpbmtfc3RhdGVfaGFuZGxlclsldV0gcG93ZXJpbmcgdXAKAAAA
+AAAAAABwb3J0X2xpbmtfc3RhdGVfaGFuZGxlclsldV0gdW5rbm93biBzdGF0ZSAoc3RhdGUgPSAl
+I3gpCgAAAAAAAAAAcG9ydF9saW5rX3N0YXRlX2hhbmRsZXIgZ290IHJlc2NoZWR1bGVkCgAAAAAA
+AAAAcG9ydF9saW5rX3N0YXRlX2hhbmRsZXI6IFNvbWV0aGluZyB3ZW50IHRlcnJpYmx5IHdyb25n
+LiByZXQgPSAlZAoAAAAAAAAAAAAAAAAAAABsZSBpbml0aWFsaXphdGlvbjogbmVudHJpZXMgJXUg
+cm91dGUgJXUgY2xpcCAldSBmaWx0ZXIgJXUgYWN0aXZlICV1IHNlcnZlciAldSBoYXNoICV1CgAA
+AAAAAAAAAABsZSBpbml0aWFsaXphdGlvbjogbmVudHJpZXMgJXUgcm91dGUgJXUgY2xpcCAldSBm
+aWx0ZXIgJXUgc2VydmVyICV1IGFjdGl2ZSAldSBoYXNoICV1IG5zZXJ2ZXJzcmFtICV1CgAAAAAA
+AAAAAAAAaHdfdHBfaW5pdDogdGNiIHJlZ2lvbiAoc3RhcnQgMHglMDhzIHNpemUgJXUpIG11c3Qg
+YmUgaW4gZmlyc3QgMjU2TUIgb2YgTUEgbWVtb3J5CgAAAAAAAAAAAAAAAAAAaHdfdHBfaW5pdDog
+cGdtbmd0IHJlZ2lvbiAoc3RhcnQgMHglMDhzIHNpemUgJXUpIG11c3QgYmUgaW4gZmlyc3QgMjU2
+TUIgb2YgTUEgbWVtb3J5CgAAAAAAAAAAAAAAaHdfdHBfaW5pdDogVFAgcGdtbmd0IGluaXRpYWxp
+emF0aW9uIGRpZCBub3QgY29tcGxldGUKAAAAAAAAAAAAAGJ1Zm1faW5pdDogbiAldSBidWZsbDY0
+aW50X3NpemUgMHgleAoAAAAAAAAAAAAAAGJ1Zm1faW5pdDogbm90IGVub3VnaCBtZW1vcnkgdG8g
+YWxsb2NhdGUgaW50ZXJuYWwgYnVmbGw2NCBidWZmZXJzCgAAAAAAAAAAAAAAAAAAYnVmbV9pbml0
+OiBub3QgZW5vdWdoIG1lbW9yeSB0byBhbGxvY2F0ZSBidWZsbDY0IGJ1ZmZlcnMKAAAAAAAAAG1l
+bV9pbml0X2J1Zjogbm90IGVub3VnaCBtZW1vcnkgdG8gYWxsb2NhdGUgZmxvdyBidWZmZXJzCgAA
+AAAAAABtZW1faW5pdF9idWY6IG5vdCBlbm91Z2ggbWVtb3J5IHRvIGFsbG9jYXRlIHRjYl9jYWNo
+ZSAob2ZmZXJlZCAldSB0cnlpbmcgdG8gdXNlICV1IGF2YWlsYWJsZSAldSkKAAAAAAAAAAAAAAAA
+AAAAbXBhcnRpdGlvbl9vdGhlcnM6IHN0YXJ0IDB4JTA4eCBzaXplICV1ICh1bnVzZWQgJXUpCgAA
+AAAAAAAAAAAAAG1wYXJ0aXRpb25fb3RoZXJzOiBzdGFydCAweCUwOHggc2l6ZSAldSAodW51c2Vk
+ICV1KQoAAAAAAAAAAAAAAABtZW1faW5pdDogRURDIG92ZXJjb21taXR0ZWQgYnkgJWQgYnl0ZXMK
+AAAAAAAAAABtZW1faW5pdDogbm90IGVub3VnaCBtZW1vcnkgdG8gYWxsb2NhdGUgZmxvdyB0YWJs
+ZQoAAAAAAAAAAAAAAAAAY3hjbmljX2RldmljZV9pbml0OiBjeGNuaWMgWzB4JTB4XSwgY3hjbmlj
+LT5maWx0ZXIgWyUweF0KAAAAAAAAAHBvZmNvZSBpbml0IGRvbmUKAAAAAAAAAAAAAAAAAAAAUG9y
+dFsldV06IFVua25vd24gU0dNSUkgc3ViLXR5cGUgJSN4CgAAAAAAAAAAAAAAUG9ydFsldV06IFVu
+a25vd24gQlRfWEZJIHN1Yi10eXBlICUjeAoAAAAAAAAAAAAAUG9ydFsldV06IFVua25vd24gQlRf
+WEFVSSBzdWItdHlwZSAlI3gKAAAAAAAAAAAAcG9ydF9pbml0WyV1XTogcG9ydCB0eXBlIDB4JXgg
+aXMgbm90IHN1cHBvcnRlZAoAbXBhcnRpdGlvbl9pbml0OiBtb3ZlZCBwbXJ4X3N0YXJ0IGZyb20g
+MHglMDh4IHRvIDB4JTA4eCB0byBtYWtlIHJvb20gZm9yIExFIEhBU0ggYW5kL29yIFRQIFRDQnMK
+AAAAAAAAAAAAAAAAAAAAAG1wYXJ0aXRpb25faW5pdDogbW92ZWQgcG1yeF9zdGFydCBmcm9tIDB4
+JTA4eCB0byAweCUwOHggKEVEUkFNKQoAAAAAAAAAAAAAAAAAAAAARVEgcGZuICV1IHZmbiAldTog
+ZGVzdHJveWluZyBlcWlkICV1IHdpdGggcGVuZGluZyBXUihzKSAobnVtX2J5dGVzICV1IGFuZCBm
+bGFncyAweCUwOHgKAAAAAAAAAAAAbDJkZXZfZmMtPmZsb3djX2lkIFsldV0sIGwyZGMtPnBmbiBb
+JXVdLCBsMmRjLT52Zm4gWyV1XSwgbDJkYy0+bHBvcnQgWyV1XSwgbDJkZXZfZmMtPmZsb3dpZCBb
+JXVdIGwyZGMtPnR4X2NoIFsldV0sIGRldi52cGQucG9ydHZlYyBbJXhdCgAAAAAAAAAAcG9ydHZl
+YyBbJXVdCgAAAGwyZGV2X3ZpX2ZzbTogbWIgWzB4JXhdLCBkZWZlcnJlZCwgc3RhdGUgWzB4JXhd
+LCBwb3J0IFsweCV4XQoAAABsMmRldl92aV9mc206IHZpaWQgWzB4JXhdIHBvcnQgWzB4JXhdLCBt
+YWMtaWQgWyUwMng6JTAyeDolMDJ4OiUwMng6JTAyeDolMDJ4XS4gCgAAAAAAAAAAAAAAAAAAAABs
+MmRldl92aV9mc206IHNnZV9lcWlkIFsweCV4XSwgc2dlX2lxaWQgWzB4JXhdLCBzZ2VfZXFjciBb
+MHgleF0sIHJzc19zeiBbMHgleF0KAGwyZGV2X3ZpX2ZzbTogbDJkZXZfZmMtPmZsb3djX25ldF9s
+MmRldl9tdHUgWyV1XSwgbWJfc2NyYXRjaCBbMHgleF0sIHBvcnQgWzB4JXhdCgAAAAAAAAAAAAAA
+AAAAAGwyZGV2X3ZpX2ZzbTogdmlpZCBbJWRdLCB2aV9mYy0+Zmxvd2NfdmlfZmxhZ3MgWzB4JXhd
+CgAAAAAAAAAAAABsMmRldl92aV9mc206IHBmbiBbMHgleF0sIHZmbiBbMHgleF0sIGwyZGV2X2Zj
+LT5mbG93Y19pZCBbMHgleF0sIGxwb3J0IFsweCV4XSwgdmlpZCBbMHgleF0sIGZsYWdzIFsweCV4
+XQoAAAAAAAAAbDJkZXZfdmlfZnNtOiBFcnJvciBmcmVlaW5nIFZJLCByYyBbMHgleF0KAAAAAAAA
+bDJkZXZfdmlfZnNtOiBwaWQgWzB4JXhdLCB2aWlkIFsweCV4XSwgbWJfbG9jIFsweCV4XSwgbWJf
+b3JpZ1sweCV4XSwgbDJkZXZfZmxhZ3MgWzB4JXhdLCByYyBbMHgleF0KAAAAAAAAAAAAAAAAAEFo
+IGhhLi4uZG91YmxlIGZyZWUgb3hfaWQgMHgleCwgcnhfaWQgMHgleAoAAAAAAEhvc3QgUFJMSSBS
+ZXNwb25zZSB0aW1lZG91dDogb3hfaWQgMHgleCByeF9pZCAweCV4CgAAAAAAAAAAAAAAAABwZm4g
+JXUgdmZuICV1IHZpYSBjb21tYW5kCgAAAAAAAHNjaGVkX2lvcXR4X2JwX3ByaW9yaXR5OiBoYXMg
+JXUgZW50cmllcyBvbmx5LCByZXF1aXJlcyAldSBlbnRyaWVzCgAAAAAAAAAAAAAAAAAAdHBfdGlt
+ZXJ2YWxzOiBwYXJzZWQgJWQgaW5zdGVhZCBvZiAldSBlbnRyaWVzCgAAdHBfdGltZXJyZXM6IHBh
+cnNlZCAlZCBpbnN0ZWFkIG9mICV1IGVudHJpZXMKAAAAdHBfbXR1cyBoYXMgJXUgZW50cmllcyBv
+bmx5LCByZXF1aXJlcyAldSBlbnRyaWVzCgAAAAAAAAAAAAAAAAAAAHRwX210dXNbJXVdIGlzICV1
+IGJ5dGVzIHdoaWNoIGlzIG5vdCBzdXBwb3J0ZWQKAGNvbmZpZ3VyYXRpb24gZmlsZSBwYXJzZXI6
+IHNnZSB0aW1lciB2YWx1ZVslaV0gaXMgdG9vIGxhcmdlLCBjaGFuZ2luZyBmcm9tICV1IHRvICV1
+dXNlY3MKAAAAAAAAAGZpbHRlcm1hc2sgMHgleCBpcyBub3QgZXF1YWwvc3Vic2V0IHRvL29mIGZp
+bHRlcm1vZGUKAAAAAAAAAAAAAABod19sZV9jbGlwX2hhbmRsZXI6IHJlbW92ZWQgcG9zPSV1ICg9
+aWR4ICV1KQoAAABod19sZV9jbGlwX2hhbmRsZXI6IGFkZGluZyB0byBwb3M9JXUgKD1pZHggJXUp
+CgBtb2R1bGVbJXVdOiBwb3J0IG1vZHVsZSBpbnNlcnRlZCBhbmQgcmVhZHkKAAAAAABtb2R1bGVb
+JXVdOiBwb3J0IG1vZHVsZSByZW1vdmVkCgAAAAAAAAAAAAAAAAAAAABtb2R1bGVbJXVdOiB1bmtu
+b3duIG1vZHVsZSBpZGVudGlmaWVyIDB4JTAyeAoAAABtb2R1bGVbJXVdOiBncGlvICV1IHRyYW5z
+IDEwRyAweCUwMnggMUcgMHglMDJ4IChsZW5ndGggJXUpIGNhYmxlIDB4JTAyeCAobGVuZ3RoICV1
+KSBtb2R1bGVfdHlwZSAweCUwMngKAAAAAAAAAAAAZmxyX3BmdmZfZnNtWyV1OiV1XTogdW5rbm93
+biBzdGF0ZSAldQoAAAAAAAAAAAAAaHcgcGYgYml0bWFwIDB4JTAyeCB2ZmlkIGJpdG1hcCAweCUw
+OHg6MHglMDh4OjB4JTA4eDoweCUwOHgKAAAAAGFmdGVyIHZmaWQgZml4dXAsIHZmaWQgYml0bWFw
+IDB4JTA4eDoweCUwOHg6MHglMDh4OjB4JTA4eAoAAAAAAAB0aW1lciBxdWV1ZSAldSBsb3N0IGEg
+dGljayEgbmV4dCAlcCBsYXN0ICVwIG51bWUgJXUKAAAAAAAAAAAAAAAAZmxyX3RpbWVyX3N0YXJ0
+OiBmbG93Y19pZCAldSAlcCBidWYgJXAKAAAAAAAAAAAAcGNpZTogbnBmICV1IChwZmJpdG1hcCAw
+eCUwMngpIG52ZiAldSAocGYgMC4uMyAweCUwMnggMHglMDJ4IDB4JTAyeCAweCUwMngpCgAAAABm
+YWlsZWQgdG8gZmluZCB0aGUgJWMlYyBWUEQgcGFyYW1ldGVyCgAAAAAAAAAAAABmYWlsZWQgdG8g
+cGFyc2UgdGhlICVjJWMgVlBEIHBhcmFtZXRlcgoAAAAAAAAAAABmYWlsZWQgdG8gc3VjY2Vzc2Z1
+bGx5IGZpbmQgQ2hlbHNpbyBWUEQKAAAAAAAAAABsb2cgaW5pdGlhbGl6ZWQgQCAweCUwOHggc2l6
+ZSAldSAoJXUgZW50cmllcykgZndyZXYgMHglMDh4IHBjaWVfZncgMHglMDh4CgAAAAAAAGdhdGhl
+cl90YXNrc19mb3JfdG1mOiBpZHggWzB4JXhdLCB0YXNrLWlkIFsweCV4XSwgY21kLWlkIFsweCV4
+XSwgYWN0aXZlIHRhc2tzIFsweCV4XS4gY29ubi1pZCBbMHgleF0sIGNtZCBjb25uLWlkIFsweCV4
+XSwgdGFzayBjb25uLWlkIFsweCV4XQoAAGdhdGhlcl90YXNrc19mb3JfdG1mOiBJbnZhbGlkIHR5
+cGUgWzB4JXhdLCBiYWlsaW5nIG91dC4KAAAAAAAAAABnYXRoZXJfdGFza3NfZm9yX3RtZjogdGFz
+ayBpZCBbMHgleF0sIHN0YXRlIFsweCV4XSwgbGlkeCBbMHgleF0sIGNvb2tpZSBoaSBbMHglMDh4
+XSA6IGxvIFsweCUwOHhdCgAAAAAAAAAAAAAAAAAAZ2F0aGVyX3Rhc2tzX2Zvcl90bWY6IHJjIFsw
+eCV4XSwgWzB4JXhdIHRhc2sgZ2F0aGVyZWQgZm9yIHRtZiB0eXBlIFsweCV4XSBwcm9jZXNzaW5n
+LgoAAAAAAAAAAAAAc2NzaV9kYXRhX291dDogY29ubl9mYyBbMHgleF0sIHN0YXRlIFsweCV4XSwg
+c2Vzc19mYyBbMHgleF0gaW4gcmVjb3ZlcnkuIFNraXBwaW5nIGlzdGFza19mYyBbMHgleF0gZnJv
+bSBUWC4KAAAAAHNlbmRfYWJvcnRfcmVxOiBjc2tfZmMtPmZsb3djX3R5cGUgWzB4JXhdLCBjc2tf
+ZmMtPmZsb3djX2lkIFsweCV4XSwgdGlkIFsweCV4XSwgdWxwdHhjaCBbJXVdLCBidWZmZXJlZCBb
+JXVdCgAAAABodyByZWdpc3RlciBvcGVyYXRpb24gbm90IGNvbXBsZXRpbmcsIHJlZyAweCUwOHgg
+bWFzayAweCUwOHggdmFsdWUgMHglMDh4IChyZWcgMHglMDh4KQoAAAAAAAAAAABNRElPIENMNDU6
+IGZhaWxlZCB0byBzZXQgdXAgTU1EIGFkZHIKAAAAAAAAAAAAAABNRElPOiBmYWlsZWQgdG8gd3Jp
+dGUKAAAAAAAAAAAAAE1ESU8gQ0w0NTogZmFpbGVkIHRvIHNldCB1cCBNTUQgYWRkcgoAAAAAAAAA
+AAAAAE1ESU86IGZhaWxlZCB0byByZWFkCgAAAAAAAAAAAAAACUFRX1Rha2VDb250cm9sT2ZGTEFT
+SDogMWUuYzAwMT0lI3ggMWUuYzQ1MD0lI3ggMWUuYzQ1MT0lI3ggMWUuMTAwPSUjeAoAAAAAAAAA
+AABBUV9BUElfV3JpdGVBbmRWZXJpZnlGbGFzaEltYWdlIC0gSW1hZ2UgaW50ZWdyaXR5IGNoZWNr
+IGZhaWxlZCAoY2FsYyAlI3ggdmFsICUjeCkKAAAAAAAAAAAAAAAAAABBUV9BUElfV3JpdGVBbmRW
+ZXJpZnlGbGFzaEltYWdlIC0gSW1hZ2UgaW50ZWdyaXR5IGNoZWNrIHBhc3NlZAoAQVFfQVBJX1dy
+aXRlQW5kVmVyaWZ5Rmxhc2hJbWFnZSAtIFRpbWVvdXQgd2FpdGluZyBmb3IgZmxhc2ggaW50ZXJm
+YWNlICgldSkKAAAAAABBUV9BUElfV3JpdGVBbmRWZXJpZnlGbGFzaEltYWdlIC0gVGltZW91dCB3
+YWl0aW5nIGZvciBmbGFzaCBpbnRlcmZhY2UgKCV1KQoAAAAAAEFRX0FQSV9Xcml0ZUFuZFZlcmlm
+eUZsYXNoSW1hZ2UgLSBUaW1lb3V0IHdhaXRpbmcgZm9yIGZsYXNoIGludGVyZmFjZSAoJXUpCgAA
+AAAAQVFfQVBJX1dyaXRlQW5kVmVyaWZ5Rmxhc2hJbWFnZSAtIFRpbWVvdXQgd2FpdGluZyBmb3Ig
+Zmxhc2ggaW50ZXJmYWNlICgldSkgKHBwICUjeCBhcCAlI3gpCgAAAAAAQVFfQVBJX1dyaXRlQW5k
+VmVyaWZ5Rmxhc2hJbWFnZSAtIFRpbWVvdXQgd2FpdGluZyBmb3IgZmxhc2ggaW50ZXJmYWNlICgl
+dSkKAAAAAABBUV9BUElfV3JpdGVBbmRWZXJpZnlGbGFzaEltYWdlIC0gVGltZW91dCB3YWl0aW5n
+IGZvciBmbGFzaCBpbnRlcmZhY2UgKCV1KQoAAAAAAEFRX0FQSV9Xcml0ZUFuZFZlcmlmeUZsYXNo
+SW1hZ2UgLSBFcnJvciBvbiBidXJuaW5nIEZMQVNIIChjcmMxNiBtaXNtYXRjaCkKAAAAAAAAc2Vu
+ZF9jbG9zZV9yZXE6IGNza19mYy0+Zmxvd2NfdHlwZSBbMHgleF0sIGNza19mYy0+Zmxvd2NfaWQg
+WzB4JXhdLCBjc2tfZmMtPnRjYl9zdGF0ZSBbMHgleF0KAAAAc2VuZF9jbG9zZV9yZXE6IGNza19m
+Yy0+Zmxvd2NfdHlwZSBbMHgleF0sIGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCB0aWQgWzB4JXhd
+LCB1bHB0eGNoIFsldV0sYnVmZmVyZWQgWyV1XQoAAAAAAG9mbGRfdGNwX2RvX2FjdGl2ZV9jbG9z
+ZTogY3NrX2ZjIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+dGNiX3N0
+YXRlIFsweCV4XQoAAAAAAG9mbGRfdGNwX2RvX2FjdGl2ZV9jbG9zZTogY3NrX2ZjIFsweCV4XSwg
+Y3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+dGNiX3N0YXRlIFsweCV4XQoAAAAAAG9m
+bGRfdGNwX2Rpc2Nvbm5lY3Q6IHRjYl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tfZmMtPmZsb3dj
+X2lkIFsweCV4XSwgY3NrLT50Y2Jfc3RhdGUgWzB4JXhdCgAAAGRlY29kZV9iYXNlNjRfc3RyaW5n
+OiBkbGVuIFslZF0KAAAAAAAAAAAAAAAAAAAAAGRlY29kZV9oZXhfc3RyaW5nOiBkbGVuIFslZF0K
+AAAAZm9pc2NzaV92YWxpZGF0ZV9sb2dpbl9zdGFnZTogLSAxCgAAAAAAAAAAAAAAAAAAYXN5bmNf
+cGR1OiBsb2dvdXQgcmVxdWVzdGVkIGJsb2NraW5nIHNlc3Npb24KAAAAYXN5bmNfcGR1OiBzZXNz
+L2Nvbm4gZHJvcCByZXF1ZXN0ZWQgYmxvY2tpbmcgc2Vzc2lvbgoAAAAAAAAAAAAAAGNwbF90eF9w
+a3Q6IGludGYgWzB4JXhdCgAAAAAAAAAAY3BsX3R4X3BrdDogdmxhbmlkIFsweCV4XQoAAAAAAABu
+ZXRfbDJkZXZfZmluZF9ieV9hZGRyOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBsMmRjLT5s
+cG9ydCBbJXVdLCBsMmRfZmMtPmZsb3djX2lkIFsweCV4XSwgbDJkYy0+aW40X2Rldi5pbl9hZGRy
+LmFkZHIgWzB4JXhdLCBhZGRyIFsweCV4XQoAAABuZXRfbDJkZXZfbXR1X2NvbmZpZzogbDJkZXZf
+ZmMtPmZsb3djX2lkIFsweCV4XSwgbXR1ICV1CgAAAAAAAAAAbmV0aWZfZG9fZGhjcDogd3ItPnBh
+cmFtLnZsYW5pZCBbJXVdLCBsMmRldl9mYy0+Zmxvd2NfbmV0X2wyZGV2X3ZsYW5kZXYgWzB4JXhd
+CgBjcGxfdHhfcGt0OiBpbnRmIFsweCV4XQoAAAAAAAAAAGNwbF90eF9wa3Q6IHZsYW5pZCBbMHgl
+eF0KAAAAAAAAZW5jb2RlIGhleCBzdHJpbmc6IGRsZW4gWyVkXQoAAAB0Y3Bfc2VuZF9hb3Blbl9y
+ZXE6IGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tfZmMtPmZsb3djX3N0YXRlIFsweCV4XSwg
+YnVmZmVyZWQgWyV1XSwgcmVzX2NudCBbMHgleF0sIGlxX2lkeCBbMHgleF0KAAAAAAAAAAAAAHRj
+cF9zZW5kX2FvcGVuX3JlcTogY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+Zmxvd2Nf
+c3RhdGUgWzB4JXhdLCBubyB2YWxpZCBsMnRfZW50eS4gRGVsYXlpbmcgYW5vdGhlciByZXRyeSBm
+b3IgMSBzZWNvbmRzLgoAAAAAAAAAAAAAAAAAAGFvcGVuX3JlcTogaHdfbGVfZmlsdGVyX2N0dXBs
+ZSBmYWlsZWQKAAAAAAAAAAAAAG9mbGRfdGNwX3NlbmRfYW9wZW5fcmVxOiBjcGxfcmVxLT5GaWx0
+ZXIgWzB4JTB4XSwgY3R1cGxlc1swXSBbMHgleF0sIGN0dXBsZXNbMV0gWzB4JXhdCgAAAAAAAAAA
+AGNzb2NrX2FsbG9jOiB0eF9jaCBbMHgleF0sIGxwb3J0IFsweCV4XSwgY29va2llIFslMDh4XQoA
+AAAAAAAAAABjc29ja19hbGxvYzogYXZhaWxhYmxlIFsldV0sIG5jc29jayBbJXVdLCBwb3M6YXRp
+ZCBbMHgleF0sIGNza19mYyBbMHgleF0sIGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBzcG9ydCBb
+JXVdCgAAV0FUQ0hET0c6IE5vIHRlbXBlcmF0dXJlIHNlbnNvciBhdmFpbGFibGUuCgAAAAAAV0FU
+Q0hET0c6IEFjdGl2YXRpbmcKAAAAAAAAAAAAAABXQVRDSERPRyAtIEVuYWJsZSBhY3Rpb24gJXUg
+dGltZSAldQoAAAAAAAAAAAAAAABXQVRDSERPRyAtIERpc2FibGUgYWN0aW9uICV1CgAAAFdBVENI
+RE9HOiBEZS1hY3RpdmF0aW5nCgAAAAAAAAAAZm9pc2NzaSBjb25uX2ZjIFsweCV4XSwgZmxvd2Nf
+c2NoZWRjbCBbMHgleF0sIGluZ19jaCBbMHgleF0sIGVncl9jaCBbMHgleF0KAAAAAABsMmRldl9u
+b3RpZnkgd2l0aCB1bmtub3duIGZsYWcgWzB4JXhdCgAAAAAAAAAAAABGQ29FIEZDQiBsaW5rZG93
+bjogaW9fcmVxIDB4JXgleCBpcWlkIDB4JXggZmxvd2lkIDB4JXggb3AgMHgleAoAZmNfc2VuZF9h
+bGxvY19jcGw6IGZhaWxlZCB0byBzZXR1cCBmaWx0ZXIgY3R1cGxlCgAAAAAAAAAAAAAAAAAAAGZj
+b2VfY29tcHV0ZV9jdHVwbGUgMHgleDoleAoAAAAAY29tcHV0ZV9jdHVwbGUoKTogZmFpbGVkIHRv
+IHNldHVwIGZpbHRlciBjdHVwbGUKAAAAAAAAAAAAAAAAAAAAAGZjb2Ugbm90aWZ5IDogVXBkYXRl
+IG5ldyBEQ0JYIHZhbHVlcyBWSSBzdGF0ZSAweCV4IHByaSAweCV4IHNjaGVkY2wgMHgleCBkY2J4
+X2RvbmUgMHgleAoAAAAAAAAAAGZjb2Ugbm90aWZ5IDogRkNGIGZsb3dpZCAweCV4LCB1bHBjaCAw
+eCV4IAoAAAAAAGZjb2Ugbm90aWZ5IDogRkNvRSBMSU5LVVA6IHBvcnQgMHgleCwgZXZlbnQgMHgl
+eAoAAAAAAAAAAAAAAAAAAABmY29lIG5vdGlmeSA6IEZDb0UgTElOS0RPV046IHBvcnQgMHgleCwg
+ZXZlbnQgMHgleAoAAAAAAAAAAAAAAAAAZmNvZSBub3RpZnkgOiBEQ0JYIDogcG9ydCAweCV4LCBw
+cmlvcml0eSAweCV4IHVscHR4Y2ggMHgleCBjbGFzcyAweCV4CgAAAAAAAAAAAABwb3J0WyV1XSBz
+ZXQgRENCIFBQUCBQQVJBTVM6IHBlICUjeCB0eCAlI3ggcnggJSN4CgAAAAAAAAAAAAAAAAAAY2hf
+Y2xfcmF0ZVsldS8ldV06IGNhcHBlZCBkZWZpY2l0X2luY3IgZnJvbSByZXF1aXJlZCAldSB0byAl
+dTsgcmF0ZSAldSAoZWZmICV1KSBkZWZpY2l0X21heCAldQoARkNvRSBGQ0YgdGltZXI6IGZsb3dj
+IHN0YXRlIDB4JXgsIHBvcnQgMHgleCAsZmNmIDB4JXgsIGZsb3djX2lkIDB4JXgKAAAAAAAAAAAA
+AAB3b3JrYXJvdW5kMTM3MjM6IGRldGVjdGVkIFdSIEAgMHglMDh4IG9mIHNpemUgJXUgYnl0ZXMs
+IGRyaWJibGluZyBpdCBpbiAldSBieXRlcyBhdCBhIHRpbWUKAAAAAAByaV93cl9pbml0WyV1XTog
+bXNzICV1IGlzIG5vdCA4LWJ5dGUgYWxpZ25lZAoAAABjb3JlX3Byb2dyYW1fdGNiOiB0aWQgJSN4
+IHRfc3RhdGUgJSN4IHJjdl9hZHYgMHglMDh4IHJjdl9zY2FsZSAlI3ggdHhfbWF4ICUjeCByY3Zf
+bnh0ICUjeCBhdGlkICUjeAoAAAAAAAAAAAAAAAAACW9wdDAgJSN4JXggb3B0MiAlI3ggaXB2NiAl
+I3ggZmxhZ3NfdGltZXIgMHglMDh4CgAAAAAAAAAAAAAAAAAAAG9mbGRfY29ubmVjdGlvbl93cjog
+Y29ubmVjdGlvbiB3aXRoIDUtdHVwbGUgbHAgMHglMDR4IGZwIDB4JTA0eCBsaXAgMHglMDh4JTA4
+eCBwaXAgMHglMDh4JTA4eCBmaWx0ZXIgMHglMDh4IGV4aXN0cyBAIExFIGluZGV4ICV1CgAAAAAA
+AAAAAAAAAAAAAG9mbGRfY29ubmVjdGlvbl93cjogY29ubmVjdGlvbiB3aXRoIDUtdHVwbGUgbHAg
+MHglMDR4IGZwIDB4JTA0eCBsaXAgMHglMDh4IHBpcCAweCUwOHggZmlsdGVyIDB4JTA4eCBleGlz
+dHMgQCBMRSBpbmRleCAldQoAAAAAAAAAb2ZsZF9jb25uZWN0aW9uX3dyOiBjb25uZWN0aW9uIHdp
+dGggNS10dXBsZSBscCAweCUwNHggZnAgMHglMDR4IGxpcCAweCUwOHglMDh4IHBpcCAweCUwOHgl
+MDh4IGZpbHRlciAweCUwOHgKAAAAAG9mbGRfY29ubmVjdGlvbl93cjogY29ubmVjdGlvbiB3aXRo
+IDUtdHVwbGUgbHAgMHglMDR4IGZwIDB4JTA0eCBsaXAgMHglMDh4IHBpcCAweCUwOHggZmlsdGVy
+IDB4JTA4eAoAAAAAAAAAAAAAAABJUUZMSU5UIHBmbiAldSB2Zm4gJXU6IGlxZXNpemUgJXUgdG9v
+IHNtYWxsCgAAAABJUUZMSU5UIHBmbiAldSB2Zm4gJXU6IGlxaWQgJXUgdG9vIGxhcmdlIChtYXgg
+JXUpCgAAAAAAAAAAAAAAAAAASVFGTElOVCBwZm4gJXUgdmZuICV1OiBpcWlkICV1IG5vdCBhbGxv
+Y2F0ZWQKAAAASVFGTElOVCBwZm4gJXUgdmZuICV1OiBmbDBpZCAldSB0b28gbGFyZ2UgKG1heCAl
+dSkKAAAAAAAAAAAAAAAAAElRRkxJTlQgcGZuICV1IHZmbiAldTogZmwwaWQgJXUgbm90IGFsbG9j
+YXRlZAoAAElRRkxJTlQgcGZuICV1IHZmbiAldTogZmwxaWQgJXUgdG9vIGxhcmdlIChtYXggJXUp
+CgAAAAAAAAAAAAAAAABJUUZMSU5UIHBmbiAldSB2Zm4gJXU6IGZsMWlkICV1IG5vdCBhbGxvY2F0
+ZWQKAABJUUZMSU5UIHBmbiAldSB2Zm4gJXU6IGZsMWlkICV1IGlzIHZhbGlkIGJ1dCBub3QgZmww
+aWQgJXUKAAAAAAAASVFGTElOVCBwZm4gJXUgdmZuICV1OiBmbDFpZCAldSBpcyB2YWxpZCBidXQg
+aGVhZGVyIHNwbGl0IGZlYXR1cmUgaXMgbm90IGVuYWJsZWQKAAAAAAAAAAAAAAAAAAAASVEgcGZu
+ICV1IHZmbiAldTogaXFpZCAldSB0b28gbGFyZ2UgKG1heCAldSkKAAAASVEgcGZuICV1IHZmbiAl
+dTogaXFpZCAldSBub3QgYWxsb2NhdGVkCgAAAAAAAAAASVEgcGZuICV1IHZmbiAldTogZmwwaWQg
+JXUgZmwxaWQgJXUgYnV0IG5vdCBzdXBwb3J0ZWQKAAAAAAAAAAAAAGh3X3VscHR4X3dvcmthcm91
+bmRfcHIxNjk0OV9lbmFibGVkX3BmOiBwZiAldSBlbmFibGVkICV1CgAAAAAAAABod191bHB0eF93
+b3JrYXJvdW5kX3ByMTY5NDlfZW5hYmxlZF92ZmlkOiB2ZmlkICV1IGVuYWJsZWQgJXUKAAAARVEg
+cGZuICV1IHZmbiAldTogY3JlYXRpbmcgRVRIIGVxaWQgJXUgd2l0aCBwZW5kaW5nIFdSKHMpIChu
+dW1fYnl0ZXMgJXUgYW5kIGZsYWdzIDB4JTA4eAoAAAAAAAAARVEgcGZuICV1IHZmbiAldTogY3Jl
+YXRpbmcgQ1RSTCBlcWlkICV1IHdpdGggcGVuZGluZyBXUihzKSAobnVtX2J5dGVzICV1IGFuZCBm
+bGFncyAweCUwOHgKAAAAAAAARVEgcGZuICV1IHZmbiAldTogZXFpZCAldSB0b28gbGFyZ2UgKG1h
+eCAldSkKAAAARVEgcGZuICV1IHZmbiAldTogZXFpZCAldSBub3QgYWxsb2NhdGVkCgAAAAAAAAAA
+aHdfY2ltX3RwX3dvcmthcm91bmQxMzcyM19lbmFibGU6IHBvcnQgJXUgcHJvdG9jb2wgMHgleCBl
+biAldSBjdXJyZW50IDB4JXggd29ya2Fyb3VuZF9wcjEzNzIzIDB4JXggbmV4dCAweCV4CgAAAHBv
+cnRfYmxpbmtfbGVkX3Jlc3RvcmUKAAAAAAAAAAAAcG9ydF9ibGluazogYmxpbmtkdXI9MHgleCBi
+bGlua19yZWZjbnQKAAAAAAAAAAAAcG9ydF9ibGluazogCWJsaW5rX3JlZmNudD0weCV4CgBwb3J0
+X2JsaW5rOiAJYmxpbmtfcmVmY250PTB4JXgKAG1paV9hZHZfZmNbJXVdOiByY2FwcyAweCV4CgAA
+AAAAbWlpX2Fkdl9zcGVlZFsldV06IHJjYXBzIDB4JXgKAABtaWlfaW5pdFsldV06IGFjYXBzIDB4
+JXgKAAAAAAAAAHBvcnRbJXVdOiBnYXZlIHVwIGZpeGluZyBlcnJvcnMhISEKAAAAAAAAAAAAAAAA
+AG1paV9hbnJlc3RhcnRbJXVdOiBhY2FwcyAweCV4CgAAaHdfeGdtX3BvcnRfbHBiayBwb3J0ICV1
+IHB0eXBlICUjeCBhY3Rpb24gJSN4CgAAcG9ydFsldToweCUwMng6MHglMDJ4XTogbDFjZmcsIHBj
+YXBzIDB4JXggYWNhcHMgMHgleCByY2FwcyAweCV4CgAAAAAAAAAAAAAAAAAAAABwb3J0WyV1OjB4
+JTAyeDoweCUwMnhdOiBsMWNmZywgaW52YWxpZCByZXF1ZXN0LCBwY2FwcyAweCV4IGFjYXBzIDB4
+JXggcmNhcHMgMHgleAoAAAAAAAAAAAAAAAAAAABwb3J0WyV1OjB4JTAyeDoweCUwMnhdOiBsMWNm
+ZywgbWRpIGlzc3VlIHBjYXBzIDB4JXggYWNhcHMgMHgleCByY2FwcyAweCV4CgAAAAAAAHBvcnRb
+JXU6MHglMDJ4OjB4JTAyeF06IGwxY2ZnLCBjYW5ub3QgZm9yY2Ugbm8vbXVsdGlwbGUgc3BlZWQo
+cyksIHBjYXBzIDB4JXggYWNhcHMgMHgleCByY2FwcyAweCV4CgAAAAAAAAAAAAAAAABldGhfZmxv
+d2NfaGFuZGxlclsweCV4XTogZmxhZ3MgMHglMDh4IG51bV9ieXRlcyAldSBzY2hlZGNsIDB4JXgg
+LT4gMHgleAoAAAAAAAAAAHNjc2lfY21kOiByZWNlaXZlZCBUTUYgb3AgWzB4JXhdIGZ1bmMgWzB4
+JXhdIG9uIGNvbm4gWzB4JXhdIHRocm91Z2ggY29tbWFuZCBwYXRoLgoAAAAAAAAAAAAAAAAAAHNj
+c2lfY21kOiBjb25uX2ZjIFsweCV4XSwgc3RhdGUgWzB4JXhdLCBzZXNzX2ZjIFsweCV4XSBpbiBy
+ZWNvdmVyeS4gU2tpcHBpbmcgaXN0YXNrX2ZjIFsweCV4XSBmcm9tIFRYLgoAAAAAAAAAAABzY3Np
+X2NtZDogaVNDU0kgY29tbWFuZCBzZXF1ZW5jZSB3aW5kb3cgY2xvc2VkLiBjb25uIFsweCV4XSwg
+b3AgWzB4JXhdLCAgY21kc24gWzB4JXhdLCBzZW50X2NtZHNuIFsweCV4XSwgbWF4X2NtZHNuIFsw
+eCV4XSwgaXR0IFsweCV4XQoAAAAAAAAAAABzY3NpX3JlYWQ6IGNvbm5fZmMgWzB4JXhdLCBzdGF0
+ZSBbMHgleF0sIHNlc3NfZmMgWzB4JXhdIGluIHJlY292ZXJ5LiBTa2lwcGluZyBpc3Rhc2tfZmMg
+WzB4JXhdIGZyb20gVFguCgAAAAAAAAAAc2NzaV9yZWFkOiBpU0NTSSBjb21tYW5kIHNlcXVlbmNl
+IHdpbmRvdyBjbG9zZWQuIGNvbm4gWzB4JXhdLCBjbWRzbiBbMHgleF0sIHNlbnRfY21kc24gWzB4
+JXhdLCBtYXhfY21kc24gWzB4JXhdCgAAAAAAAAAAAAAAAAAAAABzY3NpX3dyaXRlOiBjb25uX2Zj
+IFsweCV4XSwgc3RhdGUgWzB4JXhdLCBzZXNzX2ZjIFsweCV4XSBpbiByZWNvdmVyeS4gU2tpcHBp
+bmcgaXN0YXNrX2ZjIFsweCV4XSBmcm9tIFRYLgoAAAAAAAAAc2NzaV93cml0ZTogaVNDU0kgY29t
+bWFuZCBzZXF1ZW5jZSB3aW5kb3cgY2xvc2VkLiBjb25uIFsweCV4XSwgY21kc24gWzB4JXhdLCBz
+ZW50X2NtZHNuIFsweCV4XSwgbWF4X2NtZHNuIFsweCV4XSwgaXR0IFsweCV4XQoAAABkY2J4X2Nv
+bnRyb2xfc21bJXVdIENPTlRST0xfTElOS1VQCgAAAAAAAAAAAAAAAABkY2J4X2NvbnRyb2xfc21b
+JXVdIENPTlRST0xfVVBEQVRFX0RDQlhfVExWCgAAAABkY2J4X2NvbnRyb2xfc21bJXVdIENPTlRS
+T0xfUEVFUl9OT1RfQURWRVJUSVNFX0RDQlgKAAAAAAAAAAAAAAAAZGNieF9jb250cm9sX3NtWyV1
+XSBDT05UUk9MX1VQREFURV9PUEVSX1ZFUlNJT04KAAAAAAAAAAAAAAAAAAAAAGRjYnhfY29udHJv
+bF9zbVsldV0gQ09OVFJPTF9QUk9DRVNTX1BFRVJfVExWCgAAAGRjYnhfY29udHJvbF9zbVsldV0g
+Q09OVFJPTF9BQ0tfUEVFUgoAAAAAAAAAAAAAAGRjYnhfaWVlZV92YWxpZGF0ZVsldV0gZXJyb3Ig
+KG91aSAlI3ggc3VidHlwZSAlI3ggbGVuICUjeCkKAAAAAABkY2J4X2NlZV92YWxpZGF0ZVsldV0g
+ZXJyb3IKAAAAAHByb2Nlc3NfZGhjcF9vcHRzOiByb290IHBhdGggbGVuIFslZF0gYnl0ZXMKAAAA
+AG5ldGlmX3Byb2Nlc3NfZGhjcF9vcHRzOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBNU0df
+VFlQRSBbJWRdLCBkaGN0eHQtPnN0YXRlIFslZF0KAAAAAAAAAAAAAGljbXBfcmVjdjogbDJkZXZf
+ZmMtPmZsb3djX2lkIFsweCV4XSwgcGlkIFsweCV4XSwgaWNtcCB0eXBlIFsweCV4XQoAAAAAAAAA
+AAAAAAAAZmNfc2VuZF9hbGxvY19jcGw6IGZhaWxlZCB0byBzZXR1cCBmaWx0ZXIgY3R1cGxlCgAA
+AAAAAAAAAAAAAAAAAGZjb2VfY29tcHV0ZV9jdHVwbGUgMHgleDoleAoAAAAAY29tcHV0ZV9jdHVw
+bGUoKTogZmFpbGVkIHRvIHNldHVwIGZpbHRlciBjdHVwbGUKAAAAAAAAAAAAAAAAAAAAAGZjb2Vf
+Y29tcHV0ZV9jdHVwbGUgdmxhbiAleCB2aWlkICV4IHBvcnQgJXggbXBzX2lkeCAleAoAAAAAAAAA
+AABpZ25vcmluZyBmaXAgcmVjdiBmb3IgZmNmIGZsb3c6JXggaW4gb2ZmbGluZSBzdGF0ZQoAAAAA
+AAAAAAAAAAAAQUJUUyBBQ0MgYXdhaXRpbmcgUFJMSSBSc3A6IGZsb3djX2lkIDB4JXggb3hfaWQg
+MHgleCByeF9pZCAweCV4IGlxaWQgMHgleAoAAAAAAABhcnBfcmVjdjogaXBpZCBbMHgleF0sIGlu
+X2FkZHIuYWRkciBbMHgleF0sIHNpcCBbMHgleF0sIHJpcCBbMHgleF0sIGFycF9vcCBbMHgleF0K
+AAAAAAAAAAAAAAAAAABjaG5ldF9hcnBfcmVjdjogaXAgY29uZmxpY3QgZGV0ZWN0ZWQKAAAAAAAA
+AAAAAABjaG5ldF9hcnBfcmVjdjogcGlkIFsldV0sIHZsYW4gWzB4JXhdLCBhcnAgb3AgWzB4JXhd
+LCBzaXAgWzB4JXhdLCByaXAgWzB4JXhdCgAAAGNzb2NrX2ZyZWU6IHNpemVvZihjc2tfZmMtPnUu
+Y3NvY2spIFsldV0sIGJ5dGVzCgAAAAAAAAAAAAAAAAAAAABHb3QgQ09OTl9FWElTVCBmb3IgeGlk
+OjB4JXgsIHRhZzoweCV4LCByZXRyeWluZy4KAAAAAAAAAAAAAAAAAAAAY3NvY2tfcGVlcl9jbG9z
+ZTogY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIHRjYl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tf
+ZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgdGNiX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0KAAAAAABj
+c29ja19wZWVyX2Nsb3NlOiBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19z
+dGF0ZSAgWzB4JXhdCgAAAAAAAAAAAGh3X3VscHR4X3dvcmthcm91bmRfcHIxNjk0OV9lbmFibGVk
+X3BmX2lxOiBpcSAldSBlbmFibGVkICV1IChwZiAldSkKAAAAAAAAAAAAAAAAdGNwX2Nsc19hYnJ0
+X3JwbDogdGNiIHRpZCBbMHglMDZ4XSwgZmxvd2NfdHlwZSBbMHgleF0sIGNwbG9wIFsweCV4XSAK
+AAAAAAAAAAAAAABjaF9yYXRlWyV1XTogY2FwcGVkIHRpY2sgZnJvbSByZXF1aXJlZCAldSB0byBz
+dXBwb3J0ZWQgJXU7IHJhdGUgJXUgKGVmZiAldSkgZGVmaWNpdF9pbmNyICV1IHRpY2sgJXUKAAAA
+AAAAAAAAAAAAcGt0c2NoZWRfY2hfcmxbJXVdOiBjaGFubmVsIHJsIG5vdCBhdmFpbGFibGUgaW4g
+Y29uanVuY3Rpb24gd2l0aCBmbG93IHNoYXBpbmcKAABwa3RzY2hlZF9jaF9ybFsldV06IHJhdGUg
+JXUgbWF4ICV1CgAAAAAAAAAAAAAAAABwa3RzY2hlZF9jbF93cnJbJXU6JXVdOiB3ZWlnaHQgJXUg
+d2VpZ2h0ZWRfbWFzayAweCV4CgAAAAAAAAAAAAAAZXFfcGFyYW1zWzB4JXg6MHgleF06IGRtYXEg
+MHgleCByZWFkICV1IHBmICV1IGVxaWRfYXBpICV1IHJldCAlZAoAAAAAAAAAAAAAAAAAAABod19t
+YV9hZGRyX3RvX21lbV90eXBlX29mZjogTUEgYWRkcmVzcyAweCUwOHggaXMgbm90IG1hcHBlZAoA
+AAAAaHdfbWFfYWRkcl90b19tZW1fdHlwZV9vZmY6IE1BIGFkZHJlc3MgMHglMDh4IG1hcHMgdG8g
+dHlwZSAldSBvZmZzZXQgMHgleAoAAAAAAABtZW1fbWFsbG9jX3RlbXA6IGZhaWxlZCB0byBhbGxv
+Y2F0ZSAldSBieXRlcywgcmV0dXJuaW5nIE5VTEwKAAAAbWVtX21hbGxvYzogZmFpbGVkIHRvIGFs
+bG9jYXRlICV1IGJ5dGVzLCByZXR1cm5pbmcgTlVMTAoAAAAAAAAAAGxlIGNvbmZpZ3VyYXRpb246
+IGhhc2ggbW9kZSByZXF1aXJlcyBhdCBsZWFzdCAxNiBlbnRyaWVzLCBuaGFzaCAldQoAAAAAAAAA
+AAAAAAAAbGUgY29uZmlndXJhdGlvbjogaGFzaCBtb2RlIHJlcXVpcmVzIGF0IGVudHJpZXMgdG8g
+YmUgYSBwb3dlciBvZiAyLCBuaGFzaCAldQoAAABsZSBjb25maWd1cmF0aW9uOiByZXF1ZXN0ZWQg
+JXUgdGNhbSBlbnRyaWVzIGJ1dCBvbmx5ICV1IGF2YWlsYWJsZSAobnJvdXRlICV1IG5jbGlwICV1
+IG5maWx0ZXIgJXUgbnNlcnZlciAldQoAAAAAbGUgY29uZmlndXJhdGlvbjogdGNhbSByZWdpb25z
+IG11c3QgaGF2ZSBtdWx0aXBsZSBvZiAzMiBlbnRyaWVzLCBucm91dGUgJXUgbmNsaXAgJXUgbmZp
+bHRlciAldSBuc2VydmVyICV1CgAAAAAAAGh3X3RwX3RjcF90dW5pbmdzOiB0dW5pbmcgZm9yIGNs
+dXN0ZXIgZW52aXJvbm1lbnQKAAAAAAAAAAAAAAAAAABod190cF90Y3BfdHVuaW5nczogdHVuaW5n
+IGZvciBMQU4gZW52aXJvbm1lbnQKAABod190cF90Y3BfdHVuaW5nczogdHVuaW5nIGZvciBXQU4g
+ZW52aXJvbm1lbnQKAABod190cF90Y3BfdHVuaW5nczogbWFudWFsIHR1bmluZwoAAAAAAAAAAAAA
+AAAAAABjb25maWd1cmF0aW9uIGZpbGUgcGFyc2VyIGVuY291bnRlcmVkIGVycm9yIEAgbGluZSAl
+dToKAAAAAAAAAAAAaHdfaTJjX3RyYW5zYWN0aW9uOiBuZGF0YSAldSBhZGRyX29wIDB4JXggZGF0
+YVswXSAweCV4IGRpZmYgJXUKAGh3X2kyY190cmFuc2FjdGlvbjogbmRhdGEgJXUgYWRkcl9vcCAw
+eCV4IGRhdGFbMF0gMHgleCBkaWZmICV1IGRwb3MgJXUgY29udCAldSBmYWlsZWQgd2l0aCBlcnIg
+JWQKAAAAAAAAAAAAAAAAAABpMmMgdHJhbnNhY3Rpb24gZmFpbGVkIHRvIGNvbXBsZXRlCgAAAAAA
+AAAAAAAAAABIT1NUIFBBR0VfU0laRSBbMHglMGx4XSB0b28gc21hbGwsIG1pbiBbMHglMGx4XSBy
+ZXF1aXJlZAoAAAAAAAAAcGFnZSBzaXplIFslbHVdIG1pc21hdGNoCgAAAAAAAABQQUdFIHNpemUg
+JWx1IHVuc3VwcG9ydGVkLCBkZHAgZGlzYWJsZWQKAAAAAAAAAABIb3N0IHBhZ2Vfc2l6ZSAlbHUs
+IGRkcF9pZHggJXUKAEZDb0UgRERQIGluaXQ6IGZjb2UgbGxpbWl0IDB4JXgsIGZjb2UgdWxpbWl0
+IDB4JXggZ2JsIGxsaW1pdCAweCV4IGdibCB1bGltaXQgMHgleCBwY2JzeiAleAoAAAAAAEZDb0Ug
+RERQIGluaXQ6IGZjb2UgcHBvZCBvZmYgMHgleCwgZmNvZSBzdCBwcG9kIGFkZHIgMHgleCBmY29l
+IG51bSBwcG9kcyAweCV4CgAAZmNvZSB4Y2hnIG1nciBpbml0OiBOdW1iZXIgb2YgZXhjaGFuZ2Vz
+IGZvciBGQ29FIGlzICV4CgAAAAAAAAAAAGZjb2VfbDJ0X2luaXQ6IE5vIHVscHR4IGNyZWRpdCBj
+aDpbJXVdCgAAAAAAAAAAAGZjb2VfbDJ0X2luaXQ6IGNoOlsldV0gbDJ0X2lkeCBbJXVdCgAAAAAA
+AAAAAAAAAHBvcnRfaHNzX3NpZ2RldFsldV06IGhzc19zaWdkZXQgY2hhbmdlZCB0byAweCV4CgAA
+AAAAAAAAAAAAAAAAAABwb3J0WyV1XSBsaW5rIHVwICgldSkgKHNwZWVkICUjeCBhY2FwcyAlI3gg
+bHBjYXBzICUjeCkKAAAAAAAAAAAAUVNGUCBtb2R1bGUgdW5wbHVnIC0gcmVpbml0aWFsaXppbmcg
+cnhfbG9zICB0byAweGZmCgAAAAAAAAAAAAAAAGdwaW9fcXNmcF9tb2R1bGVfdXBkYXRlOiBjaGFu
+Z2VkIHJ4X2xvcyBmcm9tIDB4JXggdG8gMHgleAoAAAAAAABncGlvX3FzZnBfbW9kdWxlX3VwZGF0
+ZTogY2hhbmdlZCB0eF9kaXMgZnJvbSAweCV4IHRvIDB4JXgKAAAAAAAAQ2FsY3VsYXRpb24gb3V0
+IG9mIGJvdW5kcyBmdXJpbmcgaW5pdDogJSN4ICUjeCAlI3gKAAAAAAAAAAAAAAAAAGh3X3NnZV9t
+YW1lbV9pbml0OiBlbmNvdW50ZXJlZCBlcnJvciAlZAoAAAAAAAAAAF9od190cF9wZ21uZ3Q6IHR4
+X3BhZ2VfbWF4ICV1IHJ4X3BhZ2VfbWF4ICV1IHBzdHJ1Y3RzICV1IHNpemUgJXUKAAAAAAAAAAAA
+AAAAAAAAbXBhcnRpdGlvbl9vdGhlcnNfdG90YWw6IGRkcCAldSBkZHBfaXNjc2kgJXUgc3RhZyAl
+dSBwYmwgJXUgcnEgJXUgcnF1ZHAgJXUgLT4gJXUKAAAAAAAAAAAAAAAAAAAAX21wYXJ0aXRpb25f
+YmFua3NfbWNYOiBuYmFua3NfcG10eCAldSAoJXVNQikgbmJhbmtzX3BtcnggJXUgKCV1TUIpIG5i
+YW5rc19vdGhlcnMgJXUgKCV1TUIpIG5iYW5rc19mdyAldSAoJXVNQikKAF9tcGFydGl0aW9uX2Jh
+bmtzX21jMTogbmJhbmtzX3BtdHggJXUgKCV1TUIpIG5iYW5rc19vdGhlcnMgJXUgKCV1TUIpIG5i
+YW5rc19mdyAldSAoJXVNQikKAAAAAAAAAF9tcGFydGl0aW9uX2JhbmtzX21jMDogbmJhbmtzX3Bt
+cnggJXUgKCV1TUIpIG5iYW5rc19vdGhlcnMgJXUgKCV1TUIpCgAAAAAAAAAAAAAAbWVtX21hbGxv
+Y19pbnRlcm5hbDogZmFpbGVkIHRvIGFsbG9jYXRlICV1IGJ5dGVzLCByZXR1cm5pbmcgTlVMTAoA
+AAAAAAAAAAAAAAAAAABod19lZGNfYmlzdFsldV06IGJpc3RfY21kWzB4JTA4eF0gYWRkciAweCV4
+IGxlbiAweCV4CgAAAAAAAAAAAAAAaHdfZWRjX2Jpc3RbJXVdOiBkb25lLCBlbmNvdW50ZXJlZCAl
+dSBlcnJvcnMgb24gZmlyc3QgYW5kICV1IGVycm9ycyBvbiBzZWNvbmQgYXR0ZW1wdCAoJXVnYnBz
+KQoAbWVtX2luaXRfY2FjaGVzOiBjYWNoZV9zaXplICV1IGZsb3djX2J1Zl90Y2JfY2FjaGVfc2l6
+ZSAldSBidWZsbDY0X2NhY2hlX3NpemUgJXUKAAAAAAAAAAAAAAAAAAAAcXVldWVzX3Blcl9wYWdl
+OiBwZiAldSBoYXMgYSBiYXJzaXplIG9mICV1LWJ5dGVzLCBvY3Ffc2l6ZSAldQoAAHNnZSByZXF1
+aXJlIG5lcSAldSBuaXEgJXUgcm91bmRpbmcgdG8gJXUgJXUKAAAAAG1wYXJ0aXRpb25fcG10eDog
+bSAweCUwOHggc2l6ZSAldQoAAAAAAAAAAAAAAAAAAG1wYXJ0aXRpb25fcG1yeDogbSAweCUwOHgg
+c2l6ZSAldQoAAAAAAAAAAAAAAAAAAG1wYXJ0aXRpb25fZWRjIChubyBleHRtZW0pOiBtIDB4JTA4
+eCBzaXplICV1CgAAAG1wYXJ0aXRpb25fZWRjX2VzdGltYXRlOiBodyBtb2R1bGVzIHJlcXVpcmUg
+JWQgYnl0ZXMgaW4gRURDCgAAAABmb2lzY3NpX2J5ZTpsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhd
+LCBsMmRldl9mYy0+Zmxvd2NfcGNpZV9wZm4gWzB4JXhdLCBsMmRldl9mYy0+Zmxvd2NfcGNpZV92
+Zm4gWzB4JXhdLCBwb3J0IFsweCV4XQoAAAAAAAAAAAAAAGZvaXNjc2lfYnllOnZsYW5kZXZfZmMt
+PmZsb3djX2lkIFsweCV4XSwgdmxhbmRldl9mYy0+Zmxvd2NfcGNpZV9wZm4gWzB4JXhdLCB2bGFu
+ZGV2X2ZjLT5mbG93Y19wY2llX3ZmbiBbMHgleF0sIHBvcnQgWzB4JXhdCgAAAAAAY3JfbW9kdWxl
+X3J4X2xvc1sldV06IHJ4X2xvcyBjaGFuZ2VkIHRvICV1CgAAAAAAcGZuICV1IHZmbiAldSBoYXMg
+cG5kdHhucyAldSBhZnRlciAxMDBtcwoAAAAAAAAAYmFkIG1haWxib3ggY21kOiBwZm4gMHgleCB2
+Zm4gMHgleDsgb3Bjb2RlIDB4JXggPiBMQVNUQzJFIDB4JXgKAG1haWxib3ggY21kIG5vdCB5ZXQg
+c3VwcG9ydGVkOiBwZm4gMHgleCB2Zm4gMHgleDsgb3Bjb2RlIDB4JXgKAABiYWQgbWFpbGJveCBj
+bWQ6IHBmbiAweCV4IHZmbiAweCV4OyBvcGNvZGUgMHgleCBpcyB2YWxpZCBwb3N0IGRldmljZSBp
+bml0IG9ubHkKAGJhZCBtYWlsYm94IGNtZDogcGZuIDB4JXggdmZuIDB4JXg7IG9wY29kZSAweCUw
+MnggcmFtYXNrIDB4JXggY21kIHJhbWFzayAweCV4CgAAYmFkIG1haWxib3ggY21kOiBwZm4gMHgl
+eCB2Zm4gMHgleDsgb3Bjb2RlIDB4JTAyeCBsZW4xNiAweCV4IHZlcnN1cyBleHBlY3RlZCBsZW4x
+NiAweCV4CgAAAAAAAAAAaW5zdWZmaWNpZW50IGNhcHMgdG8gcHJvY2VzcyBtYWlsYm94IGNtZDog
+cGZuIDB4JXggdmZuIDB4JXg7IHJfY2FwcyAweCV4IHd4X2NhcHMgMHgleCByZXF1aXJlZCByX2Nh
+cHMgMHgleCB3X2NhcHMgMHgleAoAAAAAAAAAAABpbnN1ZmZpY2llbnQgY2FwcyB0byBwcm9jZXNz
+IG1haWxib3ggY21kOiBwZm4gMHgleCB2Zm4gMHgleDsgcl9jYXBzIDB4JXggd3hfY2FwcyAweCV4
+IHJlcXVpcmVkIHJfY2FwcyAweCV4IHdfY2FwcyAweCV4CgAAAAAAAAAAAFZQRCByZWdpb24gaXMg
+dG9vIHNtYWxsIChTRVJDRkdfU1JfUEZOVlBEU0laRSAweCV4KQoAAAAAAAAAAAAAAABjZjogZmFp
+bGVkIHRvIGFsbG9jYXRlZCBtZW1vcnkgZm9yIGNvbmZpZ3VyYXRpb24gZmlsZSwgcmV0ICVkCgAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ggAAASAAAAAAAAAAggAAAQAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+BoCAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAoAAAAAAAAAAAAACAAMAAAAAAWAIAAAAAAMAAAAAAAAA
+AAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAAAAAgAAAAAAAAAAAAAAABAAOAAAAAAAAAAAAAAAIAAAAA
+AAAAAAAgA4AAAAAAAAAAAAAQAoAAgAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAKA
+AAAAAAAAAAAAAAIAAAAAAAAAAAAAAAKAAAAAAAAAAAABAAMAAAAAAAAAAAAAAoMAAAAAAAAAAAAQ
+AoAAAAAAAAAAAAAwAAMAAAAAAAAIAAAwAAMAAAAAAAAAAAAwBYMAAAAAAAAIAAAwBYMAAAAAAAAA
+AAAwBIMAAAAAAAAIAAAwBIMAAAAAAAAAAAAwAwMAAAAAAAAIAAAwAwMAAAAAAAAAAAA4AwMAAAAA
+AAAAAAA4BYMAAAAAAAAAAAA4BIMAAAAAAAAAAAA4AAMAAAAAAAAAAAA0BoIAAAAAAAAAAAA8A4IA
+AAAAAAAAAAA8AAMAAAAAAAAIAAA8AAMAAAAAAAAAAAA8BIMAAAAAAAAAAAA8BQMAAAAAAAAAAAA9
+BAMAAAAAAAAAAAA8A4MAAAAAAAAAAAAsAAIAAAAAAAAAAAAsBYIAAAAAAAAAAAAsBQIAAAAAAAAA
+AAAQBoAAAAAAAAAAAAAQBoLAAAAAAAAAAAAQBoKAAAAAAAAAAAAADoIAAAAAAAAAAAAQB4KAAAAA
+IAAAAAAAB4IAAAAAIAAAAAAQBwKAAAAAAAAAAAAQBwKAAAAAAAAAAAAQBwKAAAAAAAAAAAAABwIA
+AAAAIAAAAAAQF4MAAAAAAAAIAAAQF4MAAAAAAAAIAAAQAAAAAAAAAAAAAAAQBgOAAAAAAAAAAAAA
+DgMAAAAAAAAAAAAQBgNAAAAAAAAAAAAQBgMAAAAAAAAAAAAQBgAAAAAAAAAAAAAABgOAAAAAAAAA
+AAAABgMAAAAAAAAAAAAADgIAAAAAAAAAAAAADgIAAAAAAAAAAAAQBgIAAAAAAAAAAAAQBgIAAAAA
+AAAAAAAQBgKAAAAAAAAAAAAQBgKAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAACAAAAAAAAAAAAEAMAAAAAAAAIAAAAAAAAAAAAAAAAAAD/////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////8AAAAgAAAA
+AMAAAAAAAAAgAAAAAOAAAAAAAAAAAgAAAAAAAABAAAAAAAAAAAAAAAAAAAEhAAAAAAAAAAAAAQEg
+AAAAAAAAAAAAAAIAAAAEAAQAAAAABQAAAAQAAAAAAAAAAACgAAAAAIAAAAAAgABAAAAAAAACAAAA
+gAAgAAAAAAACAAABAEAAAAAAAAAAAAABAEIAAAAAAAAAAAAAACAAAAAAAAAAAAACECAAAAAAAAAA
+AAACDAIAAAAAAAAAAAAAhQIAAAAEAAAAAAAAgEIAAAAAAAAAAAACACIAAAAAAAAAAAAAgEEAAAAA
+AAAAAAAAgEGAAAAAAAAAAAACACEAAAAAAAAAAAAAECCAAAAAAAAAAAACJQCAAAAAAAAAAAAABQAA
+AAAAAAAAAAAIiASAAAAAAAAAAAAIiASAAAAAAAAAAAAIogCAAAAAAAAAAAAIogCAAAAAAAAAAAAI
+owCAAAAAAAAAAAAIowCAAAAAAAAAAAAIpICAAAAAAAAAAAAIpICAAAAAAAAAAAAEpIDAAAAAAAAA
+AAAEogDAAAAAAAAAAAAEowDAAAAAAAAAAAAEiATAAAAAAAAAAAAACQGAAAAAAAAAAAACDACAAAAA
+AAAAAAAAiATAAAAAAAAAAAAAiASAAAAAAAAAAAACCwCAAAAAAAAAAAAAioCAAAAAAAAAAAAAC4CA
+AAAAAAAAAAAAjACAAAAAAAAAAAACIBCAAAAAAAAAAAACCgCAAAAAAAAAAAACCoCAAAAAAAAAAAAA
+CQKAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAQFAAAAAAAAAAAAAAQCAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAACAAAAAAAAAAAAAAIEQAAAAAAAAAAAAAIEIAAAAAAAAAAAAAIEEAAAAAAAAAAAAAIGAAAAA
+AAAAAAAAgADAAAAAAAAAAAAAgACgAAAAAAAAAAAAAAgAAAAAAAAAAAAAgYAAAAAAAAAAAAAAgYCA
+AAAAAAAAAAAAiYCAAAAAAAAAAAAAiYDAAAAAAAAAAAAAAYIAAAAAAAAAAAACAYAAAAAAAAAAAAAC
+AYCAAAAAAAAAAAAAQYGAAAAAAAAAAAACAYGAAAAAAAAAAAAASYGAAAAAAAAAAAACCYGAAAAAAAAA
+AAACAYEAAAAAAAAAAAAAQYEAAAAAAAAAAAAgAAAAAAAAAAAAAAAQAAACAQAAAAAAAAAQAAACAAAA
+AAAAAAAQAAAAAAAAAAAAAAAAgADAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////8AAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAgAkgAAAAAAAAADZgAgAEAAAAAACACSAAAAAAAAAANyASUEQAAAAAAAAAAA
+AAAAAAAAA5YAIABAAAAAAAgAAAACAIgDhwAAVgAgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAA
+AAAAAAAAAAAAA5YAIABAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAA
+AAAIAAAAAgCIA4UAAJYBIABAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAAAAAOWACAA
+QAAAAAAIAAAAAgCIA4UAAJYBIABAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAAAAAOW
+ACAAQAAAAAAIAAAAAgCIA4UAAJYBIABAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAAC
+AAOWACYEQAAAAAAIRyABBAAAArIAAtIFICRAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAEcgAQYM
+oYKwQAGSBCAkQAAAAAAARyABBAygQrOAAhIFICRAAAAAAAgAAAACAIgDhQAAlgEgAEAAAAAACAAA
+AAIAiAOFAACWASAAQAAAAAAIAAAAAgCIA4UAAJYBIABAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAA
+DcUSugKwgNMUVIviSkYkQAAAAAAFxRK6AreA0xRUi2JJpiRAAAAAAAXFEqIGsIDTFFSL4kpGJEAA
+AAAADcUSoga3gNMUVItiSaYkQAAAAAAFxRKiBrCA0xRUi+JKRiRAAAAAAA3FEqIGt4DTFFSLYkmm
+JEAAAAAABcUSogawgNMUVIviSkYkQAAAAAANxRKiBreA0xRUi2JJpiRAAAAAAAnEEKACAICQAACL
+YmnGJEAAAAAAAcQQoAawgJMGVItiacYkQAAAAAABxBCgBrCAkwZUi2JpxiRAAAAAAAHFELgGsICT
+FlSLYkjGJEAAAAAACKEQiAIAgVgSAAtSAKYkQAAAAAAJwBCQArCAAxZUipIBxiRAAAAAAAnAELgG
+sIADEJSL4gJGJEAAAAAACcAQuAK0gAMQlItiAaYkQAAAAAAJwBC4ArSAAxCUi2IBpiRAAAAAAAnA
+ELgCtIADEJSLYgGmJEAAAAAACcAQuAK0gAMQlItiAaYkQAAAAAABoBCQBrSAAxCUi2IBpiRAAAAA
+AAHAEIACsIADFFSKUgDGJEAAAAAAAcAQgAKwgAMUVIpSAMYkQAAAAAABwBCAArCAAxRUilIAxiRA
+AAAAAAhHIAEEAAACsgAC0gUgJEAAAAAAAIEAAAIAhVgHQAtSAKYkQAAAAAAAgQAAAgCFWAdAC1IA
+piRAAAAAAAAAAAAEAKBAAYAB1gAgAEAAAAAAAAAAAAYAoYAAQAFWACAAQAAAAAAAAAAABACgQAGA
+AdYAIABAAAAAAAiBAAACAIVZgAQLUgCmJEAAAAAACWFAAAAAABgAAANCASakQAAAAAAAAAAAAAAA
+AAAAA5YAIABAAAAAAAAAAAAEAKBAAYAB1gAgAEAAAAAACAAAAAIAiAOHAAPWACYEQAAAAAAIAAAA
+AgCIA4cAA9YAJgRAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAA
+AAAABACgQAGAAdYAIABAAAAAAAnAELgCtIADEJSLYgGmJEAAAAAAAAAAAAAAAAACAAOWACYEQAAA
+AAAAAAAAAAAAAAAAA5YAIABAAAAAAAgAAAACAIgDhQAAlgEgAEAAAAAAAAAAAAQAoEABgAHWACAA
+QAAAAAAAAAAABACgQAGAAdYAIABAAAAAAAAAAAAEAKBAAYAB1gAgAEAAAAAACKEQiAIAgVgQAAkS
+AaYkQAAAAAAAAAAABACgQAGAAdYAIABAAAAAAAAAAAAGAKGAAEABVgAgAEAAAAAACAAAAAIAiAOF
+QAjSAkYkQAAAAAAJxRKiApSI0hCAiyJIpiRAAAAAAAHAEIAGpIgBBVSLUgDGJEAAAAAACcAQgAKk
+iACFVItSAMYkQAAAAAAJwBCABrSIAwEUi1IBpiRAAAAAAA3AAAACsIDDFlSL4gNGJEAAAAAAAAAA
+AAAAAAAAAAOWACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAIADAABAAAAAIAAAIAJiRAAAAAAABHMAAGAyACtwAIAgHAJEAAAAAACAMAAAIGoAq1
+AAgCAMYkQAAAAAAAAAAAAAAAAAIAAAIAJiRAAAAAAAAgUAAEAAAAAgAAAgAmJEAAAAAACGAgAIQA
+AAAAAAAGACAAQAAAAAAIYCAAhAAAAAIBMAIAJiVAAAAAAAhgAAAEAIQBgAQEAgHGJMAAAAAAAcAA
+AAJDgAMCDIgCAaYkQAAAAAAIAGAABAAAAAIAAAIAJiRAAAAAAAgAYAAEAAAAAAAABAEgAEAAAAAA
+AAAAAAAAAAAAAAAEASAAQAAAAAAECBSABgoAAAcBTAIgpiZAAAAAAAiAAAAGAIQBgAQIAgGmJkAA
+AAAAAEAAAAIAoAACQAgCAaYkQAAAAAAAAAAAAAAAAAIAAAIAJiRAAAAAAAQAAAAChAADAooIAgSm
+JEAAAAAAAAAAAAAAAAACAAAGASBIQAAAAAAAIFAABAAAAAIAAAIAJiRAAAAAAAhgIACEAAAAAgAA
+BgAmBEAAAAAACGAgAIQAAAACAAACASYlQAAAAAAIYAAABACEAYAEBAIBxiTAAAAAAAgAYAAEAAAA
+AAAABAEgAEAAAAAAAAAAAAAAAAAAAAACACZMcAAAAAAAAAAAAAAAAAAAAAYBIAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAi0kAQJFgQCBMYkQAAAAAABwAAACLSQBAkWBAIExiRA
+AAAAAAQIdIBMCQAAUABcAmHmJEAAAAAADAh0gEQAAABSAEACYSYkQAAAAAAIAhCgBAAAAAABAAIA
+JiRAAAAAAAgCEKAEAAAAAAEAAgAmJEAAAAAABAh0AEIBAAAHAIgCYMYkQAAAAAANyBQAAgkAAARA
+nAJg5iRAAAAAAAnIEIAGtJAEApSIAmXGJEAAAAAADch0AEi0kAMAlIgCYKYkwAAAAAANyHQASLSQ
+AwCUiAJgpiTAAAAAAAhHAAAEAAAAAAAAAgEgJEAAAAAACEcAAAQAAAACAAACBSAkQAAAAAAARyAB
+DAchwrcACAIBwCRAAAAAAABHIAEMByHCtwAIAgHAJEAAAAAAAEcgAQwHIcK3AAgCAcAkQAAAAAAA
+ACABCACEAAVAiAIBxiTAAAAAAAAAIAEIAIQABUCIAgHGJMAAAAAAAAAgAQgAhAAFQIgCAcYkwAAA
+AAAAACABhoIAAQLAiAIDxiTAAAAAAAAAIAGCggAAAsCIAgPGJMAAAAAACcAgAYKkgAEFQIgCAcYk
+wAAAAAAIAAAADACEAAVAiAIBxiTAAAAAAAAAIAGGggABAsCIAgPGJMAAAAAAAAAgAYKCAAAAwIgC
+AqYkwAAAAAAJwCABgqSAAQVAiAIBxiTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAACAAAAAQABCQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABbZ2xvYmFsXQpyc3NfZ2xiX2Nv
+bmZpZ19tb2RlPWJhc2ljdmlydHVhbApyc3NfZ2xiX2NvbmZpZ19vcHRpb25zPXRubG1hcGVuLGhh
+c2h0b2VwbGl0eix0bmxhbGxsa3AKcmVnWzB4MTAwOF09MHg0MDgxMC8weDIxYzcwCnJlZ1sweDEw
+MGNdPTB4MjIyMjIyMjIKcmVnWzB4MTBhMF09MHgwMTA0MDgxMApyZWdbMHgxMDQ0XT00MDk2CnJl
+Z1sweDEwNDhdPTY1NTM2CnJlZ1sweDEwNGNdPTE1MzYKcmVnWzB4MTA1MF09OTAyNApyZWdbMHgx
+MDU0XT05MjE2CnJlZ1sweDEwNThdPTIwNDgKcmVnWzB4MTA1Y109MTI4CnJlZ1sweDEwNjBdPTgx
+OTIKcmVnWzB4MTA2NF09MTYzODQKcmVnWzB4MTBhNF09MHhhMDAwYTAwMC8weGYwMDBmMDAwCnJl
+Z1sweDEwYThdPTB4MjAwMC8weDIwMDAKc2dlX3RpbWVyX3ZhbHVlPTUsMTAsMjAsNTAsMTAwLDIw
+MApyZWdbMHg3ZDA0XT0weDAwMDEwMDAwLzB4MDAwMTAwMDAKcmVnWzB4N2RjMF09MHgwZTJmODg0
+OQpmaWx0ZXJNb2RlPWZyYWdtZW50YXRpb24sbXBzaGl0dHlwZSxwcm90b2NvbCx2bGFuLHBvcnQs
+ZmNvZQpmaWx0ZXJNYXNrPXByb3RvY29sLGZjb2UKdHBfcG1yeD0zNAp0cF9wbXJ4X3BhZ2VzaXpl
+PTY0Swp0cF9ucnhjaD0wCnRwX3BtdHg9MzIKdHBfcG10eF9wYWdlc2l6ZT02NEsKdHBfbnR4Y2g9
+MAp0cF9tdHVzPTg4LDI1Niw1MTIsNTc2LDgwOCwxMDI0LDEyODAsMTQ4OCwxNTAwLDIwMDIsMjA0
+OCw0MDk2LDQzNTIsODE5Miw5MDAwLDk2MDAKW2Z1bmN0aW9uIjAiXQpudmY9MTYKd3hfY2Fwcz1h
+bGwKcl9jYXBzPWFsbApudmk9MQpuaXFmbGludD04Cm5ldGhjdHJsPTgKbmVxPTE2Cm5leGFjdGY9
+OApjbWFzaz1hbGwKcG1hc2s9MHgxCltmdW5jdGlvbiIxIl0KbnZmPTE2Cnd4X2NhcHM9YWxsCnJf
+Y2Fwcz1hbGwKbnZpPTEKbmlxZmxpbnQ9OApuZXRoY3RybD04Cm5lcT0xNgpuZXhhY3RmPTgKY21h
+c2s9YWxsCnBtYXNrPTB4MgpbZnVuY3Rpb24iMiJdCm52Zj0xNgp3eF9jYXBzPWFsbApyX2NhcHM9
+YWxsCm52aT0xCm5pcWZsaW50PTgKbmV0aGN0cmw9OApuZXE9MTYKbmV4YWN0Zj04CmNtYXNrPWFs
+bApwbWFzaz0weDQKW2Z1bmN0aW9uIjMiXQpudmY9MTYKd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApu
+dmk9MQpuaXFmbGludD04Cm5ldGhjdHJsPTgKbmVxPTE2Cm5leGFjdGY9OApjbWFzaz1hbGwKcG1h
+c2s9MHg4CltmdW5jdGlvbiI0Il0Kd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9MjgKbmlxZmxp
+bnQ9MTcwCm5ldGhjdHJsPTEwMApuZXE9MjU2Cm5leGFjdGY9NDAKY21hc2s9YWxsCnBtYXNrPWFs
+bApuZXRob2ZsZD0xMDI0Cm5yb3V0ZT0zMgpuY2xpcD0zMgpuZmlsdGVyPTQ5Ngpuc2VydmVyPTQ5
+NgpuaGFzaD0xMjI4OApwcm90b2NvbD1uaWNfdm0sb2ZsZCxyZGRwLHJkbWFjLGlzY3NpX2luaXRp
+YXRvcl9wZHUsaXNjc2lfdGFyZ2V0X3BkdQp0cF9sMnQ9MzA3Mgp0cF9kZHA9Mwp0cF9kZHBfaXNj
+c2k9Mgp0cF9zdGFnPTMKdHBfcGJsPTEwCnRwX3JxPTEzCltmdW5jdGlvbiI1Il0Kd3hfY2Fwcz1h
+bGwKcl9jYXBzPWFsbApudmk9NApuaXFmbGludD0zNApuZXRoY3RybD0zMgpuZXE9NjQKbmV4YWN0
+Zj00CmNtYXNrPWFsbApwbWFzaz1hbGwKbnNlcnZlcj0xNgpuaGFzaD0yMDQ4CnRwX2wydD0xMDI0
+CnByb3RvY29sPWlzY3NpX2luaXRpYXRvcl9mb2ZsZAp0cF9kZHBfaXNjc2k9Mgppc2NzaV9udGFz
+az0yMDQ4CmlzY3NpX25zZXNzPTIwNDgKaXNjc2lfbmNvbm5fcGVyX3Nlc3Npb249MQppc2NzaV9u
+aW5pdGlhdG9yX2luc3RhbmNlPTY0CltmdW5jdGlvbiI2Il0Kd3hfY2Fwcz1hbGwKcl9jYXBzPWFs
+bApudmk9NApuaXFmbGludD0zNApuZXRoY3RybD0zMgpuZXE9NjYKbmV4YWN0Zj0zMgpjbWFzaz1h
+bGwKcG1hc2s9YWxsCm5oYXNoPTIwNDgKcHJvdG9jb2w9ZmNvZV9pbml0aWF0b3IKdHBfZGRwPTEK
+ZmNvZV9uZmNmPTE2CmZjb2VfbnZucD0zMgpmY29lX25zc249MTAyNApbZnVuY3Rpb24iMTAyMyJd
+Cnd4X2NhcHM9YWxsCnJfY2Fwcz1hbGwKbnZpPTQKY21hc2s9YWxsCnBtYXNrPWFsbApuZXhhY3Rm
+PTgKbmZpbHRlcj0xNgpbZnVuY3Rpb24iMC8qIl0Kd3hfY2Fwcz0weDgyCnJfY2Fwcz0weDg2Cm52
+aT0xCm5pcWZsaW50PTQKbmV0aGN0cmw9MgpuZXE9NApuZXhhY3RmPTQKY21hc2s9YWxsCnBtYXNr
+PTB4MQpbZnVuY3Rpb24iMS8qIl0Kd3hfY2Fwcz0weDgyCnJfY2Fwcz0weDg2Cm52aT0xCm5pcWZs
+aW50PTQKbmV0aGN0cmw9MgpuZXE9NApuZXhhY3RmPTQKY21hc2s9YWxsCnBtYXNrPTB4MgpbZnVu
+Y3Rpb24iMi8qIl0Kd3hfY2Fwcz0weDgyCnJfY2Fwcz0weDg2Cm52aT0xCm5pcWZsaW50PTQKbmV0
+aGN0cmw9MgpuZXE9NApuZXhhY3RmPTQKY21hc2s9YWxsCnBtYXNrPTB4NApbZnVuY3Rpb24iMy8q
+Il0Kd3hfY2Fwcz0weDgyCnJfY2Fwcz0weDg2Cm52aT0xCm5pcWZsaW50PTQKbmV0aGN0cmw9Mgpu
+ZXE9NApuZXhhY3RmPTQKY21hc2s9YWxsCnBtYXNrPTB4OApbcG9ydCIwIl0KZGNiPXBwcCxkY2J4
+CmJnX21lbT0yNQpscGJrX21lbT0yNQpod209MzAKbHdtPTE1CmR3bT0zMApkY2JfYXBwX3Rsdlsw
+XT0weDg5MDYsZXRoZXJ0eXBlLDMKZGNiX2FwcF90bHZbMV09MHg4OTE0LGV0aGVydHlwZSwzCmRj
+Yl9hcHBfdGx2WzJdPTMyNjAsc29ja2V0bnVtLDUKW3BvcnQiMSJdCmRjYj1wcHAsZGNieApiZ19t
+ZW09MjUKbHBia19tZW09MjUKaHdtPTMwCmx3bT0xNQpkd209MzAKZGNiX2FwcF90bHZbMF09MHg4
+OTA2LGV0aGVydHlwZSwzCmRjYl9hcHBfdGx2WzFdPTB4ODkxNCxldGhlcnR5cGUsMwpkY2JfYXBw
+X3RsdlsyXT0zMjYwLHNvY2tldG51bSw1Cltwb3J0IjIiXQpkY2I9cHBwLGRjYngKYmdfbWVtPTI1
+CmxwYmtfbWVtPTI1Cmh3bT0zMApsd209MTUKZHdtPTMwCmRjYl9hcHBfdGx2WzBdPTB4ODkwNixl
+dGhlcnR5cGUsMwpkY2JfYXBwX3RsdlsxXT0weDg5MTQsZXRoZXJ0eXBlLDMKZGNiX2FwcF90bHZb
+Ml09MzI2MCxzb2NrZXRudW0sNQpbcG9ydCIzIl0KZGNiPXBwcCxkY2J4CmJnX21lbT0yNQpscGJr
+X21lbT0yNQpod209MzAKbHdtPTE1CmR3bT0zMApkY2JfYXBwX3RsdlswXT0weDg5MDYsZXRoZXJ0
+eXBlLDMKZGNiX2FwcF90bHZbMV09MHg4OTE0LGV0aGVydHlwZSwzCmRjYl9hcHBfdGx2WzJdPTMy
+NjAsc29ja2V0bnVtLDUKW2ZpbmldCnZlcnNpb249MHgxNDI1MDAxMgpjaGVja3N1bT0weDU3MzMz
+NTRhCgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAW2dsb2JhbF0KcnNzX2dsYl9jb25maWdfbW9k
+ZT1iYXNpY3ZpcnR1YWwKcnNzX2dsYl9jb25maWdfb3B0aW9ucz10bmxtYXBlbixoYXNodG9lcGxp
+dHosdG5sYWxsbGtwCnJlZ1sweDEwMDhdPTB4NDA4MTAvMHgyMWM3MApyZWdbMHgxMDBjXT0weDIy
+MjIyMjIyCnJlZ1sweDEwYTBdPTB4MDEwNDA4MTAKcmVnWzB4MTA0NF09NDA5NgpyZWdbMHgxMDQ4
+XT02NTUzNgpyZWdbMHgxMDRjXT0xNTM2CnJlZ1sweDEwNTBdPTkwMjQKcmVnWzB4MTA1NF09OTIx
+NgpyZWdbMHgxMDU4XT0yMDQ4CnJlZ1sweDEwNWNdPTEyOApyZWdbMHgxMDYwXT04MTkyCnJlZ1sw
+eDEwNjRdPTE2Mzg0CnJlZ1sweDEwYTRdPTB4YTAwMGEwMDAvMHhmMDAwZjAwMApyZWdbMHgxMGE4
+XT0weDIwMDAvMHgyMDAwCnNnZV90aW1lcl92YWx1ZT01LDEwLDIwLDUwLDEwMCwyMDAKcmVnWzB4
+N2QwNF09MHgwMDAxMDAwMC8weDAwMDEwMDAwCnJlZ1sweDdkYzBdPTB4MGUyZjg4NDkKZmlsdGVy
+TW9kZT1mcmFnbWVudGF0aW9uLG1wc2hpdHR5cGUscHJvdG9jb2wsdmxhbixwb3J0LGZjb2UKZmls
+dGVyTWFzaz1wcm90b2NvbCxmY29lCnRwX3Btcng9MzAKdHBfcG1yeF9wYWdlc2l6ZT02NEsKdHBf
+bnJ4Y2g9MAp0cF9wbXR4PTUwCnRwX3BtdHhfcGFnZXNpemU9NjRLCnRwX250eGNoPTAKdHBfbXR1
+cz04OCwyNTYsNTEyLDU3Niw4MDgsMTAyNCwxMjgwLDE0ODgsMTUwMCwyMDAyLDIwNDgsNDA5Niw0
+MzUyLDgxOTIsOTAwMCw5NjAwCltmdW5jdGlvbiIwIl0Kd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApu
+dmk9MjgKbmlxZmxpbnQ9MTcwCm5ldGhjdHJsPTk2Cm5lcT0yNTIKbmV4YWN0Zj00MApjbWFzaz1h
+bGwKcG1hc2s9YWxsCm5ldGhvZmxkPTEwMjQKbnJvdXRlPTMyCm5jbGlwPTMyCm5maWx0ZXI9NDgK
+bnNlcnZlcj0zMgpuaGFzaD0wCnByb3RvY29sPW5pY192bSxvZmxkLHJkZHAscmRtYWMsaXNjc2lf
+aW5pdGlhdG9yX3BkdSxpc2NzaV90YXJnZXRfcGR1CnRwX2wydD0zMDcyCnRwX2RkcD0yCnRwX2Rk
+cF9pc2NzaT0yCnRwX3N0YWc9Mgp0cF9wYmw9NQp0cF9ycT03CltmdW5jdGlvbiIxIl0Kd3hfY2Fw
+cz1hbGwKcl9jYXBzPWFsbApudmk9NApuaXFmbGludD0zNApuZXRoY3RybD0zMgpuZXE9NjYKbmV4
+YWN0Zj0zMgpjbWFzaz1hbGwKcG1hc2s9YWxsCm5oYXNoPTAKcHJvdG9jb2w9ZmNvZV9pbml0aWF0
+b3IKdHBfZGRwPTIKZmNvZV9uZmNmPTE2CmZjb2VfbnZucD0zMgpmY29lX25zc249MTAyNApbZnVu
+Y3Rpb24iMTAyMyJdCnd4X2NhcHM9YWxsCnJfY2Fwcz1hbGwKbnZpPTQKY21hc2s9YWxsCnBtYXNr
+PWFsbApuZXhhY3RmPTgKbmZpbHRlcj0xNgpbZnVuY3Rpb24iMC8qIl0Kd3hfY2Fwcz0weDgyCnJf
+Y2Fwcz0weDg2Cm52aT0xCm5pcWZsaW50PTQKbmV0aGN0cmw9MgpuZXE9NApuZXhhY3RmPTQKY21h
+c2s9YWxsCnBtYXNrPTB4MQpbZnVuY3Rpb24iMS8qIl0Kd3hfY2Fwcz0weDgyCnJfY2Fwcz0weDg2
+Cm52aT0xCm5pcWZsaW50PTQKbmV0aGN0cmw9MgpuZXE9NApuZXhhY3RmPTQKY21hc2s9YWxsCnBt
+YXNrPTB4MgpbcG9ydCIwIl0KZGNiPXBwcCxkY2J4CmJnX21lbT0yNQpscGJrX21lbT0yNQpod209
+MzAKbHdtPTE1CmR3bT0zMApkY2JfYXBwX3RsdlswXT0weDg5MDYsZXRoZXJ0eXBlLDMKZGNiX2Fw
+cF90bHZbMV09MHg4OTE0LGV0aGVydHlwZSwzCmRjYl9hcHBfdGx2WzJdPTMyNjAsc29ja2V0bnVt
+LDUKW3BvcnQiMSJdCmRjYj1wcHAsZGNieApiZ19tZW09MjUKbHBia19tZW09MjUKaHdtPTMwCmx3
+bT0xNQpkd209MzAKZGNiX2FwcF90bHZbMF09MHg4OTA2LGV0aGVydHlwZSwzCmRjYl9hcHBfdGx2
+WzFdPTB4ODkxNCxldGhlcnR5cGUsMwpkY2JfYXBwX3RsdlsyXT0zMjYwLHNvY2tldG51bSw1Cltw
+b3J0IjIiXQpkY2I9cHBwLGRjYngKYmdfbWVtPTI1CmxwYmtfbWVtPTI1Cmh3bT0zMApsd209MTUK
+ZHdtPTMwCmRjYl9hcHBfdGx2WzBdPTB4ODkwNixldGhlcnR5cGUsMwpkY2JfYXBwX3RsdlsxXT0w
+eDg5MTQsZXRoZXJ0eXBlLDMKZGNiX2FwcF90bHZbMl09MzI2MCxzb2NrZXRudW0sNQpbcG9ydCIz
+Il0KZGNiPXBwcCxkY2J4CmJnX21lbT0yNQpscGJrX21lbT0yNQpod209MzAKbHdtPTE1CmR3bT0z
+MApkY2JfYXBwX3RsdlswXT0weDg5MDYsZXRoZXJ0eXBlLDMKZGNiX2FwcF90bHZbMV09MHg4OTE0
+LGV0aGVydHlwZSwzCmRjYl9hcHBfdGx2WzJdPTMyNjAsc29ja2V0bnVtLDUKW2ZpbmldCnZlcnNp
+b249MHgxNDI1MDAxMgpjaGVja3N1bT0weGJjZGQwYzYzCgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
+====
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
deleted file mode 100644
index d28161d65f35..000000000000
--- a/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu
+++ /dev/null
@@ -1,8705 +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
-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
-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
-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
-PhMuMh5RDnD/n+++393P/L8brzqfWY94kYiBqbHKoevRDMEt8U7hbxCAAKEwwiDjUARAJXBGYGeD
-uZOYo/uz2sM90xzjf/NeArESkCLzMtJCNVIUYndyVrXqpcuVqIWJ9W7lT9UsxQ004iTDFKAEgXRm
-ZEdUJEQFp9u3+oeZl7jnX/d+xx3XPCbTNvIGkRawZld2dkYVVjTZTMlt+Q7pL5nIiem5iqmrWERI
-ZXgGaCcYwAjhOIIoo8t921zrP/sei/mb2Ku7u5pKdVpUajd6FgrxGtAqszqS/S7tD91szU29qq2L
-neiNyXwmbAdcZExFPKIsgxzgDMHvH/8+z13ffK+bv7qP2Z/4bhd+Nk5VXnQukz6yDtEe8AAAMAQA
-ADAQAABZCAAAWaQAAZQwAAAQJAAAEDAAABA8AAAQ3AAAeywAAHs0AAHijAAB5owAAeqMAAHujAAB
-8owAAfaMAAH6jAAB/owAAI3MAAB+dAAAj9wAAZFYAACP/AAAdRwAAHUYAAB1EAAAd+AAAHfkAAB3
-9AABnDwAARB0AAEQhAAAlAgAAJhcAACWDAAAlhQAAJYgAACWLAAA0CgAAJAIAAIQ3AACMNwAAlDc
-AAJw3AABkFQAAGAcAAGg2AABkJAAAHfgAAB35AAAd/QAAHl4AAB5+AABlAQAAePAAAHnwAAB68AA
-Ae/AAAHzwAAB98AAAfvAAAH/wAABlAwAAAAAHwAAAAAAAAEAAAAAAAAAAgEAAAAAAAAEAgAAAAAA
-AAcSAAAAAAAACAMAAAAAAAAPEwAAAAAAABAEAAAAAAAAHxQAAAAAAAAgBQAAAAAAAD8VAAAAAAAA
-QAYAAAAAAACABwAAAAAAAMAWAAAAAAABAAgAAAAAAAIACQAAAAAAAwAXAAAAAAAEAAoAAAAAAAgA
-CwAAAAAADAAYAAAAAAAQAAwAAAAAABgAGgAAAAAAIAANAAAAAABAAA4AAAAAAIAADwAAAAAAwAAa
-AAAAAADgABsAAAAAAQAAEAAAAAABgAAcAAAAAAHAAB0AAAAAAeAAHgAAAAACAAARAAAAAAAwAD//
-/8AAADAIP///wAAAWRCsgAAAAABZrH4lAAAAAZQQH////wABlDQAAAARAAGUCB////8AAZQ4AAAA
-EQAAECh/////AAAQLH////8AABA0f////wAAEDh/////AAAQQA9EAAAAAHsoAB//4gAAezA//+7/
-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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_uwire.txt b/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt
index 1c81f2aa3597..2690edd1e6f1 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-2013 Chelsio Communications.  All rights reserved.
+# Copyright (C) 2010-2014 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
@@ -496,6 +496,8 @@
 # dwm:		minimum delta between high and low watermark (in units of 100
 #		Bytes)
 #
+#
+
 [port "0"]
 	dcb = ppp, dcbx		# configure for DCB PPP and enable DCBX offload
 	bg_mem = 25
@@ -503,6 +505,9 @@
 	hwm = 30
 	lwm = 15
 	dwm = 30
+	dcb_app_tlv[0] = 0x8906, ethertype, 3
+	dcb_app_tlv[1] = 0x8914, ethertype, 3
+	dcb_app_tlv[2] = 3260, socketnum, 5
 
 [port "1"]
 	dcb = ppp, dcbx
@@ -511,6 +516,9 @@
 	hwm = 30
 	lwm = 15
 	dwm = 30
+	dcb_app_tlv[0] = 0x8906, ethertype, 3
+	dcb_app_tlv[1] = 0x8914, ethertype, 3
+	dcb_app_tlv[2] = 3260, socketnum, 5
 
 [port "2"]
 	dcb = ppp, dcbx
@@ -519,6 +527,9 @@
 	hwm = 30
 	lwm = 15
 	dwm = 30
+	dcb_app_tlv[0] = 0x8906, ethertype, 3
+	dcb_app_tlv[1] = 0x8914, ethertype, 3
+	dcb_app_tlv[2] = 3260, socketnum, 5
 
 [port "3"]
 	dcb = ppp, dcbx
@@ -527,10 +538,13 @@
 	hwm = 30
 	lwm = 15
 	dwm = 30
+	dcb_app_tlv[0] = 0x8906, ethertype, 3
+	dcb_app_tlv[1] = 0x8914, ethertype, 3
+	dcb_app_tlv[2] = 3260, socketnum, 5
 
 [fini]
-	version = 0x14250010
-	checksum = 0x5a5526c3
+	version = 0x14250012
+	checksum = 0xd9ae0325
 
 # 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 93e99778e9b9..417bdae70b3a 100644
--- a/sys/dev/cxgbe/firmware/t4fw_interface.h
+++ b/sys/dev/cxgbe/firmware/t4fw_interface.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012 Chelsio Communications, Inc.
+ * Copyright (c) 2012-2014 Chelsio Communications, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -100,7 +100,7 @@ enum fw_wr_opcodes {
 	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_ETH_TX_EO_WR		= 0x1c,
 	FW_EQ_FLUSH_WR		= 0x1b,
 	FW_OFLD_CONNECTION_WR	= 0x2f,
 	FW_FLOWC_WR		= 0x0a,
@@ -647,21 +647,70 @@ struct fw_eth_tx_pkts_wr {
 	__u8   type;
 };
 
-struct fw_eth_tx_uo_wr {
+enum fw_eth_tx_eo_type {
+	FW_ETH_TX_EO_TYPE_UDPSEG,
+	FW_ETH_TX_EO_TYPE_TCPSEG,
+	FW_ETH_TX_EO_TYPE_NVGRESEG,
+};
+
+struct fw_eth_tx_eo_wr {
 	__be32 op_immdlen;
 	__be32 equiq_to_len16;
 	__be64 r3;
-	__u8   r4;
-	__u8   ethlen;
-	__be16 iplen;
-	__u8   udplen;
-	__u8   rtplen;
-	__be16 r5;
-	__be16 mss;
-	__be16 schedpktsize;
-	__be32 length;
+	union fw_eth_tx_eo {
+		struct fw_eth_tx_eo_udpseg {
+			__u8   type;
+			__u8   ethlen;
+			__be16 iplen;
+			__u8   udplen;
+			__u8   rtplen;
+			__be16 r4;
+			__be16 mss;
+			__be16 schedpktsize;
+			__be32 plen;
+		} udpseg;
+		struct fw_eth_tx_eo_tcpseg {
+			__u8   type;
+			__u8   ethlen;
+			__be16 iplen;
+			__u8   tcplen;
+			__u8   tsclk_tsoff;
+			__be16 r4;
+			__be16 mss;
+			__be16 r5;
+			__be32 plen;
+		} tcpseg;
+		struct fw_eth_tx_eo_nvgreseg {
+			__u8   type;
+			__u8   iphdroffout;
+			__be16 grehdroff;
+			__be16 iphdroffin;
+			__be16 tcphdroffin;
+			__be16 mss;
+			__be16 r4;
+			__be32 plen;
+		} nvgreseg;
+	} u;
 };
 
+#define S_FW_ETH_TX_EO_WR_IMMDLEN	0
+#define M_FW_ETH_TX_EO_WR_IMMDLEN	0x1ff
+#define V_FW_ETH_TX_EO_WR_IMMDLEN(x)	((x) << S_FW_ETH_TX_EO_WR_IMMDLEN)
+#define G_FW_ETH_TX_EO_WR_IMMDLEN(x)	\
+    (((x) >> S_FW_ETH_TX_EO_WR_IMMDLEN) & M_FW_ETH_TX_EO_WR_IMMDLEN)
+
+#define S_FW_ETH_TX_EO_WR_TSCLK		6
+#define M_FW_ETH_TX_EO_WR_TSCLK		0x3
+#define V_FW_ETH_TX_EO_WR_TSCLK(x)	((x) << S_FW_ETH_TX_EO_WR_TSCLK)
+#define G_FW_ETH_TX_EO_WR_TSCLK(x)	\
+    (((x) >> S_FW_ETH_TX_EO_WR_TSCLK) & M_FW_ETH_TX_EO_WR_TSCLK)
+
+#define S_FW_ETH_TX_EO_WR_TSOFF		0
+#define M_FW_ETH_TX_EO_WR_TSOFF		0x3f
+#define V_FW_ETH_TX_EO_WR_TSOFF(x)	((x) << S_FW_ETH_TX_EO_WR_TSOFF)
+#define G_FW_ETH_TX_EO_WR_TSOFF(x)	\
+    (((x) >> S_FW_ETH_TX_EO_WR_TSOFF) & M_FW_ETH_TX_EO_WR_TSOFF)
+
 struct fw_eq_flush_wr {
 	__u8   opcode;
 	__u8   r1[3];
@@ -794,13 +843,13 @@ enum fw_flowc_mnem_tcpstate {
 	FW_FLOWC_MNEM_TCPSTATE_TIMEWAIT	= 10, /* not expected */
 };
 
-enum fw_flowc_mnem_uostate {
-	FW_FLOWC_MNEM_UOSTATE_CLOSED	= 0, /* illegal */
-	FW_FLOWC_MNEM_UOSTATE_ESTABLISHED = 1, /* default */
-	FW_FLOWC_MNEM_UOSTATE_CLOSING	= 2, /* graceful close, after sending
+enum fw_flowc_mnem_eostate {
+	FW_FLOWC_MNEM_EOSTATE_CLOSED	= 0, /* illegal */
+	FW_FLOWC_MNEM_EOSTATE_ESTABLISHED = 1, /* default */
+	FW_FLOWC_MNEM_EOSTATE_CLOSING	= 2, /* graceful close, after sending
 					      * outstanding payload
 					      */
-	FW_FLOWC_MNEM_UOSTATE_ABORTING	= 3, /* immediate close, after
+	FW_FLOWC_MNEM_EOSTATE_ABORTING	= 3, /* immediate close, after
 					      * discarding outstanding payload
 					      */
 };
@@ -816,7 +865,7 @@ enum fw_flowc_mnem {
 	FW_FLOWC_MNEM_MSS		= 7,
 	FW_FLOWC_MNEM_TXDATAPLEN_MAX	= 8,
 	FW_FLOWC_MNEM_TCPSTATE		= 9,
-	FW_FLOWC_MNEM_UOSTATE		= 10,
+	FW_FLOWC_MNEM_EOSTATE		= 10,
 	FW_FLOWC_MNEM_SCHEDCLASS	= 11,
 	FW_FLOWC_MNEM_DCBPRIO		= 12,
 };
@@ -3525,6 +3574,15 @@ enum fw_caps_config_fcoe {
 	FW_CAPS_CONFIG_POFCOE_TARGET    = 0x00000010,
 };
 
+enum fw_memtype_cf {
+	FW_MEMTYPE_CF_EDC0		= FW_MEMTYPE_EDC0,
+	FW_MEMTYPE_CF_EDC1		= FW_MEMTYPE_EDC1,
+	FW_MEMTYPE_CF_EXTMEM		= FW_MEMTYPE_EXTMEM,
+	FW_MEMTYPE_CF_FLASH		= FW_MEMTYPE_FLASH,
+	FW_MEMTYPE_CF_INTERNAL		= FW_MEMTYPE_INTERNAL,
+	FW_MEMTYPE_CF_EXTMEM1		= FW_MEMTYPE_EXTMEM1,
+};
+
 struct fw_caps_config_cmd {
 	__be32 op_to_write;
 	__be32 cfvalid_to_len16;
@@ -3612,6 +3670,7 @@ enum fw_params_param_dev {
 	FW_PARAMS_PARAM_DEV_INTFVER_FCOEPDU = 0x15,
 	FW_PARAMS_PARAM_DEV_MCINIT	= 0x16,
 	FW_PARAMS_PARAM_DEV_ULPTX_MEMWRITE_DSGL = 0x17,
+	FW_PARAMS_PARAM_DEV_FWCACHE	= 0x18,
 };
 
 /*
@@ -3691,14 +3750,19 @@ enum fw_params_param_dev_bypass {
 	FW_PARAMS_PARAM_DEV_BYPASS_BYPASS = 0x2,
 };
 
-enum fw_params_phyfw_actions {
-	FW_PARAMS_PARAM_PHYFW_DOWNLOAD	= 0x00,
-	FW_PARAMS_PARAM_PHYFW_VERSION	= 0x01,
+enum fw_params_param_dev_phyfw {
+	FW_PARAMS_PARAM_DEV_PHYFW_DOWNLOAD = 0x00,
+	FW_PARAMS_PARAM_DEV_PHYFW_VERSION = 0x01,
 };
 
 enum fw_params_param_dev_diag {
-	FW_PARAM_DEV_DIAG_TMP = 0x00,
-	FW_PARAM_DEV_DIAG_VDD = 0x01,
+	FW_PARAM_DEV_DIAG_TMP		= 0x00,
+	FW_PARAM_DEV_DIAG_VDD		= 0x01,
+};
+
+enum fw_params_param_dev_fwcache {
+	FW_PARAM_DEV_FWCACHE_FLUSH	= 0x00,
+	FW_PARAM_DEV_FWCACHE_FLUSHINV	= 0x01,
 };
 
 #define S_FW_PARAMS_MNEM	24
@@ -4553,7 +4617,7 @@ struct fw_eq_eth_cmd {
 	__be32 fetchszm_to_iqid;
 	__be32 dcaen_to_eqsize;
 	__be64 eqaddr;
-	__be32 viid_pkd;
+	__be32 autoequiqe_to_viid;
 	__be32 r8_lo;
 	__be64 r9;
 };
@@ -4728,6 +4792,20 @@ struct fw_eq_eth_cmd {
 #define G_FW_EQ_ETH_CMD_EQSIZE(x)	\
     (((x) >> S_FW_EQ_ETH_CMD_EQSIZE) & M_FW_EQ_ETH_CMD_EQSIZE)
 
+#define S_FW_EQ_ETH_CMD_AUTOEQUIQE	31
+#define M_FW_EQ_ETH_CMD_AUTOEQUIQE	0x1
+#define V_FW_EQ_ETH_CMD_AUTOEQUIQE(x)	((x) << S_FW_EQ_ETH_CMD_AUTOEQUIQE)
+#define G_FW_EQ_ETH_CMD_AUTOEQUIQE(x)	\
+    (((x) >> S_FW_EQ_ETH_CMD_AUTOEQUIQE) & M_FW_EQ_ETH_CMD_AUTOEQUIQE)
+#define F_FW_EQ_ETH_CMD_AUTOEQUIQE	V_FW_EQ_ETH_CMD_AUTOEQUIQE(1U)
+
+#define S_FW_EQ_ETH_CMD_AUTOEQUEQE	30
+#define M_FW_EQ_ETH_CMD_AUTOEQUEQE	0x1
+#define V_FW_EQ_ETH_CMD_AUTOEQUEQE(x)	((x) << S_FW_EQ_ETH_CMD_AUTOEQUEQE)
+#define G_FW_EQ_ETH_CMD_AUTOEQUEQE(x)	\
+    (((x) >> S_FW_EQ_ETH_CMD_AUTOEQUEQE) & M_FW_EQ_ETH_CMD_AUTOEQUEQE)
+#define F_FW_EQ_ETH_CMD_AUTOEQUEQE	V_FW_EQ_ETH_CMD_AUTOEQUEQE(1U)
+
 #define S_FW_EQ_ETH_CMD_VIID	16
 #define M_FW_EQ_ETH_CMD_VIID	0xfff
 #define V_FW_EQ_ETH_CMD_VIID(x)	((x) << S_FW_EQ_ETH_CMD_VIID)
@@ -5680,18 +5758,19 @@ enum fw_port_action {
 	FW_PORT_ACTION_L1_LOW_PWR_EN	= 0x0011,
 	FW_PORT_ACTION_L2_WOL_MODE_EN	= 0x0012,
 	FW_PORT_ACTION_LPBK_TO_NORMAL	= 0x0020,
-	FW_PORT_ACTION_L1_SS_LPBK_ASIC	= 0x0021,
-	FW_PORT_ACTION_MAC_LPBK		= 0x0022,
-	FW_PORT_ACTION_L1_WS_LPBK_ASIC	= 0x0023,
-	FW_PORT_ACTION_L1_EXT_LPBK      = 0x0026,
+	FW_PORT_ACTION_LPBK_SS_ASIC	= 0x0022,
+	FW_PORT_ACTION_LPBK_WS_ASIC	= 0x0023,
+	FW_PORT_ACTION_LPBK_WS_EXT_PHY	= 0x0025,
+	FW_PORT_ACTION_LPBK_SS_EXT	= 0x0026,
 	FW_PORT_ACTION_DIAGNOSTICS	= 0x0027,
-	FW_PORT_ACTION_PCS_LPBK		= 0x0028,
+	FW_PORT_ACTION_LPBK_SS_EXT_PHY	= 0x0028,
 	FW_PORT_ACTION_PHY_RESET	= 0x0040,
 	FW_PORT_ACTION_PMA_RESET	= 0x0041,
 	FW_PORT_ACTION_PCS_RESET	= 0x0042,
 	FW_PORT_ACTION_PHYXS_RESET	= 0x0043,
 	FW_PORT_ACTION_DTEXS_REEST	= 0x0044,
 	FW_PORT_ACTION_AN_RESET		= 0x0045,
+
 };
 
 enum fw_port_l2cfg_ctlbf {
@@ -5704,6 +5783,20 @@ enum fw_port_l2cfg_ctlbf {
 	FW_PORT_L2_CTLBF_MTU	= 0x40
 };
 
+enum fw_dcb_app_tlv_sf {
+	FW_DCB_APP_SF_ETHERTYPE,
+	FW_DCB_APP_SF_SOCKET_TCP,
+	FW_DCB_APP_SF_SOCKET_UDP,
+	FW_DCB_APP_SF_SOCKET_ALL,
+};
+
+enum fw_port_dcb_versions {
+	FW_PORT_DCB_VER_CEE1D0,
+	FW_PORT_DCB_VER_CEE1D01,
+	FW_PORT_DCB_VER_IEEE,
+	FW_PORT_DCB_VER_UNKNOWN=7
+};
+
 enum fw_port_dcb_cfg {
 	FW_PORT_DCB_CFG_PG	= 0x01,
 	FW_PORT_DCB_CFG_PFC	= 0x02,
@@ -5724,10 +5817,18 @@ enum fw_port_dcb_type {
 	FW_PORT_DCB_TYPE_CONTROL	= 0x05,
 };
 
+enum fw_port_dcb_feature_state {
+	FW_PORT_DCB_FEATURE_STATE_PENDING = 0x0,
+	FW_PORT_DCB_FEATURE_STATE_SUCCESS = 0x1,
+	FW_PORT_DCB_FEATURE_STATE_ERROR	= 0x2,
+	FW_PORT_DCB_FEATURE_STATE_TIMEOUT = 0x3,
+};
+
 enum fw_port_diag_ops {
 	FW_PORT_DIAGS_TEMP		= 0x00,
 	FW_PORT_DIAGS_TX_POWER		= 0x01,
 	FW_PORT_DIAGS_RX_POWER		= 0x02,
+	FW_PORT_DIAGS_TX_DIS		= 0x03,
 };
 
 struct fw_port_cmd {
@@ -5760,7 +5861,9 @@ struct fw_port_cmd {
 			__be16 mtu;
 			__u8   cbllen;
 			__u8   auxlinfo;
-			__be32 r8;
+			__u8   dcbxdis_pkd;
+			__u8   r8_lo;
+			__be16 lpcap;
 			__be64 r9;
 		} info;
 		struct fw_port_diags {
@@ -5792,7 +5895,8 @@ struct fw_port_cmd {
 			struct fw_port_dcb_pfc {
 				__u8   type;
 				__u8   pfcen;
-				__be16 r10[3];
+				__u8   r10[5];
+				__u8   max_pfc_tcs;
 				__be64 r11;
 			} pfc;
 			struct fw_port_app_priority {
@@ -5807,8 +5911,9 @@ struct fw_port_cmd {
 			struct fw_port_dcb_control {
 				__u8   type;
 				__u8   all_syncd_pkd;
-				__be16 r10_lo[3];
-				__be64 r11;
+				__be16 pfc_state_to_app_state;
+				__be32 r11;
+				__be64 r12;
 			} control;
 		} dcb;
 	} u;
@@ -5953,6 +6058,13 @@ struct fw_port_cmd {
 #define G_FW_PORT_CMD_MODTYPE(x)	\
     (((x) >> S_FW_PORT_CMD_MODTYPE) & M_FW_PORT_CMD_MODTYPE)
 
+#define S_FW_PORT_CMD_DCBXDIS		7
+#define M_FW_PORT_CMD_DCBXDIS		0x1
+#define V_FW_PORT_CMD_DCBXDIS(x)	((x) << S_FW_PORT_CMD_DCBXDIS)
+#define G_FW_PORT_CMD_DCBXDIS(x)	\
+    (((x) >> S_FW_PORT_CMD_DCBXDIS) & M_FW_PORT_CMD_DCBXDIS)
+#define F_FW_PORT_CMD_DCBXDIS	V_FW_PORT_CMD_DCBXDIS(1U)
+
 #define S_FW_PORT_CMD_APPLY	7
 #define M_FW_PORT_CMD_APPLY	0x1
 #define V_FW_PORT_CMD_APPLY(x)	((x) << S_FW_PORT_CMD_APPLY)
@@ -5967,10 +6079,32 @@ struct fw_port_cmd {
     (((x) >> S_FW_PORT_CMD_ALL_SYNCD) & M_FW_PORT_CMD_ALL_SYNCD)
 #define F_FW_PORT_CMD_ALL_SYNCD	V_FW_PORT_CMD_ALL_SYNCD(1U)
 
+#define S_FW_PORT_CMD_PFC_STATE		8
+#define M_FW_PORT_CMD_PFC_STATE		0xf
+#define V_FW_PORT_CMD_PFC_STATE(x)	((x) << S_FW_PORT_CMD_PFC_STATE)
+#define G_FW_PORT_CMD_PFC_STATE(x)	\
+    (((x) >> S_FW_PORT_CMD_PFC_STATE) & M_FW_PORT_CMD_PFC_STATE)
+
+#define S_FW_PORT_CMD_ETS_STATE		4
+#define M_FW_PORT_CMD_ETS_STATE		0xf
+#define V_FW_PORT_CMD_ETS_STATE(x)	((x) << S_FW_PORT_CMD_ETS_STATE)
+#define G_FW_PORT_CMD_ETS_STATE(x)	\
+    (((x) >> S_FW_PORT_CMD_ETS_STATE) & M_FW_PORT_CMD_ETS_STATE)
+
+#define S_FW_PORT_CMD_APP_STATE		0
+#define M_FW_PORT_CMD_APP_STATE		0xf
+#define V_FW_PORT_CMD_APP_STATE(x)	((x) << S_FW_PORT_CMD_APP_STATE)
+#define G_FW_PORT_CMD_APP_STATE(x)	\
+    (((x) >> S_FW_PORT_CMD_APP_STATE) & M_FW_PORT_CMD_APP_STATE)
+
 /*
  *	These are configured into the VPD and hence tools that generate
  *	VPD may use this enumeration.
  *	extPHY	#lanes	T4_I2C	extI2C	BP_Eq	BP_ANEG	Speed
+ *
+ *	REMEMBER:
+ *	    Update the Common Code t4_hw.c:t4_get_port_type_description()
+ *	    with any new Firmware Port Technology Types!
  */
 enum fw_port_type {
 	FW_PORT_TYPE_FIBER_XFI	=  0,	/* Y, 1, N, Y, N, N, 10G */
@@ -7657,6 +7791,17 @@ enum pcie_fw_eval {
     (((x) >> S_PCIE_FW_REGISTERED) & M_PCIE_FW_REGISTERED)
 
 
+/******************************************************************************
+ *   P C I E   F W   P F 0   R E G I S T E R
+ **********************************************/
+
+/*
+ *	this register is available as 32-bit of persistent storage (accross
+ *	PL_RST based chip-reset) for boot drivers (i.e. firmware and driver
+ *	will not write it)
+ */
+
+
 /******************************************************************************
  *   B I N A R Y   H E A D E R   F O R M A T
  **********************************************/
@@ -7720,13 +7865,13 @@ enum fw_hdr_chip {
 
 enum {
 	T4FW_VERSION_MAJOR	= 0x01,
-	T4FW_VERSION_MINOR	= 0x09,
-	T4FW_VERSION_MICRO	= 0x0c,
+	T4FW_VERSION_MINOR	= 0x0b,
+	T4FW_VERSION_MICRO	= 0x1b,
 	T4FW_VERSION_BUILD	= 0x00,
 
 	T5FW_VERSION_MAJOR	= 0x01,
-	T5FW_VERSION_MINOR	= 0x09,
-	T5FW_VERSION_MICRO	= 0x0c,
+	T5FW_VERSION_MINOR	= 0x0b,
+	T5FW_VERSION_MICRO	= 0x1b,
 	T5FW_VERSION_BUILD	= 0x00,
 };
 
diff --git a/sys/dev/cxgbe/firmware/t5fw-1.11.27.0.bin.uu b/sys/dev/cxgbe/firmware/t5fw-1.11.27.0.bin.uu
new file mode 100644
index 000000000000..e22a66b0bffa
--- /dev/null
+++ b/sys/dev/cxgbe/firmware/t5fw-1.11.27.0.bin.uu
@@ -0,0 +1,9028 @@
+/*-
+ * Copyright (c) 2014 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
+AAED6gELGwAAAQQHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAA80D3APkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAENoZWxzaW8gRlcgUlVOTUVNIERFQlVHPTAgKEJ1aWx0IFdlZCBKdW4gMTggMTg6
+Mjc6MTUgUERUIDIwMTQgb24gY2xlb3BhdHJhLmFzaWNkZXNpZ25lcnMuY29tOi9ob21lL2Zpcm13
+YXJlL2N2cy9mdy1yZWxlYXNlKSwgVmVyc2lvbiBUNXh4IDAxLjBiLjFiLjAwAAAAAAAAAPT202lg
+AMgAH/zhSOEAe/AAEAAA4QAwuHj///8f/OFAgAAAAeEAe3AAABAAH//83CAAAADhAZwE4QUAAAAC
+AEDhBQgAAAYAQAACAAwABgAM4QUABAAMAACAAAEC4QB7POEAe0ThAHvk4gAAAAABAADhAHuQIAAA
+AAAAgADhAHsAAABAAeEAe5wAAEAAREREQuAAAADjAARzREREQOMACAAgAAJcAAAAAB//kRAAAAAA
+H/+RFAAAAAAf/5EYAAAAAB//kRwf/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+0S/5TAMCc3
+ACc3ECc3ICc3MCM9AXIz7RL/jxX/jxb/j8Aw1yAFZgFgABQAAAQ2BQACANMP0w8FMwxuOxQHRxQH
+BEN2MeYENgUFMwxvO+0AAgAS/4MV/4EjCgACJwIHBEMEPgUFMwwHRxRvO/ADAgAS/33JLoMghCGF
+IrwidDsOhlC0VZYwtDN0M/Rj/+YAZT/iZV/fEv9xwDIDLgUDAgAS/2jAMCg3QCg3RCg3SCg3TCM9
+AXIz7QACABL/ay0nAMARAUkxAEgxAQIAwAAU/2gE0jEV/2eUUBT/ZwTTMRX/ZpRQFP9mBNQxFf9m
+lFAU/2UE1TEV/2WUUBD/ZQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/AAA
+H/wAAOMACfgf/AAAH/wAAOMACfgf/AAAH/wAAOMACfgf/4AAH/+JEOMACfgf/4kQH/+JEOMAEwgf
+/4kQH/+JEOMAEwgf/4kQH/+K7OMAEwgf/4rsH/+RDOMAFOQf/5EQH/+v3OMAGwgf/6/cH/+v3OMA
+OdQf/8AAH//9yeMAOdQgAAAAIAABauMAd6AgAAF4IAABfOMAeQwgAAF8IAABheMAeRAgAAGYIAAB
+nOMAeRwgAAGcIAABpeMAeSAgAAG4IAABvOMAeSwgAAG8IAABxeMAeTAgAAHYIAAB2OMAeTwgAAHc
+IAAB4uMAeTwgAAH4IAAB+OMAeUQgAAH8IAAB/OMAeUQgAAIYIAACGOMAeUQgAAIcIAACHOMAeUQg
+AAI4IAACOOMAeUQgAAI8IAACPOMAeUQgAAJYIAACWOMAeUQgAAJcIAACYuMAeUQgAAJ4IAACeOMA
+eUwgAAJ8IAACguMAeUwgAAKYIAGvJOMAeVQgAwAAIAMVQOMCJeAgAxVAIAMVQOMCOyAgAxVAIAad
+nOMCOyAgBp2gIAajMOMFw4AgCAAAIAgV8OMFyRAgCBXwIAkzmeMF3wAgCTOgIAk1IOMG/LAgCwAA
+IAsAAOMG/jAgCwAAIAsAAOMG/jAgCwAAIAuaH+MG/jAAAAAAAAAAAAAAAAAgABI2IAASKCAAFhog
+ABIoIAAVlSAAEiggABLdIAAVLSAAFLIgABIoIAAUXSAAFBQgABOpIAASFSAAE1QgABIoIAASKCAA
+EiggABL8AAAAAP///////w/8///w////APwgAJxfIACdiyAAnbwgAJ2DIACdSSAAnUIgAJ0GIACc
+/iAAnPYgAJynIACduiAAnJ8gAJyGAAAAAAAAAAAAAAAAAAAACgAAAAoAAAAUAAAACgAAAAoAAAAK
+AAAACgAAAAoAAAAKAAAAAAAAAAAAAAAAAAEAAQABAAEAAQABAAEAAQABAAIAAwAEAAUABgAHAAgA
+CQAKAA4AEQAVABkAHgAjAC0APABQAGQAyAEsAZAB9AAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAgAC
+AAMAAwADAAMABAAEAAQABAAEAAUABQAFAAUABQAFAAYABgAHAAcAAAACAAAABgAAAAoAAAAOAAAA
+FAAAABwAAAAoAAAAOAAAAFAAAABwAAAAoAAAAOAAAAFAAAABwAAAAoAAAAOAAAAFAQAABwAAAAoA
+AAAOAAAAFAAAABwAAAAoAAAAOAAAAFAAAABwAAAAoAAAAOAAAAFAAAABwAAAAoAAAAOAAP8AAQIC
+AAAAAAAAAAAAAAAQIEAAAAAAAAAAAAAAAAAABAACAAEAAIAAQAAgABAACCBAgAAAAAAAAAAAAAAA
+AAAgAwqAAAAAACADCoQAAAABIAMKjAAAAAIAAAAAAAAAACADCmgAAAABIAMKbAAAAAIgAw5IAAAA
+/yADCGAAAAD/IAMIYAAAAAAgAw5IAAAAACADCZAAAAABIAMJmAAAAAQgAwmgAAAACCADCawAAAAg
+IAMJvAAAAEAgAwnEAAAAgCADCcwAAAEAIAMJ1AAAAgAgAwnoAAAEACADCfwAAAgAIAMKFAAAEAAg
+AwooAAAgACADCjgAAEAAIAMKRAAAgAAgAwpYAAEAAAAAAAAAAAAACAQCAAAAAAAAAAAAAAAAACAD
+CXwAAAAQIAMJhAAAABEgAwlkAAAAACADCWgAAAABIAMJbAAAAAIgAwl0AAAAAwAAAAAAAP//AAAA
+AAAA//8gAwjkAAABACADCPAAAACAIAMJAAAAAEAgAwkQAAAAICADCSAAAAAQIAMJMAAAAAggAwk8
+AAAABCADCUgAAAACIAMJVAAAAAEAAAAAAAAAACAJGtEgCRqMIAkaxyAJGscgCRqMIAkajCAJGtEg
+CRrRIAkajCAJGtEgCRqMIAka0SAJGscgCRqMIAkajCAJGowgCRqMIAkajCAJGtEgCRqMIAkajCAJ
+GowgCRqMIAkajCAJGtEgCRrRIAka0SAJGtEgCRrRIAka0SAJGtEgCRrRIAkajCAJGowgCRqMIAka
+jCAJGowgCRqMIAkajCAJGowgCRqMIAkajCAJGowgCRqMIAkajCAJGowgCRqMIAkajAACAgUFCAgL
+Cw4OEREUFBcXGhodHSAgIyMmJikpLCwvLzIyNTU4ODs7AAAAAAAAAAEDEREICBAJAwEAAAAAAAAg
+BI9wIAFtFCAANaggAVC8IAFp3CABZWwgATJYIAO3xB//6Vwf/+XcIACeSB//2MAgAFtIIABN4AAA
+AAAAAAAAIAFRmCAAedAAAAAAAAAAAB//0rQf/8SIH//CHB//wDAgAEnoIABCoCAAQSAgAJS0H//g
+pCAGbJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAFz2CABXeggAKaE
+IAClqB//72Af/82IH//KMCAAd6AgBOwwIAEUiCAA9VwgAN7AIADS+CAAxOggALsYIACooCAEkZgg
+A9JoIAEJKCAD88wgAZuUIABbBAAAAAAgAKbkIAVRhCAAm9ggAVhYIAAECCAAj3AAAAAAAAAAAB//
+8pAgAKagIAPVAAAAAAAAAAAAIANKXCAAJ2AgAB24IAAmVAAAAAAgADEIIAAu1CAALFAAAAAAIAA1
+aCABDNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgADL8IASPECAAJ2AAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAA0qCADUgggADOwAAAAAAAAAAAAAAAAAAAAAAAAAAQA
+AAAEAAAACAsAAAAgAxKUCAAAACADEqAIAAAAIAMSrAoAAAAgAxK4DAAAACADEsQSAAAAIAMS1A0A
+AAAgAxLoDgAAACADEvgTAAAAIAMTCAoAAAAgAxMcDgAAACADEygYAAAAIAMTOA0AAAAgAxNUDgAA
+ACADE2QQAAAAIAMTdBIAAAAgAxOIDgAAACADE5wQAAAAIAMTrBEAAAAgAxPACgAAACADE9QLAAAA
+IAMT4A0AAAAgAxPsFAAAACADE/wKAAAAIAMUFA8AAAAgAxQgBgAAACADFDAGAAAAIAMUOAYAAAAg
+AxRABgAAACADFEgGAAAAIAMUUAkAAAAgAxRYBgAAACADFGQEAAAAIAMUbAYAAAAgAxR0CwAAACAD
+FHwLAAAAIAMUiAQAAAAgAxRsBAAAACADFJQJAAAAIAMUnAkAAAAgAxSoAAAAAAAAAAANAAAAIAMU
+tAoAAAAgAxTEBgAAACADFNACAAAAIAMU2AMAAAAgAw4cAQAAACADFNwAAAAAAAAAANdqpHjox7dW
+JCBw28G9zu71fA+vR4fGKqgwRhP9RpUBaYCY2ItE96///1uxiVzXvmuQESL9mHGTpnlDjkm0CCH2
+HiViwECzQCZeWlHptseq1i8QXQJEFFPYoeaB59P7yCHhzebDNwfW9NUNh0VaFO2p4+kF/O+j+Gdv
+AtmNKkyK//o5Qodx9oFtnWEi/eU4DKS+6kRL3s+p9rtLYL6/vHAom37G6qEn+tTvMIUEiB0F2dTQ
+OebbmeUfonz4xKxWZfQpIkRDKv+Xq5Qjp/yToDllW1nDjwzMkv/v9H2FhF3Rb6h+T/4s5uCjAUMU
+TggRofdTfoK9OvI1KtfSu+uG05EHDBEWBwwRFgcMERYHDBEWBQkOFAUJDhQFCQ4UBQkOFAQLEBcE
+CxAXBAsQFwQLEBcGCg8VBgoPFQYKDxUGCg8VH//AAAAEACAgBqMwIAam8B/84gAf/500H/+dpB//
+oPADgAAAgQAAAB//oOAA//gAAQAAAAAQAACBBAEAgQQAAAEEAAABBAEAAAf//4AAAAAqAAAAH/+E
+QAYAAAAf/80QIAQNeAIAAACAEAAAgAAABUFAAABBQAEAgwAAAR//llAEAAAIIAMMYAwAAACBgAAA
+//+//7////8f/5Fg//8AAP//AP/wAAAA/3///x/84uQAQAAAH/+ZlAABAAAAAP//H/+sYB//khAP
+////H/+fYB//nqgf/6LcIAtwcCALcMAf/5N4IAtxIB//n6Qf/6LUH/zg4B//olDg//4A4QGSAB//
+luQA////H/+atB//nlwEQQAIBAEACMAAAADABAAApQAAADAAAAAf/5k84QP+AOEEbgAAAIWEAACF
+gCALXMAgC12AIAtdACALXUAf/57gAAAPYAAA/4AgBqNwIAae+CALXcDhAC4AH/+e1B//mfQf/5+w
+H/+bIAAACcAf/56gH/zeAOAAAKDhADC4AACAAOEAYBAAAEAA4QMIAOEDSADhA4gA4QPIAOEAEAgf
+/OFA4QB7cB//r5wf/6+UH/zgCB//r5gf/6+0H/+vrB//r7Af/6/MH/+vxB//r8gf/OIAH/+dNB//
+mrQgAYOUH/+sYB//naQBAAAAH/+frAAA/4AAABBAH/+RYB//n7gf/5+0H/+gGAQAAAgFAAAAg/8A
+AIEAAAAAEAAAKgAAACAACJQgAwu4H/+IUB//hEAf/6DwZ0UjAe/Nq4mYutz+EDJUdh//gAAAAD8o
+IAMOHM////8gCwUAEAAAAD////8CAAAAQAAAAP//f/8gCwYgH/+g4CAAIlAgCwbACAAAAAD///8g
+CwcwIAsGUPf///8gCwkgIAAfEP/+//8gCxMQACAAAAwAAAAAAEAAAAD//wAAgAANAAAAIAAk+P/7
+//8P9oAAAAP//wAAJ/8gCxdAIAsXcAABAAAABAAAH4AAPx//n2Af/544IAAxCCAAMrggAC7UIAsY
+ACALGKAgACxQIAsY8CALGYDgAAAABAEACB//nkRTAAAAUgAAAFEAAAAgAaXYH/+bGCALHCAgCxyA
+IAscUCALHwAf/55cIAsfUB//mrwf/54QIAsgwBQAAACAAAAAgAAAAngAAACAAAAGgAAABQAACgCA
+ALAAAOMwkv//8ACAALEA4QGaAAACAAAgCyCAH/+YWAAAfkAf/55IAP/AAB//nkwoAAAAJgAAACAL
+IPAFgAAABgAAAB//moArAAAAIABFMB/83gAf/5wQNQAAAAOAAAADQAAAB////wA///+AQAAACA//
+/x////8gAAAAAADAAB//niw9AAAAH/+c1B//luAHAAAAgQQBAIEEAAAf/5xwAAA6mMMAAAAAAA//
+AEMAAAAACAAEAAAAIAtyIB//rIAf/68QH/+WUOEAegAf/5bQH/+eMCBgAAAf/5q4H/+crB//msQg
+C3JQAAMHgCALcsAf/5igAEAAAAAACQAAADAC//z4f8AAAACj/7sAo/+6AOADAACD/7YAD////w//
++AD/AAAAIAtzACALIvAgCyMgIAtzkAAPAAAACgAA//8ADx//msgf/540A//AAIP/wAAgC3QQIAt0
+gB//nsQf/6LcH/+s8B//rND/YPAAH/+i4B//gFAf/5EgBIAACABEAAD/H///AMAAAAAAgQCBgAAA
+/7//////AAAAgAAAAACG3e4AAAAf/OIMDwAAAB//nlQf/6LYAAAPCCALcHAgC3DAH/+TeCALcSAf
+/5bMH/+AYCAGn1AAADAAAAAnEB//2DAgC3twH/+fpB//nwQf/5qw3q2+7yADBuA0AAAAPwAAAB//
+rDgAmQAAAACJBhAABwIBwIAAH/+rCJkAAAAf/6z0AIgACIKAAAEf/6yIH/+rlAAPA/8DEQAAAxUA
+ACALJ7AgCygQIAsoYCALKMAgCyfgIADNuCALKmAgCyqQIAsq4CALK0AgANNAKQAAACAA2ZwgC3vA
+IAt8ICALfJDw8PDw/wD/AKqqqqrMzMzMH/+vAAAAHaAf/60IIADp9CALfSAgC32QAA9CQCAD+mgf
+/56MH/+e8AAJAAAAAEgAggAAACABDNggC34QIAt+gAAJAAgf/6v8MAAAAB//rEgAAAgGAACIzAAA
+iRR/AAAA8AAAACALg+AgC4RwAADgACALgiAgC4RAH/+YXB/84uQABAP/CgAAAB//qyQzAAAA4QAA
+AB//qxQf/61EA//gAH///wAAAP/+AD/2kB//rFAAABzoA//wACALbnAgC24wIAtukB//rlAgCzKg
+H/+bYBoAAAAgCzLwIAFFlB//ngAgCzNAH/+sTB//nLgAD///AADerR//rAAf/5xgIAMIEB//mtAf
+/5zEIAae9B//okAf/6GoIAuF0B//mWDABAAAH/+c0B//mMjgAQAAIAs2MCALNnAgAJiUIACWJCAL
+hpAgC4bgH/+YfCALOBAf/6LsIAtA4OD//gAgC2OgH/+TCCALTNAgC01gIAajcCALUBAgC1BASAAA
+ACABfQAf/5wgIAF/AB//mfQf/5dAH/+c5B//mkwAAAqgAAAI7B//nNwgBqNc4QBeAB//m7wATTWg
+AABIuR//luThAC4AH/+c6OEDBgD//7//4QAOAOAFAAAD/wAAH/+aVCADDGAf/L//PAAAAAAH//+D
+AAAAH/+Z/CABoBwf/58UIAtiwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBgAAAAAAAAP//////////////
+//////8f//v8H//7/B//+8Af//vAH//7wB//+8Af//QAH//4eB//9qAf//agH//2oCAGboAAAAAA
+AAAAAAAAAAAAAAAAIAZw8CAGcPAAAAAAAAAAAAAAAAAAAAAAIAZugCAGboAf//l0H//5dB//+XQf
+//l0H//5dB//+XQAAAAAIAGEtAAAAAAAAAAAAAAAAAAAAAACAQAAAAAAAAAAAAAAAAAABAAAAAAA
+AACBgAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+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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
+IAV0ACAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/og
+BXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAF
+c/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz
++iAFc/ogBXP6IAVz+iAFc/ogBXP6IAV0ACAFc/ogBXP6IAVz+iAFdAAgBXP6IAVz+iAFc/ogBXQA
+IAVz+iAFc/ogBXP6IAV0ACAFc/ogBXP6IAVz+iAFdAAgBXP6IAVz+iAFc/ogBXQAIAVz+iAFc/og
+BXP6IAV0ACAFc/ogBXP6IAVz+iAFdAAgBXP6IAVz+iAFc/ogBXQAIAVz+iAFc/ogBXP6IAV0ACAF
+c/ogBXP6IAVz+iAFdAAgBXP6IAVz+iAFc/ogBXQAIAVz+iAFc/ogBXP6IAV0ACAFc/ogBXP6IAVz
++iAFdAAgBXP6IAVz+iAFc/ogBXQAIAVz+iAFc/ogBXP6IAV0ACAFc/ogBXP6IAVz+iAFc/ogBXP6
+IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/og
+BXQAIAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXQAIAVz+iAF
+c/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz
++iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXQAIAVz+iAFc/ogBXP6IAV0ACAFc/ogBXP6
+IAVz+iAFdAAgBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/og
+BXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAF
+c/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz
++iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6
+IAV0ACAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/og
+BXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAF
+c/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz+iAFc/ogBXP6IAVz
++iAFc/ogBXQAAAAAAAAAAAAAAAAAIAV0SiAFdaUgBXdTIAV3RSAFdzAgBXciIAV3DSAFdv8gBXbq
+IAV23SAFdsogBXa9IAV2qiAFdp0gBXaKIAV0QyAFdncgBXZqIAV2VyAFdkogBXY2IAV2LCAFdhsg
+BXYRIAV2ACAFdEMgBXRDIAV0QyAFdEMgBXRDIAV0QyAFdfMgBXRjIAV0QyAFdEMgBXRDIAV11iAF
+db0gBXWzIAV1lCAFdEMgBXWBIAV1ZyAFdVQgBXU6IAV1JyAFdQ8gBXT8IAV06SAFdIAAAAAAAAAA
+ACAFegwgBXoWIAV7aiAFe0QgBXs9IAV7NiAFey8gBXsoIAV7ISAFexogBXsTIAV7CSAFev8gBXrp
+IAV6viAFepIgBXqJIAV6biAFemQgBXpUIAV6RCAFej0gBXoqIAV6IyAFef4AAAAAAAAAAAAAAAAg
+BgpQIAYHqCAGBjwgBgPkIAYB8CAF+bAgBfqgIAYAZCAF+SQAAAAAAw8IEoOOk5JSVgAAEAAAAGNv
+bmZpZ3VyYXRpb24gZmlsZSBwYXJzZXIgZm91bmQgYWRkaXRpb25hbCBjb25maWd1cmF0aW9uIGFm
+dGVyIFtmaW5pXQoAADAAAABmY29lAAAAAHZuaWNfaWQAdmxhbgAAAAB0b3MAZXRoZXJ0eXBlAAAA
+bWFjbWF0Y2gAAAAAbXBzaGl0dHlwZQAAZnJhZ21lbnRhdGlvbgAAAHNydnJzcmFtAAAAAGZjb2Vt
+YXNrAAAAAGNvbXBhY3QAYmFzaWN2aXJ0dWFsAAAAAHN5bm1hcGVuAAAAAHN5bjR0dXBlbmlwdjYA
+AABzeW4ydHVwZW5pcHY2AAAAc3luNHR1cGVuaXB2NAAAAHN5bjJ0dXBlbmlwdjQAAABvZmRtYXBl
+bgAAAAB0bmxtYXBlbgAAAAB0bmxhbGxsa3AAAABoYXNodG9lcGxpdHoAAAAAbGFuAHdhbgBjbHVz
+dGVyAG1hbnVhbAAAdHBfcGlvAAB0cF90bV9waW8AAABuaWNfdm0AAG5pY191bQAAbmljX3VtX2lz
+Z2wAbmljX2hhc2hmaWx0ZXIAAG9mbGQAAAAAcmRkcAAAAAByZG1hYwAAAGlzY3NpX2luaXRpYXRv
+cl9wZHUAaXNjc2lfdGFyZ2V0X3BkdQAAAABpc2NzaV9pbml0aWF0b3JfZm9mbGQAAABpc2NzaV90
+YXJnZXRfZm9mbGQAAGZjb2VfaW5pdGlhdG9yAABmY29lX3RhcmdldABwb2Zjb2VfaW5pdGlhdG9y
+AAAAAHBvZmNvZV90YXJnZXQAAABwcHAAZGNieAAAAABzb2NrZXRudW0AAABjZWUAaWVlZQAAAABh
+dXRvAAAAACADFOAABAAAAAAEAAAEAAAAAAAAAAAAAAAAAAAAAAAAIAX46AAAAAAgBfhAIAX10CAF
+9MAgBdRQIAV+4CAFbqggBW2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAQarCAEKcAgBCnAIAQp
+wCAEOrggBFQQIARg2CAEaCAgBBeEIAQU+CAD0GwgBIX8IAPOBCADyvggBW1UIAVsJCAFZZAgBCnA
+IAVkuCAFY2wgBWKcIAZz+CADWuAgA694IAYVDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAIAPzaCAD3YggA+2UIAPrFCAD6ZwAAAAAIAPnOCAD8qgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAP//wAAA/8AAAA/AAAADyAGhDQgBjAwIAaEICAGMEAgBjBUIAYvmCAGMNggBi9o/xgw
+YGAAAAAAAQIDAAAAACAGCvwgBBjcIABayAAAAAAAAACBAAAAAAAAAAAAAAAAIAPD1CADwoQgA8Gg
+AAAAACADuhQgA7oMIAO6BAAAAAAgA7IEIAOygCADsiAgA7KUMDEyMzQ1Njc4OWFiY2RlZkFCQ0RF
+RgAAAAAAAAAAAABBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWmFiY2RlZmdoaWprbG1ub3BxcnN0
+dXZ3eHl6MDEyMzQ1Njc4OSsvAAAAAAAAAAAAAAAAAAAAACAAISAAAQAAIAAhAAAFAAEgACDkAAMA
+BSAAIMQABwAAY4JTYwAAAAD///////8AAAAEBAgAB0MAAAAAAAAAAAAAIQAJAIEAQQAhAAkAIQAJ
+AIEAQQCBAEEAgQBBAIEAQQAhAAkAgQBBACEACQAhABEAgQBBAIEAQQAhAAkAgQBBACEACQAhAAkB
+AQBBAIEAIQCBACEAEBBhAQEAgQEBAIEDAgEAAAAAAAAAAAAAAAAAIAMIYAAAAAAgAw5IAAAAACAD
+CGQAAAABIAMO8AAAAAIgAwhsAAAABCADCHQAAAAIIAMIfAAAABAgAw74AAAAICADCIAAAABAIAMI
+jAAAAIAgAwiYAAABACADCKQAAAIAIAMItAAAIAAgAwjAAABAACADCMwAAIAAAAAAAAAAAAAAAAIE
+AAAARAAAAAQAAABAIAYOoCAGDlggBg0oIAYLzCAGC4ggBgtcIAYLtAAAAAAAAAIAAAAEAAAACABZ
+ZXMAMDEyMzQ1Njc4OWFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6AAAAAG5vbmUAAAAAYWxsACoA
+AABkaXNhYmxlZAAAAABlbmFibGVkADB4AABOQQAAVjAAAFYxAABWMgAAVjMAAFY0AABWNQAAVjYA
+AFY3AABWOAAAVjkAAFZBAABWQgAAVkMAAFZEAABWRQAAVkYAAFZHAABWSAAAVkkAAFZKAABWSwAA
+VkwAAFZNAABWTgAAVk8AAFZQAABWUQAAVlIAAFZTAABWVAAAVlUAAHBvcnQAAAAAcHJvdG9jb2wA
+AAAAZ2xvYmFsAABmdW5jdGlvbgAAAABmaW5pAAAAAHJlZwBmaWx0ZXJNb2RlAABmaWx0ZXJNYXNr
+AAByc3NfZ2xiX2NvbmZpZ19tb2RlAHJzc19nbGJfY29uZmlnX29wdGlvbnMAAHNnZV90aW1lcl92
+YWx1ZQB0cF9wbXJ4AHRwX3BtcnhfcGFnZXNpemUAAAAAdHBfcG1yeF9mbGFncwAAAHRwX25yeGNo
+AAAAAHRwX3BtdHgAdHBfcG10eF9wYWdlc2l6ZQAAAAB0cF9udHhjaAAAAAB0cF9tdHVzAHRwX3Rj
+cHR1bmluZwAAAAB0cF90aW1lcnJlcwB0cF90aW1lcnZhbHMAAAAAc2NoZWRfaW9xdHhfYnBfcHJp
+b3JpdHkAcGNpZV9tYV9yc3BfdGltZXJ2YWx1ZQAAcGxfdGltZW91dF92YWx1ZQAAAABiYXIydGhy
+b3R0bGVjb3VudAAAAGNwbHR4ZGF0YV9tZW1hbGlnbgAAbWMAAG1jX21vZGVfYnJjAG1jX3BkAAAA
+b2ZsZF9mbGFncwAAbnZmAHd4X2NhcHMAcl9jYXBzAABuaXFmbGludAAAAABuZXEAbmV0aGN0cmwA
+AAAAbnZpAHJzc252aQAAbmV4YWN0ZgBjbWFzawAAAHBtYXNrAAAAbmV0aG9mbGQAAAAAbnJvdXRl
+AABuY2xpcAAAAG5maWx0ZXIAbnNlcnZlcgBuaGFzaAAAAHRwX2wydAAAdHBfZGRwAAB0cF9kZHBf
+aXNjc2kAAAAAdHBfc3RhZwB0cF9wYmwAAHRwX3JxAAAAaXNjc2lfbnRhc2sAaXNjc2lfbnNlc3MA
+aXNjc2lfbmNvbm5fcGVyX3Nlc3Npb24AaXNjc2lfbmluaXRpYXRvcl9pbnN0YW5jZQAAAGlzY3Np
+X21heF9zZ2UAAABwcG1fbWF4X3pvbmVzAAAAcHBtX3pvbmVfcmFuZ2UwAHBwbV96b25lX3Jhbmdl
+MQBwcG1fem9uZV9yYW5nZTIAcHBtX3pvbmVfcmFuZ2UzAGZjb2VfbmZjZgAAAGZjb2VfbnZucAAA
+AGZjb2VfbnNzbgAAAGRjYgBkY2JfYXBwX3RsdgBkY2JfZGNieF9wcm90b2NvbAAAAGJnX21lbQAA
+bHBia19tZW0AAAAAaHdtAGx3bQBkd20AZGVib3VuY2V0aW1lAAAAAHZlcnNpb24AY2hlY2tzdW0A
+AAAAU2Vzc2lvblR5cGUAT0ZNYXJrZXIAAAAASUZNYXJrZXIAAAAARGF0YURpZ2VzdAAASGVhZGVy
+RGlnZXN0AAAAAEVycm9yUmVjb3ZlcnlMZXZlbAAASW1tZWRpYXRlRGF0YQAAAERhdGFQRFVJbk9y
+ZGVyAABEYXRhU2VxdWVuY2VJbk9yZGVyAEluaXRpYWxSMlQAAE1heENvbm5lY3Rpb25zAABNYXhS
+ZWN2RGF0YVNlZ21lbnRMZW5ndGgAAAAASW5pdGlhdG9yTmFtZQAAAEluaXRpYXRvckFsaWFzAABE
+ZWZhdWx0VGltZTJXYWl0AAAAAERlZmF1bHRUaW1lMlJldGFpbgAATWF4QnVyc3RMZW5ndGgAAEZp
+cnN0QnVyc3RMZW5ndGgAAAAATWF4T3V0c3RhbmRpbmdSMlQAAABUYXJnZXROYW1lAABUYXJnZXRB
+bGlhcwBUYXJnZXRBZGRyZXNzAAAAVGFyZ2V0UG9ydGFsR3JvdXBUYWcAAAAAQXV0aE1ldGhvZAAA
+U2VuZFRhcmdldHM9QWxsAENIQVBfQQAAQ0hBUF9JAABDSEFQX0MAAENIQVBfTgAAQ0hBUF9SAABE
+aXNjb3ZlcnkAAABOb3JtYWwAAE5vbmUAAAAAQ1JDMzJDAABDUkMzMkMsTm9uZQBOb25lLENSQzMy
+QwBDSEFQAAAAAENIQVAsTm9uZQAAAE5vbmUsQ0hBUAAAAE5vdFVuZGVyc3Rvb2QAAABJcnJlbGV2
+YW50AABSZWplY3QAAE5vAAA1AAAAQ0hOZXQgMS4wMAAAAAAADAAAAAABAAF8AAwBAAAAABAAAAAU
+IAaZGAAAAwUOQAAAH/wAAB/8AAAf/6/gH/+v4CAGozAgBqbwIAk1ICAJNSAgCgAAIAqAACAKgAAg
+CtZAH/+RYOEAXgAgCwEw4QGOAAAAQA4gC2VgAAGRDIAAAAAgCwFgAABAGgAAEAAAAP/pAABAAAAA
+/+AAAFAAAAD/+AAAgAAAAEANAAAMAAAA//cAAA//AAAPQgAA//UgCwHAAACABwAAgAQgC2WAAAAI
+AP//8/8gC2UQIAtloAAAuO4AADQAAAC07gAAtP8AALQAAAC4ACALZcAgC2YgCAAAAB/84uQgAzOk
+AEAAAB//nkQgCwHwIAsDIB//n2AgCwIgDzwAACALArAgA5u8IAOdkCALA4APAAAAIAsD4B//hdAf
+/4bAH/+EQCALBDAf/6DgIAsEcCALBLAgAwgQIAMMYCADC+AgC2ewIAMLwCALZ+AgC2aQIAtm8CAL
+Z1Af/56gAQAAACgAAADgAAAAAA9CQCAAIUAAAgAAH/+fpAD///8gC2gAIAsFQCALBaAgCwXwH/+e
+TCALBXAgA3ucAAgAACADgEQf/548IAsHgCAGn1AAD/wAH/+WzB//mCAAADAAIAsHwCALCFAgCwjw
+VQAAACALaKAgC2jADgAAABAAAAAgAwzYAAAIBiALCYAf/50IAAAP/iALCkAAAP//IAto4CALCeAg
+A01IIANXjCALCqAgCwsQIAsLYCALabAgA1zYIANgUCALaXBAAAAAAADwACALC6AAHoSAIAsMEB//
+njggCwxwIAsM4CAGprAgCw1gIAajcCALDZDv////IAsN8CALDkDhAAAAIAsQgCALDqAgCw8QIAsP
+cCADYtQgCw/QIAsQMCALagAgC2ogIAMM0B/84gAf/500DAAAAIEAAAAEAAAIH/+GMB//hzAgAw4g
+H/+GED/////P////IAsQ4B//huwf/55AIAsRICALEWAgC2pAIAsR4H///6v//y5cAADRpP//0E0A
+AJxOIAsSYCALEiAgCxGgH/+GLAAASAAf/4YoAAAgACADDiAf/4aQIAsSoCADljAgA4PcIAsTUB//
+nkj//f//IAsT4B//nlggCxQwIAtqYAP/0AAAUAwAAAEAACALa3Af/5fAIAtq4CADTSAgA4kUIAtr
+oB//nwQgCxRQIAsUkCALFWAgCxXAIAsU0ABMS0AgA4NgIAsVICALFjAEAQAIACAAACADZVwgCxaw
+IAsWYCALFxAgC2hgIAOTwCALaDAgCxnAAACOAiALGjAgCxqAIAsa0CALGfAgCxsgA4AAAB//oPAg
+CxtwIAsb0P/3//8gCxzAIAsdgCADkFwgCx5AH/+cwCADkuQgA4P4AADAACADhiwgC2wAIAtsQCAL
+HoACAAAAIAsewCALZTAgC2TgIAsfoAAAF3AgC20AIAts4AAAJxAgA7DEIAtssCALbTAgC21QIAMK
+NCALH9AgCx/wIAsgEB//m7wgBqEkIAsgQB//muDhAH4AH/+c9B//nlAAAPP/BAAAABQAAAAqAAAA
+IAO4iB//qxAaAAAAIAshQCALbfAf/57wH/+sODAAABAgC27QIAtvMB//nlQgCyGQ4AAGAACcAADg
+AAkkH/+bOCALIbAf/5MIAAAMvAAAiQaIiIiIH/+XNOEC/gAgC2/gH/+ttCALIfAgCyIQAAMEwOED
+AgDg//4A4QCOAAAAloAAAJZAIAajMAAAlqAAAJZg4QMALAADAAAf/N4A4QB6AAAB4ADhAZIAAAHj
+AB//nlwgCyJQIAsigB//rFQAD///H/+sBB//krQgBqYwF5AAABSwAAAAAGAAIAalcIAAAAQgBqY6
+AAAc2gAAg/8VoAAAIAMAABagAAAIUAEAIKAAAD/wAAAjoAAAA/8AHwDAAAQf/624IAtvYCAGbzgg
+A+L4IAtvoCAGbvzerb7/GsAAACAGpTgAAP/qIAamQAAACBQAAIgAH/+esCAD+mgAEAAAH/+csB//
+mwg4AAAAMAAAdCADABAgCyKwMAAACDAAAAw0AAAI0AAAAAAAiRQ7AAAINJAAAAVdSoAgBAAcABgA
+AP8H//8AOAAAADAAACALcdAGAAAAIAQNePgAAAAB///nAAHAACAAAIAEABAAH/+a8OEBmgDhAZpA
+4QGaPOEBmjjhAZo04QGaMB//n1DhAC4AgAAAA4AAAAL//P//4QEOAB//krAf/5MwIAQarCALd3Ag
+C3UgIAt1YCALdxAgC3dAIAt1kCALddAgC3YAIAt2QCALdnAgC3awIAt08P//AAAP///w//AAACAL
+d/Af/6xgH/+X6CALd7Af/5pUIAQpwCALePAgC3kgIAt4kCALeDAf/5eUH/+YxAAA/4AAAC7gIAsj
+YCALI5D/+///AAQAAOEB4sAf/5z4kAAA8Pz/gO8gCyPgIAskIAAA+AAAAwEMAAMBCI////8gCyRw
+IAskwCALJPAgCyUw4QDeAAADAwgAAwIA///wAOEA7gAf/55k//9//wAA4AAAAPwAAAMDBH////8A
+AREcAAERGAAQCACAAAgAH/+asAADAQT//8AAAAD//gAAJYAAAwMAH/+c5OD/4sAgC3lw4QMGACAL
+eaAgC3nAIAt5UCADAFgAAP/zIAslgAAAKjAAAP+PAABStQAASAoAAI+CAACPhgAAOAAAAI+KAADj
+PwAAg64AAP/xIAsloAAAEED//8+/IAt54AAAEgAgCyXQ4QMuAOEDMgD+////IAsl8CADAGAgCyZQ
+IAsmIACAAAAf/5sMIAt6AAAA/v8AAP/AAAD/PwAA+f8gC3pQIAt7ACALerAgCycAIAsmwCALJpAg
+CycgIAsncBAABQ3uAAAAAcCAAAkAAAAAAN6tH/+r/CADARAf/5zUAACDACALKgAAAIIAIAspICAL
+KXAgCymwEAAHAiADAWAgCy8AIAsroCALLsAgCy6AIAMKFCALLcAgCy5AIAsuACALLYAgCy0wIAss
+8CALLKAgCyxQIAssECALK9AgAwokIAt/ACALfzAgC39gIAt/oCALf+AgC4AQGwAAAAAFAAIgCy8w
+IAPJQCADyKAgA8ggAAAbIQAAgMIgC4BAIAuAgCALgKAA/8AAEgAAACAExLggC4FQIAuBECALL4Ag
+Cy/gIAuBkCALMQAgAwxQIAswMCALMSAgCzCQAP///DIAAAAAABA2///v/8AAAAAgAwGgM5AAACAL
+gnAgC4LQIAuCsCALgxAgCzFgH/+sSCAECgwAAAhQIAMBqAAACEAA///6AACABd6tvu+BgAAAAACD
+/TAAABwwAAAEMAAAFAAA/+///v//H/+s9AD/8AAAKAAAIAsxoDAAAAAwAAA0AACAASADAbAAAIAC
+EAAFEJkAAAA0AAAAIAuDkCALMeAAGQAAIAsyMCADDOQAABIPIAsyYP//9/8gC4NQAxUAAAUAAACD
+/wAb//9AACALhMAgCzOAIAs0ACALNFAAAZGs4QGRrL/////f////IAs0gAsAAAAgBVr4IAs08CAL
+NWAgCzXQIAs2ACALhQAgC4WAIARqlB//meQAATiAAAInECALhiB///8PH/+dwPwA///hAJYA4QCa
+AAAACf/hAJ4AAACwAB//nuggAwIA4QAOAAMAAADhABIAEwAAABEAAAAf/AAAH/+eKCALNsAgC4cQ
+AAGUjwABlM8gAwIgH/+a0CADBqAgCzcAIAadoCALNzAf/5psH/+cZCADB3Af/5HUH/+Z2B//mHwf
+/5q84QGeAP+///8AAZ80IAs4YCALOKAf/55gIAs7EAA///8f/5nAAAD/lwAA/9UAAP/9//+rk8IA
+AA4F3AEAA/8AAMAAAAEgCztwIAs7sCALPAAgCzxAIAs8kCALPNAf///wH/+fFP3//9Af/5GIH/+b
+YB//kvgAAv//AACcQCALcXAgCz/wIAtAYB//nMggC0EgIAttcCALQbAgC3AwAAD+ACAFjpggC0Hw
+AAAhACALQpAgC0IgIAtCYCAFnLwgBp8wIAafQCAGn2AgC0LQ///I////8f///9/PIAtDAAAAIAT/
+/984IAtDMB//nOgf/5MMIAtDYAADAAIf/5qsIAtD4CALQ5AgC0QA4QMKACALREAf/5uUIAuN0Pf/
+//8BMBjAAAMI3CALRGAgC41wIAtEgCALRQAgC0TAIAtFoCALRhAgC0VAIAtFcCALReAAAYagIAW9
+3OEDAAQF9eEAACYloACYloACYloAIAMH1OEDADAABAXu4QMBBOEB4gAAYAAAH/+TGAAFAAQABBQA
+H/+axB//msggCAAAIAgusCAIBmAf/5y0IAhvACAIBVAgCARAIAgDMCAIAiAgCAEQH/+e7CAGn1Qf
+/5lIH/+cACABhhThAHYAIAuSkB//nfQgC0xwIAameiALTwAUkAAAQAAABCALT3AgC0+gIAtNcCAD
+XHAgC02wIAtOEAAAj/4gC05gIygVACALTsAf/5zEIAuTACALk4Af/5y4IAaluB//rtgf/6tgH/+u
+SP/oD/8AEIAAIAtQgCAF9uggAAAAIAMH4OEAWgAByEAG4QGZ4B//nwAgBqNQIAtQoAABkPj//Ph/
+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
+EDDRD2RO6y5gDWTjQvI2ASAAEBAw0Q9kTtgvYA35YRIjOwA34LCY+DYBIAAQEDDRD2ROvilgDWST
+MvI2ASAAEBAw0Q9kTqsr0p8q0p6rqrCqmjHRD2ROmoxnjM4swSKcMdEPZE6MLtKenjHRD2RB3yhg
+YC9gYQiIEQj/Av82ASAAEBAw0Q9kTmkpYFQLi0f/AgAKAMLO0Mev+jYBIAAQEDDRD2ROTItni76L
+vZsx0Q9kTj8uwnEtwnCu3bDdnTHRD2ROLi/CcJ8x0Q9kTiQpwm8owm6piLCImDHRD2ROEyrCbpox
+0Q9kTgmLZ4u+LLIQi7+su7C7mzHRD2RN9YxnjM6Mz5wx0Q9kTeiNZ43ejtyN267dsN2dMdEPZE3V
+jmeO7o7rnjHRD2RNyI9nj/6I/o/9qP+w/58x0Q9kTbWIZ4iOiYqIiamIsIiYMdEPZE2iiWeJnomZ
+mTHRD2RNlYpniq6LqIqnq6qwqpox0Q9kTYKLZ4u+i7ebMdEPZE11jGeMzo3GjMWtzLDMnDHRD2RN
+Yo1njd6N1Z0x0Q9kTVWOZ47uL+EpLuEor+6w7p4x0Q9kTUCPZ4/+L/EonzHRD2RNMohniI4pgSco
+gSapiLCImDHRD2RNHYlniZ4pkSaZMdEPZE0PimeKriuhJSqhJKuqsKqaMdEPZEz6i2eLviuxJJsx
+0Q9kTOyMZ4zOLcEjLMEircywzJwx0Q9kUMfaYFgaLC1gDAjdEf4KgCwJAG6wDt0C/TYBIAAQEDDR
+D2RQpI4xLmQgDo4U/mQhIAAQEDDRD2RQj48xL2RhD48U/2RgIAAQEDDRD2SRHy+yf45gD+4MDlkU
+DpkRCdkMKZ0E+JLOLoABcDAA4QQArBoMiAL4ls4gABAQMNEPAGRQR4ox/wIAAACDgqD6ZHoiAABR
+sFr+dMAg0Q8owYZkjQ0qwXkpwXiqmbCZ+TYBIAAQEDDRDwAAK8GGZL0JLcF4/TYBIAAQEDDRD8cv
+0Q8AAAAAAC1gDC7AgADQBP4OGwIAAFiw/gJAAAUQUDD8aNkSAABwsFhHpPI2ASAAEBAw0Q+PZ4/+
+iPOP8qj/sP//NgEgABAQMNEPiGeIjoiC+DYBIAAQEDDRD4pvqaqwqvo2ASAAEBAw0Q+Lb/s2ASAA
+EBAw0Q8sYROpzLDM/DYBIAAQEDDRDy1hE/02ASAAEBAw0Q8AAAAAAADz+6Jv/xBIMChgDC7AgACB
+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
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAACACJBgAAAAAAAAAABAAAAQgAiRQAAAAAAAAAAAQA
+AAIgAQy8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAIkGAAAAAAAAAAAEAAAB
+CACJFAAAAAAAAAAABAAAAiABDLwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AAAA
+Dv8AAQAAAAAAAAoBAIEACgEAAQAKAQABAAoBAAEADgMBAQAe/4GBAB4CgQEAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAABGwQDAwEbAgMDARsDAwMBGwIBAQEfBIGBASv/gYEBKgGBgQEpAYGB
+AR8DgQEBHwOBAQEs/4GBAT0CgQUBPP+FAAE8/4UAATkBBQUBPg8FBQEuBIGBARsCAQEADgKBAQEu
+AoGBAA4CAAEADgKBAQAOAgEBARoBgYEBDgIBAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAHAMBAAAOAwEBAE8EAQEAXwQBAQA8BAEAAAAAAAAAbP8BAQBMBAEBAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzAAAAfQAAAIcAAACRAAYhegAAAAUAAAAE
+AAAAAQAAAFIAAAATAAAAGwAAABYAAAAQAAAAAAAAAAAAAABSAAAAWwAIGzIAAAAGAAAADAAAAAIA
+AABnAAAAAAAAAB0AAAAUAAAAEAAAAAAAAAAAAAAAVwAAAGMACYloAAAABwAAAAIAAAACAAAA/QAA
+AAMAAAAeAAAAGgAAABAAAAADAAAAAAAAAFsAAABoAAoh/wAAAAcAAAACAAAAAgAAAGcAAAAcAAAA
+HgAAAB4AAABQAAAAAAAAAAIAAABcAAAAbAAKupUAAAAIAAAACgAAAAMAAAD1AAAAAQAAAB4AAAAa
+AAAAEAAAAAEAAAAAAAAAXQAAAG0ACyBPAAAACAAAAAoAAAADAAAAagAAAAIAAAAeAAAAGgAAABAA
+AAACAAAAAAAAAF4AAABuAAun8QAAAAgAAAAKAAAAAwAAACkAAAACAAAAHwAAABwAAAAQAAAAAgAA
+AAIAAABfAAAAcQAMNQAAAAAIAAAACgAAAAMAAABSAAAAEwAAABsAAAAbAAAAUAAAAAAAAAAAAAAA
+YQAAAHMADELzAAAACAAAAAoAAAADAAAA9QAAAAEAAAAbAAAAGwAAABAAAAABAAAAAgAAAGEAAABz
+AAy3NgAAAAkAAAAGAAAAAwAAAP0AAAADAAAAHAAAABwAAAAQAAAAAwAAAAAAAABkAAAAcAANHO8A
+AAAJAAAABgAAAAMAAAApAAAAAQAAABwAAAAcAAAAUAAAAAEAAAACAAAAZAAAAHEADj3VAAAACQAA
+AAYAAAADAAAAKgAAAB8AAAAfAAAAHwAAABAAAAAAAAAAAgAAAGYAAAByAA7VvgAAAAoAAAAJAAAA
+BAAAAGoAAAACAAAAHAAAABwAAAAQAAAAAgAAAAAAAABmAAAAdwAPQkAAAAAKAAAACQAAAAQAAAD9
+AAAAAgAAAB0AAAAdAAAAUAAAAAIAAAACAAAAZgAAAHcAD7xSAAAACgAAAAkAAAAEAAAAKQAAAAEA
+AAAdAAAAHQAAAFAAAAABAAAAAgAAAGsAAAB4ABBGBAAAAAoAAAAJAAAABAAAAGoAAAAfAAAAHgAA
+AB4AAAAFAAAAAgAAAAIAAABrAAAAeQcAOwACADgABAM7AQAAAAABNgFsAZYA8AEgAVMA4QExAWEA
+vADkAQsA9QEiAUkAxgDrAQ8AwgDqARMAnQC/AN4AywDtAQ0AqgDJAOQAowDEAOAAgQCiAL0ArwDM
+AOMAlACwAMYAiwCoAL8AAACBAJ0AmgCzAMcAgQCbAK8AbgCPAKUAAAAAAAAAiQCfALEAbQCIAJsA
+AABhAHIAAAAAAAAAegCPAJ8AAAByAIcAAAAAAAAAAAAAAAAAAAAAAAAAAAD7ASYBagDZAP8BNgDu
+AS4BjACrANMBEwDWAPkBKgC5ANoBCgC3AOIBMACMAK0A4QC6ANkBBgCiAL4A5wCWALcA6gBlAIwA
+ugCkAL8A5gCOAKgAzQB6AJgAwwAAAAAAlACRAKoAzQB7AJUAtwAAAHoAowAAAAAAAACAAJgAuABk
+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
+AwIBAAcGBQQLCgkIDw4NDAAAADIAAAPoAAAACgAAAfQAAAAAAAAD6ACYloAAAAPoAJiWgAAAHCAA
+AABLAD0JAAAD0JAAmJaAAQEAAAMDAgIFBQQEBwcGBgAAAAAAAAAAAAEAEAARAB4ADQASAAcAHwAO
+AAsAEwAVABsACAAXACAADwAdAAwABgAKABQAGgAWABwABQAJABkABAAYAAMAAgABAHsAdQD7APUA
+RQBvAH0AdwBfAGkAxQDvAKMAPwD9APcAuwA5AN8A6QDPAJ0ARwBxAA8AWQAlAL8AEwBjAH8AeQBt
+AF0APQC5AJsADQBhAGsACwAJAFEAHwAxAFMAxwDxACEAtQCPANkArQAzAKUAQQBVAJcAkwDjACkA
+yQD/APkA8wDDAO0A3QDnACMAvQA7ALcATwAdAI0A1wCRAOEA6wDbABsAiwCJAIcArwDRAJ8ANQAt
+ALEA0wAXAKcASQBzAEMAZwChADcAzQBXABEAWwCZAAcALwCzAKsAlQAnAMEA5QBNANUAGQCFACsA
+FQBlAMsABQCpAEsAgwADAIEAAAD6APQAfAB2AMQA7gD8APYA3gDoAEYAcAAkAL4AfgB4ADwAuABg
+AGoAUAAeAMYA8ACOANgApABAAJIA4gD+APgA7ADcALwAOgAcAIwA4ADqAIoAiADQAJ4AsADSAEgA
+cgCgADYAEABaAC4AsgAmAMAA1AAYABQAZACoAEoAgAB6AHQARABuAF4AaACiAD4AugA4AM4AnAAO
+AFgAEgBiAGwAXACaAAwACgAIADAAUgAgALQArAAyAFQAlgAoAMgA8gDCAOYAIgC2AE4A1gCQANoA
+GgCGAK4ANAAsABYApgBCAGYAzABWAJgABgCqAJQA5ABMAIQAKgDKAAQAggACAAEAAwACAAQAAAAA
+AAAAAAABAAIAHAAbABYAFQAeAB0AGAAXAAwACwAQAA8AIAAfABoAGQAUABMACgAJAA4ADQASABEA
+CAAHAAYABQAEAAMAAQAAAAIABAAAAAAAAAAAIAMPICAI0XwgAw8kIAjf4CADDzAgCN7wIAMPPCAI
+3qAgAw9QIAjd9CADD2ggCNyIIAMPeCAI23AgAw+AIAjbSCADD5QgCNsgIAMPpCAI2vAgAw+wIAjZ
+1CADD7ggCNmsIAMPzCAI2XggAw/YIAjYFCADD+AgCNdsIAMP8CAI1mggAw/8IAjVWCADEAwgCNQs
+IAMQJCAI0PwgAxA8IAjQuCADEFAgCNAkIAMQZCAIz/wgAxB4IAjO/CADEHwgCM4QIAMQiCAIzRAg
+AxCQIAjM6CADEJwgCMykIAMQoCAIzCggAxCoIAjL8CADELAgCMu4IAMQvCAIy4AgAxDAIAjLSCAD
+EMwgCMsQIAMQ0CAIzGAgAxDYIAjK2CADEOAgCMqgIAMQ6CAIx8AgAxDwIAjKUCADEPwgCMpIIAMR
+BCAIyhAgAxEMIAjJ2CADERQgCMmgIAMRHCAIyWggAw74IAjFoCADESQgCMVoIAMRLCAIxTAgAxE0
+IAjE+CADEUQgCMTAIAMRTCAIxIggAxFUIAjEUCADEVwgCMQoIAMRaCAIxAAgAxF0IAjD0CADEYwg
+CMOoIAMRqCAIw4AgAxG4IAjDWCADEcggCMMwIAMR2CAIwwggAxHoIAjC4CADEfggCMK4IAMSCCAI
+wpAgAxIUIAjCaCADEiAgCMJAAAAAAAAAAAAgAxIsIAjBFCADEjAgCL8kIAMSPCAIvkQgAxJQIAi+
+ECADElggCL3cIAMSZCAIvaggAxJoIAi9dCADEmwgCL1AIAMScCAIvRAAAAAAAAAAACADEoAgCLzo
+IAMSiCAIvMAgAw8EIAji2CADDwwgCOIMIAMO8CAI4VwgAw8YIAjguAAAMAQAADAQAABZ3AAAWoAA
+AFqEAABaiAAAWowAAFqQAAGUMAAAECQAABAwAAAQPAAAENwAABEMAAB7LAAAezQAAeKMAAHmjAAB
+6owAAe6MAAHyjAAB9owAAfqMAAH+jAAAjcwAAI6AAAB+dAAAj9wAAZFYAAGScAAAj/wABBMcAAQT
+GAAEExAABJMcAASTGAAEkxAAAHfgAAB35AAAd/QAAHgEAAGcPAABEHQAARCEAACUCAAAmFwAAJYM
+AACWFAAAliAAAJYsAACWxAAA0CgAAJAIAAMI3AADSNwAA4jcAAPI3AADCOQAA0jkAAOI5AADyOQA
+AZBUAABgHAABoNgAAZCQAAB34AAAd+QAAHf0AAB4BAAAeNgAAHjgAAB49AAFAHgABQh4AAUTCAAB
+lAQAAePAAAHnwAAB68AAAe/AAAHzwAAB98AAAfvAAAH/wAABlAwAAAAAAAAAAAAAAAAAAAAAHwAA
+AAAAAAEAAAAAAAAAAgEAAAAAAAAEAgAAAAAAAAYUAAAAAAAABxIAAAAAAAAIAwAAAAAAAAoVAAAA
+AAAADxMAAAAAAAAQBAAAAAAAACAFAAAAAAAAQAYAAAAAAACABwAAAAAAAMAWAAAAAAABAAgAAAAA
+AAIACQAAAAAAAwAXAAAAAAAEAAoAAAAAAAgACwAAAAAADAAYAAAAAAAQAAwAAAAAABgAGgAAAAAA
+IAANAAAAAABAAA4AAAAAAIAADwAAAAAAwAAaAAAAAADgABsAAAAAAQAAEAAAAAABgAAcAAAAAAHA
+AB0AAAAAAeAAHgAAAAACAAARAAAAAAAwAL///0AAADAIv///QAABlBCf////AAGUNAAAABAAAZQI
+n//j/wABlDgAAAAQAAAQKOH///8AABAs4f///wAAEDQB////AAAQOAH///8AABBAAAQAAAAAERAA
+////AAARFAD///8AAHsoAH3/4gAAezA//+7/AAB7OAAAAAEAAHtAP//u/wAAfCQAff/iAAHiiAAI
+AAAAAeaIAAgAAAAB6ogACAAAAAHuiAAIAAAAAfKIAAgAAAAB9ogACAAAAAH6iAAIAAAAAf6IAAgA
+AAAAjcj////wAACN0P////AAAI58AAAA8AAAjoQAAADwAAB+cH+//38AAH54f7//fwAAfgAAwAAA
+AAGRVAH///8AAZGcAf///wAAj9gDf///AACP+P////8ABBMUAAAABwAEEwwAAAALAASTFAAAAAcA
+BJMMAAAACwAAd9wAAAADAAB39P////8AAHgEAAAAAwABnDgAAcBAAAGc+AABwEAAAJAEAAAAPgAB
+EHgA////AAEQfAD///8AARCIAAAAAAAAlAQAAP//AACUEAAA//8AAJhUAAAB/wAAmFgAAAH/AACW
+CAAAAAAAAJYcAP///wAAliQA////AACWKAD///8AAJYwAP///wAA0CAAAAAHAADQJAAAAAcAAwjY
+AAAAAwADSNgAAAADAAOI2AAAAAMAA8jYAAAAAwADCOQAAAADAANI5AAAAAMAA4jkAAAAAwADyOQA
+AAADAAGQUAAAAO8AAaDUAAABgwABkIwAOAAAAAGQmAA4AAAABQB0AAAABwAFAHAAAAAFAAUIdAAA
+AAcABQhwAAAABQAFEwQAAAABIAsAAAAAQYwAAEGIAABBhgAAgAAAAEGBAACoGQAAqBoAAMMAAACo
+GwAAqBwAAKgXAAD//wAAEAQAAOWfAAAfEQAA7gkAAP/+AADq/yALACAAAP8AAACoGCALAGAAAGAN
+AA9CQAAA3q0gCwCgIAsA8OEAXgD+//7/AQAAAAEAAQAgMAAAIAtkACALZCAAACBAAAGGoCALZFAA
+AEANIAtkgCALZLAAADDUIAs3gB//mgQf/5oUH/+RYACAAAD/nwAAIAgAAAAQAABACAAAAgAAAPjA
+AAAAAGAs/3///yALh2DhAHIAH/+ZmOEEEgAAixRA4QP+AAAEAEjhBAIAAAQAIYYQAAAABABAgAAA
+AIAUAAOAFgADgBIAI4ARsgOAEAAFACrxLwABhp8ACvEvIAuHoAAEAAggCzegH/+Y3CAGo3Af/56c
+IAuIYOAAAADhAHYAIAuH0CALiBAgCzfQ4QB6ACALOPAgCzlAIAs5oB//mgAgAw1Q4QSSACADDPD/
+AP//AAwAAIAAAB+AAAA/4QGaAP/A//8f/56sAAAIAAAmDAAf/5vUP////wABngzhAZ4AAAGedAAB
+nqwAAZ7YAAGe8AABnxwgCzoAIAs6YCALifAgC4mAIAuIoCALiOAgC4kw4QAuAAQAAAAf/5Mo4QBW
+AAKAUACAAACAAABAAP/xAIAB8AAAjgHggAAAHwAgCA8E4QGSAOEADgAAAQAAAAAP/wACAAAAfwBA
+AAMAAACCAIAAwQDA//8j/wAAyAAQIAEgH/+ZYB//nuzhAH4A4QCOADwAAAD//7//UGjoR5IAAADw
+APAA37//+yAAAAR/9///gABCAP/3/38ABgAA/wAAAABJJJIAAH4YEAEQAQAAfkAgASABFRUVFYQh
+hCEQEBAQ4QGOAAAA/n8EBAGA4QDOAB//kwiIiIiIzMzMzOEAjgThAI4I4QCODOD//gAgCA8kAAAI
+wIABxBHEEcQRAP8A/wBAAED//z/////gASALiqAgC4rQH/+ZoP8P///MiEQAIAuKYAgICAggC4sA
+REQAAMzMiIhERERE//D/AAACADMqKhUV/v///x//m3Af/5iIH/+e5AAA//0gC4swH/+b5CAAAAAg
+CzrQIAjguAAwAAAAYAAAIGAAAOMAAgDi//8A0AAAAM///gAgAwgYH/+c3B//n2Af/4CgH/+dYAAA
+EAD///AAIAuMACALPRAgCz1QIAs9cCALPZAgCz3wIAs+QCALPqAAAB//IAs+0CALPvAgCz8wIAuL
+sCALi3AgC4vQH/+c8CALP1Af/6Dg4QAyAB//gNAf/4EQH/+BUB//mCD/gA////4AHwAAe2Af/OIA
+CAAAAB//meQf/5N4H/+SsOEA3gDhAO4A4QL+AOEDvgDhAz4A4QN+AOEB4gDhAQ4A4QCSAP//8P8A
+AAkAH/+YxB//mmD/8AAAAAKABv/7//8gC0aQIAtG8B//gdAf/5l8H/+YYB//nugQAAAA//D//yAD
+C2Af/5dgAAB+TOEAigAgC0dgIAtHwCALSCAf/56wH/+c0B//msggC0hgIAtI4CALkEAgC0iQH/+c
+zCALSWAgC0kgIAuOwCALSdAgC0oQH/+eYB//mdQgC5EwH/+bYCALkJDf0AAAIAuQ0B//nKz/gAAA
+///gACALSlAgC0qAH/+asCALjnAgBp9UIAMLbAAEAAAf/5NgH/+B4B//msT//8f/AAL/wCALkZAf
+/56gIAtKwB//nOgf/62wH/+uMB//rbQSAAAAH/+dNCALjUAf/6xgBAAACIEAAAAAADAAIAMLaB//
+rEwf/68ISQAAAB//rkggC4zQIAuMICALjIAuADYAAA8D/wMRAAADFQAAH/+e8CAGnaAf/6pgIAtL
+AB//nAwf/5ekH/+k0B//oFQf/6JQIACYlB//7lwf/+w0H/+eVCAAmkgf/5v0AgCCEAIAAhAAACAA
+AgAAEAAaAAAA+saIACAAAPAAAAAf/5zk4QMGACAGnpAgC0uAIAtLUCALSyAgC44Q//9//wAAMgAf
+/5kIH/+avCALjjDhABIAiAACEB//kwwgCBGEH/+ceAAA+AAAPDw8H/+TaB//lyQf/55MH/+c4CAG
+nxAgC4/wIAuPkCALklAf/5kAIAtMICALkfAgC5HAIAtLsCALkiAgC48gH/+Y/B//mPQf/5j4H/+Y
+yB//lqwf/5xgIAgQhB//mmgf/5pkH/+blB//mSQf/5kgH/+CEB//m5ggAwiAIAMKdCAGn2Af/4Iw
+H/+bBB//mwgf/5sMH/+bPB//mzgf/5s0H/+bMB//mywf/5skH/+bGB//mxwf/5sgH/+CUB//mpwf
+/5JQH/+aVIf///8f/5lUH/+Y2B//mbT//wAAH/+C4CALUYAf/4LwH/+fBCALUcAf/5msIAtSECAL
+UkAf/4MAH/+ZHAAAJYAgC1JwIAtSsB//lsQf/4MgH/+XWB//lsAf/4MoA+f8GCALUuAf/4MwH/+b
+yCADCNQf/5vED////yADDWAf/5h8IAtTQCAIDvT//+8QIAgOpP//72AgCA10IAgOnP//8JAgCAyk
+///xYB//mTgD///gAARyDAAEchQABHIcAARwFAAEcCgABHAgAARwLAAAhYA////gAARAJAAEQEwA
+BEokAAQA4AAEAAQgC1VAIAtVcAAEAsQABALAIAuUcCALlKAABHBkAADwACALlNAABEHAAARBxAAE
+QcgABEB4AARA3AAEQUAABEFEIAtWQCALVoAgC1awIAtVoCALVeAgC1YQAARwWAAAECgABEFgIAtX
+AAAAd3cAADMzIAtYQCALV0AgC1fAIAtYACALV4AgC1bQAAAgKAAEdBgABErAAARAwAAEQMQABEHw
+AARB9AAEdBQgC5QwIAtZYCALWSAgC1jgIAtYoCALWGAABAJwAAAI8AAEAnQABAJ8AAQCkAAAvygA
+BHBcAAR0AAAA8AYABEvwAARyKAABmy8AAWMdAAQBMAAEAOwABAEIAAR2AAAEAQQABHYEAAD/+AAE
+AQAABADkAAR2CAAA/8EABHIAAABVVQAEcgQABAD4AAQA3AAEANgABHJIAAQBOAAEARgABHJMAAQA
+9AAEclAABHQIAARyCAAEQEgABErcIAtZoCALWeAgC1ogAARBLAAEQTwABEDgIAtaYAAEQQAgC1qQ
+AARwSAAEcGAABHIgAAR2DAAEeASAEAAAIAuVECADDeCAEgADAAQA6IAQAAMABADAAABOIAAEAMwA
+BADEAAQAyAAEATQgCAXUIAgKFAACACEABACAAA//KQAEAEQgC1rAAAQCRAAEAkwABAJIBgYAAAAE
+AYAAAB54AAEwsAAEANAABADUAAQA8AAEAPwAAgjVAAEEagAEAQwABAEQAACiwgAEARQABAEcAAQB
+JAAEASgABAEsAAQBQAAEAUQABAJQAAQBIAAEAmAABAJkAAQCVAABACF3NZQAAARB/AAES/wAAIAg
+AAAICAAEcDAgCALAAARgwAAEYMQAAIgAAARB1AAES9QABEHYAARL2AAEQdwABEvcAARwOAAEcAAg
+C1rwAARwBAAAwAAgC1swAARgyAAAgCQABEAcAARKHAAAFywgC1twIAtboDuaygAABGDkAARg0CAL
+W9AABEAAAARABAAEQAwABEAIIAMIEAAESgQABHA0AARwCAAEUAAABFQAAARgzAAAfwAABEHQAARL
+0AAEcFAABFBoAARQQAAEVGggCAbwAARQUAAEVFAABFIkAABAQAAEUigABFIsAARAEAAESBAABEAU
+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
++GEgaAAgZnBoYiBoZCX/AgAL/78VEGP/nxm5oKk5KZDdY/9MpZonpABj/+Glmye1AGP/2aWcl8Bj
+/9KlnSfUANEPpZ4n5QDRDwAAAAAAAAAgAw5wDMAABiAGdjQgAw50CMAADCAGdjQgAw54PMAAECAG
+dYQgAw58BsAAOCAGd5ggAw6ACMAAPCAGdjQgAw6EAsAAQCAGd5ggAw6ICMAARCAGdjQgAw6MCEAA
+TCAGdsQgAw6QCEAAUCAGdsQgAw6UCEAAVCAGdsQgAw6YCEAAWCAGdsQgAw6cIEAAXCAGdsQgAw6g
+IEAAbCAGdsQgAw6kIEAAfCAGdsQgAw6oIEAAjCAGdsQgAw6sIEAAnCAGdsQgAw6wIEAArCAGdsQg
+Aw60IEAAvCAGdsQgAw64IEAAzCAGdsQgAw68DEAA3CAGdJQgAw7ADEAA6CAGdJQgAw7EDEAA9CAG
+dJQgAw7IDEABACAGdJQgAw7MDEABDCAGdJQgAw7QDEABGCAGdJQgAw7UDEABJCAGdJQgAw7YDEAB
+MCAGdJQgAw7cCEABPCAGdsQgAw7gCEABQCAGdsQgAw7kCEABRCAGdsQgAw7oEEABSCAGdsQgAw7s
+EEABUCAGdsRiY204NDg1Nl9sb2Fkc2VxdWVuY2U6IFN0YXJ0ZWQKAGJjbTg0ODU2X2xvYWRzZXF1
+ZW5jZTogVXBsb2FkIGltYWdlIHRvIFBIWSBvbi1jaGlwIG1lbW9yeQoAAAAAAABiY204NDg1Nl9s
+b2Fkc2VxdWVuY2U6IGRvbmUgbG9hZGluZyBpbWFnZSAoaSA9ICV1KQoAAAAAAAAAAAAAAAAAYmNt
+ODQ4NTZfbG9hZHNlcXVlbmNlOiBET1dOTE9BRCBGQUlMRUQgKGxvID0gJSN4LCBoaT0lI3gsIGNu
+dD0ldSkKAAAAAAAAAAAAAAAAAABiY204NDg1Nl9sb2Fkc2VxdWVuY2U6IERvd25sb2FkIGNvbXBs
+ZXRlZCBhZnRlciAldSBsb29wcwoAAAAAAAAAaHdfYmNtODQ4NTZfbG93cG93ZXJbJXVdOiBlbmFi
+bGU9JWQKAAAAAAAAAAAAAAAAaHdfYmNtODQ4NTZfbG93cG93ZXJbJXVdLCBmYWlsZWQgdG8gc2V0
+IDMwLjB4NDAwQSBiaXQgNzsgMzAuMHg0MDBFIGJpdD0xIGFmdGVyIDVtcywgcmVnPSV4CgAAAAAA
+aHdfYmNtNTQ4Ml9jZmdtZGlbJXVdIHNldHRpbmcgdHlwZSAldQoAAAAAAAAAAAAAZ2F0aGVyX3Rh
+c2tzX3RvX3R4X2xpc3Q6IHRhc2sgaW4gdXNlIFsldV0KAAAAAAAAZ2F0aGVyX3Rhc2tzX3RvX3R4
+X2xpc3Q6IGlkeCBbJXVdLCB0YXNrIGZpZCBbMHgleF0sIHRhc2sgc3RhdGUgWzB4JXhdLCB0YXNr
+IGNvbm4gWzB4JXhdLCB0YXNrIGZmbGFncyBbMHgleF0sIGNvbm4gZmlkIFsweCV4XSwgZGRwIFsl
+ZF0KAAAAAAAAAAAAZ2F0aGVyX3Rhc2tzX3RvX3R4X2xpc3Q6IHRhc2sgWzB4JXhdLCBzdGF0ZSBb
+MHgleF0gb24gY29ubiBbMHgleF0gbm90IHZhbGlkIHRvIGdhdGhlciwgc2tpcHBpbmcKAAAAAAAA
+AAAAAAAAAAAAAGdhdGhlcl90YXNrc190b190eF9saXN0OiB0YXNrIFsweCV4XSwgc3RpbGwgcXVl
+dWVkIG9uIHR4IHBlbmRpbmcgbGlzdC4gUmVtb3ZpbmcgaXQuCgAAAAAAAAAAAAAAAGdhdGhlcl90
+YXNrc190b190eF9saXN0OiBjb25uX2ZjLT5mbG93Y19mbGFncyBbMHgleF0sIGxpc3RfZW1wdHkg
+WzB4JXhdLCBhZGRfdGFza19jb3VudCBbMHgleF0KAHRvX3R4X2xpc3Q6IG5vIHRhc2sgdG8gY2xv
+c2UgZm9yIGNvbm4gWzB4JXhdLCBiYWlsaW5nIHRvIHJlY292ZXJ5IHN0YXRlIFsweCV4XQoAYXV0
+aGVudGljYXRlX3RhcmdldDogS0VZX0NIQVBfUkVTUCAtIFsweCV4JXgleCV4JXgleCV4JXhdCgAA
+AAAAAGF1dGhlbnRpY2F0ZV90YXJnZXQ6IEtFWV9DSEFQX1JFU1AgLSBbMHgleCV4JXgleCV4JXgl
+eCV4XQoAAAAAAABhdXRoZW50aWNhdGVfdGFyZ2V0OiBJbmNvcnJlY3QgcGFzc3dvcmQKAAAAAAAA
+AABDSEFQX0M6IGRpZ2VzdCBleHBhbnNpb24gZXJyb3IKAENIQVBfTjogVGFyZ2V0IHVzZXJpZCBt
+aXNtYXRjaAoAQ0hBUF9SOiBkaWdlc3QgZXhwYW5zaW9uIGVycm9yCgBpU0NTSSBTZWMtcGFyYW1z
+IHJlY2VpdmVkaGF2ZSBlcnJvcnMhIQoAAAAAAAAAAABUYXJnZXQgbW92ZWQgdGVtcC4gY29ubiAl
+eCwgc2VzcyAleAoAAAAAAAAAAAAAAABMb2dpbiBGYWlsZWQhIS4gY29ubl9mYyBbMHgleF0sIHNl
+c3NfZmMgWzB4JXhdLCBzdGF0dXNfY2xhc3MgWzB4JXhdCgAAAAAAAAAAAAAAAFByb3RvY29sIEVy
+cm9yIGNiaXQgJWQgdGJpdCAlZCBjc2cgJWQgbnNnICVkCgAAAHJlY3Zfbm9waW46IGN0cmwgdGFz
+ayBhbHJlYWR5IHBlbmRpbmcKAAAAAAAAAAAAAG9mbGRfcnhfZGF0YTogYWllZSwgaXNjc2kgY29u
+biBbMHgleF0gZm9yIHNlc3MgWzB4JXhdLCB0eXBlIFsweCV4XSB0cmFuc2l0ZWQgaW4gdG9lIG1v
+ZGUuIEtpY2tpbmcgcmVjb3ZlcnkgCgAAAABvZmxkX3J4X2RhdGE6IGNvbm4gdGlkIFsweCV4XSwg
+cnhfZGF0YS0+c2VxIFsweCV4XSwgcnhfZGF0YS0+bGVuIFsweCV4XSwgcnhfZGF0YS0+c3RhdHVz
+IFsweCV4XQoAAAAAAAAAAAAAAAAAAAAAb2ZsZF9yeF9kYXRhOiBjc2sgeyBpZCBbMHgleF0sIGNz
+b2NrX29mZnNldCBbMHgleF0sIGRsZW4gWzB4JXhdIH0KAAAAAAAAAAAAAAAAAABhY3RfZXN0OiB0
+Y2JfZmMgWzB4JXhdLCBmbG93Y19mb2lzY3NpX2Nvbm5fZmxhZ3MgWzB4JXhdCgAAAAAAAAAAYWN0
+X2VzdGFiOiB0Y2JfZmMtPmZsb3djX2J1ZiBbMHgleF0sIHRjYl9mYy0+Zmxvd2NfdHlwZSBbMHgl
+eF0gdGNiX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0sIG5wYWdlcyBbMHgleF0sIGZsb3djX3RwX3Nu
+ZF9tYXggWzB4JXhdCgAAAAAAAAAAAAAAAAAAYWN0X2VzdGFiOiBhdGlkIFsweCV4XSwgdGlkIFsw
+eCV4XSwgb3AgWzB4JXhdLCByY3ZfaXNuIFsweCV4XSwgc25kX2lzbiBbMHgleF0sIGNzb2NrLT5m
+bG93Y19zdGF0ZSBbMHgleF0sIHRjcF9vcHQgWzB4JXhdLCB0Y2JfZmMtPmZsb3djX2lkIFsweCV4
+XSAKAAAAAAAAAAAAAAAAAGNza19mYy0+Zmxvd2NfY3NvY2tfY29va2llIFsweCV4XSAKAAAAAAAA
+AAAAAAAAAGNobmV0X3F1ZXVlX3htaXQ6IGZjLT5mbG93Y19pZCBbMHgleF0sIGJ1Zl9sZW4gWzB4
+JXhdLCBidWZmZXJlZCBbMHgleF0sIGZpZm8ubnVtX2J5dGVzIFslMHhdCgAAAGwzaW40X2Rldl9j
+b25maWc6IHdyLT5wYXJhbS52bGFuaWQgWyV1XSwgbDJkZXZfZmMtPmZsb3djX25ldF9sMmRldl92
+bGFuZGV2IFsweCV4XQoAAAAAAAAAAAAAAAAAAG5ldF9sM2luNF9kZXZfY29uZmlnOiBsMmRldl9m
+Yy0+Zmxvd2NfaWQgWzB4JXhdLCBhZGRyZXNzIGFscmVhZHkgdXNlZCBieSBwb3J0ICVkCgAAAAAA
+AAAAAAAAAAAAAG5ldF9sM2luNF9kZXZfY29uZmlnOiAgYWRkciBbMHgleF0sIG1hc2sgWzB4JXhd
+LCBndyBbMHgleF0sIHJlZl9jbnQgWzB4JXhdIGluIHVzZQoAAAAAAAAAAAAAAAAAAHdyaF9jaG5l
+dF9pZmNvbmY6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIGwyZGV2X2ZjLT5mbG93Y190eXBl
+IFslMHhdLCBpZmNvbmZfd3ItPnN1Ym9wIFsweCV4XQoAAAAAAAAAAAAAAAAAAAB3cmhfY2huZXRf
+aWZjb25mOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCB1bmtub3duIHN1Ym9wIFsweCV4XQoA
+AAAAAAAAAAAAAAAAAHdyaF9jaG5ldF9pZmNvbmY6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0s
+IHJjICVkCgAAAAAAAAAAAAAAAABuZXRpZl9pcF9jb25mbGljdF90aW1lcl9jYjogbDJkZXZfZmMt
+PmZsb3djX2lkIFsweCV4XSwgaW5kZXZjdHh0LT5zdGF0ZSBbJWRdLCBpbmRldmN0eHQtPnJldHJ5
+X2NudCBbJWRdCgAAAAAAAAAAbmV0aWZfaXBfY29uZmxpY3RfdGltZXJfY2I6IGwyZGV2X2ZjLT5m
+bG93Y19pZCBbMHgleF0sIGluZGV2Y3R4dCBbMHgleF0sIGluIGZyZWUgc3RhdGUKAAAAAAAAAAAA
+Y21kaF9jaG5ldF9pZmFjZTogZmMgWzB4JXhdLCBmYy0+Zmxvd2NfaWQgWzB4JXhdLCBmYy0+Zmxv
+d2NfdHlwZSBbMHgleF0sIHAgWzB4JXhdLCBsZW4xNiBbJXVdLCBsb2MgWzB4JXhdCgAAAAAAAGNt
+ZGhfY2huZXRfaWZhY2U6bDJkZXZfZmMgWzB4JXhdLCBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhd
+LCBsMmRldi0+Zmxvd2NfdHlwZSBbJXVdLCBsMmRldl9mYy0+Zmxvd2NfbmV0X2wyZGV2X2ZsYWdz
+IFslMHhdCgAAAAAAY21kaF9jaG5ldF9pZmFjZTogcjJbMF0gJXUgcjJbMV0gJXUKAAAAAAAAAAAA
+AAAAY21kaF9jaG5ldF9pZmFjZTogbDJkZXZfZmMtPmZsb3djX25ldF9sMmRldl9mbGFncyBjaGFu
+Z2VkIGZyb20gWyUweF0gdG8gWyUweF0sIHJjIFslZF0KAAAAAAAAAAAAY2huZXRfbDJkZXZfdXBf
+bWJfY2I6IHJjIFslZF0sIHBvcnQgWyV1XSwgc3RhdGUgWyV1XSwgY29va2llIFsweCV4XQoAAAAA
+AAAAAAAAAABkaGNwX3Byb2Nlc3NfY2I6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIGRoY3R4
+dC0+c3RhdGUgWyUweF0sIGRoY3R4dC0+cnRyeV9jbnQgWyV1XQoAAAAAAAAAAABkaGNwX3RpbWVy
+X2NiOiBESENQRElTQ09WRVIgc2VudCwgYnV0IG5vIHJlcGx5IGZyb20gYW55IHBvc3NpYmxlIHNl
+cnZlciBvbiB0aGUgbmV0d29yay4gUmV0cnlpbmcgYWdhaW4KAAAAAAAAAAAAZGhjcF90aW1lcl9j
+YjogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgc2VuZGluZyBESENQRElTQ09WRVIgZm9yIGRo
+Y3R4dCBbMHgleF0gb24gcGlkIFslZF0KAAAAZGhjcF90aW1lcl9jYjogbDJkZXZfZmMtPmZsb3dj
+X2lkIFsweCV4XSwgREhDUE9GRkVSIHJlY2VpdmVkIGZvciBkaGN0eHQgWyV4XSBwaWQgWyVkXQoA
+AAAAAAAAAAAAZGhjcF90aW1lcl9jYjogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgIERIQ1BB
+Q0sgcmVjZWl2ZWQgZm9yIGRoY3R4dCBbJXhdLCBwaWQgWyVkXQoAAAAAAAAAAAAAZGhjcF90aW1l
+cl9jYjogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgZGhjdHh0LT5pcGFkZHIgWzB4JXhdCgAA
+AAAAAAAAAAAAAAAAAABkaGNwX3RpbWVyX2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBu
+byByZXBseSBmcm9tIGRoY3Agc2VydmVyLCB0aW1pbmcgb3V0CgAAAAAAAAAAAAAAAAAAAABhdXRo
+X25lZ29fc2VjdXJpdHk6IHNlbmRfZmxhZyBbMHgleF0sIGF1dGhfcG9saWN5IFsweCV4XQoAAAAA
+AAAAYXV0aF9uZWdvX3NlY3VyaXR5OiBLRVlfQ0hBUF9SRVNQIC0gaGFzaFsweCV4JXgleCV4JXgl
+eCV4JXhdCgAAAGF1dGhfbmVnb19zZWN1cml0eTogS0VZX0NIQVBfUkVTUCAtIGhhc2hbMHgleCV4
+JXgleCV4JXgleCV4XQoAAABhdXRoX25lZ29fc2VjdXJpdHk6IEtFWV9DSEFQX1JFU1AgLSBlcnJv
+ciBlbmNvZGluZyB0byBoZXgKAAAAAAAAYXV0aF9uZWdvX3NlY3VyaXR5OiBLRVlfQ0hBUF9SRVNQ
+IC0gZWxlbiBbMHgleF0KAAAAAAAAAAAAAAAAAAAAAGF1dGhfbmVnb19zZWN1cml0eTogS0VZX0NI
+QVBfQ0hBTCAtIGVycm9yIGVuY29kaW5nIHRvIGhleAoAAAAAAABhdXRoX25lZ29fc2VjdXJpdHk6
+IEtFWV9DSEFQX0NIQUwgLSBlbGVuIFsweCV4XQoAAAAAAAAAAAAAAAAAAAAAbG9nb3V0X3RpbWVk
+b3V0OiBsb2dvdXQgcmVxdWVzdCB0aW1lZG91dCwgcG9zc2libGUgbmV0d29yayBpc3N1ZXMuIEZv
+cmNlZnVsbHkgYnJlYWtpbmcgcGF0aCBmb3Igc2VzcyBbMHgleF0KAAAAAHBpbmdfdGFyZ2V0OiBw
+aW5nIHRpbWVvdXQsIGtpY2tpbmcgcmVjb3ZlcnkgZm9yIHNlc3MgWzB4JXhdCgAAAABjc29ja19m
+YWlsZWQ6IGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tfZmMtPmZsb3djX3N0YXRlIFsweCV4
+XSwgc2Vzc19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBzZXNzX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0s
+IGV2dCBbMHgleF0KAAAAAAAAAAAAAABjaG5ldF9maW5kX2wydF9lbnRyeTogZGFkZHIgWyUwOHhd
+LCBbMHglMDh4XSwgbG9jYWwgbmV0d29yayBbJWRdCgAAAAAAAAAAAAAAAAAAAGwydGVudCBbJTB4
+XSwgbDJ0ZW50LT5pZHggWyVkXQoAcmMgWyVkXSwgY3NrX2ZjIFsweCV4XSwgY3NrX2ZjLT5mbG93
+Y19pZCBbMHgleF0KAAAAAAAAAAAAAAAAAAAAAHJlY292ZXJ5X3RpbWVvdXQ6IHNlc3MgaWQgWzB4
+JXhdIHN0YXRlIFsweCV4XSwgZmxhZ3MgWzB4JXhdCgAAAAByZWNvdmVyeV90aW1lb3V0OiBzZXNz
+IGlkIFsweCV4XSBpbiBsb2dvdXQsIGFib3J0IHRoZSBjb25uZWN0aW9uCgAAAAAAAAAAAAAAAAAA
+AGZvaXNjc2k6IFJlY292ZXJ5IHRpbWVkIG91dCBhZnRlciBbJXVdIHJldHJ5LCBiYWlsaW5nIG91
+dAoAAAAAAAByZWNvdmVyeV90aW1lb3V0OiBzZXNzX2ZjLT5mbG93Y19pZCBbMHgleF0sIHJldHJ5
+IGNvdW50IFslZF0sIHNlc3NfZmMtPmZsb3djX3N0YXRlIFsweCV4XQoAAAAAAAByZWNvdmVyeV90
+aW1lb3V0OiBzZXNzX2ZjLT5mbG93Y19mb2lzY3NpX3Nlc3NfZmxhZ3MgWzB4JXhdLCBjb25uZWN0
+aW9uIHJlcXVlc3QgcGVuZGluZywgYmFpbGluZyBvdXQKAAAAAAAAAAAAAAAAVENQIGNvbm4gZXN0
+YWJsaXNobWVudCBmYWlsZWQgJWQKAAAAAAAAAAAAAAAAAAAAZGlzY292ZXJ5X2RhdGE6IHNlc3Mg
+eyBpZCBbMHgleF0sIGZsYWdzIFsweCV4XSwgYnVmZmVyZWQgWyV1XS4gfQoAAAAAAAAAAAAAAAAA
+AABkaXNjb3ZlcnlfZGF0YTogc2VzcyB7IGlkIFsweCV4XSB9LCB1bHB0eGNoIFsldV0gbm8gY3Jl
+ZGl0cyBhdmFpbGFibGUsIHJlc2NoZWR1bGluZyByZXF1ZXN0LgoAAABJbnZhbGlkIG9wY29kZSAw
+eCV4IGluIGN0cmwgcGF0aAoAAAAAAAAAAAAAAAAAAABERFAgZXJyb3IgWzB4JXhdLCBhYm9ydGlu
+ZyBjb25ubiBbMHgleF0KAAAAAAAAAAByeF9kYXRhX2RkcDogUmVzcG9uY2UgcmVjaWV2ZWQgZm9y
+IHRhc2sgWzB4JXhdIHdoaWxlIGludmFsaWQgdGFzayBvciBjb25uZWN0aW9uIHN0YXRlLiB0YXNr
+IHN0YXRlIFsweCV4XSwgY29ubiBzdGF0ZSBbMHgleF0sIGNvbm4gZmxhZ3MgWzB4JXhdCgBpc2Nz
+aV9oZHJfcng6IFJlc3BvbmNlIHJlY2lldmVkIGZvciB0YXNrIFsweCV4XSB3aGlsZSBpbnZhbGlk
+IHRhc2sgb3IgY29ubmVjdGlvbiBzdGF0ZS4gdGFzayBzdGF0ZSBbMHgleF0sIGNvbm4gc3RhdGUg
+WzB4JXhdLCBjb25uIGZsYWdzIFsweCV4XQoAAAAAAAAAAAAAAAAAAAAAaXNjc2lfaGRyX3J4OiBJ
+bnZhbGlkIHRhc2sgc3RhdGUgMHgleCBmb3IgdGFzayAweCV4LCBpdHQgWzB4JXhdLCBvcGMgWzB4
+JXhdCgAAAABwcm9jZXNzX3RtZl9yZXNwb25zZTogYnVmZmVyZWQgWzB4JXhdLCBpc3Rhc2tfZmMt
+PmZsb3djX2J1Zi0+c2NoZWRfbm9kZS5uZXh0IFsweCV4XSwgaXN0YXNrX2ZjIFsweCV4XSwgaXN0
+YXNrX2ZjLT5mbG93Y19pZCBbMHgleF0KAAAAAAAAAAAAAAAAAABwcm9jZXNzX3RtZl9yZXNwb25z
+ZTogd3Igb3AgWzB4JXhdLCB0bWYgb3AgWzB4JXhdCgAAAAAAAAAAAAAAAAAAcmV0dXJuX3BlbmRp
+bmdfdGFzazogY29va2llIFsweCUwOHhdLCBbMHglMDh4XQoAcmV0dXJuX3BlbmRpbmdfdGFzazog
+ZGVsYXkgcHJvY2Vzc2luZywgY29ubiBmbGFncyBbMHgleF0KAAAAAAAAAHJldHVybl9wZW5kaW5n
+X3Rhc2s6IERvbmUgc2VuZGluZyB0YXNrIGVycm9yIHRvIGhvc3QsIHVscHR4bGVuMTYgWyV1XQoA
+AAAAAAAAAAAAcmV0dXJuX3BlbmRpbmdfdGFzazogZGVxdWV1ZSB0YXNrIFsweCV4XSwgc3RhdGUg
+WzB4JXhdIGZyb20gdHhfbGlzdAoAAAAAAAAAAAAAAAByZXR1cm5fcGVuZGluZ190YXNrOiBhbGwg
+dGFza3MgcmV0dXJuZWQsIHJlY292ZXJ5IHN0YXRlIHRyYW5zIHRvIFsweCV4XQoAAAAAAAAAAGNs
+ZWFyX2RkcF9tYXA6IGlzdGFza19mYyBbMHgleF0sIGlzdGFza19mYy0+Zmxvd2NfaWQgWzB4JXhd
+IGJ1ZmZlcmVkICV1CgAAAAAAAAAAY2xlYXJfZGRwX21hcDogaXN0YXNrX2ZjLT5mbG93Y19mb2lz
+Y3NpX3Rhc2tfbnBwb2QgJXUsIG5wcG9kICV1LCBwcGRhZGRyIFsweCV4XQoAAAAAAAAAAAAAAAAA
+AAAAY2xlYXJfZGRwX21hcDogYWxsIHJldHVybmVkIHRhc2tzIGRkcCBjbGVhcmVkLCByZWNvdmVy
+eSBzdGF0ZSB0cmFucyB0byBbMHgleF0KAAB3cmhfZm9pc2NzaV9ub2RlOiBub2RlX3dyLT5mbG93
+aWRfbGVuMTYgMiBbJXhdCgB3cmhfZm9pc2NzaV9jaGFwOiBpZF9sZW4gWyV4XSwgc2VjX2xlbiBb
+JXhdCgAAAAB3cmhfZm9pc2NzaV9jaGFwOiB0Z3RfaWRfbGVuIFsleF0sIHRndF9zZWNfbGVuIFsl
+eF0KAAAAAAAAAAAAAAAAc2Vzc2lvbl9ibG9jazogc2Vzc19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBz
+ZXNzX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0sIGNvbm5fZmMtPmZsb3djX2lkIFsweCV4XSwgY29u
+bl9mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgY3NrX2Zj
+LT5mbG93Y19zdGF0ZSBbMHgleF0KAAAAAAAAAAAAAAAAAAAAc2Vzc2lvbl91bmJsb2NrOiBzZXNz
+X2ZjLT5mbG93Y19pZCBbMHgleF0sIHNlc3NfZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgY29ubl9m
+Yy0+Zmxvd2NfaWQgWzB4JXhdLCBjb25uX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0sIGNza19mYy0+
+Zmxvd2NfaWQgWzB4JXhdLCBjc2tfZmMtPmZsb3djX3N0YXRlIFsweCV4XQoAAAAAAAAAAAAAAAAA
+c3RhcnRfbG9nb3V0OiBTZXNzLWlkIFsweCV4XSBhbHJlYWR5IGxvZ2dpbiBvdXQuCgAAAAAAAAAA
+AAAAAAAAAHBlZXJfY29uOiBjc2tfZmMgPT4gZmxvd2lkIFsweCV4XSwgZmxvd2NfYnVmIFsweCV4
+XQoAAAAAAAAAAAAAAABhbGxvY19zZXNzOiBsb2dpbl9yZXRyeSBbJWRdLCByZWNvdl90aW1lb3V0
+IFslZF0KAAAAAAAAAAAAAAAAAAAAZm9pc2NzaV9jdHJsOiBzdWJvcCBbMHgleF0sIHNlc3NfdHlw
+ZV90b19lcmwgWzB4JXhdLCBzZXNzX3R5cGUgWzB4JXhdCgAAAAAAAAAAAABmb2lzY3NpX2N0cmw6
+IHJlY2VpdmVkIGJsb2NrZWQgZnJvbSBkcml2ZXIsIHRyaWdnZXJpbmcgcmV0dXJuIHRhc2tzIG5v
+dy4KAAAAAAAAAHdhdGNoZG9nIGNtZCBoYW5kbGVyICh0aW1lICV1IGFjdGlvbiAldSkKAAAAAAAA
+AFdBVENIRE9HOiBkZXZpY2Ugc2h1dGRvd24KAAAAAAAAV0FUQ0hET0c6IGJ5cGFzcyB0aW1lb3V0
+CgAAAAAAAABXQVRDSERPRzogRkxSIC0gbm90IGltcGxlbWVudGVkIHlldAoAAAAAAAAAAAAAAABX
+QVRDSERPRzogdGVtcGVyYXR1cmUgb2YgJWRDIGV4Y2VlZHMgdGhyZXNob2xkIG9mICVkQwoAAAAA
+AAAAAAAAZmlsdGVyOiBwb3JncmFtbWluZyB0aWQgJXUgKGxlIHRjYW0gaW5kZXggJXUpLi4uCgAA
+AAAAAAAAAAAAAAAAAGZpbHRlcjogcmVxdWVzdGluZyBjb21wbGV0aW9uLi4uCgAAAAAAAAAAAAAA
+AAAAAGwyZGV2X3NlbmRfcG9ydF9ldmVudDogd3IgWzB4JXhdIHBlbmRpbmcgb24gcG9ydCBbJWRd
+LCBjdXJyZW50IHRyeSBbJWRdCgAAAAAAAAAARkNPRSBGcmVlOiBzdGlsbCB5aWVsZGVkIHdoZW4g
+ZnJlZWluZy4uLmZsb3djX2lkICV4IGZsb3djX2ZsYWdzICV4IAoAAAAAAAAAAAAAAABwb3J0ICVk
+IHNldCBwZmNfZW4gPSAweCV4CgAAAAAAAEFwcGx5IEFQUDogcG9ydCAlZCBwcmlvciAlZCBzZWxl
+Y3QgJWQgcHJvdG9jb2xJRCAweCUwNHgKAAAAAAAAAABwb3J0ICVkIHNldCBwZmNfZW4gPSAweCV4
+CgAAAAAAAGV0c19zZXRfY2ZnX2llZWVbJXVdIHVua25vd24gVFNBIGFsZyBmb3IgcHJpbyAldTog
+JXUKAAAAAAAAAAAAAABGQ29FIEREUCBmYWlsZWQgOiBveF9pZCAweCV4IHJ4X2lkIDB4JXgKAAAA
+AAAAAABGQ29FIEREUCBmYWlsZWQgOiBEZHBSZXBvcnQgMHgleCBEZHBWYWxpZCAweCV4CgBQUkxJ
+IFJzcCB0aW1lZG91dCA6IGZsb3djX2lkIDB4JXggb3hfaWQgMHgleCByeF9pZCAweCV4IAoAAAAA
+AAAAY2Fubm90IGFsbG9jYXRlIG9mZmxvYWRlZCBmaWx0ZXIgY29ubmVjdGlvbgoAAAAAY2Fubm90
+IGFsbG9jYXRlIG9mZmxvYWRlZCBmaWx0ZXIgSVB2NiBjb25uZWN0aW9uCgAAAAAAAAAAAAAAAAAA
+AGxvb3BiYWNrIGJ1ZmZlciBncm91cFsldV0gaXMgZGlzYWJsZWQKAAAAAAAAAAAAAGludmFsaWQg
+YnVmZmVyIGdyb3VwWyV1XSBjb25maWd1cmF0aW9uOiBtdHUgJXUgbHdtICV1IGh3bSAldSBkd20g
+JXUKAAAAAAAAAAAAAAAAZmMgJXUgdmYgJXUgZ290IGl2Zj0weCV4LHJhbmdlOiAlI3gtJSN4ICgl
+dS8ldSB1c2VkKQoAAAAAAAAAAAAAAFZJICV1IGNhbm5vdCBnZXQgUlNTIHNsaWNlOiBObyBtb3Jl
+IHNsaWNlcyBhdmFpbGFibGUgKHVzZWQgJXUvJXUpCgAAAAAAAAAAAAAAAAAAcGZuICV1IHZmbiAl
+dSB3aXRoIHBvcnQgbWFzayAweCV4IGNhbm5vdCBhY2Nlc3MgcG9ydCAldSwgcmV0ICVkCgAAAAAA
+AAAAAAAAAAAAAABwZm4gJXUgdmZuICV1IGNvdWxkIG5vdCBhbGxvY2F0ZSB2aWlkLCByZXQgJWQK
+AABwZm4gJXUgdmZuICV1IGNvdWxkIG1hcCB2aWlkICAweCV4IHRvIGZsb3djLCByZXQgJWQKAAAA
+AAAAAAAAAAAAcGZuICV1IHZmbiAldSBjb3VsZCBub3QgYWxsb2NhdGUgdXdpcmUgZnVuYyAlZCBt
+YWMgYWRkciwgcmV0ICVkCgAAAAAAAAAAAAAAAAAAAABtaWlfaW5pdFsldV06IGFjYXBzIDB4JXgK
+AAAAAAAAAG1paV9mb3JjZV9zcGVlZFsldV06IHJjYXBzIDB4JXgKAAAAAAAAAAAAAAAAAAAAAG1p
+aV9wZG93blsldV06IHBvd2VyZG93biBlbiAldQoAcG9ydF9jbWRfaGFuZGxlcjogdW5rbm93biB1
+LmRjYi50eXBlIDB4JXgKAAAAAAAAcG9ydFsldToweCUwMng6MHglMDJ4XTogdW5rbm93biBhY3Rp
+b24gMHgleAoAAAAAcG9ydFsldToweCUwMng6MHglMDJ4XTogdW5rbm93biByZWFkIGFjdGlvbiAw
+eCV4CgAAAAAAAAAAAAAAAAAAAGNwbF9lcnJfbm90aWZ5OiB0aWQgJXUgY3BsIDB4JTA4eCUwOHgK
+AAAAAAAAAAAAAGNwbF9lcnJfbm90aWZ5OiB0aWQgJXUgY3BsIDB4JTA4eCUwOHggMHglMDh4JTA4
+eAoAAAAAAAAAAAAAAAAAAABjcGxfZXJyX25vdGlmeTogdGlkICV1IGxlbiAldQoAAEZDT0UgRnJl
+ZTogc3RpbGwgeWllbGRlZCB3aGVuIGZyZWVpbmcuLi5mbG93Y19pZCAleCBmbG93Y19mbGFncyAl
+eCAKAAAAAAAAAAAAAAAARkNPRSBCUCBXUiBFUlI6IFdSIHdpdGggY29va2llICV4JXggZXJyb3Jl
+ZCBiYWNrIAoAAAAAAAAAAAAAAAAAAHNjc2lfYWJvcnQ6IEVudGVyaW5nIEFib3J0X3Rhc2ssIGJ1
+ZmZlcmVkIFsldV0KAHNjc2lfYWJvcnQ6IHJjIFsweCV4XSByZWYgdGFzayBub3Qgb3V0c3RhbmRp
+bmcKAHNjc2lfYWJvcnQ6IGlkYXRhLT5vcCBbMHgleF0sIGZsYWdzIFsweCV4XSwgZnVuYyBbMHgl
+eF0sIGx1bl9pZHggWzB4JXhdCgAAAAAAAAAAc2NzaV9hYm9ydDogd3ItPmlxaWQgWzB4JXhdLCBp
+c3Rhc2tfZmMtPmZsb3djX3NnZV9pcWlkIFsweCV4XSwgaXN0YXNrX2ZjIHRhc2sgZmxhZ3MgWzB4
+JXhdCgAAAAAAc2NzaV9hYm9ydDogY29ubiBbMHgleF0sIGNtZHNuIFsweCV4XSwgc2VudF9jbWRz
+biBbMHgleF0sIG1heF9jbWRzbiBbMHgleF0sIGl0dCBbMHgleF0KAAAAAAAAAAAAYWJvcnQvY2xv
+c2UgV1Igd2l0aCBjb29raWUgMHglbHggd2FzIGlzc3VlZCBvbiBzc24gMHgleCBpbiB3cm9uZyBz
+dGF0ZSAweCV4CgAAAABhYm9ydCBXUiBvbiBzc24gMHgleCBkaWQgbm90IGZpbmQgV1Igd2l0aCBj
+b29raWUgMHgleCV4CgAAAAAAAAAAY2xvc2UgV1Igd2l0aCBjb29raWUgMHglbHggb24gc3NuIDB4
+JXg7ZGlkIG5vdCBmaW5kIFdSIHdpdGggY29va2llIDB4JWx4CgAAAAAAAABhYm9ydCBXUiBvbiBz
+c24gMHgleCB3YXMgaXNzdWVkIG9uIHhjaGcgMHgleCB3aXRoIHJ4X2lkIDB4JXggaW4gd3Jvbmcg
+c3RhdGUgMHgleAoAAAAAAAAAAAAAAAAAAABzY3NpX2x1cjogRW50ZXJpbmcgTFVSIGhhbmRsZXIs
+IGJ1ZmZlcmVkIFsldV0KAABzY3NpX2x1cjogaWRhdGEtPm9wIFsweCV4XSwgZmxhZ3MgWzB4JXhd
+LCBmdW5jIFsweCV4XSwgbHVuX2lkeCBbMHgleF0KAAAAAAAAAAAAAHNjc2lfbHVyOiB3ci0+aXFp
+ZCBbMHgleF0sIGlzdGFza19mYy0+Zmxvd2Nfc2dlX2lxaWQgWzB4JXhdLCBpc3Rhc2tfZmMgdGFz
+ayBmbGFncyBbMHgleF0KAAAAAAAAAHNjc2lfbHVyOiBjb25uIFsweCV4XSwgY21kc24gWzB4JXhd
+LCBzZW50X2NtZHNuIFsweCV4XSwgbWF4X2NtZHNuIFsweCV4XSwgaXR0IFsweCV4XQoAAAAAAAAA
+AAAAAGRjYnhfY2VlX2ZlYV9zbVsldV0gRmVhdHVyZVsldV0gRkVBVFVSRV9MSU5LVVAKAGRjYnhf
+Y2VlX2ZlYV9zbVsldV0gRmVhdHVyZVsldV0gU0VUX0xPQ0FMX1BBUkFNRVRFUlMKAAAAAAAAAAAA
+AABkY2J4X2NlZV9mZWFfc21bJXVdIEZlYXR1cmVbJXVdIEZFQVRVUkVfTk9fQURWRVJUSVNFCgAA
+AAAAAAAAAAAAZGNieF9jZWVfZmVhX3NtWyV1XSBGZWF0dXJlWyV1XSBGRUFUVVJFX1BFRVJfTk9U
+X0FEVkVSVElTRV9EQ0JYCgAAAAAAAAAAAAAAAAAAAABkY2J4X2NlZV9mZWFfc21bJXVdIEZlYXR1
+cmVbJXVdIEZFQVRVUkVfUEVFUl9OT1RfQURWRVJUSVNFX0ZFQVRVUkUKAAAAAAAAAAAAAAAAAGRj
+YnhfY2VlX2ZlYV9zbVsldV0gRmVhdHVyZVsldV0gRkVBVFVSRV9VUERBVEVfT1BFUl9WRVJTSU9O
+CgAAAABkY2J4X2NlZV9mZWFfc21bJXVdIEZlYXR1cmVbJXVdIEZFQVRVUkVfUEVFUl9VUERBVEVf
+T1BFUl9WRVJTSU9OCgAAAAAAAAAAAAAAAAAAAGRjYnhfY2VlX2ZlYV9zbVsldV0gRmVhdHVyZVsl
+dV0gRkVBVFVSRV9HRVRfUEVFUl9DRkcKAAAAAAAAAAAAAABkY2J4X2NlZV9mZWFfc21bJXVdIEZl
+YXR1cmVbJXVdIEZFQVRVUkVfQ0ZHX05PVF9DT01QQVRJQkxFCgAAAAAAZGNieF9jZWVfZmVhX3Nt
+WyV1XSBGZWF0dXJlWyV1XSBGRUFUVVJFX1VTRV9MT0NBTF9DRkcKAAAAAAAAAAAAAGRjYnhfY2Vl
+X2ZlYV9zbVsldV0gRmVhdHVyZVsldV0gRkVBVFVSRV9VU0VfUEVFUl9DRkcKAAAAAAAAAAAAAABk
+Y2J4X2NlZV9mZWFfc21bJXVdIEZlYXR1cmVbJXVdIEZFQVRVUkVfRkVBVFVSRV9ESVNBQkxFRAoA
+AAAAAAAAZGNieF9jZWVfZmVhX3NtWyV1XSBGZWF0dXJlWyV1XSBGRUFUVVJFX0VSUk9SX0NIQU5H
+RQoAAAAAAAAAAAAAAEZlYXR1cmUgJXUgc3luYydkPSV1IChlcnJvciAldSkKAAAAAAAAAAAAAAAA
+AAAAAGRjYnggdXBkYXRlWyV1XSBzZW50IHRvIGRyaXZlciAodHlwZSAlI3ggc3VidHlwZSAlI3gg
+Zmxvd2NpZCAldSkKAAAAAAAAAAAAAAAAAAAAY2huZXRfbDJ0X3VwZGF0ZTogbDJ0X3VwZGF0ZSBy
+ZXF1ZXN0IHNlbnQgbDJ0ZW50IFslMDh4XSwgbDJ0ZW50LT5pZHggWyVkXSwgbDJ0ZW50LT52bGFu
+IFslZF0KAAAAbmV0aWZfcHJvY2Vzc19kaGNwOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBw
+cm9jZXNzaW5nLCBvcHRfbGVuICV1CgAAAAAAAAAAAABjaG5ldF9kaGNwX3JlY3Y6IHZsYW5pZCBb
+JXVdLCBsMmRldl9waWRfZmMtPmZsb3djX25ldF9sMmRldl92bGFuZGV2IFsweCV4XSwgbDJkZXZf
+ZmMgWzB4JXhdCgAAAABjaG5ldF9kaGNwX3JlY3Y6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0s
+IGRoY3R4dC0+c3RhdGUgWyVkXSwgbWFsYWNpb3VzIGRoY3AgcmVjdiBmb3Igbm8gcmVxdWVzdAoA
+AAAAAAAAAAAAAAAAZGhjdHh0LT5zdGF0ZSA6ICVkCgAAAAAAAAAAAAAAAABsMmRldl9mYy0+Zmxv
+d2NfaWQgWzB4JXhdLCBCYWQgREhDUCBjb29raWUgcmVjaWV2ZWQsIGFib3J0aW5nCgAAaWdub3Jp
+bmcgZmlwIHJlY3YgZm9yIHBjYiBmbG93OiV4IGluIG9mZmxpbmUgc3RhdGUKAAAAAAAAAAAAAAAA
+AE5fUE9SVCAweCV4JXgleCByZWplY3RlZCBQTE9HSSB3aXRoIHJlYXNvbiBjb2RlICV4CgAAAAAA
+AAAAAAAAAABBQlRTIHdoaWxlIGF3YWl0aW5nIFBSTEkgUnNwOiBmbG93Y19pZCAweCV4IG94X2lk
+IDB4JXggcnhfaWQgMHgleCAKAAAAAAAAAAAAAAAAAEFCVFMgZmFrZSBSc3A6IGxvYyAweCV4IG94
+X2lkIDB4JXggcnhfaWQgMHgleAoAAGxsZHBfcnhfcGt0X2hhbmRsZXJbJXVdIGRyb3AgcHJlLWlu
+aXQgKGNvdW50ID0gJXUpCgAAAAAAAAAAAAAAAAB0Y3BfcmVsZWFzZV90aWQ6IHRpZCBbMHgleF0s
+IGZsb3djIGZsYWdzIFsweCV4XSwgYnVmZmVyZWQgWzB4JXhdCgAAAAAAAAAAAAAAAAAAAHRjcF9y
+ZWxlYXNlX3RpZDogc2l6ZW9mKHRjYl9mYy0+Zmxvd2NfZm9pc2NzaV9jb25uKSBbJXVdLCBieXRl
+cwoAAAAAAAAAAAAAAAAAAAAAR290IENPTk5fRVhJU1QgZm9yIHhpZDoweCV4LCB0YWc6MHgleCwg
+cmV0cnlpbmcuCgAAAAAAAAAAAAAAAAAAAGFjdF9vcGVuX3JwbDogYXRpZCBbMHgleF0sIHRpZCBb
+MHgleF0sIHRjYl9mYy0+eyBpZCBbMHgleF0sIHN0YXRlIFsweCV4XSwgdHlwZSBbMHgleF0gfSwg
+Y3BsX29wIFsweCV4XSwgc3RhdHVzIFsweCV4XQoAAAAAAAAAAAAAYWN0X29wZW5fcnBsOiBjc2tf
+ZmMtPnsgaWQgWzB4JXhdLCBzdGF0ZSBbMHgleF0sIGNzb2NrX2ZsYWdzIFsweCV4XSB9IAoAAAAA
+AAAAAABhY3Rfb3Blbl9ycGw6IHJlY3ZkIG5lZyBhZHZpY2UgWzB4JXhdCgAAAAAAAAAAAABzZW5k
+X2Fib3J0X3JwbDogY3NrX2ZjLT5mbG93Y190eXBlIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19pZCBb
+MHgleF0sIHRpZCBbMHgleF0sIHVscHR4Y2ggWyV1XSwgYnVmZmVyZWQgWyV1XQoAAAAAd3JoX29m
+bGRfdGNwX2Nsb3NlX2Nvbl9yZXBseTogdGNiX2ZjLT5mbG93Y19pZCBbMHgleF0sIHRjYl9mYy0+
+Zmxvd2NfdHlwZSBbMHgleF0sIGxlbjE2IFsldV0sIGxvYyBbJXVdCgAAAAAAAAAAAHdyaF9vZmxk
+X3RjcF9jbG9zZV9jb25fcmVwbHk6IHJwbC0+b3BfVGlkIFsweCV4XSwgcnBsPnN0YXR1cyBbMHgl
+eF0sIHJwbC0+c25kX254dCBbMHgleF0sIHJwbC0+cmN2X254dCBbMHgleF0KAAB0Y3BfYWJvcnRf
+cnBsX3JzczogdGlkIFsweCV4XSwgc3RhdHVzIFsweCV4XQoAAAB0Y3BfYWJvcnRfcmVxX3Jzczog
+dGlkIFsweCV4XSwgc3RhdHVzIFsweCV4XQoAAABwa3RzY2hlZF9jbF93cnJbJXU6JXVdOiB3ZWln
+aHQgJXUgd2VpZ2h0ZWRfbWFzayAweCV4CgAAAAAAAAAAAAAAcGt0c2NoZWRfY2xfcmxbJXU6JXVd
+OiBtb2RlIHwgdW5pdCB8IHJhdGUgMHglMDZ4IG1pbiAldSBtYXggJXUgcGt0c2l6ZSAldQoAAAAA
+AABwYXJhbV9kbWFxWzB4JXg6MHgleF06IGRtYXEgMHgleCByZWFkICV1IHBmICV1IHJldCAlZAoA
+AAAAAAAAAAAATUNbJXVdIGluaXRfc3RhdGVfbWFjaGluZSAweCUwMngKAAAAAAAAAAAAAAAAAAAA
+TUMgaW5pdGlhbGl6YXRpb24gbm90IGNvbXBsZXRpbmcsIE1DIGN1cnJlbnQgaW5pdCBzdGF0ZSBp
+cyAweCUwMngKAAAAAAAAAAAAAAAAAABNQ1sldV0gX2h3X21jX2luaXRfbWMKAAAAAAAAAAAAAF9o
+d19tY19pbml0X21jX2ZwZ2FbJXVdOiBlcnJvciAlZAoAAAAAAAAAAAAAAAAAAHBoeTogZmFpbGVk
+IHRvIGFsbG9jYXRlZCBtZW1vcnkgZm9yIHBoeSBmdyBmaWxlLCByZXQgJWQKAAAAAAAAAABod19s
+ZV9maWx0ZXJfY3R1cGxlOiB0dXBsZSAldSBub3Qgc3BlY2lmaWVkIGJ1dCByZXF1aXJlZCBmb3Ig
+bWFzayAweCV4CgAAAAAAAAAAAGxlIGNvbmZpZ3VyYXRpb246IGhhc2ggcmVnaW9uIHRvbyBsYXJn
+ZSB0byBlbmFibGUgc2VydmVyIHNyYW0KAABsZSBjb25maWd1cmF0aW9uOiBjYW5ub3QgZW5hYmxl
+IHNlcnZlciBzcmFtIHdoZW4gaGFzaCByZWdpb24gaXMgZGlzYWJsZWQKAAAAAAAAAGh3X3RwX3Rj
+cF9zZXR0aW5nc193OiB0aW1lcl9ycyAldXVzIHRpbWVzdGFtcF9yZXMgJXV1cyBkZWxheWVkYWNr
+X3JlcyAldXVzCgAAAAAAaHdfdHBfdGNwX3NldHRpbmdzX3c6IGRhY2tfdGltZXIgJXV1cyBtc2wg
+JXV1cyByeHRfbWluLG1heCAldSwldXVzIHBlcnNfbWluLG1heCAldSwldXVzCgAAAAAAAAAAaHdf
+dHBfdGNwX3NldHRpbmdzX3c6IGtlZXBfaWRsZSxpbnR2bCAldSwldXMgbWF4cnR0ICV1dXMgaW5p
+dHNydHQgJXV1cyBmaW53YWl0Ml90aW1lciAldXVzCgAAAAAAbGUgY29uZmlndXJhdGlvbjogbmVu
+dHJpZXMgJXUgcm91dGUgJXUgY2xpcCAldSBmaWx0ZXIgJXUgYWN0aXZlICV1IHNlcnZlciAldSBo
+YXNoICV1CgAAAAAAAAAAAAAAbGUgY29uZmlndXJhdGlvbjogbmVudHJpZXMgJXUgcm91dGUgJXUg
+Y2xpcCAldSBmaWx0ZXIgJXUgc2VydmVyICV1IGFjdGl2ZSAldSBoYXNoICV1IG5zZXJ2ZXJzcmFt
+ICV1CgAAAAAAAAAAAAAAAGNmX3BhcnNlOiBmaWxlIG1lbXR5cGUgMHgleCBtZW1hZGRyIDB4JXgg
+bWFwcGVkIEAgJXA6CgAAAAAAAAAAAABjb25maWd1cmVkIHdpdGggY2FwcyBuYm18bGluayAweCUw
+OHggc3dpdGNofG5pYyAweCUwOHggdG9lfHJkbWEgMHglMDh4IGlzY3NpfGZjb2UgMHglMDh4CgAA
+AAAAAABuZXQgVkkgYWxsb2NhdGlvbiBmYWlsZWQgZm9yIGZjX2lkICV1IHdpdGggZXJyb3IgJWQK
+AAAAAAAAAAAAAAAAbmV0IFZJIG1hYyBhZGRyZXNzIHByb2dyYW1taW5nIGZhaWxlZCBmb3IgZmNf
+aWQgJXUgd2l0aCBlcnJvciAlZAoAAAAAAAAAAAAAAAAAAABuZXQgVkkgcnhtb2RlIHByb2dyYW1t
+aW5nIGZhaWxlZCBmb3IgZmNfaWQgJXUgd2l0aCBlcnJvciAlZAoAAAAAbmV0IFZJIHJzcyBpbmRp
+cmVjdGlvbiB0YWJsZSBwcm9ncmFtbWluZyBmb3IgZmNfaWQgJXUgZmFpbGVkIHdpdGggZXJyb3Ig
+JWQKAAAAAABuZXQgVkkgcnNzIGNvbmZpZyBjb21tYW5kIGZhaWxlZCBmb3IgZmNfaWQgJXUgd2l0
+aCBlcnJvciAlZAoAAAAAbmV0IFZJIGNvbW1hbmQgZmFpbGVkIGZvciBmY19pZCAldSB3aXRoIGVy
+cm9yICVkCgAAAAAAAAAAAAAAAAAAAHBwbWF4IFsldV0sIGJpdHMgWyV1XSwgRldfSVNDU0lfUEFH
+RVBPRF9UQUdfSURYX01BWF9TSVpFIFsldV0KAABkZWZhdWx0IHRhZ21hc2sgWzB4JTB4XQoAAAAA
+AAAAAHByb2dyYW1tZWQgdGFnbWFzayBbMHglMHhdCgAAAAAAcHBtLT5kZHBfaW5mby5sbGltaXQg
+WzB4JTB4XSwgcHBtLT5kZHBfaW5mby51bGltaXQgWzB4JTB4XSwgcHBtLT5kZHBfaW5mby5zaXpl
+IFsweCUweF0KAAAAAAAAAAAAcHBtLT5kZHBfaW5mby5tYXhfdHhzeiBbMHglMHhdIHBwbS0+ZGRw
+X2luZm8ubWF4X3J4c3ogWzB4JTB4XSBpb3NpemUgWzB4JTB4XQoAAABwcG1heCBbJXVdLCBpZHhf
+Yml0cyBbJXVdLCBpZHhfbWFzayBbMHglMHhdLCByZXN2ZF90YWdfbWFzayBbMHglMHhdLCB0YWdt
+YXNrIFsweCUweF0KAAAAAAAAAAAAAAB0YWcgaXR0IDB4JTB4LCBiaXRzICV1LCBhZ2UgMHglMHgs
+IGJpdHMgJXUKAAAAAABjeGNuaWMtPmlzY3NpX3BwbSBbMHglMHhdCgAAAAAAAHNjc2lfcGxkX3Np
+emUgWyV1XSwgQUxJR04oc2NzaV9wbGRfc2l6ZSwgMTYpIFsldV0KAAAAAAAAAAAAAAAAAABtYXhf
+cHBvZF96b25lcyBbJXVdCgAAAAAAAAAAAAAAAGZvaXNjc2lfaW5pdDogZm9pc2NzaV9pbml0X2Rv
+bmUgWyV1XSwgZGV2LnJlcy5mb2lzY3NpX250YXNrcyBbJXVdLCBkZXYucmVzLmZvaXNjc2lfbnNl
+c3MgWyV1XSwgZGV2LnJlcy5uY3NvY2sgWyV1XSwgZGV2LnJlcy5mb2lzY3NpX25pbml0IFsldV0s
+IHJjIFslZF0KAAAAAAAAAABjaF9jbF9yYXRlWyV1LyV1XTogY2FwcGVkIGNsYXNzIHJhdGUgZnJv
+bSByZXF1ZXN0ZWQgJXUgdG8gY29uZmlndXJlZCAoZWZmZWN0aXZlKSBjaGFubmVsIHJhdGUgJXUK
+AAAAAAAAAAAAAAAAAAAAY2hfY2xfcmF0ZVsldS8ldV06IGluY3JlYXNlZCBkZWZpY2l0X2luY3Ig
+ZnJvbSByZXF1ZXN0ZWQgJXUgdG8gcmVxdWlyZWQgbWluIG9mICV1OyByYXRlICV1IChlZmYgJXUp
+IGRlZmljaXRfbWF4ICV1CgAAAAAAAAAAAAAAAABwa3RzY2hlZCBjaGFubmVsICV1IHNldHMgc3Bl
+ZWQgKGZyb20gJXUpIHRvICV1IGticHMKAAAAAAAAAAAAAAAAbmV0X2wyZGV2X25vdGlmeTogbDJk
+ZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgcG9ydCBbJWRdLCBldmVudCBbMHgleF0sIHVscHR4Y2gg
+WyV1XSwgY2xhc3MgWzB4JXhdLCB2cHJpbyBbMHgleF0sIHZpZCBbMHgleF0sIHZpX3JlYWR5IFsl
+dV0KAAAAAAAAbmV0X2wyZGV2X25vdGlmeTogcGdpZCBbMHgleF0sIHByaW8gWzB4JXhdLCBjaCBb
+MHgleF0KAAAAAAAAAAAAAHBvcnRfY21kX2hhbmRsZXI6IHVua25vd24gdS5kY2IudHlwZSAweCV4
+CgAAAAAAAGRjYnhfcnVuX3ZlcnNpb25fc21bJXVdIERDQlhfVkVSX1NUQVRFX1JVTl9JRUVFCgAA
+AAAAAAAAAAAAAAAAAABkY2J4X3J1bl92ZXJzaW9uX3NtWyV1XSBEQ0JYX1ZFUl9TVEFURV9SVU5f
+Q0VFCgBkY2J4X3J1bl92ZXJzaW9uX3NtWyV1XSBEQ0JYX1ZFUl9TVEFURV9SVU5fTk9ORQoAAAAA
+AAAAAAAAAAAAAAAAcG9ydFsldV0gcHR5cGUgJXUgbGFuZSAldTogcnhjZmcgPSAlI3gKAAAAAAAA
+AAAAcG9ydFsldV0gcHR5cGUgJXUgbGFuZSAldTogdHhjZmcgPSAlI3gKAAAAAAAAAAAAcG9ydFsl
+dV0gbGluayBkb3duICgldSkgKGxzdGF0dXMgJSN4KQoAAAAAAAAAAAAAaTJjIGVycm9yIGNhdXNl
+ZCBieSBtb2R1bGUgdW5wbHVnCgAAAAAAAAAAAAAAAAAAc2VuZHRvIHBlbmRpbmc6IHdyX3BlbmQg
+JXAgZm9yIHBvcnQgJXUsICB3YW50IHRvIHNlbmQgdG8gcG9ydCAldQoAAAAAAAAAAAAAAAAAAABw
+b3J0WyV1XSB1cGRhdGUgKGZsb3djaWQgJXUpCgAAAHBvcnRfc2V0X2xvb3BiYWNrIHBvcnQgJSN4
+IGN1cnJlbnQgJSN4IG1vZGUgJSN4CgAAAAAAAAAAAAAAAAAAAABwb3J0WyV1XSBzcGVlZCB1cGRh
+dGU6ICUjeAoAAAAAAHBvcnRbJXVdIGJlZ2lubmluZyBkZWJvdW5jZQoAAAAAUVNGUCBtb2R1bGUg
+dW5wbHVnIC0gcmVpbml0aWFsaXppbmcgcnhfbG9zICB0byAweGZmCgAAAAAAAAAAAAAAAGdwaW9f
+cXNmcF9tb2R1bGVfdXBkYXRlOiBjaGFuZ2VkIHJ4X2xvcyBmcm9tIDB4JXggdG8gMHgleAoAAAAA
+AABncGlvX3FzZnBfbW9kdWxlX3VwZGF0ZTogY2hhbmdlZCB0eF9kaXMgZnJvbSAweCV4IHRvIDB4
+JXgKAAAAAAAAcG9ydF9saW5rX3N0YXRlX2hhbmRsZXJbJXVdIHBvd2VyaW5nIGRvd24KAAAAAAAA
+cG9ydF9saW5rX3N0YXRlX2hhbmRsZXJbJXVdIHBvd2VyaW5nIHVwCgAAAAAAAAAAcG9ydF9saW5r
+X3N0YXRlX2hhbmRsZXJbJXVdIHVua25vd24gc3RhdGUgKHN0YXRlID0gJSN4KQoAAAAAAAAAAHBv
+cnRfbGlua19zdGF0ZV9oYW5kbGVyIGdvdCByZXNjaGVkdWxlZAoAAAAAAAAAAHBvcnRfbGlua19z
+dGF0ZV9oYW5kbGVyOiBTb21ldGhpbmcgd2VudCB0ZXJyaWJseSB3cm9uZy4gcmV0ID0gJWQKAAAA
+AAAAAAAAAAAAAAAAaHdfc2dlX21hbWVtX2luaXQ6IGVuY291bnRlcmVkIGVycm9yICVkCgAAAAAA
+AAAAbGUgaW5pdGlhbGl6YXRpb246IG5lbnRyaWVzICV1IHJvdXRlICV1IGNsaXAgJXUgZmlsdGVy
+ICV1IGFjdGl2ZSAldSBzZXJ2ZXIgJXUgaGFzaCAldQoAAAAAAAAAAAAAbGUgaW5pdGlhbGl6YXRp
+b246IG5lbnRyaWVzICV1IHJvdXRlICV1IGNsaXAgJXUgZmlsdGVyICV1IHNlcnZlciAldSBhY3Rp
+dmUgJXUgaGFzaCAldSBuc2VydmVyc3JhbSAldQoAAAAAAAAAAAAAAGh3X3RwX2luaXQ6IHRjYiBy
+ZWdpb24gKHN0YXJ0IDB4JTA4cyBzaXplICV1KSBtdXN0IGJlIGluIGZpcnN0IDI1Nk1CIG9mIE1B
+IG1lbW9yeQoAAAAAAAAAAAAAAAAAAGh3X3RwX2luaXQ6IHBnbW5ndCByZWdpb24gKHN0YXJ0IDB4
+JTA4cyBzaXplICV1KSBtdXN0IGJlIGluIGZpcnN0IDI1Nk1CIG9mIE1BIG1lbW9yeQoAAAAAAAAA
+AAAAAGh3X3RwX2luaXQ6IFRQIHBnbW5ndCBpbml0aWFsaXphdGlvbiBkaWQgbm90IGNvbXBsZXRl
+CgAAAAAAAAAAAABidWZtX2luaXQ6IG4gJXUgYnVmbGw2NGludF9zaXplIDB4JXgKAAAAAAAAAAAA
+AABidWZtX2luaXQ6IG5vdCBlbm91Z2ggbWVtb3J5IHRvIGFsbG9jYXRlIGludGVybmFsIGJ1Zmxs
+NjQgYnVmZmVycwoAAAAAAAAAAAAAAAAAAGJ1Zm1faW5pdDogbm90IGVub3VnaCBtZW1vcnkgdG8g
+YWxsb2NhdGUgYnVmbGw2NCBidWZmZXJzCgAAAAAAAABtZW1faW5pdF9idWY6IG5vdCBlbm91Z2gg
+bWVtb3J5IHRvIGFsbG9jYXRlIGZsb3cgYnVmZmVycwoAAAAAAAAAbWVtX2luaXRfYnVmOiBub3Qg
+ZW5vdWdoIG1lbW9yeSB0byBhbGxvY2F0ZSB0Y2JfY2FjaGUgKG9mZmVyZWQgJXUgdHJ5aW5nIHRv
+IHVzZSAldSBhdmFpbGFibGUgJXUpCgAAAAAAAAAAAAAAAAAAAG1wYXJ0aXRpb25fb3RoZXJzOiBz
+dGFydCAweCUwOHggc2l6ZSAldSAodW51c2VkICV1KQoAAAAAAAAAAAAAAABtcGFydGl0aW9uX290
+aGVyczogc3RhcnQgMHglMDh4IHNpemUgJXUgKHVudXNlZCAldSkKAAAAAAAAAAAAAAAAbWVtX2lu
+aXQ6IEVEQyBvdmVyY29tbWl0dGVkIGJ5ICVkIGJ5dGVzCgAAAAAAAAAAbWVtX2luaXQ6IG5vdCBl
+bm91Z2ggbWVtb3J5IHRvIGFsbG9jYXRlIGZsb3cgdGFibGUKAAAAAAAAAAAAAAAAAGN4Y25pY19k
+ZXZpY2VfaW5pdDogY3hjbmljIFsweCUweF0sIGN4Y25pYy0+ZmlsdGVyIFslMHhdCgAAAAAAAABw
+b2Zjb2UgaW5pdCBkb25lCgAAAAAAAAAAAAAAAAAAAFBvcnRbJXVdOiBVbmtub3duIFNHTUlJIHN1
+Yi10eXBlICUjeAoAAAAAAAAAAAAAAFBvcnRbJXVdOiBVbmtub3duIEJUX1hGSSBzdWItdHlwZSAl
+I3gKAAAAAAAAAAAAAHBvcnRfaW5pdFsldV06IHBvcnQgdHlwZSAweCV4IGlzIG5vdCBzdXBwb3J0
+ZWQKAG1wYXJ0aXRpb25faW5pdDogbW92ZWQgcG1yeF9zdGFydCBmcm9tIDB4JTA4eCB0byAweCUw
+OHggdG8gbWFrZSByb29tIGZvciBMRSBIQVNIIGFuZC9vciBUUCBUQ0JzCgAAAAAAAAAAAAAAAAAA
+AABtcGFydGl0aW9uX2luaXQ6IG1vdmVkIHBtcnhfc3RhcnQgZnJvbSAweCUwOHggdG8gMHglMDh4
+IChFRFJBTSkKAAAAAAAAAAAAAAAAAAAAAEVRIHBmbiAldSB2Zm4gJXU6IGRlc3Ryb3lpbmcgZXFp
+ZCAldSB3aXRoIHBlbmRpbmcgV1IocykgKG51bV9ieXRlcyAldSBhbmQgZmxhZ3MgMHglMDh4CgAA
+AAAAAAAAAGwyZGV2X2ZjLT5mbG93Y19pZCBbJXVdLCBsMmRjLT5wZm4gWyV1XSwgbDJkYy0+dmZu
+IFsldV0sIGwyZGMtPmxwb3J0IFsldV0sIGwyZGV2X2ZjLT5mbG93aWQgWyV1XSBsMmRjLT50eF9j
+aCBbJXVdLCBkZXYudnBkLnBvcnR2ZWMgWyV4XQoAAAAAAAAAAHBvcnR2ZWMgWyV1XQoAAABsMmRl
+dl92aV9mc206IG1iIFsweCV4XSwgZGVmZXJyZWQsIHN0YXRlIFsweCV4XSwgcG9ydCBbMHgleF0K
+AAAAbDJkZXZfdmlfZnNtOiB2aWlkIFsweCV4XSBwb3J0IFsweCV4XSwgbWFjLWlkIFslMDJ4OiUw
+Mng6JTAyeDolMDJ4OiUwMng6JTAyeF0uIAoAAAAAAAAAAAAAAAAAAAAAbDJkZXZfdmlfZnNtOiBz
+Z2VfZXFpZCBbMHgleF0sIHNnZV9pcWlkIFsweCV4XSwgc2dlX2VxY3IgWzB4JXhdLCByc3Nfc3og
+WzB4JXhdCgBsMmRldl92aV9mc206IGwyZGV2X2ZjLT5mbG93Y19uZXRfbDJkZXZfbXR1IFsldV0s
+IG1iX3NjcmF0Y2ggWzB4JXhdLCBwb3J0IFsweCV4XQoAAAAAAAAAAAAAAAAAAABsMmRldl92aV9m
+c206IHZpaWQgWyVkXSwgdmlfZmMtPmZsb3djX3ZpX2ZsYWdzIFsweCV4XQoAAAAAAAAAAAAAbDJk
+ZXZfdmlfZnNtOiBwZm4gWzB4JXhdLCB2Zm4gWzB4JXhdLCBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4
+JXhdLCBscG9ydCBbMHgleF0sIHZpaWQgWzB4JXhdLCBmbGFncyBbMHgleF0KAAAAAAAAAGwyZGV2
+X3ZpX2ZzbTogRXJyb3IgZnJlZWluZyBWSSwgcmMgWzB4JXhdCgAAAAAAAGwyZGV2X3ZpX2ZzbTog
+cGlkIFsweCV4XSwgdmlpZCBbMHgleF0sIG1iX2xvYyBbMHgleF0sIG1iX29yaWdbMHgleF0sIGwy
+ZGV2X2ZsYWdzIFsweCV4XSwgcmMgWzB4JXhdCgAAAAAAAAAAAAAAAABBaCBoYS4uLmRvdWJsZSBm
+cmVlIG94X2lkIDB4JXgsIHJ4X2lkIDB4JXgKAAAAAABIb3N0IFBSTEkgUmVzcG9uc2UgdGltZWRv
+dXQ6IG94X2lkIDB4JXggcnhfaWQgMHgleAoAAAAAAAAAAAAAAAAAcGZuICV1IHZmbiAldSB2aWEg
+Y29tbWFuZAoAAAAAAABod19pMmNfdHJhbnNhY3Rpb246IG5kYXRhICV1IGFkZHJfb3AgMHgleCBk
+YXRhWzBdIDB4JXggZGlmZiAldQoAaHdfaTJjX3RyYW5zYWN0aW9uOiBuZGF0YSAldSBhZGRyX29w
+IDB4JXggZGF0YVswXSAweCV4IGRpZmYgJXUgZHBvcyAldSBjb250ICV1IGZhaWxlZCB3aXRoIGVy
+ciAlZAoAAAAAAAAAAAAAAAAAAGkyYyB0cmFuc2FjdGlvbiBmYWlsZWQgdG8gY29tcGxldGUKAAAA
+AAAAAAAAAAAAAFBMX1BDSUVfTElOSy5zcGVlZCBvZiAldSBpcyBub3Qgc3VwcG9ydGVkCmZpbGUs
+IHJldCBGV19FSU8KAAAAAABzY2hlZF9pb3F0eF9icF9wcmlvcml0eTogaGFzICV1IGVudHJpZXMg
+b25seSwgcmVxdWlyZXMgJXUgZW50cmllcwoAAAAAAAAAAAAAAAAAAHRwX3RpbWVydmFsczogcGFy
+c2VkICVkIGluc3RlYWQgb2YgJXUgZW50cmllcwoAAHRwX3RpbWVycmVzOiBwYXJzZWQgJWQgaW5z
+dGVhZCBvZiAldSBlbnRyaWVzCgAAAHRwX210dXMgaGFzICV1IGVudHJpZXMgb25seSwgcmVxdWly
+ZXMgJXUgZW50cmllcwoAAAAAAAAAAAAAAAAAAAB0cF9tdHVzWyV1XSBpcyAldSBieXRlcyB3aGlj
+aCBpcyBub3Qgc3VwcG9ydGVkCgBjb25maWd1cmF0aW9uIGZpbGUgcGFyc2VyOiBzZ2UgdGltZXIg
+dmFsdWVbJWldIGlzIHRvbyBsYXJnZSwgY2hhbmdpbmcgZnJvbSAldSB0byAldXVzZWNzCgAAAAAA
+AABmaWx0ZXJtYXNrIDB4JXggaXMgbm90IGVxdWFsL3N1YnNldCB0by9vZiBmaWx0ZXJtb2RlCgAA
+AAAAAAAAAAAAaHdfbGVfY2xpcF9oYW5kbGVyOiByZW1vdmVkIHBvcz0ldSAoPWlkeCAldSkKAAAA
+aHdfbGVfY2xpcF9oYW5kbGVyOiBhZGRpbmcgdG8gcG9zPSV1ICg9aWR4ICV1KQoAbW9kdWxlWyV1
+XTogcG9ydCBtb2R1bGUgaW5zZXJ0ZWQgYW5kIHJlYWR5CgAAAAAAbW9kdWxlWyV1XTogcG9ydCBt
+b2R1bGUgcmVtb3ZlZAoAAAAAAAAAAAAAAAAAAAAAbW9kdWxlWyV1XTogdW5rbm93biBtb2R1bGUg
+aWRlbnRpZmllciAweCUwMngKAAAAbW9kdWxlWyV1XTogZ3BpbyAldSB0cmFucyAxMEcgMHglMDJ4
+IDFHIDB4JTAyeCAobGVuZ3RoICV1KSBjYWJsZSAweCUwMnggKGxlbmd0aCAldSkgbW9kdWxlX3R5
+cGUgMHglMDJ4CgAAAAAAAAAAAE1DOiBleHBlY3RlZCBzdGF0ZSB0byBzd2l0Y2ggdG8gQ0ZHLgAA
+AAAAAAAAAAAAAE1DOiBleHBlY3RlZCBzdGF0ZSB0byBzd2l0Y2ggdG8gQWNjZXNzLgAAAAAAAAAA
+AE1DOiBleHBlY3RlZCBzdGF0ZSB0byBzd2l0Y2ggdG8gQ0ZHLgAAAAAAAAAAAAAAAE1DOiBleHBl
+Y3RlZCBzdGF0ZSB0byBzd2l0Y2ggdG8gQWNjZXNzLgAAAAAAAAAAAElJLjEuYnggZHAxOFsldV0g
+cVsldV0gJSN4ICUjeCAlI3ggJSN4IG1pbiAlI3ggbWF4ICUjeAoAAAAAAAAAAABJSS4xLmMtZC4g
+JSN4ICUjeCAlI3ggJSN4IGFsbCAgJSN4CgAAAAAAAAAAAAAAAABJSS4yLmIgKCUjeCAtICUjeCAr
+ICUjeCkgJSAxMjggPSAlI3gKAAAAAAAAAAAAAABJSS4zIGluZXdfMWUgYWZ0ZXIgbGltaXQgY29t
+cHV0ZSBpdGVtcF8xZSAleCwgaW5ld18xZSAleAoAAAAAAAAASUkuMy4gaXRlbXBfMWUgJSN4IGlu
+ZXdfMWUgJSN4IGluZXdfMWUgJWQKAAAAAAAASUkuNC4gc2V0XzFlICUjeAoAAAAAAAAAAAAAAAAA
+AABNQzogY2FsaWJyYXRpb24gZmFpbGVkIGZvciBlcnJhdGEyOSBkcDE4ICV1CgAAAABJVi4xLiBk
+cDE4WyV1XSBwaGFzZV9zZWwgYmVmb3JlICUjeCBhZnRlciAlI3gsIGdhdGVfZGVsYXkgJSN4CgAA
+TUMgZXJyYXRhMjkgaXNzdWU6IGRwMTggJXUgcXVhZCAldSBjYW5ub3QgYmUgZGVjcmVhc2VkCgAA
+AAAAAAAAAE1DIGVycmF0YTI5IGlzc3VlOiBkcDE4ICV1IHF1YWQgJXUgY2Fubm90IGJlIGRlY3Jl
+YXNlZAoAAAAAAAAAAABNQyBlcnJhdGEyOSBpc3N1ZTogZHAxOCAldSBxdWFkICV1IGNhbm5vdCBi
+ZSBkZWNyZWFzZWQKAAAAAAAAAAAATUMgZXJyYXRhMjkgaXNzdWU6IGRwMTggJXUgcXVhZCAldSBj
+YW5ub3QgYmUgZGVjcmVhc2VkCgAAAAAAAAAAAHRlbXAyXzFlKzB4MTAgPSAlI3gKAAAAAAAAAAAA
+AAAATUM6IGNhbGlicmF0aW9uIGZhaWxlZCBmb3IgZXJyYXRhMjEgaXRlcmF0aW9uICV1CgAAAAAA
+AAAAAAAAAAAAAE1DIGVycmF0YSAyMTogZHAxOFsldV0gcHIwIG4wMiBmYWlsZWQgdG8gZ2V0IGF2
+ZXJhZ2UKAAAAAAAAAAAAAABNQyBlcnJhdGEgMjE6IGRwMThbJXVdIHByMCBuMTMgZmFpbGVkIHRv
+IGdldCBhdmVyYWdlCgAAAAAAAAAAAAAATUMgZXJyYXRhIDIxOiBkcDE4WyV1XSBwcjEgbjAyIGZh
+aWxlZCB0byBnZXQgYXZlcmFnZQoAAAAAAAAAAAAAAE1DIGVycmF0YSAyMTogZHAxOFsldV0gcHIx
+IG4xMyBmYWlsZWQgdG8gZ2V0IGF2ZXJhZ2UKAAAAAAAAAAAAAABNQyBpbml0aWFsaXphdGlvbiBm
+YWlsZWQ6IERGSSBpbml0IG5vdCBnb2luZyB0byAwCgAAAAAAAAAAAAAAAAAATUMgaW5pdGlhbGl6
+YXRpb24gZmFpbGVkOiBERkkgaW5pdCBub3QgY29tcGxldGluZwoAAAAAAAAAAAAAAAAAAE1DIGlu
+aXRpYWxpemF0aW9uIGZhaWxlZDogQ2FsaWJyYXRpb24gZGlkbid0IGNvbXBsZXRlLgoAAAAAAAAA
+AABEUDE4ICV1LCBieXRlX2xhbmUgJXUsIGJpdF9zZWxlY3QgJXUKAAAAAAAAAAAAAABEUDE4ICV1
+LCBieXRlX2xhbmUgJXUsIGJpdF9zZWxlY3QgJXUKAAAAAAAAAAAAAABNQyBmYWlsZWQgdG8gZ2V0
+IFVQQ1RMIHBvd2VyIHVwIGRvbmUKAAAAAAAAAAAAAABNQyBpbml0aWFsaXphdGlvbiBmYWlsZWQ6
+IERpZG4ndCBnZXQgYWxsIERQMThzIGxvY2tlZAoAAAAAAAAAAAAATUMgaW5pdGlhbGl6YXRpb24g
+ZmFpbGVkOiBEaWRuJ3QgZ2V0IGJvdGggQURScyBsb2NrZWQKAAAAAAAAAAAAAEN1cnJlbnQgU2xl
+dyB0eF9yb3cgJWQ6IHR4X2NvbCAlZCwgdmFsICVkCgAAAAAAAEN1cnJlbnQgU2xldyBhZGRyX3Jv
+dyAlZDogYWRkcl9jb2wgJWQsIHZhbCAlZAoAAE1DIGluaXRpYWxpemF0aW9uIGZhaWxlZDogU0xF
+V19ET05FX1NUQVRVUyBuZXZlciB0b2dnbGVkAAAAAAAAAABmbHJfcGZ2Zl9mc21bJXU6JXVdOiB1
+bmtub3duIHN0YXRlICV1CgAAAAAAAAAAAABodyBwZiBiaXRtYXAgMHglMDJ4IHZmaWQgYml0bWFw
+IDB4JTA4eDoweCUwOHg6MHglMDh4OjB4JTA4eAoAAAAAYWZ0ZXIgdmZpZCBmaXh1cCwgdmZpZCBi
+aXRtYXAgMHglMDh4OjB4JTA4eDoweCUwOHg6MHglMDh4CgAAAAAAAE1DWyV1XTogZmFpbGVkIHRv
+IHN3aXRjaCBjb250cm9sbGVyIHRvIENGRyBzdGF0ZQoAAAAAAAAAAAAAAAAAAABNQ1sldV06IGZh
+aWxlZCB0byBzd2l0Y2ggY29udHJvbGxlciB0byBJTklUX01FTSBzdGF0ZQoAAAAAAAAAAAAATUNb
+JXVdOiBmYWlsZWQgdG8gc3dpdGNoIGNvbnRyb2xsZXIgdG8gQ0ZHIHN0YXRlCgAAAAAAAAAAAAAA
+AAAAAE1DWyV1XTogcGVyaW9kaWMgY2FsaWJyYXRpb24gZmFpbGVkIHdpdGggZXJyb3IgJXUKAAAA
+AAAAAAAAAAAAAAB0aW1lciBxdWV1ZSAldSBsb3N0IGEgdGljayEgbmV4dCAlcCBsYXN0ICVwIG51
+bWUgJXUKAAAAAAAAAAAAAAAAZmxyX3RpbWVyX3N0YXJ0OiBmbG93Y19pZCAldSAlcCBidWYgJXAK
+AAAAAAAAAAAATUFDOiBQTExzIGRpZG4ndCBsb2NrCgAAAAAAAAAAAABwY2llOiByZWFkIGZyb20g
+c2VyY2ZnIHBjaWVfaXBfdXJfbWF4ZnVuYyAweCV4IHBmYml0bWFwIDB4JXgKAAAAcGNpZTogbnBm
+ICV1IChwZmJpdG1hcCAweCUwMngpIG52ZiAldSAocGYgMC4uMyAweCUwMnggMHglMDJ4IDB4JTAy
+eCAweCUwMngpCgAAAABmYWlsZWQgdG8gZmluZCB0aGUgJWMlYyBWUEQgcGFyYW1ldGVyCgAAAAAA
+AAAAAABmYWlsZWQgdG8gcGFyc2UgdGhlICVjJWMgVlBEIHBhcmFtZXRlcgoAAAAAAAAAAABmYWls
+ZWQgdG8gc3VjY2Vzc2Z1bGx5IGZpbmQgQ2hlbHNpbyBWUEQKAAAAAAAAAABsb2cgaW5pdGlhbGl6
+ZWQgQCAweCUwOHggc2l6ZSAldSAoJXUgZW50cmllcykgZndyZXYgMHglMDh4IHBjaWVfZncgMHgl
+MDh4CgAAAAAAAGJvb3RzdHJhcCBmaXJtd2FyZSB0b29rICV1IG1zZWNzIHRvIHJ1bgoAAAAAAAAA
+AGZsb3djICV1IChTR0UgZXFpZCAldSkgKEVUSENUUkwgcXVldWUpIGV4cGVyaWVuY2VkIGEgUENJ
+IERNQSBSRUFEIHdvcmsgcmVxdWVzdCBlcnJvciAoaW5ib3VuZCBxdWV1ZSAldSkKAAAAAAAAAABm
+bG93YyAldSAoU0dFIGVxaWQgJXUpIGV4cGVyaWVuY2VkIGFuIHVuZXhwZWN0ZWQgUENJIERNQSBS
+RUFEIHdvcmsgcmVxdWVzdCBlcnJvciAoaW5ib3VuZCBxdWV1ZSAldSkKAAAAAAAAAAAAAAAAZmxv
+d2MgJXUgZXhwZXJpZW5jZWQgYW4gdW5leHBlY3RlZCBQQ0kgRE1BIFJFQUQgZXJyb3IgKGluYm91
+bmQgcXVldWUgJXUpCgAAAAAAAABnYXRoZXJfdGFza3NfZm9yX3RtZjogaWR4IFsweCV4XSwgdGFz
+ay1pZCBbMHgleF0sIGNtZC1pZCBbMHgleF0sIGFjdGl2ZSB0YXNrcyBbMHgleF0uIGNvbm4taWQg
+WzB4JXhdLCBjbWQgY29ubi1pZCBbMHgleF0sIHRhc2sgY29ubi1pZCBbMHgleF0KAABnYXRoZXJf
+dGFza3NfZm9yX3RtZjogSW52YWxpZCB0eXBlIFsweCV4XSwgYmFpbGluZyBvdXQuCgAAAAAAAAAA
+Z2F0aGVyX3Rhc2tzX2Zvcl90bWY6IHRhc2sgaWQgWzB4JXhdLCBzdGF0ZSBbMHgleF0sIGxpZHgg
+WzB4JXhdLCBjb29raWUgaGkgWzB4JTA4eF0gOiBsbyBbMHglMDh4XQoAAAAAAAAAAAAAAAAAAGdh
+dGhlcl90YXNrc19mb3JfdG1mOiByYyBbMHgleF0sIFsweCV4XSB0YXNrIGdhdGhlcmVkIGZvciB0
+bWYgdHlwZSBbMHgleF0gcHJvY2Vzc2luZy4KAAAAAAAAAAAAAHNjc2lfZGF0YV9vdXQ6IGNvbm5f
+ZmMgWzB4JXhdLCBzdGF0ZSBbMHgleF0sIHNlc3NfZmMgWzB4JXhdIGluIHJlY292ZXJ5LiBTa2lw
+cGluZyBpc3Rhc2tfZmMgWzB4JXhdIGZyb20gVFguCgAAAABzZW5kX2Fib3J0X3JlcTogY3NrX2Zj
+LT5mbG93Y190eXBlIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIHRpZCBbMHgleF0s
+IHVscHR4Y2ggWyV1XSwgYnVmZmVyZWQgWyV1XQoAAAAAaHcgcmVnaXN0ZXIgb3BlcmF0aW9uIG5v
+dCBjb21wbGV0aW5nLCByZWcgMHglMDh4IG1hc2sgMHglMDh4IHZhbHVlIDB4JTA4eCAocmVnIDB4
+JTA4eCkKAAAAAAAAAAAAaHdfYmNtODQ4NTZfY2hlY2sgZW50cnkKAAAAAAAAAABod19iY204NDg1
+Nl9jaGVjayBsb29wICV1IChjaGVjayAlI3gpCgAAAAAAAAAAAABod19iY204NDg1Nl9jaGVjayB1
+cF9ydW5uaW5nIChsb29wX2NudD0ldSkKAAAAAABod19iY204NDg1Nl9jaGVjayBmYWlsZWQgKGJh
+ZCBDUkMpCgAAAAAAAAAAAAAAAABQSFkgZmlybXdhcmUgbG9hZCBzdWNjZXNzZnVsISAod293Li4u
+KQoAAAAAAAAAAABNRElPIENMNDU6IGZhaWxlZCB0byBzZXQgdXAgTU1EIGFkZHIKAAAAAAAAAAAA
+AABNRElPOiBmYWlsZWQgdG8gd3JpdGUKAAAAAAAAAAAAAE1ESU8gQ0w0NTogZmFpbGVkIHRvIHNl
+dCB1cCBNTUQgYWRkcgoAAAAAAAAAAAAAAE1ESU86IGZhaWxlZCB0byByZWFkCgAAAAAAAAAAAAAA
+bWlpX2Fkdl9mY1sldV06IHJjYXBzIDB4JXgKAAAAAABtaWlfYWR2X3NwZWVkWyV1XTogcmNhcHMg
+MHgleAoAAHNlbmRfY2xvc2VfcmVxOiBjc2tfZmMtPmZsb3djX3R5cGUgWzB4JXhdLCBjc2tfZmMt
+PmZsb3djX2lkIFsweCV4XSwgY3NrX2ZjLT50Y2Jfc3RhdGUgWzB4JXhdCgAAAHNlbmRfY2xvc2Vf
+cmVxOiBjc2tfZmMtPmZsb3djX3R5cGUgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwg
+dGlkIFsweCV4XSwgdWxwdHhjaCBbJXVdLGJ1ZmZlcmVkIFsldV0KAAAAAABvZmxkX3RjcF9kb19h
+Y3RpdmVfY2xvc2U6IGNza19mYyBbMHgleF0sIGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tf
+ZmMtPnRjYl9zdGF0ZSBbMHgleF0KAAAAAABvZmxkX3RjcF9kb19hY3RpdmVfY2xvc2U6IGNza19m
+YyBbMHgleF0sIGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tfZmMtPnRjYl9zdGF0ZSBbMHgl
+eF0KAAAAAABvZmxkX3RjcF9kaXNjb25uZWN0OiB0Y2JfZmMtPmZsb3djX2lkIFsweCV4XSwgY3Nr
+X2ZjLT5mbG93Y19pZCBbMHgleF0sIGNzay0+dGNiX3N0YXRlIFsweCV4XQoAAABkZWNvZGVfYmFz
+ZTY0X3N0cmluZzogZGxlbiBbJWRdCgAAAAAAAAAAAAAAAAAAAABkZWNvZGVfaGV4X3N0cmluZzog
+ZGxlbiBbJWRdCgAAAGZvaXNjc2lfdmFsaWRhdGVfbG9naW5fc3RhZ2U6IC0gMQoAAAAAAAAAAAAA
+AAAAAGFzeW5jX3BkdTogbG9nb3V0IHJlcXVlc3RlZCBibG9ja2luZyBzZXNzaW9uCgAAAGFzeW5j
+X3BkdTogc2Vzcy9jb25uIGRyb3AgcmVxdWVzdGVkIGJsb2NraW5nIHNlc3Npb24KAAAAAAAAAAAA
+AABjcGxfdHhfcGt0OiBpbnRmIFsweCV4XQoAAAAAAAAAAGNwbF90eF9wa3Q6IHZsYW5pZCBbMHgl
+eF0KAAAAAAAAbmV0X2wyZGV2X2ZpbmRfYnlfYWRkcjogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4
+XSwgbDJkYy0+bHBvcnQgWyV1XSwgbDJkX2ZjLT5mbG93Y19pZCBbMHgleF0sIGwyZGMtPmluNF9k
+ZXYuaW5fYWRkci5hZGRyIFsweCV4XSwgYWRkciBbMHgleF0KAAAAbmV0X2wyZGV2X210dV9jb25m
+aWc6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIG10dSAldQoAAAAAAAAAAG5ldGlmX2RvX2Ro
+Y3A6IHdyLT5wYXJhbS52bGFuaWQgWyV1XSwgbDJkZXZfZmMtPmZsb3djX25ldF9sMmRldl92bGFu
+ZGV2IFsweCV4XQoAY3BsX3R4X3BrdDogaW50ZiBbMHgleF0KAAAAAAAAAABjcGxfdHhfcGt0OiB2
+bGFuaWQgWzB4JXhdCgAAAAAAAGVuY29kZSBoZXggc3RyaW5nOiBkbGVuIFslZF0KAAAAdGNwX3Nl
+bmRfYW9wZW5fcmVxOiBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19zdGF0
+ZSBbMHgleF0sIGJ1ZmZlcmVkIFsldV0sIHJlc19jbnQgWzB4JXhdLCBpcV9pZHggWzB4JXhdCgAA
+AAAAAAAAAAB0Y3Bfc2VuZF9hb3Blbl9yZXE6IGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tf
+ZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgbm8gdmFsaWQgbDJ0X2VudHkuIERlbGF5aW5nIGFub3Ro
+ZXIgcmV0cnkgZm9yIDEgc2Vjb25kcy4KAAAAAAAAAAAAAAAAAABhb3Blbl9yZXE6IGh3X2xlX2Zp
+bHRlcl9jdHVwbGUgZmFpbGVkCgAAAAAAAAAAAABvZmxkX3RjcF9zZW5kX2FvcGVuX3JlcTogY3Bs
+X3JlcS0+RmlsdGVyIFsweCUweF0sIGN0dXBsZXNbMF0gWzB4JXhdLCBjdHVwbGVzWzFdIFsweCV4
+XQoAAAAAAAAAAABjc29ja19hbGxvYzogdHhfY2ggWzB4JXhdLCBscG9ydCBbMHgleF0sIGNvb2tp
+ZSBbJTA4eF0KAAAAAAAAAAAAY3NvY2tfYWxsb2M6IGF2YWlsYWJsZSBbJXVdLCBuY3NvY2sgWyV1
+XSwgcG9zOmF0aWQgWzB4JXhdLCBjc2tfZmMgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsweCV4
+XSwgc3BvcnQgWyV1XQoAAFdBVENIRE9HOiBObyB0ZW1wZXJhdHVyZSBzZW5zb3IgYXZhaWxhYmxl
+LgoAAAAAAFdBVENIRE9HOiBBY3RpdmF0aW5nCgAAAAAAAAAAAAAAV0FUQ0hET0cgLSBFbmFibGUg
+YWN0aW9uICV1IHRpbWUgJXUKAAAAAAAAAAAAAAAAV0FUQ0hET0cgLSBEaXNhYmxlIGFjdGlvbiAl
+dQoAAABXQVRDSERPRzogRGUtYWN0aXZhdGluZwoAAAAAAAAAAGZvaXNjc2kgY29ubl9mYyBbMHgl
+eF0sIGZsb3djX3NjaGVkY2wgWzB4JXhdLCBpbmdfY2ggWzB4JXhdLCBlZ3JfY2ggWzB4JXhdCgAA
+AAAAbDJkZXZfbm90aWZ5IHdpdGggdW5rbm93biBmbGFnIFsweCV4XQoAAAAAAAAAAAAARkNvRSBG
+Q0IgbGlua2Rvd246IGlvX3JlcSAweCV4JXggaXFpZCAweCV4IGZsb3dpZCAweCV4IG9wIDB4JXgK
+AGZjX3NlbmRfYWxsb2NfY3BsOiBmYWlsZWQgdG8gc2V0dXAgZmlsdGVyIGN0dXBsZQoAAAAAAAAA
+AAAAAAAAAABmY29lX2NvbXB1dGVfY3R1cGxlIDB4JXg6JXgKAAAAAGNvbXB1dGVfY3R1cGxlKCk6
+IGZhaWxlZCB0byBzZXR1cCBmaWx0ZXIgY3R1cGxlCgAAAAAAAAAAAAAAAAAAAABmY29lIG5vdGlm
+eSA6IFVwZGF0ZSBuZXcgRENCWCB2YWx1ZXMgVkkgc3RhdGUgMHgleCBwcmkgMHgleCBzY2hlZGNs
+IDB4JXggZGNieF9kb25lIDB4JXgKAAAAAAAAAABmY29lIG5vdGlmeSA6IEZDRiBmbG93aWQgMHgl
+eCwgdWxwY2ggMHgleCAKAAAAAABmY29lIG5vdGlmeSA6IEZDb0UgTElOS1VQOiBwb3J0IDB4JXgs
+IGV2ZW50IDB4JXgKAAAAAAAAAAAAAAAAAAAAZmNvZSBub3RpZnkgOiBGQ29FIExJTktET1dOOiBw
+b3J0IDB4JXgsIGV2ZW50IDB4JXgKAAAAAAAAAAAAAAAAAGZjb2Ugbm90aWZ5IDogRENCWCA6IHBv
+cnQgMHgleCwgcHJpb3JpdHkgMHgleCB1bHB0eGNoIDB4JXggY2xhc3MgMHgleAoAAAAAAAAAAAAA
+cG9ydFsldV0gc2V0IERDQiBQUFAgUEFSQU1TOiBwZSAlI3ggdHggJSN4IHJ4ICUjeAoAAAAAAAAA
+AAAAAAAAAHdvcmthcm91bmRfcHIxOTM4NlsldV06IHdlaWdodF9lbmFibGVkIDB4JXggd2VpZ2h0
+X2xpbWl0ZWQgMHgleCBSRUxPQUQgJXUKAAAAAAAAd29ya2Fyb3VuZF9wcjE5Mzg2WyV1XTogZm9y
+Y2UgUkVMT0FEIFJEWSAweCV4IFdBVENIX1JEWSAweCV4IFdBVENIX0xJU1QgMHgleCAtPiAweCV4
+CgAAAAAAAAAAAAAAd29ya2Fyb3VuZF9wcjE5Mzg2WyV1XTogUkVMT0FEZWQgUkRZIDB4JXggV0FU
+Q0hfUkRZIDB4JXggV0FUQ0hfTElTVCAweCV4CgAAAAAAAABjaF9jbF9yYXRlWyV1LyV1XTogY2Fw
+cGVkIGRlZmljaXRfaW5jciBmcm9tIHJlcXVpcmVkICV1IHRvICV1OyByYXRlICV1IChlZmYgJXUp
+IGRlZmljaXRfbWF4ICV1CgBGQ29FIEZDRiB0aW1lcjogZmxvd2Mgc3RhdGUgMHgleCwgcG9ydCAw
+eCV4ICxmY2YgMHgleCwgZmxvd2NfaWQgMHgleAoAAAAAAAAAAAAAAHJpX3dyX2luaXRbJXVdOiBt
+c3MgJXUgaXMgbm90IDgtYnl0ZSBhbGlnbmVkCgAAAGNvcmVfcHJvZ3JhbV90Y2I6IHRpZCAlI3gg
+dF9zdGF0ZSAlI3ggcmN2X2FkdiAweCUwOHggcmN2X3NjYWxlICUjeCB0eF9tYXggJSN4IHJjdl9u
+eHQgJSN4IGF0aWQgJSN4CgAAAAAAAAAAAAAAAAAJb3B0MCAlI3gleCBvcHQyICUjeCBpcHY2ICUj
+eCBmbGFnc190aW1lciAweCUwOHgKAAAAAAAAAAAAAAAAAAAAb2ZsZF9jb25uZWN0aW9uX3dyOiBj
+b25uZWN0aW9uIHdpdGggNS10dXBsZSBscCAweCUwNHggZnAgMHglMDR4IGxpcCAweCUwOHglMDh4
+IHBpcCAweCUwOHglMDh4IGZpbHRlciAweCUwOHggZXhpc3RzIEAgTEUgaW5kZXggJXUKAAAAAAAA
+AAAAAAAAAAAAb2ZsZF9jb25uZWN0aW9uX3dyOiBjb25uZWN0aW9uIHdpdGggNS10dXBsZSBscCAw
+eCUwNHggZnAgMHglMDR4IGxpcCAweCUwOHggcGlwIDB4JTA4eCBmaWx0ZXIgMHglMDh4IGV4aXN0
+cyBAIExFIGluZGV4ICV1CgAAAAAAAABvZmxkX2Nvbm5lY3Rpb25fd3I6IGNvbm5lY3Rpb24gd2l0
+aCA1LXR1cGxlIGxwIDB4JTA0eCBmcCAweCUwNHggbGlwIDB4JTA4eCUwOHggcGlwIDB4JTA4eCUw
+OHggZmlsdGVyIDB4JTA4eAoAAAAAb2ZsZF9jb25uZWN0aW9uX3dyOiBjb25uZWN0aW9uIHdpdGgg
+NS10dXBsZSBscCAweCUwNHggZnAgMHglMDR4IGxpcCAweCUwOHggcGlwIDB4JTA4eCBmaWx0ZXIg
+MHglMDh4CgAAAAAAAAAAAAAAAElRRkxJTlQgcGZuICV1IHZmbiAldTogaXFlc2l6ZSAldSB0b28g
+c21hbGwKAAAAAElRRkxJTlQgcGZuICV1IHZmbiAldTogaXFpZCAldSB0b28gbGFyZ2UgKG1heCAl
+dSkKAAAAAAAAAAAAAAAAAABJUUZMSU5UIHBmbiAldSB2Zm4gJXU6IGlxaWQgJXUgbm90IGFsbG9j
+YXRlZAoAAABJUUZMSU5UIHBmbiAldSB2Zm4gJXU6IGZsMGlkICV1IHRvbyBsYXJnZSAobWF4ICV1
+KQoAAAAAAAAAAAAAAAAASVFGTElOVCBwZm4gJXUgdmZuICV1OiBmbDBpZCAldSBub3QgYWxsb2Nh
+dGVkCgAASVFGTElOVCBwZm4gJXUgdmZuICV1OiBmbDFpZCAldSB0b28gbGFyZ2UgKG1heCAldSkK
+AAAAAAAAAAAAAAAAAElRRkxJTlQgcGZuICV1IHZmbiAldTogZmwxaWQgJXUgbm90IGFsbG9jYXRl
+ZAoAAElRRkxJTlQgcGZuICV1IHZmbiAldTogZmwxaWQgJXUgaXMgdmFsaWQgYnV0IG5vdCBmbDBp
+ZCAldQoAAAAAAABJUUZMSU5UIHBmbiAldSB2Zm4gJXU6IGZsMWlkICV1IGlzIHZhbGlkIGJ1dCBo
+ZWFkZXIgc3BsaXQgZmVhdHVyZSBpcyBub3QgZW5hYmxlZAoAAAAAAAAAAAAAAAAAAABJUSBwZm4g
+JXUgdmZuICV1OiBpcWlkICV1IHRvbyBsYXJnZSAobWF4ICV1KQoAAABJUSBwZm4gJXUgdmZuICV1
+OiBpcWlkICV1IG5vdCBhbGxvY2F0ZWQKAAAAAAAAAABJUSBwZm4gJXUgdmZuICV1OiBmbDBpZCAl
+dSBmbDFpZCAldSBidXQgbm90IHN1cHBvcnRlZAoAAAAAAAAAAAAAaHdfdWxwdHhfd29ya2Fyb3Vu
+ZF9wcjE2OTQ5X2VuYWJsZWRfcGY6IHBmICV1IGVuYWJsZWQgJXUKAAAAAAAAAGh3X3VscHR4X3dv
+cmthcm91bmRfcHIxNjk0OV9lbmFibGVkX3ZmaWQ6IHZmaWQgJXUgZW5hYmxlZCAldQoAAABFUSBw
+Zm4gJXUgdmZuICV1OiBjcmVhdGluZyBFVEggZXFpZCAldSB3aXRoIHBlbmRpbmcgV1IocykgKG51
+bV9ieXRlcyAldSBhbmQgZmxhZ3MgMHglMDh4CgAAAAAAAABFUSBwZm4gJXUgdmZuICV1OiBjcmVh
+dGluZyBDVFJMIGVxaWQgJXUgd2l0aCBwZW5kaW5nIFdSKHMpIChudW1fYnl0ZXMgJXUgYW5kIGZs
+YWdzIDB4JTA4eAoAAAAAAABFUSBwZm4gJXUgdmZuICV1OiBlcWlkICV1IHRvbyBsYXJnZSAobWF4
+ICV1KQoAAABFUSBwZm4gJXUgdmZuICV1OiBlcWlkICV1IG5vdCBhbGxvY2F0ZWQKAAAAAAAAAABw
+b3J0X2JsaW5rX2xlZF9yZXN0b3JlCgAAAAAAAAAAAHBvcnRfYmxpbms6IGJsaW5rZHVyPTB4JXgg
+YmxpbmtfcmVmY250CgAAAAAAAAAAAHBvcnRfYmxpbms6IAlibGlua19yZWZjbnQ9MHgleAoAcG9y
+dF9ibGluazogCWJsaW5rX3JlZmNudD0weCV4CgBtaWlfYW5yZXN0YXJ0WyV1XTogYWNhcHMgMHgl
+eAoAAHBvcnRbJXU6MHglMDJ4OjB4JTAyeF06IGwxY2ZnLCBwY2FwcyAweCV4IGFjYXBzIDB4JXgg
+cmNhcHMgMHgleAoAAAAAAAAAAAAAAAAAAAAAcG9ydFsldToweCUwMng6MHglMDJ4XTogbDFjZmcs
+IGludmFsaWQgcmVxdWVzdCwgcGNhcHMgMHgleCBhY2FwcyAweCV4IHJjYXBzIDB4JXgKAAAAAAAA
+AAAAAAAAAAAAcG9ydFsldToweCUwMng6MHglMDJ4XTogbDFjZmcsIG1kaSBpc3N1ZSBwY2FwcyAw
+eCV4IGFjYXBzIDB4JXggcmNhcHMgMHgleAoAAAAAAABwb3J0WyV1OjB4JTAyeDoweCUwMnhdOiBs
+MWNmZywgY2Fubm90IGZvcmNlIG5vL211bHRpcGxlIHNwZWVkKHMpLCBwY2FwcyAweCV4IGFjYXBz
+IDB4JXggcmNhcHMgMHgleAoAAAAAAAAAAAAAAAAAZXRoX2Zsb3djX2hhbmRsZXJbMHgleF06IGZs
+YWdzIDB4JTA4eCBudW1fYnl0ZXMgJXUgc2NoZWRjbCAweCV4IC0+IDB4JXgKAAAAAAAAAABzY3Np
+X2NtZDogcmVjZWl2ZWQgVE1GIG9wIFsweCV4XSBmdW5jIFsweCV4XSBvbiBjb25uIFsweCV4XSB0
+aHJvdWdoIGNvbW1hbmQgcGF0aC4KAAAAAAAAAAAAAAAAAABzY3NpX2NtZDogY29ubl9mYyBbMHgl
+eF0sIHN0YXRlIFsweCV4XSwgc2Vzc19mYyBbMHgleF0gaW4gcmVjb3ZlcnkuIFNraXBwaW5nIGlz
+dGFza19mYyBbMHgleF0gZnJvbSBUWC4KAAAAAAAAAAAAc2NzaV9jbWQ6IGlTQ1NJIGNvbW1hbmQg
+c2VxdWVuY2Ugd2luZG93IGNsb3NlZC4gY29ubiBbMHgleF0sIG9wIFsweCV4XSwgIGNtZHNuIFsw
+eCV4XSwgc2VudF9jbWRzbiBbMHgleF0sIG1heF9jbWRzbiBbMHgleF0sIGl0dCBbMHgleF0KAAAA
+AAAAAAAAc2NzaV9yZWFkOiBjb25uX2ZjIFsweCV4XSwgc3RhdGUgWzB4JXhdLCBzZXNzX2ZjIFsw
+eCV4XSBpbiByZWNvdmVyeS4gU2tpcHBpbmcgaXN0YXNrX2ZjIFsweCV4XSBmcm9tIFRYLgoAAAAA
+AAAAAHNjc2lfcmVhZDogaVNDU0kgY29tbWFuZCBzZXF1ZW5jZSB3aW5kb3cgY2xvc2VkLiBjb25u
+IFsweCV4XSwgY21kc24gWzB4JXhdLCBzZW50X2NtZHNuIFsweCV4XSwgbWF4X2NtZHNuIFsweCV4
+XQoAAAAAAAAAAAAAAAAAAAAAc2NzaV93cml0ZTogY29ubl9mYyBbMHgleF0sIHN0YXRlIFsweCV4
+XSwgc2Vzc19mYyBbMHgleF0gaW4gcmVjb3ZlcnkuIFNraXBwaW5nIGlzdGFza19mYyBbMHgleF0g
+ZnJvbSBUWC4KAAAAAAAAAHNjc2lfd3JpdGU6IGlTQ1NJIGNvbW1hbmQgc2VxdWVuY2Ugd2luZG93
+IGNsb3NlZC4gY29ubiBbMHgleF0sIGNtZHNuIFsweCV4XSwgc2VudF9jbWRzbiBbMHgleF0sIG1h
+eF9jbWRzbiBbMHgleF0sIGl0dCBbMHgleF0KAAAAZGNieF9jb250cm9sX3NtWyV1XSBDT05UUk9M
+X0xJTktVUAoAAAAAAAAAAAAAAAAAZGNieF9jb250cm9sX3NtWyV1XSBDT05UUk9MX1VQREFURV9E
+Q0JYX1RMVgoAAAAAZGNieF9jb250cm9sX3NtWyV1XSBDT05UUk9MX1BFRVJfTk9UX0FEVkVSVElT
+RV9EQ0JYCgAAAAAAAAAAAAAAAGRjYnhfY29udHJvbF9zbVsldV0gQ09OVFJPTF9VUERBVEVfT1BF
+Ul9WRVJTSU9OCgAAAAAAAAAAAAAAAAAAAABkY2J4X2NvbnRyb2xfc21bJXVdIENPTlRST0xfUFJP
+Q0VTU19QRUVSX1RMVgoAAABkY2J4X2NvbnRyb2xfc21bJXVdIENPTlRST0xfQUNLX1BFRVIKAAAA
+AAAAAAAAAABkY2J4X2llZWVfdmFsaWRhdGVbJXVdIGVycm9yIChvdWkgJSN4IHN1YnR5cGUgJSN4
+IGxlbiAlI3gpCgAAAAAAZGNieF9jZWVfdmFsaWRhdGVbJXVdIGVycm9yCgAAAABjaG5ldF9sMnRf
+dXBkYXRlOiBsMmRldl9mYyBbMHgleF0sIGwyZGV2X2ZjLT5mbG93Y19pZCBbJXVdIGwyZGV2X2Zj
+LT5mbG93Y19mbGFncyBbMHgleF0sIGludGYgWzB4JXhdCgAAAAAAAAAAAAAAY2huZXRfbDJ0X3Vw
+ZGF0ZTogbDJkZXZfZmMtPmZsb3djX2lkIFsldV0gYWxyZWFkeSBzY2hlZHVsZWQKAAAAAGNobmV0
+X2wydF91cGRhdGU6IGluIGRlbGF5ZWRfcHJvY2Vzc2luZywgbDJ0ZW50IFslMDh4XQoAAAAAAAAA
+AABwcm9jZXNzX2RoY3Bfb3B0czogcm9vdCBwYXRoIGxlbiBbJWRdIGJ5dGVzCgAAAABuZXRpZl9w
+cm9jZXNzX2RoY3Bfb3B0czogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgTVNHX1RZUEUgWyVk
+XSwgZGhjdHh0LT5zdGF0ZSBbJWRdCgAAAAAAAAAAAABpY21wX3JlY3Y6IGwyZGV2X2ZjLT5mbG93
+Y19pZCBbMHgleF0sIHBpZCBbMHgleF0sIGljbXAgdHlwZSBbMHgleF0KAAAAAAAAAAAAAAAAAGZj
+X3NlbmRfYWxsb2NfY3BsOiBmYWlsZWQgdG8gc2V0dXAgZmlsdGVyIGN0dXBsZQoAAAAAAAAAAAAA
+AAAAAABmY29lX2NvbXB1dGVfY3R1cGxlIDB4JXg6JXgKAAAAAGNvbXB1dGVfY3R1cGxlKCk6IGZh
+aWxlZCB0byBzZXR1cCBmaWx0ZXIgY3R1cGxlCgAAAAAAAAAAAAAAAAAAAABmY29lX2NvbXB1dGVf
+Y3R1cGxlIHZsYW4gJXggdmlpZCAleCBwb3J0ICV4IG1wc19pZHggJXgKAAAAAAAAAAAAaWdub3Jp
+bmcgZmlwIHJlY3YgZm9yIGZjZiBmbG93OiV4IGluIG9mZmxpbmUgc3RhdGUKAAAAAAAAAAAAAAAA
+AEFCVFMgQUNDIGF3YWl0aW5nIFBSTEkgUnNwOiBmbG93Y19pZCAweCV4IG94X2lkIDB4JXggcnhf
+aWQgMHgleCBpcWlkIDB4JXgKAAAAAAAAYXJwX3JlY3Y6IGlwaWQgWzB4JXhdLCBpbl9hZGRyLmFk
+ZHIgWzB4JXhdLCBzaXAgWzB4JXhdLCByaXAgWzB4JXhdLCBhcnBfb3AgWzB4JXhdCgAAAAAAAAAA
+AAAAAAAAY2huZXRfYXJwX3JlY3Y6IGlwIGNvbmZsaWN0IGRldGVjdGVkCgAAAAAAAAAAAAAAY2hu
+ZXRfYXJwX3JlY3Y6IHBpZCBbJXVdLCB2bGFuIFsweCV4XSwgYXJwIG9wIFsweCV4XSwgc2lwIFsw
+eCV4XSwgcmlwIFsweCV4XQoAAABjc29ja19mcmVlOiBzaXplb2YoY3NrX2ZjLT51LmNzb2NrKSBb
+JXVdLCBieXRlcwoAAAAAAAAAAAAAAAAAAAAAY3NvY2tfcGVlcl9jbG9zZTogY3NrX2ZjLT5mbG93
+Y19pZCBbMHgleF0sIHRjYl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tfZmMtPmZsb3djX3N0YXRl
+IFsweCV4XSwgdGNiX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0KAAAAAABjc29ja19wZWVyX2Nsb3Nl
+OiBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19zdGF0ZSAgWzB4JXhdCgAA
+AAAAAAAAAHRjcF9jbHNfYWJydF9ycGw6IHRjYiB0aWQgWzB4JTA2eF0sIGZsb3djX3R5cGUgWzB4
+JXhdLCBjcGxvcCBbMHgleF0gCgAAAAAAAAAAAAAAY2hfcmF0ZVsldV06IGNhcHBlZCB0aWNrIGZy
+b20gcmVxdWlyZWQgJXUgdG8gc3VwcG9ydGVkICV1OyByYXRlICV1IChlZmYgJXUpIGRlZmljaXRf
+aW5jciAldSB0aWNrICV1CgAAAAAAAAAAAAAAAHBrdHNjaGVkX2NoX3JsWyV1XTogY2hhbm5lbCBy
+bCBub3QgYXZhaWxhYmxlIGluIGNvbmp1bmN0aW9uIHdpdGggZmxvdyBzaGFwaW5nCgAAcGt0c2No
+ZWRfY2hfcmxbJXVdOiByYXRlICV1IG1heCAldQoAAAAAAAAAAAAAAAAAZXFfcGFyYW1zWzB4JXg6
+MHgleF06IGRtYXEgMHgleCByZWFkICV1IHBmICV1IGVxaWRfYXBpICV1IHJldCAlZAoAAAAAAAAA
+AAAAAAAAAABNQyBDTEsgc2V0dGluZyBmYWlsZWQ6IFBMTF9NX0xPQ0sgbmV2ZXIgdG9nZ2xlZAoA
+AAAAAAAAAAAAAAAAAAAAd2FpdF9mb3JfY2FsaWJfZG9uZTogcmV0ICVkIGluICV1IGF0dGVtcHRz
+CgAAAAAAaHdfbWFfYWRkcl90b19tZW1fdHlwZV9vZmY6IE1BIGFkZHJlc3MgMHglMDh4IGlzIG5v
+dCBtYXBwZWQKAAAAAGh3X21hX2FkZHJfdG9fbWVtX3R5cGVfb2ZmOiBNQSBhZGRyZXNzIDB4JTA4
+eCBtYXBzIHRvIHR5cGUgJXUgb2Zmc2V0IDB4JXgKAAAAAAAAbWVtX21hbGxvY190ZW1wOiBmYWls
+ZWQgdG8gYWxsb2NhdGUgJXUgYnl0ZXMsIHJldHVybmluZyBOVUxMCgAAAG1lbV9tYWxsb2M6IGZh
+aWxlZCB0byBhbGxvY2F0ZSAldSBieXRlcywgcmV0dXJuaW5nIE5VTEwKAAAAAAAAAABsZSBjb25m
+aWd1cmF0aW9uOiBoYXNoIG1vZGUgcmVxdWlyZXMgYXQgbGVhc3QgMTYgZW50cmllcywgbmhhc2gg
+JXUKAAAAAAAAAAAAAAAAAGxlIGNvbmZpZ3VyYXRpb246IGhhc2ggbW9kZSByZXF1aXJlcyBhdCBl
+bnRyaWVzIHRvIGJlIGEgcG93ZXIgb2YgMiwgbmhhc2ggJXUKAAAAbGUgY29uZmlndXJhdGlvbjog
+cmVxdWVzdGVkICV1IHRjYW0gZW50cmllcyBidXQgb25seSAldSBhdmFpbGFibGUgKG5yb3V0ZSAl
+dSBuY2xpcCAldSBuZmlsdGVyICV1IG5zZXJ2ZXIgJXUKAAAAAGxlIGNvbmZpZ3VyYXRpb246IHRj
+YW0gcmVnaW9ucyBtdXN0IGhhdmUgbXVsdGlwbGUgb2YgMzIgZW50cmllcywgbnJvdXRlICV1IG5j
+bGlwICV1IG5maWx0ZXIgJXUgbnNlcnZlciAldQoAAAAAAABod190cF90Y3BfdHVuaW5nczogdHVu
+aW5nIGZvciBjbHVzdGVyIGVudmlyb25tZW50CgAAAAAAAAAAAAAAAAAAaHdfdHBfdGNwX3R1bmlu
+Z3M6IHR1bmluZyBmb3IgTEFOIGVudmlyb25tZW50CgAAaHdfdHBfdGNwX3R1bmluZ3M6IHR1bmlu
+ZyBmb3IgV0FOIGVudmlyb25tZW50CgAAaHdfdHBfdGNwX3R1bmluZ3M6IG1hbnVhbCB0dW5pbmcK
+AAAAAAAAAAAAAAAAAAAAY29uZmlndXJhdGlvbiBmaWxlIHBhcnNlciBlbmNvdW50ZXJlZCBlcnJv
+ciBAIGxpbmUgJXU6CgAAAAAAAAAAAEhPU1QgUEFHRV9TSVpFIFsweCUwbHhdIHRvbyBzbWFsbCwg
+bWluIFsweCUwbHhdIHJlcXVpcmVkCgAAAAAAAABwYWdlIHNpemUgWyVsdV0gbWlzbWF0Y2gKAAAA
+AAAAAFBBR0Ugc2l6ZSAlbHUgdW5zdXBwb3J0ZWQsIGRkcCBkaXNhYmxlZAoAAAAAAAAAAEhvc3Qg
+cGFnZV9zaXplICVsdSwgZGRwX2lkeCAldQoARkNvRSBERFAgaW5pdDogZmNvZSBsbGltaXQgMHgl
+eCwgZmNvZSB1bGltaXQgMHgleCBnYmwgbGxpbWl0IDB4JXggZ2JsIHVsaW1pdCAweCV4IHBjYnN6
+ICV4CgAAAAAARkNvRSBERFAgaW5pdDogZmNvZSBwcG9kIG9mZiAweCV4LCBmY29lIHN0IHBwb2Qg
+YWRkciAweCV4IGZjb2UgbnVtIHBwb2RzIDB4JXgKAABmY29lIHhjaGcgbWdyIGluaXQ6IE51bWJl
+ciBvZiBleGNoYW5nZXMgZm9yIEZDb0UgaXMgJXgKAAAAAAAAAAAAZmNvZV9sMnRfaW5pdDogTm8g
+dWxwdHggY3JlZGl0IGNoOlsldV0KAAAAAAAAAAAAZmNvZV9sMnRfaW5pdDogY2g6WyV1XSBsMnRf
+aWR4IFsldV0KAAAAAAAAAAAAAAAAcG9ydF9oc3Nfc2lnZGV0WyV1XTogaHNzX3NpZ2RldCBjaGFu
+Z2VkIHRvIDB4JXgKAAAAAAAAAAAAAAAAAAAAAE1BQyBmYWlsZWQgdG8gcmVzeW5jIHR4CgAAAAAA
+AAAAcG9ydFsldV0gbGluayB1cCAoJXUpIChzcGVlZCAlI3ggYWNhcHMgJSN4IGxwY2FwcyAlI3gp
+CgAAAAAAAAAAAGRpc2FibGluZyB0eCAlI3ggcnggJSN4CgAAAAAAAAAAQ2FsY3VsYXRpb24gb3V0
+IG9mIGJvdW5kcyBmdXJpbmcgaW5pdDogJSN4ICUjeCAlI3gKAAAAAAAAAAAAAAAAAF9od190cF9w
+Z21uZ3Q6IHR4X3BhZ2VfbWF4ICV1IHJ4X3BhZ2VfbWF4ICV1IHBzdHJ1Y3RzICV1IHNpemUgJXUK
+AAAAAAAAAAAAAAAAAAAAbXBhcnRpdGlvbl9vdGhlcnNfdG90YWw6IGRkcCAldSBkZHBfaXNjc2kg
+JXUgc3RhZyAldSBwYmwgJXUgcnEgJXUgcnF1ZHAgJXUgLT4gJXUKAAAAAAAAAAAAAAAAAAAAX21w
+YXJ0aXRpb25fYmFua3NfbWNYOiBuYmFua3NfcG10eCAldSAoJXVNQikgbmJhbmtzX3BtcnggJXUg
+KCV1TUIpIG5iYW5rc19vdGhlcnMgJXUgKCV1TUIpIG5iYW5rc19mdyAldSAoJXVNQikKAF9tcGFy
+dGl0aW9uX2JhbmtzX21jMTogbmJhbmtzX3BtdHggJXUgKCV1TUIpIG5iYW5rc19vdGhlcnMgJXUg
+KCV1TUIpIG5iYW5rc19mdyAldSAoJXVNQikKAAAAAAAAAF9tcGFydGl0aW9uX2JhbmtzX21jMDog
+bmJhbmtzX3BtcnggJXUgKCV1TUIpIG5iYW5rc19vdGhlcnMgJXUgKCV1TUIpCgAAAAAAAAAAAAAA
+bWVtX21hbGxvY19pbnRlcm5hbDogZmFpbGVkIHRvIGFsbG9jYXRlICV1IGJ5dGVzLCByZXR1cm5p
+bmcgTlVMTAoAAAAAAAAAAAAAAAAAAABod19lZGNfYmlzdFsldV06IGJpc3RfY21kWzB4JTA4eF0g
+YWRkciAweCV4IGxlbiAweCV4CgAAAAAAAAAAAAAAaHdfZWRjX2Jpc3RbJXVdOiBkb25lLCBlbmNv
+dW50ZXJlZCAldSBlcnJvcnMgb24gZmlyc3QgYW5kICV1IGVycm9ycyBvbiBzZWNvbmQgYXR0ZW1w
+dCAoJXVnYnBzKQoAbWVtX2luaXRfY2FjaGVzOiBjYWNoZV9zaXplICV1IGZsb3djX2J1Zl90Y2Jf
+Y2FjaGVfc2l6ZSAldSBidWZsbDY0X2NhY2hlX3NpemUgJXUKAAAAAAAAAAAAAAAAAAAAc2dlIHJl
+cXVpcmUgbmVxICV1IG5pcSAldSByb3VuZGluZyB0byAldSAldQoAAAAAbXBhcnRpdGlvbl9wbXR4
+OiBtIDB4JTA4eCBzaXplICV1CgAAAAAAAAAAAAAAAAAAbXBhcnRpdGlvbl9wbXJ4OiBtIDB4JTA4
+eCBzaXplICV1CgAAAAAAAAAAAAAAAAAAbXBhcnRpdGlvbl9lZGMgKG5vIGV4dG1lbSk6IG0gMHgl
+MDh4IHNpemUgJXUKAAAAbXBhcnRpdGlvbl9lZGNfZXN0aW1hdGU6IGh3IG1vZHVsZXMgcmVxdWly
+ZSAlZCBieXRlcyBpbiBFREMKAAAAAFRlbXBlcmF0dXJlL1ZvbHRhZ2UgU2Vuc29yOiBDb3JlIGNs
+b2NrICVkID4gNTAwOyB1c2luZyA1MDAgdG8gc3RheSBpbiBjb21wbGlhbmNlIHdpdGggaGFyZHdh
+cmUuCgAAAAAAAAAAAAAAAAAAAABmb2lzY3NpX2J5ZTpsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhd
+LCBsMmRldl9mYy0+Zmxvd2NfcGNpZV9wZm4gWzB4JXhdLCBsMmRldl9mYy0+Zmxvd2NfcGNpZV92
+Zm4gWzB4JXhdLCBwb3J0IFsweCV4XQoAAAAAAAAAAAAAAGZvaXNjc2lfYnllOnZsYW5kZXZfZmMt
+PmZsb3djX2lkIFsweCV4XSwgdmxhbmRldl9mYy0+Zmxvd2NfcGNpZV9wZm4gWzB4JXhdLCB2bGFu
+ZGV2X2ZjLT5mbG93Y19wY2llX3ZmbiBbMHgleF0sIHBvcnQgWzB4JXhdCgAAAAAAY3JfbW9kdWxl
+X3J4X2xvc1sldV06IHJ4X2xvcyBjaGFuZ2VkIHRvICV1CgAAAAAAUmFuZ2UgY2FsYzogQXZlcmFn
+ZWQgJSN4IGJ1dCBpZ25vcmVkIHZhbHVlICUjeCAoaXRlcmF0aW9uICV1KQoAAE1DIGNhbGlicmF0
+aW9uIGZhaWxlZDogREZJIGluaXQgbm90IGdvaW5nIHRvIDAKAE1DIGNhbGlicmF0aW9uIGZhaWxl
+ZDogREZJIGluaXQgbm90IGNvbXBsZXRpbmcKAE1DIGNhbGlicmF0aW9uIGZhaWxlZDogQ2FsaWJy
+YXRpb24gZGlkbid0IGNvbXBsZXRlLgoAAAAAAAAAAAAAAABNQyBjb21tYW5kIGZhaWxlZCB0byBj
+b21wbGV0ZShvcGNvZGUgJSN4IGNhZGRyICUjeCBiYWRkciAlI3ggZGVsYXkgJWQpCgAAAAAAAAAA
+AHBmbl9iaXRtYXAgMHgleAoAAAAAAAAAAAAAAAAAAAAAYmFkIG1haWxib3ggY21kOiBwZm4gMHgl
+eCB2Zm4gMHgleDsgb3Bjb2RlIDB4JXggPiBMQVNUQzJFIDB4JXgKAG1haWxib3ggY21kIG5vdCB5
+ZXQgc3VwcG9ydGVkOiBwZm4gMHgleCB2Zm4gMHgleDsgb3Bjb2RlIDB4JXgKAABiYWQgbWFpbGJv
+eCBjbWQ6IHBmbiAweCV4IHZmbiAweCV4OyBvcGNvZGUgMHgleCBpcyB2YWxpZCBwb3N0IGRldmlj
+ZSBpbml0IG9ubHkKAGJhZCBtYWlsYm94IGNtZDogcGZuIDB4JXggdmZuIDB4JXg7IG9wY29kZSAw
+eCUwMnggcmFtYXNrIDB4JXggY21kIHJhbWFzayAweCV4CgAAYmFkIG1haWxib3ggY21kOiBwZm4g
+MHgleCB2Zm4gMHgleDsgb3Bjb2RlIDB4JTAyeCBsZW4xNiAweCV4IHZlcnN1cyBleHBlY3RlZCBs
+ZW4xNiAweCV4CgAAAAAAAAAAaW5zdWZmaWNpZW50IGNhcHMgdG8gcHJvY2VzcyBtYWlsYm94IGNt
+ZDogcGZuIDB4JXggdmZuIDB4JXg7IHJfY2FwcyAweCV4IHd4X2NhcHMgMHgleCByZXF1aXJlZCBy
+X2NhcHMgMHgleCB3X2NhcHMgMHgleAoAAAAAAAAAAABpbnN1ZmZpY2llbnQgY2FwcyB0byBwcm9j
+ZXNzIG1haWxib3ggY21kOiBwZm4gMHgleCB2Zm4gMHgleDsgcl9jYXBzIDB4JXggd3hfY2FwcyAw
+eCV4IHJlcXVpcmVkIHJfY2FwcyAweCV4IHdfY2FwcyAweCV4CgAAAAAAAAAAAGh3X3Bvd2VyX3By
+ZXA6IFZERD1OT05FIGJ1dCBWQ1M9JWQKAAAAAAAAAAAAAAAAAGh3X3Bvd2VyX3ByZXA6IHVuc3Vw
+cG9ydGVkIGV4dGVybmFsIGFkanVzdGFibGUgcG93ZXIgcmVndWxhdG9ycyBWREQ9JWQsIFZDUz0l
+ZAoAaHdfcG93ZXJfcHJlcDogdW5zdXBwb3J0ZWQgVkREPSVkCgAAAAAAAAAAAAAAAAAAaHdfcG93
+ZXJfcHJlcDogdW5zdXBwb3J0ZWQgVkNTPSVkCgAAAAAAAAAAAAAAAAAAaHdfcG93ZXJfcHJlcDog
+aTJjIHdyaXRlIGVycm9yLCBWREQ9JWQscmV0PSVkCgAAaHdfcG93ZXJfcHJlcDogdW5zdXBwb3J0
+ZWQgVkREPSVkCgAAAAAAAAAAAAAAAAAAaHdfcG93ZXJfcHJlcDogaTJjIHdyaXRlIGVycm9yLCBW
+Q1M9JWQscmV0PSVkCgAAaHdfcG93ZXJfcHJlcDogdW5zdXBwb3J0ZWQgVkNTPSVkCgAAAAAAAAAA
+AAAAAAAAVlBEIHJlZ2lvbiBpcyB0b28gc21hbGwgKFNFUkNGR19TUl9QRk5WUERTSVpFIDB4JXgp
+CgAAAAAAAAAAAAAAAGNmOiBmYWlsZWQgdG8gYWxsb2NhdGVkIG1lbW9yeSBmb3IgY29uZmlndXJh
+dGlvbiBmaWxlLCByZXQgJWQKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACC
+AAABIAAAAAAAAACCAAABAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG
+gIAAAAAAAAAAAAAAAACAAAAAAAAAAAABAAAAABAAAAAAAAAAAwAAAAAAAAAAAAAAAwAAAAAAAAAA
+AAAQAAAAAAAAAAgAAAAAAgAAAAAAAAAAACAAAAAAAAAAAAAAAAEAA4AAAAAAAAAAAAAAAgAAAAAA
+AAAAACADgAAAAAAAAAAAABACgACAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABA
+AAAAAAAAACAAAAAAAAAAAAAAAIAAAoAAAAAAAAAAAAAAAoAAAAAAAAAAAIAAAgAAAAAAAAAAAAAA
+AgAAAAAAAAAAAAAAAoAAAAAAAAAAAAEAAwAAAAAAAAAAAAACgwAAAAAAAAAAABACgAAAAAAAAAAA
+ADAAAwAAAAAAAAgAADAAAwAAAAAAAAAAADAFgwAAAAAAAAgAADAFgwAAAAAAAAAAADAEgwAAAAAA
+AAgAADAEgwAAAAAAAAAAADADAwAAAAAAAAgAADADAwAAAAAAAAAAADgDAwAAAAAAAAAAADgFgwAA
+AAAAAAAAADgEgwAAAAAAAAAAADgAAwAAAAAAAAAAADQGggAAAAAAAAAAADwDggAAAAAAAAAAADwA
+AwAAAAAAAAgAADwAAwAAAAAAAAAAADwEgwAAAAAAAAAAADwFAwAAAAAAAAAAAD0EAwAAAAAAAAAA
+ADwDgwAAAAAAAAAAACwAAgAAAAAAAAAAACwFggAAAAAAAAAAACwFAgAAAAAAAAAAABAGgAAAAAAA
+AAAAABAGgoAAAAAAAAAAAAAOggAAAAAAAAAAABAHgoAAAAAgAAAAAAAHggAAAAAgAAAAABAHAoAA
+AAAAAAAAABAHAoAAAAAAAAAAABAHAoAAAAAAAAAAAAAHAgAAAAAgAAAAABAXgwAAAAAAAAgAABAX
+gwAAAAAAAAgAABAAAAAAAAAAAAAAABAGA4AAAAAAAAAAAAAOAwAAAAAAAAAAABAGA0AAAAAAAAAA
+ABAGAwAAAAAAAAAAABAGAAAAAAAAAAAAAAAGA4AAAAAAAAAAAAAGAwAAAAAAAAAAAAAOAgAAAAAA
+AAAAAAAOAgAAAAAAAAAAABAGAgAAAAAAAAAAABAGAgAAAAAAAAAAABAGAoAAAAAAAAAAABAGAoAA
+AAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAQ
+AwAAAAAAAAgAAAAAAAAAAAAAAAAAAP//////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////wAAACAAAAAA
+wAAAAAAAACAAAAAA4AAAAAAAAAACAAAAAAAAAEAAAAAAAAAAAAAAAAAAASEAAAAAAAAAAAABASAA
+AAAAAAAAAAAAAgAAAAQABAAAAAAGgAAABAAAAAAAAACAAEAAAAAAAAIAAACAACAAAAAAAAIAAAiA
+AAAAAABAAAAAAAEAQAAAAAAAAAAAAAEAQgAAAAAAAAAAAAAAIAAAAAAAAAAAAAIQIAAAAAAAAAAA
+AAIMAgAAAAAAAAAAAACFAgAAAAQAAAAAAACAQgAAAAAAAAAAAICAQgBAAAAAAAAAAICAQgAAAAAA
+AAAAAAIAIgAAAAAAAAAAAACAQQAAAAAAAAAAAICAQQAAAAAAAAAAAACAQYAAAAAAAAAAAICAQYAA
+AAAAAAAAAAIAIQAAAAAAAAAAAAAQIIAAAAAAAAAAAAIlAIAAAAAAAAAAAAAFAAAAAAAAAAAAAAiI
+BIAAAAAAAAAAAAiIBIAAAAAAAAAAAAiiAIAAAAAAAAAAAAiiAIAAAAAAAAAAAAijAIAAAAAAAAAA
+AAijAIAAAAAAAAAAAAikgIAAAAAAAAAAAAikgIAAAAAAAAAAAASkgMAAAAAAAAAAAASiAMAAAAAA
+AAAAAASjAMAAAAAAAAAAAASIBMAAAAAAAAAAAAAJAYAAAAAAAAAAAAIMAIAAAAAAAAAAAACIBMAA
+AAAAAAAAAACIBIAAAAAAAAAAAAILAIAAAAAAAAAAAACKgIAAAAAAAAAAAAALgIAAAAAAAAAAAACM
+AIAAAAAAAAAAAAIgEIAAAAAAAAAAAAIKAIAAAAAAAAAAAAIKgIAAAAAAAAAAAAAJAoAAAAAAAAAA
+AAABAQAAAAAAAAAAAAABAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAgRAAAAAA
+AAAAAAAAgQgAAAAAAAAAAAAAgQQAAAAAAAAAAAAAgYAAAAAAAAAAAACAAMAAAAAAAAAAAACAAKAA
+AAAAAAAAAAAACAAAAAAAAAAAAACBgAAAAAAAAAAAAACBgIAAAAAAAAAAAACJgIAAAAAAAAAAAACJ
+gMAAAAAAAAAAAAABggAAAAAAAAAAAAIBgAAAAAAAAAAAAAIBgIAAAAAAAAAAAABBgYAAAAAAAAAA
+AAIBgYAAAAAAAAAAAABJgYAAAAAAAAAAAAIJgYAAAAAAAAAAAAIBgQAAAAAAAAAAAABBgQAAAAAA
+AAAAACAAAAAAAAAAAAAAABAAAAIBAAAAAAAAABAAAAIAAAAAAAAAABAAAAAAAAAAAAAAAACAAMAA
+AAAAAAAAAAAAAAAAAAAAAAAAAP//////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////wAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAACACSAAAAAAAAAANmACAAQAAAAAAIAJIAAAAAAAAAA3IBJQRAAAAAAAAAAAAA
+AAAAAAADlgAgAEAAAAAACAAAAAIAiAOHAABWACAAQAAAAAAAAAAAAAAAAAAAA5YAIABAAAAAAAAA
+AAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAAAAAAAAAAAAAAA5YAIABAAAAA
+AAAAAAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAAAAAAAAAAAAAAA5YAIABA
+AAAAAAgAAAACAIgDhQAAlgEgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAAAAAAAAAAAAAAA5YA
+IABAAAAAAAgAAAACAIgDhQAAlgEgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAAAAAAAAAAAAIA
+A5YAJgRAAAAAAAhHIAEEAAACsAAC0gVAJEQAAAAACEcgAQQAAAKyAALSBUYkQAAAAAAIAAAAAgCI
+A4cAAJYBJgRAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAEcgAQYMoYKyQAGSBEAkRAAAAAAIAAAA
+AgCIA4cAAJYBJgRAAAAAAABHIAEEDKBCsYACEgVAJEQAAAAACAAAAAIAiAOHAACWASYEQAAAAAAI
+AAAAAgCIA4UAAJYBIABAAAAAAAgAAAACAIgDhQAAlgEgAEAAAAAACAAAAAIAiAOFAACWASAAQAAA
+AAAAAAAAAAAAAAAAA5YAIABAAAAAAA3FEroCsIDTFFSL4kpGJEAAAAAABcUSugK3gNMUVItiSaYk
+QAAAAAAFxRKiBrCA0xRUi+JKRiRAAAAAAA3FEqIGt4DTFFSLYkmmJEAAAAAABcUSogawgNMUVIvi
+SkYkQAAAAAANxRKiBreA0xRUi2JJpiRAAAAAAAXFEqIGsIDTFFSL4kpGJEAAAAAADcUSoga3gNMU
+VItiSaYkQAAAAAAJxBCgAgCAkAAAi2JpxiRAAAAAAAHEEKAGsICTBlSLYmnGJEAAAAAAAcQQoAaw
+gJMGVItiacYkQAAAAAABxRC4BrCAkxZUi2JIxiRAAAAAAAihEIgCAIFYEgALUgCmJEAAAAAACcAQ
+kAKwgAMWVIqSAcYkQAAAAAAJwBC4BrCAAxCUi+ICRiRAAAAAAAnAELgCtIADEJSLYgGmJEAAAAAA
+CcAQuAK0gAMQlItiAaYkQAAAAAAJwBC4ArSAAxCUi2IBpiRAAAAAAAnAELgCtIADEJSLYgGmJEAA
+AAAAAaAQkAa0gAMQlItiAaYkQAAAAAABwBCAArCAAxRUilIAxiRAAAAAAAHAEIACsIADFFSKUgDG
+JEAAAAAAAcAQgAKwgAMUVIpSAMYkQAAAAAAIRyABBAAAArAAAtIEQCRAAAAAAACBAAACAIVYB0AL
+UgCmJEAAAAAAAAAAAAQAoEABgAHWACAAQAAAAAAAAAAABgChgABAAVYAIABAAAAAAAAAAAAEAKBA
+AYAB1gAgAEAAAAAACIEAAAIAhVmABAtSAKYkQAAAAAAKAUAAAAAAGAIAA0IBJqRCAAAAAAAAAAAA
+AAAAAAADlgAgAEAAAAAAAAAAAAQAoEABgAHWACAAQAAAAAAIAAAAAgCIA4UAA9YAIABAAAAAAAgA
+AAACAIgDhQAD1gAgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAAAAAAAAAAAAAAA5YAIABAAAAA
+AAAAAAAEAKBAAYAB1gAgAEAAAAAACcAQuAK0gAMQlItiAaYkQAAAAAAAAAAAAAAAAAIAA5YAJgRA
+AAAAAAAAAAAAAAAAAAADlgAgAEAAAAAACAAAAAIAiAOFAACWASAAQAAAAAAAAAAABACgQAGAAdYA
+IABAAAAAAAAAAAAEAKBAAYAB1gAgAEAAAAAAAAAAAAQAoEABgAHWACAAQAAAAAAIoRCIAgCBWBAA
+CRIBpiRAAAAAAAAAAAAEAKBAAYAB1gAgAEAAAAAAAAAAAAYAoYAAQAFWACAAQAAAAAAIAAAAAgCI
+A4dACNICRiRCAAAAAAnFEqIClIjSEoCLIknGJEAAAAAAAcAQgAakiAEFVItSAMYkQAAAAAAJwBCA
+AqSIAIVUi1IAxiRAAAAAAAnAEIAGtIgDARSLUgGmJEAAAAAADcAAAAKwgMMWVIviA0YkQAAAAAAA
+AAAAAAAAAAAAA5YAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAgAMAAEAAAAAgAAAgAmJEAAAAAAAEcwAAYDIAK3AAgCAcAkQAAAAAAIAwAAAgagCrcA
+CAIBxiRGAAAAAAAAAAAAAAAAAgAAAgAmJEAAAAAAACBQAAQAAAAAAAACASYkRgAAAAAIYCAAhAAA
+AAAAAAYAIABAAAAAAAhgIACEAAAAAgEwAgAmJUAAAAAACGAAAAQAhAGCBAQCAcYkwgAAAAABwAAA
+AkOAAwIMiAIBpiRAAAAAAAgAYAAEAAAAAgAAAgAmJEAAAAAACABgAAQAAAAAAAAEASAAQAAAAAAA
+AAAAAAAAAAAAAAQBIABAAAAAAAQIFIAGCgAABwFMAiCmJkAAAAAACIAAAAYAhAGABAgCAaYkwAAA
+AAAAQAAAAgCgAABACAIApiRGAAAAAAAAAAAAAAAAAgAAAgAmJEAAAAAABAAAAAKEAAMCiggCBMAk
+QAAAAAAAAAAAAAAAAAIAAAYBIEhAAAAAAAAgUAAEAAAAAgAAAgAmJEAAAAAACGAgAIQAAAACAAAG
+ACYEQAAAAAAIYCAAhAAAAAIAAAIBJiVAAAAAAAhgAAAEAIQBgAQEAgHGJMAAAAAACABgAAQAAAAA
+AAAEASAAQAAAAAAAAIAAIAAAAAAAAAIAJkxwAAAAAAAAgAAgAAAAAAAABgEgAAAAAAAAAACAACAA
+AAAAAAACACZMcAAAAAAAAIAAIAAAAAAAAAYBIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAJwAAACLSMBAkWBAIExiRAAAAAAAnAAAAMNIAECRYEAgTGJEAA
+AAAABAh0gEwJAABQAFwCYeYkQAAAAAAMCHSARAAAAFIAQAJhJiRAAAAAAAgCEKAEAAAAAAEAAgAm
+JEAAAAAACAIQoAQAAAAAAQACACYkQAAAAAAECHQAQgEAAAcAiAJgxiRAAAAAAA3IFAACCQAABECc
+AmDmJEAAAAAACcgQgAK0gAQClIgCZcYkQAAAAAANyHQATLSAAwCUiAJgpiTAAAAAAAXIdABINJAD
+AJSIAmCmJMAAAAAACEcAAAQAAAAAAAACASAkQAAAAAAIRwAABAAAAAAAAAIEQCRAAAAAAABHIAEM
+ByHCtwAIAgDAJEQAAAAAAEcgAQwHIcK3AAgCAMAkRAAAAAAARyABDAchwrcACAIAwCREAAAAAAAA
+IAEIAIQABUCIAgHGJMAAAAAAAAAgAQgAhAAFQIgCAcYkwAAAAAAAACABCACEAAVAiAIBxiTAAAAA
+AAAAIAGGggABAsCIAgPGJMAAAAAAAAAgAYKCAAACwIgCA8YkwAAAAAAJwCABgqSAAQVAiAIBxiTA
+AAAAAAgAAAAMAIQABUCIAgHGJMAAAAAAAAAgAYaCAAECwIgCA8YkwAAAAAAAACABgoIAAADAiAIC
+piTAAAAAAAnAIAGCpIABBUCIAgHGJMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAIAAAAAAAEEBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFtnbG9iYWxdCnJzc19nbGJfY29u
+ZmlnX21vZGU9YmFzaWN2aXJ0dWFsCnJzc19nbGJfY29uZmlnX29wdGlvbnM9dG5sbWFwZW4saGFz
+aHRvZXBsaXR6LHRubGFsbGxrcApwbF90aW1lb3V0X3ZhbHVlPTIwMApyZWdbMHgxMDA4XT0weDQw
+ODEwLzB4MjFjNzAKcmVnWzB4MTAwY109MHgyMjIyMjIyMgpyZWdbMHgxMGEwXT0weDAxMDQwODEw
+CnJlZ1sweDEwNDRdPTQwOTYKcmVnWzB4MTA0OF09NjU1MzYKcmVnWzB4MTA0Y109MTUzNgpyZWdb
+MHgxMDUwXT05MDI0CnJlZ1sweDEwNTRdPTkyMTYKcmVnWzB4MTA1OF09MjA0OApyZWdbMHgxMDVj
+XT0xMjgKcmVnWzB4MTA2MF09ODE5MgpyZWdbMHgxMDY0XT0xNjM4NApyZWdbMHgxMGE0XT0weGEw
+MDBhMDAwLzB4ZjAwMGYwMDAKcmVnWzB4MTBhOF09MHg0MDIwMDAvMHg0MDIwMDAKYmFyMnRocm90
+dGxlY291bnQ9NTAwCnNnZV90aW1lcl92YWx1ZT01LDEwLDIwLDUwLDEwMCwyMDAKcmVnWzB4MTEy
+NF09MHgwMDAwMDQwMC8weDAwMDAwNDAwCnJlZ1sweDExMzBdPTB4MDBkNWZmZWIKcmVnWzB4MTEz
+Y109MHgwMDAyZmZjMApyZWdbMHg3ZDA0XT0weDAwMDEwMDAwLzB4MDAwMTAwMDAKcmVnWzB4N2Rj
+MF09MHgwZTJmODg0OQpmaWx0ZXJNb2RlPXNydnJzcmFtLGZyYWdtZW50YXRpb24sbXBzaGl0dHlw
+ZSxwcm90b2NvbCx2bGFuLHBvcnQsZmNvZQpmaWx0ZXJNYXNrPXByb3RvY29sLGZjb2UKdHBfcG1y
+eD0zMAp0cF9wbXJ4X3BhZ2VzaXplPTY0Swp0cF9ucnhjaD0wCnRwX3BtdHg9NTAKdHBfcG10eF9w
+YWdlc2l6ZT02NEsKdHBfbnR4Y2g9MAp0cF9tdHVzPTg4LDI1Niw1MTIsNTc2LDgwOCwxMDI0LDEy
+ODAsMTQ4OCwxNTAwLDIwMDIsMjA0OCw0MDk2LDQzNTIsODE5Miw5MDAwLDk2MDAKcmVnWzB4N2Qw
+OF09MHgwMDAwMDgwMC8weDAwMDAwODAwCnJlZ1sweDdkNDhdPTB4MDAwMDAwMDAvMHgwMDAwMDQw
+MApyZWdbMHg3ZDYwXT0weDA2MDAwMDAwLzB4MDcwMDAwMDAKcmVnWzB4MTljMDRdPTB4MDA0MDAw
+MDAvMHgwMDQwMDAwMAptY19tb2RlX2JyY1swXT0xCm1jX21vZGVfYnJjWzFdPTEKW2Z1bmN0aW9u
+IjAiXQpudmY9MTYKd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9MQpuaXFmbGludD04Cm5ldGhj
+dHJsPTgKbmVxPTE2Cm5leGFjdGY9OApjbWFzaz1hbGwKcG1hc2s9MHgxCltmdW5jdGlvbiIxIl0K
+bnZmPTE2Cnd4X2NhcHM9YWxsCnJfY2Fwcz1hbGwKbnZpPTEKbmlxZmxpbnQ9OApuZXRoY3RybD04
+Cm5lcT0xNgpuZXhhY3RmPTgKY21hc2s9YWxsCnBtYXNrPTB4MgpbZnVuY3Rpb24iMiJdCm52Zj0x
+Ngp3eF9jYXBzPWFsbApyX2NhcHM9YWxsCm52aT0xCm5pcWZsaW50PTgKbmV0aGN0cmw9OApuZXE9
+MTYKbmV4YWN0Zj04CmNtYXNrPWFsbApwbWFzaz0weDQKW2Z1bmN0aW9uIjMiXQpudmY9MTYKd3hf
+Y2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9MQpuaXFmbGludD04Cm5ldGhjdHJsPTgKbmVxPTE2Cm5l
+eGFjdGY9OApjbWFzaz1hbGwKcG1hc2s9MHg4CltmdW5jdGlvbiI0Il0Kd3hfY2Fwcz1hbGwKcl9j
+YXBzPWFsbApudmk9MjgKbmlxZmxpbnQ9MTcwCm5ldGhjdHJsPTEwMApuZXE9MjU2Cm5leGFjdGY9
+NDAKY21hc2s9YWxsCnBtYXNrPWFsbApuZXRob2ZsZD0xMDI0Cm5yb3V0ZT0zMgpuY2xpcD0zMgpu
+ZmlsdGVyPTQ5Ngpuc2VydmVyPTQ5NgpuaGFzaD0xMjI4OApwcm90b2NvbD1uaWNfdm0sb2ZsZCxy
+ZGRwLHJkbWFjLGlzY3NpX2luaXRpYXRvcl9wZHUsaXNjc2lfdGFyZ2V0X3BkdQp0cF9sMnQ9MzA3
+Mgp0cF9kZHA9Mgp0cF9kZHBfaXNjc2k9Mgp0cF9zdGFnPTIKdHBfcGJsPTUKdHBfcnE9NwpbZnVu
+Y3Rpb24iNSJdCnd4X2NhcHM9YWxsCnJfY2Fwcz1hbGwKbnZpPTQKbmlxZmxpbnQ9MzQKbmV0aGN0
+cmw9MzIKbmVxPTY0Cm5leGFjdGY9NApjbWFzaz1hbGwKcG1hc2s9YWxsCm5zZXJ2ZXI9MTYKbmhh
+c2g9MjA0OAp0cF9sMnQ9MTAyMApwcm90b2NvbD1pc2NzaV9pbml0aWF0b3JfZm9mbGQKdHBfZGRw
+X2lzY3NpPTIKaXNjc2lfbnRhc2s9MjA0OAppc2NzaV9uc2Vzcz0yMDQ4CmlzY3NpX25jb25uX3Bl
+cl9zZXNzaW9uPTEKaXNjc2lfbmluaXRpYXRvcl9pbnN0YW5jZT02NApbZnVuY3Rpb24iNiJdCnd4
+X2NhcHM9YWxsCnJfY2Fwcz1hbGwKbnZpPTQKbmlxZmxpbnQ9MzQKbmV0aGN0cmw9MzIKbmVxPTY2
+Cm5leGFjdGY9MzIKY21hc2s9YWxsCnBtYXNrPWFsbApuaGFzaD0yMDQ4CnRwX2wydD00CnByb3Rv
+Y29sPWZjb2VfaW5pdGlhdG9yCnRwX2RkcD0yCmZjb2VfbmZjZj0xNgpmY29lX252bnA9MzIKZmNv
+ZV9uc3NuPTEwMjQKW2Z1bmN0aW9uIjEwMjMiXQp3eF9jYXBzPWFsbApyX2NhcHM9YWxsCm52aT00
+CmNtYXNrPWFsbApwbWFzaz1hbGwKbmV4YWN0Zj04Cm5maWx0ZXI9MTYKW2Z1bmN0aW9uIjAvKiJd
+Cnd4X2NhcHM9MHg4MgpyX2NhcHM9MHg4Ngpudmk9MQpuaXFmbGludD00Cm5ldGhjdHJsPTIKbmVx
+PTQKbmV4YWN0Zj00CmNtYXNrPWFsbApwbWFzaz0weDEKW2Z1bmN0aW9uIjEvKiJdCnd4X2NhcHM9
+MHg4MgpyX2NhcHM9MHg4Ngpudmk9MQpuaXFmbGludD00Cm5ldGhjdHJsPTIKbmVxPTQKbmV4YWN0
+Zj00CmNtYXNrPWFsbApwbWFzaz0weDIKW2Z1bmN0aW9uIjIvKiJdCnd4X2NhcHM9MHg4MgpyX2Nh
+cHM9MHg4Ngpudmk9MQpuaXFmbGludD00Cm5ldGhjdHJsPTIKbmVxPTQKbmV4YWN0Zj00CmNtYXNr
+PWFsbApwbWFzaz0weDQKW2Z1bmN0aW9uIjMvKiJdCnd4X2NhcHM9MHg4MgpyX2NhcHM9MHg4Ngpu
+dmk9MQpuaXFmbGludD00Cm5ldGhjdHJsPTIKbmVxPTQKbmV4YWN0Zj00CmNtYXNrPWFsbApwbWFz
+az0weDgKW3BvcnQiMCJdCmRjYj1wcHAsZGNieApiZ19tZW09MjUKbHBia19tZW09MjUKaHdtPTMw
+Cmx3bT0xNQpkd209MzAKZGNiX2FwcF90bHZbMF09MHg4OTA2LGV0aGVydHlwZSwzCmRjYl9hcHBf
+dGx2WzFdPTB4ODkxNCxldGhlcnR5cGUsMwpkY2JfYXBwX3RsdlsyXT0zMjYwLHNvY2tldG51bSw1
+Cltwb3J0IjEiXQpkY2I9cHBwLGRjYngKYmdfbWVtPTI1CmxwYmtfbWVtPTI1Cmh3bT0zMApsd209
+MTUKZHdtPTMwCmRjYl9hcHBfdGx2WzBdPTB4ODkwNixldGhlcnR5cGUsMwpkY2JfYXBwX3Rsdlsx
+XT0weDg5MTQsZXRoZXJ0eXBlLDMKZGNiX2FwcF90bHZbMl09MzI2MCxzb2NrZXRudW0sNQpbcG9y
+dCIyIl0KZGNiPXBwcCxkY2J4CmJnX21lbT0yNQpscGJrX21lbT0yNQpod209MzAKbHdtPTE1CmR3
+bT0zMApkY2JfYXBwX3RsdlswXT0weDg5MDYsZXRoZXJ0eXBlLDMKZGNiX2FwcF90bHZbMV09MHg4
+OTE0LGV0aGVydHlwZSwzCmRjYl9hcHBfdGx2WzJdPTMyNjAsc29ja2V0bnVtLDUKW3BvcnQiMyJd
+CmRjYj1wcHAsZGNieApiZ19tZW09MjUKbHBia19tZW09MjUKaHdtPTMwCmx3bT0xNQpkd209MzAK
+ZGNiX2FwcF90bHZbMF09MHg4OTA2LGV0aGVydHlwZSwzCmRjYl9hcHBfdGx2WzFdPTB4ODkxNCxl
+dGhlcnR5cGUsMwpkY2JfYXBwX3RsdlsyXT0zMjYwLHNvY2tldG51bSw1CltmaW5pXQp2ZXJzaW9u
+PTB4MTQyNTAwMTYKY2hlY2tzdW09MHg1ZGEzMDI3MwoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABbZ2xvYmFsXQpyc3NfZ2xiX2NvbmZpZ19tb2Rl
+PWJhc2ljdmlydHVhbApyc3NfZ2xiX2NvbmZpZ19vcHRpb25zPXRubG1hcGVuLGhhc2h0b2VwbGl0
+eix0bmxhbGxsa3AKcGxfdGltZW91dF92YWx1ZT0yMDAKcmVnWzB4MTAwOF09MHg0MDgxMC8weDIx
+YzcwCnJlZ1sweDEwMGNdPTB4MjIyMjIyMjIKcmVnWzB4MTBhMF09MHgwMTA0MDgxMApyZWdbMHgx
+MDQ0XT00MDk2CnJlZ1sweDEwNDhdPTY1NTM2CnJlZ1sweDEwNGNdPTE1MzYKcmVnWzB4MTA1MF09
+OTAyNApyZWdbMHgxMDU0XT05MjE2CnJlZ1sweDEwNThdPTIwNDgKcmVnWzB4MTA1Y109MTI4CnJl
+Z1sweDEwNjBdPTgxOTIKcmVnWzB4MTA2NF09MTYzODQKcmVnWzB4MTBhNF09MHhhMDAwYTAwMC8w
+eGYwMDBmMDAwCnJlZ1sweDEwYThdPTB4NDAyMDAwLzB4NDAyMDAwCmJhcjJ0aHJvdHRsZWNvdW50
+PTUwMApzZ2VfdGltZXJfdmFsdWU9NSwxMCwyMCw1MCwxMDAsMjAwCnJlZ1sweDExMjRdPTB4MDAw
+MDA0MDAvMHgwMDAwMDQwMApyZWdbMHgxMTMwXT0weDAwZDVmZmViCnJlZ1sweDExM2NdPTB4MDAw
+MmZmYzAKcmVnWzB4N2QwNF09MHgwMDAxMDAwMC8weDAwMDEwMDAwCnJlZ1sweDdkYzBdPTB4MGUy
+Zjg4NDkKZmlsdGVyTW9kZT1zcnZyc3JhbSxmcmFnbWVudGF0aW9uLG1wc2hpdHR5cGUscHJvdG9j
+b2wsdmxhbixwb3J0LGZjb2UKZmlsdGVyTWFzaz1wcm90b2NvbCxmY29lCnRwX3Btcng9MzAKdHBf
+cG1yeF9wYWdlc2l6ZT02NEsKdHBfbnJ4Y2g9MAp0cF9wbXR4PTUwCnRwX3BtdHhfcGFnZXNpemU9
+NjRLCnRwX250eGNoPTAKdHBfbXR1cz04OCwyNTYsNTEyLDU3Niw4MDgsMTAyNCwxMjgwLDE0ODgs
+MTUwMCwyMDAyLDIwNDgsNDA5Niw0MzUyLDgxOTIsOTAwMCw5NjAwCnJlZ1sweDdkMDhdPTB4MDAw
+MDA4MDAvMHgwMDAwMDgwMApyZWdbMHg3ZDQ4XT0weDAwMDAwMDAwLzB4MDAwMDA0MDAKcmVnWzB4
+N2Q2MF09MHgwNjAwMDAwMC8weDA3MDAwMDAwCnJlZ1sweDE5YzA0XT0weDAwNDAwMDAwLzB4MDA0
+MDAwMDAKbWNfbW9kZV9icmNbMF09MQptY19tb2RlX2JyY1sxXT0xCltmdW5jdGlvbiIwIl0Kd3hf
+Y2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9MjgKbmlxZmxpbnQ9MTcwCm5ldGhjdHJsPTk2Cm5lcT0y
+NTIKbmV4YWN0Zj00MApjbWFzaz1hbGwKcG1hc2s9YWxsCm5ldGhvZmxkPTEwMjQKbnJvdXRlPTMy
+Cm5jbGlwPTMyCm5maWx0ZXI9NDgKbnNlcnZlcj0zMgpuaGFzaD0yMDQ4CnByb3RvY29sPW5pY192
+bSxvZmxkLHJkZHAscmRtYWMsaXNjc2lfaW5pdGlhdG9yX3BkdSxpc2NzaV90YXJnZXRfcGR1CnRw
+X2wydD00MDkyCnRwX2RkcD0yCnRwX2RkcF9pc2NzaT0yCnRwX3N0YWc9Mgp0cF9wYmw9NQp0cF9y
+cT03CltmdW5jdGlvbiIxIl0Kd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9NApuaXFmbGludD0z
+NApuZXRoY3RybD0zMgpuZXE9NjYKbmV4YWN0Zj0zMgpjbWFzaz1hbGwKcG1hc2s9YWxsCm5oYXNo
+PTIwNDgKcHJvdG9jb2w9ZmNvZV9pbml0aWF0b3IKdHBfbDJ0PTQKdHBfZGRwPTIKZmNvZV9uZmNm
+PTE2CmZjb2VfbnZucD0zMgpmY29lX25zc249MTAyNApbZnVuY3Rpb24iMTAyMyJdCnd4X2NhcHM9
+YWxsCnJfY2Fwcz1hbGwKbnZpPTQKY21hc2s9YWxsCnBtYXNrPWFsbApuZXhhY3RmPTgKbmZpbHRl
+cj0xNgpbZnVuY3Rpb24iMC8qIl0Kd3hfY2Fwcz0weDgyCnJfY2Fwcz0weDg2Cm52aT0xCm5pcWZs
+aW50PTQKbmV0aGN0cmw9MgpuZXE9NApuZXhhY3RmPTQKY21hc2s9YWxsCnBtYXNrPTB4MQpbZnVu
+Y3Rpb24iMS8qIl0Kd3hfY2Fwcz0weDgyCnJfY2Fwcz0weDg2Cm52aT0xCm5pcWZsaW50PTQKbmV0
+aGN0cmw9MgpuZXE9NApuZXhhY3RmPTQKY21hc2s9YWxsCnBtYXNrPTB4MgpbcG9ydCIwIl0KZGNi
+PXBwcCxkY2J4CmJnX21lbT0yNQpscGJrX21lbT0yNQpod209MzAKbHdtPTE1CmR3bT0zMApkY2Jf
+YXBwX3RsdlswXT0weDg5MDYsZXRoZXJ0eXBlLDMKZGNiX2FwcF90bHZbMV09MHg4OTE0LGV0aGVy
+dHlwZSwzCmRjYl9hcHBfdGx2WzJdPTMyNjAsc29ja2V0bnVtLDUKW3BvcnQiMSJdCmRjYj1wcHAs
+ZGNieApiZ19tZW09MjUKbHBia19tZW09MjUKaHdtPTMwCmx3bT0xNQpkd209MzAKZGNiX2FwcF90
+bHZbMF09MHg4OTA2LGV0aGVydHlwZSwzCmRjYl9hcHBfdGx2WzFdPTB4ODkxNCxldGhlcnR5cGUs
+MwpkY2JfYXBwX3RsdlsyXT0zMjYwLHNvY2tldG51bSw1Cltwb3J0IjIiXQpkY2I9cHBwLGRjYngK
+YmdfbWVtPTI1CmxwYmtfbWVtPTI1Cmh3bT0zMApsd209MTUKZHdtPTMwCmRjYl9hcHBfdGx2WzBd
+PTB4ODkwNixldGhlcnR5cGUsMwpkY2JfYXBwX3RsdlsxXT0weDg5MTQsZXRoZXJ0eXBlLDMKZGNi
+X2FwcF90bHZbMl09MzI2MCxzb2NrZXRudW0sNQpbcG9ydCIzIl0KZGNiPXBwcCxkY2J4CmJnX21l
+bT0yNQpscGJrX21lbT0yNQpod209MzAKbHdtPTE1CmR3bT0zMApkY2JfYXBwX3RsdlswXT0weDg5
+MDYsZXRoZXJ0eXBlLDMKZGNiX2FwcF90bHZbMV09MHg4OTE0LGV0aGVydHlwZSwzCmRjYl9hcHBf
+dGx2WzJdPTMyNjAsc29ja2V0bnVtLDUKW2ZpbmldCnZlcnNpb249MHgxNDI1MDAxNgpjaGVja3N1
+bT0weDFhMTJmOTFlCgAAAAAAAAAAAAAA
+====
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
deleted file mode 100644
index 39c5f0806ea1..000000000000
--- a/sys/dev/cxgbe/firmware/t5fw-1.9.12.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 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
-8dMuIhYsISkZ8dIptgD5Ih4gBhBQMP7MCAACEGgw/bYCICACcPD/zBEJgAQ+YPy2AygJAFZw+bYB
-IAQQaDDwDxcAIAJS8PIaHgwDAGowGfG5+bYGIEAQeDD/tgcgQAJK8G3JBQAOhgBJYfzIEQRCALsg
-GvGxqLj82QwAQAJCMPAKBwQYADsg0w9tmQIASGEoISkpISixiAgIT/glKSYATMZQK7xg//GrEAEQ
-YDD6Ih4gABBIMPkWAC1QBD4g/RYBIB4QcDD5FgIgABBoMFhsRAUOR/dmOSLaAjugwCDRDwAAAAAA
-+iwAAgAAWPD8TAACAABpcFhuH9Kg0Q8A2iD7ChwiAABgsFhxEmP/1/osAAIAAFlwWG9l0qDRDwDz
-/sBgABBoMAAAK6wY/CwAAgAAULBYcQdj/6zA8C8lKfP/YmAAEEAwiif7TAACAABpMPqsICAAEGAw
-WGkd0qDRD8eg+SAVKgBAU7AK7wwvJBQvIQn61AMoQAQ+YPj/EQABEFAw+QoALgkAT/D51AAuCQBX
-8J/RKsZJY/5mbBAGlBEvIgknIRr2IAcgHBBwMPUiECIAAFFw+hYAKfAEOeD2BkEKAAlyEA8JQmSQ
-B/8CAAABAgVQ1+AoIAWLIvkKFCAYEFAw96UwDgDMShAY8VhlsWAMZRGoVSxSOv8CAAYAtkMgJFI5
-ZEFhiSoNBj4PmQz/AgAKAJY2UCsgTCogTvysASYAt1bQLCROKjAB+SIYIAEQYDD7MQEiALRqkCgh
-JC8gB/rxRhxAAVQw8N0RDgIBfDD6iAIOoAQ/4P8hBywJAH9w/SEJKgkAbvD6ISIqCQBW8PtGAC9A
-AXww+/E5HsAEP+D/IgAsCQB/cJ1DmET7qgIABhBAMPpGAi+ABD/g+vExHgkAR/CfQS0iEJ1FKyA4
-//EuEgAAQzD8RgkgQRBoMPdGCCoDAVww+vEiHgUAXrD7CgAoBQBbcPtGBy4JAEfwn0b/8RUQAgJq
-cC0mGJtLmUrwChcAYAJJMAAJiv5GDyAgAlDwLkxA/0YOIAYQSDACCoYATmMACoYATmH5VjkgEwA1
-oIkpKCA4ppn5JgkiAE/6EIoQCgpHaaJ9wCDRDwAA+iwAAgAAWbBYcEf+ChwuyQA2oPwSASIAAFCw
-/RIAIgAAWPBYbYXSoNEPK2wY+iwAAgAAYLBYcHdj/9cAAAAAAPsSACIAAFCwWG7J0qDRDwCLIsDE
-DLsCmyJj/7YAAAAA/SIdKIABSDAAgQQAzxoP3QItJh1j/oQAiieNEcDA+qwgIgAAW3BYaILSoNEP
-2iBYbTFj/1wJdwzz/fth0AI58GwQDJUaIxYLLBILAOWOKyE1KsIELyIJKCAH+yEaKgMAWrAjwgL5
-IhAoIAFAMP8HQgfwBDrg8wNDCgAH0ZBkcAf/AgAAAhgGUPYgBSAYEFgwCrlwiSLBdP8CAA4BqrmQ
-+xILIyUAtmArsAEnCgj8hRECAYZy0JgSFvC98xYFIAICSTD+FgQgBgJZMPoWAyQAIDVwJ1I6+RYJ
-KgBT3dAoUjn+jAADHQA2IBrwsSqiSvjwrxLuADagKIJJDQM+ZILgiiqYEZscD6oM/hYGKgA+npAt
-GgD+Cv8qAAibUCggFpsc/BYALgBCchCPE4YWKiA4iMP4ZgcgABBwMJ5pn2gnIheXahfwo/0iGyoD
-AVAw/WYLIEAQMDD28J0eBQBRsIjE/hYHJgUAUfD2FggqAKjD0IoUmxyZHfwWACD0ADagYABG8/9c
-YAAQQDAAmR2cEPosAAIAAFjwWG/MjBCJHfsSDC9wADagYAIgAJkdKiAH/AoAIgAAWjBYb6KMEIkd
-+xIML2gAtqBgAvmOGIYVjxeME/sSAC+AEEgwKSQ7/IgMDAAgZ3D4tgQuCQA38P8SBi4JAHuwLSYb
-/SIQIgAAULBYbkaLHIkdjBD6VjkhABBQMHOrCCggFi0K/32JbY8pLiA4DwIAo///Jgkg8AD7sC4h
-NYrELSEaDwIA/9YRCgMAcrD4IhAqAAbRkA8OQmTgAnGGX/oWAyAYEDAw+mgwAAEQaDD9FgQgAxAw
-MJYaY/5kiieLG/qsICIAAGEwWGtLmhAtIhuIpGP/QAAAKiAH/DwAAgAAWjBYb1SMEIkdixxj/3oA
-2iBYbJSMEIkdixyPKWP/ew7aDPP/mWHQAlKwAIsVihctIhAe8ET7IDsqCQBasP/wQhgJAFGw/o4C
-BmABRDD1sTFmgAQ94IvAJiAHD7sB//AzFgIBMDAKZhD6IQcqCQA28P8SBioJAH7w+iEkKUABUDCb
-8CshCfYhIijABDog9/AoGgkAOrD4IgAqCQBG8JvznfX+9gYmCQA5sPb2AimABDog+vYEKAkAQnD4
-9gEgYAJL8PjMICIgADkgKkz+bakFAAiGAElhKCAUCISH+CQUKgBmFiD6EgkhABBIMPpWOSoACRpQ
-KCAWKwr//wIADgCK2hAsIhexzPwmFyATADTgjiktIDij7v4mCSIAePtQjxRl8MzAINEPAAAAAAAA
-JiBOZGzxB5sCmyL7EgsiAABQsP0SCiIAAGEwWGx/0qDRDwDaIPsKHCIAAGCwWG9yY//X+xIKIgAA
-ULBYbcXSoNEPAACLEtog+7wYIgAAYLBYb2lj/7TbwPwSAy+AEHgwLyQ7/xIGIgAAULBYbbv6Fgkg
-ABAwMCYmGyYkO2P/KYwR+yEJL/AQcDD9IBUuAEByMA6PDC8kFPTdEAuABD7g/QoAKgkAbvD9xAAg
-ARBIMP7EAyoJAE7wm8Ea780ppklj/vQAiif7TAACAABpMPqsICAAEGAwWGdn0qDRDwAA2iBYbBVj
-/woqIAf8PAACAABaMFhuzWP+3Qe6DPP7zWHQAlKwAACLEtog+7wSIgAAYLBYbzlj/vQAbBAGKCAF
-3UD677QQFBBwMPcKAS4AkHIQKyBOKaJKsLv7JE4hAAA2YCaiSWRg9ykgFLOZCQlH+SQUKgDbFmAr
-IHMU77H8Ih0gARBAMPCxBAACAkrw8HsaCIABTDD5JHMv/xB4MP+/AwoAQGbw+4s5DABAezD8Jh0g
-zAC24IoifKcELCBOysJ9pwguIEwtIE5+0xfMbC8gFPgiAioOAT/gZIGGwCDRDwAAAACJJ8ezC6oB
-+iYCIGACUnBYXw/z75QQJwA2oCigANMP0w8DiAooghD8oAciAABasP0KBCIAAFCwC4AAZa/ciSfT
-D2SfoyqZFMqniplkr5kooAADiAooghD8oAciAABasP0KAyIAAFCwC4AAZa/gY/93AADz/9VgABBQ
-MMBgKSAUs5kpJBRj/wwAAAD6LAACAABZcFhtP9Kg0Q8ALyAFLCAH/AtBDgCnc9AFDkf/AgACAKib
-oI82DLkRqpkokjr/AgACAHzCICqSOWSg7ighJPvvZhwCAWAw8yEJLKAEOyD8708YCQBiMPshIigJ
-AFowmKCIIP+mBSoJAGbw86YDIAIQYDDz70wZgAQ6IPumAigJAGIw+KYBIDACWrDwAxcAABBQMLGq
-8hseAfQCPqD8ljkj/1EDoIon29D6rCAgABBgMFhm3GP+iyshCS8gFfz68CAAEEAw+GQALABAYnAs
-ZAP0/xALgAQ+4PycDAoJAH7w/CQUKgkAPvCbYSemSWP+FIonwLD6rCAgARBgMFhtj5SgjCD77zYd
-gAQ7IPumAiwJADsw/KYBIBwQWDD8LAACAABQsFhuoMAg0Q8AjSJk0Er/AgAD/weboIonwLD6rCAg
-ARBgMFhqFZSgjSAI3RH77yQcCQA/cJ2hjDaco5uiY/3hAAD7XAACAABQsFhs5WP90Y8zY/6vAAAA
-AAD+FgAgMAJa8PosAAIAAGCwWG6GjhBj/5xsEAQpIBRvmxiKJ/tMAAAAEGAw+qwgIgAAaTBYZp3S
-oNEPiyJzvlga7vksokpkwE0soklkwEf5JBQrngE+YP8gFS/wEEAw/iEJKABAQnD4xAMgARBoMPiY
-DA5ABD/g+CQUL4AEO6D/CgAuCQB7sP/EAC4JAGuwnsEtpklj/4rIssAg0Q/aIPwsAAAcEFgwWG5h
-wCDRDwAAAGwQDv0gBy7gASgw/+z+IAEQQDD0Fg0uBQB+MJ8e/Q1BAnICO6AqPBD0ChYCAABIcABJ
-ZQIKhgBJYwAKhvAJoAADEFAwKhYN8QMWAgAASHAACYr5FgwiAAAYcIovKCE0hzcvIRqLKfMWDyIA
-ADDw//wRBgMARfD7CUIKAAc7EMiW/wIAAAHuBpDzCgEgFBB4MPf6MAIuAjugKiBPKSBNsaoKCkf6
-JE8qARjWUCogBf8CAA4BAnqQiyIq+vP8Eg8oANpakC4iGSzCAv8CAA4BIfMQLhIPLuIIGO6n/+6n
-EgIAN6AuEg0M0xH4MwgABgJzsCkyOv8CAAoA1fZQJDI5DQU+ZEGdiymKKtMPC6oM/wIACgCgLpAs
-GgB1yw8rIBYoCv/TD/8CAA4BesLQGe6jKCEkKiEH+SEJKAkASjAKCkoMqhD6IAcoCQBWcBvujgoq
-QPzumxqgBDqg+yEiKgkAWrCaQPoiACoJAGbwm0Ib7pWYRPlGAyuABDqg++6SGgkAWrCaQYkvmUUo
-IDgZ7o/EwvdGCCgDAUAw+QoAKgUARnD5RgcgAhBQMPhiBCoFAEMwmEkY7oaMZZxKiWb5RgsgABBI
-MPwgOSDKADXgCpwQCMwCnEyJaJdPmU6IaShGEIxqLEYR8A8XAJACSTAACYqJZ/8CAAoAk03QH+5p
-Cr4CD+4Cnkb9CgUhABBgMP02OSoACSsQKyAWKAr//wIADgEaQtAsIhkrIE+KKfkgOCACAmMw/CYZ
-If4CWvD7JE8qACAqsPomCSIA3/pQjR5l0b3AINEPLxYQLhYRLRYS+iwAAgAAWXBYbYstEhIuEhH/
-EhAupgA2oI4eZe/UiicrEg/8Eg0gYAJSsFho/sAg0Q8AAAAA/wIAAf+bYxDz/y5gARBIMAAAK9wY
-+iwAAgAAYLBYbbNj/78AAADB436pDC8gOsCP/RYSLgD3w9D6LAACAABZcFhsAdKg0Q8A8AAGYB0Q
-UDDAoSshCY4f+iwAD7AEPqD84gcrQAQ+4P3iCCoJAH7w/uICKgkAHvBYa+LAINEPAADz/85gGBBQ
-MAAKuQKZRvgKBSEAEGAw+DY5KgAJKxArIBYqCv//AgAOANBS0IseZLEpjGeLaoppB8wM/GYHKgAg
-XfD3uwZwABBgMLGqiWaIZZpp+2YKKgAgTfD3uwZ6ACBDMLGqm2aaZYgpLCA4pYj4JgkiAIj7EIkn
-KpkUy6GLmf0WEiAtADbgGe4EKLAALxYQLhYRCYgKKIIQLLAH+iwAAAMQaDALgAAtEhIuEhEvEhCL
-Isej/wIACf9CWpAoITSHZyshGoov/7wRBgMARfD1IgkqAAi7EAUJQsiW/wIAAACEBpDBtPe6MAAB
-EEgwmR5j/OzaIFhqLWP+PIon+qwwIgAAWbBYWljSoNEPLxYQLhYRLRYS+iAHIAAQYDBYbPYtEhIu
-EhH/EhAs8QC2oCvcEvosAAIAAGCwWG1MY/4jAPogByIAAGFwWGzUY/3BAAAJ9wzz/CFh2AI58C8W
-EC4WEYonLRYSix/8Eg0gYAJSsFhofy0SEi4SES8SEPP+sWIAADKwLxYQLhYR/RYSIgAAULBYagYt
-EhIuEhEvEhBj/tUAAMFT+iwAAAAQWDD8CgAgAxBoMFhkGSsgBf0SEi/986rQY/2cAAAvFhAuFhEt
-FhL6IAciAABhcFhssC0SEi4SES8SEGP+Qwm3DPP+9WHYAjnwAGwQDJUYAPWOiC+TGYwZLSE0KSEa
-i8QqIAeOKf+WEQoDAG7w+gpBCgAJWZAOB0JkcAf/AgAAAiEGECYgBfciAiAUEEgwC5hw+LwADgGw
-yZD7EgkjMQC14CuwAcCY/KURAgGM8tAW7YP6FgMgAgJJMP8WBCAGAlkw+BYCJAAgNXAnUjr5Fgcq
-AEdd0ChSOf+MAAMsADYgGu12KqJK+O11Ev0ANqAogkkNAz5kgu+KKigWAQ6qDPsWCioAMh6QLRoA
-/gr/KgAIm1AoIBabGvwWACDcCHIwFu18LSA4/u15EAAQQDCY9/fCBCwDAWww9hICLgUAabDEoP4W
-BSgFAGqw+BYGKgDCuZCOFPsWCiElADegYABNAPP/dWAAEEAwmRufHJwQ+iwAAgAAWPBYbJiMEI8c
-iRv7EgovhQA2oGACRZkbnxwqIAf8CgAiAABaMFhsbYwQjxyJG/sSCi96ALagYAMgnBD2EgIvgBBo
-MP0kOyAgAlMw8AoWAEACQ/AASGGW+IfEjcebGojG9ncMDAAgbbD3xgQqAAizUJsaKRYL/BYAIAIC
-QjCZG4wSixCGFo4VmLb9tgciAABQsP0iDy4JADOwWGsGixqJG4wQJxoA+lY5KgAGmdAoIBYqCv96
-iXWOKS0gOA8CAKPu/iYJIgBAe1AtIRovITSKxA8CAP+qNg/wBD9g+CIPKgAG09AOD0Jk8AJxhmf6
-FgIgFBAwMPpoMAABEGgw/RYEIAMQMDCWGGP+TZkbiiefHIsZ+qwgIgAAYTBYaAqPHIkbixrz/xNi
-AABisAAAKiAH/DwAAgAAWjBYbBKMEIkbixpj/3IA2iBYaVKMEIkbixqOKWP/cw/aDPP/kWHYAlKw
-JiA7jRUe7QP67QMQQAJb8PjdAgAgAkMw9WEsbgkAc3CGwCcgB5Me+iEkJgBAUbD9A0MGAgE8MPgz
-EAygBD3g8+zuGgkAGrD2IQcsCQBtsIcv8yEJLAkAH3D99gAnQAEwMP0hIibABDmg9iIAIgkANPCX
-9Z72k/Pz7OEXgAQ5oPr2BCYJADJw9vYBIf4CUTDzEg4sCQAfcP32AiAaAD0gbakFAAiGAEthKCAU
-0w8IhIf4JBQqAGGWIPoSByEAEEgw+lY5KgAJGlAoIBYrCv//AgAOAIbaEMg9jSksIDij3f0mCSIA
-eHsQjhRl4M3AINEPAAAmIE5kbOQJfAKcIvsSCSIAAFCw/RIIIgAAYTBYaUHSoNEPANog+wocIgAA
-YLBYbDRj/9f7EggiAABQsFhqh9Kg0Q8AAIsT2iD7vBgiAABgsFhsK2P/tCb6gCYkOwIIhgBLY/wS
-AiIAAFswnPj9Ig8iAABQsFhqe/oWByAAEEAwKCQ7Y/8wjBH7IQkv8BBwMP0gFS4AQHIwDo8MLyQU
-9N0QC4AEPuD9CgAqCQBu8P3EACABEEgw/sQDKgkATvCbwRrsjimmSWP+/Yon+0wAAgAAaTD6rCAg
-ABBgMFhkKNKg0Q/aIFho1mP/CwAAAAAqIAf8PAACAABaMFhrjWP+5QebDPP7u2HYAlrwixPaIPu8
-EiIAAGCwWGv6Y/7vbBAGKCAFIyAHJAoD8wNBCPQBOiAoICJkgG8CKgJYYlD5oWZgARBoMCogIRjs
-bA8CAPwzEQCqAP6wCDMIKTI6DwIAbpNEKzI5y74uCv7+rgEAABBgMPoiACwJAG+w/SQhIAAQSDD5
-FgAgABB4MPkWASAJEHAw+RYCIAAQaDBYZv30NjkgABAQMNEPwCDRDwAAbBAKLCAF9LUaABMQaDD4
-IAciAABI8PkWACIAABkw+xYDIgAAInD4CEEIGAA7IP8CAA4Bk2sQjiL27EUfwAQ+IPXitGAIAkjw
-pv+fFYwVLMI6/RIFKgFXTxAt0jkuGgD9FgQioAA3YCUhG4pChymGKvgWCSQDAC6wBa8M92YMCgAD
-f5DVoHVjMyoaAPwK/yoAB6qQKyAW+BYJIHgIYvCKQv8CAAoApFFQjRMb7D+HQ5gZ9NCgZgBAXfBg
-ADOZGPosAAIAAFlwWGtoiBn5EggvuQA2oGACIZkY+iAHIAAQYDBYaz+IGfkSCC+1ALagYALs/wIA
-AABHBdAtIRqMKZcW+RYILkABaDD4FgkgfwC3oJcW+RYILkABYDD4FgkgbQA3oPkWCC/wBD9g+BYJ
-KgAuq9Ab7B6GFolD/tUMCB0BMDDyiBEIAEBecPlGAyYJAEGwlhZgADSKJykWCCsSAPqsICIAAGDw
-WGb4iBn5EgggAhBYMPukAiIAACKw+qICI/+9BdCMKZcWmRiYGY4WjxT1rQwCAABZMPosAAwAICsw
-/UYCIgAAaXD8JgkiAABg8FhnF4kYiBmPFS4aAPr2OSoABquQKyAWJgr/drkMwKGaE2P+eQAAAAAA
-APogByIAAGFwWGroiBmJGGP/4AAAjykY6/D5EgQuACAv8J8pjEOLQI0T98wAAEACSnD86kAO4AFY
-MP4WASEbALdgJyAHBwdBCHcKJ3KZ/6oQACACQTD6PP8mAEBV8PfHAgAeADzgbakFAAiGAElhi0DA
-gJgSHOvdJiEaiBQU69mNESkhB/rr1h4mATww/dwPICACc3D0/wgJQAFMMP/wgCnABD5g/U0UCAkA
-VnD6684QAgJrcA09DJmAD18MiSCXh5aGnoMW66f6mgIJgAQ+YPqGBCACAlDw/4YFKAkATrD5hgEm
-BQBrMJaCLCAU88wIAgAAIrD8JBQghgCq8I4ViBL/Cv8hABBoMPTmOSoAB6tQKyAW/wIADgBE+tDS
-gNEPAIYTZGCLwCDRDwAA2iD7jBgiAABgsFhrEWP/5IsU/E0RAgAAULD9uwgAARBgMFhhOPP/qGAG
-AiEwiif8Fgcu6AFYMPqsICLUAL+gjBTAsfzMICIAAGjwWGMgi0CaEmP+82W82v8CAAH+a58gLiAg
-/wIAAf5me5Bj/4sAAAAAAAAA+iAHIgAAYXBYaoCIEtKA0Q+KJ9ww+xIAIEACUrBYZmzAsvukAiAA
-EBAw0Q8AAAAA+zwAAgAAOzD9PAAAABBgMFhjBdtA/DwAAgAAaXD6FgIiAABx8P8SBCIAAFCwWGaN
-i0Bj/uPaIPuMEiIAAGCwWGrbY/8KAAAAbBAEFOt00w/TDyRAgAhEEfsKASIAAFEwWXppGOtaZKBD
-CCgC+KYAIAIQSDD5pgEgOQA0oGghHG8kGf4iFmAQAkqwBAOIAImKAgOIAEmKAAOIAAmK2kD7CgIg
-ARBgMFl/p8Ag0Q/HJNEPD+gwn6IO7jCeow3AMJ2kDLEw/KYFIAAQWDCbppunY//JAABsEBLyFhQg
-ARBgMPkSFCIAAFDw+hYXJuABKDD4ogAiAAAZMPSQByH8Almw+ZIHKgUAXzD7Fggo4AFAMCgWEPQE
-QQBAAkpw+RYaIgJ0AaAtEhSN0mXTdRLrHi4iSmTk9C8iSS8WESYSEWRk8C0SGirRBfkSFy/AEHAw
-9hYDLABAd3D9FhksACBusPmcICCAAmtw9ZwACgJs6lAmEhcpEhD1Fgwv8BBgMPZiAyAeAkpw9hYO
-LgBAZnD/FgouACAv8J8d9fwACgJX69CUEJMRH+saKxIXF+sACU0U/RYTIAgCSXD5FgYgEAJBcPgW
-ByAgAlDwmh+XFCoSFCuxDCsWFfsSGSfABDkg/qEHJgAgEbAmFhYqoBb+DkoAgAJa8PsWBS/ABDug
-+wr/LgkAe7D+FgsmANpekJMRlBBgAoEA9xIYIAICSnD6IgwAAgJz8P4OQAIAAHuw+hIaIjkANmAm
-EhkqoQUowAD2pggAARBYMPWICwCAAjGw/YwACgEPshD6CgAmAAFIMAa6OA2rC/2qCgAQAmrwJjAA
-B2YLF+rs+woBIAAQQDAOuDinhydwkPaLCwIAAHKw9ogKADACWvD0dAgAIAJCMIrg8A0XCgMAErCa
-gAALj4jgsczzPAEr/7CWEAKHDAqLDJvg89IBIAEQMDDy0gAgABBYMAdrOPm5CAIAIB6w89YBKgAD
-UNCxIvLWACIA7/0QBBQUghsnEhUe6s4d6swqEhImEhf5EhotgAQ6YP2tAQoAQHKw/BIYKgkAYrD5
-kQUgAgJb8P4SESoJAG7wm8SaUINnLRIUKhIZBzMMk2cjEhOS4I3Q/BINKAAgVnD06rUSACAk8PMW
-CS2ABD9g9OYCIAICGPD0EhAsCQBs8P3mASCAAkpw9OYDICACE7D0PAAKALnmUCoSE4gc+SwAAgAA
-IPBtqQUACIYASWGOHtMPZeGpLxIXj/dk8a4nEhYmEhQjdjkmYBYnCv//AgAOAGA5kCgSFokfKII6
-9xIWKgBwThAncjkqEhfyEhUg0gA14CcWEYlQiqf4EgogAhAgMPkWEiAAEHgw+YlHAgMAULDyFhUg
-vwA2YBPqdioSGisSGfqhBSIAIB5wIzAAF+px+6sIDAABSDD1MwsAgAJa8P08AAoA4ljQ+woBIAAQ
-UDAMujgNqwv9qgoAEAJq8CsSEfecCAIAAHKw+4gIAgAAGfD4FhggMAJaMPP+N2AoAkIwjReKFmP9
-+gqNDGP93gAAKxIXKhIUK7ENWCkaLBIULMAWLQr//wIAB/+V7xAqEhSLGFgpLWWvG2ABUgDAINEP
-ixAsEhT7vBgiAABTMFhpvsAg0Q8X6kiNF4oWY/9/ACISGIwU8kILAAAQODDwDBcAIAIQsLF38hIe
-AfQCPeDz/gJgAgIhMACMHC8SEwyaDPpOFAIAAGiw+QoAIBQAN6DwDBYAAgJKcPANoAHoCHJwLRIR
-jBX2Eg4gABBIMP7+DAwAIG6w9O5mYCACa3DyDBYAAgJKcPANogHoCHJwZG5ViR4okQCxiCiVAGP+
-SCkSFyoSFSmRDAqZDPkWAiDwALZgKhIUKqAE/wIAAgCDAqAnEhciEhGIcQw2EfdyAiIAIDCw9oEs
-YgAAWLD1CgAiAKOGECkSFIoRhBkokBSlRPiKBQACAiEw+JQULACfEiAnEhYmEhQkdjkmYBYnCv93
-YRArEheMEiuxDSoSFAy7DFgoxSoSFI0RiqfAwPqsICIAAFtwWGGQ0qDRDwo9DGP+OYsQLBIU+7wS
-IgAAUzBYaWvAINEP26D6EhogHgJqMP1NFAIAAGDwWOmB+hYXIAEQcDCeGGP6+cDwLxYRY/sILBIU
-+wocIgAAUzBYaVzAINEPCpUMY/skCvUMY/tOAAAsEhePHC7AFS3AFCvAEfzBCSIAAFCw/hIVLAAg
-d3BY6V1j/u8oEhSJEQ8CACaAFC8SF6lmJoQUL/IA/wIAAf+Rq9ArEhH6EhQtwAQ84P27CAAAEGAw
-WF9u8/8FYAYCIPAAAAAAACoSFPssAAIAAGHwW/eoKBIXiIH8qxECAAAqsPsrCAH/YIYQ+hIUIgAA
-YfBb93fz/q5kACAusCYSFIwT+2EJL/AQaDD+YBUsAEBuMP2FDAABEEgw9WQUIAAQeDD07hALgAQ+
-4P3EAyoJAHbw/8QAKgkATvCbwRrpnimmSWP+fQBsEAiIIisgB5US/CAWIP8QeDD1gQZqIAFcMPsW
-BSA2BHswixL0uxoCAABQsFgoeosV9KJLYP8QeDAX6Y0e6YYsMA/8vREB/gIxMP7ggCwAID9w/RYE
-IO4AtyD90jogbgJzsA5OFK5us+76EgQqAHP3UCqiOZoT9awAAOQANqArckpksK8qcklkoKksIBb6
-FgEgHgR7MPsxBiIAAFCwWChFLSAEKiAU9KoIAgBig2AKCkf6JBQsAJaSoCswD4oS9bCzauABUDD4
-PBAiAK6aoPkSAyAAECAwbWkFAAiGAElhhRMMaBGoVSkgBP8CAAIAb4JgKTIB9RYAIgAAWXD3MgIg
-AKIuYPUKACIAroZQpWqLFPq2OSIAABEw0Q8AAPosAAIAAFjw/RICIgAAYTBYZdvSoNEPANog+woc
-IgAAYLBYaM5j/9cmMA4GZglj/wwAAAAAAAAA8/8cYAAQUDAAACu8GPosAAIAAGCwWGjDY/+sKiQU
-Y/9DLiEHH+lY/elcH0ABcDAM7hH7MA4uCQB7sC7WKIwgGOlZ+MwRAAMQcDAOzAL81ikgIAJI8PII
-BwIAchqgbbkOAEVjBAmGAEVlAAmGAEVh8/8fYAAQIDAAjzD/AgACAIQr0IIU9iY5IgAAETDRD4sR
-+SEJL/AQYDD9IBUsAEBisPyvDAABEEAw/yQUIAAQcDD03RAJgAQ+YPy0AygJAG5w/rQAKAkARnCZ
-sSh2SWP+lAAAAIon/UwAAAEQWDD8EgMgQAJSsFhgrvP+n2IAACKw2iD7XAACAABh8Fv2+IkxixD8
-rBECAAAqsPy7CAH/VYZQ+iwAAgAAYfBb9selpaVqixT6tjkiAAARMNEPK7wS+iwAAgAAYLBYaHtj
-/oqKJy2hFfz6wCBAAlKwDKwBrNwszEBtuRUARWMICYYARWkGCYbwBaYKAA3iUNMP20D9TAAAABBg
-MFhgivP+FmIAACKwDZkMY//i2iD7XAAAABBgMFhekfJMAAAGAlmwjBQrxjnRDwAAbBAEIyAAJArt
-dDEHIiEDvCLRDwCGIIUjhCH2CFMDZAE0MPgzCAZgATAwpjMOMxHzUgwFoAEgMPM8GiHkAhCwBCQs
-BDMooyLRDwAAAGwQCIsiKSAHijCVE/wgFiggAUww9bFIawABUDArCv/6FgIgOgRbMIsTmRX0uxoC
-AABQsFgnqIkV9KJfYP8QWDAX6LssckpkwUYmckn4bAABSAA1oB7ory7ggAyVEadV/VI6IG4Cc7AO
-ThSuTrPu/wIACgCEd1AmUjlkYP0vIBaYEfkK7SAuBFvwKDAQ+zELJgDpThC8uwIqAlgndSwgBCgg
-FPSICAIAgQMgCAhH+CQULACXkiAe6Loc6JgoIQeNEhnotfoSAylAAUAw/IgRAB4Ce3D/TxQICQBK
-MPhmACrgAVAw+yIAIAICe/D/TwwAIAJJsPg8ECwFAHuw/WYDK4AEPuD8ZgIqCQBdMPtmASIAT5qg
-+EEPYAAQODCwSm2pBQAIhgBJYfkgBCH+AlkwDLsRq2v7vBAiAEoCYIgxJjIC+xYAIAByLiDzCgAi
-AH6GEKNM/FY5IgAAEfDRDwAAAAD6LAACAABY8P0SAyIAAGEwWGT50qDRDwAAACucGPosAAIAAGCw
-WGfrY//UAAAAAADz/rhgABAwMNog+wocIgAAYLBYZ+Rj/7coJBRj/waKJ/ycAAABEFgw+qwgIgAA
-aTBYX/vz/19iAAA6sIsw/wIAAgBtqtD0VjkiAAAR8NEPAI4R/SEJL/AQeDD5IBUuAEB+MP+LDAAB
-EGAw+yQUIAAQUDD0mRANgAQ/YP/kAywJAE9w+uQALAkAZ3Cd4Sx2SWP+kgAAAAAAAPosAAIAAGGw
-W/YuixCIMZoU86wADcAEOqD8uwgB/4WGEPosAAIAAGGwW/X9o6OjTPxWOSIAABHw0Q+ONIs3jTX+
-D1MNZAFwMP/MCA5gAXAwrswOzBH8uwwNoAFsMPzMGiHkAlrwDb0sDcwo8/3/agAgZvArnBL6LAAC
-AABgsFhno2P+s7BLDLsR+2sIAgAAULD7vBAgABBgMFhdyfJ8AAAGAmEwLFY50Q8AAABsEAbaIFgn
-ghjoNyQwFvnoMRKgEDAwBqYohTf0RAoIACBNsPlECwIAAFCw9VwIJAAgQTBYJ3eIQB7oLMBx+zAW
-IMAIIjAv4pAu4pOq/wn/Ea/unhAd6CYY6AAZ6B/9bQgPwAQ+oP7SfS4AIEfwiPEs0n8AsQTweRoI
-AEBKMPjMAg4JAEuw/tZ9LgkAY7Ce8inSf8ibhhAt0n1Y6NTaYFgDJo8yiUEAIQQAeBqVkJlRlFD1
-RgEuCQBH8J8y0Q8AAABsEAjaIFgnUtSgHOgK+ugIEqAQKDD1RCgLwAQ8oKy7+7IAKgAgUTAqon8m
-LO715/kQYBAYMPjoABoAQFqw+hYAIAEQODDwAQcEACAtMPAAL2QAIEEwAzwK9cwLDzwQQDCoyPiC
-LSIAAFCw+0wAAgAAabD+PKAhwAJjMAuAAAARiwczYPCBgA+cAjjg0Q8AAAAAAAAAbBAEFefKFufo
-9TUCAgAgMLAlJoAkIoBnQAttCAUoIoBngAJj//PRD2wQBCggBSUgB4o19Pr9IAIQGDD1BUECFAC+
-IMAg0Q8AAIgpGefYDwIA+iYLJgB91hAJWQkqkegpkeT/AgAKAE1WUIoiDwIA/wIAAgBGgpACKgJY
-XXQrIgLTDwO6AWSvuoonBLsB+yYCIGACUrBYVyPz56gQJwA2oCigANMP0w8DiAooghD8oAciAABa
-sP0KBCIAAFCwC4AAZa/ciSfTD2SfeCqZFMqniplkr24ooAADiAooghD8oAciAABasP0KAyIAAFCw
-C4AAZa/gY/9MAADz/9VgABBQMNogWF1hKyAi+rsMAgAAULBYXpTaUPsKASAAEGAwWF9TiyLzugEP
-/6+e0CwgB/S9AQIAAFCw/SYCKiABZDD7vB8iAABgsFhm8cAg0Q8AAAAA+yAiIgAAULBYXoIqIAXB
-436hDGioKYsi8/8ZagBAGvAvIDrAj3j56vosAAAAEFgw/AoAIAIQaDBYXcxj/9cAAPosAAAAEFgw
-/AoAIAIQaDBYXUlj/78AAGwQCos3HeeAjDYpICEoIgv6Cv4sAEBrMPy7DAgAQFZw+SQhIBgIWjDA
-INEPAAAAAPADFgIAAEBwAEhhmxUuIAUlIAfHTfgWCCACEBgw9QVBA64BP6CJKRrna/smCyYAfV5Q
-CloJK6HoKqHk/wIACgBM3pCLIv8CAAIAR4LQAioCWF0IiyIDugFkr5yKJwS7AfsmAiBgAlKwWFa4
-26Dz5zwQJwA2oCiwANMP0w8DiAooghAssAf6LAAABBBoMAuAAPusAA/hALagiSfTD2SfWCqZFIuZ
-yqhkv04osAADiAooghAssAf6LAAAAxBoMAuAAPusAA/lALagY/8sAAAAAADz/9JgABBYMNogWFz1
-KyAi+rsMAgAAULBYXijaUPsKASAAEGAwWF7niyLzugEP/60e0CwgB/S9AQIAAFCw/SYCKiABZDD7
-vB8iAABgsFhmhcAg0Q8AAAAA+yAiIgAAULBYXhYqIAXB436hDGioKYsi8/8UagBAGvAvIDrAj3j5
-6vosAAAAEFgw/AoAIAIQaDBYXWBj/9cAAPosAAAAEFgw/AoAIAIQaDBYXN1j/78AAGwQBBznFikw
-Fos0CVkU/LsBAAB7BmD65xIRBgA2YMfe9ObwFFgAOmAsoWxplRx8swm0zv8CAAoAiPbQLyAGsP8P
-D0f/JAYgWgA34MAg0Q8ALKFs/LMMcAgCQzD/AgAKAHzG0CkgBrCZCQlH+SQGL9wAtmCLIokn+pkU
-KgBAbvCbIouZZKCxKLAABIgKKIIQ2iD8sAcgAxBoMAuAAMAg0Q8AiyKKJw27AfsmAiBgAlKwWFZG
-ya0ooAAEiAooghD8oAciAABasP0KBCIAAFCwC4AAZa/giSdkn3EqmRRkoGCKmWSvZiigAASICiiC
-EPygByIAAFqw/QoDIgAAULALgABlr+Bj/0QAAPosAAIAAFjw/EwAAgAAaXBYXdLAINEPAPosAAIA
-AFjw/EwAAgAAaXBb/0fAINEPAPP/SmAAEFgw8/+dYAAQUDCINyKiyQmIEfP+52IAIECwiDcioskJ
-iBHz/v9iACBAsGwQBNEPAAAAbBAIFea+FOa8F+a6khLwIQQAABBIMPkWAyAEEEAw+BYEIAEQUDAA
-qhoCIgn6FgEv/xBYMPuqAwPgBDig+hYAJgAgPLD05osSACAgsPAAImAAEDAwmBOJFLFm8iwMIBgC
-OfD1XAIh/gJKcPkWBCCjADZgKlGy8GEEAAEQQDDwiBoFpgE6oCtxfmS/ytogWF8+jBHwYQQAARBo
-MPDdGgIAABqw/RYDIA0ANyCPEI6iD+4BnqKKNyqsMFhV6MmvKKAA0w8EiAooghD8oAciAABasP0K
-BCIAAFDwC4AAZa/eiTdkn3IqmRTLroqZZK9oKKAABIgKKIIQ/KAHIgAAWrD9CgMiAABQ8AuAAGWv
-4GP/RgAAixPAkfoSAioFAF5wWGAe0Q8AAAAAAADz/75gABBQMGwQBPjmcxDMEEgwCSkoqYgogOj4
-hwpiAAAgsMAg0Q8AAMDA1cAF5BYBAgDA0RrmaQErEaq6/aaBIMgQSDBtCBAuooIODkL44Qph/gJK
-cGSQhmP/6MAg9iCWYgAAGLD8poEgyBBIMG0IEC+igg8PQvTwCmH+AkpwZJBlY//owCD2IKViAAAY
-sBnmVNMP/OZUGAAgTvAslosY5lIolov9poEgyBBIMG0IDyuiggsLQvixCWH+Akpwyp5j/+nAIPYg
-f2IAABiwwNItpoEsooEF5BZmMDLSMNEPAPP/em/7EBAw8/+bb/sQEDDz/9Fv+xAQMPoKAiAIEFgw
-/OY7EgAAaTBZe9Jj/8bdQPzmOBACEFAw8w4GAAgQWDBZe8zApFhfENIw0Q8AAAAA+goCIAgQWDD8
-5i8SAABpMFl7xGP/jgAA+goCIAgQWDD85ioSAABpMFl7vmP/dgAAbBAGHeYmCysRrbMqMn8Z5iQX
-5geIoMBA+XkIAAEQKDD0gDRoACBO8CwyeP8yeyYAWM8QZfE8LDZ8KzJ5KzZ73UAN5BYBAgAkpgAN
-5BYsCgn/AgAGAFxkkC8ye8HA/eYREG8AN+AiMnwqIQSOIPoLRgAeCBPwJDZ8JDZ7YAAEAAAuNnz9
-rwEB/gJC8Aj/Av8lBCAsAD7gIjJ8sMz/MnsgHgA0oMnGY/+/2iBYXlJloOcqIQT6CUYAEgDCsMiZ
-0Q8A2iBYX4zRDwDaIFhfwtEPAPosAAAAEFgwWF+N0Q8AAAD60mAh8AJwsADhBPBbGg//EGAwDLsD
-C6oBKtZgWX3oJDZ8JDZ7KjJ/Y/8zABbl5y9gYGTwkllyGlheCChw0dMPDwIA9eXiEFQA/jApUH0P
-AgD/AgAAAEOGYP8CAAIAQ4Zg/wIABABDhmApUH2xmSlUfStgYGS/AFhd8mSu+i1SILDd/VYgLvIA
-t2BYXZEqViBj/uQc5c/+MnwgBRBQMPgyeiAEEFgw+BYAIfICaLBZe1kqMn9j/qEAKTJ78jZ8Lx4A
-tmAiNnvRDxvlwyuyrv8CAAH/sYbQJWRgY/9YwKBb/zpj/4TAoVv/OGP/fCRUfWP/dgAAbBAEFOW4
-+eWxG7AEPKD45ZMUACAi8CNCf6mI9DBNaAAgQvAqMgB4qQIqQnsc5akrMQT6Rn8qAEBi8Po1BCIA
-AFDwWF33z6ApMQT5DUYAEgDCcMjZ0Q8A2jBYXzHRDwDaMFhfZ9EPAAAAAAAA+iwAAAAQWDBYXzHR
-DyNGf9EPAABsEAT5+v8gDgA04IgiCTkDCYgBmCKKJyqsMFhU2fPlXRAjADagKKAAA4gKKIIQ/KAH
-IgAAWrD9CgQiAABQsAuAAGWv4Ikny5IqmRTKpYqZya0ooAADiAooghD8oAciAABasP0KAyIAAFCw
-C4AAZa/g0Q8AAPP/12AAEFAw0Q8AAGwQBPrlNxHQAkiwCQlHDJkRqpkokjoPAgAPAgD/AgAMAFpG
-ICqSOWSgqxzlTBvlbgIqCQyqCguqCFhd/PAhBAABEEgw8JkaD/8QWDDyrAAADgA2YIqiC5sDC6oB
-miKKJw8CAA8CACqsMFhUpfPlKhAoADagKKAA0w8PAgADiAooghD8oAciAABasP0KBCIAAFCwC4AA
-Za/biSfLmiqZFMqpipnJrSigAAOICiiCEPygByIAAFqw/QoDIgAAULALgABlr+DRDwAAAAAAAPP/
-02AAEFAw0Q/RD9EPAABsEAQY5QACA0cMMxGoMysyIBnlCYqxKLAA+YgKCgAIOCACCj4oghADAj79
-CgIiAABgsAuAACI2IAwCANEPAAAAbBAEGOTwAgNHDDMRqDMrMiAZ5PmKsSiwAPmICgoACDggAgo+
-KIIQAwI+/QoCIgAAYLALgAAiNiAMAgDRDwAAAGwQBBjk/yiCNil60AmIKBXlHQyIEShWt/VStyAA
-ECAwBOQxAQIAFOUawTADIwIjRopj//xsEARZdwYS5RYT5PApIoLTDwipjgOoCoiAC4AAY//sAGwQ
-BCoiByqsEFhe0dEPAABsEASIJyKMENogWF6taKEB0Q/aIFhepxLlBwuoEfSgO2IAIECwDOowKyKF
-K7IAIqz//LsIAgAAULBZfL8c5P8qwn/wIQQAARBYMAC7GguqAirGf1l87tEPAAAAAPoKByABEFgw
-WF6FLCJ/LCaD0Q8AbBAEJiIHDwIA9mwQIgAAUPBYXur8PAACAABpMP5cAAIAAFqw/yIAIgAAUbBY
-Xi7RDwAAAGwQBPnkuRgmASAwF+S49iYCKAAgSjAogID0JgMmCQA88JcgCFgMmCHRDwAAEuTbA+gw
-BO4wBbEwkyCUIZUiEuTXE+SYhCAEMwKTIBLk1cAwKDdAKDdEKDdIKDdMIz0BcjPtAwIAEuTPwDCT
-IMcvE+TOAyMDEuTOhCAENAGUIBLkzIQgBDQBlCAS5MuEIAQ0AZQgEuTJhCAENAGUIMcvwDEDIwMS
-5MaEIAQ0AZQgY//8EuTEgyADExQPMxGTIBLkwcAwIyYAV//ZEOTAkQCSAZMClAMR5L6CEAHqMKIR
-AfAxwEAE5BYAAgAR5LqCECMaAAMiApIQEeS3wCGSEATkMYQDgwKCAYEAANIwASMAAAAAEOSykQCS
-AZMClAMR5LCCEAHqMKIRAfExwEAE5BYAAgAR5KiCECMqAAMiApIQEeSowCGSEATkMYQDgwKCAYEA
-ANMwATMAAAAAEOSjkQCSAZMClAMR5KGCEAHqMKIRAfIxwEAE5BYAAgAR5JaCECNKAAMiApIQEeSZ
-wCGSEATkMYQDgwKCAYEAANQwAUMAAAAAbBAEJCAUo0QkJBTRDwAAAABclAFdlAJelANflABDAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXJABXZACXpAD
-X5AAUwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyU
-AB2QAZ2UAp6UA5+UBAiUBQmUBgqUBwuUAEMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAACckAGdkAKekAcdkAOfkAR4kAV5kAZ6kAd7kABTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAA3JQAHZAB3ZQC3pQD35QEBJQFBZQGBpQHB5QICJQJCZQKCpQLC5QAQwAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAANyQAd2QAt6QCx2QA9+QBLSQBbWQBraQB7eQCLiQCbmQCrqQC7uQ
-AFMAAAAf//dgANIxEP/+CgAAAAAAH//3qADTMRD//goAAAAAAB//9/AA1DEQ//4KAAAAAAAA9DAK
-AAAAAAD0MAoAAAAAAPQwCgAAAABsEAaJIiUyAyoiAPWRNmT4ASwwGOH3/wIABACDEWAMVBEIRAgo
-Qjr/AgAGAI9CICtCOfbh8BETADbgKWJ6/wIACgBHzpD+CgAgABB4MP1hfi//EGAw/BYAIAEQYDD6
-FgIgABBQMPoWASQAIC9w/QoEIgAAUXBYXCf8CgAgBBBoMP4KACAAEEAw+BYAIAAQeDD4FgEiAABa
-sPgWAiIAAFFwWFwcwJYa4dQtIAaLIvlGOSABEGAw+jYCIAICa3D9JAYqCQBm8PsmAiAAEBAw0Q8A
-/AoAIAAQSDD5FgAgBBBoMPkWASAAEHAw+RYCIAAQeDBYXAjAkxrhwC0gBosi+UY5IAEQYDD6NgIg
-AgJrcP0kBioJAGbw+yYCIAAQEDDRDwAqIAb+4bUQARBAMP42Ai4JAEZw/yYCIAICUrD6JAYgABAQ
-MNEPwCDRD9og+1wYIgAAYLBYYMzAINEPAABsEAiIIiogBywiFPWBBWogAVAwHeGjZMDSGOGeLdCA
-DKYRqGb7YjogbgJrcA1NFK1Nst3/AgAKAILu0CliOfucAAEEADZgLoJKZODfKYJJZJDZKiAUCqSH
-+iQULACAEqCNOfg8EC7gASgw/W0UAgCWG6D4QRVgABAoMPpM/yIAAErwbakFAAiGAElhicAa4YX8
-TP8iAABC8PzPEQ+ABDpg+pkCDgkAczD+tgEqACB+8A8CAA8CAA8CAG3ZB/mGBiCAAkIwiDGbEIcy
-9oFmYAAQSDD5FgEiAL8GEIoRqkqwqvpmOSIAABFw0Q8AAAULR2iyGYon+0wAAAAQYDD6rCAiAABp
-MFhYp9Kg0Q8AwCDRDwAAAAD6LAACAABY8PxMAAIAAGlwWF2J0qDRDwDaIPsKHCIAAGCwWGB8Y//X
-8/7+YAAQSDAAACusGPwsAAIAAFCwWGB1Y/+8AAAAAAD+IQkv8BA4MP8gFSYAQD6wB60MLSQU9P8Q
-AAEQaDD3lAMvgAQ7oP8KAC4JAHuw/5QALgkAa7CekS2GSWP+xY4nnhOF6fnpFC/AEHgw9+EVIEAC
-U7D3FgQuAEB+sP8WBSnABDkg+JkMACACKXD15gkmACB98PiZMgCAAjnw+eUUKgB8OVD5FgIqlAA+
-IAWJCCmc8P8CAAoAQk3Q+EEiYgAAevAuTP9t6QUABYYAT2GJof+pBCgAIE4w/xYCIeACSnD/AgAG
-AGA+UJmh+RICIgAAKnBlnllgAIf6LAACAABh8FvuqIgxKxIA+hYBLcAEOqD8uwgB/0UGEPosAAIA
-AGHwW+53jRH9rQgCAAARcK1NsN0tZjnRDwAAAAAFdwz3TxQCAABK8G35BQIFhgBJY4kV/0UMDgAg
-PvD5nEAgHgA9YLBebekFBAmGAE9lhRUvqQQHiQypVSVcMPWmAS3TALfgjhXA8P+lBCCAAnOwnqGe
-oPP9u2AAECgwjxSOEw9VDJXpY/7/hRX5EgIggAIpcJWhY/8+AGwQBPQiECKIARgw8iIPBfABHDAE
-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
-/RIZLgAgcLD4QuouYAFwMAPuCo7gL1CG+hYbIgAAWrD6EhguACBDsAtgAI4dB+4oLBIb/RIaLgAg
-cLD4QusuYAFwMAPuCo7gL1CH+hYcIgAAWrD6EhkuACBDsAtgAI4eB+4oLBIc/RIbLgAgcLD4Quwu
-YAFwMAPuCo7gL1CI+hYdIgAAWrD6EhouACBDsAtgAI4fB+4oLBId/RIcLgAgcLD4Qu0uYAFwMAPu
-Co7gL1CJ+hYeIgAAWrD6EhsuACBDsAtgAC4SEAfuKCwSHv0SHS4AIHCw+ELuLmABcDAD7gqO4C9Q
-ivoWHyIAAFqw+hIcLgAgQ7ALYAAuEhEH7igsEh/9Eh4uACBwsPhC7y5gAXAwA+4KjuAvUIv6FiAi
-AABasPoSHS4AIEOwC2AALhIS0w8H7igsEiD9Eh8uACBwsPhC8C5gAXAwA+4KjuAvUIz6FiEiAABa
-sPoSHi4AIEOwC2AALhITLBIhB+4oLRIg/1CNLgAgcLD4QvEuYAFwMAPuCo7gmhP6Eh8iAABasPsW
-AS4AIEOwC2AALhIUjBEH7igtEiH/UI4uACBwsPhC8i5gAXAwA+4KjuCaEvoSICIAAFqw+xYjLgAg
-Q7ALYAAuEhUsEiMH7iiNE/9Qjy4AIHCw+ELzLmABcDAD7gqO4PoSISIAADqwJxYi+O4IAgAAWfAL
-YACOESoWJCkSEi0SFY8VKxITLBIU+BIRICACe/D/FgUgIAJa8PsWEyAgAmMw/BYUICACQjD4FhEg
-IAJrcP0WFSAgAkpwKRYSjR+JHIgbjB6LHf8SECAgAkIw+BYLICACYzD8Fg4gIAJa8PsWDSAgAnvw
-/xYQICACSnD5FgwgIAJrcJ0fiRaNGY8a+xIHICACKXD8EgggIAJrcP0WCSAgAnvw/xYKIIACITD/
-EgQgIAJjMPwWCCAgAlrw+xYHIBACSnD5FgYh/gJ78P8WBCvtALfgiRCLEo8TjpCNkYyS+JIDLgAg
-e7D+lgAsACBXcP2WASwAIDsw/JYCKAAgWjCYk9EPAGwQBCkiFSv6gPkJRQA3EEAw+YwMCgAgEnD7
-pBAgIAIgsPqsESwAW8oQKwoAWWzELCIVKyIU8dQEDdAEPyD9JhIiAABAsPy7GAADEEgw+yYTIAIQ
-UDBtqgyOhATujv6GBCAIAkIw0w/TD22aIfmCBCAgAkIwioGLgoyDBJmOBKqOBLuOBMyOmYCagZuC
-nIP7TAACAABQsFv+noogiCKJIY8jBIiOBJmOBP+OBKqOmiCfIykmAfgmAiIAAECwGd8fAAKGAENh
-8AkXAAsQSDBtmgIACIrRDwAAAAAAAAD7CgAgEAJjMFlslvgsAAAEEEgw0w9tmiH5ggQgIAJCMIqB
-i4KMgwSZjgSqjgS7jgTMjpmAmoGbgpyD+iwAAgAAWTBb/nzaQPP/AmA4EGAwAGwQBioiFfgiFCBA
-EDAwDwIA+koICKABVDD5ZgwKAAOikCiMASgmFComFQYqDPqsUCoAe7UQ+zwAAgAAYbBZbGn4LAAA
-BBBIMA8CANMPbZoh+YIEICACQjCKgYuCjIMEmY4Eqo4Eu44EzI6ZgJqBm4KcgyUsEPosAAIAAFlw
-W/5ZBkcM/wIADABXReD2NAgCAABRcPZ8AAAAEBgw9BYAIgAAQTD2CBYABBBIMABKZwQIhgBKZQII
-hgBKYwAIhvAKoAIAAECwbZoh+YIEICACQjCKgYuCjIMEmY4Eqo4Eu44EzI6ZgJqBm4Kcg/osAAIA
-AFlwW/48+lwAAAICGPD2bMAggAIhMP9tmmIAAEEwixD6PBECAABRcPx8DAoAIF8wWWwx0Q8AAAAA
-+zwAAgAAYTBZbCzRD6Y8nBDz/9BgABAYMAAAAGwQBBjetBneshresBPes5MjmCKZIfomACAAEFgw
-KyYVKyYU0Q8AAABsEAbeIPTiECIAAGEwG96j90IHIgAAUfD/XPogExBAMPNCFiIAABDw93IOKgAU
-Q9AY3qGaEwj4CoiAnBKeEQqAAJMQKrKV/FwAAgAAWLBZcC1kpjfzRhYgABAQMNEPAAAAACviEgub
-Uv4WAS/oADbgGt6L8xYAIgAAWLD6orciAABhcFlwIGSlyhrehNsg+qK5IgAAYXBZcBtkp1Aa3oDb
-IPqiuyIAAGFwWXAW9KcEY3wQMDAa3nrbIPqivSIAAGFwWXAQZKdaGt512yD6or8iAABhcFlwCyMq
-gP8CAAIAIB3w/wIAAASbKqArMNnBWP8CAAQC9KrQabchJTTZixD7RhYgABAQMNEPkxAqso38XAAC
-AABYsFlv+2Snp4sQ+0YWIAAQEDDRDwCTECqym/xcAAIAAFiwWW/zZa8X+hwAAAsQWDBYqgz7CgEg
-ABAYMPqzOAAxADag+hICIgAAWbBZbGTDsPzeVRIAACqw+goFIgAAaXBZc67IWRzeUI0RDFw2LNYX
-ZTS1jRD9RhYgABAQMNEPLkByZO66kxAqsrH8XAACAABYsFlv12Wup/ocAAAWEFgwWKnw+woBIAAQ
-EDD6sjgAFQA2oPoSAiIAAFmwWWxILH0DKsUoZSRhjRD9RhYgABAQMNEPAACTECqyo/xcAAIAAFiw
-WW/DZKLPGt4o2yDTD/qijyIAAGFwWW++Za5C+hwAAAUQWDBYqdf7CgEgABAQMPqyOAVYADag+hIC
-IgAAWbBZbC4sQHP/AgAAAqFvEGSlOooT+woFIA0QYDBYqbLSoNEPkxAqsqn8XAACAABYsFlvqGWu
-svocAAASEFgwWKnBZKPFK0By/wIAAAQUquD6EgIiAABZsFlsGSxCF4sQ+0YWLAMAUzD8RhcgABAQ
-MNEPkxAqsqf8XAACAABYsFlvlGSiRBrd+dsgDwIA+qKhIgAAYXBZb49lrk76HAAADhBYMFipqGSj
-YfoSAiIAAFmwWWwDK30CKrUUixD7RhYgABAQMNEPAJMQKrKZ/FwAAgAAWLBZb39kokca3eTbIPqi
-pSIAAGFwWW96ZKPUGt3f2yD6opMiAABhcFlvdWWt6focAAAHEFgwWKmPZKL8K0ByZLeTGt3VixL6
-ot8iAABhsFlvbGWm9itAc8DIDLsCK0RzixD7RhYgABAQMNEPAJMQKrKv/FwAAgAAWLBZb2Fkog8a
-3cbbINMP+qKRIgAAYXBZb1xlrYL6HAAABhBYMFipdWSilStAcmS3Gxrdu4sS+qLfIgAAYbBZb1Jk
-pysrQHMsCv0MuwErRHOLEPtGFiAAEBAw0Q8AkxAqspf8XAACAABYsFlvR2Sh1xrdrNsg0w/6oosi
-AABhcFlvQmSjKhrdptsg+qKrIgAAYXBZbz1krD8a3aLbIPqisyIAAGFwWW84ZawswKX83aUQMBBY
-MFly/xrdmosS+qLNIgAAYbBZbzBlpOSLESuyEguZUsiZaJIH/wIAAgEWnmCNEYwQK9YS/EYWIAAQ
-EDDRD5MQKrKH/FwAAgAAWLBZbyJkoYsa3YfbIPqiiSIAAGFwWW8dZayI+hwAAAIQWDBYqTdkoZsa
-3X6LEvqi3yIAAGGwWW8VZaxnihP7CgIgDRBgMFipFtKg0Q8AAAAAAAAA+hwAAA8QWDBYqShkoWL6
-EgIiAABZsFlrg4sQLH0CKsUV+0YWIAAQEDDRDwAAAAAA+hwAABEQWDBYqRxkoTItQHJk1acpQHP/
-AgAB/gL6UP8CAAH9/v5Q+hICIgAAWbBZa3EtQhjDsPzdZBwDAFdw/UYYIAUQUDBZcruLEPtGFiAA
-EBAw0Q8AAPocAAAKEFgwWKkGZKDaLkBy0w9k5Qf6EgIiAABZsFlrXy9BNv8CAAoBDFPQihP7Cgog
-DRBgMFio49Kg0Q8AAAD6HAAAFRBYMFio9mSgmvoSASIAAFkw/BICIgAAabBYqHuLEPtGFiAAEBAw
-0Q8AAAD6HAAACRBYMFio6mSgaihAcmSEqxrdMYsS+qLfIgAAYbBZbsdlosArQHP9EgAgARBgMP1G
-FioJAGbw+0RzIAAQEDDRDwAAAAD6HAAAARBYMFio2MqiGt0gixL6ot8iAABhsFlut2Wq74oT+woB
-IA0QYDBYqLjSoNEPwKX83SIQMBBYMFlyesAg0Q8AAAAAAAD6EgIiAABZsFlrJPsKMCIAAGqw/N0Z
-EAUQUDBZcnD6EgIiAABZsFlrHf8CAAQBigagxy/RDwAAAPocAAAIEFgwWKi4+woBIAAQEDD6sjgA
-KQA2oCxAcg8CAGTD5BrdCPsSAiIAAGGwWW6SZaLCLUBzwOgO3QItRHNlL22PEP9GFiAAEBAw0Q8A
-+hIBIgAAWTBYqK1lr5orMNlj+gYAAAAA+hwAABAQWDBYqJ5krzooQHLTD2SDVvoSAiIAAFmwWWr3
-KUIZixD7RhYoAwBWcPlGGSAAEBAw0Q/6HAAAAxBYMFiokGSvAhrc2IsS0w/6osUiAABhsFlubvPc
-4hEWALagixErshILyVHImWiSB/8CAAP/kB5gjhH8EgAsAEAe8C3mEvxGFiAAEBAw0Q9lLrmPEP9G
-FiAAEBAw0Q8AAAAAAPoSAiIAAFmwWWrUKkU2ghDyRhYgABAQMNEPAAAAAAAA9nMIAAAQWDD6PAAA
-gBBgMFlqOPoSAiIAAFjwWKjFIyqAo3MrMNnAxAy7Avo0+yrgAVwwKzTZY/j/IyqAo3MoMNnAkvoS
-AigJAEow+DTZIgAAWbBZarrDsPo02CzgAVQw/NyxEAUQUDBZcgRj+MeKEllTrfsKMCIAAGqw/Nyr
-EAUQUDBZcf6KEllTp/ysAAP9EFgw+hICKgAgXfBZbi1koarAovzcohAwEFgwWXH0xy/RDxrcjYsS
-+qLHIgAAYbBZbiRlrguLESuyEgvJUWiRCmiSB/8CAAP+/R5gHtyVA70B/hIBLAkAd3CMEC3mEvxG
-FiAAEBAw0Q+KE/sKCSANEGAwWKgY0qDRDwAAAAAAAAD6HAAABBBYMFioKmStao0R/NyFEAUQUDD9
-0hIgMBBYMFlx0hrcbYsS+qLFIgAAYbBZbgPz3H0QsgC2oIsRK7ISC+lRyJlokgf/AgAD/rqeYI4R
-/BIALABAHvAt5hL8RhYgABAQMNEPABrcXIsS+qLPIgAAYbBZbfJlrUWLESuyEguZUmiRCmiSB/8C
-AAP+mh5gEtxmiBH+KoAiCQAS8PKGEi4AIHHwLeDZwPH8EgAsCQB/cC3k2fxGFiAAEBAw0Q+KE/sK
-CCANEGAwWKfi0qDRDyMqgKNzKzDZwMEMuwILC0crNNlj90EAABrcO4sS+qLHIgAAYbBZbdJlrMSL
-ESuyEgvpUWiRCmiSB/8CAAP+WZ5gHtxHjBEDvQEO3QL9xhIgBRBQMPzcQxAwEFgwWXGPixD7RhYg
-ABAQMNEPIyqAo3MrMNnAyAy7AgsLRys02WP21gAAAAAAAPZ1CAAAEFgw+lwAAIAQYDBZaZ7BYPoS
-AiIAAFlwWKgqKzDZBrsC+jT7KuABXDArNNlj9pyKE/sKByANEGAwWKev0qDRD4oT+woQIAwQYDBY
-p6vSoNEPihP7CgogDBBgMFinptKg0Q8AihP7CgkgDBBgMFinotKg0Q+KE/sKCCAMEGAwWKee0qDR
-DwCKE/sKEiAMEGAwWKeZ0qDRD4oT+woRIAwQYDBYp5XSoNEPihP7CgYgDBBgMFinkdKg0Q+KE/sK
-ByAMEGAwWKeM0qDRDwCKE/sKBiANEGAwWKeI0qDRDwAAAAAAAABsEAQkIhArIAfTD/RAQ2ogAVww
-LDAQLTAR/jASLYAEOyANzAL9MBMtgAQ7IA7MAgjMEQ3MAmjAHykiEv3b7xAUAEJwDZ0BLSYSLkAF
-LwqVf+FNwCDRDwAAKDAUKTAV+jAWKYAEOiAJiAL5MBcpgAQ6IAqIAgiIEQmIAv4KgCF0ADogKSIS
-eJcnwKX829wQMBBYMFlxJsAg0Q8AAAAAAAAA+kwAAAYQWDBYxEHAINEPAI0n/9kUL8AQQDD60gkg
-QAJjcAjMAfzMQCCAAnvw/9UUIYACUrD61gkqAAXikCnRFaqamtkd28fZoPANBwAEEGAwbcoCAElh
-GNukmKCPIPj/EQAEEEAwCP8Cn6EtMBQvMBX5MBYtgAQ/YA/dAv8wFy2ABD9gCd0C+Nu3HYAEP2D4
-pgIsCQB/cP2mBCAQAmDw8QwWADACSrAACYooIhKPIg6IAvgmEi7zALfgAioC+7wYIgAAYLBYWqNj
-/t0AbBAGJCIQL0By+wqVIABth+Ac26KNII42LzEL+DAfIAUQUDD4FgAgMBBYMFlw5SQiGCwxC4gs
-hUeJSvrbmRgAIGIw+CYMIAAQWDD1Ug4gMACScPtGFCwJAFZwnUrwAAlgABBYMAAAK0IU+zwgKgAg
-WXBZaOUuQhQtMQuu3S1GFCpQBCxQBftQBiuABDqgDKoC+VAHK4AEOqD424MaCQBasAilEQlVAvzb
-gBQAQEVw9VwDL/wQQDD4VQEAMBBYMPoKBSIAAHFwWXC+KSITKDELK0IU+YgIAGACeXD4JhMghgR6
-8MAg0Q8AACpABXuh8xzbb/0iACACEFAw/kIAIDAQWDBZcK/6TAAAAhBgMPwkZSABEFgwWMPLwCDR
-DwAAAAAAAB7bY41KDt0B/UYKIgAAULBYvWf6LAAAABBYMPwKACACEGgwWAGxwCDRDwBsEAYc21mN
-IPQiByAFEFAw/jIFIDAQWDD1BUcAARBAMPRJFCH8Anlw9BYALgUAfjBZcJCJIvfbRBCvADZg/wIA
-AgBRGWCIJ4yI+oEVL8AQeDD5ggsgQAJyMA/uAfuJFCoAIHKw+qxAJgCN5lApCqD5uwgIACBPMPuF
-FCoAis6Q/wIABgCP1lCZiNnA8AcHAgAAQzDwCKAAChBQMABIYQBIYQBIYQBIYQBIYQBIYQBIYQBI
-YQBIYR/bBm2qBQADhgBJYZ/AjiAd2yn47hEAChB4MP3GAi4JAHuw/sYBIAAQEDDRD8Ag0Q8AKCAH
-GdrvCAhB+jIFJ8AEOiCpZiliOiSsHwREFHSTay5iOWTgZfAHBwIAAEOwbUkCAEhhG9rom+CJIPgy
-BCBAAmDw/drnECACW7D95gIpgAQ+YPrmAygJAE0w+eYBIgAAULALgAD0ZjkiOgA5YIon+woKIAAQ
-YDD6rCAgChBoMFhSFNKg0Q/AINEPANog+4wYIgAAYLBYWe9j/rnAsJuL8/7+YgAAYnAADK0M/e0M
-AOAQeDCv3Z2IY/7mL+xAn4hj/t4AAGwQBIcnH9rlKnkU+XEVL8AQcDD4cgggoBBoMPxyCyoAIGqw
-+3wgKgA71lAOuwGrmfmcQCDcBEMw+nUUKgAgajD6k2pyAAAyMHmhdJp48A8HAgAAObAAR2EAR2EA
-R2EAR2EAR2EAR2EAR2EAR2EAR2EAR2EX2qyXYIUgk2X0ZgQgChA4MPLazxWABD1g8mYCJAkAPXD1
-ZgEiAAARsNEPwCDRD8CAmHvz/6NiAAAzMAiaDPq6DADgEGAwrKqaeGP/jCy8QJx4Y/+EbBAEx48I
-WAMIOAIISAOoaPBxBAIAIECwAiIYojLRDwBsEAQEOAMIWAOoaPBxBAIAIECwAiIYojLRDwAAbBAE
-BDgDCFgBCEgDqGjwcQQCACBAsAIiGKIy0Q8AAABsEAQFSAMIOAEIWAOoaPBxBAIAIECwAiIYojLR
-DwAAAGwQBCMiECsgBygwBf0KiyCSEEgw+wtBAFYISjAsIGT+CoAgQAhrMCkiEnifFXCfF3+WSB7a
-kw6eAf4mEiAAEBAw0Q/AINEPAPzajxAFEFAw/TIAIDAQWDBZb8ovMAUoCpV48d76PAAAAhBIMPkk
-ZSABEFgwWMLkwCDRDwCNJ//ZFC/AEEAw+tIJIEACY3AIzAH8zEAggAJ78P/VFCGAAlKw+tYJKgAF
-4pAp0RWqmprZHdpq2aDwDQcABBBgMG3KAgBJYR3aR52gjCDH//jMEQAEEGgw/6YELAkAazCcoSgi
-Eo8iGdpe+aYCKAkAcjD4JhIvUQC34Nog+7wYIgAAYLBYWVLAINEPAGwQBBPaXwMiAtEPAGwQBicg
-B4giGdon9SIQJiABPDD1gn1rwAQ54AmqCCiiOv8CAAQBOcYgJKI5+NosEmgANSAmIhIsIgn7Igom
-CAEwMAhmCiZigPy7DABgAjGw/wIACgEENtArIBYoCv94sQ36IAcgABBgMFhY1mSiOS8hBxfaEQ8P
-SvvaQB/ABD/g/NoRHgkAP/CfQP0iACBAEHAwnkP8RgIgBRA4MPjaEQoJAF9w+0YEKgkAOrCaQSki
-EighGv/aMhAwEFgw+Y5ACEoBTDD2mREPoAQ7oPtGBS4JAEuw+EYGLgkAe7CeR4wpKiIV9swID+AQ
-SDD8JgkqACAysPomFSYAzs0QjzT82iAQARBAMPn8ASAAEHAw+Y44AgAAUfBZb1YW2gv5TCAvgBBo
-MPAGBwBAEHAwAElhAElhAElhLUQh/kQgIAAQSDApRCcpRCYpRCUpRCQvUhIPixQvRDsrRDoLixQr
-RDkLixQrRDgqIhYqRD8KihQqRD4KihQqRD0KihQqRDyNNBjZ9fxMKCD/EFgw+tn/EABwg2AtPBgA
-DYgADIorRDAqRDH4RDIv/xB4MC9EMy9SEo5fjTT82fUQABAoMPgiFiAFEFAw+BYAIDAQWDBZbykF
-jRSMNCVEIyxENy1EIgyMFCxENgyMFCxENQyMFCxENPAGBwCAAlkwAEthKiAHCgpBG9mpDKoRq6on
-pjkrIBYpCv95sQr6IAcgMBBgMFhYU440aOAniif7CgQgABBgMPqsICAEEGgwWFDgKyISLPp/DLsB
-+yYSIAAQEDDRDx7Z0C0iEg7dAi0mEmP/yAAAAAD6LAACAABZsFhYeWSt7WAAJo5fGNnBse7+Vg8o
-CQBDsChEMwiIFChEMgiIFChEMQiIFChEMGP/HMAg0Q/aIPwsAAAwAlnwWFilwCDRD9og+3wSIgAA
-YLBYWKHAINEPAABsEAQrIhQqIhMFA0f7qgwCDgA44GSgcywgBxvZcwwMQQzJEfghBygAIF5wLZI6
-CAhK/IgRAroBO2Arkjke2XAd2Yr/2XEQTAA24PzZohgJAHIwmLD4IgAsCQBusP22BSAIEHAwnrP/
-tgIgAhBwMPiPEQgJAGIw+LYELgkAd/CfsS6WOS0iFKrdLSYUaTIOwCDRD4kiypJoMjHAINEPiif7
-CgEgABBgMPqsICABEGgwWFCS0qDRDwAAAAArzBj6LAACAABgsFhYbWkyzYwn/ckUL8AQcDD6wgkg
-QAJbMA67Afu8QCAgAmtw/cUUIeACUrD6xgkqABjakC/BFfnZRRoAIFPwmsmZoIggwJHy2XMZgAQ6
-IPKmAigJAEow+KYBIAAQEDDRDxnZOpmgiCDAkfLZahmABDog8qYCKAkASjD4pgEgABAQMNEPbBAE
-LCBkKAqO/wIABgBcRxApIAUd2WD62WAQqgA2YCsiEg27ASsmEo05LiITKzEL8woAKABeapAqIhH7
-7ggAmhB4MP4mEyDZADagLqAF+AqbIPwEe7D5CpYg7ARDsPsKiyDcBEuwe8lmjKx9zwPSMNEPiKvb
-MPwKACACEGgwC4AAKyIUKiITGdlFC6oMK61A/NlEGgAKXlB6wwzzJhEgABAQMNEPAAAA+iwAAAAQ
-WDD8CgAgAhBoMFv/f/MmESAAEBAw0Q/AINEPAAAAAAAAAP2iACAwEFgw/NkzEAUQUDBZbmLzJhEg
-ABAQMNEPAAAA/NkuEAIQUDD+IgAgMBBYMFluWioiEC2gBS4KlX7RtcDy/yRlIAEQWDBYwXXAINEP
-2iBYuxZj/1hsEAgrIGQoCo54sQ0pIAUd2R302R0QCgC2YMAg0Q8AACwiEvkiESwJAGsw/CYSIHIA
-tzCOLI82JTAg+Pr8IIsQaDD1CkUAjgRz8CoiECigBSkKlXmBw8DC/CRlIAEQWDBYwVnAINEPAPSS
-hGBAAlDwiZeJnvmcMCAGEFgwwCBtuQUACoYASWHRDwAAAAAvMQr/D04AMRA4MP/8AyAhEDAw+P8B
-BgE2btD/6QgAJRBoMPkmDCgJACMw+CYSICgEMrB9oQx3oQnCkv8CAA4B/kqQLzAwKDAxDwIA+TAy
-L4AEP+D02OseCQBH8PgwMy+ABD/g/NjmHgkAT/AI/xH4QoMuCQBH8PRCky4BsGfQD35Y/wxFD6AE
-O6AOzAKsiAmIEahEJEyALkAFKAqa9CYRJgGRR5AoCpv5CpYmAYvHkPwKiyYBh8+Q+AqZLgGD4tD/
-AgAOAY/DkP8KBCYAZLaQ/wIABgBg7pArMEIsMEAuMDwoMEEpMD347hENgAQ7IPgwPiwJAEMw+TA/
-LgkAS7D4zBEPgAQ7oPgwQy4JAEOwC8wC+MwRD4AEO6D57gIMCQBDMA7JDPsiECAAEqJgJbITDwIA
-flEIBegMZoACLrYTLrIUfOEIDskMZpACLLYUi0wPuwL7RgwgogRqsP8CAAYAsj6Q/wIABgETNpDC
-wv8CAAYBSWaQLRAQZN4RikcpPCD6og4gAxBwMG3qBQIJhgBKY8Ag0Q8rMCPAwQvLOStEQfsUEC//
-mmqQLTAh0w9/16ooMEIrMEAsMDwtMEEuMD34zBELgAQ+4P0wPioJAG7w/jA/LAkAczD4uxENgAQ7
-IP0wQywJAGswCLsC+LsRDYAEOyD+zAIKCQBu8Ay+DPoiECAAESOgLaITfNEIDc4MZuACLKYTLKIU
-e8EIDLgMZoACK6YUKzA4LDA5/TA6K4AEPuAMuwL8MDsrgAQ+4A27AvpCDCuABD7gDLsC+dhvEAIC
-WvD7JhYqCQB6sJpMmUtj/xMAACkiGImXKzELiZ6/uwtLS/W9eWBgAkpwY/0PAAAAAAAA+AoDKHwB
-ZDD/AgAP/sZOECgwJCkwJf0wJimABDogCYgC+TAnKYAEOiANiAIIiBH5iAIACAJr8PP9XW4FAEdw
-ACkwIf8CAAAAwOJQKjAkKzAl/DAmK4AEOqALqgL7MCcrgAQ6oAyqAgiqEQuqAmWhVyswTCwwTf0w
-TiuABD7gDLsC/DBPK4AEPuANuwIIuxH6IhAqCQBm8GS8oiyiGf8CAAv+Tl8QK0YSLjBILzBJ+DBK
-L4AEO6AP7gL/MEsvgAQ7oAjuAgjuEQ/uAi5GFC0wNC4wNcCA+TA2LYAEP2D/2CocCQB3cP4wNy2A
-BD9g+EYVLAkAT3D4RhMtgAQ/YP9GCywJAHdwnU1j/ecoMDgpMDn6MDopgAQ6IAmIAvkwOymABDog
-CogCCIgRCYgC/9gYEAICQjAoJhafS2P9tQAAAAD9QgAgBRBQMPzYEhAwEFgwWW04wCDRDwDz/K5v
-6hBgMPzYDRIAAGuw/kIAIAIQUDD1FgAgMBBYMFltLmP7uwAAKjA4KzA5/DA6K4AEOqALqgL7MDsr
-gAQ6oAyqAgiqEQuqAvnX/RACAlKwKiYWmUtj/UUAAAAAAAD0IhggABBYMCsmEWP9MQAAKiIQY/tu
-AABsEAYqIgcmIAcPAgAoqRQGBkHzogkh4gA2IAUIR/WiDiIBahog/NfpEDAQWDD9ogIiAABwsP8i
-ACAFEFAwWW0J/NfkEAUQUDD9MAAgMBBYMFltBCQwISoKBfQERgAwEFgw/NfcEgAAaTBZbP4b14sM
-ahGrqiiiOv8CAAQBL8IgKaI5ZJJUHNfUJiEHJyAHGNeK+9fSEAC1hSD/AgACAKqBIP0KACQApoUg
-LyEI9gZKDgIBODD67hAHwAQ5oPcHQQYJAHGw8HcRBgkAWbD2lgAuCQA/8P4iACAwEDgw95YDIAAQ
-MDAmlgUmlgf4lgIuCQBn8P+WBCIAAFjw+O4RAAQQeDD8lgYuCQB7sP6WASBAAmJwAguGAExjAAuG
-8AygAAQQWDD42BEAAhBgMAyIAiiWCfgFFgCAAkpwAElpBgWGAElnBAWGAEll+6Y5IFACUPBZbCcV
-16P6FgAvwBBYMPf6liQAUwUg/wIAAABjhSD9IgwvlxBwMC4kBSNSivckBSBgAH9wKyISLjIkC4pE
-+qoPAAAQYDD+qgoAARBoMPqiACvwAVwwWE5B9iYSL8AQWDCOJ5Ys/CIAIEACa7D25RQsAEBfcPtS
-dCCAAmtwneid6fvLDAAAEGAw+jIRIAEQaDBYTjIuMhKw7v42EiAAEBAw0Q8tUAJj/rDz/h5gABAY
-MPP+pWCCEGgw/Nd3EAUQUDD9EgAgMBBYMFlskooq/BIAIgAAWLBZbAHz/0JvwBBYMACNN4w2+iIK
-IgAAcLBYI3iOEPzXaRIAACKw/UIAIDAQWDD/QgogBRBQMFlsgo9MI1KK90QFIJQA//CLQIlHlkws
-UnT6+sAgQAJCcPaVFCgAQFIw/LsMAIACQjCYmPiWCSABEGgw+jIRIAAQYDBYTgMsMhKwzCw2EvP+
-wm/AEFgwK0ISLjIkC4pE+qoPAAAQYDD+qgoAARBoMPqiACvwAVwwWE32JkYSY/+PiyLKsf0yACAF
-EFAw/NdBEDAQWDBZbF3AINEPLCBACMwQnDBj/SQAjjDaIP3XOh74AXAw/iRAIgAAYLD9NgAgMAJZ
-sFhWA2P/ugBsEAaJJy4gByiZFPUKRwwgAXAw9pIJIV0ANiD/AgACAK6aoC8gQQzHEfMKBCAAEGgw
-+woAIVIAt+AY1s6odyhyOv8CAAoAw54QKXI5+pwAAYUANmD7FgAhoAC34CQhBxnXFR3XFf4lQAVA
-ASAw+lUQBcAEOSD41scUCQApMP8hCCQJAGkwJKYA/SIAJQAEPyD4pgIgABAgMPSmBS4JAC/w9KYH
-IDAQKDD1pgMuCQBP8P+mBCACEHAw+N0RAAQQeDD5pgYsCQB/cP2mASBAAkqwAgaGAEljAAaGAElh
-CL0R9db3HAkAd3Atpgkjdjn4IgwvlxBgMCwkBfNSii+WEEgw+SQFIFYAfjArIhIuMiQLikT6qg8A
-ABBgMP6qCgABEGgw+qIAK/ABXDBYTZckJhKLII4nlCwsUnT/+sAgQAJrsPTlFCwAQH9w/LsMAIAC
-a3Cd6f3mCCAAEGAw+jIRIAEQaDBYTYkiMhKwIvI2EiAAEBAw0Q/z/qNgABAwMCggQAiIEJhgY/6b
-iJ4tgAQrgAX6gAYtgAQ/YAvdAviABy2ABD9g89agHAkAV3AI3REI3QID3QEj3GfzQxQAiRBYMPP+
-d2AIAhjwAAAAAAAA8/58YAAQSDAAj2DaIP7WvR74AXww/yRAIDACWzD+ZgAiAABgsFhVhcAg0Q8s
-3Ej73GciAABwsPtLFAIAAHmwWWunLiAHixDz/kVsIAFwMABsEASJJy0gByMhByiZFA0LQfySCSNA
-ARww9IE7Y8AEPOAFCUf+1k0SAK4aYAy6Ea6qLqI6/wIABACUw6D5ojkuAgFoMPjWlh6gBDug/9ZL
-EgkAdPD+CjAhCQA2YAgzApOQiCD/lgIgBBAYMP6WAymABDog/taJGAkAGjCYkfghCCAAEGgw/yBB
-IAAQIDD0lgUrAAQ+4PSWBygJAFow9fDvaAkAcjD+lgYlgAQ/YPiWBCACEEAw+5wgJAkARXACDIYA
-S2MADIYAS2GVmRXWdSOmOfwiDC+XEHgwLyQF81KKL5YQcDD+JAUgVgB/MCsiEi4yJAuKRPqqDwAA
-EGAw/qoKAAEQaDD6ogAr8AFcMFhNFyQmEosgjieULCxSdP/6wCBAAmuw9OUULABAf3D8uwwAgAJr
-cJ3p/eYIIAAQYDD6MhEgARBoMFhNCSIyErAi8jYSIAAQEDDRD/P+xWAAEGAwAInA2iD41lQY+AFM
-MPkkQCAwAlrw+MYAIgAAYLBYVRvAINEPKiBACKoQmsBj/pwA8/8RYIkQaDBsEASKKo6vGNZH+CYL
-IEACSLD55gAgcAJ6sP8mCCIAAFiw/iYJIAAQYDD5pg8vmBBAMPgkBSACEGgwWFU4wCDRDwAAAGwQ
-BBvWOCoxDNMPK7J/HNYT+TAQIBYQIDD7ox9wABAoMHyhF/osAAIAAFlw/DwAAgAAaTBYuirAINEP
-AGiRQWiSIWiUCcBA8//ZYAAQKDB8odF7q87aMFi6V9Wg8//EYAAQIDD8oQdwFhAgMHujAmAAAcBA
-2jBYum3z/6dgABAoMNowWLp99awAACIANqD81hYQBRBQMP0yASAwEFgwWWsq8/9/YAAQIDAAAADz
-/3RgDBAgMGwQBCkwE/SQa2D4ECgwaJEDwCDRD4Qn0w8PAgCEThzWBi0wEShNBClNAy2U/P4wEiAF
-EFAw/oTdIDAQWDBZaxX7PBgj/RBQMPwwESoAIFEwWLp++kreKgAgLPD8MBIqACBRMFi6evosAAIA
-AFkwWLqCwCDRD4QnDwIAhE4c1fAtMBEtRAL+MBIgBRBQMP5EAyAwEFgwWWr/+zwYIcgQUDD8MBEq
-ACBRMFi6aPoqqCoAICzw/DASKgAgUTBYumTAINEPAABsEATzixQC2BAoMKUlI1R/+1R+IEAQUDD6
-VHogABBIMPlUeyAHEEAw+FR8IEMQIDAkVH3RDwAAAGwQBI84/NXPEAUQUDD9MBAgMBBYMP/vUQIA
-AHPwWWreKTAQ+JELYAMQEDBokj3AINEP2jBYuxD4Cgcv8wA2oIuni74sso4MmVb8fVgOAAvOEH0g
-D/u9AiAAEGAwWLrbwCDRDwBYukXAINEPABLVt4M2IiJ/CTMRoyKCKoIoLiIS//qMIIAQGDD/JGQg
-SgBjsIon+woEIAAQYDD6rCAgBBBoMFhMjisiEiz6fwy7ASsmEown/skUL8AQeDD6wgkgQAJrMA/d
-Af3cQCCAAnOw/sUUIYACUrD6xgkqAAXqkCjBFaqKmskc1WHZoPAMBwAEEFgwbboCAElhG9U/m6CJ
-IP/VkxAAEEAw+JkRAAQQWDD4pBIoCQBecJmhLiISjSKfovilCC4JABuw/iYSLwIAt2ArIAf7C0EC
-AABQsPu8GCIAAGCwWFRHwCDRDwAAbBAEiC4jLDhziQXAINEPAACLLoiz/EwAAgAAaXD7vOAiAABQ
-sAuAAIwi/SAFL90AtyBk39WOLnPp1mP/zQAAAGwQFisgByUWFvMWGCIAAEkw+RYJIAEQUDCaHhPV
-aiYSGP0SFiogAVwwKxYVh2X4YgQj/xBwMPoxZCzgAWww9mEPJh8BPDD4xRQMCwFAMPwWGSQKAUAw
-+loMCg8BNDD7FhIr4AFQMPoWEyAYANYwBgtJmx1gAAGeHS4SGC0WFA8CAC/hPSjgHSgUAC8WES7i
-H/4WDyIDk4NgiSIPAgBll9/8CgAgTgA14PwWECAJADXg2lBYvKvzCgAgABAwMC4SGdpw/QoDIAIQ
-YDD+3DkCAABZMFi8mf8KDyYAIDKw9RYILgAoN9CUFwZFFPAASGACAilwKBIRZIcXKRIYiZV9lqcr
-EhGMH/0cAAABEFAw+hYQIgAAUXBYvMFmp0z7CgMgABAYMAqzOmQ3NvUWCCAwEDAwBkUUlBckEhUf
-1MEMRBEPRAgsQjr/AgAKA8OvEClCOfacAAeEADZgKPJKZIdcKfJJ+BIJJ1YANmAuIBQO6If+JBQs
-A76ToCkSGSwSE/sKAyAMADZg/wIACAPf4tBkMH+NF2TQAmQwZPtsAAIAAFCw/AoDIBgQaDBYvNGO
-Hf8SCCX9ADTgGNSo/NUEEAAQSDD5pgIoCQBD8P4SEi8ABD+gmaP5pgQgHBBYMPmmBS4gBDug/+4C
-D7AEPOD4pgAuCQB7sP6mASAFEFAwWWoEKhIU/wIAAgOVGqDAICVGOdEPACsSEGSwcvtsAAIAAFCw
-/AoDIBgQaDBYvLIsEAAW1OYf1OeOGCZizBnU5vwfFA4JAHuw9sYLDsAEP+D5/wIARAB/MIwfK23/
-LRIRKLI/K7F9nqCfoZ2inKObpJilYAAWAIwfLRIRK2EFiGOeoJ+hm6KYo52knKUmrBgtEhKMHQLd
-EP0WCi0ABDsg/BYLJTsAteAa1G2IGMDw/xYFIAIQeDD/FgYoCQBSMJgc+2wAAgAAULD8CgMgGBBo
-MFi8iSYSGIkVjxaGZf0SGCG2ADZgBh5Q9itQCBMBMDD90gQsFAEwMPXMEAhABDog87sQDiAEO6D7
-1LQeCQBbsPwSDCgJAGIw/KYALgkAQ7D7pgEj/xBAMJii/qYFLSABbDCdpB7Uqp6j//z/IDACMrD/
-FgYgAgJKcPkWBS90ALfg+2wAAgAAULD8CgMgGBBoMFi8ZR7Un/sSCiADEGAw+RILIBgQaDD2Egwg
-ABBAMPamACIAAHqw+/r/KAkAXnD7pgInsAQ44Pj2BCIAAFCw+PYFJgkASbD79gMuCQBxsP72ASAw
-AlvwWLxPHtSL/xIMIAAQYDCcEZwSnBOcFJ+gnKL8pgQgEAJYcPymBS//EGgw/aYDLgkAcbD+pgEg
-IAJocP4SGCAwAjKw+hwEIBgCYHBYuwPAgfqKOQIAABqw2aD6FhwkHQA04CQWHSUWHvsKASAAEFAw
-Cbo48xYfLWoANqAT1G8pEhmEGBvUbPwKASIAAFJw/BIKKgUASzCIG/VqACgwBD5g+rU5CAkAZnD4
-mAIICQBNcPkWFyQJAEVwJRYaFdRZ+QoDIAIQQDD+RBEIBQBScPgWGyQJACkw8ADMYAAQKDAAAAD8
-EgwuLQEwMPb9QAoWATQw9ghQCwAEPuD5iBENwAQ/YPjdAggVATAw9O4RCPAEOiD+3QIOGAEwMPru
-EAgJAFow9ptQDAkAR3D4EAAqsAQ+4PvuAgtgATQw/KYAK0AEPuD+3QIOFwEwMPnuEAiABDog+9Q0
-GAkAWjD7pgEsCQB3cPimBSACEHAw/tQ2HAkAd3CdpJ6jGNQymKJj/gUAAJmhlKCcopyjnKT8pgUg
-ABBYMJumm6ebqJupLRIbsVX2rCgmARptUPtsAAIAAFCw/AoEICgQaDBYu+L0UExpsAQ9YCsSGv8C
-AAAAqIVg+5kCD/8QYDD1f6doCQAecI0TLBIYjhKPEYvMLMIQmaGbqfSmACAAEEAwmKKYpp+jnqSc
-pZ2njBScqGP/jy0SGSwSFxvUDQyZAvTQiGgJAF5w/vr/ICEANeCZoZSgnqKeo56k/qYFIAAQaDCd
-pp2nnaidqWP/ViIWICYSGCUWIiMWIS5iGixiGy1iFStiGShhOSNhOC9hOiViFvJiFyMABDzg8xIh
-LgkAH/AmYTueo52mnKSbop+pmaGUoJWnkqjyEiApAAQ6IPUSIiYJAEGwlqVj/vgA+/r/ICEANeCZ
-oZSgm6Kbo5uk+6YFIAAQQDCYppinmKiYqWP+0iIWICISGC4iGIwsKCIULyE5LSE7KyE49iE6LwAE
-P+D/EgQsCQB/cCIiEJ6knaX8pgcrAAQ+4PimCCYJAFmwlqmZoZKjlKCCEp+mkqIiEiBj/oAAKBIZ
-LBIXG9PJZIBj/JkCD/8QcDD0cCFoCQBecJmhlKCeop6jnqT+pgUgABBoMJ2mnaedqJ2pY/5GLhIY
-IhYgLeISLOITK+IYiO2G7i/iFILvLuIRnqKdo5ykm6WYppann6mZoZKolKAiEiBj/hEAACsSGsff
-+5kCAAAQYDD0cBtoCQAecJmhlKCdop2jnaSdpZymnKecqJypY/3jmaGUoI4T/xIBIAAQQDCYopij
-mKSYppinmKifpZ6pY/3CKhIYGdOc0w+KpSMSHyUSHvQSHSAOAE6wZHB3HNOXixgMuwIrlvpj+eGD
-HsDS8/n/YgUAP3AAwKX805AQHBBYMP5eEQIAAGlwWWiPY/jEAAAAAAD6EhMgABBwMJ4RnhKeE54U
-WLn6JBYdJRYe8xYfLDUANqD6EhMgABBYMFi57CQWHSUWHiMWH2P8GY8fZfjiY/iPGtNNiBgKiAIo
-lvpj+WkAAAAAWLnvyKkb03XTDyuwgGSwXSoSE1i55fkSHCvNALag+hITIAEQWDBYudgpEhxj+7cA
-AAAAAAAA8/hZYDAQMDD7EhEiAABRcPwSDyIAAGhwWLrJY/icAAArEhiMGf0SFiIAAFCwWE8a0qDR
-DwAAAAD601wRQRBYMFlGefsaQSEAEGAw+tNXHAkAYrBZRnlj/4AAANog+wocIgAAYLBYS+lj/7QA
-AAAAAPP4fGAAEEgwKxIV2iD7vBgiAABgsFhL4WP/lAAAAAAA/SEJL/AQQDD6IBUoAEBDsAjsDCwk
-FPwSDiAAEFgw9KoQDYAEP2D4lAMsCQBXcPuUACwJAGdwnZEs9klj+EiKJ40ZLAoA+qwgIgAAW3BY
-SgTSoCVGOdEPAPP4RGAEEBgwbBAEFNMNgiAkQn8T0ywEIgwDIgLRDwAAbBAMGNL7KYKTKoKLKI32
-KIDR9AqAK5AEOqD/hwx4ACBWcPAACWQAICJwJCqApJQY0tLwCAcCAABIcABJYQBJYQBJYQBJYRnS
-3CpBKxvS8x3Spv/TFRDkBEqwjiD9FgIgBBBgMPsWBi+ABDug/xYALAkAY7CcESlABwkJQQCZEQmp
-AguZApkUCOowHNMI+BYFIAAQeDCfFysgNQPuAv4WCyACEGgw/RYJKgkAZvD7FggiMgA84PpMAAIA
-AFhw/AoEIAIQaDBYRdjRDyssNvwKBiB0AlBwWWAFY//ZAAAAAABsEAQoIAUtIAfBlP0MQQ4AeMoQ
-iSJlkL8uMAH8yxEAFABvsCogTmWhZhnSc6m7L7I6/wIAAgBtw+Aqsjn/rAAA2gA2oCySSmTApSqS
-SWSgnywgFAzEh/wkFCoAaxcgGtJ1FtLcJyEk/glBCAIBaDD6iBANAAQ+YPzS1hwJAEdw+CEJLAkA
-bfD3ISIsCQA3cJ3whiD5MQEgAhBoMPn2BCYJAGXw+PYDJ4AEOaD39gImCQBpsJbxjDOc9fAKFwAw
-AkvwAAmKBQlH/bY5IgBVmmDAINEPAAAAAAD6LAACAABY8PxMAAIAAGlwWE5x0qDRDwDaIPsKHCIA
-AGCwWFFkY//X+iwAAgAAWXBYT7fSoNEPAPP/KGAAEFAwAAArzBj6LAACAABgsFhRWWP/rAAAAAAA
-/iEJL/AQMDD3IBUmAEAzMPbNDAAAEEAw/SQUIAEQaDD0dxAPgAQ7oPakAy4JADuw+KQALgkAa7Ce
-oS2WSS4wAS0gB2P+54on+0wAAgAAaTD6rCAgABBgMFhJX9Kg0Q8AwLgLmwKbImP/PQAAbBAGKCAF
-JiAH9zwAAgAAWPD5ChQgAxAYMPYGQQ4A18oQBQhH9dIOEigAOiCMIvTAf2vABDmgwCDRDwAALSId
-ZdGZiif7oggvwAQ5IPyhFS/AEGgw+aILIEACerD4qRQsAEBv8P0WASwAIGsw/MxAJgC73lCuiPil
-FCoAIFuw/hYCKgDVVxDJevm8AAAYADUgjRJtSQUAB4YASWEq8gAPAgANqgj/AgAGAOhmkJrwY/96
-paouojpu4xAsojkY0gse0l/90fUQFgC3INog/CwAADACWbBYUQbAINEPAJjAjyD4/xEAARBAMPjG
-Ai4JAB/wn8GPsy7ifw+PFK/u/sYDICACSzDwDRcAABBAMP7STRAQEHgwsYjyGR4B9AI+IJ/HnsgY
-0daYxo0gCN0RA90CnckjpjkrIAaKJ/zR0hABEHAw/SICIAICWvD7JAYgQAJSsPupBC/AEEgw+KIB
-KABATrD+3QIAgAJKcP0mAiBgAlrw+6UEIaACQjD4pgEqABTKECmhBaiYmKGcgIsg+tIuG4AEPuD6
-hgIqCQAe8PuGASAAEBAw0Q8c0becgIsg+tIlG4AEPuD6hgIqCQAe8PuGASAAEBAw0Q8AAAAAAPos
-AAIAAFlwWE8d0qDRDwAY0hvwADZgihBIMMDgnqvz/j1iAABacAAY0hYpUiCIgCmQB/kWACAAEFAw
-C4AAihCJEwqZDPjSDR4tADZgK4KC+RYDIagA/vBj/hoAAAAAAPvKDAA3ADXgCkwU/cwIIgAAQfD9
-TTYCAABK8NMPbdkFAAiGAElhiRGqePxODACAAkpwbekFAgiGAEljjRKMEQrdDK3MLMxAnPBj/bOO
-ES7sQJ7wY/2pAABsEAqIJ4kiLCAHKoEV//rAIEACQjD8SxEIAEB6MPs7CAgAIEKw+IxAIgAAKvD8
-DEEKAh/C0C5QB/XRaBIAAFlwDM8R9uwDIfwCa7D0kApuACAv8MAg0Q8AACjyOrbn/wIACgILPhAp
-8jn6nAAEEwA2YChSSmSD5ilSSWST4CwgFAzOh/wkFCoCCJcgGdGkiDSMIBXRzh7RWPjMEQAAXSYQ
-LSAHwWjzISQgAxBAMPSxASwCAWww97ABLKAEP2D+pgIsCQBPcP2mACgJAEMw/dFqHAEBODD4pgEg
-ABA4MPamAyACEEAw8A0HACACarBtigIATWEtIQkpIAf0pgkgOhBAMPemBS9gBDsg+QxBDUAEP2D+
-3QINAAQ7IPw8AgwJAEdw/aYGLAkAKzCcpCkhCfosAAAAEGAw/rEBIAAQaDD5CgMrQAQ+YPn2OSoJ
-AEbwWE6MwCDRDwCJJyiRFfX6wCBAAkpw+RYFKABALnD4FgIoACBKMPW8ICCAAkIw+RYIKgAExVCI
-EghVDPlSACACAkNwCMgCmBb4CoEo+AFMMPcWASA2CEJwGNGKiRaZofimACH+AktwCRkUmaJgAA+I
-FhnRhZmgmKGIUQhYFJiiJTIGGdGCGNGCBSUUKZKA+BIFJABARXD1ggEoACAucCiBBSmmAykSCCgW
-A/mICAAEAkkw/JkRAIACQjD4FgkkACBNcPkWByoABsVQKBIDJxYBCFUM9xIHKAAgbTCymQyZEfeZ
-DAAgAkKw9JBHZ8AEP2CYFIgZpXn/AgAKAQDKEIkUBYwMnBAMTBRtyQUABYYASWEM2AyMECkSCArM
-CPmcQCAgAmMwbYkFAgmGAExjLCIACMwRGNFU/QoBKgAgUfCdpvimBCAEEEgw+NFQGAkATzCZpYyz
-KIJ+HdDcDIwU/IgIAAAQSDD4pgcgIAJisPANFwBAAlKwsZnyGh4B9AI+YBrRRf7GBiAgEGgwnceJ
-NI2z+NFDGABAVnD60T8c4AFsMPUyBSyQBD9g9zIGKAkAbnD6MgooCQBWcJnII7AJGdE3+LALJgBA
-RfAtsAj5sAokAEBNcPSIEALABDzg9TMCBAYBbDD3VRAIYAQ+YP1YFAgJAEZw8YgQCAkALnD10NAW
-CQBF8PfGCigJAB5wmcmDtZPL87IGLIABbDDzxgwsgAQ/YPmyByoAQCqw+cYNKgkAarCazoi0mM8j
-sAH/AgAAAE380CggBxnQ4ggoQPWxASigBDog+iEkKAkASjAoxhCGIP0KGCIBARww+dCwEAMQQDD+
-xhIngAQ5oP3GEyYJAEGw9sYRIKACazDwCQcAAhBAMPYSASAAEEgwbYoCAE1hLSAHJyEJwYr5xhUv
-YAQ44P0NQQdABD3g/tDyFgkAdfD1xhktAAQ/YP2tAgYJAEXw98YWLAkAd3AtxhQm9jktsAeKJ/Td
-CAAAEGAw+9wAAEACUrBYR6rSoNEPAAAA+RIELjQAN2DTD23ZBQQFhgBJZWP+G9og+wocIgAAYLBY
-T4DAINEPAAq1DGP7vgAA8/vtYAAQSDArzBj6LAACAABgsFhPeMAg0Q8AAAAAAAD4IBUv8BBwMPMW
-Ci4AQHMwDsMMIyQUIyEJ/pQDKEAEOiD4MxEAARBwMPgKACIJAETw+JQAIgkAdPCTkYMaLlZJY/uv
-AGwQBiggBSwgB8Dz+QoULOABLDD8DEEOAM7KEPX6wCIsADtgiCIb0DX0gHJrwAQ7IMAg0Q8AiieL
-qCahFfmiCyBAAjqw/akUKABAKfD4FgAmACBBsPZsQCYAtl5QDEkRqd39pRQqACBacPkWASoAs9WQ
-yTf5vAAAFQA1II0RbUkFAAOGAElhKnIADaoI/wIABgDINpCacPP/iWIAABrwq6ouojpu4xUkojkY
-0Df90IwQARBYMPVAFmAgAkkwK8wY+iwAAgAAYLBYTzLAINEPmECOIAjuEftGAi4JAHuwnkGOMy3S
-fw6OFPzQFBwAIHdwnUP90AoQABBAMPAMFwAQEGAwsYjyGR4B9AI+IJxHnUYZ0HSZSIggCIgRD4gC
-mEkvpjkuIAaKJ40ise7+JAYgQAJSsPypBCwJAF9w+KIBKABALrD+oQUggAJKcP0mAiBgAmMw/KUE
-IaACQjD4pgEqABdKEPnP8BgAIEOwmKGZgIIg+CIRAAAQSDD5hgIiCQB4sPKGASAAEBAw0Q8AABnP
-5pmAgiD4IhEAABBIMPmGAiIJAHiw8oYBIAAQEDDRDwAAAAAAAAD6LAACAABZcFhNS9Kg0Q8AwLCb
-q/P+V2IAABpwAAAAAPtqDAA3ADTgCk4U/ewIIgAAQPD9TTYCAABK8NMPbdkFAAiGAElhiRCqOP5N
-DACAAkpwbdkFAgiGAEljjhGNEAruDK7dLdxAnXBj/nWIECiMQJhwY/5rAABsEAYsIAcUz7IMDEEM
-wxGkMygyOv6DOmADECAwKzI5yr8f0DEd0DH6IgAgABBwMC4WAC4WAv0WASAAEGAw/QoFIB4QcDBY
-Sev0NjkgABAQMNEPK8wY+iwAAgAAYLBYTsHHJNEPbBAGKCBwwFT0z5kQ0AB2MCsgBwsLQQyzEaQz
-KTI69CIAJKwBOmAqMjlkoEvbQFjNZsDB/QoAIAEQcDD4z8IQABBIMPkWASAAEHgw+RYCIgAAWrD4
-FgAiAABRMFhJzSU2OSogcCsK+wuqAfokcCAAEBAw0Q/AINEP2iD7vBgiAABgsFhOn8ck0Q8AAABs
-EAQrIAcYz3YUz/wLC0EMsxH0Qn8iACBE8CgyOv6CQ2QAIFkwKjI5y6gESwL8CgAgAhBoMP4KAiAQ
-EHgwWWNYwIH+z+8fgAQ9IP6mAC4JAEfwn6GNIJ2iwML8NjkgABAQMNEP2iD7vBgiAABgsFhOgcck
-0Q8AAABsEBQuMBD3CgcgARBoMPrPVhAAEDAw/woYIisAN6D/AgAABBQHoGjiA8Ag0Q8rIAcFCUfT
-D/kWGSogAVww+xYaIjQCOmAsIAX/AgAIBWZDIC4gcv8CAAIFYPuQ2iBYS8tlp8yPImX3xyohGow1
-/SIQKfAEOqD+IgkqAAjiEA4JQsiW/wIAAAXah1ApEhoazzYMmRH6zBcoACBWcApKFCkWFfmSOiAY
-EFgw/L0wAAYCQrD4FgwgDgJZMPgWCyoFL95QKxIVK7I5/wIAAAUoquAoIgoNCT4OiAz5FhcqAD5K
-EC0gIikgIw2ZDP8CAAAFZCpgKCAHHc+mCAhBDYgJL4HmCf42Dv8ML4XmLSAiLhYHDd6H/SQiIAVa
-K2AYz5wogn+OK/CBBAH+Antw8P8aAAEQQDAAiBr4jP8uACB7sP8iCS4JAEOwniooEhcP6Qz/AgAK
-BULGUC0iEC8gBxjPBw8vQAr/EPghBy4JAEfwn7AvIQn+IgApQAFAMPkSDCjABDogCP8C+CEkL4AE
-O6D+ISIoCQB2cJ+zmbEfzv0Zz32dtf/PfR4JAHuw/rYCKAkASjCYtCggOJy49rYHIAIQSDCZufnP
-dRBHEHAw9rYLKAMBQDD+CgEmBQBHsP62CigFAEfw+DwQKAkAPnD5tgYgYAJK8G2pBQAIhgBJYRnO
-45m8iDD/AgACA92qEC0SFYwbLNY5KyAUKhIXpLv7JBQgFgA2oCgSF48pLiA4qP//JgkiBKp7kCkS
-Gf8CAAIElxpgwCDRDwAAACggBy4wESwgBYki/ntACCABQDD4FhooAuKbIP8CAA3ABDog/wIAAgRC
-KmCqzC/COsGK+xYWKgRax9ApwjksFhXfkPycAAAEWCpgKKJK/wIACgQ5QiArokn/AgAOYAFwMP8C
-AAAEL6rgnxqbGZwYKDAUKCQ4KTAVJiQ7KSQ5iTaIOCglCSklIog5iTopJSQoJSOJPIg7KCUlKSRM
-KDINKCRNKDIRKTIQKSUoKCYVLSUpJiROJiRPJiYbLSYXLSYYLSYZJiYdLSRzLiQ6LiEaJiRwJiRy
-9iRxKALp8dApCgL7IDgv/BB4MPMWHS4AQH+w888aEdgCe/D5twEOAA7O0P4ISAABEEgw/pkUCAUA
-QnAJiAgOiBEI/wwPOCz+CgEgBBBIMPvO5BgAQE7wDzMu+ek5AgUAH7D4bAACACBE8PnOnRgFAErw
-B+c5+/z8IgAAcbD5IBQuBQA6cPP4HA4JAEOwA7Mc+CU0KwAEPuDzJTUjAAQ/4PvrAg4JABuwni8u
-Ehb7JhAoACAmcCkkFPMSHSVjADegHs5rjBoYzrMrIAckFh6PKf8mDCQCAVgw/TIOJKAEOSD9Fg8k
-CQBBMJTAJCEI+CIAICAQaDD9xgMqIAFcMP7GAisABD7g+I0RAAMQcDD+CgEsCQB3cP3GASyABD5g
-+0QCDAkAd3D7IgsgABBwMC4WEJbFm8mfyBvO1P3GByAUEHgw/xYGIBYQaDD9FhgoCQBaMPjGBiQJ
-AFkwlMT0Eh4gARBoMPYkFCBgAmMwKyAH+M60GiABXDD5zsUQKAJa8ACxBADXGvkyDyYJAE3wJxYS
-J4YwF86/KRYR+cwAAgAAcfAsFggCDoYASWMADoYASWEsIDn6CoAiAABJsPhsAABAEGgw/A5AAgAA
-ebD+3zgAAhBYMP4gOCwAQFsw/Kg4ABAQaDD4/wICAABRsP4sQAIAAEGw/Lk5CgBAX7D+DEAKBQBb
-cP0KACAgEFgw+xIIKAUAYvD8zqAeAwFwMPoiACgJAFIw/BYALgkAS7D9FgEgARBgMPj/AgAAEGgw
-+7wgLgkAe7D87hEABBB4MP8KAC4JAHuw/hYCIAAQcDBYSEbAwf/OjhIAAFqw+iIAJAAQSDD5FgAg
-ABBoMPkWAiAAEEAw+BYBIAEQcDBYSDosEhH9Eg8iAABasPoiAC//EEAwmBAuIST/ISUtAAFsMPwM
-SA1wBD9gDcwC8P8RAAAQaDD8FgIuCQB7sPwKAS//EHgw/hYBIBoQcDBYSCfboPoiAC//EGAw/BYA
-IAAQSDCZESghIikhCcDQ8IgRABwQcDD4mQIP/xB4MPkWAiABEGAwWEgZKhYTKiEoWUyP/c5gEgAA
-YrD6IgAv/xBwMJ4QLhIQLdCMG85b/t0CAf4CYzDy6RAMEAQ/YPnMEQgJAG5wDJkCC5kCmREoIhUZ
-zlP/+v8gHhBwMPhoFAAAEGgw+xITKAkASjD4FgIgARBgMFhH/hjOMC8SEg8CAP+GMCIAAEqwBgeG
-AElnBAeGAElliTD/AgACASwqUBzN8SchBy4SFf0SGCAQAkswKpKRLeY5LSIALMJ+LiAMKyAV/yAH
-LAAgazD9IA0tkAQ7IPwiACoAIGKwKhYUL6QHLqQMJ6UHLaQNJzIJK6QVKZIcKzIR/TIQIBQQQDAo
-pAUsph73pQkgABBwMP2lKCD/EHgw+2sUAAEQaDD7EgkoACBecP2lKSfgATww96UjIAEQaDD5phYi
-AABh8FjLZiwSFPbEFCIAAFnw/MAVICAQaDBZGP4tEhb3EgYiOAA3YC4gOsD//wIABgEZ/5ApMFfE
-gAmIDJgdwNH/Cv8gABBwMPwhCSIAAFqw/BYOIgAAULBYy1EmJBSLHiwgFY0dWRjrwLyKJxzNkYqu
-8AwHAAEQSDAASmEASmEASmEASmEASmEASmEASmEASmEezWAtEhYr5kknJAX5JBcgKwA3YC8gOsCP
-ePEeGc1nKDBQCYgKKIIQ/DBXIKACWPD6LAAAAhBoMAuAAAUKR/8CAAIBkxqgwCDRD/osAAIAAFjw
-/EwAAgAAaXBYSXfSoNEPAAAABQtH+xYZIjQCOuArIAXBxP8CAAYAzGbQbrhjLSByft9d2iBYScdl
-oGSOImXgXyggFKSIKCQUjzB69kMqIAcYzTgKCkEMpxGodylyOv8CAAQBhUJgK3I5ZLL/LyBx3DD+
-CuoiAABQsP/mOQIAAGkw/woBIgAAcbBYSYjAhCh2OSkSGf8CAAIBXZpgwCDRD/osAAIAAFjw/EwA
-AgAAaXBYSU3SoNEPAPzNtBAEEFAw/SIAICoQWDBZYoyMGC4hGvP6FWABEGgw/DwAAgAAaTD7rCAg
-ABBwMP8KASIAAFCwWEluKhIYtKoqFhhj/YUAAB7NpCcSGh/NoS7ggABxBPDXGgADEFgw+/SALuAB
-PDD++DNyAABbsMef+M2aGBEAT/D5EhouAEBLsAiZChjNbCiWmRnNkw5+Ag4OR/6UgCE6ADbgZOE9
-wYP4FgYgARB4MP8WECAAEHAw/hYPIBMQWDArFhhj+tUAAPP+C2AGEFgwxJCZHWP90wCOHPkgcSIA
-AGDw+iwAAgAAaTD4CuogARB4MPmGOQ/ABDug/mwACgAgdvBYST6PHLT/nxtj+BKMJyjJFCfMIPSA
-5mBgAkswjskokgD5FhsgABBgMPmNDAGQAkIw/Yw5D8AQaDD04FdsAEBt8J0UKRYbiXB+kUgt4ADB
-hHjRfcGVedF4wYZ40XN/0XDBmXnRa8GKeNFmiBQt4AcpcQWZFfiZCA3ABD9g+ZxALgAga7D560Fy
-AABrsP7cAA+2ALdgyc7+EhsgLRB4MC3AAH/RLIjOwMD46QwBkAJCMAmMOWXP5ywgTvkKFiIAAGmw
-8AAMbAUAZnCNFQ3tDGP/ui0kcWP9oGTuyfAABmABEEgwwJAfzUAu8tLHjgjuAQ6eAi720mP+qwAA
-AAAAAPP/HGAAEHAw+iwAAgAAWPD8TAACAABpcFhIx9Kg0Q8A2iD7ChwiAABgsFhLumP/18Ag0Q8r
-EhraIPu8GCIAAGCwWEu0Y/0AACwWFfP3TmAAEEgwKxIa2iD7vBgiAABgsFhLrGP/oYon+0wAAAAQ
-YDD6rCAiAABpMFhDxdKg0Q8Aiif7TAAAABBgMPqsICIAAGkwWEO/0qDRDwAA2iBYSG1j9qeKJ/tM
-AAIAAGkw+qwgIAAQYDBYQ7bSoNEPK6wY/CwAAgAAULBYS5Nj/SIrIAX/AgAB/joG4MDCDPwCnCJj
-/GWOKZ4q8/V1YgAAe7CPFyogBx7M7A/bDPskIiogAVAwDq4JLeHmr90t5eYtICLM14wpnCpgACkA
-ABnM4imSf44r8JEEAf4CQ3DwiBoAARB4MAD/Gv/8/y4AIEOwD+4CniorrB/8LAACAABQsFhLcWP7
-9AmsDPP0SGHQAmMwAABsEAQYzI2JICuCfviCkyAQEGAw/CQFKAAgXnD5mREAABBYMPskFCgAIEow
-+4QUIgAAULBb5obRD2wQBBnMmIoyKZJ/CaoRqpkskAb4kgIgABBYMP36/iALEHAw/pQFIf4CYzD8
-lAYoAEBqMPiWAiIAAFJwW+Z2wCDRDwAAbBAGiCIqIAeHMJUS+gpBAAAQMDD1gZxm4AE8MPoWASD0
-ADXg+3wBIgAAULBZXpf1+o0gALUuoPIWACC0ADXg93IJAgAAMPD3PBAjwAQ4oPAAHGIAIBiwaYEG
-ihCLZVjKKWagtyZsMPd8MCYAQhWQKGAQyI5ogTlpgukoYBFlj9ZgAFgAKGARyIxogRpnr9R1odFg
-AIYAAIoQ+2IFIgAAYfBYymJj/+SKEItlWMpbY//aKGARyIpogRhnr6d1oaRgAFmKEPtiBSIAAGHw
-WMpXY//mihCLZVjKUGP/3IoQ+2IFIgAAYfBYygxj/3QAAACKEPwK/SAAEFgwWV+o9voAJgBmrpCI
-MAaIAZgwYAANAAAAAAAA8hYAIgAAUbCHERjL4Qx3Eah3KXI68hIAJACaQmApcjn7nAABNQA2YCmC
-SmSRDimCSWSRCCwgFAzEh/wkFCwAmRMgAzwC+g5HAgAAaTD/CgEiAABQsFhILY0S/Q1HAAQQcDD+
-djkiPAA7YCoiB/tMAAAAEGAw+qwgIgAAaTBYQwjSoNEPwCDRDwDHtPIWAC//vNqQ2iD7ChwiAABg
-sFhEx/osAAIAAFjw/RICIgAAYTBYR+XSoNEPAACMEgwMR/nCcmAAEBAwiBCIh42I8oEVL8AQWDD5
-ggsgQAIqMAtbAasi8ixAJgBk7lApiRQMRxH9eggIACA+cPmFFCoAZtSQyTXJQ9nQbUkFAAOGAElh
-ilAPAgAPAgCnqv8CAAYAhhaQi9D6VgAqAEA28PvWACAAEBAw0Q+MMAbMAZww0Q/aIPsKHCIAAGCw
-WESdY/9SghDz/s1gABBIMAAAixHaIPu8GCIAAGCwWESVY/80AAAAAAD+IQkv8BAwMP8gFSYAQDMw
-Bs0MLSQU9P8QAAEQaDD2lAMvgAQ7oP8KAC4JAHuw/5QALgkAa7CekS2GSWP+k4uQwKD6hgsqAEA2
-8PuWACAAEBAw0Q8AAAAA/SoMADYANOAKTBT+zAgiAABA8P5ONgIAAEtw0w9t6QUACIYASWEKOAj8
-TwwAgAJK8G35BQIIhgBJYwp4DPvSACgAIELwKIxA+FYAKgBANvD71gAgABAQMNEPAAAAAAAA+9IA
-IIACSvD5VgAqAEA28PvWACAAEBAw0Q8AAAAAAABsEAQoIAXNjioiByuiDC2pFP6iCSBgAkqw/LzI
-IA4ESvBlwAPI3cjr+iwAAAAQWDBb5ZDRDxzL4B/L3/n6/yAQAlqw+aYAIAAQQDD4JgcqABHX0CjC
-fS3Cfx/L2JuBn6Muwn2eovvGfSACAmtwLcZ/0Q8vwoApwoIuzQKb8Z6jLcKAnaL7xoAgAgJKcCnG
-gtEPAAAAbBAEHMtyGsvJLMJ8K6LHo8wJzBGsuymxGsDy/pQKYAAQaDAttRpgAAJokxAusRoP7gIO
-Dk/+tRoiJgA/oPosAAAAEFgwW+Vm0Q8AACyhcIqwDKoMWMm9Y//iAABsEDIuIAcfyxQODkEM7RGv
-3SjSOvIWUSBKEEgw8xYmKggEThAl0jktFlD2XAAACAKpYI9I88uoH/8QaDD5yxYQIBBYMP/yUAAA
-SAPQ8AkXAGACeHAAD4oACY0AsASPSZ8eKkIQLEIRLBYQCgobmh8oQhIpQhMpFhIICBsoFhGMTI9N
-LxYUDAwbLBYTiU6KTyoWFgkJGykWFYhL+BYXIMACSHAACYotFhstFhwtFh0tFh4tFh8tFiAtFiEt
-FiItFiMuFi0oMkApMj8pFhkoFhpgAFEAAAAAAADx+QcAYAJ4cABPYQBPYQH5iyhCCSgWFC9CDS8W
-FSxCDCwWFipCC/oWFyDAAnhwAE9hAE9hLRYhLRYiLRYjLhYtKTJAKjI/KhYfKRYgK/r/KxYj+xYi
-IGACUHD7FiEgwAJYcFjJhC8xa9MP96wACAcz/pAvMXR/ogwoMXWviP8CAAwHKkKQWMnA9/r0IAdy
-KqD1FiciAABQsFjJliUxdKWl/wIAAAd6LWAfyvwv8nwuMsn4yt8eACB9cPwSJi+QBD/g/+4IAAEQ
-aDAt5RovQSuVwS8WQhzLSyZCGiNCGCdCGS5CFCtCFylCFikWRfsWRCgAQEOw+BZGKngBcDD6FkMu
-fAFwMC4WKykWAvoWACIAAGlw+xYBIAUQUDD4FgMgABBYMFlgChzLN/nLOBAFEFAw+RYBKOABEDD4
-FkcgABBYMPgWACAgEGgw8NAEAgAAcfDzDRsCAAB5sFlf/MDy/RIrIAEQSDD7CgAggBBgMPx8AQIA
-AFLw/Jw5CgUAUnD8qgICBTuDYCkWNiIWLPgKCiH6AmNw/I04AAAQcDD+FjMgABBgMPwWNCAAEEAw
-KBY1GMqfwMH4OAEAABBIMPnJOQgFAEMw8ssSGAkASjD+CjcgBSaqIADgBAMJGwkJQykWNwCEBPc+
-GAAEuSWQBlhQ+BZILBQBMDD8FkkiBJixkIkkCYlB+RZKIASX0ZAGzEH8FksiBJ+1kIwkDCxB+QoB
-IBAQQDD4eAEAABB4MP+fOQgFAEJwCP8C/wIAAAT3q+AfyoT/FjggABBIMCkWOQbJUAn4EwmIAv8C
-AAAE8Cog/8pSEAAQQDAoFjovFjsG31AP+RMPmQL/AgAABOiqYPjKdRAAEEgwKRY8KBY9BuhQCP8T
-CP8C/wIAAAThK+D5yt0QABB4MC8WPikWPwa5UAn4EwmIAv8CAAAE2aogLRYr/8pcEAAQQDAoFkAv
-FkHwJAQAEBBoMPQWViAgEHgw8hZVIAAQQDD8FlcuYAFwMPwKASAAEBAw/hYpIgAASjD0ypAeAEB9
-8PLCOQ4FAH8w/y8CAgAAWjD0NAEIBQB7cP/KvRQFACMw/QqAJAkAETD9CggqBQAncP8/AQAEECAw
-+woGKAkAWjD/zzkEBQBS8PsSSCpXATAw8v8CA2QBGDD0IhEIBQB/cPkSSSQJAEkw/cqaGuAEOqD4
-EkokCQBBMPe7EQlgBD5g/W0BCAkAXnD7yqIZAAQ6IPlEAgoJAFIw+PgTAQAQSDD7EjkoBQBu8Pc5
-GAQJAEkw/RJXKCABTDDxxAQJQAQ+YPc/GAgJAE0w9PQTDoAEP+D4EkskCQBBMPL/AggJAFZw+hI4
-L/8QEDDyFgAsoAQ/YPISVS4JAHuw/hYCL/8QeDD+Ej4qCQBqsP39EwgwBDog+hI1KAkAVnD9Ejoq
-CQBu8PsSRyQJAFkw+PgTCAkARnD9mQIL4AQ6oPoSPCgJAFIw/RJAKmAEPuD4EjYkCQBBMP4SPyoJ
-AHKw+hI7KAkAVnD9Ej0oCQBucPkWASnQBDog+hIzKAkAUjD5ymccCQB3cPgSQSQJAEEw+aoQAAAQ
-cDD9RAIKCQBasPmIAgQJAFEw+xInJAkAQTD0FkwgABBoMPQSViIAAFFwWEP6KxI3LBIrKBJM8WQE
-DgoBNDD3PRgAIBBwMPDgBAAAEEgw/Q1FDuABMDD/+v8oBQB/sPgIGw58ARgw8MwRDWAEP2D8uxAI
-CQBucPy7AgAAEGgw+O4QDbIBGDD4FgIsQAQ7IPjKPxwJAHMw+BYAIAIQcDD8CgEqCQBm8PusAAgJ
-AF5w+RYBIgAAUXBYQ9cmEikvEkP9IgYgARBgMPgSQiIAAFqw/vr/IgAAUXD+FgAt4AFsMP0WTSkA
-BDog/RYBLgkAR/D/FgIgBBBwMP0KAC//EHgwWEPF/AoBIAAQaDD+CgYv/xB4MPsSRiAAEEgwDwIA
-+xYCIgAAWrD5FgEv/xBQMPoWACIAAFFwWEO3/RJNL/8QeDD+EkQv/xBgMP4WASIAAFqw/BYAIgAA
-UXD9FgIgARBgMP0KACAIEHAwWEOq+BI0IAEQYDD9CgAv/xB4MP8WACAKEHAw+EkUCoAEPiD7mQIK
-QAQ+IPuIAg//EHgw+RYBIgAAWrD4FgIiAABRcFhDmi4KDP/6/yIAAFqw/CICL/8QaDD9FgAgABBo
-MP0WAiIAAFFw/IxSAAAQaDD8Fk4tAAQ7IPwWASABEGAwWEOKx7/7FgAvABBIMJkRiSP4Ek4gARBg
-MP0KACAOEHAw+QlPD/8QeDD4CF8JQAQ+YPmIAgIAAFqw+BYCIgAAUXBYQ3ooOv/9EkUv/xBgMPDE
-BAIAAFqw9z4YAgAAUXD8FgAvIAFwMP4WTyABEGAw/O4QD2AEP2D9bVkOCQBH8P8WAiwJAHdw/RYB
-IBAQcDD9CgAv/xB4MFhDZMBw+xJPL/8QGDD8CgEgABBoMP4KEiAAEEgw+RYBKywBXDD7FgIv/xB4
-MPusAA//EFAw+hYAIgAAUXBYQ1XAwf0KACAUEHAw//r/IAAQSDD5FgEv/xBAMPkWAiIAAFqw+BYA
-IgAAUXBYQ0r8yagQFhBwMP36/yIAAFqw/RYAIAAQUDD6FgIv/xB4MPwWASIAAFFw/AoBIAAQaDBY
-Qz3Awf0KACAYEHAw//r/L/8QSDD5FgAgABBAMPkWAiIAAFqw+BYBIgAAUXBYQzL5rAAFtwA1oP8C
-AAIC14Gg/wIAAAMjhaD/AgAEAx+FoCcWGPcWGSDAAlhw87YCIP4CaHCTs5O0k7WTtpO3k7iTuZO6
-k7v+yNwQEAIycPycICBgAlJw+BIsIIAQWDD7mwgAoAIYcPsWMiACAltw/cjVFDIANiApFigoEi32
-yS4SAAB5sBfI1/5SEQggAUAw+BZSIgkAMLDyFlQngAQ5YPIKACAEEEAw+AoDJgkAQbD2FlMiAAAy
-cG2Kc55gKRJT+WYBIgAAS/DwBxcAgAJ78AAJisKYmWUpElIoElT4ZgYpsAQ4oPjJWRgJAEZwnWT4
-mQIAAgIQsPu88CIAAELw+WYHIgAASPD0CBYB4AIY8PjMAACAAjGw8AikAIACYzDyCRYCAABCsPAI
-ogCAAlKwGMlA+xIoIPAQYDD2CgAg4BBQMPYWGCDIEBgw87MIAAAQMDD5gosqACBS8PiCjCIAAHrw
-+RYZKgAgZvD4FhogAhBIMG2ahv72MCAoEGAw+BJTIgAASPD49jEggAIY8PAHFwAGAkGwAAmKLfY0
-+RJUI7AEOiAs9jX59jYgAgIxsP6EBmABEEgwwJAoElIImRECmQL5ySMYCQBKMC/8QPIcYCgJAEow
-+PYnIgAASvDyAhYCAABCsPAIogBgAhBw8AIWAIACWvDwCaAAgAJSsCYSKPgaQCBEEBgw8hImJgAg
-QbApQSr/AgAAAM/CUBnInSoSURzI9i5mACqiAC1mAvxmBSAIEFgw+2YDKAkATXD4qhEAAhBYMPlm
-BCoJAFqwKmYB8AcXADACSbAACYrzPAIgQAIxsItA/wIAAADPKtApIAEAmTKFIQAkBCxCGStCGP1C
-GirgAUgwKhYvDLsY/QdJCiABXDD7Fi4gGAA2oC5CFBjIbQ7PU//8/i4AQEOwD+U4KxJR+mwAAAQQ
-cDD9rFAAMBB4MPuyACABEGgwWVwmHcheKxIu/BIvIAQQSDDwDQcCAABqsABNYQBNYQBNYR7IfgC9
-EfjI1xwJAG3w+KYCLAkAd3D9pgAgEAJ5MPEPFgAgAnKwAA6KlaYoQhQMDQb9pB0ofAFAMPikHCAI
-AnDwLxJQLvY5+SQAIAAQEDDRD4ghCJhQKBZJwJD5Fkgh+2uxkAYMUfwWSiP7bNGQiCQPAgAIDED4
-GEAKBQBn8AuIAvgWSyH7ZLWQ8/bGbC4BMDD5CgEgABBAMPIWVSxgAXAw/Mz/IAAQEDD8mDgAABBg
-MAKcOPISVS//zMcQwIEoFklj/5QAAAAAAP8CAAH/VMZQG8gdKhJRLEIanmCKoP1mAiAQEHgwn2Oc
-ZfxmByoJAF1w+2YEIAAQSDD4qhEAAhBYMPlmBioJAFqw+mYBIAQCGPDz/mBgQAIxsCwSUPPGOSAE
-EFgw+yQAIAAQEDDRDwAAKRY0IhYs/PwAAAEQQDD4FjUgABBwMP4WNiwFAFLwLBYzY/WRiCUICFMo
-Fjdj9bcAwPD/FjggABBIMCkWOWP2EsCQ+RY6IAAQQDAoFjtj9iHAgPgWPCAAEHgwLxY9Y/YwwPD/
-Fj4gABBIMCkWP2P2P/0WKyAAEEgw+RZAIAAQQDAoFkFj9ksAACoWKhrH5ywWMfQKBwAAEFAw+hYw
-IOACQHAASGUayB0nIosnFh/yIowgBBBAMPIWICOABDlg9xItIgkAQLDyFlMp4AQ5YPISJigJAFIw
-+BZUJiABPDD3FlIiAABScPfHtxACEEAwbYqgLBIqIhZVnqAoElOYoSgSMfAHFwIAAEmwAAmKKRIw
-0oD4jEAgARB4MPgWMSAAEEAwCfg4+ZwBL7AEPmApFjApElIIiBH9pgQuCQBH8P/IPxgJAH5wKBJU
-mKb/CigoCQB+cPmmByIAAEsw/6YFIIACYzD8FioiAABC8PoIFgCAAjGw8AKqAeACWvDyElUiAAB4
-8PgPFgHgAhjw8AmoAIACUrAmEjLz/FpgOBAYMAAAAAD8yCcSAABasPrIJhAAEEgw+RYCIAAQaDD8
-FgAgGhBwMPoWAS//EHgw+lwAAAEQYDBYQbb+Gv8gARBgMP3IGh//EHgw/xYAIgAAWrD9FgIiAABR
-cP4WASAAEGgw/8gQEBwQcDBYQarAwf0KACAeEHAw+QoALgEQeDD5FgEv/xBAMPkWAiIAAFqw+BYA
-IgAAUXBYQZ7z+c5iAABKsAAAAAAA/AoBIAAQaDD4IgQgGhBwMP/6/yIAAFqw+QoAIgAAUXD5FgIo
-GAFAMP8WACjgBDog+BYBL/8QeDBYQYzAwf0KACAcEHAw//r/IAAQSDD5FgEv/xBAMPkWAiIAAFqw
-+BYAIgAAUXBYQYHAwf0KACAeEHAw//r/IAAQSDD5FgEv/xBAMPkWAiIAAFqw+BYAIgAAUXBYQXbz
-+SxiAABKsItJLUEW/kEXIN4ANKAcx9cpQhEqQg4vQg0oQhInFgkoFgMrFggqFgf5FgEgBRBQMP8W
-BSAAEEgw+RYAIAAQeDD/FgQgABBYMPsWBiAAEEAw+BYCICgQWDBZXIf/AgAB+Kit4CISJir6nvok
-AS+eEEgw8/sDYAAQGDAAAC0WUPPv+2AAECgwLBJR+swAADACW7BYRivHJNEPAAAA8hImIAUQUDD8
-x7MQGBBYMFlccvckAS/0EEgw8/q+YAAQGDAAAAAAAPISJiAFEFAw/MeqEBgQWDBZXGj3JAEv9BBI
-MPP6lmAAEBgwABzHpIhMj02XEvsWASAFEFAw+BYAICgQWDBZXF3/AgAB+FSt4GP/VABsEAosIAcY
-xuUMDEEMxhGoZihiOsGV/QoDKgFlThArYjn6vAACxwA24CswAxfHcfzHBxLLALbgJUIUBYhT+BYH
-LHwBLDD8VQECAMMHYMBQLUEqG8bX+cbZEAIQcDD4xwoQAInDUI8xm6CNIJel+aYCLgkAR/D/pgQt
-gAQ/YPnG1hwJAHdw/aYBIAgQaDCdo/AJFwAwAkqw8hkeAEACUrCyVY5A/wIAAACKq5ApMAEAmTIA
-JAQtQhonQhn/Qhgq4AFMMPsWCi8gAWgwnhgH/xj3MgEuIAF8MP8WCSAVADbgKEIUCMlT/IgBAfwC
-SnAJhziLIP2sUAAEEHAw/wowIAEQaDBZWpaJGIwaHcbMixkYxvPwDQcCAABqsABNYQBNYQBNYQCy
-Ef/HSBIJABJw/6YCIgkAQLDypgAgEAJxMPEOFgAgAmqwAA2Kl6YiQhQMCAb4pB0ifAEQMPKkHCAI
-Anlw/2Y5IAQQcDD+NAAgABAQMNEPAAD/xq0R/5THUChCGo0xm6CHIPmmAiwJAH9wnaSYpZin+HcR
-ABAQQDD4pgMmCQB18PemASAAEDgw96YGIAQCKXDz/upgQAJSsAD1ZjkgBBBAMPg0ACAAEBAw0Q8A
-H8cnGccnKEIW+kErIgAAWrCYFZoU+jIBIAEQYDD6FgYgCBBAMPgWAiAMEHAw/hYAIAAQaDD5FgEg
-AhBwMFhArI4XjxT9xxgSAABasPoSBiAAEGAwnBH9FgAgARBgMPD/EQAAEGgw/woALgkAe7D+FgIg
-BBBwMFhAnpUS/AoBIAAQaDD+CgYiAABasPoSBi//EEgw+RYAIAAQQDD4FgEgABB4MFhAk4sVwND1
-EgYgEBBwMPtsWQtgBD7g+xYCI/8QeDD8FgEiAABasPrKACABEGAw+hYAIgAAUXBYQIX8CgEgABBo
-MP4KACAAEEAw+BYAIAIQeDD4FgEiAABasPgWAiIAAFFwWEB6HMZd8/1xYA8QKDAAAPP9OWAAEFgw
-K8wY+iwAAgAAYLBYRU7HJNEPaLMqwZZ5sRHGuvs0AS/qEEgw8/2dYAAQKDAt+p4tNAHz/+5vnhBI
-MAAAAAAAAP00ACAAEBAw0Q8AAGwQGCsgBxfGFwsLQQy2EfpCCCYAIDmwKGI6+vdQBADcxiAsYjn1
-xsYRrgA3IC1RihnGNfv6/yEVADdg/QogIABGgpDwKRcAYAJQcAAKiiwWJgApjQDQBI9Jnx4qQhAu
-QhEuFhAKChuaHy9CEihCEygWEg8PGy8WEYpMjk0uFhQKChsqFhOPTohPKBYWDw8bLxYVjkv+Fhcg
-wAJQcAAKiisWGysWHCsWHSsWHisWHysWIClSQyhSRCgWGikWGSsWISsWIisWI2AASwAAAPAJBwBg
-AlBwAEphAEphLBYmAAmLj0kvFhSOTS4WFY1MLRYWKkIL+hYXIMACUHAASmEASmErFiErFiIrFiMo
-UkQpUkMpFh8oFiArFiMrFiIrFiH6HDAgwAJYcFjEjC1RcywSJvusAAgAWu6QKlF8/lF9LAAHUtCq
-7v8CAAwAUHLQ+yIAIbkAteDA0P4KAyIAAFMw/wogIAAQYDBZWa8YxnYpUsSPIC5BFi6lAgn/DPtB
-Fy4JAEfwn6CNTZ2ijEycoy9CGShCGPulAyCAEEgw+KYELgkAT/CfpY5Jnqb9QhogAxBgMP2mByAB
-EFAwLGY5KjQAKyAGiSKxu/skBigJAFZw+SYCIAAQEDDRD9og/CwAADACWvBYRMXHJNEPLUEWLkEX
-KxYkj0n/FiUhsQA14BzGSohOiU0qQhIrQhGbEZ8YmhMpFgX4FgcgABBIMPkWBCAAEEAwKBYG/xIk
-IAAQUDD6FgIgABBYMPsWACAFEFAw/xYJICgQWDBZWvotEiT8EiYh/38vYIcxACQE/cWvH54QcDAu
-NAEqQhT4QhkgMBB4MPVCGCAEEHAw+UIaKnwBVDD9CgEqAEBqsPhVGAH8Alrw+6c4AgAAUzD5rFAE
-IAEsMPsiACMgAUgwWVlfGMWX2aDwCAcAAxB4MG36AgBJYRjFugBZEf/GExIJAEiw/6YCIgkAQLDy
-pgAgEAJxMPEOFgAgAmqwAA2Kl6YsQhQrCmL7pB0sfAFgMPykHCAEEEgwKWY5+TQAIAAQEDDRD8DQ
-/goFIgAAUzD/CjggABBgMFlZQhnGCoggK1LEL0EWL6UCC4gM/EEXKAkASjCYoC5CEZ6jLUIQnaIr
-QhObpSlCEpmkiE2Yp49Mn6aOT56pjU6dqChCGSlCGPylAyCAEFgw+aYKKAkAWjCYq49Jn6z+Qhog
-BRBoMP6mDSABEFgwLWY5KzQALCAGiiKxzPwkBioJAFqw+iYCIAAQEDDRDxzF4igSJCkSJY9NKkIM
-KhYA+RYBICgQWDD4FgIgBRBQMFlamSsSJPwSJiH+vK7gY/53AABsEAzWMPUIRwABEDgw9QoAIgBQ
-giCJIsydKTAYZJBYaJFlaJMGaJQZwCDRDyY8GNtg+iwAAgAAYPBb+f1koGRmr+UZxREqkkpkoU8q
-kklkoUkrIBQLtIf7JBQsAKiS4Ion+0wAAAAQYDD6rCAiAABpMFg8SdKg0Q/aIPw8AAAwAljwW/7o
-Y/+z9jwYIgAAULD8PAACAABZsFv+FCswGGmzmmP/iiwwGP8CAAX/vpsgY/+MLTEWLjEXjziKOZod
-/+NQAHwAA/AcxaqTHItuj20oYhIpYhGZEZ8VlRCVEpUUmhj4FgMgBRBQMPsWByAAEEAw+BYGICgQ
-WDBZWlZgAB4AHMWdkxyIHY9tiWz5FgAgBRBQMPgWASAoEFgwWVpOjieD6P/hFS/AEGgw/OILIEAC
-U7ANrQGt///8QCYAU58QKOkUDEsRC4gI+OUULgAgGvD/AgAKAFJ30MlsBmwC+TwAABcANSBtSQUA
-DIYASWGOoA8CAA8CAKvu/wIABgBif5CeoC8SDGTwZSU0GCU0GfU0Gy//EEAwmDdj/nnaIPwsAAAc
-EFgwWEPdwCDRDywhCf4gFS/wEGgw9aQALABAbvAtpAP07hANgAQ7IP29DAwJAHMw/SQULAkAOzCc
-oSeWSWP+fI8c08D15gsvngC34MCDKDQYY/+UAADz/gwANgA1oA5PFPj8CCIAAEmw+Eg2AgAAYPDT
-D22JBQIJhgBMYw5pCP9IDACAAmNwbYkFBAmGAExlDrkMqdkpnECZoGP/QgAr3ECboGP/OWwQFigg
-BfXFShIAAElwLCAHizAlUX79Cv8gBAI5MPsLRwogAWAw9RVACBAAOiDAINEPiCL5FhUi6AC2IC4g
-FhnE/BbEf/3henABEHgwKCqgCMgdIhYi+cU3EgAgSjD+6QoIACBKMPKZCwAgAhOwACEEIoJ+IxYj
-APMa84J/IgBAGLDyxS0SCQAU8POGfygAIBZwIpJ/AOEE8P4aAAICELAiln8ogoAjEiMpFhDyEiIo
-AUXyEAzMEQbMCCzCAAzsAWTCjh7EYinggAysEabM+MI6IG4CSnAJSRQJeQmzmf8CAAoBSU4QnBsp
-wjn8nAACdAA2YC5iSmTiGS5iSWTiE/nFDxLdALVgKjAgKArt/wIABgF2RpDAnnmhCigK7v8CAA4C
-D8KQnhr5CgAgQAJ48PkWFyAAEFAw+hYYIgAAU/AYxIYZxP+OLiiClJ4cLhYSCO4MiKD5ICwoAEBK
-MC0hFwCZEfnE+BwJAE9wAAmLDm4U+AoBLAkAR3AIjmD/AgAGAVVHkMDgKiAWKAr/eKFmLhYcLRYe
-KxYhnBOfFCoSBFva7Y8ULRIeLhIcG8TnKCAHLCAW+BYTIqAQSDAJiB0sFhT4Fg8oACBaMPiCfyAf
-EEgwDJkMjBP7EiEmAbvKECkSEygSFPiIEAnABD5g+KgCCAAgNnCYkyghBxrE1fnE1RlAAUAwDIgR
-CogCKJYAGMTSKiIACOgK+IIAK4AEOqD4lgMqCQBR8PqWASAAEFAw+pUFICACQPD0CBYAIAJScABK
-ZfuWDyIRALVgKQoAKRYbKSAUCZSH+SQULAEwEmAmEhUMRRH1FhEm4AEwMPYWFiH8AjEw9RIAK8AE
-OaAqFhkexLT7zAAAABBQMPgSFiIAAEuw9gkWAAICUrDwC6YF6AI6oPv8AAIAbpog/sxAIAAQUDD4
-QhRgABAoMPgLFgACAlKw8A6oAegIMrApEhfTD2WQ6S4SGCsSGSoSG/y7CAwAIHMw/cYQIIACYvD8
-Fhog3QC2oIkxhDL2kgViAABbMPMKACIBD4ZQo3yNG/zWOSIAABFw0Q/aIPsKHCIAAGCwWELt+iwA
-AgAAWPD9EhUiAABhMFg/8dKg0Q8AAAAAKJ0CKYECLoEBKIEFCe4B/PwAC/65Q5ArrBL8LAACAABQ
-sFhC3WP/vCusGPwsAAIAAFCwWELZY/+rnBvz/XFgABBIMAAAACkSG4snLRYenBP1kiNgQAJS8IwT
-/xYEIAIQWDD8zEAiAABpMFg66owTLhIXjxQtEh71rAAPGgA3oIke+cYQIAAQQDAoxhJj/wUbxGPA
-oPoWGyfwBD3g8/6ibAkAX3AAKCAsGsOaACON8AkfCDAEOiAopiYKCYsBEGtj/QmeGhrEWIg4+cRW
-EBAQeDAvFhj/PCAoAEBSMP8WFygJAEowmB7z/RpgYAJQ8I4cKOAA+BYJIgDs4hDAkJkdKeAB/wIA
-AgECYlDAkI4dD5gRCO4CZ+0yY/vYG8Q5GsN9DDOMAAttKSAsKqIk8JEEAAEQWDDwvhoJFwFQMPju
-AQAPEEgw/wIADgCC9lAuMBD/AgACARp/kAoJQv8CAAAAhAZgK5z++goBIAAQQDALqDgoFhtj/ZwA
-AAAAAAAA/hIKL/AQUDD4IBUqAEBScAqbDCskFCshCfrkAyhABDog+LsRAAEQUDD4CgAqCQBG8Pjk
-ACoJAFbwm+EqZklj/WIAAAAAANvA+iwAAgAAYTBb0OArEhqJMfOsAA3ABDqg/LsIAf70hlD6LAAC
-AABhMFvQr6OtrX2OG/3mOSIAABFw0Q8AAAAAAPosAAIAAFjwWMJcwCDRDwAZw7giFiKIHyISFPIi
-CggAIEowCCILGMP/qCIpIX/6mQwAABBAMAiZNSklfyISImP8cgAAAAAAAPoLQgABEEgw+7z7IAAQ
-QDALmDgoFhtj/Kwew2vAgCgWG/P8oWwJAHdwAC6xFfuyCS/AEEAwCKoB+hYHKgAgU7D6rEAgQAJa
-8P8CAAoAe1LQKRIR/wIADf50gmAoEhmriP7MQCoAlkaQ+goAI/5qASD+CxYAAgJSsPAOrgHoCDKw
-Y/y8KhYdiDYpMQuZFQkPP5gWKRISCA4/iBkCGYsACYstFh77FiEogAFAMAApY/wWAyoAS0JQwIGY
-HWP99Iqi+RYIIABejpAKyk+IGAY+iwQuiwoOSfgIRAIAAEuwBhll+JMGcAEQUDDAoIkYepcI8AAQ
-YgAASrAA+AoBIAAQSDAKiTgtFh6fFCsWIfwWAy2uALZgjDL6LAAAARBYMPwMXwAAEGgwWMHqjBMr
-EiGPFC0SHvP9iW//EEgwwOEuFhtj+4MOuwxj/weMMv8WBCIAAFCw/RIFIAAQWDD+EgYt8AFgMFjB
-24wTKxIhjxQtEh4qEh3+Ig4v/xBAMJgdY/0yABrDmCkxDnqZeCoxD2P/OgALqQyZEvlJFAAAEFAw
-+RYBICEANmCIEfgLFgACAlKw8A6oAeQIQrAlFiCJESYWHyYSH4oSjhclFiD5SQwAABBYMPyqCACA
-AnOw+qxAI/2xgmD2Fh8h/AIqcPoOFgACAlrw8AqqAegIKvAlEiAmEh9j+z2IGP8CAAH+WuYQLRYe
-nxQrFiGcE/P++W8gAXAwAABsEAiVEYsiKiAH+TIAIAICYTCcFvwWBSogAVAw9bGgaQABTDAXwp0u
-ckr5FgIhwgA3oCZySfhsAAG/ADWgGcKZKZCADKURp1X/UjogbgJKcAlJFAlJCCmcBP8CAAoAvs/Q
-JlI59GFyYP8QWDAqIBb4FgAghARasCo8EFvZTCkgB/7DSBKgEFgwC5sd+CAWLgAgcvAu4n/B/wj/
-DP8CAAYBT3uQ+IwQDcAEPmD8rAIMACA/cJzTLSAE/wIAAgCyA2AoIBQIhIf4JBQsARiSIBrDPY4S
-LCEHGcJ4HcJ0++wPLUABYDD7SxQNwAQ7IP0SBiwJAGswnGD/IgAgAgJa8AtLDPjsECgFAF6w+WYC
-L4AEP+D4ZgMsCQB/cJ1hLCAsKiEXG8MpAMwR+RIBKgkAYrD7qgIAABA4MPpmBCAgAkDw+zIDKOAB
-TDD+ZQsgABBoMP1lCi8AEGAw+wpHCgBAZvD7ZgYqwAQ6oPpmByIAYZpg+WwgIB4APSCwSm2pBQAI
-hgBJYS0gBLBI/IgRAvoAO2CJMfgyAiYAIEGwmBT2bCAgAI4uYPMKACIAm4ZQo0mxmflWOSIAABHw
-0Q8AAAAAAAAA+iwAAgAAWPD9EgEiAABhMFg+X9Kg0Q8AAAArrBj8LAACAABQsFhBUWP/1AAAAAAA
-8/5BYAAQMDDaIPsKHCIAAGCwWEFKY/+3ijD/AgACAN0qkIsV+1Y5IgAAEfDRDwAA+iwAAgAAWTBb
-3Ydj/p+MJ/jCCS/AEGgw98kUIEACWzD6wRUsAEBu8P0WAynABD0g+XcMACACQjD4xgksACBusPh3
-MgCAAmtw98UUKgCqahBomzyomiqs8PxsICoAdFdQaEEcsE5t6QUACIYATGGKsQ8CAA8CAKqa97kE
-IeACUrD/AgAGANzukPq2ASIAAEKwZHD08/7LYgAAOjDaIPtsAAIAAGIwW8+HiBSJMZoX86wAC8AE
-PqD7ZggB/2iGUNog+2wAAgAAYjBbz1Wjo6NJsZn5VjkiAAAR8NEPjhD9IQkv8BB4MPkgFS4AQH4w
-/4sMAAEQYDD7JBQgABBQMPSZEA2ABD9g/+QDLAkAT3D65AAsCQBncJ3hLHZJY/2QHsJSHcKf+IwK
-DgAgcvAOzAutzCnBf/qZDAAAEGgwDZk1KcV/Y/1QCN0MDUoUbakFAgiGAExjiBOtbvpMDABAAlOw
-+IxAIB4APyCwz235BQQIhgBKZYgTKrkEDZwMDIgIKIww+LYBLw8AtqCNE8Dg/rUEIIACa3CdsZ2w
-8/73YAAQQDAKiAyYyWP+pyggBxrCBPgvQAH+Akkw/JkRDqAEP+D6/wIIACBNsJ+YjCD+wbMQIBBQ
-MPqWCyADEGgw/pYKK4AEPyD9wjMaCQBu8JuZjysrIQj6IBQoIAFAMP4iCSkABDog+AoAKgkARvD4
-lg0qgAQ6oJqfL5YR/xIGLAkAazCcnv6WECoJAG7w+5YMIAYCe/D4JBQiAAAR8C9WOdEPiBMojECY
-sWP+SABsEAQmIAf0wkwSoBA4MAdnHfIgFiQAICHwJEJ/wV8CVQx1TRYawlD8aREIgAQ4oPqZCAgJ
-AEDwmJDRDxzB+RvCRfIqCgwAIGHwDKoLq6opoX/zmQwAABBYMAuZNSmlf9EPAAAAbBAEG8IwHcHt
-JiAHJCAW88IsEqAQYDAMbB30SgoAIAIpMPBRBAIAIB8wKDJ+9zJ/IAEQEDAAKRr5iAEMACBrMPyq
-CwYJAEXw9zZ/KgAgWrAlon+xVSWmfyMygABBBAAlGnU4DxPBWgxiEaMigiACUgHRDwAlrQIoUQIk
-UQElUQUIRAF1SwPAINEP0Q9sEAYrIAeIIh3BUfrBTRogAVww9YCZZ8AEOuAt0ICqZvxiOiBuAmtw
-DU0Us93/AgAKAFPvECliOfycAACmADZgLqJKZOCBKaJJZJB7KyAUC7SH+yQULABREuAtIAT6Cv8o
-TgA7YAUOR2jiGIon+0wAAAAQYDD6rCAiAABpMFg4dNKg0Q/AINEPKyAserHWiTGcEIcy9pCgYgAA
-WzDzCgAiAF2GUCNmOWP/ugAAAAAAAPosAAIAAFjw/EwAAgAAaXBYPU3SoNEPANog+wocIgAAYLBY
-QEBj/9fz/1xgABBIMAAAK7wY+iwAAgAAYLBYQDlj/7wAAAAAAP8gFS/wEDgw/iEJJgBAPvD3uAwA
-ARBoMPgkFC5ABD/g95QDL4AEO6D/CgAuCQB7sP+UAC4JAGuwnpEtpklj/yHbwPosAAIAAGHwW86S
-ixCJMZoR86wADcAEOqD8uwgB/6aGUPosAAIAAGHwW85h8/86YgAgHrAAAGwQBBPBOSMylAMiDAJi
-FNEPAAAAbBAEIizu0Q9sEAqVEY1C9hYAIBACOTD/PAAAARAYMP8WAiYBCb9QFcEd/sFDH/0QeDDw
-IQQAABBQMPoWBCAAEGAw8DYaD/8QQDD2FgMmEQBBsIPRnRWJ0JkwiNAr3f6bFpOBI+J/nNGc0Ciy
-folCLUEM+YgRAAAQWDD3mQwCACBE8PoyAiABEEAwCYs4KUEN+xYHKgBAMrD6NgIgABAQMPVFDiCw
-ADZgiTeLnCqZFC2cMP29DAGQAlrw9KCOYgUAavCKmZoYZSBHihj1wPQQNgA2oBnAyCigABXA8AmI
-CiiCEPygByIAAFqw/QoDIgAAUPALgAAtQRErQQ3H/foWCCoALO7QzCiIGGWPuYwyYABSGcC4KCAA
-CYgKKIIQ/CAHIgAAWLD6PAAABBBoMAuAACxBEStBDcf9/LuNcgAAErCMMs3OYAEDAAAAAADz/3Rg
-ABBQMC1FDWP/TYwyZcAEZSBCz68ewWR84DLawFk/VNug8goAIgAAUPBYOXSLMooTiBaJQv8SBSoJ
-AFqwmjKfkSeGgSmGgJ9CIkUO0Q9+xx4PzAGcMokTjhaIQf0SBSgJAGZwmTKdgCTmgCjmgZ1BihfA
-wPxFDSCPALagixSxu/sWBCQYALrgHsDYjUJj/nKMQHTJT40XZNBKiBCJEo8RAIEEGMBy/MFAH8AE
-P+D+kqAuACBH8Irx+JKiIAEQWDDwuxoP/xBoMP27AwoAQGKw++4BCAkAUjD+lqAuCQBDsJ7y0Q8A
-0Q+JQHSRrfpMAAIAAFnwWMDejUJj/dtlr1aKGGWvUWP/DStBDI0Q/BIBLIAEP2D9wFYaCQBu8AzM
-Ea3Mm8Nj/2kAAABsEAgGZAoDRAuNQJMQHMBN+woBJgCwbRAZwKrwIQQAABBwMP4WAyvABDlg8LUa
-CgAgYrCaEvBhBA//EEAw8LgaBBEARXD4FgEgABAYMIfRitCacIjQIt3+LpJ/l4GT0JPRIiJ+iEAJ
-IhH0iAwOACATsJ4U/eIHIAAQODD84gIgARAQMAgnOPrSDCAAEBAw+NkULABAKzD85gIgYAJbcPur
-DAGQAlKw9IBqYgUAWrCK2dagzyLJbxnAMShgAAmICiiCEPxgByIAAFmw+hIEIAMQaDALgADWoMwt
-ZW/VixKMEYuwfLBRYAAzGcAlKCAA0w8PAgAJiAooghD8IAciAABYsPoSBCAEEGgwC4AA8/+kYgAA
-ErDz/5hgABBQMM13jBOxzPwWAyQiALsgGcBljUDz/xpgABAYMI1AdNkvHMDRiRCPEosRKJKiivEu
-kqDH3/27AwoAQGKw++4BCAkAUjD+lqAuCQBDsJ7y0Q8A0Q8AAAAAAADwYQQDwAQ5YPC9GgIAIGCw
-+RIAL/8QcDD+wL0cEQB3cIohL5KgKJKiDqoB+ogCDgBAb/D/lqAuCQBH8J8i0Q8AbBAEGMCzhSAo
-gn8UwLL4VQwCoBBIMAlZKKSULEJ/DAxf8woAIGAANyAewJcbwFUv+v/+uwgAABBoMPubCAABEHAw
-bQgXKLJ//BwUABQANiAttn+xM/TALGBQAlrwY//hKUJ+wa8Dqgz4QoAn//JSUCo8EAChBADpGg+Z
-AwmIAShGgGP/zSxCgMrEK0J+DLsCHcCSDFwRrcybwCxCgMjL2lD9Qn4iAABY8FjAQcAg0Q/aIFva
-jixCgGP/zgBsEAQTv7UjMX6iMtEPAAAAAAAAAGwQBMAg0Q8AbBAE9MBvEqAQKDAFIij4wCYUACAg
-sCRCf8FfA1UM9UUScgAgQLADNAoCQgsiLQ4iIXzRDxK/5NEPAAAAbBAE+8BxEAAQSDD6MgAgDRBA
-MPz6/yIAACiw/FQWIAAQEDDyVRsq4AFQMPOkCwGCADagKjAIGcBl/wIACgCywpAJqQqJkAqQAIYz
-9odCBuABMDD6fAACAABZsFlThhvAWidUDCZUDSihByhVB2ABMypQB/syAyogAVAwWRBsG8BSKlQW
-YAEcjDMsVBZgARSKM/8CAAQAh4Kg/wIABgCDgqBopStopyj4qCVgCRBoMP8CAA4AeOqQLlAg/woE
-IAIQQDD4VAUuCQB7sC5UIGAA0ylQIMCoCpkCKVQgYADFjDMsVRtgAL2NMy1VGmAAtSmyfY4zKLKA
-8IAEDgAgS7D5DwYB/gJzsP+ygi4AQHuw/g4ZAAIQQDAI7jf/7jYA/xB4MA/uNi5UI2AAeYozmlxg
-AHIpUCKKM5pb+lYJICoANmAtsoDw0QQB/gJicPDMGgABEGgwAN0a/dz/LAAgYrANzAKcWmAAPZpa
-YAA4jjMuVQhgADAZwBeIM/9QBygAIE4wKZCAKgr7+v8BCeAEPmD5/wIA/BBIMAn/AQj/Ai9UB2AA
-AcYquDP4Cg0v/0Sg0ClRG2WQWB6/9BzABy2yfSpQFitRGv3MNgD/EGgw/yqgIKoEarAtUAcNDUEP
-3Ryu3i7if8H/Cv8M+qkKBAAS/5Aev5+u3g6ZCymdDimRfAnPNgv/Nwv/LA+/HC9VG9EP0Q8Zv14J
-zzYL/zcL/ywPvxwvVRvRDwALyCwIuBwoVRvRDwBsEAr4IAQgABB4MPy/EBbgASgw92z+IAEQSDD3
-lzkCALwCIJca/wIAAgAAOPD/AgACAEqBoI0iLiAH9dEuaiABcDArICELGUJlkaDAlQoGRwxmEaxm
-KGI6/wIAAgCVRiAoYjmZFPgWCSEdADYg+iwAAgAAWTBb2mGJcP8CAAIA2apQKyAh+xwUAAcQUDD9
-EgooARXikMrV+iIHIPEQYDD8uwECAABpMPskISAAEGAw+qwgIgAAWTBYNinSoNEPwCDRDwAAAAAp
-IAX/AgAAAQoGYGiXR/8CAAgBWQJgHb94ZZ9SLtJ/KdJ9+NJ/JEUAN6CKkY6QnqCLkJqxn5D/lgEh
-/gJCMCjWfyud/4og+rY+IfACQnCYJy8kIC8kIfu/oxAAEGAwLCQULCQX/CUbIAgQaDAtJAUsJRod
-v538vv4SAABQsFvZuQIqAlvZmy4gIS8K/v/uAQIAAFCw/iQhIgAAWPBb/xscvrlj/skA+iwAAgAA
-WPD8TAACAABpcFg64dKg0Q8AAAArrBj8LAACAABQsFg902P/1Ikw+QlHAgCVgaCLIiogB/WztWog
-AVAwDKcRrHcrcjr/AgACAcvG4ChyOfgWBSOMADYg+iwAAgAAWTBb2gqJMP8CAAIBzipQ/wIAAgIR
-GaDAINEPAAD/AgAAAHqGYP8CAAIAh4Jg/wIAAgFyBmD/AgAEAY+CYMel+vhQAAcQaDD+CgEgABBY
-MPjrOAAFEEgw+tk7DiMAtuBj/zoqIAcZvtf9EgkoAgFQMAqIEAmIApjQiSD+vogQAxBYMPghCCAg
-EHgw/9YDLYAEOmD+1gIsCQBbMPzWASogAVAw/iILKwAEOqD6IgkoCQBSMC8gFBy/AJrY/tYJLoAE
-P+D+EgQoCQBiMPjWBCgJAGZw+dYGIAAQYDD81gUuCQB7sJ7XLCQUK2Y5Y/3FKQrxCbsBKyQhY/3M
-ZJ7VHr81A5sL+xYIIgAAOPDwAWNgCxBoMNLw0Q+OK40pftEJwIKYImP/GAAAACkK8fm5AQAEEGgw
-DZkCKSQhDKYRrGYrYjr/AgACAYXG4CtiOWSzABm/IfoiACAAEGAwnBGZEIhwLQqB+AhHAAEQcDD0
-iBEAABB4MPgWAiAAEGAwWDiJHL5AwLMrZjmIIiogBsDm/SAhIAEQSDD5iAIAAgJSsPokBiDxEEgw
-+CYCLABAT3D9JCEsCQB3cC0kIWP+ggCKJ4eo/aEVL8AQMDD7ogsgQAJysAbmAabd/dxAJgFIPtAo
-qRQMRRH3WwgIACAqMPilFCoBQ99QyTfZMPp8AAATADUgbUkFAAmGAEphK+IABbsI/wIABgFWbtCb
-4CpyAPoNRwIAAEnwbdkHLpAIaOENuJnAUZUa8/wxYAMQKDCLky36AA2qAQuqAppwKCAhKwrx+woC
-KABAWjALiAIoJCFj/819qQSIcygkFokYuHf/AgAH/rLN0CpwCGSgY2ihNGii52ijJmmp2YlzbpPc
-aZPZiyf4+sAgQAJS8AiqAf+1FCCAAlKwmrmauGP/vYlzKSUIY/+1i3P6IAcoACBy8CiAgCkK+/mq
-AQngBDog+KoCAPwQQDAIqgELqgIqJAdj/4mLcwuKQvoWBirgAVwwmxdZUeIcveQevrgooQeJF4sW
-KyQMKSQN+CUHIAAQeDDz/1lgCxBoMAAAAAAA/wIAA/6Sf1CIcC0K/Pn6ACwAQG+w+YkBCOABQDD6
-mQIICQBqMPgkByDxEGgw/b0BAAgQQDD5dgAsCQBHcC0kIWAAAYlw8/zhauABSDAp0oCIkYuQm4CK
-kC7Sgpihn5D/lgEh/gJzsC7WgmP7tSusGPwsAAIAAFCwWDzg+iwAAgAAWPD8TAACAABpcFg55dKg
-0Q8rIAcdvgX+EgUsAgFYMArMEPkhCCwJAGswnOD4IgAgIBBQMP+9tBogAVww/+YCIAMQYDD65gMt
-gAQ+IPq+NBwJAGdw/eYBKwAEPuD7IgkoCQBecI0r/yAUKAkAVnCZ5PvmCCgJAFIwmOb4/xAABBBA
-MP3mCSAAEGgw/eYFLgkAR/Cf5y0kFPx2OSP98wGgiif7TAACAABpMPqsICAAEGAwWDTR0qDRDwAr
-rBj8LAACAABQsFg8rRy9iPP722/0EFAwn6vz/aliAAA68AAAAPfbDAA2ADTgC00U+NwIIgAASPD4
-SDYCAABR8NMPbYkFAgmGAEpjKmxA/UgMCAAgXPBtiQUECYYASmULWQypaSmcQJngY/1aACpsQJrg
-Y/1RbBAEiScoIAYrmRQqnCD9kgkh/gJCMPSwfmjgAUAw+CQGIA4ANiDAINEPAAAAAAAA/AoqIE4A
-N2Ar0AB8uUP+kRUvwBB4MPpM/y4AQH6w/KsRD/AQQDD72wgOACB7sP7sQCBABEDw+dwQICACWvD4
-PBAqABjfkGhBCG2pBQAIhgBJYfosAAABEFgwW9eWwCDRDwAAAAAAAAD4JAYvigC2IGP/3g3tDCzc
-8AxMFLjLC6s2bbkFAAiGAElh/EoMCAAgG3D5/EAheAA+oC2s/23ZBQIIhgBJY2P/qAAAAGwQBIwx
-iDL6LAACAABY8PwMRwADEGgwC4AA0qDRDwAAbBAEKCAEIyAH8wNBBhAAOiDAINEPG74CK7F++ysU
-AgAAULBY2KFlr+faIPs8GCIAAGCwWDxHwCDRDwAAbBAEGL35ii4uIAccvXz5IgcgABAYMP4OQQYA
-XUaQI8J/CaQRpDOEN4ROKJkU+5IJIKcANiApsBTasP2wFSASADZgAioCW9flwCDRDwAAAAD5wn8g
-jAA3YImXL5kU/AoIIAQQaDD7kgkghwA34C+wFrD/D804H70CDOwRr8wowjr/AgAKAFxuECzCOfkK
-SyCtADcgj7EoIAUevdWesP8PRwCOBEowwJAImBEI/wKfsS6gFPigFSAVALegZICYKbAW+JE0Yf4C
-UnAqtBbaIFvXw8Ag0Q9j/1IA8/9ZYAAQWDDz/5FgBBBoMPP/u2CBEEgw8/95YAAQWDDaIFkAYWQ/
-yitAKCxAKf1AKiuABD7gDLsC/EArK4AEPuANuwIIuxEMuwKxuytEKwuLFCtEKguLFCtEKQuLFCtE
-KGP/jhy9rfymACAwAluw+iwAAgAAYLBYO/HAINEP2iBZAElkP2wtQCguQCn/QCotgAQ/YA7dAv5A
-Ky2ABD9gD90CCN0RDt0Csd0tRCsNjRQtRCoNjRQtRCkNjRQtRChj/zAAAGwQCiggBPcgByYB1Y4g
-9goAJAHRoiAFDUf3B0ECAc4DYBm9D4ouKZJ/CaoRCpkIKZAF+zEIIEIQQDD7JQggPhBQMPsgFiYB
-91ZQ+go9JgHzRlD8Cv8uAgtSUCgyCfgJQQAEECAwCUQMBARB9EwPL/gQSDAJRAH0TH8oACAiMPRE
-FABoAkIw+BYFIDQEYvD83P4gARBQMPogQSwFAGKwWDtZZKPnGbyQDHoRDwIAqaorojq0SP8CAAoB
-zkbQJaI5+BYII5EANWAYvWUuISImFgAnMgktIEH8vWAQCBBYMP4WBiAEEEgw/d0JCiABODD6mQwA
-BxBQMPzdEQggAUww+RYELAAgazD8wn8oCQBCcPokXCYAIE3w+yRkIHgCOfD8FgciAABYcPq9ThAD
-EGAw+iUqKYAEOiD4FgAgygJQsFlJ7o4XJiU1JiRo+SEHIC4QUDD6JFcgUhBYMCskBfq8ZxBCEFgw
-+yR0KUABTDD7vT4ZwAQ+YPoSBigJAFZwmVAZvSX4IgAgRBB4MP9WAyzAAXQw/o9CDgcBcDD63BQP
-gAQ/4PiIEQwJAH9w/70vGAkAQTD4VgErQAQ6oPi9FRoJAFqw+FYCL1AEO6D4IEEtQAQ7IPdVCywJ
-AHMw+lYGLAkAazD2VQopAAQ6IP9WBygJAGIw9o8UCAkASjD4VgQgkAJwsPIOFgBAAmlwAE1j+iEq
-IAAQYDAsVDEsVDL8VDMgABBYMCtUNStUNvtUNyAAEEgw+VQwIAAQQDAoVDQvVC4qVC0mVC8KihQq
-VCwuIFcuVDsOjhQuVDoOjhT+VDkguAJYsP6OFAAEEGAw/lQ4IHgCUXBZSaH2jBQAwAJAsPMIFgCA
-AklwAEmKAAiIAAmKJlRTF7wVLFRSiBT8jBQAQAJI8PxUUSCwAlFw/IwUABACajD8VFAqACBFcAYJ
-iADKigQJiACKii1WGxm8DylWGiogdCq0dIgxjBj7IQco4AFAMJgxKCAHH7xQ/bxQH8AEOSD7C0oK
-AgFAMPy7EQqgBDqg+rsCDgAgcXD0IQgqCQBu8JvgjSD55gIoIAFAMPbmBSsABDog9uYHJAkAUTD/
-5gYkCQB5MPTmBCAEEHgw+N0RADAQIDD05gMsCQB/cP3mASBAAiOwBgOGAERnBAOGAERlDI8Rp/8s
-9jkrIBYuCv9+sQgqIEEsEgVYOowmIRQjIRL0CgAgLQA1oBW8ucpi+lJ/IgAAWPD8CgAgARBoMFgy
-1ihSgPRMASACAhjwCDMudknb2iBYMF7AINEPiieLqPyhFS/AEHgw+aILIEACcrD+FgMuAEB7sP4W
-ASwAIHMw/MxAJgBiXlApqRQMSBEImQj5pRQqACBaMPgWAioAXVcQyTrJSAu5Am1JBQADhgBJYYoT
-jhIPAgCKoA8CAK6q/wIABgBzZpCME5rA8/v1YgAAGvAAAAAA+iwAAgAAWPD9CoQiAABhMP01CCIA
-AGlwWQWhwCDRDwCOImXvW9og/CwAADACWfBYOsXAINEPAAD6LAACAABY8P8KhSIAAGEw/zUIIgAA
-aXBZBZPAINEPAIgiZY8jKyBB2iD7vBIiAABgsFg6tsAg0Q+Wq/P7dmIAABpwAAAAAAD7ygwANwA0
-4ApMFP7MCCIAAEDw/k42AgAASvDTD23pBQgIhgBJaYkRqjj8TwwAgAJKcG35BQoIhgBJa44SjBEK
-7gz+EgMsACBzMCzMQJzgY/8hjxGIEy/8QJ+AY/8VAABsEAb4IgcgABBoMJ0QKiBBG7xNJyAHCqwJ
-+YkULcAEOyDzggkqACBm8PuyfyYgATww+xYBIykANmD4CkkjIQA04C4wEvsKVSMaADegKSAF/Ar/
-JgGH3lArIBb4JAUgGgRi8ADFjlg6ImSjMsBBGbtY/HgRAAwQcDD5iAgAARBQMP2COiIAAHkw9K85
-AAQQMDAP5jn/AgAKAXS3UCWCOfu7dBLmADVg97tSEgAAQXDwCwcCAABRcG1pAgBIYWRBpCohBxu7
-SAoKSgyqEf28JBoJAFqwKlYAKSIAGLwc+gpkIAgQcDD3VgIpgAQ+YPpWAygJAHZwKVYB+CUqIAcQ
-eDD/JFwgAxBgMP4kZCIAAFhw/RYAIMoCULBZSLMdu/mJEf4hIiAuEFgw+yRXIEIQYDD8JHQgUhBY
-MCskBfwgQSAAEFgwKyU1Dt8U+yRoL0AEO6D5CEYKSAFIMPT/EQgHAUww+KoRDQAEOyD6iAIJUAQ+
-YPm7+R4JAE/w+1UKIFQQUDD4u/QeCQBH8PpVCywJAHsw+VYHLAkAazD8VgQuCQBDsP5WBiCQAkCw
-8ggWAEACeXAAT2P6ISogABBwMC5UMS5UMv5UMyAAEGgwLVQ1LVQ2/VQ3IAAQYDAsVC77VC8gABBI
-MClUMPpULSAAEEAwKFQ0CooUKlQsLyBXL1Q7D48UL1Q6D48U/1Q5ILgCWLD/jxQABBBgMP9UOCB4
-AlFwWUhx+VxAIMACQLDzCBYAABBgMABJigAIiAAJivxUUyAAEGgw/VRSIAAQaDD9VFEgABBoMC1U
-UPsgdCCAEFAw+1RwKgAgUXCIMRy7Ki8hB/0hCCjgAUAwmDEpIAcbuyaIMP8PSg4CAUgw/P8RDqAE
-O6D4iFcOCQB38PkJQQ4JAF/w/6YALwAEOmD+IgAsCQB3cPemAiAwEFgw+6YDLAkAZ3D9pgQgBBBY
-MPymBiAAEGAw/KYFL4AEO6D8pgcuCQBbsP6mASBAAnqwBgOGAE9nBAOGAE9ljCceurf7+sAgNRB4
-MPydEQBAAmMw+8sBDAAgd3D21jkgABBoMP3FBCCAAlrw+8YBIDYQUDD7xgAghARSMH+BRcpIKyAW
-KAr/eLEg+iBBIFQQYDBYOVPAINEPxJ8pJAUqIGixqvokaC/aALUgwCDRDygkBfP9BGAAECAwZE/b
-2iBYLylj/9jFsiskBWP/sfP9GmAAECgwjCJlz9DaIPwsAAAwAlnwWDmzwCDRD40iZd+6KyBB2iD7
-vBIiAABgsFg5rMAg0Q8AbBASlRaXFCIWG/MWBSIAAFkwmxfzEhsiAAB48BK7XIzw9jAHIgAAabD4
-MEEv8BBIMPQxIizgAWAw9BYKLAAgY/D0fAAAfgJjMPcyDiwAQEswnBmKwQiICfYGQQnABDog+GwY
-IgAgQLD4FgggIAJjMPIifyoCz1NQwODyFgEgABBYMA7SDB66wy7ifwl/Ea/uLuE3KHr//wIACgLk
-chAVuvImFgMXu0Encn//AgACAAAx8P8CAAoAStNQLhIJL+IDAqoM9xYCLgAgfLD+4gIqAAOT0C7s
-AYgU9woAIAKSJiD/AgAAAo4moMAgbQhaCkg09ikKCAEAwXCYkAYoC5+DnoKJkAlEDPmqDAACAhCw
-/+wACAAgenD4FgsqAANKELHv/vwAAAICOfD/EgsgGAA8oPIKACAwAjGw/wIAAAJaJSD/AgAAAlYm
-oGP/ngy6Cgy+C4/jiqCXEv7iAi4AIHyw8qoMCgADE9Cx7sAg8hYPIAAQEDD/AgAAAFKlIC0WGmAA
-K4gf+7wBKAAgQfD4Fg8gGAA+4PsKACAwAmMwDL4LDLoKiqCP4/7iAiAAOCUg9woAL9AANqBqQcgP
-AgDTD20IVPYpCwgBANEw9i0KCAEAwXAIRAwIqgyY0P6WAiACAhCw/5YDLAAgfjD42wZyAAB7sLHv
-/vwAAAICOfD4IQxiAAB7cPIKACAwAjGwZK9z/wIAAf+4JSBj/58ALRIawLCbECswFoQU9hICIP8Q
-SDD9FhcgJARK8IwWKjBBAMyOWDi+ZKQxjR/5ufQTaAA3YBy60osahRP/EgEgkAJQ8PoWECC4AkDw
-+BYRIMACOPAnFhL/DkYAABA4MP+CQgXABD1g+90UC0AEPuD03REKCQBm8PsWEyQAIE1w9RYOI4AE
-OKDyugYeCQATsPIWDC4HAXww9RIPL1AEP+D/CgAsCQB/cP8WGCwJAHdw/RYUIAoCKXD1FhYgABAQ
-MPAAEGAFECgwACgSFv8CAAYBb0VQwJUJWS/0knFgAgIpcCoKgKp3KTEHGrnLCQlKDJkRCpkCmXCI
-MPy6jhBEEHgw/rqLEAgQSDD+dgIpgAQ6IP92AygJAEowmHEtMEEGKAqKgCsSFPgWFSAEEEgw8N0R
-CiABUDD6mQwKCQBu8Pq6kRoJAGbwm3T7EhAoIAFMMCkWGSiCAPp2ByAAEFAwKnUK+RITKAAgSjD5
-dgYgeAJCMCh1C/ALFgBAAknwAElhKTEq+nQvIAAQaDAtdDP5dC0gABB4MP90MCAAEFgw+3Q0IAAQ
-YDD8dDIgABBwMP50MSAAEGAw/HQ3IAAQcDD+dDYgABBYMPt0LiAAEHgwL3Q1KxIRLxIYCYkUKXQs
-/jBXLgAgR/AvFhgudDsOjhQudDoOjhQudDn+jhQAeAJR8P50OCAEEGAwWUcD+RISIIACUfACCYgA
-SooACYgACoorMhwqEhYrdFMLixQrdFILixQrdFELixT7dFAgdAhRcCwSGf26VRCKAlHw+xwAAEIQ
-cDD+NHQsIAFgMP0KCCwJAGsw/TRlLYAEOyD8FgAgAxBgMFlG6QYoCywxNfu6SBA2EGgwLTRX/RIV
-IAICYzAsNTUrdhaK0Cp2F4mDKXYZiIIodhiI0C8yHP4yDy4AIEfwLzYcLxIXjdAiLAH4RAwOACB+
-MP8WFywAIHdw/TYPIBgAPKDyCgAgMAIxsBi5Uih2GigSGcDlDl4vuI8vdhv/MHQoACA6MP+EdC3R
-ALegiR8FmQy2mf8CAAP+4UJgjB6LHSvGOSswFioK/3qxCCowQSwSGFg36CgSF48V9P4TAEcQSDAp
-NAWe+JT5mPeNMmXQltow+xIIIgAAYPBYOFLRD48fih71/wwABRBoMPqiOiAMAnvwDf82Df8R/xYN
-KgBC/pCHHidyOWR/q4gc/nwAAAAQUDDwCAcNYAA34G0ICbGq8A6gB/6p/pBj/++LE/y7EQAAEFAw
-+hYYKgAgTvCbHo4ejR0t5jkrMBYsCv98sQgqMEEsEhhYN8CLFYwX/RIGIgAAUPBb/ZfRDwCPw47C
-isCXH2P7dwAAAAAA8//sYAAQEDDz/4BgABA4MAAAjxmP9Pr/CAIAAHKw8hYBKgAvf1DAsPL8AAAA
-EHgw//wEIgAAcLD49A9gAgJa8CzMGP8KACAAEFgwrPKCIK4ictvb/wIAC/0Vc1AN4gxj+iIlSgD2
-FgMkAwAvsPP6M2XgASwwKDBBKIwSmBhj/rrz/9BgABBYMGwQCC4hIvogQSIAAGlw9SAHIgAAYTD2
-MgAiAAAhsPQWBCIAAHnwnxOcEp0R+qgJAAAQODD3FgAm4AEwMPe5shQgASww+yAWIDACSXD5FgUp
-wAQ6IPgK/yYAIEXw93J/IDAEQvAsEgEuFgcAzI5YN5D+EgciOQA2oBi4xgxUEahELUI6/wIACAEX
-w2AlQjlkUiQfuMQtIQcO2RT3jEIKwAE8MPY3CAoHATgw9aoRCUAEPmD4zBENQAFsMPy7Ag3ABD9g
-/LmTHAkAf3D9VgAoCQBWcPgiACBEEFAw+7l4GAkAXnD6VgMgfgI58PiIEQAIEFAw+1YCKAkAUjD+
-uYYbQAQ7oPhWAS/wEFgw+CBBJgBAXfD9cgEqCQBisJpW/lYHIAQQYDDwiBEGIAFoMPbGDAgJAEow
-+bljFiABMDD23QgAABBwMP5VCiB4Amtw/RYGKAkASjCYVP1VCyCQAliw8AsWAEACUXAASmH9ISog
-ABBAMChUNShUNvhUNyAAEHgwL1Qu/lQvIAAQWDD7VDAgABBQMPpUNCAAEEgwKVQxKVQyLVQtKVQz
-DY0ULVQsKSBXKVQ7CYkUKVQ6CYkUKVQ5+YkUAHgCUXD5VDgguAJYsFlF9SksYPMJFgCAAlFwAEqK
-AAmIAAqKKSIcGLlPKVRTCYkU+VRSIIoCUXD5iRQCAABYcPlUUS4gATAw+YkUDgkAQ7D5VFAgCBBA
-MPgkZSBCEHgw/yR0L4AEO6D+FgAgAxBgMFlF3B+4X/4hNSA2EEAwKCRXjHD9cgEgAgJzsC4lNS1W
-FyxWFotzK1YZinIqVhiJcSkmHChyASgmD/9WGiAQAnGwLlYb/CB0LAAgNXAs1HQrCggrRjkrIBYq
-Cv96sQgqIEEsEgZYNu/8EgIiAABQsP0SASIAAFjwW/zF0Q8pIEEpnBIpFgWNE/wSBCBHEHAw/iQF
-IAAQWDCbOJw3nTmKImWv19og+xIFIgAAYLBYN1HRDwAAbBAGKCAE/wIABgB3DiD7PAAEAHMiIAUI
-R/0KACIAfQIgGbiBjC4pkn8JzBH6sgAoACBmcCiQBS6xCPwKPirgAVAw/iUIJgCd5hAsCkL+Cj0m
-AJhmEPy4qR4AoPIQKCAF/wpHINACOnD2+vAmAKR+EP647hBJEEgw/woIJgDAThAtJGgtJGYtJTUv
-JGQvJGf+JSogLhBAMCgkV/4iHC+AEEgw+SRlIAEQQDD4JFwgQRB4MP8kdCAHADegKCRoxYIoJAWI
-u6q5KZw/9pkBCgAXxxCJkAkJR2mRIipxA3ijHNog/EwAAgAAaXD/sgYgABBwMFv/CsAg0Q/AINEP
-2iD8TAACAABpcP+yBiAAEHAwW/1hwCDRDwAAiCf7gggnwAQ9IPyBFS/AEHAw+YILIEACMjD/iRQu
-AEBxsP4WACwAIHMw/MxAJgCH3lD7eggOACA/8P+FFCoAh9cQyTf5vAAAFQA1INgwbUkFAAiGAElh
-KmIAB6oI/wIABgCbZpCaYGP+n9og/AqEIgAAaXD8tQgiAABhMFkBwsAg0Q/aIP0KhSIAAGEw/bUI
-IgAAaXBZAbvAINEPAIgnLokUZOBXiIktggt9w28Kvwgv/D8G/wEv8gAPD0dp8V0qkTd9o1f6LAAC
-AABhMP6CByIAAGlw/4IJIgAAWjBb/snAINEPAPosAAIAAFjw/EwAAgAAaXBb/DPAINEPAI3b/cMa
-cAAQQDCqvCzMPwbMAYzADAxHacEFLpE3feun+iwAAgAAYTD+ggciAABpcP+CCSIAAFowW/0RwCDR
-DwCdi/P9x2IAAFpwAAAAAAAA+8oMADcANOAKTBT/zAgiAABA8P9PNgIAAErw0w9t+QUACIYASWGJ
-EKo4/E4MAIACSnBt6QUCCIYASWOMEAp+DK7MLMxAnGBj/XKPEC/8QJ9gY/1obBAWIxYhIhYiKxIi
-jDAkFhb9sRUv8BBQMP6wByzgAWAw+LIPJgAgZPD7shwgfgI58PsWHC4gAXAw/hYdJgBAVfD7Fh4k
-OgA2ICwSIo5zKxIhLMETFLhP+7ILIAAQSDD0w4lvYAFwMJtRmVAoEiINwwwuQmQvgRIigRAmgRH4
-ghYvoAQ/4PgWAC4AIHuwLhYVKkKa/bfEEgAAYLD1+v8g9QA0oPusAAAAEHAwbSklgnOi4v9yAioA
-A3CQsf/+7RAoAEBssPm2ASgAQCvw+LYAIBACWvD/AgAKAGezECMWI20Iq4l0wOH5yRILYAFMMP4K
-ACoFAF+w+ssLCAAgXnD0kJ9jQAQ+YIJ3j3b8zAEiACATsP0pAQoAA3CQsf8u7RD5tgEoAEAr8Jiw
-8+PZcBACWvB2wW+JdcDh+ckSC2ABTDD+CgAqBQBfsPrLCwgAIF5w9JAyY0AEPmCCefzMASIAIBOw
-/3IIKABAbLD5tgEqAANwkLH//u0QKABAK/CYsPPj1nAQAlrw93wYKgANMxBj/00AAAD8CgAvRAC1
-oGAABwAAdsmPIxIjH7cXHreQFLcZKBIiG7cQLBIVKYEjKIBAHbc1+pkRAAAQEDD1gsZsACBLMCgS
-HNMPCGYMKRIeCpkL+RYgIzAANOAlEh0MVRH7CgokACBdcPpSOioDAFzwC7cJD3cR/wIACgGkPpAt
-Ujlk00EqEiILMwwoohwpoRUioSMIuAoophz4txsSACBYsPKlIygAIF5wKaUV8AgHAgAAS3BteQIA
-SWEnFholFhnzFiMiOgA24CsWE4kQLRYU+swAAgAAG3D6mREAABAQMPkWHyAAEDgwbbmwKRIfnjAr
-EiIKXRT9NgMgAhAoMJUyiLCZN/Q2BCBAEGAwnDX8EiEgBhAoMPiNEQgJAHow+DYGLAkAL3CdMYzL
-nDj8EiAgABBIMPuyDyBQAijw+TYLIAAQQDD7NgkiAABo8Pg2CiIAAFiw9isjfAAgYfCPwY7A/9YN
-IAICWvD+1gwgEAJrcPXREnAQAmMwdrPgwPDz/99gABBwMAAetzYftrv3fCAgCAIQsPqsQCDAAhjw
-KRIT8xIjIAAQUDD9EhQoAIBWcCwSGSsSGvvGOSCgALTgjhAvEhYK7hGe8C8SIvmSCQAAEGAwLPUV
-LPUTLPYcKvEh+PERIAEQWDD79EAgURBwMC70BfqIDAOwBDig+PUhIgAgE3DRD5tRKBIi+VYAIAYC
-KbAFJRQvgRQihRAmhRHzXAAC6QC34AvLFLO7CysU+hIiIAYCWvD7FhsiAABgcFgHsC0SIioWFSwS
-GyzVFC4SFS8SIvX1EyytALegwCDRDwD8cgEgEQA3oK7MLM3w8AAGYAEQMDDAYGrBE/wNSwABEHgw
-/M4SDAUAb/Cu3a1mjHAPAgAPAgAMDEewzPJsAAH/sycg3XCI1A8CAPgOSwABEHgw+MgSDgUAc/D8
-zP8uACBDsPTAImYAIHGwjtUPAgAPAgAOCkv+zhIKBQBT8A6qCPzM/yYAIFGw/dwYIf/cjyBj/xGP
-cygSIg8PS5+PY/u88/6tYAAQSDAlEiIoEiGFX4iHAA2L9woBIBACSHD4yBQEBQAt8PhVCAAEEDgw
-bXoCAElhsFcHB0H1cJBgEAIocMCE9WkLAAMQODD5FhcmAQC9sPcWHiIAADqwbYomKBIXeFsMg3GJ
-cGAADQAAAAAAAPMKACAAEEgwk1mZWPd8CCAQAilwYACnACoSIi8SFv4SACABEGgw/aRAIFEQSDAp
-pAUipRUipRMsoSEroRHyphwvoAQ7oJ7wDLsM+6UhIgAAEfDRD8Ag0Q/S0NEPsXj3FhIkmAC+IAVz
-C/kKBCAAECgw95kMAgAAOrBtmS52WwmJcIhxKBYYYAAJwJD5FhggABBIMPk2CCACAilw+BIYIBAC
-OfD4NgkgEAIY8CcSEsBTB1UMdlsFJRYeYAACJhYeKBIdDIgRq4goFhkogjr/AgAGAHTCICkSGSmS
-OSkWFCgSFPeMAADdADYg/nYAIAIQQDCYcvgSIiGAAiswBVUUlXOJgPiVEQgJAH5w+XYGIAYQSDD5
-EgAkCQBNcPR2BCmgBD5gmXcpEiH1dgEgQBAoMJV1iZspdgj4gg8gABBIMPl2CiAAECgwJXYL9Xww
-IEACSHD4dgkgBRBAMG2KBQAJiAAFiikSGcCGKJY5KRIeeWsH8AAKYAAQMDAoEh4IZgwpEiL4Eh4g
-BgIZsAMjFCiWHCiVISKUQCOVE2P7QisSIiqxEilCZPuyFiugBDqg+xYAKAAgVnApFhVj/SLAgCgW
-FGP/GykSIiKVEyISFNEPAAAAbBAaKCAEKSAH9ywABgCsjiD6CgEkAKiiICMWKvUIRwggAUww+RYp
-IfwCYjD8rDkC2AI6IIoni6j8oRUvwBAQMPmiCyBAAmqw9qkUIgBAE3DyzAgPwAQ9IPzMQCYDLN5Q
-r2b2pRQqACBb8P8CAAoDLVcQyTLJQAu5Am1JBQADhgBJYSrSAA+qCP8CAAYDUGaQmtDTsPMWKiAB
-EGAwGrYCi34qon8JuxH9EioqACBasCqgBcPu/dEIIEIQWDD9dQgmAuz2kP4KPSYC6N6Q8gpJLgMg
-cpAqcAXAUfYK/yYDK5aQK3AWdrELKnBBWDRXZKctKnAFInAHxbHyAkEGAE7ekMWU/wIABgBJzpAs
-EioathqMy3yjWigSKomACQlHqYj4jD8v8BBIMAmIAY2ADQ1HadE9in9kpT0TtmQqMlwuoQQtoQUv
-oQKMoP7s/y3ABD9g/O4RAf4Ce/D/pQIsACBzMA3MDGAEBcAg0Q8AAAAAAAD7EioiAABR8P0cCCIA
-AGBwW/3sZKT5KBIq+RIAIAAQeDCfiCmGCSpwBR21YwwsEf3MCABUEFgw/BYoJgCq3pCVFBy1oStx
-CPgSKiAAEDAwlhiWHiYWEiYWFPYWGiAAEEgw+RYGL/8QeDD/FhsgABBQMJoX/xYhIB4QUDAqFhb9
-ggsgAhB4MJ8ZiYkpFhkvEij8tjQaCQBm8CwWE5sdiIgoFhj9jRQOgAQ7YPv7EwADEDAwlhr/8jog
-GhAwMCYWHC4WH5scLRYe+LV0EBsQaDAtFhAoFiAbtiMetiH+Fg8gDxAwMPsWFSoCFLfQIhIoIiI5
-ZCQbH7U5i3D8tTUQIAJIcPRxByAYEDAw+LMRAAMQKDD1CiAiCQAs8PBQBAAFEFAw9bUqEgAAQLD0
-BEoKCQBm8PK8AAXABDkg9bUmFAkAKTBtqjWUgJOBn4KWg5KEipWLkIyTjpT7kgIsCQAu8PqGByAw
-AkpwnIkOChsLCxudhZqG+4YIIGACQjAqEigpCg/5pjkgVBBAMPh0BSBUEFAwKxIoK7I6IhIo/wIA
-BgG5xuAiIjketQoYteH/EiojYgA0oC1xBw0NSgzdEfxxIiwJAHdwnSCJcP612xBYEFgw+yYDIAcQ
-IDD7tQAZgAQ+YPsmAigJACZwmSGG9yYWJI/2/xYlIAAQSDD5FiYgLhB4MP90VyAIEFgw+3RkL4kQ
-MDD2dGUgBRBoMC10XC51Kil1NSl0Zyl0ZilwQf1waCBCEHAwLnR0+ZsJAFAQMDD8uxEAAgJrcP10
-aCgAIFow+IJ/ICYEMrDE7n6hCcX2/wIADgIjepAetaETtbT7CkgvQAQ/IPCdEQTAAUQw+IpCBgcB
-QDD7JQsgABBIMPklCidQBDmg/NgUC4AEOqD8tagZQAQ6IPpVAgYJAEGw8/8CBAkANXD/JgYsCQAv
-cPwmBywJAHdw/SYEIJACUfDyChYAQAJAsABIY/hxKiAAECgw9SQxIAAQGDDzJDIgABB4MP8kMyAA
-EHAw/iQ0IAAQaDD9JDUgABBgMPwkNiAAEFgw+yQ3IAAQUDAqJC4pJC/4JC0gABAwMCYkMAiIFCgk
-LCZwVyYkO9MPBoYUJiQ6BoYU9iQ5IHgCULD2hhQAuAJZ8PYkOCAEEGAwWUIdKHxg8wgWAIACSLAA
-SYoACIgACYoochwoJFMIiBQoJFL4iBQAqAJQsPgkUSAMEGAw+IgUAP4CWHD4JFAgIgJa8FlCDCtw
-dCskZCoSKRu0hQyqEauqJKY5K3AWKQr/ebEK+nBBIEgQYDBYMy7Exfx0BSAAEBAw0Q8ALKEFLaEE
-/6IAIAICYzD8DE8B/gIjcPylBSYAh2dQDEQR9PwID8AEOyAOzAwEDIvA0A3dZPAMhA+QALtgL6EF
-LDKiJXUT+jKhL5AEP+D1dRQsACB/cP11Ei+gBDtg/cwICgAgcrD8dhYizwA2oB60XgwpEa6ZKRYo
-KZI6/wIABgE9QmAkEigkQjlkQm4etFsKWhQWtNP2RgAgAhBIMJlCmkP6EiogQBB4MPxyAC2gBD8g
-n0X9RgcgBhBIMP7OAg2ABDsg/kYGLAkASzCcQR60Tp5EiquaSPZyDyAAEHAw/kYLIAAQeDCfSpZJ
-jIOcTYqCmkyGgyxtEPqCAioAAzMQsaoftKUPAgAPAgD6Rg4uAEB/MJ9PLhIoLRYAKeY5K3QF8/sf
-YgAAUTDAkCmlBfP+7WAAEGAwioMKCkuaf2P6twCLcmW64CsSKdpw+7wYIgAAYfBYM0rAINEPKxIq
-2nD8CoQiAABpcPy1CCIAAGEwWP4awCDRD8DQnavz+ddiAAAacAAAAAAAAAD7ygwANgA04ApMFP7M
-CCIAAEDw/k42AgAASvDTD23pBQYIhgBJZwo4CPxODACAAkiwbekFCAiGAElpCvgMqCgojECY0GP5
-ggArEiracPkKhSIAAGEw+bUIIgAAaXBY/fzAINEPKixAmtBj+V2IdytwByyJFPTKJmggAVwwiIlk
-ihwcs/cMmhGsqi6iOv8CAAQAlEOgLKI5ZMEdE7RBLnEHH7RBgoH7K0APQAFwMPq7EA/ABDug8gJH
-DgkAW7DyhgEuCQB7sP7GACAwEBAw/rPsGwAEPmD/cgAgQAJLMPPGBioJAF9w8sYDKgkAHvD7xgQg
-ABAQMPLGBSAEEFgw8sYHL4AEP+D+xgIuCQBf8P/GASACEHAwbeoFCgiGAElriHfAkPL6wCBAAkIw
-+6Y5IgBAEjD5hQQggAIQsJKA8oYBIFIQeDD/dAUgABAQMNEPxaIqdAVj+7WLcmW5QitwQdpw+7wS
-IgAAYfBYMuLAINEPAADAQMDA/BYnJ+ABaDD6MlwiAABZsPwKACABEGgwWCq5KDJdKhInsWYIZi6x
-qv8CAAH++4agKhYnY//RAAAAAADz+QdgABBQMIpyyKzydAUgABAQMNEPAAAAACucGPp8AAIAAGHw
-WDLH8nQFIAAQEDDRDwAAAAAAAGwQBhy0ifIWASIAADmw9rPsECAQGDDwMAQABRBQMPQNGwAwEFgw
-82KKIgAAcXBZSQUoMhLyCgAv/xBQMPYKASFtADYg9xYAIAICUrAnMhEscQSNcPvM/y/nAVAw/O8R
-CcAEPuD+dQUoACBPcA+fDAAPi/9xAyrAAVAwBqpg/w9GDjQBOqAM6BEImAwCCIvAoAaqYv8CAA4A
-VRKgfrkEyPF68VwYs7sfs8YogoMJ6RH/8oQqACBKsKqICYgRqP+M9ynJFPvyCiClADZgiRH+wgku
-AGfK0IjiieP0iAwAARBoMPWZDAAAEGAw+dw4AAAQWDAI2zj/AgAOAFRm0GAAmwAJ6BGoqPheFAvA
-BD8g/u4RCgAgX3D+uwwMgAFEMPDRBAH4AlrwjbDwaRoP/xBwMA6eAw7dAf5xBSgJAG5wmbCNcCxx
-BLHuDg5P/nUFICIEY7Cwywy5EfP/K2gAIE9wwKAqdQXz/+pgABBwMACMEfy5LnAAEHAwwMCLwvzC
-AyABEEgw9LsMAAAQaDALnTj1zAwAABBAMAyYOHjQBI0QffknLjISsSL6rAEr/1H0kMCl/LQfEDAQ
-WDD/XAACAABxMFlIocAg0Q8AABy0Gp8SjeL+4gMgIBBAMPCABAAFEFAw/Q0bADAQWDBZSJeCEhy0
-Eo0g/iAFIAUQUDD/Ig8gMBBYMFlIkIooya6MKZrAjSj81gEgABBYMJsomyn7JgsvmhBIMCkkBdEP
-AC76mi4kBdEPbBAK+goFIDAQWDD1DUcAARBAMP0WCiH8Amtw/LP7HAUAbjBZSHyOGhqzWsBQ9yIQ
-IgI/m6AqooqaGSqiES+hAmT0hFg0TYgZH7NGHrNRJoISL/KDLuKE+v8IAAICMbD2hhIvkAQ/4Pwg
-By4AIHuwK+AH/Qr7LAIBYDD+zBEKAEBu8PYgDCoJAGbwK+QHLCAH9uQML5gQeDD/5AUg/BBoMPLm
-CioAQG7w9eYILCABYDD15gkqCQBm8CvkB/cWCCIAACuw9OQJb8AQeDCK54yoK6EV+aILIEACarD2
-qRQuAEB/cP8WBioAIH7w+7xAJgH1ZlAMTxGvZvalFCoAIGPw/wIACgH21tDJNclD2cBtSQUAA4YA
-SWGK0P+qCAIAACuw/wIABgILXpCa0NPAiOD5sxgbgAQ6IApKApoxKZJ0LDEICYgM/OUIIAICQjD4
-aRQLYAFEMPSzkGiQBD5gCAhFCYgCmO4nMCH6PCgmwAE8MFlHjByzpv4wISAwEFgw/TAgIgAAefD6
-FgAgBRBQMFlIIRyzoC0xCP5RCCAFEFAw/1IMIDAQWDBZSBuIXPyPJHAIECAw/wIAAAFAheD/AgAC
-ATyB4MCQmRcEigKaXGAABwAAAADAsJsXjCIoIAf9spsSqAC3IAgIQfgWBSnABDogrYgugjr/AgAE
-AUDHoCSCOZcU/LKfEnQANSAqIhKLKfkiCioIAVAwDKoKKqKA+5kMAGACUrD6FgsqAOBWUCsgFiwK
-/3yxEvogByAAEGAwWDFK/bKCEwAANqApIQcasoQJCUr2srIZwAQ+YPiygxgJAFZwmUCPIPhGAiBA
-EDgw90YDIAUQcDD4/BEOCQA38P9GBCwJAHMwnEErIhIqIRr5sqQQMBBgMPuIQApKAVww9rsRCaAE
-OiD8RgUoCQBaMPpGBigJAEowmEeIG4cpJiIV+HcID+AQeDD3JgkmACBBsPYmFSYA230QKDwg9AgW
-AEACSTAASWUCCIYASWMACIYASWEpIhYasmQpRD8JiRQpRD4JiRQpRD0JiRQpRDz7Ug4gABBgMPxE
-JCAAEHgw/0QlIAAQMDAmRCL2RCYgABBAMChEJytEMyhEIwuLFCtEMguLFCtEMQuLFCtEMPAKFwCQ
-AkEwAAiKixgrshKKFCtEOwuMFCxEOgyMFCxEOQyMFCxEOPtWDyAARQagLyAHDw9BDP8Rrf8u9jkr
-IBYsCv98sQr6IAcgMBBgMFgw3clSiFjIjolZwGCWW5iQiliZoZZYllmIGByzGI0gLoISL4IVKIIU
-mBD2Ug4gBRBQMPYWASAwEFgwWUeQKfqZ+VQFIAAQEDDRDwAAAAAAAPsSCyIAAFCwWDD//bIVHjUA
-NqBgAImKF4uuK0Q3C4sUK0Q2C4sUK0Q1C4sUK0Q0iq8qREMKihQqREIKihQqREEKihQqREBj/0YA
-AAAAAAAA/TIHIgAAULD8MgYiAABxcFv+YfoWByAJADagiFxj/W7Apfyy7xAwEFgwWUdswNDaIPtc
-AAIAAGDwWDAlwCDRDwCLFdog+7wYIgAAYLBYMRWMWGXP5o8vFrLj9lYLIEACaXD99gAgcAJwsJ5Y
-n1n9Jg8gABAQMNEPiDcpiRTVMPcWCCCdADZgg4lj/J8AAAAA8/vvYgAAcXDz/5NgjhBoMMCwm6vz
-/ExiAAAacAAAAADz/HZv6hBAMPy6DAA3ADTgCksU9rwIIgAAQPD2RjYCAABLMNMPbWkFBgiGAEln
-iRaqOPtGDACAAkpwbWkFCAiGAElpixYK9gymuyu8QJvQY/vviBYojECY0GP75YsV2iD7vBIiAABg
-sFgw4mP/MQAA8/wIYAAQGDBsEAQqIAT7pwdgFxBAMGukBnihG8Ag0Q/6LAACAABY8PxMAAIAAGlw
-WNCEwCDRDwD6LAACAABY8PxMAAIAAGlwW/6XwCDRDwBsEAbEcvmyhRAAEDAw9hYAIAMQKDD5JSog
-ARBYMPowFSAuEEAw+CRXIGAANSD/AgAAAEiFIGhCQP8CAAIAbgUgCmsUe1AFLDAULCRgKixl/bKK
-EgAAWHD9FgAgAxBgMFk/FSYkaCYkaSYlNSYmHCckdB6xwy4lN9EPwIb4JFwgCBB4MC8kZGP/tikw
-MMGiepFm+yRkILoCULD8CgMgIhBYMPskXCA6AljwWT8CKixh/AoDIDICWPBZPv8qMBVj/38AACos
-XfwKICA6Aljw/CRkIAIQaDD9JFwiAABhcFk+9S4wGH/n0yosYfwKAyAyAljwWT7wY//CAB+xySgx
-HC/yfwmIEaj/KPE2KDUcj/AvJh5j/3wAAAAA+LJFEgAAYXD7JGQgIxBIMPkkXCDKAlCw+BYAIgAA
-WHBZPt4mJGgmJGkmJTUmJhwnJHTRD2wQCC0gBCYKF9MP9QhHDgHkM1D3IhAgABAwMPgWBiIB5Jog
-FbGeJVKKKlIRK6ECZLPpWDKUGLGNKVISG7GYKIKDK7KE+ZwBKAAgUjD5VhIlkAQ+IPkgByQAIC7w
-KFAH+gr7KAIBTDD+mREIAEBSMPwgDCgJAEowKFQHKSAH/FQML5gQWDD7VAUg/BBQMPJWCigAQFIw
-9lYIKCABTDD2VgkoCQBKMChUB/RS2G/AEHAwileMqCuhFfmiCyBAAmqw/6kULgBAc3D+FgUqACB2
-8Pu8QCYBqOZQDE4Rrv//pRQqACBjsP8CAAoBwlbQyTbJRNnAbUkFAAOGAElhKtIADwIADwIArqr/
-AgAGAdZekJrQ08CIUPmxYhuABDogCkoCmjEpknQsMQgJiAz8VQggAgJCMPhpFAtgAUQw9LL2aJAE
-PmAICEUJiAKYXi4gZCoKi/8CAA4BU1OQiyL5IAciTgC24CwiEC3CFCzCFSsiEhiw+Q3MDPuLQAAB
-Yg8gCQlB+RYEKcAEPmComS2SOv8CAAQBBsdgJJI5/bD9EgIANSCMKYoqDbsKK7KA/KoMAGACWvD7
-FgcqANXekCsgFiwK/3yxEvogByAAEGAwWC+q+LDhEu8ANqArIQccsOQLC0r2sRIbwAQ+4Pqw4xoJ
-AGbwm0CPIPpGAiBAEEgw+UYDIAUQaDD4/hEOCQA38P9GBC4JAGuwnkEsIhIrIRr6sQQQMBBwMPyJ
-QAxKAWAw9swRCaAEPmD+RgUoCQBmcPtGBigJAFZwmUeJF4YpLyIV+WYID+AQcDD2JgkuACBP8P8m
-FSYApvUQKTww9AkWAEACUTAASmUCCYYASmMACYYASmEsMDBkwOzAoPpEJiAAEHgw/0QlIAAQWDD7
-RCcgABB4MC9EJC4iFi5EPw6OFC5EPg6OFC5EPQ6OFC5EPIxeLEQzDIwULEQyDIwULEQxDIwULEQw
-JnISKkQiK0QjJkQ7BokUKUQ6CYkUKUQ5CYkUKUQ4LyAH9lYPLiABfDAM/xGo/y32OSsgFi4K/9MP
-frEK+iAHIDAQYDBYL0HJUohYyI6KWcCQmVuYoItYmrGZWJlZLDAwyMst+pn9VAUgABAQMNEPL3IS
-InIVsf//dhIgAgIQsPJ2FS+ZEHAw/lQFIAAQEDDRD9ogWC9m+LB7HlAANqBgADvAofpEIC+BEEgw
-KUQhY/8CAAAAAPosAAIAAFlw/QqOIgAAYPBYLp/AINEPAACLFNog+7wYIgAAYLBYL4+MWMjCwCDR
-D48vGLFe+FYLIEACaXD99gAgcAJwsJ5Yn1n9Jg8gABAQMNEPwKX8sVYQMBBYMFlFz8Ag0Q+INymJ
-FPU8AADjADZgg4lj/U+NFvyxTxAwEFgw/dz+IAEQUDD6CgUsBQBusFlFwmP/aQAA8/yIYgAAKbDA
-4J6r8/zmYgAAGnAAAAAA8/0Qb+oQQDAcsUAvchKNIPlyFSAAEHAwLuAAmRAochSYEfZSDiAEEFAw
-9hYCIDAQWDBZRa5j/xf8ugwANwA04ApLFP+8CCIAAEDw/082AgAASzDTD235BQYIhgBJZ4kVqjj7
-TwwAgAJKcG35BQgIhgBJaYsVCu8Mr7srvECb0GP8WYgVKIxAmNBj/E+LFNog+7wSIgAAYLBYL0Zj
-/tkAAPP8cmIAABmwbBAILSAEwYf2CgAgHAA3YGvXB/8CAAQBxItgeNERwCDRDwAAAAAAAP8CAA4C
-ZUNQ9yIQKOABKDD4FgYiAeYaIBWwYCVSiipSESuhAmSz8FgxVhiwTylSEhuwWiiCgyuyhPmcASgA
-IFIw+VYSJZAEPiD5IAckACAu8ChQB/oK+ygCAUww/pkRCABAUjD8IAwoCQBKMChUBykgB/xUDC+Y
-EFgw+1QFIPwQUDDyVgooAEBSMPZWCCggAUww9lYJKAkASjAoVAf0Uu9vwBB4MIpXi6j9oRUtwAQ5
-IPmiCyBAAnKw9qkULgBAf7D/FgUsACB/cP3cQCYBrd5QrGb2pRQqACBbMP8CAAoBxNdQyTHIT9mw
-bUkFAAOGAElhKuIADKoI/wIABgHbbpCa4NOwiFD5sCQbgAQ6IApKApoxKZJ0LDEICYgM/FUIIAIC
-QjD4aRQLYAFEMPSy8GiQBD5gCAhFCYgCmF4uIGQqCov/AgAOAVbTkIsi+SAHImgAtuAsIhAtwhQs
-whUNzAz4r7wQAWgPIAkJQfkWBCnABD5gqJktkjr/AgAEARbHYCSSOWRCIisiEh2vv4wp+iIKKggB
-XDANuworsoD8qgwAYAJa8PsWByoA1l6QKyAWLAr/fLES+iAHIAAQYDBYLmz4r6QS+AA2oCshBxyv
-pgsLSvav1BvABD7g+q+lGgkAZvCbQI8g+kYCIEAQSDD5RgMgBRBoMPj+EQ4JADfw/0YELgkAa7Ce
-QSwiEishGvqvxhAwEHAw/IlADEoBYDD2zBEJoAQ+YP5GBSgJAGZw+0YGKAkAVnCZR4kXhikvIhX5
-ZggP4BBwMPYmCS4AIE/w/yYVJgCzdRApPDD0CRYAQAJRMABKZQIJhgBKYwAJhgBKYSwwMGTA7cCg
-+kQmIAAQeDD/RCUgABBYMPtEJyAAEHgwL0QkLiIWLkQ/Do4ULkQ+Do4ULkQ9Do4ULkQ8LFIOLEQz
-DIwULEQyDIwULEQxDIwULEQwJnISKkQiK0QjJkQ7BokUKUQ6CYkUKUQ5CYkUKUQ4LyAH9lYPLiAB
-fDAM/xGo/y32OSsgFi4K/9MPfrEK+iAHIDAQYDBYLgPJUohYyI6KWcCQmVuYoItYmrGZWJlZLDAw
-yMst+pn9VAUgABAQMNEPL3ISInIVsf//dhIgAgIQsPJ2FS+ZEHAw/lQFIAAQEDDRD9ogWC4o+K89
-Hk8ANqBgAFPAofpEIC+BEEgwKUQhY/8BAAAAAPosAAIAAFjw/EwAAgAAaXBY0I7AINEPAPosAAIA
-AFlw/QqOIgAAYPBYLVvAINEPAACLFNog+7wYIgAAYLBYLkuMWGXMOI8vGLAb+FYLIEACaXD99gAg
-cAJwsJ5Yn1n9Jg8gABAQMNEPiDcpiRT1PAAA9wA2YIOJY/1JAI0W/LAPEDAQWDD93P4gARBQMPoK
-BSwFAG6wWUSDY/98AAAAAADz/IFiAAApsPP9Fm/qEEAwwOCeq/P81GIAABpwHLABL3ISjSD5chUg
-ABBwMC7gAJkQKHIUmBH2Ug4gBBBQMPYWAiAwEFgwWURvY/8rAAAAAPvaDAA3ADTgCk0U/9wIIgAA
-QPD/TzYCAABK8NMPbfkFBgiGAElniRWqOP1PDACAAkpwbfkFCAiGAElpjRUKzwyv3S3cQJ3gY/xP
-iBUojECY4GP8RYsU2iD7vBIiAABgsFguBmP+6cCl/K/YEDAQWDBZRFDAINEPAPP8WGIAABmwbBAG
-Ga/B8pJdIgAAcLD9TAACAABg8P8KACoAjJDQJZJclRArUQT1UgAh/gIjMPMjDAABEEAw/LsRAgAA
-EzDwAA5qACAu8LH//wIABgBzn9APVhQOZhEGtgwmbf/2Yj8qgAF4MAChBACJGvCgBAYAQEmw9gYZ
-AAICELD5CgAvyAC1oPjBPGACAjPwbUkuBlcUDncRB7cMJ33/93I/JIABNDAAUQQAihrwUAQGAEBV
-8AcHGfVwBmACAjGwsZkJygxpoYNkwEeHECpxBCn6//yqEQIAABvwbck08nIAJIABHDDzVBQAAgIY
-8PBRBAXgBD0g8IIaBAAgULD1RQwEEQBIsCVc/IZQBGQBBCICklASr34lIqIs5RMiIqH/5RIkACAv
-8PXWACOgBD/g9eYWIgAgGLDRDxWvdSVSoizlE//lEiQAIC/wldD15hYgABAQMNEPbBAOlBGSH4Qf
-gjD4QRMv8BBQMPdBFSLgARAw9xYFIgAgEPD3MgYgfgIQsPRAByIAQFCwiiP5PAAABBBYMPQEQQwg
-ATgw/LsMC2ABUDD6Fg4qIAFcMPsWAiPLALYgiCH3jAADlQA2oKqI+I3wIAEQMDBqgRP4C0sAARBo
-MPjMEgoFAF9wrLurZoggCAhHsIj6gVliAAAZsNsgbQhLjbSwiA8CAP0KSwABEHAw/cwSCgUAU7D3
-1wgKACBisPSAIWYAIFGwirUKD0v6zBIOBQB/sPiM/y4AIGfw96cIBgAgebD7vBggAAQmIGP/rQCO
-HyPlECblES2QE2TTBZdR+hIPIAYCWbD7KxQAABBgMJxQ+xYJIgAAYHBb/2aOH5oXjRn95RQioAA2
-oP6uqBIAAEjw9fr/It0ANOAarx8qopr/CgAiAABCsG05IosjgyKr+/69AQoAA3rQsTMv/RD9hgEs
-AEAo8PyGACAQAkIw9BYQKgBgslDAQYgk+AtLAAEQYDD4yBIKBQBfMPuICAAAEHgw9IA9bACAJjAK
-mAtt2jKLJw8CAA8CAPmcASoAIF/w8yIGLABAdvD9hgEqAAP60CM8Af/9ECwAQCjw/IYAIBACQjD2
-kVlwARBgMCgiBQgLS/jIEgoFAF8w+4gIAAAQeDD0gDNsAIAmMAqYC23aKIspgyj5nAEqACBf8P69
-AQoAA3rQsTMv/RD9hgEsAEAo8PyGACAQAkIw8iwYK/+mNlAkEhCKFYkXjhn+qBELoAQ6oPhmDAgA
-IFZw+RYHIhAAN6AcrfIMSxH8EgkqACBm8PsWBCAKEGgw+7I6LAMAazCcGAzMCQ/MEfwWAyoBAWbQ
-jRQt0jn9FgYh+QA3YIofiBiPGSmhFR6uCQj/DP8WCSgAIEZwKaUViROIFgAOi22ZAgBIYYoYZKFS
-GK5WGa3cHq6+ghIKrwmEFooX9yIID7AEP+DyFgwuACB9MJ8dghCPFf7imiAAEFgw+l0UAAAQKDD7
-/xEDoAQ4oPIWCy4AIHuw/hYKIgAAOTDyrcwQQBAgMIMbjxydc5hw/BIPIAIQcDCeco4ejMCSdJR1
-n3iTd/52CSAAEGgwnXv9CgAiAABy8P12CiAIAlrw/xIKIgAAGfD4zREMCQBLMPx2BiAGEGAw/N0C
-DgAgL/D9dgEgBRBgMG3KI/brDHAAECAwhPGN8GAAAgDA0JQ9/TYMIAICc7D//AggEAIY8I8d9ApA
-IEACKXD3fGAggAJSsPpdFA//sfnQjRjA4A7dNY8ZiRSIE/iWOSAJADfgwCDRDwCKEIsR/dgJC6AE
-OqCasIsfghb7iBEAABBIMPm1FSBREFAw+rQFIgAgQLDRDwAAAADz/HVgABAwMJeWY/z0AAAA8/+p
-YAAQaDD5CgAuHAA1oBquZyQWECqimmP9TpdRjRWGH/uuYhAAEHAwnlAsYhYrsmScECxhEiNhEA2N
-DP0WCS2gBDsg9mERKgAgZvCbF2P8zIIfiRD6EgEgABBAMPglFSBREHgw/yQFKaAEPmCZoNEPwCDR
-D9LQ0Q8AAGwQFB6ttifiiiIWGy0gBCZyFPVyFiIAAFlwKXIfKnIV+hYWIBcQQDD5FhguBUhDUAsJ
-R/IK/yIEeAJgjjco6RQjFhr5FgUgBQKqIIPpIxYZLhIbLuBkLAqL/wIADgU5Y5AvEhuP8v8CAAIF
-AavgLhIbLuIQJOIUL+IVBPgM/wIAAAU3jiAvEhokEhmP/CRCAPwKAi//EFgw9ARHAgD+f9AoEhkE
-jwgv8g8qEhoLWQMJ/wEvphQugEQtgEX5gEYvgAQ7oA3uAviARy+ABDugCe4CCO4RCO4C/xIWLgAg
-e7AObgjw8AQB/gJzsA4OGQ4OT/6lKyAGAkuw+SkSD7AQQDD5pSomBNdF0CgSGin6tP8CAAYE0E4Q
-/wIAAATMK6Aq7P/67QEOAA7XkG0ID//c/yIAAHNw/90BDgAD/5Bj/+kP7hGz7f6t4xAQEEgw864N
-EAEQeDD9LRQAABBAMP7eAQIAAFIw89MBDgUAc/Dz8zkKBQBycP4KCCIAAEow864DGAUAH7AergD6
-rgEYCQBWcP7eAQIAQB9w8/M5DgUAc/D6jAAMAEBXcP39OQoFAHMw+goEIgkAVPD/ciMoBQBqsAmI
-AggzAv8CAAoEdJ/QKnIkAz8PCvoKiqAuoQIO/xH/FgYgBKkroFguN4gWL3IkqP+J9vjyASmgBD5g
-Cako+RIaKAAgSjD4lhMv/xBYMPjyBiACEGAw+a0ZEgAAarD/8gQvAAQ7YP2IKAuABDjg/QoALgkA
-U7D4/wgOCQBLsCoSGg7ZAvmmEigEbsiQGq0kKRIaKqJ0iZAKmQyxmQkNS/8CAAAEZStg+W4UDeAB
-fDD5CkUOkAQ7oP6qAgmgBD9gCpkCKBIaj4z8/wIAARBQMPmGDi4JAFfwn4wvEhov8Spk9JIcrbwp
-EhkuEhr9rbkQABBAMPgWDSoRAFlwmhwtFhT+4hMoACAmcJkY/hYTIIACanCdHv6ssBBwAkpwmRnw
-AfBgABBQMAAtEhaCPQDQBP0SFygAIDSwsJn5CRkAABBwMPsWCywDAE9w9xYKJBgAN2DAMI0YKxIX
-ihkVrRrzuwwAABBwMPm7NgIAAEKwo+QFRAvxCBYEACBhMAAEioLdh9/4rAAAAgJzsP/SDiQDABGw
-9CIMBgAgPTDy1g0gEAA0oPfWDyoAAyHQsf+f3nvpvCgSF6Pj/wIADgE/mhBkIneJGIsbjZ8ttn+J
-nim2fogfKxIbLRIQKRIRLhITH6z8n5AOXhSekw1fFB6sg5+Si7CelP4SEiAAEFAw+LsRAAAQeDD9
-lgUoCQBaMPiWASDBADegHax0KxIQJBIRHqzq+goAIAQQODD7SwgCAAApMPRMMCBgAlrwKBIbDwIA
-KIIAIhIa/RIYKAkAajAoVgYpIg4NmQEpVgcpEhkokEQtkEUIiBH9kEYoCQBqMPmQRymABDogDYgC
-/v8LCYAEOiD9rFoYCQBKMPhWCC4AIGfw8iIUIAAQSDDyVgkiAAARMPpWCyCAAiEw+lYKIIACKXDz
-DxYAAgJKcPJSHgXoAj5g33D/AgAACAI58P8CAA//tdkQKxIbK7AHCwtBKRIaKBISL5EqHqw9+P8M
-C8AEPuD4Eg8qACB28Pi2OS/gAXww/5UqInUAN+AoEhItEhMKiBGo3S0WEycSGydwBwcHQfx1EQAE
-EFgw/lUIDAMAX/D5UjoloAQ7YC9MJw9PFP8CAAoCrX5QKVI5gxjyrSQVTQA2YCgSGieBKy0WEvkW
-ESvgBD9g9zIMKgMAPvArFhcCuwv6tn8gABBQMCq2foiMJBYQnx/3B0cB/tJ6EIk+iB2NP/kSDCgA
-QEow/QoBKABAbnD52TkIBQBDcPsWCygJAEow9xYKIZEANiCOGS0SFBiscgQOiACNii8ify4SGiki
-fvkmfi4AQEfwLyZ/LuIUiz0ObgwL7jYOuwz7Ng0gFgA24I8/r+/9Mg4qAANz0LHdnz+dPi0SGovc
-x+0OuwGb3II9KxIWKBIXpinwsAQB/gJKcPkJGQH+AkIwCYg2/goAIUEANiDz/R9gARAYMI8aiR75
-Fh4gABBAMPgWHSH+Anvw/xYVICAAt+Bj/XYoEh0rrBgNujn6Fh4gAgJCMPgWHSf+sU4QIhIdLxIW
-JxIe/RIXIgABEDAiFhwHIgqHICgSHgPdDPDwBA4AIDHw9BIcIf4Cc7AODhn+EhQsAwB3cP0WByBY
-ADdgixcIRAsOPQv6TAgqACAe8P67CwIAAEqw9wkWAgAAQ3AAyIqHIPdvNgAQAmtw/3cMAgAASrD3
-JgAgFgA14IVDjkKl9fVGAyoAA3lQse6eQnvZxY0X+BIXIAAQSDD6Eh4oBQBvcP0SHCIAIEzw+RIV
-L/+amhBkfy0tEh4rEhwNuwuNG46zLtZ/i7Ir1n5j/IwAgj0rEhb/EhcoACA0sPCwBAH+AkpwCQkZ
-Cf82/goAK/AAt+Dz/EdgABAYMPP8P2ABEBgwJhIbimImYAf1oy1mIAEwMBqrlAxpEaqZKJI6/wIA
-BAGnRiAkkjlkQ0MrEhslshIYq5ossgn7sgokCAEsMAhVCiVSgPy7DABgAilw/wIACgFErtArEhsr
-sBYsCv98sRAqEhv6oAcgABBgMFgqRWSjai0SGyjRBxmrfwgISv6rrhnABDog/6t/GAkASjCYQPzS
-ACBAEDAwlkP/RgIgBRAwMPjLEQwJAHMw/EYEKgkANvCbQSrSEinRGviroBAwEFgw+o9ACkoBUDD2
-qhEPoAQ/4PlGBi4JAFfw+0YFLgkAR/CfR47ZLNIV9e4ID+AQWDD+1gksACArMPzWFSYBH10QKRIZ
-LUwg+ZwwIAMQUDBtqgUACYYATWHAsStEICsSGyqyFi4SGipEPwqKFCpEPgqKFCpEPQqKFCpEPI/u
-LbIQL0QzD48UL0QyD48UL0QxD48UL0Qw/dISIAAQQDAoRCP9RDsgABBIMClEIg2PFC9EOg+PFC9E
-OQ+PFC9EOCywB/3mDywgAWAwHas2DMwRrcwmxjkrsBYqCv96sQ0qEhv6oAcgMBBgMFgp3ysSGmSw
-+Ym4ZJD0LRIb8rIJIAAQeDCfuy3SEJkgiLgs0hIu0hWSgZ+4/7YJIAICYzD81hIgAgJzsP7WFS+Z
-EFAw+rQFIAAQEDDRDypyES6hAiMWGfkWBSANALeg8ACDYAAQSDAAWCxgHKtaLXISGatkLMKDKxIb
-KZKE/dwBLAAgUzD9dhItkAQ7IPqwBygAIGZwKJAH/Ar7KgIBUDD+qhEIAEBiMP6wDCgJAFIwKJQH
-+rAHL5gQaDD+lAwg/BBgMP2UBSgAQGIw+5YKIAAQWDD7lggqIAFQMPuWCSgJAFIwKJQHmRT5Fhog
-WAC2YC0KjioSGysSGiwSGVgpH8Ag0Q8oEhsoghApghUighL/EhogAgJKcPmGFSACAhCw8oYSL5kQ
-cDD+9AUgABAQMNEPAAD6EhsiAABZcFgpyWStbGAAT4qX2zD6rCAiAABhMFglfIwUjcD6FhktgAQ/
-YPuhCCwJAG0wnaErxQhj9gcAAAAA8/X9YAAQGDAAACwSG/rMAAAwAlnwWCnxLxIaLhITLvYTKBIa
-iIjIgsAg0Q8qEhssEhqNrx6rx/7GCyBAAksw+dYAIHACWrCbyJ3J+aYPIAAQEDDRDywSG/rMAAAw
-AlmwWCneY/+6wODz94VgFhBoMMCl/Ku4EDAQWDBZQCbAINEPAACNFfoKBSAwEFgw/dz+IAEQeDD8
-q7AcBQBv8FlAHWP+2QAtEhscq60u4hL90gAgBBBQMPQWACAwEFgwWUAVY/65LBIb+swAACQCWbBY
-KcNj/0wAAAAA8/6kYI0QaDDz91Fv6hBIMMDg8/cDYAIQaDAAAGwQOCIWZC0SZA8CAC3QBCMWUyUW
-UvkKFyYrADdg8goYJgKpj2D/AgAEAqWjYCoSZCsSUyigB4awKxZR+hZWKCABQDD4Fk0m4AEwMPYW
-TiDWAjGwBkYU9hZPJAKWA2AoElYogAUsCk7/AgAGAopmECkKUXmBKysKVHuBJSoSVisSUfwcFCAw
-AmhwW/vs/wIAAAjHKqAqElEoElaJFZmnKIAFLBJRhMb0B0EABBAwMAdmDAYGQfZECABUEFgw9MYG
-JgDnXhD0jBQAABA4MJccJxYQJxYSJxYWJxYYJxYcJxYeJxY0JxY2JxY69xY8LAAQSDApFikpFiv5
-FjEj/xBAMCgWMPgWPSA/EFAwKhYo+hYqL/8QWDArFh/7FiUgABAwMJYbJhYv/BYiIBAQcDD+Fiws
-gAQ9IP0WIyABEHgw/xYIIAMQaDCdHv0WOCAAEHgwnxr/Fi4gABBwMP4WMiACEGAwnB0mElEbqn/6
-qu4QBhBgMCwWNR6qcBirIvgWGSAaEHgwLxYg/hYkIBEQaDAtFiYsElYqFhMZqxkrFhH5FhcgDxBY
-MCsWNyoSTRuqKoZn9hYdK8AEOqD8wQgqACBasCoWUCqiOvwWOyAbEFgw+xYUIB4QODD3FhoqB7re
-kCQSUCRCOf8CAAAHs6kgFqpCBEgC8AYHABsQSDBtmgIASGElElYfqhwWqhmDUPVRByBAAkhw+goJ
-IAMQQDD4NxECCQA08PaqERVAASww+AogJgkARfDwgAQFwAQ9YPaqDRQJADVwbao1lUCXQZ9CkkOT
-RIqVi5CMk46U+5ICLAkANvD6RgcgMAJKcJxJDgobCwsbnUWaRvtGCCBgAiEwKhJQKBJWwZv5pjkg
-VBAwMCaEBSsSVg8CACuwFiwK/3yxFiwSUioSVgDMjiqgQVgosv8CAAAHgCqgLRJNHqnn0w8M3RH+
-Ek8sACB3cC0WUC3SOv8CAAoHLfdQJBJQJEI5/wIAAAcmqSAWqgTwBgcCAABBMG3pAgBIYSgSUyoS
-VvmqtRAAEHAwLhZE+aUqIC4QWDD7pFcgBhBgMPykXCAIEGgwLaRkKIAV+GgUAAMQODD/AgAIB1LB
-0CoSVhyqvSsdAfwWRCAgAlrw+qxlIAMQYDBZN0YvElbAoCr0aCr0aSr1NSr2HPnxByBCEFAwKvR0
-Gqm/+BJOKUABTDD7qe8ZwAQ+YPv1NygJAFZwmUCH8PYSTyCYAkIwmEP4qbgXgAQ94PhGAiYJADmw
-lkEu8EEdqoco8AUO5wn8dxEAUBAwMP/xIiwAID9w/dJ/ICYEMjDEvnuBCcXG/wIADgcRYhAXqmoj
-Ek4Zqn0P3BT1qnwZQAQ74PDmEQrAAWgw/goAKgcBbDD+RQoiSAFoMPVGBy1ABDsg+CIRC1AEPuD5
-iAIAeAIY8Py7AgoJABKw+xJWKgkAWrDzRQsmCQBRsPhGBiYJADmw9kYEIJACevDwDxYAQAJpMABN
-YS2xKv5ELyAAEHgw/0QuIAAQEDDyRDcgABAoMPVENiAAEDAw9kQ1IAAQODD3RDQgABBAMPhEMyAA
-EEgw+UQyIAAQUDAqRDH9RC0gABBgMCxEMA2NFC1ELCywVyxEOwyMFCxEOgyMFPxEOSB4AlEw/IwU
-ALgCWvD8RDggBBBgMFk25igSVv1MQCDAAkIwAgiIAE2KAAiIAA2KLBJWLMIcKxJRLERTDIwULERS
-DIwULERRDIwU/ERQIKgCUTD8Ek4gYAJa8Fk21SsSVi8STv6wdC4AIH0wLvRYLRJQLBJPLNY5K7AW
-LQr/fbENKhJW+qBBIgAAYPBYJ/QqElYoElHElSmkBSiAEsqGHKl1G6pEHapEKhJWC4soW8QyKhJW
-W8QUwCDRDwB9Igf/AgAIAGTPUMAg0Q8AAAAtElMqEmT+ElIgIAJYcP3RCCIAAGNwWBAJLQqI/wIA
-BgZNbpCMFGTPz4jHi4j9gRUvwBB4MPmCCyBAAnIwD+8B/xZFLAAgf3D93EAmBk5eUCaJFAxFEftf
-CAYAICmw9oUUKgZKf1AoElPJgchP2bBtSQUACIYASWEv4gAF/wj/AgAGBmPv0J/gicD4EmQpgAQ+
-YAlJApmxKIAFw277FlEmBhc2EMSi/wIABgYSVhDD3f8CAA4GUWoQLBZWY/oZGKlWJYKKIlIUI1IV
-L1IfLxZhIxZf81IWLgVeS1ApElIJCUf/AgACBIiCYCsSU423KtkUKRZG+xZjIAUTKqCM2SwWYi4S
-ZC7gZC8Ki/8CAA4FbnuQLxJkL/IC/wIAAgURq+AuEmQu4hAp4hQv4hUJ9gz/AgAABWwNoCYSYyQS
-YiZiDCRCAP8KAi//EHAw9ARHAgD5/ZAnEmIEdggmYg8OOAP4EmMmAEBBsCaGFC1wRCpwRflwRi2A
-BD9gCt0C93BHLYAEP2AJ3QII3REH3QL2El8sACA3cA0tCPBgBAH+AmtwDQ0ZDQ1P/YUrIAYCO3D3
-JxIPsBAwMPeFKiYE6DVQJxJjKPq0/wIABgThRdD/AgAABN0rYCrc//rZAQ4AC9dQ+5z/IgAAanD7
-mQEJ//pbUA/dERupsxipsRapsxmpsvepgxAGAmNwDCwU+ckBAAEQUDD3xwEGAEAzMPjIAQYFADKw
-+Kg5BgUAPrD5qTkMAEBbMPoKACwFAGKw26D8rAAKBQBn8PsKECgJAF5wB7w59woIIgAAWrAIezn8
-CgQqCQBm8AbKOQuqAvpSIygJAFZw/wIACgSLzpAqUiQJlw8KegqKoC2hAikWR/53EQAFAatgWCnb
-JVIkp1WNVvxSAS2gBD9gDa0o/RJjLAAgazArEkcs1hP2UgYv/xBwMPiovxACEHgw9VIEK4AEPuD6
-ZigNAAQ+oPvdAgAAEEgw9lUIDAkAR3AoEmP2Cv8mCQBucPeGEigExrmQGqjIKRJjKqJ0iZAKmQyx
-mQkKS/8CAAAEvSqg+WwUC+ABLDD5CkUMkAQ7IPyqAgmgBD7gCpkCJhJjjWz/3QIAARBAMPlmDiwJ
-AEdwnWwtEmMt0Spk1LIvEmIsEmMbqV77Fl0gABBAMPgWVSYRAHDwJhZU/MITLgAgJ/AvFkksFlz8
-qVYQgAIz8PYWVyBwAnvwLxZKYAHwiL0vEl/TD/kSYC4AIBIw8PAEAf4Cc7D+DhkAABBoMPcWTCgD
-AHZw9RZLJDIANmDAMCkSSSsSYCoSSh+ovvO7DAAAEGgw/rs2AgAAIrCj3g/uC/UEFg4AIGOwAI6K
-KJINJZIPLdwB/pIOJAMAQLD0iAwEACAtMPiWDSARADYg9ZYPKgADoVAu7AGenvvZvnIAACKwJhJg
-o9P/AgAOAUOZkGSCfygSSSkSTIqPKpZ/KIIOKJZ+KxJbJhJkKBJZLxJaKRJcGqiemvAJWRSZ8wha
-FJryhmAtElj5qCMQABBwMPn2BCeABDmg+PYFLAkAN3D99gEguwA24CsSWSUSWhmoFf2ojBAEEEAw
-+1sIAgAAeXD1XDAgYAJa8CQSZIRAJxJj+hJhJAkASTCU9oZ+JBJiCmYBlvcqQEQmQEUIqhH2QEYq
-CQAysPRARyuABDqgBqoCCKoR/eQLCgkAIrD69gggABAwMPdyFCAAEHAw9/YJJAAgYTD29gsgABAw
-MPb2CiIAADlw9wQWAAICc7Dy1x4F6AI/oC/8QPVcQCIAAHIw/wIAAAgCQjD/AgAP/7dZUC8SZC/w
-Bw8PQSYSYy4SWy1hKhin4P7dDA/ABD/g/hJYLgAgR/D+9jkt4AFsMP1lKiKUADdgKBJbJhJcCogR
-qGYmFlwlEmQlUAcWp9MFBUH8VBEABBBIMPZECAgDAE9w+kI6L6AEOmAt7CcNTRT/AgAKAr9ukCRC
-OSsSSfqoxxVwADUgJhJjKGErKRZb9BZaJ+AEPmD1sgwmAwBF8CcWYPp3CwAAEEAw+HZ+IAAQeDAv
-dn+GbC4WWS0WWPUFRwH+ynmQjb4pElWOv/0SVCgAQG5w/goBLABAd3D97TkIBQBPsPcWTCgJAG5w
-9RZLIaIANmAtEkopEl0fqBMIDYgBCYouon8tEmMmon72pn4uAEB7sC6mfy3SFI69DS0MDt02De4M
-/rYNIBcAN6COv67e+bIOKgAD65ApnAGev5m+JhJjj2zHjQj/AZ9sLxJfiL0A8AQvEmCijrDu/g4Z
-Af4Ce/AO/zb9CgAhVgA34PP9FGABEBgwAAApEksrElf7FmcgABBQMPoWZiH+Akpw+RZeICIAtmBj
-/W8vEmX6rAEgMAJzcPoWZiwFAH+w/RZnJ/6s3pAoEmYmEmcpEmf7El8oAAFAMCgWZQmICi+CACkS
-YACwBPQSZSoAIBPw85kMAf4CUrD6ChkAABA4MPZECwgDAFZw+RZIIGMANmArEkgtEl0qTAgPAgD9
-OQsKACAe8P27CwIAAGqw+w0WAgAAMnABRoqPgA8CAA8uNv7/DAAQAkpw/4YAIBkAN+CFQy1CAgXl
-CPVGAyoAA/FQLdwBnUL7mcRyAABqsCkSSCYSYPoSZiYFAE5w/RJnIgAgPPD7El4v/5OZkGT/HykS
-ZygSZQmICykSTIqDKpZ/iIIoln5j/HYvEl+IvQDwBP8SYC4AIBIwsO4ODhkO/zb9CgAr1gC34PP8
-MmAAEBgwAAAAAAAA8/wkYAEQGDAiEmSPIiIgB/XzNWIgARAwGqcwDCkRqpkmkjr/AgAEAa3FoCSS
-OWRDUCsSZCWyEhanNiyyCfuyCiQIASwwBlUKJVKA/LsMAGACKXD/AgAKAUiu0CsSZCuwFiwK/3yx
-ECoSZPqgByAAEGAwWCXhZKPxLRJkL9EHEqcbDw9K+6dKH8AEP+D8pxseCQAX8J9AitD8RgIgQBBw
-MP5GAyAFEBAw+KkRCgkAWrD6RgQoCQAWcJlBKNISFqc899EaIDAQSDD4j0AISgFAMPaIEQ+gBD/g
-90YGLgkAR/D5RgUuCQA38J9Hjtks0hX17ggP4BBYMP7WCSwAICsw/NYVJgEjXRAoEmIpTCD4jDAg
-AxAwMG1qBQIIhgBJYysSZMCRKUQgKLIWLhJjKEQ/CIgUKEQ+CIgUKEQ9CIgUKEQ8j+4tshAvRDMP
-jxQvRDIPjxQvRDEPjxQvRDD90hIgABAwMCZEI/1EOyAAEDgwJ0QiDY8UL0Q6D48UL0Q5D48UL0Q4
-LLAH/eYPLCABYDAdptIMzBGtzCLGOSuwFikK/3mxDSoSZPqgByAwEGAwWCV7KxJjZLEBiLhkgPws
-EmT/sgkgABBwMJ67LMIQmPCCuPvCEiIAAFLwLcIVnyGeqP6mCSACAlrw+8YSIAICa3D9xhUvmRBI
-MPmkBSAAEBAw0Q8qUhEtoQIpFkYuElP+FmIgDQC3YPAAg2AAEDgwAFgn+hmm9CtSEhem/imSgygS
-ZCdyhPu8ASgAIFZw+1YSKZAEPmD2gAcmACBN8C9wB/kK+yYCATAw/mYRDgBAT/D7gAwuCQA38C90
-B/aABy+YEFAw+3QMIPwQSDD6dAUuAEBP8Ph2CiAAEEAw+HYIJiABMDD4dgkuCQA38C90B/cWYyBa
-ALXgLQqOKhJkKxJjLBJiWCS6wCDRDwAALhJkLuIQLeISL+IV/BJjIAICa3D95hIgAgJ78P/mFS+Z
-EFgw+8QFIAAQEDDRDwAA+hJkIgAAWXBYJWNkrWRgAE+KdysSU/qsICIAAGEwWCEWjHD6FmItgAQ7
-IPuhCCwJAGEwnKErdQhj9ecAAAAAAPP13GAAEGAwAAAsEmT6zAAAMAJZcFgliy4SYy0SXC3mEy8S
-Y4/4/wIAA/pYq+AmEmQpEmOKbxunYPuWCyBAAhJw8qYAIHACQbCYmJqZ8mYPIAAQEDDRDwAAACwS
-ZPrMAAAwAliwWCV3Y/+1wNDz91NgFhBIMMCl/KdREDAQWDBZO7/AINEPAAAsElaMwv8CAAP6JSsg
-KxJNLBJW+7wYIgAAUzBYJWjAINEPLBJWjML/AgAD+hQrICsSTSwSVvu8GCIAAFMwWCVfwCDRDy0S
-RvoKBSAwEFgw/dz+IAEQYDD8pzgcBQBvMFk7pWP+jS0SZBynNS7iEv3SACAEEFAw+RYAIDAQWDBZ
-O51j/m4uElaO4v8CAAP54yugLBJWK8BB+7wSIgAAUzBYJUfAINEPAAAsElMtElYswBQs1GBj8U8A
-AAAsEmT6zAAAJAJYsFglPWP+zSgSVsViJoQFY/HWAADz/hpgjRBoMPP2oW/qEEgwwNDz9k5gAhBI
-MCkSVomS/wIAA/msKmArEk0sElb7vBgiAABTMFglK8Ag0Q8qEmT7ElMiAABhMFjw/MAg0Q8AAC0K
-hP21CCIAAFMw/RJSIgAAYTBY7/fAINEPwOCei/PzmGIAAFpwAAAvElP72gwAPAA34ApDFPY8CCIA
-ADvw9kY2AgAAQvBtaQUEB4YASGUnElMoEkUDSQz6dwgAgAJCMNMPbZkFBgeGAEhnKRJFCl0MrZkp
-nECZ4GPzPi8SRS/8QJ/gY/MzAAAtElL6zAAAhRAwMPa1CCIAAGEwWO/VwCDRDwAAbBAIHabeKNF/
-xGX1pgAQLhA4MPQsZSAAyXoQuBr7TAAAAxBgMFkzUowSDIwUnBKKNgWrAZsTKSAFLDAe+zAiIJgI
-MnD9CjYmAKg/EP8CAA4AqOsQLiBo/yE1LgCjW5AsMRCx//8CAA4AnPsQLCU1+yRoIgAAUTD4Mgkg
-GAJYcPgmHCADEGAwWTM6ijb5pr0SAIIikPsKQiwAfk6QKjAf/wIADgB42pAsIAX/AgAOAHMzEIkn
-LCAHLZkUiZkoIQj00NFqIAFgMB2lpWSQxgyrEa27LrI6/wIABAEWQ6AtsjkVpe/+pe8UAgFgMPTS
-Fm0ABDqgIyEHj5H6RBADQAEcMP8PRwPABDzg/5YBKgkAIPD0pZsaCQBysPrWACgJAGIw/yIAKAkA
-KjCY1PXWBiAAEGAw9NYCIDAQGDDz1gMgBBBwMPzWBS+ABD/g/NYHLgkAd/D/1gEgQAJTcAIJhgBK
-YwAJhgBKYYon+frAIEACUrD+tjkoAEBOsPylBCCAAkpwmaD5pgEgUhBAMPgkBSIAABMw0Q/AINEP
-LDEQKzAiY/7KxbUrJAVj/uKOJy/pFGTxQ4jpmBQapaEpITf/AgAGAJ7WUI022hD9jVcCAABZMP0W
-BSADEGAwWTLmihAKjRSdEI82jhUF/wEvFgH7IAUgAJafoHa5nSwwHnfBB/8CAAIAjh6Qe94ZKCB0
-xJJ5iBEqIFd3oRguIGgtMCJ+0Q9gAPovIFfTD/8CAA4AeTvQji8tMQuKFK7dnS8ooBNkgKSKpv8C
-AA4ATlNQ+wpIIEgQeDD/JAUmAEu/EMOG/wIADgBewxAqMCIpIGj/AgAOAFfSUC0hNSwxELHd/wIA
-DgBP6xAdpkAsJTUepj0qJGiKES7hf/2sAQIAXXuQfaB+H6VnLSE3/DEKIOQIe3AsJTd8p2p5rmd/
-rmR6rmF7rl58pgcoMB/EknmAU7Qb+jIJIAMQYDD6JhwiAABRMFkypcAg0Q99ozf/AgAP/7i7ECwx
-ECowImP/i8CwmxRj/rgsMQosJTdj/r2NIsrVxOn+JAUgABAQMNEPAAAAAHzRkf8CAA//OjLQxfX/
-JAUgABAQMNEPK6wY/CwAAgAAULBYJC3E6f4kBSAAEBAw0Q8AAAAAAAAYpg3AkQycOfioGHIAAGsw
-H6U3LiE2/DEKIDYEe7AoITd8iaf8CgEgABBIMA3JOGWfK2P/liwlNmP/6ABsEATAINEPAGwQDC0g
-BARHAvYKACAXEEAw9QxHDgMgQ1D0IhAiAySbIBmlOyWSiipSES6hAvwWBCZvADegWCYwGKUqLFIS
-GaU0KIKDK5KE/MwBKAAgUjD8VhIlkAQ+IPggByQAIC7wL1AH+gr7KAIBQDD+iBEOAEBX8PwgDC4J
-AEfwL1QHKCAH/FQML5gQWDD7VAUg/BBQMPJWCi4AQFfw9lYIKCABQDD2VgkuCQBH8C9UB2RVWYpX
-2zD6rCAiAABh8FgfZYlQCJsRC3sCm6H6pRISAAAasCqidAqZDLGZ+WoUC2ABTDD0tcVqkAQ6oAkJ
-RQqZApleKzEIK1UILiBkLAqL/wIADgK+Y5CNImXTDC4iECkiEi/iFC7iFQmKFP/uDAACEFgw+YlA
-AALGj6AvQHP79wEAFAB78AusAQyZAiogBxukowoKQfoWDSvABDqgq6otojr/AgAKAnjDYCaiOZQa
-FKSp/QoAJOEANaCZFwSUCiRCgJoYlBz0cypgYAIhMCwwRC8wRf4wRi2ABDsgD8wC/zBHLYAEOyD+
-IhcsCQBzMAjMEQ/MAg7MNqTEjymOKg/uDP8CAAoBJqeQKyAWKAr//BYOIDIEQvD6IAcgABBgMFgj
-R4we/QoAJSYANqD7EgogYAJI8PQJFgBAAlGwAEplAgmGAEpjAAmGAEphwIEoZCAvIhYvZD8PjxQv
-ZD4PjxQvZD0PjxQvZDyOXi5kMw6OFC5kMg6OFC5kMQ6OFC5kMCuyEh+k1StkOwuOFC5kOg6OFC5k
-OQ6OFC5kOJtfLVYX/qRnEc8ANeAtZCMsZCcMihT6ZCYgoAJBsJgbCooUKmQlCooUKmQk+jIZIMAC
-ebCfGf2IFADgAnjw+GQiIiAANqD9VhYqAwBTMPpmFSDQAkjw8QkWALACQbAACIorMhkKzAwKuwz7
-NhkidAA24CwyG/+kshwAIGKw+zIaKgADUxCxuyw2Gys2GsCwGKTVgx0sIQcLugn4MwoAYBBAMAiq
-ChikPPmlAR1AAWAw+qwPLcAEOyD6ShQMCQBDMJxgHKRl+SIALgUAOnD+ZgIgQBBAMJhj+JgRCAkA
-ZnD5ZgQoCQBCsJhhiBcjMpmMHCkhGvqIEQIAQHzw+KUsEgkARPAMTAyZZvxmBSIJAETw82YHIBMA
-NeAcpSaxufwSCygJAGZwmcAuIhWMKaTu/iYVLAAgIzCcKYsYiBoqtjkpghIvghUqIBb5nAEg/xBw
-MPmGEiACAnvw/4YVIHIEcrArIAf/pMkSoBBgMAy8Ha/PL/J/wY8KiAz/AgAGAYtD0BikAPy/EQ6A
-BDqg+P8IDgkAcTCe84lYKvqZ+lQFIDYANmCLWZ1bmbCMWJvBnVj9VgkgABAQMNEPnB76LAACAABZ
-MFgi2Ywe/QoALaQANqCNWGTSBcAg0Q/AsGV+sRmkgishB4gdHKPs+qSxG0ABXDD5iAoLwAQ+4Pyk
-FxoJAGbwm2D7IgAuBQA6sP5mAiBAEEgw+WYDIAUQUDD4uREKCQBm8PtmBCgJAFZwmWEogpmJF4wc
-KyEa+pkRCABAejD5pNwYCQBKMAxMDJtm/GYFKAkASjCYZ2P+zgAA8/0CYAAQYDAqUhYDqgoqohxk
-oHMKyjYqZhUrUhYPuwu4u/MLFgCwAkmwAEmKKFIWD4gKg4AKMwyTgCNSFg87Couw+swMACwANuAP
-PAsjwgP7wgIiACAesP+kIxoABlDQ/6QhEAICWvCTw5vCY/3DAAAAZDDlKFIX/VYWIAICQjD4Vhcg
-MAJ78PkKACDEADcgI1IWDzoKiqCDGQkIQPOLCgoDAFMwmrArUhaYFg+7C/OICwAQAlrw9QsWABAC
-QjAAiIojUhYPMwqLMAq7DJswI1IWDzgKiIAKzAz0gDJgAgJacA88C4jDg8L/o/4YACBCsPgWBSoA
-BlIQ/6P6EAICGPCTwokV+cYDLSwAteBj/nLKPipSFy/8GP1WFiACAlKw+lYXIAAQGDCIGYoWKYwY
-+bwACAUAUnD4FgkvWAC3IGAADcAxI1YW8//dYAEQGDAAH6Pl8/4pYgAAWnDAgShWFmP/JAAAAAAA
-+iwAAgAAWXD9Co4iAABg8Fghm8Ag0Q8Aiy8cpHb8VgsgQAJJcPm2ACBwAlCwmlibWfkmDyAAEBAw
-0Q+LHdog+7wYIgAAYLBYIoNj/b/ApfykahAwEFgwWTjNwCDRD4k3LZkU1TD8FgQgnwA3YIOZY/p6
-AI0U+goFIDAQWDD93P4gARB4MPykXRwFAG/wWTi/Y/9sAAAAAADz+gdiAAApsPP6QW/qEEgwHKRW
-L0IVLkISjSApQhSZEPhSDiAEEFAw+BYBIDAQWDBZOLBj/zEAABijuB+kBPquCggAIEMwCO4Lr+4r
-4X8EuwwNuzUr5X9j/OCLHdog+7wSIgAAYLBYIlVj/QgAAAAA8/nhYgAAGbBsEBAtIATBl/yjMhjg
-ASgw/BYVIvwAN2D/AgAGAXYPYP8CAAQBciNgKCAHhzDzFhMoIAFAMPgWDSbgATww9xYUINYCOfD3
-RxQEBG+DYCggBSwKTv8CAAYBWmYQLQpH/wIABgU7bhArIBYuCv9+sRAAxY4qIEFYIdb/AgAABT4q
-oCUSDRajCwxVEQZVCC9SOv8CAAoEzL/QJFI5/wIAAATHKSAYoyvwCAcCAABBMG15AgBIYfuj3hAA
-EHgwLxYF+yUqIC4QYDD8JFcgBhBoMP0kXCAIEHAwLiRkKjAVDwIADwIA+moUAAMQSDD/AgAIBRHS
-UCosZfij5BAoAlhw+BYFIAMQYDBZMG/8IQcgABBoMC0kaC0kaS0lNf0mHCBCEGgwLSR0HaLo+xIU
-LUABYDD+oxgdwAQ7IP4lNywJAGswnECKIPkSEyCYAlrwm0P7EhUrgAQ6oPtGAioJAFHwmkEpkBNk
-l7ctIEEoIAUao64N2wn+ISIrwAQ+4PuqCABQEHgw+qJ/ICYEejDEznyBCcX2/wIADgTMehAZo5Ib
-o6UO0xT6DEYGSAFQMPp/QANABDzg9OoRD1AEP+D4ZhEOCQAf8PMSFCwJADMw9qOaGgkAWrD6RgYp
-AAQ7YPZGByAAEFAw+kUKLAkAezD8iAIAeAIY8PNFCygJAEow+EYEIJACeLDyDxYAQAJxMABOY/kh
-KiAAEDAw9kQ0IAAQQDAoRDD6RC8gABBYMPtELiAAEGAwLEQ3LEQ2/EQ1IAAQaDAtRDMtRDIpRC0t
-RDEJiRQpRCwvIFcvRDsPjxQvRDoPjxT/RDkguAJYsP+PFAB4AlEw/0Q4IAQQYDBZMBP6TEAgwAJA
-sAIIiABKigAIiAAKiiwiHCsSEyxEUwyMFCxEUgyMFCxEUQyMFPxEUCCoAlEw/BIUIGACWvBZMAMv
-EhT+IHQuACB9MC70WCdWOSsgFi0K/32xCvogQSIAAGDwWCEmKBITxJYpJAUogBLJjxujdxyiph2j
-d/uLKAIAAFCwW71k2iBbvUbAINEPAHnRDMAg0Q8A/wIADgQDy1D3IhAiA5QaIBaittMPJWKKKlIR
-LKEC+BYGJ0YANyBYI6oYoqMpUhIogoMvYoT5nAEoACBSMPlWEiWQBD4g/iAHJAAgL/AtUAf/Cvsu
-AgFwMP7uEQwAQH9w+SAMLAkAd3AtVAf+IAcvmBBAMPlUDCD8EHgw+FQFLABAf3DyVgogABB4MP9W
-CC4gAXAw/1YJLAkAd3AtVAdkVk6KV9sw+qwgIgAAYTBYHN4oUgAIixH7SgICAAAasCo2ASlidAmI
-DPoxCCACAkIw+GkUC2ABRDD0tpVokAQ+YAgIRQmIAihWDipVCC4gZCsKi/8CAA4DKduQLCICZcMb
-LSIQKSISLtIULdIVCYoU/t0MAAIQWDD5iUAAAy8PYC5wcycWEfvoAQAUAHuwC6wBDJkCKiAHG6Ia
-CgpB+hYSK8AEOqCrqi2iOv8CAAoC3kNgJ6I5FKIhZHWumRsElAokQoCaHCQWEPSDXmBgAiEwKTBE
-KzBF+jBGKYAEPmALmQL7MEcpgAQ+YPoiFygJAFZwCJkRC5kCCpk2pJSLKYoqC6oM+BYXKgEuppAr
-IBYsCv/4FhcgOgRi8CkWFvogByAAEGAwWCC/KBIX+RIWJlgANqAqPDD4ChYAQAJZ8ABLaQYKhgBL
-ZwQKhgBLZcDRLXQgLCIWHqIgLHQ/DIwULHQ+DIwULHQ9DIwULHQ8il4vEhEqdDMKihQqdDIKihQq
-dDEKihQqdDAv8hIdoukvdDsPjBQsdDoMjBQsdDkMjBQsdDj/Vg8gABB4MP9WFyH4ADYgKXQn+YoU
-AKACYfCcH/p0JiAAEHgwL3QjCooUKnQlCooUKnQkKjIZ/HxgIAAQeDD8Fg4g4AJg8P90IiJGADag
-wGD2VhYqAwBScPp2FSDQAnjw9Q8WALACMfAAhoovMhkKmQwK/wz/NhkiigA34CwyG6ys+TIaKgAD
-UxCxmSw2Gyk2GsCwLCEHH6G3DAxKDMwRD8wCnHAconr/IgAgQBBIMJlz+7kJAGAQGDDzmQoKCQBz
-8Jp0KhIV8xIQIB4CSnAJSRT8ojwaBQBDMPp2Ai+ABD/g+hISLgkAfnCfcY8bDKoKHKILKqKZ80MM
-D6AEP+D8IRoqAEBisPx2BioJAHqw83YFKgkAarD6dgcgEwA2IB6inLG9/hIPLAkAd3Cd4I0pLiIV
-pN39JgkuACAjsC4mFYwcKhIRKcY5K6ISJqIVKCAW+7wBIP8QeDD7phIgAgIxsPamFSByBHowKSAH
-/6I/EqAQUDAKmh2vry/yf8FvCGYM/wIABgHuM9AdoXb8nBEKgAQ+IP3MCAoJAF0wm8OIWC76mf5U
-BSwVADYgglnA8J9bmCCJWJKRn1j/VgkgABAQMNEPKRYW+iwAAgAAWTBYIE4oEhf5EhYtkgA2oIpY
-ZavajS8eomz+VgsgQAJZcPvWACBwAmCwnFidWfsmDyAAEBAw0Q/AsGWOihuiIS8hByoSFRmhWA8P
-Svz/EQoFAELw+xISLgkAT/CfcP8iACBAEEgwmXP6dgIgBRBIMPoSECwJAHPw/HYEL4AEP+D8od4e
-CQBP8J9xH6GxDLsKK7KZjBsKSgz6zBEKAEB+8PwhGioJAGbwnHb6dgUqCQBu8Jt3Y/6qAAAAAAAA
-8/zOYAAQSDAqUhYDqgoqohxkoGUKmjYqdhUvUhYM/wu4//cPFgCwAhnwAMOKL1IWDP8Kg/AKMwyT
-8CNSFgw/Co/w+pkMABwAN+AMOQuDk6Oj/JICKgADUNCxzJOTnJJj/aZkMboqUhfA8P9WFiACAlKw
-+lYXIDACYzD2CgAhmgA2YCNSFvw6Cg4AATQwiqCLHvvzCgoDAFJwmjAjUhafGgwzC/v/CwAQAhjw
-+QMWABACe/ABD4orUhYMuwqDsAozDJOwI1IWDD8Kj/AKmQz08CZgAgJZsAw5C4OTo6P8kgIqAAPQ
-0CzMAZOT/JYCLR0AtiBj/ooAAAD/CgAgPAA04CpSFyzMGP9WFiACAlKw+lYXIAAQGDCGHo8aKmwY
-/DoKBgUAerD2Fg4iAAAy8PWfXG4AATQwYADfwDEjVhbz/9VgARAYMCkSEyiSE5iWY/g82iD8PAAA
-IAJYcP0xCCIAAHFwWAe5LQqI/wIABgEGbpCMFGTJvYjHi4j+gRUvwBAwMPmCCyBAAnow/xYJLgBA
-N/D/FgcuACB7sP7sQCYBAt5QL4kUDE0RnRj9/wgMACBfcP+FFCoA/e+QyTvJSfm8AAIAAEDwbUkF
-AAiGAElhjRmPGC3SAA/dCP8CAAYBE3dQjhmd4IjACIgRCEgCmLEoIAXD/vsWEyYAyX4QxJL/AgAG
-AMROEMOt/wIADgEB0hDz9ntiAAATMADz/WFiAABZsMDxL1YWY/5R+iwAAgAAWXD9Co4iAABg8Fge
-18Ag0Q8AKxIS2iD7vBgiAABgsFgfx2P8/wCMImXI2Ysd2iD7vBgiAABgsFgfwcAg0Q+JNyyZFNUw
-+BYGIPkANyCDmWP5oo0W+goFIDAQWDD93P4gARB4MPyhoBwFAG/wWTYCY/+H8/kyYAAQKDDz+XFv
-6hBAMByhmi9yFS5yEo0gKHIUmBD2Ug4gBBBQMPYWASAwEFgwWTX0Y/9RAAAdoPwcoUj4iwoMACBu
-sA27C6y7KbF/9JkMAAAQYDAMmTUptX9j/BUA+iwAAgAAYTD+MgsiAABpcP8yByIAAFjwWABDwCDR
-DwCOImXoDSsgQdog+7wSIgAAYLBYH47AINEPLDAULCRgY/XXAMCl/KFyEDAQWDBZNdXAINEPxfIv
-JAVj9mMrEhLaIPu8EiIAAGCwWB+AY/vjAPP4r2AAEBgw2iD7PAACAABhMFjrT8Ag0Q/awPxMAACE
-EGgw/bUIIgAAaXBY6kvAINEPwOCei/P+OmIAAFpwAAD76gwANwA04ApNFP/cCCIAAEDw/082AgAA
-SvDTD235BQoIhgBJa4kXqjj9TgwAgAJKcG3pBQwIhgBJbY4YjRcK7gz+EgksACB3cC3cQJ3gY/3h
-jxeIGS/8QJ+AY/3V3VD6zAAAhRBAMPi1CCIAAGEwWOopwCDRDwBsEBQiFh73Eh4iAABp8A8CAPhw
-ByIAAHGw+gpHIEYQYDD/cAUiAAAQ8P0WAyggAUAw+BYNIDACQjD4FgkgGARj8P8CAA4DTdPQJHEi
-jH6VFiYiEyMgFShwQYsgHaDy+IgJD/AQSDD7C0cJwAQ6IPsrCAwAIEdw+BIDIH4CWvD90n8qAEBO
-8Iqx/RYMIiQBHDD7FgomAwBBsPu8ECoC+lOQ/QoAIAAQKDAN7wwdoGAt0n8JzBGs3CzBNy16//QW
-BSoABmNQFKCPkxRgAA0kSgAExDbzFgQl4AEgMByg2SzCf/8CAAIAABsw/wIACgBP05CNGijSAw+q
-DCwWAv3SAigAIEPw+BYHKgAD+hAt3AHA8PIWCyIAAGNw/RIHIAKqJaDyFgsgAqYmoMAgbQhaCmk0
-8ygKCAEAzTCZgAMpC52TnJKIgAhmDPiqDAACAhCw/cwACAAgbjD5Fg4qAANCULHN/NwAAAICe/D9
-Eg4gGAA8oPIKACAwAhjw/wIAAAJzpaD/AgAAAm+moGP/npwSC10LC1oKiqCI05IbjdL/qgwIACBD
-8PgWCCoABnoQ8hYLIAICa3Dc0P0SCCAAEHgw/xYcIAAQEDD/AgAAAFOloC4WHWAALgAAKBIc9VwB
-KAAgQ7D4FhwgGAA9YPUKACAwAlrwC1wLC1oKiqCNw/zCAiAAN6Wg/goAL88ANqBqYcdtCFTzKQsI
-AQDRsPMvCggBAMEwCGYMCKoMmPD8lgIgAgIQsP2WAy4AIG4w+PsGcgAAazCxzfzcAAACAnOw+CEM
-YgAAa/DyCgAgMAIY8GSvd/8CAAH/uiWgY/+kAAAAAAAuEh32EgsgABBAMJgQK3AWiBMmYhODEv4W
-GSD/EEgw+GY2ACYESvAsEgYqcEEAzI5YHkxkpD4tEhz5n4ITawA3YBSgYIwcghWFHf2fphCQAnnw
-/xYSILgCcfAuFhOdH/LYFAXABD1g/ApGA0AEOKD8e0ACCQAgsPyMQgA1ECAw9bsRCUAEOiDyFhUk
-ACBNcPUWESAAEBAw+4gCAAAQKDD7EgQtgAQ7IPyqAgDAAmHw/BYUKAkAUjD4FhcgARBQMPu80iAA
-EEAw+6U4ADYQUDD4FhoqBQApMPoWFiAAECgw8AAPYAAQIDAtEhz/AgAGAWftUMDlDl4v9OJdYAIC
-KXAvCoCvRCxxBx2fVAwMSgzMEQ3MApxAi3D/oBcQRBBQMPmgFBAIEGAw+UYCK4AEPuD6RgMqCQBm
-8JtBKHBBAysKjbAuEhf7FhggBBBgMPCIEQwgAWww/cwMDgkAQ7D9oBoeCQB7sJ5E/hISLCABYDAs
-FhuLsP1GByAAEGgwLUUK/BIVKgAgZvD8RgYgeAJa8CtFC/AOFgBAAmEwAExhLHEq/UQvIAAQQDAo
-RDP8RC0gABBIMPlEMSAAEFAw+kQwIAAQcDD+RDQgABB4MP9EMiAAEHAw/kQuIAAQeDD/RDcgABBQ
-MPpENSAAEEgwKUQ2KhIaDIwU/EQsK+ABXDD7EhMqACBS8ClwVyoWGilEOwmJFClEOgmJFClEOfmJ
-FAAEEGAw+UQ4IHgCUTBZLIv5EhQggAJRMAIJiABKigAJiAAKii5yHC0SHC5EUw6OFC5EUg6OFC5E
-UQ6OFP5EUCB0CGlwLxIb+KAJEIoCUTD7HAAAQhBIMPl0dC4gAXww+AoJLgkAR/D4dGUvgAQ/4P8W
-ACADEGAwWSxxKxIZKHE1AywLH5/P+RIWIAICQjAodTUoEhgpdFcvRhaOgC5GF43DLUYZjMIsRhiK
-gPlyDyoAIF6wK3YciID6ZgwAAgIQsPsWGSgAIEow+HYPIBgAPKDyCgAgMAIY8Bye3CxGGiwSG8Cl
-ClovuMsrRhv7cHQsACAjMPvEdC3VALagLRIcBd0Msd3/AgAD/uLDYCgSES8SEC+GOStwFi4K/36x
-CCpwQSwSGlgdcowbKxIZm8uWx4lyxKf6dAUguQA2YNEPLhIcLRIR9e4MAAUQeDD90jogAgJzsA/u
-Ng3uEf4WECoAUfdQJBIRJEI5ZE+7KBIP/UwAAAAQUDDwCAcNcAA3oG0ICbGq8A2gB/6x9pBj/++L
-Hfy7EQAAEFAw+hYaKgAgTvArFhEuEhEtEhAt5jkrcBYsCv98sQgqcEEsEhpYHUyPGy/wE8j+iBuJ
-f4iGeYkGxJgpdAXRD8SmKnQF0Q+Ns4yyirAvFhxj+1UA8//vYAAQEDDacPsSCSIAAGHwWB2w0Q8A
-8/9jYAAQIDCPGo/0qv//41ZyAABqsMBQ/xYBIAAQeDD9EgEgCAJ78Pj0D2ACAilwK7wY/woAIAAQ
-KDCr+IiArYj4FgEr/+3DkP8CAAv86euQDt8MY/nLANEPKXBBKZwSmRlj/sAAAADz/91gABAoMGwQ
-CJQRKSIHJjEL9yAHIEgQUDD9mRQgRhBgMPggBSBFEFgw9wdBAYgCMbD1kgkhiQA3YP8CAA4A+NIQ
-KlASyKPaIFu5NIRQ2lD5+sAk+AEgMPUWAiYBSoEgiBKIiiswX/8CAAoBWjYQ9LFfacAEOeAsbDcM
-TBS0zJwUG55P/hIEKAAgWjAtgjr1n14aAUp3UCiCOZgQ+BYDIpEANiAdnm6JFAANi22ZAgBIYf8C
-AAYBwoEgLjBfG55I956QEDMQeDD8MF4hhAC3oP8CAAYAof0Q/wIABgChgSAooBP0ogYhQAA2II0v
-/wIADgGwaRBlwVfAoI0SjNH4rhEM4AFgMPohBywJAHMwnNEoIAcKCkr8qhEMAgFAMP4hCCygBDsg
-/BIDKgkAYrD/nnQYIAFAMPCJEQoJADqw+sYALgkAS7D5IgAgABBQMJrFmsf7xgIuCQB7sP7GBCBA
-Alsw/8YGIAQQcDD4mREAMBB4MP/GAygJAHZw+cYBIgAAU3ACCoYAS2MACoYAS2EZngz9EgIvwAQ+
-IP4SBC4AIE/wLvY5LdIA/Y1XADIQcDB+0S7aIFgSlNEPAAAAAAAA+ol/cAAQKDDAoCqgEmWud2P+
-eSswXmW+nsDEnBRj/qEAACYhFCMhEvQKAC/HADWg+lJCIgAAWPD8CgAgARBoMFgU9ChSQ/RMASAC
-AhjwCDMudknbY/+bAGTO3WAAMgAAZM7VYAAqAABkzs1gACIAAP8CAAf/B+YQ/wIAB/8D3hBj/3R8
-gYH/AgAH/79eEGP/ZiwgB4oQ+yEIIG4CIbD0RBQMAgFkMPwMQQygBD9g8MwRDAkAP3D9pgAqCQBm
-8PwiACAwAmmw/aYDIAAQcDCepR2e3x6d0/6mAi2ABDsg/hICLAkAYTD8pgEqCQBu8JukAE6Nlqed
-pgIKjywgDADMEfamByoJAGbw+6YEIgAAYbD7PFQgUAJSsFkrPo4QDE8R+53AHgAge7CeE/P+DWCJ
-EFAwiyeFESyxFSu8IAm7AfvLCAXABD1g+7xAJAAgLPD4XAAKAMRZUJgSY/1EAAAAAPP9TGIAADIw
-8/1vYAAQQDAAAI0iZNFS/wIAB/8+gSCMJy7JFCZSvfThNWBAAlMwhcmFUST6wPUFRwAAEFgw/GwA
-AgAAaXBYFNqMJ4nIKMEV+8ILIEACOzAEfQH9iAgCAABR8PiMQCYAjU7QixEuyRQMuxGr7v7FFCwA
-IFpw/wIACgCL5hDJP44R/5wAABsAN6Bt6QUEA4YAT2UqIgcscgD6rCAsACBbMP8CAAYAxkcQnHCN
-oyihBY4gixHyogAsAEAisPyICA+ABDug+IxAKgkAdvD7lgEmAFsXUC+pBAxZEfkrCA4AIE/w/6UE
-KgCB3hDJa9Ng/ywAABcANWBtWQUGA4YAT2eLoA8CAA8CAKm7/wIABgCYxtCboNEPiieNEcDA+qwg
-IgAAW3BYFKGaEmP8aHTbEg1ODP6mBi31ALcg8/yXYIsQUDAE3wz/pgYt4gC3IPP8hGCMEFAwAAAA
-AADz/s1gABAoMAAAK3wY+iwAAgAAYLBYHG9j/psMWAxj/nXAgJjL8/8pYgAASvDAkJmj0Q8AAAAA
-APmEDAA8ADTgjBEEShT+rAgiAABA8P7MNgIAAHpwbckFCAiGAE9pjBGkOPrMDACAAntwbckFCgiG
-AE9riicqrCAEvAys3CzMQJxw8/7Mb8AQIDAAAAAAAADyhAwANgA1oARLFP28CCIAAHiw/V02AgAA
-QbDTD23ZBQwIhgBPbQRoCPteDACAAnswbekFDgiGAE9vBJ8Mr88v/ECfoNEPAAAk3ECUcPP+cW/A
-ECAwKMxAmKDRD2wQCBmeHCsxCicwRP0yBCAiEHAw/zBFIgAAYLD6CgAiAAARMPSeFhxwAWww8PYR
-AA4A4/B6/3GMMv8yAyABZjcQ/wIAAAFiMxAbnUgrsnwoklmvuwm7EfoWACgAIFowmBFkcv8cncMM
-bAF0yTYqMDxooTP/AgACARaGoGilUv8CAAYBHQagfqEdwtN9qRj6EgEiAABY8PwsAAIAAGlwWN+o
-0Q8AeWYU0Q8YnSIvMSf/AgAGAGdH0JoQY/+k+hIBIgAAWPD8LAACAABpcFgDJ9EPjREp0AUqCkZ6
-mcop0gcrmRRkse4rkgkv0GgZnbkssgH6sBUgAgJ78P/UaCABEHAw/tRcIAgQQDAo1Gco1GT51Sog
-ABBAMCjUZijUZf4wTiAtEEgw/zBPKiQBUDD41TUhpAJSsPjuEQAuEEAw+pg4DgkAe7D41FcgQRB4
-MC/UdC7VNy6wFf5uFAADEFAw/AxHDgAFdpApsBQp1GD+MhUiAABTcP8yFiIAAGlwW/yJ0Q8vMDwP
-AgAPAgBo9mN+8WCaEI0R/tE3IHgCSPDwCRYAuAJDcABIYf8xJiAQAlBw/9U2IAMQYDD+1TcgugJb
-cFkqKosRwMP6vF0gwgJa8FkqJooRKxwIDwIA+qxhIAMQYDBZKiH+CiIufAC14GABdAAAL8AE/wIA
-BgB2A+AanaoN3AkMzBGsqiqif2SumYw2+w1LDQgBYDAvoRkPD0t/2Q6Lqsi5KLE/fIELi7llv/SK
-qWWv4tEPirqbFPoWACArADagKzxBmxMqrE77EgMgAxBgMFjigP4KIiCDADagihCKqPoWAC/iALag
-ixRkvjgdnYEt0X/8MDwgDgB7cGjGfH7BbY0ULdEI+hIEIAgCWHD8PAACAABxcFgDS40RZd70Y/4E
-AAD6EgEiAABY8PwsAAIAAGlwWN8i0Q8AAAD6EgEiAABY8PwsAAIAAGlwW/3z0Q8AAADz/hBgABBY
-MI8QnxRj/4UAmhCcEfP+qGIAAGswfdeO8/+QY/8QaDAAKLAE/wIABf++AiDRDxmdWtMPKZF//wIA
-Af7JelD6FgAgQAJg8PrcAAIAAGhwWOMS/awAAEkAtqAqMDwrCoH/AgAP/rTakIoQZK1f2zD9FgEi
-AABgsP1cAACEEHAwWOJM0Q8AAAAAAAD6EgEiAABY8PwsAAIAAGlwWOFf0Q+aEfP84mAiEHAwAGwQ
-CCkxDyowLB+cxfswLSSRALZgHZ1E+KoRD/sQcDD7nUIaCQBasPzc1CBWBHqw/wIABgBQ3pAcnT39
-nQQWAWlmkP6dOxYBiW6Q/wIABgFVdpDAINEPizQowoL20ogqcAFYMP2nB3IAAEqwDqkBqYgJiBH4
-ZggCAVim0CswN/8CAAABdwbg+LbIYBEQSDB5ucAqMEIrMEMIqhH7CkMqCQBasHuprCswRCwwRQi7
-EfwKRCoJAGbwfLmY+iwAAgAAWPD8TAACAABpcFjFacAg0Q8AAAAAizQpMC4qMC/4MDApgAQ+YPqZ
-AgpwAVgw+JEMYgAAErD/AgAH/60aYCkwMQiIEQmIAv8CAA//pPoQJTA0KDA1CFURCFUCaFEH/wIA
-A/+ZGWAnMEYvMEf0MEgngAQ94A93Av8wSSeABD3g+JyTFgkAJfD5nPsXgAQ94A93Agh4Af8CAAf/
-fc4QGJz3GZwsCHgB/wIAB/91ThB9pwIOogEowoIk0oiiiAmIEfhECAIBKabQFpxjHJztLzA8/kIH
-IAUQUDD4MD0gMBBYMPkwPiIAAGiw/uIOL4AEP+D4MD8uCQBH8P4WBC+ABD/g/uK/LgkAT/D3FgAv
-gAQ/4PUWAS4JAEfwWTExKzBGLDBH/TBIK4AEPuD1EgQqCQBm8PwwSSuABD7gDbsCCLsR/LsCAgAA
-UXBYxHRkrkYqUqj/AgACAL0CoP8CAAIAuQagKzA8LDA9/TA+K4AEPuAMuwL8MD8rgAQ+4A27Agi7
-EQy7AigwNS8wNJsQJTBGJzBH/SwAAAUQUDD5MEglgAQ9YPycuBQJAD1w9zBJJYAEPWD5VQICAABx
-sPhVEQAwEFgw+P8RBAkAPXD1FgEuCQBH8FkxAykwNCowNQiZEQqZAv8CAAAAzYZg/wIAA/7UmmAu
-MD4YnKUrMDwsMD39QRkiAABRMPYPSwuABD7g/DA/KgkAZvD43QELgAQ+4P/dAgoJAHbw/Q1PC4AE
-PuD8uwIAbAJg8FjDg8Ag0Q/6LAACAABY8PxMAAIAAGlwWOPlwCDRDwD6LAACAABY8PxMAAIAAGlw
-WOKQwCDRDwD7MQoiAABRsFjFH/0KASAAEHAw+t44AAAQYDAO3Dj1zTFmBQBSsGP9AAAAAAAAAAD6
-LAACAABY8PxMAAIAAGlwW/5EwCDRDwCNYC5gNf8wQiAFEFAw/JxyEDAQWDBZMMXAINEPKzA8LDA9
-/TA+K4AEPuAMuwL8MD8rgAQ+4P9SkioJAG7wCLsRDLsC/wIAD/9E29BoowTAwyxWqMCl/JxhEDAQ
-WDBZMLPAINEPJjEKDwIADwIA+kwAAgAAWbBYxPL+CgEgABB4MPrvOAAAEGgwD+049NxTZAUAUrAn
-MEYoMEcqMEj1MDQngAQ94PkwNSYJAEXw+DBJJ4AEPeD4VREGCQBV8PlVAgeABD3g8/1QZgkARfAu
-MD0sMDz9MEYiAABRMP8wRyACEFgw+DA+LYAEOyD43REMCQBzMP4wSCwJAH9w/zBJLYAEOyD43REM
-CQBDMP4wPywJAHdw+MwRDYAEP2D/3QIAbAJ48P78AAwJAHMwWMOzwCDRDx+cKyLxfy7yQfn1gCIJ
-AEiw8vV/IAICc7D+9kEgABAQMNEPAAAAAGwQCBmbUSzBF/UiByIAAFFwH5tO8yAHIgAAWPAoWRTy
-UgkiAAA4sPMuQAIgARww8D0RDqAEO6D/URUuCQB7sP6mACwJAGsw/nIALAkASzD8pgQgMBBoMPmm
-BiGgAkIw/JryEAQQSDD8pgIvgAQ7oPxcIC4JAEuw/qYBL8AQcDD9pgMuAEBzMP79CAAAEEgw+aYF
-IIACa3D4VRQqAIbokP8sMCBAAiqw+VwACgCC/1AEAoYASWUCAoYASWMAAoYASWGCwSIsMP8CAAYA
-l2yQksEoyQRkgGItcCyMrAS+Ef7dAgH+Alkw/LsRDAkAazD8pgwqACBesP1SASBAAlrwmxL8UgIg
-ABBIMPwWASAAIi9g+RYDIMgAh3CLUfhsEQrgAVwwDLsCm1Eam9kMOBH5TwgIACBSMJ+A0Q/A8P/F
-BCCAAmuwncGdwPP/i2AAEBAwAPsSAiIAAFHwW6g+iFErEgL8EgEiAABKsPoWAy3ABD6g8YakegAg
-bvDacFuoDY9RjhP4aBEO4AF8MAj/Av9WAS4AIHKwGJu+DD8R/k4IDgAgR/Ce8NEPAAAPIgySWWP+
-7gLZDAlIFPgWACIAAGlwbYkFBgKGAE1niBD5rwgAgAJrsP/8ICIsAD4gkhSCEMCDAogMbYkFCA2G
-AE9pCeIMIixwksFj/tkAACLsQJLBY/7PbBAGJDAHGZqDGJp/+ZCAJCABIDAMRBGoRPhCOiBuAkpw
-CUkUuJn/AgAKAFXOECtCORqanfm8AAChADbgAAqLAElhAElhAElhAElhAElhGJuQ+ZtWEAEQYDD6
-IgAgABBwMP4WASAAEGgw+RYAIAAQeDD4FgIgAxBwMFgUrCkxBxuaZwkJSgyZEfibgxgJAF5wmaAZ
-mmX/IgAgARBgMPykGSAQEFgwm6P5pgIgAhBwMPj9EQ4JAEfw/6YELAkAd3CdocCF+EY5IAcQeDD/
-JAQgQAISsNEPwCDRD9Kw0Q8AAABsEAYamkksIAcookrAQfSBBmwgAWAwK6JJ/rwAAQYANuAdmkQo
-0IAMyxGqu/+yOiBuAkIwCEgUKIwW/wIACgB7x9ArsjlksOyJJ8DALCRUL5kUh5lk8LiPcSkgFA8P
-Rwmfh/kkFCwAdhJgFJtTGZpyKHEXjHkvcgj/1jMgABBwMC7WMvyKFAyABDsgLNY5+tY4KAkASjAo
-1j/4+BMAIBAwMPjWPiDwAikwijAuQn8tQoQpQoIvQoMoQoEAYAQPDxsICBuZEv0WACABEGAw+BYB
-IAAQaDBYFF0kTBj1ScpyAABasIl0+iwAABAQYDD8mQIAABBwMPl2BCIAAGrw+zIAIBMQYDBb/wbS
-oNEPAAAAAPP/Q2IAADsw8/79YAAQWDAAAACNImTQYvQkVCAAEBAw0Q8AAACOImXv7SvMGPosAAIA
-AGCwWBkd9CRUIAAQEDDRDyUgFf8hCS/wEDAwBpYB9pgMBEAEPWD4JBQvgAQ/4PzkAC4JAC/w9uQD
-LgkAJ/Cf4SSmSWP+4QAAANog+wocIgAAYLBYGQn0JFQgABAQMNEPAABsEASGMMSC+QqEID4QODD2
-hlcAMBAgMPRhPHAzEFAw9qIJcDcQYDDDsXtqCvbCOHA1EGgwfWIwIiAFdyFO+CFLcD0QcDD/CoUg
-PgRwsP81CCABEBAw0Q8iIAV3IQ74IQtwLRAgMHQhA8Ag0Q8oMDD7Ov8l6gA+ICoxCPuhGHABEBAw
-KTUI0Q8AAAAAAPk1CCABEBAw0Q/AIdEPAABsEAYvMDwuIAcrMQuGLv0iACogAXAw/LzEIADIh+AX
-mrr0FgAmANMb4C9yWQloEfeZrh4AIEfwKPAF/KYRAD0QSDD3vBMmACA5sPdHFA4A0soQKWI6d5MF
-JGI5ZUB5iCJkgTYFCUf/AgACAJYaYIonjxCLqP2hFS/AEBAw/KILIEACcrD4qRQiAEATsPLdCA/A
-BD/g/dxAJgC1XxCviPilFCoAIHrw/wIACgCvV1CIEMk0+bwAABIANiBtiQUAA4YASWGK4A+qCP8C
-AAYAwm6QmuDRDwAAAAD48QgpgAQ/YP0hByAGAirwBUUU+CUIJAkALnD8RQ8oCQA+cJlB9UYJIegC
-WvD+JUAJAAQ+oPqamx9AAWgw+0YDIAAQaDD9RgUv4RBYMPmalhgJAEow+lUQD8AEO6D7RBguCQAr
-sPWZuxoJAFMw+kYIKAkASjCYRPqZbh4JACuwnkCaQinyH5lL+PIeIKgCWPD4RgoggAJRMFkm4okn
-KvrA92Y5IEACQnD6CgAoAEBSMPqVFCCAAkIwmJmYmNEP0Q8AACusGPwsAAIAAFCwWBh1Y/63jCf9
-+sAgQAJbMP0KACoAQG7w/cUUIIACWvCbyZvI0Q/C4n752i9xf3331PosAAIAAFjw/BIAI/8QQDD4
-JQgiAABpcFjP8NEPxZX5JAUiAABQsFgNzNEPwLCbq9EP+90MADYANOAsEgANSRQonAj4zDYCAABQ
-8G3JBQIKhgBLY4sQKixA0w/5uwwIACBs8G25BQQJhgBKZQ38DKwsLMxAnODRDwAALSxAneDRDwBs
-EBD6mkoQABA4MJcQlxGLQSqifyggB/ZCACIAAEmwLKEC9zYAKCABQDD2hlcC4AFcMPuhBCPiADcg
-mRSOoC2hBf/M/yH+AmLw/6UCLcAEOyD87AgNwAQ/YA3MDGAAKAApoQUsoQSxmf6iACngAUww+aUF
-JgFOzxCwzAzMEfzsCA3ABD5gDcwMAAyLB9dg8AyAD5wAu2AZmiYvoQUuklH8kk8vkAQ/4PuSUS4A
-IH9w/xYMI2oAN6CNwY/An9COwJ3hJ8YA98YBIf4CWvD7llEoAboDICfFECXN//kiACVAEGgw+/rA
-IDACUzD9xREqAEBasP2ZHxCAAlqwmxebxpvH+VY+JgEMAaCaHY4cLSAEnB74Fg8v4AFwMP4WCiQB
-PINgw/D/AgAGAST9kMCRH5jYDI4Rr+4r4jqNEJkW/xIBJAGMQuAp4jlkkw0jFhAjIQckFhEUmNT9
-FgUjQAEcMPIWEiPABDzg8IQEAgkAJPCTkIsgLBYTmxj7CigjgAQ+4PuWAyAEECAw9JjKEgkAJPCT
-kZSSJBIRKyAE8xIQIf4QYDDzFhAiHwF8MPsWCSgAwYLg/wIABADWhuAtIEwrIhKbE50SHZncDY0C
-nRuTloIVE5nb8nIUCxcBFDDzEgYiAEAYsPyZ1RoAQGbwjRPzEgoiCQAYsPOVCywAQGPw8pUKLoAE
-P2Cfnf+Zzh3wBDsg/BICKgkAZvCCG5KUm5cNzBj8lgwgABBYMPwSEi3gBD4g+5YILAkAf3CdmSzA
-BwwsQP16/yxgBDsgDcwCnJsiEhMcmb0Iiwn/UZErwAQ+4PlSSSwAIGLwLBYVLMJ/8xIVIAQQaDAt
-5jkdmbQuMn+SwByZAP5WQS4AIFPw/xIULAAgazDyEhMqACBm8CtWQCI2fy1SRiMSEPISEiCAAnOw
-/NwABgEk7lAtWZAMPxH/xwgMACB/cP1VkCoBIL+Q+cwAABkANSDJMW05BQAEhgBJYSdSRtMPDwIA
-r3f/AgAGATJ10CdWRokc+QlPBp4AOaCZy4ogCKoRCjoC+sYBIAAQEDDRDyelBfP9YGAAEEgwK0En
-/wIABgBUbtDz/gJgABBIMAAbmYCNGCuysAvdDBuZhAvdAp0bY/6EAAAIbhAOngKewI0gCN0RDT0C
-/cYBIAAQEDDRDysgUC0iE50TmxJj/lMALkAYmh2cHvgWDyCAAP+wtBr8CgMgOgJZMFklxogfjB6K
-HWP9lQDaEPwKAyCiAliwWSXAtBr8CgMgnAJYsFklvYgfjB6KHWP9cQAA2hD8CgMgMgJZMFklt2P/
-s5odjxwpIAScHvgWDy/gAXww/xYKJADWBmCaHZwe+BYPJDQAOmC0GvwKAyCCAlkwWSWqiB+MHood
-Y/8g2hD8CgMgogJYsFklpGP/2QAAIgqI0Q8sklKNwY/An9COwPmSVCIAAFpwneGXwPfGASH+Akpw
-+bZUKf5KGyCLHMDA+wtPAAEQaDBYDxQiCojRDxuZPo0UCIkJ9r3+KcAEPmCmlvuZCAIAdQdgK2KB
-nLArVkEpVkAsZoEsUkYuUZEpUkmq7v7sQCYAhuZQJ1mQDD8Rr3f3VZAmACBn8P8CAAoAgL+QyUn5
-zAAAFwA04G05BQIEhgBJYydSRtMPDwIAr3f/AgAGAJJ10CdWRipigoii+RIMIgAAIzD5VYkghQA2
-IIogCKoRCjoC+sYBIAAQEDDRDydWSfP98mIAAGJwAAAA/O0MADYANSANThT77AgiAABBMPs7NgIA
-AEsw0w9tuQUECIYASWUoEgf+OwwIACBtMG25BQYJhgBIZw3+DK6uLuxALlZGY/2ijxcvVkZj/Zoo
-YoCcgSlWQShWQCxmgGP/FiugBwsLQfu8GCIAAGKwWBbrjCAIzBEMPAL8RgEgABAQMNEP2hD8CgMg
-kAJYsFklQ2P+UydWSfP/MGIAAGJwAPztDAA2ADUgDU4U++wIIgAAQTD7OzYCAABLMNMPbbkFCAiG
-AElpKBIH/jsMCAAgbTBtuQUKCYYASGsN/gyuri7sQC5WRmP+4o8XL1ZGY/7abBAELCAH/SICIgAA
-IXDzIhgvwBAwMPQhZmwgAWAwZdFeHZedDMsRrbsusjr/AgACAKFDoCqyOR6XwPmsAAE0ADagHZed
-AA6L/peZH/AQeDAASWEASWGeoCwiAPkKCCACEHAw/aYCKYAEOyD5pgMoCQByMPimASYAhP6QH5i4
-D88CL6YELrY5KiICZKANWRZD+6wAAgAAULBYEGOMPdMPyMn7Mg8iAABQsAvAAIon/ZgWEAAQIDD4
-mBMf/xBYMPSgQ2BAAkqw9KUUKABANnD7pgAggAJKcJmp+aYIIBACWrD0JgcqAFNWECjSfR+YCCzS
-f5uBn6Mu0n2eovvWfSACAmMwLNZ/lC6ULyQmECQmESQmEiQmEyQmFCQmFSQmFiQmFyQmGCQmGSQm
-GiQmG/yYjBAFEFAw+wowIDgQaDBZLMkkJAQkJAWUIiQkICQkISQkIiQkI5QplCqUK5QsJCUa9CUb
-IgAAUPBYeELAINEPAAAAACvMGPosAAIAAGCwWBZrBAlHaJIjwCDRDyjSgC/dAizSgpuBn6Mu0oCe
-ovvWgCACAmMwLNaCY/9aiycsuRT6sgkgQAJK8AaZAfmcQCAgAmMw/LUUIeACUrD6tgkqABlKkC2x
-Ff+XOhwAIFdwnbmf0I4gHJhg+O4RAAEQeDD81gIuCQB7sP7WASAAEBAw0Q8YlzCYoI8gHphX+P8R
-AAEQEDD+pgIuCQAX8P+mASAAEBAw0Q9sEAqMNRqYSf6YTxloAWAwCIgJ+ZeUGcAEOiCuji7if6qZ
-+YgIDxAQWDD76wgGAgxHkIrhj+CfoI3gKekQ+tYBIAAQUDD65gAs4AFgMPrmASHTADZgheeNUIdb
-DYRX9lIBIfQCeTAP1zgfl0gZmDcGiBQj8pMJiAH5mDUZkAQ6IPixgSIAIETw9gZHAfACa7D3B08G
-ANXOEJ4YnRX7FgQj+QC3IP8CAAYAwgEgKFEImBIZlxiMIPy2OiCQAliwmxadJ/AJBwBAAkiw8Amg
-AJwCaLAASWEASWEASWEASWEASWEuMAT/AgAEAjIHoC4xIhuXJ48wLDIWK7KTnC3+JSItkAQ7IP8m
-DioAIGbw+xYHIgAAU3D/sHwgBhBgMP8kQSDYAlrwWSRYixeKFvu8ciAGEGAwWSRVKixh/AoDIKIC
-WPBZJFEqLF38CgMgnAJY8FkkTokSjjn6l/4QTxBgMP4mCyAAEGgw/SYMIAYAN6CS7JI5KDAMLaJD
-LzAWKzEH/jAHIAICa3AtpkMqMA0pJQgsJAUvJBYoJAwrJQcqJA2KIP4kByAGEFgwKyQE+KoRAAAQ
-WDD7JgIqCQBRsPpWASAwEHAw9yUJJgEKgSD/CjMmAGP1EPTyKXAxEEAw+EIhcD4QSDAqMAXEsvcl
-NiYBRE6Q/Ao9JgFAXpD/AgAOAdhikBiWqwhICiiCEPosAAIAAFlw/GwAAAIQaDALgADAINEPAAAA
-APP+L2IAACqwKfHz/wIAAf889lAsOv+cEmP+cRWXxChSQ/q1gSH+AkIw+FZDIHgANyAZlyL/AgAK
-AbhuUCjyKR2XISryK56BLbY9LPIpLLY8/vYpIAICUrAq9iv6UkQiAABZ8PwKACABEGgwWA1+wCDR
-DykwBPclNiQA2YJg2jD7XAACAABgsFv8kWSvTvosAAIAAFlw/GwAAAIQaDBY4GjAINEPABqWkowg
-LLY6nSfwCgcAQAJIsABJYQBJYQBJYQBJYQBJYQBJYS0wBPQsTiCQAnCw/hYGJAF5h2CNMCvykywy
-FiwmDS0mDv0xIi2QBDsg/SUiKgAgZvArFgcssHz8JEEiAABRMPwKBiDYAlrwWSPUixeKFvu8ciAG
-EGAwWSPRKixh/AoDIKICWPBZI80qLF38CgMgnAJY8Fkjyo45/iYLIAAQYDD8JgwgBgA3oJLskjko
-MAcpMQkvUkMrMQcsMA0tMAz9JAwgBhBwMC4kBCwkDfslByP/EFAwKiUI+SUJIAICe/AvVkMoJAcv
-MBb/JBYgTxBwMP4kBSAAEGgwnSL3JQkiAABQsFgKu8Ag0Q8AAAAAAAAA9yU3IHgCUXDwChYAuAJI
-sPAJoAADEGAw+FEmILoCGLD3JTciAABY8PglNiAIAlBwWSOeLyBhLiBiLjQB/zQAIAgCWHD9IGMg
-AxBgMP00AiDCAlCwWSOV+iwAAgAAWXD8bAAAAhBoMFv8UsAg0Q8AAAAAAAAqXBn8CgMgogJY8Fkj
-iypcHfwKAyCcAljwWSOHY/4xAAAAAAD6LAACAABZcPgKhCIAAGGw+FUIIAIQaDBY3/XAINEPAAAA
-AAAAFZctKFJD8hIIIf4CQjAoVkMlUrz7CgAiAABpsPxcAAAwAlCwWA0xihUZlof/AgAKALnWUByW
-L44UKMIpH5aEK8IrkoEv5j0twikt5jzyxikgAgJa8CvGK/KXFxIAAFDw+xwAAgAAYXD9CgAgAhBw
-MFv8tv0KiCngAVQwfZkcaEYZKlEIKzr/DwIAe6ENAzoC+1wAAgAAYbBY4Mr6IkQiAABZ8PwKACAB
-EGgwWAzQwCDRDwAflqSIMJ0TLjEpLTB8LiUi/SRBIAYQYDD4Jg0iAABS8P8mDiDkAljwWSNEihP8
-CgYg2AJY8FkjQY47/iYLIAAQSDD5JgwgBgA3oJLsiRIalu2SO/P7z2BPEGAwAAAAAAD6LAACAABh
-sPsKhSACEGgw+1UIIgAAWXBY36fAINEPACnyLBiW4SzyLp6RKLY9LfIsLbY8/vYsIAICYzAs9i5j
-/JAAihYrMHwdlnosMSmOMJ4tLCUi/SYOIAYQYDD7JEEg5AJY8FkjHdpA/AoGINgCWPBZIxqOO/4m
-CyAAEHgw/yYMIAYAN6CS7JI7Y/09AAAZldSLFC2SLByWxCiSLpLRLLY9KpIsKrY88pYsIAICQjAo
-li5j/o0AbBAEKzIFC0lR+pXTEOsANmD/AgAAAJWGYP8CAAIAYYJgLKJ7aZNu+qKELWgBXDANzAgJ
-zBEMqgiIosee+wtHCABASjD4pgIgOAA24PizSmAWEHAwfrkoiacvmRSLmWTwXoi0jLHBkPmIAgAF
-EGgw+LYELOABYDBYAebAINEPAAAiphT6JggiAABYsFv7F4woyKKKwsugwCDRD4mnwNEtpFYsmRTA
-sPumFCAGADcgi5mMsfwMRwADEGgwWAHVY//N8/+dYAAQWDArwAcLC0H7vBgiAABTMFgUc8Ag0Q8A
-AAD6LAACAABY8PxMAAIAAGlwW/4qwCDRDwAsonv6ooQtaAFcMK3MCcwRrKqJpx6VbY00LJkU9MBA
-bABAd3CMmf3GBy7gAVwwL8QbLqAGsO7+pAYgARBYMFuvgcAg0Q8AAAD6LAACAABY8PxMAAIAAGlw
-WOBjwCDRDwDz/8JgABBgMGwQShmVmiwgByUWhocw9Uz/KOABKDD8DEECAAAxcPl3AQIAgQIgiyL6
-IBQgBgJ5cPiVIBYFADvw9bGUYAYCcbAMzREI3QgtFoct0jouFoX5EocqAPL3UCmSOfkWhCGHADZg
-K4JKZLFrKYJJZJFlCqSH+iQULADBkqD4PBAgKgA9IPpM/yIAAEhwbakFAAiGAElhIhaA+h0CIgAA
-WHBZIU0KqAL6Fogg/gA2oCoKA/scAAIAAGIwWSkkyXP7EoQiAABQsP1sAAAQAmDwWA8l26D4QRdi
-AABAcPpM/yIAAErw0w9tqQUACIYASWGNM/xcEQIAAFCw/DICKgAgZvBYDt0sEoeKJ/sShSIAAGkw
-+8Y5IEACUrD7TAAAABBgMFgMKNKg0Q+KJ/uiCCnABDkg/aEVL8AQeDD5ogsgQAJysP4Wgy4AQHuw
-/haBLAAgd3D93EAmAHdeUCmpFKiZ+aUUKgAgWjD4FoIqAHTXUMoxyU/ZsG1JBQADhgBJYSoSgy4S
-gg8CAIqgDwIA/qoIAgAAMXD/AgAGAIpukC0Sg5rQ8/6FYgAAGvCIEBmV+y0ShvwSASj4AUAwCYgK
-KIJYKhKA/AxHAgAAWHALgAAoEohj/tsAwCDRD9og+wocIgAAYLBYE9nAINEPK8wY+iwAAgAAYLBY
-E9TAINEPAP0gFS/wEHAw/CEJLgBAcrD+rwwAARBYMP8kFCxABD9g/pQDLYAEOyD9CgAsCQBrMP2U
-ACwJAFswnJErhklj/kDz/h5gABBIMMDwn6vz/d5iAAAacAAAAAD72gwAOgA04ApPFP38CCIAAEDw
-/U02AgAASvDTD23ZBQAIhgBJYSkSgao40w//TgwAgAJKcG3pBQIIhgBJYy4Sgi0SgQruDP4SgywA
-IHdwLdxAneBj/vUALxKBKBKDL/xAn4Bj/uYAAGwQBiggcvogBSAAECAw+QoIL8AQMDD5iAIAFBAo
-MPgkciYAaa6Q9QoLIBIQGDD6MzJwARA4MHOhZvMKCSoAwIagdaFs/wIACABABqD/AgAGANEekMC5
-+6MGf/UQEDDRD9JA0Q/aIFiSd/osAAAAEFgwWBBcHJSnjiAjJAUtwn4swpOu3QndEa3Mjsct7CAG
-3QH05RQggAJrcJ3pnegkxAWNIvOUVRFeADdgKiAFY/+jAI4iZe+d2iBbxLRlr+vA+v8kBSAKEFAw
-iCJlj4baIFvElmWv1IkiKiAG8yQFKAkAPnD5JgIgAgJSsCokBvP/Y2AJEFAwiScrmRT+nCAgYAJ6
-cP2SCSFqADbgg/DAsP83DAGQAhjw9zs5AgBAN7D3ChYgZgA3YIjg0w99gVos0AD5ChUmAFwvEP8C
-AAYAWE8Q+AoYJgBUPxD5ChkmAFBHEPgKGiYATE8Q/wIABgBIRxAs0Acp4QWZEPOZCA3ABDsg/N0I
-AIACSnD52zlyAABjcP3MAA+iALcg/QotIBwANuAssAB9wVWOvsCw/vgMAZACc7AI6zllv+cvIE7c
-QPAAO2wFAHnwjBAM3Axj/8IAjSJl3pDaIFvElGWu3i8gBo4iwIz4JAUgAgJ78P8kBi4JADuwniLz
-/mxgDBBQMCwkcWP+M4kiZZ5cwKgqJAXz/lRgCBBQMCsySg8CAHWzaisySWSwZNog/CEJIAAQaDD/
-Cv8gABBwMFiR1/whIyAAEGgw/goBIgAAWrD/CgIiAABQsFiR0C0gBowi9TZJIBEQcDD+JAUgAgJr
-cP0kBiwJADswnCLz/e5gERBQMAAAAAAAAPP+lmIAAGkw2iD7ChwiAABgsFgTAmP+IWwQBIk/GpUU
-hT6VkPsyDiBwAjDw9JRyEAAQQDDyVwwAABAQMPm2ASGQAilw+DYPIgUAOXD4Ng4qABGdEC+ifR6V
-Byyif5bxnj8ton2dPvamfSACAmMwLKZ/0Q8pooAkooIorQKWkZg/JaKAlT72poAgAgIhMCSmgtEP
-AABsEASKIseN+ilTABgAerAIqAGYItEPAMieWRJ326D8IgIiAABQsFkmGNEPAGwQBIkniJz1CiMg
-JBAwMPKcMCAAEFgw8okMAZACQjD5izkAKRAYMPQKKyA9ADbgYAARAIq+wLD6LAwBkAJSsAyrOcq0
-LLAAc8noLbAQ+rAfIcQII3B1oQJ2qdfaIFv/vvusAA/gALag0Q/RD2wQBPQiBy/AEEAwJUwg+FUB
-AAAQGDDzRRQggAIpcJVJlUjRD2wQBCggcNMPfIcUKiAH+yIAKgIBUDBY3xTIp9Kg0Q8AwCDRDysg
-cCwK9wy7AfskcCIAABKw0Q8AbBAGijeLNvkgBy/AEDgw9QhHDwAQYDD8uwEKAEBisPkFQQIASpog
-jifAgCgmFIzoLeEV9uILIEACe7D39wEAABBIMPjpFCwAID9w/dxAIBwIYbCZ6/AAX2IAABmwDEYR
-poj45RQuACBhsPzZDAoAxXNQ/TwAADUANOAJSBT4FgIgEAJCMPhINgIAAHMwbYkFAA2GAE5hiBKp
-PfhIDACAAnHwbYkFAg2GAE5jCW0MrX0t3ECd8AzDAo4iyOLAINEPjDQdk0/+lIoQARAwMPxZEQAA
-g+8QrZkvkjr9MQokAUXD4CySOf+TSxAoECAw+JNMEngANyAuIQcODkoM7hEP7gKewIcgwPT4xgIv
-gAQ54PTGAy4JAHuwnsEkIATwhAQIAPIBIP6UYBQA+AUgLyBMKCISmBGfEA5eAh+UW4cRhBD4eBAO
-AEB+sPdEGA/wBD/g+MYNJh8BVDD3xgYpFwFYMPTGDCH+EDgw95RjGABAOjD0lE8YCQB6MJjHJ3B/
-C3gU9JRMGABAIjAtxQv+xgQv4AQ9YPh3Ag4JACfw98UKIAAQIDCUyJ/JLyAHDy9A9Hr/LmAEP+AE
-/wKfy8CEKJY5hDTGfwdEAZQ0jyIG/wL/JgIgABAQMNEPAPoKCCIAc3MQKSBUy5b7IhQiAABQsFv4
-utKg0Q8AAAAA+cwAABQANODITG1JBQQDhgBJZY7wBu4I+HxALgBU65CY8GP+lykgVWWemCsgVmS+
-ki7SSmThXCvSSWSxVhmS9SmQgAxfEa3/+PI6IG4CSnAJSRS3mf8CAAoAlU4QJ/I5ZHEfKSAUCZSH
-+SQULACdkmArIhRksNP8yxQMCQBXMP02BCAAEHAwwJApJFaIMP8CAAIAZyoQiTGFMvaRSmIAAFnw
-9goAIgC1BlCKJ9tA/AoAIgAAaTD29jkgQAJSsFgKFtKg0Q+e8GP98ividCriiwzMFKy7+bsRAgAA
-aTD7qggCAABg8PomFCIAAFiwW/hE+SICIDwAtqBlncjaIPwsAAAwAllwWBHlwCDRDx6T+y7igh+T
-7A5+DPP+JW4JAHuwLyBQKCITmBGfEGP+EAAAAPYkViwJADJwnCKKNMe3C6oB+jYEIAAQEDDRD8HQ
-Dc0C/TYEIAAQWDDz/ytgiBBwMNog/AoEIgAAafBb96XSoNEP2iD8LAAAMAJZcFgRyMAg0Q8A2iD8
-LAAAMAJZcFgRw8Ag0Q/aIPwsAAAcEFgwWBG/wCDRDwAAAP4hCS/wECgw+CAVJABALnAFnAz8JBQg
-ABBgMPSIEA+ABDug9bQDLgkAQ7D8tAAuCQAzsJ6xJtZJjDRj/osAAAD/FgMiAABQsPt8AAIAAGFw
-W6AWiTEvEgP8qxECAAAysPt7CAH/TwZQnxP6LAACAABhcFuf5Y8T8/6HZgAgMrAAbBAEFpMTImJ/
-wHDzYn8gJQA0oCJifYQhiCCYQIUglFGXIfcmACH+Ahjw82Z/IfACELDRDyJigIQhiCCYQIUgI2KC
-lFGXIfcmACH+Ahjw82aCIfACELDRD2wQBIooiacomRT7kgkgMgA2II2iwPD/JAUv/hBwMP8kBCwA
-QHdwnaKMsS0KA/KmFCzgAWAwW/7U0qDRDwAAAADz/85gABBYMGwQCC4gBPcKFyYBJweg9QxHBgE1
-P5D8FgMiAHODICswEPgKASArEGgw9gotJgH37tD3CjImAg220PwSAyYAob7Qwob/AgAGAODG0IoT
-KSAHLAoADwIA+QhBAgCBgqCLIpwS/pI3EzIAtuAMjRGu3Z0R/dI6IAMQcDAOTjeeEPoSASoBhPdQ
-KqI5HpJ++xIALAIBTDD0ovNsoAQ/YA7dAp2gjCD+EgMgIAJKsP2SLR2ABDsg/aYCLAkAYvD8pgEu
-AYMi0I8wDw9H/6YDIgGbm6D4PBAgHgA9ILBKbakFAAiGAElhwKCJEYgQKJY5JiAE+yAFIAkAtaDM
-sWSjmdKg0Q8AiDKMJwiLV/TDVWx8AUQwFpI0HJNJAAaL9m0CIBACQPDwBqAAIAJLMPEDFgIAAHMw
-8h4eAgAAGzBt2QUACIgACYr4kz4X0AQ7YL9kBEQU9oR7IAICITAkhH9j/sOGJ4psJmww/wIAB/97
-NpArrMhkvuvAwZwSYAIeAAAAAAAAAP8CAAP/Y5sgKSAiZJBDLiAHH5J0wGD2JCIuIAFwMA/uCS3h
-5qndLeXmKSAiZJMqHZMkLdIWiivw0QQB/gJicADMGgCLGvu8/yoAIGKwC6oCmiooICAuIAXAlAmI
-AvgkICP/NRugCApD/wIAC/8vmqDAsPskICIAAFCwW6yowMAsJBQsJAVj/kKNE/8CAAP/HptgjifI
-6NogW/1L2iBb/jopIAX4CgggwwA2YC8gIAj4AvgkICP/CxpgCAZD/wIAC/8FmaDAgPgkICIAAFCw
-W6yTY/+oAAAAAPosAAIAAFjw/EwAAgAAaXBb/1P8IgggZgC2oInCZJBcwCDRD48y/JLxEAUQUDD9
-IgAu+AF8MP8WBCAwEFgwWScdiBTCZv8CAAYAT7YQwnv/AgAGAFa+EMKd/wIABgBdzhDDonqJufos
-AAIAAFjw/EwAAgAAaXBY3YzAINEPK8AHCwtB+7wYIgAAUzBYELzAINEPGpLVKqLlZKHtHJLTKcLj
-jpGGkJbgj5D+9gEgABBoMJ2Q/ZYBIf4CWrArxuUunf+NIP3mPiHwAmJwnCf4JCAgABBYMPskISAH
-EFAwKiQFY/0PAAAAAAD6LAACAABY8PxMAAIAAGlwWN3qwCDRDwD6LAACAABY8PxMAAIAAGlwWN2l
-wCDRDwD6LAACAABY8PxMAAIAAGlwWN2NwCDRDwAAAADaIPuMGCIAAGCwWBCP+iwAAgAAWPD8TAAC
-AABpcFgL6Y8iZf7HhhJkbsL6LAAAABBYMFurq8Ag0Q8AHZIGHpKg/CEIIAAQMDD2pgUgIBBYMPum
-AyBAAkqw+xIDLwAEPiD2pgcsCQB7MP6mBiwJAGsw/KYEI/5oguCKJ/ycAAIAAGkw+qwwIAEQWDBY
-AEdj/MkAKDAfKwoj/wIAB/8pXhAsCiT/AgAH/yPmEC0KJf8CAAf/Hm4Q+iwAAAIQWDBYAJpj+/wA
-APosAAACEFgwWABpY/vsAAAAGZIMCA9R/iAHKAAgT/ApkIAmCvv27gEJ4AQ+YPYK/C4JAEuwBu4B
-+CUILgkAe7AuJAdj/HmJJxuRxfwKAC//EGgw/ZYAIBACQnD8JgcqAC3O0B+SYyvy4xaRvi7y5Zix
-lpMi8uOSkvj24yACAnOw/vblIgAAErDRD40pnSpj/PAfklcp8uaKkYyQnKCLkC7y6Pq2ASAAEDAw
-lpD2lgEh/gJzsC726GP+Cx6STSbi5hKSRC3i6JhhkpMv4uafkvjm5iACAmtw/eboIgAAErDRDwAA
-AGwQBNggiYCGkRyRm4uQ+2YAIgAAEPD6kgAiAAAZMPwlEQIAACFw8pI0EZACanD2pgEgABAwMPaW
-ACQAIC5w9pYBIZACKXBtSQUABYYAQ2H1kikaABlvECNSfZkxI1J/kpEvUn2fkClWfY6A8zwBIAAQ
-EDD47wwBkAJzsPNWfyIFAHuw0Q8rUoAqXQKZsZqRKlKCJlKAlpApVoCEgPqsASAAEBAw+EYMAZAC
-ITD6VoIiBQAxMNEPAABsEASFIPJUDAGQAhlwwCAEMjnRD2wQBCogICsK89MP+6oBAAAQIDD6JCAi
-UgA44GkxGfwK/SAsAHqwDKwBLCQgAioCW/0tLSAgZNBl0Q8AAAAAAAD/p/RwARAYMC4K/g6uAf4k
-ICIAAFCwW/0sKCAHHJFCKSAi9CQiKCABQDAMiAkvgeap/y+F5ikgIoorLsJ/9JAqYf4CanAA4QQA
-3RoAOxr7vP8qACBqsAuqApoqY/+N2iBbq34kJBQkJAXRD48pnypj/3kAAGwQBCogBcCIeoM4FpHg
-9QoAIEYANqAqICDAQfOpAggAD5qQ+SQgIvoAOODaIFv9ANogW/zkKiAgCgpBaqNb0Q8AAAAA+iwA
-AgAAWPBY3Cllr+sqIAVj/7KLJyxi5WW/tfli4yCRADcgjpEtYuWIkJjgj5Ce8ZWR9ZYAIf4Ca3At
-ZuUsnf+LIPvGPiHwAlJwmiclJCAlJCFj/3vaIFv8viQkBdEP2iBb/OsuIAcYkQEvICL1JCIuIAFw
-MAjuCS3h5q/dLeXmKSAijysrYhb0kB1h/gJScACxBACqGgBIGviM/y4AIFfwCP8Cnypj/zyMKZwq
-Y/81KWLmjpGIkJjgj5AtYuie8ZWQ9ZYBIf4Ca3AtZuhj/2wAAABsEAgrIAf6MgAiAAA5MPgwECAL
-EGAw+BYAKiABXDD7FgQq4AFQMPoWBigAlQYg+BYAJgCZZhDA0J0TjiKGFPiQTRAAEHgw/xYCINUA
-t6AMZhGoZiliOrRK+hYBKgCUVlApYjkqIAT5FgUhIgA2YGSgki2CSmTQmimCSWSQlCogFAqkh/ok
-FCwBNpKgKxIA/wIACACJAuCPFYgWGZA7mfCOIPWQPBzgASww9fYCICACS/D49gMvgAQ7oPg8EC4J
-AHEw/vYBIgB3m2D4QQ1h/gJRMG2pBQAIhgBJYcCgizD/AgACAHoq0CdmOSwgBP0gBSAJALcgzNFk
-orLSoNEPAAAAAAAAAPosAAIAAFkwW6uFY/942iD7ChwiAABgsFgPOo4TZOI/+iwAAgAAWPD8TAAC
-AABpcFgKk48izP2IEsiJ+iwAAAAQWDBbqlbAINEPAAAAAAAA+iwAAAEQWDBb/2JgAAwAAPosAAAB
-EFgwW/8xBQlH/wIAAgDmAmDAoZoTY/64AAAA8/7bYAAQSDCLFPWhomAwAlrw+iwAAgAAYLBYDxpj
-/3raIFjckGShz4wiZM7kY/9qjRP4Igch2gA3YPycAAABEFgw+owwIgAAaTBb/uZj/wcAAC4gBCwg
-Bx2QN4kV+yIAKAIBYDAKiBD9iAIIACAmcPTh+G2ABD7gJZQaHJAFKJQSBY8U/5QZIDAQcDD+lB4g
-ABBYMCuUHfiIFAAAEFgwK5QbKJQR/48UAAAQcDAulBz/lBggBBBwMPiIFA4JAHNwLpQWKJQQD48U
-L5QXCIgUDo4ULpQVKJQPDo4ULpQUDo4U/pQTIAMQWDDwDAcAPgJCcG26AgBIYRiQDhuRAB2RACwg
-Bx6RAPUhCCDgEHgw/5QnLCABYDD+lCotAAQ7IP2UKSQJAGVw+5QoJAkARXAllCIFhRQllCH1hRQA
-AhB4MPWUIC4DACfw9YUUAF4CInD1lB8iAABBMNMPbfkFAAOGAEhhwHAnRAaHEWP99QAAAAD8IQkv
-8BBoMP4gFSwAQG6w/asMAAAQeDD7JBQgARBYMPTuEA2ABDsg/ZQDLAkAczD/lAAsCQBbMJyRK4ZJ
-Y/1W+iwAAgAAYLBYCJhj/dyOJ4jsLuww/wIAB/8W9hAvjMhk/iLAgZgSY/3FAAAAAAAA+iwAAgAA
-WPD8TAACAABpcFgLrdKg0Q8AKSAF/wIACf8UmmDAoiokBWP+HAAAAAAA/JwAAAEQWDD6jCAiAABp
-MFgGt2P9MQAAHJAOiScbkAv9CgAv/xBwMP6WACAQAkJw/SYHKgCsTtAtwn0vwn8bkAWY0ZuTIsJ9
-kpL4xn0gAgJ78P/GfyIAABKw0Q8olBIllBoIgxT1jxQAABA4MCeUHf+UGSADEHAw85QRIAAQKDD1
-lBwuCQBzcC6UFvODFAAgEEAwKJQeD48UGI/fL5QYI5QQDo4ULpQVA4MUDo4UD48ULpQUDo4ULpQT
-LiEI/5QXLiABZDDzlA8vAAQ/4P/uAgAAEBgw85QbLgkAQ7AOjxSHKSMgFIUrJZQ2J5Qy/5QhKAkA
-QvAolCoulCIIiBT/jxQAABBwMC6UJQeHFAWFFCWUNSeUMf+UICAAEHAwLpQk+JQpIAAQcDAulCMI
-iBQPjxQHhxQFhRQllDQnlDAvlB/4lCggABB4MC+UJgiIFAeHFPWFFAKABDzg9ZQzIAEQKDD3lC8i
-CQAs8COULiiUJwODFCOULQODFCOULAODFCOUKy8kFPP7ymAGAjkwL8KAK8KCLs0CmPGeky3CgJ2S
-+MaAIAICWvD7xoIiAAASsNEPbBAIiCIdkBQrIAf8MgAh/gJJMPkWBCAOAnkw+RYDKiABXDD7FgUs
-AEBrMPwWBiCxALYghxUYjv4MdxGody5yOvogBCoAYn+QKXI59pwAAMEANmD5FgAgeQA2oC2CSmTQ
-limCSWSQkCogFAqkh/okFCwBN5KgKxIGHI99/Y99EKoAtuAFD0f4PBAiAG0b4PhBEGIAAEmwKkz/
-bakFAAiGAElhwICKFIkWDKoR9ZFHZgAgUbCLMP8CAAIAvirQjBP8djkiAAASMNEPAAAAAAAAAPos
-AAIAAFkwW6pBY/+WAAD6LAACAABY8PxMAAIAAGlwWAr90qDRDwDaIPsKHCIAAGCwWA3wY//X8/8/
-YAAQSDCLFfSiCmAwAlrw+iwAAgAAYLBYB85j/7cAjxX6EgAgKAJ78ADxBP+POhABEHAwAO4a/O4C
-AgAAS3D+9jAgAhBoMG3aBQAJhgBKYYYQ8/8jYEACMbCOJ54R+OIJL8AQKDD76RQgQAJrsPrhFSQA
-QC9w9RYCKcAEPSD5uwwAIAJCMPjmCSQAIC6w+LsyAIACKXD75RQqAPYqEGibRKiaKqzw+xYHKgC/
-VVD4QSRiAABZsLBObekFAgiGAEtjitEPAgD/2QQqACBScP8WByHgAlKw+xIHJgEVLpD61gEiAABC
-sGW+sGABgY4V+Y8eECgCc7AA4QT+jwcQARBoMADdGvzdAgIAAFGw/eYwIAIQWDBtugUECYYASmWP
-FLT/nxPz/oJgQAIxsC0gBy4gBBqOzvwiACgCAWwwCpkQ+46BGAkAVnD04UVrgAQ7IJtiHY6dKWYA
-/woEIDAQcDD+ZgMuCQB+sP9mASADEGAw8A0HACACSbBtygIASWEuIAccjrn7IQggAhBQMP2Pqx4g
-AXAw/2wgLwAEO6D+uwICAABL8P1mBioJAGbw+2YEKgMAIrBtqQUGA4YASWeCE8CQ+fQGIAgCELDy
-djkiAAASMNEPAAAAAPwhCS/wEGgw/iAVLABAbrD9qwwAABB4MPskFCABEFgw9O4QDYAEOyD9lAMs
-CQBzMP+UACwJAFswnJErhklj/VT6LAACAABgsFgNZmP9sQAAAAAIWwz7TxQCAABRsG35BQgIhgBK
-aYgS/08MCgAgWbD4jEAgHgA/4LD+bekFCgiGAEpriBIv2QQLmgyqiCiMMPjWAS0wALfgixLA4P7V
-BCCAAlrwm9Gb0PP9GGAAEEAwjxEKiAyY+WP+DROOs5lg+2YCICAQcDD+ZgMgAxB4MP4hCC4JAH6w
-/2YBJCABbDD0IBQlAAQ9YP8iCS4JACuw9SILLgkAG7CeZJVp/2YIJAkAHzDzCgAkgAQ5IPVmBiAB
-ECgw82YFJAkAKTCUZyMkFIITsyLydjkiAAASMNEPiBIojECY0WP912wQBGhDBmhCPsAg0Q8oIAaw
-iAgIR/gkBi/wALYgiSIsMAHHrvsK/SgAQFZw+SYCIlABPyB7ydH6LAAAABBYMFuoQcAg0Q8AAPs8
-ECIAAFCwWNsZwCDRDwD6LAACAABY8FjbKcAg0Q8AbBAG+I68EqAQSDAJKSgcjy75iAgABBBQMPWC
-fyAgAljw8LEEAAEQSDDwmRoCAABosPlVAgIAAHDw9YZ/IgAAeTD1FgAgIBBYMFkjTNog+zwAAgAA
-YTBYelrAINEPAAAAbBAIlxAcjxn6EhAgIBBYMPgSESIAAGiw+BYFIgAAcPD4FgIpgAQ9YPoWBC8A
-BD0g+hYBLgkAT/D6CgQuCQB9sFkjNhqPCx+OPvmPChABEFgw/o6BEAAQaDD8+v8gnwA1IGhBB8Yq
-0Q8AAAAAJCqgBCQoiBTzNwoOACB9MA93C48V/hISJAAgcTDwMQQGACBN8PC5Gg/gBD/g/v44AN8A
-NiAO/jgudXorQn8YjvP6EgUqCQBecCtGfyp1f/h2OyDUADVgaVGdihSLFVklF/0KCCAAEGAwWSRG
-/AoAI+gQaDBZJFHaIP1xeiIAAGLw/kJ/IgAAWPBY5MzAINEPKiqgCiooADEE8LgaBAAgcrD3Qn8v
-/xBgMAyIA/M8CgoAIHqw+swLBgBARfD3Rn8sACBLMC3FfxeOz/fGOyB7ADVg/wIAAf+RHWCKFIsV
-WST3/QoIIAAQYDBZJCb8CgAj6BBoMFkkMdog/kJ/IgAAYvD9CgAiAABY8FjkrMAg0Q8rQn8MngMO
-uwErRn8tdX/6djsvNAC1YP8CAAH/Zp2gLXF6/BIEIgAAULD+Qn8iAABY8FjknsAg0Q/Jbf8CAAH/
-VJ2g/BIEIgAAULD+Qn8iAABY8FjklsAg0Q/aIPwSBCIAAFjwWHn/wCDRDwBsEAYpMAJkkHb/AgAA
-AE2GYPiSBm/qEBAw0Q8iMAb4jhQSoBBIMAkpHamIKIJ/JDAF8zIDIBsANiDApPyOlhAgEFgwWSK8
-xirRDwAAAAAAAPoKBCAgEFgw/I6QEgAAaLD+TAACAAB48FkismRAoWlB1PosAAIAAFjwWNp+wCDR
-DyowBiswBywwAy0wBC4wBY8yiDOYECkxCZkRKDEKmBJb/17SoNEPAAAiMAYfjgD0MAcioBAoMAUl
-HfyOcRAEEFAw8zEILgAgL/D58n8gIAIpMPBRBAABEHAw8O4aACAQWDD+mQICAABosPn2fyIAAHEw
-+RYAIgAAePBZIo7aIPtMAAIAAGDwWHmcwCDRDwAAAPosAAIAAFjwWNqUwCDRDwBsEAQVjl7AICI0
-AiVQGCU0CCU0CSU0CiU0C9EPbBAEwCDRDwBsEAQmIhHTD/UKACA4ADWgGo1LKCIS9yB6IHgCSrBt
-CB8joorykoQkACBBcKQzCTMR9VwBIgAgGLD3JBYqAAOxUGP/2dEPAABsEAQiIQXRD2wQBhWNAv6O
-MxAAECAw9goAIgAASPD5FgAgABA4MP7hfiABEGAw8AA6YAAQGDAAAAAAAAD6CgAiAABhsFkkao8R
-LhIC+zMCAAEQYDD29ggGCQBV8PVcASACAiEw+EksYAgCELAAQAQOCBt/h+aLIGiwKSpQMJ4SAKEE
-AMkaCQkG+hYBL//YXlDGKtEPixCTsfe2ACAAEBAw0Q8AAP1MAAACEFAw/I4aEAAQWDBZIjzGKtEP
-AGwQBPWOFhKgEEAwCCgoqFUuUn/5UnwgDAQbsMiR0Q8AwKT8jg8QIBBYMP0sAAIAAHjwWSIuI1Z/
-+iwAAgAAWPBY5GwWjgQmYBj0CgAv0AA1oNog/DwAAgAAWTD+UnwgABBoMFjj5bFEdknlY/+uAABs
-EAQqIAeIIhyMqv0hByggAVQw9YCRa8AEPmCsuyyyOv8CAAoATycQKLI5/IymGgIBUDD0gItqoAQ6
-oC4yAg6OV/0NSg8ABDug/N0RCgkAcrANqgIMqgIqhgD+IgAh/gJRMPmMmx/ABD6g/4YDLOABLDD5
-hgIvgAQ7oPmMEC4JAHEw/oYBIpoCO2AoPBD4QQ1gABAQMG2pBQAIhgBJYSS2OdEPAAAAAAD6LAAC
-AABY8PxMAAIAAGlwWAir0qDRDwAAACucGPosAAIAAGCwWAudY//UhieCafNpFC/AECgw+mEVIEAC
-YbD8SREEAEAvMPkzDAAgAhCw8mYJLAAgLrD4MzIAgAJrcPNlFCoAUOiQaJs6opoqrPD2jBAqAB1X
-UPhBH2IAAEGwsE5t6QUAAoYASGEqwgEPAgCqmvPJBCHgAlKwfaFu+sYBIgAAErBkMEgktjnRDwLd
-DA1KFNMPbakFAgKGAEZjCk8M+FxALgAgajD67BAgIgA/4LD+0w9t6QUECIYASmUvyQQNkgyiUiIs
-MPLGAS+7ALfgwCDyxQQggAJBcJjAmMEktjnRDwoiDJJpY/9aIlxAksFj/5BsEAgrEhCSFfeNjBIA
-AEnw9hIFIgAAEbCbF5kU94yxFgAgObBgAARkUGzNLCpigAo8AfxJ8XH+AilwjRRk0Er61gAgABAQ
-MNEPAI8XZPA/COowGYykKZI1wKUKKjcKmSipiJgWihcpcoL4jJ4YAEBWcAipjgioCoiAC4AADOow
-ixYMuwxrsdxj/6HAINEPANogWRtQY/+U3jD9EgUiAAB5MPoWACAIEFgw/I1kEAEQUDBZIYPHK9EP
-bBAEBeowFoyJKGI1wJUJKTcJiCgUjIXwABVkACBFcAaoCoiAC4AACeowCVkMapEQKkKCCjoBCKqO
-ZS/iaabf0Q/RDwBsEAQTjJj2jJgQEAIosPmMlxoAEBTQKmJ9JGJ/laGZIyhifZgi9WZ9IAICITAk
-Zn/RDy5igCtigi1tApXhnSMsYoCcIvVmgCACAlrwK2aC0Q8AAABsEAQTjIP2jSEQcAIosPmNIBoA
-ERTQKmJ9JGJ/laGZLyhifZgu9WZ9IAICITAkZn/RDwAALmKAK2KCLW0CleGdLyxigJwu9WaAIAIC
-WvArZoLRDwBsEAYYjE8WjSUogNEqYn0pYoUmYosJqhGqmfZgFCAeAH4wJwqA8AAJZgAgPnAnKoCn
-l/8CAAAAeCWg1GD1jRkQABAYMPAAZ2AAEBAwI6Q1LqAMjaApoAf4+v8g/BBYMPikFiAAEGAw/KUZ
-KABAXnD8jQ0YCQBMsCmkB5ISnRGTEPhQgCAwEFgw+BYDIAUQUDBZISIpUIAAMAQJCRt/n3DyLAEg
-AgIY8PNhe3ACAiEwHIz7L3ANLsJ0LXAMLMKF/joIDgAgcTD57hELkAQ6oPyqCAwAIHMwnK/9pAwl
-3BBAMCilGC+kDSlQgAAgBAkLG/8CAAP/rP7QbQgPsSIAIAQJDRv/AgAD/6N/UGP/6QAAAPoKBSAw
-EFgw/IzkEgAAaPBZIP5j/3jRD2wQBIgnG4uw9/rAIAQQUDD1iRQiAAAwsPKCCSBAAiIw+YEVJABA
-OTD0TEAggAIpcPWFFCGAAhCw8oYJKgAEIJCikpKJAAuL/YuCEgAAKLDTD22qAgBFYZ0gjGD4zBEA
-BBBoMPMmAiwJAGswnCHRDwBsEAQYjEeNLhWMCo4r+iIMIAAQGDD8UscgVhAgMPvsAAYAgsdQCdkR
-9KBnbAAgSzCeq4sryLCavJMr8yYMIgAAULBbpjSMJ/b6wCBAAlswBrsB88UUIIACWvCbyZvIKiAF
-8yQVJgCQJpAsIAf0jDcQTxBAMCgkBStRZvRCfyIAAFCw+ysUBCABZDBYdRZkoQ3RDwCJyXKZUP7G
-CSIAAFuw+sAFIAYANuCTvMSye6mIjcn+wgsvgwC3YGXve/vCACA/EHgwL8QFLlKz+lLKIAEQaDD+
-uwwAABBgMFgCPBmMjYiesIiYnmP/TonL+sIKIBYIEnCey4srY/+lcqkKnsrz/51iAABbsAAtIAV0
-2ZEtITb+ITcgBRBQMPyMfxAyEFgwWSCY0Q+PLQn/EfWvAWwAIHswiMv/AgAOAG+SEJ7LiyvIsJO8
-KcAFw6D/AgAP/3VSUIvLZb7gjcxl3tuOzWXu1vvCACArEHgwL8QFLlK0+lLLIAEQaDD+uwwAABBg
-MFgCE2P+si0hNv4hNyAFEFAw/IxjEDIQWDBZIHrRDwCNJxqMYJpALNEV+SIAIAEQODD70gggQAJz
-cPjSCy4AQDew/8wICYAEPmD8zEAoCQA+cPlGASDQBFowKNkU+rwQICACQjD41RQqADDXEMhKAASG
-AEthKtIIKqwQ/wIABgBGZpCa4IsiZb6H2iD7XBgiAABgsFgKDtEPAI3NctkKns3z/x5iAABbsACP
-zP8CAA//iZPQnszz/wliAABbsJPbY//BAAAAAAAAAPvMDAAyADUgDE0UuNj4eDYCAABJMG2JBQIJ
-hgBLY6xJ+vxAICQAP2ANewzTD225BQQJhgBKZQz9DC3cUJ3gY/95KPxAmOBj/3EAAAAAAAAAbBAE
-+CIAL8AQSDD0MEloAEBMsNMPbQgwc4E8KjAA/DAHIGwEIrAqIQX5qwgNwAQ7IPu8QCIAIGTw+zsP
-cgAAOPDzfAAAEwA14GP/xgo3DGP/7gAAAAAAAPOODAAAEGgwDtM40jDRDwBsEAQrIAf2iv0QAxBo
-MAslQApVEPchCCQJADVwlTCIIBqLNP6KrRAgEHgw/zYDLYAEOiD+NgIsCQBrMJwx+SIJKiABXDD2
-IBQrAAQ+4PsiCyYJAF3w+zYJIAAQKDD5NggoCQBSMPg2BiYJAFXw9zYEJoAEOaD1NgUmCQAxMJY3
-9SQUIGACEPDRDwAAAGwQBCQgIhiLEvMiCyABECgw9EAfYf4CMTAogn8AgQQAZhoAVRr1XP8iACA0
-8AUzApMq0Q+JKZkq0Q8AAGwQBPWLBBABECAwJVJ/hiuDKQBRBABHGvd8/y//EEAw9jIMBhEARfDw
-UAQGAEA5sAYzDPMDGQIFABEwoyLRDwBsEAYoIAUsIAfTUPwKQQgAWJogiymOK/8CAA4AUtuQjSct
-0RTBkP8CAAoAS25QHYpgDKkRrZkvkjrAYf8CAAAAECgw/wIAAgBEx+Atkjlk0H4WiqgML0AK/xD8
-il0eCQA38J/QjyD2IQggIBBAMJjT+PcRAAMQQDD81gImCQBF8JfR94rZHQAEOqD8IBQmCQBhsJXV
-ntn71ggsgAQ7IPdmAg4JAD/w/9YGIAEQeDD21gQsCQB7MJzXJSQUjBEoljkDCEf/AgACAEiaIMAg
-0Q8AiSJkkKwDCkdponKJJyuZFC2cIPsWACCRADbgipkUi4v0oJ9vwBA4MPAAB2AqEBgwZKCPi9D0
-oDduAEA7cHqxLyygANMP+aAHIE4EGzAv0QX++AgJwAQ+YPiMQCoAIEqw+KsecgAAYrD6zAAP0QC3
-IAq8DAxaOGSgSY6idOmxwCDRDw+sDGP/34on+0wAAAAQYDD6rCAiAABpMFgBVdKg0Q8AAAAAAAAA
-8/9xYAAQUDAAACusGPwsAAIAAFCwWAktY/9BixCK0Su8EPvVBCoAQD9w+qzwIIACWvD61gEqABVa
-kCzRBf6KCBoAIFMwmtGeoI0gCN0R9KYCLAkAN3D9pgEgABAQMNEPHooAnqCNIAjdEfSmAiwJADdw
-/aYBIAAQEDDRD2wQCCggBS8gB/kKEyIAAFEw+hYEIgAAIXD/D0EOAJ/KEIgiwKH8CgAhTAC2IBOJ
-4wz3EaN3KXI6/wIACADsRmAmcjn+bAAB1QA1oCgySv8CAAYA1UIgJjJJZGGf+4pnECgCa/AA0QQA
-qRoailD1imMYCQBecJkWKaYw+uwAAgAASXACCYYASmMACYYASmEYiyf6IgAgABBIMJkQKICA/AoB
-IAAQaDD/im0QQAJbsPkWAigQBDog+BYBIB4QcDBYBAjA8P4iCSIAAFqw+iIALgAQaDD+JgwgABBg
-MPwWASABEGAw/RYALwABcDD37hEAABBoMP4WAiAaEHAwWAP5GIorLxIGL4YwBgWGAEpnBAWGAEpl
-BmsC9SEJIgAAULD9CgEgABBwMPkKCiD/EHgw+XY5IgAAYXBYh4QsIBX9CkAgABBYMPskFCIAAFlw
-WNUbwNb9NkkgFBBgMCwkBQQOR2jiDC8gOsCP/wIABgBkx9DAINEPAAAECUdpkvOJJyuZFC+cIPsW
-BSBtADbgi5kWiuj0sLVvwBA4MPfzAQAqECgwjfDKv3vRLS6wAPmwByBOBCuwJPEF80gICcAEPmD4
-jEAqACBO8Pi7JXIAAHLw++wAD9MAt6AL3gwOyzhksGqIsnaBi/W/uWIAQD/wYABaBL4MY//Y8/+V
-YAAQWDDaIPsKHCIAAGCwWAiSwMDz/2ZgARBQMADz/itiAAAzMCv8GPosAAIAAGCwWAiKwMDz/0Vg
-ARBQMIonjRTAwPqsICIAAFtwWACi0qDRD4wVi/EszBD89QQsAEA78Pu88CCAAmMw+/YBKgAUYtAt
-8QWr25vxH4ldn7COIAjuEfa2Ai4JAFOw/rYBIAAQEDDRDwAfiVafsI4gCO4R9rYCLgkAU7D+tgEg
-ABAQMNEPbBAEKCAiJSAHF4nLA4gM+CQiJCABLDAHVQkkUeajRCRV5iMgIokr/HJ/IAEQUDD0MBxh
-/gJY8ADBBAC7GgCqGvqs/ygAIF5wCpkCmSrRD40pnSrRDwAAAGwQBCggBviM/yIAAFCw+CQGIAEQ
-WDBbo3TAINEPAAAAbBAEwFEDJCwDIi4CUjmkItEPAABsEAQUikcBIhGiMqQigiDRDwAAAGwQBhiK
-bQEpEakz8AAJYgAgQPAAymjNeioigApLAftZ8nH+AjGwiRzyCgAgEAA2YJqQ0Q/acFkYR2P/28Ag
-0Q/dMP5MAAIAAHlw+hYAIAgQWDD8iloQARBQMFkeeccr0Q8AAABsEAQYilQBJxGnN6h3JnKAx48I
-SAMIZgEGVgImdoAMAgDRDwBsEAQpIQSHIPNYFAnABD5g+XcICeAEOiAIdwwnfPz2cgAogAEcMPCR
-BAABEEAwAIga8JAECgBANjD7AxkP/xBQMPCRBAgRAFIw8EgaBgBAQbAIZgL2dgAgIQA1YCUhAshK
-sFr6JQIiAAAQ8NEPsVv7JQIiAAAQ8NEP0jDRDwAAAGwQBANUFCUhBIIgDFUR9SIIBeAEOSAEIgwi
-Lf/yIj8kgAEYMPBBBAABECgwAFUa8EAEAgBAKLACAhnRD2wQBIgzDwIACIhXb4QEiSJlkCeKJ/Uy
-BCIAAFkw8zIFIgAAaTD6rCAgABBgMFgABPosAAIAAFjwC1AAwCDRDwBsEAT4LAALwAQ5YP2CASIA
-ABDw+4kEIgAAGTDyVAwFwAQ8oP2BBSIAICtw+rsMD8AQYDD1qgwMAEBiMPi7MggAIGdw8oYBIIAC
-SnD7hQQqACHIkMqkCiUIdZM/yUFtSQUAAoYAQ2GFgfuJBCQAIFVweVFl9YYBIgAAEXDIsdEPACbM
-QJaB9oYAIAAQEDAihQTRDw0iDJKBY/+4AAKXDAdLFPtEDAIAACjwbbkFAAKGAEVh8sxAIgAgPPBt
-SQUCAoYAQ2MtiQQHogyiwiIsQPKGAS+rALdgY/+mIsxAkoFj/5kAAABsEAQbiRoZiRgAIQQnsID2
-kIAgARBgMADIGvqJFRjgAUAw9EY5BABAPjD1xTkCAAAh8PaUgCBgBBlwx+/6KgoOEQByMPA9GgYA
-QHXw/zkQBgkAbfD5ppkm4AE8MPe0gCAMADUgyXzRDwAAAADyiQIf9gA14C8i0sc+A/8BD88CLybS
-0Q8YiPwlgtLHnglVASWG0tEPbBAEFom0FYm6E4m7gmn4ibkQBhBIMPeK/y7/ECAw8yMKBhIAvKCD
-MAowAIhqsIj4Zgov/xAQMNEPK1KqKoKACytXK7ym+4Z/IPMANqCZaSwKZC1Sqi5KAPdiCiAAEHgw
-/2YJLAkAd3AtVqr3wgwIAGDl0KJzk2rRDylSqioaAPgKASABEBAw8mYJKABAPnD4ZgooCQBWcClW
-qtEPKlKqG4mY/ImWGxEBUDALqhwbiQn5ZgkqACBisAuqLCqGgGP/jS1SqoxqwLX7ZgksAEAncP1W
-qiACAmMw/GYKIAEQEDDRDy9SqvNiCiMAEBAw9/8BAAQQcDD+ZgkuCQAX8P9WqiACAhjw82YKIAEQ
-EDDRDyhSqoNqwCLyZgkoAEAiMPhWqiACAhjw82YKIAEQEDDRD7F5+WYKIAEQEDDRD8CjmmkvUqrz
-YgojABAQMPf/AQAEEHAw/mYJLgkAF/D/VqogAgIY8PNmCiABEBAw0Q8AAABsEAT0iH0QARAYMCRA
-0fQEQAAAEBAwBDI40Q8AbBAEFIiRFYlcF4iRI0CAG4iP/oiQH/4QeDD9+v8gDAA04LAyIkSA0Q8A
-wMH0CgAgBBBAMNMPbYpdKlHoKVHkKLCA8EEEAAEQMDD6kwZwARAYMMBgAMkaCQlHCJIBAjI59iEp
-cgAAUjANkgPwYhoIAEASMPKIAgLwBDmg8naZKOABQDD4tIAgFQA2oMmIsUT3fAQgBAIpcNEPAAAA
-8woBL+0ANiBgAAHAMCji0g+IAQg4Aijm0mP/1GwQBIgjGogqKy3+K7J8KqJ/+bsRD/wQSDD7qggI
-AEBKMAuAANKg0Q9sEAQTiSYCLAkDzAoqwn+LoSzNAo6gnrCNoCjBAimt/vvWASAAECAwlKCUoSmS
-fvMylCH+AkIw/QoBKeABQDD4xQIpkAQ+YPSAYWIAIEzwjzIpMgcAIQQA2Br+mRQv/xBQMAqIA/qS
-CS4AQEfw/zYCIDMAN6Dyh7MQIwA2oCigAAKICiiCEPygByIAAFqw/QoDIgAAUPALgABlr+DRDwAA
-AAAAAPP/zWAAEFAw/8EDIgAASTAJ5BYBAgAbiA8qsoIA8QQAThoA8QTw3xoP/xBAMAj/Aw+qAQ6q
-Aiq2ggnkFmP/awBsEASGIIdhIyEEiWCZcIhgFIflJW3+94YBIAAQUDCaYJphJVJ+9EJ/If4CGPAD
-A0/zJQQlkAQ9YPQwDGQAICkw0kDRDwAAAADyIQUiAABasAvkFgECAB2H7yzSggAhBACuGvAhBAAB
-EHgw8P8aD/8QEDAC/wMPzAEOzAL81oIiAAARMAvkFtEPbBAEFoiNASURpTWmVZRQDAIA0Q9sEAgY
-iLOSFPYSBCIAABGw8AAIZgAgQbDKWM0pKmKACjkB+Unycf4CKXDyCgAgEQA14Jpw0Q8A2iBZFoxj
-/9zAINEPAN4w/RIEIgAAeTD6FgAgCBBYMPyInxABEFAwWRy+xyvRDwAAAAAAAABsEAQah8IWiKvz
-+v4gABA4MCRirgACACmi0AOZASmm0BiH2ieGXFkZClke9hWIox2HoAgsEAxMAg3MAixmrhuIlie2
-hCpSYhSInvaHexAAEBAw94iHEEYANqATiJgrYo8qUpyrKwm7EauqLjKALXCAACAE/Q0bDgBAI7D+
-NoAgHAB/cCyiHcjDwLFY6AwtUmKxIvM9QCv/4+yQxz4fiIou8oID7gEu9oJYbbzRDwAAAGwQBP+I
-hRAREEAw8zsJCgAEmhDBlXObM4wnjcOIwpjQjsIPuwoqsX795gEgABB4MJ/C/8YDIf4CUrD/JgIr
-4AFQMPq1fiAaADag0Q/bMPwiAiIAAFCwWRlr0Q8AAAAAAPixfyIAAEvwCeQWAQIAHId7KsKCAIEE
-AP0a8IEEAAEQcDDw7hoP/xBAMAjuAw6qAQ2qAirGggnkFtEPAGwQBBiIXgM1CQ5VEahTJDF++goB
-IE8ANSArMX6GIh+IWCkxf40nHIdnLjI98JEEABACQ3DwpxoMACB7MPjmASwAIGFwnNP+1gIgAgJa
-8Cs1fvg2PSYJADmwliLRDwAAAAAAAAD7MX8gABAgMATkFgECABeHUyhyggCxBPCmGg//EEgwCWkD
-CYgBCGYCJnaCBOQWY/+DAAAAbBAEiiBloFUdiDkLPhGu3S3Sf/oiAyABEGAwDEw3Dcgs+N0oCiAB
-UDD3JQUqCQAysP3MDAACAlow+/r8KAUAYvD7qgEJkAQ+IPlZAgoJABqw+iYDKAkASjAoJQTRD48j
-G4gkDw9BC/4Rq+stsn/8sn4gNggTcNjA8okbcAAQYDDAwCy2fyy2foogYAAM2cDykVZwABBgMHLR
-Go4hmuCPIC2yfZ7xnCD8JgEh/gJrcC22fWP/UhmIDxiHHamIqOh4oRn6tn8gHgC34M2mKrJ9aqIR
-LbJ7LbZ/YAAIAPy2fy/sADfgiiBj/7AciAIZhxCIIayZqen5iQwAABBgMAnIOCi2fmP/kAAAbBAE
-IyEEFYf683RGAgBALPAEMwIjJQTRDwAAAGwQBMBABOQWAQIAFob+JWKCACEEADca8CEEAAEQQDDw
-iBoP/xBIMAmIAwhVAQdVAiVmggTkFtEPbBAEgiMCAkHRDwAAbBAEhSODIBSH4/ghBCQgASww+off
-FbAEPWD0MBdkACAhcPh5RggAQFIwCYgCKCUEIkJ/0Q8Wh9UfhuMrIQQjQn4dh9P+Qn8sxwFYMPI2
-AC4AIDfw8yYBLgAgfXD/JgAgAgIrsPVGfyoAQG7w8kZ+KgkAZvD7JQQiAAARcNEPAABsEASFI4gg
-FofA/IfAFCABLDD0gGNrsAQ5YKamKWJ/J2J+HYbI8pkrcAAQWDByeSsrZn8rZn6EIYggmECFICNi
-fZRRmyD7JgEh/gIY8CNmfdEPAAD/AgAGAEAV0HKRHIohmKCMIClifZrBmyH7JgAh/gJKcClmfdEP
-0Q8ArN6urn6BMPhmfyA1ALVgzo0vYn1q8igjYnsjZn+FIYkgmVCIIJWBmyD7JgEh/gIj8CRmfdEP
-AAD7Zn8v1QA1YIUhiSCZUIggJGJ9lYGbIPsmASH+AiEwJGZ90Q+OIazfr68P7wwPvjguZn5j/3EA
-AGwQBPWHihABEDAw9CwAAAMQEDDwAAZmAQAxMLAiKFJ/9VzgK//7xZDRDwAAbBAEKyAHFoYVHIZd
-+wpBCgIBXDD4hrIaoAQ+4PkhCCoJAGbwmzCHIPQ2CCsABDqg9TYJKAkAVnD2NgIoCQBGcPg2BiAg
-EBAw8jYDIAMQQDD5NgQgABBIMPk2CieABD3g+TYLJgkARfD3NgEgYAIQ8NEPAABsEAQsIAf7IgAi
-AABQ8P0KASAEEHAw/CxAADAQeDBZGdodhhEYhjkeh1rwDQcCAABKsABJYQBJYQBJYSkgBy8hCAkJ
-QfCZEQAAEFgw8qwwLgkAT/D+pgIuCQBH8P+mACAgAkqwAgSGAEljAASGAElhK6QW0Q8AAABsEAQo
-IAcahiMIKEAKiRAKmQKZMIcg9oXdF4AEPeAHVwKXMfAGFwAQAjjwAAeK+yEIKcAEPWD6htkdAAQ6
-IP2FzBBgAhDw/TYEKgkAZvD8nOgqCQBW8Ps2BiGgAkpw/DYFIAAQcDCeNwAEjZo4mTkCE4/RD2wQ
-BJc2HoW7+YW6EAMQQDD6hbsQGBBYMPs2Ay+ABDyg+jYCLbAEPWD5NgAsEAQ5IP2HHhwJAGsw+BIK
-LgkAR/CYOZ8x/xIJLAkAYbD/NgguCQBwsP2FsRwJAGswnjScNY4YnjfwDRcAUAIQ8AACiiI8MNEP
-bBAEGYbTJZJ/9pJ9IAAQUDD3kn8gQwA1YIhhjGCcgItgmLGaYPpmASH+AjnwJ5Z/jiGW4J5hImYA
-9iYBIZACMbDyPAACAAAZsG1JBQAChgBDYdJg0Q8AACaSgIVhiGCYUIdgL5KClXGaYfpmACH+Anvw
-L5aCY/+3bBAEBQZHaWJJGYazhScokn/AoPaSfyBgAilw8pJ9IDkANiCHIYsgm3CIIJeBmiD6JgEh
-/gIxsCaWf41RktCdIZUg8lYBIZACYLBtSQUAA4YATGHAINEPACKSgI8hhyCX8IYgLpKCn2GaIfom
-ACH+AnOwLpaCY//BbBAEiCD6IQUvwBBgMPIiAyIAADiw/EsRDABAYfD4uQgKACBisPqsQCB2BECw
-LXkEq939dQQqABrOkMk6yUjyPAACAAAaMG1JBQAChgBDYSlyAA8CAAuZCPqRWXIAABIwmXDRD8Cg
-mnPRDwAIqQz5ugwANAA04AlLFP28CCIAABDw/U02AgAAMjBt2QUAAoYARmEJMgj7TgwAgAIbMG3p
-BQIChgBDY6rPL/xA/3YAIgAAEjDRDyLMQPJ2ACIAABIw0Q8AAGwQDJQXlxySG4gblhiHMIiHlRn2
-Egkq6AE8MPcHRwBAAkIw+BYNIgHtAuDB8P8WBCAeAnHw/k4UAAIQEDCFHY0cKPrA91EFL8AEPKD+
-7AEsACB/cPzvEQQAQEVw9RYKJAAgLfD1XEAuACB88Pr8AAoCAivQ/+gRAgAAIrD+vAAOASdC0Imh
-iqD61gAoAwBNsPnWASAQAlEw8QoWABACQ3AACIqHQY9DCWYMikL5dwwOACB+cPdGASoAA0vQsaqf
-Q5pC/RYAIAEQSDD3lzkAABBgMPecOAAEAkOw9MLuagUAZjCNEPRi5GAgAntwjBf/zBEAAgJS8P8C
-AAoBaWKQHoUVA7UL/hYFICACc7D+FgYgABAgMPAAKmAAEDgwAIgV8AgHAgAAS/AASWEASWGJoGSS
-ofRhH2ACAlLw87ULCgCL4pCOHYgaLuEFqOgojED6XAAKAYlBUI6g/0UKAIMAN6D/TgsIAwBxsPhW
-ACAQAiqw9QUWABACc7AAjoqJoIWjCGYM/qICIAICOfD4mQwEACAuMPmmACoAA0FQse6Vo/6mAiCz
-ADWgZEI6//wYIAAQIDD4EgYgNABz8PAIFwIAAEvwAAmKAAmKAAmKYAARAACOFfAOBwIAAEvwAElh
-AElhjqFk70gPRQr/TgsIAwBxsJhQ+GYMACACKrD5BRYAEAJzsAEOiomhhaWOpPiZDAACAjnw+aYB
-JAAgLjD1pgUqAANBULHu/qYEIC0ANaBkQbz//BggABAgMPgSBiH/cXPQ8AgXAgAAS/AACYoACYoA
-CYpj/tkAACs0Avd4CQAPEEgwCYgKCEgU93wBIgAgQLD31QEgAgIQsIsbLLEHHYSTDAxKDMwR/RIM
-LAkAazAYhVUehJGc0Iuwihj/EgQuBQA6MP/WAy2ABDrg/tYCLAkAYLD81gEgANwuoI4bLuEaihyM
-GP0SCSAgAlKwW59+0Q+MF5sS9xYBIAAQeDD/zBEAAgJS8P0WACoAh2KQ+xYCIgAAOrD0FgMiAABq
-8A8CANMP0w9tCCnzvgsCAAAi8PXrIXIAAFOwjqDN746hsf/14FRgBgI58LNL/bwACgBlYdBj/8iK
-EQrqDGP/2okQDmw2/JYBIBACcrD7DhYAEAJKcAFJioigj6MMZgyOovyIDA4AIH8w+KYAKgADY9Cx
-7p+jnqJgADcAiRAObDb8lgEgIAJysP0OFgAQAkpwAYmKiKGPpQxmDI6k/IgMDgAgfzD4pgEqAANj
-0LHun6WepI4TH4W1juD/EgAuAEB7sJ7wjKBlzSCIobPfCPs4Y/0WAPP+hWAAEDgwjqGzuQ6bOGP9
-UwAAAAAAAPP992ABECAw8/09YAEQIDCLEg/8CfP85WoAIGbwv37+ThQAcwA14Ikc+DwQIEACSnBt
-6QUACIYASWGGGQvrCfkKASAEAhOw92YMACACQfD4FgQgFQA1oCwSBw/MEfy8DAAAEFAwDKk5/woB
-IAAQaDAJ/Thl2+Lz/hhgABA4MAAADloMY/zrAADz/k1gABBwMAf6DGP7+cEgkhTz+7tgAhAQMAAA
-bBAEhCmDLAQzDAMDSCMlHyMlIdEPAAAAbBAEiSeKnPiZFCAAEBAw9ZwgIGACInD0qwwBkAJSsPSA
-oWIFAFqwipn2Cg0gVwA2oCcKPM02K6AAd7FHaLUsdrkLLKAQaME7drkCaMI1LaAHwMD6XAACAABb
-cFv7MitZBIpRybVlr8tgABgALKAQacjMYAAOAAAAAAAAAPP/5WAAEFAw8wotIBwANKAtIABz0RmO
-LsAg/k8MAZACc7AP4jllL+fAINEPAAAAAPssAAIAAFEwW+/78qwAD9EAtqBj/+EAAPP/YWAAEFAw
-bBAEBQZHaWJahSeIWPlRFS/AEGAw91ILIEACUXD9WRQsAEBisPyZCAvABD0g+ZxAIG4EQfCr3f1V
-FCQAIF4wdZMtyTLJQG1JBQADhgBIYSWiAA8CAAtVCPlRWHAAEBAwlaDRD8Ag0Q/AIJJb0Q8AAPiV
-DAAuADTgBUcUuHb2RjYCAAAQ8G1pBQAChgBIYQUyCPdIDACAAhswbYkFAgKGAENjBbkMqckpnED5
-pgAgABAQMNEPK8xA+6YAIAAQEDDRDwAAAGwQBC4gBx+D8A4uQAruEP2DpR4JAHuwnjD4IgAiAABR
-MPSDwBAEEFgw/TYCIDAQYDD8NgMpgAQ6IPuD4hgJAFow+DYBIgAASPDwBAcAIAIY8ABDYQBDYQBD
-YS0gB/ghCC0ABDng8pxAIAIQIDD1RDYMIAFsMPWcIC0ABD9g+8wCCAkAajD8lgYoCQBaMPiWBCIA
-ABlwbUkFAAqGAENhBg4GLlQG0Q8AAGwQBCogBfUKCyAIEFgw9goBIBIQGDD6MzVwABAgMHOhcPMK
-CSoAYIagdaF1/wIACABFBqD/AgAGAG6ekMCJ+KMGf/UQEDDRD9JA0Q8AAADaIFiBdfosAAAAEFgw
-W/9aGYOliyAjJAUqkn4pkpOrqgmqEaqZi5f8+sAgQAJS8AyqAfS1FCCAAlKwKrYJKrYIJJQFiiLz
-g1IQjQA2oCogBWP/mYsiZb+UAioCW7OxZa/rwMr8JAUgChBQMI0iZd982iBbs5Jlr9QvIAaOIvMk
-BSACAnvw/yQGLgkAM7CeIvP/WmAJEFAwiCJlj1DaIFuzw2WvqIkiKiAGwLz7JAUoCQA2cPkmAiAC
-AlKwKiQG8/8rYAwQUDCMImXPISskBfP/G2IAAFLwLTJKDwIADwIAddNcKzJJZLBW2iD8IQkgABBo
-MP8K/yAAEHAwWIEH/CEjIAAQaDD+CgEiAABasP8KAiIAAFCwWIEALyAGjiL1NkkgERBAMPgkBSAC
-Anvw/yQGLgkAM7CeIvP+smAREFAw2iD7ChwiAABgsFgCNWP+/QAAAAAAAGwQBPIgcCIAACCw9CAJ
-aAkAEPAoRHDRD/pMAAAAEFgwW/8AKkBwDDkRCTkCCpkCKURw0Q9sEAaGJ/cgByjgASgwmBCGbvcH
-QQKUAjogGIRv/wIACgBsGhD/AgACAHyBIP8CAAAAkgUg+iwAAAIQWDBb/+PIosAg0Q8rPBDwCxYC
-AABRsABKYSwgBW7IYC0gcn7fWtogW/9xZaB0LiAF+CICKJgBO6AvIHJ+/0EaguNlgF0MeREKmQgq
-kjr/AgAEAIVCoCuSOfkWASD/ADbg85wAAgAAYbD6LAAAAhBoMP4KACACEHgwW/8zwLQrNjmMEGjC
-NIon+0wAAAAQYDD6rCAiAABpMFv6ENKg0Q8AAAAA+iwAAgAAWPD8TAACAABpcFv+89Kg0Q8AwCDR
-D9owWReW+6wAA/+RwqBoonn/AgAF/4wWoP8CAAP/iEag2iBZF3XAINEPizL7i1cANxBgMP8CAA//
-fuLQ+iwAAAgQWDBb/6Rlrv8tPBDyDRYCAABhsABMY2P/AAAA+iwAAAQQWDBb/5tlrt6PMy4hCQ8P
-Q/TuEQ+wBD/g/woQLgkAe7AP7gKeYGP+0Igz/wIAAf9ObhDaIFkXasAg0Q8rfBj6LAACAABgsFgB
-vWP/NQAAAAAAAGwQCBuEC5sQ+CIAIAAQSDCZEvkWAyIAAFCw8xYEIAIQaDD0FgUgAhBgMPUWBimA
-BDog9hYHKAkAYjD4FgEiAABYcFv/hNEPAGwQBMAg0Q8AbBAGkxD9CgEggAJZ8PogOyIAAGFw9iIH
-IgAASbD8FgIvwBBAMPkWASpgAVAw9WwgK8AEOqD6OggEAEBFcPAAJ2BQAlKwKCA7sYgoJDssYRX9
-3AEuACAvMP6sECCAAnvw+uwACgB2e5D/ogEiAABKsPMJFgIAAGLwAEyK8QkWDgMAfTAADIqfsYih
-g6KOo/9EDAAgAlrw/4gMAgAAYPD4pgEuACBz8P6mAyoAA3uQsTz8pgIh/8iNIByCXSshIi4hCS8h
-JIgQGYPHKiAHiIAjIQf0EgEqAgFQMPmCTxgAQEow8wNKCqAEOqD0BUMICQBSMPmCVBgJAEow+HYA
-JIAEPWD6IgAuCQAv8P92BCoJAGbw9HYGIsAEOOD7dgIuCQATsP52AyAIAhNw+xICK4AEOqD7dgUq
-CQBQsJpxAAmN+YOqEGACKfAABYoJ2QKZftEPDOoMY/8RAABsEAQpIAccgioJC0EMuhGsqiiiOv8C
-AAQAUsIgLKI5/YJ1HgIBSDD0wJJuoAQ7oC8hB/C7EQlAAXww+DEQKcAEPmD/gmsYCQB2cP2CIRgJ
-AG5w+cYAKAkAWjD7IgAgABBwMJ7H/sYFKAkAejCYxP/GBiAgAkjw/cYCIAQQeDD4uxEAMBBoMP3G
-AyoJAH7w+8YBIEACWzACCYYAS2MACYYAS2GIJ8Cz/AoAIAMQaDD/pjkgQAJSMFv5QtKg0Q+JIsiS
-wCDRD9og+7wYIgAAYLBYAR3AINEPAABsEAQlKQSHIfghBS/AEEgw/EoRCABATLD6dwwEACBVcPUl
-BCCAAlpw9yYBKgAEWdCod5ch96UIAgAgQnD0MBpggAIQsHUjGPI8AAIAABnw0w9tSQUAAoYAQ2HS
-cNEPAAAHKQwJSBT6jAgiAAAx8PpKNgIAABDwbakFAAKGAEZh+EwMAgAgGnDTD23JBQIChgBLY9Jw
-0Q8AAGwQBIsnHYHY9rIJL8AQUDD5uRQgQAJC8P6DQxgAQFIw+IxAIaACMbD2tgkgYAJKcPm1FCoA
-BkGQKbEVppYmtgmdYCwiAPsKAiAgAkmw/woCIAMQaDD+ZgItgAQ7IPheEQwJAGsw/GYBLgkAe7Bt
-ugUABIYASWH+ZgUgpgA04CkyCBeCAf36liAAECgw+DIJIBUANmAlNgsphgArMggotgElNgiVOYw8
-JHKK0w/9NAUgYAB/MCsyEi5CJAuKRPqqDwAAEGAw/qoKAAEQaDD6ogAr8AFcMFv4n/U2Ei/AEFAw
-izCON5U8LHJ0Lewg9eUULABAV3D8uwwAgAJrcJ3o/eYJIAAQYDD6QhEgARBoMFv4kS5CEg8CAA8C
-AC7s/y5GEvosAAIAAFmw/AoDIAMQaDBb/1fRDwAAAGwQBCchBIgg0w/2fP8p5wEcMPklBSXABD2g
-9YUIDcAEOmAMXAwADIsqIQP9CgEqwAEcMA07YAoKRv4+E2AAEGAwDJsRC1sMAguLDTxibz4T+WkJ
-f/8QWDDIoXOhIwmSEaIy0Q8nIQSxmQkJT/klBSCgBDpwsHYMZRHz/8RkACAuMAmfEa8//1QUD8AE
-OeD+RBEOACByMPTuDA6AAXww8PEEAfgCc7CP4ADYGguEAwT/AfkhBSgJAHowmOCIIGP/oywlBfP/
-rWAAEEgwAGwQBPWCEBKgEDgwBycopXUlUn/BbwNmDHZdGBqCFfwpEQiABDjg+pkICAkAQTCYkNEP
-AAAcgb4bggrzOgoMACBh8AyqC6uqKaF/9JkMAAAQWDALmTUppX/RDwAAbBAEG4H1AzkK9IHyEqAQ
-YDAMLCj9ga8QIAIo8PBRBAQAICMwJ0J+9kJ/IAEQUDAAqBr4dwEMACBrMPyZCwYJADmw9kZ/KAAg
-XnAlkn+xVSWWfyRCgAAxBACjGnNIDhSBIAwiEaQigiACMgHRDyidAiuBAiWBASiBBQtVAXhbA8Ag
-0Q/SoNEPAGwQBCogIikgIx6BnAqZDP8KASBWADZgLCAHDAxBDswJK8HmCb02DbsMK8XmKiAiiysK
-rYf6JCIgSAA2oCjif/CBBAH+AmKwAMwa8PgaCgAgZvD8Igkh/gJCMAi7ApsqDLkMc5MmwCDRDyog
-BWihbosiwMIMuwL7JgIv9BAQMNEPiymbKvP/12IAAGLwKyAHDawM/CQiKiABXDAOuQkokeYNiAgo
-leYqICJkoDUs4n8tIgvwwQQB/gJKsACZGgD4GviM/ywAIE9wCN0CnSraIPwsAAA+AlrwWAAFxyTR
-D8ck0Q+NKZ0qY//jAAAAbBAE9QoBIBEQQDD5gkIaACseEAM6CQ6qEampK5F+ZLByHoI9iycYgU0s
-kj7/kX4gEAJq8P6RfygAIHIwncD8tgMoACBCsJiyAOEE+yICIAICe/AvlX4AXBr9lj4qCQBm8Jsi
-0Q/B9XPzqBiCOgg4CiiCf9xA+jwAAgAAWLALgACJIgAxBABaGgqZApki0Q8AAAAAAPiRfyAAEFgw
-C+QWAQIAHYEtLtKCAIEE8FwaD/8QeDAPzwMP7gEOzAIs1oIL5BZj/1sAAABsEAyIIs6GKSISGoC0
-/YClGCgBTDD6mxEJ4AQ+YPsWBigAIFZwmRfwAwdgHhBQMMAg0Q8ALCAWKQr/+CAHJgBFzxCYGZMc
-lR4TgVT1gRISoBBIMAmJHZQd/MQKBAAgLnD1RAsIACAecPWSfiAgAhsw8DEEAAEQGDAAOBr4kn8k
-AEBFcPWBRhgJACow+JZ/JAAgKTAlQn8AwQQAPBrzEgwgAgIpcCVGfymSgJQUJBIN9RIOKAKr4lAo
-EgkMiBGtiIiA0w8IzAFkxVsutCeVHvQWDSAAEEgwKbQjKbQh/oUUAAUQIDAktCD1tCYgABAgMCS0
-IgWFFCW0JQWFFPW0JCBwAmKw8QwWAFACQvAACIqFPiW0MwWFFCW0MgWFFCW0MQWFFCW0MIw99LQ6
-IAAQKDAltDkstDcptDv8jBQAABBIMCm0OCy0NgyMFCy0NQyMFCy0NCwiFim0TCm0QCW0TSW0QSS0
-Tiy0PyS0QgyMFCy0PgyMFCy0PQyMFPy0PCAAEGAwLLRPLLRDKDIVKYwBKTYVKLRHCIgUKLRGCIgU
-KLRFCIkUKbREJDITJTIUBFUIJbRLBYUUJbRKBYUUJbRJBYUUJbRIKTIShR7TDwSZDPQSDSAgCEuw
-KLAhKQqACYgCKLQhLKIZwJAPAgD0wllg0AJCsCk2Fvk2FywDAGOwLLYV8wgWALACKvAARYopMhMP
-AgAPAgCsmSk2EyiiGQzlDAyIDPimGSKnADYgJ6IbJaIap8f3phsqAAPh0CVcAfWmGiAAEFAwKCEH
-GYAcCAhKDIgR/IDgGAkASjCYsAqoCYkg/LYCIEAQKDCVsxyAQ/WApxngBDogKIxvCEgU9fUKDAkA
-YnD8tgQpgAQ+YPwhGigJAE4wmbElUpmctvmAcRBgAmOwnLWMFglVAfqBCxACAkqw9YEIHAkAKzAK
-mQL5thQsCQArMJy3jBoqIhWJKayq+qwwKAAgZnD6JhUgYAJKcJkpGYCzKEY5KiAW/CqgIP8QKDD7
-IAcgHxBwMPruDABOBCqwDLwdqckpkn//AgAGAZTyUPiuEA/ABD7g/m4CDgAgb/Au9gMoMhMvMhL6
-Ch4mAUNH0C8gBw8PQQz0Ea1EKUI6/wIACgFa1lArQjn0sqpgwAJS8Ik3JSIXJzIXKJkULjISjCn6
-FggiRQA2IIqZiCoHdwmGFykyEwp3CyZigPnuDADgAjnw/IgMDgMAK7D5ICMmACBxsPYWCiBgAjGw
-9ewAC/5JshAoICIImQwYgEdkkrSUHQj4CSSB5vMWDCIDAE0wA0QMJIXmKSAikxOEHQmThykkIvMS
-DCKqADZgkxwTgDojMn8AMQSDK7CYAIga+AoBIgAgRPAAiBqwiPkWACIJAETwkxWTKoMciBUMiAz/
-AgAL/hEyEI0TiRArIAcNnAwsJCIcgCkLC0EMvAkqweatqirF5ikgIvkWACJRALZgjSmdKmACbSwy
-FgfMCozA9MB6YLACQvAM7DYsthUpMhYHmQu4mQQJiACIiiUyEyoyFveqCgQAIGVwJTYTiaAMmQyZ
-oCkyFgeYCoiADOUM+RYLICMANiAHlQuHU4pSp8f3VgMqAANh0LGqmlLz/ZZgABBQMAAAZJE5KDIX
-wJD5NhYgAgJCMPg2FyAwAjnw+goAIQwANWApMhYHnAqMwIkY8hYPKAABUDD5ggoMAwBhcJwgIjIW
-mBIHIgv5iQsAEAIQsP8CFgAQAkpwAcmKKDITIjIW9yIKCAAgYjAoNhOJIAyZDJkgKTIWB5gKiIAM
-VQzyEg8gAgJSsPkWCyAiADYgB5ULiFOHUqjI+BYBKgADYhCxd5dSiBGYU2P86QAA8hYPIDkANmAs
-Mhf4CgAgMAI58Pg2FiACAmMw/DYXIAAQSDCMGIgSIswY8hIPLAUAQLD8FggvRQC1YGP8qsCRKTYW
-8//dYAEQSDAAAAAAAADz/b1gABBQMIk4ypqMOcCwmzuZwI04nNGbOPs2CS+ZEFAw+jQFIAAQEDDR
-DwAAAADz/GRgABBQMC76mf40BSAAEBAw0Q/AgSg2FmP+0tog/CwAADACW/Bb/k3AINEPiBTTDyiN
-AiyBAimBASiBBQyZAfwKASv9UsJQ2iD8LAAAJAJb8Fv+QsAg0Q8ef5f6qwoOACBzMA67Cx5/4f4S
-CioAIHbwKbF/DpkM+ZzQIAAQcDAOmTUptX9j/L0vIAX/AgAB/OEH4IgiwJIJiAL4JgIgABAQMNEP
-nCqcFZkQY/19AB5/jy7if4or8OEEAf4CanDw3RoAARBgMADMGvzM/yoAIGqwDKoCmiraIPu8HyIA
-AGCwW/4ewCDRDwAAAGwQBMgw0Q+IJ/aJFC/AEDgw84IJIEACKjAHVQH1XEAgIAIxsPaFFCHgAhjw
-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
-ADUgizD5clAQ/xBgMP5yTRAAEBAw+wpXABgQQDD5qQoKAAZCkImQCpAAZEHOxirRD2Vfzscv0Q9k
-T/Eq4jyaMdEPZE/nG3DFK7CAmzHRD2RP2pIx0Q9kT9OSMdEPZE/MLPI7C8wRnDHRD2RPv5wx0Q9k
-T7gt4j2dMdEPZE+uC4lHZJGFaZGlKeKbZpHUmTHRD2RPmMfvnjHRDy0a4PX99i/nEFAw+AoUIgAA
-YXBtig8pwXQKmQH9kQtwBAJjMLEiIvra0Q9mL/f0QVRo6AFcMBJwgvQKASDJALZgBVsCLAoA/iKE
-IBQQeDBt+g8osXQKiAH7vAImAKJuELHM8AE6b/sQYDBkTyUp4kcq4kb4qhEJ8AFMMAqZApkx0Q9k
-Tw0r4qSbMdEPZE8DLOKjnDHRD2RO+ZIx0Q9kTvKSMdEPZE7rkjHRD2RO5JIx0Q9kTt2SMdEPZE7W
-kjHRD2ROz5Ix0Q9kTsgr8nwq4sMJuxGrqoqnZKCfKqwgWx8hCkwU/DYBIAAQEDDRDwAAAGROn1gS
-nPo2ASAAEBAw0Q8AAAAAAAD/AgAB/0SeYNtQ/SpAIAAQYDDyIoUgFBBAMG2KECmxdAqZAX2RJPzM
-ASAEAlrwKvKPKeLDCaoRqpkpkGTAoQmpOfk2ASAAEBAw0Q8AwAQCCxl/t9nz/+lgAhBIMBxxtSzC
-rnHGTyL6udEPKeKaZpBNmTHRDyriXPP/WWHwAlKwAGSQQv8CAAH/Ax5g+jIBIAEQWDBYB7DSoNEP
-AMAEDg0Z/Q1AAAIQWDANSzn7NgEgABAQMNEPijFYc7rAINEP0pDRD9KQ0Q+KMVgCpdKg0Q8AbBAE
-E3G2JTKAFHBJ8zJ/JAAgILAlRoAjRoHRD2wQBBZxsPVvVRAAECAw+AoAIAEQODD2YX8gChAYMG06
-JwBABAYJG/+XFHACAiEwK1AwALEEAHoasKqaIGAAAZgg9VwBIAgCELDAINEPAAAAAAAAAGwQBBZx
-nA8CAA8CAC5iQi1heRRvEfNxmBAAEEAw8nB6HAAgd3D5CoAsAQAncG2aFfKJEQuQBDogCakC+YkC
-AAICQjApNk4vIoH1cYwQ5gAn8Cgigf8CAAAARa4QKiKK+gpVABIQSDB6k1kacYX8CgAgABB4MPzb
-EQABEHAw/rsCABAQaDD7Nk0gAhBYMFskN/agbGIAABKwwID0ZYYggBBIMA8CAG2aFfKJEQuQBDog
-CakC+YkCAAICQjApNk7RD8Ag0Q/ApPxxbxAGEFgwWED9LCKBBcwB/CaBIAAQEDDRDwAAwKT8cWgQ
-BhBYMFhA9S0igQXdAf0mgSAAEBAw0Q/RDwAAbBAEFW7VAkkUKVaRJFKSAghDD4gRAIEEADYa8IEE
-AAMQODDwdxoP/xBAMAh3AwdEAQZEAiRWktEPAAAAbBAEFG7GIkaWI0aX0Q8AAGwQBtIwiSAUbtv5
-lk5yAAAZcBhxIyiCrv8CAAAAmAYQwFAoQewpQnWZIyglCC9B7S8lCS5B7i4lCi1B7y0lDCxB8Cwl
-DStB8SslDipB8iolEClB8yklEYkgYAABwFB6liGKIytCdXq0CfAAFm/qECgwAAAsQewrIQj6RnUk
-AAvbEMFW2jD7LAACAABhcFg/bMAg0Q8tQe0rRewqIQnTD9MPetzcLkHuKkXtKiEKeuzQL0HvKkXu
-KiEMevzEKEHwKkXvKiENeoy4KUHxKkXwKiEOepysK0HyKkXxKiEQerygLEHzKkXyKiEResyUKkXz
-WHf3HHESKEHzLkHvL0HsKkHyKUHwK0HuLUHt8JkRCwAEOqDwuxEPAAQ/4P9B8SwJAH9w++4CCAkA
-UjD6CgQgABBYMPgWAC4JAE/wWECOWBGw9q8/YgAAKrBgAYEAF3D9+HD9EAMQSDApRe75Re8gABAw
-MCZF7CZF7Sh27Fh5CYsh0w90tnr7ilIK8AFcMFh37vahNmIAACqwLHKLLCYKK3KMKyYLKnKKKiYJ
-WHfiK3IT+m5wEGcANuD/AgAL/ztekC1yRv8CAAv/Ne6QLkJU+woALmAAN6AqQpNtCBkoQououAmI
-EaioJoYbL0JUsbv/AgAL/yB60GP/3wAAAAAAAAD6CgUgABBYMFh3z/evm2IAACqwWKlLY/55AAAp
-ckZln5YdcM0fcM8YcM0uQe8rQfL5QfMgABBQMPxyyy4AQEOw/kXvKgBAfvD7RfIoAEBucPlF8yBE
-ADcg/HDDEAQQaDAuQosrQpOurgnuEa67KbIX/JkBAAICUrD5thcgDgBScC21Oya2Gy9yyw8CAA8C
-AH+jzSlB8ytB8vu3FXACEFAwKna6Kna7+na5IQAQQDAodrx/lxv6drcgCBBYMPt2tiAgEEgwKXa1
-Y/1nWKkdY/3CJkXzY/1bAAAAAAAAAFh1KPP9r2IAACqwbBAEjEGIQB5wNxlvO40g/uJ/KPgBQDAJ
-iAr4glgiAABQ8P7dDAIAAFkw+N0RAAUQcDD8DEcMCQB3cAuAAIlBjzIJiUf5CQYAFgA34MheiieK
-rpWg9qYBL40QEDDRD9KQ0Q8AAGwQDBRuFisgDCogDfAEBwIAAEhwAElhAElhAElhAElhFW8dGW8d
-F3AW/G8dGYAEOuD8FgErwAQ84PsUECAAEGgw/RQRKAkAQrD+cn8oCQBKMJgQ/SIAKPgBQDAFiAr4
-glggBRAwMP7dDAIAAFCw+N0RAgAAWHD23QIABBBgMAuAAIMR0w8Dg0cDAwZmMj0jEQTzA0sCAABQ
-sPwKASIAAFjwWB968AQHAgAASHDwCaACAAAysABJYQBJYQBJYS5yfxhu/BlwVhpu+foVBCABEGAw
-nBH5FgMoCQBA8CgWAP0iACj4AUAw9YgKAgAAWHD4glghgBB4MP7dDAIAAFGw+N0RAAUQcDD/FQUs
-CQB3cAuAAIUR/27gFOgBLDD1BQYABRBwMPZRvmIAAEhwAASL8AmgAAEQKDAASWEASWEASWEpcn8Y
-bt2VERpwNvoWAigJAEDwmBD9IgAo+AFAMA+ICiiCWPndDAIAAFhw+N0RAAEQYDD+3QICAABRsAuA
-AIUR/27FFOgBLDD1BQYCAABIcPZRbGAFEHAwAASLAElhAElhAElhAElhKXJ/GG7F+m7GEAEQWDD7
-FQQgBBBgMJwR+hYEKAkAQPCYEP0iACj4AUAwD4gK+IJYIgAAUbD53QwCAABYcPjdEQAAEHgw/xUF
-LAkAd3ALgACFEQWFRwUFBvZRFmIAAEhwAASLAElhAElhAElhAElhLnJ/GG6s+XACEAIQYDCcEZkT
-+W6bGAkAQPCYEP0iACj4AUAwCYgKKIJY/t0MAgAAUbD43REABRBwMP7dAgIAAFhwC4AAhREFhUcF
-BQb2UMtiAABIcAAEiwBJYQBJYQBJYQBJYS5yfxhuhRlv6pkR+W6EGAkAQPCYEP0iACj4AUAwCYgK
-+IJYIgAAUbD+3QwCAABYcPjdEQAFEHAw/t0CAAEQYDALgACFEQWFRwUFBmZQgtIw0Q8AjSD6CgIg
-ABBYMPxv1RIAAHDwWD9W0jDRD40g+goCIAAQWDD8b9ASAABxcFg/UNJQ0Q8AjSD6CgIgABBYMPxv
-yhIAAHFwWD9J0lDRD40g+goCIAAQWDD8b8USAABxcFg/Q9JQ0Q+NIPoKAiAAEFgw/G/AEgAAcXBY
-Pz3SUNEPjSD6CgIgABBYMPxvuxIAAHFwWD820lDRDwBsEAT0IFxj8AEUMPQKICAhADTgAohXyoEC
-yVPKmQLqUfSgL2H+AlkwArQ70kDRDwAAIhHz/9xgEBAgMAgiEfP/1mHwAiEwAAAMIhHz/85h+AIh
-MA4tEfxM/SH8AhEwDcI70Q/AINEPAGwQBBJtACIi2NEPAGwQBBJs/SIi19EPAGwQBCX6wAUlASRR
-FfUKwCQAICkw8yYBJAAgKTCUINEPbBAEE2+P+W1SEAAQYDAsNtosNtgsNtYsNtMsNsgsNsYsNsIs
-NsEsNrwsNrosNrUsNrAsNq8sNq4sNrQsNsAsNtL5NrYsABBwMC42zS42z/421SA/EHgwLzbM/zbO
-L/8QEDAiNrHyNrcgBhBoMC02w/022SAeEFgw+zasIBoQUDD6NrIgAxBAMPg2uCAQEEgw+TbQI/8Q
-QDD4NtQgERBQMCo2yhtvE/s2ySAbEGgwLTbEEm5jH29kLza98ja7IAEQcDD+Nr4gDxAQMCI22xxv
-Xiw2x9EPAAAAbBAEF2yw9m9bFeAEPKCnV/N2ACQAIDVwJFZ/0Q8AAABsEAQYbaCIgBlvVPNtnhgA
-QEow+CICABAQIDAEIgLyNgAgABAQMNEPbBAEGG5qJoJhGm2UKYKY94KdKgAIsJCimQmZEfAABmYA
-IE3wwHDDyiymECOmEcO7K6YQJKYRG24+iqAcben4LREKAEBasP2qAgAgEFgwC6oCDKwCBco5G22B
-wCD6tgAgCgA14JR6k3vRD8Ag0Q8AAGwQBPhtdRATEFgw/G8uEAEQUDD5+v8v5xAwMP0KFCHgEDgw
-/MzYIMICPKDyzAAAABAoMNMPbdoPLiF0Bu4B9+EmcAQCELCxVcdLIoLABLUMAFEEAK8aCfMDAyIB
-Av8CL4bAYABoAAAA/1veYgAAIXAugoQAUQQArRoJ3wMP7gEO3QIthoRgAEX1CgAiAJAYoMDQ8swA
-ABQQGDBtOg8kIXQGRAHyLAImAEi9ELFVJPr7JYLABLIMACEEAN4aACEEAK8aCf8DD1UBDlUCJYbA
-8swAAAAQKDDzChQiYBA4MG06DyQhdAZEAfdBfXAEAhCwsVXHWy6CwBdsayxyjydykwW9DPDRBA2Q
-BDsg8K0aBgAgZfD2cDcuEQBPcA/uAfwKAiwJAHdw/YbAJgkAYbD2dDcgABAQMNEPAP8CAAIAACFw
-/wIAC/+2FWAugoQAUQQA3xoAUQQAohoJIgMC7gEP7gIuhoRj/2cAAG9bhyuChBRsTSZCjyRCk/BR
-BAeQBDmg8KcaBAAgMTDzQDcsEQBJ8Ay7AfYKAiYJAF3w94aEIgkANPDzRDcgABAQMNEPxirRD2wQ
-CPttNR8AEHAw8ioLAP8QYDD/bDgRGBA4MPcnKAIAAEmw86oJB8AEOOD4/fYrwAQ6oPuqCAYAIEXw
-9JB1ZgAgObAfbrUCKAv9brQZsAQ6IPtsbxgAIFow/YbFIAIQSDApduordusr8X8rhsErduwv8X4P
-Ry4PTyz4bOIQAgJr8Pdupx4FAD9wrFn6FgQoAEB2cPWXOQoAQP4QB4kUAJsRC/sCK6bJKWapL2aq
-0Q8AAAAAAI38LnLsLHLrDd0RDt0sDcwomhT8FgUqAFKnECRmqPpy6yIAAFkwWEAJ/RIFIAAQYDBY
-P0b0UKxg/xBIMPlVCA8AEEAw9LCkZABARXCNFAWKFACsEQy8AizWySpmqStmqtEPAAAYa/ccboIZ
-bLmIjPQWASIAAGiw+RYAIgAAcPD3FgMp0AQ6IAuILPmIKAADEFAw+BYCICAQWDBYPekZbKyMFAeK
-FACrEQubAivGySpmqSlmqtEPAAAAAAAA/0wAAAMQUDD8EgUgIBBYMPwWACIAAGiw/G5oEgAAcPBY
-PdiEFWP/NvVuYh9kALbgGGvV+IIMIgAAaLD0FgEgARBIMPkWACIAAHDw+XLsIAMQUDD8bloSAAB6
-8PUWAynQBDogCYgs+BYCICAQWDBYPcXAkYwUBYoUAKsRC5sCK8bJKmapKWaq0Q8AAABsEAb2a5cR
-GBA4MAcnKNMP923/FgAgObAjZukjZugncn/7bfsSAABR8Fg/tvW8AAIAACKw+wpkIgAAUPBYP7H8
-CgAgZBBoMFg+79pA/AoAIgAAGvD7XAACAABo8Fg+6f+xMWIAAHLwGWydAigL+mxmGbAEOiD8becY
-ACBKMCyGxfpm6yACEEgwKWbqK4bBK2bs0Q8AkxAcbeCbEx9r3htr3f1sWRADEFAw/RYCKdAEPeAL
-mSz9mSgAIBBYMPkWASIAAGiwWD2MHGvTHmyEAi0L/2xOHbAEP2D4bc8cACB3cCjWxf9m6yACEHAw
-LmbqLNbBLGbs0Q8AAGwQBhNrfyYgBykykSMyk6aZCZkRqTODN4gigz7IhMAg0Q8AACc9AShxoGSB
-jilxgmSRiMDC+ypeIsMQUDD6OggKACBc8Fg1gB1tmywygv3JJ3ACEEgwKXGg+AokIgFL/lD4FgEi
-AXP6UPgWASIBn/ZQ8ACNYgAAUjAuKoAOPgj+FgIgABB4MC/kR//kTSABEGgw/eROIAoQQDAo5Ez5
-5EogCAJY8PnkSyAbEFAw+uRIIAgQYDD5CiEizxBQMPnkSSoAIFDwWDVgKXGg+Ao2IgCI/lD4FgAi
-AKr6UPgWACIA0HZQGW3WL4zaDw9I+RICLgkAT/AvlEYPjxT/lEUiAABSMBlrqPo8CAKAEGgw/cwI
-AAAQWDD7xCEpwAQ5oPvEIigAIEowmBMogjonrDEHRxT7EgMqAXw+ECuyORxrOvi8AALqADbgAAyL
-bXkCAEhhHWuXGGwAmLCPIBhraP22AiAkAnKw/rYDL4AEP+D+a8oeCQB98P+2ASkABD2g/zKAIAAQ
-YDD8tQoioRBoMP62BiAEAmKw+rwgLgkAT/D8tQsuCQBH8P+2BCoAIGzwWDUmihMnpjkpMo6xmSk2
-jgULR/8CAAP/LYLgiif7TAAAABBgMPqsICIAAGkwWx7awCDRD44SwYH45FggARBIMPnkWiAAEGgw
-/eRZIAQQUDD65FcgUAJY8P8wJiANEGAw/+RbIt0QUDD95FwqACBQ8Fg1CilxoPP+rWBJEEAwAAD4
-OggCgBBwMP6uCAAGEEgwKeQi+eQhIAEQWDD75CQgABBoMP3kIyACEGAw+DBiIqcQeDD95CYqACB6
-sPjkJSDIAljwWDT2iBApcaDz/mBgEAJCMCoagKo6KqDkx5oKmR2KEPhqwRAEEDgw+XcMAoAQcDD6
-OggAARBIMP6uCA8AATww+eQkLgkAR/D/5CIgABBoMC3kIw+PFP/kISDsAljw/zB0IqcQYDD/5CUq
-ACBisP3kJiH4AmHwWDTYiBCye/P99GgAIFowAMHF/iqAIBkQUDD+PggAABBIMPnkRy/CEHgw/+RJ
-IAkQaDD95Eov/hBYMPvkRS+AEEAw+ORIIQ4QWDD65EYiyxBQMPo6CAoAIFzwWDTCKXGg8/0ZYD8Q
-QDD/CgsgBhBYMPg6CA/+EGAw/vqAIoAQQDD4qAgAABBIMPmEIyKnEGgw/oQkKgAgarD8hCEvwhBo
-MPuEIiACEGAw/YQlIU0QWDD/hCYqACBc8Fg0qogRKXGg8/zBYBACQjD7KqcvwhBwMPkqgCGAEDgw
-+DoIBgAgPPD3cOQoACBOsP6UJS+AEGgw/ZQkIAwQQDD9bRgaACBasPd3CQAAEFgw+JQmIAoCYfD7
-lCMtAAFgMPsaUywJAGsw/JQiKgAgXPD8jBQAAgI58PyUISIAAGHwWDSKiBG2efP8SmgAIEowACoy
-jytsGPqsASIAAGCw+jaPIgAAULBbIAcFC0f/AgAD/eka4IonwLD6rCAgARBgMFshlx1rP52gjCAb
-bPb4zBEAARBoMPumAiwJAGsw/KYBIAAQEDDRDwBsEAQXajf1ICIgABAwMPQKAS8AEGgw9DBGYXAC
-QfAjIC0kJF0pcn3yPAAAPQA04ChygaWZCZkR+WwaGAAgSjAngR8JdwH5CsAn4AE8MAl3AieFH/AA
-KWIAADjwAAAAAAD2JF0gABAYMCSCjyJygaVECUQRpCIiIR/yd0ACBgEQMBprLgJZEaqZLpKCDe4B
-Dn4CLpaCLJKEDcwBDCwCLJaEKJKAGmqSG2p187Y5CABAUjAGiAL4loAgABAQMNEPAABsEAYkMAAV
-agb2CgEgPAA1IP8CAAAA7YUg/wIAAgD2ASD/AgACAPwFIP1SgSTOADkg+goEIBgQWDD8bLESAABp
-MFg8HsYq0Q8AiDGwKvgJQwAHEFgwbboP+EgUAf4CUrD5pE0oYAFEMCmkTCgwAf8CAAAAvWIQ+FJ9
-IPsANSD/AgAAAHmFIP8CAAIAdYEgwCDRDwAAJFJ/LyAipP8J/xH+MAMsACB/cI3XKTAFDuQJjd4p
-JF8oMQMNTwkoJTApMAT5JF4j4AFEMCP1bywgXxpsjfsKACAbEEAw8xqALCABYDD6mQINgAQ7IPn1
-cSwJAEMw/PVwKgAgG3D7pAUgAgJLsCmk5CogXvz6AC/wEHgw/ukJAYUANqB6wA0KihT0oB1gEAJa
-8HrI8XrwDApKFPAABmAIAlrwsbsKGhRlr/csIF/7D0IIACBPcPv/EQxAAWAw/8wCCAAgHnAslAYq
-ITAKihQqlAcoITD4lAggABAQMNEPAAAAKiBchCDAMPhEDABYADag2kD7PAAAABBgMPI1CAAAEGgw
-9VBMIAAQeDD/FgEgABBwMP8WAiBkEEgw+RYAIAAQeDBbGHpmoBsGXDf6TAACAABY8FsYXvagCmAC
-AhjwKCBceDOrKSAty5r6LAAAARBYMFv/VtKg0Q/AINEPLDAH/CRcIBACWPDxCxYAmAJQsAAKimP+
-Ybg+8w4WAKgCaLAATYpj/lHSoNEPKDAB+FsSAAQQSDD4OhIACBBgMPgXEgwHAUQw/HcBCgBASrD5
-iQEMAEBiMPoKAiYJAFXw/8wRCdAEPmD8mQIKAEBW8PqKAQgAAUAw+6oRCgkAbvD5iBEGCQBd8PqI
-AgYJAE3w+HcCAgAAULD3JC0gABBYMFv/K2P91AAAKCBfpN74CEIOACAbsCjkBi8hMA+PFC/kBywh
-MPzkCCIAABLw0Q8AAGwQBBtpV4wgI7J/A8wM+rKBLOABYDCjwwkzEaOjIzIHK7J9IzIOLgoC9RqA
-IAEQaDD0PQEqACBm8PhBgiuQBD7g+6oIAAAQYDD7QbEkACAs8PlBgyDoADYg/FTGIJAAPmBokm3/
-AgACAFoGYCoylihQxiqsASo2lvlFgyAXADYg+iwAAAAQWDD8CgAgAhBoMFv92htpfPxr7BIAAFCw
-WDhWwCDRDy8yjioyif8CAAQASUPgLzKWC/gu+Nw4AKsANqApUMYtNpb+RYMvyAA2YGP/rS4gNWTg
-eS8gSWTwcyggXWSAbS4ylgvuLg7cOCxUxitBrvSwZGH+AnrwDw9P/0WuIFkAN+AqMpYoUMaxqio2
-lvlFgy9+ADYgY/9jLDKWL0GuLVTGK1DGscz8NpYoBQB/sPlFgy9dADbgY/9CwCDRD2WvfC0ylrHd
-LTaWKUWDY/8tLVTGY/+XAAAAwLBb/sjz/6JgAxBIMC5QxrH4KDaW+UWDLwwAt6BlzwRj/xQAAGwQ
-CBlpHi4gIg8CACqSkSmSk66qCaoRqpkjkgcba6z4GuAhoBBgMPMyDiHAEGgw/5wwIgAAULD/FgEg
-QAIycP6UBywAIGzw/ZYVLAAgYPD8lhAoACBA8PiWGiCwAmJw/BYCIIgCInBb/tYba5n0FgQiAABQ
-sFv+0vtrlxIAAFCwW/7P+2uVEgAAULBb/s37a5MSAABQsFv+yvtrkRIAAFCwW/7H+2uQEgAAULBb
-/sQnPQEscbErcbAaaTgMuxwLqjb6da8gARAoMPU0GSAAECAw9TYHIAwQYDD0NBggMAJY8PQ2CCIA
-AFDwWDL2lxMkZQIkZAAlZAHzZgIgGAJA8PhmAy/AEHAwLjRO9DRMIAAQSDD1NE0gABBQMPQ0TyCA
-EGgw9BYAIAgQeDBt+kGimy+wRIwQ+vo3DmABfDD/zAgK4AFQMPwWACYSAL5gDMgRmBD/sEwsACBI
-8C/EVP+wTCwAIGswKcTF/8S9IAICSnD8EgAmACBs8PoaOSACAlqw+zRcKgAgUPD8NhQqQAFcMP27
-AgAEEGAw+3S4IgAAWHBYMsn7PEwgSAIw8PwKFCIAAFGwWDLEwcX7GjghDhBQMPo6CAoAIFzwWDK/
-jhEk5Awk5A0l5A4k5A8k5AMk5AAl5AEk5Ask5AUtME715AkuBwFsMP/kCCwGAWww/eQKIKACYPD8
-NmsgcAJY8Ps2bSB4AlDwKjZvJDZoJDZpJDRs9TRtL8AQSDApNG70NG8gUAJA8Cg2big2aiY2bP8g
-LSAIEDAw9jRxL4gQcDD/NHAg2AJY8P500SAGEGAw/SAtIMACMPD9dNIiAABRsFgyloIU/AoCL8AQ
-ODD7GlEhTRBQMPo6CAoAIFzwWDKPJCQMJCQNJSQOJCQPJCQDJCQAJSQBJCQLJCQFKzBuDwIADwIA
-9SQJLAcBWDD8JAgqBgFcMCskCic03PQ02iDgAlDw+jZzIMwCSPD5NnUg1AJA8Cg2dyQ2cCQ2cfY2
-dCDIAmDw/DZ2IYAQEDD8NnIiACAQ8Pwg5CAEEGgw9TTbINoQWDD0NN0qACBc8PzMCQDkAjDw/cwJ
-AgAAUbBYMmf3EgMgGRBgMPsahSFTEFAw+joICgAgXPBYMmCIEiSEBSSECyWEASSEACSEAySEDyWE
-DiSEDSSEDCkw3PWECSoGAUgw+oQKKAcBTDD5hAgg7AJ48C82ev82fiDeEGAw9jZ8IKYQaDD0Nnkg
-qhBwMPQ2eC4AIHDw/jZ/LAAgbPD9Nn0sACBg8Cw2e/UkxSAHEFgwK3WgJDaJJDaEJDaO9XWDIAAQ
-EDDRDwBsEAT3+uchCQA04PhM+CIAhYEg9QoBIAAQSDD4WTgAABBYMPpo7xATEHAw/2f6EAEQYDD9
-+v8gABAgMPgq4CAUECgw8/wACAkAQLDTD21aDyUxdAdVAfWBLnAEAhjwsUTT8PsqwCAAECAw+yIC
-ABQQQDBtig8vMXQH/wH/IU5wBAIY8LFE0Q8AZk/Ub0sdI6KEAEEEALUaAEEEAMYaDWYDBjMBBTMC
-I6aEY/+zKKLABOYMAGEEALMaAGEEAMUaDVUDBYgBA4gCKKbAY/+SZk+0b0scKKKEAEEEAJsaAEEE
-AM4aDe4DDogBC4gCKKaE0Q8vosAE5QwAUQQAkhoAUQQAwxoNMwMD/wEC/wIvpsDRD8CQ8/8NYAAQ
-WDDAkPP/A2ABEFgwbBAEKSIHKZIOKJIzIiAiKwoA+IwBIAAQYDD4ljMiAABQsFv/rhxoxwIqEays
-K8KAHWoMDbsBK8aAC+owGWetKZI1CZkKC5kJC+owC5sMarEObQgIDeowDZ0MatECY//wHGfKHWe+
-ra0r0oAeZ8IOuwIr1oArwpH+ae4QkAJTMCqigfzCjyoAIBbw+bsRDgAgcLD+4OgqACBesPuyBywA
-IBMwCcwRrKr7sg4gEgD7sMAg0Q8A/70BIAAQcDAutoIu9aEu9aAu9a7+9YIiAABbsFv9TsAg0Q8A
-bBAEGWozF2eq/mh2EAEQaDD5nNgv5xBYMPQwRWG4AjHwaDI92JD8KkAgABBQMP/ihSAUECAwbUoP
-JYF0C1UB+IwCJgByZVCxqipyjyhinAmqEaqIKIBkZIHm/wIAAACIhKDAgPQKASIAAHjw8085AgCC
-AKDagPQKFCIgEGAwbUoPJZF0C1UB+ZwCJgBc5VCxqiX6+yniwMFDBUQMAEEEADoaAEEE8NsaD/8Q
-YDAMuwMLmQEKmQIp5sAqco8pYpwJqhEKmQglkDf7CiAiAABSMA+6OQpVAiWUN2QwkhlqEPNiYiAA
-koSgZDCE8goAIAMQUDBtCC4rkHwkco8AIAQLCxv/txp0ACAgsCNinAlEEaQzLDBkyMQoNGQqNGsj
-YmKxInMrSmP/ygCgBA8IGf8CAAH/jH4Q/wIAA/+UmKBgAC4AAAAA9awAC/+mFqAp4oQAoQQAOhoA
-UQTw2xoP/xBgMAy7AwuZAQqZAinmhGP/ScAg0Q8A2oD0ChQiABBgMG1KDyWRdAtVAfxRUXAEAkpw
-saol+vsp4sDBQwVEDABBBAA6GgBBBPDbGg//EGAwDLsDC5kBCpkCKebAKnKPKWKcCaoRqpklkDf7
-CggiAABSMA+6OQpVAiWUN2P+/QD/q7RiAAAqsCvihAChBAA8GgChBPDUGg//EEgwCUQDBLsBDLsC
-K+aEY/+xAGQ/Y8AgbQgtKpB8K2KcACAECgob/HKPICgAfrCsLAnMEay7LbRrLbRkI2JisSL/AgAL
-/5qYkGP/y2UuHWP/JwBsEAQaaaH4oKkgDhBoMPln4x/nEGAw+yAjIBQQeDD6rNggdgDyMP4KFCYA
-T27QLSAi/Q1CAEAQeDD/3QIAABBYMG3qDy6hdAzuAf7RLHAEAlKwsbvwACJv+xBYMAB9sWctGofA
-sG36DyihdAyIAfjRCHAEAlKwsbvHu/+7JmABEGAwKpKFALEEAM0aDaoBCso5zqbB7P4kLCAAEBAw
-0Q8AAAAAAP+SwSHgAlLwAKEEAMgaCP8BD885ZP/XKyAi8goAIBUANuDRDy0gIi4agPP/kWwJAHdw
-AMCk/Gl/EBgQWDBYOOHAINEPbBAUKiIbwMAsJC4poQMooQL/AgAGAJXOEBtowR5m4x1m4yUhHCgh
-HiYhHxdm9ZcenRieGikgItTA/2a+EgAAGzD9ZqcYCQBecPkWEC4GAUAw+WiWGAcBQDD4zAACBQBH
-8P7YOQoHATQw+2liFAUAWnD4Z1UUCQBBMPsWESgGATQw/iArJqABMDD/ICQmgAQ5oP0gLCwFAEow
-+CAgLhAEO6D7/xAOCQAzsPYgIy4JAH8w+4gRDgkAG7DzICEsCQBHcPUVJi4JACOw+GYRDgkAe7D/
-IR0jAAQ84P8VJyIJADTw/CEZLgkAG7D8FSgsCQB3cC0WEvsgNCAAEEgwKRYWKxYXKCA1KBRSJiAv
-9hRTIAAQWDBbIaYqFh0WZuAdZpkYaTYVZ4goFhn1FhwhgAJCMPgWGCIAABqw8ABHYFgCK3DRDwAA
-AAAALUAM/wIABgBNg2DIlv8CAAAAlwdg/wIABACTB2BkUcwVZ3P6IhsgAgJY8FshjigSHR1mgvqB
-wXIAABqwKNKLJFKIo4gJiBGoRCtBK/ax0HAEEEgwiEAIiBEJiAKYGS9ABy5CBw8PQfzpFC8ABD/g
-+uwgLgkAfvD74gkuCQA/8P8WDCCyADcgLAooWxgw+2ZFEn4AtqDAUC6w0f4JQAH/sX+QLCArLyAi
-wJEMnDn//wkAVAA3IPpniBJaAL8gysUM/xH9QAwqACB6sCqggNMPfakq+kwAAgAAWLBbjigbZjFg
-ABMAAABowxv/AgAEAJSDIGjFEGjGxy1ADC6w0fP/CmgAAXQwKSAiGGdzCZkJDJkR/UAMKAAgSjAo
-gIB9idr6TAACAABYsFuNXBtmHWP/xgAAAAAA8/9OYAAQWDAAABtmPiwgIhpnKiuygiqiiKy7CbsR
-/yArKgAgWrAqFhouoDUooDSNoPmhGSAAEGAw+6AHIfQCQjD7FgAgARBYMPi8OA4FAH7wLxYb+qAW
-KAUATvCZE5oR/BYEIAAQUDD6FgIgMBBYMPwSHCAFEFAwWDgiLBIbDwIA/wIAAgBZgyAtEhot0DT+
-Ehsn/yqbYGThBf8CAAAAkQeg/wIAA/8hG6D6EhogAhBYMFuMAWVeMvscICIAAFEw/AoEIAIQaDBb
-Fe/9QgAgBBBQMPxoqxAYEFgwWDgKY/4JLBIZLUAiLiACLyAB+SAAIAQQUDD5FgAgMhBYMFg4ASpA
-IhxnJwqtCQzdEf3MCAABEHgwL8R5LiAALsR6LSACLcR7KyABK8R4W5K3G2XQY/6PAAAAAAAA/BIY
-IAAQeDAt8AD+8AIgBRBQMP/wASAwEFgwWDfsKhIawIAsgAApoRkogAEspBb4pAcgDQA2YC0SGgkJ
-TCnVGf8SGiAAEHAwLuACGma1iPoD7hEOngL+9RkoCQBSMJj6Y/7tAAAAAAD6EhogABBYMFuLw/oS
-GiAAEFgwWs+rY/0uAAAAAAAAAPoSGiABEFgwW4u7+hIaIAEQWDBaz6Nj/Q4A1aAlFh6OWPoKBCAY
-EFgw/GhmEgAAaXD/ICIuYAFwMFg3wotY+49XABsQQDB48S6KRy2hFfn6wCBAAlKwCakBqdn7XEAo
-AIHNUMLIWxd8G2WR9awADTEANqBj/6gAACwgIgsNQ33Jxy4SEQ4OX2njvhplhi0hHh5lmvghHyAA
-EFgw/X9AAgAAYvD9bUAMBQB7sP9ncRIAAHLw+HlADgUAarD6ICsiAABq8Pn7OQ6gAUQw/iAkKgkA
-dvD4/xAKEAQ6oP9mLBoJAHqw/CAjKgkAYrD7ICEqCQBasPhoQA6wBDug+P05DYAEOyD+3QILAAQ+
-4P2qAgoJAGbw+yAgKgkAWrApICwLuxH7IRwoCQBecCtVFvghHSgJAFZwmVooVRcvIRkvVRj+IDQg
-ABBoMJ1enl8sIDUsVDIrIC8rVDMbZVXz/ERgARAoMA27DGP++mwQCCgiHdMPDwIAiILzICsiAABQ
-sAuAAPcKASABM6agKiArFWVHiyf0ICImALYekPNmWhJHADagi74qsjLE8PqsASCAEHAw+rYyIXAC
-SXAYZVgCShGoqCyCgB1oAQ3MASyGgC2Ctxtn/wvdAi2GtyySjytSgaTMCcwR+GchGgAgZvAtsR8s
-sR0I3QH9tR8gQgBnMCyxHnjHFqOsLcKA/wIAAACAD1AqsC1gAPcAAAAA+goALAAgGrAv+gAtwoQo
-sR0P3QH6CgAsCQBusP3GhCBAAGIwKLEeeYcVKsKAKLEf/ogCAABmDpAqsC1gAMMAACvCgg+7AQur
-AivGgijCgBpligqIAijGgCaSkSpSgftnXRYAICGwCWYRqmb9YgcqACBdMCuw6I3e/RYBIgBGetAs
-IR/aQPwMRQABEFgwW/z8K1J9KSEfiiAJCUX7qgwAAJKGYPtlRBJIADpg/wIABACUgmD/AgAIAJSC
-YP8CAAoAlIZg/wIADACUgmAcZPIswjYtOugNvSwHzBENzCwCrRGj3SzWgVsU1vckLiAAEBAw0Q/A
-oS2xHw/dAi21H2P/B8ChKLUfY/83GWUJKZKPpJkJmRGpqlv75itSf49gDwIAC/8M+lKBLuABfDAL
-+wgJuxH4EgEqACBesCuyBx5k/CiNAiuyDi7ijyeFAiy9Af3Bgi4AIHuwCe4R/sGxKgAgcrD5wYMv
-GwA3YC0agP29CAAAEHgw/9TGIABABmD/AgACAFWCYP8CAAIAgAZgL7KWLtDGL/wBL7aW+cWDIBcA
-N6D6bAAAABBYMPwKACACEGgwW/leG2UA/GdwEgAAUbBYM9pj/rsbZ31j/wAA2iBb/PVnrrzSoNEP
-ABtneWP+7AAAG2WyY/7kAAAbZ3Zj/twAABtndWP+1AAAKLKO+rKJJABYwiAospaYEA6ILsDh+O84
-ANIANqAp0Mb3tpYgAhBQMPrFgy98ALZgY/+HKGA1ZICPKGBJZICJKGBdZICDKLKW8hYGIAEQEDAO
-iC4ILzgv1MaCFi7BrvsWBCBuADegsO/7FgQv4AF8MP/FriBcADfgKrKWKNDGsaoqtpb5xYMvIQC2
-IGP/LAAAKsGuL7KWJ9TGLtDG//wBIAIQQDD/tpYoBQBWMPnFgy74ALegY/8DAGWvYSiylrGIKLaW
-KcWDY/7eJ9TGY/+LAJ0S/BYDIAAQWDBb+jeME40SixTz/5FgAxBIMI4QKtDGse4utpb5xYMurwC2
-oGX+p2P+twBsEAQpIDf/AgACAK1uUP5lVRATECgw+mcOEAEQIDDz+v8gABB4MP365yIAAGPw+qzY
-IKQAdnAmKgD7rAAAFBBAMG2KDymxdA2ZAfu8AiYAUzZQscwp+vsr4sAJWAwAgQQA/BoAgQQASBoD
-iAMIuwEMuwIr5sApIDcrCvsPAgALmQEpJDf7CgAgAHt+UPgKFCJgEGAw0w9tig8poXQNmQH8kXlw
-BAJSsLG7K/r7KuLAC1gMAIEELSA3APwa8IEEAP4QSDDwSBoMAEBPcP0kNygRABow/R0UCgBAQrD9
-JDcqCQBisPrmwCAAEBAw0Q8AAAAAAAAA+cwAC/+vlyAr4oQAwQQA/BoAkQQASBoDiAMIuwEMuwIr
-5oRj/1oAAG+7jCzihACxBCkgNwD9GvCxBAD+EFAw8EgaCABAVnD5JDcoEQAaMPkZFAwAQEMw+SQ3
-LAkAazD85oQgABAQMNEPAAAAAAAAAPoKACAAEFgwW/yEKSA3KgrvCpkBKSQ3Y/6PCRsU+yQ3IAAQ
-EDDRDwBsEAQbZs8YZAMaZs4cZADwAA9gABAwMACxZv8CAAgAQ4GgAGAEAgQbf0fsbzMLyDjAcvAA
-EmAAECgwaDgCaTtk9woAIAEQKDAGFED2D0AF4AQ5IPYuFA4JACfw8u4RD4AEP+Cv7gjuCC3igApf
-Ef9/AgwAQFdwD90CC90CLeaACeowJcI1CVUJCeowCVkMapGGbQgNCeowCVkM/wIAAf+9JmBj/+vR
-DwBsEAQaY9geZMr7CgAv5xBoMPwqQCABEHgw/uKFIBQQQDBtig8ooXQNiAH8gUxwBAJSsLG7HWab
-0w8r0mJksEwcZN3+3CQgABBQMG0IKSnAgCjijwCgBAkJG/+XFXgAIEKwK9KcCYgRqLsvtGsvtGQr
-0mKxqnurFGP/zwCwBA4JGX+XsMCiW/c0wCDRD8ChW/cywCDRDwAAAGwQBBtjsiiw0cH//IcPcAEQ
-GDApICL8ICwiTgA2YMAwKyAjwKn1Cg4mARpW0P8CAAYBFi7QKiAlLCAo9GO/EAAQMDD5IRMgNgA2
-oP8KASHWADcgsZ7+CEACAABpsAj9OP4lEyAZADdgKSIdi5z6kg0gcgA24GSgatogC7AAKyAi0w8P
-AgBksrwuIGr0Y5IYZAF0MPcKICC8ADZg/wIAAACshmD/AgACAWaCYPNmWhLMAD5g/GZWEAIQUDD9
-ICIgGBBYMFg1qMY6+goCIBgQWDD8ZlASAABo8Fg1ovAEM2ABECAwLCAjKiAi/woQJgEWLxACrhGk
-7inigi3igvlJQA/vEEAw+W85DABAR3AP3QIt5oJj/2crICPA+X+xChRjbfcKIC4B0yrQKiAs+qzh
-IAEQGDDzZjgaBQBQ8GADltww9iRqIAQQUDD9ICIgGBBYMFg1hPxmMRAEEFAw/SAiIBgQWDBYNYAb
-Y2L5CgAgCBBgMG3KRS0gaACQBA0NG3/XNwkaQPkIQAvgBDqg+S8UCAkAUjDy/xEJgAQ6IKj/pP8o
-8oMHiAIo9oMu/QSO4P/9BC4AQFuwLvYAsZkoIh0PAgCIgQIqAvsKASAAEGAwC4AA86wAAxkAtqDB
-kPkkaiIAAFCwW/3p/GYNEAQQUDD9ICIgGBBYMFg1WysgIxxmB8Cp/MxwIBgEUvD/AgAOAKEq0Cog
-LPqs4SABEGgw8AExagUAU3AAALCZCQlP+SUTI/8n/lBlnjL2JCUgBBBQMPxk9BAYEFgwWDVHKSId
-ipxkomiLnWSyY9ogC7AAY/4fKiAiWBi1Y/3OAAD/AgAH/tl/EBRjFim9CimSj/RCgSAAEGAw+mQF
-EYcQcDD5mREP5xBoMPlECAAUEEAwbYoPKLF0DYgB/oFScAQCWvCxzMeb+aLBIeACYnAAwQQAOxr7
-CgEoAEBecAm5OfVjgRFRADZgLVAhIwr/c9EPwKX8ZdEQGBBYMFg1ICNUIcAwZz0y0jDRDwAAAAAA
-AAD/y7JiAABLMCiihQDBBAA5GvmJAQABEHAw8/+yaAUAT7ACrBGkzC/Cgi3Cgv4KAS4AAXww+woA
-L/4QQDD/6zgMAEBHcA27AivGgmP9N9ogW/57Y/06AMChLiBrLSBksO4OajgNajlkoYv3JGogBBBQ
-MP0gIiAYEFgwWDT8HGWs+goEIBgQWDD9ICIhoAJjMFg09/ti4x/fEGgw+QoAIAgQQDBtikQqIGgA
-kAQKCht/pzYJGED5D0AJ4AQ6IPkuFA4JAEfw8u4RD4AEP+Cv7qTuL+KDDf8BL+aDLO0EjMD+7QQs
-CQBbMJzgsZkoIh2Igdog+woAIAAQYDALgAAdZYzzrAAA8gC2oPNlhRAEEFAw+woYIgAAY3BYNNXD
-kCkkamP8+gAAKkAsDwIA/wIAB/9U/pAqCv/8CgMgoBBYMFgXXPagUGIAABqwLVAh0w99qVctUCAr
-UCJ9sUYpQCxolEBolT0qCv/8ClYgoBBYMFgvQ/agI2IAABqwHGVu/VAiIAUQUDD+UCAgGBBYMFg0
-uCxQICxUImc+WtpAW/uaY/5SAPP+TmAAEBgw+goFIBgQWDD8ZWESAABw8Fg0rCNUIWP/ji4gIi0g
-ZQLuEaTuLeaCY/uyFGKC9wogIAEQUDAoIGsvIGSwiAhqOA9qOWSsV9ogW/0n06BnMB/Hlf8CAA/9
-6UjQKgoE/GVMEBgQWDBYNJfwAAZgABAgMMBBKiAuyKPaIFv7smRNzRtlNPxlRBIAAFCwWDGN0jDR
-DwAAAGwQBBxibvgKCC/fECAw/2J1ECAQaDD6LAAAABBIMPs8AAABEHAw8pwAAgUAH7D9YlwSBQAb
-cPkKAC4FAB5wbYpKKKBoAJAECAgbf4c8CRhA+Q5ACeAEOiD5KBQOCQBDsPjuEQkgBDogroitiC6C
-gwTuAQ4uAi6Ggy6NBI7gDO4B+I0ELgkAc/CegLGZKKIdiIHAwAuAANKg0Q8AAGwQBPNlGRoiALyg
-AyMKgzD6MAAAEBAQMMYq0Q/RD8Ai0Q/AKNEPAABsEARoMUH7YnsSIAA44Gg0Pmg4Q2g7SGg8Jxhi
-LiiCNik66Am5LAeIEQmILBplBgIpEQqZCPiWACIAAFCwWxIQ0Q8bZPBj/9EbZOxj/8sAABtk62P/
-wwAAG2MkY/+7AAAbZOhj/7MAAGwQBhhiGtMPI4DR+QoBIgBufNDVgPcKpyAAEBAw9vrnIBQQUDBt
-qhArUXQGuwF3sQvyLAEgBAIpcMcr0Q9mID8VYv76ChMgABBYMP8rNW//EDAwL1KEACEEAJ4aBu0D
-D98BD+4CLlaELFKEACEE8L0aDABAazANzAIsVoRgADAA0Q8AAC5SwAKsDADBBACdGgbXAwfuAQ7d
-Ai1WwCNSwADBBPC0GgIAQDzwBDMCI1bAB+owD+owJII1p0QPTwxq8Q5tCAgL6jALSwxqsQJj//Bv
-K1QtUoQAIQQAnBoGzgMO3QENzAIsVoRgAAGCECaCNcBQ9mYKB9AQODDwAAln8AQ5oLFVd1EcBOow
-COowpkQISAxqgextCAgI6jAISAxqgeBj//DRDwAALFLAAq4MAOEEAJsaBr0DDcwBDLsCK1bAY/+p
-AGwQBtcQ+QoAIA4QUDD1ZKMQDxBYMP5hxBAfEGAw9AoEIgAAaLD1UgAgARAQMPUWACIAADOwbUoq
-KGDkCAhE/IEfcAICMbD/AgAGAJbWEPCRBAYAkt4QAC8a/3QAIAICSnCxdyTg5PbihSIAIAtwIiAA
-9+DlIAIQYDD5CvAgWAB9sPJFFAJgARAw9AREA8AEOKD3B0QCCQAosPICRwYAf9UQ/wIABgB/1dD3
-YboQ3wA04P8CAAAAaZzgBkQU9kVABgBAYTAYY0L6YeIQUQA1YAwvAfIVEgQDARAw+S4BBABAZXD0
-7gIEAAEQMP//EQXQBDkg/0QCAgkAcXAEIgLy1REC4AEQMPKwE3QAID1wZDC7K1KADwIACLsCK1aA
-9GBoamABFDDB4PIVEgAgEDAw8jwSBABANXD+zAEGAEAwsP4kAQfwBDmg/UQRAgkAYvD2RAICCQAR
-cAQiAvLVEQLgARAw8pAjdAAgPXBkMFQpUoAImQIpVoDRDwCRBAC/Gi90APP+3WAIAkpw0Q8AAPYm
-FAQCATQw8/8sZgBAYbD/AgAH/4TV0K7VJVDk/ygRBIABLDD6VQwI4AFAMPP+7GIFACowKVKACpkC
-KVaA0Q8rUoAKuwIrVoBj/0NsEAQTYvcDIwojMpkYZC8CJBGoRPNGACAAEBAw0Q8AAGwQBBNi7/UK
-ACAIECAwDwIA8yMKAgAAOLDzMpkgABAQMG1KF/AhBARgARgw8EQaAAQCELDzQxQEACAlcBliaQJ4
-EfUkFAgAIEow9IYAIAAQEDDRD2wQBBRiZ/YsAAAIEBgwbToKKEKlCAhSZIBVuEQnCgAZYl0YYlP1
-CoAvABBQMPtiWhAAEGAw+HQIACAQEDBtKisMAgAiskAiktIKIwEDYwIjltIjktIsRqClc6gzIzKA
-IpbS8pLSIAgCITC0VdEPAAAnQqQHB0nz/6Vn4AQ94AAAbBAEFmP19woAIAAQGDDTD/QKFyIAABGw
-9m1AIAICOfDTD21KCiMmgPMmgSAQAhCwwUf5dOJiAAARsBJj5/dj5xANECAw1iDTD21KCiMmsPMm
-sSAQAhCwI2bL8m1AIA0QIDDzZsohvgg4sBZj2ycKAPQKGyIAABGw9m1AIAICOfDTD21KCiMm0PMm
-0SAQAhCwwUv5dOJiAAARsNEPbBAEGGM/DwIAqCgogOj8CgEl4AEcMP+HcnAAEFgwGGKMCCgKKIKZ
-wDD4SBQIIgFEMPCRBAAAEBAw8MoaAAYQSDBtmhL4SBQIIgFEMPCRBAoJAFbwAMoa+QofJAkAUvAD
-mQx5TQ6xM/k09GAfEEgw0Q8AAAD6PAACAABZcFulCvev4mIAABKwY//kAAD6LAACAABZcFulBNKg
-0Q8AbBAE92JJEgAAMLAVYNQFJQIldrMicrQUYosTY6P0ChAiAEAgsPMKACIJABiw8na0IgAAEfBt
-SgfzJrUgCAIQsCZ2s9EPAAAAbBAEFmHbpiYlYoDHfwc3AwdVAQVFAiVmgNEPAAAAAABsEATAwRhi
-/Rljjw8CAPgoCAUgBDig+IDoJAAgSTAkQgArCgD0BE8A0AB+MBhiSAgoCiiCmfhIFAgiAUQw8JEE
-AAAQEDDwyhoABhBIMG2aEvhIFAgiAUQw8JEECgkAVvAAyhr5Ch8iCQBW8AKZDHk9DrEi+ST0YB8Q
-SDDRDwAAAPtMAAIAAFCwW6TGZ6/i0Q/6LAACAABZMFukwtEPAAAAbBAEW/9vHGNo/QoAIAAQGDD6
-ChEiAABDMPzNBCACAmtwbaoKI4ZA84ZBIBACQjDBofnY5GIAAEMwwCDaIFv/QLEiaS71+GLoEBAQ
-UDBtqgojhhDzhhEgEAJCMBhi44iAGWLiKgrCCogCmJDRDwAAAGwQCPJgmRIAAECw2TDwAgcCAAAQ
-cABCYQBCYf8CAAQARJIgEmLL9BwAAAYQGDAPAgDTD9MPbToR8y0EIfgCITD1QgggCAIQsJUwFWDY
-EmLBG2LVHWLTH2LRFGLPjFSOVYNWileaKJNIilMUYs+DUp74nNiauJNIF2K2HGCyCIsQC5sC9mBY
-GgkAZvD7dv8j6BAQMG0ICbAiySAscv98YAJj/+/AINEPAMAg0Q/HK9EPbBAEFWFtwIgIKAIoVlIP
-NBEkVlPRDwAAbBAEF2FXAiYLC2YRp2YpYsIPPREA0QQAWhoA0QTwSxoP/xBgMAy7AwuZAQqZAilm
-wvdgLBEYEEAwCCgo9mLCJgAgRfAmdu3RDwAAAGwQBBVhRAIkCwtEEaVEI0LAFWAvBTMCI0bA0Q9s
-EAQVYT0CJAsLRBGlRCNCwBZgsxVgkwYzAQUzAiNGwNEPAABsEAQTYBUiMjUjMjYCIgoDIiyxItEP
-AABsEAQbYnoPAgD7sn8iAABQ8Fg0NP0KCCAAEGAwWDNj/SwAAAAQYDBYM2/SsNEPAABsEATzYTEQ
-ARAQMCI2gCI2gdEPAGwQBBhi4iqCf8GwC6oCKoZ/WDSL0Q8AAGwQBIcg+DIAIf4CSTD5eQEP/xAw
-MPlJDAYRADEwCWYB9oQMBgAgObD2JgAgDgA1YAVKLgpKDJow0Q+UMNEPAABsEAYYYVATX+cbYsvy
-iw1wIBBQMCkw0QqZAik00XK7FNog/BwEIgAAWHBYlq2JEGiSFWiWAtEPACww0S0KgA3MAiw00dEP
-AAAuMNHE8A/uAi400dEPAAAAbBAEwIAI5BYBAgAbYP8CKgkLqgojpmQr+sALSwH7WwIAIBBgMAy7
-AiumZSemZiqiZgrqMBlfximSNQmZCgqSCgbqMAYmDGphDm0ICAzqMAwsDGrBAmP/8AjkFtEPAAAA
-bBAE+GKgEBkANOAVYggogH0lUn+wNAhEKKJSpCLRDwDRDwAAbBAE+gqAJUAQSDDykjoBPxBAMAOj
-OqMk+PqAJAAgQTAIQgHRDwAAAGwQBPNijhNQBDigoyLRDwBsEAQYX9LwCAcD4AQ84G05AgBCYdEP
-AABsEATzYoUTEAQ4oKMi0Q8AbBAEEl+/KCKSIiKTCYgRqCICKgJatx4YX8MACIv4IgcgQBBIMG2a
-AgBIYcCQmSfRDwAAAGwQBBJidSMiQCIhf6Mi0Q9sEAQSYP8UYnEjIoF7NiApIooJCVXwkQQAARBA
-MACIGiIi/gIiFPAACWIAIBIwAAAiQX0kQYDzX4YQCwA1IAMiNaQi0Q/RDwBsEAQSYO0jIoF7Nhsp
-IooJCVXwkQQAARBAMACIGiIi/gIiFKKC0Q8AEmJWIiF/0Q9sEAQWYI+mJiVigMd/BzcDB1UBBUUC
-JWaA0Q8AbBAIEmDlFGGyKiJ8KSKC9mB0EAAQGDD/X40bkAQ6oP8WBCgAIFZw+RYDIAAQQDDwABth
-eAI4sAAAAAAA+laAIAAQQDCxM/RMASQApgDgKXKRJSKCqTn6QOgpkAQ+YPlggCQAIE1whVcAMAQJ
-CRv1Ug4hpAB+cH6nytow+woHIgAAYHBYMG6LFNhQ8AsHADMQSDBtmgIASGEtCnj+KoAhgBBIMPhd
-ASgAIE1w85TEIHgQeDD/ha8gBBBYMPuFsCAeEHgw/4WxLgAgcXAt5EQr5DH75DgvgBBQMPrkIi+I
-EHgw/+QtIAEQYDD85CEvwhBIMPnkIyAOEEAw+OQmIAMQSDD55DogBhBAMPjkQS/MEGAw/OQuIAIQ
-eDAv5C//5EIgBxBQMCrkMPrkOSIAAFhw/woAIqcQUDD/5EMqACBRcPoWAiAGEGAwWClK+iqyIgAA
-WHD6WggABhBgMFgpRfsSAiK7EFAw+loIAAYQYDBYKUD6KkwiAABYcPpaCAAGEGAwWCk7+hIDIgAA
-WPBb8Rn3rqpiAABCsNKA0Q8AAGwQBhZfKwAGixZh5Rlh5thgbZoCAEhhE2HoH2HkG2HiHmHkF2Hn
-FWHlGGHmFGBMEmHhLI3/IkZ6JUZ4JkZ1J0Z3KULTKkLNLkbcK0baL0a7I0Z5Le0oLUbV80GFIKAC
-evD/RrogYAJa8CtG3f7tCCuQBDqg/kbUKAAgVnD5kgcg/gI48Ad3FChGdomemRAjZQIjZQP8ZgAg
-ABAoMPdlBCLAARgw9WUFIC0ANKDaIPtcAAABEGgwWxzIaK4V+iwAAAAQWDD8YgAgARBoMFscwmmu
-6ShCdieFBCWFBSOFAiOFA/OMAAAgAmIw/IYAICoANKDaIPsKACABEGgwWxy3aK4V+iwAAAAQWDD8
-MgAgARBoMFscsWmu6YcQI0J3DwIAJ3EnJTUFJzUC9zUDICACYPD8NgAg/gIx8PZ2FALAATgw9jUE
-IWwANKDaIPsKACABEGgwWxyhaK4V+iwAAAAQWDD8MgAgARBoMFscm2mu6SNCeA8CAA8CACY1BPc1
-AiIAAFCw9zUDIAAQWDD1NQUgIAJg8Pw2ACABEGgwWxyPaK4V+iwAAAAQWDD8MgAgARBoMFsciWmu
-6StC1SlClyNC2vW1BSAEEGAw/LUEIgAQUDD6tQIg+xBAMAmIDPq1AyD+Akow+XkUACACUvCasPU1
-BSAgAmDwLDYAKTUE+DUCIsABQDD4NQMgKwA0oAIqAvsKACABEGgwWxxwaK4V+iwAAAAQWDD8MgAg
-ARBoMFsca2mu6SpCmA8CAGSglS2s//2oAQ4AD+6QbQgP/oz/IgAAUjD+iAEOAAT2kGP/6QAAD6oR
-IkLdL6x/D38UJSUFLyUE+iUCIsABVDD6JQMgIAJgsPwmACArADTgAzoC+woAIAEQaDBbHFForhX6
-PAAAABBYMPwiACABEGgwWxxLaa7p0Q8oQngmhQQnhQInhQP1hQUgIAJKMJmAY/7sAAAAAAAAAPP/
-jGABEFAwbBAMFmE7LCAMGF5EKmKf+2KnJl4AOyAogNEJqhH6uggAgBAYMP+HB3IAIB6wYAACI60D
-HF66iM3yCgAgGAA2INEPqsMJMxHz/+hiACAe8AAAAAAAJGJUFWEn9BYJIP4CITAEOhQFqgH6rBAg
-EBBYMFhw24gZBHkU+aUEIgAAErD4pQIgIAJisPilAyAAEDgw96UFJMABQDD8pgAgKgA1INpA+3wA
-AAEQaDBbHBVorhX6TAAAABBYMPwiACABEGgwWxwPaa7pJGJTDwIADwIA9BYKIP4CITAEOhTyZqwq
-AEAqsPqsECAQEFgwWHC9J6UFBHgUhBr4pQQiAAASsPSlAiAgAmKw9KUDJMABIDD8pgAgKgA1INpA
-+woAIAEQaDBbG/horhX6TAAAABBYMPwiACABEGgwWxvyaa7pJGJS0w/TD/QWCyD+AiEwBDoU8mar
-KgBAKrD6rBAgEBBYMFhwoCelBQR4FIQb+KUEIgAAErD0pQIgIAJisPSlAyTAASAw/KYAICoANSDa
-QPsKACABEGgwWxvbaK4V+kwAAAAQWDD8IgAgARBoMFsb1Wmu6RpeOfJmqiAQEFgwWHCJG2DPGV4G
-+GDOH/8QYDD6tuAgABBQMPAJBwAMEEgwbZoCAEhhGV7p/5xgIAMQcDAqlHwslH4slK4slN4ulH8u
-lK8ulN8s9K4u9K/+9KwgAhBAMPiU3CABEFgwK5SsJGJUwbAEtDb0Fg4g/gIhMAQ6FAWqASqsEFhw
-ayelBQR5FIge+aUEIgAAErD4pQIgIAJisPilAyTAAUAw/KYAICoANSDaQPsKACABEGgwWxumaK4V
-+kwAAAAQWDD8IgAgARBoMFsboGmu6RpeJvKmCyAJALSgxyTRDwCKHvKqEQAQEFgwWHBQG14f+fr0
-IgAAEfAKkjj6tgwgBgA0oNEPHWCSHGCUEmCRGGCR+BYNIBACIzCcHypiqywmf50cKaECLCaAJCaB
-9CaCIRUANmBbG4wYXbIogoAvYqeqiAmIEfkSDC4AIEfwKPAH+ZCAIPwQUDAKiAEICEf+YH8YCQBK
-MCj0B54UjfArHBD68gcgARBgMPjdEQABEHAw/yaDLAkAd3D9FgUgQAJSsFsUy4kdjB+NHCIsMPRM
-MCBgAmMw/dwBL/+4yxCGN4ZuJmIEJGx/BDoUBaoB+qwQIBAQWDBYcBompQImpQP3pQUiAAASsPR4
-FAAgAmKw+KUEJMABMDD8pgAgKgA1INpA+woAIAEQaDBbG1VorhX6TAAAABBYMPwiACABEGgwWxtP
-aa7pjTceYEyN3hxgUfLmaCAFEFAw/dIEIDIQWDBYL3QfYEUv8mj++vQiAAAR8A/iOMgk0Q/HJNEP
-HV1UItLbjDcj0twdYDyMzifWrI7GjMUs1qgs1qoCzwz/bxQOACBjsP/WqyH+AnOwDOwMDGwU/tap
-IP4CMzD2OhQAEBBYMPwWCCoAQCqw/NZmICACUrBYb+MnpQUGeBSFGPilBCIAACKw9aUCICACYrD1
-pQMkwAEsMPymACAqADVg2lD7CgAgARBoMFsbHmiuFfpcAAAAEFgw/EIAIAEQaDBbGxhprukZYBX0
-lmUgEAC1IPAATG/0EBAwAAAAABxgF/6SqSIAAHiw/ZKoIAUQUDDzFgAgYBBAMPgWASAyEFgwWC81
-H2AGHGAOLfKr/vKqIAUQUDD/8mYgMhBYMFgvLsAgyCbRDwAAAAAAAP4KPywAEGAw/137EUEQIDD7
-CgYgABBQMC0aQC32EBhf9CnyESmG4ST2EC3yERNeHxlf+pk4JPYQIxoAA90CLfYRE110J4aWKoZv
-KoZuKoZwKoZ1KoZ0KoZ6KoZ8KoaBKoaAKoaCKoaGKoaIKoaTKoaSKoaY+oaaIAEQeDAvhn4sho0s
-ho8shpUuhowuho4rhoP7hpkv/xBIMCmGcfmGdyADECAw9IZ4IBAQaDD9hpAgGhAgMPSGciAbEGgw
-/YaEIA8QIDAkhpufPftfJxAeEEgwKYZsHl96LoZ9+4aJI/8QSDAphpQcX3YfXnQTXTcjhnYTXfcv
-hnsshofzMsIgERBQMCqGitEPAGwQBBJeOSMigXs2GykiigkJVfCRBAABEEAwAIgaIiL+AiIUooLR
-DwASX6IiIX/RD2wQEhtfuBpc29MPKLLr0w/0gr5h6AJKsPIKACAAEGAw9QoAIAAQMDD3CgAgABBA
-MPgWFCAAEHgw/xYJIAAQcDD+FgggABBoMP0WCyAAECAw9BYHIAAQGDDzFgogABAgMPcWFSAAEBgw
-9hYOIAAQODD1FhIgABAwMPwWEyAAEGAw/BYGIAAQKDAcXLsbX5cswosrspasLAnMEay7LLESmxz1
-tRMiAABQsPuxEyQAIGVwWGMSKRIUIhYWjR6CHCsSFS8SE5cvIyRVliwqIHMoIHQsIHIuIHH4ITIu
-ACB+MPwiCyoAIF8w/iBULAAgb7D6EgYoACBOsComEp4TKxYVKRYUnR4vFhONGY8bKSIRiy78Eggm
-ACBhsP4hMyIAIHTw+yE0JgAgXfD5ITUqACBKsPgiGy4AIH4w+xIHLAAgbvD+EgosACBjsJ8b+F9n
-GgAgXjD5EhIuACBycCIgcCiAbZ0Z/hYKKAAgTLDyEhYgMgD+MCkWEiIWFogcghOSFSKEYiISFmAA
-CYgcKRYSKIBimBUZX1WaFogVKZLrmxf8FgggAgIQsPhECAv/cEyQGF9OKILtZIGf+RIOIAAQEDBt
-CBcAATAAADEgDHggDQEAATEAAgAAAjAgDAElFhkVXGYYX0IlUo0kFhckgpbyFhgkACAssPcWGiWQ
-BD1g9RISJAAgKTAkFhCWTCpGEidAcCNEVSJAcvcSFSQAIC3wJRYSJUBz8hIUJgAgPLAnFhUnQHT1
-EhMiACARcCIWFCJBMvdBMyQAIC3wJRYTJUE08hIaLgAgfLD3QTUsACBh8JJP9UIbLAAgbXAiQHH3
-QRIuACBx8PUSGSoAIF1w8kBUKAAgTLCSH/VFEyQAID1wJRYZh0uFTiRCEfcSGiYAIDmw+IBtIgAg
-FPDyEhgqACAisPQSFyYAIC3w9RIZIPAA/jCZHiIWFigSEIIfIhYRIoRiIhIWYABoLKJWZMKn+woA
-IAAQYDD6CgAgABA4MPYKACAAECgw8woAIAAQIDD/CgAgABBwMP4WDiAAEGgw/RYSIAAQcDD/FhUg
-ABBoMPQWEyAAEHgw8xYUIAAQIDDz/olgABAYMCgSEJkeKIBiKBYRGV7qKBIRKZLtsSL5Kwt0ACBB
-MIkeY/5pAAAiEhL5XuQRuAA3ICyVCS2VC/6VDSA/ADbgsLgIuQH5FgQuALpG0IsUbQgR2LD7FgIh
-/gJK8Pm7AQ4ABs4QmxRj/+MAAAAAixL5XtIb8AQ+4JsSixIulQ0YXs4tlQsslQkrhpwtkfYbXsr8
-kfchMQA3YIgeKZH4LrBJIrRImRH5XsUeBQBKMP60SSAWADcgLhIVKBIUKLRLLrRKLhITLrRMLpH1
-+ucRcAAQEDAitEUitEQilQ1gAAMAZNFBKJJY85ZfIRIANiCfG/oWBiAAEBAwGlvTGV6wKqKMKZKW
-qioJqhGqmSkWDSmREvkWACIAAFBwWGogih2LEPulEiBYAlKwWGocih0qrDhYahqJHRpeoYgWL5BU
-jJ6NmyOUVZeflpwllRMrkhEukRL4lhIgAgIQsPugbSgAIFow/lUIBgAgabD8dwgCACB88PgWBiAU
-AP7wL5RiYAACL5BiLKJY/0QIC/+35JAlplMmplQnplUjplqOGy+h9S2iPySmW/ISBi4GAXww8qZW
-LAUAf7D9pj8gABAQMNEPGV5/mxJj/rNlzs8ukfll7skukfgosEmJHp4R+V54GAUAcnAotElj/uBl
-3khl7kVkvposlQktlQsulQ1j/kQlllMmllQnllUikj8qllbzllooBgFwMPSWWyIFAEPw8pY/IAAQ
-EDDRD2XOuiyR+WXOtI0RZd6vIrRFIrREIpUNLZEHKJEFLJEJkpgNiAwMiAwolQtj/o/AQPoKACAA
-EDgw9goAIAAQKDDzCgAgABBwMP4WDiAAEBAw8hYUIAAQeDD/FhUgABAQMPMWEyAAEHgw8/36YAAQ
-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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_uwire.txt b/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt
index 7c99ae8df79b..3a3d2a938c01 100644
--- a/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt
+++ b/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt
@@ -1,6 +1,6 @@
 # Chelsio T5 Factory Default configuration file.
 #
-# Copyright (C) 2010-2013 Chelsio Communications.  All rights reserved.
+# Copyright (C) 2010-2014 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
@@ -177,6 +177,9 @@
 	# TP_GLOBAL_CONFIG
 	reg[0x7d08] = 0x00000800/0x00000800 # set IssFromCplEnable
 
+	# TP_PC_CONFIG
+	reg[0x7d48] = 0x00000000/0x00000400 # clear EnableFLMError
+
 	# TP_PARA_REG0
 	reg[0x7d60] = 0x06000000/0x07000000 # set InitCWND to 6
 
@@ -433,7 +436,7 @@
 	pmask = all		# access to all four ports ...
 	nserver = 16
 	nhash = 2048
-	tp_l2t = 1024
+	tp_l2t = 1020
 	protocol = iscsi_initiator_fofld
 	tp_ddp_iscsi = 2
 	iscsi_ntask = 2048
@@ -454,6 +457,7 @@
 	cmask = all		# access to all channels
 	pmask = all		# access to all four ports ...
 	nhash = 2048
+	tp_l2t = 4
 	protocol = fcoe_initiator
 	tp_ddp = 2
 	fcoe_nfcf = 16
@@ -544,6 +548,9 @@
 	hwm = 30
 	lwm = 15
 	dwm = 30
+	dcb_app_tlv[0] = 0x8906, ethertype, 3
+	dcb_app_tlv[1] = 0x8914, ethertype, 3
+	dcb_app_tlv[2] = 3260, socketnum, 5
 
 [port "1"]
 	dcb = ppp, dcbx
@@ -552,6 +559,9 @@
 	hwm = 30
 	lwm = 15
 	dwm = 30
+	dcb_app_tlv[0] = 0x8906, ethertype, 3
+	dcb_app_tlv[1] = 0x8914, ethertype, 3
+	dcb_app_tlv[2] = 3260, socketnum, 5
 
 [port "2"]
 	dcb = ppp, dcbx
@@ -560,6 +570,9 @@
 	hwm = 30
 	lwm = 15
 	dwm = 30
+	dcb_app_tlv[0] = 0x8906, ethertype, 3
+	dcb_app_tlv[1] = 0x8914, ethertype, 3
+	dcb_app_tlv[2] = 3260, socketnum, 5
 
 [port "3"]
 	dcb = ppp, dcbx
@@ -568,10 +581,13 @@
 	hwm = 30
 	lwm = 15
 	dwm = 30
+	dcb_app_tlv[0] = 0x8906, ethertype, 3
+	dcb_app_tlv[1] = 0x8914, ethertype, 3
+	dcb_app_tlv[2] = 3260, socketnum, 5
 
 [fini]
-	version = 0x14250013
-	checksum = 0xd66f5b23
+	version = 0x14250016
+	checksum = 0x5d740273
 
 # 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
index 03652a396a31..fb93a9b2b287 100644
--- a/sys/dev/cxgbe/iw_cxgbe/cm.c
+++ b/sys/dev/cxgbe/iw_cxgbe/cm.c
@@ -769,88 +769,72 @@ process_socket_event(struct c4iw_ep *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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, db_delay_usecs, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, dack_mode, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, c4iw_max_read_depth, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, enable_tcp_timestamps, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, enable_tcp_sack, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, enable_tcp_window_scaling, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, c4iw_debug, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, peer2peer, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, p2p_type, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, ep_timeout_secs, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, mpa_rev, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, mpa_rev, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, markers_enabled, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, crc_enabled, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, rcv_win, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, snd_win, CTLFLAG_RWTUN, &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,
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, db_fc_threshold, CTLFLAG_RWTUN, &db_fc_threshold, 0,
 		"QP count/threshold that triggers automatic");
 
 static void
diff --git a/sys/dev/cxgbe/offload.h b/sys/dev/cxgbe/offload.h
index a03d114a1a28..e5f3ec2ea39e 100644
--- a/sys/dev/cxgbe/offload.h
+++ b/sys/dev/cxgbe/offload.h
@@ -153,6 +153,6 @@ int t4_register_uld(struct uld_info *);
 int t4_unregister_uld(struct uld_info *);
 int t4_activate_uld(struct adapter *, int);
 int t4_deactivate_uld(struct adapter *, int);
+void t4_iscsi_init(struct ifnet *, unsigned int, const unsigned int *);
 #endif
-
 #endif
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index 8b637f420779..437b2a4dd3b2 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -1178,7 +1178,7 @@ cxgbe_init(void *arg)
 static int
 cxgbe_ioctl(struct ifnet *ifp, unsigned long cmd, caddr_t data)
 {
-	int rc = 0, mtu, flags;
+	int rc = 0, mtu, flags, can_sleep;
 	struct port_info *pi = ifp->if_softc;
 	struct adapter *sc = pi->adapter;
 	struct ifreq *ifr = (struct ifreq *)data;
@@ -1203,7 +1203,10 @@ cxgbe_ioctl(struct ifnet *ifp, unsigned long cmd, caddr_t data)
 		break;
 
 	case SIOCSIFFLAGS:
-		rc = begin_synchronized_op(sc, pi, SLEEP_OK | INTR_OK, "t4flg");
+		can_sleep = 0;
+redo_sifflags:
+		rc = begin_synchronized_op(sc, pi,
+		    can_sleep ? (SLEEP_OK | INTR_OK) : HOLD_LOCK, "t4flg");
 		if (rc)
 			return (rc);
 
@@ -1212,15 +1215,32 @@ cxgbe_ioctl(struct ifnet *ifp, unsigned long cmd, caddr_t data)
 				flags = pi->if_flags;
 				if ((ifp->if_flags ^ flags) &
 				    (IFF_PROMISC | IFF_ALLMULTI)) {
+					if (can_sleep == 1) {
+						end_synchronized_op(sc, 0);
+						can_sleep = 0;
+						goto redo_sifflags;
+					}
 					rc = update_mac_settings(ifp,
 					    XGMAC_PROMISC | XGMAC_ALLMULTI);
 				}
-			} else
+			} else {
+				if (can_sleep == 0) {
+					end_synchronized_op(sc, LOCK_HELD);
+					can_sleep = 1;
+					goto redo_sifflags;
+				}
 				rc = cxgbe_init_synchronized(pi);
+			}
 			pi->if_flags = ifp->if_flags;
-		} else if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+		} else if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+			if (can_sleep == 0) {
+				end_synchronized_op(sc, LOCK_HELD);
+				can_sleep = 1;
+				goto redo_sifflags;
+			}
 			rc = cxgbe_uninit_synchronized(pi);
-		end_synchronized_op(sc, 0);
+		}
+		end_synchronized_op(sc, can_sleep ? 0 : LOCK_HELD);
 		break;
 
 	case SIOCADDMULTI:
@@ -5546,6 +5566,7 @@ const char *devlog_level_strings[] = {
 
 const char *devlog_facility_strings[] = {
 	[FW_DEVLOG_FACILITY_CORE]	= "CORE",
+	[FW_DEVLOG_FACILITY_CF]		= "CF",
 	[FW_DEVLOG_FACILITY_SCHED]	= "SCHED",
 	[FW_DEVLOG_FACILITY_TIMER]	= "TIMER",
 	[FW_DEVLOG_FACILITY_RES]	= "RES",
@@ -7535,16 +7556,14 @@ read_i2c(struct adapter *sc, struct t4_i2c_data *i2cd)
 	if (i2cd->len == 0 || i2cd->port_id >= sc->params.nports)
 		return (EINVAL);
 
-	if (i2cd->len > 1) {
-		/* XXX: need fw support for longer reads in one go */
-		return (ENOTSUP);
-	}
+	if (i2cd->len > sizeof(i2cd->data))
+		return (EFBIG);
 
 	rc = begin_synchronized_op(sc, NULL, SLEEP_OK | INTR_OK, "t4i2crd");
 	if (rc)
 		return (rc);
 	rc = -t4_i2c_rd(sc, sc->mbox, i2cd->port_id, i2cd->dev_addr,
-	    i2cd->offset, &i2cd->data[0]);
+	    i2cd->offset, i2cd->len, &i2cd->data[0]);
 	end_synchronized_op(sc, 0);
 
 	return (rc);
@@ -7598,7 +7617,7 @@ set_sched_class(struct adapter *sc, struct t4_sched_params *p)
 		}
 
 		/* And pass the request to the firmware ...*/
-		rc = -t4_sched_config(sc, fw_type, p->u.config.minmax);
+		rc = -t4_sched_config(sc, fw_type, p->u.config.minmax, 1);
 		goto done;
 	}
 
@@ -7696,7 +7715,7 @@ set_sched_class(struct adapter *sc, struct t4_sched_params *p)
 		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);
+		    p->u.params.weight, p->u.params.pktsize, 1);
 		goto done;
 	}
 
@@ -8035,6 +8054,19 @@ t4_ioctl(struct cdev *dev, unsigned long cmd, caddr_t data, int fflag,
 }
 
 #ifdef TCP_OFFLOAD
+void
+t4_iscsi_init(struct ifnet *ifp, unsigned int tag_mask,
+    const unsigned int *pgsz_order)
+{
+	struct port_info *pi = ifp->if_softc;
+	struct adapter *sc = pi->adapter;
+
+	t4_write_reg(sc, A_ULP_RX_ISCSI_TAGMASK, tag_mask);
+	t4_write_reg(sc, A_ULP_RX_ISCSI_PSZ, V_HPZ0(pgsz_order[0]) |
+		V_HPZ1(pgsz_order[1]) | V_HPZ2(pgsz_order[2]) |
+		V_HPZ3(pgsz_order[3]));
+}
+
 static int
 toe_capability(struct port_info *pi, int enable)
 {
@@ -8260,6 +8292,9 @@ tweak_tunables(void)
 	t4_intr_types &= INTR_MSIX | INTR_MSI | INTR_INTX;
 }
 
+static struct sx mlu;	/* mod load unload */
+SX_SYSINIT(cxgbe_mlu, &mlu, "cxgbe mod load/unload");
+
 static int
 mod_event(module_t mod, int cmd, void *arg)
 {
@@ -8268,41 +8303,67 @@ mod_event(module_t mod, int cmd, void *arg)
 
 	switch (cmd) {
 	case MOD_LOAD:
-		if (atomic_fetchadd_int(&loaded, 1))
-			break;
-		t4_sge_modload();
-		sx_init(&t4_list_lock, "T4/T5 adapters");
-		SLIST_INIT(&t4_list);
+		sx_xlock(&mlu);
+		if (loaded++ == 0) {
+			t4_sge_modload();
+			sx_init(&t4_list_lock, "T4/T5 adapters");
+			SLIST_INIT(&t4_list);
 #ifdef TCP_OFFLOAD
-		sx_init(&t4_uld_list_lock, "T4/T5 ULDs");
-		SLIST_INIT(&t4_uld_list);
+			sx_init(&t4_uld_list_lock, "T4/T5 ULDs");
+			SLIST_INIT(&t4_uld_list);
 #endif
-		t4_tracer_modload();
-		tweak_tunables();
+			t4_tracer_modload();
+			tweak_tunables();
+		}
+		sx_xunlock(&mlu);
 		break;
 
 	case MOD_UNLOAD:
-		if (atomic_fetchadd_int(&loaded, -1) > 1)
-			break;
-		t4_tracer_modunload();
+		sx_xlock(&mlu);
+		if (--loaded == 0) {
+			int tries;
+
+			sx_slock(&t4_list_lock);
+			if (!SLIST_EMPTY(&t4_list)) {
+				rc = EBUSY;
+				sx_sunlock(&t4_list_lock);
+				goto done_unload;
+			}
 #ifdef TCP_OFFLOAD
-		sx_slock(&t4_uld_list_lock);
-		if (!SLIST_EMPTY(&t4_uld_list)) {
-			rc = EBUSY;
-			sx_sunlock(&t4_uld_list_lock);
-			break;
-		}
-		sx_sunlock(&t4_uld_list_lock);
-		sx_destroy(&t4_uld_list_lock);
+			sx_slock(&t4_uld_list_lock);
+			if (!SLIST_EMPTY(&t4_uld_list)) {
+				rc = EBUSY;
+				sx_sunlock(&t4_uld_list_lock);
+				sx_sunlock(&t4_list_lock);
+				goto done_unload;
+			}
+#endif
+			tries = 0;
+			while (tries++ < 5 && t4_sge_extfree_refs() != 0) {
+				uprintf("%ju clusters with custom free routine "
+				    "still is use.\n", t4_sge_extfree_refs());
+				pause("t4unload", 2 * hz);
+			}
+#ifdef TCP_OFFLOAD
+			sx_sunlock(&t4_uld_list_lock);
 #endif
-		sx_slock(&t4_list_lock);
-		if (!SLIST_EMPTY(&t4_list)) {
-			rc = EBUSY;
 			sx_sunlock(&t4_list_lock);
-			break;
+
+			if (t4_sge_extfree_refs() == 0) {
+				t4_tracer_modunload();
+#ifdef TCP_OFFLOAD
+				sx_destroy(&t4_uld_list_lock);
+#endif
+				sx_destroy(&t4_list_lock);
+				t4_sge_modunload();
+				loaded = 0;
+			} else {
+				rc = EBUSY;
+				loaded++;	/* undo earlier decrement */
+			}
 		}
-		sx_sunlock(&t4_list_lock);
-		sx_destroy(&t4_list_lock);
+done_unload:
+		sx_xunlock(&mlu);
 		break;
 	}
 
diff --git a/sys/dev/cxgbe/t4_netmap.c b/sys/dev/cxgbe/t4_netmap.c
index 7a7785c816bb..f7210d450911 100644
--- a/sys/dev/cxgbe/t4_netmap.c
+++ b/sys/dev/cxgbe/t4_netmap.c
@@ -238,8 +238,8 @@ alloc_nm_rxq_hwq(struct port_info *pi, struct sge_nm_rxq *nm_rxq)
 	MPASS(nm_rxq->iq_desc != NULL);
 	MPASS(nm_rxq->fl_desc != NULL);
 
-	bzero(nm_rxq->iq_desc, pi->qsize_rxq * RX_IQ_ESIZE);
-	bzero(nm_rxq->fl_desc, na->num_rx_desc * RX_FL_ESIZE + spg_len);
+	bzero(nm_rxq->iq_desc, pi->qsize_rxq * IQ_ESIZE);
+	bzero(nm_rxq->fl_desc, na->num_rx_desc * EQ_ESIZE + spg_len);
 
 	bzero(&c, sizeof(c));
 	c.op_to_vfn = htobe32(V_FW_CMD_OP(FW_IQ_CMD) | F_FW_CMD_REQUEST |
@@ -264,7 +264,7 @@ alloc_nm_rxq_hwq(struct port_info *pi, struct sge_nm_rxq *nm_rxq)
 	c.iqdroprss_to_iqesize = htobe16(V_FW_IQ_CMD_IQPCIECH(pi->tx_chan) |
 	    F_FW_IQ_CMD_IQGTSMODE |
 	    V_FW_IQ_CMD_IQINTCNTTHRESH(0) |
-	    V_FW_IQ_CMD_IQESIZE(ilog2(RX_IQ_ESIZE) - 4));
+	    V_FW_IQ_CMD_IQESIZE(ilog2(IQ_ESIZE) - 4));
 	c.iqsize = htobe16(pi->qsize_rxq);
 	c.iqaddr = htobe64(nm_rxq->iq_ba);
 	c.iqns_to_fl0congen |=
@@ -274,7 +274,7 @@ alloc_nm_rxq_hwq(struct port_info *pi, struct sge_nm_rxq *nm_rxq)
 	c.fl0dcaen_to_fl0cidxfthresh =
 	    htobe16(V_FW_IQ_CMD_FL0FBMIN(X_FETCHBURSTMIN_64B) |
 		V_FW_IQ_CMD_FL0FBMAX(X_FETCHBURSTMAX_512B));
-	c.fl0size = htobe16(na->num_rx_desc + spg_len / RX_FL_ESIZE);
+	c.fl0size = htobe16(na->num_rx_desc + spg_len / EQ_ESIZE);
 	c.fl0addr = htobe64(nm_rxq->fl_ba);
 
 	rc = -t4_wr_mbox(sc, sc->mbox, &c, sizeof(c), &c);
@@ -285,7 +285,7 @@ alloc_nm_rxq_hwq(struct port_info *pi, struct sge_nm_rxq *nm_rxq)
 	}
 
 	nm_rxq->iq_cidx = 0;
-	MPASS(nm_rxq->iq_sidx == pi->qsize_rxq - spg_len / RX_IQ_ESIZE);
+	MPASS(nm_rxq->iq_sidx == pi->qsize_rxq - spg_len / IQ_ESIZE);
 	nm_rxq->iq_gen = F_RSPD_GEN;
 	nm_rxq->iq_cntxt_id = be16toh(c.iqid);
 	nm_rxq->iq_abs_id = be16toh(c.physiqid);
@@ -351,7 +351,7 @@ alloc_nm_txq_hwq(struct port_info *pi, struct sge_nm_txq *nm_txq)
 	    V_FW_EQ_ETH_CMD_VFN(0));
 	c.alloc_to_len16 = htobe32(F_FW_EQ_ETH_CMD_ALLOC |
 	    F_FW_EQ_ETH_CMD_EQSTART | FW_LEN16(c));
-	c.viid_pkd = htobe32(V_FW_EQ_ETH_CMD_VIID(pi->nm_viid));
+	c.autoequiqe_to_viid = htobe32(V_FW_EQ_ETH_CMD_VIID(pi->nm_viid));
 	c.fetchszm_to_iqid =
 	    htobe32(V_FW_EQ_ETH_CMD_HOSTFCMODE(X_HOSTFCMODE_NONE) |
 		V_FW_EQ_ETH_CMD_PCIECHN(pi->tx_chan) | F_FW_EQ_ETH_CMD_FETCHRO |
@@ -390,7 +390,7 @@ alloc_nm_txq_hwq(struct port_info *pi, struct sge_nm_txq *nm_txq)
 		udb = sc->udbs_base + UDBS_DB_OFFSET;
 		udb += (nm_txq->cntxt_id >> s_qpp) << PAGE_SHIFT;
 		nm_txq->udb_qid = nm_txq->cntxt_id & mask;
-		if (nm_txq->udb_qid > PAGE_SIZE / UDBS_SEG_SIZE)
+		if (nm_txq->udb_qid >= PAGE_SIZE / UDBS_SEG_SIZE)
 	    		clrbit(&nm_txq->doorbells, DOORBELL_WCWR);
 		else {
 			udb += nm_txq->udb_qid << UDBS_SEG_SHIFT;
@@ -581,18 +581,7 @@ npkt_to_len16(const int n)
 	return (n * 2 + 1);
 }
 
-static inline uint16_t
-idxdiff(uint16_t head, uint16_t tail, uint16_t wrap)
-{
-	MPASS(wrap > head);
-	MPASS(wrap > tail);
-
-	if (head >= tail)
-		return (head - tail);
-	else
-		return (wrap - tail + head);
-}
-#define IDXDIFF(q, idx) idxdiff((q)->pidx, (q)->idx, (q)->sidx)
+#define NMIDXDIFF(q, idx) IDXDIFF((q)->pidx, (q)->idx, (q)->sidx)
 
 static void
 ring_nm_txq_db(struct adapter *sc, struct sge_nm_txq *nm_txq)
@@ -602,7 +591,7 @@ ring_nm_txq_db(struct adapter *sc, struct sge_nm_txq *nm_txq)
 
 	MPASS(nm_txq->pidx != nm_txq->dbidx);
 
-	n = IDXDIFF(nm_txq, dbidx);
+	n = NMIDXDIFF(nm_txq, dbidx);
 	if (n > 1)
 		clrbit(&db, DOORBELL_WCWR);
 	wmb();
@@ -733,16 +722,16 @@ cxgbe_nm_tx(struct adapter *sc, struct sge_nm_txq *nm_txq,
 			return;
 		}
 
-		if (IDXDIFF(nm_txq, equiqidx) >= nm_txq->sidx / 2) {
+		if (NMIDXDIFF(nm_txq, equiqidx) >= nm_txq->sidx / 2) {
 			wr->equiq_to_len16 |= htobe32(F_FW_WR_EQUEQ |
 			    F_FW_WR_EQUIQ);
 			nm_txq->equeqidx = nm_txq->pidx;
 			nm_txq->equiqidx = nm_txq->pidx;
-		} else if (IDXDIFF(nm_txq, equeqidx) >= 64) {
+		} else if (NMIDXDIFF(nm_txq, equeqidx) >= 64) {
 			wr->equiq_to_len16 |= htobe32(F_FW_WR_EQUEQ);
 			nm_txq->equeqidx = nm_txq->pidx;
 		}
-		if (IDXDIFF(nm_txq, dbidx) >= 2 * SGE_MAX_WR_NDESC)
+		if (NMIDXDIFF(nm_txq, dbidx) >= 2 * SGE_MAX_WR_NDESC)
 			ring_nm_txq_db(sc, nm_txq);
 	}
 
@@ -782,8 +771,15 @@ reclaim_nm_tx_desc(struct sge_nm_txq *nm_txq)
 
 		n += wr->npkt;
 		nm_txq->cidx += npkt_to_ndesc(wr->npkt);
-		if (__predict_false(nm_txq->cidx >= nm_txq->sidx))
-			nm_txq->cidx -= nm_txq->sidx;
+
+		/*
+		 * We never sent a WR that wrapped around so the credits coming
+		 * back, WR by WR, should never cause the cidx to wrap around
+		 * either.
+		 */
+		MPASS(nm_txq->cidx <= nm_txq->sidx);
+		if (__predict_false(nm_txq->cidx == nm_txq->sidx))
+			nm_txq->cidx = 0;
 	}
 
 	return (n);
@@ -890,13 +886,8 @@ cxgbe_netmap_rxsync(struct netmap_adapter *na, u_int ring_nr, int flags)
 		MPASS((fl_pidx & 7) == 0);
 		MPASS((n & 7) == 0);
 
-		kring->nr_hwcur += n;
-		if (kring->nr_hwcur >= kring->nkr_num_slots)
-			kring->nr_hwcur -= kring->nkr_num_slots;
-
-		nm_rxq->fl_pidx += n;
-		if (nm_rxq->fl_pidx >= nm_rxq->fl_sidx)
-			nm_rxq->fl_pidx -= nm_rxq->fl_sidx;
+		IDXINCR(kring->nr_hwcur, n, kring->nkr_num_slots);
+		IDXINCR(nm_rxq->fl_pidx, n, nm_rxq->fl_sidx);
 
 		while (n > 0) {
 			for (i = 0; i < 8; i++, fl_pidx++, slot++) {
@@ -1073,7 +1064,7 @@ t4_nm_intr(void *arg)
 	struct netmap_adapter *na = NA(ifp);
 	struct netmap_kring *kring = &na->rx_rings[nm_rxq->nid];
 	struct netmap_ring *ring = kring->ring;
-	struct nm_iq_desc *d = &nm_rxq->iq_desc[nm_rxq->iq_cidx];
+	struct iq_desc *d = &nm_rxq->iq_desc[nm_rxq->iq_cidx];
 	uint32_t lq;
 	u_int n = 0;
 	int processed = 0;
@@ -1100,7 +1091,8 @@ t4_nm_intr(void *arg)
 			switch (opcode) {
 			case CPL_FW4_MSG:
 			case CPL_FW6_MSG:
-				handle_nm_fw6_msg(sc, ifp, &d->u.fw6_msg);
+				handle_nm_fw6_msg(sc, ifp,
+				    (const void *)&d->cpl[0]);
 				break;
 			case CPL_RX_PKT:
 				ring->slot[fl_cidx].len = G_RSPD_LEN(lq) - fl_pktshift;
diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c
index eb30463c5399..499f25205998 100644
--- a/sys/dev/cxgbe/t4_sge.c
+++ b/sys/dev/cxgbe/t4_sge.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/time.h>
 #include <sys/sysctl.h>
 #include <sys/smp.h>
+#include <sys/counter.h>
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
@@ -171,11 +172,9 @@ struct sgl {
 };
 
 static int service_iq(struct sge_iq *, int);
-static struct mbuf *get_fl_payload(struct adapter *, struct sge_fl *, uint32_t,
-    int *);
+static struct mbuf *get_fl_payload(struct adapter *, struct sge_fl *, uint32_t);
 static int t4_eth_rx(struct sge_iq *, const struct rss_header *, struct mbuf *);
-static inline void init_iq(struct sge_iq *, struct adapter *, int, int, int,
-    int);
+static inline void init_iq(struct sge_iq *, struct adapter *, int, int, int);
 static inline void init_fl(struct adapter *, struct sge_fl *, int, int, int,
     char *);
 static inline void init_eq(struct sge_eq *, int, int, uint8_t, uint16_t,
@@ -223,8 +222,6 @@ static int alloc_txq(struct port_info *, struct sge_txq *, int,
     struct sysctl_oid *);
 static int free_txq(struct port_info *, struct sge_txq *);
 static void oneseg_dma_callback(void *, bus_dma_segment_t *, int, int);
-static inline bool is_new_response(const struct sge_iq *, struct rsp_ctrl **);
-static inline void iq_next(struct sge_iq *);
 static inline void ring_fl_db(struct adapter *, struct sge_fl *);
 static int refill_fl(struct adapter *, struct sge_fl *, int);
 static void refill_sfl(void *);
@@ -258,6 +255,9 @@ static int handle_fw_msg(struct sge_iq *, const struct rss_header *,
 static int sysctl_uint16(SYSCTL_HANDLER_ARGS);
 static int sysctl_bufsizes(SYSCTL_HANDLER_ARGS);
 
+static counter_u64_t extfree_refs;
+static counter_u64_t extfree_rels;
+
 /*
  * Called on MOD_LOAD.  Validates and calculates the SGE tunables.
  */
@@ -329,6 +329,30 @@ t4_sge_modload(void)
 		    " using 0 instead.\n", cong_drop);
 		cong_drop = 0;
 	}
+
+	extfree_refs = counter_u64_alloc(M_WAITOK);
+	extfree_rels = counter_u64_alloc(M_WAITOK);
+	counter_u64_zero(extfree_refs);
+	counter_u64_zero(extfree_rels);
+}
+
+void
+t4_sge_modunload(void)
+{
+
+	counter_u64_free(extfree_refs);
+	counter_u64_free(extfree_rels);
+}
+
+uint64_t
+t4_sge_extfree_refs(void)
+{
+	uint64_t refs, rels;
+
+	rels = counter_u64_fetch(extfree_rels);
+	refs = counter_u64_fetch(extfree_refs);
+
+	return (refs - rels);
 }
 
 void
@@ -977,8 +1001,7 @@ t4_setup_port_queues(struct port_info *pi)
 	}
 	for_each_rxq(pi, i, rxq) {
 
-		init_iq(&rxq->iq, sc, pi->tmr_idx, pi->pktc_idx, pi->qsize_rxq,
-		    RX_IQ_ESIZE);
+		init_iq(&rxq->iq, sc, pi->tmr_idx, pi->pktc_idx, pi->qsize_rxq);
 
 		snprintf(name, sizeof(name), "%s rxq%d-fl",
 		    device_get_nameunit(pi->dev), i);
@@ -1002,7 +1025,7 @@ t4_setup_port_queues(struct port_info *pi)
 	for_each_ofld_rxq(pi, i, ofld_rxq) {
 
 		init_iq(&ofld_rxq->iq, sc, pi->tmr_idx, pi->pktc_idx,
-		    pi->qsize_rxq, RX_IQ_ESIZE);
+		    pi->qsize_rxq);
 
 		snprintf(name, sizeof(name), "%s ofld_rxq%d-fl",
 		    device_get_nameunit(pi->dev), i);
@@ -1289,36 +1312,44 @@ service_iq(struct sge_iq *iq, int budget)
 {
 	struct sge_iq *q;
 	struct sge_rxq *rxq = iq_to_rxq(iq);	/* Use iff iq is part of rxq */
-	struct sge_fl *fl = &rxq->fl;		/* Use iff IQ_HAS_FL */
+	struct sge_fl *fl;			/* Use iff IQ_HAS_FL */
 	struct adapter *sc = iq->adapter;
-	struct rsp_ctrl *ctrl;
-	const struct rss_header *rss;
-	int ndescs = 0, limit, fl_bufs_used = 0;
-	int rsp_type;
+	struct iq_desc *d = &iq->desc[iq->cidx];
+	int ndescs = 0, limit;
+	int rsp_type, refill;
 	uint32_t lq;
+	uint16_t fl_hw_cidx;
 	struct mbuf *m0;
 	STAILQ_HEAD(, sge_iq) iql = STAILQ_HEAD_INITIALIZER(iql);
 #if defined(INET) || defined(INET6)
 	const struct timeval lro_timeout = {0, sc->lro_timeout};
 #endif
 
-	limit = budget ? budget : iq->qsize / 8;
-
 	KASSERT(iq->state == IQS_BUSY, ("%s: iq %p not BUSY", __func__, iq));
 
+	limit = budget ? budget : iq->qsize / 16;
+
+	if (iq->flags & IQ_HAS_FL) {
+		fl = &rxq->fl;
+		fl_hw_cidx = fl->hw_cidx;	/* stable snapshot */
+	} else {
+		fl = NULL;
+		fl_hw_cidx = 0;			/* to silence gcc warning */
+	}
+
 	/*
 	 * We always come back and check the descriptor ring for new indirect
 	 * interrupts and other responses after running a single handler.
 	 */
 	for (;;) {
-		while (is_new_response(iq, &ctrl)) {
+		while ((d->rsp.u.type_gen & F_RSPD_GEN) == iq->gen) {
 
 			rmb();
 
+			refill = 0;
 			m0 = NULL;
-			rsp_type = G_RSPD_TYPE(ctrl->u.type_gen);
-			lq = be32toh(ctrl->pldbuflen_qid);
-			rss = (const void *)iq->cdesc;
+			rsp_type = G_RSPD_TYPE(d->rsp.u.type_gen);
+			lq = be32toh(d->rsp.pldbuflen_qid);
 
 			switch (rsp_type) {
 			case X_RSPD_TYPE_FLBUF:
@@ -1327,9 +1358,10 @@ service_iq(struct sge_iq *iq, int budget)
 				    ("%s: data for an iq (%p) with no freelist",
 				    __func__, iq));
 
-				m0 = get_fl_payload(sc, fl, lq, &fl_bufs_used);
+				m0 = get_fl_payload(sc, fl, lq);
 				if (__predict_false(m0 == NULL))
 					goto process_iql;
+				refill = IDXDIFF(fl->hw_cidx, fl_hw_cidx, fl->sidx) > 2;
 #ifdef T4_PKT_TIMESTAMP
 				/*
 				 * 60 bit timestamp for the payload is
@@ -1348,10 +1380,10 @@ service_iq(struct sge_iq *iq, int budget)
 				/* fall through */
 
 			case X_RSPD_TYPE_CPL:
-				KASSERT(rss->opcode < NUM_CPL_CMDS,
+				KASSERT(d->rss.opcode < NUM_CPL_CMDS,
 				    ("%s: bad opcode %02x.", __func__,
-				    rss->opcode));
-				sc->cpl_handler[rss->opcode](iq, rss, m0);
+				    d->rss.opcode));
+				sc->cpl_handler[d->rss.opcode](iq, &d->rss, m0);
 				break;
 
 			case X_RSPD_TYPE_INTR:
@@ -1373,14 +1405,14 @@ service_iq(struct sge_iq *iq, int budget)
 				 * iWARP async notification.
 				 */
 				if (lq >= 1024) {
-                                        sc->an_handler(iq, ctrl);
+                                        sc->an_handler(iq, &d->rsp);
                                         break;
                                 }
 
 				q = sc->sge.iqmap[lq - sc->sge.iq_start];
 				if (atomic_cmpset_int(&q->state, IQS_IDLE,
 				    IQS_BUSY)) {
-					if (service_iq(q, q->qsize / 8) == 0) {
+					if (service_iq(q, q->qsize / 16) == 0) {
 						atomic_cmpset_int(&q->state,
 						    IQS_BUSY, IQS_IDLE);
 					} else {
@@ -1400,16 +1432,13 @@ service_iq(struct sge_iq *iq, int budget)
 				break;
 			}
 
-			if (fl_bufs_used >= 16) {
-				FL_LOCK(fl);
-				fl->needed += fl_bufs_used;
-				refill_fl(sc, fl, 32);
-				FL_UNLOCK(fl);
-				fl_bufs_used = 0;
+			d++;
+			if (__predict_false(++iq->cidx == iq->sidx)) {
+				iq->cidx = 0;
+				iq->gen ^= F_RSPD_GEN;
+				d = &iq->desc[0];
 			}
-
-			iq_next(iq);
-			if (++ndescs == limit) {
+			if (__predict_false(++ndescs == limit)) {
 				t4_write_reg(sc, MYPF_REG(A_SGE_PF_GTS),
 				    V_CIDXINC(ndescs) |
 				    V_INGRESSQID(iq->cntxt_id) |
@@ -1425,15 +1454,20 @@ service_iq(struct sge_iq *iq, int budget)
 #endif
 
 				if (budget) {
-					if (fl_bufs_used) {
+					if (iq->flags & IQ_HAS_FL) {
 						FL_LOCK(fl);
-						fl->needed += fl_bufs_used;
 						refill_fl(sc, fl, 32);
 						FL_UNLOCK(fl);
 					}
 					return (EINPROGRESS);
 				}
 			}
+			if (refill) {
+				FL_LOCK(fl);
+				refill_fl(sc, fl, 32);
+				FL_UNLOCK(fl);
+				fl_hw_cidx = fl->hw_cidx;
+			}
 		}
 
 process_iql:
@@ -1472,7 +1506,6 @@ service_iq(struct sge_iq *iq, int budget)
 		int starved;
 
 		FL_LOCK(fl);
-		fl->needed += fl_bufs_used;
 		starved = refill_fl(sc, fl, 64);
 		FL_UNLOCK(fl);
 		if (__predict_false(starved != 0))
@@ -1506,15 +1539,14 @@ cl_metadata(struct adapter *sc, struct sge_fl *fl, struct cluster_layout *cll,
 	return (NULL);
 }
 
-static int
+static void
 rxb_free(struct mbuf *m, void *arg1, void *arg2)
 {
 	uma_zone_t zone = arg1;
 	caddr_t cl = arg2;
 
 	uma_zfree(zone, cl);
-
-	return (EXT_FREE_OK);
+	counter_u64_add(extfree_rels, 1);
 }
 
 /*
@@ -1540,7 +1572,7 @@ get_scatter_segment(struct adapter *sc, struct sge_fl *fl, int total, int flags)
 	caddr_t payload;
 
 	len = min(total, hwb->size - fl->rx_offset);
-	padded_len = roundup2(len, fl_pad);
+	padded_len = roundup2(len, fl->buf_boundary);
 	payload = sd->cl + cll->region1 + fl->rx_offset;
 
 	if (sc->sc_do_rxcopy && len < RX_COPY_THRESHOLD) {
@@ -1565,7 +1597,7 @@ get_scatter_segment(struct adapter *sc, struct sge_fl *fl, int total, int flags)
 
 		/*
 		 * There's spare room in the cluster for an mbuf.  Create one
-		 * and associate it with the payload that's in the cluster too.
+		 * and associate it with the payload that's in the cluster.
 		 */
 
 		MPASS(clm != NULL);
@@ -1576,7 +1608,8 @@ get_scatter_segment(struct adapter *sc, struct sge_fl *fl, int total, int flags)
 		fl->mbuf_inlined++;
 		m_extaddref(m, payload, padded_len, &clm->refcount, rxb_free,
 		    swz->zone, sd->cl);
-		sd->nmbuf++;
+		if (sd->nmbuf++ == 0)
+			counter_u64_add(extfree_refs, 1);
 
 	} else {
 
@@ -1590,10 +1623,12 @@ get_scatter_segment(struct adapter *sc, struct sge_fl *fl, int total, int flags)
 		if (m == NULL)
 			return (NULL);
 		fl->mbuf_allocated++;
-		if (clm != NULL)
+		if (clm != NULL) {
 			m_extaddref(m, payload, padded_len, &clm->refcount,
 			    rxb_free, swz->zone, sd->cl);
-		else {
+			if (sd->nmbuf++ == 0)
+				counter_u64_add(extfree_refs, 1);
+		} else {
 			m_cljset(m, sd->cl, swz->type);
 			sd->cl = NULL;	/* consumed, not a recycle candidate */
 		}
@@ -1603,38 +1638,32 @@ get_scatter_segment(struct adapter *sc, struct sge_fl *fl, int total, int flags)
 	m->m_len = len;
 
 	if (fl->flags & FL_BUF_PACKING) {
-		fl->rx_offset += roundup2(padded_len, sc->sge.pack_boundary);
+		fl->rx_offset += padded_len;
 		MPASS(fl->rx_offset <= hwb->size);
 		if (fl->rx_offset < hwb->size)
 			return (m);	/* without advancing the cidx */
 	}
 
-	if (__predict_false(++fl->cidx == fl->cap))
-		fl->cidx = 0;
+	if (__predict_false(++fl->cidx % 8 == 0)) {
+		uint16_t cidx = fl->cidx / 8;
+
+		if (__predict_false(cidx == fl->sidx))
+			fl->cidx = cidx = 0;
+		fl->hw_cidx = cidx;
+	}
 	fl->rx_offset = 0;
 
 	return (m);
 }
 
 static struct mbuf *
-get_fl_payload(struct adapter *sc, struct sge_fl *fl, uint32_t len_newbuf,
-    int *fl_bufs_used)
+get_fl_payload(struct adapter *sc, struct sge_fl *fl, uint32_t len_newbuf)
 {
 	struct mbuf *m0, *m, **pnext;
-	u_int nbuf, len;
+	u_int len;
 
-	/*
-	 * No assertion for the fl lock because we don't need it.  This routine
-	 * is called only from the rx interrupt handler and it only updates
-	 * fl->cidx.  (Contrast that with fl->pidx/fl->needed which could be
-	 * updated in the rx interrupt handler or the starvation helper routine.
-	 * That's why code that manipulates fl->pidx/fl->needed needs the fl
-	 * lock but this routine does not).
-	 */
-
-	nbuf = 0;
 	len = G_RSPD_LEN(len_newbuf);
-	if (__predict_false(fl->m0 != NULL)) {
+	if (__predict_false(fl->flags & FL_BUF_RESUME)) {
 		M_ASSERTPKTHDR(fl->m0);
 		MPASS(len == fl->m0->m_pkthdr.len);
 		MPASS(fl->remaining < len);
@@ -1642,15 +1671,19 @@ get_fl_payload(struct adapter *sc, struct sge_fl *fl, uint32_t len_newbuf,
 		m0 = fl->m0;
 		pnext = fl->pnext;
 		len = fl->remaining;
-		fl->m0 = NULL;
+		fl->flags &= ~FL_BUF_RESUME;
 		goto get_segment;
 	}
 
 	if (fl->rx_offset > 0 && len_newbuf & F_RSPD_NEWBUF) {
-		nbuf++;
 		fl->rx_offset = 0;
-		if (__predict_false(++fl->cidx == fl->cap))
-			fl->cidx = 0;
+		if (__predict_false(++fl->cidx % 8 == 0)) {
+			uint16_t cidx = fl->cidx / 8;
+
+			if (__predict_false(cidx == fl->sidx))
+				fl->cidx = cidx = 0;
+			fl->hw_cidx = cidx;
+		}
 	}
 
 	/*
@@ -1660,30 +1693,26 @@ get_fl_payload(struct adapter *sc, struct sge_fl *fl, uint32_t len_newbuf,
 
 	m0 = get_scatter_segment(sc, fl, len, M_PKTHDR);
 	if (m0 == NULL)
-		goto done;
+		return (NULL);
 	len -= m0->m_len;
 	pnext = &m0->m_next;
 	while (len > 0) {
-		nbuf++;
 get_segment:
 		MPASS(fl->rx_offset == 0);
 		m = get_scatter_segment(sc, fl, len, 0);
-		if (m == NULL) {
+		if (__predict_false(m == NULL)) {
 			fl->m0 = m0;
 			fl->pnext = pnext;
 			fl->remaining = len;
-			m0 = NULL;
-			goto done;
+			fl->flags |= FL_BUF_RESUME;
+			return (NULL);
 		}
 		*pnext = m;
 		pnext = &m->m_next;
 		len -= m->m_len;
 	}
 	*pnext = NULL;
-	if (fl->rx_offset == 0)
-		nbuf++;
-done:
-	(*fl_bufs_used) += nbuf;
+
 	return (m0);
 }
 
@@ -1770,7 +1799,7 @@ t4_wrq_tx_locked(struct adapter *sc, struct sge_wrq *wrq, struct wrqe *wr)
 
 	can_reclaim = reclaimable(eq);
 	if (__predict_false(eq->flags & EQ_STALLED)) {
-		if (can_reclaim < tx_resume_threshold(eq))
+		if (eq->avail + can_reclaim < tx_resume_threshold(eq))
 			return;
 		eq->flags &= ~EQ_STALLED;
 		eq->unstalled++;
@@ -1891,7 +1920,7 @@ t4_eth_tx(struct ifnet *ifp, struct sge_txq *txq, struct mbuf *m)
 
 	can_reclaim = reclaimable(eq);
 	if (__predict_false(eq->flags & EQ_STALLED)) {
-		if (can_reclaim < tx_resume_threshold(eq)) {
+		if (eq->avail + can_reclaim < tx_resume_threshold(eq)) {
 			txq->m = m;
 			return (0);
 		}
@@ -2065,13 +2094,15 @@ t4_update_fl_bufsize(struct ifnet *ifp)
 int
 can_resume_tx(struct sge_eq *eq)
 {
-	return (reclaimable(eq) >= tx_resume_threshold(eq));
+
+	return (eq->avail + reclaimable(eq) >= tx_resume_threshold(eq));
 }
 
 static inline void
 init_iq(struct sge_iq *iq, struct adapter *sc, int tmr_idx, int pktc_idx,
-    int qsize, int esize)
+    int qsize)
 {
+
 	KASSERT(tmr_idx >= 0 && tmr_idx < SGE_NTIMERS,
 	    ("%s: bad tmr_idx %d", __func__, tmr_idx));
 	KASSERT(pktc_idx < SGE_NCOUNTERS,	/* -ve is ok, means don't use */
@@ -2086,7 +2117,7 @@ init_iq(struct sge_iq *iq, struct adapter *sc, int tmr_idx, int pktc_idx,
 		iq->intr_pktc_idx = pktc_idx;
 	}
 	iq->qsize = roundup2(qsize, 16);	/* See FW_IQ_CMD/iqsize */
-	iq->esize = max(esize, 16);		/* See FW_IQ_CMD/iqesize */
+	iq->sidx = iq->qsize - spg_len / IQ_ESIZE;
 }
 
 static inline void
@@ -2095,6 +2126,7 @@ init_fl(struct adapter *sc, struct sge_fl *fl, int qsize, int maxp, int pack,
 {
 
 	fl->qsize = qsize;
+	fl->sidx = qsize - spg_len / EQ_ESIZE;
 	strlcpy(fl->lockname, name, sizeof(fl->lockname));
 	if (pack)
 		fl->flags |= FL_BUF_PACKING;
@@ -2187,7 +2219,7 @@ alloc_iq_fl(struct port_info *pi, struct sge_iq *iq, struct sge_fl *fl,
 	struct adapter *sc = iq->adapter;
 	__be32 v = 0;
 
-	len = iq->qsize * iq->esize;
+	len = iq->qsize * IQ_ESIZE;
 	rc = alloc_ring(sc, len, &iq->desc_tag, &iq->desc_map, &iq->ba,
 	    (void **)&iq->desc);
 	if (rc != 0)
@@ -2219,7 +2251,7 @@ alloc_iq_fl(struct port_info *pi, struct sge_iq *iq, struct sge_fl *fl,
 	c.iqdroprss_to_iqesize = htobe16(V_FW_IQ_CMD_IQPCIECH(pi->tx_chan) |
 	    F_FW_IQ_CMD_IQGTSMODE |
 	    V_FW_IQ_CMD_IQINTCNTTHRESH(iq->intr_pktc_idx) |
-	    V_FW_IQ_CMD_IQESIZE(ilog2(iq->esize) - 4));
+	    V_FW_IQ_CMD_IQESIZE(ilog2(IQ_ESIZE) - 4));
 	c.iqsize = htobe16(iq->qsize);
 	c.iqaddr = htobe64(iq->ba);
 	if (cong >= 0)
@@ -2228,14 +2260,13 @@ alloc_iq_fl(struct port_info *pi, struct sge_iq *iq, struct sge_fl *fl,
 	if (fl) {
 		mtx_init(&fl->fl_lock, fl->lockname, NULL, MTX_DEF);
 
-		len = fl->qsize * RX_FL_ESIZE;
+		len = fl->qsize * EQ_ESIZE;
 		rc = alloc_ring(sc, len, &fl->desc_tag, &fl->desc_map,
 		    &fl->ba, (void **)&fl->desc);
 		if (rc)
 			return (rc);
 
 		/* Allocate space for one software descriptor per buffer. */
-		fl->cap = (fl->qsize - spg_len / RX_FL_ESIZE) * 8;
 		rc = alloc_fl_sdesc(fl);
 		if (rc != 0) {
 			device_printf(sc->dev,
@@ -2243,10 +2274,14 @@ alloc_iq_fl(struct port_info *pi, struct sge_iq *iq, struct sge_fl *fl,
 			    rc);
 			return (rc);
 		}
-		fl->needed = fl->cap;
-		fl->lowat = fl->flags & FL_BUF_PACKING ?
-		    roundup2(sc->sge.fl_starve_threshold2, 8) :
-		    roundup2(sc->sge.fl_starve_threshold, 8);
+
+		if (fl->flags & FL_BUF_PACKING) {
+			fl->lowat = roundup2(sc->sge.fl_starve_threshold2, 8);
+			fl->buf_boundary = max(fl_pad, sc->sge.pack_boundary);
+		} else {
+			fl->lowat = roundup2(sc->sge.fl_starve_threshold, 8);
+			fl->buf_boundary = fl_pad;
+		}
 
 		c.iqns_to_fl0congen |=
 		    htobe32(V_FW_IQ_CMD_FL0HOSTFCMODE(X_HOSTFCMODE_NONE) |
@@ -2274,9 +2309,8 @@ alloc_iq_fl(struct port_info *pi, struct sge_iq *iq, struct sge_fl *fl,
 		return (rc);
 	}
 
-	iq->cdesc = iq->desc;
 	iq->cidx = 0;
-	iq->gen = 1;
+	iq->gen = F_RSPD_GEN;
 	iq->intr_next = iq->intr_params;
 	iq->cntxt_id = be16toh(c.iqid);
 	iq->abs_id = be16toh(c.physiqid);
@@ -2290,6 +2324,9 @@ alloc_iq_fl(struct port_info *pi, struct sge_iq *iq, struct sge_fl *fl,
 	sc->sge.iqmap[cntxt_id] = iq;
 
 	if (fl) {
+		u_int qid;
+
+		iq->flags |= IQ_HAS_FL;
 		fl->cntxt_id = be16toh(c.fl0id);
 		fl->pidx = fl->cidx = 0;
 
@@ -2300,12 +2337,29 @@ alloc_iq_fl(struct port_info *pi, struct sge_iq *iq, struct sge_fl *fl,
 		}
 		sc->sge.eqmap[cntxt_id] = (void *)fl;
 
+		qid = fl->cntxt_id;
+		if (isset(&sc->doorbells, DOORBELL_UDB)) {
+			uint32_t s_qpp = sc->sge.eq_s_qpp;
+			uint32_t mask = (1 << s_qpp) - 1;
+			volatile uint8_t *udb;
+
+			udb = sc->udbs_base + UDBS_DB_OFFSET;
+			udb += (qid >> s_qpp) << PAGE_SHIFT;
+			qid &= mask;
+			if (qid < PAGE_SIZE / UDBS_SEG_SIZE) {
+				udb += qid << UDBS_SEG_SHIFT;
+				qid = 0;
+			}
+			fl->udb = (volatile void *)udb;
+		}
+		fl->dbval = F_DBPRIO | V_QID(qid);
+		if (is_t5(sc))
+			fl->dbval |= F_DBTYPE;
+
 		FL_LOCK(fl);
 		/* Enough to make sure the SGE doesn't think it's starved */
 		refill_fl(sc, fl, fl->lowat);
 		FL_UNLOCK(fl);
-
-		iq->flags |= IQ_HAS_FL;
 	}
 
 	if (is_t5(sc) && cong >= 0) {
@@ -2426,7 +2480,7 @@ alloc_fwq(struct adapter *sc)
 	struct sysctl_oid *oid = device_get_sysctl_tree(sc->dev);
 	struct sysctl_oid_list *children = SYSCTL_CHILDREN(oid);
 
-	init_iq(fwq, sc, 0, 0, FW_IQ_QSIZE, FW_IQ_ESIZE);
+	init_iq(fwq, sc, 0, 0, FW_IQ_QSIZE);
 	fwq->flags |= IQ_INTR;	/* always */
 	intr_idx = sc->intr_count > 1 ? 1 : 0;
 	rc = alloc_iq_fl(sc->port[0], fwq, NULL, intr_idx, -1);
@@ -2515,8 +2569,12 @@ alloc_rxq(struct port_info *pi, struct sge_rxq *rxq, int intr_idx, int idx,
 	if (rc != 0)
 		return (rc);
 
+	/*
+	 * The freelist is just barely above the starvation threshold right now,
+	 * fill it up a bit more.
+	 */
 	FL_LOCK(&rxq->fl);
-	refill_fl(pi->adapter, &rxq->fl, rxq->fl.needed / 8);
+	refill_fl(pi->adapter, &rxq->fl, 128);
 	FL_UNLOCK(&rxq->fl);
 
 #if defined(INET) || defined(INET6)
@@ -2646,13 +2704,13 @@ alloc_nm_rxq(struct port_info *pi, struct sge_nm_rxq *nm_rxq, int intr_idx,
 
 	MPASS(na != NULL);
 
-	len = pi->qsize_rxq * RX_IQ_ESIZE;
+	len = pi->qsize_rxq * IQ_ESIZE;
 	rc = alloc_ring(sc, len, &nm_rxq->iq_desc_tag, &nm_rxq->iq_desc_map,
 	    &nm_rxq->iq_ba, (void **)&nm_rxq->iq_desc);
 	if (rc != 0)
 		return (rc);
 
-	len = na->num_rx_desc * RX_FL_ESIZE + spg_len;
+	len = na->num_rx_desc * EQ_ESIZE + spg_len;
 	rc = alloc_ring(sc, len, &nm_rxq->fl_desc_tag, &nm_rxq->fl_desc_map,
 	    &nm_rxq->fl_ba, (void **)&nm_rxq->fl_desc);
 	if (rc != 0)
@@ -2661,7 +2719,7 @@ alloc_nm_rxq(struct port_info *pi, struct sge_nm_rxq *nm_rxq, int intr_idx,
 	nm_rxq->pi = pi;
 	nm_rxq->nid = idx;
 	nm_rxq->iq_cidx = 0;
-	nm_rxq->iq_sidx = pi->qsize_rxq - spg_len / RX_IQ_ESIZE;
+	nm_rxq->iq_sidx = pi->qsize_rxq - spg_len / IQ_ESIZE;
 	nm_rxq->iq_gen = F_RSPD_GEN;
 	nm_rxq->fl_pidx = nm_rxq->fl_cidx = 0;
 	nm_rxq->fl_sidx = na->num_rx_desc;
@@ -2825,7 +2883,7 @@ eth_eq_alloc(struct adapter *sc, struct port_info *pi, struct sge_eq *eq)
 	    V_FW_EQ_ETH_CMD_VFN(0));
 	c.alloc_to_len16 = htobe32(F_FW_EQ_ETH_CMD_ALLOC |
 	    F_FW_EQ_ETH_CMD_EQSTART | FW_LEN16(c));
-	c.viid_pkd = htobe32(V_FW_EQ_ETH_CMD_VIID(pi->viid));
+	c.autoequiqe_to_viid = htobe32(V_FW_EQ_ETH_CMD_VIID(pi->viid));
 	c.fetchszm_to_iqid =
 	    htobe32(V_FW_EQ_ETH_CMD_HOSTFCMODE(X_HOSTFCMODE_STATUS_PAGE) |
 		V_FW_EQ_ETH_CMD_PCIECHN(eq->tx_chan) | F_FW_EQ_ETH_CMD_FETCHRO |
@@ -2939,7 +2997,7 @@ alloc_eq(struct adapter *sc, struct port_info *pi, struct sge_eq *eq)
 	}
 	if (rc != 0) {
 		device_printf(sc->dev,
-		    "failed to allocate egress queue(%d): %d",
+		    "failed to allocate egress queue(%d): %d\n",
 		    eq->flags & EQ_TYPEMASK, rc);
 	}
 
@@ -2955,7 +3013,7 @@ alloc_eq(struct adapter *sc, struct port_info *pi, struct sge_eq *eq)
 		udb = sc->udbs_base + UDBS_DB_OFFSET;
 		udb += (eq->cntxt_id >> s_qpp) << PAGE_SHIFT;	/* pg offset */
 		eq->udb_qid = eq->cntxt_id & mask;		/* id in page */
-		if (eq->udb_qid > PAGE_SIZE / UDBS_SEG_SIZE)
+		if (eq->udb_qid >= PAGE_SIZE / UDBS_SEG_SIZE)
 	    		clrbit(&eq->doorbells, DOORBELL_WCWR);
 		else {
 			udb += eq->udb_qid << UDBS_SEG_SHIFT;	/* seg offset */
@@ -3183,73 +3241,60 @@ oneseg_dma_callback(void *arg, bus_dma_segment_t *segs, int nseg, int error)
 	*ba = error ? 0 : segs->ds_addr;
 }
 
-static inline bool
-is_new_response(const struct sge_iq *iq, struct rsp_ctrl **ctrl)
-{
-	*ctrl = (void *)((uintptr_t)iq->cdesc +
-	    (iq->esize - sizeof(struct rsp_ctrl)));
-
-	return (((*ctrl)->u.type_gen >> S_RSPD_GEN) == iq->gen);
-}
-
-static inline void
-iq_next(struct sge_iq *iq)
-{
-	iq->cdesc = (void *) ((uintptr_t)iq->cdesc + iq->esize);
-	if (__predict_false(++iq->cidx == iq->qsize - spg_len / iq->esize)) {
-		iq->cidx = 0;
-		iq->gen ^= 1;
-		iq->cdesc = iq->desc;
-	}
-}
-
-#define FL_HW_IDX(x) ((x) >> 3)
 static inline void
 ring_fl_db(struct adapter *sc, struct sge_fl *fl)
 {
-	int ndesc = fl->pending / 8;
-	uint32_t v;
+	uint32_t n, v;
 
-	if (FL_HW_IDX(fl->pidx) == FL_HW_IDX(fl->cidx))
-		ndesc--;	/* hold back one credit */
-
-	if (ndesc <= 0)
-		return;		/* nothing to do */
-
-	v = F_DBPRIO | V_QID(fl->cntxt_id) | V_PIDX(ndesc);
-	if (is_t5(sc))
-		v |= F_DBTYPE;
+	n = IDXDIFF(fl->pidx / 8, fl->dbidx, fl->sidx);
+	MPASS(n > 0);
 
 	wmb();
-
-	t4_write_reg(sc, MYPF_REG(A_SGE_PF_KDOORBELL), v);
-	fl->pending -= ndesc * 8;
+	v = fl->dbval | V_PIDX(n);
+	if (fl->udb)
+		*fl->udb = htole32(v);
+	else
+		t4_write_reg(sc, MYPF_REG(A_SGE_PF_KDOORBELL), v);
+	IDXINCR(fl->dbidx, n, fl->sidx);
 }
 
 /*
- * Fill up the freelist by upto nbufs and maybe ring its doorbell.
+ * Fills up the freelist by allocating upto 'n' buffers.  Buffers that are
+ * recycled do not count towards this allocation budget.
  *
- * Returns non-zero to indicate that it should be added to the list of starving
- * freelists.
+ * Returns non-zero to indicate that this freelist should be added to the list
+ * of starving freelists.
  */
 static int
-refill_fl(struct adapter *sc, struct sge_fl *fl, int nbufs)
+refill_fl(struct adapter *sc, struct sge_fl *fl, int n)
 {
-	__be64 *d = &fl->desc[fl->pidx];
-	struct fl_sdesc *sd = &fl->sdesc[fl->pidx];
+	__be64 *d;
+	struct fl_sdesc *sd;
 	uintptr_t pa;
 	caddr_t cl;
-	struct cluster_layout *cll = &fl->cll_def;	/* default layout */
-	struct sw_zone_info *swz = &sc->sge.sw_zone_info[cll->zidx];
+	struct cluster_layout *cll;
+	struct sw_zone_info *swz;
 	struct cluster_metadata *clm;
+	uint16_t max_pidx;
+	uint16_t hw_cidx = fl->hw_cidx;		/* stable snapshot */
 
 	FL_LOCK_ASSERT_OWNED(fl);
 
-	if (nbufs > fl->needed)
-		nbufs = fl->needed;
-	nbufs -= (fl->pidx + nbufs) % 8;
+	/*
+	 * We always stop at the begining of the hardware descriptor that's just
+	 * before the one with the hw cidx.  This is to avoid hw pidx = hw cidx,
+	 * which would mean an empty freelist to the chip.
+	 */
+	max_pidx = __predict_false(hw_cidx == 0) ? fl->sidx - 1 : hw_cidx - 1;
+	if (fl->pidx == max_pidx * 8)
+		return (0);
 
-	while (nbufs--) {
+	d = &fl->desc[fl->pidx];
+	sd = &fl->sdesc[fl->pidx];
+	cll = &fl->cll_def;	/* default layout */
+	swz = &sc->sge.sw_zone_info[cll->zidx];
+
+	while (n > 0) {
 
 		if (sd->cl != NULL) {
 
@@ -3262,6 +3307,11 @@ refill_fl(struct adapter *sc, struct sge_fl *fl, int nbufs)
 				 * fit within a single mbuf each.
 				 */
 				fl->cl_fast_recycled++;
+#ifdef INVARIANTS
+				clm = cl_metadata(sc, fl, &sd->cll, sd->cl);
+				if (clm != NULL)
+					MPASS(clm->refcount == 1);
+#endif
 				goto recycled_fast;
 			}
 
@@ -3275,6 +3325,7 @@ refill_fl(struct adapter *sc, struct sge_fl *fl, int nbufs)
 
 			if (atomic_fetchadd_int(&clm->refcount, -1) == 1) {
 				fl->cl_recycled++;
+				counter_u64_add(extfree_rels, 1);
 				goto recycled;
 			}
 			sd->cl = NULL;	/* gave up my reference */
@@ -3293,6 +3344,7 @@ refill_fl(struct adapter *sc, struct sge_fl *fl, int nbufs)
 			goto alloc;
 		}
 		fl->cl_allocated++;
+		n--;
 
 		pa = pmap_kextract((vm_offset_t)cl);
 		pa += cll->region1;
@@ -3309,18 +3361,26 @@ refill_fl(struct adapter *sc, struct sge_fl *fl, int nbufs)
 		}
 		sd->nmbuf = 0;
 recycled_fast:
-		fl->pending++;
-		fl->needed--;
 		d++;
 		sd++;
-		if (__predict_false(++fl->pidx == fl->cap)) {
-			fl->pidx = 0;
-			sd = fl->sdesc;
-			d = fl->desc;
+		if (__predict_false(++fl->pidx % 8 == 0)) {
+			uint16_t pidx = fl->pidx / 8;
+
+			if (__predict_false(pidx == fl->sidx)) {
+				fl->pidx = 0;
+				pidx = 0;
+				sd = fl->sdesc;
+				d = fl->desc;
+			}
+			if (pidx == max_pidx)
+				break;
+
+			if (IDXDIFF(pidx, fl->dbidx, fl->sidx) >= 4)
+				ring_fl_db(sc, fl);
 		}
 	}
 
-	if (fl->pending >= 8)
+	if (fl->pidx / 8 != fl->dbidx)
 		ring_fl_db(sc, fl);
 
 	return (FL_RUNNING_LOW(fl) && !(fl->flags & FL_STARVING));
@@ -3355,7 +3415,7 @@ static int
 alloc_fl_sdesc(struct sge_fl *fl)
 {
 
-	fl->sdesc = malloc(fl->cap * sizeof(struct fl_sdesc), M_CXGBE,
+	fl->sdesc = malloc(fl->sidx * 8 * sizeof(struct fl_sdesc), M_CXGBE,
 	    M_ZERO | M_WAITOK);
 
 	return (0);
@@ -3370,15 +3430,17 @@ free_fl_sdesc(struct adapter *sc, struct sge_fl *fl)
 	int i;
 
 	sd = fl->sdesc;
-	for (i = 0; i < fl->cap; i++, sd++) {
+	for (i = 0; i < fl->sidx * 8; i++, sd++) {
 		if (sd->cl == NULL)
 			continue;
 
 		cll = &sd->cll;
 		clm = cl_metadata(sc, fl, cll, sd->cl);
-		if (sd->nmbuf == 0 ||
-		    (clm && atomic_fetchadd_int(&clm->refcount, -1) == 1)) {
+		if (sd->nmbuf == 0)
 			uma_zfree(sc->sge.sw_zone_info[cll->zidx].zone, sd->cl);
+		else if (clm && atomic_fetchadd_int(&clm->refcount, -1) == 1) {
+			uma_zfree(sc->sge.sw_zone_info[cll->zidx].zone, sd->cl);
+			counter_u64_add(extfree_rels, 1);
 		}
 		sd->cl = NULL;
 	}
diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c
index e2f5c79f0926..f18e0c7bc27e 100644
--- a/sys/dev/cxgbe/tom/t4_cpl_io.c
+++ b/sys/dev/cxgbe/tom/t4_cpl_io.c
@@ -70,6 +70,33 @@ VNET_DECLARE(int, tcp_autorcvbuf_inc);
 VNET_DECLARE(int, tcp_autorcvbuf_max);
 #define V_tcp_autorcvbuf_max VNET(tcp_autorcvbuf_max)
 
+/*
+ * For ULP connections HW may add headers, e.g., for digests, that aren't part
+ * of the messages sent by the host but that are part of the TCP payload and
+ * therefore consume TCP sequence space.  Tx connection parameters that
+ * operate in TCP sequence space are affected by the HW additions and need to
+ * compensate for them to accurately track TCP sequence numbers. This array
+ * contains the compensating extra lengths for ULP packets.  It is indexed by
+ * a packet's ULP submode.
+ */
+const unsigned int t4_ulp_extra_len[] = {0, 4, 4, 8};
+
+/*
+ * Return the length of any HW additions that will be made to a Tx packet.
+ * Such additions can happen for some types of ULP packets.
+ */
+static inline unsigned int
+ulp_extra_len(struct mbuf *m, int *ulp_mode)
+{
+	struct m_tag    *mtag;
+
+	if ((mtag = m_tag_find(m, CXGBE_ISCSI_MBUF_TAG, NULL)) == NULL)
+		return (0);
+	*ulp_mode = *((int *)(mtag + 1));
+
+	return (t4_ulp_extra_len[*ulp_mode & 3]);
+}
+
 void
 send_flowc_wr(struct toepcb *toep, struct flowc_tx_params *ftxp)
 {
@@ -341,8 +368,13 @@ t4_rcvd(struct toedev *tod, struct tcpcb *tp)
 	KASSERT(toep->sb_cc >= sb->sb_cc,
 	    ("%s: sb %p has more data (%d) than last time (%d).",
 	    __func__, sb, sb->sb_cc, toep->sb_cc));
-	toep->rx_credits += toep->sb_cc - sb->sb_cc;
-	toep->sb_cc = sb->sb_cc;
+	if (toep->ulp_mode == ULP_MODE_ISCSI) {
+		toep->rx_credits += toep->sb_cc;
+		toep->sb_cc = 0;
+	} else {
+		toep->rx_credits += toep->sb_cc - sb->sb_cc;
+		toep->sb_cc = sb->sb_cc;
+	}
 	credits = toep->rx_credits;
 	SOCKBUF_UNLOCK(sb);
 
@@ -444,16 +476,25 @@ max_dsgl_nsegs(int tx_credits)
 
 static inline void
 write_tx_wr(void *dst, struct toepcb *toep, unsigned int immdlen,
-    unsigned int plen, uint8_t credits, int shove)
+    unsigned int plen, uint8_t credits, int shove, int ulp_mode)
 {
 	struct fw_ofld_tx_data_wr *txwr = dst;
+	unsigned int wr_ulp_mode;
 
 	txwr->op_to_immdlen = htobe32(V_WR_OP(FW_OFLD_TX_DATA_WR) |
 	    V_FW_WR_IMMDLEN(immdlen));
 	txwr->flowid_len16 = htobe32(V_FW_WR_FLOWID(toep->tid) |
 	    V_FW_WR_LEN16(credits));
+
+	/* for iscsi, the mode & submode setting is per-packet */
+	if (toep->ulp_mode == ULP_MODE_ISCSI)
+		wr_ulp_mode = V_FW_OFLD_TX_DATA_WR_ULPMODE(ulp_mode >> 4) |
+			V_FW_OFLD_TX_DATA_WR_ULPSUBMODE(ulp_mode & 3);
+	else
+		wr_ulp_mode = V_FW_OFLD_TX_DATA_WR_ULPMODE(toep->ulp_mode);
+
 	txwr->lsodisable_to_proxy =
-	    htobe32(V_FW_OFLD_TX_DATA_WR_ULPMODE(toep->ulp_mode) |
+	    htobe32(wr_ulp_mode |
 		V_FW_OFLD_TX_DATA_WR_URGENT(0) |	/* XXX */
 		V_FW_OFLD_TX_DATA_WR_SHOVE(shove));
 	txwr->plen = htobe32(plen);
@@ -527,7 +568,7 @@ write_tx_sgl(void *dst, struct mbuf *start, struct mbuf *stop, int nsegs, int n)
  * stalls).  When drop is set this function MUST drop the bytes and wake up any
  * writers.
  */
-static void
+void
 t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
 {
 	struct mbuf *sndptr, *m, *sb_sndptr;
@@ -660,7 +701,7 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
 			}
 			txwr = wrtod(wr);
 			credits = howmany(wr->wr_len, 16);
-			write_tx_wr(txwr, toep, plen, plen, credits, shove);
+			write_tx_wr(txwr, toep, plen, plen, credits, shove, 0);
 			m_copydata(sndptr, 0, plen, (void *)(txwr + 1));
 			nsegs = 0;
 		} else {
@@ -678,7 +719,7 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
 			}
 			txwr = wrtod(wr);
 			credits = howmany(wr_len, 16);
-			write_tx_wr(txwr, toep, 0, plen, credits, shove);
+			write_tx_wr(txwr, toep, 0, plen, credits, shove, 0);
 			write_tx_sgl(txwr + 1, sndptr, m, nsegs,
 			    max_nsegs_1mbuf);
 			if (wr_len & 0xf) {
@@ -734,6 +775,177 @@ t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
 		close_conn(sc, toep);
 }
 
+/* Send ULP data over TOE using TX_DATA_WR. We send whole mbuf at once */
+void
+t4_ulp_push_frames(struct adapter *sc, struct toepcb *toep, int drop)
+{
+	struct mbuf *sndptr, *m = NULL;
+	struct fw_ofld_tx_data_wr *txwr;
+	struct wrqe *wr;
+	unsigned int plen, nsegs, credits, max_imm, max_nsegs, max_nsegs_1mbuf;
+	struct inpcb *inp = toep->inp;
+	struct tcpcb *tp;
+	struct socket *so;
+	struct sockbuf *sb;
+	int tx_credits, ulp_len = 0, ulp_mode = 0, qlen = 0;
+	int shove, compl;
+	struct ofld_tx_sdesc *txsd;
+
+	INP_WLOCK_ASSERT(inp);
+	if (toep->flags & TPF_ABORT_SHUTDOWN)
+		return;
+
+	tp = intotcpcb(inp);
+	so = inp->inp_socket;
+	sb = &so->so_snd;
+	txsd = &toep->txsd[toep->txsd_pidx];
+
+	KASSERT(toep->flags & TPF_FLOWC_WR_SENT,
+	    ("%s: flowc_wr not sent for tid %u.", __func__, toep->tid));
+
+	/*
+	 * This function doesn't resume by itself.  Someone else must clear the
+	 * flag and call this function.
+	 */
+	if (__predict_false(toep->flags & TPF_TX_SUSPENDED))
+		return;
+
+	sndptr = t4_queue_iscsi_callback(so, toep, 1, &qlen);
+	if (!qlen)
+		return;
+
+	do {
+		tx_credits = min(toep->tx_credits, MAX_OFLD_TX_CREDITS);
+		max_imm = max_imm_payload(tx_credits);
+		max_nsegs = max_dsgl_nsegs(tx_credits);
+
+		if (drop) {
+			t4_cpl_iscsi_callback(toep->td, toep, &drop,
+			    CPL_FW4_ACK);
+			drop = 0;
+		}
+
+		plen = 0;
+		nsegs = 0;
+		max_nsegs_1mbuf = 0; /* max # of SGL segments in any one mbuf */
+		for (m = sndptr; m != NULL; m = m->m_next) {
+			int n = sglist_count(mtod(m, void *), m->m_len);
+
+			nsegs += n;
+			plen += m->m_len;
+
+			/* This mbuf sent us _over_ the nsegs limit, return */
+			if (plen > max_imm && nsegs > max_nsegs) {
+				toep->flags |= TPF_TX_SUSPENDED;
+				return;
+			}
+
+			if (max_nsegs_1mbuf < n)
+				max_nsegs_1mbuf = n;
+
+			/* This mbuf put us right at the max_nsegs limit */
+			if (plen > max_imm && nsegs == max_nsegs) {
+				toep->flags |= TPF_TX_SUSPENDED;
+				return;
+			}
+		}
+
+		shove = m == NULL && !(tp->t_flags & TF_MORETOCOME);
+		/* nothing to send */
+		if (plen == 0) {
+			KASSERT(m == NULL,
+			    ("%s: nothing to send, but m != NULL", __func__));
+			break;
+		}
+
+		if (__predict_false(toep->flags & TPF_FIN_SENT))
+			panic("%s: excess tx.", __func__);
+
+		ulp_len = plen + ulp_extra_len(sndptr, &ulp_mode);
+		if (plen <= max_imm) {
+
+			/* Immediate data tx */
+			wr = alloc_wrqe(roundup(sizeof(*txwr) + plen, 16),
+					toep->ofld_txq);
+			if (wr == NULL) {
+				/* XXX: how will we recover from this? */
+				toep->flags |= TPF_TX_SUSPENDED;
+				return;
+			}
+			txwr = wrtod(wr);
+			credits = howmany(wr->wr_len, 16);
+			write_tx_wr(txwr, toep, plen, ulp_len, credits, shove,
+								ulp_mode);
+			m_copydata(sndptr, 0, plen, (void *)(txwr + 1));
+		} else {
+			int wr_len;
+
+			/* DSGL tx */
+			wr_len = sizeof(*txwr) + sizeof(struct ulptx_sgl) +
+			    ((3 * (nsegs - 1)) / 2 + ((nsegs - 1) & 1)) * 8;
+			wr = alloc_wrqe(roundup(wr_len, 16), toep->ofld_txq);
+			if (wr == NULL) {
+				/* XXX: how will we recover from this? */
+				toep->flags |= TPF_TX_SUSPENDED;
+				return;
+			}
+			txwr = wrtod(wr);
+			credits = howmany(wr_len, 16);
+			write_tx_wr(txwr, toep, 0, ulp_len, credits, shove,
+								ulp_mode);
+			write_tx_sgl(txwr + 1, sndptr, m, nsegs,
+			    max_nsegs_1mbuf);
+			if (wr_len & 0xf) {
+				uint64_t *pad = (uint64_t *)
+				    ((uintptr_t)txwr + wr_len);
+				*pad = 0;
+			}
+		}
+
+		KASSERT(toep->tx_credits >= credits,
+			("%s: not enough credits", __func__));
+
+		toep->tx_credits -= credits;
+		toep->tx_nocompl += credits;
+		toep->plen_nocompl += plen;
+		if (toep->tx_credits <= toep->tx_total * 3 / 8 &&
+			toep->tx_nocompl >= toep->tx_total / 4)
+			compl = 1;
+
+		if (compl) {
+			txwr->op_to_immdlen |= htobe32(F_FW_WR_COMPL);
+			toep->tx_nocompl = 0;
+			toep->plen_nocompl = 0;
+		}
+		tp->snd_nxt += ulp_len;
+		tp->snd_max += ulp_len;
+
+                /* goto next mbuf */
+		sndptr = m = t4_queue_iscsi_callback(so, toep, 2, &qlen);
+
+		toep->flags |= TPF_TX_DATA_SENT;
+		if (toep->tx_credits < MIN_OFLD_TX_CREDITS) {
+			toep->flags |= TPF_TX_SUSPENDED;
+		}
+
+		KASSERT(toep->txsd_avail > 0, ("%s: no txsd", __func__));
+		txsd->plen = plen;
+		txsd->tx_credits = credits;
+		txsd++;
+		if (__predict_false(++toep->txsd_pidx == toep->txsd_total)) {
+			toep->txsd_pidx = 0;
+			txsd = &toep->txsd[0];
+		}
+		toep->txsd_avail--;
+
+		t4_l2t_send(sc, wr, toep->l2te);
+	} while (m != NULL);
+
+	/* Send a FIN if requested, but only if there's no more data to send */
+	if (m == NULL && toep->flags & TPF_SEND_FIN)
+		close_conn(sc, toep);
+}
+
 int
 t4_tod_output(struct toedev *tod, struct tcpcb *tp)
 {
@@ -768,8 +980,12 @@ t4_send_fin(struct toedev *tod, struct tcpcb *tp)
 	KASSERT(toep != NULL, ("%s: toep is NULL", __func__));
 
 	toep->flags |= TPF_SEND_FIN;
-	if (tp->t_state >= TCPS_ESTABLISHED)
-		t4_push_frames(sc, toep, 0);
+	if (tp->t_state >= TCPS_ESTABLISHED) {
+		if (toep->ulp_mode == ULP_MODE_ISCSI)
+			t4_ulp_push_frames(sc, toep, 0);
+		else
+			t4_push_frames(sc, toep, 0);
+	}
 
 	return (0);
 }
@@ -1019,6 +1235,91 @@ abort_status_to_errno(struct tcpcb *tp, unsigned int abort_reason)
 	}
 }
 
+int
+cpl_not_handled(struct sge_iq *, const struct rss_header *, struct mbuf *);
+/*
+ * tom_cpl_iscsi_callback -
+ * iscsi and tom would share the following cpl messages, so when any of these
+ * message is received, after tom is done with processing it, the messages
+ * needs to be forwarded to iscsi for further processing:
+ * - CPL_SET_TCB_RPL
+ * - CPL_RX_DATA_DDP
+ */
+void (*tom_cpl_iscsi_callback)(struct tom_data *, struct socket *, void *,
+    unsigned int);
+
+struct mbuf *(*tom_queue_iscsi_callback)(struct socket *, unsigned int, int *);
+/*
+ * Check if the handler function is set for a given CPL
+ * return 0 if the function is NULL or cpl_not_handled, 1 otherwise.
+ */
+int
+t4tom_cpl_handler_registered(struct adapter *sc, unsigned int opcode)
+{
+
+	MPASS(opcode < nitems(sc->cpl_handler));
+
+	return (sc->cpl_handler[opcode] &&
+	    sc->cpl_handler[opcode] != cpl_not_handled);
+}
+
+/*
+ * set the tom_cpl_iscsi_callback function, this function should be used
+ * whenever both toe and iscsi need to process the same cpl msg.
+ */
+void
+t4tom_register_cpl_iscsi_callback(void (*fp)(struct tom_data *, struct socket *,
+    void *, unsigned int))
+{
+
+	tom_cpl_iscsi_callback = fp;
+}
+
+void
+t4tom_register_queue_iscsi_callback(struct mbuf *(*fp)(struct socket *,
+    unsigned int, int *qlen))
+{
+
+	tom_queue_iscsi_callback = fp;
+}
+
+int
+t4_cpl_iscsi_callback(struct tom_data *td, struct toepcb *toep, void *m,
+    unsigned int opcode)
+{
+	struct socket *so;
+
+	if (opcode == CPL_FW4_ACK)
+		so = toep->inp->inp_socket;
+	else {
+		INP_WLOCK(toep->inp);
+		so = toep->inp->inp_socket;
+		INP_WUNLOCK(toep->inp);
+	}
+
+	if (tom_cpl_iscsi_callback && so) {
+		if (toep->ulp_mode == ULP_MODE_ISCSI) {
+			tom_cpl_iscsi_callback(td, so, m, opcode);
+			return (0);
+		}
+	}
+
+	return (1);
+}
+
+struct mbuf *
+t4_queue_iscsi_callback(struct socket *so, struct toepcb *toep,
+    unsigned int cmd, int *qlen)
+{
+
+	if (tom_queue_iscsi_callback && so) {
+		if (toep->ulp_mode == ULP_MODE_ISCSI)
+			return (tom_queue_iscsi_callback(so, cmd, qlen));
+	}
+
+	return (NULL);
+}
+
 /*
  * TCP RST from the peer, timeout, or some other such critical error.
  */
@@ -1408,14 +1709,22 @@ do_fw4_ack(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m)
 	if (toep->flags & TPF_TX_SUSPENDED &&
 	    toep->tx_credits >= toep->tx_total / 4) {
 		toep->flags &= ~TPF_TX_SUSPENDED;
-		t4_push_frames(sc, toep, plen);
+		if (toep->ulp_mode == ULP_MODE_ISCSI)
+			t4_ulp_push_frames(sc, toep, plen);
+		else
+			t4_push_frames(sc, toep, plen);
 	} else if (plen > 0) {
 		struct sockbuf *sb = &so->so_snd;
 
-		SOCKBUF_LOCK(sb);
-		sbdrop_locked(sb, plen);
-		sowwakeup_locked(so);
-		SOCKBUF_UNLOCK_ASSERT(sb);
+		if (toep->ulp_mode == ULP_MODE_ISCSI)
+			t4_cpl_iscsi_callback(toep->td, toep, &plen,
+			    CPL_FW4_ACK);
+		else {
+			SOCKBUF_LOCK(sb);
+			sbdrop_locked(sb, plen);
+			sowwakeup_locked(so);
+			SOCKBUF_UNLOCK_ASSERT(sb);
+		}
 	}
 
 	INP_WUNLOCK(inp);
@@ -1439,6 +1748,12 @@ do_set_tcb_rpl(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m)
 
 	if (is_ftid(sc, tid))
 		return (t4_filter_rpl(iq, rss, m)); /* TCB is a filter */
+	else {
+		struct toepcb *toep = lookup_tid(sc, tid);
+
+		t4_cpl_iscsi_callback(toep->td, toep, m, CPL_SET_TCB_RPL);
+		return (0);
+	}
 
 	CXGBE_UNIMPLEMENTED(__func__);
 }
diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c
index 6c9367564b4a..3691a3b516dc 100644
--- a/sys/dev/cxgbe/tom/t4_ddp.c
+++ b/sys/dev/cxgbe/tom/t4_ddp.c
@@ -493,6 +493,7 @@ do_rx_data_ddp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m)
 	unsigned int tid = GET_TID(cpl);
 	uint32_t vld;
 	struct toepcb *toep = lookup_tid(sc, tid);
+	struct tom_data *td = toep->td;
 
 	KASSERT(m == NULL, ("%s: wasn't expecting payload", __func__));
 	KASSERT(toep->tid == tid, ("%s: toep tid/atid mismatch", __func__));
@@ -504,6 +505,16 @@ do_rx_data_ddp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m)
 		panic("%s: DDP error 0x%x (tid %d, toep %p)",
 		    __func__, vld, tid, toep);
 	}
+	if (toep->ulp_mode == ULP_MODE_ISCSI) {
+		m = m_get(M_NOWAIT, MT_DATA);
+		if (m == NULL)
+			CXGBE_UNIMPLEMENTED("mbuf alloc failure");
+		memcpy(mtod(m, unsigned char *), cpl,
+		    sizeof(struct cpl_rx_data_ddp));
+        	if (!t4_cpl_iscsi_callback(td, toep, m, CPL_RX_DATA_DDP))
+			return (0);
+		m_freem(m);
+        }
 
 	handle_ddp_data(toep, cpl->u.ddp_report, cpl->seq, be16toh(cpl->len));
 
@@ -869,7 +880,7 @@ unwire_ddp_buffer(struct ddp_buffer *db)
 	for (i = 0; i < db->npages; i++) {
 		p = db->pages[i];
 		vm_page_lock(p);
-		vm_page_unwire(p, 0);
+		vm_page_unwire(p, PQ_INACTIVE);
 		vm_page_unlock(p);
 	}
 }
diff --git a/sys/dev/cxgbe/tom/t4_tom.h b/sys/dev/cxgbe/tom/t4_tom.h
index 6328240cd494..1d883fed89e8 100644
--- a/sys/dev/cxgbe/tom/t4_tom.h
+++ b/sys/dev/cxgbe/tom/t4_tom.h
@@ -279,6 +279,7 @@ int t4_send_fin(struct toedev *, struct tcpcb *);
 int t4_send_rst(struct toedev *, struct tcpcb *);
 void t4_set_tcb_field(struct adapter *, struct toepcb *, int, uint16_t,
     uint64_t, uint64_t);
+void t4_push_frames(struct adapter *sc, struct toepcb *toep, int drop);
 
 /* t4_ddp.c */
 void t4_init_ddp(struct adapter *, struct tom_data *);
@@ -289,4 +290,20 @@ struct mbuf *get_ddp_mbuf(int);
 void enable_ddp(struct adapter *, struct toepcb *toep);
 void release_ddp_resources(struct toepcb *toep);
 void insert_ddp_data(struct toepcb *, uint32_t);
+
+/* ULP related */
+#define CXGBE_ISCSI_MBUF_TAG          50
+int t4tom_cpl_handler_registered(struct adapter *, unsigned int);
+void t4tom_register_cpl_iscsi_callback(void (*fp)(struct tom_data *,
+    struct socket *, void *, unsigned int));
+void t4tom_register_queue_iscsi_callback(struct mbuf *(*fp)(struct socket *,
+    unsigned int, int *));
+void t4_ulp_push_frames(struct adapter *sc, struct toepcb *toep, int);
+int t4_cpl_iscsi_callback(struct tom_data *, struct toepcb *, void *, uint32_t);
+struct mbuf *t4_queue_iscsi_callback(struct socket *, struct toepcb *, uint32_t,
+    int *);
+extern void (*tom_cpl_iscsi_callback)(struct tom_data *, struct socket *,
+    void *, unsigned int);
+extern struct mbuf *(*tom_queue_iscsi_callback)(struct socket*, unsigned int,
+    int *);
 #endif
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 71448ab681a4..147b404fc9f2 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -4473,7 +4473,6 @@ tulip_busdma_freering(tulip_ringinfo_t *ri)
     }
     if (ri->ri_descs != NULL) {
 	bus_dmamem_free(ri->ri_ring_tag, ri->ri_descs, ri->ri_ring_map);
-	ri->ri_ring_map = NULL;
 	ri->ri_descs = NULL;
     }
     if (ri->ri_ring_tag != NULL) {
@@ -4558,7 +4557,6 @@ tulip_busdma_cleanup(tulip_softc_t * const sc)
     if (sc->tulip_setupbuf != NULL) {
 	bus_dmamem_free(sc->tulip_setup_tag, sc->tulip_setupbuf,
 	    sc->tulip_setup_map);
-	sc->tulip_setup_map = NULL;
 	sc->tulip_setupbuf = NULL;
     }
     if (sc->tulip_setup_tag != NULL) {
diff --git a/sys/dev/drm/ati_pcigart.c b/sys/dev/drm/ati_pcigart.c
index 063288ed64d6..2c50e8bd3aab 100644
--- a/sys/dev/drm/ati_pcigart.c
+++ b/sys/dev/drm/ati_pcigart.c
@@ -116,6 +116,7 @@ drm_ati_free_pcigart_table(struct drm_device *dev,
 {
 	struct drm_dma_handle *dmah = gart_info->dmah;
 
+	bus_dmamap_unload(dmah->tag, dmah->map);
 	bus_dmamem_free(dmah->tag, dmah->vaddr, dmah->map);
 	bus_dma_tag_destroy(dmah->tag);
 	free(dmah, DRM_MEM_DMA);
diff --git a/sys/dev/drm/drm.h b/sys/dev/drm/drm.h
index 592b5b3e8213..e579a16604ad 100644
--- a/sys/dev/drm/drm.h
+++ b/sys/dev/drm/drm.h
@@ -163,7 +163,7 @@ struct drm_hw_lock {
 /* This is beyond ugly, and only works on GCC.  However, it allows me to use
  * drm.h in places (i.e., in the X-server) where I can't use size_t.  The real
  * fix is to use uint32_t instead of size_t, but that fix will break existing
- * LP64 (i.e., PowerPC64, SPARC64, IA-64, Alpha, etc.) systems.  That *will*
+ * LP64 (i.e., PowerPC64, SPARC64, Alpha, etc.) systems.  That *will*
  * eventually happen, though.  I chose 'unsigned long' to be the fallback type
  * because that works on all the platforms I know about.  Hopefully, the
  * real fix will happen before that bites us.
diff --git a/sys/dev/drm/drm_drv.c b/sys/dev/drm/drm_drv.c
index 75902a7711db..75983766f379 100644
--- a/sys/dev/drm/drm_drv.c
+++ b/sys/dev/drm/drm_drv.c
@@ -132,7 +132,6 @@ static struct cdevsw drm_cdevsw = {
 };
 
 static int drm_msi = 1;	/* Enable by default. */
-TUNABLE_INT("hw.drm.msi", &drm_msi);
 SYSCTL_NODE(_hw, OID_AUTO, drm, CTLFLAG_RW, NULL, "DRM device");
 SYSCTL_INT(_hw_drm, OID_AUTO, msi, CTLFLAG_RDTUN, &drm_msi, 1,
     "Enable MSI interrupts for drm devices");
diff --git a/sys/dev/drm/drm_pci.c b/sys/dev/drm/drm_pci.c
index afd66047f216..3d9a6f4a2b76 100644
--- a/sys/dev/drm/drm_pci.c
+++ b/sys/dev/drm/drm_pci.c
@@ -119,6 +119,7 @@ drm_pci_free(struct drm_device *dev, drm_dma_handle_t *dmah)
 	if (dmah == NULL)
 		return;
 
+	bus_dmamap_unload(dmah->tag, dmah->map);
 	bus_dmamem_free(dmah->tag, dmah->vaddr, dmah->map);
 	bus_dma_tag_destroy(dmah->tag);
 
diff --git a/sys/dev/drm/drm_sarea.h b/sys/dev/drm/drm_sarea.h
index bf5b46444166..bb957594dbfc 100644
--- a/sys/dev/drm/drm_sarea.h
+++ b/sys/dev/drm/drm_sarea.h
@@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$");
 /* SAREA area needs to be at least a page */
 #if defined(__alpha__)
 #define SAREA_MAX                       0x2000
-#elif defined(__ia64__)
-#define SAREA_MAX                       0x10000	/* 64kB */
 #else
 /* Intel 830M driver needs at least 8k SAREA */
 #define SAREA_MAX                       0x2000UL
diff --git a/sys/dev/drm/drm_sysctl.c b/sys/dev/drm/drm_sysctl.c
index ce3e5b4c7ce8..75d8306c8405 100644
--- a/sys/dev/drm/drm_sysctl.c
+++ b/sys/dev/drm/drm_sysctl.c
@@ -70,7 +70,7 @@ int drm_sysctl_init(struct drm_device *dev)
 	dev->sysctl = info;
 
 	/* Add the sysctl node for DRI if it doesn't already exist */
-	drioid = SYSCTL_ADD_NODE( &info->ctx, &sysctl__hw_children, OID_AUTO, "dri", CTLFLAG_RW, NULL, "DRI Graphics");
+	drioid = SYSCTL_ADD_NODE(&info->ctx, SYSCTL_CHILDREN(&sysctl___hw), OID_AUTO, "dri", CTLFLAG_RW, NULL, "DRI Graphics");
 	if (!drioid)
 		return 1;
 
diff --git a/sys/dev/drm/via_dmablit.c b/sys/dev/drm/via_dmablit.c
index 70ba9d978b10..e8096f2315e0 100644
--- a/sys/dev/drm/via_dmablit.c
+++ b/sys/dev/drm/via_dmablit.c
@@ -179,7 +179,7 @@ via_free_sg_info(drm_via_sg_info_t *vsg)
 		for (i=0; i < vsg->num_pages; ++i) {
 			page = vsg->pages[i];
 			vm_page_lock(page);
-			vm_page_unwire(page, 0);
+			vm_page_unwire(page, PQ_INACTIVE);
 			vm_page_unlock(page);
 		}
 	case dr_via_pages_alloc:
diff --git a/sys/dev/drm2/drm.h b/sys/dev/drm2/drm.h
index d2eac916046a..dff0f94e8530 100644
--- a/sys/dev/drm2/drm.h
+++ b/sys/dev/drm2/drm.h
@@ -163,7 +163,7 @@ struct drm_hw_lock {
 /* This is beyond ugly, and only works on GCC.  However, it allows me to use
  * drm.h in places (i.e., in the X-server) where I can't use size_t.  The real
  * fix is to use uint32_t instead of size_t, but that fix will break existing
- * LP64 (i.e., PowerPC64, SPARC64, IA-64, Alpha, etc.) systems.  That *will*
+ * LP64 (i.e., PowerPC64, SPARC64, Alpha, etc.) systems.  That *will*
  * eventually happen, though.  I chose 'unsigned long' to be the fallback type
  * because that works on all the platforms I know about.  Hopefully, the
  * real fix will happen before that bites us.
diff --git a/sys/dev/drm2/drm_drv.c b/sys/dev/drm2/drm_drv.c
index 7b00bcf8cf43..81fcee3dbe7c 100644
--- a/sys/dev/drm2/drm_drv.c
+++ b/sys/dev/drm2/drm_drv.c
@@ -203,7 +203,6 @@ static struct cdevsw drm_cdevsw = {
 };
 
 static int drm_msi = 1;	/* Enable by default. */
-TUNABLE_INT("hw.drm.msi", &drm_msi);
 SYSCTL_NODE(_hw, OID_AUTO, drm, CTLFLAG_RW, NULL, "DRM device");
 SYSCTL_INT(_hw_drm, OID_AUTO, msi, CTLFLAG_RDTUN, &drm_msi, 1,
     "Enable MSI interrupts for drm devices");
diff --git a/sys/dev/drm2/drm_fb_helper.c b/sys/dev/drm2/drm_fb_helper.c
index d797502a7a21..523b010edab5 100644
--- a/sys/dev/drm2/drm_fb_helper.c
+++ b/sys/dev/drm2/drm_fb_helper.c
@@ -36,7 +36,6 @@ __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;
@@ -69,7 +68,6 @@ vt_kms_postswitch(void *arg)
 
 	return (0);
 }
-#endif
 
 static DRM_LIST_HEAD(kernel_fb_helper_list);
 
@@ -934,10 +932,8 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 	struct fb_info *info;
 	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;
@@ -1014,7 +1010,6 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 	if (new_fb < 0)
 		return new_fb;
 
-#if defined(__FreeBSD__)
 	sc = malloc(sizeof(struct vt_kms_softc), DRM_MEM_KMS,
 	    M_WAITOK | M_ZERO);
 	sc->fb_helper = fb_helper;
@@ -1029,14 +1024,12 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 	info->fb_stride = fb_helper->fb->pitches[0];
 	info->fb_priv = sc;
 	info->enter = &vt_kms_postswitch;
-#endif
 
 	/* set the fb pointer */
 	for (i = 0; i < fb_helper->crtc_count; i++) {
 		fb_helper->crtc_info[i].mode_set.fb = fb_helper->fb;
 	}
 
-#if defined(__FreeBSD__)
 	if (new_fb) {
 		device_t fbd;
 		int ret;
@@ -1052,30 +1045,6 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 			DRM_ERROR("Failed to attach fbd device: %d\n", ret);
 #endif
 	}
-#else
-	if (new_fb) {
-		info->var.pixclock = 0;
-		if (register_framebuffer(info) < 0) {
-			return -EINVAL;
-		}
-
-		printf("fb%d: %s frame buffer device\n", info->node,
-		       info->fix.id);
-
-	} else {
-		drm_fb_helper_set_par(info);
-	}
-
-	/* Switch back to kernel console on panic */
-	/* multi card linked list maybe */
-	if (list_empty(&kernel_fb_helper_list)) {
-		printf("drm: registered panic notifier\n");
-		atomic_notifier_chain_register(&panic_notifier_list,
-					       &paniced);
-	}
-	if (new_fb)
-		list_add(&fb_helper->kernel_fb_list, &kernel_fb_helper_list);
-#endif
 	return 0;
 }
 
diff --git a/sys/dev/drm2/drm_pci.c b/sys/dev/drm2/drm_pci.c
index ac9d4e6be985..50af71da1199 100644
--- a/sys/dev/drm2/drm_pci.c
+++ b/sys/dev/drm2/drm_pci.c
@@ -116,6 +116,7 @@ drm_pci_free(struct drm_device *dev, drm_dma_handle_t *dmah)
 	if (dmah == NULL)
 		return;
 
+	bus_dmamap_unload(dmah->tag, dmah->map);
 	bus_dmamem_free(dmah->tag, dmah->vaddr, dmah->map);
 	bus_dma_tag_destroy(dmah->tag);
 
diff --git a/sys/dev/drm2/drm_sarea.h b/sys/dev/drm2/drm_sarea.h
index 9f37fcba6eda..f800cfee96a2 100644
--- a/sys/dev/drm2/drm_sarea.h
+++ b/sys/dev/drm2/drm_sarea.h
@@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$");
 /* SAREA area needs to be at least a page */
 #if defined(__alpha__)
 #define SAREA_MAX                       0x2000
-#elif defined(__ia64__)
-#define SAREA_MAX                       0x10000	/* 64kB */
 #else
 /* Intel 830M driver needs at least 8k SAREA */
 #define SAREA_MAX                       0x2000UL
diff --git a/sys/dev/drm2/drm_sysctl.c b/sys/dev/drm2/drm_sysctl.c
index a30c7ab237a6..aac21e6a486e 100644
--- a/sys/dev/drm2/drm_sysctl.c
+++ b/sys/dev/drm2/drm_sysctl.c
@@ -68,7 +68,7 @@ int drm_sysctl_init(struct drm_device *dev)
 	dev->sysctl = info;
 
 	/* Add the sysctl node for DRI if it doesn't already exist */
-	drioid = SYSCTL_ADD_NODE(&info->ctx, &sysctl__hw_children, OID_AUTO,
+	drioid = SYSCTL_ADD_NODE(&info->ctx, SYSCTL_CHILDREN(&sysctl___hw), OID_AUTO,
 	    "dri", CTLFLAG_RW, NULL, "DRI Graphics");
 	if (!drioid)
 		return 1;
diff --git a/sys/dev/drm2/i915/i915_gem.c b/sys/dev/drm2/i915/i915_gem.c
index 99821e49ae1a..6d462071d7b9 100644
--- a/sys/dev/drm2/i915/i915_gem.c
+++ b/sys/dev/drm2/i915/i915_gem.c
@@ -1039,7 +1039,7 @@ i915_gem_swap_io(struct drm_device *dev, struct drm_i915_gem_object *obj,
 			vm_page_dirty(m);
 		vm_page_reference(m);
 		vm_page_lock(m);
-		vm_page_unwire(m, 1);
+		vm_page_unwire(m, PQ_ACTIVE);
 		vm_page_unlock(m);
 		atomic_add_long(&i915_gem_wired_pages_cnt, -1);
 
@@ -1428,8 +1428,10 @@ i915_gem_pager_fault(vm_object_t vm_obj, vm_ooffset_t offset, int prot,
 
 	obj->fault_mappable = true;
 	VM_OBJECT_WLOCK(vm_obj);
-	m = vm_phys_fictitious_to_vm_page(dev->agp->base + obj->gtt_offset +
-	    offset);
+	m = PHYS_TO_VM_PAGE(dev->agp->base + obj->gtt_offset + offset);
+	KASSERT((m->flags & PG_FICTITIOUS) != 0,
+	    ("physical address %#jx not fictitious",
+	    (uintmax_t)(dev->agp->base + obj->gtt_offset + offset)));
 	if (m == NULL) {
 		VM_OBJECT_WUNLOCK(vm_obj);
 		cause = 60;
@@ -2247,7 +2249,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj,
 	for (j = 0; j < i; j++) {
 		m = obj->pages[j];
 		vm_page_lock(m);
-		vm_page_unwire(m, 0);
+		vm_page_unwire(m, PQ_INACTIVE);
 		vm_page_unlock(m);
 		atomic_add_long(&i915_gem_wired_pages_cnt, -1);
 	}
@@ -2308,7 +2310,7 @@ i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj)
 		if (obj->madv == I915_MADV_WILLNEED)
 			vm_page_reference(m);
 		vm_page_lock(m);
-		vm_page_unwire(obj->pages[i], 1);
+		vm_page_unwire(obj->pages[i], PQ_ACTIVE);
 		vm_page_unlock(m);
 		atomic_add_long(&i915_gem_wired_pages_cnt, -1);
 	}
@@ -3611,7 +3613,7 @@ i915_gem_detach_phys_object(struct drm_device *dev,
 		vm_page_reference(m);
 		vm_page_lock(m);
 		vm_page_dirty(m);
-		vm_page_unwire(m, 0);
+		vm_page_unwire(m, PQ_INACTIVE);
 		vm_page_unlock(m);
 		atomic_add_long(&i915_gem_wired_pages_cnt, -1);
 	}
@@ -3676,7 +3678,7 @@ i915_gem_attach_phys_object(struct drm_device *dev,
 
 		vm_page_reference(m);
 		vm_page_lock(m);
-		vm_page_unwire(m, 0);
+		vm_page_unwire(m, PQ_INACTIVE);
 		vm_page_unlock(m);
 		atomic_add_long(&i915_gem_wired_pages_cnt, -1);
 	}
diff --git a/sys/dev/drm2/i915/i915_gem_gtt.c b/sys/dev/drm2/i915/i915_gem_gtt.c
index 90899dede225..a4ca76fce7ee 100644
--- a/sys/dev/drm2/i915/i915_gem_gtt.c
+++ b/sys/dev/drm2/i915/i915_gem_gtt.c
@@ -206,7 +206,7 @@ i915_gem_cleanup_aliasing_ppgtt(struct drm_device *dev)
 	for (i = 0; i < ppgtt->num_pd_entries; i++) {
 		m = ppgtt->pt_pages[i];
 		if (m != NULL) {
-			vm_page_unwire(m, 0);
+			vm_page_unwire(m, PQ_INACTIVE);
 			vm_page_free(m);
 		}
 	}
diff --git a/sys/dev/drm2/i915/intel_fb.c b/sys/dev/drm2/i915/intel_fb.c
index 29579203e9ed..f8a68ec92b39 100644
--- a/sys/dev/drm2/i915/intel_fb.c
+++ b/sys/dev/drm2/i915/intel_fb.c
@@ -27,6 +27,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_syscons.h"
 #include <dev/drm2/drmP.h>
 #include <dev/drm2/drm.h>
 #include <dev/drm2/drm_crtc.h>
@@ -216,7 +217,9 @@ static void intel_fbdev_destroy(struct drm_device *dev,
 	}
 }
 
+#ifdef DEV_SC
 extern int sc_txtmouse_no_retrace_wait;
+#endif
 
 int intel_fbdev_init(struct drm_device *dev)
 {
@@ -240,7 +243,9 @@ int intel_fbdev_init(struct drm_device *dev)
 
 	drm_fb_helper_single_add_all_connectors(&ifbdev->helper);
 	drm_fb_helper_initial_config(&ifbdev->helper, 32);
+#ifdef DEV_SC
 	sc_txtmouse_no_retrace_wait = 1;
+#endif
 	return 0;
 }
 
diff --git a/sys/dev/drm2/radeon/rs690.c b/sys/dev/drm2/radeon/rs690.c
index 232053805f34..dbf64d9e8edc 100644
--- a/sys/dev/drm2/radeon/rs690.c
+++ b/sys/dev/drm2/radeon/rs690.c
@@ -308,12 +308,11 @@ static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
 		if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
 			rdev->pm.sideport_bandwidth.full)
 			rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
-#ifdef DUMBBELL_WIP
-		read_delay_latency.full = dfixed_const(370 * 800 * 1000);
-#endif /* DUMBBELL_WIP */
-		read_delay_latency.full = UINT_MAX;
-		read_delay_latency.full = dfixed_div(read_delay_latency,
-			rdev->pm.igp_sideport_mclk);
+		read_delay_latency.full = dfixed_const(370 * 800);
+		a.full = dfixed_const(1000);
+		b.full = dfixed_div(rdev->pm.igp_sideport_mclk, a);
+		read_delay_latency.full = dfixed_div(read_delay_latency, b);
+		read_delay_latency.full = dfixed_mul(read_delay_latency, a);
 	} else {
 		if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
 			rdev->pm.k8_bandwidth.full)
@@ -488,14 +487,10 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
 		}
 		if (wm0.priority_mark.full > priority_mark02.full)
 			priority_mark02.full = wm0.priority_mark.full;
-		if (dfixed_trunc(priority_mark02) < 0)
-			priority_mark02.full = 0;
 		if (wm0.priority_mark_max.full > priority_mark02.full)
 			priority_mark02.full = wm0.priority_mark_max.full;
 		if (wm1.priority_mark.full > priority_mark12.full)
 			priority_mark12.full = wm1.priority_mark.full;
-		if (dfixed_trunc(priority_mark12) < 0)
-			priority_mark12.full = 0;
 		if (wm1.priority_mark_max.full > priority_mark12.full)
 			priority_mark12.full = wm1.priority_mark_max.full;
 		d1mode_priority_a_cnt = dfixed_trunc(priority_mark02);
@@ -526,8 +521,6 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
 		}
 		if (wm0.priority_mark.full > priority_mark02.full)
 			priority_mark02.full = wm0.priority_mark.full;
-		if (dfixed_trunc(priority_mark02) < 0)
-			priority_mark02.full = 0;
 		if (wm0.priority_mark_max.full > priority_mark02.full)
 			priority_mark02.full = wm0.priority_mark_max.full;
 		d1mode_priority_a_cnt = dfixed_trunc(priority_mark02);
@@ -555,8 +548,6 @@ void rs690_bandwidth_update(struct radeon_device *rdev)
 		}
 		if (wm1.priority_mark.full > priority_mark12.full)
 			priority_mark12.full = wm1.priority_mark.full;
-		if (dfixed_trunc(priority_mark12) < 0)
-			priority_mark12.full = 0;
 		if (wm1.priority_mark_max.full > priority_mark12.full)
 			priority_mark12.full = wm1.priority_mark_max.full;
 		d2mode_priority_a_cnt = dfixed_trunc(priority_mark12);
diff --git a/sys/dev/drm2/radeon/rv515.c b/sys/dev/drm2/radeon/rv515.c
index d83cf1ba07f4..ba292deb0a1b 100644
--- a/sys/dev/drm2/radeon/rv515.c
+++ b/sys/dev/drm2/radeon/rv515.c
@@ -1087,14 +1087,10 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev)
 		}
 		if (wm0.priority_mark.full > priority_mark02.full)
 			priority_mark02.full = wm0.priority_mark.full;
-		if (dfixed_trunc(priority_mark02) < 0)
-			priority_mark02.full = 0;
 		if (wm0.priority_mark_max.full > priority_mark02.full)
 			priority_mark02.full = wm0.priority_mark_max.full;
 		if (wm1.priority_mark.full > priority_mark12.full)
 			priority_mark12.full = wm1.priority_mark.full;
-		if (dfixed_trunc(priority_mark12) < 0)
-			priority_mark12.full = 0;
 		if (wm1.priority_mark_max.full > priority_mark12.full)
 			priority_mark12.full = wm1.priority_mark_max.full;
 		d1mode_priority_a_cnt = dfixed_trunc(priority_mark02);
@@ -1125,8 +1121,6 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev)
 		}
 		if (wm0.priority_mark.full > priority_mark02.full)
 			priority_mark02.full = wm0.priority_mark.full;
-		if (dfixed_trunc(priority_mark02) < 0)
-			priority_mark02.full = 0;
 		if (wm0.priority_mark_max.full > priority_mark02.full)
 			priority_mark02.full = wm0.priority_mark_max.full;
 		d1mode_priority_a_cnt = dfixed_trunc(priority_mark02);
@@ -1154,8 +1148,6 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev)
 		}
 		if (wm1.priority_mark.full > priority_mark12.full)
 			priority_mark12.full = wm1.priority_mark.full;
-		if (dfixed_trunc(priority_mark12) < 0)
-			priority_mark12.full = 0;
 		if (wm1.priority_mark_max.full > priority_mark12.full)
 			priority_mark12.full = wm1.priority_mark_max.full;
 		d2mode_priority_a_cnt = dfixed_trunc(priority_mark12);
diff --git a/sys/dev/drm2/ttm/ttm_bo_vm.c b/sys/dev/drm2/ttm/ttm_bo_vm.c
index 83ec76ceab77..7aa1ac0c428c 100644
--- a/sys/dev/drm2/ttm/ttm_bo_vm.c
+++ b/sys/dev/drm2/ttm/ttm_bo_vm.c
@@ -216,8 +216,12 @@ ttm_bo_vm_fault(vm_object_t vm_obj, vm_ooffset_t offset,
 	}
 
 	if (bo->mem.bus.is_iomem) {
-		m = vm_phys_fictitious_to_vm_page(bo->mem.bus.base +
-		    bo->mem.bus.offset + offset);
+		m = PHYS_TO_VM_PAGE(bo->mem.bus.base + bo->mem.bus.offset +
+		    offset);
+		KASSERT((m->flags & PG_FICTITIOUS) != 0,
+		    ("physical address %#jx not fictitious",
+		    (uintmax_t)(bo->mem.bus.base + bo->mem.bus.offset
+		    + offset)));
 		pmap_page_set_memattr(m, ttm_io_prot(bo->mem.placement));
 	} else {
 		ttm = bo->ttm;
diff --git a/sys/dev/drm2/ttm/ttm_page_alloc.c b/sys/dev/drm2/ttm/ttm_page_alloc.c
index 3c0f18aa397f..8f513d0ddeaa 100644
--- a/sys/dev/drm2/ttm/ttm_page_alloc.c
+++ b/sys/dev/drm2/ttm/ttm_page_alloc.c
@@ -139,7 +139,7 @@ ttm_vm_page_free(vm_page_t m)
 	KASSERT((m->oflags & VPO_UNMANAGED) == 0, ("ttm got unmanaged %p", m));
 	m->flags &= ~PG_FICTITIOUS;
 	m->oflags |= VPO_UNMANAGED;
-	vm_page_unwire(m, 0);
+	vm_page_unwire(m, PQ_INACTIVE);
 	vm_page_free(m);
 }
 
diff --git a/sys/dev/e1000/e1000_82542.c b/sys/dev/e1000/e1000_82542.c
index c0b4e88be983..19d5402831c7 100644
--- a/sys/dev/e1000/e1000_82542.c
+++ b/sys/dev/e1000/e1000_82542.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2010, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -47,7 +47,7 @@ static s32  e1000_init_hw_82542(struct e1000_hw *hw);
 static s32  e1000_setup_link_82542(struct e1000_hw *hw);
 static s32  e1000_led_on_82542(struct e1000_hw *hw);
 static s32  e1000_led_off_82542(struct e1000_hw *hw);
-static void e1000_rar_set_82542(struct e1000_hw *hw, u8 *addr, u32 index);
+static int  e1000_rar_set_82542(struct e1000_hw *hw, u8 *addr, u32 index);
 static void e1000_clear_hw_cntrs_82542(struct e1000_hw *hw);
 static s32  e1000_read_mac_addr_82542(struct e1000_hw *hw);
 
@@ -409,7 +409,7 @@ static s32 e1000_led_off_82542(struct e1000_hw *hw)
  *  Sets the receive address array register at index to the address passed
  *  in by addr.
  **/
-static void e1000_rar_set_82542(struct e1000_hw *hw, u8 *addr, u32 index)
+static int e1000_rar_set_82542(struct e1000_hw *hw, u8 *addr, u32 index)
 {
 	u32 rar_low, rar_high;
 
@@ -431,6 +431,7 @@ static void e1000_rar_set_82542(struct e1000_hw *hw, u8 *addr, u32 index)
 
 	E1000_WRITE_REG_ARRAY(hw, E1000_RA, (index << 1), rar_low);
 	E1000_WRITE_REG_ARRAY(hw, E1000_RA, ((index << 1) + 1), rar_high);
+	return E1000_SUCCESS;
 }
 
 /**
diff --git a/sys/dev/e1000/e1000_82571.c b/sys/dev/e1000/e1000_82571.c
index 2c985900834b..e209d43826dc 100644
--- a/sys/dev/e1000/e1000_82571.c
+++ b/sys/dev/e1000/e1000_82571.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -1453,10 +1453,14 @@ static void e1000_clear_vfta_82571(struct e1000_hw *hw)
 static bool e1000_check_mng_mode_82574(struct e1000_hw *hw)
 {
 	u16 data;
+	s32 ret_val;
 
 	DEBUGFUNC("e1000_check_mng_mode_82574");
 
-	hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+	ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+	if (ret_val)
+		return FALSE;
+
 	return (data & E1000_NVM_INIT_CTRL2_MNGM) != 0;
 }
 
diff --git a/sys/dev/e1000/e1000_82575.c b/sys/dev/e1000/e1000_82575.c
index 1707236e097f..d79db678b910 100644
--- a/sys/dev/e1000/e1000_82575.c
+++ b/sys/dev/e1000/e1000_82575.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -56,7 +56,6 @@ 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);
-static s32  e1000_init_hw_82575(struct e1000_hw *hw);
 static s32  e1000_phy_hw_reset_sgmii_82575(struct e1000_hw *hw);
 static s32  e1000_read_phy_reg_sgmii_82575(struct e1000_hw *hw, u32 offset,
 					   u16 *data);
@@ -120,7 +119,8 @@ static bool e1000_get_i2c_data(u32 *i2cctl);
 static const u16 e1000_82580_rxpbs_table[] = {
 	36, 72, 144, 1, 2, 4, 8, 16, 35, 70, 140 };
 #define E1000_82580_RXPBS_TABLE_SIZE \
-	(sizeof(e1000_82580_rxpbs_table)/sizeof(u16))
+	(sizeof(e1000_82580_rxpbs_table) / \
+	 sizeof(e1000_82580_rxpbs_table[0]))
 
 
 /**
@@ -273,6 +273,11 @@ static s32 e1000_init_phy_params_82575(struct e1000_hw *hw)
 				hw->mac.ops.check_for_link =
 						e1000_check_for_link_media_swap;
 		}
+		if (phy->id == M88E1512_E_PHY_ID) {
+			ret_val = e1000_initialize_M88E1512_phy(hw);
+			if (ret_val)
+				goto out;
+		}
 		break;
 	case IGP03E1000_E_PHY_ID:
 	case IGP04E1000_E_PHY_ID:
@@ -450,6 +455,9 @@ static s32 e1000_init_mac_params_82575(struct e1000_hw *hw)
 	else
 	mac->ops.reset_hw = e1000_reset_hw_82575;
 	/* hw initialization */
+	if ((mac->type == e1000_i210) || (mac->type == e1000_i211))
+		mac->ops.init_hw = e1000_init_hw_i210;
+	else
 	mac->ops.init_hw = e1000_init_hw_82575;
 	/* link setup */
 	mac->ops.setup_link = e1000_setup_link_generic;
@@ -750,6 +758,7 @@ static s32 e1000_get_phy_id_82575(struct e1000_hw *hw)
 static s32 e1000_phy_hw_reset_sgmii_82575(struct e1000_hw *hw)
 {
 	s32 ret_val = E1000_SUCCESS;
+	struct e1000_phy_info *phy = &hw->phy;
 
 	DEBUGFUNC("e1000_phy_hw_reset_sgmii_82575");
 
@@ -772,7 +781,11 @@ static s32 e1000_phy_hw_reset_sgmii_82575(struct e1000_hw *hw)
 		goto out;
 
 	ret_val = hw->phy.ops.commit(hw);
+	if (ret_val)
+		goto out;
 
+	if (phy->id == M88E1512_E_PHY_ID)
+		ret_val = e1000_initialize_M88E1512_phy(hw);
 out:
 	return ret_val;
 }
@@ -879,7 +892,6 @@ static s32 e1000_set_d0_lplu_state_82575(struct e1000_hw *hw, bool active)
 static s32 e1000_set_d0_lplu_state_82580(struct e1000_hw *hw, bool active)
 {
 	struct e1000_phy_info *phy = &hw->phy;
-	s32 ret_val = E1000_SUCCESS;
 	u32 data;
 
 	DEBUGFUNC("e1000_set_d0_lplu_state_82580");
@@ -907,7 +919,7 @@ static s32 e1000_set_d0_lplu_state_82580(struct e1000_hw *hw, bool active)
 	}
 
 	E1000_WRITE_REG(hw, E1000_82580_PHY_POWER_MGMT, data);
-	return ret_val;
+	return E1000_SUCCESS;
 }
 
 /**
@@ -927,7 +939,6 @@ static s32 e1000_set_d0_lplu_state_82580(struct e1000_hw *hw, bool active)
 s32 e1000_set_d3_lplu_state_82580(struct e1000_hw *hw, bool active)
 {
 	struct e1000_phy_info *phy = &hw->phy;
-	s32 ret_val = E1000_SUCCESS;
 	u32 data;
 
 	DEBUGFUNC("e1000_set_d3_lplu_state_82580");
@@ -955,7 +966,7 @@ s32 e1000_set_d3_lplu_state_82580(struct e1000_hw *hw, bool active)
 	}
 
 	E1000_WRITE_REG(hw, E1000_82580_PHY_POWER_MGMT, data);
-	return ret_val;
+	return E1000_SUCCESS;
 }
 
 /**
@@ -969,7 +980,7 @@ s32 e1000_set_d3_lplu_state_82580(struct e1000_hw *hw, bool active)
  **/
 static s32 e1000_acquire_nvm_82575(struct e1000_hw *hw)
 {
-	s32 ret_val;
+	s32 ret_val = E1000_SUCCESS;
 
 	DEBUGFUNC("e1000_acquire_nvm_82575");
 
@@ -991,6 +1002,7 @@ static s32 e1000_acquire_nvm_82575(struct e1000_hw *hw)
 			DEBUGOUT("Nvm bit banging access error detected and cleared.\n");
 		}
 	}
+
 	if (hw->mac.type == e1000_82580) {
 		u32 eecd = E1000_READ_REG(hw, E1000_EECD);
 		if (eecd & E1000_EECD_BLOCKED) {
@@ -1001,7 +1013,6 @@ static s32 e1000_acquire_nvm_82575(struct e1000_hw *hw)
 		}
 	}
 
-
 	ret_val = e1000_acquire_nvm_generic(hw);
 	if (ret_val)
 		e1000_release_swfw_sync_82575(hw, E1000_SWFW_EEP_SM);
@@ -1115,7 +1126,6 @@ static void e1000_release_swfw_sync_82575(struct e1000_hw *hw, u16 mask)
 static s32 e1000_get_cfg_done_82575(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_82575");
@@ -1140,7 +1150,7 @@ static s32 e1000_get_cfg_done_82575(struct e1000_hw *hw)
 	    (hw->phy.type == e1000_phy_igp_3))
 		e1000_phy_init_script_igp3(hw);
 
-	return ret_val;
+	return E1000_SUCCESS;
 }
 
 /**
@@ -1466,7 +1476,7 @@ static s32 e1000_reset_hw_82575(struct e1000_hw *hw)
  *
  *  This inits the hardware readying it for operation.
  **/
-static s32 e1000_init_hw_82575(struct e1000_hw *hw)
+s32 e1000_init_hw_82575(struct e1000_hw *hw)
 {
 	struct e1000_mac_info *mac = &hw->mac;
 	s32 ret_val;
@@ -1985,7 +1995,7 @@ static s32 e1000_reset_init_script_82575(struct e1000_hw *hw)
  **/
 static s32 e1000_read_mac_addr_82575(struct e1000_hw *hw)
 {
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 
 	DEBUGFUNC("e1000_read_mac_addr_82575");
 
@@ -2478,11 +2488,17 @@ static s32 e1000_reset_hw_82580(struct e1000_hw *hw)
 		ctrl |= E1000_CTRL_RST;
 
 	E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
-	E1000_WRITE_FLUSH(hw);
 
-	/* Add delay to insure DEV_RST has time to complete */
-	if (global_device_reset)
-		msec_delay(5);
+	switch (hw->device_id) {
+	case E1000_DEV_ID_DH89XXCC_SGMII:
+		break;
+	default:
+		E1000_WRITE_FLUSH(hw);
+		break;
+	}
+
+	/* Add delay to insure DEV_RST or RST has time to complete */
+	msec_delay(5);
 
 	ret_val = e1000_get_auto_rd_done_generic(hw);
 	if (ret_val) {
@@ -2617,7 +2633,7 @@ s32 e1000_update_nvm_checksum_with_offset(struct e1000_hw *hw, u16 offset)
  **/
 static s32 e1000_validate_nvm_checksum_82580(struct e1000_hw *hw)
 {
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 	u16 eeprom_regions_count = 1;
 	u16 j, nvm_data;
 	u16 nvm_offset;
@@ -2757,7 +2773,7 @@ static s32 e1000_update_nvm_checksum_i350(struct e1000_hw *hw)
 static s32 __e1000_access_emi_reg(struct e1000_hw *hw, u16 address,
 				  u16 *data, bool read)
 {
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 
 	DEBUGFUNC("__e1000_access_emi_reg");
 
@@ -2786,6 +2802,95 @@ s32 e1000_read_emi_reg(struct e1000_hw *hw, u16 addr, u16 *data)
 	return __e1000_access_emi_reg(hw, addr, data, TRUE);
 }
 
+/**
+ *  e1000_initialize_M88E1512_phy - Initialize M88E1512 PHY
+ *  @hw: pointer to the HW structure
+ *
+ *  Initialize Marverl 1512 to work correctly with Avoton.
+ **/
+s32 e1000_initialize_M88E1512_phy(struct e1000_hw *hw)
+{
+	struct e1000_phy_info *phy = &hw->phy;
+	s32 ret_val = E1000_SUCCESS;
+
+	DEBUGFUNC("e1000_initialize_M88E1512_phy");
+
+	/* Check if this is correct PHY. */
+	if (phy->id != M88E1512_E_PHY_ID)
+		goto out;
+
+	/* Switch to PHY page 0xFF. */
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1543_PAGE_ADDR, 0x00FF);
+	if (ret_val)
+		goto out;
+
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1512_CFG_REG_2, 0x214B);
+	if (ret_val)
+		goto out;
+
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1512_CFG_REG_1, 0x2144);
+	if (ret_val)
+		goto out;
+
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1512_CFG_REG_2, 0x0C28);
+	if (ret_val)
+		goto out;
+
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1512_CFG_REG_1, 0x2146);
+	if (ret_val)
+		goto out;
+
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1512_CFG_REG_2, 0xB233);
+	if (ret_val)
+		goto out;
+
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1512_CFG_REG_1, 0x214D);
+	if (ret_val)
+		goto out;
+
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1512_CFG_REG_2, 0xCC0C);
+	if (ret_val)
+		goto out;
+
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1512_CFG_REG_1, 0x2159);
+	if (ret_val)
+		goto out;
+
+	/* Switch to PHY page 0xFB. */
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1543_PAGE_ADDR, 0x00FB);
+	if (ret_val)
+		goto out;
+
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1512_CFG_REG_3, 0x000D);
+	if (ret_val)
+		goto out;
+
+	/* Switch to PHY page 0x12. */
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1543_PAGE_ADDR, 0x12);
+	if (ret_val)
+		goto out;
+
+	/* Change mode to SGMII-to-Copper */
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1512_MODE, 0x8001);
+	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;
+
+	ret_val = phy->ops.commit(hw);
+	if (ret_val) {
+		DEBUGOUT("Error committing the PHY changes\n");
+		return ret_val;
+	}
+
+	msec_delay(1000);
+out:
+	return ret_val;
+}
+
 /**
  *  e1000_set_eee_i350 - Enable/disable EEE support
  *  @hw: pointer to the HW structure
@@ -2795,7 +2900,6 @@ s32 e1000_read_emi_reg(struct e1000_hw *hw, u16 addr, u16 *data)
  **/
 s32 e1000_set_eee_i350(struct e1000_hw *hw)
 {
-	s32 ret_val = E1000_SUCCESS;
 	u32 ipcnfg, eeer;
 
 	DEBUGFUNC("e1000_set_eee_i350");
@@ -2828,7 +2932,7 @@ s32 e1000_set_eee_i350(struct e1000_hw *hw)
 	E1000_READ_REG(hw, E1000_EEER);
 out:
 
-	return ret_val;
+	return E1000_SUCCESS;
 }
 
 /**
diff --git a/sys/dev/e1000/e1000_82575.h b/sys/dev/e1000/e1000_82575.h
index 9d8d3fc5a4d1..6569b98884d9 100644
--- a/sys/dev/e1000/e1000_82575.h
+++ b/sys/dev/e1000/e1000_82575.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -384,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		(1U << 31)
+#define E1000_ETQF_QUEUE_ENABLE		(1 << 31)
 /*
  * ETQF filter list: one static filter per filter consumer. This is
  *                   to avoid filter collisions later. Add new filters
@@ -411,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	(1U << 31)  /* global VF LB enable */
+#define E1000_DTXSWC_VMDQ_LOOPBACK_EN	(1 << 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
@@ -480,6 +480,7 @@ void e1000_vmdq_set_loopback_pf(struct e1000_hw *hw, bool enable);
 void e1000_vmdq_set_anti_spoofing_pf(struct e1000_hw *hw, bool enable, int pf);
 void e1000_vmdq_set_replication_pf(struct e1000_hw *hw, bool enable);
 s32 e1000_init_nvm_params_82575(struct e1000_hw *hw);
+s32  e1000_init_hw_82575(struct e1000_hw *hw);
 
 enum e1000_promisc_type {
 	e1000_promisc_disabled = 0,   /* all promisc modes disabled */
@@ -497,6 +498,7 @@ 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 *);
+s32 e1000_initialize_M88E1512_phy(struct e1000_hw *hw);
 
 /* 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 c1ca5fd51fb9..374ffa678e9c 100644
--- a/sys/dev/e1000/e1000_api.c
+++ b/sys/dev/e1000/e1000_api.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -293,6 +293,10 @@ s32 e1000_set_mac_type(struct e1000_hw *hw)
 	case E1000_DEV_ID_PCH_LPT_I217_V:
 	case E1000_DEV_ID_PCH_LPTLP_I218_LM:
 	case E1000_DEV_ID_PCH_LPTLP_I218_V:
+	case E1000_DEV_ID_PCH_I218_LM2:
+	case E1000_DEV_ID_PCH_I218_V2:
+	case E1000_DEV_ID_PCH_I218_LM3:
+	case E1000_DEV_ID_PCH_I218_V3:
 		mac->type = e1000_pch_lpt;
 		break;
 	case E1000_DEV_ID_82575EB_COPPER:
@@ -828,10 +832,12 @@ void e1000_config_collision_dist(struct e1000_hw *hw)
  *
  *  Sets a Receive Address Register (RAR) to the specified address.
  **/
-void e1000_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
+int e1000_rar_set(struct e1000_hw *hw, u8 *addr, u32 index)
 {
 	if (hw->mac.ops.rar_set)
-		hw->mac.ops.rar_set(hw, addr, index);
+		return hw->mac.ops.rar_set(hw, addr, index);
+
+	return E1000_SUCCESS;
 }
 
 /**
diff --git a/sys/dev/e1000/e1000_api.h b/sys/dev/e1000/e1000_api.h
index 69db1be90db9..a2ffa169367d 100644
--- a/sys/dev/e1000/e1000_api.h
+++ b/sys/dev/e1000/e1000_api.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -69,7 +69,7 @@ s32 e1000_setup_link(struct e1000_hw *hw);
 s32 e1000_get_speed_and_duplex(struct e1000_hw *hw, u16 *speed, u16 *duplex);
 s32 e1000_disable_pcie_master(struct e1000_hw *hw);
 void e1000_config_collision_dist(struct e1000_hw *hw);
-void e1000_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
+int e1000_rar_set(struct e1000_hw *hw, u8 *addr, u32 index);
 u32 e1000_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr);
 void e1000_update_mc_addr_list(struct e1000_hw *hw, u8 *mc_addr_list,
 			       u32 mc_addr_count);
diff --git a/sys/dev/e1000/e1000_defines.h b/sys/dev/e1000/e1000_defines.h
index 5573e5699b62..77589ed7cefe 100644
--- a/sys/dev/e1000/e1000_defines.h
+++ b/sys/dev/e1000/e1000_defines.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -77,6 +77,7 @@
 #define E1000_CTRL_EXT_EE_RST	0x00002000 /* Reinitialize from EEPROM */
 /* Physical Func Reset Done Indication */
 #define E1000_CTRL_EXT_PFRSTD	0x00004000
+#define E1000_CTRL_EXT_SDLPE	0X00040000  /* SerDes Low Power Enable */
 #define E1000_CTRL_EXT_SPD_BYPS	0x00008000 /* Speed Select Bypass */
 #define E1000_CTRL_EXT_RO_DIS	0x00020000 /* Relaxed Ordering disable */
 #define E1000_CTRL_EXT_DMA_DYN_CLK_EN	0x00080000 /* DMA Dynamic Clk Gating */
@@ -131,7 +132,7 @@
 #define E1000_RXD_ERR_RXE	0x80    /* Rx Data Error */
 #define E1000_RXD_SPC_VLAN_MASK	0x0FFF  /* VLAN ID is in lower 12 bits */
 
-#define E1000_RXDEXT_STATERR_TST	0x00010000 /* Time Stamp taken */
+#define E1000_RXDEXT_STATERR_TST	0x00000100 /* Time Stamp taken */
 #define E1000_RXDEXT_STATERR_LB		0x00040000
 #define E1000_RXDEXT_STATERR_CE		0x01000000
 #define E1000_RXDEXT_STATERR_SE		0x02000000
@@ -464,6 +465,7 @@
 
 #define ETHERNET_FCS_SIZE		4
 #define MAX_JUMBO_FRAME_SIZE		0x3F00
+#define E1000_TX_PTR_GAP		0x1F
 
 /* Extended Configuration Control and Size */
 #define E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP	0x00000020
@@ -853,6 +855,10 @@
 #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_M88E1512_CFG_REG_1	0x0010
+#define E1000_M88E1512_CFG_REG_2	0x0011
+#define E1000_M88E1512_CFG_REG_3	0x0007
+#define E1000_M88E1512_MODE		0x0014
 #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 */
@@ -1429,6 +1435,9 @@
 #define E1000_RXPBS_CFG_TS_EN		0x80000000 /* Timestamp in Rx buffer */
 #define E1000_RXPBS_SIZE_I210_MASK	0x0000003F /* Rx packet buffer size */
 #define E1000_TXPB0S_SIZE_I210_MASK	0x0000003F /* Tx packet buffer 0 size */
+#define I210_RXPBSIZE_DEFAULT		0x000000A2 /* RXPBSIZE default */
+#define I210_TXPBSIZE_DEFAULT		0x04000014 /* TXPBSIZE default */
+
 #define E1000_DOBFFCTL_OBFFTHR_MASK	0x000000FF /* OBFF threshold */
 #define E1000_DOBFFCTL_EXIT_ACT_MASK	0x01000000 /* Exit active CB */
 
@@ -1455,5 +1464,7 @@
 #define E1000_STATUS_LAN_ID_OFFSET	2
 #define E1000_VFTA_ENTRIES		128
 #define E1000_UNUSEDARG
+#ifndef ERROR_REPORT
 #define ERROR_REPORT(fmt)	do { } while (0)
+#endif /* ERROR_REPORT */
 #endif /* _E1000_DEFINES_H_ */
diff --git a/sys/dev/e1000/e1000_hw.h b/sys/dev/e1000/e1000_hw.h
index 8901ccd11a89..faf64a372abc 100644
--- a/sys/dev/e1000/e1000_hw.h
+++ b/sys/dev/e1000/e1000_hw.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -133,6 +133,10 @@ struct e1000_hw;
 #define E1000_DEV_ID_PCH_LPT_I217_V		0x153B
 #define E1000_DEV_ID_PCH_LPTLP_I218_LM		0x155A
 #define E1000_DEV_ID_PCH_LPTLP_I218_V		0x1559
+#define E1000_DEV_ID_PCH_I218_LM2		0x15A0
+#define E1000_DEV_ID_PCH_I218_V2		0x15A1
+#define E1000_DEV_ID_PCH_I218_LM3		0x15A2 /* Wildcat Point PCH */
+#define E1000_DEV_ID_PCH_I218_V3		0x15A3 /* Wildcat Point PCH */
 #define E1000_DEV_ID_82576			0x10C9
 #define E1000_DEV_ID_82576_FIBER		0x10E6
 #define E1000_DEV_ID_82576_SERDES		0x10E7
@@ -696,7 +700,7 @@ struct e1000_mac_operations {
 	s32  (*setup_led)(struct e1000_hw *);
 	void (*write_vfta)(struct e1000_hw *, u32, u32);
 	void (*config_collision_dist)(struct e1000_hw *);
-	void (*rar_set)(struct e1000_hw *, u8*, u32);
+	int  (*rar_set)(struct e1000_hw *, u8*, u32);
 	s32  (*read_mac_addr)(struct e1000_hw *);
 	s32  (*validate_mdi_setting)(struct e1000_hw *);
 	s32  (*set_obff_timer)(struct e1000_hw *, u32);
@@ -934,6 +938,13 @@ struct e1000_shadow_ram {
 
 #define E1000_SHADOW_RAM_WORDS		2048
 
+/* I218 PHY Ultra Low Power (ULP) states */
+enum e1000_ulp_state {
+	e1000_ulp_state_unknown,
+	e1000_ulp_state_off,
+	e1000_ulp_state_on,
+};
+
 struct e1000_dev_spec_ich8lan {
 	bool kmrn_lock_loss_workaround_enabled;
 	struct e1000_shadow_ram shadow_ram[E1000_SHADOW_RAM_WORDS];
@@ -942,6 +953,7 @@ struct e1000_dev_spec_ich8lan {
 	bool nvm_k1_enabled;
 	bool eee_disable;
 	u16 eee_lp_ability;
+	enum e1000_ulp_state ulp_state;
 };
 
 struct e1000_dev_spec_82575 {
diff --git a/sys/dev/e1000/e1000_i210.c b/sys/dev/e1000/e1000_i210.c
index 019e4a9b080b..f12c13f0cafc 100644
--- a/sys/dev/e1000/e1000_i210.c
+++ b/sys/dev/e1000/e1000_i210.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -536,7 +536,7 @@ s32 e1000_validate_nvm_checksum_i210(struct e1000_hw *hw)
  **/
 s32 e1000_update_nvm_checksum_i210(struct e1000_hw *hw)
 {
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 	u16 checksum = 0;
 	u16 i, nvm_data;
 
@@ -615,7 +615,7 @@ bool e1000_get_flash_presence_i210(struct e1000_hw *hw)
  **/
 s32 e1000_update_flash_i210(struct e1000_hw *hw)
 {
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 	u32 flup;
 
 	DEBUGFUNC("e1000_update_flash_i210");
@@ -671,7 +671,7 @@ s32 e1000_pool_flash_update_done_i210(struct e1000_hw *hw)
  **/
 static s32 e1000_init_nvm_params_i210(struct e1000_hw *hw)
 {
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 	struct e1000_nvm_info *nvm = &hw->nvm;
 
 	DEBUGFUNC("e1000_init_nvm_params_i210");
@@ -756,7 +756,7 @@ static s32 e1000_valid_led_default_i210(struct e1000_hw *hw, u16 *data)
 static s32 __e1000_access_xmdio_reg(struct e1000_hw *hw, u16 address,
 				    u8 dev_addr, u16 *data, bool read)
 {
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 
 	DEBUGFUNC("__e1000_access_xmdio_reg");
 
@@ -815,3 +815,90 @@ s32 e1000_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 data)
 
 	return __e1000_access_xmdio_reg(hw, addr, dev_addr, &data, FALSE);
 }
+
+/**
+ * e1000_pll_workaround_i210
+ * @hw: pointer to the HW structure
+ *
+ * Works around an errata in the PLL circuit where it occasionally
+ * provides the wrong clock frequency after power up.
+ **/
+static s32 e1000_pll_workaround_i210(struct e1000_hw *hw)
+{
+	s32 ret_val;
+	u32 wuc, mdicnfg, ctrl, ctrl_ext, reg_val;
+	u16 nvm_word, phy_word, pci_word, tmp_nvm;
+	int i;
+
+	/* Get and set needed register values */
+	wuc = E1000_READ_REG(hw, E1000_WUC);
+	mdicnfg = E1000_READ_REG(hw, E1000_MDICNFG);
+	reg_val = mdicnfg & ~E1000_MDICNFG_EXT_MDIO;
+	E1000_WRITE_REG(hw, E1000_MDICNFG, reg_val);
+
+	/* Get data from NVM, or set default */
+	ret_val = e1000_read_invm_word_i210(hw, E1000_INVM_AUTOLOAD,
+					    &nvm_word);
+	if (ret_val != E1000_SUCCESS)
+		nvm_word = E1000_INVM_DEFAULT_AL;
+	tmp_nvm = nvm_word | E1000_INVM_PLL_WO_VAL;
+	for (i = 0; i < E1000_MAX_PLL_TRIES; i++) {
+		/* check current state directly from internal PHY */
+		e1000_read_phy_reg_gs40g(hw, (E1000_PHY_PLL_FREQ_PAGE |
+					 E1000_PHY_PLL_FREQ_REG), &phy_word);
+		if ((phy_word & E1000_PHY_PLL_UNCONF)
+		    != E1000_PHY_PLL_UNCONF) {
+			ret_val = E1000_SUCCESS;
+			break;
+		} else {
+			ret_val = -E1000_ERR_PHY;
+		}
+		/* directly reset the internal PHY */
+		ctrl = E1000_READ_REG(hw, E1000_CTRL);
+		E1000_WRITE_REG(hw, E1000_CTRL, ctrl|E1000_CTRL_PHY_RST);
+
+		ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
+		ctrl_ext |= (E1000_CTRL_EXT_PHYPDEN | E1000_CTRL_EXT_SDLPE);
+		E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);
+
+		E1000_WRITE_REG(hw, E1000_WUC, 0);
+		reg_val = (E1000_INVM_AUTOLOAD << 4) | (tmp_nvm << 16);
+		E1000_WRITE_REG(hw, E1000_EEARBC_I210, reg_val);
+
+		e1000_read_pci_cfg(hw, E1000_PCI_PMCSR, &pci_word);
+		pci_word |= E1000_PCI_PMCSR_D3;
+		e1000_write_pci_cfg(hw, E1000_PCI_PMCSR, &pci_word);
+		msec_delay(1);
+		pci_word &= ~E1000_PCI_PMCSR_D3;
+		e1000_write_pci_cfg(hw, E1000_PCI_PMCSR, &pci_word);
+		reg_val = (E1000_INVM_AUTOLOAD << 4) | (nvm_word << 16);
+		E1000_WRITE_REG(hw, E1000_EEARBC_I210, reg_val);
+
+		/* restore WUC register */
+		E1000_WRITE_REG(hw, E1000_WUC, wuc);
+	}
+	/* restore MDICNFG setting */
+	E1000_WRITE_REG(hw, E1000_MDICNFG, mdicnfg);
+	return ret_val;
+}
+
+/**
+ *  e1000_init_hw_i210 - Init hw for I210/I211
+ *  @hw: pointer to the HW structure
+ *
+ *  Called to initialize hw for i210 hw family.
+ **/
+s32 e1000_init_hw_i210(struct e1000_hw *hw)
+{
+	s32 ret_val;
+
+	DEBUGFUNC("e1000_init_hw_i210");
+	if ((hw->mac.type >= e1000_i210) &&
+	    !(e1000_get_flash_presence_i210(hw))) {
+		ret_val = e1000_pll_workaround_i210(hw);
+		if (ret_val != E1000_SUCCESS)
+			return ret_val;
+	}
+	ret_val = e1000_init_hw_82575(hw);
+	return ret_val;
+}
diff --git a/sys/dev/e1000/e1000_i210.h b/sys/dev/e1000/e1000_i210.h
index d8de1bd730ff..2a20ca1e6e34 100644
--- a/sys/dev/e1000/e1000_i210.h
+++ b/sys/dev/e1000/e1000_i210.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -49,6 +49,7 @@ 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);
+s32 e1000_init_hw_i210(struct e1000_hw *hw);
 
 #define E1000_STM_OPCODE		0xDB00
 #define E1000_EEPROM_FLASH_SIZE_WORD	0x11
@@ -93,4 +94,16 @@ enum E1000_INVM_STRUCTURE_TYPE {
 #define NVM_INIT_CTRL_4_DEFAULT_I211	0x00C1
 #define NVM_LED_1_CFG_DEFAULT_I211	0x0184
 #define NVM_LED_0_2_CFG_DEFAULT_I211	0x200C
+
+/* PLL Defines */
+#define E1000_PCI_PMCSR			0x44
+#define E1000_PCI_PMCSR_D3		0x03
+#define E1000_MAX_PLL_TRIES		5
+#define E1000_PHY_PLL_UNCONF		0xFF
+#define E1000_PHY_PLL_FREQ_PAGE		0xFC0000
+#define E1000_PHY_PLL_FREQ_REG		0x000E
+#define E1000_INVM_DEFAULT_AL		0x202F
+#define E1000_INVM_AUTOLOAD		0x0A
+#define E1000_INVM_PLL_WO_VAL		0x0010
+
 #endif
diff --git a/sys/dev/e1000/e1000_ich8lan.c b/sys/dev/e1000/e1000_ich8lan.c
index 81772263290b..204c39caba51 100644
--- a/sys/dev/e1000/e1000_ich8lan.c
+++ b/sys/dev/e1000/e1000_ich8lan.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -63,6 +63,10 @@
  * Ethernet Connection I217-V
  * Ethernet Connection I218-V
  * Ethernet Connection I218-LM
+ * Ethernet Connection (2) I218-LM
+ * Ethernet Connection (2) I218-V
+ * Ethernet Connection (3) I218-LM
+ * Ethernet Connection (3) I218-V
  */
 
 #include "e1000_api.h"
@@ -73,8 +77,8 @@ static s32  e1000_acquire_nvm_ich8lan(struct e1000_hw *hw);
 static void e1000_release_nvm_ich8lan(struct e1000_hw *hw);
 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 int  e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index);
+static int  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,
@@ -250,7 +254,7 @@ static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw)
  *  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)
+static void e1000_toggle_lanphypc_pch_lpt(struct e1000_hw *hw)
 {
 	u32 mac_reg;
 
@@ -306,6 +310,12 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
 	 */
 	e1000_gate_hw_phy_config_ich8lan(hw, TRUE);
 
+	/* It is not possible to be certain of the current state of ULP
+	 * so forcibly disable it.
+	 */
+	hw->dev_spec.ich8lan.ulp_state = e1000_ulp_state_unknown;
+	e1000_disable_ulp_lpt_lp(hw, TRUE);
+
 	ret_val = hw->phy.ops.acquire(hw);
 	if (ret_val) {
 		DEBUGOUT("Failed to initialize PHY flow\n");
@@ -611,13 +621,12 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
 	DEBUGFUNC("e1000_init_nvm_params_ich8lan");
 
 	/* Can't read flash registers if the register set isn't mapped. */
+	nvm->type = e1000_nvm_flash_sw;
 	if (!hw->flash_address) {
 		DEBUGOUT("ERROR: Flash registers not mapped\n");
 		return -E1000_ERR_CONFIG;
 	}
 
-	nvm->type = e1000_nvm_flash_sw;
-
 	gfpreg = E1000_READ_FLASH_REG(hw, ICH_FLASH_GFPREG);
 
 	/* sector_X_addr is a "sector"-aligned address (4096 bytes)
@@ -672,6 +681,9 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
 static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
 {
 	struct e1000_mac_info *mac = &hw->mac;
+#if defined(QV_RELEASE) || !defined(NO_PCH_LPT_B0_SUPPORT)
+	u16 pci_cfg;
+#endif /* QV_RELEASE || !defined(NO_PCH_LPT_B0_SUPPORT) */
 
 	DEBUGFUNC("e1000_init_mac_params_ich8lan");
 
@@ -744,6 +756,11 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw)
 		mac->ops.update_mc_addr_list =
 			e1000_update_mc_addr_list_pch2lan;
 	case e1000_pchlan:
+#if defined(QV_RELEASE) || !defined(NO_PCH_LPT_B0_SUPPORT)
+		/* save PCH revision_id */
+		e1000_read_pci_cfg(hw, E1000_PCI_REVISION_ID_REG, &pci_cfg);
+		hw->revision_id = (u8)(pci_cfg &= 0x000F);
+#endif /* QV_RELEASE || !defined(NO_PCH_LPT_B0_SUPPORT) */
 		/* check management mode */
 		mac->ops.check_mng_mode = e1000_check_mng_mode_pchlan;
 		/* ID LED init */
@@ -915,6 +932,17 @@ s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
 		}
 	}
 
+	if (hw->phy.type == e1000_phy_82579) {
+		ret_val = e1000_read_emi_reg_locked(hw, I82579_LPI_PLL_SHUT,
+						    &data);
+		if (ret_val)
+			goto release;
+
+		data &= ~I82579_LPI_100_PLL_SHUT;
+		ret_val = e1000_write_emi_reg_locked(hw, I82579_LPI_PLL_SHUT,
+						     data);
+	}
+
 	/* 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)
@@ -1178,6 +1206,256 @@ static s32 e1000_set_obff_timer_pch_lpt(struct e1000_hw *hw, u32 itr)
 	return E1000_SUCCESS;
 }
 
+/**
+ *  e1000_enable_ulp_lpt_lp - configure Ultra Low Power mode for LynxPoint-LP
+ *  @hw: pointer to the HW structure
+ *  @to_sx: boolean indicating a system power state transition to Sx
+ *
+ *  When link is down, configure ULP mode to significantly reduce the power
+ *  to the PHY.  If on a Manageability Engine (ME) enabled system, tell the
+ *  ME firmware to start the ULP configuration.  If not on an ME enabled
+ *  system, configure the ULP mode by software.
+ */
+s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx)
+{
+	u32 mac_reg;
+	s32 ret_val = E1000_SUCCESS;
+	u16 phy_reg;
+
+	if ((hw->mac.type < e1000_pch_lpt) ||
+	    (hw->device_id == E1000_DEV_ID_PCH_LPT_I217_LM) ||
+	    (hw->device_id == E1000_DEV_ID_PCH_LPT_I217_V) ||
+	    (hw->device_id == E1000_DEV_ID_PCH_I218_LM2) ||
+	    (hw->device_id == E1000_DEV_ID_PCH_I218_V2) ||
+	    (hw->dev_spec.ich8lan.ulp_state == e1000_ulp_state_on))
+		return 0;
+
+	if (E1000_READ_REG(hw, E1000_FWSM) & E1000_ICH_FWSM_FW_VALID) {
+		/* Request ME configure ULP mode in the PHY */
+		mac_reg = E1000_READ_REG(hw, E1000_H2ME);
+		mac_reg |= E1000_H2ME_ULP | E1000_H2ME_ENFORCE_SETTINGS;
+		E1000_WRITE_REG(hw, E1000_H2ME, mac_reg);
+
+		goto out;
+	}
+
+	if (!to_sx) {
+		int i = 0;
+
+		/* Poll up to 5 seconds for Cable Disconnected indication */
+		while (!(E1000_READ_REG(hw, E1000_FEXT) &
+			 E1000_FEXT_PHY_CABLE_DISCONNECTED)) {
+			/* Bail if link is re-acquired */
+			if (E1000_READ_REG(hw, E1000_STATUS) & E1000_STATUS_LU)
+				return -E1000_ERR_PHY;
+
+			if (i++ == 100)
+				break;
+
+			msec_delay(50);
+		}
+		DEBUGOUT2("CABLE_DISCONNECTED %s set after %dmsec\n",
+			 (E1000_READ_REG(hw, E1000_FEXT) &
+			  E1000_FEXT_PHY_CABLE_DISCONNECTED) ? "" : "not",
+			 i * 50);
+	}
+
+	ret_val = hw->phy.ops.acquire(hw);
+	if (ret_val)
+		goto out;
+
+	/* Force SMBus mode in PHY */
+	ret_val = e1000_read_phy_reg_hv_locked(hw, CV_SMB_CTRL, &phy_reg);
+	if (ret_val)
+		goto release;
+	phy_reg |= CV_SMB_CTRL_FORCE_SMBUS;
+	e1000_write_phy_reg_hv_locked(hw, CV_SMB_CTRL, phy_reg);
+
+	/* Force 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);
+
+	/* Set Inband ULP Exit, Reset to SMBus mode and
+	 * Disable SMBus Release on PERST# in PHY
+	 */
+	ret_val = e1000_read_phy_reg_hv_locked(hw, I218_ULP_CONFIG1, &phy_reg);
+	if (ret_val)
+		goto release;
+	phy_reg |= (I218_ULP_CONFIG1_RESET_TO_SMBUS |
+		    I218_ULP_CONFIG1_DISABLE_SMB_PERST);
+	if (to_sx) {
+		if (E1000_READ_REG(hw, E1000_WUFC) & E1000_WUFC_LNKC)
+			phy_reg |= I218_ULP_CONFIG1_WOL_HOST;
+
+		phy_reg |= I218_ULP_CONFIG1_STICKY_ULP;
+	} else {
+		phy_reg |= I218_ULP_CONFIG1_INBAND_EXIT;
+	}
+	e1000_write_phy_reg_hv_locked(hw, I218_ULP_CONFIG1, phy_reg);
+
+	/* Set Disable SMBus Release on PERST# in MAC */
+	mac_reg = E1000_READ_REG(hw, E1000_FEXTNVM7);
+	mac_reg |= E1000_FEXTNVM7_DISABLE_SMB_PERST;
+	E1000_WRITE_REG(hw, E1000_FEXTNVM7, mac_reg);
+
+	/* Commit ULP changes in PHY by starting auto ULP configuration */
+	phy_reg |= I218_ULP_CONFIG1_START;
+	e1000_write_phy_reg_hv_locked(hw, I218_ULP_CONFIG1, phy_reg);
+release:
+	hw->phy.ops.release(hw);
+out:
+	if (ret_val)
+		DEBUGOUT1("Error in ULP enable flow: %d\n", ret_val);
+	else
+		hw->dev_spec.ich8lan.ulp_state = e1000_ulp_state_on;
+
+	return ret_val;
+}
+
+/**
+ *  e1000_disable_ulp_lpt_lp - unconfigure Ultra Low Power mode for LynxPoint-LP
+ *  @hw: pointer to the HW structure
+ *  @force: boolean indicating whether or not to force disabling ULP
+ *
+ *  Un-configure ULP mode when link is up, the system is transitioned from
+ *  Sx or the driver is unloaded.  If on a Manageability Engine (ME) enabled
+ *  system, poll for an indication from ME that ULP has been un-configured.
+ *  If not on an ME enabled system, un-configure the ULP mode by software.
+ *
+ *  During nominal operation, this function is called when link is acquired
+ *  to disable ULP mode (force=FALSE); otherwise, for example when unloading
+ *  the driver or during Sx->S0 transitions, this is called with force=TRUE
+ *  to forcibly disable ULP.
+ */
+s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
+{
+	s32 ret_val = E1000_SUCCESS;
+	u32 mac_reg;
+	u16 phy_reg;
+	int i = 0;
+
+	if ((hw->mac.type < e1000_pch_lpt) ||
+	    (hw->device_id == E1000_DEV_ID_PCH_LPT_I217_LM) ||
+	    (hw->device_id == E1000_DEV_ID_PCH_LPT_I217_V) ||
+	    (hw->device_id == E1000_DEV_ID_PCH_I218_LM2) ||
+	    (hw->device_id == E1000_DEV_ID_PCH_I218_V2) ||
+	    (hw->dev_spec.ich8lan.ulp_state == e1000_ulp_state_off))
+		return 0;
+
+	if (E1000_READ_REG(hw, E1000_FWSM) & E1000_ICH_FWSM_FW_VALID) {
+		if (force) {
+			/* Request ME un-configure ULP mode in the PHY */
+			mac_reg = E1000_READ_REG(hw, E1000_H2ME);
+			mac_reg &= ~E1000_H2ME_ULP;
+			mac_reg |= E1000_H2ME_ENFORCE_SETTINGS;
+			E1000_WRITE_REG(hw, E1000_H2ME, mac_reg);
+		}
+
+		/* Poll up to 100msec for ME to clear ULP_CFG_DONE */
+		while (E1000_READ_REG(hw, E1000_FWSM) &
+		       E1000_FWSM_ULP_CFG_DONE) {
+			if (i++ == 10) {
+				ret_val = -E1000_ERR_PHY;
+				goto out;
+			}
+
+			msec_delay(10);
+		}
+		DEBUGOUT1("ULP_CONFIG_DONE cleared after %dmsec\n", i * 10);
+
+		if (force) {
+			mac_reg = E1000_READ_REG(hw, E1000_H2ME);
+			mac_reg &= ~E1000_H2ME_ENFORCE_SETTINGS;
+			E1000_WRITE_REG(hw, E1000_H2ME, mac_reg);
+		} else {
+			/* Clear H2ME.ULP after ME ULP configuration */
+			mac_reg = E1000_READ_REG(hw, E1000_H2ME);
+			mac_reg &= ~E1000_H2ME_ULP;
+			E1000_WRITE_REG(hw, E1000_H2ME, mac_reg);
+		}
+
+		goto out;
+	}
+
+	ret_val = hw->phy.ops.acquire(hw);
+	if (ret_val)
+		goto out;
+
+	if (force)
+		/* Toggle LANPHYPC Value bit */
+		e1000_toggle_lanphypc_pch_lpt(hw);
+
+	/* Unforce SMBus mode in PHY */
+	ret_val = e1000_read_phy_reg_hv_locked(hw, CV_SMB_CTRL, &phy_reg);
+	if (ret_val) {
+		/* The MAC might be in PCIe mode, so temporarily force to
+		 * SMBus mode in order to access the PHY.
+		 */
+		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);
+
+		msec_delay(50);
+
+		ret_val = e1000_read_phy_reg_hv_locked(hw, CV_SMB_CTRL,
+						       &phy_reg);
+		if (ret_val)
+			goto release;
+	}
+	phy_reg &= ~CV_SMB_CTRL_FORCE_SMBUS;
+	e1000_write_phy_reg_hv_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);
+
+	/* When ULP mode was previously entered, K1 was disabled by the
+	 * hardware.  Re-Enable K1 in the PHY when exiting ULP.
+	 */
+	ret_val = e1000_read_phy_reg_hv_locked(hw, HV_PM_CTRL, &phy_reg);
+	if (ret_val)
+		goto release;
+	phy_reg |= HV_PM_CTRL_K1_ENABLE;
+	e1000_write_phy_reg_hv_locked(hw, HV_PM_CTRL, phy_reg);
+
+	/* Clear ULP enabled configuration */
+	ret_val = e1000_read_phy_reg_hv_locked(hw, I218_ULP_CONFIG1, &phy_reg);
+	if (ret_val)
+		goto release;
+		phy_reg &= ~(I218_ULP_CONFIG1_IND |
+			     I218_ULP_CONFIG1_STICKY_ULP |
+			     I218_ULP_CONFIG1_RESET_TO_SMBUS |
+			     I218_ULP_CONFIG1_WOL_HOST |
+			     I218_ULP_CONFIG1_INBAND_EXIT |
+			     I218_ULP_CONFIG1_DISABLE_SMB_PERST);
+		e1000_write_phy_reg_hv_locked(hw, I218_ULP_CONFIG1, phy_reg);
+
+		/* Commit ULP changes by starting auto ULP configuration */
+		phy_reg |= I218_ULP_CONFIG1_START;
+		e1000_write_phy_reg_hv_locked(hw, I218_ULP_CONFIG1, phy_reg);
+
+		/* Clear Disable SMBus Release on PERST# in MAC */
+		mac_reg = E1000_READ_REG(hw, E1000_FEXTNVM7);
+		mac_reg &= ~E1000_FEXTNVM7_DISABLE_SMB_PERST;
+		E1000_WRITE_REG(hw, E1000_FEXTNVM7, mac_reg);
+
+release:
+	hw->phy.ops.release(hw);
+	if (force) {
+		hw->phy.ops.reset(hw);
+		msec_delay(50);
+	}
+out:
+	if (ret_val)
+		DEBUGOUT1("Error in ULP disable flow: %d\n", ret_val);
+	else
+		hw->dev_spec.ich8lan.ulp_state = e1000_ulp_state_off;
+
+	return ret_val;
+}
+
 /**
  *  e1000_check_for_copper_link_ich8lan - Check for link (Copper)
  *  @hw: pointer to the HW structure
@@ -1217,14 +1495,17 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
 			return ret_val;
 	}
 
-	/* When connected at 10Mbps half-duplex, 82579 parts are excessively
+	/* When connected at 10Mbps half-duplex, some parts are excessively
 	 * aggressive resulting in many collisions. To avoid this, increase
 	 * the IPG and reduce Rx latency in the PHY.
 	 */
-	if ((hw->mac.type == e1000_pch2lan) && link) {
+	if (((hw->mac.type == e1000_pch2lan) ||
+	     (hw->mac.type == e1000_pch_lpt)) && link) {
 		u32 reg;
 		reg = E1000_READ_REG(hw, E1000_STATUS);
 		if (!(reg & (E1000_STATUS_FD | E1000_STATUS_SPEED_MASK))) {
+			u16 emi_addr;
+
 			reg = E1000_READ_REG(hw, E1000_TIPG);
 			reg &= ~E1000_TIPG_IPGT_MASK;
 			reg |= 0xFF;
@@ -1235,7 +1516,11 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
 			if (ret_val)
 				return ret_val;
 
-			ret_val = e1000_write_emi_reg_locked(hw, I82579_RX_CONFIG, 0);
+			if (hw->mac.type == e1000_pch2lan)
+				emi_addr = I82579_RX_CONFIG;
+			else
+				emi_addr = I217_RX_CONFIG;
+			ret_val = e1000_write_emi_reg_locked(hw, emi_addr, 0);
 
 			hw->phy.ops.release(hw);
 
@@ -1246,12 +1531,13 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
 
 	/* Work-around I218 hang issue */
 	if ((hw->device_id == E1000_DEV_ID_PCH_LPTLP_I218_LM) ||
-	    (hw->device_id == E1000_DEV_ID_PCH_LPTLP_I218_V)) {
+	    (hw->device_id == E1000_DEV_ID_PCH_LPTLP_I218_V) ||
+	    (hw->device_id == E1000_DEV_ID_PCH_I218_LM3) ||
+	    (hw->device_id == E1000_DEV_ID_PCH_I218_V3)) {
 		ret_val = e1000_k1_workaround_lpt_lp(hw, link);
 		if (ret_val)
 			return ret_val;
 	}
-
 	if (hw->mac.type == e1000_pch_lpt) {
 		/* Set platform power management values for
 		 * Latency Tolerance Reporting (LTR)
@@ -1499,9 +1785,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));
 }
 
 /**
@@ -1535,7 +1821,7 @@ static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw)
  *  contain the MAC address but RAR[1-6] are reserved for manageability (ME).
  *  Use SHRA[0-3] in place of those reserved for ME.
  **/
-static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
+static int e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
 {
 	u32 rar_low, rar_high;
 
@@ -1559,13 +1845,13 @@ static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
 		E1000_WRITE_FLUSH(hw);
 		E1000_WRITE_REG(hw, E1000_RAH(index), rar_high);
 		E1000_WRITE_FLUSH(hw);
-		return;
+		return E1000_SUCCESS;
 	}
 
 	/* 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)) {
+	if (index < (u32) (hw->mac.rar_entry_count)) {
 		s32 ret_val;
 
 		ret_val = e1000_acquire_swflag_ich8lan(hw);
@@ -1582,7 +1868,7 @@ static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
 		/* verify the register updates */
 		if ((E1000_READ_REG(hw, E1000_SHRAL(index - 1)) == rar_low) &&
 		    (E1000_READ_REG(hw, E1000_SHRAH(index - 1)) == rar_high))
-			return;
+			return E1000_SUCCESS;
 
 		DEBUGOUT2("SHRA[%d] might be locked by ME - FWSM=0x%8.8x\n",
 			 (index - 1), E1000_READ_REG(hw, E1000_FWSM));
@@ -1590,6 +1876,7 @@ static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
 
 out:
 	DEBUGOUT1("Failed to write receive address at index %d\n", index);
+	return -E1000_ERR_CONFIG;
 }
 
 /**
@@ -1603,7 +1890,7 @@ static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
  *  contain the MAC address. SHRA[0-10] are the shared receive address
  *  registers that are shared between the Host and manageability engine (ME).
  **/
-static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index)
+static int e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index)
 {
 	u32 rar_low, rar_high;
 	u32 wlock_mac;
@@ -1627,7 +1914,7 @@ static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index)
 		E1000_WRITE_FLUSH(hw);
 		E1000_WRITE_REG(hw, E1000_RAH(index), rar_high);
 		E1000_WRITE_FLUSH(hw);
-		return;
+		return E1000_SUCCESS;
 	}
 
 	/* The manageability engine (ME) can lock certain SHRAR registers that
@@ -1662,12 +1949,13 @@ static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index)
 			/* verify the register updates */
 			if ((E1000_READ_REG(hw, E1000_SHRAL_PCH_LPT(index - 1)) == rar_low) &&
 			    (E1000_READ_REG(hw, E1000_SHRAH_PCH_LPT(index - 1)) == rar_high))
-				return;
+				return E1000_SUCCESS;
 		}
 	}
 
 out:
 	DEBUGOUT1("Failed to write receive address at index %d\n", index);
+	return -E1000_ERR_CONFIG;
 }
 
 /**
@@ -2377,7 +2665,7 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
 			return ret_val;
 		hw->phy.ops.read_reg(hw, PHY_REG(776, 20), &data);
 		data &= ~(0x3FF << 2);
-		data |= (0x1A << 2);
+		data |= (E1000_TX_PTR_GAP << 2);
 		ret_val = hw->phy.ops.write_reg(hw, PHY_REG(776, 20), data);
 		if (ret_val)
 			return ret_val;
@@ -2491,55 +2779,47 @@ static s32 e1000_lv_phy_workarounds_ich8lan(struct e1000_hw *hw)
  *  e1000_k1_gig_workaround_lv - K1 Si workaround
  *  @hw:   pointer to the HW structure
  *
- *  Workaround to set the K1 beacon duration for 82579 parts
+ *  Workaround to set the K1 beacon duration for 82579 parts in 10Mbps
+ *  Disable K1 for 1000 and 100 speeds
  **/
 static s32 e1000_k1_workaround_lv(struct e1000_hw *hw)
 {
 	s32 ret_val = E1000_SUCCESS;
 	u16 status_reg = 0;
-	u32 mac_reg;
-	u16 phy_reg;
 
 	DEBUGFUNC("e1000_k1_workaround_lv");
 
 	if (hw->mac.type != e1000_pch2lan)
 		return E1000_SUCCESS;
 
-	/* Set K1 beacon duration based on 1Gbps speed or otherwise */
+	/* Set K1 beacon duration based on 10Mbs speed */
 	ret_val = hw->phy.ops.read_reg(hw, HV_M_STATUS, &status_reg);
 	if (ret_val)
 		return ret_val;
 
 	if ((status_reg & (HV_M_STATUS_LINK_UP | HV_M_STATUS_AUTONEG_COMPLETE))
 	    == (HV_M_STATUS_LINK_UP | HV_M_STATUS_AUTONEG_COMPLETE)) {
-		mac_reg = E1000_READ_REG(hw, E1000_FEXTNVM4);
-		mac_reg &= ~E1000_FEXTNVM4_BEACON_DURATION_MASK;
-
-		ret_val = hw->phy.ops.read_reg(hw, I82579_LPI_CTRL, &phy_reg);
-		if (ret_val)
-			return ret_val;
-
-		if (status_reg & HV_M_STATUS_SPEED_1000) {
+		if (status_reg &
+		    (HV_M_STATUS_SPEED_1000 | HV_M_STATUS_SPEED_100)) {
 			u16 pm_phy_reg;
 
-			mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_8USEC;
-			phy_reg &= ~I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT;
-			/* LV 1G Packet drop issue wa  */
+			/* LV 1G/100 Packet drop issue wa  */
 			ret_val = hw->phy.ops.read_reg(hw, HV_PM_CTRL,
 						       &pm_phy_reg);
 			if (ret_val)
 				return ret_val;
-			pm_phy_reg &= ~HV_PM_CTRL_PLL_STOP_IN_K1_GIGA;
+			pm_phy_reg &= ~HV_PM_CTRL_K1_ENABLE;
 			ret_val = hw->phy.ops.write_reg(hw, HV_PM_CTRL,
 							pm_phy_reg);
 			if (ret_val)
 				return ret_val;
 		} else {
+			u32 mac_reg;
+			mac_reg = E1000_READ_REG(hw, E1000_FEXTNVM4);
+			mac_reg &= ~E1000_FEXTNVM4_BEACON_DURATION_MASK;
 			mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_16USEC;
-			phy_reg |= I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT;
+			E1000_WRITE_REG(hw, E1000_FEXTNVM4, mac_reg);
 		}
-		E1000_WRITE_REG(hw, E1000_FEXTNVM4, mac_reg);
-		ret_val = hw->phy.ops.write_reg(hw, I82579_LPI_CTRL, phy_reg);
 	}
 
 	return ret_val;
@@ -3076,7 +3356,6 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
 	/* Clear FCERR and DAEL in hw status by writing 1 */
 	hsfsts.hsf_status.flcerr = 1;
 	hsfsts.hsf_status.dael = 1;
-
 	E1000_WRITE_FLASH_REG16(hw, ICH_FLASH_HSFSTS, hsfsts.regval);
 
 	/* Either we should have a hardware SPI cycle in progress
@@ -3143,6 +3422,7 @@ static s32 e1000_flash_cycle_ich8lan(struct e1000_hw *hw, u32 timeout)
 	/* Start a cycle by writing 1 in Flash Cycle Go in Hw Flash Control */
 	hsflctl.regval = E1000_READ_FLASH_REG16(hw, ICH_FLASH_HSFCTL);
 	hsflctl.hsf_ctrl.flcgo = 1;
+
 	E1000_WRITE_FLASH_REG16(hw, ICH_FLASH_HSFCTL, hsflctl.regval);
 
 	/* wait till FDONE bit is set to 1 */
@@ -3197,6 +3477,7 @@ static s32 e1000_read_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,
 	u16 word = 0;
 
 	ret_val = e1000_read_flash_data_ich8lan(hw, offset, 1, &word);
+
 	if (ret_val)
 		return ret_val;
 
@@ -3228,7 +3509,6 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 
 	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);
 
@@ -3238,18 +3518,16 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 		ret_val = e1000_flash_cycle_init_ich8lan(hw);
 		if (ret_val != E1000_SUCCESS)
 			break;
-
 		hsflctl.regval = E1000_READ_FLASH_REG16(hw, ICH_FLASH_HSFCTL);
+
 		/* 0b/1b corresponds to 1 or 2 byte size, respectively. */
 		hsflctl.hsf_ctrl.fldbcount = size - 1;
 		hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_READ;
 		E1000_WRITE_FLASH_REG16(hw, ICH_FLASH_HSFCTL, hsflctl.regval);
-
 		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
@@ -3284,6 +3562,7 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 	return ret_val;
 }
 
+
 /**
  *  e1000_write_nvm_ich8lan - Write word(s) to the NVM
  *  @hw: pointer to the HW structure
@@ -3337,7 +3616,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 	struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
 	u32 i, act_offset, new_bank_offset, old_bank_offset, bank;
 	s32 ret_val;
-	u16 data;
+	u16 data = 0;
 
 	DEBUGFUNC("e1000_update_nvm_checksum_ich8lan");
 
@@ -3373,12 +3652,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 		if (ret_val)
 			goto release;
 	}
-
 	for (i = 0; i < E1000_SHADOW_RAM_WORDS; i++) {
-		/* Determine whether to write the value stored
-		 * in the other NVM bank or a modified value stored
-		 * in the shadow RAM
-		 */
 		if (dev_spec->shadow_ram[i].modified) {
 			data = dev_spec->shadow_ram[i].value;
 		} else {
@@ -3388,7 +3662,6 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 			if (ret_val)
 				break;
 		}
-
 		/* If the word is 0x13, then make sure the signature bits
 		 * (15:14) are 11b until the commit has completed.
 		 * This will allow us to write 10b which indicates the
@@ -3403,6 +3676,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 		act_offset = (i + new_bank_offset) << 1;
 
 		usec_delay(100);
+
 		/* Write the bytes to the new bank. */
 		ret_val = e1000_retry_write_flash_byte_ich8lan(hw,
 							       act_offset,
@@ -3416,7 +3690,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 							  (u8)(data >> 8));
 		if (ret_val)
 			break;
-	}
+	 }
 
 	/* Don't bother writing the segment valid bits if sector
 	 * programming failed.
@@ -3437,8 +3711,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 		goto release;
 
 	data &= 0xBFFF;
-	ret_val = e1000_retry_write_flash_byte_ich8lan(hw,
-						       act_offset * 2 + 1,
+	ret_val = e1000_retry_write_flash_byte_ich8lan(hw, act_offset * 2 + 1,
 						       (u8)(data >> 8));
 	if (ret_val)
 		goto release;
@@ -3449,7 +3722,9 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)
 	 * to 1's. We can write 1's to 0's without an erase
 	 */
 	act_offset = (old_bank_offset + E1000_ICH_NVM_SIG_WORD) * 2 + 1;
+
 	ret_val = e1000_retry_write_flash_byte_ich8lan(hw, act_offset, 0);
+
 	if (ret_val)
 		goto release;
 
@@ -3548,8 +3823,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 
 	DEBUGFUNC("e1000_write_ich8_data");
 
-	if (size < 1 || size > 2 || data > size * 0xff ||
-	    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) +
@@ -3561,8 +3835,8 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 		ret_val = e1000_flash_cycle_init_ich8lan(hw);
 		if (ret_val != E1000_SUCCESS)
 			break;
-
 		hsflctl.regval = E1000_READ_FLASH_REG16(hw, ICH_FLASH_HSFCTL);
+
 		/* 0b/1b corresponds to 1 or 2 byte size, respectively. */
 		hsflctl.hsf_ctrl.fldbcount = size - 1;
 		hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_WRITE;
@@ -3604,6 +3878,7 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 	return ret_val;
 }
 
+
 /**
  *  e1000_write_flash_byte_ich8lan - Write a single byte to NVM
  *  @hw: pointer to the HW structure
@@ -3622,6 +3897,8 @@ static s32 e1000_write_flash_byte_ich8lan(struct e1000_hw *hw, u32 offset,
 	return e1000_write_flash_data_ich8lan(hw, offset, 1, word);
 }
 
+
+
 /**
  *  e1000_retry_write_flash_byte_ich8lan - Writes a single byte to NVM
  *  @hw: pointer to the HW structure
@@ -3730,8 +4007,9 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
 			/* Write a value 11 (block Erase) in Flash
 			 * Cycle field in hw flash control
 			 */
-			hsflctl.regval = E1000_READ_FLASH_REG16(hw,
-							      ICH_FLASH_HSFCTL);
+			hsflctl.regval =
+			    E1000_READ_FLASH_REG16(hw, ICH_FLASH_HSFCTL);
+
 			hsflctl.hsf_ctrl.flcycle = ICH_CYCLE_ERASE;
 			E1000_WRITE_FLASH_REG16(hw, ICH_FLASH_HSFCTL,
 						hsflctl.regval);
@@ -4149,7 +4427,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 &= ~(1U << 31);
+		reg &= ~(1 << 31);
 		E1000_WRITE_REG(hw, E1000_STATUS, reg);
 	}
 
@@ -4597,7 +4875,9 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
 		u16 phy_reg, device_id = hw->device_id;
 
 		if ((device_id == E1000_DEV_ID_PCH_LPTLP_I218_LM) ||
-		    (device_id == E1000_DEV_ID_PCH_LPTLP_I218_V)) {
+		    (device_id == E1000_DEV_ID_PCH_LPTLP_I218_V) ||
+		    (device_id == E1000_DEV_ID_PCH_I218_LM3) ||
+		    (device_id == E1000_DEV_ID_PCH_I218_V3)) {
 			u32 fextnvm6 = E1000_READ_REG(hw, E1000_FEXTNVM6);
 
 			E1000_WRITE_REG(hw, E1000_FEXTNVM6,
@@ -4649,7 +4929,7 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
 		 * The SMBus release must also be disabled on LCD reset.
 		 */
 		if (!(E1000_READ_REG(hw, E1000_FWSM) &
-			E1000_ICH_FWSM_FW_VALID)) {
+		      E1000_ICH_FWSM_FW_VALID)) {
 			/* Enable proxy to reset only on power good. */
 			hw->phy.ops.read_reg_locked(hw, I217_PROXY_CTRL,
 						    &phy_reg);
diff --git a/sys/dev/e1000/e1000_ich8lan.h b/sys/dev/e1000/e1000_ich8lan.h
index 2dbf8127664d..f045ebd9256b 100644
--- a/sys/dev/e1000/e1000_ich8lan.h
+++ b/sys/dev/e1000/e1000_ich8lan.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -70,11 +70,16 @@
 
 #define E1000_FWSM_WLOCK_MAC_MASK	0x0380
 #define E1000_FWSM_WLOCK_MAC_SHIFT	7
+#define E1000_FWSM_ULP_CFG_DONE		0x00000400  /* Low power cfg done */
 
 /* Shared Receive Address Registers */
 #define E1000_SHRAL_PCH_LPT(_i)		(0x05408 + ((_i) * 8))
 #define E1000_SHRAH_PCH_LPT(_i)		(0x0540C + ((_i) * 8))
 
+#define E1000_H2ME		0x05B50    /* Host to ME */
+#define E1000_H2ME_ULP		0x00000800 /* ULP Indication Bit */
+#define E1000_H2ME_ENFORCE_SETTINGS	0x00001000 /* Enforce Settings */
+
 #define ID_LED_DEFAULT_ICH8LAN	((ID_LED_DEF1_DEF2 << 12) | \
 				 (ID_LED_OFF1_OFF2 <<  8) | \
 				 (ID_LED_OFF1_ON2  <<  4) | \
@@ -87,6 +92,9 @@
 
 #define E1000_ICH8_LAN_INIT_TIMEOUT	1500
 
+/* FEXT register bit definition */
+#define E1000_FEXT_PHY_CABLE_DISCONNECTED	0x00000004
+
 #define E1000_FEXTNVM_SW_CONFIG		1
 #define E1000_FEXTNVM_SW_CONFIG_ICH8M	(1 << 27) /* different on ICH8M */
 
@@ -100,10 +108,12 @@
 #define E1000_FEXTNVM6_REQ_PLL_CLK	0x00000100
 #define E1000_FEXTNVM6_ENABLE_K1_ENTRY_CONDITION	0x00000200
 
+#define E1000_FEXTNVM7_DISABLE_SMB_PERST	0x00000020
+
 #define PCIE_ICH8_SNOOP_ALL	PCIE_NO_SNOOP_ALL
 
 #define E1000_ICH_RAR_ENTRIES	7
-#define E1000_PCH2_RAR_ENTRIES	11 /* RAR[0-6], SHRA[0-3] */
+#define E1000_PCH2_RAR_ENTRIES	5 /* RAR[0], SHRA[0-3] */
 #define E1000_PCH_LPT_RAR_ENTRIES	12 /* RAR[0], SHRA[0-10] */
 
 #define PHY_PAGE_SHIFT		5
@@ -166,6 +176,16 @@
 #define CV_SMB_CTRL		PHY_REG(769, 23)
 #define CV_SMB_CTRL_FORCE_SMBUS	0x0001
 
+/* I218 Ultra Low Power Configuration 1 Register */
+#define I218_ULP_CONFIG1		PHY_REG(779, 16)
+#define I218_ULP_CONFIG1_START		0x0001 /* Start auto ULP config */
+#define I218_ULP_CONFIG1_IND		0x0004 /* Pwr up from ULP indication */
+#define I218_ULP_CONFIG1_STICKY_ULP	0x0010 /* Set sticky ULP mode */
+#define I218_ULP_CONFIG1_INBAND_EXIT	0x0020 /* Inband on ULP exit */
+#define I218_ULP_CONFIG1_WOL_HOST	0x0040 /* WoL Host on ULP exit */
+#define I218_ULP_CONFIG1_RESET_TO_SMBUS	0x0100 /* Reset to SMBus mode */
+#define I218_ULP_CONFIG1_DISABLE_SMB_PERST	0x1000 /* Disable on PERST# */
+
 /* SMBus Address Phy Register */
 #define HV_SMB_ADDR		PHY_REG(768, 26)
 #define HV_SMB_ADDR_MASK	0x007F
@@ -200,6 +220,7 @@
 /* PHY Power Management Control */
 #define HV_PM_CTRL		PHY_REG(770, 17)
 #define HV_PM_CTRL_PLL_STOP_IN_K1_GIGA	0x100
+#define HV_PM_CTRL_K1_ENABLE		0x4000
 
 #define SW_FLAG_TIMEOUT		1000 /* SW Semaphore flag timeout in ms */
 
@@ -217,7 +238,6 @@
 #define I82579_LPI_CTRL_100_ENABLE		0x2000
 #define I82579_LPI_CTRL_1000_ENABLE		0x4000
 #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)
@@ -231,16 +251,19 @@
 #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_LPI_PLL_SHUT		0x4412 /* LPI PLL Shut Enable */
 #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 */
 #define I82579_EEE_1000_SUPPORTED	(1 << 2) /* 1000BaseTx EEE */
+#define I82579_LPI_100_PLL_SHUT	(1 << 2) /* 100M LPI PLL Shut Enabled */
 #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 */
 #define I217_EEE_LP_ABILITY	0x8002   /* IEEE MMD Register 7.61 */
+#define I217_RX_CONFIG		0xB20C /* Receive configuration */
 
 #define E1000_EEE_RX_LPI_RCVD	0x0400	/* Tx LP idle received */
 #define E1000_EEE_TX_LPI_RCVD	0x0800	/* Rx LP idle received */
@@ -279,6 +302,9 @@
 #define E1000_SVCR_OFF_TIMER_SHIFT	16
 #define E1000_SVT_OFF_HWM_MASK		0x0000001F
 
+#if defined(QV_RELEASE) || !defined(NO_PCH_LPT_B0_SUPPORT)
+#define E1000_PCI_REVISION_ID_REG	0x08
+#endif /* defined(QV_RELEASE) || !defined(NO_PCH_LPT_B0_SUPPORT) */
 void e1000_set_kmrn_lock_loss_workaround_ich8lan(struct e1000_hw *hw,
 						 bool state);
 void e1000_igp3_phy_powerdown_workaround_ich8lan(struct e1000_hw *hw);
@@ -291,5 +317,6 @@ 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);
+s32 e1000_enable_ulp_lpt_lp(struct e1000_hw *hw, bool to_sx);
+s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force);
 #endif /* _E1000_ICH8LAN_H_ */
diff --git a/sys/dev/e1000/e1000_mac.c b/sys/dev/e1000/e1000_mac.c
index cba3feaf862f..b888b341c428 100644
--- a/sys/dev/e1000/e1000_mac.c
+++ b/sys/dev/e1000/e1000_mac.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -37,7 +37,7 @@
 static s32 e1000_validate_mdi_setting_generic(struct e1000_hw *hw);
 static void e1000_set_lan_id_multi_port_pcie(struct e1000_hw *hw);
 static void e1000_config_collision_dist_generic(struct e1000_hw *hw);
-static void e1000_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index);
+static int e1000_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index);
 
 /**
  *  e1000_init_mac_ops_generic - Initialize MAC function pointers
@@ -145,14 +145,14 @@ void e1000_null_write_vfta(struct e1000_hw E1000_UNUSEDARG *hw,
 }
 
 /**
- *  e1000_null_rar_set - No-op function, return void
+ *  e1000_null_rar_set - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-void e1000_null_rar_set(struct e1000_hw E1000_UNUSEDARG *hw,
+int e1000_null_rar_set(struct e1000_hw E1000_UNUSEDARG *hw,
 			u8 E1000_UNUSEDARG *h, u32 E1000_UNUSEDARG a)
 {
 	DEBUGFUNC("e1000_null_rar_set");
-	return;
+	return E1000_SUCCESS;
 }
 
 /**
@@ -475,7 +475,7 @@ s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw)
  *  Sets the receive address array register at index to the address passed
  *  in by addr.
  **/
-static void e1000_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index)
+static int e1000_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index)
 {
 	u32 rar_low, rar_high;
 
@@ -501,6 +501,8 @@ static void e1000_rar_set_generic(struct e1000_hw *hw, u8 *addr, u32 index)
 	E1000_WRITE_FLUSH(hw);
 	E1000_WRITE_REG(hw, E1000_RAH(index), rar_high);
 	E1000_WRITE_FLUSH(hw);
+
+	return E1000_SUCCESS;
 }
 
 /**
@@ -2096,7 +2098,8 @@ s32 e1000_disable_pcie_master_generic(struct e1000_hw *hw)
 
 	while (timeout) {
 		if (!(E1000_READ_REG(hw, E1000_STATUS) &
-		      E1000_STATUS_GIO_MASTER_ENABLE))
+		      E1000_STATUS_GIO_MASTER_ENABLE) ||
+				E1000_REMOVED(hw->hw_addr))
 			break;
 		usec_delay(100);
 		timeout--;
diff --git a/sys/dev/e1000/e1000_mac.h b/sys/dev/e1000/e1000_mac.h
index 3e2ccdedb148..2c1bfe32438f 100644
--- a/sys/dev/e1000/e1000_mac.h
+++ b/sys/dev/e1000/e1000_mac.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -36,13 +36,16 @@
 #define _E1000_MAC_H_
 
 void e1000_init_mac_ops_generic(struct e1000_hw *hw);
+#ifndef E1000_REMOVED
+#define E1000_REMOVED(a) (0)
+#endif /* E1000_REMOVED */
 void e1000_null_mac_generic(struct e1000_hw *hw);
 s32  e1000_null_ops_generic(struct e1000_hw *hw);
 s32  e1000_null_link_info(struct e1000_hw *hw, u16 *s, u16 *d);
 bool e1000_null_mng_mode(struct e1000_hw *hw);
 void e1000_null_update_mc(struct e1000_hw *hw, u8 *h, u32 a);
 void e1000_null_write_vfta(struct e1000_hw *hw, u32 a, u32 b);
-void e1000_null_rar_set(struct e1000_hw *hw, u8 *h, u32 a);
+int  e1000_null_rar_set(struct e1000_hw *hw, u8 *h, u32 a);
 s32  e1000_null_set_obff_timer(struct e1000_hw *hw, u32 a);
 s32  e1000_blink_led_generic(struct e1000_hw *hw);
 s32  e1000_check_for_copper_link_generic(struct e1000_hw *hw);
diff --git a/sys/dev/e1000/e1000_manage.c b/sys/dev/e1000/e1000_manage.c
index c58d32d16b10..8087e656c54d 100644
--- a/sys/dev/e1000/e1000_manage.c
+++ b/sys/dev/e1000/e1000_manage.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -364,9 +364,12 @@ bool e1000_enable_mng_pass_thru(struct e1000_hw *hw)
 	} else if ((hw->mac.type == e1000_82574) ||
 		   (hw->mac.type == e1000_82583)) {
 		u16 data;
+		s32 ret_val;
 
 		factps = E1000_READ_REG(hw, E1000_FACTPS);
-		e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+		ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data);
+		if (ret_val)
+			return FALSE;
 
 		if (!(factps & E1000_FACTPS_MNGCG) &&
 		    ((data & E1000_NVM_INIT_CTRL2_MNGM) ==
@@ -374,7 +377,7 @@ bool e1000_enable_mng_pass_thru(struct e1000_hw *hw)
 			return TRUE;
 	} else if ((manc & E1000_MANC_SMBUS_EN) &&
 		   !(manc & E1000_MANC_ASF_EN)) {
-			return TRUE;
+		return TRUE;
 	}
 
 	return FALSE;
diff --git a/sys/dev/e1000/e1000_mbx.c b/sys/dev/e1000/e1000_mbx.c
index 14af886738f6..55477b2a6a72 100644
--- a/sys/dev/e1000/e1000_mbx.c
+++ b/sys/dev/e1000/e1000_mbx.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2010, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -38,7 +38,8 @@
  *  e1000_null_mbx_check_for_flag - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-static s32 e1000_null_mbx_check_for_flag(struct e1000_hw *hw, u16 mbx_id)
+static s32 e1000_null_mbx_check_for_flag(struct e1000_hw E1000_UNUSEDARG *hw,
+					 u16 E1000_UNUSEDARG mbx_id)
 {
 	DEBUGFUNC("e1000_null_mbx_check_flag");
 
@@ -49,8 +50,10 @@ static s32 e1000_null_mbx_check_for_flag(struct e1000_hw *hw, u16 mbx_id)
  *  e1000_null_mbx_transact - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-static s32 e1000_null_mbx_transact(struct e1000_hw *hw, u32 *msg, u16 size,
-                            u16 mbx_id)
+static s32 e1000_null_mbx_transact(struct e1000_hw E1000_UNUSEDARG *hw,
+				   u32 E1000_UNUSEDARG *msg,
+				   u16 E1000_UNUSEDARG size,
+				   u16 E1000_UNUSEDARG mbx_id)
 {
 	DEBUGFUNC("e1000_null_mbx_rw_msg");
 
@@ -354,7 +357,8 @@ static s32 e1000_check_for_bit_vf(struct e1000_hw *hw, u32 mask)
  *
  *  returns SUCCESS if the PF has set the Status bit or else ERR_MBX
  **/
-static s32 e1000_check_for_msg_vf(struct e1000_hw *hw, u16 mbx_id)
+static s32 e1000_check_for_msg_vf(struct e1000_hw *hw,
+				  u16 E1000_UNUSEDARG mbx_id)
 {
 	s32 ret_val = -E1000_ERR_MBX;
 
@@ -375,7 +379,8 @@ static s32 e1000_check_for_msg_vf(struct e1000_hw *hw, u16 mbx_id)
  *
  *  returns SUCCESS if the PF has set the ACK bit or else ERR_MBX
  **/
-static s32 e1000_check_for_ack_vf(struct e1000_hw *hw, u16 mbx_id)
+static s32 e1000_check_for_ack_vf(struct e1000_hw *hw,
+				  u16 E1000_UNUSEDARG mbx_id)
 {
 	s32 ret_val = -E1000_ERR_MBX;
 
@@ -396,14 +401,15 @@ static s32 e1000_check_for_ack_vf(struct e1000_hw *hw, u16 mbx_id)
  *
  *  returns TRUE if the PF has set the reset done bit or else FALSE
  **/
-static s32 e1000_check_for_rst_vf(struct e1000_hw *hw, u16 mbx_id)
+static s32 e1000_check_for_rst_vf(struct e1000_hw *hw,
+				  u16 E1000_UNUSEDARG mbx_id)
 {
 	s32 ret_val = -E1000_ERR_MBX;
 
 	DEBUGFUNC("e1000_check_for_rst_vf");
 
 	if (!e1000_check_for_bit_vf(hw, (E1000_V2PMAILBOX_RSTD |
-	                                 E1000_V2PMAILBOX_RSTI))) {
+					 E1000_V2PMAILBOX_RSTI))) {
 		ret_val = E1000_SUCCESS;
 		hw->mbx.stats.rsts++;
 	}
@@ -443,7 +449,7 @@ static s32 e1000_obtain_mbx_lock_vf(struct e1000_hw *hw)
  *  returns SUCCESS if it successfully copied message into the buffer
  **/
 static s32 e1000_write_mbx_vf(struct e1000_hw *hw, u32 *msg, u16 size,
-                              u16 mbx_id)
+			      u16 E1000_UNUSEDARG mbx_id)
 {
 	s32 ret_val;
 	u16 i;
@@ -484,7 +490,7 @@ static s32 e1000_write_mbx_vf(struct e1000_hw *hw, u32 *msg, u16 size,
  *  returns SUCCESS if it successfuly read message from buffer
  **/
 static s32 e1000_read_mbx_vf(struct e1000_hw *hw, u32 *msg, u16 size,
-                             u16 mbx_id)
+			     u16 E1000_UNUSEDARG mbx_id)
 {
 	s32 ret_val = E1000_SUCCESS;
 	u16 i;
@@ -657,7 +663,7 @@ static s32 e1000_obtain_mbx_lock_pf(struct e1000_hw *hw, u16 vf_number)
  *  returns SUCCESS if it successfully copied message into the buffer
  **/
 static s32 e1000_write_mbx_pf(struct e1000_hw *hw, u32 *msg, u16 size,
-                              u16 vf_number)
+			      u16 vf_number)
 {
 	s32 ret_val;
 	u16 i;
@@ -700,7 +706,7 @@ static s32 e1000_write_mbx_pf(struct e1000_hw *hw, u32 *msg, u16 size,
  *  a message due to a VF request so no polling for message is needed.
  **/
 static s32 e1000_read_mbx_pf(struct e1000_hw *hw, u32 *msg, u16 size,
-                             u16 vf_number)
+			     u16 vf_number)
 {
 	s32 ret_val;
 	u16 i;
@@ -739,6 +745,7 @@ s32 e1000_init_mbx_params_pf(struct e1000_hw *hw)
 	switch (hw->mac.type) {
 	case e1000_82576:
 	case e1000_i350:
+	case e1000_i354:
 		mbx->timeout = 0;
 		mbx->usec_delay = 0;
 
diff --git a/sys/dev/e1000/e1000_mbx.h b/sys/dev/e1000/e1000_mbx.h
index 206f00c5fad8..d2aea5c497f0 100644
--- a/sys/dev/e1000/e1000_mbx.h
+++ b/sys/dev/e1000/e1000_mbx.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2010, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -38,59 +38,59 @@
 #include "e1000_api.h"
 
 /* Define mailbox register bits */
-#define E1000_V2PMAILBOX_REQ   0x00000001 /* Request for PF Ready bit */
-#define E1000_V2PMAILBOX_ACK   0x00000002 /* Ack PF message received */
-#define E1000_V2PMAILBOX_VFU   0x00000004 /* VF owns the mailbox buffer */
-#define E1000_V2PMAILBOX_PFU   0x00000008 /* PF owns the mailbox buffer */
-#define E1000_V2PMAILBOX_PFSTS 0x00000010 /* PF wrote a message in the MB */
-#define E1000_V2PMAILBOX_PFACK 0x00000020 /* PF ack the previous VF msg */
-#define E1000_V2PMAILBOX_RSTI  0x00000040 /* PF has reset indication */
-#define E1000_V2PMAILBOX_RSTD  0x00000080 /* PF has indicated reset done */
+#define E1000_V2PMAILBOX_REQ	0x00000001 /* Request for PF Ready bit */
+#define E1000_V2PMAILBOX_ACK	0x00000002 /* Ack PF message received */
+#define E1000_V2PMAILBOX_VFU	0x00000004 /* VF owns the mailbox buffer */
+#define E1000_V2PMAILBOX_PFU	0x00000008 /* PF owns the mailbox buffer */
+#define E1000_V2PMAILBOX_PFSTS	0x00000010 /* PF wrote a message in the MB */
+#define E1000_V2PMAILBOX_PFACK	0x00000020 /* PF ack the previous VF msg */
+#define E1000_V2PMAILBOX_RSTI	0x00000040 /* PF has reset indication */
+#define E1000_V2PMAILBOX_RSTD	0x00000080 /* PF has indicated reset done */
 #define E1000_V2PMAILBOX_R2C_BITS 0x000000B0 /* All read to clear bits */
 
-#define E1000_P2VMAILBOX_STS   0x00000001 /* Initiate message send to VF */
-#define E1000_P2VMAILBOX_ACK   0x00000002 /* Ack message recv'd from VF */
-#define E1000_P2VMAILBOX_VFU   0x00000004 /* VF owns the mailbox buffer */
-#define E1000_P2VMAILBOX_PFU   0x00000008 /* PF owns the mailbox buffer */
-#define E1000_P2VMAILBOX_RVFU  0x00000010 /* Reset VFU - used when VF stuck */
+#define E1000_P2VMAILBOX_STS	0x00000001 /* Initiate message send to VF */
+#define E1000_P2VMAILBOX_ACK	0x00000002 /* Ack message recv'd from VF */
+#define E1000_P2VMAILBOX_VFU	0x00000004 /* VF owns the mailbox buffer */
+#define E1000_P2VMAILBOX_PFU	0x00000008 /* PF owns the mailbox buffer */
+#define E1000_P2VMAILBOX_RVFU	0x00000010 /* Reset VFU - used when VF stuck */
 
 #define E1000_MBVFICR_VFREQ_MASK 0x000000FF /* bits for VF messages */
-#define E1000_MBVFICR_VFREQ_VF1  0x00000001 /* bit for VF 1 message */
+#define E1000_MBVFICR_VFREQ_VF1	0x00000001 /* bit for VF 1 message */
 #define E1000_MBVFICR_VFACK_MASK 0x00FF0000 /* bits for VF acks */
-#define E1000_MBVFICR_VFACK_VF1  0x00010000 /* bit for VF 1 ack */
+#define E1000_MBVFICR_VFACK_VF1	0x00010000 /* bit for VF 1 ack */
 
-#define E1000_VFMAILBOX_SIZE   16 /* 16 32 bit words - 64 bytes */
+#define E1000_VFMAILBOX_SIZE	16 /* 16 32 bit words - 64 bytes */
 
 /* If it's a E1000_VF_* msg then it originates in the VF and is sent to the
  * PF.  The reverse is TRUE if it is E1000_PF_*.
  * Message ACK's are the value or'd with 0xF0000000
  */
-#define E1000_VT_MSGTYPE_ACK      0x80000000  /* Messages below or'd with
-                                               * this are the ACK */
-#define E1000_VT_MSGTYPE_NACK     0x40000000  /* Messages below or'd with
-                                               * this are the NACK */
-#define E1000_VT_MSGTYPE_CTS      0x20000000  /* Indicates that VF is still
-                                                 clear to send requests */
-#define E1000_VT_MSGINFO_SHIFT    16
-/* bits 23:16 are used for exra info for certain messages */
-#define E1000_VT_MSGINFO_MASK     (0xFF << E1000_VT_MSGINFO_SHIFT)
+/* Msgs below or'd with this are the ACK */
+#define E1000_VT_MSGTYPE_ACK	0x80000000
+/* Msgs below or'd with this are the NACK */
+#define E1000_VT_MSGTYPE_NACK	0x40000000
+/* Indicates that VF is still clear to send requests */
+#define E1000_VT_MSGTYPE_CTS	0x20000000
+#define E1000_VT_MSGINFO_SHIFT	16
+/* bits 23:16 are used for extra info for certain messages */
+#define E1000_VT_MSGINFO_MASK	(0xFF << E1000_VT_MSGINFO_SHIFT)
 
-#define E1000_VF_RESET            0x01 /* VF requests reset */
-#define E1000_VF_SET_MAC_ADDR     0x02 /* VF requests to set MAC addr */
-#define E1000_VF_SET_MULTICAST    0x03 /* VF requests to set MC addr */
+#define E1000_VF_RESET			0x01 /* VF requests reset */
+#define E1000_VF_SET_MAC_ADDR		0x02 /* VF requests to set MAC addr */
+#define E1000_VF_SET_MULTICAST		0x03 /* VF requests to set MC addr */
 #define E1000_VF_SET_MULTICAST_COUNT_MASK (0x1F << E1000_VT_MSGINFO_SHIFT)
-#define E1000_VF_SET_MULTICAST_OVERFLOW   (0x80 << E1000_VT_MSGINFO_SHIFT)
-#define E1000_VF_SET_VLAN         0x04 /* VF requests to set VLAN */
-#define E1000_VF_SET_VLAN_ADD             (0x01 << E1000_VT_MSGINFO_SHIFT)
-#define E1000_VF_SET_LPE          0x05 /* VF requests to set VMOLR.LPE */
-#define E1000_VF_SET_PROMISC      0x06 /*VF requests to clear VMOLR.ROPE/MPME*/
-#define E1000_VF_SET_PROMISC_UNICAST      (0x01 << E1000_VT_MSGINFO_SHIFT)
-#define E1000_VF_SET_PROMISC_MULTICAST    (0x02 << E1000_VT_MSGINFO_SHIFT)
+#define E1000_VF_SET_MULTICAST_OVERFLOW	(0x80 << E1000_VT_MSGINFO_SHIFT)
+#define E1000_VF_SET_VLAN		0x04 /* VF requests to set VLAN */
+#define E1000_VF_SET_VLAN_ADD		(0x01 << E1000_VT_MSGINFO_SHIFT)
+#define E1000_VF_SET_LPE		0x05 /* reqs to set VMOLR.LPE */
+#define E1000_VF_SET_PROMISC		0x06 /* reqs to clear VMOLR.ROPE/MPME*/
+#define E1000_VF_SET_PROMISC_UNICAST	(0x01 << E1000_VT_MSGINFO_SHIFT)
+#define E1000_VF_SET_PROMISC_MULTICAST	(0x02 << E1000_VT_MSGINFO_SHIFT)
 
-#define E1000_PF_CONTROL_MSG      0x0100 /* PF control message */
+#define E1000_PF_CONTROL_MSG		0x0100 /* PF control message */
 
-#define E1000_VF_MBX_INIT_TIMEOUT 2000 /* number of retries on mailbox */
-#define E1000_VF_MBX_INIT_DELAY   500  /* microseconds between retries */
+#define E1000_VF_MBX_INIT_TIMEOUT	2000 /* number of retries on mailbox */
+#define E1000_VF_MBX_INIT_DELAY		500  /* microseconds between retries */
 
 s32 e1000_read_mbx(struct e1000_hw *, u32 *, u16, u16);
 s32 e1000_write_mbx(struct e1000_hw *, u32 *, u16, u16);
diff --git a/sys/dev/e1000/e1000_nvm.c b/sys/dev/e1000/e1000_nvm.c
index a39b84781502..f702f71b3af7 100644
--- a/sys/dev/e1000/e1000_nvm.c
+++ b/sys/dev/e1000/e1000_nvm.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -63,7 +63,9 @@ void e1000_init_nvm_ops_generic(struct e1000_hw *hw)
  *  e1000_null_nvm_read - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-s32 e1000_null_read_nvm(struct e1000_hw *hw, u16 a, u16 b, u16 *c)
+s32 e1000_null_read_nvm(struct e1000_hw E1000_UNUSEDARG *hw,
+			u16 E1000_UNUSEDARG a, u16 E1000_UNUSEDARG b,
+			u16 E1000_UNUSEDARG *c)
 {
 	DEBUGFUNC("e1000_null_read_nvm");
 	return E1000_SUCCESS;
@@ -73,7 +75,7 @@ s32 e1000_null_read_nvm(struct e1000_hw *hw, u16 a, u16 b, u16 *c)
  *  e1000_null_nvm_generic - No-op function, return void
  *  @hw: pointer to the HW structure
  **/
-void e1000_null_nvm_generic(struct e1000_hw *hw)
+void e1000_null_nvm_generic(struct e1000_hw E1000_UNUSEDARG *hw)
 {
 	DEBUGFUNC("e1000_null_nvm_generic");
 	return;
@@ -83,7 +85,8 @@ void e1000_null_nvm_generic(struct e1000_hw *hw)
  *  e1000_null_led_default - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-s32 e1000_null_led_default(struct e1000_hw *hw, u16 *data)
+s32 e1000_null_led_default(struct e1000_hw E1000_UNUSEDARG *hw,
+			   u16 E1000_UNUSEDARG *data)
 {
 	DEBUGFUNC("e1000_null_led_default");
 	return E1000_SUCCESS;
@@ -93,7 +96,9 @@ s32 e1000_null_led_default(struct e1000_hw *hw, u16 *data)
  *  e1000_null_write_nvm - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-s32 e1000_null_write_nvm(struct e1000_hw *hw, u16 a, u16 b, u16 *c)
+s32 e1000_null_write_nvm(struct e1000_hw E1000_UNUSEDARG *hw,
+			 u16 E1000_UNUSEDARG a, u16 E1000_UNUSEDARG b,
+			 u16 E1000_UNUSEDARG *c)
 {
 	DEBUGFUNC("e1000_null_write_nvm");
 	return E1000_SUCCESS;
@@ -577,6 +582,9 @@ s32 e1000_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data)
 			   E1000_NVM_RW_REG_DATA);
 	}
 
+	if (ret_val)
+		DEBUGOUT1("NVM read error: %d\n", ret_val);
+
 	return ret_val;
 }
 
@@ -767,6 +775,12 @@ s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,
 
 	DEBUGFUNC("e1000_read_pba_string_generic");
 
+	if ((hw->mac.type >= e1000_i210) &&
+	    !e1000_get_flash_presence_i210(hw)) {
+		DEBUGOUT("Flashless no PBA string\n");
+		return -E1000_ERR_NVM_PBA_SECTION;
+	}
+
 	if (pba_num == NULL) {
 		DEBUGOUT("PBA string buffer was null\n");
 		return -E1000_ERR_INVALID_ARGUMENT;
@@ -974,7 +988,7 @@ s32 e1000_read_pba_raw(struct e1000_hw *hw, u16 *eeprom_buf,
 				return ret_val;
 		} else {
 			if (eeprom_buf_size > (u32)(pba->word[1] +
-					      pba->pba_block[0])) {
+					      pba_block_size)) {
 				memcpy(pba->pba_block,
 				       &eeprom_buf[pba->word[1]],
 				       pba_block_size * sizeof(u16));
diff --git a/sys/dev/e1000/e1000_osdep.h b/sys/dev/e1000/e1000_osdep.h
index 9cf710e232a9..13241100720c 100644
--- a/sys/dev/e1000/e1000_osdep.h
+++ b/sys/dev/e1000/e1000_osdep.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -64,11 +64,9 @@
 #define msec_delay(x) DELAY(1000*(x))
 #define msec_delay_irq(x) DELAY(1000*(x))
 
-#define MSGOUT(S, A, B)     printf(S "\n", A, B)
 #define DEBUGFUNC(F)        DEBUGOUT(F);
 #define DEBUGOUT(S)			do {} while (0)
-/* This define is needed or shared code will not build */
-#define DEBUGOUT1(S,A)			if (0) printf(S,A);
+#define DEBUGOUT1(S,A)			do {} while (0)
 #define DEBUGOUT2(S,A,B)		do {} while (0)
 #define DEBUGOUT3(S,A,B,C)		do {} while (0)
 #define DEBUGOUT7(S,A,B,C,D,E,F,G)	do {} while (0)
@@ -77,7 +75,7 @@
 #define FALSE			0
 #define TRUE			1
 #ifndef __bool_true_false_are_defined
-#define false			FALSE
+#define false			FALSE 
 #define true			TRUE
 #endif
 #define CMD_MEM_WRT_INVALIDATE	0x0010  /* BIT_4 */
@@ -87,7 +85,7 @@
 #define E1000_MUTEX                     struct mtx
 #define E1000_MUTEX_INIT(mutex)         mtx_init((mutex), #mutex, \
                                             MTX_NETWORK_LOCK, \
-                                            MTX_DEF | MTX_DUPOK)
+					    MTX_DEF | MTX_DUPOK)
 #define E1000_MUTEX_DESTROY(mutex)      mtx_destroy(mutex)
 #define E1000_MUTEX_LOCK(mutex)         mtx_lock(mutex)
 #define E1000_MUTEX_TRYLOCK(mutex)      mtx_trylock(mutex)
@@ -109,7 +107,7 @@ typedef boolean_t	bool;
 #define __le32		u32
 #define __le64		u64
 
-#if __FreeBSD_version < 800000 /* Now in HEAD */
+#if __FreeBSD_version < 800000
 #if defined(__i386__) || defined(__amd64__)
 #define mb()	__asm volatile("mfence" ::: "memory")
 #define wmb()	__asm volatile("sfence" ::: "memory")
diff --git a/sys/dev/e1000/e1000_phy.c b/sys/dev/e1000/e1000_phy.c
index 329540d48164..f27889c83c44 100644
--- a/sys/dev/e1000/e1000_phy.c
+++ b/sys/dev/e1000/e1000_phy.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -2362,19 +2362,23 @@ s32 e1000_phy_has_link_generic(struct e1000_hw *hw, u32 iterations,
 		 * it across the board.
 		 */
 		ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);
-		if (ret_val)
+		if (ret_val) {
 			/* If the first read fails, another entity may have
 			 * ownership of the resources, wait and try again to
 			 * see if they have relinquished the resources yet.
 			 */
-			usec_delay(usec_interval);
+			if (usec_interval >= 1000)
+				msec_delay(usec_interval/1000);
+			else
+				usec_delay(usec_interval);
+		}
 		ret_val = hw->phy.ops.read_reg(hw, PHY_STATUS, &phy_status);
 		if (ret_val)
 			break;
 		if (phy_status & MII_SR_LINK_STATUS)
 			break;
 		if (usec_interval >= 1000)
-			msec_delay_irq(usec_interval/1000);
+			msec_delay(usec_interval/1000);
 		else
 			usec_delay(usec_interval);
 	}
@@ -3425,11 +3429,12 @@ static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
 					  u16 *data, bool read, bool page_set)
 {
 	s32 ret_val;
-	u16 reg = BM_PHY_REG_NUM(offset);
-	u16 page = BM_PHY_REG_PAGE(offset);
+	u16 reg, page;
 	u16 phy_reg = 0;
 
 	DEBUGFUNC("e1000_access_phy_wakeup_reg_bm");
+	reg = BM_PHY_REG_NUM(offset);
+	page = BM_PHY_REG_PAGE(offset);
 
 	/* Gig must be disabled for MDIO accesses to Host Wakeup reg page */
 	if ((hw->mac.type == e1000_pchlan) &&
@@ -3487,16 +3492,10 @@ static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
 void e1000_power_up_phy_copper(struct e1000_hw *hw)
 {
 	u16 mii_reg = 0;
-	u16 power_reg = 0;
 
 	/* The PHY will retain its settings across a power down/up cycle */
 	hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
 	mii_reg &= ~MII_CR_POWER_DOWN;
-	if (hw->phy.type == e1000_phy_i210) {
-		hw->phy.ops.read_reg(hw, GS40G_COPPER_SPEC, &power_reg);
-		power_reg &= ~GS40G_CS_POWER_DOWN;
-		hw->phy.ops.write_reg(hw, GS40G_COPPER_SPEC, power_reg);
-	}
 	hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
 }
 
@@ -3511,17 +3510,10 @@ void e1000_power_up_phy_copper(struct e1000_hw *hw)
 void e1000_power_down_phy_copper(struct e1000_hw *hw)
 {
 	u16 mii_reg = 0;
-	u16 power_reg = 0;
 
 	/* The PHY will retain its settings across a power down/up cycle */
 	hw->phy.ops.read_reg(hw, PHY_CONTROL, &mii_reg);
 	mii_reg |= MII_CR_POWER_DOWN;
-	/* i210 Phy requires an additional bit for power up/down */
-	if (hw->phy.type == e1000_phy_i210) {
-		hw->phy.ops.read_reg(hw, GS40G_COPPER_SPEC, &power_reg);
-		power_reg |= GS40G_CS_POWER_DOWN;
-		hw->phy.ops.write_reg(hw, GS40G_COPPER_SPEC, power_reg);
-	}
 	hw->phy.ops.write_reg(hw, PHY_CONTROL, mii_reg);
 	msec_delay(1);
 }
@@ -4119,7 +4111,7 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data)
 {
 	u32 mphy_ctrl = 0;
 	bool locked = FALSE;
-	bool ready = FALSE;
+	bool ready;
 
 	DEBUGFUNC("e1000_read_phy_reg_mphy");
 
@@ -4157,13 +4149,12 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data)
 	*data = E1000_READ_REG(hw, E1000_MPHY_DATA);
 
 	/* Disable access to mPHY if it was originally disabled */
-	if (locked) {
+	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;
 }
@@ -4182,7 +4173,7 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data,
 {
 	u32 mphy_ctrl = 0;
 	bool locked = FALSE;
-	bool ready = FALSE;
+	bool ready;
 
 	DEBUGFUNC("e1000_write_phy_reg_mphy");
 
@@ -4223,13 +4214,12 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data,
 	E1000_WRITE_REG(hw, E1000_MPHY_DATA, data);
 
 	/* Disable access to mPHY if it was originally disabled */
-	if (locked) {
+	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;
 }
diff --git a/sys/dev/e1000/e1000_phy.h b/sys/dev/e1000/e1000_phy.h
index 32685eeee812..0e5b2e6ac69c 100644
--- a/sys/dev/e1000/e1000_phy.h
+++ b/sys/dev/e1000/e1000_phy.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -144,7 +144,6 @@ bool e1000_is_mphy_ready(struct e1000_hw *hw);
 #define GS40G_MAC_LB			0x4140
 #define GS40G_MAC_SPEED_1G		0X0006
 #define GS40G_COPPER_SPEC		0x0010
-#define GS40G_CS_POWER_DOWN		0x0002
 
 /* BM/HV Specific Registers */
 #define BM_PORT_CTRL_PAGE		769
@@ -226,6 +225,7 @@ bool e1000_is_mphy_ready(struct e1000_hw *hw);
 #define HV_M_STATUS_AUTONEG_COMPLETE	0x1000
 #define HV_M_STATUS_SPEED_MASK		0x0300
 #define HV_M_STATUS_SPEED_1000		0x0200
+#define HV_M_STATUS_SPEED_100		0x0100
 #define HV_M_STATUS_LINK_UP		0x0040
 
 #define IGP01E1000_PHY_PCS_INIT_REG	0x00B4
diff --git a/sys/dev/e1000/e1000_regs.h b/sys/dev/e1000/e1000_regs.h
index a88220f1e5f9..5c2e3f788cbf 100644
--- a/sys/dev/e1000/e1000_regs.h
+++ b/sys/dev/e1000/e1000_regs.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -59,6 +59,7 @@
 #define E1000_SCTL	0x00024  /* SerDes Control - RW */
 #define E1000_FCAL	0x00028  /* Flow Control Address Low - RW */
 #define E1000_FCAH	0x0002C  /* Flow Control Address High -RW */
+#define E1000_FEXT	0x0002C  /* Future Extended - RW */
 #define E1000_FEXTNVM	0x00028  /* Future Extended NVM - RW */
 #define E1000_FEXTNVM3	0x0003C  /* Future Extended NVM 3 - RW */
 #define E1000_FEXTNVM4	0x00024  /* Future Extended NVM 4 - RW */
@@ -108,6 +109,7 @@
 #define E1000_PBECCSTS	0x0100C  /* Packet Buffer ECC Status - RW */
 #define E1000_EEMNGCTL	0x01010  /* MNG EEprom Control */
 #define E1000_EEARBC	0x01024  /* EEPROM Auto Read Bus Control */
+#define E1000_EEARBC_I210	0x12024 /* EEPROM Auto Read Bus Control */
 #define E1000_FLASHT	0x01028  /* FLASH Timer Register */
 #define E1000_EEWR	0x0102C  /* EEPROM Write Register - RW */
 #define E1000_FLSWCTL	0x01030  /* FLASH control register */
@@ -207,7 +209,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		(1U << 31) /* SP vs. SR Tx mode */
+#define E1000_TQAVCC_QUEUE_MODE		(1 << 31) /* SP vs. SR Tx mode */
 
 /* Good transmitted packets counter registers */
 #define E1000_PQGPTC(_n)		(0x010014 + (0x100 * (_n)))
diff --git a/sys/dev/e1000/e1000_vf.c b/sys/dev/e1000/e1000_vf.c
index d1286ad2a5fa..2cabac9fa4d5 100644
--- a/sys/dev/e1000/e1000_vf.c
+++ b/sys/dev/e1000/e1000_vf.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2011, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -49,7 +49,7 @@ static s32 e1000_get_link_up_info_vf(struct e1000_hw *hw, u16 *speed,
 static s32 e1000_init_hw_vf(struct e1000_hw *hw);
 static s32 e1000_reset_hw_vf(struct e1000_hw *hw);
 static void e1000_update_mc_addr_list_vf(struct e1000_hw *hw, u8 *, u32);
-static void e1000_rar_set_vf(struct e1000_hw *, u8 *, u32);
+static int  e1000_rar_set_vf(struct e1000_hw *, u8 *, u32);
 static s32 e1000_read_mac_addr_vf(struct e1000_hw *);
 
 /**
@@ -159,7 +159,7 @@ void e1000_init_function_pointers_vf(struct e1000_hw *hw)
  *  In addition, the MAC registers to access PHY/NVM don't exist so we don't
  *  even want any SW to attempt to use them.
  **/
-static s32 e1000_acquire_vf(struct e1000_hw *hw)
+static s32 e1000_acquire_vf(struct e1000_hw E1000_UNUSEDARG *hw)
 {
 	return -E1000_ERR_PHY;
 }
@@ -172,7 +172,7 @@ static s32 e1000_acquire_vf(struct e1000_hw *hw)
  *  In addition, the MAC registers to access PHY/NVM don't exist so we don't
  *  even want any SW to attempt to use them.
  **/
-static void e1000_release_vf(struct e1000_hw *hw)
+static void e1000_release_vf(struct e1000_hw E1000_UNUSEDARG *hw)
 {
 	return;
 }
@@ -183,7 +183,7 @@ static void e1000_release_vf(struct e1000_hw *hw)
  *
  *  Virtual functions cannot change link.
  **/
-static s32 e1000_setup_link_vf(struct e1000_hw *hw)
+static s32 e1000_setup_link_vf(struct e1000_hw E1000_UNUSEDARG *hw)
 {
 	DEBUGFUNC("e1000_setup_link_vf");
 
@@ -320,7 +320,8 @@ static s32 e1000_init_hw_vf(struct e1000_hw *hw)
  *  @addr: pointer to the receive address
  *  @index receive address array register
  **/
-static void e1000_rar_set_vf(struct e1000_hw *hw, u8 * addr, u32 index)
+static int e1000_rar_set_vf(struct e1000_hw *hw, u8 *addr,
+			     u32 E1000_UNUSEDARG index)
 {
 	struct e1000_mbx_info *mbx = &hw->mbx;
 	u32 msgbuf[3];
@@ -341,6 +342,8 @@ static void e1000_rar_set_vf(struct e1000_hw *hw, u8 * addr, u32 index)
 	if (!ret_val &&
 	    (msgbuf[0] == (E1000_VF_SET_MAC_ADDR | E1000_VT_MSGTYPE_NACK)))
 		e1000_read_mac_addr_vf(hw);
+
+	return E1000_SUCCESS;
 }
 
 /**
diff --git a/sys/dev/e1000/e1000_vf.h b/sys/dev/e1000/e1000_vf.h
index 4dfebe7a4bda..2a780741c2a4 100644
--- a/sys/dev/e1000/e1000_vf.h
+++ b/sys/dev/e1000/e1000_vf.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -208,7 +208,7 @@ struct e1000_mac_operations {
 	s32  (*init_hw)(struct e1000_hw *);
 	s32  (*setup_link)(struct e1000_hw *);
 	void (*write_vfta)(struct e1000_hw *, u32, u32);
-	void (*rar_set)(struct e1000_hw *, u8*, u32);
+	int  (*rar_set)(struct e1000_hw *, u8*, u32);
 	s32  (*read_mac_addr)(struct e1000_hw *);
 };
 
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 3ac52458e38c..2d101b89500a 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2013, Intel Corporation 
+  Copyright (c) 2001-2014, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -96,7 +96,7 @@ int	em_display_debug_stats = 0;
 /*********************************************************************
  *  Driver version:
  *********************************************************************/
-char em_driver_version[] = "7.3.8";
+char em_driver_version[] = "7.4.2";
 
 /*********************************************************************
  *  PCI Device ID Table
@@ -180,6 +180,10 @@ static em_vendor_info_t em_vendor_info_array[] =
 						PCI_ANY_ID, PCI_ANY_ID, 0},
 	{ 0x8086, E1000_DEV_ID_PCH_LPTLP_I218_V,
 						PCI_ANY_ID, PCI_ANY_ID, 0},
+	{ 0x8086, E1000_DEV_ID_PCH_I218_LM2,	PCI_ANY_ID, PCI_ANY_ID, 0},
+	{ 0x8086, E1000_DEV_ID_PCH_I218_V2,	PCI_ANY_ID, PCI_ANY_ID, 0},
+	{ 0x8086, E1000_DEV_ID_PCH_I218_LM3,	PCI_ANY_ID, PCI_ANY_ID, 0},
+	{ 0x8086, E1000_DEV_ID_PCH_I218_V3,	PCI_ANY_ID, PCI_ANY_ID, 0},
 	/* required last entry */
 	{ 0, 0, 0, 0, 0}
 };
@@ -349,8 +353,6 @@ static SYSCTL_NODE(_hw, OID_AUTO, em, CTLFLAG_RD, 0, "EM driver parameters");
 
 static int em_tx_int_delay_dflt = EM_TICKS_TO_USECS(EM_TIDV);
 static int em_rx_int_delay_dflt = EM_TICKS_TO_USECS(EM_RDTR);
-TUNABLE_INT("hw.em.tx_int_delay", &em_tx_int_delay_dflt);
-TUNABLE_INT("hw.em.rx_int_delay", &em_rx_int_delay_dflt);
 SYSCTL_INT(_hw_em, OID_AUTO, tx_int_delay, CTLFLAG_RDTUN, &em_tx_int_delay_dflt,
     0, "Default transmit interrupt delay in usecs");
 SYSCTL_INT(_hw_em, OID_AUTO, rx_int_delay, CTLFLAG_RDTUN, &em_rx_int_delay_dflt,
@@ -358,8 +360,6 @@ SYSCTL_INT(_hw_em, OID_AUTO, rx_int_delay, CTLFLAG_RDTUN, &em_rx_int_delay_dflt,
 
 static int em_tx_abs_int_delay_dflt = EM_TICKS_TO_USECS(EM_TADV);
 static int em_rx_abs_int_delay_dflt = EM_TICKS_TO_USECS(EM_RADV);
-TUNABLE_INT("hw.em.tx_abs_int_delay", &em_tx_abs_int_delay_dflt);
-TUNABLE_INT("hw.em.rx_abs_int_delay", &em_rx_abs_int_delay_dflt);
 SYSCTL_INT(_hw_em, OID_AUTO, tx_abs_int_delay, CTLFLAG_RDTUN,
     &em_tx_abs_int_delay_dflt, 0,
     "Default transmit interrupt delay limit in usecs");
@@ -369,32 +369,26 @@ SYSCTL_INT(_hw_em, OID_AUTO, rx_abs_int_delay, CTLFLAG_RDTUN,
 
 static int em_rxd = EM_DEFAULT_RXD;
 static int em_txd = EM_DEFAULT_TXD;
-TUNABLE_INT("hw.em.rxd", &em_rxd);
-TUNABLE_INT("hw.em.txd", &em_txd);
 SYSCTL_INT(_hw_em, OID_AUTO, rxd, CTLFLAG_RDTUN, &em_rxd, 0,
     "Number of receive descriptors per queue");
 SYSCTL_INT(_hw_em, OID_AUTO, txd, CTLFLAG_RDTUN, &em_txd, 0,
     "Number of transmit descriptors per queue");
 
 static int em_smart_pwr_down = FALSE;
-TUNABLE_INT("hw.em.smart_pwr_down", &em_smart_pwr_down);
 SYSCTL_INT(_hw_em, OID_AUTO, smart_pwr_down, CTLFLAG_RDTUN, &em_smart_pwr_down,
     0, "Set to true to leave smart power down enabled on newer adapters");
 
 /* Controls whether promiscuous also shows bad packets */
 static int em_debug_sbp = FALSE;
-TUNABLE_INT("hw.em.sbp", &em_debug_sbp);
 SYSCTL_INT(_hw_em, OID_AUTO, sbp, CTLFLAG_RDTUN, &em_debug_sbp, 0,
     "Show bad packets in promiscuous mode");
 
 static int em_enable_msix = TRUE;
-TUNABLE_INT("hw.em.enable_msix", &em_enable_msix);
 SYSCTL_INT(_hw_em, OID_AUTO, enable_msix, CTLFLAG_RDTUN, &em_enable_msix, 0,
     "Enable MSI-X interrupts");
 
 /* How many packets rxeof tries to clean at a time */
 static int em_rx_process_limit = 100;
-TUNABLE_INT("hw.em.rx_process_limit", &em_rx_process_limit);
 SYSCTL_INT(_hw_em, OID_AUTO, rx_process_limit, CTLFLAG_RDTUN,
     &em_rx_process_limit, 0,
     "Maximum number of received packets to process "
@@ -402,7 +396,6 @@ SYSCTL_INT(_hw_em, OID_AUTO, rx_process_limit, CTLFLAG_RDTUN,
 
 /* Energy efficient ethernet - default to OFF */
 static int eee_setting = 1;
-TUNABLE_INT("hw.em.eee_setting", &eee_setting);
 SYSCTL_INT(_hw_em, OID_AUTO, eee_setting, CTLFLAG_RDTUN, &eee_setting, 0,
     "Enable Energy Efficient Ethernet");
 
@@ -698,6 +691,9 @@ em_attach(device_t dev)
 		goto err_late;
 	}
 
+	/* Disable ULP support */
+	e1000_disable_ulp_lpt_lp(hw, TRUE);
+
 	/*
 	**  Do interrupt configuration
 	*/
@@ -1822,7 +1818,6 @@ em_xmit(struct tx_ring *txr, struct mbuf **m_headp)
 	int			nsegs, i, j, first, last = 0;
 	int			error, do_tso, tso_desc = 0, remap = 1;
 
-retry:
 	m_head = *m_headp;
 	txd_upper = txd_lower = txd_used = txd_saved = 0;
 	do_tso = ((m_head->m_pkthdr.csum_flags & CSUM_TSO) != 0);
@@ -1948,6 +1943,7 @@ em_xmit(struct tx_ring *txr, struct mbuf **m_headp)
 	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);
 
@@ -2016,7 +2012,7 @@ em_xmit(struct tx_ring *txr, struct mbuf **m_headp)
 
 	if (m_head->m_flags & M_VLANTAG) {
 		/* Set the vlan id. */
-		txd_upper |= htole16((if_getvtag(m_head)) << 16);
+		txd_upper |= htole16(if_getvtag(m_head)) << 16;
                 /* Tell hardware to add tag */
                 txd_lower |= htole32(E1000_TXD_CMD_VLE);
         }
@@ -3088,7 +3084,6 @@ em_dma_malloc(struct adapter *adapter, bus_size_t size,
 	bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
 	bus_dma_tag_destroy(dma->dma_tag);
 fail_0:
-	dma->dma_map = NULL;
 	dma->dma_tag = NULL;
 
 	return (error);
@@ -3099,12 +3094,15 @@ em_dma_free(struct adapter *adapter, struct em_dma_alloc *dma)
 {
 	if (dma->dma_tag == NULL)
 		return;
-	if (dma->dma_map != NULL) {
+	if (dma->dma_paddr != 0) {
 		bus_dmamap_sync(dma->dma_tag, dma->dma_map,
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(dma->dma_tag, dma->dma_map);
+		dma->dma_paddr = 0;
+	}
+	if (dma->dma_vaddr != NULL) {
 		bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
-		dma->dma_map = NULL;
+		dma->dma_vaddr = NULL;
 	}
 	bus_dma_tag_destroy(dma->dma_tag);
 	dma->dma_tag = NULL;
diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c
index 39a7df621bbb..68539b500097 100644
--- a/sys/dev/e1000/if_igb.c
+++ b/sys/dev/e1000/if_igb.c
@@ -35,6 +35,7 @@
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_rss.h"
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
@@ -84,6 +85,9 @@
 #include <netinet/tcp.h>
 #include <netinet/tcp_lro.h>
 #include <netinet/udp.h>
+#ifdef	RSS
+#include <netinet/in_rss.h>
+#endif
 
 #include <machine/in_cksum.h>
 #include <dev/led/led.h>
@@ -327,8 +331,6 @@ static SYSCTL_NODE(_hw, OID_AUTO, igb, CTLFLAG_RD, 0, "IGB driver parameters");
 /* Descriptor defaults */
 static int igb_rxd = IGB_DEFAULT_RXD;
 static int igb_txd = IGB_DEFAULT_TXD;
-TUNABLE_INT("hw.igb.rxd", &igb_rxd);
-TUNABLE_INT("hw.igb.txd", &igb_txd);
 SYSCTL_INT(_hw_igb, OID_AUTO, rxd, CTLFLAG_RDTUN, &igb_rxd, 0,
     "Number of receive descriptors per queue");
 SYSCTL_INT(_hw_igb, OID_AUTO, txd, CTLFLAG_RDTUN, &igb_txd, 0,
@@ -341,8 +343,7 @@ SYSCTL_INT(_hw_igb, OID_AUTO, txd, CTLFLAG_RDTUN, &igb_txd, 0,
 ** traffic for that interrupt vector
 */
 static int igb_enable_aim = TRUE;
-TUNABLE_INT("hw.igb.enable_aim", &igb_enable_aim);
-SYSCTL_INT(_hw_igb, OID_AUTO, enable_aim, CTLFLAG_RW, &igb_enable_aim, 0,
+SYSCTL_INT(_hw_igb, OID_AUTO, enable_aim, CTLFLAG_RWTUN, &igb_enable_aim, 0,
     "Enable adaptive interrupt moderation");
 
 /*
@@ -350,7 +351,6 @@ SYSCTL_INT(_hw_igb, OID_AUTO, enable_aim, CTLFLAG_RW, &igb_enable_aim, 0,
  * but this allows it to be forced off for testing.
  */         
 static int igb_enable_msix = 1;
-TUNABLE_INT("hw.igb.enable_msix", &igb_enable_msix);
 SYSCTL_INT(_hw_igb, OID_AUTO, enable_msix, CTLFLAG_RDTUN, &igb_enable_msix, 0,
     "Enable MSI-X interrupts");
 
@@ -358,7 +358,6 @@ SYSCTL_INT(_hw_igb, OID_AUTO, enable_msix, CTLFLAG_RDTUN, &igb_enable_msix, 0,
 ** Tuneable Interrupt rate
 */
 static int igb_max_interrupt_rate = 8000;
-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");
 
@@ -367,7 +366,6 @@ SYSCTL_INT(_hw_igb, OID_AUTO, max_interrupt_rate, CTLFLAG_RDTUN,
 ** Tuneable number of buffers in the buf-ring (drbr_xxx)
 */
 static int igb_buf_ring_size = IGB_BR_SIZE;
-TUNABLE_INT("hw.igb.buf_ring_size", &igb_buf_ring_size);
 SYSCTL_INT(_hw_igb, OID_AUTO, buf_ring_size, CTLFLAG_RDTUN,
     &igb_buf_ring_size, 0, "Size of the bufring");
 #endif
@@ -381,7 +379,6 @@ SYSCTL_INT(_hw_igb, OID_AUTO, buf_ring_size, CTLFLAG_RDTUN,
 ** a very workload dependent type feature.
 */
 static int igb_header_split = FALSE;
-TUNABLE_INT("hw.igb.hdr_split", &igb_header_split);
 SYSCTL_INT(_hw_igb, OID_AUTO, header_split, CTLFLAG_RDTUN, &igb_header_split, 0,
     "Enable receive mbuf header split");
 
@@ -391,7 +388,6 @@ SYSCTL_INT(_hw_igb, OID_AUTO, header_split, CTLFLAG_RDTUN, &igb_header_split, 0,
 ** MSIX messages if left at 0.
 */
 static int igb_num_queues = 0;
-TUNABLE_INT("hw.igb.num_queues", &igb_num_queues);
 SYSCTL_INT(_hw_igb, OID_AUTO, num_queues, CTLFLAG_RDTUN, &igb_num_queues, 0,
     "Number of queues to configure, 0 indicates autoconfigure");
 
@@ -404,7 +400,6 @@ static int igb_last_bind_cpu = -1;
 
 /* How many packets rxeof tries to clean at a time */
 static int igb_rx_process_limit = 100;
-TUNABLE_INT("hw.igb.rx_process_limit", &igb_rx_process_limit);
 SYSCTL_INT(_hw_igb, OID_AUTO, rx_process_limit, CTLFLAG_RDTUN,
     &igb_rx_process_limit, 0,
     "Maximum number of received packets to process at a time, -1 means unlimited");
@@ -976,12 +971,33 @@ igb_mq_start(struct ifnet *ifp, struct mbuf *m)
 	struct igb_queue	*que;
 	struct tx_ring		*txr;
 	int 			i, err = 0;
+#ifdef	RSS
+	uint32_t		bucket_id;
+#endif
 
 	/* Which queue to use */
-	if ((m->m_flags & M_FLOWID) != 0)
-		i = m->m_pkthdr.flowid % adapter->num_queues;
-	else
+	/*
+	 * When doing RSS, map it to the same outbound queue
+	 * as the incoming flow would be mapped to.
+	 *
+	 * If everything is setup correctly, it should be the
+	 * same bucket that the current CPU we're on is.
+	 */
+	if ((m->m_flags & M_FLOWID) != 0) {
+#ifdef	RSS
+		if (rss_hash2bucket(m->m_pkthdr.flowid,
+		    M_HASHTYPE_GET(m), &bucket_id) == 0) {
+			/* XXX TODO: spit out something if bucket_id > num_queues? */
+			i = bucket_id % adapter->num_queues;
+		} else {
+#endif
+			i = m->m_pkthdr.flowid % adapter->num_queues;
+#ifdef	RSS
+		}
+#endif
+	} else {
 		i = curcpu % adapter->num_queues;
+	}
 	txr = &adapter->tx_rings[i];
 	que = &adapter->queues[i];
 
@@ -2442,11 +2458,34 @@ igb_allocate_msix(struct adapter *adapter)
 	device_t		dev = adapter->dev;
 	struct igb_queue	*que = adapter->queues;
 	int			error, rid, vector = 0;
+	int			cpu_id = 0;
 
 	/* Be sure to start with all interrupts disabled */
 	E1000_WRITE_REG(&adapter->hw, E1000_IMC, ~0);
 	E1000_WRITE_FLUSH(&adapter->hw);
 
+#ifdef	RSS
+	/*
+	 * If we're doing RSS, the number of queues needs to
+	 * match the number of RSS buckets that are configured.
+	 *
+	 * + If there's more queues than RSS buckets, we'll end
+	 *   up with queues that get no traffic.
+	 *
+	 * + If there's more RSS buckets than queues, we'll end
+	 *   up having multiple RSS buckets map to the same queue,
+	 *   so there'll be some contention.
+	 */
+	if (adapter->num_queues != rss_getnumbuckets()) {
+		device_printf(dev,
+		    "%s: number of queues (%d) != number of RSS buckets (%d)"
+		    "; performance will be impacted.\n",
+		    __func__,
+		    adapter->num_queues,
+		    rss_getnumbuckets());
+	}
+#endif
+
 	for (int i = 0; i < adapter->num_queues; i++, vector++, que++) {
 		rid = vector +1;
 		que->res = bus_alloc_resource_any(dev,
@@ -2473,19 +2512,42 @@ igb_allocate_msix(struct adapter *adapter)
 			que->eims = E1000_EICR_TX_QUEUE0 << i;
 		else
 			que->eims = 1 << vector;
+
+#ifdef	RSS
 		/*
-		** Bind the msix vector, and thus the
-		** rings to the corresponding cpu.
-		*/
+		 * The queue ID is used as the RSS layer bucket ID.
+		 * We look up the queue ID -> RSS CPU ID and select
+		 * that.
+		 */
+		cpu_id = rss_getcpu(i % rss_getnumbuckets());
+#else
+		/*
+		 * Bind the msix vector, and thus the
+		 * rings to the corresponding cpu.
+		 *
+		 * This just happens to match the default RSS round-robin
+		 * bucket -> queue -> CPU allocation.
+		 */
 		if (adapter->num_queues > 1) {
 			if (igb_last_bind_cpu < 0)
 				igb_last_bind_cpu = CPU_FIRST();
-			bus_bind_intr(dev, que->res, igb_last_bind_cpu);
+			cpu_id = igb_last_bind_cpu;
+		}
+#endif
+
+		if (adapter->num_queues > 1) {
+			bus_bind_intr(dev, que->res, cpu_id);
+#ifdef	RSS
+			device_printf(dev,
+				"Bound queue %d to RSS bucket %d\n",
+				i, cpu_id);
+#else
 			device_printf(dev,
 				"Bound queue %d to cpu %d\n",
-				i,igb_last_bind_cpu);
-			igb_last_bind_cpu = CPU_NEXT(igb_last_bind_cpu);
+				i, cpu_id);
+#endif
 		}
+
 #ifndef IGB_LEGACY_TX
 		TASK_INIT(&que->txr->txq_task, 0, igb_deferred_mq_start,
 		    que->txr);
@@ -2494,8 +2556,34 @@ igb_allocate_msix(struct adapter *adapter)
 		TASK_INIT(&que->que_task, 0, igb_handle_que, que);
 		que->tq = taskqueue_create("igb_que", M_NOWAIT,
 		    taskqueue_thread_enqueue, &que->tq);
-		taskqueue_start_threads(&que->tq, 1, PI_NET, "%s que",
-		    device_get_nameunit(adapter->dev));
+		if (adapter->num_queues > 1) {
+			/*
+			 * Only pin the taskqueue thread to a CPU if
+			 * RSS is in use.
+			 *
+			 * This again just happens to match the default RSS
+			 * round-robin bucket -> queue -> CPU allocation.
+			 */
+#ifdef	RSS
+			taskqueue_start_threads_pinned(&que->tq, 1, PI_NET,
+			    cpu_id,
+			    "%s que (bucket %d)",
+			    device_get_nameunit(adapter->dev),
+			    cpu_id);
+#else
+			taskqueue_start_threads(&que->tq, 1, PI_NET,
+			    "%s que (qid %d)",
+			    device_get_nameunit(adapter->dev),
+			    cpu_id);
+#endif
+		} else {
+			taskqueue_start_threads(&que->tq, 1, PI_NET, "%s que",
+			    device_get_nameunit(adapter->dev));
+		}
+
+		/* Finally update the last bound CPU id */
+		if (adapter->num_queues > 1)
+			igb_last_bind_cpu = CPU_NEXT(igb_last_bind_cpu);
 	}
 
 	/* And Link */
@@ -2772,6 +2860,13 @@ igb_setup_msix(struct adapter *adapter)
 	/* Figure out a reasonable auto config value */
 	queues = (mp_ncpus > (msgs-1)) ? (msgs-1) : mp_ncpus;
 
+#ifdef	RSS
+	/* If we're doing RSS, clamp at the number of RSS buckets */
+	if (queues > rss_getnumbuckets())
+		queues = rss_getnumbuckets();
+#endif
+
+
 	/* Manual override */
 	if (igb_num_queues != 0)
 		queues = igb_num_queues;
@@ -3259,7 +3354,6 @@ igb_dma_malloc(struct adapter *adapter, bus_size_t size,
 	bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
 	bus_dma_tag_destroy(dma->dma_tag);
 fail_0:
-	dma->dma_map = NULL;
 	dma->dma_tag = NULL;
 
 	return (error);
@@ -3270,12 +3364,15 @@ igb_dma_free(struct adapter *adapter, struct igb_dma_alloc *dma)
 {
 	if (dma->dma_tag == NULL)
 		return;
-	if (dma->dma_map != NULL) {
+	if (dma->dma_paddr != 0) {
 		bus_dmamap_sync(dma->dma_tag, dma->dma_map,
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(dma->dma_tag, dma->dma_map);
+		dma->dma_paddr = 0;
+	}
+	if (dma->dma_vaddr != NULL) {
 		bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
-		dma->dma_map = NULL;
+		dma->dma_vaddr = NULL;
 	}
 	bus_dma_tag_destroy(dma->dma_tag);
 	dma->dma_tag = NULL;
@@ -4462,6 +4559,103 @@ igb_setup_receive_structures(struct adapter *adapter)
 	return (ENOBUFS);
 }
 
+/*
+ * Initialise the RSS mapping for NICs that support multiple transmit/
+ * receive rings.
+ */
+static void
+igb_initialise_rss_mapping(struct adapter *adapter)
+{
+	struct e1000_hw *hw = &adapter->hw;
+	int i;
+	int queue_id;
+	u32 reta;
+	u32 rss_key[10], mrqc, shift = 0;
+
+	/* XXX? */
+	if (adapter->hw.mac.type == e1000_82575)
+		shift = 6;
+
+	/*
+	 * The redirection table controls which destination
+	 * queue each bucket redirects traffic to.
+	 * Each DWORD represents four queues, with the LSB
+	 * being the first queue in the DWORD.
+	 *
+	 * This just allocates buckets to queues using round-robin
+	 * allocation.
+	 *
+	 * NOTE: It Just Happens to line up with the default
+	 * RSS allocation method.
+	 */
+
+	/* Warning FM follows */
+	reta = 0;
+	for (i = 0; i < 128; i++) {
+#ifdef	RSS
+		queue_id = rss_get_indirection_to_bucket(i);
+		/*
+		 * If we have more queues than buckets, we'll
+		 * end up mapping buckets to a subset of the
+		 * queues.
+		 *
+		 * If we have more buckets than queues, we'll
+		 * end up instead assigning multiple buckets
+		 * to queues.
+		 *
+		 * Both are suboptimal, but we need to handle
+		 * the case so we don't go out of bounds
+		 * indexing arrays and such.
+		 */
+		queue_id = queue_id % adapter->num_queues;
+#else
+		queue_id = (i % adapter->num_queues);
+#endif
+		/* Adjust if required */
+		queue_id = queue_id << shift;
+
+		/*
+		 * The low 8 bits are for hash value (n+0);
+		 * The next 8 bits are for hash value (n+1), etc.
+		 */
+		reta = reta >> 8;
+		reta = reta | ( ((uint32_t) queue_id) << 24);
+		if ((i & 3) == 3) {
+			E1000_WRITE_REG(hw, E1000_RETA(i >> 2), reta);
+			reta = 0;
+		}
+	}
+
+	/* Now fill in hash table */
+
+	/* XXX This means RSS enable + 8 queues for my igb (82580.) */
+	mrqc = E1000_MRQC_ENABLE_RSS_4Q;
+
+#ifdef	RSS
+	/* XXX ew typecasting */
+	rss_getkey((uint8_t *) &rss_key);
+#else
+	arc4rand(&rss_key, sizeof(rss_key), 0);
+#endif
+	for (i = 0; i < 10; i++)
+		E1000_WRITE_REG_ARRAY(hw,
+		    E1000_RSSRK(0), i, rss_key[i]);
+
+	/*
+	 * Configure the RSS fields to hash upon.
+	 */
+	mrqc |= (E1000_MRQC_RSS_FIELD_IPV4 |
+	    E1000_MRQC_RSS_FIELD_IPV4_TCP);
+	mrqc |= (E1000_MRQC_RSS_FIELD_IPV6 |
+	    E1000_MRQC_RSS_FIELD_IPV6_TCP);
+	mrqc |=( E1000_MRQC_RSS_FIELD_IPV4_UDP |
+	    E1000_MRQC_RSS_FIELD_IPV6_UDP);
+	mrqc |=( E1000_MRQC_RSS_FIELD_IPV6_UDP_EX |
+	    E1000_MRQC_RSS_FIELD_IPV6_TCP_EX);
+
+	E1000_WRITE_REG(hw, E1000_MRQC, mrqc);
+}
+
 /*********************************************************************
  *
  *  Enable receive unit.
@@ -4545,39 +4739,9 @@ igb_initialize_receive_units(struct adapter *adapter)
 	*/
 	rxcsum = E1000_READ_REG(hw, E1000_RXCSUM);
 	if (adapter->num_queues >1) {
-		u32 random[10], mrqc, shift = 0;
-		union igb_reta {
-			u32 dword;
-			u8  bytes[4];
-		} reta;
 
-		arc4rand(&random, sizeof(random), 0);
-		if (adapter->hw.mac.type == e1000_82575)
-			shift = 6;
-		/* Warning FM follows */
-		for (int i = 0; i < 128; i++) {
-			reta.bytes[i & 3] =
-			    (i % adapter->num_queues) << shift;
-			if ((i & 3) == 3)
-				E1000_WRITE_REG(hw,
-				    E1000_RETA(i >> 2), reta.dword);
-		}
-		/* Now fill in hash table */
-		mrqc = E1000_MRQC_ENABLE_RSS_4Q;
-		for (int i = 0; i < 10; i++)
-			E1000_WRITE_REG_ARRAY(hw,
-			    E1000_RSSRK(0), i, random[i]);
-
-		mrqc |= (E1000_MRQC_RSS_FIELD_IPV4 |
-		    E1000_MRQC_RSS_FIELD_IPV4_TCP);
-		mrqc |= (E1000_MRQC_RSS_FIELD_IPV6 |
-		    E1000_MRQC_RSS_FIELD_IPV6_TCP);
-		mrqc |=( E1000_MRQC_RSS_FIELD_IPV4_UDP |
-		    E1000_MRQC_RSS_FIELD_IPV6_UDP);
-		mrqc |=( E1000_MRQC_RSS_FIELD_IPV6_UDP_EX |
-		    E1000_MRQC_RSS_FIELD_IPV6_TCP_EX);
-
-		E1000_WRITE_REG(hw, E1000_MRQC, mrqc);
+		/* rss setup */
+		igb_initialise_rss_mapping(adapter);
 
 		/*
 		** NOTE: Receive Full-Packet Checksum Offload 
@@ -4838,7 +5002,7 @@ igb_rxeof(struct igb_queue *que, int count, int *done)
 	for (i = rxr->next_to_check; count != 0;) {
 		struct mbuf		*sendmp, *mh, *mp;
 		struct igb_rx_buf	*rxbuf;
-		u16			hlen, plen, hdr, vtag;
+		u16			hlen, plen, hdr, vtag, pkt_info;
 		bool			eop = FALSE;
  
 		cur = &rxr->rx_base[i];
@@ -4860,6 +5024,7 @@ igb_rxeof(struct igb_queue *que, int count, int *done)
 		else
 			vtag = le16toh(cur->wb.upper.vlan);
 		hdr = le16toh(cur->wb.lower.lo_dword.hs_rss.hdr_info);
+		pkt_info = le16toh(cur->wb.lower.lo_dword.hs_rss.pkt_info);
 		eop = ((staterr & E1000_RXD_STAT_EOP) == E1000_RXD_STAT_EOP);
 
 		/* Make sure all segments of a bad packet are discarded */
@@ -4959,7 +5124,43 @@ igb_rxeof(struct igb_queue *que, int count, int *done)
 				rxr->fmp->m_pkthdr.ether_vtag = vtag;
 				rxr->fmp->m_flags |= M_VLANTAG;
 			}
-#ifndef IGB_LEGACY_TX
+#ifdef	RSS
+			/* XXX set flowtype once this works right */
+			rxr->fmp->m_pkthdr.flowid = 
+			    le32toh(cur->wb.lower.hi_dword.rss);
+			rxr->fmp->m_flags |= M_FLOWID;
+			switch (pkt_info & E1000_RXDADV_RSSTYPE_MASK) {
+			case E1000_RXDADV_RSSTYPE_IPV4_TCP:
+				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_TCP_IPV4);
+				break;
+			case E1000_RXDADV_RSSTYPE_IPV4:
+				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_IPV4);
+				break;
+			case E1000_RXDADV_RSSTYPE_IPV6_TCP:
+				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_TCP_IPV6);
+				break;
+			case E1000_RXDADV_RSSTYPE_IPV6_EX:
+				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_IPV6_EX);
+				break;
+			case E1000_RXDADV_RSSTYPE_IPV6:
+				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_IPV6);
+				break;
+			case E1000_RXDADV_RSSTYPE_IPV6_TCP_EX:
+				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_TCP_IPV6_EX);
+				break;
+
+			/* XXX no UDP support in RSS just yet */
+#ifdef notyet
+			case E1000_RXDADV_RSSTYPE_IPV4_UDP:
+			case E1000_RXDADV_RSSTYPE_IPV6_UDP:
+			case E1000_RXDADV_RSSTYPE_IPV6_UDP_EX:
+#endif
+			
+			default:
+				/* XXX fallthrough */
+				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_NONE);
+			}
+#elif !defined(IGB_LEGACY_TX)
 			rxr->fmp->m_pkthdr.flowid = que->msix;
 			rxr->fmp->m_flags |= M_FLOWID;
 #endif
@@ -5656,7 +5857,7 @@ igb_add_hw_stats(struct adapter *adapter)
  				"Transmit Descriptor Tail");
 		SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "no_desc_avail", 
 				CTLFLAG_RD, &txr->no_desc_avail,
-				"Queue No Descriptor Available");
+				"Queue Descriptors Unavailable");
 		SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tx_packets",
 				CTLFLAG_RD, &txr->total_packets,
 				"Queue Packets Transmitted");
diff --git a/sys/dev/e1000/if_lem.c b/sys/dev/e1000/if_lem.c
index e2dc62fb0c55..1fe22cbedbe8 100644
--- a/sys/dev/e1000/if_lem.c
+++ b/sys/dev/e1000/if_lem.c
@@ -2527,7 +2527,6 @@ lem_dma_malloc(struct adapter *adapter, bus_size_t size,
 	bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
 	bus_dma_tag_destroy(dma->dma_tag);
 fail_0:
-	dma->dma_map = NULL;
 	dma->dma_tag = NULL;
 
 	return (error);
@@ -2538,12 +2537,15 @@ lem_dma_free(struct adapter *adapter, struct em_dma_alloc *dma)
 {
 	if (dma->dma_tag == NULL)
 		return;
-	if (dma->dma_map != NULL) {
+	if (dma->dma_paddr != 0) {
 		bus_dmamap_sync(dma->dma_tag, dma->dma_map,
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(dma->dma_tag, dma->dma_map);
+		dma->dma_paddr = 0;
+	}
+	if (dma->dma_vaddr != NULL) {
 		bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
-		dma->dma_map = NULL;
+		dma->dma_vaddr = NULL;
 	}
 	bus_dma_tag_destroy(dma->dma_tag);
 	dma->dma_tag = NULL;
diff --git a/sys/dev/esp/ncr53c9x.c b/sys/dev/esp/ncr53c9x.c
index b21ea41bc8de..677aed7a66f5 100644
--- a/sys/dev/esp/ncr53c9x.c
+++ b/sys/dev/esp/ncr53c9x.c
@@ -1082,8 +1082,7 @@ ncr53c9x_action(struct cam_sim *sim, union ccb *ccb)
 
 	case XPT_RESET_DEV:
 	case XPT_SCSI_IO:
-		if (ccb->ccb_h.target_id < 0 ||
-		    ccb->ccb_h.target_id >= sc->sc_ntarg) {
+		if (ccb->ccb_h.target_id >= sc->sc_ntarg) {
 			ccb->ccb_h.status = CAM_PATH_INVALID;
 			goto done;
 		}
diff --git a/sys/dev/et/if_et.c b/sys/dev/et/if_et.c
index abca42781d8a..cd714b08ea77 100644
--- a/sys/dev/et/if_et.c
+++ b/sys/dev/et/if_et.c
@@ -120,7 +120,7 @@ static int	et_dma_ring_alloc(struct et_softc *, bus_size_t, bus_size_t,
 		    bus_dma_tag_t *, uint8_t **, bus_dmamap_t *, bus_addr_t *,
 		    const char *);
 static void	et_dma_ring_free(struct et_softc *, bus_dma_tag_t *, uint8_t **,
-		    bus_dmamap_t *);
+		    bus_dmamap_t, bus_addr_t *);
 static void	et_init_tx_ring(struct et_softc *);
 static int	et_init_rx_ring(struct et_softc *);
 static void	et_free_tx_ring(struct et_softc *);
@@ -841,15 +841,16 @@ et_dma_ring_alloc(struct et_softc *sc, bus_size_t alignment, bus_size_t maxsize,
 
 static void
 et_dma_ring_free(struct et_softc *sc, bus_dma_tag_t *tag, uint8_t **ring,
-    bus_dmamap_t *map)
+    bus_dmamap_t map, bus_addr_t *paddr)
 {
 
-	if (*map != NULL)
-		bus_dmamap_unload(*tag, *map);
-	if (*map != NULL && *ring != NULL) {
-		bus_dmamem_free(*tag, *ring, *map);
+	if (*paddr != 0) {
+		bus_dmamap_unload(*tag, map);
+		*paddr = 0;
+	}
+	if (*ring != NULL) {
+		bus_dmamem_free(*tag, *ring, map);
 		*ring = NULL;
-		*map = NULL;
 	}
 	if (*tag) {
 		bus_dma_tag_destroy(*tag);
@@ -1101,27 +1102,27 @@ et_dma_free(struct et_softc *sc)
 	/* Destroy mini RX ring, ring 0. */
 	rx_ring = &sc->sc_rx_ring[0];
 	et_dma_ring_free(sc, &rx_ring->rr_dtag, (void *)&rx_ring->rr_desc,
-	    &rx_ring->rr_dmap);
+	    rx_ring->rr_dmap, &rx_ring->rr_paddr);
 	/* Destroy standard RX ring, ring 1. */
 	rx_ring = &sc->sc_rx_ring[1];
 	et_dma_ring_free(sc, &rx_ring->rr_dtag, (void *)&rx_ring->rr_desc,
-	    &rx_ring->rr_dmap);
+	    rx_ring->rr_dmap, &rx_ring->rr_paddr);
 	/* Destroy RX stat ring. */
 	rxst_ring = &sc->sc_rxstat_ring;
 	et_dma_ring_free(sc, &rxst_ring->rsr_dtag, (void *)&rxst_ring->rsr_stat,
-	    &rxst_ring->rsr_dmap);
+	    rxst_ring->rsr_dmap, &rxst_ring->rsr_paddr);
 	/* Destroy RX status block. */
 	rxsd = &sc->sc_rx_status;
 	et_dma_ring_free(sc, &rxst_ring->rsr_dtag, (void *)&rxst_ring->rsr_stat,
-	    &rxst_ring->rsr_dmap);
+	    rxst_ring->rsr_dmap, &rxst_ring->rsr_paddr);
 	/* Destroy TX ring. */
 	tx_ring = &sc->sc_tx_ring;
 	et_dma_ring_free(sc, &tx_ring->tr_dtag, (void *)&tx_ring->tr_desc,
-	    &tx_ring->tr_dmap);
+	    tx_ring->tr_dmap, &tx_ring->tr_paddr);
 	/* Destroy TX status block. */
 	txsd = &sc->sc_tx_status;
 	et_dma_ring_free(sc, &txsd->txsd_dtag, (void *)&txsd->txsd_status,
-	    &txsd->txsd_dmap);
+	    txsd->txsd_dmap, &txsd->txsd_paddr);
 
 	/* Destroy the parent tag. */
 	if (sc->sc_dtag) {
diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c
index 24016e5a825f..129a77dad4a1 100644
--- a/sys/dev/etherswitch/arswitch/arswitch.c
+++ b/sys/dev/etherswitch/arswitch/arswitch.c
@@ -135,6 +135,7 @@ arswitch_probe(device_t dev)
 		sc->sc_switchtype = AR8X16_SWITCH_AR8316;
 		break;
 	case 0x1202:
+	case 0x1204:
 		chipname = "AR8327";
 		sc->sc_switchtype = AR8X16_SWITCH_AR8327;
 		sc->mii_lo_first = 1;
diff --git a/sys/dev/etherswitch/rtl8366/rtl8366rb.c b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
index eedd3474b353..d14f4660130e 100644
--- a/sys/dev/etherswitch/rtl8366/rtl8366rb.c
+++ b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
@@ -75,7 +75,8 @@ struct rtl8366rb_softc {
 static etherswitch_info_t etherswitch_info = {
 	.es_nports =		RTL8366RB_NUM_PORTS,
 	.es_nvlangroups =	RTL8366RB_NUM_VLANS,
-	.es_name =			"Realtek RTL8366RB"
+	.es_name =		"Realtek RTL8366RB",
+	.es_vlan_caps =		ETHERSWITCH_VLAN_DOT1Q,
 };
 
 #define RTL_LOCK(_sc)	mtx_lock(&(_sc)->sc_mtx)
@@ -148,6 +149,9 @@ rtl8366rb_probe(device_t dev)
 static void
 rtl8366rb_init(device_t dev)
 {
+	int i;
+	struct rtl8366rb_softc *sc;
+
 	/* Initialisation for TL-WR1043ND */
 	smi_rmw(dev, RTL8366RB_RCR,
 		RTL8366RB_RCR_HARD_RESET,
@@ -157,17 +161,21 @@ rtl8366rb_init(device_t dev)
 	smi_rmw(dev, RTL8366RB_SGCR,
 		RTL8366RB_SGCR_EN_VLAN | RTL8366RB_SGCR_EN_VLAN_4KTB,
 		RTL8366RB_SGCR_EN_VLAN, RTL_WAITOK);
-	/* remove port 0 form VLAN 0 */
+	/* Initialize our vlan table. */
+	sc = device_get_softc(dev);
+	for (i = 0; i <= 1; i++)
+		sc->vid[i] = (i + 1) | ETHERSWITCH_VID_VALID;
+	/* Remove port 0 from VLAN 1. */
 	smi_rmw(dev, RTL8366RB_VMCR(RTL8366RB_VMCR_MU_REG, 0),
 		(1 << 0), 0, RTL_WAITOK);
-	/* add port 0 untagged and port 5 tagged to VLAN 1 */
+	/* Add port 0 untagged and port 5 tagged to VLAN 2. */
 	smi_rmw(dev, RTL8366RB_VMCR(RTL8366RB_VMCR_MU_REG, 1),
 		((1 << 5 | 1 << 0) << RTL8366RB_VMCR_MU_MEMBER_SHIFT)
 			| ((1 << 5 | 1 << 0) << RTL8366RB_VMCR_MU_UNTAG_SHIFT),
 		((1 << 5 | 1 << 0) << RTL8366RB_VMCR_MU_MEMBER_SHIFT
 			| ((1 << 0) << RTL8366RB_VMCR_MU_UNTAG_SHIFT)),
 		RTL_WAITOK);
-	/* set PVLAN 1 for port 0 */
+	/* Set PVID 2 for port 0. */
 	smi_rmw(dev, RTL8366RB_PVCR_REG(0),
 		RTL8366RB_PVCR_VAL(0, RTL8366RB_PVCR_PORT_MASK),
 		RTL8366RB_PVCR_VAL(0, 1), RTL_WAITOK);
@@ -268,7 +276,7 @@ rtl8366rb_update_ifmedia(int portstatus, u_int *media_status, u_int *media_activ
 		*media_active |= IFM_1000_T;
 		break;
 	}
-	if ((portstatus & RTL8366RB_PLSR_FULLDUPLEX) == 0)
+	if ((portstatus & RTL8366RB_PLSR_FULLDUPLEX) != 0)
 		*media_active |= IFM_FDX;
 	else
 		*media_active |= IFM_HDX;
@@ -560,7 +568,7 @@ rtl_getport(device_t dev, etherswitch_port_t *p)
 	sc = device_get_softc(dev);
 	vlangroup = RTL8366RB_PVCR_GET(p->es_port,
 		rtl_readreg(dev, RTL8366RB_PVCR_REG(p->es_port)));
-	p->es_pvid = sc->vid[vlangroup];
+	p->es_pvid = sc->vid[vlangroup] & ETHERSWITCH_VID_MASK;
 	
 	if (p->es_port < RTL8366RB_NUM_PHYS) {
 		mii = device_get_softc(sc->miibus[p->es_port]);
@@ -570,13 +578,20 @@ rtl_getport(device_t dev, etherswitch_port_t *p)
 			return (err);
 	} else {
 		/* fill in fixed values for CPU port */
-		ifmr->ifm_count = 0;
+		p->es_flags |= ETHERSWITCH_PORT_CPU;
 		smi_read(dev, RTL8366RB_PLSR_BASE + (RTL8366RB_NUM_PHYS)/2, &v, RTL_WAITOK);
 		v = v >> (8 * ((RTL8366RB_NUM_PHYS) % 2));
 		rtl8366rb_update_ifmedia(v, &ifmr->ifm_status, &ifmr->ifm_active);
 		ifmr->ifm_current = ifmr->ifm_active;
 		ifmr->ifm_mask = 0;
 		ifmr->ifm_status = IFM_ACTIVE | IFM_AVALID;
+		/* Return our static media list. */
+		if (ifmr->ifm_count > 0) {
+			ifmr->ifm_count = 1;
+			ifmr->ifm_ulist[0] = IFM_MAKEWORD(IFM_ETHER, IFM_1000_T,
+			    IFM_FDX, 0);
+		} else
+			ifmr->ifm_count = 0;
 	}
 	return (0);
 }
@@ -589,12 +604,12 @@ rtl_setport(device_t dev, etherswitch_port_t *p)
 	struct ifmedia *ifm;
 	struct mii_data *mii;
 
-	if (p->es_port < 0 || p->es_port >= RTL8366RB_NUM_PHYS)
+	if (p->es_port < 0 || p->es_port >= RTL8366RB_NUM_PORTS)
 		return (ENXIO);
 	sc = device_get_softc(dev);
 	vlangroup = -1;
 	for (i = 0; i < RTL8366RB_NUM_VLANS; i++) {
-		if (sc->vid[i] == p->es_pvid) {
+		if ((sc->vid[i] & ETHERSWITCH_VID_MASK) == p->es_pvid) {
 			vlangroup = i;
 			break;
 		}
@@ -606,6 +621,8 @@ rtl_setport(device_t dev, etherswitch_port_t *p)
 		RTL8366RB_PVCR_VAL(p->es_port, vlangroup), RTL_WAITOK);
 	if (err)
 		return (err);
+	if (p->es_port == RTL8366RB_CPU_PORT)
+		return (0);
 	mii = device_get_softc(sc->miibus[p->es_port]);
 	ifm = &mii->mii_media;
 	err = ifmedia_ioctl(sc->ifp[p->es_port], &p->es_ifr, ifm, SIOCSIFMEDIA);
@@ -615,13 +632,15 @@ rtl_setport(device_t dev, etherswitch_port_t *p)
 static int
 rtl_getvgroup(device_t dev, etherswitch_vlangroup_t *vg)
 {
+	struct rtl8366rb_softc *sc;
 	uint16_t vmcr[3];
 	int i;
 	
 	for (i=0; i<3; i++)
 		vmcr[i] = rtl_readreg(dev, RTL8366RB_VMCR(i, vg->es_vlangroup));
 		
-	vg->es_vid = RTL8366RB_VMCR_VID(vmcr) | ETHERSWITCH_VID_VALID;
+	sc = device_get_softc(dev);
+	vg->es_vid = sc->vid[vg->es_vlangroup];
 	vg->es_member_ports = RTL8366RB_VMCR_MEMBER(vmcr);
 	vg->es_untagged_ports = RTL8366RB_VMCR_UNTAG(vmcr);
 	vg->es_fid = RTL8366RB_VMCR_FID(vmcr);
@@ -636,6 +655,10 @@ rtl_setvgroup(device_t dev, etherswitch_vlangroup_t *vg)
 
 	sc = device_get_softc(dev);
 	sc->vid[g] = vg->es_vid;
+	/* VLAN group disabled ? */
+	if (vg->es_member_ports == 0 && vg->es_untagged_ports == 0 && vg->es_vid == 0)
+		return (0);
+	sc->vid[g] |= ETHERSWITCH_VID_VALID;
 	rtl_writereg(dev, RTL8366RB_VMCR(RTL8366RB_VMCR_DOT1Q_REG, g),
 		(vg->es_vid << RTL8366RB_VMCR_DOT1Q_VID_SHIFT) & RTL8366RB_VMCR_DOT1Q_VID_MASK);
 	rtl_writereg(dev, RTL8366RB_VMCR(RTL8366RB_VMCR_MU_REG, g),
@@ -646,6 +669,17 @@ rtl_setvgroup(device_t dev, etherswitch_vlangroup_t *vg)
 	return (0);
 }
 
+static int
+rtl_getconf(device_t dev, etherswitch_conf_t *conf)
+{
+
+	/* Return the VLAN mode. */
+	conf->cmd = ETHERSWITCH_CONF_VLAN_MODE;
+	conf->vlan_mode = ETHERSWITCH_VLAN_DOT1Q;
+
+	return (0);
+}
+
 static int
 rtl_readphy(device_t dev, int phy, int reg)
 {
@@ -745,6 +779,7 @@ static device_method_t rtl8366rb_methods[] = {
 	DEVMETHOD(miibus_writereg,	rtl_writephy),
 
 	/* etherswitch interface */
+	DEVMETHOD(etherswitch_getconf,	rtl_getconf),
 	DEVMETHOD(etherswitch_getinfo,	rtl_getinfo),
 	DEVMETHOD(etherswitch_readreg,	rtl_readreg),
 	DEVMETHOD(etherswitch_writereg,	rtl_writereg),
diff --git a/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h b/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h
index 4f3d1bae044b..09037059264d 100644
--- a/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h
+++ b/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h
@@ -70,7 +70,7 @@
 #define RTL8366RB_PLSR_SPEED_10		0x00
 #define RTL8366RB_PLSR_SPEED_100	0x01
 #define RTL8366RB_PLSR_SPEED_1000	0x02
-#define RTL8366RB_PLSR_FULLDUPLEX	0x08
+#define RTL8366RB_PLSR_FULLDUPLEX	0x04
 #define RTL8366RB_PLSR_LINK		0x10
 #define RTL8366RB_PLSR_TXPAUSE		0x20
 #define RTL8366RB_PLSR_RXPAUSE		0x40
@@ -168,9 +168,10 @@
 	(RTL8366RB_PACR | (1 << (((phy) & 0x1f) + 9)) | (((page) & 0xf) << 5) | ((reg) & 0x1f))
 
 /* general characteristics of the chip */
-#define RTL8366RB_NUM_PORTS			6
-#define RTL8366RB_NUM_PHYS			(RTL8366RB_NUM_PORTS-1)
-#define RTL8366RB_NUM_VLANS			16
-#define RTL8366RB_NUM_PHY_REG			32
+#define	RTL8366RB_CPU_PORT			5
+#define	RTL8366RB_NUM_PORTS			6
+#define	RTL8366RB_NUM_PHYS			(RTL8366RB_NUM_PORTS-1)
+#define	RTL8366RB_NUM_VLANS			16
+#define	RTL8366RB_NUM_PHY_REG			32
 
 #endif
diff --git a/sys/dev/fb/creator_vt.c b/sys/dev/fb/creator_vt.c
new file mode 100644
index 000000000000..0f287498804b
--- /dev/null
+++ b/sys/dev/fb/creator_vt.c
@@ -0,0 +1,220 @@
+/*-
+ * Copyright (c) 2014 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/kernel.h>
+#include <sys/systm.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>
+
+#include <machine/bus.h>
+#include <machine/bus_private.h>
+
+#include <dev/ofw/openfirm.h>
+#include "creatorreg.h"
+
+static vd_probe_t	creatorfb_probe;
+static vd_init_t	creatorfb_init;
+static vd_blank_t	creatorfb_blank;
+static vd_bitbltchr_t	creatorfb_bitbltchr;
+
+static const struct vt_driver vt_creatorfb_driver = {
+	.vd_name	= "creatorfb",
+	.vd_probe	= creatorfb_probe,
+	.vd_init	= creatorfb_init,
+	.vd_blank	= creatorfb_blank,
+	.vd_bitbltchr	= creatorfb_bitbltchr,
+	.vd_fb_ioctl	= vt_fb_ioctl,
+	.vd_fb_mmap	= vt_fb_mmap,
+	.vd_priority	= VD_PRIORITY_SPECIFIC
+};
+
+struct creatorfb_softc {
+	struct fb_info fb;
+	struct bus_space_tag memt[1];
+	bus_space_handle_t memh;
+};
+
+static struct creatorfb_softc creatorfb_conssoftc;
+VT_DRIVER_DECLARE(vt_creatorfb, vt_creatorfb_driver);
+
+static int
+creatorfb_probe(struct vt_device *vd)
+{
+	phandle_t chosen, node;
+	ihandle_t stdout;
+	char type[64], name[64];
+
+	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);
+
+	OF_getprop(node, "name", name, sizeof(name));
+	if (strcmp(name, "SUNW,ffb") != 0 && strcmp(name, "SUNW,afb") != 0)
+		return (CN_DEAD);
+
+	/* Looks OK... */
+	return (CN_INTERNAL);
+}
+
+static int
+creatorfb_init(struct vt_device *vd)
+{
+	struct creatorfb_softc *sc;
+	phandle_t chosen;
+	phandle_t node;
+	ihandle_t handle;
+	uint32_t height, width;
+	char type[64], name[64];
+	bus_addr_t phys;
+	int space;
+
+	/* Initialize softc */
+	vd->vd_softc = sc = &creatorfb_conssoftc;
+
+	chosen = OF_finddevice("/chosen");
+	OF_getprop(chosen, "stdout", &handle, sizeof(ihandle_t));
+	node = OF_instance_to_package(handle);
+	if (node == -1) {
+		/*
+		 * The "/chosen/stdout" does not exist try
+		 * using "screen" directly.
+		 */
+		node = OF_finddevice("screen");
+		handle = OF_open("screen");
+	}
+	OF_getprop(node, "device_type", type, sizeof(type));
+	if (strcmp(type, "display") != 0)
+		return (CN_DEAD);
+
+	OF_getprop(node, "name", name, sizeof(name));
+	if (strcmp(name, "SUNW,ffb") != 0 && strcmp(name, "SUNW,afb") != 0)
+		return (CN_DEAD);
+
+	/* Make sure we have needed properties */
+	if (OF_getproplen(node, "height") != sizeof(height) ||
+	    OF_getproplen(node, "width") != sizeof(width))
+		return (CN_DEAD);
+
+	OF_getprop(node, "height", &height, sizeof(height));
+	OF_getprop(node, "width", &width, sizeof(width));
+
+	sc->fb.fb_height = height;
+	sc->fb.fb_width = width;
+	sc->fb.fb_bpp = sc->fb.fb_depth = 32;
+	sc->fb.fb_stride = 8192; /* Fixed */
+	sc->fb.fb_size = sc->fb.fb_height * sc->fb.fb_stride;
+
+	/* Map linear framebuffer */
+	if (OF_decode_addr(node, FFB_DFB24, &space, &phys) != 0)
+		return (CN_DEAD);
+	sc->fb.fb_pbase = phys;
+	sc->memh = sparc64_fake_bustag(space, phys, &sc->memt[0]);
+
+	/* 32-bit VGA palette */
+	vt_generate_cons_palette(sc->fb.fb_cmap, COLOR_FORMAT_RGB,
+	    255, 0, 255, 8, 255, 16);
+	sc->fb.fb_cmsize = 16;
+
+	vt_fb_init(vd);
+
+	return (CN_INTERNAL);
+}
+
+static void
+creatorfb_blank(struct vt_device *vd, term_color_t color)
+{
+	struct creatorfb_softc *sc;
+	uint32_t c;
+	int i;
+
+	sc = vd->vd_softc;
+	c = sc->fb.fb_cmap[color];
+
+	for (i = 0; i < sc->fb.fb_height; i++)
+		bus_space_set_region_4(sc->memt, sc->memh, i*sc->fb.fb_stride,
+		    c, sc->fb.fb_width);
+}
+
+static void
+creatorfb_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 creatorfb_softc *sc = vd->vd_softc;
+	u_long line;
+	uint32_t fgc, bgc;
+	int c;
+	uint8_t b, m;
+
+	fgc = sc->fb.fb_cmap[fg];
+	bgc = sc->fb.fb_cmap[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->fb.fb_stride * top) + 4*left;
+	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 not set. */
+				if ((m & 0x80) == 0)
+					continue;
+			}
+			bus_space_write_4(sc->memt, sc->memh, line + 4*c,
+			    (b & 0x80) ? fgc : bgc);
+		}
+		line += sc->fb.fb_stride;
+	}
+}
+
diff --git a/sys/dev/fb/fbd.c b/sys/dev/fb/fbd.c
index b75ca33516c4..ff2488d537c6 100644
--- a/sys/dev/fb/fbd.c
+++ b/sys/dev/fb/fbd.c
@@ -165,6 +165,10 @@ fb_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, int nprot,
 	struct fb_info *info;
 
 	info = dev->si_drv1;
+
+	if ((info->fb_flags & FB_FLAG_NOMMAP) || info->fb_pbase == 0)
+		return (ENODEV);
+
 	if (offset < info->fb_size) {
 		*paddr = info->fb_pbase + offset;
 		return (0);
@@ -172,110 +176,6 @@ fb_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, int nprot,
 	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;
-		} else {
-			if (info->fb_mmap == NULL)
-				info->fb_mmap = &fb_mmap;
-		}
-		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);
-
-	if (info->fb_ioctl == NULL)
-		info->fb_ioctl = &fb_ioctl;
-
-
-	return (0);
-}
-
-
 static int
 fb_init(struct fb_list_entry *entry, int unit)
 {
@@ -336,10 +236,6 @@ fbd_register(struct fb_info* info)
 		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;
 
@@ -349,8 +245,11 @@ fbd_register(struct fb_info* info)
 	if (err)
 		return (err);
 
-	if (first)
-		vt_fb_attach(info);
+	if (first) {
+		err = vt_fb_attach(info);
+		if (err)
+			return (err);
+	}
 
 	return (0);
 }
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index e13408a66eca..0ae2d54526e7 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -49,27 +49,7 @@ copyw(uint16_t *src, uint16_t *dst, size_t size)
 #define bzero_io(d, c)		bzero((void *)(d), (c))
 #define fill_io(p, d, c)	fill((p), (void *)(d), (c))
 #define fillw_io(p, d, c)	fillw((p), (void *)(d), (c))
-#elif defined(__ia64__) || defined(__sparc64__)
-#if defined(__ia64__)
-#include <machine/bus.h>
-#define	bcopy_fromio(s, d, c)	\
-	bus_space_read_region_1(IA64_BUS_SPACE_MEM, s, 0, (void*)(d), c)
-#define	bcopy_io(s, d, c)	\
-	bus_space_copy_region_1(IA64_BUS_SPACE_MEM, s, 0, d, 0, c)
-#define	bcopy_toio(s, d, c)	\
-	bus_space_write_region_1(IA64_BUS_SPACE_MEM, d, 0, (void*)(s), c)
-#define	bzero_io(d, c)		\
-	bus_space_set_region_1(IA64_BUS_SPACE_MEM, (intptr_t)(d), 0, 0, c)
-#define	fill_io(p, d, c)	\
-	bus_space_set_region_1(IA64_BUS_SPACE_MEM, (intptr_t)(d), 0, p, c)
-#define	fillw_io(p, d, c)	\
-	bus_space_set_region_2(IA64_BUS_SPACE_MEM, (intptr_t)(d), 0, p, c)
-#define	readb(a)		bus_space_read_1(IA64_BUS_SPACE_MEM, a, 0)
-#define	readw(a)		bus_space_read_2(IA64_BUS_SPACE_MEM, a, 0)
-#define	writeb(a, v)		bus_space_write_1(IA64_BUS_SPACE_MEM, a, 0, v)
-#define	writew(a, v)		bus_space_write_2(IA64_BUS_SPACE_MEM, a, 0, v)
-#define	writel(a, v)		bus_space_write_4(IA64_BUS_SPACE_MEM, a, 0, v)
-#endif /* __ia64__ */
+#elif defined(__sparc64__)
 static __inline void
 fillw(int val, uint16_t *buf, size_t size)
 {
@@ -120,7 +100,7 @@ fillw(int val, uint16_t *buf, size_t size)
 #define	writew(a, v)		(*(uint16_t*)(a) = (v))
 #endif
 
-#else /* !__i386__ && !__amd64__ && !__ia64__ && !__sparc64__ && !__powerpc__ */
+#else /* !__i386__ && !__amd64__ && !__sparc64__ && !__powerpc__ */
 #define bcopy_io(s, d, c)	memcpy_io((d), (s), (c))
 #define bcopy_toio(s, d, c)	memcpy_toio((d), (void *)(s), (c))
 #define bcopy_fromio(s, d, c)	memcpy_fromio((void *)(d), (s), (c))
diff --git a/sys/dev/fb/vesa.c b/sys/dev/fb/vesa.c
index 48067b6401fe..c7c2d641cdf4 100644
--- a/sys/dev/fb/vesa.c
+++ b/sys/dev/fb/vesa.c
@@ -101,7 +101,6 @@ static video_adapter_t *vesa_adp;
 
 static SYSCTL_NODE(_debug, OID_AUTO, vesa, CTLFLAG_RD, NULL, "VESA debugging");
 static int vesa_shadow_rom;
-TUNABLE_INT("debug.vesa.shadow_rom", &vesa_shadow_rom);
 SYSCTL_INT(_debug_vesa, OID_AUTO, shadow_rom, CTLFLAG_RDTUN, &vesa_shadow_rom,
     0, "Enable video BIOS shadow");
 
diff --git a/sys/dev/fdt/simplebus.c b/sys/dev/fdt/simplebus.c
index 1de4223bd797..1c8e54c6eb5d 100644
--- a/sys/dev/fdt/simplebus.c
+++ b/sys/dev/fdt/simplebus.c
@@ -121,8 +121,10 @@ static driver_t simplebus_driver = {
 	sizeof(struct simplebus_softc)
 };
 static devclass_t simplebus_devclass;
-DRIVER_MODULE(simplebus, ofwbus, simplebus_driver, simplebus_devclass, 0, 0);
-DRIVER_MODULE(simplebus, simplebus, simplebus_driver, simplebus_devclass, 0, 0);
+EARLY_DRIVER_MODULE(simplebus, ofwbus, simplebus_driver, simplebus_devclass,
+    0, 0, BUS_PASS_BUS);
+EARLY_DRIVER_MODULE(simplebus, simplebus, simplebus_driver, simplebus_devclass,
+    0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 
 static int
 simplebus_probe(device_t dev)
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c
index ae753d53d30c..4ac43027bd40 100644
--- a/sys/dev/firewire/fwohci.c
+++ b/sys/dev/firewire/fwohci.c
@@ -78,14 +78,13 @@
 
 #undef OHCI_DEBUG
 
-static int nocyclemaster = 0;
+static int nocyclemaster;
 int firewire_phydma_enable = 1;
 SYSCTL_DECL(_hw_firewire);
-SYSCTL_INT(_hw_firewire, OID_AUTO, nocyclemaster, CTLFLAG_RW, &nocyclemaster, 0,
-        "Do not send cycle start packets");
-SYSCTL_INT(_hw_firewire, OID_AUTO, phydma_enable, CTLFLAG_RW,
-	&firewire_phydma_enable, 1, "Allow physical request DMA from firewire");
-TUNABLE_INT("hw.firewire.phydma_enable", &firewire_phydma_enable);
+SYSCTL_INT(_hw_firewire, OID_AUTO, nocyclemaster, CTLFLAG_RWTUN,
+	&nocyclemaster, 0, "Do not send cycle start packets");
+SYSCTL_INT(_hw_firewire, OID_AUTO, phydma_enable, CTLFLAG_RWTUN,
+	&firewire_phydma_enable, 0, "Allow physical request DMA from firewire");
 
 static char dbcode[16][0x10]={"OUTM", "OUTL","INPM","INPL",
 		"STOR","LOAD","NOP ","STOP",};
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index a7d9bc35d494..cb21cf61d428 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -88,21 +88,17 @@ static int tx_speed = 2;
 static int rx_queue_len = FWMAXQUEUE;
 
 static MALLOC_DEFINE(M_FWE, "if_fwe", "Ethernet over FireWire interface");
-SYSCTL_INT(_debug, OID_AUTO, if_fwe_debug, CTLFLAG_RW, &fwedebug, 0, "");
+SYSCTL_INT(_debug, OID_AUTO, if_fwe_debug, CTLFLAG_RWTUN, &fwedebug, 0, "");
 SYSCTL_DECL(_hw_firewire);
 static SYSCTL_NODE(_hw_firewire, OID_AUTO, fwe, CTLFLAG_RD, 0,
 	"Ethernet emulation subsystem");
-SYSCTL_INT(_hw_firewire_fwe, OID_AUTO, stream_ch, CTLFLAG_RW, &stream_ch, 0,
+SYSCTL_INT(_hw_firewire_fwe, OID_AUTO, stream_ch, CTLFLAG_RWTUN, &stream_ch, 0,
 	"Stream channel to use");
-SYSCTL_INT(_hw_firewire_fwe, OID_AUTO, tx_speed, CTLFLAG_RW, &tx_speed, 0,
+SYSCTL_INT(_hw_firewire_fwe, OID_AUTO, tx_speed, CTLFLAG_RWTUN, &tx_speed, 0,
 	"Transmission speed");
-SYSCTL_INT(_hw_firewire_fwe, OID_AUTO, rx_queue_len, CTLFLAG_RW, &rx_queue_len,
+SYSCTL_INT(_hw_firewire_fwe, OID_AUTO, rx_queue_len, CTLFLAG_RWTUN, &rx_queue_len,
 	0, "Length of the receive queue");
 
-TUNABLE_INT("hw.firewire.fwe.stream_ch", &stream_ch);
-TUNABLE_INT("hw.firewire.fwe.tx_speed", &tx_speed);
-TUNABLE_INT("hw.firewire.fwe.rx_queue_len", &rx_queue_len);
-
 #ifdef DEVICE_POLLING
 static poll_handler_t fwe_poll;
 
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index e98f44e237a3..df3e1f6446d3 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -105,11 +105,9 @@ SYSCTL_INT(_debug, OID_AUTO, if_fwip_debug, CTLFLAG_RW, &fwipdebug, 0, "");
 SYSCTL_DECL(_hw_firewire);
 static SYSCTL_NODE(_hw_firewire, OID_AUTO, fwip, CTLFLAG_RD, 0,
 	"Firewire ip subsystem");
-SYSCTL_INT(_hw_firewire_fwip, OID_AUTO, rx_queue_len, CTLFLAG_RW, &rx_queue_len,
+SYSCTL_INT(_hw_firewire_fwip, OID_AUTO, rx_queue_len, CTLFLAG_RWTUN, &rx_queue_len,
 	0, "Length of the receive queue");
 
-TUNABLE_INT("hw.firewire.fwip.rx_queue_len", &rx_queue_len);
-
 #ifdef DEVICE_POLLING
 static poll_handler_t fwip_poll;
 
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index 751d1055d86c..eeca4c77b4e7 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -134,31 +134,23 @@ static int sbp_tags = 0;
 SYSCTL_DECL(_hw_firewire);
 static SYSCTL_NODE(_hw_firewire, OID_AUTO, sbp, CTLFLAG_RD, 0,
 	"SBP-II Subsystem");
-SYSCTL_INT(_debug, OID_AUTO, sbp_debug, CTLFLAG_RW, &debug, 0,
+SYSCTL_INT(_debug, OID_AUTO, sbp_debug, CTLFLAG_RWTUN, &debug, 0,
 	"SBP debug flag");
-SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, auto_login, CTLFLAG_RW, &auto_login, 0,
+SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, auto_login, CTLFLAG_RWTUN, &auto_login, 0,
 	"SBP perform login automatically");
-SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, max_speed, CTLFLAG_RW, &max_speed, 0,
+SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, max_speed, CTLFLAG_RWTUN, &max_speed, 0,
 	"SBP transfer max speed");
-SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, exclusive_login, CTLFLAG_RW,
+SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, exclusive_login, CTLFLAG_RWTUN,
 	&ex_login, 0, "SBP enable exclusive login");
-SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, login_delay, CTLFLAG_RW,
+SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, login_delay, CTLFLAG_RWTUN,
 	&login_delay, 0, "SBP login delay in msec");
-SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, scan_delay, CTLFLAG_RW,
+SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, scan_delay, CTLFLAG_RWTUN,
 	&scan_delay, 0, "SBP scan delay in msec");
-SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, use_doorbell, CTLFLAG_RW,
+SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, use_doorbell, CTLFLAG_RWTUN,
 	&use_doorbell, 0, "SBP use doorbell request");
-SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, tags, CTLFLAG_RW, &sbp_tags, 0,
+SYSCTL_INT(_hw_firewire_sbp, OID_AUTO, tags, CTLFLAG_RWTUN, &sbp_tags, 0,
 	"SBP tagged queuing support");
 
-TUNABLE_INT("hw.firewire.sbp.auto_login", &auto_login);
-TUNABLE_INT("hw.firewire.sbp.max_speed", &max_speed);
-TUNABLE_INT("hw.firewire.sbp.exclusive_login", &ex_login);
-TUNABLE_INT("hw.firewire.sbp.login_delay", &login_delay);
-TUNABLE_INT("hw.firewire.sbp.scan_delay", &scan_delay);
-TUNABLE_INT("hw.firewire.sbp.use_doorbell", &use_doorbell);
-TUNABLE_INT("hw.firewire.sbp.tags", &sbp_tags);
-
 #define NEED_RESPONSE 0
 
 #define SBP_SEG_MAX rounddown(0xffff, PAGE_SIZE)
@@ -622,7 +614,6 @@ END_DEBUG
 	}
 	/* new target */
 	target = &sbp->targets[i];
-	target->sbp = sbp;
 	target->fwdev = fwdev;
 	target->target_id = i;
 	/* XXX we may want to reload mgm port after each bus reset */
@@ -1976,6 +1967,7 @@ END_DEBUG
 	for( i = 0 ; i < SBP_NUM_TARGETS ; i++){
 		sbp->targets[i].fwdev = NULL;
 		sbp->targets[i].luns = NULL;
+		sbp->targets[i].sbp = sbp;
 	}
 
 	sbp->sim = cam_sim_alloc(sbp_action, sbp_poll, "sbp", sbp,
diff --git a/sys/dev/glxiic/glxiic.c b/sys/dev/glxiic/glxiic.c
index 6eeac7cee381..95d8602703f8 100644
--- a/sys/dev/glxiic/glxiic.c
+++ b/sys/dev/glxiic/glxiic.c
@@ -314,7 +314,6 @@ glxiic_attach(device_t dev)
 	struct sysctl_oid *tree;
 	int error, irq, unit;
 	uint32_t irq_map;
-	char tn[32];
 
 	sc = device_get_softc(dev);
 	sc->dev = dev;
@@ -402,10 +401,8 @@ glxiic_attach(device_t dev)
 	tree = device_get_sysctl_tree(dev);
 
 	sc->timeout = GLXIIC_DEFAULT_TIMEOUT;
-	snprintf(tn, sizeof(tn), "dev.glxiic.%d.timeout", unit);
-	TUNABLE_INT_FETCH(tn, &sc->timeout);
 	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
-	    "timeout", CTLFLAG_RW | CTLFLAG_TUN, &sc->timeout, 0,
+	    "timeout", CTLFLAG_RWTUN, &sc->timeout, 0,
 	    "activity timeout in ms");
 
 	glxiic_gpio_enable(sc);
@@ -711,6 +708,7 @@ static int
 glxiic_state_master_addr_callback(struct glxiic_softc *sc, uint8_t status)
 {
 	uint8_t slave;
+	uint8_t ctrl1;
 
 	GLXIIC_ASSERT_LOCKED(sc);
 
@@ -746,6 +744,13 @@ glxiic_state_master_addr_callback(struct glxiic_softc *sc, uint8_t status)
 
 	bus_write_1(sc->smb_res, GLXIIC_SMB_SDA, slave);
 
+	if ((sc->msg->flags & IIC_M_RD) != 0 && sc->ndata == 1) {
+		/* Last byte from slave, set NACK. */
+		ctrl1 = bus_read_1(sc->smb_res, GLXIIC_SMB_CTRL1);
+		bus_write_1(sc->smb_res, GLXIIC_SMB_CTRL1,
+		    ctrl1 | GLXIIC_SMB_CTRL1_ACK_BIT);
+	}
+
 	return (IIC_NOERR);
 }
 
@@ -811,13 +816,6 @@ glxiic_state_master_rx_callback(struct glxiic_softc *sc, uint8_t status)
 		return (IIC_ENOACK);
 	}
 
-	if (sc->ndata == 1) {
-		/* Last byte from slave, set NACK. */
-		ctrl1 = bus_read_1(sc->smb_res, GLXIIC_SMB_CTRL1);
-		bus_write_1(sc->smb_res, GLXIIC_SMB_CTRL1,
-		    ctrl1 | GLXIIC_SMB_CTRL1_ACK_BIT);
-	}
-
 	if ((status & GLXIIC_SMB_STS_STASTR_BIT) != 0) {
 		/* Bus is stalled, clear and wait for data. */
 		bus_write_1(sc->smb_res, GLXIIC_SMB_STS,
@@ -837,6 +835,13 @@ glxiic_state_master_rx_callback(struct glxiic_softc *sc, uint8_t status)
 		return (glxiic_state_table[sc->state].callback(sc, status));
 	}
 
+	if (sc->ndata == 1) {
+		/* Last byte from slave, set NACK. */
+		ctrl1 = bus_read_1(sc->smb_res, GLXIIC_SMB_CTRL1);
+		bus_write_1(sc->smb_res, GLXIIC_SMB_CTRL1,
+		    ctrl1 | GLXIIC_SMB_CTRL1_ACK_BIT);
+	}
+
 	glxiic_start_timeout_locked(sc);
 
 	return (IIC_NOERR);
diff --git a/sys/dev/hatm/if_hatm_intr.c b/sys/dev/hatm/if_hatm_intr.c
index 5220fe511d89..ee5e67b90244 100644
--- a/sys/dev/hatm/if_hatm_intr.c
+++ b/sys/dev/hatm/if_hatm_intr.c
@@ -261,7 +261,7 @@ hatm_mbuf_page_alloc(struct hatm_softc *sc, u_int group)
 /*
  * Free an mbuf and put it onto the free list.
  */
-static int
+static void
 hatm_mbuf0_free(struct mbuf *m, void *buf, void *args)
 {
 	struct hatm_softc *sc = args;
@@ -271,9 +271,8 @@ hatm_mbuf0_free(struct mbuf *m, void *buf, void *args)
 	    ("freeing unused mbuf %x", c->hdr.flags));
 	c->hdr.flags &= ~MBUF_USED;
 	hatm_ext_free(&sc->mbuf_list[0], (struct mbufx_free *)c);
-	return (EXT_FREE_OK);
 }
-static int
+static void
 hatm_mbuf1_free(struct mbuf *m, void *buf, void *args)
 {
 	struct hatm_softc *sc = args;
@@ -283,7 +282,6 @@ hatm_mbuf1_free(struct mbuf *m, void *buf, void *args)
 	    ("freeing unused mbuf %x", c->hdr.flags));
 	c->hdr.flags &= ~MBUF_USED;
 	hatm_ext_free(&sc->mbuf_list[1], (struct mbufx_free *)c);
-	return (EXT_FREE_OK);
 }
 
 static void
@@ -459,7 +457,7 @@ hatm_rx_buffer(struct hatm_softc *sc, u_int group, u_int handle)
 		c0->hdr.flags &= ~MBUF_CARD;
 
 		if (m != NULL) {
-			m->m_ext.ref_cnt = &c0->hdr.ref_cnt;
+			m->m_ext.ext_cnt = &c0->hdr.ref_cnt;
 			MEXTADD(m, (void *)c0, MBUF0_SIZE,
 			    hatm_mbuf0_free, c0, sc, M_PKTHDR, EXT_EXTREF);
 			m->m_data += MBUF0_OFFSET;
@@ -483,7 +481,7 @@ hatm_rx_buffer(struct hatm_softc *sc, u_int group, u_int handle)
 		c1->hdr.flags &= ~MBUF_CARD;
 
 		if (m != NULL) {
-			m->m_ext.ref_cnt = &c1->hdr.ref_cnt;
+			m->m_ext.ext_cnt = &c1->hdr.ref_cnt;
 			MEXTADD(m, (void *)c1, MBUF1_SIZE,
 			    hatm_mbuf1_free, c1, sc, M_PKTHDR, EXT_EXTREF);
 			m->m_data += MBUF1_OFFSET;
diff --git a/sys/dev/hpt27xx/hpt27xx_os_bsd.c b/sys/dev/hpt27xx/hpt27xx_os_bsd.c
index ed5582818e01..4478525a47f8 100644
--- a/sys/dev/hpt27xx/hpt27xx_os_bsd.c
+++ b/sys/dev/hpt27xx/hpt27xx_os_bsd.c
@@ -78,56 +78,8 @@ void os_pci_writel (void *osext, HPT_U8 offset, HPT_U32 value)
     pci_write_config(((PHBA)osext)->pcidev, offset, value, 4);
 }
 
-#if __FreeBSD_version < 500043
 /* PCI space access */
 HPT_U8 pcicfg_read_byte (HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg)
-{
-	HPT_U8 v;
-	pcicfgregs pciref;
-
-	pciref.bus  = bus;
-	pciref.slot = dev;
-	pciref.func = func;
-
-	v = pci_cfgread(&pciref, reg, 1);
-	return v;
-}
-HPT_U32 pcicfg_read_dword(HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg)
-{
-	HPT_U32 v;
-	pcicfgregs pciref;
-
-	pciref.bus  = bus;
-	pciref.slot = dev;
-	pciref.func = func;
-
-	v = pci_cfgread(&pciref, reg, 4);
-	return v;
-}
-void pcicfg_write_byte (HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg, HPT_U8 v)
-{
-	pcicfgregs pciref;
-
-	pciref.hose = -1;
-	pciref.bus  = bus;
-	pciref.slot = dev;
-	pciref.func = func;
-
-	pci_cfgwrite(&pciref, reg, v, 1);
-}
-void pcicfg_write_dword(HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg, HPT_U32 v)
-{
-	pcicfgregs pciref;
-
-	pciref.hose = -1;
-	pciref.bus  = bus;
-	pciref.slot = dev;
-	pciref.func = func;
-
-	pci_cfgwrite(&pciref, reg, v, 4);
-}/* PCI space access */
-#else 
-HPT_U8 pcicfg_read_byte (HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg)
 {
 	return (HPT_U8)pci_cfgregread(bus, dev, func, reg, 1);
 }
@@ -143,7 +95,6 @@ void pcicfg_write_dword(HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg, HPT_U32
 {
 	pci_cfgregwrite(bus, dev, func, reg, v, 4);
 }/* PCI space access */
-#endif
 
 void *os_map_pci_bar(
     void *osext, 
diff --git a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
index 3dfbaccbc704..ce6aff8ff909 100644
--- a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
+++ b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c
@@ -80,9 +80,7 @@ static int hpt_attach(device_t dev)
 	him = hpt_match(dev);
 	hba->ext_type = EXT_TYPE_HBA;
 	hba->ldm_adapter.him = him;
-#if __FreeBSD_version >=440000
 	pci_enable_busmaster(dev);
-#endif
 
 	pci_id.vid = pci_get_vendor(dev);
 	pci_id.did = pci_get_device(dev);
@@ -788,12 +786,10 @@ static void hpt_action(struct cam_sim *sim, union ccb *ccb)
 		strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
 		strncpy(cpi->hba_vid, "HPT   ", HBA_IDLEN);
 		strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
-#if (__FreeBSD_version >= 800000)
 		cpi->transport = XPORT_SPI;
 		cpi->transport_version = 2;
 		cpi->protocol = PROTO_SCSI;
 		cpi->protocol_version = SCSI_REV_2;
-#endif
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		break;
 	}
@@ -969,19 +965,7 @@ static struct cdevsw hpt_cdevsw = {
 	.d_close =	hpt_close,
 	.d_ioctl =	hpt_ioctl,
 	.d_name =	driver_name,
-#if __FreeBSD_version>=503000
 	.d_version =	D_VERSION,
-#endif
-#if (__FreeBSD_version>=503000 && __FreeBSD_version<600034)
-	.d_flags =	D_NEEDGIANT,
-#endif
-#if __FreeBSD_version<600034
-#if __FreeBSD_version>501000
-	.d_maj = 	MAJOR_AUTO,
-#else 
-	.d_maj = HPT_DEV_MAJOR,
-#endif
-#endif
 };
 
 static struct intr_config_hook hpt_ich;
@@ -1018,9 +1002,7 @@ static void hpt_final_init(void *dummy)
 	/* initializing hardware */
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		/* make timer available here */
-#if (__FreeBSD_version >= 500000)
 		mtx_init(&vbus_ext->lock, "hptsleeplock", NULL, MTX_DEF);
-#endif
 		callout_init_mtx(&vbus_ext->timer, &vbus_ext->lock, 0);
 		if (hpt_init_vbus(vbus_ext)) {
 			os_printk("fail to initialize hardware");
@@ -1043,10 +1025,8 @@ static void hpt_final_init(void *dummy)
 				os_max_sg_descriptors,	/* nsegments */
 				0x10000,	/* maxsegsize */
 				BUS_DMA_WAITOK,		/* flags */
-#if __FreeBSD_version>502000
 				busdma_lock_mutex,	/* lockfunc */
 				&vbus_ext->lock,		/* lockfuncarg */
-#endif
 				&vbus_ext->io_dmat	/* tag */))
 		{
 			return ;
@@ -1074,13 +1054,8 @@ static void hpt_final_init(void *dummy)
 			return ;
 		}
 
-#if __FreeBSD_version > 700025
 		vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name,
 				vbus_ext, unit_number, &vbus_ext->lock, os_max_queue_comm, /*tagged*/8,  devq);
-#else 
-		vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name,
-				vbus_ext, unit_number, os_max_queue_comm, /*tagged*/8,  devq);
-#endif
 		unit_number++;
 		if (!vbus_ext->sim) {
 			os_printk("cam_sim_alloc failed");
@@ -1089,11 +1064,7 @@ static void hpt_final_init(void *dummy)
 		}
 
 		hpt_lock_vbus(vbus_ext);
-#if __FreeBSD_version > 700044
 		if (xpt_bus_register(vbus_ext->sim, NULL, 0) != CAM_SUCCESS) {
-#else 
-		if (xpt_bus_register(vbus_ext->sim, 0) != CAM_SUCCESS) {
-#endif
 			hpt_unlock_vbus(vbus_ext);
 			os_printk("xpt_bus_register failed");
 			cam_sim_free(vbus_ext->sim, /*free devq*/ TRUE);
@@ -1131,11 +1102,7 @@ static void hpt_final_init(void *dummy)
 			}
 			
 			if (bus_setup_intr(hba->pcidev, hba->irq_res, INTR_TYPE_CAM | INTR_MPSAFE,
-#if __FreeBSD_version > 700025
 				NULL, hpt_pci_intr, vbus_ext, &hba->irq_handle)) 
-#else 
-				hpt_pci_intr, vbus_ext, &hba->irq_handle)) 
-#endif
 			{
 				os_printk("can't set up interrupt");
 				return ;
@@ -1160,7 +1127,7 @@ static void hpt_final_init(void *dummy)
 	    S_IRUSR | S_IWUSR, "%s", driver_name);
 }
 
-#if defined(KLD_MODULE) && (__FreeBSD_version >= 503000)
+#if defined(KLD_MODULE)
 
 typedef struct driverlink *driverlink_t;
 struct driverlink {
@@ -1252,29 +1219,17 @@ __DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, hpt_devclass, 0, 0);
 __MODULE_VERSION(TARGETNAME, 1);
 __MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
 
-#if __FreeBSD_version>503000
-typedef struct cdev * ioctl_dev_t;
-#else 
-typedef dev_t ioctl_dev_t;
-#endif
-
-#if __FreeBSD_version >= 500000
-typedef	struct thread *	ioctl_thread_t;
-#else 
-typedef struct proc *	ioctl_thread_t;
-#endif
-
-static int hpt_open(ioctl_dev_t dev, int flags, int devtype, ioctl_thread_t td)
+static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
 	return 0;
 }
 
-static int hpt_close(ioctl_dev_t dev, int flags, int devtype, ioctl_thread_t td)
+static int hpt_close(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
 	return 0;
 }
 
-static int hpt_ioctl(ioctl_dev_t dev, u_long cmd, caddr_t data, int fflag, ioctl_thread_t td)
+static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread *td)
 {
 	PHPT_IOCTL_PARAM piop=(PHPT_IOCTL_PARAM)data;
 	IOCTL_ARG ioctl_args;
@@ -1358,19 +1313,16 @@ static int	hpt_rescan_bus(void)
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		if ((ccb = xpt_alloc_ccb()) == NULL)
 		{
-			mtx_unlock(&Giant);
 			return(ENOMEM);
 		}
 		if (xpt_create_path(&ccb->ccb_h.path, NULL, cam_sim_path(vbus_ext->sim),
 			CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP)	
 		{
 			xpt_free_ccb(ccb);
-			mtx_unlock(&Giant);
 			return(EIO);
 		}
 		xpt_rescan(ccb);
 	}
-	mtx_unlock(&Giant);
 	return(0);
 }
 
diff --git a/sys/dev/hpt27xx/os_bsd.h b/sys/dev/hpt27xx/os_bsd.h
index fd1fe6dce3c2..15c4ed7254f3 100644
--- a/sys/dev/hpt27xx/os_bsd.h
+++ b/sys/dev/hpt27xx/os_bsd.h
@@ -38,12 +38,8 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/cons.h>
-#if (__FreeBSD_version >= 500000) 
 #include <sys/time.h>
 #include <sys/systm.h> 
-#else 
-#include <machine/clock.h>	/*to support DELAY function under 4.x BSD versions*/
-#endif
 
 #include <sys/stat.h>
 #include <sys/malloc.h>
@@ -51,11 +47,9 @@
 #include <sys/libkern.h>
 #include <sys/kernel.h>
 
-#if (__FreeBSD_version >= 500000)
 #include <sys/kthread.h>
 #include <sys/mutex.h>
 #include <sys/module.h>
-#endif
 
 #include <sys/eventhandler.h>
 #include <sys/bus.h>
@@ -63,9 +57,7 @@
 #include <sys/ioccom.h>
 
 #include <machine/resource.h>
-#if __FreeBSD_version >= 500043
 #include <machine/pci_cfgreg.h>
-#endif
 #include <machine/bus.h>
 #include <machine/stdarg.h>
 #include <sys/rman.h>
@@ -73,17 +65,8 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#if (__FreeBSD_version >= 500000)
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#else 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
-#endif
-
-#if (__FreeBSD_version <= 500043)
-#include <sys/devicestat.h>
-#endif
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
@@ -95,10 +78,6 @@
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 
-#if (__FreeBSD_version < 500043)
-#include <sys/bus_private.h>
-#endif
-
 
 typedef struct _INQUIRYDATA {
 	u_char DeviceType : 5;
@@ -188,11 +167,7 @@ typedef struct _vbus_ext {
 	
 	struct cam_sim   *sim;    /* sim for this vbus */
 	struct cam_path  *path;   /* peripheral, path, tgt, lun with this vbus */
-#if (__FreeBSD_version >= 500000)
 	struct mtx        lock; /* general purpose lock */
-#else 
-	int  			hpt_splx;
-#endif
 	bus_dma_tag_t     io_dmat; /* I/O buffer DMA tag */
 	
 	POS_CMDEXT        cmdext_list;
@@ -209,20 +184,9 @@ typedef struct _vbus_ext {
 }
 VBUS_EXT, *PVBUS_EXT;
 
-#if __FreeBSD_version >= 500000
 #define hpt_lock_vbus(vbus_ext)   mtx_lock(&(vbus_ext)->lock)
 #define hpt_unlock_vbus(vbus_ext) mtx_unlock(&(vbus_ext)->lock)
 #define	hpt_assert_vbus_locked(vbus_ext) mtx_assert(&(vbus_ext)->lock, MA_OWNED)
-#else 
-static __inline	void	hpt_lock_vbus(PVBUS_EXT	vbus_ext)
-{
-	vbus_ext->hpt_splx = splcam();
-}
-static __inline	void	hpt_unlock_vbus(PVBUS_EXT vbus_ext)
-{
-	splx(vbus_ext->hpt_splx);
-}
-#endif
 
 
 #define HPT_OSM_TIMEOUT (20*hz)  /* timeout value for OS commands */
@@ -231,35 +195,9 @@ static __inline	void	hpt_unlock_vbus(PVBUS_EXT vbus_ext)
 
 #define HPT_SCAN_BUS		_IO('H', 1)
 
-#if __FreeBSD_version >= 501000
-#define TASK_ENQUEUE(task)	taskqueue_enqueue(taskqueue_swi_giant,(task));
-#else 
 #define TASK_ENQUEUE(task)	taskqueue_enqueue(taskqueue_swi,(task));
-#endif
 
-#if __FreeBSD_version >= 500000
 static	__inline	int hpt_sleep(PVBUS_EXT vbus_ext, void *ident, int priority, const char *wmesg, int timo)
 {
 	return	msleep(ident, &vbus_ext->lock, priority, wmesg, timo);
 }
-#else 
-static	__inline	int hpt_sleep(PVBUS_EXT vbus_ext, void *ident, int priority, const char *wmesg, int timo)
-{
-	int retval = 0;
-	
-	asleep(ident, priority, wmesg, timo);
-	hpt_unlock_vbus(vbus_ext);
-	retval = await(priority, timo);
-	hpt_lock_vbus(vbus_ext);
-	
-	return retval;
-}
-#endif
-
-#if __FreeBSD_version < 501000
-#define	READ_16				0x88
-#define WRITE_16			0x8a
-#define SERVICE_ACTION_IN	0x9e
-#endif
-
-#define	HPT_DEV_MAJOR	200
diff --git a/sys/dev/hptiop/hptiop.c b/sys/dev/hptiop/hptiop.c
index b25229971272..1a2bd2024744 100644
--- a/sys/dev/hptiop/hptiop.c
+++ b/sys/dev/hptiop/hptiop.c
@@ -643,7 +643,7 @@ static void hptiop_request_callback_mvfrey(struct hpt_iop_hba * hba,
 
 		ccb = (union ccb *)srb->ccb;
 
-		untimeout(hptiop_reset_adapter, hba, srb->timeout_ch);
+		callout_stop(&srb->timeout);
 
 		if (ccb->ccb_h.flags & CAM_CDB_POINTER)
 			cdb = ccb->csio.cdb_io.cdb_ptr;
@@ -2013,12 +2013,13 @@ static int hptiop_attach(device_t dev)
 	}
 
 	hba->sim = cam_sim_alloc(hptiop_action, hptiop_poll, driver_name,
-			hba, unit, &Giant, hba->max_requests - 1, 1, devq);
+			hba, unit, &hba->lock, hba->max_requests - 1, 1, devq);
 	if (!hba->sim) {
 		device_printf(dev, "cam_sim_alloc failed\n");
 		cam_simq_free(devq);
 		goto srb_dmamap_unload;
 	}
+	hptiop_lock_adapter(hba);
 	if (xpt_bus_register(hba->sim, dev, 0) != CAM_SUCCESS)
 	{
 		device_printf(dev, "xpt_bus_register failed\n");
@@ -2031,6 +2032,7 @@ static int hptiop_attach(device_t dev)
 		device_printf(dev, "xpt_create_path failed\n");
 		goto deregister_xpt_bus;
 	}
+	hptiop_unlock_adapter(hba);
 
 	bzero(&set_config, sizeof(set_config));
 	set_config.iop_id = unit;
@@ -2056,7 +2058,7 @@ static int hptiop_attach(device_t dev)
 		goto free_hba_path;
 	}
 
-	if (bus_setup_intr(hba->pcidev, hba->irq_res, INTR_TYPE_CAM,
+	if (bus_setup_intr(hba->pcidev, hba->irq_res, INTR_TYPE_CAM | INTR_MPSAFE,
 				NULL, hptiop_pci_intr, hba, &hba->irq_handle))
 	{
 		device_printf(dev, "allocate intr function failed!\n");
@@ -2086,6 +2088,7 @@ static int hptiop_attach(device_t dev)
 free_irq_resource:
 	bus_release_resource(dev, SYS_RES_IRQ, 0, hba->irq_res);
 
+	hptiop_lock_adapter(hba);
 free_hba_path:
 	xpt_free_path(hba->path);
 
@@ -2094,6 +2097,7 @@ static int hptiop_attach(device_t dev)
 
 free_cam_sim:
 	cam_sim_free(hba->sim, /*free devq*/ TRUE);
+	hptiop_unlock_adapter(hba);
 
 srb_dmamap_unload:
 	if (hba->uncached_ptr)
@@ -2145,9 +2149,10 @@ static int hptiop_detach(device_t dev)
 	if (hptiop_send_sync_msg(hba,
 		IOPMU_INBOUND_MSG0_STOP_BACKGROUND_TASK, 60000))
 		goto out;
+	hptiop_unlock_adapter(hba);
 
 	hptiop_release_resource(hba);
-	error = 0;
+	return (0);
 out:
 	hptiop_unlock_adapter(hba);
 	return error;
@@ -2182,7 +2187,10 @@ static void hptiop_pci_intr(void *arg)
 
 static void hptiop_poll(struct cam_sim *sim)
 {
-	hptiop_pci_intr(cam_sim_softc(sim));
+	struct hpt_iop_hba *hba;
+
+	hba = cam_sim_softc(sim);
+	hba->ops->iop_intr(hba);
 }
 
 static void hptiop_async(void * callback_arg, u_int32_t code,
@@ -2289,21 +2297,20 @@ static void hptiop_action(struct cam_sim *sim, union ccb *ccb)
 	switch (ccb->ccb_h.func_code) {
 
 	case XPT_SCSI_IO:
-		hptiop_lock_adapter(hba);
 		if (ccb->ccb_h.target_lun != 0 ||
 			ccb->ccb_h.target_id >= hba->max_devices ||
 			(ccb->ccb_h.flags & CAM_CDB_PHYS))
 		{
 			ccb->ccb_h.status = CAM_TID_INVALID;
 			xpt_done(ccb);
-			goto scsi_done;
+			return;
 		}
 
 		if ((srb = hptiop_get_srb(hba)) == NULL) {
 			device_printf(hba->pcidev, "srb allocated failed");
 			ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 			xpt_done(ccb);
-			goto scsi_done;
+			return;
 		}
 
 		srb->ccb = ccb;
@@ -2322,19 +2329,15 @@ static void hptiop_action(struct cam_sim *sim, union ccb *ccb)
 			ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 			hptiop_free_srb(hba, srb);
 			xpt_done(ccb);
-			goto scsi_done;
+			return;
 		}
 
-scsi_done:
-		hptiop_unlock_adapter(hba);
 		return;
 
 	case XPT_RESET_BUS:
 		device_printf(hba->pcidev, "reset adapter");
-		hptiop_lock_adapter(hba);
 		hba->msg_done = 0;
 		hptiop_reset_adapter(hba);
-		hptiop_unlock_adapter(hba);
 		break;
 
 	case XPT_GET_TRAN_SETTINGS:
@@ -2629,7 +2632,7 @@ static void hptiop_post_req_mvfrey(struct hpt_iop_hba *hba,
 	BUS_SPACE_RD4_MVFREY2(inbound_write_ptr);
 
 	if (req->header.type == IOP_REQUEST_TYPE_SCSI_COMMAND) {
-		srb->timeout_ch = timeout(hptiop_reset_adapter, hba, 20*hz);
+		callout_reset(&srb->timeout, 20 * hz, hptiop_reset_adapter, hba);
 	}
 }
 
@@ -2741,7 +2744,7 @@ static void hptiop_map_srb(void *arg, bus_dma_segment_t *segs,
 				tmp_srb->phy_addr = phy_addr;
 			}
 
-			callout_handle_init(&tmp_srb->timeout_ch);
+			callout_init_mtx(&tmp_srb->timeout, &hba->lock, 0);
 			hptiop_free_srb(hba, tmp_srb);
 			hba->srb[i] = tmp_srb;
 			phy_addr += HPT_SRB_MAX_SIZE;
@@ -2785,6 +2788,10 @@ static  int hptiop_os_query_remove_device(struct hpt_iop_hba * hba,
 static void hptiop_release_resource(struct hpt_iop_hba *hba)
 {
 	int i;
+
+	if (hba->ioctl_dev)
+		destroy_dev(hba->ioctl_dev);
+
 	if (hba->path) {
 		struct ccb_setasync ccb;
 
@@ -2797,9 +2804,14 @@ static void hptiop_release_resource(struct hpt_iop_hba *hba)
 		xpt_free_path(hba->path);
 	}
 
+	if (hba->irq_handle)
+		bus_teardown_intr(hba->pcidev, hba->irq_res, hba->irq_handle);
+
 	if (hba->sim) {
+		hptiop_lock_adapter(hba);
 		xpt_bus_deregister(cam_sim_path(hba->sim));
 		cam_sim_free(hba->sim, TRUE);
+		hptiop_unlock_adapter(hba);
 	}
 
 	if (hba->ctlcfg_dmat) {
@@ -2813,6 +2825,7 @@ static void hptiop_release_resource(struct hpt_iop_hba *hba)
 		struct hpt_iop_srb *srb = hba->srb[i];
 		if (srb->dma_map)
 			bus_dmamap_destroy(hba->io_dmat, srb->dma_map);
+		callout_drain(&srb->timeout);
 	}
 
 	if (hba->srb_dmat) {
@@ -2827,9 +2840,6 @@ static void hptiop_release_resource(struct hpt_iop_hba *hba)
 	if (hba->parent_dmat)
 		bus_dma_tag_destroy(hba->parent_dmat);
 
-	if (hba->irq_handle)
-		bus_teardown_intr(hba->pcidev, hba->irq_res, hba->irq_handle);
-
 	if (hba->irq_res)
 		bus_release_resource(hba->pcidev, SYS_RES_IRQ,
 					0, hba->irq_res);
@@ -2840,6 +2850,5 @@ static void hptiop_release_resource(struct hpt_iop_hba *hba)
 	if (hba->bar2_res)
 		bus_release_resource(hba->pcidev, SYS_RES_MEMORY,
 					hba->bar2_rid, hba->bar2_res);
-	if (hba->ioctl_dev)
-		destroy_dev(hba->ioctl_dev);
+	mtx_destroy(&hba->lock);
 }
diff --git a/sys/dev/hptiop/hptiop.h b/sys/dev/hptiop/hptiop.h
index 67ff7fcd8646..ba8c16b43ab6 100644
--- a/sys/dev/hptiop/hptiop.h
+++ b/sys/dev/hptiop/hptiop.h
@@ -460,7 +460,7 @@ struct hpt_iop_srb {
 	u_int64_t            phy_addr;
 	u_int32_t            srb_flag;
 	int                  index;
-	struct callout_handle	timeout_ch;
+	struct callout	     timeout;
 };
 
 #define hptiop_lock_adapter(hba)   mtx_lock(&(hba)->lock)
diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
index 37ff6c2b7be4..8eabb2d25974 100644
--- a/sys/dev/hptmv/entry.c
+++ b/sys/dev/hptmv/entry.c
@@ -40,20 +40,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/kthread.h>
 
-#if (__FreeBSD_version >= 500000)
 #include <sys/mutex.h>
 #include <sys/module.h>
-#endif
+#include <sys/sx.h>
 
-#if (__FreeBSD_version >= 500000)
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#else 
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
-#include <sys/wait.h>
-#include <sys/sysproto.h>
-#endif
 
 #ifndef __KERNEL__
 #define __KERNEL__
@@ -119,6 +111,7 @@ static void HPTLIBAPI fOsCommandDone(_VBUS_ARG PCommand pCmd);
 static void ccb_done(union ccb *ccb);
 static void hpt_queue_ccb(union ccb **ccb_Q, union ccb *ccb);
 static void hpt_free_ccb(union ccb **ccb_Q, union ccb *ccb);
+static void hpt_intr_locked(IAL_ADAPTER_T *pAdapter);
 static void	hptmv_free_edma_queues(IAL_ADAPTER_T *pAdapter);
 static void	hptmv_free_channel(IAL_ADAPTER_T *pAdapter, MV_U8 channelNum);
 static void	handleEdmaError(_VBUS_ARG PCommand pCmd);
@@ -143,6 +136,8 @@ static MV_BOOLEAN hptmv_event_notify(MV_SATA_ADAPTER *pMvSataAdapter,
 #define ccb_ccb_ptr spriv_ptr0
 #define ccb_adapter ccb_h.spriv_ptr1
 
+static struct sx hptmv_list_lock;
+SX_SYSINIT(hptmv_list_lock, &hptmv_list_lock, "hptmv list");
 IAL_ADAPTER_T *gIal_Adapter = 0;
 IAL_ADAPTER_T *pCurAdapter = 0;
 static MV_SATA_CHANNEL gMvSataChannels[MAX_VBUS][MV_SATA_CHANNELS_NUM];
@@ -159,48 +154,11 @@ UCHAR DPC_Request_Nums = 0;
 static ST_HPT_DPC DpcQueue[MAX_DPC];
 static int DpcQueue_First=0;
 static int DpcQueue_Last = 0;
+static struct mtx DpcQueue_Lock;
+MTX_SYSINIT(hpmtv_dpc_lock, &DpcQueue_Lock, "hptmv dpc", MTX_DEF);
 
 char DRIVER_VERSION[] = "v1.16";
 
-#if (__FreeBSD_version >= 500000)
-static struct mtx driver_lock;
-intrmask_t lock_driver()
-{
-
-	intrmask_t spl = 0;
-	mtx_lock(&driver_lock);
-	return spl;
-}
-void unlock_driver(intrmask_t spl)
-{
-	mtx_unlock(&driver_lock);
-}
-#else 
-static int driver_locked = 0;
-intrmask_t lock_driver()
-{
-	intrmask_t spl = splcam();
-loop:
-	while (driver_locked)
-		tsleep(&driver_locked, PRIBIO, "hptlck", hz);
-	atomic_add_int(&driver_locked, 1);
-	if (driver_locked>1) {
-		atomic_subtract_int(&driver_locked, 1);
-		goto loop;
-	}
-	return spl;
-}
-
-void unlock_driver(intrmask_t spl)
-{
-	atomic_subtract_int(&driver_locked, 1);
-	if (driver_locked==0) {
-		wakeup(&driver_locked);
-	}
-	splx(spl);
-}
-#endif
-
 /*******************************************************************************
  *	Name:	hptmv_free_channel
  *
@@ -790,7 +748,8 @@ hptmv_handle_event(void * data, int flag)
 	IAL_ADAPTER_T   *pAdapter = (IAL_ADAPTER_T *)data;
 	MV_SATA_ADAPTER *pMvSataAdapter = &pAdapter->mvSataAdapter;
 	MV_U8           channelIndex;
- 
+
+	mtx_assert(&pAdapter->lock, MA_OWNED);
 /*	mvOsSemTake(&pMvSataAdapter->semaphore); */
 	for (channelIndex = 0; channelIndex < MV_SATA_CHANNELS_NUM; channelIndex++)
 	{
@@ -898,7 +857,7 @@ hptmv_event_notify(MV_SATA_ADAPTER *pMvSataAdapter, MV_EVENT_TYPE eventType,
 					KdPrint(("RR18xx [%d,%d]: device connected event received\n",
 							 pMvSataAdapter->adapterId, channel));
 					/* Delete previous timers (if multiple drives connected in the same time */
-					pAdapter->event_timer_connect = timeout(hptmv_handle_event_connect, pAdapter, 10*hz);
+					callout_reset(&pAdapter->event_timer_connect, 10 * hz, hptmv_handle_event_connect, pAdapter);
 				}
 				else if (param1 == EVENT_DISCONNECT)
 				{
@@ -907,7 +866,7 @@ hptmv_event_notify(MV_SATA_ADAPTER *pMvSataAdapter, MV_EVENT_TYPE eventType,
 							 pMvSataAdapter->adapterId, channel));
 					device_change(pAdapter, channel, FALSE);
 					/* Delete previous timers (if multiple drives disconnected in the same time */
-					/*pAdapter->event_timer_disconnect = timeout(hptmv_handle_event_disconnect, pAdapter, 10*hz); */
+					/*callout_reset(&pAdapter->event_timer_disconnect, 10 * hz, hptmv_handle_event_disconnect, pAdapter); */
 					/*It is not necessary to wait, handle it directly*/
 					hptmv_handle_event_disconnect(pAdapter);
 				}
@@ -1286,18 +1245,6 @@ dmamap_put(PBUS_DMAMAP p)
 	p->pAdapter->pbus_dmamap_list = p;
 }
 
-/*Since mtx not provide the initialize when declare, so we Final init here to initialize the global mtx*/
-#if __FreeBSD_version >= 500000
-#define override_kernel_driver()
-
-static void hpt_init(void *dummy)
-{
-	override_kernel_driver();	
-	mtx_init(&driver_lock, "hptsleeplock", NULL, MTX_DEF);
-}
-SYSINIT(hptinit, SI_SUB_CONFIGURE, SI_ORDER_FIRST, hpt_init, NULL);
-#endif
-
 static int num_adapters = 0;
 static int
 init_adapter(IAL_ADAPTER_T *pAdapter)
@@ -1308,8 +1255,11 @@ init_adapter(IAL_ADAPTER_T *pAdapter)
 
 	PVDevice pVDev;
 
-	intrmask_t oldspl = lock_driver();
+	mtx_init(&pAdapter->lock, "hptsleeplock", NULL, MTX_DEF);
+	callout_init_mtx(&pAdapter->event_timer_connect, &pAdapter->lock, 0);
+	callout_init_mtx(&pAdapter->event_timer_disconnect, &pAdapter->lock, 0);
 
+	sx_xlock(&hptmv_list_lock);
 	pAdapter->next = 0;
 
 	if(gIal_Adapter == 0){
@@ -1320,6 +1270,7 @@ init_adapter(IAL_ADAPTER_T *pAdapter)
 		pCurAdapter->next = pAdapter;
 		pCurAdapter = pAdapter;
 	}
+	sx_xunlock(&hptmv_list_lock);
 
 	pAdapter->outstandingCommands = 0;
 
@@ -1337,10 +1288,8 @@ init_adapter(IAL_ADAPTER_T *pAdapter)
 			MAX_SG_DESCRIPTORS, /* nsegments */
 			0x10000,	/* maxsegsize */
 			BUS_DMA_WAITOK, 	/* flags */
-#if __FreeBSD_version>502000
 			busdma_lock_mutex,	/* lockfunc */
-			&driver_lock,		/* lockfuncarg */
-#endif
+			&pAdapter->lock,	/* lockfuncarg */
 			&pAdapter->io_dma_parent /* tag */))
 		{
 			return ENXIO;
@@ -1350,7 +1299,6 @@ init_adapter(IAL_ADAPTER_T *pAdapter)
 	if (hptmv_allocate_edma_queues(pAdapter))
 	{
 		MV_ERROR("RR18xx: Failed to allocate memory for EDMA queues\n");
-		unlock_driver(oldspl);
 		return ENOMEM;
 	}
 
@@ -1363,7 +1311,6 @@ init_adapter(IAL_ADAPTER_T *pAdapter)
 	{
 		MV_ERROR("RR18xx: Failed to remap memory space\n");
 		hptmv_free_edma_queues(pAdapter);
-		unlock_driver(oldspl);
 		return ENXIO;
 	}
 	else
@@ -1393,7 +1340,6 @@ init_adapter(IAL_ADAPTER_T *pAdapter)
 unregister:
 		bus_release_resource(pAdapter->hpt_dev, SYS_RES_MEMORY, rid, pAdapter->mem_res);
 		hptmv_free_edma_queues(pAdapter);
-		unlock_driver(oldspl);
 		return ENXIO;
 	}
 	pAdapter->ver_601 = pMvSataAdapter->pcbVersion;
@@ -1438,7 +1384,7 @@ init_adapter(IAL_ADAPTER_T *pAdapter)
 			free(pAdapter->pbus_dmamap, M_DEVBUF);
 			goto unregister;
 		}
-		callout_handle_init(&pmap->timeout_ch);
+		callout_init_mtx(&pmap->timeout, &pAdapter->lock, 0);
 	}
 	/* setup PRD Tables */
 	KdPrint(("Allocate PRD Tables\n"));
@@ -1537,7 +1483,6 @@ init_adapter(IAL_ADAPTER_T *pAdapter)
 #endif
 
 	mvSataUnmaskAdapterInterrupt(pMvSataAdapter);
-	unlock_driver(oldspl);
 	return 0;
 }
 
@@ -2036,20 +1981,7 @@ hpt_attach(device_t dev)
 	struct cam_devq *devq;
 	struct cam_sim *hpt_vsim;
 
-	printf("%s Version %s \n", DRIVER_NAME, DRIVER_VERSION);
-
-	if (!pAdapter)
-	{
-		pAdapter = (IAL_ADAPTER_T *)malloc(sizeof (IAL_ADAPTER_T), M_DEVBUF, M_NOWAIT);
-#if __FreeBSD_version > 410000
-		device_set_softc(dev, (void *)pAdapter);
-#else 
-		device_set_driver(dev, (driver_t *)pAdapter);
-#endif
-	}
-
-	if (!pAdapter) return (ENOMEM);
-	bzero(pAdapter, sizeof(IAL_ADAPTER_T));
+	device_printf(dev, "%s Version %s \n", DRIVER_NAME, DRIVER_VERSION);
 
 	pAdapter->hpt_dev = dev;
 	
@@ -2064,13 +1996,9 @@ hpt_attach(device_t dev)
 		return(ENXIO);
 	}
 
-#if __FreeBSD_version <700000
-	if (bus_setup_intr(pAdapter->hpt_dev, pAdapter->hpt_irq, INTR_TYPE_CAM,
-				hpt_intr, pAdapter, &pAdapter->hpt_intr))
-#else 
-	if (bus_setup_intr(pAdapter->hpt_dev, pAdapter->hpt_irq, INTR_TYPE_CAM,
+	if (bus_setup_intr(pAdapter->hpt_dev, pAdapter->hpt_irq,
+				INTR_TYPE_CAM | INTR_MPSAFE,
 				NULL, hpt_intr, pAdapter, &pAdapter->hpt_intr))
-#endif
 	{
 		hpt_printk(("can't set up interrupt\n"));
 		free(pAdapter, M_DEVBUF);
@@ -2100,25 +2028,19 @@ hpt_attach(device_t dev)
 	/*
 	 * Construct our SIM entry
 	 */
-#if __FreeBSD_version <700000
 	hpt_vsim = cam_sim_alloc(hpt_action, hpt_poll, __str(PROC_DIR_NAME),
-			pAdapter, device_get_unit(pAdapter->hpt_dev), 1, 8, devq);
-#else 
-	hpt_vsim = cam_sim_alloc(hpt_action, hpt_poll, __str(PROC_DIR_NAME),
-			pAdapter, device_get_unit(pAdapter->hpt_dev), &Giant, 1, 8, devq);
-#endif
+			pAdapter, device_get_unit(pAdapter->hpt_dev),
+			&pAdapter->lock, 1, 8, devq);
 	if (hpt_vsim == NULL) {
 		cam_simq_free(devq);
 		return ENOMEM;
 	}
 
-#if __FreeBSD_version <700000
-	if (xpt_bus_register(hpt_vsim, 0) != CAM_SUCCESS)
-#else 
+	mtx_lock(&pAdapter->lock);
 	if (xpt_bus_register(hpt_vsim, dev, 0) != CAM_SUCCESS)
-#endif
 	{
 		cam_sim_free(hpt_vsim, /*free devq*/ TRUE);
+		mtx_unlock(&pAdapter->lock);
 		hpt_vsim = NULL;
 		return ENXIO;
 	}
@@ -2129,9 +2051,11 @@ hpt_attach(device_t dev)
 	{
 		xpt_bus_deregister(cam_sim_path(hpt_vsim));
 		cam_sim_free(hpt_vsim, /*free_devq*/TRUE);
+		mtx_unlock(&pAdapter->lock);
 		hpt_vsim = NULL;
 		return ENXIO;
 	}
+	mtx_unlock(&pAdapter->lock);
 
 	xpt_setup_ccb(&(ccb->ccb_h), pAdapter->path, /*priority*/5);
 	ccb->ccb_h.func_code = XPT_SASYNC_CB;
@@ -2164,7 +2088,11 @@ hpt_detach(device_t dev)
 static void
 hpt_poll(struct cam_sim *sim)
 {
-	hpt_intr((void *)cam_sim_softc(sim));
+	IAL_ADAPTER_T *pAdapter;
+
+	pAdapter = cam_sim_softc(sim);
+	
+	hpt_intr_locked((void *)cam_sim_softc(sim));
 }
 
 /****************************************************************
@@ -2174,9 +2102,19 @@ hpt_poll(struct cam_sim *sim)
 static void
 hpt_intr(void *arg)
 {
-	IAL_ADAPTER_T *pAdapter = (IAL_ADAPTER_T *)arg;
-	intrmask_t oldspl = lock_driver();
-	
+	IAL_ADAPTER_T *pAdapter;
+
+	pAdapter = arg;
+	mtx_lock(&pAdapter->lock);
+	hpt_intr_locked(pAdapter);
+	mtx_unlock(&pAdapter->lock);
+}
+
+static void
+hpt_intr_locked(IAL_ADAPTER_T *pAdapter)
+{
+
+	mtx_assert(&pAdapter->lock, MA_OWNED);
 	/* KdPrintI(("----- Entering Isr() -----\n")); */
 	if (mvSataInterruptServiceRoutine(&pAdapter->mvSataAdapter) == MV_TRUE)
 	{
@@ -2185,7 +2123,6 @@ hpt_intr(void *arg)
 	}
 
 	/* KdPrintI(("----- Leaving Isr() -----\n")); */
-	unlock_driver(oldspl);
 }
 
 /**********************************************************
@@ -2228,11 +2165,11 @@ hpt_shutdown(device_t dev)
 		IAL_ADAPTER_T *pAdapter;
 	
 		pAdapter = device_get_softc(dev);
-		if (pAdapter == NULL)
-			return (EINVAL);
 
 		EVENTHANDLER_DEREGISTER(shutdown_final, pAdapter->eh);
+		mtx_lock(&pAdapter->lock);
 		FlushAdapter(pAdapter);
+		mtx_unlock(&pAdapter->lock);
 		  /* give the flush some time to happen, 
 		    *otherwise "shutdown -p now" will make file system corrupted */
 		DELAY(1000 * 1000 * 5);
@@ -2288,6 +2225,7 @@ ccb_done(union ccb *ccb)
 	{
 		if(DPC_Request_Nums == 0)
 			Check_Idle_Call(pAdapter);
+		wakeup(pAdapter);
 	}
 }
 
@@ -2301,11 +2239,11 @@ ccb_done(union ccb *ccb)
 void
 hpt_action(struct cam_sim *sim, union ccb *ccb)
 {
-	intrmask_t oldspl;
 	IAL_ADAPTER_T * pAdapter = (IAL_ADAPTER_T *) cam_sim_softc(sim);
 	PBUS_DMAMAP  pmap;
 	_VBUS_INST(&pAdapter->VBus)
 
+	mtx_assert(&pAdapter->lock, MA_OWNED);
 	CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_TRACE, ("hpt_action\n"));
 	KdPrint(("hpt_action(%lx,%lx{%x})\n", (u_long)sim, (u_long)ccb, ccb->ccb_h.func_code));
 
@@ -2327,7 +2265,6 @@ hpt_action(struct cam_sim *sim, union ccb *ccb)
 				return;
 			}
 
-			oldspl = lock_driver();
 			if (pAdapter->outstandingCommands==0 && DPC_Request_Nums==0)
 				Check_Idle_Call(pAdapter);
 
@@ -2340,7 +2277,6 @@ hpt_action(struct cam_sim *sim, union ccb *ccb)
 				hpt_queue_ccb(&pAdapter->pending_Q, ccb);
 			else
 				OsSendCommand(_VBUS_P ccb);
-			unlock_driver(oldspl);
 
 			/* KdPrint(("leave scsiio\n")); */
 			break;
@@ -2348,9 +2284,7 @@ hpt_action(struct cam_sim *sim, union ccb *ccb)
 
 		case XPT_RESET_BUS:
 			KdPrint(("reset bus\n"));
-			oldspl = lock_driver();
 			fResetVBus(_VBUS_P0);
-			unlock_driver(oldspl);
 			xpt_done(ccb);
 			break;
 
@@ -2374,29 +2308,7 @@ hpt_action(struct cam_sim *sim, union ccb *ccb)
 			break;
 
 		case XPT_CALC_GEOMETRY:
-#if __FreeBSD_version >= 500000
 			cam_calc_geometry(&ccb->ccg, 1);
-#else
-			{
-			struct	  ccb_calc_geometry *ccg;
-			u_int32_t size_mb;
-			u_int32_t secs_per_cylinder;
-
-			ccg = &ccb->ccg;
-			size_mb = ccg->volume_size / ((1024L * 1024L) / ccg->block_size);
-
-			if (size_mb > 1024 ) {
-				ccg->heads = 255;
-				ccg->secs_per_track = 63;
-			} else {
-				ccg->heads = 64;
-				ccg->secs_per_track = 32;
-			}
-			secs_per_cylinder = ccg->heads * ccg->secs_per_track;
-			ccg->cylinders = ccg->volume_size / secs_per_cylinder;
-			ccb->ccb_h.status = CAM_REQ_CMP;
-			}
-#endif
 			xpt_done(ccb);
 			break;
 
@@ -2482,20 +2394,20 @@ hpt_free_ccb(union ccb **ccb_Q, union ccb *ccb)
  ***************************************************************************/
 static void hpt_worker_thread(void)
 {
-	intrmask_t oldspl;
 
 	for(;;)	{
+		mtx_lock(&DpcQueue_Lock);
 		while (DpcQueue_First!=DpcQueue_Last) {
 			ST_HPT_DPC p;
-			oldspl = lock_driver();
 			p = DpcQueue[DpcQueue_First];
 			DpcQueue_First++;
 			DpcQueue_First %= MAX_DPC;
 			DPC_Request_Nums++;
-			unlock_driver(oldspl);
+			mtx_unlock(&DpcQueue_Lock);
 			p.dpc(p.pAdapter, p.arg, p.flags);
 
-			oldspl = lock_driver();
+			mtx_lock(&p.pAdapter->lock);
+			mtx_lock(&DpcQueue_Lock);
 			DPC_Request_Nums--;
 			/* since we may have prevented Check_Idle_Call, do it here */
 			if (DPC_Request_Nums==0) {
@@ -2505,28 +2417,22 @@ static void hpt_worker_thread(void)
 					CheckPendingCall(_VBUS_P0);
 				}
 			}
-			unlock_driver(oldspl);
+			mtx_unlock(&p.pAdapter->lock);
+			mtx_unlock(&DpcQueue_Lock);
 
 			/*Schedule out*/
-#if (__FreeBSD_version < 500000)
-			YIELD_THREAD;
-#else 
-#if (__FreeBSD_version > 700033)
-			pause("sched", 1);
-#else
-			tsleep((caddr_t)hpt_worker_thread, PPAUSE, "sched", 1); 
-#endif
-#endif
 			if (SIGISMEMBER(curproc->p_siglist, SIGSTOP)) {
 				/* abort rebuilding process. */
 				IAL_ADAPTER_T *pAdapter;
 				PVDevice      pArray;
 				PVBus         _vbus_p;
 				int i;
+
+				sx_slock(&hptmv_list_lock);
 				pAdapter = gIal_Adapter;
 
 				while(pAdapter != 0){
-
+					mtx_lock(&pAdapter->lock);
 					_vbus_p = &pAdapter->VBus;
 
 					for (i=0;i<MAX_ARRAY_PER_VBUS;i++) 
@@ -2540,34 +2446,24 @@ static void hpt_worker_thread(void)
 								pArray->u.array.rf_abort_rebuild = 1;
 							}
 					}
+					mtx_unlock(&pAdapter->lock);
 					pAdapter = pAdapter->next;
 				}
+				sx_sunlock(&hptmv_list_lock);
 			}
+			mtx_lock(&DpcQueue_Lock);
 		}
+		mtx_unlock(&DpcQueue_Lock);
 
 /*Remove this debug option*/
 /*
 #ifdef DEBUG
 		if (SIGISMEMBER(curproc->p_siglist, SIGSTOP))
-#if (__FreeBSD_version > 700033)
 			pause("hptrdy", 2*hz);
-#else
-			tsleep((caddr_t)hpt_worker_thread, PPAUSE, "hptrdy", 2*hz);
-#endif
 #endif
 */
-	#if (__FreeBSD_version >= 800002)
 		kproc_suspend_check(curproc);
-	#elif (__FreeBSD_version >= 500043)
-		kthread_suspend_check(curproc);
-	#else 
-		kproc_suspend_loop(curproc);
-	#endif
-#if (__FreeBSD_version > 700033)
-		pause("hptrdy", 2*hz);  /* wait for something to do */
-#else
-		tsleep((caddr_t)hpt_worker_thread, PPAUSE, "hptrdy", 2*hz);  /* wait for something to do */
-#endif
+		pause("-", 2*hz);  /* wait for something to do */
 	}
 }
 
@@ -2586,6 +2482,7 @@ launch_worker_thread(void)
 	
 	kproc_start(&hpt_kp);
 
+	sx_slock(&hptmv_list_lock);
 	for (pAdapTemp = gIal_Adapter; pAdapTemp; pAdapTemp = pAdapTemp->next) {
 
 		_VBUS_INST(&pAdapTemp->VBus)
@@ -2601,17 +2498,13 @@ launch_worker_thread(void)
 					(UCHAR)((pVDev->u.array.CriticalMembers || pVDev->VDeviceType == VD_RAID_1)? DUPLICATE : REBUILD_PARITY));
 			}
 	}
+	sx_sunlock(&hptmv_list_lock);
 
 	/*
 	 * hpt_worker_thread needs to be suspended after shutdown sync, when fs sync finished.
 	 */
-#if (__FreeBSD_version < 500043)
-	EVENTHANDLER_REGISTER(shutdown_post_sync, shutdown_kproc, hptdaemonproc,
-	    SHUTDOWN_PRI_LAST);
-#else 
 	EVENTHANDLER_REGISTER(shutdown_post_sync, kproc_shutdown, hptdaemonproc,
 	    SHUTDOWN_PRI_LAST);
-#endif
 }
 /*
  *SYSINIT(hptwt, SI_SUB_KTHREAD_IDLE, SI_ORDER_FIRST, launch_worker_thread, NULL);
@@ -2721,10 +2614,12 @@ SetInquiryData(PINQUIRYDATA inquiryData, PVDevice pVDev)
 static void
 hpt_timeout(void *arg)
 {
-	_VBUS_INST(&((PBUS_DMAMAP)((union ccb *)arg)->ccb_adapter)->pAdapter->VBus)
-	intrmask_t oldspl = lock_driver();
+	PBUS_DMAMAP pmap = (PBUS_DMAMAP)((union ccb *)arg)->ccb_adapter;
+	IAL_ADAPTER_T *pAdapter = pmap->pAdapter;
+	_VBUS_INST(&pAdapter->VBus)
+
+	mtx_assert(&pAdapter->lock, MA_OWNED);
 	fResetVBus(_VBUS_P0);
-	unlock_driver(oldspl);
 }
 
 static void 
@@ -2766,7 +2661,7 @@ hpt_io_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
 		}
 	}
 
-	pmap->timeout_ch = timeout(hpt_timeout, (caddr_t)ccb, 20*hz);
+	callout_reset(&pmap->timeout, 20 * hz, hpt_timeout, ccb);
 	pVDev->pfnSendCommand(_VBUS_P pCmd);
 	CheckPendingCall(_VBUS_P0);
 }
@@ -2964,6 +2859,8 @@ OsSendCommand(_VBUS_ARG union ccb *ccb)
 				ccb->ccb_h.status = CAM_REQ_CMP_ERR;
 				dmamap_put(pmap);
 				pAdapter->outstandingCommands--;
+				if (pAdapter->outstandingCommands == 0)
+					wakeup(pAdapter);
 				xpt_done(ccb);
 			}
 			goto Command_Complished;
@@ -2987,8 +2884,8 @@ fOsCommandDone(_VBUS_ARG PCommand pCmd)
 	IAL_ADAPTER_T *pAdapter = pmap->pAdapter;
 
 	KdPrint(("fOsCommandDone(pcmd=%p, result=%d)\n", pCmd, pCmd->Result));
-	
-	untimeout(hpt_timeout, (caddr_t)ccb, pmap->timeout_ch);
+
+	callout_stop(&pmap->timeout);
 	
 	switch(pCmd->Result) {
 	case RETURN_SUCCESS:
@@ -3032,9 +2929,11 @@ hpt_queue_dpc(HPT_DPC dpc, IAL_ADAPTER_T * pAdapter, void *arg, UCHAR flags)
 {
 	int p;
 
+	mtx_lock(&DpcQueue_Lock);
 	p = (DpcQueue_Last + 1) % MAX_DPC;
 	if (p==DpcQueue_First) {
 		KdPrint(("DPC Queue full!\n"));
+		mtx_unlock(&DpcQueue_Lock);
 		return -1;
 	}
 
@@ -3043,6 +2942,7 @@ hpt_queue_dpc(HPT_DPC dpc, IAL_ADAPTER_T * pAdapter, void *arg, UCHAR flags)
 	DpcQueue[DpcQueue_Last].arg = arg;
 	DpcQueue[DpcQueue_Last].flags = flags;
 	DpcQueue_Last = p;
+	mtx_unlock(&DpcQueue_Lock);
 
 	return 0;
 }
diff --git a/sys/dev/hptmv/global.h b/sys/dev/hptmv/global.h
index c6f69825add0..18390a7e5941 100644
--- a/sys/dev/hptmv/global.h
+++ b/sys/dev/hptmv/global.h
@@ -132,11 +132,6 @@ typedef struct _VDevice_Ext
 #define LongDiv(x, y)      	(x / (UINT)(y))
 #define LongRem(x, y)		(x % (UINT)(y))
 #define LongMul(x, y)      	(x * y)
-/* Minimum and maximum macros */
-#if (__FreeBSD_version < 501000)
-#define MAX(a, b)	(((a) > (b)) ? (a) : (b))
-#define MIN(a, b)	(((a) < (b)) ? (a) : (b))
-#endif
 
 /*************************************************************************
  * C library
@@ -151,9 +146,6 @@ unsigned HPTLIBAPI os_strlen(const char *s);
 #define memcpy os_memcpy
 #define memset os_memset
 #define strlen os_strlen
-#elif (__FreeBSD_version <= 410000) 
-#define	memcpy(d, s, len)     bcopy((s),(d),(len))
-#define	memset(d, s, len)     bzero((d),(len))
 #endif
 #define ZeroMemory(a, b)  	memset((char *)a, 0, b)
 #define MemoryCopy(a,b,c) 	memcpy((char *)(a), (char *)(b), (UINT)(c))
diff --git a/sys/dev/hptmv/hptproc.c b/sys/dev/hptmv/hptproc.c
index 93eff51d8dcb..7971e73040b2 100644
--- a/sys/dev/hptmv/hptproc.c
+++ b/sys/dev/hptmv/hptproc.c
@@ -65,8 +65,8 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
 	PVDevice pSubArray, pVDev;
 	UINT	i, iarray, ichan;
 	struct cam_periph *periph = NULL;
-	intrmask_t oldspl;
 
+	mtx_lock(&pAdapter->lock);
 #ifdef SUPPORT_ARRAY	
 	if (length>=8 && strncmp(buffer, "rebuild ", 8)==0) 
 	{
@@ -74,7 +74,6 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
 		length-=8;
 		if (length>=5 && strncmp(buffer, "start", 5)==0) 
 		{
-			oldspl = lock_driver();
 			for(i = 0; i < MAX_ARRAY_PER_VBUS; i++)
 				if ((pArray=ArrayTables(i))->u.array.dArStamp==0)
 					continue; 
@@ -83,12 +82,11 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
 	                    hpt_queue_dpc((HPT_DPC)hpt_rebuild_data_block, pAdapter, pArray, 
 							(UCHAR)((pArray->u.array.CriticalMembers || pArray->VDeviceType == VD_RAID_1)? DUPLICATE : REBUILD_PARITY));
 				}
-			unlock_driver(oldspl);
+			mtx_unlock(&pAdapter->lock);
 			return orig_length;
 		}
 		else if (length>=4 && strncmp(buffer, "stop", 4)==0) 
 		{
-			oldspl = lock_driver();
 			for(i = 0; i < MAX_ARRAY_PER_VBUS; i++)
 				if ((pArray=ArrayTables(i))->u.array.dArStamp==0)
 					continue; 
@@ -96,7 +94,7 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
 					if (pArray->u.array.rf_rebuilding)
 					    pArray->u.array.rf_abort_rebuild = 1;
 				}
-			unlock_driver(oldspl);
+			mtx_unlock(&pAdapter->lock);
 			return orig_length;
 		}	
 		else if (length>=3 && buffer[1]==','&& buffer[0]>='1'&& buffer[2]>='1')	
@@ -107,17 +105,24 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
             if(iarray >= MAX_VDEVICE_PER_VBUS || ichan >= MV_SATA_CHANNELS_NUM) return -EINVAL;
 
 			pArray = _vbus_p->pVDevice[iarray];
-	        if (!pArray || (pArray->vf_online == 0)) return -EINVAL;
+			if (!pArray || (pArray->vf_online == 0)) {
+				mtx_unlock(&pAdapter->lock);
+				return -EINVAL;
+			}
 
             for (i=0;i<MV_SATA_CHANNELS_NUM;i++)
 				if(i == ichan)
 				    goto rebuild;
 
+	        mtx_unlock(&pAdapter->lock);
 	        return -EINVAL;
 
 rebuild:
 	        pVDev = &pAdapter->VDevices[ichan];
-	        if(!pVDev->u.disk.df_on_line || pVDev->pParent) return -EINVAL;
+	        if(!pVDev->u.disk.df_on_line || pVDev->pParent) {
+			mtx_unlock(&pAdapter->lock);
+			return -EINVAL;
+		}
 
 	        /* Not allow to use a mounted disk ??? test*/
 			for(i = 0; i < MAX_VDEVICE_PER_VBUS; i++)
@@ -127,6 +132,7 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
 					if (periph != NULL && periph->refcount >= 1)
 					{
 						hpt_printk(("Can not use disk used by OS!\n"));
+			    mtx_unlock(&pAdapter->lock);
 	                    return -EINVAL;	
 					}
 					/* the Mounted Disk isn't delete */
@@ -139,15 +145,13 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
 				{
 					pSubArray = pArray;
 loop:
-					oldspl = lock_driver();
 					if(hpt_add_disk_to_array(_VBUS_P VDEV_TO_ID(pSubArray), VDEV_TO_ID(pVDev)) == -1) {
-						unlock_driver(oldspl);
+						mtx_unlock(&pAdapter->lock);
 						return -EINVAL;
 					}
 					pSubArray->u.array.rf_auto_rebuild = 0;
 					pSubArray->u.array.rf_abort_rebuild = 0;
 					hpt_queue_dpc((HPT_DPC)hpt_rebuild_data_block, pAdapter, pSubArray, DUPLICATE);
-					unlock_driver(oldspl);
 					break;
 				}
 				case VD_RAID_0:
@@ -159,8 +163,10 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
 							  goto loop;
 						}
 				default:
+					mtx_unlock(&pAdapter->lock);
 					return -EINVAL;
 			}
+			mtx_unlock(&pAdapter->lock);
 			return orig_length;
 		}
 	}
@@ -175,24 +181,31 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
             if (length>=1 && *buffer>='1') 
 			{
 				iarray = *buffer-'1';
-				if(iarray >= MAX_VDEVICE_PER_VBUS) return -EINVAL;
+				if(iarray >= MAX_VDEVICE_PER_VBUS) {
+					mtx_unlock(&pAdapter->lock);
+					return -EINVAL;
+				}
 
 				pArray = _vbus_p->pVDevice[iarray];
-				if (!pArray || (pArray->vf_online == 0)) return -EINVAL;
-				
-				if(pArray->VDeviceType != VD_RAID_1 && pArray->VDeviceType != VD_RAID_5)
+				if (!pArray || (pArray->vf_online == 0)) {
+					mtx_unlock(&pAdapter->lock);
 					return -EINVAL;
+				}
+				
+				if(pArray->VDeviceType != VD_RAID_1 && pArray->VDeviceType != VD_RAID_5) {
+					mtx_unlock(&pAdapter->lock);
+					return -EINVAL;
+				}
 
 				if (!(pArray->u.array.rf_need_rebuild ||
 					pArray->u.array.rf_rebuilding ||
 					pArray->u.array.rf_verifying ||
 					pArray->u.array.rf_initializing))
 				{
-					oldspl = lock_driver();
 					pArray->u.array.RebuildSectors = 0;
 					hpt_queue_dpc((HPT_DPC)hpt_rebuild_data_block, pAdapter, pArray, VERIFY);
-					unlock_driver(oldspl);
 				}
+		mtx_unlock(&pAdapter->lock);
                 return orig_length;
 			}
 		}
@@ -203,16 +216,21 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
             if (length>=1 && *buffer>='1') 
 			{
 				iarray = *buffer-'1';
-				if(iarray >= MAX_VDEVICE_PER_VBUS) return -EINVAL;
+				if(iarray >= MAX_VDEVICE_PER_VBUS) {
+					mtx_unlock(&pAdapter->lock);
+					return -EINVAL;
+				}
 
 				pArray = _vbus_p->pVDevice[iarray];
-				if (!pArray || (pArray->vf_online == 0)) return -EINVAL;
+				if (!pArray || (pArray->vf_online == 0)) {
+					mtx_unlock(&pAdapter->lock);
+					return -EINVAL;
+				}
 				if(pArray->u.array.rf_verifying) 
 				{
-					oldspl = lock_driver();
 				    pArray->u.array.rf_abort_rebuild = 1;
-				    unlock_driver(oldspl);
 				}
+			    mtx_unlock(&pAdapter->lock);
 			    return orig_length;
 			}
 		}
@@ -226,6 +244,7 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
 			_vbus_(r5.enable_write_back) = *buffer-'0';
 			if (_vbus_(r5.enable_write_back))
 				hpt_printk(("RAID5 write back enabled"));
+			mtx_unlock(&pAdapter->lock);
 			return orig_length;
 		}
 	}
@@ -239,6 +258,7 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
 		length-=9;
 		if (length>=1 && *buffer>='0' && *buffer<='3') {
 			hpt_dbg_level = *buffer-'0';
+			mtx_unlock(&pAdapter->lock);
 			return orig_length;
 		}
 	}
@@ -246,6 +266,7 @@ hpt_set_asc_info(IAL_ADAPTER_T *pAdapter, char *buffer,int length)
 		/* TO DO */
 	}
 #endif
+	mtx_unlock(&pAdapter->lock);
 
 	return -EINVAL;
 }
@@ -486,12 +507,12 @@ hpt_get_info(IAL_ADAPTER_T *pAdapter, HPT_GET_INFO *pinfo)
 	PVDevice pVDev;
 
 #ifndef FOR_DEMO
+	mtx_lock(&pAdapter->lock);
 	if (pAdapter->beeping) {
-		intrmask_t oldspl = lock_driver();
 		pAdapter->beeping = 0;
 		BeepOff(pAdapter->mvSataAdapter.adapterIoBaseAddress);
-		unlock_driver(oldspl);
 	}
+	mtx_unlock(&pAdapter->lock);
 #endif
 
 	hpt_copy_info(pinfo, "Controller #%d:\n\n", pAdapter->mvSataAdapter.adapterId);
@@ -610,16 +631,16 @@ hpt_status(FORMAL_HANDLER_ARGS)
 
 #define xhptregister_node(name) hptregister_node(name)
 
-#if (__FreeBSD_version < 500043)
+#if __FreeBSD_version >= 1100024
 #define hptregister_node(name) \
-	SYSCTL_NODE(, OID_AUTO,	name, CTLFLAG_RW, 0, "Get/Set " #name " state root node") \
+	SYSCTL_ROOT_NODE(OID_AUTO, name, CTLFLAG_RW, 0, "Get/Set " #name " state root node"); \
 	SYSCTL_OID(_ ## name, OID_AUTO, status, CTLTYPE_STRING|CTLFLAG_RW, \
 	NULL, 0, hpt_status, "A", "Get/Set " #name " state")
-#else 
+#else
 #define hptregister_node(name) \
-	SYSCTL_NODE(, OID_AUTO,	name, CTLFLAG_RW, 0, "Get/Set " #name " state root node"); \
+	SYSCTL_NODE(, OID_AUTO, name, CTLFLAG_RW, 0, "Get/Set " #name " state root node"); \
 	SYSCTL_OID(_ ## name, OID_AUTO, status, CTLTYPE_STRING|CTLFLAG_RW, \
-	NULL, 0, hpt_status, "A", "Get/Set " #name " state");
+	NULL, 0, hpt_status, "A", "Get/Set " #name " state")
 #endif
 	
 xhptregister_node(PROC_DIR_NAME);
diff --git a/sys/dev/hptmv/ioctl.c b/sys/dev/hptmv/ioctl.c
index 5887822c99f4..50a82aed1cb8 100644
--- a/sys/dev/hptmv/ioctl.c
+++ b/sys/dev/hptmv/ioctl.c
@@ -33,13 +33,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 
-#if (__FreeBSD_version < 500000)
-#include <sys/proc.h>
-#include <sys/kthread.h>
-#include <sys/wait.h>
-#include <sys/sysproto.h>
-#endif
-
 #ifndef __KERNEL__
 #define __KERNEL__
 #endif
@@ -66,7 +59,7 @@ static int event_queue_head=0, event_queue_tail=0;
 
 static int hpt_get_event(PHPT_EVENT pEvent);
 static int hpt_set_array_state(DEVICEID idArray, DWORD state);
-static intrmask_t lock_driver_idle(IAL_ADAPTER_T *pAdapter);
+static void lock_driver_idle(IAL_ADAPTER_T *pAdapter);
 static void HPTLIBAPI thread_io_done(_VBUS_ARG PCommand pCmd);
 static int HPTLIBAPI R1ControlSgl(_VBUS_ARG PCommand pCmd,
     FPSCAT_GATH pSgTable, int logical);
@@ -158,6 +151,7 @@ ioctl_ReportEvent(UCHAR event, PVOID param)
 		get_disk_location(&((PVDevice)param)->u.disk, &controller, &channel);
 		hpt_printk(("Device removed: controller %d channel %d\n", controller, channel));
 	}
+	wakeup(param);
 }
 
 static int
@@ -195,30 +189,17 @@ hpt_delete_array(_VBUS_ARG DEVICEID id, DWORD options)
 /* just to prevent driver from sending more commands */
 static void HPTLIBAPI nothing(_VBUS_ARG void *notused){}
 
-intrmask_t
+void
 lock_driver_idle(IAL_ADAPTER_T *pAdapter)
 {
-	intrmask_t oldspl;
 	_VBUS_INST(&pAdapter->VBus)
-	oldspl = lock_driver();
+	mtx_lock(&pAdapter->lock);
 	while (pAdapter->outstandingCommands) {
 		KdPrint(("outstandingCommands is %d, wait..\n", pAdapter->outstandingCommands));
 		if (!mWaitingForIdle(_VBUS_P0)) CallWhenIdle(_VBUS_P nothing, 0);
-		unlock_driver(oldspl);
-/*Schedule out*/
-#if (__FreeBSD_version < 500000)
-		YIELD_THREAD;
-#else 
-#if (__FreeBSD_version > 700033)
-		pause("switch", 1);
-#else
-		tsleep(lock_driver_idle, PPAUSE, "switch", 1);
-#endif
-#endif
-		oldspl = lock_driver();
+		mtx_sleep(pAdapter, &pAdapter->lock, 0, "hptidle", 0);
 	}
 	CheckIdleCall(_VBUS_P0);
-	return oldspl;
 }
 
 int Kernel_DeviceIoControl(_VBUS_ARG
@@ -329,9 +310,7 @@ int Kernel_DeviceIoControl(_VBUS_ARG
 		default:
 		{
 			PVDevice pVDev;
-#ifdef SUPPORT_ARRAY
-			intrmask_t oldspl;
-#endif
+
 			switch(dwIoControlCode) {
 			/* read-only ioctl functions can be called directly. */
 			case HPT_IOCTL_GET_VERSION:
@@ -382,13 +361,13 @@ int Kernel_DeviceIoControl(_VBUS_ARG
 					 * create_array, and other functions can't be executed while channel is 
 					 * perform I/O commands. Wait until driver is idle.
 					 */
-					oldspl = lock_driver_idle(pAdapter);
+					lock_driver_idle(pAdapter);
 					if (hpt_default_ioctl(_VBUS_P dwIoControlCode, lpInBuffer, nInBufferSize, 
 						lpOutBuffer, nOutBufferSize, lpBytesReturned) == -1) {
-						unlock_driver(oldspl);
+						mtx_unlock(&pAdapter->lock);
 						return -1;
 					}
-					unlock_driver(oldspl);
+					mtx_unlock(&pAdapter->lock);
 				}
 				else
 					return -1;
@@ -401,7 +380,7 @@ int Kernel_DeviceIoControl(_VBUS_ARG
 				case HPT_IOCTL_CREATE_ARRAY:
 				{
 					pAdapter=(IAL_ADAPTER_T *)(ID_TO_VDEV(*(DEVICEID *)lpOutBuffer))->pVBus->OsExt;
-					oldspl = lock_driver();
+					mtx_lock(&pAdapter->lock);
                     if(((PCREATE_ARRAY_PARAMS)lpInBuffer)->CreateFlags & CAF_CREATE_AND_DUPLICATE)
 				    {
 						  (ID_TO_VDEV(*(DEVICEID *)lpOutBuffer))->u.array.rf_auto_rebuild = 0;
@@ -415,7 +394,7 @@ int Kernel_DeviceIoControl(_VBUS_ARG
 				    {
                           hpt_queue_dpc((HPT_DPC)hpt_rebuild_data_block, pAdapter, ID_TO_VDEV(*(DEVICEID *)lpOutBuffer), REBUILD_PARITY);
 					}
-					unlock_driver(oldspl);
+					mtx_unlock(&pAdapter->lock);
                     break;
 				}
 
@@ -423,7 +402,7 @@ int Kernel_DeviceIoControl(_VBUS_ARG
 				case HPT_IOCTL_CREATE_ARRAY_V2:
 				{
 					pAdapter=(IAL_ADAPTER_T *)(ID_TO_VDEV(*(DEVICEID *)lpOutBuffer))->pVBus->OsExt;
-					oldspl = lock_driver();
+					mtx_lock(&pAdapter->lock);
 				             if(((PCREATE_ARRAY_PARAMS_V2)lpInBuffer)->CreateFlags & CAF_CREATE_AND_DUPLICATE) {
 						  (ID_TO_VDEV(*(DEVICEID *)lpOutBuffer))->u.array.rf_auto_rebuild = 0;
 				                          hpt_queue_dpc((HPT_DPC)hpt_rebuild_data_block, pAdapter, ID_TO_VDEV(*(DEVICEID *)lpOutBuffer), DUPLICATE);
@@ -432,7 +411,7 @@ int Kernel_DeviceIoControl(_VBUS_ARG
 					} else if(((PCREATE_ARRAY_PARAMS_V2)lpInBuffer)->CreateFlags & CAF_CREATE_R5_BUILD_PARITY) {
 				                          hpt_queue_dpc((HPT_DPC)hpt_rebuild_data_block, pAdapter, ID_TO_VDEV(*(DEVICEID *)lpOutBuffer), REBUILD_PARITY);
 					}
-					unlock_driver(oldspl);
+					mtx_unlock(&pAdapter->lock);
 					break;
 				}
 				case HPT_IOCTL_ADD_DISK_TO_ARRAY:
@@ -441,23 +420,16 @@ int Kernel_DeviceIoControl(_VBUS_ARG
 					pAdapter=(IAL_ADAPTER_T *)pArray->pVBus->OsExt;
 					if(pArray->u.array.rf_rebuilding == 0)
 					{		
-						DWORD timeout = 0;
-						oldspl = lock_driver();
+						mtx_lock(&pAdapter->lock);
 						pArray->u.array.rf_auto_rebuild = 0;
 						pArray->u.array.rf_abort_rebuild = 0;
 						hpt_queue_dpc((HPT_DPC)hpt_rebuild_data_block, pAdapter, pArray, DUPLICATE);
-						unlock_driver(oldspl);
 						while (!pArray->u.array.rf_rebuilding)
 						{
-#if (__FreeBSD_version > 700033)
-							pause("pause", 1);
-#else
-							tsleep((caddr_t)Kernel_DeviceIoControl, PPAUSE, "pause", 1);
-#endif
-							if ( timeout >= hz*3)
+							if (mtx_sleep(pArray, &pAdapter->lock, 0, "hptwait", hz * 3) != 0)
 								break;
-							timeout ++;
 						}
+						mtx_unlock(&pAdapter->lock);
 					}
 					break;
 				}
@@ -475,9 +447,7 @@ int Kernel_DeviceIoControl(_VBUS_ARG
 static int
 hpt_get_event(PHPT_EVENT pEvent)
 {
-	intrmask_t oldspl = lock_driver();
 	int ret = event_queue_remove(pEvent);
-	unlock_driver(oldspl);
 	return ret;
 }
 
@@ -487,8 +457,6 @@ hpt_set_array_state(DEVICEID idArray, DWORD state)
 	IAL_ADAPTER_T *pAdapter;
 	PVDevice pVDevice = ID_TO_VDEV(idArray);
 	int	i;
-	DWORD timeout = 0;
-	intrmask_t oldspl;
 
 	if(idArray == 0 || check_VDevice_valid(pVDevice))	return -1;
 	if(!mIsArray(pVDevice))
@@ -501,32 +469,27 @@ hpt_set_array_state(DEVICEID idArray, DWORD state)
 	{
 		case MIRROR_REBUILD_START:
 		{
+			mtx_lock(&pAdapter->lock);
 			if (pVDevice->u.array.rf_rebuilding ||
 				pVDevice->u.array.rf_verifying ||
-				pVDevice->u.array.rf_initializing)
+				pVDevice->u.array.rf_initializing) {
+				mtx_unlock(&pAdapter->lock);
 				return -1;
+			}
 			
-			oldspl = lock_driver();
-
 			pVDevice->u.array.rf_auto_rebuild = 0;
 			pVDevice->u.array.rf_abort_rebuild = 0;
 
 			hpt_queue_dpc((HPT_DPC)hpt_rebuild_data_block, pAdapter, pVDevice, 
 				(UCHAR)((pVDevice->u.array.CriticalMembers || pVDevice->VDeviceType == VD_RAID_1)? DUPLICATE : REBUILD_PARITY));
 
-			unlock_driver(oldspl);
-
 			while (!pVDevice->u.array.rf_rebuilding)
 			{
-#if (__FreeBSD_version > 700033)
-				pause("pause", 1);
-#else
-				tsleep((caddr_t)hpt_set_array_state, PPAUSE, "pause", 1);
-#endif
-				if ( timeout >= hz*20)
+				if (mtx_sleep(pVDevice, &pAdapter->lock, 0,
+				    "hptwait", hz * 20) != 0)
 					break;
-				timeout ++;
 			}
+			mtx_unlock(&pAdapter->lock);
 		}
 
 		break;
@@ -537,25 +500,22 @@ hpt_set_array_state(DEVICEID idArray, DWORD state)
 				if(pVDevice->u.array.pMember[i] != 0 && pVDevice->u.array.pMember[i]->VDeviceType == VD_RAID_1)
 					hpt_set_array_state(VDEV_TO_ID(pVDevice->u.array.pMember[i]), state);
 			}
-			
-			if(pVDevice->u.array.rf_rebuilding != 1)
+
+			mtx_lock(&pAdapter->lock);
+			if(pVDevice->u.array.rf_rebuilding != 1) {
+				mtx_unlock(&pAdapter->lock);
 				return -1;
+			}
 			
-			oldspl = lock_driver();
 			pVDevice->u.array.rf_abort_rebuild = 1;
-			unlock_driver(oldspl);
 			
 			while (pVDevice->u.array.rf_abort_rebuild)
 			{
-#if (__FreeBSD_version > 700033)
-				pause("pause", 1);
-#else
-				tsleep((caddr_t)hpt_set_array_state, PPAUSE, "pause", 1);
-#endif
-				if ( timeout >= hz*20)
+				if (mtx_sleep(pVDevice, &pAdapter->lock, 0,
+				    "hptabrt", hz * 20) != 0)
 					break;
-				timeout ++;
 			}
+			mtx_unlock(&pAdapter->lock);
 		}
 		break;
 
@@ -563,98 +523,86 @@ hpt_set_array_state(DEVICEID idArray, DWORD state)
 		{
 			/*if(pVDevice->u.array.rf_verifying)
 				return -1;*/
+			mtx_lock(&pAdapter->lock);
 			if (pVDevice->u.array.rf_rebuilding ||
 				pVDevice->u.array.rf_verifying ||
-				pVDevice->u.array.rf_initializing)
+				pVDevice->u.array.rf_initializing) {
+				mtx_unlock(&pAdapter->lock);
 				return -1;
+			}
 
-			oldspl = lock_driver();
             pVDevice->u.array.RebuildSectors = 0;
 			hpt_queue_dpc((HPT_DPC)hpt_rebuild_data_block, pAdapter, pVDevice, VERIFY);
-			unlock_driver(oldspl);
 			
 			while (!pVDevice->u.array.rf_verifying)
 			{
-#if (__FreeBSD_version > 700033)
-				pause("pause", 1);
-#else
-				tsleep((caddr_t)hpt_set_array_state, PPAUSE, "pause", 1);
-#endif
-				if ( timeout >= hz*20)
+				if (mtx_sleep(pVDevice, &pAdapter->lock, 0,
+				    "hptvrfy", hz * 20) != 0)
 					break;
-				timeout ++;
 			}
+			mtx_unlock(&pAdapter->lock);
 		}
 		break;
 
 		case AS_VERIFY_ABORT:
 		{
-			if(pVDevice->u.array.rf_verifying != 1)
+			mtx_lock(&pAdapter->lock);
+			if(pVDevice->u.array.rf_verifying != 1) {
+				mtx_unlock(&pAdapter->lock);
 				return -1;
+			}
 				
-			oldspl = lock_driver();
 			pVDevice->u.array.rf_abort_rebuild = 1;
-			unlock_driver(oldspl);
 			
 			while (pVDevice->u.array.rf_abort_rebuild)
 			{
-#if (__FreeBSD_version > 700033)
-				pause("pause", 1);
-#else
-				tsleep((caddr_t)hpt_set_array_state, PPAUSE, "pause", 1);
-#endif
-				if ( timeout >= hz*80)
+				if (mtx_sleep(pVDevice, &pAdapter->lock, 0,
+				    "hptvrfy", hz * 80) != 0)
 					break;
-				timeout ++;
 			}
+			mtx_unlock(&pAdapter->lock);
 		}
 		break;
 
 		case AS_INITIALIZE_START:
 		{
+			mtx_lock(&pAdapter->lock);
 			if (pVDevice->u.array.rf_rebuilding ||
 				pVDevice->u.array.rf_verifying ||
-				pVDevice->u.array.rf_initializing)
+				pVDevice->u.array.rf_initializing) {
+				mtx_unlock(&pAdapter->lock);
 				return -1;
+			}
 
-			oldspl = lock_driver();
 			hpt_queue_dpc((HPT_DPC)hpt_rebuild_data_block, pAdapter, pVDevice, VERIFY);
-			unlock_driver(oldspl);
 			
 			while (!pVDevice->u.array.rf_initializing)
 			{
-#if (__FreeBSD_version > 700033)
-				pause("pause", 1);
-#else
-				tsleep((caddr_t)hpt_set_array_state, PPAUSE, "pause", 1);
-#endif
-				if ( timeout >= hz*80)
+				if (mtx_sleep(pVDevice, &pAdapter->lock, 0,
+				    "hptinit", hz * 80) != 0)
 					break;
-				timeout ++;
 			}
+			mtx_unlock(&pAdapter->lock);
 		}
 		break;
 
 		case AS_INITIALIZE_ABORT:
 		{
-			if(pVDevice->u.array.rf_initializing != 1)
+			mtx_lock(&pAdapter->lock);
+			if(pVDevice->u.array.rf_initializing != 1) {
+				mtx_unlock(&pAdapter->lock);
 				return -1;
+			}
 				
-			oldspl = lock_driver();
 			pVDevice->u.array.rf_abort_rebuild = 1;
-			unlock_driver(oldspl);
 			
 			while (pVDevice->u.array.rf_abort_rebuild)
 			{
-#if (__FreeBSD_version > 700033)
-				pause("pause", 1);
-#else
-				tsleep((caddr_t)hpt_set_array_state, PPAUSE, "pause", 1);
-#endif
-				if ( timeout >= hz*80)
+				if (mtx_sleep(pVDevice, &pAdapter->lock, 0,
+				    "hptinit", hz * 80) != 0)
 					break;
-				timeout ++;
 			}
+			mtx_unlock(&pAdapter->lock);
 		}
 		break;
 
@@ -739,21 +687,19 @@ thread_io_done(_VBUS_ARG PCommand pCmd)
 void
 hpt_rebuild_data_block(IAL_ADAPTER_T *pAdapter, PVDevice pArray, UCHAR flags)
 {
-	DWORD timeout = 0;
     ULONG capacity = pArray->VDeviceCapacity / (pArray->u.array.bArnMember-1);
     PCommand pCmd;
 	UINT result;
 	int needsync=0, retry=0, needdelete=0;
 	void *buffer = 0;
-	intrmask_t oldspl;
 
 	_VBUS_INST(&pAdapter->VBus)
 
 	if (pArray->u.array.rf_broken==1 ||
     	pArray->u.array.RebuildSectors>=capacity)
 		return;
-		
-	oldspl = lock_driver();
+
+	mtx_lock(&pAdapter->lock);
 	
 	switch(flags)
 	{
@@ -797,9 +743,7 @@ hpt_rebuild_data_block(IAL_ADAPTER_T *pAdapter, PVDevice pArray, UCHAR flags)
 		#define MAX_REBUILD_SECTORS 0x40
 
 		/* take care for discontinuous buffer in R1ControlSgl */
-		unlock_driver(oldspl);
 		buffer = malloc(SECTOR_TO_BYTE(MAX_REBUILD_SECTORS), M_DEVBUF, M_NOWAIT);
-		oldspl = lock_driver();
 		if(!buffer) {
 			FreeCommand(_VBUS_P pCmd);
 			hpt_printk(("can't allocate rebuild buffer\n"));
@@ -854,12 +798,7 @@ hpt_rebuild_data_block(IAL_ADAPTER_T *pAdapter, PVDevice pArray, UCHAR flags)
 	CheckPendingCall(_VBUS_P0);
 
 	if (!End_Job) {
-		unlock_driver(oldspl);
-		while (!End_Job) {
-			tsleep((caddr_t)pCmd, PPAUSE, "pause", hz);
-			if (timeout++>60) break;
-		}
-		oldspl = lock_driver();
+		mtx_sleep(pCmd, &pAdapter->lock, 0, "hptrbld", hz * 60);
 		if (!End_Job) {
 			hpt_printk(("timeout, reset\n"));
 			fResetVBus(_VBUS_P0);
@@ -868,9 +807,7 @@ hpt_rebuild_data_block(IAL_ADAPTER_T *pAdapter, PVDevice pArray, UCHAR flags)
 
 	result = pCmd->Result;
 	FreeCommand(_VBUS_P pCmd);
-	unlock_driver(oldspl);
 	if (buffer) free(buffer, M_DEVBUF);
-	oldspl = lock_driver();
 	KdPrintI(("cmd finished %d", result));
 
 	switch(result)
@@ -1000,18 +937,7 @@ hpt_rebuild_data_block(IAL_ADAPTER_T *pAdapter, PVDevice pArray, UCHAR flags)
 		KdPrintI(("currcmds is %d, wait..\n", pAdapter->outstandingCommands));
 		/* put this to have driver stop processing system commands quickly */
 		if (!mWaitingForIdle(_VBUS_P0)) CallWhenIdle(_VBUS_P nothing, 0);
-		unlock_driver(oldspl);
-		/*Schedule out*/
-#if (__FreeBSD_version < 500000)		
-		YIELD_THREAD; 
-#else 
-#if (__FreeBSD_version > 700033)
-		pause("switch", 1);
-#else
-		tsleep(hpt_rebuild_data_block, PPAUSE, "switch", 1);
-#endif
-#endif
-		oldspl = lock_driver();
+		mtx_sleep(pAdapter, &pAdapter->lock, 0, "hptidle", 0);
 	}
 		
 	if (needsync) SyncArrayInfo(pArray);
@@ -1019,5 +945,5 @@ hpt_rebuild_data_block(IAL_ADAPTER_T *pAdapter, PVDevice pArray, UCHAR flags)
 		fDeleteArray(_VBUS_P pArray, TRUE);
 
 	Check_Idle_Call(pAdapter);
-	unlock_driver(oldspl);
+	mtx_unlock(&pAdapter->lock);
 }
diff --git a/sys/dev/hptmv/mv.c b/sys/dev/hptmv/mv.c
index f9f41ffb75da..aaf67d9e2db4 100644
--- a/sys/dev/hptmv/mv.c
+++ b/sys/dev/hptmv/mv.c
@@ -33,17 +33,7 @@
 #include <sys/bus.h>
 #include <machine/resource.h>
 
-#if __FreeBSD_version >= 500043
 #include <machine/pci_cfgreg.h>
-#endif
-
-#if (__FreeBSD_version < 500043)
-#include <sys/bus_private.h>
-#endif
-
-#if (__FreeBSD_version < 500000)
-#include <machine/clock.h>
-#endif
 
 #ifndef __KERNEL__
 #define __KERNEL__
diff --git a/sys/dev/hptmv/osbsd.h b/sys/dev/hptmv/osbsd.h
index a0232e52efd7..a9abc3e2c69f 100644
--- a/sys/dev/hptmv/osbsd.h
+++ b/sys/dev/hptmv/osbsd.h
@@ -33,18 +33,10 @@
 #include <sys/eventhandler.h>
 #include <sys/devicestat.h>
 
-#if (__FreeBSD_version < 500043)
-#include <stddef.h>
-#include <sys/buf.h>
-#endif
-
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
-#if (__FreeBSD_version < 600000)
-#include <machine/bus_memio.h>
-#endif
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
@@ -63,9 +55,6 @@
 
 
 
-extern intrmask_t lock_driver(void);
-extern void unlock_driver(intrmask_t spl);
-
 typedef struct 
 {
 	UCHAR		status;     		/* 0 nonbootable; 80h bootable */
@@ -153,13 +142,14 @@ typedef struct _BUS_DMAMAP
 {	struct _BUS_DMAMAP 	 	*next;
 	struct IALAdapter 			*pAdapter;
 	bus_dmamap_t 			dma_map;
-	struct callout_handle		timeout_ch;
+	struct callout		timeout;
 	SCAT_GATH				psg[MAX_SG_DESCRIPTORS];
 } BUS_DMAMAP, *PBUS_DMAMAP;
 
 typedef struct IALAdapter 
 {
 	struct cam_path 	*path;
+	struct mtx		lock;
 
 	bus_dma_tag_t	  io_dma_parent; /* I/O buffer DMA tag */
 	PBUS_DMAMAP	  pbus_dmamap_list;
@@ -183,8 +173,8 @@ typedef struct IALAdapter
 	dma_addr_t			responsesArrayBaseDmaAlignedAddr;
 	SATA_EVENT			sataEvents[MV_SATA_CHANNELS_NUM];
 	
-   	struct	callout_handle event_timer_connect;
-  	struct	callout_handle event_timer_disconnect;
+   	struct	callout event_timer_connect;
+  	struct	callout event_timer_disconnect;
 
 	struct _VBus        VBus;
 	struct _VDevice     VDevices[MV_SATA_CHANNELS_NUM];
@@ -254,10 +244,6 @@ hpt_get_periph(int path_id,int target_id)
 	return periph;	
 }
 
-#if (__FreeBSD_version < 500000)
-#define YIELD_THREAD yield(curproc, 0)
-#endif
-
 #ifdef __i386__
 #define BITS_PER_LONG 32
 #define VDEV_TO_ID(pVDev) (DEVICEID)(pVDev)
diff --git a/sys/dev/hptnr/hptnr_os_bsd.c b/sys/dev/hptnr/hptnr_os_bsd.c
index fe4a9995da02..da3977cdd207 100644
--- a/sys/dev/hptnr/hptnr_os_bsd.c
+++ b/sys/dev/hptnr/hptnr_os_bsd.c
@@ -86,25 +86,10 @@ BUS_ADDRESS get_dmapool_phy_addr(void *osext, void * dmapool_virt_addr)
 	return (BUS_ADDRESS)vtophys(dmapool_virt_addr);
 }
 
-#if __FreeBSD_version < 500043
-HPT_U32 pcicfg_read_dword(HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg)
-{
-	HPT_U32 v;
-	pcicfgregs pciref;
-
-	pciref.bus  = bus;
-	pciref.slot = dev;
-	pciref.func = func;
-
-	v = pci_cfgread(&pciref, reg, 4);
-	return v;
-}/* PCI space access */
-#else 
 HPT_U32 pcicfg_read_dword(HPT_U8 bus, HPT_U8 dev, HPT_U8 func, HPT_U8 reg)
 {
 	return (HPT_U32)pci_cfgregread(bus, dev, func, reg, 4);;
 }/* PCI space access */
-#endif
 
 void *os_map_pci_bar(
     void *osext, 
@@ -249,9 +234,9 @@ void  os_request_timer(void * osext, HPT_U32 interval)
 	PVBUS_EXT vbus_ext = osext;
 
 	HPT_ASSERT(vbus_ext->ext_type==EXT_TYPE_VBUS);
-	
-	untimeout(os_timer_for_ldm, vbus_ext, vbus_ext->timer);
-	vbus_ext->timer = timeout(os_timer_for_ldm, vbus_ext, interval * hz / 1000000);
+
+	callout_reset(&vbus_ext->timer, interval * hz / 1000000,
+	    os_timer_for_ldm, vbus_ext);
 }
 
 HPT_TIME os_query_time(void)
diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c
index 87441be5a31a..82f4877c795c 100644
--- a/sys/dev/hptnr/hptnr_osm_bsd.c
+++ b/sys/dev/hptnr/hptnr_osm_bsd.c
@@ -31,12 +31,11 @@
 #include <dev/hptnr/os_bsd.h>
 #include <dev/hptnr/hptintf.h>
 
-static int hpt_probe(device_t dev)
+static HIM *hpt_match(device_t dev)
 {
 	PCI_ID pci_id;
 	HIM *him;
 	int i;
-	PHBA hba;
 
 	for (him = him_list; him; him = him->next) {
 		for (i=0; him->get_supported_device_id(i, &pci_id); i++) {
@@ -44,36 +43,46 @@ static int hpt_probe(device_t dev)
 				him->get_controller_count(&pci_id,0,0);
 			if ((pci_get_vendor(dev) == pci_id.vid) &&
 				(pci_get_device(dev) == pci_id.did)){
-				KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d",
-					pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev), pci_get_irq(dev)
-				));
-				device_set_desc(dev, him->name);
-				hba = (PHBA)device_get_softc(dev);
-				memset(hba, 0, sizeof(HBA));
-				hba->ext_type = EXT_TYPE_HBA;
-				hba->ldm_adapter.him = him;
-				return 0;
+				return (him);
 			}
 		}
 	}
 
+	return (NULL);
+}
+
+static int hpt_probe(device_t dev)
+{
+	HIM *him;
+
+	him = hpt_match(dev);
+	if (him != NULL) {
+		KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d",
+			pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev), pci_get_irq(dev)
+			));
+		device_set_desc(dev, him->name);
+		return (BUS_PROBE_DEFAULT);
+	}
+
 	return (ENXIO);
 }
 
 static int hpt_attach(device_t dev)
 {
 	PHBA hba = (PHBA)device_get_softc(dev);
-	HIM *him = hba->ldm_adapter.him;
+	HIM *him;
 	PCI_ID pci_id;
 	HPT_UINT size;
 	PVBUS vbus;
 	PVBUS_EXT vbus_ext;
 	
 	KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev)));
-	
-#if __FreeBSD_version >=440000
+
+	him = hpt_match(dev);
+	hba->ext_type = EXT_TYPE_HBA;
+	hba->ldm_adapter.him = him;
+
 	pci_enable_busmaster(dev);
-#endif
 
 	pci_id.vid = pci_get_vendor(dev);
 	pci_id.did = pci_get_device(dev);
@@ -82,8 +91,6 @@ static int hpt_attach(device_t dev)
 
 	size = him->get_adapter_size(&pci_id);
 	hba->ldm_adapter.him_handle = malloc(size, M_DEVBUF, M_WAITOK);
-	if (!hba->ldm_adapter.him_handle)
-		return ENXIO;
 
 	hba->pcidev = dev;
 	hba->pciaddr.tree = 0;
@@ -93,7 +100,7 @@ static int hpt_attach(device_t dev)
 
 	if (!him->create_adapter(&pci_id, hba->pciaddr, hba->ldm_adapter.him_handle, hba)) {
 		free(hba->ldm_adapter.him_handle, M_DEVBUF);
-		return -1;
+		return ENXIO;
 	}
 
 	os_printk("adapter at PCI %d:%d:%d, IRQ %d",
@@ -101,12 +108,8 @@ static int hpt_attach(device_t dev)
 
 	if (!ldm_register_adapter(&hba->ldm_adapter)) {
 		size = ldm_get_vbus_size();
-		vbus_ext = malloc(sizeof(VBUS_EXT) + size, M_DEVBUF, M_WAITOK);
-		if (!vbus_ext) {
-			free(hba->ldm_adapter.him_handle, M_DEVBUF);
-			return -1;
-		}
-		memset(vbus_ext, 0, sizeof(VBUS_EXT));
+		vbus_ext = malloc(sizeof(VBUS_EXT) + size, M_DEVBUF, M_WAITOK |
+			M_ZERO);
 		vbus_ext->ext_type = EXT_TYPE_VBUS;
 		ldm_create_vbus((PVBUS)vbus_ext->vbus, vbus_ext);
 		ldm_register_adapter(&hba->ldm_adapter);
@@ -287,7 +290,7 @@ static int hpt_flush_vdev(PVBUS_EXT vbus_ext, PVDEV vd)
 
 	KdPrint(("flusing dev %p", vd));
 
-	hpt_lock_vbus(vbus_ext);
+	hpt_assert_vbus_locked(vbus_ext);
 
 	if (mIsArray(vd->type) && vd->u.array.transform)
 		count = MAX(vd->u.array.transform->source->cmds_per_request,
@@ -298,7 +301,6 @@ static int hpt_flush_vdev(PVBUS_EXT vbus_ext, PVDEV vd)
 	pCmd = ldm_alloc_cmds(vd->vbus, count);
 
 	if (!pCmd) {
-		hpt_unlock_vbus(vbus_ext);
 		return -1;
 	}
 
@@ -324,8 +326,6 @@ static int hpt_flush_vdev(PVBUS_EXT vbus_ext, PVDEV vd)
 
 	ldm_free_cmds(pCmd);
 
-	hpt_unlock_vbus(vbus_ext);
-
 	return result;
 }
 
@@ -340,6 +340,7 @@ static void hpt_shutdown_vbus(PVBUS_EXT vbus_ext, int howto)
 
 	/* stop all ctl tasks and disable the worker taskqueue */
 	hpt_stop_tasks(vbus_ext);
+	hpt_lock_vbus(vbus_ext);
 	vbus_ext->worker.ta_context = 0;
 
 	/* flush devices */
@@ -352,7 +353,6 @@ static void hpt_shutdown_vbus(PVBUS_EXT vbus_ext, int howto)
 		}
 	}
 
-	hpt_lock_vbus(vbus_ext);
 	ldm_shutdown(vbus);
 	hpt_unlock_vbus(vbus_ext);
 
@@ -368,6 +368,8 @@ static void hpt_shutdown_vbus(PVBUS_EXT vbus_ext, int howto)
 		free(hba->ldm_adapter.him_handle, M_DEVBUF);
 	}
 
+	callout_drain(&vbus_ext->timer);
+	mtx_destroy(&vbus_ext->lock);
 	free(vbus_ext, M_DEVBUF);
 	KdPrint(("hpt_shutdown_vbus done"));
 }
@@ -431,8 +433,8 @@ static void os_cmddone(PCOMMAND pCmd)
 	union ccb *ccb = ext->ccb;
 
 	KdPrint(("os_cmddone(%p, %d)", pCmd, pCmd->Result));
-	
-	untimeout(hpt_timeout, pCmd, ext->timeout_ch);
+
+	callout_stop(&ext->timeout);
 
 	switch(pCmd->Result) {
 	case RETURN_SUCCESS:
@@ -511,7 +513,7 @@ static void hpt_io_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nsegs
 		}
 	}
 
-	ext->timeout_ch = timeout(hpt_timeout, pCmd, HPT_OSM_TIMEOUT);
+	callout_reset(&ext->timeout, HPT_OSM_TIMEOUT, hpt_timeout, pCmd);
 	ldm_queue_cmd(pCmd);
 }
 
@@ -728,18 +730,15 @@ static void hpt_action(struct cam_sim *sim, union ccb *ccb)
 
 	KdPrint(("hpt_action(fn=%d, id=%d)", ccb->ccb_h.func_code, ccb->ccb_h.target_id));
 
+	hpt_assert_vbus_locked(vbus_ext);
 	switch (ccb->ccb_h.func_code) {
 	
 	case XPT_SCSI_IO:
-		hpt_lock_vbus(vbus_ext);
 		hpt_scsi_io(vbus_ext, ccb);
-		hpt_unlock_vbus(vbus_ext);
 		return;
 
 	case XPT_RESET_BUS:
-		hpt_lock_vbus(vbus_ext);
 		ldm_reset_vbus((PVBUS)vbus_ext->vbus);
-		hpt_unlock_vbus(vbus_ext);
 		break;
 
 	case XPT_GET_TRAN_SETTINGS:
@@ -773,12 +772,10 @@ static void hpt_action(struct cam_sim *sim, union ccb *ccb)
 		strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
 		strncpy(cpi->hba_vid, "HPT   ", HBA_IDLEN);
 		strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
-#if (__FreeBSD_version >= 800000)
 		cpi->transport = XPORT_SPI;
 		cpi->transport_version = 2;
 		cpi->protocol = PROTO_SCSI;
 		cpi->protocol_version = SCSI_REV_2;
-#endif
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		break;
 	}
@@ -802,7 +799,9 @@ static void hpt_pci_intr(void *arg)
 
 static void hpt_poll(struct cam_sim *sim)
 {
-	hpt_pci_intr(cam_sim_softc(sim));
+	PVBUS_EXT vbus_ext = cam_sim_softc(sim);
+	hpt_assert_vbus_locked(vbus_ext);
+	ldm_intr((PVBUS)vbus_ext->vbus);
 }
 
 static void hpt_async(void * callback_arg, u_int32_t code, struct cam_path * path, void * arg)
@@ -951,19 +950,7 @@ static struct cdevsw hpt_cdevsw = {
 	.d_close =	hpt_close,
 	.d_ioctl =	hpt_ioctl,
 	.d_name =	driver_name,
-#if __FreeBSD_version>=503000
 	.d_version =	D_VERSION,
-#endif
-#if (__FreeBSD_version>=503000 && __FreeBSD_version<600034)
-	.d_flags =	D_NEEDGIANT,
-#endif
-#if __FreeBSD_version<600034
-#if __FreeBSD_version>501000
-	.d_maj = 	MAJOR_AUTO,
-#else 
-	.d_maj = HPT_DEV_MAJOR,
-#endif
-#endif
 };
 
 static struct intr_config_hook hpt_ich;
@@ -1000,7 +987,8 @@ static void hpt_final_init(void *dummy)
 	/* initializing hardware */
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		/* make timer available here */
-		callout_handle_init(&vbus_ext->timer);
+		mtx_init(&vbus_ext->lock, "hptsleeplock", NULL, MTX_DEF);
+		callout_init_mtx(&vbus_ext->timer, &vbus_ext->lock, 0);
 		if (hpt_init_vbus(vbus_ext)) {
 			os_printk("fail to initialize hardware");
 			break; /* FIXME */
@@ -1012,9 +1000,6 @@ static void hpt_final_init(void *dummy)
 		struct cam_devq *devq;
 		struct ccb_setasync	ccb;
 		
-#if (__FreeBSD_version >= 500000)
-		mtx_init(&vbus_ext->lock, "hptsleeplock", NULL, MTX_DEF);
-#endif
 		if (bus_dma_tag_create(NULL,/* parent */
 				4,	/* alignment */
 				BUS_SPACE_MAXADDR_32BIT+1, /* boundary */
@@ -1025,10 +1010,8 @@ static void hpt_final_init(void *dummy)
 				os_max_sg_descriptors,	/* nsegments */
 				0x10000,	/* maxsegsize */
 				BUS_DMA_WAITOK,		/* flags */
-#if __FreeBSD_version>502000
 				busdma_lock_mutex,	/* lockfunc */
 				&vbus_ext->lock,		/* lockfuncarg */
-#endif
 				&vbus_ext->io_dmat	/* tag */))
 		{
 			return ;
@@ -1048,7 +1031,7 @@ static void hpt_final_init(void *dummy)
 				os_printk("Can't create dma map(%d)", i);
 				return ;
 			}
-			callout_handle_init(&ext->timeout_ch);
+			callout_init_mtx(&ext->timeout, &vbus_ext->lock, 0);
 		}
 
 		if ((devq = cam_simq_alloc(os_max_queue_comm)) == NULL) {
@@ -1056,25 +1039,19 @@ static void hpt_final_init(void *dummy)
 			return ;
 		}
 
-#if __FreeBSD_version > 700025
+		hpt_lock_vbus(vbus_ext);
 		vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name,
-				vbus_ext, unit_number, &Giant, os_max_queue_comm, /*tagged*/8,  devq);
-#else 
-		vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name,
-				vbus_ext, unit_number, os_max_queue_comm, /*tagged*/8,  devq);
-#endif
+				vbus_ext, unit_number, &vbus_ext->lock,
+				os_max_queue_comm, /*tagged*/8,  devq);
 		unit_number++;
 		if (!vbus_ext->sim) {
 			os_printk("cam_sim_alloc failed");
 			cam_simq_free(devq);
+			hpt_unlock_vbus(vbus_ext);
 			return ;
 		}
 
-#if __FreeBSD_version > 700044
 		if (xpt_bus_register(vbus_ext->sim, NULL, 0) != CAM_SUCCESS) {
-#else 
-		if (xpt_bus_register(vbus_ext->sim, 0) != CAM_SUCCESS) {
-#endif
 			os_printk("xpt_bus_register failed");
 			cam_sim_free(vbus_ext->sim, /*free devq*/ TRUE);
 			vbus_ext->sim = NULL;
@@ -1088,9 +1065,11 @@ static void hpt_final_init(void *dummy)
 			os_printk("xpt_create_path failed");
 			xpt_bus_deregister(cam_sim_path(vbus_ext->sim));
 			cam_sim_free(vbus_ext->sim, /*free_devq*/TRUE);
+			hpt_unlock_vbus(vbus_ext);
 			vbus_ext->sim = NULL;
 			return ;
 		}
+		hpt_unlock_vbus(vbus_ext);
 
 		xpt_setup_ccb(&ccb.ccb_h, vbus_ext->path, /*priority*/5);
 		ccb.ccb_h.func_code = XPT_SASYNC_CB;
@@ -1108,12 +1087,8 @@ static void hpt_final_init(void *dummy)
 				return ;
 			}
 			
-			if (bus_setup_intr(hba->pcidev, hba->irq_res, INTR_TYPE_CAM,
-#if __FreeBSD_version > 700025
+			if (bus_setup_intr(hba->pcidev, hba->irq_res, INTR_TYPE_CAM | INTR_MPSAFE,
 				NULL, hpt_pci_intr, vbus_ext, &hba->irq_handle)) 
-#else 
-				hpt_pci_intr, vbus_ext, &hba->irq_handle)) 
-#endif
 			{
 				os_printk("can't set up interrupt");
 				return ;
@@ -1138,7 +1113,7 @@ static void hpt_final_init(void *dummy)
 	    S_IRUSR | S_IWUSR, "%s", driver_name);
 }
 
-#if defined(KLD_MODULE) && (__FreeBSD_version >= 503000)
+#if defined(KLD_MODULE)
 
 typedef struct driverlink *driverlink_t;
 struct driverlink {
@@ -1230,29 +1205,17 @@ __DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, hpt_devclass, 0, 0);
 __MODULE_VERSION(TARGETNAME, 1);
 __MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
 
-#if __FreeBSD_version>503000
-typedef struct cdev * ioctl_dev_t;
-#else 
-typedef dev_t ioctl_dev_t;
-#endif
-
-#if __FreeBSD_version >= 500000
-typedef	struct thread *	ioctl_thread_t;
-#else 
-typedef struct proc *	ioctl_thread_t;
-#endif
-
-static int hpt_open(ioctl_dev_t dev, int flags, int devtype, ioctl_thread_t td)
+static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
 	return 0;
 }
 
-static int hpt_close(ioctl_dev_t dev, int flags, int devtype, ioctl_thread_t td)
+static int hpt_close(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
 	return 0;
 }
 
-static int hpt_ioctl(ioctl_dev_t dev, u_long cmd, caddr_t data, int fflag, ioctl_thread_t td)
+static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread *td)
 {
 	PHPT_IOCTL_PARAM piop=(PHPT_IOCTL_PARAM)data;
 	IOCTL_ARG ioctl_args;
@@ -1291,16 +1254,8 @@ static int hpt_ioctl(ioctl_dev_t dev, u_long cmd, caddr_t data, int fflag, ioctl
 				goto invalid;
 		}
 		
-#if (__FreeBSD_version >= 500000)
-		mtx_lock(&Giant);
-#endif
-
 		hpt_do_ioctl(&ioctl_args);
 	
-#if (__FreeBSD_version >= 500000)
-		mtx_unlock(&Giant);
-#endif
-
 		if (ioctl_args.result==HPT_IOCTL_RESULT_OK) {
 			if (piop->nOutBufferSize) {
 				if (copyout(ioctl_args.lpOutBuffer,
@@ -1341,8 +1296,6 @@ static int	hpt_rescan_bus(void)
 	PVBUS 				vbus;
 	PVBUS_EXT			vbus_ext;	
 		
-	mtx_lock(&Giant);
-
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		if ((ccb = xpt_alloc_ccb()) == NULL)
 		{
@@ -1356,6 +1309,5 @@ static int	hpt_rescan_bus(void)
 		}
 		xpt_rescan(ccb);
 	}
-	mtx_unlock(&Giant);
 	return(0);	
 }
diff --git a/sys/dev/hptnr/os_bsd.h b/sys/dev/hptnr/os_bsd.h
index 8fda2677c7cb..b568eb1e664a 100644
--- a/sys/dev/hptnr/os_bsd.h
+++ b/sys/dev/hptnr/os_bsd.h
@@ -40,12 +40,8 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/cons.h>
-#if (__FreeBSD_version >= 500000) 
 #include <sys/time.h>
 #include <sys/systm.h> 
-#else 
-#include <machine/clock.h>	/*to support DELAY function under 4.x BSD versions*/
-#endif
 
 #include <sys/stat.h>
 #include <sys/malloc.h>
@@ -53,11 +49,9 @@
 #include <sys/libkern.h>
 #include <sys/kernel.h>
 
-#if (__FreeBSD_version >= 500000)
 #include <sys/kthread.h>
 #include <sys/mutex.h>
 #include <sys/module.h>
-#endif
 
 #include <sys/eventhandler.h>
 #include <sys/bus.h>
@@ -65,9 +59,7 @@
 #include <sys/ioccom.h>
 
 #include <machine/resource.h>
-#if __FreeBSD_version >= 500043
 #include <machine/pci_cfgreg.h>
-#endif
 #include <machine/bus.h>
 #include <machine/stdarg.h>
 #include <sys/rman.h>
@@ -75,17 +67,8 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#if (__FreeBSD_version >= 500000)
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#else 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
-#endif
-
-#if (__FreeBSD_version <= 500043)
-#include <sys/devicestat.h>
-#endif
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
@@ -97,10 +80,6 @@
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 
-#if (__FreeBSD_version < 500043)
-#include <sys/bus_private.h>
-#endif
-
 
 typedef struct _INQUIRYDATA {
 	u_char DeviceType : 5;
@@ -176,7 +155,7 @@ typedef struct _os_cmdext {
 	struct _os_cmdext *next;
 	union ccb         *ccb;
 	bus_dmamap_t       dma_map;
-	struct callout_handle timeout_ch;
+	struct callout     timeout;
 	SG                 psg[os_max_sg_descriptors];
 }
 OS_CMDEXT, *POS_CMDEXT;
@@ -190,11 +169,7 @@ typedef struct _vbus_ext {
 	
 	struct cam_sim   *sim;    /* sim for this vbus */
 	struct cam_path  *path;   /* peripheral, path, tgt, lun with this vbus */
-#if (__FreeBSD_version >= 500000)
 	struct mtx        lock; /* general purpose lock */
-#else 
-	int  			hpt_splx;
-#endif
 	bus_dma_tag_t     io_dmat; /* I/O buffer DMA tag */
 	
 	POS_CMDEXT        cmdext_list;
@@ -202,7 +177,7 @@ typedef struct _vbus_ext {
 	OSM_TASK         *tasks;
 	struct task       worker;
 	
-	struct callout_handle timer;
+	struct callout    timer;
 
 	eventhandler_tag  shutdown_eh;
 	
@@ -211,19 +186,9 @@ typedef struct _vbus_ext {
 }
 VBUS_EXT, *PVBUS_EXT;
 
-#if __FreeBSD_version >= 500000
 #define hpt_lock_vbus(vbus_ext)   mtx_lock(&(vbus_ext)->lock)
 #define hpt_unlock_vbus(vbus_ext) mtx_unlock(&(vbus_ext)->lock)
-#else 
-static __inline	void	hpt_lock_vbus(PVBUS_EXT	vbus_ext)
-{
-	vbus_ext->hpt_splx = splcam();
-}
-static __inline	void	hpt_unlock_vbus(PVBUS_EXT vbus_ext)
-{
-	splx(vbus_ext->hpt_splx);
-}
-#endif
+#define	hpt_assert_vbus_locked(vbus_ext)	mtx_assert(&(vbus_ext)->lock, MA_OWNED)
 
 
 #define HPT_OSM_TIMEOUT (20*hz)  /* timeout value for OS commands */
@@ -232,36 +197,9 @@ static __inline	void	hpt_unlock_vbus(PVBUS_EXT vbus_ext)
 
 #define HPT_SCAN_BUS		_IO('H', 1)
 
-#if __FreeBSD_version >= 501000
-#define TASK_ENQUEUE(task)	taskqueue_enqueue(taskqueue_swi_giant,(task));
-#else 
 #define TASK_ENQUEUE(task)	taskqueue_enqueue(taskqueue_swi,(task));
-#endif
 
-#if __FreeBSD_version >= 500000
 static	__inline	int hpt_sleep(PVBUS_EXT vbus_ext, void *ident, int priority, const char *wmesg, int timo)
 {
 	return	msleep(ident, &vbus_ext->lock, priority, wmesg, timo);
 }
-#else 
-static	__inline	int hpt_sleep(PVBUS_EXT vbus_ext, void *ident, int priority, const char *wmesg, int timo)
-{
-	int retval = 0;
-	
-	asleep(ident, priority, wmesg, timo);
-	hpt_unlock_vbus(vbus_ext);
-	retval = await(priority, timo);
-	hpt_lock_vbus(vbus_ext);
-	
-	return retval;
-}
-#endif
-
-#if __FreeBSD_version < 501000
-#define	READ_16				0x88
-#define WRITE_16			0x8a
-#define SERVICE_ACTION_IN	0x9e
-#endif
-
-#define	HPT_DEV_MAJOR	200
-
diff --git a/sys/dev/hptrr/hptrr_os_bsd.c b/sys/dev/hptrr/hptrr_os_bsd.c
index 5cb81dab0b5d..cc65d49b36dd 100644
--- a/sys/dev/hptrr/hptrr_os_bsd.c
+++ b/sys/dev/hptrr/hptrr_os_bsd.c
@@ -220,9 +220,9 @@ void  os_request_timer(void * osext, HPT_U32 interval)
 	PVBUS_EXT vbus_ext = osext;
 
 	HPT_ASSERT(vbus_ext->ext_type==EXT_TYPE_VBUS);
-	
-	untimeout(os_timer_for_ldm, vbus_ext, vbus_ext->timer);
-	vbus_ext->timer = timeout(os_timer_for_ldm, vbus_ext, interval * hz / 1000000);
+
+	callout_reset(&vbus_ext->timer, interval * hz / 1000000,
+	    os_timer_for_ldm, vbus_ext);
 }
 
 HPT_TIME os_query_time(void)
diff --git a/sys/dev/hptrr/hptrr_osm_bsd.c b/sys/dev/hptrr/hptrr_osm_bsd.c
index 25785c942284..ad7d79e34664 100644
--- a/sys/dev/hptrr/hptrr_osm_bsd.c
+++ b/sys/dev/hptrr/hptrr_osm_bsd.c
@@ -39,32 +39,38 @@ __FBSDID("$FreeBSD$");
 static int attach_generic = 0;
 TUNABLE_INT("hw.hptrr.attach_generic", &attach_generic);
 
-static int hpt_probe(device_t dev)
+static HIM *hpt_match(device_t dev)
 {
 	PCI_ID pci_id;
-	HIM *him;
 	int i;
-	PHBA hba;
+	HIM *him;
 
 	/* Some of supported chips are used not only by HPT. */
 	if (pci_get_vendor(dev) != 0x1103 && !attach_generic)
-		return (ENXIO);
+		return (NULL);
 	for (him = him_list; him; him = him->next) {
 		for (i=0; him->get_supported_device_id(i, &pci_id); i++) {
 			if ((pci_get_vendor(dev) == pci_id.vid) &&
 				(pci_get_device(dev) == pci_id.did)){
-				KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d",
-					pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev), pci_get_irq(dev)
-				));
-				device_set_desc(dev, him->name);
-				hba = (PHBA)device_get_softc(dev);
-				memset(hba, 0, sizeof(HBA));
-				hba->ext_type = EXT_TYPE_HBA;
-				hba->ldm_adapter.him = him;
-				return (BUS_PROBE_DEFAULT);
+				return (him);
 			}
 		}
 	}
+	return (NULL);
+}
+
+static int hpt_probe(device_t dev)
+{
+	HIM *him;
+
+	him = hpt_match(dev);
+	if (him != NULL) {
+		KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d",
+			pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev), pci_get_irq(dev)
+			    ));
+		device_set_desc(dev, him->name);
+		return (BUS_PROBE_DEFAULT);
+	}
 
 	return (ENXIO);
 }
@@ -72,17 +78,19 @@ static int hpt_probe(device_t dev)
 static int hpt_attach(device_t dev)
 {
 	PHBA hba = (PHBA)device_get_softc(dev);
-	HIM *him = hba->ldm_adapter.him;
+	HIM *him;
 	PCI_ID pci_id;
 	HPT_UINT size;
 	PVBUS vbus;
 	PVBUS_EXT vbus_ext;
 	
 	KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev)));
-	
-#if __FreeBSD_version >=440000
+
+	him = hpt_match(dev);
+	hba->ext_type = EXT_TYPE_HBA;
+	hba->ldm_adapter.him = him;
+
 	pci_enable_busmaster(dev);
-#endif
 
 	pci_id.vid = pci_get_vendor(dev);
 	pci_id.did = pci_get_device(dev);
@@ -90,8 +98,6 @@ static int hpt_attach(device_t dev)
 
 	size = him->get_adapter_size(&pci_id);
 	hba->ldm_adapter.him_handle = malloc(size, M_DEVBUF, M_WAITOK);
-	if (!hba->ldm_adapter.him_handle)
-		return ENXIO;
 
 	hba->pcidev = dev;
 	hba->pciaddr.tree = 0;
@@ -101,7 +107,7 @@ static int hpt_attach(device_t dev)
 
 	if (!him->create_adapter(&pci_id, hba->pciaddr, hba->ldm_adapter.him_handle, hba)) {
 		free(hba->ldm_adapter.him_handle, M_DEVBUF);
-		return -1;
+		return ENXIO;
 	}
 
 	os_printk("adapter at PCI %d:%d:%d, IRQ %d",
@@ -109,12 +115,8 @@ static int hpt_attach(device_t dev)
 
 	if (!ldm_register_adapter(&hba->ldm_adapter)) {
 		size = ldm_get_vbus_size();
-		vbus_ext = malloc(sizeof(VBUS_EXT) + size, M_DEVBUF, M_WAITOK);
-		if (!vbus_ext) {
-			free(hba->ldm_adapter.him_handle, M_DEVBUF);
-			return -1;
-		}
-		memset(vbus_ext, 0, sizeof(VBUS_EXT));
+		vbus_ext = malloc(sizeof(VBUS_EXT) + size, M_DEVBUF, M_WAITOK |
+		    M_ZERO);
 		vbus_ext->ext_type = EXT_TYPE_VBUS;
 		ldm_create_vbus((PVBUS)vbus_ext->vbus, vbus_ext);
 		ldm_register_adapter(&hba->ldm_adapter);
@@ -295,7 +297,7 @@ static int hpt_flush_vdev(PVBUS_EXT vbus_ext, PVDEV vd)
 
 	KdPrint(("flusing dev %p", vd));
 
-	hpt_lock_vbus(vbus_ext);
+	hpt_assert_vbus_locked(vbus_ext);
 
 	if (mIsArray(vd->type) && vd->u.array.transform)
 		count = MAX(vd->u.array.transform->source->cmds_per_request,
@@ -306,7 +308,6 @@ static int hpt_flush_vdev(PVBUS_EXT vbus_ext, PVDEV vd)
 	pCmd = ldm_alloc_cmds(vd->vbus, count);
 
 	if (!pCmd) {
-		hpt_unlock_vbus(vbus_ext);
 		return -1;
 	}
 
@@ -332,8 +333,6 @@ static int hpt_flush_vdev(PVBUS_EXT vbus_ext, PVDEV vd)
 
 	ldm_free_cmds(pCmd);
 
-	hpt_unlock_vbus(vbus_ext);
-
 	return result;
 }
 
@@ -348,6 +347,7 @@ static void hpt_shutdown_vbus(PVBUS_EXT vbus_ext, int howto)
 
 	/* stop all ctl tasks and disable the worker taskqueue */
 	hpt_stop_tasks(vbus_ext);
+	hpt_lock_vbus(vbus_ext);
 	vbus_ext->worker.ta_context = 0;
 
 	/* flush devices */
@@ -360,7 +360,6 @@ static void hpt_shutdown_vbus(PVBUS_EXT vbus_ext, int howto)
 		}
 	}
 
-	hpt_lock_vbus(vbus_ext);
 	ldm_shutdown(vbus);
 	hpt_unlock_vbus(vbus_ext);
 
@@ -376,6 +375,8 @@ static void hpt_shutdown_vbus(PVBUS_EXT vbus_ext, int howto)
 		free(hba->ldm_adapter.him_handle, M_DEVBUF);
 	}
 
+	callout_drain(&vbus_ext->timer);
+	mtx_destroy(&vbus_ext->lock);
 	free(vbus_ext, M_DEVBUF);
 	KdPrint(("hpt_shutdown_vbus done"));
 }
@@ -439,8 +440,8 @@ static void os_cmddone(PCOMMAND pCmd)
 	union ccb *ccb = ext->ccb;
 
 	KdPrint(("os_cmddone(%p, %d)", pCmd, pCmd->Result));
-	
-	untimeout(hpt_timeout, pCmd, ext->timeout_ch);
+
+	callout_stop(&ext->timeout);
 
 	switch(pCmd->Result) {
 	case RETURN_SUCCESS:
@@ -528,7 +529,7 @@ static void hpt_io_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nsegs
 			    BUS_DMASYNC_PREWRITE);
 		}
 	}
-	ext->timeout_ch = timeout(hpt_timeout, pCmd, HPT_OSM_TIMEOUT);
+	callout_reset(&ext->timeout, HPT_OSM_TIMEOUT, hpt_timeout, pCmd);
 	ldm_queue_cmd(pCmd);
 }
 
@@ -745,18 +746,15 @@ static void hpt_action(struct cam_sim *sim, union ccb *ccb)
 
 	KdPrint(("hpt_action(fn=%d, id=%d)", ccb->ccb_h.func_code, ccb->ccb_h.target_id));
 
+	hpt_assert_vbus_locked(vbus_ext);
 	switch (ccb->ccb_h.func_code) {
 	
 	case XPT_SCSI_IO:
-		hpt_lock_vbus(vbus_ext);
 		hpt_scsi_io(vbus_ext, ccb);
-		hpt_unlock_vbus(vbus_ext);
 		return;
 
 	case XPT_RESET_BUS:
-		hpt_lock_vbus(vbus_ext);
 		ldm_reset_vbus((PVBUS)vbus_ext->vbus);
-		hpt_unlock_vbus(vbus_ext);
 		break;
 
 	case XPT_GET_TRAN_SETTINGS:
@@ -765,14 +763,7 @@ static void hpt_action(struct cam_sim *sim, union ccb *ccb)
 		break;
 
 	case XPT_CALC_GEOMETRY:
-#if __FreeBSD_version >= 500000
 		cam_calc_geometry(&ccb->ccg, 1);
-#else
-		ccb->ccg.heads = 255;
-		ccb->ccg.secs_per_track = 63;
-		ccb->ccg.cylinders = ccb->ccg.volume_size / (ccb->ccg.heads * ccb->ccg.secs_per_track);
-		ccb->ccb_h.status = CAM_REQ_CMP;
-#endif
 		break;
 
 	case XPT_PATH_INQ:
@@ -821,7 +812,9 @@ static void hpt_pci_intr(void *arg)
 
 static void hpt_poll(struct cam_sim *sim)
 {
-	hpt_pci_intr(cam_sim_softc(sim));
+	PVBUS_EXT vbus_ext = cam_sim_softc(sim);
+	hpt_assert_vbus_locked(vbus_ext);
+	ldm_intr((PVBUS)vbus_ext->vbus);
 }
 
 static void hpt_async(void * callback_arg, u_int32_t code, struct cam_path * path, void * arg)
@@ -970,19 +963,7 @@ static struct cdevsw hpt_cdevsw = {
 	.d_close =	hpt_close,
 	.d_ioctl =	hpt_ioctl,
 	.d_name =	driver_name,
-#if __FreeBSD_version>=503000
 	.d_version =	D_VERSION,
-#endif
-#if (__FreeBSD_version>=503000 && __FreeBSD_version<600034)
-	.d_flags =	D_NEEDGIANT,
-#endif
-#if __FreeBSD_version<600034
-#if __FreeBSD_version>501000
-	.d_maj = 	MAJOR_AUTO,
-#else 
-	.d_maj = HPT_DEV_MAJOR,
-#endif
-#endif
 };
 
 static struct intr_config_hook hpt_ich;
@@ -1019,7 +1000,8 @@ static void hpt_final_init(void *dummy)
 	/* initializing hardware */
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		/* make timer available here */
-		callout_handle_init(&vbus_ext->timer);
+		mtx_init(&vbus_ext->lock, "hptsleeplock", NULL, MTX_DEF);
+		callout_init_mtx(&vbus_ext->timer, &vbus_ext->lock, 0);
 		if (hpt_init_vbus(vbus_ext)) {
 			os_printk("fail to initialize hardware");
 			break; /* FIXME */
@@ -1031,9 +1013,6 @@ static void hpt_final_init(void *dummy)
 		struct cam_devq *devq;
 		struct ccb_setasync	ccb;
 		
-#if (__FreeBSD_version >= 500000)
-		mtx_init(&vbus_ext->lock, "hptsleeplock", NULL, MTX_DEF);
-#endif
 		if (bus_dma_tag_create(NULL,/* parent */
 				4,	/* alignment */
 				BUS_SPACE_MAXADDR_32BIT+1, /* boundary */
@@ -1044,10 +1023,8 @@ static void hpt_final_init(void *dummy)
 				os_max_sg_descriptors,	/* nsegments */
 				0x10000,	/* maxsegsize */
 				BUS_DMA_WAITOK,		/* flags */
-#if __FreeBSD_version>502000
 				busdma_lock_mutex,	/* lockfunc */
 				&vbus_ext->lock,		/* lockfuncarg */
-#endif
 				&vbus_ext->io_dmat	/* tag */))
 		{
 			return ;
@@ -1067,7 +1044,7 @@ static void hpt_final_init(void *dummy)
 				os_printk("Can't create dma map(%d)", i);
 				return ;
 			}
-			callout_handle_init(&ext->timeout_ch);
+			callout_init_mtx(&ext->timeout, &vbus_ext->lock, 0);
 		}
 
 		if ((devq = cam_simq_alloc(os_max_queue_comm)) == NULL) {
@@ -1075,13 +1052,9 @@ static void hpt_final_init(void *dummy)
 			return ;
 		}
 
-#if __FreeBSD_version > 700025
 		vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name,
-				vbus_ext, 0, &Giant, os_max_queue_comm, /*tagged*/8,  devq);
-#else
-		vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name,
-				vbus_ext, 0, os_max_queue_comm, /*tagged*/8,  devq);
-#endif
+				vbus_ext, 0, &vbus_ext->lock, os_max_queue_comm,
+				/*tagged*/8,  devq);
 				
 		if (!vbus_ext->sim) {
 			os_printk("cam_sim_alloc failed");
@@ -1089,13 +1062,11 @@ static void hpt_final_init(void *dummy)
 			return ;
 		}
 
-#if __FreeBSD_version > 700044
+		hpt_lock_vbus(vbus_ext);
 		if (xpt_bus_register(vbus_ext->sim, NULL, 0) != CAM_SUCCESS) {
-#else
-		if (xpt_bus_register(vbus_ext->sim, 0) != CAM_SUCCESS) {
-#endif
 			os_printk("xpt_bus_register failed");
 			cam_sim_free(vbus_ext->sim, /*free devq*/ TRUE);
+			hpt_unlock_vbus(vbus_ext);
 			vbus_ext->sim = NULL;
 			return ;
 		}
@@ -1107,9 +1078,11 @@ static void hpt_final_init(void *dummy)
 			os_printk("xpt_create_path failed");
 			xpt_bus_deregister(cam_sim_path(vbus_ext->sim));
 			cam_sim_free(vbus_ext->sim, /*free_devq*/TRUE);
+			hpt_unlock_vbus(vbus_ext);
 			vbus_ext->sim = NULL;
 			return ;
 		}
+		hpt_unlock_vbus(vbus_ext);
 
 		xpt_setup_ccb(&ccb.ccb_h, vbus_ext->path, /*priority*/5);
 		ccb.ccb_h.func_code = XPT_SASYNC_CB;
@@ -1127,12 +1100,8 @@ static void hpt_final_init(void *dummy)
 				return ;
 			}
 			
-			if (bus_setup_intr(hba->pcidev, hba->irq_res, INTR_TYPE_CAM,
-#if __FreeBSD_version > 700025
+			if (bus_setup_intr(hba->pcidev, hba->irq_res, INTR_TYPE_CAM | INTR_MPSAFE,
 				NULL, hpt_pci_intr, vbus_ext, &hba->irq_handle)) 
-#else
-				hpt_pci_intr, vbus_ext, &hba->irq_handle)) 
-#endif
 			{
 				os_printk("can't set up interrupt");
 				return ;
@@ -1156,7 +1125,7 @@ static void hpt_final_init(void *dummy)
 	    S_IRUSR | S_IWUSR, "%s", driver_name);
 }
 
-#if defined(KLD_MODULE) && (__FreeBSD_version >= 503000)
+#if defined(KLD_MODULE)
 
 typedef struct driverlink *driverlink_t;
 struct driverlink {
@@ -1248,29 +1217,17 @@ __DRIVER_MODULE(TARGETNAME, pci, hpt_pci_driver, hpt_devclass, 0, 0);
 __MODULE_VERSION(TARGETNAME, 1);
 __MODULE_DEPEND(TARGETNAME, cam, 1, 1, 1);
 
-#if __FreeBSD_version>503000
-typedef struct cdev * ioctl_dev_t;
-#else 
-typedef dev_t ioctl_dev_t;
-#endif
-
-#if __FreeBSD_version >= 500000
-typedef	struct thread *	ioctl_thread_t;
-#else 
-typedef struct proc *	ioctl_thread_t;
-#endif
-
-static int hpt_open(ioctl_dev_t dev, int flags, int devtype, ioctl_thread_t td)
+static int hpt_open(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
 	return 0;
 }
 
-static int hpt_close(ioctl_dev_t dev, int flags, int devtype, ioctl_thread_t td)
+static int hpt_close(struct cdev *dev, int flags, int devtype, struct thread *td)
 {
 	return 0;
 }
 
-static int hpt_ioctl(ioctl_dev_t dev, u_long cmd, caddr_t data, int fflag, ioctl_thread_t td)
+static int hpt_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct thread *td)
 {
 	PHPT_IOCTL_PARAM piop=(PHPT_IOCTL_PARAM)data;
 	IOCTL_ARG ioctl_args;
@@ -1309,16 +1266,8 @@ static int hpt_ioctl(ioctl_dev_t dev, u_long cmd, caddr_t data, int fflag, ioctl
 				goto invalid;
 		}
 		
-#if (__FreeBSD_version >= 500000)
-		mtx_lock(&Giant);
-#endif
-
 		hpt_do_ioctl(&ioctl_args);
 	
-#if (__FreeBSD_version >= 500000)
-		mtx_unlock(&Giant);
-#endif
-
 		if (ioctl_args.result==HPT_IOCTL_RESULT_OK) {
 			if (piop->nOutBufferSize) {
 				if (copyout(ioctl_args.lpOutBuffer,
@@ -1359,10 +1308,6 @@ static int	hpt_rescan_bus(void)
 	PVBUS 				vbus;
 	PVBUS_EXT			vbus_ext;	
 		
-#if (__FreeBSD_version >= 500000)
-	mtx_lock(&Giant);
-#endif
-
 	ldm_for_each_vbus(vbus, vbus_ext) {
 		if ((ccb = xpt_alloc_ccb()) == NULL)
 			return(ENOMEM);
@@ -1375,9 +1320,5 @@ static int	hpt_rescan_bus(void)
 		xpt_rescan(ccb);
 	}
 	
-#if (__FreeBSD_version >= 500000)
-	mtx_unlock(&Giant);
-#endif
-
 	return(0);	
 }
diff --git a/sys/dev/hptrr/os_bsd.h b/sys/dev/hptrr/os_bsd.h
index 1c6760e8edaa..4f8abb55c834 100644
--- a/sys/dev/hptrr/os_bsd.h
+++ b/sys/dev/hptrr/os_bsd.h
@@ -42,12 +42,8 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/cons.h>
-#if (__FreeBSD_version >= 500000) 
 #include <sys/time.h>
 #include <sys/systm.h> 
-#else 
-#include <machine/clock.h>	/*to support DELAY function under 4.x BSD versions*/
-#endif
 
 #include <sys/stat.h>
 #include <sys/malloc.h>
@@ -55,11 +51,9 @@
 #include <sys/libkern.h>
 #include <sys/kernel.h>
 
-#if (__FreeBSD_version >= 500000)
 #include <sys/kthread.h>
 #include <sys/mutex.h>
 #include <sys/module.h>
-#endif
 
 #include <sys/eventhandler.h>
 #include <sys/bus.h>
@@ -74,17 +68,8 @@
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#if (__FreeBSD_version >= 500000)
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#else 
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
-#endif
-
-#if (__FreeBSD_version <= 500043)
-#include <sys/devicestat.h>
-#endif
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
@@ -95,9 +80,6 @@
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 
-#if (__FreeBSD_version < 500043)
-#include <sys/bus_private.h>
-#endif
 
 
 typedef struct _INQUIRYDATA {
@@ -174,7 +156,7 @@ typedef struct _os_cmdext {
 	struct _os_cmdext *next;
 	union ccb         *ccb;
 	bus_dmamap_t       dma_map;
-	struct callout_handle timeout_ch;
+	struct callout     timeout;
 	SG                 psg[os_max_sg_descriptors];
 }
 OS_CMDEXT, *POS_CMDEXT;
@@ -188,11 +170,7 @@ typedef struct _vbus_ext {
 	
 	struct cam_sim   *sim;    /* sim for this vbus */
 	struct cam_path  *path;   /* peripheral, path, tgt, lun with this vbus */
-#if (__FreeBSD_version >= 500000)
 	struct mtx        lock; /* general purpose lock */
-#else 
-	int  			hpt_splx;
-#endif
 	bus_dma_tag_t     io_dmat; /* I/O buffer DMA tag */
 	
 	POS_CMDEXT        cmdext_list;
@@ -200,7 +178,7 @@ typedef struct _vbus_ext {
 	OSM_TASK         *tasks;
 	struct task       worker;
 	
-	struct callout_handle timer;
+	struct callout    timer;
 
 	eventhandler_tag  shutdown_eh;
 	
@@ -209,19 +187,9 @@ typedef struct _vbus_ext {
 }
 VBUS_EXT, *PVBUS_EXT;
 
-#if __FreeBSD_version >= 500000
 #define hpt_lock_vbus(vbus_ext)   mtx_lock(&(vbus_ext)->lock)
 #define hpt_unlock_vbus(vbus_ext) mtx_unlock(&(vbus_ext)->lock)
-#else 
-static __inline	void	hpt_lock_vbus(PVBUS_EXT	vbus_ext)
-{
-	vbus_ext->hpt_splx = splcam();
-}
-static __inline	void	hpt_unlock_vbus(PVBUS_EXT vbus_ext)
-{
-	splx(vbus_ext->hpt_splx);
-}
-#endif
+#define hpt_assert_vbus_locked(vbus_ext)   mtx_assert(&(vbus_ext)->lock, MA_OWNED)
 
 
 #define HPT_OSM_TIMEOUT (20*hz)  /* timeout value for OS commands */
@@ -230,35 +198,9 @@ static __inline	void	hpt_unlock_vbus(PVBUS_EXT vbus_ext)
 
 #define HPT_SCAN_BUS		_IO('H', 1)
 
-#if __FreeBSD_version >= 501000
-#define TASK_ENQUEUE(task)	taskqueue_enqueue(taskqueue_swi_giant,(task));
-#else 
 #define TASK_ENQUEUE(task)	taskqueue_enqueue(taskqueue_swi,(task));
-#endif
 
-#if __FreeBSD_version >= 500000
 static	__inline	int hpt_sleep(PVBUS_EXT vbus_ext, void *ident, int priority, const char *wmesg, int timo)
 {
 	return	msleep(ident, &vbus_ext->lock, priority, wmesg, timo);
 }
-#else 
-static	__inline	int hpt_sleep(PVBUS_EXT vbus_ext, void *ident, int priority, const char *wmesg, int timo)
-{
-	int retval = 0;
-	
-	asleep(ident, priority, wmesg, timo);
-	hpt_unlock_vbus(vbus_ext);
-	retval = await(priority, timo);
-	hpt_lock_vbus(vbus_ext);
-	
-	return retval;
-}
-#endif
-
-#if __FreeBSD_version < 501000
-#define	READ_16				0x88
-#define WRITE_16			0x8a
-#define SERVICE_ACTION_IN	0x9e
-#endif
-
-#define	HPT_DEV_MAJOR	200
diff --git a/sys/dev/hwpmc/hwpmc_logging.c b/sys/dev/hwpmc/hwpmc_logging.c
index c9b8aeaf5af1..ee5b89771f7b 100644
--- a/sys/dev/hwpmc/hwpmc_logging.c
+++ b/sys/dev/hwpmc/hwpmc_logging.c
@@ -66,8 +66,7 @@ SYSCTL_DECL(_kern_hwpmc);
  */
 
 static int pmclog_buffer_size = PMC_LOG_BUFFER_SIZE;
-TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "logbuffersize", &pmclog_buffer_size);
-SYSCTL_INT(_kern_hwpmc, OID_AUTO, logbuffersize, CTLFLAG_TUN|CTLFLAG_RD,
+SYSCTL_INT(_kern_hwpmc, OID_AUTO, logbuffersize, CTLFLAG_RDTUN,
     &pmclog_buffer_size, 0, "size of log buffers in kilobytes");
 
 /*
@@ -75,8 +74,7 @@ SYSCTL_INT(_kern_hwpmc, OID_AUTO, logbuffersize, CTLFLAG_TUN|CTLFLAG_RD,
  */
 
 static int pmc_nlogbuffers = PMC_NLOGBUFFERS;
-TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "nbuffers", &pmc_nlogbuffers);
-SYSCTL_INT(_kern_hwpmc, OID_AUTO, nbuffers, CTLFLAG_TUN|CTLFLAG_RD,
+SYSCTL_INT(_kern_hwpmc, OID_AUTO, nbuffers, CTLFLAG_RDTUN,
     &pmc_nlogbuffers, 0, "number of global log buffers");
 
 /*
diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c
index 8e5eac879d24..6241638d13b0 100644
--- a/sys/dev/hwpmc/hwpmc_mod.c
+++ b/sys/dev/hwpmc/hwpmc_mod.c
@@ -234,8 +234,7 @@ static void pmc_generic_cpu_finalize(struct pmc_mdep *md);
 SYSCTL_DECL(_kern_hwpmc);
 
 static int pmc_callchaindepth = PMC_CALLCHAIN_DEPTH;
-TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "callchaindepth", &pmc_callchaindepth);
-SYSCTL_INT(_kern_hwpmc, OID_AUTO, callchaindepth, CTLFLAG_TUN|CTLFLAG_RD,
+SYSCTL_INT(_kern_hwpmc, OID_AUTO, callchaindepth, CTLFLAG_RDTUN,
     &pmc_callchaindepth, 0, "depth of call chain records");
 
 #ifdef	DEBUG
@@ -244,7 +243,7 @@ char	pmc_debugstr[PMC_DEBUG_STRSIZE];
 TUNABLE_STR(PMC_SYSCTL_NAME_PREFIX "debugflags", pmc_debugstr,
     sizeof(pmc_debugstr));
 SYSCTL_PROC(_kern_hwpmc, OID_AUTO, debugflags,
-    CTLTYPE_STRING|CTLFLAG_RW|CTLFLAG_TUN,
+    CTLTYPE_STRING | CTLFLAG_RWTUN | CTLFLAG_NOFETCH,
     0, 0, pmc_debugflags_sysctl_handler, "A", "debug flags");
 #endif
 
@@ -254,8 +253,7 @@ SYSCTL_PROC(_kern_hwpmc, OID_AUTO, debugflags,
  */
 
 static int pmc_hashsize = PMC_HASH_SIZE;
-TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "hashsize", &pmc_hashsize);
-SYSCTL_INT(_kern_hwpmc, OID_AUTO, hashsize, CTLFLAG_TUN|CTLFLAG_RD,
+SYSCTL_INT(_kern_hwpmc, OID_AUTO, hashsize, CTLFLAG_RDTUN,
     &pmc_hashsize, 0, "rows in hash tables");
 
 /*
@@ -263,8 +261,7 @@ SYSCTL_INT(_kern_hwpmc, OID_AUTO, hashsize, CTLFLAG_TUN|CTLFLAG_RD,
  */
 
 static int pmc_nsamples = PMC_NSAMPLES;
-TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "nsamples", &pmc_nsamples);
-SYSCTL_INT(_kern_hwpmc, OID_AUTO, nsamples, CTLFLAG_TUN|CTLFLAG_RD,
+SYSCTL_INT(_kern_hwpmc, OID_AUTO, nsamples, CTLFLAG_RDTUN,
     &pmc_nsamples, 0, "number of PC samples per CPU");
 
 
@@ -273,8 +270,7 @@ SYSCTL_INT(_kern_hwpmc, OID_AUTO, nsamples, CTLFLAG_TUN|CTLFLAG_RD,
  */
 
 static int pmc_mtxpool_size = PMC_MTXPOOL_SIZE;
-TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "mtxpoolsize", &pmc_mtxpool_size);
-SYSCTL_INT(_kern_hwpmc, OID_AUTO, mtxpoolsize, CTLFLAG_TUN|CTLFLAG_RD,
+SYSCTL_INT(_kern_hwpmc, OID_AUTO, mtxpoolsize, CTLFLAG_RDTUN,
     &pmc_mtxpool_size, 0, "size of spin mutex pool");
 
 
@@ -288,8 +284,7 @@ SYSCTL_INT(_kern_hwpmc, OID_AUTO, mtxpoolsize, CTLFLAG_TUN|CTLFLAG_RD,
  */
 
 static int pmc_unprivileged_syspmcs = 0;
-TUNABLE_INT("security.bsd.unprivileged_syspmcs", &pmc_unprivileged_syspmcs);
-SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_syspmcs, CTLFLAG_RW,
+SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_syspmcs, CTLFLAG_RWTUN,
     &pmc_unprivileged_syspmcs, 0,
     "allow unprivileged process to allocate system PMCs");
 
diff --git a/sys/dev/hwpmc/hwpmc_powerpc.c b/sys/dev/hwpmc/hwpmc_powerpc.c
index 19207cd285b5..462805935c4b 100644
--- a/sys/dev/hwpmc/hwpmc_powerpc.c
+++ b/sys/dev/hwpmc/hwpmc_powerpc.c
@@ -55,20 +55,22 @@ int
 pmc_save_kernel_callchain(uintptr_t *cc, int maxsamples,
     struct trapframe *tf)
 {
+	uintptr_t *osp, *sp;
 	int frames = 0;
-	uintptr_t *sp;
 
 	cc[frames++] = PMC_TRAPFRAME_TO_PC(tf);
 	sp = (uintptr_t *)PMC_TRAPFRAME_TO_FP(tf);
+	osp = NULL;
 
 	for (; frames < maxsamples; frames++) {
-		if (!INKERNEL(sp))
+		if (!INKERNEL(sp) || sp <= osp)
 			break;
 #ifdef __powerpc64__
-		cc[frames++] = sp[2];
+		cc[frames] = sp[2];
 #else
-		cc[frames++] = sp[1];
+		cc[frames] = sp[1];
 #endif
+		osp = sp;
 		sp = (uintptr_t *)*sp;
 	}
 	return (frames);
@@ -184,26 +186,28 @@ int
 pmc_save_user_callchain(uintptr_t *cc, int maxsamples,
     struct trapframe *tf)
 {
-	uintptr_t *sp;
+	uintptr_t *osp, *sp;
 	int frames = 0;
 
 	cc[frames++] = PMC_TRAPFRAME_TO_PC(tf);
 	sp = (uintptr_t *)PMC_TRAPFRAME_TO_FP(tf);
+	osp = NULL;
 
 	for (; frames < maxsamples; frames++) {
-		if (!INUSER(sp))
+		if (!INUSER(sp) || sp <= osp)
 			break;
+		osp = sp;
 #ifdef __powerpc64__
 		/* Check if 32-bit mode. */
 		if (!(tf->srr1 & PSL_SF)) {
-			cc[frames++] = fuword32((uint32_t *)sp + 1);
+			cc[frames] = fuword32((uint32_t *)sp + 1);
 			sp = (uintptr_t *)(uintptr_t)fuword32(sp);
 		} else {
-			cc[frames++] = fuword(sp + 2);
+			cc[frames] = fuword(sp + 2);
 			sp = (uintptr_t *)fuword(sp);
 		}
 #else
-		cc[frames++] = fuword32((uint32_t *)sp + 1);
+		cc[frames] = fuword32((uint32_t *)sp + 1);
 		sp = (uintptr_t *)fuword32(sp);
 #endif
 	}
diff --git a/sys/dev/i40e/README b/sys/dev/i40e/README
new file mode 100644
index 000000000000..e52b09962cbd
--- /dev/null
+++ b/sys/dev/i40e/README
@@ -0,0 +1,342 @@
+FreeBSD Base Driver for the Intel� XL710 Ethernet Controller Family
+================================================================
+
+/*$FreeBSD$*/
+
+July 21, 2014
+
+
+Contents
+========
+
+- Overview
+- Supported Adapters
+- Building and Installation
+- Additional Configurations
+- Known Limitations
+
+
+Overview
+========
+
+This file describes the i40e FreeBSD* Base driver for the XL710 Ethernet Family of Adapters. The Driver has been developed for use with FreeBSD 10.0 or later,  but should be compatible with any supported release.
+
+For questions related to hardware requirements, refer to the documentation      supplied with your Intel XL710 adapter. All hardware requirements listed apply  for use with FreeBSD.
+
+
+Supported Adapters
+==================
+
+The driver in this release is compatible with XL710 and X710-based Intel        Ethernet Network Connections.
+
+
+SFP+ Devices with Pluggable Optics
+----------------------------------
+
+SR Modules
+----------
+  Intel     DUAL RATE 1G/10G SFP+ SR (bailed)    FTLX8571D3BCV-IT
+  Intel     DUAL RATE 1G/10G SFP+ SR (bailed)    AFBR-703SDZ-IN2
+
+LR Modules
+----------
+  Intel     DUAL RATE 1G/10G SFP+ LR (bailed)    FTLX1471D3BCV-IT
+  Intel     DUAL RATE 1G/10G SFP+ LR (bailed)    AFCT-701SDZ-IN2
+
+QSFP+ Modules
+-------------
+  Intel     TRIPLE RATE 1G/10G/40G QSFP+ SR (bailed)    E40GQSFPSR
+  Intel     TRIPLE RATE 1G/10G/40G QSFP+ LR (bailed)    E40GQSFPLR
+    QSFP+ 1G speed is not supported on XL710 based devices.
+
+X710/XL710 Based SFP+ adapters support all passive and active limiting direct   attach cables that comply with SFF-8431 v4.1 and SFF-8472 v10.4 specifications.
+              
+
+Building and Installation
+=========================
+
+NOTE: You must have kernel sources installed to compile the driver module.
+
+In the instructions below, x.x.x is the driver version
+as indicated in thename of the driver tar. 
+
+1. Move the base driver tar file to the directory of your choice. For example,  use /home/username/i40e or /usr/local/src/i40e.
+
+2. Untar/unzip the archive:
+     tar xfz i40e-x.x.x.tar.gz
+
+3. To install man page:
+     cd i40e-x.x.x
+     gzip -c i40e.4 > /usr/share/man/man4/i40e.4.gz
+
+4. To load the driver onto a running system:
+     cd i40e-x.x.x/src
+     make load
+
+5. To assign an IP address to the interface, enter the following:
+     ifconfig ixl<interface_num> <IP_address>
+
+6. Verify that the interface works. Enter the following, where <IP_address> is  the IP address for another machine on the same subnet as the interface that is  being tested:
+
+     ping <IP_address>
+
+7. If you want the driver to load automatically when the system is booted:
+
+     cd i40e-x.x.x/src
+     make
+     make install
+        
+    Edit /boot/loader.conf, and add the following line:
+     if_i40e_load="YES"
+
+    Edit /etc/rc.conf, and create the appropriate
+    ifconfig_ixl<interface_num> entry:
+
+     ifconfig_ixl<interface_num>="<ifconfig_settings>"
+
+     Example usage:
+
+     ifconfig_ixl0="inet 192.168.10.1 netmask 255.255.255.0"
+
+     NOTE: For assistance, see the ifconfig man page.
+
+
+
+Configuration and Tuning
+=========================
+
+The driver supports Transmit/Receive Checksum Offload for IPv4 and IPv6,
+TSO forIPv4 and IPv6, LRO, and Jumbo Frames on all 40 Gigabit adapters. 
+
+  Jumbo Frames
+  ------------
+  To enable Jumbo Frames, use the ifconfig utility to increase
+  the MTU beyond 1500 bytes.
+
+       - The Jumbo Frames setting on the switch must be set to at least
+         22 byteslarger than that of the adapter.
+
+       - The maximum MTU setting for Jumbo Frames is 9706. This value
+         coincides with the maximum jumbo frames size of 9728.
+         To modify the setting, enter the following:
+
+        ifconfig ixl<interface_num> <hostname or IP address> mtu 9000
+
+       - To confirm an interface's MTU value, use the ifconfig command.
+         To confirm the MTU used between two specific devices, use:
+
+        route get <destination_IP_address>
+
+  VLANs
+  -----
+  To create a new VLAN pseudo-interface:
+
+        ifconfig <vlan_name> create
+
+  To associate the VLAN pseudo-interface with a physical interface
+  and assign a VLAN ID, IP address, and netmask:
+
+        ifconfig <vlan_name> <ip_address> netmask <subnet_mask> vlan
+           <vlan_id> vlandev <physical_interface>
+
+  Example:
+
+        ifconfig vlan10 10.0.0.1 netmask 255.255.255.0 vlan 10 vlandev ixl0
+
+  In this example, all packets will be marked on egress with
+  802.1Q VLAN tags, specifying a VLAN ID of 10.
+
+  To remove a VLAN pseudo-interface:
+
+        ifconfig <vlan_name> destroy
+
+
+  Checksum Offload
+  ----------------
+    
+  Checksum offloading supports IPv4 and IPv6 with TCP and UDP packets
+  and is supported for both transmit and receive. Checksum offloading
+  for transmit and recieve is enabled by default for both IPv4 and IPv6.
+
+  Checksum offloading can be enabled or disabled using ifconfig.
+  Transmit and receive offloading for IPv4 and Ipv6 are enabled
+  and disabled seperately.
+
+  NOTE: TSO requires Tx checksum, so when Tx checksum
+        is disabled, TSO will also  be disabled. 
+
+  To enable Tx checksum offloading for ipv4:
+
+         ifconfig ixl<interface_num> txcsum4 
+
+  To disable Tx checksum offloading for ipv4:
+         
+         ifconfig ixl<interface_num> -txcsum4 
+         (NOTE: This will disable TSO4)
+
+  To enable Rx checksum offloading for ipv6:
+ 
+         ifconfig ixl<interface_num> rxcsum6 
+         
+  To disable Rx checksum offloading for ipv6:
+
+         ifconfig ixl<interface_num> -rxcsum6 
+         (NOTE: This will disable TSO6)
+
+  
+  To confirm the current settings:
+
+         ifconfig ixl<interface_num>
+
+  
+  TSO
+  ---
+
+  TSO supports both IPv4 and IPv6 and is enabled by default. TSO can
+  be disabled and enabled using the ifconfig utility.
+
+  NOTE: TSO requires Tx checksum, so when Tx checksum is
+      disabled, TSO will also be disabled. 
+
+  To disable TSO IPv4:
+
+         ifconfig ixl<interface_num> -tso4
+         
+  To enable TSO IPv4:
+
+         ifconfig ixl<interface_num> tso4 
+
+  To disable TSO IPv6:
+
+         ifconfig ixl<interface_num> -tso6
+
+  To enable TSO IPv6:
+        
+         ifconfig ixl<interface_num> tso6
+
+  To disable BOTH TSO IPv4 and IPv6:
+
+         ifconfig ixl<interface_num> -tso
+
+  To enable BOTH TSO IPv4 and IPv6:
+  
+         ifconfig ixl<interface_num> tso
+
+
+  LRO
+  ---
+
+  Large Receive Offload is enabled by default. It can be enabled
+  or disabled by using the ifconfig utility.
+
+  NOTE: LRO should be disabled when forwarding packets.
+
+  To disable LRO:	
+
+         ifconfig ixl<interface_num> -lro 
+
+  To enable LRO:
+
+         ifconfig ixl<interface_num> lro 
+
+
+Flow Control
+------------
+Flow control is disabled by default. To change flow control settings use sysctl.
+
+To enable flow control to Rx pause frames:     
+
+         sysctl dev.ixl.<interface_num>.fc=1
+
+To enable flow control to Tx pause frames: 
+
+         sysctl dev.ixl.<interface_num>.fc=2
+
+To enable flow control to Rx and Tx pause frames:
+
+         sysctl dev.ixl.<interface_num>.fc=3
+
+To disable flow control:
+
+         sysctl dev.ixl.<interface_num>.fc=0
+    
+
+NOTE: You must have a flow control capable link partner.
+
+
+   
+  Important system configuration changes:
+  =======================================
+ 
+  
+-Change the file /etc/sysctl.conf, and add the line:  
+ 
+         hw.intr_storm_threshold: 0 (the default is 1000)
+
+-Best throughput results are seen with a large MTU; use 9706 if possible. 
+
+-The default number of descriptors per ring is 1024, increasing this may        improve performance depending on the use case.
+
+
+Known Limitations
+=================
+
+Network Memory Buffer allocation
+--------------------------------
+  FreeBSD may have a low number of network memory buffers (mbufs) by default. Ifyour mbuf value is too low, it may cause the driver to fail to initialize and/orcause the system to become unresponsive. You can check to see if the system is  mbuf-starved by running 'netstat -m'. Increase the number of mbufs by editing   the lines below in /etc/sysctl.conf:
+
+         kern.ipc.nmbclusters
+         kern.ipc.nmbjumbop    
+         kern.ipc.nmbjumbo9
+         kern.ipc.nmbjumbo16
+         kern.ipc.nmbufs
+
+The amount of memory that you allocate is system specific, and may require some trial and error.
+
+Also, increasing the follwing in /etc/sysctl.conf could help increase network   performance:
+         
+         kern.ipc.maxsockbuf
+         net.inet.tcp.sendspace
+         net.inet.tcp.recvspace
+         net.inet.udp.maxdgram
+         net.inet.udp.recvspace
+                  
+
+UDP Stress Test Dropped Packet Issue
+------------------------------------
+  Under small packet UDP stress test with the i40e driver, the FreeBSD system   will drop UDP packets due to the fullness of socket buffers. You may want to    change the driver's Flow Control variables to the minimum value for controlling packet reception.
+
+
+Disable LRO when routing/bridging
+---------------------------------
+LRO must be turned off when forwarding traffic.
+
+
+Lower than expected performance
+-------------------------------
+  Some PCIe x8 slots are actually configured as x4 slots. These slots have      insufficient bandwidth for full line rate with dual port and quad port devices. In addition, if you put a PCIe Generation 3-capable adapter into a PCIe         Generation 2 slot, you cannot get full bandwidth. The driver detects this       situation and writes the following message in the system log:
+
+  "PCI-Express bandwidth available for this card is not sufficient for optimal  performance. For optimal performance a x8 PCI-Express slot is required."
+
+If this error occurs, moving your adapter to a true PCIe Generation 3 x8 slot   will resolve the issue.
+
+
+Support
+=======
+
+For general information and support, go to the Intel support website at:
+
+        http://support.intel.com
+
+If an issue is identified with the released source code on the supported kernel with a supported adapter, email the specific information related to the issue tofreebsdnic@mailbox.intel.com.
+
+
+License
+=======
+
+This software program is released under the terms of a license agreement betweenyou ('Licensee') and Intel. Do not use or load this software or any associated  materials (collectively, the 'Software') until you have carefully read the full terms and conditions of the LICENSE located in this software package. By loadingor using the Software, you agree to the terms of this Agreement. If you do not 
+agree with the terms of this Agreement, do not install or use the Software.
+
+* Other names and brands may be claimed as the property of others.
+
+
diff --git a/sys/dev/i40e/i40e.h b/sys/dev/i40e/i40e.h
index 8892e09b80b4..e377c2cd6970 100755
--- a/sys/dev/i40e/i40e.h
+++ b/sys/dev/i40e/i40e.h
@@ -92,13 +92,23 @@
 #include "i40e_prototype.h"
 
 #ifdef I40E_DEBUG
+#include <sys/sbuf.h>
+
 #define MAC_FORMAT "%02x:%02x:%02x:%02x:%02x:%02x"
 #define MAC_FORMAT_ARGS(mac_addr) \
 	(mac_addr)[0], (mac_addr)[1], (mac_addr)[2], (mac_addr)[3], \
 	(mac_addr)[4], (mac_addr)[5]
 #define ON_OFF_STR(is_set) ((is_set) ? "On" : "Off")
 
+#define DPRINTF(...)		printf(__VA_ARGS__)
+#define DDPRINTF(dev, ...)	device_printf(dev, __VA_ARGS__)
+#define IDPRINTF(ifp, ...)	if_printf(ifp, __VA_ARGS__)
+
 // static void	i40e_dump_desc(void *, u8, u16);
+#else
+#define DPRINTF(...)
+#define DDPRINTF(...)
+#define IDPRINTF(...)
 #endif
 
 /* Tunables */
@@ -173,10 +183,21 @@
 #define I40E_ITR_NONE		3
 #define I40E_QUEUE_EOL		0x7FF
 #define I40E_MAX_FRAME		0x2600
-#define I40E_MAX_SEGS		32
-#define I40E_MAX_FILTERS	256 /* This is artificial */
+#define I40E_MAX_TX_SEGS	8 
+#define I40E_MAX_TSO_SEGS	66 
+#define I40E_SPARSE_CHAIN	6
+#define I40E_QUEUE_HUNG		0x80000000
+
+/* ERJ: hardware can support ~1.5k filters between all functions */
+#define I40E_MAX_FILTERS	256
 #define I40E_MAX_TX_BUSY	10
 
+#define I40E_NVM_VERSION_LO_SHIFT	0
+#define I40E_NVM_VERSION_LO_MASK	(0xff << I40E_NVM_VERSION_LO_SHIFT)
+#define I40E_NVM_VERSION_HI_SHIFT	12
+#define I40E_NVM_VERSION_HI_MASK	(0xf << I40E_NVM_VERSION_HI_SHIFT)
+
+
 /*
  * Interrupt Moderation parameters 
  */
@@ -200,7 +221,9 @@
 /* used in the vlan field of the filter when not a vlan */
 #define I40E_VLAN_ANY		-1
 
-#define CSUM_OFFLOAD		(CSUM_IP|CSUM_TCP|CSUM_UDP|CSUM_SCTP)
+#define CSUM_OFFLOAD_IPV4	(CSUM_IP|CSUM_TCP|CSUM_UDP|CSUM_SCTP)
+#define CSUM_OFFLOAD_IPV6	(CSUM_TCP_IPV6|CSUM_UDP_IPV6|CSUM_SCTP_IPV6)
+#define CSUM_OFFLOAD		(CSUM_OFFLOAD_IPV4|CSUM_OFFLOAD_IPV6|CSUM_TSO)
 
 /* Misc flags for i40e_vsi.flags */
 #define I40E_FLAGS_KEEP_TSO4	(1 << 0)
@@ -238,6 +261,7 @@ struct i40e_tx_buf {
 	u32		eop_index;
 	struct mbuf	*m_head;
 	bus_dmamap_t	map;
+	bus_dma_tag_t	tag;
 };
 
 struct i40e_rx_buf {
@@ -248,15 +272,6 @@ struct i40e_rx_buf {
 	bus_dmamap_t	pmap;
 };
 
-struct i40e_pkt_info {
-	u16		etype;
-	u32		elen;
-	u32		iplen;
-	struct ip	*ip;
-	struct ip6_hdr	*ip6;
-	struct tcphdr	*th;
-};
-
 /*
 ** This struct has multiple uses, multicast
 ** addresses, vlans, and mac filters all use it.
@@ -275,7 +290,7 @@ struct i40e_mac_filter {
 struct tx_ring {
         struct i40e_queue	*que;
 	struct mtx		mtx;
-	int			watchdog;
+	u32			tail;
 	struct i40e_tx_desc	*base;
 	struct i40e_dma_mem	dma;
 	u16			next_avail;
@@ -287,7 +302,8 @@ struct tx_ring {
 	struct i40e_tx_buf	*buffers;
 	volatile u16		avail;
 	u32			cmd;
-	bus_dma_tag_t		tag;
+	bus_dma_tag_t		tx_tag;
+	bus_dma_tag_t		tso_tag;
 	char			mtx_name[16];
 	struct buf_ring		*br;
 
@@ -318,6 +334,7 @@ struct rx_ring {
 	char			mtx_name[16];
 	struct i40e_rx_buf	*buffers;
 	u32			mbuf_sz;
+	u32			tail;
 	bus_dma_tag_t		htag;
 	bus_dma_tag_t		ptag;
 
@@ -407,6 +424,7 @@ struct i40e_vsi {
 	u64			hw_filters_add;
 
 	/* Misc. */
+	u64 			active_queues;
 	u64 			flags;
 };
 
@@ -433,8 +451,9 @@ i40e_get_filter(struct i40e_vsi *vsi)
 {
 	struct i40e_mac_filter  *f;
 
-	// create a new empty filter
-	f = malloc(sizeof(struct i40e_mac_filter) , M_DEVBUF, M_NOWAIT | M_ZERO);
+	/* create a new empty filter */
+	f = malloc(sizeof(struct i40e_mac_filter),
+	    M_DEVBUF, M_NOWAIT | M_ZERO);
 	SLIST_INSERT_HEAD(&vsi->ftl, f, next);
 
 	return (f);
@@ -467,6 +486,25 @@ struct i40e_sysctl_info {
 
 extern int i40e_atr_rate;
 
+/*
+** i40e_fw_version_str - format the FW and NVM version strings
+*/
+static inline char *
+i40e_fw_version_str(struct i40e_hw *hw)
+{
+	static char buf[32];
+
+	snprintf(buf, sizeof(buf),
+	    "f%d.%d a%d.%d n%02x.%02x e%08x",
+	    hw->aq.fw_maj_ver, hw->aq.fw_min_ver,
+	    hw->aq.api_maj_ver, hw->aq.api_min_ver,
+	    (hw->nvm.version & I40E_NVM_VERSION_HI_MASK) >>
+	    I40E_NVM_VERSION_HI_SHIFT,
+	    (hw->nvm.version & I40E_NVM_VERSION_LO_MASK) >>
+	    I40E_NVM_VERSION_LO_SHIFT,
+	    hw->nvm.eetrack);
+	return buf;
+}
 
 /*********************************************************************
  *  TXRX Function prototypes
diff --git a/sys/dev/i40e/i40e_adminq.c b/sys/dev/i40e/i40e_adminq.c
index e2924f66b0cc..cca01a6d0b35 100755
--- a/sys/dev/i40e/i40e_adminq.c
+++ b/sys/dev/i40e/i40e_adminq.c
@@ -61,16 +61,37 @@ static void i40e_adminq_init_regs(struct i40e_hw *hw)
 		hw->aq.asq.tail = I40E_VF_ATQT1;
 		hw->aq.asq.head = I40E_VF_ATQH1;
 		hw->aq.asq.len  = I40E_VF_ATQLEN1;
+		hw->aq.asq.bal  = I40E_VF_ATQBAL1;
+		hw->aq.asq.bah  = I40E_VF_ATQBAH1;
 		hw->aq.arq.tail = I40E_VF_ARQT1;
 		hw->aq.arq.head = I40E_VF_ARQH1;
 		hw->aq.arq.len  = I40E_VF_ARQLEN1;
+		hw->aq.arq.bal  = I40E_VF_ARQBAL1;
+		hw->aq.arq.bah  = I40E_VF_ARQBAH1;
+#ifdef I40E_QV
+	} else if (hw->aq_dbg_ena) {
+		hw->aq.asq.tail = I40E_GL_ATQT;
+		hw->aq.asq.head = I40E_GL_ATQH;
+		hw->aq.asq.len  = I40E_GL_ATQLEN;
+		hw->aq.asq.bal  = I40E_GL_ATQBAL;
+		hw->aq.asq.bah  = I40E_GL_ATQBAH;
+		hw->aq.arq.tail = I40E_GL_ARQT;
+		hw->aq.arq.head = I40E_GL_ARQH;
+		hw->aq.arq.len  = I40E_GL_ARQLEN;
+		hw->aq.arq.bal  = I40E_GL_ARQBAL;
+		hw->aq.arq.bah  = I40E_GL_ARQBAH;
+#endif
 	} else {
 		hw->aq.asq.tail = I40E_PF_ATQT;
 		hw->aq.asq.head = I40E_PF_ATQH;
 		hw->aq.asq.len  = I40E_PF_ATQLEN;
+		hw->aq.asq.bal  = I40E_PF_ATQBAL;
+		hw->aq.asq.bah  = I40E_PF_ATQBAH;
 		hw->aq.arq.tail = I40E_PF_ARQT;
 		hw->aq.arq.head = I40E_PF_ARQH;
 		hw->aq.arq.len  = I40E_PF_ARQLEN;
+		hw->aq.arq.bal  = I40E_PF_ARQBAL;
+		hw->aq.arq.bah  = I40E_PF_ARQBAH;
 	}
 }
 
@@ -148,6 +169,10 @@ void i40e_free_adminq_arq(struct i40e_hw *hw)
  **/
 static enum i40e_status_code i40e_alloc_arq_bufs(struct i40e_hw *hw)
 {
+#ifdef I40E_QV
+	struct i40e_aq_desc qv_desc;
+	struct i40e_aq_desc *qv_desc_on_ring;
+#endif
 	enum i40e_status_code ret_code;
 	struct i40e_aq_desc *desc;
 	struct i40e_dma_mem *bi;
@@ -176,6 +201,13 @@ static enum i40e_status_code i40e_alloc_arq_bufs(struct i40e_hw *hw)
 
 		/* now configure the descriptors for use */
 		desc = I40E_ADMINQ_DESC(hw->aq.arq, i);
+#ifdef I40E_QV
+		/* swap the descriptor with userspace version */
+		i40e_memcpy(&qv_desc, desc, sizeof(struct i40e_aq_desc),
+			    I40E_DMA_TO_NONDMA);
+		qv_desc_on_ring = desc;
+		desc = &qv_desc;
+#endif
 
 		desc->flags = CPU_TO_LE16(I40E_AQ_FLAG_BUF);
 		if (hw->aq.arq_buf_size > I40E_AQ_LARGE_BUF)
@@ -194,6 +226,11 @@ static enum i40e_status_code i40e_alloc_arq_bufs(struct i40e_hw *hw)
 			CPU_TO_LE32(I40E_LO_DWORD(bi->pa));
 		desc->params.external.param0 = 0;
 		desc->params.external.param1 = 0;
+#ifdef I40E_QV
+		/* put the initialized descriptor back to the ring */
+		i40e_memcpy(qv_desc_on_ring, desc, sizeof(struct i40e_aq_desc),
+			    I40E_NONDMA_TO_DMA);
+#endif
 	}
 
 alloc_arq_bufs:
@@ -306,27 +343,14 @@ static enum i40e_status_code i40e_config_asq_regs(struct i40e_hw *hw)
 	wr32(hw, hw->aq.asq.head, 0);
 	wr32(hw, hw->aq.asq.tail, 0);
 
-	if (hw->mac.type == I40E_MAC_VF) {
-		/* configure the transmit queue */
-		wr32(hw, I40E_VF_ATQBAH1,
-		    I40E_HI_DWORD(hw->aq.asq.desc_buf.pa));
-		wr32(hw, I40E_VF_ATQBAL1,
-		    I40E_LO_DWORD(hw->aq.asq.desc_buf.pa));
-		wr32(hw, I40E_VF_ATQLEN1, (hw->aq.num_asq_entries |
-					  I40E_VF_ATQLEN1_ATQENABLE_MASK));
-		reg = rd32(hw, I40E_VF_ATQBAL1);
-	} else {
-		/* configure the transmit queue */
-		wr32(hw, I40E_PF_ATQBAH,
-		    I40E_HI_DWORD(hw->aq.asq.desc_buf.pa));
-		wr32(hw, I40E_PF_ATQBAL,
-		    I40E_LO_DWORD(hw->aq.asq.desc_buf.pa));
-		wr32(hw, I40E_PF_ATQLEN, (hw->aq.num_asq_entries |
-					  I40E_PF_ATQLEN_ATQENABLE_MASK));
-		reg = rd32(hw, I40E_PF_ATQBAL);
-	}
+	/* set starting point */
+	wr32(hw, hw->aq.asq.len, (hw->aq.num_asq_entries |
+				  I40E_PF_ATQLEN_ATQENABLE_MASK));
+	wr32(hw, hw->aq.asq.bal, I40E_LO_DWORD(hw->aq.asq.desc_buf.pa));
+	wr32(hw, hw->aq.asq.bah, I40E_HI_DWORD(hw->aq.asq.desc_buf.pa));
 
 	/* Check one register to verify that config was applied */
+	reg = rd32(hw, hw->aq.asq.bal);
 	if (reg != I40E_LO_DWORD(hw->aq.asq.desc_buf.pa))
 		ret_code = I40E_ERR_ADMIN_QUEUE_ERROR;
 
@@ -348,30 +372,17 @@ static enum i40e_status_code i40e_config_arq_regs(struct i40e_hw *hw)
 	wr32(hw, hw->aq.arq.head, 0);
 	wr32(hw, hw->aq.arq.tail, 0);
 
-	if (hw->mac.type == I40E_MAC_VF) {
-		/* configure the receive queue */
-		wr32(hw, I40E_VF_ARQBAH1,
-		    I40E_HI_DWORD(hw->aq.arq.desc_buf.pa));
-		wr32(hw, I40E_VF_ARQBAL1,
-		    I40E_LO_DWORD(hw->aq.arq.desc_buf.pa));
-		wr32(hw, I40E_VF_ARQLEN1, (hw->aq.num_arq_entries |
-					  I40E_VF_ARQLEN1_ARQENABLE_MASK));
-		reg = rd32(hw, I40E_VF_ARQBAL1);
-	} else {
-		/* configure the receive queue */
-		wr32(hw, I40E_PF_ARQBAH,
-		    I40E_HI_DWORD(hw->aq.arq.desc_buf.pa));
-		wr32(hw, I40E_PF_ARQBAL,
-		    I40E_LO_DWORD(hw->aq.arq.desc_buf.pa));
-		wr32(hw, I40E_PF_ARQLEN, (hw->aq.num_arq_entries |
-					  I40E_PF_ARQLEN_ARQENABLE_MASK));
-		reg = rd32(hw, I40E_PF_ARQBAL);
-	}
+	/* set starting point */
+	wr32(hw, hw->aq.arq.len, (hw->aq.num_arq_entries |
+				  I40E_PF_ARQLEN_ARQENABLE_MASK));
+	wr32(hw, hw->aq.arq.bal, I40E_LO_DWORD(hw->aq.arq.desc_buf.pa));
+	wr32(hw, hw->aq.arq.bah, I40E_HI_DWORD(hw->aq.arq.desc_buf.pa));
 
 	/* Update tail in the HW to post pre-allocated buffers */
 	wr32(hw, hw->aq.arq.tail, hw->aq.num_arq_entries - 1);
 
 	/* Check one register to verify that config was applied */
+	reg = rd32(hw, hw->aq.arq.bal);
 	if (reg != I40E_LO_DWORD(hw->aq.arq.desc_buf.pa))
 		ret_code = I40E_ERR_ADMIN_QUEUE_ERROR;
 
@@ -510,9 +521,22 @@ enum i40e_status_code i40e_shutdown_asq(struct i40e_hw *hw)
 		return I40E_ERR_NOT_READY;
 
 	/* Stop firmware AdminQ processing */
+#ifdef I40E_QV
+	/* Do not reset registers, as Tools AQ is shared resource for QV */
+	if (!hw->aq_dbg_ena) {
+		wr32(hw, hw->aq.asq.head, 0);
+		wr32(hw, hw->aq.asq.tail, 0);
+		wr32(hw, hw->aq.asq.len, 0);
+		wr32(hw, hw->aq.asq.bal, 0);
+		wr32(hw, hw->aq.asq.bah, 0);
+	}
+#else
 	wr32(hw, hw->aq.asq.head, 0);
 	wr32(hw, hw->aq.asq.tail, 0);
 	wr32(hw, hw->aq.asq.len, 0);
+	wr32(hw, hw->aq.asq.bal, 0);
+	wr32(hw, hw->aq.asq.bah, 0);
+#endif
 
 	/* make sure spinlock is available */
 	i40e_acquire_spinlock(&hw->aq.asq_spinlock);
@@ -541,9 +565,22 @@ enum i40e_status_code i40e_shutdown_arq(struct i40e_hw *hw)
 		return I40E_ERR_NOT_READY;
 
 	/* Stop firmware AdminQ processing */
+#ifdef I40E_QV
+	/* Do not reset registers, as Tools AQ is shared resource for QV */
+	if (!hw->aq_dbg_ena) {
+		wr32(hw, hw->aq.arq.head, 0);
+		wr32(hw, hw->aq.arq.tail, 0);
+		wr32(hw, hw->aq.arq.len, 0);
+		wr32(hw, hw->aq.arq.bal, 0);
+		wr32(hw, hw->aq.arq.bah, 0);
+	}
+#else
 	wr32(hw, hw->aq.arq.head, 0);
 	wr32(hw, hw->aq.arq.tail, 0);
 	wr32(hw, hw->aq.arq.len, 0);
+	wr32(hw, hw->aq.arq.bal, 0);
+	wr32(hw, hw->aq.arq.bah, 0);
+#endif
 
 	/* make sure spinlock is available */
 	i40e_acquire_spinlock(&hw->aq.arq_spinlock);
@@ -591,6 +628,9 @@ enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw)
 	/* Set up register offsets */
 	i40e_adminq_init_regs(hw);
 
+	/* setup ASQ command write back timeout */
+	hw->aq.asq_cmd_timeout = I40E_ASQ_CMD_TIMEOUT;
+
 	/* allocate the ASQ */
 	ret_code = i40e_init_asq(hw);
 	if (ret_code != I40E_SUCCESS)
@@ -627,16 +667,19 @@ enum i40e_status_code i40e_init_adminq(struct i40e_hw *hw)
 	i40e_read_nvm_word(hw, I40E_SR_NVM_EETRACK_HI, &eetrack_hi);
 	hw->nvm.eetrack = (eetrack_hi << 16) | eetrack_lo;
 
-#ifdef FORTVILLE_A0_SUPPORT
-	if (hw->aq.api_maj_ver != I40E_FW_API_VERSION_MAJOR ||
-	    !((hw->aq.api_min_ver == I40E_FW_API_VERSION_MINOR) ||
-	      (hw->aq.api_min_ver == I40E_FW_API_VERSION_A0_MINOR))) {
+#ifdef I40E_QV
+	if (!hw->qv_force_init) {
+		if (hw->aq.api_maj_ver > I40E_FW_API_VERSION_MAJOR) {
+			ret_code = I40E_ERR_FIRMWARE_API_VERSION;
+			goto init_adminq_free_arq;
+		}
+	}
 #else
 	if (hw->aq.api_maj_ver > I40E_FW_API_VERSION_MAJOR) {
-#endif
 		ret_code = I40E_ERR_FIRMWARE_API_VERSION;
 		goto init_adminq_free_arq;
 	}
+#endif
 
 	/* pre-emptive resource lock release */
 	i40e_aq_release_resource(hw, I40E_NVM_RESOURCE_ID, 0, NULL);
@@ -671,8 +714,16 @@ enum i40e_status_code i40e_shutdown_adminq(struct i40e_hw *hw)
 {
 	enum i40e_status_code ret_code = I40E_SUCCESS;
 
+#ifdef I40E_QV
+	/* This command is not supported for Tools AQ */
+	if (!hw->aq_dbg_ena) {
+		if (i40e_check_asq_alive(hw))
+			i40e_aq_queue_shutdown(hw, TRUE);
+	}
+#else
 	if (i40e_check_asq_alive(hw))
 		i40e_aq_queue_shutdown(hw, TRUE);
+#endif
 
 	i40e_shutdown_asq(hw);
 	i40e_shutdown_arq(hw);
@@ -692,6 +743,10 @@ enum i40e_status_code i40e_shutdown_adminq(struct i40e_hw *hw)
  **/
 u16 i40e_clean_asq(struct i40e_hw *hw)
 {
+#ifdef I40E_QV
+	struct i40e_aq_desc qv_desc = {0};
+	struct i40e_aq_desc *qv_desc_on_ring;
+#endif /* I40E_QV */
 	struct i40e_adminq_ring *asq = &(hw->aq.asq);
 	struct i40e_asq_cmd_details *details;
 	u16 ntc = asq->next_to_clean;
@@ -700,6 +755,13 @@ u16 i40e_clean_asq(struct i40e_hw *hw)
 
 	desc = I40E_ADMINQ_DESC(*asq, ntc);
 	details = I40E_ADMINQ_DETAILS(*asq, ntc);
+#ifdef I40E_QV
+	/* copy the descriptor from ring to userspace buffer */
+	i40e_memcpy(&qv_desc, desc, sizeof(struct i40e_aq_desc),
+		     I40E_DMA_TO_NONDMA);
+	qv_desc_on_ring = desc;
+	desc = &qv_desc;
+#endif /* I40E_QV */
 	while (rd32(hw, hw->aq.asq.head) != ntc) {
 		i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,
 			   "%s: ntc %d head %d.\n", __FUNCTION__, ntc,
@@ -714,11 +776,23 @@ u16 i40e_clean_asq(struct i40e_hw *hw)
 		}
 		i40e_memset(desc, 0, sizeof(*desc), I40E_DMA_MEM);
 		i40e_memset(details, 0, sizeof(*details), I40E_NONDMA_MEM);
+#ifdef I40E_QV
+		/* copy the descriptor from userspace buffer to ring */
+		i40e_memcpy(qv_desc_on_ring, desc,
+			    sizeof(struct i40e_aq_desc), I40E_NONDMA_TO_DMA);
+#endif /* I40E_QV */
 		ntc++;
 		if (ntc == asq->count)
 			ntc = 0;
 		desc = I40E_ADMINQ_DESC(*asq, ntc);
 		details = I40E_ADMINQ_DETAILS(*asq, ntc);
+#ifdef I40E_QV
+		/* copy the descriptor from ring to userspace buffer */
+		i40e_memcpy(&qv_desc, desc, sizeof(struct i40e_aq_desc),
+			     I40E_DMA_TO_NONDMA);
+		qv_desc_on_ring = desc;
+		desc = &qv_desc;
+#endif /* I40E_QV */
 	}
 
 	asq->next_to_clean = ntc;
@@ -759,6 +833,10 @@ enum i40e_status_code i40e_asq_send_command(struct i40e_hw *hw,
 				u16  buff_size,
 				struct i40e_asq_cmd_details *cmd_details)
 {
+#ifdef I40E_QV
+	struct i40e_aq_desc qv_desc = {0};
+	struct i40e_aq_desc *qv_desc_on_ring;
+#endif /* I40E_QV */
 	enum i40e_status_code status = I40E_SUCCESS;
 	struct i40e_dma_mem *dma_buff = NULL;
 	struct i40e_asq_cmd_details *details;
@@ -855,6 +933,13 @@ enum i40e_status_code i40e_asq_send_command(struct i40e_hw *hw,
 	/* if the desc is available copy the temp desc to the right place */
 	i40e_memcpy(desc_on_ring, desc, sizeof(struct i40e_aq_desc),
 		    I40E_NONDMA_TO_DMA);
+#ifdef I40E_QV
+	/* copy the descriptor from ring to userspace buffer */
+	i40e_memcpy(&qv_desc, desc_on_ring, sizeof(struct i40e_aq_desc),
+		     I40E_DMA_TO_NONDMA);
+	qv_desc_on_ring = desc_on_ring;
+	desc_on_ring = &qv_desc;
+#endif /* I40E_QV */
 
 	/* if buff is not NULL assume indirect command */
 	if (buff != NULL) {
@@ -871,11 +956,17 @@ enum i40e_status_code i40e_asq_send_command(struct i40e_hw *hw,
 				CPU_TO_LE32(I40E_HI_DWORD(dma_buff->pa));
 		desc_on_ring->params.external.addr_low =
 				CPU_TO_LE32(I40E_LO_DWORD(dma_buff->pa));
+#ifdef I40E_QV
+		/* copy the descriptor from userspace buffer to ring */
+		i40e_memcpy(qv_desc_on_ring, desc_on_ring,
+			    sizeof(struct i40e_aq_desc), I40E_NONDMA_TO_DMA);
+#endif /* I40E_QV */
 	}
 
 	/* bump the tail */
 	i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, "AQTX: desc and buffer:\n");
-	i40e_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc_on_ring, buff);
+	i40e_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc_on_ring,
+		      buff, buff_size);
 	(hw->aq.asq.next_to_use)++;
 	if (hw->aq.asq.next_to_use == hw->aq.asq.count)
 		hw->aq.asq.next_to_use = 0;
@@ -890,6 +981,11 @@ enum i40e_status_code i40e_asq_send_command(struct i40e_hw *hw,
 		u32 delay_len = 10;
 
 		do {
+#ifdef I40E_QV
+			/* copy the descriptor from ring to user buffer */
+			i40e_memcpy(desc_on_ring, qv_desc_on_ring,
+			    sizeof(struct i40e_aq_desc), I40E_DMA_TO_NONDMA);
+#endif /* I40E_QV */
 			/* AQ designers suggest use of head for better
 			 * timing reliability than DD bit
 			 */
@@ -898,11 +994,15 @@ enum i40e_status_code i40e_asq_send_command(struct i40e_hw *hw,
 			/* ugh! delay while spin_lock */
 			i40e_usec_delay(delay_len);
 			total_delay += delay_len;
-		} while (total_delay <  I40E_ASQ_CMD_TIMEOUT);
+		} while (total_delay < hw->aq.asq_cmd_timeout);
 	}
 
 	/* if ready, copy the desc back to temp */
 	if (i40e_asq_done(hw)) {
+#ifdef I40E_QV
+		/* Swap pointer back */
+		desc_on_ring = qv_desc_on_ring;
+#endif /* I40E_QV */
 		i40e_memcpy(desc, desc_on_ring, sizeof(struct i40e_aq_desc),
 			    I40E_DMA_TO_NONDMA);
 		if (buff != NULL)
@@ -926,11 +1026,9 @@ enum i40e_status_code i40e_asq_send_command(struct i40e_hw *hw,
 		hw->aq.asq_last_status = (enum i40e_admin_queue_err)retval;
 	}
 
-	if (desc->datalen == buff_size) {
-		i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,
-			   "AQTX: desc and buffer writeback:\n");
-		i40e_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, buff);
-	}
+	i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,
+		   "AQTX: desc and buffer writeback:\n");
+	i40e_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, buff, buff_size);
 
 	/* update the error if time out occurred */
 	if ((!cmd_completed) &&
@@ -981,6 +1079,10 @@ enum i40e_status_code i40e_clean_arq_element(struct i40e_hw *hw,
 					     struct i40e_arq_event_info *e,
 					     u16 *pending)
 {
+#ifdef I40E_QV
+	struct i40e_aq_desc qv_desc = {0};
+	struct i40e_aq_desc *qv_desc_on_ring;
+#endif /* I40E_QV */
 	enum i40e_status_code ret_code = I40E_SUCCESS;
 	u16 ntc = hw->aq.arq.next_to_clean;
 	struct i40e_aq_desc *desc;
@@ -1006,6 +1108,13 @@ enum i40e_status_code i40e_clean_arq_element(struct i40e_hw *hw,
 
 	/* now clean the next descriptor */
 	desc = I40E_ADMINQ_DESC(hw->aq.arq, ntc);
+#ifdef I40E_QV
+	/* copy the descriptor from ring to userspace buffer */
+	i40e_memcpy(&qv_desc, desc, sizeof(struct i40e_aq_desc),
+		     I40E_DMA_TO_NONDMA);
+	qv_desc_on_ring = desc;
+	desc = &qv_desc;
+#endif /* I40E_QV */
 	desc_idx = ntc;
 
 	flags = LE16_TO_CPU(desc->flags);
@@ -1017,19 +1126,20 @@ enum i40e_status_code i40e_clean_arq_element(struct i40e_hw *hw,
 			   I40E_DEBUG_AQ_MESSAGE,
 			   "AQRX: Event received with error 0x%X.\n",
 			   hw->aq.arq_last_status);
-	} else {
-		i40e_memcpy(&e->desc, desc, sizeof(struct i40e_aq_desc),
-			    I40E_DMA_TO_NONDMA);
-		datalen = LE16_TO_CPU(desc->datalen);
-		e->msg_size = min(datalen, e->msg_size);
-		if (e->msg_buf != NULL && (e->msg_size != 0))
-			i40e_memcpy(e->msg_buf,
-				    hw->aq.arq.r.arq_bi[desc_idx].va,
-				    e->msg_size, I40E_DMA_TO_NONDMA);
 	}
 
+	i40e_memcpy(&e->desc, desc, sizeof(struct i40e_aq_desc),
+		    I40E_DMA_TO_NONDMA);
+	datalen = LE16_TO_CPU(desc->datalen);
+	e->msg_size = min(datalen, e->msg_size);
+	if (e->msg_buf != NULL && (e->msg_size != 0))
+		i40e_memcpy(e->msg_buf,
+			    hw->aq.arq.r.arq_bi[desc_idx].va,
+			    e->msg_size, I40E_DMA_TO_NONDMA);
+
 	i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, "AQRX: desc and buffer:\n");
-	i40e_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, e->msg_buf);
+	i40e_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, e->msg_buf,
+		      hw->aq.arq_buf_size);
 
 	/* Restore the original datalen and buffer address in the desc,
 	 * FW updates datalen to indicate the event message
@@ -1044,6 +1154,11 @@ enum i40e_status_code i40e_clean_arq_element(struct i40e_hw *hw,
 	desc->datalen = CPU_TO_LE16((u16)bi->size);
 	desc->params.external.addr_high = CPU_TO_LE32(I40E_HI_DWORD(bi->pa));
 	desc->params.external.addr_low = CPU_TO_LE32(I40E_LO_DWORD(bi->pa));
+#ifdef I40E_QV
+	/* copy the descriptor from userspace buffer to ring */
+	i40e_memcpy(qv_desc_on_ring, desc,
+		    sizeof(struct i40e_aq_desc), I40E_NONDMA_TO_DMA);
+#endif /* I40E_QV */
 
 	/* set tail = the last cleaned desc index. */
 	wr32(hw, hw->aq.arq.tail, ntc);
diff --git a/sys/dev/i40e/i40e_adminq.h b/sys/dev/i40e/i40e_adminq.h
index 1dd645e5b494..f5a33ea04113 100755
--- a/sys/dev/i40e/i40e_adminq.h
+++ b/sys/dev/i40e/i40e_adminq.h
@@ -64,6 +64,8 @@ struct i40e_adminq_ring {
 	u32 head;
 	u32 tail;
 	u32 len;
+	u32 bah;
+	u32 bal;
 };
 
 /* ASQ transaction details */
@@ -90,6 +92,7 @@ struct i40e_arq_event_info {
 struct i40e_adminq_info {
 	struct i40e_adminq_ring arq;    /* receive queue */
 	struct i40e_adminq_ring asq;    /* send queue */
+	u32 asq_cmd_timeout;            /* send queue cmd write back timeout*/
 	u16 num_arq_entries;            /* receive queue depth */
 	u16 num_asq_entries;            /* send queue depth */
 	u16 arq_buf_size;               /* receive queue buffer size */
@@ -110,8 +113,8 @@ struct i40e_adminq_info {
 };
 
 /* general information */
-#define I40E_AQ_LARGE_BUF	512
-#define I40E_ASQ_CMD_TIMEOUT	100000  /* usecs */
+#define I40E_AQ_LARGE_BUF		512
+#define I40E_ASQ_CMD_TIMEOUT		100000 /* usecs */
 
 void i40e_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc,
 				       u16 opcode);
diff --git a/sys/dev/i40e/i40e_adminq_cmd.h b/sys/dev/i40e/i40e_adminq_cmd.h
index 77a1afb30a52..09b5887512d4 100755
--- a/sys/dev/i40e/i40e_adminq_cmd.h
+++ b/sys/dev/i40e/i40e_adminq_cmd.h
@@ -43,9 +43,6 @@
 
 #define I40E_FW_API_VERSION_MAJOR  0x0001
 #define I40E_FW_API_VERSION_MINOR  0x0002
-#ifdef FORTVILLE_A0_SUPPORT
-#define I40E_FW_API_VERSION_A0_MINOR  0x0000
-#endif
 
 struct i40e_aq_desc {
 	__le16 flags;
@@ -698,9 +695,6 @@ struct i40e_aqc_add_get_update_vsi {
 #define I40E_AQ_VSI_TYPE_PF             0x2
 #define I40E_AQ_VSI_TYPE_EMP_MNG        0x3
 #define I40E_AQ_VSI_FLAG_CASCADED_PV    0x4
-#ifdef FORTVILLE_A0_SUPPORT
-#define I40E_AQ_VSI_FLAG_CLOUD_VSI      0x8
-#endif
 	__le32 addr_high;
 	__le32 addr_low;
 };
@@ -1223,11 +1217,6 @@ struct i40e_aqc_add_remove_cloud_filters_element_data {
 #define I40E_AQC_ADD_CLOUD_FILTER_SHIFT                 0
 #define I40E_AQC_ADD_CLOUD_FILTER_MASK                  (0x3F << \
 					I40E_AQC_ADD_CLOUD_FILTER_SHIFT)
-#ifdef FORTVILLE_A0_SUPPORT
-#define I40E_AQC_ADD_CLOUD_FILTER_OIP_GRE               0x0002
-#define I40E_AQC_ADD_CLOUD_FILTER_IMAC_IVLAN_GRE        0x0004
-#define I40E_AQC_ADD_CLOUD_FILTER_IMAC_IVLAN_VNL        0x0007
-#endif
 /* 0x0000 reserved */
 #define I40E_AQC_ADD_CLOUD_FILTER_OIP                   0x0001
 /* 0x0002 reserved */
@@ -2012,22 +2001,6 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_start);
 
 /* Add Udp Tunnel command and completion (direct 0x0B00) */
 struct i40e_aqc_add_udp_tunnel {
-#ifdef FORTVILLE_A0_SUPPORT
-	__le16 udp_port;
-	u8     header_len; /* in DWords, 1 to 15 */
-	u8     protocol_type;
-#define I40E_AQC_TUNNEL_TYPE_TEREDO	0x0
-#define I40E_AQC_TUNNEL_TYPE_VXLAN	0x2
-#define I40E_AQC_TUNNEL_TYPE_NGE	0x3
-	u8     variable_udp_length;
-#define I40E_AQC_TUNNEL_FIXED_UDP_LENGTH	0x0
-#define I40E_AQC_TUNNEL_VARIABLE_UDP_LENGTH	0x1
-	u8		udp_key_index;
-#define I40E_AQC_TUNNEL_KEY_INDEX_VXLAN			0x0
-#define I40E_AQC_TUNNEL_KEY_INDEX_NGE			0x1
-#define I40E_AQC_TUNNEL_KEY_INDEX_PROPRIETARY_UDP	0x2
-	u8		reserved[10];
-#else
 	__le16 udp_port;
 	u8     reserved0[3];
 	u8     protocol_type;
@@ -2035,7 +2008,6 @@ struct i40e_aqc_add_udp_tunnel {
 #define I40E_AQC_TUNNEL_TYPE_NGE	0x01
 #define I40E_AQC_TUNNEL_TYPE_TEREDO	0x10
 	u8     reserved1[10];
-#endif
 };
 
 I40E_CHECK_CMD_LENGTH(i40e_aqc_add_udp_tunnel);
@@ -2056,13 +2028,7 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_add_udp_tunnel_completion);
 struct i40e_aqc_remove_udp_tunnel {
 	u8     reserved[2];
 	u8     index; /* 0 to 15 */
-#ifdef FORTVILLE_A0_SUPPORT
-	u8     pf_filters;
-	u8     total_filters;
-	u8     reserved2[11];
-#else
 	u8     reserved2[13];
-#endif
 };
 
 I40E_CHECK_CMD_LENGTH(i40e_aqc_remove_udp_tunnel);
@@ -2072,37 +2038,13 @@ struct i40e_aqc_del_udp_tunnel_completion {
 	u8     index; /* 0 to 15 */
 	u8     multiple_pfs;
 	u8     total_filters_used;
-#ifdef FORTVILLE_A0_SUPPORT
-	u8     reserved;
-	u8     tunnels_free;
-	u8     reserved1[9];
-#else
 	u8     reserved1[11];
-#endif
 };
 
 I40E_CHECK_CMD_LENGTH(i40e_aqc_del_udp_tunnel_completion);
 
 /* tunnel key structure 0x0B10 */
 
-#ifdef FORTVILLE_A0_SUPPORT
-struct i40e_aqc_tunnel_key_structure_A0 {
-	__le16     key1_off;
-	__le16     key1_len;
-	__le16     key2_off;
-	__le16     key2_len;
-	__le16     flags;
-#define I40E_AQC_TUNNEL_KEY_STRUCT_OVERRIDE 0x01
-/* response flags */
-#define I40E_AQC_TUNNEL_KEY_STRUCT_SUCCESS    0x01
-#define I40E_AQC_TUNNEL_KEY_STRUCT_MODIFIED   0x02
-#define I40E_AQC_TUNNEL_KEY_STRUCT_OVERRIDDEN 0x03
-	u8         resreved[6];
-};
-
-I40E_CHECK_CMD_LENGTH(i40e_aqc_tunnel_key_structure_A0);
-
-#endif
 struct i40e_aqc_tunnel_key_structure {
 	u8	key1_off;
 	u8	key2_off;
diff --git a/sys/dev/i40e/i40e_common.c b/sys/dev/i40e/i40e_common.c
index 53a43be814bd..ec0fd0cfb2bc 100755
--- a/sys/dev/i40e/i40e_common.c
+++ b/sys/dev/i40e/i40e_common.c
@@ -52,9 +52,6 @@ static enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw)
 
 	if (hw->vendor_id == I40E_INTEL_VENDOR_ID) {
 		switch (hw->device_id) {
-#if defined(FORTVILLE_A0_SUPPORT) || defined(I40E_FPGA_SUPPORT)
-		case I40E_DEV_ID_FPGA_A:
-#endif
 		case I40E_DEV_ID_SFP_XL710:
 		case I40E_DEV_ID_QEMU:
 		case I40E_DEV_ID_KX_A:
@@ -63,9 +60,6 @@ static enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw)
 		case I40E_DEV_ID_QSFP_A:
 		case I40E_DEV_ID_QSFP_B:
 		case I40E_DEV_ID_QSFP_C:
-#ifdef FORTVILLE_A0_SUPPORT
-		case I40E_DEV_ID_10G_BASE_T:
-#endif
 			hw->mac.type = I40E_MAC_XL710;
 			break;
 		case I40E_DEV_ID_VF:
@@ -91,13 +85,15 @@ static enum i40e_status_code i40e_set_mac_type(struct i40e_hw *hw)
  * @mask: debug mask
  * @desc: pointer to admin queue descriptor
  * @buffer: pointer to command buffer
+ * @buf_len: max length of buffer
  *
  * Dumps debug log about adminq command with descriptor contents.
  **/
 void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc,
-		   void *buffer)
+		   void *buffer, u16 buf_len)
 {
 	struct i40e_aq_desc *aq_desc = (struct i40e_aq_desc *)desc;
+	u16 len = LE16_TO_CPU(aq_desc->datalen);
 	u8 *aq_buffer = (u8 *)buffer;
 	u32 data[4];
 	u32 i = 0;
@@ -121,7 +117,9 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc,
 	if ((buffer != NULL) && (aq_desc->datalen != 0)) {
 		i40e_memset(data, 0, sizeof(data), I40E_NONDMA_MEM);
 		i40e_debug(hw, mask, "AQ CMD Buffer:\n");
-		for (i = 0; i < LE16_TO_CPU(aq_desc->datalen); i++) {
+		if (buf_len < len)
+			len = buf_len;
+		for (i = 0; i < len; i++) {
 			data[((i % 16) / 4)] |=
 				((u32)aq_buffer[i]) << (8 * (i % 4));
 			if ((i % 16) == 15) {
@@ -572,7 +570,6 @@ enum i40e_status_code i40e_init_shared_code(struct i40e_hw *hw)
 		break;
 	default:
 		return I40E_ERR_DEVICE_NOT_SUPPORTED;
-		break;
 	}
 
 	hw->phy.get_link_info = TRUE;
@@ -712,8 +709,10 @@ void i40e_pre_tx_queue_cfg(struct i40e_hw *hw, u32 queue, bool enable)
 	u32 reg_block = 0;
 	u32 reg_val;
 
-	if (abs_queue_idx >= 128)
+	if (abs_queue_idx >= 128) {
 		reg_block = abs_queue_idx / 128;
+		abs_queue_idx %= 128;
+	}
 
 	reg_val = rd32(hw, I40E_GLLAN_TXPRE_QDIS(reg_block));
 	reg_val &= ~I40E_GLLAN_TXPRE_QDIS_QINDX_MASK;
@@ -762,6 +761,8 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw)
 	switch (hw->phy.link_info.phy_type) {
 	case I40E_PHY_TYPE_10GBASE_SR:
 	case I40E_PHY_TYPE_10GBASE_LR:
+	case I40E_PHY_TYPE_1000BASE_SX:
+	case I40E_PHY_TYPE_1000BASE_LX:
 	case I40E_PHY_TYPE_40GBASE_SR4:
 	case I40E_PHY_TYPE_40GBASE_LR4:
 		media = I40E_MEDIA_TYPE_FIBER;
@@ -797,11 +798,7 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw)
 	return media;
 }
 
-#ifndef FORTVILLE_A0_SUPPORT
 #define I40E_PF_RESET_WAIT_COUNT	100
-#else
-#define I40E_PF_RESET_WAIT_COUNT	200
-#endif
 /**
  * i40e_pf_reset - Reset the PF
  * @hw: pointer to the hardware structure
@@ -877,6 +874,99 @@ enum i40e_status_code i40e_pf_reset(struct i40e_hw *hw)
 	return I40E_SUCCESS;
 }
 
+/**
+ * i40e_clear_hw - clear out any left over hw state
+ * @hw: pointer to the hw struct
+ *
+ * Clear queues and interrupts, typically called at init time,
+ * but after the capabilities have been found so we know how many
+ * queues and msix vectors have been allocated.
+ **/
+void i40e_clear_hw(struct i40e_hw *hw)
+{
+	u32 num_queues, base_queue;
+	u32 num_pf_int;
+	u32 num_vf_int;
+	u32 num_vfs;
+	u32 i, j;
+	u32 val;
+	u32 eol = 0x7ff;
+
+	/* get number of interrupts, queues, and vfs */
+	val = rd32(hw, I40E_GLPCI_CNF2);
+	num_pf_int = (val & I40E_GLPCI_CNF2_MSI_X_PF_N_MASK) >>
+			I40E_GLPCI_CNF2_MSI_X_PF_N_SHIFT;
+	num_vf_int = (val & I40E_GLPCI_CNF2_MSI_X_VF_N_MASK) >>
+			I40E_GLPCI_CNF2_MSI_X_VF_N_SHIFT;
+
+	val = rd32(hw, I40E_PFLAN_QALLOC);
+	base_queue = (val & I40E_PFLAN_QALLOC_FIRSTQ_MASK) >>
+			I40E_PFLAN_QALLOC_FIRSTQ_SHIFT;
+	j = (val & I40E_PFLAN_QALLOC_LASTQ_MASK) >>
+			I40E_PFLAN_QALLOC_LASTQ_SHIFT;
+	if (val & I40E_PFLAN_QALLOC_VALID_MASK)
+		num_queues = (j - base_queue) + 1;
+	else
+		num_queues = 0;
+
+	val = rd32(hw, I40E_PF_VT_PFALLOC);
+	i = (val & I40E_PF_VT_PFALLOC_FIRSTVF_MASK) >>
+			I40E_PF_VT_PFALLOC_FIRSTVF_SHIFT;
+	j = (val & I40E_PF_VT_PFALLOC_LASTVF_MASK) >>
+			I40E_PF_VT_PFALLOC_LASTVF_SHIFT;
+	if (val & I40E_PF_VT_PFALLOC_VALID_MASK)
+		num_vfs = (j - i) + 1;
+	else
+		num_vfs = 0;
+
+	/* stop all the interrupts */
+	wr32(hw, I40E_PFINT_ICR0_ENA, 0);
+	val = 0x3 << I40E_PFINT_DYN_CTLN_ITR_INDX_SHIFT;
+	for (i = 0; i < num_pf_int - 2; i++)
+		wr32(hw, I40E_PFINT_DYN_CTLN(i), val);
+
+	/* Set the FIRSTQ_INDX field to 0x7FF in PFINT_LNKLSTx */
+	val = eol << I40E_PFINT_LNKLST0_FIRSTQ_INDX_SHIFT;
+	wr32(hw, I40E_PFINT_LNKLST0, val);
+	for (i = 0; i < num_pf_int - 2; i++)
+		wr32(hw, I40E_PFINT_LNKLSTN(i), val);
+	val = eol << I40E_VPINT_LNKLST0_FIRSTQ_INDX_SHIFT;
+	for (i = 0; i < num_vfs; i++)
+		wr32(hw, I40E_VPINT_LNKLST0(i), val);
+	for (i = 0; i < num_vf_int - 2; i++)
+		wr32(hw, I40E_VPINT_LNKLSTN(i), val);
+
+	/* warn the HW of the coming Tx disables */
+	for (i = 0; i < num_queues; i++) {
+		u32 abs_queue_idx = base_queue + i;
+		u32 reg_block = 0;
+
+		if (abs_queue_idx >= 128) {
+			reg_block = abs_queue_idx / 128;
+			abs_queue_idx %= 128;
+		}
+
+		val = rd32(hw, I40E_GLLAN_TXPRE_QDIS(reg_block));
+		val &= ~I40E_GLLAN_TXPRE_QDIS_QINDX_MASK;
+		val |= (abs_queue_idx << I40E_GLLAN_TXPRE_QDIS_QINDX_SHIFT);
+		val |= I40E_GLLAN_TXPRE_QDIS_SET_QDIS_MASK;
+
+		wr32(hw, I40E_GLLAN_TXPRE_QDIS(reg_block), val);
+	}
+	i40e_usec_delay(400);
+
+	/* stop all the queues */
+	for (i = 0; i < num_queues; i++) {
+		wr32(hw, I40E_QINT_TQCTL(i), 0);
+		wr32(hw, I40E_QTX_ENA(i), 0);
+		wr32(hw, I40E_QINT_RQCTL(i), 0);
+		wr32(hw, I40E_QRX_ENA(i), 0);
+	}
+
+	/* short wait for all queue disables to settle */
+	i40e_usec_delay(50);
+}
+
 /**
  * i40e_clear_pxe_mode - clear pxe operations mode
  * @hw: pointer to the hw struct
@@ -886,16 +976,8 @@ enum i40e_status_code i40e_pf_reset(struct i40e_hw *hw)
  **/
 void i40e_clear_pxe_mode(struct i40e_hw *hw)
 {
-#if defined(FORTVILLE_A0_SUPPORT) || defined(I40E_FPGA_SUPPORT)
-	u32 reg;
-
-	/* Clear single descriptor fetch/write-back mode */
-	reg = rd32(hw, I40E_GLLAN_RCTL_0);
-	wr32(hw, I40E_GLLAN_RCTL_0, (reg & (~I40E_GLLAN_RCTL_0_PXE_MODE_MASK)));
-#else
 	if (i40e_check_asq_alive(hw))
 		i40e_aq_clear_pxe_mode(hw, NULL);
-#endif
 }
 
 /**
@@ -1120,7 +1202,7 @@ enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures,
 	status = i40e_aq_get_phy_capabilities(hw, FALSE, false, &abilities,
 					      NULL);
 	if (status) {
-		*aq_failures |= I40E_SET_FC_AQ_FAIL_GET1;
+		*aq_failures |= I40E_SET_FC_AQ_FAIL_GET;
 		return status;
 	}
 
@@ -1145,31 +1227,19 @@ enum i40e_status_code i40e_set_fc(struct i40e_hw *hw, u8 *aq_failures,
 
 		if (status)
 			*aq_failures |= I40E_SET_FC_AQ_FAIL_SET;
-
-		/* Get the abilities to set hw->fc.current_mode correctly */
-		status = i40e_aq_get_phy_capabilities(hw, FALSE, false,
-						      &abilities, NULL);
-		if (status) {
-			/* Wait a little bit and try once more */
-			i40e_msec_delay(1000);
-			status = i40e_aq_get_phy_capabilities(hw, FALSE, false,
-							      &abilities, NULL);
-		}
-		if (status) {
-			*aq_failures |= I40E_SET_FC_AQ_FAIL_GET2;
-			return status;
-		}
 	}
-	/* Copy the what was returned from get capabilities into fc */
-	if ((abilities.abilities & I40E_AQ_PHY_FLAG_PAUSE_TX) &&
-	    (abilities.abilities & I40E_AQ_PHY_FLAG_PAUSE_RX))
-		hw->fc.current_mode = I40E_FC_FULL;
-	else if (abilities.abilities & I40E_AQ_PHY_FLAG_PAUSE_TX)
-		hw->fc.current_mode = I40E_FC_TX_PAUSE;
-	else if (abilities.abilities & I40E_AQ_PHY_FLAG_PAUSE_RX)
-		hw->fc.current_mode = I40E_FC_RX_PAUSE;
-	else
-		hw->fc.current_mode = I40E_FC_NONE;
+	/* Update the link info */
+	status = i40e_update_link_info(hw, TRUE);
+	if (status) {
+		/* Wait a little bit (on 40G cards it sometimes takes a really
+		 * long time for link to come back from the atomic reset)
+		 * and try once more
+		 */
+		i40e_msec_delay(1000);
+		status = i40e_update_link_info(hw, TRUE);
+	}
+	if (status)
+		*aq_failures |= I40E_SET_FC_AQ_FAIL_UPDATE;
 
 	return status;
 }
@@ -1210,7 +1280,6 @@ enum i40e_status_code i40e_aq_set_mac_config(struct i40e_hw *hw,
 
 	return status;
 }
-#ifndef FORTVILLE_A0_SUPPORT
 
 /**
  * i40e_aq_clear_pxe_mode
@@ -1238,17 +1307,17 @@ enum i40e_status_code i40e_aq_clear_pxe_mode(struct i40e_hw *hw,
 
 	return status;
 }
-#endif
 
 /**
  * i40e_aq_set_link_restart_an
  * @hw: pointer to the hw struct
+ * @enable_link: if TRUE: enable link, if FALSE: disable link
  * @cmd_details: pointer to command details structure or NULL
  *
  * Sets up the link and restarts the Auto-Negotiation over the link.
  **/
 enum i40e_status_code i40e_aq_set_link_restart_an(struct i40e_hw *hw,
-				struct i40e_asq_cmd_details *cmd_details)
+		bool enable_link, struct i40e_asq_cmd_details *cmd_details)
 {
 	struct i40e_aq_desc desc;
 	struct i40e_aqc_set_link_restart_an *cmd =
@@ -1259,6 +1328,10 @@ enum i40e_status_code i40e_aq_set_link_restart_an(struct i40e_hw *hw,
 					  i40e_aqc_opc_set_link_restart_an);
 
 	cmd->command = I40E_AQ_PHY_RESTART_AN;
+	if (enable_link)
+		cmd->command |= I40E_AQ_PHY_LINK_ENABLE;
+	else
+		cmd->command &= ~I40E_AQ_PHY_LINK_ENABLE;
 
 	status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
 
@@ -1859,6 +1932,14 @@ enum i40e_status_code i40e_aq_get_firmware_version(struct i40e_hw *hw,
 			*api_major_version = LE16_TO_CPU(resp->api_major);
 		if (api_minor_version != NULL)
 			*api_minor_version = LE16_TO_CPU(resp->api_minor);
+
+		/* A workaround to fix the API version in SW */
+		if (api_major_version && api_minor_version &&
+		    fw_major_version && fw_minor_version &&
+		    ((*api_major_version == 1) && (*api_minor_version == 1)) &&
+		    (((*fw_major_version == 4) && (*fw_minor_version >= 2)) ||
+		     (*fw_major_version > 4)))
+			*api_minor_version = 2;
 	}
 
 	return status;
@@ -2270,6 +2351,35 @@ enum i40e_status_code i40e_aq_send_msg_to_vf(struct i40e_hw *hw, u16 vfid,
 	return status;
 }
 
+/**
+ * i40e_aq_debug_write_register
+ * @hw: pointer to the hw struct
+ * @reg_addr: register address
+ * @reg_val: register value
+ * @cmd_details: pointer to command details structure or NULL
+ *
+ * Write to a register using the admin queue commands
+ **/
+enum i40e_status_code i40e_aq_debug_write_register(struct i40e_hw *hw,
+				u32 reg_addr, u64 reg_val,
+				struct i40e_asq_cmd_details *cmd_details)
+{
+	struct i40e_aq_desc desc;
+	struct i40e_aqc_debug_reg_read_write *cmd =
+		(struct i40e_aqc_debug_reg_read_write *)&desc.params.raw;
+	enum i40e_status_code status;
+
+	i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_debug_write_reg);
+
+	cmd->address = CPU_TO_LE32(reg_addr);
+	cmd->value_high = CPU_TO_LE32((u32)(reg_val >> 32));
+	cmd->value_low = CPU_TO_LE32((u32)(reg_val & 0xFFFFFFFF));
+
+	status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
+
+	return status;
+}
+
 /**
  * i40e_aq_get_hmc_resource_profile
  * @hw: pointer to the hw struct
@@ -3065,17 +3175,10 @@ enum i40e_status_code i40e_aq_start_lldp(struct i40e_hw *hw,
  * @filter_index: pointer to filter index
  * @cmd_details: pointer to command details structure or NULL
  **/
-#ifdef FORTVILLE_A0_SUPPORT
-enum i40e_status_code i40e_aq_add_udp_tunnel(struct i40e_hw *hw,
-				u16 udp_port, u8 header_len,
-				u8 protocol_index, u8 *filter_index,
-				struct i40e_asq_cmd_details *cmd_details)
-#else
 enum i40e_status_code i40e_aq_add_udp_tunnel(struct i40e_hw *hw,
 				u16 udp_port, u8 protocol_index,
 				u8 *filter_index,
 				struct i40e_asq_cmd_details *cmd_details)
-#endif
 {
 	struct i40e_aq_desc desc;
 	struct i40e_aqc_add_udp_tunnel *cmd =
@@ -3087,9 +3190,6 @@ enum i40e_status_code i40e_aq_add_udp_tunnel(struct i40e_hw *hw,
 	i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_add_udp_tunnel);
 
 	cmd->udp_port = CPU_TO_LE16(udp_port);
-#ifdef FORTVILLE_A0_SUPPORT
-	cmd->header_len = header_len;
-#endif
 	cmd->protocol_type = protocol_index;
 
 	status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
@@ -3925,9 +4025,6 @@ static enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw,
 	u32 fcoe_cntx_size, fcoe_filt_size;
 	u32 pe_cntx_size, pe_filt_size;
 	u32 fcoe_fmax;
-#ifdef FORTVILLE_A0_SUPPORT
-	u32 pe_fmax;
-#endif
 
 	u32 val;
 
@@ -4002,15 +4099,6 @@ static enum i40e_status_code i40e_validate_filter_settings(struct i40e_hw *hw,
 		     >> I40E_GLHMC_FCOEFMAX_PMFCOEFMAX_SHIFT;
 	if (fcoe_filt_size + fcoe_cntx_size >  fcoe_fmax)
 		return I40E_ERR_INVALID_SIZE;
-#ifdef FORTVILLE_A0_SUPPORT
-
-	/* PEHSIZE + PEDSIZE should not be greater than PMPEXFMAX */
-	val = rd32(hw, I40E_GLHMC_PEXFMAX);
-	pe_fmax = (val & I40E_GLHMC_PEXFMAX_PMPEXFMAX_MASK)
-		   >> I40E_GLHMC_PEXFMAX_PMPEXFMAX_SHIFT;
-	if (pe_filt_size + pe_cntx_size >  pe_fmax)
-		return I40E_ERR_INVALID_SIZE;
-#endif
 
 	return I40E_SUCCESS;
 }
@@ -4081,31 +4169,6 @@ enum i40e_status_code i40e_set_filter_control(struct i40e_hw *hw,
 
 	return I40E_SUCCESS;
 }
-#ifdef FORTVILLE_A0_SUPPORT
-
-/**
- * i40e_set_tag_alloc_method
- * @hw: pointer to the hardware structure
- * @debug: a bool to indicates if the debug mode tag alloc needs to be set.
- *
- * Note: Enable debug mode tag allocation method if the Extended PCIE Tags are
- * disabled as a workaround to avoid Rx stall when the device comes up on PCI
- * Gen 2 slot or if the Extended Tags are disabled on Gen 3 slot. If the
- * Extended tags are enabled this workaround should not be applied since it
- * would cause unnecessary performance degradation.
- */
-void i40e_set_tag_alloc_method(struct i40e_hw *hw, bool debug)
-{
-	u32 val;
-	val = rd32(hw, I40E_GLPCI_PCITEST2);
-
-	if (debug)
-		val |= I40E_GLPCI_PCITEST2_TAG_ALLOC_MASK;
-	else
-		val &= ~I40E_GLPCI_PCITEST2_TAG_ALLOC_MASK;
-	wr32(hw, I40E_GLPCI_PCITEST2, val);
-}
-#endif
 
 /**
  * i40e_aq_add_rem_control_packet_filter - Add or Remove Control Packet Filter
diff --git a/sys/dev/i40e/i40e_hmc.h b/sys/dev/i40e/i40e_hmc.h
index 697991770e5b..cba325f5a8b9 100755
--- a/sys/dev/i40e/i40e_hmc.h
+++ b/sys/dev/i40e/i40e_hmc.h
@@ -39,7 +39,6 @@
 
 /* forward-declare the HW struct for the compiler */
 struct i40e_hw;
-enum i40e_status_code;
 
 #define I40E_HMC_INFO_SIGNATURE		0x484D5347 /* HMSG */
 #define I40E_HMC_PD_CNT_IN_SD		512
@@ -136,7 +135,7 @@ struct i40e_hmc_info {
 		((((type) == I40E_SD_TYPE_PAGED) ? 0 : 1) <<		\
 		I40E_PFHMC_SDDATALOW_PMSDTYPE_SHIFT) |			\
 		(1 << I40E_PFHMC_SDDATALOW_PMSDVALID_SHIFT);		\
-	val3 = (sd_index) | (1 << I40E_PFHMC_SDCMD_PMSDWR_SHIFT);	\
+	val3 = (sd_index) | (1u << I40E_PFHMC_SDCMD_PMSDWR_SHIFT);	\
 	wr32((hw), I40E_PFHMC_SDDATAHIGH, val1);			\
 	wr32((hw), I40E_PFHMC_SDDATALOW, val2);				\
 	wr32((hw), I40E_PFHMC_SDCMD, val3);				\
@@ -155,7 +154,7 @@ struct i40e_hmc_info {
 		I40E_PFHMC_SDDATALOW_PMSDBPCOUNT_SHIFT) |		\
 		((((type) == I40E_SD_TYPE_PAGED) ? 0 : 1) <<		\
 		I40E_PFHMC_SDDATALOW_PMSDTYPE_SHIFT);			\
-	val3 = (sd_index) | (1 << I40E_PFHMC_SDCMD_PMSDWR_SHIFT);	\
+	val3 = (sd_index) | (1u << I40E_PFHMC_SDCMD_PMSDWR_SHIFT);	\
 	wr32((hw), I40E_PFHMC_SDDATAHIGH, 0);				\
 	wr32((hw), I40E_PFHMC_SDDATALOW, val2);				\
 	wr32((hw), I40E_PFHMC_SDCMD, val3);				\
diff --git a/sys/dev/i40e/i40e_lan_hmc.c b/sys/dev/i40e/i40e_lan_hmc.c
index 8cd27ea5c070..91c20e8f6ad4 100755
--- a/sys/dev/i40e/i40e_lan_hmc.c
+++ b/sys/dev/i40e/i40e_lan_hmc.c
@@ -425,7 +425,6 @@ enum i40e_status_code i40e_create_lan_hmc_object(struct i40e_hw *hw,
 			default:
 				ret_code = I40E_ERR_INVALID_SD_TYPE;
 				goto exit;
-				break;
 			}
 		}
 	}
@@ -510,7 +509,6 @@ enum i40e_status_code i40e_configure_lan_hmc(struct i40e_hw *hw,
 		DEBUGOUT1("i40e_configure_lan_hmc: Unknown SD type: %d\n",
 			  ret_code);
 		goto configure_lan_hmc_out;
-		break;
 	}
 
 	/* Configure and program the FPM registers so objects can be created */
@@ -754,6 +752,381 @@ static struct i40e_context_ele i40e_hmc_rxq_ce_info[] = {
 	{ 0 }
 };
 
+/**
+ * i40e_write_byte - replace HMC context byte
+ * @hmc_bits: pointer to the HMC memory
+ * @ce_info: a description of the struct to be read from
+ * @src: the struct to be read from
+ **/
+static void i40e_write_byte(u8 *hmc_bits,
+			    struct i40e_context_ele *ce_info,
+			    u8 *src)
+{
+	u8 src_byte, dest_byte, mask;
+	u8 *from, *dest;
+	u16 shift_width;
+
+	/* copy from the next struct field */
+	from = src + ce_info->offset;
+
+	/* prepare the bits and mask */
+	shift_width = ce_info->lsb % 8;
+	mask = ((u8)1 << ce_info->width) - 1;
+
+	src_byte = *from;
+	src_byte &= mask;
+
+	/* shift to correct alignment */
+	mask <<= shift_width;
+	src_byte <<= shift_width;
+
+	/* get the current bits from the target bit string */
+	dest = hmc_bits + (ce_info->lsb / 8);
+
+	i40e_memcpy(&dest_byte, dest, sizeof(dest_byte), I40E_DMA_TO_NONDMA);
+
+	dest_byte &= ~mask;	/* get the bits not changing */
+	dest_byte |= src_byte;	/* add in the new bits */
+
+	/* put it all back */
+	i40e_memcpy(dest, &dest_byte, sizeof(dest_byte), I40E_NONDMA_TO_DMA);
+}
+
+/**
+ * i40e_write_word - replace HMC context word
+ * @hmc_bits: pointer to the HMC memory
+ * @ce_info: a description of the struct to be read from
+ * @src: the struct to be read from
+ **/
+static void i40e_write_word(u8 *hmc_bits,
+			    struct i40e_context_ele *ce_info,
+			    u8 *src)
+{
+	u16 src_word, mask;
+	u8 *from, *dest;
+	u16 shift_width;
+	__le16 dest_word;
+
+	/* copy from the next struct field */
+	from = src + ce_info->offset;
+
+	/* prepare the bits and mask */
+	shift_width = ce_info->lsb % 8;
+	mask = ((u16)1 << ce_info->width) - 1;
+
+	/* don't swizzle the bits until after the mask because the mask bits
+	 * will be in a different bit position on big endian machines
+	 */
+	src_word = *(u16 *)from;
+	src_word &= mask;
+
+	/* shift to correct alignment */
+	mask <<= shift_width;
+	src_word <<= shift_width;
+
+	/* get the current bits from the target bit string */
+	dest = hmc_bits + (ce_info->lsb / 8);
+
+	i40e_memcpy(&dest_word, dest, sizeof(dest_word), I40E_DMA_TO_NONDMA);
+
+	dest_word &= ~(CPU_TO_LE16(mask));	/* get the bits not changing */
+	dest_word |= CPU_TO_LE16(src_word);	/* add in the new bits */
+
+	/* put it all back */
+	i40e_memcpy(dest, &dest_word, sizeof(dest_word), I40E_NONDMA_TO_DMA);
+}
+
+/**
+ * i40e_write_dword - replace HMC context dword
+ * @hmc_bits: pointer to the HMC memory
+ * @ce_info: a description of the struct to be read from
+ * @src: the struct to be read from
+ **/
+static void i40e_write_dword(u8 *hmc_bits,
+			     struct i40e_context_ele *ce_info,
+			     u8 *src)
+{
+	u32 src_dword, mask;
+	u8 *from, *dest;
+	u16 shift_width;
+	__le32 dest_dword;
+
+	/* copy from the next struct field */
+	from = src + ce_info->offset;
+
+	/* prepare the bits and mask */
+	shift_width = ce_info->lsb % 8;
+
+	/* if the field width is exactly 32 on an x86 machine, then the shift
+	 * operation will not work because the SHL instructions count is masked
+	 * to 5 bits so the shift will do nothing
+	 */
+	if (ce_info->width < 32)
+		mask = ((u32)1 << ce_info->width) - 1;
+	else
+		mask = 0xFFFFFFFF;
+
+	/* don't swizzle the bits until after the mask because the mask bits
+	 * will be in a different bit position on big endian machines
+	 */
+	src_dword = *(u32 *)from;
+	src_dword &= mask;
+
+	/* shift to correct alignment */
+	mask <<= shift_width;
+	src_dword <<= shift_width;
+
+	/* get the current bits from the target bit string */
+	dest = hmc_bits + (ce_info->lsb / 8);
+
+	i40e_memcpy(&dest_dword, dest, sizeof(dest_dword), I40E_DMA_TO_NONDMA);
+
+	dest_dword &= ~(CPU_TO_LE32(mask));	/* get the bits not changing */
+	dest_dword |= CPU_TO_LE32(src_dword);	/* add in the new bits */
+
+	/* put it all back */
+	i40e_memcpy(dest, &dest_dword, sizeof(dest_dword), I40E_NONDMA_TO_DMA);
+}
+
+/**
+ * i40e_write_qword - replace HMC context qword
+ * @hmc_bits: pointer to the HMC memory
+ * @ce_info: a description of the struct to be read from
+ * @src: the struct to be read from
+ **/
+static void i40e_write_qword(u8 *hmc_bits,
+			     struct i40e_context_ele *ce_info,
+			     u8 *src)
+{
+	u64 src_qword, mask;
+	u8 *from, *dest;
+	u16 shift_width;
+	__le64 dest_qword;
+
+	/* copy from the next struct field */
+	from = src + ce_info->offset;
+
+	/* prepare the bits and mask */
+	shift_width = ce_info->lsb % 8;
+
+	/* if the field width is exactly 64 on an x86 machine, then the shift
+	 * operation will not work because the SHL instructions count is masked
+	 * to 6 bits so the shift will do nothing
+	 */
+	if (ce_info->width < 64)
+		mask = ((u64)1 << ce_info->width) - 1;
+	else
+		mask = 0xFFFFFFFFFFFFFFFFUL;
+
+	/* don't swizzle the bits until after the mask because the mask bits
+	 * will be in a different bit position on big endian machines
+	 */
+	src_qword = *(u64 *)from;
+	src_qword &= mask;
+
+	/* shift to correct alignment */
+	mask <<= shift_width;
+	src_qword <<= shift_width;
+
+	/* get the current bits from the target bit string */
+	dest = hmc_bits + (ce_info->lsb / 8);
+
+	i40e_memcpy(&dest_qword, dest, sizeof(dest_qword), I40E_DMA_TO_NONDMA);
+
+	dest_qword &= ~(CPU_TO_LE64(mask));	/* get the bits not changing */
+	dest_qword |= CPU_TO_LE64(src_qword);	/* add in the new bits */
+
+	/* put it all back */
+	i40e_memcpy(dest, &dest_qword, sizeof(dest_qword), I40E_NONDMA_TO_DMA);
+}
+
+/**
+ * i40e_read_byte - read HMC context byte into struct
+ * @hmc_bits: pointer to the HMC memory
+ * @ce_info: a description of the struct to be filled
+ * @dest: the struct to be filled
+ **/
+static void i40e_read_byte(u8 *hmc_bits,
+			   struct i40e_context_ele *ce_info,
+			   u8 *dest)
+{
+	u8 dest_byte, mask;
+	u8 *src, *target;
+	u16 shift_width;
+
+	/* prepare the bits and mask */
+	shift_width = ce_info->lsb % 8;
+	mask = ((u8)1 << ce_info->width) - 1;
+
+	/* shift to correct alignment */
+	mask <<= shift_width;
+
+	/* get the current bits from the src bit string */
+	src = hmc_bits + (ce_info->lsb / 8);
+
+	i40e_memcpy(&dest_byte, src, sizeof(dest_byte), I40E_DMA_TO_NONDMA);
+
+	dest_byte &= ~(mask);
+
+	dest_byte >>= shift_width;
+
+	/* get the address from the struct field */
+	target = dest + ce_info->offset;
+
+	/* put it back in the struct */
+	i40e_memcpy(target, &dest_byte, sizeof(dest_byte), I40E_NONDMA_TO_DMA);
+}
+
+/**
+ * i40e_read_word - read HMC context word into struct
+ * @hmc_bits: pointer to the HMC memory
+ * @ce_info: a description of the struct to be filled
+ * @dest: the struct to be filled
+ **/
+static void i40e_read_word(u8 *hmc_bits,
+			   struct i40e_context_ele *ce_info,
+			   u8 *dest)
+{
+	u16 dest_word, mask;
+	u8 *src, *target;
+	u16 shift_width;
+	__le16 src_word;
+
+	/* prepare the bits and mask */
+	shift_width = ce_info->lsb % 8;
+	mask = ((u16)1 << ce_info->width) - 1;
+
+	/* shift to correct alignment */
+	mask <<= shift_width;
+
+	/* get the current bits from the src bit string */
+	src = hmc_bits + (ce_info->lsb / 8);
+
+	i40e_memcpy(&src_word, src, sizeof(src_word), I40E_DMA_TO_NONDMA);
+
+	/* the data in the memory is stored as little endian so mask it
+	 * correctly
+	 */
+	src_word &= ~(CPU_TO_LE16(mask));
+
+	/* get the data back into host order before shifting */
+	dest_word = LE16_TO_CPU(src_word);
+
+	dest_word >>= shift_width;
+
+	/* get the address from the struct field */
+	target = dest + ce_info->offset;
+
+	/* put it back in the struct */
+	i40e_memcpy(target, &dest_word, sizeof(dest_word), I40E_NONDMA_TO_DMA);
+}
+
+/**
+ * i40e_read_dword - read HMC context dword into struct
+ * @hmc_bits: pointer to the HMC memory
+ * @ce_info: a description of the struct to be filled
+ * @dest: the struct to be filled
+ **/
+static void i40e_read_dword(u8 *hmc_bits,
+			    struct i40e_context_ele *ce_info,
+			    u8 *dest)
+{
+	u32 dest_dword, mask;
+	u8 *src, *target;
+	u16 shift_width;
+	__le32 src_dword;
+
+	/* prepare the bits and mask */
+	shift_width = ce_info->lsb % 8;
+
+	/* if the field width is exactly 32 on an x86 machine, then the shift
+	 * operation will not work because the SHL instructions count is masked
+	 * to 5 bits so the shift will do nothing
+	 */
+	if (ce_info->width < 32)
+		mask = ((u32)1 << ce_info->width) - 1;
+	else
+		mask = 0xFFFFFFFF;
+
+	/* shift to correct alignment */
+	mask <<= shift_width;
+
+	/* get the current bits from the src bit string */
+	src = hmc_bits + (ce_info->lsb / 8);
+
+	i40e_memcpy(&src_dword, src, sizeof(src_dword), I40E_DMA_TO_NONDMA);
+
+	/* the data in the memory is stored as little endian so mask it
+	 * correctly
+	 */
+	src_dword &= ~(CPU_TO_LE32(mask));
+
+	/* get the data back into host order before shifting */
+	dest_dword = LE32_TO_CPU(src_dword);
+
+	dest_dword >>= shift_width;
+
+	/* get the address from the struct field */
+	target = dest + ce_info->offset;
+
+	/* put it back in the struct */
+	i40e_memcpy(target, &dest_dword, sizeof(dest_dword),
+		    I40E_NONDMA_TO_DMA);
+}
+
+/**
+ * i40e_read_qword - read HMC context qword into struct
+ * @hmc_bits: pointer to the HMC memory
+ * @ce_info: a description of the struct to be filled
+ * @dest: the struct to be filled
+ **/
+static void i40e_read_qword(u8 *hmc_bits,
+			    struct i40e_context_ele *ce_info,
+			    u8 *dest)
+{
+	u64 dest_qword, mask;
+	u8 *src, *target;
+	u16 shift_width;
+	__le64 src_qword;
+
+	/* prepare the bits and mask */
+	shift_width = ce_info->lsb % 8;
+
+	/* if the field width is exactly 64 on an x86 machine, then the shift
+	 * operation will not work because the SHL instructions count is masked
+	 * to 6 bits so the shift will do nothing
+	 */
+	if (ce_info->width < 64)
+		mask = ((u64)1 << ce_info->width) - 1;
+	else
+		mask = 0xFFFFFFFFFFFFFFFFUL;
+
+	/* shift to correct alignment */
+	mask <<= shift_width;
+
+	/* get the current bits from the src bit string */
+	src = hmc_bits + (ce_info->lsb / 8);
+
+	i40e_memcpy(&src_qword, src, sizeof(src_qword), I40E_DMA_TO_NONDMA);
+
+	/* the data in the memory is stored as little endian so mask it
+	 * correctly
+	 */
+	src_qword &= ~(CPU_TO_LE64(mask));
+
+	/* get the data back into host order before shifting */
+	dest_qword = LE64_TO_CPU(src_qword);
+
+	dest_qword >>= shift_width;
+
+	/* get the address from the struct field */
+	target = dest + ce_info->offset;
+
+	/* put it back in the struct */
+	i40e_memcpy(target, &dest_qword, sizeof(dest_qword),
+		    I40E_NONDMA_TO_DMA);
+}
+
 /**
  * i40e_get_hmc_context - extract HMC context bits
  * @context_bytes: pointer to the context bit array
@@ -764,55 +1137,21 @@ static enum i40e_status_code i40e_get_hmc_context(u8 *context_bytes,
 					struct i40e_context_ele *ce_info,
 					u8 *dest)
 {
-	u16 shift_width;
-	u8 bitfield[8];
-	int i, f;
-	u64 mask;
-	u8 *p;
+	int f;
 
 	for (f = 0; ce_info[f].width != 0; f++) {
-		*(u64 *)bitfield = 0;
-
-		/* copy the bytes that contain the desired bits */
-		p = context_bytes + (ce_info[f].lsb / 8);
-		for (i = 0; i < ce_info[f].size_of; i++)
-			bitfield[i] = p[i];
-
-		/* shift the bits to the right */
-		shift_width = ce_info[f].lsb % 8;
-		*(u64 *)bitfield >>= shift_width;
-
-		/* some fields might overlap into one more byte, so grab
-		 * the one more byte if needed and stick the extra bits
-		 * onto the top of the value
-		 * example: 62 bit field that starts in bit 5 of first byte
-		 *          will overlap 3 bits into byte 9
-		 */
-		if ((shift_width + ce_info[f].width) >
-		    (ce_info[f].size_of * 8)) {
-			u8 byte = p[ce_info[f].size_of];
-			byte <<= (8 - shift_width);
-			bitfield[ce_info[f].size_of - 1] |= byte;
-		}
-
-		/* mask for the target bits */
-		mask = ((u64)1 << ce_info[f].width) - 1;
-		*(u64 *)bitfield &= mask;
-
-		/* copy into the appropriate struct field */
-		p = dest + ce_info[f].offset;
 		switch (ce_info[f].size_of) {
 		case 1:
-			*p  = *(u8 *)&bitfield;
+			i40e_read_byte(context_bytes, &ce_info[f], dest);
 			break;
 		case 2:
-			*(u16 *)p = LE16_TO_CPU(*(u16 *)&bitfield);
+			i40e_read_word(context_bytes, &ce_info[f], dest);
 			break;
 		case 4:
-			*(u32 *)p = LE32_TO_CPU(*(u32 *)&bitfield);
+			i40e_read_dword(context_bytes, &ce_info[f], dest);
 			break;
 		case 8:
-			*(u64 *)p = LE64_TO_CPU(*(u64 *)&bitfield);
+			i40e_read_qword(context_bytes, &ce_info[f], dest);
 			break;
 		default:
 			/* nothing to do, just keep going */
@@ -850,71 +1189,28 @@ static enum i40e_status_code i40e_set_hmc_context(u8 *context_bytes,
 					struct i40e_context_ele *ce_info,
 					u8 *dest)
 {
-	u16 shift_width;
-	u64 bitfield;
-	u8 hi_byte;
-	u8 hi_mask;
-	u64 t_bits;
-	u64 mask;
-	u8 *p;
 	int f;
 
 	for (f = 0; ce_info[f].width != 0; f++) {
-		/* clear out the field */
-		bitfield = 0;
 
-		/* copy from the next struct field */
-		p = dest + ce_info[f].offset;
+		/* we have to deal with each element of the HMC using the
+		 * correct size so that we are correct regardless of the
+		 * endianness of the machine
+		 */
 		switch (ce_info[f].size_of) {
 		case 1:
-			bitfield = *p;
+			i40e_write_byte(context_bytes, &ce_info[f], dest);
 			break;
 		case 2:
-			bitfield = CPU_TO_LE16(*(u16 *)p);
+			i40e_write_word(context_bytes, &ce_info[f], dest);
 			break;
 		case 4:
-			bitfield = CPU_TO_LE32(*(u32 *)p);
+			i40e_write_dword(context_bytes, &ce_info[f], dest);
 			break;
 		case 8:
-			bitfield = CPU_TO_LE64(*(u64 *)p);
+			i40e_write_qword(context_bytes, &ce_info[f], dest);
 			break;
 		}
-
-		/* prepare the bits and mask */
-		shift_width = ce_info[f].lsb % 8;
-		mask = ((u64)1 << ce_info[f].width) - 1;
-
-		/* save upper bytes for special case */
-		hi_mask = (u8)((mask >> 56) & 0xff);
-		hi_byte = (u8)((bitfield >> 56) & 0xff);
-
-		/* shift to correct alignment */
-		mask <<= shift_width;
-		bitfield <<= shift_width;
-
-		/* get the current bits from the target bit string */
-		p = context_bytes + (ce_info[f].lsb / 8);
-		i40e_memcpy(&t_bits, p, sizeof(u64), I40E_DMA_TO_NONDMA);
-
-		t_bits &= ~mask;          /* get the bits not changing */
-		t_bits |= bitfield;       /* add in the new bits */
-
-		/* put it all back */
-		i40e_memcpy(p, &t_bits, sizeof(u64), I40E_NONDMA_TO_DMA);
-
-		/* deal with the special case if needed
-		 * example: 62 bit field that starts in bit 5 of first byte
-		 *          will overlap 3 bits into byte 9
-		 */
-		if ((shift_width + ce_info[f].width) > 64) {
-			u8 byte;
-
-			hi_mask >>= (8 - shift_width);
-			hi_byte >>= (8 - shift_width);
-			byte = p[8] & ~hi_mask;  /* get the bits not changing */
-			byte |= hi_byte;         /* add in the new bits */
-			p[8] = byte;             /* put it back */
-		}
 	}
 
 	return I40E_SUCCESS;
diff --git a/sys/dev/i40e/i40e_lan_hmc.h b/sys/dev/i40e/i40e_lan_hmc.h
index 686572fd1b75..8b73570b8fb5 100755
--- a/sys/dev/i40e/i40e_lan_hmc.h
+++ b/sys/dev/i40e/i40e_lan_hmc.h
@@ -37,20 +37,25 @@
 
 /* forward-declare the HW struct for the compiler */
 struct i40e_hw;
-enum i40e_status_code;
 
 /* HMC element context information */
 
-/* Rx queue context data */
+/* Rx queue context data
+ *
+ * The sizes of the variables may be larger than needed due to crossing byte
+ * boundaries. If we do not have the width of the variable set to the correct
+ * size then we could end up shifting bits off the top of the variable when the
+ * variable is at the top of a byte and crosses over into the next byte.
+ */
 struct i40e_hmc_obj_rxq {
 	u16 head;
-	u8  cpuid;
+	u16 cpuid; /* bigger than needed, see above for reason */
 	u64 base;
 	u16 qlen;
 #define I40E_RXQ_CTX_DBUFF_SHIFT 7
-	u8  dbuff;
+	u16 dbuff; /* bigger than needed, see above for reason */
 #define I40E_RXQ_CTX_HBUFF_SHIFT 6
-	u8  hbuff;
+	u16 hbuff; /* bigger than needed, see above for reason */
 	u8  dtype;
 	u8  dsize;
 	u8  crcstrip;
@@ -59,16 +64,22 @@ struct i40e_hmc_obj_rxq {
 	u8  hsplit_0;
 	u8  hsplit_1;
 	u8  showiv;
-	u16 rxmax;
+	u32 rxmax; /* bigger than needed, see above for reason */
 	u8  tphrdesc_ena;
 	u8  tphwdesc_ena;
 	u8  tphdata_ena;
 	u8  tphhead_ena;
-	u8  lrxqthresh;
+	u16 lrxqthresh; /* bigger than needed, see above for reason */
 	u8  prefena;	/* NOTE: normally must be set to 1 at init */
 };
 
-/* Tx queue context data */
+/* Tx queue context data
+*
+* The sizes of the variables may be larger than needed due to crossing byte
+* boundaries. If we do not have the width of the variable set to the correct
+* size then we could end up shifting bits off the top of the variable when the
+* variable is at the top of a byte and crosses over into the next byte.
+*/
 struct i40e_hmc_obj_txq {
 	u16 head;
 	u8  new_context;
@@ -78,7 +89,7 @@ struct i40e_hmc_obj_txq {
 	u8  fd_ena;
 	u8  alt_vlan_ena;
 	u16 thead_wb;
-	u16 cpuid;
+	u8  cpuid;
 	u8  head_wb_ena;
 	u16 qlen;
 	u8  tphrdesc_ena;
@@ -122,11 +133,7 @@ enum i40e_hmc_lan_object_size {
 #define I40E_HMC_L2OBJ_BASE_ALIGNMENT 512
 #define I40E_HMC_OBJ_SIZE_TXQ         128
 #define I40E_HMC_OBJ_SIZE_RXQ         32
-#ifdef FORTVILLE_A0_SUPPORT
-#define I40E_HMC_OBJ_SIZE_FCOE_CNTX   128
-#else
 #define I40E_HMC_OBJ_SIZE_FCOE_CNTX   64
-#endif
 #define I40E_HMC_OBJ_SIZE_FCOE_FILT   64
 
 enum i40e_hmc_lan_rsrc_type {
diff --git a/sys/dev/i40e/i40e_nvm.c b/sys/dev/i40e/i40e_nvm.c
index f6ab50f55812..52d860291f33 100755
--- a/sys/dev/i40e/i40e_nvm.c
+++ b/sys/dev/i40e/i40e_nvm.c
@@ -457,13 +457,9 @@ enum i40e_status_code i40e_validate_nvm_checksum(struct i40e_hw *hw,
 
 	DEBUGFUNC("i40e_validate_nvm_checksum");
 
-	ret_code = i40e_acquire_nvm(hw, I40E_RESOURCE_READ);
-	if (ret_code != I40E_SUCCESS)
-		goto i40e_validate_nvm_checksum_exit;
-
 	ret_code = i40e_calc_nvm_checksum(hw, &checksum_local);
 	if (ret_code != I40E_SUCCESS)
-		goto i40e_validate_nvm_checksum_free;
+		goto i40e_validate_nvm_checksum_exit;
 
 	/* Do not use i40e_read_nvm_word() because we do not want to take
 	 * the synchronization semaphores twice here.
@@ -480,9 +476,6 @@ enum i40e_status_code i40e_validate_nvm_checksum(struct i40e_hw *hw,
 	if (checksum)
 		*checksum = checksum_local;
 
-i40e_validate_nvm_checksum_free:
-	i40e_release_nvm(hw);
-
 i40e_validate_nvm_checksum_exit:
 	return ret_code;
 }
diff --git a/sys/dev/i40e/i40e_osdep.c b/sys/dev/i40e/i40e_osdep.c
index e55d734fa0a8..cea801cbfeec 100755
--- a/sys/dev/i40e/i40e_osdep.c
+++ b/sys/dev/i40e/i40e_osdep.c
@@ -89,7 +89,7 @@ i40e_allocate_dma(struct i40e_hw *hw, struct i40e_dma_mem *dma,
 		goto fail_0;
 	}
 	err = bus_dmamem_alloc(dma->tag, (void **)&dma->va,
-			     BUS_DMA_NOWAIT | M_ZERO, &dma->map);
+			     BUS_DMA_NOWAIT | BUS_DMA_ZERO, &dma->map);
 	if (err != 0) {
 		device_printf(dev,
 		    "i40e_allocate_dma: bus_dmamem_alloc failed, "
diff --git a/sys/dev/i40e/i40e_prototype.h b/sys/dev/i40e/i40e_prototype.h
index 3dc2f5a95f19..9b2d7fc33144 100755
--- a/sys/dev/i40e/i40e_prototype.h
+++ b/sys/dev/i40e/i40e_prototype.h
@@ -70,10 +70,8 @@ enum i40e_status_code i40e_asq_send_command(struct i40e_hw *hw,
 bool i40e_asq_done(struct i40e_hw *hw);
 
 /* debug function for adminq */
-void i40e_debug_aq(struct i40e_hw *hw,
-		   enum i40e_debug_mask mask,
-		   void *desc,
-		   void *buffer);
+void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask,
+		   void *desc, void *buffer, u16 buf_len);
 
 void i40e_idle_aq(struct i40e_hw *hw);
 void i40e_resume_aq(struct i40e_hw *hw);
@@ -90,6 +88,9 @@ enum i40e_status_code i40e_aq_get_firmware_version(struct i40e_hw *hw,
 				u16 *fw_major_version, u16 *fw_minor_version,
 				u16 *api_major_version, u16 *api_minor_version,
 				struct i40e_asq_cmd_details *cmd_details);
+enum i40e_status_code i40e_aq_debug_write_register(struct i40e_hw *hw,
+				u32 reg_addr, u64 reg_val,
+				struct i40e_asq_cmd_details *cmd_details);
 enum i40e_status_code i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags,
 				struct i40e_asq_cmd_details *cmd_details);
 enum i40e_status_code i40e_aq_set_default_vsi(struct i40e_hw *hw, u16 vsi_id,
@@ -116,12 +117,10 @@ enum i40e_status_code i40e_aq_get_partner_advt(struct i40e_hw *hw,
 				struct i40e_asq_cmd_details *cmd_details);
 enum i40e_status_code i40e_aq_set_lb_modes(struct i40e_hw *hw, u16 lb_modes,
 				struct i40e_asq_cmd_details *cmd_details);
-#ifndef FORTVILLE_A0_SUPPORT
 enum i40e_status_code i40e_aq_clear_pxe_mode(struct i40e_hw *hw,
 			struct i40e_asq_cmd_details *cmd_details);
-#endif
 enum i40e_status_code i40e_aq_set_link_restart_an(struct i40e_hw *hw,
-				struct i40e_asq_cmd_details *cmd_details);
+		bool enable_link, struct i40e_asq_cmd_details *cmd_details);
 enum i40e_status_code i40e_aq_get_link_info(struct i40e_hw *hw,
 				bool enable_lse, struct i40e_link_status *link,
 				struct i40e_asq_cmd_details *cmd_details);
@@ -226,17 +225,10 @@ enum i40e_status_code i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent,
 				struct i40e_asq_cmd_details *cmd_details);
 enum i40e_status_code i40e_aq_start_lldp(struct i40e_hw *hw,
 				struct i40e_asq_cmd_details *cmd_details);
-#ifdef FORTVILLE_A0_SUPPORT
-enum i40e_status_code i40e_aq_add_udp_tunnel(struct i40e_hw *hw,
-				u16 udp_port, u8 header_len,
-				u8 protocol_index, u8 *filter_index,
-				struct i40e_asq_cmd_details *cmd_details);
-#else
 enum i40e_status_code i40e_aq_add_udp_tunnel(struct i40e_hw *hw,
 				u16 udp_port, u8 protocol_index,
 				u8 *filter_index,
 				struct i40e_asq_cmd_details *cmd_details);
-#endif
 enum i40e_status_code i40e_aq_del_udp_tunnel(struct i40e_hw *hw, u8 index,
 				struct i40e_asq_cmd_details *cmd_details);
 enum i40e_status_code i40e_aq_get_switch_resource_alloc(struct i40e_hw *hw,
@@ -361,6 +353,7 @@ enum i40e_status_code i40e_aq_set_oem_mode(struct i40e_hw *hw,
 /* i40e_common */
 enum i40e_status_code i40e_init_shared_code(struct i40e_hw *hw);
 enum i40e_status_code i40e_pf_reset(struct i40e_hw *hw);
+void i40e_clear_hw(struct i40e_hw *hw);
 void i40e_clear_pxe_mode(struct i40e_hw *hw);
 bool i40e_get_link_status(struct i40e_hw *hw);
 enum i40e_status_code i40e_get_mac_addr(struct i40e_hw *hw, u8 *mac_addr);
@@ -371,9 +364,6 @@ enum i40e_status_code i40e_aq_configure_partition_bw(struct i40e_hw *hw,
 			struct i40e_asq_cmd_details *cmd_details);
 enum i40e_status_code i40e_get_port_mac_addr(struct i40e_hw *hw, u8 *mac_addr);
 void i40e_pre_tx_queue_cfg(struct i40e_hw *hw, u32 queue, bool enable);
-#ifdef FORTVILLE_A0_SUPPORT
-void i40e_set_tag_alloc_method(struct i40e_hw *hw, bool debug);
-#endif
 enum i40e_status_code i40e_validate_mac_addr(u8 *mac_addr);
 enum i40e_aq_link_speed i40e_get_link_speed(struct i40e_hw *hw);
 /* prototype for functions used for NVM access */
diff --git a/sys/dev/i40e/i40e_register.h b/sys/dev/i40e/i40e_register.h
index 39d86e3fa3c2..b6364a0cbbdc 100755
--- a/sys/dev/i40e/i40e_register.h
+++ b/sys/dev/i40e/i40e_register.h
@@ -35,32 +35,29 @@
 #ifndef _I40E_REGISTER_H_
 #define _I40E_REGISTER_H_
 
-#if !defined(EXTERNAL_RELEASE) || defined(SV_SUPPORT) || defined(FORTVILLE_A0_SUPPORT)
-#include "i40e_register_x710_int.h"
-#endif
 
-#define I40E_GL_ARQBAH              0x000801C0
+#define I40E_GL_ARQBAH              0x000801C0 /* Reset: EMPR */
 #define I40E_GL_ARQBAH_ARQBAH_SHIFT 0
 #define I40E_GL_ARQBAH_ARQBAH_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_ARQBAH_ARQBAH_SHIFT)
-#define I40E_GL_ARQBAL              0x000800C0
+#define I40E_GL_ARQBAL              0x000800C0 /* Reset: EMPR */
 #define I40E_GL_ARQBAL_ARQBAL_SHIFT 0
 #define I40E_GL_ARQBAL_ARQBAL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_ARQBAL_ARQBAL_SHIFT)
-#define I40E_GL_ARQH            0x000803C0
+#define I40E_GL_ARQH            0x000803C0 /* Reset: EMPR */
 #define I40E_GL_ARQH_ARQH_SHIFT 0
 #define I40E_GL_ARQH_ARQH_MASK  I40E_MASK(0x3FF, I40E_GL_ARQH_ARQH_SHIFT)
-#define I40E_GL_ARQT            0x000804C0
+#define I40E_GL_ARQT            0x000804C0 /* Reset: EMPR */
 #define I40E_GL_ARQT_ARQT_SHIFT 0
 #define I40E_GL_ARQT_ARQT_MASK  I40E_MASK(0x3FF, I40E_GL_ARQT_ARQT_SHIFT)
-#define I40E_GL_ATQBAH              0x00080140
+#define I40E_GL_ATQBAH              0x00080140 /* Reset: EMPR */
 #define I40E_GL_ATQBAH_ATQBAH_SHIFT 0
 #define I40E_GL_ATQBAH_ATQBAH_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_ATQBAH_ATQBAH_SHIFT)
-#define I40E_GL_ATQBAL              0x00080040
+#define I40E_GL_ATQBAL              0x00080040 /* Reset: EMPR */
 #define I40E_GL_ATQBAL_ATQBAL_SHIFT 0
 #define I40E_GL_ATQBAL_ATQBAL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_ATQBAL_ATQBAL_SHIFT)
-#define I40E_GL_ATQH            0x00080340
+#define I40E_GL_ATQH            0x00080340 /* Reset: EMPR */
 #define I40E_GL_ATQH_ATQH_SHIFT 0
 #define I40E_GL_ATQH_ATQH_MASK  I40E_MASK(0x3FF, I40E_GL_ATQH_ATQH_SHIFT)
-#define I40E_GL_ATQLEN                 0x00080240
+#define I40E_GL_ATQLEN                 0x00080240 /* Reset: EMPR */
 #define I40E_GL_ATQLEN_ATQLEN_SHIFT    0
 #define I40E_GL_ATQLEN_ATQLEN_MASK     I40E_MASK(0x3FF, I40E_GL_ATQLEN_ATQLEN_SHIFT)
 #define I40E_GL_ATQLEN_ATQVFE_SHIFT    28
@@ -71,19 +68,19 @@
 #define I40E_GL_ATQLEN_ATQCRIT_MASK    I40E_MASK(0x1, I40E_GL_ATQLEN_ATQCRIT_SHIFT)
 #define I40E_GL_ATQLEN_ATQENABLE_SHIFT 31
 #define I40E_GL_ATQLEN_ATQENABLE_MASK  I40E_MASK(0x1, I40E_GL_ATQLEN_ATQENABLE_SHIFT)
-#define I40E_GL_ATQT            0x00080440
+#define I40E_GL_ATQT            0x00080440 /* Reset: EMPR */
 #define I40E_GL_ATQT_ATQT_SHIFT 0
 #define I40E_GL_ATQT_ATQT_MASK  I40E_MASK(0x3FF, I40E_GL_ATQT_ATQT_SHIFT)
-#define I40E_PF_ARQBAH              0x00080180
+#define I40E_PF_ARQBAH              0x00080180 /* Reset: EMPR */
 #define I40E_PF_ARQBAH_ARQBAH_SHIFT 0
 #define I40E_PF_ARQBAH_ARQBAH_MASK  I40E_MASK(0xFFFFFFFF, I40E_PF_ARQBAH_ARQBAH_SHIFT)
-#define I40E_PF_ARQBAL              0x00080080
+#define I40E_PF_ARQBAL              0x00080080 /* Reset: EMPR */
 #define I40E_PF_ARQBAL_ARQBAL_SHIFT 0
 #define I40E_PF_ARQBAL_ARQBAL_MASK  I40E_MASK(0xFFFFFFFF, I40E_PF_ARQBAL_ARQBAL_SHIFT)
-#define I40E_PF_ARQH            0x00080380
+#define I40E_PF_ARQH            0x00080380 /* Reset: EMPR */
 #define I40E_PF_ARQH_ARQH_SHIFT 0
 #define I40E_PF_ARQH_ARQH_MASK  I40E_MASK(0x3FF, I40E_PF_ARQH_ARQH_SHIFT)
-#define I40E_PF_ARQLEN                 0x00080280
+#define I40E_PF_ARQLEN                 0x00080280 /* Reset: EMPR */
 #define I40E_PF_ARQLEN_ARQLEN_SHIFT    0
 #define I40E_PF_ARQLEN_ARQLEN_MASK     I40E_MASK(0x3FF, I40E_PF_ARQLEN_ARQLEN_SHIFT)
 #define I40E_PF_ARQLEN_ARQVFE_SHIFT    28
@@ -94,19 +91,19 @@
 #define I40E_PF_ARQLEN_ARQCRIT_MASK    I40E_MASK(0x1, I40E_PF_ARQLEN_ARQCRIT_SHIFT)
 #define I40E_PF_ARQLEN_ARQENABLE_SHIFT 31
 #define I40E_PF_ARQLEN_ARQENABLE_MASK  I40E_MASK(0x1, I40E_PF_ARQLEN_ARQENABLE_SHIFT)
-#define I40E_PF_ARQT            0x00080480
+#define I40E_PF_ARQT            0x00080480 /* Reset: EMPR */
 #define I40E_PF_ARQT_ARQT_SHIFT 0
 #define I40E_PF_ARQT_ARQT_MASK  I40E_MASK(0x3FF, I40E_PF_ARQT_ARQT_SHIFT)
-#define I40E_PF_ATQBAH              0x00080100
+#define I40E_PF_ATQBAH              0x00080100 /* Reset: EMPR */
 #define I40E_PF_ATQBAH_ATQBAH_SHIFT 0
 #define I40E_PF_ATQBAH_ATQBAH_MASK  I40E_MASK(0xFFFFFFFF, I40E_PF_ATQBAH_ATQBAH_SHIFT)
-#define I40E_PF_ATQBAL              0x00080000
+#define I40E_PF_ATQBAL              0x00080000 /* Reset: EMPR */
 #define I40E_PF_ATQBAL_ATQBAL_SHIFT 0
 #define I40E_PF_ATQBAL_ATQBAL_MASK  I40E_MASK(0xFFFFFFFF, I40E_PF_ATQBAL_ATQBAL_SHIFT)
-#define I40E_PF_ATQH            0x00080300
+#define I40E_PF_ATQH            0x00080300 /* Reset: EMPR */
 #define I40E_PF_ATQH_ATQH_SHIFT 0
 #define I40E_PF_ATQH_ATQH_MASK  I40E_MASK(0x3FF, I40E_PF_ATQH_ATQH_SHIFT)
-#define I40E_PF_ATQLEN                 0x00080200
+#define I40E_PF_ATQLEN                 0x00080200 /* Reset: EMPR */
 #define I40E_PF_ATQLEN_ATQLEN_SHIFT    0
 #define I40E_PF_ATQLEN_ATQLEN_MASK     I40E_MASK(0x3FF, I40E_PF_ATQLEN_ATQLEN_SHIFT)
 #define I40E_PF_ATQLEN_ATQVFE_SHIFT    28
@@ -117,22 +114,22 @@
 #define I40E_PF_ATQLEN_ATQCRIT_MASK    I40E_MASK(0x1, I40E_PF_ATQLEN_ATQCRIT_SHIFT)
 #define I40E_PF_ATQLEN_ATQENABLE_SHIFT 31
 #define I40E_PF_ATQLEN_ATQENABLE_MASK  I40E_MASK(0x1, I40E_PF_ATQLEN_ATQENABLE_SHIFT)
-#define I40E_PF_ATQT            0x00080400
+#define I40E_PF_ATQT            0x00080400 /* Reset: EMPR */
 #define I40E_PF_ATQT_ATQT_SHIFT 0
 #define I40E_PF_ATQT_ATQT_MASK  I40E_MASK(0x3FF, I40E_PF_ATQT_ATQT_SHIFT)
-#define I40E_VF_ARQBAH(_VF)         (0x00081400 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VF_ARQBAH(_VF)         (0x00081400 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: EMPR */
 #define I40E_VF_ARQBAH_MAX_INDEX    127
 #define I40E_VF_ARQBAH_ARQBAH_SHIFT 0
 #define I40E_VF_ARQBAH_ARQBAH_MASK  I40E_MASK(0xFFFFFFFF, I40E_VF_ARQBAH_ARQBAH_SHIFT)
-#define I40E_VF_ARQBAL(_VF)         (0x00080C00 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VF_ARQBAL(_VF)         (0x00080C00 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: EMPR */
 #define I40E_VF_ARQBAL_MAX_INDEX    127
 #define I40E_VF_ARQBAL_ARQBAL_SHIFT 0
 #define I40E_VF_ARQBAL_ARQBAL_MASK  I40E_MASK(0xFFFFFFFF, I40E_VF_ARQBAL_ARQBAL_SHIFT)
-#define I40E_VF_ARQH(_VF)       (0x00082400 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VF_ARQH(_VF)       (0x00082400 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: EMPR */
 #define I40E_VF_ARQH_MAX_INDEX  127
 #define I40E_VF_ARQH_ARQH_SHIFT 0
 #define I40E_VF_ARQH_ARQH_MASK  I40E_MASK(0x3FF, I40E_VF_ARQH_ARQH_SHIFT)
-#define I40E_VF_ARQLEN(_VF)            (0x00081C00 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VF_ARQLEN(_VF)            (0x00081C00 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: EMPR */
 #define I40E_VF_ARQLEN_MAX_INDEX       127
 #define I40E_VF_ARQLEN_ARQLEN_SHIFT    0
 #define I40E_VF_ARQLEN_ARQLEN_MASK     I40E_MASK(0x3FF, I40E_VF_ARQLEN_ARQLEN_SHIFT)
@@ -144,23 +141,23 @@
 #define I40E_VF_ARQLEN_ARQCRIT_MASK    I40E_MASK(0x1, I40E_VF_ARQLEN_ARQCRIT_SHIFT)
 #define I40E_VF_ARQLEN_ARQENABLE_SHIFT 31
 #define I40E_VF_ARQLEN_ARQENABLE_MASK  I40E_MASK(0x1, I40E_VF_ARQLEN_ARQENABLE_SHIFT)
-#define I40E_VF_ARQT(_VF)       (0x00082C00 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VF_ARQT(_VF)       (0x00082C00 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: EMPR */
 #define I40E_VF_ARQT_MAX_INDEX  127
 #define I40E_VF_ARQT_ARQT_SHIFT 0
 #define I40E_VF_ARQT_ARQT_MASK  I40E_MASK(0x3FF, I40E_VF_ARQT_ARQT_SHIFT)
-#define I40E_VF_ATQBAH(_VF)         (0x00081000 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VF_ATQBAH(_VF)         (0x00081000 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: EMPR */
 #define I40E_VF_ATQBAH_MAX_INDEX    127
 #define I40E_VF_ATQBAH_ATQBAH_SHIFT 0
 #define I40E_VF_ATQBAH_ATQBAH_MASK  I40E_MASK(0xFFFFFFFF, I40E_VF_ATQBAH_ATQBAH_SHIFT)
-#define I40E_VF_ATQBAL(_VF)         (0x00080800 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VF_ATQBAL(_VF)         (0x00080800 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: EMPR */
 #define I40E_VF_ATQBAL_MAX_INDEX    127
 #define I40E_VF_ATQBAL_ATQBAL_SHIFT 0
 #define I40E_VF_ATQBAL_ATQBAL_MASK  I40E_MASK(0xFFFFFFFF, I40E_VF_ATQBAL_ATQBAL_SHIFT)
-#define I40E_VF_ATQH(_VF)       (0x00082000 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VF_ATQH(_VF)       (0x00082000 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: EMPR */
 #define I40E_VF_ATQH_MAX_INDEX  127
 #define I40E_VF_ATQH_ATQH_SHIFT 0
 #define I40E_VF_ATQH_ATQH_MASK  I40E_MASK(0x3FF, I40E_VF_ATQH_ATQH_SHIFT)
-#define I40E_VF_ATQLEN(_VF)            (0x00081800 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VF_ATQLEN(_VF)            (0x00081800 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: EMPR */
 #define I40E_VF_ATQLEN_MAX_INDEX       127
 #define I40E_VF_ATQLEN_ATQLEN_SHIFT    0
 #define I40E_VF_ATQLEN_ATQLEN_MASK     I40E_MASK(0x3FF, I40E_VF_ATQLEN_ATQLEN_SHIFT)
@@ -172,21 +169,21 @@
 #define I40E_VF_ATQLEN_ATQCRIT_MASK    I40E_MASK(0x1, I40E_VF_ATQLEN_ATQCRIT_SHIFT)
 #define I40E_VF_ATQLEN_ATQENABLE_SHIFT 31
 #define I40E_VF_ATQLEN_ATQENABLE_MASK  I40E_MASK(0x1, I40E_VF_ATQLEN_ATQENABLE_SHIFT)
-#define I40E_VF_ATQT(_VF)       (0x00082800 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VF_ATQT(_VF)       (0x00082800 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: EMPR */
 #define I40E_VF_ATQT_MAX_INDEX  127
 #define I40E_VF_ATQT_ATQT_SHIFT 0
 #define I40E_VF_ATQT_ATQT_MASK  I40E_MASK(0x3FF, I40E_VF_ATQT_ATQT_SHIFT)
-#define I40E_PRT_L2TAGSEN              0x001C0B20
+#define I40E_PRT_L2TAGSEN              0x001C0B20 /* Reset: CORER */
 #define I40E_PRT_L2TAGSEN_ENABLE_SHIFT 0
 #define I40E_PRT_L2TAGSEN_ENABLE_MASK  I40E_MASK(0xFF, I40E_PRT_L2TAGSEN_ENABLE_SHIFT)
-#define I40E_PFCM_LAN_ERRDATA                  0x0010C080
+#define I40E_PFCM_LAN_ERRDATA                  0x0010C080 /* Reset: PFR */
 #define I40E_PFCM_LAN_ERRDATA_ERROR_CODE_SHIFT 0
 #define I40E_PFCM_LAN_ERRDATA_ERROR_CODE_MASK  I40E_MASK(0xF, I40E_PFCM_LAN_ERRDATA_ERROR_CODE_SHIFT)
 #define I40E_PFCM_LAN_ERRDATA_Q_TYPE_SHIFT     4
 #define I40E_PFCM_LAN_ERRDATA_Q_TYPE_MASK      I40E_MASK(0x7, I40E_PFCM_LAN_ERRDATA_Q_TYPE_SHIFT)
 #define I40E_PFCM_LAN_ERRDATA_Q_NUM_SHIFT      8
 #define I40E_PFCM_LAN_ERRDATA_Q_NUM_MASK       I40E_MASK(0xFFF, I40E_PFCM_LAN_ERRDATA_Q_NUM_SHIFT)
-#define I40E_PFCM_LAN_ERRINFO                     0x0010C000
+#define I40E_PFCM_LAN_ERRINFO                     0x0010C000 /* Reset: PFR */
 #define I40E_PFCM_LAN_ERRINFO_ERROR_VALID_SHIFT   0
 #define I40E_PFCM_LAN_ERRINFO_ERROR_VALID_MASK    I40E_MASK(0x1, I40E_PFCM_LAN_ERRINFO_ERROR_VALID_SHIFT)
 #define I40E_PFCM_LAN_ERRINFO_ERROR_INST_SHIFT    4
@@ -197,7 +194,7 @@
 #define I40E_PFCM_LAN_ERRINFO_RLU_ERROR_CNT_MASK  I40E_MASK(0xFF, I40E_PFCM_LAN_ERRINFO_RLU_ERROR_CNT_SHIFT)
 #define I40E_PFCM_LAN_ERRINFO_RLS_ERROR_CNT_SHIFT 24
 #define I40E_PFCM_LAN_ERRINFO_RLS_ERROR_CNT_MASK  I40E_MASK(0xFF, I40E_PFCM_LAN_ERRINFO_RLS_ERROR_CNT_SHIFT)
-#define I40E_PFCM_LANCTXCTL                  0x0010C300
+#define I40E_PFCM_LANCTXCTL                  0x0010C300 /* Reset: CORER */
 #define I40E_PFCM_LANCTXCTL_QUEUE_NUM_SHIFT  0
 #define I40E_PFCM_LANCTXCTL_QUEUE_NUM_MASK   I40E_MASK(0xFFF, I40E_PFCM_LANCTXCTL_QUEUE_NUM_SHIFT)
 #define I40E_PFCM_LANCTXCTL_SUB_LINE_SHIFT   12
@@ -206,16 +203,16 @@
 #define I40E_PFCM_LANCTXCTL_QUEUE_TYPE_MASK  I40E_MASK(0x3, I40E_PFCM_LANCTXCTL_QUEUE_TYPE_SHIFT)
 #define I40E_PFCM_LANCTXCTL_OP_CODE_SHIFT    17
 #define I40E_PFCM_LANCTXCTL_OP_CODE_MASK     I40E_MASK(0x3, I40E_PFCM_LANCTXCTL_OP_CODE_SHIFT)
-#define I40E_PFCM_LANCTXDATA(_i)        (0x0010C100 + ((_i) * 128)) /* _i=0...3 */
+#define I40E_PFCM_LANCTXDATA(_i)        (0x0010C100 + ((_i) * 128)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_PFCM_LANCTXDATA_MAX_INDEX  3
 #define I40E_PFCM_LANCTXDATA_DATA_SHIFT 0
 #define I40E_PFCM_LANCTXDATA_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_PFCM_LANCTXDATA_DATA_SHIFT)
-#define I40E_PFCM_LANCTXSTAT                0x0010C380
+#define I40E_PFCM_LANCTXSTAT                0x0010C380 /* Reset: CORER */
 #define I40E_PFCM_LANCTXSTAT_CTX_DONE_SHIFT 0
 #define I40E_PFCM_LANCTXSTAT_CTX_DONE_MASK  I40E_MASK(0x1, I40E_PFCM_LANCTXSTAT_CTX_DONE_SHIFT)
 #define I40E_PFCM_LANCTXSTAT_CTX_MISS_SHIFT 1
 #define I40E_PFCM_LANCTXSTAT_CTX_MISS_MASK  I40E_MASK(0x1, I40E_PFCM_LANCTXSTAT_CTX_MISS_SHIFT)
-#define I40E_VFCM_PE_ERRDATA1(_VF)             (0x00138800 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VFCM_PE_ERRDATA1(_VF)             (0x00138800 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: VFR */
 #define I40E_VFCM_PE_ERRDATA1_MAX_INDEX        127
 #define I40E_VFCM_PE_ERRDATA1_ERROR_CODE_SHIFT 0
 #define I40E_VFCM_PE_ERRDATA1_ERROR_CODE_MASK  I40E_MASK(0xF, I40E_VFCM_PE_ERRDATA1_ERROR_CODE_SHIFT)
@@ -223,7 +220,7 @@
 #define I40E_VFCM_PE_ERRDATA1_Q_TYPE_MASK      I40E_MASK(0x7, I40E_VFCM_PE_ERRDATA1_Q_TYPE_SHIFT)
 #define I40E_VFCM_PE_ERRDATA1_Q_NUM_SHIFT      8
 #define I40E_VFCM_PE_ERRDATA1_Q_NUM_MASK       I40E_MASK(0x3FFFF, I40E_VFCM_PE_ERRDATA1_Q_NUM_SHIFT)
-#define I40E_VFCM_PE_ERRINFO1(_VF)                (0x00138400 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VFCM_PE_ERRINFO1(_VF)                (0x00138400 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: VFR */
 #define I40E_VFCM_PE_ERRINFO1_MAX_INDEX           127
 #define I40E_VFCM_PE_ERRINFO1_ERROR_VALID_SHIFT   0
 #define I40E_VFCM_PE_ERRINFO1_ERROR_VALID_MASK    I40E_MASK(0x1, I40E_VFCM_PE_ERRINFO1_ERROR_VALID_SHIFT)
@@ -235,25 +232,25 @@
 #define I40E_VFCM_PE_ERRINFO1_RLU_ERROR_CNT_MASK  I40E_MASK(0xFF, I40E_VFCM_PE_ERRINFO1_RLU_ERROR_CNT_SHIFT)
 #define I40E_VFCM_PE_ERRINFO1_RLS_ERROR_CNT_SHIFT 24
 #define I40E_VFCM_PE_ERRINFO1_RLS_ERROR_CNT_MASK  I40E_MASK(0xFF, I40E_VFCM_PE_ERRINFO1_RLS_ERROR_CNT_SHIFT)
-#define I40E_GLDCB_GENC              0x00083044
+#define I40E_GLDCB_GENC              0x00083044 /* Reset: CORER */
 #define I40E_GLDCB_GENC_PCIRTT_SHIFT 0
 #define I40E_GLDCB_GENC_PCIRTT_MASK  I40E_MASK(0xFFFF, I40E_GLDCB_GENC_PCIRTT_SHIFT)
-#define I40E_GLDCB_RUPTI                     0x00122618
+#define I40E_GLDCB_RUPTI                     0x00122618 /* Reset: CORER */
 #define I40E_GLDCB_RUPTI_PFCTIMEOUT_UP_SHIFT 0
 #define I40E_GLDCB_RUPTI_PFCTIMEOUT_UP_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLDCB_RUPTI_PFCTIMEOUT_UP_SHIFT)
-#define I40E_PRTDCB_FCCFG            0x001E4640
+#define I40E_PRTDCB_FCCFG            0x001E4640 /* Reset: GLOBR */
 #define I40E_PRTDCB_FCCFG_TFCE_SHIFT 3
 #define I40E_PRTDCB_FCCFG_TFCE_MASK  I40E_MASK(0x3, I40E_PRTDCB_FCCFG_TFCE_SHIFT)
-#define I40E_PRTDCB_FCRTV                     0x001E4600
+#define I40E_PRTDCB_FCRTV                     0x001E4600 /* Reset: GLOBR */
 #define I40E_PRTDCB_FCRTV_FC_REFRESH_TH_SHIFT 0
 #define I40E_PRTDCB_FCRTV_FC_REFRESH_TH_MASK  I40E_MASK(0xFFFF, I40E_PRTDCB_FCRTV_FC_REFRESH_TH_SHIFT)
-#define I40E_PRTDCB_FCTTVN(_i)             (0x001E4580 + ((_i) * 32)) /* _i=0...3 */
+#define I40E_PRTDCB_FCTTVN(_i)             (0x001E4580 + ((_i) * 32)) /* _i=0...3 */ /* Reset: GLOBR */
 #define I40E_PRTDCB_FCTTVN_MAX_INDEX       3
 #define I40E_PRTDCB_FCTTVN_TTV_2N_SHIFT    0
 #define I40E_PRTDCB_FCTTVN_TTV_2N_MASK     I40E_MASK(0xFFFF, I40E_PRTDCB_FCTTVN_TTV_2N_SHIFT)
 #define I40E_PRTDCB_FCTTVN_TTV_2N_P1_SHIFT 16
 #define I40E_PRTDCB_FCTTVN_TTV_2N_P1_MASK  I40E_MASK(0xFFFF, I40E_PRTDCB_FCTTVN_TTV_2N_P1_SHIFT)
-#define I40E_PRTDCB_GENC                    0x00083000
+#define I40E_PRTDCB_GENC                    0x00083000 /* Reset: CORER */
 #define I40E_PRTDCB_GENC_RESERVED_1_SHIFT   0
 #define I40E_PRTDCB_GENC_RESERVED_1_MASK    I40E_MASK(0x3, I40E_PRTDCB_GENC_RESERVED_1_SHIFT)
 #define I40E_PRTDCB_GENC_NUMTC_SHIFT        2
@@ -264,10 +261,10 @@
 #define I40E_PRTDCB_GENC_FCOEUP_VALID_MASK  I40E_MASK(0x1, I40E_PRTDCB_GENC_FCOEUP_VALID_SHIFT)
 #define I40E_PRTDCB_GENC_PFCLDA_SHIFT       16
 #define I40E_PRTDCB_GENC_PFCLDA_MASK        I40E_MASK(0xFFFF, I40E_PRTDCB_GENC_PFCLDA_SHIFT)
-#define I40E_PRTDCB_GENS                   0x00083020
+#define I40E_PRTDCB_GENS                   0x00083020 /* Reset: CORER */
 #define I40E_PRTDCB_GENS_DCBX_STATUS_SHIFT 0
 #define I40E_PRTDCB_GENS_DCBX_STATUS_MASK  I40E_MASK(0x7, I40E_PRTDCB_GENS_DCBX_STATUS_SHIFT)
-#define I40E_PRTDCB_MFLCN             0x001E2400
+#define I40E_PRTDCB_MFLCN             0x001E2400 /* Reset: GLOBR */
 #define I40E_PRTDCB_MFLCN_PMCF_SHIFT  0
 #define I40E_PRTDCB_MFLCN_PMCF_MASK   I40E_MASK(0x1, I40E_PRTDCB_MFLCN_PMCF_SHIFT)
 #define I40E_PRTDCB_MFLCN_DPF_SHIFT   1
@@ -278,7 +275,7 @@
 #define I40E_PRTDCB_MFLCN_RFCE_MASK   I40E_MASK(0x1, I40E_PRTDCB_MFLCN_RFCE_SHIFT)
 #define I40E_PRTDCB_MFLCN_RPFCE_SHIFT 4
 #define I40E_PRTDCB_MFLCN_RPFCE_MASK  I40E_MASK(0xFF, I40E_PRTDCB_MFLCN_RPFCE_SHIFT)
-#define I40E_PRTDCB_RETSC                    0x001223E0
+#define I40E_PRTDCB_RETSC                    0x001223E0 /* Reset: CORER */
 #define I40E_PRTDCB_RETSC_ETS_MODE_SHIFT     0
 #define I40E_PRTDCB_RETSC_ETS_MODE_MASK      I40E_MASK(0x1, I40E_PRTDCB_RETSC_ETS_MODE_SHIFT)
 #define I40E_PRTDCB_RETSC_NON_ETS_MODE_SHIFT 1
@@ -287,7 +284,7 @@
 #define I40E_PRTDCB_RETSC_ETS_MAX_EXP_MASK   I40E_MASK(0xF, I40E_PRTDCB_RETSC_ETS_MAX_EXP_SHIFT)
 #define I40E_PRTDCB_RETSC_LLTC_SHIFT         8
 #define I40E_PRTDCB_RETSC_LLTC_MASK          I40E_MASK(0xFF, I40E_PRTDCB_RETSC_LLTC_SHIFT)
-#define I40E_PRTDCB_RETSTCC(_i)               (0x00122180 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTDCB_RETSTCC(_i)               (0x00122180 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRTDCB_RETSTCC_MAX_INDEX         7
 #define I40E_PRTDCB_RETSTCC_BWSHARE_SHIFT     0
 #define I40E_PRTDCB_RETSTCC_BWSHARE_MASK      I40E_MASK(0x7F, I40E_PRTDCB_RETSTCC_BWSHARE_SHIFT)
@@ -295,17 +292,17 @@
 #define I40E_PRTDCB_RETSTCC_UPINTC_MODE_MASK  I40E_MASK(0x1, I40E_PRTDCB_RETSTCC_UPINTC_MODE_SHIFT)
 #define I40E_PRTDCB_RETSTCC_ETSTC_SHIFT       31
 #define I40E_PRTDCB_RETSTCC_ETSTC_MASK        I40E_MASK(0x1, I40E_PRTDCB_RETSTCC_ETSTC_SHIFT)
-#define I40E_PRTDCB_RPPMC                    0x001223A0
+#define I40E_PRTDCB_RPPMC                    0x001223A0 /* Reset: CORER */
 #define I40E_PRTDCB_RPPMC_LANRPPM_SHIFT      0
 #define I40E_PRTDCB_RPPMC_LANRPPM_MASK       I40E_MASK(0xFF, I40E_PRTDCB_RPPMC_LANRPPM_SHIFT)
 #define I40E_PRTDCB_RPPMC_RDMARPPM_SHIFT     8
 #define I40E_PRTDCB_RPPMC_RDMARPPM_MASK      I40E_MASK(0xFF, I40E_PRTDCB_RPPMC_RDMARPPM_SHIFT)
 #define I40E_PRTDCB_RPPMC_RX_FIFO_SIZE_SHIFT 16
 #define I40E_PRTDCB_RPPMC_RX_FIFO_SIZE_MASK  I40E_MASK(0xFF, I40E_PRTDCB_RPPMC_RX_FIFO_SIZE_SHIFT)
-#define I40E_PRTDCB_RUP                0x001C0B00
+#define I40E_PRTDCB_RUP                0x001C0B00 /* Reset: CORER */
 #define I40E_PRTDCB_RUP_NOVLANUP_SHIFT 0
 #define I40E_PRTDCB_RUP_NOVLANUP_MASK  I40E_MASK(0x7, I40E_PRTDCB_RUP_NOVLANUP_SHIFT)
-#define I40E_PRTDCB_RUP2TC             0x001C09A0
+#define I40E_PRTDCB_RUP2TC             0x001C09A0 /* Reset: CORER */
 #define I40E_PRTDCB_RUP2TC_UP0TC_SHIFT 0
 #define I40E_PRTDCB_RUP2TC_UP0TC_MASK  I40E_MASK(0x7, I40E_PRTDCB_RUP2TC_UP0TC_SHIFT)
 #define I40E_PRTDCB_RUP2TC_UP1TC_SHIFT 3
@@ -322,36 +319,40 @@
 #define I40E_PRTDCB_RUP2TC_UP6TC_MASK  I40E_MASK(0x7, I40E_PRTDCB_RUP2TC_UP6TC_SHIFT)
 #define I40E_PRTDCB_RUP2TC_UP7TC_SHIFT 21
 #define I40E_PRTDCB_RUP2TC_UP7TC_MASK  I40E_MASK(0x7, I40E_PRTDCB_RUP2TC_UP7TC_SHIFT)
-#define I40E_PRTDCB_TC2PFC              0x001C0980
+#define I40E_PRTDCB_TC2PFC              0x001C0980 /* Reset: CORER */
 #define I40E_PRTDCB_TC2PFC_TC2PFC_SHIFT 0
 #define I40E_PRTDCB_TC2PFC_TC2PFC_MASK  I40E_MASK(0xFF, I40E_PRTDCB_TC2PFC_TC2PFC_SHIFT)
-#define I40E_PRTDCB_TCPMC                 0x000A21A0
+#define I40E_PRTDCB_TCMSTC(_i)        (0x000A0040 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
+#define I40E_PRTDCB_TCMSTC_MAX_INDEX  7
+#define I40E_PRTDCB_TCMSTC_MSTC_SHIFT 0
+#define I40E_PRTDCB_TCMSTC_MSTC_MASK  I40E_MASK(0xFFFFF, I40E_PRTDCB_TCMSTC_MSTC_SHIFT)
+#define I40E_PRTDCB_TCPMC                 0x000A21A0 /* Reset: CORER */
 #define I40E_PRTDCB_TCPMC_CPM_SHIFT       0
 #define I40E_PRTDCB_TCPMC_CPM_MASK        I40E_MASK(0x1FFF, I40E_PRTDCB_TCPMC_CPM_SHIFT)
 #define I40E_PRTDCB_TCPMC_LLTC_SHIFT      13
 #define I40E_PRTDCB_TCPMC_LLTC_MASK       I40E_MASK(0xFF, I40E_PRTDCB_TCPMC_LLTC_SHIFT)
 #define I40E_PRTDCB_TCPMC_TCPM_MODE_SHIFT 30
 #define I40E_PRTDCB_TCPMC_TCPM_MODE_MASK  I40E_MASK(0x1, I40E_PRTDCB_TCPMC_TCPM_MODE_SHIFT)
-#define I40E_PRTDCB_TCWSTC(_i)        (0x000A2040 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTDCB_TCWSTC(_i)        (0x000A2040 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRTDCB_TCWSTC_MAX_INDEX  7
 #define I40E_PRTDCB_TCWSTC_MSTC_SHIFT 0
 #define I40E_PRTDCB_TCWSTC_MSTC_MASK  I40E_MASK(0xFFFFF, I40E_PRTDCB_TCWSTC_MSTC_SHIFT)
-#define I40E_PRTDCB_TDPMC                 0x000A0180
+#define I40E_PRTDCB_TDPMC                 0x000A0180 /* Reset: CORER */
 #define I40E_PRTDCB_TDPMC_DPM_SHIFT       0
 #define I40E_PRTDCB_TDPMC_DPM_MASK        I40E_MASK(0xFF, I40E_PRTDCB_TDPMC_DPM_SHIFT)
 #define I40E_PRTDCB_TDPMC_TCPM_MODE_SHIFT 30
 #define I40E_PRTDCB_TDPMC_TCPM_MODE_MASK  I40E_MASK(0x1, I40E_PRTDCB_TDPMC_TCPM_MODE_SHIFT)
-#define I40E_PRTDCB_TETSC_TCB                             0x000AE060
+#define I40E_PRTDCB_TETSC_TCB                             0x000AE060 /* Reset: CORER */
 #define I40E_PRTDCB_TETSC_TCB_EN_LL_STRICT_PRIORITY_SHIFT 0
 #define I40E_PRTDCB_TETSC_TCB_EN_LL_STRICT_PRIORITY_MASK  I40E_MASK(0x1, I40E_PRTDCB_TETSC_TCB_EN_LL_STRICT_PRIORITY_SHIFT)
 #define I40E_PRTDCB_TETSC_TCB_LLTC_SHIFT                  8
 #define I40E_PRTDCB_TETSC_TCB_LLTC_MASK                   I40E_MASK(0xFF, I40E_PRTDCB_TETSC_TCB_LLTC_SHIFT)
-#define I40E_PRTDCB_TETSC_TPB                             0x00098060
+#define I40E_PRTDCB_TETSC_TPB                             0x00098060 /* Reset: CORER */
 #define I40E_PRTDCB_TETSC_TPB_EN_LL_STRICT_PRIORITY_SHIFT 0
 #define I40E_PRTDCB_TETSC_TPB_EN_LL_STRICT_PRIORITY_MASK  I40E_MASK(0x1, I40E_PRTDCB_TETSC_TPB_EN_LL_STRICT_PRIORITY_SHIFT)
 #define I40E_PRTDCB_TETSC_TPB_LLTC_SHIFT                  8
 #define I40E_PRTDCB_TETSC_TPB_LLTC_MASK                   I40E_MASK(0xFF, I40E_PRTDCB_TETSC_TPB_LLTC_SHIFT)
-#define I40E_PRTDCB_TFCS              0x001E4560
+#define I40E_PRTDCB_TFCS              0x001E4560 /* Reset: GLOBR */
 #define I40E_PRTDCB_TFCS_TXOFF_SHIFT  0
 #define I40E_PRTDCB_TFCS_TXOFF_MASK   I40E_MASK(0x1, I40E_PRTDCB_TFCS_TXOFF_SHIFT)
 #define I40E_PRTDCB_TFCS_TXOFF0_SHIFT 8
@@ -370,15 +371,11 @@
 #define I40E_PRTDCB_TFCS_TXOFF6_MASK  I40E_MASK(0x1, I40E_PRTDCB_TFCS_TXOFF6_SHIFT)
 #define I40E_PRTDCB_TFCS_TXOFF7_SHIFT 15
 #define I40E_PRTDCB_TFCS_TXOFF7_MASK  I40E_MASK(0x1, I40E_PRTDCB_TFCS_TXOFF7_SHIFT)
-#define I40E_PRTDCB_TFWSTC(_i)        (0x000A0040 + ((_i) * 32)) /* _i=0...7 */
-#define I40E_PRTDCB_TFWSTC_MAX_INDEX  7
-#define I40E_PRTDCB_TFWSTC_MSTC_SHIFT 0
-#define I40E_PRTDCB_TFWSTC_MSTC_MASK  I40E_MASK(0xFFFFF, I40E_PRTDCB_TFWSTC_MSTC_SHIFT)
-#define I40E_PRTDCB_TPFCTS(_i)            (0x001E4660 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTDCB_TPFCTS(_i)            (0x001E4660 + ((_i) * 32)) /* _i=0...7 */ /* Reset: GLOBR */
 #define I40E_PRTDCB_TPFCTS_MAX_INDEX      7
 #define I40E_PRTDCB_TPFCTS_PFCTIMER_SHIFT 0
 #define I40E_PRTDCB_TPFCTS_PFCTIMER_MASK  I40E_MASK(0x3FFF, I40E_PRTDCB_TPFCTS_PFCTIMER_SHIFT)
-#define I40E_GLFCOE_RCTL                0x00269B94
+#define I40E_GLFCOE_RCTL                0x00269B94 /* Reset: CORER */
 #define I40E_GLFCOE_RCTL_FCOEVER_SHIFT  0
 #define I40E_GLFCOE_RCTL_FCOEVER_MASK   I40E_MASK(0xF, I40E_GLFCOE_RCTL_FCOEVER_SHIFT)
 #define I40E_GLFCOE_RCTL_SAVBAD_SHIFT   4
@@ -387,14 +384,14 @@
 #define I40E_GLFCOE_RCTL_ICRC_MASK      I40E_MASK(0x1, I40E_GLFCOE_RCTL_ICRC_SHIFT)
 #define I40E_GLFCOE_RCTL_MAX_SIZE_SHIFT 16
 #define I40E_GLFCOE_RCTL_MAX_SIZE_MASK  I40E_MASK(0x3FFF, I40E_GLFCOE_RCTL_MAX_SIZE_SHIFT)
-#define I40E_GL_FWSTS             0x00083048
+#define I40E_GL_FWSTS             0x00083048 /* Reset: POR */
 #define I40E_GL_FWSTS_FWS0B_SHIFT 0
 #define I40E_GL_FWSTS_FWS0B_MASK  I40E_MASK(0xFF, I40E_GL_FWSTS_FWS0B_SHIFT)
 #define I40E_GL_FWSTS_FWRI_SHIFT  9
 #define I40E_GL_FWSTS_FWRI_MASK   I40E_MASK(0x1, I40E_GL_FWSTS_FWRI_SHIFT)
 #define I40E_GL_FWSTS_FWS1B_SHIFT 16
 #define I40E_GL_FWSTS_FWS1B_MASK  I40E_MASK(0xFF, I40E_GL_FWSTS_FWS1B_SHIFT)
-#define I40E_GLGEN_CLKSTAT                    0x000B8184
+#define I40E_GLGEN_CLKSTAT                    0x000B8184 /* Reset: POR */
 #define I40E_GLGEN_CLKSTAT_CLKMODE_SHIFT      0
 #define I40E_GLGEN_CLKSTAT_CLKMODE_MASK       I40E_MASK(0x1, I40E_GLGEN_CLKSTAT_CLKMODE_SHIFT)
 #define I40E_GLGEN_CLKSTAT_U_CLK_SPEED_SHIFT  4
@@ -407,7 +404,7 @@
 #define I40E_GLGEN_CLKSTAT_P2_CLK_SPEED_MASK  I40E_MASK(0x7, I40E_GLGEN_CLKSTAT_P2_CLK_SPEED_SHIFT)
 #define I40E_GLGEN_CLKSTAT_P3_CLK_SPEED_SHIFT 20
 #define I40E_GLGEN_CLKSTAT_P3_CLK_SPEED_MASK  I40E_MASK(0x7, I40E_GLGEN_CLKSTAT_P3_CLK_SPEED_SHIFT)
-#define I40E_GLGEN_GPIO_CTL(_i)                (0x00088100 + ((_i) * 4)) /* _i=0...29 */
+#define I40E_GLGEN_GPIO_CTL(_i)                (0x00088100 + ((_i) * 4)) /* _i=0...29 */ /* Reset: POR */
 #define I40E_GLGEN_GPIO_CTL_MAX_INDEX          29
 #define I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT      0
 #define I40E_GLGEN_GPIO_CTL_PRT_NUM_MASK       I40E_MASK(0x3, I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT)
@@ -426,27 +423,27 @@
 #define I40E_GLGEN_GPIO_CTL_LED_BLINK_SHIFT    11
 #define I40E_GLGEN_GPIO_CTL_LED_BLINK_MASK     I40E_MASK(0x1, I40E_GLGEN_GPIO_CTL_LED_BLINK_SHIFT)
 #define I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT     12
-#define I40E_GLGEN_GPIO_CTL_LED_MODE_MASK      I40E_MASK(0xF, I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT)
+#define I40E_GLGEN_GPIO_CTL_LED_MODE_MASK      I40E_MASK(0x1F, I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT)
 #define I40E_GLGEN_GPIO_CTL_INT_MODE_SHIFT     17
 #define I40E_GLGEN_GPIO_CTL_INT_MODE_MASK      I40E_MASK(0x3, I40E_GLGEN_GPIO_CTL_INT_MODE_SHIFT)
 #define I40E_GLGEN_GPIO_CTL_OUT_DEFAULT_SHIFT  19
 #define I40E_GLGEN_GPIO_CTL_OUT_DEFAULT_MASK   I40E_MASK(0x1, I40E_GLGEN_GPIO_CTL_OUT_DEFAULT_SHIFT)
 #define I40E_GLGEN_GPIO_CTL_PHY_PIN_NAME_SHIFT 20
 #define I40E_GLGEN_GPIO_CTL_PHY_PIN_NAME_MASK  I40E_MASK(0x3F, I40E_GLGEN_GPIO_CTL_PHY_PIN_NAME_SHIFT)
-#define I40E_GLGEN_GPIO_SET                 0x00088184
+#define I40E_GLGEN_GPIO_SET                 0x00088184 /* Reset: POR */
 #define I40E_GLGEN_GPIO_SET_GPIO_INDX_SHIFT 0
 #define I40E_GLGEN_GPIO_SET_GPIO_INDX_MASK  I40E_MASK(0x1F, I40E_GLGEN_GPIO_SET_GPIO_INDX_SHIFT)
 #define I40E_GLGEN_GPIO_SET_SDP_DATA_SHIFT  5
 #define I40E_GLGEN_GPIO_SET_SDP_DATA_MASK   I40E_MASK(0x1, I40E_GLGEN_GPIO_SET_SDP_DATA_SHIFT)
 #define I40E_GLGEN_GPIO_SET_DRIVE_SDP_SHIFT 6
 #define I40E_GLGEN_GPIO_SET_DRIVE_SDP_MASK  I40E_MASK(0x1, I40E_GLGEN_GPIO_SET_DRIVE_SDP_SHIFT)
-#define I40E_GLGEN_GPIO_STAT                  0x0008817C
+#define I40E_GLGEN_GPIO_STAT                  0x0008817C /* Reset: POR */
 #define I40E_GLGEN_GPIO_STAT_GPIO_VALUE_SHIFT 0
 #define I40E_GLGEN_GPIO_STAT_GPIO_VALUE_MASK  I40E_MASK(0x3FFFFFFF, I40E_GLGEN_GPIO_STAT_GPIO_VALUE_SHIFT)
-#define I40E_GLGEN_GPIO_TRANSIT                       0x00088180
+#define I40E_GLGEN_GPIO_TRANSIT                       0x00088180 /* Reset: POR */
 #define I40E_GLGEN_GPIO_TRANSIT_GPIO_TRANSITION_SHIFT 0
 #define I40E_GLGEN_GPIO_TRANSIT_GPIO_TRANSITION_MASK  I40E_MASK(0x3FFFFFFF, I40E_GLGEN_GPIO_TRANSIT_GPIO_TRANSITION_SHIFT)
-#define I40E_GLGEN_I2CCMD(_i)          (0x000881E0 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLGEN_I2CCMD(_i)          (0x000881E0 + ((_i) * 4)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_GLGEN_I2CCMD_MAX_INDEX    3
 #define I40E_GLGEN_I2CCMD_DATA_SHIFT   0
 #define I40E_GLGEN_I2CCMD_DATA_MASK    I40E_MASK(0xFFFF, I40E_GLGEN_I2CCMD_DATA_SHIFT)
@@ -462,7 +459,7 @@
 #define I40E_GLGEN_I2CCMD_R_MASK       I40E_MASK(0x1, I40E_GLGEN_I2CCMD_R_SHIFT)
 #define I40E_GLGEN_I2CCMD_E_SHIFT      31
 #define I40E_GLGEN_I2CCMD_E_MASK       I40E_MASK(0x1, I40E_GLGEN_I2CCMD_E_SHIFT)
-#define I40E_GLGEN_I2CPARAMS(_i)                   (0x000881AC + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLGEN_I2CPARAMS(_i)                   (0x000881AC + ((_i) * 4)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_GLGEN_I2CPARAMS_MAX_INDEX             3
 #define I40E_GLGEN_I2CPARAMS_WRITE_TIME_SHIFT      0
 #define I40E_GLGEN_I2CPARAMS_WRITE_TIME_MASK       I40E_MASK(0x1F, I40E_GLGEN_I2CPARAMS_WRITE_TIME_SHIFT)
@@ -486,10 +483,10 @@
 #define I40E_GLGEN_I2CPARAMS_CLK_STRETCH_DIS_MASK  I40E_MASK(0x1, I40E_GLGEN_I2CPARAMS_CLK_STRETCH_DIS_SHIFT)
 #define I40E_GLGEN_I2CPARAMS_I2C_DATA_ORDER_SHIFT  31
 #define I40E_GLGEN_I2CPARAMS_I2C_DATA_ORDER_MASK   I40E_MASK(0x1, I40E_GLGEN_I2CPARAMS_I2C_DATA_ORDER_SHIFT)
-#define I40E_GLGEN_LED_CTL                          0x00088178
+#define I40E_GLGEN_LED_CTL                          0x00088178 /* Reset: POR */
 #define I40E_GLGEN_LED_CTL_GLOBAL_BLINK_MODE_SHIFT  0
 #define I40E_GLGEN_LED_CTL_GLOBAL_BLINK_MODE_MASK   I40E_MASK(0x1, I40E_GLGEN_LED_CTL_GLOBAL_BLINK_MODE_SHIFT)
-#define I40E_GLGEN_MDIO_CTRL(_i)                (0x000881D0 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLGEN_MDIO_CTRL(_i)                (0x000881D0 + ((_i) * 4)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_GLGEN_MDIO_CTRL_MAX_INDEX          3
 #define I40E_GLGEN_MDIO_CTRL_LEGACY_RSVD2_SHIFT 0
 #define I40E_GLGEN_MDIO_CTRL_LEGACY_RSVD2_MASK  I40E_MASK(0x1FFFF, I40E_GLGEN_MDIO_CTRL_LEGACY_RSVD2_SHIFT)
@@ -497,7 +494,7 @@
 #define I40E_GLGEN_MDIO_CTRL_CONTMDC_MASK       I40E_MASK(0x1, I40E_GLGEN_MDIO_CTRL_CONTMDC_SHIFT)
 #define I40E_GLGEN_MDIO_CTRL_LEGACY_RSVD1_SHIFT 18
 #define I40E_GLGEN_MDIO_CTRL_LEGACY_RSVD1_MASK  I40E_MASK(0x3FFF, I40E_GLGEN_MDIO_CTRL_LEGACY_RSVD1_SHIFT)
-#define I40E_GLGEN_MDIO_I2C_SEL(_i)                (0x000881C0 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLGEN_MDIO_I2C_SEL(_i)                (0x000881C0 + ((_i) * 4)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_GLGEN_MDIO_I2C_SEL_MAX_INDEX          3
 #define I40E_GLGEN_MDIO_I2C_SEL_MDIO_I2C_SEL_SHIFT 0
 #define I40E_GLGEN_MDIO_I2C_SEL_MDIO_I2C_SEL_MASK  I40E_MASK(0x1, I40E_GLGEN_MDIO_I2C_SEL_MDIO_I2C_SEL_SHIFT)
@@ -515,7 +512,7 @@
 #define I40E_GLGEN_MDIO_I2C_SEL_MDIO_IF_MODE_MASK  I40E_MASK(0xF, I40E_GLGEN_MDIO_I2C_SEL_MDIO_IF_MODE_SHIFT)
 #define I40E_GLGEN_MDIO_I2C_SEL_EN_FAST_MODE_SHIFT 31
 #define I40E_GLGEN_MDIO_I2C_SEL_EN_FAST_MODE_MASK  I40E_MASK(0x1, I40E_GLGEN_MDIO_I2C_SEL_EN_FAST_MODE_SHIFT)
-#define I40E_GLGEN_MSCA(_i)               (0x0008818C + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLGEN_MSCA(_i)               (0x0008818C + ((_i) * 4)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_GLGEN_MSCA_MAX_INDEX         3
 #define I40E_GLGEN_MSCA_MDIADD_SHIFT      0
 #define I40E_GLGEN_MSCA_MDIADD_MASK       I40E_MASK(0xFFFF, I40E_GLGEN_MSCA_MDIADD_SHIFT)
@@ -531,18 +528,18 @@
 #define I40E_GLGEN_MSCA_MDICMD_MASK       I40E_MASK(0x1, I40E_GLGEN_MSCA_MDICMD_SHIFT)
 #define I40E_GLGEN_MSCA_MDIINPROGEN_SHIFT 31
 #define I40E_GLGEN_MSCA_MDIINPROGEN_MASK  I40E_MASK(0x1, I40E_GLGEN_MSCA_MDIINPROGEN_SHIFT)
-#define I40E_GLGEN_MSRWD(_i)             (0x0008819C + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLGEN_MSRWD(_i)             (0x0008819C + ((_i) * 4)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_GLGEN_MSRWD_MAX_INDEX       3
 #define I40E_GLGEN_MSRWD_MDIWRDATA_SHIFT 0
 #define I40E_GLGEN_MSRWD_MDIWRDATA_MASK  I40E_MASK(0xFFFF, I40E_GLGEN_MSRWD_MDIWRDATA_SHIFT)
 #define I40E_GLGEN_MSRWD_MDIRDDATA_SHIFT 16
 #define I40E_GLGEN_MSRWD_MDIRDDATA_MASK  I40E_MASK(0xFFFF, I40E_GLGEN_MSRWD_MDIRDDATA_SHIFT)
-#define I40E_GLGEN_PCIFCNCNT                0x001C0AB4
+#define I40E_GLGEN_PCIFCNCNT                0x001C0AB4 /* Reset: PCIR */
 #define I40E_GLGEN_PCIFCNCNT_PCIPFCNT_SHIFT 0
 #define I40E_GLGEN_PCIFCNCNT_PCIPFCNT_MASK  I40E_MASK(0x1F, I40E_GLGEN_PCIFCNCNT_PCIPFCNT_SHIFT)
 #define I40E_GLGEN_PCIFCNCNT_PCIVFCNT_SHIFT 16
 #define I40E_GLGEN_PCIFCNCNT_PCIVFCNT_MASK  I40E_MASK(0xFF, I40E_GLGEN_PCIFCNCNT_PCIVFCNT_SHIFT)
-#define I40E_GLGEN_RSTAT                   0x000B8188
+#define I40E_GLGEN_RSTAT                   0x000B8188 /* Reset: POR */
 #define I40E_GLGEN_RSTAT_DEVSTATE_SHIFT    0
 #define I40E_GLGEN_RSTAT_DEVSTATE_MASK     I40E_MASK(0x3, I40E_GLGEN_RSTAT_DEVSTATE_SHIFT)
 #define I40E_GLGEN_RSTAT_RESET_TYPE_SHIFT  2
@@ -555,22 +552,22 @@
 #define I40E_GLGEN_RSTAT_EMPRCNT_MASK      I40E_MASK(0x3, I40E_GLGEN_RSTAT_EMPRCNT_SHIFT)
 #define I40E_GLGEN_RSTAT_TIME_TO_RST_SHIFT 10
 #define I40E_GLGEN_RSTAT_TIME_TO_RST_MASK  I40E_MASK(0x3F, I40E_GLGEN_RSTAT_TIME_TO_RST_SHIFT)
-#define I40E_GLGEN_RSTCTL                   0x000B8180
+#define I40E_GLGEN_RSTCTL                   0x000B8180 /* Reset: POR */
 #define I40E_GLGEN_RSTCTL_GRSTDEL_SHIFT     0
 #define I40E_GLGEN_RSTCTL_GRSTDEL_MASK      I40E_MASK(0x3F, I40E_GLGEN_RSTCTL_GRSTDEL_SHIFT)
 #define I40E_GLGEN_RSTCTL_ECC_RST_ENA_SHIFT 8
 #define I40E_GLGEN_RSTCTL_ECC_RST_ENA_MASK  I40E_MASK(0x1, I40E_GLGEN_RSTCTL_ECC_RST_ENA_SHIFT)
-#define I40E_GLGEN_RSTENA_EMP                   0x000B818C
+#define I40E_GLGEN_RSTENA_EMP                   0x000B818C /* Reset: POR */
 #define I40E_GLGEN_RSTENA_EMP_EMP_RST_ENA_SHIFT 0
 #define I40E_GLGEN_RSTENA_EMP_EMP_RST_ENA_MASK  I40E_MASK(0x1, I40E_GLGEN_RSTENA_EMP_EMP_RST_ENA_SHIFT)
-#define I40E_GLGEN_RTRIG              0x000B8190
+#define I40E_GLGEN_RTRIG              0x000B8190 /* Reset: CORER */
 #define I40E_GLGEN_RTRIG_CORER_SHIFT  0
 #define I40E_GLGEN_RTRIG_CORER_MASK   I40E_MASK(0x1, I40E_GLGEN_RTRIG_CORER_SHIFT)
 #define I40E_GLGEN_RTRIG_GLOBR_SHIFT  1
 #define I40E_GLGEN_RTRIG_GLOBR_MASK   I40E_MASK(0x1, I40E_GLGEN_RTRIG_GLOBR_SHIFT)
 #define I40E_GLGEN_RTRIG_EMPFWR_SHIFT 2
 #define I40E_GLGEN_RTRIG_EMPFWR_MASK  I40E_MASK(0x1, I40E_GLGEN_RTRIG_EMPFWR_SHIFT)
-#define I40E_GLGEN_STAT               0x000B612C
+#define I40E_GLGEN_STAT               0x000B612C /* Reset: POR */
 #define I40E_GLGEN_STAT_HWRSVD0_SHIFT 0
 #define I40E_GLGEN_STAT_HWRSVD0_MASK  I40E_MASK(0x3, I40E_GLGEN_STAT_HWRSVD0_SHIFT)
 #define I40E_GLGEN_STAT_DCBEN_SHIFT   2
@@ -583,23 +580,23 @@
 #define I40E_GLGEN_STAT_EVBEN_MASK    I40E_MASK(0x1, I40E_GLGEN_STAT_EVBEN_SHIFT)
 #define I40E_GLGEN_STAT_HWRSVD1_SHIFT 6
 #define I40E_GLGEN_STAT_HWRSVD1_MASK  I40E_MASK(0x3, I40E_GLGEN_STAT_HWRSVD1_SHIFT)
-#define I40E_GLGEN_VFLRSTAT(_i)         (0x00092600 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLGEN_VFLRSTAT(_i)         (0x00092600 + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLGEN_VFLRSTAT_MAX_INDEX   3
 #define I40E_GLGEN_VFLRSTAT_VFLRE_SHIFT 0
 #define I40E_GLGEN_VFLRSTAT_VFLRE_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLGEN_VFLRSTAT_VFLRE_SHIFT)
-#define I40E_GLVFGEN_TIMER             0x000881BC
+#define I40E_GLVFGEN_TIMER             0x000881BC /* Reset: CORER */
 #define I40E_GLVFGEN_TIMER_GTIME_SHIFT 0
 #define I40E_GLVFGEN_TIMER_GTIME_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLVFGEN_TIMER_GTIME_SHIFT)
-#define I40E_PFGEN_CTRL             0x00092400
+#define I40E_PFGEN_CTRL             0x00092400 /* Reset: PFR */
 #define I40E_PFGEN_CTRL_PFSWR_SHIFT 0
 #define I40E_PFGEN_CTRL_PFSWR_MASK  I40E_MASK(0x1, I40E_PFGEN_CTRL_PFSWR_SHIFT)
-#define I40E_PFGEN_DRUN               0x00092500
+#define I40E_PFGEN_DRUN               0x00092500 /* Reset: CORER */
 #define I40E_PFGEN_DRUN_DRVUNLD_SHIFT 0
 #define I40E_PFGEN_DRUN_DRVUNLD_MASK  I40E_MASK(0x1, I40E_PFGEN_DRUN_DRVUNLD_SHIFT)
-#define I40E_PFGEN_PORTNUM                0x001C0480
+#define I40E_PFGEN_PORTNUM                0x001C0480 /* Reset: CORER */
 #define I40E_PFGEN_PORTNUM_PORT_NUM_SHIFT 0
 #define I40E_PFGEN_PORTNUM_PORT_NUM_MASK  I40E_MASK(0x3, I40E_PFGEN_PORTNUM_PORT_NUM_SHIFT)
-#define I40E_PFGEN_STATE                  0x00088000
+#define I40E_PFGEN_STATE                  0x00088000 /* Reset: CORER */
 #define I40E_PFGEN_STATE_RESERVED_0_SHIFT 0
 #define I40E_PFGEN_STATE_RESERVED_0_MASK  I40E_MASK(0x1, I40E_PFGEN_STATE_RESERVED_0_SHIFT)
 #define I40E_PFGEN_STATE_PFFCEN_SHIFT     1
@@ -608,140 +605,140 @@
 #define I40E_PFGEN_STATE_PFLINKEN_MASK    I40E_MASK(0x1, I40E_PFGEN_STATE_PFLINKEN_SHIFT)
 #define I40E_PFGEN_STATE_PFSCEN_SHIFT     3
 #define I40E_PFGEN_STATE_PFSCEN_MASK      I40E_MASK(0x1, I40E_PFGEN_STATE_PFSCEN_SHIFT)
-#define I40E_PRTGEN_CNF                      0x000B8120
+#define I40E_PRTGEN_CNF                      0x000B8120 /* Reset: POR */
 #define I40E_PRTGEN_CNF_PORT_DIS_SHIFT       0
 #define I40E_PRTGEN_CNF_PORT_DIS_MASK        I40E_MASK(0x1, I40E_PRTGEN_CNF_PORT_DIS_SHIFT)
 #define I40E_PRTGEN_CNF_ALLOW_PORT_DIS_SHIFT 1
 #define I40E_PRTGEN_CNF_ALLOW_PORT_DIS_MASK  I40E_MASK(0x1, I40E_PRTGEN_CNF_ALLOW_PORT_DIS_SHIFT)
 #define I40E_PRTGEN_CNF_EMP_PORT_DIS_SHIFT   2
 #define I40E_PRTGEN_CNF_EMP_PORT_DIS_MASK    I40E_MASK(0x1, I40E_PRTGEN_CNF_EMP_PORT_DIS_SHIFT)
-#define I40E_PRTGEN_CNF2                          0x000B8160
+#define I40E_PRTGEN_CNF2                          0x000B8160 /* Reset: POR */
 #define I40E_PRTGEN_CNF2_ACTIVATE_PORT_LINK_SHIFT 0
 #define I40E_PRTGEN_CNF2_ACTIVATE_PORT_LINK_MASK  I40E_MASK(0x1, I40E_PRTGEN_CNF2_ACTIVATE_PORT_LINK_SHIFT)
-#define I40E_PRTGEN_STATUS                   0x000B8100
+#define I40E_PRTGEN_STATUS                   0x000B8100 /* Reset: POR */
 #define I40E_PRTGEN_STATUS_PORT_VALID_SHIFT  0
 #define I40E_PRTGEN_STATUS_PORT_VALID_MASK   I40E_MASK(0x1, I40E_PRTGEN_STATUS_PORT_VALID_SHIFT)
 #define I40E_PRTGEN_STATUS_PORT_ACTIVE_SHIFT 1
 #define I40E_PRTGEN_STATUS_PORT_ACTIVE_MASK  I40E_MASK(0x1, I40E_PRTGEN_STATUS_PORT_ACTIVE_SHIFT)
-#define I40E_VFGEN_RSTAT1(_VF)            (0x00074400 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VFGEN_RSTAT1(_VF)            (0x00074400 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: VFR */
 #define I40E_VFGEN_RSTAT1_MAX_INDEX       127
 #define I40E_VFGEN_RSTAT1_VFR_STATE_SHIFT 0
 #define I40E_VFGEN_RSTAT1_VFR_STATE_MASK  I40E_MASK(0x3, I40E_VFGEN_RSTAT1_VFR_STATE_SHIFT)
-#define I40E_VPGEN_VFRSTAT(_VF)       (0x00091C00 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VPGEN_VFRSTAT(_VF)       (0x00091C00 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_VPGEN_VFRSTAT_MAX_INDEX  127
 #define I40E_VPGEN_VFRSTAT_VFRD_SHIFT 0
 #define I40E_VPGEN_VFRSTAT_VFRD_MASK  I40E_MASK(0x1, I40E_VPGEN_VFRSTAT_VFRD_SHIFT)
-#define I40E_VPGEN_VFRTRIG(_VF)        (0x00091800 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VPGEN_VFRTRIG(_VF)        (0x00091800 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_VPGEN_VFRTRIG_MAX_INDEX   127
 #define I40E_VPGEN_VFRTRIG_VFSWR_SHIFT 0
 #define I40E_VPGEN_VFRTRIG_VFSWR_MASK  I40E_MASK(0x1, I40E_VPGEN_VFRTRIG_VFSWR_SHIFT)
-#define I40E_VSIGEN_RSTAT(_VSI)      (0x00090800 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSIGEN_RSTAT(_VSI)      (0x00090800 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_VSIGEN_RSTAT_MAX_INDEX  383
 #define I40E_VSIGEN_RSTAT_VMRD_SHIFT 0
 #define I40E_VSIGEN_RSTAT_VMRD_MASK  I40E_MASK(0x1, I40E_VSIGEN_RSTAT_VMRD_SHIFT)
-#define I40E_VSIGEN_RTRIG(_VSI)       (0x00090000 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSIGEN_RTRIG(_VSI)       (0x00090000 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_VSIGEN_RTRIG_MAX_INDEX   383
 #define I40E_VSIGEN_RTRIG_VMSWR_SHIFT 0
 #define I40E_VSIGEN_RTRIG_VMSWR_MASK  I40E_MASK(0x1, I40E_VSIGEN_RTRIG_VMSWR_SHIFT)
-#define I40E_GLHMC_FCOEDDPBASE(_i)                  (0x000C6600 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_FCOEDDPBASE(_i)                  (0x000C6600 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_FCOEDDPBASE_MAX_INDEX            15
 #define I40E_GLHMC_FCOEDDPBASE_FPMFCOEDDPBASE_SHIFT 0
 #define I40E_GLHMC_FCOEDDPBASE_FPMFCOEDDPBASE_MASK  I40E_MASK(0xFFFFFF, I40E_GLHMC_FCOEDDPBASE_FPMFCOEDDPBASE_SHIFT)
-#define I40E_GLHMC_FCOEDDPCNT(_i)                 (0x000C6700 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_FCOEDDPCNT(_i)                 (0x000C6700 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_FCOEDDPCNT_MAX_INDEX           15
 #define I40E_GLHMC_FCOEDDPCNT_FPMFCOEDDPCNT_SHIFT 0
 #define I40E_GLHMC_FCOEDDPCNT_FPMFCOEDDPCNT_MASK  I40E_MASK(0xFFFFF, I40E_GLHMC_FCOEDDPCNT_FPMFCOEDDPCNT_SHIFT)
-#define I40E_GLHMC_FCOEDDPOBJSZ                      0x000C2010
+#define I40E_GLHMC_FCOEDDPOBJSZ                      0x000C2010 /* Reset: CORER */
 #define I40E_GLHMC_FCOEDDPOBJSZ_PMFCOEDDPOBJSZ_SHIFT 0
 #define I40E_GLHMC_FCOEDDPOBJSZ_PMFCOEDDPOBJSZ_MASK  I40E_MASK(0xF, I40E_GLHMC_FCOEDDPOBJSZ_PMFCOEDDPOBJSZ_SHIFT)
-#define I40E_GLHMC_FCOEFBASE(_i)                (0x000C6800 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_FCOEFBASE(_i)                (0x000C6800 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_FCOEFBASE_MAX_INDEX          15
 #define I40E_GLHMC_FCOEFBASE_FPMFCOEFBASE_SHIFT 0
 #define I40E_GLHMC_FCOEFBASE_FPMFCOEFBASE_MASK  I40E_MASK(0xFFFFFF, I40E_GLHMC_FCOEFBASE_FPMFCOEFBASE_SHIFT)
-#define I40E_GLHMC_FCOEFCNT(_i)               (0x000C6900 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_FCOEFCNT(_i)               (0x000C6900 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_FCOEFCNT_MAX_INDEX         15
 #define I40E_GLHMC_FCOEFCNT_FPMFCOEFCNT_SHIFT 0
 #define I40E_GLHMC_FCOEFCNT_FPMFCOEFCNT_MASK  I40E_MASK(0x7FFFFF, I40E_GLHMC_FCOEFCNT_FPMFCOEFCNT_SHIFT)
-#define I40E_GLHMC_FCOEFMAX                  0x000C20D0
+#define I40E_GLHMC_FCOEFMAX                  0x000C20D0 /* Reset: CORER */
 #define I40E_GLHMC_FCOEFMAX_PMFCOEFMAX_SHIFT 0
 #define I40E_GLHMC_FCOEFMAX_PMFCOEFMAX_MASK  I40E_MASK(0xFFFF, I40E_GLHMC_FCOEFMAX_PMFCOEFMAX_SHIFT)
-#define I40E_GLHMC_FCOEFOBJSZ                    0x000C2018
+#define I40E_GLHMC_FCOEFOBJSZ                    0x000C2018 /* Reset: CORER */
 #define I40E_GLHMC_FCOEFOBJSZ_PMFCOEFOBJSZ_SHIFT 0
 #define I40E_GLHMC_FCOEFOBJSZ_PMFCOEFOBJSZ_MASK  I40E_MASK(0xF, I40E_GLHMC_FCOEFOBJSZ_PMFCOEFOBJSZ_SHIFT)
-#define I40E_GLHMC_FCOEMAX                 0x000C2014
+#define I40E_GLHMC_FCOEMAX                 0x000C2014 /* Reset: CORER */
 #define I40E_GLHMC_FCOEMAX_PMFCOEMAX_SHIFT 0
 #define I40E_GLHMC_FCOEMAX_PMFCOEMAX_MASK  I40E_MASK(0x1FFF, I40E_GLHMC_FCOEMAX_PMFCOEMAX_SHIFT)
-#define I40E_GLHMC_FSIAVBASE(_i)                (0x000C5600 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_FSIAVBASE(_i)                (0x000C5600 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_FSIAVBASE_MAX_INDEX          15
 #define I40E_GLHMC_FSIAVBASE_FPMFSIAVBASE_SHIFT 0
 #define I40E_GLHMC_FSIAVBASE_FPMFSIAVBASE_MASK  I40E_MASK(0xFFFFFF, I40E_GLHMC_FSIAVBASE_FPMFSIAVBASE_SHIFT)
-#define I40E_GLHMC_FSIAVCNT(_i)               (0x000C5700 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_FSIAVCNT(_i)               (0x000C5700 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_FSIAVCNT_MAX_INDEX         15
 #define I40E_GLHMC_FSIAVCNT_FPMFSIAVCNT_SHIFT 0
 #define I40E_GLHMC_FSIAVCNT_FPMFSIAVCNT_MASK  I40E_MASK(0x1FFFFFFF, I40E_GLHMC_FSIAVCNT_FPMFSIAVCNT_SHIFT)
 #define I40E_GLHMC_FSIAVCNT_RSVD_SHIFT        29
 #define I40E_GLHMC_FSIAVCNT_RSVD_MASK         I40E_MASK(0x7, I40E_GLHMC_FSIAVCNT_RSVD_SHIFT)
-#define I40E_GLHMC_FSIAVMAX                  0x000C2068
+#define I40E_GLHMC_FSIAVMAX                  0x000C2068 /* Reset: CORER */
 #define I40E_GLHMC_FSIAVMAX_PMFSIAVMAX_SHIFT 0
 #define I40E_GLHMC_FSIAVMAX_PMFSIAVMAX_MASK  I40E_MASK(0x1FFFF, I40E_GLHMC_FSIAVMAX_PMFSIAVMAX_SHIFT)
-#define I40E_GLHMC_FSIAVOBJSZ                    0x000C2064
+#define I40E_GLHMC_FSIAVOBJSZ                    0x000C2064 /* Reset: CORER */
 #define I40E_GLHMC_FSIAVOBJSZ_PMFSIAVOBJSZ_SHIFT 0
 #define I40E_GLHMC_FSIAVOBJSZ_PMFSIAVOBJSZ_MASK  I40E_MASK(0xF, I40E_GLHMC_FSIAVOBJSZ_PMFSIAVOBJSZ_SHIFT)
-#define I40E_GLHMC_FSIMCBASE(_i)                (0x000C6000 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_FSIMCBASE(_i)                (0x000C6000 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_FSIMCBASE_MAX_INDEX          15
 #define I40E_GLHMC_FSIMCBASE_FPMFSIMCBASE_SHIFT 0
 #define I40E_GLHMC_FSIMCBASE_FPMFSIMCBASE_MASK  I40E_MASK(0xFFFFFF, I40E_GLHMC_FSIMCBASE_FPMFSIMCBASE_SHIFT)
-#define I40E_GLHMC_FSIMCCNT(_i)              (0x000C6100 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_FSIMCCNT(_i)              (0x000C6100 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_FSIMCCNT_MAX_INDEX        15
 #define I40E_GLHMC_FSIMCCNT_FPMFSIMCSZ_SHIFT 0
 #define I40E_GLHMC_FSIMCCNT_FPMFSIMCSZ_MASK  I40E_MASK(0x1FFFFFFF, I40E_GLHMC_FSIMCCNT_FPMFSIMCSZ_SHIFT)
-#define I40E_GLHMC_FSIMCMAX                  0x000C2060
+#define I40E_GLHMC_FSIMCMAX                  0x000C2060 /* Reset: CORER */
 #define I40E_GLHMC_FSIMCMAX_PMFSIMCMAX_SHIFT 0
 #define I40E_GLHMC_FSIMCMAX_PMFSIMCMAX_MASK  I40E_MASK(0x3FFF, I40E_GLHMC_FSIMCMAX_PMFSIMCMAX_SHIFT)
-#define I40E_GLHMC_FSIMCOBJSZ                    0x000C205c
+#define I40E_GLHMC_FSIMCOBJSZ                    0x000C205c /* Reset: CORER */
 #define I40E_GLHMC_FSIMCOBJSZ_PMFSIMCOBJSZ_SHIFT 0
 #define I40E_GLHMC_FSIMCOBJSZ_PMFSIMCOBJSZ_MASK  I40E_MASK(0xF, I40E_GLHMC_FSIMCOBJSZ_PMFSIMCOBJSZ_SHIFT)
-#define I40E_GLHMC_LANQMAX                 0x000C2008
+#define I40E_GLHMC_LANQMAX                 0x000C2008 /* Reset: CORER */
 #define I40E_GLHMC_LANQMAX_PMLANQMAX_SHIFT 0
 #define I40E_GLHMC_LANQMAX_PMLANQMAX_MASK  I40E_MASK(0x7FF, I40E_GLHMC_LANQMAX_PMLANQMAX_SHIFT)
-#define I40E_GLHMC_LANRXBASE(_i)                (0x000C6400 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_LANRXBASE(_i)                (0x000C6400 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_LANRXBASE_MAX_INDEX          15
 #define I40E_GLHMC_LANRXBASE_FPMLANRXBASE_SHIFT 0
 #define I40E_GLHMC_LANRXBASE_FPMLANRXBASE_MASK  I40E_MASK(0xFFFFFF, I40E_GLHMC_LANRXBASE_FPMLANRXBASE_SHIFT)
-#define I40E_GLHMC_LANRXCNT(_i)               (0x000C6500 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_LANRXCNT(_i)               (0x000C6500 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_LANRXCNT_MAX_INDEX         15
 #define I40E_GLHMC_LANRXCNT_FPMLANRXCNT_SHIFT 0
 #define I40E_GLHMC_LANRXCNT_FPMLANRXCNT_MASK  I40E_MASK(0x7FF, I40E_GLHMC_LANRXCNT_FPMLANRXCNT_SHIFT)
-#define I40E_GLHMC_LANRXOBJSZ                    0x000C200c
+#define I40E_GLHMC_LANRXOBJSZ                    0x000C200c /* Reset: CORER */
 #define I40E_GLHMC_LANRXOBJSZ_PMLANRXOBJSZ_SHIFT 0
 #define I40E_GLHMC_LANRXOBJSZ_PMLANRXOBJSZ_MASK  I40E_MASK(0xF, I40E_GLHMC_LANRXOBJSZ_PMLANRXOBJSZ_SHIFT)
-#define I40E_GLHMC_LANTXBASE(_i)                (0x000C6200 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_LANTXBASE(_i)                (0x000C6200 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_LANTXBASE_MAX_INDEX          15
 #define I40E_GLHMC_LANTXBASE_FPMLANTXBASE_SHIFT 0
 #define I40E_GLHMC_LANTXBASE_FPMLANTXBASE_MASK  I40E_MASK(0xFFFFFF, I40E_GLHMC_LANTXBASE_FPMLANTXBASE_SHIFT)
 #define I40E_GLHMC_LANTXBASE_RSVD_SHIFT         24
 #define I40E_GLHMC_LANTXBASE_RSVD_MASK          I40E_MASK(0xFF, I40E_GLHMC_LANTXBASE_RSVD_SHIFT)
-#define I40E_GLHMC_LANTXCNT(_i)               (0x000C6300 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_LANTXCNT(_i)               (0x000C6300 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_LANTXCNT_MAX_INDEX         15
 #define I40E_GLHMC_LANTXCNT_FPMLANTXCNT_SHIFT 0
 #define I40E_GLHMC_LANTXCNT_FPMLANTXCNT_MASK  I40E_MASK(0x7FF, I40E_GLHMC_LANTXCNT_FPMLANTXCNT_SHIFT)
-#define I40E_GLHMC_LANTXOBJSZ                    0x000C2004
+#define I40E_GLHMC_LANTXOBJSZ                    0x000C2004 /* Reset: CORER */
 #define I40E_GLHMC_LANTXOBJSZ_PMLANTXOBJSZ_SHIFT 0
 #define I40E_GLHMC_LANTXOBJSZ_PMLANTXOBJSZ_MASK  I40E_MASK(0xF, I40E_GLHMC_LANTXOBJSZ_PMLANTXOBJSZ_SHIFT)
-#define I40E_GLHMC_PFASSIGN(_i)                 (0x000C0c00 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_PFASSIGN(_i)                 (0x000C0c00 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_PFASSIGN_MAX_INDEX           15
 #define I40E_GLHMC_PFASSIGN_PMFCNPFASSIGN_SHIFT 0
 #define I40E_GLHMC_PFASSIGN_PMFCNPFASSIGN_MASK  I40E_MASK(0xF, I40E_GLHMC_PFASSIGN_PMFCNPFASSIGN_SHIFT)
-#define I40E_GLHMC_SDPART(_i)            (0x000C0800 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_SDPART(_i)            (0x000C0800 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_SDPART_MAX_INDEX      15
 #define I40E_GLHMC_SDPART_PMSDBASE_SHIFT 0
 #define I40E_GLHMC_SDPART_PMSDBASE_MASK  I40E_MASK(0xFFF, I40E_GLHMC_SDPART_PMSDBASE_SHIFT)
 #define I40E_GLHMC_SDPART_PMSDSIZE_SHIFT 16
 #define I40E_GLHMC_SDPART_PMSDSIZE_MASK  I40E_MASK(0x1FFF, I40E_GLHMC_SDPART_PMSDSIZE_SHIFT)
-#define I40E_PFHMC_ERRORDATA                      0x000C0500
+#define I40E_PFHMC_ERRORDATA                      0x000C0500 /* Reset: PFR */
 #define I40E_PFHMC_ERRORDATA_HMC_ERROR_DATA_SHIFT 0
 #define I40E_PFHMC_ERRORDATA_HMC_ERROR_DATA_MASK  I40E_MASK(0x3FFFFFFF, I40E_PFHMC_ERRORDATA_HMC_ERROR_DATA_SHIFT)
-#define I40E_PFHMC_ERRORINFO                       0x000C0400
+#define I40E_PFHMC_ERRORINFO                       0x000C0400 /* Reset: PFR */
 #define I40E_PFHMC_ERRORINFO_PMF_INDEX_SHIFT       0
 #define I40E_PFHMC_ERRORINFO_PMF_INDEX_MASK        I40E_MASK(0x1F, I40E_PFHMC_ERRORINFO_PMF_INDEX_SHIFT)
 #define I40E_PFHMC_ERRORINFO_PMF_ISVF_SHIFT        7
@@ -752,20 +749,20 @@
 #define I40E_PFHMC_ERRORINFO_HMC_OBJECT_TYPE_MASK  I40E_MASK(0x1F, I40E_PFHMC_ERRORINFO_HMC_OBJECT_TYPE_SHIFT)
 #define I40E_PFHMC_ERRORINFO_ERROR_DETECTED_SHIFT  31
 #define I40E_PFHMC_ERRORINFO_ERROR_DETECTED_MASK   I40E_MASK(0x1, I40E_PFHMC_ERRORINFO_ERROR_DETECTED_SHIFT)
-#define I40E_PFHMC_PDINV               0x000C0300
+#define I40E_PFHMC_PDINV               0x000C0300 /* Reset: PFR */
 #define I40E_PFHMC_PDINV_PMSDIDX_SHIFT 0
 #define I40E_PFHMC_PDINV_PMSDIDX_MASK  I40E_MASK(0xFFF, I40E_PFHMC_PDINV_PMSDIDX_SHIFT)
 #define I40E_PFHMC_PDINV_PMPDIDX_SHIFT 16
 #define I40E_PFHMC_PDINV_PMPDIDX_MASK  I40E_MASK(0x1FF, I40E_PFHMC_PDINV_PMPDIDX_SHIFT)
-#define I40E_PFHMC_SDCMD               0x000C0000
+#define I40E_PFHMC_SDCMD               0x000C0000 /* Reset: PFR */
 #define I40E_PFHMC_SDCMD_PMSDIDX_SHIFT 0
 #define I40E_PFHMC_SDCMD_PMSDIDX_MASK  I40E_MASK(0xFFF, I40E_PFHMC_SDCMD_PMSDIDX_SHIFT)
 #define I40E_PFHMC_SDCMD_PMSDWR_SHIFT  31
 #define I40E_PFHMC_SDCMD_PMSDWR_MASK   I40E_MASK(0x1, I40E_PFHMC_SDCMD_PMSDWR_SHIFT)
-#define I40E_PFHMC_SDDATAHIGH                    0x000C0200
+#define I40E_PFHMC_SDDATAHIGH                    0x000C0200 /* Reset: PFR */
 #define I40E_PFHMC_SDDATAHIGH_PMSDDATAHIGH_SHIFT 0
 #define I40E_PFHMC_SDDATAHIGH_PMSDDATAHIGH_MASK  I40E_MASK(0xFFFFFFFF, I40E_PFHMC_SDDATAHIGH_PMSDDATAHIGH_SHIFT)
-#define I40E_PFHMC_SDDATALOW                   0x000C0100
+#define I40E_PFHMC_SDDATALOW                   0x000C0100 /* Reset: PFR */
 #define I40E_PFHMC_SDDATALOW_PMSDVALID_SHIFT   0
 #define I40E_PFHMC_SDDATALOW_PMSDVALID_MASK    I40E_MASK(0x1, I40E_PFHMC_SDDATALOW_PMSDVALID_SHIFT)
 #define I40E_PFHMC_SDDATALOW_PMSDTYPE_SHIFT    1
@@ -774,220 +771,11 @@
 #define I40E_PFHMC_SDDATALOW_PMSDBPCOUNT_MASK  I40E_MASK(0x3FF, I40E_PFHMC_SDDATALOW_PMSDBPCOUNT_SHIFT)
 #define I40E_PFHMC_SDDATALOW_PMSDDATALOW_SHIFT 12
 #define I40E_PFHMC_SDDATALOW_PMSDDATALOW_MASK  I40E_MASK(0xFFFFF, I40E_PFHMC_SDDATALOW_PMSDDATALOW_SHIFT)
-#define I40E_GL_DBG_DATA                   0x0026998C
-#define I40E_GL_DBG_DATA_GL_DBG_DATA_SHIFT 0
-#define I40E_GL_DBG_DATA_GL_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_DBG_DATA_GL_DBG_DATA_SHIFT)
-#define I40E_GLQF_ABORT_MASK(_i)                   (0x0026CCC8 + ((_i) * 4)) /* _i=0...1 */
-#define I40E_GLQF_ABORT_MASK_MAX_INDEX             1
-#define I40E_GLQF_ABORT_MASK_GLQF_ABORT_MASK_SHIFT 0
-#define I40E_GLQF_ABORT_MASK_GLQF_ABORT_MASK_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLQF_ABORT_MASK_GLQF_ABORT_MASK_SHIFT)
-#define I40E_GLQF_L2_MAP(_i)               (0x0026CBF8 + ((_i) * 4)) /* _i=0...1 */
-#define I40E_GLQF_L2_MAP_MAX_INDEX         1
-#define I40E_GLQF_L2_MAP_GLQF_L2_MAP_SHIFT 0
-#define I40E_GLQF_L2_MAP_GLQF_L2_MAP_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLQF_L2_MAP_GLQF_L2_MAP_SHIFT)
-#define I40E_GLQF_OPT_MAP                   0x0026CBDC
-#define I40E_GLQF_OPT_MAP_FRAG_IDX_SHIFT    0
-#define I40E_GLQF_OPT_MAP_FRAG_IDX_MASK     I40E_MASK(0x3F, I40E_GLQF_OPT_MAP_FRAG_IDX_SHIFT)
-#define I40E_GLQF_OPT_MAP_IP_OPT_IDX_SHIFT  12
-#define I40E_GLQF_OPT_MAP_IP_OPT_IDX_MASK   I40E_MASK(0x3F, I40E_GLQF_OPT_MAP_IP_OPT_IDX_SHIFT)
-#define I40E_GLQF_OPT_MAP_TCP_OPT_IDX_SHIFT 18
-#define I40E_GLQF_OPT_MAP_TCP_OPT_IDX_MASK  I40E_MASK(0x3F, I40E_GLQF_OPT_MAP_TCP_OPT_IDX_SHIFT)
-#define I40E_GLRCB_DBG_DATA0                0x00122628
-#define I40E_GLRCB_DBG_DATA0_DBG_DATA_SHIFT 0
-#define I40E_GLRCB_DBG_DATA0_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCB_DBG_DATA0_DBG_DATA_SHIFT)
-#define I40E_GLRCB_DBG_DATA1                0x0012262C
-#define I40E_GLRCB_DBG_DATA1_DBG_DATA_SHIFT 0
-#define I40E_GLRCB_DBG_DATA1_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCB_DBG_DATA1_DBG_DATA_SHIFT)
-#define I40E_GLRCB_DBG_DATA2                0x00122630
-#define I40E_GLRCB_DBG_DATA2_DBG_DATA_SHIFT 0
-#define I40E_GLRCB_DBG_DATA2_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCB_DBG_DATA2_DBG_DATA_SHIFT)
-#define I40E_GLRCB_DBG_DATA3                0x00122634
-#define I40E_GLRCB_DBG_DATA3_DBG_DATA_SHIFT 0
-#define I40E_GLRCB_DBG_DATA3_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCB_DBG_DATA3_DBG_DATA_SHIFT)
-#define I40E_GLRCB_DBG_DATA4                0x00122638
-#define I40E_GLRCB_DBG_DATA4_DBG_DATA_SHIFT 0
-#define I40E_GLRCB_DBG_DATA4_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCB_DBG_DATA4_DBG_DATA_SHIFT)
-#define I40E_GLRCB_DBG_DATA5                0x0012263C
-#define I40E_GLRCB_DBG_DATA5_DBG_DATA_SHIFT 0
-#define I40E_GLRCB_DBG_DATA5_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCB_DBG_DATA5_DBG_DATA_SHIFT)
-#define I40E_GLRLAN_DBG_DATA0                0x0012A598
-#define I40E_GLRLAN_DBG_DATA0_DBG_DATA_SHIFT 0
-#define I40E_GLRLAN_DBG_DATA0_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA0_DBG_DATA_SHIFT)
-#define I40E_GLRLAN_DBG_DATA1                0x0012A59C
-#define I40E_GLRLAN_DBG_DATA1_DBG_DATA_SHIFT 0
-#define I40E_GLRLAN_DBG_DATA1_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA1_DBG_DATA_SHIFT)
-#define I40E_GLRLAN_DBG_DATA2                0x0012A5A0
-#define I40E_GLRLAN_DBG_DATA2_DBG_DATA_SHIFT 0
-#define I40E_GLRLAN_DBG_DATA2_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA2_DBG_DATA_SHIFT)
-#define I40E_GLRLAN_DBG_DATA3                0x0012A5A4
-#define I40E_GLRLAN_DBG_DATA3_DBG_DATA_SHIFT 0
-#define I40E_GLRLAN_DBG_DATA3_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA3_DBG_DATA_SHIFT)
-#define I40E_GLRLAN_DBG_DATA4                0x0012A5A8
-#define I40E_GLRLAN_DBG_DATA4_DBG_DATA_SHIFT 0
-#define I40E_GLRLAN_DBG_DATA4_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA4_DBG_DATA_SHIFT)
-#define I40E_GLRLAN_DBG_DATA5                0x0012A5AC
-#define I40E_GLRLAN_DBG_DATA5_DBG_DATA_SHIFT 0
-#define I40E_GLRLAN_DBG_DATA5_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA5_DBG_DATA_SHIFT)
-#define I40E_GLRLAN_DBG_DATA6                0x0012A5B0
-#define I40E_GLRLAN_DBG_DATA6_DBG_DATA_SHIFT 0
-#define I40E_GLRLAN_DBG_DATA6_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA6_DBG_DATA_SHIFT)
-#define I40E_GLRLAN_DBG_DATA7                0x0012A5B4
-#define I40E_GLRLAN_DBG_DATA7_DBG_DATA_SHIFT 0
-#define I40E_GLRLAN_DBG_DATA7_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA7_DBG_DATA_SHIFT)
-#define I40E_GLRLAN_SPARE                  0x0012A5B8
-#define I40E_GLRLAN_SPARE_SPARE_BITS_SHIFT 0
-#define I40E_GLRLAN_SPARE_SPARE_BITS_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_SPARE_SPARE_BITS_SHIFT)
-#define I40E_PRT_SWR_PM_THR                 0x0026CD00
-#define I40E_PRT_SWR_PM_THR_THRESHOLD_SHIFT 0
-#define I40E_PRT_SWR_PM_THR_THRESHOLD_MASK  I40E_MASK(0xFF, I40E_PRT_SWR_PM_THR_THRESHOLD_SHIFT)
-#define I40E_RCU_PST_DBG_CTL                           0x0026CC24
-#define I40E_RCU_PST_DBG_CTL_IGNORE_FLR_SHIFT          0
-#define I40E_RCU_PST_DBG_CTL_IGNORE_FLR_MASK           I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_IGNORE_FLR_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_IGNORE_VFLR_SHIFT         1
-#define I40E_RCU_PST_DBG_CTL_IGNORE_VFLR_MASK          I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_IGNORE_VFLR_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_IGNORE_VMLR_SHIFT         2
-#define I40E_RCU_PST_DBG_CTL_IGNORE_VMLR_MASK          I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_IGNORE_VMLR_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_USE_PCTYPE_FCOE_SHIFT     3
-#define I40E_RCU_PST_DBG_CTL_USE_PCTYPE_FCOE_MASK      I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_USE_PCTYPE_FCOE_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_IGNORE_ETH_HIT_SHIFT      4
-#define I40E_RCU_PST_DBG_CTL_IGNORE_ETH_HIT_MASK       I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_IGNORE_ETH_HIT_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_IGNORE_MAC_VLAN_HIT_SHIFT 5
-#define I40E_RCU_PST_DBG_CTL_IGNORE_MAC_VLAN_HIT_MASK  I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_IGNORE_MAC_VLAN_HIT_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_IGNORE_SWR_DROP_SHIFT     6
-#define I40E_RCU_PST_DBG_CTL_IGNORE_SWR_DROP_MASK      I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_IGNORE_SWR_DROP_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_HOLD_FLU_JOBS_SHIFT       7
-#define I40E_RCU_PST_DBG_CTL_HOLD_FLU_JOBS_MASK        I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_HOLD_FLU_JOBS_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_FC_HASH_BASE_SHIFT        8
-#define I40E_RCU_PST_DBG_CTL_FC_HASH_BASE_MASK         I40E_MASK(0xF, I40E_RCU_PST_DBG_CTL_FC_HASH_BASE_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_PE_HASH_BASE_SHIFT        12
-#define I40E_RCU_PST_DBG_CTL_PE_HASH_BASE_MASK         I40E_MASK(0xF, I40E_RCU_PST_DBG_CTL_PE_HASH_BASE_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_FD_HASH_BASE_SHIFT        16
-#define I40E_RCU_PST_DBG_CTL_FD_HASH_BASE_MASK         I40E_MASK(0xF, I40E_RCU_PST_DBG_CTL_FD_HASH_BASE_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_FOC_CNTX_LIMIT_BASE_SHIFT 20
-#define I40E_RCU_PST_DBG_CTL_FOC_CNTX_LIMIT_BASE_MASK  I40E_MASK(0xF, I40E_RCU_PST_DBG_CTL_FOC_CNTX_LIMIT_BASE_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_ERR_COMP_DIS_SHIFT        24
-#define I40E_RCU_PST_DBG_CTL_ERR_COMP_DIS_MASK         I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_ERR_COMP_DIS_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_REM_COMP_DIS_SHIFT        25
-#define I40E_RCU_PST_DBG_CTL_REM_COMP_DIS_MASK         I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_REM_COMP_DIS_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_HOLD_PST_INPUT_SHIFT      28
-#define I40E_RCU_PST_DBG_CTL_HOLD_PST_INPUT_MASK       I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_HOLD_PST_INPUT_SHIFT)
-#define I40E_RCU_PST_DBG_CTL_INC_INPUT_CMD_SHIFT       29
-#define I40E_RCU_PST_DBG_CTL_INC_INPUT_CMD_MASK        I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_INC_INPUT_CMD_SHIFT)
-#define I40E_RCU_PST_DBG_DROP_CNT                         0x0026CBEC
-#define I40E_RCU_PST_DBG_DROP_CNT_FD_DROP_CNT_SHIFT       0
-#define I40E_RCU_PST_DBG_DROP_CNT_FD_DROP_CNT_MASK        I40E_MASK(0xFF, I40E_RCU_PST_DBG_DROP_CNT_FD_DROP_CNT_SHIFT)
-#define I40E_RCU_PST_DBG_DROP_CNT_FLR_DROP_CNT_SHIFT      8
-#define I40E_RCU_PST_DBG_DROP_CNT_FLR_DROP_CNT_MASK       I40E_MASK(0xFF, I40E_RCU_PST_DBG_DROP_CNT_FLR_DROP_CNT_SHIFT)
-#define I40E_RCU_PST_DBG_DROP_CNT_PF_BOUND_DROP_CNT_SHIFT 16
-#define I40E_RCU_PST_DBG_DROP_CNT_PF_BOUND_DROP_CNT_MASK  I40E_MASK(0xFF, I40E_RCU_PST_DBG_DROP_CNT_PF_BOUND_DROP_CNT_SHIFT)
-#define I40E_RCU_PST_DBG_DROP_CNT_SWR_DROP_CNT_SHIFT      24
-#define I40E_RCU_PST_DBG_DROP_CNT_SWR_DROP_CNT_MASK       I40E_MASK(0xFF, I40E_RCU_PST_DBG_DROP_CNT_SWR_DROP_CNT_SHIFT)
-#define I40E_RCU_PST_DBG_FLU_STATE(_i)             (0x0026CB80 + ((_i) * 4)) /* _i=0...15 */
-#define I40E_RCU_PST_DBG_FLU_STATE_MAX_INDEX       15
-#define I40E_RCU_PST_DBG_FLU_STATE_FLU_STATE_SHIFT 0
-#define I40E_RCU_PST_DBG_FLU_STATE_FLU_STATE_MASK  I40E_MASK(0x1F, I40E_RCU_PST_DBG_FLU_STATE_FLU_STATE_SHIFT)
-#define I40E_RCU_PST_DBG_FLU_STATE_FLU_HASH_SHIFT  5
-#define I40E_RCU_PST_DBG_FLU_STATE_FLU_HASH_MASK   I40E_MASK(0xFFFFF, I40E_RCU_PST_DBG_FLU_STATE_FLU_HASH_SHIFT)
-#define I40E_RCU_PST_DBG_FLU_STATE_FLU_OBJ_SHIFT   25
-#define I40E_RCU_PST_DBG_FLU_STATE_FLU_OBJ_MASK    I40E_MASK(0x7, I40E_RCU_PST_DBG_FLU_STATE_FLU_OBJ_SHIFT)
-#define I40E_RCU_PST_DBG_FLU_STATE_FLU_CMD_SHIFT   28
-#define I40E_RCU_PST_DBG_FLU_STATE_FLU_CMD_MASK    I40E_MASK(0xF, I40E_RCU_PST_DBG_FLU_STATE_FLU_CMD_SHIFT)
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_0                     0x0026CC14
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_CONF_FAIL_CNT_SHIFT 0
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_CONF_FAIL_CNT_MASK  I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_0_CONF_FAIL_CNT_SHIFT)
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_QUAD_HIT_CNT_SHIFT  8
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_QUAD_HIT_CNT_MASK   I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_0_QUAD_HIT_CNT_SHIFT)
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_ETH_HIT_CNT_SHIFT   16
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_ETH_HIT_CNT_MASK    I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_0_ETH_HIT_CNT_SHIFT)
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_FCOE_CNT_SHIFT      24
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_FCOE_CNT_MASK       I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_0_FCOE_CNT_SHIFT)
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_1                    0x0026CC1C
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_FD_HIT_CNT_SHIFT   0
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_FD_HIT_CNT_MASK    I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_1_FD_HIT_CNT_SHIFT)
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_MAC_VLAN_CNT_SHIFT 8
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_MAC_VLAN_CNT_MASK  I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_1_MAC_VLAN_CNT_SHIFT)
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_RSS_CNT_SHIFT      16
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_RSS_CNT_MASK       I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_1_RSS_CNT_SHIFT)
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_DEFAULT_CNT_SHIFT  24
-#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_DEFAULT_CNT_MASK   I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_1_DEFAULT_CNT_SHIFT)
-#define I40E_RCU_PST_DBG_STATUS_0                      0x0026CC04
-#define I40E_RCU_PST_DBG_STATUS_0_PST_FLR_STAT_SHIFT   0
-#define I40E_RCU_PST_DBG_STATUS_0_PST_FLR_STAT_MASK    I40E_MASK(0xFFFF, I40E_RCU_PST_DBG_STATUS_0_PST_FLR_STAT_SHIFT)
-#define I40E_RCU_PST_DBG_STATUS_0_INPUT_FIFO_OCC_SHIFT 16
-#define I40E_RCU_PST_DBG_STATUS_0_INPUT_FIFO_OCC_MASK  I40E_MASK(0x3, I40E_RCU_PST_DBG_STATUS_0_INPUT_FIFO_OCC_SHIFT)
-#define I40E_RCU_PST_DBG_STATUS_1                      0x0026CC0C
-#define I40E_RCU_PST_DBG_STATUS_1_FLR_FLOW_START_SHIFT 0
-#define I40E_RCU_PST_DBG_STATUS_1_FLR_FLOW_START_MASK  I40E_MASK(0xFFFF, I40E_RCU_PST_DBG_STATUS_1_FLR_FLOW_START_SHIFT)
-#define I40E_RCU_PST_DBG_STATUS_1_FLR_FLOW_DONE_SHIFT  16
-#define I40E_RCU_PST_DBG_STATUS_1_FLR_FLOW_DONE_MASK   I40E_MASK(0xFFFF, I40E_RCU_PST_DBG_STATUS_1_FLR_FLOW_DONE_SHIFT)
-#define I40E_RCU_PST_FOC_ACCESS_STATUS                     0x00270110
-#define I40E_RCU_PST_FOC_ACCESS_STATUS_WR_ACCESS_CNT_SHIFT 0
-#define I40E_RCU_PST_FOC_ACCESS_STATUS_WR_ACCESS_CNT_MASK  I40E_MASK(0xFF, I40E_RCU_PST_FOC_ACCESS_STATUS_WR_ACCESS_CNT_SHIFT)
-#define I40E_RCU_PST_FOC_ACCESS_STATUS_RD_ACCESS_CNT_SHIFT 8
-#define I40E_RCU_PST_FOC_ACCESS_STATUS_RD_ACCESS_CNT_MASK  I40E_MASK(0xFF, I40E_RCU_PST_FOC_ACCESS_STATUS_RD_ACCESS_CNT_SHIFT)
-#define I40E_RCU_PST_FOC_ACCESS_STATUS_ERR_CNT_SHIFT       16
-#define I40E_RCU_PST_FOC_ACCESS_STATUS_ERR_CNT_MASK        I40E_MASK(0xFF, I40E_RCU_PST_FOC_ACCESS_STATUS_ERR_CNT_SHIFT)
-#define I40E_RCU_PST_FOC_ACCESS_STATUS_LAST_ERR_CODE_SHIFT 24
-#define I40E_RCU_PST_FOC_ACCESS_STATUS_LAST_ERR_CODE_MASK  I40E_MASK(0x7, I40E_RCU_PST_FOC_ACCESS_STATUS_LAST_ERR_CODE_SHIFT)
-#define I40E_RCU_PST_INPUT_ACL_STATUS(_i)                            (0x00270100 + ((_i) * 4)) /* _i=0...2 */
-#define I40E_RCU_PST_INPUT_ACL_STATUS_MAX_INDEX                      2
-#define I40E_RCU_PST_INPUT_ACL_STATUS_RCU_PST_INPUT_ACL_STATUS_SHIFT 0
-#define I40E_RCU_PST_INPUT_ACL_STATUS_RCU_PST_INPUT_ACL_STATUS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_INPUT_ACL_STATUS_RCU_PST_INPUT_ACL_STATUS_SHIFT)
-#define I40E_RCU_PST_INPUT_MTG_FIELDS(_i)                            (0x00270080 + ((_i) * 4)) /* _i=0...31 */
-#define I40E_RCU_PST_INPUT_MTG_FIELDS_MAX_INDEX                      31
-#define I40E_RCU_PST_INPUT_MTG_FIELDS_RCU_PST_INPUT_MTG_FIELDS_SHIFT 0
-#define I40E_RCU_PST_INPUT_MTG_FIELDS_RCU_PST_INPUT_MTG_FIELDS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_INPUT_MTG_FIELDS_RCU_PST_INPUT_MTG_FIELDS_SHIFT)
-#define I40E_RCU_PST_INPUT_MTG_STATUS(_i)                            (0x00270060 + ((_i) * 4)) /* _i=0...7 */
-#define I40E_RCU_PST_INPUT_MTG_STATUS_MAX_INDEX                      7
-#define I40E_RCU_PST_INPUT_MTG_STATUS_RCU_PST_INPUT_MTG_STATUS_SHIFT 0
-#define I40E_RCU_PST_INPUT_MTG_STATUS_RCU_PST_INPUT_MTG_STATUS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_INPUT_MTG_STATUS_RCU_PST_INPUT_MTG_STATUS_SHIFT)
-#define I40E_RCU_PST_OUTFIFO_OCC(_i)            (0x0026CFE0 + ((_i) * 4)) /* _i=0...7 */
-#define I40E_RCU_PST_OUTFIFO_OCC_MAX_INDEX      7
-#define I40E_RCU_PST_OUTFIFO_OCC_UP_1_OCC_SHIFT 0
-#define I40E_RCU_PST_OUTFIFO_OCC_UP_1_OCC_MASK  I40E_MASK(0xFF, I40E_RCU_PST_OUTFIFO_OCC_UP_1_OCC_SHIFT)
-#define I40E_RCU_PST_OUTFIFO_OCC_UP_2_OCC_SHIFT 8
-#define I40E_RCU_PST_OUTFIFO_OCC_UP_2_OCC_MASK  I40E_MASK(0xFF, I40E_RCU_PST_OUTFIFO_OCC_UP_2_OCC_SHIFT)
-#define I40E_RCU_PST_OUTFIFO_OCC_UP_3_OCC_SHIFT 16
-#define I40E_RCU_PST_OUTFIFO_OCC_UP_3_OCC_MASK  I40E_MASK(0xFF, I40E_RCU_PST_OUTFIFO_OCC_UP_3_OCC_SHIFT)
-#define I40E_RCU_PST_OUTFIFO_OCC_UP_4_OCC_SHIFT 24
-#define I40E_RCU_PST_OUTFIFO_OCC_UP_4_OCC_MASK  I40E_MASK(0xFF, I40E_RCU_PST_OUTFIFO_OCC_UP_4_OCC_SHIFT)
-#define I40E_RCU_PST_RCB_ACL_STATUS(_i)                          (0x00270030 + ((_i) * 4)) /* _i=0...2 */
-#define I40E_RCU_PST_RCB_ACL_STATUS_MAX_INDEX                    2
-#define I40E_RCU_PST_RCB_ACL_STATUS_RCU_PST_RCB_ACL_STATUS_SHIFT 0
-#define I40E_RCU_PST_RCB_ACL_STATUS_RCU_PST_RCB_ACL_STATUS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_RCB_ACL_STATUS_RCU_PST_RCB_ACL_STATUS_SHIFT)
-#define I40E_RCU_PST_RCB_FIFO_FIELDS(_i)                           (0x00270000 + ((_i) * 4)) /* _i=0...5 */
-#define I40E_RCU_PST_RCB_FIFO_FIELDS_MAX_INDEX                     5
-#define I40E_RCU_PST_RCB_FIFO_FIELDS_RCU_PST_RCB_FIFO_FIELDS_SHIFT 0
-#define I40E_RCU_PST_RCB_FIFO_FIELDS_RCU_PST_RCB_FIFO_FIELDS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_RCB_FIFO_FIELDS_RCU_PST_RCB_FIFO_FIELDS_SHIFT)
-#define I40E_RCU_PST_RCB_FIFO_Q_STATUS(_i)                             (0x00270020 + ((_i) * 4)) /* _i=0...3 */
-#define I40E_RCU_PST_RCB_FIFO_Q_STATUS_MAX_INDEX                       3
-#define I40E_RCU_PST_RCB_FIFO_Q_STATUS_RCU_PST_RCB_FIFO_Q_STATUS_SHIFT 0
-#define I40E_RCU_PST_RCB_FIFO_Q_STATUS_RCU_PST_RCB_FIFO_Q_STATUS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_RCB_FIFO_Q_STATUS_RCU_PST_RCB_FIFO_Q_STATUS_SHIFT)
-#define I40E_RCU_PST_RCB_MTG_STATUS(_i)                          (0x00270040 + ((_i) * 4)) /* _i=0...7 */
-#define I40E_RCU_PST_RCB_MTG_STATUS_MAX_INDEX                    7
-#define I40E_RCU_PST_RCB_MTG_STATUS_RCU_PST_RCB_MTG_STATUS_SHIFT 0
-#define I40E_RCU_PST_RCB_MTG_STATUS_RCU_PST_RCB_MTG_STATUS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_RCB_MTG_STATUS_RCU_PST_RCB_MTG_STATUS_SHIFT)
-#define I40E_RCU_PST_RCB_OUT_CTL                     0x0026CDA8
-#define I40E_RCU_PST_RCB_OUT_CTL_BLOCK_RCB_OUT_SHIFT 0
-#define I40E_RCU_PST_RCB_OUT_CTL_BLOCK_RCB_OUT_MASK  I40E_MASK(0x1, I40E_RCU_PST_RCB_OUT_CTL_BLOCK_RCB_OUT_SHIFT)
-#define I40E_RCU_PST_RCB_OUT_CTL_STEP_ONE_CMD_SHIFT  1
-#define I40E_RCU_PST_RCB_OUT_CTL_STEP_ONE_CMD_MASK   I40E_MASK(0x1, I40E_RCU_PST_RCB_OUT_CTL_STEP_ONE_CMD_SHIFT)
-#define I40E_RCU_PST_RCB_OUT_STAT                    0x0026CC18
-#define I40E_RCU_PST_RCB_OUT_STAT_RCB_FIFO_OCC_SHIFT 0
-#define I40E_RCU_PST_RCB_OUT_STAT_RCB_FIFO_OCC_MASK  I40E_MASK(0xF, I40E_RCU_PST_RCB_OUT_STAT_RCB_FIFO_OCC_SHIFT)
-#define I40E_RCU_PST_RCB_OUT_STAT_NEXT_IPLEN_SHIFT   8
-#define I40E_RCU_PST_RCB_OUT_STAT_NEXT_IPLEN_MASK    I40E_MASK(0xFFFF, I40E_RCU_PST_RCB_OUT_STAT_NEXT_IPLEN_SHIFT)
-#define I40E_RCU_PST_RCB_OUT_STAT_NEXT_TYPE_SHIFT    24
-#define I40E_RCU_PST_RCB_OUT_STAT_NEXT_TYPE_MASK     I40E_MASK(0x7, I40E_RCU_PST_RCB_OUT_STAT_NEXT_TYPE_SHIFT)
-#define I40E_RCU_PST_RCB_OUT_STAT_NEXT_CFG_ERR_SHIFT 28
-#define I40E_RCU_PST_RCB_OUT_STAT_NEXT_CFG_ERR_MASK  I40E_MASK(0x1, I40E_RCU_PST_RCB_OUT_STAT_NEXT_CFG_ERR_SHIFT)
-#define I40E_RCU_PST_RCB_OUT_STAT_RSV3_SHIFT         29
-#define I40E_RCU_PST_RCB_OUT_STAT_RSV3_MASK          I40E_MASK(0x7, I40E_RCU_PST_RCB_OUT_STAT_RSV3_SHIFT)
-#define I40E_GL_GP_FUSE(_i)              (0x0009400C + ((_i) * 4)) /* _i=0...28 */
+#define I40E_GL_GP_FUSE(_i)              (0x0009400C + ((_i) * 4)) /* _i=0...28 */ /* Reset: POR */
 #define I40E_GL_GP_FUSE_MAX_INDEX        28
 #define I40E_GL_GP_FUSE_GL_GP_FUSE_SHIFT 0
 #define I40E_GL_GP_FUSE_GL_GP_FUSE_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_GP_FUSE_GL_GP_FUSE_SHIFT)
-#define I40E_GL_UFUSE                        0x00094008
+#define I40E_GL_UFUSE                        0x00094008 /* Reset: POR */
 #define I40E_GL_UFUSE_FOUR_PORT_ENABLE_SHIFT 1
 #define I40E_GL_UFUSE_FOUR_PORT_ENABLE_MASK  I40E_MASK(0x1, I40E_GL_UFUSE_FOUR_PORT_ENABLE_SHIFT)
 #define I40E_GL_UFUSE_NIC_ID_SHIFT           2
@@ -996,7 +784,7 @@
 #define I40E_GL_UFUSE_ULT_LOCKOUT_MASK       I40E_MASK(0x1, I40E_GL_UFUSE_ULT_LOCKOUT_SHIFT)
 #define I40E_GL_UFUSE_CLS_LOCKOUT_SHIFT      11
 #define I40E_GL_UFUSE_CLS_LOCKOUT_MASK       I40E_MASK(0x1, I40E_GL_UFUSE_CLS_LOCKOUT_SHIFT)
-#define I40E_EMPINT_GPIO_ENA                  0x00088188
+#define I40E_EMPINT_GPIO_ENA                  0x00088188 /* Reset: POR */
 #define I40E_EMPINT_GPIO_ENA_GPIO0_ENA_SHIFT  0
 #define I40E_EMPINT_GPIO_ENA_GPIO0_ENA_MASK   I40E_MASK(0x1, I40E_EMPINT_GPIO_ENA_GPIO0_ENA_SHIFT)
 #define I40E_EMPINT_GPIO_ENA_GPIO1_ENA_SHIFT  1
@@ -1057,12 +845,12 @@
 #define I40E_EMPINT_GPIO_ENA_GPIO28_ENA_MASK  I40E_MASK(0x1, I40E_EMPINT_GPIO_ENA_GPIO28_ENA_SHIFT)
 #define I40E_EMPINT_GPIO_ENA_GPIO29_ENA_SHIFT 29
 #define I40E_EMPINT_GPIO_ENA_GPIO29_ENA_MASK  I40E_MASK(0x1, I40E_EMPINT_GPIO_ENA_GPIO29_ENA_SHIFT)
-#define I40E_PFGEN_PORTMDIO_NUM                       0x0003F100
+#define I40E_PFGEN_PORTMDIO_NUM                       0x0003F100 /* Reset: CORER */
 #define I40E_PFGEN_PORTMDIO_NUM_PORT_NUM_SHIFT        0
 #define I40E_PFGEN_PORTMDIO_NUM_PORT_NUM_MASK         I40E_MASK(0x3, I40E_PFGEN_PORTMDIO_NUM_PORT_NUM_SHIFT)
 #define I40E_PFGEN_PORTMDIO_NUM_VFLINK_STAT_ENA_SHIFT 4
 #define I40E_PFGEN_PORTMDIO_NUM_VFLINK_STAT_ENA_MASK  I40E_MASK(0x1, I40E_PFGEN_PORTMDIO_NUM_VFLINK_STAT_ENA_SHIFT)
-#define I40E_PFINT_AEQCTL                  0x00038700
+#define I40E_PFINT_AEQCTL                  0x00038700 /* Reset: CORER */
 #define I40E_PFINT_AEQCTL_MSIX_INDX_SHIFT  0
 #define I40E_PFINT_AEQCTL_MSIX_INDX_MASK   I40E_MASK(0xFF, I40E_PFINT_AEQCTL_MSIX_INDX_SHIFT)
 #define I40E_PFINT_AEQCTL_ITR_INDX_SHIFT   11
@@ -1073,7 +861,7 @@
 #define I40E_PFINT_AEQCTL_CAUSE_ENA_MASK   I40E_MASK(0x1, I40E_PFINT_AEQCTL_CAUSE_ENA_SHIFT)
 #define I40E_PFINT_AEQCTL_INTEVENT_SHIFT   31
 #define I40E_PFINT_AEQCTL_INTEVENT_MASK    I40E_MASK(0x1, I40E_PFINT_AEQCTL_INTEVENT_SHIFT)
-#define I40E_PFINT_CEQCTL(_INTPF)          (0x00036800 + ((_INTPF) * 4)) /* _i=0...511 */
+#define I40E_PFINT_CEQCTL(_INTPF)          (0x00036800 + ((_INTPF) * 4)) /* _i=0...511 */ /* Reset: CORER */
 #define I40E_PFINT_CEQCTL_MAX_INDEX        511
 #define I40E_PFINT_CEQCTL_MSIX_INDX_SHIFT  0
 #define I40E_PFINT_CEQCTL_MSIX_INDX_MASK   I40E_MASK(0xFF, I40E_PFINT_CEQCTL_MSIX_INDX_SHIFT)
@@ -1089,7 +877,7 @@
 #define I40E_PFINT_CEQCTL_CAUSE_ENA_MASK   I40E_MASK(0x1, I40E_PFINT_CEQCTL_CAUSE_ENA_SHIFT)
 #define I40E_PFINT_CEQCTL_INTEVENT_SHIFT   31
 #define I40E_PFINT_CEQCTL_INTEVENT_MASK    I40E_MASK(0x1, I40E_PFINT_CEQCTL_INTEVENT_SHIFT)
-#define I40E_PFINT_DYN_CTL0                       0x00038480
+#define I40E_PFINT_DYN_CTL0                       0x00038480 /* Reset: PFR */
 #define I40E_PFINT_DYN_CTL0_INTENA_SHIFT          0
 #define I40E_PFINT_DYN_CTL0_INTENA_MASK           I40E_MASK(0x1, I40E_PFINT_DYN_CTL0_INTENA_SHIFT)
 #define I40E_PFINT_DYN_CTL0_CLEARPBA_SHIFT        1
@@ -1106,7 +894,7 @@
 #define I40E_PFINT_DYN_CTL0_SW_ITR_INDX_MASK      I40E_MASK(0x3, I40E_PFINT_DYN_CTL0_SW_ITR_INDX_SHIFT)
 #define I40E_PFINT_DYN_CTL0_INTENA_MSK_SHIFT      31
 #define I40E_PFINT_DYN_CTL0_INTENA_MSK_MASK       I40E_MASK(0x1, I40E_PFINT_DYN_CTL0_INTENA_MSK_SHIFT)
-#define I40E_PFINT_DYN_CTLN(_INTPF)               (0x00034800 + ((_INTPF) * 4)) /* _i=0...511 */
+#define I40E_PFINT_DYN_CTLN(_INTPF)               (0x00034800 + ((_INTPF) * 4)) /* _i=0...511 */ /* Reset: PFR */
 #define I40E_PFINT_DYN_CTLN_MAX_INDEX             511
 #define I40E_PFINT_DYN_CTLN_INTENA_SHIFT          0
 #define I40E_PFINT_DYN_CTLN_INTENA_MASK           I40E_MASK(0x1, I40E_PFINT_DYN_CTLN_INTENA_SHIFT)
@@ -1124,7 +912,7 @@
 #define I40E_PFINT_DYN_CTLN_SW_ITR_INDX_MASK      I40E_MASK(0x3, I40E_PFINT_DYN_CTLN_SW_ITR_INDX_SHIFT)
 #define I40E_PFINT_DYN_CTLN_INTENA_MSK_SHIFT      31
 #define I40E_PFINT_DYN_CTLN_INTENA_MSK_MASK       I40E_MASK(0x1, I40E_PFINT_DYN_CTLN_INTENA_MSK_SHIFT)
-#define I40E_PFINT_GPIO_ENA                  0x00088080
+#define I40E_PFINT_GPIO_ENA                  0x00088080 /* Reset: CORER */
 #define I40E_PFINT_GPIO_ENA_GPIO0_ENA_SHIFT  0
 #define I40E_PFINT_GPIO_ENA_GPIO0_ENA_MASK   I40E_MASK(0x1, I40E_PFINT_GPIO_ENA_GPIO0_ENA_SHIFT)
 #define I40E_PFINT_GPIO_ENA_GPIO1_ENA_SHIFT  1
@@ -1185,7 +973,7 @@
 #define I40E_PFINT_GPIO_ENA_GPIO28_ENA_MASK  I40E_MASK(0x1, I40E_PFINT_GPIO_ENA_GPIO28_ENA_SHIFT)
 #define I40E_PFINT_GPIO_ENA_GPIO29_ENA_SHIFT 29
 #define I40E_PFINT_GPIO_ENA_GPIO29_ENA_MASK  I40E_MASK(0x1, I40E_PFINT_GPIO_ENA_GPIO29_ENA_SHIFT)
-#define I40E_PFINT_ICR0                        0x00038780
+#define I40E_PFINT_ICR0                        0x00038780 /* Reset: CORER */
 #define I40E_PFINT_ICR0_INTEVENT_SHIFT         0
 #define I40E_PFINT_ICR0_INTEVENT_MASK          I40E_MASK(0x1, I40E_PFINT_ICR0_INTEVENT_SHIFT)
 #define I40E_PFINT_ICR0_QUEUE_0_SHIFT          1
@@ -1230,7 +1018,7 @@
 #define I40E_PFINT_ICR0_ADMINQ_MASK            I40E_MASK(0x1, I40E_PFINT_ICR0_ADMINQ_SHIFT)
 #define I40E_PFINT_ICR0_SWINT_SHIFT            31
 #define I40E_PFINT_ICR0_SWINT_MASK             I40E_MASK(0x1, I40E_PFINT_ICR0_SWINT_SHIFT)
-#define I40E_PFINT_ICR0_ENA                        0x00038800
+#define I40E_PFINT_ICR0_ENA                        0x00038800 /* Reset: CORER */
 #define I40E_PFINT_ICR0_ENA_ECC_ERR_SHIFT          16
 #define I40E_PFINT_ICR0_ENA_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PFINT_ICR0_ENA_ECC_ERR_SHIFT)
 #define I40E_PFINT_ICR0_ENA_MAL_DETECT_SHIFT       19
@@ -1257,40 +1045,40 @@
 #define I40E_PFINT_ICR0_ENA_ADMINQ_MASK            I40E_MASK(0x1, I40E_PFINT_ICR0_ENA_ADMINQ_SHIFT)
 #define I40E_PFINT_ICR0_ENA_RSVD_SHIFT             31
 #define I40E_PFINT_ICR0_ENA_RSVD_MASK              I40E_MASK(0x1, I40E_PFINT_ICR0_ENA_RSVD_SHIFT)
-#define I40E_PFINT_ITR0(_i)            (0x00038000 + ((_i) * 128)) /* _i=0...2 */
+#define I40E_PFINT_ITR0(_i)            (0x00038000 + ((_i) * 128)) /* _i=0...2 */ /* Reset: PFR */
 #define I40E_PFINT_ITR0_MAX_INDEX      2
 #define I40E_PFINT_ITR0_INTERVAL_SHIFT 0
 #define I40E_PFINT_ITR0_INTERVAL_MASK  I40E_MASK(0xFFF, I40E_PFINT_ITR0_INTERVAL_SHIFT)
-#define I40E_PFINT_ITRN(_i, _INTPF)     (0x00030000 + ((_i) * 2048 + (_INTPF) * 4)) /* _i=0...2, _INTPF=0...511 */
+#define I40E_PFINT_ITRN(_i, _INTPF)     (0x00030000 + ((_i) * 2048 + (_INTPF) * 4)) /* _i=0...2, _INTPF=0...511 */ /* Reset: PFR */
 #define I40E_PFINT_ITRN_MAX_INDEX      2
 #define I40E_PFINT_ITRN_INTERVAL_SHIFT 0
 #define I40E_PFINT_ITRN_INTERVAL_MASK  I40E_MASK(0xFFF, I40E_PFINT_ITRN_INTERVAL_SHIFT)
-#define I40E_PFINT_LNKLST0                   0x00038500
+#define I40E_PFINT_LNKLST0                   0x00038500 /* Reset: PFR */
 #define I40E_PFINT_LNKLST0_FIRSTQ_INDX_SHIFT 0
 #define I40E_PFINT_LNKLST0_FIRSTQ_INDX_MASK  I40E_MASK(0x7FF, I40E_PFINT_LNKLST0_FIRSTQ_INDX_SHIFT)
 #define I40E_PFINT_LNKLST0_FIRSTQ_TYPE_SHIFT 11
 #define I40E_PFINT_LNKLST0_FIRSTQ_TYPE_MASK  I40E_MASK(0x3, I40E_PFINT_LNKLST0_FIRSTQ_TYPE_SHIFT)
-#define I40E_PFINT_LNKLSTN(_INTPF)           (0x00035000 + ((_INTPF) * 4)) /* _i=0...511 */
+#define I40E_PFINT_LNKLSTN(_INTPF)           (0x00035000 + ((_INTPF) * 4)) /* _i=0...511 */ /* Reset: PFR */
 #define I40E_PFINT_LNKLSTN_MAX_INDEX         511
 #define I40E_PFINT_LNKLSTN_FIRSTQ_INDX_SHIFT 0
 #define I40E_PFINT_LNKLSTN_FIRSTQ_INDX_MASK  I40E_MASK(0x7FF, I40E_PFINT_LNKLSTN_FIRSTQ_INDX_SHIFT)
 #define I40E_PFINT_LNKLSTN_FIRSTQ_TYPE_SHIFT 11
 #define I40E_PFINT_LNKLSTN_FIRSTQ_TYPE_MASK  I40E_MASK(0x3, I40E_PFINT_LNKLSTN_FIRSTQ_TYPE_SHIFT)
-#define I40E_PFINT_RATE0                 0x00038580
+#define I40E_PFINT_RATE0                 0x00038580 /* Reset: PFR */
 #define I40E_PFINT_RATE0_INTERVAL_SHIFT  0
 #define I40E_PFINT_RATE0_INTERVAL_MASK   I40E_MASK(0x3F, I40E_PFINT_RATE0_INTERVAL_SHIFT)
 #define I40E_PFINT_RATE0_INTRL_ENA_SHIFT 6
 #define I40E_PFINT_RATE0_INTRL_ENA_MASK  I40E_MASK(0x1, I40E_PFINT_RATE0_INTRL_ENA_SHIFT)
-#define I40E_PFINT_RATEN(_INTPF)         (0x00035800 + ((_INTPF) * 4)) /* _i=0...511 */
+#define I40E_PFINT_RATEN(_INTPF)         (0x00035800 + ((_INTPF) * 4)) /* _i=0...511 */ /* Reset: PFR */
 #define I40E_PFINT_RATEN_MAX_INDEX       511
 #define I40E_PFINT_RATEN_INTERVAL_SHIFT  0
 #define I40E_PFINT_RATEN_INTERVAL_MASK   I40E_MASK(0x3F, I40E_PFINT_RATEN_INTERVAL_SHIFT)
 #define I40E_PFINT_RATEN_INTRL_ENA_SHIFT 6
 #define I40E_PFINT_RATEN_INTRL_ENA_MASK  I40E_MASK(0x1, I40E_PFINT_RATEN_INTRL_ENA_SHIFT)
-#define I40E_PFINT_STAT_CTL0                      0x00038400
+#define I40E_PFINT_STAT_CTL0                      0x00038400 /* Reset: PFR */
 #define I40E_PFINT_STAT_CTL0_OTHER_ITR_INDX_SHIFT 2
 #define I40E_PFINT_STAT_CTL0_OTHER_ITR_INDX_MASK  I40E_MASK(0x3, I40E_PFINT_STAT_CTL0_OTHER_ITR_INDX_SHIFT)
-#define I40E_QINT_RQCTL(_Q)              (0x0003A000 + ((_Q) * 4)) /* _i=0...1535 */
+#define I40E_QINT_RQCTL(_Q)              (0x0003A000 + ((_Q) * 4)) /* _i=0...1535 */ /* Reset: CORER */
 #define I40E_QINT_RQCTL_MAX_INDEX        1535
 #define I40E_QINT_RQCTL_MSIX_INDX_SHIFT  0
 #define I40E_QINT_RQCTL_MSIX_INDX_MASK   I40E_MASK(0xFF, I40E_QINT_RQCTL_MSIX_INDX_SHIFT)
@@ -1306,7 +1094,7 @@
 #define I40E_QINT_RQCTL_CAUSE_ENA_MASK   I40E_MASK(0x1, I40E_QINT_RQCTL_CAUSE_ENA_SHIFT)
 #define I40E_QINT_RQCTL_INTEVENT_SHIFT   31
 #define I40E_QINT_RQCTL_INTEVENT_MASK    I40E_MASK(0x1, I40E_QINT_RQCTL_INTEVENT_SHIFT)
-#define I40E_QINT_TQCTL(_Q)              (0x0003C000 + ((_Q) * 4)) /* _i=0...1535 */
+#define I40E_QINT_TQCTL(_Q)              (0x0003C000 + ((_Q) * 4)) /* _i=0...1535 */ /* Reset: CORER */
 #define I40E_QINT_TQCTL_MAX_INDEX        1535
 #define I40E_QINT_TQCTL_MSIX_INDX_SHIFT  0
 #define I40E_QINT_TQCTL_MSIX_INDX_MASK   I40E_MASK(0xFF, I40E_QINT_TQCTL_MSIX_INDX_SHIFT)
@@ -1322,7 +1110,7 @@
 #define I40E_QINT_TQCTL_CAUSE_ENA_MASK   I40E_MASK(0x1, I40E_QINT_TQCTL_CAUSE_ENA_SHIFT)
 #define I40E_QINT_TQCTL_INTEVENT_SHIFT   31
 #define I40E_QINT_TQCTL_INTEVENT_MASK    I40E_MASK(0x1, I40E_QINT_TQCTL_INTEVENT_SHIFT)
-#define I40E_VFINT_DYN_CTL0(_VF)                  (0x0002A400 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VFINT_DYN_CTL0(_VF)                  (0x0002A400 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: VFR */
 #define I40E_VFINT_DYN_CTL0_MAX_INDEX             127
 #define I40E_VFINT_DYN_CTL0_INTENA_SHIFT          0
 #define I40E_VFINT_DYN_CTL0_INTENA_MASK           I40E_MASK(0x1, I40E_VFINT_DYN_CTL0_INTENA_SHIFT)
@@ -1340,7 +1128,7 @@
 #define I40E_VFINT_DYN_CTL0_SW_ITR_INDX_MASK      I40E_MASK(0x3, I40E_VFINT_DYN_CTL0_SW_ITR_INDX_SHIFT)
 #define I40E_VFINT_DYN_CTL0_INTENA_MSK_SHIFT      31
 #define I40E_VFINT_DYN_CTL0_INTENA_MSK_MASK       I40E_MASK(0x1, I40E_VFINT_DYN_CTL0_INTENA_MSK_SHIFT)
-#define I40E_VFINT_DYN_CTLN(_INTVF)               (0x00024800 + ((_INTVF) * 4)) /* _i=0...511 */
+#define I40E_VFINT_DYN_CTLN(_INTVF)               (0x00024800 + ((_INTVF) * 4)) /* _i=0...511 */ /* Reset: VFR */
 #define I40E_VFINT_DYN_CTLN_MAX_INDEX             511
 #define I40E_VFINT_DYN_CTLN_INTENA_SHIFT          0
 #define I40E_VFINT_DYN_CTLN_INTENA_MASK           I40E_MASK(0x1, I40E_VFINT_DYN_CTLN_INTENA_SHIFT)
@@ -1358,7 +1146,7 @@
 #define I40E_VFINT_DYN_CTLN_SW_ITR_INDX_MASK      I40E_MASK(0x3, I40E_VFINT_DYN_CTLN_SW_ITR_INDX_SHIFT)
 #define I40E_VFINT_DYN_CTLN_INTENA_MSK_SHIFT      31
 #define I40E_VFINT_DYN_CTLN_INTENA_MSK_MASK       I40E_MASK(0x1, I40E_VFINT_DYN_CTLN_INTENA_MSK_SHIFT)
-#define I40E_VFINT_ICR0(_VF)                   (0x0002BC00 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VFINT_ICR0(_VF)                   (0x0002BC00 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_VFINT_ICR0_MAX_INDEX              127
 #define I40E_VFINT_ICR0_INTEVENT_SHIFT         0
 #define I40E_VFINT_ICR0_INTEVENT_MASK          I40E_MASK(0x1, I40E_VFINT_ICR0_INTEVENT_SHIFT)
@@ -1376,7 +1164,7 @@
 #define I40E_VFINT_ICR0_ADMINQ_MASK            I40E_MASK(0x1, I40E_VFINT_ICR0_ADMINQ_SHIFT)
 #define I40E_VFINT_ICR0_SWINT_SHIFT            31
 #define I40E_VFINT_ICR0_SWINT_MASK             I40E_MASK(0x1, I40E_VFINT_ICR0_SWINT_SHIFT)
-#define I40E_VFINT_ICR0_ENA(_VF)                   (0x0002C000 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VFINT_ICR0_ENA(_VF)                   (0x0002C000 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_VFINT_ICR0_ENA_MAX_INDEX              127
 #define I40E_VFINT_ICR0_ENA_LINK_STAT_CHANGE_SHIFT 25
 #define I40E_VFINT_ICR0_ENA_LINK_STAT_CHANGE_MASK  I40E_MASK(0x1, I40E_VFINT_ICR0_ENA_LINK_STAT_CHANGE_SHIFT)
@@ -1384,19 +1172,19 @@
 #define I40E_VFINT_ICR0_ENA_ADMINQ_MASK            I40E_MASK(0x1, I40E_VFINT_ICR0_ENA_ADMINQ_SHIFT)
 #define I40E_VFINT_ICR0_ENA_RSVD_SHIFT             31
 #define I40E_VFINT_ICR0_ENA_RSVD_MASK              I40E_MASK(0x1, I40E_VFINT_ICR0_ENA_RSVD_SHIFT)
-#define I40E_VFINT_ITR0(_i, _VF)        (0x00028000 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...2, _VF=0...127 */
+#define I40E_VFINT_ITR0(_i, _VF)        (0x00028000 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...2, _VF=0...127 */ /* Reset: VFR */
 #define I40E_VFINT_ITR0_MAX_INDEX      2
 #define I40E_VFINT_ITR0_INTERVAL_SHIFT 0
 #define I40E_VFINT_ITR0_INTERVAL_MASK  I40E_MASK(0xFFF, I40E_VFINT_ITR0_INTERVAL_SHIFT)
-#define I40E_VFINT_ITRN(_i, _INTVF)     (0x00020000 + ((_i) * 2048 + (_INTVF) * 4)) /* _i=0...2, _INTVF=0...511 */
+#define I40E_VFINT_ITRN(_i, _INTVF)     (0x00020000 + ((_i) * 2048 + (_INTVF) * 4)) /* _i=0...2, _INTVF=0...511 */ /* Reset: VFR */
 #define I40E_VFINT_ITRN_MAX_INDEX      2
 #define I40E_VFINT_ITRN_INTERVAL_SHIFT 0
 #define I40E_VFINT_ITRN_INTERVAL_MASK  I40E_MASK(0xFFF, I40E_VFINT_ITRN_INTERVAL_SHIFT)
-#define I40E_VFINT_STAT_CTL0(_VF)                 (0x0002A000 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VFINT_STAT_CTL0(_VF)                 (0x0002A000 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: VFR */
 #define I40E_VFINT_STAT_CTL0_MAX_INDEX            127
 #define I40E_VFINT_STAT_CTL0_OTHER_ITR_INDX_SHIFT 2
 #define I40E_VFINT_STAT_CTL0_OTHER_ITR_INDX_MASK  I40E_MASK(0x3, I40E_VFINT_STAT_CTL0_OTHER_ITR_INDX_SHIFT)
-#define I40E_VPINT_AEQCTL(_VF)             (0x0002B800 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VPINT_AEQCTL(_VF)             (0x0002B800 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_VPINT_AEQCTL_MAX_INDEX        127
 #define I40E_VPINT_AEQCTL_MSIX_INDX_SHIFT  0
 #define I40E_VPINT_AEQCTL_MSIX_INDX_MASK   I40E_MASK(0xFF, I40E_VPINT_AEQCTL_MSIX_INDX_SHIFT)
@@ -1408,7 +1196,7 @@
 #define I40E_VPINT_AEQCTL_CAUSE_ENA_MASK   I40E_MASK(0x1, I40E_VPINT_AEQCTL_CAUSE_ENA_SHIFT)
 #define I40E_VPINT_AEQCTL_INTEVENT_SHIFT   31
 #define I40E_VPINT_AEQCTL_INTEVENT_MASK    I40E_MASK(0x1, I40E_VPINT_AEQCTL_INTEVENT_SHIFT)
-#define I40E_VPINT_CEQCTL(_INTVF)          (0x00026800 + ((_INTVF) * 4)) /* _i=0...511 */
+#define I40E_VPINT_CEQCTL(_INTVF)          (0x00026800 + ((_INTVF) * 4)) /* _i=0...511 */ /* Reset: CORER */
 #define I40E_VPINT_CEQCTL_MAX_INDEX        511
 #define I40E_VPINT_CEQCTL_MSIX_INDX_SHIFT  0
 #define I40E_VPINT_CEQCTL_MSIX_INDX_MASK   I40E_MASK(0xFF, I40E_VPINT_CEQCTL_MSIX_INDX_SHIFT)
@@ -1424,48 +1212,48 @@
 #define I40E_VPINT_CEQCTL_CAUSE_ENA_MASK   I40E_MASK(0x1, I40E_VPINT_CEQCTL_CAUSE_ENA_SHIFT)
 #define I40E_VPINT_CEQCTL_INTEVENT_SHIFT   31
 #define I40E_VPINT_CEQCTL_INTEVENT_MASK    I40E_MASK(0x1, I40E_VPINT_CEQCTL_INTEVENT_SHIFT)
-#define I40E_VPINT_LNKLST0(_VF)              (0x0002A800 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VPINT_LNKLST0(_VF)              (0x0002A800 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: VFR */
 #define I40E_VPINT_LNKLST0_MAX_INDEX         127
 #define I40E_VPINT_LNKLST0_FIRSTQ_INDX_SHIFT 0
 #define I40E_VPINT_LNKLST0_FIRSTQ_INDX_MASK  I40E_MASK(0x7FF, I40E_VPINT_LNKLST0_FIRSTQ_INDX_SHIFT)
 #define I40E_VPINT_LNKLST0_FIRSTQ_TYPE_SHIFT 11
 #define I40E_VPINT_LNKLST0_FIRSTQ_TYPE_MASK  I40E_MASK(0x3, I40E_VPINT_LNKLST0_FIRSTQ_TYPE_SHIFT)
-#define I40E_VPINT_LNKLSTN(_INTVF)           (0x00025000 + ((_INTVF) * 4)) /* _i=0...511 */
+#define I40E_VPINT_LNKLSTN(_INTVF)           (0x00025000 + ((_INTVF) * 4)) /* _i=0...511 */ /* Reset: VFR */
 #define I40E_VPINT_LNKLSTN_MAX_INDEX         511
 #define I40E_VPINT_LNKLSTN_FIRSTQ_INDX_SHIFT 0
 #define I40E_VPINT_LNKLSTN_FIRSTQ_INDX_MASK  I40E_MASK(0x7FF, I40E_VPINT_LNKLSTN_FIRSTQ_INDX_SHIFT)
 #define I40E_VPINT_LNKLSTN_FIRSTQ_TYPE_SHIFT 11
 #define I40E_VPINT_LNKLSTN_FIRSTQ_TYPE_MASK  I40E_MASK(0x3, I40E_VPINT_LNKLSTN_FIRSTQ_TYPE_SHIFT)
-#define I40E_VPINT_RATE0(_VF)            (0x0002AC00 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VPINT_RATE0(_VF)            (0x0002AC00 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: VFR */
 #define I40E_VPINT_RATE0_MAX_INDEX       127
 #define I40E_VPINT_RATE0_INTERVAL_SHIFT  0
 #define I40E_VPINT_RATE0_INTERVAL_MASK   I40E_MASK(0x3F, I40E_VPINT_RATE0_INTERVAL_SHIFT)
 #define I40E_VPINT_RATE0_INTRL_ENA_SHIFT 6
 #define I40E_VPINT_RATE0_INTRL_ENA_MASK  I40E_MASK(0x1, I40E_VPINT_RATE0_INTRL_ENA_SHIFT)
-#define I40E_VPINT_RATEN(_INTVF)         (0x00025800 + ((_INTVF) * 4)) /* _i=0...511 */
+#define I40E_VPINT_RATEN(_INTVF)         (0x00025800 + ((_INTVF) * 4)) /* _i=0...511 */ /* Reset: VFR */
 #define I40E_VPINT_RATEN_MAX_INDEX       511
 #define I40E_VPINT_RATEN_INTERVAL_SHIFT  0
 #define I40E_VPINT_RATEN_INTERVAL_MASK   I40E_MASK(0x3F, I40E_VPINT_RATEN_INTERVAL_SHIFT)
 #define I40E_VPINT_RATEN_INTRL_ENA_SHIFT 6
 #define I40E_VPINT_RATEN_INTRL_ENA_MASK  I40E_MASK(0x1, I40E_VPINT_RATEN_INTRL_ENA_SHIFT)
-#define I40E_GL_RDPU_CNTRL                 0x00051060
+#define I40E_GL_RDPU_CNTRL                 0x00051060 /* Reset: CORER */
 #define I40E_GL_RDPU_CNTRL_RX_PAD_EN_SHIFT 0
 #define I40E_GL_RDPU_CNTRL_RX_PAD_EN_MASK  I40E_MASK(0x1, I40E_GL_RDPU_CNTRL_RX_PAD_EN_SHIFT)
 #define I40E_GL_RDPU_CNTRL_ECO_SHIFT       1
 #define I40E_GL_RDPU_CNTRL_ECO_MASK        I40E_MASK(0x7FFFFFFF, I40E_GL_RDPU_CNTRL_ECO_SHIFT)
-#define I40E_GLLAN_RCTL_0                0x0012A500
+#define I40E_GLLAN_RCTL_0                0x0012A500 /* Reset: CORER */
 #define I40E_GLLAN_RCTL_0_PXE_MODE_SHIFT 0
 #define I40E_GLLAN_RCTL_0_PXE_MODE_MASK  I40E_MASK(0x1, I40E_GLLAN_RCTL_0_PXE_MODE_SHIFT)
-#define I40E_GLLAN_TSOMSK_F               0x000442D8
+#define I40E_GLLAN_TSOMSK_F               0x000442D8 /* Reset: CORER */
 #define I40E_GLLAN_TSOMSK_F_TCPMSKF_SHIFT 0
 #define I40E_GLLAN_TSOMSK_F_TCPMSKF_MASK  I40E_MASK(0xFFF, I40E_GLLAN_TSOMSK_F_TCPMSKF_SHIFT)
-#define I40E_GLLAN_TSOMSK_L               0x000442E0
+#define I40E_GLLAN_TSOMSK_L               0x000442E0 /* Reset: CORER */
 #define I40E_GLLAN_TSOMSK_L_TCPMSKL_SHIFT 0
 #define I40E_GLLAN_TSOMSK_L_TCPMSKL_MASK  I40E_MASK(0xFFF, I40E_GLLAN_TSOMSK_L_TCPMSKL_SHIFT)
-#define I40E_GLLAN_TSOMSK_M               0x000442DC
+#define I40E_GLLAN_TSOMSK_M               0x000442DC /* Reset: CORER */
 #define I40E_GLLAN_TSOMSK_M_TCPMSKM_SHIFT 0
 #define I40E_GLLAN_TSOMSK_M_TCPMSKM_MASK  I40E_MASK(0xFFF, I40E_GLLAN_TSOMSK_M_TCPMSKM_SHIFT)
-#define I40E_GLLAN_TXPRE_QDIS(_i)              (0x000e6500 + ((_i) * 4)) /* _i=0...11 */
+#define I40E_GLLAN_TXPRE_QDIS(_i)              (0x000e6500 + ((_i) * 4)) /* _i=0...11 */ /* Reset: CORER */
 #define I40E_GLLAN_TXPRE_QDIS_MAX_INDEX        11
 #define I40E_GLLAN_TXPRE_QDIS_QINDX_SHIFT      0
 #define I40E_GLLAN_TXPRE_QDIS_QINDX_MASK       I40E_MASK(0x7FF, I40E_GLLAN_TXPRE_QDIS_QINDX_SHIFT)
@@ -1475,14 +1263,14 @@
 #define I40E_GLLAN_TXPRE_QDIS_SET_QDIS_MASK    I40E_MASK(0x1, I40E_GLLAN_TXPRE_QDIS_SET_QDIS_SHIFT)
 #define I40E_GLLAN_TXPRE_QDIS_CLEAR_QDIS_SHIFT 31
 #define I40E_GLLAN_TXPRE_QDIS_CLEAR_QDIS_MASK  I40E_MASK(0x1, I40E_GLLAN_TXPRE_QDIS_CLEAR_QDIS_SHIFT)
-#define I40E_PFLAN_QALLOC              0x001C0400
+#define I40E_PFLAN_QALLOC              0x001C0400 /* Reset: CORER */
 #define I40E_PFLAN_QALLOC_FIRSTQ_SHIFT 0
 #define I40E_PFLAN_QALLOC_FIRSTQ_MASK  I40E_MASK(0x7FF, I40E_PFLAN_QALLOC_FIRSTQ_SHIFT)
 #define I40E_PFLAN_QALLOC_LASTQ_SHIFT  16
 #define I40E_PFLAN_QALLOC_LASTQ_MASK   I40E_MASK(0x7FF, I40E_PFLAN_QALLOC_LASTQ_SHIFT)
 #define I40E_PFLAN_QALLOC_VALID_SHIFT  31
 #define I40E_PFLAN_QALLOC_VALID_MASK   I40E_MASK(0x1, I40E_PFLAN_QALLOC_VALID_SHIFT)
-#define I40E_QRX_ENA(_Q)             (0x00120000 + ((_Q) * 4)) /* _i=0...1535 */
+#define I40E_QRX_ENA(_Q)             (0x00120000 + ((_Q) * 4)) /* _i=0...1535 */ /* Reset: PFR */
 #define I40E_QRX_ENA_MAX_INDEX       1535
 #define I40E_QRX_ENA_QENA_REQ_SHIFT  0
 #define I40E_QRX_ENA_QENA_REQ_MASK   I40E_MASK(0x1, I40E_QRX_ENA_QENA_REQ_SHIFT)
@@ -1490,11 +1278,11 @@
 #define I40E_QRX_ENA_FAST_QDIS_MASK  I40E_MASK(0x1, I40E_QRX_ENA_FAST_QDIS_SHIFT)
 #define I40E_QRX_ENA_QENA_STAT_SHIFT 2
 #define I40E_QRX_ENA_QENA_STAT_MASK  I40E_MASK(0x1, I40E_QRX_ENA_QENA_STAT_SHIFT)
-#define I40E_QRX_TAIL(_Q)        (0x00128000 + ((_Q) * 4)) /* _i=0...1535 */
+#define I40E_QRX_TAIL(_Q)        (0x00128000 + ((_Q) * 4)) /* _i=0...1535 */ /* Reset: CORER */
 #define I40E_QRX_TAIL_MAX_INDEX  1535
 #define I40E_QRX_TAIL_TAIL_SHIFT 0
 #define I40E_QRX_TAIL_TAIL_MASK  I40E_MASK(0x1FFF, I40E_QRX_TAIL_TAIL_SHIFT)
-#define I40E_QTX_CTL(_Q)             (0x00104000 + ((_Q) * 4)) /* _i=0...1535 */
+#define I40E_QTX_CTL(_Q)             (0x00104000 + ((_Q) * 4)) /* _i=0...1535 */ /* Reset: CORER */
 #define I40E_QTX_CTL_MAX_INDEX       1535
 #define I40E_QTX_CTL_PFVF_Q_SHIFT    0
 #define I40E_QTX_CTL_PFVF_Q_MASK     I40E_MASK(0x3, I40E_QTX_CTL_PFVF_Q_SHIFT)
@@ -1502,7 +1290,7 @@
 #define I40E_QTX_CTL_PF_INDX_MASK    I40E_MASK(0xF, I40E_QTX_CTL_PF_INDX_SHIFT)
 #define I40E_QTX_CTL_VFVM_INDX_SHIFT 7
 #define I40E_QTX_CTL_VFVM_INDX_MASK  I40E_MASK(0x1FF, I40E_QTX_CTL_VFVM_INDX_SHIFT)
-#define I40E_QTX_ENA(_Q)             (0x00100000 + ((_Q) * 4)) /* _i=0...1535 */
+#define I40E_QTX_ENA(_Q)             (0x00100000 + ((_Q) * 4)) /* _i=0...1535 */ /* Reset: PFR */
 #define I40E_QTX_ENA_MAX_INDEX       1535
 #define I40E_QTX_ENA_QENA_REQ_SHIFT  0
 #define I40E_QTX_ENA_QENA_REQ_MASK   I40E_MASK(0x1, I40E_QTX_ENA_QENA_REQ_SHIFT)
@@ -1510,89 +1298,89 @@
 #define I40E_QTX_ENA_FAST_QDIS_MASK  I40E_MASK(0x1, I40E_QTX_ENA_FAST_QDIS_SHIFT)
 #define I40E_QTX_ENA_QENA_STAT_SHIFT 2
 #define I40E_QTX_ENA_QENA_STAT_MASK  I40E_MASK(0x1, I40E_QTX_ENA_QENA_STAT_SHIFT)
-#define I40E_QTX_HEAD(_Q)              (0x000E4000 + ((_Q) * 4)) /* _i=0...1535 */
+#define I40E_QTX_HEAD(_Q)              (0x000E4000 + ((_Q) * 4)) /* _i=0...1535 */ /* Reset: CORER */
 #define I40E_QTX_HEAD_MAX_INDEX        1535
 #define I40E_QTX_HEAD_HEAD_SHIFT       0
 #define I40E_QTX_HEAD_HEAD_MASK        I40E_MASK(0x1FFF, I40E_QTX_HEAD_HEAD_SHIFT)
 #define I40E_QTX_HEAD_RS_PENDING_SHIFT 16
 #define I40E_QTX_HEAD_RS_PENDING_MASK  I40E_MASK(0x1, I40E_QTX_HEAD_RS_PENDING_SHIFT)
-#define I40E_QTX_TAIL(_Q)        (0x00108000 + ((_Q) * 4)) /* _i=0...1535 */
+#define I40E_QTX_TAIL(_Q)        (0x00108000 + ((_Q) * 4)) /* _i=0...1535 */ /* Reset: PFR */
 #define I40E_QTX_TAIL_MAX_INDEX  1535
 #define I40E_QTX_TAIL_TAIL_SHIFT 0
 #define I40E_QTX_TAIL_TAIL_MASK  I40E_MASK(0x1FFF, I40E_QTX_TAIL_TAIL_SHIFT)
-#define I40E_VPLAN_MAPENA(_VF)           (0x00074000 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VPLAN_MAPENA(_VF)           (0x00074000 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: VFR */
 #define I40E_VPLAN_MAPENA_MAX_INDEX      127
 #define I40E_VPLAN_MAPENA_TXRX_ENA_SHIFT 0
 #define I40E_VPLAN_MAPENA_TXRX_ENA_MASK  I40E_MASK(0x1, I40E_VPLAN_MAPENA_TXRX_ENA_SHIFT)
-#define I40E_VPLAN_QTABLE(_i, _VF)      (0x00070000 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...15, _VF=0...127 */
+#define I40E_VPLAN_QTABLE(_i, _VF)      (0x00070000 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...15, _VF=0...127 */ /* Reset: VFR */
 #define I40E_VPLAN_QTABLE_MAX_INDEX    15
 #define I40E_VPLAN_QTABLE_QINDEX_SHIFT 0
 #define I40E_VPLAN_QTABLE_QINDEX_MASK  I40E_MASK(0x7FF, I40E_VPLAN_QTABLE_QINDEX_SHIFT)
-#define I40E_VSILAN_QBASE(_VSI)               (0x0020C800 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSILAN_QBASE(_VSI)               (0x0020C800 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSILAN_QBASE_MAX_INDEX           383
 #define I40E_VSILAN_QBASE_VSIBASE_SHIFT       0
 #define I40E_VSILAN_QBASE_VSIBASE_MASK        I40E_MASK(0x7FF, I40E_VSILAN_QBASE_VSIBASE_SHIFT)
 #define I40E_VSILAN_QBASE_VSIQTABLE_ENA_SHIFT 11
 #define I40E_VSILAN_QBASE_VSIQTABLE_ENA_MASK  I40E_MASK(0x1, I40E_VSILAN_QBASE_VSIQTABLE_ENA_SHIFT)
-#define I40E_VSILAN_QTABLE(_i, _VSI)       (0x00200000 + ((_i) * 2048 + (_VSI) * 4)) /* _i=0...7, _VSI=0...383 */
+#define I40E_VSILAN_QTABLE(_i, _VSI)       (0x00200000 + ((_i) * 2048 + (_VSI) * 4)) /* _i=0...7, _VSI=0...383 */ /* Reset: PFR */
 #define I40E_VSILAN_QTABLE_MAX_INDEX      7
 #define I40E_VSILAN_QTABLE_QINDEX_0_SHIFT 0
 #define I40E_VSILAN_QTABLE_QINDEX_0_MASK  I40E_MASK(0x7FF, I40E_VSILAN_QTABLE_QINDEX_0_SHIFT)
 #define I40E_VSILAN_QTABLE_QINDEX_1_SHIFT 16
 #define I40E_VSILAN_QTABLE_QINDEX_1_MASK  I40E_MASK(0x7FF, I40E_VSILAN_QTABLE_QINDEX_1_SHIFT)
-#define I40E_PRTGL_SAH              0x001E2140
+#define I40E_PRTGL_SAH              0x001E2140 /* Reset: GLOBR */
 #define I40E_PRTGL_SAH_FC_SAH_SHIFT 0
 #define I40E_PRTGL_SAH_FC_SAH_MASK  I40E_MASK(0xFFFF, I40E_PRTGL_SAH_FC_SAH_SHIFT)
 #define I40E_PRTGL_SAH_MFS_SHIFT    16
 #define I40E_PRTGL_SAH_MFS_MASK     I40E_MASK(0xFFFF, I40E_PRTGL_SAH_MFS_SHIFT)
-#define I40E_PRTGL_SAL              0x001E2120
+#define I40E_PRTGL_SAL              0x001E2120 /* Reset: GLOBR */
 #define I40E_PRTGL_SAL_FC_SAL_SHIFT 0
 #define I40E_PRTGL_SAL_FC_SAL_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTGL_SAL_FC_SAL_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_GCP                              0x001E30E0
+#define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_GCP                              0x001E30E0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_GCP_HSEC_CTL_RX_ENABLE_GCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_GCP_HSEC_CTL_RX_ENABLE_GCP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_ENABLE_GCP_HSEC_CTL_RX_ENABLE_GCP_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_GPP                              0x001E3260
+#define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_GPP                              0x001E3260 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_GPP_HSEC_CTL_RX_ENABLE_GPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_GPP_HSEC_CTL_RX_ENABLE_GPP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_ENABLE_GPP_HSEC_CTL_RX_ENABLE_GPP_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_PPP                              0x001E32E0
+#define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_PPP                              0x001E32E0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_PPP_HSEC_CTL_RX_ENABLE_PPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_PPP_HSEC_CTL_RX_ENABLE_PPP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_ENABLE_PPP_HSEC_CTL_RX_ENABLE_PPP_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_RX_FORWARD_CONTROL                                   0x001E3360
+#define I40E_PRTMAC_HSEC_CTL_RX_FORWARD_CONTROL                                   0x001E3360 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_FORWARD_CONTROL_HSEC_CTL_RX_FORWARD_CONTROL_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_FORWARD_CONTROL_HSEC_CTL_RX_FORWARD_CONTROL_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_FORWARD_CONTROL_HSEC_CTL_RX_FORWARD_CONTROL_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_UCAST_PART1                                        0x001E3110
+#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_UCAST_PART1                                        0x001E3110 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_UCAST_PART1_HSEC_CTL_RX_PAUSE_DA_UCAST_PART1_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_UCAST_PART1_HSEC_CTL_RX_PAUSE_DA_UCAST_PART1_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_UCAST_PART1_HSEC_CTL_RX_PAUSE_DA_UCAST_PART1_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_UCAST_PART2                                        0x001E3120
+#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_UCAST_PART2                                        0x001E3120 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_UCAST_PART2_HSEC_CTL_RX_PAUSE_DA_UCAST_PART2_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_UCAST_PART2_HSEC_CTL_RX_PAUSE_DA_UCAST_PART2_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_UCAST_PART2_HSEC_CTL_RX_PAUSE_DA_UCAST_PART2_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_ENABLE                                0x001E30C0
+#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_ENABLE                                0x001E30C0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_ENABLE_HSEC_CTL_RX_PAUSE_ENABLE_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_ENABLE_HSEC_CTL_RX_PAUSE_ENABLE_MASK  I40E_MASK(0x1FF, I40E_PRTMAC_HSEC_CTL_RX_PAUSE_ENABLE_HSEC_CTL_RX_PAUSE_ENABLE_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_SA_PART1                                  0x001E3140
+#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_SA_PART1                                  0x001E3140 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_SA_PART1_HSEC_CTL_RX_PAUSE_SA_PART1_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_SA_PART1_HSEC_CTL_RX_PAUSE_SA_PART1_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTMAC_HSEC_CTL_RX_PAUSE_SA_PART1_HSEC_CTL_RX_PAUSE_SA_PART1_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_SA_PART2                                  0x001E3150
+#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_SA_PART2                                  0x001E3150 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_SA_PART2_HSEC_CTL_RX_PAUSE_SA_PART2_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_SA_PART2_HSEC_CTL_RX_PAUSE_SA_PART2_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_RX_PAUSE_SA_PART2_HSEC_CTL_RX_PAUSE_SA_PART2_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_ENABLE                                0x001E30D0
+#define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_ENABLE                                0x001E30D0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_ENABLE_HSEC_CTL_TX_PAUSE_ENABLE_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_ENABLE_HSEC_CTL_TX_PAUSE_ENABLE_MASK  I40E_MASK(0x1FF, I40E_PRTMAC_HSEC_CTL_TX_PAUSE_ENABLE_HSEC_CTL_TX_PAUSE_ENABLE_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_QUANTA(_i)                            (0x001E3370 + ((_i) * 16)) /* _i=0...8 */
+#define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_QUANTA(_i)                            (0x001E3370 + ((_i) * 16)) /* _i=0...8 */ /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_QUANTA_MAX_INDEX                      8
 #define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_QUANTA_HSEC_CTL_TX_PAUSE_QUANTA_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_QUANTA_HSEC_CTL_TX_PAUSE_QUANTA_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_TX_PAUSE_QUANTA_HSEC_CTL_TX_PAUSE_QUANTA_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_REFRESH_TIMER(_i)                                   (0x001E3400 + ((_i) * 16)) /* _i=0...8 */
+#define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_REFRESH_TIMER(_i)                                   (0x001E3400 + ((_i) * 16)) /* _i=0...8 */ /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_REFRESH_TIMER_MAX_INDEX                             8
 #define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_REFRESH_TIMER_HSEC_CTL_TX_PAUSE_REFRESH_TIMER_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_REFRESH_TIMER_HSEC_CTL_TX_PAUSE_REFRESH_TIMER_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_TX_PAUSE_REFRESH_TIMER_HSEC_CTL_TX_PAUSE_REFRESH_TIMER_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_TX_SA_PART1                            0x001E34B0
+#define I40E_PRTMAC_HSEC_CTL_TX_SA_PART1                            0x001E34B0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_SA_PART1_HSEC_CTL_TX_SA_PART1_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_SA_PART1_HSEC_CTL_TX_SA_PART1_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTMAC_HSEC_CTL_TX_SA_PART1_HSEC_CTL_TX_SA_PART1_SHIFT)
-#define I40E_PRTMAC_HSEC_CTL_TX_SA_PART2                            0x001E34C0
+#define I40E_PRTMAC_HSEC_CTL_TX_SA_PART2                            0x001E34C0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_SA_PART2_HSEC_CTL_TX_SA_PART2_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_SA_PART2_HSEC_CTL_TX_SA_PART2_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_TX_SA_PART2_HSEC_CTL_TX_SA_PART2_SHIFT)
-#define I40E_PRTMAC_PCS_XAUI_SWAP_A                     0x0008C480
+#define I40E_PRTMAC_PCS_XAUI_SWAP_A                     0x0008C480 /* Reset: GLOBR */
 #define I40E_PRTMAC_PCS_XAUI_SWAP_A_SWAP_TX_LANE3_SHIFT 0
 #define I40E_PRTMAC_PCS_XAUI_SWAP_A_SWAP_TX_LANE3_MASK  I40E_MASK(0x3, I40E_PRTMAC_PCS_XAUI_SWAP_A_SWAP_TX_LANE3_SHIFT)
 #define I40E_PRTMAC_PCS_XAUI_SWAP_A_SWAP_TX_LANE2_SHIFT 2
@@ -1609,7 +1397,7 @@
 #define I40E_PRTMAC_PCS_XAUI_SWAP_A_SWAP_RX_LANE1_MASK  I40E_MASK(0x3, I40E_PRTMAC_PCS_XAUI_SWAP_A_SWAP_RX_LANE1_SHIFT)
 #define I40E_PRTMAC_PCS_XAUI_SWAP_A_SWAP_RX_LANE0_SHIFT 14
 #define I40E_PRTMAC_PCS_XAUI_SWAP_A_SWAP_RX_LANE0_MASK  I40E_MASK(0x3, I40E_PRTMAC_PCS_XAUI_SWAP_A_SWAP_RX_LANE0_SHIFT)
-#define I40E_PRTMAC_PCS_XAUI_SWAP_B                     0x0008C484
+#define I40E_PRTMAC_PCS_XAUI_SWAP_B                     0x0008C484 /* Reset: GLOBR */
 #define I40E_PRTMAC_PCS_XAUI_SWAP_B_SWAP_TX_LANE3_SHIFT 0
 #define I40E_PRTMAC_PCS_XAUI_SWAP_B_SWAP_TX_LANE3_MASK  I40E_MASK(0x3, I40E_PRTMAC_PCS_XAUI_SWAP_B_SWAP_TX_LANE3_SHIFT)
 #define I40E_PRTMAC_PCS_XAUI_SWAP_B_SWAP_TX_LANE2_SHIFT 2
@@ -1626,10 +1414,10 @@
 #define I40E_PRTMAC_PCS_XAUI_SWAP_B_SWAP_RX_LANE1_MASK  I40E_MASK(0x3, I40E_PRTMAC_PCS_XAUI_SWAP_B_SWAP_RX_LANE1_SHIFT)
 #define I40E_PRTMAC_PCS_XAUI_SWAP_B_SWAP_RX_LANE0_SHIFT 14
 #define I40E_PRTMAC_PCS_XAUI_SWAP_B_SWAP_RX_LANE0_MASK  I40E_MASK(0x3, I40E_PRTMAC_PCS_XAUI_SWAP_B_SWAP_RX_LANE0_SHIFT)
-#define I40E_GL_FWRESETCNT                  0x00083100
+#define I40E_GL_FWRESETCNT                  0x00083100 /* Reset: POR */
 #define I40E_GL_FWRESETCNT_FWRESETCNT_SHIFT 0
 #define I40E_GL_FWRESETCNT_FWRESETCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_FWRESETCNT_FWRESETCNT_SHIFT)
-#define I40E_GL_MNG_FWSM                              0x000B6134
+#define I40E_GL_MNG_FWSM                              0x000B6134 /* Reset: POR */
 #define I40E_GL_MNG_FWSM_FW_MODES_SHIFT               0
 #define I40E_GL_MNG_FWSM_FW_MODES_MASK                I40E_MASK(0x3, I40E_GL_MNG_FWSM_FW_MODES_SHIFT)
 #define I40E_GL_MNG_FWSM_EEP_RELOAD_IND_SHIFT         10
@@ -1650,21 +1438,21 @@
 #define I40E_GL_MNG_FWSM_PHY_SERDES2_CONFIG_ERR_MASK  I40E_MASK(0x1, I40E_GL_MNG_FWSM_PHY_SERDES2_CONFIG_ERR_SHIFT)
 #define I40E_GL_MNG_FWSM_PHY_SERDES3_CONFIG_ERR_SHIFT 29
 #define I40E_GL_MNG_FWSM_PHY_SERDES3_CONFIG_ERR_MASK  I40E_MASK(0x1, I40E_GL_MNG_FWSM_PHY_SERDES3_CONFIG_ERR_SHIFT)
-#define I40E_GL_MNG_HWARB_CTRL                   0x000B6130
+#define I40E_GL_MNG_HWARB_CTRL                   0x000B6130 /* Reset: POR */
 #define I40E_GL_MNG_HWARB_CTRL_NCSI_ARB_EN_SHIFT 0
 #define I40E_GL_MNG_HWARB_CTRL_NCSI_ARB_EN_MASK  I40E_MASK(0x1, I40E_GL_MNG_HWARB_CTRL_NCSI_ARB_EN_SHIFT)
-#define I40E_PRT_MNG_FTFT_DATA(_i)         (0x000852A0 + ((_i) * 32)) /* _i=0...31 */
+#define I40E_PRT_MNG_FTFT_DATA(_i)         (0x000852A0 + ((_i) * 32)) /* _i=0...31 */ /* Reset: POR */
 #define I40E_PRT_MNG_FTFT_DATA_MAX_INDEX   31
 #define I40E_PRT_MNG_FTFT_DATA_DWORD_SHIFT 0
 #define I40E_PRT_MNG_FTFT_DATA_DWORD_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRT_MNG_FTFT_DATA_DWORD_SHIFT)
-#define I40E_PRT_MNG_FTFT_LENGTH              0x00085260
+#define I40E_PRT_MNG_FTFT_LENGTH              0x00085260 /* Reset: POR */
 #define I40E_PRT_MNG_FTFT_LENGTH_LENGTH_SHIFT 0
 #define I40E_PRT_MNG_FTFT_LENGTH_LENGTH_MASK  I40E_MASK(0xFF, I40E_PRT_MNG_FTFT_LENGTH_LENGTH_SHIFT)
-#define I40E_PRT_MNG_FTFT_MASK(_i)        (0x00085160 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRT_MNG_FTFT_MASK(_i)        (0x00085160 + ((_i) * 32)) /* _i=0...7 */ /* Reset: POR */
 #define I40E_PRT_MNG_FTFT_MASK_MAX_INDEX  7
 #define I40E_PRT_MNG_FTFT_MASK_MASK_SHIFT 0
 #define I40E_PRT_MNG_FTFT_MASK_MASK_MASK  I40E_MASK(0xFFFF, I40E_PRT_MNG_FTFT_MASK_MASK_SHIFT)
-#define I40E_PRT_MNG_MANC                            0x00256A20
+#define I40E_PRT_MNG_MANC                            0x00256A20 /* Reset: POR */
 #define I40E_PRT_MNG_MANC_FLOW_CONTROL_DISCARD_SHIFT 0
 #define I40E_PRT_MNG_MANC_FLOW_CONTROL_DISCARD_MASK  I40E_MASK(0x1, I40E_PRT_MNG_MANC_FLOW_CONTROL_DISCARD_SHIFT)
 #define I40E_PRT_MNG_MANC_NCSI_DISCARD_SHIFT         1
@@ -1681,11 +1469,11 @@
 #define I40E_PRT_MNG_MANC_EN_BMC2OS_MASK             I40E_MASK(0x1, I40E_PRT_MNG_MANC_EN_BMC2OS_SHIFT)
 #define I40E_PRT_MNG_MANC_EN_BMC2NET_SHIFT           29
 #define I40E_PRT_MNG_MANC_EN_BMC2NET_MASK            I40E_MASK(0x1, I40E_PRT_MNG_MANC_EN_BMC2NET_SHIFT)
-#define I40E_PRT_MNG_MAVTV(_i)       (0x00255900 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRT_MNG_MAVTV(_i)       (0x00255900 + ((_i) * 32)) /* _i=0...7 */ /* Reset: POR */
 #define I40E_PRT_MNG_MAVTV_MAX_INDEX 7
 #define I40E_PRT_MNG_MAVTV_VID_SHIFT 0
 #define I40E_PRT_MNG_MAVTV_VID_MASK  I40E_MASK(0xFFF, I40E_PRT_MNG_MAVTV_VID_SHIFT)
-#define I40E_PRT_MNG_MDEF(_i)                             (0x00255D00 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRT_MNG_MDEF(_i)                             (0x00255D00 + ((_i) * 32)) /* _i=0...7 */ /* Reset: POR */
 #define I40E_PRT_MNG_MDEF_MAX_INDEX                       7
 #define I40E_PRT_MNG_MDEF_MAC_EXACT_AND_SHIFT             0
 #define I40E_PRT_MNG_MDEF_MAC_EXACT_AND_MASK              I40E_MASK(0xF, I40E_PRT_MNG_MDEF_MAC_EXACT_AND_SHIFT)
@@ -1713,7 +1501,7 @@
 #define I40E_PRT_MNG_MDEF_PORT_0X298_OR_MASK              I40E_MASK(0x1, I40E_PRT_MNG_MDEF_PORT_0X298_OR_SHIFT)
 #define I40E_PRT_MNG_MDEF_PORT_0X26F_OR_SHIFT             31
 #define I40E_PRT_MNG_MDEF_PORT_0X26F_OR_MASK              I40E_MASK(0x1, I40E_PRT_MNG_MDEF_PORT_0X26F_OR_SHIFT)
-#define I40E_PRT_MNG_MDEF_EXT(_i)                             (0x00255F00 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRT_MNG_MDEF_EXT(_i)                             (0x00255F00 + ((_i) * 32)) /* _i=0...7 */ /* Reset: POR */
 #define I40E_PRT_MNG_MDEF_EXT_MAX_INDEX                       7
 #define I40E_PRT_MNG_MDEF_EXT_L2_ETHERTYPE_AND_SHIFT          0
 #define I40E_PRT_MNG_MDEF_EXT_L2_ETHERTYPE_AND_MASK           I40E_MASK(0xF, I40E_PRT_MNG_MDEF_EXT_L2_ETHERTYPE_AND_SHIFT)
@@ -1737,19 +1525,19 @@
 #define I40E_PRT_MNG_MDEF_EXT_APPLY_TO_NETWORK_TRAFFIC_MASK   I40E_MASK(0x1, I40E_PRT_MNG_MDEF_EXT_APPLY_TO_NETWORK_TRAFFIC_SHIFT)
 #define I40E_PRT_MNG_MDEF_EXT_APPLY_TO_HOST_TRAFFIC_SHIFT     31
 #define I40E_PRT_MNG_MDEF_EXT_APPLY_TO_HOST_TRAFFIC_MASK      I40E_MASK(0x1, I40E_PRT_MNG_MDEF_EXT_APPLY_TO_HOST_TRAFFIC_SHIFT)
-#define I40E_PRT_MNG_MDEFVSI(_i)                (0x00256580 + ((_i) * 32)) /* _i=0...3 */
+#define I40E_PRT_MNG_MDEFVSI(_i)                (0x00256580 + ((_i) * 32)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_PRT_MNG_MDEFVSI_MAX_INDEX          3
 #define I40E_PRT_MNG_MDEFVSI_MDEFVSI_2N_SHIFT   0
 #define I40E_PRT_MNG_MDEFVSI_MDEFVSI_2N_MASK    I40E_MASK(0xFFFF, I40E_PRT_MNG_MDEFVSI_MDEFVSI_2N_SHIFT)
 #define I40E_PRT_MNG_MDEFVSI_MDEFVSI_2NP1_SHIFT 16
 #define I40E_PRT_MNG_MDEFVSI_MDEFVSI_2NP1_MASK  I40E_MASK(0xFFFF, I40E_PRT_MNG_MDEFVSI_MDEFVSI_2NP1_SHIFT)
-#define I40E_PRT_MNG_METF(_i)            (0x00256780 + ((_i) * 32)) /* _i=0...3 */
+#define I40E_PRT_MNG_METF(_i)            (0x00256780 + ((_i) * 32)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_PRT_MNG_METF_MAX_INDEX      3
 #define I40E_PRT_MNG_METF_ETYPE_SHIFT    0
 #define I40E_PRT_MNG_METF_ETYPE_MASK     I40E_MASK(0xFFFF, I40E_PRT_MNG_METF_ETYPE_SHIFT)
 #define I40E_PRT_MNG_METF_POLARITY_SHIFT 30
 #define I40E_PRT_MNG_METF_POLARITY_MASK  I40E_MASK(0x1, I40E_PRT_MNG_METF_POLARITY_SHIFT)
-#define I40E_PRT_MNG_MFUTP(_i)                      (0x00254E00 + ((_i) * 32)) /* _i=0...15 */
+#define I40E_PRT_MNG_MFUTP(_i)                      (0x00254E00 + ((_i) * 32)) /* _i=0...15 */ /* Reset: POR */
 #define I40E_PRT_MNG_MFUTP_MAX_INDEX                15
 #define I40E_PRT_MNG_MFUTP_MFUTP_N_SHIFT            0
 #define I40E_PRT_MNG_MFUTP_MFUTP_N_MASK             I40E_MASK(0xFFFF, I40E_PRT_MNG_MFUTP_MFUTP_N_SHIFT)
@@ -1759,26 +1547,26 @@
 #define I40E_PRT_MNG_MFUTP_TCP_MASK                 I40E_MASK(0x1, I40E_PRT_MNG_MFUTP_TCP_SHIFT)
 #define I40E_PRT_MNG_MFUTP_SOURCE_DESTINATION_SHIFT 18
 #define I40E_PRT_MNG_MFUTP_SOURCE_DESTINATION_MASK  I40E_MASK(0x1, I40E_PRT_MNG_MFUTP_SOURCE_DESTINATION_SHIFT)
-#define I40E_PRT_MNG_MIPAF4(_i)         (0x00256280 + ((_i) * 32)) /* _i=0...3 */
+#define I40E_PRT_MNG_MIPAF4(_i)         (0x00256280 + ((_i) * 32)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_PRT_MNG_MIPAF4_MAX_INDEX   3
 #define I40E_PRT_MNG_MIPAF4_MIPAF_SHIFT 0
 #define I40E_PRT_MNG_MIPAF4_MIPAF_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRT_MNG_MIPAF4_MIPAF_SHIFT)
-#define I40E_PRT_MNG_MIPAF6(_i)         (0x00254200 + ((_i) * 32)) /* _i=0...15 */
+#define I40E_PRT_MNG_MIPAF6(_i)         (0x00254200 + ((_i) * 32)) /* _i=0...15 */ /* Reset: POR */
 #define I40E_PRT_MNG_MIPAF6_MAX_INDEX   15
 #define I40E_PRT_MNG_MIPAF6_MIPAF_SHIFT 0
 #define I40E_PRT_MNG_MIPAF6_MIPAF_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRT_MNG_MIPAF6_MIPAF_SHIFT)
-#define I40E_PRT_MNG_MMAH(_i)        (0x00256380 + ((_i) * 32)) /* _i=0...3 */
+#define I40E_PRT_MNG_MMAH(_i)        (0x00256380 + ((_i) * 32)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_PRT_MNG_MMAH_MAX_INDEX  3
 #define I40E_PRT_MNG_MMAH_MMAH_SHIFT 0
 #define I40E_PRT_MNG_MMAH_MMAH_MASK  I40E_MASK(0xFFFF, I40E_PRT_MNG_MMAH_MMAH_SHIFT)
-#define I40E_PRT_MNG_MMAL(_i)        (0x00256480 + ((_i) * 32)) /* _i=0...3 */
+#define I40E_PRT_MNG_MMAL(_i)        (0x00256480 + ((_i) * 32)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_PRT_MNG_MMAL_MAX_INDEX  3
 #define I40E_PRT_MNG_MMAL_MMAL_SHIFT 0
 #define I40E_PRT_MNG_MMAL_MMAL_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRT_MNG_MMAL_MMAL_SHIFT)
-#define I40E_PRT_MNG_MNGONLY                                  0x00256A60
+#define I40E_PRT_MNG_MNGONLY                                  0x00256A60 /* Reset: POR */
 #define I40E_PRT_MNG_MNGONLY_EXCLUSIVE_TO_MANAGEABILITY_SHIFT 0
 #define I40E_PRT_MNG_MNGONLY_EXCLUSIVE_TO_MANAGEABILITY_MASK  I40E_MASK(0xFF, I40E_PRT_MNG_MNGONLY_EXCLUSIVE_TO_MANAGEABILITY_SHIFT)
-#define I40E_PRT_MNG_MSFM                    0x00256AA0
+#define I40E_PRT_MNG_MSFM                    0x00256AA0 /* Reset: POR */
 #define I40E_PRT_MNG_MSFM_PORT_26F_UDP_SHIFT 0
 #define I40E_PRT_MNG_MSFM_PORT_26F_UDP_MASK  I40E_MASK(0x1, I40E_PRT_MNG_MSFM_PORT_26F_UDP_SHIFT)
 #define I40E_PRT_MNG_MSFM_PORT_26F_TCP_SHIFT 1
@@ -1795,51 +1583,51 @@
 #define I40E_PRT_MNG_MSFM_IPV6_2_MASK_MASK   I40E_MASK(0x1, I40E_PRT_MNG_MSFM_IPV6_2_MASK_SHIFT)
 #define I40E_PRT_MNG_MSFM_IPV6_3_MASK_SHIFT  7
 #define I40E_PRT_MNG_MSFM_IPV6_3_MASK_MASK   I40E_MASK(0x1, I40E_PRT_MNG_MSFM_IPV6_3_MASK_SHIFT)
-#define I40E_MSIX_PBA(_i)          (0x00001000 + ((_i) * 4)) /* _i=0...5 */
+#define I40E_MSIX_PBA(_i)          (0x00001000 + ((_i) * 4)) /* _i=0...5 */ /* Reset: FLR */
 #define I40E_MSIX_PBA_MAX_INDEX    5
 #define I40E_MSIX_PBA_PENBIT_SHIFT 0
 #define I40E_MSIX_PBA_PENBIT_MASK  I40E_MASK(0xFFFFFFFF, I40E_MSIX_PBA_PENBIT_SHIFT)
-#define I40E_MSIX_TADD(_i)              (0x00000000 + ((_i) * 16)) /* _i=0...128 */
+#define I40E_MSIX_TADD(_i)              (0x00000000 + ((_i) * 16)) /* _i=0...128 */ /* Reset: FLR */
 #define I40E_MSIX_TADD_MAX_INDEX        128
 #define I40E_MSIX_TADD_MSIXTADD10_SHIFT 0
 #define I40E_MSIX_TADD_MSIXTADD10_MASK  I40E_MASK(0x3, I40E_MSIX_TADD_MSIXTADD10_SHIFT)
 #define I40E_MSIX_TADD_MSIXTADD_SHIFT   2
 #define I40E_MSIX_TADD_MSIXTADD_MASK    I40E_MASK(0x3FFFFFFF, I40E_MSIX_TADD_MSIXTADD_SHIFT)
-#define I40E_MSIX_TMSG(_i)            (0x00000008 + ((_i) * 16)) /* _i=0...128 */
+#define I40E_MSIX_TMSG(_i)            (0x00000008 + ((_i) * 16)) /* _i=0...128 */ /* Reset: FLR */
 #define I40E_MSIX_TMSG_MAX_INDEX      128
 #define I40E_MSIX_TMSG_MSIXTMSG_SHIFT 0
 #define I40E_MSIX_TMSG_MSIXTMSG_MASK  I40E_MASK(0xFFFFFFFF, I40E_MSIX_TMSG_MSIXTMSG_SHIFT)
-#define I40E_MSIX_TUADD(_i)             (0x00000004 + ((_i) * 16)) /* _i=0...128 */
+#define I40E_MSIX_TUADD(_i)             (0x00000004 + ((_i) * 16)) /* _i=0...128 */ /* Reset: FLR */
 #define I40E_MSIX_TUADD_MAX_INDEX       128
 #define I40E_MSIX_TUADD_MSIXTUADD_SHIFT 0
 #define I40E_MSIX_TUADD_MSIXTUADD_MASK  I40E_MASK(0xFFFFFFFF, I40E_MSIX_TUADD_MSIXTUADD_SHIFT)
-#define I40E_MSIX_TVCTRL(_i)        (0x0000000C + ((_i) * 16)) /* _i=0...128 */
+#define I40E_MSIX_TVCTRL(_i)        (0x0000000C + ((_i) * 16)) /* _i=0...128 */ /* Reset: FLR */
 #define I40E_MSIX_TVCTRL_MAX_INDEX  128
 #define I40E_MSIX_TVCTRL_MASK_SHIFT 0
 #define I40E_MSIX_TVCTRL_MASK_MASK  I40E_MASK(0x1, I40E_MSIX_TVCTRL_MASK_SHIFT)
-#define I40E_VFMSIX_PBA1(_i)          (0x00002000 + ((_i) * 4)) /* _i=0...19 */
+#define I40E_VFMSIX_PBA1(_i)          (0x00002000 + ((_i) * 4)) /* _i=0...19 */ /* Reset: VFLR */
 #define I40E_VFMSIX_PBA1_MAX_INDEX    19
 #define I40E_VFMSIX_PBA1_PENBIT_SHIFT 0
 #define I40E_VFMSIX_PBA1_PENBIT_MASK  I40E_MASK(0xFFFFFFFF, I40E_VFMSIX_PBA1_PENBIT_SHIFT)
-#define I40E_VFMSIX_TADD1(_i)              (0x00002100 + ((_i) * 16)) /* _i=0...639 */
+#define I40E_VFMSIX_TADD1(_i)              (0x00002100 + ((_i) * 16)) /* _i=0...639 */ /* Reset: VFLR */
 #define I40E_VFMSIX_TADD1_MAX_INDEX        639
 #define I40E_VFMSIX_TADD1_MSIXTADD10_SHIFT 0
 #define I40E_VFMSIX_TADD1_MSIXTADD10_MASK  I40E_MASK(0x3, I40E_VFMSIX_TADD1_MSIXTADD10_SHIFT)
 #define I40E_VFMSIX_TADD1_MSIXTADD_SHIFT   2
 #define I40E_VFMSIX_TADD1_MSIXTADD_MASK    I40E_MASK(0x3FFFFFFF, I40E_VFMSIX_TADD1_MSIXTADD_SHIFT)
-#define I40E_VFMSIX_TMSG1(_i)            (0x00002108 + ((_i) * 16)) /* _i=0...639 */
+#define I40E_VFMSIX_TMSG1(_i)            (0x00002108 + ((_i) * 16)) /* _i=0...639 */ /* Reset: VFLR */
 #define I40E_VFMSIX_TMSG1_MAX_INDEX      639
 #define I40E_VFMSIX_TMSG1_MSIXTMSG_SHIFT 0
 #define I40E_VFMSIX_TMSG1_MSIXTMSG_MASK  I40E_MASK(0xFFFFFFFF, I40E_VFMSIX_TMSG1_MSIXTMSG_SHIFT)
-#define I40E_VFMSIX_TUADD1(_i)             (0x00002104 + ((_i) * 16)) /* _i=0...639 */
+#define I40E_VFMSIX_TUADD1(_i)             (0x00002104 + ((_i) * 16)) /* _i=0...639 */ /* Reset: VFLR */
 #define I40E_VFMSIX_TUADD1_MAX_INDEX       639
 #define I40E_VFMSIX_TUADD1_MSIXTUADD_SHIFT 0
 #define I40E_VFMSIX_TUADD1_MSIXTUADD_MASK  I40E_MASK(0xFFFFFFFF, I40E_VFMSIX_TUADD1_MSIXTUADD_SHIFT)
-#define I40E_VFMSIX_TVCTRL1(_i)        (0x0000210C + ((_i) * 16)) /* _i=0...639 */
+#define I40E_VFMSIX_TVCTRL1(_i)        (0x0000210C + ((_i) * 16)) /* _i=0...639 */ /* Reset: VFLR */
 #define I40E_VFMSIX_TVCTRL1_MAX_INDEX  639
 #define I40E_VFMSIX_TVCTRL1_MASK_SHIFT 0
 #define I40E_VFMSIX_TVCTRL1_MASK_MASK  I40E_MASK(0x1, I40E_VFMSIX_TVCTRL1_MASK_SHIFT)
-#define I40E_GLNVM_FLA                0x000B6108
+#define I40E_GLNVM_FLA                0x000B6108 /* Reset: POR */
 #define I40E_GLNVM_FLA_FL_SCK_SHIFT   0
 #define I40E_GLNVM_FLA_FL_SCK_MASK    I40E_MASK(0x1, I40E_GLNVM_FLA_FL_SCK_SHIFT)
 #define I40E_GLNVM_FLA_FL_CE_SHIFT    1
@@ -1860,12 +1648,12 @@
 #define I40E_GLNVM_FLA_FL_BUSY_MASK   I40E_MASK(0x1, I40E_GLNVM_FLA_FL_BUSY_SHIFT)
 #define I40E_GLNVM_FLA_FL_DER_SHIFT   31
 #define I40E_GLNVM_FLA_FL_DER_MASK    I40E_MASK(0x1, I40E_GLNVM_FLA_FL_DER_SHIFT)
-#define I40E_GLNVM_FLASHID                  0x000B6104
+#define I40E_GLNVM_FLASHID                  0x000B6104 /* Reset: POR */
 #define I40E_GLNVM_FLASHID_FLASHID_SHIFT    0
 #define I40E_GLNVM_FLASHID_FLASHID_MASK     I40E_MASK(0xFFFFFF, I40E_GLNVM_FLASHID_FLASHID_SHIFT)
 #define I40E_GLNVM_FLASHID_FLEEP_PERF_SHIFT 31
 #define I40E_GLNVM_FLASHID_FLEEP_PERF_MASK  I40E_MASK(0x1, I40E_GLNVM_FLASHID_FLEEP_PERF_SHIFT)
-#define I40E_GLNVM_GENS                  0x000B6100
+#define I40E_GLNVM_GENS                  0x000B6100 /* Reset: POR */
 #define I40E_GLNVM_GENS_NVM_PRES_SHIFT   0
 #define I40E_GLNVM_GENS_NVM_PRES_MASK    I40E_MASK(0x1, I40E_GLNVM_GENS_NVM_PRES_SHIFT)
 #define I40E_GLNVM_GENS_SR_SIZE_SHIFT    5
@@ -1876,11 +1664,11 @@
 #define I40E_GLNVM_GENS_ALT_PRST_MASK    I40E_MASK(0x1, I40E_GLNVM_GENS_ALT_PRST_SHIFT)
 #define I40E_GLNVM_GENS_FL_AUTO_RD_SHIFT 25
 #define I40E_GLNVM_GENS_FL_AUTO_RD_MASK  I40E_MASK(0x1, I40E_GLNVM_GENS_FL_AUTO_RD_SHIFT)
-#define I40E_GLNVM_PROTCSR(_i)              (0x000B6010 + ((_i) * 4)) /* _i=0...59 */
+#define I40E_GLNVM_PROTCSR(_i)              (0x000B6010 + ((_i) * 4)) /* _i=0...59 */ /* Reset: POR */
 #define I40E_GLNVM_PROTCSR_MAX_INDEX        59
 #define I40E_GLNVM_PROTCSR_ADDR_BLOCK_SHIFT 0
 #define I40E_GLNVM_PROTCSR_ADDR_BLOCK_MASK  I40E_MASK(0xFFFFFF, I40E_GLNVM_PROTCSR_ADDR_BLOCK_SHIFT)
-#define I40E_GLNVM_SRCTL              0x000B6110
+#define I40E_GLNVM_SRCTL              0x000B6110 /* Reset: POR */
 #define I40E_GLNVM_SRCTL_SRBUSY_SHIFT 0
 #define I40E_GLNVM_SRCTL_SRBUSY_MASK  I40E_MASK(0x1, I40E_GLNVM_SRCTL_SRBUSY_SHIFT)
 #define I40E_GLNVM_SRCTL_ADDR_SHIFT   14
@@ -1891,12 +1679,12 @@
 #define I40E_GLNVM_SRCTL_START_MASK   I40E_MASK(0x1, I40E_GLNVM_SRCTL_START_SHIFT)
 #define I40E_GLNVM_SRCTL_DONE_SHIFT   31
 #define I40E_GLNVM_SRCTL_DONE_MASK    I40E_MASK(0x1, I40E_GLNVM_SRCTL_DONE_SHIFT)
-#define I40E_GLNVM_SRDATA              0x000B6114
+#define I40E_GLNVM_SRDATA              0x000B6114 /* Reset: POR */
 #define I40E_GLNVM_SRDATA_WRDATA_SHIFT 0
 #define I40E_GLNVM_SRDATA_WRDATA_MASK  I40E_MASK(0xFFFF, I40E_GLNVM_SRDATA_WRDATA_SHIFT)
 #define I40E_GLNVM_SRDATA_RDDATA_SHIFT 16
 #define I40E_GLNVM_SRDATA_RDDATA_MASK  I40E_MASK(0xFFFF, I40E_GLNVM_SRDATA_RDDATA_SHIFT)
-#define I40E_GLNVM_ULD                          0x000B6008
+#define I40E_GLNVM_ULD                          0x000B6008 /* Reset: POR */
 #define I40E_GLNVM_ULD_CONF_PCIR_DONE_SHIFT     0
 #define I40E_GLNVM_ULD_CONF_PCIR_DONE_MASK      I40E_MASK(0x1, I40E_GLNVM_ULD_CONF_PCIR_DONE_SHIFT)
 #define I40E_GLNVM_ULD_CONF_PCIRTL_DONE_SHIFT   1
@@ -1917,16 +1705,16 @@
 #define I40E_GLNVM_ULD_CONF_EMP_DONE_MASK       I40E_MASK(0x1, I40E_GLNVM_ULD_CONF_EMP_DONE_SHIFT)
 #define I40E_GLNVM_ULD_CONF_PCIALT_DONE_SHIFT   9
 #define I40E_GLNVM_ULD_CONF_PCIALT_DONE_MASK    I40E_MASK(0x1, I40E_GLNVM_ULD_CONF_PCIALT_DONE_SHIFT)
-#define I40E_GLPCI_BYTCTH                        0x0009C484
+#define I40E_GLPCI_BYTCTH                        0x0009C484 /* Reset: PCIR */
 #define I40E_GLPCI_BYTCTH_PCI_COUNT_BW_BCT_SHIFT 0
 #define I40E_GLPCI_BYTCTH_PCI_COUNT_BW_BCT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_BYTCTH_PCI_COUNT_BW_BCT_SHIFT)
-#define I40E_GLPCI_BYTCTL                        0x0009C488
+#define I40E_GLPCI_BYTCTL                        0x0009C488 /* Reset: PCIR */
 #define I40E_GLPCI_BYTCTL_PCI_COUNT_BW_BCT_SHIFT 0
 #define I40E_GLPCI_BYTCTL_PCI_COUNT_BW_BCT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_BYTCTL_PCI_COUNT_BW_BCT_SHIFT)
-#define I40E_GLPCI_CAPCTRL              0x000BE4A4
+#define I40E_GLPCI_CAPCTRL              0x000BE4A4 /* Reset: PCIR */
 #define I40E_GLPCI_CAPCTRL_VPD_EN_SHIFT 0
 #define I40E_GLPCI_CAPCTRL_VPD_EN_MASK  I40E_MASK(0x1, I40E_GLPCI_CAPCTRL_VPD_EN_SHIFT)
-#define I40E_GLPCI_CAPSUP                      0x000BE4A8
+#define I40E_GLPCI_CAPSUP                      0x000BE4A8 /* Reset: PCIR */
 #define I40E_GLPCI_CAPSUP_PCIE_VER_SHIFT       0
 #define I40E_GLPCI_CAPSUP_PCIE_VER_MASK        I40E_MASK(0x1, I40E_GLPCI_CAPSUP_PCIE_VER_SHIFT)
 #define I40E_GLPCI_CAPSUP_LTR_EN_SHIFT         2
@@ -1955,12 +1743,12 @@
 #define I40E_GLPCI_CAPSUP_LOAD_SUBSYS_ID_MASK  I40E_MASK(0x1, I40E_GLPCI_CAPSUP_LOAD_SUBSYS_ID_SHIFT)
 #define I40E_GLPCI_CAPSUP_LOAD_DEV_ID_SHIFT    31
 #define I40E_GLPCI_CAPSUP_LOAD_DEV_ID_MASK     I40E_MASK(0x1, I40E_GLPCI_CAPSUP_LOAD_DEV_ID_SHIFT)
-#define I40E_GLPCI_CNF                   0x000BE4C0
+#define I40E_GLPCI_CNF                   0x000BE4C0 /* Reset: POR */
 #define I40E_GLPCI_CNF_FLEX10_SHIFT      1
 #define I40E_GLPCI_CNF_FLEX10_MASK       I40E_MASK(0x1, I40E_GLPCI_CNF_FLEX10_SHIFT)
 #define I40E_GLPCI_CNF_WAKE_PIN_EN_SHIFT 2
 #define I40E_GLPCI_CNF_WAKE_PIN_EN_MASK  I40E_MASK(0x1, I40E_GLPCI_CNF_WAKE_PIN_EN_SHIFT)
-#define I40E_GLPCI_CNF2                      0x000BE494
+#define I40E_GLPCI_CNF2                      0x000BE494 /* Reset: PCIR */
 #define I40E_GLPCI_CNF2_RO_DIS_SHIFT         0
 #define I40E_GLPCI_CNF2_RO_DIS_MASK          I40E_MASK(0x1, I40E_GLPCI_CNF2_RO_DIS_SHIFT)
 #define I40E_GLPCI_CNF2_CACHELINE_SIZE_SHIFT 1
@@ -1969,10 +1757,10 @@
 #define I40E_GLPCI_CNF2_MSI_X_PF_N_MASK      I40E_MASK(0x7FF, I40E_GLPCI_CNF2_MSI_X_PF_N_SHIFT)
 #define I40E_GLPCI_CNF2_MSI_X_VF_N_SHIFT     13
 #define I40E_GLPCI_CNF2_MSI_X_VF_N_MASK      I40E_MASK(0x7FF, I40E_GLPCI_CNF2_MSI_X_VF_N_SHIFT)
-#define I40E_GLPCI_DREVID                     0x0009C480
+#define I40E_GLPCI_DREVID                     0x0009C480 /* Reset: PCIR */
 #define I40E_GLPCI_DREVID_DEFAULT_REVID_SHIFT 0
 #define I40E_GLPCI_DREVID_DEFAULT_REVID_MASK  I40E_MASK(0xFF, I40E_GLPCI_DREVID_DEFAULT_REVID_SHIFT)
-#define I40E_GLPCI_GSCL_1                        0x0009C48C
+#define I40E_GLPCI_GSCL_1                        0x0009C48C /* Reset: PCIR */
 #define I40E_GLPCI_GSCL_1_GIO_COUNT_EN_0_SHIFT   0
 #define I40E_GLPCI_GSCL_1_GIO_COUNT_EN_0_MASK    I40E_MASK(0x1, I40E_GLPCI_GSCL_1_GIO_COUNT_EN_0_SHIFT)
 #define I40E_GLPCI_GSCL_1_GIO_COUNT_EN_1_SHIFT   1
@@ -2005,7 +1793,7 @@
 #define I40E_GLPCI_GSCL_1_GIO_COUNT_STOP_MASK    I40E_MASK(0x1, I40E_GLPCI_GSCL_1_GIO_COUNT_STOP_SHIFT)
 #define I40E_GLPCI_GSCL_1_GIO_COUNT_START_SHIFT  31
 #define I40E_GLPCI_GSCL_1_GIO_COUNT_START_MASK   I40E_MASK(0x1, I40E_GLPCI_GSCL_1_GIO_COUNT_START_SHIFT)
-#define I40E_GLPCI_GSCL_2                       0x0009C490
+#define I40E_GLPCI_GSCL_2                       0x0009C490 /* Reset: PCIR */
 #define I40E_GLPCI_GSCL_2_GIO_EVENT_NUM_0_SHIFT 0
 #define I40E_GLPCI_GSCL_2_GIO_EVENT_NUM_0_MASK  I40E_MASK(0xFF, I40E_GLPCI_GSCL_2_GIO_EVENT_NUM_0_SHIFT)
 #define I40E_GLPCI_GSCL_2_GIO_EVENT_NUM_1_SHIFT 8
@@ -2014,20 +1802,20 @@
 #define I40E_GLPCI_GSCL_2_GIO_EVENT_NUM_2_MASK  I40E_MASK(0xFF, I40E_GLPCI_GSCL_2_GIO_EVENT_NUM_2_SHIFT)
 #define I40E_GLPCI_GSCL_2_GIO_EVENT_NUM_3_SHIFT 24
 #define I40E_GLPCI_GSCL_2_GIO_EVENT_NUM_3_MASK  I40E_MASK(0xFF, I40E_GLPCI_GSCL_2_GIO_EVENT_NUM_3_SHIFT)
-#define I40E_GLPCI_GSCL_5_8(_i)                   (0x0009C494 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLPCI_GSCL_5_8(_i)                   (0x0009C494 + ((_i) * 4)) /* _i=0...3 */ /* Reset: PCIR */
 #define I40E_GLPCI_GSCL_5_8_MAX_INDEX             3
 #define I40E_GLPCI_GSCL_5_8_LBC_THRESHOLD_N_SHIFT 0
 #define I40E_GLPCI_GSCL_5_8_LBC_THRESHOLD_N_MASK  I40E_MASK(0xFFFF, I40E_GLPCI_GSCL_5_8_LBC_THRESHOLD_N_SHIFT)
 #define I40E_GLPCI_GSCL_5_8_LBC_TIMER_N_SHIFT     16
 #define I40E_GLPCI_GSCL_5_8_LBC_TIMER_N_MASK      I40E_MASK(0xFFFF, I40E_GLPCI_GSCL_5_8_LBC_TIMER_N_SHIFT)
-#define I40E_GLPCI_GSCN_0_3(_i)                 (0x0009C4A4 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLPCI_GSCN_0_3(_i)                 (0x0009C4A4 + ((_i) * 4)) /* _i=0...3 */ /* Reset: PCIR */
 #define I40E_GLPCI_GSCN_0_3_MAX_INDEX           3
 #define I40E_GLPCI_GSCN_0_3_EVENT_COUNTER_SHIFT 0
 #define I40E_GLPCI_GSCN_0_3_EVENT_COUNTER_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_GSCN_0_3_EVENT_COUNTER_SHIFT)
-#define I40E_GLPCI_LATCT                        0x0009C4B4
+#define I40E_GLPCI_LATCT                        0x0009C4B4 /* Reset: PCIR */
 #define I40E_GLPCI_LATCT_PCI_COUNT_LAT_CT_SHIFT 0
 #define I40E_GLPCI_LATCT_PCI_COUNT_LAT_CT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_LATCT_PCI_COUNT_LAT_CT_SHIFT)
-#define I40E_GLPCI_LBARCTRL                    0x000BE484
+#define I40E_GLPCI_LBARCTRL                    0x000BE484 /* Reset: POR */
 #define I40E_GLPCI_LBARCTRL_PREFBAR_SHIFT      0
 #define I40E_GLPCI_LBARCTRL_PREFBAR_MASK       I40E_MASK(0x1, I40E_GLPCI_LBARCTRL_PREFBAR_SHIFT)
 #define I40E_GLPCI_LBARCTRL_BAR32_SHIFT        1
@@ -2042,30 +1830,30 @@
 #define I40E_GLPCI_LBARCTRL_RSVD_10_MASK       I40E_MASK(0x1, I40E_GLPCI_LBARCTRL_RSVD_10_SHIFT)
 #define I40E_GLPCI_LBARCTRL_EXROM_SIZE_SHIFT   11
 #define I40E_GLPCI_LBARCTRL_EXROM_SIZE_MASK    I40E_MASK(0x7, I40E_GLPCI_LBARCTRL_EXROM_SIZE_SHIFT)
-#define I40E_GLPCI_LINKCAP                          0x000BE4AC
+#define I40E_GLPCI_LINKCAP                          0x000BE4AC /* Reset: PCIR */
 #define I40E_GLPCI_LINKCAP_LINK_SPEEDS_VECTOR_SHIFT 0
 #define I40E_GLPCI_LINKCAP_LINK_SPEEDS_VECTOR_MASK  I40E_MASK(0x3F, I40E_GLPCI_LINKCAP_LINK_SPEEDS_VECTOR_SHIFT)
 #define I40E_GLPCI_LINKCAP_MAX_PAYLOAD_SHIFT        6
 #define I40E_GLPCI_LINKCAP_MAX_PAYLOAD_MASK         I40E_MASK(0x7, I40E_GLPCI_LINKCAP_MAX_PAYLOAD_SHIFT)
 #define I40E_GLPCI_LINKCAP_MAX_LINK_WIDTH_SHIFT     9
 #define I40E_GLPCI_LINKCAP_MAX_LINK_WIDTH_MASK      I40E_MASK(0xF, I40E_GLPCI_LINKCAP_MAX_LINK_WIDTH_SHIFT)
-#define I40E_GLPCI_PCIERR                    0x000BE4FC
+#define I40E_GLPCI_PCIERR                    0x000BE4FC /* Reset: PCIR */
 #define I40E_GLPCI_PCIERR_PCIE_ERR_REP_SHIFT 0
 #define I40E_GLPCI_PCIERR_PCIE_ERR_REP_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_PCIERR_PCIE_ERR_REP_SHIFT)
-#define I40E_GLPCI_PKTCT                        0x0009C4BC
+#define I40E_GLPCI_PKTCT                        0x0009C4BC /* Reset: PCIR */
 #define I40E_GLPCI_PKTCT_PCI_COUNT_BW_PCT_SHIFT 0
 #define I40E_GLPCI_PKTCT_PCI_COUNT_BW_PCT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_PKTCT_PCI_COUNT_BW_PCT_SHIFT)
-#define I40E_GLPCI_PM_MUX_NPQ                        0x0009C4F4
+#define I40E_GLPCI_PM_MUX_NPQ                        0x0009C4F4 /* Reset: PCIR */
 #define I40E_GLPCI_PM_MUX_NPQ_NPQ_NUM_PORT_SEL_SHIFT 0
 #define I40E_GLPCI_PM_MUX_NPQ_NPQ_NUM_PORT_SEL_MASK  I40E_MASK(0x7, I40E_GLPCI_PM_MUX_NPQ_NPQ_NUM_PORT_SEL_SHIFT)
 #define I40E_GLPCI_PM_MUX_NPQ_INNER_NPQ_SEL_SHIFT    16
 #define I40E_GLPCI_PM_MUX_NPQ_INNER_NPQ_SEL_MASK     I40E_MASK(0x1F, I40E_GLPCI_PM_MUX_NPQ_INNER_NPQ_SEL_SHIFT)
-#define I40E_GLPCI_PM_MUX_PFB                      0x0009C4F0
+#define I40E_GLPCI_PM_MUX_PFB                      0x0009C4F0 /* Reset: PCIR */
 #define I40E_GLPCI_PM_MUX_PFB_PFB_PORT_SEL_SHIFT   0
 #define I40E_GLPCI_PM_MUX_PFB_PFB_PORT_SEL_MASK    I40E_MASK(0x1F, I40E_GLPCI_PM_MUX_PFB_PFB_PORT_SEL_SHIFT)
 #define I40E_GLPCI_PM_MUX_PFB_INNER_PORT_SEL_SHIFT 16
 #define I40E_GLPCI_PM_MUX_PFB_INNER_PORT_SEL_MASK  I40E_MASK(0x7, I40E_GLPCI_PM_MUX_PFB_INNER_PORT_SEL_SHIFT)
-#define I40E_GLPCI_PMSUP                    0x000BE4B0
+#define I40E_GLPCI_PMSUP                    0x000BE4B0 /* Reset: PCIR */
 #define I40E_GLPCI_PMSUP_ASPM_SUP_SHIFT     0
 #define I40E_GLPCI_PMSUP_ASPM_SUP_MASK      I40E_MASK(0x3, I40E_GLPCI_PMSUP_ASPM_SUP_SHIFT)
 #define I40E_GLPCI_PMSUP_L0S_EXIT_LAT_SHIFT 2
@@ -2080,12 +1868,12 @@
 #define I40E_GLPCI_PMSUP_SLOT_CLK_MASK      I40E_MASK(0x1, I40E_GLPCI_PMSUP_SLOT_CLK_SHIFT)
 #define I40E_GLPCI_PMSUP_OBFF_SUP_SHIFT     15
 #define I40E_GLPCI_PMSUP_OBFF_SUP_MASK      I40E_MASK(0x3, I40E_GLPCI_PMSUP_OBFF_SUP_SHIFT)
-#define I40E_GLPCI_PQ_MAX_USED_SPC                                0x0009C4EC
+#define I40E_GLPCI_PQ_MAX_USED_SPC                                0x0009C4EC /* Reset: PCIR */
 #define I40E_GLPCI_PQ_MAX_USED_SPC_GLPCI_PQ_MAX_USED_SPC_12_SHIFT 0
 #define I40E_GLPCI_PQ_MAX_USED_SPC_GLPCI_PQ_MAX_USED_SPC_12_MASK  I40E_MASK(0xFF, I40E_GLPCI_PQ_MAX_USED_SPC_GLPCI_PQ_MAX_USED_SPC_12_SHIFT)
 #define I40E_GLPCI_PQ_MAX_USED_SPC_GLPCI_PQ_MAX_USED_SPC_13_SHIFT 8
 #define I40E_GLPCI_PQ_MAX_USED_SPC_GLPCI_PQ_MAX_USED_SPC_13_MASK  I40E_MASK(0xFF, I40E_GLPCI_PQ_MAX_USED_SPC_GLPCI_PQ_MAX_USED_SPC_13_SHIFT)
-#define I40E_GLPCI_PWRDATA                  0x000BE490
+#define I40E_GLPCI_PWRDATA                  0x000BE490 /* Reset: PCIR */
 #define I40E_GLPCI_PWRDATA_D0_POWER_SHIFT   0
 #define I40E_GLPCI_PWRDATA_D0_POWER_MASK    I40E_MASK(0xFF, I40E_GLPCI_PWRDATA_D0_POWER_SHIFT)
 #define I40E_GLPCI_PWRDATA_COMM_POWER_SHIFT 8
@@ -2094,58 +1882,58 @@
 #define I40E_GLPCI_PWRDATA_D3_POWER_MASK    I40E_MASK(0xFF, I40E_GLPCI_PWRDATA_D3_POWER_SHIFT)
 #define I40E_GLPCI_PWRDATA_DATA_SCALE_SHIFT 24
 #define I40E_GLPCI_PWRDATA_DATA_SCALE_MASK  I40E_MASK(0x3, I40E_GLPCI_PWRDATA_DATA_SCALE_SHIFT)
-#define I40E_GLPCI_REVID                 0x000BE4B4
+#define I40E_GLPCI_REVID                 0x000BE4B4 /* Reset: PCIR */
 #define I40E_GLPCI_REVID_NVM_REVID_SHIFT 0
 #define I40E_GLPCI_REVID_NVM_REVID_MASK  I40E_MASK(0xFF, I40E_GLPCI_REVID_NVM_REVID_SHIFT)
-#define I40E_GLPCI_SERH                 0x000BE49C
+#define I40E_GLPCI_SERH                 0x000BE49C /* Reset: PCIR */
 #define I40E_GLPCI_SERH_SER_NUM_H_SHIFT 0
 #define I40E_GLPCI_SERH_SER_NUM_H_MASK  I40E_MASK(0xFFFF, I40E_GLPCI_SERH_SER_NUM_H_SHIFT)
-#define I40E_GLPCI_SERL                 0x000BE498
+#define I40E_GLPCI_SERL                 0x000BE498 /* Reset: PCIR */
 #define I40E_GLPCI_SERL_SER_NUM_L_SHIFT 0
 #define I40E_GLPCI_SERL_SER_NUM_L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_SERL_SER_NUM_L_SHIFT)
-#define I40E_GLPCI_SPARE_BITS_0                  0x0009C4F8
+#define I40E_GLPCI_SPARE_BITS_0                  0x0009C4F8 /* Reset: PCIR */
 #define I40E_GLPCI_SPARE_BITS_0_SPARE_BITS_SHIFT 0
 #define I40E_GLPCI_SPARE_BITS_0_SPARE_BITS_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_SPARE_BITS_0_SPARE_BITS_SHIFT)
-#define I40E_GLPCI_SPARE_BITS_1                  0x0009C4FC
+#define I40E_GLPCI_SPARE_BITS_1                  0x0009C4FC /* Reset: PCIR */
 #define I40E_GLPCI_SPARE_BITS_1_SPARE_BITS_SHIFT 0
 #define I40E_GLPCI_SPARE_BITS_1_SPARE_BITS_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_SPARE_BITS_1_SPARE_BITS_SHIFT)
-#define I40E_GLPCI_SUBVENID                  0x000BE48C
+#define I40E_GLPCI_SUBVENID                  0x000BE48C /* Reset: PCIR */
 #define I40E_GLPCI_SUBVENID_SUB_VEN_ID_SHIFT 0
 #define I40E_GLPCI_SUBVENID_SUB_VEN_ID_MASK  I40E_MASK(0xFFFF, I40E_GLPCI_SUBVENID_SUB_VEN_ID_SHIFT)
-#define I40E_GLPCI_UPADD               0x000BE4F8
+#define I40E_GLPCI_UPADD               0x000BE4F8 /* Reset: PCIR */
 #define I40E_GLPCI_UPADD_ADDRESS_SHIFT 1
 #define I40E_GLPCI_UPADD_ADDRESS_MASK  I40E_MASK(0x7FFFFFFF, I40E_GLPCI_UPADD_ADDRESS_SHIFT)
-#define I40E_GLPCI_VENDORID                0x000BE518
+#define I40E_GLPCI_VENDORID                0x000BE518 /* Reset: PCIR */
 #define I40E_GLPCI_VENDORID_VENDORID_SHIFT 0
 #define I40E_GLPCI_VENDORID_VENDORID_MASK  I40E_MASK(0xFFFF, I40E_GLPCI_VENDORID_VENDORID_SHIFT)
-#define I40E_GLPCI_VFSUP                   0x000BE4B8
+#define I40E_GLPCI_VFSUP                   0x000BE4B8 /* Reset: PCIR */
 #define I40E_GLPCI_VFSUP_VF_PREFETCH_SHIFT 0
 #define I40E_GLPCI_VFSUP_VF_PREFETCH_MASK  I40E_MASK(0x1, I40E_GLPCI_VFSUP_VF_PREFETCH_SHIFT)
 #define I40E_GLPCI_VFSUP_VR_BAR_TYPE_SHIFT 1
 #define I40E_GLPCI_VFSUP_VR_BAR_TYPE_MASK  I40E_MASK(0x1, I40E_GLPCI_VFSUP_VR_BAR_TYPE_SHIFT)
-#define I40E_PF_FUNC_RID                       0x0009C000
+#define I40E_PF_FUNC_RID                       0x0009C000 /* Reset: PCIR */
 #define I40E_PF_FUNC_RID_FUNCTION_NUMBER_SHIFT 0
 #define I40E_PF_FUNC_RID_FUNCTION_NUMBER_MASK  I40E_MASK(0x7, I40E_PF_FUNC_RID_FUNCTION_NUMBER_SHIFT)
 #define I40E_PF_FUNC_RID_DEVICE_NUMBER_SHIFT   3
 #define I40E_PF_FUNC_RID_DEVICE_NUMBER_MASK    I40E_MASK(0x1F, I40E_PF_FUNC_RID_DEVICE_NUMBER_SHIFT)
 #define I40E_PF_FUNC_RID_BUS_NUMBER_SHIFT      8
 #define I40E_PF_FUNC_RID_BUS_NUMBER_MASK       I40E_MASK(0xFF, I40E_PF_FUNC_RID_BUS_NUMBER_SHIFT)
-#define I40E_PF_PCI_CIAA               0x0009C080
+#define I40E_PF_PCI_CIAA               0x0009C080 /* Reset: FLR */
 #define I40E_PF_PCI_CIAA_ADDRESS_SHIFT 0
 #define I40E_PF_PCI_CIAA_ADDRESS_MASK  I40E_MASK(0xFFF, I40E_PF_PCI_CIAA_ADDRESS_SHIFT)
 #define I40E_PF_PCI_CIAA_VF_NUM_SHIFT  12
 #define I40E_PF_PCI_CIAA_VF_NUM_MASK   I40E_MASK(0x7F, I40E_PF_PCI_CIAA_VF_NUM_SHIFT)
-#define I40E_PF_PCI_CIAD            0x0009C100
+#define I40E_PF_PCI_CIAD            0x0009C100 /* Reset: FLR */
 #define I40E_PF_PCI_CIAD_DATA_SHIFT 0
 #define I40E_PF_PCI_CIAD_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_PF_PCI_CIAD_DATA_SHIFT)
-#define I40E_PFPCI_CLASS                     0x000BE400
+#define I40E_PFPCI_CLASS                     0x000BE400 /* Reset: PCIR */
 #define I40E_PFPCI_CLASS_STORAGE_CLASS_SHIFT 0
 #define I40E_PFPCI_CLASS_STORAGE_CLASS_MASK  I40E_MASK(0x1, I40E_PFPCI_CLASS_STORAGE_CLASS_SHIFT)
 #define I40E_PFPCI_CLASS_RESERVED_1_SHIFT    1
 #define I40E_PFPCI_CLASS_RESERVED_1_MASK     I40E_MASK(0x1, I40E_PFPCI_CLASS_RESERVED_1_SHIFT)
 #define I40E_PFPCI_CLASS_PF_IS_LAN_SHIFT     2
 #define I40E_PFPCI_CLASS_PF_IS_LAN_MASK      I40E_MASK(0x1, I40E_PFPCI_CLASS_PF_IS_LAN_SHIFT)
-#define I40E_PFPCI_CNF                 0x000BE000
+#define I40E_PFPCI_CNF                 0x000BE000 /* Reset: PCIR */
 #define I40E_PFPCI_CNF_MSI_EN_SHIFT    2
 #define I40E_PFPCI_CNF_MSI_EN_MASK     I40E_MASK(0x1, I40E_PFPCI_CNF_MSI_EN_SHIFT)
 #define I40E_PFPCI_CNF_EXROM_DIS_SHIFT 3
@@ -2154,88 +1942,88 @@
 #define I40E_PFPCI_CNF_IO_BAR_MASK     I40E_MASK(0x1, I40E_PFPCI_CNF_IO_BAR_SHIFT)
 #define I40E_PFPCI_CNF_INT_PIN_SHIFT   5
 #define I40E_PFPCI_CNF_INT_PIN_MASK    I40E_MASK(0x3, I40E_PFPCI_CNF_INT_PIN_SHIFT)
-#define I40E_PFPCI_DEVID                 0x000BE080
+#define I40E_PFPCI_DEVID                 0x000BE080 /* Reset: PCIR */
 #define I40E_PFPCI_DEVID_PF_DEV_ID_SHIFT 0
 #define I40E_PFPCI_DEVID_PF_DEV_ID_MASK  I40E_MASK(0xFFFF, I40E_PFPCI_DEVID_PF_DEV_ID_SHIFT)
 #define I40E_PFPCI_DEVID_VF_DEV_ID_SHIFT 16
 #define I40E_PFPCI_DEVID_VF_DEV_ID_MASK  I40E_MASK(0xFFFF, I40E_PFPCI_DEVID_VF_DEV_ID_SHIFT)
-#define I40E_PFPCI_FACTPS                        0x0009C180
+#define I40E_PFPCI_FACTPS                        0x0009C180 /* Reset: FLR */
 #define I40E_PFPCI_FACTPS_FUNC_POWER_STATE_SHIFT 0
 #define I40E_PFPCI_FACTPS_FUNC_POWER_STATE_MASK  I40E_MASK(0x3, I40E_PFPCI_FACTPS_FUNC_POWER_STATE_SHIFT)
 #define I40E_PFPCI_FACTPS_FUNC_AUX_EN_SHIFT      3
 #define I40E_PFPCI_FACTPS_FUNC_AUX_EN_MASK       I40E_MASK(0x1, I40E_PFPCI_FACTPS_FUNC_AUX_EN_SHIFT)
-#define I40E_PFPCI_FUNC                            0x000BE200
+#define I40E_PFPCI_FUNC                            0x000BE200 /* Reset: POR */
 #define I40E_PFPCI_FUNC_FUNC_DIS_SHIFT             0
 #define I40E_PFPCI_FUNC_FUNC_DIS_MASK              I40E_MASK(0x1, I40E_PFPCI_FUNC_FUNC_DIS_SHIFT)
 #define I40E_PFPCI_FUNC_ALLOW_FUNC_DIS_SHIFT       1
 #define I40E_PFPCI_FUNC_ALLOW_FUNC_DIS_MASK        I40E_MASK(0x1, I40E_PFPCI_FUNC_ALLOW_FUNC_DIS_SHIFT)
 #define I40E_PFPCI_FUNC_DIS_FUNC_ON_PORT_DIS_SHIFT 2
 #define I40E_PFPCI_FUNC_DIS_FUNC_ON_PORT_DIS_MASK  I40E_MASK(0x1, I40E_PFPCI_FUNC_DIS_FUNC_ON_PORT_DIS_SHIFT)
-#define I40E_PFPCI_FUNC2                    0x000BE180
+#define I40E_PFPCI_FUNC2                    0x000BE180 /* Reset: PCIR */
 #define I40E_PFPCI_FUNC2_EMP_FUNC_DIS_SHIFT 0
 #define I40E_PFPCI_FUNC2_EMP_FUNC_DIS_MASK  I40E_MASK(0x1, I40E_PFPCI_FUNC2_EMP_FUNC_DIS_SHIFT)
-#define I40E_PFPCI_ICAUSE                      0x0009C200
+#define I40E_PFPCI_ICAUSE                      0x0009C200 /* Reset: PFR */
 #define I40E_PFPCI_ICAUSE_PCIE_ERR_CAUSE_SHIFT 0
 #define I40E_PFPCI_ICAUSE_PCIE_ERR_CAUSE_MASK  I40E_MASK(0xFFFFFFFF, I40E_PFPCI_ICAUSE_PCIE_ERR_CAUSE_SHIFT)
-#define I40E_PFPCI_IENA                   0x0009C280
+#define I40E_PFPCI_IENA                   0x0009C280 /* Reset: PFR */
 #define I40E_PFPCI_IENA_PCIE_ERR_EN_SHIFT 0
 #define I40E_PFPCI_IENA_PCIE_ERR_EN_MASK  I40E_MASK(0xFFFFFFFF, I40E_PFPCI_IENA_PCIE_ERR_EN_SHIFT)
-#define I40E_PFPCI_PF_FLUSH_DONE                  0x0009C800
+#define I40E_PFPCI_PF_FLUSH_DONE                  0x0009C800 /* Reset: PCIR */
 #define I40E_PFPCI_PF_FLUSH_DONE_FLUSH_DONE_SHIFT 0
 #define I40E_PFPCI_PF_FLUSH_DONE_FLUSH_DONE_MASK  I40E_MASK(0x1, I40E_PFPCI_PF_FLUSH_DONE_FLUSH_DONE_SHIFT)
-#define I40E_PFPCI_PM              0x000BE300
+#define I40E_PFPCI_PM              0x000BE300 /* Reset: POR */
 #define I40E_PFPCI_PM_PME_EN_SHIFT 0
 #define I40E_PFPCI_PM_PME_EN_MASK  I40E_MASK(0x1, I40E_PFPCI_PM_PME_EN_SHIFT)
-#define I40E_PFPCI_STATUS1                  0x000BE280
+#define I40E_PFPCI_STATUS1                  0x000BE280 /* Reset: POR */
 #define I40E_PFPCI_STATUS1_FUNC_VALID_SHIFT 0
 #define I40E_PFPCI_STATUS1_FUNC_VALID_MASK  I40E_MASK(0x1, I40E_PFPCI_STATUS1_FUNC_VALID_SHIFT)
-#define I40E_PFPCI_SUBSYSID                    0x000BE100
+#define I40E_PFPCI_SUBSYSID                    0x000BE100 /* Reset: PCIR */
 #define I40E_PFPCI_SUBSYSID_PF_SUBSYS_ID_SHIFT 0
 #define I40E_PFPCI_SUBSYSID_PF_SUBSYS_ID_MASK  I40E_MASK(0xFFFF, I40E_PFPCI_SUBSYSID_PF_SUBSYS_ID_SHIFT)
 #define I40E_PFPCI_SUBSYSID_VF_SUBSYS_ID_SHIFT 16
 #define I40E_PFPCI_SUBSYSID_VF_SUBSYS_ID_MASK  I40E_MASK(0xFFFF, I40E_PFPCI_SUBSYSID_VF_SUBSYS_ID_SHIFT)
-#define I40E_PFPCI_VF_FLUSH_DONE                  0x0000E400
+#define I40E_PFPCI_VF_FLUSH_DONE                  0x0000E400 /* Reset: PCIR */
 #define I40E_PFPCI_VF_FLUSH_DONE_FLUSH_DONE_SHIFT 0
 #define I40E_PFPCI_VF_FLUSH_DONE_FLUSH_DONE_MASK  I40E_MASK(0x1, I40E_PFPCI_VF_FLUSH_DONE_FLUSH_DONE_SHIFT)
-#define I40E_PFPCI_VF_FLUSH_DONE1(_VF)             (0x0009C600 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_PFPCI_VF_FLUSH_DONE1(_VF)             (0x0009C600 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: PCIR */
 #define I40E_PFPCI_VF_FLUSH_DONE1_MAX_INDEX        127
 #define I40E_PFPCI_VF_FLUSH_DONE1_FLUSH_DONE_SHIFT 0
 #define I40E_PFPCI_VF_FLUSH_DONE1_FLUSH_DONE_MASK  I40E_MASK(0x1, I40E_PFPCI_VF_FLUSH_DONE1_FLUSH_DONE_SHIFT)
-#define I40E_PFPCI_VM_FLUSH_DONE                  0x0009C880
+#define I40E_PFPCI_VM_FLUSH_DONE                  0x0009C880 /* Reset: PCIR */
 #define I40E_PFPCI_VM_FLUSH_DONE_FLUSH_DONE_SHIFT 0
 #define I40E_PFPCI_VM_FLUSH_DONE_FLUSH_DONE_MASK  I40E_MASK(0x1, I40E_PFPCI_VM_FLUSH_DONE_FLUSH_DONE_SHIFT)
-#define I40E_PFPCI_VMINDEX               0x0009C300
+#define I40E_PFPCI_VMINDEX               0x0009C300 /* Reset: PCIR */
 #define I40E_PFPCI_VMINDEX_VMINDEX_SHIFT 0
 #define I40E_PFPCI_VMINDEX_VMINDEX_MASK  I40E_MASK(0x1FF, I40E_PFPCI_VMINDEX_VMINDEX_SHIFT)
-#define I40E_PFPCI_VMPEND               0x0009C380
+#define I40E_PFPCI_VMPEND               0x0009C380 /* Reset: PCIR */
 #define I40E_PFPCI_VMPEND_PENDING_SHIFT 0
 #define I40E_PFPCI_VMPEND_PENDING_MASK  I40E_MASK(0x1, I40E_PFPCI_VMPEND_PENDING_SHIFT)
-#define I40E_PRTPM_EEE_STAT                     0x001E4320
+#define I40E_PRTPM_EEE_STAT                     0x001E4320 /* Reset: GLOBR */
 #define I40E_PRTPM_EEE_STAT_EEE_NEG_SHIFT       29
 #define I40E_PRTPM_EEE_STAT_EEE_NEG_MASK        I40E_MASK(0x1, I40E_PRTPM_EEE_STAT_EEE_NEG_SHIFT)
 #define I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_SHIFT 30
 #define I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_MASK  I40E_MASK(0x1, I40E_PRTPM_EEE_STAT_RX_LPI_STATUS_SHIFT)
 #define I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_SHIFT 31
 #define I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_MASK  I40E_MASK(0x1, I40E_PRTPM_EEE_STAT_TX_LPI_STATUS_SHIFT)
-#define I40E_PRTPM_EEEC                     0x001E4380
+#define I40E_PRTPM_EEEC                     0x001E4380 /* Reset: GLOBR */
 #define I40E_PRTPM_EEEC_TW_WAKE_MIN_SHIFT   16
 #define I40E_PRTPM_EEEC_TW_WAKE_MIN_MASK    I40E_MASK(0x3F, I40E_PRTPM_EEEC_TW_WAKE_MIN_SHIFT)
 #define I40E_PRTPM_EEEC_TX_LU_LPI_DLY_SHIFT 24
 #define I40E_PRTPM_EEEC_TX_LU_LPI_DLY_MASK  I40E_MASK(0x3, I40E_PRTPM_EEEC_TX_LU_LPI_DLY_SHIFT)
 #define I40E_PRTPM_EEEC_TEEE_DLY_SHIFT      26
 #define I40E_PRTPM_EEEC_TEEE_DLY_MASK       I40E_MASK(0x3F, I40E_PRTPM_EEEC_TEEE_DLY_SHIFT)
-#define I40E_PRTPM_EEEFWD                          0x001E4400
+#define I40E_PRTPM_EEEFWD                          0x001E4400 /* Reset: GLOBR */
 #define I40E_PRTPM_EEEFWD_EEE_FW_CONFIG_DONE_SHIFT 31
 #define I40E_PRTPM_EEEFWD_EEE_FW_CONFIG_DONE_MASK  I40E_MASK(0x1, I40E_PRTPM_EEEFWD_EEE_FW_CONFIG_DONE_SHIFT)
-#define I40E_PRTPM_EEER                 0x001E4360
+#define I40E_PRTPM_EEER                 0x001E4360 /* Reset: GLOBR */
 #define I40E_PRTPM_EEER_TW_SYSTEM_SHIFT 0
 #define I40E_PRTPM_EEER_TW_SYSTEM_MASK  I40E_MASK(0xFFFF, I40E_PRTPM_EEER_TW_SYSTEM_SHIFT)
 #define I40E_PRTPM_EEER_TX_LPI_EN_SHIFT 16
 #define I40E_PRTPM_EEER_TX_LPI_EN_MASK  I40E_MASK(0x1, I40E_PRTPM_EEER_TX_LPI_EN_SHIFT)
-#define I40E_PRTPM_EEETXC              0x001E43E0
+#define I40E_PRTPM_EEETXC              0x001E43E0 /* Reset: GLOBR */
 #define I40E_PRTPM_EEETXC_TW_PHY_SHIFT 0
 #define I40E_PRTPM_EEETXC_TW_PHY_MASK  I40E_MASK(0xFFFF, I40E_PRTPM_EEETXC_TW_PHY_SHIFT)
-#define I40E_PRTPM_GC                     0x000B8140
+#define I40E_PRTPM_GC                     0x000B8140 /* Reset: POR */
 #define I40E_PRTPM_GC_EMP_LINK_ON_SHIFT   0
 #define I40E_PRTPM_GC_EMP_LINK_ON_MASK    I40E_MASK(0x1, I40E_PRTPM_GC_EMP_LINK_ON_SHIFT)
 #define I40E_PRTPM_GC_MNG_VETO_SHIFT      1
@@ -2246,57 +2034,57 @@
 #define I40E_PRTPM_GC_LCDMP_MASK          I40E_MASK(0x1, I40E_PRTPM_GC_LCDMP_SHIFT)
 #define I40E_PRTPM_GC_LPLU_ASSERTED_SHIFT 31
 #define I40E_PRTPM_GC_LPLU_ASSERTED_MASK  I40E_MASK(0x1, I40E_PRTPM_GC_LPLU_ASSERTED_SHIFT)
-#define I40E_PRTPM_RLPIC              0x001E43A0
+#define I40E_PRTPM_RLPIC              0x001E43A0 /* Reset: GLOBR */
 #define I40E_PRTPM_RLPIC_ERLPIC_SHIFT 0
 #define I40E_PRTPM_RLPIC_ERLPIC_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTPM_RLPIC_ERLPIC_SHIFT)
-#define I40E_PRTPM_TLPIC              0x001E43C0
+#define I40E_PRTPM_TLPIC              0x001E43C0 /* Reset: GLOBR */
 #define I40E_PRTPM_TLPIC_ETLPIC_SHIFT 0
 #define I40E_PRTPM_TLPIC_ETLPIC_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTPM_TLPIC_ETLPIC_SHIFT)
-#define I40E_GLRPB_DPSS               0x000AC828
+#define I40E_GLRPB_DPSS               0x000AC828 /* Reset: CORER */
 #define I40E_GLRPB_DPSS_DPS_TCN_SHIFT 0
 #define I40E_GLRPB_DPSS_DPS_TCN_MASK  I40E_MASK(0xFFFFF, I40E_GLRPB_DPSS_DPS_TCN_SHIFT)
-#define I40E_GLRPB_GHW           0x000AC830
+#define I40E_GLRPB_GHW           0x000AC830 /* Reset: CORER */
 #define I40E_GLRPB_GHW_GHW_SHIFT 0
 #define I40E_GLRPB_GHW_GHW_MASK  I40E_MASK(0xFFFFF, I40E_GLRPB_GHW_GHW_SHIFT)
-#define I40E_GLRPB_GLW           0x000AC834
+#define I40E_GLRPB_GLW           0x000AC834 /* Reset: CORER */
 #define I40E_GLRPB_GLW_GLW_SHIFT 0
 #define I40E_GLRPB_GLW_GLW_MASK  I40E_MASK(0xFFFFF, I40E_GLRPB_GLW_GLW_SHIFT)
-#define I40E_GLRPB_PHW           0x000AC844
+#define I40E_GLRPB_PHW           0x000AC844 /* Reset: CORER */
 #define I40E_GLRPB_PHW_PHW_SHIFT 0
 #define I40E_GLRPB_PHW_PHW_MASK  I40E_MASK(0xFFFFF, I40E_GLRPB_PHW_PHW_SHIFT)
-#define I40E_GLRPB_PLW           0x000AC848
+#define I40E_GLRPB_PLW           0x000AC848 /* Reset: CORER */
 #define I40E_GLRPB_PLW_PLW_SHIFT 0
 #define I40E_GLRPB_PLW_PLW_MASK  I40E_MASK(0xFFFFF, I40E_GLRPB_PLW_PLW_SHIFT)
-#define I40E_PRTRPB_DHW(_i)           (0x000AC100 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTRPB_DHW(_i)           (0x000AC100 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRTRPB_DHW_MAX_INDEX     7
 #define I40E_PRTRPB_DHW_DHW_TCN_SHIFT 0
 #define I40E_PRTRPB_DHW_DHW_TCN_MASK  I40E_MASK(0xFFFFF, I40E_PRTRPB_DHW_DHW_TCN_SHIFT)
-#define I40E_PRTRPB_DLW(_i)           (0x000AC220 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTRPB_DLW(_i)           (0x000AC220 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRTRPB_DLW_MAX_INDEX     7
 #define I40E_PRTRPB_DLW_DLW_TCN_SHIFT 0
 #define I40E_PRTRPB_DLW_DLW_TCN_MASK  I40E_MASK(0xFFFFF, I40E_PRTRPB_DLW_DLW_TCN_SHIFT)
-#define I40E_PRTRPB_DPS(_i)           (0x000AC320 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTRPB_DPS(_i)           (0x000AC320 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRTRPB_DPS_MAX_INDEX     7
 #define I40E_PRTRPB_DPS_DPS_TCN_SHIFT 0
 #define I40E_PRTRPB_DPS_DPS_TCN_MASK  I40E_MASK(0xFFFFF, I40E_PRTRPB_DPS_DPS_TCN_SHIFT)
-#define I40E_PRTRPB_SHT(_i)           (0x000AC480 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTRPB_SHT(_i)           (0x000AC480 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRTRPB_SHT_MAX_INDEX     7
 #define I40E_PRTRPB_SHT_SHT_TCN_SHIFT 0
 #define I40E_PRTRPB_SHT_SHT_TCN_MASK  I40E_MASK(0xFFFFF, I40E_PRTRPB_SHT_SHT_TCN_SHIFT)
-#define I40E_PRTRPB_SHW           0x000AC580
+#define I40E_PRTRPB_SHW           0x000AC580 /* Reset: CORER */
 #define I40E_PRTRPB_SHW_SHW_SHIFT 0
 #define I40E_PRTRPB_SHW_SHW_MASK  I40E_MASK(0xFFFFF, I40E_PRTRPB_SHW_SHW_SHIFT)
-#define I40E_PRTRPB_SLT(_i)           (0x000AC5A0 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTRPB_SLT(_i)           (0x000AC5A0 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRTRPB_SLT_MAX_INDEX     7
 #define I40E_PRTRPB_SLT_SLT_TCN_SHIFT 0
 #define I40E_PRTRPB_SLT_SLT_TCN_MASK  I40E_MASK(0xFFFFF, I40E_PRTRPB_SLT_SLT_TCN_SHIFT)
-#define I40E_PRTRPB_SLW           0x000AC6A0
+#define I40E_PRTRPB_SLW           0x000AC6A0 /* Reset: CORER */
 #define I40E_PRTRPB_SLW_SLW_SHIFT 0
 #define I40E_PRTRPB_SLW_SLW_MASK  I40E_MASK(0xFFFFF, I40E_PRTRPB_SLW_SLW_SHIFT)
-#define I40E_PRTRPB_SPS           0x000AC7C0
+#define I40E_PRTRPB_SPS           0x000AC7C0 /* Reset: CORER */
 #define I40E_PRTRPB_SPS_SPS_SHIFT 0
 #define I40E_PRTRPB_SPS_SPS_MASK  I40E_MASK(0xFFFFF, I40E_PRTRPB_SPS_SPS_SHIFT)
-#define I40E_GLQF_CTL                      0x00269BA4
+#define I40E_GLQF_CTL                      0x00269BA4 /* Reset: CORER */
 #define I40E_GLQF_CTL_HTOEP_SHIFT          1
 #define I40E_GLQF_CTL_HTOEP_MASK           I40E_MASK(0x1, I40E_GLQF_CTL_HTOEP_SHIFT)
 #define I40E_GLQF_CTL_HTOEP_FCOE_SHIFT     2
@@ -2321,12 +2109,12 @@
 #define I40E_GLQF_CTL_INVALPRIO_MASK       I40E_MASK(0x1, I40E_GLQF_CTL_INVALPRIO_SHIFT)
 #define I40E_GLQF_CTL_IGNORE_IP_SHIFT      27
 #define I40E_GLQF_CTL_IGNORE_IP_MASK       I40E_MASK(0x1, I40E_GLQF_CTL_IGNORE_IP_SHIFT)
-#define I40E_GLQF_FDCNT_0                   0x00269BAC
+#define I40E_GLQF_FDCNT_0                   0x00269BAC /* Reset: CORER */
 #define I40E_GLQF_FDCNT_0_GUARANT_CNT_SHIFT 0
 #define I40E_GLQF_FDCNT_0_GUARANT_CNT_MASK  I40E_MASK(0x1FFF, I40E_GLQF_FDCNT_0_GUARANT_CNT_SHIFT)
 #define I40E_GLQF_FDCNT_0_BESTCNT_SHIFT     13
 #define I40E_GLQF_FDCNT_0_BESTCNT_MASK      I40E_MASK(0x1FFF, I40E_GLQF_FDCNT_0_BESTCNT_SHIFT)
-#define I40E_GLQF_HKEY(_i)         (0x00270140 + ((_i) * 4)) /* _i=0...12 */
+#define I40E_GLQF_HKEY(_i)         (0x00270140 + ((_i) * 4)) /* _i=0...12 */ /* Reset: CORER */
 #define I40E_GLQF_HKEY_MAX_INDEX   12
 #define I40E_GLQF_HKEY_KEY_0_SHIFT 0
 #define I40E_GLQF_HKEY_KEY_0_MASK  I40E_MASK(0xFF, I40E_GLQF_HKEY_KEY_0_SHIFT)
@@ -2336,15 +2124,15 @@
 #define I40E_GLQF_HKEY_KEY_2_MASK  I40E_MASK(0xFF, I40E_GLQF_HKEY_KEY_2_SHIFT)
 #define I40E_GLQF_HKEY_KEY_3_SHIFT 24
 #define I40E_GLQF_HKEY_KEY_3_MASK  I40E_MASK(0xFF, I40E_GLQF_HKEY_KEY_3_SHIFT)
-#define I40E_GLQF_HSYM(_i)            (0x00269D00 + ((_i) * 4)) /* _i=0...63 */
+#define I40E_GLQF_HSYM(_i)            (0x00269D00 + ((_i) * 4)) /* _i=0...63 */ /* Reset: CORER */
 #define I40E_GLQF_HSYM_MAX_INDEX      63
 #define I40E_GLQF_HSYM_SYMH_ENA_SHIFT 0
 #define I40E_GLQF_HSYM_SYMH_ENA_MASK  I40E_MASK(0x1, I40E_GLQF_HSYM_SYMH_ENA_SHIFT)
-#define I40E_GLQF_PCNT(_i)        (0x00266800 + ((_i) * 4)) /* _i=0...511 */
+#define I40E_GLQF_PCNT(_i)        (0x00266800 + ((_i) * 4)) /* _i=0...511 */ /* Reset: CORER */
 #define I40E_GLQF_PCNT_MAX_INDEX  511
 #define I40E_GLQF_PCNT_PCNT_SHIFT 0
 #define I40E_GLQF_PCNT_PCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLQF_PCNT_PCNT_SHIFT)
-#define I40E_GLQF_SWAP(_i, _j)          (0x00267E00 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...63 */
+#define I40E_GLQF_SWAP(_i, _j)          (0x00267E00 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...63 */ /* Reset: CORER */
 #define I40E_GLQF_SWAP_MAX_INDEX       1
 #define I40E_GLQF_SWAP_OFF0_SRC0_SHIFT 0
 #define I40E_GLQF_SWAP_OFF0_SRC0_MASK  I40E_MASK(0x3F, I40E_GLQF_SWAP_OFF0_SRC0_SHIFT)
@@ -2358,7 +2146,7 @@
 #define I40E_GLQF_SWAP_OFF1_SRC1_MASK  I40E_MASK(0x3F, I40E_GLQF_SWAP_OFF1_SRC1_SHIFT)
 #define I40E_GLQF_SWAP_FLEN1_SHIFT     28
 #define I40E_GLQF_SWAP_FLEN1_MASK      I40E_MASK(0xF, I40E_GLQF_SWAP_FLEN1_SHIFT)
-#define I40E_PFQF_CTL_0                   0x001C0AC0
+#define I40E_PFQF_CTL_0                   0x001C0AC0 /* Reset: CORER */
 #define I40E_PFQF_CTL_0_PEHSIZE_SHIFT     0
 #define I40E_PFQF_CTL_0_PEHSIZE_MASK      I40E_MASK(0x1F, I40E_PFQF_CTL_0_PEHSIZE_SHIFT)
 #define I40E_PFQF_CTL_0_PEDSIZE_SHIFT     5
@@ -2379,24 +2167,24 @@
 #define I40E_PFQF_CTL_0_VFFCHSIZE_MASK    I40E_MASK(0xF, I40E_PFQF_CTL_0_VFFCHSIZE_SHIFT)
 #define I40E_PFQF_CTL_0_VFFCDSIZE_SHIFT   24
 #define I40E_PFQF_CTL_0_VFFCDSIZE_MASK    I40E_MASK(0x3, I40E_PFQF_CTL_0_VFFCDSIZE_SHIFT)
-#define I40E_PFQF_CTL_1                    0x00245D80
+#define I40E_PFQF_CTL_1                    0x00245D80 /* Reset: CORER */
 #define I40E_PFQF_CTL_1_CLEARFDTABLE_SHIFT 0
 #define I40E_PFQF_CTL_1_CLEARFDTABLE_MASK  I40E_MASK(0x1, I40E_PFQF_CTL_1_CLEARFDTABLE_SHIFT)
-#define I40E_PFQF_FDALLOC               0x00246280
+#define I40E_PFQF_FDALLOC               0x00246280 /* Reset: CORER */
 #define I40E_PFQF_FDALLOC_FDALLOC_SHIFT 0
 #define I40E_PFQF_FDALLOC_FDALLOC_MASK  I40E_MASK(0xFF, I40E_PFQF_FDALLOC_FDALLOC_SHIFT)
 #define I40E_PFQF_FDALLOC_FDBEST_SHIFT  8
 #define I40E_PFQF_FDALLOC_FDBEST_MASK   I40E_MASK(0xFF, I40E_PFQF_FDALLOC_FDBEST_SHIFT)
-#define I40E_PFQF_FDSTAT                   0x00246380
+#define I40E_PFQF_FDSTAT                   0x00246380 /* Reset: CORER */
 #define I40E_PFQF_FDSTAT_GUARANT_CNT_SHIFT 0
 #define I40E_PFQF_FDSTAT_GUARANT_CNT_MASK  I40E_MASK(0x1FFF, I40E_PFQF_FDSTAT_GUARANT_CNT_SHIFT)
 #define I40E_PFQF_FDSTAT_BEST_CNT_SHIFT    16
 #define I40E_PFQF_FDSTAT_BEST_CNT_MASK     I40E_MASK(0x1FFF, I40E_PFQF_FDSTAT_BEST_CNT_SHIFT)
-#define I40E_PFQF_HENA(_i)             (0x00245900 + ((_i) * 128)) /* _i=0...1 */
+#define I40E_PFQF_HENA(_i)             (0x00245900 + ((_i) * 128)) /* _i=0...1 */ /* Reset: CORER */
 #define I40E_PFQF_HENA_MAX_INDEX       1
 #define I40E_PFQF_HENA_PTYPE_ENA_SHIFT 0
 #define I40E_PFQF_HENA_PTYPE_ENA_MASK  I40E_MASK(0xFFFFFFFF, I40E_PFQF_HENA_PTYPE_ENA_SHIFT)
-#define I40E_PFQF_HKEY(_i)         (0x00244800 + ((_i) * 128)) /* _i=0...12 */
+#define I40E_PFQF_HKEY(_i)         (0x00244800 + ((_i) * 128)) /* _i=0...12 */ /* Reset: CORER */
 #define I40E_PFQF_HKEY_MAX_INDEX   12
 #define I40E_PFQF_HKEY_KEY_0_SHIFT 0
 #define I40E_PFQF_HKEY_KEY_0_MASK  I40E_MASK(0xFF, I40E_PFQF_HKEY_KEY_0_SHIFT)
@@ -2406,7 +2194,7 @@
 #define I40E_PFQF_HKEY_KEY_2_MASK  I40E_MASK(0xFF, I40E_PFQF_HKEY_KEY_2_SHIFT)
 #define I40E_PFQF_HKEY_KEY_3_SHIFT 24
 #define I40E_PFQF_HKEY_KEY_3_MASK  I40E_MASK(0xFF, I40E_PFQF_HKEY_KEY_3_SHIFT)
-#define I40E_PFQF_HLUT(_i)        (0x00240000 + ((_i) * 128)) /* _i=0...127 */
+#define I40E_PFQF_HLUT(_i)        (0x00240000 + ((_i) * 128)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_PFQF_HLUT_MAX_INDEX  127
 #define I40E_PFQF_HLUT_LUT0_SHIFT 0
 #define I40E_PFQF_HLUT_LUT0_MASK  I40E_MASK(0x3F, I40E_PFQF_HLUT_LUT0_SHIFT)
@@ -2416,54 +2204,20 @@
 #define I40E_PFQF_HLUT_LUT2_MASK  I40E_MASK(0x3F, I40E_PFQF_HLUT_LUT2_SHIFT)
 #define I40E_PFQF_HLUT_LUT3_SHIFT 24
 #define I40E_PFQF_HLUT_LUT3_MASK  I40E_MASK(0x3F, I40E_PFQF_HLUT_LUT3_SHIFT)
-#define I40E_PFQF_HREGION(_i)                  (0x00245400 + ((_i) * 128)) /* _i=0...7 */
-#define I40E_PFQF_HREGION_MAX_INDEX            7
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_0_SHIFT 0
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_0_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_0_SHIFT)
-#define I40E_PFQF_HREGION_REGION_0_SHIFT       1
-#define I40E_PFQF_HREGION_REGION_0_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_0_SHIFT)
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_1_SHIFT 4
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_1_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_1_SHIFT)
-#define I40E_PFQF_HREGION_REGION_1_SHIFT       5
-#define I40E_PFQF_HREGION_REGION_1_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_1_SHIFT)
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_2_SHIFT 8
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_2_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_2_SHIFT)
-#define I40E_PFQF_HREGION_REGION_2_SHIFT       9
-#define I40E_PFQF_HREGION_REGION_2_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_2_SHIFT)
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_3_SHIFT 12
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_3_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_3_SHIFT)
-#define I40E_PFQF_HREGION_REGION_3_SHIFT       13
-#define I40E_PFQF_HREGION_REGION_3_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_3_SHIFT)
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_4_SHIFT 16
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_4_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_4_SHIFT)
-#define I40E_PFQF_HREGION_REGION_4_SHIFT       17
-#define I40E_PFQF_HREGION_REGION_4_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_4_SHIFT)
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_5_SHIFT 20
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_5_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_5_SHIFT)
-#define I40E_PFQF_HREGION_REGION_5_SHIFT       21
-#define I40E_PFQF_HREGION_REGION_5_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_5_SHIFT)
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_6_SHIFT 24
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_6_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_6_SHIFT)
-#define I40E_PFQF_HREGION_REGION_6_SHIFT       25
-#define I40E_PFQF_HREGION_REGION_6_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_6_SHIFT)
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_7_SHIFT 28
-#define I40E_PFQF_HREGION_OVERRIDE_ENA_7_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_7_SHIFT)
-#define I40E_PFQF_HREGION_REGION_7_SHIFT       29
-#define I40E_PFQF_HREGION_REGION_7_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_7_SHIFT)
-#define I40E_PRTQF_CTL_0                0x00256E60
+#define I40E_PRTQF_CTL_0                0x00256E60 /* Reset: CORER */
 #define I40E_PRTQF_CTL_0_HSYM_ENA_SHIFT 0
 #define I40E_PRTQF_CTL_0_HSYM_ENA_MASK  I40E_MASK(0x1, I40E_PRTQF_CTL_0_HSYM_ENA_SHIFT)
-#define I40E_PRTQF_FD_FLXINSET(_i)         (0x00253800 + ((_i) * 32)) /* _i=0...63 */
+#define I40E_PRTQF_FD_FLXINSET(_i)         (0x00253800 + ((_i) * 32)) /* _i=0...63 */ /* Reset: CORER */
 #define I40E_PRTQF_FD_FLXINSET_MAX_INDEX   63
 #define I40E_PRTQF_FD_FLXINSET_INSET_SHIFT 0
 #define I40E_PRTQF_FD_FLXINSET_INSET_MASK  I40E_MASK(0xFF, I40E_PRTQF_FD_FLXINSET_INSET_SHIFT)
-#define I40E_PRTQF_FD_MSK(_i, _j)       (0x00252000 + ((_i) * 64 + (_j) * 32)) /* _i=0...63, _j=0...1 */
+#define I40E_PRTQF_FD_MSK(_i, _j)       (0x00252000 + ((_i) * 64 + (_j) * 32)) /* _i=0...63, _j=0...1 */ /* Reset: CORER */
 #define I40E_PRTQF_FD_MSK_MAX_INDEX    63
 #define I40E_PRTQF_FD_MSK_MASK_SHIFT   0
 #define I40E_PRTQF_FD_MSK_MASK_MASK    I40E_MASK(0xFFFF, I40E_PRTQF_FD_MSK_MASK_SHIFT)
 #define I40E_PRTQF_FD_MSK_OFFSET_SHIFT 16
 #define I40E_PRTQF_FD_MSK_OFFSET_MASK  I40E_MASK(0x3F, I40E_PRTQF_FD_MSK_OFFSET_SHIFT)
-#define I40E_PRTQF_FLX_PIT(_i)              (0x00255200 + ((_i) * 32)) /* _i=0...8 */
+#define I40E_PRTQF_FLX_PIT(_i)              (0x00255200 + ((_i) * 32)) /* _i=0...8 */ /* Reset: CORER */
 #define I40E_PRTQF_FLX_PIT_MAX_INDEX        8
 #define I40E_PRTQF_FLX_PIT_SOURCE_OFF_SHIFT 0
 #define I40E_PRTQF_FLX_PIT_SOURCE_OFF_MASK  I40E_MASK(0x1F, I40E_PRTQF_FLX_PIT_SOURCE_OFF_SHIFT)
@@ -2471,11 +2225,11 @@
 #define I40E_PRTQF_FLX_PIT_FSIZE_MASK       I40E_MASK(0x1F, I40E_PRTQF_FLX_PIT_FSIZE_SHIFT)
 #define I40E_PRTQF_FLX_PIT_DEST_OFF_SHIFT   10
 #define I40E_PRTQF_FLX_PIT_DEST_OFF_MASK    I40E_MASK(0x3F, I40E_PRTQF_FLX_PIT_DEST_OFF_SHIFT)
-#define I40E_VFQF_HENA1(_i, _VF)         (0x00230800 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...1, _VF=0...127 */
+#define I40E_VFQF_HENA1(_i, _VF)         (0x00230800 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...1, _VF=0...127 */ /* Reset: CORER */
 #define I40E_VFQF_HENA1_MAX_INDEX       1
 #define I40E_VFQF_HENA1_PTYPE_ENA_SHIFT 0
 #define I40E_VFQF_HENA1_PTYPE_ENA_MASK  I40E_MASK(0xFFFFFFFF, I40E_VFQF_HENA1_PTYPE_ENA_SHIFT)
-#define I40E_VFQF_HKEY1(_i, _VF)     (0x00228000 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...12, _VF=0...127 */
+#define I40E_VFQF_HKEY1(_i, _VF)     (0x00228000 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...12, _VF=0...127 */ /* Reset: CORER */
 #define I40E_VFQF_HKEY1_MAX_INDEX   12
 #define I40E_VFQF_HKEY1_KEY_0_SHIFT 0
 #define I40E_VFQF_HKEY1_KEY_0_MASK  I40E_MASK(0xFF, I40E_VFQF_HKEY1_KEY_0_SHIFT)
@@ -2485,7 +2239,7 @@
 #define I40E_VFQF_HKEY1_KEY_2_MASK  I40E_MASK(0xFF, I40E_VFQF_HKEY1_KEY_2_SHIFT)
 #define I40E_VFQF_HKEY1_KEY_3_SHIFT 24
 #define I40E_VFQF_HKEY1_KEY_3_MASK  I40E_MASK(0xFF, I40E_VFQF_HKEY1_KEY_3_SHIFT)
-#define I40E_VFQF_HLUT1(_i, _VF)    (0x00220000 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...15, _VF=0...127 */
+#define I40E_VFQF_HLUT1(_i, _VF)    (0x00220000 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...15, _VF=0...127 */ /* Reset: CORER */
 #define I40E_VFQF_HLUT1_MAX_INDEX  15
 #define I40E_VFQF_HLUT1_LUT0_SHIFT 0
 #define I40E_VFQF_HLUT1_LUT0_MASK  I40E_MASK(0xF, I40E_VFQF_HLUT1_LUT0_SHIFT)
@@ -2495,7 +2249,7 @@
 #define I40E_VFQF_HLUT1_LUT2_MASK  I40E_MASK(0xF, I40E_VFQF_HLUT1_LUT2_SHIFT)
 #define I40E_VFQF_HLUT1_LUT3_SHIFT 24
 #define I40E_VFQF_HLUT1_LUT3_MASK  I40E_MASK(0xF, I40E_VFQF_HLUT1_LUT3_SHIFT)
-#define I40E_VFQF_HREGION1(_i, _VF)              (0x0022E000 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...7, _VF=0...127 */
+#define I40E_VFQF_HREGION1(_i, _VF)              (0x0022E000 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...7, _VF=0...127 */ /* Reset: CORER */
 #define I40E_VFQF_HREGION1_MAX_INDEX            7
 #define I40E_VFQF_HREGION1_OVERRIDE_ENA_0_SHIFT 0
 #define I40E_VFQF_HREGION1_OVERRIDE_ENA_0_MASK  I40E_MASK(0x1, I40E_VFQF_HREGION1_OVERRIDE_ENA_0_SHIFT)
@@ -2529,7 +2283,7 @@
 #define I40E_VFQF_HREGION1_OVERRIDE_ENA_7_MASK  I40E_MASK(0x1, I40E_VFQF_HREGION1_OVERRIDE_ENA_7_SHIFT)
 #define I40E_VFQF_HREGION1_REGION_7_SHIFT       29
 #define I40E_VFQF_HREGION1_REGION_7_MASK        I40E_MASK(0x7, I40E_VFQF_HREGION1_REGION_7_SHIFT)
-#define I40E_VPQF_CTL(_VF)          (0x001C0000 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VPQF_CTL(_VF)          (0x001C0000 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: VFR */
 #define I40E_VPQF_CTL_MAX_INDEX     127
 #define I40E_VPQF_CTL_PEHSIZE_SHIFT 0
 #define I40E_VPQF_CTL_PEHSIZE_MASK  I40E_MASK(0x1F, I40E_VPQF_CTL_PEHSIZE_SHIFT)
@@ -2539,7 +2293,7 @@
 #define I40E_VPQF_CTL_FCHSIZE_MASK  I40E_MASK(0xF, I40E_VPQF_CTL_FCHSIZE_SHIFT)
 #define I40E_VPQF_CTL_FCDSIZE_SHIFT 14
 #define I40E_VPQF_CTL_FCDSIZE_MASK  I40E_MASK(0x3, I40E_VPQF_CTL_FCDSIZE_SHIFT)
-#define I40E_VSIQF_CTL(_VSI)             (0x0020D800 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSIQF_CTL(_VSI)             (0x0020D800 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSIQF_CTL_MAX_INDEX         383
 #define I40E_VSIQF_CTL_FCOE_ENA_SHIFT    0
 #define I40E_VSIQF_CTL_FCOE_ENA_MASK     I40E_MASK(0x1, I40E_VSIQF_CTL_FCOE_ENA_SHIFT)
@@ -2553,7 +2307,7 @@
 #define I40E_VSIQF_CTL_PEUFRAG_ENA_MASK  I40E_MASK(0x1, I40E_VSIQF_CTL_PEUFRAG_ENA_SHIFT)
 #define I40E_VSIQF_CTL_PEMFRAG_ENA_SHIFT 5
 #define I40E_VSIQF_CTL_PEMFRAG_ENA_MASK  I40E_MASK(0x1, I40E_VSIQF_CTL_PEMFRAG_ENA_SHIFT)
-#define I40E_VSIQF_TCREGION(_i, _VSI)         (0x00206000 + ((_i) * 2048 + (_VSI) * 4)) /* _i=0...3, _VSI=0...383 */
+#define I40E_VSIQF_TCREGION(_i, _VSI)         (0x00206000 + ((_i) * 2048 + (_VSI) * 4)) /* _i=0...3, _VSI=0...383 */ /* Reset: PFR */
 #define I40E_VSIQF_TCREGION_MAX_INDEX        3
 #define I40E_VSIQF_TCREGION_TC_OFFSET_SHIFT  0
 #define I40E_VSIQF_TCREGION_TC_OFFSET_MASK   I40E_MASK(0x1FF, I40E_VSIQF_TCREGION_TC_OFFSET_SHIFT)
@@ -2563,575 +2317,575 @@
 #define I40E_VSIQF_TCREGION_TC_OFFSET2_MASK  I40E_MASK(0x1FF, I40E_VSIQF_TCREGION_TC_OFFSET2_SHIFT)
 #define I40E_VSIQF_TCREGION_TC_SIZE2_SHIFT   25
 #define I40E_VSIQF_TCREGION_TC_SIZE2_MASK    I40E_MASK(0x7, I40E_VSIQF_TCREGION_TC_SIZE2_SHIFT)
-#define I40E_GL_FCOECRC(_i)           (0x00314d80 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOECRC(_i)           (0x00314d80 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOECRC_MAX_INDEX     143
 #define I40E_GL_FCOECRC_FCOECRC_SHIFT 0
 #define I40E_GL_FCOECRC_FCOECRC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_FCOECRC_FCOECRC_SHIFT)
-#define I40E_GL_FCOEDDPC(_i)            (0x00314480 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOEDDPC(_i)            (0x00314480 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOEDDPC_MAX_INDEX      143
 #define I40E_GL_FCOEDDPC_FCOEDDPC_SHIFT 0
 #define I40E_GL_FCOEDDPC_FCOEDDPC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_FCOEDDPC_FCOEDDPC_SHIFT)
-#define I40E_GL_FCOEDIFEC(_i)             (0x00318480 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOEDIFEC(_i)             (0x00318480 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOEDIFEC_MAX_INDEX       143
 #define I40E_GL_FCOEDIFEC_FCOEDIFRC_SHIFT 0
 #define I40E_GL_FCOEDIFEC_FCOEDIFRC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_FCOEDIFEC_FCOEDIFRC_SHIFT)
-#define I40E_GL_FCOEDIFTCL(_i)             (0x00354000 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOEDIFTCL(_i)             (0x00354000 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOEDIFTCL_MAX_INDEX       143
 #define I40E_GL_FCOEDIFTCL_FCOEDIFTC_SHIFT 0
 #define I40E_GL_FCOEDIFTCL_FCOEDIFTC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_FCOEDIFTCL_FCOEDIFTC_SHIFT)
-#define I40E_GL_FCOEDIXEC(_i)             (0x0034c000 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOEDIXEC(_i)             (0x0034c000 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOEDIXEC_MAX_INDEX       143
 #define I40E_GL_FCOEDIXEC_FCOEDIXEC_SHIFT 0
 #define I40E_GL_FCOEDIXEC_FCOEDIXEC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_FCOEDIXEC_FCOEDIXEC_SHIFT)
-#define I40E_GL_FCOEDIXVC(_i)             (0x00350000 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOEDIXVC(_i)             (0x00350000 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOEDIXVC_MAX_INDEX       143
 #define I40E_GL_FCOEDIXVC_FCOEDIXVC_SHIFT 0
 #define I40E_GL_FCOEDIXVC_FCOEDIXVC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_FCOEDIXVC_FCOEDIXVC_SHIFT)
-#define I40E_GL_FCOEDWRCH(_i)             (0x00320004 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOEDWRCH(_i)             (0x00320004 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOEDWRCH_MAX_INDEX       143
 #define I40E_GL_FCOEDWRCH_FCOEDWRCH_SHIFT 0
 #define I40E_GL_FCOEDWRCH_FCOEDWRCH_MASK  I40E_MASK(0xFFFF, I40E_GL_FCOEDWRCH_FCOEDWRCH_SHIFT)
-#define I40E_GL_FCOEDWRCL(_i)             (0x00320000 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOEDWRCL(_i)             (0x00320000 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOEDWRCL_MAX_INDEX       143
 #define I40E_GL_FCOEDWRCL_FCOEDWRCL_SHIFT 0
 #define I40E_GL_FCOEDWRCL_FCOEDWRCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_FCOEDWRCL_FCOEDWRCL_SHIFT)
-#define I40E_GL_FCOEDWTCH(_i)             (0x00348084 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOEDWTCH(_i)             (0x00348084 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOEDWTCH_MAX_INDEX       143
 #define I40E_GL_FCOEDWTCH_FCOEDWTCH_SHIFT 0
 #define I40E_GL_FCOEDWTCH_FCOEDWTCH_MASK  I40E_MASK(0xFFFF, I40E_GL_FCOEDWTCH_FCOEDWTCH_SHIFT)
-#define I40E_GL_FCOEDWTCL(_i)             (0x00348080 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOEDWTCL(_i)             (0x00348080 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOEDWTCL_MAX_INDEX       143
 #define I40E_GL_FCOEDWTCL_FCOEDWTCL_SHIFT 0
 #define I40E_GL_FCOEDWTCL_FCOEDWTCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_FCOEDWTCL_FCOEDWTCL_SHIFT)
-#define I40E_GL_FCOELAST(_i)            (0x00314000 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOELAST(_i)            (0x00314000 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOELAST_MAX_INDEX      143
 #define I40E_GL_FCOELAST_FCOELAST_SHIFT 0
 #define I40E_GL_FCOELAST_FCOELAST_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_FCOELAST_FCOELAST_SHIFT)
-#define I40E_GL_FCOEPRC(_i)           (0x00315200 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOEPRC(_i)           (0x00315200 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOEPRC_MAX_INDEX     143
 #define I40E_GL_FCOEPRC_FCOEPRC_SHIFT 0
 #define I40E_GL_FCOEPRC_FCOEPRC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_FCOEPRC_FCOEPRC_SHIFT)
-#define I40E_GL_FCOEPTC(_i)           (0x00344C00 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOEPTC(_i)           (0x00344C00 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOEPTC_MAX_INDEX     143
 #define I40E_GL_FCOEPTC_FCOEPTC_SHIFT 0
 #define I40E_GL_FCOEPTC_FCOEPTC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_FCOEPTC_FCOEPTC_SHIFT)
-#define I40E_GL_FCOERPDC(_i)            (0x00324000 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_FCOERPDC(_i)            (0x00324000 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_FCOERPDC_MAX_INDEX      143
 #define I40E_GL_FCOERPDC_FCOERPDC_SHIFT 0
 #define I40E_GL_FCOERPDC_FCOERPDC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_FCOERPDC_FCOERPDC_SHIFT)
-#define I40E_GL_RXERR1_L(_i)             (0x00318000 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_RXERR1_L(_i)             (0x00318000 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_RXERR1_L_MAX_INDEX       143
 #define I40E_GL_RXERR1_L_FCOEDIFRC_SHIFT 0
 #define I40E_GL_RXERR1_L_FCOEDIFRC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_RXERR1_L_FCOEDIFRC_SHIFT)
-#define I40E_GL_RXERR2_L(_i)             (0x0031c000 + ((_i) * 8)) /* _i=0...143 */
+#define I40E_GL_RXERR2_L(_i)             (0x0031c000 + ((_i) * 8)) /* _i=0...143 */ /* Reset: CORER */
 #define I40E_GL_RXERR2_L_MAX_INDEX       143
 #define I40E_GL_RXERR2_L_FCOEDIXAC_SHIFT 0
 #define I40E_GL_RXERR2_L_FCOEDIXAC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_RXERR2_L_FCOEDIXAC_SHIFT)
-#define I40E_GLPRT_BPRCH(_i)         (0x003005E4 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_BPRCH(_i)         (0x003005E4 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_BPRCH_MAX_INDEX   3
 #define I40E_GLPRT_BPRCH_UPRCH_SHIFT 0
 #define I40E_GLPRT_BPRCH_UPRCH_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_BPRCH_UPRCH_SHIFT)
-#define I40E_GLPRT_BPRCL(_i)         (0x003005E0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_BPRCL(_i)         (0x003005E0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_BPRCL_MAX_INDEX   3
 #define I40E_GLPRT_BPRCL_UPRCH_SHIFT 0
 #define I40E_GLPRT_BPRCL_UPRCH_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_BPRCL_UPRCH_SHIFT)
-#define I40E_GLPRT_BPTCH(_i)         (0x00300A04 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_BPTCH(_i)         (0x00300A04 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_BPTCH_MAX_INDEX   3
 #define I40E_GLPRT_BPTCH_UPRCH_SHIFT 0
 #define I40E_GLPRT_BPTCH_UPRCH_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_BPTCH_UPRCH_SHIFT)
-#define I40E_GLPRT_BPTCL(_i)         (0x00300A00 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_BPTCL(_i)         (0x00300A00 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_BPTCL_MAX_INDEX   3
 #define I40E_GLPRT_BPTCL_UPRCH_SHIFT 0
 #define I40E_GLPRT_BPTCL_UPRCH_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_BPTCL_UPRCH_SHIFT)
-#define I40E_GLPRT_CRCERRS(_i)           (0x00300080 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_CRCERRS(_i)           (0x00300080 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_CRCERRS_MAX_INDEX     3
 #define I40E_GLPRT_CRCERRS_CRCERRS_SHIFT 0
 #define I40E_GLPRT_CRCERRS_CRCERRS_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_CRCERRS_CRCERRS_SHIFT)
-#define I40E_GLPRT_GORCH(_i)         (0x00300004 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_GORCH(_i)         (0x00300004 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_GORCH_MAX_INDEX   3
 #define I40E_GLPRT_GORCH_GORCH_SHIFT 0
 #define I40E_GLPRT_GORCH_GORCH_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_GORCH_GORCH_SHIFT)
-#define I40E_GLPRT_GORCL(_i)         (0x00300000 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_GORCL(_i)         (0x00300000 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_GORCL_MAX_INDEX   3
 #define I40E_GLPRT_GORCL_GORCL_SHIFT 0
 #define I40E_GLPRT_GORCL_GORCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_GORCL_GORCL_SHIFT)
-#define I40E_GLPRT_GOTCH(_i)         (0x00300684 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_GOTCH(_i)         (0x00300684 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_GOTCH_MAX_INDEX   3
 #define I40E_GLPRT_GOTCH_GOTCH_SHIFT 0
 #define I40E_GLPRT_GOTCH_GOTCH_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_GOTCH_GOTCH_SHIFT)
-#define I40E_GLPRT_GOTCL(_i)         (0x00300680 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_GOTCL(_i)         (0x00300680 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_GOTCL_MAX_INDEX   3
 #define I40E_GLPRT_GOTCL_GOTCL_SHIFT 0
 #define I40E_GLPRT_GOTCL_GOTCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_GOTCL_GOTCL_SHIFT)
-#define I40E_GLPRT_ILLERRC(_i)           (0x003000E0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_ILLERRC(_i)           (0x003000E0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_ILLERRC_MAX_INDEX     3
 #define I40E_GLPRT_ILLERRC_ILLERRC_SHIFT 0
 #define I40E_GLPRT_ILLERRC_ILLERRC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_ILLERRC_ILLERRC_SHIFT)
-#define I40E_GLPRT_LDPC(_i)        (0x00300620 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_LDPC(_i)        (0x00300620 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_LDPC_MAX_INDEX  3
 #define I40E_GLPRT_LDPC_LDPC_SHIFT 0
 #define I40E_GLPRT_LDPC_LDPC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_LDPC_LDPC_SHIFT)
-#define I40E_GLPRT_LXOFFRXC(_i)              (0x00300160 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_LXOFFRXC(_i)              (0x00300160 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_LXOFFRXC_MAX_INDEX        3
 #define I40E_GLPRT_LXOFFRXC_LXOFFRXCNT_SHIFT 0
 #define I40E_GLPRT_LXOFFRXC_LXOFFRXCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_LXOFFRXC_LXOFFRXCNT_SHIFT)
-#define I40E_GLPRT_LXOFFTXC(_i)            (0x003009A0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_LXOFFTXC(_i)            (0x003009A0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_LXOFFTXC_MAX_INDEX      3
 #define I40E_GLPRT_LXOFFTXC_LXOFFTXC_SHIFT 0
 #define I40E_GLPRT_LXOFFTXC_LXOFFTXC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_LXOFFTXC_LXOFFTXC_SHIFT)
-#define I40E_GLPRT_LXONRXC(_i)             (0x00300140 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_LXONRXC(_i)             (0x00300140 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_LXONRXC_MAX_INDEX       3
 #define I40E_GLPRT_LXONRXC_LXONRXCNT_SHIFT 0
 #define I40E_GLPRT_LXONRXC_LXONRXCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_LXONRXC_LXONRXCNT_SHIFT)
-#define I40E_GLPRT_LXONTXC(_i)           (0x00300980 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_LXONTXC(_i)           (0x00300980 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_LXONTXC_MAX_INDEX     3
 #define I40E_GLPRT_LXONTXC_LXONTXC_SHIFT 0
 #define I40E_GLPRT_LXONTXC_LXONTXC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_LXONTXC_LXONTXC_SHIFT)
-#define I40E_GLPRT_MLFC(_i)        (0x00300020 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_MLFC(_i)        (0x00300020 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_MLFC_MAX_INDEX  3
 #define I40E_GLPRT_MLFC_MLFC_SHIFT 0
 #define I40E_GLPRT_MLFC_MLFC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_MLFC_MLFC_SHIFT)
-#define I40E_GLPRT_MPRCH(_i)         (0x003005C4 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_MPRCH(_i)         (0x003005C4 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_MPRCH_MAX_INDEX   3
 #define I40E_GLPRT_MPRCH_MPRCH_SHIFT 0
 #define I40E_GLPRT_MPRCH_MPRCH_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_MPRCH_MPRCH_SHIFT)
-#define I40E_GLPRT_MPRCL(_i)         (0x003005C0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_MPRCL(_i)         (0x003005C0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_MPRCL_MAX_INDEX   3
 #define I40E_GLPRT_MPRCL_MPRCL_SHIFT 0
 #define I40E_GLPRT_MPRCL_MPRCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_MPRCL_MPRCL_SHIFT)
-#define I40E_GLPRT_MPTCH(_i)         (0x003009E4 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_MPTCH(_i)         (0x003009E4 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_MPTCH_MAX_INDEX   3
 #define I40E_GLPRT_MPTCH_MPTCH_SHIFT 0
 #define I40E_GLPRT_MPTCH_MPTCH_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_MPTCH_MPTCH_SHIFT)
-#define I40E_GLPRT_MPTCL(_i)         (0x003009E0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_MPTCL(_i)         (0x003009E0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_MPTCL_MAX_INDEX   3
 #define I40E_GLPRT_MPTCL_MPTCL_SHIFT 0
 #define I40E_GLPRT_MPTCL_MPTCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_MPTCL_MPTCL_SHIFT)
-#define I40E_GLPRT_MRFC(_i)        (0x00300040 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_MRFC(_i)        (0x00300040 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_MRFC_MAX_INDEX  3
 #define I40E_GLPRT_MRFC_MRFC_SHIFT 0
 #define I40E_GLPRT_MRFC_MRFC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_MRFC_MRFC_SHIFT)
-#define I40E_GLPRT_PRC1023H(_i)            (0x00300504 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC1023H(_i)            (0x00300504 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC1023H_MAX_INDEX      3
 #define I40E_GLPRT_PRC1023H_PRC1023H_SHIFT 0
 #define I40E_GLPRT_PRC1023H_PRC1023H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PRC1023H_PRC1023H_SHIFT)
-#define I40E_GLPRT_PRC1023L(_i)            (0x00300500 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC1023L(_i)            (0x00300500 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC1023L_MAX_INDEX      3
 #define I40E_GLPRT_PRC1023L_PRC1023L_SHIFT 0
 #define I40E_GLPRT_PRC1023L_PRC1023L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PRC1023L_PRC1023L_SHIFT)
-#define I40E_GLPRT_PRC127H(_i)           (0x003004A4 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC127H(_i)           (0x003004A4 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC127H_MAX_INDEX     3
 #define I40E_GLPRT_PRC127H_PRC127H_SHIFT 0
 #define I40E_GLPRT_PRC127H_PRC127H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PRC127H_PRC127H_SHIFT)
-#define I40E_GLPRT_PRC127L(_i)           (0x003004A0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC127L(_i)           (0x003004A0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC127L_MAX_INDEX     3
 #define I40E_GLPRT_PRC127L_PRC127L_SHIFT 0
 #define I40E_GLPRT_PRC127L_PRC127L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PRC127L_PRC127L_SHIFT)
-#define I40E_GLPRT_PRC1522H(_i)            (0x00300524 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC1522H(_i)            (0x00300524 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC1522H_MAX_INDEX      3
 #define I40E_GLPRT_PRC1522H_PRC1522H_SHIFT 0
 #define I40E_GLPRT_PRC1522H_PRC1522H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PRC1522H_PRC1522H_SHIFT)
-#define I40E_GLPRT_PRC1522L(_i)            (0x00300520 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC1522L(_i)            (0x00300520 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC1522L_MAX_INDEX      3
 #define I40E_GLPRT_PRC1522L_PRC1522L_SHIFT 0
 #define I40E_GLPRT_PRC1522L_PRC1522L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PRC1522L_PRC1522L_SHIFT)
-#define I40E_GLPRT_PRC255H(_i)              (0x003004C4 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC255H(_i)              (0x003004C4 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC255H_MAX_INDEX        3
 #define I40E_GLPRT_PRC255H_PRTPRC255H_SHIFT 0
 #define I40E_GLPRT_PRC255H_PRTPRC255H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PRC255H_PRTPRC255H_SHIFT)
-#define I40E_GLPRT_PRC255L(_i)           (0x003004C0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC255L(_i)           (0x003004C0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC255L_MAX_INDEX     3
 #define I40E_GLPRT_PRC255L_PRC255L_SHIFT 0
 #define I40E_GLPRT_PRC255L_PRC255L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PRC255L_PRC255L_SHIFT)
-#define I40E_GLPRT_PRC511H(_i)           (0x003004E4 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC511H(_i)           (0x003004E4 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC511H_MAX_INDEX     3
 #define I40E_GLPRT_PRC511H_PRC511H_SHIFT 0
 #define I40E_GLPRT_PRC511H_PRC511H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PRC511H_PRC511H_SHIFT)
-#define I40E_GLPRT_PRC511L(_i)           (0x003004E0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC511L(_i)           (0x003004E0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC511L_MAX_INDEX     3
 #define I40E_GLPRT_PRC511L_PRC511L_SHIFT 0
 #define I40E_GLPRT_PRC511L_PRC511L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PRC511L_PRC511L_SHIFT)
-#define I40E_GLPRT_PRC64H(_i)          (0x00300484 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC64H(_i)          (0x00300484 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC64H_MAX_INDEX    3
 #define I40E_GLPRT_PRC64H_PRC64H_SHIFT 0
 #define I40E_GLPRT_PRC64H_PRC64H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PRC64H_PRC64H_SHIFT)
-#define I40E_GLPRT_PRC64L(_i)          (0x00300480 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC64L(_i)          (0x00300480 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC64L_MAX_INDEX    3
 #define I40E_GLPRT_PRC64L_PRC64L_SHIFT 0
 #define I40E_GLPRT_PRC64L_PRC64L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PRC64L_PRC64L_SHIFT)
-#define I40E_GLPRT_PRC9522H(_i)            (0x00300544 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC9522H(_i)            (0x00300544 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC9522H_MAX_INDEX      3
 #define I40E_GLPRT_PRC9522H_PRC1522H_SHIFT 0
 #define I40E_GLPRT_PRC9522H_PRC1522H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PRC9522H_PRC1522H_SHIFT)
-#define I40E_GLPRT_PRC9522L(_i)            (0x00300540 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PRC9522L(_i)            (0x00300540 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PRC9522L_MAX_INDEX      3
 #define I40E_GLPRT_PRC9522L_PRC1522L_SHIFT 0
 #define I40E_GLPRT_PRC9522L_PRC1522L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PRC9522L_PRC1522L_SHIFT)
-#define I40E_GLPRT_PTC1023H(_i)            (0x00300724 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC1023H(_i)            (0x00300724 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC1023H_MAX_INDEX      3
 #define I40E_GLPRT_PTC1023H_PTC1023H_SHIFT 0
 #define I40E_GLPRT_PTC1023H_PTC1023H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PTC1023H_PTC1023H_SHIFT)
-#define I40E_GLPRT_PTC1023L(_i)            (0x00300720 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC1023L(_i)            (0x00300720 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC1023L_MAX_INDEX      3
 #define I40E_GLPRT_PTC1023L_PTC1023L_SHIFT 0
 #define I40E_GLPRT_PTC1023L_PTC1023L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PTC1023L_PTC1023L_SHIFT)
-#define I40E_GLPRT_PTC127H(_i)           (0x003006C4 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC127H(_i)           (0x003006C4 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC127H_MAX_INDEX     3
 #define I40E_GLPRT_PTC127H_PTC127H_SHIFT 0
 #define I40E_GLPRT_PTC127H_PTC127H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PTC127H_PTC127H_SHIFT)
-#define I40E_GLPRT_PTC127L(_i)           (0x003006C0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC127L(_i)           (0x003006C0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC127L_MAX_INDEX     3
 #define I40E_GLPRT_PTC127L_PTC127L_SHIFT 0
 #define I40E_GLPRT_PTC127L_PTC127L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PTC127L_PTC127L_SHIFT)
-#define I40E_GLPRT_PTC1522H(_i)            (0x00300744 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC1522H(_i)            (0x00300744 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC1522H_MAX_INDEX      3
 #define I40E_GLPRT_PTC1522H_PTC1522H_SHIFT 0
 #define I40E_GLPRT_PTC1522H_PTC1522H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PTC1522H_PTC1522H_SHIFT)
-#define I40E_GLPRT_PTC1522L(_i)            (0x00300740 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC1522L(_i)            (0x00300740 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC1522L_MAX_INDEX      3
 #define I40E_GLPRT_PTC1522L_PTC1522L_SHIFT 0
 #define I40E_GLPRT_PTC1522L_PTC1522L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PTC1522L_PTC1522L_SHIFT)
-#define I40E_GLPRT_PTC255H(_i)           (0x003006E4 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC255H(_i)           (0x003006E4 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC255H_MAX_INDEX     3
 #define I40E_GLPRT_PTC255H_PTC255H_SHIFT 0
 #define I40E_GLPRT_PTC255H_PTC255H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PTC255H_PTC255H_SHIFT)
-#define I40E_GLPRT_PTC255L(_i)           (0x003006E0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC255L(_i)           (0x003006E0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC255L_MAX_INDEX     3
 #define I40E_GLPRT_PTC255L_PTC255L_SHIFT 0
 #define I40E_GLPRT_PTC255L_PTC255L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PTC255L_PTC255L_SHIFT)
-#define I40E_GLPRT_PTC511H(_i)           (0x00300704 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC511H(_i)           (0x00300704 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC511H_MAX_INDEX     3
 #define I40E_GLPRT_PTC511H_PTC511H_SHIFT 0
 #define I40E_GLPRT_PTC511H_PTC511H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PTC511H_PTC511H_SHIFT)
-#define I40E_GLPRT_PTC511L(_i)           (0x00300700 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC511L(_i)           (0x00300700 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC511L_MAX_INDEX     3
 #define I40E_GLPRT_PTC511L_PTC511L_SHIFT 0
 #define I40E_GLPRT_PTC511L_PTC511L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PTC511L_PTC511L_SHIFT)
-#define I40E_GLPRT_PTC64H(_i)          (0x003006A4 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC64H(_i)          (0x003006A4 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC64H_MAX_INDEX    3
 #define I40E_GLPRT_PTC64H_PTC64H_SHIFT 0
 #define I40E_GLPRT_PTC64H_PTC64H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PTC64H_PTC64H_SHIFT)
-#define I40E_GLPRT_PTC64L(_i)          (0x003006A0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC64L(_i)          (0x003006A0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC64L_MAX_INDEX    3
 #define I40E_GLPRT_PTC64L_PTC64L_SHIFT 0
 #define I40E_GLPRT_PTC64L_PTC64L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PTC64L_PTC64L_SHIFT)
-#define I40E_GLPRT_PTC9522H(_i)            (0x00300764 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC9522H(_i)            (0x00300764 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC9522H_MAX_INDEX      3
 #define I40E_GLPRT_PTC9522H_PTC9522H_SHIFT 0
 #define I40E_GLPRT_PTC9522H_PTC9522H_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_PTC9522H_PTC9522H_SHIFT)
-#define I40E_GLPRT_PTC9522L(_i)            (0x00300760 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_PTC9522L(_i)            (0x00300760 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_PTC9522L_MAX_INDEX      3
 #define I40E_GLPRT_PTC9522L_PTC9522L_SHIFT 0
 #define I40E_GLPRT_PTC9522L_PTC9522L_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PTC9522L_PTC9522L_SHIFT)
-#define I40E_GLPRT_PXOFFRXC(_i, _j)             (0x00300280 + ((_i) * 8 + (_j) * 32)) /* _i=0...3, _j=0...7 */
+#define I40E_GLPRT_PXOFFRXC(_i, _j)             (0x00300280 + ((_i) * 8 + (_j) * 32)) /* _i=0...3, _j=0...7 */ /* Reset: CORER */
 #define I40E_GLPRT_PXOFFRXC_MAX_INDEX          3
 #define I40E_GLPRT_PXOFFRXC_PRPXOFFRXCNT_SHIFT 0
 #define I40E_GLPRT_PXOFFRXC_PRPXOFFRXCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PXOFFRXC_PRPXOFFRXCNT_SHIFT)
-#define I40E_GLPRT_PXOFFTXC(_i, _j)             (0x00300880 + ((_i) * 8 + (_j) * 32)) /* _i=0...3, _j=0...7 */
+#define I40E_GLPRT_PXOFFTXC(_i, _j)             (0x00300880 + ((_i) * 8 + (_j) * 32)) /* _i=0...3, _j=0...7 */ /* Reset: CORER */
 #define I40E_GLPRT_PXOFFTXC_MAX_INDEX          3
 #define I40E_GLPRT_PXOFFTXC_PRPXOFFTXCNT_SHIFT 0
 #define I40E_GLPRT_PXOFFTXC_PRPXOFFTXCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PXOFFTXC_PRPXOFFTXCNT_SHIFT)
-#define I40E_GLPRT_PXONRXC(_i, _j)            (0x00300180 + ((_i) * 8 + (_j) * 32)) /* _i=0...3, _j=0...7 */
+#define I40E_GLPRT_PXONRXC(_i, _j)            (0x00300180 + ((_i) * 8 + (_j) * 32)) /* _i=0...3, _j=0...7 */ /* Reset: CORER */
 #define I40E_GLPRT_PXONRXC_MAX_INDEX         3
 #define I40E_GLPRT_PXONRXC_PRPXONRXCNT_SHIFT 0
 #define I40E_GLPRT_PXONRXC_PRPXONRXCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PXONRXC_PRPXONRXCNT_SHIFT)
-#define I40E_GLPRT_PXONTXC(_i, _j)          (0x00300780 + ((_i) * 8 + (_j) * 32)) /* _i=0...3, _j=0...7 */
+#define I40E_GLPRT_PXONTXC(_i, _j)          (0x00300780 + ((_i) * 8 + (_j) * 32)) /* _i=0...3, _j=0...7 */ /* Reset: CORER */
 #define I40E_GLPRT_PXONTXC_MAX_INDEX       3
 #define I40E_GLPRT_PXONTXC_PRPXONTXC_SHIFT 0
 #define I40E_GLPRT_PXONTXC_PRPXONTXC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_PXONTXC_PRPXONTXC_SHIFT)
-#define I40E_GLPRT_RDPC(_i)        (0x00300600 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_RDPC(_i)        (0x00300600 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_RDPC_MAX_INDEX  3
 #define I40E_GLPRT_RDPC_RDPC_SHIFT 0
 #define I40E_GLPRT_RDPC_RDPC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_RDPC_RDPC_SHIFT)
-#define I40E_GLPRT_RFC(_i)       (0x00300560 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_RFC(_i)       (0x00300560 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_RFC_MAX_INDEX 3
 #define I40E_GLPRT_RFC_RFC_SHIFT 0
 #define I40E_GLPRT_RFC_RFC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_RFC_RFC_SHIFT)
-#define I40E_GLPRT_RJC(_i)       (0x00300580 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_RJC(_i)       (0x00300580 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_RJC_MAX_INDEX 3
 #define I40E_GLPRT_RJC_RJC_SHIFT 0
 #define I40E_GLPRT_RJC_RJC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_RJC_RJC_SHIFT)
-#define I40E_GLPRT_RLEC(_i)        (0x003000A0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_RLEC(_i)        (0x003000A0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_RLEC_MAX_INDEX  3
 #define I40E_GLPRT_RLEC_RLEC_SHIFT 0
 #define I40E_GLPRT_RLEC_RLEC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_RLEC_RLEC_SHIFT)
-#define I40E_GLPRT_ROC(_i)       (0x00300120 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_ROC(_i)       (0x00300120 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_ROC_MAX_INDEX 3
 #define I40E_GLPRT_ROC_ROC_SHIFT 0
 #define I40E_GLPRT_ROC_ROC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_ROC_ROC_SHIFT)
-#define I40E_GLPRT_RUC(_i)       (0x00300100 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_RUC(_i)       (0x00300100 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_RUC_MAX_INDEX 3
 #define I40E_GLPRT_RUC_RUC_SHIFT 0
 #define I40E_GLPRT_RUC_RUC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_RUC_RUC_SHIFT)
-#define I40E_GLPRT_RUPP(_i)        (0x00300660 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_RUPP(_i)        (0x00300660 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_RUPP_MAX_INDEX  3
 #define I40E_GLPRT_RUPP_RUPP_SHIFT 0
 #define I40E_GLPRT_RUPP_RUPP_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_RUPP_RUPP_SHIFT)
-#define I40E_GLPRT_RXON2OFFCNT(_i, _j)              (0x00300380 + ((_i) * 8 + (_j) * 32)) /* _i=0...3, _j=0...7 */
+#define I40E_GLPRT_RXON2OFFCNT(_i, _j)              (0x00300380 + ((_i) * 8 + (_j) * 32)) /* _i=0...3, _j=0...7 */ /* Reset: CORER */
 #define I40E_GLPRT_RXON2OFFCNT_MAX_INDEX           3
 #define I40E_GLPRT_RXON2OFFCNT_PRRXON2OFFCNT_SHIFT 0
 #define I40E_GLPRT_RXON2OFFCNT_PRRXON2OFFCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_RXON2OFFCNT_PRRXON2OFFCNT_SHIFT)
-#define I40E_GLPRT_TDOLD(_i)               (0x00300A20 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_TDOLD(_i)               (0x00300A20 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_TDOLD_MAX_INDEX         3
 #define I40E_GLPRT_TDOLD_GLPRT_TDOLD_SHIFT 0
 #define I40E_GLPRT_TDOLD_GLPRT_TDOLD_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_TDOLD_GLPRT_TDOLD_SHIFT)
-#define I40E_GLPRT_TDPC(_i)        (0x00375400 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_TDPC(_i)        (0x00375400 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_TDPC_MAX_INDEX  3
 #define I40E_GLPRT_TDPC_TDPC_SHIFT 0
 #define I40E_GLPRT_TDPC_TDPC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_TDPC_TDPC_SHIFT)
-#define I40E_GLPRT_UPRCH(_i)         (0x003005A4 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_UPRCH(_i)         (0x003005A4 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_UPRCH_MAX_INDEX   3
 #define I40E_GLPRT_UPRCH_UPRCH_SHIFT 0
 #define I40E_GLPRT_UPRCH_UPRCH_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_UPRCH_UPRCH_SHIFT)
-#define I40E_GLPRT_UPRCL(_i)         (0x003005A0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_UPRCL(_i)         (0x003005A0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_UPRCL_MAX_INDEX   3
 #define I40E_GLPRT_UPRCL_UPRCL_SHIFT 0
 #define I40E_GLPRT_UPRCL_UPRCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_UPRCL_UPRCL_SHIFT)
-#define I40E_GLPRT_UPTCH(_i)         (0x003009C4 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_UPTCH(_i)         (0x003009C4 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_UPTCH_MAX_INDEX   3
 #define I40E_GLPRT_UPTCH_UPTCH_SHIFT 0
 #define I40E_GLPRT_UPTCH_UPTCH_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_UPTCH_UPTCH_SHIFT)
-#define I40E_GLPRT_UPTCL(_i)          (0x003009C0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_UPTCL(_i)          (0x003009C0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_UPTCL_MAX_INDEX    3
 #define I40E_GLPRT_UPTCL_VUPTCH_SHIFT 0
 #define I40E_GLPRT_UPTCL_VUPTCH_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_UPTCL_VUPTCH_SHIFT)
-#define I40E_GLSW_BPRCH(_i)         (0x00370104 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_BPRCH(_i)         (0x00370104 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_BPRCH_MAX_INDEX   15
 #define I40E_GLSW_BPRCH_BPRCH_SHIFT 0
 #define I40E_GLSW_BPRCH_BPRCH_MASK  I40E_MASK(0xFFFF, I40E_GLSW_BPRCH_BPRCH_SHIFT)
-#define I40E_GLSW_BPRCL(_i)         (0x00370100 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_BPRCL(_i)         (0x00370100 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_BPRCL_MAX_INDEX   15
 #define I40E_GLSW_BPRCL_BPRCL_SHIFT 0
 #define I40E_GLSW_BPRCL_BPRCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSW_BPRCL_BPRCL_SHIFT)
-#define I40E_GLSW_BPTCH(_i)         (0x00340104 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_BPTCH(_i)         (0x00340104 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_BPTCH_MAX_INDEX   15
 #define I40E_GLSW_BPTCH_BPTCH_SHIFT 0
 #define I40E_GLSW_BPTCH_BPTCH_MASK  I40E_MASK(0xFFFF, I40E_GLSW_BPTCH_BPTCH_SHIFT)
-#define I40E_GLSW_BPTCL(_i)         (0x00340100 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_BPTCL(_i)         (0x00340100 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_BPTCL_MAX_INDEX   15
 #define I40E_GLSW_BPTCL_BPTCL_SHIFT 0
 #define I40E_GLSW_BPTCL_BPTCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSW_BPTCL_BPTCL_SHIFT)
-#define I40E_GLSW_GORCH(_i)         (0x0035C004 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_GORCH(_i)         (0x0035C004 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_GORCH_MAX_INDEX   15
 #define I40E_GLSW_GORCH_GORCH_SHIFT 0
 #define I40E_GLSW_GORCH_GORCH_MASK  I40E_MASK(0xFFFF, I40E_GLSW_GORCH_GORCH_SHIFT)
-#define I40E_GLSW_GORCL(_i)         (0x0035c000 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_GORCL(_i)         (0x0035c000 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_GORCL_MAX_INDEX   15
 #define I40E_GLSW_GORCL_GORCL_SHIFT 0
 #define I40E_GLSW_GORCL_GORCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSW_GORCL_GORCL_SHIFT)
-#define I40E_GLSW_GOTCH(_i)         (0x0032C004 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_GOTCH(_i)         (0x0032C004 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_GOTCH_MAX_INDEX   15
 #define I40E_GLSW_GOTCH_GOTCH_SHIFT 0
 #define I40E_GLSW_GOTCH_GOTCH_MASK  I40E_MASK(0xFFFF, I40E_GLSW_GOTCH_GOTCH_SHIFT)
-#define I40E_GLSW_GOTCL(_i)         (0x0032c000 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_GOTCL(_i)         (0x0032c000 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_GOTCL_MAX_INDEX   15
 #define I40E_GLSW_GOTCL_GOTCL_SHIFT 0
 #define I40E_GLSW_GOTCL_GOTCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSW_GOTCL_GOTCL_SHIFT)
-#define I40E_GLSW_MPRCH(_i)         (0x00370084 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_MPRCH(_i)         (0x00370084 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_MPRCH_MAX_INDEX   15
 #define I40E_GLSW_MPRCH_MPRCH_SHIFT 0
 #define I40E_GLSW_MPRCH_MPRCH_MASK  I40E_MASK(0xFFFF, I40E_GLSW_MPRCH_MPRCH_SHIFT)
-#define I40E_GLSW_MPRCL(_i)         (0x00370080 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_MPRCL(_i)         (0x00370080 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_MPRCL_MAX_INDEX   15
 #define I40E_GLSW_MPRCL_MPRCL_SHIFT 0
 #define I40E_GLSW_MPRCL_MPRCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSW_MPRCL_MPRCL_SHIFT)
-#define I40E_GLSW_MPTCH(_i)         (0x00340084 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_MPTCH(_i)         (0x00340084 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_MPTCH_MAX_INDEX   15
 #define I40E_GLSW_MPTCH_MPTCH_SHIFT 0
 #define I40E_GLSW_MPTCH_MPTCH_MASK  I40E_MASK(0xFFFF, I40E_GLSW_MPTCH_MPTCH_SHIFT)
-#define I40E_GLSW_MPTCL(_i)         (0x00340080 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_MPTCL(_i)         (0x00340080 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_MPTCL_MAX_INDEX   15
 #define I40E_GLSW_MPTCL_MPTCL_SHIFT 0
 #define I40E_GLSW_MPTCL_MPTCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSW_MPTCL_MPTCL_SHIFT)
-#define I40E_GLSW_RUPP(_i)        (0x00370180 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_RUPP(_i)        (0x00370180 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_RUPP_MAX_INDEX  15
 #define I40E_GLSW_RUPP_RUPP_SHIFT 0
 #define I40E_GLSW_RUPP_RUPP_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSW_RUPP_RUPP_SHIFT)
-#define I40E_GLSW_TDPC(_i)        (0x00348000 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_TDPC(_i)        (0x00348000 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_TDPC_MAX_INDEX  15
 #define I40E_GLSW_TDPC_TDPC_SHIFT 0
 #define I40E_GLSW_TDPC_TDPC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSW_TDPC_TDPC_SHIFT)
-#define I40E_GLSW_UPRCH(_i)         (0x00370004 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_UPRCH(_i)         (0x00370004 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_UPRCH_MAX_INDEX   15
 #define I40E_GLSW_UPRCH_UPRCH_SHIFT 0
 #define I40E_GLSW_UPRCH_UPRCH_MASK  I40E_MASK(0xFFFF, I40E_GLSW_UPRCH_UPRCH_SHIFT)
-#define I40E_GLSW_UPRCL(_i)         (0x00370000 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_UPRCL(_i)         (0x00370000 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_UPRCL_MAX_INDEX   15
 #define I40E_GLSW_UPRCL_UPRCL_SHIFT 0
 #define I40E_GLSW_UPRCL_UPRCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSW_UPRCL_UPRCL_SHIFT)
-#define I40E_GLSW_UPTCH(_i)         (0x00340004 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_UPTCH(_i)         (0x00340004 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_UPTCH_MAX_INDEX   15
 #define I40E_GLSW_UPTCH_UPTCH_SHIFT 0
 #define I40E_GLSW_UPTCH_UPTCH_MASK  I40E_MASK(0xFFFF, I40E_GLSW_UPTCH_UPTCH_SHIFT)
-#define I40E_GLSW_UPTCL(_i)         (0x00340000 + ((_i) * 8)) /* _i=0...15 */
+#define I40E_GLSW_UPTCL(_i)         (0x00340000 + ((_i) * 8)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSW_UPTCL_MAX_INDEX   15
 #define I40E_GLSW_UPTCL_UPTCL_SHIFT 0
 #define I40E_GLSW_UPTCL_UPTCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSW_UPTCL_UPTCL_SHIFT)
-#define I40E_GLV_BPRCH(_i)         (0x0036D804 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_BPRCH(_i)         (0x0036D804 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_BPRCH_MAX_INDEX   383
 #define I40E_GLV_BPRCH_BPRCH_SHIFT 0
 #define I40E_GLV_BPRCH_BPRCH_MASK  I40E_MASK(0xFFFF, I40E_GLV_BPRCH_BPRCH_SHIFT)
-#define I40E_GLV_BPRCL(_i)         (0x0036d800 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_BPRCL(_i)         (0x0036d800 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_BPRCL_MAX_INDEX   383
 #define I40E_GLV_BPRCL_BPRCL_SHIFT 0
 #define I40E_GLV_BPRCL_BPRCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLV_BPRCL_BPRCL_SHIFT)
-#define I40E_GLV_BPTCH(_i)         (0x0033D804 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_BPTCH(_i)         (0x0033D804 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_BPTCH_MAX_INDEX   383
 #define I40E_GLV_BPTCH_BPTCH_SHIFT 0
 #define I40E_GLV_BPTCH_BPTCH_MASK  I40E_MASK(0xFFFF, I40E_GLV_BPTCH_BPTCH_SHIFT)
-#define I40E_GLV_BPTCL(_i)         (0x0033d800 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_BPTCL(_i)         (0x0033d800 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_BPTCL_MAX_INDEX   383
 #define I40E_GLV_BPTCL_BPTCL_SHIFT 0
 #define I40E_GLV_BPTCL_BPTCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLV_BPTCL_BPTCL_SHIFT)
-#define I40E_GLV_GORCH(_i)         (0x00358004 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_GORCH(_i)         (0x00358004 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_GORCH_MAX_INDEX   383
 #define I40E_GLV_GORCH_GORCH_SHIFT 0
 #define I40E_GLV_GORCH_GORCH_MASK  I40E_MASK(0xFFFF, I40E_GLV_GORCH_GORCH_SHIFT)
-#define I40E_GLV_GORCL(_i)         (0x00358000 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_GORCL(_i)         (0x00358000 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_GORCL_MAX_INDEX   383
 #define I40E_GLV_GORCL_GORCL_SHIFT 0
 #define I40E_GLV_GORCL_GORCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLV_GORCL_GORCL_SHIFT)
-#define I40E_GLV_GOTCH(_i)         (0x00328004 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_GOTCH(_i)         (0x00328004 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_GOTCH_MAX_INDEX   383
 #define I40E_GLV_GOTCH_GOTCH_SHIFT 0
 #define I40E_GLV_GOTCH_GOTCH_MASK  I40E_MASK(0xFFFF, I40E_GLV_GOTCH_GOTCH_SHIFT)
-#define I40E_GLV_GOTCL(_i)         (0x00328000 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_GOTCL(_i)         (0x00328000 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_GOTCL_MAX_INDEX   383
 #define I40E_GLV_GOTCL_GOTCL_SHIFT 0
 #define I40E_GLV_GOTCL_GOTCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLV_GOTCL_GOTCL_SHIFT)
-#define I40E_GLV_MPRCH(_i)         (0x0036CC04 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_MPRCH(_i)         (0x0036CC04 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_MPRCH_MAX_INDEX   383
 #define I40E_GLV_MPRCH_MPRCH_SHIFT 0
 #define I40E_GLV_MPRCH_MPRCH_MASK  I40E_MASK(0xFFFF, I40E_GLV_MPRCH_MPRCH_SHIFT)
-#define I40E_GLV_MPRCL(_i)         (0x0036cc00 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_MPRCL(_i)         (0x0036cc00 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_MPRCL_MAX_INDEX   383
 #define I40E_GLV_MPRCL_MPRCL_SHIFT 0
 #define I40E_GLV_MPRCL_MPRCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLV_MPRCL_MPRCL_SHIFT)
-#define I40E_GLV_MPTCH(_i)         (0x0033CC04 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_MPTCH(_i)         (0x0033CC04 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_MPTCH_MAX_INDEX   383
 #define I40E_GLV_MPTCH_MPTCH_SHIFT 0
 #define I40E_GLV_MPTCH_MPTCH_MASK  I40E_MASK(0xFFFF, I40E_GLV_MPTCH_MPTCH_SHIFT)
-#define I40E_GLV_MPTCL(_i)         (0x0033cc00 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_MPTCL(_i)         (0x0033cc00 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_MPTCL_MAX_INDEX   383
 #define I40E_GLV_MPTCL_MPTCL_SHIFT 0
 #define I40E_GLV_MPTCL_MPTCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLV_MPTCL_MPTCL_SHIFT)
-#define I40E_GLV_RDPC(_i)        (0x00310000 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_RDPC(_i)        (0x00310000 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_RDPC_MAX_INDEX  383
 #define I40E_GLV_RDPC_RDPC_SHIFT 0
 #define I40E_GLV_RDPC_RDPC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLV_RDPC_RDPC_SHIFT)
-#define I40E_GLV_RUPP(_i)        (0x0036E400 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_RUPP(_i)        (0x0036E400 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_RUPP_MAX_INDEX  383
 #define I40E_GLV_RUPP_RUPP_SHIFT 0
 #define I40E_GLV_RUPP_RUPP_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLV_RUPP_RUPP_SHIFT)
-#define I40E_GLV_TEPC(_VSI)      (0x00344000 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_GLV_TEPC(_VSI)      (0x00344000 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_TEPC_MAX_INDEX  383
 #define I40E_GLV_TEPC_TEPC_SHIFT 0
 #define I40E_GLV_TEPC_TEPC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLV_TEPC_TEPC_SHIFT)
-#define I40E_GLV_UPRCH(_i)         (0x0036C004 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_UPRCH(_i)         (0x0036C004 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_UPRCH_MAX_INDEX   383
 #define I40E_GLV_UPRCH_UPRCH_SHIFT 0
 #define I40E_GLV_UPRCH_UPRCH_MASK  I40E_MASK(0xFFFF, I40E_GLV_UPRCH_UPRCH_SHIFT)
-#define I40E_GLV_UPRCL(_i)         (0x0036c000 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_UPRCL(_i)         (0x0036c000 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_UPRCL_MAX_INDEX   383
 #define I40E_GLV_UPRCL_UPRCL_SHIFT 0
 #define I40E_GLV_UPRCL_UPRCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLV_UPRCL_UPRCL_SHIFT)
-#define I40E_GLV_UPTCH(_i)            (0x0033C004 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_UPTCH(_i)            (0x0033C004 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_UPTCH_MAX_INDEX      383
 #define I40E_GLV_UPTCH_GLVUPTCH_SHIFT 0
 #define I40E_GLV_UPTCH_GLVUPTCH_MASK  I40E_MASK(0xFFFF, I40E_GLV_UPTCH_GLVUPTCH_SHIFT)
-#define I40E_GLV_UPTCL(_i)         (0x0033c000 + ((_i) * 8)) /* _i=0...383 */
+#define I40E_GLV_UPTCL(_i)         (0x0033c000 + ((_i) * 8)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_GLV_UPTCL_MAX_INDEX   383
 #define I40E_GLV_UPTCL_UPTCL_SHIFT 0
 #define I40E_GLV_UPTCL_UPTCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLV_UPTCL_UPTCL_SHIFT)
-#define I40E_GLVEBTC_RBCH(_i, _j)      (0x00364004 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */
+#define I40E_GLVEBTC_RBCH(_i, _j)      (0x00364004 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */ /* Reset: CORER */
 #define I40E_GLVEBTC_RBCH_MAX_INDEX   7
 #define I40E_GLVEBTC_RBCH_TCBCH_SHIFT 0
 #define I40E_GLVEBTC_RBCH_TCBCH_MASK  I40E_MASK(0xFFFF, I40E_GLVEBTC_RBCH_TCBCH_SHIFT)
-#define I40E_GLVEBTC_RBCL(_i, _j)      (0x00364000 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */
+#define I40E_GLVEBTC_RBCL(_i, _j)      (0x00364000 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */ /* Reset: CORER */
 #define I40E_GLVEBTC_RBCL_MAX_INDEX   7
 #define I40E_GLVEBTC_RBCL_TCBCL_SHIFT 0
 #define I40E_GLVEBTC_RBCL_TCBCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLVEBTC_RBCL_TCBCL_SHIFT)
-#define I40E_GLVEBTC_RPCH(_i, _j)      (0x00368004 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */
+#define I40E_GLVEBTC_RPCH(_i, _j)      (0x00368004 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */ /* Reset: CORER */
 #define I40E_GLVEBTC_RPCH_MAX_INDEX   7
 #define I40E_GLVEBTC_RPCH_TCPCH_SHIFT 0
 #define I40E_GLVEBTC_RPCH_TCPCH_MASK  I40E_MASK(0xFFFF, I40E_GLVEBTC_RPCH_TCPCH_SHIFT)
-#define I40E_GLVEBTC_RPCL(_i, _j)      (0x00368000 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */
+#define I40E_GLVEBTC_RPCL(_i, _j)      (0x00368000 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */ /* Reset: CORER */
 #define I40E_GLVEBTC_RPCL_MAX_INDEX   7
 #define I40E_GLVEBTC_RPCL_TCPCL_SHIFT 0
 #define I40E_GLVEBTC_RPCL_TCPCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLVEBTC_RPCL_TCPCL_SHIFT)
-#define I40E_GLVEBTC_TBCH(_i, _j)      (0x00334004 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */
+#define I40E_GLVEBTC_TBCH(_i, _j)      (0x00334004 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */ /* Reset: CORER */
 #define I40E_GLVEBTC_TBCH_MAX_INDEX   7
 #define I40E_GLVEBTC_TBCH_TCBCH_SHIFT 0
 #define I40E_GLVEBTC_TBCH_TCBCH_MASK  I40E_MASK(0xFFFF, I40E_GLVEBTC_TBCH_TCBCH_SHIFT)
-#define I40E_GLVEBTC_TBCL(_i, _j)      (0x00334000 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */
+#define I40E_GLVEBTC_TBCL(_i, _j)      (0x00334000 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */ /* Reset: CORER */
 #define I40E_GLVEBTC_TBCL_MAX_INDEX   7
 #define I40E_GLVEBTC_TBCL_TCBCL_SHIFT 0
 #define I40E_GLVEBTC_TBCL_TCBCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLVEBTC_TBCL_TCBCL_SHIFT)
-#define I40E_GLVEBTC_TPCH(_i, _j)      (0x00338004 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */
+#define I40E_GLVEBTC_TPCH(_i, _j)      (0x00338004 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */ /* Reset: CORER */
 #define I40E_GLVEBTC_TPCH_MAX_INDEX   7
 #define I40E_GLVEBTC_TPCH_TCPCH_SHIFT 0
 #define I40E_GLVEBTC_TPCH_TCPCH_MASK  I40E_MASK(0xFFFF, I40E_GLVEBTC_TPCH_TCPCH_SHIFT)
-#define I40E_GLVEBTC_TPCL(_i, _j)      (0x00338000 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */
+#define I40E_GLVEBTC_TPCL(_i, _j)      (0x00338000 + ((_i) * 8 + (_j) * 64)) /* _i=0...7, _j=0...15 */ /* Reset: CORER */
 #define I40E_GLVEBTC_TPCL_MAX_INDEX   7
 #define I40E_GLVEBTC_TPCL_TCPCL_SHIFT 0
 #define I40E_GLVEBTC_TPCL_TCPCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLVEBTC_TPCL_TCPCL_SHIFT)
-#define I40E_GLVEBVL_BPCH(_i)          (0x00374804 + ((_i) * 8)) /* _i=0...127 */
+#define I40E_GLVEBVL_BPCH(_i)          (0x00374804 + ((_i) * 8)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_GLVEBVL_BPCH_MAX_INDEX    127
 #define I40E_GLVEBVL_BPCH_VLBPCH_SHIFT 0
 #define I40E_GLVEBVL_BPCH_VLBPCH_MASK  I40E_MASK(0xFFFF, I40E_GLVEBVL_BPCH_VLBPCH_SHIFT)
-#define I40E_GLVEBVL_BPCL(_i)          (0x00374800 + ((_i) * 8)) /* _i=0...127 */
+#define I40E_GLVEBVL_BPCL(_i)          (0x00374800 + ((_i) * 8)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_GLVEBVL_BPCL_MAX_INDEX    127
 #define I40E_GLVEBVL_BPCL_VLBPCL_SHIFT 0
 #define I40E_GLVEBVL_BPCL_VLBPCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLVEBVL_BPCL_VLBPCL_SHIFT)
-#define I40E_GLVEBVL_GORCH(_i)         (0x00360004 + ((_i) * 8)) /* _i=0...127 */
+#define I40E_GLVEBVL_GORCH(_i)         (0x00360004 + ((_i) * 8)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_GLVEBVL_GORCH_MAX_INDEX   127
 #define I40E_GLVEBVL_GORCH_VLBCH_SHIFT 0
 #define I40E_GLVEBVL_GORCH_VLBCH_MASK  I40E_MASK(0xFFFF, I40E_GLVEBVL_GORCH_VLBCH_SHIFT)
-#define I40E_GLVEBVL_GORCL(_i)         (0x00360000 + ((_i) * 8)) /* _i=0...127 */
+#define I40E_GLVEBVL_GORCL(_i)         (0x00360000 + ((_i) * 8)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_GLVEBVL_GORCL_MAX_INDEX   127
 #define I40E_GLVEBVL_GORCL_VLBCL_SHIFT 0
 #define I40E_GLVEBVL_GORCL_VLBCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLVEBVL_GORCL_VLBCL_SHIFT)
-#define I40E_GLVEBVL_GOTCH(_i)         (0x00330004 + ((_i) * 8)) /* _i=0...127 */
+#define I40E_GLVEBVL_GOTCH(_i)         (0x00330004 + ((_i) * 8)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_GLVEBVL_GOTCH_MAX_INDEX   127
 #define I40E_GLVEBVL_GOTCH_VLBCH_SHIFT 0
 #define I40E_GLVEBVL_GOTCH_VLBCH_MASK  I40E_MASK(0xFFFF, I40E_GLVEBVL_GOTCH_VLBCH_SHIFT)
-#define I40E_GLVEBVL_GOTCL(_i)         (0x00330000 + ((_i) * 8)) /* _i=0...127 */
+#define I40E_GLVEBVL_GOTCL(_i)         (0x00330000 + ((_i) * 8)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_GLVEBVL_GOTCL_MAX_INDEX   127
 #define I40E_GLVEBVL_GOTCL_VLBCL_SHIFT 0
 #define I40E_GLVEBVL_GOTCL_VLBCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLVEBVL_GOTCL_VLBCL_SHIFT)
-#define I40E_GLVEBVL_MPCH(_i)          (0x00374404 + ((_i) * 8)) /* _i=0...127 */
+#define I40E_GLVEBVL_MPCH(_i)          (0x00374404 + ((_i) * 8)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_GLVEBVL_MPCH_MAX_INDEX    127
 #define I40E_GLVEBVL_MPCH_VLMPCH_SHIFT 0
 #define I40E_GLVEBVL_MPCH_VLMPCH_MASK  I40E_MASK(0xFFFF, I40E_GLVEBVL_MPCH_VLMPCH_SHIFT)
-#define I40E_GLVEBVL_MPCL(_i)          (0x00374400 + ((_i) * 8)) /* _i=0...127 */
+#define I40E_GLVEBVL_MPCL(_i)          (0x00374400 + ((_i) * 8)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_GLVEBVL_MPCL_MAX_INDEX    127
 #define I40E_GLVEBVL_MPCL_VLMPCL_SHIFT 0
 #define I40E_GLVEBVL_MPCL_VLMPCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLVEBVL_MPCL_VLMPCL_SHIFT)
-#define I40E_GLVEBVL_UPCH(_i)          (0x00374004 + ((_i) * 8)) /* _i=0...127 */
+#define I40E_GLVEBVL_UPCH(_i)          (0x00374004 + ((_i) * 8)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_GLVEBVL_UPCH_MAX_INDEX    127
 #define I40E_GLVEBVL_UPCH_VLUPCH_SHIFT 0
 #define I40E_GLVEBVL_UPCH_VLUPCH_MASK  I40E_MASK(0xFFFF, I40E_GLVEBVL_UPCH_VLUPCH_SHIFT)
-#define I40E_GLVEBVL_UPCL(_i)          (0x00374000 + ((_i) * 8)) /* _i=0...127 */
+#define I40E_GLVEBVL_UPCL(_i)          (0x00374000 + ((_i) * 8)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_GLVEBVL_UPCL_MAX_INDEX    127
 #define I40E_GLVEBVL_UPCL_VLUPCL_SHIFT 0
 #define I40E_GLVEBVL_UPCL_VLUPCL_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLVEBVL_UPCL_VLUPCL_SHIFT)
-#define I40E_GL_MTG_FLU_MSK_H                 0x00269F4C
+#define I40E_GL_MTG_FLU_MSK_H                 0x00269F4C /* Reset: CORER */
 #define I40E_GL_MTG_FLU_MSK_H_MASK_HIGH_SHIFT 0
 #define I40E_GL_MTG_FLU_MSK_H_MASK_HIGH_MASK  I40E_MASK(0xFFFF, I40E_GL_MTG_FLU_MSK_H_MASK_HIGH_SHIFT)
-#define I40E_GL_SWR_DEF_ACT(_i)              (0x00270200 + ((_i) * 4)) /* _i=0...35 */
+#define I40E_GL_SWR_DEF_ACT(_i)              (0x00270200 + ((_i) * 4)) /* _i=0...35 */ /* Reset: CORER */
 #define I40E_GL_SWR_DEF_ACT_MAX_INDEX        35
 #define I40E_GL_SWR_DEF_ACT_DEF_ACTION_SHIFT 0
 #define I40E_GL_SWR_DEF_ACT_DEF_ACTION_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWR_DEF_ACT_DEF_ACTION_SHIFT)
-#define I40E_GL_SWR_DEF_ACT_EN(_i)                     (0x0026CFB8 + ((_i) * 4)) /* _i=0...1 */
+#define I40E_GL_SWR_DEF_ACT_EN(_i)                     (0x0026CFB8 + ((_i) * 4)) /* _i=0...1 */ /* Reset: CORER */
 #define I40E_GL_SWR_DEF_ACT_EN_MAX_INDEX               1
 #define I40E_GL_SWR_DEF_ACT_EN_DEF_ACT_EN_BITMAP_SHIFT 0
 #define I40E_GL_SWR_DEF_ACT_EN_DEF_ACT_EN_BITMAP_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWR_DEF_ACT_EN_DEF_ACT_EN_BITMAP_SHIFT)
-#define I40E_PRTTSYN_ADJ               0x001E4280
+#define I40E_PRTTSYN_ADJ               0x001E4280 /* Reset: GLOBR */
 #define I40E_PRTTSYN_ADJ_TSYNADJ_SHIFT 0
 #define I40E_PRTTSYN_ADJ_TSYNADJ_MASK  I40E_MASK(0x7FFFFFFF, I40E_PRTTSYN_ADJ_TSYNADJ_SHIFT)
 #define I40E_PRTTSYN_ADJ_SIGN_SHIFT    31
 #define I40E_PRTTSYN_ADJ_SIGN_MASK     I40E_MASK(0x1, I40E_PRTTSYN_ADJ_SIGN_SHIFT)
-#define I40E_PRTTSYN_AUX_0(_i)           (0x001E42A0 + ((_i) * 32)) /* _i=0...1 */
+#define I40E_PRTTSYN_AUX_0(_i)           (0x001E42A0 + ((_i) * 32)) /* _i=0...1 */ /* Reset: GLOBR */
 #define I40E_PRTTSYN_AUX_0_MAX_INDEX     1
 #define I40E_PRTTSYN_AUX_0_OUT_ENA_SHIFT 0
 #define I40E_PRTTSYN_AUX_0_OUT_ENA_MASK  I40E_MASK(0x1, I40E_PRTTSYN_AUX_0_OUT_ENA_SHIFT)
@@ -3143,17 +2897,17 @@
 #define I40E_PRTTSYN_AUX_0_PULSEW_MASK   I40E_MASK(0xF, I40E_PRTTSYN_AUX_0_PULSEW_SHIFT)
 #define I40E_PRTTSYN_AUX_0_EVNTLVL_SHIFT 16
 #define I40E_PRTTSYN_AUX_0_EVNTLVL_MASK  I40E_MASK(0x3, I40E_PRTTSYN_AUX_0_EVNTLVL_SHIFT)
-#define I40E_PRTTSYN_AUX_1(_i)               (0x001E42E0 + ((_i) * 32)) /* _i=0...1 */
+#define I40E_PRTTSYN_AUX_1(_i)               (0x001E42E0 + ((_i) * 32)) /* _i=0...1 */ /* Reset: GLOBR */
 #define I40E_PRTTSYN_AUX_1_MAX_INDEX         1
 #define I40E_PRTTSYN_AUX_1_INSTNT_SHIFT      0
 #define I40E_PRTTSYN_AUX_1_INSTNT_MASK       I40E_MASK(0x1, I40E_PRTTSYN_AUX_1_INSTNT_SHIFT)
 #define I40E_PRTTSYN_AUX_1_SAMPLE_TIME_SHIFT 1
 #define I40E_PRTTSYN_AUX_1_SAMPLE_TIME_MASK  I40E_MASK(0x1, I40E_PRTTSYN_AUX_1_SAMPLE_TIME_SHIFT)
-#define I40E_PRTTSYN_CLKO(_i)            (0x001E4240 + ((_i) * 32)) /* _i=0...1 */
+#define I40E_PRTTSYN_CLKO(_i)            (0x001E4240 + ((_i) * 32)) /* _i=0...1 */ /* Reset: GLOBR */
 #define I40E_PRTTSYN_CLKO_MAX_INDEX      1
 #define I40E_PRTTSYN_CLKO_TSYNCLKO_SHIFT 0
 #define I40E_PRTTSYN_CLKO_TSYNCLKO_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_CLKO_TSYNCLKO_SHIFT)
-#define I40E_PRTTSYN_CTL0                       0x001E4200
+#define I40E_PRTTSYN_CTL0                       0x001E4200 /* Reset: GLOBR */
 #define I40E_PRTTSYN_CTL0_CLEAR_TSYNTIMER_SHIFT 0
 #define I40E_PRTTSYN_CTL0_CLEAR_TSYNTIMER_MASK  I40E_MASK(0x1, I40E_PRTTSYN_CTL0_CLEAR_TSYNTIMER_SHIFT)
 #define I40E_PRTTSYN_CTL0_TXTIME_INT_ENA_SHIFT  1
@@ -3168,7 +2922,7 @@
 #define I40E_PRTTSYN_CTL0_TSYNACT_MASK          I40E_MASK(0x3, I40E_PRTTSYN_CTL0_TSYNACT_SHIFT)
 #define I40E_PRTTSYN_CTL0_TSYNENA_SHIFT         31
 #define I40E_PRTTSYN_CTL0_TSYNENA_MASK          I40E_MASK(0x1, I40E_PRTTSYN_CTL0_TSYNENA_SHIFT)
-#define I40E_PRTTSYN_CTL1                   0x00085020
+#define I40E_PRTTSYN_CTL1                   0x00085020 /* Reset: CORER */
 #define I40E_PRTTSYN_CTL1_V1MESSTYPE0_SHIFT 0
 #define I40E_PRTTSYN_CTL1_V1MESSTYPE0_MASK  I40E_MASK(0xFF, I40E_PRTTSYN_CTL1_V1MESSTYPE0_SHIFT)
 #define I40E_PRTTSYN_CTL1_V1MESSTYPE1_SHIFT 8
@@ -3183,29 +2937,29 @@
 #define I40E_PRTTSYN_CTL1_UDP_ENA_MASK      I40E_MASK(0x3, I40E_PRTTSYN_CTL1_UDP_ENA_SHIFT)
 #define I40E_PRTTSYN_CTL1_TSYNENA_SHIFT     31
 #define I40E_PRTTSYN_CTL1_TSYNENA_MASK      I40E_MASK(0x1, I40E_PRTTSYN_CTL1_TSYNENA_SHIFT)
-#define I40E_PRTTSYN_EVNT_H(_i)              (0x001E40C0 + ((_i) * 32)) /* _i=0...1 */
+#define I40E_PRTTSYN_EVNT_H(_i)              (0x001E40C0 + ((_i) * 32)) /* _i=0...1 */ /* Reset: GLOBR */
 #define I40E_PRTTSYN_EVNT_H_MAX_INDEX        1
 #define I40E_PRTTSYN_EVNT_H_TSYNEVNT_H_SHIFT 0
 #define I40E_PRTTSYN_EVNT_H_TSYNEVNT_H_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_EVNT_H_TSYNEVNT_H_SHIFT)
-#define I40E_PRTTSYN_EVNT_L(_i)              (0x001E4080 + ((_i) * 32)) /* _i=0...1 */
+#define I40E_PRTTSYN_EVNT_L(_i)              (0x001E4080 + ((_i) * 32)) /* _i=0...1 */ /* Reset: GLOBR */
 #define I40E_PRTTSYN_EVNT_L_MAX_INDEX        1
 #define I40E_PRTTSYN_EVNT_L_TSYNEVNT_L_SHIFT 0
 #define I40E_PRTTSYN_EVNT_L_TSYNEVNT_L_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_EVNT_L_TSYNEVNT_L_SHIFT)
-#define I40E_PRTTSYN_INC_H                 0x001E4060
+#define I40E_PRTTSYN_INC_H                 0x001E4060 /* Reset: GLOBR */
 #define I40E_PRTTSYN_INC_H_TSYNINC_H_SHIFT 0
 #define I40E_PRTTSYN_INC_H_TSYNINC_H_MASK  I40E_MASK(0x3F, I40E_PRTTSYN_INC_H_TSYNINC_H_SHIFT)
-#define I40E_PRTTSYN_INC_L                 0x001E4040
+#define I40E_PRTTSYN_INC_L                 0x001E4040 /* Reset: GLOBR */
 #define I40E_PRTTSYN_INC_L_TSYNINC_L_SHIFT 0
 #define I40E_PRTTSYN_INC_L_TSYNINC_L_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_INC_L_TSYNINC_L_SHIFT)
-#define I40E_PRTTSYN_RXTIME_H(_i)            (0x00085040 + ((_i) * 32)) /* _i=0...3 */
+#define I40E_PRTTSYN_RXTIME_H(_i)            (0x00085040 + ((_i) * 32)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_PRTTSYN_RXTIME_H_MAX_INDEX      3
 #define I40E_PRTTSYN_RXTIME_H_RXTIEM_H_SHIFT 0
 #define I40E_PRTTSYN_RXTIME_H_RXTIEM_H_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_RXTIME_H_RXTIEM_H_SHIFT)
-#define I40E_PRTTSYN_RXTIME_L(_i)            (0x000850C0 + ((_i) * 32)) /* _i=0...3 */
+#define I40E_PRTTSYN_RXTIME_L(_i)            (0x000850C0 + ((_i) * 32)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_PRTTSYN_RXTIME_L_MAX_INDEX      3
 #define I40E_PRTTSYN_RXTIME_L_RXTIEM_L_SHIFT 0
 #define I40E_PRTTSYN_RXTIME_L_RXTIEM_L_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_RXTIME_L_RXTIEM_L_SHIFT)
-#define I40E_PRTTSYN_STAT_0              0x001E4220
+#define I40E_PRTTSYN_STAT_0              0x001E4220 /* Reset: GLOBR */
 #define I40E_PRTTSYN_STAT_0_EVENT0_SHIFT 0
 #define I40E_PRTTSYN_STAT_0_EVENT0_MASK  I40E_MASK(0x1, I40E_PRTTSYN_STAT_0_EVENT0_SHIFT)
 #define I40E_PRTTSYN_STAT_0_EVENT1_SHIFT 1
@@ -3216,7 +2970,7 @@
 #define I40E_PRTTSYN_STAT_0_TGT1_MASK    I40E_MASK(0x1, I40E_PRTTSYN_STAT_0_TGT1_SHIFT)
 #define I40E_PRTTSYN_STAT_0_TXTIME_SHIFT 4
 #define I40E_PRTTSYN_STAT_0_TXTIME_MASK  I40E_MASK(0x1, I40E_PRTTSYN_STAT_0_TXTIME_SHIFT)
-#define I40E_PRTTSYN_STAT_1            0x00085140
+#define I40E_PRTTSYN_STAT_1            0x00085140 /* Reset: CORER */
 #define I40E_PRTTSYN_STAT_1_RXT0_SHIFT 0
 #define I40E_PRTTSYN_STAT_1_RXT0_MASK  I40E_MASK(0x1, I40E_PRTTSYN_STAT_1_RXT0_SHIFT)
 #define I40E_PRTTSYN_STAT_1_RXT1_SHIFT 1
@@ -3225,30 +2979,30 @@
 #define I40E_PRTTSYN_STAT_1_RXT2_MASK  I40E_MASK(0x1, I40E_PRTTSYN_STAT_1_RXT2_SHIFT)
 #define I40E_PRTTSYN_STAT_1_RXT3_SHIFT 3
 #define I40E_PRTTSYN_STAT_1_RXT3_MASK  I40E_MASK(0x1, I40E_PRTTSYN_STAT_1_RXT3_SHIFT)
-#define I40E_PRTTSYN_TGT_H(_i)              (0x001E4180 + ((_i) * 32)) /* _i=0...1 */
+#define I40E_PRTTSYN_TGT_H(_i)              (0x001E4180 + ((_i) * 32)) /* _i=0...1 */ /* Reset: GLOBR */
 #define I40E_PRTTSYN_TGT_H_MAX_INDEX        1
 #define I40E_PRTTSYN_TGT_H_TSYNTGTT_H_SHIFT 0
 #define I40E_PRTTSYN_TGT_H_TSYNTGTT_H_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_TGT_H_TSYNTGTT_H_SHIFT)
-#define I40E_PRTTSYN_TGT_L(_i)              (0x001E4140 + ((_i) * 32)) /* _i=0...1 */
+#define I40E_PRTTSYN_TGT_L(_i)              (0x001E4140 + ((_i) * 32)) /* _i=0...1 */ /* Reset: GLOBR */
 #define I40E_PRTTSYN_TGT_L_MAX_INDEX        1
 #define I40E_PRTTSYN_TGT_L_TSYNTGTT_L_SHIFT 0
 #define I40E_PRTTSYN_TGT_L_TSYNTGTT_L_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_TGT_L_TSYNTGTT_L_SHIFT)
-#define I40E_PRTTSYN_TIME_H                  0x001E4120
+#define I40E_PRTTSYN_TIME_H                  0x001E4120 /* Reset: GLOBR */
 #define I40E_PRTTSYN_TIME_H_TSYNTIME_H_SHIFT 0
 #define I40E_PRTTSYN_TIME_H_TSYNTIME_H_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_TIME_H_TSYNTIME_H_SHIFT)
-#define I40E_PRTTSYN_TIME_L                  0x001E4100
+#define I40E_PRTTSYN_TIME_L                  0x001E4100 /* Reset: GLOBR */
 #define I40E_PRTTSYN_TIME_L_TSYNTIME_L_SHIFT 0
 #define I40E_PRTTSYN_TIME_L_TSYNTIME_L_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_TIME_L_TSYNTIME_L_SHIFT)
-#define I40E_PRTTSYN_TXTIME_H                0x001E41E0
+#define I40E_PRTTSYN_TXTIME_H                0x001E41E0 /* Reset: GLOBR */
 #define I40E_PRTTSYN_TXTIME_H_TXTIEM_H_SHIFT 0
 #define I40E_PRTTSYN_TXTIME_H_TXTIEM_H_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_TXTIME_H_TXTIEM_H_SHIFT)
-#define I40E_PRTTSYN_TXTIME_L                0x001E41C0
+#define I40E_PRTTSYN_TXTIME_L                0x001E41C0 /* Reset: GLOBR */
 #define I40E_PRTTSYN_TXTIME_L_TXTIEM_L_SHIFT 0
 #define I40E_PRTTSYN_TXTIME_L_TXTIEM_L_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_TXTIME_L_TXTIEM_L_SHIFT)
-#define I40E_GLSCD_QUANTA                  0x000B2080
+#define I40E_GLSCD_QUANTA                  0x000B2080 /* Reset: CORER */
 #define I40E_GLSCD_QUANTA_TSCDQUANTA_SHIFT 0
 #define I40E_GLSCD_QUANTA_TSCDQUANTA_MASK  I40E_MASK(0x7, I40E_GLSCD_QUANTA_TSCDQUANTA_SHIFT)
-#define I40E_GL_MDET_RX                0x0012A510
+#define I40E_GL_MDET_RX                0x0012A510 /* Reset: CORER */
 #define I40E_GL_MDET_RX_FUNCTION_SHIFT 0
 #define I40E_GL_MDET_RX_FUNCTION_MASK  I40E_MASK(0xFF, I40E_GL_MDET_RX_FUNCTION_SHIFT)
 #define I40E_GL_MDET_RX_EVENT_SHIFT    8
@@ -3257,37 +3011,39 @@
 #define I40E_GL_MDET_RX_QUEUE_MASK     I40E_MASK(0x3FFF, I40E_GL_MDET_RX_QUEUE_SHIFT)
 #define I40E_GL_MDET_RX_VALID_SHIFT    31
 #define I40E_GL_MDET_RX_VALID_MASK     I40E_MASK(0x1, I40E_GL_MDET_RX_VALID_SHIFT)
-#define I40E_GL_MDET_TX                0x000E6480
-#define I40E_GL_MDET_TX_FUNCTION_SHIFT 0
-#define I40E_GL_MDET_TX_FUNCTION_MASK  I40E_MASK(0xFF, I40E_GL_MDET_TX_FUNCTION_SHIFT)
-#define I40E_GL_MDET_TX_EVENT_SHIFT    8
-#define I40E_GL_MDET_TX_EVENT_MASK     I40E_MASK(0x1FF, I40E_GL_MDET_TX_EVENT_SHIFT)
-#define I40E_GL_MDET_TX_QUEUE_SHIFT    17
-#define I40E_GL_MDET_TX_QUEUE_MASK     I40E_MASK(0x3FFF, I40E_GL_MDET_TX_QUEUE_SHIFT)
-#define I40E_GL_MDET_TX_VALID_SHIFT    31
-#define I40E_GL_MDET_TX_VALID_MASK     I40E_MASK(0x1, I40E_GL_MDET_TX_VALID_SHIFT)
-#define I40E_PF_MDET_RX             0x0012A400
+#define I40E_GL_MDET_TX              0x000E6480 /* Reset: CORER */
+#define I40E_GL_MDET_TX_QUEUE_SHIFT  0
+#define I40E_GL_MDET_TX_QUEUE_MASK   I40E_MASK(0xFFF, I40E_GL_MDET_TX_QUEUE_SHIFT)
+#define I40E_GL_MDET_TX_VF_NUM_SHIFT 12
+#define I40E_GL_MDET_TX_VF_NUM_MASK  I40E_MASK(0x1FF, I40E_GL_MDET_TX_VF_NUM_SHIFT)
+#define I40E_GL_MDET_TX_PF_NUM_SHIFT 21
+#define I40E_GL_MDET_TX_PF_NUM_MASK  I40E_MASK(0xF, I40E_GL_MDET_TX_PF_NUM_SHIFT)
+#define I40E_GL_MDET_TX_EVENT_SHIFT  25
+#define I40E_GL_MDET_TX_EVENT_MASK   I40E_MASK(0x1F, I40E_GL_MDET_TX_EVENT_SHIFT)
+#define I40E_GL_MDET_TX_VALID_SHIFT  31
+#define I40E_GL_MDET_TX_VALID_MASK   I40E_MASK(0x1, I40E_GL_MDET_TX_VALID_SHIFT)
+#define I40E_PF_MDET_RX             0x0012A400 /* Reset: CORER */
 #define I40E_PF_MDET_RX_VALID_SHIFT 0
 #define I40E_PF_MDET_RX_VALID_MASK  I40E_MASK(0x1, I40E_PF_MDET_RX_VALID_SHIFT)
-#define I40E_PF_MDET_TX             0x000E6400
+#define I40E_PF_MDET_TX             0x000E6400 /* Reset: CORER */
 #define I40E_PF_MDET_TX_VALID_SHIFT 0
 #define I40E_PF_MDET_TX_VALID_MASK  I40E_MASK(0x1, I40E_PF_MDET_TX_VALID_SHIFT)
-#define I40E_PF_VT_PFALLOC               0x001C0500
+#define I40E_PF_VT_PFALLOC               0x001C0500 /* Reset: CORER */
 #define I40E_PF_VT_PFALLOC_FIRSTVF_SHIFT 0
 #define I40E_PF_VT_PFALLOC_FIRSTVF_MASK  I40E_MASK(0xFF, I40E_PF_VT_PFALLOC_FIRSTVF_SHIFT)
 #define I40E_PF_VT_PFALLOC_LASTVF_SHIFT  8
 #define I40E_PF_VT_PFALLOC_LASTVF_MASK   I40E_MASK(0xFF, I40E_PF_VT_PFALLOC_LASTVF_SHIFT)
 #define I40E_PF_VT_PFALLOC_VALID_SHIFT   31
 #define I40E_PF_VT_PFALLOC_VALID_MASK    I40E_MASK(0x1, I40E_PF_VT_PFALLOC_VALID_SHIFT)
-#define I40E_VP_MDET_RX(_VF)        (0x0012A000 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VP_MDET_RX(_VF)        (0x0012A000 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_VP_MDET_RX_MAX_INDEX   127
 #define I40E_VP_MDET_RX_VALID_SHIFT 0
 #define I40E_VP_MDET_RX_VALID_MASK  I40E_MASK(0x1, I40E_VP_MDET_RX_VALID_SHIFT)
-#define I40E_VP_MDET_TX(_VF)        (0x000E6000 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VP_MDET_TX(_VF)        (0x000E6000 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_VP_MDET_TX_MAX_INDEX   127
 #define I40E_VP_MDET_TX_VALID_SHIFT 0
 #define I40E_VP_MDET_TX_VALID_MASK  I40E_MASK(0x1, I40E_VP_MDET_TX_VALID_SHIFT)
-#define I40E_GLPM_WUMC                    0x0006C800
+#define I40E_GLPM_WUMC                    0x0006C800 /* Reset: POR */
 #define I40E_GLPM_WUMC_NOTCO_SHIFT        0
 #define I40E_GLPM_WUMC_NOTCO_MASK         I40E_MASK(0x1, I40E_GLPM_WUMC_NOTCO_SHIFT)
 #define I40E_GLPM_WUMC_SRST_PIN_VAL_SHIFT 1
@@ -3298,17 +3054,17 @@
 #define I40E_GLPM_WUMC_RESERVED_4_MASK    I40E_MASK(0x1FFF, I40E_GLPM_WUMC_RESERVED_4_SHIFT)
 #define I40E_GLPM_WUMC_MNG_WU_PF_SHIFT    16
 #define I40E_GLPM_WUMC_MNG_WU_PF_MASK     I40E_MASK(0xFFFF, I40E_GLPM_WUMC_MNG_WU_PF_SHIFT)
-#define I40E_PFPM_APM            0x000B8080
+#define I40E_PFPM_APM            0x000B8080 /* Reset: POR */
 #define I40E_PFPM_APM_APME_SHIFT 0
 #define I40E_PFPM_APM_APME_MASK  I40E_MASK(0x1, I40E_PFPM_APM_APME_SHIFT)
-#define I40E_PFPM_FHFT_LENGTH(_i)          (0x0006A000 + ((_i) * 128)) /* _i=0...7 */
+#define I40E_PFPM_FHFT_LENGTH(_i)          (0x0006A000 + ((_i) * 128)) /* _i=0...7 */ /* Reset: POR */
 #define I40E_PFPM_FHFT_LENGTH_MAX_INDEX    7
 #define I40E_PFPM_FHFT_LENGTH_LENGTH_SHIFT 0
 #define I40E_PFPM_FHFT_LENGTH_LENGTH_MASK  I40E_MASK(0xFF, I40E_PFPM_FHFT_LENGTH_LENGTH_SHIFT)
-#define I40E_PFPM_WUC                 0x0006B200
+#define I40E_PFPM_WUC                 0x0006B200 /* Reset: POR */
 #define I40E_PFPM_WUC_EN_APM_D0_SHIFT 5
 #define I40E_PFPM_WUC_EN_APM_D0_MASK  I40E_MASK(0x1, I40E_PFPM_WUC_EN_APM_D0_SHIFT)
-#define I40E_PFPM_WUFC                 0x0006B400
+#define I40E_PFPM_WUFC                 0x0006B400 /* Reset: POR */
 #define I40E_PFPM_WUFC_LNKC_SHIFT      0
 #define I40E_PFPM_WUFC_LNKC_MASK       I40E_MASK(0x1, I40E_PFPM_WUFC_LNKC_SHIFT)
 #define I40E_PFPM_WUFC_MAG_SHIFT       1
@@ -3349,7 +3105,7 @@
 #define I40E_PFPM_WUFC_FLX7_MASK       I40E_MASK(0x1, I40E_PFPM_WUFC_FLX7_SHIFT)
 #define I40E_PFPM_WUFC_FW_RST_WK_SHIFT 31
 #define I40E_PFPM_WUFC_FW_RST_WK_MASK  I40E_MASK(0x1, I40E_PFPM_WUFC_FW_RST_WK_SHIFT)
-#define I40E_PFPM_WUS                  0x0006B600
+#define I40E_PFPM_WUS                  0x0006B600 /* Reset: POR */
 #define I40E_PFPM_WUS_LNKC_SHIFT       0
 #define I40E_PFPM_WUS_LNKC_MASK        I40E_MASK(0x1, I40E_PFPM_WUS_LNKC_SHIFT)
 #define I40E_PFPM_WUS_MAG_SHIFT        1
@@ -3376,12 +3132,12 @@
 #define I40E_PFPM_WUS_FLX7_MASK        I40E_MASK(0x1, I40E_PFPM_WUS_FLX7_SHIFT)
 #define I40E_PFPM_WUS_FW_RST_WK_SHIFT  31
 #define I40E_PFPM_WUS_FW_RST_WK_MASK   I40E_MASK(0x1, I40E_PFPM_WUS_FW_RST_WK_SHIFT)
-#define I40E_PRTPM_FHFHR                 0x0006C000
+#define I40E_PRTPM_FHFHR                 0x0006C000 /* Reset: POR */
 #define I40E_PRTPM_FHFHR_UNICAST_SHIFT   0
 #define I40E_PRTPM_FHFHR_UNICAST_MASK    I40E_MASK(0x1, I40E_PRTPM_FHFHR_UNICAST_SHIFT)
 #define I40E_PRTPM_FHFHR_MULTICAST_SHIFT 1
 #define I40E_PRTPM_FHFHR_MULTICAST_MASK  I40E_MASK(0x1, I40E_PRTPM_FHFHR_MULTICAST_SHIFT)
-#define I40E_PRTPM_SAH(_i)             (0x001E44C0 + ((_i) * 32)) /* _i=0...3 */
+#define I40E_PRTPM_SAH(_i)             (0x001E44C0 + ((_i) * 32)) /* _i=0...3 */ /* Reset: PFR */
 #define I40E_PRTPM_SAH_MAX_INDEX       3
 #define I40E_PRTPM_SAH_PFPM_SAH_SHIFT  0
 #define I40E_PRTPM_SAH_PFPM_SAH_MASK   I40E_MASK(0xFFFF, I40E_PRTPM_SAH_PFPM_SAH_SHIFT)
@@ -3391,20 +3147,20 @@
 #define I40E_PRTPM_SAH_MC_MAG_EN_MASK  I40E_MASK(0x1, I40E_PRTPM_SAH_MC_MAG_EN_SHIFT)
 #define I40E_PRTPM_SAH_AV_SHIFT        31
 #define I40E_PRTPM_SAH_AV_MASK         I40E_MASK(0x1, I40E_PRTPM_SAH_AV_SHIFT)
-#define I40E_PRTPM_SAL(_i)            (0x001E4440 + ((_i) * 32)) /* _i=0...3 */
+#define I40E_PRTPM_SAL(_i)            (0x001E4440 + ((_i) * 32)) /* _i=0...3 */ /* Reset: PFR */
 #define I40E_PRTPM_SAL_MAX_INDEX      3
 #define I40E_PRTPM_SAL_PFPM_SAL_SHIFT 0
 #define I40E_PRTPM_SAL_PFPM_SAL_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTPM_SAL_PFPM_SAL_SHIFT)
-#define I40E_VF_ARQBAH1              0x00006000
+#define I40E_VF_ARQBAH1              0x00006000 /* Reset: EMPR */
 #define I40E_VF_ARQBAH1_ARQBAH_SHIFT 0
 #define I40E_VF_ARQBAH1_ARQBAH_MASK  I40E_MASK(0xFFFFFFFF, I40E_VF_ARQBAH1_ARQBAH_SHIFT)
-#define I40E_VF_ARQBAL1              0x00006C00
+#define I40E_VF_ARQBAL1              0x00006C00 /* Reset: EMPR */
 #define I40E_VF_ARQBAL1_ARQBAL_SHIFT 0
 #define I40E_VF_ARQBAL1_ARQBAL_MASK  I40E_MASK(0xFFFFFFFF, I40E_VF_ARQBAL1_ARQBAL_SHIFT)
-#define I40E_VF_ARQH1            0x00007400
+#define I40E_VF_ARQH1            0x00007400 /* Reset: EMPR */
 #define I40E_VF_ARQH1_ARQH_SHIFT 0
 #define I40E_VF_ARQH1_ARQH_MASK  I40E_MASK(0x3FF, I40E_VF_ARQH1_ARQH_SHIFT)
-#define I40E_VF_ARQLEN1                 0x00008000
+#define I40E_VF_ARQLEN1                 0x00008000 /* Reset: EMPR */
 #define I40E_VF_ARQLEN1_ARQLEN_SHIFT    0
 #define I40E_VF_ARQLEN1_ARQLEN_MASK     I40E_MASK(0x3FF, I40E_VF_ARQLEN1_ARQLEN_SHIFT)
 #define I40E_VF_ARQLEN1_ARQVFE_SHIFT    28
@@ -3415,19 +3171,19 @@
 #define I40E_VF_ARQLEN1_ARQCRIT_MASK    I40E_MASK(0x1, I40E_VF_ARQLEN1_ARQCRIT_SHIFT)
 #define I40E_VF_ARQLEN1_ARQENABLE_SHIFT 31
 #define I40E_VF_ARQLEN1_ARQENABLE_MASK  I40E_MASK(0x1, I40E_VF_ARQLEN1_ARQENABLE_SHIFT)
-#define I40E_VF_ARQT1            0x00007000
+#define I40E_VF_ARQT1            0x00007000 /* Reset: EMPR */
 #define I40E_VF_ARQT1_ARQT_SHIFT 0
 #define I40E_VF_ARQT1_ARQT_MASK  I40E_MASK(0x3FF, I40E_VF_ARQT1_ARQT_SHIFT)
-#define I40E_VF_ATQBAH1              0x00007800
+#define I40E_VF_ATQBAH1              0x00007800 /* Reset: EMPR */
 #define I40E_VF_ATQBAH1_ATQBAH_SHIFT 0
 #define I40E_VF_ATQBAH1_ATQBAH_MASK  I40E_MASK(0xFFFFFFFF, I40E_VF_ATQBAH1_ATQBAH_SHIFT)
-#define I40E_VF_ATQBAL1              0x00007C00
+#define I40E_VF_ATQBAL1              0x00007C00 /* Reset: EMPR */
 #define I40E_VF_ATQBAL1_ATQBAL_SHIFT 0
 #define I40E_VF_ATQBAL1_ATQBAL_MASK  I40E_MASK(0xFFFFFFFF, I40E_VF_ATQBAL1_ATQBAL_SHIFT)
-#define I40E_VF_ATQH1            0x00006400
+#define I40E_VF_ATQH1            0x00006400 /* Reset: EMPR */
 #define I40E_VF_ATQH1_ATQH_SHIFT 0
 #define I40E_VF_ATQH1_ATQH_MASK  I40E_MASK(0x3FF, I40E_VF_ATQH1_ATQH_SHIFT)
-#define I40E_VF_ATQLEN1                 0x00006800
+#define I40E_VF_ATQLEN1                 0x00006800 /* Reset: EMPR */
 #define I40E_VF_ATQLEN1_ATQLEN_SHIFT    0
 #define I40E_VF_ATQLEN1_ATQLEN_MASK     I40E_MASK(0x3FF, I40E_VF_ATQLEN1_ATQLEN_SHIFT)
 #define I40E_VF_ATQLEN1_ATQVFE_SHIFT    28
@@ -3438,13 +3194,13 @@
 #define I40E_VF_ATQLEN1_ATQCRIT_MASK    I40E_MASK(0x1, I40E_VF_ATQLEN1_ATQCRIT_SHIFT)
 #define I40E_VF_ATQLEN1_ATQENABLE_SHIFT 31
 #define I40E_VF_ATQLEN1_ATQENABLE_MASK  I40E_MASK(0x1, I40E_VF_ATQLEN1_ATQENABLE_SHIFT)
-#define I40E_VF_ATQT1            0x00008400
+#define I40E_VF_ATQT1            0x00008400 /* Reset: EMPR */
 #define I40E_VF_ATQT1_ATQT_SHIFT 0
 #define I40E_VF_ATQT1_ATQT_MASK  I40E_MASK(0x3FF, I40E_VF_ATQT1_ATQT_SHIFT)
-#define I40E_VFGEN_RSTAT                 0x00008800
+#define I40E_VFGEN_RSTAT                 0x00008800 /* Reset: VFR */
 #define I40E_VFGEN_RSTAT_VFR_STATE_SHIFT 0
 #define I40E_VFGEN_RSTAT_VFR_STATE_MASK  I40E_MASK(0x3, I40E_VFGEN_RSTAT_VFR_STATE_SHIFT)
-#define I40E_VFINT_DYN_CTL01                       0x00005C00
+#define I40E_VFINT_DYN_CTL01                       0x00005C00 /* Reset: VFR */
 #define I40E_VFINT_DYN_CTL01_INTENA_SHIFT          0
 #define I40E_VFINT_DYN_CTL01_INTENA_MASK           I40E_MASK(0x1, I40E_VFINT_DYN_CTL01_INTENA_SHIFT)
 #define I40E_VFINT_DYN_CTL01_CLEARPBA_SHIFT        1
@@ -3461,7 +3217,7 @@
 #define I40E_VFINT_DYN_CTL01_SW_ITR_INDX_MASK      I40E_MASK(0x3, I40E_VFINT_DYN_CTL01_SW_ITR_INDX_SHIFT)
 #define I40E_VFINT_DYN_CTL01_INTENA_MSK_SHIFT      31
 #define I40E_VFINT_DYN_CTL01_INTENA_MSK_MASK       I40E_MASK(0x1, I40E_VFINT_DYN_CTL01_INTENA_MSK_SHIFT)
-#define I40E_VFINT_DYN_CTLN1(_INTVF)               (0x00003800 + ((_INTVF) * 4)) /* _i=0...15 */
+#define I40E_VFINT_DYN_CTLN1(_INTVF)               (0x00003800 + ((_INTVF) * 4)) /* _i=0...15 */ /* Reset: VFR */
 #define I40E_VFINT_DYN_CTLN1_MAX_INDEX             15
 #define I40E_VFINT_DYN_CTLN1_INTENA_SHIFT          0
 #define I40E_VFINT_DYN_CTLN1_INTENA_MASK           I40E_MASK(0x1, I40E_VFINT_DYN_CTLN1_INTENA_SHIFT)
@@ -3479,14 +3235,14 @@
 #define I40E_VFINT_DYN_CTLN1_SW_ITR_INDX_MASK      I40E_MASK(0x3, I40E_VFINT_DYN_CTLN1_SW_ITR_INDX_SHIFT)
 #define I40E_VFINT_DYN_CTLN1_INTENA_MSK_SHIFT      31
 #define I40E_VFINT_DYN_CTLN1_INTENA_MSK_MASK       I40E_MASK(0x1, I40E_VFINT_DYN_CTLN1_INTENA_MSK_SHIFT)
-#define I40E_VFINT_ICR0_ENA1                        0x00005000
+#define I40E_VFINT_ICR0_ENA1                        0x00005000 /* Reset: CORER */
 #define I40E_VFINT_ICR0_ENA1_LINK_STAT_CHANGE_SHIFT 25
 #define I40E_VFINT_ICR0_ENA1_LINK_STAT_CHANGE_MASK  I40E_MASK(0x1, I40E_VFINT_ICR0_ENA1_LINK_STAT_CHANGE_SHIFT)
 #define I40E_VFINT_ICR0_ENA1_ADMINQ_SHIFT           30
 #define I40E_VFINT_ICR0_ENA1_ADMINQ_MASK            I40E_MASK(0x1, I40E_VFINT_ICR0_ENA1_ADMINQ_SHIFT)
 #define I40E_VFINT_ICR0_ENA1_RSVD_SHIFT             31
 #define I40E_VFINT_ICR0_ENA1_RSVD_MASK              I40E_MASK(0x1, I40E_VFINT_ICR0_ENA1_RSVD_SHIFT)
-#define I40E_VFINT_ICR01                        0x00004800
+#define I40E_VFINT_ICR01                        0x00004800 /* Reset: CORER */
 #define I40E_VFINT_ICR01_INTEVENT_SHIFT         0
 #define I40E_VFINT_ICR01_INTEVENT_MASK          I40E_MASK(0x1, I40E_VFINT_ICR01_INTEVENT_SHIFT)
 #define I40E_VFINT_ICR01_QUEUE_0_SHIFT          1
@@ -3503,54 +3259,54 @@
 #define I40E_VFINT_ICR01_ADMINQ_MASK            I40E_MASK(0x1, I40E_VFINT_ICR01_ADMINQ_SHIFT)
 #define I40E_VFINT_ICR01_SWINT_SHIFT            31
 #define I40E_VFINT_ICR01_SWINT_MASK             I40E_MASK(0x1, I40E_VFINT_ICR01_SWINT_SHIFT)
-#define I40E_VFINT_ITR01(_i)            (0x00004C00 + ((_i) * 4)) /* _i=0...2 */
+#define I40E_VFINT_ITR01(_i)            (0x00004C00 + ((_i) * 4)) /* _i=0...2 */ /* Reset: VFR */
 #define I40E_VFINT_ITR01_MAX_INDEX      2
 #define I40E_VFINT_ITR01_INTERVAL_SHIFT 0
 #define I40E_VFINT_ITR01_INTERVAL_MASK  I40E_MASK(0xFFF, I40E_VFINT_ITR01_INTERVAL_SHIFT)
-#define I40E_VFINT_ITRN1(_i, _INTVF)     (0x00002800 + ((_i) * 64 + (_INTVF) * 4)) /* _i=0...2, _INTVF=0...15 */
+#define I40E_VFINT_ITRN1(_i, _INTVF)     (0x00002800 + ((_i) * 64 + (_INTVF) * 4)) /* _i=0...2, _INTVF=0...15 */ /* Reset: VFR */
 #define I40E_VFINT_ITRN1_MAX_INDEX      2
 #define I40E_VFINT_ITRN1_INTERVAL_SHIFT 0
 #define I40E_VFINT_ITRN1_INTERVAL_MASK  I40E_MASK(0xFFF, I40E_VFINT_ITRN1_INTERVAL_SHIFT)
-#define I40E_VFINT_STAT_CTL01                      0x00005400
+#define I40E_VFINT_STAT_CTL01                      0x00005400 /* Reset: VFR */
 #define I40E_VFINT_STAT_CTL01_OTHER_ITR_INDX_SHIFT 2
 #define I40E_VFINT_STAT_CTL01_OTHER_ITR_INDX_MASK  I40E_MASK(0x3, I40E_VFINT_STAT_CTL01_OTHER_ITR_INDX_SHIFT)
-#define I40E_QRX_TAIL1(_Q)        (0x00002000 + ((_Q) * 4)) /* _i=0...15 */
+#define I40E_QRX_TAIL1(_Q)        (0x00002000 + ((_Q) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_QRX_TAIL1_MAX_INDEX  15
 #define I40E_QRX_TAIL1_TAIL_SHIFT 0
 #define I40E_QRX_TAIL1_TAIL_MASK  I40E_MASK(0x1FFF, I40E_QRX_TAIL1_TAIL_SHIFT)
-#define I40E_QTX_TAIL1(_Q)        (0x00000000 + ((_Q) * 4)) /* _i=0...15 */
+#define I40E_QTX_TAIL1(_Q)        (0x00000000 + ((_Q) * 4)) /* _i=0...15 */ /* Reset: PFR */
 #define I40E_QTX_TAIL1_MAX_INDEX  15
 #define I40E_QTX_TAIL1_TAIL_SHIFT 0
 #define I40E_QTX_TAIL1_TAIL_MASK  I40E_MASK(0x1FFF, I40E_QTX_TAIL1_TAIL_SHIFT)
-#define I40E_VFMSIX_PBA              0x00002000
+#define I40E_VFMSIX_PBA              0x00002000 /* Reset: VFLR */
 #define I40E_VFMSIX_PBA_PENBIT_SHIFT 0
 #define I40E_VFMSIX_PBA_PENBIT_MASK  I40E_MASK(0xFFFFFFFF, I40E_VFMSIX_PBA_PENBIT_SHIFT)
-#define I40E_VFMSIX_TADD(_i)              (0x00000000 + ((_i) * 16)) /* _i=0...16 */
+#define I40E_VFMSIX_TADD(_i)              (0x00000000 + ((_i) * 16)) /* _i=0...16 */ /* Reset: VFLR */
 #define I40E_VFMSIX_TADD_MAX_INDEX        16
 #define I40E_VFMSIX_TADD_MSIXTADD10_SHIFT 0
 #define I40E_VFMSIX_TADD_MSIXTADD10_MASK  I40E_MASK(0x3, I40E_VFMSIX_TADD_MSIXTADD10_SHIFT)
 #define I40E_VFMSIX_TADD_MSIXTADD_SHIFT   2
 #define I40E_VFMSIX_TADD_MSIXTADD_MASK    I40E_MASK(0x3FFFFFFF, I40E_VFMSIX_TADD_MSIXTADD_SHIFT)
-#define I40E_VFMSIX_TMSG(_i)            (0x00000008 + ((_i) * 16)) /* _i=0...16 */
+#define I40E_VFMSIX_TMSG(_i)            (0x00000008 + ((_i) * 16)) /* _i=0...16 */ /* Reset: VFLR */
 #define I40E_VFMSIX_TMSG_MAX_INDEX      16
 #define I40E_VFMSIX_TMSG_MSIXTMSG_SHIFT 0
 #define I40E_VFMSIX_TMSG_MSIXTMSG_MASK  I40E_MASK(0xFFFFFFFF, I40E_VFMSIX_TMSG_MSIXTMSG_SHIFT)
-#define I40E_VFMSIX_TUADD(_i)             (0x00000004 + ((_i) * 16)) /* _i=0...16 */
+#define I40E_VFMSIX_TUADD(_i)             (0x00000004 + ((_i) * 16)) /* _i=0...16 */ /* Reset: VFLR */
 #define I40E_VFMSIX_TUADD_MAX_INDEX       16
 #define I40E_VFMSIX_TUADD_MSIXTUADD_SHIFT 0
 #define I40E_VFMSIX_TUADD_MSIXTUADD_MASK  I40E_MASK(0xFFFFFFFF, I40E_VFMSIX_TUADD_MSIXTUADD_SHIFT)
-#define I40E_VFMSIX_TVCTRL(_i)        (0x0000000C + ((_i) * 16)) /* _i=0...16 */
+#define I40E_VFMSIX_TVCTRL(_i)        (0x0000000C + ((_i) * 16)) /* _i=0...16 */ /* Reset: VFLR */
 #define I40E_VFMSIX_TVCTRL_MAX_INDEX  16
 #define I40E_VFMSIX_TVCTRL_MASK_SHIFT 0
 #define I40E_VFMSIX_TVCTRL_MASK_MASK  I40E_MASK(0x1, I40E_VFMSIX_TVCTRL_MASK_SHIFT)
-#define I40E_VFCM_PE_ERRDATA                  0x0000DC00
+#define I40E_VFCM_PE_ERRDATA                  0x0000DC00 /* Reset: VFR */
 #define I40E_VFCM_PE_ERRDATA_ERROR_CODE_SHIFT 0
 #define I40E_VFCM_PE_ERRDATA_ERROR_CODE_MASK  I40E_MASK(0xF, I40E_VFCM_PE_ERRDATA_ERROR_CODE_SHIFT)
 #define I40E_VFCM_PE_ERRDATA_Q_TYPE_SHIFT     4
 #define I40E_VFCM_PE_ERRDATA_Q_TYPE_MASK      I40E_MASK(0x7, I40E_VFCM_PE_ERRDATA_Q_TYPE_SHIFT)
 #define I40E_VFCM_PE_ERRDATA_Q_NUM_SHIFT      8
 #define I40E_VFCM_PE_ERRDATA_Q_NUM_MASK       I40E_MASK(0x3FFFF, I40E_VFCM_PE_ERRDATA_Q_NUM_SHIFT)
-#define I40E_VFCM_PE_ERRINFO                     0x0000D800
+#define I40E_VFCM_PE_ERRINFO                     0x0000D800 /* Reset: VFR */
 #define I40E_VFCM_PE_ERRINFO_ERROR_VALID_SHIFT   0
 #define I40E_VFCM_PE_ERRINFO_ERROR_VALID_MASK    I40E_MASK(0x1, I40E_VFCM_PE_ERRINFO_ERROR_VALID_SHIFT)
 #define I40E_VFCM_PE_ERRINFO_ERROR_INST_SHIFT    4
@@ -3561,11 +3317,11 @@
 #define I40E_VFCM_PE_ERRINFO_RLU_ERROR_CNT_MASK  I40E_MASK(0xFF, I40E_VFCM_PE_ERRINFO_RLU_ERROR_CNT_SHIFT)
 #define I40E_VFCM_PE_ERRINFO_RLS_ERROR_CNT_SHIFT 24
 #define I40E_VFCM_PE_ERRINFO_RLS_ERROR_CNT_MASK  I40E_MASK(0xFF, I40E_VFCM_PE_ERRINFO_RLS_ERROR_CNT_SHIFT)
-#define I40E_VFQF_HENA(_i)             (0x0000C400 + ((_i) * 4)) /* _i=0...1 */
+#define I40E_VFQF_HENA(_i)             (0x0000C400 + ((_i) * 4)) /* _i=0...1 */ /* Reset: CORER */
 #define I40E_VFQF_HENA_MAX_INDEX       1
 #define I40E_VFQF_HENA_PTYPE_ENA_SHIFT 0
 #define I40E_VFQF_HENA_PTYPE_ENA_MASK  I40E_MASK(0xFFFFFFFF, I40E_VFQF_HENA_PTYPE_ENA_SHIFT)
-#define I40E_VFQF_HKEY(_i)         (0x0000CC00 + ((_i) * 4)) /* _i=0...12 */
+#define I40E_VFQF_HKEY(_i)         (0x0000CC00 + ((_i) * 4)) /* _i=0...12 */ /* Reset: CORER */
 #define I40E_VFQF_HKEY_MAX_INDEX   12
 #define I40E_VFQF_HKEY_KEY_0_SHIFT 0
 #define I40E_VFQF_HKEY_KEY_0_MASK  I40E_MASK(0xFF, I40E_VFQF_HKEY_KEY_0_SHIFT)
@@ -3575,7 +3331,7 @@
 #define I40E_VFQF_HKEY_KEY_2_MASK  I40E_MASK(0xFF, I40E_VFQF_HKEY_KEY_2_SHIFT)
 #define I40E_VFQF_HKEY_KEY_3_SHIFT 24
 #define I40E_VFQF_HKEY_KEY_3_MASK  I40E_MASK(0xFF, I40E_VFQF_HKEY_KEY_3_SHIFT)
-#define I40E_VFQF_HLUT(_i)        (0x0000D000 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_VFQF_HLUT(_i)        (0x0000D000 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_VFQF_HLUT_MAX_INDEX  15
 #define I40E_VFQF_HLUT_LUT0_SHIFT 0
 #define I40E_VFQF_HLUT_LUT0_MASK  I40E_MASK(0xF, I40E_VFQF_HLUT_LUT0_SHIFT)
@@ -3585,7 +3341,7 @@
 #define I40E_VFQF_HLUT_LUT2_MASK  I40E_MASK(0xF, I40E_VFQF_HLUT_LUT2_SHIFT)
 #define I40E_VFQF_HLUT_LUT3_SHIFT 24
 #define I40E_VFQF_HLUT_LUT3_MASK  I40E_MASK(0xF, I40E_VFQF_HLUT_LUT3_SHIFT)
-#define I40E_VFQF_HREGION(_i)                  (0x0000D400 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_VFQF_HREGION(_i)                  (0x0000D400 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_VFQF_HREGION_MAX_INDEX            7
 #define I40E_VFQF_HREGION_OVERRIDE_ENA_0_SHIFT 0
 #define I40E_VFQF_HREGION_OVERRIDE_ENA_0_MASK  I40E_MASK(0x1, I40E_VFQF_HREGION_OVERRIDE_ENA_0_SHIFT)
diff --git a/sys/dev/i40e/i40e_register_x710_int.h b/sys/dev/i40e/i40e_register_x710_int.h
index d227f3471d65..2f970cda4963 100755
--- a/sys/dev/i40e/i40e_register_x710_int.h
+++ b/sys/dev/i40e/i40e_register_x710_int.h
@@ -37,7 +37,7 @@
 
 /* PF - Admin Queue */
 
-#define I40E_GL_ARQLEN                 0x000802C0
+#define I40E_GL_ARQLEN                 0x000802C0 /* Reset: EMPR */
 #define I40E_GL_ARQLEN_ARQLEN_SHIFT    0
 #define I40E_GL_ARQLEN_ARQLEN_MASK     I40E_MASK(0x3FF, I40E_GL_ARQLEN_ARQLEN_SHIFT)
 #define I40E_GL_ARQLEN_ARQVFE_SHIFT    28
@@ -51,7 +51,7 @@
 
 /* PF - Analyzer Registers */
 
-#define I40E_GL_RCU_PRS_L2TAG(_i)             (0x0026CFC0 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_GL_RCU_PRS_L2TAG(_i)             (0x0026CFC0 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_GL_RCU_PRS_L2TAG_MAX_INDEX       7
 #define I40E_GL_RCU_PRS_L2TAG_LENGTH_SHIFT    0
 #define I40E_GL_RCU_PRS_L2TAG_LENGTH_MASK     I40E_MASK(0x7F, I40E_GL_RCU_PRS_L2TAG_LENGTH_SHIFT)
@@ -70,17 +70,17 @@
 #define I40E_GL_RCU_PRS_L2TAG_ETHERTYPE_SHIFT 16
 #define I40E_GL_RCU_PRS_L2TAG_ETHERTYPE_MASK  I40E_MASK(0xFFFF, I40E_GL_RCU_PRS_L2TAG_ETHERTYPE_SHIFT)
 
-#define I40E_GL_SWT_L2TAG0(_i)        (0x00044278 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_GL_SWT_L2TAG0(_i)        (0x00044278 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_GL_SWT_L2TAG0_MAX_INDEX  7
 #define I40E_GL_SWT_L2TAG0_DATA_SHIFT 0
 #define I40E_GL_SWT_L2TAG0_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWT_L2TAG0_DATA_SHIFT)
 
-#define I40E_GL_SWT_L2TAG1(_i)        (0x00044298 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_GL_SWT_L2TAG1(_i)        (0x00044298 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_GL_SWT_L2TAG1_MAX_INDEX  7
 #define I40E_GL_SWT_L2TAG1_DATA_SHIFT 0
 #define I40E_GL_SWT_L2TAG1_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWT_L2TAG1_DATA_SHIFT)
 
-#define I40E_GL_SWT_L2TAGCTRL(_i)             (0x001C0A70 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_GL_SWT_L2TAGCTRL(_i)             (0x001C0A70 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_GL_SWT_L2TAGCTRL_MAX_INDEX       7
 #define I40E_GL_SWT_L2TAGCTRL_LENGTH_SHIFT    0
 #define I40E_GL_SWT_L2TAGCTRL_LENGTH_MASK     I40E_MASK(0x7F, I40E_GL_SWT_L2TAGCTRL_LENGTH_SHIFT)
@@ -99,41 +99,41 @@
 #define I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT 16
 #define I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_MASK  I40E_MASK(0xFFFF, I40E_GL_SWT_L2TAGCTRL_ETHERTYPE_SHIFT)
 
-#define I40E_GL_SWT_L2TAGRXEB(_i)          (0x00051000 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_GL_SWT_L2TAGRXEB(_i)          (0x00051000 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_GL_SWT_L2TAGRXEB_MAX_INDEX    7
 #define I40E_GL_SWT_L2TAGRXEB_OFFSET_SHIFT 0
 #define I40E_GL_SWT_L2TAGRXEB_OFFSET_MASK  I40E_MASK(0xFF, I40E_GL_SWT_L2TAGRXEB_OFFSET_SHIFT)
 #define I40E_GL_SWT_L2TAGRXEB_LENGTH_SHIFT 8
 #define I40E_GL_SWT_L2TAGRXEB_LENGTH_MASK  I40E_MASK(0x3, I40E_GL_SWT_L2TAGRXEB_LENGTH_SHIFT)
 
-#define I40E_GL_SWT_L2TAGTXIB(_i)          (0x000442B8 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_GL_SWT_L2TAGTXIB(_i)          (0x000442B8 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_GL_SWT_L2TAGTXIB_MAX_INDEX    7
 #define I40E_GL_SWT_L2TAGTXIB_OFFSET_SHIFT 0
 #define I40E_GL_SWT_L2TAGTXIB_OFFSET_MASK  I40E_MASK(0xFF, I40E_GL_SWT_L2TAGTXIB_OFFSET_SHIFT)
 #define I40E_GL_SWT_L2TAGTXIB_LENGTH_SHIFT 8
 #define I40E_GL_SWT_L2TAGTXIB_LENGTH_MASK  I40E_MASK(0x3, I40E_GL_SWT_L2TAGTXIB_LENGTH_SHIFT)
 
-#define I40E_GLANL_L2ULP(_i)             (0x001C0A2C + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLANL_L2ULP(_i)             (0x001C0A2C + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLANL_L2ULP_MAX_INDEX       15
 #define I40E_GLANL_L2ULP_ETHERTYPE_SHIFT 0
 #define I40E_GLANL_L2ULP_ETHERTYPE_MASK  I40E_MASK(0xFFFF, I40E_GLANL_L2ULP_ETHERTYPE_SHIFT)
 #define I40E_GLANL_L2ULP_ENABLE_SHIFT    31
 #define I40E_GLANL_L2ULP_ENABLE_MASK     I40E_MASK(0x1, I40E_GLANL_L2ULP_ENABLE_SHIFT)
 
-#define I40E_GLANL_PRE_LY2                  0x001C0A20
+#define I40E_GLANL_PRE_LY2                  0x001C0A20 /* Reset: CORER */
 #define I40E_GLANL_PRE_LY2_PRE_LY2_L2_SHIFT 0
 #define I40E_GLANL_PRE_LY2_PRE_LY2_L2_MASK  I40E_MASK(0xFFFF, I40E_GLANL_PRE_LY2_PRE_LY2_L2_SHIFT)
 
-#define I40E_GLPPRS_INDIRECT_ADDRESS            0x001C0A90
+#define I40E_GLPPRS_INDIRECT_ADDRESS            0x001C0A90 /* Reset: CORER */
 #define I40E_GLPPRS_INDIRECT_ADDRESS_ADDR_SHIFT 0
 #define I40E_GLPPRS_INDIRECT_ADDRESS_ADDR_MASK  I40E_MASK(0xFFFF, I40E_GLPPRS_INDIRECT_ADDRESS_ADDR_SHIFT)
 
-#define I40E_GLPPRS_INDIRECT_DATA(_i)        (0x001C0A94 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLPPRS_INDIRECT_DATA(_i)        (0x001C0A94 + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPPRS_INDIRECT_DATA_MAX_INDEX  3
 #define I40E_GLPPRS_INDIRECT_DATA_DATA_SHIFT 0
 #define I40E_GLPPRS_INDIRECT_DATA_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPPRS_INDIRECT_DATA_DATA_SHIFT)
 
-#define I40E_GLRDPU_L2TAGCTRL(_i)             (0x00051020 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_GLRDPU_L2TAGCTRL(_i)             (0x00051020 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_GLRDPU_L2TAGCTRL_MAX_INDEX       7
 #define I40E_GLRDPU_L2TAGCTRL_LENGTH_SHIFT    0
 #define I40E_GLRDPU_L2TAGCTRL_LENGTH_MASK     I40E_MASK(0x7F, I40E_GLRDPU_L2TAGCTRL_LENGTH_SHIFT)
@@ -152,7 +152,7 @@
 #define I40E_GLRDPU_L2TAGCTRL_ETHERTYPE_SHIFT 16
 #define I40E_GLRDPU_L2TAGCTRL_ETHERTYPE_MASK  I40E_MASK(0xFFFF, I40E_GLRDPU_L2TAGCTRL_ETHERTYPE_SHIFT)
 
-#define I40E_GLTDPU_L2TAGCTRL(_i)             (0x00044204 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_GLTDPU_L2TAGCTRL(_i)             (0x00044204 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_GLTDPU_L2TAGCTRL_MAX_INDEX       7
 #define I40E_GLTDPU_L2TAGCTRL_LENGTH_SHIFT    0
 #define I40E_GLTDPU_L2TAGCTRL_LENGTH_MASK     I40E_MASK(0x7F, I40E_GLTDPU_L2TAGCTRL_LENGTH_SHIFT)
@@ -171,35 +171,35 @@
 #define I40E_GLTDPU_L2TAGCTRL_ETHERTYPE_SHIFT 16
 #define I40E_GLTDPU_L2TAGCTRL_ETHERTYPE_MASK  I40E_MASK(0xFFFF, I40E_GLTDPU_L2TAGCTRL_ETHERTYPE_SHIFT)
 
-#define I40E_GLTDPU_L2ULP(_i)             (0x00044224 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLTDPU_L2ULP(_i)             (0x00044224 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLTDPU_L2ULP_MAX_INDEX       15
 #define I40E_GLTDPU_L2ULP_ETHERTYPE_SHIFT 0
 #define I40E_GLTDPU_L2ULP_ETHERTYPE_MASK  I40E_MASK(0xFFFF, I40E_GLTDPU_L2ULP_ETHERTYPE_SHIFT)
 #define I40E_GLTDPU_L2ULP_ENABLE_SHIFT    31
 #define I40E_GLTDPU_L2ULP_ENABLE_MASK     I40E_MASK(0x1, I40E_GLTDPU_L2ULP_ENABLE_SHIFT)
 
-#define I40E_GLTDPU_PRE_LY2                  0x00044200
+#define I40E_GLTDPU_PRE_LY2                  0x00044200 /* Reset: CORER */
 #define I40E_GLTDPU_PRE_LY2_PRE_LY2_L2_SHIFT 0
 #define I40E_GLTDPU_PRE_LY2_PRE_LY2_L2_MASK  I40E_MASK(0xFFFF, I40E_GLTDPU_PRE_LY2_PRE_LY2_L2_SHIFT)
 
-#define I40E_PRT_PPRSL2TAGSEN              0x00087080
+#define I40E_PRT_PPRSL2TAGSEN              0x00087080 /* Reset: CORER */
 #define I40E_PRT_PPRSL2TAGSEN_ENABLE_SHIFT 0
 #define I40E_PRT_PPRSL2TAGSEN_ENABLE_MASK  I40E_MASK(0xFF, I40E_PRT_PPRSL2TAGSEN_ENABLE_SHIFT)
 
-#define I40E_PRT_TDPUL2TAGSEN              0x00044140
+#define I40E_PRT_TDPUL2TAGSEN              0x00044140 /* Reset: CORER */
 #define I40E_PRT_TDPUL2TAGSEN_ENABLE_SHIFT 0
 #define I40E_PRT_TDPUL2TAGSEN_ENABLE_MASK  I40E_MASK(0xFF, I40E_PRT_TDPUL2TAGSEN_ENABLE_SHIFT)
 
-#define I40E_PRTPPRS_INDIRECT_ADDRESS            0x00084320
+#define I40E_PRTPPRS_INDIRECT_ADDRESS            0x00084320 /* Reset: CORER */
 #define I40E_PRTPPRS_INDIRECT_ADDRESS_ADDR_SHIFT 0
 #define I40E_PRTPPRS_INDIRECT_ADDRESS_ADDR_MASK  I40E_MASK(0xFFFF, I40E_PRTPPRS_INDIRECT_ADDRESS_ADDR_SHIFT)
 
-#define I40E_PRTPPRS_INDIRECT_DATA(_i)        (0x00084340 + ((_i) * 32)) /* _i=0...3 */
+#define I40E_PRTPPRS_INDIRECT_DATA(_i)        (0x00084340 + ((_i) * 32)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_PRTPPRS_INDIRECT_DATA_MAX_INDEX  3
 #define I40E_PRTPPRS_INDIRECT_DATA_DATA_SHIFT 0
 #define I40E_PRTPPRS_INDIRECT_DATA_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTPPRS_INDIRECT_DATA_DATA_SHIFT)
 
-#define I40E_PRTPPRS_L2TAGCTRL(_i)             (0x00084020 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTPPRS_L2TAGCTRL(_i)             (0x00084020 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRTPPRS_L2TAGCTRL_MAX_INDEX       7
 #define I40E_PRTPPRS_L2TAGCTRL_LENGTH_SHIFT    0
 #define I40E_PRTPPRS_L2TAGCTRL_LENGTH_MASK     I40E_MASK(0x7F, I40E_PRTPPRS_L2TAGCTRL_LENGTH_SHIFT)
@@ -218,18 +218,18 @@
 #define I40E_PRTPPRS_L2TAGCTRL_ETHERTYPE_SHIFT 16
 #define I40E_PRTPPRS_L2TAGCTRL_ETHERTYPE_MASK  I40E_MASK(0xFFFF, I40E_PRTPPRS_L2TAGCTRL_ETHERTYPE_SHIFT)
 
-#define I40E_PRTPPRS_L2ULP(_i)             (0x00084120 + ((_i) * 32)) /* _i=0...15 */
+#define I40E_PRTPPRS_L2ULP(_i)             (0x00084120 + ((_i) * 32)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_PRTPPRS_L2ULP_MAX_INDEX       15
 #define I40E_PRTPPRS_L2ULP_ETHERTYPE_SHIFT 0
 #define I40E_PRTPPRS_L2ULP_ETHERTYPE_MASK  I40E_MASK(0xFFFF, I40E_PRTPPRS_L2ULP_ETHERTYPE_SHIFT)
 #define I40E_PRTPPRS_L2ULP_ENABLE_SHIFT    31
 #define I40E_PRTPPRS_L2ULP_ENABLE_MASK     I40E_MASK(0x1, I40E_PRTPPRS_L2ULP_ENABLE_SHIFT)
 
-#define I40E_PRTPPRS_PRE_LY2                  0x00084000
+#define I40E_PRTPPRS_PRE_LY2                  0x00084000 /* Reset: CORER */
 #define I40E_PRTPPRS_PRE_LY2_PRE_LY2_L2_SHIFT 0
 #define I40E_PRTPPRS_PRE_LY2_PRE_LY2_L2_MASK  I40E_MASK(0xFFFF, I40E_PRTPPRS_PRE_LY2_PRE_LY2_L2_SHIFT)
 
-#define I40E_PRTPPRS_SIATH(_i)             (0x00085900 + ((_i) * 32)) /* _i=0...15 */
+#define I40E_PRTPPRS_SIATH(_i)             (0x00085900 + ((_i) * 32)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_PRTPPRS_SIATH_MAX_INDEX       15
 #define I40E_PRTPPRS_SIATH_ETHERTYPE_SHIFT 0
 #define I40E_PRTPPRS_SIATH_ETHERTYPE_MASK  I40E_MASK(0xFFFF, I40E_PRTPPRS_SIATH_ETHERTYPE_SHIFT)
@@ -238,7 +238,7 @@
 #define I40E_PRTPPRS_SIATH_VALID_SHIFT     31
 #define I40E_PRTPPRS_SIATH_VALID_MASK      I40E_MASK(0x1, I40E_PRTPPRS_SIATH_VALID_SHIFT)
 
-#define I40E_PRTPPRS_SIATL(_i)                (0x00085700 + ((_i) * 32)) /* _i=0...15 */
+#define I40E_PRTPPRS_SIATL(_i)                (0x00085700 + ((_i) * 32)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_PRTPPRS_SIATL_MAX_INDEX          15
 #define I40E_PRTPPRS_SIATL_GRE_PROTOCOL_SHIFT 0
 #define I40E_PRTPPRS_SIATL_GRE_PROTOCOL_MASK  I40E_MASK(0xFFFF, I40E_PRTPPRS_SIATL_GRE_PROTOCOL_SHIFT)
@@ -251,19 +251,19 @@
 
 /* PF - CM Registers */
 
-#define I40E_GLCM_LANCLSADDR                0x0010C444
+#define I40E_GLCM_LANCLSADDR                0x0010C444 /* Reset: CORER */
 #define I40E_GLCM_LANCLSADDR_CLS_ADDR_SHIFT 0
 #define I40E_GLCM_LANCLSADDR_CLS_ADDR_MASK  I40E_MASK(0x1FF, I40E_GLCM_LANCLSADDR_CLS_ADDR_SHIFT)
 
-#define I40E_GLCM_LANCLSDATAHI                   0x0010C44C
+#define I40E_GLCM_LANCLSDATAHI                   0x0010C44C /* Reset: CORER */
 #define I40E_GLCM_LANCLSDATAHI_CLS_DATA_HI_SHIFT 0
 #define I40E_GLCM_LANCLSDATAHI_CLS_DATA_HI_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLCM_LANCLSDATAHI_CLS_DATA_HI_SHIFT)
 
-#define I40E_GLCM_LANCLSDATALO                   0x0010C448
+#define I40E_GLCM_LANCLSDATALO                   0x0010C448 /* Reset: CORER */
 #define I40E_GLCM_LANCLSDATALO_CLS_DATA_LO_SHIFT 0
 #define I40E_GLCM_LANCLSDATALO_CLS_DATA_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLCM_LANCLSDATALO_CLS_DATA_LO_SHIFT)
 
-#define I40E_GLCM_LANCONFIG                            0x0010C430
+#define I40E_GLCM_LANCONFIG                            0x0010C430 /* Reset: CORER */
 #define I40E_GLCM_LANCONFIG_GLOBAL_LOCK_MODE_SHIFT     1
 #define I40E_GLCM_LANCONFIG_GLOBAL_LOCK_MODE_MASK      I40E_MASK(0x1, I40E_GLCM_LANCONFIG_GLOBAL_LOCK_MODE_SHIFT)
 #define I40E_GLCM_LANCONFIG_DISABLE_PACKET_COUNT_SHIFT 2
@@ -289,13 +289,13 @@
 #define I40E_GLCM_LANCONFIG_DBGMUX_EN_SHIFT            28
 #define I40E_GLCM_LANCONFIG_DBGMUX_EN_MASK             I40E_MASK(0x1, I40E_GLCM_LANCONFIG_DBGMUX_EN_SHIFT)
 
-#define I40E_GLCM_LANCRDTHR                   0x0010C41C
+#define I40E_GLCM_LANCRDTHR                   0x0010C41C /* Reset: CORER */
 #define I40E_GLCM_LANCRDTHR_CMLANCRDTHR_SHIFT 0
 #define I40E_GLCM_LANCRDTHR_CMLANCRDTHR_MASK  I40E_MASK(0x3FFF, I40E_GLCM_LANCRDTHR_CMLANCRDTHR_SHIFT)
 #define I40E_GLCM_LANCRDTHR_CMLANTCBTHR_SHIFT 16
 #define I40E_GLCM_LANCRDTHR_CMLANTCBTHR_MASK  I40E_MASK(0x7F, I40E_GLCM_LANCRDTHR_CMLANTCBTHR_SHIFT)
 
-#define I40E_GLCM_LANCTXDGCTL                  0x0010C410
+#define I40E_GLCM_LANCTXDGCTL                  0x0010C410 /* Reset: CORER */
 #define I40E_GLCM_LANCTXDGCTL_QUEUE_NUM_SHIFT  0
 #define I40E_GLCM_LANCTXDGCTL_QUEUE_NUM_MASK   I40E_MASK(0xFFF, I40E_GLCM_LANCTXDGCTL_QUEUE_NUM_SHIFT)
 #define I40E_GLCM_LANCTXDGCTL_SUB_LINE_SHIFT   12
@@ -313,12 +313,12 @@
 #define I40E_GLCM_LANCTXDGCTL_ALLOCATE_SHIFT   23
 #define I40E_GLCM_LANCTXDGCTL_ALLOCATE_MASK    I40E_MASK(0x1, I40E_GLCM_LANCTXDGCTL_ALLOCATE_SHIFT)
 
-#define I40E_GLCM_LANCTXDGDATA(_i)        (0x0010C400 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLCM_LANCTXDGDATA(_i)        (0x0010C400 + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLCM_LANCTXDGDATA_MAX_INDEX  3
 #define I40E_GLCM_LANCTXDGDATA_DATA_SHIFT 0
 #define I40E_GLCM_LANCTXDGDATA_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLCM_LANCTXDGDATA_DATA_SHIFT)
 
-#define I40E_GLCM_LANCTXDGFN                  0x0010C418
+#define I40E_GLCM_LANCTXDGFN                  0x0010C418 /* Reset: CORER */
 #define I40E_GLCM_LANCTXDGFN_PF_NUM_SHIFT     0
 #define I40E_GLCM_LANCTXDGFN_PF_NUM_MASK      I40E_MASK(0xF, I40E_GLCM_LANCTXDGFN_PF_NUM_SHIFT)
 #define I40E_GLCM_LANCTXDGFN_VM_VF_NUM_SHIFT  4
@@ -326,39 +326,39 @@
 #define I40E_GLCM_LANCTXDGFN_VM_VF_TYPE_SHIFT 16
 #define I40E_GLCM_LANCTXDGFN_VM_VF_TYPE_MASK  I40E_MASK(0x3, I40E_GLCM_LANCTXDGFN_VM_VF_TYPE_SHIFT)
 
-#define I40E_GLCM_LANCTXDGSTAT                0x0010C414
+#define I40E_GLCM_LANCTXDGSTAT                0x0010C414 /* Reset: CORER */
 #define I40E_GLCM_LANCTXDGSTAT_CTX_DONE_SHIFT 0
 #define I40E_GLCM_LANCTXDGSTAT_CTX_DONE_MASK  I40E_MASK(0x1, I40E_GLCM_LANCTXDGSTAT_CTX_DONE_SHIFT)
 #define I40E_GLCM_LANCTXDGSTAT_CTX_MISS_SHIFT 1
 #define I40E_GLCM_LANCTXDGSTAT_CTX_MISS_MASK  I40E_MASK(0x1, I40E_GLCM_LANCTXDGSTAT_CTX_MISS_SHIFT)
 
-#define I40E_GLCM_LANDATAREQHI                      0x0010C478
+#define I40E_GLCM_LANDATAREQHI                      0x0010C478 /* Reset: CORER */
 #define I40E_GLCM_LANDATAREQHI_CMLANDATAREQHI_SHIFT 0
 #define I40E_GLCM_LANDATAREQHI_CMLANDATAREQHI_MASK  I40E_MASK(0xFFFFFF, I40E_GLCM_LANDATAREQHI_CMLANDATAREQHI_SHIFT)
 
-#define I40E_GLCM_LANDATAREQLOW                       0x0010C474
+#define I40E_GLCM_LANDATAREQLOW                       0x0010C474 /* Reset: CORER */
 #define I40E_GLCM_LANDATAREQLOW_CMLANDATAREQLOW_SHIFT 0
 #define I40E_GLCM_LANDATAREQLOW_CMLANDATAREQLOW_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLCM_LANDATAREQLOW_CMLANDATAREQLOW_SHIFT)
 
-#define I40E_GLCM_LANDATASTALLHI                        0x0010C480
+#define I40E_GLCM_LANDATASTALLHI                        0x0010C480 /* Reset: CORER */
 #define I40E_GLCM_LANDATASTALLHI_CMLANDATASTALLHI_SHIFT 0
 #define I40E_GLCM_LANDATASTALLHI_CMLANDATASTALLHI_MASK  I40E_MASK(0xFFFFFF, I40E_GLCM_LANDATASTALLHI_CMLANDATASTALLHI_SHIFT)
 
-#define I40E_GLCM_LANDATASTALLLO                         0x0010C47C
+#define I40E_GLCM_LANDATASTALLLO                         0x0010C47C /* Reset: CORER */
 #define I40E_GLCM_LANDATASTALLLO_CMLANDATASTALLLOW_SHIFT 0
 #define I40E_GLCM_LANDATASTALLLO_CMLANDATASTALLLOW_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLCM_LANDATASTALLLO_CMLANDATASTALLLOW_SHIFT)
 
-#define I40E_GLCM_LANLOCKTBLADDR                    0x0010C458
+#define I40E_GLCM_LANLOCKTBLADDR                    0x0010C458 /* Reset: CORER */
 #define I40E_GLCM_LANLOCKTBLADDR_LOCKTBL_ADDR_SHIFT 0
 #define I40E_GLCM_LANLOCKTBLADDR_LOCKTBL_ADDR_MASK  I40E_MASK(0xF, I40E_GLCM_LANLOCKTBLADDR_LOCKTBL_ADDR_SHIFT)
 
-#define I40E_GLCM_LANLOCKTBLDATAHI                 0x0010C460
+#define I40E_GLCM_LANLOCKTBLDATAHI                 0x0010C460 /* Reset: CORER */
 #define I40E_GLCM_LANLOCKTBLDATAHI_LOCKSEL_SHIFT   0
 #define I40E_GLCM_LANLOCKTBLDATAHI_LOCKSEL_MASK    I40E_MASK(0xFF, I40E_GLCM_LANLOCKTBLDATAHI_LOCKSEL_SHIFT)
 #define I40E_GLCM_LANLOCKTBLDATAHI_GPLOCKSEL_SHIFT 8
 #define I40E_GLCM_LANLOCKTBLDATAHI_GPLOCKSEL_MASK  I40E_MASK(0xF, I40E_GLCM_LANLOCKTBLDATAHI_GPLOCKSEL_SHIFT)
 
-#define I40E_GLCM_LANLOCKTBLDATALO                  0x0010C45C
+#define I40E_GLCM_LANLOCKTBLDATALO                  0x0010C45C /* Reset: CORER */
 #define I40E_GLCM_LANLOCKTBLDATALO_QNUM_SHIFT       0
 #define I40E_GLCM_LANLOCKTBLDATALO_QNUM_MASK        I40E_MASK(0xFFF, I40E_GLCM_LANLOCKTBLDATALO_QNUM_SHIFT)
 #define I40E_GLCM_LANLOCKTBLDATALO_PF_NUM_SHIFT     12
@@ -368,19 +368,19 @@
 #define I40E_GLCM_LANLOCKTBLDATALO_VM_VF_TYPE_SHIFT 25
 #define I40E_GLCM_LANLOCKTBLDATALO_VM_VF_TYPE_MASK  I40E_MASK(0x3, I40E_GLCM_LANLOCKTBLDATALO_VM_VF_TYPE_SHIFT)
 
-#define I40E_GLCM_LANMISSREQHI                      0x0010C488
+#define I40E_GLCM_LANMISSREQHI                      0x0010C488 /* Reset: CORER */
 #define I40E_GLCM_LANMISSREQHI_CMLANMISSREQHI_SHIFT 0
 #define I40E_GLCM_LANMISSREQHI_CMLANMISSREQHI_MASK  I40E_MASK(0xFFFFFF, I40E_GLCM_LANMISSREQHI_CMLANMISSREQHI_SHIFT)
 
-#define I40E_GLCM_LANMISSREQLO                       0x0010C484
+#define I40E_GLCM_LANMISSREQLO                       0x0010C484 /* Reset: CORER */
 #define I40E_GLCM_LANMISSREQLO_CMLANMISSREQLOW_SHIFT 0
 #define I40E_GLCM_LANMISSREQLO_CMLANMISSREQLOW_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLCM_LANMISSREQLO_CMLANMISSREQLOW_SHIFT)
 
-#define I40E_GLCM_LANPKTCNTADDR                   0x0010C450
+#define I40E_GLCM_LANPKTCNTADDR                   0x0010C450 /* Reset: CORER */
 #define I40E_GLCM_LANPKTCNTADDR_PKTCNT_ADDR_SHIFT 0
 #define I40E_GLCM_LANPKTCNTADDR_PKTCNT_ADDR_MASK  I40E_MASK(0x1FF, I40E_GLCM_LANPKTCNTADDR_PKTCNT_ADDR_SHIFT)
 
-#define I40E_GLCM_LANPKTCNTDATA               0x0010C454
+#define I40E_GLCM_LANPKTCNTDATA               0x0010C454 /* Reset: CORER */
 #define I40E_GLCM_LANPKTCNTDATA_DONE_SHIFT    0
 #define I40E_GLCM_LANPKTCNTDATA_DONE_MASK     I40E_MASK(0x1, I40E_GLCM_LANPKTCNTDATA_DONE_SHIFT)
 #define I40E_GLCM_LANPKTCNTDATA_PKTCNT_SHIFT  1
@@ -388,69 +388,69 @@
 #define I40E_GLCM_LANPKTCNTDATA_RLSTATE_SHIFT 12
 #define I40E_GLCM_LANPKTCNTDATA_RLSTATE_MASK  I40E_MASK(0x3, I40E_GLCM_LANPKTCNTDATA_RLSTATE_SHIFT)
 
-#define I40E_GLCM_LANRLADDR               0x0010C43C
+#define I40E_GLCM_LANRLADDR               0x0010C43C /* Reset: CORER */
 #define I40E_GLCM_LANRLADDR_RL_ADDR_SHIFT 0
 #define I40E_GLCM_LANRLADDR_RL_ADDR_MASK  I40E_MASK(0xFFF, I40E_GLCM_LANRLADDR_RL_ADDR_SHIFT)
 
-#define I40E_GLCM_LANRLDATA               0x0010C440
+#define I40E_GLCM_LANRLDATA               0x0010C440 /* Reset: CORER */
 #define I40E_GLCM_LANRLDATA_RL_DATA_SHIFT 0
 #define I40E_GLCM_LANRLDATA_RL_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLCM_LANRLDATA_RL_DATA_SHIFT)
 
-#define I40E_GLCM_LANRLQUERY(_i)           (0x0010C420 + ((_i) * 4)) /* _i=0...1 */
+#define I40E_GLCM_LANRLQUERY(_i)           (0x0010C420 + ((_i) * 4)) /* _i=0...1 */ /* Reset: CORER */
 #define I40E_GLCM_LANRLQUERY_MAX_INDEX     1
 #define I40E_GLCM_LANRLQUERY_RLINDEX_SHIFT 0
 #define I40E_GLCM_LANRLQUERY_RLINDEX_MASK  I40E_MASK(0x3FF, I40E_GLCM_LANRLQUERY_RLINDEX_SHIFT)
 
-#define I40E_GLCM_LANRLSTAT(_i)              (0x0010C428 + ((_i) * 4)) /* _i=0...1 */
+#define I40E_GLCM_LANRLSTAT(_i)              (0x0010C428 + ((_i) * 4)) /* _i=0...1 */ /* Reset: CORER */
 #define I40E_GLCM_LANRLSTAT_MAX_INDEX        1
 #define I40E_GLCM_LANRLSTAT_QUERY_DONE_SHIFT 0
 #define I40E_GLCM_LANRLSTAT_QUERY_DONE_MASK  I40E_MASK(0x1, I40E_GLCM_LANRLSTAT_QUERY_DONE_SHIFT)
 #define I40E_GLCM_LANRLSTAT_RL_EMPTY_SHIFT   1
 #define I40E_GLCM_LANRLSTAT_RL_EMPTY_MASK    I40E_MASK(0x1, I40E_GLCM_LANRLSTAT_RL_EMPTY_SHIFT)
 
-#define I40E_GLCM_LANSNOOPREQHI                       0x0010C468
+#define I40E_GLCM_LANSNOOPREQHI                       0x0010C468 /* Reset: CORER */
 #define I40E_GLCM_LANSNOOPREQHI_CMLANSNOOPREQHI_SHIFT 0
 #define I40E_GLCM_LANSNOOPREQHI_CMLANSNOOPREQHI_MASK  I40E_MASK(0xFFFFFF, I40E_GLCM_LANSNOOPREQHI_CMLANSNOOPREQHI_SHIFT)
 
-#define I40E_GLCM_LANSNOOPREQLO                        0x0010C464
+#define I40E_GLCM_LANSNOOPREQLO                        0x0010C464 /* Reset: CORER */
 #define I40E_GLCM_LANSNOOPREQLO_CMLANSNOOPREQLOW_SHIFT 0
 #define I40E_GLCM_LANSNOOPREQLO_CMLANSNOOPREQLOW_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLCM_LANSNOOPREQLO_CMLANSNOOPREQLOW_SHIFT)
 
-#define I40E_GLCM_LANSNOOPSTALLHI                         0x0010C470
+#define I40E_GLCM_LANSNOOPSTALLHI                         0x0010C470 /* Reset: CORER */
 #define I40E_GLCM_LANSNOOPSTALLHI_CMLANSNOOPSTALLHI_SHIFT 0
 #define I40E_GLCM_LANSNOOPSTALLHI_CMLANSNOOPSTALLHI_MASK  I40E_MASK(0xFFFFFF, I40E_GLCM_LANSNOOPSTALLHI_CMLANSNOOPSTALLHI_SHIFT)
 
-#define I40E_GLCM_LANSNOOPSTALLLO                          0x0010C46C
+#define I40E_GLCM_LANSNOOPSTALLLO                          0x0010C46C /* Reset: CORER */
 #define I40E_GLCM_LANSNOOPSTALLLO_CMLANSNOOPSTALLLOW_SHIFT 0
 #define I40E_GLCM_LANSNOOPSTALLLO_CMLANSNOOPSTALLLOW_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLCM_LANSNOOPSTALLLO_CMLANSNOOPSTALLLOW_SHIFT)
 
 /* PF - DCB Registers  */
 
-#define I40E_GLDCB_PACER                 0x000A2210
+#define I40E_GLDCB_PACER                 0x000A2210 /* Reset: CORER */
 #define I40E_GLDCB_PACER_PACER_VAL_SHIFT 0
 #define I40E_GLDCB_PACER_PACER_VAL_MASK  I40E_MASK(0x3FFFFFF, I40E_GLDCB_PACER_PACER_VAL_SHIFT)
 #define I40E_GLDCB_PACER_PACER_EN_SHIFT  31
 #define I40E_GLDCB_PACER_PACER_EN_MASK   I40E_MASK(0x1, I40E_GLDCB_PACER_PACER_EN_SHIFT)
 
-#define I40E_GLDCB_PCI_DATA                   0x000A0150
+#define I40E_GLDCB_PCI_DATA                   0x000A0150 /* Reset: CORER */
 #define I40E_GLDCB_PCI_DATA_PCI_DATA_BC_SHIFT 0
 #define I40E_GLDCB_PCI_DATA_PCI_DATA_BC_MASK  I40E_MASK(0xFFFFF, I40E_GLDCB_PCI_DATA_PCI_DATA_BC_SHIFT)
 
-#define I40E_GLDCB_RLLPC                 0x0005105C
+#define I40E_GLDCB_RLLPC                 0x0005105C /* Reset: CORER */
 #define I40E_GLDCB_RLLPC_LLMAXPCNT_SHIFT 0
 #define I40E_GLDCB_RLLPC_LLMAXPCNT_MASK  I40E_MASK(0xFFFF, I40E_GLDCB_RLLPC_LLMAXPCNT_SHIFT)
 #define I40E_GLDCB_RLLPC_BMAXPCNT_SHIFT  16
 #define I40E_GLDCB_RLLPC_BMAXPCNT_MASK   I40E_MASK(0xFFFF, I40E_GLDCB_RLLPC_BMAXPCNT_SHIFT)
 
-#define I40E_GLDCB_RLLPSB             0x00051054
+#define I40E_GLDCB_RLLPSB             0x00051054 /* Reset: CORER */
 #define I40E_GLDCB_RLLPSB_BPCNT_SHIFT 0
 #define I40E_GLDCB_RLLPSB_BPCNT_MASK  I40E_MASK(0x3FFFFFF, I40E_GLDCB_RLLPSB_BPCNT_SHIFT)
 
-#define I40E_GLDCB_RLLPSLL              0x00051058
+#define I40E_GLDCB_RLLPSLL              0x00051058 /* Reset: CORER */
 #define I40E_GLDCB_RLLPSLL_LLPCNT_SHIFT 0
 #define I40E_GLDCB_RLLPSLL_LLPCNT_MASK  I40E_MASK(0x3FFFFFF, I40E_GLDCB_RLLPSLL_LLPCNT_SHIFT)
 
-#define I40E_GLDCB_RMPMC                       0x00122610
+#define I40E_GLDCB_RMPMC                       0x00122610 /* Reset: CORER */
 #define I40E_GLDCB_RMPMC_RSPM_SHIFT            0
 #define I40E_GLDCB_RMPMC_RSPM_MASK             I40E_MASK(0x3F, I40E_GLDCB_RMPMC_RSPM_SHIFT)
 #define I40E_GLDCB_RMPMC_MIQ_NODROP_MODE_SHIFT 6
@@ -458,23 +458,23 @@
 #define I40E_GLDCB_RMPMC_RPM_DIS_SHIFT         31
 #define I40E_GLDCB_RMPMC_RPM_DIS_MASK          I40E_MASK(0x1, I40E_GLDCB_RMPMC_RPM_DIS_SHIFT)
 
-#define I40E_GLDCB_RMPMS            0x00122614
+#define I40E_GLDCB_RMPMS            0x00122614 /* Reset: CORER */
 #define I40E_GLDCB_RMPMS_RMPM_SHIFT 0
 #define I40E_GLDCB_RMPMS_RMPM_MASK  I40E_MASK(0xFFFF, I40E_GLDCB_RMPMS_RMPM_SHIFT)
 
-#define I40E_GLDCB_RPRRD0                   0x00122608
+#define I40E_GLDCB_RPRRD0                   0x00122608 /* Reset: CORER */
 #define I40E_GLDCB_RPRRD0_BWSHARE_40G_SHIFT 0
 #define I40E_GLDCB_RPRRD0_BWSHARE_40G_MASK  I40E_MASK(0x3FF, I40E_GLDCB_RPRRD0_BWSHARE_40G_SHIFT)
 #define I40E_GLDCB_RPRRD0_BWSHARE_10G_SHIFT 16
 #define I40E_GLDCB_RPRRD0_BWSHARE_10G_MASK  I40E_MASK(0x3FF, I40E_GLDCB_RPRRD0_BWSHARE_10G_SHIFT)
 
-#define I40E_GLDCB_RPRRD1                    0x0012260C
+#define I40E_GLDCB_RPRRD1                    0x0012260C /* Reset: CORER */
 #define I40E_GLDCB_RPRRD1_BWSHARE_1G_SHIFT   0
 #define I40E_GLDCB_RPRRD1_BWSHARE_1G_MASK    I40E_MASK(0x3FF, I40E_GLDCB_RPRRD1_BWSHARE_1G_SHIFT)
 #define I40E_GLDCB_RPRRD1_BWSHARE_100M_SHIFT 16
 #define I40E_GLDCB_RPRRD1_BWSHARE_100M_MASK  I40E_MASK(0x3FF, I40E_GLDCB_RPRRD1_BWSHARE_100M_SHIFT)
 
-#define I40E_GLDCB_RSPMC                   0x00122604
+#define I40E_GLDCB_RSPMC                   0x00122604 /* Reset: CORER */
 #define I40E_GLDCB_RSPMC_RSPM_SHIFT        0
 #define I40E_GLDCB_RSPMC_RSPM_MASK         I40E_MASK(0xFF, I40E_GLDCB_RSPMC_RSPM_SHIFT)
 #define I40E_GLDCB_RSPMC_RPM_MODE_SHIFT    8
@@ -486,15 +486,15 @@
 #define I40E_GLDCB_RSPMC_RPM_DIS_SHIFT     31
 #define I40E_GLDCB_RSPMC_RPM_DIS_MASK      I40E_MASK(0x1, I40E_GLDCB_RSPMC_RPM_DIS_SHIFT)
 
-#define I40E_GLDCB_RSPMS            0x00122600
+#define I40E_GLDCB_RSPMS            0x00122600 /* Reset: CORER */
 #define I40E_GLDCB_RSPMS_RSPM_SHIFT 0
 #define I40E_GLDCB_RSPMS_RSPM_MASK  I40E_MASK(0x3FFFF, I40E_GLDCB_RSPMS_RSPM_SHIFT)
 
-#define I40E_GLDCB_TFPFCI                 0x00098080
+#define I40E_GLDCB_TFPFCI                 0x00098080 /* Reset: CORER */
 #define I40E_GLDCB_TFPFCI_IGNORE_FC_SHIFT 0
 #define I40E_GLDCB_TFPFCI_IGNORE_FC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLDCB_TFPFCI_IGNORE_FC_SHIFT)
 
-#define I40E_GLDCB_TGENC_TLPM                         0x000A01C0
+#define I40E_GLDCB_TGENC_TLPM                         0x000A01C0 /* Reset: CORER */
 #define I40E_GLDCB_TGENC_TLPM_ALLOFFTH_SHIFT          0
 #define I40E_GLDCB_TGENC_TLPM_ALLOFFTH_MASK           I40E_MASK(0xFF, I40E_GLDCB_TGENC_TLPM_ALLOFFTH_SHIFT)
 #define I40E_GLDCB_TGENC_TLPM_SHARED_TDATATH_SHIFT    8
@@ -506,7 +506,7 @@
 #define I40E_GLDCB_TGENC_TLPM_FWLB_MODE_SHIFT         31
 #define I40E_GLDCB_TGENC_TLPM_FWLB_MODE_MASK          I40E_MASK(0x1, I40E_GLDCB_TGENC_TLPM_FWLB_MODE_SHIFT)
 
-#define I40E_GLDCB_TGENC_TUPM                 0x000A2200
+#define I40E_GLDCB_TGENC_TUPM                 0x000A2200 /* Reset: CORER */
 #define I40E_GLDCB_TGENC_TUPM_ALLOFFTH_SHIFT  0
 #define I40E_GLDCB_TGENC_TUPM_ALLOFFTH_MASK   I40E_MASK(0x1FFF, I40E_GLDCB_TGENC_TUPM_ALLOFFTH_SHIFT)
 #define I40E_GLDCB_TGENC_TUPM_TCPM_DIS_SHIFT  30
@@ -514,50 +514,50 @@
 #define I40E_GLDCB_TGENC_TUPM_CWLB_MODE_SHIFT 31
 #define I40E_GLDCB_TGENC_TUPM_CWLB_MODE_MASK  I40E_MASK(0x1, I40E_GLDCB_TGENC_TUPM_CWLB_MODE_SHIFT)
 
-#define I40E_PRTDCB_FCAH             0x001E24C0
+#define I40E_PRTDCB_FCAH             0x001E24C0 /* Reset: GLOBR */
 #define I40E_PRTDCB_FCAH_PFCAH_SHIFT 0
 #define I40E_PRTDCB_FCAH_PFCAH_MASK  I40E_MASK(0xFFFF, I40E_PRTDCB_FCAH_PFCAH_SHIFT)
 
-#define I40E_PRTDCB_FCAL             0x001E24A0
+#define I40E_PRTDCB_FCAL             0x001E24A0 /* Reset: GLOBR */
 #define I40E_PRTDCB_FCAL_PFCAL_SHIFT 0
 #define I40E_PRTDCB_FCAL_PFCAL_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTDCB_FCAL_PFCAL_SHIFT)
 
-#define I40E_PRTDCB_RETSTCS(_i)           (0x001222A0 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTDCB_RETSTCS(_i)           (0x001222A0 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRTDCB_RETSTCS_MAX_INDEX     7
 #define I40E_PRTDCB_RETSTCS_CREDITS_SHIFT 0
 #define I40E_PRTDCB_RETSTCS_CREDITS_MASK  I40E_MASK(0x1FFFFFFF, I40E_PRTDCB_RETSTCS_CREDITS_SHIFT)
 
-#define I40E_PRTDCB_RLANPMS               0x001223C0
+#define I40E_PRTDCB_RLANPMS               0x001223C0 /* Reset: CORER */
 #define I40E_PRTDCB_RLANPMS_LANRPPM_SHIFT 0
 #define I40E_PRTDCB_RLANPMS_LANRPPM_MASK  I40E_MASK(0x3FFFF, I40E_PRTDCB_RLANPMS_LANRPPM_SHIFT)
 
-#define I40E_PRTDCB_RPFCTOP                 0x001E2480
+#define I40E_PRTDCB_RPFCTOP                 0x001E2480 /* Reset: GLOBR */
 #define I40E_PRTDCB_RPFCTOP_PFCTYPE_SHIFT   0
 #define I40E_PRTDCB_RPFCTOP_PFCTYPE_MASK    I40E_MASK(0xFFFF, I40E_PRTDCB_RPFCTOP_PFCTYPE_SHIFT)
 #define I40E_PRTDCB_RPFCTOP_PFCOPCODE_SHIFT 16
 #define I40E_PRTDCB_RPFCTOP_PFCOPCODE_MASK  I40E_MASK(0xFFFF, I40E_PRTDCB_RPFCTOP_PFCOPCODE_SHIFT)
 
-#define I40E_PRTDCB_RPRRC               0x00122100
+#define I40E_PRTDCB_RPRRC               0x00122100 /* Reset: CORER */
 #define I40E_PRTDCB_RPRRC_BWSHARE_SHIFT 0
 #define I40E_PRTDCB_RPRRC_BWSHARE_MASK  I40E_MASK(0x3FF, I40E_PRTDCB_RPRRC_BWSHARE_SHIFT)
 
-#define I40E_PRTDCB_RPRRS               0x00122120
+#define I40E_PRTDCB_RPRRS               0x00122120 /* Reset: CORER */
 #define I40E_PRTDCB_RPRRS_CREDITS_SHIFT 0
 #define I40E_PRTDCB_RPRRS_CREDITS_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTDCB_RPRRS_CREDITS_SHIFT)
 
-#define I40E_PRTDCB_RRDMAPMS                0x00122160
+#define I40E_PRTDCB_RRDMAPMS                0x00122160 /* Reset: CORER */
 #define I40E_PRTDCB_RRDMAPMS_RDMARPPM_SHIFT 0
 #define I40E_PRTDCB_RRDMAPMS_RDMARPPM_MASK  I40E_MASK(0x3FFFF, I40E_PRTDCB_RRDMAPMS_RDMARPPM_SHIFT)
 
-#define I40E_PRTDCB_RUP_PPRS                0x000844C0
+#define I40E_PRTDCB_RUP_PPRS                0x000844C0 /* Reset: CORER */
 #define I40E_PRTDCB_RUP_PPRS_NOVLANUP_SHIFT 0
 #define I40E_PRTDCB_RUP_PPRS_NOVLANUP_MASK  I40E_MASK(0x7, I40E_PRTDCB_RUP_PPRS_NOVLANUP_SHIFT)
 
-#define I40E_PRTDCB_RUP_TDPU                0x00044120
+#define I40E_PRTDCB_RUP_TDPU                0x00044120 /* Reset: CORER */
 #define I40E_PRTDCB_RUP_TDPU_NOVLANUP_SHIFT 0
 #define I40E_PRTDCB_RUP_TDPU_NOVLANUP_MASK  I40E_MASK(0x7, I40E_PRTDCB_RUP_TDPU_NOVLANUP_SHIFT)
 
-#define I40E_PRTDCB_RUP2TC_RCB             0x00122280
+#define I40E_PRTDCB_RUP2TC_RCB             0x00122280 /* Reset: CORER */
 #define I40E_PRTDCB_RUP2TC_RCB_UP0TC_SHIFT 0
 #define I40E_PRTDCB_RUP2TC_RCB_UP0TC_MASK  I40E_MASK(0x7, I40E_PRTDCB_RUP2TC_RCB_UP0TC_SHIFT)
 #define I40E_PRTDCB_RUP2TC_RCB_UP1TC_SHIFT 3
@@ -575,39 +575,39 @@
 #define I40E_PRTDCB_RUP2TC_RCB_UP7TC_SHIFT 21
 #define I40E_PRTDCB_RUP2TC_RCB_UP7TC_MASK  I40E_MASK(0x7, I40E_PRTDCB_RUP2TC_RCB_UP7TC_SHIFT)
 
-#define I40E_PRTDCB_RUPTQ(_i)          (0x00122400 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTDCB_RUPTQ(_i)          (0x00122400 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRTDCB_RUPTQ_MAX_INDEX    7
 #define I40E_PRTDCB_RUPTQ_RXQNUM_SHIFT 0
 #define I40E_PRTDCB_RUPTQ_RXQNUM_MASK  I40E_MASK(0x3FFF, I40E_PRTDCB_RUPTQ_RXQNUM_SHIFT)
 
-#define I40E_PRTDCB_RUPTS(_i)            (0x00122500 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTDCB_RUPTS(_i)            (0x00122500 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRTDCB_RUPTS_MAX_INDEX      7
 #define I40E_PRTDCB_RUPTS_PFCTIMER_SHIFT 0
 #define I40E_PRTDCB_RUPTS_PFCTIMER_MASK  I40E_MASK(0x3FFF, I40E_PRTDCB_RUPTS_PFCTIMER_SHIFT)
 
-#define I40E_PRTDCB_TC2PFC_RCB              0x00122140
+#define I40E_PRTDCB_TC2PFC_RCB              0x00122140 /* Reset: CORER */
 #define I40E_PRTDCB_TC2PFC_RCB_TC2PFC_SHIFT 0
 #define I40E_PRTDCB_TC2PFC_RCB_TC2PFC_MASK  I40E_MASK(0xFF, I40E_PRTDCB_TC2PFC_RCB_TC2PFC_SHIFT)
 
-#define I40E_PRTDCB_TCLLPC                 0x000AE000
+#define I40E_PRTDCB_TCLLPC                 0x000AE000 /* Reset: CORER */
 #define I40E_PRTDCB_TCLLPC_LLMAXPCNT_SHIFT 0
 #define I40E_PRTDCB_TCLLPC_LLMAXPCNT_MASK  I40E_MASK(0xFFFF, I40E_PRTDCB_TCLLPC_LLMAXPCNT_SHIFT)
 #define I40E_PRTDCB_TCLLPC_BMAXPCNT_SHIFT  16
 #define I40E_PRTDCB_TCLLPC_BMAXPCNT_MASK   I40E_MASK(0xFFFF, I40E_PRTDCB_TCLLPC_BMAXPCNT_SHIFT)
 
-#define I40E_PRTDCB_TCLLPSB             0x000AE020
+#define I40E_PRTDCB_TCLLPSB             0x000AE020 /* Reset: CORER */
 #define I40E_PRTDCB_TCLLPSB_BPCNT_SHIFT 0
 #define I40E_PRTDCB_TCLLPSB_BPCNT_MASK  I40E_MASK(0x3FFFFFF, I40E_PRTDCB_TCLLPSB_BPCNT_SHIFT)
 
-#define I40E_PRTDCB_TCLLPSLL              0x000AE040
+#define I40E_PRTDCB_TCLLPSLL              0x000AE040 /* Reset: CORER */
 #define I40E_PRTDCB_TCLLPSLL_LLPCNT_SHIFT 0
 #define I40E_PRTDCB_TCLLPSLL_LLPCNT_MASK  I40E_MASK(0x3FFFFFF, I40E_PRTDCB_TCLLPSLL_LLPCNT_SHIFT)
 
-#define I40E_PRTDCB_TCPFCPC                 0x000A21C0
+#define I40E_PRTDCB_TCPFCPC                 0x000A21C0 /* Reset: CORER */
 #define I40E_PRTDCB_TCPFCPC_PORTOFFTH_SHIFT 0
 #define I40E_PRTDCB_TCPFCPC_PORTOFFTH_MASK  I40E_MASK(0x1FFF, I40E_PRTDCB_TCPFCPC_PORTOFFTH_SHIFT)
 
-#define I40E_PRTDCB_TCPFCTCC                    0x000A21E0
+#define I40E_PRTDCB_TCPFCTCC                    0x000A21E0 /* Reset: CORER */
 #define I40E_PRTDCB_TCPFCTCC_TCOFFTH_SHIFT      0
 #define I40E_PRTDCB_TCPFCTCC_TCOFFTH_MASK       I40E_MASK(0x1FFF, I40E_PRTDCB_TCPFCTCC_TCOFFTH_SHIFT)
 #define I40E_PRTDCB_TCPFCTCC_LL_PRI_TRESH_SHIFT 13
@@ -615,15 +615,15 @@
 #define I40E_PRTDCB_TCPFCTCC_LL_PRI_EN_SHIFT    31
 #define I40E_PRTDCB_TCPFCTCC_LL_PRI_EN_MASK     I40E_MASK(0x1, I40E_PRTDCB_TCPFCTCC_LL_PRI_EN_SHIFT)
 
-#define I40E_PRTDCB_TCWSP              0x000A2160
+#define I40E_PRTDCB_TCWSP              0x000A2160 /* Reset: CORER */
 #define I40E_PRTDCB_TCWSP_WSPORT_SHIFT 0
 #define I40E_PRTDCB_TCWSP_WSPORT_MASK  I40E_MASK(0xFFFFF, I40E_PRTDCB_TCWSP_WSPORT_SHIFT)
 
-#define I40E_PRTDCB_TDPMS           0x000A0000
+#define I40E_PRTDCB_TDPMS           0x000A0000 /* Reset: CORER */
 #define I40E_PRTDCB_TDPMS_DPM_SHIFT 0
 #define I40E_PRTDCB_TDPMS_DPM_MASK  I40E_MASK(0xFFFFF, I40E_PRTDCB_TDPMS_DPM_SHIFT)
 
-#define I40E_PRTDCB_TDPUC                   0x00044100
+#define I40E_PRTDCB_TDPUC                   0x00044100 /* Reset: CORER */
 #define I40E_PRTDCB_TDPUC_MAX_TXFRAME_SHIFT 0
 #define I40E_PRTDCB_TDPUC_MAX_TXFRAME_MASK  I40E_MASK(0xFFFF, I40E_PRTDCB_TDPUC_MAX_TXFRAME_SHIFT)
 #define I40E_PRTDCB_TDPUC_MAL_LENGTH_SHIFT  16
@@ -637,49 +637,49 @@
 #define I40E_PRTDCB_TDPUC_CLEAR_DROP_SHIFT  31
 #define I40E_PRTDCB_TDPUC_CLEAR_DROP_MASK   I40E_MASK(0x1, I40E_PRTDCB_TDPUC_CLEAR_DROP_SHIFT)
 
-#define I40E_PRTDCB_TFLLPC                 0x00098000
+#define I40E_PRTDCB_TFLLPC                 0x00098000 /* Reset: CORER */
 #define I40E_PRTDCB_TFLLPC_LLMAXPCNT_SHIFT 0
 #define I40E_PRTDCB_TFLLPC_LLMAXPCNT_MASK  I40E_MASK(0xFFFF, I40E_PRTDCB_TFLLPC_LLMAXPCNT_SHIFT)
 #define I40E_PRTDCB_TFLLPC_BMAXPCNT_SHIFT  16
 #define I40E_PRTDCB_TFLLPC_BMAXPCNT_MASK   I40E_MASK(0xFFFF, I40E_PRTDCB_TFLLPC_BMAXPCNT_SHIFT)
 
-#define I40E_PRTDCB_TFLLPSB             0x00098020
+#define I40E_PRTDCB_TFLLPSB             0x00098020 /* Reset: CORER */
 #define I40E_PRTDCB_TFLLPSB_BPCNT_SHIFT 0
 #define I40E_PRTDCB_TFLLPSB_BPCNT_MASK  I40E_MASK(0x3FFFFFF, I40E_PRTDCB_TFLLPSB_BPCNT_SHIFT)
 
-#define I40E_PRTDCB_TFLLPSLL              0x00098040
+#define I40E_PRTDCB_TFLLPSLL              0x00098040 /* Reset: CORER */
 #define I40E_PRTDCB_TFLLPSLL_LLPCNT_SHIFT 0
 #define I40E_PRTDCB_TFLLPSLL_LLPCNT_MASK  I40E_MASK(0x3FFFFFF, I40E_PRTDCB_TFLLPSLL_LLPCNT_SHIFT)
 
-#define I40E_PRTDCB_TFPFCC                 0x000A01A0
+#define I40E_PRTDCB_TFPFCC                 0x000A01A0 /* Reset: CORER */
 #define I40E_PRTDCB_TFPFCC_PORTOFFTH_SHIFT 0
 #define I40E_PRTDCB_TFPFCC_PORTOFFTH_MASK  I40E_MASK(0xFF, I40E_PRTDCB_TFPFCC_PORTOFFTH_SHIFT)
 #define I40E_PRTDCB_TFPFCC_TCOFFTH_SHIFT   8
 #define I40E_PRTDCB_TFPFCC_TCOFFTH_MASK    I40E_MASK(0xFF, I40E_PRTDCB_TFPFCC_TCOFFTH_SHIFT)
 
-#define I40E_PRTDCB_TFWSP              0x000A0140
+#define I40E_PRTDCB_TFWSP              0x000A0140 /* Reset: CORER */
 #define I40E_PRTDCB_TFWSP_WSPORT_SHIFT 0
 #define I40E_PRTDCB_TFWSP_WSPORT_MASK  I40E_MASK(0xFFFFF, I40E_PRTDCB_TFWSP_WSPORT_SHIFT)
 
-#define I40E_PRTDCB_TLANCPMS              0x000A2020
+#define I40E_PRTDCB_TLANCPMS              0x000A2020 /* Reset: CORER */
 #define I40E_PRTDCB_TLANCPMS_LANCPM_SHIFT 0
 #define I40E_PRTDCB_TLANCPMS_LANCPM_MASK  I40E_MASK(0xFFFFF, I40E_PRTDCB_TLANCPMS_LANCPM_SHIFT)
 
-#define I40E_PRTDCB_TLPMC              0x000A0160
+#define I40E_PRTDCB_TLPMC              0x000A0160 /* Reset: CORER */
 #define I40E_PRTDCB_TLPMC_TC2PFC_SHIFT 0
 #define I40E_PRTDCB_TLPMC_TC2PFC_MASK  I40E_MASK(0xFF, I40E_PRTDCB_TLPMC_TC2PFC_SHIFT)
 
-#define I40E_PRTDCB_TPFCTOP                 0x001E4540
+#define I40E_PRTDCB_TPFCTOP                 0x001E4540 /* Reset: GLOBR */
 #define I40E_PRTDCB_TPFCTOP_PFCTYPE_SHIFT   0
 #define I40E_PRTDCB_TPFCTOP_PFCTYPE_MASK    I40E_MASK(0xFFFF, I40E_PRTDCB_TPFCTOP_PFCTYPE_SHIFT)
 #define I40E_PRTDCB_TPFCTOP_PFCOPCODE_SHIFT 16
 #define I40E_PRTDCB_TPFCTOP_PFCOPCODE_MASK  I40E_MASK(0xFFFF, I40E_PRTDCB_TPFCTOP_PFCOPCODE_SHIFT)
 
-#define I40E_PRTDCB_TRDMACPMS               0x000A2000
+#define I40E_PRTDCB_TRDMACPMS               0x000A2000 /* Reset: CORER */
 #define I40E_PRTDCB_TRDMACPMS_RDMACPM_SHIFT 0
 #define I40E_PRTDCB_TRDMACPMS_RDMACPM_MASK  I40E_MASK(0xFFFFF, I40E_PRTDCB_TRDMACPMS_RDMACPM_SHIFT)
 
-#define I40E_PRTDCB_TUP2TC             0x001E4620
+#define I40E_PRTDCB_TUP2TC             0x001E4620 /* Reset: GLOBR */
 #define I40E_PRTDCB_TUP2TC_UP0TC_SHIFT 0
 #define I40E_PRTDCB_TUP2TC_UP0TC_MASK  I40E_MASK(0x7, I40E_PRTDCB_TUP2TC_UP0TC_SHIFT)
 #define I40E_PRTDCB_TUP2TC_UP1TC_SHIFT 3
@@ -697,31 +697,31 @@
 #define I40E_PRTDCB_TUP2TC_UP7TC_SHIFT 21
 #define I40E_PRTDCB_TUP2TC_UP7TC_MASK  I40E_MASK(0x7, I40E_PRTDCB_TUP2TC_UP7TC_SHIFT)
 
-#define I40E_PRTDCB_TUPMC              0x000A2140
+#define I40E_PRTDCB_TUPMC              0x000A2140 /* Reset: CORER */
 #define I40E_PRTDCB_TUPMC_TC2PFC_SHIFT 0
 #define I40E_PRTDCB_TUPMC_TC2PFC_MASK  I40E_MASK(0xFF, I40E_PRTDCB_TUPMC_TC2PFC_SHIFT)
 
 /* PF - FCoE Registers  */
 
-#define I40E_GLFCOE_ENA                0x001C0A28
+#define I40E_GLFCOE_ENA                0x001C0A28 /* Reset: CORER */
 #define I40E_GLFCOE_ENA_FCOE_ENA_SHIFT 0
 #define I40E_GLFCOE_ENA_FCOE_ENA_MASK  I40E_MASK(0x1, I40E_GLFCOE_ENA_FCOE_ENA_SHIFT)
 
-#define I40E_GLFCOE_ENA_TDPU                0x000442E4
+#define I40E_GLFCOE_ENA_TDPU                0x000442E4 /* Reset: CORER */
 #define I40E_GLFCOE_ENA_TDPU_FCOE_ENA_SHIFT 0
 #define I40E_GLFCOE_ENA_TDPU_FCOE_ENA_MASK  I40E_MASK(0x1, I40E_GLFCOE_ENA_TDPU_FCOE_ENA_SHIFT)
 
-#define I40E_GLFCOE_ENA_TLAN                0x000E6484
+#define I40E_GLFCOE_ENA_TLAN                0x000E6484 /* Reset: CORER */
 #define I40E_GLFCOE_ENA_TLAN_FCOE_ENA_SHIFT 0
 #define I40E_GLFCOE_ENA_TLAN_FCOE_ENA_MASK  I40E_MASK(0x1, I40E_GLFCOE_ENA_TLAN_FCOE_ENA_SHIFT)
 
-#define I40E_GLFCOE_RLANCTL                0x0012A508
+#define I40E_GLFCOE_RLANCTL                0x0012A508 /* Reset: CORER */
 #define I40E_GLFCOE_RLANCTL_FRSTDDPH_SHIFT 1
 #define I40E_GLFCOE_RLANCTL_FRSTDDPH_MASK  I40E_MASK(0x1, I40E_GLFCOE_RLANCTL_FRSTDDPH_SHIFT)
 #define I40E_GLFCOE_RLANCTL_ALLH_SHIFT     3
 #define I40E_GLFCOE_RLANCTL_ALLH_MASK      I40E_MASK(0x1, I40E_GLFCOE_RLANCTL_ALLH_SHIFT)
 
-#define I40E_GLFCOE_RSOF              0x00269B9C
+#define I40E_GLFCOE_RSOF              0x00269B9C /* Reset: CORER */
 #define I40E_GLFCOE_RSOF_SOF_I2_SHIFT 0
 #define I40E_GLFCOE_RSOF_SOF_I2_MASK  I40E_MASK(0xFF, I40E_GLFCOE_RSOF_SOF_I2_SHIFT)
 #define I40E_GLFCOE_RSOF_SOF_I3_SHIFT 8
@@ -731,7 +731,7 @@
 #define I40E_GLFCOE_RSOF_SOF_N3_SHIFT 24
 #define I40E_GLFCOE_RSOF_SOF_N3_MASK  I40E_MASK(0xFF, I40E_GLFCOE_RSOF_SOF_N3_SHIFT)
 
-#define I40E_GLFCOE_TEOF              0x000442EC
+#define I40E_GLFCOE_TEOF              0x000442EC /* Reset: CORER */
 #define I40E_GLFCOE_TEOF_EOF_N_SHIFT  0
 #define I40E_GLFCOE_TEOF_EOF_N_MASK   I40E_MASK(0xFF, I40E_GLFCOE_TEOF_EOF_N_SHIFT)
 #define I40E_GLFCOE_TEOF_EOF_T_SHIFT  8
@@ -741,7 +741,7 @@
 #define I40E_GLFCOE_TEOF_EOF_A_SHIFT  24
 #define I40E_GLFCOE_TEOF_EOF_A_MASK   I40E_MASK(0xFF, I40E_GLFCOE_TEOF_EOF_A_SHIFT)
 
-#define I40E_GLFCOE_TSOF              0x000442E8
+#define I40E_GLFCOE_TSOF              0x000442E8 /* Reset: CORER */
 #define I40E_GLFCOE_TSOF_SOF_I2_SHIFT 0
 #define I40E_GLFCOE_TSOF_SOF_I2_MASK  I40E_MASK(0xFF, I40E_GLFCOE_TSOF_SOF_I2_SHIFT)
 #define I40E_GLFCOE_TSOF_SOF_I3_SHIFT 8
@@ -751,7 +751,7 @@
 #define I40E_GLFCOE_TSOF_SOF_N3_SHIFT 24
 #define I40E_GLFCOE_TSOF_SOF_N3_MASK  I40E_MASK(0xFF, I40E_GLFCOE_TSOF_SOF_N3_SHIFT)
 
-#define I40E_PRTFCOE_REOF              0x000856A0
+#define I40E_PRTFCOE_REOF              0x000856A0 /* Reset: CORER */
 #define I40E_PRTFCOE_REOF_EOF_N_SHIFT  0
 #define I40E_PRTFCOE_REOF_EOF_N_MASK   I40E_MASK(0xFF, I40E_PRTFCOE_REOF_EOF_N_SHIFT)
 #define I40E_PRTFCOE_REOF_EOF_T_SHIFT  8
@@ -763,37 +763,37 @@
 
 /* PF - General Registers  */
 
-#define I40E_ECC_ENA               0x00092630
+#define I40E_ECC_ENA               0x00092630 /* Reset: CORER */
 #define I40E_ECC_ENA_ECC_ENA_SHIFT 0
 #define I40E_ECC_ENA_ECC_ENA_MASK  I40E_MASK(0x1, I40E_ECC_ENA_ECC_ENA_SHIFT)
 
-#define I40E_GLGEN_CSR_DEBUG_C                     0x00078E8C
+#define I40E_GLGEN_CSR_DEBUG_C                     0x00078E8C /* Reset: POR */
 #define I40E_GLGEN_CSR_DEBUG_C_CSR_ACCESS_EN_SHIFT 0
 #define I40E_GLGEN_CSR_DEBUG_C_CSR_ACCESS_EN_MASK  I40E_MASK(0x1, I40E_GLGEN_CSR_DEBUG_C_CSR_ACCESS_EN_SHIFT)
 #define I40E_GLGEN_CSR_DEBUG_C_CSR_ADDR_PROT_SHIFT 1
 #define I40E_GLGEN_CSR_DEBUG_C_CSR_ADDR_PROT_MASK  I40E_MASK(0x1, I40E_GLGEN_CSR_DEBUG_C_CSR_ADDR_PROT_SHIFT)
 
-#define I40E_GLGEN_CSR_DEBUG_F                   0x000B6138
+#define I40E_GLGEN_CSR_DEBUG_F                   0x000B6138 /* Reset: POR */
 #define I40E_GLGEN_CSR_DEBUG_F_CSR_PROT_EN_SHIFT 0
 #define I40E_GLGEN_CSR_DEBUG_F_CSR_PROT_EN_MASK  I40E_MASK(0x1, I40E_GLGEN_CSR_DEBUG_F_CSR_PROT_EN_SHIFT)
 
-#define I40E_GLGEN_DUAL40                     0x001C0A6C
+#define I40E_GLGEN_DUAL40                     0x001C0A6C /* Reset: CORER */
 #define I40E_GLGEN_DUAL40_DUAL_40G_MODE_SHIFT 0
 #define I40E_GLGEN_DUAL40_DUAL_40G_MODE_MASK  I40E_MASK(0x1, I40E_GLGEN_DUAL40_DUAL_40G_MODE_SHIFT)
 
-#define I40E_GLGEN_DUAL40_RPB                     0x000AC7E0
+#define I40E_GLGEN_DUAL40_RPB                     0x000AC7E0 /* Reset: CORER */
 #define I40E_GLGEN_DUAL40_RPB_DUAL_40G_MODE_SHIFT 0
 #define I40E_GLGEN_DUAL40_RPB_DUAL_40G_MODE_MASK  I40E_MASK(0x1, I40E_GLGEN_DUAL40_RPB_DUAL_40G_MODE_SHIFT)
 
-#define I40E_GLGEN_DUAL40_TLPM                     0x000A01C4
+#define I40E_GLGEN_DUAL40_TLPM                     0x000A01C4 /* Reset: CORER */
 #define I40E_GLGEN_DUAL40_TLPM_DUAL_40G_MODE_SHIFT 0
 #define I40E_GLGEN_DUAL40_TLPM_DUAL_40G_MODE_MASK  I40E_MASK(0x1, I40E_GLGEN_DUAL40_TLPM_DUAL_40G_MODE_SHIFT)
 
-#define I40E_GLGEN_DUAL40_TUPM                     0x000A2204
+#define I40E_GLGEN_DUAL40_TUPM                     0x000A2204 /* Reset: CORER */
 #define I40E_GLGEN_DUAL40_TUPM_DUAL_40G_MODE_SHIFT 0
 #define I40E_GLGEN_DUAL40_TUPM_DUAL_40G_MODE_MASK  I40E_MASK(0x1, I40E_GLGEN_DUAL40_TUPM_DUAL_40G_MODE_SHIFT)
 
-#define I40E_GLGEN_FWHWRCTRL                       0x00092610
+#define I40E_GLGEN_FWHWRCTRL                       0x00092610 /* Reset: CORER */
 #define I40E_GLGEN_FWHWRCTRL_PF_ENA_RST_DONE_SHIFT 0
 #define I40E_GLGEN_FWHWRCTRL_PF_ENA_RST_DONE_MASK  I40E_MASK(0x1, I40E_GLGEN_FWHWRCTRL_PF_ENA_RST_DONE_SHIFT)
 #define I40E_GLGEN_FWHWRCTRL_VF_ENA_RST_DONE_SHIFT 1
@@ -803,7 +803,7 @@
 #define I40E_GLGEN_FWHWRCTRL_PE_CPL_EN_SHIFT       31
 #define I40E_GLGEN_FWHWRCTRL_PE_CPL_EN_MASK        I40E_MASK(0x1, I40E_GLGEN_FWHWRCTRL_PE_CPL_EN_SHIFT)
 
-#define I40E_GLGEN_IMRTRIG              0x000B8194
+#define I40E_GLGEN_IMRTRIG              0x000B8194 /* Reset: CORER */
 #define I40E_GLGEN_IMRTRIG_CORER_SHIFT  0
 #define I40E_GLGEN_IMRTRIG_CORER_MASK   I40E_MASK(0x1, I40E_GLGEN_IMRTRIG_CORER_SHIFT)
 #define I40E_GLGEN_IMRTRIG_GLOBR_SHIFT  1
@@ -811,33 +811,39 @@
 #define I40E_GLGEN_IMRTRIG_EMPFWR_SHIFT 2
 #define I40E_GLGEN_IMRTRIG_EMPFWR_MASK  I40E_MASK(0x1, I40E_GLGEN_IMRTRIG_EMPFWR_SHIFT)
 
-#define I40E_GLGEN_MISC_CONFIG                              0x000B81A4
+#define I40E_GLGEN_MISC_CONFIG                              0x000B81A4 /* Reset: POR */
 #define I40E_GLGEN_MISC_CONFIG_SINGLE_10G_PORT_SELECT_SHIFT 0
 #define I40E_GLGEN_MISC_CONFIG_SINGLE_10G_PORT_SELECT_MASK  I40E_MASK(0x1, I40E_GLGEN_MISC_CONFIG_SINGLE_10G_PORT_SELECT_SHIFT)
 
-#define I40E_GLGEN_PCIFCNCNT_CSR                0x00078E84
+#define I40E_GLGEN_PCIFCNCNT_CSR                0x00078E84 /* Reset: PCIR */
 #define I40E_GLGEN_PCIFCNCNT_CSR_PCIPFCNT_SHIFT 0
 #define I40E_GLGEN_PCIFCNCNT_CSR_PCIPFCNT_MASK  I40E_MASK(0x1F, I40E_GLGEN_PCIFCNCNT_CSR_PCIPFCNT_SHIFT)
 #define I40E_GLGEN_PCIFCNCNT_CSR_PCIVFCNT_SHIFT 16
 #define I40E_GLGEN_PCIFCNCNT_CSR_PCIVFCNT_MASK  I40E_MASK(0xFF, I40E_GLGEN_PCIFCNCNT_CSR_PCIVFCNT_SHIFT)
 
-#define I40E_GLGEN_PCIFCNCNT_INT                0x0003F840
+#define I40E_GLGEN_PCIFCNCNT_INT                0x0003F840 /* Reset: CORER */
 #define I40E_GLGEN_PCIFCNCNT_INT_PCIPFCNT_SHIFT 0
 #define I40E_GLGEN_PCIFCNCNT_INT_PCIPFCNT_MASK  I40E_MASK(0x1F, I40E_GLGEN_PCIFCNCNT_INT_PCIPFCNT_SHIFT)
 #define I40E_GLGEN_PCIFCNCNT_INT_PCIVFCNT_SHIFT 16
 #define I40E_GLGEN_PCIFCNCNT_INT_PCIVFCNT_MASK  I40E_MASK(0xFF, I40E_GLGEN_PCIFCNCNT_INT_PCIVFCNT_SHIFT)
 
-#define I40E_GLGEN_PF_ACC_TO                 0x00078E88
+#define I40E_GLGEN_PE_ENA                      0x000B81A0 /* Reset: POR */
+#define I40E_GLGEN_PE_ENA_PE_ENA_SHIFT         0
+#define I40E_GLGEN_PE_ENA_PE_ENA_MASK          I40E_MASK(0x1, I40E_GLGEN_PE_ENA_PE_ENA_SHIFT)
+#define I40E_GLGEN_PE_ENA_PE_CLK_SRC_SEL_SHIFT 1
+#define I40E_GLGEN_PE_ENA_PE_CLK_SRC_SEL_MASK  I40E_MASK(0x3, I40E_GLGEN_PE_ENA_PE_CLK_SRC_SEL_SHIFT)
+
+#define I40E_GLGEN_PF_ACC_TO                 0x00078E88 /* Reset: POR */
 #define I40E_GLGEN_PF_ACC_TO_PF_ACC_TO_SHIFT 0
 #define I40E_GLGEN_PF_ACC_TO_PF_ACC_TO_MASK  I40E_MASK(0xFFFF, I40E_GLGEN_PF_ACC_TO_PF_ACC_TO_SHIFT)
 
-#define I40E_GLGEN_RSTSTAT_REQ                 0x00092620
+#define I40E_GLGEN_RSTSTAT_REQ                 0x00092620 /* Reset: CORER */
 #define I40E_GLGEN_RSTSTAT_REQ_RST_INDEX_SHIFT 0
 #define I40E_GLGEN_RSTSTAT_REQ_RST_INDEX_MASK  I40E_MASK(0x1FF, I40E_GLGEN_RSTSTAT_REQ_RST_INDEX_SHIFT)
 #define I40E_GLGEN_RSTSTAT_REQ_RST_TYPE_SHIFT  16
 #define I40E_GLGEN_RSTSTAT_REQ_RST_TYPE_MASK   I40E_MASK(0x3, I40E_GLGEN_RSTSTAT_REQ_RST_TYPE_SHIFT)
 
-#define I40E_GLGEN_RSTSTATUS                   0x00092624
+#define I40E_GLGEN_RSTSTATUS                   0x00092624 /* Reset: CORER */
 #define I40E_GLGEN_RSTSTATUS_TDPU_CNT_SHIFT    0
 #define I40E_GLGEN_RSTSTATUS_TDPU_CNT_MASK     I40E_MASK(0x1F, I40E_GLGEN_RSTSTATUS_TDPU_CNT_SHIFT)
 #define I40E_GLGEN_RSTSTATUS_RDPU_CNT_SHIFT    8
@@ -869,56 +875,56 @@
 #define I40E_GLGEN_RSTSTATUS_HW_DONE_SHIFT     31
 #define I40E_GLGEN_RSTSTATUS_HW_DONE_MASK      I40E_MASK(0x1, I40E_GLGEN_RSTSTATUS_HW_DONE_SHIFT)
 
-#define I40E_GLMNG_WD_ENA                     0x000B8198
+#define I40E_GLMNG_WD_ENA                     0x000B8198 /* Reset: POR */
 #define I40E_GLMNG_WD_ENA_FW_RST_WD_ENA_SHIFT 0
 #define I40E_GLMNG_WD_ENA_FW_RST_WD_ENA_MASK  I40E_MASK(0x1, I40E_GLMNG_WD_ENA_FW_RST_WD_ENA_SHIFT)
 #define I40E_GLMNG_WD_ENA_ECC_RST_ENA_SHIFT   1
 #define I40E_GLMNG_WD_ENA_ECC_RST_ENA_MASK    I40E_MASK(0x1, I40E_GLMNG_WD_ENA_ECC_RST_ENA_SHIFT)
 
-#define I40E_GLPHY_ANA_ADD               0x000BA008
+#define I40E_GLPHY_ANA_ADD               0x000BA008 /* Reset: POR */
 #define I40E_GLPHY_ANA_ADD_ADDRESS_SHIFT 0
 #define I40E_GLPHY_ANA_ADD_ADDRESS_MASK  I40E_MASK(0xFFFF, I40E_GLPHY_ANA_ADD_ADDRESS_SHIFT)
 #define I40E_GLPHY_ANA_ADD_BYTE_EN_SHIFT 28
 #define I40E_GLPHY_ANA_ADD_BYTE_EN_MASK  I40E_MASK(0xF, I40E_GLPHY_ANA_ADD_BYTE_EN_SHIFT)
 
-#define I40E_GLPHY_ANA_DATA            0x000BA00C
+#define I40E_GLPHY_ANA_DATA            0x000BA00C /* Reset: POR */
 #define I40E_GLPHY_ANA_DATA_DATA_SHIFT 0
 #define I40E_GLPHY_ANA_DATA_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPHY_ANA_DATA_DATA_SHIFT)
 
-#define I40E_PFGEN_FWHWRSTAT                        0x00092480
+#define I40E_PFGEN_FWHWRSTAT                        0x00092480 /* Reset: CORER */
 #define I40E_PFGEN_FWHWRSTAT_FW_RST_DONE_SHIFT      0
 #define I40E_PFGEN_FWHWRSTAT_FW_RST_DONE_MASK       I40E_MASK(0x1, I40E_PFGEN_FWHWRSTAT_FW_RST_DONE_SHIFT)
 #define I40E_PFGEN_FWHWRSTAT_HW_ONLY_RST_DONE_SHIFT 31
 #define I40E_PFGEN_FWHWRSTAT_HW_ONLY_RST_DONE_MASK  I40E_MASK(0x1, I40E_PFGEN_FWHWRSTAT_HW_ONLY_RST_DONE_SHIFT)
 
-#define I40E_PFGEN_PORTNUM_CAR                0x000B8000
+#define I40E_PFGEN_PORTNUM_CAR                0x000B8000 /* Reset: POR */
 #define I40E_PFGEN_PORTNUM_CAR_PORT_NUM_SHIFT 0
 #define I40E_PFGEN_PORTNUM_CAR_PORT_NUM_MASK  I40E_MASK(0x3, I40E_PFGEN_PORTNUM_CAR_PORT_NUM_SHIFT)
 
-#define I40E_PFGEN_PORTNUM_CSR                0x00078D00
+#define I40E_PFGEN_PORTNUM_CSR                0x00078D00 /* Reset: CORER */
 #define I40E_PFGEN_PORTNUM_CSR_PORT_NUM_SHIFT 0
 #define I40E_PFGEN_PORTNUM_CSR_PORT_NUM_MASK  I40E_MASK(0x3, I40E_PFGEN_PORTNUM_CSR_PORT_NUM_SHIFT)
 
-#define I40E_PFGEN_PORTNUM_PM                0x0006B800
+#define I40E_PFGEN_PORTNUM_PM                0x0006B800 /* Reset: CORER */
 #define I40E_PFGEN_PORTNUM_PM_PORT_NUM_SHIFT 0
 #define I40E_PFGEN_PORTNUM_PM_PORT_NUM_MASK  I40E_MASK(0x3, I40E_PFGEN_PORTNUM_PM_PORT_NUM_SHIFT)
 
-#define I40E_PFGEN_PORTNUM_RCB                0x00122000
+#define I40E_PFGEN_PORTNUM_RCB                0x00122000 /* Reset: CORER */
 #define I40E_PFGEN_PORTNUM_RCB_PORT_NUM_SHIFT 0
 #define I40E_PFGEN_PORTNUM_RCB_PORT_NUM_MASK  I40E_MASK(0x3, I40E_PFGEN_PORTNUM_RCB_PORT_NUM_SHIFT)
 
-#define I40E_PFGEN_PORTNUM_TSCD                0x000B2240
+#define I40E_PFGEN_PORTNUM_TSCD                0x000B2240 /* Reset: CORER */
 #define I40E_PFGEN_PORTNUM_TSCD_PORT_NUM_SHIFT 0
 #define I40E_PFGEN_PORTNUM_TSCD_PORT_NUM_MASK  I40E_MASK(0x3, I40E_PFGEN_PORTNUM_TSCD_PORT_NUM_SHIFT)
 
-#define I40E_VPGEN_FWHWRSTAT(_VF)                   (0x00092000 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VPGEN_FWHWRSTAT(_VF)                   (0x00092000 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_VPGEN_FWHWRSTAT_MAX_INDEX              127
 #define I40E_VPGEN_FWHWRSTAT_FW_RST_DONE_SHIFT      0
 #define I40E_VPGEN_FWHWRSTAT_FW_RST_DONE_MASK       I40E_MASK(0x1, I40E_VPGEN_FWHWRSTAT_FW_RST_DONE_SHIFT)
 #define I40E_VPGEN_FWHWRSTAT_HW_ONLY_RST_DONE_SHIFT 31
 #define I40E_VPGEN_FWHWRSTAT_HW_ONLY_RST_DONE_MASK  I40E_MASK(0x1, I40E_VPGEN_FWHWRSTAT_HW_ONLY_RST_DONE_SHIFT)
 
-#define I40E_VSIGEN_FWHWRSTAT(_VSI)                  (0x00091000 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSIGEN_FWHWRSTAT(_VSI)                  (0x00091000 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: CORER */
 #define I40E_VSIGEN_FWHWRSTAT_MAX_INDEX              383
 #define I40E_VSIGEN_FWHWRSTAT_FW_RST_DONE_SHIFT      0
 #define I40E_VSIGEN_FWHWRSTAT_FW_RST_DONE_MASK       I40E_MASK(0x1, I40E_VSIGEN_FWHWRSTAT_FW_RST_DONE_SHIFT)
@@ -927,13 +933,13 @@
 
 /* PF - HMC Registers */
 
-#define I40E_GLFOC_CECC_ERR                         0x000AA0D4
+#define I40E_GLFOC_CECC_ERR                         0x000AA0D4 /* Reset: POR */
 #define I40E_GLFOC_CECC_ERR_UNCOR_ECC_ERR_CNT_SHIFT 0
 #define I40E_GLFOC_CECC_ERR_UNCOR_ECC_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_GLFOC_CECC_ERR_UNCOR_ECC_ERR_CNT_SHIFT)
 #define I40E_GLFOC_CECC_ERR_COR_ECC_ERR_CNT_SHIFT   16
 #define I40E_GLFOC_CECC_ERR_COR_ECC_ERR_CNT_MASK    I40E_MASK(0xFFF, I40E_GLFOC_CECC_ERR_COR_ECC_ERR_CNT_SHIFT)
 
-#define I40E_GLFOC_ECC_CTL                           0x000AA0CC
+#define I40E_GLFOC_ECC_CTL                           0x000AA0CC /* Reset: POR */
 #define I40E_GLFOC_ECC_CTL_HOST_ECC_EN_SHIFT         0
 #define I40E_GLFOC_ECC_CTL_HOST_ECC_EN_MASK          I40E_MASK(0x1, I40E_GLFOC_ECC_CTL_HOST_ECC_EN_SHIFT)
 #define I40E_GLFOC_ECC_CTL_HOST_ECC_MASK_INT_SHIFT   1
@@ -951,7 +957,7 @@
 #define I40E_GLFOC_ECC_CTL_CLIENT_ECC_INVERT2_SHIFT  7
 #define I40E_GLFOC_ECC_CTL_CLIENT_ECC_INVERT2_MASK   I40E_MASK(0x1, I40E_GLFOC_ECC_CTL_CLIENT_ECC_INVERT2_SHIFT)
 
-#define I40E_GLFOC_ERRDATA0                  0x000AA0C0
+#define I40E_GLFOC_ERRDATA0                  0x000AA0C0 /* Reset: POR */
 #define I40E_GLFOC_ERRDATA0_ERROR_CODE_SHIFT 0
 #define I40E_GLFOC_ERRDATA0_ERROR_CODE_MASK  I40E_MASK(0x3F, I40E_GLFOC_ERRDATA0_ERROR_CODE_SHIFT)
 #define I40E_GLFOC_ERRDATA0_OBJ_TYPE_SHIFT   8
@@ -963,11 +969,11 @@
 #define I40E_GLFOC_ERRDATA0_PF_NUM_SHIFT     24
 #define I40E_GLFOC_ERRDATA0_PF_NUM_MASK      I40E_MASK(0xF, I40E_GLFOC_ERRDATA0_PF_NUM_SHIFT)
 
-#define I40E_GLFOC_ERRDATA1                 0x000AA0C4
+#define I40E_GLFOC_ERRDATA1                 0x000AA0C4 /* Reset: POR */
 #define I40E_GLFOC_ERRDATA1_OBJ_INDEX_SHIFT 0
 #define I40E_GLFOC_ERRDATA1_OBJ_INDEX_MASK  I40E_MASK(0xFFFFFFF, I40E_GLFOC_ERRDATA1_OBJ_INDEX_SHIFT)
 
-#define I40E_GLFOC_ERRDATA2              0x000AA0C8
+#define I40E_GLFOC_ERRDATA2              0x000AA0C8 /* Reset: POR */
 #define I40E_GLFOC_ERRDATA2_LENGTH_SHIFT 0
 #define I40E_GLFOC_ERRDATA2_LENGTH_MASK  I40E_MASK(0x7F, I40E_GLFOC_ERRDATA2_LENGTH_SHIFT)
 #define I40E_GLFOC_ERRDATA2_OFFSET_SHIFT 7
@@ -977,111 +983,111 @@
 #define I40E_GLFOC_ERRDATA2_TAG_SHIFT    23
 #define I40E_GLFOC_ERRDATA2_TAG_MASK     I40E_MASK(0x1FF, I40E_GLFOC_ERRDATA2_TAG_SHIFT)
 
-#define I40E_GLFOC_ERRINFO                   0x000AA0BC
+#define I40E_GLFOC_ERRINFO                   0x000AA0BC /* Reset: POR */
 #define I40E_GLFOC_ERRINFO_ERROR_VALID_SHIFT 0
 #define I40E_GLFOC_ERRINFO_ERROR_VALID_MASK  I40E_MASK(0x1, I40E_GLFOC_ERRINFO_ERROR_VALID_SHIFT)
 #define I40E_GLFOC_ERRINFO_ERROR_CNT_SHIFT   8
 #define I40E_GLFOC_ERRINFO_ERROR_CNT_MASK    I40E_MASK(0xFF, I40E_GLFOC_ERRINFO_ERROR_CNT_SHIFT)
 
-#define I40E_GLFOC_FCOEHTE_OBJOFST                       0x000AA050
+#define I40E_GLFOC_FCOEHTE_OBJOFST                       0x000AA050 /* Reset: CORER */
 #define I40E_GLFOC_FCOEHTE_OBJOFST_OBJ_TYPE_OFFSET_SHIFT 0
 #define I40E_GLFOC_FCOEHTE_OBJOFST_OBJ_TYPE_OFFSET_MASK  I40E_MASK(0x3FF, I40E_GLFOC_FCOEHTE_OBJOFST_OBJ_TYPE_OFFSET_SHIFT)
 
-#define I40E_GLFOC_HECC_ERR                         0x000AA0D0
+#define I40E_GLFOC_HECC_ERR                         0x000AA0D0 /* Reset: POR */
 #define I40E_GLFOC_HECC_ERR_UNCOR_ECC_ERR_CNT_SHIFT 0
 #define I40E_GLFOC_HECC_ERR_UNCOR_ECC_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_GLFOC_HECC_ERR_UNCOR_ECC_ERR_CNT_SHIFT)
 #define I40E_GLFOC_HECC_ERR_COR_ECC_ERR_CNT_SHIFT   16
 #define I40E_GLFOC_HECC_ERR_COR_ECC_ERR_CNT_MASK    I40E_MASK(0xFFF, I40E_GLFOC_HECC_ERR_COR_ECC_ERR_CNT_SHIFT)
 
-#define I40E_GLFOC_LAN32BRSV_OBJOFST                       0x000AA058
+#define I40E_GLFOC_LAN32BRSV_OBJOFST                       0x000AA058 /* Reset: CORER */
 #define I40E_GLFOC_LAN32BRSV_OBJOFST_OBJ_TYPE_OFFSET_SHIFT 0
 #define I40E_GLFOC_LAN32BRSV_OBJOFST_OBJ_TYPE_OFFSET_MASK  I40E_MASK(0x3FF, I40E_GLFOC_LAN32BRSV_OBJOFST_OBJ_TYPE_OFFSET_SHIFT)
 
-#define I40E_GLFOC_LAN64BRSV0_OBJOFST                       0x000AA05C
+#define I40E_GLFOC_LAN64BRSV0_OBJOFST                       0x000AA05C /* Reset: CORER */
 #define I40E_GLFOC_LAN64BRSV0_OBJOFST_OBJ_TYPE_OFFSET_SHIFT 0
 #define I40E_GLFOC_LAN64BRSV0_OBJOFST_OBJ_TYPE_OFFSET_MASK  I40E_MASK(0x3FF, I40E_GLFOC_LAN64BRSV0_OBJOFST_OBJ_TYPE_OFFSET_SHIFT)
 
-#define I40E_GLFOC_LAN64BRSV1_OBJOFST                       0x000AA060
+#define I40E_GLFOC_LAN64BRSV1_OBJOFST                       0x000AA060 /* Reset: CORER */
 #define I40E_GLFOC_LAN64BRSV1_OBJOFST_OBJ_TYPE_OFFSET_SHIFT 0
 #define I40E_GLFOC_LAN64BRSV1_OBJOFST_OBJ_TYPE_OFFSET_MASK  I40E_MASK(0x3FF, I40E_GLFOC_LAN64BRSV1_OBJOFST_OBJ_TYPE_OFFSET_SHIFT)
 
-#define I40E_GLFOC_QUADHTE_OBJOFST                       0x000AA054
+#define I40E_GLFOC_QUADHTE_OBJOFST                       0x000AA054 /* Reset: CORER */
 #define I40E_GLFOC_QUADHTE_OBJOFST_OBJ_TYPE_OFFSET_SHIFT 0
 #define I40E_GLFOC_QUADHTE_OBJOFST_OBJ_TYPE_OFFSET_MASK  I40E_MASK(0x3FF, I40E_GLFOC_QUADHTE_OBJOFST_OBJ_TYPE_OFFSET_SHIFT)
 
-#define I40E_GLFOC_STAT_CTL                   0x000AA008
+#define I40E_GLFOC_STAT_CTL                   0x000AA008 /* Reset: CORER */
 #define I40E_GLFOC_STAT_CTL_OBJECT_TYPE_SHIFT 0
 #define I40E_GLFOC_STAT_CTL_OBJECT_TYPE_MASK  I40E_MASK(0x1F, I40E_GLFOC_STAT_CTL_OBJECT_TYPE_SHIFT)
 
-#define I40E_GLFOC_STAT_OBJ_CNT                    0x000AA00C
+#define I40E_GLFOC_STAT_OBJ_CNT                    0x000AA00C /* Reset: CORER */
 #define I40E_GLFOC_STAT_OBJ_CNT_OBJECT_COUNT_SHIFT 0
 #define I40E_GLFOC_STAT_OBJ_CNT_OBJECT_COUNT_MASK  I40E_MASK(0x3FFF, I40E_GLFOC_STAT_OBJ_CNT_OBJECT_COUNT_SHIFT)
 
-#define I40E_GLFOC_STAT_RD_DATA_IDLE_HI              0x000AA034
+#define I40E_GLFOC_STAT_RD_DATA_IDLE_HI              0x000AA034 /* Reset: CORER */
 #define I40E_GLFOC_STAT_RD_DATA_IDLE_HI_CNT_HI_SHIFT 0
 #define I40E_GLFOC_STAT_RD_DATA_IDLE_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLFOC_STAT_RD_DATA_IDLE_HI_CNT_HI_SHIFT)
 
-#define I40E_GLFOC_STAT_RD_DATA_IDLE_LO              0x000AA030
+#define I40E_GLFOC_STAT_RD_DATA_IDLE_LO              0x000AA030 /* Reset: CORER */
 #define I40E_GLFOC_STAT_RD_DATA_IDLE_LO_CNT_LO_SHIFT 0
 #define I40E_GLFOC_STAT_RD_DATA_IDLE_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLFOC_STAT_RD_DATA_IDLE_LO_CNT_LO_SHIFT)
 
-#define I40E_GLFOC_STAT_RD_DATA_XFER_HI              0x000AA03C
+#define I40E_GLFOC_STAT_RD_DATA_XFER_HI              0x000AA03C /* Reset: CORER */
 #define I40E_GLFOC_STAT_RD_DATA_XFER_HI_CNT_HI_SHIFT 0
 #define I40E_GLFOC_STAT_RD_DATA_XFER_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLFOC_STAT_RD_DATA_XFER_HI_CNT_HI_SHIFT)
 
-#define I40E_GLFOC_STAT_RD_DATA_XFER_LO              0x000AA038
+#define I40E_GLFOC_STAT_RD_DATA_XFER_LO              0x000AA038 /* Reset: CORER */
 #define I40E_GLFOC_STAT_RD_DATA_XFER_LO_CNT_LO_SHIFT 0
 #define I40E_GLFOC_STAT_RD_DATA_XFER_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLFOC_STAT_RD_DATA_XFER_LO_CNT_LO_SHIFT)
 
-#define I40E_GLFOC_STAT_RD_HIT_HI              0x000AA014
+#define I40E_GLFOC_STAT_RD_HIT_HI              0x000AA014 /* Reset: CORER */
 #define I40E_GLFOC_STAT_RD_HIT_HI_CNT_HI_SHIFT 0
 #define I40E_GLFOC_STAT_RD_HIT_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLFOC_STAT_RD_HIT_HI_CNT_HI_SHIFT)
 
-#define I40E_GLFOC_STAT_RD_HIT_LO              0x000AA010
+#define I40E_GLFOC_STAT_RD_HIT_LO              0x000AA010 /* Reset: CORER */
 #define I40E_GLFOC_STAT_RD_HIT_LO_CNT_LO_SHIFT 0
 #define I40E_GLFOC_STAT_RD_HIT_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLFOC_STAT_RD_HIT_LO_CNT_LO_SHIFT)
 
-#define I40E_GLFOC_STAT_RD_MISS_HI              0x000AA01C
+#define I40E_GLFOC_STAT_RD_MISS_HI              0x000AA01C /* Reset: CORER */
 #define I40E_GLFOC_STAT_RD_MISS_HI_CNT_HI_SHIFT 0
 #define I40E_GLFOC_STAT_RD_MISS_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLFOC_STAT_RD_MISS_HI_CNT_HI_SHIFT)
 
-#define I40E_GLFOC_STAT_RD_MISS_LO              0x000AA018
+#define I40E_GLFOC_STAT_RD_MISS_LO              0x000AA018 /* Reset: CORER */
 #define I40E_GLFOC_STAT_RD_MISS_LO_CNT_LO_SHIFT 0
 #define I40E_GLFOC_STAT_RD_MISS_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLFOC_STAT_RD_MISS_LO_CNT_LO_SHIFT)
 
-#define I40E_GLFOC_STAT_WR_DATA_IDLE_HI              0x000AA044
+#define I40E_GLFOC_STAT_WR_DATA_IDLE_HI              0x000AA044 /* Reset: CORER */
 #define I40E_GLFOC_STAT_WR_DATA_IDLE_HI_CNT_HI_SHIFT 0
 #define I40E_GLFOC_STAT_WR_DATA_IDLE_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLFOC_STAT_WR_DATA_IDLE_HI_CNT_HI_SHIFT)
 
-#define I40E_GLFOC_STAT_WR_DATA_IDLE_LO              0x000AA040
+#define I40E_GLFOC_STAT_WR_DATA_IDLE_LO              0x000AA040 /* Reset: CORER */
 #define I40E_GLFOC_STAT_WR_DATA_IDLE_LO_CNT_LO_SHIFT 0
 #define I40E_GLFOC_STAT_WR_DATA_IDLE_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLFOC_STAT_WR_DATA_IDLE_LO_CNT_LO_SHIFT)
 
-#define I40E_GLFOC_STAT_WR_DATA_XFER_HI              0x000AA04C
+#define I40E_GLFOC_STAT_WR_DATA_XFER_HI              0x000AA04C /* Reset: CORER */
 #define I40E_GLFOC_STAT_WR_DATA_XFER_HI_CNT_HI_SHIFT 0
 #define I40E_GLFOC_STAT_WR_DATA_XFER_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLFOC_STAT_WR_DATA_XFER_HI_CNT_HI_SHIFT)
 
-#define I40E_GLFOC_STAT_WR_DATA_XFER_LO              0x000AA048
+#define I40E_GLFOC_STAT_WR_DATA_XFER_LO              0x000AA048 /* Reset: CORER */
 #define I40E_GLFOC_STAT_WR_DATA_XFER_LO_CNT_LO_SHIFT 0
 #define I40E_GLFOC_STAT_WR_DATA_XFER_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLFOC_STAT_WR_DATA_XFER_LO_CNT_LO_SHIFT)
 
-#define I40E_GLFOC_STAT_WR_HIT_HI              0x000AA024
+#define I40E_GLFOC_STAT_WR_HIT_HI              0x000AA024 /* Reset: CORER */
 #define I40E_GLFOC_STAT_WR_HIT_HI_CNT_HI_SHIFT 0
 #define I40E_GLFOC_STAT_WR_HIT_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLFOC_STAT_WR_HIT_HI_CNT_HI_SHIFT)
 
-#define I40E_GLFOC_STAT_WR_HIT_LO              0x000AA020
+#define I40E_GLFOC_STAT_WR_HIT_LO              0x000AA020 /* Reset: CORER */
 #define I40E_GLFOC_STAT_WR_HIT_LO_CNT_LO_SHIFT 0
 #define I40E_GLFOC_STAT_WR_HIT_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLFOC_STAT_WR_HIT_LO_CNT_LO_SHIFT)
 
-#define I40E_GLFOC_STAT_WR_MISS_HI              0x000AA02C
+#define I40E_GLFOC_STAT_WR_MISS_HI              0x000AA02C /* Reset: CORER */
 #define I40E_GLFOC_STAT_WR_MISS_HI_CNT_HI_SHIFT 0
 #define I40E_GLFOC_STAT_WR_MISS_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLFOC_STAT_WR_MISS_HI_CNT_HI_SHIFT)
 
-#define I40E_GLFOC_STAT_WR_MISS_LO              0x000AA028
+#define I40E_GLFOC_STAT_WR_MISS_LO              0x000AA028 /* Reset: CORER */
 #define I40E_GLFOC_STAT_WR_MISS_LO_CNT_LO_SHIFT 0
 #define I40E_GLFOC_STAT_WR_MISS_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLFOC_STAT_WR_MISS_LO_CNT_LO_SHIFT)
 
-#define I40E_GLHMC_EMPOBJCACHECTL0                      0x000C20dc
+#define I40E_GLHMC_EMPOBJCACHECTL0                      0x000C20dc /* Reset: CORER */
 #define I40E_GLHMC_EMPOBJCACHECTL0_OBJ_PF_NUM_SHIFT     0
 #define I40E_GLHMC_EMPOBJCACHECTL0_OBJ_PF_NUM_MASK      I40E_MASK(0xF, I40E_GLHMC_EMPOBJCACHECTL0_OBJ_PF_NUM_SHIFT)
 #define I40E_GLHMC_EMPOBJCACHECTL0_OBJ_TYPE_SHIFT       8
@@ -1097,17 +1103,17 @@
 #define I40E_GLHMC_EMPOBJCACHECTL0_CMD_DONE_SHIFT       31
 #define I40E_GLHMC_EMPOBJCACHECTL0_CMD_DONE_MASK        I40E_MASK(0x1, I40E_GLHMC_EMPOBJCACHECTL0_CMD_DONE_SHIFT)
 
-#define I40E_GLHMC_EMPOBJCACHECTL1                 0x000C20e0
+#define I40E_GLHMC_EMPOBJCACHECTL1                 0x000C20e0 /* Reset: CORER */
 #define I40E_GLHMC_EMPOBJCACHECTL1_OBJ_INDEX_SHIFT 0
 #define I40E_GLHMC_EMPOBJCACHECTL1_OBJ_INDEX_MASK  I40E_MASK(0xFFFFFFF, I40E_GLHMC_EMPOBJCACHECTL1_OBJ_INDEX_SHIFT)
 
-#define I40E_GLHMC_FWPDINV               0x000C207c
+#define I40E_GLHMC_FWPDINV               0x000C207c /* Reset: CORER */
 #define I40E_GLHMC_FWPDINV_PMSDIDX_SHIFT 0
 #define I40E_GLHMC_FWPDINV_PMSDIDX_MASK  I40E_MASK(0xFFF, I40E_GLHMC_FWPDINV_PMSDIDX_SHIFT)
 #define I40E_GLHMC_FWPDINV_PMPDIDX_SHIFT 16
 #define I40E_GLHMC_FWPDINV_PMPDIDX_MASK  I40E_MASK(0x1FF, I40E_GLHMC_FWPDINV_PMPDIDX_SHIFT)
 
-#define I40E_GLHMC_FWSDCMD                0x000C2070
+#define I40E_GLHMC_FWSDCMD                0x000C2070 /* Reset: CORER */
 #define I40E_GLHMC_FWSDCMD_PMSDIDX_SHIFT  0
 #define I40E_GLHMC_FWSDCMD_PMSDIDX_MASK   I40E_MASK(0xFFF, I40E_GLHMC_FWSDCMD_PMSDIDX_SHIFT)
 #define I40E_GLHMC_FWSDCMD_PF_SHIFT       16
@@ -1119,11 +1125,11 @@
 #define I40E_GLHMC_FWSDCMD_PMSDWR_SHIFT   31
 #define I40E_GLHMC_FWSDCMD_PMSDWR_MASK    I40E_MASK(0x1, I40E_GLHMC_FWSDCMD_PMSDWR_SHIFT)
 
-#define I40E_GLHMC_FWSDDATAHIGH                    0x000C2078
+#define I40E_GLHMC_FWSDDATAHIGH                    0x000C2078 /* Reset: CORER */
 #define I40E_GLHMC_FWSDDATAHIGH_PMSDDATAHIGH_SHIFT 0
 #define I40E_GLHMC_FWSDDATAHIGH_PMSDDATAHIGH_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLHMC_FWSDDATAHIGH_PMSDDATAHIGH_SHIFT)
 
-#define I40E_GLHMC_FWSDDATALOW                   0x000C2074
+#define I40E_GLHMC_FWSDDATALOW                   0x000C2074 /* Reset: CORER */
 #define I40E_GLHMC_FWSDDATALOW_PMSDVALID_SHIFT   0
 #define I40E_GLHMC_FWSDDATALOW_PMSDVALID_MASK    I40E_MASK(0x1, I40E_GLHMC_FWSDDATALOW_PMSDVALID_SHIFT)
 #define I40E_GLHMC_FWSDDATALOW_PMSDTYPE_SHIFT    1
@@ -1133,61 +1139,61 @@
 #define I40E_GLHMC_FWSDDATALOW_PMSDDATALOW_SHIFT 12
 #define I40E_GLHMC_FWSDDATALOW_PMSDDATALOW_MASK  I40E_MASK(0xFFFFF, I40E_GLHMC_FWSDDATALOW_PMSDDATALOW_SHIFT)
 
-#define I40E_GLHMC_LAN32BRSVDBASE(_i)                     (0x000C6a00 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_LAN32BRSVDBASE(_i)                     (0x000C6a00 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_LAN32BRSVDBASE_MAX_INDEX               15
 #define I40E_GLHMC_LAN32BRSVDBASE_FPMLAN32BRSVDBASE_SHIFT 0
 #define I40E_GLHMC_LAN32BRSVDBASE_FPMLAN32BRSVDBASE_MASK  I40E_MASK(0xFFFFFF, I40E_GLHMC_LAN32BRSVDBASE_FPMLAN32BRSVDBASE_SHIFT)
 
-#define I40E_GLHMC_LAN32BRSVDCNT(_i)                    (0x000C6b00 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_LAN32BRSVDCNT(_i)                    (0x000C6b00 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_LAN32BRSVDCNT_MAX_INDEX              15
 #define I40E_GLHMC_LAN32BRSVDCNT_FPMLAN32BRSVDCNT_SHIFT 0
 #define I40E_GLHMC_LAN32BRSVDCNT_FPMLAN32BRSVDCNT_MASK  I40E_MASK(0x1FFFFFFF, I40E_GLHMC_LAN32BRSVDCNT_FPMLAN32BRSVDCNT_SHIFT)
 
-#define I40E_GLHMC_LAN32BRSVDMAX                       0x000C209C
+#define I40E_GLHMC_LAN32BRSVDMAX                       0x000C209C /* Reset: CORER */
 #define I40E_GLHMC_LAN32BRSVDMAX_PMLAN32BRSVDMAX_SHIFT 0
 #define I40E_GLHMC_LAN32BRSVDMAX_PMLAN32BRSVDMAX_MASK  I40E_MASK(0x1FFFFFFF, I40E_GLHMC_LAN32BRSVDMAX_PMLAN32BRSVDMAX_SHIFT)
 
-#define I40E_GLHMC_LAN32BRSVDOBJSZ                         0x000C2098
+#define I40E_GLHMC_LAN32BRSVDOBJSZ                         0x000C2098 /* Reset: CORER */
 #define I40E_GLHMC_LAN32BRSVDOBJSZ_PMLAN32BRSVDOBJSZ_SHIFT 0
 #define I40E_GLHMC_LAN32BRSVDOBJSZ_PMLAN32BRSVDOBJSZ_MASK  I40E_MASK(0xF, I40E_GLHMC_LAN32BRSVDOBJSZ_PMLAN32BRSVDOBJSZ_SHIFT)
 
-#define I40E_GLHMC_LAN64BRSVD0BASE(_i)                      (0x000C6c00 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_LAN64BRSVD0BASE(_i)                      (0x000C6c00 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_LAN64BRSVD0BASE_MAX_INDEX                15
 #define I40E_GLHMC_LAN64BRSVD0BASE_FPMLAN64BRSVD0BASE_SHIFT 0
 #define I40E_GLHMC_LAN64BRSVD0BASE_FPMLAN64BRSVD0BASE_MASK  I40E_MASK(0xFFFFFF, I40E_GLHMC_LAN64BRSVD0BASE_FPMLAN64BRSVD0BASE_SHIFT)
 
-#define I40E_GLHMC_LAN64BRSVD0CNT(_i)                     (0x000C6d00 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_LAN64BRSVD0CNT(_i)                     (0x000C6d00 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_LAN64BRSVD0CNT_MAX_INDEX               15
 #define I40E_GLHMC_LAN64BRSVD0CNT_FPMLAN64BRSVD0CNT_SHIFT 0
 #define I40E_GLHMC_LAN64BRSVD0CNT_FPMLAN64BRSVD0CNT_MASK  I40E_MASK(0x1FFFFFFF, I40E_GLHMC_LAN64BRSVD0CNT_FPMLAN64BRSVD0CNT_SHIFT)
 
-#define I40E_GLHMC_LAN64BRSVD0MAX                        0x000C20a4
+#define I40E_GLHMC_LAN64BRSVD0MAX                        0x000C20a4 /* Reset: CORER */
 #define I40E_GLHMC_LAN64BRSVD0MAX_PMLAN64BRSVD0MAX_SHIFT 0
 #define I40E_GLHMC_LAN64BRSVD0MAX_PMLAN64BRSVD0MAX_MASK  I40E_MASK(0x1FFFFFFF, I40E_GLHMC_LAN64BRSVD0MAX_PMLAN64BRSVD0MAX_SHIFT)
 
-#define I40E_GLHMC_LAN64BRSVD0OBJSZ                          0x000C20a0
+#define I40E_GLHMC_LAN64BRSVD0OBJSZ                          0x000C20a0 /* Reset: CORER */
 #define I40E_GLHMC_LAN64BRSVD0OBJSZ_PMLAN64BRSVD0OBJSZ_SHIFT 0
 #define I40E_GLHMC_LAN64BRSVD0OBJSZ_PMLAN64BRSVD0OBJSZ_MASK  I40E_MASK(0xF, I40E_GLHMC_LAN64BRSVD0OBJSZ_PMLAN64BRSVD0OBJSZ_SHIFT)
 
-#define I40E_GLHMC_LAN64BRSVD1BASE(_i)                      (0x000C6e00 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_LAN64BRSVD1BASE(_i)                      (0x000C6e00 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_LAN64BRSVD1BASE_MAX_INDEX                15
 #define I40E_GLHMC_LAN64BRSVD1BASE_FPMLAN64BRSVD1BASE_SHIFT 0
 #define I40E_GLHMC_LAN64BRSVD1BASE_FPMLAN64BRSVD1BASE_MASK  I40E_MASK(0xFFFFFF, I40E_GLHMC_LAN64BRSVD1BASE_FPMLAN64BRSVD1BASE_SHIFT)
 
-#define I40E_GLHMC_LAN64BRSVD1CNT(_i)                     (0x000C6f00 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_LAN64BRSVD1CNT(_i)                     (0x000C6f00 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_LAN64BRSVD1CNT_MAX_INDEX               15
 #define I40E_GLHMC_LAN64BRSVD1CNT_FPMLAN64BRSVD1CNT_SHIFT 0
 #define I40E_GLHMC_LAN64BRSVD1CNT_FPMLAN64BRSVD1CNT_MASK  I40E_MASK(0x1FFFFFFF, I40E_GLHMC_LAN64BRSVD1CNT_FPMLAN64BRSVD1CNT_SHIFT)
 
-#define I40E_GLHMC_LAN64BRSVD1MAX                        0x000C20ac
+#define I40E_GLHMC_LAN64BRSVD1MAX                        0x000C20ac /* Reset: CORER */
 #define I40E_GLHMC_LAN64BRSVD1MAX_PMLAN64BRSVD1MAX_SHIFT 0
 #define I40E_GLHMC_LAN64BRSVD1MAX_PMLAN64BRSVD1MAX_MASK  I40E_MASK(0x1FFFFFFF, I40E_GLHMC_LAN64BRSVD1MAX_PMLAN64BRSVD1MAX_SHIFT)
 
-#define I40E_GLHMC_LAN64BRSVD1OBJSZ                          0x000C20a8
+#define I40E_GLHMC_LAN64BRSVD1OBJSZ                          0x000C20a8 /* Reset: CORER */
 #define I40E_GLHMC_LAN64BRSVD1OBJSZ_PMLAN64BRSVD1OBJSZ_SHIFT 0
 #define I40E_GLHMC_LAN64BRSVD1OBJSZ_PMLAN64BRSVD1OBJSZ_MASK  I40E_MASK(0xF, I40E_GLHMC_LAN64BRSVD1OBJSZ_PMLAN64BRSVD1OBJSZ_SHIFT)
 
-#define I40E_GLHMC_OBJECTCACHECTL0(_i)                  (0x000C0900 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_OBJECTCACHECTL0(_i)                  (0x000C0900 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_OBJECTCACHECTL0_MAX_INDEX            15
 #define I40E_GLHMC_OBJECTCACHECTL0_OBJ_PF_NUM_SHIFT     0
 #define I40E_GLHMC_OBJECTCACHECTL0_OBJ_PF_NUM_MASK      I40E_MASK(0xF, I40E_GLHMC_OBJECTCACHECTL0_OBJ_PF_NUM_SHIFT)
@@ -1204,23 +1210,23 @@
 #define I40E_GLHMC_OBJECTCACHECTL0_CMD_DONE_SHIFT       31
 #define I40E_GLHMC_OBJECTCACHECTL0_CMD_DONE_MASK        I40E_MASK(0x1, I40E_GLHMC_OBJECTCACHECTL0_CMD_DONE_SHIFT)
 
-#define I40E_GLHMC_OBJECTCACHECTL1(_i)             (0x000C0a00 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_OBJECTCACHECTL1(_i)             (0x000C0a00 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_OBJECTCACHECTL1_MAX_INDEX       15
 #define I40E_GLHMC_OBJECTCACHECTL1_OBJ_INDEX_SHIFT 0
 #define I40E_GLHMC_OBJECTCACHECTL1_OBJ_INDEX_MASK  I40E_MASK(0xFFFFFFF, I40E_GLHMC_OBJECTCACHECTL1_OBJ_INDEX_SHIFT)
 
-#define I40E_GLHMC_PMATCFG                     0x000C2000
+#define I40E_GLHMC_PMATCFG                     0x000C2000 /* Reset: CORER */
 #define I40E_GLHMC_PMATCFG_CM_PE_WEIGHT_SHIFT  0
 #define I40E_GLHMC_PMATCFG_CM_PE_WEIGHT_MASK   I40E_MASK(0x1, I40E_GLHMC_PMATCFG_CM_PE_WEIGHT_SHIFT)
 #define I40E_GLHMC_PMATCFG_CM_LAN_WEIGHT_SHIFT 1
 #define I40E_GLHMC_PMATCFG_CM_LAN_WEIGHT_MASK  I40E_MASK(0x1, I40E_GLHMC_PMATCFG_CM_LAN_WEIGHT_SHIFT)
 
-#define I40E_GLHMC_PMFTABLE(_i)                        (0x000C0b00 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLHMC_PMFTABLE(_i)                        (0x000C0b00 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLHMC_PMFTABLE_MAX_INDEX                  15
 #define I40E_GLHMC_PMFTABLE_PM_FCN_TBL_ENTRY_VLD_SHIFT 31
 #define I40E_GLHMC_PMFTABLE_PM_FCN_TBL_ENTRY_VLD_MASK  I40E_MASK(0x1, I40E_GLHMC_PMFTABLE_PM_FCN_TBL_ENTRY_VLD_SHIFT)
 
-#define I40E_GLPBLOC_CACHE_CTRL                     0x000A8000
+#define I40E_GLPBLOC_CACHE_CTRL                     0x000A8000 /* Reset: CORER */
 #define I40E_GLPBLOC_CACHE_CTRL_SCALE_FACTOR_SHIFT  0
 #define I40E_GLPBLOC_CACHE_CTRL_SCALE_FACTOR_MASK   I40E_MASK(0x3, I40E_GLPBLOC_CACHE_CTRL_SCALE_FACTOR_SHIFT)
 #define I40E_GLPBLOC_CACHE_CTRL_DBGMUX_EN_SHIFT     4
@@ -1230,13 +1236,13 @@
 #define I40E_GLPBLOC_CACHE_CTRL_DBGMUX_SEL_HI_SHIFT 16
 #define I40E_GLPBLOC_CACHE_CTRL_DBGMUX_SEL_HI_MASK  I40E_MASK(0x1F, I40E_GLPBLOC_CACHE_CTRL_DBGMUX_SEL_HI_SHIFT)
 
-#define I40E_GLPBLOC_CECC_ERR                         0x000A80B4
+#define I40E_GLPBLOC_CECC_ERR                         0x000A80B4 /* Reset: POR */
 #define I40E_GLPBLOC_CECC_ERR_UNCOR_ECC_ERR_CNT_SHIFT 0
 #define I40E_GLPBLOC_CECC_ERR_UNCOR_ECC_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_GLPBLOC_CECC_ERR_UNCOR_ECC_ERR_CNT_SHIFT)
 #define I40E_GLPBLOC_CECC_ERR_COR_ECC_ERR_CNT_SHIFT   16
 #define I40E_GLPBLOC_CECC_ERR_COR_ECC_ERR_CNT_MASK    I40E_MASK(0xFFF, I40E_GLPBLOC_CECC_ERR_COR_ECC_ERR_CNT_SHIFT)
 
-#define I40E_GLPBLOC_ECC_CTL                           0x000A80AC
+#define I40E_GLPBLOC_ECC_CTL                           0x000A80AC /* Reset: POR */
 #define I40E_GLPBLOC_ECC_CTL_HOST_ECC_EN_SHIFT         0
 #define I40E_GLPBLOC_ECC_CTL_HOST_ECC_EN_MASK          I40E_MASK(0x1, I40E_GLPBLOC_ECC_CTL_HOST_ECC_EN_SHIFT)
 #define I40E_GLPBLOC_ECC_CTL_HOST_ECC_MASK_INT_SHIFT   1
@@ -1254,7 +1260,7 @@
 #define I40E_GLPBLOC_ECC_CTL_CLIENT_ECC_INVERT2_SHIFT  7
 #define I40E_GLPBLOC_ECC_CTL_CLIENT_ECC_INVERT2_MASK   I40E_MASK(0x1, I40E_GLPBLOC_ECC_CTL_CLIENT_ECC_INVERT2_SHIFT)
 
-#define I40E_GLPBLOC_ERRDATA0                  0x000A80A0
+#define I40E_GLPBLOC_ERRDATA0                  0x000A80A0 /* Reset: POR */
 #define I40E_GLPBLOC_ERRDATA0_ERROR_CODE_SHIFT 0
 #define I40E_GLPBLOC_ERRDATA0_ERROR_CODE_MASK  I40E_MASK(0x3F, I40E_GLPBLOC_ERRDATA0_ERROR_CODE_SHIFT)
 #define I40E_GLPBLOC_ERRDATA0_OBJ_TYPE_SHIFT   8
@@ -1266,11 +1272,11 @@
 #define I40E_GLPBLOC_ERRDATA0_PF_NUM_SHIFT     24
 #define I40E_GLPBLOC_ERRDATA0_PF_NUM_MASK      I40E_MASK(0xF, I40E_GLPBLOC_ERRDATA0_PF_NUM_SHIFT)
 
-#define I40E_GLPBLOC_ERRDATA1                 0x000A80A4
+#define I40E_GLPBLOC_ERRDATA1                 0x000A80A4 /* Reset: POR */
 #define I40E_GLPBLOC_ERRDATA1_OBJ_INDEX_SHIFT 0
 #define I40E_GLPBLOC_ERRDATA1_OBJ_INDEX_MASK  I40E_MASK(0xFFFFFFF, I40E_GLPBLOC_ERRDATA1_OBJ_INDEX_SHIFT)
 
-#define I40E_GLPBLOC_ERRDATA2              0x000A80A8
+#define I40E_GLPBLOC_ERRDATA2              0x000A80A8 /* Reset: POR */
 #define I40E_GLPBLOC_ERRDATA2_LENGTH_SHIFT 0
 #define I40E_GLPBLOC_ERRDATA2_LENGTH_MASK  I40E_MASK(0x7F, I40E_GLPBLOC_ERRDATA2_LENGTH_SHIFT)
 #define I40E_GLPBLOC_ERRDATA2_OFFSET_SHIFT 7
@@ -1280,99 +1286,99 @@
 #define I40E_GLPBLOC_ERRDATA2_TAG_SHIFT    23
 #define I40E_GLPBLOC_ERRDATA2_TAG_MASK     I40E_MASK(0x1FF, I40E_GLPBLOC_ERRDATA2_TAG_SHIFT)
 
-#define I40E_GLPBLOC_ERRINFO                   0x000A809C
+#define I40E_GLPBLOC_ERRINFO                   0x000A809C /* Reset: POR */
 #define I40E_GLPBLOC_ERRINFO_ERROR_VALID_SHIFT 0
 #define I40E_GLPBLOC_ERRINFO_ERROR_VALID_MASK  I40E_MASK(0x1, I40E_GLPBLOC_ERRINFO_ERROR_VALID_SHIFT)
 #define I40E_GLPBLOC_ERRINFO_ERROR_CNT_SHIFT   8
 #define I40E_GLPBLOC_ERRINFO_ERROR_CNT_MASK    I40E_MASK(0xFF, I40E_GLPBLOC_ERRINFO_ERROR_CNT_SHIFT)
 
-#define I40E_GLPBLOC_HECC_ERR                         0x000A80B0
+#define I40E_GLPBLOC_HECC_ERR                         0x000A80B0 /* Reset: POR */
 #define I40E_GLPBLOC_HECC_ERR_UNCOR_ECC_ERR_CNT_SHIFT 0
 #define I40E_GLPBLOC_HECC_ERR_UNCOR_ECC_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_GLPBLOC_HECC_ERR_UNCOR_ECC_ERR_CNT_SHIFT)
 #define I40E_GLPBLOC_HECC_ERR_COR_ECC_ERR_CNT_SHIFT   16
 #define I40E_GLPBLOC_HECC_ERR_COR_ECC_ERR_CNT_MASK    I40E_MASK(0xFFF, I40E_GLPBLOC_HECC_ERR_COR_ECC_ERR_CNT_SHIFT)
 
-#define I40E_GLPBLOC_MRTE_OBJOFST                       0x000A8050
+#define I40E_GLPBLOC_MRTE_OBJOFST                       0x000A8050 /* Reset: CORER */
 #define I40E_GLPBLOC_MRTE_OBJOFST_OBJ_TYPE_OFFSET_SHIFT 0
 #define I40E_GLPBLOC_MRTE_OBJOFST_OBJ_TYPE_OFFSET_MASK  I40E_MASK(0x3FF, I40E_GLPBLOC_MRTE_OBJOFST_OBJ_TYPE_OFFSET_SHIFT)
 
-#define I40E_GLPBLOC_PBLE_OBJOFST                       0x000A804C
+#define I40E_GLPBLOC_PBLE_OBJOFST                       0x000A804C /* Reset: CORER */
 #define I40E_GLPBLOC_PBLE_OBJOFST_OBJ_TYPE_OFFSET_SHIFT 0
 #define I40E_GLPBLOC_PBLE_OBJOFST_OBJ_TYPE_OFFSET_MASK  I40E_MASK(0x3FF, I40E_GLPBLOC_PBLE_OBJOFST_OBJ_TYPE_OFFSET_SHIFT)
 
-#define I40E_GLPBLOC_STAT_CTL                   0x000A8004
+#define I40E_GLPBLOC_STAT_CTL                   0x000A8004 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_CTL_OBJECT_TYPE_SHIFT 0
 #define I40E_GLPBLOC_STAT_CTL_OBJECT_TYPE_MASK  I40E_MASK(0x1F, I40E_GLPBLOC_STAT_CTL_OBJECT_TYPE_SHIFT)
 
-#define I40E_GLPBLOC_STAT_OBJ_CNT                    0x000A8008
+#define I40E_GLPBLOC_STAT_OBJ_CNT                    0x000A8008 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_OBJ_CNT_OBJECT_COUNT_SHIFT 0
 #define I40E_GLPBLOC_STAT_OBJ_CNT_OBJECT_COUNT_MASK  I40E_MASK(0x3FFF, I40E_GLPBLOC_STAT_OBJ_CNT_OBJECT_COUNT_SHIFT)
 
-#define I40E_GLPBLOC_STAT_RD_DATA_IDLE_HI              0x000A8030
+#define I40E_GLPBLOC_STAT_RD_DATA_IDLE_HI              0x000A8030 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_RD_DATA_IDLE_HI_CNT_HI_SHIFT 0
 #define I40E_GLPBLOC_STAT_RD_DATA_IDLE_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLPBLOC_STAT_RD_DATA_IDLE_HI_CNT_HI_SHIFT)
 
-#define I40E_GLPBLOC_STAT_RD_DATA_IDLE_LO              0x000A802C
+#define I40E_GLPBLOC_STAT_RD_DATA_IDLE_LO              0x000A802C /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_RD_DATA_IDLE_LO_CNT_LO_SHIFT 0
 #define I40E_GLPBLOC_STAT_RD_DATA_IDLE_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPBLOC_STAT_RD_DATA_IDLE_LO_CNT_LO_SHIFT)
 
-#define I40E_GLPBLOC_STAT_RD_DATA_XFER_HI              0x000A8038
+#define I40E_GLPBLOC_STAT_RD_DATA_XFER_HI              0x000A8038 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_RD_DATA_XFER_HI_CNT_HI_SHIFT 0
 #define I40E_GLPBLOC_STAT_RD_DATA_XFER_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLPBLOC_STAT_RD_DATA_XFER_HI_CNT_HI_SHIFT)
 
-#define I40E_GLPBLOC_STAT_RD_DATA_XFER_LO              0x000A8034
+#define I40E_GLPBLOC_STAT_RD_DATA_XFER_LO              0x000A8034 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_RD_DATA_XFER_LO_CNT_LO_SHIFT 0
 #define I40E_GLPBLOC_STAT_RD_DATA_XFER_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPBLOC_STAT_RD_DATA_XFER_LO_CNT_LO_SHIFT)
 
-#define I40E_GLPBLOC_STAT_RD_HIT_HI              0x000A8010
+#define I40E_GLPBLOC_STAT_RD_HIT_HI              0x000A8010 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_RD_HIT_HI_CNT_HI_SHIFT 0
 #define I40E_GLPBLOC_STAT_RD_HIT_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLPBLOC_STAT_RD_HIT_HI_CNT_HI_SHIFT)
 
-#define I40E_GLPBLOC_STAT_RD_HIT_LO              0x000A800C
+#define I40E_GLPBLOC_STAT_RD_HIT_LO              0x000A800C /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_RD_HIT_LO_CNT_LO_SHIFT 0
 #define I40E_GLPBLOC_STAT_RD_HIT_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPBLOC_STAT_RD_HIT_LO_CNT_LO_SHIFT)
 
-#define I40E_GLPBLOC_STAT_RD_MISS_HI              0x000A8018
+#define I40E_GLPBLOC_STAT_RD_MISS_HI              0x000A8018 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_RD_MISS_HI_CNT_HI_SHIFT 0
 #define I40E_GLPBLOC_STAT_RD_MISS_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLPBLOC_STAT_RD_MISS_HI_CNT_HI_SHIFT)
 
-#define I40E_GLPBLOC_STAT_RD_MISS_LO              0x000A8014
+#define I40E_GLPBLOC_STAT_RD_MISS_LO              0x000A8014 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_RD_MISS_LO_CNT_LO_SHIFT 0
 #define I40E_GLPBLOC_STAT_RD_MISS_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPBLOC_STAT_RD_MISS_LO_CNT_LO_SHIFT)
 
-#define I40E_GLPBLOC_STAT_WR_DATA_IDLE_HI              0x000A8040
+#define I40E_GLPBLOC_STAT_WR_DATA_IDLE_HI              0x000A8040 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_WR_DATA_IDLE_HI_CNT_HI_SHIFT 0
 #define I40E_GLPBLOC_STAT_WR_DATA_IDLE_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLPBLOC_STAT_WR_DATA_IDLE_HI_CNT_HI_SHIFT)
 
-#define I40E_GLPBLOC_STAT_WR_DATA_IDLE_LO              0x000A803C
+#define I40E_GLPBLOC_STAT_WR_DATA_IDLE_LO              0x000A803C /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_WR_DATA_IDLE_LO_CNT_LO_SHIFT 0
 #define I40E_GLPBLOC_STAT_WR_DATA_IDLE_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPBLOC_STAT_WR_DATA_IDLE_LO_CNT_LO_SHIFT)
 
-#define I40E_GLPBLOC_STAT_WR_DATA_XFER_HI              0x000A8048
+#define I40E_GLPBLOC_STAT_WR_DATA_XFER_HI              0x000A8048 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_WR_DATA_XFER_HI_CNT_HI_SHIFT 0
 #define I40E_GLPBLOC_STAT_WR_DATA_XFER_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLPBLOC_STAT_WR_DATA_XFER_HI_CNT_HI_SHIFT)
 
-#define I40E_GLPBLOC_STAT_WR_DATA_XFER_LO              0x000A8044
+#define I40E_GLPBLOC_STAT_WR_DATA_XFER_LO              0x000A8044 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_WR_DATA_XFER_LO_CNT_LO_SHIFT 0
 #define I40E_GLPBLOC_STAT_WR_DATA_XFER_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPBLOC_STAT_WR_DATA_XFER_LO_CNT_LO_SHIFT)
 
-#define I40E_GLPBLOC_STAT_WR_HIT_HI              0x000A8020
+#define I40E_GLPBLOC_STAT_WR_HIT_HI              0x000A8020 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_WR_HIT_HI_CNT_HI_SHIFT 0
 #define I40E_GLPBLOC_STAT_WR_HIT_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLPBLOC_STAT_WR_HIT_HI_CNT_HI_SHIFT)
 
-#define I40E_GLPBLOC_STAT_WR_HIT_LO              0x000A801C
+#define I40E_GLPBLOC_STAT_WR_HIT_LO              0x000A801C /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_WR_HIT_LO_CNT_LO_SHIFT 0
 #define I40E_GLPBLOC_STAT_WR_HIT_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPBLOC_STAT_WR_HIT_LO_CNT_LO_SHIFT)
 
-#define I40E_GLPBLOC_STAT_WR_MISS_HI              0x000A8028
+#define I40E_GLPBLOC_STAT_WR_MISS_HI              0x000A8028 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_WR_MISS_HI_CNT_HI_SHIFT 0
 #define I40E_GLPBLOC_STAT_WR_MISS_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLPBLOC_STAT_WR_MISS_HI_CNT_HI_SHIFT)
 
-#define I40E_GLPBLOC_STAT_WR_MISS_LO              0x000A8024
+#define I40E_GLPBLOC_STAT_WR_MISS_LO              0x000A8024 /* Reset: CORER */
 #define I40E_GLPBLOC_STAT_WR_MISS_LO_CNT_LO_SHIFT 0
 #define I40E_GLPBLOC_STAT_WR_MISS_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPBLOC_STAT_WR_MISS_LO_CNT_LO_SHIFT)
 
-#define I40E_GLPDOC_CACHE_CTRL                     0x000D0000
+#define I40E_GLPDOC_CACHE_CTRL                     0x000D0000 /* Reset: CORER */
 #define I40E_GLPDOC_CACHE_CTRL_SCALE_FACTOR_SHIFT  0
 #define I40E_GLPDOC_CACHE_CTRL_SCALE_FACTOR_MASK   I40E_MASK(0x3, I40E_GLPDOC_CACHE_CTRL_SCALE_FACTOR_SHIFT)
 #define I40E_GLPDOC_CACHE_CTRL_DBGMUX_EN_SHIFT     4
@@ -1382,13 +1388,13 @@
 #define I40E_GLPDOC_CACHE_CTRL_DBGMUX_SEL_HI_SHIFT 16
 #define I40E_GLPDOC_CACHE_CTRL_DBGMUX_SEL_HI_MASK  I40E_MASK(0x1F, I40E_GLPDOC_CACHE_CTRL_DBGMUX_SEL_HI_SHIFT)
 
-#define I40E_GLPDOC_CECC_ERR                         0x000D0080
+#define I40E_GLPDOC_CECC_ERR                         0x000D0080 /* Reset: POR */
 #define I40E_GLPDOC_CECC_ERR_UNCOR_ECC_ERR_CNT_SHIFT 0
 #define I40E_GLPDOC_CECC_ERR_UNCOR_ECC_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_GLPDOC_CECC_ERR_UNCOR_ECC_ERR_CNT_SHIFT)
 #define I40E_GLPDOC_CECC_ERR_COR_ECC_ERR_CNT_SHIFT   16
 #define I40E_GLPDOC_CECC_ERR_COR_ECC_ERR_CNT_MASK    I40E_MASK(0xFFF, I40E_GLPDOC_CECC_ERR_COR_ECC_ERR_CNT_SHIFT)
 
-#define I40E_GLPDOC_ECC_CTL                           0x000D007c
+#define I40E_GLPDOC_ECC_CTL                           0x000D007c /* Reset: POR */
 #define I40E_GLPDOC_ECC_CTL_HOST_ECC_EN_SHIFT         0
 #define I40E_GLPDOC_ECC_CTL_HOST_ECC_EN_MASK          I40E_MASK(0x1, I40E_GLPDOC_ECC_CTL_HOST_ECC_EN_SHIFT)
 #define I40E_GLPDOC_ECC_CTL_HOST_ECC_MASK_INT_SHIFT   1
@@ -1406,7 +1412,7 @@
 #define I40E_GLPDOC_ECC_CTL_CLIENT_ECC_INVERT2_SHIFT  7
 #define I40E_GLPDOC_ECC_CTL_CLIENT_ECC_INVERT2_MASK   I40E_MASK(0x1, I40E_GLPDOC_ECC_CTL_CLIENT_ECC_INVERT2_SHIFT)
 
-#define I40E_GLPDOC_ERRDATA0                  0x000D0070
+#define I40E_GLPDOC_ERRDATA0                  0x000D0070 /* Reset: POR */
 #define I40E_GLPDOC_ERRDATA0_ERROR_CODE_SHIFT 0
 #define I40E_GLPDOC_ERRDATA0_ERROR_CODE_MASK  I40E_MASK(0x3F, I40E_GLPDOC_ERRDATA0_ERROR_CODE_SHIFT)
 #define I40E_GLPDOC_ERRDATA0_OBJ_TYPE_SHIFT   8
@@ -1418,11 +1424,11 @@
 #define I40E_GLPDOC_ERRDATA0_PF_NUM_SHIFT     24
 #define I40E_GLPDOC_ERRDATA0_PF_NUM_MASK      I40E_MASK(0xF, I40E_GLPDOC_ERRDATA0_PF_NUM_SHIFT)
 
-#define I40E_GLPDOC_ERRDATA1                 0x000D0074
+#define I40E_GLPDOC_ERRDATA1                 0x000D0074 /* Reset: POR */
 #define I40E_GLPDOC_ERRDATA1_OBJ_INDEX_SHIFT 0
 #define I40E_GLPDOC_ERRDATA1_OBJ_INDEX_MASK  I40E_MASK(0xFFFFFFF, I40E_GLPDOC_ERRDATA1_OBJ_INDEX_SHIFT)
 
-#define I40E_GLPDOC_ERRDATA2              0x000D0078
+#define I40E_GLPDOC_ERRDATA2              0x000D0078 /* Reset: POR */
 #define I40E_GLPDOC_ERRDATA2_LENGTH_SHIFT 0
 #define I40E_GLPDOC_ERRDATA2_LENGTH_MASK  I40E_MASK(0x7F, I40E_GLPDOC_ERRDATA2_LENGTH_SHIFT)
 #define I40E_GLPDOC_ERRDATA2_OFFSET_SHIFT 7
@@ -1432,55 +1438,55 @@
 #define I40E_GLPDOC_ERRDATA2_TAG_SHIFT    23
 #define I40E_GLPDOC_ERRDATA2_TAG_MASK     I40E_MASK(0x1FF, I40E_GLPDOC_ERRDATA2_TAG_SHIFT)
 
-#define I40E_GLPDOC_ERRINFO                   0x000D006C
+#define I40E_GLPDOC_ERRINFO                   0x000D006C /* Reset: POR */
 #define I40E_GLPDOC_ERRINFO_ERROR_VALID_SHIFT 0
 #define I40E_GLPDOC_ERRINFO_ERROR_VALID_MASK  I40E_MASK(0x1, I40E_GLPDOC_ERRINFO_ERROR_VALID_SHIFT)
 #define I40E_GLPDOC_ERRINFO_ERROR_CNT_SHIFT   8
 #define I40E_GLPDOC_ERRINFO_ERROR_CNT_MASK    I40E_MASK(0xFF, I40E_GLPDOC_ERRINFO_ERROR_CNT_SHIFT)
 
-#define I40E_GLPDOC_STAT_CTL                   0x000D0004
+#define I40E_GLPDOC_STAT_CTL                   0x000D0004 /* Reset: CORER */
 #define I40E_GLPDOC_STAT_CTL_OBJECT_TYPE_SHIFT 0
 #define I40E_GLPDOC_STAT_CTL_OBJECT_TYPE_MASK  I40E_MASK(0x1F, I40E_GLPDOC_STAT_CTL_OBJECT_TYPE_SHIFT)
 
-#define I40E_GLPDOC_STAT_OBJ_CNT                    0x000D0008
+#define I40E_GLPDOC_STAT_OBJ_CNT                    0x000D0008 /* Reset: CORER */
 #define I40E_GLPDOC_STAT_OBJ_CNT_OBJECT_COUNT_SHIFT 0
 #define I40E_GLPDOC_STAT_OBJ_CNT_OBJECT_COUNT_MASK  I40E_MASK(0x3FFF, I40E_GLPDOC_STAT_OBJ_CNT_OBJECT_COUNT_SHIFT)
 
-#define I40E_GLPDOC_STAT_RD_DATA_IDLE_HI              0x000D0020
+#define I40E_GLPDOC_STAT_RD_DATA_IDLE_HI              0x000D0020 /* Reset: CORER */
 #define I40E_GLPDOC_STAT_RD_DATA_IDLE_HI_CNT_HI_SHIFT 0
 #define I40E_GLPDOC_STAT_RD_DATA_IDLE_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLPDOC_STAT_RD_DATA_IDLE_HI_CNT_HI_SHIFT)
 
-#define I40E_GLPDOC_STAT_RD_DATA_IDLE_LO              0x000D001C
+#define I40E_GLPDOC_STAT_RD_DATA_IDLE_LO              0x000D001C /* Reset: CORER */
 #define I40E_GLPDOC_STAT_RD_DATA_IDLE_LO_CNT_LO_SHIFT 0
 #define I40E_GLPDOC_STAT_RD_DATA_IDLE_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPDOC_STAT_RD_DATA_IDLE_LO_CNT_LO_SHIFT)
 
-#define I40E_GLPDOC_STAT_RD_DATA_XFER_HI              0x000D0028
+#define I40E_GLPDOC_STAT_RD_DATA_XFER_HI              0x000D0028 /* Reset: CORER */
 #define I40E_GLPDOC_STAT_RD_DATA_XFER_HI_CNT_HI_SHIFT 0
 #define I40E_GLPDOC_STAT_RD_DATA_XFER_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLPDOC_STAT_RD_DATA_XFER_HI_CNT_HI_SHIFT)
 
-#define I40E_GLPDOC_STAT_RD_DATA_XFER_LO              0x000D0024
+#define I40E_GLPDOC_STAT_RD_DATA_XFER_LO              0x000D0024 /* Reset: CORER */
 #define I40E_GLPDOC_STAT_RD_DATA_XFER_LO_CNT_LO_SHIFT 0
 #define I40E_GLPDOC_STAT_RD_DATA_XFER_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPDOC_STAT_RD_DATA_XFER_LO_CNT_LO_SHIFT)
 
-#define I40E_GLPDOC_STAT_RD_HIT_HI              0x000D0010
+#define I40E_GLPDOC_STAT_RD_HIT_HI              0x000D0010 /* Reset: CORER */
 #define I40E_GLPDOC_STAT_RD_HIT_HI_CNT_HI_SHIFT 0
 #define I40E_GLPDOC_STAT_RD_HIT_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLPDOC_STAT_RD_HIT_HI_CNT_HI_SHIFT)
 
-#define I40E_GLPDOC_STAT_RD_HIT_LO              0x000D000C
+#define I40E_GLPDOC_STAT_RD_HIT_LO              0x000D000C /* Reset: CORER */
 #define I40E_GLPDOC_STAT_RD_HIT_LO_CNT_LO_SHIFT 0
 #define I40E_GLPDOC_STAT_RD_HIT_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPDOC_STAT_RD_HIT_LO_CNT_LO_SHIFT)
 
-#define I40E_GLPDOC_STAT_RD_MISS_HI              0x000D0018
+#define I40E_GLPDOC_STAT_RD_MISS_HI              0x000D0018 /* Reset: CORER */
 #define I40E_GLPDOC_STAT_RD_MISS_HI_CNT_HI_SHIFT 0
 #define I40E_GLPDOC_STAT_RD_MISS_HI_CNT_HI_MASK  I40E_MASK(0xFFFFFF, I40E_GLPDOC_STAT_RD_MISS_HI_CNT_HI_SHIFT)
 
-#define I40E_GLPDOC_STAT_RD_MISS_LO              0x000D0014
+#define I40E_GLPDOC_STAT_RD_MISS_LO              0x000D0014 /* Reset: CORER */
 #define I40E_GLPDOC_STAT_RD_MISS_LO_CNT_LO_SHIFT 0
 #define I40E_GLPDOC_STAT_RD_MISS_LO_CNT_LO_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPDOC_STAT_RD_MISS_LO_CNT_LO_SHIFT)
 
 /* PF - Intel Internal Registers */
 
-#define I40E_DPU_IMEM_CFG                    0x00051064
+#define I40E_DPU_IMEM_CFG                    0x00051064 /* Reset: POR */
 #define I40E_DPU_IMEM_CFG_ECC_EN_SHIFT       0
 #define I40E_DPU_IMEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_DPU_IMEM_CFG_ECC_EN_SHIFT)
 #define I40E_DPU_IMEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -1502,7 +1508,7 @@
 #define I40E_DPU_IMEM_CFG_RM_SHIFT           16
 #define I40E_DPU_IMEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_DPU_IMEM_CFG_RM_SHIFT)
 
-#define I40E_DPU_IMEM_STATUS                        0x00051068
+#define I40E_DPU_IMEM_STATUS                        0x00051068 /* Reset: POR */
 #define I40E_DPU_IMEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_DPU_IMEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_DPU_IMEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_DPU_IMEM_STATUS_ECC_FIX_SHIFT          1
@@ -1512,7 +1518,7 @@
 #define I40E_DPU_IMEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_DPU_IMEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_DPU_IMEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_DPU_RECIPE_ADDR_CFG                    0x0005106C
+#define I40E_DPU_RECIPE_ADDR_CFG                    0x0005106C /* Reset: POR */
 #define I40E_DPU_RECIPE_ADDR_CFG_ECC_EN_SHIFT       0
 #define I40E_DPU_RECIPE_ADDR_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_DPU_RECIPE_ADDR_CFG_ECC_EN_SHIFT)
 #define I40E_DPU_RECIPE_ADDR_CFG_ECC_INVERT_1_SHIFT 1
@@ -1534,7 +1540,7 @@
 #define I40E_DPU_RECIPE_ADDR_CFG_RM_SHIFT           16
 #define I40E_DPU_RECIPE_ADDR_CFG_RM_MASK            I40E_MASK(0xF, I40E_DPU_RECIPE_ADDR_CFG_RM_SHIFT)
 
-#define I40E_DPU_RECIPE_ADDR_STATUS                        0x00051070
+#define I40E_DPU_RECIPE_ADDR_STATUS                        0x00051070 /* Reset: POR */
 #define I40E_DPU_RECIPE_ADDR_STATUS_ECC_ERR_SHIFT          0
 #define I40E_DPU_RECIPE_ADDR_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_DPU_RECIPE_ADDR_STATUS_ECC_ERR_SHIFT)
 #define I40E_DPU_RECIPE_ADDR_STATUS_ECC_FIX_SHIFT          1
@@ -1544,15 +1550,15 @@
 #define I40E_DPU_RECIPE_ADDR_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_DPU_RECIPE_ADDR_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_DPU_RECIPE_ADDR_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_FLEEP_ECC_COR_ERR           0x000B6150
+#define I40E_FLEEP_ECC_COR_ERR           0x000B6150 /* Reset: POR */
 #define I40E_FLEEP_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_FLEEP_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_FLEEP_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_FLEEP_ECC_UNCOR_ERR           0x000B614C
+#define I40E_FLEEP_ECC_UNCOR_ERR           0x000B614C /* Reset: POR */
 #define I40E_FLEEP_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_FLEEP_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_FLEEP_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_FLEEP_MEM_CFG                    0x000B6144
+#define I40E_FLEEP_MEM_CFG                    0x000B6144 /* Reset: POR */
 #define I40E_FLEEP_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_FLEEP_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_FLEEP_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_FLEEP_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -1574,7 +1580,7 @@
 #define I40E_FLEEP_MEM_CFG_RM_SHIFT           16
 #define I40E_FLEEP_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_FLEEP_MEM_CFG_RM_SHIFT)
 
-#define I40E_FLEEP_MEM_STATUS                        0x000B6148
+#define I40E_FLEEP_MEM_STATUS                        0x000B6148 /* Reset: POR */
 #define I40E_FLEEP_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_FLEEP_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_FLEEP_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_FLEEP_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -1584,7 +1590,7 @@
 #define I40E_FLEEP_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_FLEEP_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_FLEEP_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_FOC_CACHE_DBG_CTL              0x000AA0A4
+#define I40E_FOC_CACHE_DBG_CTL              0x000AA0A4 /* Reset: CORER */
 #define I40E_FOC_CACHE_DBG_CTL_ADR_SHIFT    0
 #define I40E_FOC_CACHE_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_FOC_CACHE_DBG_CTL_ADR_SHIFT)
 #define I40E_FOC_CACHE_DBG_CTL_DW_SEL_SHIFT 18
@@ -1594,11 +1600,11 @@
 #define I40E_FOC_CACHE_DBG_CTL_DONE_SHIFT   31
 #define I40E_FOC_CACHE_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_FOC_CACHE_DBG_CTL_DONE_SHIFT)
 
-#define I40E_FOC_CACHE_DBG_DATA             0x000AA0A8
+#define I40E_FOC_CACHE_DBG_DATA             0x000AA0A8 /* Reset: CORER */
 #define I40E_FOC_CACHE_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_FOC_CACHE_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_FOC_CACHE_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_FOC_CACHE_MEM_CFG                    0x000AA064
+#define I40E_FOC_CACHE_MEM_CFG                    0x000AA064 /* Reset: POR */
 #define I40E_FOC_CACHE_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_FOC_CACHE_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_FOC_CACHE_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_FOC_CACHE_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -1620,7 +1626,7 @@
 #define I40E_FOC_CACHE_MEM_CFG_RM_SHIFT           16
 #define I40E_FOC_CACHE_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_FOC_CACHE_MEM_CFG_RM_SHIFT)
 
-#define I40E_FOC_CAHCE_MEM_STATUS                        0x000AA068
+#define I40E_FOC_CAHCE_MEM_STATUS                        0x000AA068 /* Reset: POR */
 #define I40E_FOC_CAHCE_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_FOC_CAHCE_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_FOC_CAHCE_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_FOC_CAHCE_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -1630,15 +1636,15 @@
 #define I40E_FOC_CAHCE_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_FOC_CAHCE_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_FOC_CAHCE_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_FOC_ECC_COR_ERR           0x000AA098
+#define I40E_FOC_ECC_COR_ERR           0x000AA098 /* Reset: POR */
 #define I40E_FOC_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_FOC_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_FOC_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_FOC_ECC_UNCOR_ERR           0x000AA094
+#define I40E_FOC_ECC_UNCOR_ERR           0x000AA094 /* Reset: POR */
 #define I40E_FOC_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_FOC_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_FOC_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_FOC_EVICT_MEM_CFG                    0x000AA084
+#define I40E_FOC_EVICT_MEM_CFG                    0x000AA084 /* Reset: POR */
 #define I40E_FOC_EVICT_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_FOC_EVICT_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_FOC_EVICT_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_FOC_EVICT_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -1660,7 +1666,7 @@
 #define I40E_FOC_EVICT_MEM_CFG_RM_SHIFT           16
 #define I40E_FOC_EVICT_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_FOC_EVICT_MEM_CFG_RM_SHIFT)
 
-#define I40E_FOC_EVICT_MEM_STATUS                        0x000AA088
+#define I40E_FOC_EVICT_MEM_STATUS                        0x000AA088 /* Reset: POR */
 #define I40E_FOC_EVICT_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_FOC_EVICT_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_FOC_EVICT_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_FOC_EVICT_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -1670,7 +1676,7 @@
 #define I40E_FOC_EVICT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_FOC_EVICT_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_FOC_EVICT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_FOC_FD_DBG_CTL              0x000AA0B4
+#define I40E_FOC_FD_DBG_CTL              0x000AA0B4 /* Reset: CORER */
 #define I40E_FOC_FD_DBG_CTL_ADR_SHIFT    0
 #define I40E_FOC_FD_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_FOC_FD_DBG_CTL_ADR_SHIFT)
 #define I40E_FOC_FD_DBG_CTL_DW_SEL_SHIFT 18
@@ -1680,11 +1686,11 @@
 #define I40E_FOC_FD_DBG_CTL_DONE_SHIFT   31
 #define I40E_FOC_FD_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_FOC_FD_DBG_CTL_DONE_SHIFT)
 
-#define I40E_FOC_FD_DBG_DATA             0x000AA0B8
+#define I40E_FOC_FD_DBG_DATA             0x000AA0B8 /* Reset: CORER */
 #define I40E_FOC_FD_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_FOC_FD_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_FOC_FD_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_FOC_FD_MEM_CFG                    0x000AA08C
+#define I40E_FOC_FD_MEM_CFG                    0x000AA08C /* Reset: POR */
 #define I40E_FOC_FD_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_FOC_FD_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_FOC_FD_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_FOC_FD_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -1706,7 +1712,7 @@
 #define I40E_FOC_FD_MEM_CFG_RM_SHIFT           16
 #define I40E_FOC_FD_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_FOC_FD_MEM_CFG_RM_SHIFT)
 
-#define I40E_FOC_FD_MEM_STATUS                        0x000AA090
+#define I40E_FOC_FD_MEM_STATUS                        0x000AA090 /* Reset: POR */
 #define I40E_FOC_FD_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_FOC_FD_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_FOC_FD_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_FOC_FD_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -1716,7 +1722,7 @@
 #define I40E_FOC_FD_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_FOC_FD_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_FOC_FD_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_FOC_FILL_MEM_CFG                    0x000AA074
+#define I40E_FOC_FILL_MEM_CFG                    0x000AA074 /* Reset: POR */
 #define I40E_FOC_FILL_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_FOC_FILL_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_FOC_FILL_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_FOC_FILL_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -1738,7 +1744,7 @@
 #define I40E_FOC_FILL_MEM_CFG_RM_SHIFT           16
 #define I40E_FOC_FILL_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_FOC_FILL_MEM_CFG_RM_SHIFT)
 
-#define I40E_FOC_FILL_MEM_STATUS                        0x000AA078
+#define I40E_FOC_FILL_MEM_STATUS                        0x000AA078 /* Reset: POR */
 #define I40E_FOC_FILL_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_FOC_FILL_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_FOC_FILL_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_FOC_FILL_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -1748,7 +1754,7 @@
 #define I40E_FOC_FILL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_FOC_FILL_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_FOC_FILL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_FOC_TAG_DBG_CTL              0x000AA09C
+#define I40E_FOC_TAG_DBG_CTL              0x000AA09C /* Reset: CORER */
 #define I40E_FOC_TAG_DBG_CTL_ADR_SHIFT    0
 #define I40E_FOC_TAG_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_FOC_TAG_DBG_CTL_ADR_SHIFT)
 #define I40E_FOC_TAG_DBG_CTL_DW_SEL_SHIFT 18
@@ -1758,11 +1764,11 @@
 #define I40E_FOC_TAG_DBG_CTL_DONE_SHIFT   31
 #define I40E_FOC_TAG_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_FOC_TAG_DBG_CTL_DONE_SHIFT)
 
-#define I40E_FOC_TAG_DBG_DATA             0x000AA0A0
+#define I40E_FOC_TAG_DBG_DATA             0x000AA0A0 /* Reset: CORER */
 #define I40E_FOC_TAG_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_FOC_TAG_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_FOC_TAG_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_FOC_TAG_MEM_CFG                    0x000AA06C
+#define I40E_FOC_TAG_MEM_CFG                    0x000AA06C /* Reset: POR */
 #define I40E_FOC_TAG_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_FOC_TAG_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_FOC_TAG_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_FOC_TAG_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -1784,7 +1790,7 @@
 #define I40E_FOC_TAG_MEM_CFG_RM_SHIFT           16
 #define I40E_FOC_TAG_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_FOC_TAG_MEM_CFG_RM_SHIFT)
 
-#define I40E_FOC_TAG_MEM_STATUS                        0x000AA070
+#define I40E_FOC_TAG_MEM_STATUS                        0x000AA070 /* Reset: POR */
 #define I40E_FOC_TAG_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_FOC_TAG_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_FOC_TAG_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_FOC_TAG_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -1794,15 +1800,15 @@
 #define I40E_FOC_TAG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_FOC_TAG_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_FOC_TAG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_FVL_STAT_ECC_COR_ERR           0x003800F4
+#define I40E_FVL_STAT_ECC_COR_ERR           0x003800F4 /* Reset: POR */
 #define I40E_FVL_STAT_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_FVL_STAT_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_FVL_STAT_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_FVL_STAT_ECC_UNCOR_ERR           0x003800F0
+#define I40E_FVL_STAT_ECC_UNCOR_ERR           0x003800F0 /* Reset: POR */
 #define I40E_FVL_STAT_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_FVL_STAT_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_FVL_STAT_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_FVL_STAT_MEM_CFG(_i)                (0x00380000 + ((_i) * 4)) /* _i=0...29 */
+#define I40E_FVL_STAT_MEM_CFG(_i)                (0x00380000 + ((_i) * 4)) /* _i=0...29 */ /* Reset: POR */
 #define I40E_FVL_STAT_MEM_CFG_MAX_INDEX          29
 #define I40E_FVL_STAT_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_FVL_STAT_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_FVL_STAT_MEM_CFG_ECC_EN_SHIFT)
@@ -1825,7 +1831,7 @@
 #define I40E_FVL_STAT_MEM_CFG_RM_SHIFT           16
 #define I40E_FVL_STAT_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_FVL_STAT_MEM_CFG_RM_SHIFT)
 
-#define I40E_FVL_STAT_MEM_STATUS(_i)                    (0x00380078 + ((_i) * 4)) /* _i=0...29 */
+#define I40E_FVL_STAT_MEM_STATUS(_i)                    (0x00380078 + ((_i) * 4)) /* _i=0...29 */ /* Reset: POR */
 #define I40E_FVL_STAT_MEM_STATUS_MAX_INDEX              29
 #define I40E_FVL_STAT_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_FVL_STAT_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_FVL_STAT_MEM_STATUS_ECC_ERR_SHIFT)
@@ -1836,23 +1842,23 @@
 #define I40E_FVL_STAT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_FVL_STAT_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_FVL_STAT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_GL_CRITERRMODMASK0                    0x000B4020
+#define I40E_GL_CRITERRMODMASK0                    0x000B4020 /* Reset: CORER */
 #define I40E_GL_CRITERRMODMASK0_MODULE_MASK0_SHIFT 1
 #define I40E_GL_CRITERRMODMASK0_MODULE_MASK0_MASK  I40E_MASK(0x7FFFFFFF, I40E_GL_CRITERRMODMASK0_MODULE_MASK0_SHIFT)
 
-#define I40E_GL_CRITERRMODMASK1                    0x000B4024
+#define I40E_GL_CRITERRMODMASK1                    0x000B4024 /* Reset: CORER */
 #define I40E_GL_CRITERRMODMASK1_MODULE_MASK1_SHIFT 1
 #define I40E_GL_CRITERRMODMASK1_MODULE_MASK1_MASK  I40E_MASK(0x7FFFFFFF, I40E_GL_CRITERRMODMASK1_MODULE_MASK1_SHIFT)
 
-#define I40E_GL_CRITERRMODMASK2                    0x000B4028
+#define I40E_GL_CRITERRMODMASK2                    0x000B4028 /* Reset: CORER */
 #define I40E_GL_CRITERRMODMASK2_MODULE_MASK2_SHIFT 1
 #define I40E_GL_CRITERRMODMASK2_MODULE_MASK2_MASK  I40E_MASK(0x7FFFFFFF, I40E_GL_CRITERRMODMASK2_MODULE_MASK2_SHIFT)
 
-#define I40E_GL_CRITERRMODMASK3                    0x000B402C
+#define I40E_GL_CRITERRMODMASK3                    0x000B402C /* Reset: CORER */
 #define I40E_GL_CRITERRMODMASK3_MODULE_MASK3_SHIFT 1
 #define I40E_GL_CRITERRMODMASK3_MODULE_MASK3_MASK  I40E_MASK(0x7FFFFFFF, I40E_GL_CRITERRMODMASK3_MODULE_MASK3_SHIFT)
 
-#define I40E_GL_CRITERRTRGTMASK0                           0x000B4040
+#define I40E_GL_CRITERRTRGTMASK0                           0x000B4040 /* Reset: CORER */
 #define I40E_GL_CRITERRTRGTMASK0_TRGT_MATCH_0_INST_SHIFT   0
 #define I40E_GL_CRITERRTRGTMASK0_TRGT_MATCH_0_INST_MASK    I40E_MASK(0x3F, I40E_GL_CRITERRTRGTMASK0_TRGT_MATCH_0_INST_SHIFT)
 #define I40E_GL_CRITERRTRGTMASK0_TRGT_MATCH_0_TYPE_SHIFT   6
@@ -1866,7 +1872,7 @@
 #define I40E_GL_CRITERRTRGTMASK0_TRGT_MATCH_1_MODULE_SHIFT 24
 #define I40E_GL_CRITERRTRGTMASK0_TRGT_MATCH_1_MODULE_MASK  I40E_MASK(0xFF, I40E_GL_CRITERRTRGTMASK0_TRGT_MATCH_1_MODULE_SHIFT)
 
-#define I40E_GL_CRITERRTRGTMASK1                           0x000B4044
+#define I40E_GL_CRITERRTRGTMASK1                           0x000B4044 /* Reset: CORER */
 #define I40E_GL_CRITERRTRGTMASK1_TRGT_MATCH_2_INST_SHIFT   0
 #define I40E_GL_CRITERRTRGTMASK1_TRGT_MATCH_2_INST_MASK    I40E_MASK(0x3F, I40E_GL_CRITERRTRGTMASK1_TRGT_MATCH_2_INST_SHIFT)
 #define I40E_GL_CRITERRTRGTMASK1_TRGT_MATCH_2_TYPE_SHIFT   6
@@ -1880,7 +1886,7 @@
 #define I40E_GL_CRITERRTRGTMASK1_TRGT_MATCH_3_MODULE_SHIFT 24
 #define I40E_GL_CRITERRTRGTMASK1_TRGT_MATCH_3_MODULE_MASK  I40E_MASK(0xFF, I40E_GL_CRITERRTRGTMASK1_TRGT_MATCH_3_MODULE_SHIFT)
 
-#define I40E_GL_CRITERRTRGTMASK2                           0x000B4048
+#define I40E_GL_CRITERRTRGTMASK2                           0x000B4048 /* Reset: CORER */
 #define I40E_GL_CRITERRTRGTMASK2_TRGT_MATCH_4_INST_SHIFT   0
 #define I40E_GL_CRITERRTRGTMASK2_TRGT_MATCH_4_INST_MASK    I40E_MASK(0x3F, I40E_GL_CRITERRTRGTMASK2_TRGT_MATCH_4_INST_SHIFT)
 #define I40E_GL_CRITERRTRGTMASK2_TRGT_MATCH_4_TYPE_SHIFT   6
@@ -1894,7 +1900,7 @@
 #define I40E_GL_CRITERRTRGTMASK2_TRGT_MATCH_5_MODULE_SHIFT 24
 #define I40E_GL_CRITERRTRGTMASK2_TRGT_MATCH_5_MODULE_MASK  I40E_MASK(0xFF, I40E_GL_CRITERRTRGTMASK2_TRGT_MATCH_5_MODULE_SHIFT)
 
-#define I40E_GL_CRITERRTRGTMASK3                           0x000B404C
+#define I40E_GL_CRITERRTRGTMASK3                           0x000B404C /* Reset: CORER */
 #define I40E_GL_CRITERRTRGTMASK3_TRGT_MATCH_6_INST_SHIFT   0
 #define I40E_GL_CRITERRTRGTMASK3_TRGT_MATCH_6_INST_MASK    I40E_MASK(0x3F, I40E_GL_CRITERRTRGTMASK3_TRGT_MATCH_6_INST_SHIFT)
 #define I40E_GL_CRITERRTRGTMASK3_TRGT_MATCH_6_TYPE_SHIFT   6
@@ -1908,7 +1914,7 @@
 #define I40E_GL_CRITERRTRGTMASK3_TRGT_MATCH_7_MODULE_SHIFT 24
 #define I40E_GL_CRITERRTRGTMASK3_TRGT_MATCH_7_MODULE_MASK  I40E_MASK(0xFF, I40E_GL_CRITERRTRGTMASK3_TRGT_MATCH_7_MODULE_SHIFT)
 
-#define I40E_GL_CRITERRTRGTMASK4                           0x000B4050
+#define I40E_GL_CRITERRTRGTMASK4                           0x000B4050 /* Reset: CORER */
 #define I40E_GL_CRITERRTRGTMASK4_TRGT_MATCH_8_INST_SHIFT   0
 #define I40E_GL_CRITERRTRGTMASK4_TRGT_MATCH_8_INST_MASK    I40E_MASK(0x3F, I40E_GL_CRITERRTRGTMASK4_TRGT_MATCH_8_INST_SHIFT)
 #define I40E_GL_CRITERRTRGTMASK4_TRGT_MATCH_8_TYPE_SHIFT   6
@@ -1922,7 +1928,7 @@
 #define I40E_GL_CRITERRTRGTMASK4_TRGT_MATCH_9_MODULE_SHIFT 24
 #define I40E_GL_CRITERRTRGTMASK4_TRGT_MATCH_9_MODULE_MASK  I40E_MASK(0xFF, I40E_GL_CRITERRTRGTMASK4_TRGT_MATCH_9_MODULE_SHIFT)
 
-#define I40E_GL_CRITERRTRGTMASK5                            0x000B4054
+#define I40E_GL_CRITERRTRGTMASK5                            0x000B4054 /* Reset: CORER */
 #define I40E_GL_CRITERRTRGTMASK5_TRGT_MATCH_10_INST_SHIFT   0
 #define I40E_GL_CRITERRTRGTMASK5_TRGT_MATCH_10_INST_MASK    I40E_MASK(0x3F, I40E_GL_CRITERRTRGTMASK5_TRGT_MATCH_10_INST_SHIFT)
 #define I40E_GL_CRITERRTRGTMASK5_TRGT_MATCH_10_TYPE_SHIFT   6
@@ -1936,7 +1942,7 @@
 #define I40E_GL_CRITERRTRGTMASK5_TRGT_MATCH_11_MODULE_SHIFT 24
 #define I40E_GL_CRITERRTRGTMASK5_TRGT_MATCH_11_MODULE_MASK  I40E_MASK(0xFF, I40E_GL_CRITERRTRGTMASK5_TRGT_MATCH_11_MODULE_SHIFT)
 
-#define I40E_GL_CRITERRTRGTMASK6                            0x000B4058
+#define I40E_GL_CRITERRTRGTMASK6                            0x000B4058 /* Reset: CORER */
 #define I40E_GL_CRITERRTRGTMASK6_TRGT_MATCH_12_INST_SHIFT   0
 #define I40E_GL_CRITERRTRGTMASK6_TRGT_MATCH_12_INST_MASK    I40E_MASK(0x3F, I40E_GL_CRITERRTRGTMASK6_TRGT_MATCH_12_INST_SHIFT)
 #define I40E_GL_CRITERRTRGTMASK6_TRGT_MATCH_12_TYPE_SHIFT   6
@@ -1950,7 +1956,7 @@
 #define I40E_GL_CRITERRTRGTMASK6_TRGT_MATCH_13_MODULE_SHIFT 24
 #define I40E_GL_CRITERRTRGTMASK6_TRGT_MATCH_13_MODULE_MASK  I40E_MASK(0xFF, I40E_GL_CRITERRTRGTMASK6_TRGT_MATCH_13_MODULE_SHIFT)
 
-#define I40E_GL_CRITERRTRGTMASK7                            0x000B405C
+#define I40E_GL_CRITERRTRGTMASK7                            0x000B405C /* Reset: CORER */
 #define I40E_GL_CRITERRTRGTMASK7_TRGT_MATCH_14_INST_SHIFT   0
 #define I40E_GL_CRITERRTRGTMASK7_TRGT_MATCH_14_INST_MASK    I40E_MASK(0x3F, I40E_GL_CRITERRTRGTMASK7_TRGT_MATCH_14_INST_SHIFT)
 #define I40E_GL_CRITERRTRGTMASK7_TRGT_MATCH_14_TYPE_SHIFT   6
@@ -1964,17 +1970,21 @@
 #define I40E_GL_CRITERRTRGTMASK7_TRGT_MATCH_15_MODULE_SHIFT 24
 #define I40E_GL_CRITERRTRGTMASK7_TRGT_MATCH_15_MODULE_MASK  I40E_MASK(0xFF, I40E_GL_CRITERRTRGTMASK7_TRGT_MATCH_15_MODULE_SHIFT)
 
-#define I40E_GL_DBGEMPR                0x00083108
+#define I40E_GL_DBG_DATA                   0x0026998C /* Reset: CORER */
+#define I40E_GL_DBG_DATA_GL_DBG_DATA_SHIFT 0
+#define I40E_GL_DBG_DATA_GL_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_DBG_DATA_GL_DBG_DATA_SHIFT)
+
+#define I40E_GL_DBGEMPR                0x00083108 /* Reset: EMPR */
 #define I40E_GL_DBGEMPR_RSV_DATA_SHIFT 0
 #define I40E_GL_DBGEMPR_RSV_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_DBGEMPR_RSV_DATA_SHIFT)
 
-#define I40E_GL_DBGPOR                        0x00083104
+#define I40E_GL_DBGPOR                        0x00083104 /* Reset: POR */
 #define I40E_GL_DBGPOR_ROM_EMPR_TRIGGER_SHIFT 0
 #define I40E_GL_DBGPOR_ROM_EMPR_TRIGGER_MASK  I40E_MASK(0x1, I40E_GL_DBGPOR_ROM_EMPR_TRIGGER_SHIFT)
 #define I40E_GL_DBGPOR_RSV_DATA_SHIFT         1
 #define I40E_GL_DBGPOR_RSV_DATA_MASK          I40E_MASK(0x7FFFFFFF, I40E_GL_DBGPOR_RSV_DATA_SHIFT)
 
-#define I40E_GL_DBGRST                      0x0008310C
+#define I40E_GL_DBGRST                      0x0008310C /* Reset: POR */
 #define I40E_GL_DBGRST_PRST_RSV_DATA_SHIFT  0
 #define I40E_GL_DBGRST_PRST_RSV_DATA_MASK   I40E_MASK(0xFF, I40E_GL_DBGRST_PRST_RSV_DATA_SHIFT)
 #define I40E_GL_DBGRST_IBR_RSV_DATA_SHIFT   8
@@ -1984,7 +1994,7 @@
 #define I40E_GL_DBGRST_CORER_RSV_DATA_SHIFT 24
 #define I40E_GL_DBGRST_CORER_RSV_DATA_MASK  I40E_MASK(0xFF, I40E_GL_DBGRST_CORER_RSV_DATA_SHIFT)
 
-#define I40E_GL_MDEF_TR_CFG                   0x00269A5C
+#define I40E_GL_MDEF_TR_CFG                   0x00269A5C /* Reset: CORER */
 #define I40E_GL_MDEF_TR_CFG_TCP_TR_IDX_SHIFT  0
 #define I40E_GL_MDEF_TR_CFG_TCP_TR_IDX_MASK   I40E_MASK(0x3F, I40E_GL_MDEF_TR_CFG_TCP_TR_IDX_SHIFT)
 #define I40E_GL_MDEF_TR_CFG_UDP_TR_IDX_SHIFT  6
@@ -1996,15 +2006,15 @@
 #define I40E_GL_MDEF_TR_CFG_VLAN_TR_IDX_SHIFT 24
 #define I40E_GL_MDEF_TR_CFG_VLAN_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_MDEF_TR_CFG_VLAN_TR_IDX_SHIFT)
 
-#define I40E_GL_MDEF_TR_EXT_CFG                    0x00269A64
+#define I40E_GL_MDEF_TR_EXT_CFG                    0x00269A64 /* Reset: CORER */
 #define I40E_GL_MDEF_TR_EXT_CFG_FCTRL_TR_IDX_SHIFT 0
 #define I40E_GL_MDEF_TR_EXT_CFG_FCTRL_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_MDEF_TR_EXT_CFG_FCTRL_TR_IDX_SHIFT)
 
-#define I40E_GL_MTG_HSH_CTL                 0x00269984
+#define I40E_GL_MTG_HSH_CTL                 0x00269984 /* Reset: CORER */
 #define I40E_GL_MTG_HSH_CTL_HASH_MODE_SHIFT 0
 #define I40E_GL_MTG_HSH_CTL_HASH_MODE_MASK  I40E_MASK(0x3, I40E_GL_MTG_HSH_CTL_HASH_MODE_SHIFT)
 
-#define I40E_GL_MTG_MAP                      0x0026994C
+#define I40E_GL_MTG_MAP                      0x0026994C /* Reset: CORER */
 #define I40E_GL_MTG_MAP_ETAG_FV_IDX_SHIFT    0
 #define I40E_GL_MTG_MAP_ETAG_FV_IDX_MASK     I40E_MASK(0x3F, I40E_GL_MTG_MAP_ETAG_FV_IDX_SHIFT)
 #define I40E_GL_MTG_MAP_ETAG_TR_IDX_SHIFT    6
@@ -2016,54 +2026,54 @@
 #define I40E_GL_MTG_MAP_STAG_TR_IDX_SHIFT    24
 #define I40E_GL_MTG_MAP_STAG_TR_IDX_MASK     I40E_MASK(0x3F, I40E_GL_MTG_MAP_STAG_TR_IDX_SHIFT)
 
-#define I40E_GL_MTG_MAP_EXT                     0x00269954
+#define I40E_GL_MTG_MAP_EXT                     0x00269954 /* Reset: CORER */
 #define I40E_GL_MTG_MAP_EXT_O_VLAN_FV_IDX_SHIFT 0
 #define I40E_GL_MTG_MAP_EXT_O_VLAN_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_MTG_MAP_EXT_O_VLAN_FV_IDX_SHIFT)
 #define I40E_GL_MTG_MAP_EXT_O_VLAN_TR_IDX_SHIFT 6
 #define I40E_GL_MTG_MAP_EXT_O_VLAN_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_MTG_MAP_EXT_O_VLAN_TR_IDX_SHIFT)
 
-#define I40E_GL_MTG_REP_FLU_CTL                0x00269964
+#define I40E_GL_MTG_REP_FLU_CTL                0x00269964 /* Reset: CORER */
 #define I40E_GL_MTG_REP_FLU_CTL_FLU_MODE_SHIFT 0
 #define I40E_GL_MTG_REP_FLU_CTL_FLU_MODE_MASK  I40E_MASK(0xF, I40E_GL_MTG_REP_FLU_CTL_FLU_MODE_SHIFT)
 #define I40E_GL_MTG_REP_FLU_CTL_FLU_OVTH_SHIFT 8
 #define I40E_GL_MTG_REP_FLU_CTL_FLU_OVTH_MASK  I40E_MASK(0xFF, I40E_GL_MTG_REP_FLU_CTL_FLU_OVTH_SHIFT)
 
-#define I40E_GL_MTG_REP_MFIFO_CTL                     0x0026999C
+#define I40E_GL_MTG_REP_MFIFO_CTL                     0x0026999C /* Reset: CORER */
 #define I40E_GL_MTG_REP_MFIFO_CTL_UP_STRICT_PR_SHIFT  0
 #define I40E_GL_MTG_REP_MFIFO_CTL_UP_STRICT_PR_MASK   I40E_MASK(0xF, I40E_GL_MTG_REP_MFIFO_CTL_UP_STRICT_PR_SHIFT)
 #define I40E_GL_MTG_REP_MFIFO_CTL_PRT_STRICT_PR_SHIFT 4
 #define I40E_GL_MTG_REP_MFIFO_CTL_PRT_STRICT_PR_MASK  I40E_MASK(0x1, I40E_GL_MTG_REP_MFIFO_CTL_PRT_STRICT_PR_SHIFT)
 
-#define I40E_GL_MTG_TBL_CTL                0x0026997C
+#define I40E_GL_MTG_TBL_CTL                0x0026997C /* Reset: CORER */
 #define I40E_GL_MTG_TBL_CTL_FLU_MODE_SHIFT 0
 #define I40E_GL_MTG_TBL_CTL_FLU_MODE_MASK  I40E_MASK(0xF, I40E_GL_MTG_TBL_CTL_FLU_MODE_SHIFT)
 #define I40E_GL_MTG_TBL_CTL_FLU_OVTH_SHIFT 8
 #define I40E_GL_MTG_TBL_CTL_FLU_OVTH_MASK  I40E_MASK(0xFF, I40E_GL_MTG_TBL_CTL_FLU_OVTH_SHIFT)
 
-#define I40E_GL_PRE_FLU_CTL(_i)            (0x00269240 + ((_i) * 4)) /* _i=0...9 */
+#define I40E_GL_PRE_FLU_CTL(_i)            (0x00269240 + ((_i) * 4)) /* _i=0...9 */ /* Reset: CORER */
 #define I40E_GL_PRE_FLU_CTL_MAX_INDEX      9
 #define I40E_GL_PRE_FLU_CTL_FLU_MODE_SHIFT 0
 #define I40E_GL_PRE_FLU_CTL_FLU_MODE_MASK  I40E_MASK(0xF, I40E_GL_PRE_FLU_CTL_FLU_MODE_SHIFT)
 #define I40E_GL_PRE_FLU_CTL_FLU_OVTH_SHIFT 8
 #define I40E_GL_PRE_FLU_CTL_FLU_OVTH_MASK  I40E_MASK(0xFF, I40E_GL_PRE_FLU_CTL_FLU_OVTH_SHIFT)
 
-#define I40E_GL_PRE_HSH_KEY_D0                0x00269810
+#define I40E_GL_PRE_HSH_KEY_D0                0x00269810 /* Reset: CORER */
 #define I40E_GL_PRE_HSH_KEY_D0_HASH_KEY_SHIFT 0
 #define I40E_GL_PRE_HSH_KEY_D0_HASH_KEY_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_HSH_KEY_D0_HASH_KEY_SHIFT)
 
-#define I40E_GL_PRE_HSH_KEY_D1                0x00269814
+#define I40E_GL_PRE_HSH_KEY_D1                0x00269814 /* Reset: CORER */
 #define I40E_GL_PRE_HSH_KEY_D1_HASH_KEY_SHIFT 0
 #define I40E_GL_PRE_HSH_KEY_D1_HASH_KEY_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_HSH_KEY_D1_HASH_KEY_SHIFT)
 
-#define I40E_GL_PRE_HSH_KEY_D2                0x00269818
+#define I40E_GL_PRE_HSH_KEY_D2                0x00269818 /* Reset: CORER */
 #define I40E_GL_PRE_HSH_KEY_D2_HASH_KEY_SHIFT 0
 #define I40E_GL_PRE_HSH_KEY_D2_HASH_KEY_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_HSH_KEY_D2_HASH_KEY_SHIFT)
 
-#define I40E_GL_PRE_HSH_KEY_D3                0x0026981C
+#define I40E_GL_PRE_HSH_KEY_D3                0x0026981C /* Reset: CORER */
 #define I40E_GL_PRE_HSH_KEY_D3_HASH_KEY_SHIFT 0
 #define I40E_GL_PRE_HSH_KEY_D3_HASH_KEY_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_HSH_KEY_D3_HASH_KEY_SHIFT)
 
-#define I40E_GL_PRE_MNG_ARP_FLD_CFG                         0x00269A94
+#define I40E_GL_PRE_MNG_ARP_FLD_CFG                         0x00269A94 /* Reset: CORER */
 #define I40E_GL_PRE_MNG_ARP_FLD_CFG_FV_IDX_SHIFT            0
 #define I40E_GL_PRE_MNG_ARP_FLD_CFG_FV_IDX_MASK             I40E_MASK(0x3F, I40E_GL_PRE_MNG_ARP_FLD_CFG_FV_IDX_SHIFT)
 #define I40E_GL_PRE_MNG_ARP_FLD_CFG_TR_IDX_SHIFT            13
@@ -2071,71 +2081,71 @@
 #define I40E_GL_PRE_MNG_ARP_FLD_CFG_ARP_TAR_IP_FV_IDX_SHIFT 24
 #define I40E_GL_PRE_MNG_ARP_FLD_CFG_ARP_TAR_IP_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_ARP_FLD_CFG_ARP_TAR_IP_FV_IDX_SHIFT)
 
-#define I40E_GL_PRE_MNG_ETH_FLD_CFG              0x00269ABC
+#define I40E_GL_PRE_MNG_ETH_FLD_CFG              0x00269ABC /* Reset: CORER */
 #define I40E_GL_PRE_MNG_ETH_FLD_CFG_FV_IDX_SHIFT 0
 #define I40E_GL_PRE_MNG_ETH_FLD_CFG_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_ETH_FLD_CFG_FV_IDX_SHIFT)
 
-#define I40E_GL_PRE_MNG_ICMP_FLD_CFG              0x00269A9C
+#define I40E_GL_PRE_MNG_ICMP_FLD_CFG              0x00269A9C /* Reset: CORER */
 #define I40E_GL_PRE_MNG_ICMP_FLD_CFG_FV_IDX_SHIFT 0
 #define I40E_GL_PRE_MNG_ICMP_FLD_CFG_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_ICMP_FLD_CFG_FV_IDX_SHIFT)
 #define I40E_GL_PRE_MNG_ICMP_FLD_CFG_TR_IDX_SHIFT 13
 #define I40E_GL_PRE_MNG_ICMP_FLD_CFG_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_ICMP_FLD_CFG_TR_IDX_SHIFT)
 
-#define I40E_GL_PRE_MNG_IP4_FLD_CFG              0x00269AB4
+#define I40E_GL_PRE_MNG_IP4_FLD_CFG              0x00269AB4 /* Reset: CORER */
 #define I40E_GL_PRE_MNG_IP4_FLD_CFG_FV_IDX_SHIFT 0
 #define I40E_GL_PRE_MNG_IP4_FLD_CFG_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_IP4_FLD_CFG_FV_IDX_SHIFT)
 #define I40E_GL_PRE_MNG_IP4_FLD_CFG_TR_IDX_SHIFT 13
 #define I40E_GL_PRE_MNG_IP4_FLD_CFG_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_IP4_FLD_CFG_TR_IDX_SHIFT)
 
-#define I40E_GL_PRE_MNG_IP6_FLD_CFG              0x00269A7C
+#define I40E_GL_PRE_MNG_IP6_FLD_CFG              0x00269A7C /* Reset: CORER */
 #define I40E_GL_PRE_MNG_IP6_FLD_CFG_FV_IDX_SHIFT 0
 #define I40E_GL_PRE_MNG_IP6_FLD_CFG_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_IP6_FLD_CFG_FV_IDX_SHIFT)
 #define I40E_GL_PRE_MNG_IP6_FLD_CFG_TR_IDX_SHIFT 13
 #define I40E_GL_PRE_MNG_IP6_FLD_CFG_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_IP6_FLD_CFG_TR_IDX_SHIFT)
 
-#define I40E_GL_PRE_MNG_MAC_FLD_CFG              0x00269A8C
+#define I40E_GL_PRE_MNG_MAC_FLD_CFG              0x00269A8C /* Reset: CORER */
 #define I40E_GL_PRE_MNG_MAC_FLD_CFG_FV_IDX_SHIFT 0
 #define I40E_GL_PRE_MNG_MAC_FLD_CFG_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_MAC_FLD_CFG_FV_IDX_SHIFT)
 #define I40E_GL_PRE_MNG_MAC_FLD_CFG_TR_IDX_SHIFT 13
 #define I40E_GL_PRE_MNG_MAC_FLD_CFG_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_MAC_FLD_CFG_TR_IDX_SHIFT)
 
-#define I40E_GL_PRE_MNG_MLD_FLD_CFG              0x00269A6C
+#define I40E_GL_PRE_MNG_MLD_FLD_CFG              0x00269A6C /* Reset: CORER */
 #define I40E_GL_PRE_MNG_MLD_FLD_CFG_FV_IDX_SHIFT 0
 #define I40E_GL_PRE_MNG_MLD_FLD_CFG_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_MLD_FLD_CFG_FV_IDX_SHIFT)
 #define I40E_GL_PRE_MNG_MLD_FLD_CFG_TR_IDX_SHIFT 13
 #define I40E_GL_PRE_MNG_MLD_FLD_CFG_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_MLD_FLD_CFG_TR_IDX_SHIFT)
 
-#define I40E_GL_PRE_MNG_TCPDP_FLD_CFG              0x00269A74
+#define I40E_GL_PRE_MNG_TCPDP_FLD_CFG              0x00269A74 /* Reset: CORER */
 #define I40E_GL_PRE_MNG_TCPDP_FLD_CFG_FV_IDX_SHIFT 0
 #define I40E_GL_PRE_MNG_TCPDP_FLD_CFG_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_TCPDP_FLD_CFG_FV_IDX_SHIFT)
 #define I40E_GL_PRE_MNG_TCPDP_FLD_CFG_TR_IDX_SHIFT 13
 #define I40E_GL_PRE_MNG_TCPDP_FLD_CFG_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_TCPDP_FLD_CFG_TR_IDX_SHIFT)
 
-#define I40E_GL_PRE_MNG_TCPSP_FLD_CFG              0x00269AA4
+#define I40E_GL_PRE_MNG_TCPSP_FLD_CFG              0x00269AA4 /* Reset: CORER */
 #define I40E_GL_PRE_MNG_TCPSP_FLD_CFG_FV_IDX_SHIFT 0
 #define I40E_GL_PRE_MNG_TCPSP_FLD_CFG_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_TCPSP_FLD_CFG_FV_IDX_SHIFT)
 #define I40E_GL_PRE_MNG_TCPSP_FLD_CFG_TR_IDX_SHIFT 13
 #define I40E_GL_PRE_MNG_TCPSP_FLD_CFG_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_TCPSP_FLD_CFG_TR_IDX_SHIFT)
 
-#define I40E_GL_PRE_MNG_UDPDP_FLD_CFG              0x00269AAC
+#define I40E_GL_PRE_MNG_UDPDP_FLD_CFG              0x00269AAC /* Reset: CORER */
 #define I40E_GL_PRE_MNG_UDPDP_FLD_CFG_FV_IDX_SHIFT 0
 #define I40E_GL_PRE_MNG_UDPDP_FLD_CFG_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_UDPDP_FLD_CFG_FV_IDX_SHIFT)
 #define I40E_GL_PRE_MNG_UDPDP_FLD_CFG_TR_IDX_SHIFT 13
 #define I40E_GL_PRE_MNG_UDPDP_FLD_CFG_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_UDPDP_FLD_CFG_TR_IDX_SHIFT)
 
-#define I40E_GL_PRE_MNG_UDPSP_FLD_CFG              0x00269AC4
+#define I40E_GL_PRE_MNG_UDPSP_FLD_CFG              0x00269AC4 /* Reset: CORER */
 #define I40E_GL_PRE_MNG_UDPSP_FLD_CFG_FV_IDX_SHIFT 0
 #define I40E_GL_PRE_MNG_UDPSP_FLD_CFG_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_UDPSP_FLD_CFG_FV_IDX_SHIFT)
 #define I40E_GL_PRE_MNG_UDPSP_FLD_CFG_TR_IDX_SHIFT 13
 #define I40E_GL_PRE_MNG_UDPSP_FLD_CFG_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_UDPSP_FLD_CFG_TR_IDX_SHIFT)
 
-#define I40E_GL_PRE_MNG_VLAN_FLD_CFG              0x00269A84
+#define I40E_GL_PRE_MNG_VLAN_FLD_CFG              0x00269A84 /* Reset: CORER */
 #define I40E_GL_PRE_MNG_VLAN_FLD_CFG_FV_IDX_SHIFT 0
 #define I40E_GL_PRE_MNG_VLAN_FLD_CFG_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_VLAN_FLD_CFG_FV_IDX_SHIFT)
 #define I40E_GL_PRE_MNG_VLAN_FLD_CFG_TR_IDX_SHIFT 13
 #define I40E_GL_PRE_MNG_VLAN_FLD_CFG_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_MNG_VLAN_FLD_CFG_TR_IDX_SHIFT)
 
-#define I40E_GL_PRE_PRX_BIG_ENT_D2                 0x002699EC
+#define I40E_GL_PRE_PRX_BIG_ENT_D2                 0x002699EC /* Reset: CORER */
 #define I40E_GL_PRE_PRX_BIG_ENT_D2_USE_PORT_SHIFT  7
 #define I40E_GL_PRE_PRX_BIG_ENT_D2_USE_PORT_MASK   I40E_MASK(0x1, I40E_GL_PRE_PRX_BIG_ENT_D2_USE_PORT_SHIFT)
 #define I40E_GL_PRE_PRX_BIG_ENT_D2_TR_EN_SHIFT     8
@@ -2147,39 +2157,39 @@
 #define I40E_GL_PRE_PRX_BIG_ENT_D2_BIT_MSK0_SHIFT  24
 #define I40E_GL_PRE_PRX_BIG_ENT_D2_BIT_MSK0_MASK   I40E_MASK(0xFF, I40E_GL_PRE_PRX_BIG_ENT_D2_BIT_MSK0_SHIFT)
 
-#define I40E_GL_PRE_PRX_BIG_HSH_KEY_D0          0x00269A1C
+#define I40E_GL_PRE_PRX_BIG_HSH_KEY_D0          0x00269A1C /* Reset: CORER */
 #define I40E_GL_PRE_PRX_BIG_HSH_KEY_D0_H0_SHIFT 0
 #define I40E_GL_PRE_PRX_BIG_HSH_KEY_D0_H0_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_PRX_BIG_HSH_KEY_D0_H0_SHIFT)
 
-#define I40E_GL_PRE_PRX_BIG_HSH_KEY_D2          0x00269A3C
+#define I40E_GL_PRE_PRX_BIG_HSH_KEY_D2          0x00269A3C /* Reset: CORER */
 #define I40E_GL_PRE_PRX_BIG_HSH_KEY_D2_H2_SHIFT 0
 #define I40E_GL_PRE_PRX_BIG_HSH_KEY_D2_H2_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_PRX_BIG_HSH_KEY_D2_H2_SHIFT)
 
-#define I40E_GL_PRE_PRX_FLU_CTL                0x00269974
+#define I40E_GL_PRE_PRX_FLU_CTL                0x00269974 /* Reset: CORER */
 #define I40E_GL_PRE_PRX_FLU_CTL_FLU_MODE_SHIFT 0
 #define I40E_GL_PRE_PRX_FLU_CTL_FLU_MODE_MASK  I40E_MASK(0xF, I40E_GL_PRE_PRX_FLU_CTL_FLU_MODE_SHIFT)
 #define I40E_GL_PRE_PRX_FLU_CTL_FLU_OVTH_SHIFT 8
 #define I40E_GL_PRE_PRX_FLU_CTL_FLU_OVTH_MASK  I40E_MASK(0xFF, I40E_GL_PRE_PRX_FLU_CTL_FLU_OVTH_SHIFT)
 
-#define I40E_GL_PRE_PRX_GEN_CFG                     0x002699AC
+#define I40E_GL_PRE_PRX_GEN_CFG                     0x002699AC /* Reset: CORER */
 #define I40E_GL_PRE_PRX_GEN_CFG_FILTER_ENABLE_SHIFT 0
 #define I40E_GL_PRE_PRX_GEN_CFG_FILTER_ENABLE_MASK  I40E_MASK(0x1, I40E_GL_PRE_PRX_GEN_CFG_FILTER_ENABLE_SHIFT)
 #define I40E_GL_PRE_PRX_GEN_CFG_HASH_MODE_SHIFT     6
 #define I40E_GL_PRE_PRX_GEN_CFG_HASH_MODE_MASK      I40E_MASK(0x3, I40E_GL_PRE_PRX_GEN_CFG_HASH_MODE_SHIFT)
 
-#define I40E_GL_PRE_PRX_HSH_KEY_D1          0x00269A2C
+#define I40E_GL_PRE_PRX_HSH_KEY_D1          0x00269A2C /* Reset: CORER */
 #define I40E_GL_PRE_PRX_HSH_KEY_D1_H1_SHIFT 0
 #define I40E_GL_PRE_PRX_HSH_KEY_D1_H1_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_PRX_HSH_KEY_D1_H1_SHIFT)
 
-#define I40E_GL_PRE_PRX_HSH_KEY_D2          0x00269A44
+#define I40E_GL_PRE_PRX_HSH_KEY_D2          0x00269A44 /* Reset: CORER */
 #define I40E_GL_PRE_PRX_HSH_KEY_D2_H2_SHIFT 0
 #define I40E_GL_PRE_PRX_HSH_KEY_D2_H2_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_PRX_HSH_KEY_D2_H2_SHIFT)
 
-#define I40E_GL_PRE_PRX_HSH_KEY_D3          0x00269A4C
+#define I40E_GL_PRE_PRX_HSH_KEY_D3          0x00269A4C /* Reset: CORER */
 #define I40E_GL_PRE_PRX_HSH_KEY_D3_H3_SHIFT 0
 #define I40E_GL_PRE_PRX_HSH_KEY_D3_H3_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_PRX_HSH_KEY_D3_H3_SHIFT)
 
-#define I40E_GL_PRE_RDMABM_FLD_CFG                     0x002699B4
+#define I40E_GL_PRE_RDMABM_FLD_CFG                     0x002699B4 /* Reset: CORER */
 #define I40E_GL_PRE_RDMABM_FLD_CFG_TCP_DP_FV_IDX_SHIFT 0
 #define I40E_GL_PRE_RDMABM_FLD_CFG_TCP_DP_FV_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_RDMABM_FLD_CFG_TCP_DP_FV_IDX_SHIFT)
 #define I40E_GL_PRE_RDMABM_FLD_CFG_TCP_DP_TR_IDX_SHIFT 6
@@ -2189,7 +2199,7 @@
 #define I40E_GL_PRE_RDMABM_FLD_CFG_UDP_DP_TR_IDX_SHIFT 22
 #define I40E_GL_PRE_RDMABM_FLD_CFG_UDP_DP_TR_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_RDMABM_FLD_CFG_UDP_DP_TR_IDX_SHIFT)
 
-#define I40E_GL_PRE_TR_MAN(_i)               (0x00269F80 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_GL_PRE_TR_MAN(_i)               (0x00269F80 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_GL_PRE_TR_MAN_MAX_INDEX         7
 #define I40E_GL_PRE_TR_MAN_SRC_TR_IDX0_SHIFT 0
 #define I40E_GL_PRE_TR_MAN_SRC_TR_IDX0_MASK  I40E_MASK(0x3F, I40E_GL_PRE_TR_MAN_SRC_TR_IDX0_SHIFT)
@@ -2200,18 +2210,18 @@
 #define I40E_GL_PRE_TR_MAN_TR_MAN_NEG_SHIFT  18
 #define I40E_GL_PRE_TR_MAN_TR_MAN_NEG_MASK   I40E_MASK(0x1, I40E_GL_PRE_TR_MAN_TR_MAN_NEG_SHIFT)
 
-#define I40E_GL_PRS_FRT(_i)            (0x00269750 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GL_PRS_FRT(_i)            (0x00269750 + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GL_PRS_FRT_MAX_INDEX      3
 #define I40E_GL_PRS_FRT_FV_IDX_0_SHIFT 0
 #define I40E_GL_PRS_FRT_FV_IDX_0_MASK  I40E_MASK(0x3FF, I40E_GL_PRS_FRT_FV_IDX_0_SHIFT)
 #define I40E_GL_PRS_FRT_FV_IDX_1_SHIFT 16
 #define I40E_GL_PRS_FRT_FV_IDX_1_MASK  I40E_MASK(0x3FF, I40E_GL_PRS_FRT_FV_IDX_1_SHIFT)
 
-#define I40E_GL_PRS_L2LEN               0x0026996C
+#define I40E_GL_PRS_L2LEN               0x0026996C /* Reset: CORER */
 #define I40E_GL_PRS_L2LEN_MAC_LEN_SHIFT 8
 #define I40E_GL_PRS_L2LEN_MAC_LEN_MASK  I40E_MASK(0xFF, I40E_GL_PRS_L2LEN_MAC_LEN_SHIFT)
 
-#define I40E_GL_PRS_PL_THR                     0x00269FE4
+#define I40E_GL_PRS_PL_THR                     0x00269FE4 /* Reset: CORER */
 #define I40E_GL_PRS_PL_THR_PIPE_LIMIT_P0_SHIFT 0
 #define I40E_GL_PRS_PL_THR_PIPE_LIMIT_P0_MASK  I40E_MASK(0xFF, I40E_GL_PRS_PL_THR_PIPE_LIMIT_P0_SHIFT)
 #define I40E_GL_PRS_PL_THR_PIPE_LIMIT_P1_SHIFT 8
@@ -2221,7 +2231,7 @@
 #define I40E_GL_PRS_PL_THR_PIPE_LIMIT_P3_SHIFT 24
 #define I40E_GL_PRS_PL_THR_PIPE_LIMIT_P3_MASK  I40E_MASK(0xFF, I40E_GL_PRS_PL_THR_PIPE_LIMIT_P3_SHIFT)
 
-#define I40E_GL_PRS_PM_PORT_THR                  0x00269FC4
+#define I40E_GL_PRS_PM_PORT_THR                  0x00269FC4 /* Reset: CORER */
 #define I40E_GL_PRS_PM_PORT_THR_THR_PORT_0_SHIFT 0
 #define I40E_GL_PRS_PM_PORT_THR_THR_PORT_0_MASK  I40E_MASK(0xFF, I40E_GL_PRS_PM_PORT_THR_THR_PORT_0_SHIFT)
 #define I40E_GL_PRS_PM_PORT_THR_THR_PORT_1_SHIFT 8
@@ -2231,7 +2241,7 @@
 #define I40E_GL_PRS_PM_PORT_THR_THR_PORT_3_SHIFT 24
 #define I40E_GL_PRS_PM_PORT_THR_THR_PORT_3_MASK  I40E_MASK(0xFF, I40E_GL_PRS_PM_PORT_THR_THR_PORT_3_SHIFT)
 
-#define I40E_GL_PRS_PM_UP_THR                 0x00269FCC
+#define I40E_GL_PRS_PM_UP_THR                 0x00269FCC /* Reset: CORER */
 #define I40E_GL_PRS_PM_UP_THR_UP_PORT_0_SHIFT 0
 #define I40E_GL_PRS_PM_UP_THR_UP_PORT_0_MASK  I40E_MASK(0xFF, I40E_GL_PRS_PM_UP_THR_UP_PORT_0_SHIFT)
 #define I40E_GL_PRS_PM_UP_THR_UP_PORT_1_SHIFT 8
@@ -2241,7 +2251,7 @@
 #define I40E_GL_PRS_PM_UP_THR_UP_PORT_3_SHIFT 24
 #define I40E_GL_PRS_PM_UP_THR_UP_PORT_3_MASK  I40E_MASK(0xFF, I40E_GL_PRS_PM_UP_THR_UP_PORT_3_SHIFT)
 
-#define I40E_GL_RXA_CFG                     0x00269944
+#define I40E_GL_RXA_CFG                     0x00269944 /* Reset: CORER */
 #define I40E_GL_RXA_CFG_UP_STRICT_PR_SHIFT  0
 #define I40E_GL_RXA_CFG_UP_STRICT_PR_MASK   I40E_MASK(0xF, I40E_GL_RXA_CFG_UP_STRICT_PR_SHIFT)
 #define I40E_GL_RXA_CFG_PRT_STRICT_PR_SHIFT 4
@@ -2251,16 +2261,16 @@
 #define I40E_GL_RXA_CFG_MAX_HDR_LEN_SHIFT   15
 #define I40E_GL_RXA_CFG_MAX_HDR_LEN_MASK    I40E_MASK(0x7F, I40E_GL_RXA_CFG_MAX_HDR_LEN_SHIFT)
 
-#define I40E_GL_SWR_DP                 0x00269998
+#define I40E_GL_SWR_DP                 0x00269998 /* Reset: CORER */
 #define I40E_GL_SWR_DP_DUAL_PORT_SHIFT 0
 #define I40E_GL_SWR_DP_DUAL_PORT_MASK  I40E_MASK(0x1, I40E_GL_SWR_DP_DUAL_PORT_SHIFT)
 
-#define I40E_GL_SWR_MAC_AS_FLU_ID(_i)               (0x00269BE8 + ((_i) * 4)) /* _i=0...1 */
+#define I40E_GL_SWR_MAC_AS_FLU_ID(_i)               (0x00269BE8 + ((_i) * 4)) /* _i=0...1 */ /* Reset: CORER */
 #define I40E_GL_SWR_MAC_AS_FLU_ID_MAX_INDEX         1
 #define I40E_GL_SWR_MAC_AS_FLU_ID_FLU_INDEXES_SHIFT 0
 #define I40E_GL_SWR_MAC_AS_FLU_ID_FLU_INDEXES_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWR_MAC_AS_FLU_ID_FLU_INDEXES_SHIFT)
 
-#define I40E_GL_SWR_MIM_DBG_CTL                  0x00269FE8
+#define I40E_GL_SWR_MIM_DBG_CTL                  0x00269FE8 /* Reset: CORER */
 #define I40E_GL_SWR_MIM_DBG_CTL_ADDR_SHIFT       0
 #define I40E_GL_SWR_MIM_DBG_CTL_ADDR_MASK        I40E_MASK(0x1FF, I40E_GL_SWR_MIM_DBG_CTL_ADDR_SHIFT)
 #define I40E_GL_SWR_MIM_DBG_CTL_DW_SEL_SHIFT     16
@@ -2270,11 +2280,11 @@
 #define I40E_GL_SWR_MIM_DBG_CTL_BLOCK_PRSR_SHIFT 31
 #define I40E_GL_SWR_MIM_DBG_CTL_BLOCK_PRSR_MASK  I40E_MASK(0x1, I40E_GL_SWR_MIM_DBG_CTL_BLOCK_PRSR_SHIFT)
 
-#define I40E_GL_SWR_MIM_DBG_STS                          0x00269FEC
+#define I40E_GL_SWR_MIM_DBG_STS                          0x00269FEC /* Reset: CORER */
 #define I40E_GL_SWR_MIM_DBG_STS_GL_SWR_MIM_DBG_STS_SHIFT 0
 #define I40E_GL_SWR_MIM_DBG_STS_GL_SWR_MIM_DBG_STS_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWR_MIM_DBG_STS_GL_SWR_MIM_DBG_STS_SHIFT)
 
-#define I40E_GL_SWR_PM_PORT_THR                  0x00269FB4
+#define I40E_GL_SWR_PM_PORT_THR                  0x00269FB4 /* Reset: CORER */
 #define I40E_GL_SWR_PM_PORT_THR_THR_PORT_0_SHIFT 0
 #define I40E_GL_SWR_PM_PORT_THR_THR_PORT_0_MASK  I40E_MASK(0xFF, I40E_GL_SWR_PM_PORT_THR_THR_PORT_0_SHIFT)
 #define I40E_GL_SWR_PM_PORT_THR_THR_PORT_1_SHIFT 8
@@ -2284,13 +2294,13 @@
 #define I40E_GL_SWR_PM_PORT_THR_THR_PORT_3_SHIFT 24
 #define I40E_GL_SWR_PM_PORT_THR_THR_PORT_3_MASK  I40E_MASK(0xFF, I40E_GL_SWR_PM_PORT_THR_THR_PORT_3_SHIFT)
 
-#define I40E_GL_SWR_REP_FLU_CTL                0x0026995C
+#define I40E_GL_SWR_REP_FLU_CTL                0x0026995C /* Reset: CORER */
 #define I40E_GL_SWR_REP_FLU_CTL_FLU_MODE_SHIFT 0
 #define I40E_GL_SWR_REP_FLU_CTL_FLU_MODE_MASK  I40E_MASK(0xF, I40E_GL_SWR_REP_FLU_CTL_FLU_MODE_SHIFT)
 #define I40E_GL_SWR_REP_FLU_CTL_FLU_OVTH_SHIFT 8
 #define I40E_GL_SWR_REP_FLU_CTL_FLU_OVTH_MASK  I40E_MASK(0xFF, I40E_GL_SWR_REP_FLU_CTL_FLU_OVTH_SHIFT)
 
-#define I40E_GL_SWR_REP_MFIFO_CTL                     0x00269994
+#define I40E_GL_SWR_REP_MFIFO_CTL                     0x00269994 /* Reset: CORER */
 #define I40E_GL_SWR_REP_MFIFO_CTL_UP_STRICT_PR_SHIFT  0
 #define I40E_GL_SWR_REP_MFIFO_CTL_UP_STRICT_PR_MASK   I40E_MASK(0xF, I40E_GL_SWR_REP_MFIFO_CTL_UP_STRICT_PR_SHIFT)
 #define I40E_GL_SWR_REP_MFIFO_CTL_PRT_STRICT_PR_SHIFT 4
@@ -2298,7 +2308,7 @@
 #define I40E_GL_SWR_REP_MFIFO_CTL_SPARE27B_SHIFT      5
 #define I40E_GL_SWR_REP_MFIFO_CTL_SPARE27B_MASK       I40E_MASK(0x7FFFFFF, I40E_GL_SWR_REP_MFIFO_CTL_SPARE27B_SHIFT)
 
-#define I40E_GLCM_LAN_CACHE0_MEM_CFG                    0x0010C48C
+#define I40E_GLCM_LAN_CACHE0_MEM_CFG                    0x0010C48C /* Reset: POR */
 #define I40E_GLCM_LAN_CACHE0_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_GLCM_LAN_CACHE0_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_GLCM_LAN_CACHE0_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_GLCM_LAN_CACHE0_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -2324,7 +2334,7 @@
 #define I40E_GLCM_LAN_CACHE0_MEM_CFG_RM_B_SHIFT         20
 #define I40E_GLCM_LAN_CACHE0_MEM_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_GLCM_LAN_CACHE0_MEM_CFG_RM_B_SHIFT)
 
-#define I40E_GLCM_LAN_CACHE0_MEM_STATUS                        0x0010C490
+#define I40E_GLCM_LAN_CACHE0_MEM_STATUS                        0x0010C490 /* Reset: POR */
 #define I40E_GLCM_LAN_CACHE0_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_GLCM_LAN_CACHE0_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_GLCM_LAN_CACHE0_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_GLCM_LAN_CACHE0_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -2334,7 +2344,7 @@
 #define I40E_GLCM_LAN_CACHE0_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_GLCM_LAN_CACHE0_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_GLCM_LAN_CACHE0_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_GLCM_LAN_CACHE1_MEM_CFG                    0x0010C494
+#define I40E_GLCM_LAN_CACHE1_MEM_CFG                    0x0010C494 /* Reset: POR */
 #define I40E_GLCM_LAN_CACHE1_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_GLCM_LAN_CACHE1_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_GLCM_LAN_CACHE1_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_GLCM_LAN_CACHE1_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -2360,7 +2370,7 @@
 #define I40E_GLCM_LAN_CACHE1_MEM_CFG_RM_B_SHIFT         20
 #define I40E_GLCM_LAN_CACHE1_MEM_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_GLCM_LAN_CACHE1_MEM_CFG_RM_B_SHIFT)
 
-#define I40E_GLCM_LAN_CACHE1_MEM_STATUS                        0x0010C498
+#define I40E_GLCM_LAN_CACHE1_MEM_STATUS                        0x0010C498 /* Reset: POR */
 #define I40E_GLCM_LAN_CACHE1_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_GLCM_LAN_CACHE1_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_GLCM_LAN_CACHE1_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_GLCM_LAN_CACHE1_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -2370,7 +2380,7 @@
 #define I40E_GLCM_LAN_CACHE1_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_GLCM_LAN_CACHE1_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_GLCM_LAN_CACHE1_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_GLCM_LAN_DBELL_MEM_CFG                    0x0010C49C
+#define I40E_GLCM_LAN_DBELL_MEM_CFG                    0x0010C49C /* Reset: POR */
 #define I40E_GLCM_LAN_DBELL_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_GLCM_LAN_DBELL_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_GLCM_LAN_DBELL_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_GLCM_LAN_DBELL_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -2396,7 +2406,7 @@
 #define I40E_GLCM_LAN_DBELL_MEM_CFG_RM_B_SHIFT         20
 #define I40E_GLCM_LAN_DBELL_MEM_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_GLCM_LAN_DBELL_MEM_CFG_RM_B_SHIFT)
 
-#define I40E_GLCM_LAN_DBELL_MEM_STATUS                        0x0010C4A0
+#define I40E_GLCM_LAN_DBELL_MEM_STATUS                        0x0010C4A0 /* Reset: POR */
 #define I40E_GLCM_LAN_DBELL_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_GLCM_LAN_DBELL_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_GLCM_LAN_DBELL_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_GLCM_LAN_DBELL_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -2406,15 +2416,15 @@
 #define I40E_GLCM_LAN_DBELL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_GLCM_LAN_DBELL_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_GLCM_LAN_DBELL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_GLCM_LAN_ECC_COR_ERR           0x0010C4D0
+#define I40E_GLCM_LAN_ECC_COR_ERR           0x0010C4D0 /* Reset: POR */
 #define I40E_GLCM_LAN_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_GLCM_LAN_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_GLCM_LAN_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_GLCM_LAN_ECC_UNCOR_ERR           0x0010C4CC
+#define I40E_GLCM_LAN_ECC_UNCOR_ERR           0x0010C4CC /* Reset: POR */
 #define I40E_GLCM_LAN_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_GLCM_LAN_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_GLCM_LAN_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_GLCM_LAN_EVICTBUF_MEM_CFG                    0x0010C4A4
+#define I40E_GLCM_LAN_EVICTBUF_MEM_CFG                    0x0010C4A4 /* Reset: POR */
 #define I40E_GLCM_LAN_EVICTBUF_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_GLCM_LAN_EVICTBUF_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_GLCM_LAN_EVICTBUF_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_GLCM_LAN_EVICTBUF_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -2436,7 +2446,7 @@
 #define I40E_GLCM_LAN_EVICTBUF_MEM_CFG_RM_SHIFT           16
 #define I40E_GLCM_LAN_EVICTBUF_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_GLCM_LAN_EVICTBUF_MEM_CFG_RM_SHIFT)
 
-#define I40E_GLCM_LAN_EVICTBUF_MEM_STATUS                        0x0010C4A8
+#define I40E_GLCM_LAN_EVICTBUF_MEM_STATUS                        0x0010C4A8 /* Reset: POR */
 #define I40E_GLCM_LAN_EVICTBUF_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_GLCM_LAN_EVICTBUF_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_GLCM_LAN_EVICTBUF_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_GLCM_LAN_EVICTBUF_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -2446,7 +2456,7 @@
 #define I40E_GLCM_LAN_EVICTBUF_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_GLCM_LAN_EVICTBUF_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_GLCM_LAN_EVICTBUF_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_GLCM_LAN_FILLBUF_MEM_CFG                    0x0010C4AC
+#define I40E_GLCM_LAN_FILLBUF_MEM_CFG                    0x0010C4AC /* Reset: POR */
 #define I40E_GLCM_LAN_FILLBUF_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_GLCM_LAN_FILLBUF_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_GLCM_LAN_FILLBUF_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_GLCM_LAN_FILLBUF_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -2468,7 +2478,7 @@
 #define I40E_GLCM_LAN_FILLBUF_MEM_CFG_RM_SHIFT           16
 #define I40E_GLCM_LAN_FILLBUF_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_GLCM_LAN_FILLBUF_MEM_CFG_RM_SHIFT)
 
-#define I40E_GLCM_LAN_FILLBUF_MEM_STATUS                        0x0010C4B0
+#define I40E_GLCM_LAN_FILLBUF_MEM_STATUS                        0x0010C4B0 /* Reset: POR */
 #define I40E_GLCM_LAN_FILLBUF_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_GLCM_LAN_FILLBUF_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_GLCM_LAN_FILLBUF_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_GLCM_LAN_FILLBUF_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -2478,7 +2488,7 @@
 #define I40E_GLCM_LAN_FILLBUF_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_GLCM_LAN_FILLBUF_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_GLCM_LAN_FILLBUF_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_GLCM_LAN_QTXCTL_MEM_CFG                    0x0010C4BC
+#define I40E_GLCM_LAN_QTXCTL_MEM_CFG                    0x0010C4BC /* Reset: POR */
 #define I40E_GLCM_LAN_QTXCTL_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_GLCM_LAN_QTXCTL_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_GLCM_LAN_QTXCTL_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_GLCM_LAN_QTXCTL_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -2500,7 +2510,7 @@
 #define I40E_GLCM_LAN_QTXCTL_MEM_CFG_RM_SHIFT           16
 #define I40E_GLCM_LAN_QTXCTL_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_GLCM_LAN_QTXCTL_MEM_CFG_RM_SHIFT)
 
-#define I40E_GLCM_LAN_QTXCTL_MEM_STATUS                        0x0010C4C0
+#define I40E_GLCM_LAN_QTXCTL_MEM_STATUS                        0x0010C4C0 /* Reset: POR */
 #define I40E_GLCM_LAN_QTXCTL_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_GLCM_LAN_QTXCTL_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_GLCM_LAN_QTXCTL_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_GLCM_LAN_QTXCTL_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -2510,7 +2520,7 @@
 #define I40E_GLCM_LAN_QTXCTL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_GLCM_LAN_QTXCTL_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_GLCM_LAN_QTXCTL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_GLCM_LAN_RDYLIST_MEM_CFG                    0x0010C4B4
+#define I40E_GLCM_LAN_RDYLIST_MEM_CFG                    0x0010C4B4 /* Reset: POR */
 #define I40E_GLCM_LAN_RDYLIST_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_GLCM_LAN_RDYLIST_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_GLCM_LAN_RDYLIST_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_GLCM_LAN_RDYLIST_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -2532,7 +2542,7 @@
 #define I40E_GLCM_LAN_RDYLIST_MEM_CFG_RM_SHIFT           16
 #define I40E_GLCM_LAN_RDYLIST_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_GLCM_LAN_RDYLIST_MEM_CFG_RM_SHIFT)
 
-#define I40E_GLCM_LAN_RDYLIST_MEM_STATUS                        0x0010C4B8
+#define I40E_GLCM_LAN_RDYLIST_MEM_STATUS                        0x0010C4B8 /* Reset: POR */
 #define I40E_GLCM_LAN_RDYLIST_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_GLCM_LAN_RDYLIST_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_GLCM_LAN_RDYLIST_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_GLCM_LAN_RDYLIST_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -2542,7 +2552,7 @@
 #define I40E_GLCM_LAN_RDYLIST_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_GLCM_LAN_RDYLIST_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_GLCM_LAN_RDYLIST_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_GLCM_LAN_TAILPTR_MEM_CFG                    0x0010C4C4
+#define I40E_GLCM_LAN_TAILPTR_MEM_CFG                    0x0010C4C4 /* Reset: POR */
 #define I40E_GLCM_LAN_TAILPTR_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_GLCM_LAN_TAILPTR_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_GLCM_LAN_TAILPTR_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_GLCM_LAN_TAILPTR_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -2568,7 +2578,7 @@
 #define I40E_GLCM_LAN_TAILPTR_MEM_CFG_RM_B_SHIFT         20
 #define I40E_GLCM_LAN_TAILPTR_MEM_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_GLCM_LAN_TAILPTR_MEM_CFG_RM_B_SHIFT)
 
-#define I40E_GLCM_LAN_TAILPTR_MEM_STATUS                        0x0010C4C8
+#define I40E_GLCM_LAN_TAILPTR_MEM_STATUS                        0x0010C4C8 /* Reset: POR */
 #define I40E_GLCM_LAN_TAILPTR_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_GLCM_LAN_TAILPTR_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_GLCM_LAN_TAILPTR_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_GLCM_LAN_TAILPTR_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -2578,11 +2588,11 @@
 #define I40E_GLCM_LAN_TAILPTR_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_GLCM_LAN_TAILPTR_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_GLCM_LAN_TAILPTR_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_GLDFT_NCSI_PADS_CFG                       0x0009408C
+#define I40E_GLDFT_NCSI_PADS_CFG                       0x0009408C /* Reset: POR */
 #define I40E_GLDFT_NCSI_PADS_CFG_GLNCSI_PADS_CFG_SHIFT 0
 #define I40E_GLDFT_NCSI_PADS_CFG_GLNCSI_PADS_CFG_MASK  I40E_MASK(0x1, I40E_GLDFT_NCSI_PADS_CFG_GLNCSI_PADS_CFG_SHIFT)
 
-#define I40E_GLDFT_TS_STAT                       0x00094080
+#define I40E_GLDFT_TS_STAT                       0x00094080 /* Reset: POR */
 #define I40E_GLDFT_TS_STAT_SBL_THERM_IND_SHIFT   0
 #define I40E_GLDFT_TS_STAT_SBL_THERM_IND_MASK    I40E_MASK(0x7, I40E_GLDFT_TS_STAT_SBL_THERM_IND_SHIFT)
 #define I40E_GLDFT_TS_STAT_SBT_THERM_VAL_SHIFT   3
@@ -2590,7 +2600,7 @@
 #define I40E_GLDFT_TS_STAT_SBT_THERM_VALID_SHIFT 31
 #define I40E_GLDFT_TS_STAT_SBT_THERM_VALID_MASK  I40E_MASK(0x1, I40E_GLDFT_TS_STAT_SBT_THERM_VALID_SHIFT)
 
-#define I40E_GLDFT_VISA_CTRL                    0x00094084
+#define I40E_GLDFT_VISA_CTRL                    0x00094084 /* Reset: POR */
 #define I40E_GLDFT_VISA_CTRL_VISA_INDEX_SHIFT   0
 #define I40E_GLDFT_VISA_CTRL_VISA_INDEX_MASK    I40E_MASK(0x1F, I40E_GLDFT_VISA_CTRL_VISA_INDEX_SHIFT)
 #define I40E_GLDFT_VISA_CTRL_VISA_UNIT_ID_SHIFT 5
@@ -2598,95 +2608,95 @@
 #define I40E_GLDFT_VISA_CTRL_VISA_OPCODE_SHIFT  31
 #define I40E_GLDFT_VISA_CTRL_VISA_OPCODE_MASK   I40E_MASK(0x1, I40E_GLDFT_VISA_CTRL_VISA_OPCODE_SHIFT)
 
-#define I40E_GLDFT_VISA_DATA                       0x00094088
+#define I40E_GLDFT_VISA_DATA                       0x00094088 /* Reset: POR */
 #define I40E_GLDFT_VISA_DATA_GLDFT_VISA_DATA_SHIFT 0
 #define I40E_GLDFT_VISA_DATA_GLDFT_VISA_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLDFT_VISA_DATA_GLDFT_VISA_DATA_SHIFT)
 
-#define I40E_GLDFT_VISA_DISABLE                             0x00094098
+#define I40E_GLDFT_VISA_DISABLE                             0x00094098 /* Reset: POR */
 #define I40E_GLDFT_VISA_DISABLE_VISA_CUSTOMER_DISABLE_SHIFT 0
 #define I40E_GLDFT_VISA_DISABLE_VISA_CUSTOMER_DISABLE_MASK  I40E_MASK(0x1, I40E_GLDFT_VISA_DISABLE_VISA_CUSTOMER_DISABLE_SHIFT)
 #define I40E_GLDFT_VISA_DISABLE_VISA_ALL_DISABLE_SHIFT      1
 #define I40E_GLDFT_VISA_DISABLE_VISA_ALL_DISABLE_MASK       I40E_MASK(0x1, I40E_GLDFT_VISA_DISABLE_VISA_ALL_DISABLE_SHIFT)
 
-#define I40E_GLDFT_VISA_LANE_LSB                           0x00094090
+#define I40E_GLDFT_VISA_LANE_LSB                           0x00094090 /* Reset: POR */
 #define I40E_GLDFT_VISA_LANE_LSB_GLDFT_VISA_LANE_LSB_SHIFT 0
 #define I40E_GLDFT_VISA_LANE_LSB_GLDFT_VISA_LANE_LSB_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLDFT_VISA_LANE_LSB_GLDFT_VISA_LANE_LSB_SHIFT)
 
-#define I40E_GLDFT_VISA_LANE_MSB                           0x00094094
+#define I40E_GLDFT_VISA_LANE_MSB                           0x00094094 /* Reset: POR */
 #define I40E_GLDFT_VISA_LANE_MSB_GLDFT_VISA_LANE_MSB_SHIFT 0
 #define I40E_GLDFT_VISA_LANE_MSB_GLDFT_VISA_LANE_MSB_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLDFT_VISA_LANE_MSB_GLDFT_VISA_LANE_MSB_SHIFT)
 
-#define I40E_GLLAN_TCB_STAT               0x000AE0D0
+#define I40E_GLLAN_TCB_STAT               0x000AE0D0 /* Reset: CORER */
 #define I40E_GLLAN_TCB_STAT_LL_STAT_SHIFT 0
 #define I40E_GLLAN_TCB_STAT_LL_STAT_MASK  I40E_MASK(0xFFFF, I40E_GLLAN_TCB_STAT_LL_STAT_SHIFT)
 #define I40E_GLLAN_TCB_STAT_RSV_SHIFT     16
 #define I40E_GLLAN_TCB_STAT_RSV_MASK      I40E_MASK(0xFFFF, I40E_GLLAN_TCB_STAT_RSV_SHIFT)
 
-#define I40E_GLPCI_CLKCTL                      0x000B819C
+#define I40E_GLPCI_CLKCTL                      0x000B819C /* Reset: POR */
 #define I40E_GLPCI_CLKCTL_PCI_CLK_DYN_SHIFT    0
 #define I40E_GLPCI_CLKCTL_PCI_CLK_DYN_MASK     I40E_MASK(0x1, I40E_GLPCI_CLKCTL_PCI_CLK_DYN_SHIFT)
 #define I40E_GLPCI_CLKCTL_PCI_CLK_STABLE_SHIFT 1
 #define I40E_GLPCI_CLKCTL_PCI_CLK_STABLE_MASK  I40E_MASK(0x1, I40E_GLPCI_CLKCTL_PCI_CLK_STABLE_SHIFT)
 
-#define I40E_GLPCI_MCTP_CREDIT              0x000BE4EC
+#define I40E_GLPCI_MCTP_CREDIT              0x000BE4EC /* Reset: PCIR */
 #define I40E_GLPCI_MCTP_CREDIT_HEADER_SHIFT 0
 #define I40E_GLPCI_MCTP_CREDIT_HEADER_MASK  I40E_MASK(0xFF, I40E_GLPCI_MCTP_CREDIT_HEADER_SHIFT)
 #define I40E_GLPCI_MCTP_CREDIT_DATA_SHIFT   8
 #define I40E_GLPCI_MCTP_CREDIT_DATA_MASK    I40E_MASK(0xFFF, I40E_GLPCI_MCTP_CREDIT_DATA_SHIFT)
 
-#define I40E_GLPCI_MCTP_MASK_0                         0x000BE4C4
+#define I40E_GLPCI_MCTP_MASK_0                         0x000BE4C4 /* Reset: PCIR */
 #define I40E_GLPCI_MCTP_MASK_0_GLPCI_MCTP_MASK_0_SHIFT 0
 #define I40E_GLPCI_MCTP_MASK_0_GLPCI_MCTP_MASK_0_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_MCTP_MASK_0_GLPCI_MCTP_MASK_0_SHIFT)
 
-#define I40E_GLPCI_MCTP_MASK_1                         0x000BE4C8
+#define I40E_GLPCI_MCTP_MASK_1                         0x000BE4C8 /* Reset: PCIR */
 #define I40E_GLPCI_MCTP_MASK_1_GLPCI_MCTP_MASK_1_SHIFT 0
 #define I40E_GLPCI_MCTP_MASK_1_GLPCI_MCTP_MASK_1_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_MCTP_MASK_1_GLPCI_MCTP_MASK_1_SHIFT)
 
-#define I40E_GLPCI_MCTP_MASK_2                         0x000BE4CC
+#define I40E_GLPCI_MCTP_MASK_2                         0x000BE4CC /* Reset: PCIR */
 #define I40E_GLPCI_MCTP_MASK_2_GLPCI_MCTP_MASK_2_SHIFT 0
 #define I40E_GLPCI_MCTP_MASK_2_GLPCI_MCTP_MASK_2_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_MCTP_MASK_2_GLPCI_MCTP_MASK_2_SHIFT)
 
-#define I40E_GLPCI_MCTP_MASK_3                         0x000BE4D0
+#define I40E_GLPCI_MCTP_MASK_3                         0x000BE4D0 /* Reset: PCIR */
 #define I40E_GLPCI_MCTP_MASK_3_GLPCI_MCTP_MASK_3_SHIFT 0
 #define I40E_GLPCI_MCTP_MASK_3_GLPCI_MCTP_MASK_3_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_MCTP_MASK_3_GLPCI_MCTP_MASK_3_SHIFT)
 
-#define I40E_GLPCI_MCTP_MAX_PAY                          0x000BE4E8
+#define I40E_GLPCI_MCTP_MAX_PAY                          0x000BE4E8 /* Reset: PCIR */
 #define I40E_GLPCI_MCTP_MAX_PAY_GLPCI_MCTP_MAX_PAY_SHIFT 0
 #define I40E_GLPCI_MCTP_MAX_PAY_GLPCI_MCTP_MAX_PAY_MASK  I40E_MASK(0x7FF, I40E_GLPCI_MCTP_MAX_PAY_GLPCI_MCTP_MAX_PAY_SHIFT)
 
-#define I40E_GLPCI_MCTP_VAL_0                        0x000BE4D4
+#define I40E_GLPCI_MCTP_VAL_0                        0x000BE4D4 /* Reset: PCIR */
 #define I40E_GLPCI_MCTP_VAL_0_GLPCI_MCTP_VAL_0_SHIFT 0
 #define I40E_GLPCI_MCTP_VAL_0_GLPCI_MCTP_VAL_0_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_MCTP_VAL_0_GLPCI_MCTP_VAL_0_SHIFT)
 
-#define I40E_GLPCI_MCTP_VAL_1                        0x000BE4D8
+#define I40E_GLPCI_MCTP_VAL_1                        0x000BE4D8 /* Reset: PCIR */
 #define I40E_GLPCI_MCTP_VAL_1_GLPCI_MCTP_VAL_1_SHIFT 0
 #define I40E_GLPCI_MCTP_VAL_1_GLPCI_MCTP_VAL_1_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_MCTP_VAL_1_GLPCI_MCTP_VAL_1_SHIFT)
 
-#define I40E_GLPCI_MCTP_VAL_2                        0x000BE4DC
+#define I40E_GLPCI_MCTP_VAL_2                        0x000BE4DC /* Reset: PCIR */
 #define I40E_GLPCI_MCTP_VAL_2_GLPCI_MCTP_VAL_2_SHIFT 0
 #define I40E_GLPCI_MCTP_VAL_2_GLPCI_MCTP_VAL_2_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_MCTP_VAL_2_GLPCI_MCTP_VAL_2_SHIFT)
 
-#define I40E_GLPCI_MCTP_VAL_3                        0x000BE4E0
+#define I40E_GLPCI_MCTP_VAL_3                        0x000BE4E0 /* Reset: PCIR */
 #define I40E_GLPCI_MCTP_VAL_3_GLPCI_MCTP_VAL_3_SHIFT 0
 #define I40E_GLPCI_MCTP_VAL_3_GLPCI_MCTP_VAL_3_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_MCTP_VAL_3_GLPCI_MCTP_VAL_3_SHIFT)
 
-#define I40E_GLPCI_OSR_LIMIT                 0x000BE504
+#define I40E_GLPCI_OSR_LIMIT                 0x000BE504 /* Reset: PCIR */
 #define I40E_GLPCI_OSR_LIMIT_OSR_LIMIT_SHIFT 0
 #define I40E_GLPCI_OSR_LIMIT_OSR_LIMIT_MASK  I40E_MASK(0xFF, I40E_GLPCI_OSR_LIMIT_OSR_LIMIT_SHIFT)
 
-#define I40E_GLPCI_PHY_SPARE_IN                    0x000BE508
+#define I40E_GLPCI_PHY_SPARE_IN                    0x000BE508 /* Reset: POR */
 #define I40E_GLPCI_PHY_SPARE_IN_DIG_IN_SPARE_SHIFT 0
 #define I40E_GLPCI_PHY_SPARE_IN_DIG_IN_SPARE_MASK  I40E_MASK(0x3FF, I40E_GLPCI_PHY_SPARE_IN_DIG_IN_SPARE_SHIFT)
 
-#define I40E_GLPCI_PHY_SPARE_OUT                           0x000BE50C
+#define I40E_GLPCI_PHY_SPARE_OUT                           0x000BE50C /* Reset: POR */
 #define I40E_GLPCI_PHY_SPARE_OUT_TAMAR_DIG_OUT_SPARE_SHIFT 0
 #define I40E_GLPCI_PHY_SPARE_OUT_TAMAR_DIG_OUT_SPARE_MASK  I40E_MASK(0x3FF, I40E_GLPCI_PHY_SPARE_OUT_TAMAR_DIG_OUT_SPARE_SHIFT)
 
-#define I40E_GLPCI_SHUTDOWN_DIS                    0x000BE4F0
+#define I40E_GLPCI_SHUTDOWN_DIS                    0x000BE4F0 /* Reset: PCIR */
 #define I40E_GLPCI_SHUTDOWN_DIS_SHUTDOWN_DIS_SHIFT 0
 #define I40E_GLPCI_SHUTDOWN_DIS_SHUTDOWN_DIS_MASK  I40E_MASK(0x1, I40E_GLPCI_SHUTDOWN_DIS_SHUTDOWN_DIS_SHIFT)
 
-#define I40E_GLPCI_SPARE1                               0x000BE510
+#define I40E_GLPCI_SPARE1                               0x000BE510 /* Reset: POR */
 #define I40E_GLPCI_SPARE1_WU_COMPLIANT_CB_SHIFT         0
 #define I40E_GLPCI_SPARE1_WU_COMPLIANT_CB_MASK          I40E_MASK(0x1, I40E_GLPCI_SPARE1_WU_COMPLIANT_CB_SHIFT)
 #define I40E_GLPCI_SPARE1_BYPASS_SIDEBAND_SHIFT         1
@@ -2708,11 +2718,21 @@
 #define I40E_GLPCI_SPARE1_SPARE_SHIFT                   25
 #define I40E_GLPCI_SPARE1_SPARE_MASK                    I40E_MASK(0x7F, I40E_GLPCI_SPARE1_SPARE_SHIFT)
 
-#define I40E_GLPCI_SPARE2             0x000BE514
+#define I40E_GLPCI_SPARE2             0x000BE514 /* Reset: POR */
 #define I40E_GLPCI_SPARE2_SPARE_SHIFT 0
 #define I40E_GLPCI_SPARE2_SPARE_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_SPARE2_SPARE_SHIFT)
 
-#define I40E_GLQF_L3_MAP(_i)                (0x0026C700 + ((_i) * 4)) /* _i=0...63 */
+#define I40E_GLQF_ABORT_MASK(_i)                   (0x0026CCC8 + ((_i) * 4)) /* _i=0...1 */ /* Reset: CORER */
+#define I40E_GLQF_ABORT_MASK_MAX_INDEX             1
+#define I40E_GLQF_ABORT_MASK_GLQF_ABORT_MASK_SHIFT 0
+#define I40E_GLQF_ABORT_MASK_GLQF_ABORT_MASK_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLQF_ABORT_MASK_GLQF_ABORT_MASK_SHIFT)
+
+#define I40E_GLQF_L2_MAP(_i)               (0x0026CBF8 + ((_i) * 4)) /* _i=0...1 */ /* Reset: CORER */
+#define I40E_GLQF_L2_MAP_MAX_INDEX         1
+#define I40E_GLQF_L2_MAP_GLQF_L2_MAP_SHIFT 0
+#define I40E_GLQF_L2_MAP_GLQF_L2_MAP_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLQF_L2_MAP_GLQF_L2_MAP_SHIFT)
+
+#define I40E_GLQF_L3_MAP(_i)                (0x0026C700 + ((_i) * 4)) /* _i=0...63 */ /* Reset: CORER */
 #define I40E_GLQF_L3_MAP_MAX_INDEX          63
 #define I40E_GLQF_L3_MAP_TR_IDX_CODE_SHIFT  0
 #define I40E_GLQF_L3_MAP_TR_IDX_CODE_MASK   I40E_MASK(0x3F, I40E_GLQF_L3_MAP_TR_IDX_CODE_SHIFT)
@@ -2723,115 +2743,191 @@
 #define I40E_GLQF_L3_MAP_MIN_SKIP_ENA_SHIFT 15
 #define I40E_GLQF_L3_MAP_MIN_SKIP_ENA_MASK  I40E_MASK(0x1, I40E_GLQF_L3_MAP_MIN_SKIP_ENA_SHIFT)
 
-#define I40E_GLRCB_DBG_CTL                0x00122620
+#define I40E_GLQF_OPT_MAP                   0x0026CBDC /* Reset: CORER */
+#define I40E_GLQF_OPT_MAP_FRAG_IDX_SHIFT    0
+#define I40E_GLQF_OPT_MAP_FRAG_IDX_MASK     I40E_MASK(0x3F, I40E_GLQF_OPT_MAP_FRAG_IDX_SHIFT)
+#define I40E_GLQF_OPT_MAP_IP_OPT_IDX_SHIFT  12
+#define I40E_GLQF_OPT_MAP_IP_OPT_IDX_MASK   I40E_MASK(0x3F, I40E_GLQF_OPT_MAP_IP_OPT_IDX_SHIFT)
+#define I40E_GLQF_OPT_MAP_TCP_OPT_IDX_SHIFT 18
+#define I40E_GLQF_OPT_MAP_TCP_OPT_IDX_MASK  I40E_MASK(0x3F, I40E_GLQF_OPT_MAP_TCP_OPT_IDX_SHIFT)
+
+#define I40E_GLRCB_DBG_CTL                0x00122620 /* Reset: CORER */
 #define I40E_GLRCB_DBG_CTL_MEM_ADDR_SHIFT 0
 #define I40E_GLRCB_DBG_CTL_MEM_ADDR_MASK  I40E_MASK(0xFFFF, I40E_GLRCB_DBG_CTL_MEM_ADDR_SHIFT)
 #define I40E_GLRCB_DBG_CTL_MEM_SEL_SHIFT  16
 #define I40E_GLRCB_DBG_CTL_MEM_SEL_MASK   I40E_MASK(0x1F, I40E_GLRCB_DBG_CTL_MEM_SEL_SHIFT)
 
-#define I40E_GLRCB_DBG_FEAT                0x0012266C
+#define I40E_GLRCB_DBG_DATA0                0x00122628 /* Reset: CORER */
+#define I40E_GLRCB_DBG_DATA0_DBG_DATA_SHIFT 0
+#define I40E_GLRCB_DBG_DATA0_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCB_DBG_DATA0_DBG_DATA_SHIFT)
+
+#define I40E_GLRCB_DBG_DATA1                0x0012262C /* Reset: CORER */
+#define I40E_GLRCB_DBG_DATA1_DBG_DATA_SHIFT 0
+#define I40E_GLRCB_DBG_DATA1_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCB_DBG_DATA1_DBG_DATA_SHIFT)
+
+#define I40E_GLRCB_DBG_DATA2                0x00122630 /* Reset: CORER */
+#define I40E_GLRCB_DBG_DATA2_DBG_DATA_SHIFT 0
+#define I40E_GLRCB_DBG_DATA2_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCB_DBG_DATA2_DBG_DATA_SHIFT)
+
+#define I40E_GLRCB_DBG_DATA3                0x00122634 /* Reset: CORER */
+#define I40E_GLRCB_DBG_DATA3_DBG_DATA_SHIFT 0
+#define I40E_GLRCB_DBG_DATA3_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCB_DBG_DATA3_DBG_DATA_SHIFT)
+
+#define I40E_GLRCB_DBG_DATA4                0x00122638 /* Reset: CORER */
+#define I40E_GLRCB_DBG_DATA4_DBG_DATA_SHIFT 0
+#define I40E_GLRCB_DBG_DATA4_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCB_DBG_DATA4_DBG_DATA_SHIFT)
+
+#define I40E_GLRCB_DBG_DATA5                0x0012263C /* Reset: CORER */
+#define I40E_GLRCB_DBG_DATA5_DBG_DATA_SHIFT 0
+#define I40E_GLRCB_DBG_DATA5_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCB_DBG_DATA5_DBG_DATA_SHIFT)
+
+#define I40E_GLRCB_DBG_FEAT                0x0012266C /* Reset: CORER */
 #define I40E_GLRCB_DBG_FEAT_SET_DROP_SHIFT 0
 #define I40E_GLRCB_DBG_FEAT_SET_DROP_MASK  I40E_MASK(0xF, I40E_GLRCB_DBG_FEAT_SET_DROP_SHIFT)
 
-#define I40E_GLRCB_DBG_RD_STOP           0x00122640
+#define I40E_GLRCB_DBG_RD_STOP           0x00122640 /* Reset: CORER */
 #define I40E_GLRCB_DBG_RD_STOP_ENA_SHIFT 0
 #define I40E_GLRCB_DBG_RD_STOP_ENA_MASK  I40E_MASK(0x1, I40E_GLRCB_DBG_RD_STOP_ENA_SHIFT)
 
-#define I40E_GLRCB_LL_BP_CFG                0x0012261C
+#define I40E_GLRCB_LL_BP_CFG                0x0012261C /* Reset: CORER */
 #define I40E_GLRCB_LL_BP_CFG_MIN_THRS_SHIFT 0
 #define I40E_GLRCB_LL_BP_CFG_MIN_THRS_MASK  I40E_MASK(0xFFFF, I40E_GLRCB_LL_BP_CFG_MIN_THRS_SHIFT)
 #define I40E_GLRCB_LL_BP_CFG_MAX_THRS_SHIFT 16
 #define I40E_GLRCB_LL_BP_CFG_MAX_THRS_MASK  I40E_MASK(0xFFFF, I40E_GLRCB_LL_BP_CFG_MAX_THRS_SHIFT)
 
-#define I40E_GLRCB_TO_1MS_TICK_CFG                    0x00122624
+#define I40E_GLRCB_TO_1MS_TICK_CFG                    0x00122624 /* Reset: CORER */
 #define I40E_GLRCB_TO_1MS_TICK_CFG_UC_DIV_RATIO_SHIFT 0
 #define I40E_GLRCB_TO_1MS_TICK_CFG_UC_DIV_RATIO_MASK  I40E_MASK(0xFFFFF, I40E_GLRCB_TO_1MS_TICK_CFG_UC_DIV_RATIO_SHIFT)
 
-#define I40E_GLRLAN_COMPLETION_FIFO_CTL                  0x0012A574
+#define I40E_GLRLAN_COMPLETION_FIFO_CTL                  0x0012A574 /* Reset: CORER */
 #define I40E_GLRLAN_COMPLETION_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_COMPLETION_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_COMPLETION_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_DATA_FLUSH_REQ_FIFO_CTL                  0x0012A58C
+#define I40E_GLRLAN_DATA_FLUSH_REQ_FIFO_CTL                  0x0012A58C /* Reset: CORER */
 #define I40E_GLRLAN_DATA_FLUSH_REQ_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_DATA_FLUSH_REQ_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_DATA_FLUSH_REQ_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_DBG_CTL                0x0012A594
+#define I40E_GLRLAN_DBG_CTL                0x0012A594 /* Reset: CORER */
 #define I40E_GLRLAN_DBG_CTL_MEM_ADDR_SHIFT 0
 #define I40E_GLRLAN_DBG_CTL_MEM_ADDR_MASK  I40E_MASK(0xFFFF, I40E_GLRLAN_DBG_CTL_MEM_ADDR_SHIFT)
 #define I40E_GLRLAN_DBG_CTL_MEM_SEL_SHIFT  16
 #define I40E_GLRLAN_DBG_CTL_MEM_SEL_MASK   I40E_MASK(0x1F, I40E_GLRLAN_DBG_CTL_MEM_SEL_SHIFT)
 
-#define I40E_GLRLAN_DIX_WB_FIFO_CTL                  0x0012A590
+#define I40E_GLRLAN_DBG_DATA0                0x0012A598 /* Reset: CORER */
+#define I40E_GLRLAN_DBG_DATA0_DBG_DATA_SHIFT 0
+#define I40E_GLRLAN_DBG_DATA0_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA0_DBG_DATA_SHIFT)
+
+#define I40E_GLRLAN_DBG_DATA1                0x0012A59C /* Reset: CORER */
+#define I40E_GLRLAN_DBG_DATA1_DBG_DATA_SHIFT 0
+#define I40E_GLRLAN_DBG_DATA1_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA1_DBG_DATA_SHIFT)
+
+#define I40E_GLRLAN_DBG_DATA2                0x0012A5A0 /* Reset: CORER */
+#define I40E_GLRLAN_DBG_DATA2_DBG_DATA_SHIFT 0
+#define I40E_GLRLAN_DBG_DATA2_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA2_DBG_DATA_SHIFT)
+
+#define I40E_GLRLAN_DBG_DATA3                0x0012A5A4 /* Reset: CORER */
+#define I40E_GLRLAN_DBG_DATA3_DBG_DATA_SHIFT 0
+#define I40E_GLRLAN_DBG_DATA3_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA3_DBG_DATA_SHIFT)
+
+#define I40E_GLRLAN_DBG_DATA4                0x0012A5A8 /* Reset: CORER */
+#define I40E_GLRLAN_DBG_DATA4_DBG_DATA_SHIFT 0
+#define I40E_GLRLAN_DBG_DATA4_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA4_DBG_DATA_SHIFT)
+
+#define I40E_GLRLAN_DBG_DATA5                0x0012A5AC /* Reset: CORER */
+#define I40E_GLRLAN_DBG_DATA5_DBG_DATA_SHIFT 0
+#define I40E_GLRLAN_DBG_DATA5_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA5_DBG_DATA_SHIFT)
+
+#define I40E_GLRLAN_DBG_DATA6                0x0012A5B0 /* Reset: CORER */
+#define I40E_GLRLAN_DBG_DATA6_DBG_DATA_SHIFT 0
+#define I40E_GLRLAN_DBG_DATA6_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA6_DBG_DATA_SHIFT)
+
+#define I40E_GLRLAN_DBG_DATA7                0x0012A5B4 /* Reset: CORER */
+#define I40E_GLRLAN_DBG_DATA7_DBG_DATA_SHIFT 0
+#define I40E_GLRLAN_DBG_DATA7_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DBG_DATA7_DBG_DATA_SHIFT)
+
+#define I40E_GLRLAN_DIX_WB_FIFO_CTL                  0x0012A590 /* Reset: CORER */
 #define I40E_GLRLAN_DIX_WB_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_DIX_WB_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_DIX_WB_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_DSCR_FETCH_FIFO_CTL                  0x0012A584
+#define I40E_GLRLAN_DSCR_FETCH_FIFO_CTL                  0x0012A584 /* Reset: CORER */
 #define I40E_GLRLAN_DSCR_FETCH_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_DSCR_FETCH_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_DSCR_FETCH_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_DSCR_REQ_FIFO_CTL                  0x0012A554
+#define I40E_GLRLAN_DSCR_REQ_FIFO_CTL                  0x0012A554 /* Reset: CORER */
 #define I40E_GLRLAN_DSCR_REQ_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_DSCR_REQ_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_DSCR_REQ_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_DSCR_WR_REQ_FIFO_CTL                  0x0012A57C
+#define I40E_GLRLAN_DSCR_WR_REQ_FIFO_CTL                  0x0012A57C /* Reset: CORER */
 #define I40E_GLRLAN_DSCR_WR_REQ_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_DSCR_WR_REQ_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_DSCR_WR_REQ_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_DUMMY_CNTX_0(_i)              (0x0012A5BC + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLRLAN_DUMMY_CNTX_0(_i)              (0x0012A5BC + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLRLAN_DUMMY_CNTX_0_MAX_INDEX        3
 #define I40E_GLRLAN_DUMMY_CNTX_0_DUMMY_CNTX_SHIFT 0
 #define I40E_GLRLAN_DUMMY_CNTX_0_DUMMY_CNTX_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DUMMY_CNTX_0_DUMMY_CNTX_SHIFT)
 
-#define I40E_GLRLAN_DUMMY_CNTX_1(_i)              (0x0012A5CC + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLRLAN_DUMMY_CNTX_1(_i)              (0x0012A5CC + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLRLAN_DUMMY_CNTX_1_MAX_INDEX        3
 #define I40E_GLRLAN_DUMMY_CNTX_1_DUMMY_CNTX_SHIFT 0
 #define I40E_GLRLAN_DUMMY_CNTX_1_DUMMY_CNTX_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_DUMMY_CNTX_1_DUMMY_CNTX_SHIFT)
 
-#define I40E_GLRLAN_DUMMY_CNTX_ENA                      0x0012A5DC
+#define I40E_GLRLAN_DUMMY_CNTX_ENA                      0x0012A5DC /* Reset: CORER */
 #define I40E_GLRLAN_DUMMY_CNTX_ENA_DUMMY_CNTX_ENA_SHIFT 0
 #define I40E_GLRLAN_DUMMY_CNTX_ENA_DUMMY_CNTX_ENA_MASK  I40E_MASK(0x1, I40E_GLRLAN_DUMMY_CNTX_ENA_DUMMY_CNTX_ENA_SHIFT)
 
-#define I40E_GLRLAN_ITR_NOTIFICATION_FIFO_CTL                  0x0012A578
+#define I40E_GLRLAN_ITR_NOTIFICATION_FIFO_CTL                  0x0012A578 /* Reset: CORER */
 #define I40E_GLRLAN_ITR_NOTIFICATION_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_ITR_NOTIFICATION_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_ITR_NOTIFICATION_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_ITR_WR_DONE_FIFO_CTL                  0x0012A580
+#define I40E_GLRLAN_ITR_WR_DONE_FIFO_CTL                  0x0012A580 /* Reset: CORER */
 #define I40E_GLRLAN_ITR_WR_DONE_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_ITR_WR_DONE_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_ITR_WR_DONE_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_PIM_REQ_FIFO_CTL                  0x0012A570
+#define I40E_GLRLAN_PIM_REQ_FIFO_CTL                  0x0012A570 /* Reset: CORER */
 #define I40E_GLRLAN_PIM_REQ_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_PIM_REQ_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_PIM_REQ_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_QCNTX_DATA_WB_FIFO_CTL                  0x0012A568
+#define I40E_GLRLAN_QCNTX_DATA_WB_FIFO_CTL                  0x0012A568 /* Reset: CORER */
 #define I40E_GLRLAN_QCNTX_DATA_WB_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_QCNTX_DATA_WB_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_QCNTX_DATA_WB_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_QCNTX_MT2L_WB_FIFO_CTL                  0x0012A56C
+#define I40E_GLRLAN_QCNTX_MT2L_WB_FIFO_CTL                  0x0012A56C /* Reset: CORER */
 #define I40E_GLRLAN_QCNTX_MT2L_WB_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_QCNTX_MT2L_WB_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_QCNTX_MT2L_WB_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_QCNTX_NUM_WB_FIFO_CTL                  0x0012A564
+#define I40E_GLRLAN_QCNTX_NUM_WB_FIFO_CTL                  0x0012A564 /* Reset: CORER */
 #define I40E_GLRLAN_QCNTX_NUM_WB_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_QCNTX_NUM_WB_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_QCNTX_NUM_WB_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_RDPU_ATTR_FIFO_CTL                  0x0012A55C
+#define I40E_GLRLAN_RDPU_ATTR_FIFO_CTL                  0x0012A55C /* Reset: CORER */
 #define I40E_GLRLAN_RDPU_ATTR_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_RDPU_ATTR_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_RDPU_ATTR_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_RDPU_CMD_FIFO_CTL                  0x0012A558
+#define I40E_GLRLAN_RDPU_CMD_FIFO_CTL                  0x0012A558 /* Reset: CORER */
 #define I40E_GLRLAN_RDPU_CMD_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_RDPU_CMD_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_RDPU_CMD_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_RDPU_WB_FIFO_CTL                  0x0012A560
+#define I40E_GLRLAN_RDPU_WB_FIFO_CTL                  0x0012A560 /* Reset: CORER */
 #define I40E_GLRLAN_RDPU_WB_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_RDPU_WB_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_RDPU_WB_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_GLRLAN_REQ_INFO_FIFO_CTL                  0x0012A588
+#define I40E_GLRLAN_REQ_INFO_FIFO_CTL                  0x0012A588 /* Reset: CORER */
 #define I40E_GLRLAN_REQ_INFO_FIFO_CTL_BP_THRSHLD_SHIFT 0
 #define I40E_GLRLAN_REQ_INFO_FIFO_CTL_BP_THRSHLD_MASK  I40E_MASK(0x3FF, I40E_GLRLAN_REQ_INFO_FIFO_CTL_BP_THRSHLD_SHIFT)
 
-#define I40E_ITR_CAUSE_MEM_0_CFG                    0x0003FC00
+#define I40E_GLRLAN_SPARE                  0x0012A5B8 /* Reset: CORER */
+#define I40E_GLRLAN_SPARE_SPARE_BITS_SHIFT 0
+#define I40E_GLRLAN_SPARE_SPARE_BITS_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRLAN_SPARE_SPARE_BITS_SHIFT)
+
+#define I40E_GLTLAN_MAX_TCBCMD                      0x000E64D4 /* Reset: CORER */
+#define I40E_GLTLAN_MAX_TCBCMD_MAX_TCBCMD_SHIFT     0
+#define I40E_GLTLAN_MAX_TCBCMD_MAX_TCBCMD_MASK      I40E_MASK(0xF, I40E_GLTLAN_MAX_TCBCMD_MAX_TCBCMD_SHIFT)
+#define I40E_GLTLAN_MAX_TCBCMD_RSVD1_SHIFT          8
+#define I40E_GLTLAN_MAX_TCBCMD_RSVD1_MASK           I40E_MASK(0x3, I40E_GLTLAN_MAX_TCBCMD_RSVD1_SHIFT)
+#define I40E_GLTLAN_MAX_TCBCMD_MULTPL_REQ_DIS_SHIFT 31
+#define I40E_GLTLAN_MAX_TCBCMD_MULTPL_REQ_DIS_MASK  I40E_MASK(0x1, I40E_GLTLAN_MAX_TCBCMD_MULTPL_REQ_DIS_SHIFT)
+
+#define I40E_ITR_CAUSE_MEM_0_CFG                    0x0003FC00 /* Reset: POR */
 #define I40E_ITR_CAUSE_MEM_0_CFG_ECC_EN_SHIFT       0
 #define I40E_ITR_CAUSE_MEM_0_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_ITR_CAUSE_MEM_0_CFG_ECC_EN_SHIFT)
 #define I40E_ITR_CAUSE_MEM_0_CFG_ECC_INVERT_1_SHIFT 1
@@ -2853,7 +2949,7 @@
 #define I40E_ITR_CAUSE_MEM_0_CFG_RM_SHIFT           16
 #define I40E_ITR_CAUSE_MEM_0_CFG_RM_MASK            I40E_MASK(0xF, I40E_ITR_CAUSE_MEM_0_CFG_RM_SHIFT)
 
-#define I40E_ITR_CAUSE_MEM_0_STATUS                        0x0003FC04
+#define I40E_ITR_CAUSE_MEM_0_STATUS                        0x0003FC04 /* Reset: POR */
 #define I40E_ITR_CAUSE_MEM_0_STATUS_ECC_ERR_SHIFT          0
 #define I40E_ITR_CAUSE_MEM_0_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_ITR_CAUSE_MEM_0_STATUS_ECC_ERR_SHIFT)
 #define I40E_ITR_CAUSE_MEM_0_STATUS_ECC_FIX_SHIFT          1
@@ -2863,7 +2959,7 @@
 #define I40E_ITR_CAUSE_MEM_0_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_ITR_CAUSE_MEM_0_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_ITR_CAUSE_MEM_0_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_ITR_CAUSE_MEM_1_CFG                    0x0003FC08
+#define I40E_ITR_CAUSE_MEM_1_CFG                    0x0003FC08 /* Reset: POR */
 #define I40E_ITR_CAUSE_MEM_1_CFG_ECC_EN_SHIFT       0
 #define I40E_ITR_CAUSE_MEM_1_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_ITR_CAUSE_MEM_1_CFG_ECC_EN_SHIFT)
 #define I40E_ITR_CAUSE_MEM_1_CFG_ECC_INVERT_1_SHIFT 1
@@ -2885,7 +2981,7 @@
 #define I40E_ITR_CAUSE_MEM_1_CFG_RM_SHIFT           16
 #define I40E_ITR_CAUSE_MEM_1_CFG_RM_MASK            I40E_MASK(0xF, I40E_ITR_CAUSE_MEM_1_CFG_RM_SHIFT)
 
-#define I40E_ITR_CAUSE_MEM_1_STATUS                        0x0003FC0C
+#define I40E_ITR_CAUSE_MEM_1_STATUS                        0x0003FC0C /* Reset: POR */
 #define I40E_ITR_CAUSE_MEM_1_STATUS_ECC_ERR_SHIFT          0
 #define I40E_ITR_CAUSE_MEM_1_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_ITR_CAUSE_MEM_1_STATUS_ECC_ERR_SHIFT)
 #define I40E_ITR_CAUSE_MEM_1_STATUS_ECC_FIX_SHIFT          1
@@ -2895,15 +2991,15 @@
 #define I40E_ITR_CAUSE_MEM_1_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_ITR_CAUSE_MEM_1_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_ITR_CAUSE_MEM_1_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_ITR_ECC_COR_ERR           0x0003FC24
+#define I40E_ITR_ECC_COR_ERR           0x0003FC24 /* Reset: POR */
 #define I40E_ITR_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_ITR_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_ITR_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_ITR_ECC_UNCOR_ERR           0x0003FC20
+#define I40E_ITR_ECC_UNCOR_ERR           0x0003FC20 /* Reset: POR */
 #define I40E_ITR_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_ITR_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_ITR_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_ITR_MSIX_MEM_0_CFG                    0x0003FC10
+#define I40E_ITR_MSIX_MEM_0_CFG                    0x0003FC10 /* Reset: POR */
 #define I40E_ITR_MSIX_MEM_0_CFG_ECC_EN_SHIFT       0
 #define I40E_ITR_MSIX_MEM_0_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_ITR_MSIX_MEM_0_CFG_ECC_EN_SHIFT)
 #define I40E_ITR_MSIX_MEM_0_CFG_ECC_INVERT_1_SHIFT 1
@@ -2925,7 +3021,7 @@
 #define I40E_ITR_MSIX_MEM_0_CFG_RM_SHIFT           16
 #define I40E_ITR_MSIX_MEM_0_CFG_RM_MASK            I40E_MASK(0xF, I40E_ITR_MSIX_MEM_0_CFG_RM_SHIFT)
 
-#define I40E_ITR_MSIX_MEM_0_STATUS                        0x0003FC14
+#define I40E_ITR_MSIX_MEM_0_STATUS                        0x0003FC14 /* Reset: POR */
 #define I40E_ITR_MSIX_MEM_0_STATUS_ECC_ERR_SHIFT          0
 #define I40E_ITR_MSIX_MEM_0_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_ITR_MSIX_MEM_0_STATUS_ECC_ERR_SHIFT)
 #define I40E_ITR_MSIX_MEM_0_STATUS_ECC_FIX_SHIFT          1
@@ -2935,7 +3031,7 @@
 #define I40E_ITR_MSIX_MEM_0_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_ITR_MSIX_MEM_0_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_ITR_MSIX_MEM_0_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_ITR_MSIX_MEM_1_CFG                    0x0003FC18
+#define I40E_ITR_MSIX_MEM_1_CFG                    0x0003FC18 /* Reset: POR */
 #define I40E_ITR_MSIX_MEM_1_CFG_ECC_EN_SHIFT       0
 #define I40E_ITR_MSIX_MEM_1_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_ITR_MSIX_MEM_1_CFG_ECC_EN_SHIFT)
 #define I40E_ITR_MSIX_MEM_1_CFG_ECC_INVERT_1_SHIFT 1
@@ -2957,7 +3053,7 @@
 #define I40E_ITR_MSIX_MEM_1_CFG_RM_SHIFT           16
 #define I40E_ITR_MSIX_MEM_1_CFG_RM_MASK            I40E_MASK(0xF, I40E_ITR_MSIX_MEM_1_CFG_RM_SHIFT)
 
-#define I40E_ITR_MSIX_MEM_1_STATUS                        0x0003FC1C
+#define I40E_ITR_MSIX_MEM_1_STATUS                        0x0003FC1C /* Reset: POR */
 #define I40E_ITR_MSIX_MEM_1_STATUS_ECC_ERR_SHIFT          0
 #define I40E_ITR_MSIX_MEM_1_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_ITR_MSIX_MEM_1_STATUS_ECC_ERR_SHIFT)
 #define I40E_ITR_MSIX_MEM_1_STATUS_ECC_FIX_SHIFT          1
@@ -2967,7 +3063,7 @@
 #define I40E_ITR_MSIX_MEM_1_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_ITR_MSIX_MEM_1_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_ITR_MSIX_MEM_1_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_MNG_ADMIN_Q_CFG                    0x0008304C
+#define I40E_MNG_ADMIN_Q_CFG                    0x0008304C /* Reset: POR */
 #define I40E_MNG_ADMIN_Q_CFG_ECC_EN_SHIFT       0
 #define I40E_MNG_ADMIN_Q_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_MNG_ADMIN_Q_CFG_ECC_EN_SHIFT)
 #define I40E_MNG_ADMIN_Q_CFG_ECC_INVERT_1_SHIFT 1
@@ -2989,7 +3085,7 @@
 #define I40E_MNG_ADMIN_Q_CFG_RM_SHIFT           16
 #define I40E_MNG_ADMIN_Q_CFG_RM_MASK            I40E_MASK(0xF, I40E_MNG_ADMIN_Q_CFG_RM_SHIFT)
 
-#define I40E_MNG_ADMIN_Q_STATUS                        0x00083050
+#define I40E_MNG_ADMIN_Q_STATUS                        0x00083050 /* Reset: POR */
 #define I40E_MNG_ADMIN_Q_STATUS_ECC_ERR_SHIFT          0
 #define I40E_MNG_ADMIN_Q_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_MNG_ADMIN_Q_STATUS_ECC_ERR_SHIFT)
 #define I40E_MNG_ADMIN_Q_STATUS_ECC_FIX_SHIFT          1
@@ -2999,7 +3095,7 @@
 #define I40E_MNG_ADMIN_Q_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_MNG_ADMIN_Q_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_MNG_ADMIN_Q_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_MNG_ALTERNATE_CFG                    0x000830A4
+#define I40E_MNG_ALTERNATE_CFG                    0x000830A4 /* Reset: POR */
 #define I40E_MNG_ALTERNATE_CFG_ECC_EN_SHIFT       0
 #define I40E_MNG_ALTERNATE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_MNG_ALTERNATE_CFG_ECC_EN_SHIFT)
 #define I40E_MNG_ALTERNATE_CFG_ECC_INVERT_1_SHIFT 1
@@ -3021,7 +3117,7 @@
 #define I40E_MNG_ALTERNATE_CFG_RM_SHIFT           16
 #define I40E_MNG_ALTERNATE_CFG_RM_MASK            I40E_MASK(0xF, I40E_MNG_ALTERNATE_CFG_RM_SHIFT)
 
-#define I40E_MNG_ALTERNATE_STATUS                        0x000830A8
+#define I40E_MNG_ALTERNATE_STATUS                        0x000830A8 /* Reset: POR */
 #define I40E_MNG_ALTERNATE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_MNG_ALTERNATE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_MNG_ALTERNATE_STATUS_ECC_ERR_SHIFT)
 #define I40E_MNG_ALTERNATE_STATUS_ECC_FIX_SHIFT          1
@@ -3031,7 +3127,7 @@
 #define I40E_MNG_ALTERNATE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_MNG_ALTERNATE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_MNG_ALTERNATE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_MNG_CODE_BANK_CFG                    0x00083054
+#define I40E_MNG_CODE_BANK_CFG                    0x00083054 /* Reset: POR */
 #define I40E_MNG_CODE_BANK_CFG_ECC_EN_SHIFT       0
 #define I40E_MNG_CODE_BANK_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_MNG_CODE_BANK_CFG_ECC_EN_SHIFT)
 #define I40E_MNG_CODE_BANK_CFG_ECC_INVERT_1_SHIFT 1
@@ -3053,7 +3149,7 @@
 #define I40E_MNG_CODE_BANK_CFG_RM_SHIFT           16
 #define I40E_MNG_CODE_BANK_CFG_RM_MASK            I40E_MASK(0xF, I40E_MNG_CODE_BANK_CFG_RM_SHIFT)
 
-#define I40E_MNG_CODE_BANK_STATUS                        0x00083058
+#define I40E_MNG_CODE_BANK_STATUS                        0x00083058 /* Reset: POR */
 #define I40E_MNG_CODE_BANK_STATUS_ECC_ERR_SHIFT          0
 #define I40E_MNG_CODE_BANK_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_MNG_CODE_BANK_STATUS_ECC_ERR_SHIFT)
 #define I40E_MNG_CODE_BANK_STATUS_ECC_FIX_SHIFT          1
@@ -3063,15 +3159,15 @@
 #define I40E_MNG_CODE_BANK_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_MNG_CODE_BANK_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_MNG_CODE_BANK_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_MNG_ECC_COR_ERR           0x000830B8
+#define I40E_MNG_ECC_COR_ERR           0x000830B8 /* Reset: POR */
 #define I40E_MNG_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_MNG_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_MNG_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_MNG_ECC_UNCOR_ERR           0x000830B4
+#define I40E_MNG_ECC_UNCOR_ERR           0x000830B4 /* Reset: POR */
 #define I40E_MNG_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_MNG_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_MNG_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_MNG_POPULATED_DATA_CFG                    0x00083064
+#define I40E_MNG_POPULATED_DATA_CFG                    0x00083064 /* Reset: POR */
 #define I40E_MNG_POPULATED_DATA_CFG_ECC_EN_SHIFT       0
 #define I40E_MNG_POPULATED_DATA_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_MNG_POPULATED_DATA_CFG_ECC_EN_SHIFT)
 #define I40E_MNG_POPULATED_DATA_CFG_ECC_INVERT_1_SHIFT 1
@@ -3093,7 +3189,7 @@
 #define I40E_MNG_POPULATED_DATA_CFG_RM_SHIFT           16
 #define I40E_MNG_POPULATED_DATA_CFG_RM_MASK            I40E_MASK(0xF, I40E_MNG_POPULATED_DATA_CFG_RM_SHIFT)
 
-#define I40E_MNG_POPULATED_DATA_STATUS                        0x00083068
+#define I40E_MNG_POPULATED_DATA_STATUS                        0x00083068 /* Reset: POR */
 #define I40E_MNG_POPULATED_DATA_STATUS_ECC_ERR_SHIFT          0
 #define I40E_MNG_POPULATED_DATA_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_MNG_POPULATED_DATA_STATUS_ECC_ERR_SHIFT)
 #define I40E_MNG_POPULATED_DATA_STATUS_ECC_FIX_SHIFT          1
@@ -3103,7 +3199,7 @@
 #define I40E_MNG_POPULATED_DATA_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_MNG_POPULATED_DATA_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_MNG_POPULATED_DATA_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_MNG_POPULATED_DATA0_CFG                    0x0008305C
+#define I40E_MNG_POPULATED_DATA0_CFG                    0x0008305C /* Reset: POR */
 #define I40E_MNG_POPULATED_DATA0_CFG_ECC_EN_SHIFT       0
 #define I40E_MNG_POPULATED_DATA0_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_MNG_POPULATED_DATA0_CFG_ECC_EN_SHIFT)
 #define I40E_MNG_POPULATED_DATA0_CFG_ECC_INVERT_1_SHIFT 1
@@ -3125,7 +3221,7 @@
 #define I40E_MNG_POPULATED_DATA0_CFG_RM_SHIFT           16
 #define I40E_MNG_POPULATED_DATA0_CFG_RM_MASK            I40E_MASK(0xF, I40E_MNG_POPULATED_DATA0_CFG_RM_SHIFT)
 
-#define I40E_MNG_POPULATED_DATA0_STATUS                        0x00083060
+#define I40E_MNG_POPULATED_DATA0_STATUS                        0x00083060 /* Reset: POR */
 #define I40E_MNG_POPULATED_DATA0_STATUS_ECC_ERR_SHIFT          0
 #define I40E_MNG_POPULATED_DATA0_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_MNG_POPULATED_DATA0_STATUS_ECC_ERR_SHIFT)
 #define I40E_MNG_POPULATED_DATA0_STATUS_ECC_FIX_SHIFT          1
@@ -3135,7 +3231,7 @@
 #define I40E_MNG_POPULATED_DATA0_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_MNG_POPULATED_DATA0_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_MNG_POPULATED_DATA0_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_MNG_ROM_CFG                    0x000830AC
+#define I40E_MNG_ROM_CFG                    0x000830AC /* Reset: POR */
 #define I40E_MNG_ROM_CFG_ECC_EN_SHIFT       0
 #define I40E_MNG_ROM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_MNG_ROM_CFG_ECC_EN_SHIFT)
 #define I40E_MNG_ROM_CFG_ECC_INVERT_1_SHIFT 1
@@ -3157,7 +3253,7 @@
 #define I40E_MNG_ROM_CFG_RM_SHIFT           16
 #define I40E_MNG_ROM_CFG_RM_MASK            I40E_MASK(0xF, I40E_MNG_ROM_CFG_RM_SHIFT)
 
-#define I40E_MNG_ROM_STATUS                        0x000830B0
+#define I40E_MNG_ROM_STATUS                        0x000830B0 /* Reset: POR */
 #define I40E_MNG_ROM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_MNG_ROM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_MNG_ROM_STATUS_ECC_ERR_SHIFT)
 #define I40E_MNG_ROM_STATUS_ECC_FIX_SHIFT          1
@@ -3167,7 +3263,7 @@
 #define I40E_MNG_ROM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_MNG_ROM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_MNG_ROM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_MNG_RX_BANK_CFG                    0x0008306C
+#define I40E_MNG_RX_BANK_CFG                    0x0008306C /* Reset: POR */
 #define I40E_MNG_RX_BANK_CFG_ECC_EN_SHIFT       0
 #define I40E_MNG_RX_BANK_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_MNG_RX_BANK_CFG_ECC_EN_SHIFT)
 #define I40E_MNG_RX_BANK_CFG_ECC_INVERT_1_SHIFT 1
@@ -3189,7 +3285,7 @@
 #define I40E_MNG_RX_BANK_CFG_RM_SHIFT           16
 #define I40E_MNG_RX_BANK_CFG_RM_MASK            I40E_MASK(0xF, I40E_MNG_RX_BANK_CFG_RM_SHIFT)
 
-#define I40E_MNG_RX_BANK_STATUS                        0x00083070
+#define I40E_MNG_RX_BANK_STATUS                        0x00083070 /* Reset: POR */
 #define I40E_MNG_RX_BANK_STATUS_ECC_ERR_SHIFT          0
 #define I40E_MNG_RX_BANK_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_MNG_RX_BANK_STATUS_ECC_ERR_SHIFT)
 #define I40E_MNG_RX_BANK_STATUS_ECC_FIX_SHIFT          1
@@ -3199,7 +3295,7 @@
 #define I40E_MNG_RX_BANK_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_MNG_RX_BANK_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_MNG_RX_BANK_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_MNG_RXF_CFG                    0x00083074
+#define I40E_MNG_RXF_CFG                    0x00083074 /* Reset: POR */
 #define I40E_MNG_RXF_CFG_ECC_EN_SHIFT       0
 #define I40E_MNG_RXF_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_MNG_RXF_CFG_ECC_EN_SHIFT)
 #define I40E_MNG_RXF_CFG_ECC_INVERT_1_SHIFT 1
@@ -3225,7 +3321,7 @@
 #define I40E_MNG_RXF_CFG_RM_B_SHIFT         20
 #define I40E_MNG_RXF_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_MNG_RXF_CFG_RM_B_SHIFT)
 
-#define I40E_MNG_RXF_STATUS                        0x00083078
+#define I40E_MNG_RXF_STATUS                        0x00083078 /* Reset: POR */
 #define I40E_MNG_RXF_STATUS_ECC_ERR_SHIFT          0
 #define I40E_MNG_RXF_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_MNG_RXF_STATUS_ECC_ERR_SHIFT)
 #define I40E_MNG_RXF_STATUS_ECC_FIX_SHIFT          1
@@ -3235,7 +3331,7 @@
 #define I40E_MNG_RXF_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_MNG_RXF_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_MNG_RXF_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_MNG_TX0_GLUE_CFG                    0x0008307C
+#define I40E_MNG_TX0_GLUE_CFG                    0x0008307C /* Reset: POR */
 #define I40E_MNG_TX0_GLUE_CFG_ECC_EN_SHIFT       0
 #define I40E_MNG_TX0_GLUE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_MNG_TX0_GLUE_CFG_ECC_EN_SHIFT)
 #define I40E_MNG_TX0_GLUE_CFG_ECC_INVERT_1_SHIFT 1
@@ -3261,7 +3357,7 @@
 #define I40E_MNG_TX0_GLUE_CFG_RM_B_SHIFT         20
 #define I40E_MNG_TX0_GLUE_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_MNG_TX0_GLUE_CFG_RM_B_SHIFT)
 
-#define I40E_MNG_TX0_GLUE_STATUS                        0x00083080
+#define I40E_MNG_TX0_GLUE_STATUS                        0x00083080 /* Reset: POR */
 #define I40E_MNG_TX0_GLUE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_MNG_TX0_GLUE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_MNG_TX0_GLUE_STATUS_ECC_ERR_SHIFT)
 #define I40E_MNG_TX0_GLUE_STATUS_ECC_FIX_SHIFT          1
@@ -3271,7 +3367,7 @@
 #define I40E_MNG_TX0_GLUE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_MNG_TX0_GLUE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_MNG_TX0_GLUE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_MNG_TX1_GLUE_CFG                    0x00083084
+#define I40E_MNG_TX1_GLUE_CFG                    0x00083084 /* Reset: POR */
 #define I40E_MNG_TX1_GLUE_CFG_ECC_EN_SHIFT       0
 #define I40E_MNG_TX1_GLUE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_MNG_TX1_GLUE_CFG_ECC_EN_SHIFT)
 #define I40E_MNG_TX1_GLUE_CFG_ECC_INVERT_1_SHIFT 1
@@ -3297,7 +3393,7 @@
 #define I40E_MNG_TX1_GLUE_CFG_RM_B_SHIFT         20
 #define I40E_MNG_TX1_GLUE_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_MNG_TX1_GLUE_CFG_RM_B_SHIFT)
 
-#define I40E_MNG_TX1_GLUE_STATUS                        0x00083088
+#define I40E_MNG_TX1_GLUE_STATUS                        0x00083088 /* Reset: POR */
 #define I40E_MNG_TX1_GLUE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_MNG_TX1_GLUE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_MNG_TX1_GLUE_STATUS_ECC_ERR_SHIFT)
 #define I40E_MNG_TX1_GLUE_STATUS_ECC_FIX_SHIFT          1
@@ -3307,7 +3403,7 @@
 #define I40E_MNG_TX1_GLUE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_MNG_TX1_GLUE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_MNG_TX1_GLUE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_MNG_TX2_GLUE_CFG                    0x0008308C
+#define I40E_MNG_TX2_GLUE_CFG                    0x0008308C /* Reset: POR */
 #define I40E_MNG_TX2_GLUE_CFG_ECC_EN_SHIFT       0
 #define I40E_MNG_TX2_GLUE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_MNG_TX2_GLUE_CFG_ECC_EN_SHIFT)
 #define I40E_MNG_TX2_GLUE_CFG_ECC_INVERT_1_SHIFT 1
@@ -3333,7 +3429,7 @@
 #define I40E_MNG_TX2_GLUE_CFG_RM_B_SHIFT         20
 #define I40E_MNG_TX2_GLUE_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_MNG_TX2_GLUE_CFG_RM_B_SHIFT)
 
-#define I40E_MNG_TX2_GLUE_STATUS                        0x00083090
+#define I40E_MNG_TX2_GLUE_STATUS                        0x00083090 /* Reset: POR */
 #define I40E_MNG_TX2_GLUE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_MNG_TX2_GLUE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_MNG_TX2_GLUE_STATUS_ECC_ERR_SHIFT)
 #define I40E_MNG_TX2_GLUE_STATUS_ECC_FIX_SHIFT          1
@@ -3343,7 +3439,7 @@
 #define I40E_MNG_TX2_GLUE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_MNG_TX2_GLUE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_MNG_TX2_GLUE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_MNG_TX3_GLUE_CFG                    0x00083094
+#define I40E_MNG_TX3_GLUE_CFG                    0x00083094 /* Reset: POR */
 #define I40E_MNG_TX3_GLUE_CFG_ECC_EN_SHIFT       0
 #define I40E_MNG_TX3_GLUE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_MNG_TX3_GLUE_CFG_ECC_EN_SHIFT)
 #define I40E_MNG_TX3_GLUE_CFG_ECC_INVERT_1_SHIFT 1
@@ -3369,7 +3465,7 @@
 #define I40E_MNG_TX3_GLUE_CFG_RM_B_SHIFT         20
 #define I40E_MNG_TX3_GLUE_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_MNG_TX3_GLUE_CFG_RM_B_SHIFT)
 
-#define I40E_MNG_TX3_GLUE_STATUS                        0x00083098
+#define I40E_MNG_TX3_GLUE_STATUS                        0x00083098 /* Reset: POR */
 #define I40E_MNG_TX3_GLUE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_MNG_TX3_GLUE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_MNG_TX3_GLUE_STATUS_ECC_ERR_SHIFT)
 #define I40E_MNG_TX3_GLUE_STATUS_ECC_FIX_SHIFT          1
@@ -3379,7 +3475,7 @@
 #define I40E_MNG_TX3_GLUE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_MNG_TX3_GLUE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_MNG_TX3_GLUE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_MNG_TX4_GLUE_CFG                    0x0008309C
+#define I40E_MNG_TX4_GLUE_CFG                    0x0008309C /* Reset: POR */
 #define I40E_MNG_TX4_GLUE_CFG_ECC_EN_SHIFT       0
 #define I40E_MNG_TX4_GLUE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_MNG_TX4_GLUE_CFG_ECC_EN_SHIFT)
 #define I40E_MNG_TX4_GLUE_CFG_ECC_INVERT_1_SHIFT 1
@@ -3405,7 +3501,7 @@
 #define I40E_MNG_TX4_GLUE_CFG_RM_B_SHIFT         20
 #define I40E_MNG_TX4_GLUE_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_MNG_TX4_GLUE_CFG_RM_B_SHIFT)
 
-#define I40E_MNG_TX4_GLUE_STATUS                        0x000830A0
+#define I40E_MNG_TX4_GLUE_STATUS                        0x000830A0 /* Reset: POR */
 #define I40E_MNG_TX4_GLUE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_MNG_TX4_GLUE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_MNG_TX4_GLUE_STATUS_ECC_ERR_SHIFT)
 #define I40E_MNG_TX4_GLUE_STATUS_ECC_FIX_SHIFT          1
@@ -3415,7 +3511,7 @@
 #define I40E_MNG_TX4_GLUE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_MNG_TX4_GLUE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_MNG_TX4_GLUE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PBLOC_CACHE_DBG_CTL              0x000A808C
+#define I40E_PBLOC_CACHE_DBG_CTL              0x000A808C /* Reset: CORER */
 #define I40E_PBLOC_CACHE_DBG_CTL_ADR_SHIFT    0
 #define I40E_PBLOC_CACHE_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_PBLOC_CACHE_DBG_CTL_ADR_SHIFT)
 #define I40E_PBLOC_CACHE_DBG_CTL_DW_SEL_SHIFT 18
@@ -3425,11 +3521,11 @@
 #define I40E_PBLOC_CACHE_DBG_CTL_DONE_SHIFT   31
 #define I40E_PBLOC_CACHE_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_PBLOC_CACHE_DBG_CTL_DONE_SHIFT)
 
-#define I40E_PBLOC_CACHE_DBG_DATA             0x000A8090
+#define I40E_PBLOC_CACHE_DBG_DATA             0x000A8090 /* Reset: CORER */
 #define I40E_PBLOC_CACHE_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_PBLOC_CACHE_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_PBLOC_CACHE_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_PBLOC_CACHE_MEM_CFG                    0x000A8054
+#define I40E_PBLOC_CACHE_MEM_CFG                    0x000A8054 /* Reset: POR */
 #define I40E_PBLOC_CACHE_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_PBLOC_CACHE_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PBLOC_CACHE_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_PBLOC_CACHE_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -3451,7 +3547,7 @@
 #define I40E_PBLOC_CACHE_MEM_CFG_RM_SHIFT           16
 #define I40E_PBLOC_CACHE_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_PBLOC_CACHE_MEM_CFG_RM_SHIFT)
 
-#define I40E_PBLOC_CACHE_MEM_STATUS                        0x000A8058
+#define I40E_PBLOC_CACHE_MEM_STATUS                        0x000A8058 /* Reset: POR */
 #define I40E_PBLOC_CACHE_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PBLOC_CACHE_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PBLOC_CACHE_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PBLOC_CACHE_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -3461,15 +3557,15 @@
 #define I40E_PBLOC_CACHE_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PBLOC_CACHE_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PBLOC_CACHE_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PBLOC_ECC_COR_ERR           0x000A8080
+#define I40E_PBLOC_ECC_COR_ERR           0x000A8080 /* Reset: POR */
 #define I40E_PBLOC_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_PBLOC_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_PBLOC_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_PBLOC_ECC_UNCOR_ERR           0x000A807C
+#define I40E_PBLOC_ECC_UNCOR_ERR           0x000A807C /* Reset: POR */
 #define I40E_PBLOC_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_PBLOC_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_PBLOC_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_PBLOC_EVICT_MEM_CFG                    0x000A8074
+#define I40E_PBLOC_EVICT_MEM_CFG                    0x000A8074 /* Reset: POR */
 #define I40E_PBLOC_EVICT_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_PBLOC_EVICT_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PBLOC_EVICT_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_PBLOC_EVICT_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -3495,7 +3591,7 @@
 #define I40E_PBLOC_EVICT_MEM_CFG_RM_B_SHIFT         20
 #define I40E_PBLOC_EVICT_MEM_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_PBLOC_EVICT_MEM_CFG_RM_B_SHIFT)
 
-#define I40E_PBLOC_EVICT_MEM_STATUS                        0x000A8078
+#define I40E_PBLOC_EVICT_MEM_STATUS                        0x000A8078 /* Reset: POR */
 #define I40E_PBLOC_EVICT_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PBLOC_EVICT_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PBLOC_EVICT_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PBLOC_EVICT_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -3505,7 +3601,7 @@
 #define I40E_PBLOC_EVICT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PBLOC_EVICT_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PBLOC_EVICT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PBLOC_FILL_MEM_CFG                    0x000A8064
+#define I40E_PBLOC_FILL_MEM_CFG                    0x000A8064 /* Reset: POR */
 #define I40E_PBLOC_FILL_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_PBLOC_FILL_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PBLOC_FILL_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_PBLOC_FILL_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -3531,7 +3627,7 @@
 #define I40E_PBLOC_FILL_MEM_CFG_RM_B_SHIFT         20
 #define I40E_PBLOC_FILL_MEM_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_PBLOC_FILL_MEM_CFG_RM_B_SHIFT)
 
-#define I40E_PBLOC_FILL_MEM_STATUS                        0x000A8068
+#define I40E_PBLOC_FILL_MEM_STATUS                        0x000A8068 /* Reset: POR */
 #define I40E_PBLOC_FILL_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PBLOC_FILL_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PBLOC_FILL_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PBLOC_FILL_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -3541,7 +3637,7 @@
 #define I40E_PBLOC_FILL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PBLOC_FILL_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PBLOC_FILL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PBLOC_PLIST_DBG_CTL              0x000A8094
+#define I40E_PBLOC_PLIST_DBG_CTL              0x000A8094 /* Reset: CORER */
 #define I40E_PBLOC_PLIST_DBG_CTL_ADR_SHIFT    0
 #define I40E_PBLOC_PLIST_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_PBLOC_PLIST_DBG_CTL_ADR_SHIFT)
 #define I40E_PBLOC_PLIST_DBG_CTL_DW_SEL_SHIFT 18
@@ -3551,11 +3647,11 @@
 #define I40E_PBLOC_PLIST_DBG_CTL_DONE_SHIFT   31
 #define I40E_PBLOC_PLIST_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_PBLOC_PLIST_DBG_CTL_DONE_SHIFT)
 
-#define I40E_PBLOC_PLIST_DBG_DATA             0x000A8098
+#define I40E_PBLOC_PLIST_DBG_DATA             0x000A8098 /* Reset: CORER */
 #define I40E_PBLOC_PLIST_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_PBLOC_PLIST_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_PBLOC_PLIST_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_PBLOC_PLIST_MEM_CFG                    0x000A806C
+#define I40E_PBLOC_PLIST_MEM_CFG                    0x000A806C /* Reset: POR */
 #define I40E_PBLOC_PLIST_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_PBLOC_PLIST_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PBLOC_PLIST_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_PBLOC_PLIST_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -3577,7 +3673,7 @@
 #define I40E_PBLOC_PLIST_MEM_CFG_RM_SHIFT           16
 #define I40E_PBLOC_PLIST_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_PBLOC_PLIST_MEM_CFG_RM_SHIFT)
 
-#define I40E_PBLOC_PLIST_MEM_STATUS                        0x000A8070
+#define I40E_PBLOC_PLIST_MEM_STATUS                        0x000A8070 /* Reset: POR */
 #define I40E_PBLOC_PLIST_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PBLOC_PLIST_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PBLOC_PLIST_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PBLOC_PLIST_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -3587,7 +3683,7 @@
 #define I40E_PBLOC_PLIST_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PBLOC_PLIST_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PBLOC_PLIST_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PBLOC_TAG_DBG_CTL              0x000A8084
+#define I40E_PBLOC_TAG_DBG_CTL              0x000A8084 /* Reset: CORER */
 #define I40E_PBLOC_TAG_DBG_CTL_ADR_SHIFT    0
 #define I40E_PBLOC_TAG_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_PBLOC_TAG_DBG_CTL_ADR_SHIFT)
 #define I40E_PBLOC_TAG_DBG_CTL_DW_SEL_SHIFT 18
@@ -3597,11 +3693,11 @@
 #define I40E_PBLOC_TAG_DBG_CTL_DONE_SHIFT   31
 #define I40E_PBLOC_TAG_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_PBLOC_TAG_DBG_CTL_DONE_SHIFT)
 
-#define I40E_PBLOC_TAG_DBG_DATA             0x000A8088
+#define I40E_PBLOC_TAG_DBG_DATA             0x000A8088 /* Reset: CORER */
 #define I40E_PBLOC_TAG_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_PBLOC_TAG_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_PBLOC_TAG_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_PBLOC_TAG_MEM_CFG                    0x000A805C
+#define I40E_PBLOC_TAG_MEM_CFG                    0x000A805C /* Reset: POR */
 #define I40E_PBLOC_TAG_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_PBLOC_TAG_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PBLOC_TAG_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_PBLOC_TAG_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -3623,7 +3719,7 @@
 #define I40E_PBLOC_TAG_MEM_CFG_RM_SHIFT           16
 #define I40E_PBLOC_TAG_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_PBLOC_TAG_MEM_CFG_RM_SHIFT)
 
-#define I40E_PBLOC_TAG_MEM_STATUS                        0x000A8060
+#define I40E_PBLOC_TAG_MEM_STATUS                        0x000A8060 /* Reset: POR */
 #define I40E_PBLOC_TAG_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PBLOC_TAG_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PBLOC_TAG_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PBLOC_TAG_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -3633,15 +3729,15 @@
 #define I40E_PBLOC_TAG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PBLOC_TAG_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PBLOC_TAG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_ECC_COR_ERR           0x0009D080
+#define I40E_PCIE_ECC_COR_ERR           0x0009D080 /* Reset: POR */
 #define I40E_PCIE_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_PCIE_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_PCIE_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_PCIE_ECC_UNCOR_ERR           0x0009D07C
+#define I40E_PCIE_ECC_UNCOR_ERR           0x0009D07C /* Reset: POR */
 #define I40E_PCIE_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_PCIE_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_PCIE_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_PCIE_IOSF_RX_DATA_CFG                    0x0009D010
+#define I40E_PCIE_IOSF_RX_DATA_CFG                    0x0009D010 /* Reset: POR */
 #define I40E_PCIE_IOSF_RX_DATA_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_IOSF_RX_DATA_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_IOSF_RX_DATA_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_IOSF_RX_DATA_CFG_ECC_INVERT_1_SHIFT 1
@@ -3667,7 +3763,7 @@
 #define I40E_PCIE_IOSF_RX_DATA_CFG_RM_B_SHIFT         20
 #define I40E_PCIE_IOSF_RX_DATA_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_PCIE_IOSF_RX_DATA_CFG_RM_B_SHIFT)
 
-#define I40E_PCIE_IOSF_RX_DATA_STATUS                        0x0009D068
+#define I40E_PCIE_IOSF_RX_DATA_STATUS                        0x0009D068 /* Reset: POR */
 #define I40E_PCIE_IOSF_RX_DATA_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_IOSF_RX_DATA_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_IOSF_RX_DATA_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_IOSF_RX_DATA_STATUS_ECC_FIX_SHIFT          1
@@ -3677,7 +3773,7 @@
 #define I40E_PCIE_IOSF_RX_DATA_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_IOSF_RX_DATA_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_IOSF_RX_DATA_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_IOSF_RX_HDR_CFG                    0x0009D028
+#define I40E_PCIE_IOSF_RX_HDR_CFG                    0x0009D028 /* Reset: POR */
 #define I40E_PCIE_IOSF_RX_HDR_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_IOSF_RX_HDR_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_IOSF_RX_HDR_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_IOSF_RX_HDR_CFG_ECC_INVERT_1_SHIFT 1
@@ -3703,7 +3799,7 @@
 #define I40E_PCIE_IOSF_RX_HDR_CFG_RM_B_SHIFT         20
 #define I40E_PCIE_IOSF_RX_HDR_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_PCIE_IOSF_RX_HDR_CFG_RM_B_SHIFT)
 
-#define I40E_PCIE_IOSF_RX_HDR_STATUS                        0x0009D05C
+#define I40E_PCIE_IOSF_RX_HDR_STATUS                        0x0009D05C /* Reset: POR */
 #define I40E_PCIE_IOSF_RX_HDR_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_IOSF_RX_HDR_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_IOSF_RX_HDR_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_IOSF_RX_HDR_STATUS_ECC_FIX_SHIFT          1
@@ -3713,7 +3809,7 @@
 #define I40E_PCIE_IOSF_RX_HDR_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_IOSF_RX_HDR_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_IOSF_RX_HDR_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_IOSF_TX_DATA_CFG                    0x0009D020
+#define I40E_PCIE_IOSF_TX_DATA_CFG                    0x0009D020 /* Reset: POR */
 #define I40E_PCIE_IOSF_TX_DATA_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_IOSF_TX_DATA_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_IOSF_TX_DATA_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_IOSF_TX_DATA_CFG_ECC_INVERT_1_SHIFT 1
@@ -3739,7 +3835,7 @@
 #define I40E_PCIE_IOSF_TX_DATA_CFG_RM_B_SHIFT         20
 #define I40E_PCIE_IOSF_TX_DATA_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_PCIE_IOSF_TX_DATA_CFG_RM_B_SHIFT)
 
-#define I40E_PCIE_IOSF_TX_DATA_STATUS                        0x0009D050
+#define I40E_PCIE_IOSF_TX_DATA_STATUS                        0x0009D050 /* Reset: POR */
 #define I40E_PCIE_IOSF_TX_DATA_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_IOSF_TX_DATA_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_IOSF_TX_DATA_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_IOSF_TX_DATA_STATUS_ECC_FIX_SHIFT          1
@@ -3749,7 +3845,7 @@
 #define I40E_PCIE_IOSF_TX_DATA_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_IOSF_TX_DATA_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_IOSF_TX_DATA_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_IOSF_TX_HDR_CFG                    0x0009D034
+#define I40E_PCIE_IOSF_TX_HDR_CFG                    0x0009D034 /* Reset: POR */
 #define I40E_PCIE_IOSF_TX_HDR_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_IOSF_TX_HDR_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_IOSF_TX_HDR_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_IOSF_TX_HDR_CFG_ECC_INVERT_1_SHIFT 1
@@ -3775,7 +3871,7 @@
 #define I40E_PCIE_IOSF_TX_HDR_CFG_RM_B_SHIFT         20
 #define I40E_PCIE_IOSF_TX_HDR_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_PCIE_IOSF_TX_HDR_CFG_RM_B_SHIFT)
 
-#define I40E_PCIE_IOSF_TX_HDR_STATUS                        0x0009D03C
+#define I40E_PCIE_IOSF_TX_HDR_STATUS                        0x0009D03C /* Reset: POR */
 #define I40E_PCIE_IOSF_TX_HDR_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_IOSF_TX_HDR_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_IOSF_TX_HDR_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_IOSF_TX_HDR_STATUS_ECC_FIX_SHIFT          1
@@ -3785,7 +3881,7 @@
 #define I40E_PCIE_IOSF_TX_HDR_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_IOSF_TX_HDR_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_IOSF_TX_HDR_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_MCTP_DATA_CFG                    0x0009D01C
+#define I40E_PCIE_MCTP_DATA_CFG                    0x0009D01C /* Reset: POR */
 #define I40E_PCIE_MCTP_DATA_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_MCTP_DATA_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_MCTP_DATA_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_MCTP_DATA_CFG_ECC_INVERT_1_SHIFT 1
@@ -3807,7 +3903,7 @@
 #define I40E_PCIE_MCTP_DATA_CFG_RM_SHIFT           16
 #define I40E_PCIE_MCTP_DATA_CFG_RM_MASK            I40E_MASK(0xF, I40E_PCIE_MCTP_DATA_CFG_RM_SHIFT)
 
-#define I40E_PCIE_MCTP_DATA_STATUS                        0x0009D04C
+#define I40E_PCIE_MCTP_DATA_STATUS                        0x0009D04C /* Reset: POR */
 #define I40E_PCIE_MCTP_DATA_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_MCTP_DATA_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_MCTP_DATA_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_MCTP_DATA_STATUS_ECC_FIX_SHIFT          1
@@ -3817,7 +3913,7 @@
 #define I40E_PCIE_MCTP_DATA_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_MCTP_DATA_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_MCTP_DATA_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_MCTP_HDR_CFG                    0x0009D004
+#define I40E_PCIE_MCTP_HDR_CFG                    0x0009D004 /* Reset: POR */
 #define I40E_PCIE_MCTP_HDR_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_MCTP_HDR_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_MCTP_HDR_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_MCTP_HDR_CFG_ECC_INVERT_1_SHIFT 1
@@ -3839,7 +3935,7 @@
 #define I40E_PCIE_MCTP_HDR_CFG_RM_SHIFT           16
 #define I40E_PCIE_MCTP_HDR_CFG_RM_MASK            I40E_MASK(0xF, I40E_PCIE_MCTP_HDR_CFG_RM_SHIFT)
 
-#define I40E_PCIE_MCTP_HDR_STATUS                        0x0009D040
+#define I40E_PCIE_MCTP_HDR_STATUS                        0x0009D040 /* Reset: POR */
 #define I40E_PCIE_MCTP_HDR_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_MCTP_HDR_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_MCTP_HDR_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_MCTP_HDR_STATUS_ECC_FIX_SHIFT          1
@@ -3849,7 +3945,7 @@
 #define I40E_PCIE_MCTP_HDR_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_MCTP_HDR_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_MCTP_HDR_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_MSIX_VEC_CFG                    0x0009D030
+#define I40E_PCIE_MSIX_VEC_CFG                    0x0009D030 /* Reset: POR */
 #define I40E_PCIE_MSIX_VEC_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_MSIX_VEC_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_MSIX_VEC_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_MSIX_VEC_CFG_ECC_INVERT_1_SHIFT 1
@@ -3871,7 +3967,7 @@
 #define I40E_PCIE_MSIX_VEC_CFG_RM_SHIFT           16
 #define I40E_PCIE_MSIX_VEC_CFG_RM_MASK            I40E_MASK(0xF, I40E_PCIE_MSIX_VEC_CFG_RM_SHIFT)
 
-#define I40E_PCIE_MSIX_VEC_STATUS                        0x0009D060
+#define I40E_PCIE_MSIX_VEC_STATUS                        0x0009D060 /* Reset: POR */
 #define I40E_PCIE_MSIX_VEC_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_MSIX_VEC_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_MSIX_VEC_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_MSIX_VEC_STATUS_ECC_FIX_SHIFT          1
@@ -3881,7 +3977,7 @@
 #define I40E_PCIE_MSIX_VEC_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_MSIX_VEC_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_MSIX_VEC_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_NPQ_CPL_LAN_DESC_CFG                    0x0009D06C
+#define I40E_PCIE_NPQ_CPL_LAN_DESC_CFG                    0x0009D06C /* Reset: POR */
 #define I40E_PCIE_NPQ_CPL_LAN_DESC_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_NPQ_CPL_LAN_DESC_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_LAN_DESC_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_NPQ_CPL_LAN_DESC_CFG_ECC_INVERT_1_SHIFT 1
@@ -3903,7 +3999,7 @@
 #define I40E_PCIE_NPQ_CPL_LAN_DESC_CFG_RM_SHIFT           16
 #define I40E_PCIE_NPQ_CPL_LAN_DESC_CFG_RM_MASK            I40E_MASK(0xF, I40E_PCIE_NPQ_CPL_LAN_DESC_CFG_RM_SHIFT)
 
-#define I40E_PCIE_NPQ_CPL_LAN_DESC_STATUS                        0x0009D074
+#define I40E_PCIE_NPQ_CPL_LAN_DESC_STATUS                        0x0009D074 /* Reset: POR */
 #define I40E_PCIE_NPQ_CPL_LAN_DESC_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_NPQ_CPL_LAN_DESC_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_LAN_DESC_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_NPQ_CPL_LAN_DESC_STATUS_ECC_FIX_SHIFT          1
@@ -3913,7 +4009,7 @@
 #define I40E_PCIE_NPQ_CPL_LAN_DESC_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_NPQ_CPL_LAN_DESC_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_LAN_DESC_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_NPQ_CPL_MNG_CFG                    0x0009D008
+#define I40E_PCIE_NPQ_CPL_MNG_CFG                    0x0009D008 /* Reset: POR */
 #define I40E_PCIE_NPQ_CPL_MNG_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_NPQ_CPL_MNG_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_MNG_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_NPQ_CPL_MNG_CFG_ECC_INVERT_1_SHIFT 1
@@ -3935,7 +4031,7 @@
 #define I40E_PCIE_NPQ_CPL_MNG_CFG_RM_SHIFT           16
 #define I40E_PCIE_NPQ_CPL_MNG_CFG_RM_MASK            I40E_MASK(0xF, I40E_PCIE_NPQ_CPL_MNG_CFG_RM_SHIFT)
 
-#define I40E_PCIE_NPQ_CPL_MNG_STATUS                        0x0009D054
+#define I40E_PCIE_NPQ_CPL_MNG_STATUS                        0x0009D054 /* Reset: POR */
 #define I40E_PCIE_NPQ_CPL_MNG_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_NPQ_CPL_MNG_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_MNG_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_NPQ_CPL_MNG_STATUS_ECC_FIX_SHIFT          1
@@ -3945,7 +4041,7 @@
 #define I40E_PCIE_NPQ_CPL_MNG_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_NPQ_CPL_MNG_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_MNG_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_NPQ_CPL_PE_DESC_CFG                    0x0009D078
+#define I40E_PCIE_NPQ_CPL_PE_DESC_CFG                    0x0009D078 /* Reset: POR */
 #define I40E_PCIE_NPQ_CPL_PE_DESC_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_NPQ_CPL_PE_DESC_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_PE_DESC_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_NPQ_CPL_PE_DESC_CFG_ECC_INVERT_1_SHIFT 1
@@ -3967,7 +4063,7 @@
 #define I40E_PCIE_NPQ_CPL_PE_DESC_CFG_RM_SHIFT           16
 #define I40E_PCIE_NPQ_CPL_PE_DESC_CFG_RM_MASK            I40E_MASK(0xF, I40E_PCIE_NPQ_CPL_PE_DESC_CFG_RM_SHIFT)
 
-#define I40E_PCIE_NPQ_CPL_PE_DESC_STATUS                        0x0009D070
+#define I40E_PCIE_NPQ_CPL_PE_DESC_STATUS                        0x0009D070 /* Reset: POR */
 #define I40E_PCIE_NPQ_CPL_PE_DESC_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_NPQ_CPL_PE_DESC_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_PE_DESC_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_NPQ_CPL_PE_DESC_STATUS_ECC_FIX_SHIFT          1
@@ -3977,7 +4073,7 @@
 #define I40E_PCIE_NPQ_CPL_PE_DESC_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_NPQ_CPL_PE_DESC_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_PE_DESC_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_NPQ_CPL_PMAT_CFG                    0x0009D000
+#define I40E_PCIE_NPQ_CPL_PMAT_CFG                    0x0009D000 /* Reset: POR */
 #define I40E_PCIE_NPQ_CPL_PMAT_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_NPQ_CPL_PMAT_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_PMAT_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_NPQ_CPL_PMAT_CFG_ECC_INVERT_1_SHIFT 1
@@ -3999,7 +4095,7 @@
 #define I40E_PCIE_NPQ_CPL_PMAT_CFG_RM_SHIFT           16
 #define I40E_PCIE_NPQ_CPL_PMAT_CFG_RM_MASK            I40E_MASK(0xF, I40E_PCIE_NPQ_CPL_PMAT_CFG_RM_SHIFT)
 
-#define I40E_PCIE_NPQ_CPL_PMAT_STATUS                        0x0009D048
+#define I40E_PCIE_NPQ_CPL_PMAT_STATUS                        0x0009D048 /* Reset: POR */
 #define I40E_PCIE_NPQ_CPL_PMAT_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_NPQ_CPL_PMAT_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_PMAT_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_NPQ_CPL_PMAT_STATUS_ECC_FIX_SHIFT          1
@@ -4009,7 +4105,7 @@
 #define I40E_PCIE_NPQ_CPL_PMAT_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_NPQ_CPL_PMAT_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_PMAT_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_NPQ_CPL_TDPU_CFG                    0x0009D014
+#define I40E_PCIE_NPQ_CPL_TDPU_CFG                    0x0009D014 /* Reset: POR */
 #define I40E_PCIE_NPQ_CPL_TDPU_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_NPQ_CPL_TDPU_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_TDPU_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_NPQ_CPL_TDPU_CFG_ECC_INVERT_1_SHIFT 1
@@ -4031,7 +4127,7 @@
 #define I40E_PCIE_NPQ_CPL_TDPU_CFG_RM_SHIFT           16
 #define I40E_PCIE_NPQ_CPL_TDPU_CFG_RM_MASK            I40E_MASK(0xF, I40E_PCIE_NPQ_CPL_TDPU_CFG_RM_SHIFT)
 
-#define I40E_PCIE_NPQ_CPL_TDPU_STATUS                        0x0009D064
+#define I40E_PCIE_NPQ_CPL_TDPU_STATUS                        0x0009D064 /* Reset: POR */
 #define I40E_PCIE_NPQ_CPL_TDPU_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_NPQ_CPL_TDPU_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_TDPU_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_NPQ_CPL_TDPU_STATUS_ECC_FIX_SHIFT          1
@@ -4041,7 +4137,7 @@
 #define I40E_PCIE_NPQ_CPL_TDPU_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_NPQ_CPL_TDPU_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_NPQ_CPL_TDPU_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_PQ_C125_CFG                    0x0009D018
+#define I40E_PCIE_PQ_C125_CFG                    0x0009D018 /* Reset: POR */
 #define I40E_PCIE_PQ_C125_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_PQ_C125_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_PQ_C125_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_PQ_C125_CFG_ECC_INVERT_1_SHIFT 1
@@ -4063,7 +4159,7 @@
 #define I40E_PCIE_PQ_C125_CFG_RM_SHIFT           16
 #define I40E_PCIE_PQ_C125_CFG_RM_MASK            I40E_MASK(0xF, I40E_PCIE_PQ_C125_CFG_RM_SHIFT)
 
-#define I40E_PCIE_PQ_C125_STATUS                        0x0009D038
+#define I40E_PCIE_PQ_C125_STATUS                        0x0009D038 /* Reset: POR */
 #define I40E_PCIE_PQ_C125_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_PQ_C125_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_PQ_C125_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_PQ_C125_STATUS_ECC_FIX_SHIFT          1
@@ -4073,7 +4169,7 @@
 #define I40E_PCIE_PQ_C125_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_PQ_C125_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_PQ_C125_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_PQ_C400_CFG                    0x0009D024
+#define I40E_PCIE_PQ_C400_CFG                    0x0009D024 /* Reset: POR */
 #define I40E_PCIE_PQ_C400_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_PQ_C400_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_PQ_C400_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_PQ_C400_CFG_ECC_INVERT_1_SHIFT 1
@@ -4095,7 +4191,7 @@
 #define I40E_PCIE_PQ_C400_CFG_RM_SHIFT           16
 #define I40E_PCIE_PQ_C400_CFG_RM_MASK            I40E_MASK(0xF, I40E_PCIE_PQ_C400_CFG_RM_SHIFT)
 
-#define I40E_PCIE_PQ_C400_STATUS                        0x0009D044
+#define I40E_PCIE_PQ_C400_STATUS                        0x0009D044 /* Reset: POR */
 #define I40E_PCIE_PQ_C400_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_PQ_C400_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_PQ_C400_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_PQ_C400_STATUS_ECC_FIX_SHIFT          1
@@ -4105,7 +4201,7 @@
 #define I40E_PCIE_PQ_C400_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_PQ_C400_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_PQ_C400_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PCIE_RETRY_BUF_CFG                    0x0009D02C
+#define I40E_PCIE_RETRY_BUF_CFG                    0x0009D02C /* Reset: POR */
 #define I40E_PCIE_RETRY_BUF_CFG_ECC_EN_SHIFT       0
 #define I40E_PCIE_RETRY_BUF_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PCIE_RETRY_BUF_CFG_ECC_EN_SHIFT)
 #define I40E_PCIE_RETRY_BUF_CFG_ECC_INVERT_1_SHIFT 1
@@ -4127,7 +4223,7 @@
 #define I40E_PCIE_RETRY_BUF_CFG_RM_SHIFT           16
 #define I40E_PCIE_RETRY_BUF_CFG_RM_MASK            I40E_MASK(0xF, I40E_PCIE_RETRY_BUF_CFG_RM_SHIFT)
 
-#define I40E_PCIE_RETRY_BUF_STATUS                        0x0009D058
+#define I40E_PCIE_RETRY_BUF_STATUS                        0x0009D058 /* Reset: POR */
 #define I40E_PCIE_RETRY_BUF_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PCIE_RETRY_BUF_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PCIE_RETRY_BUF_STATUS_ECC_ERR_SHIFT)
 #define I40E_PCIE_RETRY_BUF_STATUS_ECC_FIX_SHIFT          1
@@ -4137,7 +4233,7 @@
 #define I40E_PCIE_RETRY_BUF_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PCIE_RETRY_BUF_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PCIE_RETRY_BUF_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PDOC_CACHE_DBG_CTL              0x000D005C
+#define I40E_PDOC_CACHE_DBG_CTL              0x000D005C /* Reset: CORER */
 #define I40E_PDOC_CACHE_DBG_CTL_ADR_SHIFT    0
 #define I40E_PDOC_CACHE_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_PDOC_CACHE_DBG_CTL_ADR_SHIFT)
 #define I40E_PDOC_CACHE_DBG_CTL_DW_SEL_SHIFT 18
@@ -4147,11 +4243,11 @@
 #define I40E_PDOC_CACHE_DBG_CTL_DONE_SHIFT   31
 #define I40E_PDOC_CACHE_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_PDOC_CACHE_DBG_CTL_DONE_SHIFT)
 
-#define I40E_PDOC_CACHE_DBG_DATA             0x000D0060
+#define I40E_PDOC_CACHE_DBG_DATA             0x000D0060 /* Reset: CORER */
 #define I40E_PDOC_CACHE_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_PDOC_CACHE_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_PDOC_CACHE_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_PDOC_CACHE_MEM_CFG                    0x000D002C
+#define I40E_PDOC_CACHE_MEM_CFG                    0x000D002C /* Reset: POR */
 #define I40E_PDOC_CACHE_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_PDOC_CACHE_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PDOC_CACHE_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_PDOC_CACHE_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -4173,7 +4269,7 @@
 #define I40E_PDOC_CACHE_MEM_CFG_RM_SHIFT           16
 #define I40E_PDOC_CACHE_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_PDOC_CACHE_MEM_CFG_RM_SHIFT)
 
-#define I40E_PDOC_CACHE_MEM_STATUS                        0x000D0030
+#define I40E_PDOC_CACHE_MEM_STATUS                        0x000D0030 /* Reset: POR */
 #define I40E_PDOC_CACHE_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PDOC_CACHE_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PDOC_CACHE_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PDOC_CACHE_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -4183,15 +4279,15 @@
 #define I40E_PDOC_CACHE_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PDOC_CACHE_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PDOC_CACHE_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PDOC_ECC_COR_ERR_CNT           0x000D0050
+#define I40E_PDOC_ECC_COR_ERR_CNT           0x000D0050 /* Reset: POR */
 #define I40E_PDOC_ECC_COR_ERR_CNT_CNT_SHIFT 0
 #define I40E_PDOC_ECC_COR_ERR_CNT_CNT_MASK  I40E_MASK(0xFFF, I40E_PDOC_ECC_COR_ERR_CNT_CNT_SHIFT)
 
-#define I40E_PDOC_ECC_UNCOR_ERR_CNT           0x000D004C
+#define I40E_PDOC_ECC_UNCOR_ERR_CNT           0x000D004C /* Reset: POR */
 #define I40E_PDOC_ECC_UNCOR_ERR_CNT_CNT_SHIFT 0
 #define I40E_PDOC_ECC_UNCOR_ERR_CNT_CNT_MASK  I40E_MASK(0xFFF, I40E_PDOC_ECC_UNCOR_ERR_CNT_CNT_SHIFT)
 
-#define I40E_PDOC_FILL_MEM_CFG                    0x000D003C
+#define I40E_PDOC_FILL_MEM_CFG                    0x000D003C /* Reset: POR */
 #define I40E_PDOC_FILL_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_PDOC_FILL_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PDOC_FILL_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_PDOC_FILL_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -4213,7 +4309,7 @@
 #define I40E_PDOC_FILL_MEM_CFG_RM_SHIFT           16
 #define I40E_PDOC_FILL_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_PDOC_FILL_MEM_CFG_RM_SHIFT)
 
-#define I40E_PDOC_FILL_MEM_STATUS                        0x000D0040
+#define I40E_PDOC_FILL_MEM_STATUS                        0x000D0040 /* Reset: POR */
 #define I40E_PDOC_FILL_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PDOC_FILL_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PDOC_FILL_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PDOC_FILL_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -4223,7 +4319,7 @@
 #define I40E_PDOC_FILL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PDOC_FILL_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PDOC_FILL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PDOC_PLIST_DBG_CTL              0x000D0064
+#define I40E_PDOC_PLIST_DBG_CTL              0x000D0064 /* Reset: CORER */
 #define I40E_PDOC_PLIST_DBG_CTL_ADR_SHIFT    0
 #define I40E_PDOC_PLIST_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_PDOC_PLIST_DBG_CTL_ADR_SHIFT)
 #define I40E_PDOC_PLIST_DBG_CTL_DW_SEL_SHIFT 18
@@ -4233,11 +4329,11 @@
 #define I40E_PDOC_PLIST_DBG_CTL_DONE_SHIFT   31
 #define I40E_PDOC_PLIST_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_PDOC_PLIST_DBG_CTL_DONE_SHIFT)
 
-#define I40E_PDOC_PLIST_DBG_DATA             0x000D0068
+#define I40E_PDOC_PLIST_DBG_DATA             0x000D0068 /* Reset: CORER */
 #define I40E_PDOC_PLIST_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_PDOC_PLIST_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_PDOC_PLIST_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_PDOC_PLIST_MEM_CFG                    0x000D0044
+#define I40E_PDOC_PLIST_MEM_CFG                    0x000D0044 /* Reset: POR */
 #define I40E_PDOC_PLIST_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_PDOC_PLIST_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PDOC_PLIST_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_PDOC_PLIST_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -4259,7 +4355,7 @@
 #define I40E_PDOC_PLIST_MEM_CFG_RM_SHIFT           16
 #define I40E_PDOC_PLIST_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_PDOC_PLIST_MEM_CFG_RM_SHIFT)
 
-#define I40E_PDOC_PLIST_MEM_STATUS                        0x000D0048
+#define I40E_PDOC_PLIST_MEM_STATUS                        0x000D0048 /* Reset: POR */
 #define I40E_PDOC_PLIST_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PDOC_PLIST_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PDOC_PLIST_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PDOC_PLIST_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -4269,7 +4365,7 @@
 #define I40E_PDOC_PLIST_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PDOC_PLIST_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PDOC_PLIST_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PDOC_TAG_DBG_CTL              0x000D0054
+#define I40E_PDOC_TAG_DBG_CTL              0x000D0054 /* Reset: CORER */
 #define I40E_PDOC_TAG_DBG_CTL_ADR_SHIFT    0
 #define I40E_PDOC_TAG_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_PDOC_TAG_DBG_CTL_ADR_SHIFT)
 #define I40E_PDOC_TAG_DBG_CTL_DW_SEL_SHIFT 18
@@ -4279,11 +4375,11 @@
 #define I40E_PDOC_TAG_DBG_CTL_DONE_SHIFT   31
 #define I40E_PDOC_TAG_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_PDOC_TAG_DBG_CTL_DONE_SHIFT)
 
-#define I40E_PDOC_TAG_DBG_DATA             0x000D0058
+#define I40E_PDOC_TAG_DBG_DATA             0x000D0058 /* Reset: CORER */
 #define I40E_PDOC_TAG_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_PDOC_TAG_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_PDOC_TAG_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_PDOC_TAG_MEM_CFG                    0x000D0038
+#define I40E_PDOC_TAG_MEM_CFG                    0x000D0038 /* Reset: POR */
 #define I40E_PDOC_TAG_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_PDOC_TAG_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PDOC_TAG_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_PDOC_TAG_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -4305,7 +4401,7 @@
 #define I40E_PDOC_TAG_MEM_CFG_RM_SHIFT           16
 #define I40E_PDOC_TAG_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_PDOC_TAG_MEM_CFG_RM_SHIFT)
 
-#define I40E_PDOC_TAG_MEM_STATUS                        0x000D0034
+#define I40E_PDOC_TAG_MEM_STATUS                        0x000D0034 /* Reset: POR */
 #define I40E_PDOC_TAG_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PDOC_TAG_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PDOC_TAG_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PDOC_TAG_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -4315,7 +4411,7 @@
 #define I40E_PDOC_TAG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PDOC_TAG_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PDOC_TAG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PKT_INDICATIONS(_i)              (0x000AC920 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_PKT_INDICATIONS(_i)              (0x000AC920 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PKT_INDICATIONS_MAX_INDEX        7
 #define I40E_PKT_INDICATIONS_START_CNT_SHIFT  0
 #define I40E_PKT_INDICATIONS_START_CNT_MASK   I40E_MASK(0xFF, I40E_PKT_INDICATIONS_START_CNT_SHIFT)
@@ -4326,15 +4422,15 @@
 #define I40E_PKT_INDICATIONS_DROP_CNT_SHIFT   24
 #define I40E_PKT_INDICATIONS_DROP_CNT_MASK    I40E_MASK(0xFF, I40E_PKT_INDICATIONS_DROP_CNT_SHIFT)
 
-#define I40E_PMAT_ECC_COR_ERR           0x000C20CC
+#define I40E_PMAT_ECC_COR_ERR           0x000C20CC /* Reset: POR */
 #define I40E_PMAT_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_PMAT_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_PMAT_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_PMAT_ECC_UNCOR_ERR_CNT           0x000C20C8
+#define I40E_PMAT_ECC_UNCOR_ERR_CNT           0x000C20C8 /* Reset: POR */
 #define I40E_PMAT_ECC_UNCOR_ERR_CNT_CNT_SHIFT 0
 #define I40E_PMAT_ECC_UNCOR_ERR_CNT_CNT_MASK  I40E_MASK(0xFFF, I40E_PMAT_ECC_UNCOR_ERR_CNT_CNT_SHIFT)
 
-#define I40E_PMAT_OBJ_BASE_RAM_CFG                    0x000C20B8
+#define I40E_PMAT_OBJ_BASE_RAM_CFG                    0x000C20B8 /* Reset: POR */
 #define I40E_PMAT_OBJ_BASE_RAM_CFG_ECC_EN_SHIFT       0
 #define I40E_PMAT_OBJ_BASE_RAM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PMAT_OBJ_BASE_RAM_CFG_ECC_EN_SHIFT)
 #define I40E_PMAT_OBJ_BASE_RAM_CFG_ECC_INVERT_1_SHIFT 1
@@ -4356,7 +4452,7 @@
 #define I40E_PMAT_OBJ_BASE_RAM_CFG_RM_SHIFT           16
 #define I40E_PMAT_OBJ_BASE_RAM_CFG_RM_MASK            I40E_MASK(0xF, I40E_PMAT_OBJ_BASE_RAM_CFG_RM_SHIFT)
 
-#define I40E_PMAT_OBJ_BASE_RAM_STATUS                        0x000C20BC
+#define I40E_PMAT_OBJ_BASE_RAM_STATUS                        0x000C20BC /* Reset: POR */
 #define I40E_PMAT_OBJ_BASE_RAM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PMAT_OBJ_BASE_RAM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PMAT_OBJ_BASE_RAM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PMAT_OBJ_BASE_RAM_STATUS_ECC_FIX_SHIFT          1
@@ -4366,7 +4462,7 @@
 #define I40E_PMAT_OBJ_BASE_RAM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PMAT_OBJ_BASE_RAM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PMAT_OBJ_BASE_RAM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PMAT_OBJ_BNDS_RAM_CFG                    0x000C20C0
+#define I40E_PMAT_OBJ_BNDS_RAM_CFG                    0x000C20C0 /* Reset: POR */
 #define I40E_PMAT_OBJ_BNDS_RAM_CFG_ECC_EN_SHIFT       0
 #define I40E_PMAT_OBJ_BNDS_RAM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PMAT_OBJ_BNDS_RAM_CFG_ECC_EN_SHIFT)
 #define I40E_PMAT_OBJ_BNDS_RAM_CFG_ECC_INVERT_1_SHIFT 1
@@ -4388,7 +4484,7 @@
 #define I40E_PMAT_OBJ_BNDS_RAM_CFG_RM_SHIFT           16
 #define I40E_PMAT_OBJ_BNDS_RAM_CFG_RM_MASK            I40E_MASK(0xF, I40E_PMAT_OBJ_BNDS_RAM_CFG_RM_SHIFT)
 
-#define I40E_PMAT_OBJ_BNDS_RAM_STATUS                        0x000C20C4
+#define I40E_PMAT_OBJ_BNDS_RAM_STATUS                        0x000C20C4 /* Reset: POR */
 #define I40E_PMAT_OBJ_BNDS_RAM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PMAT_OBJ_BNDS_RAM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PMAT_OBJ_BNDS_RAM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PMAT_OBJ_BNDS_RAM_STATUS_ECC_FIX_SHIFT          1
@@ -4398,7 +4494,7 @@
 #define I40E_PMAT_OBJ_BNDS_RAM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PMAT_OBJ_BNDS_RAM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PMAT_OBJ_BNDS_RAM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PMAT_ST_RAM_CFG                    0x000C20B0
+#define I40E_PMAT_ST_RAM_CFG                    0x000C20B0 /* Reset: POR */
 #define I40E_PMAT_ST_RAM_CFG_ECC_EN_SHIFT       0
 #define I40E_PMAT_ST_RAM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PMAT_ST_RAM_CFG_ECC_EN_SHIFT)
 #define I40E_PMAT_ST_RAM_CFG_ECC_INVERT_1_SHIFT 1
@@ -4420,7 +4516,7 @@
 #define I40E_PMAT_ST_RAM_CFG_RM_SHIFT           16
 #define I40E_PMAT_ST_RAM_CFG_RM_MASK            I40E_MASK(0xF, I40E_PMAT_ST_RAM_CFG_RM_SHIFT)
 
-#define I40E_PMAT_ST_RAM_STATUS                        0x000C20B4
+#define I40E_PMAT_ST_RAM_STATUS                        0x000C20B4 /* Reset: POR */
 #define I40E_PMAT_ST_RAM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PMAT_ST_RAM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PMAT_ST_RAM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PMAT_ST_RAM_STATUS_ECC_FIX_SHIFT          1
@@ -4430,7 +4526,7 @@
 #define I40E_PMAT_ST_RAM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PMAT_ST_RAM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PMAT_ST_RAM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PORT_CMD_BUF_MEM_CFG                    0x000AE094
+#define I40E_PORT_CMD_BUF_MEM_CFG                    0x000AE094 /* Reset: POR */
 #define I40E_PORT_CMD_BUF_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_PORT_CMD_BUF_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PORT_CMD_BUF_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_PORT_CMD_BUF_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -4452,7 +4548,7 @@
 #define I40E_PORT_CMD_BUF_MEM_CFG_RM_SHIFT           16
 #define I40E_PORT_CMD_BUF_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_PORT_CMD_BUF_MEM_CFG_RM_SHIFT)
 
-#define I40E_PORT_CMD_BUF_MEM_STATUS                        0x000AE098
+#define I40E_PORT_CMD_BUF_MEM_STATUS                        0x000AE098 /* Reset: POR */
 #define I40E_PORT_CMD_BUF_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PORT_CMD_BUF_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PORT_CMD_BUF_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PORT_CMD_BUF_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -4462,7 +4558,7 @@
 #define I40E_PORT_CMD_BUF_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PORT_CMD_BUF_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PORT_CMD_BUF_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PORT_CMD_MNG_MEM_CFG                    0x000AE09C
+#define I40E_PORT_CMD_MNG_MEM_CFG                    0x000AE09C /* Reset: POR */
 #define I40E_PORT_CMD_MNG_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_PORT_CMD_MNG_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PORT_CMD_MNG_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_PORT_CMD_MNG_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -4484,7 +4580,7 @@
 #define I40E_PORT_CMD_MNG_MEM_CFG_RM_SHIFT           16
 #define I40E_PORT_CMD_MNG_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_PORT_CMD_MNG_MEM_CFG_RM_SHIFT)
 
-#define I40E_PORT_CMD_MNG_MEM_STATUS                        0x000AE0A0
+#define I40E_PORT_CMD_MNG_MEM_STATUS                        0x000AE0A0 /* Reset: POR */
 #define I40E_PORT_CMD_MNG_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PORT_CMD_MNG_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PORT_CMD_MNG_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_PORT_CMD_MNG_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -4494,15 +4590,15 @@
 #define I40E_PORT_CMD_MNG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PORT_CMD_MNG_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PORT_CMD_MNG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PPRS_ECC_COR_ERR           0x00085BA0
+#define I40E_PPRS_ECC_COR_ERR           0x00085BA0 /* Reset: POR */
 #define I40E_PPRS_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_PPRS_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_PPRS_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_PPRS_ECC_UNCOR_ERR           0x00085B80
+#define I40E_PPRS_ECC_UNCOR_ERR           0x00085B80 /* Reset: POR */
 #define I40E_PPRS_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_PPRS_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_PPRS_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_PPRS_PCKT_CFG                    0x00085B00
+#define I40E_PPRS_PCKT_CFG                    0x00085B00 /* Reset: POR */
 #define I40E_PPRS_PCKT_CFG_ECC_EN_SHIFT       0
 #define I40E_PPRS_PCKT_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PPRS_PCKT_CFG_ECC_EN_SHIFT)
 #define I40E_PPRS_PCKT_CFG_ECC_INVERT_1_SHIFT 1
@@ -4524,7 +4620,7 @@
 #define I40E_PPRS_PCKT_CFG_RM_SHIFT           16
 #define I40E_PPRS_PCKT_CFG_RM_MASK            I40E_MASK(0xF, I40E_PPRS_PCKT_CFG_RM_SHIFT)
 
-#define I40E_PPRS_PCKT_STATUS                        0x00085B20
+#define I40E_PPRS_PCKT_STATUS                        0x00085B20 /* Reset: POR */
 #define I40E_PPRS_PCKT_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PPRS_PCKT_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PPRS_PCKT_STATUS_ECC_ERR_SHIFT)
 #define I40E_PPRS_PCKT_STATUS_ECC_FIX_SHIFT          1
@@ -4534,7 +4630,7 @@
 #define I40E_PPRS_PCKT_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PPRS_PCKT_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PPRS_PCKT_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PPRS_RECIPE_CFG                    0x00085B40
+#define I40E_PPRS_RECIPE_CFG                    0x00085B40 /* Reset: POR */
 #define I40E_PPRS_RECIPE_CFG_ECC_EN_SHIFT       0
 #define I40E_PPRS_RECIPE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_PPRS_RECIPE_CFG_ECC_EN_SHIFT)
 #define I40E_PPRS_RECIPE_CFG_ECC_INVERT_1_SHIFT 1
@@ -4556,7 +4652,7 @@
 #define I40E_PPRS_RECIPE_CFG_RM_SHIFT           16
 #define I40E_PPRS_RECIPE_CFG_RM_MASK            I40E_MASK(0xF, I40E_PPRS_RECIPE_CFG_RM_SHIFT)
 
-#define I40E_PPRS_RECIPE_STATUS                        0x00085B60
+#define I40E_PPRS_RECIPE_STATUS                        0x00085B60 /* Reset: POR */
 #define I40E_PPRS_RECIPE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_PPRS_RECIPE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_PPRS_RECIPE_STATUS_ECC_ERR_SHIFT)
 #define I40E_PPRS_RECIPE_STATUS_ECC_FIX_SHIFT          1
@@ -4566,7 +4662,7 @@
 #define I40E_PPRS_RECIPE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_PPRS_RECIPE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_PPRS_RECIPE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_PRT_PPRS_CTRL                     0x00086000
+#define I40E_PRT_PPRS_CTRL                     0x00086000 /* Reset: CORER */
 #define I40E_PRT_PPRS_CTRL_HDR_VLD_SEL_SHIFT   0
 #define I40E_PRT_PPRS_CTRL_HDR_VLD_SEL_MASK    I40E_MASK(0x3, I40E_PRT_PPRS_CTRL_HDR_VLD_SEL_SHIFT)
 #define I40E_PRT_PPRS_CTRL_STOP_ANA_DIS_SHIFT  2
@@ -4578,43 +4674,47 @@
 #define I40E_PRT_PPRS_CTRL_SPARE_27B_SHIFT     5
 #define I40E_PRT_PPRS_CTRL_SPARE_27B_MASK      I40E_MASK(0x7FFFFFF, I40E_PRT_PPRS_CTRL_SPARE_27B_SHIFT)
 
-#define I40E_PRT_PPRS_DEFUALT_RECIPE_PTR                          0x00086040
+#define I40E_PRT_PPRS_DEFUALT_RECIPE_PTR                          0x00086040 /* Reset: CORER */
 #define I40E_PRT_PPRS_DEFUALT_RECIPE_PTR_DEFUALT_RECIPE_PTR_SHIFT 0
 #define I40E_PRT_PPRS_DEFUALT_RECIPE_PTR_DEFUALT_RECIPE_PTR_MASK  I40E_MASK(0x3FFFFF, I40E_PRT_PPRS_DEFUALT_RECIPE_PTR_DEFUALT_RECIPE_PTR_SHIFT)
 
-#define I40E_PRT_PPRS_DONE_CNT                    0x00087020
+#define I40E_PRT_PPRS_DONE_CNT                    0x00087020 /* Reset: CORER */
 #define I40E_PRT_PPRS_DONE_CNT_LY3_DONE_CNT_SHIFT 0
 #define I40E_PRT_PPRS_DONE_CNT_LY3_DONE_CNT_MASK  I40E_MASK(0xFFFF, I40E_PRT_PPRS_DONE_CNT_LY3_DONE_CNT_SHIFT)
 #define I40E_PRT_PPRS_DONE_CNT_LY2_DONE_CNT_SHIFT 16
 #define I40E_PRT_PPRS_DONE_CNT_LY2_DONE_CNT_MASK  I40E_MASK(0xFFFF, I40E_PRT_PPRS_DONE_CNT_LY2_DONE_CNT_SHIFT)
 
-#define I40E_PRT_PPRS_DROP_CNT                         0x00087000
+#define I40E_PRT_PPRS_DROP_CNT                         0x00087000 /* Reset: CORER */
 #define I40E_PRT_PPRS_DROP_CNT_PRT_PPRS_DROP_CNT_SHIFT 0
 #define I40E_PRT_PPRS_DROP_CNT_PRT_PPRS_DROP_CNT_MASK  I40E_MASK(0xFFFF, I40E_PRT_PPRS_DROP_CNT_PRT_PPRS_DROP_CNT_SHIFT)
 
-#define I40E_PRT_PPRS_HDR_VLD_PCTYPE_EN                         0x00086060
+#define I40E_PRT_PPRS_HDR_VLD_PCTYPE_EN                         0x00086060 /* Reset: CORER */
 #define I40E_PRT_PPRS_HDR_VLD_PCTYPE_EN_HDR_VLD_PCTYPE_EN_SHIFT 0
 #define I40E_PRT_PPRS_HDR_VLD_PCTYPE_EN_HDR_VLD_PCTYPE_EN_MASK  I40E_MASK(0xFFFF, I40E_PRT_PPRS_HDR_VLD_PCTYPE_EN_HDR_VLD_PCTYPE_EN_SHIFT)
 
-#define I40E_PRT_PPRS_NOT_PARSE_CNT                    0x00087040
+#define I40E_PRT_PPRS_NOT_PARSE_CNT                    0x00087040 /* Reset: CORER */
 #define I40E_PRT_PPRS_NOT_PARSE_CNT_STOP_ANA_CNT_SHIFT 0
 #define I40E_PRT_PPRS_NOT_PARSE_CNT_STOP_ANA_CNT_MASK  I40E_MASK(0xFFFF, I40E_PRT_PPRS_NOT_PARSE_CNT_STOP_ANA_CNT_SHIFT)
 #define I40E_PRT_PPRS_NOT_PARSE_CNT_ABORT_CNT_SHIFT    16
 #define I40E_PRT_PPRS_NOT_PARSE_CNT_ABORT_CNT_MASK     I40E_MASK(0xFFFF, I40E_PRT_PPRS_NOT_PARSE_CNT_ABORT_CNT_SHIFT)
 
-#define I40E_PRT_PPRS_PERF_BUF                 0x00086020
+#define I40E_PRT_PPRS_PERF_BUF                 0x00086020 /* Reset: CORER */
 #define I40E_PRT_PPRS_PERF_BUF_HI_TRESH_SHIFT  0
 #define I40E_PRT_PPRS_PERF_BUF_HI_TRESH_MASK   I40E_MASK(0x3F, I40E_PRT_PPRS_PERF_BUF_HI_TRESH_SHIFT)
 #define I40E_PRT_PPRS_PERF_BUF_LOW_TRESH_SHIFT 16
 #define I40E_PRT_PPRS_PERF_BUF_LOW_TRESH_MASK  I40E_MASK(0x3F, I40E_PRT_PPRS_PERF_BUF_LOW_TRESH_SHIFT)
 
-#define I40E_PRT_PPRS_PKTS_CNT                  0x00087060
+#define I40E_PRT_PPRS_PKTS_CNT                  0x00087060 /* Reset: CORER */
 #define I40E_PRT_PPRS_PKTS_CNT_RPB_IF_CNT_SHIFT 0
 #define I40E_PRT_PPRS_PKTS_CNT_RPB_IF_CNT_MASK  I40E_MASK(0xFFFF, I40E_PRT_PPRS_PKTS_CNT_RPB_IF_CNT_SHIFT)
 #define I40E_PRT_PPRS_PKTS_CNT_MAC_IF_CNT_SHIFT 16
 #define I40E_PRT_PPRS_PKTS_CNT_MAC_IF_CNT_MASK  I40E_MASK(0xFFFF, I40E_PRT_PPRS_PKTS_CNT_MAC_IF_CNT_SHIFT)
 
-#define I40E_RCB_CHUNK_DATA_CFG                    0x00122644
+#define I40E_PRT_SWR_PM_THR                 0x0026CD00 /* Reset: CORER */
+#define I40E_PRT_SWR_PM_THR_THRESHOLD_SHIFT 0
+#define I40E_PRT_SWR_PM_THR_THRESHOLD_MASK  I40E_MASK(0xFF, I40E_PRT_SWR_PM_THR_THRESHOLD_SHIFT)
+
+#define I40E_RCB_CHUNK_DATA_CFG                    0x00122644 /* Reset: POR */
 #define I40E_RCB_CHUNK_DATA_CFG_ECC_EN_SHIFT       0
 #define I40E_RCB_CHUNK_DATA_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCB_CHUNK_DATA_CFG_ECC_EN_SHIFT)
 #define I40E_RCB_CHUNK_DATA_CFG_ECC_INVERT_1_SHIFT 1
@@ -4636,7 +4736,7 @@
 #define I40E_RCB_CHUNK_DATA_CFG_RM_SHIFT           16
 #define I40E_RCB_CHUNK_DATA_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCB_CHUNK_DATA_CFG_RM_SHIFT)
 
-#define I40E_RCB_CHUNK_DATA_STATUS                        0x00122648
+#define I40E_RCB_CHUNK_DATA_STATUS                        0x00122648 /* Reset: POR */
 #define I40E_RCB_CHUNK_DATA_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCB_CHUNK_DATA_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCB_CHUNK_DATA_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCB_CHUNK_DATA_STATUS_ECC_FIX_SHIFT          1
@@ -4646,15 +4746,15 @@
 #define I40E_RCB_CHUNK_DATA_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCB_CHUNK_DATA_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCB_CHUNK_DATA_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCB_ECC_COR_ERR           0x00122668
+#define I40E_RCB_ECC_COR_ERR           0x00122668 /* Reset: POR */
 #define I40E_RCB_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_RCB_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_RCB_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_RCB_ECC_UNCOR_ERR           0x00122664
+#define I40E_RCB_ECC_UNCOR_ERR           0x00122664 /* Reset: POR */
 #define I40E_RCB_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_RCB_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_RCB_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_RCB_HEAD_CACHE_CFG                    0x0012264C
+#define I40E_RCB_HEAD_CACHE_CFG                    0x0012264C /* Reset: POR */
 #define I40E_RCB_HEAD_CACHE_CFG_ECC_EN_SHIFT       0
 #define I40E_RCB_HEAD_CACHE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCB_HEAD_CACHE_CFG_ECC_EN_SHIFT)
 #define I40E_RCB_HEAD_CACHE_CFG_ECC_INVERT_1_SHIFT 1
@@ -4676,7 +4776,7 @@
 #define I40E_RCB_HEAD_CACHE_CFG_RM_SHIFT           16
 #define I40E_RCB_HEAD_CACHE_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCB_HEAD_CACHE_CFG_RM_SHIFT)
 
-#define I40E_RCB_HEAD_CACHE_STATUS                        0x00122650
+#define I40E_RCB_HEAD_CACHE_STATUS                        0x00122650 /* Reset: POR */
 #define I40E_RCB_HEAD_CACHE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCB_HEAD_CACHE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCB_HEAD_CACHE_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCB_HEAD_CACHE_STATUS_ECC_FIX_SHIFT          1
@@ -4686,7 +4786,7 @@
 #define I40E_RCB_HEAD_CACHE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCB_HEAD_CACHE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCB_HEAD_CACHE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCB_INPUT_FIFO_CFG                    0x0012265C
+#define I40E_RCB_INPUT_FIFO_CFG                    0x0012265C /* Reset: POR */
 #define I40E_RCB_INPUT_FIFO_CFG_ECC_EN_SHIFT       0
 #define I40E_RCB_INPUT_FIFO_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCB_INPUT_FIFO_CFG_ECC_EN_SHIFT)
 #define I40E_RCB_INPUT_FIFO_CFG_ECC_INVERT_1_SHIFT 1
@@ -4708,7 +4808,7 @@
 #define I40E_RCB_INPUT_FIFO_CFG_RM_SHIFT           16
 #define I40E_RCB_INPUT_FIFO_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCB_INPUT_FIFO_CFG_RM_SHIFT)
 
-#define I40E_RCB_INPUT_FIFO_STATUS                        0x00122660
+#define I40E_RCB_INPUT_FIFO_STATUS                        0x00122660 /* Reset: POR */
 #define I40E_RCB_INPUT_FIFO_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCB_INPUT_FIFO_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCB_INPUT_FIFO_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCB_INPUT_FIFO_STATUS_ECC_FIX_SHIFT          1
@@ -4718,7 +4818,7 @@
 #define I40E_RCB_INPUT_FIFO_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCB_INPUT_FIFO_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCB_INPUT_FIFO_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCB_LL_CFG                    0x00122654
+#define I40E_RCB_LL_CFG                    0x00122654 /* Reset: POR */
 #define I40E_RCB_LL_CFG_ECC_EN_SHIFT       0
 #define I40E_RCB_LL_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCB_LL_CFG_ECC_EN_SHIFT)
 #define I40E_RCB_LL_CFG_ECC_INVERT_1_SHIFT 1
@@ -4740,7 +4840,7 @@
 #define I40E_RCB_LL_CFG_RM_SHIFT           16
 #define I40E_RCB_LL_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCB_LL_CFG_RM_SHIFT)
 
-#define I40E_RCB_LL_STATUS                        0x00122658
+#define I40E_RCB_LL_STATUS                        0x00122658 /* Reset: POR */
 #define I40E_RCB_LL_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCB_LL_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCB_LL_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCB_LL_STATUS_ECC_FIX_SHIFT          1
@@ -4750,7 +4850,7 @@
 #define I40E_RCB_LL_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCB_LL_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCB_LL_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_DP_MTG_MFIFO_CFG                    0x00269B34
+#define I40E_RCU_DP_MTG_MFIFO_CFG                    0x00269B34 /* Reset: POR */
 #define I40E_RCU_DP_MTG_MFIFO_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_DP_MTG_MFIFO_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_DP_MTG_MFIFO_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_DP_MTG_MFIFO_CFG_ECC_INVERT_1_SHIFT 1
@@ -4772,7 +4872,7 @@
 #define I40E_RCU_DP_MTG_MFIFO_CFG_RM_SHIFT           16
 #define I40E_RCU_DP_MTG_MFIFO_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_DP_MTG_MFIFO_CFG_RM_SHIFT)
 
-#define I40E_RCU_DP_MTG_MFIFO_STATUS                        0x00269B3C
+#define I40E_RCU_DP_MTG_MFIFO_STATUS                        0x00269B3C /* Reset: POR */
 #define I40E_RCU_DP_MTG_MFIFO_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_DP_MTG_MFIFO_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_DP_MTG_MFIFO_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_DP_MTG_MFIFO_STATUS_ECC_FIX_SHIFT          1
@@ -4782,7 +4882,7 @@
 #define I40E_RCU_DP_MTG_MFIFO_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_DP_MTG_MFIFO_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_DP_MTG_MFIFO_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_DP_SWR_REP_MFIFO_CFG                    0x00269B44
+#define I40E_RCU_DP_SWR_REP_MFIFO_CFG                    0x00269B44 /* Reset: POR */
 #define I40E_RCU_DP_SWR_REP_MFIFO_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_DP_SWR_REP_MFIFO_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_DP_SWR_REP_MFIFO_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_DP_SWR_REP_MFIFO_CFG_ECC_INVERT_1_SHIFT 1
@@ -4804,7 +4904,7 @@
 #define I40E_RCU_DP_SWR_REP_MFIFO_CFG_RM_SHIFT           16
 #define I40E_RCU_DP_SWR_REP_MFIFO_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_DP_SWR_REP_MFIFO_CFG_RM_SHIFT)
 
-#define I40E_RCU_DP_SWR_REP_MFIFO_STATUS                        0x00269B4C
+#define I40E_RCU_DP_SWR_REP_MFIFO_STATUS                        0x00269B4C /* Reset: POR */
 #define I40E_RCU_DP_SWR_REP_MFIFO_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_DP_SWR_REP_MFIFO_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_DP_SWR_REP_MFIFO_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_DP_SWR_REP_MFIFO_STATUS_ECC_FIX_SHIFT          1
@@ -4814,7 +4914,7 @@
 #define I40E_RCU_DP_SWR_REP_MFIFO_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_DP_SWR_REP_MFIFO_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_DP_SWR_REP_MFIFO_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_DP_SWR_UP_STATUS_CFG                    0x00269AFC
+#define I40E_RCU_DP_SWR_UP_STATUS_CFG                    0x00269AFC /* Reset: POR */
 #define I40E_RCU_DP_SWR_UP_STATUS_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_DP_SWR_UP_STATUS_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_DP_SWR_UP_STATUS_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_DP_SWR_UP_STATUS_CFG_ECC_INVERT_1_SHIFT 1
@@ -4836,7 +4936,7 @@
 #define I40E_RCU_DP_SWR_UP_STATUS_CFG_RM_SHIFT           16
 #define I40E_RCU_DP_SWR_UP_STATUS_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_DP_SWR_UP_STATUS_CFG_RM_SHIFT)
 
-#define I40E_RCU_DP_SWR_UP_STATUS_STATUS                        0x00269B0C
+#define I40E_RCU_DP_SWR_UP_STATUS_STATUS                        0x00269B0C /* Reset: POR */
 #define I40E_RCU_DP_SWR_UP_STATUS_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_DP_SWR_UP_STATUS_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_DP_SWR_UP_STATUS_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_DP_SWR_UP_STATUS_STATUS_ECC_FIX_SHIFT          1
@@ -4846,7 +4946,7 @@
 #define I40E_RCU_DP_SWR_UP_STATUS_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_DP_SWR_UP_STATUS_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_DP_SWR_UP_STATUS_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_DP_TFIFO_CFG                    0x0026CBD4
+#define I40E_RCU_DP_TFIFO_CFG                    0x0026CBD4 /* Reset: POR */
 #define I40E_RCU_DP_TFIFO_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_DP_TFIFO_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_DP_TFIFO_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_DP_TFIFO_CFG_ECC_INVERT_1_SHIFT 1
@@ -4868,7 +4968,7 @@
 #define I40E_RCU_DP_TFIFO_CFG_RM_SHIFT           16
 #define I40E_RCU_DP_TFIFO_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_DP_TFIFO_CFG_RM_SHIFT)
 
-#define I40E_RCU_DP_TFIFO_STATUS                        0x0026CBE4
+#define I40E_RCU_DP_TFIFO_STATUS                        0x0026CBE4 /* Reset: POR */
 #define I40E_RCU_DP_TFIFO_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_DP_TFIFO_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_DP_TFIFO_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_DP_TFIFO_STATUS_ECC_FIX_SHIFT          1
@@ -4878,7 +4978,7 @@
 #define I40E_RCU_DP_TFIFO_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_DP_TFIFO_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_DP_TFIFO_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_FCOE_PCTYPE_OVR_CTL                                     0x0026CC28
+#define I40E_RCU_FCOE_PCTYPE_OVR_CTL                                     0x0026CC28 /* Reset: CORER */
 #define I40E_RCU_FCOE_PCTYPE_OVR_CTL_OVERRIDE_METHOD_SHIFT               0
 #define I40E_RCU_FCOE_PCTYPE_OVR_CTL_OVERRIDE_METHOD_MASK                I40E_MASK(0xF, I40E_RCU_FCOE_PCTYPE_OVR_CTL_OVERRIDE_METHOD_SHIFT)
 #define I40E_RCU_FCOE_PCTYPE_OVR_CTL_ACTIVE_EXCHANGE_CONTEXT_IDX_SHIFT   4
@@ -4892,7 +4992,7 @@
 #define I40E_RCU_FCOE_PCTYPE_OVR_CTL_MANUAL_IDX_SHIFT                    20
 #define I40E_RCU_FCOE_PCTYPE_OVR_CTL_MANUAL_IDX_MASK                     I40E_MASK(0x7, I40E_RCU_FCOE_PCTYPE_OVR_CTL_MANUAL_IDX_SHIFT)
 
-#define I40E_RCU_FD_CNT_CFG                    0x0026CB04
+#define I40E_RCU_FD_CNT_CFG                    0x0026CB04 /* Reset: POR */
 #define I40E_RCU_FD_CNT_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_FD_CNT_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_FD_CNT_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_FD_CNT_CFG_ECC_INVERT_1_SHIFT 1
@@ -4914,7 +5014,7 @@
 #define I40E_RCU_FD_CNT_CFG_RM_SHIFT           16
 #define I40E_RCU_FD_CNT_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_FD_CNT_CFG_RM_SHIFT)
 
-#define I40E_RCU_FD_CNT_STATUS                        0x0026CB0C
+#define I40E_RCU_FD_CNT_STATUS                        0x0026CB0C /* Reset: POR */
 #define I40E_RCU_FD_CNT_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_FD_CNT_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_FD_CNT_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_FD_CNT_STATUS_ECC_FIX_SHIFT          1
@@ -4924,7 +5024,7 @@
 #define I40E_RCU_FD_CNT_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_FD_CNT_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_FD_CNT_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_FD_FLU_LUT_CFG                    0x0026CB14
+#define I40E_RCU_FD_FLU_LUT_CFG                    0x0026CB14 /* Reset: POR */
 #define I40E_RCU_FD_FLU_LUT_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_FD_FLU_LUT_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_FD_FLU_LUT_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_FD_FLU_LUT_CFG_ECC_INVERT_1_SHIFT 1
@@ -4946,7 +5046,7 @@
 #define I40E_RCU_FD_FLU_LUT_CFG_RM_SHIFT           16
 #define I40E_RCU_FD_FLU_LUT_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_FD_FLU_LUT_CFG_RM_SHIFT)
 
-#define I40E_RCU_FD_FLU_LUT_STATUS                        0x0026CB1C
+#define I40E_RCU_FD_FLU_LUT_STATUS                        0x0026CB1C /* Reset: POR */
 #define I40E_RCU_FD_FLU_LUT_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_FD_FLU_LUT_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_FD_FLU_LUT_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_FD_FLU_LUT_STATUS_ECC_FIX_SHIFT          1
@@ -4956,7 +5056,7 @@
 #define I40E_RCU_FD_FLU_LUT_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_FD_FLU_LUT_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_FD_FLU_LUT_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_FOC_TAILS_CFG                    0x00269ADC
+#define I40E_RCU_FOC_TAILS_CFG                    0x00269ADC /* Reset: POR */
 #define I40E_RCU_FOC_TAILS_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_FOC_TAILS_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_FOC_TAILS_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_FOC_TAILS_CFG_ECC_INVERT_1_SHIFT 1
@@ -4978,7 +5078,7 @@
 #define I40E_RCU_FOC_TAILS_CFG_RM_SHIFT           16
 #define I40E_RCU_FOC_TAILS_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_FOC_TAILS_CFG_RM_SHIFT)
 
-#define I40E_RCU_FOC_TAILS_STATUS                        0x00269B2C
+#define I40E_RCU_FOC_TAILS_STATUS                        0x00269B2C /* Reset: POR */
 #define I40E_RCU_FOC_TAILS_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_FOC_TAILS_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_FOC_TAILS_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_FOC_TAILS_STATUS_ECC_FIX_SHIFT          1
@@ -4988,15 +5088,264 @@
 #define I40E_RCU_FOC_TAILS_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_FOC_TAILS_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_FOC_TAILS_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_PST_ECC_COR_ERR           0x0026CBC4
+#define I40E_RCU_PST_DBG_CTL                           0x0026CC24 /* Reset: CORER */
+#define I40E_RCU_PST_DBG_CTL_IGNORE_FLR_SHIFT          0
+#define I40E_RCU_PST_DBG_CTL_IGNORE_FLR_MASK           I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_IGNORE_FLR_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_IGNORE_VFLR_SHIFT         1
+#define I40E_RCU_PST_DBG_CTL_IGNORE_VFLR_MASK          I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_IGNORE_VFLR_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_IGNORE_VMLR_SHIFT         2
+#define I40E_RCU_PST_DBG_CTL_IGNORE_VMLR_MASK          I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_IGNORE_VMLR_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_USE_PCTYPE_FCOE_SHIFT     3
+#define I40E_RCU_PST_DBG_CTL_USE_PCTYPE_FCOE_MASK      I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_USE_PCTYPE_FCOE_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_IGNORE_ETH_HIT_SHIFT      4
+#define I40E_RCU_PST_DBG_CTL_IGNORE_ETH_HIT_MASK       I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_IGNORE_ETH_HIT_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_IGNORE_MAC_VLAN_HIT_SHIFT 5
+#define I40E_RCU_PST_DBG_CTL_IGNORE_MAC_VLAN_HIT_MASK  I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_IGNORE_MAC_VLAN_HIT_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_IGNORE_SWR_DROP_SHIFT     6
+#define I40E_RCU_PST_DBG_CTL_IGNORE_SWR_DROP_MASK      I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_IGNORE_SWR_DROP_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_HOLD_FLU_JOBS_SHIFT       7
+#define I40E_RCU_PST_DBG_CTL_HOLD_FLU_JOBS_MASK        I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_HOLD_FLU_JOBS_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_FC_HASH_BASE_SHIFT        8
+#define I40E_RCU_PST_DBG_CTL_FC_HASH_BASE_MASK         I40E_MASK(0xF, I40E_RCU_PST_DBG_CTL_FC_HASH_BASE_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_PE_HASH_BASE_SHIFT        12
+#define I40E_RCU_PST_DBG_CTL_PE_HASH_BASE_MASK         I40E_MASK(0xF, I40E_RCU_PST_DBG_CTL_PE_HASH_BASE_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_FD_HASH_BASE_SHIFT        16
+#define I40E_RCU_PST_DBG_CTL_FD_HASH_BASE_MASK         I40E_MASK(0xF, I40E_RCU_PST_DBG_CTL_FD_HASH_BASE_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_FOC_CNTX_LIMIT_BASE_SHIFT 20
+#define I40E_RCU_PST_DBG_CTL_FOC_CNTX_LIMIT_BASE_MASK  I40E_MASK(0xF, I40E_RCU_PST_DBG_CTL_FOC_CNTX_LIMIT_BASE_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_ERR_COMP_DIS_SHIFT        24
+#define I40E_RCU_PST_DBG_CTL_ERR_COMP_DIS_MASK         I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_ERR_COMP_DIS_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_REM_COMP_DIS_SHIFT        25
+#define I40E_RCU_PST_DBG_CTL_REM_COMP_DIS_MASK         I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_REM_COMP_DIS_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_HOLD_PST_INPUT_SHIFT      28
+#define I40E_RCU_PST_DBG_CTL_HOLD_PST_INPUT_MASK       I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_HOLD_PST_INPUT_SHIFT)
+#define I40E_RCU_PST_DBG_CTL_INC_INPUT_CMD_SHIFT       29
+#define I40E_RCU_PST_DBG_CTL_INC_INPUT_CMD_MASK        I40E_MASK(0x1, I40E_RCU_PST_DBG_CTL_INC_INPUT_CMD_SHIFT)
+
+#define I40E_RCU_PST_DBG_DROP_CNT                         0x0026CBEC /* Reset: CORER */
+#define I40E_RCU_PST_DBG_DROP_CNT_FD_DROP_CNT_SHIFT       0
+#define I40E_RCU_PST_DBG_DROP_CNT_FD_DROP_CNT_MASK        I40E_MASK(0xFF, I40E_RCU_PST_DBG_DROP_CNT_FD_DROP_CNT_SHIFT)
+#define I40E_RCU_PST_DBG_DROP_CNT_FLR_DROP_CNT_SHIFT      8
+#define I40E_RCU_PST_DBG_DROP_CNT_FLR_DROP_CNT_MASK       I40E_MASK(0xFF, I40E_RCU_PST_DBG_DROP_CNT_FLR_DROP_CNT_SHIFT)
+#define I40E_RCU_PST_DBG_DROP_CNT_PF_BOUND_DROP_CNT_SHIFT 16
+#define I40E_RCU_PST_DBG_DROP_CNT_PF_BOUND_DROP_CNT_MASK  I40E_MASK(0xFF, I40E_RCU_PST_DBG_DROP_CNT_PF_BOUND_DROP_CNT_SHIFT)
+#define I40E_RCU_PST_DBG_DROP_CNT_SWR_DROP_CNT_SHIFT      24
+#define I40E_RCU_PST_DBG_DROP_CNT_SWR_DROP_CNT_MASK       I40E_MASK(0xFF, I40E_RCU_PST_DBG_DROP_CNT_SWR_DROP_CNT_SHIFT)
+
+#define I40E_RCU_PST_DBG_FLU_STATE(_i)             (0x0026CB80 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
+#define I40E_RCU_PST_DBG_FLU_STATE_MAX_INDEX       15
+#define I40E_RCU_PST_DBG_FLU_STATE_FLU_STATE_SHIFT 0
+#define I40E_RCU_PST_DBG_FLU_STATE_FLU_STATE_MASK  I40E_MASK(0x1F, I40E_RCU_PST_DBG_FLU_STATE_FLU_STATE_SHIFT)
+#define I40E_RCU_PST_DBG_FLU_STATE_FLU_HASH_SHIFT  5
+#define I40E_RCU_PST_DBG_FLU_STATE_FLU_HASH_MASK   I40E_MASK(0xFFFFF, I40E_RCU_PST_DBG_FLU_STATE_FLU_HASH_SHIFT)
+#define I40E_RCU_PST_DBG_FLU_STATE_FLU_OBJ_SHIFT   25
+#define I40E_RCU_PST_DBG_FLU_STATE_FLU_OBJ_MASK    I40E_MASK(0x7, I40E_RCU_PST_DBG_FLU_STATE_FLU_OBJ_SHIFT)
+#define I40E_RCU_PST_DBG_FLU_STATE_FLU_CMD_SHIFT   28
+#define I40E_RCU_PST_DBG_FLU_STATE_FLU_CMD_MASK    I40E_MASK(0xF, I40E_RCU_PST_DBG_FLU_STATE_FLU_CMD_SHIFT)
+
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_0                     0x0026CC14 /* Reset: CORER */
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_CONF_FAIL_CNT_SHIFT 0
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_CONF_FAIL_CNT_MASK  I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_0_CONF_FAIL_CNT_SHIFT)
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_QUAD_HIT_CNT_SHIFT  8
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_QUAD_HIT_CNT_MASK   I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_0_QUAD_HIT_CNT_SHIFT)
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_ETH_HIT_CNT_SHIFT   16
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_ETH_HIT_CNT_MASK    I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_0_ETH_HIT_CNT_SHIFT)
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_FCOE_CNT_SHIFT      24
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_0_FCOE_CNT_MASK       I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_0_FCOE_CNT_SHIFT)
+
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_1                    0x0026CC1C /* Reset: CORER */
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_FD_HIT_CNT_SHIFT   0
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_FD_HIT_CNT_MASK    I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_1_FD_HIT_CNT_SHIFT)
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_MAC_VLAN_CNT_SHIFT 8
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_MAC_VLAN_CNT_MASK  I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_1_MAC_VLAN_CNT_SHIFT)
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_RSS_CNT_SHIFT      16
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_RSS_CNT_MASK       I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_1_RSS_CNT_SHIFT)
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_DEFAULT_CNT_SHIFT  24
+#define I40E_RCU_PST_DBG_Q_SRC_CNT_1_DEFAULT_CNT_MASK   I40E_MASK(0xFF, I40E_RCU_PST_DBG_Q_SRC_CNT_1_DEFAULT_CNT_SHIFT)
+
+#define I40E_RCU_PST_DBG_STATUS_0                      0x0026CC04 /* Reset: CORER */
+#define I40E_RCU_PST_DBG_STATUS_0_PST_FLR_STAT_SHIFT   0
+#define I40E_RCU_PST_DBG_STATUS_0_PST_FLR_STAT_MASK    I40E_MASK(0xFFFF, I40E_RCU_PST_DBG_STATUS_0_PST_FLR_STAT_SHIFT)
+#define I40E_RCU_PST_DBG_STATUS_0_INPUT_FIFO_OCC_SHIFT 16
+#define I40E_RCU_PST_DBG_STATUS_0_INPUT_FIFO_OCC_MASK  I40E_MASK(0x3, I40E_RCU_PST_DBG_STATUS_0_INPUT_FIFO_OCC_SHIFT)
+
+#define I40E_RCU_PST_DBG_STATUS_1                      0x0026CC0C /* Reset: CORER */
+#define I40E_RCU_PST_DBG_STATUS_1_FLR_FLOW_START_SHIFT 0
+#define I40E_RCU_PST_DBG_STATUS_1_FLR_FLOW_START_MASK  I40E_MASK(0xFFFF, I40E_RCU_PST_DBG_STATUS_1_FLR_FLOW_START_SHIFT)
+#define I40E_RCU_PST_DBG_STATUS_1_FLR_FLOW_DONE_SHIFT  16
+#define I40E_RCU_PST_DBG_STATUS_1_FLR_FLOW_DONE_MASK   I40E_MASK(0xFFFF, I40E_RCU_PST_DBG_STATUS_1_FLR_FLOW_DONE_SHIFT)
+
+#define I40E_RCU_PST_ECC_COR_ERR           0x0026CBC4 /* Reset: POR */
 #define I40E_RCU_PST_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_RCU_PST_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_RCU_PST_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_RCU_PST_ECC_UNCOR_ERR           0x0026CBCC
+#define I40E_RCU_PST_ECC_UNCOR_ERR           0x0026CBCC /* Reset: POR */
 #define I40E_RCU_PST_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_RCU_PST_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_RCU_PST_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_RCU_PST_TFIFO_CFG                    0x00269B54
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN                          0x0026CC08 /* Reset: CORER */
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_FILTER_EN_SHIFT      0
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_FILTER_EN_MASK       I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_FILTER_EN_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_SOF2_CLASS_SHIFT     1
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_SOF2_CLASS_MASK      I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_SOF2_CLASS_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_SOF3_CLASS_SHIFT     2
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_SOF3_CLASS_MASK      I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_SOF3_CLASS_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_EOFA_EOFI_SHIFT      3
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_EOFA_EOFI_MASK       I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_EOFA_EOFI_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_FIRST_NO_SOFI_SHIFT  4
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_FIRST_NO_SOFI_MASK   I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_FIRST_NO_SOFI_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_MID_SOFI_SHIFT       5
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_MID_SOFI_MASK        I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_MID_SOFI_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_NOT_NEW_SEQ_ID_SHIFT 6
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_NOT_NEW_SEQ_ID_MASK  I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_NOT_NEW_SEQ_ID_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_NEW_SEQ_ID_SHIFT     7
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_NEW_SEQ_ID_MASK      I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_NEW_SEQ_ID_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_NEW_SEQ_CNT_SHIFT    8
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_NEW_SEQ_CNT_MASK     I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_NEW_SEQ_CNT_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_DIFF_SEQ_CNT_SHIFT   9
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_DIFF_SEQ_CNT_MASK    I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_GEN_DIFF_SEQ_CNT_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_SOF_CLASS_SHIFT      11
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_SOF_CLASS_MASK       I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_SOF_CLASS_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_INITIATOR_SHIFT      12
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_INITIATOR_MASK       I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_INITIATOR_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_LAST_PKT_SHIFT       13
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_LAST_PKT_MASK        I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_LAST_PKT_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_EOFT_SHIFT           14
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_EOFT_MASK            I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_EOFT_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_SEQ_ID_SHIFT         15
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_SEQ_ID_MASK          I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_SEQ_ID_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_EX_CNTX_SHIFT        16
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_EX_CNTX_MASK         I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_EX_CNTX_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_SEQ_CNTX_SHIFT       17
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_SEQ_CNTX_MASK        I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_SEQ_CNTX_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_SEQ_INITIATIVE_SHIFT 18
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_SEQ_INITIATIVE_MASK  I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_SEQ_INITIATIVE_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_RLT_OFFSET_SHIFT     19
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_RLT_OFFSET_MASK      I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_RLT_OFFSET_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_FIRST_SEQ_SHIFT      20
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_FIRST_SEQ_MASK       I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_FIRST_SEQ_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_ABORT_SEQ_SHIFT      21
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_ABORT_SEQ_MASK       I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_ABORT_SEQ_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_LAST_SEQ_SHIFT       22
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_LAST_SEQ_MASK        I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_RSP_LAST_SEQ_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_NEW_SEQ_ID_SHIFT    23
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_NEW_SEQ_ID_MASK     I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_NEW_SEQ_ID_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_DIFF_SEQ_ID_SHIFT   24
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_DIFF_SEQ_ID_MASK    I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_DIFF_SEQ_ID_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_EOFT_SHIFT          25
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_EOFT_MASK           I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_EOFT_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_EOFN_SHIFT          26
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_EOFN_MASK           I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_EOFN_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_EX_CNTX_SHIFT       27
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_EX_CNTX_MASK        I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_EX_CNTX_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_SEQ_CNTX_SHIFT      28
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_SEQ_CNTX_MASK       I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_SEQ_CNTX_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_PARAM_SHIFT         29
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_PARAM_MASK          I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_PARAM_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_FIRST_SEQ_SHIFT     30
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_FIRST_SEQ_MASK      I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_FIRST_SEQ_SHIFT)
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_ABORT_SEQ_SHIFT     31
+#define I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_ABORT_SEQ_MASK      I40E_MASK(0x1, I40E_RCU_PST_FCOE_CNTX_CHK_EN_DATA_ABORT_SEQ_SHIFT)
+
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN                          0x0026CC10 /* Reset: CORER */
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_FCOE_VER_SHIFT           0
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_FCOE_VER_MASK            I40E_MASK(0x1, I40E_RCU_PST_FCOE_PROT_CHK_EN_FCOE_VER_SHIFT)
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_SOF_VALUE_SHIFT          1
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_SOF_VALUE_MASK           I40E_MASK(0x1, I40E_RCU_PST_FCOE_PROT_CHK_EN_SOF_VALUE_SHIFT)
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_EOF_VALUE_SHIFT          2
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_EOF_VALUE_MASK           I40E_MASK(0x1, I40E_RCU_PST_FCOE_PROT_CHK_EN_EOF_VALUE_SHIFT)
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_END_SEQ_EOFT_SHIFT       3
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_END_SEQ_EOFT_MASK        I40E_MASK(0x1, I40E_RCU_PST_FCOE_PROT_CHK_EN_END_SEQ_EOFT_SHIFT)
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_NO_END_SEQ_NO_EOFT_SHIFT 4
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_NO_END_SEQ_NO_EOFT_MASK  I40E_MASK(0x1, I40E_RCU_PST_FCOE_PROT_CHK_EN_NO_END_SEQ_NO_EOFT_SHIFT)
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_OBSOLETE_FLAGS_SHIFT     5
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_OBSOLETE_FLAGS_MASK      I40E_MASK(0x1, I40E_RCU_PST_FCOE_PROT_CHK_EN_OBSOLETE_FLAGS_SHIFT)
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_NOT_FCP_SHIFT            6
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_NOT_FCP_MASK             I40E_MASK(0x1, I40E_RCU_PST_FCOE_PROT_CHK_EN_NOT_FCP_SHIFT)
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_CRC_ERROR_SHIFT          7
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_CRC_ERROR_MASK           I40E_MASK(0x1, I40E_RCU_PST_FCOE_PROT_CHK_EN_CRC_ERROR_SHIFT)
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_PKT_SIZE_SHIFT           8
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_PKT_SIZE_MASK            I40E_MASK(0x1, I40E_RCU_PST_FCOE_PROT_CHK_EN_PKT_SIZE_SHIFT)
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_SEQ_INIT_LAST_SHIFT      9
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_SEQ_INIT_LAST_MASK       I40E_MASK(0x1, I40E_RCU_PST_FCOE_PROT_CHK_EN_SEQ_INIT_LAST_SHIFT)
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_OPTIONAL_HEADERS_SHIFT   10
+#define I40E_RCU_PST_FCOE_PROT_CHK_EN_OPTIONAL_HEADERS_MASK    I40E_MASK(0x1, I40E_RCU_PST_FCOE_PROT_CHK_EN_OPTIONAL_HEADERS_SHIFT)
+
+#define I40E_RCU_PST_FOC_ACCESS_STATUS                     0x00270110 /* Reset: CORER */
+#define I40E_RCU_PST_FOC_ACCESS_STATUS_WR_ACCESS_CNT_SHIFT 0
+#define I40E_RCU_PST_FOC_ACCESS_STATUS_WR_ACCESS_CNT_MASK  I40E_MASK(0xFF, I40E_RCU_PST_FOC_ACCESS_STATUS_WR_ACCESS_CNT_SHIFT)
+#define I40E_RCU_PST_FOC_ACCESS_STATUS_RD_ACCESS_CNT_SHIFT 8
+#define I40E_RCU_PST_FOC_ACCESS_STATUS_RD_ACCESS_CNT_MASK  I40E_MASK(0xFF, I40E_RCU_PST_FOC_ACCESS_STATUS_RD_ACCESS_CNT_SHIFT)
+#define I40E_RCU_PST_FOC_ACCESS_STATUS_ERR_CNT_SHIFT       16
+#define I40E_RCU_PST_FOC_ACCESS_STATUS_ERR_CNT_MASK        I40E_MASK(0xFF, I40E_RCU_PST_FOC_ACCESS_STATUS_ERR_CNT_SHIFT)
+#define I40E_RCU_PST_FOC_ACCESS_STATUS_LAST_ERR_CODE_SHIFT 24
+#define I40E_RCU_PST_FOC_ACCESS_STATUS_LAST_ERR_CODE_MASK  I40E_MASK(0x7, I40E_RCU_PST_FOC_ACCESS_STATUS_LAST_ERR_CODE_SHIFT)
+
+#define I40E_RCU_PST_INPUT_ACL_STATUS(_i)                            (0x00270100 + ((_i) * 4)) /* _i=0...2 */ /* Reset: CORER */
+#define I40E_RCU_PST_INPUT_ACL_STATUS_MAX_INDEX                      2
+#define I40E_RCU_PST_INPUT_ACL_STATUS_RCU_PST_INPUT_ACL_STATUS_SHIFT 0
+#define I40E_RCU_PST_INPUT_ACL_STATUS_RCU_PST_INPUT_ACL_STATUS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_INPUT_ACL_STATUS_RCU_PST_INPUT_ACL_STATUS_SHIFT)
+
+#define I40E_RCU_PST_INPUT_MTG_FIELDS(_i)                            (0x00270080 + ((_i) * 4)) /* _i=0...31 */ /* Reset: CORER */
+#define I40E_RCU_PST_INPUT_MTG_FIELDS_MAX_INDEX                      31
+#define I40E_RCU_PST_INPUT_MTG_FIELDS_RCU_PST_INPUT_MTG_FIELDS_SHIFT 0
+#define I40E_RCU_PST_INPUT_MTG_FIELDS_RCU_PST_INPUT_MTG_FIELDS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_INPUT_MTG_FIELDS_RCU_PST_INPUT_MTG_FIELDS_SHIFT)
+
+#define I40E_RCU_PST_INPUT_MTG_STATUS(_i)                            (0x00270060 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
+#define I40E_RCU_PST_INPUT_MTG_STATUS_MAX_INDEX                      7
+#define I40E_RCU_PST_INPUT_MTG_STATUS_RCU_PST_INPUT_MTG_STATUS_SHIFT 0
+#define I40E_RCU_PST_INPUT_MTG_STATUS_RCU_PST_INPUT_MTG_STATUS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_INPUT_MTG_STATUS_RCU_PST_INPUT_MTG_STATUS_SHIFT)
+
+#define I40E_RCU_PST_OUTFIFO_OCC(_i)            (0x0026CFE0 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
+#define I40E_RCU_PST_OUTFIFO_OCC_MAX_INDEX      7
+#define I40E_RCU_PST_OUTFIFO_OCC_UP_1_OCC_SHIFT 0
+#define I40E_RCU_PST_OUTFIFO_OCC_UP_1_OCC_MASK  I40E_MASK(0xFF, I40E_RCU_PST_OUTFIFO_OCC_UP_1_OCC_SHIFT)
+#define I40E_RCU_PST_OUTFIFO_OCC_UP_2_OCC_SHIFT 8
+#define I40E_RCU_PST_OUTFIFO_OCC_UP_2_OCC_MASK  I40E_MASK(0xFF, I40E_RCU_PST_OUTFIFO_OCC_UP_2_OCC_SHIFT)
+#define I40E_RCU_PST_OUTFIFO_OCC_UP_3_OCC_SHIFT 16
+#define I40E_RCU_PST_OUTFIFO_OCC_UP_3_OCC_MASK  I40E_MASK(0xFF, I40E_RCU_PST_OUTFIFO_OCC_UP_3_OCC_SHIFT)
+#define I40E_RCU_PST_OUTFIFO_OCC_UP_4_OCC_SHIFT 24
+#define I40E_RCU_PST_OUTFIFO_OCC_UP_4_OCC_MASK  I40E_MASK(0xFF, I40E_RCU_PST_OUTFIFO_OCC_UP_4_OCC_SHIFT)
+
+#define I40E_RCU_PST_RCB_ACL_STATUS(_i)                          (0x00270030 + ((_i) * 4)) /* _i=0...2 */ /* Reset: CORER */
+#define I40E_RCU_PST_RCB_ACL_STATUS_MAX_INDEX                    2
+#define I40E_RCU_PST_RCB_ACL_STATUS_RCU_PST_RCB_ACL_STATUS_SHIFT 0
+#define I40E_RCU_PST_RCB_ACL_STATUS_RCU_PST_RCB_ACL_STATUS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_RCB_ACL_STATUS_RCU_PST_RCB_ACL_STATUS_SHIFT)
+
+#define I40E_RCU_PST_RCB_FIFO_FIELDS(_i)                           (0x00270000 + ((_i) * 4)) /* _i=0...5 */ /* Reset: CORER */
+#define I40E_RCU_PST_RCB_FIFO_FIELDS_MAX_INDEX                     5
+#define I40E_RCU_PST_RCB_FIFO_FIELDS_RCU_PST_RCB_FIFO_FIELDS_SHIFT 0
+#define I40E_RCU_PST_RCB_FIFO_FIELDS_RCU_PST_RCB_FIFO_FIELDS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_RCB_FIFO_FIELDS_RCU_PST_RCB_FIFO_FIELDS_SHIFT)
+
+#define I40E_RCU_PST_RCB_FIFO_Q_STATUS(_i)                             (0x00270020 + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
+#define I40E_RCU_PST_RCB_FIFO_Q_STATUS_MAX_INDEX                       3
+#define I40E_RCU_PST_RCB_FIFO_Q_STATUS_RCU_PST_RCB_FIFO_Q_STATUS_SHIFT 0
+#define I40E_RCU_PST_RCB_FIFO_Q_STATUS_RCU_PST_RCB_FIFO_Q_STATUS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_RCB_FIFO_Q_STATUS_RCU_PST_RCB_FIFO_Q_STATUS_SHIFT)
+
+#define I40E_RCU_PST_RCB_MTG_STATUS(_i)                          (0x00270040 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
+#define I40E_RCU_PST_RCB_MTG_STATUS_MAX_INDEX                    7
+#define I40E_RCU_PST_RCB_MTG_STATUS_RCU_PST_RCB_MTG_STATUS_SHIFT 0
+#define I40E_RCU_PST_RCB_MTG_STATUS_RCU_PST_RCB_MTG_STATUS_MASK  I40E_MASK(0xFFFFFFFF, I40E_RCU_PST_RCB_MTG_STATUS_RCU_PST_RCB_MTG_STATUS_SHIFT)
+
+#define I40E_RCU_PST_RCB_OUT_CTL                     0x0026CDA8 /* Reset: CORER */
+#define I40E_RCU_PST_RCB_OUT_CTL_BLOCK_RCB_OUT_SHIFT 0
+#define I40E_RCU_PST_RCB_OUT_CTL_BLOCK_RCB_OUT_MASK  I40E_MASK(0x1, I40E_RCU_PST_RCB_OUT_CTL_BLOCK_RCB_OUT_SHIFT)
+#define I40E_RCU_PST_RCB_OUT_CTL_STEP_ONE_CMD_SHIFT  1
+#define I40E_RCU_PST_RCB_OUT_CTL_STEP_ONE_CMD_MASK   I40E_MASK(0x1, I40E_RCU_PST_RCB_OUT_CTL_STEP_ONE_CMD_SHIFT)
+
+#define I40E_RCU_PST_RCB_OUT_STAT                    0x0026CC18 /* Reset: CORER */
+#define I40E_RCU_PST_RCB_OUT_STAT_RCB_FIFO_OCC_SHIFT 0
+#define I40E_RCU_PST_RCB_OUT_STAT_RCB_FIFO_OCC_MASK  I40E_MASK(0xF, I40E_RCU_PST_RCB_OUT_STAT_RCB_FIFO_OCC_SHIFT)
+#define I40E_RCU_PST_RCB_OUT_STAT_NEXT_IPLEN_SHIFT   8
+#define I40E_RCU_PST_RCB_OUT_STAT_NEXT_IPLEN_MASK    I40E_MASK(0xFFFF, I40E_RCU_PST_RCB_OUT_STAT_NEXT_IPLEN_SHIFT)
+#define I40E_RCU_PST_RCB_OUT_STAT_NEXT_TYPE_SHIFT    24
+#define I40E_RCU_PST_RCB_OUT_STAT_NEXT_TYPE_MASK     I40E_MASK(0x7, I40E_RCU_PST_RCB_OUT_STAT_NEXT_TYPE_SHIFT)
+#define I40E_RCU_PST_RCB_OUT_STAT_NEXT_CFG_ERR_SHIFT 28
+#define I40E_RCU_PST_RCB_OUT_STAT_NEXT_CFG_ERR_MASK  I40E_MASK(0x1, I40E_RCU_PST_RCB_OUT_STAT_NEXT_CFG_ERR_SHIFT)
+#define I40E_RCU_PST_RCB_OUT_STAT_RSV3_SHIFT         29
+#define I40E_RCU_PST_RCB_OUT_STAT_RSV3_MASK          I40E_MASK(0x7, I40E_RCU_PST_RCB_OUT_STAT_RSV3_SHIFT)
+
+#define I40E_RCU_PST_TFIFO_CFG                    0x00269B54 /* Reset: POR */
 #define I40E_RCU_PST_TFIFO_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_PST_TFIFO_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_PST_TFIFO_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_PST_TFIFO_CFG_ECC_INVERT_1_SHIFT 1
@@ -5018,7 +5367,7 @@
 #define I40E_RCU_PST_TFIFO_CFG_RM_SHIFT           16
 #define I40E_RCU_PST_TFIFO_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_PST_TFIFO_CFG_RM_SHIFT)
 
-#define I40E_RCU_PST_TFIFO_STATUS                        0x00269B5C
+#define I40E_RCU_PST_TFIFO_STATUS                        0x00269B5C /* Reset: POR */
 #define I40E_RCU_PST_TFIFO_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_PST_TFIFO_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_PST_TFIFO_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_PST_TFIFO_STATUS_ECC_FIX_SHIFT          1
@@ -5028,7 +5377,7 @@
 #define I40E_RCU_PST_TFIFO_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_PST_TFIFO_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_PST_TFIFO_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_SP_BIG_FLU_CFG                    0x0026CDA4
+#define I40E_RCU_SP_BIG_FLU_CFG                    0x0026CDA4 /* Reset: POR */
 #define I40E_RCU_SP_BIG_FLU_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_SP_BIG_FLU_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_SP_BIG_FLU_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_SP_BIG_FLU_CFG_ECC_INVERT_1_SHIFT 1
@@ -5050,7 +5399,7 @@
 #define I40E_RCU_SP_BIG_FLU_CFG_RM_SHIFT           16
 #define I40E_RCU_SP_BIG_FLU_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_SP_BIG_FLU_CFG_RM_SHIFT)
 
-#define I40E_RCU_SP_BIG_FLU_STATUS                        0x0026CDAC
+#define I40E_RCU_SP_BIG_FLU_STATUS                        0x0026CDAC /* Reset: POR */
 #define I40E_RCU_SP_BIG_FLU_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_SP_BIG_FLU_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_SP_BIG_FLU_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_SP_BIG_FLU_STATUS_ECC_FIX_SHIFT          1
@@ -5060,7 +5409,7 @@
 #define I40E_RCU_SP_BIG_FLU_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_SP_BIG_FLU_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_SP_BIG_FLU_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_SP_MTG_VSI_CNTXT_CFG                    0x002698B4
+#define I40E_RCU_SP_MTG_VSI_CNTXT_CFG                    0x002698B4 /* Reset: POR */
 #define I40E_RCU_SP_MTG_VSI_CNTXT_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_SP_MTG_VSI_CNTXT_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_SP_MTG_VSI_CNTXT_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_SP_MTG_VSI_CNTXT_CFG_ECC_INVERT_1_SHIFT 1
@@ -5082,7 +5431,7 @@
 #define I40E_RCU_SP_MTG_VSI_CNTXT_CFG_RM_SHIFT           16
 #define I40E_RCU_SP_MTG_VSI_CNTXT_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_SP_MTG_VSI_CNTXT_CFG_RM_SHIFT)
 
-#define I40E_RCU_SP_MTG_VSI_CNTXT_STATUS                        0x002698BC
+#define I40E_RCU_SP_MTG_VSI_CNTXT_STATUS                        0x002698BC /* Reset: POR */
 #define I40E_RCU_SP_MTG_VSI_CNTXT_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_SP_MTG_VSI_CNTXT_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_SP_MTG_VSI_CNTXT_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_SP_MTG_VSI_CNTXT_STATUS_ECC_FIX_SHIFT          1
@@ -5092,7 +5441,7 @@
 #define I40E_RCU_SP_MTG_VSI_CNTXT_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_SP_MTG_VSI_CNTXT_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_SP_MTG_VSI_CNTXT_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_SP_PST_CONFIG_CFG                    0x00269AD4
+#define I40E_RCU_SP_PST_CONFIG_CFG                    0x00269AD4 /* Reset: POR */
 #define I40E_RCU_SP_PST_CONFIG_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_SP_PST_CONFIG_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_SP_PST_CONFIG_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_SP_PST_CONFIG_CFG_ECC_INVERT_1_SHIFT 1
@@ -5114,7 +5463,7 @@
 #define I40E_RCU_SP_PST_CONFIG_CFG_RM_SHIFT           16
 #define I40E_RCU_SP_PST_CONFIG_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_SP_PST_CONFIG_CFG_RM_SHIFT)
 
-#define I40E_RCU_SP_PST_CONFIG_STATUS                        0x00269B04
+#define I40E_RCU_SP_PST_CONFIG_STATUS                        0x00269B04 /* Reset: POR */
 #define I40E_RCU_SP_PST_CONFIG_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_SP_PST_CONFIG_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_SP_PST_CONFIG_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_SP_PST_CONFIG_STATUS_ECC_FIX_SHIFT          1
@@ -5124,7 +5473,7 @@
 #define I40E_RCU_SP_PST_CONFIG_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_SP_PST_CONFIG_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_SP_PST_CONFIG_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_SP_PST_RSC_HASH_CFG                    0x00269AEC
+#define I40E_RCU_SP_PST_RSC_HASH_CFG                    0x00269AEC /* Reset: POR */
 #define I40E_RCU_SP_PST_RSC_HASH_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_SP_PST_RSC_HASH_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_SP_PST_RSC_HASH_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_SP_PST_RSC_HASH_CFG_ECC_INVERT_1_SHIFT 1
@@ -5146,7 +5495,7 @@
 #define I40E_RCU_SP_PST_RSC_HASH_CFG_RM_SHIFT           16
 #define I40E_RCU_SP_PST_RSC_HASH_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_SP_PST_RSC_HASH_CFG_RM_SHIFT)
 
-#define I40E_RCU_SP_PST_RSC_HASH_STATUS                        0x00269B14
+#define I40E_RCU_SP_PST_RSC_HASH_STATUS                        0x00269B14 /* Reset: POR */
 #define I40E_RCU_SP_PST_RSC_HASH_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_SP_PST_RSC_HASH_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_SP_PST_RSC_HASH_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_SP_PST_RSC_HASH_STATUS_ECC_FIX_SHIFT          1
@@ -5156,7 +5505,7 @@
 #define I40E_RCU_SP_PST_RSC_HASH_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_SP_PST_RSC_HASH_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_SP_PST_RSC_HASH_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_SP_SWR_VSI_CNTXT_CFG                    0x002698C4
+#define I40E_RCU_SP_SWR_VSI_CNTXT_CFG                    0x002698C4 /* Reset: POR */
 #define I40E_RCU_SP_SWR_VSI_CNTXT_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_SP_SWR_VSI_CNTXT_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_SP_SWR_VSI_CNTXT_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_SP_SWR_VSI_CNTXT_CFG_ECC_INVERT_1_SHIFT 1
@@ -5178,7 +5527,7 @@
 #define I40E_RCU_SP_SWR_VSI_CNTXT_CFG_RM_SHIFT           16
 #define I40E_RCU_SP_SWR_VSI_CNTXT_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_SP_SWR_VSI_CNTXT_CFG_RM_SHIFT)
 
-#define I40E_RCU_SP_SWR_VSI_CNTXT_STATUS                        0x002698CC
+#define I40E_RCU_SP_SWR_VSI_CNTXT_STATUS                        0x002698CC /* Reset: POR */
 #define I40E_RCU_SP_SWR_VSI_CNTXT_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_SP_SWR_VSI_CNTXT_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_SP_SWR_VSI_CNTXT_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_SP_SWR_VSI_CNTXT_STATUS_ECC_FIX_SHIFT          1
@@ -5188,7 +5537,7 @@
 #define I40E_RCU_SP_SWR_VSI_CNTXT_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_SP_SWR_VSI_CNTXT_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_SP_SWR_VSI_CNTXT_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_SP16KB_CFG                    0x002698D4
+#define I40E_RCU_SP16KB_CFG                    0x002698D4 /* Reset: POR */
 #define I40E_RCU_SP16KB_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_SP16KB_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_SP16KB_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_SP16KB_CFG_ECC_INVERT_1_SHIFT 1
@@ -5210,7 +5559,7 @@
 #define I40E_RCU_SP16KB_CFG_RM_SHIFT           16
 #define I40E_RCU_SP16KB_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_SP16KB_CFG_RM_SHIFT)
 
-#define I40E_RCU_SP16KB_REP_CFG                    0x00269AF4
+#define I40E_RCU_SP16KB_REP_CFG                    0x00269AF4 /* Reset: POR */
 #define I40E_RCU_SP16KB_REP_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_SP16KB_REP_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_SP16KB_REP_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_SP16KB_REP_CFG_ECC_INVERT_1_SHIFT 1
@@ -5232,7 +5581,7 @@
 #define I40E_RCU_SP16KB_REP_CFG_RM_SHIFT           16
 #define I40E_RCU_SP16KB_REP_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_SP16KB_REP_CFG_RM_SHIFT)
 
-#define I40E_RCU_SP16KB_REP_STATUS                        0x00269B24
+#define I40E_RCU_SP16KB_REP_STATUS                        0x00269B24 /* Reset: POR */
 #define I40E_RCU_SP16KB_REP_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_SP16KB_REP_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_SP16KB_REP_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_SP16KB_REP_STATUS_ECC_FIX_SHIFT          1
@@ -5242,7 +5591,7 @@
 #define I40E_RCU_SP16KB_REP_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_SP16KB_REP_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_SP16KB_REP_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_SP16KB_STATUS                        0x002698DC
+#define I40E_RCU_SP16KB_STATUS                        0x002698DC /* Reset: POR */
 #define I40E_RCU_SP16KB_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_SP16KB_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_SP16KB_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_SP16KB_STATUS_ECC_FIX_SHIFT          1
@@ -5252,7 +5601,7 @@
 #define I40E_RCU_SP16KB_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_SP16KB_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_SP16KB_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_SP1KB_CFG                    0x002698E4
+#define I40E_RCU_SP1KB_CFG                    0x002698E4 /* Reset: POR */
 #define I40E_RCU_SP1KB_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_SP1KB_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_SP1KB_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_SP1KB_CFG_ECC_INVERT_1_SHIFT 1
@@ -5274,7 +5623,7 @@
 #define I40E_RCU_SP1KB_CFG_RM_SHIFT           16
 #define I40E_RCU_SP1KB_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_SP1KB_CFG_RM_SHIFT)
 
-#define I40E_RCU_SP1KB_STATUS                        0x002698EC
+#define I40E_RCU_SP1KB_STATUS                        0x002698EC /* Reset: POR */
 #define I40E_RCU_SP1KB_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_SP1KB_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_SP1KB_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_SP1KB_STATUS_ECC_FIX_SHIFT          1
@@ -5284,7 +5633,7 @@
 #define I40E_RCU_SP1KB_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_SP1KB_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_SP1KB_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_SP256B_CFG                    0x002698F4
+#define I40E_RCU_SP256B_CFG                    0x002698F4 /* Reset: POR */
 #define I40E_RCU_SP256B_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_SP256B_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_SP256B_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_SP256B_CFG_ECC_INVERT_1_SHIFT 1
@@ -5306,7 +5655,7 @@
 #define I40E_RCU_SP256B_CFG_RM_SHIFT           16
 #define I40E_RCU_SP256B_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_SP256B_CFG_RM_SHIFT)
 
-#define I40E_RCU_SP256B_STATUS                        0x002698FC
+#define I40E_RCU_SP256B_STATUS                        0x002698FC /* Reset: POR */
 #define I40E_RCU_SP256B_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_SP256B_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_SP256B_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_SP256B_STATUS_ECC_FIX_SHIFT          1
@@ -5316,7 +5665,7 @@
 #define I40E_RCU_SP256B_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_SP256B_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_SP256B_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_SP2KB_CFG                    0x00269904
+#define I40E_RCU_SP2KB_CFG                    0x00269904 /* Reset: POR */
 #define I40E_RCU_SP2KB_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_SP2KB_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_SP2KB_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_SP2KB_CFG_ECC_INVERT_1_SHIFT 1
@@ -5338,7 +5687,7 @@
 #define I40E_RCU_SP2KB_CFG_RM_SHIFT           16
 #define I40E_RCU_SP2KB_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_SP2KB_CFG_RM_SHIFT)
 
-#define I40E_RCU_SP2KB_STATUS                        0x0026990C
+#define I40E_RCU_SP2KB_STATUS                        0x0026990C /* Reset: POR */
 #define I40E_RCU_SP2KB_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_SP2KB_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_SP2KB_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_SP2KB_STATUS_ECC_FIX_SHIFT          1
@@ -5348,7 +5697,7 @@
 #define I40E_RCU_SP2KB_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_SP2KB_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_SP2KB_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_SP4KB_CFG                    0x00269914
+#define I40E_RCU_SP4KB_CFG                    0x00269914 /* Reset: POR */
 #define I40E_RCU_SP4KB_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_SP4KB_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_SP4KB_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_SP4KB_CFG_ECC_INVERT_1_SHIFT 1
@@ -5370,7 +5719,7 @@
 #define I40E_RCU_SP4KB_CFG_RM_SHIFT           16
 #define I40E_RCU_SP4KB_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_SP4KB_CFG_RM_SHIFT)
 
-#define I40E_RCU_SP4KB_STATUS                        0x0026991C
+#define I40E_RCU_SP4KB_STATUS                        0x0026991C /* Reset: POR */
 #define I40E_RCU_SP4KB_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_SP4KB_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_SP4KB_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_SP4KB_STATUS_ECC_FIX_SHIFT          1
@@ -5380,7 +5729,7 @@
 #define I40E_RCU_SP4KB_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_SP4KB_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_SP4KB_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_SP8KB_CFG                    0x00269924
+#define I40E_RCU_SP8KB_CFG                    0x00269924 /* Reset: POR */
 #define I40E_RCU_SP8KB_CFG_ECC_EN_SHIFT       0
 #define I40E_RCU_SP8KB_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RCU_SP8KB_CFG_ECC_EN_SHIFT)
 #define I40E_RCU_SP8KB_CFG_ECC_INVERT_1_SHIFT 1
@@ -5402,7 +5751,7 @@
 #define I40E_RCU_SP8KB_CFG_RM_SHIFT           16
 #define I40E_RCU_SP8KB_CFG_RM_MASK            I40E_MASK(0xF, I40E_RCU_SP8KB_CFG_RM_SHIFT)
 
-#define I40E_RCU_SP8KB_STATUS                        0x0026992C
+#define I40E_RCU_SP8KB_STATUS                        0x0026992C /* Reset: POR */
 #define I40E_RCU_SP8KB_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RCU_SP8KB_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RCU_SP8KB_STATUS_ECC_ERR_SHIFT)
 #define I40E_RCU_SP8KB_STATUS_ECC_FIX_SHIFT          1
@@ -5412,23 +5761,23 @@
 #define I40E_RCU_SP8KB_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RCU_SP8KB_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RCU_SP8KB_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RCU_SWR_ECC_COR_ERR           0x00269934
+#define I40E_RCU_SWR_ECC_COR_ERR           0x00269934 /* Reset: POR */
 #define I40E_RCU_SWR_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_RCU_SWR_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_RCU_SWR_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_RCU_SWR_ECC_UNCOR_ERR           0x0026993C
+#define I40E_RCU_SWR_ECC_UNCOR_ERR           0x0026993C /* Reset: POR */
 #define I40E_RCU_SWR_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_RCU_SWR_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_RCU_SWR_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_RDPU_ECC_COR_ERR           0x00051080
+#define I40E_RDPU_ECC_COR_ERR           0x00051080 /* Reset: POR */
 #define I40E_RDPU_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_RDPU_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_RDPU_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_RDPU_ECC_UNCOR_ERR           0x0005107C
+#define I40E_RDPU_ECC_UNCOR_ERR           0x0005107C /* Reset: POR */
 #define I40E_RDPU_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_RDPU_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_RDPU_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_RDPU_VSI_LY2_STRIP_CFG                    0x00051074
+#define I40E_RDPU_VSI_LY2_STRIP_CFG                    0x00051074 /* Reset: POR */
 #define I40E_RDPU_VSI_LY2_STRIP_CFG_ECC_EN_SHIFT       0
 #define I40E_RDPU_VSI_LY2_STRIP_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RDPU_VSI_LY2_STRIP_CFG_ECC_EN_SHIFT)
 #define I40E_RDPU_VSI_LY2_STRIP_CFG_ECC_INVERT_1_SHIFT 1
@@ -5450,7 +5799,7 @@
 #define I40E_RDPU_VSI_LY2_STRIP_CFG_RM_SHIFT           16
 #define I40E_RDPU_VSI_LY2_STRIP_CFG_RM_MASK            I40E_MASK(0xF, I40E_RDPU_VSI_LY2_STRIP_CFG_RM_SHIFT)
 
-#define I40E_RDPU_VSI_LY2_STRIP_STATUS                        0x00051078
+#define I40E_RDPU_VSI_LY2_STRIP_STATUS                        0x00051078 /* Reset: POR */
 #define I40E_RDPU_VSI_LY2_STRIP_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RDPU_VSI_LY2_STRIP_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RDPU_VSI_LY2_STRIP_STATUS_ECC_ERR_SHIFT)
 #define I40E_RDPU_VSI_LY2_STRIP_STATUS_ECC_FIX_SHIFT          1
@@ -5460,7 +5809,7 @@
 #define I40E_RDPU_VSI_LY2_STRIP_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RDPU_VSI_LY2_STRIP_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RDPU_VSI_LY2_STRIP_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RLAN_ATTR_FIFO_CFG                    0x0012A52C
+#define I40E_RLAN_ATTR_FIFO_CFG                    0x0012A52C /* Reset: POR */
 #define I40E_RLAN_ATTR_FIFO_CFG_ECC_EN_SHIFT       0
 #define I40E_RLAN_ATTR_FIFO_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RLAN_ATTR_FIFO_CFG_ECC_EN_SHIFT)
 #define I40E_RLAN_ATTR_FIFO_CFG_ECC_INVERT_1_SHIFT 1
@@ -5482,7 +5831,7 @@
 #define I40E_RLAN_ATTR_FIFO_CFG_RM_SHIFT           16
 #define I40E_RLAN_ATTR_FIFO_CFG_RM_MASK            I40E_MASK(0xF, I40E_RLAN_ATTR_FIFO_CFG_RM_SHIFT)
 
-#define I40E_RLAN_ATTR_FIFO_STATUS                        0x0012A530
+#define I40E_RLAN_ATTR_FIFO_STATUS                        0x0012A530 /* Reset: POR */
 #define I40E_RLAN_ATTR_FIFO_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RLAN_ATTR_FIFO_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RLAN_ATTR_FIFO_STATUS_ECC_ERR_SHIFT)
 #define I40E_RLAN_ATTR_FIFO_STATUS_ECC_FIX_SHIFT          1
@@ -5492,7 +5841,7 @@
 #define I40E_RLAN_ATTR_FIFO_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RLAN_ATTR_FIFO_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RLAN_ATTR_FIFO_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RLAN_CCH_CFG                    0x0012A514
+#define I40E_RLAN_CCH_CFG                    0x0012A514 /* Reset: POR */
 #define I40E_RLAN_CCH_CFG_ECC_EN_SHIFT       0
 #define I40E_RLAN_CCH_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RLAN_CCH_CFG_ECC_EN_SHIFT)
 #define I40E_RLAN_CCH_CFG_ECC_INVERT_1_SHIFT 1
@@ -5514,7 +5863,7 @@
 #define I40E_RLAN_CCH_CFG_RM_SHIFT           16
 #define I40E_RLAN_CCH_CFG_RM_MASK            I40E_MASK(0xF, I40E_RLAN_CCH_CFG_RM_SHIFT)
 
-#define I40E_RLAN_CCH_STATUS                        0x0012A518
+#define I40E_RLAN_CCH_STATUS                        0x0012A518 /* Reset: POR */
 #define I40E_RLAN_CCH_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RLAN_CCH_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RLAN_CCH_STATUS_ECC_ERR_SHIFT)
 #define I40E_RLAN_CCH_STATUS_ECC_FIX_SHIFT          1
@@ -5524,7 +5873,7 @@
 #define I40E_RLAN_CCH_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RLAN_CCH_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RLAN_CCH_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RLAN_CMD_FIFO_CFG                    0x0012A534
+#define I40E_RLAN_CMD_FIFO_CFG                    0x0012A534 /* Reset: POR */
 #define I40E_RLAN_CMD_FIFO_CFG_ECC_EN_SHIFT       0
 #define I40E_RLAN_CMD_FIFO_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RLAN_CMD_FIFO_CFG_ECC_EN_SHIFT)
 #define I40E_RLAN_CMD_FIFO_CFG_ECC_INVERT_1_SHIFT 1
@@ -5546,7 +5895,7 @@
 #define I40E_RLAN_CMD_FIFO_CFG_RM_SHIFT           16
 #define I40E_RLAN_CMD_FIFO_CFG_RM_MASK            I40E_MASK(0xF, I40E_RLAN_CMD_FIFO_CFG_RM_SHIFT)
 
-#define I40E_RLAN_CMD_FIFO_STATUS                        0x0012A538
+#define I40E_RLAN_CMD_FIFO_STATUS                        0x0012A538 /* Reset: POR */
 #define I40E_RLAN_CMD_FIFO_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RLAN_CMD_FIFO_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RLAN_CMD_FIFO_STATUS_ECC_ERR_SHIFT)
 #define I40E_RLAN_CMD_FIFO_STATUS_ECC_FIX_SHIFT          1
@@ -5556,7 +5905,7 @@
 #define I40E_RLAN_CMD_FIFO_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RLAN_CMD_FIFO_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RLAN_CMD_FIFO_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RLAN_DCH_LINE_ATTR_CFG                    0x0012A51C
+#define I40E_RLAN_DCH_LINE_ATTR_CFG                    0x0012A51C /* Reset: POR */
 #define I40E_RLAN_DCH_LINE_ATTR_CFG_ECC_EN_SHIFT       0
 #define I40E_RLAN_DCH_LINE_ATTR_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RLAN_DCH_LINE_ATTR_CFG_ECC_EN_SHIFT)
 #define I40E_RLAN_DCH_LINE_ATTR_CFG_ECC_INVERT_1_SHIFT 1
@@ -5578,7 +5927,7 @@
 #define I40E_RLAN_DCH_LINE_ATTR_CFG_RM_SHIFT           16
 #define I40E_RLAN_DCH_LINE_ATTR_CFG_RM_MASK            I40E_MASK(0xF, I40E_RLAN_DCH_LINE_ATTR_CFG_RM_SHIFT)
 
-#define I40E_RLAN_DCH_LINE_ATTR_STATUS                        0x0012A520
+#define I40E_RLAN_DCH_LINE_ATTR_STATUS                        0x0012A520 /* Reset: POR */
 #define I40E_RLAN_DCH_LINE_ATTR_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RLAN_DCH_LINE_ATTR_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RLAN_DCH_LINE_ATTR_STATUS_ECC_ERR_SHIFT)
 #define I40E_RLAN_DCH_LINE_ATTR_STATUS_ECC_FIX_SHIFT          1
@@ -5588,7 +5937,7 @@
 #define I40E_RLAN_DCH_LINE_ATTR_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RLAN_DCH_LINE_ATTR_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RLAN_DCH_LINE_ATTR_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RLAN_DSCR_CH_BNK_CFG                    0x0012A544
+#define I40E_RLAN_DSCR_CH_BNK_CFG                    0x0012A544 /* Reset: POR */
 #define I40E_RLAN_DSCR_CH_BNK_CFG_ECC_EN_SHIFT       0
 #define I40E_RLAN_DSCR_CH_BNK_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RLAN_DSCR_CH_BNK_CFG_ECC_EN_SHIFT)
 #define I40E_RLAN_DSCR_CH_BNK_CFG_ECC_INVERT_1_SHIFT 1
@@ -5610,7 +5959,7 @@
 #define I40E_RLAN_DSCR_CH_BNK_CFG_RM_SHIFT           16
 #define I40E_RLAN_DSCR_CH_BNK_CFG_RM_MASK            I40E_MASK(0xF, I40E_RLAN_DSCR_CH_BNK_CFG_RM_SHIFT)
 
-#define I40E_RLAN_DSCR_CH_BNK_STATUS                        0x0012A548
+#define I40E_RLAN_DSCR_CH_BNK_STATUS                        0x0012A548 /* Reset: POR */
 #define I40E_RLAN_DSCR_CH_BNK_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RLAN_DSCR_CH_BNK_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RLAN_DSCR_CH_BNK_STATUS_ECC_ERR_SHIFT)
 #define I40E_RLAN_DSCR_CH_BNK_STATUS_ECC_FIX_SHIFT          1
@@ -5620,7 +5969,7 @@
 #define I40E_RLAN_DSCR_CH_BNK_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RLAN_DSCR_CH_BNK_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RLAN_DSCR_CH_BNK_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RLAN_DSCR_REQ_FIFO_CFG                    0x0012A524
+#define I40E_RLAN_DSCR_REQ_FIFO_CFG                    0x0012A524 /* Reset: POR */
 #define I40E_RLAN_DSCR_REQ_FIFO_CFG_ECC_EN_SHIFT       0
 #define I40E_RLAN_DSCR_REQ_FIFO_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RLAN_DSCR_REQ_FIFO_CFG_ECC_EN_SHIFT)
 #define I40E_RLAN_DSCR_REQ_FIFO_CFG_ECC_INVERT_1_SHIFT 1
@@ -5642,7 +5991,7 @@
 #define I40E_RLAN_DSCR_REQ_FIFO_CFG_RM_SHIFT           16
 #define I40E_RLAN_DSCR_REQ_FIFO_CFG_RM_MASK            I40E_MASK(0xF, I40E_RLAN_DSCR_REQ_FIFO_CFG_RM_SHIFT)
 
-#define I40E_RLAN_DSCR_REQ_FIFO_STATUS                        0x0012A528
+#define I40E_RLAN_DSCR_REQ_FIFO_STATUS                        0x0012A528 /* Reset: POR */
 #define I40E_RLAN_DSCR_REQ_FIFO_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RLAN_DSCR_REQ_FIFO_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RLAN_DSCR_REQ_FIFO_STATUS_ECC_ERR_SHIFT)
 #define I40E_RLAN_DSCR_REQ_FIFO_STATUS_ECC_FIX_SHIFT          1
@@ -5652,15 +6001,15 @@
 #define I40E_RLAN_DSCR_REQ_FIFO_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RLAN_DSCR_REQ_FIFO_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RLAN_DSCR_REQ_FIFO_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RLAN_ECC_COR_ERR           0x0012A550
+#define I40E_RLAN_ECC_COR_ERR           0x0012A550 /* Reset: POR */
 #define I40E_RLAN_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_RLAN_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_RLAN_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_RLAN_ECC_UNCOR_ERR           0x0012A54C
+#define I40E_RLAN_ECC_UNCOR_ERR           0x0012A54C /* Reset: POR */
 #define I40E_RLAN_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_RLAN_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_RLAN_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_RLAN_TAILS_CFG                    0x0012A53C
+#define I40E_RLAN_TAILS_CFG                    0x0012A53C /* Reset: POR */
 #define I40E_RLAN_TAILS_CFG_ECC_EN_SHIFT       0
 #define I40E_RLAN_TAILS_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RLAN_TAILS_CFG_ECC_EN_SHIFT)
 #define I40E_RLAN_TAILS_CFG_ECC_INVERT_1_SHIFT 1
@@ -5682,7 +6031,7 @@
 #define I40E_RLAN_TAILS_CFG_RM_SHIFT           16
 #define I40E_RLAN_TAILS_CFG_RM_MASK            I40E_MASK(0xF, I40E_RLAN_TAILS_CFG_RM_SHIFT)
 
-#define I40E_RLAN_TAILS_STATUS                        0x0012A540
+#define I40E_RLAN_TAILS_STATUS                        0x0012A540 /* Reset: POR */
 #define I40E_RLAN_TAILS_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RLAN_TAILS_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RLAN_TAILS_STATUS_ECC_ERR_SHIFT)
 #define I40E_RLAN_TAILS_STATUS_ECC_FIX_SHIFT          1
@@ -5692,7 +6041,7 @@
 #define I40E_RLAN_TAILS_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RLAN_TAILS_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RLAN_TAILS_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RPB_BACK_PRS_STAT                 0x000AC948
+#define I40E_RPB_BACK_PRS_STAT                 0x000AC948 /* Reset: CORER */
 #define I40E_RPB_BACK_PRS_STAT_PPRS_0_BP_SHIFT 0
 #define I40E_RPB_BACK_PRS_STAT_PPRS_0_BP_MASK  I40E_MASK(0x1, I40E_RPB_BACK_PRS_STAT_PPRS_0_BP_SHIFT)
 #define I40E_RPB_BACK_PRS_STAT_PPRS_1_BP_SHIFT 1
@@ -5720,7 +6069,7 @@
 #define I40E_RPB_BACK_PRS_STAT_PORT_3_FC_SHIFT 15
 #define I40E_RPB_BACK_PRS_STAT_PORT_3_FC_MASK  I40E_MASK(0x1, I40E_RPB_BACK_PRS_STAT_PORT_3_FC_SHIFT)
 
-#define I40E_RPB_CC_CNT_MEM_CFG                    0x000AC860
+#define I40E_RPB_CC_CNT_MEM_CFG                    0x000AC860 /* Reset: POR */
 #define I40E_RPB_CC_CNT_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_RPB_CC_CNT_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RPB_CC_CNT_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_RPB_CC_CNT_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -5742,7 +6091,7 @@
 #define I40E_RPB_CC_CNT_MEM_CFG_RM_SHIFT           16
 #define I40E_RPB_CC_CNT_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_RPB_CC_CNT_MEM_CFG_RM_SHIFT)
 
-#define I40E_RPB_CC_CNT_MEM_STATUS                        0x000AC864
+#define I40E_RPB_CC_CNT_MEM_STATUS                        0x000AC864 /* Reset: POR */
 #define I40E_RPB_CC_CNT_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RPB_CC_CNT_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RPB_CC_CNT_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_RPB_CC_CNT_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -5752,7 +6101,7 @@
 #define I40E_RPB_CC_CNT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RPB_CC_CNT_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RPB_CC_CNT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RPB_CC_MEM_CFG                    0x000AC890
+#define I40E_RPB_CC_MEM_CFG                    0x000AC890 /* Reset: POR */
 #define I40E_RPB_CC_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_RPB_CC_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RPB_CC_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_RPB_CC_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -5774,7 +6123,7 @@
 #define I40E_RPB_CC_MEM_CFG_RM_SHIFT           16
 #define I40E_RPB_CC_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_RPB_CC_MEM_CFG_RM_SHIFT)
 
-#define I40E_RPB_CC_MEM_STATUS                        0x000AC894
+#define I40E_RPB_CC_MEM_STATUS                        0x000AC894 /* Reset: POR */
 #define I40E_RPB_CC_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RPB_CC_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RPB_CC_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_RPB_CC_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -5784,7 +6133,7 @@
 #define I40E_RPB_CC_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RPB_CC_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RPB_CC_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RPB_CLID_MEM_CFG                    0x000AC870
+#define I40E_RPB_CLID_MEM_CFG                    0x000AC870 /* Reset: POR */
 #define I40E_RPB_CLID_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_RPB_CLID_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RPB_CLID_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_RPB_CLID_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -5806,7 +6155,7 @@
 #define I40E_RPB_CLID_MEM_CFG_RM_SHIFT           16
 #define I40E_RPB_CLID_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_RPB_CLID_MEM_CFG_RM_SHIFT)
 
-#define I40E_RPB_CLID_MEM_STATUS                        0x000AC874
+#define I40E_RPB_CLID_MEM_STATUS                        0x000AC874 /* Reset: POR */
 #define I40E_RPB_CLID_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RPB_CLID_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RPB_CLID_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_RPB_CLID_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -5816,7 +6165,7 @@
 #define I40E_RPB_CLID_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RPB_CLID_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RPB_CLID_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RPB_DATA_PIPE_MEM_CFG(_i)                (0x000AC898 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_RPB_DATA_PIPE_MEM_CFG(_i)                (0x000AC898 + ((_i) * 4)) /* _i=0...7 */ /* Reset: POR */
 #define I40E_RPB_DATA_PIPE_MEM_CFG_MAX_INDEX          7
 #define I40E_RPB_DATA_PIPE_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_RPB_DATA_PIPE_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RPB_DATA_PIPE_MEM_CFG_ECC_EN_SHIFT)
@@ -5839,7 +6188,7 @@
 #define I40E_RPB_DATA_PIPE_MEM_CFG_RM_SHIFT           16
 #define I40E_RPB_DATA_PIPE_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_RPB_DATA_PIPE_MEM_CFG_RM_SHIFT)
 
-#define I40E_RPB_DATA_PIPE_MEM_STATUS(_i)                    (0x000AC8B8 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_RPB_DATA_PIPE_MEM_STATUS(_i)                    (0x000AC8B8 + ((_i) * 4)) /* _i=0...7 */ /* Reset: POR */
 #define I40E_RPB_DATA_PIPE_MEM_STATUS_MAX_INDEX              7
 #define I40E_RPB_DATA_PIPE_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RPB_DATA_PIPE_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RPB_DATA_PIPE_MEM_STATUS_ECC_ERR_SHIFT)
@@ -5850,11 +6199,11 @@
 #define I40E_RPB_DATA_PIPE_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RPB_DATA_PIPE_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RPB_DATA_PIPE_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RPB_DBG_ACC_CNT                       0x000AC8E0
+#define I40E_RPB_DBG_ACC_CNT                       0x000AC8E0 /* Reset: CORER */
 #define I40E_RPB_DBG_ACC_CNT_RPB_DBG_ACC_CNT_SHIFT 0
 #define I40E_RPB_DBG_ACC_CNT_RPB_DBG_ACC_CNT_MASK  I40E_MASK(0xFFFF, I40E_RPB_DBG_ACC_CNT_RPB_DBG_ACC_CNT_SHIFT)
 
-#define I40E_RPB_DBG_ACC_CTL               0x000AC8E4
+#define I40E_RPB_DBG_ACC_CTL               0x000AC8E4 /* Reset: CORER */
 #define I40E_RPB_DBG_ACC_CTL_ADDR_SHIFT    0
 #define I40E_RPB_DBG_ACC_CTL_ADDR_MASK     I40E_MASK(0xFFFF, I40E_RPB_DBG_ACC_CTL_ADDR_SHIFT)
 #define I40E_RPB_DBG_ACC_CTL_MEM_SEL_SHIFT 16
@@ -5862,12 +6211,12 @@
 #define I40E_RPB_DBG_ACC_CTL_EXECUTE_SHIFT 20
 #define I40E_RPB_DBG_ACC_CTL_EXECUTE_MASK  I40E_MASK(0x1, I40E_RPB_DBG_ACC_CTL_EXECUTE_SHIFT)
 
-#define I40E_RPB_DBG_ACC_DATA(_i)                     (0x000AC8EC + ((_i) * 4)) /* _i=0...7 */
+#define I40E_RPB_DBG_ACC_DATA(_i)                     (0x000AC8EC + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_RPB_DBG_ACC_DATA_MAX_INDEX               7
 #define I40E_RPB_DBG_ACC_DATA_RPB_DBG_READ_DATA_SHIFT 0
 #define I40E_RPB_DBG_ACC_DATA_RPB_DBG_READ_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_RPB_DBG_ACC_DATA_RPB_DBG_READ_DATA_SHIFT)
 
-#define I40E_RPB_DBG_ACC_STAT                0x000AC8E8
+#define I40E_RPB_DBG_ACC_STAT                0x000AC8E8 /* Reset: CORER */
 #define I40E_RPB_DBG_ACC_STAT_READY_SHIFT    0
 #define I40E_RPB_DBG_ACC_STAT_READY_MASK     I40E_MASK(0x1, I40E_RPB_DBG_ACC_STAT_READY_SHIFT)
 #define I40E_RPB_DBG_ACC_STAT_BUSY_SHIFT     1
@@ -5879,7 +6228,7 @@
 #define I40E_RPB_DBG_ACC_STAT_WD_ERR_SHIFT   6
 #define I40E_RPB_DBG_ACC_STAT_WD_ERR_MASK    I40E_MASK(0x1, I40E_RPB_DBG_ACC_STAT_WD_ERR_SHIFT)
 
-#define I40E_RPB_DBG_FEAT                         0x000AC940
+#define I40E_RPB_DBG_FEAT                         0x000AC940 /* Reset: CORER */
 #define I40E_RPB_DBG_FEAT_DISABLE_REPORTS_SHIFT   0
 #define I40E_RPB_DBG_FEAT_DISABLE_REPORTS_MASK    I40E_MASK(0x1, I40E_RPB_DBG_FEAT_DISABLE_REPORTS_SHIFT)
 #define I40E_RPB_DBG_FEAT_DISABLE_RELEASE_SHIFT   1
@@ -5907,15 +6256,15 @@
 #define I40E_RPB_DBG_FEAT_LTR_CLK_GEN_VAL_SHIFT   20
 #define I40E_RPB_DBG_FEAT_LTR_CLK_GEN_VAL_MASK    I40E_MASK(0xFFF, I40E_RPB_DBG_FEAT_LTR_CLK_GEN_VAL_SHIFT)
 
-#define I40E_RPB_ECC_COR_ERR           0x000AC8DC
+#define I40E_RPB_ECC_COR_ERR           0x000AC8DC /* Reset: POR */
 #define I40E_RPB_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_RPB_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_RPB_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_RPB_ECC_UNCOR_ERR           0x000AC8D8
+#define I40E_RPB_ECC_UNCOR_ERR           0x000AC8D8 /* Reset: POR */
 #define I40E_RPB_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_RPB_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_RPB_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_RPB_EGR_CNT                0x000AC94C
+#define I40E_RPB_EGR_CNT                0x000AC94C /* Reset: CORER */
 #define I40E_RPB_EGR_CNT_RCU_REQ_SHIFT  0
 #define I40E_RPB_EGR_CNT_RCU_REQ_MASK   I40E_MASK(0xFF, I40E_RPB_EGR_CNT_RCU_REQ_SHIFT)
 #define I40E_RPB_EGR_CNT_PE_0_REQ_SHIFT 8
@@ -5925,13 +6274,13 @@
 #define I40E_RPB_EGR_CNT_RDPU_REQ_SHIFT 24
 #define I40E_RPB_EGR_CNT_RDPU_REQ_MASK  I40E_MASK(0xFF, I40E_RPB_EGR_CNT_RDPU_REQ_SHIFT)
 
-#define I40E_RPB_GEN_DBG_CNT                  0x000AC944
+#define I40E_RPB_GEN_DBG_CNT                  0x000AC944 /* Reset: CORER */
 #define I40E_RPB_GEN_DBG_CNT_FREE_CC_SHIFT    0
 #define I40E_RPB_GEN_DBG_CNT_FREE_CC_MASK     I40E_MASK(0x1FF, I40E_RPB_GEN_DBG_CNT_FREE_CC_SHIFT)
 #define I40E_RPB_GEN_DBG_CNT_FREE_CLIDS_SHIFT 16
 #define I40E_RPB_GEN_DBG_CNT_FREE_CLIDS_MASK  I40E_MASK(0x3FFF, I40E_RPB_GEN_DBG_CNT_FREE_CLIDS_SHIFT)
 
-#define I40E_RPB_PKT_MEM_CFG                    0x000AC868
+#define I40E_RPB_PKT_MEM_CFG                    0x000AC868 /* Reset: POR */
 #define I40E_RPB_PKT_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_RPB_PKT_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RPB_PKT_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_RPB_PKT_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -5953,7 +6302,7 @@
 #define I40E_RPB_PKT_MEM_CFG_RM_SHIFT           16
 #define I40E_RPB_PKT_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_RPB_PKT_MEM_CFG_RM_SHIFT)
 
-#define I40E_RPB_PKT_MEM_STATUS                        0x000AC86C
+#define I40E_RPB_PKT_MEM_STATUS                        0x000AC86C /* Reset: POR */
 #define I40E_RPB_PKT_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RPB_PKT_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RPB_PKT_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_RPB_PKT_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -5963,7 +6312,7 @@
 #define I40E_RPB_PKT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RPB_PKT_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RPB_PKT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RPB_PPDB_MEM_CFG                    0x000AC878
+#define I40E_RPB_PPDB_MEM_CFG                    0x000AC878 /* Reset: POR */
 #define I40E_RPB_PPDB_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_RPB_PPDB_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RPB_PPDB_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_RPB_PPDB_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -5989,7 +6338,7 @@
 #define I40E_RPB_PPDB_MEM_CFG_RM_B_SHIFT         20
 #define I40E_RPB_PPDB_MEM_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_RPB_PPDB_MEM_CFG_RM_B_SHIFT)
 
-#define I40E_RPB_PPDB_MEM_STATUS                        0x000AC87C
+#define I40E_RPB_PPDB_MEM_STATUS                        0x000AC87C /* Reset: POR */
 #define I40E_RPB_PPDB_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RPB_PPDB_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RPB_PPDB_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_RPB_PPDB_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -5999,14 +6348,14 @@
 #define I40E_RPB_PPDB_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RPB_PPDB_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RPB_PPDB_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RPB_PPRS_ERR_CNT(_i)                 (0x000AC910 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_RPB_PPRS_ERR_CNT(_i)                 (0x000AC910 + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_RPB_PPRS_ERR_CNT_MAX_INDEX           3
 #define I40E_RPB_PPRS_ERR_CNT_PKT_SIZE_ERR_SHIFT  0
 #define I40E_RPB_PPRS_ERR_CNT_PKT_SIZE_ERR_MASK   I40E_MASK(0xFF, I40E_RPB_PPRS_ERR_CNT_PKT_SIZE_ERR_SHIFT)
 #define I40E_RPB_PPRS_ERR_CNT_VALID_BTW_PKT_SHIFT 8
 #define I40E_RPB_PPRS_ERR_CNT_VALID_BTW_PKT_MASK  I40E_MASK(0xFF, I40E_RPB_PPRS_ERR_CNT_VALID_BTW_PKT_SHIFT)
 
-#define I40E_RPB_REPORT_LL_MEM_CFG                    0x000AC880
+#define I40E_RPB_REPORT_LL_MEM_CFG                    0x000AC880 /* Reset: POR */
 #define I40E_RPB_REPORT_LL_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_RPB_REPORT_LL_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RPB_REPORT_LL_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_RPB_REPORT_LL_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6028,7 +6377,7 @@
 #define I40E_RPB_REPORT_LL_MEM_CFG_RM_SHIFT           16
 #define I40E_RPB_REPORT_LL_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_RPB_REPORT_LL_MEM_CFG_RM_SHIFT)
 
-#define I40E_RPB_REPORT_LL_MEM_STATUS                        0x000AC884
+#define I40E_RPB_REPORT_LL_MEM_STATUS                        0x000AC884 /* Reset: POR */
 #define I40E_RPB_REPORT_LL_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RPB_REPORT_LL_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RPB_REPORT_LL_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_RPB_REPORT_LL_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6038,7 +6387,7 @@
 #define I40E_RPB_REPORT_LL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RPB_REPORT_LL_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RPB_REPORT_LL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RPB_REPORT_MEM_CFG                    0x000AC888
+#define I40E_RPB_REPORT_MEM_CFG                    0x000AC888 /* Reset: POR */
 #define I40E_RPB_REPORT_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_RPB_REPORT_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_RPB_REPORT_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_RPB_REPORT_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6060,7 +6409,7 @@
 #define I40E_RPB_REPORT_MEM_CFG_RM_SHIFT           16
 #define I40E_RPB_REPORT_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_RPB_REPORT_MEM_CFG_RM_SHIFT)
 
-#define I40E_RPB_REPORT_MEM_STATUS                        0x000AC88C
+#define I40E_RPB_REPORT_MEM_STATUS                        0x000AC88C /* Reset: POR */
 #define I40E_RPB_REPORT_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_RPB_REPORT_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_RPB_REPORT_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_RPB_REPORT_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6070,27 +6419,27 @@
 #define I40E_RPB_REPORT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_RPB_REPORT_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_RPB_REPORT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_RPB_RPT_CNT                   0x000AC950
+#define I40E_RPB_RPT_CNT                   0x000AC950 /* Reset: CORER */
 #define I40E_RPB_RPT_CNT_RPB_RPT_CNT_SHIFT 0
 #define I40E_RPB_RPT_CNT_RPB_RPT_CNT_MASK  I40E_MASK(0xFFFF, I40E_RPB_RPT_CNT_RPB_RPT_CNT_SHIFT)
 
-#define I40E_RPB_RPT_STAT                    0x000AC954
+#define I40E_RPB_RPT_STAT                    0x000AC954 /* Reset: CORER */
 #define I40E_RPB_RPT_STAT_RPB_RPT_STAT_SHIFT 0
 #define I40E_RPB_RPT_STAT_RPB_RPT_STAT_MASK  I40E_MASK(0xFFFFFFFF, I40E_RPB_RPT_STAT_RPB_RPT_STAT_SHIFT)
 
-#define I40E_RPB_SHR_MOD_CNT                       0x000AC90C
+#define I40E_RPB_SHR_MOD_CNT                       0x000AC90C /* Reset: CORER */
 #define I40E_RPB_SHR_MOD_CNT_RPB_SHR_MOD_CNT_SHIFT 0
 #define I40E_RPB_SHR_MOD_CNT_RPB_SHR_MOD_CNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_RPB_SHR_MOD_CNT_RPB_SHR_MOD_CNT_SHIFT)
 
-#define I40E_TCB_ECC_COR_ERR           0x000AE0A8
+#define I40E_TCB_ECC_COR_ERR           0x000AE0A8 /* Reset: POR */
 #define I40E_TCB_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_TCB_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_TCB_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_TCB_ECC_UNCOR_ERR           0x000AE0A4
+#define I40E_TCB_ECC_UNCOR_ERR           0x000AE0A4 /* Reset: POR */
 #define I40E_TCB_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_TCB_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_TCB_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_TCB_PORT_CMD_BUF_DBG_CTL              0x000AE0B4
+#define I40E_TCB_PORT_CMD_BUF_DBG_CTL              0x000AE0B4 /* Reset: CORER */
 #define I40E_TCB_PORT_CMD_BUF_DBG_CTL_ADR_SHIFT    0
 #define I40E_TCB_PORT_CMD_BUF_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_TCB_PORT_CMD_BUF_DBG_CTL_ADR_SHIFT)
 #define I40E_TCB_PORT_CMD_BUF_DBG_CTL_DW_SEL_SHIFT 18
@@ -6100,11 +6449,11 @@
 #define I40E_TCB_PORT_CMD_BUF_DBG_CTL_DONE_SHIFT   31
 #define I40E_TCB_PORT_CMD_BUF_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_TCB_PORT_CMD_BUF_DBG_CTL_DONE_SHIFT)
 
-#define I40E_TCB_PORT_CMD_BUF_DBG_DATA             0x000AE0CC
+#define I40E_TCB_PORT_CMD_BUF_DBG_DATA             0x000AE0CC /* Reset: CORER */
 #define I40E_TCB_PORT_CMD_BUF_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_TCB_PORT_CMD_BUF_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_TCB_PORT_CMD_BUF_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_TCB_PORT_CMD_MNG_DBG_CTL              0x000AE0B8
+#define I40E_TCB_PORT_CMD_MNG_DBG_CTL              0x000AE0B8 /* Reset: CORER */
 #define I40E_TCB_PORT_CMD_MNG_DBG_CTL_ADR_SHIFT    0
 #define I40E_TCB_PORT_CMD_MNG_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_TCB_PORT_CMD_MNG_DBG_CTL_ADR_SHIFT)
 #define I40E_TCB_PORT_CMD_MNG_DBG_CTL_DW_SEL_SHIFT 18
@@ -6114,11 +6463,11 @@
 #define I40E_TCB_PORT_CMD_MNG_DBG_CTL_DONE_SHIFT   31
 #define I40E_TCB_PORT_CMD_MNG_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_TCB_PORT_CMD_MNG_DBG_CTL_DONE_SHIFT)
 
-#define I40E_TCB_PORT_CMD_MNG_DBG_DATA             0x000AE0C0
+#define I40E_TCB_PORT_CMD_MNG_DBG_DATA             0x000AE0C0 /* Reset: CORER */
 #define I40E_TCB_PORT_CMD_MNG_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_TCB_PORT_CMD_MNG_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_TCB_PORT_CMD_MNG_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_TCB_WAIT_CMD_BUF_DBG_CTL              0x000AE0BC
+#define I40E_TCB_WAIT_CMD_BUF_DBG_CTL              0x000AE0BC /* Reset: CORER */
 #define I40E_TCB_WAIT_CMD_BUF_DBG_CTL_ADR_SHIFT    0
 #define I40E_TCB_WAIT_CMD_BUF_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_TCB_WAIT_CMD_BUF_DBG_CTL_ADR_SHIFT)
 #define I40E_TCB_WAIT_CMD_BUF_DBG_CTL_DW_SEL_SHIFT 18
@@ -6128,11 +6477,11 @@
 #define I40E_TCB_WAIT_CMD_BUF_DBG_CTL_DONE_SHIFT   31
 #define I40E_TCB_WAIT_CMD_BUF_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_TCB_WAIT_CMD_BUF_DBG_CTL_DONE_SHIFT)
 
-#define I40E_TCB_WAIT_CMD_BUF_DBG_DATA             0x000AE0C4
+#define I40E_TCB_WAIT_CMD_BUF_DBG_DATA             0x000AE0C4 /* Reset: CORER */
 #define I40E_TCB_WAIT_CMD_BUF_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_TCB_WAIT_CMD_BUF_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_TCB_WAIT_CMD_BUF_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_TCB_WAIT_CMD_MNG_DBG_CTL              0x000AE0B0
+#define I40E_TCB_WAIT_CMD_MNG_DBG_CTL              0x000AE0B0 /* Reset: CORER */
 #define I40E_TCB_WAIT_CMD_MNG_DBG_CTL_ADR_SHIFT    0
 #define I40E_TCB_WAIT_CMD_MNG_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_TCB_WAIT_CMD_MNG_DBG_CTL_ADR_SHIFT)
 #define I40E_TCB_WAIT_CMD_MNG_DBG_CTL_DW_SEL_SHIFT 18
@@ -6142,11 +6491,11 @@
 #define I40E_TCB_WAIT_CMD_MNG_DBG_CTL_DONE_SHIFT   31
 #define I40E_TCB_WAIT_CMD_MNG_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_TCB_WAIT_CMD_MNG_DBG_CTL_DONE_SHIFT)
 
-#define I40E_TCB_WAIT_CMD_MNG_DBG_DATA             0x000AE0C8
+#define I40E_TCB_WAIT_CMD_MNG_DBG_DATA             0x000AE0C8 /* Reset: CORER */
 #define I40E_TCB_WAIT_CMD_MNG_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_TCB_WAIT_CMD_MNG_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_TCB_WAIT_CMD_MNG_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_TDPU_CMD_MUX_MEM_CFG                    0x00044304
+#define I40E_TDPU_CMD_MUX_MEM_CFG                    0x00044304 /* Reset: POR */
 #define I40E_TDPU_CMD_MUX_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TDPU_CMD_MUX_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TDPU_CMD_MUX_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TDPU_CMD_MUX_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6168,7 +6517,7 @@
 #define I40E_TDPU_CMD_MUX_MEM_CFG_RM_SHIFT           16
 #define I40E_TDPU_CMD_MUX_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TDPU_CMD_MUX_MEM_CFG_RM_SHIFT)
 
-#define I40E_TDPU_CMD_MUX_MEM_STATUS                        0x00044330
+#define I40E_TDPU_CMD_MUX_MEM_STATUS                        0x00044330 /* Reset: POR */
 #define I40E_TDPU_CMD_MUX_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TDPU_CMD_MUX_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TDPU_CMD_MUX_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TDPU_CMD_MUX_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6178,7 +6527,7 @@
 #define I40E_TDPU_CMD_MUX_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TDPU_CMD_MUX_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TDPU_CMD_MUX_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TDPU_DAC_MEM_CFG                    0x00044310
+#define I40E_TDPU_DAC_MEM_CFG                    0x00044310 /* Reset: POR */
 #define I40E_TDPU_DAC_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TDPU_DAC_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TDPU_DAC_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TDPU_DAC_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6200,7 +6549,7 @@
 #define I40E_TDPU_DAC_MEM_CFG_RM_SHIFT           16
 #define I40E_TDPU_DAC_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TDPU_DAC_MEM_CFG_RM_SHIFT)
 
-#define I40E_TDPU_DAC_MEM_STATUS                        0x00044328
+#define I40E_TDPU_DAC_MEM_STATUS                        0x00044328 /* Reset: POR */
 #define I40E_TDPU_DAC_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TDPU_DAC_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TDPU_DAC_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TDPU_DAC_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6210,7 +6559,7 @@
 #define I40E_TDPU_DAC_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TDPU_DAC_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TDPU_DAC_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TDPU_DAC_MNG_MEM_CFG                    0x0004430C
+#define I40E_TDPU_DAC_MNG_MEM_CFG                    0x0004430C /* Reset: POR */
 #define I40E_TDPU_DAC_MNG_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TDPU_DAC_MNG_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TDPU_DAC_MNG_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TDPU_DAC_MNG_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6232,7 +6581,7 @@
 #define I40E_TDPU_DAC_MNG_MEM_CFG_RM_SHIFT           16
 #define I40E_TDPU_DAC_MNG_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TDPU_DAC_MNG_MEM_CFG_RM_SHIFT)
 
-#define I40E_TDPU_DAC_MNG_MEM_STATUS                        0x0004432C
+#define I40E_TDPU_DAC_MNG_MEM_STATUS                        0x0004432C /* Reset: POR */
 #define I40E_TDPU_DAC_MNG_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TDPU_DAC_MNG_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TDPU_DAC_MNG_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TDPU_DAC_MNG_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6242,15 +6591,15 @@
 #define I40E_TDPU_DAC_MNG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TDPU_DAC_MNG_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TDPU_DAC_MNG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TDPU_ECC_COR_ERR           0x0004433C
+#define I40E_TDPU_ECC_COR_ERR           0x0004433C /* Reset: POR */
 #define I40E_TDPU_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_TDPU_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_TDPU_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_TDPU_ECC_UNCOR_ERR           0x00044338
+#define I40E_TDPU_ECC_UNCOR_ERR           0x00044338 /* Reset: POR */
 #define I40E_TDPU_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_TDPU_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_TDPU_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_TDPU_IMEM_CFG                    0x000442F8
+#define I40E_TDPU_IMEM_CFG                    0x000442F8 /* Reset: POR */
 #define I40E_TDPU_IMEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TDPU_IMEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TDPU_IMEM_CFG_ECC_EN_SHIFT)
 #define I40E_TDPU_IMEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6272,7 +6621,7 @@
 #define I40E_TDPU_IMEM_CFG_RM_SHIFT           16
 #define I40E_TDPU_IMEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TDPU_IMEM_CFG_RM_SHIFT)
 
-#define I40E_TDPU_IMEM_STATUS                        0x00044318
+#define I40E_TDPU_IMEM_STATUS                        0x00044318 /* Reset: POR */
 #define I40E_TDPU_IMEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TDPU_IMEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TDPU_IMEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TDPU_IMEM_STATUS_ECC_FIX_SHIFT          1
@@ -6282,7 +6631,7 @@
 #define I40E_TDPU_IMEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TDPU_IMEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TDPU_IMEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TDPU_RECIPE_ADDR_CFG                    0x000442FC
+#define I40E_TDPU_RECIPE_ADDR_CFG                    0x000442FC /* Reset: POR */
 #define I40E_TDPU_RECIPE_ADDR_CFG_ECC_EN_SHIFT       0
 #define I40E_TDPU_RECIPE_ADDR_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TDPU_RECIPE_ADDR_CFG_ECC_EN_SHIFT)
 #define I40E_TDPU_RECIPE_ADDR_CFG_ECC_INVERT_1_SHIFT 1
@@ -6304,7 +6653,7 @@
 #define I40E_TDPU_RECIPE_ADDR_CFG_RM_SHIFT           16
 #define I40E_TDPU_RECIPE_ADDR_CFG_RM_MASK            I40E_MASK(0xF, I40E_TDPU_RECIPE_ADDR_CFG_RM_SHIFT)
 
-#define I40E_TDPU_RECIPE_ADDR_STATUS                        0x0004431C
+#define I40E_TDPU_RECIPE_ADDR_STATUS                        0x0004431C /* Reset: POR */
 #define I40E_TDPU_RECIPE_ADDR_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TDPU_RECIPE_ADDR_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TDPU_RECIPE_ADDR_STATUS_ECC_ERR_SHIFT)
 #define I40E_TDPU_RECIPE_ADDR_STATUS_ECC_FIX_SHIFT          1
@@ -6314,7 +6663,7 @@
 #define I40E_TDPU_RECIPE_ADDR_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TDPU_RECIPE_ADDR_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TDPU_RECIPE_ADDR_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TDPU_TDRD_MEM_CFG                    0x00044314
+#define I40E_TDPU_TDRD_MEM_CFG                    0x00044314 /* Reset: POR */
 #define I40E_TDPU_TDRD_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TDPU_TDRD_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TDPU_TDRD_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TDPU_TDRD_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6336,7 +6685,7 @@
 #define I40E_TDPU_TDRD_MEM_CFG_RM_SHIFT           16
 #define I40E_TDPU_TDRD_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TDPU_TDRD_MEM_CFG_RM_SHIFT)
 
-#define I40E_TDPU_TDRD_MEM_STATUS                        0x00044324
+#define I40E_TDPU_TDRD_MEM_STATUS                        0x00044324 /* Reset: POR */
 #define I40E_TDPU_TDRD_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TDPU_TDRD_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TDPU_TDRD_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TDPU_TDRD_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6346,7 +6695,7 @@
 #define I40E_TDPU_TDRD_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TDPU_TDRD_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TDPU_TDRD_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TDPU_TDWR_MEM_CFG                    0x00044308
+#define I40E_TDPU_TDWR_MEM_CFG                    0x00044308 /* Reset: POR */
 #define I40E_TDPU_TDWR_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TDPU_TDWR_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TDPU_TDWR_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TDPU_TDWR_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6368,7 +6717,7 @@
 #define I40E_TDPU_TDWR_MEM_CFG_RM_SHIFT           16
 #define I40E_TDPU_TDWR_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TDPU_TDWR_MEM_CFG_RM_SHIFT)
 
-#define I40E_TDPU_TDWR_MEM_STATUS                        0x00044334
+#define I40E_TDPU_TDWR_MEM_STATUS                        0x00044334 /* Reset: POR */
 #define I40E_TDPU_TDWR_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TDPU_TDWR_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TDPU_TDWR_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TDPU_TDWR_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6378,7 +6727,7 @@
 #define I40E_TDPU_TDWR_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TDPU_TDWR_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TDPU_TDWR_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TDPU_VSI_LY2_INSERT_MEM_CFG                    0x00044300
+#define I40E_TDPU_VSI_LY2_INSERT_MEM_CFG                    0x00044300 /* Reset: POR */
 #define I40E_TDPU_VSI_LY2_INSERT_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TDPU_VSI_LY2_INSERT_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TDPU_VSI_LY2_INSERT_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TDPU_VSI_LY2_INSERT_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6400,7 +6749,7 @@
 #define I40E_TDPU_VSI_LY2_INSERT_MEM_CFG_RM_SHIFT           16
 #define I40E_TDPU_VSI_LY2_INSERT_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TDPU_VSI_LY2_INSERT_MEM_CFG_RM_SHIFT)
 
-#define I40E_TDPU_VSI_LY2_INSERT_MEM_STATUS                        0x00044320
+#define I40E_TDPU_VSI_LY2_INSERT_MEM_STATUS                        0x00044320 /* Reset: POR */
 #define I40E_TDPU_VSI_LY2_INSERT_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TDPU_VSI_LY2_INSERT_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TDPU_VSI_LY2_INSERT_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TDPU_VSI_LY2_INSERT_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6410,7 +6759,7 @@
 #define I40E_TDPU_VSI_LY2_INSERT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TDPU_VSI_LY2_INSERT_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TDPU_VSI_LY2_INSERT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TLAN_DEC_MEM_CFG                    0x000E6490
+#define I40E_TLAN_DEC_MEM_CFG                    0x000E6490 /* Reset: POR */
 #define I40E_TLAN_DEC_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TLAN_DEC_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TLAN_DEC_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TLAN_DEC_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6432,7 +6781,7 @@
 #define I40E_TLAN_DEC_MEM_CFG_RM_SHIFT           16
 #define I40E_TLAN_DEC_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TLAN_DEC_MEM_CFG_RM_SHIFT)
 
-#define I40E_TLAN_DEC_MEM_STATUS                        0x000E6494
+#define I40E_TLAN_DEC_MEM_STATUS                        0x000E6494 /* Reset: POR */
 #define I40E_TLAN_DEC_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TLAN_DEC_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TLAN_DEC_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TLAN_DEC_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6442,7 +6791,7 @@
 #define I40E_TLAN_DEC_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TLAN_DEC_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TLAN_DEC_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TLAN_DEC_MNG_MEM_CFG                    0x000E64A0
+#define I40E_TLAN_DEC_MNG_MEM_CFG                    0x000E64A0 /* Reset: POR */
 #define I40E_TLAN_DEC_MNG_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TLAN_DEC_MNG_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TLAN_DEC_MNG_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TLAN_DEC_MNG_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6464,7 +6813,7 @@
 #define I40E_TLAN_DEC_MNG_MEM_CFG_RM_SHIFT           16
 #define I40E_TLAN_DEC_MNG_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TLAN_DEC_MNG_MEM_CFG_RM_SHIFT)
 
-#define I40E_TLAN_DEC_MNG_MEM_STATUS                        0x000E64A4
+#define I40E_TLAN_DEC_MNG_MEM_STATUS                        0x000E64A4 /* Reset: POR */
 #define I40E_TLAN_DEC_MNG_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TLAN_DEC_MNG_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TLAN_DEC_MNG_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TLAN_DEC_MNG_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6474,7 +6823,7 @@
 #define I40E_TLAN_DEC_MNG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TLAN_DEC_MNG_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TLAN_DEC_MNG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TLAN_DEC_PTRS_MEM_CFG                    0x000E6498
+#define I40E_TLAN_DEC_PTRS_MEM_CFG                    0x000E6498 /* Reset: POR */
 #define I40E_TLAN_DEC_PTRS_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TLAN_DEC_PTRS_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TLAN_DEC_PTRS_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TLAN_DEC_PTRS_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6496,7 +6845,7 @@
 #define I40E_TLAN_DEC_PTRS_MEM_CFG_RM_SHIFT           16
 #define I40E_TLAN_DEC_PTRS_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TLAN_DEC_PTRS_MEM_CFG_RM_SHIFT)
 
-#define I40E_TLAN_DEC_PTRS_MEM_STATUS                        0x000E649C
+#define I40E_TLAN_DEC_PTRS_MEM_STATUS                        0x000E649C /* Reset: POR */
 #define I40E_TLAN_DEC_PTRS_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TLAN_DEC_PTRS_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TLAN_DEC_PTRS_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TLAN_DEC_PTRS_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6506,15 +6855,15 @@
 #define I40E_TLAN_DEC_PTRS_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TLAN_DEC_PTRS_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TLAN_DEC_PTRS_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TLAN_ECC_COR_ERR           0x000E64B4
+#define I40E_TLAN_ECC_COR_ERR           0x000E64B4 /* Reset: POR */
 #define I40E_TLAN_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_TLAN_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_TLAN_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_TLAN_ECC_UNCOR_ERR           0x000E64B0
+#define I40E_TLAN_ECC_UNCOR_ERR           0x000E64B0 /* Reset: POR */
 #define I40E_TLAN_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_TLAN_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_TLAN_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_TLAN_HEAD_WB_CFG                    0x000E64A8
+#define I40E_TLAN_HEAD_WB_CFG                    0x000E64A8 /* Reset: POR */
 #define I40E_TLAN_HEAD_WB_CFG_ECC_EN_SHIFT       0
 #define I40E_TLAN_HEAD_WB_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TLAN_HEAD_WB_CFG_ECC_EN_SHIFT)
 #define I40E_TLAN_HEAD_WB_CFG_ECC_INVERT_1_SHIFT 1
@@ -6536,7 +6885,7 @@
 #define I40E_TLAN_HEAD_WB_CFG_RM_SHIFT           16
 #define I40E_TLAN_HEAD_WB_CFG_RM_MASK            I40E_MASK(0xF, I40E_TLAN_HEAD_WB_CFG_RM_SHIFT)
 
-#define I40E_TLAN_HEAD_WB_STATUS                        0x000E64AC
+#define I40E_TLAN_HEAD_WB_STATUS                        0x000E64AC /* Reset: POR */
 #define I40E_TLAN_HEAD_WB_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TLAN_HEAD_WB_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TLAN_HEAD_WB_STATUS_ECC_ERR_SHIFT)
 #define I40E_TLAN_HEAD_WB_STATUS_ECC_FIX_SHIFT          1
@@ -6546,7 +6895,7 @@
 #define I40E_TLAN_HEAD_WB_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TLAN_HEAD_WB_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TLAN_HEAD_WB_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TPB_CLID_MEM_CFG                    0x0009808C
+#define I40E_TPB_CLID_MEM_CFG                    0x0009808C /* Reset: POR */
 #define I40E_TPB_CLID_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TPB_CLID_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TPB_CLID_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TPB_CLID_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6568,7 +6917,7 @@
 #define I40E_TPB_CLID_MEM_CFG_RM_SHIFT           16
 #define I40E_TPB_CLID_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TPB_CLID_MEM_CFG_RM_SHIFT)
 
-#define I40E_TPB_CLID_MEM_DBG_CTL              0x000980C8
+#define I40E_TPB_CLID_MEM_DBG_CTL              0x000980C8 /* Reset: CORER */
 #define I40E_TPB_CLID_MEM_DBG_CTL_ADR_SHIFT    0
 #define I40E_TPB_CLID_MEM_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_TPB_CLID_MEM_DBG_CTL_ADR_SHIFT)
 #define I40E_TPB_CLID_MEM_DBG_CTL_DW_SEL_SHIFT 18
@@ -6578,11 +6927,11 @@
 #define I40E_TPB_CLID_MEM_DBG_CTL_DONE_SHIFT   31
 #define I40E_TPB_CLID_MEM_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_TPB_CLID_MEM_DBG_CTL_DONE_SHIFT)
 
-#define I40E_TPB_CLID_MEM_DBG_DATA             0x000980D4
+#define I40E_TPB_CLID_MEM_DBG_DATA             0x000980D4 /* Reset: CORER */
 #define I40E_TPB_CLID_MEM_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_TPB_CLID_MEM_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_TPB_CLID_MEM_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_TPB_CLID_MEM_STATUS                        0x00098090
+#define I40E_TPB_CLID_MEM_STATUS                        0x00098090 /* Reset: POR */
 #define I40E_TPB_CLID_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TPB_CLID_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TPB_CLID_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TPB_CLID_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6592,7 +6941,7 @@
 #define I40E_TPB_CLID_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TPB_CLID_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TPB_CLID_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TPB_DBG_FEAT                     0x00098084
+#define I40E_TPB_DBG_FEAT                     0x00098084 /* Reset: CORER */
 #define I40E_TPB_DBG_FEAT_DIS_MIB_SHIFT       0
 #define I40E_TPB_DBG_FEAT_DIS_MIB_MASK        I40E_MASK(0xF, I40E_TPB_DBG_FEAT_DIS_MIB_SHIFT)
 #define I40E_TPB_DBG_FEAT_FORCE_FC_IND_SHIFT  4
@@ -6602,19 +6951,19 @@
 #define I40E_TPB_DBG_FEAT_DIS_BURST_CTL_SHIFT 12
 #define I40E_TPB_DBG_FEAT_DIS_BURST_CTL_MASK  I40E_MASK(0xF, I40E_TPB_DBG_FEAT_DIS_BURST_CTL_SHIFT)
 
-#define I40E_TPB_ECC_COR_ERR           0x000980B8
+#define I40E_TPB_ECC_COR_ERR           0x000980B8 /* Reset: POR */
 #define I40E_TPB_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_TPB_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_TPB_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_TPB_ECC_UNCOR_ERR           0x000980B4
+#define I40E_TPB_ECC_UNCOR_ERR           0x000980B4 /* Reset: POR */
 #define I40E_TPB_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_TPB_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_TPB_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_TPB_FC_OVR                  0x00098088
+#define I40E_TPB_FC_OVR                  0x00098088 /* Reset: CORER */
 #define I40E_TPB_FC_OVR_TPB_FC_OVR_SHIFT 0
 #define I40E_TPB_FC_OVR_TPB_FC_OVR_MASK  I40E_MASK(0xFFFFFFFF, I40E_TPB_FC_OVR_TPB_FC_OVR_SHIFT)
 
-#define I40E_TPB_PKT_MEM_CFG                    0x00098094
+#define I40E_TPB_PKT_MEM_CFG                    0x00098094 /* Reset: POR */
 #define I40E_TPB_PKT_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TPB_PKT_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TPB_PKT_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TPB_PKT_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6636,7 +6985,7 @@
 #define I40E_TPB_PKT_MEM_CFG_RM_SHIFT           16
 #define I40E_TPB_PKT_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TPB_PKT_MEM_CFG_RM_SHIFT)
 
-#define I40E_TPB_PKT_MEM_DBG_CTL              0x000980CC
+#define I40E_TPB_PKT_MEM_DBG_CTL              0x000980CC /* Reset: CORER */
 #define I40E_TPB_PKT_MEM_DBG_CTL_ADR_SHIFT    0
 #define I40E_TPB_PKT_MEM_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_TPB_PKT_MEM_DBG_CTL_ADR_SHIFT)
 #define I40E_TPB_PKT_MEM_DBG_CTL_DW_SEL_SHIFT 18
@@ -6646,11 +6995,11 @@
 #define I40E_TPB_PKT_MEM_DBG_CTL_DONE_SHIFT   31
 #define I40E_TPB_PKT_MEM_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_TPB_PKT_MEM_DBG_CTL_DONE_SHIFT)
 
-#define I40E_TPB_PKT_MEM_DBG_DATA             0x000980E0
+#define I40E_TPB_PKT_MEM_DBG_DATA             0x000980E0 /* Reset: CORER */
 #define I40E_TPB_PKT_MEM_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_TPB_PKT_MEM_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_TPB_PKT_MEM_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_TPB_PKT_MEM_STATUS                        0x00098098
+#define I40E_TPB_PKT_MEM_STATUS                        0x00098098 /* Reset: POR */
 #define I40E_TPB_PKT_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TPB_PKT_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TPB_PKT_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TPB_PKT_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6660,7 +7009,7 @@
 #define I40E_TPB_PKT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TPB_PKT_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TPB_PKT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TPB_REPORT_LL_MEM_CFG                    0x0009809C
+#define I40E_TPB_REPORT_LL_MEM_CFG                    0x0009809C /* Reset: POR */
 #define I40E_TPB_REPORT_LL_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TPB_REPORT_LL_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TPB_REPORT_LL_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TPB_REPORT_LL_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6682,7 +7031,7 @@
 #define I40E_TPB_REPORT_LL_MEM_CFG_RM_SHIFT           16
 #define I40E_TPB_REPORT_LL_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TPB_REPORT_LL_MEM_CFG_RM_SHIFT)
 
-#define I40E_TPB_REPORT_LL_MEM_DBG_CTL              0x000980C0
+#define I40E_TPB_REPORT_LL_MEM_DBG_CTL              0x000980C0 /* Reset: CORER */
 #define I40E_TPB_REPORT_LL_MEM_DBG_CTL_ADR_SHIFT    0
 #define I40E_TPB_REPORT_LL_MEM_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_TPB_REPORT_LL_MEM_DBG_CTL_ADR_SHIFT)
 #define I40E_TPB_REPORT_LL_MEM_DBG_CTL_DW_SEL_SHIFT 18
@@ -6692,11 +7041,11 @@
 #define I40E_TPB_REPORT_LL_MEM_DBG_CTL_DONE_SHIFT   31
 #define I40E_TPB_REPORT_LL_MEM_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_TPB_REPORT_LL_MEM_DBG_CTL_DONE_SHIFT)
 
-#define I40E_TPB_REPORT_LL_MEM_DBG_DATA             0x000980D8
+#define I40E_TPB_REPORT_LL_MEM_DBG_DATA             0x000980D8 /* Reset: CORER */
 #define I40E_TPB_REPORT_LL_MEM_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_TPB_REPORT_LL_MEM_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_TPB_REPORT_LL_MEM_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_TPB_REPORT_LL_MEM_STATUS                        0x000980A0
+#define I40E_TPB_REPORT_LL_MEM_STATUS                        0x000980A0 /* Reset: POR */
 #define I40E_TPB_REPORT_LL_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TPB_REPORT_LL_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TPB_REPORT_LL_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TPB_REPORT_LL_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6706,7 +7055,7 @@
 #define I40E_TPB_REPORT_LL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TPB_REPORT_LL_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TPB_REPORT_LL_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TPB_REPORT_MEM_CFG                    0x000980A4
+#define I40E_TPB_REPORT_MEM_CFG                    0x000980A4 /* Reset: POR */
 #define I40E_TPB_REPORT_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TPB_REPORT_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TPB_REPORT_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TPB_REPORT_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6728,7 +7077,7 @@
 #define I40E_TPB_REPORT_MEM_CFG_RM_SHIFT           16
 #define I40E_TPB_REPORT_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TPB_REPORT_MEM_CFG_RM_SHIFT)
 
-#define I40E_TPB_REPORT_MEM_DBG_CTL              0x000980C4
+#define I40E_TPB_REPORT_MEM_DBG_CTL              0x000980C4 /* Reset: CORER */
 #define I40E_TPB_REPORT_MEM_DBG_CTL_ADR_SHIFT    0
 #define I40E_TPB_REPORT_MEM_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_TPB_REPORT_MEM_DBG_CTL_ADR_SHIFT)
 #define I40E_TPB_REPORT_MEM_DBG_CTL_DW_SEL_SHIFT 18
@@ -6738,11 +7087,11 @@
 #define I40E_TPB_REPORT_MEM_DBG_CTL_DONE_SHIFT   31
 #define I40E_TPB_REPORT_MEM_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_TPB_REPORT_MEM_DBG_CTL_DONE_SHIFT)
 
-#define I40E_TPB_REPORT_MEM_DBG_DATA             0x000980DC
+#define I40E_TPB_REPORT_MEM_DBG_DATA             0x000980DC /* Reset: CORER */
 #define I40E_TPB_REPORT_MEM_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_TPB_REPORT_MEM_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_TPB_REPORT_MEM_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_TPB_REPORT_MEM_STATUS                        0x000980A8
+#define I40E_TPB_REPORT_MEM_STATUS                        0x000980A8 /* Reset: POR */
 #define I40E_TPB_REPORT_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TPB_REPORT_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TPB_REPORT_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TPB_REPORT_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6752,7 +7101,7 @@
 #define I40E_TPB_REPORT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TPB_REPORT_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TPB_REPORT_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TPB_RPB_BUFF_MEM_CFG                    0x000980AC
+#define I40E_TPB_RPB_BUFF_MEM_CFG                    0x000980AC /* Reset: POR */
 #define I40E_TPB_RPB_BUFF_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_TPB_RPB_BUFF_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TPB_RPB_BUFF_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_TPB_RPB_BUFF_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -6774,7 +7123,7 @@
 #define I40E_TPB_RPB_BUFF_MEM_CFG_RM_SHIFT           16
 #define I40E_TPB_RPB_BUFF_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_TPB_RPB_BUFF_MEM_CFG_RM_SHIFT)
 
-#define I40E_TPB_RPB_BUFF_MEM_DBG_CTL              0x000980BC
+#define I40E_TPB_RPB_BUFF_MEM_DBG_CTL              0x000980BC /* Reset: CORER */
 #define I40E_TPB_RPB_BUFF_MEM_DBG_CTL_ADR_SHIFT    0
 #define I40E_TPB_RPB_BUFF_MEM_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_TPB_RPB_BUFF_MEM_DBG_CTL_ADR_SHIFT)
 #define I40E_TPB_RPB_BUFF_MEM_DBG_CTL_DW_SEL_SHIFT 18
@@ -6784,11 +7133,11 @@
 #define I40E_TPB_RPB_BUFF_MEM_DBG_CTL_DONE_SHIFT   31
 #define I40E_TPB_RPB_BUFF_MEM_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_TPB_RPB_BUFF_MEM_DBG_CTL_DONE_SHIFT)
 
-#define I40E_TPB_RPB_BUFF_MEM_DBG_DATA             0x000980D0
+#define I40E_TPB_RPB_BUFF_MEM_DBG_DATA             0x000980D0 /* Reset: CORER */
 #define I40E_TPB_RPB_BUFF_MEM_DBG_DATA_RD_DW_SHIFT 0
 #define I40E_TPB_RPB_BUFF_MEM_DBG_DATA_RD_DW_MASK  I40E_MASK(0xFFFFFFFF, I40E_TPB_RPB_BUFF_MEM_DBG_DATA_RD_DW_SHIFT)
 
-#define I40E_TPB_RPB_BUFF_MEM_STATUS                        0x000980B0
+#define I40E_TPB_RPB_BUFF_MEM_STATUS                        0x000980B0 /* Reset: POR */
 #define I40E_TPB_RPB_BUFF_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TPB_RPB_BUFF_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TPB_RPB_BUFF_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_TPB_RPB_BUFF_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -6798,7 +7147,7 @@
 #define I40E_TPB_RPB_BUFF_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TPB_RPB_BUFF_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TPB_RPB_BUFF_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TSCD_BRANCH_TABLE_CFG                    0x000B2218
+#define I40E_TSCD_BRANCH_TABLE_CFG                    0x000B2218 /* Reset: POR */
 #define I40E_TSCD_BRANCH_TABLE_CFG_ECC_EN_SHIFT       0
 #define I40E_TSCD_BRANCH_TABLE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TSCD_BRANCH_TABLE_CFG_ECC_EN_SHIFT)
 #define I40E_TSCD_BRANCH_TABLE_CFG_ECC_INVERT_1_SHIFT 1
@@ -6820,7 +7169,7 @@
 #define I40E_TSCD_BRANCH_TABLE_CFG_RM_SHIFT           16
 #define I40E_TSCD_BRANCH_TABLE_CFG_RM_MASK            I40E_MASK(0xF, I40E_TSCD_BRANCH_TABLE_CFG_RM_SHIFT)
 
-#define I40E_TSCD_BRANCH_TABLE_STATUS                        0x000B2230
+#define I40E_TSCD_BRANCH_TABLE_STATUS                        0x000B2230 /* Reset: POR */
 #define I40E_TSCD_BRANCH_TABLE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TSCD_BRANCH_TABLE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TSCD_BRANCH_TABLE_STATUS_ECC_ERR_SHIFT)
 #define I40E_TSCD_BRANCH_TABLE_STATUS_ECC_FIX_SHIFT          1
@@ -6830,7 +7179,7 @@
 #define I40E_TSCD_BRANCH_TABLE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TSCD_BRANCH_TABLE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TSCD_BRANCH_TABLE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TSCD_BW_LIMIT_TABLE_CFG                    0x000B2204
+#define I40E_TSCD_BW_LIMIT_TABLE_CFG                    0x000B2204 /* Reset: POR */
 #define I40E_TSCD_BW_LIMIT_TABLE_CFG_ECC_EN_SHIFT       0
 #define I40E_TSCD_BW_LIMIT_TABLE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TSCD_BW_LIMIT_TABLE_CFG_ECC_EN_SHIFT)
 #define I40E_TSCD_BW_LIMIT_TABLE_CFG_ECC_INVERT_1_SHIFT 1
@@ -6856,7 +7205,7 @@
 #define I40E_TSCD_BW_LIMIT_TABLE_CFG_RM_B_SHIFT         20
 #define I40E_TSCD_BW_LIMIT_TABLE_CFG_RM_B_MASK          I40E_MASK(0xF, I40E_TSCD_BW_LIMIT_TABLE_CFG_RM_B_SHIFT)
 
-#define I40E_TSCD_BW_LIMIT_TABLE_STATUS                        0x000B2228
+#define I40E_TSCD_BW_LIMIT_TABLE_STATUS                        0x000B2228 /* Reset: POR */
 #define I40E_TSCD_BW_LIMIT_TABLE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TSCD_BW_LIMIT_TABLE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TSCD_BW_LIMIT_TABLE_STATUS_ECC_ERR_SHIFT)
 #define I40E_TSCD_BW_LIMIT_TABLE_STATUS_ECC_FIX_SHIFT          1
@@ -6866,15 +7215,15 @@
 #define I40E_TSCD_BW_LIMIT_TABLE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TSCD_BW_LIMIT_TABLE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TSCD_BW_LIMIT_TABLE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TSCD_ECC_COR_ERR           0x000B223c
+#define I40E_TSCD_ECC_COR_ERR           0x000B223c /* Reset: POR */
 #define I40E_TSCD_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_TSCD_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_TSCD_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_TSCD_ECC_UNCOR_ERR           0x000B2238
+#define I40E_TSCD_ECC_UNCOR_ERR           0x000B2238 /* Reset: POR */
 #define I40E_TSCD_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_TSCD_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_TSCD_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_TSCD_NEXT_NODE_TABLE_CFG                    0x000B220C
+#define I40E_TSCD_NEXT_NODE_TABLE_CFG                    0x000B220C /* Reset: POR */
 #define I40E_TSCD_NEXT_NODE_TABLE_CFG_ECC_EN_SHIFT       0
 #define I40E_TSCD_NEXT_NODE_TABLE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TSCD_NEXT_NODE_TABLE_CFG_ECC_EN_SHIFT)
 #define I40E_TSCD_NEXT_NODE_TABLE_CFG_ECC_INVERT_1_SHIFT 1
@@ -6896,7 +7245,7 @@
 #define I40E_TSCD_NEXT_NODE_TABLE_CFG_RM_SHIFT           16
 #define I40E_TSCD_NEXT_NODE_TABLE_CFG_RM_MASK            I40E_MASK(0xF, I40E_TSCD_NEXT_NODE_TABLE_CFG_RM_SHIFT)
 
-#define I40E_TSCD_NEXT_NODE_TABLE_STATUS                        0x000B222c
+#define I40E_TSCD_NEXT_NODE_TABLE_STATUS                        0x000B222c /* Reset: POR */
 #define I40E_TSCD_NEXT_NODE_TABLE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TSCD_NEXT_NODE_TABLE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TSCD_NEXT_NODE_TABLE_STATUS_ECC_ERR_SHIFT)
 #define I40E_TSCD_NEXT_NODE_TABLE_STATUS_ECC_FIX_SHIFT          1
@@ -6906,7 +7255,7 @@
 #define I40E_TSCD_NEXT_NODE_TABLE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TSCD_NEXT_NODE_TABLE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TSCD_NEXT_NODE_TABLE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TSCD_NODE_TABLE_CFG                    0x000B2210
+#define I40E_TSCD_NODE_TABLE_CFG                    0x000B2210 /* Reset: POR */
 #define I40E_TSCD_NODE_TABLE_CFG_ECC_EN_SHIFT       0
 #define I40E_TSCD_NODE_TABLE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TSCD_NODE_TABLE_CFG_ECC_EN_SHIFT)
 #define I40E_TSCD_NODE_TABLE_CFG_ECC_INVERT_1_SHIFT 1
@@ -6928,7 +7277,7 @@
 #define I40E_TSCD_NODE_TABLE_CFG_RM_SHIFT           16
 #define I40E_TSCD_NODE_TABLE_CFG_RM_MASK            I40E_MASK(0xF, I40E_TSCD_NODE_TABLE_CFG_RM_SHIFT)
 
-#define I40E_TSCD_NODE_TABLE_STATUS                        0x000B2220
+#define I40E_TSCD_NODE_TABLE_STATUS                        0x000B2220 /* Reset: POR */
 #define I40E_TSCD_NODE_TABLE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TSCD_NODE_TABLE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TSCD_NODE_TABLE_STATUS_ECC_ERR_SHIFT)
 #define I40E_TSCD_NODE_TABLE_STATUS_ECC_FIX_SHIFT          1
@@ -6938,7 +7287,7 @@
 #define I40E_TSCD_NODE_TABLE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TSCD_NODE_TABLE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TSCD_NODE_TABLE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TSCD_RL_MAP_TABLE_CFG                    0x000B2214
+#define I40E_TSCD_RL_MAP_TABLE_CFG                    0x000B2214 /* Reset: POR */
 #define I40E_TSCD_RL_MAP_TABLE_CFG_ECC_EN_SHIFT       0
 #define I40E_TSCD_RL_MAP_TABLE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TSCD_RL_MAP_TABLE_CFG_ECC_EN_SHIFT)
 #define I40E_TSCD_RL_MAP_TABLE_CFG_ECC_INVERT_1_SHIFT 1
@@ -6960,7 +7309,7 @@
 #define I40E_TSCD_RL_MAP_TABLE_CFG_RM_SHIFT           16
 #define I40E_TSCD_RL_MAP_TABLE_CFG_RM_MASK            I40E_MASK(0xF, I40E_TSCD_RL_MAP_TABLE_CFG_RM_SHIFT)
 
-#define I40E_TSCD_RL_MAP_TABLE_STATUS                        0x000B2224
+#define I40E_TSCD_RL_MAP_TABLE_STATUS                        0x000B2224 /* Reset: POR */
 #define I40E_TSCD_RL_MAP_TABLE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TSCD_RL_MAP_TABLE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TSCD_RL_MAP_TABLE_STATUS_ECC_ERR_SHIFT)
 #define I40E_TSCD_RL_MAP_TABLE_STATUS_ECC_FIX_SHIFT          1
@@ -6970,7 +7319,7 @@
 #define I40E_TSCD_RL_MAP_TABLE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TSCD_RL_MAP_TABLE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TSCD_RL_MAP_TABLE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TSCD_SHARED_BW_LIMIT_TABLE_CFG                    0x000B2200
+#define I40E_TSCD_SHARED_BW_LIMIT_TABLE_CFG                    0x000B2200 /* Reset: POR */
 #define I40E_TSCD_SHARED_BW_LIMIT_TABLE_CFG_ECC_EN_SHIFT       0
 #define I40E_TSCD_SHARED_BW_LIMIT_TABLE_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_TSCD_SHARED_BW_LIMIT_TABLE_CFG_ECC_EN_SHIFT)
 #define I40E_TSCD_SHARED_BW_LIMIT_TABLE_CFG_ECC_INVERT_1_SHIFT 1
@@ -6992,7 +7341,7 @@
 #define I40E_TSCD_SHARED_BW_LIMIT_TABLE_CFG_RM_SHIFT           16
 #define I40E_TSCD_SHARED_BW_LIMIT_TABLE_CFG_RM_MASK            I40E_MASK(0xF, I40E_TSCD_SHARED_BW_LIMIT_TABLE_CFG_RM_SHIFT)
 
-#define I40E_TSCD_SHARED_BW_LIMIT_TABLE_STATUS                        0x000B2234
+#define I40E_TSCD_SHARED_BW_LIMIT_TABLE_STATUS                        0x000B2234 /* Reset: POR */
 #define I40E_TSCD_SHARED_BW_LIMIT_TABLE_STATUS_ECC_ERR_SHIFT          0
 #define I40E_TSCD_SHARED_BW_LIMIT_TABLE_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_TSCD_SHARED_BW_LIMIT_TABLE_STATUS_ECC_ERR_SHIFT)
 #define I40E_TSCD_SHARED_BW_LIMIT_TABLE_STATUS_ECC_FIX_SHIFT          1
@@ -7002,19 +7351,19 @@
 #define I40E_TSCD_SHARED_BW_LIMIT_TABLE_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_TSCD_SHARED_BW_LIMIT_TABLE_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_TSCD_SHARED_BW_LIMIT_TABLE_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_TXDBG_GL_CNTRL                  0x000BC000
+#define I40E_TXDBG_GL_CNTRL                  0x000BC000 /* Reset: CORER */
 #define I40E_TXDBG_GL_CNTRL_TXDBG_MODE_SHIFT 0
 #define I40E_TXDBG_GL_CNTRL_TXDBG_MODE_MASK  I40E_MASK(0x7, I40E_TXDBG_GL_CNTRL_TXDBG_MODE_SHIFT)
 
-#define I40E_TXDBG_RD_ENTITY              0x000BC004
+#define I40E_TXDBG_RD_ENTITY              0x000BC004 /* Reset: CORER */
 #define I40E_TXDBG_RD_ENTITY_RD_LOG_SHIFT 0
 #define I40E_TXDBG_RD_ENTITY_RD_LOG_MASK  I40E_MASK(0xFFFFFFFF, I40E_TXDBG_RD_ENTITY_RD_LOG_SHIFT)
 
-#define I40E_TXDBG_RD_ENTITY_CNTRL                     0x000BC008
+#define I40E_TXDBG_RD_ENTITY_CNTRL                     0x000BC008 /* Reset: CORER */
 #define I40E_TXDBG_RD_ENTITY_CNTRL_RD_ENTITY_NUM_SHIFT 0
 #define I40E_TXDBG_RD_ENTITY_CNTRL_RD_ENTITY_NUM_MASK  I40E_MASK(0xFFF, I40E_TXDBG_RD_ENTITY_CNTRL_RD_ENTITY_NUM_SHIFT)
 
-#define I40E_TXUPDBG_ITR_CAUSE_CTL                      0x000E0018
+#define I40E_TXUPDBG_ITR_CAUSE_CTL                      0x000E0018 /* Reset: CORER */
 #define I40E_TXUPDBG_ITR_CAUSE_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_ITR_CAUSE_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_ITR_CAUSE_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_ITR_CAUSE_CTL_FLOW_ID_SHIFT        1
@@ -7022,7 +7371,7 @@
 #define I40E_TXUPDBG_ITR_CAUSE_CTL_EVENT_ID_SHIFT       13
 #define I40E_TXUPDBG_ITR_CAUSE_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_ITR_CAUSE_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_ITR_DONE_CTL                      0x000E0020
+#define I40E_TXUPDBG_ITR_DONE_CTL                      0x000E0020 /* Reset: CORER */
 #define I40E_TXUPDBG_ITR_DONE_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_ITR_DONE_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_ITR_DONE_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_ITR_DONE_CTL_FLOW_ID_SHIFT        1
@@ -7030,7 +7379,7 @@
 #define I40E_TXUPDBG_ITR_DONE_CTL_EVENT_ID_SHIFT       13
 #define I40E_TXUPDBG_ITR_DONE_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_ITR_DONE_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_ITR_EXP_CTL                      0x000E001C
+#define I40E_TXUPDBG_ITR_EXP_CTL                      0x000E001C /* Reset: CORER */
 #define I40E_TXUPDBG_ITR_EXP_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_ITR_EXP_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_ITR_EXP_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_ITR_EXP_CTL_FLOW_ID_SHIFT        1
@@ -7038,7 +7387,7 @@
 #define I40E_TXUPDBG_ITR_EXP_CTL_EVENT_ID_SHIFT       13
 #define I40E_TXUPDBG_ITR_EXP_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_ITR_EXP_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_MAC0IN_CTL                      0x000E2008
+#define I40E_TXUPDBG_MAC0IN_CTL                      0x000E2008 /* Reset: CORER */
 #define I40E_TXUPDBG_MAC0IN_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_MAC0IN_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_MAC0IN_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_MAC0IN_CTL_FLOW_ID_SHIFT        1
@@ -7046,7 +7395,7 @@
 #define I40E_TXUPDBG_MAC0IN_CTL_EVENT_ID_SHIFT       13
 #define I40E_TXUPDBG_MAC0IN_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_MAC0IN_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_MAC1IN_CTL                      0x000E200C
+#define I40E_TXUPDBG_MAC1IN_CTL                      0x000E200C /* Reset: CORER */
 #define I40E_TXUPDBG_MAC1IN_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_MAC1IN_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_MAC1IN_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_MAC1IN_CTL_FLOW_ID_SHIFT        1
@@ -7054,7 +7403,7 @@
 #define I40E_TXUPDBG_MAC1IN_CTL_EVENT_ID_SHIFT       13
 #define I40E_TXUPDBG_MAC1IN_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_MAC1IN_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_MAC2IN_CTL                      0x000E2010
+#define I40E_TXUPDBG_MAC2IN_CTL                      0x000E2010 /* Reset: CORER */
 #define I40E_TXUPDBG_MAC2IN_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_MAC2IN_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_MAC2IN_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_MAC2IN_CTL_FLOW_ID_SHIFT        1
@@ -7062,7 +7411,7 @@
 #define I40E_TXUPDBG_MAC2IN_CTL_EVENT_ID_SHIFT       13
 #define I40E_TXUPDBG_MAC2IN_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_MAC2IN_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_MAC3IN_CTL                      0x000E2014
+#define I40E_TXUPDBG_MAC3IN_CTL                      0x000E2014 /* Reset: CORER */
 #define I40E_TXUPDBG_MAC3IN_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_MAC3IN_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_MAC3IN_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_MAC3IN_CTL_FLOW_ID_SHIFT        1
@@ -7070,7 +7419,7 @@
 #define I40E_TXUPDBG_MAC3IN_CTL_EVENT_ID_SHIFT       13
 #define I40E_TXUPDBG_MAC3IN_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_MAC3IN_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_MSIX_CTL                      0x000BC00C
+#define I40E_TXUPDBG_MSIX_CTL                      0x000BC00C /* Reset: CORER */
 #define I40E_TXUPDBG_MSIX_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_MSIX_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_MSIX_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_MSIX_CTL_FLOW_ID_SHIFT        1
@@ -7078,7 +7427,7 @@
 #define I40E_TXUPDBG_MSIX_CTL_EVENT_ID_SHIFT       13
 #define I40E_TXUPDBG_MSIX_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_MSIX_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_Q_SCHED_CTL                      0x000E000C
+#define I40E_TXUPDBG_Q_SCHED_CTL                      0x000E000C /* Reset: CORER */
 #define I40E_TXUPDBG_Q_SCHED_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_Q_SCHED_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_Q_SCHED_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_Q_SCHED_CTL_FLOW_ID_SHIFT        1
@@ -7088,7 +7437,7 @@
 #define I40E_TXUPDBG_Q_SCHED_CTL_EVENT_ID_SHIFT       15
 #define I40E_TXUPDBG_Q_SCHED_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_Q_SCHED_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_QG_SCHED_CTL                      0x000E0008
+#define I40E_TXUPDBG_QG_SCHED_CTL                      0x000E0008 /* Reset: CORER */
 #define I40E_TXUPDBG_QG_SCHED_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_QG_SCHED_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_QG_SCHED_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_QG_SCHED_CTL_FLOW_ID_SHIFT        1
@@ -7096,7 +7445,7 @@
 #define I40E_TXUPDBG_QG_SCHED_CTL_EVENT_ID_SHIFT       13
 #define I40E_TXUPDBG_QG_SCHED_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_QG_SCHED_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_TAIL_BUMP_CTL                      0x000E0000
+#define I40E_TXUPDBG_TAIL_BUMP_CTL                      0x000E0000 /* Reset: CORER */
 #define I40E_TXUPDBG_TAIL_BUMP_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_TAIL_BUMP_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_TAIL_BUMP_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_TAIL_BUMP_CTL_FLOW_ID_SHIFT        1
@@ -7104,7 +7453,7 @@
 #define I40E_TXUPDBG_TAIL_BUMP_CTL_EVENT_ID_SHIFT       13
 #define I40E_TXUPDBG_TAIL_BUMP_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_TAIL_BUMP_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_TCBIN_CTL                      0x000E0010
+#define I40E_TXUPDBG_TCBIN_CTL                      0x000E0010 /* Reset: CORER */
 #define I40E_TXUPDBG_TCBIN_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_TCBIN_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_TCBIN_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_TCBIN_CTL_FLOW_ID_SHIFT        1
@@ -7114,7 +7463,7 @@
 #define I40E_TXUPDBG_TCBIN_CTL_EVENT_ID_SHIFT       15
 #define I40E_TXUPDBG_TCBIN_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_TCBIN_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_TDPUIN_CTL                      0x000E2000
+#define I40E_TXUPDBG_TDPUIN_CTL                      0x000E2000 /* Reset: CORER */
 #define I40E_TXUPDBG_TDPUIN_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_TDPUIN_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_TDPUIN_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_TDPUIN_CTL_FLOW_ID_SHIFT        1
@@ -7124,7 +7473,7 @@
 #define I40E_TXUPDBG_TDPUIN_CTL_EVENT_ID_SHIFT       15
 #define I40E_TXUPDBG_TDPUIN_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_TDPUIN_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_TLAN2_CTL                      0x000E0014
+#define I40E_TXUPDBG_TLAN2_CTL                      0x000E0014 /* Reset: CORER */
 #define I40E_TXUPDBG_TLAN2_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_TLAN2_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_TLAN2_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_TLAN2_CTL_FLOW_ID_SHIFT        1
@@ -7136,7 +7485,7 @@
 #define I40E_TXUPDBG_TLAN2_CTL_EVENT_ID_B_SHIFT     18
 #define I40E_TXUPDBG_TLAN2_CTL_EVENT_ID_B_MASK      I40E_MASK(0x7, I40E_TXUPDBG_TLAN2_CTL_EVENT_ID_B_SHIFT)
 
-#define I40E_TXUPDBG_TPBIN_CTL                      0x000E2004
+#define I40E_TXUPDBG_TPBIN_CTL                      0x000E2004 /* Reset: CORER */
 #define I40E_TXUPDBG_TPBIN_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_TPBIN_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_TPBIN_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_TPBIN_CTL_FLOW_ID_SHIFT        1
@@ -7146,7 +7495,7 @@
 #define I40E_TXUPDBG_TPBIN_CTL_EVENT_ID_SHIFT       15
 #define I40E_TXUPDBG_TPBIN_CTL_EVENT_ID_MASK        I40E_MASK(0x7, I40E_TXUPDBG_TPBIN_CTL_EVENT_ID_SHIFT)
 
-#define I40E_TXUPDBG_WA_CTL                      0x000E0004
+#define I40E_TXUPDBG_WA_CTL                      0x000E0004 /* Reset: CORER */
 #define I40E_TXUPDBG_WA_CTL_FILTER_FLOW_EN_SHIFT 0
 #define I40E_TXUPDBG_WA_CTL_FILTER_FLOW_EN_MASK  I40E_MASK(0x1, I40E_TXUPDBG_WA_CTL_FILTER_FLOW_EN_SHIFT)
 #define I40E_TXUPDBG_WA_CTL_FLOW_ID_SHIFT        1
@@ -7156,7 +7505,7 @@
 #define I40E_TXUPDBG_WA_CTL_EVENT_ID_B_SHIFT     16
 #define I40E_TXUPDBG_WA_CTL_EVENT_ID_B_MASK      I40E_MASK(0x7, I40E_TXUPDBG_WA_CTL_EVENT_ID_B_SHIFT)
 
-#define I40E_WAIT_CMD_BUF_MEM_CFG                    0x000AE088
+#define I40E_WAIT_CMD_BUF_MEM_CFG                    0x000AE088 /* Reset: POR */
 #define I40E_WAIT_CMD_BUF_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_WAIT_CMD_BUF_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_WAIT_CMD_BUF_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_WAIT_CMD_BUF_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -7178,7 +7527,7 @@
 #define I40E_WAIT_CMD_BUF_MEM_CFG_RM_SHIFT           16
 #define I40E_WAIT_CMD_BUF_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_WAIT_CMD_BUF_MEM_CFG_RM_SHIFT)
 
-#define I40E_WAIT_CMD_BUF_MEM_STATUS                        0x000AE08C
+#define I40E_WAIT_CMD_BUF_MEM_STATUS                        0x000AE08C /* Reset: POR */
 #define I40E_WAIT_CMD_BUF_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_WAIT_CMD_BUF_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_WAIT_CMD_BUF_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_WAIT_CMD_BUF_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -7188,7 +7537,7 @@
 #define I40E_WAIT_CMD_BUF_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_WAIT_CMD_BUF_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_WAIT_CMD_BUF_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_WAIT_CMD_MNG_MEM_CFG                    0x000AE084
+#define I40E_WAIT_CMD_MNG_MEM_CFG                    0x000AE084 /* Reset: POR */
 #define I40E_WAIT_CMD_MNG_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_WAIT_CMD_MNG_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_WAIT_CMD_MNG_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_WAIT_CMD_MNG_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -7210,7 +7559,7 @@
 #define I40E_WAIT_CMD_MNG_MEM_CFG_RM_SHIFT           16
 #define I40E_WAIT_CMD_MNG_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_WAIT_CMD_MNG_MEM_CFG_RM_SHIFT)
 
-#define I40E_WAIT_CMD_MNG_MEM_STATUS                        0x000AE090
+#define I40E_WAIT_CMD_MNG_MEM_STATUS                        0x000AE090 /* Reset: POR */
 #define I40E_WAIT_CMD_MNG_MEM_STATUS_ECC_ERR_SHIFT          0
 #define I40E_WAIT_CMD_MNG_MEM_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_WAIT_CMD_MNG_MEM_STATUS_ECC_ERR_SHIFT)
 #define I40E_WAIT_CMD_MNG_MEM_STATUS_ECC_FIX_SHIFT          1
@@ -7220,15 +7569,15 @@
 #define I40E_WAIT_CMD_MNG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_WAIT_CMD_MNG_MEM_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_WAIT_CMD_MNG_MEM_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_WUC_ECC_COR_ERR           0x0006E8AC
+#define I40E_WUC_ECC_COR_ERR           0x0006E8AC /* Reset: POR */
 #define I40E_WUC_ECC_COR_ERR_CNT_SHIFT 0
 #define I40E_WUC_ECC_COR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_WUC_ECC_COR_ERR_CNT_SHIFT)
 
-#define I40E_WUC_ECC_UNCOR_ERR           0x0006E8A8
+#define I40E_WUC_ECC_UNCOR_ERR           0x0006E8A8 /* Reset: POR */
 #define I40E_WUC_ECC_UNCOR_ERR_CNT_SHIFT 0
 #define I40E_WUC_ECC_UNCOR_ERR_CNT_MASK  I40E_MASK(0xFFF, I40E_WUC_ECC_UNCOR_ERR_CNT_SHIFT)
 
-#define I40E_WUC_SP_FLEX_CFG                    0x0006E898
+#define I40E_WUC_SP_FLEX_CFG                    0x0006E898 /* Reset: POR */
 #define I40E_WUC_SP_FLEX_CFG_ECC_EN_SHIFT       0
 #define I40E_WUC_SP_FLEX_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_WUC_SP_FLEX_CFG_ECC_EN_SHIFT)
 #define I40E_WUC_SP_FLEX_CFG_ECC_INVERT_1_SHIFT 1
@@ -7250,7 +7599,7 @@
 #define I40E_WUC_SP_FLEX_CFG_RM_SHIFT           16
 #define I40E_WUC_SP_FLEX_CFG_RM_MASK            I40E_MASK(0xF, I40E_WUC_SP_FLEX_CFG_RM_SHIFT)
 
-#define I40E_WUC_SP_FLEX_MASK_MEM_CFG                    0x0006E890
+#define I40E_WUC_SP_FLEX_MASK_MEM_CFG                    0x0006E890 /* Reset: POR */
 #define I40E_WUC_SP_FLEX_MASK_MEM_CFG_ECC_EN_SHIFT       0
 #define I40E_WUC_SP_FLEX_MASK_MEM_CFG_ECC_EN_MASK        I40E_MASK(0x1, I40E_WUC_SP_FLEX_MASK_MEM_CFG_ECC_EN_SHIFT)
 #define I40E_WUC_SP_FLEX_MASK_MEM_CFG_ECC_INVERT_1_SHIFT 1
@@ -7272,7 +7621,7 @@
 #define I40E_WUC_SP_FLEX_MASK_MEM_CFG_RM_SHIFT           16
 #define I40E_WUC_SP_FLEX_MASK_MEM_CFG_RM_MASK            I40E_MASK(0xF, I40E_WUC_SP_FLEX_MASK_MEM_CFG_RM_SHIFT)
 
-#define I40E_WUC_SP_FLEX_MASK_STATUS                        0x0006E894
+#define I40E_WUC_SP_FLEX_MASK_STATUS                        0x0006E894 /* Reset: POR */
 #define I40E_WUC_SP_FLEX_MASK_STATUS_ECC_ERR_SHIFT          0
 #define I40E_WUC_SP_FLEX_MASK_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_WUC_SP_FLEX_MASK_STATUS_ECC_ERR_SHIFT)
 #define I40E_WUC_SP_FLEX_MASK_STATUS_ECC_FIX_SHIFT          1
@@ -7282,7 +7631,7 @@
 #define I40E_WUC_SP_FLEX_MASK_STATUS_GLOBAL_INIT_DONE_SHIFT 3
 #define I40E_WUC_SP_FLEX_MASK_STATUS_GLOBAL_INIT_DONE_MASK  I40E_MASK(0x1, I40E_WUC_SP_FLEX_MASK_STATUS_GLOBAL_INIT_DONE_SHIFT)
 
-#define I40E_WUC_SP_FLEX_STATUS                        0x0006E89C
+#define I40E_WUC_SP_FLEX_STATUS                        0x0006E89C /* Reset: POR */
 #define I40E_WUC_SP_FLEX_STATUS_ECC_ERR_SHIFT          0
 #define I40E_WUC_SP_FLEX_STATUS_ECC_ERR_MASK           I40E_MASK(0x1, I40E_WUC_SP_FLEX_STATUS_ECC_ERR_SHIFT)
 #define I40E_WUC_SP_FLEX_STATUS_ECC_FIX_SHIFT          1
@@ -7296,7 +7645,7 @@
 
 /* PF - Interrupt Registers */
 
-#define I40E_GLINT_CTL                        0x0003F800
+#define I40E_GLINT_CTL                        0x0003F800 /* Reset: CORER */
 #define I40E_GLINT_CTL_DIS_AUTOMASK_PF0_SHIFT 0
 #define I40E_GLINT_CTL_DIS_AUTOMASK_PF0_MASK  I40E_MASK(0x1, I40E_GLINT_CTL_DIS_AUTOMASK_PF0_SHIFT)
 #define I40E_GLINT_CTL_DIS_AUTOMASK_VF0_SHIFT 1
@@ -7304,7 +7653,7 @@
 #define I40E_GLINT_CTL_DIS_AUTOMASK_N_SHIFT   2
 #define I40E_GLINT_CTL_DIS_AUTOMASK_N_MASK    I40E_MASK(0x1, I40E_GLINT_CTL_DIS_AUTOMASK_N_SHIFT)
 
-#define I40E_PFINT_ITR0_STAT(_i)              (0x00038200 + ((_i) * 128)) /* _i=0...2 */
+#define I40E_PFINT_ITR0_STAT(_i)              (0x00038200 + ((_i) * 128)) /* _i=0...2 */ /* Reset: PFR */
 #define I40E_PFINT_ITR0_STAT_MAX_INDEX        2
 #define I40E_PFINT_ITR0_STAT_ITR_EXPIRE_SHIFT 0
 #define I40E_PFINT_ITR0_STAT_ITR_EXPIRE_MASK  I40E_MASK(0x1, I40E_PFINT_ITR0_STAT_ITR_EXPIRE_SHIFT)
@@ -7313,7 +7662,7 @@
 #define I40E_PFINT_ITR0_STAT_ITR_TIME_SHIFT   2
 #define I40E_PFINT_ITR0_STAT_ITR_TIME_MASK    I40E_MASK(0xFFF, I40E_PFINT_ITR0_STAT_ITR_TIME_SHIFT)
 
-#define I40E_PFINT_ITRN_STAT(_i, _INTPF)       (0x00032000 + ((_i) * 2048 + (_INTPF) * 4)) /* _i=0...2, _INTPF=0...511 */
+#define I40E_PFINT_ITRN_STAT(_i, _INTPF)       (0x00032000 + ((_i) * 2048 + (_INTPF) * 4)) /* _i=0...2, _INTPF=0...511 */ /* Reset: PFR */
 #define I40E_PFINT_ITRN_STAT_MAX_INDEX        2
 #define I40E_PFINT_ITRN_STAT_ITR_EXPIRE_SHIFT 0
 #define I40E_PFINT_ITRN_STAT_ITR_EXPIRE_MASK  I40E_MASK(0x1, I40E_PFINT_ITRN_STAT_ITR_EXPIRE_SHIFT)
@@ -7322,20 +7671,20 @@
 #define I40E_PFINT_ITRN_STAT_ITR_TIME_SHIFT   2
 #define I40E_PFINT_ITRN_STAT_ITR_TIME_MASK    I40E_MASK(0xFFF, I40E_PFINT_ITRN_STAT_ITR_TIME_SHIFT)
 
-#define I40E_PFINT_RATE0_STAT                  0x00038600
+#define I40E_PFINT_RATE0_STAT                  0x00038600 /* Reset: PFR */
 #define I40E_PFINT_RATE0_STAT_CREDIT_SHIFT     0
 #define I40E_PFINT_RATE0_STAT_CREDIT_MASK      I40E_MASK(0xF, I40E_PFINT_RATE0_STAT_CREDIT_SHIFT)
 #define I40E_PFINT_RATE0_STAT_INTRL_TIME_SHIFT 4
 #define I40E_PFINT_RATE0_STAT_INTRL_TIME_MASK  I40E_MASK(0x3F, I40E_PFINT_RATE0_STAT_INTRL_TIME_SHIFT)
 
-#define I40E_PFINT_RATEN_STAT(_INTPF)          (0x00036000 + ((_INTPF) * 4)) /* _i=0...511 */
+#define I40E_PFINT_RATEN_STAT(_INTPF)          (0x00036000 + ((_INTPF) * 4)) /* _i=0...511 */ /* Reset: PFR */
 #define I40E_PFINT_RATEN_STAT_MAX_INDEX        511
 #define I40E_PFINT_RATEN_STAT_CREDIT_SHIFT     0
 #define I40E_PFINT_RATEN_STAT_CREDIT_MASK      I40E_MASK(0xF, I40E_PFINT_RATEN_STAT_CREDIT_SHIFT)
 #define I40E_PFINT_RATEN_STAT_INTRL_TIME_SHIFT 4
 #define I40E_PFINT_RATEN_STAT_INTRL_TIME_MASK  I40E_MASK(0x3F, I40E_PFINT_RATEN_STAT_INTRL_TIME_SHIFT)
 
-#define I40E_VFINT_ITR0_STAT(_i, _VF)          (0x00029000 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...2, _VF=0...127 */
+#define I40E_VFINT_ITR0_STAT(_i, _VF)          (0x00029000 + ((_i) * 1024 + (_VF) * 4)) /* _i=0...2, _VF=0...127 */ /* Reset: VFR */
 #define I40E_VFINT_ITR0_STAT_MAX_INDEX        2
 #define I40E_VFINT_ITR0_STAT_ITR_EXPIRE_SHIFT 0
 #define I40E_VFINT_ITR0_STAT_ITR_EXPIRE_MASK  I40E_MASK(0x1, I40E_VFINT_ITR0_STAT_ITR_EXPIRE_SHIFT)
@@ -7344,7 +7693,7 @@
 #define I40E_VFINT_ITR0_STAT_ITR_TIME_SHIFT   2
 #define I40E_VFINT_ITR0_STAT_ITR_TIME_MASK    I40E_MASK(0xFFF, I40E_VFINT_ITR0_STAT_ITR_TIME_SHIFT)
 
-#define I40E_VFINT_ITRN_STAT(_i, _INTVF)       (0x00022000 + ((_i) * 2048 + (_INTVF) * 4)) /* _i=0...2, _INTVF=0...511 */
+#define I40E_VFINT_ITRN_STAT(_i, _INTVF)       (0x00022000 + ((_i) * 2048 + (_INTVF) * 4)) /* _i=0...2, _INTVF=0...511 */ /* Reset: VFR */
 #define I40E_VFINT_ITRN_STAT_MAX_INDEX        2
 #define I40E_VFINT_ITRN_STAT_ITR_EXPIRE_SHIFT 0
 #define I40E_VFINT_ITRN_STAT_ITR_EXPIRE_MASK  I40E_MASK(0x1, I40E_VFINT_ITRN_STAT_ITR_EXPIRE_SHIFT)
@@ -7353,14 +7702,14 @@
 #define I40E_VFINT_ITRN_STAT_ITR_TIME_SHIFT   2
 #define I40E_VFINT_ITRN_STAT_ITR_TIME_MASK    I40E_MASK(0xFFF, I40E_VFINT_ITRN_STAT_ITR_TIME_SHIFT)
 
-#define I40E_VFINT_RATE0_STAT(_VF)             (0x0002B000 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VFINT_RATE0_STAT(_VF)             (0x0002B000 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: VFR */
 #define I40E_VFINT_RATE0_STAT_MAX_INDEX        127
 #define I40E_VFINT_RATE0_STAT_CREDIT_SHIFT     0
 #define I40E_VFINT_RATE0_STAT_CREDIT_MASK      I40E_MASK(0xF, I40E_VFINT_RATE0_STAT_CREDIT_SHIFT)
 #define I40E_VFINT_RATE0_STAT_INTRL_TIME_SHIFT 4
 #define I40E_VFINT_RATE0_STAT_INTRL_TIME_MASK  I40E_MASK(0x3F, I40E_VFINT_RATE0_STAT_INTRL_TIME_SHIFT)
 
-#define I40E_VFINT_RATEN_STAT(_INTVF)          (0x00026000 + ((_INTVF) * 4)) /* _i=0...511 */
+#define I40E_VFINT_RATEN_STAT(_INTVF)          (0x00026000 + ((_INTVF) * 4)) /* _i=0...511 */ /* Reset: VFR */
 #define I40E_VFINT_RATEN_STAT_MAX_INDEX        511
 #define I40E_VFINT_RATEN_STAT_CREDIT_SHIFT     0
 #define I40E_VFINT_RATEN_STAT_CREDIT_MASK      I40E_MASK(0xF, I40E_VFINT_RATEN_STAT_CREDIT_SHIFT)
@@ -7369,12 +7718,12 @@
 
 /* PF - LAN Transmit Receive Registers */
 
-#define I40E_GLLAN_PF_RECIPE(_i)          (0x0012A5E0 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLLAN_PF_RECIPE(_i)          (0x0012A5E0 + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLLAN_PF_RECIPE_MAX_INDEX    15
 #define I40E_GLLAN_PF_RECIPE_RECIPE_SHIFT 0
 #define I40E_GLLAN_PF_RECIPE_RECIPE_MASK  I40E_MASK(0x3, I40E_GLLAN_PF_RECIPE_RECIPE_SHIFT)
 
-#define I40E_GLLAN_RCTL_1                       0x0012A504
+#define I40E_GLLAN_RCTL_1                       0x0012A504 /* Reset: CORER */
 #define I40E_GLLAN_RCTL_1_RXMAX_EXPANSION_SHIFT 12
 #define I40E_GLLAN_RCTL_1_RXMAX_EXPANSION_MASK  I40E_MASK(0xF, I40E_GLLAN_RCTL_1_RXMAX_EXPANSION_SHIFT)
 #define I40E_GLLAN_RCTL_1_RXDWBCTL_SHIFT        16
@@ -7386,13 +7735,13 @@
 #define I40E_GLLAN_RCTL_1_RXDATAWRROEN_SHIFT    19
 #define I40E_GLLAN_RCTL_1_RXDATAWRROEN_MASK     I40E_MASK(0x1, I40E_GLLAN_RCTL_1_RXDATAWRROEN_SHIFT)
 
-#define I40E_GLLAN_TCTL_0                    0x000E6488
+#define I40E_GLLAN_TCTL_0                    0x000E6488 /* Reset: CORER */
 #define I40E_GLLAN_TCTL_0_TXLANTH_SHIFT      0
 #define I40E_GLLAN_TCTL_0_TXLANTH_MASK       I40E_MASK(0x3F, I40E_GLLAN_TCTL_0_TXLANTH_SHIFT)
 #define I40E_GLLAN_TCTL_0_TXDESCRDROEN_SHIFT 6
 #define I40E_GLLAN_TCTL_0_TXDESCRDROEN_MASK  I40E_MASK(0x1, I40E_GLLAN_TCTL_0_TXDESCRDROEN_SHIFT)
 
-#define I40E_GLLAN_TCTL_1                        0x000442F0
+#define I40E_GLLAN_TCTL_1                        0x000442F0 /* Reset: CORER */
 #define I40E_GLLAN_TCTL_1_TXMAX_EXPANSION_SHIFT  0
 #define I40E_GLLAN_TCTL_1_TXMAX_EXPANSION_MASK   I40E_MASK(0xF, I40E_GLLAN_TCTL_1_TXMAX_EXPANSION_SHIFT)
 #define I40E_GLLAN_TCTL_1_TXDATARDROEN_SHIFT     4
@@ -7414,7 +7763,7 @@
 #define I40E_GLLAN_TCTL_1_DBG_ECO_SHIFT          24
 #define I40E_GLLAN_TCTL_1_DBG_ECO_MASK           I40E_MASK(0xFF, I40E_GLLAN_TCTL_1_DBG_ECO_SHIFT)
 
-#define I40E_GLLAN_TCTL_2                       0x000AE080
+#define I40E_GLLAN_TCTL_2                       0x000AE080 /* Reset: CORER */
 #define I40E_GLLAN_TCTL_2_TXMAX_EXPANSION_SHIFT 0
 #define I40E_GLLAN_TCTL_2_TXMAX_EXPANSION_MASK  I40E_MASK(0xF, I40E_GLLAN_TCTL_2_TXMAX_EXPANSION_SHIFT)
 #define I40E_GLLAN_TCTL_2_STAT_DBG_ADDR_SHIFT   4
@@ -7424,60 +7773,60 @@
 #define I40E_GLLAN_TCTL_2_ECO_SHIFT             12
 #define I40E_GLLAN_TCTL_2_ECO_MASK              I40E_MASK(0xFFFFF, I40E_GLLAN_TCTL_2_ECO_SHIFT)
 
-#define I40E_GLLAN_TXEMP_EN                 0x000AE0AC
+#define I40E_GLLAN_TXEMP_EN                 0x000AE0AC /* Reset: CORER */
 #define I40E_GLLAN_TXEMP_EN_TXHOST_EN_SHIFT 0
 #define I40E_GLLAN_TXEMP_EN_TXHOST_EN_MASK  I40E_MASK(0x1, I40E_GLLAN_TXEMP_EN_TXHOST_EN_SHIFT)
 
-#define I40E_GLLAN_TXHOST_EN                 0x000A2208
+#define I40E_GLLAN_TXHOST_EN                 0x000A2208 /* Reset: CORER */
 #define I40E_GLLAN_TXHOST_EN_TXHOST_EN_SHIFT 0
 #define I40E_GLLAN_TXHOST_EN_TXHOST_EN_MASK  I40E_MASK(0x1, I40E_GLLAN_TXHOST_EN_TXHOST_EN_SHIFT)
 
-#define I40E_GLRCU_INDIRECT_ADDRESS                              0x001C0AA4
+#define I40E_GLRCU_INDIRECT_ADDRESS                              0x001C0AA4 /* Reset: CORER */
 #define I40E_GLRCU_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_SHIFT 0
 #define I40E_GLRCU_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_MASK  I40E_MASK(0xFFFF, I40E_GLRCU_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_SHIFT)
 
-#define I40E_GLRCU_INDIRECT_DATA(_i)                       (0x001C0AA8 + ((_i) * 4)) /* _i=0...1 */
+#define I40E_GLRCU_INDIRECT_DATA(_i)                       (0x001C0AA8 + ((_i) * 4)) /* _i=0...1 */ /* Reset: CORER */
 #define I40E_GLRCU_INDIRECT_DATA_MAX_INDEX                 1
 #define I40E_GLRCU_INDIRECT_DATA_GLRCU_INDIRECT_DATA_SHIFT 0
 #define I40E_GLRCU_INDIRECT_DATA_GLRCU_INDIRECT_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCU_INDIRECT_DATA_GLRCU_INDIRECT_DATA_SHIFT)
 
-#define I40E_GLRCU_LB_INDIRECT_ADDRESS                              0x00269BD4
+#define I40E_GLRCU_LB_INDIRECT_ADDRESS                              0x00269BD4 /* Reset: CORER */
 #define I40E_GLRCU_LB_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_SHIFT 0
 #define I40E_GLRCU_LB_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_MASK  I40E_MASK(0xFFFF, I40E_GLRCU_LB_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_SHIFT)
 
-#define I40E_GLRCU_LB_INDIRECT_DATA(_i)                       (0x00269898 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLRCU_LB_INDIRECT_DATA(_i)                       (0x00269898 + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLRCU_LB_INDIRECT_DATA_MAX_INDEX                 3
 #define I40E_GLRCU_LB_INDIRECT_DATA_GLRCU_INDIRECT_DATA_SHIFT 0
 #define I40E_GLRCU_LB_INDIRECT_DATA_GLRCU_INDIRECT_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCU_LB_INDIRECT_DATA_GLRCU_INDIRECT_DATA_SHIFT)
 
-#define I40E_GLRCU_RX_INDIRECT_ADDRESS                              0x00269BCC
+#define I40E_GLRCU_RX_INDIRECT_ADDRESS                              0x00269BCC /* Reset: CORER */
 #define I40E_GLRCU_RX_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_SHIFT 0
 #define I40E_GLRCU_RX_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_MASK  I40E_MASK(0xFFFF, I40E_GLRCU_RX_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_SHIFT)
 
-#define I40E_GLRCU_RX_INDIRECT_DATA(_i)                       (0x00269888 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLRCU_RX_INDIRECT_DATA(_i)                       (0x00269888 + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLRCU_RX_INDIRECT_DATA_MAX_INDEX                 3
 #define I40E_GLRCU_RX_INDIRECT_DATA_GLRCU_INDIRECT_DATA_SHIFT 0
 #define I40E_GLRCU_RX_INDIRECT_DATA_GLRCU_INDIRECT_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRCU_RX_INDIRECT_DATA_GLRCU_INDIRECT_DATA_SHIFT)
 
-#define I40E_GLRDPU_INDIRECT_ADDRESS                              0x00051040
+#define I40E_GLRDPU_INDIRECT_ADDRESS                              0x00051040 /* Reset: CORER */
 #define I40E_GLRDPU_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_SHIFT 0
 #define I40E_GLRDPU_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_MASK  I40E_MASK(0xFFFF, I40E_GLRDPU_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_SHIFT)
 
-#define I40E_GLRDPU_INDIRECT_DATA(_i)                       (0x00051044 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLRDPU_INDIRECT_DATA(_i)                       (0x00051044 + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLRDPU_INDIRECT_DATA_MAX_INDEX                 3
 #define I40E_GLRDPU_INDIRECT_DATA_GLRCU_INDIRECT_DATA_SHIFT 0
 #define I40E_GLRDPU_INDIRECT_DATA_GLRCU_INDIRECT_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLRDPU_INDIRECT_DATA_GLRCU_INDIRECT_DATA_SHIFT)
 
-#define I40E_GLTDPU_INDIRECT_ADDRESS                              0x00044264
+#define I40E_GLTDPU_INDIRECT_ADDRESS                              0x00044264 /* Reset: CORER */
 #define I40E_GLTDPU_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_SHIFT 0
 #define I40E_GLTDPU_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_MASK  I40E_MASK(0xFFFF, I40E_GLTDPU_INDIRECT_ADDRESS_GLRCU_INDIRECT_ADDRESS_SHIFT)
 
-#define I40E_GLTDPU_INDIRECT_DATA(_i)                       (0x00044268 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLTDPU_INDIRECT_DATA(_i)                       (0x00044268 + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLTDPU_INDIRECT_DATA_MAX_INDEX                 3
 #define I40E_GLTDPU_INDIRECT_DATA_GLRCU_INDIRECT_DATA_SHIFT 0
 #define I40E_GLTDPU_INDIRECT_DATA_GLRCU_INDIRECT_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLTDPU_INDIRECT_DATA_GLRCU_INDIRECT_DATA_SHIFT)
 
-#define I40E_GLTLAN_MIN_MAX_MSS             0x000E64dC
+#define I40E_GLTLAN_MIN_MAX_MSS             0x000E64dC /* Reset: CORER */
 #define I40E_GLTLAN_MIN_MAX_MSS_MAHDL_SHIFT 0
 #define I40E_GLTLAN_MIN_MAX_MSS_MAHDL_MASK  I40E_MASK(0x3FFF, I40E_GLTLAN_MIN_MAX_MSS_MAHDL_SHIFT)
 #define I40E_GLTLAN_MIN_MAX_MSS_MIHDL_SHIFT 16
@@ -7485,7 +7834,7 @@
 #define I40E_GLTLAN_MIN_MAX_MSS_RSV_SHIFT   26
 #define I40E_GLTLAN_MIN_MAX_MSS_RSV_MASK    I40E_MASK(0x3F, I40E_GLTLAN_MIN_MAX_MSS_RSV_SHIFT)
 
-#define I40E_GLTLAN_MIN_MAX_PKT             0x000E64d8
+#define I40E_GLTLAN_MIN_MAX_PKT             0x000E64DC /* Reset: CORER */
 #define I40E_GLTLAN_MIN_MAX_PKT_MAHDL_SHIFT 0
 #define I40E_GLTLAN_MIN_MAX_PKT_MAHDL_MASK  I40E_MASK(0x3FFF, I40E_GLTLAN_MIN_MAX_PKT_MAHDL_SHIFT)
 #define I40E_GLTLAN_MIN_MAX_PKT_MIHDL_SHIFT 16
@@ -7493,7 +7842,7 @@
 #define I40E_GLTLAN_MIN_MAX_PKT_RSV_SHIFT   22
 #define I40E_GLTLAN_MIN_MAX_PKT_RSV_MASK    I40E_MASK(0x3FF, I40E_GLTLAN_MIN_MAX_PKT_RSV_SHIFT)
 
-#define I40E_PF_VT_PFALLOC_RLAN               0x0012A480
+#define I40E_PF_VT_PFALLOC_RLAN               0x0012A480 /* Reset: CORER */
 #define I40E_PF_VT_PFALLOC_RLAN_FIRSTVF_SHIFT 0
 #define I40E_PF_VT_PFALLOC_RLAN_FIRSTVF_MASK  I40E_MASK(0xFF, I40E_PF_VT_PFALLOC_RLAN_FIRSTVF_SHIFT)
 #define I40E_PF_VT_PFALLOC_RLAN_LASTVF_SHIFT  8
@@ -7501,7 +7850,7 @@
 #define I40E_PF_VT_PFALLOC_RLAN_VALID_SHIFT   31
 #define I40E_PF_VT_PFALLOC_RLAN_VALID_MASK    I40E_MASK(0x1, I40E_PF_VT_PFALLOC_RLAN_VALID_SHIFT)
 
-#define I40E_PFLAN_QALLOC_CSR              0x00078E00
+#define I40E_PFLAN_QALLOC_CSR              0x00078E00 /* Reset: CORER */
 #define I40E_PFLAN_QALLOC_CSR_FIRSTQ_SHIFT 0
 #define I40E_PFLAN_QALLOC_CSR_FIRSTQ_MASK  I40E_MASK(0x7FF, I40E_PFLAN_QALLOC_CSR_FIRSTQ_SHIFT)
 #define I40E_PFLAN_QALLOC_CSR_LASTQ_SHIFT  16
@@ -7509,7 +7858,7 @@
 #define I40E_PFLAN_QALLOC_CSR_VALID_SHIFT  31
 #define I40E_PFLAN_QALLOC_CSR_VALID_MASK   I40E_MASK(0x1, I40E_PFLAN_QALLOC_CSR_VALID_SHIFT)
 
-#define I40E_PFLAN_QALLOC_INT              0x0003F000
+#define I40E_PFLAN_QALLOC_INT              0x0003F000 /* Reset: CORER */
 #define I40E_PFLAN_QALLOC_INT_FIRSTQ_SHIFT 0
 #define I40E_PFLAN_QALLOC_INT_FIRSTQ_MASK  I40E_MASK(0x7FF, I40E_PFLAN_QALLOC_INT_FIRSTQ_SHIFT)
 #define I40E_PFLAN_QALLOC_INT_LASTQ_SHIFT  16
@@ -7517,7 +7866,7 @@
 #define I40E_PFLAN_QALLOC_INT_VALID_SHIFT  31
 #define I40E_PFLAN_QALLOC_INT_VALID_MASK   I40E_MASK(0x1, I40E_PFLAN_QALLOC_INT_VALID_SHIFT)
 
-#define I40E_PFLAN_QALLOC_PMAT              0x000C0600
+#define I40E_PFLAN_QALLOC_PMAT              0x000C0600 /* Reset: CORER */
 #define I40E_PFLAN_QALLOC_PMAT_FIRSTQ_SHIFT 0
 #define I40E_PFLAN_QALLOC_PMAT_FIRSTQ_MASK  I40E_MASK(0x7FF, I40E_PFLAN_QALLOC_PMAT_FIRSTQ_SHIFT)
 #define I40E_PFLAN_QALLOC_PMAT_LASTQ_SHIFT  16
@@ -7525,7 +7874,7 @@
 #define I40E_PFLAN_QALLOC_PMAT_VALID_SHIFT  31
 #define I40E_PFLAN_QALLOC_PMAT_VALID_MASK   I40E_MASK(0x1, I40E_PFLAN_QALLOC_PMAT_VALID_SHIFT)
 
-#define I40E_PFLAN_QALLOC_RCB              0x00122080
+#define I40E_PFLAN_QALLOC_RCB              0x00122080 /* Reset: CORER */
 #define I40E_PFLAN_QALLOC_RCB_FIRSTQ_SHIFT 0
 #define I40E_PFLAN_QALLOC_RCB_FIRSTQ_MASK  I40E_MASK(0x7FF, I40E_PFLAN_QALLOC_RCB_FIRSTQ_SHIFT)
 #define I40E_PFLAN_QALLOC_RCB_LASTQ_SHIFT  16
@@ -7533,7 +7882,7 @@
 #define I40E_PFLAN_QALLOC_RCB_VALID_SHIFT  31
 #define I40E_PFLAN_QALLOC_RCB_VALID_MASK   I40E_MASK(0x1, I40E_PFLAN_QALLOC_RCB_VALID_SHIFT)
 
-#define I40E_PFLAN_QALLOC_RCU              0x00246780
+#define I40E_PFLAN_QALLOC_RCU              0x00246780 /* Reset: CORER */
 #define I40E_PFLAN_QALLOC_RCU_FIRSTQ_SHIFT 0
 #define I40E_PFLAN_QALLOC_RCU_FIRSTQ_MASK  I40E_MASK(0x7FF, I40E_PFLAN_QALLOC_RCU_FIRSTQ_SHIFT)
 #define I40E_PFLAN_QALLOC_RCU_LASTQ_SHIFT  16
@@ -7541,19 +7890,27 @@
 #define I40E_PFLAN_QALLOC_RCU_VALID_SHIFT  31
 #define I40E_PFLAN_QALLOC_RCU_VALID_MASK   I40E_MASK(0x1, I40E_PFLAN_QALLOC_RCU_VALID_SHIFT)
 
-#define I40E_PRTLAN_RXEMP_EN                 0x001E4780
+#define I40E_PRTLAN_RXEMP_EN                 0x001E4780 /* Reset: GLOBR */
 #define I40E_PRTLAN_RXEMP_EN_RXHOST_EN_SHIFT 0
 #define I40E_PRTLAN_RXEMP_EN_RXHOST_EN_MASK  I40E_MASK(0x1, I40E_PRTLAN_RXEMP_EN_RXHOST_EN_SHIFT)
 
 /* PF - MAC Registers  */
 
-#define I40E_PRTDCB_MPVCTL            0x001E2460
+#define I40E_PRTDCB_MPVCTL            0x001E2460 /* Reset: GLOBR */
 #define I40E_PRTDCB_MPVCTL_PFCV_SHIFT 0
 #define I40E_PRTDCB_MPVCTL_PFCV_MASK  I40E_MASK(0xFFFF, I40E_PRTDCB_MPVCTL_PFCV_SHIFT)
 #define I40E_PRTDCB_MPVCTL_RFCV_SHIFT 16
 #define I40E_PRTDCB_MPVCTL_RFCV_MASK  I40E_MASK(0xFFFF, I40E_PRTDCB_MPVCTL_RFCV_SHIFT)
 
-#define I40E_PRTMAC_HLCTL                     0x001E2000
+#define I40E_PRTMAC_AN_LP_STATUS1                      0x0008C680 /* Reset: GLOBR */
+#define I40E_PRTMAC_AN_LP_STATUS1_LP_AN_PAGE_LOW_SHIFT 0
+#define I40E_PRTMAC_AN_LP_STATUS1_LP_AN_PAGE_LOW_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_AN_LP_STATUS1_LP_AN_PAGE_LOW_SHIFT)
+#define I40E_PRTMAC_AN_LP_STATUS1_AN_ARB_STATE_SHIFT   16
+#define I40E_PRTMAC_AN_LP_STATUS1_AN_ARB_STATE_MASK    I40E_MASK(0xF, I40E_PRTMAC_AN_LP_STATUS1_AN_ARB_STATE_SHIFT)
+#define I40E_PRTMAC_AN_LP_STATUS1_RSVD_SHIFT           20
+#define I40E_PRTMAC_AN_LP_STATUS1_RSVD_MASK            I40E_MASK(0xFFF, I40E_PRTMAC_AN_LP_STATUS1_RSVD_SHIFT)
+
+#define I40E_PRTMAC_HLCTL                     0x001E2000 /* Reset: GLOBR */
 #define I40E_PRTMAC_HLCTL_APPEND_CRC_SHIFT    0
 #define I40E_PRTMAC_HLCTL_APPEND_CRC_MASK     I40E_MASK(0x1, I40E_PRTMAC_HLCTL_APPEND_CRC_SHIFT)
 #define I40E_PRTMAC_HLCTL_RXCRCSTRP_SHIFT     1
@@ -7601,7 +7958,7 @@
 #define I40E_PRTMAC_HLCTL_RXPADSTRIPEN_SHIFT  28
 #define I40E_PRTMAC_HLCTL_RXPADSTRIPEN_MASK   I40E_MASK(0x1, I40E_PRTMAC_HLCTL_RXPADSTRIPEN_SHIFT)
 
-#define I40E_PRTMAC_HLCTLA                     0x001E4760
+#define I40E_PRTMAC_HLCTLA                     0x001E4760 /* Reset: GLOBR */
 #define I40E_PRTMAC_HLCTLA_DROP_US_PKTS_SHIFT  0
 #define I40E_PRTMAC_HLCTLA_DROP_US_PKTS_MASK   I40E_MASK(0x1, I40E_PRTMAC_HLCTLA_DROP_US_PKTS_SHIFT)
 #define I40E_PRTMAC_HLCTLA_RX_FWRD_CTRL_SHIFT  1
@@ -7613,7 +7970,7 @@
 #define I40E_PRTMAC_HLCTLA_HYS_FLUSH_PKT_SHIFT 7
 #define I40E_PRTMAC_HLCTLA_HYS_FLUSH_PKT_MASK  I40E_MASK(0x1, I40E_PRTMAC_HLCTLA_HYS_FLUSH_PKT_SHIFT)
 
-#define I40E_PRTMAC_HLSTA                    0x001E2020
+#define I40E_PRTMAC_HLSTA                    0x001E2020 /* Reset: GLOBR */
 #define I40E_PRTMAC_HLSTA_REVID_SHIFT        0
 #define I40E_PRTMAC_HLSTA_REVID_MASK         I40E_MASK(0xF, I40E_PRTMAC_HLSTA_REVID_SHIFT)
 #define I40E_PRTMAC_HLSTA_RESERVED_2_SHIFT   4
@@ -7629,7 +7986,7 @@
 #define I40E_PRTMAC_HLSTA_LEGACY_RSVD2_SHIFT 9
 #define I40E_PRTMAC_HLSTA_LEGACY_RSVD2_MASK  I40E_MASK(0x1, I40E_PRTMAC_HLSTA_LEGACY_RSVD2_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_INTERNAL                             0x001E3530
+#define I40E_PRTMAC_HSEC_CTL_INTERNAL                             0x001E3530 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_INTERNAL_HSEC_RX_SWZL_SHIFT          0
 #define I40E_PRTMAC_HSEC_CTL_INTERNAL_HSEC_RX_SWZL_MASK           I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_INTERNAL_HSEC_RX_SWZL_SHIFT)
 #define I40E_PRTMAC_HSEC_CTL_INTERNAL_HSEC_TX_SWZL_SHIFT          1
@@ -7637,219 +7994,219 @@
 #define I40E_PRTMAC_HSEC_CTL_INTERNAL_HSEC_CTL_RX_CHECK_ACK_SHIFT 2
 #define I40E_PRTMAC_HSEC_CTL_INTERNAL_HSEC_CTL_RX_CHECK_ACK_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_INTERNAL_HSEC_CTL_RX_CHECK_ACK_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_GCP                                   0x001E3160
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_GCP                                   0x001E3160 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_GCP_HSEC_CTL_RX_CHECK_ETYPE_GCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_GCP_HSEC_CTL_RX_CHECK_ETYPE_GCP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_GCP_HSEC_CTL_RX_CHECK_ETYPE_GCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_GPP                                   0x001E32A0
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_GPP                                   0x001E32A0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_GPP_HSEC_CTL_RX_CHECK_ETYPE_GPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_GPP_HSEC_CTL_RX_CHECK_ETYPE_GPP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_GPP_HSEC_CTL_RX_CHECK_ETYPE_GPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_PCP                                   0x001E3210
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_PCP                                   0x001E3210 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_PCP_HSEC_CTL_RX_CHECK_ETYPE_PCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_PCP_HSEC_CTL_RX_CHECK_ETYPE_PCP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_PCP_HSEC_CTL_RX_CHECK_ETYPE_PCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_PPP                                   0x001E3320
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_PPP                                   0x001E3320 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_PPP_HSEC_CTL_RX_CHECK_ETYPE_PPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_PPP_HSEC_CTL_RX_CHECK_ETYPE_PPP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_ETYPE_PPP_HSEC_CTL_RX_CHECK_ETYPE_PPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_GCP                                   0x001E30F0
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_GCP                                   0x001E30F0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_GCP_HSEC_CTL_RX_CHECK_MCAST_GCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_GCP_HSEC_CTL_RX_CHECK_MCAST_GCP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_GCP_HSEC_CTL_RX_CHECK_MCAST_GCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_GPP                                   0x001E3270
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_GPP                                   0x001E3270 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_GPP_HSEC_CTL_RX_CHECK_MCAST_GPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_GPP_HSEC_CTL_RX_CHECK_MCAST_GPP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_GPP_HSEC_CTL_RX_CHECK_MCAST_GPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_PCP                                   0x001E31C0
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_PCP                                   0x001E31C0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_PCP_HSEC_CTL_RX_CHECK_MCAST_PCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_PCP_HSEC_CTL_RX_CHECK_MCAST_PCP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_PCP_HSEC_CTL_RX_CHECK_MCAST_PCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_PPP                                   0x001E32F0
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_PPP                                   0x001E32F0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_PPP_HSEC_CTL_RX_CHECK_MCAST_PPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_PPP_HSEC_CTL_RX_CHECK_MCAST_PPP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_MCAST_PPP_HSEC_CTL_RX_CHECK_MCAST_PPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_GCP                                    0x001E3170
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_GCP                                    0x001E3170 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_GCP_HSEC_CTL_RX_CHECK_OPCODE_GCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_GCP_HSEC_CTL_RX_CHECK_OPCODE_GCP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_GCP_HSEC_CTL_RX_CHECK_OPCODE_GCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_GPP                                    0x001E32C0
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_GPP                                    0x001E32C0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_GPP_HSEC_CTL_RX_CHECK_OPCODE_GPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_GPP_HSEC_CTL_RX_CHECK_OPCODE_GPP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_GPP_HSEC_CTL_RX_CHECK_OPCODE_GPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_PCP                                    0x001E3230
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_PCP                                    0x001E3230 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_PCP_HSEC_CTL_RX_CHECK_OPCODE_PCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_PCP_HSEC_CTL_RX_CHECK_OPCODE_PCP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_PCP_HSEC_CTL_RX_CHECK_OPCODE_PCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_PPP                                    0x001E3340
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_PPP                                    0x001E3340 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_PPP_HSEC_CTL_RX_CHECK_OPCODE_PPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_PPP_HSEC_CTL_RX_CHECK_OPCODE_PPP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_OPCODE_PPP_HSEC_CTL_RX_CHECK_OPCODE_PPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_GCP                                0x001E3130
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_GCP                                0x001E3130 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_GCP_HSEC_CTL_RX_CHECK_SA_GCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_GCP_HSEC_CTL_RX_CHECK_SA_GCP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_GCP_HSEC_CTL_RX_CHECK_SA_GCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_GPP                                0x001E3290
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_GPP                                0x001E3290 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_GPP_HSEC_CTL_RX_CHECK_SA_GPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_GPP_HSEC_CTL_RX_CHECK_SA_GPP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_GPP_HSEC_CTL_RX_CHECK_SA_GPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_PCP                                0x001E3200
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_PCP                                0x001E3200 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_PCP_HSEC_CTL_RX_CHECK_SA_PCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_PCP_HSEC_CTL_RX_CHECK_SA_PCP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_PCP_HSEC_CTL_RX_CHECK_SA_PCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_PPP                                0x001E3310
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_PPP                                0x001E3310 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_PPP_HSEC_CTL_RX_CHECK_SA_PPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_PPP_HSEC_CTL_RX_CHECK_SA_PPP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_SA_PPP_HSEC_CTL_RX_CHECK_SA_PPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_GCP                                   0x001E3100
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_GCP                                   0x001E3100 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_GCP_HSEC_CTL_RX_CHECK_UCAST_GCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_GCP_HSEC_CTL_RX_CHECK_UCAST_GCP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_GCP_HSEC_CTL_RX_CHECK_UCAST_GCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_GPP                                   0x001E3280
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_GPP                                   0x001E3280 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_GPP_HSEC_CTL_RX_CHECK_UCAST_GPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_GPP_HSEC_CTL_RX_CHECK_UCAST_GPP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_GPP_HSEC_CTL_RX_CHECK_UCAST_GPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_PCP                                   0x001E31D0
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_PCP                                   0x001E31D0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_PCP_HSEC_CTL_RX_CHECK_UCAST_PCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_PCP_HSEC_CTL_RX_CHECK_UCAST_PCP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_PCP_HSEC_CTL_RX_CHECK_UCAST_PCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_PPP                                   0x001E3300
+#define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_PPP                                   0x001E3300 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_PPP_HSEC_CTL_RX_CHECK_UCAST_PPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_PPP_HSEC_CTL_RX_CHECK_UCAST_PPP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_CHECK_UCAST_PPP_HSEC_CTL_RX_CHECK_UCAST_PPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_DELETE_FCS                              0x001E3080
+#define I40E_PRTMAC_HSEC_CTL_RX_DELETE_FCS                              0x001E3080 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_DELETE_FCS_HSEC_CTL_RX_DELETE_FCS_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_DELETE_FCS_HSEC_CTL_RX_DELETE_FCS_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_DELETE_FCS_HSEC_CTL_RX_DELETE_FCS_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_ENABLE                          0x001E3070
+#define I40E_PRTMAC_HSEC_CTL_RX_ENABLE                          0x001E3070 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_HSEC_CTL_RX_ENABLE_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_HSEC_CTL_RX_ENABLE_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_ENABLE_HSEC_CTL_RX_ENABLE_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_PCP                              0x001E31B0
+#define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_PCP                              0x001E31B0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_PCP_HSEC_CTL_RX_ENABLE_PCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_ENABLE_PCP_HSEC_CTL_RX_ENABLE_PCP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_ENABLE_PCP_HSEC_CTL_RX_ENABLE_PCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_GCP                             0x001E31A0
+#define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_GCP                             0x001E31A0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_GCP_HSEC_CTL_RX_ETYPE_GCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_GCP_HSEC_CTL_RX_ETYPE_GCP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_RX_ETYPE_GCP_HSEC_CTL_RX_ETYPE_GCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_GPP                             0x001E32B0
+#define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_GPP                             0x001E32B0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_GPP_HSEC_CTL_RX_ETYPE_GPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_GPP_HSEC_CTL_RX_ETYPE_GPP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_RX_ETYPE_GPP_HSEC_CTL_RX_ETYPE_GPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_PCP                             0x001E3220
+#define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_PCP                             0x001E3220 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_PCP_HSEC_CTL_RX_ETYPE_PCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_PCP_HSEC_CTL_RX_ETYPE_PCP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_RX_ETYPE_PCP_HSEC_CTL_RX_ETYPE_PCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_PPP                             0x001E3330
+#define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_PPP                             0x001E3330 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_PPP_HSEC_CTL_RX_ETYPE_PPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_ETYPE_PPP_HSEC_CTL_RX_ETYPE_PPP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_RX_ETYPE_PPP_HSEC_CTL_RX_ETYPE_PPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_IGNORE_FCS                              0x001E3090
+#define I40E_PRTMAC_HSEC_CTL_RX_IGNORE_FCS                              0x001E3090 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_IGNORE_FCS_HSEC_CTL_RX_IGNORE_FCS_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_IGNORE_FCS_HSEC_CTL_RX_IGNORE_FCS_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_RX_IGNORE_FCS_HSEC_CTL_RX_IGNORE_FCS_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_MAX_PACKET_LEN                                  0x001E30A0
+#define I40E_PRTMAC_HSEC_CTL_RX_MAX_PACKET_LEN                                  0x001E30A0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_MAX_PACKET_LEN_HSEC_CTL_RX_MAX_PACKET_LEN_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_MAX_PACKET_LEN_HSEC_CTL_RX_MAX_PACKET_LEN_MASK  I40E_MASK(0x7FFF, I40E_PRTMAC_HSEC_CTL_RX_MAX_PACKET_LEN_HSEC_CTL_RX_MAX_PACKET_LEN_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_MIN_PACKET_LEN                                  0x001E30B0
+#define I40E_PRTMAC_HSEC_CTL_RX_MIN_PACKET_LEN                                  0x001E30B0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_MIN_PACKET_LEN_HSEC_CTL_RX_MIN_PACKET_LEN_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_MIN_PACKET_LEN_HSEC_CTL_RX_MIN_PACKET_LEN_MASK  I40E_MASK(0xFF, I40E_PRTMAC_HSEC_CTL_RX_MIN_PACKET_LEN_HSEC_CTL_RX_MIN_PACKET_LEN_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_GPP                              0x001E32D0
+#define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_GPP                              0x001E32D0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_GPP_HSEC_CTL_RX_OPCODE_GPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_GPP_HSEC_CTL_RX_OPCODE_GPP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_RX_OPCODE_GPP_HSEC_CTL_RX_OPCODE_GPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MAX_GCP                                  0x001E3190
+#define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MAX_GCP                                  0x001E3190 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MAX_GCP_HSEC_CTL_RX_OPCODE_MAX_GCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MAX_GCP_HSEC_CTL_RX_OPCODE_MAX_GCP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MAX_GCP_HSEC_CTL_RX_OPCODE_MAX_GCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MAX_PCP                                  0x001E3250
+#define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MAX_PCP                                  0x001E3250 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MAX_PCP_HSEC_CTL_RX_OPCODE_MAX_PCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MAX_PCP_HSEC_CTL_RX_OPCODE_MAX_PCP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MAX_PCP_HSEC_CTL_RX_OPCODE_MAX_PCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MIN_GCP                                  0x001E3180
+#define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MIN_GCP                                  0x001E3180 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MIN_GCP_HSEC_CTL_RX_OPCODE_MIN_GCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MIN_GCP_HSEC_CTL_RX_OPCODE_MIN_GCP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MIN_GCP_HSEC_CTL_RX_OPCODE_MIN_GCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MIN_PCP                                  0x001E3240
+#define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MIN_PCP                                  0x001E3240 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MIN_PCP_HSEC_CTL_RX_OPCODE_MIN_PCP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MIN_PCP_HSEC_CTL_RX_OPCODE_MIN_PCP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_RX_OPCODE_MIN_PCP_HSEC_CTL_RX_OPCODE_MIN_PCP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_PPP                              0x001E3350
+#define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_PPP                              0x001E3350 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_PPP_HSEC_CTL_RX_OPCODE_PPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_OPCODE_PPP_HSEC_CTL_RX_OPCODE_PPP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_RX_OPCODE_PPP_HSEC_CTL_RX_OPCODE_PPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_MCAST_PART1                                        0x001E31E0
+#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_MCAST_PART1                                        0x001E31E0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_MCAST_PART1_HSEC_CTL_RX_PAUSE_DA_MCAST_PART1_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_MCAST_PART1_HSEC_CTL_RX_PAUSE_DA_MCAST_PART1_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_MCAST_PART1_HSEC_CTL_RX_PAUSE_DA_MCAST_PART1_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_MCAST_PART2                                        0x001E31F0
+#define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_MCAST_PART2                                        0x001E31F0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_MCAST_PART2_HSEC_CTL_RX_PAUSE_DA_MCAST_PART2_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_MCAST_PART2_HSEC_CTL_RX_PAUSE_DA_MCAST_PART2_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_RX_PAUSE_DA_MCAST_PART2_HSEC_CTL_RX_PAUSE_DA_MCAST_PART2_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_DA_GPP_PART1                                0x001E3490
+#define I40E_PRTMAC_HSEC_CTL_TX_DA_GPP_PART1                                0x001E3490 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_DA_GPP_PART1_HSEC_CTL_TX_DA_GPP_PART1_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_DA_GPP_PART1_HSEC_CTL_TX_DA_GPP_PART1_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTMAC_HSEC_CTL_TX_DA_GPP_PART1_HSEC_CTL_TX_DA_GPP_PART1_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_DA_GPP_PART2                                0x001E34A0
+#define I40E_PRTMAC_HSEC_CTL_TX_DA_GPP_PART2                                0x001E34A0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_DA_GPP_PART2_HSEC_CTL_TX_DA_GPP_PART2_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_DA_GPP_PART2_HSEC_CTL_TX_DA_GPP_PART2_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_TX_DA_GPP_PART2_HSEC_CTL_TX_DA_GPP_PART2_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_DA_PPP_PART1                                0x001E34F0
+#define I40E_PRTMAC_HSEC_CTL_TX_DA_PPP_PART1                                0x001E34F0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_DA_PPP_PART1_HSEC_CTL_TX_DA_PPP_PART1_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_DA_PPP_PART1_HSEC_CTL_TX_DA_PPP_PART1_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTMAC_HSEC_CTL_TX_DA_PPP_PART1_HSEC_CTL_TX_DA_PPP_PART1_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_DA_PPP_PART2                                0x001E3500
+#define I40E_PRTMAC_HSEC_CTL_TX_DA_PPP_PART2                                0x001E3500 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_DA_PPP_PART2_HSEC_CTL_TX_DA_PPP_PART2_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_DA_PPP_PART2_HSEC_CTL_TX_DA_PPP_PART2_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_TX_DA_PPP_PART2_HSEC_CTL_TX_DA_PPP_PART2_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_ENABLE                          0x001E3000
+#define I40E_PRTMAC_HSEC_CTL_TX_ENABLE                          0x001E3000 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_ENABLE_HSEC_CTL_TX_ENABLE_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_ENABLE_HSEC_CTL_TX_ENABLE_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_TX_ENABLE_HSEC_CTL_TX_ENABLE_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_ERR_PKT_MODE                                0x001E3060
+#define I40E_PRTMAC_HSEC_CTL_TX_ERR_PKT_MODE                                0x001E3060 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_ERR_PKT_MODE_HSEC_CTL_TX_ERR_PKT_MODE_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_ERR_PKT_MODE_HSEC_CTL_TX_ERR_PKT_MODE_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_TX_ERR_PKT_MODE_HSEC_CTL_TX_ERR_PKT_MODE_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_ETHERTYPE_GPP                                 0x001E34D0
+#define I40E_PRTMAC_HSEC_CTL_TX_ETHERTYPE_GPP                                 0x001E34D0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_ETHERTYPE_GPP_HSEC_CTL_TX_ETHERTYPE_GPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_ETHERTYPE_GPP_HSEC_CTL_TX_ETHERTYPE_GPP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_TX_ETHERTYPE_GPP_HSEC_CTL_TX_ETHERTYPE_GPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_ETHERTYPE_PPP                                 0x001E3510
+#define I40E_PRTMAC_HSEC_CTL_TX_ETHERTYPE_PPP                                 0x001E3510 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_ETHERTYPE_PPP_HSEC_CTL_TX_ETHERTYPE_PPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_ETHERTYPE_PPP_HSEC_CTL_TX_ETHERTYPE_PPP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_TX_ETHERTYPE_PPP_HSEC_CTL_TX_ETHERTYPE_PPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_FCS_INS_ENABLE                     0x001E3020
+#define I40E_PRTMAC_HSEC_CTL_TX_FCS_INS_ENABLE                     0x001E3020 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_FCS_INS_ENABLE_TX_FCS_INS_EN_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_FCS_INS_ENABLE_TX_FCS_INS_EN_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_TX_FCS_INS_ENABLE_TX_FCS_INS_EN_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_FCS_STOMP                             0x001E3030
+#define I40E_PRTMAC_HSEC_CTL_TX_FCS_STOMP                             0x001E3030 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_FCS_STOMP_HSEC_CTL_TX_FCS_STOMP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_FCS_STOMP_HSEC_CTL_TX_FCS_STOMP_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_TX_FCS_STOMP_HSEC_CTL_TX_FCS_STOMP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_IGNORE_FCS                              0x001E3040
+#define I40E_PRTMAC_HSEC_CTL_TX_IGNORE_FCS                              0x001E3040 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_IGNORE_FCS_HSEC_CTL_TX_IGNORE_FCS_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_IGNORE_FCS_HSEC_CTL_TX_IGNORE_FCS_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_TX_IGNORE_FCS_HSEC_CTL_TX_IGNORE_FCS_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_OPCODE_GPP                              0x001E34E0
+#define I40E_PRTMAC_HSEC_CTL_TX_OPCODE_GPP                              0x001E34E0 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_OPCODE_GPP_HSEC_CTL_TX_OPCODE_GPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_OPCODE_GPP_HSEC_CTL_TX_OPCODE_GPP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_TX_OPCODE_GPP_HSEC_CTL_TX_OPCODE_GPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_OPCODE_PPP                              0x001E3520
+#define I40E_PRTMAC_HSEC_CTL_TX_OPCODE_PPP                              0x001E3520 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_OPCODE_PPP_HSEC_CTL_TX_OPCODE_PPP_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_OPCODE_PPP_HSEC_CTL_TX_OPCODE_PPP_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_HSEC_CTL_TX_OPCODE_PPP_HSEC_CTL_TX_OPCODE_PPP_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_RDYOUT_THRESH                                 0x001E3010
+#define I40E_PRTMAC_HSEC_CTL_TX_RDYOUT_THRESH                                 0x001E3010 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_RDYOUT_THRESH_HSEC_CTL_TX_RDYOUT_THRESH_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_RDYOUT_THRESH_HSEC_CTL_TX_RDYOUT_THRESH_MASK  I40E_MASK(0xF, I40E_PRTMAC_HSEC_CTL_TX_RDYOUT_THRESH_HSEC_CTL_TX_RDYOUT_THRESH_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_TX_TO_RX_LOOPBACK                                  0x001E3050
+#define I40E_PRTMAC_HSEC_CTL_TX_TO_RX_LOOPBACK                                  0x001E3050 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_TX_TO_RX_LOOPBACK_HSEC_CTL_TX_TO_RX_LOOPBACK_SHIFT 0
 #define I40E_PRTMAC_HSEC_CTL_TX_TO_RX_LOOPBACK_HSEC_CTL_TX_TO_RX_LOOPBACK_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_TX_TO_RX_LOOPBACK_HSEC_CTL_TX_TO_RX_LOOPBACK_SHIFT)
 
-#define I40E_PRTMAC_HSEC_CTL_XLGMII                   0x001E3550
+#define I40E_PRTMAC_HSEC_CTL_XLGMII                   0x001E3550 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_CTL_XLGMII_LB_PHY_SHIFT      0
 #define I40E_PRTMAC_HSEC_CTL_XLGMII_LB_PHY_MASK       I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_XLGMII_LB_PHY_SHIFT)
 #define I40E_PRTMAC_HSEC_CTL_XLGMII_HI_TH_SHIFT       1
@@ -7873,11 +8230,11 @@
 #define I40E_PRTMAC_HSEC_CTL_XLGMII_LB2TX_SHIFT       17
 #define I40E_PRTMAC_HSEC_CTL_XLGMII_LB2TX_MASK        I40E_MASK(0x1, I40E_PRTMAC_HSEC_CTL_XLGMII_LB2TX_SHIFT)
 
-#define I40E_PRTMAC_HSEC_SINGLE_40G_PORT_SELECT                                  0x001E3540
+#define I40E_PRTMAC_HSEC_SINGLE_40G_PORT_SELECT                                  0x001E3540 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSEC_SINGLE_40G_PORT_SELECT_MAC_SINGLE_40G_PORT_SELECT_SHIFT 0
 #define I40E_PRTMAC_HSEC_SINGLE_40G_PORT_SELECT_MAC_SINGLE_40G_PORT_SELECT_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSEC_SINGLE_40G_PORT_SELECT_MAC_SINGLE_40G_PORT_SELECT_SHIFT)
 
-#define I40E_PRTMAC_HSECTL1                         0x001E3560
+#define I40E_PRTMAC_HSECTL1                         0x001E3560 /* Reset: GLOBR */
 #define I40E_PRTMAC_HSECTL1_DROP_US_PKTS_SHIFT      0
 #define I40E_PRTMAC_HSECTL1_DROP_US_PKTS_MASK       I40E_MASK(0x1, I40E_PRTMAC_HSECTL1_DROP_US_PKTS_SHIFT)
 #define I40E_PRTMAC_HSECTL1_PAD_US_PKT_SHIFT        3
@@ -7891,7 +8248,7 @@
 #define I40E_PRTMAC_HSECTL1_EN_PREAMBLE_CHECK_SHIFT 31
 #define I40E_PRTMAC_HSECTL1_EN_PREAMBLE_CHECK_MASK  I40E_MASK(0x1, I40E_PRTMAC_HSECTL1_EN_PREAMBLE_CHECK_SHIFT)
 
-#define I40E_PRTMAC_LINKSTA                              0x001E2420
+#define I40E_PRTMAC_LINKSTA                              0x001E2420 /* Reset: GLOBR */
 #define I40E_PRTMAC_LINKSTA_FIFO_MTAR_STS_RX_EMPTY_SHIFT 0
 #define I40E_PRTMAC_LINKSTA_FIFO_MTAR_STS_RX_EMPTY_MASK  I40E_MASK(0x1, I40E_PRTMAC_LINKSTA_FIFO_MTAR_STS_RX_EMPTY_SHIFT)
 #define I40E_PRTMAC_LINKSTA_FIFO_MTAR_STS_RX_FULL_SHIFT  1
@@ -7907,7 +8264,7 @@
 #define I40E_PRTMAC_LINKSTA_MAC_LINK_UP_SHIFT            30
 #define I40E_PRTMAC_LINKSTA_MAC_LINK_UP_MASK             I40E_MASK(0x1, I40E_PRTMAC_LINKSTA_MAC_LINK_UP_SHIFT)
 
-#define I40E_PRTMAC_MACC                         0x001E24E0
+#define I40E_PRTMAC_MACC                         0x001E24E0 /* Reset: GLOBR */
 #define I40E_PRTMAC_MACC_FORCE_LINK_SHIFT        0
 #define I40E_PRTMAC_MACC_FORCE_LINK_MASK         I40E_MASK(0x1, I40E_PRTMAC_MACC_FORCE_LINK_SHIFT)
 #define I40E_PRTMAC_MACC_PHY_LOOP_BACK_SHIFT     1
@@ -7941,13 +8298,13 @@
 #define I40E_PRTMAC_MACC_FORCE_SPEED_EN_SHIFT    26
 #define I40E_PRTMAC_MACC_FORCE_SPEED_EN_MASK     I40E_MASK(0x1, I40E_PRTMAC_MACC_FORCE_SPEED_EN_SHIFT)
 
-#define I40E_PRTMAC_PAP                  0x001E2040
+#define I40E_PRTMAC_PAP                  0x001E2040 /* Reset: GLOBR */
 #define I40E_PRTMAC_PAP_TXPAUSECNT_SHIFT 0
 #define I40E_PRTMAC_PAP_TXPAUSECNT_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_PAP_TXPAUSECNT_SHIFT)
 #define I40E_PRTMAC_PAP_PACE_SHIFT       16
 #define I40E_PRTMAC_PAP_PACE_MASK        I40E_MASK(0xF, I40E_PRTMAC_PAP_PACE_SHIFT)
 
-#define I40E_PRTMAC_PCS_AN_CONTROL1              0x0008C600
+#define I40E_PRTMAC_PCS_AN_CONTROL1              0x0008C600 /* Reset: GLOBR */
 #define I40E_PRTMAC_PCS_AN_CONTROL1_ANACK2_SHIFT 1
 #define I40E_PRTMAC_PCS_AN_CONTROL1_ANACK2_MASK  I40E_MASK(0x1, I40E_PRTMAC_PCS_AN_CONTROL1_ANACK2_SHIFT)
 #define I40E_PRTMAC_PCS_AN_CONTROL1_ANSF_SHIFT   2
@@ -7969,7 +8326,7 @@
 #define I40E_PRTMAC_PCS_AN_CONTROL1_PB_SHIFT     28
 #define I40E_PRTMAC_PCS_AN_CONTROL1_PB_MASK      I40E_MASK(0x3, I40E_PRTMAC_PCS_AN_CONTROL1_PB_SHIFT)
 
-#define I40E_PRTMAC_PCS_AN_CONTROL2                          0x0008C620
+#define I40E_PRTMAC_PCS_AN_CONTROL2                          0x0008C620 /* Reset: GLOBR */
 #define I40E_PRTMAC_PCS_AN_CONTROL2_AN_PAGE_D_LOW_OVRD_SHIFT 0
 #define I40E_PRTMAC_PCS_AN_CONTROL2_AN_PAGE_D_LOW_OVRD_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_PCS_AN_CONTROL2_AN_PAGE_D_LOW_OVRD_SHIFT)
 #define I40E_PRTMAC_PCS_AN_CONTROL2_RSVD_SHIFT               16
@@ -7993,7 +8350,7 @@
 #define I40E_PRTMAC_PCS_AN_CONTROL2_FEC_FORCE_SHIFT          31
 #define I40E_PRTMAC_PCS_AN_CONTROL2_FEC_FORCE_MASK           I40E_MASK(0x1, I40E_PRTMAC_PCS_AN_CONTROL2_FEC_FORCE_SHIFT)
 
-#define I40E_PRTMAC_PCS_AN_CONTROL4                                 0x0008C660
+#define I40E_PRTMAC_PCS_AN_CONTROL4                                 0x0008C660 /* Reset: GLOBR */
 #define I40E_PRTMAC_PCS_AN_CONTROL4_RESERVED0_SHIFT                 0
 #define I40E_PRTMAC_PCS_AN_CONTROL4_RESERVED0_MASK                  I40E_MASK(0x1FFF, I40E_PRTMAC_PCS_AN_CONTROL4_RESERVED0_SHIFT)
 #define I40E_PRTMAC_PCS_AN_CONTROL4_FORCE_KR_EEE_AN_VALUE_SHIFT     13
@@ -8015,7 +8372,7 @@
 #define I40E_PRTMAC_PCS_AN_CONTROL4_RESERVED1_SHIFT                 21
 #define I40E_PRTMAC_PCS_AN_CONTROL4_RESERVED1_MASK                  I40E_MASK(0x7FF, I40E_PRTMAC_PCS_AN_CONTROL4_RESERVED1_SHIFT)
 
-#define I40E_PRTMAC_PCS_LINK_CTRL                                0x0008C260
+#define I40E_PRTMAC_PCS_LINK_CTRL                                0x0008C260 /* Reset: GLOBR */
 #define I40E_PRTMAC_PCS_LINK_CTRL_PMD_40G_R_TYPE_SELECTION_SHIFT 0
 #define I40E_PRTMAC_PCS_LINK_CTRL_PMD_40G_R_TYPE_SELECTION_MASK  I40E_MASK(0x3, I40E_PRTMAC_PCS_LINK_CTRL_PMD_40G_R_TYPE_SELECTION_SHIFT)
 #define I40E_PRTMAC_PCS_LINK_CTRL_PMD_10G_R_TYPE_SELECTION_SHIFT 2
@@ -8059,7 +8416,7 @@
 #define I40E_PRTMAC_PCS_LINK_CTRL_RESTART_AUTO_NEG_SHIFT         31
 #define I40E_PRTMAC_PCS_LINK_CTRL_RESTART_AUTO_NEG_MASK          I40E_MASK(0x1, I40E_PRTMAC_PCS_LINK_CTRL_RESTART_AUTO_NEG_SHIFT)
 
-#define I40E_PRTMAC_PCS_LINK_STATUS1                                 0x0008C200
+#define I40E_PRTMAC_PCS_LINK_STATUS1                                 0x0008C200 /* Reset: GLOBR */
 #define I40E_PRTMAC_PCS_LINK_STATUS1_SIGNAL_DETECTED_1G_MODE_SHIFT   5
 #define I40E_PRTMAC_PCS_LINK_STATUS1_SIGNAL_DETECTED_1G_MODE_MASK    I40E_MASK(0x1, I40E_PRTMAC_PCS_LINK_STATUS1_SIGNAL_DETECTED_1G_MODE_SHIFT)
 #define I40E_PRTMAC_PCS_LINK_STATUS1_SIGNAL_DETECTED_LANE_0_SHIFT    6
@@ -8107,7 +8464,7 @@
 #define I40E_PRTMAC_PCS_LINK_STATUS1_MAC_READY_SHIFT                 30
 #define I40E_PRTMAC_PCS_LINK_STATUS1_MAC_READY_MASK                  I40E_MASK(0x1, I40E_PRTMAC_PCS_LINK_STATUS1_MAC_READY_SHIFT)
 
-#define I40E_PRTMAC_PCS_LINK_STATUS2                             0x0008C220
+#define I40E_PRTMAC_PCS_LINK_STATUS2                             0x0008C220 /* Reset: GLOBR */
 #define I40E_PRTMAC_PCS_LINK_STATUS2_SIGNAL_DETECTED_FEC_SHIFT   1
 #define I40E_PRTMAC_PCS_LINK_STATUS2_SIGNAL_DETECTED_FEC_MASK    I40E_MASK(0x1, I40E_PRTMAC_PCS_LINK_STATUS2_SIGNAL_DETECTED_FEC_SHIFT)
 #define I40E_PRTMAC_PCS_LINK_STATUS2_FEC_BLOCK_LOCK_SHIFT        2
@@ -8129,33 +8486,33 @@
 #define I40E_PRTMAC_PCS_LINK_STATUS2_BP_AN_RECEIVER_IDLE_SHIFT   19
 #define I40E_PRTMAC_PCS_LINK_STATUS2_BP_AN_RECEIVER_IDLE_MASK    I40E_MASK(0x1, I40E_PRTMAC_PCS_LINK_STATUS2_BP_AN_RECEIVER_IDLE_SHIFT)
 
-#define I40E_PRTMAC_PCS_MUX_KR                  0x0008C000
+#define I40E_PRTMAC_PCS_MUX_KR                  0x0008C000 /* Reset: GLOBR */
 #define I40E_PRTMAC_PCS_MUX_KR_PCS_MUX_KR_SHIFT 0
 #define I40E_PRTMAC_PCS_MUX_KR_PCS_MUX_KR_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTMAC_PCS_MUX_KR_PCS_MUX_KR_SHIFT)
 
-#define I40E_PRTMAC_PCS_MUX_KX                  0x0008C008
+#define I40E_PRTMAC_PCS_MUX_KX                  0x0008C008 /* Reset: GLOBR */
 #define I40E_PRTMAC_PCS_MUX_KX_PCS_MUX_KX_SHIFT 0
 #define I40E_PRTMAC_PCS_MUX_KX_PCS_MUX_KX_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTMAC_PCS_MUX_KX_PCS_MUX_KX_SHIFT)
 
-#define I40E_PRTMAC_PHY_ANA_ADD               0x000A4038
+#define I40E_PRTMAC_PHY_ANA_ADD               0x000A4038 /* Reset: GLOBR */
 #define I40E_PRTMAC_PHY_ANA_ADD_ADDRESS_SHIFT 0
 #define I40E_PRTMAC_PHY_ANA_ADD_ADDRESS_MASK  I40E_MASK(0xFFFF, I40E_PRTMAC_PHY_ANA_ADD_ADDRESS_SHIFT)
 #define I40E_PRTMAC_PHY_ANA_ADD_BYTE_EN_SHIFT 28
 #define I40E_PRTMAC_PHY_ANA_ADD_BYTE_EN_MASK  I40E_MASK(0xF, I40E_PRTMAC_PHY_ANA_ADD_BYTE_EN_SHIFT)
 
-#define I40E_PRTMAC_PHY_ANA_DATA            0x000A403c
+#define I40E_PRTMAC_PHY_ANA_DATA            0x000A403c /* Reset: GLOBR */
 #define I40E_PRTMAC_PHY_ANA_DATA_DATA_SHIFT 0
 #define I40E_PRTMAC_PHY_ANA_DATA_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTMAC_PHY_ANA_DATA_DATA_SHIFT)
 
-#define I40E_PRTMAC_PMD_MUX_KR                  0x0008C004
+#define I40E_PRTMAC_PMD_MUX_KR                  0x0008C004 /* Reset: GLOBR */
 #define I40E_PRTMAC_PMD_MUX_KR_PMD_MUX_KR_SHIFT 0
 #define I40E_PRTMAC_PMD_MUX_KR_PMD_MUX_KR_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTMAC_PMD_MUX_KR_PMD_MUX_KR_SHIFT)
 
-#define I40E_PRTMAC_PMD_MUX_KX                  0x0008C00C
+#define I40E_PRTMAC_PMD_MUX_KX                  0x0008C00C /* Reset: GLOBR */
 #define I40E_PRTMAC_PMD_MUX_KX_PMD_MUX_KX_SHIFT 0
 #define I40E_PRTMAC_PMD_MUX_KX_PMD_MUX_KX_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTMAC_PMD_MUX_KX_PMD_MUX_KX_SHIFT)
 
-#define I40E_PRTMAC_TREG                        0x001E2160
+#define I40E_PRTMAC_TREG                        0x001E2160 /* Reset: GLOBR */
 #define I40E_PRTMAC_TREG_ILGLCODETXERRTST_SHIFT 0
 #define I40E_PRTMAC_TREG_ILGLCODETXERRTST_MASK  I40E_MASK(0xFF, I40E_PRTMAC_TREG_ILGLCODETXERRTST_SHIFT)
 #define I40E_PRTMAC_TREG_CTRLTXERRTST_SHIFT     8
@@ -8169,11 +8526,11 @@
 
 /* PF - Manageability  Registers  */
 
-#define I40E_EMP_TCO_ISOLATE                       0x00078E80
+#define I40E_EMP_TCO_ISOLATE                       0x00078E80 /* Reset: POR */
 #define I40E_EMP_TCO_ISOLATE_EMP_TCO_ISOLATE_SHIFT 0
 #define I40E_EMP_TCO_ISOLATE_EMP_TCO_ISOLATE_MASK  I40E_MASK(0xFFFF, I40E_EMP_TCO_ISOLATE_EMP_TCO_ISOLATE_SHIFT)
 
-#define I40E_GL_MNG_FRIACR            0x00083240
+#define I40E_GL_MNG_FRIACR            0x00083240 /* Reset: EMPR */
 #define I40E_GL_MNG_FRIACR_ADDR_SHIFT 0
 #define I40E_GL_MNG_FRIACR_ADDR_MASK  I40E_MASK(0x1FFFFF, I40E_GL_MNG_FRIACR_ADDR_SHIFT)
 #define I40E_GL_MNG_FRIACR_WR_SHIFT   24
@@ -8181,21 +8538,21 @@
 #define I40E_GL_MNG_FRIACR_RD_SHIFT   25
 #define I40E_GL_MNG_FRIACR_RD_MASK    I40E_MASK(0x1, I40E_GL_MNG_FRIACR_RD_SHIFT)
 
-#define I40E_GL_MNG_FRIARDR             0x00083248
+#define I40E_GL_MNG_FRIARDR             0x00083248 /* Reset: EMPR */
 #define I40E_GL_MNG_FRIARDR_RDATA_SHIFT 0
 #define I40E_GL_MNG_FRIARDR_RDATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_MNG_FRIARDR_RDATA_SHIFT)
 
-#define I40E_GL_MNG_FRIARR              0x0008324C
+#define I40E_GL_MNG_FRIARR              0x0008324C /* Reset: EMPR */
 #define I40E_GL_MNG_FRIARR_HALT_SHIFT   0
 #define I40E_GL_MNG_FRIARR_HALT_MASK    I40E_MASK(0x1, I40E_GL_MNG_FRIARR_HALT_SHIFT)
 #define I40E_GL_MNG_FRIARR_RST_EN_SHIFT 1
 #define I40E_GL_MNG_FRIARR_RST_EN_MASK  I40E_MASK(0x1, I40E_GL_MNG_FRIARR_RST_EN_SHIFT)
 
-#define I40E_GL_MNG_FRIAWDR             0x00083244
+#define I40E_GL_MNG_FRIAWDR             0x00083244 /* Reset: EMPR */
 #define I40E_GL_MNG_FRIAWDR_WDATA_SHIFT 0
 #define I40E_GL_MNG_FRIAWDR_WDATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_MNG_FRIAWDR_WDATA_SHIFT)
 
-#define I40E_GL_MNG_RRDFM                      0x00083040
+#define I40E_GL_MNG_RRDFM                      0x00083040 /* Reset: EMPR */
 #define I40E_GL_MNG_RRDFM_RMII_DBG_FIL_0_SHIFT 0
 #define I40E_GL_MNG_RRDFM_RMII_DBG_FIL_0_MASK  I40E_MASK(0x1, I40E_GL_MNG_RRDFM_RMII_DBG_FIL_0_SHIFT)
 #define I40E_GL_MNG_RRDFM_RMII_DBG_FIL_1_SHIFT 1
@@ -8205,11 +8562,11 @@
 #define I40E_GL_MNG_RRDFM_RMII_DBG_FIL_3_SHIFT 3
 #define I40E_GL_MNG_RRDFM_RMII_DBG_FIL_3_MASK  I40E_MASK(0x1, I40E_GL_MNG_RRDFM_RMII_DBG_FIL_3_SHIFT)
 
-#define I40E_GL_SWR_PL_THR                  0x00269FDC
+#define I40E_GL_SWR_PL_THR                  0x00269FDC /* Reset: CORER */
 #define I40E_GL_SWR_PL_THR_PIPE_LIMIT_SHIFT 0
 #define I40E_GL_SWR_PL_THR_PIPE_LIMIT_MASK  I40E_MASK(0xFF, I40E_GL_SWR_PL_THR_PIPE_LIMIT_SHIFT)
 
-#define I40E_GL_SWR_PM_UP_THR                 0x00269FBC
+#define I40E_GL_SWR_PM_UP_THR                 0x00269FBC /* Reset: CORER */
 #define I40E_GL_SWR_PM_UP_THR_UP_PORT_0_SHIFT 0
 #define I40E_GL_SWR_PM_UP_THR_UP_PORT_0_MASK  I40E_MASK(0xFF, I40E_GL_SWR_PM_UP_THR_UP_PORT_0_SHIFT)
 #define I40E_GL_SWR_PM_UP_THR_UP_PORT_1_SHIFT 8
@@ -8219,7 +8576,7 @@
 #define I40E_GL_SWR_PM_UP_THR_UP_PORT_3_SHIFT 24
 #define I40E_GL_SWR_PM_UP_THR_UP_PORT_3_MASK  I40E_MASK(0xFF, I40E_GL_SWR_PM_UP_THR_UP_PORT_3_SHIFT)
 
-#define I40E_PRT_MNG_FTFT_IGNORETAGS                                 0x00085280
+#define I40E_PRT_MNG_FTFT_IGNORETAGS                                 0x00085280 /* Reset: POR */
 #define I40E_PRT_MNG_FTFT_IGNORETAGS_PRT_MNG_FTFT_IGNORETAGS_0_SHIFT 0
 #define I40E_PRT_MNG_FTFT_IGNORETAGS_PRT_MNG_FTFT_IGNORETAGS_0_MASK  I40E_MASK(0x1, I40E_PRT_MNG_FTFT_IGNORETAGS_PRT_MNG_FTFT_IGNORETAGS_0_SHIFT)
 #define I40E_PRT_MNG_FTFT_IGNORETAGS_PRT_MNG_FTFT_IGNORETAGS_SHIFT   2
@@ -8229,13 +8586,13 @@
 
 /* PF - NVM Registers  */
 
-#define I40E_EMPNVM_FLCNT             0x000B6128
+#define I40E_EMPNVM_FLCNT             0x000B6128 /* Reset: POR */
 #define I40E_EMPNVM_FLCNT_RDCNT_SHIFT 0
 #define I40E_EMPNVM_FLCNT_RDCNT_MASK  I40E_MASK(0x1FFFFFF, I40E_EMPNVM_FLCNT_RDCNT_SHIFT)
 #define I40E_EMPNVM_FLCNT_ABORT_SHIFT 31
 #define I40E_EMPNVM_FLCNT_ABORT_MASK  I40E_MASK(0x1, I40E_EMPNVM_FLCNT_ABORT_SHIFT)
 
-#define I40E_EMPNVM_FLCTL              0x000B6120
+#define I40E_EMPNVM_FLCTL              0x000B6120 /* Reset: POR */
 #define I40E_EMPNVM_FLCTL_ADDR_SHIFT   0
 #define I40E_EMPNVM_FLCTL_ADDR_MASK    I40E_MASK(0xFFFFFF, I40E_EMPNVM_FLCTL_ADDR_SHIFT)
 #define I40E_EMPNVM_FLCTL_CMD_SHIFT    24
@@ -8249,11 +8606,11 @@
 #define I40E_EMPNVM_FLCTL_GLDONE_SHIFT 31
 #define I40E_EMPNVM_FLCTL_GLDONE_MASK  I40E_MASK(0x1, I40E_EMPNVM_FLCTL_GLDONE_SHIFT)
 
-#define I40E_EMPNVM_FLDATA                 0x000B6124
+#define I40E_EMPNVM_FLDATA                 0x000B6124 /* Reset: POR */
 #define I40E_EMPNVM_FLDATA_FLMNGDATA_SHIFT 0
 #define I40E_EMPNVM_FLDATA_FLMNGDATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_EMPNVM_FLDATA_FLMNGDATA_SHIFT)
 
-#define I40E_EMPNVM_SRCTL                     0x000B6118
+#define I40E_EMPNVM_SRCTL                     0x000B6118 /* Reset: POR */
 #define I40E_EMPNVM_SRCTL_ADDR_SHIFT          0
 #define I40E_EMPNVM_SRCTL_ADDR_MASK           I40E_MASK(0x7FFF, I40E_EMPNVM_SRCTL_ADDR_SHIFT)
 #define I40E_EMPNVM_SRCTL_START_SHIFT         15
@@ -8271,31 +8628,31 @@
 #define I40E_EMPNVM_SRCTL_DONE_SHIFT          31
 #define I40E_EMPNVM_SRCTL_DONE_MASK           I40E_MASK(0x1, I40E_EMPNVM_SRCTL_DONE_SHIFT)
 
-#define I40E_EMPNVM_SRDATA              0x000B611C
+#define I40E_EMPNVM_SRDATA              0x000B611C /* Reset: POR */
 #define I40E_EMPNVM_SRDATA_WRDATA_SHIFT 0
 #define I40E_EMPNVM_SRDATA_WRDATA_MASK  I40E_MASK(0xFFFF, I40E_EMPNVM_SRDATA_WRDATA_SHIFT)
 #define I40E_EMPNVM_SRDATA_RDDATA_SHIFT 16
 #define I40E_EMPNVM_SRDATA_RDDATA_MASK  I40E_MASK(0xFFFF, I40E_EMPNVM_SRDATA_RDDATA_SHIFT)
 
-#define I40E_GLNVM_ALTIMERS                   0x000B6140
+#define I40E_GLNVM_ALTIMERS                   0x000B6140 /* Reset: POR */
 #define I40E_GLNVM_ALTIMERS_PCI_ALTIMER_SHIFT 0
 #define I40E_GLNVM_ALTIMERS_PCI_ALTIMER_MASK  I40E_MASK(0xFFF, I40E_GLNVM_ALTIMERS_PCI_ALTIMER_SHIFT)
 #define I40E_GLNVM_ALTIMERS_GEN_ALTIMER_SHIFT 12
 #define I40E_GLNVM_ALTIMERS_GEN_ALTIMER_MASK  I40E_MASK(0xFFFFF, I40E_GLNVM_ALTIMERS_GEN_ALTIMER_SHIFT)
 
-#define I40E_GLNVM_EMPLD                       0x000B610C
+#define I40E_GLNVM_EMPLD                       0x000B610C /* Reset: POR */
 #define I40E_GLNVM_EMPLD_EMP_CORE_DONE_SHIFT   3
 #define I40E_GLNVM_EMPLD_EMP_CORE_DONE_MASK    I40E_MASK(0x1, I40E_GLNVM_EMPLD_EMP_CORE_DONE_SHIFT)
 #define I40E_GLNVM_EMPLD_EMP_GLOBAL_DONE_SHIFT 4
 #define I40E_GLNVM_EMPLD_EMP_GLOBAL_DONE_MASK  I40E_MASK(0x1, I40E_GLNVM_EMPLD_EMP_GLOBAL_DONE_SHIFT)
 
-#define I40E_GLNVM_EMPRQ                       0x000B613C
+#define I40E_GLNVM_EMPRQ                       0x000B613C /* Reset: POR */
 #define I40E_GLNVM_EMPRQ_EMP_CORE_REQD_SHIFT   3
 #define I40E_GLNVM_EMPRQ_EMP_CORE_REQD_MASK    I40E_MASK(0x1, I40E_GLNVM_EMPRQ_EMP_CORE_REQD_SHIFT)
 #define I40E_GLNVM_EMPRQ_EMP_GLOBAL_REQD_SHIFT 4
 #define I40E_GLNVM_EMPRQ_EMP_GLOBAL_REQD_MASK  I40E_MASK(0x1, I40E_GLNVM_EMPRQ_EMP_GLOBAL_REQD_SHIFT)
 
-#define I40E_GLNVM_SRLD                        0x000B600C
+#define I40E_GLNVM_SRLD                        0x000B600C /* Reset: POR */
 #define I40E_GLNVM_SRLD_HW_PCIR_DONE_SHIFT     0
 #define I40E_GLNVM_SRLD_HW_PCIR_DONE_MASK      I40E_MASK(0x1, I40E_GLNVM_SRLD_HW_PCIR_DONE_SHIFT)
 #define I40E_GLNVM_SRLD_HW_PCIRTL_DONE_SHIFT   1
@@ -8317,7 +8674,7 @@
 #define I40E_GLNVM_SRLD_HW_PCIALT_DONE_SHIFT   9
 #define I40E_GLNVM_SRLD_HW_PCIALT_DONE_MASK    I40E_MASK(0x1, I40E_GLNVM_SRLD_HW_PCIALT_DONE_SHIFT)
 
-#define I40E_GLNVM_ULT                      0x000B6154
+#define I40E_GLNVM_ULT                      0x000B6154 /* Reset: POR */
 #define I40E_GLNVM_ULT_CONF_PCIR_AE_SHIFT   0
 #define I40E_GLNVM_ULT_CONF_PCIR_AE_MASK    I40E_MASK(0x1, I40E_GLNVM_ULT_CONF_PCIR_AE_SHIFT)
 #define I40E_GLNVM_ULT_CONF_PCIRTL_AE_SHIFT 1
@@ -8335,7 +8692,7 @@
 #define I40E_GLNVM_ULT_CONF_PCIALT_AE_SHIFT 9
 #define I40E_GLNVM_ULT_CONF_PCIALT_AE_MASK  I40E_MASK(0x1, I40E_GLNVM_ULT_CONF_PCIALT_AE_SHIFT)
 
-#define I40E_MEM_INIT_GATE_AL_DONE                                    0x000B6004
+#define I40E_MEM_INIT_GATE_AL_DONE                                    0x000B6004 /* Reset: POR */
 #define I40E_MEM_INIT_GATE_AL_DONE_CMLAN_INIT_DONE_GATE_AL_DONE_SHIFT 0
 #define I40E_MEM_INIT_GATE_AL_DONE_CMLAN_INIT_DONE_GATE_AL_DONE_MASK  I40E_MASK(0x1, I40E_MEM_INIT_GATE_AL_DONE_CMLAN_INIT_DONE_GATE_AL_DONE_SHIFT)
 #define I40E_MEM_INIT_GATE_AL_DONE_PMAT_INIT_DONE_GATE_AL_DONE_SHIFT  1
@@ -8371,7 +8728,7 @@
 #define I40E_MEM_INIT_GATE_AL_DONE_ITR_INIT_DONE_GATE_AL_DONE_SHIFT   16
 #define I40E_MEM_INIT_GATE_AL_DONE_ITR_INIT_DONE_GATE_AL_DONE_MASK    I40E_MASK(0x1, I40E_MEM_INIT_GATE_AL_DONE_ITR_INIT_DONE_GATE_AL_DONE_SHIFT)
 
-#define I40E_MEM_INIT_GATE_AL_STR                                    0x000B6000
+#define I40E_MEM_INIT_GATE_AL_STR                                    0x000B6000 /* Reset: POR */
 #define I40E_MEM_INIT_GATE_AL_STR_CMLAN_INIT_DONE_GATE_AL_STRT_SHIFT 0
 #define I40E_MEM_INIT_GATE_AL_STR_CMLAN_INIT_DONE_GATE_AL_STRT_MASK  I40E_MASK(0x1, I40E_MEM_INIT_GATE_AL_STR_CMLAN_INIT_DONE_GATE_AL_STRT_SHIFT)
 #define I40E_MEM_INIT_GATE_AL_STR_PMAT_INIT_DONE_GATE_AL_STRT_SHIFT  1
@@ -8409,7 +8766,7 @@
 
 /* PF - PCIe Registers  */
 
-#define I40E_EMP_PCI_CIAA               0x0009C4D0
+#define I40E_EMP_PCI_CIAA               0x0009C4D0 /* Reset: PCIR */
 #define I40E_EMP_PCI_CIAA_ADDRESS_SHIFT 0
 #define I40E_EMP_PCI_CIAA_ADDRESS_MASK  I40E_MASK(0xFFF, I40E_EMP_PCI_CIAA_ADDRESS_SHIFT)
 #define I40E_EMP_PCI_CIAA_FNUM_SHIFT    12
@@ -8417,40 +8774,40 @@
 #define I40E_EMP_PCI_CIAA_PF_SHIFT      19
 #define I40E_EMP_PCI_CIAA_PF_MASK       I40E_MASK(0x1, I40E_EMP_PCI_CIAA_PF_SHIFT)
 
-#define I40E_EMP_PCI_CIAD            0x0009C4D4
+#define I40E_EMP_PCI_CIAD            0x0009C4D4 /* Reset: PCIR */
 #define I40E_EMP_PCI_CIAD_DATA_SHIFT 0
 #define I40E_EMP_PCI_CIAD_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_EMP_PCI_CIAD_DATA_SHIFT)
 
-#define I40E_GL_PCI_DBGCTL                            0x000BE4F4
+#define I40E_GL_PCI_DBGCTL                            0x000BE4F4 /* Reset: PCIR */
 #define I40E_GL_PCI_DBGCTL_CONFIG_ACCESS_ENABLE_SHIFT 0
 #define I40E_GL_PCI_DBGCTL_CONFIG_ACCESS_ENABLE_MASK  I40E_MASK(0x1, I40E_GL_PCI_DBGCTL_CONFIG_ACCESS_ENABLE_SHIFT)
 
-#define I40E_GLGEN_FWPFRSTAT              0x0009C4E8
+#define I40E_GLGEN_FWPFRSTAT              0x0009C4E8 /* Reset: PCIR */
 #define I40E_GLGEN_FWPFRSTAT_PF_FLR_SHIFT 0
 #define I40E_GLGEN_FWPFRSTAT_PF_FLR_MASK  I40E_MASK(0xFFFF, I40E_GLGEN_FWPFRSTAT_PF_FLR_SHIFT)
 
-#define I40E_GLGEN_FWVFRSTAT(_i)          (0x0009C4D8 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLGEN_FWVFRSTAT(_i)          (0x0009C4D8 + ((_i) * 4)) /* _i=0...3 */ /* Reset: PCIR */
 #define I40E_GLGEN_FWVFRSTAT_MAX_INDEX    3
 #define I40E_GLGEN_FWVFRSTAT_VF_FLR_SHIFT 0
 #define I40E_GLGEN_FWVFRSTAT_VF_FLR_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLGEN_FWVFRSTAT_VF_FLR_SHIFT)
 
-#define I40E_GLGEN_PCIFCNCNT_PCI                0x000BE4A0
+#define I40E_GLGEN_PCIFCNCNT_PCI                0x000BE4A0 /* Reset: PCIR */
 #define I40E_GLGEN_PCIFCNCNT_PCI_PCIPFCNT_SHIFT 0
 #define I40E_GLGEN_PCIFCNCNT_PCI_PCIPFCNT_MASK  I40E_MASK(0x1F, I40E_GLGEN_PCIFCNCNT_PCI_PCIPFCNT_SHIFT)
 #define I40E_GLGEN_PCIFCNCNT_PCI_PCIVFCNT_SHIFT 16
 #define I40E_GLGEN_PCIFCNCNT_PCI_PCIVFCNT_MASK  I40E_MASK(0xFF, I40E_GLGEN_PCIFCNCNT_PCI_PCIVFCNT_SHIFT)
 
-#define I40E_GLPCI_ANA_ADD               0x000BA000
+#define I40E_GLPCI_ANA_ADD               0x000BA000 /* Reset: POR */
 #define I40E_GLPCI_ANA_ADD_ADDRESS_SHIFT 0
 #define I40E_GLPCI_ANA_ADD_ADDRESS_MASK  I40E_MASK(0xFFFF, I40E_GLPCI_ANA_ADD_ADDRESS_SHIFT)
 #define I40E_GLPCI_ANA_ADD_BYTE_EN_SHIFT 28
 #define I40E_GLPCI_ANA_ADD_BYTE_EN_MASK  I40E_MASK(0xF, I40E_GLPCI_ANA_ADD_BYTE_EN_SHIFT)
 
-#define I40E_GLPCI_ANA_DATA            0x000BA004
+#define I40E_GLPCI_ANA_DATA            0x000BA004 /* Reset: POR */
 #define I40E_GLPCI_ANA_DATA_DATA_SHIFT 0
 #define I40E_GLPCI_ANA_DATA_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_ANA_DATA_DATA_SHIFT)
 
-#define I40E_GLPCI_LCBADD                0x0009C4C0
+#define I40E_GLPCI_LCBADD                0x0009C4C0 /* Reset: PCIR */
 #define I40E_GLPCI_LCBADD_ADDRESS_SHIFT  0
 #define I40E_GLPCI_LCBADD_ADDRESS_MASK   I40E_MASK(0x3FFFF, I40E_GLPCI_LCBADD_ADDRESS_SHIFT)
 #define I40E_GLPCI_LCBADD_BLOCK_ID_SHIFT 20
@@ -8458,23 +8815,23 @@
 #define I40E_GLPCI_LCBADD_LOCK_SHIFT     31
 #define I40E_GLPCI_LCBADD_LOCK_MASK      I40E_MASK(0x1, I40E_GLPCI_LCBADD_LOCK_SHIFT)
 
-#define I40E_GLPCI_LCBDATA                0x0009C4C4
+#define I40E_GLPCI_LCBDATA                0x0009C4C4 /* Reset: PCIR */
 #define I40E_GLPCI_LCBDATA_LCB_DATA_SHIFT 0
 #define I40E_GLPCI_LCBDATA_LCB_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPCI_LCBDATA_LCB_DATA_SHIFT)
 
-#define I40E_GLPCI_PCITEST1                  0x000BE488
+#define I40E_GLPCI_PCITEST1                  0x000BE488 /* Reset: PCIR */
 #define I40E_GLPCI_PCITEST1_IGNORE_RID_SHIFT 0
 #define I40E_GLPCI_PCITEST1_IGNORE_RID_MASK  I40E_MASK(0x1, I40E_GLPCI_PCITEST1_IGNORE_RID_SHIFT)
 #define I40E_GLPCI_PCITEST1_V_MSIX_EN_SHIFT  2
 #define I40E_GLPCI_PCITEST1_V_MSIX_EN_MASK   I40E_MASK(0x1, I40E_GLPCI_PCITEST1_V_MSIX_EN_SHIFT)
 
-#define I40E_GLPCI_PCITEST2                     0x000BE4BC
+#define I40E_GLPCI_PCITEST2                     0x000BE4BC /* Reset: PCIR */
 #define I40E_GLPCI_PCITEST2_IOV_TEST_MODE_SHIFT 0
 #define I40E_GLPCI_PCITEST2_IOV_TEST_MODE_MASK  I40E_MASK(0x1, I40E_GLPCI_PCITEST2_IOV_TEST_MODE_SHIFT)
 #define I40E_GLPCI_PCITEST2_TAG_ALLOC_SHIFT     1
 #define I40E_GLPCI_PCITEST2_TAG_ALLOC_MASK      I40E_MASK(0x1, I40E_GLPCI_PCITEST2_TAG_ALLOC_SHIFT)
 
-#define I40E_GLTPH_CTRL                         0x000BE480
+#define I40E_GLTPH_CTRL                         0x000BE480 /* Reset: PCIR */
 #define I40E_GLTPH_CTRL_DISABLE_READ_HINT_SHIFT 8
 #define I40E_GLTPH_CTRL_DISABLE_READ_HINT_MASK  I40E_MASK(0x1, I40E_GLTPH_CTRL_DISABLE_READ_HINT_SHIFT)
 #define I40E_GLTPH_CTRL_DESC_PH_SHIFT           9
@@ -8484,7 +8841,7 @@
 #define I40E_GLTPH_CTRL_TPH_AUTOLEARN_SHIFT     13
 #define I40E_GLTPH_CTRL_TPH_AUTOLEARN_MASK      I40E_MASK(0x1, I40E_GLTPH_CTRL_TPH_AUTOLEARN_SHIFT)
 
-#define I40E_PF_VT_PFALLOC_PCIE               0x000BE380
+#define I40E_PF_VT_PFALLOC_PCIE               0x000BE380 /* Reset: PCIR */
 #define I40E_PF_VT_PFALLOC_PCIE_FIRSTVF_SHIFT 0
 #define I40E_PF_VT_PFALLOC_PCIE_FIRSTVF_MASK  I40E_MASK(0xFF, I40E_PF_VT_PFALLOC_PCIE_FIRSTVF_SHIFT)
 #define I40E_PF_VT_PFALLOC_PCIE_LASTVF_SHIFT  8
@@ -8494,7 +8851,7 @@
 
 /* PF - Power Management Registers */
 
-#define I40E_GLPCI_PM_EN_STAT                        0x000BE4E4
+#define I40E_GLPCI_PM_EN_STAT                        0x000BE4E4 /* Reset: POR */
 #define I40E_GLPCI_PM_EN_STAT_PCIE_PME_EN_PF0_SHIFT  0
 #define I40E_GLPCI_PM_EN_STAT_PCIE_PME_EN_PF0_MASK   I40E_MASK(0x1, I40E_GLPCI_PM_EN_STAT_PCIE_PME_EN_PF0_SHIFT)
 #define I40E_GLPCI_PM_EN_STAT_PCIE_PME_EN_PF1_SHIFT  1
@@ -8528,17 +8885,17 @@
 #define I40E_GLPCI_PM_EN_STAT_PCIE_PME_EN_PF15_SHIFT 15
 #define I40E_GLPCI_PM_EN_STAT_PCIE_PME_EN_PF15_MASK  I40E_MASK(0x1, I40E_GLPCI_PM_EN_STAT_PCIE_PME_EN_PF15_SHIFT)
 
-#define I40E_GLPM_DMAC_ENC                 0x000881F0
+#define I40E_GLPM_DMAC_ENC                 0x000881F0 /* Reset: CORER */
 #define I40E_GLPM_DMAC_ENC_DMACENTRY_SHIFT 0
 #define I40E_GLPM_DMAC_ENC_DMACENTRY_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPM_DMAC_ENC_DMACENTRY_SHIFT)
 
-#define I40E_GLPM_DMAC_EXC                     0x000881FC
+#define I40E_GLPM_DMAC_EXC                     0x000881FC /* Reset: CORER */
 #define I40E_GLPM_DMAC_EXC_DMACTIMEREXIT_SHIFT 0
 #define I40E_GLPM_DMAC_EXC_DMACTIMEREXIT_MASK  I40E_MASK(0xFFFF, I40E_GLPM_DMAC_EXC_DMACTIMEREXIT_SHIFT)
 #define I40E_GLPM_DMAC_EXC_DMAIMMEXIT_SHIFT    16
 #define I40E_GLPM_DMAC_EXC_DMAIMMEXIT_MASK     I40E_MASK(0xFFFF, I40E_GLPM_DMAC_EXC_DMAIMMEXIT_SHIFT)
 
-#define I40E_GLPM_DMACR                                0x000881F4
+#define I40E_GLPM_DMACR                                0x000881F4 /* Reset: CORER */
 #define I40E_GLPM_DMACR_DMACWT_SHIFT                   0
 #define I40E_GLPM_DMACR_DMACWT_MASK                    I40E_MASK(0xFFFF, I40E_GLPM_DMACR_DMACWT_SHIFT)
 #define I40E_GLPM_DMACR_EXIT_DC_SHIFT                  29
@@ -8548,21 +8905,21 @@
 #define I40E_GLPM_DMACR_DMAC_EN_SHIFT                  31
 #define I40E_GLPM_DMACR_DMAC_EN_MASK                   I40E_MASK(0x1, I40E_GLPM_DMACR_DMAC_EN_SHIFT)
 
-#define I40E_GLPM_DMCTH               0x000AC7E4
+#define I40E_GLPM_DMCTH               0x000AC7E4 /* Reset: CORER */
 #define I40E_GLPM_DMCTH_DMACRXT_SHIFT 0
 #define I40E_GLPM_DMCTH_DMACRXT_MASK  I40E_MASK(0x3FF, I40E_GLPM_DMCTH_DMACRXT_SHIFT)
 
-#define I40E_GLPM_DMCTLX            0x000881F8
+#define I40E_GLPM_DMCTLX            0x000881F8 /* Reset: CORER */
 #define I40E_GLPM_DMCTLX_TTLX_SHIFT 0
 #define I40E_GLPM_DMCTLX_TTLX_MASK  I40E_MASK(0xFFF, I40E_GLPM_DMCTLX_TTLX_SHIFT)
 
-#define I40E_GLPM_EEE_SU                           0x001E4340
+#define I40E_GLPM_EEE_SU                           0x001E4340 /* Reset: GLOBR */
 #define I40E_GLPM_EEE_SU_DTW_MIN_1000_BASE_T_SHIFT 0
 #define I40E_GLPM_EEE_SU_DTW_MIN_1000_BASE_T_MASK  I40E_MASK(0xFF, I40E_GLPM_EEE_SU_DTW_MIN_1000_BASE_T_SHIFT)
 #define I40E_GLPM_EEE_SU_DTW_MIN_100_BASE_TX_SHIFT 8
 #define I40E_GLPM_EEE_SU_DTW_MIN_100_BASE_TX_MASK  I40E_MASK(0xFF, I40E_GLPM_EEE_SU_DTW_MIN_100_BASE_TX_SHIFT)
 
-#define I40E_GLPM_EEE_SU_EXT                            0x001E4344
+#define I40E_GLPM_EEE_SU_EXT                            0x001E4344 /* Reset: GLOBR */
 #define I40E_GLPM_EEE_SU_EXT_DTW_MIN_1000_BASE_KX_SHIFT 0
 #define I40E_GLPM_EEE_SU_EXT_DTW_MIN_1000_BASE_KX_MASK  I40E_MASK(0xFF, I40E_GLPM_EEE_SU_EXT_DTW_MIN_1000_BASE_KX_SHIFT)
 #define I40E_GLPM_EEE_SU_EXT_DTW_MIN_10GBASE_KX4_SHIFT  8
@@ -8572,7 +8929,7 @@
 #define I40E_GLPM_EEE_SU_EXT_DTW_MIN_10GBASE_T_SHIFT    24
 #define I40E_GLPM_EEE_SU_EXT_DTW_MIN_10GBASE_T_MASK     I40E_MASK(0xFF, I40E_GLPM_EEE_SU_EXT_DTW_MIN_10GBASE_T_SHIFT)
 
-#define I40E_GLPM_LTRC                         0x000BE500
+#define I40E_GLPM_LTRC                         0x000BE500 /* Reset: PCIR */
 #define I40E_GLPM_LTRC_SLTRV_SHIFT             0
 #define I40E_GLPM_LTRC_SLTRV_MASK              I40E_MASK(0x3FF, I40E_GLPM_LTRC_SLTRV_SHIFT)
 #define I40E_GLPM_LTRC_SSCALE_SHIFT            10
@@ -8588,70 +8945,70 @@
 #define I40E_GLPM_LTRC_LTRNS_REQUIREMENT_SHIFT 31
 #define I40E_GLPM_LTRC_LTRNS_REQUIREMENT_MASK  I40E_MASK(0x1, I40E_GLPM_LTRC_LTRNS_REQUIREMENT_SHIFT)
 
-#define I40E_PRTPM_EEEDBG                  0x001E4420
+#define I40E_PRTPM_EEEDBG                  0x001E4420 /* Reset: GLOBR */
 #define I40E_PRTPM_EEEDBG_FORCE_TLPI_SHIFT 0
 #define I40E_PRTPM_EEEDBG_FORCE_TLPI_MASK  I40E_MASK(0x1, I40E_PRTPM_EEEDBG_FORCE_TLPI_SHIFT)
 
-#define I40E_PRTPM_HPTC                   0x000AC800
+#define I40E_PRTPM_HPTC                   0x000AC800 /* Reset: CORER */
 #define I40E_PRTPM_HPTC_HIGH_PRI_TC_SHIFT 0
 #define I40E_PRTPM_HPTC_HIGH_PRI_TC_MASK  I40E_MASK(0xFF, I40E_PRTPM_HPTC_HIGH_PRI_TC_SHIFT)
 
 /* PF - Receive Packet Buffer Registers */
 
-#define I40E_GLRPB_DHWS               0x000AC820
+#define I40E_GLRPB_DHWS               0x000AC820 /* Reset: CORER */
 #define I40E_GLRPB_DHWS_DHW_TCN_SHIFT 0
 #define I40E_GLRPB_DHWS_DHW_TCN_MASK  I40E_MASK(0xFFFFF, I40E_GLRPB_DHWS_DHW_TCN_SHIFT)
 
-#define I40E_GLRPB_DLWS               0x000AC824
+#define I40E_GLRPB_DLWS               0x000AC824 /* Reset: CORER */
 #define I40E_GLRPB_DLWS_DLW_TCN_SHIFT 0
 #define I40E_GLRPB_DLWS_DLW_TCN_MASK  I40E_MASK(0xFFFFF, I40E_GLRPB_DLWS_DLW_TCN_SHIFT)
 
-#define I40E_GLRPB_GFC           0x000AC82C
+#define I40E_GLRPB_GFC           0x000AC82C /* Reset: CORER */
 #define I40E_GLRPB_GFC_GFC_SHIFT 0
 #define I40E_GLRPB_GFC_GFC_MASK  I40E_MASK(0xFFFFF, I40E_GLRPB_GFC_GFC_SHIFT)
 
-#define I40E_GLRPB_GPC           0x000AC838
+#define I40E_GLRPB_GPC           0x000AC838 /* Reset: CORER */
 #define I40E_GLRPB_GPC_GPC_SHIFT 0
 #define I40E_GLRPB_GPC_GPC_MASK  I40E_MASK(0x3FFF, I40E_GLRPB_GPC_GPC_SHIFT)
 
-#define I40E_GLRPB_LTRTL             0x000AC83C
+#define I40E_GLRPB_LTRTL             0x000AC83C /* Reset: CORER */
 #define I40E_GLRPB_LTRTL_LTRTL_SHIFT 0
 #define I40E_GLRPB_LTRTL_LTRTL_MASK  I40E_MASK(0x3FF, I40E_GLRPB_LTRTL_LTRTL_SHIFT)
 
-#define I40E_GLRPB_LTRTV             0x000AC840
+#define I40E_GLRPB_LTRTV             0x000AC840 /* Reset: CORER */
 #define I40E_GLRPB_LTRTV_LTRTV_SHIFT 0
 #define I40E_GLRPB_LTRTV_LTRTV_MASK  I40E_MASK(0x3FF, I40E_GLRPB_LTRTV_LTRTV_SHIFT)
 
-#define I40E_GLRPB_SHTS               0x000AC84C
+#define I40E_GLRPB_SHTS               0x000AC84C /* Reset: CORER */
 #define I40E_GLRPB_SHTS_SHT_TCN_SHIFT 0
 #define I40E_GLRPB_SHTS_SHT_TCN_MASK  I40E_MASK(0xFFFFF, I40E_GLRPB_SHTS_SHT_TCN_SHIFT)
 
-#define I40E_GLRPB_SHWS           0x000AC850
+#define I40E_GLRPB_SHWS           0x000AC850 /* Reset: CORER */
 #define I40E_GLRPB_SHWS_SHW_SHIFT 0
 #define I40E_GLRPB_SHWS_SHW_MASK  I40E_MASK(0xFFFFF, I40E_GLRPB_SHWS_SHW_SHIFT)
 
-#define I40E_GLRPB_SLTS               0x000AC854
+#define I40E_GLRPB_SLTS               0x000AC854 /* Reset: CORER */
 #define I40E_GLRPB_SLTS_SLT_TCN_SHIFT 0
 #define I40E_GLRPB_SLTS_SLT_TCN_MASK  I40E_MASK(0xFFFFF, I40E_GLRPB_SLTS_SLT_TCN_SHIFT)
 
-#define I40E_GLRPB_SLWS           0x000AC858
+#define I40E_GLRPB_SLWS           0x000AC858 /* Reset: CORER */
 #define I40E_GLRPB_SLWS_SLW_SHIFT 0
 #define I40E_GLRPB_SLWS_SLW_MASK  I40E_MASK(0xFFFFF, I40E_GLRPB_SLWS_SLW_SHIFT)
 
-#define I40E_GLRPB_SPSS           0x000AC85C
+#define I40E_GLRPB_SPSS           0x000AC85C /* Reset: CORER */
 #define I40E_GLRPB_SPSS_SPS_SHIFT 0
 #define I40E_GLRPB_SPSS_SPS_MASK  I40E_MASK(0xFFFFF, I40E_GLRPB_SPSS_SPS_SHIFT)
 
-#define I40E_PRTRPB_DFC(_i)           (0x000AC000 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTRPB_DFC(_i)           (0x000AC000 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRTRPB_DFC_MAX_INDEX     7
 #define I40E_PRTRPB_DFC_DFC_TCN_SHIFT 0
 #define I40E_PRTRPB_DFC_DFC_TCN_MASK  I40E_MASK(0xFFFFF, I40E_PRTRPB_DFC_DFC_TCN_SHIFT)
 
-#define I40E_PRTRPB_PFC           0x000AC420
+#define I40E_PRTRPB_PFC           0x000AC420 /* Reset: CORER */
 #define I40E_PRTRPB_PFC_PFC_SHIFT 0
 #define I40E_PRTRPB_PFC_PFC_MASK  I40E_MASK(0xFFFFF, I40E_PRTRPB_PFC_PFC_SHIFT)
 
-#define I40E_PRTRPB_RUP2TC             0x000AC440
+#define I40E_PRTRPB_RUP2TC             0x000AC440 /* Reset: CORER */
 #define I40E_PRTRPB_RUP2TC_UP0TC_SHIFT 0
 #define I40E_PRTRPB_RUP2TC_UP0TC_MASK  I40E_MASK(0x7, I40E_PRTRPB_RUP2TC_UP0TC_SHIFT)
 #define I40E_PRTRPB_RUP2TC_UP1TC_SHIFT 3
@@ -8669,22 +9026,22 @@
 #define I40E_PRTRPB_RUP2TC_UP7TC_SHIFT 21
 #define I40E_PRTRPB_RUP2TC_UP7TC_MASK  I40E_MASK(0x7, I40E_PRTRPB_RUP2TC_UP7TC_SHIFT)
 
-#define I40E_PRTRPB_SFC           0x000AC460
+#define I40E_PRTRPB_SFC           0x000AC460 /* Reset: CORER */
 #define I40E_PRTRPB_SFC_SFC_SHIFT 0
 #define I40E_PRTRPB_SFC_SFC_MASK  I40E_MASK(0xFFFFF, I40E_PRTRPB_SFC_SFC_SHIFT)
 
-#define I40E_PRTRPB_SOC(_i)           (0x000AC6C0 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRTRPB_SOC(_i)           (0x000AC6C0 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRTRPB_SOC_MAX_INDEX     7
 #define I40E_PRTRPB_SOC_SOC_TCN_SHIFT 0
 #define I40E_PRTRPB_SOC_SOC_TCN_MASK  I40E_MASK(0xFFFFF, I40E_PRTRPB_SOC_SOC_TCN_SHIFT)
 
-#define I40E_PRTRPB_TC2PFC              0x000AC200
+#define I40E_PRTRPB_TC2PFC              0x000AC200 /* Reset: CORER */
 #define I40E_PRTRPB_TC2PFC_TC2PFC_SHIFT 0
 #define I40E_PRTRPB_TC2PFC_TC2PFC_MASK  I40E_MASK(0xFF, I40E_PRTRPB_TC2PFC_TC2PFC_SHIFT)
 
 /* PF - Rx Filters Registers */
 
-#define I40E_GL_PRS_FVBM(_i)                 (0x00269760 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GL_PRS_FVBM(_i)                 (0x00269760 + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GL_PRS_FVBM_MAX_INDEX           3
 #define I40E_GL_PRS_FVBM_FV_BYTE_INDX_SHIFT  0
 #define I40E_GL_PRS_FVBM_FV_BYTE_INDX_MASK   I40E_MASK(0x7F, I40E_GL_PRS_FVBM_FV_BYTE_INDX_SHIFT)
@@ -8693,17 +9050,17 @@
 #define I40E_GL_PRS_FVBM_MSK_ENA_SHIFT       31
 #define I40E_GL_PRS_FVBM_MSK_ENA_MASK        I40E_MASK(0x1, I40E_GL_PRS_FVBM_MSK_ENA_SHIFT)
 
-#define I40E_GLCM_LAN_FCOEQCNT                    0x0010C438
+#define I40E_GLCM_LAN_FCOEQCNT                    0x0010C438 /* Reset: CORER */
 #define I40E_GLCM_LAN_FCOEQCNT_FCOE_DDP_CNT_SHIFT 10
 #define I40E_GLCM_LAN_FCOEQCNT_FCOE_DDP_CNT_MASK  I40E_MASK(0x3FF, I40E_GLCM_LAN_FCOEQCNT_FCOE_DDP_CNT_SHIFT)
 
-#define I40E_GLCM_LAN_LANQCNT                 0x0010C434
+#define I40E_GLCM_LAN_LANQCNT                 0x0010C434 /* Reset: CORER */
 #define I40E_GLCM_LAN_LANQCNT_LANTX_CNT_SHIFT 0
 #define I40E_GLCM_LAN_LANQCNT_LANTX_CNT_MASK  I40E_MASK(0x3FF, I40E_GLCM_LAN_LANQCNT_LANTX_CNT_SHIFT)
 #define I40E_GLCM_LAN_LANQCNT_LANRX_CNT_SHIFT 10
 #define I40E_GLCM_LAN_LANQCNT_LANRX_CNT_MASK  I40E_MASK(0x3FF, I40E_GLCM_LAN_LANQCNT_LANRX_CNT_SHIFT)
 
-#define I40E_GLFOC_CACHE_CTL                     0x000AA000
+#define I40E_GLFOC_CACHE_CTL                     0x000AA000 /* Reset: CORER */
 #define I40E_GLFOC_CACHE_CTL_FD_ALLOCATION_SHIFT 0
 #define I40E_GLFOC_CACHE_CTL_FD_ALLOCATION_MASK  I40E_MASK(0x3, I40E_GLFOC_CACHE_CTL_FD_ALLOCATION_SHIFT)
 #define I40E_GLFOC_CACHE_CTL_SCALE_FACTOR_SHIFT  2
@@ -8715,68 +9072,68 @@
 #define I40E_GLFOC_CACHE_CTL_DBGMUX_SEL_HI_SHIFT 16
 #define I40E_GLFOC_CACHE_CTL_DBGMUX_SEL_HI_MASK  I40E_MASK(0x1F, I40E_GLFOC_CACHE_CTL_DBGMUX_SEL_HI_SHIFT)
 
-#define I40E_GLFOC_FSTAT              0x000AA004
+#define I40E_GLFOC_FSTAT              0x000AA004 /* Reset: CORER */
 #define I40E_GLFOC_FSTAT_PE_CNT_SHIFT 0
 #define I40E_GLFOC_FSTAT_PE_CNT_MASK  I40E_MASK(0x7FF, I40E_GLFOC_FSTAT_PE_CNT_SHIFT)
 #define I40E_GLFOC_FSTAT_FC_CNT_SHIFT 16
 #define I40E_GLFOC_FSTAT_FC_CNT_MASK  I40E_MASK(0x7FF, I40E_GLFOC_FSTAT_FC_CNT_SHIFT)
 
-#define I40E_GLQF_FC_INSET(_i, _j)      (0x002695A0 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...3 */
+#define I40E_GLQF_FC_INSET(_i, _j)      (0x002695A0 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...3 */ /* Reset: CORER */
 #define I40E_GLQF_FC_INSET_MAX_INDEX   1
 #define I40E_GLQF_FC_INSET_INSET_SHIFT 0
 #define I40E_GLQF_FC_INSET_INSET_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLQF_FC_INSET_INSET_SHIFT)
 
-#define I40E_GLQF_FC_MSK(_i, _j)       (0x002690C0 + ((_i) * 4 + (_j) * 16)) /* _i=0...3, _j=0...3 */
+#define I40E_GLQF_FC_MSK(_i, _j)       (0x002690C0 + ((_i) * 4 + (_j) * 16)) /* _i=0...3, _j=0...3 */ /* Reset: CORER */
 #define I40E_GLQF_FC_MSK_MAX_INDEX    3
 #define I40E_GLQF_FC_MSK_MASK_SHIFT   0
 #define I40E_GLQF_FC_MSK_MASK_MASK    I40E_MASK(0xFFFF, I40E_GLQF_FC_MSK_MASK_SHIFT)
 #define I40E_GLQF_FC_MSK_OFFSET_SHIFT 16
 #define I40E_GLQF_FC_MSK_OFFSET_MASK  I40E_MASK(0x3F, I40E_GLQF_FC_MSK_OFFSET_SHIFT)
 
-#define I40E_GLQF_FCTYPE(_i)                (0x00269520 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLQF_FCTYPE(_i)                (0x00269520 + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLQF_FCTYPE_MAX_INDEX          3
 #define I40E_GLQF_FCTYPE_PCTYPE_INDEX_SHIFT 0
 #define I40E_GLQF_FCTYPE_PCTYPE_INDEX_MASK  I40E_MASK(0x3F, I40E_GLQF_FCTYPE_PCTYPE_INDEX_SHIFT)
 #define I40E_GLQF_FCTYPE_PCTYPE_ENA_SHIFT   7
 #define I40E_GLQF_FCTYPE_PCTYPE_ENA_MASK    I40E_MASK(0x1, I40E_GLQF_FCTYPE_PCTYPE_ENA_SHIFT)
 
-#define I40E_GLQF_FD_MSK(_i, _j)       (0x00267200 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...63 */
+#define I40E_GLQF_FD_MSK(_i, _j)       (0x00267200 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...63 */ /* Reset: CORER */
 #define I40E_GLQF_FD_MSK_MAX_INDEX    1
 #define I40E_GLQF_FD_MSK_MASK_SHIFT   0
 #define I40E_GLQF_FD_MSK_MASK_MASK    I40E_MASK(0xFFFF, I40E_GLQF_FD_MSK_MASK_SHIFT)
 #define I40E_GLQF_FD_MSK_OFFSET_SHIFT 16
 #define I40E_GLQF_FD_MSK_OFFSET_MASK  I40E_MASK(0x3F, I40E_GLQF_FD_MSK_OFFSET_SHIFT)
 
-#define I40E_GLQF_FDCNT_1                 0x00269BB4
+#define I40E_GLQF_FDCNT_1                 0x00269BB4 /* Reset: CORER */
 #define I40E_GLQF_FDCNT_1_BUCKETCNT_SHIFT 0
 #define I40E_GLQF_FDCNT_1_BUCKETCNT_MASK  I40E_MASK(0x3FFF, I40E_GLQF_FDCNT_1_BUCKETCNT_SHIFT)
 
-#define I40E_GLQF_FDCNT_2                0x00269BBC
+#define I40E_GLQF_FDCNT_2                0x00269BBC /* Reset: CORER */
 #define I40E_GLQF_FDCNT_2_HITSBCNT_SHIFT 0
 #define I40E_GLQF_FDCNT_2_HITSBCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLQF_FDCNT_2_HITSBCNT_SHIFT)
 
-#define I40E_GLQF_FDCNT_3                0x00269BC4
+#define I40E_GLQF_FDCNT_3                0x00269BC4 /* Reset: CORER */
 #define I40E_GLQF_FDCNT_3_HITLBCNT_SHIFT 0
 #define I40E_GLQF_FDCNT_3_HITLBCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLQF_FDCNT_3_HITLBCNT_SHIFT)
 
-#define I40E_GLQF_FDENA(_i)          (0x002698A8 + ((_i) * 4)) /* _i=0...1 */
+#define I40E_GLQF_FDENA(_i)          (0x002698A8 + ((_i) * 4)) /* _i=0...1 */ /* Reset: CORER */
 #define I40E_GLQF_FDENA_MAX_INDEX    1
 #define I40E_GLQF_FDENA_FD_ENA_SHIFT 0
 #define I40E_GLQF_FDENA_FD_ENA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLQF_FDENA_FD_ENA_SHIFT)
 
-#define I40E_GLQF_HASH_INSET(_i, _j)      (0x00267600 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...63 */
+#define I40E_GLQF_HASH_INSET(_i, _j)      (0x00267600 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...63 */ /* Reset: CORER */
 #define I40E_GLQF_HASH_INSET_MAX_INDEX   1
 #define I40E_GLQF_HASH_INSET_INSET_SHIFT 0
 #define I40E_GLQF_HASH_INSET_INSET_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLQF_HASH_INSET_INSET_SHIFT)
 
-#define I40E_GLQF_HASH_MSK(_i, _j)       (0x00267A00 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...63 */
+#define I40E_GLQF_HASH_MSK(_i, _j)       (0x00267A00 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...63 */ /* Reset: CORER */
 #define I40E_GLQF_HASH_MSK_MAX_INDEX    1
 #define I40E_GLQF_HASH_MSK_MASK_SHIFT   0
 #define I40E_GLQF_HASH_MSK_MASK_MASK    I40E_MASK(0xFFFF, I40E_GLQF_HASH_MSK_MASK_SHIFT)
 #define I40E_GLQF_HASH_MSK_OFFSET_SHIFT 16
 #define I40E_GLQF_HASH_MSK_OFFSET_MASK  I40E_MASK(0x3F, I40E_GLQF_HASH_MSK_OFFSET_SHIFT)
 
-#define I40E_GLQF_ORT(_i)               (0x00268900 + ((_i) * 4)) /* _i=0...63 */
+#define I40E_GLQF_ORT(_i)               (0x00268900 + ((_i) * 4)) /* _i=0...63 */ /* Reset: CORER */
 #define I40E_GLQF_ORT_MAX_INDEX         63
 #define I40E_GLQF_ORT_PIT_INDX_SHIFT    0
 #define I40E_GLQF_ORT_PIT_INDX_MASK     I40E_MASK(0x1F, I40E_GLQF_ORT_PIT_INDX_SHIFT)
@@ -8785,23 +9142,23 @@
 #define I40E_GLQF_ORT_FLX_PAYLOAD_SHIFT 7
 #define I40E_GLQF_ORT_FLX_PAYLOAD_MASK  I40E_MASK(0x1, I40E_GLQF_ORT_FLX_PAYLOAD_SHIFT)
 
-#define I40E_GLQF_PE_INSET(_i, _j)      (0x00269140 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...7 */
+#define I40E_GLQF_PE_INSET(_i, _j)      (0x00269140 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...7 */ /* Reset: CORER */
 #define I40E_GLQF_PE_INSET_MAX_INDEX   1
 #define I40E_GLQF_PE_INSET_INSET_SHIFT 0
 #define I40E_GLQF_PE_INSET_INSET_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLQF_PE_INSET_INSET_SHIFT)
 
-#define I40E_GLQF_PE_MSK(_i, _j)       (0x002691C0 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...7 */
+#define I40E_GLQF_PE_MSK(_i, _j)       (0x002691C0 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...7 */ /* Reset: CORER */
 #define I40E_GLQF_PE_MSK_MAX_INDEX    1
 #define I40E_GLQF_PE_MSK_MASK_SHIFT   0
 #define I40E_GLQF_PE_MSK_MASK_MASK    I40E_MASK(0xFFFF, I40E_GLQF_PE_MSK_MASK_SHIFT)
 #define I40E_GLQF_PE_MSK_OFFSET_SHIFT 16
 #define I40E_GLQF_PE_MSK_OFFSET_MASK  I40E_MASK(0x3F, I40E_GLQF_PE_MSK_OFFSET_SHIFT)
 
-#define I40E_GLQF_PECNT_0                0x00269FA4
+#define I40E_GLQF_PECNT_0                0x00269FA4 /* Reset: CORER */
 #define I40E_GLQF_PECNT_0_PROG_CNT_SHIFT 0
 #define I40E_GLQF_PECNT_0_PROG_CNT_MASK  I40E_MASK(0x1F, I40E_GLQF_PECNT_0_PROG_CNT_SHIFT)
 
-#define I40E_GLQF_PECNT_1                   0x00269FAC
+#define I40E_GLQF_PECNT_1                   0x00269FAC /* Reset: CORER */
 #define I40E_GLQF_PECNT_1_ADD_OK_SHIFT      0
 #define I40E_GLQF_PECNT_1_ADD_OK_MASK       I40E_MASK(0x1F, I40E_GLQF_PECNT_1_ADD_OK_SHIFT)
 #define I40E_GLQF_PECNT_1_ADD_FAIL_SHIFT    8
@@ -8811,14 +9168,14 @@
 #define I40E_GLQF_PECNT_1_REMOVE_FAIL_SHIFT 24
 #define I40E_GLQF_PECNT_1_REMOVE_FAIL_MASK  I40E_MASK(0x1F, I40E_GLQF_PECNT_1_REMOVE_FAIL_SHIFT)
 
-#define I40E_GLQF_PETYPE(_i)                (0x00269560 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_GLQF_PETYPE(_i)                (0x00269560 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_GLQF_PETYPE_MAX_INDEX          7
 #define I40E_GLQF_PETYPE_PCTYPE_INDEX_SHIFT 0
 #define I40E_GLQF_PETYPE_PCTYPE_INDEX_MASK  I40E_MASK(0x3F, I40E_GLQF_PETYPE_PCTYPE_INDEX_SHIFT)
 #define I40E_GLQF_PETYPE_PCTYPE_ENA_SHIFT   7
 #define I40E_GLQF_PETYPE_PCTYPE_ENA_MASK    I40E_MASK(0x1, I40E_GLQF_PETYPE_PCTYPE_ENA_SHIFT)
 
-#define I40E_GLQF_PIT(_i)              (0x00268C80 + ((_i) * 4)) /* _i=0...23 */
+#define I40E_GLQF_PIT(_i)              (0x00268C80 + ((_i) * 4)) /* _i=0...23 */ /* Reset: CORER */
 #define I40E_GLQF_PIT_MAX_INDEX        23
 #define I40E_GLQF_PIT_SOURCE_OFF_SHIFT 0
 #define I40E_GLQF_PIT_SOURCE_OFF_MASK  I40E_MASK(0x1F, I40E_GLQF_PIT_SOURCE_OFF_SHIFT)
@@ -8827,17 +9184,17 @@
 #define I40E_GLQF_PIT_DEST_OFF_SHIFT   10
 #define I40E_GLQF_PIT_DEST_OFF_MASK    I40E_MASK(0x3F, I40E_GLQF_PIT_DEST_OFF_SHIFT)
 
-#define I40E_GLQF_PTYPE(_i, _j)           (0x00268200 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...63 */
+#define I40E_GLQF_PTYPE(_i, _j)           (0x00268200 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...63 */ /* Reset: CORER */
 #define I40E_GLQF_PTYPE_MAX_INDEX        1
 #define I40E_GLQF_PTYPE_PROT_LAYER_SHIFT 0
 #define I40E_GLQF_PTYPE_PROT_LAYER_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLQF_PTYPE_PROT_LAYER_SHIFT)
 
-#define I40E_GLQF_PTYPE_ENA(_i, _j)           (0x00268600 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...63 */
+#define I40E_GLQF_PTYPE_ENA(_i, _j)           (0x00268600 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...63 */ /* Reset: CORER */
 #define I40E_GLQF_PTYPE_ENA_MAX_INDEX        1
 #define I40E_GLQF_PTYPE_ENA_PROT_LAYER_SHIFT 0
 #define I40E_GLQF_PTYPE_ENA_PROT_LAYER_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLQF_PTYPE_ENA_PROT_LAYER_SHIFT)
 
-#define I40E_PFQF_CTL_0_PMAT                   0x000C0700
+#define I40E_PFQF_CTL_0_PMAT                   0x000C0700 /* Reset: CORER */
 #define I40E_PFQF_CTL_0_PMAT_PEHSIZE_SHIFT     0
 #define I40E_PFQF_CTL_0_PMAT_PEHSIZE_MASK      I40E_MASK(0x1F, I40E_PFQF_CTL_0_PMAT_PEHSIZE_SHIFT)
 #define I40E_PFQF_CTL_0_PMAT_PEDSIZE_SHIFT     5
@@ -8859,7 +9216,7 @@
 #define I40E_PFQF_CTL_0_PMAT_VFFCDSIZE_SHIFT   24
 #define I40E_PFQF_CTL_0_PMAT_VFFCDSIZE_MASK    I40E_MASK(0x3, I40E_PFQF_CTL_0_PMAT_VFFCDSIZE_SHIFT)
 
-#define I40E_PFQF_CTL_0_RCU                   0x00245C80
+#define I40E_PFQF_CTL_0_RCU                   0x00245C80 /* Reset: CORER */
 #define I40E_PFQF_CTL_0_RCU_PEHSIZE_SHIFT     0
 #define I40E_PFQF_CTL_0_RCU_PEHSIZE_MASK      I40E_MASK(0x1F, I40E_PFQF_CTL_0_RCU_PEHSIZE_SHIFT)
 #define I40E_PFQF_CTL_0_RCU_PEDSIZE_SHIFT     5
@@ -8881,44 +9238,79 @@
 #define I40E_PFQF_CTL_0_RCU_VFFCDSIZE_SHIFT   24
 #define I40E_PFQF_CTL_0_RCU_VFFCDSIZE_MASK    I40E_MASK(0x3, I40E_PFQF_CTL_0_RCU_VFFCDSIZE_SHIFT)
 
-#define I40E_PFQF_DDPCNT               0x00246180
+#define I40E_PFQF_DDPCNT               0x00246180 /* Reset: CORER */
 #define I40E_PFQF_DDPCNT_DDP_CNT_SHIFT 0
 #define I40E_PFQF_DDPCNT_DDP_CNT_MASK  I40E_MASK(0x1FFF, I40E_PFQF_DDPCNT_DDP_CNT_SHIFT)
 
-#define I40E_PFQF_FCCNT_0                 0x00245E80
+#define I40E_PFQF_FCCNT_0                 0x00245E80 /* Reset: CORER */
 #define I40E_PFQF_FCCNT_0_BUCKETCNT_SHIFT 0
 #define I40E_PFQF_FCCNT_0_BUCKETCNT_MASK  I40E_MASK(0x1FFF, I40E_PFQF_FCCNT_0_BUCKETCNT_SHIFT)
 
-#define I40E_PFQF_FCCNT_1                0x00245F80
+#define I40E_PFQF_FCCNT_1                0x00245F80 /* Reset: PFR */
 #define I40E_PFQF_FCCNT_1_HITSBCNT_SHIFT 0
 #define I40E_PFQF_FCCNT_1_HITSBCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_PFQF_FCCNT_1_HITSBCNT_SHIFT)
 
-#define I40E_PFQF_FCCNT_2                0x00246080
+#define I40E_PFQF_FCCNT_2                0x00246080 /* Reset: PFR */
 #define I40E_PFQF_FCCNT_2_HITLBCNT_SHIFT 0
 #define I40E_PFQF_FCCNT_2_HITLBCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_PFQF_FCCNT_2_HITLBCNT_SHIFT)
 
-#define I40E_PFQF_PECNT_0                 0x00246480
+#define I40E_PFQF_HREGION(_i)                  (0x00245400 + ((_i) * 128)) /* _i=0...7 */ /* Reset: CORER */
+#define I40E_PFQF_HREGION_MAX_INDEX            7
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_0_SHIFT 0
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_0_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_0_SHIFT)
+#define I40E_PFQF_HREGION_REGION_0_SHIFT       1
+#define I40E_PFQF_HREGION_REGION_0_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_0_SHIFT)
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_1_SHIFT 4
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_1_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_1_SHIFT)
+#define I40E_PFQF_HREGION_REGION_1_SHIFT       5
+#define I40E_PFQF_HREGION_REGION_1_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_1_SHIFT)
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_2_SHIFT 8
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_2_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_2_SHIFT)
+#define I40E_PFQF_HREGION_REGION_2_SHIFT       9
+#define I40E_PFQF_HREGION_REGION_2_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_2_SHIFT)
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_3_SHIFT 12
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_3_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_3_SHIFT)
+#define I40E_PFQF_HREGION_REGION_3_SHIFT       13
+#define I40E_PFQF_HREGION_REGION_3_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_3_SHIFT)
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_4_SHIFT 16
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_4_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_4_SHIFT)
+#define I40E_PFQF_HREGION_REGION_4_SHIFT       17
+#define I40E_PFQF_HREGION_REGION_4_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_4_SHIFT)
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_5_SHIFT 20
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_5_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_5_SHIFT)
+#define I40E_PFQF_HREGION_REGION_5_SHIFT       21
+#define I40E_PFQF_HREGION_REGION_5_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_5_SHIFT)
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_6_SHIFT 24
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_6_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_6_SHIFT)
+#define I40E_PFQF_HREGION_REGION_6_SHIFT       25
+#define I40E_PFQF_HREGION_REGION_6_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_6_SHIFT)
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_7_SHIFT 28
+#define I40E_PFQF_HREGION_OVERRIDE_ENA_7_MASK  I40E_MASK(0x1, I40E_PFQF_HREGION_OVERRIDE_ENA_7_SHIFT)
+#define I40E_PFQF_HREGION_REGION_7_SHIFT       29
+#define I40E_PFQF_HREGION_REGION_7_MASK        I40E_MASK(0x7, I40E_PFQF_HREGION_REGION_7_SHIFT)
+
+#define I40E_PFQF_PECNT_0                 0x00246480 /* Reset: CORER */
 #define I40E_PFQF_PECNT_0_BUCKETCNT_SHIFT 0
 #define I40E_PFQF_PECNT_0_BUCKETCNT_MASK  I40E_MASK(0x7FFFF, I40E_PFQF_PECNT_0_BUCKETCNT_SHIFT)
 
-#define I40E_PFQF_PECNT_1                0x00246580
+#define I40E_PFQF_PECNT_1                0x00246580 /* Reset: PFR */
 #define I40E_PFQF_PECNT_1_HITSBCNT_SHIFT 0
 #define I40E_PFQF_PECNT_1_HITSBCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_PFQF_PECNT_1_HITSBCNT_SHIFT)
 
-#define I40E_PFQF_PECNT_2                0x00246680
+#define I40E_PFQF_PECNT_2                0x00246680 /* Reset: PFR */
 #define I40E_PFQF_PECNT_2_HITLBCNT_SHIFT 0
 #define I40E_PFQF_PECNT_2_HITLBCNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_PFQF_PECNT_2_HITLBCNT_SHIFT)
 
-#define I40E_PFQF_PECNT_CNTX              0x0026CA80
+#define I40E_PFQF_PECNT_CNTX              0x0026CA80 /* Reset: CORER */
 #define I40E_PFQF_PECNT_CNTX_FLTCNT_SHIFT 0
 #define I40E_PFQF_PECNT_CNTX_FLTCNT_MASK  I40E_MASK(0x7FFFF, I40E_PFQF_PECNT_CNTX_FLTCNT_SHIFT)
 
-#define I40E_PRTQF_FD_INSET(_i, _j)      (0x00250000 + ((_i) * 64 + (_j) * 32)) /* _i=0...63, _j=0...1 */
+#define I40E_PRTQF_FD_INSET(_i, _j)      (0x00250000 + ((_i) * 64 + (_j) * 32)) /* _i=0...63, _j=0...1 */ /* Reset: CORER */
 #define I40E_PRTQF_FD_INSET_MAX_INDEX   63
 #define I40E_PRTQF_FD_INSET_INSET_SHIFT 0
 #define I40E_PRTQF_FD_INSET_INSET_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTQF_FD_INSET_INSET_SHIFT)
 
-#define I40E_VPQF_CTL_RCU(_VF)          (0x00231C00 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VPQF_CTL_RCU(_VF)          (0x00231C00 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_VPQF_CTL_RCU_MAX_INDEX     127
 #define I40E_VPQF_CTL_RCU_PEHSIZE_SHIFT 0
 #define I40E_VPQF_CTL_RCU_PEHSIZE_MASK  I40E_MASK(0x1F, I40E_VPQF_CTL_RCU_PEHSIZE_SHIFT)
@@ -8929,56 +9321,56 @@
 #define I40E_VPQF_CTL_RCU_FCDSIZE_SHIFT 14
 #define I40E_VPQF_CTL_RCU_FCDSIZE_MASK  I40E_MASK(0x3, I40E_VPQF_CTL_RCU_FCDSIZE_SHIFT)
 
-#define I40E_VPQF_DDPCNT1(_VF)          (0x00231400 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VPQF_DDPCNT1(_VF)          (0x00231400 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_VPQF_DDPCNT1_MAX_INDEX     127
 #define I40E_VPQF_DDPCNT1_DDP_CNT_SHIFT 0
 #define I40E_VPQF_DDPCNT1_DDP_CNT_MASK  I40E_MASK(0x1FFF, I40E_VPQF_DDPCNT1_DDP_CNT_SHIFT)
 
-#define I40E_VPQF_FCCNT_0(_VF)            (0x0026A400 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VPQF_FCCNT_0(_VF)            (0x0026A400 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_VPQF_FCCNT_0_MAX_INDEX       127
 #define I40E_VPQF_FCCNT_0_BUCKETCNT_SHIFT 0
 #define I40E_VPQF_FCCNT_0_BUCKETCNT_MASK  I40E_MASK(0x1FFF, I40E_VPQF_FCCNT_0_BUCKETCNT_SHIFT)
 
-#define I40E_VPQF_PECNT_0(_VF)            (0x0026B400 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VPQF_PECNT_0(_VF)            (0x0026B400 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_VPQF_PECNT_0_MAX_INDEX       127
 #define I40E_VPQF_PECNT_0_BUCKETCNT_SHIFT 0
 #define I40E_VPQF_PECNT_0_BUCKETCNT_MASK  I40E_MASK(0x7FFFF, I40E_VPQF_PECNT_0_BUCKETCNT_SHIFT)
 
-#define I40E_VPQF_PECNT_1(_VF)         (0x0026BC00 + ((_VF) * 4)) /* _i=0...127 */
+#define I40E_VPQF_PECNT_1(_VF)         (0x0026BC00 + ((_VF) * 4)) /* _i=0...127 */ /* Reset: CORER */
 #define I40E_VPQF_PECNT_1_MAX_INDEX    127
 #define I40E_VPQF_PECNT_1_FLTCNT_SHIFT 0
 #define I40E_VPQF_PECNT_1_FLTCNT_MASK  I40E_MASK(0x7FFFF, I40E_VPQF_PECNT_1_FLTCNT_SHIFT)
 
 /* PF - Statistics Registers  */
 
-#define I40E_GLPRT_AORCH(_i)         (0x00300A44 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_AORCH(_i)         (0x00300A44 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_AORCH_MAX_INDEX   3
 #define I40E_GLPRT_AORCH_AORCH_SHIFT 0
 #define I40E_GLPRT_AORCH_AORCH_MASK  I40E_MASK(0xFFFF, I40E_GLPRT_AORCH_AORCH_SHIFT)
 
-#define I40E_GLPRT_AORCL(_i)         (0x00300A40 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_AORCL(_i)         (0x00300A40 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_AORCL_MAX_INDEX   3
 #define I40E_GLPRT_AORCL_VGORC_SHIFT 0
 #define I40E_GLPRT_AORCL_VGORC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_AORCL_VGORC_SHIFT)
 
-#define I40E_GLPRT_ERRBC(_i)         (0x003000C0 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_ERRBC(_i)         (0x003000C0 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_ERRBC_MAX_INDEX   3
 #define I40E_GLPRT_ERRBC_ERRBC_SHIFT 0
 #define I40E_GLPRT_ERRBC_ERRBC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_ERRBC_ERRBC_SHIFT)
 
-#define I40E_GLPRT_MSPDC(_i)         (0x00300060 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_MSPDC(_i)         (0x00300060 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_MSPDC_MAX_INDEX   3
 #define I40E_GLPRT_MSPDC_MSPDC_SHIFT 0
 #define I40E_GLPRT_MSPDC_MSPDC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_MSPDC_MSPDC_SHIFT)
 
-#define I40E_GLPRT_STDC(_i)        (0x00300640 + ((_i) * 8)) /* _i=0...3 */
+#define I40E_GLPRT_STDC(_i)        (0x00300640 + ((_i) * 8)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLPRT_STDC_MAX_INDEX  3
 #define I40E_GLPRT_STDC_STDC_SHIFT 0
 #define I40E_GLPRT_STDC_STDC_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLPRT_STDC_STDC_SHIFT)
 
 /* PF - Switch Registers */
 
-#define I40E_EMP_MTG_FLU_ICH                       0x00269BE4
+#define I40E_EMP_MTG_FLU_ICH                       0x00269BE4 /* Reset: CORER */
 #define I40E_EMP_MTG_FLU_ICH_PROTOCOL_ID_SHIFT     0
 #define I40E_EMP_MTG_FLU_ICH_PROTOCOL_ID_MASK      I40E_MASK(0x3F, I40E_EMP_MTG_FLU_ICH_PROTOCOL_ID_SHIFT)
 #define I40E_EMP_MTG_FLU_ICH_IGNORE_PROTOCOL_SHIFT 6
@@ -8986,7 +9378,7 @@
 #define I40E_EMP_MTG_FLU_ICH_USE_MAN_SHIFT         7
 #define I40E_EMP_MTG_FLU_ICH_USE_MAN_MASK          I40E_MASK(0x1, I40E_EMP_MTG_FLU_ICH_USE_MAN_SHIFT)
 
-#define I40E_EMP_MTG_FLU_ICL                    0x00269BDC
+#define I40E_EMP_MTG_FLU_ICL                    0x00269BDC /* Reset: CORER */
 #define I40E_EMP_MTG_FLU_ICL_W0_OFFSET_SHIFT    0
 #define I40E_EMP_MTG_FLU_ICL_W0_OFFSET_MASK     I40E_MASK(0x3F, I40E_EMP_MTG_FLU_ICL_W0_OFFSET_SHIFT)
 #define I40E_EMP_MTG_FLU_ICL_W0_STATUS_SHIFT    6
@@ -9008,17 +9400,17 @@
 #define I40E_EMP_MTG_FLU_ICL_PORT_ENABLE_SHIFT  31
 #define I40E_EMP_MTG_FLU_ICL_PORT_ENABLE_MASK   I40E_MASK(0x1, I40E_EMP_MTG_FLU_ICL_PORT_ENABLE_SHIFT)
 
-#define I40E_EMP_SWT_CCTRL                0x00269770
+#define I40E_EMP_SWT_CCTRL                0x00269770 /* Reset: POR */
 #define I40E_EMP_SWT_CCTRL_LLVSI_SHIFT    10
 #define I40E_EMP_SWT_CCTRL_LLVSI_MASK     I40E_MASK(0x3FF, I40E_EMP_SWT_CCTRL_LLVSI_SHIFT)
 #define I40E_EMP_SWT_CCTRL_PROXYVSI_SHIFT 20
 #define I40E_EMP_SWT_CCTRL_PROXYVSI_MASK  I40E_MASK(0x3FF, I40E_EMP_SWT_CCTRL_PROXYVSI_SHIFT)
 
-#define I40E_EMP_SWT_CGEN            0x0006D000
+#define I40E_EMP_SWT_CGEN            0x0006D000 /* Reset: POR */
 #define I40E_EMP_SWT_CGEN_GLEN_SHIFT 0
 #define I40E_EMP_SWT_CGEN_GLEN_MASK  I40E_MASK(0x1, I40E_EMP_SWT_CGEN_GLEN_SHIFT)
 
-#define I40E_EMP_SWT_CLLE(_i)               (0x00269790 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_EMP_SWT_CLLE(_i)               (0x00269790 + ((_i) * 4)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_EMP_SWT_CLLE_MAX_INDEX         3
 #define I40E_EMP_SWT_CLLE_TAG_SHIFT         0
 #define I40E_EMP_SWT_CLLE_TAG_MASK          I40E_MASK(0xFFFF, I40E_EMP_SWT_CLLE_TAG_SHIFT)
@@ -9029,18 +9421,18 @@
 #define I40E_EMP_SWT_CLLE_ENABLE_SHIFT      31
 #define I40E_EMP_SWT_CLLE_ENABLE_MASK       I40E_MASK(0x1, I40E_EMP_SWT_CLLE_ENABLE_SHIFT)
 
-#define I40E_EMP_SWT_CMASK                        0x0006D180
+#define I40E_EMP_SWT_CMASK                        0x0006D180 /* Reset: POR */
 #define I40E_EMP_SWT_CMASK_UNICASTTAGMASK_SHIFT   0
 #define I40E_EMP_SWT_CMASK_UNICASTTAGMASK_MASK    I40E_MASK(0xFFFF, I40E_EMP_SWT_CMASK_UNICASTTAGMASK_SHIFT)
 #define I40E_EMP_SWT_CMASK_MULTICASTTAGMASK_SHIFT 16
 #define I40E_EMP_SWT_CMASK_MULTICASTTAGMASK_MASK  I40E_MASK(0xFFFF, I40E_EMP_SWT_CMASK_MULTICASTTAGMASK_SHIFT)
 
-#define I40E_EMP_SWT_CMTTD(_i)          (0x0006E000 + ((_i) * 4)) /* _i=0...511 */
+#define I40E_EMP_SWT_CMTTD(_i)          (0x0006E000 + ((_i) * 4)) /* _i=0...511 */ /* Reset: POR */
 #define I40E_EMP_SWT_CMTTD_MAX_INDEX    511
 #define I40E_EMP_SWT_CMTTD_PFLIST_SHIFT 0
 #define I40E_EMP_SWT_CMTTD_PFLIST_MASK  I40E_MASK(0xFFFF, I40E_EMP_SWT_CMTTD_PFLIST_SHIFT)
 
-#define I40E_EMP_SWT_CMTTL(_i)          (0x0006D800 + ((_i) * 4)) /* _i=0...511 */
+#define I40E_EMP_SWT_CMTTL(_i)          (0x0006D800 + ((_i) * 4)) /* _i=0...511 */ /* Reset: POR */
 #define I40E_EMP_SWT_CMTTL_MAX_INDEX    511
 #define I40E_EMP_SWT_CMTTL_MTAG_SHIFT   0
 #define I40E_EMP_SWT_CMTTL_MTAG_MASK    I40E_MASK(0xFFFF, I40E_EMP_SWT_CMTTL_MTAG_SHIFT)
@@ -9049,7 +9441,7 @@
 #define I40E_EMP_SWT_CMTTL_ENABLE_SHIFT 18
 #define I40E_EMP_SWT_CMTTL_ENABLE_MASK  I40E_MASK(0x1, I40E_EMP_SWT_CMTTL_ENABLE_SHIFT)
 
-#define I40E_EMP_SWT_COFFSET                          0x0006D200
+#define I40E_EMP_SWT_COFFSET                          0x0006D200 /* Reset: POR */
 #define I40E_EMP_SWT_COFFSET_UNICASTTAGOFFSET_SHIFT   0
 #define I40E_EMP_SWT_COFFSET_UNICASTTAGOFFSET_MASK    I40E_MASK(0x1F, I40E_EMP_SWT_COFFSET_UNICASTTAGOFFSET_SHIFT)
 #define I40E_EMP_SWT_COFFSET_RESERVED_2_SHIFT         5
@@ -9057,7 +9449,7 @@
 #define I40E_EMP_SWT_COFFSET_MULTICASTTAGOFFSET_SHIFT 8
 #define I40E_EMP_SWT_COFFSET_MULTICASTTAGOFFSET_MASK  I40E_MASK(0x1F, I40E_EMP_SWT_COFFSET_MULTICASTTAGOFFSET_SHIFT)
 
-#define I40E_EMP_SWT_CPFE(_i)               (0x001C09E0 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_EMP_SWT_CPFE(_i)               (0x001C09E0 + ((_i) * 4)) /* _i=0...15 */ /* Reset: POR */
 #define I40E_EMP_SWT_CPFE_MAX_INDEX         15
 #define I40E_EMP_SWT_CPFE_TAG_SHIFT         0
 #define I40E_EMP_SWT_CPFE_TAG_MASK          I40E_MASK(0xFFFF, I40E_EMP_SWT_CPFE_TAG_SHIFT)
@@ -9068,7 +9460,7 @@
 #define I40E_EMP_SWT_CPFE_ENABLE_SHIFT      31
 #define I40E_EMP_SWT_CPFE_ENABLE_MASK       I40E_MASK(0x1, I40E_EMP_SWT_CPFE_ENABLE_SHIFT)
 
-#define I40E_EMP_SWT_CPFE_RCU(_i)               (0x00269040 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_EMP_SWT_CPFE_RCU(_i)               (0x00269040 + ((_i) * 4)) /* _i=0...15 */ /* Reset: POR */
 #define I40E_EMP_SWT_CPFE_RCU_MAX_INDEX         15
 #define I40E_EMP_SWT_CPFE_RCU_TAG_SHIFT         0
 #define I40E_EMP_SWT_CPFE_RCU_TAG_MASK          I40E_MASK(0xFFFF, I40E_EMP_SWT_CPFE_RCU_TAG_SHIFT)
@@ -9079,7 +9471,7 @@
 #define I40E_EMP_SWT_CPFE_RCU_ENABLE_SHIFT      31
 #define I40E_EMP_SWT_CPFE_RCU_ENABLE_MASK       I40E_MASK(0x1, I40E_EMP_SWT_CPFE_RCU_ENABLE_SHIFT)
 
-#define I40E_EMP_SWT_CPFE_WUC(_i)               (0x0006D080 + ((_i) * 4)) /* _i=0...15 */
+#define I40E_EMP_SWT_CPFE_WUC(_i)               (0x0006D080 + ((_i) * 4)) /* _i=0...15 */ /* Reset: POR */
 #define I40E_EMP_SWT_CPFE_WUC_MAX_INDEX         15
 #define I40E_EMP_SWT_CPFE_WUC_TAG_SHIFT         0
 #define I40E_EMP_SWT_CPFE_WUC_TAG_MASK          I40E_MASK(0xFFFF, I40E_EMP_SWT_CPFE_WUC_TAG_SHIFT)
@@ -9090,7 +9482,7 @@
 #define I40E_EMP_SWT_CPFE_WUC_ENABLE_SHIFT      31
 #define I40E_EMP_SWT_CPFE_WUC_ENABLE_MASK       I40E_MASK(0x1, I40E_EMP_SWT_CPFE_WUC_ENABLE_SHIFT)
 
-#define I40E_EMP_SWT_CPTE(_i)               (0x002697B0 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_EMP_SWT_CPTE(_i)               (0x002697B0 + ((_i) * 4)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_EMP_SWT_CPTE_MAX_INDEX         3
 #define I40E_EMP_SWT_CPTE_TAG_SHIFT         0
 #define I40E_EMP_SWT_CPTE_TAG_MASK          I40E_MASK(0xFFFF, I40E_EMP_SWT_CPTE_TAG_SHIFT)
@@ -9101,7 +9493,7 @@
 #define I40E_EMP_SWT_CPTE_ENABLE_SHIFT      31
 #define I40E_EMP_SWT_CPTE_ENABLE_MASK       I40E_MASK(0x1, I40E_EMP_SWT_CPTE_ENABLE_SHIFT)
 
-#define I40E_EMP_SWT_CPTE2(_i)               (0x002697D0 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_EMP_SWT_CPTE2(_i)               (0x002697D0 + ((_i) * 4)) /* _i=0...3 */ /* Reset: POR */
 #define I40E_EMP_SWT_CPTE2_MAX_INDEX         3
 #define I40E_EMP_SWT_CPTE2_TAG_SHIFT         0
 #define I40E_EMP_SWT_CPTE2_TAG_MASK          I40E_MASK(0xFFFF, I40E_EMP_SWT_CPTE2_TAG_SHIFT)
@@ -9112,13 +9504,13 @@
 #define I40E_EMP_SWT_CPTE2_ENABLE_SHIFT      31
 #define I40E_EMP_SWT_CPTE2_ENABLE_MASK       I40E_MASK(0x1, I40E_EMP_SWT_CPTE2_ENABLE_SHIFT)
 
-#define I40E_EMP_SWT_CTAG                 0x00269B64
+#define I40E_EMP_SWT_CTAG                 0x00269B64 /* Reset: POR */
 #define I40E_EMP_SWT_CTAG_TAG_INDEX_SHIFT 0
 #define I40E_EMP_SWT_CTAG_TAG_INDEX_MASK  I40E_MASK(0x3F, I40E_EMP_SWT_CTAG_TAG_INDEX_SHIFT)
 #define I40E_EMP_SWT_CTAG_TAG_MASK_SHIFT  10
 #define I40E_EMP_SWT_CTAG_TAG_MASK_MASK   I40E_MASK(0xFFFF, I40E_EMP_SWT_CTAG_TAG_MASK_SHIFT)
 
-#define I40E_EMP_SWT_CUPD                            0x0006D100
+#define I40E_EMP_SWT_CUPD                            0x0006D100 /* Reset: POR */
 #define I40E_EMP_SWT_CUPD_UNTAGGED_PORT0_PF_SHIFT    0
 #define I40E_EMP_SWT_CUPD_UNTAGGED_PORT0_PF_MASK     I40E_MASK(0xF, I40E_EMP_SWT_CUPD_UNTAGGED_PORT0_PF_SHIFT)
 #define I40E_EMP_SWT_CUPD_UNTAGGED_PORT1_PF_SHIFT    4
@@ -9140,11 +9532,11 @@
 #define I40E_EMP_SWT_CUPD_ACCEPTUNMATCHEDMCTST_SHIFT 31
 #define I40E_EMP_SWT_CUPD_ACCEPTUNMATCHEDMCTST_MASK  I40E_MASK(0x1, I40E_EMP_SWT_CUPD_ACCEPTUNMATCHEDMCTST_SHIFT)
 
-#define I40E_EMP_SWT_ETHMATCH                0x00269B6C
+#define I40E_EMP_SWT_ETHMATCH                0x00269B6C /* Reset: POR */
 #define I40E_EMP_SWT_ETHMATCH_ETHMATCH_SHIFT 0
 #define I40E_EMP_SWT_ETHMATCH_ETHMATCH_MASK  I40E_MASK(0xFFFF, I40E_EMP_SWT_ETHMATCH_ETHMATCH_SHIFT)
 
-#define I40E_EMP_SWT_FLU_L1_ICH_PHASE0(_i)                   (0x002695E0 + ((_i) * 4)) /* _i=0...4 */
+#define I40E_EMP_SWT_FLU_L1_ICH_PHASE0(_i)                   (0x002695E0 + ((_i) * 4)) /* _i=0...4 */ /* Reset: CORER */
 #define I40E_EMP_SWT_FLU_L1_ICH_PHASE0_MAX_INDEX             4
 #define I40E_EMP_SWT_FLU_L1_ICH_PHASE0_PROTOCOL_ID_SHIFT     0
 #define I40E_EMP_SWT_FLU_L1_ICH_PHASE0_PROTOCOL_ID_MASK      I40E_MASK(0x3F, I40E_EMP_SWT_FLU_L1_ICH_PHASE0_PROTOCOL_ID_SHIFT)
@@ -9153,7 +9545,7 @@
 #define I40E_EMP_SWT_FLU_L1_ICH_PHASE0_USE_MAN_SHIFT         7
 #define I40E_EMP_SWT_FLU_L1_ICH_PHASE0_USE_MAN_MASK          I40E_MASK(0x1, I40E_EMP_SWT_FLU_L1_ICH_PHASE0_USE_MAN_SHIFT)
 
-#define I40E_EMP_SWT_FLU_L1_ICH_PHASE1(_i)                   (0x00269660 + ((_i) * 4)) /* _i=0...4 */
+#define I40E_EMP_SWT_FLU_L1_ICH_PHASE1(_i)                   (0x00269660 + ((_i) * 4)) /* _i=0...4 */ /* Reset: CORER */
 #define I40E_EMP_SWT_FLU_L1_ICH_PHASE1_MAX_INDEX             4
 #define I40E_EMP_SWT_FLU_L1_ICH_PHASE1_PROTOCOL_ID_SHIFT     0
 #define I40E_EMP_SWT_FLU_L1_ICH_PHASE1_PROTOCOL_ID_MASK      I40E_MASK(0x3F, I40E_EMP_SWT_FLU_L1_ICH_PHASE1_PROTOCOL_ID_SHIFT)
@@ -9162,7 +9554,7 @@
 #define I40E_EMP_SWT_FLU_L1_ICH_PHASE1_USE_MAN_SHIFT         7
 #define I40E_EMP_SWT_FLU_L1_ICH_PHASE1_USE_MAN_MASK          I40E_MASK(0x1, I40E_EMP_SWT_FLU_L1_ICH_PHASE1_USE_MAN_SHIFT)
 
-#define I40E_EMP_SWT_FLU_L1_ICL_PHASE0(_i)                (0x00269620 + ((_i) * 4)) /* _i=0...6 */
+#define I40E_EMP_SWT_FLU_L1_ICL_PHASE0(_i)                (0x00269620 + ((_i) * 4)) /* _i=0...6 */ /* Reset: CORER */
 #define I40E_EMP_SWT_FLU_L1_ICL_PHASE0_MAX_INDEX          6
 #define I40E_EMP_SWT_FLU_L1_ICL_PHASE0_W0_OFFSET_SHIFT    0
 #define I40E_EMP_SWT_FLU_L1_ICL_PHASE0_W0_OFFSET_MASK     I40E_MASK(0x3F, I40E_EMP_SWT_FLU_L1_ICL_PHASE0_W0_OFFSET_SHIFT)
@@ -9185,7 +9577,7 @@
 #define I40E_EMP_SWT_FLU_L1_ICL_PHASE0_PORT_ENABLE_SHIFT  31
 #define I40E_EMP_SWT_FLU_L1_ICL_PHASE0_PORT_ENABLE_MASK   I40E_MASK(0x1, I40E_EMP_SWT_FLU_L1_ICL_PHASE0_PORT_ENABLE_SHIFT)
 
-#define I40E_EMP_SWT_FLU_L1_ICL_PHASE1(_i)                (0x002696A0 + ((_i) * 4)) /* _i=0...6 */
+#define I40E_EMP_SWT_FLU_L1_ICL_PHASE1(_i)                (0x002696A0 + ((_i) * 4)) /* _i=0...6 */ /* Reset: CORER */
 #define I40E_EMP_SWT_FLU_L1_ICL_PHASE1_MAX_INDEX          6
 #define I40E_EMP_SWT_FLU_L1_ICL_PHASE1_W0_OFFSET_SHIFT    0
 #define I40E_EMP_SWT_FLU_L1_ICL_PHASE1_W0_OFFSET_MASK     I40E_MASK(0x3F, I40E_EMP_SWT_FLU_L1_ICL_PHASE1_W0_OFFSET_SHIFT)
@@ -9208,7 +9600,7 @@
 #define I40E_EMP_SWT_FLU_L1_ICL_PHASE1_PORT_ENABLE_SHIFT  31
 #define I40E_EMP_SWT_FLU_L1_ICL_PHASE1_PORT_ENABLE_MASK   I40E_MASK(0x1, I40E_EMP_SWT_FLU_L1_ICL_PHASE1_PORT_ENABLE_SHIFT)
 
-#define I40E_EMP_SWT_FLU_L2_IC_PHASE0(_i)                         (0x002696E0 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_EMP_SWT_FLU_L2_IC_PHASE0(_i)                         (0x002696E0 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_EMP_SWT_FLU_L2_IC_PHASE0_MAX_INDEX                   7
 #define I40E_EMP_SWT_FLU_L2_IC_PHASE0_FIELD0_L1_OBJECT_TYPE_SHIFT 0
 #define I40E_EMP_SWT_FLU_L2_IC_PHASE0_FIELD0_L1_OBJECT_TYPE_MASK  I40E_MASK(0xF, I40E_EMP_SWT_FLU_L2_IC_PHASE0_FIELD0_L1_OBJECT_TYPE_SHIFT)
@@ -9231,7 +9623,7 @@
 #define I40E_EMP_SWT_FLU_L2_IC_PHASE0_PORT_ENABLE_SHIFT           31
 #define I40E_EMP_SWT_FLU_L2_IC_PHASE0_PORT_ENABLE_MASK            I40E_MASK(0x1, I40E_EMP_SWT_FLU_L2_IC_PHASE0_PORT_ENABLE_SHIFT)
 
-#define I40E_EMP_SWT_FLU_L2_IC_PHASE1(_i)                         (0x00269720 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_EMP_SWT_FLU_L2_IC_PHASE1(_i)                         (0x00269720 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_EMP_SWT_FLU_L2_IC_PHASE1_MAX_INDEX                   7
 #define I40E_EMP_SWT_FLU_L2_IC_PHASE1_FIELD0_L1_OBJECT_TYPE_SHIFT 0
 #define I40E_EMP_SWT_FLU_L2_IC_PHASE1_FIELD0_L1_OBJECT_TYPE_MASK  I40E_MASK(0xF, I40E_EMP_SWT_FLU_L2_IC_PHASE1_FIELD0_L1_OBJECT_TYPE_SHIFT)
@@ -9254,27 +9646,27 @@
 #define I40E_EMP_SWT_FLU_L2_IC_PHASE1_PORT_ENABLE_SHIFT           31
 #define I40E_EMP_SWT_FLU_L2_IC_PHASE1_PORT_ENABLE_MASK            I40E_MASK(0x1, I40E_EMP_SWT_FLU_L2_IC_PHASE1_PORT_ENABLE_SHIFT)
 
-#define I40E_EMP_SWT_LOCMD(_i)           (0x00269460 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_EMP_SWT_LOCMD(_i)           (0x00269460 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_EMP_SWT_LOCMD_MAX_INDEX     7
 #define I40E_EMP_SWT_LOCMD_COMMAND_SHIFT 0
 #define I40E_EMP_SWT_LOCMD_COMMAND_MASK  I40E_MASK(0xFFFFFFFF, I40E_EMP_SWT_LOCMD_COMMAND_SHIFT)
 
-#define I40E_EMP_SWT_LOFV(_i)               (0x00268D80 + ((_i) * 4)) /* _i=0...31 */
+#define I40E_EMP_SWT_LOFV(_i)               (0x00268D80 + ((_i) * 4)) /* _i=0...31 */ /* Reset: CORER */
 #define I40E_EMP_SWT_LOFV_MAX_INDEX         31
 #define I40E_EMP_SWT_LOFV_FIELDVECTOR_SHIFT 0
 #define I40E_EMP_SWT_LOFV_FIELDVECTOR_MASK  I40E_MASK(0xFFFFFFFF, I40E_EMP_SWT_LOFV_FIELDVECTOR_SHIFT)
 
-#define I40E_EMP_SWT_MIREGVSI(_i, _j)             (0x00263000 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...383 */
+#define I40E_EMP_SWT_MIREGVSI(_i, _j)             (0x00263000 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...383 */ /* Reset: CORER */
 #define I40E_EMP_SWT_MIREGVSI_MAX_INDEX          1
 #define I40E_EMP_SWT_MIREGVSI_ENABLEDRULES_SHIFT 0
 #define I40E_EMP_SWT_MIREGVSI_ENABLEDRULES_MASK  I40E_MASK(0xFFFFFFFF, I40E_EMP_SWT_MIREGVSI_ENABLEDRULES_SHIFT)
 
-#define I40E_EMP_SWT_MIRIGVSI(_i, _j)             (0x00265000 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...383 */
+#define I40E_EMP_SWT_MIRIGVSI(_i, _j)             (0x00265000 + ((_i) * 4 + (_j) * 8)) /* _i=0...1, _j=0...383 */ /* Reset: CORER */
 #define I40E_EMP_SWT_MIRIGVSI_MAX_INDEX          1
 #define I40E_EMP_SWT_MIRIGVSI_ENABLEDRULES_SHIFT 0
 #define I40E_EMP_SWT_MIRIGVSI_ENABLEDRULES_MASK  I40E_MASK(0xFFFFFFFF, I40E_EMP_SWT_MIRIGVSI_ENABLEDRULES_SHIFT)
 
-#define I40E_EMP_SWT_MIRTARVSI(_i)                (0x00268B00 + ((_i) * 4)) /* _i=0...63 */
+#define I40E_EMP_SWT_MIRTARVSI(_i)                (0x00268B00 + ((_i) * 4)) /* _i=0...63 */ /* Reset: CORER */
 #define I40E_EMP_SWT_MIRTARVSI_MAX_INDEX          63
 #define I40E_EMP_SWT_MIRTARVSI_TARGETVSI_SHIFT    0
 #define I40E_EMP_SWT_MIRTARVSI_TARGETVSI_MASK     I40E_MASK(0x1FF, I40E_EMP_SWT_MIRTARVSI_TARGETVSI_SHIFT)
@@ -9287,42 +9679,42 @@
 #define I40E_EMP_SWT_MIRTARVSI_RULEENABLE_SHIFT   31
 #define I40E_EMP_SWT_MIRTARVSI_RULEENABLE_MASK    I40E_MASK(0x1, I40E_EMP_SWT_MIRTARVSI_RULEENABLE_SHIFT)
 
-#define I40E_EMP_SWT_STS(_i)               (0x002692C0 + ((_i) * 4)) /* _i=0...9 */
+#define I40E_EMP_SWT_STS(_i)               (0x002692C0 + ((_i) * 4)) /* _i=0...9 */ /* Reset: CORER */
 #define I40E_EMP_SWT_STS_MAX_INDEX         9
 #define I40E_EMP_SWT_STS_EMP_SWT_STS_SHIFT 0
 #define I40E_EMP_SWT_STS_EMP_SWT_STS_MASK  I40E_MASK(0xFFFFFFFF, I40E_EMP_SWT_STS_EMP_SWT_STS_SHIFT)
 
-#define I40E_GL_MTG_FLU_MSK_L                0x00269F44
+#define I40E_GL_MTG_FLU_MSK_L                0x00269F44 /* Reset: CORER */
 #define I40E_GL_MTG_FLU_MSK_L_MASK_LOW_SHIFT 0
 #define I40E_GL_MTG_FLU_MSK_L_MASK_LOW_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_MTG_FLU_MSK_L_MASK_LOW_SHIFT)
 
-#define I40E_GL_PRE_FLU_MSK_PH0_H(_i)             (0x00269EA0 + ((_i) * 4)) /* _i=0...6 */
+#define I40E_GL_PRE_FLU_MSK_PH0_H(_i)             (0x00269EA0 + ((_i) * 4)) /* _i=0...6 */ /* Reset: CORER */
 #define I40E_GL_PRE_FLU_MSK_PH0_H_MAX_INDEX       6
 #define I40E_GL_PRE_FLU_MSK_PH0_H_MASK_HIGH_SHIFT 0
 #define I40E_GL_PRE_FLU_MSK_PH0_H_MASK_HIGH_MASK  I40E_MASK(0xFFFF, I40E_GL_PRE_FLU_MSK_PH0_H_MASK_HIGH_SHIFT)
 
-#define I40E_GL_PRE_FLU_MSK_PH0_L(_i)            (0x00269E60 + ((_i) * 4)) /* _i=0...6 */
+#define I40E_GL_PRE_FLU_MSK_PH0_L(_i)            (0x00269E60 + ((_i) * 4)) /* _i=0...6 */ /* Reset: CORER */
 #define I40E_GL_PRE_FLU_MSK_PH0_L_MAX_INDEX      6
 #define I40E_GL_PRE_FLU_MSK_PH0_L_MASK_LOW_SHIFT 0
 #define I40E_GL_PRE_FLU_MSK_PH0_L_MASK_LOW_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_FLU_MSK_PH0_L_MASK_LOW_SHIFT)
 
-#define I40E_GL_PRE_FLU_MSK_PH1_H(_i)             (0x00269F20 + ((_i) * 4)) /* _i=0...6 */
+#define I40E_GL_PRE_FLU_MSK_PH1_H(_i)             (0x00269F20 + ((_i) * 4)) /* _i=0...6 */ /* Reset: CORER */
 #define I40E_GL_PRE_FLU_MSK_PH1_H_MAX_INDEX       6
 #define I40E_GL_PRE_FLU_MSK_PH1_H_MASK_HIGH_SHIFT 0
 #define I40E_GL_PRE_FLU_MSK_PH1_H_MASK_HIGH_MASK  I40E_MASK(0xFFFF, I40E_GL_PRE_FLU_MSK_PH1_H_MASK_HIGH_SHIFT)
 
-#define I40E_GL_PRE_FLU_MSK_PH1_L(_i)            (0x00269EE0 + ((_i) * 4)) /* _i=0...6 */
+#define I40E_GL_PRE_FLU_MSK_PH1_L(_i)            (0x00269EE0 + ((_i) * 4)) /* _i=0...6 */ /* Reset: CORER */
 #define I40E_GL_PRE_FLU_MSK_PH1_L_MAX_INDEX      6
 #define I40E_GL_PRE_FLU_MSK_PH1_L_MASK_LOW_SHIFT 0
 #define I40E_GL_PRE_FLU_MSK_PH1_L_MASK_LOW_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_FLU_MSK_PH1_L_MASK_LOW_SHIFT)
 
-#define I40E_GL_PRE_GEN_CFG                     0x002699A4
+#define I40E_GL_PRE_GEN_CFG                     0x002699A4 /* Reset: CORER */
 #define I40E_GL_PRE_GEN_CFG_FILTER_ENABLE_SHIFT 0
 #define I40E_GL_PRE_GEN_CFG_FILTER_ENABLE_MASK  I40E_MASK(0x1, I40E_GL_PRE_GEN_CFG_FILTER_ENABLE_SHIFT)
 #define I40E_GL_PRE_GEN_CFG_HASH_MODE_SHIFT     6
 #define I40E_GL_PRE_GEN_CFG_HASH_MODE_MASK      I40E_MASK(0x3, I40E_GL_PRE_GEN_CFG_HASH_MODE_SHIFT)
 
-#define I40E_GL_PRE_PRX_BIG_ENT_D0                  0x002699C4
+#define I40E_GL_PRE_PRX_BIG_ENT_D0                  0x002699C4 /* Reset: CORER */
 #define I40E_GL_PRE_PRX_BIG_ENT_D0_F0_SRC_IDX_SHIFT 0
 #define I40E_GL_PRE_PRX_BIG_ENT_D0_F0_SRC_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_PRX_BIG_ENT_D0_F0_SRC_IDX_SHIFT)
 #define I40E_GL_PRE_PRX_BIG_ENT_D0_F0_SRC_SEL_SHIFT 6
@@ -9346,7 +9738,7 @@
 #define I40E_GL_PRE_PRX_BIG_ENT_D0_F3_SRC_IDX_SHIFT 31
 #define I40E_GL_PRE_PRX_BIG_ENT_D0_F3_SRC_IDX_MASK  I40E_MASK(0x1, I40E_GL_PRE_PRX_BIG_ENT_D0_F3_SRC_IDX_SHIFT)
 
-#define I40E_GL_PRE_PRX_BIG_ENT_D1                  0x002699D4
+#define I40E_GL_PRE_PRX_BIG_ENT_D1                  0x002699D4 /* Reset: CORER */
 #define I40E_GL_PRE_PRX_BIG_ENT_D1_F4_SRC_IDX_SHIFT 0
 #define I40E_GL_PRE_PRX_BIG_ENT_D1_F4_SRC_IDX_MASK  I40E_MASK(0x3F, I40E_GL_PRE_PRX_BIG_ENT_D1_F4_SRC_IDX_SHIFT)
 #define I40E_GL_PRE_PRX_BIG_ENT_D1_F4_SRC_SEL_SHIFT 6
@@ -9370,19 +9762,19 @@
 #define I40E_GL_PRE_PRX_BIG_ENT_D1_F7_SRC_IDX_SHIFT 31
 #define I40E_GL_PRE_PRX_BIG_ENT_D1_F7_SRC_IDX_MASK  I40E_MASK(0x1, I40E_GL_PRE_PRX_BIG_ENT_D1_F7_SRC_IDX_SHIFT)
 
-#define I40E_GL_PRE_PRX_BIG_ENT_D3                0x00269A0C
+#define I40E_GL_PRE_PRX_BIG_ENT_D3                0x00269A0C /* Reset: CORER */
 #define I40E_GL_PRE_PRX_BIG_ENT_D3_BIT_MSK0_SHIFT 0
 #define I40E_GL_PRE_PRX_BIG_ENT_D3_BIT_MSK0_MASK  I40E_MASK(0xFF, I40E_GL_PRE_PRX_BIG_ENT_D3_BIT_MSK0_SHIFT)
 
-#define I40E_GL_PRE_PRX_BIG_HSH_KEY_D1          0x00269A34
+#define I40E_GL_PRE_PRX_BIG_HSH_KEY_D1          0x00269A34 /* Reset: CORER */
 #define I40E_GL_PRE_PRX_BIG_HSH_KEY_D1_H1_SHIFT 0
 #define I40E_GL_PRE_PRX_BIG_HSH_KEY_D1_H1_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_PRX_BIG_HSH_KEY_D1_H1_SHIFT)
 
-#define I40E_GL_PRE_PRX_BIG_HSH_KEY_D3          0x00269A54
+#define I40E_GL_PRE_PRX_BIG_HSH_KEY_D3          0x00269A54 /* Reset: CORER */
 #define I40E_GL_PRE_PRX_BIG_HSH_KEY_D3_H3_SHIFT 0
 #define I40E_GL_PRE_PRX_BIG_HSH_KEY_D3_H3_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_PRX_BIG_HSH_KEY_D3_H3_SHIFT)
 
-#define I40E_GL_PRE_PRX_H_PHASE0                       0x00269B74
+#define I40E_GL_PRE_PRX_H_PHASE0                       0x00269B74 /* Reset: CORER */
 #define I40E_GL_PRE_PRX_H_PHASE0_PROTOCOL_ID_SHIFT     0
 #define I40E_GL_PRE_PRX_H_PHASE0_PROTOCOL_ID_MASK      I40E_MASK(0x3F, I40E_GL_PRE_PRX_H_PHASE0_PROTOCOL_ID_SHIFT)
 #define I40E_GL_PRE_PRX_H_PHASE0_IGNORE_PROTOCOL_SHIFT 6
@@ -9396,7 +9788,7 @@
 #define I40E_GL_PRE_PRX_H_PHASE0_MASK1_BITS_SHIFT      24
 #define I40E_GL_PRE_PRX_H_PHASE0_MASK1_BITS_MASK       I40E_MASK(0xFF, I40E_GL_PRE_PRX_H_PHASE0_MASK1_BITS_SHIFT)
 
-#define I40E_GL_PRE_PRX_H_PHASE1                       0x00269B7C
+#define I40E_GL_PRE_PRX_H_PHASE1                       0x00269B7C /* Reset: CORER */
 #define I40E_GL_PRE_PRX_H_PHASE1_PROTOCOL_ID_SHIFT     0
 #define I40E_GL_PRE_PRX_H_PHASE1_PROTOCOL_ID_MASK      I40E_MASK(0x3F, I40E_GL_PRE_PRX_H_PHASE1_PROTOCOL_ID_SHIFT)
 #define I40E_GL_PRE_PRX_H_PHASE1_IGNORE_PROTOCOL_SHIFT 6
@@ -9410,11 +9802,11 @@
 #define I40E_GL_PRE_PRX_H_PHASE1_MASK1_BITS_SHIFT      24
 #define I40E_GL_PRE_PRX_H_PHASE1_MASK1_BITS_MASK       I40E_MASK(0xFF, I40E_GL_PRE_PRX_H_PHASE1_MASK1_BITS_SHIFT)
 
-#define I40E_GL_PRE_PRX_HSH_KEY_D0          0x00269A24
+#define I40E_GL_PRE_PRX_HSH_KEY_D0          0x00269A24 /* Reset: CORER */
 #define I40E_GL_PRE_PRX_HSH_KEY_D0_H0_SHIFT 0
 #define I40E_GL_PRE_PRX_HSH_KEY_D0_H0_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_PRE_PRX_HSH_KEY_D0_H0_SHIFT)
 
-#define I40E_GL_PRE_PRX_L_PHASE0                    0x00269B8C
+#define I40E_GL_PRE_PRX_L_PHASE0                    0x00269B8C /* Reset: CORER */
 #define I40E_GL_PRE_PRX_L_PHASE0_W0_OFFSET_SHIFT    0
 #define I40E_GL_PRE_PRX_L_PHASE0_W0_OFFSET_MASK     I40E_MASK(0x3F, I40E_GL_PRE_PRX_L_PHASE0_W0_OFFSET_SHIFT)
 #define I40E_GL_PRE_PRX_L_PHASE0_W0_STATUS_SHIFT    6
@@ -9442,7 +9834,7 @@
 #define I40E_GL_PRE_PRX_L_PHASE0_PORT_ENABLE_SHIFT  31
 #define I40E_GL_PRE_PRX_L_PHASE0_PORT_ENABLE_MASK   I40E_MASK(0x1, I40E_GL_PRE_PRX_L_PHASE0_PORT_ENABLE_SHIFT)
 
-#define I40E_GL_PRE_PRX_L_PHASE1                    0x00269B84
+#define I40E_GL_PRE_PRX_L_PHASE1                    0x00269B84 /* Reset: CORER */
 #define I40E_GL_PRE_PRX_L_PHASE1_W0_OFFSET_SHIFT    0
 #define I40E_GL_PRE_PRX_L_PHASE1_W0_OFFSET_MASK     I40E_MASK(0x3F, I40E_GL_PRE_PRX_L_PHASE1_W0_OFFSET_SHIFT)
 #define I40E_GL_PRE_PRX_L_PHASE1_W0_STATUS_SHIFT    6
@@ -9470,42 +9862,42 @@
 #define I40E_GL_PRE_PRX_L_PHASE1_PORT_ENABLE_SHIFT  31
 #define I40E_GL_PRE_PRX_L_PHASE1_PORT_ENABLE_MASK   I40E_MASK(0x1, I40E_GL_PRE_PRX_L_PHASE1_PORT_ENABLE_SHIFT)
 
-#define I40E_GL_SW_SWT_STS(_i)               (0x00269340 + ((_i) * 4)) /* _i=0...9 */
+#define I40E_GL_SW_SWT_STS(_i)               (0x00269340 + ((_i) * 4)) /* _i=0...9 */ /* Reset: CORER */
 #define I40E_GL_SW_SWT_STS_MAX_INDEX         9
 #define I40E_GL_SW_SWT_STS_EMP_SWT_STS_SHIFT 0
 #define I40E_GL_SW_SWT_STS_EMP_SWT_STS_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SW_SWT_STS_EMP_SWT_STS_SHIFT)
 
-#define I40E_GL_SWR_FILTERS_NEED_HIT(_i)                    (0x0026CF00 + ((_i) * 4)) /* _i=0...1 */
+#define I40E_GL_SWR_FILTERS_NEED_HIT(_i)                    (0x0026CF00 + ((_i) * 4)) /* _i=0...1 */ /* Reset: CORER */
 #define I40E_GL_SWR_FILTERS_NEED_HIT_MAX_INDEX              1
 #define I40E_GL_SWR_FILTERS_NEED_HIT_FILTERS_NEED_HIT_SHIFT 0
 #define I40E_GL_SWR_FILTERS_NEED_HIT_FILTERS_NEED_HIT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWR_FILTERS_NEED_HIT_FILTERS_NEED_HIT_SHIFT)
 
-#define I40E_GL_SWR_FILTERS_NEED_MISS(_i)                     (0x0026CF10 + ((_i) * 4)) /* _i=0...1 */
+#define I40E_GL_SWR_FILTERS_NEED_MISS(_i)                     (0x0026CF10 + ((_i) * 4)) /* _i=0...1 */ /* Reset: CORER */
 #define I40E_GL_SWR_FILTERS_NEED_MISS_MAX_INDEX               1
 #define I40E_GL_SWR_FILTERS_NEED_MISS_FILTERS_NEED_MISS_SHIFT 0
 #define I40E_GL_SWR_FILTERS_NEED_MISS_FILTERS_NEED_MISS_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWR_FILTERS_NEED_MISS_FILTERS_NEED_MISS_SHIFT)
 
-#define I40E_GL_SWR_HIT_FILTERS(_i)               (0x0026CF08 + ((_i) * 4)) /* _i=0...1 */
+#define I40E_GL_SWR_HIT_FILTERS(_i)               (0x0026CF08 + ((_i) * 4)) /* _i=0...1 */ /* Reset: CORER */
 #define I40E_GL_SWR_HIT_FILTERS_MAX_INDEX         1
 #define I40E_GL_SWR_HIT_FILTERS_HIT_FILTERS_SHIFT 0
 #define I40E_GL_SWR_HIT_FILTERS_HIT_FILTERS_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWR_HIT_FILTERS_HIT_FILTERS_SHIFT)
 
-#define I40E_GL_SWR_MISS_FILTERS(_i)                (0x0026CF18 + ((_i) * 4)) /* _i=0...1 */
+#define I40E_GL_SWR_MISS_FILTERS(_i)                (0x0026CF18 + ((_i) * 4)) /* _i=0...1 */ /* Reset: CORER */
 #define I40E_GL_SWR_MISS_FILTERS_MAX_INDEX          1
 #define I40E_GL_SWR_MISS_FILTERS_MISS_FILTERS_SHIFT 0
 #define I40E_GL_SWR_MISS_FILTERS_MISS_FILTERS_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWR_MISS_FILTERS_MISS_FILTERS_SHIFT)
 
-#define I40E_GL_SWR_PRI_JOIN_MAP(_i)                  (0x0026CE20 + ((_i) * 4)) /* _i=0...8 */
+#define I40E_GL_SWR_PRI_JOIN_MAP(_i)                  (0x0026CE20 + ((_i) * 4)) /* _i=0...8 */ /* Reset: CORER */
 #define I40E_GL_SWR_PRI_JOIN_MAP_MAX_INDEX            8
 #define I40E_GL_SWR_PRI_JOIN_MAP_GL_SWR_PRI_MAP_SHIFT 0
 #define I40E_GL_SWR_PRI_JOIN_MAP_GL_SWR_PRI_MAP_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWR_PRI_JOIN_MAP_GL_SWR_PRI_MAP_SHIFT)
 
-#define I40E_GL_SWR_PRI_MAP(_i)                  (0x0026CDE0 + ((_i) * 4)) /* _i=0...8 */
+#define I40E_GL_SWR_PRI_MAP(_i)                  (0x0026CDE0 + ((_i) * 4)) /* _i=0...8 */ /* Reset: CORER */
 #define I40E_GL_SWR_PRI_MAP_MAX_INDEX            8
 #define I40E_GL_SWR_PRI_MAP_GL_SWR_PRI_MAP_SHIFT 0
 #define I40E_GL_SWR_PRI_MAP_GL_SWR_PRI_MAP_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWR_PRI_MAP_GL_SWR_PRI_MAP_SHIFT)
 
-#define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D0                  0x002699BC
+#define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D0                  0x002699BC /* Reset: CORER */
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D0_F0_SRC_IDX_SHIFT 0
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D0_F0_SRC_IDX_MASK  I40E_MASK(0x3F, I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D0_F0_SRC_IDX_SHIFT)
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D0_F0_SRC_SEL_SHIFT 6
@@ -9529,7 +9921,7 @@
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D0_F3_SRC_IDX_SHIFT 31
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D0_F3_SRC_IDX_MASK  I40E_MASK(0x1, I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D0_F3_SRC_IDX_SHIFT)
 
-#define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D1                  0x002699CC
+#define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D1                  0x002699CC /* Reset: CORER */
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D1_F4_SRC_IDX_SHIFT 0
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D1_F4_SRC_IDX_MASK  I40E_MASK(0x3F, I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D1_F4_SRC_IDX_SHIFT)
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D1_F4_SRC_SEL_SHIFT 6
@@ -9553,7 +9945,7 @@
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D1_F7_SRC_IDX_SHIFT 31
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D1_F7_SRC_IDX_MASK  I40E_MASK(0x1, I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D1_F7_SRC_IDX_SHIFT)
 
-#define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D2                 0x002699FC
+#define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D2                 0x002699FC /* Reset: CORER */
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D2_USE_PHASE_SHIFT 0
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D2_USE_PHASE_MASK  I40E_MASK(0x1, I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D2_USE_PHASE_SHIFT)
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D2_USE_INGR_SHIFT  1
@@ -9573,11 +9965,11 @@
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D2_BIT_MSK0_SHIFT  24
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D2_BIT_MSK0_MASK   I40E_MASK(0xFF, I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D2_BIT_MSK0_SHIFT)
 
-#define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D3                0x00269A14
+#define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D3                0x00269A14 /* Reset: CORER */
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D3_BIT_MSK0_SHIFT 0
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D3_BIT_MSK0_MASK  I40E_MASK(0xFF, I40E_GL_SWT_FLU_BIG_ENT_PHASE0_D3_BIT_MSK0_SHIFT)
 
-#define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D0                  0x002699DC
+#define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D0                  0x002699DC /* Reset: CORER */
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D0_F0_SRC_IDX_SHIFT 0
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D0_F0_SRC_IDX_MASK  I40E_MASK(0x3F, I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D0_F0_SRC_IDX_SHIFT)
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D0_F0_SRC_SEL_SHIFT 6
@@ -9601,7 +9993,7 @@
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D0_F3_SRC_IDX_SHIFT 31
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D0_F3_SRC_IDX_MASK  I40E_MASK(0x1, I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D0_F3_SRC_IDX_SHIFT)
 
-#define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D1                  0x002699E4
+#define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D1                  0x002699E4 /* Reset: CORER */
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D1_F4_SRC_IDX_SHIFT 0
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D1_F4_SRC_IDX_MASK  I40E_MASK(0x3F, I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D1_F4_SRC_IDX_SHIFT)
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D1_F4_SRC_SEL_SHIFT 6
@@ -9625,7 +10017,7 @@
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D1_F7_SRC_IDX_SHIFT 31
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D1_F7_SRC_IDX_MASK  I40E_MASK(0x1, I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D1_F7_SRC_IDX_SHIFT)
 
-#define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D2                 0x002699F4
+#define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D2                 0x002699F4 /* Reset: CORER */
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D2_USE_PHASE_SHIFT 0
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D2_USE_PHASE_MASK  I40E_MASK(0x1, I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D2_USE_PHASE_SHIFT)
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D2_USE_INGR_SHIFT  1
@@ -9645,41 +10037,41 @@
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D2_BIT_MSK0_SHIFT  24
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D2_BIT_MSK0_MASK   I40E_MASK(0xFF, I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D2_BIT_MSK0_SHIFT)
 
-#define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D3                0x00269A04
+#define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D3                0x00269A04 /* Reset: CORER */
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D3_BIT_MSK0_SHIFT 0
 #define I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D3_BIT_MSK0_MASK  I40E_MASK(0xFF, I40E_GL_SWT_FLU_BIG_ENT_PHASE1_D3_BIT_MSK0_SHIFT)
 
-#define I40E_GL_SWT_LOCMD_PE(_i)           (0x002694A0 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_GL_SWT_LOCMD_PE(_i)           (0x002694A0 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_GL_SWT_LOCMD_PE_MAX_INDEX     7
 #define I40E_GL_SWT_LOCMD_PE_COMMAND_SHIFT 0
 #define I40E_GL_SWT_LOCMD_PE_COMMAND_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWT_LOCMD_PE_COMMAND_SHIFT)
 
-#define I40E_GL_SWT_LOCMD_SW(_i)           (0x002694E0 + ((_i) * 4)) /* _i=0...7 */
+#define I40E_GL_SWT_LOCMD_SW(_i)           (0x002694E0 + ((_i) * 4)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_GL_SWT_LOCMD_SW_MAX_INDEX     7
 #define I40E_GL_SWT_LOCMD_SW_COMMAND_SHIFT 0
 #define I40E_GL_SWT_LOCMD_SW_COMMAND_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWT_LOCMD_SW_COMMAND_SHIFT)
 
-#define I40E_GL_SWT_LOFV_PE(_i)               (0x00268E80 + ((_i) * 4)) /* _i=0...31 */
+#define I40E_GL_SWT_LOFV_PE(_i)               (0x00268E80 + ((_i) * 4)) /* _i=0...31 */ /* Reset: CORER */
 #define I40E_GL_SWT_LOFV_PE_MAX_INDEX         31
 #define I40E_GL_SWT_LOFV_PE_FIELDVECTOR_SHIFT 0
 #define I40E_GL_SWT_LOFV_PE_FIELDVECTOR_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWT_LOFV_PE_FIELDVECTOR_SHIFT)
 
-#define I40E_GL_SWT_LOFV_SW(_i)               (0x00268F80 + ((_i) * 4)) /* _i=0...31 */
+#define I40E_GL_SWT_LOFV_SW(_i)               (0x00268F80 + ((_i) * 4)) /* _i=0...31 */ /* Reset: CORER */
 #define I40E_GL_SWT_LOFV_SW_MAX_INDEX         31
 #define I40E_GL_SWT_LOFV_SW_FIELDVECTOR_SHIFT 0
 #define I40E_GL_SWT_LOFV_SW_FIELDVECTOR_MASK  I40E_MASK(0xFFFFFFFF, I40E_GL_SWT_LOFV_SW_FIELDVECTOR_SHIFT)
 
-#define I40E_PRT_MSCCNT              0x00256BA0
+#define I40E_PRT_MSCCNT              0x00256BA0 /* Reset: CORER */
 #define I40E_PRT_MSCCNT_CCOUNT_SHIFT 0
 #define I40E_PRT_MSCCNT_CCOUNT_MASK  I40E_MASK(0x1FFFFFF, I40E_PRT_MSCCNT_CCOUNT_SHIFT)
 
-#define I40E_PRT_SBPVSI                      0x00256BE0
+#define I40E_PRT_SBPVSI                      0x00256BE0 /* Reset: CORER */
 #define I40E_PRT_SBPVSI_BAD_FRAMES_VSI_SHIFT 0
 #define I40E_PRT_SBPVSI_BAD_FRAMES_VSI_MASK  I40E_MASK(0x1FF, I40E_PRT_SBPVSI_BAD_FRAMES_VSI_SHIFT)
 #define I40E_PRT_SBPVSI_SBP_SHIFT            31
 #define I40E_PRT_SBPVSI_SBP_MASK             I40E_MASK(0x1, I40E_PRT_SBPVSI_SBP_SHIFT)
 
-#define I40E_PRT_SCSTS             0x00256C20
+#define I40E_PRT_SCSTS             0x00256C20 /* Reset: CORER */
 #define I40E_PRT_SCSTS_BSCA_SHIFT  0
 #define I40E_PRT_SCSTS_BSCA_MASK   I40E_MASK(0x1, I40E_PRT_SCSTS_BSCA_SHIFT)
 #define I40E_PRT_SCSTS_BSCAP_SHIFT 1
@@ -9689,29 +10081,29 @@
 #define I40E_PRT_SCSTS_MSCAP_SHIFT 3
 #define I40E_PRT_SCSTS_MSCAP_MASK  I40E_MASK(0x1, I40E_PRT_SCSTS_MSCAP_SHIFT)
 
-#define I40E_PRT_SWT_BSCCNT              0x00256C60
+#define I40E_PRT_SWT_BSCCNT              0x00256C60 /* Reset: CORER */
 #define I40E_PRT_SWT_BSCCNT_CCOUNT_SHIFT 0
 #define I40E_PRT_SWT_BSCCNT_CCOUNT_MASK  I40E_MASK(0x1FFFFFF, I40E_PRT_SWT_BSCCNT_CCOUNT_SHIFT)
 
-#define I40E_PRT_SWT_BSCTRH              0x00256CA0
+#define I40E_PRT_SWT_BSCTRH              0x00256CA0 /* Reset: CORER */
 #define I40E_PRT_SWT_BSCTRH_UTRESH_SHIFT 0
 #define I40E_PRT_SWT_BSCTRH_UTRESH_MASK  I40E_MASK(0x7FFFF, I40E_PRT_SWT_BSCTRH_UTRESH_SHIFT)
 
-#define I40E_PRT_SWT_DEFPORTS                         0x00256CE0
+#define I40E_PRT_SWT_DEFPORTS                         0x00256CE0 /* Reset: CORER */
 #define I40E_PRT_SWT_DEFPORTS_DEFAULT_VSI_SHIFT       0
 #define I40E_PRT_SWT_DEFPORTS_DEFAULT_VSI_MASK        I40E_MASK(0x1FF, I40E_PRT_SWT_DEFPORTS_DEFAULT_VSI_SHIFT)
 #define I40E_PRT_SWT_DEFPORTS_DEFAULT_VSI_VALID_SHIFT 31
 #define I40E_PRT_SWT_DEFPORTS_DEFAULT_VSI_VALID_MASK  I40E_MASK(0x1, I40E_PRT_SWT_DEFPORTS_DEFAULT_VSI_VALID_SHIFT)
 
-#define I40E_PRT_SWT_MSCTRH              0x00256D20
+#define I40E_PRT_SWT_MSCTRH              0x00256D20 /* Reset: CORER */
 #define I40E_PRT_SWT_MSCTRH_UTRESH_SHIFT 0
 #define I40E_PRT_SWT_MSCTRH_UTRESH_MASK  I40E_MASK(0x7FFFF, I40E_PRT_SWT_MSCTRH_UTRESH_SHIFT)
 
-#define I40E_PRT_SWT_SCBI          0x00256D60
+#define I40E_PRT_SWT_SCBI          0x00256D60 /* Reset: CORER */
 #define I40E_PRT_SWT_SCBI_BI_SHIFT 0
 #define I40E_PRT_SWT_SCBI_BI_MASK  I40E_MASK(0x1FFFFFF, I40E_PRT_SWT_SCBI_BI_SHIFT)
 
-#define I40E_PRT_SWT_SCCRL                0x00256DA0
+#define I40E_PRT_SWT_SCCRL                0x00256DA0 /* Reset: CORER */
 #define I40E_PRT_SWT_SCCRL_MDIPW_SHIFT    0
 #define I40E_PRT_SWT_SCCRL_MDIPW_MASK     I40E_MASK(0x1, I40E_PRT_SWT_SCCRL_MDIPW_SHIFT)
 #define I40E_PRT_SWT_SCCRL_MDICW_SHIFT    1
@@ -9725,11 +10117,11 @@
 #define I40E_PRT_SWT_SCCRL_INTERVAL_SHIFT 8
 #define I40E_PRT_SWT_SCCRL_INTERVAL_MASK  I40E_MASK(0x3FF, I40E_PRT_SWT_SCCRL_INTERVAL_SHIFT)
 
-#define I40E_PRT_SWT_SCTC             0x00256DE0
+#define I40E_PRT_SWT_SCTC             0x00256DE0 /* Reset: CORER */
 #define I40E_PRT_SWT_SCTC_COUNT_SHIFT 0
 #define I40E_PRT_SWT_SCTC_COUNT_MASK  I40E_MASK(0x3FF, I40E_PRT_SWT_SCTC_COUNT_SHIFT)
 
-#define I40E_PRT_SWT_SWITCHID                             0x00256E20
+#define I40E_PRT_SWT_SWITCHID                             0x00256E20 /* Reset: CORER */
 #define I40E_PRT_SWT_SWITCHID_SWID_SHIFT                  0
 #define I40E_PRT_SWT_SWITCHID_SWID_MASK                   I40E_MASK(0xFFF, I40E_PRT_SWT_SWITCHID_SWID_SHIFT)
 #define I40E_PRT_SWT_SWITCHID_ISNSTAG_SHIFT               12
@@ -9739,7 +10131,7 @@
 #define I40E_PRT_SWT_SWITCHID_FORWARD_MUTICAST_ETAG_SHIFT 31
 #define I40E_PRT_SWT_SWITCHID_FORWARD_MUTICAST_ETAG_MASK  I40E_MASK(0x1, I40E_PRT_SWT_SWITCHID_FORWARD_MUTICAST_ETAG_SHIFT)
 
-#define I40E_PRT_TCTUPR(_i)       (0x00044000 + ((_i) * 32)) /* _i=0...7 */
+#define I40E_PRT_TCTUPR(_i)       (0x00044000 + ((_i) * 32)) /* _i=0...7 */ /* Reset: CORER */
 #define I40E_PRT_TCTUPR_MAX_INDEX 7
 #define I40E_PRT_TCTUPR_UP0_SHIFT 0
 #define I40E_PRT_TCTUPR_UP0_MASK  I40E_MASK(0x7, I40E_PRT_TCTUPR_UP0_SHIFT)
@@ -9760,35 +10152,35 @@
 
 /* PF - TimeSync (IEEE 1588) Registers  */
 
-#define I40E_PRTTSYN_VFTIME_H                  0x001E4020
+#define I40E_PRTTSYN_VFTIME_H                  0x001E4020 /* Reset: GLOBR */
 #define I40E_PRTTSYN_VFTIME_H_TSYNTIME_H_SHIFT 0
 #define I40E_PRTTSYN_VFTIME_H_TSYNTIME_H_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_VFTIME_H_TSYNTIME_H_SHIFT)
 
-#define I40E_PRTTSYN_VFTIME_L                  0x001E4000
+#define I40E_PRTTSYN_VFTIME_L                  0x001E4000 /* Reset: GLOBR */
 #define I40E_PRTTSYN_VFTIME_L_TSYNTIME_L_SHIFT 0
 #define I40E_PRTTSYN_VFTIME_L_TSYNTIME_L_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_VFTIME_L_TSYNTIME_L_SHIFT)
 
 /* PF - Transmit Scheduler Registers */
 
-#define I40E_GLSCD_BWLCREDUPDATE                     0x000B2148
+#define I40E_GLSCD_BWLCREDUPDATE                     0x000B2148 /* Reset: CORER */
 #define I40E_GLSCD_BWLCREDUPDATE_BWLCREDUPDATE_SHIFT 0
 #define I40E_GLSCD_BWLCREDUPDATE_BWLCREDUPDATE_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSCD_BWLCREDUPDATE_BWLCREDUPDATE_SHIFT)
 
-#define I40E_GLSCD_BWLLINESPERARB                      0x000B214C
+#define I40E_GLSCD_BWLLINESPERARB                      0x000B214C /* Reset: CORER */
 #define I40E_GLSCD_BWLLINESPERARB_BWLLINESPERARB_SHIFT 0
 #define I40E_GLSCD_BWLLINESPERARB_BWLLINESPERARB_MASK  I40E_MASK(0x7FF, I40E_GLSCD_BWLLINESPERARB_BWLLINESPERARB_SHIFT)
 
-#define I40E_GLSCD_CREDITSPERQUANTA                            0x000B2144
+#define I40E_GLSCD_CREDITSPERQUANTA                            0x000B2144 /* Reset: CORER */
 #define I40E_GLSCD_CREDITSPERQUANTA_TSCDCREDITSPERQUANTA_SHIFT 0
 #define I40E_GLSCD_CREDITSPERQUANTA_TSCDCREDITSPERQUANTA_MASK  I40E_MASK(0xFFFF, I40E_GLSCD_CREDITSPERQUANTA_TSCDCREDITSPERQUANTA_SHIFT)
 
-#define I40E_GLSCD_ERRSTATREG                          0x000B2150
+#define I40E_GLSCD_ERRSTATREG                          0x000B2150 /* Reset: CORER */
 #define I40E_GLSCD_ERRSTATREG_LOOP_DETECTED_SHIFT      0
 #define I40E_GLSCD_ERRSTATREG_LOOP_DETECTED_MASK       I40E_MASK(0x1, I40E_GLSCD_ERRSTATREG_LOOP_DETECTED_SHIFT)
 #define I40E_GLSCD_ERRSTATREG_SHRTBWLIMUPDATEPER_SHIFT 1
 #define I40E_GLSCD_ERRSTATREG_SHRTBWLIMUPDATEPER_MASK  I40E_MASK(0x1, I40E_GLSCD_ERRSTATREG_SHRTBWLIMUPDATEPER_SHIFT)
 
-#define I40E_GLSCD_IFBCMDH                       0x000B20A0
+#define I40E_GLSCD_IFBCMDH                       0x000B20A0 /* Reset: CORER */
 #define I40E_GLSCD_IFBCMDH_FLDOFFS_NUMENTS_SHIFT 0
 #define I40E_GLSCD_IFBCMDH_FLDOFFS_NUMENTS_MASK  I40E_MASK(0x7F, I40E_GLSCD_IFBCMDH_FLDOFFS_NUMENTS_SHIFT)
 #define I40E_GLSCD_IFBCMDH_FLDSZ_SHIFT           7
@@ -9798,7 +10190,7 @@
 #define I40E_GLSCD_IFBCMDH_RSVD_SHIFT            31
 #define I40E_GLSCD_IFBCMDH_RSVD_MASK             I40E_MASK(0x1, I40E_GLSCD_IFBCMDH_RSVD_SHIFT)
 
-#define I40E_GLSCD_IFBCMDL                   0x000B209c
+#define I40E_GLSCD_IFBCMDL                   0x000B209c /* Reset: CORER */
 #define I40E_GLSCD_IFBCMDL_OPCODE_SHIFT      0
 #define I40E_GLSCD_IFBCMDL_OPCODE_MASK       I40E_MASK(0xF, I40E_GLSCD_IFBCMDL_OPCODE_SHIFT)
 #define I40E_GLSCD_IFBCMDL_TBLTYPE_SHIFT     4
@@ -9810,7 +10202,7 @@
 #define I40E_GLSCD_IFBCMDL_RSVD_SHIFT        22
 #define I40E_GLSCD_IFBCMDL_RSVD_MASK         I40E_MASK(0x3FF, I40E_GLSCD_IFBCMDL_RSVD_SHIFT)
 
-#define I40E_GLSCD_IFCTRL                          0x000B20A8
+#define I40E_GLSCD_IFCTRL                          0x000B20A8 /* Reset: CORER */
 #define I40E_GLSCD_IFCTRL_BCMDDB_SHIFT             0
 #define I40E_GLSCD_IFCTRL_BCMDDB_MASK              I40E_MASK(0x1, I40E_GLSCD_IFCTRL_BCMDDB_SHIFT)
 #define I40E_GLSCD_IFCTRL_ICMDCLRERR_SHIFT         1
@@ -9822,12 +10214,12 @@
 #define I40E_GLSCD_IFCTRL_SMALL_CRED_DISABLE_SHIFT 4
 #define I40E_GLSCD_IFCTRL_SMALL_CRED_DISABLE_MASK  I40E_MASK(0x1, I40E_GLSCD_IFCTRL_SMALL_CRED_DISABLE_SHIFT)
 
-#define I40E_GLSCD_IFDATA(_i)              (0x000B2084 + ((_i) * 4)) /* _i=0...3 */
+#define I40E_GLSCD_IFDATA(_i)              (0x000B2084 + ((_i) * 4)) /* _i=0...3 */ /* Reset: CORER */
 #define I40E_GLSCD_IFDATA_MAX_INDEX        3
 #define I40E_GLSCD_IFDATA_TSCDIFDATA_SHIFT 0
 #define I40E_GLSCD_IFDATA_TSCDIFDATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSCD_IFDATA_TSCDIFDATA_SHIFT)
 
-#define I40E_GLSCD_IFICMDH                       0x000B2098
+#define I40E_GLSCD_IFICMDH                       0x000B2098 /* Reset: CORER */
 #define I40E_GLSCD_IFICMDH_FLDOFFS_NUMENTS_SHIFT 0
 #define I40E_GLSCD_IFICMDH_FLDOFFS_NUMENTS_MASK  I40E_MASK(0x7F, I40E_GLSCD_IFICMDH_FLDOFFS_NUMENTS_SHIFT)
 #define I40E_GLSCD_IFICMDH_FLDSZ_SHIFT           7
@@ -9837,7 +10229,7 @@
 #define I40E_GLSCD_IFICMDH_RSVD_SHIFT            31
 #define I40E_GLSCD_IFICMDH_RSVD_MASK             I40E_MASK(0x1, I40E_GLSCD_IFICMDH_RSVD_SHIFT)
 
-#define I40E_GLSCD_IFICMDL                   0x000B2094
+#define I40E_GLSCD_IFICMDL                   0x000B2094 /* Reset: CORER */
 #define I40E_GLSCD_IFICMDL_OPCODE_SHIFT      0
 #define I40E_GLSCD_IFICMDL_OPCODE_MASK       I40E_MASK(0xF, I40E_GLSCD_IFICMDL_OPCODE_SHIFT)
 #define I40E_GLSCD_IFICMDL_TBLTYPE_SHIFT     4
@@ -9849,7 +10241,7 @@
 #define I40E_GLSCD_IFICMDL_RSVD_SHIFT        22
 #define I40E_GLSCD_IFICMDL_RSVD_MASK         I40E_MASK(0x3FF, I40E_GLSCD_IFICMDL_RSVD_SHIFT)
 
-#define I40E_GLSCD_IFSTATUS                 0x000B20A4
+#define I40E_GLSCD_IFSTATUS                 0x000B20A4 /* Reset: CORER */
 #define I40E_GLSCD_IFSTATUS_ENTRAVAIL_SHIFT 0
 #define I40E_GLSCD_IFSTATUS_ENTRAVAIL_MASK  I40E_MASK(0x3F, I40E_GLSCD_IFSTATUS_ENTRAVAIL_SHIFT)
 #define I40E_GLSCD_IFSTATUS_ICMDBZ_SHIFT    6
@@ -9863,19 +10255,19 @@
 #define I40E_GLSCD_IFSTATUS_RSVD_SHIFT      10
 #define I40E_GLSCD_IFSTATUS_RSVD_MASK       I40E_MASK(0x3FFFFF, I40E_GLSCD_IFSTATUS_RSVD_SHIFT)
 
-#define I40E_GLSCD_INCSCHEDCFGCOUNT                        0x000B2140
+#define I40E_GLSCD_INCSCHEDCFGCOUNT                        0x000B2140 /* Reset: CORER */
 #define I40E_GLSCD_INCSCHEDCFGCOUNT_INCSCHEDCFGCOUNT_SHIFT 0
 #define I40E_GLSCD_INCSCHEDCFGCOUNT_INCSCHEDCFGCOUNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSCD_INCSCHEDCFGCOUNT_INCSCHEDCFGCOUNT_SHIFT)
 
-#define I40E_GLSCD_LANTCBCMDS                     0x000B2154
+#define I40E_GLSCD_LANTCBCMDS                     0x000B2154 /* Reset: CORER */
 #define I40E_GLSCD_LANTCBCMDS_NUMLANTCBCMDS_SHIFT 0
 #define I40E_GLSCD_LANTCBCMDS_NUMLANTCBCMDS_MASK  I40E_MASK(0x7F, I40E_GLSCD_LANTCBCMDS_NUMLANTCBCMDS_SHIFT)
 
-#define I40E_GLSCD_LLPREALTHRESH                     0x000B213C
+#define I40E_GLSCD_LLPREALTHRESH                     0x000B213C /* Reset: CORER */
 #define I40E_GLSCD_LLPREALTHRESH_LLPREALTHRESH_SHIFT 0
 #define I40E_GLSCD_LLPREALTHRESH_LLPREALTHRESH_MASK  I40E_MASK(0xF, I40E_GLSCD_LLPREALTHRESH_LLPREALTHRESH_SHIFT)
 
-#define I40E_GLSCD_PRGPERFCONTROL(_i)                  (0x000B20FC + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLSCD_PRGPERFCONTROL(_i)                  (0x000B20FC + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSCD_PRGPERFCONTROL_MAX_INDEX            15
 #define I40E_GLSCD_PRGPERFCONTROL_COUNTERTYPE_SHIFT    0
 #define I40E_GLSCD_PRGPERFCONTROL_COUNTERTYPE_MASK     I40E_MASK(0x7, I40E_GLSCD_PRGPERFCONTROL_COUNTERTYPE_SHIFT)
@@ -9888,12 +10280,12 @@
 #define I40E_GLSCD_PRGPERFCONTROL_QSINDEX_SHIFT        16
 #define I40E_GLSCD_PRGPERFCONTROL_QSINDEX_MASK         I40E_MASK(0x3FF, I40E_GLSCD_PRGPERFCONTROL_QSINDEX_SHIFT)
 
-#define I40E_GLSCD_PRGPERFCOUNT(_i)                (0x000B20BC + ((_i) * 4)) /* _i=0...15 */
+#define I40E_GLSCD_PRGPERFCOUNT(_i)                (0x000B20BC + ((_i) * 4)) /* _i=0...15 */ /* Reset: CORER */
 #define I40E_GLSCD_PRGPERFCOUNT_MAX_INDEX          15
 #define I40E_GLSCD_PRGPERFCOUNT_PRGPERFCOUNT_SHIFT 0
 #define I40E_GLSCD_PRGPERFCOUNT_PRGPERFCOUNT_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSCD_PRGPERFCOUNT_PRGPERFCOUNT_SHIFT)
 
-#define I40E_GLSCD_RAM_DBG_CTL(_i)          (0x000B28c0 + ((_i) * 4)) /* _i=0...9 */
+#define I40E_GLSCD_RAM_DBG_CTL(_i)          (0x000B28c0 + ((_i) * 4)) /* _i=0...9 */ /* Reset: POR */
 #define I40E_GLSCD_RAM_DBG_CTL_MAX_INDEX    9
 #define I40E_GLSCD_RAM_DBG_CTL_ADR_SHIFT    0
 #define I40E_GLSCD_RAM_DBG_CTL_ADR_MASK     I40E_MASK(0x3FFFF, I40E_GLSCD_RAM_DBG_CTL_ADR_SHIFT)
@@ -9904,58 +10296,58 @@
 #define I40E_GLSCD_RAM_DBG_CTL_DONE_SHIFT   31
 #define I40E_GLSCD_RAM_DBG_CTL_DONE_MASK    I40E_MASK(0x1, I40E_GLSCD_RAM_DBG_CTL_DONE_SHIFT)
 
-#define I40E_GLSCD_RAM_DBG_DATA(_i)                      (0x000b28e8 + ((_i) * 4)) /* _i=0...9 */
+#define I40E_GLSCD_RAM_DBG_DATA(_i)                      (0x000b28e8 + ((_i) * 4)) /* _i=0...9 */ /* Reset: POR */
 #define I40E_GLSCD_RAM_DBG_DATA_MAX_INDEX                9
 #define I40E_GLSCD_RAM_DBG_DATA_GLSCD_RAM_DBG_DATA_SHIFT 0
 #define I40E_GLSCD_RAM_DBG_DATA_GLSCD_RAM_DBG_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSCD_RAM_DBG_DATA_GLSCD_RAM_DBG_DATA_SHIFT)
 
-#define I40E_GLSCD_RLMTBLRD2CMD                 0x000B2158
+#define I40E_GLSCD_RLMTBLRD2CMD                 0x000B2158 /* Reset: CORER */
 #define I40E_GLSCD_RLMTBLRD2CMD_RLMTBLIDX_SHIFT 0
 #define I40E_GLSCD_RLMTBLRD2CMD_RLMTBLIDX_MASK  I40E_MASK(0x3FF, I40E_GLSCD_RLMTBLRD2CMD_RLMTBLIDX_SHIFT)
 
-#define I40E_GLSCD_RLMTBLRD2DATAHI            0x000B2164
+#define I40E_GLSCD_RLMTBLRD2DATAHI            0x000B2164 /* Reset: CORER */
 #define I40E_GLSCD_RLMTBLRD2DATAHI_DATA_SHIFT 0
 #define I40E_GLSCD_RLMTBLRD2DATAHI_DATA_MASK  I40E_MASK(0x7FFFFFF, I40E_GLSCD_RLMTBLRD2DATAHI_DATA_SHIFT)
 
-#define I40E_GLSCD_RLMTBLRD2DATALO            0x000B2160
+#define I40E_GLSCD_RLMTBLRD2DATALO            0x000B2160 /* Reset: CORER */
 #define I40E_GLSCD_RLMTBLRD2DATALO_DATA_SHIFT 0
 #define I40E_GLSCD_RLMTBLRD2DATALO_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSCD_RLMTBLRD2DATALO_DATA_SHIFT)
 
-#define I40E_GLSCD_RLMTBLRD2STATUS             0x000B215C
+#define I40E_GLSCD_RLMTBLRD2STATUS             0x000B215C /* Reset: CORER */
 #define I40E_GLSCD_RLMTBLRD2STATUS_VALID_SHIFT 0
 #define I40E_GLSCD_RLMTBLRD2STATUS_VALID_MASK  I40E_MASK(0x1, I40E_GLSCD_RLMTBLRD2STATUS_VALID_SHIFT)
 #define I40E_GLSCD_RLMTBLRD2STATUS_RSVD_SHIFT  1
 #define I40E_GLSCD_RLMTBLRD2STATUS_RSVD_MASK   I40E_MASK(0x7FFFFFFF, I40E_GLSCD_RLMTBLRD2STATUS_RSVD_SHIFT)
 
-#define I40E_GLSCD_RLMTBLRDCMD                 0x000B20AC
+#define I40E_GLSCD_RLMTBLRDCMD                 0x000B20AC /* Reset: CORER */
 #define I40E_GLSCD_RLMTBLRDCMD_RLMTBLIDX_SHIFT 0
 #define I40E_GLSCD_RLMTBLRDCMD_RLMTBLIDX_MASK  I40E_MASK(0x3FF, I40E_GLSCD_RLMTBLRDCMD_RLMTBLIDX_SHIFT)
 
-#define I40E_GLSCD_RLMTBLRDDATAHI            0x000B20B8
+#define I40E_GLSCD_RLMTBLRDDATAHI            0x000B20B8 /* Reset: CORER */
 #define I40E_GLSCD_RLMTBLRDDATAHI_DATA_SHIFT 0
 #define I40E_GLSCD_RLMTBLRDDATAHI_DATA_MASK  I40E_MASK(0x7FFFFFF, I40E_GLSCD_RLMTBLRDDATAHI_DATA_SHIFT)
 
-#define I40E_GLSCD_RLMTBLRDDATALO            0x000B20B4
+#define I40E_GLSCD_RLMTBLRDDATALO            0x000B20B4 /* Reset: CORER */
 #define I40E_GLSCD_RLMTBLRDDATALO_DATA_SHIFT 0
 #define I40E_GLSCD_RLMTBLRDDATALO_DATA_MASK  I40E_MASK(0xFFFFFFFF, I40E_GLSCD_RLMTBLRDDATALO_DATA_SHIFT)
 
-#define I40E_GLSCD_RLMTBLRDSTATUS             0x000B20B0
+#define I40E_GLSCD_RLMTBLRDSTATUS             0x000B20B0 /* Reset: CORER */
 #define I40E_GLSCD_RLMTBLRDSTATUS_VALID_SHIFT 0
 #define I40E_GLSCD_RLMTBLRDSTATUS_VALID_MASK  I40E_MASK(0x1, I40E_GLSCD_RLMTBLRDSTATUS_VALID_SHIFT)
 #define I40E_GLSCD_RLMTBLRDSTATUS_RSVD_SHIFT  1
 #define I40E_GLSCD_RLMTBLRDSTATUS_RSVD_MASK   I40E_MASK(0x7FFFFFFF, I40E_GLSCD_RLMTBLRDSTATUS_RSVD_SHIFT)
 
-#define I40E_PFSCD_DEFQSETHNDL                   0x000B2000
+#define I40E_PFSCD_DEFQSETHNDL                   0x000B2000 /* Reset: PFR */
 #define I40E_PFSCD_DEFQSETHNDL_DEFQSETHNDL_SHIFT 0
 #define I40E_PFSCD_DEFQSETHNDL_DEFQSETHNDL_MASK  I40E_MASK(0xFFFF, I40E_PFSCD_DEFQSETHNDL_DEFQSETHNDL_SHIFT)
 
 /* PF - Virtualization PF Registers  */
 
-#define I40E_GL_MDCK_RX                 0x0012A50C
+#define I40E_GL_MDCK_RX                 0x0012A50C /* Reset: CORER */
 #define I40E_GL_MDCK_RX_DESC_ADDR_SHIFT 0
 #define I40E_GL_MDCK_RX_DESC_ADDR_MASK  I40E_MASK(0x1, I40E_GL_MDCK_RX_DESC_ADDR_SHIFT)
 
-#define I40E_GL_MDCK_TCMD                         0x000E648C
+#define I40E_GL_MDCK_TCMD                         0x000E648C /* Reset: CORER */
 #define I40E_GL_MDCK_TCMD_DESC_ADDR_SHIFT         0
 #define I40E_GL_MDCK_TCMD_DESC_ADDR_MASK          I40E_MASK(0x1, I40E_GL_MDCK_TCMD_DESC_ADDR_SHIFT)
 #define I40E_GL_MDCK_TCMD_MAX_BUFF_SHIFT          2
@@ -9989,7 +10381,7 @@
 #define I40E_GL_MDCK_TCMD_ZERO_BSIZE_SHIFT        18
 #define I40E_GL_MDCK_TCMD_ZERO_BSIZE_MASK         I40E_MASK(0x1, I40E_GL_MDCK_TCMD_ZERO_BSIZE_SHIFT)
 
-#define I40E_GL_MDCK_TDAT                      0x000442F4
+#define I40E_GL_MDCK_TDAT                      0x000442F4 /* Reset: CORER */
 #define I40E_GL_MDCK_TDAT_BIG_OFFSET_SHIFT     0
 #define I40E_GL_MDCK_TDAT_BIG_OFFSET_MASK      I40E_MASK(0x1, I40E_GL_MDCK_TDAT_BIG_OFFSET_SHIFT)
 #define I40E_GL_MDCK_TDAT_BUFF_ADDR_SHIFT      1
@@ -9999,7 +10391,7 @@
 #define I40E_GL_MDCK_TDAT_MAL_CMD_DIS_SHIFT    3
 #define I40E_GL_MDCK_TDAT_MAL_CMD_DIS_MASK     I40E_MASK(0x1, I40E_GL_MDCK_TDAT_MAL_CMD_DIS_SHIFT)
 
-#define I40E_PF_VIRT_VSTATUS                  0x0009C400
+#define I40E_PF_VIRT_VSTATUS                  0x0009C400 /* Reset: PFR */
 #define I40E_PF_VIRT_VSTATUS_NUM_VFS_SHIFT    0
 #define I40E_PF_VIRT_VSTATUS_NUM_VFS_MASK     I40E_MASK(0xFF, I40E_PF_VIRT_VSTATUS_NUM_VFS_SHIFT)
 #define I40E_PF_VIRT_VSTATUS_TOTAL_VFS_SHIFT  8
@@ -10007,7 +10399,7 @@
 #define I40E_PF_VIRT_VSTATUS_IOV_ACTIVE_SHIFT 16
 #define I40E_PF_VIRT_VSTATUS_IOV_ACTIVE_MASK  I40E_MASK(0x1, I40E_PF_VIRT_VSTATUS_IOV_ACTIVE_SHIFT)
 
-#define I40E_PF_VT_PFALLOC_CSR               0x00078D80
+#define I40E_PF_VT_PFALLOC_CSR               0x00078D80 /* Reset: CORER */
 #define I40E_PF_VT_PFALLOC_CSR_FIRSTVF_SHIFT 0
 #define I40E_PF_VT_PFALLOC_CSR_FIRSTVF_MASK  I40E_MASK(0xFF, I40E_PF_VT_PFALLOC_CSR_FIRSTVF_SHIFT)
 #define I40E_PF_VT_PFALLOC_CSR_LASTVF_SHIFT  8
@@ -10015,7 +10407,7 @@
 #define I40E_PF_VT_PFALLOC_CSR_VALID_SHIFT   31
 #define I40E_PF_VT_PFALLOC_CSR_VALID_MASK    I40E_MASK(0x1, I40E_PF_VT_PFALLOC_CSR_VALID_SHIFT)
 
-#define I40E_PF_VT_PFALLOC_INT               0x0003F080
+#define I40E_PF_VT_PFALLOC_INT               0x0003F080 /* Reset: CORER */
 #define I40E_PF_VT_PFALLOC_INT_FIRSTVF_SHIFT 0
 #define I40E_PF_VT_PFALLOC_INT_FIRSTVF_MASK  I40E_MASK(0xFF, I40E_PF_VT_PFALLOC_INT_FIRSTVF_SHIFT)
 #define I40E_PF_VT_PFALLOC_INT_LASTVF_SHIFT  8
@@ -10023,7 +10415,7 @@
 #define I40E_PF_VT_PFALLOC_INT_VALID_SHIFT   31
 #define I40E_PF_VT_PFALLOC_INT_VALID_MASK    I40E_MASK(0x1, I40E_PF_VT_PFALLOC_INT_VALID_SHIFT)
 
-#define I40E_PF_VT_PFALLOC_PMAT               0x000C0680
+#define I40E_PF_VT_PFALLOC_PMAT               0x000C0680 /* Reset: CORER */
 #define I40E_PF_VT_PFALLOC_PMAT_FIRSTVF_SHIFT 0
 #define I40E_PF_VT_PFALLOC_PMAT_FIRSTVF_MASK  I40E_MASK(0xFF, I40E_PF_VT_PFALLOC_PMAT_FIRSTVF_SHIFT)
 #define I40E_PF_VT_PFALLOC_PMAT_LASTVF_SHIFT  8
@@ -10031,7 +10423,7 @@
 #define I40E_PF_VT_PFALLOC_PMAT_VALID_SHIFT   31
 #define I40E_PF_VT_PFALLOC_PMAT_VALID_MASK    I40E_MASK(0x1, I40E_PF_VT_PFALLOC_PMAT_VALID_SHIFT)
 
-#define I40E_PF_VT_PFALLOC_TSCD               0x000B2280
+#define I40E_PF_VT_PFALLOC_TSCD               0x000B2280 /* Reset: CORER */
 #define I40E_PF_VT_PFALLOC_TSCD_FIRSTVF_SHIFT 0
 #define I40E_PF_VT_PFALLOC_TSCD_FIRSTVF_MASK  I40E_MASK(0xFF, I40E_PF_VT_PFALLOC_TSCD_FIRSTVF_SHIFT)
 #define I40E_PF_VT_PFALLOC_TSCD_LASTVF_SHIFT  8
@@ -10039,7 +10431,7 @@
 #define I40E_PF_VT_PFALLOC_TSCD_VALID_SHIFT   31
 #define I40E_PF_VT_PFALLOC_TSCD_VALID_MASK    I40E_MASK(0x1, I40E_PF_VT_PFALLOC_TSCD_VALID_SHIFT)
 
-#define I40E_PF_VT_PFALLOC_VMLR               0x00092580
+#define I40E_PF_VT_PFALLOC_VMLR               0x00092580 /* Reset: CORER */
 #define I40E_PF_VT_PFALLOC_VMLR_FIRSTVF_SHIFT 0
 #define I40E_PF_VT_PFALLOC_VMLR_FIRSTVF_MASK  I40E_MASK(0xFF, I40E_PF_VT_PFALLOC_VMLR_FIRSTVF_SHIFT)
 #define I40E_PF_VT_PFALLOC_VMLR_LASTVF_SHIFT  8
@@ -10049,7 +10441,7 @@
 
 /* PF - VSI Context */
 
-#define I40E_VSI_L2TAGSTXVALID(_VSI)                      (0x00042800 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_L2TAGSTXVALID(_VSI)                      (0x00042800 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_L2TAGSTXVALID_MAX_INDEX                  383
 #define I40E_VSI_L2TAGSTXVALID_L2TAG1INSERTID_SHIFT       0
 #define I40E_VSI_L2TAGSTXVALID_L2TAG1INSERTID_MASK        I40E_MASK(0x7, I40E_VSI_L2TAGSTXVALID_L2TAG1INSERTID_SHIFT)
@@ -10072,12 +10464,12 @@
 #define I40E_VSI_L2TAGSTXVALID_TIR2_INSERT_SHIFT          27
 #define I40E_VSI_L2TAGSTXVALID_TIR2_INSERT_MASK           I40E_MASK(0x1, I40E_VSI_L2TAGSTXVALID_TIR2_INSERT_SHIFT)
 
-#define I40E_VSI_PORT(_VSI)          (0x000B22C0 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_PORT(_VSI)          (0x000B22C0 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_PORT_MAX_INDEX      383
 #define I40E_VSI_PORT_PORT_NUM_SHIFT 0
 #define I40E_VSI_PORT_PORT_NUM_MASK  I40E_MASK(0x3, I40E_VSI_PORT_PORT_NUM_SHIFT)
 
-#define I40E_VSI_RUPR(_VSI)     (0x00050000 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_RUPR(_VSI)     (0x00050000 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_RUPR_MAX_INDEX 383
 #define I40E_VSI_RUPR_UP0_SHIFT 0
 #define I40E_VSI_RUPR_UP0_MASK  I40E_MASK(0x7, I40E_VSI_RUPR_UP0_SHIFT)
@@ -10096,14 +10488,14 @@
 #define I40E_VSI_RUPR_UP7_SHIFT 21
 #define I40E_VSI_RUPR_UP7_MASK  I40E_MASK(0x7, I40E_VSI_RUPR_UP7_SHIFT)
 
-#define I40E_VSI_RXSWCTRL(_VSI)                   (0x00208800 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_RXSWCTRL(_VSI)                   (0x00208800 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_RXSWCTRL_MAX_INDEX               383
 #define I40E_VSI_RXSWCTRL_MACVSIPRUNEENABLE_SHIFT 0
 #define I40E_VSI_RXSWCTRL_MACVSIPRUNEENABLE_MASK  I40E_MASK(0x1, I40E_VSI_RXSWCTRL_MACVSIPRUNEENABLE_SHIFT)
 #define I40E_VSI_RXSWCTRL_VLANPRUNEENABLE_SHIFT   1
 #define I40E_VSI_RXSWCTRL_VLANPRUNEENABLE_MASK    I40E_MASK(0x1, I40E_VSI_RXSWCTRL_VLANPRUNEENABLE_SHIFT)
 
-#define I40E_VSI_SRCSWCTRL(_VSI)                   (0x00209800 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_SRCSWCTRL(_VSI)                   (0x00209800 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_SRCSWCTRL_MAX_INDEX               383
 #define I40E_VSI_SRCSWCTRL_SWID_SHIFT              0
 #define I40E_VSI_SRCSWCTRL_SWID_MASK               I40E_MASK(0xFFF, I40E_VSI_SRCSWCTRL_SWID_SHIFT)
@@ -10122,34 +10514,34 @@
 #define I40E_VSI_SRCSWCTRL_MACAS_SHIFT             23
 #define I40E_VSI_SRCSWCTRL_MACAS_MASK              I40E_MASK(0x1, I40E_VSI_SRCSWCTRL_MACAS_SHIFT)
 
-#define I40E_VSI_TAIR(_VSI)             (0x00041800 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_TAIR(_VSI)             (0x00041800 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_TAIR_MAX_INDEX         383
 #define I40E_VSI_TAIR_PORT_TAG_ID_SHIFT 0
 #define I40E_VSI_TAIR_PORT_TAG_ID_MASK  I40E_MASK(0xFFFF, I40E_VSI_TAIR_PORT_TAG_ID_SHIFT)
 
-#define I40E_VSI_TAR(_VSI)                (0x00042000 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_TAR(_VSI)                (0x00042000 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_TAR_MAX_INDEX            383
 #define I40E_VSI_TAR_ACCEPTTAGGED_SHIFT   0
 #define I40E_VSI_TAR_ACCEPTTAGGED_MASK    I40E_MASK(0x3FF, I40E_VSI_TAR_ACCEPTTAGGED_SHIFT)
 #define I40E_VSI_TAR_ACCEPTUNTAGGED_SHIFT 16
 #define I40E_VSI_TAR_ACCEPTUNTAGGED_MASK  I40E_MASK(0x3FF, I40E_VSI_TAR_ACCEPTUNTAGGED_SHIFT)
 
-#define I40E_VSI_TIR_0(_VSI)             (0x00040000 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_TIR_0(_VSI)             (0x00040000 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_TIR_0_MAX_INDEX         383
 #define I40E_VSI_TIR_0_PORT_TAG_ID_SHIFT 0
 #define I40E_VSI_TIR_0_PORT_TAG_ID_MASK  I40E_MASK(0xFFFF, I40E_VSI_TIR_0_PORT_TAG_ID_SHIFT)
 
-#define I40E_VSI_TIR_1(_VSI)             (0x00040800 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_TIR_1(_VSI)             (0x00040800 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_TIR_1_MAX_INDEX         383
 #define I40E_VSI_TIR_1_PORT_TAG_ID_SHIFT 0
 #define I40E_VSI_TIR_1_PORT_TAG_ID_MASK  I40E_MASK(0xFFFFFFFF, I40E_VSI_TIR_1_PORT_TAG_ID_SHIFT)
 
-#define I40E_VSI_TIR_2(_VSI)             (0x00041000 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_TIR_2(_VSI)             (0x00041000 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_TIR_2_MAX_INDEX         383
 #define I40E_VSI_TIR_2_PORT_TAG_ID_SHIFT 0
 #define I40E_VSI_TIR_2_PORT_TAG_ID_MASK  I40E_MASK(0xFFFF, I40E_VSI_TIR_2_PORT_TAG_ID_SHIFT)
 
-#define I40E_VSI_TSR(_VSI)             (0x00050800 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_TSR(_VSI)             (0x00050800 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_TSR_MAX_INDEX         383
 #define I40E_VSI_TSR_STRIPTAG_SHIFT    0
 #define I40E_VSI_TSR_STRIPTAG_MASK     I40E_MASK(0x3FF, I40E_VSI_TSR_STRIPTAG_SHIFT)
@@ -10158,7 +10550,7 @@
 #define I40E_VSI_TSR_SHOWPRIONLY_SHIFT 20
 #define I40E_VSI_TSR_SHOWPRIONLY_MASK  I40E_MASK(0x3FF, I40E_VSI_TSR_SHOWPRIONLY_SHIFT)
 
-#define I40E_VSI_TUPIOM(_VSI)     (0x00043800 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_TUPIOM(_VSI)     (0x00043800 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_TUPIOM_MAX_INDEX 383
 #define I40E_VSI_TUPIOM_UP0_SHIFT 0
 #define I40E_VSI_TUPIOM_UP0_MASK  I40E_MASK(0x7, I40E_VSI_TUPIOM_UP0_SHIFT)
@@ -10177,7 +10569,7 @@
 #define I40E_VSI_TUPIOM_UP7_SHIFT 21
 #define I40E_VSI_TUPIOM_UP7_MASK  I40E_MASK(0x7, I40E_VSI_TUPIOM_UP7_SHIFT)
 
-#define I40E_VSI_TUPR(_VSI)     (0x00043000 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_TUPR(_VSI)     (0x00043000 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_TUPR_MAX_INDEX 383
 #define I40E_VSI_TUPR_UP0_SHIFT 0
 #define I40E_VSI_TUPR_UP0_MASK  I40E_MASK(0x7, I40E_VSI_TUPR_UP0_SHIFT)
@@ -10196,7 +10588,7 @@
 #define I40E_VSI_TUPR_UP7_SHIFT 21
 #define I40E_VSI_TUPR_UP7_MASK  I40E_MASK(0x7, I40E_VSI_TUPR_UP7_SHIFT)
 
-#define I40E_VSI_VSI2F(_VSI)              (0x0020B800 + ((_VSI) * 4)) /* _i=0...383 */
+#define I40E_VSI_VSI2F(_VSI)              (0x0020B800 + ((_VSI) * 4)) /* _i=0...383 */ /* Reset: PFR */
 #define I40E_VSI_VSI2F_MAX_INDEX          383
 #define I40E_VSI_VSI2F_VFVMNUMBER_SHIFT   0
 #define I40E_VSI_VSI2F_VFVMNUMBER_MASK    I40E_MASK(0x3FF, I40E_VSI_VSI2F_VFVMNUMBER_SHIFT)
@@ -10215,17 +10607,17 @@
 
 /* PF - Wake-Up and Proxying Registers  */
 
-#define I40E_PFPM_FHFT_DATA(_i, _j)      (0x00060000 + ((_i) * 4096 + (_j) * 128)) /* _i=0...7, _j=0...31 */
+#define I40E_PFPM_FHFT_DATA(_i, _j)      (0x00060000 + ((_i) * 4096 + (_j) * 128)) /* _i=0...7, _j=0...31 */ /* Reset: POR */
 #define I40E_PFPM_FHFT_DATA_MAX_INDEX   7
 #define I40E_PFPM_FHFT_DATA_DWORD_SHIFT 0
 #define I40E_PFPM_FHFT_DATA_DWORD_MASK  I40E_MASK(0xFFFFFFFF, I40E_PFPM_FHFT_DATA_DWORD_SHIFT)
 
-#define I40E_PFPM_FHFT_MASK(_i, _j)     (0x00068000 + ((_i) * 1024 + (_j) * 128)) /* _i=0...7, _j=0...7 */
+#define I40E_PFPM_FHFT_MASK(_i, _j)     (0x00068000 + ((_i) * 1024 + (_j) * 128)) /* _i=0...7, _j=0...7 */ /* Reset: POR */
 #define I40E_PFPM_FHFT_MASK_MAX_INDEX  7
 #define I40E_PFPM_FHFT_MASK_MASK_SHIFT 0
 #define I40E_PFPM_FHFT_MASK_MASK_MASK  I40E_MASK(0xFFFF, I40E_PFPM_FHFT_MASK_MASK_SHIFT)
 
-#define I40E_PFPM_PROXYFC                    0x00245A80
+#define I40E_PFPM_PROXYFC                    0x00245A80 /* Reset: POR */
 #define I40E_PFPM_PROXYFC_PPROXYE_SHIFT      0
 #define I40E_PFPM_PROXYFC_PPROXYE_MASK       I40E_MASK(0x1, I40E_PFPM_PROXYFC_PPROXYE_SHIFT)
 #define I40E_PFPM_PROXYFC_EX_SHIFT           1
@@ -10241,7 +10633,7 @@
 #define I40E_PFPM_PROXYFC_MLD_SHIFT          12
 #define I40E_PFPM_PROXYFC_MLD_MASK           I40E_MASK(0x1, I40E_PFPM_PROXYFC_MLD_SHIFT)
 
-#define I40E_PFPM_PROXYS                    0x00245B80
+#define I40E_PFPM_PROXYS                    0x00245B80 /* Reset: POR */
 #define I40E_PFPM_PROXYS_EX_SHIFT           1
 #define I40E_PFPM_PROXYS_EX_MASK            I40E_MASK(0x1, I40E_PFPM_PROXYS_EX_SHIFT)
 #define I40E_PFPM_PROXYS_ARP_SHIFT          4
@@ -10261,7 +10653,7 @@
 
 /* VF - Interrupts */
 
-#define I40E_VFINT_ITR0_STAT1(_i)              (0x00004400 + ((_i) * 4)) /* _i=0...2 */
+#define I40E_VFINT_ITR0_STAT1(_i)              (0x00004400 + ((_i) * 4)) /* _i=0...2 */ /* Reset: VFR */
 #define I40E_VFINT_ITR0_STAT1_MAX_INDEX        2
 #define I40E_VFINT_ITR0_STAT1_ITR_EXPIRE_SHIFT 0
 #define I40E_VFINT_ITR0_STAT1_ITR_EXPIRE_MASK  I40E_MASK(0x1, I40E_VFINT_ITR0_STAT1_ITR_EXPIRE_SHIFT)
@@ -10270,7 +10662,7 @@
 #define I40E_VFINT_ITR0_STAT1_ITR_TIME_SHIFT   2
 #define I40E_VFINT_ITR0_STAT1_ITR_TIME_MASK    I40E_MASK(0xFFF, I40E_VFINT_ITR0_STAT1_ITR_TIME_SHIFT)
 
-#define I40E_VFINT_ITRN_STAT1(_i, _INTVF)       (0x00003000 + ((_i) * 64 + (_INTVF) * 4)) /* _i=0...2, _INTVF=0...15 */
+#define I40E_VFINT_ITRN_STAT1(_i, _INTVF)       (0x00003000 + ((_i) * 64 + (_INTVF) * 4)) /* _i=0...2, _INTVF=0...15 */ /* Reset: VFR */
 #define I40E_VFINT_ITRN_STAT1_MAX_INDEX        2
 #define I40E_VFINT_ITRN_STAT1_ITR_EXPIRE_SHIFT 0
 #define I40E_VFINT_ITRN_STAT1_ITR_EXPIRE_MASK  I40E_MASK(0x1, I40E_VFINT_ITRN_STAT1_ITR_EXPIRE_SHIFT)
@@ -10279,13 +10671,13 @@
 #define I40E_VFINT_ITRN_STAT1_ITR_TIME_SHIFT   2
 #define I40E_VFINT_ITRN_STAT1_ITR_TIME_MASK    I40E_MASK(0xFFF, I40E_VFINT_ITRN_STAT1_ITR_TIME_SHIFT)
 
-#define I40E_VFINT_RATE0_STAT1                  0x00005800
+#define I40E_VFINT_RATE0_STAT1                  0x00005800 /* Reset: VFR */
 #define I40E_VFINT_RATE0_STAT1_CREDIT_SHIFT     0
 #define I40E_VFINT_RATE0_STAT1_CREDIT_MASK      I40E_MASK(0xF, I40E_VFINT_RATE0_STAT1_CREDIT_SHIFT)
 #define I40E_VFINT_RATE0_STAT1_INTRL_TIME_SHIFT 4
 #define I40E_VFINT_RATE0_STAT1_INTRL_TIME_MASK  I40E_MASK(0x3F, I40E_VFINT_RATE0_STAT1_INTRL_TIME_SHIFT)
 
-#define I40E_VFINT_RATEN_STAT1(_INTVF)          (0x00004000 + ((_INTVF) * 4)) /* _i=0...15 */
+#define I40E_VFINT_RATEN_STAT1(_INTVF)          (0x00004000 + ((_INTVF) * 4)) /* _i=0...15 */ /* Reset: VFR */
 #define I40E_VFINT_RATEN_STAT1_MAX_INDEX        15
 #define I40E_VFINT_RATEN_STAT1_CREDIT_SHIFT     0
 #define I40E_VFINT_RATEN_STAT1_CREDIT_MASK      I40E_MASK(0xF, I40E_VFINT_RATEN_STAT1_CREDIT_SHIFT)
@@ -10300,27 +10692,20 @@
 
 /* VF - Rx Filters Registers */
 
-#define I40E_VPQF_DDPCNT               0x0000C800
+#define I40E_VPQF_DDPCNT               0x0000C800 /* Reset: CORER */
 #define I40E_VPQF_DDPCNT_DDP_CNT_SHIFT 0
 #define I40E_VPQF_DDPCNT_DDP_CNT_MASK  I40E_MASK(0x1FFF, I40E_VPQF_DDPCNT_DDP_CNT_SHIFT)
 
 /* VF - Time Sync Registers */
 
-#define I40E_PRTTSYN_VFTIME_H1                  0x0000E020
+#define I40E_PRTTSYN_VFTIME_H1                  0x0000E020 /* Reset: GLOBR */
 #define I40E_PRTTSYN_VFTIME_H1_TSYNTIME_H_SHIFT 0
 #define I40E_PRTTSYN_VFTIME_H1_TSYNTIME_H_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_VFTIME_H1_TSYNTIME_H_SHIFT)
 
-#define I40E_PRTTSYN_VFTIME_L1                  0x0000E000
+#define I40E_PRTTSYN_VFTIME_L1                  0x0000E000 /* Reset: GLOBR */
 #define I40E_PRTTSYN_VFTIME_L1_TSYNTIME_L_SHIFT 0
 #define I40E_PRTTSYN_VFTIME_L1_TSYNTIME_L_MASK  I40E_MASK(0xFFFFFFFF, I40E_PRTTSYN_VFTIME_L1_TSYNTIME_L_SHIFT)
 
-/* FPGA supported register */
-#define I40E_GLGEN_PE_ENA                     0x000B81A0
-#define I40E_GLGEN_PE_ENA_PE_ENA_SHIFT         0
-#define I40E_GLGEN_PE_ENA_PE_ENA_MASK    (0x1 << I40E_GLGEN_PE_ENA_PE_ENA_SHIFT)
-#define I40E_GLGEN_PE_ENA_PE_CLK_SRC_SEL_SHIFT 1
-#define I40E_GLGEN_PE_ENA_PE_CLK_SRC_SEL_MASK  (0x3 << I40E_GLGEN_PE_ENA_PE_CLK_SRC_SEL_SHIFT)
-
 /* Used in A0 code flow */
 #define I40E_GLHMC_PEXFMAX                0x000C2048
 #define I40E_GLHMC_PEXFMAX_PMPEXFMAX_SHIFT 0
diff --git a/sys/dev/i40e/i40e_txrx.c b/sys/dev/i40e/i40e_txrx.c
index 8b41cd43ddaa..e6fdc46697fb 100755
--- a/sys/dev/i40e/i40e_txrx.c
+++ b/sys/dev/i40e/i40e_txrx.c
@@ -38,12 +38,15 @@
 ** 	    both the BASE and the VF drivers.
 */
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#endif
+
 #include "i40e.h"
 
 /* Local Prototypes */
-static void	i40e_rx_checksum(struct mbuf *, u32, u32, u32);
+static void	i40e_rx_checksum(struct mbuf *, u32, u32, u8);
 static void	i40e_refresh_mbufs(struct i40e_queue *, int);
 static int      i40e_xmit(struct i40e_queue *, struct mbuf **);
 static int	i40e_tx_setup_offload(struct i40e_queue *,
@@ -52,7 +55,7 @@ static bool	i40e_tso_setup(struct i40e_queue *, struct mbuf *);
 
 static __inline void i40e_rx_discard(struct rx_ring *, int);
 static __inline void i40e_rx_input(struct rx_ring *, struct ifnet *,
-		    struct mbuf *, u32);
+		    struct mbuf *, u8);
 
 /*
 ** Multiqueue Transmit driver
@@ -72,6 +75,10 @@ i40e_mq_start(struct ifnet *ifp, struct mbuf *m)
 	else
 		i = curcpu % vsi->num_queues;
 
+	/* Check for a hung queue and pick alternative */
+	if (((1 << i) & vsi->active_queues) == 0)
+		i = ffsl(vsi->active_queues);
+
 	que = &vsi->queues[i];
 	txr = &que->txr;
 
@@ -79,12 +86,12 @@ i40e_mq_start(struct ifnet *ifp, struct mbuf *m)
 	if (err)
 		return(err);
 	if (I40E_TX_TRYLOCK(txr)) {
-		err = i40e_mq_start_locked(ifp, txr);
+		i40e_mq_start_locked(ifp, txr);
 		I40E_TX_UNLOCK(txr);
 	} else
 		taskqueue_enqueue(que->tq, &que->tx_task);
 
-	return (err);
+	return (0);
 }
 
 int
@@ -159,6 +166,34 @@ i40e_qflush(struct ifnet *ifp)
 	if_qflush(ifp);
 }
 
+/*
+** Find mbuf chains passed to the driver 
+** that are 'sparse', using more than 8
+** mbufs to deliver an mss-size chunk of data
+*/
+static inline bool
+i40e_tso_detect_sparse(struct mbuf *mp)
+{
+	struct mbuf	*m;
+	int		num = 0, mss;
+	bool		ret = FALSE;
+
+	mss = mp->m_pkthdr.tso_segsz;
+	for (m = mp->m_next; m != NULL; m = m->m_next) {
+		num++;
+		mss -= m->m_len;
+		if (mss < 1)
+			break;
+		if (m->m_next == NULL)
+			break;
+	}
+	if (num > I40E_SPARSE_CHAIN)
+		ret = TRUE;
+
+	return (ret);
+}
+
+
 /*********************************************************************
  *
  *  This routine maps the mbufs to tx descriptors, allowing the
@@ -176,22 +211,19 @@ i40e_xmit(struct i40e_queue *que, struct mbuf **m_headp)
 	struct tx_ring		*txr = &que->txr;
 	struct i40e_tx_buf	*buf;
 	struct i40e_tx_desc	*txd = NULL;
-	struct mbuf		*m_head;
-	int             	i, j, error, nsegs;
+	struct mbuf		*m_head, *m;
+	int             	i, j, error, nsegs, maxsegs;
 	int			first, last = 0;
 	u16			vtag = 0;
 	u32			cmd, off;
 	bus_dmamap_t		map;
-	bus_dma_segment_t	segs[I40E_MAX_SEGS];
+	bus_dma_tag_t		tag;
+	bus_dma_segment_t	segs[I40E_MAX_TSO_SEGS];
 
 
 	cmd = off = 0;
 	m_head = *m_headp;
 
-	/* Grab the VLAN tag */
-	if (m_head->m_flags & M_VLANTAG)
-		vtag = htole16(m_head->m_pkthdr.ether_vtag);
-
         /*
          * Important to capture the first descriptor
          * used because it will contain the index of
@@ -200,17 +232,29 @@ i40e_xmit(struct i40e_queue *que, struct mbuf **m_headp)
         first = txr->next_avail;
 	buf = &txr->buffers[first];
 	map = buf->map;
+	tag = txr->tx_tag;
+	maxsegs = I40E_MAX_TX_SEGS;
+
+	if (m_head->m_pkthdr.csum_flags & CSUM_TSO) {
+		/* Use larger mapping for TSO */
+		tag = txr->tso_tag;
+		maxsegs = I40E_MAX_TSO_SEGS;
+		if (i40e_tso_detect_sparse(m_head)) {
+			m = m_defrag(m_head, M_NOWAIT);
+			*m_headp = m;
+		}
+	}
 
 	/*
 	 * Map the packet for DMA.
 	 */
-	error = bus_dmamap_load_mbuf_sg(txr->tag, map,
+	error = bus_dmamap_load_mbuf_sg(tag, map,
 	    *m_headp, segs, &nsegs, BUS_DMA_NOWAIT);
 
 	if (error == EFBIG) {
 		struct mbuf *m;
 
-		m = m_defrag(*m_headp, M_NOWAIT);
+		m = m_collapse(*m_headp, M_NOWAIT, maxsegs);
 		if (m == NULL) {
 			que->mbuf_defrag_failed++;
 			m_freem(*m_headp);
@@ -220,7 +264,7 @@ i40e_xmit(struct i40e_queue *que, struct mbuf **m_headp)
 		*m_headp = m;
 
 		/* Try it again */
-		error = bus_dmamap_load_mbuf_sg(txr->tag, map,
+		error = bus_dmamap_load_mbuf_sg(tag, map,
 		    *m_headp, segs, &nsegs, BUS_DMA_NOWAIT);
 
 		if (error == ENOMEM) {
@@ -251,20 +295,25 @@ i40e_xmit(struct i40e_queue *que, struct mbuf **m_headp)
 	m_head = *m_headp;
 
 	/* Set up the TSO/CSUM offload */
-	error = i40e_tx_setup_offload(que, m_head, &cmd, &off);
-	if (error)
-		goto xmit_fail;
+	if (m_head->m_pkthdr.csum_flags & CSUM_OFFLOAD) {
+		error = i40e_tx_setup_offload(que, m_head, &cmd, &off);
+		if (error)
+			goto xmit_fail;
+	}
 
 	cmd |= I40E_TX_DESC_CMD_ICRC;
-	/* Add vlan tag to each descriptor */
-	if (m_head->m_flags & M_VLANTAG)
+	/* Grab the VLAN tag */
+	if (m_head->m_flags & M_VLANTAG) {
 		cmd |= I40E_TX_DESC_CMD_IL2TAG1;
+		vtag = htole16(m_head->m_pkthdr.ether_vtag);
+	}
 
 	i = txr->next_avail;
 	for (j = 0; j < nsegs; j++) {
 		bus_size_t seglen;
 
 		buf = &txr->buffers[i];
+		buf->tag = tag; /* Keep track of the type tag */
 		txd = &txr->base[i];
 		seglen = segs[j].ds_len;
 
@@ -294,7 +343,7 @@ i40e_xmit(struct i40e_queue *que, struct mbuf **m_headp)
 	/* Swap the dma map between the first and last descriptor */
 	txr->buffers[first].map = buf->map;
 	buf->map = map;
-	bus_dmamap_sync(txr->tag, map, BUS_DMASYNC_PREWRITE);
+	bus_dmamap_sync(tag, map, BUS_DMASYNC_PREWRITE);
 
         /* Set the index of the descriptor that will be marked done */
         buf = &txr->buffers[first];
@@ -307,8 +356,8 @@ i40e_xmit(struct i40e_queue *que, struct mbuf **m_headp)
 	 * hardware that this frame is available to transmit.
 	 */
 	++txr->total_packets;
+	wr32(hw, txr->tail, i);
 
-	wr32(hw, I40E_QTX_TAIL(que->me), i);
 	i40e_flush(hw);
 	/* Mark outstanding work */
 	if (que->busy == 0)
@@ -316,7 +365,7 @@ i40e_xmit(struct i40e_queue *que, struct mbuf **m_headp)
 	return (0);
 
 xmit_fail:
-	bus_dmamap_unload(txr->tag, buf->map);
+	bus_dmamap_unload(tag, buf->map);
 	return (error);
 }
 
@@ -341,21 +390,38 @@ i40e_allocate_tx_data(struct i40e_queue *que)
 	 * Setup DMA descriptor areas.
 	 */
 	if ((error = bus_dma_tag_create(NULL,		/* parent */
-			       1, 0,		/* alignment, bounds */
+			       1, 0,			/* alignment, bounds */
 			       BUS_SPACE_MAXADDR,	/* lowaddr */
 			       BUS_SPACE_MAXADDR,	/* highaddr */
 			       NULL, NULL,		/* filter, filterarg */
 			       I40E_TSO_SIZE,		/* maxsize */
-			       32,
+			       I40E_MAX_TX_SEGS,	/* nsegments */
 			       PAGE_SIZE,		/* maxsegsize */
 			       0,			/* flags */
 			       NULL,			/* lockfunc */
 			       NULL,			/* lockfuncarg */
-			       &txr->tag))) {
+			       &txr->tx_tag))) {
 		device_printf(dev,"Unable to allocate TX DMA tag\n");
 		goto fail;
 	}
 
+	/* Make a special tag for TSO */
+	if ((error = bus_dma_tag_create(NULL,		/* parent */
+			       1, 0,			/* alignment, bounds */
+			       BUS_SPACE_MAXADDR,	/* lowaddr */
+			       BUS_SPACE_MAXADDR,	/* highaddr */
+			       NULL, NULL,		/* filter, filterarg */
+			       I40E_TSO_SIZE,		/* maxsize */
+			       I40E_MAX_TSO_SEGS,	/* nsegments */
+			       PAGE_SIZE,		/* maxsegsize */
+			       0,			/* flags */
+			       NULL,			/* lockfunc */
+			       NULL,			/* lockfuncarg */
+			       &txr->tso_tag))) {
+		device_printf(dev,"Unable to allocate TX TSO DMA tag\n");
+		goto fail;
+	}
+
 	if (!(txr->buffers =
 	    (struct i40e_tx_buf *) malloc(sizeof(struct i40e_tx_buf) *
 	    que->num_desc, M_DEVBUF, M_NOWAIT | M_ZERO))) {
@@ -364,10 +430,11 @@ i40e_allocate_tx_data(struct i40e_queue *que)
 		goto fail;
 	}
 
-        /* Create the descriptor buffer dma maps */
+        /* Create the descriptor buffer default dma maps */
 	buf = txr->buffers;
 	for (int i = 0; i < que->num_desc; i++, buf++) {
-		error = bus_dmamap_create(txr->tag, 0, &buf->map);
+		buf->tag = txr->tx_tag;
+		error = bus_dmamap_create(buf->tag, 0, &buf->map);
 		if (error != 0) {
 			device_printf(dev, "Unable to create TX DMA map\n");
 			goto fail;
@@ -410,9 +477,9 @@ i40e_init_tx_ring(struct i40e_queue *que)
         buf = txr->buffers;
 	for (int i = 0; i < que->num_desc; i++, buf++) {
 		if (buf->m_head != NULL) {
-			bus_dmamap_sync(txr->tag, buf->map,
+			bus_dmamap_sync(buf->tag, buf->map,
 			    BUS_DMASYNC_POSTWRITE);
-			bus_dmamap_unload(txr->tag, buf->map);
+			bus_dmamap_unload(buf->tag, buf->map);
 			m_freem(buf->m_head);
 			buf->m_head = NULL;
 		}
@@ -445,21 +512,21 @@ i40e_free_que_tx(struct i40e_queue *que)
 	for (int i = 0; i < que->num_desc; i++) {
 		buf = &txr->buffers[i];
 		if (buf->m_head != NULL) {
-			bus_dmamap_sync(txr->tag, buf->map,
+			bus_dmamap_sync(buf->tag, buf->map,
 			    BUS_DMASYNC_POSTWRITE);
-			bus_dmamap_unload(txr->tag,
+			bus_dmamap_unload(buf->tag,
 			    buf->map);
 			m_freem(buf->m_head);
 			buf->m_head = NULL;
 			if (buf->map != NULL) {
-				bus_dmamap_destroy(txr->tag,
+				bus_dmamap_destroy(buf->tag,
 				    buf->map);
 				buf->map = NULL;
 			}
 		} else if (buf->map != NULL) {
-			bus_dmamap_unload(txr->tag,
+			bus_dmamap_unload(buf->tag,
 			    buf->map);
-			bus_dmamap_destroy(txr->tag,
+			bus_dmamap_destroy(buf->tag,
 			    buf->map);
 			buf->map = NULL;
 		}
@@ -470,9 +537,13 @@ i40e_free_que_tx(struct i40e_queue *que)
 		free(txr->buffers, M_DEVBUF);
 		txr->buffers = NULL;
 	}
-	if (txr->tag != NULL) {
-		bus_dma_tag_destroy(txr->tag);
-		txr->tag = NULL;
+	if (txr->tx_tag != NULL) {
+		bus_dma_tag_destroy(txr->tx_tag);
+		txr->tx_tag = NULL;
+	}
+	if (txr->tso_tag != NULL) {
+		bus_dma_tag_destroy(txr->tso_tag);
+		txr->tso_tag = NULL;
 	}
 	return;
 }
@@ -549,8 +620,7 @@ i40e_tx_setup_offload(struct i40e_queue *que,
 	switch (ipproto) {
 		case IPPROTO_TCP:
 			tcp_hlen = th->th_off << 2;
-			if (mp->m_pkthdr.csum_flags & CSUM_TCP || 
-				mp->m_pkthdr.csum_flags & CSUM_TCP_IPV6) {
+			if (mp->m_pkthdr.csum_flags & (CSUM_TCP|CSUM_TCP_IPV6)) {
 				*cmd |= I40E_TX_DESC_CMD_L4T_EOFT_TCP;
 				*off |= (tcp_hlen >> 2) <<
 				    I40E_TX_DESC_LENGTH_L4_FC_LEN_SHIFT;
@@ -560,8 +630,7 @@ i40e_tx_setup_offload(struct i40e_queue *que,
 #endif
 			break;
 		case IPPROTO_UDP:
-			if (mp->m_pkthdr.csum_flags & CSUM_UDP ||
-				mp->m_pkthdr.csum_flags & CSUM_UDP_IPV6) {
+			if (mp->m_pkthdr.csum_flags & (CSUM_UDP|CSUM_UDP_IPV6)) {
 				*cmd |= I40E_TX_DESC_CMD_L4T_EOFT_UDP;
 				*off |= (sizeof(struct udphdr) >> 2) <<
 				    I40E_TX_DESC_LENGTH_L4_FC_LEN_SHIFT;
@@ -569,7 +638,7 @@ i40e_tx_setup_offload(struct i40e_queue *que,
 			break;
 
 		case IPPROTO_SCTP:
-			if (mp->m_pkthdr.csum_flags & CSUM_SCTP) {
+			if (mp->m_pkthdr.csum_flags & (CSUM_SCTP|CSUM_SCTP_IPV6)) {
 				*cmd |= I40E_TX_DESC_CMD_L4T_EOFT_SCTP;
 				*off |= (sizeof(struct sctphdr) >> 2) <<
 				    I40E_TX_DESC_LENGTH_L4_FC_LEN_SHIFT;
@@ -679,6 +748,18 @@ i40e_tso_setup(struct i40e_queue *que, struct mbuf *mp)
 	return TRUE;
 }
 
+/*             
+** i40e_get_tx_head - Retrieve the value from the 
+**    location the HW records its HEAD index
+*/
+static inline u32
+i40e_get_tx_head(struct i40e_queue *que)
+{
+	struct tx_ring  *txr = &que->txr;
+	void *head = &txr->base[que->num_desc];
+	return LE32_TO_CPU(*(volatile __le32 *)head);
+}
+
 /**********************************************************************
  *
  *  Examine each tx_buffer in the used queue. If the hardware is done
@@ -692,7 +773,7 @@ i40e_txeof(struct i40e_queue *que)
 	struct i40e_vsi		*vsi = que->vsi;
 	struct ifnet		*ifp = vsi->ifp;
 	struct tx_ring		*txr = &que->txr;
-	u32			first, last, done, processed;
+	u32			first, last, head, done, processed;
 	struct i40e_tx_buf	*buf;
 	struct i40e_tx_desc	*tx_desc, *eop_desc;
 
@@ -715,6 +796,9 @@ i40e_txeof(struct i40e_queue *que)
 		return FALSE;
 	eop_desc = (struct i40e_tx_desc *)&txr->base[last];
 
+	/* Get the Head WB value */
+	head = i40e_get_tx_head(que);
+
 	/*
 	** Get the index of the first descriptor
 	** BEYOND the EOP and call that 'done'.
@@ -727,25 +811,24 @@ i40e_txeof(struct i40e_queue *que)
         bus_dmamap_sync(txr->dma.tag, txr->dma.map,
             BUS_DMASYNC_POSTREAD);
 	/*
-	** Only the EOP descriptor of a packet now has the DD
-	** bit set, this is what we look for...
+	** The HEAD index of the ring is written in a 
+	** defined location, this rather than a done bit
+	** is what is used to keep track of what must be
+	** 'cleaned'.
 	*/
-	while (eop_desc->cmd_type_offset_bsz &
-	    htole32(I40E_TX_DESC_DTYPE_DESC_DONE)) {
+	while (first != head) {
 		/* We clean the range of the packet */
 		while (first != done) {
-			tx_desc->cmd_type_offset_bsz &=
-			    ~I40E_TXD_QW1_DTYPE_MASK;
 			++txr->avail;
 			++processed;
 
 			if (buf->m_head) {
 				txr->bytes +=
 				    buf->m_head->m_pkthdr.len;
-				bus_dmamap_sync(txr->tag,
+				bus_dmamap_sync(buf->tag,
 				    buf->map,
 				    BUS_DMASYNC_POSTWRITE);
-				bus_dmamap_unload(txr->tag,
+				bus_dmamap_unload(buf->tag,
 				    buf->map);
 				m_freem(buf->m_head);
 				buf->m_head = NULL;
@@ -786,10 +869,11 @@ i40e_txeof(struct i40e_queue *que)
 	** be considered hung. If anything has been
 	** cleaned then reset the state.
 	*/
-	if (!processed)
+	if ((processed == 0) && (que->busy != I40E_QUEUE_HUNG))
 		++que->busy;
-	else
-		que->busy = 1;
+
+	if (processed)
+		que->busy = 1; /* Note this turns off HUNG */
 
 	/*
 	 * If there are no pending descriptors, clear the timeout.
@@ -884,6 +968,7 @@ i40e_refresh_mbufs(struct i40e_queue *que, int limit)
 		    BUS_DMASYNC_PREREAD);
 		rxr->base[i].read.pkt_addr =
 		   htole64(pseg[0].ds_addr);
+		/* Used only when doing header split */
 		rxr->base[i].read.hdr_addr = 0;
 
 		refreshed = TRUE;
@@ -895,7 +980,7 @@ i40e_refresh_mbufs(struct i40e_queue *que, int limit)
 	}
 update:
 	if (refreshed) /* Update hardware tail index */
-		wr32(vsi->hw, I40E_QRX_TAIL(que->me), rxr->next_refresh);
+		wr32(vsi->hw, rxr->tail, rxr->next_refresh);
 	return;
 }
 
@@ -1020,6 +1105,7 @@ i40e_init_rx_ring(struct i40e_queue *que)
 		buf->m_pack = NULL;
 	}
 
+	/* header split is off */
 	rxr->hdr_split = FALSE;
 
 	/* Now replenish the mbufs */
@@ -1170,7 +1256,7 @@ i40e_free_que_rx(struct i40e_queue *que)
 }
 
 static __inline void
-i40e_rx_input(struct rx_ring *rxr, struct ifnet *ifp, struct mbuf *m, u32 ptype)
+i40e_rx_input(struct rx_ring *rxr, struct ifnet *ifp, struct mbuf *m, u8 ptype)
 {
         /*
          * ATM LRO is only for IPv4/TCP packets and TCP checksum of the packet
@@ -1260,9 +1346,10 @@ i40e_rxeof(struct i40e_queue *que, int count)
 
 	for (i = rxr->next_check; count != 0;) {
 		struct mbuf	*sendmp, *mh, *mp;
-		u32		rsc, ptype, status, error;
+		u32		rsc, status, error;
 		u16		hlen, plen, vtag;
 		u64		qword;
+		u8		ptype;
 		bool		eop;
  
 		/* Sync the ring. */
@@ -1478,8 +1565,11 @@ i40e_rxeof(struct i40e_queue *que, int count)
  *
  *********************************************************************/
 static void
-i40e_rx_checksum(struct mbuf * mp, u32 status, u32 error, u32 ptype)
+i40e_rx_checksum(struct mbuf * mp, u32 status, u32 error, u8 ptype)
 {
+	struct i40e_rx_ptype_decoded decoded;
+
+	decoded = decode_rx_desc_ptype(ptype);
 
 	/* Errors? */
  	if (error & ((1 << I40E_RX_DESC_ERROR_IPE_SHIFT) |
@@ -1488,6 +1578,16 @@ i40e_rx_checksum(struct mbuf * mp, u32 status, u32 error, u32 ptype)
 		return;
 	}
 
+	/* IPv6 with extension headers likely have bad csum */
+	if (decoded.outer_ip == I40E_RX_PTYPE_OUTER_IP &&
+	    decoded.outer_ip_ver == I40E_RX_PTYPE_OUTER_IPV6)
+		if (status &
+		    (1 << I40E_RX_DESC_STATUS_IPV6EXADD_SHIFT)) {
+			mp->m_pkthdr.csum_flags = 0;
+			return;
+		}
+
+ 
 	/* IP Checksum Good */
 	mp->m_pkthdr.csum_flags = CSUM_IP_CHECKED;
 	mp->m_pkthdr.csum_flags |= CSUM_IP_VALID;
diff --git a/sys/dev/i40e/i40e_type.h b/sys/dev/i40e/i40e_type.h
index cde31adcd72d..093cfbd09606 100755
--- a/sys/dev/i40e/i40e_type.h
+++ b/sys/dev/i40e/i40e_type.h
@@ -56,9 +56,6 @@
 #define I40E_DEV_ID_QSFP_A		0x1583
 #define I40E_DEV_ID_QSFP_B		0x1584
 #define I40E_DEV_ID_QSFP_C		0x1585
-#ifdef FORTVILLE_A0_SUPPORT
-#define I40E_DEV_ID_10G_BASE_T		0x1586
-#endif
 #define I40E_DEV_ID_VF			0x154C
 #define I40E_DEV_ID_VF_HV		0x1571
 
@@ -66,8 +63,10 @@
 					 (d) == I40E_DEV_ID_QSFP_B  || \
 					 (d) == I40E_DEV_ID_QSFP_C)
 
+#ifndef I40E_MASK
 /* I40E_MASK is a macro used on 32 bit registers */
 #define I40E_MASK(mask, shift) (mask << shift)
+#endif
 
 #define I40E_MAX_PF			16
 #define I40E_MAX_PF_VSI			64
@@ -214,10 +213,10 @@ enum i40e_fc_mode {
 
 enum i40e_set_fc_aq_failures {
 	I40E_SET_FC_AQ_FAIL_NONE = 0,
-	I40E_SET_FC_AQ_FAIL_GET1 = 1,
+	I40E_SET_FC_AQ_FAIL_GET = 1,
 	I40E_SET_FC_AQ_FAIL_SET = 2,
-	I40E_SET_FC_AQ_FAIL_GET2 = 4,
-	I40E_SET_FC_AQ_FAIL_SET_GET = 6
+	I40E_SET_FC_AQ_FAIL_UPDATE = 4,
+	I40E_SET_FC_AQ_FAIL_SET_UPDATE = 6
 };
 
 enum i40e_vsi_type {
@@ -533,6 +532,10 @@ struct i40e_hw {
 
 	/* Admin Queue info */
 	struct i40e_adminq_info aq;
+#ifdef I40E_QV
+	bool aq_dbg_ena; /* use Tools AQ instead of PF AQ */
+	bool qv_force_init;
+#endif
 
 	/* state of nvm update process */
 	enum i40e_nvmupd_state nvmupd_state;
diff --git a/sys/dev/i40e/if_i40e.c b/sys/dev/i40e/if_i40e.c
index a763c0d5dcce..74e64bf698c4 100755
--- a/sys/dev/i40e/if_i40e.c
+++ b/sys/dev/i40e/if_i40e.c
@@ -32,15 +32,18 @@
 ******************************************************************************/
 /*$FreeBSD$*/
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#endif
+
 #include "i40e.h"
 #include "i40e_pf.h"
 
 /*********************************************************************
  *  Driver version
  *********************************************************************/
-char i40e_driver_version[] = "0.6.9 - Beta Release";
+char i40e_driver_version[] = "1.0.0";
 
 /*********************************************************************
  *  PCI Device ID Table
@@ -145,12 +148,14 @@ static void	i40e_print_debug_info(struct i40e_pf *);
 static void	i40e_intr(void *);
 static void	i40e_msix_que(void *);
 static void	i40e_msix_adminq(void *);
+static void	i40e_handle_mdd_event(struct i40e_pf *);
 
 /* Deferred interrupt tasklets */
 static void	i40e_do_adminq(void *, int);
 
 /* Sysctl handlers */
 static int	i40e_set_flowcntl(SYSCTL_HANDLER_ARGS);
+static int	i40e_set_advertise(SYSCTL_HANDLER_ARGS);
 
 /* Statistics */
 static void     i40e_add_hw_stats(struct i40e_pf *);
@@ -172,6 +177,8 @@ static void	i40e_stat_update32(struct i40e_hw *, u32, bool,
 static int 	i40e_sysctl_link_status(SYSCTL_HANDLER_ARGS);
 static int	i40e_sysctl_phy_abilities(SYSCTL_HANDLER_ARGS);
 static int	i40e_sysctl_sw_filter_list(SYSCTL_HANDLER_ARGS);
+static int	i40e_sysctl_hw_res_info(SYSCTL_HANDLER_ARGS);
+static int	i40e_sysctl_dump_txd(SYSCTL_HANDLER_ARGS);
 #endif
 
 /*********************************************************************
@@ -188,7 +195,7 @@ static device_method_t i40e_methods[] = {
 };
 
 static driver_t i40e_driver = {
-	"i40e", i40e_methods, sizeof(struct i40e_pf),
+	"ixl", i40e_methods, sizeof(struct i40e_pf),
 };
 
 devclass_t i40e_devclass;
@@ -197,6 +204,11 @@ DRIVER_MODULE(i40e, pci, i40e_driver, i40e_devclass, 0, 0);
 MODULE_DEPEND(i40e, pci, 1, 1, 1);
 MODULE_DEPEND(i40e, ether, 1, 1, 1);
 
+/*
+** Global reset mutex
+*/
+static struct mtx i40e_reset_mtx;
+
 /*
  * MSIX should be the default for best performance,
  * but this allows it to be forced off for testing.
@@ -252,6 +264,7 @@ static char *i40e_fc_string[6] = {
 	"Default"
 };
 
+
 /*********************************************************************
  *  Device identification routine
  *
@@ -269,6 +282,7 @@ i40e_probe(device_t dev)
 	u16	pci_vendor_id, pci_device_id;
 	u16	pci_subvendor_id, pci_subdevice_id;
 	char	device_name[256];
+	static bool lock_init = FALSE;
 
 	INIT_DEBUGOUT("i40e_probe: begin");
 
@@ -294,6 +308,13 @@ i40e_probe(device_t dev)
 				i40e_strings[ent->index],
 				i40e_driver_version);
 			device_set_desc_copy(dev, device_name);
+			/* One shot mutex init */
+			if (lock_init == FALSE) {
+				lock_init = TRUE;
+				mtx_init(&i40e_reset_mtx,
+				    "i40e_reset",
+				    "I40E RESET Lock", MTX_DEF);
+			}
 			return (BUS_PROBE_DEFAULT);
 		}
 		ent++;
@@ -318,7 +339,6 @@ i40e_attach(device_t dev)
 	struct i40e_hw	*hw;
 	struct i40e_vsi *vsi;
 	u16		bus;
-	u32		reg;
 	int             error = 0;
 
 	INIT_DEBUGOUT("i40e_attach: begin");
@@ -347,6 +367,11 @@ i40e_attach(device_t dev)
 	    OID_AUTO, "fc", CTLTYPE_INT | CTLFLAG_RW,
 	    pf, 0, i40e_set_flowcntl, "I", "Flow Control");
 
+	SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
+	    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+	    OID_AUTO, "advertise_speed", CTLTYPE_INT | CTLFLAG_RW,
+	    pf, 0, i40e_set_advertise, "I", "Advertised Speed");
+
 	SYSCTL_ADD_INT(device_get_sysctl_ctx(dev),
 	    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
 	    OID_AUTO, "rx_itr", CTLTYPE_INT | CTLFLAG_RW,
@@ -382,6 +407,16 @@ i40e_attach(device_t dev)
 	    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
 	    OID_AUTO, "filter_list", CTLTYPE_STRING | CTLFLAG_RD,
 	    pf, 0, i40e_sysctl_sw_filter_list, "A", "SW Filter List");
+
+	SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
+	    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+	    OID_AUTO, "hw_res_info", CTLTYPE_STRING | CTLFLAG_RD,
+	    pf, 0, i40e_sysctl_hw_res_info, "A", "HW Resource Allocation");
+
+	SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
+	    SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+	    OID_AUTO, "dump_desc", CTLTYPE_INT | CTLFLAG_WR,
+	    pf, 0, i40e_sysctl_dump_txd, "I", "Desc dump");
 #endif
 
 	/* Save off the information about this board */
@@ -393,7 +428,7 @@ i40e_attach(device_t dev)
 	hw->subsystem_device_id =
 	    pci_read_config(dev, PCIR_SUBDEV_0, 2);
 
-	hw->bus.device = pci_get_device(dev);
+	hw->bus.device = pci_get_slot(dev);
 	hw->bus.func = pci_get_function(dev);
 
 	/* Do PCI setup - map BAR0, etc */
@@ -409,31 +444,56 @@ i40e_attach(device_t dev)
 	    OID_AUTO, "debug", CTLTYPE_INT|CTLFLAG_RW, pf, 0,
 	    i40e_debug_info, "I", "Debug Information");
 
-	/* Workaround to keep ARI detection off */
-	reg = rd32(hw, I40E_GLPCI_CAPSUP);
-	reg &= ~I40E_GLPCI_CAPSUP_ARI_EN_MASK;
-	wr32(hw, I40E_GLPCI_CAPSUP, reg);
 
 	/* Establish a clean starting point */
+	i40e_clear_hw(hw);
 	error = i40e_pf_reset(hw);
 	if (error) {
-		// TODO: Remove EMPR reset
-		/* Use the heavy hammer, force a firmware reset */
-		reg = rd32(&pf->hw, I40E_GLGEN_RSTENA_EMP);
-		reg |= I40E_GLGEN_RSTENA_EMP_EMP_RST_ENA_MASK;
-		wr32(&pf->hw, I40E_GLGEN_RSTENA_EMP, reg);
-		/* force the reset */
-		reg = rd32(&pf->hw, I40E_GLGEN_RTRIG);
-		reg |= I40E_GLGEN_RTRIG_EMPFWR_MASK;
-		wr32(&pf->hw, I40E_GLGEN_RTRIG, reg);
-		i40e_flush(hw);
+		device_printf(dev,"PF reset failure %x\n", error);
+		error = EIO;
+		goto err_out;
+	}
 
-		error = i40e_pf_reset(hw);
-		if (error) {
-			device_printf(dev,"PF reset failure %x\n", error);
-			error = EIO;
-			goto err_out;
+	/* For now always do an initial CORE reset on first device */
+	{
+		static int	i40e_dev_count;
+		static int	i40e_dev_track[32];
+		u32		my_dev;
+		int		i, found = FALSE;
+		u16		bus = pci_get_bus(dev);
+
+		mtx_lock(&i40e_reset_mtx);
+		my_dev = (bus << 8) | hw->bus.device;
+
+		for (i = 0; i < i40e_dev_count; i++) {
+			if (i40e_dev_track[i] == my_dev)
+				found = TRUE;
 		}
+
+                if (!found) {
+                        u32 reg;
+
+                        i40e_dev_track[i40e_dev_count] = my_dev;
+                        i40e_dev_count++;
+
+                        device_printf(dev, "Initial CORE RESET\n");
+                        wr32(hw, I40E_GLGEN_RTRIG, I40E_GLGEN_RTRIG_CORER_MASK);
+                        i40e_flush(hw);
+                        i = 50;
+                        do {
+				i40e_msec_delay(50);
+                                reg = rd32(hw, I40E_GLGEN_RSTAT);
+                                if (!(reg & I40E_GLGEN_RSTAT_DEVSTATE_MASK))
+                                        break;
+                        } while (i--);
+
+                        /* paranoia */
+                        wr32(hw, I40E_PF_ATQLEN, 0);
+                        wr32(hw, I40E_PF_ATQBAL, 0);
+                        wr32(hw, I40E_PF_ATQBAH, 0);
+                        i40e_clear_pxe_mode(hw);
+                }
+                mtx_unlock(&i40e_reset_mtx);
 	}
 
 	/* Set admin queue parameters */
@@ -453,17 +513,24 @@ i40e_attach(device_t dev)
 	/* Set up the admin queue */
 	error = i40e_init_adminq(hw);
 	if (error) {
-		device_printf(dev, "Admin Queue setup failure!\n");
+		device_printf(dev, "The driver for the device stopped "
+		    "because the NVM image is newer than expected.\n"
+		    "You must install the most recent version of "
+		    " the network driver.\n");
 		goto err_out;
 	}
+	device_printf(dev, "%s\n", i40e_fw_version_str(hw));
 
-#ifdef I40E_DEBUG
-	device_printf(dev,"Firmware version: %d.%d "
-	    "API version %d.%d NVM track %x version %x\n", 
-	    hw->aq.fw_maj_ver, hw->aq.fw_min_ver,
-	    hw->aq.api_maj_ver, hw->aq.api_min_ver,
-	    hw->nvm.eetrack, hw->nvm.version);
-#endif
+        if (hw->aq.api_maj_ver == I40E_FW_API_VERSION_MAJOR &&
+	    hw->aq.api_min_ver > I40E_FW_API_VERSION_MINOR)
+		device_printf(dev, "The driver for the device detected "
+		    "a newer version of the NVM image than expected.\n"
+		    "Please install the most recent version of the network driver.\n");
+	else if (hw->aq.api_maj_ver < I40E_FW_API_VERSION_MAJOR ||
+	    hw->aq.api_min_ver < (I40E_FW_API_VERSION_MINOR - 1))
+		device_printf(dev, "The driver for the device detected "
+		    "an older version of the NVM image than expected.\n"
+		    "Please update the NVM image.\n");
 
 	/* Clear PXE mode */
 	i40e_clear_pxe_mode(hw);
@@ -488,6 +555,9 @@ i40e_attach(device_t dev)
 		goto err_mac_hmc;
 	}
 
+	/* Disable LLDP from the firmware */
+	i40e_aq_stop_lldp(hw, TRUE, NULL);
+
 	i40e_get_mac_addr(hw, hw->mac.addr);
 	error = i40e_validate_mac_addr(hw->mac.addr);
 	if (error) {
@@ -517,6 +587,15 @@ i40e_attach(device_t dev)
 	/* Determine link state */
 	vsi->link_up = i40e_config_link(hw);
 
+	/* Report if Unqualified modules are found */
+	if ((vsi->link_up == FALSE) &&
+	    (pf->hw.phy.link_info.link_info &
+	    I40E_AQ_MEDIA_AVAILABLE) &&
+	    (!(pf->hw.phy.link_info.an_info &
+	    I40E_AQ_QUALIFIED_MODULE)))
+		device_printf(dev, "Link failed because "
+		    "an unqualified module was detected\n");
+
 	/* Setup OS specific network interface */
 	if (i40e_setup_interface(dev, vsi) != 0)
 		goto err_late;
@@ -536,6 +615,7 @@ i40e_attach(device_t dev)
 	vsi->vlan_detach = EVENTHANDLER_REGISTER(vlan_unconfig,
 	    i40e_unregister_vlan, vsi, EVENTHANDLER_PRI_FIRST);
 
+
 	INIT_DEBUGOUT("i40e_attach: end");
 	return (0);
 
@@ -1014,12 +1094,6 @@ i40e_init_locked(struct i40e_pf *pf)
 	} else
 		i40e_configure_legacy(pf);
 
-	/*
-	** Only a temporary workaround for RX hangs
-	*/
-	if (rd32(hw, I40E_PRTRPB_SLW) != 0x30000)
-		wr32(hw, I40E_PRTRPB_SLW, 0x30000);
-
 	i40e_enable_rings(vsi);
 
 	i40e_aq_set_default_vsi(hw, vsi->seid, NULL);
@@ -1171,6 +1245,10 @@ i40e_msix_que(void *arg)
 	struct tx_ring	*txr = &que->txr;
 	bool		more_tx, more_rx;
 
+	/* Protect against spurious interrupts */
+	if (!(vsi->ifp->if_drv_flags & IFF_DRV_RUNNING))
+		return;
+
 	++que->irqs;
 
 	more_rx = i40e_rxeof(que, I40E_RX_LIMIT);
@@ -1219,8 +1297,10 @@ i40e_msix_adminq(void *arg)
 	if (reg & I40E_PFINT_ICR0_ADMINQ_MASK)
 		mask &= ~I40E_PFINT_ICR0_ENA_ADMINQ_MASK;
 
-	if (reg & I40E_PFINT_ICR0_MAL_DETECT_MASK)
+	if (reg & I40E_PFINT_ICR0_MAL_DETECT_MASK) {
+		i40e_handle_mdd_event(pf);
 		mask &= ~I40E_PFINT_ICR0_ENA_MAL_DETECT_MASK;
+	}
 
 	if (reg & I40E_PFINT_ICR0_VFLR_MASK)
 		mask &= ~I40E_PFINT_ICR0_ENA_VFLR_MASK;
@@ -1274,6 +1354,12 @@ i40e_media_status(struct ifnet * ifp, struct ifmediareq * ifmr)
 		case I40E_PHY_TYPE_1000BASE_T:
 			ifmr->ifm_active |= IFM_1000_T;
 			break;
+		case I40E_PHY_TYPE_1000BASE_SX:
+			ifmr->ifm_active |= IFM_1000_SX;
+			break;
+		case I40E_PHY_TYPE_1000BASE_LX:
+			ifmr->ifm_active |= IFM_1000_LX;
+			break;
 		/* 10 G */
 		case I40E_PHY_TYPE_10GBASE_CR1_CU:
 		case I40E_PHY_TYPE_10GBASE_SFPP_CU:
@@ -1296,16 +1382,11 @@ i40e_media_status(struct ifnet * ifp, struct ifmediareq * ifmr)
 		case I40E_PHY_TYPE_40GBASE_LR4:
 			ifmr->ifm_active |= IFM_40G_LR4;
 			break;
-		/*
-		 * FreeBSD doesn't know about the other phy
-		 * types this hardware supports.
-		 */
 		default:
 			ifmr->ifm_active |= IFM_UNKNOWN;
 			break;
 	}
 	/* Report flow control status as well */
-	/* TODO: Something special if PFC is enabled instead */
 	if (hw->phy.link_info.an_info & I40E_AQ_LINK_PAUSE_TX)
 		ifmr->ifm_active |= IFM_ETH_TXPAUSE;
 	if (hw->phy.link_info.an_info & I40E_AQ_LINK_PAUSE_RX)
@@ -1335,7 +1416,9 @@ i40e_media_change(struct ifnet * ifp)
 	if (IFM_TYPE(ifm->ifm_media) != IFM_ETHER)
 		return (EINVAL);
 
-	return (0);
+	if_printf(ifp, "Media change is currently not supported.\n");
+
+	return (ENODEV);
 }
 
 
@@ -1568,7 +1651,7 @@ i40e_local_timer(void *arg)
 	i40e_update_stats_counters(pf);
 
 	/*
-	** Check status on the queues for a hang
+	** Check status of the queues
 	*/
 	mask = (I40E_PFINT_DYN_CTLN_INTENA_MASK |
 		I40E_PFINT_DYN_CTLN_SWINT_TRIG_MASK);
@@ -1582,9 +1665,20 @@ i40e_local_timer(void *arg)
 		** are uncleaned descriptors it increments busy. If
 		** we get to 5 we declare it hung.
 		*/
+		if (que->busy == I40E_QUEUE_HUNG) {
+			++hung;
+			/* Mark the queue as inactive */
+			vsi->active_queues &= ~((u64)1 << que->me);
+			continue;
+		} else {
+			/* Check if we've come back from hung */
+			if ((vsi->active_queues & ((u64)1 << que->me)) == 0)
+				vsi->active_queues |= ((u64)1 << que->me);
+		}
 		if (que->busy >= I40E_MAX_TX_BUSY) {
 			device_printf(dev,"Warning queue %d "
-			    "appears to be hung!", i);
+			    "appears to be hung!\n", i);
+			que->busy = I40E_QUEUE_HUNG;
 			++hung;
 		}
 	}
@@ -1809,6 +1903,27 @@ i40e_init_msix(struct i40e_pf *pf)
 	if (i40e_enable_msix == 0)
 		goto msi;
 
+	/*
+	** When used in a virtualized environment 
+	** PCI BUSMASTER capability may not be set
+	** so explicity set it here and rewrite
+	** the ENABLE in the MSIX control register
+	** at this point to cause the host to
+	** successfully initialize us.
+	*/
+	{
+		u16 pci_cmd_word;
+		int msix_ctrl;
+		pci_cmd_word = pci_read_config(dev, PCIR_COMMAND, 2);
+		pci_cmd_word |= PCIM_CMD_BUSMASTEREN;
+		pci_write_config(dev, PCIR_COMMAND, pci_cmd_word, 2);
+		pci_find_cap(dev, PCIY_MSIX, &rid);
+		rid += PCIR_MSIX_CTRL;
+		msix_ctrl = pci_read_config(dev, rid, 2);
+		msix_ctrl |= PCIM_MSIXCTRL_MSIX_ENABLE;
+		pci_write_config(dev, rid, msix_ctrl, 2);
+	}
+
 	/* First try MSI/X */
 	rid = PCIR_BAR(I40E_BAR);
 	pf->msix_mem = bus_alloc_resource_any(dev,
@@ -1850,7 +1965,6 @@ i40e_init_msix(struct i40e_pf *pf)
 		return (0); /* Will go to Legacy setup */
 	}
 
-	// NOTE this is all simplified based on ONE VSI
 	if (pci_alloc_msix(dev, &vectors) == 0) {
                	device_printf(pf->dev,
 		    "Using MSIX interrupts with %d vectors\n", vectors);
@@ -2194,7 +2308,7 @@ i40e_setup_interface(device_t dev, struct i40e_vsi *vsi)
 		return (EPERM);
 	}
 
-	/* Display PHY's supported media types */
+	/* Display supported media types */
 	if (abilities_resp.phy_type & (1 << I40E_PHY_TYPE_100BASE_TX))
 		ifmedia_add(&vsi->media, IFM_ETHER | IFM_100_TX, 0, NULL);
 
@@ -2355,7 +2469,11 @@ i40e_initialize_vsi(struct i40e_vsi *vsi)
 		tctx.base = (txr->dma.pa/128);
 		tctx.qlen = que->num_desc;
 		tctx.fc_ena = 0;
-		tctx.rdylist = vsi->info.qs_handle[0];
+		tctx.rdylist = vsi->info.qs_handle[0]; /* index is TC */
+		/* Enable HEAD writeback */
+		tctx.head_wb_ena = 1;
+		tctx.head_wb_addr = txr->dma.pa +
+		    (que->num_desc * sizeof(struct i40e_tx_desc));
 		tctx.rdylist_act = 0;
 		err = i40e_clear_lan_tx_queue_context(hw, i);
 		if (err) {
@@ -2401,11 +2519,7 @@ i40e_initialize_vsi(struct i40e_vsi *vsi)
 		rctx.tphwdesc_ena = 1;
 		rctx.tphdata_ena = 0;
 		rctx.tphhead_ena = 0;
-#ifdef FORTVILLE_A0_SUPPORT
-		rctx.lrxqthresh = 0;
-#else
 		rctx.lrxqthresh = 2;
-#endif
 		rctx.crcstrip = 1;
 		rctx.l2tsel = 1;
 		rctx.showiv = 1;
@@ -2520,16 +2634,20 @@ i40e_setup_stations(struct i40e_pf *pf)
 		que->num_desc = i40e_ringsz;
 		que->me = i;
 		que->vsi = vsi;
+		/* mark the queue as active */
+		vsi->active_queues |= (u64)1 << que->me;
 		txr = &que->txr;
 		txr->que = que;
+		txr->tail = I40E_QTX_TAIL(que->me);
 
 		/* Initialize the TX lock */
 		snprintf(txr->mtx_name, sizeof(txr->mtx_name), "%s:tx(%d)",
 		    device_get_nameunit(dev), que->me);
 		mtx_init(&txr->mtx, txr->mtx_name, NULL, MTX_DEF);
 		/* Create the TX descriptor ring */
-		tsize = roundup2(que->num_desc *
-		    sizeof(struct i40e_tx_desc), DBA_ALIGN);
+		tsize = roundup2((que->num_desc *
+		    sizeof(struct i40e_tx_desc)) +
+		    sizeof(u32), DBA_ALIGN);
 		if (i40e_allocate_dma(&pf->hw,
 		    &txr->dma, tsize, DBA_ALIGN)) {
 			device_printf(dev,
@@ -2563,6 +2681,7 @@ i40e_setup_stations(struct i40e_pf *pf)
 		    sizeof(union i40e_rx_desc), DBA_ALIGN);
 		rxr = &que->rxr;
 		rxr->que = que;
+		rxr->tail = I40E_QRX_TAIL(que->me);
 
 		/* Initialize the RX side lock */
 		snprintf(rxr->mtx_name, sizeof(rxr->mtx_name), "%s:rx(%d)",
@@ -2698,7 +2817,7 @@ i40e_set_queue_tx_itr(struct i40e_queue *que)
 	if (txr->bytes == 0)
 		return;
 
-	if (i40e_dynamic_rx_itr) {
+	if (i40e_dynamic_tx_itr) {
 		tx_bytes = txr->bytes/txr->itr;
 		tx_itr = txr->itr;
 
@@ -2757,6 +2876,10 @@ static void
 i40e_add_hw_stats(struct i40e_pf *pf)
 {
 	device_t dev = pf->dev;
+	struct i40e_vsi *vsi = &pf->vsi;
+	struct i40e_queue *queues = vsi->queues;
+	struct i40e_eth_stats *vsi_stats = &vsi->eth_stats;
+	struct i40e_hw_port_stats *pf_stats = &pf->stats;
 
 	struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(dev);
 	struct sysctl_oid *tree = device_get_sysctl_tree(dev);
@@ -2765,9 +2888,8 @@ i40e_add_hw_stats(struct i40e_pf *pf)
 	struct sysctl_oid *vsi_node, *queue_node;
 	struct sysctl_oid_list *vsi_list, *queue_list;
 
-	struct i40e_vsi *vsi = &pf->vsi;
-	struct i40e_eth_stats *vsi_stats = &vsi->eth_stats;
-	struct i40e_hw_port_stats *pf_stats = &pf->stats;
+	struct tx_ring *txr;
+	struct rx_ring *rxr;
 
 	/* Driver statistics */
 	SYSCTL_ADD_ULONG(ctx, child, OID_AUTO, "watchdog_events",
@@ -2779,51 +2901,39 @@ i40e_add_hw_stats(struct i40e_pf *pf)
 
 	/* VSI statistics */
 #define QUEUE_NAME_LEN 32
-	char vsi_namebuf[QUEUE_NAME_LEN];
 	char queue_namebuf[QUEUE_NAME_LEN];
 	
-	snprintf(vsi_namebuf, QUEUE_NAME_LEN, "vsi%d", vsi->info.stat_counter_idx);
-	vsi_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, vsi_namebuf,
-				   CTLFLAG_RD, NULL, "VSI Number");
+	// ERJ: Only one vsi now, re-do when >1 VSI enabled
+	// snprintf(vsi_namebuf, QUEUE_NAME_LEN, "vsi%d", vsi->info.stat_counter_idx);
+	vsi_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "vsi",
+				   CTLFLAG_RD, NULL, "VSI-specific stats");
 	vsi_list = SYSCTL_CHILDREN(vsi_node);
 
 	i40e_add_sysctls_eth_stats(ctx, vsi_list, vsi_stats);
 
 	/* Queue statistics */
-	struct i40e_queue *queues = vsi->queues;
-	struct tx_ring *txr;
-	struct rx_ring *rxr;
 	for (int q = 0; q < vsi->num_queues; q++) {
-		snprintf(queue_namebuf, QUEUE_NAME_LEN, "queue%d", q);
+		snprintf(queue_namebuf, QUEUE_NAME_LEN, "que%d", q);
 		queue_node = SYSCTL_ADD_NODE(ctx, vsi_list, OID_AUTO, queue_namebuf,
-					     CTLFLAG_RD, NULL, "Queue Name");
+					     CTLFLAG_RD, NULL, "Queue #");
 		queue_list = SYSCTL_CHILDREN(queue_node);
 
-		SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, "mbuf_defrag_failed",
+		txr = &(queues[q].txr);
+		rxr = &(queues[q].rxr);
+
+		SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "mbuf_defrag_failed",
 				CTLFLAG_RD, &(queues[q].mbuf_defrag_failed),
 				"m_defrag() failed");
-		SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, "dropped",
+		SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "dropped",
 				CTLFLAG_RD, &(queues[q].dropped_pkts),
 				"Driver dropped packets");
-
-		txr = &(queues[q].txr);
-		/* ERJ - Need:
-		 * i40e_sysctl_interrupt_rate_handler
-		 * i40e_sysctl_tdh_handler
-		 * i40e_sysctl_tdt_handler
-		 *
-		 * i40e_sysctl_rdh_handler
-		 * i40e_sysctl_rdt_handler
-		 * rx_copies
-		 * LRO stats
-		 */
 		SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "irqs",
 				CTLFLAG_RD, &(queues[q].irqs),
 				"irqs on this queue");
-		SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, "tso_tx",
+		SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tso_tx",
 				CTLFLAG_RD, &(queues[q].tso),
 				"TSO");
-		SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, "tx_dma_setup",
+		SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tx_dma_setup",
 				CTLFLAG_RD, &(queues[q].tx_dma_setup),
 				"Driver tx dma failure in xmit");
 		SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "no_desc_avail",
@@ -2835,8 +2945,6 @@ i40e_add_hw_stats(struct i40e_pf *pf)
 		SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tx_bytes",
 				CTLFLAG_RD, &(txr->bytes),
 				"Queue Bytes Transmitted");
-		
-		rxr = &(queues[q].rxr);
 		SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "rx_packets",
 				CTLFLAG_RD, &(rxr->rx_packets),
 				"Queue Packets Received");
@@ -2863,16 +2971,14 @@ i40e_add_sysctls_eth_stats(struct sysctl_ctx_list *ctx,
 			"Multicast Packets Received"},
 		{&eth_stats->rx_broadcast, "bcast_pkts_rcvd",
 			"Broadcast Packets Received"},
-		// Add description
-		{&eth_stats->rx_discards, "rx_discards", "?"},
+		{&eth_stats->rx_discards, "rx_discards", "Discarded RX packets"},
 		{&eth_stats->tx_bytes, "good_octets_txd", "Good Octets Transmitted"},
 		{&eth_stats->tx_unicast, "ucast_pkts_txd", "Unicast Packets Transmitted"},
 		{&eth_stats->tx_multicast, "mcast_pkts_txd",
 			"Multicast Packets Transmitted"},
 		{&eth_stats->tx_broadcast, "bcast_pkts_txd",
 			"Broadcast Packets Transmitted"},
-		// Add description
-		{&eth_stats->tx_discards, "tx_discards", "?"},
+		{&eth_stats->tx_discards, "tx_discards", "Discarded TX packets"},
 		// end
 		{0,0,0}
 	};
@@ -2892,7 +2998,7 @@ i40e_add_sysctls_mac_stats(struct sysctl_ctx_list *ctx,
 	struct sysctl_oid_list *child,
 	struct i40e_hw_port_stats *stats)
 {
-	struct sysctl_oid *stat_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "mac_stats",
+	struct sysctl_oid *stat_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, "mac",
 				    CTLFLAG_RD, NULL, "Mac Statistics");
 	struct sysctl_oid_list *stat_list = SYSCTL_CHILDREN(stat_node);
 
@@ -3095,11 +3201,9 @@ i40e_setup_vlan_filters(struct i40e_vsi *vsi)
 static void
 i40e_init_filters(struct i40e_vsi *vsi)
 {
-	/* Protocol addresses */
-	/* - Flow control multicast */
-	u8 mc[6] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x01};
-	i40e_add_filter(vsi, mc, I40E_VLAN_ANY);
-	/* TODO: other protocols */
+	/* Add broadcast address */
+	u8 bc[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+	i40e_add_filter(vsi, bc, I40E_VLAN_ANY);
 }
 
 /*
@@ -3332,7 +3436,6 @@ i40e_enable_rings(struct i40e_vsi *vsi)
 	u32		reg;
 
 	for (int i = 0; i < vsi->num_queues; i++) {
-		// ERJ: pre_tx_queue_cfg is B0-only?
 		i40e_pre_tx_queue_cfg(hw, i, TRUE);
 
 		reg = rd32(hw, I40E_QTX_ENA(i));
@@ -3372,10 +3475,7 @@ i40e_disable_rings(struct i40e_vsi *vsi)
 	u32		reg;
 
 	for (int i = 0; i < vsi->num_queues; i++) {
-		// ERJ
-		// this step can be executed concurrently for each queue
 		i40e_pre_tx_queue_cfg(hw, i, FALSE);
-		// min 100usec for 2x10, 400usec for 1x10
 		i40e_usec_delay(500);
 
 		reg = rd32(hw, I40E_QTX_ENA(i));
@@ -3406,6 +3506,78 @@ i40e_disable_rings(struct i40e_vsi *vsi)
 	}
 }
 
+/**
+ * i40e_handle_mdd_event
+ *
+ * Called from interrupt handler to identify possibly malicious vfs
+ * (But also detects events from the PF, as well)
+ **/
+static void i40e_handle_mdd_event(struct i40e_pf *pf)
+{
+	struct i40e_hw *hw = &pf->hw;
+	device_t dev = pf->dev;
+	bool mdd_detected = false;
+	bool pf_mdd_detected = false;
+	u32 reg;
+
+	/* find what triggered the MDD event */
+	reg = rd32(hw, I40E_GL_MDET_TX);
+	if (reg & I40E_GL_MDET_TX_VALID_MASK) {
+		u8 pf_num = (reg & I40E_GL_MDET_TX_PF_NUM_MASK) >>
+				I40E_GL_MDET_TX_PF_NUM_SHIFT;
+		u8 event = (reg & I40E_GL_MDET_TX_EVENT_MASK) >>
+				I40E_GL_MDET_TX_EVENT_SHIFT;
+		u8 queue = (reg & I40E_GL_MDET_TX_QUEUE_MASK) >>
+				I40E_GL_MDET_TX_QUEUE_SHIFT;
+		device_printf(dev,
+			 "Malicious Driver Detection event 0x%02x"
+			 " on TX queue %d pf number 0x%02x\n",
+			 event, queue, pf_num);
+		wr32(hw, I40E_GL_MDET_TX, 0xffffffff);
+		mdd_detected = true;
+	}
+	reg = rd32(hw, I40E_GL_MDET_RX);
+	if (reg & I40E_GL_MDET_RX_VALID_MASK) {
+		u8 func = (reg & I40E_GL_MDET_RX_FUNCTION_MASK) >>
+				I40E_GL_MDET_RX_FUNCTION_SHIFT;
+		u8 event = (reg & I40E_GL_MDET_RX_EVENT_MASK) >>
+				I40E_GL_MDET_RX_EVENT_SHIFT;
+		u8 queue = (reg & I40E_GL_MDET_RX_QUEUE_MASK) >>
+				I40E_GL_MDET_RX_QUEUE_SHIFT;
+		device_printf(dev,
+			 "Malicious Driver Detection event 0x%02x"
+			 " on RX queue %d of function 0x%02x\n",
+			 event, queue, func);
+		wr32(hw, I40E_GL_MDET_RX, 0xffffffff);
+		mdd_detected = true;
+	}
+
+	if (mdd_detected) {
+		reg = rd32(hw, I40E_PF_MDET_TX);
+		if (reg & I40E_PF_MDET_TX_VALID_MASK) {
+			wr32(hw, I40E_PF_MDET_TX, 0xFFFF);
+			device_printf(dev,
+				 "MDD TX event is for this function 0x%08x",
+				 reg);
+			pf_mdd_detected = true;
+		}
+		reg = rd32(hw, I40E_PF_MDET_RX);
+		if (reg & I40E_PF_MDET_RX_VALID_MASK) {
+			wr32(hw, I40E_PF_MDET_RX, 0xFFFF);
+			device_printf(dev,
+				 "MDD RX event is for this function 0x%08x",
+				 reg);
+			pf_mdd_detected = true;
+		}
+	}
+
+	/* re-enable mdd interrupt cause */
+	reg = rd32(hw, I40E_PFINT_ICR0_ENA);
+	reg |= I40E_PFINT_ICR0_ENA_MAL_DETECT_MASK;
+	wr32(hw, I40E_PFINT_ICR0_ENA, reg);
+	i40e_flush(hw);
+}
+
 static void
 i40e_enable_intr(struct i40e_vsi *vsi)
 {
@@ -3505,6 +3677,9 @@ static void
 i40e_update_stats_counters(struct i40e_pf *pf)
 {
 	struct i40e_hw	*hw = &pf->hw;
+	struct i40e_vsi *vsi = &pf->vsi;
+	struct ifnet	*ifp = vsi->ifp;
+
 	struct i40e_hw_port_stats *nsd = &pf->stats;
 	struct i40e_hw_port_stats *osd = &pf->stats_offsets;
 
@@ -3579,7 +3754,7 @@ i40e_update_stats_counters(struct i40e_pf *pf)
 			   &osd->rx_length_errors,
 			   &nsd->rx_length_errors);
 
-	/* Update flow control stats */
+	/* Flow control (LFC) stats */
 	i40e_stat_update32(hw, I40E_GLPRT_LXONRXC(hw->port),
 			   pf->stat_offsets_loaded,
 			   &osd->link_xon_rx, &nsd->link_xon_rx);
@@ -3593,10 +3768,7 @@ i40e_update_stats_counters(struct i40e_pf *pf)
 			   pf->stat_offsets_loaded,
 			   &osd->link_xoff_tx, &nsd->link_xoff_tx);
 
-	/* 
-	 * Uncomment these out when priority flow control
-	 * is implemented.
-	 */
+	/* Priority flow control stats */
 #if 0
 	for (int i = 0; i < 8; i++) {
 		i40e_stat_update32(hw, I40E_GLPRT_PXONRXC(hw->port, i),
@@ -3619,6 +3791,7 @@ i40e_update_stats_counters(struct i40e_pf *pf)
 	}
 #endif
 
+	/* Packet size stats rx */
 	i40e_stat_update48(hw, I40E_GLPRT_PRC64H(hw->port),
 			   I40E_GLPRT_PRC64L(hw->port),
 			   pf->stat_offsets_loaded,
@@ -3648,6 +3821,7 @@ i40e_update_stats_counters(struct i40e_pf *pf)
 			   pf->stat_offsets_loaded,
 			   &osd->rx_size_big, &nsd->rx_size_big);
 
+	/* Packet size stats tx */
 	i40e_stat_update48(hw, I40E_GLPRT_PTC64H(hw->port),
 			   I40E_GLPRT_PTC64L(hw->port),
 			   pf->stat_offsets_loaded,
@@ -3690,45 +3864,13 @@ i40e_update_stats_counters(struct i40e_pf *pf)
 			   pf->stat_offsets_loaded,
 			   &osd->rx_jabber, &nsd->rx_jabber);
 	pf->stat_offsets_loaded = true;
-	/* End pf-only stats */
+	/* End hw stats */
 
 	/* Update vsi stats */
-	struct i40e_vsi *vsi = &pf->vsi;
 	i40e_update_eth_stats(vsi);
 
-	/* ERJ - does something need these statistics?
-	u64 rx_p = 0, rx_b = 0, tx_p = 0, tx_b = 0;
-	u64 tx_no_desc;
-	u64 rx_split, rx_discarded, rx_not_done;
-	for (u16 q = 0; q < vsi->num_queues; q++)
-	{
-		struct i40e_queue *p = &vsi->queues[q];	
-	
-		rx_p += p->rxr.packets;
-		tx_p += p->txr.packets;
-		rx_b += p->rxr.bytes;
-		tx_b += p->txr.bytes;
-	
-		tx_no_desc += p->txr.no_desc;
-		rx_split += p->rxr.split;
-		rx_discarded += p->rxr.discarded;
-		rx_not_done += p->rxr.not_done;
-	}
-	*/
-
 	/* OS statistics */
-	struct ifnet	*ifp = vsi->ifp;
-
-	// ifp->if_ipackets = rx_p; // no gprc
-	// ifp->if_opackets = tx_p; // no gptc
-	ifp->if_ibytes = nsd->eth.rx_bytes;
-	ifp->if_obytes = nsd->eth.tx_bytes;
-	ifp->if_imcasts = nsd->eth.rx_multicast;
-	ifp->if_omcasts = nsd->eth.tx_multicast;
-	ifp->if_collisions = 0;
-
-	/* Rx Errors */
-	// Linux uses illegal_bytes instead of rx_length_errors
+	// ERJ - these are per-port, update all vsis?
 	ifp->if_ierrors = nsd->crc_errors + nsd->illegal_bytes;
 }
 
@@ -3781,7 +3923,7 @@ i40e_do_adminq(void *context, int pending)
 	} while (result && (loop++ < I40E_ADM_LIMIT));
 
 	reg = rd32(hw, I40E_PFINT_ICR0_ENA);
-	reg |=  I40E_PFINT_ICR0_ENA_ADMINQ_MASK;
+	reg |= I40E_PFINT_ICR0_ENA_ADMINQ_MASK;
 	wr32(hw, I40E_PFINT_ICR0_ENA, reg);
 	free(event.msg_buf, M_DEVBUF);
 
@@ -3861,8 +4003,9 @@ i40e_print_debug_info(struct i40e_pf *pf)
  **/
 void i40e_update_eth_stats(struct i40e_vsi *vsi)
 {
-	struct i40e_pf	*pf = (struct i40e_pf *)vsi->back;
+	struct i40e_pf *pf = (struct i40e_pf *)vsi->back;
 	struct i40e_hw *hw = &pf->hw;
+	struct ifnet *ifp = vsi->ifp;
 	struct i40e_eth_stats *es;
 	struct i40e_eth_stats *oes;
 	u16 stat_idx = vsi->info.stat_counter_idx;
@@ -3912,6 +4055,23 @@ void i40e_update_eth_stats(struct i40e_vsi *vsi)
 			   vsi->stat_offsets_loaded,
 			   &oes->tx_broadcast, &es->tx_broadcast);
 	vsi->stat_offsets_loaded = true;
+
+	/* Update ifnet stats */
+	ifp->if_ipackets = es->rx_unicast +
+	                   es->rx_multicast +
+			   es->rx_broadcast;
+	ifp->if_opackets = es->tx_unicast +
+	                   es->tx_multicast +
+			   es->tx_broadcast;
+	ifp->if_ibytes = es->rx_bytes;
+	ifp->if_obytes = es->tx_bytes;
+	ifp->if_imcasts = es->rx_multicast;
+	ifp->if_omcasts = es->tx_multicast;
+
+	ifp->if_oerrors = es->tx_errors;
+	ifp->if_iqdrops = es->rx_discards;
+	ifp->if_noproto = es->rx_unknown_protocol;
+	ifp->if_collisions = 0;
 }
 
 /**
@@ -3952,7 +4112,7 @@ i40e_stat_update48(struct i40e_hw *hw, u32 hireg, u32 loreg,
 	new_data = rd64(hw, loreg);
 #else
 	/*
-	 * Use two rd32's instead of one rd64 because FreeBSD versions before
+	 * Use two rd32's instead of one rd64; FreeBSD versions before
 	 * 10 don't support 8 byte bus reads/writes.
 	 */
 	new_data = rd32(hw, loreg);
@@ -3988,7 +4148,6 @@ i40e_stat_update32(struct i40e_hw *hw, u32 reg,
 
 /*
 ** Set flow control using sysctl:
-** Flow control values:
 ** 	0 - off
 **	1 - rx pause
 **	2 - tx pause
@@ -4007,113 +4166,156 @@ i40e_set_flowcntl(SYSCTL_HANDLER_ARGS)
 	struct i40e_pf *pf = (struct i40e_pf *)arg1;
 	struct i40e_hw *hw = &pf->hw;
 	device_t dev = pf->dev;
-	struct i40e_aq_get_phy_abilities_resp abilities;
 	int requested_fc = 0, error = 0;
 	enum i40e_status_code aq_error = 0;
 	u8 fc_aq_err = 0;
 
-	/* Get current capability information */
-	aq_error = i40e_aq_get_phy_capabilities(hw, FALSE, FALSE, &abilities, NULL);
-	if (aq_error)
-		device_printf(dev, "Error getting phy capabilities %d,"
-		    " aq error: %d\n", aq_error, hw->aq.asq_last_status);
-
-	if ((abilities.abilities & I40E_AQ_PHY_FLAG_PAUSE_TX) &&
-	    (abilities.abilities & I40E_AQ_PHY_FLAG_PAUSE_RX))
-		hw->fc.current_mode = I40E_FC_FULL;
-	else if (abilities.abilities & I40E_AQ_PHY_FLAG_PAUSE_TX)
-		hw->fc.current_mode = I40E_FC_TX_PAUSE;
-	else if (abilities.abilities & I40E_AQ_PHY_FLAG_PAUSE_RX)
-		hw->fc.current_mode = I40E_FC_RX_PAUSE;
-	else
-		hw->fc.current_mode = I40E_FC_NONE;
+	aq_error = i40e_aq_get_link_info(hw, TRUE, NULL, NULL);
+	if (aq_error) {
+		device_printf(dev,
+		    "%s: Error retrieving link info from aq, %d\n",
+		    __func__, aq_error);
+		return (EAGAIN);
+	}
 
 	/* Read in new mode */
 	requested_fc = hw->fc.current_mode;
 	error = sysctl_handle_int(oidp, &requested_fc, 0, req);
 	if ((error) || (req->newptr == NULL))
-		goto no_set;
+		return (error);
 	if (requested_fc < 0 || requested_fc > 3) {
 		device_printf(dev,
 		    "Invalid fc mode; valid modes are 0 through 3\n");
 		return (EINVAL);
 	}
 
+	/*
+	** Changing flow control mode currently does not work on
+	** 40GBASE-CR4 PHYs
+	*/
+	if (hw->phy.link_info.phy_type == I40E_PHY_TYPE_40GBASE_CR4
+	    || hw->phy.link_info.phy_type == I40E_PHY_TYPE_40GBASE_CR4_CU) {
+		device_printf(dev, "Changing flow control mode unsupported"
+		    " on 40GBase-CR4 media.\n");
+		return (ENODEV);
+	}
+
 	/* Set fc ability for port */
 	hw->fc.requested_mode = requested_fc;
-	i40e_set_fc(hw, &fc_aq_err, TRUE);
+	aq_error = i40e_set_fc(hw, &fc_aq_err, TRUE);
+	if (aq_error) {
+		device_printf(dev,
+		    "%s: Error setting new fc mode %d; fc_err %#x\n",
+		    __func__, aq_error, fc_aq_err);
+		return (EAGAIN);
+	}
 
-	// DEBUG: Verify flow control setting was successfully set
 	if (hw->fc.current_mode != hw->fc.requested_mode) {
-		device_printf(dev, "FC set failure:\n");
-		device_printf(dev, "Current: %s / Requested: %s\n",
+		device_printf(dev, "%s: FC set failure:\n", __func__);
+		device_printf(dev, "%s: Current: %s / Requested: %s\n",
+		    __func__,
 		    i40e_fc_string[hw->fc.current_mode],
 		    i40e_fc_string[hw->fc.requested_mode]);
 	}
 
-no_set:;
-#ifdef I40E_DEBUG
-	/* Print FC registers */
-	u32 reg = 0;
-	printf("Current FC mode: %s\n", i40e_fc_string[hw->fc.current_mode]);
-	if (i40e_is_40G_device(hw->device_id)) {
-		// XXX: Why are these names so long?
-		reg = rd32(hw, I40E_PRTMAC_HSEC_CTL_RX_ENABLE_GPP);
-		printf("PRTMAC_HSEC_CTL_RX_ENABLE_GPP (LFC)         : %s\n",
-		    ON_OFF_STR(reg & I40E_PRTMAC_HSEC_CTL_RX_ENABLE_GPP_HSEC_CTL_RX_ENABLE_GPP_MASK));
+	return (0);
+}
 
-		reg = rd32(hw, I40E_PRTMAC_HSEC_CTL_RX_ENABLE_PPP);
-		printf("PRTMAC_HSEC_CTL_RX_ENABLE_PPP (PFC)         : %s\n",
-		    ON_OFF_STR(reg & I40E_PRTMAC_HSEC_CTL_RX_ENABLE_GPP_HSEC_CTL_RX_ENABLE_GPP_MASK));
+/*
+** Control link advertise speed:
+**	1 - advertise 1G only
+**	2 - advertise 10G only
+**	3 - advertise 1 and 10G
+**
+** Does not work on 40G devices.
+*/
+static int
+i40e_set_advertise(SYSCTL_HANDLER_ARGS)
+{
+	struct i40e_pf *pf = (struct i40e_pf *)arg1;
+	struct i40e_hw *hw = &pf->hw;
+	device_t dev = pf->dev;
+	struct i40e_aq_get_phy_abilities_resp abilities;
+	struct i40e_aq_set_phy_config config;
+	int current_ls = 0, requested_ls = 0;
+	enum i40e_status_code aq_error = 0;
+	int error = 0;
 
-		reg = rd32(hw, I40E_PRTMAC_HSEC_CTL_RX_PAUSE_ENABLE);
-		printf("PRTMAC_HSEC_CTL_RX_PAUSE_ENABLE (LFC)       : %s\n",
-		    ON_OFF_STR(reg & I40E_PRTMAC_HSEC_CTL_RX_PAUSE_ENABLE_HSEC_CTL_RX_PAUSE_ENABLE_MASK));
+	/*
+	** FW doesn't support changing advertised speed
+	** for 40G devices; speed is always 40G.
+	*/
+	if (i40e_is_40G_device(hw->device_id))
+		return (ENODEV);
 
-		reg = rd32(hw, I40E_PRTMAC_HSEC_CTL_TX_PAUSE_ENABLE);
-		printf("PRTMAC_HSEC_CTL_TX_PAUSE_ENABLE (LFC)       : %s\n",
-		    ON_OFF_STR(reg & I40E_PRTMAC_HSEC_CTL_TX_PAUSE_ENABLE_HSEC_CTL_TX_PAUSE_ENABLE_MASK));
-
-		reg = rd32(hw, I40E_PRTMAC_HSEC_CTL_TX_PAUSE_REFRESH_TIMER(8));
-		printf("PRTMAC_HSEC_CTL_TX_PAUSE_REFRESH_TIMER (LFC): %#010x\n", reg);
-
-		reg = rd32(hw, I40E_PRTMAC_HSEC_CTL_TX_PAUSE_QUANTA(8));
-		printf("PRTMAC_HSEC_CTL_TX_PAUSE_QUANTA (LFC)       : %#010x\n",
-		    reg & I40E_PRTMAC_HSEC_CTL_TX_PAUSE_QUANTA_HSEC_CTL_TX_PAUSE_QUANTA_MASK);
-	} else {
-		reg = rd32(hw, I40E_PRTDCB_MFLCN);
-		printf("PRTDCB_MFLCN                     :\n");
-		printf("- PMCF  (Pass MAC Control Frames): %s\n",
-		    ON_OFF_STR(reg & I40E_PRTDCB_MFLCN_PMCF_MASK));
-		printf("- DPF   (Discard Pause Frames)   : %s\n",
-		    ON_OFF_STR(reg & I40E_PRTDCB_MFLCN_DPF_MASK));
-		printf("- RPFCM (Rx PFC Mode)            : %s\n",
-		    ON_OFF_STR(reg & I40E_PRTDCB_MFLCN_RPFCM_MASK));
-		printf("- RFCE  (Rx LFC Mode)            : %s\n",
-		    ON_OFF_STR(reg & I40E_PRTDCB_MFLCN_RFCE_MASK));
-		printf("- RPFCE (Rx PFC Enable Bitmap)   : %#04x\n",
-		    reg & I40E_PRTDCB_MFLCN_RPFCE_MASK);
-		reg = rd32(hw, I40E_PRTDCB_FCCFG);
-		printf("PRTDCB_FCCFG                     :\n");
-		u8 tfce = reg & I40E_PRTDCB_FCCFG_TFCE_MASK;
-		printf("- TFCE  (Tx FC Enable)           : %s\n",
-		    (tfce == 3) ? "Reserved" :
-		    (tfce == 2) ? "PFC Enabled" :
-		    (tfce == 1) ? "LFC Enabled" :
-				  "Tx FC Disabled");
-		reg = rd32(hw, I40E_PRTDCB_FCTTVN(0));
-		printf("PRTDCB_FCCTTVN (LFC)             : %#06x\n",
-		    reg & I40E_PRTDCB_FCTTVN_TTV_2N_MASK);
-		reg = rd32(hw, I40E_PRTDCB_FCRTV);
-		printf("PRTDCB_FCRTV (Pause ref thresh)  : %#06x\n",
-		    reg & I40E_PRTDCB_FCRTV_FC_REFRESH_TH_MASK);
-		reg = rd32(hw, I40E_PRTDCB_TC2PFC);
-		printf("PRTDCB_TC2PFC is 0xff            : %s\n",
-		    ((reg & I40E_PRTDCB_TC2PFC_TC2PFC_MASK) == 0xFF)
-		    ? "Yes" : "No");
+	/* Get current capability information */
+	aq_error = i40e_aq_get_phy_capabilities(hw, FALSE, FALSE, &abilities, NULL);
+	if (aq_error) {
+		device_printf(dev, "%s: Error getting phy capabilities %d,"
+		    " aq error: %d\n", __func__, aq_error,
+		    hw->aq.asq_last_status);
+		return (EAGAIN);
 	}
-#endif
-	return (error);
+
+	/* Figure out current mode */
+	else if (abilities.link_speed & I40E_LINK_SPEED_10GB
+	    && abilities.link_speed & I40E_LINK_SPEED_1GB)
+		current_ls = 3;
+	else if (abilities.link_speed & I40E_LINK_SPEED_10GB)
+		current_ls = 2;
+	else if (abilities.link_speed & I40E_LINK_SPEED_1GB)
+		current_ls = 1;
+	else
+		current_ls = 0;
+
+	/* Read in new mode */
+	requested_ls = current_ls;
+	error = sysctl_handle_int(oidp, &requested_ls, 0, req);
+	if ((error) || (req->newptr == NULL))
+		return (error);
+	if (requested_ls < 1 || requested_ls > 3) {
+		device_printf(dev,
+		    "Invalid advertised speed; valid modes are 1 through 3\n");
+		return (EINVAL);
+	}
+
+	/* Exit if no change */
+	if (current_ls == requested_ls)
+		return (0);
+
+	/* Prepare new config */
+	bzero(&config, sizeof(config));
+	config.phy_type = abilities.phy_type;
+	config.abilities = abilities.abilities
+	    | I40E_AQ_PHY_ENABLE_ATOMIC_LINK;
+	config.eee_capability = abilities.eee_capability;
+	config.eeer = abilities.eeer_val;
+	config.low_power_ctrl = abilities.d3_lpan;
+	/* Translate into aq cmd link_speed */
+	switch (requested_ls) {
+	case 3:
+		config.link_speed = I40E_LINK_SPEED_10GB
+		    | I40E_LINK_SPEED_1GB;
+	case 2:
+		config.link_speed = I40E_LINK_SPEED_10GB;
+	case 1:
+		config.link_speed = I40E_LINK_SPEED_1GB;
+	default:
+		// nothing should get here
+		break;
+	}
+
+	/* Do aq command & restart link */
+	aq_error = i40e_aq_set_phy_config(hw, &config, NULL);
+	if (aq_error) {
+		device_printf(dev, "%s: Error setting new phy config %d,"
+		    " aq error: %d\n", __func__, aq_error,
+		    hw->aq.asq_last_status);
+		return (EAGAIN);
+	}
+
+	i40e_update_link_status(pf);
+	return (0);
 }
 
 /*
@@ -4294,5 +4496,129 @@ i40e_sysctl_sw_filter_list(SYSCTL_HANDLER_ARGS)
 	free(buf, M_DEVBUF);
 	return error;
 }
+
+#define I40E_SW_RES_SIZE 0x14
+static int
+i40e_sysctl_hw_res_info(SYSCTL_HANDLER_ARGS)
+{
+	struct i40e_pf *pf = (struct i40e_pf *)arg1;
+	struct i40e_hw *hw = &pf->hw;
+	device_t dev = pf->dev;
+	struct sbuf *buf;
+	int error = 0;
+
+	u8 num_entries;
+	struct i40e_aqc_switch_resource_alloc_element_resp resp[I40E_SW_RES_SIZE];
+
+	buf = sbuf_new_for_sysctl(NULL, NULL, 0, req);
+	if (!buf) {
+		device_printf(dev, "Could not allocate sbuf for output.\n");
+		return (ENOMEM);
+	}
+
+	error = i40e_aq_get_switch_resource_alloc(hw, &num_entries,
+				resp,
+				I40E_SW_RES_SIZE,
+				NULL);
+	if (error) {
+		device_printf(dev, "%s: get_switch_resource_alloc() error %d, aq error %d\n",
+		    __func__, error, hw->aq.asq_last_status);
+		sbuf_delete(buf);
+		return error;
+	}
+	device_printf(dev, "Num_entries: %d\n", num_entries);
+
+	sbuf_cat(buf, "\n");
+	sbuf_printf(buf,
+	    "Type | Guaranteed | Total | Used   | Un-allocated\n"
+	    "     | (this)     | (all) | (this) | (all)       \n");
+	for (int i = 0; i < num_entries; i++) {
+		sbuf_printf(buf,
+		    "%#4x | %10d   %5d   %6d   %12d",
+		    resp[i].resource_type,
+		    resp[i].guaranteed,
+		    resp[i].total,
+		    resp[i].used,
+		    resp[i].total_unalloced);
+		if (i < num_entries - 1)
+			sbuf_cat(buf, "\n");
+	}
+
+	error = sbuf_finish(buf);
+	if (error) {
+		device_printf(dev, "Error finishing sbuf: %d\n", error);
+		sbuf_delete(buf);
+		return error;
+	}
+
+	error = sysctl_handle_string(oidp, sbuf_data(buf), sbuf_len(buf), req);
+	if (error)
+		device_printf(dev, "sysctl error: %d\n", error);
+	sbuf_delete(buf);
+	return error;
+
+}
+
+/*
+** Dump TX desc given index.
+** Doesn't work; don't use.
+** TODO: Also needs a queue index input!
+**/
+static int
+i40e_sysctl_dump_txd(SYSCTL_HANDLER_ARGS)
+{
+	struct i40e_pf *pf = (struct i40e_pf *)arg1;
+	device_t dev = pf->dev;
+	struct sbuf *buf;
+	int error = 0;
+
+	u16 desc_idx = 0;
+
+	buf = sbuf_new_for_sysctl(NULL, NULL, 0, req);
+	if (!buf) {
+		device_printf(dev, "Could not allocate sbuf for output.\n");
+		return (ENOMEM);
+	}
+
+	/* Read in index */
+	error = sysctl_handle_int(oidp, &desc_idx, 0, req);
+	if (error)
+		return (error);
+	if (req->newptr == NULL)
+		return (EIO); // fix
+	if (desc_idx > 1024) { // fix
+		device_printf(dev,
+		    "Invalid descriptor index, needs to be < 1024\n"); // fix
+		return (EINVAL);
+	}
+
+	// Don't use this sysctl yet
+	if (TRUE)
+		return (ENODEV);
+
+	sbuf_cat(buf, "\n");
+
+	// set to queue 1?
+	struct i40e_queue *que = pf->vsi.queues;
+	struct tx_ring *txr = &(que[1].txr);
+	struct i40e_tx_desc *txd = &txr->base[desc_idx];
+
+	sbuf_printf(buf, "Que: %d, Desc: %d\n", que->me, desc_idx);
+	sbuf_printf(buf, "Addr: %#18lx\n", txd->buffer_addr);
+	sbuf_printf(buf, "Opts: %#18lx\n", txd->cmd_type_offset_bsz);
+
+	error = sbuf_finish(buf);
+	if (error) {
+		device_printf(dev, "Error finishing sbuf: %d\n", error);
+		sbuf_delete(buf);
+		return error;
+	}
+
+	error = sysctl_handle_string(oidp, sbuf_data(buf), sbuf_len(buf), req);
+	if (error)
+		device_printf(dev, "sysctl error: %d\n", error);
+	sbuf_delete(buf);
+	return error;
+}
 #endif
 
diff --git a/sys/dev/isci/isci.h b/sys/dev/isci/isci.h
index 1dc8e93bda59..ce0426a158c3 100644
--- a/sys/dev/isci/isci.h
+++ b/sys/dev/isci/isci.h
@@ -164,6 +164,7 @@ struct ISCI_CONTROLLER
 	uint32_t		initial_discovery_mask;
 	BOOL			is_frozen;
 	BOOL			release_queued_ccbs;
+	BOOL			fail_on_task_timeout;
 	uint8_t			*remote_device_memory;
 	struct ISCI_MEMORY	cached_controller_memory;
 	struct ISCI_MEMORY	uncached_controller_memory;
diff --git a/sys/dev/isci/isci_controller.c b/sys/dev/isci/isci_controller.c
index 0760f34e58e4..f3ff0825faf8 100644
--- a/sys/dev/isci/isci_controller.c
+++ b/sys/dev/isci/isci_controller.c
@@ -300,6 +300,8 @@ SCI_STATUS isci_controller_initialize(struct ISCI_CONTROLLER *controller)
 	SCI_CONTROLLER_HANDLE_T scic_controller_handle;
 	char led_name[64];
 	unsigned long tunable;
+	uint32_t io_shortage;
+	uint32_t fail_on_timeout;
 	int i;
 
 	scic_controller_handle =
@@ -365,10 +367,12 @@ SCI_STATUS isci_controller_initialize(struct ISCI_CONTROLLER *controller)
 	 *  this io_shortage parameter, which will tell CAM that we have a
 	 *  large queue depth than we really do.
 	 */
-	uint32_t io_shortage = 0;
+	io_shortage = 0;
 	TUNABLE_INT_FETCH("hw.isci.io_shortage", &io_shortage);
 	controller->sim_queue_depth += io_shortage;
 
+	fail_on_timeout = 1;
+	TUNABLE_INT_FETCH("hw.isci.fail_on_task_timeout", &fail_on_timeout);
 	/* Attach to CAM using xpt_bus_register now, then immediately freeze
 	 *  the simq.  It will get released later when initial domain discovery
 	 *  is complete.
diff --git a/sys/dev/isci/isci_sysctl.c b/sys/dev/isci/isci_sysctl.c
index 4623a8aa3966..62a10b958901 100644
--- a/sys/dev/isci/isci_sysctl.c
+++ b/sys/dev/isci/isci_sysctl.c
@@ -222,6 +222,24 @@ isci_sysctl_log_frozen_lun_masks(SYSCTL_HANDLER_ARGS)
 	return (0);
 }
 
+static int
+isci_sysctl_fail_on_task_timeout(SYSCTL_HANDLER_ARGS)
+{
+	struct isci_softc	*isci = (struct isci_softc *)arg1;
+	int32_t			fail_on_timeout = 0;
+	int			error, i;
+
+	error = sysctl_handle_int(oidp, &fail_on_timeout, 0, req);
+
+	if (error || fail_on_timeout == 0)
+		return (error);
+
+	for (i = 0; i < isci->controller_count; i++)
+		isci->controllers[i].fail_on_task_timeout = fail_on_timeout;
+
+	return (0);
+}
+
 void isci_sysctl_initialize(struct isci_softc *isci)
 {
 	struct sysctl_ctx_list *sysctl_ctx = device_get_sysctl_ctx(isci->device);
@@ -259,5 +277,10 @@ void isci_sysctl_initialize(struct isci_softc *isci)
 	    "log_frozen_lun_masks", CTLTYPE_UINT| CTLFLAG_RW, isci, 0,
 	    isci_sysctl_log_frozen_lun_masks, "IU",
 	    "Log frozen lun masks to kernel log");
+
+	SYSCTL_ADD_PROC(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO,
+	    "fail_on_task_timeout", CTLTYPE_UINT | CTLFLAG_RW, isci, 0,
+	    isci_sysctl_fail_on_task_timeout, "IU",
+	    "Fail a command that has encountered a task management timeout");
 }
 
diff --git a/sys/dev/isci/isci_task_request.c b/sys/dev/isci/isci_task_request.c
index 5d7f63d294ba..6c8be45e3ebb 100644
--- a/sys/dev/isci/isci_task_request.c
+++ b/sys/dev/isci/isci_task_request.c
@@ -206,8 +206,17 @@ isci_task_request_complete(SCI_CONTROLLER_HANDLE_T scif_controller,
 		break;
 
 	case SCI_FAILURE_TIMEOUT:
-		retry_task = TRUE;
-		isci_log_message(0, "ISCI", "task timeout - retrying\n");
+		if (isci_controller->fail_on_task_timeout) {
+			retry_task = FALSE;
+			isci_log_message(0, "ISCI",
+			    "task timeout - not retrying\n");
+			scif_cb_domain_device_removed(isci_controller,
+			    isci_remote_device->domain, isci_remote_device);
+		} else {
+			retry_task = TRUE;
+			isci_log_message(0, "ISCI",
+			    "task timeout - retrying\n");
+		}
 		break;
 
 	case SCI_TASK_FAILURE:
diff --git a/sys/dev/isci/scil/scic_sds_stp_request.c b/sys/dev/isci/scil/scic_sds_stp_request.c
index ed597b1ce8ac..f3fe28ddd4c9 100644
--- a/sys/dev/isci/scil/scic_sds_stp_request.c
+++ b/sys/dev/isci/scil/scic_sds_stp_request.c
@@ -1222,6 +1222,7 @@ SCI_STATUS scic_sds_stp_request_pio_data_in_copy_data_buffer(
          length -= copy_length;
          sgl_offset += copy_length;
          data_offset += copy_length;
+         source_address += copy_length;
 #endif
       }
    }
diff --git a/sys/dev/iscsi/icl.c b/sys/dev/iscsi/icl.c
index 2b5e4d0dba6d..1a8a26a04cc2 100644
--- a/sys/dev/iscsi/icl.c
+++ b/sys/dev/iscsi/icl.c
@@ -61,24 +61,19 @@
 
 SYSCTL_NODE(_kern, OID_AUTO, icl, CTLFLAG_RD, 0, "iSCSI Common Layer");
 static int debug = 1;
-TUNABLE_INT("kern.icl.debug", &debug);
 SYSCTL_INT(_kern_icl, OID_AUTO, debug, CTLFLAG_RWTUN,
     &debug, 0, "Enable debug messages");
 static int coalesce = 1;
-TUNABLE_INT("kern.icl.coalesce", &coalesce);
 SYSCTL_INT(_kern_icl, OID_AUTO, coalesce, CTLFLAG_RWTUN,
     &coalesce, 0, "Try to coalesce PDUs before sending");
 static int partial_receive_len = 128 * 1024;
-TUNABLE_INT("kern.icl.partial_receive_len", &partial_receive_len);
 SYSCTL_INT(_kern_icl, OID_AUTO, partial_receive_len, CTLFLAG_RWTUN,
     &partial_receive_len, 0, "Minimum read size for partially received "
     "data segment");
 static int sendspace = 1048576;
-TUNABLE_INT("kern.icl.sendspace", &sendspace);
 SYSCTL_INT(_kern_icl, OID_AUTO, sendspace, CTLFLAG_RWTUN,
     &sendspace, 0, "Default send socket buffer size");
 static int recvspace = 1048576;
-TUNABLE_INT("kern.icl.recvspace", &recvspace);
 SYSCTL_INT(_kern_icl, OID_AUTO, recvspace, CTLFLAG_RWTUN,
     &recvspace, 0, "Default receive socket buffer size");
 
@@ -669,7 +664,10 @@ icl_conn_receive_pdu(struct icl_conn *ic, size_t *availablep)
 	}
 
 	if (error != 0) {
-		icl_pdu_free(request);
+		/*
+		 * Don't free the PDU; it's pointed to by ic->ic_receive_pdu
+		 * and will get freed in icl_conn_close().
+		 */
 		icl_conn_fail(ic);
 	}
 
diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c
index 9ad64e62fc34..8c0492275229 100644
--- a/sys/dev/iscsi/iscsi.c
+++ b/sys/dev/iscsi/iscsi.c
@@ -78,27 +78,21 @@ static struct iscsi_softc	*sc;
 
 SYSCTL_NODE(_kern, OID_AUTO, iscsi, CTLFLAG_RD, 0, "iSCSI initiator");
 static int debug = 1;
-TUNABLE_INT("kern.iscsi.debug", &debug);
 SYSCTL_INT(_kern_iscsi, OID_AUTO, debug, CTLFLAG_RWTUN,
     &debug, 0, "Enable debug messages");
 static int ping_timeout = 5;
-TUNABLE_INT("kern.iscsi.ping_timeout", &ping_timeout);
 SYSCTL_INT(_kern_iscsi, OID_AUTO, ping_timeout, CTLFLAG_RWTUN, &ping_timeout,
     0, "Timeout for ping (NOP-Out) requests, in seconds");
 static int iscsid_timeout = 60;
-TUNABLE_INT("kern.iscsi.iscsid_timeout", &iscsid_timeout);
 SYSCTL_INT(_kern_iscsi, OID_AUTO, iscsid_timeout, CTLFLAG_RWTUN, &iscsid_timeout,
     0, "Time to wait for iscsid(8) to handle reconnection, in seconds");
 static int login_timeout = 60;
-TUNABLE_INT("kern.iscsi.login_timeout", &login_timeout);
 SYSCTL_INT(_kern_iscsi, OID_AUTO, login_timeout, CTLFLAG_RWTUN, &login_timeout,
     0, "Time to wait for iscsid(8) to finish Login Phase, in seconds");
 static int maxtags = 255;
-TUNABLE_INT("kern.iscsi.maxtags", &maxtags);
 SYSCTL_INT(_kern_iscsi, OID_AUTO, maxtags, CTLFLAG_RWTUN, &maxtags,
     0, "Max number of IO requests queued");
 static int fail_on_disconnection = 0;
-TUNABLE_INT("kern.iscsi.fail_on_disconnection", &fail_on_disconnection);
 SYSCTL_INT(_kern_iscsi, OID_AUTO, fail_on_disconnection, CTLFLAG_RWTUN,
     &fail_on_disconnection, 0, "Destroy CAM SIM on connection failure");
 
@@ -158,6 +152,7 @@ static void	iscsi_pdu_queue(struct icl_pdu *request);
 static void	iscsi_pdu_update_statsn(const struct icl_pdu *response);
 static void	iscsi_pdu_handle_nop_in(struct icl_pdu *response);
 static void	iscsi_pdu_handle_scsi_response(struct icl_pdu *response);
+static void	iscsi_pdu_handle_task_response(struct icl_pdu *response);
 static void	iscsi_pdu_handle_data_in(struct icl_pdu *response);
 static void	iscsi_pdu_handle_logout_response(struct icl_pdu *response);
 static void	iscsi_pdu_handle_r2t(struct icl_pdu *response);
@@ -169,7 +164,7 @@ static void	iscsi_action(struct cam_sim *sim, union ccb *ccb);
 static void	iscsi_poll(struct cam_sim *sim);
 static struct iscsi_outstanding	*iscsi_outstanding_find(struct iscsi_session *is,
 		    uint32_t initiator_task_tag);
-static int	iscsi_outstanding_add(struct iscsi_session *is,
+static struct iscsi_outstanding	*iscsi_outstanding_add(struct iscsi_session *is,
 		    uint32_t initiator_task_tag, union ccb *ccb);
 static void	iscsi_outstanding_remove(struct iscsi_session *is,
 		    struct iscsi_outstanding *io);
@@ -279,28 +274,36 @@ iscsi_session_logout(struct iscsi_session *is)
 	iscsi_pdu_queue_locked(request);
 }
 
+static void
+iscsi_session_terminate_task(struct iscsi_session *is,
+    struct iscsi_outstanding *io, bool requeue)
+{
+
+	if (io->io_ccb != NULL) {
+		io->io_ccb->ccb_h.status &= ~(CAM_SIM_QUEUED | CAM_STATUS_MASK);
+		if (requeue)
+			io->io_ccb->ccb_h.status |= CAM_REQUEUE_REQ;
+		else
+			io->io_ccb->ccb_h.status |= CAM_REQ_ABORTED;
+		if ((io->io_ccb->ccb_h.status & CAM_DEV_QFRZN) == 0) {
+			io->io_ccb->ccb_h.status |= CAM_DEV_QFRZN;
+			xpt_freeze_devq(io->io_ccb->ccb_h.path, 1);
+			ISCSI_SESSION_DEBUG(is, "freezing devq");
+		}
+		xpt_done(io->io_ccb);
+	}
+	iscsi_outstanding_remove(is, io);
+}
+
 static void
 iscsi_session_terminate_tasks(struct iscsi_session *is, bool requeue)
 {
 	struct iscsi_outstanding *io, *tmp;
 
 	ISCSI_SESSION_LOCK_ASSERT(is);
-	
-	TAILQ_FOREACH_SAFE(io, &is->is_outstanding, io_next, tmp) {
-		if (requeue) {
-			io->io_ccb->ccb_h.status &= ~CAM_SIM_QUEUED;
-			io->io_ccb->ccb_h.status |= CAM_REQUEUE_REQ;
-		} else {
-			io->io_ccb->ccb_h.status = CAM_REQ_ABORTED;
-		}
 
-		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_DEV_QFRZN;
-		xpt_done(io->io_ccb);
-		iscsi_outstanding_remove(is, io);
+	TAILQ_FOREACH_SAFE(io, &is->is_outstanding, io_next, tmp) {
+		iscsi_session_terminate_task(is, io, requeue);
 	}
 }
 
@@ -699,6 +702,9 @@ iscsi_receive_callback(struct icl_pdu *response)
 	case ISCSI_BHS_OPCODE_SCSI_RESPONSE:
 		iscsi_pdu_handle_scsi_response(response);
 		break;
+	case ISCSI_BHS_OPCODE_TASK_RESPONSE:
+		iscsi_pdu_handle_task_response(response);
+		break;
 	case ISCSI_BHS_OPCODE_SCSI_DATA_IN:
 		iscsi_pdu_handle_data_in(response);
 		break;
@@ -819,7 +825,7 @@ iscsi_pdu_handle_scsi_response(struct icl_pdu *response)
 
 	bhssr = (struct iscsi_bhs_scsi_response *)response->ip_bhs;
 	io = iscsi_outstanding_find(is, bhssr->bhssr_initiator_task_tag);
-	if (io == NULL) {
+	if (io == NULL || io->io_ccb == NULL) {
 		ISCSI_SESSION_WARN(is, "bad itt 0x%x", bhssr->bhssr_initiator_task_tag);
 		icl_pdu_free(response);
 		iscsi_session_reconnect(is);
@@ -918,6 +924,38 @@ iscsi_pdu_handle_scsi_response(struct icl_pdu *response)
 	icl_pdu_free(response);
 }
 
+static void
+iscsi_pdu_handle_task_response(struct icl_pdu *response)
+{
+	struct iscsi_bhs_task_management_response *bhstmr;
+	struct iscsi_outstanding *io, *aio;
+	struct iscsi_session *is;
+
+	is = PDU_SESSION(response);
+
+	bhstmr = (struct iscsi_bhs_task_management_response *)response->ip_bhs;
+	io = iscsi_outstanding_find(is, bhstmr->bhstmr_initiator_task_tag);
+	if (io == NULL || io->io_ccb != NULL) {
+		ISCSI_SESSION_WARN(is, "bad itt 0x%x",
+		    bhstmr->bhstmr_initiator_task_tag);
+		icl_pdu_free(response);
+		iscsi_session_reconnect(is);
+		return;
+	}
+
+	if (bhstmr->bhstmr_response != BHSTMR_RESPONSE_FUNCTION_COMPLETE) {
+		ISCSI_SESSION_WARN(is, "task response 0x%x",
+		    bhstmr->bhstmr_response);
+	} else {
+		aio = iscsi_outstanding_find(is, io->io_datasn);
+		if (aio != NULL && aio->io_ccb != NULL)
+			iscsi_session_terminate_task(is, aio, false);
+	}
+
+	iscsi_outstanding_remove(is, io);
+	icl_pdu_free(response);
+}
+
 static void
 iscsi_pdu_handle_data_in(struct icl_pdu *response)
 {
@@ -930,7 +968,7 @@ iscsi_pdu_handle_data_in(struct icl_pdu *response)
 	is = PDU_SESSION(response);
 	bhsdi = (struct iscsi_bhs_data_in *)response->ip_bhs;
 	io = iscsi_outstanding_find(is, bhsdi->bhsdi_initiator_task_tag);
-	if (io == NULL) {
+	if (io == NULL || io->io_ccb == NULL) {
 		ISCSI_SESSION_WARN(is, "bad itt 0x%x", bhsdi->bhsdi_initiator_task_tag);
 		icl_pdu_free(response);
 		iscsi_session_reconnect(is);
@@ -1043,7 +1081,7 @@ iscsi_pdu_handle_r2t(struct icl_pdu *response)
 
 	bhsr2t = (struct iscsi_bhs_r2t *)response->ip_bhs;
 	io = iscsi_outstanding_find(is, bhsr2t->bhsr2t_initiator_task_tag);
-	if (io == NULL) {
+	if (io == NULL || io->io_ccb == NULL) {
 		ISCSI_SESSION_WARN(is, "bad itt 0x%x; reconnecting",
 		    bhsr2t->bhsr2t_initiator_task_tag);
 		icl_pdu_free(response);
@@ -1227,6 +1265,9 @@ iscsi_ioctl_daemon_wait(struct iscsi_softc *sc,
 		ISCSI_SESSION_UNLOCK(is);
 
 		request->idr_session_id = is->is_id;
+		memcpy(&request->idr_isid, &is->is_isid,
+		    sizeof(request->idr_isid));
+		request->idr_tsih = 0;	/* New or reinstated session. */
 		memcpy(&request->idr_conf, &is->is_conf,
 		    sizeof(request->idr_conf));
 
@@ -1276,7 +1317,7 @@ iscsi_ioctl_daemon_handoff(struct iscsi_softc *sc,
 
 	strlcpy(is->is_target_alias, handoff->idh_target_alias,
 	    sizeof(is->is_target_alias));
-	memcpy(is->is_isid, handoff->idh_isid, sizeof(is->is_isid));
+	is->is_tsih = handoff->idh_tsih;
 	is->is_statsn = handoff->idh_statsn;
 	is->is_initial_r2t = handoff->idh_initial_r2t;
 	is->is_immediate_data = handoff->idh_immediate_data;
@@ -1344,7 +1385,7 @@ iscsi_ioctl_daemon_handoff(struct iscsi_softc *sc,
 
 		is->is_sim = cam_sim_alloc(iscsi_action, iscsi_poll, "iscsi",
 		    is, is->is_id /* unit */, &is->is_lock,
-		    maxtags, maxtags, is->is_devq);
+		    1, maxtags, is->is_devq);
 		if (is->is_sim == NULL) {
 			ISCSI_SESSION_UNLOCK(is);
 			ISCSI_SESSION_WARN(is, "failed to allocate SIM");
@@ -1589,6 +1630,33 @@ iscsi_sanitize_session_conf(struct iscsi_session_conf *isc)
 	isc->isc_mutual_secret[ISCSI_SECRET_LEN - 1] = '\0';
 }
 
+static bool
+iscsi_valid_session_conf(const struct iscsi_session_conf *isc)
+{
+
+	if (isc->isc_initiator[0] == '\0') {
+		ISCSI_DEBUG("empty isc_initiator");
+		return (false);
+	}
+
+	if (isc->isc_target_addr[0] == '\0') {
+		ISCSI_DEBUG("empty isc_target_addr");
+		return (false);
+	}
+
+	if (isc->isc_discovery != 0 && isc->isc_target[0] != 0) {
+		ISCSI_DEBUG("non-empty isc_target for discovery session");
+		return (false);
+	}
+
+	if (isc->isc_discovery == 0 && isc->isc_target[0] == 0) {
+		ISCSI_DEBUG("empty isc_target for non-discovery session");
+		return (false);
+	}
+
+	return (true);
+}
+
 static int
 iscsi_ioctl_session_add(struct iscsi_softc *sc, struct iscsi_session_add *isa)
 {
@@ -1597,22 +1665,12 @@ iscsi_ioctl_session_add(struct iscsi_softc *sc, struct iscsi_session_add *isa)
 	int error;
 
 	iscsi_sanitize_session_conf(&isa->isa_conf);
+	if (iscsi_valid_session_conf(&isa->isa_conf) == false)
+		return (EINVAL);
 
 	is = malloc(sizeof(*is), M_ISCSI, M_ZERO | M_WAITOK);
 	memcpy(&is->is_conf, &isa->isa_conf, sizeof(is->is_conf));
 
-	if (is->is_conf.isc_initiator[0] == '\0' ||
-	    is->is_conf.isc_target_addr[0] == '\0') {
-		free(is, M_ISCSI);
-		return (EINVAL);
-	}
-
-	if ((is->is_conf.isc_discovery != 0 && is->is_conf.isc_target[0] != 0) ||
-	    (is->is_conf.isc_discovery == 0 && is->is_conf.isc_target[0] == 0)) {
-		free(is, M_ISCSI);
-		return (EINVAL);
-	}
-
 	sx_xlock(&sc->sc_lock);
 
 	/*
@@ -1652,6 +1710,9 @@ iscsi_ioctl_session_add(struct iscsi_softc *sc, struct iscsi_session_add *isa)
 	is->is_softc = sc;
 	sc->sc_last_session_id++;
 	is->is_id = sc->sc_last_session_id;
+	is->is_isid[0] = 0x80; /* RFC 3720, 10.12.5: 10b, "Random" ISID. */
+	arc4rand(&is->is_isid[1], 5, 0);
+	is->is_tsih = 0;
 	callout_init(&is->is_callout, 1);
 	callout_reset(&is->is_callout, 1 * hz, iscsi_callout, is);
 	TAILQ_INSERT_TAIL(&sc->sc_sessions, is, is_next);
@@ -1769,7 +1830,38 @@ iscsi_ioctl_session_list(struct iscsi_softc *sc, struct iscsi_session_list *isl)
 
 	return (0);
 }
-	
+
+static int
+iscsi_ioctl_session_modify(struct iscsi_softc *sc,
+    struct iscsi_session_modify *ism)
+{
+	struct iscsi_session *is;
+
+	iscsi_sanitize_session_conf(&ism->ism_conf);
+	if (iscsi_valid_session_conf(&ism->ism_conf) == false)
+		return (EINVAL);
+
+	sx_xlock(&sc->sc_lock);
+	TAILQ_FOREACH(is, &sc->sc_sessions, is_next) {
+		ISCSI_SESSION_LOCK(is);
+		if (is->is_id == ism->ism_session_id)
+			break;
+		ISCSI_SESSION_UNLOCK(is);
+	}
+	if (is == NULL) {
+		sx_xunlock(&sc->sc_lock);
+		return (ESRCH);
+	}
+	sx_xunlock(&sc->sc_lock);
+
+	memcpy(&is->is_conf, &ism->ism_conf, sizeof(is->is_conf));
+	ISCSI_SESSION_UNLOCK(is);
+
+	iscsi_session_reconnect(is);
+
+	return (0);
+}
+
 static int
 iscsi_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int mode,
     struct thread *td)
@@ -1808,6 +1900,9 @@ iscsi_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int mode,
 	case ISCSISLIST:
 		return (iscsi_ioctl_session_list(sc,
 		    (struct iscsi_session_list *)arg));
+	case ISCSISMODIFY:
+		return (iscsi_ioctl_session_modify(sc,
+		    (struct iscsi_session_modify *)arg));
 	default:
 		return (EINVAL);
 	}
@@ -1827,7 +1922,21 @@ iscsi_outstanding_find(struct iscsi_session *is, uint32_t initiator_task_tag)
 	return (NULL);
 }
 
-static int
+static struct iscsi_outstanding *
+iscsi_outstanding_find_ccb(struct iscsi_session *is, union ccb *ccb)
+{
+	struct iscsi_outstanding *io;
+
+	ISCSI_SESSION_LOCK_ASSERT(is);
+
+	TAILQ_FOREACH(io, &is->is_outstanding, io_next) {
+		if (io->io_ccb == ccb)
+			return (io);
+	}
+	return (NULL);
+}
+
+static struct iscsi_outstanding *
 iscsi_outstanding_add(struct iscsi_session *is,
     uint32_t initiator_task_tag, union ccb *ccb)
 {
@@ -1841,12 +1950,12 @@ iscsi_outstanding_add(struct iscsi_session *is,
 	io = uma_zalloc(iscsi_outstanding_zone, M_NOWAIT | M_ZERO);
 	if (io == NULL) {
 		ISCSI_SESSION_WARN(is, "failed to allocate %zd bytes", sizeof(*io));
-		return (ENOMEM);
+		return (NULL);
 	}
 	io->io_initiator_task_tag = initiator_task_tag;
 	io->io_ccb = ccb;
 	TAILQ_INSERT_TAIL(&is->is_outstanding, io, io_next);
-	return (0);
+	return (io);
 }
 
 static void
@@ -1859,12 +1968,67 @@ iscsi_outstanding_remove(struct iscsi_session *is, struct iscsi_outstanding *io)
 	uma_zfree(iscsi_outstanding_zone, io);
 }
 
+static void
+iscsi_action_abort(struct iscsi_session *is, union ccb *ccb)
+{
+	struct icl_pdu *request;
+	struct iscsi_bhs_task_management_request *bhstmr;
+	struct ccb_abort *cab = &ccb->cab;
+	struct iscsi_outstanding *io, *aio;
+
+	ISCSI_SESSION_LOCK_ASSERT(is);
+
+#if 0
+	KASSERT(is->is_login_phase == false, ("%s called during Login Phase", __func__));
+#else
+	if (is->is_login_phase) {
+		ccb->ccb_h.status = CAM_REQ_ABORTED;
+		xpt_done(ccb);
+		return;
+	}
+#endif
+
+	aio = iscsi_outstanding_find_ccb(is, cab->abort_ccb);
+	if (aio == NULL) {
+		ccb->ccb_h.status = CAM_REQ_CMP;
+		xpt_done(ccb);
+		return;
+	}
+
+	request = icl_pdu_new_bhs(is->is_conn, M_NOWAIT);
+	if (request == NULL) {
+		ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
+		xpt_done(ccb);
+		return;
+	}
+
+	bhstmr = (struct iscsi_bhs_task_management_request *)request->ip_bhs;
+	bhstmr->bhstmr_opcode = ISCSI_BHS_OPCODE_TASK_REQUEST;
+	bhstmr->bhstmr_function = 0x80 | BHSTMR_FUNCTION_ABORT_TASK;
+
+	bhstmr->bhstmr_lun = htobe64(CAM_EXTLUN_BYTE_SWIZZLE(ccb->ccb_h.target_lun));
+	bhstmr->bhstmr_initiator_task_tag = is->is_initiator_task_tag;
+	is->is_initiator_task_tag++;
+	bhstmr->bhstmr_referenced_task_tag = aio->io_initiator_task_tag;
+
+	io = iscsi_outstanding_add(is, bhstmr->bhstmr_initiator_task_tag, NULL);
+	if (io == NULL) {
+		icl_pdu_free(request);
+		ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
+		xpt_done(ccb);
+		return;
+	}
+	io->io_datasn = aio->io_initiator_task_tag;
+	iscsi_pdu_queue_locked(request);
+}
+
 static void
 iscsi_action_scsiio(struct iscsi_session *is, union ccb *ccb)
 {
 	struct icl_pdu *request;
 	struct iscsi_bhs_scsi_command *bhssc;
 	struct ccb_scsiio *csio;
+	struct iscsi_outstanding *io;
 	size_t len;
 	int error;
 
@@ -1909,23 +2073,24 @@ iscsi_action_scsiio(struct iscsi_session *is, union ccb *ccb)
 		break;
 	}
 
-        switch (csio->tag_action) {
-        case MSG_HEAD_OF_Q_TAG:
-		bhssc->bhssc_flags |= BHSSC_FLAGS_ATTR_HOQ;
-		break;
-                break;
-        case MSG_ORDERED_Q_TAG:
-		bhssc->bhssc_flags |= BHSSC_FLAGS_ATTR_ORDERED;
-                break;
-        case MSG_ACA_TASK:
-		bhssc->bhssc_flags |= BHSSC_FLAGS_ATTR_ACA;
-                break;
-        case CAM_TAG_ACTION_NONE:
-        case MSG_SIMPLE_Q_TAG:
-        default:
-		bhssc->bhssc_flags |= BHSSC_FLAGS_ATTR_SIMPLE;
-                break;
-        }
+	if ((ccb->ccb_h.flags & CAM_TAG_ACTION_VALID) != 0) {
+		switch (csio->tag_action) {
+		case MSG_HEAD_OF_Q_TAG:
+			bhssc->bhssc_flags |= BHSSC_FLAGS_ATTR_HOQ;
+			break;
+		case MSG_ORDERED_Q_TAG:
+			bhssc->bhssc_flags |= BHSSC_FLAGS_ATTR_ORDERED;
+			break;
+		case MSG_ACA_TASK:
+			bhssc->bhssc_flags |= BHSSC_FLAGS_ATTR_ACA;
+			break;
+		case MSG_SIMPLE_Q_TAG:
+		default:
+			bhssc->bhssc_flags |= BHSSC_FLAGS_ATTR_SIMPLE;
+			break;
+		}
+	} else
+		bhssc->bhssc_flags |= BHSSC_FLAGS_ATTR_UNTAGGED;
 
 	bhssc->bhssc_lun = htobe64(CAM_EXTLUN_BYTE_SWIZZLE(ccb->ccb_h.target_lun));
 	bhssc->bhssc_initiator_task_tag = is->is_initiator_task_tag;
@@ -1939,8 +2104,8 @@ iscsi_action_scsiio(struct iscsi_session *is, union ccb *ccb)
 	else
 		memcpy(&bhssc->bhssc_cdb, csio->cdb_io.cdb_bytes, csio->cdb_len);
 
-	error = iscsi_outstanding_add(is, bhssc->bhssc_initiator_task_tag, ccb);
-	if (error != 0) {
+	io = iscsi_outstanding_add(is, bhssc->bhssc_initiator_task_tag, ccb);
+	if (io == NULL) {
 		icl_pdu_free(request);
 		if ((ccb->ccb_h.status & CAM_DEV_QFRZN) == 0) {
 			xpt_freeze_devq(ccb->ccb_h.path, 1);
@@ -2018,6 +2183,23 @@ iscsi_action(struct cam_sim *sim, union ccb *ccb)
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		break;
 	}
+	case XPT_GET_TRAN_SETTINGS:
+	{
+		struct ccb_trans_settings	*cts;
+		struct ccb_trans_settings_scsi	*scsi;
+
+		cts = &ccb->cts;
+		scsi = &cts->proto_specific.scsi;
+
+		cts->protocol = PROTO_SCSI;
+		cts->protocol_version = SCSI_REV_SPC3;
+		cts->transport = XPORT_ISCSI;
+		cts->transport_version = 0;
+		scsi->valid = CTS_SCSI_VALID_TQ;
+		scsi->flags = CTS_SCSI_FLAGS_TAG_ENB;
+		cts->ccb_h.status = CAM_REQ_CMP;
+		break;
+	}
 	case XPT_CALC_GEOMETRY:
 		cam_calc_geometry(&ccb->ccg, /*extended*/1);
 		ccb->ccb_h.status = CAM_REQ_CMP;
@@ -2027,12 +2209,14 @@ iscsi_action(struct cam_sim *sim, union ccb *ccb)
 	 * XXX: What's the point?
 	 */
 	case XPT_RESET_BUS:
-	case XPT_ABORT:
 	case XPT_TERM_IO:
 		ISCSI_SESSION_DEBUG(is, "faking success for reset, abort, or term_io");
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 #endif
+	case XPT_ABORT:
+		iscsi_action_abort(is, ccb);
+		return;
 	case XPT_SCSI_IO:
 		iscsi_action_scsiio(is, ccb);
 		return;
diff --git a/sys/dev/iscsi/iscsi.h b/sys/dev/iscsi/iscsi.h
index e18f7f818c23..0fe1515c2b6d 100644
--- a/sys/dev/iscsi/iscsi.h
+++ b/sys/dev/iscsi/iscsi.h
@@ -64,6 +64,7 @@ struct iscsi_session {
 	size_t				is_max_burst_length;
 	size_t				is_first_burst_length;
 	uint8_t				is_isid[6];
+	uint16_t			is_tsih;
 	bool				is_immediate_data;
 	size_t				is_max_data_segment_length;
 	char				is_target_alias[ISCSI_ALIAS_LEN];
diff --git a/sys/dev/iscsi/iscsi_ioctl.h b/sys/dev/iscsi/iscsi_ioctl.h
index ace1ebdcc3ef..b7cb47d4f975 100644
--- a/sys/dev/iscsi/iscsi_ioctl.h
+++ b/sys/dev/iscsi/iscsi_ioctl.h
@@ -91,8 +91,8 @@ struct iscsi_session_state {
 struct iscsi_daemon_request {
 	unsigned int			idr_session_id;
 	struct iscsi_session_conf	idr_conf;
-	uint8_t				idr_spare_isid[6];
-	uint16_t			idr_spare_tsih;
+	uint8_t				idr_isid[6];
+	uint16_t			idr_tsih;
 	uint16_t			idr_spare_cid;
 	int				idr_spare[4];
 };
@@ -101,9 +101,9 @@ struct iscsi_daemon_handoff {
 	unsigned int			idh_session_id;
 	int				idh_socket;
 	char				idh_target_alias[ISCSI_ALIAS_LEN];
-	uint8_t				idh_isid[6];
-	uint16_t			idr_spare_tsih;
-	uint16_t			idr_spare_cid;
+	uint8_t				idh_spare_isid[6];
+	uint16_t			idh_tsih;
+	uint16_t			idh_spare_cid;
 	uint32_t			idh_statsn;
 	int				idh_header_digest;
 	int				idh_data_digest;
@@ -202,8 +202,15 @@ struct iscsi_session_list {
 	int				isl_spare[4];
 };
 
+struct iscsi_session_modify {
+	unsigned int			ism_session_id;
+	struct iscsi_session_conf	ism_conf;
+	int				ism_spare[4];
+};
+
 #define	ISCSISADD	_IOW('I', 0x11, struct iscsi_session_add)
 #define	ISCSISREMOVE	_IOW('I', 0x12, struct iscsi_session_remove)
 #define	ISCSISLIST	_IOWR('I', 0x13, struct iscsi_session_list)
+#define	ISCSISMODIFY	_IOWR('I', 0x14, struct iscsi_session_modify)
 
 #endif /* !ISCSI_IOCTL_H */
diff --git a/sys/dev/iscsi_initiator/isc_soc.c b/sys/dev/iscsi_initiator/isc_soc.c
index a08ecfad37a0..625e74b3b981 100644
--- a/sys/dev/iscsi_initiator/isc_soc.c
+++ b/sys/dev/iscsi_initiator/isc_soc.c
@@ -68,7 +68,7 @@ static int ou_refcnt = 0;
 /*
  | function for freeing external storage for mbuf
  */
-static int
+static void
 ext_free(struct mbuf *m, void *a, void *b)
 {
      pduq_t *pq = b;
@@ -78,7 +78,6 @@ ext_free(struct mbuf *m, void *a, void *b)
 	  free(pq->buf, M_ISCSIBUF);
 	  pq->buf = NULL;
      }
-     return (EXT_FREE_OK);
 }
 
 int
@@ -134,7 +133,7 @@ isc_sendPDU(isc_session_t *sp, pduq_t *pq)
 	       int l;
 
 	       MGET(md, M_WAITOK, MT_DATA);
-	       md->m_ext.ref_cnt = &ou_refcnt;
+	       md->m_ext.ext_cnt = &ou_refcnt;
 	       l = min(MCLBYTES, len);
 	       debug(4, "setting ext_free(arg=%p len/l=%d/%d)", pq->buf, len, l);
 	       MEXTADD(md, pp->ds_addr + off, l, ext_free, 
diff --git a/sys/dev/iscsi_initiator/iscsi.c b/sys/dev/iscsi_initiator/iscsi.c
index cd66a369fa74..049c1112d6c8 100644
--- a/sys/dev/iscsi_initiator/iscsi.c
+++ b/sys/dev/iscsi_initiator/iscsi.c
@@ -77,11 +77,11 @@ struct mtx iscsi_dbg_mtx;
 #endif
 
 static int max_sessions = MAX_SESSIONS;
-SYSCTL_INT(_net, OID_AUTO, iscsi_initiator_max_sessions, CTLFLAG_RDTUN, &max_sessions, MAX_SESSIONS,
-	   "Max sessions allowed");
+SYSCTL_INT(_net, OID_AUTO, iscsi_initiator_max_sessions, CTLFLAG_RDTUN,
+    &max_sessions, 0, "Max sessions allowed");
 static int max_pdus = MAX_PDUS;
-SYSCTL_INT(_net, OID_AUTO, iscsi_initiator_max_pdus, CTLFLAG_RDTUN, &max_pdus, MAX_PDUS,
-	   "Max pdu pool");
+SYSCTL_INT(_net, OID_AUTO, iscsi_initiator_max_pdus, CTLFLAG_RDTUN,
+    &max_pdus, 0, "Max PDU pool");
 
 static char isid[6+1] = {
      0x80,
@@ -711,9 +711,6 @@ iscsi_start(void)
 {
      debug_called(8);
 
-     TUNABLE_INT_FETCH("net.iscsi_initiator.max_sessions", &max_sessions);
-     TUNABLE_INT_FETCH("net.iscsi_initiator.max_pdus", &max_pdus);
-
      isc =  malloc(sizeof(struct isc_softc), M_ISCSI, M_ZERO|M_WAITOK);
      mtx_init(&isc->isc_mtx, "iscsi-isc", NULL, MTX_DEF);
 
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index 605c688f0530..06b4d7ef42b6 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -5107,7 +5107,7 @@ isp_action(struct cam_sim *sim, union ccb *ccb)
 			break;
 #endif
 		case XPT_SCSI_IO:
-			error = isp_control(isp, ISPCTL_ABORT_CMD, ccb);
+			error = isp_control(isp, ISPCTL_ABORT_CMD, accb);
 			if (error) {
 				ccb->ccb_h.status = CAM_UA_ABORT;
 			} else {
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 86c5a1db75b2..2c6ee89892e5 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -1741,6 +1741,7 @@ isp_pci_mbxdma(ispsoftc_t *isp)
 bad:
 	while (--cmap >= 0) {
 		struct isp_fc *fc = ISP_FC_PC(isp, cmap);
+		bus_dmamap_unload(fc->tdmat, fc->tdmap);
 		bus_dmamem_free(fc->tdmat, base, fc->tdmap);
 		bus_dma_tag_destroy(fc->tdmat);
 		while (fc->nexus_free_list) {
@@ -1749,6 +1750,8 @@ isp_pci_mbxdma(ispsoftc_t *isp)
 			free(n, M_DEVBUF);
 		}
 	}
+	if (isp->isp_rquest_dma != 0)
+		bus_dmamap_unload(isp->isp_osinfo.cdmat, isp->isp_osinfo.cdmap);
 	bus_dmamem_free(isp->isp_osinfo.cdmat, base, isp->isp_osinfo.cdmap);
 	bus_dma_tag_destroy(isp->isp_osinfo.cdmat);
 	free(isp->isp_xflist, M_DEVBUF);
diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c
index cba8d0d32ae0..1b4c96a2efe0 100644
--- a/sys/dev/iwn/if_iwn.c
+++ b/sys/dev/iwn/if_iwn.c
@@ -1733,16 +1733,12 @@ fail:	iwn_dma_contig_free(dma);
 static void
 iwn_dma_contig_free(struct iwn_dma_info *dma)
 {
-	if (dma->map != NULL) {
-		if (dma->vaddr != NULL) {
-			bus_dmamap_sync(dma->tag, dma->map,
-			    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
-			bus_dmamap_unload(dma->tag, dma->map);
-			bus_dmamem_free(dma->tag, dma->vaddr, dma->map);
-			dma->vaddr = NULL;
-		}
-		bus_dmamap_destroy(dma->tag, dma->map);
-		dma->map = NULL;
+	if (dma->vaddr != NULL) {
+		bus_dmamap_sync(dma->tag, dma->map,
+		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+		bus_dmamap_unload(dma->tag, dma->map);
+		bus_dmamem_free(dma->tag, dma->vaddr, dma->map);
+		dma->vaddr = NULL;
 	}
 	if (dma->tag != NULL) {
 		bus_dma_tag_destroy(dma->tag);
@@ -8469,9 +8465,10 @@ iwn_panicked(void *arg0, int pending)
 	device_printf(sc->sc_dev, "%s: controller panicked, iv_state = %d; "
 	    "resetting...\n", __func__, vap->iv_state);
 
-	iwn_stop(sc);
-	iwn_init(sc);
-	iwn_start(sc->sc_ifp);
+	IWN_LOCK(sc);
+
+	iwn_stop_locked(sc);
+	iwn_init_locked(sc);
 	if (vap->iv_state >= IEEE80211_S_AUTH &&
 	    (error = iwn_auth(sc, vap)) != 0) {
 		device_printf(sc->sc_dev,
@@ -8482,6 +8479,11 @@ iwn_panicked(void *arg0, int pending)
 		device_printf(sc->sc_dev,
 		    "%s: could not move to run state\n", __func__);
 	}
+
+	/* Only run start once the NIC is in a useful state, like associated */
+	iwn_start_locked(sc->sc_ifp);
+
+	IWN_UNLOCK(sc);
 }
 
 static void
diff --git a/sys/dev/iwn/if_iwn_chip_cfg.h b/sys/dev/iwn/if_iwn_chip_cfg.h
index 67eba898a193..ea6f3e12e400 100644
--- a/sys/dev/iwn/if_iwn_chip_cfg.h
+++ b/sys/dev/iwn/if_iwn_chip_cfg.h
@@ -116,7 +116,7 @@ struct iwn_base_params {
 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_ram_support = false,	/* shadow_ram_support */
 	.shadow_reg_enable = false,	/* shadow_reg_enable */
 	.bt_session_2 = false,	/* bt_session_2 */
 	.bt_sco_disable = true,	/* bt_sco_disable */
diff --git a/sys/dev/ixgb/if_ixgb.c b/sys/dev/ixgb/if_ixgb.c
index 2e62c1c1572b..f01e673e0e53 100644
--- a/sys/dev/ixgb/if_ixgb.c
+++ b/sys/dev/ixgb/if_ixgb.c
@@ -1459,7 +1459,6 @@ ixgb_dma_malloc(struct adapter * adapter, bus_size_t size,
 fail_1:
 	bus_dma_tag_destroy(dma->dma_tag);
 fail_0:
-	dma->dma_map = NULL;
 	dma->dma_tag = NULL;
 	return (r);
 }
diff --git a/sys/dev/ixgbe/ixgbe.c b/sys/dev/ixgbe/ixgbe.c
index 774827cfd63c..b2bbcb0dc440 100644
--- a/sys/dev/ixgbe/ixgbe.c
+++ b/sys/dev/ixgbe/ixgbe.c
@@ -35,8 +35,13 @@
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
+#include "opt_rss.h"
 #include "ixgbe.h"
 
+#ifdef	RSS
+#include <netinet/in_rss.h>
+#endif
+
 /*********************************************************************
  *  Set this to one to display debug statistics
  *********************************************************************/
@@ -244,18 +249,15 @@ static SYSCTL_NODE(_hw, OID_AUTO, ix, CTLFLAG_RD, 0,
 ** traffic for that interrupt vector
 */
 static int ixgbe_enable_aim = TRUE;
-TUNABLE_INT("hw.ixgbe.enable_aim", &ixgbe_enable_aim);
-SYSCTL_INT(_hw_ix, OID_AUTO, enable_aim, CTLFLAG_RW, &ixgbe_enable_aim, 0,
+SYSCTL_INT(_hw_ix, OID_AUTO, enable_aim, CTLFLAG_RWTUN, &ixgbe_enable_aim, 0,
     "Enable adaptive interrupt moderation");
 
 static int ixgbe_max_interrupt_rate = (4000000 / IXGBE_LOW_LATENCY);
-TUNABLE_INT("hw.ixgbe.max_interrupt_rate", &ixgbe_max_interrupt_rate);
 SYSCTL_INT(_hw_ix, OID_AUTO, max_interrupt_rate, CTLFLAG_RDTUN,
     &ixgbe_max_interrupt_rate, 0, "Maximum interrupts per second");
 
 /* How many packets rxeof tries to clean at a time */
 static int ixgbe_rx_process_limit = 256;
-TUNABLE_INT("hw.ixgbe.rx_process_limit", &ixgbe_rx_process_limit);
 SYSCTL_INT(_hw_ix, OID_AUTO, rx_process_limit, CTLFLAG_RDTUN,
     &ixgbe_rx_process_limit, 0,
     "Maximum number of received packets to process at a time,"
@@ -263,7 +265,6 @@ SYSCTL_INT(_hw_ix, OID_AUTO, rx_process_limit, CTLFLAG_RDTUN,
 
 /* How many packets txeof tries to clean at a time */
 static int ixgbe_tx_process_limit = 256;
-TUNABLE_INT("hw.ixgbe.tx_process_limit", &ixgbe_tx_process_limit);
 SYSCTL_INT(_hw_ix, OID_AUTO, tx_process_limit, CTLFLAG_RDTUN,
     &ixgbe_tx_process_limit, 0,
     "Maximum number of sent packets to process at a time,"
@@ -283,7 +284,6 @@ static int ixgbe_smart_speed = ixgbe_smart_speed_on;
  * but this allows it to be forced off for testing.
  */
 static int ixgbe_enable_msix = 1;
-TUNABLE_INT("hw.ixgbe.enable_msix", &ixgbe_enable_msix);
 SYSCTL_INT(_hw_ix, OID_AUTO, enable_msix, CTLFLAG_RDTUN, &ixgbe_enable_msix, 0,
     "Enable MSI-X interrupts");
 
@@ -294,7 +294,6 @@ SYSCTL_INT(_hw_ix, OID_AUTO, enable_msix, CTLFLAG_RDTUN, &ixgbe_enable_msix, 0,
  * can be overriden manually here.
  */
 static int ixgbe_num_queues = 0;
-TUNABLE_INT("hw.ixgbe.num_queues", &ixgbe_num_queues);
 SYSCTL_INT(_hw_ix, OID_AUTO, num_queues, CTLFLAG_RDTUN, &ixgbe_num_queues, 0,
     "Number of queues to configure, 0 indicates autoconfigure");
 
@@ -304,13 +303,11 @@ SYSCTL_INT(_hw_ix, OID_AUTO, num_queues, CTLFLAG_RDTUN, &ixgbe_num_queues, 0,
 ** the better performing choice.
 */
 static int ixgbe_txd = PERFORM_TXD;
-TUNABLE_INT("hw.ixgbe.txd", &ixgbe_txd);
 SYSCTL_INT(_hw_ix, OID_AUTO, txd, CTLFLAG_RDTUN, &ixgbe_txd, 0,
-    "Number of receive descriptors per queue");
+    "Number of transmit descriptors per queue");
 
 /* Number of RX descriptors per ring */
 static int ixgbe_rxd = PERFORM_RXD;
-TUNABLE_INT("hw.ixgbe.rxd", &ixgbe_rxd);
 SYSCTL_INT(_hw_ix, OID_AUTO, rxd, CTLFLAG_RDTUN, &ixgbe_rxd, 0,
     "Number of receive descriptors per queue");
 
@@ -817,12 +814,33 @@ ixgbe_mq_start(struct ifnet *ifp, struct mbuf *m)
 	struct ix_queue	*que;
 	struct tx_ring	*txr;
 	int 		i, err = 0;
+#ifdef	RSS
+	uint32_t bucket_id;
+#endif
 
 	/* Which queue to use */
-	if ((m->m_flags & M_FLOWID) != 0)
-		i = m->m_pkthdr.flowid % adapter->num_queues;
-	else
+	/*
+	 * When doing RSS, map it to the same outbound queue
+	 * as the incoming flow would be mapped to.
+	 *
+	 * If everything is setup correctly, it should be the
+	 * same bucket that the current CPU we're on is.
+	 */
+	if ((m->m_flags & M_FLOWID) != 0) {
+#ifdef	RSS
+		if (rss_hash2bucket(m->m_pkthdr.flowid,
+		    M_HASHTYPE_GET(m), &bucket_id) == 0) {
+			/* XXX TODO: spit out something if bucket_id > num_queues? */
+			i = bucket_id % adapter->num_queues;
+		} else {
+#endif
+			i = m->m_pkthdr.flowid % adapter->num_queues;
+#ifdef	RSS
+		}
+#endif
+	} else {
 		i = curcpu % adapter->num_queues;
+	}
 
 	txr = &adapter->tx_rings[i];
 	que = &adapter->queues[i];
@@ -2346,6 +2364,31 @@ ixgbe_allocate_msix(struct adapter *adapter)
 	struct 		ix_queue *que = adapter->queues;
 	struct  	tx_ring *txr = adapter->tx_rings;
 	int 		error, rid, vector = 0;
+	int		cpu_id = 0;
+
+#ifdef	RSS
+	/*
+	 * If we're doing RSS, the number of queues needs to
+	 * match the number of RSS buckets that are configured.
+	 *
+	 * + If there's more queues than RSS buckets, we'll end
+	 *   up with queues that get no traffic.
+	 *
+	 * + If there's more RSS buckets than queues, we'll end
+	 *   up having multiple RSS buckets map to the same queue,
+	 *   so there'll be some contention.
+	 */
+	if (adapter->num_queues != rss_getnumbuckets()) {
+		device_printf(dev,
+		    "%s: number of queues (%d) != number of RSS buckets (%d)"
+		    "; performance will be impacted.\n",
+		    __func__,
+		    adapter->num_queues,
+		    rss_getnumbuckets());
+	}
+#endif
+
+
 
 	for (int i = 0; i < adapter->num_queues; i++, vector++, que++, txr++) {
 		rid = vector + 1;
@@ -2370,12 +2413,37 @@ ixgbe_allocate_msix(struct adapter *adapter)
 #endif
 		que->msix = vector;
         	adapter->que_mask |= (u64)(1 << que->msix);
+#ifdef	RSS
 		/*
-		** Bind the msix vector, and thus the
-		** ring to the corresponding cpu.
-		*/
+		 * The queue ID is used as the RSS layer bucket ID.
+		 * We look up the queue ID -> RSS CPU ID and select
+		 * that.
+		 */
+		cpu_id = rss_getcpu(i % rss_getnumbuckets());
+#else
+		/*
+		 * Bind the msix vector, and thus the
+		 * rings to the corresponding cpu.
+		 *
+		 * This just happens to match the default RSS round-robin
+		 * bucket -> queue -> CPU allocation.
+		 */
 		if (adapter->num_queues > 1)
-			bus_bind_intr(dev, que->res, i);
+			cpu_id = i;
+#endif
+		if (adapter->num_queues > 1)
+			bus_bind_intr(dev, que->res, cpu_id);
+
+#ifdef	RSS
+		device_printf(dev,
+		    "Bound RSS bucket %d to CPU %d\n",
+		    i, cpu_id);
+#else
+		device_printf(dev,
+		    "Bound queue %d to cpu %d\n",
+		    i, cpu_id);
+#endif
+
 
 #ifndef IXGBE_LEGACY_TX
 		TASK_INIT(&txr->txq_task, 0, ixgbe_deferred_mq_start, txr);
@@ -2383,8 +2451,16 @@ ixgbe_allocate_msix(struct adapter *adapter)
 		TASK_INIT(&que->que_task, 0, ixgbe_handle_que, que);
 		que->tq = taskqueue_create_fast("ixgbe_que", M_NOWAIT,
 		    taskqueue_thread_enqueue, &que->tq);
+#ifdef	RSS
+		taskqueue_start_threads_pinned(&que->tq, 1, PI_NET,
+		    cpu_id,
+		    "%s (bucket %d)",
+		    device_get_nameunit(adapter->dev),
+		    cpu_id);
+#else
 		taskqueue_start_threads(&que->tq, 1, PI_NET, "%s que",
 		    device_get_nameunit(adapter->dev));
+#endif
 	}
 
 	/* and Link */
@@ -2458,6 +2534,11 @@ ixgbe_setup_msix(struct adapter *adapter)
 
 	/* Figure out a reasonable auto config value */
 	queues = (mp_ncpus > (msgs-1)) ? (msgs-1) : mp_ncpus;
+#ifdef	RSS
+	/* If we're doing RSS, clamp at the number of RSS buckets */
+	if (queues > rss_getnumbuckets())
+		queues = rss_getnumbuckets();
+#endif
 
 	if (ixgbe_num_queues != 0)
 		queues = ixgbe_num_queues;
@@ -2788,7 +2869,6 @@ ixgbe_dma_malloc(struct adapter *adapter, bus_size_t size,
 fail_1:
 	bus_dma_tag_destroy(dma->dma_tag);
 fail_0:
-	dma->dma_map = NULL;
 	dma->dma_tag = NULL;
 	return (r);
 }
@@ -4116,6 +4196,111 @@ ixgbe_setup_receive_structures(struct adapter *adapter)
 	return (ENOBUFS);
 }
 
+static void
+ixgbe_initialise_rss_mapping(struct adapter *adapter)
+{
+	struct ixgbe_hw	*hw = &adapter->hw;
+	uint32_t reta;
+	int i, j, queue_id;
+	uint32_t rss_key[10];
+	uint32_t mrqc;
+#ifdef	RSS
+	uint32_t rss_hash_config;
+#endif
+
+	/* Setup RSS */
+	reta = 0;
+
+#ifdef	RSS
+	/* Fetch the configured RSS key */
+	rss_getkey((uint8_t *) &rss_key);
+#else
+	/* set up random bits */
+	arc4rand(&rss_key, sizeof(rss_key), 0);
+#endif
+
+	/* Set up the redirection table */
+	for (i = 0, j = 0; i < 128; i++, j++) {
+		if (j == adapter->num_queues) j = 0;
+#ifdef	RSS
+		/*
+		 * Fetch the RSS bucket id for the given indirection entry.
+		 * Cap it at the number of configured buckets (which is
+		 * num_queues.)
+		 */
+		queue_id = rss_get_indirection_to_bucket(i);
+		queue_id = queue_id % adapter->num_queues;
+#else
+		queue_id = (j * 0x11);
+#endif
+		/*
+		 * The low 8 bits are for hash value (n+0);
+		 * The next 8 bits are for hash value (n+1), etc.
+		 */
+		reta = reta >> 8;
+		reta = reta | ( ((uint32_t) queue_id) << 24);
+		if ((i & 3) == 3) {
+			IXGBE_WRITE_REG(hw, IXGBE_RETA(i >> 2), reta);
+			reta = 0;
+		}
+	}
+
+	/* Now fill our hash function seeds */
+	for (int i = 0; i < 10; i++)
+		IXGBE_WRITE_REG(hw, IXGBE_RSSRK(i), rss_key[i]);
+
+	/* Perform hash on these packet types */
+#ifdef	RSS
+	mrqc = IXGBE_MRQC_RSSEN;
+	rss_hash_config = rss_gethashconfig();
+	if (rss_hash_config & RSS_HASHTYPE_RSS_IPV4)
+		mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4;
+	if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV4)
+		mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4_TCP;
+	if (rss_hash_config & RSS_HASHTYPE_RSS_IPV6)
+		mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6;
+	if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV6)
+		mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_TCP;
+	if (rss_hash_config & RSS_HASHTYPE_RSS_IPV6_EX)
+		mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX;
+	if (rss_hash_config & RSS_HASHTYPE_RSS_TCP_IPV6_EX)
+		mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_TCP;
+	if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4)
+		mrqc |= IXGBE_MRQC_RSS_FIELD_IPV4_UDP;
+	if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV4_EX)
+		device_printf(adapter->dev,
+		    "%s: RSS_HASHTYPE_RSS_UDP_IPV4_EX defined, "
+		    "but not supported\n", __func__);
+	if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6)
+		mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_UDP;
+	if (rss_hash_config & RSS_HASHTYPE_RSS_UDP_IPV6_EX)
+		mrqc |= IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP;
+#else
+	/*
+	 * Disable UDP - IP fragments aren't currently being handled
+	 * and so we end up with a mix of 2-tuple and 4-tuple
+	 * traffic.
+	 */
+	mrqc = IXGBE_MRQC_RSSEN
+	     | IXGBE_MRQC_RSS_FIELD_IPV4
+	     | IXGBE_MRQC_RSS_FIELD_IPV4_TCP
+#if 0
+	     | IXGBE_MRQC_RSS_FIELD_IPV4_UDP
+#endif
+	     | IXGBE_MRQC_RSS_FIELD_IPV6_EX_TCP
+	     | IXGBE_MRQC_RSS_FIELD_IPV6_EX
+	     | IXGBE_MRQC_RSS_FIELD_IPV6
+	     | IXGBE_MRQC_RSS_FIELD_IPV6_TCP
+#if 0
+	     | IXGBE_MRQC_RSS_FIELD_IPV6_UDP
+	     | IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP
+#endif
+	;
+#endif /* RSS */
+	IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc);
+}
+
+
 /*********************************************************************
  *
  *  Setup receive registers and features.
@@ -4132,7 +4317,7 @@ ixgbe_initialize_receive_units(struct adapter *adapter)
 	struct ixgbe_hw	*hw = &adapter->hw;
 	struct ifnet   *ifp = adapter->ifp;
 	u32		bufsz, rxctrl, fctrl, srrctl, rxcsum;
-	u32		reta, mrqc = 0, hlreg, random[10];
+	u32		hlreg;
 
 
 	/*
@@ -4204,39 +4389,9 @@ ixgbe_initialize_receive_units(struct adapter *adapter)
 
 	rxcsum = IXGBE_READ_REG(hw, IXGBE_RXCSUM);
 
-	/* Setup RSS */
+	ixgbe_initialise_rss_mapping(adapter);
+
 	if (adapter->num_queues > 1) {
-		int i, j;
-		reta = 0;
-
-		/* set up random bits */
-		arc4rand(&random, sizeof(random), 0);
-
-		/* Set up the redirection table */
-		for (i = 0, j = 0; i < 128; i++, j++) {
-			if (j == adapter->num_queues) j = 0;
-			reta = (reta << 8) | (j * 0x11);
-			if ((i & 3) == 3)
-				IXGBE_WRITE_REG(hw, IXGBE_RETA(i >> 2), reta);
-		}
-
-		/* Now fill our hash function seeds */
-		for (int i = 0; i < 10; i++)
-			IXGBE_WRITE_REG(hw, IXGBE_RSSRK(i), random[i]);
-
-		/* Perform hash on these packet types */
-		mrqc = IXGBE_MRQC_RSSEN
-		     | IXGBE_MRQC_RSS_FIELD_IPV4
-		     | IXGBE_MRQC_RSS_FIELD_IPV4_TCP
-		     | IXGBE_MRQC_RSS_FIELD_IPV4_UDP
-		     | IXGBE_MRQC_RSS_FIELD_IPV6_EX_TCP
-		     | IXGBE_MRQC_RSS_FIELD_IPV6_EX
-		     | IXGBE_MRQC_RSS_FIELD_IPV6
-		     | IXGBE_MRQC_RSS_FIELD_IPV6_TCP
-		     | IXGBE_MRQC_RSS_FIELD_IPV6_UDP
-		     | IXGBE_MRQC_RSS_FIELD_IPV6_EX_UDP;
-		IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc);
-
 		/* RSS and RX IPP Checksum are mutually exclusive */
 		rxcsum |= IXGBE_RXCSUM_PCSD;
 	}
@@ -4409,6 +4564,7 @@ ixgbe_rxeof(struct ix_queue *que)
 	u16			count = rxr->process_limit;
 	union ixgbe_adv_rx_desc	*cur;
 	struct ixgbe_rx_buf	*rbuf, *nbuf;
+	u16			pkt_info;
 
 	IXGBE_RX_LOCK(rxr);
 
@@ -4433,6 +4589,7 @@ ixgbe_rxeof(struct ix_queue *que)
 
 		cur = &rxr->rx_base[i];
 		staterr = le32toh(cur->wb.upper.status_error);
+		pkt_info = le16toh(cur->wb.lower.lo_dword.hs_rss.pkt_info);
 
 		if ((staterr & IXGBE_RXD_STAT_DD) == 0)
 			break;
@@ -4565,9 +4722,47 @@ ixgbe_rxeof(struct ix_queue *que)
 			if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
 				ixgbe_rx_checksum(staterr, sendmp, ptype);
 #if __FreeBSD_version >= 800000
+#ifdef RSS
+			sendmp->m_pkthdr.flowid =
+			    le32toh(cur->wb.lower.hi_dword.rss);
+			sendmp->m_flags |= M_FLOWID;
+			switch (pkt_info & IXGBE_RXDADV_RSSTYPE_MASK) {
+			case IXGBE_RXDADV_RSSTYPE_IPV4_TCP:
+				M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_TCP_IPV4);
+				break;
+			case IXGBE_RXDADV_RSSTYPE_IPV4:
+				M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_IPV4);
+				break;
+			case IXGBE_RXDADV_RSSTYPE_IPV6_TCP:
+				M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_TCP_IPV6);
+				break;
+			case IXGBE_RXDADV_RSSTYPE_IPV6_EX:
+				M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_IPV6_EX);
+				break;
+			case IXGBE_RXDADV_RSSTYPE_IPV6:
+				M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_IPV6);
+				break;
+			case IXGBE_RXDADV_RSSTYPE_IPV6_TCP_EX:
+				M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_TCP_IPV6_EX);
+				break;
+			case IXGBE_RXDADV_RSSTYPE_IPV4_UDP:
+				M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_UDP_IPV4);
+				break;
+			case IXGBE_RXDADV_RSSTYPE_IPV6_UDP:
+				M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_UDP_IPV6);
+				break;
+			case IXGBE_RXDADV_RSSTYPE_IPV6_UDP_EX:
+				M_HASHTYPE_SET(sendmp, M_HASHTYPE_RSS_UDP_IPV6_EX);
+				break;
+			default:
+				/* XXX fallthrough */
+				M_HASHTYPE_SET(sendmp, M_HASHTYPE_NONE);
+			}
+#else /* RSS */
 			sendmp->m_pkthdr.flowid = que->msix;
 			sendmp->m_flags |= M_FLOWID;
-#endif
+#endif /* RSS */
+#endif /* FreeBSD_version */
 		}
 next_desc:
 		bus_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map,
diff --git a/sys/dev/ixgbe/ixv.c b/sys/dev/ixgbe/ixv.c
index a471da910746..e7446c213fe9 100644
--- a/sys/dev/ixgbe/ixv.c
+++ b/sys/dev/ixgbe/ixv.c
@@ -1955,7 +1955,6 @@ ixv_dma_malloc(struct adapter *adapter, bus_size_t size,
 fail_1:
 	bus_dma_tag_destroy(dma->dma_tag);
 fail_0:
-	dma->dma_map = NULL;
 	dma->dma_tag = NULL;
 	return (r);
 }
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 7f03e8baffcf..94f326f8de2a 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -123,7 +123,7 @@ static int lge_detach(device_t);
 static int lge_alloc_jumbo_mem(struct lge_softc *);
 static void lge_free_jumbo_mem(struct lge_softc *);
 static void *lge_jalloc(struct lge_softc *);
-static int lge_jfree(struct mbuf *, void *, void *);
+static void lge_jfree(struct mbuf *, void *, void *);
 
 static int lge_newbuf(struct lge_softc *, struct lge_rx_desc *, struct mbuf *);
 static int lge_encap(struct lge_softc *, struct mbuf *, u_int32_t *);
@@ -847,7 +847,7 @@ lge_jalloc(sc)
 /*
  * Release a jumbo buffer.
  */
-static int
+static void
 lge_jfree(struct mbuf *m, void *buf, void *args)
 {
 	struct lge_softc	*sc;
@@ -873,8 +873,6 @@ lge_jfree(struct mbuf *m, void *buf, void *args)
 	entry->slot = i;
 	SLIST_REMOVE_HEAD(&sc->lge_jinuse_listhead, jpool_entries);
 	SLIST_INSERT_HEAD(&sc->lge_jfree_listhead, entry, jpool_entries);
-
-	return (EXT_FREE_OK);
 }
 
 /*
diff --git a/sys/dev/malo/if_malo.c b/sys/dev/malo/if_malo.c
index db8f61d7437b..1e879ba9459f 100644
--- a/sys/dev/malo/if_malo.c
+++ b/sys/dev/malo/if_malo.c
@@ -65,27 +65,22 @@ SYSCTL_NODE(_hw, OID_AUTO, malo, CTLFLAG_RD, 0,
     "Marvell 88w8335 driver parameters");
 
 static	int malo_txcoalesce = 8;	/* # tx pkts to q before poking f/w*/
-SYSCTL_INT(_hw_malo, OID_AUTO, txcoalesce, CTLFLAG_RW, &malo_txcoalesce,
+SYSCTL_INT(_hw_malo, OID_AUTO, txcoalesce, CTLFLAG_RWTUN, &malo_txcoalesce,
 	    0, "tx buffers to send at once");
-TUNABLE_INT("hw.malo.txcoalesce", &malo_txcoalesce);
 static	int malo_rxbuf = MALO_RXBUF;		/* # rx buffers to allocate */
-SYSCTL_INT(_hw_malo, OID_AUTO, rxbuf, CTLFLAG_RW, &malo_rxbuf,
+SYSCTL_INT(_hw_malo, OID_AUTO, rxbuf, CTLFLAG_RWTUN, &malo_rxbuf,
 	    0, "rx buffers allocated");
-TUNABLE_INT("hw.malo.rxbuf", &malo_rxbuf);
 static	int malo_rxquota = MALO_RXBUF;		/* # max buffers to process */
-SYSCTL_INT(_hw_malo, OID_AUTO, rxquota, CTLFLAG_RW, &malo_rxquota,
+SYSCTL_INT(_hw_malo, OID_AUTO, rxquota, CTLFLAG_RWTUN, &malo_rxquota,
 	    0, "max rx buffers to process per interrupt");
-TUNABLE_INT("hw.malo.rxquota", &malo_rxquota);
 static	int malo_txbuf = MALO_TXBUF;		/* # tx buffers to allocate */
-SYSCTL_INT(_hw_malo, OID_AUTO, txbuf, CTLFLAG_RW, &malo_txbuf,
+SYSCTL_INT(_hw_malo, OID_AUTO, txbuf, CTLFLAG_RWTUN, &malo_txbuf,
 	    0, "tx buffers allocated");
-TUNABLE_INT("hw.malo.txbuf", &malo_txbuf);
 
 #ifdef MALO_DEBUG
 static	int malo_debug = 0;
-SYSCTL_INT(_hw_malo, OID_AUTO, debug, CTLFLAG_RW, &malo_debug,
+SYSCTL_INT(_hw_malo, OID_AUTO, debug, CTLFLAG_RWTUN, &malo_debug,
 	    0, "control debugging printfs");
-TUNABLE_INT("hw.malo.debug", &malo_debug);
 enum {
 	MALO_DEBUG_XMIT		= 0x00000001,	/* basic xmit operation */
 	MALO_DEBUG_XMIT_DESC	= 0x00000002,	/* xmit descriptors */
diff --git a/sys/dev/malo/if_malo_pci.c b/sys/dev/malo/if_malo_pci.c
index 71ba3c0543c5..c9e6b2070380 100644
--- a/sys/dev/malo/if_malo_pci.c
+++ b/sys/dev/malo/if_malo_pci.c
@@ -86,9 +86,8 @@ static SYSCTL_NODE(_hw_malo, OID_AUTO, pci, CTLFLAG_RD, 0,
     "Marvell 88W8335 driver PCI parameters");
 
 static int msi_disable = 0;				/* MSI disabled  */
-SYSCTL_INT(_hw_malo_pci, OID_AUTO, msi_disable, CTLFLAG_RW, &msi_disable,
+SYSCTL_INT(_hw_malo_pci, OID_AUTO, msi_disable, CTLFLAG_RWTUN, &msi_disable,
 	    0, "MSI disabled");
-TUNABLE_INT("hw.malo.pci.msi_disable", &msi_disable);
 
 /*
  * Devices supported by this driver.
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index 367a6a23f1ec..a82d81d1142e 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -895,8 +895,10 @@ mdstart_swap(struct md_s *sc, struct bio *bp)
 		else
 			vm_page_activate(m);
 		vm_page_unlock(m);
-		if (bp->bio_cmd == BIO_WRITE)
+		if (bp->bio_cmd == BIO_WRITE) {
 			vm_page_dirty(m);
+			vm_pager_page_unswapped(m);
+		}
 
 		/* Actions on further pages start at offset 0 */
 		p += PAGE_SIZE - offs;
diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c
index 1a618ce0b176..5ec813eafaee 100644
--- a/sys/dev/mfi/mfi.c
+++ b/sys/dev/mfi/mfi.c
@@ -132,33 +132,27 @@ static int mfi_check_for_sscd(struct mfi_softc *sc, struct mfi_command *cm);
 
 SYSCTL_NODE(_hw, OID_AUTO, mfi, CTLFLAG_RD, 0, "MFI driver parameters");
 static int	mfi_event_locale = MFI_EVT_LOCALE_ALL;
-TUNABLE_INT("hw.mfi.event_locale", &mfi_event_locale);
 SYSCTL_INT(_hw_mfi, OID_AUTO, event_locale, CTLFLAG_RWTUN, &mfi_event_locale,
            0, "event message locale");
 
 static int	mfi_event_class = MFI_EVT_CLASS_INFO;
-TUNABLE_INT("hw.mfi.event_class", &mfi_event_class);
 SYSCTL_INT(_hw_mfi, OID_AUTO, event_class, CTLFLAG_RWTUN, &mfi_event_class,
            0, "event message class");
 
 static int	mfi_max_cmds = 128;
-TUNABLE_INT("hw.mfi.max_cmds", &mfi_max_cmds);
 SYSCTL_INT(_hw_mfi, OID_AUTO, max_cmds, CTLFLAG_RDTUN, &mfi_max_cmds,
 	   0, "Max commands limit (-1 = controller limit)");
 
 static int	mfi_detect_jbod_change = 1;
-TUNABLE_INT("hw.mfi.detect_jbod_change", &mfi_detect_jbod_change);
 SYSCTL_INT(_hw_mfi, OID_AUTO, detect_jbod_change, CTLFLAG_RWTUN,
 	   &mfi_detect_jbod_change, 0, "Detect a change to a JBOD");
 
 int		mfi_polled_cmd_timeout = MFI_POLL_TIMEOUT_SECS;
-TUNABLE_INT("hw.mfi.polled_cmd_timeout", &mfi_polled_cmd_timeout);
 SYSCTL_INT(_hw_mfi, OID_AUTO, polled_cmd_timeout, CTLFLAG_RWTUN,
 	   &mfi_polled_cmd_timeout, 0,
 	   "Polled command timeout - used for firmware flash etc (in seconds)");
 
 static int	mfi_cmd_timeout = MFI_CMD_TIMEOUT;
-TUNABLE_INT("hw.mfi.cmd_timeout", &mfi_cmd_timeout);
 SYSCTL_INT(_hw_mfi, OID_AUTO, cmd_timeout, CTLFLAG_RWTUN, &mfi_cmd_timeout,
 	   0, "Command timeout (in seconds)");
 
diff --git a/sys/dev/mfi/mfi_cam.c b/sys/dev/mfi/mfi_cam.c
index 4fd6198a8a85..87f854c3f33e 100644
--- a/sys/dev/mfi/mfi_cam.c
+++ b/sys/dev/mfi/mfi_cam.c
@@ -90,8 +90,7 @@ static struct mfi_command * mfip_start(void *);
 static void	mfip_done(struct mfi_command *cm);
 
 static int mfi_allow_disks = 0;
-TUNABLE_INT("hw.mfi.allow_cam_disk_passthrough", &mfi_allow_disks);
-SYSCTL_INT(_hw_mfi, OID_AUTO, allow_cam_disk_passthrough, CTLFLAG_RD,
+SYSCTL_INT(_hw_mfi, OID_AUTO, allow_cam_disk_passthrough, CTLFLAG_RDTUN,
     &mfi_allow_disks, 0, "event message locale");
 
 static devclass_t	mfip_devclass;
diff --git a/sys/dev/mfi/mfi_pci.c b/sys/dev/mfi/mfi_pci.c
index 0c3b30fce975..80d655cf1b02 100644
--- a/sys/dev/mfi/mfi_pci.c
+++ b/sys/dev/mfi/mfi_pci.c
@@ -108,12 +108,10 @@ DRIVER_MODULE(mfi, pci, mfi_pci_driver, mfi_devclass, 0, 0);
 MODULE_VERSION(mfi, 1);
 
 static int	mfi_msi = 1;
-TUNABLE_INT("hw.mfi.msi", &mfi_msi);
 SYSCTL_INT(_hw_mfi, OID_AUTO, msi, CTLFLAG_RDTUN, &mfi_msi, 0,
     "Enable use of MSI interrupts");
 
-static int	mfi_mrsas_enable = 0;
-TUNABLE_INT("hw.mfi.mrsas_enable", &mfi_msi);
+static int	mfi_mrsas_enable;
 SYSCTL_INT(_hw_mfi, OID_AUTO, mrsas_enable, CTLFLAG_RDTUN, &mfi_mrsas_enable,
      0, "Allow mrasas to take newer cards");
 
@@ -186,7 +184,6 @@ mfi_pci_probe(device_t dev)
 		device_set_desc(dev, id->desc);
 
 		/* give priority to mrsas if tunable set */
-		TUNABLE_INT_FETCH("hw.mfi.mrsas_enable", &mfi_mrsas_enable);
 		if ((id->flags & MFI_FLAGS_MRSAS) && mfi_mrsas_enable)
 			return (BUS_PROBE_LOW_PRIORITY);
 		else
diff --git a/sys/dev/mfi/mfi_tbolt.c b/sys/dev/mfi/mfi_tbolt.c
index 2d27534062c3..984c355321e7 100644
--- a/sys/dev/mfi/mfi_tbolt.c
+++ b/sys/dev/mfi/mfi_tbolt.c
@@ -86,7 +86,6 @@ static void mfi_queue_map_sync(struct mfi_softc *sc);
 extern int	mfi_polled_cmd_timeout;
 static int	mfi_fw_reset_test = 0;
 #ifdef MFI_DEBUG
-TUNABLE_INT("hw.mfi.fw_reset_test", &mfi_fw_reset_test);
 SYSCTL_INT(_hw_mfi, OID_AUTO, fw_reset_test, CTLFLAG_RWTUN, &mfi_fw_reset_test,
            0, "Force a firmware reset condition");
 #endif
diff --git a/sys/dev/mge/if_mge.c b/sys/dev/mge/if_mge.c
index 860e3734be28..d479aa243722 100644
--- a/sys/dev/mge/if_mge.c
+++ b/sys/dev/mge/if_mge.c
@@ -1140,6 +1140,8 @@ mge_intr_rx_locked(struct mge_softc *sc, int count)
 			mb->m_pkthdr.len -= 2;
 			mb->m_data += 2;
 
+			mb->m_pkthdr.rcvif = ifp;
+
 			mge_offload_process_frame(ifp, mb, status,
 			    bufsize);
 
@@ -1159,6 +1161,8 @@ mge_intr_rx_locked(struct mge_softc *sc, int count)
 			count -= 1;
 	}
 
+	ifp->if_ipackets += rx_npkts;
+
 	return (rx_npkts);
 }
 
@@ -1437,12 +1441,6 @@ mge_encap(struct mge_softc *sc, struct mbuf *m0)
 
 	ifp = sc->ifp;
 
-	/* Check for free descriptors */
-	if (sc->tx_desc_used_count + 1 >= MGE_TX_DESC_NUM) {
-		/* No free descriptors */
-		return (-1);
-	}
-
 	/* Fetch unused map */
 	desc_no = sc->tx_desc_curr;
 	dw = &sc->mge_tx_desc[desc_no];
@@ -1451,9 +1449,16 @@ mge_encap(struct mge_softc *sc, struct mbuf *m0)
 	/* Create mapping in DMA memory */
 	error = bus_dmamap_load_mbuf_sg(sc->mge_tx_dtag, mapp, m0, segs, &nsegs,
 	    BUS_DMA_NOWAIT);
-	if (error != 0 || nsegs != 1 ) {
+	if (error != 0) {
+		m_freem(m0);
+		return (error);
+	}
+
+	/* Only one segment is supported. */
+	if (nsegs != 1) {
 		bus_dmamap_unload(sc->mge_tx_dtag, mapp);
-		return ((error != 0) ? error : -1);
+		m_freem(m0);
+		return (-1);
 	}
 
 	bus_dmamap_sync(sc->mge_tx_dtag, mapp, BUS_DMASYNC_PREWRITE);
@@ -1553,15 +1558,33 @@ mge_start_locked(struct ifnet *ifp)
 		if (m0 == NULL)
 			break;
 
-		mtmp = m_defrag(m0, M_NOWAIT);
-		if (mtmp)
-			m0 = mtmp;
+		if (m0->m_pkthdr.csum_flags & (CSUM_IP|CSUM_TCP|CSUM_UDP) ||
+		    m0->m_flags & M_VLANTAG) {
+			if (M_WRITABLE(m0) == 0) {
+				mtmp = m_dup(m0, M_NOWAIT);
+				m_freem(m0);
+				if (mtmp == NULL)
+					continue;
+				m0 = mtmp;
+			}
+		}
+		/* The driver support only one DMA fragment. */
+		if (m0->m_next != NULL) {
+			mtmp = m_defrag(m0, M_NOWAIT);
+			if (mtmp)
+				m0 = mtmp;
+		}
 
-		if (mge_encap(sc, m0)) {
+		/* Check for free descriptors */
+		if (sc->tx_desc_used_count + 1 >= MGE_TX_DESC_NUM) {
 			IF_PREPEND(&ifp->if_snd, m0);
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
 			break;
 		}
+
+		if (mge_encap(sc, m0) != 0)
+			break;
+
 		queued++;
 		BPF_MTAP(ifp, m0);
 	}
diff --git a/sys/dev/mlx/mlx.c b/sys/dev/mlx/mlx.c
index ddcf4b0598bc..0f92eaf35385 100644
--- a/sys/dev/mlx/mlx.c
+++ b/sys/dev/mlx/mlx.c
@@ -191,6 +191,8 @@ mlx_free(struct mlx_softc *sc)
 	bus_dma_tag_destroy(sc->mlx_buffer_dmat);
 
     /* free and destroy DMA memory and tag for s/g lists */
+    if (sc->mlx_sgbusaddr)
+	bus_dmamap_unload(sc->mlx_sg_dmat, sc->mlx_sg_dmamap);
     if (sc->mlx_sgtable)
 	bus_dmamem_free(sc->mlx_sg_dmat, sc->mlx_sgtable, sc->mlx_sg_dmamap);
     if (sc->mlx_sg_dmat)
@@ -239,10 +241,15 @@ mlx_sglist_map(struct mlx_softc *sc)
     debug_called(1);
 
     /* destroy any existing mappings */
+    if (sc->mlx_sgbusaddr)
+	bus_dmamap_unload(sc->mlx_sg_dmat, sc->mlx_sg_dmamap);
     if (sc->mlx_sgtable)
 	bus_dmamem_free(sc->mlx_sg_dmat, sc->mlx_sgtable, sc->mlx_sg_dmamap);
     if (sc->mlx_sg_dmat)
 	bus_dma_tag_destroy(sc->mlx_sg_dmat);
+    sc->mlx_sgbusaddr = 0;
+    sc->mlx_sgtable = NULL;
+    sc->mlx_sg_dmat = NULL;
 
     /*
      * Create a single tag describing a region large enough to hold all of
diff --git a/sys/dev/mmc/mmc.c b/sys/dev/mmc/mmc.c
index 3d66c62cdc71..8b6e1a872f4b 100644
--- a/sys/dev/mmc/mmc.c
+++ b/sys/dev/mmc/mmc.c
@@ -102,6 +102,7 @@ struct mmc_ivars {
 	uint32_t hs_tran_speed;	/* Max speed in high speed mode */
 	uint32_t erase_sector;	/* Card native erase sector size */
 	char card_id_string[64];/* Formatted CID info (serial, MFG, etc) */
+	char card_sn_string[16];/* Formatted serial # for disk->d_ident */
 };
 
 #define CMD_RETRIES	3
@@ -887,6 +888,9 @@ mmc_format_card_id_string(struct mmc_ivars *ivar)
 	 * mmcsd0: 968MB <SD SD01G 8.0 SN 2686905 Mfg 08/2008 by 3 TN> at mmc0
 	 * 22.5MHz/4bit/128-block
 	 *
+	 * Also format just the card serial number, which the mmcsd driver will
+	 * use as the disk->d_ident string.
+	 *
 	 * The card_id_string in mmc_ivars is currently allocated as 64 bytes,
 	 * and our max formatted length is currently 55 bytes if every field
 	 * contains the largest value.
@@ -900,8 +904,10 @@ mmc_format_card_id_string(struct mmc_ivars *ivar)
 		snprintf(oidstr, sizeof(oidstr), "%c%c", c1, c2);
 	else
 		snprintf(oidstr, sizeof(oidstr), "0x%04x", ivar->cid.oid);
+	snprintf(ivar->card_sn_string, sizeof(ivar->card_sn_string),
+	    "%08X", ivar->cid.psn);
 	snprintf(ivar->card_id_string, sizeof(ivar->card_id_string),
-	    "%s%s %s %d.%d SN %u MFG %02d/%04d by %d %s",
+	    "%s%s %s %d.%d SN %08X MFG %02d/%04d by %d %s",
 	    ivar->mode == mode_sd ? "SD" : "MMC", ivar->high_cap ? "HC" : "",
 	    ivar->cid.pnm, ivar->cid.prv >> 4, ivar->cid.prv & 0x0f,
 	    ivar->cid.psn, ivar->cid.mdt_month, ivar->cid.mdt_year,
@@ -1698,6 +1704,9 @@ mmc_read_ivar(device_t bus, device_t child, int which, uintptr_t *result)
 	case MMC_IVAR_CARD_ID_STRING:
 		*(char **)result = ivar->card_id_string;
 		break;
+	case MMC_IVAR_CARD_SN_STRING:
+		*(char **)result = ivar->card_sn_string;
+		break;
 	}
 	return (0);
 }
diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c
index f24537e79205..5b2bc2c27f7b 100644
--- a/sys/dev/mmc/mmcsd.c
+++ b/sys/dev/mmc/mmcsd.c
@@ -163,6 +163,9 @@ mmcsd_attach(device_t dev)
 	d->d_unit = device_get_unit(dev);
 	d->d_flags = DISKFLAG_CANDELETE;
 	d->d_delmaxsize = mmc_get_erase_sector(dev) * d->d_sectorsize * 1; /* conservative */
+	strlcpy(d->d_ident, mmc_get_card_sn_string(dev), sizeof(d->d_ident));
+	strlcpy(d->d_descr, mmc_get_card_id_string(dev), sizeof(d->d_descr));
+
 	/*
 	 * Display in most natural units.  There's no cards < 1MB.  The SD
 	 * standard goes to 2GiB due to its reliance on FAT, but the data
@@ -188,7 +191,7 @@ mmcsd_attach(device_t dev)
 	speed = mmcbr_get_clock(device_get_parent(dev));
 	maxblocks = mmc_get_max_data(dev);
 	device_printf(dev, "%ju%cB <%s>%s at %s %d.%01dMHz/%dbit/%d-block\n",
-	    mb, unit, mmc_get_card_id_string(dev),
+	    mb, unit, d->d_descr,
 	    mmc_get_read_only(dev) ? " (read-only)" : "",
 	    device_get_nameunit(device_get_parent(dev)),
 	    speed / 1000000, (speed / 100000) % 10,
diff --git a/sys/dev/mmc/mmcvar.h b/sys/dev/mmc/mmcvar.h
index b274d32448e0..c7a4af9945de 100644
--- a/sys/dev/mmc/mmcvar.h
+++ b/sys/dev/mmc/mmcvar.h
@@ -69,11 +69,12 @@ enum mmc_device_ivars {
     MMC_IVAR_BUS_WIDTH,
     MMC_IVAR_ERASE_SECTOR,
     MMC_IVAR_MAX_DATA,
-    MMC_IVAR_CARD_ID_STRING
+    MMC_IVAR_CARD_ID_STRING,
+    MMC_IVAR_CARD_SN_STRING,
 };
 
 /*
- * Simplified accessors for pci devices
+ * Simplified accessors for mmc devices
  */
 #define MMC_ACCESSOR(var, ivar, type)					\
 	__BUS_ACCESSOR(mmc, var, MMC, ivar, type)
@@ -90,5 +91,6 @@ MMC_ACCESSOR(bus_width, BUS_WIDTH, int)
 MMC_ACCESSOR(erase_sector, ERASE_SECTOR, int)
 MMC_ACCESSOR(max_data, MAX_DATA, int)
 MMC_ACCESSOR(card_id_string, CARD_ID_STRING, const char *)
+MMC_ACCESSOR(card_sn_string, CARD_SN_STRING, const char *)
 
 #endif /* DEV_MMC_MMCVAR_H */
diff --git a/sys/dev/mps/mps.c b/sys/dev/mps/mps.c
index a73b3919340f..403a4d2f8493 100644
--- a/sys/dev/mps/mps.c
+++ b/sys/dev/mps/mps.c
@@ -75,7 +75,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/mps/mps_ioctl.h>
 #include <dev/mps/mpsvar.h>
 #include <dev/mps/mps_table.h>
-#include <dev/mps/mps_sas.h>
 
 static int mps_diag_reset(struct mps_softc *sc, int sleep_flag);
 static int mps_init_queues(struct mps_softc *sc);
@@ -141,6 +140,7 @@ mps_diag_reset(struct mps_softc *sc,int sleep_flag)
 {
 	uint32_t reg;
 	int i, error, tries = 0;
+	uint8_t first_wait_done = FALSE;
 
 	mps_dprint(sc, MPS_TRACE, "%s\n", __func__);
 
@@ -183,15 +183,32 @@ mps_diag_reset(struct mps_softc *sc,int sleep_flag)
 
 	/* Wait up to 300 seconds in 50ms intervals */
 	error = ETIMEDOUT;
-	for (i = 0; i < 60000; i++) {
-		/* wait 50 msec */
-		if (mtx_owned(&sc->mps_mtx) && sleep_flag == CAN_SLEEP)
-			msleep(&sc->msleep_fake_chan, &sc->mps_mtx, 0,
-			    "mpsdiag", hz/20);
-		else if (sleep_flag == CAN_SLEEP)
-			pause("mpsdiag", hz/20);
-		else
-			DELAY(50 * 1000);
+	for (i = 0; i < 6000; i++) {
+		/*
+		 * Wait 50 msec. If this is the first time through, wait 256
+		 * msec to satisfy Diag Reset timing requirements.
+		 */
+		if (first_wait_done) {
+			if (mtx_owned(&sc->mps_mtx) && sleep_flag == CAN_SLEEP)
+				msleep(&sc->msleep_fake_chan, &sc->mps_mtx, 0,
+				    "mpsdiag", hz/20);
+			else if (sleep_flag == CAN_SLEEP)
+				pause("mpsdiag", hz/20);
+			else
+				DELAY(50 * 1000);
+		} else {
+			DELAY(256 * 1000);
+			first_wait_done = TRUE;
+		}
+		/*
+		 * Check for the RESET_ADAPTER bit to be cleared first, then
+		 * wait for the RESET state to be cleared, which takes a little
+		 * longer.
+		 */
+		reg = mps_regread(sc, MPI2_HOST_DIAGNOSTIC_OFFSET);
+		if (reg & MPI2_DIAG_RESET_ADAPTER) {
+			continue;
+		}
 		reg = mps_regread(sc, MPI2_DOORBELL_OFFSET);
 		if ((reg & MPI2_IOC_STATE_MASK) != MPI2_IOC_STATE_RESET) {
 			error = 0;
@@ -237,7 +254,7 @@ mps_transition_ready(struct mps_softc *sc)
 	sleep_flags = (sc->mps_flags & MPS_FLAGS_ATTACH_DONE)
 					? CAN_SLEEP:NO_SLEEP;
 	error = 0;
-	while (tries++ < 5) {
+	while (tries++ < 1200) {
 		reg = mps_regread(sc, MPI2_DOORBELL_OFFSET);
 		mps_dprint(sc, MPS_INIT, "Doorbell= 0x%x\n", reg);
 
@@ -328,11 +345,9 @@ mps_transition_operational(struct mps_softc *sc)
 static int
 mps_iocfacts_allocate(struct mps_softc *sc, uint8_t attaching)
 {
-	int error, i;
+	int error;
 	Mpi2IOCFactsReply_t saved_facts;
 	uint8_t saved_mode, reallocating;
-	struct mpssas_lun *lun, *lun_tmp;
-	struct mpssas_target *targ;
 
 	mps_dprint(sc, MPS_TRACE, "%s\n", __func__);
 
@@ -489,27 +504,7 @@ mps_iocfacts_allocate(struct mps_softc *sc, uint8_t attaching)
 	 */
 	if (reallocating) {
 		mps_iocfacts_free(sc);
-
-		/*
-		 * The number of targets is based on IOC Facts, so free all of
-		 * the allocated LUNs for each target and then the target buffer
-		 * itself.
-		 */
-		for (i=0; i< saved_facts.MaxTargets; i++) {
-			targ = &sc->sassc->targets[i];
-			SLIST_FOREACH_SAFE(lun, &targ->luns, lun_link,
-			    lun_tmp) {
-				free(lun, M_MPT2);
-			}
-		}
-		free(sc->sassc->targets, M_MPT2);
-
-		sc->sassc->targets = malloc(sizeof(struct mpssas_target) *
-		    sc->facts->MaxTargets, M_MPT2, M_WAITOK|M_ZERO);
-		if (!sc->sassc->targets) {
-			panic("%s failed to alloc targets with error %d\n",
-			    __func__, ENOMEM);
-		}
+		mpssas_realloc_targets(sc, saved_facts.MaxTargets);
 	}
 
 	/*
@@ -615,7 +610,7 @@ mps_iocfacts_free(struct mps_softc *sc)
 
 	mps_dprint(sc, MPS_TRACE, "%s\n", __func__);
 
-	if (sc->post_busaddr != 0)
+	if (sc->free_busaddr != 0)
 		bus_dmamap_unload(sc->queues_dmat, sc->queues_map);
 	if (sc->free_queue != NULL)
 		bus_dmamem_free(sc->queues_dmat, sc->free_queue,
@@ -679,6 +674,9 @@ int
 mps_reinit(struct mps_softc *sc)
 {
 	int error;
+	struct mpssas_softc *sassc;
+
+	sassc = sc->sassc;
 
 	MPS_FUNCTRACE(sc);
 
@@ -759,6 +757,8 @@ mps_reinit(struct mps_softc *sc)
 	mps_dprint(sc, MPS_INFO, "%s finished sc %p post %u free %u\n", 
 	    __func__, sc, sc->replypostindex, sc->replyfreeindex);
 
+	mpssas_release_simq_reinit(sassc);
+
 	return 0;
 }
 
@@ -2533,6 +2533,7 @@ int
 mps_request_polled(struct mps_softc *sc, struct mps_command *cm)
 {
 	int error, timeout = 0, rc;
+	struct timeval cur_time, start_time;
 
 	error = 0;
 
@@ -2540,22 +2541,33 @@ mps_request_polled(struct mps_softc *sc, struct mps_command *cm)
 	cm->cm_complete = NULL;
 	mps_map_command(sc, cm);
 
+	getmicrotime(&start_time);
 	while ((cm->cm_flags & MPS_CM_FLAGS_COMPLETE) == 0) {
 		mps_intr_locked(sc);
 
-		DELAY(50 * 1000);
-		if (timeout++ > 1000) {
+		if (mtx_owned(&sc->mps_mtx))
+			msleep(&sc->msleep_fake_chan, &sc->mps_mtx, 0,
+			    "mpspoll", hz/20);
+		else
+			pause("mpsdiag", hz/20);
+
+		/*
+		 * Check for real-time timeout and fail if more than 60 seconds.
+		 */
+		getmicrotime(&cur_time);
+		timeout = cur_time.tv_sec - start_time.tv_sec;
+		if (timeout > 60) {
 			mps_dprint(sc, MPS_FAULT, "polling failed\n");
 			error = ETIMEDOUT;
 			break;
 		}
 	}
-	
+
 	if (error) {
 		mps_dprint(sc, MPS_FAULT, "Calling Reinit from %s\n", __func__);
 		rc = mps_reinit(sc);
-		mps_dprint(sc, MPS_FAULT, "Reinit %s\n", 
-				(rc == 0) ? "success" : "failed");
+		mps_dprint(sc, MPS_FAULT, "Reinit %s\n", (rc == 0) ? "success" :
+		    "failed");
 	}
 
 	return (error);
diff --git a/sys/dev/mps/mps_mapping.c b/sys/dev/mps/mps_mapping.c
index 97e24be799eb..80022ea4a209 100644
--- a/sys/dev/mps/mps_mapping.c
+++ b/sys/dev/mps/mps_mapping.c
@@ -336,12 +336,13 @@ _mapping_get_high_missing_mt_idx(struct mps_softc *sc)
 	end_idx = sc->max_devices;
 	if (ioc_pg8_flags & MPI2_IOCPAGE8_FLAGS_RESERVED_TARGETID_0)
 		start_idx = 1;
-	if (sc->ir_firmware)
+	if (sc->ir_firmware) {
 		_mapping_get_ir_maprange(sc, &start_idx_ir, &end_idx_ir);
-	if (start_idx == start_idx_ir)
-		start_idx = end_idx_ir + 1;
-	else
-		end_idx = start_idx_ir;
+		if (start_idx == start_idx_ir)
+			start_idx = end_idx_ir + 1;
+		else
+			end_idx = start_idx_ir;
+	}
 	mt_entry = &sc->mapping_table[start_idx];
 	for (map_idx = start_idx; map_idx < end_idx; map_idx++, mt_entry++) {
 		if (mt_entry->missing_count > high_missing_count) {
diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c
index 06f0e696ea46..e729d1c552c3 100644
--- a/sys/dev/mps/mps_sas.c
+++ b/sys/dev/mps/mps_sas.c
@@ -115,7 +115,6 @@ static uint8_t op_code_prot[256] = {
 
 MALLOC_DEFINE(M_MPSSAS, "MPSSAS", "MPS SAS memory");
 
-static void mpssas_discovery_timeout(void *data);
 static void mpssas_remove_device(struct mps_softc *, struct mps_command *);
 static void mpssas_remove_complete(struct mps_softc *, struct mps_command *);
 static void mpssas_action(struct cam_sim *sim, union ccb *ccb);
@@ -190,6 +189,16 @@ mpssas_startup_increment(struct mpssas_softc *sassc)
 	}
 }
 
+void
+mpssas_release_simq_reinit(struct mpssas_softc *sassc)
+{
+	if (sassc->flags & MPSSAS_QUEUE_FROZEN) {
+		sassc->flags &= ~MPSSAS_QUEUE_FROZEN;
+		xpt_release_simq(sassc->sim, 1);
+		mps_dprint(sassc->sc, MPS_INFO, "Unfreezing SIM queue\n");
+	}
+}
+
 void
 mpssas_startup_decrement(struct mpssas_softc *sassc)
 {
@@ -597,7 +606,7 @@ mpssas_remove_device(struct mps_softc *sc, struct mps_command *tm)
 
 		mps_dprint(sc, MPS_XINFO, "Completing missed command %p\n", tm);
 		ccb = tm->cm_complete_data;
-		ccb->ccb_h.status = CAM_DEV_NOT_THERE;
+		mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
 		mpssas_scsiio_complete(sc, tm);
 	}
 }
@@ -899,46 +908,6 @@ mpssas_discovery_end(struct mpssas_softc *sassc)
 
 }
 
-static void
-mpssas_discovery_timeout(void *data)
-{
-	struct mpssas_softc *sassc = data;
-	struct mps_softc *sc;
-
-	sc = sassc->sc;
-	MPS_FUNCTRACE(sc);
-
-	mps_lock(sc);
-	mps_dprint(sc, MPS_INFO,
-	    "Timeout waiting for discovery, interrupts may not be working!\n");
-	sassc->flags &= ~MPSSAS_DISCOVERY_TIMEOUT_PENDING;
-
-	/* Poll the hardware for events in case interrupts aren't working */
-	mps_intr_locked(sc);
-
-	mps_dprint(sassc->sc, MPS_INFO,
-	    "Finished polling after discovery timeout at %d\n", ticks);
-
-	if ((sassc->flags & MPSSAS_IN_DISCOVERY) == 0) {
-		mpssas_discovery_end(sassc);
-	} else {
-		if (sassc->discovery_timeouts < MPSSAS_MAX_DISCOVERY_TIMEOUTS) {
-			sassc->flags |= MPSSAS_DISCOVERY_TIMEOUT_PENDING;
-			callout_reset(&sassc->discovery_callout,
-			    MPSSAS_DISCOVERY_TIMEOUT * hz,
-			    mpssas_discovery_timeout, sassc);
-			sassc->discovery_timeouts++;
-		} else {
-			mps_dprint(sassc->sc, MPS_FAULT,
-			    "Discovery timed out, continuing.\n");
-			sassc->flags &= ~MPSSAS_IN_DISCOVERY;
-			mpssas_discovery_end(sassc);
-		}
-	}
-
-	mps_unlock(sc);
-}
-
 static void
 mpssas_action(struct cam_sim *sim, union ccb *ccb)
 {
@@ -984,7 +953,7 @@ mpssas_action(struct cam_sim *sim, union ccb *ccb)
 		 */
 		cpi->maxio = 256 * 1024;
 #endif
-		cpi->ccb_h.status = CAM_REQ_CMP;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_CMP);
 		break;
 	}
 	case XPT_GET_TRAN_SETTINGS:
@@ -1003,7 +972,7 @@ mpssas_action(struct cam_sim *sim, union ccb *ccb)
 		    cts->ccb_h.target_id));
 		targ = &sassc->targets[cts->ccb_h.target_id];
 		if (targ->handle == 0x0) {
-			cts->ccb_h.status = CAM_SEL_TIMEOUT;
+			mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
 			break;
 		}
 
@@ -1030,12 +999,12 @@ mpssas_action(struct cam_sim *sim, union ccb *ccb)
 		scsi->valid = CTS_SCSI_VALID_TQ;
 		scsi->flags = CTS_SCSI_FLAGS_TAG_ENB;
 
-		cts->ccb_h.status = CAM_REQ_CMP;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_CMP);
 		break;
 	}
 	case XPT_CALC_GEOMETRY:
 		cam_calc_geometry(&ccb->ccg, /*extended*/1);
-		ccb->ccb_h.status = CAM_REQ_CMP;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_CMP);
 		break;
 	case XPT_RESET_DEV:
 		mps_dprint(sassc->sc, MPS_XINFO, "mpssas_action XPT_RESET_DEV\n");
@@ -1046,7 +1015,7 @@ mpssas_action(struct cam_sim *sim, union ccb *ccb)
 	case XPT_TERM_IO:
 		mps_dprint(sassc->sc, MPS_XINFO,
 		    "mpssas_action faking success for abort or reset\n");
-		ccb->ccb_h.status = CAM_REQ_CMP;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_CMP);
 		break;
 	case XPT_SCSI_IO:
 		mpssas_action_scsiio(sassc, ccb);
@@ -1057,7 +1026,7 @@ mpssas_action(struct cam_sim *sim, union ccb *ccb)
 		return;
 #endif
 	default:
-		ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
+		mpssas_set_ccbstatus(ccb, CAM_FUNC_NOTAVAIL);
 		break;
 	}
 	xpt_done(ccb);
@@ -1120,6 +1089,14 @@ mpssas_complete_all_commands(struct mps_softc *sc)
 			wakeup(cm);
 			completed = 1;
 		}
+
+		if (cm->cm_sc->io_cmds_active != 0) {
+			cm->cm_sc->io_cmds_active--;
+		} else {
+			mps_dprint(cm->cm_sc, MPS_INFO, "Warning: "
+			    "io_cmds_active is out of sync - resynching to "
+			    "0\n");
+		}
 		
 		if ((completed == 0) && (cm->cm_state != MPS_CM_STATE_FREE)) {
 			/* this should never happen, but if it does, log */
@@ -1586,8 +1563,7 @@ mpssas_scsiio_timeout(void *data)
 	/* XXX first, check the firmware state, to see if it's still
 	 * operational.  if not, do a diag reset.
 	 */
-
-	cm->cm_ccb->ccb_h.status = CAM_CMD_TIMEOUT;
+	mpssas_set_ccbstatus(cm->cm_ccb, CAM_CMD_TIMEOUT);
 	cm->cm_state = MPS_CM_STATE_TIMEDOUT;
 	TAILQ_INSERT_TAIL(&targ->timedout_commands, cm, cm_recovery);
 
@@ -1648,14 +1624,14 @@ mpssas_action_scsiio(struct mpssas_softc *sassc, union ccb *ccb)
 	if (targ->handle == 0x0) {
 		mps_dprint(sc, MPS_ERROR, "%s NULL handle for target %u\n", 
 		    __func__, csio->ccb_h.target_id);
-		csio->ccb_h.status = CAM_SEL_TIMEOUT;
+		mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
 		xpt_done(ccb);
 		return;
 	}
 	if (targ->flags & MPS_TARGET_FLAGS_RAID_COMPONENT) {
 		mps_dprint(sc, MPS_ERROR, "%s Raid component no SCSI IO "
 		    "supported %u\n", __func__, csio->ccb_h.target_id);
-		csio->ccb_h.status = CAM_TID_INVALID;
+		mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
 		xpt_done(ccb);
 		return;
 	}
@@ -1664,7 +1640,7 @@ mpssas_action_scsiio(struct mpssas_softc *sassc, union ccb *ccb)
 	 * Progress" and was actually aborted by the upper layer.  Check for
 	 * this here and complete the command without error.
 	 */
-	if (ccb->ccb_h.status != CAM_REQ_INPROG) {
+	if (mpssas_get_ccbstatus(ccb) != CAM_REQ_INPROG) {
 		mps_dprint(sc, MPS_TRACE, "%s Command is not in progress for "
 		    "target %u\n", __func__, csio->ccb_h.target_id);
 		xpt_done(ccb);
@@ -1677,22 +1653,25 @@ mpssas_action_scsiio(struct mpssas_softc *sassc, union ccb *ccb)
 	 */
 	if (targ->flags & MPSSAS_TARGET_INREMOVAL) {
 		if (targ->devinfo == 0)
-			csio->ccb_h.status = CAM_REQ_CMP;
+			mpssas_set_ccbstatus(ccb, CAM_REQ_CMP);
 		else
-			csio->ccb_h.status = CAM_SEL_TIMEOUT;
+			mpssas_set_ccbstatus(ccb, CAM_SEL_TIMEOUT);
 		xpt_done(ccb);
 		return;
 	}
 
 	if ((sc->mps_flags & MPS_FLAGS_SHUTDOWN) != 0) {
 		mps_dprint(sc, MPS_INFO, "%s shutting down\n", __func__);
-		csio->ccb_h.status = CAM_TID_INVALID;
+		mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
 		xpt_done(ccb);
 		return;
 	}
 
 	cm = mps_alloc_command(sc);
-	if (cm == NULL) {
+	if (cm == NULL || (sc->mps_flags & MPS_FLAGS_DIAGRESET)) {
+		if (cm != NULL) {
+			mps_free_command(sc, cm);
+		}
 		if ((sassc->flags & MPSSAS_QUEUE_FROZEN) == 0) {
 			xpt_freeze_simq(sassc->sim, 1);
 			sassc->flags |= MPSSAS_QUEUE_FROZEN;
@@ -1765,7 +1744,7 @@ mpssas_action_scsiio(struct mpssas_softc *sassc, union ccb *ccb)
 	req->Control = htole32(mpi_control);
 	if (MPS_SET_LUN(req->LUN, csio->ccb_h.target_lun) != 0) {
 		mps_free_command(sc, cm);
-		ccb->ccb_h.status = CAM_LUN_INVALID;
+		mpssas_set_ccbstatus(ccb, CAM_LUN_INVALID);
 		xpt_done(ccb);
 		return;
 	}
@@ -1853,10 +1832,10 @@ mpssas_action_scsiio(struct mpssas_softc *sassc, union ccb *ccb)
 	 * the I/O to the IR volume itself.
 	 */
 	if (sc->WD_valid_config) {
-		if (ccb->ccb_h.status != MPS_WD_RETRY) {
+		if (ccb->ccb_h.sim_priv.entries[0].field == MPS_WD_RETRY) {
 			mpssas_direct_drive_io(sassc, cm, ccb);
 		} else {
-			ccb->ccb_h.status = CAM_REQ_INPROG;
+			mpssas_set_ccbstatus(ccb, CAM_REQ_INPROG);
 		}
 	}
 
@@ -2150,7 +2129,7 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
 		 * because there can be no reply when we haven't actually
 		 * gone out to the hardware.
 		 */
-		ccb->ccb_h.status = CAM_REQUEUE_REQ;
+		mpssas_set_ccbstatus(ccb, CAM_REQUEUE_REQ);
 
 		/*
 		 * Currently the only error included in the mask is
@@ -2171,13 +2150,25 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
 		}
 	}
 
+	/*
+	 * If this is a Start Stop Unit command and it was issued by the driver
+	 * during shutdown, decrement the refcount to account for all of the
+	 * commands that were sent.  All SSU commands should be completed before
+	 * shutdown completes, meaning SSU_refcount will be 0 after SSU_started
+	 * is TRUE.
+	 */
+	if (sc->SSU_started && (csio->cdb_io.cdb_bytes[0] == START_STOP_UNIT)) {
+		mps_dprint(sc, MPS_INFO, "Decrementing SSU count.\n");
+		sc->SSU_refcount--;
+	}
+
 	/* Take the fast path to completion */
 	if (cm->cm_reply == NULL) {
-		if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG) {
+		if (mpssas_get_ccbstatus(ccb) == CAM_REQ_INPROG) {
 			if ((sc->mps_flags & MPS_FLAGS_DIAGRESET) != 0)
-				ccb->ccb_h.status = CAM_SCSI_BUS_RESET;
+				mpssas_set_ccbstatus(ccb, CAM_SCSI_BUS_RESET);
 			else {
-				ccb->ccb_h.status = CAM_REQ_CMP;
+				mpssas_set_ccbstatus(ccb, CAM_REQ_CMP);
 				ccb->csio.scsi_status = SCSI_STATUS_OK;
 			}
 			if (sassc->flags & MPSSAS_QUEUE_FROZEN) {
@@ -2193,10 +2184,10 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
 		 * CAM_REQ_CMP.  The first is if MPS_CM_FLAGS_ERROR_MASK is
 		 * set, the second is in the MPS_FLAGS_DIAGRESET above.
 		 */
-		if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
+		if (mpssas_get_ccbstatus(ccb) != CAM_REQ_CMP) {
 			/*
 			 * Freeze the dev queue so that commands are
-			 * executed in the correct order with after error
+			 * executed in the correct order after error
 			 * recovery.
 			 */
 			ccb->ccb_h.status |= CAM_DEV_QFRZN;
@@ -2220,10 +2211,11 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
 	 */
 	if (cm->cm_flags & MPS_CM_FLAGS_DD_IO) {
 		mps_free_command(sc, cm);
-		ccb->ccb_h.status = MPS_WD_RETRY;
+		ccb->ccb_h.sim_priv.entries[0].field = MPS_WD_RETRY;
 		mpssas_action_scsiio(sassc, ccb);
 		return;
-	}
+	} else
+		ccb->ccb_h.sim_priv.entries[0].field = 0;
 
 	switch (le16toh(rep->IOCStatus) & MPI2_IOCSTATUS_MASK) {
 	case MPI2_IOCSTATUS_SCSI_DATA_UNDERRUN:
@@ -2239,7 +2231,7 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
 		/* Completion failed at the transport level. */
 		if (rep->SCSIState & (MPI2_SCSI_STATE_NO_SCSI_STATUS |
 		    MPI2_SCSI_STATE_TERMINATED)) {
-			ccb->ccb_h.status = CAM_REQ_CMP_ERR;
+			mpssas_set_ccbstatus(ccb, CAM_REQ_CMP_ERR);
 			break;
 		}
 
@@ -2248,7 +2240,7 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
 		 * recover the command.
 		 */
 		if (rep->SCSIState & MPI2_SCSI_STATE_AUTOSENSE_FAILED) {
-			ccb->ccb_h.status = CAM_AUTOSENSE_FAIL;
+			mpssas_set_ccbstatus(ccb, CAM_AUTOSENSE_FAIL);
 			break;
 		}
 
@@ -2272,16 +2264,16 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
 		 */
 		if ((rep->SCSIStatus == MPI2_SCSI_STATUS_COMMAND_TERMINATED) ||
 		    (rep->SCSIStatus == MPI2_SCSI_STATUS_TASK_ABORTED)) {
-			ccb->ccb_h.status = CAM_REQ_ABORTED;
+			mpssas_set_ccbstatus(ccb, CAM_REQ_ABORTED);
 			break;
 		}
 
 		/* Handle normal status and sense */
 		csio->scsi_status = rep->SCSIStatus;
 		if (rep->SCSIStatus == MPI2_SCSI_STATUS_GOOD)
-			ccb->ccb_h.status = CAM_REQ_CMP;
+			mpssas_set_ccbstatus(ccb, CAM_REQ_CMP);
 		else
-			ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR;
+			mpssas_set_ccbstatus(ccb, CAM_SCSI_STATUS_ERROR);
 
 		if (rep->SCSIState & MPI2_SCSI_STATE_AUTOSENSE_VALID) {
 			int sense_len, returned_sense_len;
@@ -2345,13 +2337,13 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
 		 * failed.
 		 */
 		if (cm->cm_targ->devinfo == 0)
-			ccb->ccb_h.status = CAM_REQ_CMP;
+			mpssas_set_ccbstatus(ccb, CAM_REQ_CMP);
 		else
-			ccb->ccb_h.status = CAM_DEV_NOT_THERE;
+			mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
 		break;
 	case MPI2_IOCSTATUS_INVALID_SGL:
 		mps_print_scsiio_cmd(sc, cm);
-		ccb->ccb_h.status = CAM_UNREC_HBA_ERROR;
+		mpssas_set_ccbstatus(ccb, CAM_UNREC_HBA_ERROR);
 		break;
 	case MPI2_IOCSTATUS_SCSI_TASK_TERMINATED:
 		/*
@@ -2364,14 +2356,14 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
 		 * on the console.
 		 */
 		if (cm->cm_state == MPS_CM_STATE_TIMEDOUT)
-			ccb->ccb_h.status = CAM_CMD_TIMEOUT;
+			mpssas_set_ccbstatus(ccb, CAM_CMD_TIMEOUT);
 		else
-			ccb->ccb_h.status = CAM_REQ_ABORTED;
+			mpssas_set_ccbstatus(ccb, CAM_REQ_ABORTED);
 		break;
 	case MPI2_IOCSTATUS_SCSI_DATA_OVERRUN:
 		/* resid is ignored for this condition */
 		csio->resid = 0;
-		ccb->ccb_h.status = CAM_DATA_RUN_ERR;
+		mpssas_set_ccbstatus(ccb, CAM_DATA_RUN_ERR);
 		break;
 	case MPI2_IOCSTATUS_SCSI_IOC_TERMINATED:
 	case MPI2_IOCSTATUS_SCSI_EXT_TERMINATED:
@@ -2380,7 +2372,7 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
 		 * transient transport-related) errors, retry these without
 		 * decrementing the retry count.
 		 */
-		ccb->ccb_h.status = CAM_REQUEUE_REQ;
+		mpssas_set_ccbstatus(ccb, CAM_REQUEUE_REQ);
 		mpssas_log_command(cm, MPS_INFO,
 		    "terminated ioc %x scsi %x state %x xfer %u\n",
 		    le16toh(rep->IOCStatus), rep->SCSIStatus, rep->SCSIState,
@@ -2402,7 +2394,7 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
 		    le16toh(rep->IOCStatus), rep->SCSIStatus, rep->SCSIState,
 		    le32toh(rep->TransferCount));
 		csio->resid = cm->cm_length;
-		ccb->ccb_h.status = CAM_REQ_CMP_ERR;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_CMP_ERR);
 		break;
 	}
 	
@@ -2415,7 +2407,7 @@ mpssas_scsiio_complete(struct mps_softc *sc, struct mps_command *cm)
 		    "unfreezing SIM queue\n");
 	}
 
-	if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
+	if (mpssas_get_ccbstatus(ccb) != CAM_REQ_CMP) {
 		ccb->ccb_h.status |= CAM_DEV_QFRZN;
 		xpt_freeze_devq(ccb->ccb_h.path, /*count*/ 1);
 	}
@@ -2713,14 +2705,14 @@ mpssas_smpio_complete(struct mps_softc *sc, struct mps_command *cm)
 	if ((cm->cm_flags & MPS_CM_FLAGS_ERROR_MASK) != 0) {
 		mps_dprint(sc, MPS_ERROR,"%s: cm_flags = %#x on SMP request!\n",
 			   __func__, cm->cm_flags);
-		ccb->ccb_h.status = CAM_REQ_CMP_ERR;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_CMP_ERR);
 		goto bailout;
         }
 
 	rpl = (MPI2_SMP_PASSTHROUGH_REPLY *)cm->cm_reply;
 	if (rpl == NULL) {
 		mps_dprint(sc, MPS_ERROR, "%s: NULL cm_reply!\n", __func__);
-		ccb->ccb_h.status = CAM_REQ_CMP_ERR;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_CMP_ERR);
 		goto bailout;
 	}
 
@@ -2733,7 +2725,7 @@ mpssas_smpio_complete(struct mps_softc *sc, struct mps_command *cm)
 	    rpl->SASStatus != MPI2_SASSTATUS_SUCCESS) {
 		mps_dprint(sc, MPS_XINFO, "%s: IOCStatus %04x SASStatus %02x\n",
 		    __func__, le16toh(rpl->IOCStatus), rpl->SASStatus);
-		ccb->ccb_h.status = CAM_REQ_CMP_ERR;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_CMP_ERR);
 		goto bailout;
 	}
 
@@ -2742,9 +2734,9 @@ mpssas_smpio_complete(struct mps_softc *sc, struct mps_command *cm)
 		   (uintmax_t)sasaddr);
 
 	if (ccb->smpio.smp_response[2] == SMP_FR_ACCEPTED)
-		ccb->ccb_h.status = CAM_REQ_CMP;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_CMP);
 	else
-		ccb->ccb_h.status = CAM_SMP_STATUS_ERROR;
+		mpssas_set_ccbstatus(ccb, CAM_SMP_STATUS_ERROR);
 
 bailout:
 	/*
@@ -2780,7 +2772,7 @@ mpssas_send_smpcmd(struct mpssas_softc *sassc, union ccb *ccb, uint64_t sasaddr)
 	case CAM_DATA_SG_PADDR:
 		mps_dprint(sc, MPS_ERROR,
 			   "%s: physical addresses not supported\n", __func__);
-		ccb->ccb_h.status = CAM_REQ_INVALID;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_INVALID);
 		xpt_done(ccb);
 		return;
 	case CAM_DATA_SG:
@@ -2794,7 +2786,7 @@ mpssas_send_smpcmd(struct mpssas_softc *sassc, union ccb *ccb, uint64_t sasaddr)
 				   "%s: multiple request or response "
 				   "buffer segments not supported for SMP\n",
 				   __func__);
-			ccb->ccb_h.status = CAM_REQ_INVALID;
+			mpssas_set_ccbstatus(ccb, CAM_REQ_INVALID);
 			xpt_done(ccb);
 			return;
 		}
@@ -2828,7 +2820,7 @@ mpssas_send_smpcmd(struct mpssas_softc *sassc, union ccb *ccb, uint64_t sasaddr)
 		response = ccb->smpio.smp_response;
 		break;
 	default:
-		ccb->ccb_h.status = CAM_REQ_INVALID;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_INVALID);
 		xpt_done(ccb);
 		return;
 	}
@@ -2837,7 +2829,7 @@ mpssas_send_smpcmd(struct mpssas_softc *sassc, union ccb *ccb, uint64_t sasaddr)
 	if (cm == NULL) {
 		mps_dprint(sc, MPS_ERROR,
 		    "%s: cannot allocate command\n", __func__);
-		ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
+		mpssas_set_ccbstatus(ccb, CAM_RESRC_UNAVAIL);
 		xpt_done(ccb);
 		return;
 	}
@@ -2925,7 +2917,7 @@ mpssas_send_smpcmd(struct mpssas_softc *sassc, union ccb *ccb, uint64_t sasaddr)
 
 bailout_error:
 	mps_free_command(sc, cm);
-	ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
+	mpssas_set_ccbstatus(ccb, CAM_RESRC_UNAVAIL);
 	xpt_done(ccb);
 	return;
 
@@ -2950,7 +2942,7 @@ mpssas_action_smpio(struct mpssas_softc *sassc, union ccb *ccb)
 		mps_dprint(sc, MPS_ERROR,
 			   "%s: target %d does not exist!\n", __func__,
 			   ccb->ccb_h.target_id);
-		ccb->ccb_h.status = CAM_SEL_TIMEOUT;
+		mpssas_set_ccbstatus(ccb, CAM_SEL_TIMEOUT);
 		xpt_done(ccb);
 		return;
 	}
@@ -2999,7 +2991,7 @@ mpssas_action_smpio(struct mpssas_softc *sassc, union ccb *ccb)
 			mps_dprint(sc, MPS_ERROR,
 				   "%s: handle %d does not have a valid "
 				   "parent handle!\n", __func__, targ->handle);
-			ccb->ccb_h.status = CAM_REQ_INVALID;
+			mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
 			goto bailout;
 		}
 #ifdef OLD_MPS_PROBE
@@ -3010,7 +3002,7 @@ mpssas_action_smpio(struct mpssas_softc *sassc, union ccb *ccb)
 			mps_dprint(sc, MPS_ERROR,
 				   "%s: handle %d does not have a valid "
 				   "parent target!\n", __func__, targ->handle);
-			ccb->ccb_h.status = CAM_REQ_INVALID;
+			mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
 			goto bailout;
 		}
 
@@ -3020,7 +3012,7 @@ mpssas_action_smpio(struct mpssas_softc *sassc, union ccb *ccb)
 				   "%s: handle %d parent %d does not "
 				   "have an SMP target!\n", __func__,
 				   targ->handle, parent_target->handle);
-			ccb->ccb_h.status = CAM_REQ_INVALID;
+			mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
 			goto bailout;
 
 		}
@@ -3033,7 +3025,7 @@ mpssas_action_smpio(struct mpssas_softc *sassc, union ccb *ccb)
 				   "%s: handle %d parent %d does not "
 				   "have an SMP target!\n", __func__,
 				   targ->handle, targ->parent_handle);
-			ccb->ccb_h.status = CAM_REQ_INVALID;
+			mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
 			goto bailout;
 
 		}
@@ -3042,7 +3034,7 @@ mpssas_action_smpio(struct mpssas_softc *sassc, union ccb *ccb)
 				   "%s: handle %d parent handle %d does "
 				   "not have a valid SAS address!\n",
 				   __func__, targ->handle, targ->parent_handle);
-			ccb->ccb_h.status = CAM_REQ_INVALID;
+			mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
 			goto bailout;
 		}
 
@@ -3055,7 +3047,7 @@ mpssas_action_smpio(struct mpssas_softc *sassc, union ccb *ccb)
 		mps_dprint(sc, MPS_INFO,
 			   "%s: unable to find SAS address for handle %d\n",
 			   __func__, targ->handle);
-		ccb->ccb_h.status = CAM_REQ_INVALID;
+		mpssas_set_ccbstatus(ccb, CAM_DEV_NOT_THERE);
 		goto bailout;
 	}
 	mpssas_send_smpcmd(sassc, ccb, sasaddr);
@@ -3087,7 +3079,7 @@ mpssas_action_resetdev(struct mpssas_softc *sassc, union ccb *ccb)
 	if (tm == NULL) {
 		mps_dprint(sc, MPS_ERROR,
 		    "command alloc failure in mpssas_action_resetdev\n");
-		ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
+		mpssas_set_ccbstatus(ccb, CAM_RESRC_UNAVAIL);
 		xpt_done(ccb);
 		return;
 	}
@@ -3135,7 +3127,7 @@ mpssas_resetdev_complete(struct mps_softc *sc, struct mps_command *tm)
 			   "%s: cm_flags = %#x for reset of handle %#04x! "
 			   "This should not happen!\n", __func__, tm->cm_flags,
 			   req->DevHandle);
-		ccb->ccb_h.status = CAM_REQ_CMP_ERR;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_CMP_ERR);
 		goto bailout;
 	}
 
@@ -3144,12 +3136,12 @@ mpssas_resetdev_complete(struct mps_softc *sc, struct mps_command *tm)
 	    le16toh(resp->IOCStatus), le32toh(resp->ResponseCode));
 
 	if (le32toh(resp->ResponseCode) == MPI2_SCSITASKMGMT_RSP_TM_COMPLETE) {
-		ccb->ccb_h.status = CAM_REQ_CMP;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_CMP);
 		mpssas_announce_reset(sc, AC_SENT_BDR, tm->cm_targ->tid,
 		    CAM_LUN_WILDCARD);
 	}
 	else
-		ccb->ccb_h.status = CAM_REQ_CMP_ERR;
+		mpssas_set_ccbstatus(ccb, CAM_REQ_CMP_ERR);
 
 bailout:
 
@@ -3251,7 +3243,7 @@ mpssas_async(void *callback_arg, uint32_t code, struct cam_path *path,
 			cam_release_devq(cdai.ccb_h.path,
 					 0, 0, 0, FALSE);
 
-		if (((cdai.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP)
+		if ((mpssas_get_ccbstatus((union ccb *)&cdai) == CAM_REQ_CMP)
 		 && (rcap_buf.prot & SRC16_PROT_EN)) {
 			lun->eedp_formatted = TRUE;
 			lun->eedp_block_size = scsi_4btoul(rcap_buf.length);
@@ -3366,6 +3358,20 @@ mpssas_check_eedp(struct mps_softc *sc, struct cam_path *path,
 	}
 
 	xpt_path_string(local_path, path_str, sizeof(path_str));
+
+	/*
+	 * If this is a SATA direct-access end device,
+	 * mark it so that a SCSI StartStopUnit command
+	 * will be sent to it when the driver is being
+	 * shutdown.
+	 */
+	if ((cgd.inq_data.device == T_DIRECT) && 
+		(target->devinfo & MPI2_SAS_DEVICE_INFO_SATA_DEVICE) &&
+		((target->devinfo & MPI2_SAS_DEVICE_INFO_MASK_DEVICE_TYPE) ==
+		MPI2_SAS_DEVICE_INFO_END_DEVICE)) {
+		lun->stop_at_shutdown = TRUE;
+	}
+
 	mps_dprint(sc, MPS_INFO, "Sending read cap: path %s handle %d\n",
 	    path_str, target->handle);
 
@@ -3453,7 +3459,7 @@ mpssas_read_cap_done(struct cam_periph *periph, union ccb *done_ccb)
 		 * the lun as not supporting EEDP and set the block size
 		 * to 0.
 		 */
-		if (((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP)
+		if ((mpssas_get_ccbstatus(done_ccb) != CAM_REQ_CMP)
 		 || (done_ccb->csio.scsi_status != SCSI_STATUS_OK)) {
 			lun->eedp_formatted = FALSE;
 			lun->eedp_block_size = 0;
@@ -3591,3 +3597,33 @@ mpssas_check_id(struct mpssas_softc *sassc, int id)
 
 	return (0);
 }
+
+void
+mpssas_realloc_targets(struct mps_softc *sc, int maxtargets)
+{
+	struct mpssas_softc *sassc;
+	struct mpssas_lun *lun, *lun_tmp;
+	struct mpssas_target *targ;
+	int i;
+
+	sassc = sc->sassc;
+	/*
+	 * The number of targets is based on IOC Facts, so free all of
+	 * the allocated LUNs for each target and then the target buffer
+	 * itself.
+	 */
+	for (i=0; i< maxtargets; i++) {
+		targ = &sassc->targets[i];
+		SLIST_FOREACH_SAFE(lun, &targ->luns, lun_link, lun_tmp) {
+			free(lun, M_MPT2);
+		}
+	}
+	free(sassc->targets, M_MPT2);
+
+	sassc->targets = malloc(sizeof(struct mpssas_target) * maxtargets,
+	    M_MPT2, M_WAITOK|M_ZERO);
+	if (!sassc->targets) {
+		panic("%s failed to alloc targets with error %d\n",
+		    __func__, ENOMEM);
+	}
+}
diff --git a/sys/dev/mps/mps_sas.h b/sys/dev/mps/mps_sas.h
index 0c3bb08980a7..0a3ddf158382 100644
--- a/sys/dev/mps/mps_sas.h
+++ b/sys/dev/mps/mps_sas.h
@@ -35,6 +35,7 @@ struct mpssas_lun {
 	lun_id_t	lun_id;
 	uint8_t		eedp_formatted;
 	uint32_t	eedp_block_size;
+	uint8_t		stop_at_shutdown;
 };
 
 struct mpssas_target {
@@ -145,6 +146,19 @@ mpssas_set_lun(uint8_t *lun, u_int ccblun)
 	return (0);
 }
 
+static __inline void
+mpssas_set_ccbstatus(union ccb *ccb, int status)
+{
+	ccb->ccb_h.status &= ~CAM_STATUS_MASK;
+	ccb->ccb_h.status |= status;
+}
+
+static __inline int
+mpssas_get_ccbstatus(union ccb *ccb)
+{
+	return (ccb->ccb_h.status & CAM_STATUS_MASK);
+}
+
 #define MPS_SET_SINGLE_LUN(req, lun)	\
 do {					\
 	bzero((req)->LUN, 8);		\
@@ -156,7 +170,5 @@ void mpssas_discovery_end(struct mpssas_softc *sassc);
 void mpssas_startup_increment(struct mpssas_softc *sassc);
 void mpssas_startup_decrement(struct mpssas_softc *sassc);
 
-struct mps_command * mpssas_alloc_tm(struct mps_softc *sc);
-void mpssas_free_tm(struct mps_softc *sc, struct mps_command *tm);
 void mpssas_firmware_event_work(void *arg, int pending);
 int mpssas_check_id(struct mpssas_softc *sassc, int id);
diff --git a/sys/dev/mps/mps_sas_lsi.c b/sys/dev/mps/mps_sas_lsi.c
index c219be14bb13..583632947e34 100644
--- a/sys/dev/mps/mps_sas_lsi.c
+++ b/sys/dev/mps/mps_sas_lsi.c
@@ -120,6 +120,9 @@ int mpssas_get_sas_address_for_sata_disk(struct mps_softc *sc,
     u64 *sas_address, u16 handle, u32 device_info);
 static int mpssas_volume_add(struct mps_softc *sc,
     u16 handle);
+static void mpssas_SSU_to_SATA_devices(struct mps_softc *sc);
+static void mpssas_stop_unit_done(struct cam_periph *periph,
+    union ccb *done_ccb);
 
 void
 mpssas_evt_handler(struct mps_softc *sc, uintptr_t data,
@@ -909,6 +912,138 @@ mpssas_volume_add(struct mps_softc *sc, u16 handle)
 	return (error);
 }
 
+/**
+ * mpssas_SSU_to_SATA_devices 
+ * @sc: per adapter object
+ *
+ * Looks through the target list and issues a StartStopUnit SCSI command to each
+ * SATA direct-access device.  This helps to ensure that data corruption is
+ * avoided when the system is being shut down.  This must be called after the IR
+ * System Shutdown RAID Action is sent if in IR mode.
+ *
+ * Return nothing.
+ */
+static void
+mpssas_SSU_to_SATA_devices(struct mps_softc *sc)
+{
+	struct mpssas_softc *sassc = sc->sassc;
+	union ccb *ccb;
+	path_id_t pathid = cam_sim_path(sassc->sim);
+	target_id_t targetid;
+	struct mpssas_target *target;
+	struct mpssas_lun *lun;
+	char path_str[64];
+	struct timeval cur_time, start_time;
+
+	/*
+	 * For each LUN of each target, issue a StartStopUnit command to stop
+	 * the device.
+	 */
+	sc->SSU_started = TRUE;
+	sc->SSU_refcount = 0;
+	for (targetid = 0; targetid < sc->facts->MaxTargets; targetid++) {
+		target = &sassc->targets[targetid];
+		if (target->handle == 0x0) {
+			continue;
+		}
+
+		SLIST_FOREACH(lun, &target->luns, lun_link) {
+			ccb = xpt_alloc_ccb_nowait();
+			if (ccb == NULL) {
+				mps_dprint(sc, MPS_FAULT, "Unable to alloc CCB "
+				    "to stop unit.\n");
+				return;
+			}
+
+			/*
+			 * The stop_at_shutdown flag will be set if this LUN is
+			 * a SATA direct-access end device.
+			 */
+			if (lun->stop_at_shutdown) {
+				if (xpt_create_path(&ccb->ccb_h.path,
+				    xpt_periph, pathid, targetid,
+				    lun->lun_id) != CAM_REQ_CMP) {
+					mps_dprint(sc, MPS_FAULT, "Unable to "
+					    "create LUN path to stop unit.\n");
+					xpt_free_ccb(ccb);
+					return;
+				}
+				xpt_path_string(ccb->ccb_h.path, path_str,
+				    sizeof(path_str));
+
+				mps_dprint(sc, MPS_INFO, "Sending StopUnit: "
+				    "path %s handle %d\n", path_str,
+				    target->handle);
+			
+				/*
+				 * Issue a START STOP UNIT command for the LUN.
+				 * Increment the SSU counter to be used to
+				 * count the number of required replies.
+				 */
+				mps_dprint(sc, MPS_INFO, "Incrementing SSU "
+				    "count\n");
+				sc->SSU_refcount++;
+				ccb->ccb_h.target_id =
+				    xpt_path_target_id(ccb->ccb_h.path);
+				ccb->ccb_h.target_lun = lun->lun_id;
+				ccb->ccb_h.ppriv_ptr1 = sassc;
+				scsi_start_stop(&ccb->csio,
+				    /*retries*/0,
+				    mpssas_stop_unit_done,
+				    MSG_SIMPLE_Q_TAG,
+				    /*start*/FALSE,
+				    /*load/eject*/0,
+				    /*immediate*/FALSE,
+				    MPS_SENSE_LEN,
+				    /*timeout*/10000);
+				xpt_action(ccb);
+			}
+		}
+	}
+
+	/*
+	 * Wait until all of the SSU commands have completed or time has
+	 * expired (60 seconds).  pause for 100ms each time through.  If any
+	 * command times out, the target will be reset in the SCSI command
+	 * timeout routine.
+	 */
+	getmicrotime(&start_time);
+	while (sc->SSU_refcount) {
+		pause("mpswait", hz/10);
+		
+		getmicrotime(&cur_time);
+		if ((cur_time.tv_sec - start_time.tv_sec) > 60) {
+			mps_dprint(sc, MPS_FAULT, "Time has expired waiting "
+			    "for SSU commands to complete.\n");
+			break;
+		}
+	}
+}
+
+static void
+mpssas_stop_unit_done(struct cam_periph *periph, union ccb *done_ccb)
+{
+	struct mpssas_softc *sassc;
+	char path_str[64];
+
+	sassc = (struct mpssas_softc *)done_ccb->ccb_h.ppriv_ptr1;
+
+	xpt_path_string(done_ccb->ccb_h.path, path_str, sizeof(path_str));
+	mps_dprint(sassc->sc, MPS_INFO, "Completing stop unit for %s\n",
+	    path_str);
+
+	if (done_ccb == NULL)
+		return;
+
+	/*
+	 * Nothing more to do except free the CCB and path.  If the command
+	 * timed out, an abort reset, then target reset will be issued during
+	 * the SCSI Command process.
+	 */
+	xpt_free_path(done_ccb->ccb_h.path);
+	xpt_free_ccb(done_ccb);
+}
+
 /**
  * mpssas_ir_shutdown - IR shutdown notification
  * @sc: per adapter object
@@ -933,7 +1068,7 @@ mpssas_ir_shutdown(struct mps_softc *sc)
 
 	/* is IR firmware build loaded? */
 	if (!sc->ir_firmware)
-		return;
+		goto out;
 
 	/* are there any volumes?  Look at IR target IDs. */
 	// TODO-later, this should be looked up in the RAID config structure
@@ -958,11 +1093,11 @@ mpssas_ir_shutdown(struct mps_softc *sc)
 	}
 
 	if (!found_volume)
-		return;
+		goto out;
 
 	if ((cm = mps_alloc_command(sc)) == NULL) {
 		printf("%s: command alloc failed\n", __func__);
-		return;
+		goto out;
 	}
 
 	action = (MPI2_RAID_ACTION_REQUEST *)cm->cm_req;
@@ -978,4 +1113,7 @@ mpssas_ir_shutdown(struct mps_softc *sc)
 	 */
 	if (cm)
 		mps_free_command(sc, cm);
+
+out:
+	mpssas_SSU_to_SATA_devices(sc);
 }
diff --git a/sys/dev/mps/mps_user.c b/sys/dev/mps/mps_user.c
index 9212f77f9c21..16ec4e4e623a 100644
--- a/sys/dev/mps/mps_user.c
+++ b/sys/dev/mps/mps_user.c
@@ -101,7 +101,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/mps/mps_ioctl.h>
 #include <dev/mps/mpsvar.h>
 #include <dev/mps/mps_table.h>
-#include <dev/mps/mps_sas.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 
diff --git a/sys/dev/mps/mpsvar.h b/sys/dev/mps/mpsvar.h
index 14015fa0d6d3..bae023e67668 100644
--- a/sys/dev/mps/mpsvar.h
+++ b/sys/dev/mps/mpsvar.h
@@ -32,7 +32,7 @@
 #ifndef _MPSVAR_H
 #define _MPSVAR_H
 
-#define MPS_DRIVER_VERSION	"16.00.00.00-fbsd"
+#define MPS_DRIVER_VERSION	"19.00.00.00-fbsd"
 
 #define MPS_DB_MAX_WAIT		2500
 
@@ -417,6 +417,10 @@ struct mps_softc {
 
 	char				exclude_ids[80];
 	struct timeval			lastfail;
+
+	/* StartStopUnit command handling at shutdown */
+	uint32_t			SSU_refcount;
+	uint8_t				SSU_started;
 };
 
 struct mps_config_params {
@@ -756,6 +760,10 @@ void mpssas_prepare_remove(struct mpssas_softc *sassc, uint16_t handle);
 void mpssas_prepare_volume_remove(struct mpssas_softc *sassc, uint16_t handle);
 int mpssas_startup(struct mps_softc *sc);
 struct mpssas_target * mpssas_find_target_by_handle(struct mpssas_softc *, int, uint16_t);
+void mpssas_realloc_targets(struct mps_softc *sc, int maxtargets);
+struct mps_command * mpssas_alloc_tm(struct mps_softc *sc);
+void mpssas_free_tm(struct mps_softc *sc, struct mps_command *tm);
+void mpssas_release_simq_reinit(struct mpssas_softc *sassc);
 
 SYSCTL_DECL(_hw_mps);
 
diff --git a/sys/dev/mpt/mpt_cam.c b/sys/dev/mpt/mpt_cam.c
index 7e3c140c22a4..25c4f33584f5 100644
--- a/sys/dev/mpt/mpt_cam.c
+++ b/sys/dev/mpt/mpt_cam.c
@@ -2449,8 +2449,11 @@ mpt_cam_event(struct mpt_softc *mpt, request_t *req,
 
 		pqf = (PTR_EVENT_DATA_QUEUE_FULL)msg->Data;
 		pqf->CurrentDepth = le16toh(pqf->CurrentDepth);
-		mpt_prt(mpt, "QUEUE FULL EVENT: Bus 0x%02x Target 0x%02x Depth "
-		    "%d\n", pqf->Bus, pqf->TargetID, pqf->CurrentDepth);
+		if (bootverbose) {
+		    mpt_prt(mpt, "QUEUE FULL EVENT: Bus 0x%02x Target 0x%02x "
+			"Depth %d\n",
+			pqf->Bus, pqf->TargetID, pqf->CurrentDepth);
+		}
 		if (mpt->phydisk_sim && mpt_is_raid_member(mpt,
 		    pqf->TargetID) != 0) {
 			sim = mpt->phydisk_sim;
diff --git a/sys/dev/mrsas/mrsas_fp.c b/sys/dev/mrsas/mrsas_fp.c
index 69a996f78241..91005a5c5855 100644
--- a/sys/dev/mrsas/mrsas_fp.c
+++ b/sys/dev/mrsas/mrsas_fp.c
@@ -1219,7 +1219,7 @@ void mrsas_set_pd_lba(MRSAS_RAID_SCSI_IO_REQUEST *io_request, u_int8_t cdb_len,
 	    opcode = cdb[0] == READ_6 ? READ_10 : WRITE_10;
 	    control = cdb[5];
 		
-	    memset(cdb, 0, sizeof(cdb));
+	    memset(cdb, 0, sizeof(io_request->CDB.CDB32));
 	    cdb[0] = opcode;
 	    cdb[9] = control;
 
diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c
index 8ad85a86cf77..dd5bb32cf34f 100644
--- a/sys/dev/mvs/mvs.c
+++ b/sys/dev/mvs/mvs.c
@@ -402,7 +402,6 @@ mvs_dmafini(device_t dev)
 		bus_dmamem_free(ch->dma.workrp_tag,
 		    ch->dma.workrp, ch->dma.workrp_map);
 		ch->dma.workrp_bus = 0;
-		ch->dma.workrp_map = NULL;
 		ch->dma.workrp = NULL;
 	}
 	if (ch->dma.workrp_tag) {
@@ -414,7 +413,6 @@ mvs_dmafini(device_t dev)
 		bus_dmamem_free(ch->dma.workrq_tag,
 		    ch->dma.workrq, ch->dma.workrq_map);
 		ch->dma.workrq_bus = 0;
-		ch->dma.workrq_map = NULL;
 		ch->dma.workrq = NULL;
 	}
 	if (ch->dma.workrq_tag) {
diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c
index b50e1a937907..7b3308848b61 100644
--- a/sys/dev/mwl/if_mwl.c
+++ b/sys/dev/mwl/if_mwl.c
@@ -188,31 +188,25 @@ static	int mwl_rxdesc = MWL_RXDESC;		/* # rx desc's to allocate */
 SYSCTL_INT(_hw_mwl, OID_AUTO, rxdesc, CTLFLAG_RW, &mwl_rxdesc,
 	    0, "rx descriptors allocated");
 static	int mwl_rxbuf = MWL_RXBUF;		/* # rx buffers to allocate */
-SYSCTL_INT(_hw_mwl, OID_AUTO, rxbuf, CTLFLAG_RW, &mwl_rxbuf,
+SYSCTL_INT(_hw_mwl, OID_AUTO, rxbuf, CTLFLAG_RWTUN, &mwl_rxbuf,
 	    0, "rx buffers allocated");
-TUNABLE_INT("hw.mwl.rxbuf", &mwl_rxbuf);
 static	int mwl_txbuf = MWL_TXBUF;		/* # tx buffers to allocate */
-SYSCTL_INT(_hw_mwl, OID_AUTO, txbuf, CTLFLAG_RW, &mwl_txbuf,
+SYSCTL_INT(_hw_mwl, OID_AUTO, txbuf, CTLFLAG_RWTUN, &mwl_txbuf,
 	    0, "tx buffers allocated");
-TUNABLE_INT("hw.mwl.txbuf", &mwl_txbuf);
 static	int mwl_txcoalesce = 8;		/* # tx packets to q before poking f/w*/
-SYSCTL_INT(_hw_mwl, OID_AUTO, txcoalesce, CTLFLAG_RW, &mwl_txcoalesce,
+SYSCTL_INT(_hw_mwl, OID_AUTO, txcoalesce, CTLFLAG_RWTUN, &mwl_txcoalesce,
 	    0, "tx buffers to send at once");
-TUNABLE_INT("hw.mwl.txcoalesce", &mwl_txcoalesce);
 static	int mwl_rxquota = MWL_RXBUF;		/* # max buffers to process */
-SYSCTL_INT(_hw_mwl, OID_AUTO, rxquota, CTLFLAG_RW, &mwl_rxquota,
+SYSCTL_INT(_hw_mwl, OID_AUTO, rxquota, CTLFLAG_RWTUN, &mwl_rxquota,
 	    0, "max rx buffers to process per interrupt");
-TUNABLE_INT("hw.mwl.rxquota", &mwl_rxquota);
 static	int mwl_rxdmalow = 3;			/* # min buffers for wakeup */
-SYSCTL_INT(_hw_mwl, OID_AUTO, rxdmalow, CTLFLAG_RW, &mwl_rxdmalow,
+SYSCTL_INT(_hw_mwl, OID_AUTO, rxdmalow, CTLFLAG_RWTUN, &mwl_rxdmalow,
 	    0, "min free rx buffers before restarting traffic");
-TUNABLE_INT("hw.mwl.rxdmalow", &mwl_rxdmalow);
 
 #ifdef MWL_DEBUG
 static	int mwl_debug = 0;
-SYSCTL_INT(_hw_mwl, OID_AUTO, debug, CTLFLAG_RW, &mwl_debug,
+SYSCTL_INT(_hw_mwl, OID_AUTO, debug, CTLFLAG_RWTUN, &mwl_debug,
 	    0, "control debugging printfs");
-TUNABLE_INT("hw.mwl.debug", &mwl_debug);
 enum {
 	MWL_DEBUG_XMIT		= 0x00000001,	/* basic xmit operation */
 	MWL_DEBUG_XMIT_DESC	= 0x00000002,	/* xmit descriptors */
@@ -2611,7 +2605,7 @@ mwl_rxbuf_init(struct mwl_softc *sc, struct mwl_rxbuf *bf)
 	return 0;
 }
 
-static int
+static void
 mwl_ext_free(struct mbuf *m, void *data, void *arg)
 {
 	struct mwl_softc *sc = arg;
@@ -2627,7 +2621,6 @@ mwl_ext_free(struct mbuf *m, void *data, void *arg)
 		sc->sc_rxblocked = 0;
 		mwl_hal_intrset(sc->sc_mh, sc->sc_imask);
 	}
-	return (EXT_FREE_OK);
 }
 
 struct mwl_frame_bar {
diff --git a/sys/dev/nand/nand.c b/sys/dev/nand/nand.c
index fb83e673861b..113953ef8f37 100644
--- a/sys/dev/nand/nand.c
+++ b/sys/dev/nand/nand.c
@@ -65,18 +65,9 @@ __FBSDID("$FreeBSD$");
 #define	SOFTECC_BYTES		3
 
 int nand_debug_flag = 0;
-SYSCTL_INT(_debug, OID_AUTO, nand_debug, CTLFLAG_RW, &nand_debug_flag, 0,
+SYSCTL_INT(_debug, OID_AUTO, nand_debug, CTLFLAG_RWTUN, &nand_debug_flag, 0,
     "NAND subsystem debug flag");
 
-static void
-nand_tunable_init(void *arg)
-{
-
-	TUNABLE_INT_FETCH("debug.nand", &nand_debug_flag);
-}
-
-SYSINIT(nand_tunables, SI_SUB_VFS, SI_ORDER_ANY, nand_tunable_init, NULL);
-
 MALLOC_DEFINE(M_NAND, "NAND", "NAND dynamic data");
 
 static void calculate_ecc(const uint8_t *, uint8_t *);
diff --git a/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c b/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
index 7076b7346e24..6a13b281f567 100644
--- a/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
+++ b/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c
@@ -40,6 +40,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_device_polling.h"
+#include "opt_netfpga.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -117,70 +118,92 @@ static poll_handler_t nf10bmac_poll;
 #define	NF10BMAC_DATA_SPORT_MASK	0x00ff0000
 #define	NF10BMAC_DATA_SPORT_SHIFT	16
 #define	NF10BMAC_DATA_LAST		0x00008000
+#ifdef NF10BMAC_64BIT
+#define	NF10BMAC_DATA_STRB		0x000000ff
+#define	REGWTYPE			uint64_t
+#else
 #define	NF10BMAC_DATA_STRB		0x0000000f
+#define	REGWTYPE			uint32_t
+#endif
 
 
 static inline void
-nf10bmac_write_4(struct resource *res, uint32_t reg, uint32_t val4,
+nf10bmac_write(struct resource *res, REGWTYPE reg, REGWTYPE val,
     const char *f __unused, const int l __unused)
 {
 
-	bus_write_4(res, reg, htole32(val4));
+#ifdef NF10BMAC_64BIT
+	bus_write_8(res, reg, htole64(val));
+#else
+	bus_write_4(res, reg, htole32(val));
+#endif
 }
 
-static inline uint32_t
-nf10bmac_read_4(struct resource *res, uint32_t reg,
+static inline REGWTYPE
+nf10bmac_read(struct resource *res, REGWTYPE reg,
     const char *f __unused, const int l __unused)
 {
 
+#ifdef NF10BMAC_64BIT
+	return (le64toh(bus_read_8(res, reg)));
+#else
 	return (le32toh(bus_read_4(res, reg)));
+#endif
 }
 
 static inline void
-nf10bmac_write_4_be(struct resource *res, uint32_t reg, uint32_t val4,
+nf10bmac_write_be(struct resource *res, REGWTYPE reg, REGWTYPE val,
     const char *f __unused, const int l __unused)
 {
 
-	bus_write_4(res, reg, htobe32(val4));
+#ifdef NF10BMAC_64BIT
+	bus_write_8(res, reg, htobe64(val));
+#else
+	bus_write_4(res, reg, htobe32(val));
+#endif
 }
 
 
-static inline uint32_t
-nf10bmac_read_4_be(struct resource *res, uint32_t reg,
+static inline REGWTYPE
+nf10bmac_read_be(struct resource *res, REGWTYPE reg,
     const char *f __unused, const int l __unused)
 {
 
+#ifdef NF10BMAC_64BIT
+	return (be64toh(bus_read_8(res, reg)));
+#else
 	return (be32toh(bus_read_4(res, reg)));
+#endif
 }
 
-#define	NF10BMAC_WRITE_CTRL_4(sc, reg, val)				\
-	nf10bmac_write_4((sc)->nf10bmac_ctrl_res, (reg), (val),		\
+#define	NF10BMAC_WRITE_CTRL(sc, reg, val)				\
+	nf10bmac_write((sc)->nf10bmac_ctrl_res, (reg), (val),		\
 	    __func__, __LINE__)
-#define	NF10BMAC_WRITE_4(sc, reg, val)					\
-	nf10bmac_write_4((sc)->nf10bmac_tx_mem_res, (reg), (val),	\
+#define	NF10BMAC_WRITE(sc, reg, val)					\
+	nf10bmac_write((sc)->nf10bmac_tx_mem_res, (reg), (val),		\
 	    __func__, __LINE__)
-#define	NF10BMAC_READ_4(sc, reg)					\
-	nf10bmac_read_4((sc)->nf10bmac_rx_mem_res, (reg),		\
+#define	NF10BMAC_READ(sc, reg)						\
+	nf10bmac_read((sc)->nf10bmac_rx_mem_res, (reg),			\
 	    __func__, __LINE__)
-#define	NF10BMAC_WRITE_4_BE(sc, reg, val)				\
-	nf10bmac_write_4_be((sc)->nf10bmac_tx_mem_res, (reg), (val),	\
+#define	NF10BMAC_WRITE_BE(sc, reg, val)					\
+	nf10bmac_write_be((sc)->nf10bmac_tx_mem_res, (reg), (val),	\
 	    __func__, __LINE__)
-#define	NF10BMAC_READ_4_BE(sc, reg)					\
-	nf10bmac_read_4_be((sc)->nf10bmac_rx_mem_res, (reg),		\
+#define	NF10BMAC_READ_BE(sc, reg)					\
+	nf10bmac_read_be((sc)->nf10bmac_rx_mem_res, (reg),		\
 	    __func__, __LINE__)
 
-#define	NF10BMAC_WRITE_INTR_4(sc, reg, val, _f, _l)			\
-	nf10bmac_write_4((sc)->nf10bmac_intr_res, (reg), (val),		\
+#define	NF10BMAC_WRITE_INTR(sc, reg, val, _f, _l)			\
+	nf10bmac_write((sc)->nf10bmac_intr_res, (reg), (val),		\
 	    (_f), (_l))
 
 #define	NF10BMAC_RX_INTR_CLEAR_DIS(sc)					\
-	NF10BMAC_WRITE_INTR_4((sc), NF10BMAC_INTR_CLEAR_DIS, 1,		\
+	NF10BMAC_WRITE_INTR((sc), NF10BMAC_INTR_CLEAR_DIS, 1,		\
 	__func__, __LINE__)
 #define	NF10BMAC_RX_INTR_ENABLE(sc)					\
-	NF10BMAC_WRITE_INTR_4((sc), NF10BMAC_INTR_CTRL, 1,		\
+	NF10BMAC_WRITE_INTR((sc), NF10BMAC_INTR_CTRL, 1,		\
 	__func__, __LINE__)
 #define	NF10BMAC_RX_INTR_DISABLE(sc)					\
-	NF10BMAC_WRITE_INTR_4((sc), NF10BMAC_INTR_CTRL, 0,		\
+	NF10BMAC_WRITE_INTR((sc), NF10BMAC_INTR_CTRL, 0,		\
 	__func__, __LINE__)
 
 
@@ -196,7 +219,7 @@ static int
 nf10bmac_tx_locked(struct nf10bmac_softc *sc, struct mbuf *m)
 {
 	int32_t len, l, ml;
-	uint32_t m4, val4;
+	REGWTYPE md, val;
 
 	NF10BMAC_LOCK_ASSERT(sc);
 
@@ -211,16 +234,16 @@ nf10bmac_tx_locked(struct nf10bmac_softc *sc, struct mbuf *m)
 	len = m->m_pkthdr.len;
 
 	/* Write the length at start of packet. */
-	NF10BMAC_WRITE_4(sc, NF10BMAC_TX_LEN, len);
+	NF10BMAC_WRITE(sc, NF10BMAC_TX_LEN, len);
 
 	/* Write the meta data and data. */
-	ml = len / sizeof(val4);
-	len -= (ml * sizeof(val4));
+	ml = len / sizeof(val);
+	len -= (ml * sizeof(val));
 	for (l = 0; l <= ml; l++) {
 		int32_t cl;
 
-		cl = sizeof(val4);
-		m4 = (NF10BMAC_TUSER_CPU0 << NF10BMAC_DATA_SPORT_SHIFT);
+		cl = sizeof(val);
+		md = (NF10BMAC_TUSER_CPU0 << NF10BMAC_DATA_SPORT_SHIFT);
 		if (l == ml || (len == 0 && l == (ml - 1))) {
 			if (l == ml && len == 0) {
 				break;
@@ -229,20 +252,20 @@ nf10bmac_tx_locked(struct nf10bmac_softc *sc, struct mbuf *m)
 				int sl;
 
 				if (l == (ml - 1))
-					len = 4;
+					len = sizeof(val);
 				cl = len;
 
 				for (s = 0, sl = len; sl > 0; sl--)
 					s |= (1 << (sl - 1));
-				m4 |= (s & NF10BMAC_DATA_STRB);
-				m4 |= NF10BMAC_DATA_LAST;
+				md |= (s & NF10BMAC_DATA_STRB);
+				md |= NF10BMAC_DATA_LAST;
 			}
 		} else {
-			m4 |= NF10BMAC_DATA_STRB;
+			md |= NF10BMAC_DATA_STRB;
 		}
-		NF10BMAC_WRITE_4(sc, NF10BMAC_TX_META, m4);
-		bcopy(&sc->nf10bmac_tx_buf[l*sizeof(val4)], &val4, cl);
-		NF10BMAC_WRITE_4_BE(sc, NF10BMAC_TX_DATA, val4);	
+		NF10BMAC_WRITE(sc, NF10BMAC_TX_META, md);
+		bcopy(&sc->nf10bmac_tx_buf[l*sizeof(val)], &val, cl);
+		NF10BMAC_WRITE_BE(sc, NF10BMAC_TX_DATA, val);	
 	}
 
 	/* If anyone is interested give them a copy. */
@@ -311,14 +334,14 @@ nf10bmac_start(struct ifnet *ifp)
 static void
 nf10bmac_eat_packet_munch_munch(struct nf10bmac_softc *sc)
 {
-	uint32_t m4, val4;
+	REGWTYPE md, val;
 
 	do {
-		m4 = NF10BMAC_READ_4_BE(sc, NF10BMAC_RX_META);
-		if ((m4 & NF10BMAC_DATA_STRB) != 0)
-			val4 = NF10BMAC_READ_4_BE(sc, NF10BMAC_RX_DATA);
-	} while ((m4 & NF10BMAC_DATA_STRB) != 0 &&
-	    (m4 & NF10BMAC_DATA_LAST) == 0);
+		md = NF10BMAC_READ_BE(sc, NF10BMAC_RX_META);
+		if ((md & NF10BMAC_DATA_STRB) != 0)
+			val = NF10BMAC_READ_BE(sc, NF10BMAC_RX_DATA);
+	} while ((md & NF10BMAC_DATA_STRB) != 0 &&
+	    (md & NF10BMAC_DATA_LAST) == 0);
 }
 
 static int
@@ -326,7 +349,7 @@ nf10bmac_rx_locked(struct nf10bmac_softc *sc)
 {
 	struct ifnet *ifp;
 	struct mbuf *m;
-	uint32_t m4, val4;
+	REGWTYPE md, val;
 	int32_t len, l;
 
 	/*
@@ -336,21 +359,21 @@ nf10bmac_rx_locked(struct nf10bmac_softc *sc)
 	 * skip to tlast).
 	 */
 
-	len = NF10BMAC_READ_4(sc, NF10BMAC_RX_LEN) & NF10BMAC_DATA_LEN_MASK;
+	len = NF10BMAC_READ(sc, NF10BMAC_RX_LEN) & NF10BMAC_DATA_LEN_MASK;
 	if (len > (MCLBYTES - ETHER_ALIGN)) {
 		nf10bmac_eat_packet_munch_munch(sc);
 		return (0);
 	}
 
-	m4 = NF10BMAC_READ_4(sc, NF10BMAC_RX_META);
-	if (len == 0 && (m4 & NF10BMAC_DATA_STRB) == 0) {
+	md = NF10BMAC_READ(sc, NF10BMAC_RX_META);
+	if (len == 0 && (md & NF10BMAC_DATA_STRB) == 0) {
 		/* No packet data available. */
 		return (0);
-	} else if (len == 0 && (m4 & NF10BMAC_DATA_STRB) != 0) {
+	} else if (len == 0 && (md & NF10BMAC_DATA_STRB) != 0) {
 		/* We are in the middle of a packet. */
 		nf10bmac_eat_packet_munch_munch(sc);
 		return (0);
-	} else if ((m4 & NF10BMAC_DATA_STRB) == 0) {
+	} else if ((md & NF10BMAC_DATA_STRB) == 0) {
 		/* Invalid length "hint". */
 		device_printf(sc->nf10bmac_dev,
 		    "Unexpected length %d on zero strb\n", len);
@@ -377,13 +400,13 @@ nf10bmac_rx_locked(struct nf10bmac_softc *sc)
 	ifp = sc->nf10bmac_ifp;
 	l = 0;
 /*
-	while ((m4 & NF10BMAC_DATA_STRB) != 0 && l < len) {
+	while ((md & NF10BMAC_DATA_STRB) != 0 && l < len) {
 */
 	while (l < len) {
 		size_t cl;
 
-		if ((m4 & NF10BMAC_DATA_LAST) == 0 &&
-		    (len - l) < sizeof(val4)) {
+		if ((md & NF10BMAC_DATA_LAST) == 0 &&
+		    (len - l) < sizeof(val)) {
 			/*
 			 * Our length and LAST disagree. We have a valid STRB.
 			 * We could continue until we fill the mbuf and just
@@ -394,34 +417,34 @@ nf10bmac_rx_locked(struct nf10bmac_softc *sc)
 			ifp->if_ierrors++;
 			m_freem(m);
 			return (0);
-		} else if ((len - l) <= sizeof(val4)) {
+		} else if ((len - l) <= sizeof(val)) {
 			cl = len - l;
 		} else {
-			cl = sizeof(val4);
+			cl = sizeof(val);
 		}
 
 		/* Read the first bytes of data as well. */
-		val4 = NF10BMAC_READ_4_BE(sc, NF10BMAC_RX_DATA);
-		bcopy(&val4, (uint8_t *)(m->m_data + l), cl);
+		val = NF10BMAC_READ_BE(sc, NF10BMAC_RX_DATA);
+		bcopy(&val, (uint8_t *)(m->m_data + l), cl);
 		l += cl;
 
-		if ((m4 & NF10BMAC_DATA_LAST) != 0 || l >= len)
+		if ((md & NF10BMAC_DATA_LAST) != 0 || l >= len)
 			break;
 		else {
 			DELAY(50);
-			m4 = NF10BMAC_READ_4(sc, NF10BMAC_RX_META);
+			md = NF10BMAC_READ(sc, NF10BMAC_RX_META);
 		}
 
 		cl = 10;
-		while ((m4 & NF10BMAC_DATA_STRB) == 0 && cl-- > 0) {
+		while ((md & NF10BMAC_DATA_STRB) == 0 && cl-- > 0) {
 			DELAY(10);
-			m4 = NF10BMAC_READ_4(sc, NF10BMAC_RX_META);
+			md = NF10BMAC_READ(sc, NF10BMAC_RX_META);
 		}
 	}
 	/* We should get out of this loop with tlast and tsrb. */
-	if ((m4 & NF10BMAC_DATA_LAST) == 0 || (m4 & NF10BMAC_DATA_STRB) == 0) {
+	if ((md & NF10BMAC_DATA_LAST) == 0 || (md & NF10BMAC_DATA_STRB) == 0) {
 		device_printf(sc->nf10bmac_dev, "Unexpected rx loop end state: "
-		    "m4=0x%08x len=%d l=%d\n", m4, len, l);
+		    "md=0x%08jx len=%d l=%d\n", (uintmax_t)md, len, l);
 		ifp->if_ierrors++;
 		m_freem(m);
 		return (0);
diff --git a/sys/dev/netfpga10g/nf10bmac/if_nf10bmac_fdt.c b/sys/dev/netfpga10g/nf10bmac/if_nf10bmac_fdt.c
index 4245da4170c2..3c22aa8aaa9f 100644
--- a/sys/dev/netfpga10g/nf10bmac/if_nf10bmac_fdt.c
+++ b/sys/dev/netfpga10g/nf10bmac/if_nf10bmac_fdt.c
@@ -90,80 +90,80 @@ nf10bmac_attach_fdt(device_t dev)
 
 	/*
 	 * LOOP memory region (this could be a general control region).
-	 * 0x00: 32bit register to enable a Y-"lopback".
+	 * 0x00: 32/64bit register to enable a Y-"lopback".
 	 */
-        sc->nf10bmac_ctrl_rid = 0;
-        sc->nf10bmac_ctrl_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
-            &sc->nf10bmac_ctrl_rid, RF_ACTIVE);
-        if (sc->nf10bmac_ctrl_res == NULL) {
-                device_printf(dev, "failed to map memory for CTRL region\n");
-                error = ENXIO;
-                goto err;
-        } 
-        if (bootverbose)
-                device_printf(sc->nf10bmac_dev, "CTRL region at mem %p-%p\n",
-                    (void *)rman_get_start(sc->nf10bmac_ctrl_res),
-                    (void *)(rman_get_start(sc->nf10bmac_ctrl_res) + 
-                    rman_get_size(sc->nf10bmac_ctrl_res)));
+	sc->nf10bmac_ctrl_rid = 0;
+	sc->nf10bmac_ctrl_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->nf10bmac_ctrl_rid, RF_ACTIVE);
+	if (sc->nf10bmac_ctrl_res == NULL) {
+		device_printf(dev, "failed to map memory for CTRL region\n");
+		error = ENXIO;
+		goto err;
+	} 
+	if (bootverbose)
+		device_printf(sc->nf10bmac_dev, "CTRL region at mem %p-%p\n",
+		    (void *)rman_get_start(sc->nf10bmac_ctrl_res),
+		    (void *)(rman_get_start(sc->nf10bmac_ctrl_res) + 
+		    rman_get_size(sc->nf10bmac_ctrl_res)));
 
-        /*
-         * TX and TX metadata FIFO memory region.
-         * 0x00: 32bit FIFO data,
-	 * 0x08: 32bit FIFO metadata,
-         * 0x10: 32bit packet length.
-         */
-        sc->nf10bmac_tx_mem_rid = 1;
-        sc->nf10bmac_tx_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
-            &sc->nf10bmac_tx_mem_rid, RF_ACTIVE);
-        if (sc->nf10bmac_tx_mem_res == NULL) {
-                device_printf(dev, "failed to map memory for TX FIFO\n");
-                error = ENXIO;
-                goto err;
-        }
-        if (bootverbose)
-                device_printf(sc->nf10bmac_dev, "TX FIFO at mem %p-%p\n",
-                    (void *)rman_get_start(sc->nf10bmac_tx_mem_res),
-                    (void *)(rman_get_start(sc->nf10bmac_tx_mem_res) +
-                    rman_get_size(sc->nf10bmac_tx_mem_res)));
+	/*
+	 * TX and TX metadata FIFO memory region.
+	 * 0x00: 32/64bit FIFO data,
+	 * 0x08: 32/64bit FIFO metadata,
+	 * 0x10: 32/64bit packet length.
+	 */
+	sc->nf10bmac_tx_mem_rid = 1;
+	sc->nf10bmac_tx_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->nf10bmac_tx_mem_rid, RF_ACTIVE);
+	if (sc->nf10bmac_tx_mem_res == NULL) {
+		device_printf(dev, "failed to map memory for TX FIFO\n");
+		error = ENXIO;
+		goto err;
+	}
+	if (bootverbose)
+		device_printf(sc->nf10bmac_dev, "TX FIFO at mem %p-%p\n",
+		    (void *)rman_get_start(sc->nf10bmac_tx_mem_res),
+		    (void *)(rman_get_start(sc->nf10bmac_tx_mem_res) +
+		    rman_get_size(sc->nf10bmac_tx_mem_res)));
 
-        /*
-         * RX and RXC metadata FIFO memory region.
-         * 0x00: 32bit FIFO data,
-	 * 0x08: 32bit FIFO metadata,
-         * 0x10: 32bit packet length.
-         */
-        sc->nf10bmac_rx_mem_rid = 2;
-        sc->nf10bmac_rx_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
-            &sc->nf10bmac_rx_mem_rid, RF_ACTIVE);
-        if (sc->nf10bmac_rx_mem_res == NULL) {
-                device_printf(dev, "failed to map memory for RX FIFO\n");
-                error = ENXIO;
-                goto err;
-        } 
-        if (bootverbose)
-                device_printf(sc->nf10bmac_dev, "RX FIFO at mem %p-%p\n",
-                    (void *)rman_get_start(sc->nf10bmac_rx_mem_res),
-                    (void *)(rman_get_start(sc->nf10bmac_rx_mem_res) + 
-                    rman_get_size(sc->nf10bmac_rx_mem_res)));
+	/*
+	 * RX and RXC metadata FIFO memory region.
+	 * 0x00: 32/64bit FIFO data,
+	 * 0x08: 32/64bit FIFO metadata,
+	 * 0x10: 32/64bit packet length.
+	 */
+	sc->nf10bmac_rx_mem_rid = 2;
+	sc->nf10bmac_rx_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->nf10bmac_rx_mem_rid, RF_ACTIVE);
+	if (sc->nf10bmac_rx_mem_res == NULL) {
+		device_printf(dev, "failed to map memory for RX FIFO\n");
+		error = ENXIO;
+		goto err;
+	} 
+	if (bootverbose)
+		device_printf(sc->nf10bmac_dev, "RX FIFO at mem %p-%p\n",
+		    (void *)rman_get_start(sc->nf10bmac_rx_mem_res),
+		    (void *)(rman_get_start(sc->nf10bmac_rx_mem_res) + 
+		    rman_get_size(sc->nf10bmac_rx_mem_res)));
 
 	/*
 	 * Interrupt handling registers.
-	 * 0x00: 32bit register to clear (and disable) the RX interrupt.
-	 * 0x08: 32bit register to enable or disable the RX interrupt.
+	 * 0x00: 32/64bit register to clear (and disable) the RX interrupt.
+	 * 0x08: 32/64bit register to enable or disable the RX interrupt.
 	 */
-        sc->nf10bmac_intr_rid = 3;
-        sc->nf10bmac_intr_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
-            &sc->nf10bmac_intr_rid, RF_ACTIVE);
-        if (sc->nf10bmac_intr_res == NULL) {
-                device_printf(dev, "failed to map memory for INTR region\n");
-                error = ENXIO;
-                goto err;
-        } 
-        if (bootverbose)
-                device_printf(sc->nf10bmac_dev, "INTR region at mem %p-%p\n",
-                    (void *)rman_get_start(sc->nf10bmac_intr_res),
-                    (void *)(rman_get_start(sc->nf10bmac_intr_res) + 
-                    rman_get_size(sc->nf10bmac_intr_res)));
+	sc->nf10bmac_intr_rid = 3;
+	sc->nf10bmac_intr_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->nf10bmac_intr_rid, RF_ACTIVE);
+	if (sc->nf10bmac_intr_res == NULL) {
+		device_printf(dev, "failed to map memory for INTR region\n");
+		error = ENXIO;
+		goto err;
+	} 
+	if (bootverbose)
+		device_printf(sc->nf10bmac_dev, "INTR region at mem %p-%p\n",
+		    (void *)rman_get_start(sc->nf10bmac_intr_res),
+		    (void *)(rman_get_start(sc->nf10bmac_intr_res) + 
+		    rman_get_size(sc->nf10bmac_intr_res)));
 
 	/* (Optional) RX and TX IRQ. */
 	sc->nf10bmac_rx_irq_rid = 0;
diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c
index 6101045f7014..36740218824e 100644
--- a/sys/dev/netmap/netmap_freebsd.c
+++ b/sys/dev/netmap/netmap_freebsd.c
@@ -221,9 +221,9 @@ generic_xmit_frame(struct ifnet *ifp, struct mbuf *m,
 	 * (and eventually, just reference the netmap buffer)
 	 */
 
-	if (*m->m_ext.ref_cnt != 1) {
+	if (*m->m_ext.ext_cnt != 1) {
 		D("invalid refcnt %d for %p",
-			*m->m_ext.ref_cnt, m);
+			*m->m_ext.ext_cnt, m);
 		panic("in generic_xmit_frame");
 	}
 	// XXX the ext_size check is unnecessary if we link the netmap buf
@@ -238,7 +238,7 @@ generic_xmit_frame(struct ifnet *ifp, struct mbuf *m,
 	}
 	m->m_len = m->m_pkthdr.len = len;
 	// inc refcount. All ours, we could skip the atomic
-	atomic_fetchadd_int(m->m_ext.ref_cnt, 1);
+	atomic_fetchadd_int(m->m_ext.ext_cnt, 1);
 	m->m_flags |= M_FLOWID;
 	m->m_pkthdr.flowid = ring_nr;
 	m->m_pkthdr.rcvif = ifp; /* used for tx notification */
diff --git a/sys/dev/netmap/netmap_generic.c b/sys/dev/netmap/netmap_generic.c
index a14dbc26aa80..97850cbf585d 100644
--- a/sys/dev/netmap/netmap_generic.c
+++ b/sys/dev/netmap/netmap_generic.c
@@ -126,8 +126,8 @@ netmap_default_mbuf_destructor(struct mbuf *m)
 	m->m_ext.ext_type = EXT_PACKET;
 	m->m_ext.ext_free = NULL;
 	m->m_ext.ext_arg1 = m->m_ext.ext_arg2 = NULL;
-	if (*(m->m_ext.ref_cnt) == 0)
-		*(m->m_ext.ref_cnt) = 1;
+	if (*(m->m_ext.ext_cnt) == 0)
+		*(m->m_ext.ext_cnt) = 1;
 	uma_zfree(zone_pack, m);
 } 
 
@@ -141,12 +141,12 @@ netmap_get_mbuf(int len)
 		m->m_ext.ext_arg2 = m->m_ext.ext_buf; /* save original */
 		m->m_ext.ext_free = (void *)netmap_default_mbuf_destructor;
 		m->m_ext.ext_type = EXT_EXTREF;
-		ND(5, "create m %p refcnt %d", m, *m->m_ext.ref_cnt);
+		ND(5, "create m %p refcnt %d", m, *m->m_ext.ext_cnt);
 	}
 	return m;
 } 
 
-#define GET_MBUF_REFCNT(m)	((m)->m_ext.ref_cnt ? *(m)->m_ext.ref_cnt : -1)
+#define GET_MBUF_REFCNT(m)	((m)->m_ext.ext_cnt ? *(m)->m_ext.ext_cnt : -1)
 
 
 
diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c
index 806a4ee95bcb..85821b10d8c7 100644
--- a/sys/dev/nfe/if_nfe.c
+++ b/sys/dev/nfe/if_nfe.c
@@ -88,7 +88,7 @@ static void nfe_mac_config(struct nfe_softc *, struct mii_data *);
 static void nfe_set_intr(struct nfe_softc *);
 static __inline void nfe_enable_intr(struct nfe_softc *);
 static __inline void nfe_disable_intr(struct nfe_softc *);
-static int  nfe_ioctl(struct ifnet *, u_long, caddr_t);
+static int  nfe_ioctl(if_t, u_long, caddr_t);
 static void nfe_alloc_msix(struct nfe_softc *, int);
 static int nfe_intr(void *);
 static void nfe_int_task(void *, int);
@@ -101,12 +101,12 @@ static int  nfe_jrxeof(struct nfe_softc *, int, int *);
 static void nfe_txeof(struct nfe_softc *);
 static int  nfe_encap(struct nfe_softc *, struct mbuf **);
 static void nfe_setmulti(struct nfe_softc *);
-static void nfe_start(struct ifnet *);
-static void nfe_start_locked(struct ifnet *);
-static void nfe_watchdog(struct ifnet *);
+static void nfe_start(if_t);
+static void nfe_start_locked(if_t);
+static void nfe_watchdog(if_t);
 static void nfe_init(void *);
 static void nfe_init_locked(void *);
-static void nfe_stop(struct ifnet *);
+static void nfe_stop(if_t);
 static int  nfe_alloc_rx_ring(struct nfe_softc *, struct nfe_rx_ring *);
 static void nfe_alloc_jrx_ring(struct nfe_softc *, struct nfe_jrx_ring *);
 static int  nfe_init_rx_ring(struct nfe_softc *, struct nfe_rx_ring *);
@@ -116,8 +116,8 @@ static void nfe_free_jrx_ring(struct nfe_softc *, struct nfe_jrx_ring *);
 static int  nfe_alloc_tx_ring(struct nfe_softc *, struct nfe_tx_ring *);
 static void nfe_init_tx_ring(struct nfe_softc *, struct nfe_tx_ring *);
 static void nfe_free_tx_ring(struct nfe_softc *, struct nfe_tx_ring *);
-static int  nfe_ifmedia_upd(struct ifnet *);
-static void nfe_ifmedia_sts(struct ifnet *, struct ifmediareq *);
+static int  nfe_ifmedia_upd(if_t);
+static void nfe_ifmedia_sts(if_t, struct ifmediareq *);
 static void nfe_tick(void *);
 static void nfe_get_macaddr(struct nfe_softc *, uint8_t *);
 static void nfe_set_macaddr(struct nfe_softc *, uint8_t *);
@@ -364,7 +364,7 @@ static int
 nfe_attach(device_t dev)
 {
 	struct nfe_softc *sc;
-	struct ifnet *ifp;
+	if_t ifp;
 	bus_addr_t dma_addr_max;
 	int error = 0, i, msic, phyloc, reg, rid;
 
@@ -570,9 +570,9 @@ nfe_attach(device_t dev)
 	if (error)
 		goto fail;
 
-	ifp = sc->nfe_ifp = if_alloc(IFT_ETHER);
+	ifp = sc->nfe_ifp = if_gethandle(IFT_ETHER);
 	if (ifp == NULL) {
-		device_printf(dev, "can not if_alloc()\n");
+		device_printf(dev, "can not if_gethandle()\n");
 		error = ENOSPC;
 		goto fail;
 	}
@@ -590,47 +590,47 @@ nfe_attach(device_t dev)
 	/* Create sysctl node. */
 	nfe_sysctl_node(sc);
 
-	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 = nfe_ioctl;
-	ifp->if_start = nfe_start;
-	ifp->if_hwassist = 0;
-	ifp->if_capabilities = 0;
-	ifp->if_init = nfe_init;
-	IFQ_SET_MAXLEN(&ifp->if_snd, NFE_TX_RING_COUNT - 1);
-	ifp->if_snd.ifq_drv_maxlen = NFE_TX_RING_COUNT - 1;
-	IFQ_SET_READY(&ifp->if_snd);
+	if_setsoftc(ifp, sc);
+	if_initname_drv(ifp, device_get_name(dev), device_get_unit(dev));
+	if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
+	if_setioctlfn(ifp, nfe_ioctl);
+	if_setstartfn(ifp, nfe_start);
+	if_sethwassist(ifp, 0);
+	if_setcapabilities(ifp, 0);
+	if_setinitfn(ifp, nfe_init);
+	if_setsendqlen(ifp, NFE_TX_RING_COUNT - 1);
+	if_setsendqready(ifp);
+
 
 	if (sc->nfe_flags & NFE_HW_CSUM) {
-		ifp->if_capabilities |= IFCAP_HWCSUM | IFCAP_TSO4;
-		ifp->if_hwassist |= NFE_CSUM_FEATURES | CSUM_TSO;
+		if_setcapabilitiesbit(ifp, IFCAP_HWCSUM | IFCAP_TSO4, 0);
+		if_sethwassistbits(ifp, NFE_CSUM_FEATURES | CSUM_TSO, 0);
 	}
-	ifp->if_capenable = ifp->if_capabilities;
+	if_setcapenable(ifp, if_getcapabilities(ifp));
 
-	sc->nfe_framesize = ifp->if_mtu + NFE_RX_HEADERS;
+	sc->nfe_framesize = if_getmtu(ifp) + NFE_RX_HEADERS;
 	/* VLAN capability setup. */
-	ifp->if_capabilities |= IFCAP_VLAN_MTU;
+	if_setcapabilitiesbit(ifp, IFCAP_VLAN_MTU, 0);
 	if ((sc->nfe_flags & NFE_HW_VLAN) != 0) {
-		ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING;
-		if ((ifp->if_capabilities & IFCAP_HWCSUM) != 0)
-			ifp->if_capabilities |= IFCAP_VLAN_HWCSUM |
-			    IFCAP_VLAN_HWTSO;
+		if_setcapabilitiesbit(ifp, IFCAP_VLAN_HWTAGGING, 0);
+		if ((if_getcapabilities(ifp) & IFCAP_HWCSUM) != 0)
+			if_setcapabilitiesbit(ifp,
+			    (IFCAP_VLAN_HWCSUM | IFCAP_VLAN_HWTSO), 0);
 	}
 
 	if (pci_find_cap(dev, PCIY_PMG, &reg) == 0)
-		ifp->if_capabilities |= IFCAP_WOL_MAGIC;
-	ifp->if_capenable = ifp->if_capabilities;
+		if_setcapabilitiesbit(ifp, IFCAP_WOL_MAGIC, 0);
+	if_setcapenable(ifp, if_getcapabilities(ifp));
 
 	/*
 	 * Tell the upper layer(s) we support long frames.
-	 * Must appear after the call to ether_ifattach() because
-	 * ether_ifattach() sets ifi_hdrlen to the default value.
+	 * Must appear after the call to ether_ifattach_drv() because
+	 * ether_ifattach_drv() sets ifi_hdrlen to the default value.
 	 */
-	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	if_setifheaderlen(ifp, sizeof(struct ether_vlan_header));
 
 #ifdef DEVICE_POLLING
-	ifp->if_capabilities |= IFCAP_POLLING;
+	if_setcapabilitiesbit(ifp, IFCAP_POLLING, 0);
 #endif
 
 	/* Do MII setup */
@@ -642,14 +642,14 @@ nfe_attach(device_t dev)
 		if (nfe_detect_msik9(sc) != 0)
 			phyloc = 0;
 	}
-	error = mii_attach(dev, &sc->nfe_miibus, ifp, nfe_ifmedia_upd,
-	    nfe_ifmedia_sts, BMSR_DEFCAPMASK, phyloc, MII_OFFSET_ANY,
-	    MIIF_DOPAUSE);
+	error = mii_attach(dev, &sc->nfe_miibus, ifp,
+	    (ifm_change_cb_t)nfe_ifmedia_upd, (ifm_stat_cb_t)nfe_ifmedia_sts,
+	    BMSR_DEFCAPMASK, phyloc, MII_OFFSET_ANY, MIIF_DOPAUSE);
 	if (error != 0) {
 		device_printf(dev, "attaching PHYs failed\n");
 		goto fail;
 	}
-	ether_ifattach(ifp, sc->eaddr);
+	ether_ifattach_drv(ifp, sc->eaddr);
 
 	TASK_INIT(&sc->nfe_int_task, 0, nfe_int_task, sc);
 	sc->nfe_tq = taskqueue_create_fast("nfe_taskq", M_WAITOK,
@@ -674,7 +674,7 @@ nfe_attach(device_t dev)
 		device_printf(dev, "couldn't set up irq\n");
 		taskqueue_free(sc->nfe_tq);
 		sc->nfe_tq = NULL;
-		ether_ifdetach(ifp);
+		ether_ifdetach_drv(ifp);
 		goto fail;
 	}
 
@@ -690,7 +690,7 @@ static int
 nfe_detach(device_t dev)
 {
 	struct nfe_softc *sc;
-	struct ifnet *ifp;
+	if_t ifp;
 	uint8_t eaddr[ETHER_ADDR_LEN];
 	int i, rid;
 
@@ -699,16 +699,16 @@ nfe_detach(device_t dev)
 	ifp = sc->nfe_ifp;
 
 #ifdef DEVICE_POLLING
-	if (ifp != NULL && ifp->if_capenable & IFCAP_POLLING)
+	if (ifp != NULL && if_getcapenable(ifp) & IFCAP_POLLING)
 		ether_poll_deregister(ifp);
 #endif
 	if (device_is_attached(dev)) {
 		NFE_LOCK(sc);
 		nfe_stop(ifp);
-		ifp->if_flags &= ~IFF_UP;
+		if_setflagbits(ifp, 0, IFF_UP);
 		NFE_UNLOCK(sc);
 		callout_drain(&sc->nfe_stat_ch);
-		ether_ifdetach(ifp);
+		ether_ifdetach_drv(ifp);
 	}
 
 	if (ifp) {
@@ -720,7 +720,7 @@ nfe_detach(device_t dev)
 		} else
 			bcopy(sc->eaddr, eaddr, ETHER_ADDR_LEN);
 		nfe_set_macaddr(sc, eaddr);
-		if_free(ifp);
+		if_free_drv(ifp);
 	}
 	if (sc->nfe_miibus)
 		device_delete_child(dev, sc->nfe_miibus);
@@ -805,14 +805,14 @@ static int
 nfe_resume(device_t dev)
 {
 	struct nfe_softc *sc;
-	struct ifnet *ifp;
+	if_t ifp;
 
 	sc = device_get_softc(dev);
 
 	NFE_LOCK(sc);
 	nfe_power(sc);
 	ifp = sc->nfe_ifp;
-	if (ifp->if_flags & IFF_UP)
+	if (if_getflags(ifp) & IFF_UP)
 		nfe_init_locked(sc);
 	sc->nfe_suspended = 0;
 	NFE_UNLOCK(sc);
@@ -892,7 +892,7 @@ nfe_miibus_statchg(device_t dev)
 {
 	struct nfe_softc *sc;
 	struct mii_data *mii;
-	struct ifnet *ifp;
+	if_t ifp;
 	uint32_t rxctl, txctl;
 
 	sc = device_get_softc(dev);
@@ -917,7 +917,7 @@ nfe_miibus_statchg(device_t dev)
 	nfe_mac_config(sc, mii);
 	txctl = NFE_READ(sc, NFE_TX_CTL);
 	rxctl = NFE_READ(sc, NFE_RX_CTL);
-	if (sc->nfe_link != 0 && (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) {
+	if (sc->nfe_link != 0 && (if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) {
 		txctl |= NFE_TX_START;
 		rxctl |= NFE_RX_START;
 	} else {
@@ -1410,7 +1410,6 @@ nfe_free_rx_ring(struct nfe_softc *sc, struct nfe_rx_ring *ring)
 		bus_dmamem_free(ring->rx_desc_tag, desc, ring->rx_desc_map);
 		ring->desc64 = NULL;
 		ring->desc32 = NULL;
-		ring->rx_desc_map = NULL;
 	}
 	if (ring->rx_desc_tag != NULL) {
 		bus_dma_tag_destroy(ring->rx_desc_tag);
@@ -1464,7 +1463,6 @@ nfe_free_jrx_ring(struct nfe_softc *sc, struct nfe_jrx_ring *ring)
 		bus_dmamem_free(ring->jrx_desc_tag, desc, ring->jrx_desc_map);
 		ring->jdesc64 = NULL;
 		ring->jdesc32 = NULL;
-		ring->jrx_desc_map = NULL;
 	}
 
 	if (ring->jrx_desc_tag != NULL) {
@@ -1626,26 +1624,25 @@ nfe_free_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring)
 		bus_dmamem_free(ring->tx_desc_tag, desc, ring->tx_desc_map);
 		ring->desc64 = NULL;
 		ring->desc32 = NULL;
-		ring->tx_desc_map = NULL;
 		bus_dma_tag_destroy(ring->tx_desc_tag);
 		ring->tx_desc_tag = NULL;
 	}
 }
 
 #ifdef DEVICE_POLLING
-static poll_handler_t nfe_poll;
+static poll_handler_drv_t nfe_poll;
 
 
 static int
-nfe_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
+nfe_poll(if_t ifp, enum poll_cmd cmd, int count)
 {
-	struct nfe_softc *sc = ifp->if_softc;
+	struct nfe_softc *sc = if_getsoftc(ifp);
 	uint32_t r;
 	int rx_npkts = 0;
 
 	NFE_LOCK(sc);
 
-	if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
+	if (!(if_getdrvflags(ifp) & IFF_DRV_RUNNING)) {
 		NFE_UNLOCK(sc);
 		return (rx_npkts);
 	}
@@ -1655,7 +1652,7 @@ nfe_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
 	else
 		rx_npkts = nfe_rxeof(sc, count, &rx_npkts);
 	nfe_txeof(sc);
-	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
+	if (!if_sendq_empty(ifp))
 		nfe_start_locked(ifp);
 
 	if (cmd == POLL_AND_CHECK_STATUS) {
@@ -1713,14 +1710,14 @@ nfe_disable_intr(struct nfe_softc *sc)
 
 
 static int
-nfe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
+nfe_ioctl(if_t ifp, u_long cmd, caddr_t data)
 {
 	struct nfe_softc *sc;
 	struct ifreq *ifr;
 	struct mii_data *mii;
 	int error, init, mask;
 
-	sc = ifp->if_softc;
+	sc = if_getsoftc(ifp);
 	ifr = (struct ifreq *) data;
 	error = 0;
 	init = 0;
@@ -1728,16 +1725,16 @@ nfe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	case SIOCSIFMTU:
 		if (ifr->ifr_mtu < ETHERMIN || ifr->ifr_mtu > NFE_JUMBO_MTU)
 			error = EINVAL;
-		else if (ifp->if_mtu != ifr->ifr_mtu) {
+		else if (if_getmtu(ifp) != ifr->ifr_mtu) {
 			if ((((sc->nfe_flags & NFE_JUMBO_SUP) == 0) ||
 			    (sc->nfe_jumbo_disable != 0)) &&
 			    ifr->ifr_mtu > ETHERMTU)
 				error = EINVAL;
 			else {
 				NFE_LOCK(sc);
-				ifp->if_mtu = ifr->ifr_mtu;
-				if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
-					ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
+				if_setmtu(ifp, ifr->ifr_mtu);
+				if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
+					if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
 					nfe_init_locked(sc);
 				}
 				NFE_UNLOCK(sc);
@@ -1746,29 +1743,29 @@ nfe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		break;
 	case SIOCSIFFLAGS:
 		NFE_LOCK(sc);
-		if (ifp->if_flags & IFF_UP) {
+		if (if_getflags(ifp) & IFF_UP) {
 			/*
 			 * If only the PROMISC or ALLMULTI flag changes, then
 			 * don't do a full re-init of the chip, just update
 			 * the Rx filter.
 			 */
-			if ((ifp->if_drv_flags & IFF_DRV_RUNNING) &&
-			    ((ifp->if_flags ^ sc->nfe_if_flags) &
+			if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) &&
+			    ((if_getflags(ifp) ^ sc->nfe_if_flags) &
 			     (IFF_ALLMULTI | IFF_PROMISC)) != 0)
 				nfe_setmulti(sc);
 			else
 				nfe_init_locked(sc);
 		} else {
-			if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+			if (if_getdrvflags(ifp) & IFF_DRV_RUNNING)
 				nfe_stop(ifp);
 		}
-		sc->nfe_if_flags = ifp->if_flags;
+		sc->nfe_if_flags = if_getflags(ifp);
 		NFE_UNLOCK(sc);
 		error = 0;
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
-		if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) {
+		if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) {
 			NFE_LOCK(sc);
 			nfe_setmulti(sc);
 			NFE_UNLOCK(sc);
@@ -1778,62 +1775,62 @@ nfe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
 		mii = device_get_softc(sc->nfe_miibus);
-		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, cmd);
+		error = ifmedia_ioctl_drv(ifp, ifr, &mii->mii_media, cmd);
 		break;
 	case SIOCSIFCAP:
-		mask = ifr->ifr_reqcap ^ ifp->if_capenable;
+		mask = ifr->ifr_reqcap ^ if_getcapenable(ifp);
 #ifdef DEVICE_POLLING
 		if ((mask & IFCAP_POLLING) != 0) {
 			if ((ifr->ifr_reqcap & IFCAP_POLLING) != 0) {
-				error = ether_poll_register(nfe_poll, ifp);
+				error = ether_poll_register_drv(nfe_poll, ifp);
 				if (error)
 					break;
 				NFE_LOCK(sc);
 				nfe_disable_intr(sc);
-				ifp->if_capenable |= IFCAP_POLLING;
+				if_setcapenablebit(ifp, IFCAP_POLLING, 0);
 				NFE_UNLOCK(sc);
 			} else {
 				error = ether_poll_deregister(ifp);
 				/* Enable interrupt even in error case */
 				NFE_LOCK(sc);
 				nfe_enable_intr(sc);
-				ifp->if_capenable &= ~IFCAP_POLLING;
+				if_setcapenablebit(ifp, 0, IFCAP_POLLING);
 				NFE_UNLOCK(sc);
 			}
 		}
 #endif /* DEVICE_POLLING */
 		if ((mask & IFCAP_WOL_MAGIC) != 0 &&
-		    (ifp->if_capabilities & IFCAP_WOL_MAGIC) != 0)
-			ifp->if_capenable ^= IFCAP_WOL_MAGIC;
+		    (if_getcapabilities(ifp) & IFCAP_WOL_MAGIC) != 0)
+			if_togglecapenable(ifp, IFCAP_WOL_MAGIC);
 		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 |= NFE_CSUM_FEATURES;
+		    (if_getcapabilities(ifp) & IFCAP_TXCSUM) != 0) {
+			if_togglecapenable(ifp, IFCAP_TXCSUM);
+			if ((if_getcapenable(ifp) & IFCAP_TXCSUM) != 0)
+				if_sethwassistbits(ifp, NFE_CSUM_FEATURES, 0);
 			else
-				ifp->if_hwassist &= ~NFE_CSUM_FEATURES;
+				if_sethwassistbits(ifp, 0, NFE_CSUM_FEATURES);
 		}
 		if ((mask & IFCAP_RXCSUM) != 0 &&
-		    (ifp->if_capabilities & IFCAP_RXCSUM) != 0) {
-			ifp->if_capenable ^= IFCAP_RXCSUM;
+		    (if_getcapabilities(ifp) & IFCAP_RXCSUM) != 0) {
+			if_togglecapenable(ifp, IFCAP_RXCSUM);
 			init++;
 		}
 		if ((mask & IFCAP_TSO4) != 0 &&
-		    (ifp->if_capabilities & IFCAP_TSO4) != 0) {
-			ifp->if_capenable ^= IFCAP_TSO4;
-			if ((IFCAP_TSO4 & ifp->if_capenable) != 0)
-				ifp->if_hwassist |= CSUM_TSO;
+		    (if_getcapabilities(ifp) & IFCAP_TSO4) != 0) {
+			if_togglecapenable(ifp, IFCAP_TSO4);
+			if ((IFCAP_TSO4 & if_getcapenable(ifp)) != 0)
+				if_sethwassistbits(ifp, CSUM_TSO, 0);
 			else
-				ifp->if_hwassist &= ~CSUM_TSO;
+				if_sethwassistbits(ifp, 0, CSUM_TSO);
 		}
 		if ((mask & IFCAP_VLAN_HWTSO) != 0 &&
-		    (ifp->if_capabilities & IFCAP_VLAN_HWTSO) != 0)
-			ifp->if_capenable ^= IFCAP_VLAN_HWTSO;
+		    (if_getcapabilities(ifp) & IFCAP_VLAN_HWTSO) != 0)
+			if_togglecapenable(ifp, IFCAP_VLAN_HWTSO);
 		if ((mask & IFCAP_VLAN_HWTAGGING) != 0 &&
-		    (ifp->if_capabilities & IFCAP_VLAN_HWTAGGING) != 0) {
-			ifp->if_capenable ^= IFCAP_VLAN_HWTAGGING;
-			if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) == 0)
-				ifp->if_capenable &= ~IFCAP_VLAN_HWTSO;
+		    (if_getcapabilities(ifp) & IFCAP_VLAN_HWTAGGING) != 0) {
+			if_togglecapenable(ifp, IFCAP_VLAN_HWTAGGING);
+			if ((if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) == 0)
+				if_setcapenablebit(ifp, 0, IFCAP_VLAN_HWTSO);
 			init++;
 		}
 		/*
@@ -1843,20 +1840,20 @@ nfe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		 * VLAN stripping. So when we know Rx checksum offload is
 		 * disabled turn entire hardware VLAN assist off.
 		 */
-		if ((ifp->if_capenable & IFCAP_RXCSUM) == 0) {
-			if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0)
+		if ((if_getcapenable(ifp) & IFCAP_RXCSUM) == 0) {
+			if ((if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) != 0)
 				init++;
-			ifp->if_capenable &= ~(IFCAP_VLAN_HWTAGGING |
-			    IFCAP_VLAN_HWTSO);
+			if_setcapenablebit(ifp, 0,
+			    (IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_HWTSO));
 		}
-		if (init > 0 && (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) {
-			ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
+		if (init > 0 && (if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) {
+			if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
 			nfe_init(sc);
 		}
-		VLAN_CAPABILITIES(ifp);
+		if_vlancap(ifp);
 		break;
 	default:
-		error = ether_ioctl(ifp, cmd, data);
+		error = ether_ioctl_drv(ifp, cmd, data);
 		break;
 	}
 
@@ -1886,7 +1883,7 @@ static void
 nfe_int_task(void *arg, int pending)
 {
 	struct nfe_softc *sc = arg;
-	struct ifnet *ifp = sc->nfe_ifp;
+	if_t ifp = sc->nfe_ifp;
 	uint32_t r;
 	int domore;
 
@@ -1902,7 +1899,7 @@ nfe_int_task(void *arg, int pending)
 	DPRINTFN(sc, 5, "nfe_intr: interrupt register %x\n", r);
 
 #ifdef DEVICE_POLLING
-	if (ifp->if_capenable & IFCAP_POLLING) {
+	if (if_getcapenable(ifp) & IFCAP_POLLING) {
 		NFE_UNLOCK(sc);
 		return;
 	}
@@ -1914,7 +1911,7 @@ nfe_int_task(void *arg, int pending)
 		DPRINTF(sc, "link state changed\n");
 	}
 
-	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
+	if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) {
 		NFE_UNLOCK(sc);
 		nfe_disable_intr(sc);
 		return;
@@ -1929,7 +1926,7 @@ nfe_int_task(void *arg, int pending)
 	/* check Tx ring */
 	nfe_txeof(sc);
 
-	if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
+	if (!if_sendq_empty(ifp))
 		nfe_start_locked(ifp);
 
 	NFE_UNLOCK(sc);
@@ -2114,7 +2111,7 @@ nfe_jnewbuf(struct nfe_softc *sc, int idx)
 static int
 nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 {
-	struct ifnet *ifp = sc->nfe_ifp;
+	if_t ifp = sc->nfe_ifp;
 	struct nfe_desc32 *desc32;
 	struct nfe_desc64 *desc64;
 	struct nfe_rx_data *data;
@@ -2152,7 +2149,7 @@ nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 		prog++;
 		if ((sc->nfe_flags & (NFE_JUMBO_SUP | NFE_40BIT_ADDR)) == 0) {
 			if (!(flags & NFE_RX_VALID_V1)) {
-				ifp->if_ierrors++;
+				if_incierrors(ifp, 1);
 				nfe_discard_rxbuf(sc, sc->rxq.cur);
 				continue;
 			}
@@ -2162,7 +2159,7 @@ nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 			}
 		} else {
 			if (!(flags & NFE_RX_VALID_V2)) {
-				ifp->if_ierrors++;
+				if_incierrors(ifp, 1);
 				nfe_discard_rxbuf(sc, sc->rxq.cur);
 				continue;
 			}
@@ -2174,20 +2171,20 @@ nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 		}
 
 		if (flags & NFE_RX_ERROR) {
-			ifp->if_ierrors++;
+			if_incierrors(ifp, 1);
 			nfe_discard_rxbuf(sc, sc->rxq.cur);
 			continue;
 		}
 
 		m = data->m;
 		if (nfe_newbuf(sc, sc->rxq.cur) != 0) {
-			ifp->if_iqdrops++;
+			if_inciqdrops(ifp, 1);
 			nfe_discard_rxbuf(sc, sc->rxq.cur);
 			continue;
 		}
 
 		if ((vtag & NFE_RX_VTAG) != 0 &&
-		    (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0) {
+		    (if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) != 0) {
 			m->m_pkthdr.ether_vtag = vtag & 0xffff;
 			m->m_flags |= M_VLANTAG;
 		}
@@ -2195,7 +2192,7 @@ nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 		m->m_pkthdr.len = m->m_len = len;
 		m->m_pkthdr.rcvif = ifp;
 
-		if ((ifp->if_capenable & IFCAP_RXCSUM) != 0) {
+		if ((if_getcapenable(ifp) & IFCAP_RXCSUM) != 0) {
 			if ((flags & NFE_RX_IP_CSUMOK) != 0) {
 				m->m_pkthdr.csum_flags |= CSUM_IP_CHECKED;
 				m->m_pkthdr.csum_flags |= CSUM_IP_VALID;
@@ -2208,10 +2205,10 @@ nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 			}
 		}
 
-		ifp->if_ipackets++;
+		if_incipackets(ifp, 1);
 
 		NFE_UNLOCK(sc);
-		(*ifp->if_input)(ifp, m);
+		if_input(ifp, m);
 		NFE_LOCK(sc);
 		rx_npkts++;
 	}
@@ -2229,7 +2226,7 @@ nfe_rxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 static int
 nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 {
-	struct ifnet *ifp = sc->nfe_ifp;
+	if_t ifp = sc->nfe_ifp;
 	struct nfe_desc32 *desc32;
 	struct nfe_desc64 *desc64;
 	struct nfe_rx_data *data;
@@ -2268,7 +2265,7 @@ nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 		prog++;
 		if ((sc->nfe_flags & (NFE_JUMBO_SUP | NFE_40BIT_ADDR)) == 0) {
 			if (!(flags & NFE_RX_VALID_V1)) {
-				ifp->if_ierrors++;
+				if_incierrors(ifp, 1);
 				nfe_discard_jrxbuf(sc, sc->jrxq.jcur);
 				continue;
 			}
@@ -2278,7 +2275,7 @@ nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 			}
 		} else {
 			if (!(flags & NFE_RX_VALID_V2)) {
-				ifp->if_ierrors++;
+				if_incierrors(ifp, 1);
 				nfe_discard_jrxbuf(sc, sc->jrxq.jcur);
 				continue;
 			}
@@ -2290,20 +2287,20 @@ nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 		}
 
 		if (flags & NFE_RX_ERROR) {
-			ifp->if_ierrors++;
+			if_incierrors(ifp, 1);
 			nfe_discard_jrxbuf(sc, sc->jrxq.jcur);
 			continue;
 		}
 
 		m = data->m;
 		if (nfe_jnewbuf(sc, sc->jrxq.jcur) != 0) {
-			ifp->if_iqdrops++;
+			if_inciqdrops(ifp, 1);
 			nfe_discard_jrxbuf(sc, sc->jrxq.jcur);
 			continue;
 		}
 
 		if ((vtag & NFE_RX_VTAG) != 0 &&
-		    (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0) {
+		    (if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) != 0) {
 			m->m_pkthdr.ether_vtag = vtag & 0xffff;
 			m->m_flags |= M_VLANTAG;
 		}
@@ -2311,7 +2308,7 @@ nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 		m->m_pkthdr.len = m->m_len = len;
 		m->m_pkthdr.rcvif = ifp;
 
-		if ((ifp->if_capenable & IFCAP_RXCSUM) != 0) {
+		if ((if_getcapenable(ifp) & IFCAP_RXCSUM) != 0) {
 			if ((flags & NFE_RX_IP_CSUMOK) != 0) {
 				m->m_pkthdr.csum_flags |= CSUM_IP_CHECKED;
 				m->m_pkthdr.csum_flags |= CSUM_IP_VALID;
@@ -2324,10 +2321,10 @@ nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 			}
 		}
 
-		ifp->if_ipackets++;
+		if_incipackets(ifp, 1);
 
 		NFE_UNLOCK(sc);
-		(*ifp->if_input)(ifp, m);
+		if_input(ifp, m);
 		NFE_LOCK(sc);
 		rx_npkts++;
 	}
@@ -2345,7 +2342,7 @@ nfe_jrxeof(struct nfe_softc *sc, int count, int *rx_npktsp)
 static void
 nfe_txeof(struct nfe_softc *sc)
 {
-	struct ifnet *ifp = sc->nfe_ifp;
+	if_t ifp = sc->nfe_ifp;
 	struct nfe_desc32 *desc32;
 	struct nfe_desc64 *desc64;
 	struct nfe_tx_data *data = NULL;
@@ -2382,18 +2379,18 @@ nfe_txeof(struct nfe_softc *sc)
 				device_printf(sc->nfe_dev,
 				    "tx v1 error 0x%4b\n", flags, NFE_V1_TXERR);
 
-				ifp->if_oerrors++;
+				if_incoerrors(ifp, 1);
 			} else
-				ifp->if_opackets++;
+				if_incopackets(ifp, 1);
 		} else {
 			if ((flags & NFE_TX_LASTFRAG_V2) == 0)
 				continue;
 			if ((flags & NFE_TX_ERROR_V2) != 0) {
 				device_printf(sc->nfe_dev,
 				    "tx v2 error 0x%4b\n", flags, NFE_V2_TXERR);
-				ifp->if_oerrors++;
+				if_incoerrors(ifp, 1);
 			} else
-				ifp->if_opackets++;
+				if_incopackets(ifp, 1);
 		}
 
 		/* last fragment of the mbuf chain transmitted */
@@ -2408,7 +2405,7 @@ nfe_txeof(struct nfe_softc *sc)
 	if (prog > 0) {
 		sc->nfe_force_tx = 0;
 		sc->txq.next = cons;
-		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+		if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
 		if (sc->txq.queued == 0)
 			sc->nfe_watchdog_timer = 0;
 	}
@@ -2565,18 +2562,18 @@ nfe_encap(struct nfe_softc *sc, struct mbuf **m_head)
 static void
 nfe_setmulti(struct nfe_softc *sc)
 {
-	struct ifnet *ifp = sc->nfe_ifp;
-	struct ifmultiaddr *ifma;
-	int i;
+	if_t ifp = sc->nfe_ifp;
+	int i, mc_count, mcnt;
 	uint32_t filter;
 	uint8_t addr[ETHER_ADDR_LEN], mask[ETHER_ADDR_LEN];
 	uint8_t etherbroadcastaddr[ETHER_ADDR_LEN] = {
 		0xff, 0xff, 0xff, 0xff, 0xff, 0xff
 	};
+	uint8_t *mta;
 
 	NFE_LOCK_ASSERT(sc);
 
-	if ((ifp->if_flags & (IFF_ALLMULTI | IFF_PROMISC)) != 0) {
+	if ((if_getflags(ifp) & (IFF_ALLMULTI | IFF_PROMISC)) != 0) {
 		bzero(addr, ETHER_ADDR_LEN);
 		bzero(mask, ETHER_ADDR_LEN);
 		goto done;
@@ -2585,21 +2582,35 @@ nfe_setmulti(struct nfe_softc *sc)
 	bcopy(etherbroadcastaddr, addr, ETHER_ADDR_LEN);
 	bcopy(etherbroadcastaddr, mask, ETHER_ADDR_LEN);
 
-	if_maddr_rlock(ifp);
-	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
-		u_char *addrp;
+	mc_count = if_multiaddr_count(ifp, -1);
+	mta = malloc(sizeof(uint8_t) * ETHER_ADDR_LEN * mc_count, M_DEVBUF,
+	    M_NOWAIT);
 
-		if (ifma->ifma_addr->sa_family != AF_LINK)
-			continue;
+	/* Unable to get memory - process without filtering */
+	if (mta == NULL) {
+		device_printf(sc->nfe_dev, "nfe_setmulti: failed to allocate"
+		    "temp multicast buffer!\n");
 
-		addrp = LLADDR((struct sockaddr_dl *) ifma->ifma_addr);
-		for (i = 0; i < ETHER_ADDR_LEN; i++) {
-			u_int8_t mcaddr = addrp[i];
-			addr[i] &= mcaddr;
-			mask[i] &= ~mcaddr;
+		bzero(addr, ETHER_ADDR_LEN);
+		bzero(mask, ETHER_ADDR_LEN);
+		goto done;
+	};
+
+	if_multiaddr_array(ifp, mta, &mcnt, mc_count);
+
+	for (i = 0; i < mcnt; i++) {
+		uint8_t *addrp;
+		int j;
+
+		addrp = mta + (i * ETHER_ADDR_LEN);
+		for (j = 0; j < ETHER_ADDR_LEN; j++) {
+			u_int8_t mcaddr = addrp[j];
+			addr[j] &= mcaddr;
+			mask[j] &= ~mcaddr;
 		}
 	}
-	if_maddr_runlock(ifp);
+
+	free(mta, M_DEVBUF);
 
 	for (i = 0; i < ETHER_ADDR_LEN; i++) {
 		mask[i] |= addr[i];
@@ -2620,15 +2631,15 @@ nfe_setmulti(struct nfe_softc *sc)
 	filter = NFE_READ(sc, NFE_RXFILTER);
 	filter &= NFE_PFF_RX_PAUSE;
 	filter |= NFE_RXFILTER_MAGIC;
-	filter |= (ifp->if_flags & IFF_PROMISC) ? NFE_PFF_PROMISC : NFE_PFF_U2M;
+	filter |= (if_getflags(ifp) & IFF_PROMISC) ? NFE_PFF_PROMISC : NFE_PFF_U2M;
 	NFE_WRITE(sc, NFE_RXFILTER, filter);
 }
 
 
 static void
-nfe_start(struct ifnet *ifp)
+nfe_start(if_t ifp)
 {
-	struct nfe_softc *sc = ifp->if_softc;
+	struct nfe_softc *sc = if_getsoftc(ifp);
 
 	NFE_LOCK(sc);
 	nfe_start_locked(ifp);
@@ -2636,32 +2647,33 @@ nfe_start(struct ifnet *ifp)
 }
 
 static void
-nfe_start_locked(struct ifnet *ifp)
+nfe_start_locked(if_t ifp)
 {
-	struct nfe_softc *sc = ifp->if_softc;
+	struct nfe_softc *sc = if_getsoftc(ifp);
 	struct mbuf *m0;
-	int enq;
+	int enq = 0;
 
 	NFE_LOCK_ASSERT(sc);
 
-	if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) !=
+	if ((if_getdrvflags(ifp) & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) !=
 	    IFF_DRV_RUNNING || sc->nfe_link == 0)
 		return;
 
-	for (enq = 0; !IFQ_DRV_IS_EMPTY(&ifp->if_snd);) {
-		IFQ_DRV_DEQUEUE(&ifp->if_snd, m0);
+	while (!if_sendq_empty(ifp)) {
+		m0 = if_dequeue(ifp);
+
 		if (m0 == NULL)
 			break;
 
 		if (nfe_encap(sc, &m0) != 0) {
 			if (m0 == NULL)
 				break;
-			IFQ_DRV_PREPEND(&ifp->if_snd, m0);
-			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+			if_sendq_prepend(ifp, m0);
+			if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0);
 			break;
 		}
 		enq++;
-		ETHER_BPF_MTAP(ifp, m0);
+		if_etherbpfmtap(ifp, m0);
 	}
 
 	if (enq > 0) {
@@ -2680,9 +2692,9 @@ nfe_start_locked(struct ifnet *ifp)
 
 
 static void
-nfe_watchdog(struct ifnet *ifp)
+nfe_watchdog(if_t ifp)
 {
-	struct nfe_softc *sc = ifp->if_softc;
+	struct nfe_softc *sc = if_getsoftc(ifp);
 
 	if (sc->nfe_watchdog_timer == 0 || --sc->nfe_watchdog_timer)
 		return;
@@ -2692,7 +2704,7 @@ nfe_watchdog(struct ifnet *ifp)
 	if (sc->txq.queued == 0) {
 		if_printf(ifp, "watchdog timeout (missed Tx interrupts) "
 		    "-- recovering\n");
-		if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
+		if (!if_sendq_empty(ifp))
 			nfe_start_locked(ifp);
 		return;
 	}
@@ -2710,8 +2722,8 @@ nfe_watchdog(struct ifnet *ifp)
 
 	if_printf(ifp, "watchdog timeout\n");
 
-	ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
-	ifp->if_oerrors++;
+	if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING);
+	if_incoerrors(ifp, 1);
 	nfe_init_locked(sc);
 }
 
@@ -2731,7 +2743,7 @@ static void
 nfe_init_locked(void *xsc)
 {
 	struct nfe_softc *sc = xsc;
-	struct ifnet *ifp = sc->nfe_ifp;
+	if_t ifp = sc->nfe_ifp;
 	struct mii_data *mii;
 	uint32_t val;
 	int error;
@@ -2740,12 +2752,12 @@ nfe_init_locked(void *xsc)
 
 	mii = device_get_softc(sc->nfe_miibus);
 
-	if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+	if (if_getdrvflags(ifp) & IFF_DRV_RUNNING)
 		return;
 
 	nfe_stop(ifp);
 
-	sc->nfe_framesize = ifp->if_mtu + NFE_RX_HEADERS;
+	sc->nfe_framesize = if_getmtu(ifp) + NFE_RX_HEADERS;
 
 	nfe_init_tx_ring(sc, &sc->txq);
 	if (sc->nfe_framesize > (MCLBYTES - ETHER_HDR_LEN))
@@ -2774,16 +2786,16 @@ nfe_init_locked(void *xsc)
 	else if (sc->nfe_flags & NFE_JUMBO_SUP)
 		sc->rxtxctl |= NFE_RXTX_V2MAGIC;
 
-	if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
+	if ((if_getcapenable(ifp) & IFCAP_RXCSUM) != 0)
 		sc->rxtxctl |= NFE_RXTX_RXCSUM;
-	if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0)
+	if ((if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) != 0)
 		sc->rxtxctl |= NFE_RXTX_VTAG_INSERT | NFE_RXTX_VTAG_STRIP;
 
 	NFE_WRITE(sc, NFE_RXTX_CTL, NFE_RXTX_RESET | sc->rxtxctl);
 	DELAY(10);
 	NFE_WRITE(sc, NFE_RXTX_CTL, sc->rxtxctl);
 
-	if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0)
+	if ((if_getcapenable(ifp) & IFCAP_VLAN_HWTAGGING) != 0)
 		NFE_WRITE(sc, NFE_VTAG_CTL, NFE_VTAG_ENABLE);
 	else
 		NFE_WRITE(sc, NFE_VTAG_CTL, 0);
@@ -2791,7 +2803,7 @@ nfe_init_locked(void *xsc)
 	NFE_WRITE(sc, NFE_SETUP_R6, 0);
 
 	/* set MAC address */
-	nfe_set_macaddr(sc, IF_LLADDR(ifp));
+	nfe_set_macaddr(sc, if_getlladdr(ifp));
 
 	/* tell MAC where rings are in memory */
 	if (sc->nfe_framesize > MCLBYTES - ETHER_HDR_LEN) {
@@ -2861,15 +2873,15 @@ nfe_init_locked(void *xsc)
 	nfe_stats_clear(sc);
 
 #ifdef DEVICE_POLLING
-	if (ifp->if_capenable & IFCAP_POLLING)
+	if (if_getcapenable(ifp) & IFCAP_POLLING)
 		nfe_disable_intr(sc);
 	else
 #endif
 	nfe_set_intr(sc);
 	nfe_enable_intr(sc); /* enable interrupts */
 
-	ifp->if_drv_flags |= IFF_DRV_RUNNING;
-	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+	if_setdrvflagbits(ifp, IFF_DRV_RUNNING, 0);
+	if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
 
 	sc->nfe_link = 0;
 	mii_mediachg(mii);
@@ -2879,9 +2891,9 @@ nfe_init_locked(void *xsc)
 
 
 static void
-nfe_stop(struct ifnet *ifp)
+nfe_stop(if_t ifp)
 {
-	struct nfe_softc *sc = ifp->if_softc;
+	struct nfe_softc *sc = if_getsoftc(ifp);
 	struct nfe_rx_ring *rx_ring;
 	struct nfe_jrx_ring *jrx_ring;
 	struct nfe_tx_ring *tx_ring;
@@ -2892,7 +2904,7 @@ nfe_stop(struct ifnet *ifp)
 	NFE_LOCK_ASSERT(sc);
 
 	sc->nfe_watchdog_timer = 0;
-	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
+	if_setdrvflagbits(ifp, 0, (IFF_DRV_RUNNING | IFF_DRV_OACTIVE));
 
 	callout_stop(&sc->nfe_stat_ch);
 
@@ -2954,9 +2966,9 @@ nfe_stop(struct ifnet *ifp)
 
 
 static int
-nfe_ifmedia_upd(struct ifnet *ifp)
+nfe_ifmedia_upd(if_t ifp)
 {
-	struct nfe_softc *sc = ifp->if_softc;
+	struct nfe_softc *sc = if_getsoftc(ifp);
 	struct mii_data *mii;
 
 	NFE_LOCK(sc);
@@ -2969,12 +2981,12 @@ nfe_ifmedia_upd(struct ifnet *ifp)
 
 
 static void
-nfe_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
+nfe_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr)
 {
 	struct nfe_softc *sc;
 	struct mii_data *mii;
 
-	sc = ifp->if_softc;
+	sc = if_getsoftc(ifp);
 
 	NFE_LOCK(sc);
 	mii = device_get_softc(sc->nfe_miibus);
@@ -2991,7 +3003,7 @@ nfe_tick(void *xsc)
 {
 	struct nfe_softc *sc;
 	struct mii_data *mii;
-	struct ifnet *ifp;
+	if_t ifp;
 
 	sc = (struct nfe_softc *)xsc;
 
@@ -3370,7 +3382,7 @@ nfe_set_linkspeed(struct nfe_softc *sc)
 static void
 nfe_set_wol(struct nfe_softc *sc)
 {
-	struct ifnet *ifp;
+	if_t ifp;
 	uint32_t wolctl;
 	int pmc;
 	uint16_t pmstat;
@@ -3380,12 +3392,12 @@ nfe_set_wol(struct nfe_softc *sc)
 	if (pci_find_cap(sc->nfe_dev, PCIY_PMG, &pmc) != 0)
 		return;
 	ifp = sc->nfe_ifp;
-	if ((ifp->if_capenable & IFCAP_WOL_MAGIC) != 0)
+	if ((if_getcapenable(ifp) & IFCAP_WOL_MAGIC) != 0)
 		wolctl = NFE_WOL_MAGIC;
 	else
 		wolctl = 0;
 	NFE_WRITE(sc, NFE_WOL_CTL, wolctl);
-	if ((ifp->if_capenable & IFCAP_WOL_MAGIC) != 0) {
+	if ((if_getcapenable(ifp) & IFCAP_WOL_MAGIC) != 0) {
 		nfe_set_linkspeed(sc);
 		if ((sc->nfe_flags & NFE_PWR_MGMT) != 0)
 			NFE_WRITE(sc, NFE_PWR2_CTL,
@@ -3399,7 +3411,7 @@ nfe_set_wol(struct nfe_softc *sc)
 	/* Request PME if WOL is requested. */
 	pmstat = pci_read_config(sc->nfe_dev, pmc + PCIR_POWER_STATUS, 2);
 	pmstat &= ~(PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE);
-	if ((ifp->if_capenable & IFCAP_WOL) != 0)
+	if ((if_getcapenable(ifp) & IFCAP_WOL) != 0)
 		pmstat |= PCIM_PSTAT_PME | PCIM_PSTAT_PMEENABLE;
 	pci_write_config(sc->nfe_dev, pmc + PCIR_POWER_STATUS, pmstat, 2);
 }
diff --git a/sys/dev/nxge/xge-osdep.h b/sys/dev/nxge/xge-osdep.h
index e8f4aba2d057..2f7098385131 100644
--- a/sys/dev/nxge/xge-osdep.h
+++ b/sys/dev/nxge/xge-osdep.h
@@ -406,7 +406,6 @@ xge_os_dma_free(pci_dev_h pdev, const void *vaddr, int size,
 	XGE_OS_MEMORY_CHECK_FREE(p_dmah->dma_viraddr, size);
 	bus_dmamem_free(p_dmah->dma_tag, p_dmah->dma_viraddr, p_dmah->dma_map);
 	bus_dma_tag_destroy(p_dmah->dma_tag);
-	p_dmah->dma_map = NULL;
 	p_dmah->dma_tag = NULL;
 	p_dmah->dma_viraddr = NULL;
 	return;
diff --git a/sys/dev/oce/oce_hw.c b/sys/dev/oce/oce_hw.c
index 7fc16b8383ff..8d292880e3cb 100644
--- a/sys/dev/oce/oce_hw.c
+++ b/sys/dev/oce/oce_hw.c
@@ -487,11 +487,7 @@ oce_hw_start(POCE_SOFTC sc)
 		if_link_state_change(sc->ifp, LINK_STATE_DOWN);
 	}
 
-	if (link.mac_speed > 0 && link.mac_speed < 5)
-		sc->link_speed = link.mac_speed;
-	else
-		sc->link_speed = 0;
-
+	sc->link_speed = link.phys_port_speed;
 	sc->qos_link_speed = (uint32_t )link.qos_link_speed * 10;
 
 	rc = oce_start_mq(sc->mq);
diff --git a/sys/dev/oce/oce_hw.h b/sys/dev/oce/oce_hw.h
index 9f1a92a37e94..1ad3f7889e0b 100644
--- a/sys/dev/oce/oce_hw.h
+++ b/sys/dev/oce/oce_hw.h
@@ -1023,7 +1023,7 @@ struct mbx_hdr {
 #define	OCE_MBX_ADDL_STATUS(_MHDR) ((_MHDR)->u0.rsp.additional_status)
 #define	OCE_MBX_STATUS(_MHDR) ((_MHDR)->u0.rsp.status)
 
-/* [05] OPCODE_COMMON_QUERY_LINK_CONFIG */
+/* [05] OPCODE_COMMON_QUERY_LINK_CONFIG_V1 */
 struct mbx_query_common_link_config {
 	struct mbx_hdr hdr;
 	union {
@@ -1032,16 +1032,37 @@ struct mbx_query_common_link_config {
 		} req;
 
 		struct {
-			/* dw 0 */
-			uint8_t physical_port;
-			uint8_t mac_duplex;
-			uint8_t mac_speed;
-			uint8_t mac_fault;
-			/* dw 1 */
-			uint8_t mgmt_mac_duplex;
-			uint8_t mgmt_mac_speed;
+		#ifdef _BIG_ENDIAN
+			uint32_t physical_port_fault:8;
+			uint32_t physical_port_speed:8;
+			uint32_t link_duplex:8;
+			uint32_t pt:2;
+			uint32_t port_number:6;
+
 			uint16_t qos_link_speed;
-			uint32_t logical_link_status;
+			uint16_t rsvd0;
+
+			uint32_t rsvd1:21;
+			uint32_t phys_fcv:1;
+			uint32_t phys_rxf:1;
+			uint32_t phys_txf:1;
+			uint32_t logical_link_status:8;
+		#else
+			uint32_t port_number:6;
+			uint32_t pt:2;
+			uint32_t link_duplex:8;
+			uint32_t physical_port_speed:8;
+			uint32_t physical_port_fault:8;
+
+			uint16_t rsvd0;
+			uint16_t qos_link_speed;
+
+			uint32_t logical_link_status:8;
+			uint32_t phys_txf:1;
+			uint32_t phys_rxf:1;
+			uint32_t phys_fcv:1;
+			uint32_t rsvd1:21;
+		#endif
 		} rsp;
 	} params;
 };
diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c
index 42ef2c96be81..af57491e1fa2 100644
--- a/sys/dev/oce/oce_if.c
+++ b/sys/dev/oce/oce_if.c
@@ -563,9 +563,6 @@ oce_multiq_start(struct ifnet *ifp, struct mbuf *m)
 	int queue_index = 0;
 	int status = 0;
 
-	if (!sc->link_status)
-		return ENXIO;
-
 	if ((m->m_flags & M_FLOWID) != 0)
 		queue_index = m->m_pkthdr.flowid % sc->nwqs;
 
@@ -829,10 +826,21 @@ oce_media_status(struct ifnet *ifp, struct ifmediareq *req)
 		req->ifm_active |= IFM_10G_SR | IFM_FDX;
 		sc->speed = 10000;
 		break;
+	case 5: /* 20 Gbps */
+		req->ifm_active |= IFM_10G_SR | IFM_FDX;
+		sc->speed = 20000;
+		break;
+	case 6: /* 25 Gbps */
+		req->ifm_active |= IFM_10G_SR | IFM_FDX;
+		sc->speed = 25000;
+		break;
 	case 7: /* 40 Gbps */
 		req->ifm_active |= IFM_40G_SR4 | IFM_FDX;
 		sc->speed = 40000;
 		break;
+	default:
+		sc->speed = 0;
+		break;
 	}
 	
 	return;
@@ -1263,7 +1271,6 @@ oce_multiq_transmit(struct ifnet *ifp, struct mbuf *m, struct oce_wq *wq)
 				drbr_putback(ifp, br, next);
 				wq->tx_stats.tx_stops ++;
 				ifp->if_drv_flags |= IFF_DRV_OACTIVE;
-				status = drbr_enqueue(ifp, br, next);
 			}  
 			break;
 		}
@@ -1274,7 +1281,7 @@ oce_multiq_transmit(struct ifnet *ifp, struct mbuf *m, struct oce_wq *wq)
 		ETHER_BPF_MTAP(ifp, next);
 	}
 
-	return status;
+	return 0;
 }
 
 
@@ -2217,13 +2224,16 @@ setup_max_queues_want(POCE_SOFTC sc)
 	    (sc->function_mode & FNM_UMC_MODE)    ||
 	    (sc->function_mode & FNM_VNIC_MODE)	  ||
 	    (!is_rss_enabled(sc))		  ||
-	    (sc->flags & OCE_FLAGS_BE2)) {
+	    IS_BE2(sc)) {
 		sc->nrqs = 1;
 		sc->nwqs = 1;
 	} else {
 		sc->nrqs = MIN(OCE_NCPUS, sc->nrssqs) + 1;
 		sc->nwqs = MIN(OCE_NCPUS, sc->nrssqs);
 	}
+
+	if (IS_BE2(sc) && is_rss_enabled(sc))
+		sc->nrqs = MIN(OCE_NCPUS, sc->nrssqs) + 1;
 }
 
 
@@ -2237,6 +2247,9 @@ update_queues_got(POCE_SOFTC sc)
 		sc->nrqs = 1;
 		sc->nwqs = 1;
 	}
+
+	if (IS_BE2(sc))
+		sc->nwqs = 1;
 }
 
 static int 
diff --git a/sys/dev/oce/oce_if.h b/sys/dev/oce/oce_if.h
index 1af4c4ccdc8e..b6db402e7766 100644
--- a/sys/dev/oce/oce_if.h
+++ b/sys/dev/oce/oce_if.h
@@ -761,14 +761,9 @@ struct oce_rq {
 };
 
 struct link_status {
-	uint8_t physical_port;
-	uint8_t mac_duplex;
-	uint8_t mac_speed;
-	uint8_t mac_fault;
-	uint8_t mgmt_mac_duplex;
-	uint8_t mgmt_mac_speed;
+	uint8_t phys_port_speed;
+	uint8_t logical_link_status;
 	uint16_t qos_link_speed;
-	uint32_t logical_link_status;
 };
 
 
diff --git a/sys/dev/oce/oce_mbox.c b/sys/dev/oce/oce_mbox.c
index 77fd33bfb05e..d3dab2fcace0 100644
--- a/sys/dev/oce/oce_mbox.c
+++ b/sys/dev/oce/oce_mbox.c
@@ -961,9 +961,9 @@ oce_get_link_status(POCE_SOFTC sc, struct link_status *link)
 		goto error;
 	}
 	/* interpret response */
-	bcopy(&fwcmd->params.rsp, link, sizeof(struct link_status));
-	link->logical_link_status = HOST_32(link->logical_link_status);
-	link->qos_link_speed = HOST_16(link->qos_link_speed);
+	link->qos_link_speed = HOST_16(fwcmd->params.rsp.qos_link_speed);
+	link->phys_port_speed = fwcmd->params.rsp.physical_port_speed;
+	link->logical_link_status = fwcmd->params.rsp.logical_link_status;
 error:
 	return rc;
 }
@@ -1876,7 +1876,7 @@ oce_mbox_cq_create(struct oce_cq *cq, uint32_t ncoalesce, uint32_t is_eventable)
 		ctx->v2.armed = 0;
 		ctx->v2.eq_id = cq->eq->eq_id;
 		if (ctx->v2.count == 3) {
-			if (cq->cq_cfg.q_len > (4*1024)-1)
+			if ((u_int)cq->cq_cfg.q_len > (4*1024)-1)
 				ctx->v2.cqe_count = (4*1024)-1;
 			else
 				ctx->v2.cqe_count = cq->cq_cfg.q_len;
diff --git a/sys/dev/oce/oce_util.c b/sys/dev/oce/oce_util.c
index 669da0367858..9ae92ff05f16 100644
--- a/sys/dev/oce/oce_util.c
+++ b/sys/dev/oce/oce_util.c
@@ -105,15 +105,15 @@ oce_dma_free(POCE_SOFTC sc, POCE_DMA_MEM dma)
 	if (dma->tag == NULL)
 		return;
 
-	if (dma->map != NULL) {
+	if (dma->paddr != 0) {
 		bus_dmamap_sync(dma->tag, dma->map,
 				BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(dma->tag, dma->map);
+		dma->paddr = 0;
 	}
 
 	if (dma->ptr != NULL) {
 		bus_dmamem_free(dma->tag, dma->ptr, dma->map);
-		dma->map = NULL;
 		dma->ptr = NULL;
 	}
 
diff --git a/sys/dev/ofw/ofwbus.c b/sys/dev/ofw/ofwbus.c
index aa7566b52977..402fabcf6a88 100644
--- a/sys/dev/ofw/ofwbus.c
+++ b/sys/dev/ofw/ofwbus.c
@@ -136,7 +136,8 @@ static driver_t ofwbus_driver = {
 	sizeof(struct ofwbus_softc)
 };
 static devclass_t ofwbus_devclass;
-DRIVER_MODULE(ofwbus, nexus, ofwbus_driver, ofwbus_devclass, 0, 0);
+EARLY_DRIVER_MODULE(ofwbus, nexus, ofwbus_driver, ofwbus_devclass, 0, 0,
+    BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 MODULE_VERSION(ofwbus, 1);
 
 static const char *const ofwbus_excl_name[] = {
@@ -434,10 +435,11 @@ ofwbus_setup_dinfo(device_t dev, phandle_t node)
 {
 	struct ofwbus_softc *sc;
 	struct ofwbus_devinfo *ndi;
+	const char *nodename;
 	uint32_t *reg, *intr, icells;
 	uint64_t phys, size;
 	phandle_t iparent;
-	int i, j;
+	int i, j, rid;
 	int nintr;
 	int nreg;
 
@@ -448,8 +450,8 @@ ofwbus_setup_dinfo(device_t dev, phandle_t node)
 		free(ndi, M_DEVBUF);
 		return (NULL);
 	}
-	if (OFWBUS_EXCLUDED(ndi->ndi_obdinfo.obd_name,
-	    ndi->ndi_obdinfo.obd_type)) {
+	nodename = ndi->ndi_obdinfo.obd_name;
+	if (OFWBUS_EXCLUDED(nodename, ndi->ndi_obdinfo.obd_type)) {
 		ofw_bus_gen_destroy_devinfo(&ndi->ndi_obdinfo);
 		free(ndi, M_DEVBUF);
 		return (NULL);
@@ -462,11 +464,11 @@ ofwbus_setup_dinfo(device_t dev, phandle_t node)
 	if (nreg % (sc->acells + sc->scells) != 0) {
 		if (bootverbose)
 			device_printf(dev, "Malformed reg property on <%s>\n",
-			    ndi->ndi_obdinfo.obd_name);
+			    nodename);
 		nreg = 0;
 	}
 
-	for (i = 0; i < nreg; i += sc->acells + sc->scells) {
+	for (i = 0, rid = 0; i < nreg; i += sc->acells + sc->scells, rid++) {
 		phys = size = 0;
 		for (j = 0; j < sc->acells; j++) {
 			phys <<= 32;
@@ -478,7 +480,7 @@ ofwbus_setup_dinfo(device_t dev, phandle_t node)
 		}
 		/* Skip the dummy reg property of glue devices like ssm(4). */
 		if (size != 0)
-			resource_list_add(&ndi->ndi_rl, SYS_RES_MEMORY, i,
+			resource_list_add(&ndi->ndi_rl, SYS_RES_MEMORY, rid,
 			    phys, phys + size - 1, size);
 	}
 	free(reg, M_OFWPROP);
@@ -486,15 +488,28 @@ ofwbus_setup_dinfo(device_t dev, phandle_t node)
 	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) {
+		if (OF_searchencprop(node, "interrupt-parent", &iparent,
+		    sizeof(iparent)) == -1) {
+			device_printf(dev, "No interrupt-parent found, "
+			    "assuming nexus on <%s>\n", nodename);
+			iparent = 0xffffffff;
+		}
+		if (OF_searchencprop(OF_xref_phandle(iparent), 
+		    "#interrupt-cells", &icells, sizeof(icells)) == -1) {
+			device_printf(dev, "Missing #interrupt-cells property, "
+			    "assuming <1> on <%s>\n", nodename);
+			icells = 1;
+		}
+		if (icells < 1 || icells > nintr) {
+			device_printf(dev, "Invalid #interrupt-cells property "
+			    "value <%d>, assuming <1> on <%s>\n", icells, 
+			    nodename);
+			icells = 1;
+		}
+		for (i = 0, rid = 0; i < nintr; i += icells, rid++) {
 			intr[i] = ofw_bus_map_intr(dev, iparent, icells,
 			    &intr[i]);
-			resource_list_add(&ndi->ndi_rl, SYS_RES_IRQ, i, intr[i],
+			resource_list_add(&ndi->ndi_rl, SYS_RES_IRQ, rid, intr[i],
 			    intr[i], 1);
 		}
 		free(intr, M_OFWPROP);
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index 0c49d2f38a7f..87ab53abcf4a 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -62,14 +62,12 @@ __FBSDID("$FreeBSD$");
 static SYSCTL_NODE(_hw, OID_AUTO, pccard, CTLFLAG_RD, 0, "PCCARD parameters");
 
 int	pccard_debug = 0;
-TUNABLE_INT("hw.pccard.debug", &pccard_debug);
-SYSCTL_INT(_hw_pccard, OID_AUTO, debug, CTLFLAG_RW,
+SYSCTL_INT(_hw_pccard, OID_AUTO, debug, CTLFLAG_RWTUN,
     &pccard_debug, 0,
   "pccard debug");
 
 int	pccard_cis_debug = 0;
-TUNABLE_INT("hw.pccard.cis_debug", &pccard_cis_debug);
-SYSCTL_INT(_hw_pccard, OID_AUTO, cis_debug, CTLFLAG_RW,
+SYSCTL_INT(_hw_pccard, OID_AUTO, cis_debug, CTLFLAG_RWTUN,
     &pccard_cis_debug, 0, "pccard CIS debug");
 
 #ifdef PCCARDDEBUG
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index 092d3efae773..b724d05e0423 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -134,26 +134,22 @@ static SYSCTL_NODE(_hw, OID_AUTO, cbb, CTLFLAG_RD, 0, "CBB parameters");
 
 /* There's no way to say TUNEABLE_LONG to get the right types */
 u_long cbb_start_mem = CBB_START_MEM;
-TUNABLE_ULONG("hw.cbb.start_memory", &cbb_start_mem);
-SYSCTL_ULONG(_hw_cbb, OID_AUTO, start_memory, CTLFLAG_RW,
+SYSCTL_ULONG(_hw_cbb, OID_AUTO, start_memory, CTLFLAG_RWTUN,
     &cbb_start_mem, CBB_START_MEM,
     "Starting address for memory allocations");
 
 u_long cbb_start_16_io = CBB_START_16_IO;
-TUNABLE_ULONG("hw.cbb.start_16_io", &cbb_start_16_io);
-SYSCTL_ULONG(_hw_cbb, OID_AUTO, start_16_io, CTLFLAG_RW,
+SYSCTL_ULONG(_hw_cbb, OID_AUTO, start_16_io, CTLFLAG_RWTUN,
     &cbb_start_16_io, CBB_START_16_IO,
     "Starting ioport for 16-bit cards");
 
 u_long cbb_start_32_io = CBB_START_32_IO;
-TUNABLE_ULONG("hw.cbb.start_32_io", &cbb_start_32_io);
-SYSCTL_ULONG(_hw_cbb, OID_AUTO, start_32_io, CTLFLAG_RW,
+SYSCTL_ULONG(_hw_cbb, OID_AUTO, start_32_io, CTLFLAG_RWTUN,
     &cbb_start_32_io, CBB_START_32_IO,
     "Starting ioport for 32-bit cards");
 
 int cbb_debug = 0;
-TUNABLE_INT("hw.cbb.debug", &cbb_debug);
-SYSCTL_INT(_hw_cbb, OID_AUTO, debug, CTLFLAG_RW, &cbb_debug, 0,
+SYSCTL_INT(_hw_cbb, OID_AUTO, debug, CTLFLAG_RWTUN, &cbb_debug, 0,
     "Verbose cardbus bridge debugging");
 
 static void	cbb_insert(struct cbb_softc *sc);
diff --git a/sys/dev/pccbb/pccbb_isa.c b/sys/dev/pccbb/pccbb_isa.c
index 1d0a698da78b..c51106251055 100644
--- a/sys/dev/pccbb/pccbb_isa.c
+++ b/sys/dev/pccbb/pccbb_isa.c
@@ -74,8 +74,7 @@ __FBSDID("$FreeBSD$");
 static SYSCTL_NODE(_hw, OID_AUTO, pcic, CTLFLAG_RD, 0, "PCIC parameters");
 
 static int isa_intr_mask = EXCA_INT_MASK_ALLOWED;
-TUNABLE_INT("hw.cbb.intr_mask", &isa_intr_mask);
-SYSCTL_INT(_hw_pcic, OID_AUTO, intr_mask, CTLFLAG_RD, &isa_intr_mask, 0,
+SYSCTL_INT(_hw_pcic, OID_AUTO, intr_mask, CTLFLAG_RDTUN, &isa_intr_mask, 0,
     "Mask of allowable interrupts for this laptop.  The default is generally\n\
 correct, but some laptops do not route all the IRQ pins to the bridge to\n\
 save wires.  Sometimes you need a more restrictive mask because some of the\n\
@@ -89,7 +88,6 @@ allocated.");
  *     2: 6729's method
  */
 int pcic_pd6722_vsense = 1;
-TUNABLE_INT("hw.pcic.pd6722_vsense", &pcic_pd6722_vsense);
 SYSCTL_INT(_hw_pcic, OID_AUTO, pd6722_vsense, CTLFLAG_RDTUN,
     &pcic_pd6722_vsense, 1,
     "Select CL-PD6722's VSENSE method.  VSENSE is used to determine the\n\
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index 85928f9dfcc0..7b4727cc3e7a 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -481,6 +481,8 @@ cbb_chipinit(struct cbb_softc *sc)
 
 	/* Enable memory access */
 	pci_enable_busmaster(sc->dev);
+	/* XXX: This should not be necessary, but some chipsets require it */
+	PCI_MASK_CONFIG(sc->dev, PCIR_COMMAND, | PCIM_CMD_PORTEN, 2);
 
 	/* disable Legacy IO */
 	switch (sc->chipset) {
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index b2b5ff80d0d5..9733841803ab 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -282,22 +282,20 @@ static int pcie_chipset, pcix_chipset;
 SYSCTL_NODE(_hw, OID_AUTO, pci, CTLFLAG_RD, 0, "PCI bus tuning parameters");
 
 static int pci_enable_io_modes = 1;
-TUNABLE_INT("hw.pci.enable_io_modes", &pci_enable_io_modes);
-SYSCTL_INT(_hw_pci, OID_AUTO, enable_io_modes, CTLFLAG_RW,
+SYSCTL_INT(_hw_pci, OID_AUTO, enable_io_modes, CTLFLAG_RWTUN,
     &pci_enable_io_modes, 1,
     "Enable I/O and memory bits in the config register.  Some BIOSes do not\n\
 enable these bits correctly.  We'd like to do this all the time, but there\n\
 are some peripherals that this causes problems with.");
 
 static int pci_do_realloc_bars = 0;
-TUNABLE_INT("hw.pci.realloc_bars", &pci_do_realloc_bars);
-SYSCTL_INT(_hw_pci, OID_AUTO, realloc_bars, CTLFLAG_RW,
+SYSCTL_INT(_hw_pci, OID_AUTO, realloc_bars, CTLFLAG_RWTUN,
     &pci_do_realloc_bars, 0,
-    "Attempt to allocate a new range for any BARs whose original firmware-assigned ranges fail to allocate during the initial device scan.");
+    "Attempt to allocate a new range for any BARs whose original "
+    "firmware-assigned ranges fail to allocate during the initial device scan.");
 
 static int pci_do_power_nodriver = 0;
-TUNABLE_INT("hw.pci.do_power_nodriver", &pci_do_power_nodriver);
-SYSCTL_INT(_hw_pci, OID_AUTO, do_power_nodriver, CTLFLAG_RW,
+SYSCTL_INT(_hw_pci, OID_AUTO, do_power_nodriver, CTLFLAG_RWTUN,
     &pci_do_power_nodriver, 0,
   "Place a function into D3 state when no driver attaches to it.  0 means\n\
 disable.  1 means conservatively place devices into D3 state.  2 means\n\
@@ -305,30 +303,25 @@ agressively place devices into D3 state.  3 means put absolutely everything\n\
 in D3 state.");
 
 int pci_do_power_resume = 1;
-TUNABLE_INT("hw.pci.do_power_resume", &pci_do_power_resume);
-SYSCTL_INT(_hw_pci, OID_AUTO, do_power_resume, CTLFLAG_RW,
+SYSCTL_INT(_hw_pci, OID_AUTO, do_power_resume, CTLFLAG_RWTUN,
     &pci_do_power_resume, 1,
   "Transition from D3 -> D0 on resume.");
 
 int pci_do_power_suspend = 1;
-TUNABLE_INT("hw.pci.do_power_suspend", &pci_do_power_suspend);
-SYSCTL_INT(_hw_pci, OID_AUTO, do_power_suspend, CTLFLAG_RW,
+SYSCTL_INT(_hw_pci, OID_AUTO, do_power_suspend, CTLFLAG_RWTUN,
     &pci_do_power_suspend, 1,
   "Transition from D0 -> D3 on suspend.");
 
 static int pci_do_msi = 1;
-TUNABLE_INT("hw.pci.enable_msi", &pci_do_msi);
-SYSCTL_INT(_hw_pci, OID_AUTO, enable_msi, CTLFLAG_RW, &pci_do_msi, 1,
+SYSCTL_INT(_hw_pci, OID_AUTO, enable_msi, CTLFLAG_RWTUN, &pci_do_msi, 1,
     "Enable support for MSI interrupts");
 
 static int pci_do_msix = 1;
-TUNABLE_INT("hw.pci.enable_msix", &pci_do_msix);
-SYSCTL_INT(_hw_pci, OID_AUTO, enable_msix, CTLFLAG_RW, &pci_do_msix, 1,
+SYSCTL_INT(_hw_pci, OID_AUTO, enable_msix, CTLFLAG_RWTUN, &pci_do_msix, 1,
     "Enable support for MSI-X interrupts");
 
 static int pci_honor_msi_blacklist = 1;
-TUNABLE_INT("hw.pci.honor_msi_blacklist", &pci_honor_msi_blacklist);
-SYSCTL_INT(_hw_pci, OID_AUTO, honor_msi_blacklist, CTLFLAG_RD,
+SYSCTL_INT(_hw_pci, OID_AUTO, honor_msi_blacklist, CTLFLAG_RDTUN,
     &pci_honor_msi_blacklist, 1, "Honor chipset blacklist for MSI/MSI-X");
 
 #if defined(__i386__) || defined(__amd64__)
@@ -336,26 +329,22 @@ static int pci_usb_takeover = 1;
 #else
 static int pci_usb_takeover = 0;
 #endif
-TUNABLE_INT("hw.pci.usb_early_takeover", &pci_usb_takeover);
 SYSCTL_INT(_hw_pci, OID_AUTO, usb_early_takeover, CTLFLAG_RDTUN,
     &pci_usb_takeover, 1, "Enable early takeover of USB controllers.\n\
 Disable this if you depend on BIOS emulation of USB devices, that is\n\
 you use USB devices (like keyboard or mouse) but do not load USB drivers");
 
 static int pci_clear_bars;
-TUNABLE_INT("hw.pci.clear_bars", &pci_clear_bars);
 SYSCTL_INT(_hw_pci, OID_AUTO, clear_bars, CTLFLAG_RDTUN, &pci_clear_bars, 0,
     "Ignore firmware-assigned resources for BARs.");
 
 #if defined(NEW_PCIB) && defined(PCI_RES_BUS)
 static int pci_clear_buses;
-TUNABLE_INT("hw.pci.clear_buses", &pci_clear_buses);
 SYSCTL_INT(_hw_pci, OID_AUTO, clear_buses, CTLFLAG_RDTUN, &pci_clear_buses, 0,
     "Ignore firmware-assigned bus numbers.");
 #endif
 
 static int pci_enable_ari = 1;
-TUNABLE_INT("hw.pci.enable_ari", &pci_enable_ari);
 SYSCTL_INT(_hw_pci, OID_AUTO, enable_ari, CTLFLAG_RDTUN, &pci_enable_ari,
     0, "Enable support for PCIe Alternative RID Interpretation");
 
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c
index 8b5021974c75..3c5842be44c6 100644
--- a/sys/dev/pci/pci_pci.c
+++ b/sys/dev/pci/pci_pci.c
@@ -117,7 +117,6 @@ DRIVER_MODULE(pcib, pci, pcib_driver, pcib_devclass, NULL, NULL);
 SYSCTL_DECL(_hw_pci);
 
 static int pci_clear_pcib;
-TUNABLE_INT("hw.pci.clear_pcib", &pci_clear_pcib);
 SYSCTL_INT(_hw_pci, OID_AUTO, clear_pcib, CTLFLAG_RDTUN, &pci_clear_pcib, 0,
     "Clear firmware-assigned resources for PCI-PCI bridge I/O windows.");
 
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 6e733f588d5e..7083582ea436 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 
-#if defined(__amd64__) || defined(__i386__) || defined(__ia64__)
+#if defined(__amd64__) || defined(__i386__)
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #endif
@@ -71,7 +71,6 @@ static int	vga_pci_release_resource(device_t dev, device_t child, int type,
     int rid, struct resource *r);
 
 int vga_pci_default_unit = -1;
-TUNABLE_INT("hw.pci.default_vgapci_unit", &vga_pci_default_unit);
 SYSCTL_INT(_hw_pci, OID_AUTO, default_vgapci_unit, CTLFLAG_RDTUN,
     &vga_pci_default_unit, -1, "Default VGA-compatible display");
 
@@ -138,7 +137,7 @@ vga_pci_map_bios(device_t dev, size_t *size)
 	int rid;
 	struct resource *res;
 
-#if defined(__amd64__) || defined(__i386__) || defined(__ia64__)
+#if defined(__amd64__) || defined(__i386__)
 	if (vga_pci_is_boot_display(dev)) {
 		/*
 		 * On x86, the System BIOS copy the default display
@@ -174,7 +173,7 @@ vga_pci_unmap_bios(device_t dev, void *bios)
 		return;
 	}
 
-#if defined(__amd64__) || defined(__i386__) || defined(__ia64__)
+#if defined(__amd64__) || defined(__i386__)
 	if (vga_pci_is_boot_display(dev)) {
 		/* We mapped the BIOS shadow copy located at 0xC0000. */
 		pmap_unmapdev((vm_offset_t)bios, VGA_PCI_BIOS_SHADOW_SIZE);
diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c
index d6d5509050c3..618a3ae03691 100644
--- a/sys/dev/puc/puc_pci.c
+++ b/sys/dev/puc/puc_pci.c
@@ -80,8 +80,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/puc/puc_bfe.h>
 
 static int puc_msi_disable;
-TUNABLE_INT("hw.puc.msi_disable", &puc_msi_disable);
-SYSCTL_INT(_hw_puc, OID_AUTO, msi_disable, CTLFLAG_RD | CTLFLAG_TUN,
+SYSCTL_INT(_hw_puc, OID_AUTO, msi_disable, CTLFLAG_RDTUN,
     &puc_msi_disable, 0, "Disable use of MSI interrupts by puc(9)");
 
 static const struct puc_cfg *
diff --git a/sys/dev/random/ivy.c b/sys/dev/random/ivy.c
index 9b4001692ada..cb82adc47f7e 100644
--- a/sys/dev/random/ivy.c
+++ b/sys/dev/random/ivy.c
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 static int random_ivy_read(void *, int);
 
 static struct random_hardware_source random_ivy = {
-	.ident = "Hardware, Intel IvyBridge+ RNG",
+	.ident = "Hardware, Intel Secure Key RNG",
 	.source = RANDOM_PURE_RDRAND,
 	.read = random_ivy_read
 };
diff --git a/sys/dev/rt/if_rt.c b/sys/dev/rt/if_rt.c
index 5f62fec6920d..aaf84f382968 100644
--- a/sys/dev/rt/if_rt.c
+++ b/sys/dev/rt/if_rt.c
@@ -140,9 +140,8 @@ static void	rt_ifmedia_sts(struct ifnet *, struct ifmediareq *);
 static SYSCTL_NODE(_hw, OID_AUTO, rt, CTLFLAG_RD, 0, "RT driver parameters");
 #ifdef IF_RT_DEBUG
 static int rt_debug = 0;
-SYSCTL_INT(_hw_rt, OID_AUTO, debug, CTLFLAG_RW, &rt_debug, 0,
+SYSCTL_INT(_hw_rt, OID_AUTO, debug, CTLFLAG_RWTUN, &rt_debug, 0,
     "RT debug level");
-TUNABLE_INT("hw.rt.debug", &rt_debug);
 #endif
 
 static int
diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c
index b8e03bed3409..18fbf1e83fbb 100644
--- a/sys/dev/sdhci/sdhci.c
+++ b/sys/dev/sdhci/sdhci.c
@@ -67,8 +67,7 @@ struct sdhci_softc {
 static SYSCTL_NODE(_hw, OID_AUTO, sdhci, CTLFLAG_RD, 0, "sdhci driver");
 
 int	sdhci_debug = 0;
-TUNABLE_INT("hw.sdhci.debug", &sdhci_debug);
-SYSCTL_INT(_hw_sdhci, OID_AUTO, debug, CTLFLAG_RW, &sdhci_debug, 0, "Debug level");
+SYSCTL_INT(_hw_sdhci, OID_AUTO, debug, CTLFLAG_RWTUN, &sdhci_debug, 0, "Debug level");
 
 #define RD1(slot, off)	SDHCI_READ_1((slot)->bus, (slot), (off))
 #define RD2(slot, off)	SDHCI_READ_2((slot)->bus, (slot), (off))
diff --git a/sys/dev/sdhci/sdhci_pci.c b/sys/dev/sdhci/sdhci_pci.c
index b8d85306d8f4..9e7e47181888 100644
--- a/sys/dev/sdhci/sdhci_pci.c
+++ b/sys/dev/sdhci/sdhci_pci.c
@@ -124,8 +124,7 @@ struct sdhci_pci_softc {
 static SYSCTL_NODE(_hw, OID_AUTO, sdhci_pci, CTLFLAG_RD, 0, "sdhci PCI driver");
 
 int	sdhci_pci_debug;
-TUNABLE_INT("hw.sdhci_pci.debug", &sdhci_pci_debug);
-SYSCTL_INT(_hw_sdhci_pci, OID_AUTO, debug, CTLFLAG_RW, &sdhci_pci_debug, 0, "Debug level");
+SYSCTL_INT(_hw_sdhci_pci, OID_AUTO, debug, CTLFLAG_RWTUN, &sdhci_pci_debug, 0, "Debug level");
 
 static uint8_t
 sdhci_pci_read_1(device_t dev, struct sdhci_slot *slot, bus_size_t off)
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index c9d1c8311488..de3eadf583ee 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -119,8 +119,7 @@ static int si_Nports;
 static int si_Nmodules;
 static int si_debug;
 
-SYSCTL_INT(_machdep, OID_AUTO, si_debug, CTLFLAG_RW, &si_debug, 0, "");
-TUNABLE_INT("machdep.si_debug", &si_debug);
+SYSCTL_INT(_machdep, OID_AUTO, si_debug, CTLFLAG_RWTUN, &si_debug, 0, "");
 
 static int si_numunits;
 
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index d187a2bab31f..324a80be0829 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -372,7 +372,7 @@ sysctl_machdep_comdefaultrate(SYSCTL_HANDLER_ARGS)
 	return error;
 }
 
-SYSCTL_PROC(_machdep, OID_AUTO, conspeed, CTLTYPE_INT | CTLFLAG_RW,
+SYSCTL_PROC(_machdep, OID_AUTO, conspeed, CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH,
 	    0, 0, sysctl_machdep_comdefaultrate, "I", "");
 TUNABLE_INT("machdep.conspeed", __DEVOLATILE(int *, &comdefaultrate));
 
diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c
index 09e2242065b0..4a95af63d8a6 100644
--- a/sys/dev/sis/if_sis.c
+++ b/sys/dev/sis/if_sis.c
@@ -2361,7 +2361,6 @@ sis_add_sysctls(struct sis_softc *sc)
 {
 	struct sysctl_ctx_list *ctx;
 	struct sysctl_oid_list *children;
-	char tn[32];
 	int unit;
 
 	ctx = device_get_sysctl_ctx(sc->sis_dev);
@@ -2376,10 +2375,8 @@ sis_add_sysctls(struct sis_softc *sc)
 	 * because it will consume extra CPU cycles for short frames.
 	 */
 	sc->sis_manual_pad = 0;
-	snprintf(tn, sizeof(tn), "dev.sis.%d.manual_pad", unit);
-	TUNABLE_INT_FETCH(tn, &sc->sis_manual_pad);
 	SYSCTL_ADD_INT(ctx, children, OID_AUTO, "manual_pad",
-	    CTLFLAG_RW, &sc->sis_manual_pad, 0, "Manually pad short frames");
+	    CTLFLAG_RWTUN, &sc->sis_manual_pad, 0, "Manually pad short frames");
 }
 
 static device_method_t sis_methods[] = {
diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c
index 9026e53bf377..9b8c55e9a846 100644
--- a/sys/dev/sound/pci/atiixp.c
+++ b/sys/dev/sound/pci/atiixp.c
@@ -1146,13 +1146,14 @@ atiixp_release_resource(struct atiixp_info *sc)
 		bus_dma_tag_destroy(sc->parent_dmat);
 		sc->parent_dmat = NULL;
 	}
-	if (sc->sgd_dmamap)
+	if (sc->sgd_addr) {
 		bus_dmamap_unload(sc->sgd_dmat, sc->sgd_dmamap);
+		sc->sgd_addr = 0;
+	}
 	if (sc->sgd_table) {
 		bus_dmamem_free(sc->sgd_dmat, sc->sgd_table, sc->sgd_dmamap);
 		sc->sgd_table = NULL;
 	}
-	sc->sgd_dmamap = NULL;
 	if (sc->sgd_dmat) {
 		bus_dma_tag_destroy(sc->sgd_dmat);
 		sc->sgd_dmat = NULL;
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index 72dec78dcf01..c4a13f3a7453 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -160,6 +160,7 @@ struct emu_memblk {
 	void *buf;
 	bus_addr_t buf_addr;
 	u_int32_t pte_start, pte_size;
+	bus_dmamap_t buf_map;
 };
 
 struct emu_mem {
@@ -168,6 +169,8 @@ struct emu_mem {
 	void *silent_page;
 	bus_addr_t silent_page_addr;
 	bus_addr_t ptb_pages_addr;
+	bus_dmamap_t ptb_map;
+	bus_dmamap_t silent_map;
 	SLIST_HEAD(, emu_memblk) blocks;
 };
 
@@ -239,7 +242,7 @@ struct sc_info {
 /* stuff */
 static int emu_init(struct sc_info *);
 static void emu_intr(void *);
-static void *emu_malloc(struct sc_info *sc, u_int32_t sz, bus_addr_t *addr);
+static void *emu_malloc(struct sc_info *sc, u_int32_t sz, bus_addr_t *addr, bus_dmamap_t *map);
 static void *emu_memalloc(struct sc_info *sc, u_int32_t sz, bus_addr_t *addr);
 static int emu_memfree(struct sc_info *sc, void *buf);
 static int emu_memstart(struct sc_info *sc, void *buf);
@@ -1315,24 +1318,27 @@ emu_setmap(void *arg, bus_dma_segment_t *segs, int nseg, int error)
 }
 
 static void *
-emu_malloc(struct sc_info *sc, u_int32_t sz, bus_addr_t *addr)
+emu_malloc(struct sc_info *sc, u_int32_t sz, bus_addr_t *addr,
+    bus_dmamap_t *map)
 {
 	void *buf;
-	bus_dmamap_t map;
 
 	*addr = 0;
-	if (bus_dmamem_alloc(sc->parent_dmat, &buf, BUS_DMA_NOWAIT, &map))
+	if (bus_dmamem_alloc(sc->parent_dmat, &buf, BUS_DMA_NOWAIT, map))
 		return NULL;
-	if (bus_dmamap_load(sc->parent_dmat, map, buf, sz, emu_setmap, addr, 0)
-	    || !*addr)
+	if (bus_dmamap_load(sc->parent_dmat, *map, buf, sz, emu_setmap, addr, 0)
+	    || !*addr) {
+		bus_dmamem_free(sc->parent_dmat, buf, *map);
 		return NULL;
+	}
 	return buf;
 }
 
 static void
-emu_free(struct sc_info *sc, void *buf)
+emu_free(struct sc_info *sc, void *buf, bus_dmamap_t map)
 {
-	bus_dmamem_free(sc->parent_dmat, buf, NULL);
+	bus_dmamap_unload(sc->parent_dmat, map);
+	bus_dmamem_free(sc->parent_dmat, buf, map);
 }
 
 static void *
@@ -1362,7 +1368,7 @@ emu_memalloc(struct sc_info *sc, u_int32_t sz, bus_addr_t *addr)
 	blk = malloc(sizeof(*blk), M_DEVBUF, M_NOWAIT);
 	if (blk == NULL)
 		return NULL;
-	buf = emu_malloc(sc, sz, &blk->buf_addr);
+	buf = emu_malloc(sc, sz, &blk->buf_addr, &blk->buf_map);
 	*addr = blk->buf_addr;
 	if (buf == NULL) {
 		free(blk, M_DEVBUF);
@@ -1405,7 +1411,7 @@ emu_memfree(struct sc_info *sc, void *buf)
 	if (blk == NULL)
 		return EINVAL;
 	SLIST_REMOVE(&mem->blocks, blk, emu_memblk, link);
-	emu_free(sc, buf);
+	emu_free(sc, buf, blk->buf_map);
 	tmp = (u_int32_t)(sc->mem.silent_page_addr) << 1;
 	for (idx = blk->pte_start; idx < blk->pte_start + blk->pte_size; idx++) {
 		mem->bmap[idx >> 3] &= ~(1 << (idx & 7));
@@ -1882,14 +1888,14 @@ emu_init(struct sc_info *sc)
 
 	SLIST_INIT(&sc->mem.blocks);
 	sc->mem.ptb_pages = emu_malloc(sc, EMUMAXPAGES * sizeof(u_int32_t),
-	    &sc->mem.ptb_pages_addr);
+	    &sc->mem.ptb_pages_addr, &sc->mem.ptb_map);
 	if (sc->mem.ptb_pages == NULL)
 		return -1;
 
 	sc->mem.silent_page = emu_malloc(sc, EMUPAGESIZE,
-	    &sc->mem.silent_page_addr);
+	    &sc->mem.silent_page_addr, &sc->mem.silent_map);
 	if (sc->mem.silent_page == NULL) {
-		emu_free(sc, sc->mem.ptb_pages);
+		emu_free(sc, sc->mem.ptb_pages, sc->mem.ptb_map);
 		return -1;
 	}
 	/* Clear page with silence & setup all pointers to this page */
@@ -2025,8 +2031,8 @@ emu_uninit(struct sc_info *sc)
 	/* init envelope engine */
 	if (!SLIST_EMPTY(&sc->mem.blocks))
 		device_printf(sc->dev, "warning: memblock list not empty\n");
-	emu_free(sc, sc->mem.ptb_pages);
-	emu_free(sc, sc->mem.silent_page);
+	emu_free(sc, sc->mem.ptb_pages, sc->mem.ptb_map);
+	emu_free(sc, sc->mem.silent_page, sc->mem.silent_map);
 
 	if(sc->mpu)
 	    mpu401_uninit(sc->mpu);
diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c
index cca4997a29f1..5309dfb062c1 100644
--- a/sys/dev/sound/pci/emu10kx.c
+++ b/sys/dev/sound/pci/emu10kx.c
@@ -273,14 +273,17 @@ struct emu_memblk {
 	char		owner[16];
 	bus_addr_t	buf_addr;
 	uint32_t	pte_start, pte_size;
+	bus_dmamap_t	buf_map;
 };
 
 struct emu_mem {
 	uint8_t		bmap[EMU_MAXPAGES / 8];
 	uint32_t	*ptb_pages;
 	void		*silent_page;
-	bus_addr_t	silent_page_addr;
 	bus_addr_t	ptb_pages_addr;
+	bus_addr_t	silent_page_addr;
+	bus_dmamap_t	ptb_map;
+	bus_dmamap_t	silent_map;
 	bus_dma_tag_t	dmat;
 	struct emu_sc_info *card;
 	SLIST_HEAD(, emu_memblk) blocks;
@@ -377,8 +380,8 @@ struct emu_sc_info {
 };
 
 static void	emu_setmap(void *arg, bus_dma_segment_t * segs, int nseg, int error);
-static void*	emu_malloc(struct emu_mem *mem, uint32_t sz, bus_addr_t * addr);
-static void	emu_free(struct emu_mem *mem, void *dmabuf);
+static void*	emu_malloc(struct emu_mem *mem, uint32_t sz, bus_addr_t * addr, bus_dmamap_t *map);
+static void	emu_free(struct emu_mem *mem, void *dmabuf, bus_dmamap_t map);
 static void*	emu_memalloc(struct emu_mem *mem, uint32_t sz, bus_addr_t * addr, const char * owner);
 static int	emu_memfree(struct emu_mem *mem, void *membuf);
 static int	emu_memstart(struct emu_mem *mem, void *membuf);
@@ -1057,30 +1060,32 @@ emu_setmap(void *arg, bus_dma_segment_t * segs, int nseg, int error)
 }
 
 static void *
-emu_malloc(struct emu_mem *mem, uint32_t sz, bus_addr_t * addr)
+emu_malloc(struct emu_mem *mem, uint32_t sz, bus_addr_t * addr,
+    bus_dmamap_t *map)
 {
 	void *dmabuf;
-	bus_dmamap_t map;
 	int error;
 
 	*addr = 0;
-	if ((error = bus_dmamem_alloc(mem->dmat, &dmabuf, BUS_DMA_NOWAIT, &map))) {
+	if ((error = bus_dmamem_alloc(mem->dmat, &dmabuf, BUS_DMA_NOWAIT, map))) {
 		if (mem->card->dbg_level > 2)
 			device_printf(mem->card->dev, "emu_malloc: failed to alloc DMA map: %d\n", error);
 		return (NULL);
 		}
-	if ((error = bus_dmamap_load(mem->dmat, map, dmabuf, sz, emu_setmap, addr, 0)) || !*addr) {
+	if ((error = bus_dmamap_load(mem->dmat, *map, dmabuf, sz, emu_setmap, addr, 0)) || !*addr) {
 		if (mem->card->dbg_level > 2)
 			device_printf(mem->card->dev, "emu_malloc: failed to load DMA memory: %d\n", error);
+		bus_dmamem_free(mem->dmat, dmabuf, *map);
 		return (NULL);
 		}
 	return (dmabuf);
 }
 
 static void
-emu_free(struct emu_mem *mem, void *dmabuf)
+emu_free(struct emu_mem *mem, void *dmabuf, bus_dmamap_t map)
 {
-	bus_dmamem_free(mem->dmat, dmabuf, NULL);
+	bus_dmamap_unload(mem->dmat, map);
+	bus_dmamem_free(mem->dmat, dmabuf, map);
 }
 
 static void *
@@ -1121,7 +1126,7 @@ emu_memalloc(struct emu_mem *mem, uint32_t sz, bus_addr_t * addr, const char *ow
 		return (NULL);
 		}
 	bzero(blk, sizeof(*blk));
-	membuf = emu_malloc(mem, sz, &blk->buf_addr);
+	membuf = emu_malloc(mem, sz, &blk->buf_addr, &blk->buf_map);
 	*addr = blk->buf_addr;
 	if (membuf == NULL) {
 		if (mem->card->dbg_level > 2)
@@ -1159,7 +1164,7 @@ emu_memfree(struct emu_mem *mem, void *membuf)
 	if (blk == NULL)
 		return (EINVAL);
 	SLIST_REMOVE(&mem->blocks, blk, emu_memblk, link);
-	emu_free(mem, membuf);
+	emu_free(mem, membuf, blk->buf_map);
 	tmp = (uint32_t) (mem->silent_page_addr) << 1;
 	for (idx = blk->pte_start; idx < blk->pte_start + blk->pte_size; idx++) {
 		mem->bmap[idx >> 3] &= ~(1 << (idx & 7));
@@ -2724,13 +2729,13 @@ emu_init(struct emu_sc_info *sc)
 
 	sc->mem.card = sc;
 	SLIST_INIT(&sc->mem.blocks);
-	sc->mem.ptb_pages = emu_malloc(&sc->mem, EMU_MAXPAGES * sizeof(uint32_t), &sc->mem.ptb_pages_addr);
+	sc->mem.ptb_pages = emu_malloc(&sc->mem, EMU_MAXPAGES * sizeof(uint32_t), &sc->mem.ptb_pages_addr, &sc->mem.ptb_map);
 	if (sc->mem.ptb_pages == NULL)
 		return (ENOMEM);
 
-	sc->mem.silent_page = emu_malloc(&sc->mem, EMUPAGESIZE, &sc->mem.silent_page_addr);
+	sc->mem.silent_page = emu_malloc(&sc->mem, EMUPAGESIZE, &sc->mem.silent_page_addr, &sc->mem.silent_map);
 	if (sc->mem.silent_page == NULL) {
-		emu_free(&sc->mem, sc->mem.ptb_pages);
+		emu_free(&sc->mem, sc->mem.ptb_pages, sc->mem.ptb_map);
 		return (ENOMEM);
 	}
 	/* Clear page with silence & setup all pointers to this page */
@@ -2946,8 +2951,8 @@ emu_uninit(struct emu_sc_info *sc)
 		if (blk != NULL)
 		device_printf(sc->dev, "lost %d for %s\n", blk->pte_size, blk->owner);
 
-	emu_free(&sc->mem, sc->mem.ptb_pages);
-	emu_free(&sc->mem, sc->mem.silent_page);
+	emu_free(&sc->mem, sc->mem.ptb_pages, sc->mem.ptb_map);
+	emu_free(&sc->mem, sc->mem.silent_page, sc->mem.silent_map);
 
 	return (0);
 }
diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c
index 6c23e28be839..5b39ff861e0d 100644
--- a/sys/dev/sound/pci/envy24.c
+++ b/sys/dev/sound/pci/envy24.c
@@ -163,6 +163,7 @@ struct sc_info {
 	u_int32_t	psize, rsize; /* DMA buffer size(byte) */
 	u_int16_t	blk[2]; /* transfer check blocksize(dword) */
 	bus_dmamap_t	pmap, rmap;
+	bus_addr_t	paddr, raddr;
 
 	/* current status */
 	u_int32_t	speed;
@@ -2166,15 +2167,16 @@ envy24_pci_probe(device_t dev)
 static void
 envy24_dmapsetmap(void *arg, bus_dma_segment_t *segs, int nseg, int error)
 {
-	/* struct sc_info *sc = (struct sc_info *)arg; */
+	struct sc_info *sc = (struct sc_info *)arg;
 
+	sc->paddr = segs->ds_addr;
 #if(0)
 	device_printf(sc->dev, "envy24_dmapsetmap()\n");
 	if (bootverbose) {
 		printf("envy24(play): setmap %lx, %lx; ",
 		    (unsigned long)segs->ds_addr,
 		    (unsigned long)segs->ds_len);
-		printf("%p -> %lx\n", sc->pmap, (unsigned long)vtophys(sc->pmap));
+		printf("%p -> %lx\n", sc->pmap, sc->paddr);
 	}
 #endif
 }
@@ -2182,15 +2184,16 @@ envy24_dmapsetmap(void *arg, bus_dma_segment_t *segs, int nseg, int error)
 static void
 envy24_dmarsetmap(void *arg, bus_dma_segment_t *segs, int nseg, int error)
 {
-	/* struct sc_info *sc = (struct sc_info *)arg; */
+	struct sc_info *sc = (struct sc_info *)arg;
 
+	sc->raddr = segs->ds_addr;
 #if(0)
 	device_printf(sc->dev, "envy24_dmarsetmap()\n");
 	if (bootverbose) {
 		printf("envy24(record): setmap %lx, %lx; ",
 		    (unsigned long)segs->ds_addr,
 		    (unsigned long)segs->ds_len);
-		printf("%p -> %lx\n", sc->rmap, (unsigned long)vtophys(sc->pmap));
+		printf("%p -> %lx\n", sc->rmap, sc->raddr);
 	}
 #endif
 }
@@ -2200,19 +2203,17 @@ envy24_dmafree(struct sc_info *sc)
 {
 #if(0)
 	device_printf(sc->dev, "envy24_dmafree():");
-	if (sc->rmap) printf(" sc->rmap(0x%08x)", (u_int32_t)sc->rmap);
-	else printf(" sc->rmap(null)");
-	if (sc->pmap) printf(" sc->pmap(0x%08x)", (u_int32_t)sc->pmap);
-	else printf(" sc->pmap(null)");
+	printf(" sc->raddr(0x%08x)", (u_int32_t)sc->raddr);
+	printf(" sc->paddr(0x%08x)", (u_int32_t)sc->paddr);
 	if (sc->rbuf) printf(" sc->rbuf(0x%08x)", (u_int32_t)sc->rbuf);
 	else printf(" sc->rbuf(null)");
 	if (sc->pbuf) printf(" sc->pbuf(0x%08x)\n", (u_int32_t)sc->pbuf);
 	else printf(" sc->pbuf(null)\n");
 #endif
 #if(0)
-	if (sc->rmap)
+	if (sc->raddr)
 		bus_dmamap_unload(sc->dmat, sc->rmap);
-	if (sc->pmap)
+	if (sc->paddr)
 		bus_dmamap_unload(sc->dmat, sc->pmap);
 	if (sc->rbuf)
 		bus_dmamem_free(sc->dmat, sc->rbuf, sc->rmap);
@@ -2225,7 +2226,7 @@ envy24_dmafree(struct sc_info *sc)
 	bus_dmamem_free(sc->dmat, sc->pbuf, sc->pmap);
 #endif
 
-	sc->rmap = sc->pmap = NULL;
+	sc->raddr = sc->paddr = 0;
 	sc->pbuf = NULL;
 	sc->rbuf = NULL;
 
@@ -2235,7 +2236,6 @@ envy24_dmafree(struct sc_info *sc)
 static int
 envy24_dmainit(struct sc_info *sc)
 {
-	u_int32_t addr;
 
 #if(0)
 	device_printf(sc->dev, "envy24_dmainit()\n");
@@ -2245,7 +2245,7 @@ envy24_dmainit(struct sc_info *sc)
 	sc->rsize = ENVY24_REC_BUFUNIT * ENVY24_SAMPLE_NUM;
 	sc->pbuf = NULL;
 	sc->rbuf = NULL;
-	sc->pmap = sc->rmap = NULL;
+	sc->paddr = sc->raddr = 0;
 	sc->blk[0] = sc->blk[1] = 0;
 
 	/* allocate DMA buffer */
@@ -2273,11 +2273,10 @@ envy24_dmainit(struct sc_info *sc)
 	bzero(sc->rbuf, sc->rsize);
 
 	/* set values to register */
-	addr = vtophys(sc->pbuf);
 #if(0)
-	device_printf(sc->dev, "pbuf(0x%08x)\n", addr);
+	device_printf(sc->dev, "paddr(0x%08x)\n", sc->paddr);
 #endif
-	envy24_wrmt(sc, ENVY24_MT_PADDR, addr, 4);
+	envy24_wrmt(sc, ENVY24_MT_PADDR, sc->paddr, 4);
 #if(0)
 	device_printf(sc->dev, "PADDR-->(0x%08x)\n", envy24_rdmt(sc, ENVY24_MT_PADDR, 4));
 	device_printf(sc->dev, "psize(%ld)\n", sc->psize / 4 - 1);
@@ -2286,8 +2285,7 @@ envy24_dmainit(struct sc_info *sc)
 #if(0)
 	device_printf(sc->dev, "PCNT-->(%ld)\n", envy24_rdmt(sc, ENVY24_MT_PCNT, 2));
 #endif
-	addr = vtophys(sc->rbuf);
-	envy24_wrmt(sc, ENVY24_MT_RADDR, addr, 4);
+	envy24_wrmt(sc, ENVY24_MT_RADDR, sc->raddr, 4);
 	envy24_wrmt(sc, ENVY24_MT_RCNT, sc->rsize / 4 - 1, 2);
 
 	return 0;
diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c
index 7372e8a69ba1..0619ac163adb 100644
--- a/sys/dev/sound/pci/envy24ht.c
+++ b/sys/dev/sound/pci/envy24ht.c
@@ -162,6 +162,7 @@ struct sc_info {
 	u_int32_t	psize, rsize; /* DMA buffer size(byte) */
 	u_int16_t	blk[2]; /* transfer check blocksize(dword) */
 	bus_dmamap_t	pmap, rmap;
+	bus_addr_t	paddr, raddr;
 
 	/* current status */
 	u_int32_t	speed;
@@ -2082,6 +2083,7 @@ envy24ht_dmapsetmap(void *arg, bus_dma_segment_t *segs, int nseg, int error)
 {
 	struct sc_info *sc = arg;
 
+	sc->paddr = segs->ds_addr;
 #if(0)
 	device_printf(sc->dev, "envy24ht_dmapsetmap()\n");
 	if (bootverbose) {
@@ -2099,6 +2101,7 @@ envy24ht_dmarsetmap(void *arg, bus_dma_segment_t *segs, int nseg, int error)
 {
 	struct sc_info *sc = arg;
 
+	sc->raddr = segs->ds_addr;
 #if(0)
 	device_printf(sc->dev, "envy24ht_dmarsetmap()\n");
 	if (bootverbose) {
@@ -2116,19 +2119,17 @@ envy24ht_dmafree(struct sc_info *sc)
 {
 #if(0)
 	device_printf(sc->dev, "envy24ht_dmafree():");
-	if (sc->rmap) printf(" sc->rmap(0x%08x)", (u_int32_t)sc->rmap);
-	else printf(" sc->rmap(null)");
-	if (sc->pmap) printf(" sc->pmap(0x%08x)", (u_int32_t)sc->pmap);
-	else printf(" sc->pmap(null)");
+	printf(" sc->raddr(0x%08x)", (u_int32_t)sc->raddr);
+	printf(" sc->paddr(0x%08x)", (u_int32_t)sc->paddr);
 	if (sc->rbuf) printf(" sc->rbuf(0x%08x)", (u_int32_t)sc->rbuf);
 	else printf(" sc->rbuf(null)");
 	if (sc->pbuf) printf(" sc->pbuf(0x%08x)\n", (u_int32_t)sc->pbuf);
 	else printf(" sc->pbuf(null)\n");
 #endif
 #if(0)
-	if (sc->rmap)
+	if (sc->raddr)
 		bus_dmamap_unload(sc->dmat, sc->rmap);
-	if (sc->pmap)
+	if (sc->paddr)
 		bus_dmamap_unload(sc->dmat, sc->pmap);
 	if (sc->rbuf)
 		bus_dmamem_free(sc->dmat, sc->rbuf, sc->rmap);
@@ -2141,7 +2142,7 @@ envy24ht_dmafree(struct sc_info *sc)
 	bus_dmamem_free(sc->dmat, sc->pbuf, sc->pmap);
 #endif
 
-	sc->rmap = sc->pmap = NULL;
+	sc->raddr = sc->paddr = 0;
 	sc->pbuf = NULL;
 	sc->rbuf = NULL;
 
@@ -2160,7 +2161,7 @@ envy24ht_dmainit(struct sc_info *sc)
 	sc->rsize = ENVY24HT_REC_BUFUNIT * ENVY24HT_SAMPLE_NUM;
 	sc->pbuf = NULL;
 	sc->rbuf = NULL;
-	sc->pmap = sc->rmap = NULL;
+	sc->paddr = sc->raddr = 0;
 	sc->blk[0] = sc->blk[1] = 0;
 
 	/* allocate DMA buffer */
diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c
index 9f4693225e5a..44b72423c90a 100644
--- a/sys/dev/sound/pci/hda/hdaa_patches.c
+++ b/sys/dev/sound/pci/hda/hdaa_patches.c
@@ -346,11 +346,22 @@ hdac_pin_patch(struct hdaa_widget *w)
 			patch = "as=1 seq=15";
 			break;
 		}
+	} else if (id == HDA_CODEC_CX20561 &&
+	    subid == LENOVO_T400_SUBVENDOR) {
+		switch (nid) {
+		case 22:
+			patch = "as=1 seq=15";
+			break;
+		case 26:
+			patch = "as=1 seq=0";
+			break;
+		}
 	} else if (id == HDA_CODEC_CX20590 &&
 	    (subid == LENOVO_X1_SUBVENDOR ||
 	    subid == LENOVO_X220_SUBVENDOR ||
 	    subid == LENOVO_T420_SUBVENDOR ||
-	    subid == LENOVO_T520_SUBVENDOR)) {
+	    subid == LENOVO_T520_SUBVENDOR ||
+	    subid == LENOVO_G580_SUBVENDOR)) {
 		switch (nid) {
 		case 25:
 			patch = "as=1 seq=15";
diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c
index 9648aac8b5d5..c13716e9351c 100644
--- a/sys/dev/sound/pci/hda/hdac.c
+++ b/sys/dev/sound/pci/hda/hdac.c
@@ -611,19 +611,19 @@ hdac_dma_alloc(struct hdac_softc *sc, struct hdac_dma *dma, bus_size_t size)
 static void
 hdac_dma_free(struct hdac_softc *sc, struct hdac_dma *dma)
 {
-	if (dma->dma_map != NULL) {
+	if (dma->dma_paddr != 0) {
 #if 0
 		/* Flush caches */
 		bus_dmamap_sync(dma->dma_tag, dma->dma_map,
 		    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 #endif
 		bus_dmamap_unload(dma->dma_tag, dma->dma_map);
+		dma->dma_paddr = 0;
 	}
 	if (dma->dma_vaddr != NULL) {
 		bus_dmamem_free(dma->dma_tag, dma->dma_vaddr, dma->dma_map);
 		dma->dma_vaddr = NULL;
 	}
-	dma->dma_map = NULL;
 	if (dma->dma_tag != NULL) {
 		bus_dma_tag_destroy(dma->dma_tag);
 		dma->dma_tag = NULL;
diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h
index 2dc7ec9fee4d..0fc2c0f5c9ac 100644
--- a/sys/dev/sound/pci/hda/hdac.h
+++ b/sys/dev/sound/pci/hda/hdac.h
@@ -236,11 +236,13 @@
 #define	LENOVO_X1CRBN_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x21f9)
 #define LENOVO_X220_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x21da)
 #define LENOVO_X300_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x20ac)
+#define	LENOVO_T400_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x20f2)
 #define	LENOVO_T420_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x21ce)
 #define	LENOVO_T430_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x21f3)
 #define	LENOVO_T430S_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x21fb)
 #define	LENOVO_T520_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x21cf)
 #define	LENOVO_T530_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x21f6)
+#define	LENOVO_G580_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0x3977)
 #define LENOVO_ALL_SUBVENDOR	HDA_MODEL_CONSTRUCT(LENOVO, 0xffff)
 
 /* Samsung */
diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c
index 68a17f4f1911..8258afceb152 100644
--- a/sys/dev/sound/pci/hdspe.c
+++ b/sys/dev/sound/pci/hdspe.c
@@ -344,7 +344,6 @@ hdspe_dmafree(struct sc_info *sc)
 	bus_dmamap_unload(sc->dmat, sc->pmap);
 	bus_dmamem_free(sc->dmat, sc->rbuf, sc->rmap);
 	bus_dmamem_free(sc->dmat, sc->pbuf, sc->pmap);
-	sc->rmap = sc->pmap = NULL;
 	sc->rbuf = sc->pbuf = NULL;
 }
 
diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c
index 1b452115a55b..c95aa6c773df 100644
--- a/sys/dev/sound/pci/maestro.c
+++ b/sys/dev/sound/pci/maestro.c
@@ -110,6 +110,7 @@ struct agg_chinfo {
 	struct snd_dbuf		*buffer;
 
 	/* OS independent */
+	bus_dmamap_t		map;
 	bus_addr_t		phys;	/* channel buffer physical address */
 	bus_addr_t		base;	/* channel buffer segment base */
 	u_int32_t		blklen;	/* DMA block length in WORDs */
@@ -130,6 +131,7 @@ struct agg_rchinfo {
 	struct snd_dbuf		*buffer;
 
 	/* OS independent */
+	bus_dmamap_t		map;
 	bus_addr_t		phys;	/* channel buffer physical address */
 	bus_addr_t		base;	/* channel buffer segment base */
 	u_int32_t		blklen;	/* DMA block length in WORDs */
@@ -166,6 +168,7 @@ struct agg_info {
 	struct ac97_info	*codec;
 
 	/* OS independent */
+	bus_dmamap_t		stat_map;
 	u_int8_t		*stat;	/* status buffer pointer */
 	bus_addr_t		phys;	/* status buffer physical address */
 	unsigned int		bufsz;	/* channel buffer size in bytes */
@@ -262,8 +265,9 @@ static int	agg_suspend(device_t);
 static int	agg_resume(device_t);
 static int	agg_shutdown(device_t);
 
-static void	*dma_malloc(bus_dma_tag_t, u_int32_t, bus_addr_t*);
-static void	dma_free(bus_dma_tag_t, void *);
+static void	*dma_malloc(bus_dma_tag_t, u_int32_t, bus_addr_t*,
+		    bus_dmamap_t *);
+static void	dma_free(bus_dma_tag_t, void *, bus_dmamap_t);
 
 
 /* -----------------------------
@@ -1297,7 +1301,7 @@ aggpch_init(kobj_t obj, void *devinfo, struct snd_dbuf *b,
 	ch->buffer = b;
 	ch->num = ess->playchns;
 
-	p = dma_malloc(ess->buf_dmat, ess->bufsz, &physaddr);
+	p = dma_malloc(ess->buf_dmat, ess->bufsz, &physaddr, &ch->map);
 	if (p == NULL)
 		return NULL;
 	ch->phys = physaddr;
@@ -1360,7 +1364,7 @@ aggpch_free(kobj_t obj, void *data)
 	struct agg_info *ess = ch->parent;
 
 	/* free up buffer - called after channel stopped */
-	dma_free(ess->buf_dmat, sndbuf_getbuf(ch->buffer));
+	dma_free(ess->buf_dmat, sndbuf_getbuf(ch->buffer), ch->map);
 
 	/* return 0 if ok */
 	return 0;
@@ -1722,25 +1726,26 @@ setmap(void *arg, bus_dma_segment_t *segs, int nseg, int error)
 }
 
 static void *
-dma_malloc(bus_dma_tag_t dmat, u_int32_t sz, bus_addr_t *phys)
+dma_malloc(bus_dma_tag_t dmat, u_int32_t sz, bus_addr_t *phys,
+    bus_dmamap_t *map)
 {
 	void *buf;
-	bus_dmamap_t map;
 
-	if (bus_dmamem_alloc(dmat, &buf, BUS_DMA_NOWAIT, &map))
+	if (bus_dmamem_alloc(dmat, &buf, BUS_DMA_NOWAIT, map))
 		return NULL;
-	if (bus_dmamap_load(dmat, map, buf, sz, setmap, phys, 0)
-	    || !*phys || map) {
-		bus_dmamem_free(dmat, buf, map);
+	if (bus_dmamap_load(dmat, *map, buf, sz, setmap, phys, 0) != 0 ||
+	    *phys == 0) {
+		bus_dmamem_free(dmat, buf, *map);
 		return NULL;
 	}
 	return buf;
 }
 
 static void
-dma_free(bus_dma_tag_t dmat, void *buf)
+dma_free(bus_dma_tag_t dmat, void *buf, bus_dmamap_t map)
 {
-	bus_dmamem_free(dmat, buf, NULL);
+	bus_dmamap_unload(dmat, map);
+	bus_dmamem_free(dmat, buf, map);
 }
 
 static int
@@ -1836,7 +1841,8 @@ agg_attach(device_t dev)
 	}
 
 	/* Allocate the room for brain-damaging status buffer. */
-	ess->stat = dma_malloc(ess->stat_dmat, 3*ess->bufsz, &ess->phys);
+	ess->stat = dma_malloc(ess->stat_dmat, 3*ess->bufsz, &ess->phys,
+	    &ess->stat_map);
 	if (ess->stat == NULL) {
 		device_printf(dev, "cannot allocate status buffer\n");
 		ret = ENOMEM;
@@ -1939,7 +1945,7 @@ agg_attach(device_t dev)
 		bus_release_resource(dev, SYS_RES_IOPORT, regid, reg);
 	if (ess != NULL) {
 		if (ess->stat != NULL)
-			dma_free(ess->stat_dmat, ess->stat);
+			dma_free(ess->stat_dmat, ess->stat, ess->stat_map);
 		if (ess->stat_dmat != NULL)
 			bus_dma_tag_destroy(ess->stat_dmat);
 		if (ess->buf_dmat != NULL)
@@ -1983,7 +1989,7 @@ agg_detach(device_t dev)
 	bus_teardown_intr(dev, ess->irq, ess->ih);
 	bus_release_resource(dev, SYS_RES_IRQ, ess->irqid, ess->irq);
 	bus_release_resource(dev, SYS_RES_IOPORT, ess->regid, ess->reg);
-	dma_free(ess->stat_dmat, ess->stat);
+	dma_free(ess->stat_dmat, ess->stat, ess->stat_map);
 	bus_dma_tag_destroy(ess->stat_dmat);
 	bus_dma_tag_destroy(ess->buf_dmat);
 	mtx_destroy(&ess->lock);
diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c
index 1f5f48299f20..171278c4539a 100644
--- a/sys/dev/sound/pci/via8233.c
+++ b/sys/dev/sound/pci/via8233.c
@@ -1381,7 +1381,7 @@ via_attach(device_t dev)
 		bus_release_resource(dev, SYS_RES_IRQ, via->irqid, via->irq);
 	if (via->parent_dmat)
 		bus_dma_tag_destroy(via->parent_dmat);
-	if (via->sgd_dmamap)
+	if (via->sgd_addr)
 		bus_dmamap_unload(via->sgd_dmat, via->sgd_dmamap);
 	if (via->sgd_table)
 		bus_dmamem_free(via->sgd_dmat, via->sgd_table, via->sgd_dmamap);
diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
index 28198a61f79a..6b615e870a79 100644
--- a/sys/dev/sound/pci/via82c686.c
+++ b/sys/dev/sound/pci/via82c686.c
@@ -606,7 +606,7 @@ via_attach(device_t dev)
 	if (via->ih) bus_teardown_intr(dev, via->irq, via->ih);
 	if (via->irq) bus_release_resource(dev, SYS_RES_IRQ, via->irqid, via->irq);
 	if (via->parent_dmat) bus_dma_tag_destroy(via->parent_dmat);
-	if (via->sgd_dmamap) bus_dmamap_unload(via->sgd_dmat, via->sgd_dmamap);
+	if (via->sgd_addr) bus_dmamap_unload(via->sgd_dmat, via->sgd_dmamap);
 	if (via->sgd_table) bus_dmamem_free(via->sgd_dmat, via->sgd_table, via->sgd_dmamap);
 	if (via->sgd_dmat) bus_dma_tag_destroy(via->sgd_dmat);
 	if (via->lock) snd_mtxfree(via->lock);
diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c
index 0ae2fb054f18..a925fb160036 100644
--- a/sys/dev/sound/pcm/buffer.c
+++ b/sys/dev/sound/pcm/buffer.c
@@ -139,7 +139,7 @@ sndbuf_free(struct snd_dbuf *b)
 
 	if (b->buf) {
 		if (b->flags & SNDBUF_F_MANAGED) {
-			if (b->dmamap)
+			if (b->buf_addr)
 				bus_dmamap_unload(b->dmatag, b->dmamap);
 			if (b->dmatag)
 				bus_dmamem_free(b->dmatag, b->buf, b->dmamap);
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index 75b02d00e311..41fbee2e75ae 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -119,8 +119,7 @@ SYSCTL_PROC(_hw_snd, OID_AUTO, timeout, CTLTYPE_INT | CTLFLAG_RW,
 #endif
 
 static int chn_vpc_autoreset = 1;
-TUNABLE_INT("hw.snd.vpc_autoreset", &chn_vpc_autoreset);
-SYSCTL_INT(_hw_snd, OID_AUTO, vpc_autoreset, CTLFLAG_RW,
+SYSCTL_INT(_hw_snd, OID_AUTO, vpc_autoreset, CTLFLAG_RWTUN,
 	&chn_vpc_autoreset, 0, "automatically reset channels volume to 0db");
 
 static int chn_vol_0db_pcm = SND_VOL_0DB_PCM;
diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c
index 92a1cf539024..a647269dba6d 100644
--- a/sys/dev/sound/pcm/feeder_chain.c
+++ b/sys/dev/sound/pcm/feeder_chain.c
@@ -125,8 +125,7 @@ static uint32_t *feeder_chain_formats[FEEDER_CHAIN_LAST] = {
 static int feeder_chain_mode = FEEDER_CHAIN_DEFAULT;
 
 #if defined(_KERNEL) && defined(SND_DEBUG) && defined(SND_FEEDER_FULL_MULTIFORMAT)
-TUNABLE_INT("hw.snd.feeder_chain_mode", &feeder_chain_mode);
-SYSCTL_INT(_hw_snd, OID_AUTO, feeder_chain_mode, CTLFLAG_RW,
+SYSCTL_INT(_hw_snd, OID_AUTO, feeder_chain_mode, CTLFLAG_RWTUN,
     &feeder_chain_mode, 0,
     "feeder chain mode "
     "(0=lean, 1=16bit, 2=32bit, 3=multiformat, 4=fullmultiformat)");
diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c
index dee38a386e51..b4a92c986a60 100644
--- a/sys/dev/sound/pcm/feeder_eq.c
+++ b/sys/dev/sound/pcm/feeder_eq.c
@@ -97,8 +97,7 @@ static char feeder_eq_presets[] = FEEDER_EQ_PRESETS;
 SYSCTL_STRING(_hw_snd, OID_AUTO, feeder_eq_presets, CTLFLAG_RD,
     &feeder_eq_presets, 0, "compile-time eq presets");
 
-TUNABLE_INT("hw.snd.feeder_eq_exact_rate", &feeder_eq_exact_rate);
-SYSCTL_INT(_hw_snd, OID_AUTO, feeder_eq_exact_rate, CTLFLAG_RW,
+SYSCTL_INT(_hw_snd, OID_AUTO, feeder_eq_exact_rate, CTLFLAG_RWTUN,
     &feeder_eq_exact_rate, 0, "force exact rate validation");
 #endif
 
diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c
index cb30dd93149a..d521fd16f1c1 100644
--- a/sys/dev/sound/pcm/feeder_rate.c
+++ b/sys/dev/sound/pcm/feeder_rate.c
@@ -168,8 +168,7 @@ TUNABLE_INT("hw.snd.feeder_rate_max", &feeder_rate_max);
 TUNABLE_INT("hw.snd.feeder_rate_round", &feeder_rate_round);
 TUNABLE_INT("hw.snd.feeder_rate_quality", &feeder_rate_quality);
 
-TUNABLE_INT("hw.snd.feeder_rate_polyphase_max", &feeder_rate_polyphase_max);
-SYSCTL_INT(_hw_snd, OID_AUTO, feeder_rate_polyphase_max, CTLFLAG_RW,
+SYSCTL_INT(_hw_snd, OID_AUTO, feeder_rate_polyphase_max, CTLFLAG_RWTUN,
     &feeder_rate_polyphase_max, 0, "maximum allowable polyphase entries");
 
 static int
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index 8f9a5fb3a7f3..1c5307654cc9 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -40,8 +40,7 @@ SND_DECLARE_FILE("$FreeBSD$");
 static MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
 
 static int mixer_bypass = 1;
-TUNABLE_INT("hw.snd.vpc_mixer_bypass", &mixer_bypass);
-SYSCTL_INT(_hw_snd, OID_AUTO, vpc_mixer_bypass, CTLFLAG_RW,
+SYSCTL_INT(_hw_snd, OID_AUTO, vpc_mixer_bypass, CTLFLAG_RWTUN,
     &mixer_bypass, 0,
     "control channel pcm/rec volume, bypassing real mixer device");
 
@@ -1222,6 +1221,15 @@ mixer_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode,
 	return (ret);
 }
 
+static void
+mixer_mixerinfo(struct snd_mixer *m, mixer_info *mi)
+{
+	bzero((void *)mi, sizeof(*mi));
+	strlcpy(mi->id, m->name, sizeof(mi->id));
+	strlcpy(mi->name, device_get_desc(m->dev), sizeof(mi->name));
+	mi->modify_counter = m->modify_counter;
+}
+
 /*
  * XXX Make sure you can guarantee concurrency safety before calling this
  *     function, be it through Giant, PCM_*, etc !
@@ -1280,6 +1288,10 @@ mixer_ioctl_cmd(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode,
 		*arg_i = SOUND_VERSION;
 		ret = 0;
 		goto done;
+	case SOUND_MIXER_INFO:
+		mixer_mixerinfo(m, (mixer_info *)arg);
+		ret = 0;
+		goto done;
 	}
 	if ((cmd & ~0xff) == MIXER_WRITE(0)) {
 		if (j == SOUND_MIXER_RECSRC)
diff --git a/sys/dev/sound/pcm/pcm.h b/sys/dev/sound/pcm/pcm.h
index aab375089a2f..a3a4ec385c7a 100644
--- a/sys/dev/sound/pcm/pcm.h
+++ b/sys/dev/sound/pcm/pcm.h
@@ -42,7 +42,7 @@
 
 /*
  * Automatically turn on 64bit arithmetic on suitable archs
- * (amd64 64bit, ia64, etc..) for wider 32bit samples / integer processing.
+ * (amd64 64bit, etc..) for wider 32bit samples / integer processing.
  */
 #if LONG_BIT >= 64
 #undef SND_PCM_64
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index a7edad5246c7..8b43879470e5 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -52,8 +52,7 @@ int snd_unit = -1;
 TUNABLE_INT("hw.snd.default_unit", &snd_unit);
 
 static int snd_unit_auto = -1;
-TUNABLE_INT("hw.snd.default_auto", &snd_unit_auto);
-SYSCTL_INT(_hw_snd, OID_AUTO, default_auto, CTLFLAG_RW,
+SYSCTL_INT(_hw_snd, OID_AUTO, default_auto, CTLFLAG_RWTUN,
     &snd_unit_auto, 0, "assign default unit to a newly attached device");
 
 int snd_maxautovchans = 16;
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 1af8cb2c4ecf..6c798cc0e096 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -103,17 +103,11 @@ static SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW, 0, "USB uaudio");
 
 SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RW,
     &uaudio_debug, 0, "uaudio debug level");
-
-TUNABLE_INT("hw.usb.uaudio.default_rate", &uaudio_default_rate);
-SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_rate, CTLFLAG_RW,
+SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_rate, CTLFLAG_RWTUN,
     &uaudio_default_rate, 0, "uaudio default sample rate");
-
-TUNABLE_INT("hw.usb.uaudio.default_bits", &uaudio_default_bits);
-SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_bits, CTLFLAG_RW,
+SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_bits, CTLFLAG_RWTUN,
     &uaudio_default_bits, 0, "uaudio default sample bits");
-
-TUNABLE_INT("hw.usb.uaudio.default_channels", &uaudio_default_channels);
-SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_channels, CTLFLAG_RW,
+SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_channels, CTLFLAG_RWTUN,
     &uaudio_default_channels, 0, "uaudio default sample channels");
 #endif
 
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index 4dc5ca576864..bd533f5bc99c 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -132,8 +132,6 @@ typedef	u_int32_t u32;
 #define MEMORY_BARRIER()	do { ; } while(0)
 #elif	defined	__powerpc__
 #define MEMORY_BARRIER()	__asm__ volatile("eieio; sync" : : : "memory")
-#elif	defined	__ia64__
-#define MEMORY_BARRIER()	__asm__ volatile("mf.a; mf" : : : "memory")
 #elif	defined	__sparc64__
 #define MEMORY_BARRIER()	__asm__ volatile("membar #Sync" : : : "memory")
 #elif	defined	__arm__
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index b44dd537105b..6a19523ee2ea 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -154,8 +154,7 @@ SYSCTL_INT(_hw_syscons, OID_AUTO, kbd_reboot, CTLFLAG_RW|CTLFLAG_SECURE, &enable
 SYSCTL_INT(_hw_syscons, OID_AUTO, kbd_debug, CTLFLAG_RW|CTLFLAG_SECURE, &enable_kdbkey,
     0, "enable keyboard debug");
 #endif
-TUNABLE_INT("hw.syscons.sc_no_suspend_vtswitch", &sc_no_suspend_vtswitch);
-SYSCTL_INT(_hw_syscons, OID_AUTO, sc_no_suspend_vtswitch, CTLFLAG_RW,
+SYSCTL_INT(_hw_syscons, OID_AUTO, sc_no_suspend_vtswitch, CTLFLAG_RWTUN,
     &sc_no_suspend_vtswitch, 0, "Disable VT switch before suspend.");
 #if !defined(SC_NO_FONT_LOADING) && defined(SC_DFLT_FONT)
 #include "font.h"
@@ -267,6 +266,8 @@ static struct cdevsw consolectl_devsw = {
 int
 sc_probe_unit(int unit, int flags)
 {
+    if (!vty_enabled(VTY_SC))
+        return ENXIO;
     if (!scvidprobe(unit, flags, FALSE)) {
 	if (bootverbose)
 	    printf("%s%d: no video adapter found.\n", SC_DRIVER_NAME, unit);
@@ -492,6 +493,9 @@ sc_attach_unit(int unit, int flags)
     struct cdev *dev;
     int vc;
 
+    if (!vty_enabled(VTY_SC))
+        return ENXIO;
+
     flags &= ~SC_KERNEL_CONSOLE;
 
     if (sc_console_unit == unit) {
@@ -576,6 +580,8 @@ sc_attach_unit(int unit, int flags)
 static void
 scmeminit(void *arg)
 {
+    if (!vty_enabled(VTY_SC))
+        return;
     if (sc_malloc)
 	return;
     sc_malloc = TRUE;
@@ -1589,6 +1595,11 @@ sc_cnprobe(struct consdev *cp)
     int unit;
     int flags;
 
+    if (!vty_enabled(VTY_SC)) {
+	cp->cn_pri = CN_DEAD;
+	return;
+    }
+
     cp->cn_pri = sc_get_cons_priority(&unit, &flags);
 
     /* a video card is always required */
diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c
index c58e9aeae895..e66849787929 100644
--- a/sys/dev/syscons/sysmouse.c
+++ b/sys/dev/syscons/sysmouse.c
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/tty.h>
 #include <sys/ttydefaults.h>
 #include <sys/kernel.h>
+#include <sys/cons.h>
 #include <sys/consio.h>
 #include <sys/mouse.h>
 
@@ -165,6 +166,8 @@ static struct ttydevsw smdev_ttydevsw = {
 static void
 sm_attach_mouse(void *unused)
 {
+	if (!vty_enabled(VTY_SC))
+		return;
 	sysmouse_tty = tty_alloc(&smdev_ttydevsw, NULL);
 	tty_makedev(sysmouse_tty, NULL, "sysmouse");
 }
diff --git a/sys/dev/terasic/mtl/terasic_mtl.h b/sys/dev/terasic/mtl/terasic_mtl.h
index e07bbf4635b7..ad772488f9a3 100644
--- a/sys/dev/terasic/mtl/terasic_mtl.h
+++ b/sys/dev/terasic/mtl/terasic_mtl.h
@@ -62,7 +62,7 @@ struct terasic_mtl_softc {
 	int		 mtl_reg_rid;
 
 	/*
-	 * Graphics frame buffer device -- mappable form userspace.
+	 * Graphics frame buffer device -- mappable from userspace.
 	 */
 	struct cdev	*mtl_pixel_cdev;
 	struct resource	*mtl_pixel_res;
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index c201029bc7dc..fa63aa9543bb 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -227,7 +227,7 @@ static void ti_dma_free(struct ti_softc *);
 static int ti_dma_ring_alloc(struct ti_softc *, bus_size_t, bus_size_t,
     bus_dma_tag_t *, uint8_t **, bus_dmamap_t *, bus_addr_t *, const char *);
 static void ti_dma_ring_free(struct ti_softc *, bus_dma_tag_t *, uint8_t **,
-    bus_dmamap_t *);
+    bus_dmamap_t, bus_addr_t *);
 static int ti_newbuf_std(struct ti_softc *, int);
 static int ti_newbuf_mini(struct ti_softc *, int);
 static int ti_newbuf_jumbo(struct ti_softc *, int, struct mbuf *);
@@ -1035,15 +1035,16 @@ ti_dma_ring_alloc(struct ti_softc *sc, bus_size_t alignment, bus_size_t maxsize,
 
 static void
 ti_dma_ring_free(struct ti_softc *sc, bus_dma_tag_t *tag, uint8_t **ring,
-    bus_dmamap_t *map)
+    bus_dmamap_t map, bus_addr_t *paddr)
 {
 
-	if (*map != NULL)
-		bus_dmamap_unload(*tag, *map);
-	if (*map != NULL && *ring != NULL) {
-		bus_dmamem_free(*tag, *ring, *map);
+	if (*paddr != 0) {
+		bus_dmamap_unload(*tag, map);
+		*paddr = 0;
+	}
+	if (*ring != NULL) {
+		bus_dmamem_free(*tag, *ring, map);
 		*ring = NULL;
-		*map = NULL;
 	}
 	if (*tag) {
 		bus_dma_tag_destroy(*tag);
@@ -1336,32 +1337,39 @@ ti_dma_free(struct ti_softc *sc)
 	/* Destroy standard RX ring. */
 	ti_dma_ring_free(sc, &sc->ti_cdata.ti_rx_std_ring_tag,
 	    (void *)&sc->ti_rdata.ti_rx_std_ring,
-	    &sc->ti_cdata.ti_rx_std_ring_map);
+	    sc->ti_cdata.ti_rx_std_ring_map,
+	    &sc->ti_rdata.ti_rx_std_ring_paddr);
 	/* Destroy jumbo RX ring. */
 	ti_dma_ring_free(sc, &sc->ti_cdata.ti_rx_jumbo_ring_tag,
 	    (void *)&sc->ti_rdata.ti_rx_jumbo_ring,
-	    &sc->ti_cdata.ti_rx_jumbo_ring_map);
+	    sc->ti_cdata.ti_rx_jumbo_ring_map,
+	    &sc->ti_rdata.ti_rx_jumbo_ring_paddr);
 	/* Destroy mini RX ring. */
 	ti_dma_ring_free(sc, &sc->ti_cdata.ti_rx_mini_ring_tag,
 	    (void *)&sc->ti_rdata.ti_rx_mini_ring,
-	    &sc->ti_cdata.ti_rx_mini_ring_map);
+	    sc->ti_cdata.ti_rx_mini_ring_map,
+	    &sc->ti_rdata.ti_rx_mini_ring_paddr);
 	/* Destroy RX return ring. */
 	ti_dma_ring_free(sc, &sc->ti_cdata.ti_rx_return_ring_tag,
 	    (void *)&sc->ti_rdata.ti_rx_return_ring,
-	    &sc->ti_cdata.ti_rx_return_ring_map);
+	    sc->ti_cdata.ti_rx_return_ring_map,
+	    &sc->ti_rdata.ti_rx_return_ring_paddr);
 	/* Destroy TX ring. */
 	ti_dma_ring_free(sc, &sc->ti_cdata.ti_tx_ring_tag,
-	    (void *)&sc->ti_rdata.ti_tx_ring, &sc->ti_cdata.ti_tx_ring_map);
+	    (void *)&sc->ti_rdata.ti_tx_ring, sc->ti_cdata.ti_tx_ring_map,
+	    &sc->ti_rdata.ti_tx_ring_paddr);
 	/* Destroy status block. */
 	ti_dma_ring_free(sc, &sc->ti_cdata.ti_status_tag,
-	    (void *)&sc->ti_rdata.ti_status, &sc->ti_cdata.ti_status_map);
+	    (void *)&sc->ti_rdata.ti_status, sc->ti_cdata.ti_status_map,
+	    &sc->ti_rdata.ti_status_paddr);
 	/* Destroy event ring. */
 	ti_dma_ring_free(sc, &sc->ti_cdata.ti_event_ring_tag,
 	    (void *)&sc->ti_rdata.ti_event_ring,
-	    &sc->ti_cdata.ti_event_ring_map);
+	    sc->ti_cdata.ti_event_ring_map, &sc->ti_rdata.ti_event_ring_paddr);
 	/* Destroy GIB */
 	ti_dma_ring_free(sc, &sc->ti_cdata.ti_gib_tag,
-	    (void *)&sc->ti_rdata.ti_info, &sc->ti_cdata.ti_gib_map);
+	    (void *)&sc->ti_rdata.ti_info, sc->ti_cdata.ti_gib_map,
+	    &sc->ti_rdata.ti_info_paddr);
 
 	/* Destroy the parent tag. */
 	if (sc->ti_cdata.ti_parent_tag) {
@@ -1616,7 +1624,7 @@ ti_newbuf_jumbo(struct ti_softc *sc, int idx, struct mbuf *m_old)
 			}
 			sf[i] = sf_buf_alloc(frame, SFB_NOWAIT);
 			if (sf[i] == NULL) {
-				vm_page_unwire(frame, 0);
+				vm_page_unwire(frame, PQ_INACTIVE);
 				vm_page_free(frame);
 				device_printf(sc->ti_dev, "buffer allocation "
 				    "failed -- packet dropped!\n");
diff --git a/sys/dev/tsec/if_tsec_fdt.c b/sys/dev/tsec/if_tsec_fdt.c
index a4fe3d8c87ce..6ed8953f472c 100644
--- a/sys/dev/tsec/if_tsec_fdt.c
+++ b/sys/dev/tsec/if_tsec_fdt.c
@@ -101,8 +101,6 @@ static driver_t tsec_fdt_driver = {
 };
 
 DRIVER_MODULE(tsec, simplebus, tsec_fdt_driver, tsec_devclass, 0, 0);
-MODULE_DEPEND(tsec, simplebus, 1, 1, 1);
-MODULE_DEPEND(tsec, ether, 1, 1, 1);
 
 static int
 tsec_fdt_probe(device_t dev)
diff --git a/sys/dev/tws/tws.c b/sys/dev/tws/tws.c
index 6ebde7574448..11013cbc2b55 100644
--- a/sys/dev/tws/tws.c
+++ b/sys/dev/tws/tws.c
@@ -310,6 +310,12 @@ tws_attach(device_t dev)
 attach_fail_4:
     tws_teardown_intr(sc);
     destroy_dev(sc->tws_cdev);
+    if (sc->dma_mem_phys)
+	    bus_dmamap_unload(sc->cmd_tag, sc->cmd_map);
+    if (sc->dma_mem)
+	    bus_dmamem_free(sc->cmd_tag, sc->dma_mem, sc->cmd_map);
+    if (sc->cmd_tag)
+	    bus_dma_tag_destroy(sc->cmd_tag);
 attach_fail_3:
     for(i=0;i<sc->irqs;i++) {
         if ( sc->irq_res[i] ){
@@ -383,6 +389,13 @@ tws_detach(device_t dev)
 
     tws_cam_detach(sc);
 
+    if (sc->dma_mem_phys)
+	    bus_dmamap_unload(sc->cmd_tag, sc->cmd_map);
+    if (sc->dma_mem)
+	    bus_dmamem_free(sc->cmd_tag, sc->dma_mem, sc->cmd_map);
+    if (sc->cmd_tag)
+	    bus_dma_tag_destroy(sc->cmd_tag);
+
     /* Release memory resource */
     if ( sc->mfa_res ){
         if (bus_release_resource(sc->tws_dev,
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index b0dd09c2e7c6..e0452be03984 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -112,7 +112,7 @@ MODULE_DEPEND(txp, ether, 1, 1, 1);
  *    restriction by copying received frame to align the frame on
  *    32bit boundary on strict-alignment architectures. This adds a
  *    lot of CPU burden and it effectively reduce Rx performance on
- *    strict-alignment architectures(e.g. sparc64, arm, mips and ia64).
+ *    strict-alignment architectures(e.g. sparc64, arm and mips).
  *
  * Unfortunately it seems that 3Com have no longer interests in
  * releasing fixed firmware so we may have to live with these bugs.
@@ -169,8 +169,8 @@ static int txp_alloc_rings(struct txp_softc *);
 static void txp_init_rings(struct txp_softc *);
 static int txp_dma_alloc(struct txp_softc *, char *, bus_dma_tag_t *,
     bus_size_t, bus_size_t, bus_dmamap_t *, void **, bus_size_t, bus_addr_t *);
-static void txp_dma_free(struct txp_softc *, bus_dma_tag_t *, bus_dmamap_t *,
-    void **);
+static void txp_dma_free(struct txp_softc *, bus_dma_tag_t *, bus_dmamap_t,
+    void **, bus_addr_t *);
 static void txp_free_rings(struct txp_softc *);
 static int txp_rxring_fill(struct txp_softc *);
 static void txp_rxring_empty(struct txp_softc *);
@@ -787,7 +787,7 @@ txp_download_fw_section(struct txp_softc *sc,
 
 	bus_dmamap_sync(sec_tag, sec_map, BUS_DMASYNC_POSTWRITE);
 bail:
-	txp_dma_free(sc, &sec_tag, &sec_map, (void **)&sec_buf);
+	txp_dma_free(sc, &sec_tag, sec_map, (void **)&sec_buf, &sec_paddr);
 	return (err);
 }
 
@@ -1265,17 +1265,17 @@ txp_dma_alloc(struct txp_softc *sc, char *type, bus_dma_tag_t *tag,
 }
 
 static void
-txp_dma_free(struct txp_softc *sc, bus_dma_tag_t *tag, bus_dmamap_t *map,
-    void **buf)
+txp_dma_free(struct txp_softc *sc, bus_dma_tag_t *tag, bus_dmamap_t map,
+    void **buf, bus_addr_t *paddr)
 {
 
 	if (*tag != NULL) {
-		if (*map != NULL)
-			bus_dmamap_unload(*tag, *map);
-		if (*map != NULL && buf != NULL)
-			bus_dmamem_free(*tag, *(uint8_t **)buf, *map);
+		if (*paddr != 0)
+			bus_dmamap_unload(*tag, map);
+		if (buf != NULL)
+			bus_dmamem_free(*tag, *(uint8_t **)buf, map);
 		*(uint8_t **)buf = NULL;
-		*map = NULL;
+		*paddr = 0;
 		bus_dma_tag_destroy(*tag);
 		*tag = NULL;
 	}
@@ -1649,38 +1649,48 @@ txp_free_rings(struct txp_softc *sc)
 
 	/* Hi priority Tx ring. */
 	txp_dma_free(sc, &sc->sc_cdata.txp_txhiring_tag,
-	    &sc->sc_cdata.txp_txhiring_map,
-	    (void **)&sc->sc_ldata.txp_txhiring);
+	    sc->sc_cdata.txp_txhiring_map,
+	    (void **)&sc->sc_ldata.txp_txhiring,
+	    &sc->sc_ldata.txp_txhiring_paddr);
 	/* Low priority Tx ring. */
 	txp_dma_free(sc, &sc->sc_cdata.txp_txloring_tag,
-	    &sc->sc_cdata.txp_txloring_map,
-	    (void **)&sc->sc_ldata.txp_txloring);
+	    sc->sc_cdata.txp_txloring_map,
+	    (void **)&sc->sc_ldata.txp_txloring,
+	    &sc->sc_ldata.txp_txloring_paddr);
 	/* Hi priority Rx ring. */
 	txp_dma_free(sc, &sc->sc_cdata.txp_rxhiring_tag,
-	    &sc->sc_cdata.txp_rxhiring_map,
-	    (void **)&sc->sc_ldata.txp_rxhiring);
+	    sc->sc_cdata.txp_rxhiring_map,
+	    (void **)&sc->sc_ldata.txp_rxhiring,
+	    &sc->sc_ldata.txp_rxhiring_paddr);
 	/* Low priority Rx ring. */
 	txp_dma_free(sc, &sc->sc_cdata.txp_rxloring_tag,
-	    &sc->sc_cdata.txp_rxloring_map,
-	    (void **)&sc->sc_ldata.txp_rxloring);
+	    sc->sc_cdata.txp_rxloring_map,
+	    (void **)&sc->sc_ldata.txp_rxloring,
+	    &sc->sc_ldata.txp_rxloring_paddr);
 	/* Receive buffer ring. */
 	txp_dma_free(sc, &sc->sc_cdata.txp_rxbufs_tag,
-	    &sc->sc_cdata.txp_rxbufs_map, (void **)&sc->sc_ldata.txp_rxbufs);
+	    sc->sc_cdata.txp_rxbufs_map, (void **)&sc->sc_ldata.txp_rxbufs,
+	    &sc->sc_ldata.txp_rxbufs_paddr);
 	/* Command ring. */
 	txp_dma_free(sc, &sc->sc_cdata.txp_cmdring_tag,
-	    &sc->sc_cdata.txp_cmdring_map, (void **)&sc->sc_ldata.txp_cmdring);
+	    sc->sc_cdata.txp_cmdring_map, (void **)&sc->sc_ldata.txp_cmdring,
+	    &sc->sc_ldata.txp_cmdring_paddr);
 	/* Response ring. */
 	txp_dma_free(sc, &sc->sc_cdata.txp_rspring_tag,
-	    &sc->sc_cdata.txp_rspring_map, (void **)&sc->sc_ldata.txp_rspring);
+	    sc->sc_cdata.txp_rspring_map, (void **)&sc->sc_ldata.txp_rspring,
+	    &sc->sc_ldata.txp_rspring_paddr);
 	/* Zero ring. */
 	txp_dma_free(sc, &sc->sc_cdata.txp_zero_tag,
-	    &sc->sc_cdata.txp_zero_map, (void **)&sc->sc_ldata.txp_zero);
+	    sc->sc_cdata.txp_zero_map, (void **)&sc->sc_ldata.txp_zero,
+	    &sc->sc_ldata.txp_zero_paddr);
 	/* Host variables. */
 	txp_dma_free(sc, &sc->sc_cdata.txp_hostvar_tag,
-	    &sc->sc_cdata.txp_hostvar_map, (void **)&sc->sc_ldata.txp_hostvar);
+	    sc->sc_cdata.txp_hostvar_map, (void **)&sc->sc_ldata.txp_hostvar,
+	    &sc->sc_ldata.txp_hostvar_paddr);
 	/* Boot record. */
 	txp_dma_free(sc, &sc->sc_cdata.txp_boot_tag,
-	    &sc->sc_cdata.txp_boot_map, (void **)&sc->sc_ldata.txp_boot);
+	    sc->sc_cdata.txp_boot_map, (void **)&sc->sc_ldata.txp_boot,
+	    &sc->sc_ldata.txp_boot_paddr);
 
 	if (sc->sc_cdata.txp_parent_tag != NULL) {
 		bus_dma_tag_destroy(sc->sc_cdata.txp_parent_tag);
diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c
index 5397092dc32d..a65fd90d814d 100644
--- a/sys/dev/uart/uart_bus_pci.c
+++ b/sys/dev/uart/uart_bus_pci.c
@@ -136,6 +136,8 @@ static const struct pci_id pci_ns8250_ids[] = {
 	"MosChip MCS9901 PCIe to Peripheral Controller", 0x10 },
 { 0x9710, 0x9904, 0xa000, 0x1000,
 	"MosChip MCS9904 PCIe to Peripheral Controller", 0x10 },
+{ 0x9710, 0x9922, 0xffff, 0,
+	"MosChip MCS9922 Multi I/O Controller", 0x10 },
 { 0xdeaf, 0x9051, 0xffff, 0, "Middle Digital PC Weasel Serial Port", 0x10 },
 { 0xffff, 0, 0xffff, 0, NULL, 0, 0}
 };
diff --git a/sys/dev/uart/uart_cpu_ia64.c b/sys/dev/uart/uart_cpu_ia64.c
deleted file mode 100644
index 9a71e20e506e..000000000000
--- a/sys/dev/uart/uart_cpu_ia64.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (c) 2003, 2004 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-
-#include <machine/bus.h>
-#include <machine/dig64.h>
-#include <machine/md_var.h>
-#include <machine/vmparam.h>
-
-#include <dev/uart/uart.h>
-#include <dev/uart/uart_cpu.h>
-
-bus_space_tag_t uart_bus_space_io = IA64_BUS_SPACE_IO;
-bus_space_tag_t uart_bus_space_mem = IA64_BUS_SPACE_MEM;
-
-static int dig64_to_uart_parity[] = {
-	UART_PARITY_NONE, UART_PARITY_NONE, UART_PARITY_EVEN,
-	UART_PARITY_ODD, UART_PARITY_MARK, UART_PARITY_SPACE
-};
-
-int
-uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
-{
-
-	return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0);
-}
-
-int
-uart_cpu_getdev(int devtype, struct uart_devinfo *di)
-{
-	struct dig64_hcdp_table *tbl;
-	struct dig64_hcdp_entry *ent;
-	struct uart_class *class;
-	bus_addr_t addr;
-	uint64_t hcdp;
-	unsigned int i;
-
-	class = &uart_ns8250_class;
-	if (class == NULL)
-		return (ENXIO);
-
-	/*
-	 * Use the DIG64 HCDP table if present.
-	 */
-	hcdp = ia64_get_hcdp();
-	if (hcdp != 0) {
-		tbl = (void*)IA64_PHYS_TO_RR7(hcdp);
-		for (i = 0; i < tbl->entries; i++) {
-			ent = tbl->entry + i;
-
-			if (devtype == UART_DEV_CONSOLE &&
-			    ent->type != DIG64_HCDP_CONSOLE)
-				continue;
-
-			if (devtype == UART_DEV_DBGPORT &&
-			    ent->type != DIG64_HCDP_DBGPORT)
-				continue;
-
-			addr = ent->address.addr_high;
-			addr = (addr << 32) + ent->address.addr_low;
-			di->ops = uart_getops(class);
-			di->bas.chan = 0;
-			di->bas.bst = (ent->address.addr_space == 0)
-			    ? uart_bus_space_mem : uart_bus_space_io;
-			if (bus_space_map(di->bas.bst, addr,
-			    uart_getrange(class), 0, &di->bas.bsh) != 0)
-				continue;
-			di->bas.regshft = 0;
-			di->bas.rclk = ent->pclock << 4;
-			/* We don't deal with 64-bit baud rates. */
-			di->baudrate = ent->baud_low;
-			di->databits = ent->databits;
-			di->stopbits = ent->stopbits;
-			di->parity = (ent->parity >= 6) ? UART_PARITY_NONE
-			    : dig64_to_uart_parity[ent->parity];
-			return (0);
-		}
-
-		/* FALLTHROUGH */
-	}
-
-	/* Check the environment. */
-	return (uart_getenv(devtype, di, class));
-}
diff --git a/sys/dev/uart/uart_cpu_powerpc.c b/sys/dev/uart/uart_cpu_powerpc.c
index 0791c7783bac..e41ceaea82ab 100644
--- a/sys/dev/uart/uart_cpu_powerpc.c
+++ b/sys/dev/uart/uart_cpu_powerpc.c
@@ -113,10 +113,6 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 	phandle_t input, opts, chosen;
 	int error;
 
-	class = &uart_z8530_class;
-	if (class == NULL)
-		return (ENXIO);
-
 	opts = OF_finddevice("/options");
 	chosen = OF_finddevice("/chosen");
 	switch (devtype) {
@@ -181,6 +177,9 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 	} else
 		return (ENXIO);
 
+	if (class == NULL)
+		return (ENXIO);
+
 	error = OF_decode_addr(input, 0, &di->bas.bst, &di->bas.bsh);
 	if (error)
 		return (error);
diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c
index 773cb442c897..89f78402746b 100644
--- a/sys/dev/uart/uart_dev_ns8250.c
+++ b/sys/dev/uart/uart_dev_ns8250.c
@@ -55,9 +55,8 @@ __FBSDID("$FreeBSD$");
 #define	DEFAULT_RCLK	1843200
 
 static int broken_txfifo = 0;
-SYSCTL_INT(_hw, OID_AUTO, broken_txfifo, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw, OID_AUTO, broken_txfifo, CTLFLAG_RWTUN,
 	&broken_txfifo, 0, "UART FIFO has QEMU emulation bug");
-TUNABLE_INT("hw.broken_txfifo", &broken_txfifo);
 
 /*
  * Clear pending interrupts. THRE is cleared by reading IIR. Data
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index 956feaccc64c..a79886cff205 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -2301,25 +2301,25 @@ ubsec_kprocess_modexp_sw(struct ubsec_softc *sc, struct cryptkop *krp, int hint)
 
 errout:
 	if (me != NULL) {
-		if (me->me_q.q_mcr.dma_map != NULL)
+		if (me->me_q.q_mcr.dma_tag != NULL)
 			ubsec_dma_free(sc, &me->me_q.q_mcr);
-		if (me->me_q.q_ctx.dma_map != NULL) {
+		if (me->me_q.q_ctx.dma_tag != NULL) {
 			bzero(me->me_q.q_ctx.dma_vaddr, me->me_q.q_ctx.dma_size);
 			ubsec_dma_free(sc, &me->me_q.q_ctx);
 		}
-		if (me->me_M.dma_map != NULL) {
+		if (me->me_M.dma_tag != NULL) {
 			bzero(me->me_M.dma_vaddr, me->me_M.dma_size);
 			ubsec_dma_free(sc, &me->me_M);
 		}
-		if (me->me_E.dma_map != NULL) {
+		if (me->me_E.dma_tag != NULL) {
 			bzero(me->me_E.dma_vaddr, me->me_E.dma_size);
 			ubsec_dma_free(sc, &me->me_E);
 		}
-		if (me->me_C.dma_map != NULL) {
+		if (me->me_C.dma_tag != NULL) {
 			bzero(me->me_C.dma_vaddr, me->me_C.dma_size);
 			ubsec_dma_free(sc, &me->me_C);
 		}
-		if (me->me_epb.dma_map != NULL)
+		if (me->me_epb.dma_tag != NULL)
 			ubsec_dma_free(sc, &me->me_epb);
 		free(me, M_DEVBUF);
 	}
@@ -2502,25 +2502,25 @@ ubsec_kprocess_modexp_hw(struct ubsec_softc *sc, struct cryptkop *krp, int hint)
 
 errout:
 	if (me != NULL) {
-		if (me->me_q.q_mcr.dma_map != NULL)
+		if (me->me_q.q_mcr.dma_tag != NULL)
 			ubsec_dma_free(sc, &me->me_q.q_mcr);
-		if (me->me_q.q_ctx.dma_map != NULL) {
+		if (me->me_q.q_ctx.dma_tag != NULL) {
 			bzero(me->me_q.q_ctx.dma_vaddr, me->me_q.q_ctx.dma_size);
 			ubsec_dma_free(sc, &me->me_q.q_ctx);
 		}
-		if (me->me_M.dma_map != NULL) {
+		if (me->me_M.dma_tag != NULL) {
 			bzero(me->me_M.dma_vaddr, me->me_M.dma_size);
 			ubsec_dma_free(sc, &me->me_M);
 		}
-		if (me->me_E.dma_map != NULL) {
+		if (me->me_E.dma_tag != NULL) {
 			bzero(me->me_E.dma_vaddr, me->me_E.dma_size);
 			ubsec_dma_free(sc, &me->me_E);
 		}
-		if (me->me_C.dma_map != NULL) {
+		if (me->me_C.dma_tag != NULL) {
 			bzero(me->me_C.dma_vaddr, me->me_C.dma_size);
 			ubsec_dma_free(sc, &me->me_C);
 		}
-		if (me->me_epb.dma_map != NULL)
+		if (me->me_epb.dma_tag != NULL)
 			ubsec_dma_free(sc, &me->me_epb);
 		free(me, M_DEVBUF);
 	}
@@ -2696,13 +2696,13 @@ ubsec_kprocess_rsapriv(struct ubsec_softc *sc, struct cryptkop *krp, int hint)
 
 errout:
 	if (rp != NULL) {
-		if (rp->rpr_q.q_mcr.dma_map != NULL)
+		if (rp->rpr_q.q_mcr.dma_tag != NULL)
 			ubsec_dma_free(sc, &rp->rpr_q.q_mcr);
-		if (rp->rpr_msgin.dma_map != NULL) {
+		if (rp->rpr_msgin.dma_tag != NULL) {
 			bzero(rp->rpr_msgin.dma_vaddr, rp->rpr_msgin.dma_size);
 			ubsec_dma_free(sc, &rp->rpr_msgin);
 		}
-		if (rp->rpr_msgout.dma_map != NULL) {
+		if (rp->rpr_msgout.dma_tag != NULL) {
 			bzero(rp->rpr_msgout.dma_vaddr, rp->rpr_msgout.dma_size);
 			ubsec_dma_free(sc, &rp->rpr_msgout);
 		}
diff --git a/sys/dev/usb/controller/at91dci.c b/sys/dev/usb/controller/at91dci.c
index abcad6233d21..a572d9168f2d 100644
--- a/sys/dev/usb/controller/at91dci.c
+++ b/sys/dev/usb/controller/at91dci.c
@@ -91,6 +91,9 @@
 #define	AT9100_DCI_PC2SC(pc) \
    AT9100_DCI_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus)
 
+#define	AT9100_DCI_THREAD_IRQ \
+  (AT91_UDP_INT_BUS | AT91_UDP_INT_END_BR | AT91_UDP_INT_RXRSM | AT91_UDP_INT_RXSUSP)
+
 #ifdef USB_DEBUG
 static int at91dcidebug = 0;
 
@@ -296,17 +299,15 @@ at91dci_set_address(struct at91dci_softc *sc, uint8_t addr)
 }
 
 static uint8_t
-at91dci_setup_rx(struct at91dci_td *td)
+at91dci_setup_rx(struct at91dci_softc *sc, struct at91dci_td *td)
 {
-	struct at91dci_softc *sc;
 	struct usb_device_request req;
 	uint32_t csr;
 	uint32_t temp;
 	uint16_t count;
 
 	/* read out FIFO status */
-	csr = bus_space_read_4(td->io_tag, td->io_hdl,
-	    td->status_reg);
+	csr = AT91_UDP_READ_4(sc, td->status_reg);
 
 	DPRINTFN(5, "csr=0x%08x rem=%u\n", csr, td->remainder);
 
@@ -338,7 +339,7 @@ at91dci_setup_rx(struct at91dci_td *td)
 		goto not_complete;
 	}
 	/* receive data */
-	bus_space_read_multi_1(td->io_tag, td->io_hdl,
+	bus_space_read_multi_1(sc->sc_io_tag, sc->sc_io_hdl,
 	    td->fifo_reg, (void *)&req, sizeof(req));
 
 	/* copy data into real buffer */
@@ -347,9 +348,6 @@ at91dci_setup_rx(struct at91dci_td *td)
 	td->offset = sizeof(req);
 	td->remainder = 0;
 
-	/* get pointer to softc */
-	sc = AT9100_DCI_PC2SC(td->pc);
-
 	/* sneak peek the set address */
 	if ((req.bmRequestType == UT_WRITE_DEVICE) &&
 	    (req.bRequest == UR_SET_ADDRESS)) {
@@ -367,8 +365,7 @@ at91dci_setup_rx(struct at91dci_td *td)
 
 	/* write the direction of the control transfer */
 	AT91_CSR_ACK(csr, temp);
-	bus_space_write_4(td->io_tag, td->io_hdl,
-	    td->status_reg, csr);
+	AT91_UDP_WRITE_4(sc, td->status_reg, csr);
 	return (0);			/* complete */
 
 not_complete:
@@ -383,15 +380,13 @@ at91dci_setup_rx(struct at91dci_td *td)
 	if (temp) {
 		DPRINTFN(5, "clearing 0x%08x\n", temp);
 		AT91_CSR_ACK(csr, temp);
-		bus_space_write_4(td->io_tag, td->io_hdl,
-		    td->status_reg, csr);
+		AT91_UDP_WRITE_4(sc, td->status_reg, csr);
 	}
 	return (1);			/* not complete */
-
 }
 
 static uint8_t
-at91dci_data_rx(struct at91dci_td *td)
+at91dci_data_rx(struct at91dci_softc *sc, struct at91dci_td *td)
 {
 	struct usb_page_search buf_res;
 	uint32_t csr;
@@ -406,8 +401,7 @@ at91dci_data_rx(struct at91dci_td *td)
 	/* check if any of the FIFO banks have data */
 repeat:
 	/* read out FIFO status */
-	csr = bus_space_read_4(td->io_tag, td->io_hdl,
-	    td->status_reg);
+	csr = AT91_UDP_READ_4(sc, td->status_reg);
 
 	DPRINTFN(5, "csr=0x%08x rem=%u\n", csr, td->remainder);
 
@@ -436,8 +430,7 @@ at91dci_data_rx(struct at91dci_td *td)
 		if (temp) {
 			/* write command */
 			AT91_CSR_ACK(csr, temp);
-			bus_space_write_4(td->io_tag, td->io_hdl,
-			    td->status_reg, csr);
+			AT91_UDP_WRITE_4(sc, td->status_reg, csr);
 		}
 		return (1);		/* not complete */
 	}
@@ -470,7 +463,7 @@ at91dci_data_rx(struct at91dci_td *td)
 			buf_res.length = count;
 		}
 		/* receive data */
-		bus_space_read_multi_1(td->io_tag, td->io_hdl,
+		bus_space_read_multi_1(sc->sc_io_tag, sc->sc_io_hdl,
 		    td->fifo_reg, buf_res.buffer, buf_res.length);
 
 		/* update counters */
@@ -495,8 +488,7 @@ at91dci_data_rx(struct at91dci_td *td)
 
 	/* write command */
 	AT91_CSR_ACK(csr, temp);
-	bus_space_write_4(td->io_tag, td->io_hdl,
-	    td->status_reg, csr);
+	AT91_UDP_WRITE_4(sc, td->status_reg, csr);
 
 	/*
 	 * NOTE: We may have to delay a little bit before
@@ -518,7 +510,7 @@ at91dci_data_rx(struct at91dci_td *td)
 }
 
 static uint8_t
-at91dci_data_tx(struct at91dci_td *td)
+at91dci_data_tx(struct at91dci_softc *sc, struct at91dci_td *td)
 {
 	struct usb_page_search buf_res;
 	uint32_t csr;
@@ -531,8 +523,7 @@ at91dci_data_tx(struct at91dci_td *td)
 repeat:
 
 	/* read out FIFO status */
-	csr = bus_space_read_4(td->io_tag, td->io_hdl,
-	    td->status_reg);
+	csr = AT91_UDP_READ_4(sc, td->status_reg);
 
 	DPRINTFN(5, "csr=0x%08x rem=%u\n", csr, td->remainder);
 
@@ -552,8 +543,7 @@ at91dci_data_tx(struct at91dci_td *td)
 		if (temp) {
 			/* write command */
 			AT91_CSR_ACK(csr, temp);
-			bus_space_write_4(td->io_tag, td->io_hdl,
-			    td->status_reg, csr);
+			AT91_UDP_WRITE_4(sc, td->status_reg, csr);
 		}
 		return (1);		/* not complete */
 	} else {
@@ -569,7 +559,6 @@ at91dci_data_tx(struct at91dci_td *td)
 		count = td->remainder;
 	}
 	while (count > 0) {
-
 		usbd_get_page(td->pc, td->offset, &buf_res);
 
 		/* get correct length */
@@ -577,7 +566,7 @@ at91dci_data_tx(struct at91dci_td *td)
 			buf_res.length = count;
 		}
 		/* transmit data */
-		bus_space_write_multi_1(td->io_tag, td->io_hdl,
+		bus_space_write_multi_1(sc->sc_io_tag, sc->sc_io_hdl,
 		    td->fifo_reg, buf_res.buffer, buf_res.length);
 
 		/* update counters */
@@ -588,8 +577,7 @@ at91dci_data_tx(struct at91dci_td *td)
 
 	/* write command */
 	AT91_CSR_ACK(csr, temp);
-	bus_space_write_4(td->io_tag, td->io_hdl,
-	    td->status_reg, csr);
+	AT91_UDP_WRITE_4(sc, td->status_reg, csr);
 
 	/* check remainder */
 	if (td->remainder == 0) {
@@ -605,19 +593,13 @@ at91dci_data_tx(struct at91dci_td *td)
 }
 
 static uint8_t
-at91dci_data_tx_sync(struct at91dci_td *td)
+at91dci_data_tx_sync(struct at91dci_softc *sc, struct at91dci_td *td)
 {
-	struct at91dci_softc *sc;
 	uint32_t csr;
 	uint32_t temp;
 
-#if 0
-repeat:
-#endif
-
 	/* read out FIFO status */
-	csr = bus_space_read_4(td->io_tag, td->io_hdl,
-	    td->status_reg);
+	csr = AT91_UDP_READ_4(sc, td->status_reg);
 
 	DPRINTFN(5, "csr=0x%08x\n", csr);
 
@@ -637,8 +619,7 @@ at91dci_data_tx_sync(struct at91dci_td *td)
 	if (!(csr & AT91_UDP_CSR_TXCOMP)) {
 		goto not_complete;
 	}
-	sc = AT9100_DCI_PC2SC(td->pc);
-	if (sc->sc_dv_addr != 0xFF) {
+	if (td->status_reg == AT91_UDP_CSR(0) && sc->sc_dv_addr != 0xFF) {
 		/*
 		 * The AT91 has a special requirement with regard to
 		 * setting the address and that is to write the new
@@ -648,8 +629,7 @@ at91dci_data_tx_sync(struct at91dci_td *td)
 	}
 	/* write command */
 	AT91_CSR_ACK(csr, temp);
-	bus_space_write_4(td->io_tag, td->io_hdl,
-	    td->status_reg, csr);
+	AT91_UDP_WRITE_4(sc, td->status_reg, csr);
 
 	return (0);			/* complete */
 
@@ -657,24 +637,26 @@ at91dci_data_tx_sync(struct at91dci_td *td)
 	if (temp) {
 		/* write command */
 		AT91_CSR_ACK(csr, temp);
-		bus_space_write_4(td->io_tag, td->io_hdl,
-		    td->status_reg, csr);
+		AT91_UDP_WRITE_4(sc, td->status_reg, csr);
 	}
 	return (1);			/* not complete */
 }
 
-static uint8_t
+static void
 at91dci_xfer_do_fifo(struct usb_xfer *xfer)
 {
-	struct at91dci_softc *sc;
+	struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus);
 	struct at91dci_td *td;
 	uint8_t temp;
 
 	DPRINTFN(9, "\n");
 
 	td = xfer->td_transfer_cache;
+	if (td == NULL)
+		return;
+
 	while (1) {
-		if ((td->func) (td)) {
+		if ((td->func) (sc, td)) {
 			/* operation in progress */
 			break;
 		}
@@ -704,10 +686,9 @@ at91dci_xfer_do_fifo(struct usb_xfer *xfer)
 		if (temp & 1)
 			td->fifo_bank = 1;
 	}
-	return (1);			/* not complete */
+	return;
 
 done:
-	sc = AT9100_DCI_BUS2SC(xfer->xroot->bus);
 	temp = (xfer->endpointno & UE_ADDR);
 
 	/* update FIFO bank flag and multi buffer */
@@ -718,23 +699,42 @@ at91dci_xfer_do_fifo(struct usb_xfer *xfer)
 	}
 
 	/* compute all actual lengths */
+	xfer->td_transfer_cache = NULL;
+	sc->sc_xfer_complete = 1;
+}
 
-	at91dci_standard_done(xfer);
+static uint8_t
+at91dci_xfer_do_complete(struct usb_xfer *xfer)
+{
+	struct at91dci_td *td;
 
-	return (0);			/* complete */
+	DPRINTFN(9, "\n");
+	td = xfer->td_transfer_cache;
+	if (td == NULL) {
+		/* compute all actual lengths */
+		at91dci_standard_done(xfer);
+		return(1);
+	}
+	return (0);
 }
 
 static void
-at91dci_interrupt_poll(struct at91dci_softc *sc)
+at91dci_interrupt_poll_locked(struct at91dci_softc *sc)
 {
 	struct usb_xfer *xfer;
 
+	TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry)
+		at91dci_xfer_do_fifo(xfer);
+}
+
+static void
+at91dci_interrupt_complete_locked(struct at91dci_softc *sc)
+{
+	struct usb_xfer *xfer;
 repeat:
 	TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) {
-		if (!at91dci_xfer_do_fifo(xfer)) {
-			/* queue has been modified */
+		if (at91dci_xfer_do_complete(xfer))
 			goto repeat;
-		}
 	}
 }
 
@@ -764,20 +764,47 @@ at91dci_vbus_interrupt(struct at91dci_softc *sc, uint8_t is_on)
 	}
 }
 
-void
-at91dci_interrupt(struct at91dci_softc *sc)
+int
+at91dci_filter_interrupt(void *arg)
 {
+	struct at91dci_softc *sc = arg;
+	int retval = FILTER_HANDLED;
 	uint32_t status;
 
-	USB_BUS_LOCK(&sc->sc_bus);
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
 
 	status = AT91_UDP_READ_4(sc, AT91_UDP_ISR);
 	status &= AT91_UDP_INT_DEFAULT;
 
-	if (!status) {
-		USB_BUS_UNLOCK(&sc->sc_bus);
-		return;
-	}
+	if (status & AT9100_DCI_THREAD_IRQ)
+		retval = FILTER_SCHEDULE_THREAD;
+
+	/* acknowledge interrupts */
+	AT91_UDP_WRITE_4(sc, AT91_UDP_ICR, status & ~AT9100_DCI_THREAD_IRQ);
+
+	/* poll FIFOs, if any */
+	at91dci_interrupt_poll_locked(sc);
+
+	if (sc->sc_xfer_complete != 0)
+		retval = FILTER_SCHEDULE_THREAD;
+
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
+
+	return (retval);
+}
+
+void
+at91dci_interrupt(void *arg)
+{
+	struct at91dci_softc *sc = arg;
+	uint32_t status;
+
+	USB_BUS_LOCK(&sc->sc_bus);
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
+
+	status = AT91_UDP_READ_4(sc, AT91_UDP_ISR);
+	status &= AT9100_DCI_THREAD_IRQ;
+
 	/* acknowledge interrupts */
 
 	AT91_UDP_WRITE_4(sc, AT91_UDP_ICR, status);
@@ -837,14 +864,12 @@ at91dci_interrupt(struct at91dci_softc *sc)
 		/* complete root HUB interrupt endpoint */
 		at91dci_root_intr(sc);
 	}
-	/* check for any endpoint interrupts */
 
-	if (status & AT91_UDP_INT_EPS) {
-
-		DPRINTFN(5, "real endpoint interrupt 0x%08x\n", status);
-
-		at91dci_interrupt_poll(sc);
+	if (sc->sc_xfer_complete != 0) {
+		sc->sc_xfer_complete = 0;
+		at91dci_interrupt_complete_locked(sc);
 	}
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 	USB_BUS_UNLOCK(&sc->sc_bus);
 }
 
@@ -1049,12 +1074,17 @@ at91dci_timeout(void *arg)
 static void
 at91dci_start_standard_chain(struct usb_xfer *xfer)
 {
+	struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus);
+
 	DPRINTFN(9, "\n");
 
-	/* poll one time */
-	if (at91dci_xfer_do_fifo(xfer)) {
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
+
+	/* poll one time */
+	at91dci_xfer_do_fifo(xfer);
+
+	if (at91dci_xfer_do_complete(xfer) == 0) {
 
-		struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus);
 		uint8_t ep_no = xfer->endpointno & UE_ADDR;
 
 		/*
@@ -1075,6 +1105,7 @@ at91dci_start_standard_chain(struct usb_xfer *xfer)
 			    &at91dci_timeout, xfer->timeout);
 		}
 	}
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 }
 
 static void
@@ -1216,6 +1247,8 @@ at91dci_device_done(struct usb_xfer *xfer, usb_error_t error)
 	DPRINTFN(2, "xfer=%p, endpoint=%p, error=%d\n",
 	    xfer, xfer->endpoint, error);
 
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
+
 	if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) {
 		ep_no = (xfer->endpointno & UE_ADDR);
 
@@ -1224,8 +1257,11 @@ at91dci_device_done(struct usb_xfer *xfer, usb_error_t error)
 
 		DPRINTFN(15, "disable interrupts on endpoint %d\n", ep_no);
 	}
+
 	/* dequeue transfer and start next transfer */
 	usbd_transfer_done(xfer, error);
+
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 }
 
 static void
@@ -1248,11 +1284,14 @@ at91dci_set_stall(struct usb_device *udev,
 
 	/* set FORCESTALL */
 	sc = AT9100_DCI_BUS2SC(udev->bus);
+
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
 	csr_reg = (ep->edesc->bEndpointAddress & UE_ADDR);
 	csr_reg = AT91_UDP_CSR(csr_reg);
 	csr_val = AT91_UDP_READ_4(sc, csr_reg);
 	AT91_CSR_ACK(csr_val, AT91_UDP_CSR_FORCESTALL);
 	AT91_UDP_WRITE_4(sc, csr_reg, csr_val);
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 }
 
 static void
@@ -1269,6 +1308,9 @@ at91dci_clear_stall_sub(struct at91dci_softc *sc, uint8_t ep_no,
 		/* clearing stall is not needed */
 		return;
 	}
+
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
+
 	/* compute CSR register offset */
 	csr_reg = AT91_UDP_CSR(ep_no);
 
@@ -1349,6 +1391,8 @@ at91dci_clear_stall_sub(struct at91dci_softc *sc, uint8_t ep_no,
 
 	/* enable endpoint */
 	AT91_UDP_WRITE_4(sc, AT91_UDP_CSR(ep_no), csr_val);
+
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 }
 
 static void
@@ -1484,7 +1528,10 @@ at91dci_do_poll(struct usb_bus *bus)
 	struct at91dci_softc *sc = AT9100_DCI_BUS2SC(bus);
 
 	USB_BUS_LOCK(&sc->sc_bus);
-	at91dci_interrupt_poll(sc);
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
+	at91dci_interrupt_poll_locked(sc);
+	at91dci_interrupt_complete_locked(sc);
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 	USB_BUS_UNLOCK(&sc->sc_bus);
 }
 
@@ -2239,8 +2286,6 @@ at91dci_xfer_setup(struct usb_setup_params *parm)
 			td = USB_ADD_BYTES(parm->buf, parm->size[0]);
 
 			/* init TD */
-			td->io_tag = sc->sc_io_tag;
-			td->io_hdl = sc->sc_io_hdl;
 			td->max_packet_size = xfer->max_packet_size;
 			td->status_reg = AT91_UDP_CSR(ep_no);
 			td->fifo_reg = AT91_UDP_FDR(ep_no);
diff --git a/sys/dev/usb/controller/at91dci.h b/sys/dev/usb/controller/at91dci.h
index b079eb5b272c..964e062f670b 100644
--- a/sys/dev/usb/controller/at91dci.h
+++ b/sys/dev/usb/controller/at91dci.h
@@ -133,12 +133,11 @@
   bus_space_write_4((sc)->sc_io_tag, (sc)->sc_io_hdl, reg, data)
 
 struct at91dci_td;
+struct at91dci_softc;
 
-typedef uint8_t (at91dci_cmd_t)(struct at91dci_td *td);
+typedef uint8_t (at91dci_cmd_t)(struct at91dci_softc *sc, struct at91dci_td *td);
 
 struct at91dci_td {
-	bus_space_tag_t io_tag;
-	bus_space_handle_t io_hdl;
 	struct at91dci_td *obj_next;
 	at91dci_cmd_t *func;
 	struct usb_page_cache *pc;
@@ -221,6 +220,8 @@ struct at91dci_softc {
 	void    (*sc_pull_down) (void *arg);
 	void   *sc_pull_arg;
 
+	uint32_t sc_xfer_complete;
+
 	uint8_t	sc_rt_addr;		/* root HUB address */
 	uint8_t	sc_dv_addr;		/* device address */
 	uint8_t	sc_conf;		/* root HUB config */
@@ -235,7 +236,8 @@ struct at91dci_softc {
 
 usb_error_t at91dci_init(struct at91dci_softc *sc);
 void	at91dci_uninit(struct at91dci_softc *sc);
-void	at91dci_interrupt(struct at91dci_softc *sc);
+driver_filter_t at91dci_filter_interrupt;
+driver_intr_t at91dci_interrupt;
 void	at91dci_vbus_interrupt(struct at91dci_softc *sc, uint8_t is_on);
 
 #endif					/* _AT9100_DCI_H_ */
diff --git a/sys/dev/usb/controller/at91dci_atmelarm.c b/sys/dev/usb/controller/at91dci_atmelarm.c
index cbadbb250f4a..8ea4ef9c2a7f 100644
--- a/sys/dev/usb/controller/at91dci_atmelarm.c
+++ b/sys/dev/usb/controller/at91dci_atmelarm.c
@@ -212,8 +212,8 @@ at91_udp_attach(device_t dev)
 	}
 	device_set_ivars(sc->sc_dci.sc_bus.bdev, &sc->sc_dci.sc_bus);
 
-	err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
-	    NULL, (driver_intr_t *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl);
+	err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_TTY | INTR_MPSAFE,
+	    at91dci_filter_interrupt, at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl);
 	if (err) {
 		sc->sc_dci.sc_intr_hdl = NULL;
 		goto error;
diff --git a/sys/dev/usb/controller/at91dci_fdt.c b/sys/dev/usb/controller/at91dci_fdt.c
index e1c5dd8389ab..7329a396c827 100644
--- a/sys/dev/usb/controller/at91dci_fdt.c
+++ b/sys/dev/usb/controller/at91dci_fdt.c
@@ -218,13 +218,8 @@ at91_udp_attach(device_t dev)
 	}
 	device_set_ivars(sc->sc_dci.sc_bus.bdev, &sc->sc_dci.sc_bus);
 
-#if (__FreeBSD_version >= 700031)
-	err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
-	    NULL, (driver_intr_t *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl);
-#else
-	err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
-	    (driver_intr_t *)at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl);
-#endif
+	err = bus_setup_intr(dev, sc->sc_dci.sc_irq_res, INTR_TYPE_TTY | INTR_MPSAFE,
+	    at91dci_filter_interrupt, at91dci_interrupt, sc, &sc->sc_dci.sc_intr_hdl);
 	if (err) {
 		sc->sc_dci.sc_intr_hdl = NULL;
 		goto error;
diff --git a/sys/dev/usb/controller/dwc_otg.c b/sys/dev/usb/controller/dwc_otg.c
index ed88caa42b7e..b90fbf56022d 100644
--- a/sys/dev/usb/controller/dwc_otg.c
+++ b/sys/dev/usb/controller/dwc_otg.c
@@ -112,14 +112,13 @@ static int dwc_otg_use_hsic;
 
 static SYSCTL_NODE(_hw_usb, OID_AUTO, dwc_otg, CTLFLAG_RW, 0, "USB DWC OTG");
 
-SYSCTL_INT(_hw_usb_dwc_otg, OID_AUTO, use_hsic, CTLFLAG_RD | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_dwc_otg, OID_AUTO, use_hsic, CTLFLAG_RDTUN,
     &dwc_otg_use_hsic, 0, "DWC OTG uses HSIC interface");
-TUNABLE_INT("hw.usb.dwc_otg.use_hsic", &dwc_otg_use_hsic);
 
 #ifdef USB_DEBUG
 static int dwc_otg_debug;
 
-SYSCTL_INT(_hw_usb_dwc_otg, OID_AUTO, debug, CTLFLAG_RW,
+SYSCTL_INT(_hw_usb_dwc_otg, OID_AUTO, debug, CTLFLAG_RWTUN,
     &dwc_otg_debug, 0, "DWC OTG debug level");
 #endif
 
diff --git a/sys/dev/usb/controller/ehci.c b/sys/dev/usb/controller/ehci.c
index ad3a3fc55d2b..0f9372585d1c 100644
--- a/sys/dev/usb/controller/ehci.c
+++ b/sys/dev/usb/controller/ehci.c
@@ -98,19 +98,14 @@ static int ehciiaadbug = 0;
 static int ehcilostintrbug = 0;
 
 static SYSCTL_NODE(_hw_usb, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci");
-SYSCTL_INT(_hw_usb_ehci, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_ehci, OID_AUTO, debug, CTLFLAG_RWTUN,
     &ehcidebug, 0, "Debug level");
-TUNABLE_INT("hw.usb.ehci.debug", &ehcidebug);
-SYSCTL_INT(_hw_usb_ehci, OID_AUTO, no_hs, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_ehci, OID_AUTO, no_hs, CTLFLAG_RWTUN,
     &ehcinohighspeed, 0, "Disable High Speed USB");
-TUNABLE_INT("hw.usb.ehci.no_hs", &ehcinohighspeed);
-SYSCTL_INT(_hw_usb_ehci, OID_AUTO, iaadbug, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_ehci, OID_AUTO, iaadbug, CTLFLAG_RWTUN,
     &ehciiaadbug, 0, "Enable doorbell bug workaround");
-TUNABLE_INT("hw.usb.ehci.iaadbug", &ehciiaadbug);
-SYSCTL_INT(_hw_usb_ehci, OID_AUTO, lostintrbug, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_ehci, OID_AUTO, lostintrbug, CTLFLAG_RWTUN,
     &ehcilostintrbug, 0, "Enable lost interrupt bug workaround");
-TUNABLE_INT("hw.usb.ehci.lostintrbug", &ehcilostintrbug);
-
 
 static void ehci_dump_regs(ehci_softc_t *sc);
 static void ehci_dump_sqh(ehci_softc_t *sc, ehci_qh_t *sqh);
@@ -215,7 +210,7 @@ ehci_reset(ehci_softc_t *sc)
 			return (0);
 		}
 	}
-	device_printf(sc->sc_bus.bdev, "Reset timeout\n");
+	device_printf(sc->sc_bus.bdev, "reset timeout\n");
 	return (USB_ERR_IOERROR);
 }
 
@@ -290,7 +285,7 @@ ehci_init_sub(struct ehci_softc *sc)
 		}
 	}
 	if (hcr) {
-		device_printf(sc->sc_bus.bdev, "Run timeout\n");
+		device_printf(sc->sc_bus.bdev, "run timeout\n");
 		return (USB_ERR_IOERROR);
 	}
 	return (USB_ERR_NORMAL_COMPLETION);
diff --git a/sys/dev/usb/controller/ohci.c b/sys/dev/usb/controller/ohci.c
index 86fca1eeaa3b..206c75314d0c 100644
--- a/sys/dev/usb/controller/ohci.c
+++ b/sys/dev/usb/controller/ohci.c
@@ -84,9 +84,8 @@
 static int ohcidebug = 0;
 
 static SYSCTL_NODE(_hw_usb, OID_AUTO, ohci, CTLFLAG_RW, 0, "USB ohci");
-SYSCTL_INT(_hw_usb_ohci, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_ohci, OID_AUTO, debug, CTLFLAG_RWTUN,
     &ohcidebug, 0, "ohci debug level");
-TUNABLE_INT("hw.usb.ohci.debug", &ohcidebug);
 
 static void ohci_dumpregs(ohci_softc_t *);
 static void ohci_dump_tds(ohci_td_t *);
diff --git a/sys/dev/usb/controller/saf1761_otg.c b/sys/dev/usb/controller/saf1761_otg.c
index 0f5b4741d753..debd50e56e35 100644
--- a/sys/dev/usb/controller/saf1761_otg.c
+++ b/sys/dev/usb/controller/saf1761_otg.c
@@ -1927,7 +1927,7 @@ saf1761_otg_start_standard_chain(struct usb_xfer *xfer)
 	/* poll one time */
 	saf1761_otg_xfer_do_fifo(sc, xfer);
 
-	if (xfer->td_transfer_cache != NULL) {
+	if (saf1761_otg_xfer_do_complete(sc, xfer) == 0) {
 		/*
 		 * Only enable the endpoint interrupt when we are
 		 * actually waiting for data, hence we are dealing
@@ -1943,9 +1943,6 @@ saf1761_otg_start_standard_chain(struct usb_xfer *xfer)
 			usbd_transfer_timeout_ms(xfer,
 			    &saf1761_otg_timeout, xfer->timeout);
 		}
-	} else {
-		/* catch completion, if any */
-		saf1761_otg_interrupt_complete_locked(sc);
 	}
 	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 }
diff --git a/sys/dev/usb/controller/uhci.c b/sys/dev/usb/controller/uhci.c
index 134a4472363a..00776154447c 100644
--- a/sys/dev/usb/controller/uhci.c
+++ b/sys/dev/usb/controller/uhci.c
@@ -89,12 +89,10 @@ static int uhcidebug = 0;
 static int uhcinoloop = 0;
 
 static SYSCTL_NODE(_hw_usb, OID_AUTO, uhci, CTLFLAG_RW, 0, "USB uhci");
-SYSCTL_INT(_hw_usb_uhci, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_uhci, OID_AUTO, debug, CTLFLAG_RWTUN,
     &uhcidebug, 0, "uhci debug level");
-TUNABLE_INT("hw.usb.uhci.debug", &uhcidebug);
-SYSCTL_INT(_hw_usb_uhci, OID_AUTO, loop, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_uhci, OID_AUTO, loop, CTLFLAG_RWTUN,
     &uhcinoloop, 0, "uhci noloop");
-TUNABLE_INT("hw.usb.uhci.loop", &uhcinoloop);
 
 static void uhci_dumpregs(uhci_softc_t *sc);
 static void uhci_dump_tds(uhci_td_t *td);
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c
index c2cafecf61d4..dc10591513af 100644
--- a/sys/dev/usb/controller/usb_controller.c
+++ b/sys/dev/usb/controller/usb_controller.c
@@ -90,19 +90,16 @@ SYSCTL_INT(_hw_usb_ctrl, OID_AUTO, debug, CTLFLAG_RW, &usb_ctrl_debug, 0,
 
 #if USB_HAVE_ROOT_MOUNT_HOLD
 static int usb_no_boot_wait = 0;
-TUNABLE_INT("hw.usb.no_boot_wait", &usb_no_boot_wait);
-SYSCTL_INT(_hw_usb, OID_AUTO, no_boot_wait, CTLFLAG_RD|CTLFLAG_TUN, &usb_no_boot_wait, 0,
+SYSCTL_INT(_hw_usb, OID_AUTO, no_boot_wait, CTLFLAG_RDTUN, &usb_no_boot_wait, 0,
     "No USB device enumerate waiting at boot.");
 #endif
 
 static int usb_no_suspend_wait = 0;
-TUNABLE_INT("hw.usb.no_suspend_wait", &usb_no_suspend_wait);
-SYSCTL_INT(_hw_usb, OID_AUTO, no_suspend_wait, CTLFLAG_RW|CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb, OID_AUTO, no_suspend_wait, CTLFLAG_RWTUN,
     &usb_no_suspend_wait, 0, "No USB device waiting at system suspend.");
 
 static int usb_no_shutdown_wait = 0;
-TUNABLE_INT("hw.usb.no_shutdown_wait", &usb_no_shutdown_wait);
-SYSCTL_INT(_hw_usb, OID_AUTO, no_shutdown_wait, CTLFLAG_RW|CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb, OID_AUTO, no_shutdown_wait, CTLFLAG_RWTUN,
     &usb_no_shutdown_wait, 0, "No USB device waiting at system shutdown.");
 
 static devclass_t usb_devclass;
@@ -133,7 +130,7 @@ DRIVER_MODULE(usbus, xhci, usb_driver, usb_devclass, 0, 0);
 /* Device Only Drivers */
 DRIVER_MODULE(usbus, at91_udp, usb_driver, usb_devclass, 0, 0);
 DRIVER_MODULE(usbus, musbotg, usb_driver, usb_devclass, 0, 0);
-DRIVER_MODULE(usbus, uss820, usb_driver, usb_devclass, 0, 0);
+DRIVER_MODULE(usbus, uss820dci, usb_driver, usb_devclass, 0, 0);
 DRIVER_MODULE(usbus, octusb, usb_driver, usb_devclass, 0, 0);
 
 /* Dual Mode Drivers */
diff --git a/sys/dev/usb/controller/uss820dci.c b/sys/dev/usb/controller/uss820dci.c
index 9e1000003038..722a63a9217e 100644
--- a/sys/dev/usb/controller/uss820dci.c
+++ b/sys/dev/usb/controller/uss820dci.c
@@ -81,6 +81,9 @@
 #define	USS820_DCI_PC2SC(pc) \
    USS820_DCI_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus)
 
+#define	USS820_DCI_THREAD_IRQ \
+    (USS820_SSR_SUSPEND | USS820_SSR_RESUME | USS820_SSR_RESET)
+
 #ifdef USB_DEBUG
 static int uss820dcidebug = 0;
 
@@ -243,24 +246,18 @@ uss820dci_set_address(struct uss820dci_softc *sc, uint8_t addr)
 }
 
 static uint8_t
-uss820dci_setup_rx(struct uss820dci_td *td)
+uss820dci_setup_rx(struct uss820dci_softc *sc, struct uss820dci_td *td)
 {
-	struct uss820dci_softc *sc;
 	struct usb_device_request req;
 	uint16_t count;
 	uint8_t rx_stat;
 	uint8_t temp;
 
 	/* select the correct endpoint */
-	bus_space_write_1(td->io_tag, td->io_hdl,
-	    USS820_EPINDEX, td->ep_index);
+	USS820_WRITE_1(sc, USS820_EPINDEX, td->ep_index);
 
 	/* read out FIFO status */
-	rx_stat = bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_RXSTAT);
-
-	/* get pointer to softc */
-	sc = USS820_DCI_PC2SC(td->pc);
+	rx_stat = USS820_READ_1(sc, USS820_RXSTAT);
 
 	DPRINTFN(5, "rx_stat=0x%02x rem=%u\n", rx_stat, td->remainder);
 
@@ -282,10 +279,8 @@ uss820dci_setup_rx(struct uss820dci_td *td)
 	    0xFF ^ USS820_RXSTAT_EDOVW, 0);
 
 	/* get the packet byte count */
-	count = bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_RXCNTL);
-	count |= (bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_RXCNTH) << 8);
+	count = USS820_READ_1(sc, USS820_RXCNTL);
+	count |= (USS820_READ_1(sc, USS820_RXCNTH) << 8);
 	count &= 0x3FF;
 
 	/* verify data length */
@@ -300,12 +295,11 @@ uss820dci_setup_rx(struct uss820dci_td *td)
 		goto setup_not_complete;
 	}
 	/* receive data */
-	bus_space_read_multi_1(td->io_tag, td->io_hdl,
-	    USS820_RXDAT, (void *)&req, sizeof(req));
+	bus_space_read_multi_1(sc->sc_io_tag, sc->sc_io_hdl,
+	    USS820_RXDAT * USS820_REG_STRIDE, (void *)&req, sizeof(req));
 
 	/* read out FIFO status */
-	rx_stat = bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_RXSTAT);
+	rx_stat = USS820_READ_1(sc, USS820_RXSTAT);
 
 	if (rx_stat & (USS820_RXSTAT_EDOVW |
 	    USS820_RXSTAT_STOVW)) {
@@ -319,11 +313,9 @@ uss820dci_setup_rx(struct uss820dci_td *td)
 	    USS820_RXSTAT_STOVW), 0);
 
 	/* set RXFFRC bit */
-	temp = bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_RXCON);
+	temp = USS820_READ_1(sc, USS820_RXCON);
 	temp |= USS820_RXCON_RXFFRC;
-	bus_space_write_1(td->io_tag, td->io_hdl,
-	    USS820_RXCON, temp);
+	USS820_WRITE_1(sc, USS820_RXCON, temp);
 
 	/* copy data into real buffer */
 	usbd_copy_in(td->pc, 0, &req, sizeof(req));
@@ -351,11 +343,9 @@ uss820dci_setup_rx(struct uss820dci_td *td)
 setup_not_complete:
 
 	/* set RXFFRC bit */
-	temp = bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_RXCON);
+	temp = USS820_READ_1(sc, USS820_RXCON);
 	temp |= USS820_RXCON_RXFFRC;
-	bus_space_write_1(td->io_tag, td->io_hdl,
-	    USS820_RXCON, temp);
+	USS820_WRITE_1(sc, USS820_RXCON, temp);
 
 	/* FALLTHROUGH */
 
@@ -378,11 +368,10 @@ uss820dci_setup_rx(struct uss820dci_td *td)
 		    USS820_RXSTAT_RXSETUP), 0);
 	}
 	return (1);			/* not complete */
-
 }
 
 static uint8_t
-uss820dci_data_rx(struct uss820dci_td *td)
+uss820dci_data_rx(struct uss820dci_softc *sc, struct uss820dci_td *td)
 {
 	struct usb_page_search buf_res;
 	uint16_t count;
@@ -396,16 +385,14 @@ uss820dci_data_rx(struct uss820dci_td *td)
 	got_short = 0;
 
 	/* select the correct endpoint */
-	bus_space_write_1(td->io_tag, td->io_hdl, USS820_EPINDEX, td->ep_index);
+	USS820_WRITE_1(sc, USS820_EPINDEX, td->ep_index);
 
 	/* check if any of the FIFO banks have data */
 repeat:
 	/* read out FIFO flag */
-	rx_flag = bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_RXFLG);
+	rx_flag = USS820_READ_1(sc, USS820_RXFLG);
 	/* read out FIFO status */
-	rx_stat = bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_RXSTAT);
+	rx_stat = USS820_READ_1(sc, USS820_RXSTAT);
 
 	DPRINTFN(5, "rx_stat=0x%02x rx_flag=0x%02x rem=%u\n",
 	    rx_stat, rx_flag, td->remainder);
@@ -413,7 +400,7 @@ uss820dci_data_rx(struct uss820dci_td *td)
 	if (rx_stat & (USS820_RXSTAT_RXSETUP |
 	    USS820_RXSTAT_RXSOVW |
 	    USS820_RXSTAT_EDOVW)) {
-		if (td->remainder == 0) {
+		if (td->remainder == 0 && td->ep_index == 0) {
 			/*
 			 * We are actually complete and have
 			 * received the next SETUP
@@ -449,11 +436,8 @@ uss820dci_data_rx(struct uss820dci_td *td)
 		return (1);		/* not complete */
 	}
 	/* get the packet byte count */
-	count = bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_RXCNTL);
-
-	count |= (bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_RXCNTH) << 8);
+	count = USS820_READ_1(sc, USS820_RXCNTL);
+	count |= (USS820_READ_1(sc, USS820_RXCNTH) << 8);
 	count &= 0x3FF;
 
 	DPRINTFN(5, "count=0x%04x\n", count);
@@ -484,8 +468,8 @@ uss820dci_data_rx(struct uss820dci_td *td)
 			buf_res.length = count;
 		}
 		/* receive data */
-		bus_space_read_multi_1(td->io_tag, td->io_hdl,
-		    USS820_RXDAT, buf_res.buffer, buf_res.length);
+		bus_space_read_multi_1(sc->sc_io_tag, sc->sc_io_hdl,
+		    USS820_RXDAT * USS820_REG_STRIDE, buf_res.buffer, buf_res.length);
 
 		/* update counters */
 		count -= buf_res.length;
@@ -494,11 +478,9 @@ uss820dci_data_rx(struct uss820dci_td *td)
 	}
 
 	/* set RXFFRC bit */
-	rx_cntl = bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_RXCON);
+	rx_cntl = USS820_READ_1(sc, USS820_RXCON);
 	rx_cntl |= USS820_RXCON_RXFFRC;
-	bus_space_write_1(td->io_tag, td->io_hdl,
-	    USS820_RXCON, rx_cntl);
+	USS820_WRITE_1(sc, USS820_RXCON, rx_cntl);
 
 	/* check if we are complete */
 	if ((td->remainder == 0) || got_short) {
@@ -515,7 +497,7 @@ uss820dci_data_rx(struct uss820dci_td *td)
 }
 
 static uint8_t
-uss820dci_data_tx(struct uss820dci_td *td)
+uss820dci_data_tx(struct uss820dci_softc *sc, struct uss820dci_td *td)
 {
 	struct usb_page_search buf_res;
 	uint16_t count;
@@ -525,32 +507,32 @@ uss820dci_data_tx(struct uss820dci_td *td)
 	uint8_t to;
 
 	/* select the correct endpoint */
-	bus_space_write_1(td->io_tag, td->io_hdl,
-	    USS820_EPINDEX, td->ep_index);
+	USS820_WRITE_1(sc, USS820_EPINDEX, td->ep_index);
 
 	to = 2;				/* don't loop forever! */
 
 repeat:
 	/* read out TX FIFO flags */
-	tx_flag = bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_TXFLG);
+	tx_flag = USS820_READ_1(sc, USS820_TXFLG);
 
-	/* read out RX FIFO status last */
-	rx_stat = bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_RXSTAT);
+	DPRINTFN(5, "tx_flag=0x%02x rem=%u\n", tx_flag, td->remainder);
 
-	DPRINTFN(5, "rx_stat=0x%02x tx_flag=0x%02x rem=%u\n",
-	    rx_stat, tx_flag, td->remainder);
+	if (td->ep_index == 0) {
+		/* read out RX FIFO status last */
+		rx_stat = USS820_READ_1(sc, USS820_RXSTAT);
 
-	if (rx_stat & (USS820_RXSTAT_RXSETUP |
-	    USS820_RXSTAT_RXSOVW |
-	    USS820_RXSTAT_EDOVW)) {
-		/*
-	         * The current transfer was aborted
-	         * by the USB Host
-	         */
-		td->error = 1;
-		return (0);		/* complete */
+		DPRINTFN(5, "rx_stat=0x%02x\n", rx_stat);
+
+		if (rx_stat & (USS820_RXSTAT_RXSETUP |
+		    USS820_RXSTAT_RXSOVW |
+		    USS820_RXSTAT_EDOVW)) {
+			/*
+			 * The current transfer was aborted by the USB
+			 * Host:
+			 */
+			td->error = 1;
+			return (0);		/* complete */
+		}
 	}
 	if (tx_flag & (USS820_TXFLG_TXOVF |
 	    USS820_TXFLG_TXURF)) {
@@ -583,8 +565,8 @@ uss820dci_data_tx(struct uss820dci_td *td)
 			buf_res.length = count;
 		}
 		/* transmit data */
-		bus_space_write_multi_1(td->io_tag, td->io_hdl,
-		    USS820_TXDAT, buf_res.buffer, buf_res.length);
+		bus_space_write_multi_1(sc->sc_io_tag, sc->sc_io_hdl,
+		    USS820_TXDAT * USS820_REG_STRIDE, buf_res.buffer, buf_res.length);
 
 		/* update counters */
 		count -= buf_res.length;
@@ -593,12 +575,10 @@ uss820dci_data_tx(struct uss820dci_td *td)
 	}
 
 	/* post-write high packet byte count first */
-	bus_space_write_1(td->io_tag, td->io_hdl,
-	    USS820_TXCNTH, count_copy >> 8);
+	USS820_WRITE_1(sc, USS820_TXCNTH, count_copy >> 8);
 
 	/* post-write low packet byte count last */
-	bus_space_write_1(td->io_tag, td->io_hdl,
-	    USS820_TXCNTL, count_copy);
+	USS820_WRITE_1(sc, USS820_TXCNTL, count_copy);
 
 	/*
 	 * Enable TX output, which must happen after that we have written
@@ -623,35 +603,32 @@ uss820dci_data_tx(struct uss820dci_td *td)
 }
 
 static uint8_t
-uss820dci_data_tx_sync(struct uss820dci_td *td)
+uss820dci_data_tx_sync(struct uss820dci_softc *sc, struct uss820dci_td *td)
 {
-	struct uss820dci_softc *sc;
 	uint8_t rx_stat;
 	uint8_t tx_flag;
 
 	/* select the correct endpoint */
-	bus_space_write_1(td->io_tag, td->io_hdl,
-	    USS820_EPINDEX, td->ep_index);
+	USS820_WRITE_1(sc, USS820_EPINDEX, td->ep_index);
 
 	/* read out TX FIFO flag */
-	tx_flag = bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_TXFLG);
+	tx_flag = USS820_READ_1(sc, USS820_TXFLG);
 
-	/* read out RX FIFO status last */
-	rx_stat = bus_space_read_1(td->io_tag, td->io_hdl,
-	    USS820_RXSTAT);
+	if (td->ep_index == 0) {
+		/* read out RX FIFO status last */
+		rx_stat = USS820_READ_1(sc, USS820_RXSTAT);
 
-	DPRINTFN(5, "rx_stat=0x%02x rem=%u\n", rx_stat, td->remainder);
+		DPRINTFN(5, "rx_stat=0x%02x rem=%u\n", rx_stat, td->remainder);
 
-	if (rx_stat & (USS820_RXSTAT_RXSETUP |
-	    USS820_RXSTAT_RXSOVW |
-	    USS820_RXSTAT_EDOVW)) {
-		DPRINTFN(5, "faking complete\n");
-		/* Race condition */
-		return (0);		/* complete */
+		if (rx_stat & (USS820_RXSTAT_RXSETUP |
+		    USS820_RXSTAT_RXSOVW |
+		    USS820_RXSTAT_EDOVW)) {
+			DPRINTFN(5, "faking complete\n");
+			/* Race condition */
+			return (0);		/* complete */
+		}
 	}
-	DPRINTFN(5, "tx_flag=0x%02x rem=%u\n",
-	    tx_flag, td->remainder);
+	DPRINTFN(5, "tx_flag=0x%02x rem=%u\n", tx_flag, td->remainder);
 
 	if (tx_flag & (USS820_TXFLG_TXOVF |
 	    USS820_TXFLG_TXURF)) {
@@ -662,24 +639,27 @@ uss820dci_data_tx_sync(struct uss820dci_td *td)
 	    USS820_TXFLG_TXFIF1)) {
 		return (1);		/* not complete */
 	}
-	sc = USS820_DCI_PC2SC(td->pc);
-	if (sc->sc_dv_addr != 0xFF) {
+	if (td->ep_index == 0 && sc->sc_dv_addr != 0xFF) {
 		/* write function address */
 		uss820dci_set_address(sc, sc->sc_dv_addr);
 	}
 	return (0);			/* complete */
 }
 
-static uint8_t
+static void
 uss820dci_xfer_do_fifo(struct usb_xfer *xfer)
 {
+	struct uss820dci_softc *sc = USS820_DCI_BUS2SC(xfer->xroot->bus);
 	struct uss820dci_td *td;
 
 	DPRINTFN(9, "\n");
 
 	td = xfer->td_transfer_cache;
+	if (td == NULL)
+		return;
+
 	while (1) {
-		if ((td->func) (td)) {
+		if ((td->func) (sc, td)) {
 			/* operation in progress */
 			break;
 		}
@@ -703,27 +683,47 @@ uss820dci_xfer_do_fifo(struct usb_xfer *xfer)
 		td = td->obj_next;
 		xfer->td_transfer_cache = td;
 	}
-	return (1);			/* not complete */
+	return;
 
 done:
 	/* compute all actual lengths */
+	xfer->td_transfer_cache = NULL;
+	sc->sc_xfer_complete = 1;
+}
 
-	uss820dci_standard_done(xfer);
+static uint8_t
+uss820dci_xfer_do_complete(struct usb_xfer *xfer)
+{
+	struct uss820dci_td *td;
 
-	return (0);			/* complete */
+	DPRINTFN(9, "\n");
+
+	td = xfer->td_transfer_cache;
+	if (td == NULL) {
+		/* compute all actual lengths */
+		uss820dci_standard_done(xfer);
+		return(1);
+	}
+	return (0);
 }
 
 static void
-uss820dci_interrupt_poll(struct uss820dci_softc *sc)
+uss820dci_interrupt_poll_locked(struct uss820dci_softc *sc)
 {
 	struct usb_xfer *xfer;
 
+	TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry)
+		uss820dci_xfer_do_fifo(xfer);
+}
+
+static void
+uss820dci_interrupt_complete_locked(struct uss820dci_softc *sc)
+{
+	struct usb_xfer *xfer;
 repeat:
 	TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) {
-		if (!uss820dci_xfer_do_fifo(xfer)) {
-			/* queue has been modified */
+		if (uss820dci_xfer_do_complete(xfer))
 			goto repeat;
-		}
 	}
 }
 
@@ -748,27 +748,51 @@ uss820dci_wait_suspend(struct uss820dci_softc *sc, uint8_t on)
 	USS820_WRITE_1(sc, USS820_SCRATCH, scratch);
 }
 
-void
-uss820dci_interrupt(struct uss820dci_softc *sc)
+int
+uss820dci_filter_interrupt(void *arg)
 {
+	struct uss820dci_softc *sc = arg;
+	int retval = FILTER_HANDLED;
+	uint8_t ssr;
+
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
+
+	ssr = USS820_READ_1(sc, USS820_SSR);
+	uss820dci_update_shared_1(sc, USS820_SSR, USS820_DCI_THREAD_IRQ, 0);
+
+	if (ssr & USS820_DCI_THREAD_IRQ)
+		retval = FILTER_SCHEDULE_THREAD;
+
+	/* poll FIFOs, if any */
+	uss820dci_interrupt_poll_locked(sc);
+
+	if (sc->sc_xfer_complete != 0)
+		retval = FILTER_SCHEDULE_THREAD;
+
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
+
+	return (retval);
+}
+
+void
+uss820dci_interrupt(void *arg)
+{
+	struct uss820dci_softc *sc = arg;
 	uint8_t ssr;
 	uint8_t event;
 
 	USB_BUS_LOCK(&sc->sc_bus);
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
 
 	ssr = USS820_READ_1(sc, USS820_SSR);
 
-	ssr &= (USS820_SSR_SUSPEND |
-	    USS820_SSR_RESUME |
-	    USS820_SSR_RESET);
-
 	/* acknowledge all interrupts */
 
-	uss820dci_update_shared_1(sc, USS820_SSR, 0, 0);
+	uss820dci_update_shared_1(sc, USS820_SSR, ~USS820_DCI_THREAD_IRQ, 0);
 
 	/* check for any bus state change interrupts */
 
-	if (ssr) {
+	if (ssr & USS820_DCI_THREAD_IRQ) {
 
 		event = 0;
 
@@ -820,9 +844,13 @@ uss820dci_interrupt(struct uss820dci_softc *sc)
 	/* acknowledge all SBI1 interrupts */
 	uss820dci_update_shared_1(sc, USS820_SBI1, 0, 0);
 
-	/* poll all active transfers */
-	uss820dci_interrupt_poll(sc);
+	if (sc->sc_xfer_complete != 0) {
+		sc->sc_xfer_complete = 0;
 
+		/* complete FIFOs, if any */
+		uss820dci_interrupt_complete_locked(sc);
+	}
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 	USB_BUS_UNLOCK(&sc->sc_bus);
 }
 
@@ -1050,11 +1078,16 @@ uss820dci_intr_set(struct usb_xfer *xfer, uint8_t set)
 static void
 uss820dci_start_standard_chain(struct usb_xfer *xfer)
 {
+	struct uss820dci_softc *sc = USS820_DCI_BUS2SC(xfer->xroot->bus);
+
 	DPRINTFN(9, "\n");
 
-	/* poll one time */
-	if (uss820dci_xfer_do_fifo(xfer)) {
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
 
+	/* poll one time */
+	uss820dci_xfer_do_fifo(xfer);
+
+	if (uss820dci_xfer_do_complete(xfer) == 0) {
 		/*
 		 * Only enable the endpoint interrupt when we are
 		 * actually waiting for data, hence we are dealing
@@ -1071,6 +1104,7 @@ uss820dci_start_standard_chain(struct usb_xfer *xfer)
 			    &uss820dci_timeout, xfer->timeout);
 		}
 	}
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 }
 
 static void
@@ -1204,16 +1238,22 @@ uss820dci_standard_done(struct usb_xfer *xfer)
 static void
 uss820dci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
+	struct uss820dci_softc *sc = USS820_DCI_BUS2SC(xfer->xroot->bus);
+
 	USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED);
 
 	DPRINTFN(2, "xfer=%p, endpoint=%p, error=%d\n",
 	    xfer, xfer->endpoint, error);
 
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
+
 	if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) {
 		uss820dci_intr_set(xfer, 0);
 	}
 	/* dequeue transfer and start next transfer */
 	usbd_transfer_done(xfer, error);
+
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 }
 
 static void
@@ -1246,6 +1286,7 @@ uss820dci_set_stall(struct usb_device *udev,
 		/* should not happen */
 		return;
 	}
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
 	USS820_WRITE_1(sc, USS820_EPINDEX, ep_no);
 
 	if (ep_dir == UE_DIR_IN) {
@@ -1254,6 +1295,7 @@ uss820dci_set_stall(struct usb_device *udev,
 		temp = USS820_EPCON_RXSTL;
 	}
 	uss820dci_update_shared_1(sc, USS820_EPCON, 0xFF, temp);
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 }
 
 static void
@@ -1266,6 +1308,8 @@ uss820dci_clear_stall_sub(struct uss820dci_softc *sc,
 		/* clearing stall is not needed */
 		return;
 	}
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
+
 	/* select endpoint index */
 	USS820_WRITE_1(sc, USS820_EPINDEX, ep_no);
 
@@ -1304,6 +1348,7 @@ uss820dci_clear_stall_sub(struct uss820dci_softc *sc,
 		temp &= ~USS820_RXCON_RXCLR;
 		USS820_WRITE_1(sc, USS820_RXCON, temp);
 	}
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 }
 
 static void
@@ -1487,7 +1532,7 @@ uss820dci_init(struct uss820dci_softc *sc)
 			temp = USS820_EPCON_RXEPEN | USS820_EPCON_TXEPEN;
 		}
 
-		uss820dci_update_shared_1(sc, USS820_EPCON, 0xFF, temp);
+		uss820dci_update_shared_1(sc, USS820_EPCON, 0, temp);
 	}
 
 	USB_BUS_UNLOCK(&sc->sc_bus);
@@ -1540,7 +1585,10 @@ uss820dci_do_poll(struct usb_bus *bus)
 	struct uss820dci_softc *sc = USS820_DCI_BUS2SC(bus);
 
 	USB_BUS_LOCK(&sc->sc_bus);
-	uss820dci_interrupt_poll(sc);
+	USB_BUS_SPIN_LOCK(&sc->sc_bus);
+	uss820dci_interrupt_poll_locked(sc);
+	uss820dci_interrupt_complete_locked(sc);
+	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 	USB_BUS_UNLOCK(&sc->sc_bus);
 }
 
@@ -2304,8 +2352,6 @@ uss820dci_xfer_setup(struct usb_setup_params *parm)
 			td = USB_ADD_BYTES(parm->buf, parm->size[0]);
 
 			/* init TD */
-			td->io_tag = sc->sc_io_tag;
-			td->io_hdl = sc->sc_io_hdl;
 			td->max_packet_size = xfer->max_packet_size;
 			td->ep_index = ep_no;
 			if (pf->support_multi_buffer &&
diff --git a/sys/dev/usb/controller/uss820dci.h b/sys/dev/usb/controller/uss820dci.h
index 8a27f15144d0..bc9cbc14c735 100644
--- a/sys/dev/usb/controller/uss820dci.h
+++ b/sys/dev/usb/controller/uss820dci.h
@@ -255,19 +255,22 @@
 #define	USS820_UNK1 0x1f		/* Unknown */
 #define	USS820_UNK1_UNKNOWN 0xFF
 
+#ifndef USS820_REG_STRIDE
+#define	USS820_REG_STRIDE 1
+#endif
+
 #define	USS820_READ_1(sc, reg) \
-  bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, reg)
+  bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, (reg) * USS820_REG_STRIDE)
 
 #define	USS820_WRITE_1(sc, reg, data)	\
-  bus_space_write_1((sc)->sc_io_tag, (sc)->sc_io_hdl, reg, data)
+  bus_space_write_1((sc)->sc_io_tag, (sc)->sc_io_hdl, (reg) * USS820_REG_STRIDE, (data))
 
 struct uss820dci_td;
+struct uss820dci_softc;
 
-typedef uint8_t (uss820dci_cmd_t)(struct uss820dci_td *td);
+typedef uint8_t (uss820dci_cmd_t)(struct uss820dci_softc *, struct uss820dci_td *td);
 
 struct uss820dci_td {
-	bus_space_tag_t io_tag;
-	bus_space_handle_t io_hdl;
 	struct uss820dci_td *obj_next;
 	uss820dci_cmd_t *func;
 	struct usb_page_cache *pc;
@@ -336,6 +339,8 @@ struct uss820dci_softc {
 	bus_space_tag_t sc_io_tag;
 	bus_space_handle_t sc_io_hdl;
 
+	uint32_t sc_xfer_complete;
+
 	uint8_t	sc_rt_addr;		/* root HUB address */
 	uint8_t	sc_dv_addr;		/* device address */
 	uint8_t	sc_conf;		/* root HUB config */
@@ -349,6 +354,7 @@ struct uss820dci_softc {
 
 usb_error_t uss820dci_init(struct uss820dci_softc *sc);
 void	uss820dci_uninit(struct uss820dci_softc *sc);
-void	uss820dci_interrupt(struct uss820dci_softc *sc);
+driver_filter_t uss820dci_filter_interrupt;
+driver_intr_t uss820dci_interrupt;
 
 #endif					/* _USS820_DCI_H_ */
diff --git a/sys/dev/usb/controller/uss820dci_atmelarm.c b/sys/dev/usb/controller/uss820dci_atmelarm.c
index 7fd83a229ccd..33534b7f6e00 100644
--- a/sys/dev/usb/controller/uss820dci_atmelarm.c
+++ b/sys/dev/usb/controller/uss820dci_atmelarm.c
@@ -77,15 +77,15 @@ static device_method_t uss820dci_methods[] = {
 };
 
 static driver_t uss820dci_driver = {
-	.name = "uss820",
+	.name = "uss820dci",
 	.methods = uss820dci_methods,
 	.size = sizeof(struct uss820dci_softc),
 };
 
 static devclass_t uss820dci_devclass;
 
-DRIVER_MODULE(uss820, atmelarm, uss820dci_driver, uss820dci_devclass, 0, 0);
-MODULE_DEPEND(uss820, usb, 1, 1, 1);
+DRIVER_MODULE(uss820dci, atmelarm, uss820dci_driver, uss820dci_devclass, 0, 0);
+MODULE_DEPEND(uss820dci, usb, 1, 1, 1);
 
 static const char *const uss820_desc = "USS820 USB Device Controller";
 
@@ -136,13 +136,8 @@ uss820_atmelarm_attach(device_t dev)
 	}
 	device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus);
 
-#if (__FreeBSD_version >= 700031)
-	err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
-	    NULL, (driver_intr_t *)uss820dci_interrupt, sc, &sc->sc_intr_hdl);
-#else
-	err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
-	    (driver_intr_t *)uss820dci_interrupt, sc, &sc->sc_intr_hdl);
-#endif
+	err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_TTY | INTR_MPSAFE,
+	    uss820dci_filter_interrupt, uss820dci_interrupt, sc, &sc->sc_intr_hdl);
 	if (err) {
 		sc->sc_intr_hdl = NULL;
 		goto error;
diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c
index 4570ad2aab84..5e9029c5abe9 100644
--- a/sys/dev/usb/controller/xhci.c
+++ b/sys/dev/usb/controller/xhci.c
@@ -90,24 +90,20 @@
 static SYSCTL_NODE(_hw_usb, OID_AUTO, xhci, CTLFLAG_RW, 0, "USB XHCI");
 
 static int xhcistreams;
-SYSCTL_INT(_hw_usb_xhci, OID_AUTO, streams, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_xhci, OID_AUTO, streams, CTLFLAG_RWTUN,
     &xhcistreams, 0, "Set to enable streams mode support");
-TUNABLE_INT("hw.usb.xhci.streams", &xhcistreams);
 
 #ifdef USB_DEBUG
 static int xhcidebug;
 static int xhciroute;
 static int xhcipolling;
 
-SYSCTL_INT(_hw_usb_xhci, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_xhci, OID_AUTO, debug, CTLFLAG_RWTUN,
     &xhcidebug, 0, "Debug level");
-TUNABLE_INT("hw.usb.xhci.debug", &xhcidebug);
-SYSCTL_INT(_hw_usb_xhci, OID_AUTO, xhci_port_route, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_xhci, OID_AUTO, xhci_port_route, CTLFLAG_RWTUN,
     &xhciroute, 0, "Routing bitmap for switching EHCI ports to XHCI controller");
-TUNABLE_INT("hw.usb.xhci.xhci_port_route", &xhciroute);
-SYSCTL_INT(_hw_usb_xhci, OID_AUTO, use_polling, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_xhci, OID_AUTO, use_polling, CTLFLAG_RWTUN,
     &xhcipolling, 0, "Set to enable software interrupt polling for XHCI controller");
-TUNABLE_INT("hw.usb.xhci.use_polling", &xhcipolling);
 #else
 #define	xhciroute 0
 #endif
@@ -2682,24 +2678,23 @@ xhci_alloc_device_ext(struct usb_device *udev)
 		goto error;
 	}
 
-	pc = &sc->sc_hw.devs[index].endpoint_pc;
-	pg = &sc->sc_hw.devs[index].endpoint_pg;
-
-	/* need to initialize the page cache */
-	pc->tag_parent = sc->sc_bus.dma_parent_tag;
-
-	if (usb_pc_alloc_mem(pc, pg,
-	    sizeof(struct xhci_dev_endpoint_trbs), XHCI_PAGE_SIZE)) {
-		goto error;
-	}
-
 	/* initialise all endpoint LINK TRBs */
 
 	for (i = 0; i != XHCI_MAX_ENDPOINTS; i++) {
 
+		pc = &sc->sc_hw.devs[index].endpoint_pc[i];
+		pg = &sc->sc_hw.devs[index].endpoint_pg[i];
+
+		/* need to initialize the page cache */
+		pc->tag_parent = sc->sc_bus.dma_parent_tag;
+
+		if (usb_pc_alloc_mem(pc, pg,
+		    sizeof(struct xhci_dev_endpoint_trbs), XHCI_TRB_ALIGN)) {
+			goto error;
+		}
+
 		/* lookup endpoint TRB ring */
-		usbd_get_page(pc, (uintptr_t)&
-		    ((struct xhci_dev_endpoint_trbs *)0)->trb[i][0], &buf_ep);
+		usbd_get_page(pc, 0, &buf_ep);
 
 		/* get TRB pointer */
 		trb = buf_ep.buffer;
@@ -2713,9 +2708,9 @@ xhci_alloc_device_ext(struct usb_device *udev)
 		trb->dwTrb2 = htole32(XHCI_TRB_2_IRQ_SET(0));
 		trb->dwTrb3 = htole32(XHCI_TRB_3_CYCLE_BIT |
 		    XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_LINK));
-	}
 
-	usb_pc_cpu_flush(pc);
+		usb_pc_cpu_flush(pc);
+	}
 
 	xhci_set_slot_pointer(sc, index, buf_dev.physaddr);
 
@@ -2732,13 +2727,15 @@ xhci_free_device_ext(struct usb_device *udev)
 {
 	struct xhci_softc *sc = XHCI_BUS2SC(udev->bus);
 	uint8_t index;
+	uint8_t i;
 
 	index = udev->controller_slot_id;
 	xhci_set_slot_pointer(sc, index, 0);
 
 	usb_pc_free_mem(&sc->sc_hw.devs[index].device_pc);
 	usb_pc_free_mem(&sc->sc_hw.devs[index].input_pc);
-	usb_pc_free_mem(&sc->sc_hw.devs[index].endpoint_pc);
+	for (i = 0; i != XHCI_MAX_ENDPOINTS; i++)
+		usb_pc_free_mem(&sc->sc_hw.devs[index].endpoint_pc[i]);
 }
 
 static struct xhci_endpoint_ext *
@@ -2759,10 +2756,9 @@ xhci_get_endpoint_ext(struct usb_device *udev, struct usb_endpoint_descriptor *e
 
 	index = udev->controller_slot_id;
 
-	pc = &sc->sc_hw.devs[index].endpoint_pc;
+	pc = &sc->sc_hw.devs[index].endpoint_pc[epno];
 
-	usbd_get_page(pc, (uintptr_t)&((struct xhci_dev_endpoint_trbs *)0)->
-	    trb[epno][0], &buf_ep);
+	usbd_get_page(pc, 0, &buf_ep);
 
 	pepext = &sc->sc_hw.devs[index].endp[epno];
 	pepext->page_cache = pc;
diff --git a/sys/dev/usb/controller/xhci.h b/sys/dev/usb/controller/xhci.h
index b000e4f11dd6..408b429dff0a 100644
--- a/sys/dev/usb/controller/xhci.h
+++ b/sys/dev/usb/controller/xhci.h
@@ -316,8 +316,8 @@ struct xhci_trb {
 } __aligned(4);
 
 struct xhci_dev_endpoint_trbs {
-	struct xhci_trb		trb[XHCI_MAX_ENDPOINTS]
-	    [(XHCI_MAX_STREAMS * XHCI_MAX_TRANSFERS) + XHCI_MAX_STREAMS];
+	struct xhci_trb		trb[(XHCI_MAX_STREAMS *
+	    XHCI_MAX_TRANSFERS) + XHCI_MAX_STREAMS];
 };
 
 #define	XHCI_TD_PAGE_NBUF	17	/* units, room enough for 64Kbytes */
@@ -385,11 +385,11 @@ enum {
 struct xhci_hw_dev {
 	struct usb_page_cache	device_pc;
 	struct usb_page_cache	input_pc;
-	struct usb_page_cache	endpoint_pc;
+	struct usb_page_cache	endpoint_pc[XHCI_MAX_ENDPOINTS];
 
 	struct usb_page		device_pg;
 	struct usb_page		input_pg;
-	struct usb_page		endpoint_pg;
+	struct usb_page		endpoint_pg[XHCI_MAX_ENDPOINTS];
 
 	struct xhci_endpoint_ext endp[XHCI_MAX_ENDPOINTS];
 
diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c
index dc5a6e9dd445..f0b789a3d66b 100644
--- a/sys/dev/usb/controller/xhci_pci.c
+++ b/sys/dev/usb/controller/xhci_pci.c
@@ -150,6 +150,8 @@ static int
 xhci_pci_port_route(device_t self, uint32_t set, uint32_t clear)
 {
 	uint32_t temp;
+	uint32_t usb3_mask;
+	uint32_t usb2_mask;
 
 	temp = pci_read_config(self, PCI_XHCI_INTEL_USB3_PSSEN, 4) |
 	    pci_read_config(self, PCI_XHCI_INTEL_XUSB2PR, 4);
@@ -157,8 +159,12 @@ xhci_pci_port_route(device_t self, uint32_t set, uint32_t clear)
 	temp |= set;
 	temp &= ~clear;
 
-	pci_write_config(self, PCI_XHCI_INTEL_USB3_PSSEN, temp, 4);
-	pci_write_config(self, PCI_XHCI_INTEL_XUSB2PR, temp, 4);
+	/* Don't set bits which the hardware doesn't support */
+	usb3_mask = pci_read_config(self, PCI_XHCI_INTEL_USB3PRM, 4);
+	usb2_mask = pci_read_config(self, PCI_XHCI_INTEL_USB2PRM, 4);
+
+	pci_write_config(self, PCI_XHCI_INTEL_USB3_PSSEN, temp & usb3_mask, 4);
+	pci_write_config(self, PCI_XHCI_INTEL_XUSB2PR, temp & usb2_mask, 4);
 
 	device_printf(self, "Port routing mask set to 0x%08x\n", temp);
 
diff --git a/sys/dev/usb/controller/xhcireg.h b/sys/dev/usb/controller/xhcireg.h
index bd1d635cff77..a0b739711081 100644
--- a/sys/dev/usb/controller/xhcireg.h
+++ b/sys/dev/usb/controller/xhcireg.h
@@ -35,7 +35,9 @@
 #define	PCI_XHCI_FLADJ		0x61	/* RW frame length adjust */
 
 #define	PCI_XHCI_INTEL_XUSB2PR	0xD0	/* Intel USB2 Port Routing */
+#define	PCI_XHCI_INTEL_USB2PRM	0xD4	/* Intel USB2 Port Routing Mask */
 #define	PCI_XHCI_INTEL_USB3_PSSEN 0xD8	/* Intel USB3 Port SuperSpeed Enable */
+#define	PCI_XHCI_INTEL_USB3PRM	0xDC	/* Intel USB3 Port Routing Mask */
 
 /* XHCI capability registers */
 #define	XHCI_CAPLENGTH		0x00	/* RO capability */
diff --git a/sys/dev/usb/gadget/g_audio.c b/sys/dev/usb/gadget/g_audio.c
index a1d23944ff16..9bcacb95ddb5 100644
--- a/sys/dev/usb/gadget/g_audio.c
+++ b/sys/dev/usb/gadget/g_audio.c
@@ -580,13 +580,24 @@ g_audio_handle_request(device_t dev,
 		    (req->bRequest == 0x84 /* get residue */ )) {
 
 			if (offset == 0) {
-				USETW(sc->sc_volume_limit, 0);
+				USETW(sc->sc_volume_limit, 1);
 				*plen = 2;
 				*pptr = &sc->sc_volume_limit;
 			} else {
 				*plen = 0;
 			}
 			return (0);
+		} else if ((req->bmRequestType == UT_READ_CLASS_INTERFACE) &&
+		    (req->bRequest == 0x81 /* get value */ )) {
+
+			if (offset == 0) {
+				USETW(sc->sc_volume_setting, 0x2000);
+				*plen = sizeof(sc->sc_volume_setting);
+				*pptr = &sc->sc_volume_setting;
+			} else {
+				*plen = 0;
+			}
+			return (0);
 		} else if ((req->bmRequestType == UT_WRITE_CLASS_INTERFACE) &&
 		    (req->bRequest == 0x01 /* set value */ )) {
 
diff --git a/sys/dev/usb/input/uhid.c b/sys/dev/usb/input/uhid.c
index 48d9c4faa57f..1b284d251d6f 100644
--- a/sys/dev/usb/input/uhid.c
+++ b/sys/dev/usb/input/uhid.c
@@ -759,9 +759,20 @@ uhid_attach(device_t dev)
 			sc->sc_flags |= UHID_FLAG_STATIC_DESC;
 		}
 	} else if ((uaa->info.bInterfaceClass == UICLASS_VENDOR) &&
-		    (uaa->info.bInterfaceSubClass == UISUBCLASS_XBOX360_CONTROLLER) &&
+	    (uaa->info.bInterfaceSubClass == UISUBCLASS_XBOX360_CONTROLLER) &&
 	    (uaa->info.bInterfaceProtocol == UIPROTO_XBOX360_GAMEPAD)) {
-
+		static const uint8_t reportbuf[3] = {1, 3, 0};
+		/*
+		 * Turn off the four LEDs on the gamepad which
+		 * are blinking by default:
+		 */
+		error = usbd_req_set_report(uaa->device, NULL,
+		    __DECONST(void *, reportbuf), sizeof(reportbuf),
+		    uaa->info.bIfaceIndex, UHID_OUTPUT_REPORT, 0);
+		if (error) {
+			DPRINTF("set output report failed, error=%s (ignored)\n",
+			    usbd_errstr(error));
+		}
 		/* the Xbox 360 gamepad has no report descriptor */
 		sc->sc_repdesc_size = sizeof(uhid_xb360gp_report_descr);
 		sc->sc_repdesc_ptr = (void *)&uhid_xb360gp_report_descr;
diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c
index ede27f726cab..0e56d9643a0f 100644
--- a/sys/dev/usb/input/ukbd.c
+++ b/sys/dev/usb/input/ukbd.c
@@ -95,15 +95,12 @@ static int ukbd_no_leds = 0;
 static int ukbd_pollrate = 0;
 
 static SYSCTL_NODE(_hw_usb, OID_AUTO, ukbd, CTLFLAG_RW, 0, "USB keyboard");
-SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, debug, CTLFLAG_RWTUN,
     &ukbd_debug, 0, "Debug level");
-TUNABLE_INT("hw.usb.ukbd.debug", &ukbd_debug);
-SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, no_leds, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, no_leds, CTLFLAG_RWTUN,
     &ukbd_no_leds, 0, "Disables setting of keyboard leds");
-TUNABLE_INT("hw.usb.ukbd.no_leds", &ukbd_no_leds);
-SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, pollrate, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_ukbd, OID_AUTO, pollrate, CTLFLAG_RWTUN,
     &ukbd_pollrate, 0, "Force this polling rate, 1-1000Hz");
-TUNABLE_INT("hw.usb.ukbd.pollrate", &ukbd_pollrate);
 #endif
 
 #define	UKBD_EMULATE_ATSCANCODE	       1
diff --git a/sys/dev/usb/net/if_axge.c b/sys/dev/usb/net/if_axge.c
index a20f5fafd90a..17fd4d81a4bc 100644
--- a/sys/dev/usb/net/if_axge.c
+++ b/sys/dev/usb/net/if_axge.c
@@ -77,7 +77,7 @@ static const struct {
 	uint8_t	timer_h;
 	uint8_t	size;
 	uint8_t	ifg;
-} axge_bulk_size[] = {
+} __packed axge_bulk_size[] = {
 	{ 7, 0x4f, 0x00, 0x12, 0xff },
 	{ 7, 0x20, 0x03, 0x16, 0xff },
 	{ 7, 0xae, 0x07, 0x18, 0xff },
@@ -123,8 +123,8 @@ 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 *,
+static void	axge_rx_frame(struct usb_ether *, struct usb_page_cache *, int);
+static void	axge_rxeof(struct usb_ether *, struct usb_page_cache *,
 		    unsigned int, unsigned int, uint32_t);
 static void	axge_csum_cfg(struct usb_ether *);
 
@@ -153,7 +153,7 @@ static const struct usb_config axge_config[AXGE_N_TRANSFER] = {
 		.type = UE_BULK,
 		.endpoint = UE_ADDR_ANY,
 		.direction = UE_DIR_IN,
-		.bufsize = 20480,
+		.bufsize = 65536,
 		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
 		.callback = axge_bulk_read_callback,
 		.timeout = 0,		/* no timeout */
@@ -605,8 +605,7 @@ axge_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
 		pc = usbd_xfer_get_frame(xfer, 0);
-		if (axge_rx_frame(ue, pc, actlen) != 0)
-			goto tr_setup;
+		axge_rx_frame(ue, pc, actlen);
 
 		/* FALLTHROUGH */
 	case USB_ST_SETUP:
@@ -614,15 +613,14 @@ axge_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
 		usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer));
 		usbd_transfer_submit(xfer);
 		uether_rxflush(ue);
-		return;
+		break;
 
 	default:
 		if (error != USB_ERR_CANCELLED) {
 			usbd_xfer_set_stall(xfer);
 			goto tr_setup;
 		}
-		return;
-
+		break;
 	}
 }
 
@@ -926,18 +924,21 @@ axge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	return (error);
 }
 
-static int
+static void
 axge_rx_frame(struct usb_ether *ue, struct usb_page_cache *pc, int actlen)
 {
-	int error, pos;
-	int pkt_cnt;
-	uint32_t rxhdr, pkt_hdr;
-	uint16_t hdr_off;
-	uint16_t len, pktlen; 
+	uint32_t pos;
+	uint32_t pkt_cnt;
+	uint32_t rxhdr;
+	uint32_t pkt_hdr;
+	uint32_t hdr_off;
+	uint32_t pktlen; 
+
+	/* verify we have enough data */
+	if (actlen < (int)sizeof(rxhdr))
+		return;
 
 	pos = 0;
-	len = 0;
-	error = 0;
 
 	usbd_copy_out(pc, actlen - sizeof(rxhdr), &rxhdr, sizeof(rxhdr));
 	rxhdr = le32toh(rxhdr);
@@ -945,31 +946,36 @@ axge_rx_frame(struct usb_ether *ue, struct usb_page_cache *pc, int actlen)
 	pkt_cnt = (uint16_t)rxhdr;
 	hdr_off = (uint16_t)(rxhdr >> 16);
 
-	usbd_copy_out(pc, hdr_off, &pkt_hdr, sizeof(pkt_hdr));
-
-	while (pkt_cnt > 0) {
-		if ((int)(sizeof(pkt_hdr)) > actlen) {
-			error = EINVAL;
+	while (pkt_cnt--) {
+		/* verify the header offset */
+		if ((int)(hdr_off + sizeof(pkt_hdr)) > actlen) {
+			DPRINTF("End of packet headers\n");
 			break;
 		}
+		if ((int)pos >= actlen) {
+			DPRINTF("Data position reached end\n");
+			break;
+		}
+		usbd_copy_out(pc, hdr_off, &pkt_hdr, sizeof(pkt_hdr));
+
 		pkt_hdr = le32toh(pkt_hdr);
 		pktlen = (pkt_hdr >> 16) & 0x1fff;
-		if ((pkt_hdr & AXGE_RXHDR_CRC_ERR) ||
-		    (pkt_hdr & AXGE_RXHDR_DROP_ERR))
+		if (pkt_hdr & (AXGE_RXHDR_CRC_ERR | AXGE_RXHDR_DROP_ERR)) {
+			DPRINTF("Dropped a packet\n");
 			ue->ue_ifp->if_ierrors++;
-		axge_rxeof(ue, pc, pos + 2, pktlen - 6, pkt_hdr);
-		len = (pktlen + 7) & ~7;
-		pos += len;
-		pkt_hdr++;
-		pkt_cnt--;
+		}
+		if (pktlen >= 6 && (int)(pos + pktlen) <= actlen) {
+			axge_rxeof(ue, pc, pos + 2, pktlen - 6, pkt_hdr);
+		} else {
+			DPRINTF("Invalid packet pos=%d len=%d\n",
+			    (int)pos, (int)pktlen);
+		}
+		pos += (pktlen + 7) & ~7;
+		hdr_off += sizeof(pkt_hdr);
 	}
-
-	if (error != 0)
-		ue->ue_ifp->if_ierrors++;
-	return (error);
 }
 
-static int
+static void
 axge_rxeof(struct usb_ether *ue, struct usb_page_cache *pc,
     unsigned int offset, unsigned int len, uint32_t pkt_hdr)
 {
@@ -979,37 +985,34 @@ axge_rxeof(struct usb_ether *ue, struct usb_page_cache *pc,
 	ifp = ue->ue_ifp;
 	if (len < ETHER_HDR_LEN || len > MCLBYTES - ETHER_ALIGN) {
 		ifp->if_ierrors++;
-		return (EINVAL);
+		return;
 	}
 
 	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
 	if (m == NULL) {
 		ifp->if_iqdrops++;
-		return (ENOMEM);
+		return;
 	}
-	m->m_len = m->m_pkthdr.len = MCLBYTES;
+	m->m_pkthdr.rcvif = ifp;
+	m->m_len = m->m_pkthdr.len = len + ETHER_ALIGN;
 	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 ((pkt_hdr & (AXGE_RXHDR_L4CSUM_ERR | AXGE_RXHDR_L3CSUM_ERR)) == 0) {
-		m->m_pkthdr.csum_flags |= CSUM_IP_CHECKED | CSUM_IP_VALID;
 		if ((pkt_hdr & AXGE_RXHDR_L4_TYPE_MASK) ==
 		    AXGE_RXHDR_L4_TYPE_TCP ||
 		    (pkt_hdr & AXGE_RXHDR_L4_TYPE_MASK) ==
 		    AXGE_RXHDR_L4_TYPE_UDP) {
 			m->m_pkthdr.csum_flags |= CSUM_DATA_VALID |
-			    CSUM_PSEUDO_HDR;
+			    CSUM_PSEUDO_HDR | CSUM_IP_CHECKED | CSUM_IP_VALID;
 			m->m_pkthdr.csum_data = 0xffff;
 		}
 	}
 
 	_IF_ENQUEUE(&ue->ue_rxq, m);
-	return (0);
 }
 
 static void
diff --git a/sys/dev/usb/net/if_axgereg.h b/sys/dev/usb/net/if_axgereg.h
index 94b0aa83788c..1825d3b0994b 100644
--- a/sys/dev/usb/net/if_axgereg.h
+++ b/sys/dev/usb/net/if_axgereg.h
@@ -11,17 +11,17 @@
  *    notice, 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
+ * 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 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.
+ * 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$
  */
diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c
index 5ed162593f8f..4f475ec8338d 100644
--- a/sys/dev/usb/net/if_cdce.c
+++ b/sys/dev/usb/net/if_cdce.c
@@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$");
 #define	USB_DEBUG_VAR cdce_debug
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_process.h>
+#include <dev/usb/usb_msctest.h>
 #include "usb_if.h"
 
 #include <dev/usb/net/usb_ethernet.h>
@@ -251,8 +252,11 @@ static driver_t cdce_driver = {
 };
 
 static devclass_t cdce_devclass;
+static eventhandler_tag cdce_etag;
 
-DRIVER_MODULE(cdce, uhub, cdce_driver, cdce_devclass, NULL, 0);
+static int  cdce_driver_loaded(struct module *, int, void *);
+
+DRIVER_MODULE(cdce, uhub, cdce_driver, cdce_devclass, cdce_driver_loaded, 0);
 MODULE_VERSION(cdce, 1);
 MODULE_DEPEND(cdce, uether, 1, 1, 1);
 MODULE_DEPEND(cdce, usb, 1, 1, 1);
@@ -267,6 +271,10 @@ static const struct usb_ether_methods cdce_ue_methods = {
 	.ue_setpromisc = cdce_setpromisc,
 };
 
+static const STRUCT_USB_HOST_ID cdce_switch_devs[] = {
+	{USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E3272_INIT, MSC_EJECT_HUAWEI2)},
+};
+
 static const STRUCT_USB_HOST_ID cdce_host_devs[] = {
 	{USB_VPI(USB_VENDOR_ACERLABS, USB_PRODUCT_ACERLABS_M5632, CDCE_FLAG_NO_UNION)},
 	{USB_VPI(USB_VENDOR_AMBIT, USB_PRODUCT_AMBIT_NTL_250, CDCE_FLAG_NO_UNION)},
@@ -281,6 +289,16 @@ static const STRUCT_USB_HOST_ID cdce_host_devs[] = {
 	{USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLA300, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)},
 	{USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC700, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)},
 	{USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC750, CDCE_FLAG_ZAURUS | CDCE_FLAG_NO_UNION)},
+
+	{USB_VENDOR(USB_VENDOR_HUAWEI), USB_IFACE_CLASS(UICLASS_VENDOR),
+		USB_IFACE_SUBCLASS(0x02), USB_IFACE_PROTOCOL(0x16),
+		USB_DRIVER_INFO(0)},
+	{USB_VENDOR(USB_VENDOR_HUAWEI), USB_IFACE_CLASS(UICLASS_VENDOR),
+		USB_IFACE_SUBCLASS(0x02), USB_IFACE_PROTOCOL(0x46),
+		USB_DRIVER_INFO(0)},
+	{USB_VENDOR(USB_VENDOR_HUAWEI), USB_IFACE_CLASS(UICLASS_VENDOR),
+		USB_IFACE_SUBCLASS(0x02), USB_IFACE_PROTOCOL(0x76),
+		USB_DRIVER_INFO(0)},
 };
 
 static const STRUCT_USB_DUAL_ID cdce_dual_devs[] = {
@@ -474,6 +492,48 @@ cdce_ncm_init(struct cdce_softc *sc)
 }
 #endif
 
+static void
+cdce_test_autoinst(void *arg, struct usb_device *udev,
+    struct usb_attach_arg *uaa)
+{
+	struct usb_interface *iface;
+	struct usb_interface_descriptor *id;
+
+	if (uaa->dev_state != UAA_DEV_READY)
+		return;
+
+	iface = usbd_get_iface(udev, 0);
+	if (iface == NULL)
+		return;
+	id = iface->idesc;
+	if (id == NULL || id->bInterfaceClass != UICLASS_MASS)
+		return;
+	if (usbd_lookup_id_by_uaa(cdce_switch_devs, sizeof(cdce_switch_devs), uaa))
+		return;		/* no device match */
+
+	if (usb_msc_eject(udev, 0, USB_GET_DRIVER_INFO(uaa)) == 0) {
+		/* success, mark the udev as disappearing */
+		uaa->dev_state = UAA_DEV_EJECTING;
+	}
+}
+
+static int
+cdce_driver_loaded(struct module *mod, int what, void *arg)
+{
+	switch (what) {
+	case MOD_LOAD:
+		/* register our autoinstall handler */
+		cdce_etag = EVENTHANDLER_REGISTER(usb_dev_configured,
+		    cdce_test_autoinst, NULL, EVENTHANDLER_PRI_ANY);
+		return (0);
+	case MOD_UNLOAD:
+		EVENTHANDLER_DEREGISTER(usb_dev_configured, cdce_etag);
+		return (0);
+	default:
+		return (EOPNOTSUPP);
+	}
+}
+
 static int
 cdce_probe(device_t dev)
 {
diff --git a/sys/dev/usb/net/uhso.c b/sys/dev/usb/net/uhso.c
index ec84b0fdc944..ba6236c6b263 100644
--- a/sys/dev/usb/net/uhso.c
+++ b/sys/dev/usb/net/uhso.c
@@ -559,8 +559,6 @@ uhso_attach(device_t self)
 	mtx_init(&sc->sc_mtx, "uhso", NULL, MTX_DEF);
 	ucom_ref(&sc->sc_super_ucom);
 
-	sc->sc_ucom = NULL;
-	sc->sc_ttys = 0;
 	sc->sc_radio = 1;
 
 	id = usbd_get_interface_descriptor(uaa->iface);
@@ -680,9 +678,6 @@ uhso_detach(device_t self)
 				    UHSO_CTRL_MAX);
 			}
 		}
-
-		free(sc->sc_tty, M_USBDEV);
-		free(sc->sc_ucom, M_USBDEV);
 	}
 
 	if (sc->sc_ifp != NULL) {
@@ -710,6 +705,8 @@ static void
 uhso_free_softc(struct uhso_softc *sc)
 {
 	if (ucom_unref(&sc->sc_super_ucom)) {
+		free(sc->sc_tty, M_USBDEV);
+		free(sc->sc_ucom, M_USBDEV);
 		mtx_destroy(&sc->sc_mtx);
 		device_free_softc(sc);
 	}
diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c
index cdc3e4afd5e2..eeda93204511 100644
--- a/sys/dev/usb/quirk/usb_quirk.c
+++ b/sys/dev/usb/quirk/usb_quirk.c
@@ -562,6 +562,7 @@ static const char *usb_quirk_str[USB_QUIRK_MAX] = {
 	[UQ_MSC_EJECT_WAIT]		= "UQ_MSC_EJECT_WAIT",
 	[UQ_MSC_EJECT_SAEL_M460]	= "UQ_MSC_EJECT_SAEL_M460",
 	[UQ_MSC_EJECT_HUAWEISCSI]	= "UQ_MSC_EJECT_HUAWEISCSI",
+	[UQ_MSC_EJECT_HUAWEISCSI2]	= "UQ_MSC_EJECT_HUAWEISCSI2",
 	[UQ_MSC_EJECT_TCT]		= "UQ_MSC_EJECT_TCT",
 	[UQ_BAD_MIDI]			= "UQ_BAD_MIDI",
 	[UQ_AU_VENDOR_CLASS]		= "UQ_AU_VENDOR_CLASS",
diff --git a/sys/dev/usb/quirk/usb_quirk.h b/sys/dev/usb/quirk/usb_quirk.h
index 15d5f15c431d..c2e9501ee899 100644
--- a/sys/dev/usb/quirk/usb_quirk.h
+++ b/sys/dev/usb/quirk/usb_quirk.h
@@ -102,6 +102,7 @@ enum {
 	UQ_MSC_EJECT_WAIT,		/* wait for the device to eject */
 	UQ_MSC_EJECT_SAEL_M460,		/* ejects after Sael USB commands */ 
 	UQ_MSC_EJECT_HUAWEISCSI,	/* ejects after Huawei SCSI command */
+	UQ_MSC_EJECT_HUAWEISCSI2,	/* ejects after Huawei SCSI 2 command */
 	UQ_MSC_EJECT_TCT,		/* ejects after TCT SCSI command */
 
 	UQ_BAD_MIDI,		/* device claims MIDI class, but isn't */
diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c
index 82f0a9d319b6..bbf535126442 100644
--- a/sys/dev/usb/serial/u3g.c
+++ b/sys/dev/usb/serial/u3g.c
@@ -76,15 +76,6 @@ SYSCTL_INT(_hw_usb_u3g, OID_AUTO, debug, CTLFLAG_RW,
 #define	U3G_CONFIG_INDEX	0
 #define	U3G_BSIZE		2048
 
-#define	U3GSP_GPRS		0
-#define	U3GSP_EDGE		1
-#define	U3GSP_CDMA		2
-#define	U3GSP_UMTS		3
-#define	U3GSP_HSDPA		4
-#define	U3GSP_HSUPA		5
-#define	U3GSP_HSPA		6
-#define	U3GSP_MAX		7
-
 /* Eject methods; See also usb_quirks.h:UQ_MSC_EJECT_* */
 #define	U3GINIT_HUAWEI		1	/* Requires Huawei init command */
 #define	U3GINIT_SIERRA		2	/* Requires Sierra init command */
@@ -95,7 +86,8 @@ SYSCTL_INT(_hw_usb_u3g, OID_AUTO, debug, CTLFLAG_RW,
 #define	U3GINIT_WAIT		7	/* Device reappears after a delay */
 #define	U3GINIT_SAEL_M460	8	/* Requires vendor init */
 #define	U3GINIT_HUAWEISCSI	9	/* Requires Huawei SCSI init command */
-#define	U3GINIT_TCT		10	/* Requires TCT Mobile init command */
+#define	U3GINIT_HUAWEISCSI2	10	/* Requires Huawei SCSI init command (2) */
+#define	U3GINIT_TCT		11	/* Requires TCT Mobile init command */
 
 enum {
 	U3G_BULK_WR,
@@ -343,7 +335,9 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = {
 	U3G_DEV(NOVATEL, EU870D, 0),
 	U3G_DEV(NOVATEL, MC760, 0),
 	U3G_DEV(NOVATEL, MC547, 0),
+	U3G_DEV(NOVATEL, MC679, 0),
 	U3G_DEV(NOVATEL, MC950D, 0),
+	U3G_DEV(NOVATEL, MC990D, 0),
 	U3G_DEV(NOVATEL, MIFI2200, U3GINIT_SCSIEJECT),
 	U3G_DEV(NOVATEL, MIFI2200V, U3GINIT_SCSIEJECT),
 	U3G_DEV(NOVATEL, U720, 0),
@@ -727,6 +721,8 @@ u3g_test_autoinst(void *arg, struct usb_device *udev,
 		method = U3GINIT_WAIT;
 	else if (usb_test_quirk(uaa, UQ_MSC_EJECT_HUAWEISCSI))
 		method = U3GINIT_HUAWEISCSI;
+	else if (usb_test_quirk(uaa, UQ_MSC_EJECT_HUAWEISCSI2))
+		method = U3GINIT_HUAWEISCSI2;
 	else if (usb_test_quirk(uaa, UQ_MSC_EJECT_TCT))
 		method = U3GINIT_TCT;
 	else if (usbd_lookup_id_by_uaa(u3g_devs, sizeof(u3g_devs), uaa) == 0)
@@ -747,6 +743,9 @@ u3g_test_autoinst(void *arg, struct usb_device *udev,
 		case U3GINIT_HUAWEISCSI:
 			error = usb_msc_eject(udev, 0, MSC_EJECT_HUAWEI);
 			break;
+		case U3GINIT_HUAWEISCSI2:
+			error = usb_msc_eject(udev, 0, MSC_EJECT_HUAWEI2);
+			break;
 		case U3GINIT_SCSIEJECT:
 			error = usb_msc_eject(udev, 0, MSC_EJECT_STOPUNIT);
 			break;
@@ -755,7 +754,8 @@ u3g_test_autoinst(void *arg, struct usb_device *udev,
 			break;
 		case U3GINIT_ZTESTOR:
 			error = usb_msc_eject(udev, 0, MSC_EJECT_STOPUNIT);
-			error |= usb_msc_eject(udev, 0, MSC_EJECT_ZTESTOR);
+			if (error == 0)
+			    error = usb_msc_eject(udev, 0, MSC_EJECT_ZTESTOR);
 			break;
 		case U3GINIT_CMOTECH:
 			error = usb_msc_eject(udev, 0, MSC_EJECT_CMOTECH);
@@ -889,7 +889,7 @@ u3g_attach(device_t dev)
 		sc->sc_iface[nports] = id->bInterfaceNumber;
 
 		if (bootverbose && sc->sc_xfer[nports][U3G_INTR]) {
-			device_printf(dev, "port %d supports modem control",
+			device_printf(dev, "port %d supports modem control\n",
 				      nports);
 		}
 
diff --git a/sys/dev/usb/serial/uftdi.c b/sys/dev/usb/serial/uftdi.c
index 25da9b892f40..9624825ddc14 100644
--- a/sys/dev/usb/serial/uftdi.c
+++ b/sys/dev/usb/serial/uftdi.c
@@ -932,7 +932,6 @@ static const struct jtag_by_name {
  * creation of tty devices for jtag interfaces.  Enabled by default.
  */
 static int skip_jtag_interfaces = 1;
-TUNABLE_INT("hw.usb.uftdi.skip_jtag_interfaces", &skip_jtag_interfaces);
 SYSCTL_INT(_hw_usb_uftdi, OID_AUTO, skip_jtag_interfaces, CTLFLAG_RWTUN,
     &skip_jtag_interfaces, 1, "Skip creating tty devices for jtag interfaces");
 
@@ -1035,7 +1034,7 @@ uftdi_devtype_setup(struct uftdi_softc *sc, struct usb_attach_arg *uaa)
 		} else {
 			sc->sc_devtype = DEVT_232R;
 			device_printf(sc->sc_dev, "Warning: unknown FTDI "
-			    "device type, bcdDevice=0x%04x, assuming 232R", 
+			    "device type, bcdDevice=0x%04x, assuming 232R\n", 
 			    uaa->info.bcdDevice);
 		}
 		sc->sc_ucom.sc_portno = 0;
diff --git a/sys/dev/usb/serial/umcs.c b/sys/dev/usb/serial/umcs.c
index c8f8ab8a0830..b7174fb3b97f 100644
--- a/sys/dev/usb/serial/umcs.c
+++ b/sys/dev/usb/serial/umcs.c
@@ -1083,7 +1083,10 @@ umcs7840_calc_baudrate(uint32_t rate, uint16_t *divisor, uint8_t *clk)
 
 	for (i = 0; i < umcs7840_baudrate_divisors_len - 1 &&
 	    !(rate > umcs7840_baudrate_divisors[i] && rate <= umcs7840_baudrate_divisors[i + 1]); ++i);
-	*divisor = umcs7840_baudrate_divisors[i + 1] / rate;
+	if (rate == 0)
+		*divisor = 1;	/* XXX */
+	else
+		*divisor = umcs7840_baudrate_divisors[i + 1] / rate;
 	/* 0x00 .. 0x70 */
 	*clk = i << MCS7840_DEV_SPx_CLOCK_SHIFT;
 	return (0);
diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c
index 2945415bbe99..7a83346cd2f6 100644
--- a/sys/dev/usb/serial/usb_serial.c
+++ b/sys/dev/usb/serial/usb_serial.c
@@ -119,14 +119,11 @@ static int ucom_cons_subunit = 0;
 static int ucom_cons_baud = 9600;
 static struct ucom_softc *ucom_cons_softc = NULL;
 
-TUNABLE_INT("hw.usb.ucom.cons_unit", &ucom_cons_unit);
-SYSCTL_INT(_hw_usb_ucom, OID_AUTO, cons_unit, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_ucom, OID_AUTO, cons_unit, CTLFLAG_RWTUN,
     &ucom_cons_unit, 0, "console unit number");
-TUNABLE_INT("hw.usb.ucom.cons_subunit", &ucom_cons_subunit);
-SYSCTL_INT(_hw_usb_ucom, OID_AUTO, cons_subunit, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_ucom, OID_AUTO, cons_subunit, CTLFLAG_RWTUN,
     &ucom_cons_subunit, 0, "console subunit number");
-TUNABLE_INT("hw.usb.ucom.cons_baud", &ucom_cons_baud);
-SYSCTL_INT(_hw_usb_ucom, OID_AUTO, cons_baud, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_ucom, OID_AUTO, cons_baud, CTLFLAG_RWTUN,
     &ucom_cons_baud, 0, "console baud rate");
 
 static usb_proc_callback_t ucom_cfg_start_transfers;
@@ -203,7 +200,7 @@ ucom_uninit(void *arg)
 
 	mtx_destroy(&ucom_mtx);
 }
-SYSUNINIT(ucom_uninit, SI_SUB_KLD - 2, SI_ORDER_ANY, ucom_uninit, NULL);
+SYSUNINIT(ucom_uninit, SI_SUB_KLD - 3, SI_ORDER_ANY, ucom_uninit, NULL);
 
 /*
  * Mark a unit number (the X in cuaUX) as in use.
diff --git a/sys/dev/usb/serial/usb_serial.h b/sys/dev/usb/serial/usb_serial.h
index 5c6e71c9d043..8fdf988cae0c 100644
--- a/sys/dev/usb/serial/usb_serial.h
+++ b/sys/dev/usb/serial/usb_serial.h
@@ -195,7 +195,7 @@ struct ucom_softc {
 #define	UCOM_MTX_LOCK(sc) mtx_lock((sc)->sc_mtx)
 #define	UCOM_MTX_UNLOCK(sc) mtx_unlock((sc)->sc_mtx)
 #define	UCOM_UNLOAD_DRAIN(x) \
-SYSUNINIT(var, SI_SUB_KLD - 3, SI_ORDER_ANY, ucom_drain_all, 0)
+SYSUNINIT(var, SI_SUB_KLD - 2, SI_ORDER_ANY, ucom_drain_all, 0)
 
 #define	ucom_cfg_do_request(udev,com,req,ptr,flags,timo) \
     usbd_do_request_proc(udev,&(com)->sc_super->sc_tq,req,ptr,flags,NULL,timo)
diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c
index f3a51b313ff4..e169abbfb53e 100644
--- a/sys/dev/usb/storage/umass.c
+++ b/sys/dev/usb/storage/umass.c
@@ -167,12 +167,10 @@ static int umass_debug;
 static int umass_throttle;
 
 static SYSCTL_NODE(_hw_usb, OID_AUTO, umass, CTLFLAG_RW, 0, "USB umass");
-SYSCTL_INT(_hw_usb_umass, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_umass, OID_AUTO, debug, CTLFLAG_RWTUN,
     &umass_debug, 0, "umass debug level");
-TUNABLE_INT("hw.usb.umass.debug", &umass_debug);
-SYSCTL_INT(_hw_usb_umass, OID_AUTO, throttle, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_umass, OID_AUTO, throttle, CTLFLAG_RWTUN,
     &umass_throttle, 0, "Forced delay between commands in milliseconds");
-TUNABLE_INT("hw.usb.umass.throttle", &umass_throttle);
 #else
 #define	DIF(...) do { } while (0)
 #define	DPRINTF(...) do { } while (0)
diff --git a/sys/dev/usb/template/usb_template.c b/sys/dev/usb/template/usb_template.c
index ec7e7112b4fd..b2e840dcbc1c 100644
--- a/sys/dev/usb/template/usb_template.c
+++ b/sys/dev/usb/template/usb_template.c
@@ -135,7 +135,7 @@ usb_make_raw_desc(struct usb_temp_setup *temp,
 
 			/* check if we have got a CDC union descriptor */
 
-			if ((raw[0] >= sizeof(struct usb_cdc_union_descriptor)) &&
+			if ((raw[0] == sizeof(struct usb_cdc_union_descriptor)) &&
 			    (raw[1] == UDESC_CS_INTERFACE) &&
 			    (raw[2] == UDESCSUB_CDC_UNION)) {
 				struct usb_cdc_union_descriptor *ud = (void *)dst;
@@ -150,7 +150,7 @@ usb_make_raw_desc(struct usb_temp_setup *temp,
 
 			/* check if we have got an interface association descriptor */
 
-			if ((raw[0] >= sizeof(struct usb_interface_assoc_descriptor)) &&
+			if ((raw[0] == sizeof(struct usb_interface_assoc_descriptor)) &&
 			    (raw[1] == UDESC_IFACE_ASSOC)) {
 				struct usb_interface_assoc_descriptor *iad = (void *)dst;
 
@@ -162,7 +162,7 @@ usb_make_raw_desc(struct usb_temp_setup *temp,
 
 			/* check if we have got a call management descriptor */
 
-			if ((raw[0] >= sizeof(struct usb_cdc_cm_descriptor)) &&
+			if ((raw[0] == sizeof(struct usb_cdc_cm_descriptor)) &&
 			    (raw[1] == UDESC_CS_INTERFACE) &&
 			    (raw[2] == UDESCSUB_CDC_CM)) {
 				struct usb_cdc_cm_descriptor *ccd = (void *)dst;
@@ -1368,6 +1368,9 @@ usb_temp_setup_by_index(struct usb_device *udev, uint16_t index)
 	case USB_TEMP_MOUSE:
 		err = usb_temp_setup(udev, &usb_template_mouse);
 		break;
+	case USB_TEMP_PHONE:
+		err = usb_temp_setup(udev, &usb_template_phone);
+		break;
 	default:
 		return (USB_ERR_INVAL);
 	}
diff --git a/sys/dev/usb/template/usb_template.h b/sys/dev/usb/template/usb_template.h
index b05272fb2a71..b157911b203b 100644
--- a/sys/dev/usb/template/usb_template.h
+++ b/sys/dev/usb/template/usb_template.h
@@ -105,6 +105,7 @@ extern const struct usb_temp_device_desc usb_template_modem;
 extern const struct usb_temp_device_desc usb_template_mouse;
 extern const struct usb_temp_device_desc usb_template_msc;
 extern const struct usb_temp_device_desc usb_template_mtp;
+extern const struct usb_temp_device_desc usb_template_phone;
 
 usb_error_t	usb_temp_setup(struct usb_device *,
 		    const struct usb_temp_device_desc *);
diff --git a/sys/dev/usb/template/usb_template_phone.c b/sys/dev/usb/template/usb_template_phone.c
new file mode 100644
index 000000000000..c58103e9b444
--- /dev/null
+++ b/sys/dev/usb/template/usb_template_phone.c
@@ -0,0 +1,419 @@
+/* $FreeBSD$ */
+/*-
+ * Copyright (c) 2014 Hans Petter Selasky. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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.
+ */
+
+/*
+ * This file contains the USB template for an USB phone device.
+ */
+
+#ifdef USB_GLOBAL_INCLUDE_FILE
+#include USB_GLOBAL_INCLUDE_FILE
+#else
+#include <sys/stdint.h>
+#include <sys/stddef.h>
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/module.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/condvar.h>
+#include <sys/sysctl.h>
+#include <sys/sx.h>
+#include <sys/unistd.h>
+#include <sys/callout.h>
+#include <sys/malloc.h>
+#include <sys/priv.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usb_core.h>
+#include <dev/usb/usb_cdc.h>
+
+#include <dev/usb/template/usb_template.h>
+#endif			/* USB_GLOBAL_INCLUDE_FILE */
+
+enum {
+	INDEX_PHONE_LANG,
+	INDEX_PHONE_MIXER,
+	INDEX_PHONE_RECORD,
+	INDEX_PHONE_PLAYBACK,
+	INDEX_PHONE_PRODUCT,
+	INDEX_PHONE_HID,
+	INDEX_PHONE_MAX,
+};
+
+#define	STRING_PHONE_PRODUCT \
+  "U\0S\0B\0 \0P\0h\0o\0n\0e\0 \0D\0e\0v\0i\0c\0e"
+
+#define	STRING_PHONE_MIXER \
+  "M\0i\0x\0e\0r\0 \0i\0n\0t\0e\0r\0f\0a\0c\0e"
+
+#define	STRING_PHONE_RECORD \
+  "R\0e\0c\0o\0r\0d\0 \0i\0n\0t\0e\0r\0f\0a\0c\0e"
+
+#define	STRING_PHONE_PLAYBACK \
+  "P\0l\0a\0y\0b\0a\0c\0k\0 \0i\0n\0t\0e\0r\0f\0a\0c\0e"
+
+#define	STRING_PHONE_HID \
+  "H\0I\0D\0 \0i\0n\0t\0e\0r\0f\0a\0c\0e"
+
+/* make the real string descriptors */
+
+USB_MAKE_STRING_DESC(STRING_PHONE_MIXER, string_phone_mixer);
+USB_MAKE_STRING_DESC(STRING_PHONE_RECORD, string_phone_record);
+USB_MAKE_STRING_DESC(STRING_PHONE_PLAYBACK, string_phone_playback);
+USB_MAKE_STRING_DESC(STRING_PHONE_PRODUCT, string_phone_product);
+USB_MAKE_STRING_DESC(STRING_PHONE_HID, string_phone_hid);
+
+/* prototypes */
+
+/*
+ * Phone Mixer description structures
+ *
+ * Some of the phone descriptors were dumped from no longer in
+ * production Yealink VOIP USB phone adapter:
+ */
+static uint8_t phone_hid_descriptor[] = {
+	0x05, 0x0b, 0x09, 0x01, 0xa1, 0x01, 0x05, 0x09,
+	0x19, 0x01, 0x29, 0x3f, 0x15, 0x00, 0x25, 0x01,
+	0x75, 0x01, 0x95, 0x80, 0x81, 0x00, 0x05, 0x08,
+	0x19, 0x01, 0x29, 0x10, 0x15, 0x00, 0x25, 0x01,
+	0x75, 0x01, 0x95, 0x80, 0x91, 0x00, 0xc0
+};
+
+static const uint8_t phone_raw_desc_0[] = {
+	0x0a, 0x24, 0x01, 0x00, 0x01, 0x4a, 0x00, 0x02,
+	0x01, 0x02
+};
+
+static const uint8_t phone_raw_desc_1[] = {
+	0x0c, 0x24, 0x02, 0x01, 0x01, 0x02, 0x00, 0x01,
+	0x00, 0x00, 0x00, 0x00
+};
+
+static const uint8_t phone_raw_desc_2[] = {
+	0x0c, 0x24, 0x02, 0x02, 0x01, 0x01, 0x00, 0x01,
+	0x00, 0x00, 0x00, 0x00
+};
+
+static const uint8_t phone_raw_desc_3[] = {
+	0x09, 0x24, 0x03, 0x03, 0x01, 0x03, 0x00, 0x06,
+	0x00
+};
+
+static const uint8_t phone_raw_desc_4[] = {
+	0x09, 0x24, 0x03, 0x04, 0x01, 0x01, 0x00, 0x05,
+	0x00
+};
+
+static const uint8_t phone_raw_desc_5[] = {
+	0x0b, 0x24, 0x06, 0x05, 0x01, 0x02, 0x03, 0x00,
+	0x03, 0x00, 0x00
+};
+
+static const uint8_t phone_raw_desc_6[] = {
+	0x0b, 0x24, 0x06, 0x06, 0x02, 0x02, 0x03, 0x00,
+	0x03, 0x00, 0x00
+};
+
+static const void *phone_raw_iface_0_desc[] = {
+	phone_raw_desc_0,
+	phone_raw_desc_1,
+	phone_raw_desc_2,
+	phone_raw_desc_3,
+	phone_raw_desc_4,
+	phone_raw_desc_5,
+	phone_raw_desc_6,
+	NULL,
+};
+
+static const struct usb_temp_interface_desc phone_iface_0 = {
+	.ppEndpoints = NULL,		/* no endpoints */
+	.ppRawDesc = phone_raw_iface_0_desc,
+	.bInterfaceClass = 1,
+	.bInterfaceSubClass = 1,
+	.bInterfaceProtocol = 0,
+	.iInterface = INDEX_PHONE_MIXER,
+};
+
+static const uint8_t phone_raw_desc_20[] = {
+	0x07, 0x24, 0x01, 0x04, 0x01, 0x01, 0x00
+};
+
+static const uint8_t phone_raw_desc_21[] = {
+	0x0b, 0x24, 0x02, 0x01, 0x01, 0x02, 0x10, 0x01,
+	/* 8kHz */
+	0x40, 0x1f, 0x00
+};
+
+static const uint8_t phone_raw_desc_22[] = {
+	0x07, 0x25, 0x01, 0x00, 0x00, 0x00, 0x00
+};
+
+static const void *phone_raw_iface_1_desc[] = {
+	phone_raw_desc_20,
+	phone_raw_desc_21,
+	NULL,
+};
+
+static const void *phone_raw_ep_1_desc[] = {
+	phone_raw_desc_22,
+	NULL,
+};
+
+static const struct usb_temp_packet_size phone_isoc_mps = {
+	.mps[USB_SPEED_FULL] = 0x10,
+	.mps[USB_SPEED_HIGH] = 0x10,
+};
+
+static const struct usb_temp_interval phone_isoc_interval = {
+	.bInterval[USB_SPEED_FULL] = 1,	/* 1:1 */
+	.bInterval[USB_SPEED_HIGH] = 4,	/* 1:8 */
+};
+
+static const struct usb_temp_endpoint_desc phone_isoc_in_ep = {
+	.ppRawDesc = phone_raw_ep_1_desc,
+	.pPacketSize = &phone_isoc_mps,
+	.pIntervals = &phone_isoc_interval,
+	.bEndpointAddress = UE_DIR_IN,
+	.bmAttributes = UE_ISOCHRONOUS,
+};
+
+static const struct usb_temp_endpoint_desc *phone_iface_1_ep[] = {
+	&phone_isoc_in_ep,
+	NULL,
+};
+
+static const struct usb_temp_interface_desc phone_iface_1_alt_0 = {
+	.ppEndpoints = NULL,		/* no endpoints */
+	.ppRawDesc = NULL,		/* no raw descriptors */
+	.bInterfaceClass = 1,
+	.bInterfaceSubClass = 2,
+	.bInterfaceProtocol = 0,
+	.iInterface = INDEX_PHONE_PLAYBACK,
+};
+
+static const struct usb_temp_interface_desc phone_iface_1_alt_1 = {
+	.ppEndpoints = phone_iface_1_ep,
+	.ppRawDesc = phone_raw_iface_1_desc,
+	.bInterfaceClass = 1,
+	.bInterfaceSubClass = 2,
+	.bInterfaceProtocol = 0,
+	.iInterface = INDEX_PHONE_PLAYBACK,
+	.isAltInterface = 1,		/* this is an alternate setting */
+};
+
+static const uint8_t phone_raw_desc_30[] = {
+	0x07, 0x24, 0x01, 0x02, 0x01, 0x01, 0x00
+};
+
+static const uint8_t phone_raw_desc_31[] = {
+	0x0b, 0x24, 0x02, 0x01, 0x01, 0x02, 0x10, 0x01,
+	/* 8kHz */
+	0x40, 0x1f, 0x00
+};
+
+static const uint8_t phone_raw_desc_32[] = {
+	0x07, 0x25, 0x01, 0x00, 0x00, 0x00, 0x00
+};
+
+static const void *phone_raw_iface_2_desc[] = {
+	phone_raw_desc_30,
+	phone_raw_desc_31,
+	NULL,
+};
+
+static const void *phone_raw_ep_2_desc[] = {
+	phone_raw_desc_32,
+	NULL,
+};
+
+static const struct usb_temp_endpoint_desc phone_isoc_out_ep = {
+	.ppRawDesc = phone_raw_ep_2_desc,
+	.pPacketSize = &phone_isoc_mps,
+	.pIntervals = &phone_isoc_interval,
+	.bEndpointAddress = UE_DIR_OUT,
+	.bmAttributes = UE_ISOCHRONOUS,
+};
+
+static const struct usb_temp_endpoint_desc *phone_iface_2_ep[] = {
+	&phone_isoc_out_ep,
+	NULL,
+};
+
+static const struct usb_temp_interface_desc phone_iface_2_alt_0 = {
+	.ppEndpoints = NULL,		/* no endpoints */
+	.ppRawDesc = NULL,		/* no raw descriptors */
+	.bInterfaceClass = 1,
+	.bInterfaceSubClass = 2,
+	.bInterfaceProtocol = 0,
+	.iInterface = INDEX_PHONE_RECORD,
+};
+
+static const struct usb_temp_interface_desc phone_iface_2_alt_1 = {
+	.ppEndpoints = phone_iface_2_ep,
+	.ppRawDesc = phone_raw_iface_2_desc,
+	.bInterfaceClass = 1,
+	.bInterfaceSubClass = 2,
+	.bInterfaceProtocol = 0,
+	.iInterface = INDEX_PHONE_RECORD,
+	.isAltInterface = 1,		/* this is an alternate setting */
+};
+
+static const uint8_t phone_hid_raw_desc_0[] = {
+	0x09, 0x21, 0x00, 0x01, 0x00, 0x01, 0x22, sizeof(phone_hid_descriptor),
+	0x00
+};
+
+static const void *phone_hid_desc_0[] = {
+	phone_hid_raw_desc_0,
+	NULL,
+};
+
+static const struct usb_temp_packet_size phone_hid_mps = {
+	.mps[USB_SPEED_FULL] = 0x10,
+	.mps[USB_SPEED_HIGH] = 0x10,
+};
+
+static const struct usb_temp_interval phone_hid_interval = {
+	.bInterval[USB_SPEED_FULL] = 2,		/* 2ms */
+	.bInterval[USB_SPEED_HIGH] = 2,		/* 2ms */
+};
+
+static const struct usb_temp_endpoint_desc phone_hid_in_ep = {
+	.pPacketSize = &phone_hid_mps,
+	.pIntervals = &phone_hid_interval,
+	.bEndpointAddress = UE_DIR_IN,
+	.bmAttributes = UE_INTERRUPT,
+};
+
+static const struct usb_temp_endpoint_desc *phone_iface_3_ep[] = {
+	&phone_hid_in_ep,
+	NULL,
+};
+
+static const struct usb_temp_interface_desc phone_iface_3 = {
+	.ppEndpoints = phone_iface_3_ep,
+	.ppRawDesc = phone_hid_desc_0,
+	.bInterfaceClass = 3,
+	.bInterfaceSubClass = 0,
+	.bInterfaceProtocol = 0,
+	.iInterface = INDEX_PHONE_HID,
+};
+
+static const struct usb_temp_interface_desc *phone_interfaces[] = {
+	&phone_iface_0,
+	&phone_iface_1_alt_0,
+	&phone_iface_1_alt_1,
+	&phone_iface_2_alt_0,
+	&phone_iface_2_alt_1,
+	&phone_iface_3,
+	NULL,
+};
+
+static const struct usb_temp_config_desc phone_config_desc = {
+	.ppIfaceDesc = phone_interfaces,
+	.bmAttributes = UC_BUS_POWERED,
+	.bMaxPower = 25,		/* 50 mA */
+	.iConfiguration = INDEX_PHONE_PRODUCT,
+};
+
+static const struct usb_temp_config_desc *phone_configs[] = {
+	&phone_config_desc,
+	NULL,
+};
+
+static usb_temp_get_string_desc_t phone_get_string_desc;
+static usb_temp_get_vendor_desc_t phone_get_vendor_desc;
+
+const struct usb_temp_device_desc usb_template_phone = {
+	.getStringDesc = &phone_get_string_desc,
+	.getVendorDesc = &phone_get_vendor_desc,
+	.ppConfigDesc = phone_configs,
+	.idVendor = USB_TEMPLATE_VENDOR,
+	.idProduct = 0xb001,
+	.bcdDevice = 0x0100,
+	.bDeviceClass = UDCLASS_IN_INTERFACE,
+	.bDeviceSubClass = 0,
+	.bDeviceProtocol = 0,
+	.iManufacturer = 0,
+	.iProduct = INDEX_PHONE_PRODUCT,
+	.iSerialNumber = 0,
+};
+
+/*------------------------------------------------------------------------*
+ *      phone_get_vendor_desc
+ *
+ * Return values:
+ * NULL: Failure. No such vendor descriptor.
+ * Else: Success. Pointer to vendor descriptor is returned.
+ *------------------------------------------------------------------------*/
+static const void *
+phone_get_vendor_desc(const struct usb_device_request *req, uint16_t *plen)
+{
+	if ((req->bmRequestType == 0x81) && (req->bRequest == 0x06) &&
+	    (req->wValue[0] == 0x00) && (req->wValue[1] == 0x22) &&
+	    (req->wIndex[1] == 0) && (req->wIndex[0] == 3 /* iface */)) {
+
+		*plen = sizeof(phone_hid_descriptor);
+		return (phone_hid_descriptor);
+	}
+	return (NULL);
+}
+
+/*------------------------------------------------------------------------*
+ *	phone_get_string_desc
+ *
+ * Return values:
+ * NULL: Failure. No such string.
+ * Else: Success. Pointer to string descriptor is returned.
+ *------------------------------------------------------------------------*/
+static const void *
+phone_get_string_desc(uint16_t lang_id, uint8_t string_index)
+{
+	static const void *ptr[INDEX_PHONE_MAX] = {
+		[INDEX_PHONE_LANG] = &usb_string_lang_en,
+		[INDEX_PHONE_MIXER] = &string_phone_mixer,
+		[INDEX_PHONE_RECORD] = &string_phone_record,
+		[INDEX_PHONE_PLAYBACK] = &string_phone_playback,
+		[INDEX_PHONE_PRODUCT] = &string_phone_product,
+		[INDEX_PHONE_HID] = &string_phone_hid,
+	};
+
+	if (string_index == 0) {
+		return (&usb_string_lang_en);
+	}
+	if (lang_id != 0x0409) {
+		return (NULL);
+	}
+	if (string_index < INDEX_PHONE_MAX) {
+		return (ptr[string_index]);
+	}
+	return (NULL);
+}
diff --git a/sys/dev/usb/usb_debug.c b/sys/dev/usb/usb_debug.c
index 338298835b80..9c7fa6e1d062 100644
--- a/sys/dev/usb/usb_debug.c
+++ b/sys/dev/usb/usb_debug.c
@@ -67,9 +67,8 @@
 int	usb_debug = 0;
 
 SYSCTL_NODE(_hw, OID_AUTO, usb, CTLFLAG_RW, 0, "USB debugging");
-SYSCTL_INT(_hw_usb, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb, OID_AUTO, debug, CTLFLAG_RWTUN,
     &usb_debug, 0, "Debug level");
-TUNABLE_INT("hw.usb.debug", &usb_debug);
 
 #ifdef USB_DEBUG
 /*
@@ -78,44 +77,34 @@ TUNABLE_INT("hw.usb.debug", &usb_debug);
 static SYSCTL_NODE(_hw_usb, OID_AUTO, timings, CTLFLAG_RW, 0, "Timings");
 static int usb_timings_sysctl_handler(SYSCTL_HANDLER_ARGS);
 
-TUNABLE_INT("hw.usb.timings.port_reset_delay", (int *)&usb_port_reset_delay);
-SYSCTL_PROC(_hw_usb_timings, OID_AUTO, port_reset_delay, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_PROC(_hw_usb_timings, OID_AUTO, port_reset_delay, CTLTYPE_UINT | CTLFLAG_RWTUN,
     &usb_port_reset_delay, sizeof(usb_port_reset_delay),
     usb_timings_sysctl_handler, "IU", "Port Reset Delay");
-TUNABLE_INT("hw.usb.timings.port_root_reset_delay", (int *)&usb_port_root_reset_delay);
-SYSCTL_PROC(_hw_usb_timings, OID_AUTO, port_root_reset_delay, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_PROC(_hw_usb_timings, OID_AUTO, port_root_reset_delay, CTLTYPE_UINT | CTLFLAG_RWTUN,
     &usb_port_root_reset_delay, sizeof(usb_port_root_reset_delay),
     usb_timings_sysctl_handler, "IU", "Root Port Reset Delay");
-TUNABLE_INT("hw.usb.timings.port_reset_recovery", (int *)&usb_port_reset_recovery);
-SYSCTL_PROC(_hw_usb_timings, OID_AUTO, port_reset_recovery, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_PROC(_hw_usb_timings, OID_AUTO, port_reset_recovery, CTLTYPE_UINT | CTLFLAG_RWTUN,
     &usb_port_reset_recovery, sizeof(usb_port_reset_recovery),
     usb_timings_sysctl_handler, "IU", "Port Reset Recovery");
-TUNABLE_INT("hw.usb.timings.port_powerup_delay", (int *)&usb_port_powerup_delay);
-SYSCTL_PROC(_hw_usb_timings, OID_AUTO, port_powerup_delay, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_PROC(_hw_usb_timings, OID_AUTO, port_powerup_delay, CTLTYPE_UINT | CTLFLAG_RWTUN,
     &usb_port_powerup_delay, sizeof(usb_port_powerup_delay),
     usb_timings_sysctl_handler, "IU", "Port PowerUp Delay");
-TUNABLE_INT("hw.usb.timings.port_resume_delay", (int *)&usb_port_resume_delay);
-SYSCTL_PROC(_hw_usb_timings, OID_AUTO, port_resume_delay, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_PROC(_hw_usb_timings, OID_AUTO, port_resume_delay, CTLTYPE_UINT | CTLFLAG_RWTUN,
     &usb_port_resume_delay, sizeof(usb_port_resume_delay),
     usb_timings_sysctl_handler, "IU", "Port Resume Delay");
-TUNABLE_INT("hw.usb.timings.set_address_settle", (int *)&usb_set_address_settle);
-SYSCTL_PROC(_hw_usb_timings, OID_AUTO, set_address_settle, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_PROC(_hw_usb_timings, OID_AUTO, set_address_settle, CTLTYPE_UINT | CTLFLAG_RWTUN,
     &usb_set_address_settle, sizeof(usb_set_address_settle),
     usb_timings_sysctl_handler, "IU", "Set Address Settle");
-TUNABLE_INT("hw.usb.timings.resume_delay", (int *)&usb_resume_delay);
-SYSCTL_PROC(_hw_usb_timings, OID_AUTO, resume_delay, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_PROC(_hw_usb_timings, OID_AUTO, resume_delay, CTLTYPE_UINT | CTLFLAG_RWTUN,
     &usb_resume_delay, sizeof(usb_resume_delay),
     usb_timings_sysctl_handler, "IU", "Resume Delay");
-TUNABLE_INT("hw.usb.timings.resume_wait", (int *)&usb_resume_wait);
-SYSCTL_PROC(_hw_usb_timings, OID_AUTO, resume_wait, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_PROC(_hw_usb_timings, OID_AUTO, resume_wait, CTLTYPE_UINT | CTLFLAG_RWTUN,
     &usb_resume_wait, sizeof(usb_resume_wait),
     usb_timings_sysctl_handler, "IU", "Resume Wait");
-TUNABLE_INT("hw.usb.timings.resume_recovery", (int *)&usb_resume_recovery);
-SYSCTL_PROC(_hw_usb_timings, OID_AUTO, resume_recovery, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_PROC(_hw_usb_timings, OID_AUTO, resume_recovery, CTLTYPE_UINT | CTLFLAG_RWTUN,
     &usb_resume_recovery, sizeof(usb_resume_recovery),
     usb_timings_sysctl_handler, "IU", "Resume Recovery");
-TUNABLE_INT("hw.usb.timings.extra_power_up_time", (int *)&usb_extra_power_up_time);
-SYSCTL_PROC(_hw_usb_timings, OID_AUTO, extra_power_up_time, CTLTYPE_UINT | CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_PROC(_hw_usb_timings, OID_AUTO, extra_power_up_time, CTLTYPE_UINT | CTLFLAG_RWTUN,
     &usb_extra_power_up_time, sizeof(usb_extra_power_up_time),
     usb_timings_sysctl_handler, "IU", "Extra PowerUp Time");
 #endif
diff --git a/sys/dev/usb/usb_dev.c b/sys/dev/usb/usb_dev.c
index 6ad02a7d035d..396067309ac4 100644
--- a/sys/dev/usb/usb_dev.c
+++ b/sys/dev/usb/usb_dev.c
@@ -86,9 +86,8 @@
 static int usb_fifo_debug = 0;
 
 static SYSCTL_NODE(_hw_usb, OID_AUTO, dev, CTLFLAG_RW, 0, "USB device");
-SYSCTL_INT(_hw_usb_dev, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_dev, OID_AUTO, debug, CTLFLAG_RWTUN,
     &usb_fifo_debug, 0, "Debug Level");
-TUNABLE_INT("hw.usb.dev.debug", &usb_fifo_debug);
 #endif
 
 #if ((__FreeBSD_version >= 700001) || (__FreeBSD_version == 0) || \
diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c
index 7acb5cbc4f7d..baf02334b77c 100644
--- a/sys/dev/usb/usb_device.c
+++ b/sys/dev/usb/usb_device.c
@@ -118,8 +118,7 @@ int	usb_template = USB_TEMPLATE;
 int	usb_template;
 #endif
 
-TUNABLE_INT("hw.usb.usb_template", &usb_template);
-SYSCTL_INT(_hw_usb, OID_AUTO, template, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb, OID_AUTO, template, CTLFLAG_RWTUN,
     &usb_template, 0, "Selected USB device side template");
 
 /* English is default language */
@@ -127,12 +126,10 @@ SYSCTL_INT(_hw_usb, OID_AUTO, template, CTLFLAG_RW | CTLFLAG_TUN,
 static int usb_lang_id = 0x0009;
 static int usb_lang_mask = 0x00FF;
 
-TUNABLE_INT("hw.usb.usb_lang_id", &usb_lang_id);
-SYSCTL_INT(_hw_usb, OID_AUTO, usb_lang_id, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb, OID_AUTO, usb_lang_id, CTLFLAG_RWTUN,
     &usb_lang_id, 0, "Preferred USB language ID");
 
-TUNABLE_INT("hw.usb.usb_lang_mask", &usb_lang_mask);
-SYSCTL_INT(_hw_usb, OID_AUTO, usb_lang_mask, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb, OID_AUTO, usb_lang_mask, CTLFLAG_RWTUN,
     &usb_lang_mask, 0, "Preferred USB language mask");
 
 static const char* statestr[USB_STATE_MAX] = {
@@ -451,6 +448,17 @@ usb_endpoint_foreach(struct usb_device *udev, struct usb_endpoint *ep)
 	return (NULL);
 }
 
+#if USB_HAVE_UGEN
+static uint16_t
+usb_get_refcount(struct usb_device *udev)
+{
+	if (usb_proc_is_called_from(USB_BUS_EXPLORE_PROC(udev->bus)) ||
+	    usb_proc_is_called_from(USB_BUS_CONTROL_XFER_PROC(udev->bus)))
+		return (1);
+	return (2);
+}
+#endif
+
 /*------------------------------------------------------------------------*
  *	usb_wait_pending_ref_locked
  *
@@ -463,9 +471,7 @@ static void
 usb_wait_pending_ref_locked(struct usb_device *udev)
 {
 #if USB_HAVE_UGEN
-	const uint16_t refcount =
-	    usb_proc_is_called_from(
-	    USB_BUS_EXPLORE_PROC(udev->bus)) ? 1 : 2;
+	const uint16_t refcount = usb_get_refcount(udev);
 
 	DPRINTF("Refcount = %d\n", (int)refcount); 
 
@@ -496,9 +502,7 @@ static void
 usb_ref_restore_locked(struct usb_device *udev)
 {
 #if USB_HAVE_UGEN
-	const uint16_t refcount =
-	    usb_proc_is_called_from(
-	    USB_BUS_EXPLORE_PROC(udev->bus)) ? 1 : 2;
+	const uint16_t refcount = usb_get_refcount(udev);
 
 	DPRINTF("Refcount = %d\n", (int)refcount); 
 
diff --git a/sys/dev/usb/usb_generic.c b/sys/dev/usb/usb_generic.c
index 4ebd557a5182..96dfe8bceb87 100644
--- a/sys/dev/usb/usb_generic.c
+++ b/sys/dev/usb/usb_generic.c
@@ -131,9 +131,8 @@ struct usb_fifo_methods usb_ugen_methods = {
 static int ugen_debug = 0;
 
 static SYSCTL_NODE(_hw_usb, OID_AUTO, ugen, CTLFLAG_RW, 0, "USB generic");
-SYSCTL_INT(_hw_usb_ugen, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN, &ugen_debug,
+SYSCTL_INT(_hw_usb_ugen, OID_AUTO, debug, CTLFLAG_RWTUN, &ugen_debug,
     0, "Debug level");
-TUNABLE_INT("hw.usb.ugen.debug", &ugen_debug);
 #endif
 
 
diff --git a/sys/dev/usb/usb_hub.c b/sys/dev/usb/usb_hub.c
index e9c9a42c3914..8e0d557a9c5f 100644
--- a/sys/dev/usb/usb_hub.c
+++ b/sys/dev/usb/usb_hub.c
@@ -86,9 +86,8 @@ enum {
 static int uhub_debug = 0;
 
 static SYSCTL_NODE(_hw_usb, OID_AUTO, uhub, CTLFLAG_RW, 0, "USB HUB");
-SYSCTL_INT(_hw_usb_uhub, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN, &uhub_debug, 0,
+SYSCTL_INT(_hw_usb_uhub, OID_AUTO, debug, CTLFLAG_RWTUN, &uhub_debug, 0,
     "Debug level");
-TUNABLE_INT("hw.usb.uhub.debug", &uhub_debug);
 #endif
 
 #if USB_HAVE_POWERD
diff --git a/sys/dev/usb/usb_ioctl.h b/sys/dev/usb/usb_ioctl.h
index 277ba19ca3cd..9af9303154a7 100644
--- a/sys/dev/usb/usb_ioctl.h
+++ b/sys/dev/usb/usb_ioctl.h
@@ -64,6 +64,7 @@ enum {
 	USB_TEMP_AUDIO,		/* USB Audio */
 	USB_TEMP_KBD,		/* USB Keyboard */
 	USB_TEMP_MOUSE,		/* USB Mouse */
+	USB_TEMP_PHONE,		/* USB Phone */
 	USB_TEMP_MAX,
 };
 
diff --git a/sys/dev/usb/usb_msctest.c b/sys/dev/usb/usb_msctest.c
index f0cb1a560fce..1a8c675e60f4 100644
--- a/sys/dev/usb/usb_msctest.c
+++ b/sys/dev/usb/usb_msctest.c
@@ -103,6 +103,9 @@ static uint8_t scsi_cmotech_eject[] =   { 0xff, 0x52, 0x44, 0x45, 0x56, 0x43,
 static uint8_t scsi_huawei_eject[] =	{ 0x11, 0x06, 0x00, 0x00, 0x00, 0x00,
 					  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 					  0x00, 0x00, 0x00, 0x00 };
+static uint8_t scsi_huawei_eject2[] =	{ 0x11, 0x06, 0x20, 0x00, 0x00, 0x01,
+					  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+					  0x00, 0x00, 0x00, 0x00 };
 static uint8_t scsi_tct_eject[] =	{ 0x06, 0xf5, 0x04, 0x02, 0x52, 0x70 };
 static uint8_t scsi_sync_cache[] =	{ 0x35, 0x00, 0x00, 0x00, 0x00, 0x00,
 					  0x00, 0x00, 0x00, 0x00 };
@@ -485,6 +488,7 @@ bbb_command_start(struct bbb_transfer *sc, uint8_t dir, uint8_t lun,
 	sc->data_rem = data_len;
 	sc->data_timeout = (data_timeout + USB_MS_HZ);
 	sc->actlen = 0;
+	sc->error = 0;
 	sc->cmd_len = cmd_len;
 	memset(&sc->cbw->CBWCDB, 0, sizeof(sc->cbw->CBWCDB));
 	memcpy(&sc->cbw->CBWCDB, cmd_ptr, cmd_len);
@@ -839,6 +843,11 @@ usb_msc_eject(struct usb_device *udev, uint8_t iface_index, int method)
 		    &scsi_huawei_eject, sizeof(scsi_huawei_eject),
 		    USB_MS_HZ);
 		break;
+	case MSC_EJECT_HUAWEI2:
+		err = bbb_command_start(sc, DIR_IN, 0, NULL, 0,
+		    &scsi_huawei_eject2, sizeof(scsi_huawei_eject2),
+		    USB_MS_HZ);
+		break;
 	case MSC_EJECT_TCT:
 		/*
 		 * TCTMobile needs DIR_IN flag. To get it, we
@@ -850,9 +859,10 @@ usb_msc_eject(struct usb_device *udev, uint8_t iface_index, int method)
 		break;
 	default:
 		DPRINTF("Unknown eject method (%d)\n", method);
-		err = 0;
-		break;
+		bbb_detach(sc);
+		return (USB_ERR_INVAL);
 	}
+
 	DPRINTF("Eject CD command status: %s\n", usbd_errstr(err));
 
 	bbb_detach(sc);
diff --git a/sys/dev/usb/usb_msctest.h b/sys/dev/usb/usb_msctest.h
index 3644022afdf4..dcc3cf7e8ccd 100644
--- a/sys/dev/usb/usb_msctest.h
+++ b/sys/dev/usb/usb_msctest.h
@@ -33,6 +33,7 @@ enum {
 	MSC_EJECT_ZTESTOR,
 	MSC_EJECT_CMOTECH,
 	MSC_EJECT_HUAWEI,
+	MSC_EJECT_HUAWEI2,
 	MSC_EJECT_TCT,
 };
 
diff --git a/sys/dev/usb/usb_process.c b/sys/dev/usb/usb_process.c
index e70166ca4f2c..683c700d2472 100644
--- a/sys/dev/usb/usb_process.c
+++ b/sys/dev/usb/usb_process.c
@@ -90,9 +90,8 @@ static int usb_pcount;
 static int usb_proc_debug;
 
 static SYSCTL_NODE(_hw_usb, OID_AUTO, proc, CTLFLAG_RW, 0, "USB process");
-SYSCTL_INT(_hw_usb_proc, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN, &usb_proc_debug, 0,
+SYSCTL_INT(_hw_usb_proc, OID_AUTO, debug, CTLFLAG_RWTUN, &usb_proc_debug, 0,
     "Debug level");
-TUNABLE_INT("hw.usb.proc.debug", &usb_proc_debug);
 #endif
 
 /*------------------------------------------------------------------------*
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 2bd62a507e9d..50452938a1a8 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1379,6 +1379,7 @@ product CHIC CYPRESS		0x0003	Cypress USB Mouse
 product CHICONY KB8933		0x0001	KB-8933 keyboard
 product CHICONY KU0325		0x0116	KU-0325 keyboard
 product CHICONY CNF7129		0xb071	Notebook Web Camera
+product CHICONY HDUVCCAM	0xb40a	HD UVC WebCam
 product	CHICONY RTL8188CUS_1	0xaff7	RTL8188CUS
 product	CHICONY RTL8188CUS_2	0xaff8	RTL8188CUS
 product	CHICONY RTL8188CUS_3	0xaff9	RTL8188CUS
@@ -2342,9 +2343,11 @@ product HUAWEI E392		0x1505	LTE modem
 product HUAWEI E3131		0x1506	3G modem
 product HUAWEI K3765_INIT	0x1520	K3765 Initial
 product HUAWEI K4505_INIT	0x1521	K4505 Initial
+product HUAWEI E3272_INIT	0x155b	LTE modem initial
 product HUAWEI ETS2055		0x1803	CDMA modem
 product HUAWEI E173		0x1c05	3G modem
 product HUAWEI E173_INIT	0x1c0b	3G modem initial
+product HUAWEI E3272		0x1c1e	LTE modem
 
 /* HUAWEI 3com products */
 product HUAWEI3COM WUB320G	0x0009	Aolynk WUB320g
@@ -3231,6 +3234,7 @@ product NOVATEL EU740		0x2410	Expedite EU740
 product NOVATEL EU870D		0x2420	Expedite EU870D
 product NOVATEL U727		0x4100	Merlin U727 CDMA
 product NOVATEL MC950D		0x4400	Novatel MC950D HSUPA
+product NOVATEL MC990D		0x7001	Novatel MC990D
 product NOVATEL ZEROCD		0x5010	Novatel ZeroCD
 product NOVATEL MIFI2200V	0x5020	Novatel MiFi 2200 CDMA Virgin Mobile
 product NOVATEL ZEROCD2		0x5030	Novatel ZeroCD
@@ -3239,6 +3243,7 @@ product NOVATEL U727_2		0x5100	Merlin U727 CDMA
 product NOVATEL U760		0x6000	Novatel U760
 product NOVATEL MC760		0x6002	Novatel MC760
 product NOVATEL MC547		0x7042	Novatel MC547
+product NOVATEL MC679		0x7031	Novatel MC679
 product NOVATEL2 FLEXPACKGPS	0x0100	NovAtel FlexPack GPS receiver
 
 /* Merlin products */
diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c
index 1b45c35a4e17..700f72afac53 100644
--- a/sys/dev/usb/wlan/if_rum.c
+++ b/sys/dev/usb/wlan/if_rum.c
@@ -1035,6 +1035,8 @@ rum_setup_tx_desc(struct rum_softc *sc, struct rum_tx_desc *desc,
 		desc->plcp_length_hi = plcp_length >> 6;
 		desc->plcp_length_lo = plcp_length & 0x3f;
 	} else {
+		if (rate == 0)
+			rate = 2;	/* avoid division by zero */
 		plcp_length = (16 * len + rate - 1) / rate;
 		if (rate == 22) {
 			remainder = (16 * len) % 22;
diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c
index 9db1e04ce3de..b8e886388f72 100644
--- a/sys/dev/usb/wlan/if_uath.c
+++ b/sys/dev/usb/wlan/if_uath.c
@@ -115,18 +115,16 @@ __FBSDID("$FreeBSD$");
 static SYSCTL_NODE(_hw_usb, OID_AUTO, uath, CTLFLAG_RW, 0, "USB Atheros");
 
 static	int uath_countrycode = CTRY_DEFAULT;	/* country code */
-SYSCTL_INT(_hw_usb_uath, OID_AUTO, countrycode, CTLFLAG_RW | CTLFLAG_TUN, &uath_countrycode,
+SYSCTL_INT(_hw_usb_uath, OID_AUTO, countrycode, CTLFLAG_RWTUN, &uath_countrycode,
     0, "country code");
-TUNABLE_INT("hw.usb.uath.countrycode", &uath_countrycode);
 static	int uath_regdomain = 0;			/* regulatory domain */
 SYSCTL_INT(_hw_usb_uath, OID_AUTO, regdomain, CTLFLAG_RD, &uath_regdomain,
     0, "regulatory domain");
 
 #ifdef UATH_DEBUG
 int uath_debug = 0;
-SYSCTL_INT(_hw_usb_uath, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN, &uath_debug, 0,
+SYSCTL_INT(_hw_usb_uath, OID_AUTO, debug, CTLFLAG_RWTUN, &uath_debug, 0,
     "uath debug level");
-TUNABLE_INT("hw.usb.uath.debug", &uath_debug);
 enum {
 	UATH_DEBUG_XMIT		= 0x00000001,	/* basic xmit operation */
 	UATH_DEBUG_XMIT_DUMP	= 0x00000002,	/* xmit dump */
diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c
index a860a2b6910b..a84644d6e921 100644
--- a/sys/dev/usb/wlan/if_upgt.c
+++ b/sys/dev/usb/wlan/if_upgt.c
@@ -76,9 +76,8 @@ static SYSCTL_NODE(_hw, OID_AUTO, upgt, CTLFLAG_RD, 0,
 
 #ifdef UPGT_DEBUG
 int upgt_debug = 0;
-SYSCTL_INT(_hw_upgt, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN, &upgt_debug,
+SYSCTL_INT(_hw_upgt, OID_AUTO, debug, CTLFLAG_RWTUN, &upgt_debug,
 	    0, "control debugging printfs");
-TUNABLE_INT("hw.upgt.debug", &upgt_debug);
 enum {
 	UPGT_DEBUG_XMIT		= 0x00000001,	/* basic xmit operation */
 	UPGT_DEBUG_RECV		= 0x00000002,	/* basic recv operation */
@@ -429,7 +428,7 @@ upgt_get_stats(struct upgt_softc *sc)
 
 	data_cmd = upgt_getbuf(sc);
 	if (data_cmd == NULL) {
-		device_printf(sc->sc_dev, "%s: out of buffer.\n", __func__);
+		device_printf(sc->sc_dev, "%s: out of buffers.\n", __func__);
 		return;
 	}
 
diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c
index cf1da4a57813..6145ff86c26d 100644
--- a/sys/dev/usb/wlan/if_ural.c
+++ b/sys/dev/usb/wlan/if_ural.c
@@ -1038,6 +1038,8 @@ ural_setup_tx_desc(struct ural_softc *sc, struct ural_tx_desc *desc,
 		desc->plcp_length_hi = plcp_length >> 6;
 		desc->plcp_length_lo = plcp_length & 0x3f;
 	} else {
+		if (rate == 0)
+			rate = 2;	/* avoid division by zero */
 		plcp_length = (16 * len + rate - 1) / rate;
 		if (rate == 22) {
 			remainder = (16 * len) % 22;
diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c
index a5516339fb41..d2837324b63f 100644
--- a/sys/dev/usb/wlan/if_urtw.c
+++ b/sys/dev/usb/wlan/if_urtw.c
@@ -65,9 +65,8 @@ __FBSDID("$FreeBSD$");
 static SYSCTL_NODE(_hw_usb, OID_AUTO, urtw, CTLFLAG_RW, 0, "USB Realtek 8187L");
 #ifdef URTW_DEBUG
 int urtw_debug = 0;
-SYSCTL_INT(_hw_usb_urtw, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN, &urtw_debug, 0,
+SYSCTL_INT(_hw_usb_urtw, OID_AUTO, debug, CTLFLAG_RWTUN, &urtw_debug, 0,
     "control debugging printfs");
-TUNABLE_INT("hw.usb.urtw.debug", &urtw_debug);
 enum {
 	URTW_DEBUG_XMIT		= 0x00000001,	/* basic xmit operation */
 	URTW_DEBUG_RECV		= 0x00000002,	/* basic recv operation */
@@ -90,9 +89,8 @@ enum {
 } while (0)
 #endif
 static int urtw_preamble_mode = URTW_PREAMBLE_MODE_LONG;
-SYSCTL_INT(_hw_usb_urtw, OID_AUTO, preamble_mode, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_usb_urtw, OID_AUTO, preamble_mode, CTLFLAG_RWTUN,
     &urtw_preamble_mode, 0, "set the preable mode (long or short)");
-TUNABLE_INT("hw.usb.urtw.preamble_mode", &urtw_preamble_mode);
 
 /* recognized device vendors/products */
 #define urtw_lookup(v, p)						\
diff --git a/sys/dev/usb/wlan/if_urtwn.c b/sys/dev/usb/wlan/if_urtwn.c
index 6d18ae00784f..f09a70fe68d1 100644
--- a/sys/dev/usb/wlan/if_urtwn.c
+++ b/sys/dev/usb/wlan/if_urtwn.c
@@ -2281,9 +2281,6 @@ urtwn_fw_reset(struct urtwn_softc *sc)
 	}
 	/* Force 8051 reset. */
 	urtwn_write_2(sc, R92C_SYS_FUNC_EN, reg & ~R92C_SYS_FUNC_EN_CPUEN);
-	urtwn_write_2(sc, R92C_SYS_FUNC_EN,
-	    urtwn_read_2(sc, R92C_SYS_FUNC_EN) |
-	    R92C_SYS_FUNC_EN_CPUEN);
 }
 
 static void
@@ -2383,6 +2380,11 @@ urtwn_load_firmware(struct urtwn_softc *sc)
 		urtwn_write_1(sc, R92C_MCUFWDL, 0);
 	}
 
+	if (!(sc->chip & URTWN_CHIP_88E)) {
+		urtwn_write_2(sc, R92C_SYS_FUNC_EN,
+		    urtwn_read_2(sc, R92C_SYS_FUNC_EN) |
+		    R92C_SYS_FUNC_EN_CPUEN);
+	}
 	urtwn_write_1(sc, R92C_MCUFWDL,
 	    urtwn_read_1(sc, R92C_MCUFWDL) | R92C_MCUFWDL_EN);
 	urtwn_write_1(sc, R92C_MCUFWDL + 2,
diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c
index def2550d0f37..1e06d1512d18 100644
--- a/sys/dev/usb/wlan/if_zyd.c
+++ b/sys/dev/usb/wlan/if_zyd.c
@@ -2480,7 +2480,7 @@ zyd_tx_start(struct zyd_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
 	const struct ieee80211_txparam *tp;
 	struct ieee80211_key *k;
 	int rate, totlen;
-	static uint8_t ratediv[] = ZYD_TX_RATEDIV;
+	static const uint8_t ratediv[] = ZYD_TX_RATEDIV;
 	uint8_t phy;
 	uint16_t pktlen;
 	uint32_t bits;
diff --git a/sys/dev/usb/wlan/if_zydreg.h b/sys/dev/usb/wlan/if_zydreg.h
index 970a3e82dd13..05d94e399709 100644
--- a/sys/dev/usb/wlan/if_zydreg.h
+++ b/sys/dev/usb/wlan/if_zydreg.h
@@ -970,7 +970,7 @@
 
 #define	ZYD_TX_RATEDIV							\
 {									\
-	0x1, 0x2, 0xb, 0xb, 0x0, 0x0, 0x0, 0x0, 0x30, 0x18, 0xc, 0x6,	\
+	0x1, 0x2, 0xb, 0xb, 0x1, 0x1, 0x1, 0x1, 0x30, 0x18, 0xc, 0x6,	\
 	0x36, 0x24, 0x12, 0x9						\
 }
 
diff --git a/sys/dev/virtio/balloon/virtio_balloon.c b/sys/dev/virtio/balloon/virtio_balloon.c
index a90a653901da..6d00ef38bfa3 100644
--- a/sys/dev/virtio/balloon/virtio_balloon.c
+++ b/sys/dev/virtio/balloon/virtio_balloon.c
@@ -438,8 +438,7 @@ vtballoon_alloc_page(struct vtballoon_softc *sc)
 {
 	vm_page_t m;
 
-	m = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL | VM_ALLOC_WIRED |
-	    VM_ALLOC_NOOBJ);
+	m = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ);
 	if (m != NULL)
 		sc->vtballoon_current_npages++;
 
@@ -450,7 +449,6 @@ static void
 vtballoon_free_page(struct vtballoon_softc *sc, vm_page_t m)
 {
 
-	vm_page_unwire(m, 0);
 	vm_page_free(m);
 	sc->vtballoon_current_npages--;
 }
diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c
index 34c146433337..2a1fa3cb4771 100644
--- a/sys/dev/virtio/network/if_vtnet.c
+++ b/sys/dev/virtio/network/if_vtnet.c
@@ -128,6 +128,8 @@ static int	vtnet_rxq_eof(struct vtnet_rxq *);
 static void	vtnet_rx_vq_intr(void *);
 static void	vtnet_rxq_tq_intr(void *, int);
 
+static int	vtnet_txq_below_threshold(struct vtnet_txq *);
+static int	vtnet_txq_notify(struct vtnet_txq *);
 static void	vtnet_txq_free_mbufs(struct vtnet_txq *);
 static int	vtnet_txq_offload_ctx(struct vtnet_txq *, struct mbuf *,
 		    int *, int *, int *);
@@ -149,7 +151,7 @@ static void	vtnet_txq_tq_deferred(void *, int);
 #endif
 static void	vtnet_txq_start(struct vtnet_txq *);
 static void	vtnet_txq_tq_intr(void *, int);
-static void	vtnet_txq_eof(struct vtnet_txq *);
+static int	vtnet_txq_eof(struct vtnet_txq *);
 static void	vtnet_tx_vq_intr(void *);
 static void	vtnet_tx_start_all(struct vtnet_softc *);
 
@@ -206,6 +208,8 @@ static void	vtnet_ifmedia_sts(struct ifnet *, struct ifmediareq *);
 static void	vtnet_get_hwaddr(struct vtnet_softc *);
 static void	vtnet_set_hwaddr(struct vtnet_softc *);
 static void	vtnet_vlan_tag_remove(struct mbuf *);
+static void	vtnet_set_rx_process_limit(struct vtnet_softc *);
+static void	vtnet_set_tx_intr_threshold(struct vtnet_softc *);
 
 static void	vtnet_setup_rxq_sysctl(struct sysctl_ctx_list *,
 		    struct sysctl_oid_list *, struct vtnet_rxq *);
@@ -241,19 +245,6 @@ TUNABLE_INT("hw.vtnet.mq_max_pairs", &vtnet_mq_max_pairs);
 static int vtnet_rx_process_limit = 512;
 TUNABLE_INT("hw.vtnet.rx_process_limit", &vtnet_rx_process_limit);
 
-/*
- * Reducing the number of transmit completed interrupts can improve
- * performance. To do so, the define below keeps the Tx vq interrupt
- * disabled and adds calls to vtnet_txeof() in the start and watchdog
- * paths. The price to pay for this is the m_free'ing of transmitted
- * mbufs may be delayed until the watchdog fires.
- *
- * BMV: Reintroduce this later as a run-time option, if it makes
- * sense after the EVENT_IDX feature is supported.
- *
- * #define VTNET_TX_INTR_MODERATION
- */
-
 static uma_zone_t vtnet_tx_header_zone;
 
 static struct virtio_feature_desc vtnet_feature_desc[] = {
@@ -552,37 +543,38 @@ vtnet_negotiate_features(struct vtnet_softc *sc)
 		mask |= VTNET_TSO_FEATURES;
 	if (vtnet_tunable_int(sc, "lro_disable", vtnet_lro_disable))
 		mask |= VTNET_LRO_FEATURES;
+#ifndef VTNET_LEGACY_TX
 	if (vtnet_tunable_int(sc, "mq_disable", vtnet_mq_disable))
 		mask |= VIRTIO_NET_F_MQ;
-#ifdef VTNET_LEGACY_TX
+#else
 	mask |= VIRTIO_NET_F_MQ;
 #endif
 
 	features = VTNET_FEATURES & ~mask;
 	sc->vtnet_features = virtio_negotiate_features(dev, features);
 
-	if (virtio_with_feature(dev, VTNET_LRO_FEATURES) == 0)
-		return;
-	if (virtio_with_feature(dev, VIRTIO_NET_F_MRG_RXBUF))
-		return;
+	if (virtio_with_feature(dev, VTNET_LRO_FEATURES) &&
+	    virtio_with_feature(dev, VIRTIO_NET_F_MRG_RXBUF) == 0) {
+		/*
+		 * LRO without mergeable buffers requires special care. This
+		 * is not ideal because every receive buffer must be large
+		 * enough to hold the maximum TCP packet, the Ethernet header,
+		 * and the header. This requires up to 34 descriptors with
+		 * MCLBYTES clusters. If we do not have indirect descriptors,
+		 * LRO is disabled since the virtqueue will not contain very
+		 * many receive buffers.
+		 */
+		if (!virtio_with_feature(dev, VIRTIO_RING_F_INDIRECT_DESC)) {
+			device_printf(dev,
+			    "LRO disabled due to both mergeable buffers and "
+			    "indirect descriptors not negotiated\n");
 
-	/*
-	 * LRO without mergeable buffers requires special care. This is not
-	 * ideal because every receive buffer must be large enough to hold
-	 * the maximum TCP packet, the Ethernet header, and the header. This
-	 * requires up to 34 descriptors with MCLBYTES clusters. If we do
-	 * not have indirect descriptors, LRO is disabled since the virtqueue
-	 * will not contain very many receive buffers.
-	 */
-	if (virtio_with_feature(dev, VIRTIO_RING_F_INDIRECT_DESC) == 0) {
-		device_printf(dev,
-		    "LRO disabled due to both mergeable buffers and indirect "
-		    "descriptors not negotiated\n");
-
-		features &= ~VTNET_LRO_FEATURES;
-		sc->vtnet_features = virtio_negotiate_features(dev, features);
-	} else
-		sc->vtnet_flags |= VTNET_FLAG_LRO_NOMRG;
+			features &= ~VTNET_LRO_FEATURES;
+			sc->vtnet_features =
+			    virtio_negotiate_features(dev, features);
+		} else
+			sc->vtnet_flags |= VTNET_FLAG_LRO_NOMRG;
+	}
 }
 
 static void
@@ -902,7 +894,6 @@ vtnet_setup_interface(struct vtnet_softc *sc)
 {
 	device_t dev;
 	struct ifnet *ifp;
-	int limit;
 
 	dev = sc->vtnet_dev;
 
@@ -1001,11 +992,8 @@ vtnet_setup_interface(struct vtnet_softc *sc)
 		    vtnet_unregister_vlan, sc, EVENTHANDLER_PRI_FIRST);
 	}
 
-	limit = vtnet_tunable_int(sc, "rx_process_limit",
-	    vtnet_rx_process_limit);
-	if (limit < 0)
-		limit = INT_MAX;
-	sc->vtnet_rx_process_limit = limit;
+	vtnet_set_rx_process_limit(sc);
+	vtnet_set_tx_intr_threshold(sc);
 
 	return (0);
 }
@@ -1896,6 +1884,44 @@ vtnet_rxq_tq_intr(void *xrxq, int pending)
 	VTNET_RXQ_UNLOCK(rxq);
 }
 
+static int
+vtnet_txq_below_threshold(struct vtnet_txq *txq)
+{
+	struct vtnet_softc *sc;
+	struct virtqueue *vq;
+
+	sc = txq->vtntx_sc;
+	vq = txq->vtntx_vq;
+
+	return (virtqueue_nfree(vq) <= sc->vtnet_tx_intr_thresh);
+}
+
+static int
+vtnet_txq_notify(struct vtnet_txq *txq)
+{
+	struct virtqueue *vq;
+
+	vq = txq->vtntx_vq;
+
+	txq->vtntx_watchdog = VTNET_TX_TIMEOUT;
+	virtqueue_notify(vq);
+
+	if (vtnet_txq_enable_intr(txq) == 0)
+		return (0);
+
+	/*
+	 * Drain frames that were completed since last checked. If this
+	 * causes the queue to go above the threshold, the caller should
+	 * continue transmitting.
+	 */
+	if (vtnet_txq_eof(txq) != 0 && vtnet_txq_below_threshold(txq) == 0) {
+		virtqueue_disable_intr(vq);
+		return (1);
+	}
+
+	return (0);
+}
+
 static void
 vtnet_txq_free_mbufs(struct vtnet_txq *txq)
 {
@@ -2113,13 +2139,11 @@ vtnet_txq_enqueue_buf(struct vtnet_txq *txq, struct mbuf **m_head,
 static int
 vtnet_txq_encap(struct vtnet_txq *txq, struct mbuf **m_head)
 {
-	struct vtnet_softc *sc;
 	struct vtnet_tx_header *txhdr;
 	struct virtio_net_hdr *hdr;
 	struct mbuf *m;
 	int error;
 
-	sc = txq->vtntx_sc;
 	m = *m_head;
 	M_ASSERTPKTHDR(m);
 
@@ -2172,11 +2196,11 @@ vtnet_start_locked(struct vtnet_txq *txq, struct ifnet *ifp)
 	struct vtnet_softc *sc;
 	struct virtqueue *vq;
 	struct mbuf *m0;
-	int enq;
+	int tries, enq;
 
 	sc = txq->vtntx_sc;
 	vq = txq->vtntx_vq;
-	enq = 0;
+	tries = 0;
 
 	VTNET_TXQ_LOCK_ASSERT(txq);
 
@@ -2186,6 +2210,9 @@ vtnet_start_locked(struct vtnet_txq *txq, struct ifnet *ifp)
 
 	vtnet_txq_eof(txq);
 
+again:
+	enq = 0;
+
 	while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) {
 		if (virtqueue_full(vq))
 			break;
@@ -2204,9 +2231,12 @@ vtnet_start_locked(struct vtnet_txq *txq, struct ifnet *ifp)
 		ETHER_BPF_MTAP(ifp, m0);
 	}
 
-	if (enq > 0) {
-		virtqueue_notify(vq);
-		txq->vtntx_watchdog = VTNET_TX_TIMEOUT;
+	if (enq > 0 && vtnet_txq_notify(txq) != 0) {
+		if (tries++ < VTNET_NOTIFY_RETRIES)
+			goto again;
+
+		txq->vtntx_stats.vtxs_rescheduled++;
+		taskqueue_enqueue(txq->vtntx_tq, &txq->vtntx_intrtask);
 	}
 }
 
@@ -2233,13 +2263,13 @@ vtnet_txq_mq_start_locked(struct vtnet_txq *txq, struct mbuf *m)
 	struct virtqueue *vq;
 	struct buf_ring *br;
 	struct ifnet *ifp;
-	int enq, error;
+	int enq, tries, error;
 
 	sc = txq->vtntx_sc;
 	vq = txq->vtntx_vq;
 	br = txq->vtntx_br;
 	ifp = sc->vtnet_ifp;
-	enq = 0;
+	tries = 0;
 	error = 0;
 
 	VTNET_TXQ_LOCK_ASSERT(txq);
@@ -2259,14 +2289,16 @@ vtnet_txq_mq_start_locked(struct vtnet_txq *txq, struct mbuf *m)
 
 	vtnet_txq_eof(txq);
 
+again:
+	enq = 0;
+
 	while ((m = drbr_peek(ifp, br)) != NULL) {
 		if (virtqueue_full(vq)) {
 			drbr_putback(ifp, br, m);
 			break;
 		}
 
-		error = vtnet_txq_encap(txq, &m);
-		if (error) {
+		if (vtnet_txq_encap(txq, &m) != 0) {
 			if (m != NULL)
 				drbr_putback(ifp, br, m);
 			else
@@ -2279,9 +2311,12 @@ vtnet_txq_mq_start_locked(struct vtnet_txq *txq, struct mbuf *m)
 		ETHER_BPF_MTAP(ifp, m);
 	}
 
-	if (enq > 0) {
-		virtqueue_notify(vq);
-		txq->vtntx_watchdog = VTNET_TX_TIMEOUT;
+	if (enq > 0 && vtnet_txq_notify(txq) != 0) {
+		if (tries++ < VTNET_NOTIFY_RETRIES)
+			goto again;
+
+		txq->vtntx_stats.vtxs_rescheduled++;
+		taskqueue_enqueue(txq->vtntx_tq, &txq->vtntx_intrtask);
 	}
 
 	return (0);
@@ -2369,30 +2404,26 @@ vtnet_txq_tq_intr(void *xtxq, int pending)
 	}
 
 	vtnet_txq_eof(txq);
-
 	vtnet_txq_start(txq);
 
-	if (vtnet_txq_enable_intr(txq) != 0) {
-		vtnet_txq_disable_intr(txq);
-		txq->vtntx_stats.vtxs_rescheduled++;
-		taskqueue_enqueue(txq->vtntx_tq, &txq->vtntx_intrtask);
-	}
-
 	VTNET_TXQ_UNLOCK(txq);
 }
 
-static void
+static int
 vtnet_txq_eof(struct vtnet_txq *txq)
 {
 	struct virtqueue *vq;
 	struct vtnet_tx_header *txhdr;
 	struct mbuf *m;
+	int deq;
 
 	vq = txq->vtntx_vq;
+	deq = 0;
 	VTNET_TXQ_LOCK_ASSERT(txq);
 
 	while ((txhdr = virtqueue_dequeue(vq, NULL)) != NULL) {
 		m = txhdr->vth_mbuf;
+		deq++;
 
 		txq->vtntx_stats.vtxs_opackets++;
 		txq->vtntx_stats.vtxs_obytes += m->m_pkthdr.len;
@@ -2405,6 +2436,8 @@ vtnet_txq_eof(struct vtnet_txq *txq)
 
 	if (virtqueue_empty(vq))
 		txq->vtntx_watchdog = 0;
+
+	return (deq);
 }
 
 static void
@@ -2413,12 +2446,10 @@ vtnet_tx_vq_intr(void *xtxq)
 	struct vtnet_softc *sc;
 	struct vtnet_txq *txq;
 	struct ifnet *ifp;
-	int tries;
 
 	txq = xtxq;
 	sc = txq->vtntx_sc;
 	ifp = sc->vtnet_ifp;
-	tries = 0;
 
 	if (__predict_false(txq->vtntx_id >= sc->vtnet_act_vq_pairs)) {
 		/*
@@ -2433,30 +2464,15 @@ vtnet_tx_vq_intr(void *xtxq)
 
 	VTNET_TXQ_LOCK(txq);
 
-again:
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
 		VTNET_TXQ_UNLOCK(txq);
 		return;
 	}
 
 	vtnet_txq_eof(txq);
-
 	vtnet_txq_start(txq);
 
-	if (vtnet_txq_enable_intr(txq) != 0) {
-		vtnet_txq_disable_intr(txq);
-		/*
-		 * This is an occasional race, so retry a few times
-		 * before scheduling the taskqueue.
-		 */
-		if (tries++ < VTNET_INTR_DISABLE_RETRIES)
-			goto again;
-
-		VTNET_TXQ_UNLOCK(txq);
-		txq->vtntx_stats.vtxs_rescheduled++;
-		taskqueue_enqueue(txq->vtntx_tq, &txq->vtntx_intrtask);
-	} else
-		VTNET_TXQ_UNLOCK(txq);
+	VTNET_TXQ_UNLOCK(txq);
 }
 
 static void
@@ -2503,21 +2519,31 @@ vtnet_qflush(struct ifnet *ifp)
 static int
 vtnet_watchdog(struct vtnet_txq *txq)
 {
-	struct vtnet_softc *sc;
+	struct ifnet *ifp;
 
-	sc = txq->vtntx_sc;
+	ifp = txq->vtntx_sc->vtnet_ifp;
 
 	VTNET_TXQ_LOCK(txq);
-	if (sc->vtnet_flags & VTNET_FLAG_EVENT_IDX)
-		vtnet_txq_eof(txq);
+	if (txq->vtntx_watchdog == 1) {
+		/*
+		 * Only drain completed frames if the watchdog is about to
+		 * expire. If any frames were drained, there may be enough
+		 * free descriptors now available to transmit queued frames.
+		 * In that case, the timer will immediately be decremented
+		 * below, but the timeout is generous enough that should not
+		 * be a problem.
+		 */
+		if (vtnet_txq_eof(txq) != 0)
+			vtnet_txq_start(txq);
+	}
+
 	if (txq->vtntx_watchdog == 0 || --txq->vtntx_watchdog) {
 		VTNET_TXQ_UNLOCK(txq);
 		return (0);
 	}
 	VTNET_TXQ_UNLOCK(txq);
 
-	if_printf(sc->vtnet_ifp, "watchdog timeout on queue %d\n",
-	    txq->vtntx_id);
+	if_printf(ifp, "watchdog timeout on queue %d\n", txq->vtntx_id);
 	return (1);
 }
 
@@ -2946,11 +2972,9 @@ vtnet_set_active_vq_pairs(struct vtnet_softc *sc)
 static int
 vtnet_reinit(struct vtnet_softc *sc)
 {
-	device_t dev;
 	struct ifnet *ifp;
 	int error;
 
-	dev = sc->vtnet_dev;
 	ifp = sc->vtnet_ifp;
 
 	/* Use the current MAC address. */
@@ -3071,7 +3095,7 @@ vtnet_exec_ctrl_cmd(struct vtnet_softc *sc, void *cookie,
 static int
 vtnet_ctrl_mac_cmd(struct vtnet_softc *sc, uint8_t *hwaddr)
 {
-	struct virtio_net_ctrl_hdr hdr;
+	struct virtio_net_ctrl_hdr hdr __aligned(2);
 	struct sglist_seg segs[3];
 	struct sglist sg;
 	uint8_t ack;
@@ -3105,7 +3129,7 @@ vtnet_ctrl_mq_cmd(struct vtnet_softc *sc, uint16_t npairs)
 		struct virtio_net_ctrl_mq mq;
 		uint8_t pad2;
 		uint8_t ack;
-	} s;
+	} s __aligned(2);
 	int error;
 
 	s.hdr.class = VIRTIO_NET_CTRL_MQ;
@@ -3137,7 +3161,7 @@ vtnet_ctrl_rx_cmd(struct vtnet_softc *sc, int cmd, int on)
 		uint8_t onoff;
 		uint8_t pad2;
 		uint8_t ack;
-	} s;
+	} s __aligned(2);
 	int error;
 
 	KASSERT(sc->vtnet_flags & VTNET_FLAG_CTRL_RX,
@@ -3220,7 +3244,7 @@ vtnet_rx_filter(struct vtnet_softc *sc)
 static void
 vtnet_rx_filter_mac(struct vtnet_softc *sc)
 {
-	struct virtio_net_ctrl_hdr hdr;
+	struct virtio_net_ctrl_hdr hdr __aligned(2);
 	struct vtnet_mac_filter *filter;
 	struct sglist_seg segs[4];
 	struct sglist sg;
@@ -3333,7 +3357,7 @@ vtnet_exec_vlan_filter(struct vtnet_softc *sc, int add, uint16_t tag)
 		uint16_t tag;
 		uint8_t pad2;
 		uint8_t ack;
-	} s;
+	} s __aligned(2);
 	int error;
 
 	s.hdr.class = VIRTIO_NET_CTRL_VLAN;
@@ -3568,6 +3592,50 @@ vtnet_vlan_tag_remove(struct mbuf *m)
 	m_adj(m, ETHER_VLAN_ENCAP_LEN);
 }
 
+static void
+vtnet_set_rx_process_limit(struct vtnet_softc *sc)
+{
+	int limit;
+
+	limit = vtnet_tunable_int(sc, "rx_process_limit",
+	    vtnet_rx_process_limit);
+	if (limit < 0)
+		limit = INT_MAX;
+	sc->vtnet_rx_process_limit = limit;
+}
+
+static void
+vtnet_set_tx_intr_threshold(struct vtnet_softc *sc)
+{
+	device_t dev;
+	int size, thresh;
+
+	dev = sc->vtnet_dev;
+	size = virtqueue_size(sc->vtnet_txqs[0].vtntx_vq);
+
+	/*
+	 * The Tx interrupt is disabled until the queue free count falls
+	 * below our threshold. Completed frames are drained from the Tx
+	 * virtqueue before transmitting new frames and in the watchdog
+	 * callout, so the frequency of Tx interrupts is greatly reduced,
+	 * at the cost of not freeing mbufs as quickly as they otherwise
+	 * would be.
+	 *
+	 * N.B. We assume all the Tx queues are the same size.
+	 */
+	thresh = size / 4;
+
+	/*
+	 * Without indirect descriptors, leave enough room for the most
+	 * segments we handle.
+	 */
+	if (virtio_with_feature(dev, VIRTIO_RING_F_INDIRECT_DESC) == 0 &&
+	    thresh < sc->vtnet_tx_nsegs)
+		thresh = sc->vtnet_tx_nsegs;
+
+	sc->vtnet_tx_intr_thresh = thresh;
+}
+
 static void
 vtnet_setup_rxq_sysctl(struct sysctl_ctx_list *ctx,
     struct sysctl_oid_list *child, struct vtnet_rxq *rxq)
@@ -3763,8 +3831,18 @@ vtnet_rxq_disable_intr(struct vtnet_rxq *rxq)
 static int
 vtnet_txq_enable_intr(struct vtnet_txq *txq)
 {
+	struct virtqueue *vq;
 
-	return (virtqueue_postpone_intr(txq->vtntx_vq, VQ_POSTPONE_LONG));
+	vq = txq->vtntx_vq;
+
+	if (vtnet_txq_below_threshold(txq) != 0)
+		return (virtqueue_postpone_intr(vq, VQ_POSTPONE_LONG));
+
+	/*
+	 * The free count is above our threshold. Keep the Tx interrupt
+	 * disabled until the queue is fuller.
+	 */
+	return (0);
 }
 
 static void
diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h
index aa6d6341b438..7249a3e083f1 100644
--- a/sys/dev/virtio/network/if_vtnetvar.h
+++ b/sys/dev/virtio/network/if_vtnetvar.h
@@ -74,7 +74,6 @@ struct vtnet_rxq {
 	struct virtqueue	*vtnrx_vq;
 	struct sglist		*vtnrx_sg;
 	int			 vtnrx_id;
-	int			 vtnrx_process_limit;
 	struct vtnet_rxq_stats	 vtnrx_stats;
 	struct taskqueue	*vtnrx_tq;
 	struct task		 vtnrx_intrtask;
@@ -150,6 +149,7 @@ struct vtnet_softc {
 	int			 vtnet_rx_nmbufs;
 	int			 vtnet_rx_clsize;
 	int			 vtnet_rx_new_clsize;
+	int			 vtnet_tx_intr_thresh;
 	int			 vtnet_tx_nsegs;
 	int			 vtnet_if_flags;
 	int			 vtnet_act_vq_pairs;
@@ -183,6 +183,14 @@ struct vtnet_softc {
  */
 #define VTNET_INTR_DISABLE_RETRIES	4
 
+/*
+ * Similarly, additional completed entries can appear in a virtqueue
+ * between when lasted checked and before notifying the host. Number
+ * of times to retry before scheduling the taskqueue to process the
+ * queue.
+ */
+#define VTNET_NOTIFY_RETRIES		4
+
 /*
  * Fake the media type. The host does not provide us with any real media
  * information.
diff --git a/sys/dev/virtio/pci/virtio_pci.c b/sys/dev/virtio/pci/virtio_pci.c
index 497abc88363d..e5a03320017d 100644
--- a/sys/dev/virtio/pci/virtio_pci.c
+++ b/sys/dev/virtio/pci/virtio_pci.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcireg.h>
 
 #include <dev/virtio/virtio.h>
-#include <dev/virtio/virtio_config.h>
 #include <dev/virtio/virtqueue.h>
 #include <dev/virtio/pci/virtio_pci.h>
 
@@ -170,6 +169,9 @@ static void	vtpci_config_intr(void *);
 
 #define vtpci_setup_msi_interrupt vtpci_setup_legacy_interrupt
 
+#define VIRTIO_PCI_CONFIG(_sc) \
+    VIRTIO_PCI_CONFIG_OFF((((_sc)->vtpci_flags & VTPCI_FLAG_MSIX)) != 0)
+
 /*
  * I/O port read/write wrappers.
  */
diff --git a/sys/dev/virtio/pci/virtio_pci.h b/sys/dev/virtio/pci/virtio_pci.h
index 485cf4ff5b1c..f071ad638d4c 100644
--- a/sys/dev/virtio/pci/virtio_pci.h
+++ b/sys/dev/virtio/pci/virtio_pci.h
@@ -72,8 +72,7 @@
  * The remaining space is defined by each driver as the per-driver
  * configuration space.
  */
-#define VIRTIO_PCI_CONFIG(sc) \
-    (((sc)->vtpci_flags & VTPCI_FLAG_MSIX) ? 24 : 20)
+#define VIRTIO_PCI_CONFIG_OFF(msix_enabled)     ((msix_enabled) ? 24 : 20)
 
 /*
  * How many bits to shift physical queue address written to QUEUE_PFN.
diff --git a/sys/dev/virtio/virtio.h b/sys/dev/virtio/virtio.h
index f4586e2479cb..05fb0c6ca5ea 100644
--- a/sys/dev/virtio/virtio.h
+++ b/sys/dev/virtio/virtio.h
@@ -30,6 +30,7 @@
 #define _VIRTIO_H_
 
 #include <dev/virtio/virtio_ids.h>
+#include <dev/virtio/virtio_config.h>
 
 struct vq_alloc_info;
 
diff --git a/sys/dev/virtio/virtio_config.h b/sys/dev/virtio/virtio_config.h
index 379b011bdb5e..88cdb8b83a9a 100644
--- a/sys/dev/virtio/virtio_config.h
+++ b/sys/dev/virtio/virtio_config.h
@@ -44,6 +44,12 @@
  */
 #define VIRTIO_F_NOTIFY_ON_EMPTY (1 << 24)
 
+/* Support for indirect buffer descriptors. */
+#define VIRTIO_RING_F_INDIRECT_DESC	(1 << 28)
+
+/* Support to suppress interrupt until specific index is reached. */
+#define VIRTIO_RING_F_EVENT_IDX		(1 << 29)
+
 /*
  * The guest should never negotiate this feature; it
  * is used to detect faulty drivers.
diff --git a/sys/dev/virtio/virtqueue.c b/sys/dev/virtio/virtqueue.c
index 1ccb36338532..79fe245fb8d8 100644
--- a/sys/dev/virtio/virtqueue.c
+++ b/sys/dev/virtio/virtqueue.c
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 
 #include <dev/virtio/virtio.h>
-#include <dev/virtio/virtio_config.h>
 #include <dev/virtio/virtqueue.h>
 #include <dev/virtio/virtio_ring.h>
 
@@ -375,6 +374,13 @@ virtqueue_size(struct virtqueue *vq)
 	return (vq->vq_nentries);
 }
 
+int
+virtqueue_nfree(struct virtqueue *vq)
+{
+
+	return (vq->vq_free_cnt);
+}
+
 int
 virtqueue_empty(struct virtqueue *vq)
 {
diff --git a/sys/dev/virtio/virtqueue.h b/sys/dev/virtio/virtqueue.h
index 0d4ed9468d22..cefb84845592 100644
--- a/sys/dev/virtio/virtqueue.h
+++ b/sys/dev/virtio/virtqueue.h
@@ -32,12 +32,6 @@
 struct virtqueue;
 struct sglist;
 
-/* Support for indirect buffer descriptors. */
-#define VIRTIO_RING_F_INDIRECT_DESC	(1 << 28)
-
-/* Support to suppress interrupt until specific index is reached. */
-#define VIRTIO_RING_F_EVENT_IDX		(1 << 29)
-
 /* Device callback for a virtqueue interrupt. */
 typedef void virtqueue_intr_t(void *);
 
@@ -92,6 +86,7 @@ vm_paddr_t virtqueue_paddr(struct virtqueue *vq);
 int	 virtqueue_full(struct virtqueue *vq);
 int	 virtqueue_empty(struct virtqueue *vq);
 int	 virtqueue_size(struct virtqueue *vq);
+int	 virtqueue_nfree(struct virtqueue *vq);
 int	 virtqueue_nused(struct virtqueue *vq);
 void	 virtqueue_notify(struct virtqueue *vq);
 void	 virtqueue_dump(struct virtqueue *vq);
diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c
index 1e761e499d15..f3fde92e3f7a 100644
--- a/sys/dev/vmware/vmxnet3/if_vmx.c
+++ b/sys/dev/vmware/vmxnet3/if_vmx.c
@@ -168,7 +168,6 @@ static int	vmxnet3_txq_load_mbuf(struct vmxnet3_txqueue *, struct mbuf **,
 		    bus_dmamap_t, bus_dma_segment_t [], int *);
 static void	vmxnet3_txq_unload_mbuf(struct vmxnet3_txqueue *, bus_dmamap_t);
 static int	vmxnet3_txq_encap(struct vmxnet3_txqueue *, struct mbuf **);
-static void	vmxnet3_txq_update_pending(struct vmxnet3_txqueue *);
 #ifdef VMXNET3_LEGACY_TX
 static void	vmxnet3_start_locked(struct ifnet *);
 static void	vmxnet3_start(struct ifnet *);
@@ -695,6 +694,8 @@ vmxnet3_setup_msix_interrupts(struct vmxnet3_softc *sc)
 		     vmxnet3_txq_intr, txq, &intr->vmxi_handler);
 		if (error)
 			return (error);
+		bus_describe_intr(dev, intr->vmxi_irq, intr->vmxi_handler,
+		    "tq%d", i);
 		txq->vxtxq_intr_idx = intr->vmxi_rid - 1;
 	}
 
@@ -704,6 +705,8 @@ vmxnet3_setup_msix_interrupts(struct vmxnet3_softc *sc)
 		    vmxnet3_rxq_intr, rxq, &intr->vmxi_handler);
 		if (error)
 			return (error);
+		bus_describe_intr(dev, intr->vmxi_irq, intr->vmxi_handler,
+		    "rq%d", i);
 		rxq->vxrxq_intr_idx = intr->vmxi_rid - 1;
 	}
 
@@ -711,6 +714,7 @@ vmxnet3_setup_msix_interrupts(struct vmxnet3_softc *sc)
 	    vmxnet3_event_intr, sc, &intr->vmxi_handler);
 	if (error)
 		return (error);
+	bus_describe_intr(dev, intr->vmxi_irq, intr->vmxi_handler, "event");
 	sc->vmx_event_intr_idx = intr->vmxi_rid - 1;
 
 	return (0);
@@ -2088,17 +2092,25 @@ vmxnet3_rxq_eof(struct vmxnet3_rxqueue *rxq)
 	sc = rxq->vxrxq_sc;
 	ifp = sc->vmx_ifp;
 	rxc = &rxq->vxrxq_comp_ring;
-	m_head = m_tail = NULL;
 
 	VMXNET3_RXQ_LOCK_ASSERT(rxq);
 
 	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
 		return;
 
+	m_head = rxq->vxrxq_mhead;
+	rxq->vxrxq_mhead = NULL;
+	m_tail = rxq->vxrxq_mtail;
+	rxq->vxrxq_mtail = NULL;
+	MPASS(m_head == NULL || m_tail != NULL);
+
 	for (;;) {
 		rxcd = &rxc->vxcr_u.rxcd[rxc->vxcr_next];
-		if (rxcd->gen != rxc->vxcr_gen)
+		if (rxcd->gen != rxc->vxcr_gen) {
+			rxq->vxrxq_mhead = m_head;
+			rxq->vxrxq_mtail = m_tail;
 			break;
+		}
 		vmxnet3_barrier(sc, VMXNET3_BARRIER_RD);
 
 		if (++rxc->vxcr_next == rxc->vxcr_ndesc) {
@@ -2214,12 +2226,10 @@ vmxnet3_legacy_intr(void *xsc)
 	struct vmxnet3_softc *sc;
 	struct vmxnet3_rxqueue *rxq;
 	struct vmxnet3_txqueue *txq;
-	struct ifnet *ifp;
 
 	sc = xsc;
 	rxq = &sc->vmx_rxq[0];
 	txq = &sc->vmx_txq[0];
-	ifp = sc->vmx_ifp;
 
 	if (sc->vmx_intr_type == VMXNET3_IT_LEGACY) {
 		if (vmxnet3_read_bar1(sc, VMXNET3_BAR1_INTR) == 0)
@@ -2248,11 +2258,9 @@ vmxnet3_txq_intr(void *xtxq)
 {
 	struct vmxnet3_softc *sc;
 	struct vmxnet3_txqueue *txq;
-	struct ifnet *ifp;
 
 	txq = xtxq;
 	sc = txq->vxtxq_sc;
-	ifp = sc->vmx_ifp;
 
 	if (sc->vmx_intr_mask_mode == VMXNET3_IMM_ACTIVE)
 		vmxnet3_disable_intr(sc, txq->vxtxq_intr_idx);
@@ -2330,6 +2338,12 @@ vmxnet3_rxstop(struct vmxnet3_softc *sc, struct vmxnet3_rxqueue *rxq)
 	struct vmxnet3_rxbuf *rxb;
 	int i, j;
 
+	if (rxq->vxrxq_mhead != NULL) {
+		m_freem(rxq->vxrxq_mhead);
+		rxq->vxrxq_mhead = NULL;
+		rxq->vxrxq_mtail = NULL;
+	}
+
 	for (i = 0; i < VMXNET3_RXRINGS_PERQ; i++) {
 		rxr = &rxq->vxrxq_cmd_ring[i];
 
@@ -2607,10 +2621,12 @@ vmxnet3_txq_offload_ctx(struct vmxnet3_txqueue *txq, struct mbuf *m,
 	struct ether_vlan_header *evh;
 	int offset;
 #if defined(INET)
-	struct ip *ip, iphdr;
+	struct ip *ip = NULL;
+	struct ip iphdr;
 #endif
 #if defined(INET6)
-	struct ip6_hdr *ip6, ip6hdr;
+	struct ip6_hdr *ip6 = NULL;
+	struct ip6_hdr ip6hdr;
 #endif
 
 	evh = mtod(m, struct ether_vlan_header *);
@@ -2754,7 +2770,6 @@ static int
 vmxnet3_txq_encap(struct vmxnet3_txqueue *txq, struct mbuf **m0)
 {
 	struct vmxnet3_softc *sc;
-	struct ifnet *ifp;
 	struct vmxnet3_txring *txr;
 	struct vmxnet3_txdesc *txd, *sop;
 	struct mbuf *m;
@@ -2763,7 +2778,6 @@ vmxnet3_txq_encap(struct vmxnet3_txqueue *txq, struct mbuf **m0)
 	int i, gen, nsegs, etype, proto, start, error;
 
 	sc = txq->vxtxq_sc;
-	ifp = sc->vmx_ifp;
 	start = 0;
 	txd = NULL;
 	txr = &txq->vxtxq_cmd_ring;
@@ -2841,7 +2855,8 @@ vmxnet3_txq_encap(struct vmxnet3_txqueue *txq, struct mbuf **m0)
 	vmxnet3_barrier(sc, VMXNET3_BARRIER_WR);
 	sop->gen ^= 1;
 
-	if (++txq->vxtxq_ts->npending >= txq->vxtxq_ts->intr_threshold) {
+	txq->vxtxq_ts->npending += nsegs;
+	if (txq->vxtxq_ts->npending >= txq->vxtxq_ts->intr_threshold) {
 		txq->vxtxq_ts->npending = 0;
 		vmxnet3_write_bar0(sc, VMXNET3_BAR0_TXH(txq->vxtxq_id),
 		    txr->vxtxr_head);
@@ -2850,20 +2865,6 @@ vmxnet3_txq_encap(struct vmxnet3_txqueue *txq, struct mbuf **m0)
 	return (0);
 }
 
-static void
-vmxnet3_txq_update_pending(struct vmxnet3_txqueue *txq)
-{
-	struct vmxnet3_txring *txr;
-
-	txr = &txq->vxtxq_cmd_ring;
-
-	if (txq->vxtxq_ts->npending > 0) {
-		txq->vxtxq_ts->npending = 0;
-		vmxnet3_write_bar0(txq->vxtxq_sc,
-		    VMXNET3_BAR0_TXH(txq->vxtxq_id), txr->vxtxr_head);
-	}
-}
-
 #ifdef VMXNET3_LEGACY_TX
 
 static void
@@ -2910,10 +2911,8 @@ vmxnet3_start_locked(struct ifnet *ifp)
 		ETHER_BPF_MTAP(ifp, m_head);
 	}
 
-	if (tx > 0) {
-		vmxnet3_txq_update_pending(txq);
+	if (tx > 0)
 		txq->vxtxq_watchdog = VMXNET3_WATCHDOG_TIMEOUT;
-	}
 }
 
 static void
@@ -2974,8 +2973,7 @@ vmxnet3_txq_mq_start_locked(struct vmxnet3_txqueue *txq, struct mbuf *m)
 			break;
 		}
 
-		error = vmxnet3_txq_encap(txq, &m);
-		if (error) {
+		if (vmxnet3_txq_encap(txq, &m) != 0) {
 			if (m != NULL)
 				drbr_putback(ifp, br, m);
 			else
@@ -2988,10 +2986,8 @@ vmxnet3_txq_mq_start_locked(struct vmxnet3_txqueue *txq, struct mbuf *m)
 		ETHER_BPF_MTAP(ifp, m);
 	}
 
-	if (tx > 0) {
-		vmxnet3_txq_update_pending(txq);
+	if (tx > 0)
 		txq->vxtxq_watchdog = VMXNET3_WATCHDOG_TIMEOUT;
-	}
 
 	return (0);
 }
@@ -3886,7 +3882,7 @@ vmxnet3_dma_free(struct vmxnet3_softc *sc, struct vmxnet3_dma_alloc *dma)
 {
 
 	if (dma->dma_tag != NULL) {
-		if (dma->dma_map != NULL) {
+		if (dma->dma_paddr != 0) {
 			bus_dmamap_sync(dma->dma_tag, dma->dma_map,
 			    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 			bus_dmamap_unload(dma->dma_tag, dma->dma_map);
diff --git a/sys/dev/vmware/vmxnet3/if_vmxvar.h b/sys/dev/vmware/vmxnet3/if_vmxvar.h
index 50eb1c3a124b..6c797214b2ee 100644
--- a/sys/dev/vmware/vmxnet3/if_vmxvar.h
+++ b/sys/dev/vmware/vmxnet3/if_vmxvar.h
@@ -168,6 +168,8 @@ struct vmxnet3_rxqueue {
 	struct vmxnet3_softc		*vxrxq_sc;
 	int				 vxrxq_id;
 	int				 vxrxq_intr_idx;
+	struct mbuf			*vxrxq_mhead;
+	struct mbuf			*vxrxq_mtail;
 	struct vmxnet3_rxring		 vxrxq_cmd_ring[VMXNET3_RXRINGS_PERQ];
 	struct vmxnet3_comp_ring	 vxrxq_comp_ring;
 	struct vmxnet3_rxq_stats	 vxrxq_stats;
diff --git a/sys/dev/vt/colors/vt_termcolors.c b/sys/dev/vt/colors/vt_termcolors.c
index e8608770875d..d8a59091d39a 100644
--- a/sys/dev/vt/colors/vt_termcolors.c
+++ b/sys/dev/vt/colors/vt_termcolors.c
@@ -39,25 +39,36 @@ static struct {
 	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 */
+	{0,	50,	0},	/* dark green */
+	{77,	63,	0},	/* dark yellow */
+	{20,	40,	64},	/* dark blue */
 	{50,	0,	50},	/* dark magenta */
-	{50,	50,	0},	/* brown */
+	{0,	50,	50},	/* dark cyan */
 	{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 */
+
+	{18,	20,	21},	/* dark gray */
 	{100,	0,	0},	/* light red */
+	{0,	100,	0},	/* light green */
+	{100,	100,	0},	/* light yellow */
+	{45,	62,	81},	/* light blue */
 	{100,	0,	100},	/* light magenta */
-	{100,	100,	0},	/* yellow */
+	{0,	100,	100},	/* light cyan */
 	{100,	100,	100},	/* white */
 };
 
+/*
+ * Between console's palette and VGA's one:
+ *   - blue and red are swapped (1 <-> 4)
+ *   - yellow ad cyan are swapped (3 <-> 6)
+ */
+static const int cons_to_vga_colors[16] = {
+	0, 4, 2, 6, 1, 5, 3, 7,
+	0, 4, 2, 6, 1, 5, 3, 7
+};
+
 int
-vt_generate_vga_palette(uint32_t *palette, int format, uint32_t rmax, int roffset,
+vt_generate_cons_palette(uint32_t *palette, int format, uint32_t rmax, int roffset,
     uint32_t gmax, int goffset, uint32_t bmax, int boffset)
 {
 	int i;
@@ -66,7 +77,7 @@ vt_generate_vga_palette(uint32_t *palette, int format, uint32_t rmax, int roffse
 	for (i = 0; i < 16; i++) {
 		switch (format) {
 		case COLOR_FORMAT_VGA:
-			palette[i] = i;
+			palette[i] = cons_to_vga_colors[i];
 			break;
 		case COLOR_FORMAT_RGB:
 			palette[i] = CF(r, i) | CF(g, i) | CF(b, i);
diff --git a/sys/dev/vt/colors/vt_termcolors.h b/sys/dev/vt/colors/vt_termcolors.h
index 2ae7049301de..fd54733dd320 100644
--- a/sys/dev/vt/colors/vt_termcolors.h
+++ b/sys/dev/vt/colors/vt_termcolors.h
@@ -45,6 +45,6 @@ enum vt_color_format {
 };
 
 /* Helper to fill color map used by driver */
-int vt_generate_vga_palette(uint32_t *palette, int format, uint32_t rmax,
+int vt_generate_cons_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/hw/efifb/efifb.c b/sys/dev/vt/hw/efifb/efifb.c
index 683cecbabc4d..35deded59f16 100644
--- a/sys/dev/vt/hw/efifb/efifb.c
+++ b/sys/dev/vt/hw/efifb/efifb.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 
 static vd_init_t vt_efifb_init;
 static vd_probe_t vt_efifb_probe;
+static void vt_efifb_remap(void *efifb_data);
 
 static struct vt_driver vt_efifb_driver = {
 	.vd_name = "efifb",
@@ -60,7 +61,8 @@ static struct vt_driver vt_efifb_driver = {
 	.vd_init = vt_efifb_init,
 	.vd_blank = vt_fb_blank,
 	.vd_bitbltchr = vt_fb_bitbltchr,
-	.vd_maskbitbltchr = vt_fb_maskbitbltchr,
+	.vd_fb_ioctl = vt_fb_ioctl,
+	.vd_fb_mmap = vt_fb_mmap,
 	/* Better than VGA, but still generic driver. */
 	.vd_priority = VD_PRIORITY_GENERIC + 1,
 };
@@ -68,6 +70,8 @@ static struct vt_driver vt_efifb_driver = {
 static struct fb_info local_info;
 VT_DRIVER_DECLARE(vt_efifb, vt_efifb_driver);
 
+SYSINIT(efifb_remap, SI_SUB_KMEM, SI_ORDER_ANY, vt_efifb_remap, &local_info);
+
 static int
 vt_efifb_probe(struct vt_device *vd)
 {
@@ -94,7 +98,7 @@ vt_efifb_probe(struct vt_device *vd)
 static int
 vt_efifb_init(struct vt_device *vd)
 {
-	int		depth, d, i, len;
+	int		depth, d;
 	struct fb_info	*info;
 	struct efi_fb	*efifb;
 	caddr_t		kmdp;
@@ -125,7 +129,7 @@ vt_efifb_init(struct vt_device *vd)
 
 	info->fb_stride = efifb->fb_stride * (depth / 8);
 
-	vt_generate_vga_palette(info->fb_cmap, COLOR_FORMAT_RGB,
+	vt_generate_cons_palette(info->fb_cmap, COLOR_FORMAT_RGB,
 	    efifb->fb_mask_red, ffs(efifb->fb_mask_red) - 1,
 	    efifb->fb_mask_green, ffs(efifb->fb_mask_green) - 1,
 	    efifb->fb_mask_blue, ffs(efifb->fb_mask_blue) - 1);
@@ -133,18 +137,12 @@ vt_efifb_init(struct vt_device *vd)
 	info->fb_size = info->fb_height * info->fb_stride;
 	info->fb_pbase = efifb->fb_addr;
 	/*
-	 * We could use pmap_mapdev here except that the kernel pmap
-	 * hasn't been created yet and hence any attempt to lock it will
-	 * fail.
+	 * Use the direct map as a crutch until pmap is available. Once pmap
+	 * is online, the framebuffer will be remapped by vt_efifb_remap()
+	 * using pmap_mapdev_attr().
 	 */
 	info->fb_vbase = PHYS_TO_DMAP(efifb->fb_addr);
 
-	/* 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;
 
@@ -155,11 +153,26 @@ vt_efifb_init(struct vt_device *vd)
 	info->fb_width = MIN(info->fb_width, VT_FB_DEFAULT_WIDTH);
 	info->fb_height = MIN(info->fb_height, VT_FB_DEFAULT_HEIGHT);
 
-	fb_probe(info);
 	vt_fb_init(vd);
 
-	/* Clear the screen. */
-	vt_fb_blank(vd, TC_BLACK);
-
 	return (CN_INTERNAL);
 }
+
+static void
+vt_efifb_remap(void *xinfo)
+{
+	struct fb_info *info = xinfo;
+
+	if (info->fb_pbase == 0)
+		return;
+
+	/*
+	 * Remap as write-combining. This massively improves performance and
+	 * happens very early in kernel initialization, when everything is
+	 * still single-threaded and interrupts are off, so replacing the
+	 * mapping address is safe.
+	 */
+	info->fb_vbase = (intptr_t)pmap_mapdev_attr(info->fb_pbase,
+	    info->fb_size, VM_MEMATTR_WRITE_COMBINING);
+}
+
diff --git a/sys/dev/vt/hw/fb/vt_early_fb.c b/sys/dev/vt/hw/fb/vt_early_fb.c
index 64b2122f3ee3..a618ca3bd00c 100644
--- a/sys/dev/vt/hw/fb/vt_early_fb.c
+++ b/sys/dev/vt/hw/fb/vt_early_fb.c
@@ -90,25 +90,25 @@ vt_efb_initialize(struct fb_info *info)
 	 */
 	switch (info->fb_depth) {
 	case 8:
-		vt_generate_vga_palette(info->fb_cmap, COLOR_FORMAT_RGB,
+		vt_generate_cons_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,
+		vt_generate_cons_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,
+		vt_generate_cons_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,
+		vt_generate_cons_palette(info->fb_cmap,
 		    COLOR_FORMAT_RGB, 255, 0, 255, 8, 255, 16);
+#else
+		vt_generate_cons_palette(info->fb_cmap,
+		    COLOR_FORMAT_RGB, 255, 16, 255, 8, 255, 0);
 #endif
 #ifdef	FDT
 		for (i = 0; i < 16; i++) {
@@ -296,7 +296,6 @@ vt_efb_init(struct vt_device *vd)
 #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
index 3ffba40a1adb..3dd356415b40 100644
--- a/sys/dev/vt/hw/fb/vt_fb.c
+++ b/sys/dev/vt/hw/fb/vt_fb.c
@@ -41,10 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/vt/hw/fb/vt_fb.h>
 #include <dev/vt/colors/vt_termcolors.h>
 
-static int vt_fb_ioctl(struct vt_device *vd, u_long cmd, caddr_t data,
-    struct thread *td);
-static int vt_fb_mmap(struct vt_device *vd, vm_ooffset_t offset,
-    vm_paddr_t *paddr, int prot, vm_memattr_t *memattr);
 void vt_fb_drawrect(struct vt_device *vd, int x1, int y1, int x2, int y2,
     int fill, term_color_t color);
 void vt_fb_setpixel(struct vt_device *vd, int x, int y, term_color_t color);
@@ -54,7 +50,6 @@ static struct vt_driver vt_fb_driver = {
 	.vd_init = vt_fb_init,
 	.vd_blank = vt_fb_blank,
 	.vd_bitbltchr = vt_fb_bitbltchr,
-	.vd_maskbitbltchr = vt_fb_maskbitbltchr,
 	.vd_drawrect = vt_fb_drawrect,
 	.vd_setpixel = vt_fb_setpixel,
 	.vd_postswitch = vt_fb_postswitch,
@@ -65,20 +60,71 @@ static struct vt_driver vt_fb_driver = {
 
 VT_DRIVER_DECLARE(vt_fb, vt_fb_driver);
 
-static int
+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;
+}
+
+int
 vt_fb_ioctl(struct vt_device *vd, u_long cmd, caddr_t data, struct thread *td)
 {
 	struct fb_info *info;
+	int error = 0;
 
 	info = vd->vd_softc;
 
-	if (info->fb_ioctl == NULL)
-		return (-1);
+	switch (cmd) {
+	case FBIOGTYPE:
+		bcopy(info, (struct fbtype *)data, sizeof(struct fbtype));
+		break;
 
-	return (info->fb_ioctl(info->fb_cdev, cmd, data, 0, td));
+	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 */
+		if (vd->vd_driver->vd_blank == NULL)
+			return (ENODEV);
+		vd->vd_driver->vd_blank(vd, TC_BLACK);
+		break;
+
+	default:
+		error = ENOIOCTL;
+		break;
+	}
+
+	return (error);
 }
 
-static int
+int
 vt_fb_mmap(struct vt_device *vd, vm_ooffset_t offset, vm_paddr_t *paddr,
     int prot, vm_memattr_t *memattr)
 {
@@ -86,10 +132,18 @@ vt_fb_mmap(struct vt_device *vd, vm_ooffset_t offset, vm_paddr_t *paddr,
 
 	info = vd->vd_softc;
 
-	if (info->fb_ioctl == NULL)
-		return (ENXIO);
+	if (info->fb_flags & FB_FLAG_NOMMAP)
+		return (ENODEV);
 
-	return (info->fb_mmap(info->fb_cdev, offset, paddr, prot, memattr));
+	if (offset >= 0 && offset < info->fb_size) {
+		*paddr = info->fb_pbase + offset;
+	#ifdef VM_MEMATTR_WRITE_COMBINING
+		*memattr = VM_MEMATTR_WRITE_COMBINING;
+	#endif
+		return (0);
+	}
+
+	return (EINVAL);
 }
 
 void
@@ -103,20 +157,22 @@ vt_fb_setpixel(struct vt_device *vd, int x, int y, term_color_t color)
 	c = info->fb_cmap[color];
 	o = info->fb_stride * y + x * FBTYPE_GET_BYTESPP(info);
 
+	KASSERT((info->fb_vbase != 0), ("Unmapped framebuffer"));
+
 	switch (FBTYPE_GET_BYTESPP(info)) {
 	case 1:
-		info->wr1(info, o, c);
+		vt_fb_mem_wr1(info, o, c);
 		break;
 	case 2:
-		info->wr2(info, o, c);
+		vt_fb_mem_wr2(info, o, c);
 		break;
 	case 3:
-		info->wr1(info, o, (c >> 16) & 0xff);
-		info->wr1(info, o + 1, (c >> 8) & 0xff);
-		info->wr1(info, o + 2, c & 0xff);
+		vt_fb_mem_wr1(info, o, (c >> 16) & 0xff);
+		vt_fb_mem_wr1(info, o + 1, (c >> 8) & 0xff);
+		vt_fb_mem_wr1(info, o + 2, c & 0xff);
 		break;
 	case 4:
-		info->wr4(info, o, c);
+		vt_fb_mem_wr4(info, o, c);
 		break;
 	default:
 		/* panic? */
@@ -147,109 +203,50 @@ vt_fb_blank(struct vt_device *vd, term_color_t color)
 {
 	struct fb_info *info;
 	uint32_t c;
-	u_int o;
+	u_int o, h;
 
 	info = vd->vd_softc;
 	c = info->fb_cmap[color];
 
+	KASSERT((info->fb_vbase != 0), ("Unmapped framebuffer"));
+
 	switch (FBTYPE_GET_BYTESPP(info)) {
 	case 1:
-		for (o = 0; o < info->fb_stride; o++)
-			info->wr1(info, o, c);
+		for (h = 0; h < info->fb_height; h++)
+			for (o = 0; o < info->fb_stride; o++)
+				vt_fb_mem_wr1(info, h*info->fb_stride + o, c);
 		break;
 	case 2:
-		for (o = 0; o < info->fb_stride; o += 2)
-			info->wr2(info, o, c);
+		for (h = 0; h < info->fb_height; h++)
+			for (o = 0; o < info->fb_stride; o += 2)
+				vt_fb_mem_wr2(info, h*info->fb_stride + 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);
-		}
+		for (h = 0; h < info->fb_height; h++)
+			for (o = 0; o < info->fb_stride; o += 3) {
+				vt_fb_mem_wr1(info, h*info->fb_stride + o,
+				    (c >> 16) & 0xff);
+				vt_fb_mem_wr1(info, h*info->fb_stride + o + 1,
+				    (c >> 8) & 0xff);
+				vt_fb_mem_wr1(info, h*info->fb_stride + o + 2,
+				    c & 0xff);
+			}
 		break;
 	case 4:
-		for (o = 0; o < info->fb_stride; o += 4)
-			info->wr4(info, o, c);
+		for (h = 0; h < info->fb_height; h++)
+			for (o = 0; o < info->fb_stride; o += 4)
+				vt_fb_mem_wr4(info, h*info->fb_stride + 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;
-	const uint8_t *ch;
-
-	info = vd->vd_softc;
-	bpp = FBTYPE_GET_BYTESPP(info);
-	fgc = info->fb_cmap[fg];
-	bgc = info->fb_cmap[bg];
-	b = 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;
-			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_maskbitbltchr(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;
@@ -271,6 +268,8 @@ vt_fb_maskbitbltchr(struct vt_device *vd, const uint8_t *src, const uint8_t *mas
 	    info->fb_height))
 		return;
 
+	KASSERT((info->fb_vbase != 0), ("Unmapped framebuffer"));
+
 	line = (info->fb_stride * top) + (left * bpp);
 	for (l = 0; l < height; l++) {
 		ch = src;
@@ -293,19 +292,19 @@ vt_fb_maskbitbltchr(struct vt_device *vd, const uint8_t *src, const uint8_t *mas
 
 			switch(bpp) {
 			case 1:
-				info->wr1(info, o, cc);
+				vt_fb_mem_wr1(info, o, cc);
 				break;
 			case 2:
-				info->wr2(info, o, cc);
+				vt_fb_mem_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);
+				vt_fb_mem_wr1(info, o, (cc >> 16) & 0xff);
+				vt_fb_mem_wr1(info, o + 1, (cc >> 8) & 0xff);
+				vt_fb_mem_wr1(info, o + 2, cc & 0xff);
 				break;
 			case 4:
-				info->wr4(info, o, cc);
+				vt_fb_mem_wr4(info, o, cc);
 				break;
 			default:
 				/* panic? */
@@ -334,18 +333,18 @@ vt_fb_init_cmap(uint32_t *cmap, int depth)
 
 	switch (depth) {
 	case 8:
-		return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
+		return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB,
 		    0x7, 5, 0x7, 2, 0x3, 0));
 	case 15:
-		return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
+		return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB,
 		    0x1f, 10, 0x1f, 5, 0x1f, 0));
 	case 16:
-		return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
+		return (vt_generate_cons_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));
+		return (vt_generate_cons_palette(cmap, COLOR_FORMAT_RGB,
+		    0xff, 16, 0xff, 8, 0xff, 0));
 	default:
 		return (1);
 	}
@@ -361,6 +360,12 @@ vt_fb_init(struct vt_device *vd)
 	vd->vd_height = info->fb_height;
 	vd->vd_width = info->fb_width;
 
+	if (info->fb_size == 0)
+		return (CN_DEAD);
+
+	if (info->fb_pbase == 0)
+		info->fb_flags |= FB_FLAG_NOMMAP;
+
 	if (info->fb_cmsize <= 0) {
 		err = vt_fb_init_cmap(info->fb_cmap, FBTYPE_GET_BPP(info));
 		if (err)
@@ -369,7 +374,7 @@ vt_fb_init(struct vt_device *vd)
 	}
 
 	/* Clear the screen. */
-	vt_fb_blank(vd, TC_BLACK);
+	vd->vd_driver->vd_blank(vd, TC_BLACK);
 
 	/* Wakeup screen. KMS need this. */
 	vt_fb_postswitch(vd);
diff --git a/sys/dev/vt/hw/fb/vt_fb.h b/sys/dev/vt/hw/fb/vt_fb.h
index 10dd2389319a..2cbe8d5ab171 100644
--- a/sys/dev/vt/hw/fb/vt_fb.h
+++ b/sys/dev/vt/hw/fb/vt_fb.h
@@ -36,12 +36,11 @@ 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_maskbitbltchr_t vt_fb_maskbitbltchr;
 vd_postswitch_t	vt_fb_postswitch;
+vd_fb_ioctl_t	vt_fb_ioctl;
+vd_fb_mmap_t	vt_fb_mmap;
 
 #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
index d91feff957cf..6efd9de24a6c 100644
--- a/sys/dev/vt/hw/ofwfb/ofwfb.c
+++ b/sys/dev/vt/hw/ofwfb/ofwfb.c
@@ -30,8 +30,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.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>
 
 #include <vm/vm.h>
@@ -47,35 +49,25 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/ofw_pci.h>
 
 struct ofwfb_softc {
+	struct fb_info	fb;
+
 	phandle_t	sc_node;
-
-	struct ofw_pci_register sc_pciaddrs[8];
-	int		sc_num_pciaddrs;
-
-
-	intptr_t	sc_addr;
-	int		sc_depth;
-	int		sc_stride;
-
+	ihandle_t	sc_handle;
 	bus_space_tag_t	sc_memt; 
-
-	uint32_t	sc_colormap[16];
 };
 
 static vd_probe_t	ofwfb_probe;
 static vd_init_t	ofwfb_init;
-static vd_blank_t	ofwfb_blank;
 static vd_bitbltchr_t	ofwfb_bitbltchr;
-static vd_fb_mmap_t	ofwfb_mmap;
 
 static const struct vt_driver vt_ofwfb_driver = {
 	.vd_name	= "ofwfb",
 	.vd_probe	= ofwfb_probe,
 	.vd_init	= ofwfb_init,
-	.vd_blank	= ofwfb_blank,
+	.vd_blank	= vt_fb_blank,
 	.vd_bitbltchr	= ofwfb_bitbltchr,
-	.vd_maskbitbltchr = ofwfb_bitbltchr,
-	.vd_fb_mmap	= ofwfb_mmap,
+	.vd_fb_ioctl	= vt_fb_ioctl,
+	.vd_fb_mmap	= vt_fb_mmap,
 	.vd_priority	= VD_PRIORITY_GENERIC+1,
 };
 
@@ -107,37 +99,12 @@ ofwfb_probe(struct vt_device *vd)
 	return (CN_INTERNAL);
 }
 
-static void
-ofwfb_blank(struct vt_device *vd, term_color_t color)
-{
-	struct ofwfb_softc *sc = vd->vd_softc;
-	u_int ofs, size;
-	uint32_t c;
-
-	size = sc->sc_stride * vd->vd_height;
-	switch (sc->sc_depth) {
-	case 8:
-		c = (color << 24) | (color << 16) | (color << 8) | color;
-		for (ofs = 0; ofs < size/4; ofs++)
-			*(uint32_t *)(sc->sc_addr + 4*ofs) = c;
-		break;
-	case 32:
-		c = sc->sc_colormap[color];
-		for (ofs = 0; ofs < size; 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;
+	struct fb_info *sc = vd->vd_softc;
 	u_long line;
 	uint32_t fgc, bgc;
 	int c;
@@ -147,8 +114,8 @@ ofwfb_bitbltchr(struct vt_device *vd, const uint8_t *src, const uint8_t *mask,
 		uint8_t	 c[4];
 	} ch1, ch2;
 
-	fgc = sc->sc_colormap[fg];
-	bgc = sc->sc_colormap[bg];
+	fgc = sc->fb_cmap[fg];
+	bgc = sc->fb_cmap[bg];
 	b = m = 0;
 
 	/* Don't try to put off screen pixels */
@@ -156,8 +123,8 @@ ofwfb_bitbltchr(struct vt_device *vd, const uint8_t *src, const uint8_t *mask,
 	    vd->vd_height))
 		return;
 
-	line = (sc->sc_stride * top) + left * sc->sc_depth/8;
-	if (mask == NULL && sc->sc_depth == 8 && (width % 8 == 0)) {
+	line = (sc->fb_stride * top) + left * sc->fb_bpp/8;
+	if (mask == NULL && sc->fb_bpp == 8 && (width % 8 == 0)) {
 		for (; height > 0; height--) {
 			for (c = 0; c < width; c += 8) {
 				b = *src++;
@@ -183,11 +150,11 @@ ofwfb_bitbltchr(struct vt_device *vd, const uint8_t *src, const uint8_t *mask,
 				if (b & 0x02) ch2.c[2] = fg;
 				if (b & 0x01) ch2.c[3] = fg;
 
-				*(uint32_t *)(sc->sc_addr + line + c) = ch1.l;
-				*(uint32_t *)(sc->sc_addr + line + c + 4) =
+				*(uint32_t *)(sc->fb_vbase + line + c) = ch1.l;
+				*(uint32_t *)(sc->fb_vbase + line + c + 4) =
 				    ch2.l;
 			}
-			line += sc->sc_stride;
+			line += sc->fb_stride;
 		}
 	} else {
 		for (; height > 0; height--) {
@@ -205,13 +172,13 @@ ofwfb_bitbltchr(struct vt_device *vd, const uint8_t *src, const uint8_t *mask,
 					if ((m & 0x80) == 0)
 						continue;
 				}
-				switch(sc->sc_depth) {
+				switch(sc->fb_bpp) {
 				case 8:
-					*(uint8_t *)(sc->sc_addr + line + c) =
+					*(uint8_t *)(sc->fb_vbase + line + c) =
 					    b & 0x80 ? fg : bg;
 					break;
 				case 32:
-					*(uint32_t *)(sc->sc_addr + line + 4*c)
+					*(uint32_t *)(sc->fb_vbase + line + 4*c)
 					    = (b & 0x80) ? fgc : bgc;
 					break;
 				default:
@@ -219,7 +186,7 @@ ofwfb_bitbltchr(struct vt_device *vd, const uint8_t *src, const uint8_t *mask,
 					break;
 				}
 			}
-			line += sc->sc_stride;
+			line += sc->fb_stride;
 		}
 	}
 }
@@ -228,31 +195,24 @@ 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) {
+	switch (sc->fb.fb_bpp) {
 	case 8:
-		vt_generate_vga_palette(sc->sc_colormap, COLOR_FORMAT_RGB, 255,
-		    0, 255, 8, 255, 16);
+		vt_generate_cons_palette(sc->fb.fb_cmap, COLOR_FORMAT_RGB, 255,
+		    16, 255, 8, 255, 0);
 
 		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),
+			OF_call_method("color!", sc->sc_handle, 4, 1,
+			    (cell_t)((sc->fb.fb_cmap[i] >> 16) & 0xff),
+			    (cell_t)((sc->fb.fb_cmap[i] >> 8) & 0xff),
+			    (cell_t)((sc->fb.fb_cmap[i] >> 0) & 0xff),
 			    (cell_t)i, &retval);
 		}
 		break;
@@ -265,24 +225,23 @@ ofwfb_initialize(struct vt_device *vd)
 		 * 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,
+		oldpix = bus_space_read_4(sc->sc_memt, sc->fb.fb_vbase, 0);
+		bus_space_write_4(sc->sc_memt, sc->fb.fb_vbase, 0, 0xff000000);
+		if (*(uint8_t *)(sc->fb.fb_vbase) == 0xff)
+			vt_generate_cons_palette(sc->fb.fb_cmap,
 			    COLOR_FORMAT_RGB, 255, 0, 255, 8, 255, 16);
-		bus_space_write_4(sc->sc_memt, sc->sc_addr, 0, oldpix);
+		else
+			vt_generate_cons_palette(sc->fb.fb_cmap,
+			    COLOR_FORMAT_RGB, 255, 16, 255, 8, 255, 0);
+		bus_space_write_4(sc->sc_memt, sc->fb.fb_vbase, 0, oldpix);
 		break;
 
 	default:
-		panic("Unknown color space depth %d", sc->sc_depth);
+		panic("Unknown color space depth %d", sc->fb.fb_bpp);
 		break;
         }
 
-	/* Clear the screen. */
-	ofwfb_blank(vd, TC_BLACK);
+	sc->fb.fb_cmsize = 16;
 }
 
 static int
@@ -291,9 +250,8 @@ ofwfb_init(struct vt_device *vd)
 	struct ofwfb_softc *sc;
 	char type[64];
 	phandle_t chosen;
-	ihandle_t stdout;
 	phandle_t node;
-	uint32_t depth, height, width;
+	uint32_t depth, height, width, stride;
 	uint32_t fb_phys;
 	int i, len;
 #ifdef __sparc64__
@@ -306,14 +264,15 @@ ofwfb_init(struct vt_device *vd)
 	vd->vd_softc = sc = &ofwfb_conssoftc;
 
 	chosen = OF_finddevice("/chosen");
-	OF_getprop(chosen, "stdout", &stdout, sizeof(stdout));
-	node = OF_instance_to_package(stdout);
+	OF_getprop(chosen, "stdout", &sc->sc_handle, sizeof(ihandle_t));
+	node = OF_instance_to_package(sc->sc_handle);
 	if (node == -1) {
 		/*
 		 * The "/chosen/stdout" does not exist try
 		 * using "screen" directly.
 		 */
 		node = OF_finddevice("screen");
+		sc->sc_handle = OF_open("screen");
 	}
 	OF_getprop(node, "device_type", type, sizeof(type));
 	if (strcmp(type, "display") != 0)
@@ -322,40 +281,34 @@ ofwfb_init(struct vt_device *vd)
 	/* Keep track of the OF node */
 	sc->sc_node = node;
 
+	/*
+	 * Try to use a 32-bit framebuffer if possible. This may be
+	 * unimplemented and fail. That's fine -- it just means we are
+	 * stuck with the defaults.
+	 */
+	OF_call_method("set-depth", sc->sc_handle, 1, 1, (cell_t)32, &i);
+
 	/* 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))
+	    OF_getproplen(node, "linebytes") != sizeof(sc->fb.fb_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;
+	sc->fb.fb_bpp = sc->fb.fb_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));
+	OF_getprop(node, "linebytes", &stride, sizeof(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", sc->sc_pciaddrs,
-	    sizeof(sc->sc_pciaddrs));
-	if (len == -1) {
-		len = OF_getprop(OF_parent(node), "assigned-addresses",
-		    sc->sc_pciaddrs, sizeof(sc->sc_pciaddrs));
-        }
-        if (len == -1)
-                len = 0;
-	sc->sc_num_pciaddrs = len / sizeof(struct ofw_pci_register);
+	sc->fb.fb_height = height;
+	sc->fb.fb_width = width;
+	sc->fb.fb_stride = stride;
+	sc->fb.fb_size = sc->fb.fb_height * sc->fb.fb_stride;
 
 	/*
 	 * Grab the physical address of the framebuffer, and then map it
@@ -368,15 +321,23 @@ ofwfb_init(struct vt_device *vd)
 
 	#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);
+		bus_space_map(sc->sc_memt, fb_phys, sc->fb.fb_size,
+		    BUS_SPACE_MAP_PREFETCHABLE, &sc->fb.fb_vbase);
 	#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);
+		sc->fb.fb_vbase =
+		    sparc64_fake_bustag(space, fb_phys, sc->sc_memt);
+	#elif defined(__arm__)
+		sc->sc_memt = fdtbus_bs_tag;
+		bus_space_map(sc->sc_memt, sc->fb.fb_pbase, sc->fb.fb_size,
+		    BUS_SPACE_MAP_PREFETCHABLE,
+		    (bus_space_handle_t *)&sc->fb.fb_vbase);
 	#else
 		#error Unsupported platform!
 	#endif
+
+		sc->fb.fb_pbase = fb_phys;
 	} else {
 		/*
 		 * Some IBM systems don't have an address property. Try to
@@ -385,13 +346,31 @@ ofwfb_init(struct vt_device *vd)
 		 * Linux does the same thing.
 		 */
 
-		fb_phys = sc->sc_num_pciaddrs;
-		for (i = 0; i < sc->sc_num_pciaddrs; i++) {
+		struct ofw_pci_register pciaddrs[8];
+		int num_pciaddrs = 0;
+
+		/*
+		 * 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;
+		num_pciaddrs = len / sizeof(struct ofw_pci_register);
+
+		fb_phys = num_pciaddrs;
+		for (i = 0; i < num_pciaddrs; i++) {
 			/* If it is too small, not the framebuffer */
-			if (sc->sc_pciaddrs[i].size_lo < sc->sc_stride*height)
+			if (pciaddrs[i].size_lo < sc->fb.fb_stride * height)
 				continue;
 			/* If it is not memory, it isn't either */
-			if (!(sc->sc_pciaddrs[i].phys_hi &
+			if (!(pciaddrs[i].phys_hi &
 			    OFW_PCI_PHYS_HI_SPACE_MEM32))
 				continue;
 
@@ -399,59 +378,26 @@ ofwfb_init(struct vt_device *vd)
 			fb_phys = i;
 
 			/* If it is prefetchable, it certainly is */
-			if (sc->sc_pciaddrs[i].phys_hi &
-			    OFW_PCI_PHYS_HI_PREFETCHABLE)
+			if (pciaddrs[i].phys_hi & OFW_PCI_PHYS_HI_PREFETCHABLE)
 				break;
 		}
 
-		if (fb_phys == sc->sc_num_pciaddrs) /* No candidates found */
+		if (fb_phys == num_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);
+		OF_decode_addr(node, fb_phys, &sc->sc_memt, &sc->fb.fb_vbase);
+		sc->fb.fb_pbase = sc->fb.fb_vbase; /* 1:1 mapped */
+	#else
+		/* No ability to interpret assigned-addresses otherwise */
+		return (CN_DEAD);
 	#endif
         }
 
+
 	ofwfb_initialize(vd);
+	vt_fb_init(vd);
 
 	return (CN_INTERNAL);
 }
 
-static int
-ofwfb_mmap(struct vt_device *vd, vm_ooffset_t offset, vm_paddr_t *paddr,
-    int prot, vm_memattr_t *memattr)
-{
-	struct ofwfb_softc *sc = vd->vd_softc;
-        int i;
-
-	/*
-	 * Make sure the requested address lies within the PCI device's
-	 * assigned addrs
-	 */
-	for (i = 0; i < sc->sc_num_pciaddrs; i++)
-	  if (offset >= sc->sc_pciaddrs[i].phys_lo &&
-	    offset < (sc->sc_pciaddrs[i].phys_lo + sc->sc_pciaddrs[i].size_lo))
-		{
-			/*
-			 * If this is a prefetchable BAR, we can (and should)
-			 * enable write-combining.
-			 */
-			if (sc->sc_pciaddrs[i].phys_hi &
-			    OFW_PCI_PHYS_HI_PREFETCHABLE)
-				*memattr = VM_MEMATTR_WRITE_COMBINING;
-
-			*paddr = offset;
-			return (0);
-		}
-
-        /*
-         * Hack for Radeon...
-         */
-	*paddr = offset;
-	return (0);
-}
-
diff --git a/sys/dev/vt/hw/vga/vga.c b/sys/dev/vt/hw/vga/vt_vga.c
similarity index 91%
rename from sys/dev/vt/hw/vga/vga.c
rename to sys/dev/vt/hw/vga/vt_vga.c
index a13e094a1075..5dbf5bd4f53e 100644
--- a/sys/dev/vt/hw/vga/vga.c
+++ b/sys/dev/vt/hw/vga/vt_vga.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 
 #include <dev/vt/vt.h>
-#include <dev/vt/hw/vga/vga_reg.h>
+#include <dev/vt/hw/vga/vt_vga_reg.h>
 
 #include <machine/bus.h>
 
@@ -75,7 +75,6 @@ static vd_probe_t	vga_probe;
 static vd_init_t	vga_init;
 static vd_blank_t	vga_blank;
 static vd_bitbltchr_t	vga_bitbltchr;
-static vd_maskbitbltchr_t vga_maskbitbltchr;
 static vd_drawrect_t	vga_drawrect;
 static vd_setpixel_t	vga_setpixel;
 static vd_putchar_t	vga_putchar;
@@ -87,7 +86,6 @@ static const struct vt_driver vt_vga_driver = {
 	.vd_init	= vga_init,
 	.vd_blank	= vga_blank,
 	.vd_bitbltchr	= vga_bitbltchr,
-	.vd_maskbitbltchr = vga_maskbitbltchr,
 	.vd_drawrect	= vga_drawrect,
 	.vd_setpixel	= vga_setpixel,
 	.vd_putchar	= vga_putchar,
@@ -172,88 +170,83 @@ vga_drawrect(struct vt_device *vd, int x1, int y1, int x2, int y2, int fill,
 	}
 }
 
-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;
+/*
+ * Shift bitmap of one row of the glyph.
+ * a - array of bytes with src bitmap and result storage.
+ * m - resulting background color bitmask.
+ * size - number of bytes per glyph row (+ one byte to store shift overflow).
+ * shift - offset for target bitmap.
+ */
 
-	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_shift_u8array(uint8_t *a, uint8_t *m, int size, int shift)
+{
+	int i;
+
+	for (i = (size - 1); i > 0; i--) {
+		a[i] = (a[i] >> shift) | (a[i-1] << (7 - shift));
+		m[i] = ~a[i];
 	}
+	a[0] = (a[0] >> shift);
+	m[0] = ~a[0] & (0xff >> shift);
+	m[size - 1] = ~a[size - 1] & (0xff << (7 - shift));
 }
 
+/* XXX: fix gaps on mouse track when character size is not rounded to 8. */
 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)
 {
-	u_long dst, ldst;
-	int w;
+	uint8_t aa[64], ma[64], *r;
+	int dst, shift, sz, x, y;
+	struct vga_softc *sc;
 
-	/* Don't try to put off screen pixels */
-	if (((left + width) > VT_VGA_WIDTH) || ((top + height) >
-	    VT_VGA_HEIGHT))
+	if ((left + width) > VT_VGA_WIDTH)
+		return;
+	if ((top + height) > VT_VGA_HEIGHT)
 		return;
 
-	dst = (VT_VGA_WIDTH * top + left) / 8;
+	sc = vd->vd_softc;
 
-	for (; height > 0; height--) {
-		ldst = dst;
-		for (w = width; w > 0; w -= 8) {
-			vga_bitblt_put(vd, ldst, fg, *src);
-			vga_bitblt_put(vd, ldst, bg, ~*src);
-			ldst++;
-			src++;
-		}
-		dst += VT_VGA_WIDTH / 8;
-	}
-}
-
-/* Bitblt with mask support. Slow. */
-static void
-vga_maskbitbltchr(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;
+	sz = (width + 7) / 8;
 	shift = left % 8;
 
-	/* Don't try to put off screen pixels */
-	if (((left + width) > VT_VGA_WIDTH) || ((top + height) >
-	    VT_VGA_HEIGHT))
-		return;
+	dst = (VT_VGA_WIDTH * top + left) / 8;
 
-	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);
+	for (y = 0; y < height; y++) {
+		r = (uint8_t *)src + (y * sz);
+		memcpy(aa, r, sz);
+		aa[sz] = 0;
+		vga_shift_u8array(aa, ma, sz + 1, shift);
+
+		vga_setcolor(vd, bg);
+		for (x = 0; x < (sz + 1); x ++) {
+			if (ma[x] == 0)
+				continue;
+			/*
+			 * XXX Only mouse cursor can go out of screen.
+			 * So for mouse it have to just return, but for regular
+			 * characters it have to panic, to indicate error in
+			 * size/coordinates calculations.
+			 */
+			if ((dst + x) >= (VT_VGA_WIDTH * VT_VGA_HEIGHT))
+				return;
+			if (ma[x] != 0xff)
+				MEM_READ1(sc, dst + x);
+			MEM_WRITE1(sc, dst + x, ma[x]);
+		}
+
+		vga_setcolor(vd, fg);
+		for (x = 0; x < (sz + 1); x ++) {
+			if (aa[x] == 0)
+				continue;
+			if (aa[x] != 0xff)
+				MEM_READ1(sc, dst + x);
+			MEM_WRITE1(sc, dst + x, aa[x]);
+		}
+
+		dst += VT_VGA_WIDTH / 8;
 	}
 }
 
@@ -656,11 +649,6 @@ vga_init(struct vt_device *vd)
 	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
diff --git a/sys/dev/vt/hw/vga/vga_reg.h b/sys/dev/vt/hw/vga/vt_vga_reg.h
similarity index 100%
rename from sys/dev/vt/hw/vga/vga_reg.h
rename to sys/dev/vt/hw/vga/vt_vga_reg.h
diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h
index 87a57a2285c3..7dc90e6b0df2 100644
--- a/sys/dev/vt/vt.h
+++ b/sys/dev/vt/vt.h
@@ -50,11 +50,6 @@
 #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
@@ -89,9 +84,14 @@ one 'device sc' or 'device vt'"
 
 #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);
+SYSCTL_INT(_kern_vt, OID_AUTO, _name, CTLFLAG_RWTUN, &vt_##_name, _default,\
+		_descr);
+
+/* Allow to disable some special keys by users. */
+#define	VT_DEBUG_KEY_ENABLED	(1 << 0)
+#define	VT_REBOOT_KEY_ENABLED	(1 << 1)
+#define	VT_HALT_KEY_ENABLED	(1 << 2)
+#define	VT_POWEROFF_KEY_ENABLED	(1 << 3)
 
 struct vt_driver;
 
@@ -230,7 +230,7 @@ void vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz);
 	((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	VTBUF_SPACE_CHAR(attr)	(' ' | (attr))
 
 #define	VHS_SET	0
 #define	VHS_CUR	1
@@ -290,9 +290,6 @@ 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_maskbitbltchr_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);
 typedef int vd_fb_ioctl_t(struct vt_device *, u_long, caddr_t, struct thread *);
@@ -311,7 +308,6 @@ struct vt_driver {
 	/* Drawing. */
 	vd_blank_t	*vd_blank;
 	vd_bitbltchr_t	*vd_bitbltchr;
-	vd_maskbitbltchr_t *vd_maskbitbltchr;
 	vd_drawrect_t	*vd_drawrect;
 	vd_setpixel_t	*vd_setpixel;
 
@@ -353,54 +349,6 @@ void vt_upgrade(struct vt_device *vd);
 #define	VT_FB_DEFAULT_HEIGHT	1200
 #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)
-
 /* name argument is not used yet. */
 #define VT_DRIVER_DECLARE(name, drv) DATA_SET(vt_drv_set, drv)
 
diff --git a/sys/dev/vt/vt_buf.c b/sys/dev/vt/vt_buf.c
index d8602f806323..4003ce8e5412 100644
--- a/sys/dev/vt/vt_buf.c
+++ b/sys/dev/vt/vt_buf.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
+#include <sys/reboot.h>
 #include <sys/systm.h>
 
 #include <dev/vt/vt.h>
@@ -228,10 +229,9 @@ vtbuf_dirty_axis(unsigned int begin, unsigned int end)
 }
 
 static inline void
-vtbuf_dirty(struct vt_buf *vb, const term_rect_t *area)
+vtbuf_dirty_locked(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)
@@ -244,18 +244,26 @@ vtbuf_dirty(struct vt_buf *vb, const term_rect_t *area)
 	    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);
+}
+
+static inline void
+vtbuf_dirty(struct vt_buf *vb, const term_rect_t *area)
+{
+
+	VTBUF_LOCK(vb);
+	vtbuf_dirty_locked(vb, area);
 	VTBUF_UNLOCK(vb);
 }
 
 static inline void
-vtbuf_dirty_cell(struct vt_buf *vb, const term_pos_t *p)
+vtbuf_dirty_cell_locked(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);
+	vtbuf_dirty_locked(vb, &area);
 }
 
 static void
@@ -372,9 +380,8 @@ vtbuf_fill_locked(struct vt_buf *vb, const term_rect_t *r, term_char_t c)
 
 	VTBUF_LOCK(vb);
 	vtbuf_fill(vb, r, c);
+	vtbuf_dirty_locked(vb, r);
 	VTBUF_UNLOCK(vb);
-
-	vtbuf_dirty(vb, r);
 }
 
 static void
@@ -385,13 +392,13 @@ vtbuf_init_rows(struct vt_buf *vb)
 	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];
+		vb->vb_rows[r] = &vb->vb_buffer[r * vb->vb_scr_size.tp_col];
 }
 
 void
 vtbuf_init_early(struct vt_buf *vb)
 {
+	term_rect_t rect;
 
 	vb->vb_flags |= VBF_CURSOR;
 	vb->vb_roffset = 0;
@@ -402,6 +409,10 @@ vtbuf_init_early(struct vt_buf *vb)
 	vb->vb_mark_end.tp_col = 0;
 
 	vtbuf_init_rows(vb);
+	rect.tr_begin.tp_row = rect.tr_begin.tp_col = 0;
+	rect.tr_end = vb->vb_scr_size;
+	vtbuf_fill(vb, &rect, VTBUF_SPACE_CHAR((boothowto & RB_MUTE) == 0 ?
+	    TERMINAL_KERN_ATTR : TERMINAL_NORM_ATTR));
 	vtbuf_make_undirty(vb);
 	if ((vb->vb_flags & VBF_MTX_INIT) == 0) {
 		mtx_init(&vb->vb_lock, "vtbuf", NULL, MTX_SPIN);
@@ -474,20 +485,27 @@ vtbuf_grow(struct vt_buf *vb, const term_pos_t *p, int history_size)
 
 		/* Copy history and fill extra space. */
 		for (r = 0; r < history_size; r ++) {
+			/*
+			 * XXX VTBUF_SPACE_CHAR(TERMINAL_NORM_ATTR) will
+			 * extended lines of kernel text using the wrong
+			 * background color.
+			 */
 			row = rows[r];
 			if (r < h) { /* Copy. */
 				memmove(rows[r], copyrows[r],
 				    MIN(p->tp_col, w) * sizeof(term_char_t));
 				for (c = MIN(p->tp_col, w); c < p->tp_col;
 				    c++) {
-					row[c] = VTBUF_SPACE_CHAR;
+					row[c] = VTBUF_SPACE_CHAR(
+					    TERMINAL_NORM_ATTR);
 				}
 			} else { /* Just fill. */
 				rect.tr_begin.tp_col = 0;
 				rect.tr_begin.tp_row = r;
 				rect.tr_end.tp_col = p->tp_col;
 				rect.tr_end.tp_row = p->tp_row;
-				vtbuf_fill(vb, &rect, VTBUF_SPACE_CHAR);
+				vtbuf_fill(vb, &rect,
+				    VTBUF_SPACE_CHAR(TERMINAL_NORM_ATTR));
 				break;
 			}
 		}
@@ -519,8 +537,8 @@ vtbuf_putchar(struct vt_buf *vb, const term_pos_t *p, term_char_t c)
 	if (row[p->tp_col] != c) {
 		VTBUF_LOCK(vb);
 		row[p->tp_col] = c;
+		vtbuf_dirty_cell_locked(vb, p);
 		VTBUF_UNLOCK(vb);
-		vtbuf_dirty_cell(vb, p);
 	}
 }
 
@@ -529,9 +547,11 @@ 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);
+		VTBUF_LOCK(vb);
+		vtbuf_dirty_cell_locked(vb, &vb->vb_cursor);
 		vb->vb_cursor = *p;
-		vtbuf_dirty_cell(vb, &vb->vb_cursor);
+		vtbuf_dirty_cell_locked(vb, &vb->vb_cursor);
+		VTBUF_UNLOCK(vb);
 	} else {
 		vb->vb_cursor = *p;
 	}
@@ -712,10 +732,10 @@ vtbuf_cursor_visibility(struct vt_buf *vb, int yes)
 	else
 		vb->vb_flags &= ~VBF_CURSOR;
 	nflags = vb->vb_flags;
-	VTBUF_UNLOCK(vb);
 
 	if (oflags != nflags)
-		vtbuf_dirty_cell(vb, &vb->vb_cursor);
+		vtbuf_dirty_cell_locked(vb, &vb->vb_cursor);
+	VTBUF_UNLOCK(vb);
 }
 
 void
@@ -730,9 +750,9 @@ vtbuf_scroll_mode(struct vt_buf *vb, int yes)
 	else
 		vb->vb_flags &= ~VBF_SCROLL;
 	nflags = vb->vb_flags;
-	VTBUF_UNLOCK(vb);
 
 	if (oflags != nflags)
-		vtbuf_dirty_cell(vb, &vb->vb_cursor);
+		vtbuf_dirty_cell_locked(vb, &vb->vb_cursor);
+	VTBUF_UNLOCK(vb);
 }
 
diff --git a/sys/dev/vt/vt_consolectl.c b/sys/dev/vt/vt_consolectl.c
index df8b341d4132..32e3ba6a9ce5 100644
--- a/sys/dev/vt/vt_consolectl.c
+++ b/sys/dev/vt/vt_consolectl.c
@@ -73,6 +73,8 @@ static void
 consolectl_drvinit(void *unused)
 {
 
+	if (!vty_enabled(VTY_VT))
+		return;
 	make_dev(&consolectl_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
 	    "consolectl");
 }
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
index 80aa7776476f..fbffa9c33f3e 100644
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -111,14 +111,14 @@ const struct terminal_class vt_termclass = {
 #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, "vt(9) parameters");
 VT_SYSCTL_INT(enable_altgr, 1, "Enable AltGr key (Do not assume R.Alt as Alt)");
 VT_SYSCTL_INT(debug, 0, "vt(9) debug level");
 VT_SYSCTL_INT(deadtimer, 15, "Time to wait busy process in VT_PROCESS mode");
 VT_SYSCTL_INT(suspendswitch, 1, "Switch to VT0 before suspend");
+VT_SYSCTL_INT(spclkeys, (VT_DEBUG_KEY_ENABLED|VT_REBOOT_KEY_ENABLED|
+    VT_HALT_KEY_ENABLED|VT_POWEROFF_KEY_ENABLED), "Enabled special keys "
+    "handled by vt(4)");
 
 static struct vt_device	vt_consdev;
 static unsigned int vt_unit = 0;
@@ -169,8 +169,8 @@ static struct vt_window	vt_conswindow = {
 	.vw_number = VT_CONSWINDOW,
 	.vw_flags = VWF_CONSOLE,
 	.vw_buf = {
-		.vb_buffer = vt_constextbuf,
-		.vb_rows = vt_constextbufrows,
+		.vb_buffer = &vt_constextbuf[0],
+		.vb_rows = &vt_constextbufrows[0],
 		.vb_history_size = VBF_DEFAULT_HISTORY_SIZE,
 		.vb_curroffset = 0,
 		.vb_roffset = 0,
@@ -215,6 +215,8 @@ static void
 vt_update_static(void *dummy)
 {
 
+	if (!vty_enabled(VTY_VT))
+		return;
 	if (main_vd->vd_driver != NULL)
 		printf("VT: running with driver \"%s\".\n",
 		    main_vd->vd_driver->vd_name);
@@ -403,17 +405,21 @@ vt_machine_kbdevent(int c)
 
 	switch (c) {
 	case SPCLKEY | DBG:
-		kdb_enter(KDB_WHY_BREAK, "manual escape to debugger");
+		if (vt_spclkeys & VT_DEBUG_KEY_ENABLED)
+			kdb_enter(KDB_WHY_BREAK, "manual escape to debugger");
 		return (1);
 	case SPCLKEY | RBT:
-		/* XXX: Make this configurable! */
-		shutdown_nice(0);
+		if (vt_spclkeys & VT_REBOOT_KEY_ENABLED)
+			/* XXX: Make this configurable! */
+			shutdown_nice(0);
 		return (1);
 	case SPCLKEY | HALT:
-		shutdown_nice(RB_HALT);
+		if (vt_spclkeys & VT_HALT_KEY_ENABLED)
+			shutdown_nice(RB_HALT);
 		return (1);
 	case SPCLKEY | PDWN:
-		shutdown_nice(RB_HALT|RB_POWEROFF);
+		if (vt_spclkeys & VT_POWEROFF_KEY_ENABLED)
+			shutdown_nice(RB_HALT|RB_POWEROFF);
 		return (1);
 	};
 
@@ -616,7 +622,7 @@ vt_kbdevent(keyboard_t *kbd, int event, void *arg)
 	case KBDIO_UNLOADING:
 		mtx_lock(&Giant);
 		vd->vd_keyboard = -1;
-		kbd_release(kbd, (void *)&vd->vd_keyboard);
+		kbd_release(kbd, (void *)vd);
 		mtx_unlock(&Giant);
 		return (0);
 	default:
@@ -881,7 +887,7 @@ vt_flush(struct vt_device *vd)
 		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_maskbitbltchr(vd, m->map, m->mask, bpl,
+		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);
@@ -956,6 +962,11 @@ 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;
+	term_attr_t attr;
+	term_char_t c;
+
+	if (!vty_enabled(VTY_VT))
+		return;
 
 	if (vd->vd_flags & VDF_INITIALIZED)
 		/* Initialization already done. */
@@ -992,12 +1003,17 @@ vtterm_cnprobe(struct terminal *tm, struct consdev *cp)
 	sprintf(cp->cn_name, "ttyv%r", VT_UNIT(vw));
 
 	/* Attach default font if not in TEXTMODE. */
-	if (!(vd->vd_flags & VDF_TEXTMODE))
+	if ((vd->vd_flags & VDF_TEXTMODE) == 0)
 		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);
+	c = (boothowto & RB_MUTE) == 0 ? TERMINAL_KERN_ATTR :
+	    TERMINAL_NORM_ATTR;
+	attr.ta_format = TCHAR_FORMAT(c);
+	attr.ta_fgcolor = TCHAR_FGCOLOR(c);
+	attr.ta_bgcolor = TCHAR_BGCOLOR(c);
+	terminal_set_winsize_blank(tm, &wsz, 1, &attr);
 
 	if (vtdbest != NULL) {
 #ifdef DEV_SPLASH
@@ -1138,7 +1154,7 @@ vt_change_font(struct vt_window *vw, struct vt_font *vf)
 		VT_UNLOCK(vd);
 		return (EBUSY);
 	}
-	if (vw->vw_font == NULL) {
+	if (vd->vd_flags & VDF_TEXTMODE) {
 		/* Our device doesn't need fonts. */
 		VT_UNLOCK(vd);
 		return (ENOTTY);
@@ -1155,13 +1171,19 @@ vt_change_font(struct vt_window *vw, struct vt_font *vf)
 	/* 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_set_winsize_blank(tm, &wsz, 0, NULL);
 	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);
+	if (vw->vw_font != vf) {
+		/*
+		 * In case vt_change_font called to update size we don't need
+		 * to update font link.
+		 */
+		vtfont_unref(vw->vw_font);
+		vw->vw_font = vtfont_ref(vf);
+	}
 
 	/* Force a full redraw the next timer tick. */
 	if (vd->vd_curwindow == vw)
@@ -1773,11 +1795,10 @@ vtterm_ioctl(struct terminal *tm, u_long cmd, caddr_t data,
 				return (EINVAL);
 			}
 			i = kbd_allocate(kbd->kb_name, kbd->kb_unit,
-			    (void *)&vd->vd_keyboard, vt_kbdevent, vd);
+			    (void *)vd, vt_kbdevent, vd);
 			if (i >= 0) {
 				if (vd->vd_keyboard != -1) {
-					kbd_release(kbd,
-					    (void *)&vd->vd_keyboard);
+					kbd_release(kbd, (void *)vd);
 				}
 				kbd = kbd_get_keyboard(i);
 				vd->vd_keyboard = i;
@@ -1799,7 +1820,7 @@ vtterm_ioctl(struct terminal *tm, u_long cmd, caddr_t data,
 				mtx_unlock(&Giant);
 				return (EINVAL);
 			}
-			error = kbd_release(kbd, (void *)&vd->vd_keyboard);
+			error = kbd_release(kbd, (void *)vd);
 			if (error == 0) {
 				vd->vd_keyboard = -1;
 			}
@@ -1970,7 +1991,7 @@ vt_allocate_window(struct vt_device *vd, unsigned int window)
 	vw->vw_number = window;
 	vw->vw_kbdmode = K_XLATE;
 
-	if (!(vd->vd_flags & VDF_TEXTMODE))
+	if ((vd->vd_flags & VDF_TEXTMODE) == 0)
 		vw->vw_font = vtfont_ref(&vt_font_default);
 
 	vt_termsize(vd, vw->vw_font, &size);
@@ -1991,6 +2012,9 @@ vt_upgrade(struct vt_device *vd)
 	struct vt_window *vw;
 	unsigned int i;
 
+	if (!vty_enabled(VTY_VT))
+		return;
+
 	for (i = 0; i < VT_MAXWINDOWS; i++) {
 		vw = vd->vd_windows[i];
 		if (vw == NULL) {
@@ -2014,9 +2038,8 @@ vt_upgrade(struct vt_device *vd)
 		vd->vd_curwindow = vd->vd_windows[VT_CONSWINDOW];
 
 	if (!(vd->vd_flags & VDF_ASYNC)) {
-	/* Attach keyboard. */
-	vt_allocate_keyboard(vd);
-	DPRINTF(20, "%s: vd_keyboard = %d\n", __func__, vd->vd_keyboard);
+		/* Attach keyboard. */
+		vt_allocate_keyboard(vd);
 
 		/* Init 25 Hz timer. */
 		callout_init_mtx(&vd->vd_timer, &vd->vd_lock, 0);
@@ -2046,7 +2069,10 @@ vt_resize(struct vt_device *vd)
 			vw->vw_font = vtfont_ref(&vt_font_default);
 		VT_UNLOCK(vd);
 		/* Resize terminal windows */
-		vt_change_font(vw, vw->vw_font);
+		while (vt_change_font(vw, vw->vw_font) == EBUSY) {
+			DPRINTF(100, "%s: vt_change_font() is busy, "
+			    "window %d\n", __func__, i);
+		}
 	}
 }
 
@@ -2054,7 +2080,9 @@ void
 vt_allocate(struct vt_driver *drv, void *softc)
 {
 	struct vt_device *vd;
-	struct winsize wsz;
+
+	if (!vty_enabled(VTY_VT))
+		return;
 
 	if (main_vd->vd_driver == NULL) {
 		main_vd->vd_driver = drv;
@@ -2075,8 +2103,6 @@ vt_allocate(struct vt_driver *drv, void *softc)
 	}
 	vd = main_vd;
 	VT_LOCK(vd);
-	if (drv->vd_maskbitbltchr == NULL)
-		drv->vd_maskbitbltchr = drv->vd_bitbltchr;
 
 	if (vd->vd_flags & VDF_ASYNC) {
 		/* Stop vt_flush periodic task. */
@@ -2099,6 +2125,7 @@ vt_allocate(struct vt_driver *drv, void *softc)
 	vd->vd_driver->vd_init(vd);
 	VT_UNLOCK(vd);
 
+	/* Update windows sizes and initialize last items. */
 	vt_upgrade(vd);
 
 #ifdef DEV_SPLASH
@@ -2107,16 +2134,17 @@ vt_allocate(struct vt_driver *drv, void *softc)
 #endif
 
 	if (vd->vd_flags & VDF_ASYNC) {
+		/* Allow to put chars now. */
 		terminal_mute(vd->vd_curwindow->vw_terminal, 0);
+		/* Rerun timer for screen updates. */
 		callout_schedule(&vd->vd_timer, hz / VT_TIMERFREQ);
 	}
 
+	/*
+	 * Register as console. If it already registered, cnadd() will ignore
+	 * it.
+	 */
 	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_blank(vd->vd_windows[VT_CONSWINDOW]->vw_terminal,
-	    &wsz, 0);
 }
 
 void
diff --git a/sys/dev/vt/vt_sysmouse.c b/sys/dev/vt/vt_sysmouse.c
index 92eee3c4b8c1..21b2400816f2 100644
--- a/sys/dev/vt/vt_sysmouse.c
+++ b/sys/dev/vt/vt_sysmouse.c
@@ -405,6 +405,8 @@ static void
 sysmouse_drvinit(void *unused)
 {
 
+	if (!vty_enabled(VTY_VT))
+		return;
 	mtx_init(&sysmouse_lock, "sysmouse", NULL, MTX_DEF);
 	cv_init(&sysmouse_sleep, "sysmrd");
 	make_dev(&sysmouse_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
diff --git a/sys/dev/vxge/vxge-osdep.h b/sys/dev/vxge/vxge-osdep.h
index f358c91c65dc..66caaeb04201 100644
--- a/sys/dev/vxge/vxge-osdep.h
+++ b/sys/dev/vxge/vxge-osdep.h
@@ -615,7 +615,6 @@ vxge_dma_free(pci_dev_h pdev, const void *vaddr, u_long size,
 	bus_dmamem_free(p_dmah->dma_tag, p_dmah->dma_vaddr, p_dmah->dma_map);
 	bus_dma_tag_destroy(p_dmah->dma_tag);
 
-	p_dmah->dma_map = NULL;
 	p_dmah->dma_tag = NULL;
 	p_dmah->dma_vaddr = NULL;
 }
diff --git a/sys/dev/wb/if_wb.c b/sys/dev/wb/if_wb.c
index a126d4a4df8f..dd087a9d5eac 100644
--- a/sys/dev/wb/if_wb.c
+++ b/sys/dev/wb/if_wb.c
@@ -143,7 +143,7 @@ static int wb_probe(device_t);
 static int wb_attach(device_t);
 static int wb_detach(device_t);
 
-static int wb_bfree(struct mbuf *, void *addr, void *args);
+static void wb_bfree(struct mbuf *, void *addr, void *args);
 static int wb_newbuf(struct wb_softc *, struct wb_chain_onefrag *,
 		struct mbuf *);
 static int wb_encap(struct wb_softc *, struct wb_chain *, struct mbuf *);
@@ -823,11 +823,9 @@ wb_list_rx_init(sc)
 	return(0);
 }
 
-static int
+static void
 wb_bfree(struct mbuf *m, void *buf, void *args)
 {
-
-	return (EXT_FREE_OK);
 }
 
 /*
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c
index e85e079306ce..6e4428bef516 100644
--- a/sys/dev/wpi/if_wpi.c
+++ b/sys/dev/wpi/if_wpi.c
@@ -130,9 +130,8 @@ enum {
 	WPI_DEBUG_ANY		= 0xffffffff
 };
 
-static int wpi_debug = 0;
-SYSCTL_INT(_debug, OID_AUTO, wpi, CTLFLAG_RW, &wpi_debug, 0, "wpi debug level");
-TUNABLE_INT("debug.wpi", &wpi_debug);
+static int wpi_debug;
+SYSCTL_INT(_debug, OID_AUTO, wpi, CTLFLAG_RWTUN, &wpi_debug, 0, "wpi debug level");
 
 #else
 #define DPRINTF(x)
@@ -901,13 +900,13 @@ static void
 wpi_dma_contig_free(struct wpi_dma_info *dma)
 {
 	if (dma->tag) {
-		if (dma->map != NULL) {
+		if (dma->vaddr_start != NULL) {
 			if (dma->paddr_start != 0) {
 				bus_dmamap_sync(dma->tag, dma->map,
 				    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 				bus_dmamap_unload(dma->tag, dma->map);
 			}
-			bus_dmamem_free(dma->tag, &dma->vaddr_start, dma->map);
+			bus_dmamem_free(dma->tag, dma->vaddr_start, dma->map);
 		}
 		bus_dma_tag_destroy(dma->tag);
 	}
diff --git a/sys/dev/xen/balloon/balloon.c b/sys/dev/xen/balloon/balloon.c
index 2df9c8b50fbe..6503a0060fa7 100644
--- a/sys/dev/xen/balloon/balloon.c
+++ b/sys/dev/xen/balloon/balloon.c
@@ -94,13 +94,8 @@ SYSCTL_ULONG(_dev_xen_balloon, OID_AUTO, low_mem, CTLFLAG_RD,
 SYSCTL_ULONG(_dev_xen_balloon, OID_AUTO, high_mem, CTLFLAG_RD,
     &bs.balloon_high, 0, "High-mem balloon");
 
-struct balloon_entry {
-	vm_page_t page;
-	STAILQ_ENTRY(balloon_entry) list;
-};
-
 /* List of ballooned pages, threaded through the mem_map array. */
-static STAILQ_HEAD(,balloon_entry) ballooned_pages;
+static TAILQ_HEAD(,vm_page) ballooned_pages;
 
 /* Main work function, always executed in process context. */
 static void balloon_process(void *unused);
@@ -110,47 +105,6 @@ static void balloon_process(void *unused);
 #define WPRINTK(fmt, args...) \
 	printk(KERN_WARNING "xen_mem: " fmt, ##args)
 
-/* balloon_append: add the given page to the balloon. */
-static int
-balloon_append(vm_page_t page)
-{
-	struct balloon_entry *entry;
-
-	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. */
-static vm_page_t
-balloon_retrieve(void)
-{
-	vm_page_t page;
-	struct balloon_entry *entry;
-
-	mtx_assert(&balloon_mutex, MA_OWNED);
-
-	if (STAILQ_EMPTY(&ballooned_pages))
-		return (NULL);
-
-	entry = STAILQ_FIRST(&ballooned_pages);
-	STAILQ_REMOVE_HEAD(&ballooned_pages, list);
-
-	page = entry->page;
-	free(entry, M_BALLOON);
-	
-	bs.balloon_low--;
-
-	return (page);
-}
-
 static unsigned long 
 current_target(void)
 {
@@ -203,7 +157,6 @@ static int
 increase_reservation(unsigned long nr_pages)
 {
 	unsigned long  pfn, i;
-	struct balloon_entry *entry;
 	vm_page_t      page;
 	long           rc;
 	struct xen_memory_reservation reservation = {
@@ -217,10 +170,9 @@ increase_reservation(unsigned long nr_pages)
 	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)) {
-		KASSERT(entry, ("ballooned_pages list corrupt"));
-		page = entry->page;
+	for (page = TAILQ_FIRST(&ballooned_pages), i = 0;
+	    i < nr_pages; i++, page = TAILQ_NEXT(page, plinks.q)) {
+		KASSERT(page != NULL, ("ballooned_pages list corrupt"));
 		frame_list[i] = (VM_PAGE_TO_PHYS(page) >> PAGE_SHIFT);
 	}
 
@@ -245,8 +197,10 @@ increase_reservation(unsigned long nr_pages)
 	}
 
 	for (i = 0; i < nr_pages; i++) {
-		page = balloon_retrieve();
-		KASSERT(page, ("balloon_retrieve failed"));
+		page = TAILQ_FIRST(&ballooned_pages);
+		KASSERT(page != NULL, ("Unable to get ballooned page"));
+		TAILQ_REMOVE(&ballooned_pages, page, plinks.q);
+		bs.balloon_low--;
 
 		pfn = (VM_PAGE_TO_PHYS(page) >> PAGE_SHIFT);
 		KASSERT((xen_feature(XENFEAT_auto_translated_physmap) ||
@@ -255,7 +209,6 @@ increase_reservation(unsigned long nr_pages)
 
 		set_phys_to_machine(pfn, frame_list[i]);
 
-		vm_page_unwire(page, 0);
 		vm_page_free(page);
 	}
 
@@ -286,24 +239,29 @@ decrease_reservation(unsigned long nr_pages)
 	for (i = 0; i < nr_pages; i++) {
 		if ((page = vm_page_alloc(NULL, 0, 
 			    VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | 
-			    VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) {
+			    VM_ALLOC_ZERO)) == NULL) {
 			nr_pages = i;
 			need_sleep = 1;
 			break;
 		}
 
+		if ((page->flags & PG_ZERO) == 0) {
+			/*
+			 * Zero the page, or else we might be leaking
+			 * important data to other domains on the same
+			 * host. Xen doesn't scrub ballooned out memory
+			 * pages, the guest is in charge of making
+			 * sure that no information is leaked.
+			 */
+			pmap_zero_page(page);
+		}
+
 		pfn = (VM_PAGE_TO_PHYS(page) >> PAGE_SHIFT);
 		frame_list[i] = PFNTOMFN(pfn);
 
 		set_phys_to_machine(pfn, INVALID_P2M_ENTRY);
-		if (balloon_append(page) != 0) {
-			vm_page_unwire(page, 0);
-			vm_page_free(page);
-
-			nr_pages = i;
-			need_sleep = 1;
-			break;
-		}
+		TAILQ_INSERT_HEAD(&ballooned_pages, page, plinks.q);
+		bs.balloon_low++;
 	}
 
 	set_xen_guest_handle(reservation.extent_start, frame_list);
@@ -438,7 +396,8 @@ balloon_init(void *arg)
 	/* Initialise the balloon with excess memory space. */
 	for (pfn = xen_start_info->nr_pages; pfn < max_pfn; pfn++) {
 		page = PHYS_TO_VM_PAGE(pfn << PAGE_SHIFT);
-		balloon_append(page);
+		TAILQ_INSERT_HEAD(&ballooned_pages, page, plinks.q);
+		bs.balloon_low++;
 	}
 #undef max_pfn
 #endif
diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c
index 92b5f3542819..7a1c974552b4 100644
--- a/sys/dev/xen/blkfront/blkfront.c
+++ b/sys/dev/xen/blkfront/blkfront.c
@@ -272,8 +272,12 @@ xbd_queue_request(struct xbd_softc *sc, struct xbd_command *cm)
 {
 	int error;
 
-	error = bus_dmamap_load(sc->xbd_io_dmat, cm->cm_map, cm->cm_data,
-	    cm->cm_datalen, xbd_queue_cb, cm, 0);
+	if (cm->cm_bp != NULL)
+		error = bus_dmamap_load_bio(sc->xbd_io_dmat, cm->cm_map,
+		    cm->cm_bp, xbd_queue_cb, cm, 0);
+	else
+		error = bus_dmamap_load(sc->xbd_io_dmat, cm->cm_map,
+		    cm->cm_data, cm->cm_datalen, xbd_queue_cb, cm, 0);
 	if (error == EINPROGRESS) {
 		/*
 		 * Maintain queuing order by freezing the queue.  The next
@@ -333,8 +337,6 @@ xbd_bio_command(struct xbd_softc *sc)
 	}
 
 	cm->cm_bp = bp;
-	cm->cm_data = bp->bio_data;
-	cm->cm_datalen = bp->bio_bcount;
 	cm->cm_sector_number = (blkif_sector_t)bp->bio_pblkno;
 
 	switch (bp->bio_cmd) {
@@ -993,7 +995,7 @@ xbd_instance_create(struct xbd_softc *sc, blkif_sector_t sectors,
 
 	sc->xbd_disk->d_mediasize = sectors * sector_size;
 	sc->xbd_disk->d_maxsize = sc->xbd_max_request_size;
-	sc->xbd_disk->d_flags = 0;
+	sc->xbd_disk->d_flags = DISKFLAG_UNMAPPED_BIO;
 	if ((sc->xbd_flags & (XBDF_FLUSH|XBDF_BARRIER)) != 0) {
 		sc->xbd_disk->d_flags |= DISKFLAG_CANFLUSHCACHE;
 		device_printf(sc->xbd_dev,
diff --git a/sys/dev/xen/console/console.c b/sys/dev/xen/console/console.c
index 77bc91ef4a24..5019ec946d15 100644
--- a/sys/dev/xen/console/console.c
+++ b/sys/dev/xen/console/console.c
@@ -509,4 +509,4 @@ xcons_force_flush(void)
 	}
 }
 
-DRIVER_MODULE(xc, nexus, xc_driver, xc_devclass, 0, 0);
+DRIVER_MODULE(xc, xenpv, xc_driver, xc_devclass, 0, 0);
diff --git a/sys/dev/xen/console/xencons_ring.c b/sys/dev/xen/console/xencons_ring.c
index 42b9abe09947..65d05ce14212 100644
--- a/sys/dev/xen/console/xencons_ring.c
+++ b/sys/dev/xen/console/xencons_ring.c
@@ -35,6 +35,7 @@ xen_intr_handle_t console_handle;
 extern struct mtx              cn_mtx;
 extern device_t xencons_dev;
 extern bool cnsl_evt_reg;
+#define DOM0_BUFFER_SIZE	16
 
 static inline struct xencons_interface *
 xencons_interface(void)
@@ -48,6 +49,18 @@ xencons_has_input(void)
 {
 	struct xencons_interface *intf; 
 
+	if (xen_initial_domain()) {
+		/*
+		 * Since the Dom0 console works with hypercalls
+		 * there's no way to know if there's input unless
+		 * we actually try to retrieve it, so always return
+		 * like there's pending data. Then if the hypercall
+		 * returns no input, we can handle it without problems
+		 * in xencons_handle_input().
+		 */
+		return 1;
+	}
+
 	intf = xencons_interface();		
 
 	return (intf->in_cons != intf->in_prod);
@@ -98,6 +111,19 @@ xencons_handle_input(void *unused)
 	XENCONS_RING_IDX cons, prod;
 
 	CN_LOCK(cn_mtx);
+
+	if (xen_initial_domain()) {
+		static char rbuf[DOM0_BUFFER_SIZE];
+		int         l;
+
+		while ((l = HYPERVISOR_console_io(CONSOLEIO_read,
+		    DOM0_BUFFER_SIZE, rbuf)) > 0)
+			xencons_rx(rbuf, l);
+
+		CN_UNLOCK(cn_mtx);
+		return;
+	}
+
 	intf = xencons_interface();
 
 	cons = intf->in_cons;
diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c
index bc0609d33d40..665a5acdbe29 100644
--- a/sys/dev/xen/control/control.c
+++ b/sys/dev/xen/control/control.c
@@ -287,7 +287,7 @@ xctrl_suspend()
 	}
 	HYPERVISOR_shared_info->arch.max_pfn = max_pfn;
 
-	gnttab_resume();
+	gnttab_resume(NULL);
 	intr_resume(suspend_cancelled != 0);
 	local_irq_enable();
 	xencons_resume();
@@ -316,21 +316,6 @@ xctrl_suspend()
 	EVENTHANDLER_INVOKE(power_resume);
 }
 
-static void
-xen_pv_shutdown_final(void *arg, int howto)
-{
-	/*
-	 * Inform the hypervisor that shutdown is complete.
-	 * This is not necessary in HVM domains since Xen
-	 * emulates ACPI in that mode and FreeBSD's ACPI
-	 * support will request this transition.
-	 */
-	if (howto & (RB_HALT | RB_POWEROFF))
-		HYPERVISOR_shutdown(SHUTDOWN_poweroff);
-	else
-		HYPERVISOR_shutdown(SHUTDOWN_reboot);
-}
-
 #else
 
 /* HVM mode suspension. */
@@ -400,7 +385,7 @@ xctrl_suspend()
 	/*
 	 * Reset grant table info.
 	 */
-	gnttab_resume();
+	gnttab_resume(NULL);
 
 #ifdef SMP
 	if (smp_started && !CPU_EMPTY(&cpu_suspend_map)) {
@@ -440,6 +425,21 @@ xctrl_crash()
 	panic("Xen directed crash");
 }
 
+static void
+xen_pv_shutdown_final(void *arg, int howto)
+{
+	/*
+	 * Inform the hypervisor that shutdown is complete.
+	 * This is not necessary in HVM domains since Xen
+	 * emulates ACPI in that mode and FreeBSD's ACPI
+	 * support will request this transition.
+	 */
+	if (howto & (RB_HALT | RB_POWEROFF))
+		HYPERVISOR_shutdown(SHUTDOWN_poweroff);
+	else
+		HYPERVISOR_shutdown(SHUTDOWN_reboot);
+}
+
 /*------------------------------ Event Reception -----------------------------*/
 static void
 xctrl_on_watch_event(struct xs_watch *watch, const char **vec, unsigned int len)
@@ -522,10 +522,9 @@ xctrl_attach(device_t dev)
 	xctrl->xctrl_watch.callback_data = (uintptr_t)xctrl;
 	xs_register_watch(&xctrl->xctrl_watch);
 
-#ifndef XENHVM
-	EVENTHANDLER_REGISTER(shutdown_final, xen_pv_shutdown_final, NULL,
-			      SHUTDOWN_PRI_LAST);
-#endif
+	if (xen_pv_domain())
+		EVENTHANDLER_REGISTER(shutdown_final, xen_pv_shutdown_final, NULL,
+		                      SHUTDOWN_PRI_LAST);
 
 	return (0);
 }
diff --git a/sys/dev/xen/pvcpu/pvcpu.c b/sys/dev/xen/pvcpu/pvcpu.c
new file mode 100644
index 000000000000..c70525216000
--- /dev/null
+++ b/sys/dev/xen/pvcpu/pvcpu.c
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2013 Roger Pau Monné <roger.pau@citrix.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/pcpu.h>
+#include <sys/smp.h>
+
+#include <xen/xen-os.h>
+
+/*
+ * Dummy Xen cpu device
+ *
+ * Since there's no ACPI on PVH guests, we need to create a dummy
+ * CPU device in order to fill the pcpu->pc_device field.
+ */
+
+static void
+xenpvcpu_identify(driver_t *driver, device_t parent)
+{
+	int i;
+
+	/* Only attach to PV guests, HVM guests use the ACPI CPU devices */
+	if (!xen_pv_domain())
+		return;
+
+	CPU_FOREACH(i) {
+		if (BUS_ADD_CHILD(parent, 0, "pvcpu", i) == NULL)
+			panic("Unable to add Xen PV CPU device.");
+	}
+}
+
+static int
+xenpvcpu_probe(device_t dev)
+{
+
+	device_set_desc(dev, "Xen PV CPU");
+	return (BUS_PROBE_NOWILDCARD);
+}
+
+static int
+xenpvcpu_attach(device_t dev)
+{
+	struct pcpu *pc;
+	int cpu;
+
+	cpu = device_get_unit(dev);
+	pc = pcpu_find(cpu);
+	pc->pc_device = dev;
+	return (0);
+}
+
+static device_method_t xenpvcpu_methods[] = {
+	DEVMETHOD(device_identify, xenpvcpu_identify),
+	DEVMETHOD(device_probe, xenpvcpu_probe),
+	DEVMETHOD(device_attach, xenpvcpu_attach),
+
+	DEVMETHOD_END
+};
+
+static driver_t xenpvcpu_driver = {
+	"pvcpu",
+	xenpvcpu_methods,
+	0,
+};
+
+devclass_t xenpvcpu_devclass;
+
+DRIVER_MODULE(xenpvcpu, xenpv, xenpvcpu_driver, xenpvcpu_devclass, 0, 0);
+MODULE_DEPEND(xenpvcpu, xenpv, 1, 1, 1);
diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/timer.c
index ed611d03e3a3..574307638c52 100644
--- a/sys/dev/xen/timer/timer.c
+++ b/sys/dev/xen/timer/timer.c
@@ -645,5 +645,5 @@ static driver_t xentimer_driver = {
 	sizeof(struct xentimer_softc),
 };
 
-DRIVER_MODULE(xentimer, nexus, xentimer_driver, xentimer_devclass, 0, 0);
-MODULE_DEPEND(xentimer, nexus, 1, 1, 1);
+DRIVER_MODULE(xentimer, xenpv, xentimer_driver, xentimer_devclass, 0, 0);
+MODULE_DEPEND(xentimer, xenpv, 1, 1, 1);
diff --git a/sys/dev/xen/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c
index dd2ad924b169..3fdd78cf5967 100644
--- a/sys/dev/xen/xenpci/xenpci.c
+++ b/sys/dev/xen/xenpci/xenpci.c
@@ -51,8 +51,6 @@ __FBSDID("$FreeBSD$");
 
 extern void xen_intr_handle_upcall(struct trapframe *trap_frame);
 
-static device_t nexus;
-
 /*
  * This is used to find our platform device instance.
  */
@@ -110,13 +108,6 @@ xenpci_deallocate_resources(device_t dev)
 			scp->rid_irq, scp->res_irq);
 		scp->res_irq = 0;
 	}
-	if (scp->res_memory != 0) {
-		bus_deactivate_resource(dev, SYS_RES_MEMORY,
-			scp->rid_memory, scp->res_memory);
-		bus_release_resource(dev, SYS_RES_MEMORY,
-			scp->rid_memory, scp->res_memory);
-		scp->res_memory = 0;
-	}
 
 	return (0);
 }
@@ -136,16 +127,6 @@ xenpci_allocate_resources(device_t dev)
 		goto errexit;
 	}
 
-	scp->rid_memory = PCIR_BAR(1);
-	scp->res_memory = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
-			&scp->rid_memory, RF_ACTIVE);
-	if (scp->res_memory == NULL) {
-		printf("xenpci Could not allocate memory bar.\n");
-		goto errexit;
-	}
-
-	scp->phys_next = rman_get_start(scp->res_memory);
-
 	return (0);
 
 errexit:
@@ -154,70 +135,6 @@ xenpci_allocate_resources(device_t dev)
 	return (ENXIO); /* For want of a better idea. */
 }
 
-/*
- * Allocate a physical address range from our mmio region.
- */
-static int
-xenpci_alloc_space_int(struct xenpci_softc *scp, size_t sz,
-    vm_paddr_t *pa)
-{
-
-	if (scp->phys_next + sz > rman_get_end(scp->res_memory)) {
-		return (ENOMEM);
-	}
-
-	*pa = scp->phys_next;
-	scp->phys_next += sz;
-
-	return (0);
-}
-
-/*
- * Allocate a physical address range from our mmio region.
- */
-int
-xenpci_alloc_space(size_t sz, vm_paddr_t *pa)
-{
-	device_t dev = devclass_get_device(xenpci_devclass, 0);
-
-	if (dev) {
-		return (xenpci_alloc_space_int(device_get_softc(dev),
-			sz, pa));
-	} else {
-		return (ENOMEM);
-	}
-}
-
-static struct resource *
-xenpci_alloc_resource(device_t dev, device_t child, int type, int *rid,
-    u_long start, u_long end, u_long count, u_int flags)
-{
-	return (BUS_ALLOC_RESOURCE(nexus, child, type, rid, start,
-	    end, count, flags));
-}
-
-
-static int
-xenpci_release_resource(device_t dev, device_t child, int type, int rid,
-    struct resource *r)
-{
-	return (BUS_RELEASE_RESOURCE(nexus, child, type, rid, r));
-}
-
-static int
-xenpci_activate_resource(device_t dev, device_t child, int type, int rid,
-    struct resource *r)
-{
-	return (BUS_ACTIVATE_RESOURCE(nexus, child, type, rid, r));
-}
-
-static int
-xenpci_deactivate_resource(device_t dev, device_t child, int type,
-    int rid, struct resource *r)
-{
-	return (BUS_DEACTIVATE_RESOURCE(nexus, child, type, rid, r));
-}
-
 /*
  * Probe - just check device ID.
  */
@@ -229,7 +146,7 @@ xenpci_probe(device_t dev)
 		return (ENXIO);
 
 	device_set_desc(dev, "Xen Platform Device");
-	return (bus_generic_probe(dev));
+	return (BUS_PROBE_DEFAULT);
 }
 
 /*
@@ -239,20 +156,8 @@ static int
 xenpci_attach(device_t dev)
 {
 	struct xenpci_softc *scp = device_get_softc(dev);
-	devclass_t dc;
 	int error;
 
-	/*
-	 * Find and record nexus0.  Since we are not really on the
-	 * PCI bus, all resource operations are directed to nexus
-	 * instead of through our parent.
-	 */
-	if ((dc = devclass_find("nexus"))  == 0
-	 || (nexus = devclass_get_device(dc, 0)) == 0) {
-		device_printf(dev, "unable to find nexus.");
-		return (ENOENT);
-	}
-
 	error = xenpci_allocate_resources(dev);
 	if (error) {
 		device_printf(dev, "xenpci_allocate_resources failed(%d).\n",
@@ -270,7 +175,7 @@ xenpci_attach(device_t dev)
 		goto errexit;
 	}
 
-	return (bus_generic_attach(dev));
+	return (0);
 
 errexit:
 	/*
@@ -308,17 +213,11 @@ xenpci_detach(device_t dev)
 	return (xenpci_deallocate_resources(dev));
 }
 
-static int
-xenpci_suspend(device_t dev)
-{
-	return (bus_generic_suspend(dev));
-}
-
 static int
 xenpci_resume(device_t dev)
 {
 	xen_hvm_set_callback(dev);
-	return (bus_generic_resume(dev));
+	return (0);
 }
 
 static device_method_t xenpci_methods[] = {
@@ -326,16 +225,8 @@ static device_method_t xenpci_methods[] = {
 	DEVMETHOD(device_probe,		xenpci_probe),
 	DEVMETHOD(device_attach,	xenpci_attach),
 	DEVMETHOD(device_detach,	xenpci_detach),
-	DEVMETHOD(device_suspend,	xenpci_suspend),
 	DEVMETHOD(device_resume,	xenpci_resume),
 
-	/* Bus interface */
-	DEVMETHOD(bus_add_child,	bus_generic_add_child),
-	DEVMETHOD(bus_alloc_resource,   xenpci_alloc_resource),
-	DEVMETHOD(bus_release_resource, xenpci_release_resource),
-	DEVMETHOD(bus_activate_resource, xenpci_activate_resource),
-	DEVMETHOD(bus_deactivate_resource, xenpci_deactivate_resource),
-
 	{ 0, 0 }
 };
 
diff --git a/sys/dev/xen/xenpci/xenpcivar.h b/sys/dev/xen/xenpci/xenpcivar.h
index 527a291c8801..45d12159ed09 100644
--- a/sys/dev/xen/xenpci/xenpcivar.h
+++ b/sys/dev/xen/xenpci/xenpcivar.h
@@ -31,13 +31,7 @@
  */
 struct xenpci_softc {
 	int rid_ioport;
-	int rid_memory;
 	int rid_irq;
-	struct resource* res_memory;	/* Resource for mem range. */
 	struct resource* res_irq;	/* Resource for irq range. */
 	void	*intr_cookie;
-
-	vm_paddr_t phys_next;		/* next page from mem range */
 };
-
-extern int xenpci_alloc_space(size_t sz, vm_paddr_t *pa);
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index 590fc1911428..274fb3e05c22 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -50,6 +50,23 @@ __FBSDID("$FreeBSD$");
 #include <fs/cd9660/cd9660_node.h>
 #include <fs/cd9660/iso_rrip.h>
 
+struct cd9660_ino_alloc_arg {
+	ino_t ino;
+	ino_t i_ino;
+	struct iso_directory_record *ep;
+};
+
+static int
+cd9660_ino_alloc(struct mount *mp, void *arg, int lkflags,
+    struct vnode **vpp)
+{
+	struct cd9660_ino_alloc_arg *dd_arg;
+
+	dd_arg = arg;
+	return (cd9660_vget_internal(mp, dd_arg->i_ino, lkflags, vpp,
+	    dd_arg->i_ino != dd_arg->ino, dd_arg->ep));
+}
+
 /*
  * Convert a component of a pathname into a pointer to a locked inode.
  * This is a very central and rather complicated routine.
@@ -104,6 +121,7 @@ cd9660_lookup(ap)
 	doff_t endsearch;		/* offset to end directory search */
 	struct vnode *pdp;		/* saved dp during symlink work */
 	struct vnode *tdp;		/* returned by cd9660_vget_internal */
+	struct cd9660_ino_alloc_arg dd_arg;
 	u_long bmask;			/* block offset mask */
 	int error;
 	ino_t ino, i_ino;
@@ -114,7 +132,6 @@ cd9660_lookup(ap)
 	int res;
 	int assoc, len;
 	char *name;
-	struct mount *mp;
 	struct vnode **vpp = ap->a_vpp;
 	struct componentname *cnp = ap->a_cnp;
 	int flags = cnp->cn_flags;
@@ -368,39 +385,13 @@ cd9660_lookup(ap)
 	 * it's a relocated directory.
 	 */
 	if (flags & ISDOTDOT) {
-		/*
-		 * Expanded copy of vn_vget_ino() so that we can use
-		 * cd9660_vget_internal().
-		 */
-		mp = pdp->v_mount;
-		ltype = VOP_ISLOCKED(pdp);
-		error = vfs_busy(mp, MBF_NOWAIT);
-		if (error != 0) {
-			vfs_ref(mp);
-			VOP_UNLOCK(pdp, 0);
-			error = vfs_busy(mp, 0);
-			vn_lock(pdp, ltype | LK_RETRY);
-			vfs_rel(mp);
-			if (error)
-				return (ENOENT);
-			if (pdp->v_iflag & VI_DOOMED) {
-				vfs_unbusy(mp);
-				return (ENOENT);
-			}
-		}
-		VOP_UNLOCK(pdp, 0);
-		error = cd9660_vget_internal(vdp->v_mount, i_ino,
-					     cnp->cn_lkflags, &tdp,
-					     i_ino != ino, ep);
+		dd_arg.ino = ino;
+		dd_arg.i_ino = i_ino;
+		dd_arg.ep = ep;
+		error = vn_vget_ino_gen(pdp, cd9660_ino_alloc, &dd_arg,
+		    cnp->cn_lkflags, &tdp);
 		free(ep2, M_TEMP);
-		vfs_unbusy(mp);
-		vn_lock(pdp, ltype | LK_RETRY);
-		if (pdp->v_iflag & VI_DOOMED) {
-			if (error == 0)
-				vput(tdp);
-			error = ENOENT;
-		}
-		if (error)
+		if (error != 0)
 			return (error);
 		*vpp = tdp;
 	} else if (dp->i_number == i_ino) {
diff --git a/sys/fs/cuse/cuse.c b/sys/fs/cuse/cuse.c
index 4a23963b6cf6..37765d49e26c 100644
--- a/sys/fs/cuse/cuse.c
+++ b/sys/fs/cuse/cuse.c
@@ -813,15 +813,9 @@ cuse_proc2proc_copy(struct proc *proc_s, vm_offset_t data_s,
 			.uio_td = td,
 		};
 
-		PROC_LOCK(proc_s);
-		_PHOLD(proc_s);
-		PROC_UNLOCK(proc_s);
-
+		PHOLD(proc_s);
 		error = proc_rwmem(proc_s, &uio);
-
-		PROC_LOCK(proc_s);
-		_PRELE(proc_s);
-		PROC_UNLOCK(proc_s);
+		PRELE(proc_s);
 
 	} else if (proc_cur == proc_s) {
 		struct iovec iov = {
@@ -838,15 +832,9 @@ cuse_proc2proc_copy(struct proc *proc_s, vm_offset_t data_s,
 			.uio_td = td,
 		};
 
-		PROC_LOCK(proc_d);
-		_PHOLD(proc_d);
-		PROC_UNLOCK(proc_d);
-
+		PHOLD(proc_d);
 		error = proc_rwmem(proc_d, &uio);
-
-		PROC_LOCK(proc_d);
-		_PRELE(proc_d);
-		PROC_UNLOCK(proc_d);
+		PRELE(proc_d);
 	} else {
 		error = EINVAL;
 	}
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index a05299a8e703..1e3f5e844864 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -1533,10 +1533,8 @@ devfs_setattr(struct vop_setattr_args *ap)
 	}
 
 	if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) {
-		/* See the comment in ufs_vnops::ufs_setattr(). */
-		if ((error = VOP_ACCESS(vp, VADMIN, ap->a_cred, td)) &&
-		    ((vap->va_vaflags & VA_UTIMES_NULL) == 0 ||
-		    (error = VOP_ACCESS(vp, VWRITE, ap->a_cred, td))))
+		error = vn_utimes_perm(vp, vap, ap->a_cred, td);
+		if (error != 0)
 			return (error);
 		if (vap->va_atime.tv_sec != VNOVAL) {
 			if (vp->v_type == VCHR)
diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c
index 523e3c742179..2046e33a5d39 100644
--- a/sys/fs/ext2fs/ext2_vnops.c
+++ b/sys/fs/ext2fs/ext2_vnops.c
@@ -666,10 +666,6 @@ ext2_link(struct vop_link_args *ap)
 	if ((cnp->cn_flags & HASBUF) == 0)
 		panic("ext2_link: no name");
 #endif
-	if (tdvp->v_mount != vp->v_mount) {
-		error = EXDEV;
-		goto out;
-	}
 	ip = VTOI(vp);
 	if ((nlink_t)ip->i_nlink >= EXT2_LINK_MAX) {
 		error = EMLINK;
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index 27c76e1bb107..3704915b7144 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -63,8 +63,6 @@
 
 static int msdosfs_lookup_(struct vnode *vdp, struct vnode **vpp,
     struct componentname *cnp, u_int64_t *inum);
-static int msdosfs_deget_dotdot(struct vnode *vp, u_long cluster, int blkoff,
-    struct vnode **rvp);
 
 int
 msdosfs_lookup(struct vop_cachedlookup_args *ap)
@@ -73,6 +71,28 @@ msdosfs_lookup(struct vop_cachedlookup_args *ap)
 	return (msdosfs_lookup_(ap->a_dvp, ap->a_vpp, ap->a_cnp, NULL));
 }
 
+struct deget_dotdot {
+	u_long cluster;
+	int blkoff;
+};
+
+static int
+msdosfs_deget_dotdot(struct mount *mp, void *arg, int lkflags,
+    struct vnode **rvp)
+{
+	struct deget_dotdot *dd_arg;
+	struct denode *rdp;
+	struct msdosfsmount *pmp;
+	int error;
+
+	pmp = VFSTOMSDOSFS(mp);
+	dd_arg = arg;
+	error = deget(pmp, dd_arg->cluster, dd_arg->blkoff,  &rdp);
+	if (error == 0)
+		*rvp = DETOV(rdp);
+	return (error);
+}
+
 /*
  * When we search a directory the blocks containing directory entries are
  * read and examined.  The directory entries contain information that would
@@ -110,6 +130,7 @@ msdosfs_lookup_(struct vnode *vdp, struct vnode **vpp,
 	struct msdosfsmount *pmp;
 	struct buf *bp = NULL;
 	struct direntry *dep = NULL;
+	struct deget_dotdot dd_arg;
 	u_char dosfilename[12];
 	int flags = cnp->cn_flags;
 	int nameiop = cnp->cn_nameiop;
@@ -524,8 +545,11 @@ msdosfs_lookup_(struct vnode *vdp, struct vnode **vpp,
 	 */
 	pdp = vdp;
 	if (flags & ISDOTDOT) {
-		error = msdosfs_deget_dotdot(pdp, cluster, blkoff, vpp);
-		if (error) {
+		dd_arg.cluster = cluster;
+		dd_arg.blkoff = blkoff;
+		error = vn_vget_ino_gen(vdp, msdosfs_deget_dotdot,
+		    &dd_arg, cnp->cn_lkflags, vpp);
+		if (error != 0) {
 			*vpp = NULL;
 			return (error);
 		}
@@ -560,54 +584,6 @@ msdosfs_lookup_(struct vnode *vdp, struct vnode **vpp,
 	return (0);
 }
 
-static int
-msdosfs_deget_dotdot(struct vnode *vp, u_long cluster, int blkoff,
-    struct vnode **rvp)
-{
-	struct mount *mp;
-	struct msdosfsmount *pmp;
-	struct denode *rdp;
-	int ltype, error;
-
-	mp = vp->v_mount;
-	pmp = VFSTOMSDOSFS(mp);
-	ltype = VOP_ISLOCKED(vp);
-	KASSERT(ltype == LK_EXCLUSIVE || ltype == LK_SHARED,
-	    ("msdosfs_deget_dotdot: vp not locked"));
-
-	error = vfs_busy(mp, MBF_NOWAIT);
-	if (error != 0) {
-		vfs_ref(mp);
-		VOP_UNLOCK(vp, 0);
-		error = vfs_busy(mp, 0);
-		vn_lock(vp, ltype | LK_RETRY);
-		vfs_rel(mp);
-		if (error != 0)
-			return (ENOENT);
-		if (vp->v_iflag & VI_DOOMED) {
-			vfs_unbusy(mp);
-			return (ENOENT);
-		}
-	}
-	VOP_UNLOCK(vp, 0);
-	error = deget(pmp, cluster, blkoff,  &rdp);
-	vfs_unbusy(mp);
-	if (error == 0)
-		*rvp = DETOV(rdp);
-	if (*rvp != vp)
-		vn_lock(vp, ltype | LK_RETRY);
-	if (vp->v_iflag & VI_DOOMED) {
-		if (error == 0) {
-			if (*rvp == vp)
-				vunref(*rvp);
-			else
-				vput(*rvp);
-		}
-		error = ENOENT;
-	}
-	return (error);
-}
-
 /*
  * dep  - directory entry to copy into the directory
  * ddep - directory to add to
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 856ec7cbf5ba..622917f5563b 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -501,12 +501,9 @@ msdosfs_setattr(ap)
 	if (vap->va_atime.tv_sec != VNOVAL || vap->va_mtime.tv_sec != VNOVAL) {
 		if (vp->v_mount->mnt_flag & MNT_RDONLY)
 			return (EROFS);
-		if (vap->va_vaflags & VA_UTIMES_NULL) {
-			error = VOP_ACCESS(vp, VADMIN, cred, td); 
-			if (error)
-				error = VOP_ACCESS(vp, VWRITE, cred, td);
-		} else
-			error = VOP_ACCESS(vp, VADMIN, cred, td);
+		error = vn_utimes_perm(vp, vap, cred, td);
+		if (error != 0)
+			return (error);
 		if ((pmp->pm_flags & MSDOSFSMNT_NOWIN95) == 0 &&
 		    vap->va_atime.tv_sec != VNOVAL) {
 			dep->de_flag &= ~DE_ACCESS;
diff --git a/sys/fs/nandfs/nandfs.h b/sys/fs/nandfs/nandfs.h
index fd5978a1299b..899a7dd77743 100644
--- a/sys/fs/nandfs/nandfs.h
+++ b/sys/fs/nandfs/nandfs.h
@@ -303,8 +303,8 @@ struct nandfs_node {
 #define	PRINT_NODE_FLAGS \
 	"\10\1IN_ACCESS\2IN_CHANGE\3IN_UPDATE\4IN_MODIFIED\5IN_RENAME"
 
-#define	NANDFS_GATHER(x) ((x)->b_flags |= B_00800000)
-#define	NANDFS_UNGATHER(x) ((x)->b_flags &= ~B_00800000)
-#define	NANDFS_ISGATHERED(x) ((x)->b_flags & B_00800000)
+#define	NANDFS_GATHER(x) ((x)->b_flags |= B_FS_FLAG1)
+#define	NANDFS_UNGATHER(x) ((x)->b_flags &= ~B_FS_FLAG1)
+#define	NANDFS_ISGATHERED(x) ((x)->b_flags & B_FS_FLAG1)
 
 #endif /* !_FS_NANDFS_NANDFS_H_ */
diff --git a/sys/fs/nandfs/nandfs_subr.c b/sys/fs/nandfs/nandfs_subr.c
index fa6ff72bad70..c9780a56643d 100644
--- a/sys/fs/nandfs/nandfs_subr.c
+++ b/sys/fs/nandfs/nandfs_subr.c
@@ -639,16 +639,14 @@ nandfs_get_node_raw(struct nandfs_device *nandfsdev, struct nandfsmount *nmp,
 	if (nmp) {
 		mp = nmp->nm_vfs_mountp;
 		error = getnewvnode("nandfs", mp, &nandfs_vnodeops, &nvp);
-		if (error) {
+		if (error)
 			return (error);
-		}
 	} else {
 		mp = NULL;
 		error = getnewvnode("snandfs", mp, &nandfs_system_vnodeops,
 		    &nvp);
-		if (error) {
+		if (error)
 			return (error);
-		}
 	}
 
 	if (mp)
diff --git a/sys/fs/nandfs/nandfs_vfsops.c b/sys/fs/nandfs/nandfs_vfsops.c
index eba4b4ce5053..eb07d4f5e988 100644
--- a/sys/fs/nandfs/nandfs_vfsops.c
+++ b/sys/fs/nandfs/nandfs_vfsops.c
@@ -912,7 +912,7 @@ nandfs_mount_device(struct vnode *devvp, struct mount *mp,
 			/*
 			 * We conclude that this is not NAND storage
 			 */
-			nandfsdev->nd_erasesize = NANDFS_DEF_ERASESIZE;
+			erasesize = NANDFS_DEF_ERASESIZE;
 		} else {
 			DROP_GIANT();
 			g_topology_lock();
@@ -924,7 +924,6 @@ nandfs_mount_device(struct vnode *devvp, struct mount *mp,
 			return (error);
 		}
 	}
-
 	nandfsdev->nd_erasesize = erasesize;
 
 	DPRINTF(VOLUMES, ("%s: erasesize %x\n", __func__,
diff --git a/sys/fs/nandfs/nandfs_vnops.c b/sys/fs/nandfs/nandfs_vnops.c
index 056ca901c2b9..2c92f8b02dc7 100644
--- a/sys/fs/nandfs/nandfs_vnops.c
+++ b/sys/fs/nandfs/nandfs_vnops.c
@@ -405,8 +405,7 @@ nandfs_lookup(struct vop_cachedlookup_args *ap)
 			error = ENOENT;
 			if ((nameiop == CREATE || nameiop == RENAME) &&
 			    islastcn) {
-				error = VOP_ACCESS(dvp, VWRITE, cred,
-				    td);
+				error = VOP_ACCESS(dvp, VWRITE, cred, td);
 				if (!error) {
 					/* keep the component name */
 					cnp->cn_flags |= SAVENAME;
@@ -787,9 +786,8 @@ nandfs_chown(struct vnode *vp, uid_t uid, gid_t gid, struct ucred *cred,
 	node->nn_flags |= IN_CHANGE;
 	if ((inode->i_mode & (ISUID | ISGID)) &&
 	    (ouid != uid || ogid != gid)) {
-		if (priv_check_cred(cred, PRIV_VFS_RETAINSUGID, 0)) {
+		if (priv_check_cred(cred, PRIV_VFS_RETAINSUGID, 0))
 			inode->i_mode &= ~(ISUID | ISGID);
-		}
 	}
 	DPRINTF(VNCALL, ("%s: vp %p, cred %p, td %p - ret OK\n", __func__, vp,
 	    cred, td));
@@ -989,7 +987,7 @@ nandfs_check_possible(struct vnode *vp, struct vattr *vap, mode_t mode)
 		 * Normal nodes: check if we're on a read-only mounted
 		 * filingsystem and bomb out if we're trying to write.
 		 */
-		if ((mode & VWRITE) && (vp->v_mount->mnt_flag & MNT_RDONLY))
+		if ((mode & VMODIFY_PERMS) && (vp->v_mount->mnt_flag & MNT_RDONLY))
 			return (EROFS);
 		break;
 	case VBLK:
@@ -1006,7 +1004,7 @@ nandfs_check_possible(struct vnode *vp, struct vattr *vap, mode_t mode)
 		return (EINVAL);
 	}
 
-	/* Noone may write immutable files */
+	/* No one may write immutable files */
 	if ((mode & VWRITE) && (VTON(vp)->nn_inode.i_flags & IMMUTABLE))
 		return (EPERM);
 
@@ -1049,9 +1047,8 @@ nandfs_access(struct vop_access_args *ap)
 		return (error);
 
 	error = nandfs_check_possible(vp, &vap, accmode);
-	if (error) {
+	if (error)
 		return (error);
-	}
 
 	error = nandfs_check_permitted(vp, &vap, accmode, cred);
 
@@ -1355,9 +1352,6 @@ nandfs_link(struct vop_link_args *ap)
 	struct nandfs_inode *inode = &node->nn_inode;
 	int error;
 
-	if (tdvp->v_mount != vp->v_mount)
-		return (EXDEV);
-
 	if (inode->i_links_count >= LINK_MAX)
 		return (EMLINK);
 
diff --git a/sys/fs/nfs/nfs.h b/sys/fs/nfs/nfs.h
index 5976934ca0a3..6106de99cbcd 100644
--- a/sys/fs/nfs/nfs.h
+++ b/sys/fs/nfs/nfs.h
@@ -50,7 +50,8 @@
 #define	NFS_MAXREXMIT	100		/* Stop counting after this many */
 #define	NFSV4_CALLBACKTIMEO (2 * NFS_HZ) /* Timeout in ticks */
 #define	NFSV4_CALLBACKRETRY 5		/* Number of retries before failure */
-#define	NFSV4_CBSLOTS	8		/* Number of slots for session */
+#define	NFSV4_SLOTS	64		/* Number of slots, fore channel */
+#define	NFSV4_CBSLOTS	8		/* Number of slots, back channel */
 #define	NFSV4_CBRETRYCNT 4		/* # of CBRecall retries upon err */
 #define	NFSV4_UPCALLTIMEO (15 * NFS_HZ)	/* Timeout in ticks for upcalls */
 					/* to gssd or nfsuserd */
@@ -91,6 +92,9 @@
 #ifndef NFSLOCKHASHSIZE
 #define	NFSLOCKHASHSIZE		20	/* Size of server nfslock hash table */
 #endif
+#ifndef NFSSESSIONHASHSIZE
+#define	NFSSESSIONHASHSIZE	20	/* Size of server session hash table */
+#endif
 #define	NFSSTATEHASHSIZE	10	/* Size of server stateid hash table */
 #ifndef NFSUSERHASHSIZE
 #define	NFSUSERHASHSIZE		30	/* Size of user id hash table */
@@ -276,6 +280,8 @@ struct nfsreferral {
 #define	LCL_GSSINTEGRITY	0x00002000
 #define	LCL_GSSPRIVACY		0x00004000
 #define	LCL_ADMINREVOKED	0x00008000
+#define	LCL_RECLAIMCOMPLETE	0x00010000
+#define	LCL_NFSV41		0x00020000
 
 #define	LCL_GSS		LCL_KERBV	/* Or of all mechs */
 
@@ -318,6 +324,11 @@ struct nfsreferral {
 #define	NFSLCK_SETATTR		0x02000000
 #define	NFSLCK_DELEGPURGE	0x04000000
 #define	NFSLCK_DELEGRETURN	0x08000000
+#define	NFSLCK_WANTWDELEG	0x10000000
+#define	NFSLCK_WANTRDELEG	0x20000000
+#define	NFSLCK_WANTNODELEG	0x40000000
+#define	NFSLCK_WANTBITS							\
+    (NFSLCK_WANTWDELEG | NFSLCK_WANTRDELEG | NFSLCK_WANTNODELEG)
 
 /* And bits for nid_flag */
 #define	NFSID_INITIALIZE	0x0001
@@ -341,68 +352,120 @@ struct nfsreferral {
  * THE MACROS MUST BE MANUALLY MODIFIED IF NFSATTRBIT_MAXWORDS CHANGES!!
  * It is (NFSATTRBIT_MAX + 31) / 32.
  */
-#define	NFSATTRBIT_MAXWORDS	2
+#define	NFSATTRBIT_MAXWORDS	3
 
 typedef struct {
 	u_int32_t bits[NFSATTRBIT_MAXWORDS];
 } nfsattrbit_t;
 
-#define	NFSZERO_ATTRBIT(b) do { (b)->bits[0] = 0; (b)->bits[1] = 0; } while (0)
-#define	NFSSET_ATTRBIT(t, f) do { (t)->bits[0] = (f)->bits[0]; 		\
-				  (t)->bits[1] = (f)->bits[1]; } while (0)
+#define	NFSZERO_ATTRBIT(b) do {						\
+	(b)->bits[0] = 0;						\
+	(b)->bits[1] = 0;						\
+	(b)->bits[2] = 0;						\
+} while (0)
+
+#define	NFSSET_ATTRBIT(t, f) do {					\
+	(t)->bits[0] = (f)->bits[0];			 		\
+	(t)->bits[1] = (f)->bits[1];					\
+	(t)->bits[2] = (f)->bits[2];					\
+} while (0)
+
 #define	NFSSETSUPP_ATTRBIT(b) do { 					\
 	(b)->bits[0] = NFSATTRBIT_SUPP0; 				\
-	(b)->bits[1] = (NFSATTRBIT_SUPP1 | NFSATTRBIT_SUPPSETONLY); } while (0)
+	(b)->bits[1] = (NFSATTRBIT_SUPP1 | NFSATTRBIT_SUPPSETONLY);	\
+	(b)->bits[2] = NFSATTRBIT_SUPP2;				\
+} while (0)
+
 #define	NFSISSET_ATTRBIT(b, p)	((b)->bits[(p) / 32] & (1 << ((p) % 32)))
 #define	NFSSETBIT_ATTRBIT(b, p)	((b)->bits[(p) / 32] |= (1 << ((p) % 32)))
 #define	NFSCLRBIT_ATTRBIT(b, p)	((b)->bits[(p) / 32] &= ~(1 << ((p) % 32)))
+
 #define	NFSCLRALL_ATTRBIT(b, a)	do { 					\
-		(b)->bits[0] &= ~((a)->bits[0]); 			\
-		(b)->bits[1] &= ~((a)->bits[1]); 			\
-		} while (0)
+	(b)->bits[0] &= ~((a)->bits[0]);	 			\
+	(b)->bits[1] &= ~((a)->bits[1]);	 			\
+	(b)->bits[2] &= ~((a)->bits[2]);				\
+} while (0)
+
 #define	NFSCLRNOT_ATTRBIT(b, a)	do { 					\
-		(b)->bits[0] &= ((a)->bits[0]); 			\
-		(b)->bits[1] &= ((a)->bits[1]); 			\
-		} while (0)
+	(b)->bits[0] &= ((a)->bits[0]);		 			\
+	(b)->bits[1] &= ((a)->bits[1]);		 			\
+	(b)->bits[2] &= ((a)->bits[2]);		 			\
+} while (0)
+
 #define	NFSCLRNOTFILLABLE_ATTRBIT(b) do { 				\
-		(b)->bits[0] &= NFSATTRBIT_SUPP0; 			\
-		(b)->bits[1] &= NFSATTRBIT_SUPP1; } while (0)
+	(b)->bits[0] &= NFSATTRBIT_SUPP0;	 			\
+	(b)->bits[1] &= NFSATTRBIT_SUPP1;				\
+	(b)->bits[2] &= NFSATTRBIT_SUPP2;				\
+} while (0)
+
 #define	NFSCLRNOTSETABLE_ATTRBIT(b) do { 				\
-		(b)->bits[0] &= NFSATTRBIT_SETABLE0; 			\
-		(b)->bits[1] &= NFSATTRBIT_SETABLE1; } while (0)
-#define	NFSNONZERO_ATTRBIT(b)	((b)->bits[0] || (b)->bits[1])
-#define	NFSEQUAL_ATTRBIT(b, p)						\
-	((b)->bits[0] == (p)->bits[0] && (b)->bits[1] == (p)->bits[1])
+	(b)->bits[0] &= NFSATTRBIT_SETABLE0;	 			\
+	(b)->bits[1] &= NFSATTRBIT_SETABLE1;				\
+	(b)->bits[2] &= NFSATTRBIT_SETABLE2;				\
+} while (0)
+
+#define	NFSNONZERO_ATTRBIT(b)	((b)->bits[0] || (b)->bits[1] || (b)->bits[2])
+#define	NFSEQUAL_ATTRBIT(b, p)	((b)->bits[0] == (p)->bits[0] &&	\
+	(b)->bits[1] == (p)->bits[1] && (b)->bits[2] == (p)->bits[2])
+
 #define	NFSGETATTR_ATTRBIT(b) do { 					\
-		(b)->bits[0] = NFSATTRBIT_GETATTR0; 			\
-		(b)->bits[1] = NFSATTRBIT_GETATTR1; } while (0)
+	(b)->bits[0] = NFSATTRBIT_GETATTR0;	 			\
+	(b)->bits[1] = NFSATTRBIT_GETATTR1;				\
+	(b)->bits[2] = NFSATTRBIT_GETATTR2;				\
+} while (0)
+
 #define	NFSWCCATTR_ATTRBIT(b) do { 					\
-		(b)->bits[0] = NFSATTRBIT_WCCATTR0; 			\
-		(b)->bits[1] = NFSATTRBIT_WCCATTR1; } while (0)
+	(b)->bits[0] = NFSATTRBIT_WCCATTR0;	 			\
+	(b)->bits[1] = NFSATTRBIT_WCCATTR1;				\
+	(b)->bits[2] = NFSATTRBIT_WCCATTR2;				\
+} while (0)
+
 #define	NFSWRITEGETATTR_ATTRBIT(b) do { 				\
-		(b)->bits[0] = NFSATTRBIT_WRITEGETATTR0;		\
-		(b)->bits[1] = NFSATTRBIT_WRITEGETATTR1; } while (0)
+	(b)->bits[0] = NFSATTRBIT_WRITEGETATTR0;			\
+	(b)->bits[1] = NFSATTRBIT_WRITEGETATTR1;			\
+	(b)->bits[2] = NFSATTRBIT_WRITEGETATTR2;			\
+} while (0)
+
 #define	NFSCBGETATTR_ATTRBIT(b, c) do { 				\
-	(c)->bits[0] = ((b)->bits[0] & NFSATTRBIT_CBGETATTR0); 		\
-	(c)->bits[1] = ((b)->bits[1] & NFSATTRBIT_CBGETATTR1); } while (0)
+	(c)->bits[0] = ((b)->bits[0] & NFSATTRBIT_CBGETATTR0);		\
+	(c)->bits[1] = ((b)->bits[1] & NFSATTRBIT_CBGETATTR1);		\
+	(c)->bits[2] = ((b)->bits[2] & NFSATTRBIT_CBGETATTR2);		\
+} while (0)
+
 #define	NFSPATHCONF_GETATTRBIT(b) do { 					\
-		(b)->bits[0] = NFSGETATTRBIT_PATHCONF0; 		\
-		(b)->bits[1] = NFSGETATTRBIT_PATHCONF1; } while (0)
+	(b)->bits[0] = NFSGETATTRBIT_PATHCONF0;		 		\
+	(b)->bits[1] = NFSGETATTRBIT_PATHCONF1;				\
+	(b)->bits[2] = NFSGETATTRBIT_PATHCONF2;				\
+} while (0)
+
 #define	NFSSTATFS_GETATTRBIT(b)	do { 					\
-		(b)->bits[0] = NFSGETATTRBIT_STATFS0; 			\
-		(b)->bits[1] = NFSGETATTRBIT_STATFS1; } while (0)
+	(b)->bits[0] = NFSGETATTRBIT_STATFS0;	 			\
+	(b)->bits[1] = NFSGETATTRBIT_STATFS1;				\
+	(b)->bits[2] = NFSGETATTRBIT_STATFS2;				\
+} while (0)
+
 #define	NFSISSETSTATFS_ATTRBIT(b) 					\
 		(((b)->bits[0] & NFSATTRBIT_STATFS0) || 		\
-		 ((b)->bits[1] & NFSATTRBIT_STATFS1))
+		 ((b)->bits[1] & NFSATTRBIT_STATFS1) ||			\
+		 ((b)->bits[2] & NFSATTRBIT_STATFS2))
+
 #define	NFSCLRSTATFS_ATTRBIT(b)	do { 					\
-		(b)->bits[0] &= ~NFSATTRBIT_STATFS0; 			\
-		(b)->bits[1] &= ~NFSATTRBIT_STATFS1; } while (0)
+	(b)->bits[0] &= ~NFSATTRBIT_STATFS0;	 			\
+	(b)->bits[1] &= ~NFSATTRBIT_STATFS1;				\
+	(b)->bits[2] &= ~NFSATTRBIT_STATFS2;				\
+} while (0)
+
 #define	NFSREADDIRPLUS_ATTRBIT(b) do { 					\
-		(b)->bits[0] = NFSATTRBIT_READDIRPLUS0; 		\
-		(b)->bits[1] = NFSATTRBIT_READDIRPLUS1; } while (0)
+	(b)->bits[0] = NFSATTRBIT_READDIRPLUS0;		 		\
+	(b)->bits[1] = NFSATTRBIT_READDIRPLUS1;				\
+	(b)->bits[2] = NFSATTRBIT_READDIRPLUS2;				\
+} while (0)
+
 #define	NFSREFERRAL_ATTRBIT(b) do { 					\
-		(b)->bits[0] = NFSATTRBIT_REFERRAL0;	 		\
-		(b)->bits[1] = NFSATTRBIT_REFERRAL1; } while (0)
+	(b)->bits[0] = NFSATTRBIT_REFERRAL0;		 		\
+	(b)->bits[1] = NFSATTRBIT_REFERRAL1;				\
+	(b)->bits[2] = NFSATTRBIT_REFERRAL2;				\
+} while (0)
 
 /*
  * Store uid, gid creds that were used when the stateid was acquired.
@@ -529,6 +592,9 @@ struct nfsrv_descript {
 	int			nd_gssnamelen;	/* principal name length */
 	char			*nd_gssname;	/* principal name */
 	uint32_t		*nd_slotseq;	/* ptr to slot seq# in req */
+	uint8_t			nd_sessionid[NFSX_V4SESSIONID];	/* Session id */
+	uint32_t		nd_slotid;	/* Slotid for this RPC */
+	SVCXPRT			*nd_xprt;	/* Server RPC handle */
 };
 
 #define	nd_princlen	nd_gssnamelen
@@ -562,6 +628,8 @@ struct nfsrv_descript {
 #define	ND_NFSCL		0x01000000
 #define	ND_NFSV41		0x02000000
 #define	ND_HASSEQUENCE		0x04000000
+#define	ND_CACHETHIS		0x08000000
+#define	ND_LASTOP		0x10000000
 
 /*
  * ND_GSS should be the "or" of all GSS type authentications.
diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c
index 0104c2928f90..363ff8957a47 100644
--- a/sys/fs/nfs/nfs_commonkrpc.c
+++ b/sys/fs/nfs/nfs_commonkrpc.c
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/vnode.h>
 
 #include <rpc/rpc.h>
+#include <rpc/krpc.h>
 
 #include <kgssapi/krb5/kcrypto.h>
 
@@ -738,8 +739,12 @@ newnfs_request(struct nfsrv_descript *nd, struct nfsmount *nmp,
 	}
 
 	nd->nd_mrep = NULL;
-	stat = CLNT_CALL_MBUF(nrp->nr_client, &ext, procnum, nd->nd_mreq,
-	    &nd->nd_mrep, timo);
+	if (clp != NULL && sep != NULL)
+		stat = clnt_bck_call(nrp->nr_client, &ext, procnum,
+		    nd->nd_mreq, &nd->nd_mrep, timo, sep->nfsess_xprt);
+	else
+		stat = CLNT_CALL_MBUF(nrp->nr_client, &ext, procnum,
+		    nd->nd_mreq, &nd->nd_mrep, timo);
 
 	if (rep != NULL) {
 		/*
@@ -794,7 +799,8 @@ newnfs_request(struct nfsrv_descript *nd, struct nfsmount *nmp,
 	nd->nd_md = nd->nd_mrep;
 	nd->nd_dpos = NFSMTOD(nd->nd_md, caddr_t);
 	nd->nd_repstat = 0;
-	if (nd->nd_procnum != NFSPROC_NULL) {
+	if (nd->nd_procnum != NFSPROC_NULL &&
+	    nd->nd_procnum != NFSV4PROC_CBNULL) {
 		/* If sep == NULL, set it to the default in nmp. */
 		if (sep == NULL && nmp != NULL)
 			sep = NFSMNT_MDSSESSION(nmp);
@@ -826,11 +832,20 @@ newnfs_request(struct nfsrv_descript *nd, struct nfsmount *nmp,
 			/*
 			 * If the first op is Sequence, free up the slot.
 			 */
-			if (nmp != NULL && i == NFSV4OP_SEQUENCE && j != 0)
+			if ((nmp != NULL && i == NFSV4OP_SEQUENCE && j != 0) ||
+			    (clp != NULL && i == NFSV4OP_CBSEQUENCE && j != 0))
 				NFSCL_DEBUG(1, "failed seq=%d\n", j);
-			if (nmp != NULL && i == NFSV4OP_SEQUENCE && j == 0) {
-				NFSM_DISSECT(tl, uint32_t *, NFSX_V4SESSIONID +
-				    5 * NFSX_UNSIGNED);
+			if ((nmp != NULL && i == NFSV4OP_SEQUENCE && j == 0) ||
+			    (clp != NULL && i == NFSV4OP_CBSEQUENCE && j == 0)
+			    ) {
+				if (i == NFSV4OP_SEQUENCE)
+					NFSM_DISSECT(tl, uint32_t *,
+					    NFSX_V4SESSIONID +
+					    5 * NFSX_UNSIGNED);
+				else
+					NFSM_DISSECT(tl, uint32_t *,
+					    NFSX_V4SESSIONID +
+					    4 * NFSX_UNSIGNED);
 				mtx_lock(&sep->nfsess_mtx);
 				tl += NFSX_V4SESSIONID / NFSX_UNSIGNED;
 				retseq = fxdr_unsigned(uint32_t, *tl++);
diff --git a/sys/fs/nfs/nfs_commonport.c b/sys/fs/nfs/nfs_commonport.c
index 602cf23c07ab..27aca2691b78 100644
--- a/sys/fs/nfs/nfs_commonport.c
+++ b/sys/fs/nfs/nfs_commonport.c
@@ -112,6 +112,7 @@ MALLOC_DEFINE(M_NEWNFSDEVINFO, "NFSCL devinfo", "NFSv4.1 Device Info");
 MALLOC_DEFINE(M_NEWNFSSOCKREQ, "NFSCL sockreq", "NFS Sock Req");
 MALLOC_DEFINE(M_NEWNFSCLDS, "NFSCL session", "NFSv4.1 Session");
 MALLOC_DEFINE(M_NEWNFSLAYRECALL, "NFSCL layrecall", "NFSv4.1 Layout Recall");
+MALLOC_DEFINE(M_NEWNFSDSESSION, "NFSD session", "NFSD Session for a client");
 
 /*
  * Definition of mutex locks.
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c
index 5c50dfd430a2..b94091c62e45 100644
--- a/sys/fs/nfs/nfs_commonsubs.c
+++ b/sys/fs/nfs/nfs_commonsubs.c
@@ -1733,6 +1733,23 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp,
 			}
 			attrsum += NFSX_HYPER;
 			break;
+		case NFSATTRBIT_SUPPATTREXCLCREAT:
+			retnotsup = 0;
+			error = nfsrv_getattrbits(nd, &retattrbits,
+			    &cnt, &retnotsup);
+			if (error)
+			    goto nfsmout;
+			if (compare && !(*retcmpp)) {
+			   NFSSETSUPP_ATTRBIT(&checkattrbits);
+			   NFSCLRNOTSETABLE_ATTRBIT(&checkattrbits);
+			   NFSCLRBIT_ATTRBIT(&checkattrbits,
+				NFSATTRBIT_TIMEACCESSSET);
+			   if (!NFSEQUAL_ATTRBIT(&retattrbits, &checkattrbits)
+			       || retnotsup)
+				*retcmpp = NFSERR_NOTSAME;
+			}
+			attrsum += cnt;
+			break;
 		default:
 			printf("EEK! nfsv4_loadattr unknown attr=%d\n",
 				bitpos);
@@ -2469,6 +2486,12 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp,
 			txdr_hyper(uquad, tl);
 			retnum += NFSX_HYPER;
 			break;
+		case NFSATTRBIT_SUPPATTREXCLCREAT:
+			NFSSETSUPP_ATTRBIT(&attrbits);
+			NFSCLRNOTSETABLE_ATTRBIT(&attrbits);
+			NFSCLRBIT_ATTRBIT(&attrbits, NFSATTRBIT_TIMEACCESSSET);
+			retnum += nfsrv_putattrbit(nd, &attrbits);
+			break;
 		default:
 			printf("EEK! Bad V4 attribute bitpos=%d\n", bitpos);
 		};
@@ -3663,6 +3686,9 @@ nfsv4_getipaddr(struct nfsrv_descript *nd, struct sockaddr_storage *sa,
 
 /*
  * Handle an NFSv4.1 Sequence request for the session.
+ * If reply != NULL, use it to return the cached reply, as required.
+ * The client gets a cached reply via this call for callbacks, however the
+ * server gets a cached reply via the nfsv4_seqsess_cachereply() call.
  */
 int
 nfsv4_seqsession(uint32_t seqid, uint32_t slotid, uint32_t highslot,
@@ -3671,7 +3697,8 @@ nfsv4_seqsession(uint32_t seqid, uint32_t slotid, uint32_t highslot,
 	int error;
 
 	error = 0;
-	*reply = NULL;
+	if (reply != NULL)
+		*reply = NULL;
 	if (slotid > maxslot)
 		return (NFSERR_BADSLOT);
 	if (seqid == slots[slotid].nfssl_seq) {
@@ -3679,13 +3706,18 @@ nfsv4_seqsession(uint32_t seqid, uint32_t slotid, uint32_t highslot,
 		if (slots[slotid].nfssl_inprog != 0)
 			error = NFSERR_DELAY;
 		else if (slots[slotid].nfssl_reply != NULL) {
-			*reply = slots[slotid].nfssl_reply;
-			slots[slotid].nfssl_reply = NULL;
+			if (reply != NULL) {
+				*reply = slots[slotid].nfssl_reply;
+				slots[slotid].nfssl_reply = NULL;
+			}
 			slots[slotid].nfssl_inprog = 1;
+			error = NFSERR_REPLYFROMCACHE;
 		} else
-			error = NFSERR_SEQMISORDERED;
+			/* No reply cached, so just do it. */
+			slots[slotid].nfssl_inprog = 1;
 	} else if ((slots[slotid].nfssl_seq + 1) == seqid) {
-		m_freem(slots[slotid].nfssl_reply);
+		if (slots[slotid].nfssl_reply != NULL)
+			m_freem(slots[slotid].nfssl_reply);
 		slots[slotid].nfssl_reply = NULL;
 		slots[slotid].nfssl_inprog = 1;
 		slots[slotid].nfssl_seq++;
@@ -3696,12 +3728,22 @@ nfsv4_seqsession(uint32_t seqid, uint32_t slotid, uint32_t highslot,
 
 /*
  * Cache this reply for the slot.
+ * Use the "rep" argument to return the cached reply if repstat is set to
+ * NFSERR_REPLYFROMCACHE. The client never sets repstat to this value.
  */
 void
-nfsv4_seqsess_cacherep(uint32_t slotid, struct nfsslot *slots, struct mbuf *rep)
+nfsv4_seqsess_cacherep(uint32_t slotid, struct nfsslot *slots, int repstat,
+   struct mbuf **rep)
 {
 
-	slots[slotid].nfssl_reply = rep;
+	if (repstat == NFSERR_REPLYFROMCACHE) {
+		*rep = slots[slotid].nfssl_reply;
+		slots[slotid].nfssl_reply = NULL;
+	} else {
+		if (slots[slotid].nfssl_reply != NULL)
+			m_freem(slots[slotid].nfssl_reply);
+		slots[slotid].nfssl_reply = *rep;
+	}
 	slots[slotid].nfssl_inprog = 0;
 }
 
@@ -3713,51 +3755,13 @@ nfsv4_setsequence(struct nfsmount *nmp, struct nfsrv_descript *nd,
     struct nfsclsession *sep, int dont_replycache)
 {
 	uint32_t *tl, slotseq = 0;
-	int i, maxslot, slotpos;
-	uint64_t bitval;
+	int error, maxslot, slotpos;
 	uint8_t sessionid[NFSX_V4SESSIONID];
 
-	/* Find an unused slot. */
-	slotpos = -1;
-	maxslot = -1;
-	mtx_lock(&sep->nfsess_mtx);
-	do {
-		bitval = 1;
-		for (i = 0; i < sep->nfsess_foreslots; i++) {
-			if ((bitval & sep->nfsess_slots) == 0) {
-				slotpos = i;
-				sep->nfsess_slots |= bitval;
-				sep->nfsess_slotseq[i]++;
-				slotseq = sep->nfsess_slotseq[i];
-				break;
-			}
-			bitval <<= 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", hz);
-		}
-	} while (slotpos == -1);
-	/* Now, find the highest slot in use. (nfsc_slots is 64bits) */
-	bitval = 1;
-	for (i = 0; i < 64; i++) {
-		if ((bitval & sep->nfsess_slots) != 0)
-			maxslot = i;
-		bitval <<= 1;
-	}
-	bcopy(sep->nfsess_sessionid, sessionid, NFSX_V4SESSIONID);
-	mtx_unlock(&sep->nfsess_mtx);
+	error = nfsv4_sequencelookup(nmp, sep, &slotpos, &maxslot, &slotseq,
+	    sessionid);
+	if (error != 0)
+		return;
 	KASSERT(maxslot >= 0, ("nfscl_setsequence neg maxslot"));
 
 	/* Build the Sequence arguments. */
@@ -3775,6 +3779,60 @@ nfsv4_setsequence(struct nfsmount *nmp, struct nfsrv_descript *nd,
 	nd->nd_flag |= ND_HASSEQUENCE;
 }
 
+int
+nfsv4_sequencelookup(struct nfsmount *nmp, struct nfsclsession *sep,
+    int *slotposp, int *maxslotp, uint32_t *slotseqp, uint8_t *sessionid)
+{
+	int i, maxslot, slotpos;
+	uint64_t bitval;
+
+	/* Find an unused slot. */
+	slotpos = -1;
+	maxslot = -1;
+	mtx_lock(&sep->nfsess_mtx);
+	do {
+		bitval = 1;
+		for (i = 0; i < sep->nfsess_foreslots; i++) {
+			if ((bitval & sep->nfsess_slots) == 0) {
+				slotpos = i;
+				sep->nfsess_slots |= bitval;
+				sep->nfsess_slotseq[i]++;
+				*slotseqp = sep->nfsess_slotseq[i];
+				break;
+			}
+			bitval <<= 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 != NULL &&
+			    (nmp->nm_mountp->mnt_kern_flag & MNTK_UNMOUNTF)
+			    != 0) {
+				mtx_unlock(&sep->nfsess_mtx);
+				return (ESTALE);
+			}
+			/* Wake up once/sec, to check for a forced dismount. */
+			(void)mtx_sleep(&sep->nfsess_slots, &sep->nfsess_mtx,
+			    PZERO, "nfsclseq", hz);
+		}
+	} while (slotpos == -1);
+	/* Now, find the highest slot in use. (nfsc_slots is 64bits) */
+	bitval = 1;
+	for (i = 0; i < 64; i++) {
+		if ((bitval & sep->nfsess_slots) != 0)
+			maxslot = i;
+		bitval <<= 1;
+	}
+	bcopy(sep->nfsess_sessionid, sessionid, NFSX_V4SESSIONID);
+	mtx_unlock(&sep->nfsess_mtx);
+	*slotposp = slotpos;
+	*maxslotp = maxslot;
+	return (0);
+}
+
 /*
  * Free a session slot.
  */
diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h
index 895829df823f..2abd7e4dc880 100644
--- a/sys/fs/nfs/nfs_var.h
+++ b/sys/fs/nfs/nfs_var.h
@@ -61,6 +61,7 @@ union nethostaddr;
 struct nfsstate;
 struct nfslock;
 struct nfsclient;
+struct nfsdsession;
 struct nfslockconflict;
 struct nfsd_idargs;
 struct nfsd_clid;
@@ -90,8 +91,11 @@ NFS_READDIR_ARGS;
 /* nfs_nfsdstate.c */
 int nfsrv_setclient(struct nfsrv_descript *, struct nfsclient **,
     nfsquad_t *, nfsquad_t *, NFSPROC_T *);
-int nfsrv_getclient(nfsquad_t, int, struct nfsclient **, nfsquad_t,
-    struct nfsrv_descript *, NFSPROC_T *);
+int nfsrv_getclient(nfsquad_t, int, struct nfsclient **, struct nfsdsession *,
+    nfsquad_t, uint32_t, struct nfsrv_descript *, NFSPROC_T *);
+int nfsrv_destroyclient(nfsquad_t, NFSPROC_T *);
+int nfsrv_destroysession(struct nfsrv_descript *, uint8_t *);
+int nfsrv_freestateid(struct nfsrv_descript *, nfsv4stateid_t *, NFSPROC_T *);
 int nfsrv_adminrevoke(struct nfsd_clid *, NFSPROC_T *);
 void nfsrv_dumpclients(struct nfsd_dumpclients *, int);
 void nfsrv_dumplocks(vnode_t, struct nfsd_dumplocks *, int, NFSPROC_T *);
@@ -105,8 +109,8 @@ int nfsrv_opencheck(nfsquad_t, nfsv4stateid_t *, struct nfsstate *,
     vnode_t, struct nfsrv_descript *, NFSPROC_T *, int);
 int nfsrv_openupdate(vnode_t, struct nfsstate *, nfsquad_t,
     nfsv4stateid_t *, struct nfsrv_descript *, NFSPROC_T *);
-int nfsrv_delegupdate(nfsquad_t, nfsv4stateid_t *, vnode_t, int,
-    struct ucred *, NFSPROC_T *);
+int nfsrv_delegupdate(struct nfsrv_descript *, nfsquad_t, nfsv4stateid_t *,
+    vnode_t, int, struct ucred *, NFSPROC_T *);
 int nfsrv_releaselckown(struct nfsstate *, nfsquad_t, NFSPROC_T *);
 void nfsrv_zapclient(struct nfsclient *, NFSPROC_T *);
 int nfssvc_idname(struct nfsd_idargs *);
@@ -127,6 +131,10 @@ int nfsrv_checkgetattr(struct nfsrv_descript *, vnode_t,
 int nfsrv_nfsuserdport(u_short, NFSPROC_T *);
 void nfsrv_nfsuserddelport(void);
 void nfsrv_throwawayallstate(NFSPROC_T *);
+int nfsrv_checksequence(struct nfsrv_descript *, uint32_t, uint32_t *,
+    uint32_t *, int, uint32_t *, NFSPROC_T *);
+int nfsrv_checkreclaimcomplete(struct nfsrv_descript *);
+void nfsrv_cache_session(uint8_t *, uint32_t, int, struct mbuf **);
 
 /* nfs_nfsdserv.c */
 int nfsrvd_access(struct nfsrv_descript *, int,
@@ -211,10 +219,27 @@ int nfsrvd_releaselckown(struct nfsrv_descript *, int,
     vnode_t, NFSPROC_T *, struct nfsexstuff *);
 int nfsrvd_pathconf(struct nfsrv_descript *, int,
     vnode_t, NFSPROC_T *, struct nfsexstuff *);
+int nfsrvd_exchangeid(struct nfsrv_descript *, int,
+    vnode_t, NFSPROC_T *, struct nfsexstuff *);
+int nfsrvd_createsession(struct nfsrv_descript *, int,
+    vnode_t, NFSPROC_T *, struct nfsexstuff *);
+int nfsrvd_sequence(struct nfsrv_descript *, int,
+    vnode_t, NFSPROC_T *, struct nfsexstuff *);
+int nfsrvd_reclaimcomplete(struct nfsrv_descript *, int,
+    vnode_t, NFSPROC_T *, struct nfsexstuff *);
+int nfsrvd_destroyclientid(struct nfsrv_descript *, int,
+    vnode_t, NFSPROC_T *, struct nfsexstuff *);
+int nfsrvd_destroysession(struct nfsrv_descript *, int,
+    vnode_t, NFSPROC_T *, struct nfsexstuff *);
+int nfsrvd_freestateid(struct nfsrv_descript *, int,
+    vnode_t, NFSPROC_T *, struct nfsexstuff *);
+int nfsrvd_notsupp(struct nfsrv_descript *, int,
+    vnode_t, NFSPROC_T *, struct nfsexstuff *);
 
 /* nfs_nfsdsocket.c */
 void nfsrvd_rephead(struct nfsrv_descript *);
-void nfsrvd_dorpc(struct nfsrv_descript *, int, NFSPROC_T *);
+void nfsrvd_dorpc(struct nfsrv_descript *, int, u_char *, int, u_int32_t,
+    NFSPROC_T *);
 
 /* nfs_nfsdcache.c */
 void nfsrvd_initcache(void);
@@ -264,9 +289,11 @@ int nfsv4_getipaddr(struct nfsrv_descript *, struct sockaddr_storage *,
     int *);
 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_seqsess_cacherep(uint32_t, struct nfsslot *, int, struct mbuf **);
 void nfsv4_setsequence(struct nfsmount *, struct nfsrv_descript *,
     struct nfsclsession *, int);
+int nfsv4_sequencelookup(struct nfsmount *, struct nfsclsession *, int *,
+    int *, uint32_t *, uint8_t *);
 void nfsv4_freeslot(struct nfsclsession *, int);
 
 /* nfs_clcomsubs.c */
@@ -322,6 +349,8 @@ int nfsrv_parsename(struct nfsrv_descript *, char *, u_long *,
     NFSPATHLEN_T *);
 void nfsd_init(void);
 int nfsd_checkrootexp(struct nfsrv_descript *);
+void nfsd_getminorvers(struct nfsrv_descript *, u_char *, u_char **, int *,
+    u_int32_t *);
 
 /* nfs_clvfsops.c */
 void nfscl_retopts(struct nfsmount *, char *, size_t);
@@ -628,6 +657,7 @@ int nfsvno_advlock(vnode_t, int, u_int64_t, u_int64_t, NFSPROC_T *);
 int nfsrv_v4rootexport(void *, struct ucred *, NFSPROC_T *);
 int nfsvno_testexp(struct nfsrv_descript *, struct nfsexstuff *);
 uint32_t nfsrv_hashfh(fhandle_t *);
+uint32_t nfsrv_hashsessionid(uint8_t *);
 void nfsrv_backupstable(void);
 
 /* nfs_commonkrpc.c */
diff --git a/sys/fs/nfs/nfsclstate.h b/sys/fs/nfs/nfsclstate.h
index aa2bfee90586..c66d68aa36ef 100644
--- a/sys/fs/nfs/nfsclstate.h
+++ b/sys/fs/nfs/nfsclstate.h
@@ -57,6 +57,7 @@ struct nfsclsession {
 	struct mtx	nfsess_mtx;
 	struct nfsslot	nfsess_cbslots[NFSV4_CBSLOTS];
 	nfsquad_t	nfsess_clientid;
+	SVCXPRT		*nfsess_xprt;		/* For backchannel callback */
 	uint32_t	nfsess_slotseq[64];	/* Max for 64bit nm_slots */
 	uint64_t	nfsess_slots;
 	uint32_t	nfsess_sequenceid;
diff --git a/sys/fs/nfs/nfsdport.h b/sys/fs/nfs/nfsdport.h
index a09a6dd1ee62..efa4b12500ca 100644
--- a/sys/fs/nfs/nfsdport.h
+++ b/sys/fs/nfs/nfsdport.h
@@ -115,3 +115,9 @@ struct nfsexstuff {
 #define	NFSRV_MINFH	(sizeof (fhandle_t))
 #define	NFSRV_MAXFH	(sizeof (fhandle_t))
 
+/* Use this macro for debug printfs. */
+#define	NFSD_DEBUG(level, ...)	do {					\
+		if (nfsd_debuglevel >= (level))				\
+			printf(__VA_ARGS__);				\
+	} while (0)
+
diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h
index a34ddd3f60ad..88c7a34ae3ff 100644
--- a/sys/fs/nfs/nfsport.h
+++ b/sys/fs/nfs/nfsport.h
@@ -638,6 +638,9 @@ void nfsrvd_rcv(struct socket *, void *, int);
 #define	NFSUNLOCKSOCKREQ(r)	mtx_unlock(&((r)->nr_mtx))
 #define	NFSLOCKDS(d)		mtx_lock(&((d)->nfsclds_mtx))
 #define	NFSUNLOCKDS(d)		mtx_unlock(&((d)->nfsclds_mtx))
+#define	NFSSESSIONMUTEXPTR(s)	(&((s)->mtx))
+#define	NFSLOCKSESSION(s)	mtx_lock(&((s)->mtx))
+#define	NFSUNLOCKSESSION(s)	mtx_unlock(&((s)->mtx))
 
 /*
  * Use these macros to initialize/free a mutex.
@@ -733,6 +736,7 @@ MALLOC_DECLARE(M_NEWNFSDEVINFO);
 MALLOC_DECLARE(M_NEWNFSSOCKREQ);
 MALLOC_DECLARE(M_NEWNFSCLDS);
 MALLOC_DECLARE(M_NEWNFSLAYRECALL);
+MALLOC_DECLARE(M_NEWNFSDSESSION);
 #define	M_NFSRVCACHE	M_NEWNFSRVCACHE
 #define	M_NFSDCLIENT	M_NEWNFSDCLIENT
 #define	M_NFSDSTATE	M_NEWNFSDSTATE
@@ -758,6 +762,7 @@ MALLOC_DECLARE(M_NEWNFSLAYRECALL);
 #define	M_NFSSOCKREQ	M_NEWNFSSOCKREQ
 #define	M_NFSCLDS	M_NEWNFSCLDS
 #define	M_NFSLAYRECALL	M_NEWNFSLAYRECALL
+#define	M_NFSDSESSION	M_NEWNFSDSESSION
 
 #define	NFSINT_SIGMASK(set) 						\
 	(SIGISMEMBER(set, SIGINT) || SIGISMEMBER(set, SIGTERM) ||	\
diff --git a/sys/fs/nfs/nfsproto.h b/sys/fs/nfs/nfsproto.h
index 6836661ee823..731be0777c15 100644
--- a/sys/fs/nfs/nfsproto.h
+++ b/sys/fs/nfs/nfsproto.h
@@ -389,9 +389,13 @@
 #define	NFSV4OPEN_CLAIMPREVIOUS		1
 #define	NFSV4OPEN_CLAIMDELEGATECUR	2
 #define	NFSV4OPEN_CLAIMDELEGATEPREV	3
+#define	NFSV4OPEN_CLAIMFH		4
+#define	NFSV4OPEN_CLAIMDELEGATECURFH	5
+#define	NFSV4OPEN_CLAIMDELEGATEPREVFH	6
 #define	NFSV4OPEN_DELEGATENONE		0
 #define	NFSV4OPEN_DELEGATEREAD		1
 #define	NFSV4OPEN_DELEGATEWRITE		2
+#define	NFSV4OPEN_DELEGATENONEEXT	3
 #define	NFSV4OPEN_LIMITSIZE		1
 #define	NFSV4OPEN_LIMITBLOCKS		2
 
@@ -479,23 +483,50 @@
 #define	NFSV4OPEN_ACCESSREAD		0x00000001
 #define	NFSV4OPEN_ACCESSWRITE		0x00000002
 #define	NFSV4OPEN_ACCESSBOTH		0x00000003
+#define	NFSV4OPEN_WANTDELEGMASK		0x0000ff00
+#define	NFSV4OPEN_WANTREADDELEG		0x00000100
+#define	NFSV4OPEN_WANTWRITEDELEG	0x00000200
+#define	NFSV4OPEN_WANTANYDELEG		0x00000300
+#define	NFSV4OPEN_WANTNODELEG		0x00000400
+#define	NFSV4OPEN_WANTCANCEL		0x00000500
+#define	NFSV4OPEN_WANTSIGNALDELEG	0x00010000
+#define	NFSV4OPEN_WANTPUSHDELEG		0x00020000
 
 #define	NFSV4OPEN_DENYNONE		0x00000000
 #define	NFSV4OPEN_DENYREAD		0x00000001
 #define	NFSV4OPEN_DENYWRITE		0x00000002
 #define	NFSV4OPEN_DENYBOTH		0x00000003
 
+/*
+ * Delegate_none_ext reply values.
+ */
+#define	NFSV4OPEN_NOTWANTED		0
+#define	NFSV4OPEN_CONTENTION		1
+#define	NFSV4OPEN_RESOURCE		2
+#define	NFSV4OPEN_NOTSUPPFTYPE		3
+#define	NFSV4OPEN_NOTSUPPWRITEFTYPE	4
+#define	NFSV4OPEN_NOTSUPPUPGRADE	5
+#define	NFSV4OPEN_NOTSUPPDOWNGRADE	6
+#define	NFSV4OPEN_CANCELLED		7
+#define	NFSV4OPEN_ISDIR			8
+
 /*
  * Open result flags
- * (The first two are in the spec. The rest are used internally.)
+ * (The first four are in the spec. The rest are used internally.)
  */
 #define	NFSV4OPEN_RESULTCONFIRM		0x00000002
 #define	NFSV4OPEN_LOCKTYPEPOSIX		0x00000004
+#define	NFSV4OPEN_PRESERVEUNLINKED	0x00000008
+#define	NFSV4OPEN_MAYNOTIFYLOCK		0x00000020
 #define	NFSV4OPEN_RFLAGS 						\
-		(NFSV4OPEN_RESULTCONFIRM | NFSV4OPEN_LOCKTYPEPOSIX)
+    (NFSV4OPEN_RESULTCONFIRM | NFSV4OPEN_LOCKTYPEPOSIX |		\
+    NFSV4OPEN_PRESERVEUNLINKED | NFSV4OPEN_MAYNOTIFYLOCK)
 #define	NFSV4OPEN_RECALL		0x00010000
 #define	NFSV4OPEN_READDELEGATE		0x00020000
 #define	NFSV4OPEN_WRITEDELEGATE		0x00040000
+#define	NFSV4OPEN_WDRESOURCE		0x00080000
+#define	NFSV4OPEN_WDCONTENTION		0x00100000
+#define	NFSV4OPEN_WDNOTWANTED		0x00200000
 
 /*
  * NFS V4 File Handle types
@@ -805,6 +836,27 @@ struct nfsv3_sattr {
 #define	NFSATTRBIT_TIMEMODIFY		53
 #define	NFSATTRBIT_TIMEMODIFYSET	54
 #define	NFSATTRBIT_MOUNTEDONFILEID	55
+#define	NFSATTRBIT_DIRNOTIFDELAY	56
+#define	NFSATTRBIT_DIRENTNOTIFDELAY	57
+#define	NFSATTRBIT_DACL			58
+#define	NFSATTRBIT_SACL			59
+#define	NFSATTRBIT_CHANGEPOLICY		60
+#define	NFSATTRBIT_FSSTATUS		61
+#define	NFSATTRBIT_FSLAYOUTTYPE		62
+#define	NFSATTRBIT_LAYOUTHINT		63
+#define	NFSATTRBIT_LAYOUTTYPE		64
+#define	NFSATTRBIT_LAYOUTBLKSIZE	65
+#define	NFSATTRBIT_LAYOUTALIGNMENT	66
+#define	NFSATTRBIT_FSLOCATIONSINFO	67
+#define	NFSATTRBIT_MDSTHRESHOLD		68
+#define	NFSATTRBIT_RETENTIONGET		69
+#define	NFSATTRBIT_RETENTIONSET		70
+#define	NFSATTRBIT_RETENTEVTGET		71
+#define	NFSATTRBIT_RETENTEVTSET		72
+#define	NFSATTRBIT_RETENTIONHOLD	73
+#define	NFSATTRBIT_MODESETMASKED	74
+#define	NFSATTRBIT_SUPPATTREXCLCREAT	75
+#define	NFSATTRBIT_FSCHARSETCAP		76
 
 #define	NFSATTRBM_SUPPORTEDATTRS	0x00000001
 #define	NFSATTRBM_TYPE			0x00000002
@@ -862,8 +914,29 @@ struct nfsv3_sattr {
 #define	NFSATTRBM_TIMEMODIFY		0x00200000
 #define	NFSATTRBM_TIMEMODIFYSET		0x00400000
 #define	NFSATTRBM_MOUNTEDONFILEID	0x00800000
+#define	NFSATTRBM_DIRNOTIFDELAY		0x01000000
+#define	NFSATTRBM_DIRENTNOTIFDELAY	0x02000000
+#define	NFSATTRBM_DACL			0x04000000
+#define	NFSATTRBM_SACL			0x08000000
+#define	NFSATTRBM_CHANGEPOLICY		0x10000000
+#define	NFSATTRBM_FSSTATUS		0x20000000
+#define	NFSATTRBM_FSLAYOUTTYPE		0x40000000
+#define	NFSATTRBM_LAYOUTHINT		0x80000000
+#define	NFSATTRBM_LAYOUTTYPE		0x00000001
+#define	NFSATTRBM_LAYOUTBLKSIZE		0x00000002
+#define	NFSATTRBM_LAYOUTALIGNMENT	0x00000004
+#define	NFSATTRBM_FSLOCATIONSINFO	0x00000008
+#define	NFSATTRBM_MDSTHRESHOLD		0x00000010
+#define	NFSATTRBM_RETENTIONGET		0x00000020
+#define	NFSATTRBM_RETENTIONSET		0x00000040
+#define	NFSATTRBM_RETENTEVTGET		0x00000080
+#define	NFSATTRBM_RETENTEVTSET		0x00000100
+#define	NFSATTRBM_RETENTIONHOLD		0x00000200
+#define	NFSATTRBM_MODESETMASKED		0x00000400
+#define	NFSATTRBM_SUPPATTREXCLCREAT	0x00000800
+#define	NFSATTRBM_FSCHARSETCAP		0x00001000
 
-#define	NFSATTRBIT_MAX			56
+#define	NFSATTRBIT_MAX			77
 
 /*
  * Sets of attributes that are supported, by words in the bitmap.
@@ -871,6 +944,7 @@ struct nfsv3_sattr {
 /*
  * NFSATTRBIT_SUPPORTED - SUPP0 - bits 0<->31
  *			  SUPP1 - bits 32<->63
+ *			  SUPP2 - bits 64<->95
  */
 #define	NFSATTRBIT_SUPP0						\
  	(NFSATTRBM_SUPPORTEDATTRS |					\
@@ -937,6 +1011,8 @@ struct nfsv3_sattr {
 #define	NFSATTRBIT_SUPP1	NFSATTRBIT_S1
 #endif
 
+#define	NFSATTRBIT_SUPP2	NFSATTRBM_SUPPATTREXCLCREAT
+
 /*
  * NFSATTRBIT_SUPPSETONLY is the OR of NFSATTRBIT_TIMEACCESSSET and
  * NFSATTRBIT_TIMEMODIFYSET.
@@ -947,6 +1023,7 @@ struct nfsv3_sattr {
 /*
  * NFSATTRBIT_SETABLE - SETABLE0 - bits 0<->31
  *			SETABLE1 - bits 32<->63
+ *			SETABLE2 - bits 64<->95
  */
 #define	NFSATTRBIT_SETABLE0						\
 	(NFSATTRBM_SIZE |						\
@@ -957,6 +1034,7 @@ struct nfsv3_sattr {
  	NFSATTRBM_OWNERGROUP |						\
  	NFSATTRBM_TIMEACCESSSET |					\
  	NFSATTRBM_TIMEMODIFYSET)
+#define	NFSATTRBIT_SETABLE2		0
 
 /*
  * Set of attributes that the getattr vnode op needs.
@@ -986,6 +1064,11 @@ struct nfsv3_sattr {
  	NFSATTRBM_TIMEMETADATA |					\
  	NFSATTRBM_TIMEMODIFY)
 
+/*
+ * NFSATTRBIT_GETATTR2 - bits 64<->95
+ */
+#define	NFSATTRBIT_GETATTR2		0
+
 /*
  * Subset of the above that the Write RPC gets.
  * OR of the following bits.
@@ -1012,6 +1095,11 @@ struct nfsv3_sattr {
  	NFSATTRBM_TIMEMETADATA |					\
  	NFSATTRBM_TIMEMODIFY)
 
+/*
+ * NFSATTRBIT_WRITEGETATTR2 - bits 64<->95
+ */
+#define	NFSATTRBIT_WRITEGETATTR2	0
+
 /*
  * Set of attributes that the wccattr operation op needs.
  * OR of the following bits.
@@ -1025,6 +1113,11 @@ struct nfsv3_sattr {
 #define	NFSATTRBIT_WCCATTR1						\
  	(NFSATTRBM_TIMEMODIFY)
 
+/*
+ * NFSATTRBIT_WCCATTR2 - bits 64<->95
+ */
+#define	NFSATTRBIT_WCCATTR2		0
+
 /*
  * NFSATTRBIT_CBGETATTR0 - bits 0<->31
  */
@@ -1035,6 +1128,11 @@ struct nfsv3_sattr {
  */
 #define	NFSATTRBIT_CBGETATTR1		0x0
 
+/*
+ * NFSATTRBIT_CBGETATTR2 - bits 64<->95
+ */
+#define	NFSATTRBIT_CBGETATTR2		0x0
+
 /*
  * Sets of attributes that require a VFS_STATFS() call to get the
  * values of.
@@ -1066,6 +1164,11 @@ struct nfsv3_sattr {
  	NFSATTRBM_SPACEUSED |						\
 	NFSATTRBM_TIMEDELTA)
 
+/*
+ * NFSATTRBIT_STATFS2 - bits 64<->95
+ */
+#define	NFSATTRBIT_STATFS2		0
+
 /*
  * These are the bits that are needed by the nfs_statfs() call.
  * (The regular getattr bits are or'd in so the vnode gets the correct
@@ -1093,6 +1196,11 @@ struct nfsv3_sattr {
 				NFSATTRBM_SPACETOTAL |			\
 				NFSATTRBM_TIMEDELTA)
 
+/*
+ * NFSGETATTRBIT_STATFS2 - bits 64<->95
+ */
+#define	NFSGETATTRBIT_STATFS2		0
+
 /*
  * Set of attributes for the equivalent of an nfsv3 pathconf rpc.
  * NFSGETATTRBIT_PATHCONF0 - bits 0<->31
@@ -1110,6 +1218,11 @@ struct nfsv3_sattr {
 #define	NFSGETATTRBIT_PATHCONF1	(NFSATTRBIT_GETATTR1 |			\
 				NFSATTRBM_NOTRUNC)
 
+/*
+ * NFSGETATTRBIT_PATHCONF2 - bits 64<->95
+ */
+#define	NFSGETATTRBIT_PATHCONF2		0
+
 /*
  * Sets of attributes required by readdir and readdirplus.
  * NFSATTRBIT_READDIRPLUS0	(NFSATTRBIT_GETATTR0 | NFSATTRBIT_FILEHANDLE |
@@ -1118,6 +1231,7 @@ struct nfsv3_sattr {
 #define	NFSATTRBIT_READDIRPLUS0	(NFSATTRBIT_GETATTR0 | NFSATTRBM_FILEHANDLE | \
 				NFSATTRBM_RDATTRERROR)
 #define	NFSATTRBIT_READDIRPLUS1	NFSATTRBIT_GETATTR1
+#define	NFSATTRBIT_READDIRPLUS2		0
 
 /*
  * Set of attributes supported by Referral vnodes.
@@ -1125,6 +1239,7 @@ struct nfsv3_sattr {
 #define	NFSATTRBIT_REFERRAL0	(NFSATTRBM_TYPE | NFSATTRBM_FSID |	\
 	NFSATTRBM_RDATTRERROR | NFSATTRBM_FSLOCATIONS)
 #define	NFSATTRBIT_REFERRAL1	NFSATTRBM_MOUNTEDONFILEID
+#define	NFSATTRBIT_REFERRAL2		0
 
 /*
  * Structure for data handled by the statfs rpc. Since some fields are
diff --git a/sys/fs/nfs/nfsrvcache.h b/sys/fs/nfs/nfsrvcache.h
index 7db303584ac3..119a68dc1094 100644
--- a/sys/fs/nfs/nfsrvcache.h
+++ b/sys/fs/nfs/nfsrvcache.h
@@ -116,7 +116,6 @@ LIST_HEAD(nfsrvhashhead, nfsrvcache);
 /* The fine-grained locked cache hash table for TCP. */
 struct nfsrchash_bucket {
 	struct mtx		mtx;
-	char			lock_name[16];
 	struct nfsrvhashhead	tbl;
 };
 
diff --git a/sys/fs/nfs/nfsrvstate.h b/sys/fs/nfs/nfsrvstate.h
index 964b998aed04..59a0542c1c9c 100644
--- a/sys/fs/nfs/nfsrvstate.h
+++ b/sys/fs/nfs/nfsrvstate.h
@@ -42,6 +42,8 @@ LIST_HEAD(nfsclienthashhead, nfsclient);
 LIST_HEAD(nfsstatehead, nfsstate);
 LIST_HEAD(nfslockhead, nfslock);
 LIST_HEAD(nfslockhashhead, nfslockfile);
+LIST_HEAD(nfssessionhead, nfsdsession);
+LIST_HEAD(nfssessionhashhead, nfsdsession);
 
 /*
  * List head for nfsusrgrp.
@@ -64,6 +66,13 @@ TAILQ_HEAD(nfsuserlruhead, nfsusrgrp);
 	(&nfsgroupnamehash[((l)>=4?(*(p)+*((p)+1)+*((p)+2)+*((p)+3)):*(p)) \
 		% NFSGROUPHASHSIZE])
 
+struct nfssessionhash {
+	struct mtx			mtx;
+	struct nfssessionhashhead	list;
+};
+#define	NFSSESSIONHASH(f) 						\
+	(&nfssessionhash[nfsrv_hashsessionid(f) % NFSSESSIONHASHSIZE])
+
 /*
  * Client server structure for V4. It is doubly linked into two lists.
  * The first is a hash table based on the clientid and the second is a
@@ -76,6 +85,7 @@ struct nfsclient {
 	struct nfsstatehead lc_open;		/* Open owner list */
 	struct nfsstatehead lc_deleg;		/* Delegations */
 	struct nfsstatehead lc_olddeleg;	/* and old delegations */
+	struct nfssessionhead lc_session;	/* List of NFSv4.1 sessions */
 	time_t		lc_expiry;		/* Expiry time (sec) */
 	time_t		lc_delegtime;		/* Old deleg expiry (sec) */
 	nfsquad_t	lc_clientid;		/* 64 bit clientid */
@@ -100,6 +110,43 @@ struct nfsclient {
 #define	CLOPS_RENEW		0x0002
 #define	CLOPS_RENEWOP		0x0004
 
+/*
+ * Structure for an NFSv4.1 session.
+ * Locking rules for this structure.
+ * To add/delete one of these structures from the lists, you must lock
+ * both: NFSLOCKSESSION(session hashhead) and NFSLOCKSTATE() in that order.
+ * To traverse the lists looking for one of these, you must hold one
+ * of these two locks.
+ * The exception is if the thread holds the exclusive root sleep lock.
+ * In this case, all other nfsd threads are blocked, so locking the
+ * mutexes isn't required.
+ * When manipulating sess_refcnt, NFSLOCKSTATE() must be locked.
+ * When manipulating the fields withinsess_cbsess except nfsess_xprt,
+ * sess_cbsess.nfsess_mtx must be locked.
+ * When manipulating sess_slots and sess_cbsess.nfsess_xprt,
+ * NFSLOCKSESSION(session hashhead) must be locked.
+ */
+struct nfsdsession {
+	uint64_t		sess_refcnt;	/* Reference count. */
+	LIST_ENTRY(nfsdsession)	sess_hash;	/* Hash list of sessions. */
+	LIST_ENTRY(nfsdsession)	sess_list;	/* List of client sessions. */
+	struct nfsslot		sess_slots[NFSV4_SLOTS];
+	struct nfsclient	*sess_clp;	/* Associated clientid. */
+	uint32_t		sess_crflags;
+	uint32_t		sess_cbprogram;
+	uint32_t		sess_maxreq;
+	uint32_t		sess_maxresp;
+	uint32_t		sess_maxrespcached;
+	uint32_t		sess_maxops;
+	uint32_t		sess_maxslots;
+	uint32_t		sess_cbmaxreq;
+	uint32_t		sess_cbmaxresp;
+	uint32_t		sess_cbmaxrespcached;
+	uint32_t		sess_cbmaxops;
+	uint8_t			sess_sessionid[NFSX_V4SESSIONID];
+	struct nfsclsession	sess_cbsess;	/* Callback session. */
+};
+
 /*
  * Nfs state structure. I couldn't resist overloading this one, since
  * it makes cleanup, etc. simpler. These structures are used in four ways:
diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c
index 5fa302f102bd..2600b80ea5d1 100644
--- a/sys/fs/nfsclient/nfs_clstate.c
+++ b/sys/fs/nfsclient/nfs_clstate.c
@@ -280,6 +280,23 @@ nfscl_open(vnode_t vp, u_int8_t *nfhp, int fhlen, u_int32_t amode, int usedeleg,
 	nfscl_newopen(clp, dp, &owp, &nowp, &op, &nop, own, nfhp, fhlen,
 	    newonep);
 
+	/*
+	 * Now, check the mode on the open and return the appropriate
+	 * value.
+	 */
+	if (retp != NULL) {
+		if (nfhp != NULL && dp != NULL && nop == NULL)
+			/* new local open on delegation */
+			*retp = NFSCLOPEN_SETCRED;
+		else
+			*retp = NFSCLOPEN_OK;
+	}
+	if (op != NULL && (amode & ~(op->nfso_mode))) {
+		op->nfso_mode |= amode;
+		if (retp != NULL && dp == NULL)
+			*retp = NFSCLOPEN_DOOPEN;
+	}
+
 	/*
 	 * Serialize modifications to the open owner for multiple threads
 	 * within the same process using a read/write sleep lock.
@@ -295,23 +312,6 @@ nfscl_open(vnode_t vp, u_int8_t *nfhp, int fhlen, u_int32_t amode, int usedeleg,
 		*owpp = owp;
 	if (opp != NULL)
 		*opp = op;
-	if (retp != NULL) {
-		if (nfhp != NULL && dp != NULL && nop == NULL)
-			/* new local open on delegation */
-			*retp = NFSCLOPEN_SETCRED;
-		else
-			*retp = NFSCLOPEN_OK;
-	}
-
-	/*
-	 * Now, check the mode on the open and return the appropriate
-	 * value.
-	 */
-	if (op != NULL && (amode & ~(op->nfso_mode))) {
-		op->nfso_mode |= amode;
-		if (retp != NULL && dp == NULL)
-			*retp = NFSCLOPEN_DOOPEN;
-	}
 	return (0);
 }
 
@@ -3548,7 +3548,7 @@ nfscl_docb(struct nfsrv_descript *nd, NFSPROC_T *p)
 		if (clp != NULL) {
 			nfsv4_seqsess_cacherep(slotid,
 			    NFSMNT_MDSSESSION(clp->nfsc_nmp)->nfsess_cbslots,
-			    rep);
+			    NFSERR_OK, &rep);
 			NFSUNLOCKCLSTATE();
 		} else {
 			NFSUNLOCKCLSTATE();
diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c
index 2d13b06b6db7..9570b70092ac 100644
--- a/sys/fs/nfsclient/nfs_clvnops.c
+++ b/sys/fs/nfsclient/nfs_clvnops.c
@@ -1976,10 +1976,6 @@ nfs_link(struct vop_link_args *ap)
 	struct nfsvattr nfsva, dnfsva;
 	int error = 0, attrflag, dattrflag;
 
-	if (vp->v_mount != tdvp->v_mount) {
-		return (EXDEV);
-	}
-
 	/*
 	 * Push all writes to the server, so that the attribute cache
 	 * doesn't get "out of sync" with the server.
diff --git a/sys/fs/nfsserver/nfs_nfsdcache.c b/sys/fs/nfsserver/nfs_nfsdcache.c
index 2c4a654e5679..0f78b3f06ec1 100644
--- a/sys/fs/nfsserver/nfs_nfsdcache.c
+++ b/sys/fs/nfsserver/nfs_nfsdcache.c
@@ -977,6 +977,9 @@ nfsrvd_refcache(struct nfsrvcache *rp)
 {
 	struct mtx *mutex;
 
+	if (rp == NULL)
+		/* For NFSv4.1, there is no cache entry. */
+		return;
 	mutex = nfsrc_cachemutex(rp);
 	mtx_lock(mutex);
 	if (rp->rc_refcnt < 0)
diff --git a/sys/fs/nfsserver/nfs_nfsdkrpc.c b/sys/fs/nfsserver/nfs_nfsdkrpc.c
index 96490937cb60..d2145ccdb549 100644
--- a/sys/fs/nfsserver/nfs_nfsdkrpc.c
+++ b/sys/fs/nfsserver/nfs_nfsdkrpc.c
@@ -305,7 +305,10 @@ nfs_proc(struct nfsrv_descript *nd, u_int32_t xid, SVCXPRT *xprt,
     struct nfsrvcache **rpp)
 {
 	struct thread *td = curthread;
-	int cacherep = RC_DOIT, isdgram;
+	int cacherep = RC_DOIT, isdgram, taglen = -1;
+	struct mbuf *m;
+	u_char tag[NFSV4_SMALLSTR + 1], *tagstr = NULL;
+	u_int32_t minorvers = 0;
 	uint32_t ack;
 
 	*rpp = NULL;
@@ -339,10 +342,18 @@ nfs_proc(struct nfsrv_descript *nd, u_int32_t xid, SVCXPRT *xprt,
 		nd->nd_retxid = xid;
 		nd->nd_tcpconntime = NFSD_MONOSEC;
 		nd->nd_sockref = xprt->xp_sockref;
-		cacherep = nfsrvd_getcache(nd);
-		ack = 0;
-		SVC_ACK(xprt, &ack);
-		nfsrc_trimcache(xprt->xp_sockref, ack, 0);
+		if ((nd->nd_flag & ND_NFSV4) != 0)
+			nfsd_getminorvers(nd, tag, &tagstr, &taglen,
+			    &minorvers);
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			/* NFSv4.1 caches replies in the session slots. */
+			cacherep = RC_DOIT;
+		else {
+			cacherep = nfsrvd_getcache(nd);
+			ack = 0;
+			SVC_ACK(xprt, &ack);
+			nfsrc_trimcache(xprt->xp_sockref, ack, 0);
+		}
 	}
 
 	/*
@@ -352,13 +363,33 @@ nfs_proc(struct nfsrv_descript *nd, u_int32_t xid, SVCXPRT *xprt,
 	 * RC_DROPIT - just throw the request away
 	 */
 	if (cacherep == RC_DOIT) {
-		nfsrvd_dorpc(nd, isdgram, td);
-		if (nd->nd_repstat == NFSERR_DONTREPLY)
-			cacherep = RC_DROPIT;
-		else
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			nd->nd_xprt = xprt;
+		nfsrvd_dorpc(nd, isdgram, tagstr, taglen, minorvers, td);
+		if ((nd->nd_flag & ND_NFSV41) != 0) {
+			if (nd->nd_repstat != NFSERR_REPLYFROMCACHE &&
+			    (nd->nd_flag & ND_SAVEREPLY) != 0) {
+				/* Cache a copy of the reply. */
+				m = m_copym(nd->nd_mreq, 0, M_COPYALL,
+				    M_WAITOK);
+			} else
+				m = NULL;
+			if ((nd->nd_flag & ND_HASSEQUENCE) != 0)
+				nfsrv_cache_session(nd->nd_sessionid,
+				    nd->nd_slotid, nd->nd_repstat, &m);
+			if (nd->nd_repstat == NFSERR_REPLYFROMCACHE)
+				nd->nd_repstat = 0;
 			cacherep = RC_REPLY;
-		*rpp = nfsrvd_updatecache(nd);
+		} else {
+			if (nd->nd_repstat == NFSERR_DONTREPLY)
+				cacherep = RC_DROPIT;
+			else
+				cacherep = RC_REPLY;
+			*rpp = nfsrvd_updatecache(nd);
+		}
 	}
+	if (tagstr != NULL && taglen > NFSV4_SMALLSTR)
+		free(tagstr, M_TEMP);
 
 	NFSEXITCODE2(0, nd);
 	return (cacherep);
diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c
index 0979864c70db..1973c14f41b4 100644
--- a/sys/fs/nfsserver/nfs_nfsdport.c
+++ b/sys/fs/nfsserver/nfs_nfsdport.c
@@ -58,6 +58,7 @@ extern struct nfsrv_stablefirst nfsrv_stablefirst;
 extern void (*nfsd_call_servertimer)(void);
 extern SVCPOOL	*nfsrvd_pool;
 extern struct nfsv4lock nfsd_suspend_lock;
+extern struct nfssessionhash nfssessionhash[NFSSESSIONHASHSIZE];
 struct vfsoptlist nfsv4root_opt, nfsv4root_newopt;
 NFSDLOCKMUTEX;
 struct nfsrchash_bucket nfsrchash_table[NFSRVCACHE_HASHSIZE];
@@ -67,6 +68,7 @@ struct mtx nfs_v4root_mutex;
 struct nfsrvfh nfs_rootfh, nfs_pubfh;
 int nfs_pubfhset = 0, nfs_rootfhset = 0;
 struct proc *nfsd_master_proc = NULL;
+int nfsd_debuglevel = 0;
 static pid_t nfsd_master_pid = (pid_t)-1;
 static char nfsd_master_comm[MAXCOMLEN + 1];
 static struct timeval nfsd_master_start;
@@ -93,6 +95,8 @@ SYSCTL_INT(_vfs_nfsd, OID_AUTO, issue_delegations, CTLFLAG_RW,
     &nfsrv_issuedelegs, 0, "Enable nfsd to issue delegations");
 SYSCTL_INT(_vfs_nfsd, OID_AUTO, enable_locallocks, CTLFLAG_RW,
     &nfsrv_dolocallocks, 0, "Enable nfsd to acquire local locks on files");
+SYSCTL_INT(_vfs_nfsd, OID_AUTO, debuglevel, CTLFLAG_RW, &nfsd_debuglevel,
+    0, "Debug level for new nfs server");
 SYSCTL_INT(_vfs_nfsd, OID_AUTO, enable_stringtouid, CTLFLAG_RW,
     &nfsd_enable_stringtouid, 0, "Enable nfsd to accept numeric owner_names");
 
@@ -1551,7 +1555,7 @@ nfsrvd_readdir(struct nfsrv_descript *nd, int isdgram,
 	u_long *cookies = NULL, *cookiep;
 	struct uio io;
 	struct iovec iv;
-	int not_zfs;
+	int is_ufs;
 
 	if (nd->nd_repstat) {
 		nfsrv_postopattr(nd, getret, &at);
@@ -1606,7 +1610,7 @@ nfsrvd_readdir(struct nfsrv_descript *nd, int isdgram,
 			nfsrv_postopattr(nd, getret, &at);
 		goto out;
 	}
-	not_zfs = strcmp(vp->v_mount->mnt_vfc->vfc_name, "zfs");
+	is_ufs = strcmp(vp->v_mount->mnt_vfc->vfc_name, "ufs") == 0;
 	MALLOC(rbuf, caddr_t, siz, M_TEMP, M_WAITOK);
 again:
 	eofflag = 0;
@@ -1686,12 +1690,10 @@ nfsrvd_readdir(struct nfsrv_descript *nd, int isdgram,
 	 * skip over the records that precede the requested offset. This
 	 * requires the assumption that file offset cookies monotonically
 	 * increase.
-	 * Since the offset cookies don't monotonically increase for ZFS,
-	 * this is not done when ZFS is the file system.
 	 */
 	while (cpos < cend && ncookies > 0 &&
 	    (dp->d_fileno == 0 || dp->d_type == DT_WHT ||
-	     (not_zfs != 0 && ((u_quad_t)(*cookiep)) <= toff))) {
+	     (is_ufs == 1 && ((u_quad_t)(*cookiep)) <= toff))) {
 		cpos += dp->d_reclen;
 		dp = (struct dirent *)cpos;
 		cookiep++;
@@ -1804,7 +1806,7 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram,
 	struct uio io;
 	struct iovec iv;
 	struct componentname cn;
-	int at_root, needs_unbusy, not_zfs, supports_nfsv4acls;
+	int at_root, is_ufs, is_zfs, needs_unbusy, supports_nfsv4acls;
 	struct mount *mp, *new_mp;
 	uint64_t mounted_on_fileno;
 
@@ -1884,7 +1886,8 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram,
 			nfsrv_postopattr(nd, getret, &at);
 		goto out;
 	}
-	not_zfs = strcmp(vp->v_mount->mnt_vfc->vfc_name, "zfs");
+	is_ufs = strcmp(vp->v_mount->mnt_vfc->vfc_name, "ufs") == 0;
+	is_zfs = strcmp(vp->v_mount->mnt_vfc->vfc_name, "zfs") == 0;
 
 	MALLOC(rbuf, caddr_t, siz, M_TEMP, M_WAITOK);
 again:
@@ -1957,12 +1960,10 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram,
 	 * skip over the records that precede the requested offset. This
 	 * requires the assumption that file offset cookies monotonically
 	 * increase.
-	 * Since the offset cookies don't monotonically increase for ZFS,
-	 * this is not done when ZFS is the file system.
 	 */
 	while (cpos < cend && ncookies > 0 &&
 	  (dp->d_fileno == 0 || dp->d_type == DT_WHT ||
-	   (not_zfs != 0 && ((u_quad_t)(*cookiep)) <= toff) ||
+	   (is_ufs == 1 && ((u_quad_t)(*cookiep)) <= toff) ||
 	   ((nd->nd_flag & ND_NFSV4) &&
 	    ((dp->d_namlen == 1 && dp->d_name[0] == '.') ||
 	     (dp->d_namlen==2 && dp->d_name[0]=='.' && dp->d_name[1]=='.'))))) {
@@ -2004,7 +2005,7 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram,
 	 * This needs to be done here for NFSv4, since NFSv4 never does
 	 * a VFS_VGET() for "." or "..".
 	 */
-	if (not_zfs == 0) {
+	if (is_zfs == 1) {
 		r = VFS_VGET(mp, at.na_fileid, LK_SHARED, &nvp);
 		if (r == EOPNOTSUPP) {
 			usevget = 0;
@@ -2153,7 +2154,7 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram,
 					if (!r)
 					    r = nfsvno_getattr(nvp, nvap,
 						nd->nd_cred, p, 1);
-					if (r == 0 && not_zfs == 0 &&
+					if (r == 0 && is_zfs == 1 &&
 					    nfsrv_enable_crossmntpt != 0 &&
 					    (nd->nd_flag & ND_NFSV4) != 0 &&
 					    nvp->v_type == VDIR &&
@@ -2263,9 +2264,11 @@ nfsrvd_readdirplus(struct nfsrv_descript *nd, int isdgram,
 	if (dirlen > cnt || nd->nd_repstat) {
 		if (!nd->nd_repstat && entrycnt == 0)
 			nd->nd_repstat = NFSERR_TOOSMALL;
-		if (nd->nd_repstat)
+		if (nd->nd_repstat) {
 			newnfs_trimtrailing(nd, mb0, bpos0);
-		else
+			if (nd->nd_flag & ND_NFSV3)
+				nfsrv_postopattr(nd, getret, &at);
+		} else
 			newnfs_trimtrailing(nd, mb1, bpos1);
 		eofflag = 0;
 	} else if (cpos < cend)
@@ -3263,6 +3266,18 @@ nfsrv_hashfh(fhandle_t *fhp)
 	return (hashval);
 }
 
+/*
+ * Calculate a hash value for the sessionid.
+ */
+uint32_t
+nfsrv_hashsessionid(uint8_t *sessionid)
+{
+	uint32_t hashval;
+
+	hashval = hash32_buf(sessionid, NFSX_V4SESSIONID, 0);
+	return (hashval);
+}
+
 /*
  * Signal the userland master nfsd to backup the stable restart file.
  */
@@ -3306,21 +3321,17 @@ nfsd_modevent(module_t mod, int type, void *data)
 			goto out;
 		newnfs_portinit();
 		for (i = 0; i < NFSRVCACHE_HASHSIZE; i++) {
-			snprintf(nfsrchash_table[i].lock_name,
-			    sizeof(nfsrchash_table[i].lock_name), "nfsrc_tcp%d",
-			    i);
-			mtx_init(&nfsrchash_table[i].mtx,
-			    nfsrchash_table[i].lock_name, NULL, MTX_DEF);
-			snprintf(nfsrcahash_table[i].lock_name,
-			    sizeof(nfsrcahash_table[i].lock_name), "nfsrc_tcpa%d",
-			    i);
-			mtx_init(&nfsrcahash_table[i].mtx,
-			    nfsrcahash_table[i].lock_name, NULL, MTX_DEF);
+			mtx_init(&nfsrchash_table[i].mtx, "nfsrtc", NULL,
+			    MTX_DEF);
+			mtx_init(&nfsrcahash_table[i].mtx, "nfsrtca", NULL,
+			    MTX_DEF);
 		}
-		mtx_init(&nfsrc_udpmtx, "nfs_udpcache_mutex", NULL, MTX_DEF);
-		mtx_init(&nfs_v4root_mutex, "nfs_v4root_mutex", NULL, MTX_DEF);
-		mtx_init(&nfsv4root_mnt.mnt_mtx, "struct mount mtx", NULL,
-		    MTX_DEF);
+		mtx_init(&nfsrc_udpmtx, "nfsuc", NULL, MTX_DEF);
+		mtx_init(&nfs_v4root_mutex, "nfs4rt", NULL, MTX_DEF);
+		mtx_init(&nfsv4root_mnt.mnt_mtx, "nfs4mnt", NULL, MTX_DEF);
+		for (i = 0; i < NFSSESSIONHASHSIZE; i++)
+			mtx_init(&nfssessionhash[i].mtx, "nfssm",
+			    NULL, MTX_DEF);
 		lockinit(&nfsv4root_mnt.mnt_explock, PVFS, "explock", 0, 0);
 		nfsrvd_initcache();
 		nfsd_init();
@@ -3368,6 +3379,8 @@ nfsd_modevent(module_t mod, int type, void *data)
 		mtx_destroy(&nfsrc_udpmtx);
 		mtx_destroy(&nfs_v4root_mutex);
 		mtx_destroy(&nfsv4root_mnt.mnt_mtx);
+		for (i = 0; i < NFSSESSIONHASHSIZE; i++)
+			mtx_destroy(&nfssessionhash[i].mtx);
 		lockdestroy(&nfsv4root_mnt.mnt_explock);
 		loaded = 0;
 		break;
diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c
index 69c3af0fdb83..0d3ff7658ec6 100644
--- a/sys/fs/nfsserver/nfs_nfsdserv.c
+++ b/sys/fs/nfsserver/nfs_nfsdserv.c
@@ -666,10 +666,14 @@ nfsrvd_read(struct nfsrv_descript *nd, __unused int isdgram,
 		stp->ls_stateid.seqid = fxdr_unsigned(u_int32_t, *tl++);
 		clientid.lval[0] = stp->ls_stateid.other[0] = *tl++;
 		clientid.lval[1] = stp->ls_stateid.other[1] = *tl++;
-		if (nd->nd_flag & ND_IMPLIEDCLID) {
-			if (nd->nd_clientid.qval != clientid.qval)
-				printf("EEK! multiple clids\n");
+		if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+			if ((nd->nd_flag & ND_NFSV41) != 0)
+				clientid.qval = nd->nd_clientid.qval;
+			else if (nd->nd_clientid.qval != clientid.qval)
+				printf("EEK1 multiple clids\n");
 		} else {
+			if ((nd->nd_flag & ND_NFSV41) != 0)
+				printf("EEK! no clientid from session\n");
 			nd->nd_flag |= ND_IMPLIEDCLID;
 			nd->nd_clientid.qval = clientid.qval;
 		}
@@ -818,10 +822,14 @@ nfsrvd_write(struct nfsrv_descript *nd, __unused int isdgram,
 		stp->ls_stateid.seqid = fxdr_unsigned(u_int32_t, *tl++);
 		clientid.lval[0] = stp->ls_stateid.other[0] = *tl++;
 		clientid.lval[1] = stp->ls_stateid.other[1] = *tl++;
-		if (nd->nd_flag & ND_IMPLIEDCLID) {
-			if (nd->nd_clientid.qval != clientid.qval)
-				printf("EEK! multiple clids\n");
+		if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+			if ((nd->nd_flag & ND_NFSV41) != 0)
+				clientid.qval = nd->nd_clientid.qval;
+			else if (nd->nd_clientid.qval != clientid.qval)
+				printf("EEK2 multiple clids\n");
 		} else {
+			if ((nd->nd_flag & ND_NFSV41) != 0)
+				printf("EEK! no clientid from session\n");
 			nd->nd_flag |= ND_IMPLIEDCLID;
 			nd->nd_clientid.qval = clientid.qval;
 		}
@@ -2204,10 +2212,14 @@ nfsrvd_lock(struct nfsrv_descript *nd, __unused int isdgram,
 		stp->ls_opentolockseq = fxdr_unsigned(int, *tl++);
 		clientid.lval[0] = *tl++;
 		clientid.lval[1] = *tl++;
-		if (nd->nd_flag & ND_IMPLIEDCLID) {
-			if (nd->nd_clientid.qval != clientid.qval)
-				printf("EEK! multiple clids\n");
+		if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+			if ((nd->nd_flag & ND_NFSV41) != 0)
+				clientid.qval = nd->nd_clientid.qval;
+			else if (nd->nd_clientid.qval != clientid.qval)
+				printf("EEK3 multiple clids\n");
 		} else {
+			if ((nd->nd_flag & ND_NFSV41) != 0)
+				printf("EEK! no clientid from session\n");
 			nd->nd_flag |= ND_IMPLIEDCLID;
 			nd->nd_clientid.qval = clientid.qval;
 		}
@@ -2227,10 +2239,14 @@ nfsrvd_lock(struct nfsrv_descript *nd, __unused int isdgram,
 		stp->ls_seq = fxdr_unsigned(int, *tl);
 		clientid.lval[0] = stp->ls_stateid.other[0];
 		clientid.lval[1] = stp->ls_stateid.other[1];
-		if (nd->nd_flag & ND_IMPLIEDCLID) {
-			if (nd->nd_clientid.qval != clientid.qval)
-				printf("EEK! multiple clids\n");
+		if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+			if ((nd->nd_flag & ND_NFSV41) != 0)
+				clientid.qval = nd->nd_clientid.qval;
+			else if (nd->nd_clientid.qval != clientid.qval)
+				printf("EEK4 multiple clids\n");
 		} else {
+			if ((nd->nd_flag & ND_NFSV41) != 0)
+				printf("EEK! no clientid from session\n");
 			nd->nd_flag |= ND_IMPLIEDCLID;
 			nd->nd_clientid.qval = clientid.qval;
 		}
@@ -2376,10 +2392,14 @@ nfsrvd_lockt(struct nfsrv_descript *nd, __unused int isdgram,
 	tl += 2;
 	clientid.lval[0] = *tl++;
 	clientid.lval[1] = *tl;
-	if (nd->nd_flag & ND_IMPLIEDCLID) {
-		if (nd->nd_clientid.qval != clientid.qval)
-			printf("EEK! multiple clids\n");
+	if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			clientid.qval = nd->nd_clientid.qval;
+		else if (nd->nd_clientid.qval != clientid.qval)
+			printf("EEK5 multiple clids\n");
 	} else {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			printf("EEK! no clientid from session\n");
 		nd->nd_flag |= ND_IMPLIEDCLID;
 		nd->nd_clientid.qval = clientid.qval;
 	}
@@ -2487,10 +2507,14 @@ nfsrvd_locku(struct nfsrv_descript *nd, __unused int isdgram,
 	}
 	clientid.lval[0] = stp->ls_stateid.other[0];
 	clientid.lval[1] = stp->ls_stateid.other[1];
-	if (nd->nd_flag & ND_IMPLIEDCLID) {
-		if (nd->nd_clientid.qval != clientid.qval)
-			printf("EEK! multiple clids\n");
+	if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			clientid.qval = nd->nd_clientid.qval;
+		else if (nd->nd_clientid.qval != clientid.qval)
+			printf("EEK6 multiple clids\n");
 	} else {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			printf("EEK! no clientid from session\n");
 		nd->nd_flag |= ND_IMPLIEDCLID;
 		nd->nd_clientid.qval = clientid.qval;
 	}
@@ -2531,7 +2555,7 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram,
     struct nfsexstuff *exp)
 {
 	u_int32_t *tl;
-	int i;
+	int i, retext;
 	struct nfsstate *stp = NULL;
 	int error = 0, create, claim, exclusive_flag = 0;
 	u_int32_t rflags = NFSV4OPEN_LOCKTYPEPOSIX, acemask;
@@ -2568,6 +2592,39 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram,
 	stp->ls_uid = nd->nd_cred->cr_uid;
 	stp->ls_seq = fxdr_unsigned(u_int32_t, *tl++);
 	i = fxdr_unsigned(int, *tl++);
+	retext = 0;
+	if ((i & (NFSV4OPEN_WANTDELEGMASK | NFSV4OPEN_WANTSIGNALDELEG |
+	    NFSV4OPEN_WANTPUSHDELEG)) != 0 && (nd->nd_flag & ND_NFSV41) != 0) {
+		retext = 1;
+		/* For now, ignore these. */
+		i &= ~(NFSV4OPEN_WANTPUSHDELEG | NFSV4OPEN_WANTSIGNALDELEG);
+		switch (i & NFSV4OPEN_WANTDELEGMASK) {
+		case NFSV4OPEN_WANTANYDELEG:
+			stp->ls_flags |= (NFSLCK_WANTRDELEG |
+			    NFSLCK_WANTWDELEG);
+			i &= ~NFSV4OPEN_WANTDELEGMASK;
+			break;
+		case NFSV4OPEN_WANTREADDELEG:
+			stp->ls_flags |= NFSLCK_WANTRDELEG;
+			i &= ~NFSV4OPEN_WANTDELEGMASK;
+			break;
+		case NFSV4OPEN_WANTWRITEDELEG:
+			stp->ls_flags |= NFSLCK_WANTWDELEG;
+			i &= ~NFSV4OPEN_WANTDELEGMASK;
+			break;
+		case NFSV4OPEN_WANTNODELEG:
+			stp->ls_flags |= NFSLCK_WANTNODELEG;
+			i &= ~NFSV4OPEN_WANTDELEGMASK;
+			break;
+		case NFSV4OPEN_WANTCANCEL:
+			printf("NFSv4: ignore Open WantCancel\n");
+			i &= ~NFSV4OPEN_WANTDELEGMASK;
+			break;
+		default:
+			/* nd_repstat will be set to NFSERR_INVAL below. */
+			break;
+		};
+	}
 	switch (i) {
 	case NFSV4OPEN_ACCESSREAD:
 		stp->ls_flags |= NFSLCK_READACCESS;
@@ -2599,10 +2656,14 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram,
 	};
 	clientid.lval[0] = *tl++;
 	clientid.lval[1] = *tl;
-	if (nd->nd_flag & ND_IMPLIEDCLID) {
-		if (nd->nd_clientid.qval != clientid.qval)
-			printf("EEK! multiple clids\n");
+	if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			clientid.qval = nd->nd_clientid.qval;
+		else if (nd->nd_clientid.qval != clientid.qval)
+			printf("EEK7 multiple clids\n");
 	} else {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			printf("EEK! no clientid from session\n");
 		nd->nd_flag |= ND_IMPLIEDCLID;
 		nd->nd_clientid.qval = clientid.qval;
 	}
@@ -2642,6 +2703,28 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram,
 			cverf[0] = *tl++;
 			cverf[1] = *tl;
 			break;
+		case NFSCREATE_EXCLUSIVE41:
+			NFSM_DISSECT(tl, u_int32_t *, NFSX_VERF);
+			cverf[0] = *tl++;
+			cverf[1] = *tl;
+			error = nfsv4_sattr(nd, &nva, &attrbits, aclp, p);
+			if (error != 0)
+				goto nfsmout;
+			if (NFSISSET_ATTRBIT(&attrbits,
+			    NFSATTRBIT_TIMEACCESSSET))
+				nd->nd_repstat = NFSERR_INVAL;
+			/*
+			 * If the na_gid being set is the same as that of
+			 * the directory it is going in, clear it, since
+			 * that is what will be set by default. This allows
+			 * a user that isn't in that group to do the create.
+			 */
+			if (nd->nd_repstat == 0 && NFSVNO_ISSETGID(&nva) &&
+			    nva.na_gid == dirfor.na_gid)
+				NFSVNO_UNSET(&nva, gid);
+			if (nd->nd_repstat == 0)
+				nd->nd_repstat = nfsrv_checkuidgid(nd, &nva);
+			break;
 		default:
 			nd->nd_repstat = NFSERR_BADXDR;
 			goto nfsmout;
@@ -2723,27 +2806,38 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram,
 			exclusive_flag = 1;
 			if (!named.ni_vp)
 				nva.na_mode = 0;
+			break;
+		    case NFSCREATE_EXCLUSIVE41:
+			exclusive_flag = 1;
+			break;
 		    };
 		}
 		nfsvno_open(nd, &named, clientid, &stateid, stp,
 		    &exclusive_flag, &nva, cverf, create, aclp, &attrbits,
 		    nd->nd_cred, p, exp, &vp);
-	} else if (claim == NFSV4OPEN_CLAIMPREVIOUS) {
-		NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
-		i = fxdr_unsigned(int, *tl);
-		switch (i) {
-		case NFSV4OPEN_DELEGATEREAD:
-			stp->ls_flags |= NFSLCK_DELEGREAD;
-			break;
-		case NFSV4OPEN_DELEGATEWRITE:
-			stp->ls_flags |= NFSLCK_DELEGWRITE;
-		case NFSV4OPEN_DELEGATENONE:
-			break;
-		default:
-			nd->nd_repstat = NFSERR_BADXDR;
-			goto nfsmout;
-		};
-		stp->ls_flags |= NFSLCK_RECLAIM;
+	} else if (claim == NFSV4OPEN_CLAIMPREVIOUS || claim ==
+	    NFSV4OPEN_CLAIMFH) {
+		if (claim == NFSV4OPEN_CLAIMPREVIOUS) {
+			NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
+			i = fxdr_unsigned(int, *tl);
+			switch (i) {
+			case NFSV4OPEN_DELEGATEREAD:
+				stp->ls_flags |= NFSLCK_DELEGREAD;
+				break;
+			case NFSV4OPEN_DELEGATEWRITE:
+				stp->ls_flags |= NFSLCK_DELEGWRITE;
+			case NFSV4OPEN_DELEGATENONE:
+				break;
+			default:
+				nd->nd_repstat = NFSERR_BADXDR;
+				goto nfsmout;
+			};
+			stp->ls_flags |= NFSLCK_RECLAIM;
+		} else {
+			/* CLAIM_NULL_FH */
+			if (nd->nd_repstat == 0 && create == NFSV4OPEN_CREATE)
+				nd->nd_repstat = NFSERR_INVAL;
+		}
 		vp = dp;
 		NFSVOPLOCK(vp, LK_EXCLUSIVE | LK_RETRY);
 		if ((vp->v_iflag & VI_DOOMED) == 0)
@@ -2832,7 +2926,21 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram,
 			*tl = txdr_unsigned(NFSV4OPEN_DELEGATEREAD);
 		else if (rflags & NFSV4OPEN_WRITEDELEGATE)
 			*tl = txdr_unsigned(NFSV4OPEN_DELEGATEWRITE);
-		else
+		else if (retext != 0) {
+			*tl = txdr_unsigned(NFSV4OPEN_DELEGATENONEEXT);
+			if ((rflags & NFSV4OPEN_WDCONTENTION) != 0) {
+				NFSM_BUILD(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
+				*tl++ = txdr_unsigned(NFSV4OPEN_CONTENTION);
+				*tl = newnfs_false;
+			} else if ((rflags & NFSV4OPEN_WDRESOURCE) != 0) {
+				NFSM_BUILD(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
+				*tl++ = txdr_unsigned(NFSV4OPEN_RESOURCE);
+				*tl = newnfs_false;
+			} else {
+				NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED);
+				*tl = txdr_unsigned(NFSV4OPEN_NOTWANTED);
+			}
+		} else
 			*tl = txdr_unsigned(NFSV4OPEN_DELEGATENONE);
 		if (rflags & (NFSV4OPEN_READDELEGATE|NFSV4OPEN_WRITEDELEGATE)) {
 			NFSM_BUILD(tl, u_int32_t *, NFSX_STATEID+NFSX_UNSIGNED);
@@ -2908,10 +3016,14 @@ nfsrvd_close(struct nfsrv_descript *nd, __unused int isdgram,
 	stp->ls_flags = NFSLCK_CLOSE;
 	clientid.lval[0] = stp->ls_stateid.other[0];
 	clientid.lval[1] = stp->ls_stateid.other[1];
-	if (nd->nd_flag & ND_IMPLIEDCLID) {
-		if (nd->nd_clientid.qval != clientid.qval)
-			printf("EEK! multiple clids\n");
+	if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			clientid.qval = nd->nd_clientid.qval;
+		else if (nd->nd_clientid.qval != clientid.qval)
+			printf("EEK8 multiple clids\n");
 	} else {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			printf("EEK! no clientid from session\n");
 		nd->nd_flag |= ND_IMPLIEDCLID;
 		nd->nd_clientid.qval = clientid.qval;
 	}
@@ -2948,14 +3060,18 @@ nfsrvd_delegpurge(struct nfsrv_descript *nd, __unused int isdgram,
 	NFSM_DISSECT(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
 	clientid.lval[0] = *tl++;
 	clientid.lval[1] = *tl;
-	if (nd->nd_flag & ND_IMPLIEDCLID) {
-		if (nd->nd_clientid.qval != clientid.qval)
-			printf("EEK! multiple clids\n");
+	if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			clientid.qval = nd->nd_clientid.qval;
+		else if (nd->nd_clientid.qval != clientid.qval)
+			printf("EEK9 multiple clids\n");
 	} else {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			printf("EEK! no clientid from session\n");
 		nd->nd_flag |= ND_IMPLIEDCLID;
 		nd->nd_clientid.qval = clientid.qval;
 	}
-	nd->nd_repstat = nfsrv_delegupdate(clientid, NULL, NULL,
+	nd->nd_repstat = nfsrv_delegupdate(nd, clientid, NULL, NULL,
 	    NFSV4OP_DELEGPURGE, nd->nd_cred, p);
 nfsmout:
 	NFSEXITCODE2(error, nd);
@@ -2979,14 +3095,18 @@ nfsrvd_delegreturn(struct nfsrv_descript *nd, __unused int isdgram,
 	NFSBCOPY((caddr_t)tl, (caddr_t)stateid.other, NFSX_STATEIDOTHER);
 	clientid.lval[0] = stateid.other[0];
 	clientid.lval[1] = stateid.other[1];
-	if (nd->nd_flag & ND_IMPLIEDCLID) {
-		if (nd->nd_clientid.qval != clientid.qval)
-			printf("EEK! multiple clids\n");
+	if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			clientid.qval = nd->nd_clientid.qval;
+		else if (nd->nd_clientid.qval != clientid.qval)
+			printf("EEK10 multiple clids\n");
 	} else {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			printf("EEK! no clientid from session\n");
 		nd->nd_flag |= ND_IMPLIEDCLID;
 		nd->nd_clientid.qval = clientid.qval;
 	}
-	nd->nd_repstat = nfsrv_delegupdate(clientid, &stateid, vp,
+	nd->nd_repstat = nfsrv_delegupdate(nd, clientid, &stateid, vp,
 	    NFSV4OP_DELEGRETURN, nd->nd_cred, p);
 nfsmout:
 	vput(vp);
@@ -3024,6 +3144,10 @@ nfsrvd_openconfirm(struct nfsrv_descript *nd, __unused int isdgram,
 	nfsv4stateid_t stateid;
 	nfsquad_t clientid;
 
+	if ((nd->nd_flag & ND_NFSV41) != 0) {
+		nd->nd_repstat = NFSERR_NOTSUPP;
+		goto nfsmout;
+	}
 	NFSM_DISSECT(tl, u_int32_t *, NFSX_STATEID + NFSX_UNSIGNED);
 	stp->ls_ownerlen = 0;
 	stp->ls_op = nd->nd_rp;
@@ -3036,10 +3160,14 @@ nfsrvd_openconfirm(struct nfsrv_descript *nd, __unused int isdgram,
 	stp->ls_flags = NFSLCK_CONFIRM;
 	clientid.lval[0] = stp->ls_stateid.other[0];
 	clientid.lval[1] = stp->ls_stateid.other[1];
-	if (nd->nd_flag & ND_IMPLIEDCLID) {
-		if (nd->nd_clientid.qval != clientid.qval)
-			printf("EEK! multiple clids\n");
+	if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			clientid.qval = nd->nd_clientid.qval;
+		else if (nd->nd_clientid.qval != clientid.qval)
+			printf("EEK11 multiple clids\n");
 	} else {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			printf("EEK! no clientid from session\n");
 		nd->nd_flag |= ND_IMPLIEDCLID;
 		nd->nd_clientid.qval = clientid.qval;
 	}
@@ -3112,10 +3240,14 @@ nfsrvd_opendowngrade(struct nfsrv_descript *nd, __unused int isdgram,
 
 	clientid.lval[0] = stp->ls_stateid.other[0];
 	clientid.lval[1] = stp->ls_stateid.other[1];
-	if (nd->nd_flag & ND_IMPLIEDCLID) {
-		if (nd->nd_clientid.qval != clientid.qval)
-			printf("EEK! multiple clids\n");
+	if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			clientid.qval = nd->nd_clientid.qval;
+		else if (nd->nd_clientid.qval != clientid.qval)
+			printf("EEK12 multiple clids\n");
 	} else {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			printf("EEK! no clientid from session\n");
 		nd->nd_flag |= ND_IMPLIEDCLID;
 		nd->nd_clientid.qval = clientid.qval;
 	}
@@ -3144,6 +3276,10 @@ nfsrvd_renew(struct nfsrv_descript *nd, __unused int isdgram,
 	int error = 0;
 	nfsquad_t clientid;
 
+	if ((nd->nd_flag & ND_NFSV41) != 0) {
+		nd->nd_repstat = NFSERR_NOTSUPP;
+		goto nfsmout;
+	}
 	if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) {
 		nd->nd_repstat = NFSERR_WRONGSEC;
 		goto nfsmout;
@@ -3151,15 +3287,19 @@ nfsrvd_renew(struct nfsrv_descript *nd, __unused int isdgram,
 	NFSM_DISSECT(tl, u_int32_t *, NFSX_HYPER);
 	clientid.lval[0] = *tl++;
 	clientid.lval[1] = *tl;
-	if (nd->nd_flag & ND_IMPLIEDCLID) {
-		if (nd->nd_clientid.qval != clientid.qval)
-			printf("EEK! multiple clids\n");
+	if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			clientid.qval = nd->nd_clientid.qval;
+		else if (nd->nd_clientid.qval != clientid.qval)
+			printf("EEK13 multiple clids\n");
 	} else {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			printf("EEK! no clientid from session\n");
 		nd->nd_flag |= ND_IMPLIEDCLID;
 		nd->nd_clientid.qval = clientid.qval;
 	}
 	nd->nd_repstat = nfsrv_getclient(clientid, (CLOPS_RENEWOP|CLOPS_RENEW),
-	    NULL, (nfsquad_t)((u_quad_t)0), nd, p);
+	    NULL, NULL, (nfsquad_t)((u_quad_t)0), 0, nd, p);
 nfsmout:
 	NFSEXITCODE2(error, nd);
 	return (error);
@@ -3283,6 +3423,10 @@ nfsrvd_setclientid(struct nfsrv_descript *nd, __unused int isdgram,
 	u_char *verf, *ucp, *ucp2, addrbuf[24];
 	nfsquad_t clientid, confirm;
 
+	if ((nd->nd_flag & ND_NFSV41) != 0) {
+		nd->nd_repstat = NFSERR_NOTSUPP;
+		goto nfsmout;
+	}
 	if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) {
 		nd->nd_repstat = NFSERR_WRONGSEC;
 		goto out;
@@ -3395,6 +3539,10 @@ nfsrvd_setclientidcfrm(struct nfsrv_descript *nd,
 	int error = 0;
 	nfsquad_t clientid, confirm;
 
+	if ((nd->nd_flag & ND_NFSV41) != 0) {
+		nd->nd_repstat = NFSERR_NOTSUPP;
+		goto nfsmout;
+	}
 	if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) {
 		nd->nd_repstat = NFSERR_WRONGSEC;
 		goto nfsmout;
@@ -3410,7 +3558,7 @@ nfsrvd_setclientidcfrm(struct nfsrv_descript *nd,
 	 * returns the appropriate NFSERR status.
 	 */
 	nd->nd_repstat = nfsrv_getclient(clientid, (CLOPS_CONFIRM|CLOPS_RENEW),
-	    NULL, confirm, nd, p);
+	    NULL, NULL, confirm, 0, nd, p);
 nfsmout:
 	NFSEXITCODE2(error, nd);
 	return (error);
@@ -3485,6 +3633,10 @@ nfsrvd_releaselckown(struct nfsrv_descript *nd, __unused int isdgram,
 	int error = 0, len;
 	nfsquad_t clientid;
 
+	if ((nd->nd_flag & ND_NFSV41) != 0) {
+		nd->nd_repstat = NFSERR_NOTSUPP;
+		goto nfsmout;
+	}
 	if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) {
 		nd->nd_repstat = NFSERR_WRONGSEC;
 		goto nfsmout;
@@ -3503,10 +3655,14 @@ nfsrvd_releaselckown(struct nfsrv_descript *nd, __unused int isdgram,
 	stp->ls_uid = nd->nd_cred->cr_uid;
 	clientid.lval[0] = *tl++;
 	clientid.lval[1] = *tl;
-	if (nd->nd_flag & ND_IMPLIEDCLID) {
-		if (nd->nd_clientid.qval != clientid.qval)
-			printf("EEK! multiple clids\n");
+	if ((nd->nd_flag & ND_IMPLIEDCLID) != 0) {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			clientid.qval = nd->nd_clientid.qval;
+		else if (nd->nd_clientid.qval != clientid.qval)
+			printf("EEK14 multiple clids\n");
 	} else {
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			printf("EEK! no clientid from session\n");
 		nd->nd_flag |= ND_IMPLIEDCLID;
 		nd->nd_clientid.qval = clientid.qval;
 	}
@@ -3524,3 +3680,385 @@ nfsrvd_releaselckown(struct nfsrv_descript *nd, __unused int isdgram,
 	NFSEXITCODE2(error, nd);
 	return (error);
 }
+
+/*
+ * nfsv4 exchange_id service
+ */
+APPLESTATIC int
+nfsrvd_exchangeid(struct nfsrv_descript *nd, __unused int isdgram,
+    __unused vnode_t vp, NFSPROC_T *p, __unused struct nfsexstuff *exp)
+{
+	uint32_t *tl;
+	int error = 0, i, idlen;
+	struct nfsclient *clp = NULL;
+	nfsquad_t clientid, confirm;
+	uint8_t *verf;
+	uint32_t sp4type, v41flags;
+	uint64_t owner_minor;
+	struct timespec verstime;
+
+	if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) {
+		nd->nd_repstat = NFSERR_WRONGSEC;
+		goto nfsmout;
+	}
+	NFSM_DISSECT(tl, u_int32_t *, NFSX_VERF + NFSX_UNSIGNED);
+	verf = (uint8_t *)tl;
+	tl += (NFSX_VERF / NFSX_UNSIGNED);
+	i = fxdr_unsigned(int, *tl);
+	if (i > NFSV4_OPAQUELIMIT || i <= 0) {
+		nd->nd_repstat = NFSERR_BADXDR;
+		goto nfsmout;
+	}
+	idlen = i;
+	if (nd->nd_flag & ND_GSS)
+		i += nd->nd_princlen;
+	clp = (struct nfsclient *)malloc(sizeof(struct nfsclient) + i,
+	    M_NFSDCLIENT, M_WAITOK | M_ZERO);
+	NFSINITSOCKMUTEX(&clp->lc_req.nr_mtx);
+	NFSSOCKADDRALLOC(clp->lc_req.nr_nam);
+	NFSSOCKADDRSIZE(clp->lc_req.nr_nam, sizeof (struct sockaddr_in));
+	clp->lc_req.nr_cred = NULL;
+	NFSBCOPY(verf, clp->lc_verf, NFSX_VERF);
+	clp->lc_idlen = idlen;
+	error = nfsrv_mtostr(nd, clp->lc_id, idlen);
+	if (error != 0)
+		goto nfsmout;
+	if ((nd->nd_flag & ND_GSS) != 0) {
+		clp->lc_flags = LCL_GSS | LCL_NFSV41;
+		if ((nd->nd_flag & ND_GSSINTEGRITY) != 0)
+			clp->lc_flags |= LCL_GSSINTEGRITY;
+		else if ((nd->nd_flag & ND_GSSPRIVACY) != 0)
+			clp->lc_flags |= LCL_GSSPRIVACY;
+	} else
+		clp->lc_flags = LCL_NFSV41;
+	if ((nd->nd_flag & ND_GSS) != 0 && nd->nd_princlen > 0) {
+		clp->lc_flags |= LCL_NAME;
+		clp->lc_namelen = nd->nd_princlen;
+		clp->lc_name = &clp->lc_id[idlen];
+		NFSBCOPY(nd->nd_principal, clp->lc_name, clp->lc_namelen);
+	} else {
+		clp->lc_uid = nd->nd_cred->cr_uid;
+		clp->lc_gid = nd->nd_cred->cr_gid;
+	}
+	NFSM_DISSECT(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
+	v41flags = fxdr_unsigned(uint32_t, *tl++);
+	if ((v41flags & ~(NFSV4EXCH_SUPPMOVEDREFER | NFSV4EXCH_SUPPMOVEDMIGR |
+	    NFSV4EXCH_BINDPRINCSTATEID | NFSV4EXCH_MASKPNFS |
+	    NFSV4EXCH_UPDCONFIRMEDRECA)) != 0) {
+		nd->nd_repstat = NFSERR_INVAL;
+		goto nfsmout;
+	}
+	if ((v41flags & NFSV4EXCH_UPDCONFIRMEDRECA) != 0)
+		confirm.lval[1] = 1;
+	else
+		confirm.lval[1] = 0;
+	v41flags = NFSV4EXCH_USENONPNFS;
+	sp4type = fxdr_unsigned(uint32_t, *tl);
+	if (sp4type != NFSV4EXCH_SP4NONE) {
+		nd->nd_repstat = NFSERR_NOTSUPP;
+		goto nfsmout;
+	}
+
+	/*
+	 * nfsrv_setclient() does the actual work of adding it to the
+	 * client list. If there is no error, the structure has been
+	 * linked into the client list and clp should no longer be used
+	 * here. When an error is returned, it has not been linked in,
+	 * so it should be free'd.
+	 */
+	nd->nd_repstat = nfsrv_setclient(nd, &clp, &clientid, &confirm, p);
+	if (clp != NULL) {
+		NFSSOCKADDRFREE(clp->lc_req.nr_nam);
+		NFSFREEMUTEX(&clp->lc_req.nr_mtx);
+		free(clp, M_NFSDCLIENT);
+	}
+	if (nd->nd_repstat == 0) {
+		if (confirm.lval[1] != 0)
+			v41flags |= NFSV4EXCH_CONFIRMEDR;
+		NFSM_BUILD(tl, uint32_t *, 2 * NFSX_HYPER + 3 * NFSX_UNSIGNED);
+		*tl++ = clientid.lval[0];			/* ClientID */
+		*tl++ = clientid.lval[1];
+		*tl++ = txdr_unsigned(confirm.lval[0]);		/* SequenceID */
+		*tl++ = txdr_unsigned(v41flags);		/* Exch flags */
+		*tl++ = txdr_unsigned(NFSV4EXCH_SP4NONE);	/* No SSV */
+		owner_minor = 0;				/* Owner */
+		txdr_hyper(owner_minor, tl);			/* Minor */
+		(void)nfsm_strtom(nd, nd->nd_cred->cr_prison->pr_hostuuid,
+		    strlen(nd->nd_cred->cr_prison->pr_hostuuid)); /* Major */
+		NFSM_BUILD(tl, uint32_t *, 3 * NFSX_UNSIGNED);
+		*tl++ = txdr_unsigned(NFSX_UNSIGNED);
+		*tl++ = time_uptime;		/* Make scope a unique value. */
+		*tl = txdr_unsigned(1);
+		(void)nfsm_strtom(nd, "freebsd.org", strlen("freebsd.org"));
+		(void)nfsm_strtom(nd, version, strlen(version));
+		NFSM_BUILD(tl, uint32_t *, NFSX_V4TIME);
+		verstime.tv_sec = 1293840000;		/* Jan 1, 2011 */
+		verstime.tv_nsec = 0;
+		txdr_nfsv4time(&verstime, tl);
+	}
+	NFSEXITCODE2(0, nd);
+	return (0);
+nfsmout:
+	if (clp != NULL) {
+		NFSSOCKADDRFREE(clp->lc_req.nr_nam);
+		NFSFREEMUTEX(&clp->lc_req.nr_mtx);
+		free(clp, M_NFSDCLIENT);
+	}
+	NFSEXITCODE2(error, nd);
+	return (error);
+}
+
+/*
+ * nfsv4 create session service
+ */
+APPLESTATIC int
+nfsrvd_createsession(struct nfsrv_descript *nd, __unused int isdgram,
+    __unused vnode_t vp, NFSPROC_T *p, __unused struct nfsexstuff *exp)
+{
+	uint32_t *tl;
+	int error = 0;
+	nfsquad_t clientid, confirm;
+	struct nfsdsession *sep = NULL;
+	uint32_t rdmacnt;
+
+	if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) {
+		nd->nd_repstat = NFSERR_WRONGSEC;
+		goto nfsmout;
+	}
+	sep = (struct nfsdsession *)malloc(sizeof(struct nfsdsession),
+	    M_NFSDSESSION, M_WAITOK | M_ZERO);
+	sep->sess_refcnt = 1;
+	mtx_init(&sep->sess_cbsess.nfsess_mtx, "nfscbsession", NULL, MTX_DEF);
+	NFSM_DISSECT(tl, uint32_t *, NFSX_HYPER + 2 * NFSX_UNSIGNED);
+	clientid.lval[0] = *tl++;
+	clientid.lval[1] = *tl++;
+	confirm.lval[0] = fxdr_unsigned(uint32_t, *tl++);
+	sep->sess_crflags = fxdr_unsigned(uint32_t, *tl);
+	/* Persistent sessions and RDMA are not supported. */
+	sep->sess_crflags &= NFSV4CRSESS_CONNBACKCHAN;
+
+	/* Fore channel attributes. */
+	NFSM_DISSECT(tl, uint32_t *, 7 * NFSX_UNSIGNED);
+	tl++;					/* Header pad always 0. */
+	sep->sess_maxreq = fxdr_unsigned(uint32_t, *tl++);
+	sep->sess_maxresp = fxdr_unsigned(uint32_t, *tl++);
+	sep->sess_maxrespcached = fxdr_unsigned(uint32_t, *tl++);
+	sep->sess_maxops = fxdr_unsigned(uint32_t, *tl++);
+	sep->sess_maxslots = fxdr_unsigned(uint32_t, *tl++);
+	if (sep->sess_maxslots > NFSV4_SLOTS)
+		sep->sess_maxslots = NFSV4_SLOTS;
+	rdmacnt = fxdr_unsigned(uint32_t, *tl);
+	if (rdmacnt > 1) {
+		nd->nd_repstat = NFSERR_BADXDR;
+		goto nfsmout;
+	} else if (rdmacnt == 1)
+		NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
+
+	/* Back channel attributes. */
+	NFSM_DISSECT(tl, uint32_t *, 7 * NFSX_UNSIGNED);
+	tl++;					/* Header pad always 0. */
+	sep->sess_cbmaxreq = fxdr_unsigned(uint32_t, *tl++);
+	sep->sess_cbmaxresp = fxdr_unsigned(uint32_t, *tl++);
+	sep->sess_cbmaxrespcached = fxdr_unsigned(uint32_t, *tl++);
+	sep->sess_cbmaxops = fxdr_unsigned(uint32_t, *tl++);
+	sep->sess_cbsess.nfsess_foreslots = fxdr_unsigned(uint32_t, *tl++);
+	rdmacnt = fxdr_unsigned(uint32_t, *tl);
+	if (rdmacnt > 1) {
+		nd->nd_repstat = NFSERR_BADXDR;
+		goto nfsmout;
+	} else if (rdmacnt == 1)
+		NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
+
+	NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
+	sep->sess_cbprogram = fxdr_unsigned(uint32_t, *tl);
+
+	/*
+	 * nfsrv_getclient() searches the client list for a match and
+	 * returns the appropriate NFSERR status.
+	 */
+	nd->nd_repstat = nfsrv_getclient(clientid, CLOPS_CONFIRM | CLOPS_RENEW,
+	    NULL, sep, confirm, sep->sess_cbprogram, nd, p);
+	if (nd->nd_repstat == 0) {
+		NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID);
+		NFSBCOPY(sep->sess_sessionid, tl, NFSX_V4SESSIONID);
+		NFSM_BUILD(tl, uint32_t *, 18 * NFSX_UNSIGNED);
+		*tl++ = txdr_unsigned(confirm.lval[0]);	/* sequenceid */
+		*tl++ = txdr_unsigned(sep->sess_crflags);
+
+		/* Fore channel attributes. */
+		*tl++ = 0;
+		*tl++ = txdr_unsigned(sep->sess_maxreq);
+		*tl++ = txdr_unsigned(sep->sess_maxresp);
+		*tl++ = txdr_unsigned(sep->sess_maxrespcached);
+		*tl++ = txdr_unsigned(sep->sess_maxops);
+		*tl++ = txdr_unsigned(sep->sess_maxslots);
+		*tl++ = txdr_unsigned(1);
+		*tl++ = txdr_unsigned(0);			/* No RDMA. */
+
+		/* Back channel attributes. */
+		*tl++ = 0;
+		*tl++ = txdr_unsigned(sep->sess_cbmaxreq);
+		*tl++ = txdr_unsigned(sep->sess_cbmaxresp);
+		*tl++ = txdr_unsigned(sep->sess_cbmaxrespcached);
+		*tl++ = txdr_unsigned(sep->sess_cbmaxops);
+		*tl++ = txdr_unsigned(sep->sess_cbsess.nfsess_foreslots);
+		*tl++ = txdr_unsigned(1);
+		*tl = txdr_unsigned(0);			/* No RDMA. */
+	}
+nfsmout:
+	if (nd->nd_repstat != 0 && sep != NULL)
+		free(sep, M_NFSDSESSION);
+	NFSEXITCODE2(error, nd);
+	return (error);
+}
+
+/*
+ * nfsv4 sequence service
+ */
+APPLESTATIC int
+nfsrvd_sequence(struct nfsrv_descript *nd, __unused int isdgram,
+    __unused vnode_t vp, __unused NFSPROC_T *p, __unused struct nfsexstuff *exp)
+{
+	uint32_t *tl;
+	uint32_t highest_slotid, sequenceid, sflags, target_highest_slotid;
+	int cache_this, error = 0;
+
+	if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) {
+		nd->nd_repstat = NFSERR_WRONGSEC;
+		goto nfsmout;
+	}
+	NFSM_DISSECT(tl, uint32_t *, NFSX_V4SESSIONID);
+	NFSBCOPY(tl, nd->nd_sessionid, NFSX_V4SESSIONID);
+	NFSM_DISSECT(tl, uint32_t *, 4 * NFSX_UNSIGNED);
+	sequenceid = fxdr_unsigned(uint32_t, *tl++);
+	nd->nd_slotid = fxdr_unsigned(uint32_t, *tl++);
+	highest_slotid = fxdr_unsigned(uint32_t, *tl++);
+	if (*tl == newnfs_true)
+		cache_this = 1;
+	else
+		cache_this = 0;
+	nd->nd_flag |= ND_HASSEQUENCE;
+	nd->nd_repstat = nfsrv_checksequence(nd, sequenceid, &highest_slotid,
+	    &target_highest_slotid, cache_this, &sflags, p);
+	if (nd->nd_repstat == 0) {
+		NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID);
+		NFSBCOPY(nd->nd_sessionid, tl, NFSX_V4SESSIONID);
+		NFSM_BUILD(tl, uint32_t *, 5 * NFSX_UNSIGNED);
+		*tl++ = txdr_unsigned(sequenceid);
+		*tl++ = txdr_unsigned(nd->nd_slotid);
+		*tl++ = txdr_unsigned(highest_slotid);
+		*tl++ = txdr_unsigned(target_highest_slotid);
+		*tl = txdr_unsigned(sflags);
+	}
+nfsmout:
+	NFSEXITCODE2(error, nd);
+	return (error);
+}
+
+/*
+ * nfsv4 reclaim complete service
+ */
+APPLESTATIC int
+nfsrvd_reclaimcomplete(struct nfsrv_descript *nd, __unused int isdgram,
+    __unused vnode_t vp, __unused NFSPROC_T *p, __unused struct nfsexstuff *exp)
+{
+	uint32_t *tl;
+	int error = 0;
+
+	if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) {
+		nd->nd_repstat = NFSERR_WRONGSEC;
+		goto nfsmout;
+	}
+	NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
+	if (*tl == newnfs_true)
+		nd->nd_repstat = NFSERR_NOTSUPP;
+	else
+		nd->nd_repstat = nfsrv_checkreclaimcomplete(nd);
+nfsmout:
+	NFSEXITCODE2(error, nd);
+	return (error);
+}
+
+/*
+ * nfsv4 destroy clientid service
+ */
+APPLESTATIC int
+nfsrvd_destroyclientid(struct nfsrv_descript *nd, __unused int isdgram,
+    __unused vnode_t vp, NFSPROC_T *p, __unused struct nfsexstuff *exp)
+{
+	uint32_t *tl;
+	nfsquad_t clientid;
+	int error = 0;
+
+	if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) {
+		nd->nd_repstat = NFSERR_WRONGSEC;
+		goto nfsmout;
+	}
+	NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED);
+	clientid.lval[0] = *tl++;
+	clientid.lval[1] = *tl;
+	nd->nd_repstat = nfsrv_destroyclient(clientid, p);
+nfsmout:
+	NFSEXITCODE2(error, nd);
+	return (error);
+}
+
+/*
+ * nfsv4 destroy session service
+ */
+APPLESTATIC int
+nfsrvd_destroysession(struct nfsrv_descript *nd, __unused int isdgram,
+    __unused vnode_t vp, __unused NFSPROC_T *p, __unused struct nfsexstuff *exp)
+{
+	uint8_t *cp, sessid[NFSX_V4SESSIONID];
+	int error = 0;
+
+	if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) {
+		nd->nd_repstat = NFSERR_WRONGSEC;
+		goto nfsmout;
+	}
+	NFSM_DISSECT(cp, uint8_t *, NFSX_V4SESSIONID);
+	NFSBCOPY(cp, sessid, NFSX_V4SESSIONID);
+	nd->nd_repstat = nfsrv_destroysession(nd, sessid);
+nfsmout:
+	NFSEXITCODE2(error, nd);
+	return (error);
+}
+
+/*
+ * nfsv4 free stateid service
+ */
+APPLESTATIC int
+nfsrvd_freestateid(struct nfsrv_descript *nd, __unused int isdgram,
+    __unused vnode_t vp, NFSPROC_T *p, __unused struct nfsexstuff *exp)
+{
+	uint32_t *tl;
+	nfsv4stateid_t stateid;
+	int error = 0;
+
+	if (nfs_rootfhset == 0 || nfsd_checkrootexp(nd) != 0) {
+		nd->nd_repstat = NFSERR_WRONGSEC;
+		goto nfsmout;
+	}
+	NFSM_DISSECT(tl, uint32_t *, NFSX_STATEID);
+	stateid.seqid = fxdr_unsigned(uint32_t, *tl++);
+	NFSBCOPY(tl, stateid.other, NFSX_STATEIDOTHER);
+	nd->nd_repstat = nfsrv_freestateid(nd, &stateid, p);
+nfsmout:
+	NFSEXITCODE2(error, nd);
+	return (error);
+}
+
+/*
+ * nfsv4 service not supported
+ */
+APPLESTATIC int
+nfsrvd_notsupp(struct nfsrv_descript *nd, __unused int isdgram,
+    __unused vnode_t vp, __unused NFSPROC_T *p, __unused struct nfsexstuff *exp)
+{
+
+	nd->nd_repstat = NFSERR_NOTSUPP;
+	NFSEXITCODE2(0, nd);
+	return (0);
+}
+
diff --git a/sys/fs/nfsserver/nfs_nfsdsocket.c b/sys/fs/nfsserver/nfs_nfsdsocket.c
index bd97336f129d..b15dfec4b648 100644
--- a/sys/fs/nfsserver/nfs_nfsdsocket.c
+++ b/sys/fs/nfsserver/nfs_nfsdsocket.c
@@ -48,6 +48,7 @@ extern struct nfsv4lock nfsv4rootfs_lock;
 extern struct nfsrv_stablefirst nfsrv_stablefirst;
 extern struct nfsclienthashhead nfsclienthash[NFSCLIENTHASHSIZE];
 extern int nfsrc_floodlevel, nfsrc_tcpsavedreplies;
+extern int nfsd_debuglevel;
 NFSV4ROOTLOCKMUTEX;
 NFSSTATESPINLOCK;
 
@@ -131,7 +132,7 @@ int (*nfsrv3_procs2[NFS_V3NPROCS])(struct nfsrv_descript *,
 	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
 };
 
-int (*nfsrv4_ops0[NFSV4OP_NOPS])(struct nfsrv_descript *,
+int (*nfsrv4_ops0[NFSV41_NOPS])(struct nfsrv_descript *,
     int, vnode_t , NFSPROC_T *, struct nfsexstuff *) = {
 	(int (*)(struct nfsrv_descript *, int, vnode_t , NFSPROC_T *, struct nfsexstuff *))0,
 	(int (*)(struct nfsrv_descript *, int, vnode_t , NFSPROC_T *, struct nfsexstuff *))0,
@@ -173,9 +174,28 @@ int (*nfsrv4_ops0[NFSV4OP_NOPS])(struct nfsrv_descript *,
 	nfsrvd_verify,
 	nfsrvd_write,
 	nfsrvd_releaselckown,
+	nfsrvd_notsupp,
+	nfsrvd_notsupp,
+	nfsrvd_exchangeid,
+	nfsrvd_createsession,
+	nfsrvd_destroysession,
+	nfsrvd_freestateid,
+	nfsrvd_notsupp,
+	nfsrvd_notsupp,
+	nfsrvd_notsupp,
+	nfsrvd_notsupp,
+	nfsrvd_notsupp,
+	nfsrvd_notsupp,
+	nfsrvd_notsupp,
+	nfsrvd_sequence,
+	nfsrvd_notsupp,
+	nfsrvd_notsupp,
+	nfsrvd_notsupp,
+	nfsrvd_destroyclientid,
+	nfsrvd_reclaimcomplete,
 };
 
-int (*nfsrv4_ops1[NFSV4OP_NOPS])(struct nfsrv_descript *,
+int (*nfsrv4_ops1[NFSV41_NOPS])(struct nfsrv_descript *,
     int, vnode_t , vnode_t *, fhandle_t *,
     NFSPROC_T *, struct nfsexstuff *) = {
 	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
@@ -218,9 +238,28 @@ int (*nfsrv4_ops1[NFSV4OP_NOPS])(struct nfsrv_descript *,
 	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
 	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
 	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t *, fhandle_t *, NFSPROC_T *, struct nfsexstuff *))0,
 };
 
-int (*nfsrv4_ops2[NFSV4OP_NOPS])(struct nfsrv_descript *,
+int (*nfsrv4_ops2[NFSV41_NOPS])(struct nfsrv_descript *,
     int, vnode_t , vnode_t , NFSPROC_T *,
     struct nfsexstuff *, struct nfsexstuff *) = {
 	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
@@ -263,6 +302,25 @@ int (*nfsrv4_ops2[NFSV4OP_NOPS])(struct nfsrv_descript *,
 	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
 	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
 	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
+	(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
 };
 #endif	/* !APPLEKEXT */
 
@@ -304,7 +362,7 @@ static int nfs_writerpc[NFS_NPROCS] = { 0, 0, 1, 0, 0, 0, 0,
 
 /* local functions */
 static void nfsrvd_compound(struct nfsrv_descript *nd, int isdgram,
-    NFSPROC_T *p);
+    u_char *tag, int taglen, u_int32_t minorvers, NFSPROC_T *p);
 
 
 /*
@@ -314,7 +372,7 @@ static void nfsrvd_compound(struct nfsrv_descript *nd, int isdgram,
 static int nfs_retfh[NFS_V3NPROCS] = { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1,
 	1, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0 };
 
-extern struct nfsv4_opflag nfsv4_opflag[NFSV4OP_NOPS];
+extern struct nfsv4_opflag nfsv4_opflag[NFSV41_NOPS];
 
 static int nfsv3to4op[NFS_V3NPROCS] = {
 	NFSPROC_NULL,
@@ -349,8 +407,8 @@ static int nfsv3to4op[NFS_V3NPROCS] = {
  * The NFS V4 Compound RPC is performed separately by nfsrvd_compound().
  */
 APPLESTATIC void
-nfsrvd_dorpc(struct nfsrv_descript *nd, int isdgram,
-    NFSPROC_T *p)
+nfsrvd_dorpc(struct nfsrv_descript *nd, int isdgram, u_char *tag, int taglen,
+    u_int32_t minorvers, NFSPROC_T *p)
 {
 	int error = 0, lktype;
 	vnode_t vp;
@@ -427,7 +485,7 @@ nfsrvd_dorpc(struct nfsrv_descript *nd, int isdgram,
 	 * The group is indicated by the value in nfs_retfh[].
 	 */
 	if (nd->nd_flag & ND_NFSV4) {
-		nfsrvd_compound(nd, isdgram, p);
+		nfsrvd_compound(nd, isdgram, tag, taglen, minorvers, p);
 	} else {
 		if (nfs_retfh[nd->nd_procnum] == 1) {
 			if (vp)
@@ -482,15 +540,14 @@ nfsrvd_dorpc(struct nfsrv_descript *nd, int isdgram,
  * vnode pointer handling.
  */
 static void
-nfsrvd_compound(struct nfsrv_descript *nd, int isdgram,
-    NFSPROC_T *p)
+nfsrvd_compound(struct nfsrv_descript *nd, int isdgram, u_char *tag,
+    int taglen, u_int32_t minorvers, NFSPROC_T *p)
 {
-	int i, op;
+	int i, op, op0 = 0;
 	u_int32_t *tl;
 	struct nfsclient *clp, *nclp;
-	int numops, taglen = -1, error = 0, igotlock;
-	u_int32_t minorvers, retops = 0, *retopsp = NULL, *repp;
-	u_char tag[NFSV4_SMALLSTR + 1], *tagstr;
+	int numops, error = 0, igotlock;
+	u_int32_t retops = 0, *retopsp = NULL, *repp;
 	vnode_t vp, nvp, savevp;
 	struct nfsrvfh fh;
 	mount_t new_mp, temp_mp = NULL;
@@ -595,31 +652,17 @@ nfsrvd_compound(struct nfsrv_descript *nd, int isdgram,
 	savevp = vp = NULL;
 	save_fsid.val[0] = save_fsid.val[1] = 0;
 	cur_fsid.val[0] = cur_fsid.val[1] = 0;
-	NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
-	taglen = fxdr_unsigned(int, *tl);
+
+	/* If taglen < 0, there was a parsing error in nfsd_getminorvers(). */
 	if (taglen < 0) {
 		error = EBADRPC;
 		goto nfsmout;
 	}
-	if (taglen <= NFSV4_SMALLSTR)
-		tagstr = tag;
-	else
-		tagstr = malloc(taglen + 1, M_TEMP, M_WAITOK);
-	error = nfsrv_mtostr(nd, tagstr, taglen);
-	if (error) {
-		if (taglen > NFSV4_SMALLSTR)
-			free(tagstr, M_TEMP);
-		taglen = -1;
-		goto nfsmout;
-	}
+
 	(void) nfsm_strtom(nd, tag, taglen);
-	if (taglen > NFSV4_SMALLSTR) {
-		free(tagstr, M_TEMP);
-	}
 	NFSM_BUILD(retopsp, u_int32_t *, NFSX_UNSIGNED);
-	NFSM_DISSECT(tl, u_int32_t *, 2 * NFSX_UNSIGNED);
-	minorvers = fxdr_unsigned(u_int32_t, *tl++);
-	if (minorvers != NFSV4_MINORVERSION)
+	NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
+	if (minorvers != NFSV4_MINORVERSION && minorvers != NFSV41_MINORVERSION)
 		nd->nd_repstat = NFSERR_MINORVERMISMATCH;
 	if (nd->nd_repstat)
 		numops = 0;
@@ -638,7 +681,10 @@ nfsrvd_compound(struct nfsrv_descript *nd, int isdgram,
 		NFSM_BUILD(repp, u_int32_t *, 2 * NFSX_UNSIGNED);
 		*repp = *tl;
 		op = fxdr_unsigned(int, *tl);
-		if (op < NFSV4OP_ACCESS || op >= NFSV4OP_NOPS) {
+		NFSD_DEBUG(4, "op=%d\n", op);
+		if (op < NFSV4OP_ACCESS ||
+		    (op >= NFSV4OP_NOPS && (nd->nd_flag & ND_NFSV41) == 0) ||
+		    (op >= NFSV41_NOPS && (nd->nd_flag & ND_NFSV41) != 0)) {
 			nd->nd_repstat = NFSERR_OPILLEGAL;
 			*repp++ = txdr_unsigned(NFSV4OP_OPILLEGAL);
 			*repp = nfsd_errmap(nd);
@@ -647,6 +693,10 @@ nfsrvd_compound(struct nfsrv_descript *nd, int isdgram,
 		} else {
 			repp++;
 		}
+		if (i == 0)
+			op0 = op;
+		if (i == numops - 1)
+			nd->nd_flag |= ND_LASTOP;
 
 		/*
 		 * Check for a referral on the current FH and, if so, return
@@ -661,6 +711,29 @@ nfsrvd_compound(struct nfsrv_descript *nd, int isdgram,
 			break;
 		}
 
+		/*
+		 * For NFSv4.1, check for a Sequence Operation being first
+		 * or one of the other allowed operations by itself.
+		 */
+		if ((nd->nd_flag & ND_NFSV41) != 0) {
+			if (i != 0 && op == NFSV4OP_SEQUENCE)
+				nd->nd_repstat = NFSERR_SEQUENCEPOS;
+			else if (i == 0 && op != NFSV4OP_SEQUENCE &&
+			    op != NFSV4OP_EXCHANGEID &&
+			    op != NFSV4OP_CREATESESSION &&
+			    op != NFSV4OP_BINDCONNTOSESS &&
+			    op != NFSV4OP_DESTROYCLIENTID &&
+			    op != NFSV4OP_DESTROYSESSION)
+				nd->nd_repstat = NFSERR_OPNOTINSESS;
+			else if (i != 0 && op0 != NFSV4OP_SEQUENCE)
+				nd->nd_repstat = NFSERR_NOTONLYOP;
+			if (nd->nd_repstat != 0) {
+				*repp = nfsd_errmap(nd);
+				retops++;
+				break;
+			}
+		}
+
 		nd->nd_procnum = op;
 		/*
 		 * If over flood level, reply NFSERR_RESOURCE, if at the first
@@ -672,13 +745,13 @@ nfsrvd_compound(struct nfsrv_descript *nd, int isdgram,
 		 * If nfsrv_mallocmget_limit() returns True, the system is near
 		 * to its limit for memory that malloc()/mget() can allocate.
 		 */
-		if (i == 0 && nd->nd_rp->rc_refcnt == 0 &&
+		if (i == 0 && (nd->nd_rp == NULL ||
+		    nd->nd_rp->rc_refcnt == 0) &&
 		    (nfsrv_mallocmget_limit() ||
 		     nfsrc_tcpsavedreplies > nfsrc_floodlevel)) {
-			if (nfsrc_tcpsavedreplies > nfsrc_floodlevel) {
-				printf("nfsd server cache flooded, try to");
-				printf(" increase nfsrc_floodlevel\n");
-			}
+			if (nfsrc_tcpsavedreplies > nfsrc_floodlevel)
+				printf("nfsd server cache flooded, try "
+				    "increasing vfs.nfsd.tcphighwater\n");
 			nd->nd_repstat = NFSERR_RESOURCE;
 			*repp = nfsd_errmap(nd);
 			if (op == NFSV4OP_SETATTR) {
diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c
index 88abfd4bd518..2faf064d7567 100644
--- a/sys/fs/nfsserver/nfs_nfsdstate.c
+++ b/sys/fs/nfsserver/nfs_nfsdstate.c
@@ -51,6 +51,7 @@ NFSSTATESPINLOCK;
  */
 struct nfsclienthashhead nfsclienthash[NFSCLIENTHASHSIZE];
 struct nfslockhashhead nfslockhash[NFSLOCKHASHSIZE];
+struct nfssessionhash nfssessionhash[NFSSESSIONHASHSIZE];
 #endif	/* !APPLEKEXT */
 
 static u_int32_t nfsrv_openpluslock = 0, nfsrv_delegatecnt = 0;
@@ -89,10 +90,13 @@ static void nfsrv_updatelock(struct nfsstate *stp, struct nfslock **new_lopp,
 static int nfsrv_getipnumber(u_char *cp);
 static int nfsrv_checkrestart(nfsquad_t clientid, u_int32_t flags,
     nfsv4stateid_t *stateidp, int specialid);
-static int nfsrv_checkgrace(u_int32_t flags);
+static int nfsrv_checkgrace(struct nfsrv_descript *nd, struct nfsclient *clp,
+    u_int32_t flags);
 static int nfsrv_docallback(struct nfsclient *clp, int procnum,
     nfsv4stateid_t *stateidp, int trunc, fhandle_t *fhp,
     struct nfsvattr *nap, nfsattrbit_t *attrbitp, NFSPROC_T *p);
+static int nfsrv_cbcallargs(struct nfsrv_descript *nd, struct nfsclient *clp,
+    uint32_t callback, int op, const char *optag, struct nfsdsession **sepp);
 static u_int32_t nfsrv_nextclientindex(void);
 static u_int32_t nfsrv_nextstateindex(struct nfsclient *clp);
 static void nfsrv_markstable(struct nfsclient *clp);
@@ -123,6 +127,11 @@ static void nfsrv_locallock_commit(struct nfslockfile *lfp, int flags,
     uint64_t first, uint64_t end);
 static void nfsrv_locklf(struct nfslockfile *lfp);
 static void nfsrv_unlocklf(struct nfslockfile *lfp);
+static struct nfsdsession *nfsrv_findsession(uint8_t *sessionid);
+static int nfsrv_freesession(struct nfsdsession *sep, uint8_t *sessionid);
+static int nfsv4_setcbsequence(struct nfsrv_descript *nd, struct nfsclient *clp,
+    int dont_replycache, struct nfsdsession **sepp);
+static int nfsv4_getcbsession(struct nfsclient *clp, struct nfsdsession **sepp);
 
 /*
  * Scan the client list for a match and either return the current one,
@@ -191,6 +200,18 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp,
 	}
 	if (!gotit ||
 	    (clp->lc_flags & (LCL_NEEDSCONFIRM | LCL_ADMINREVOKED))) {
+		if ((nd->nd_flag & ND_NFSV41) != 0 && confirmp->lval[1] != 0) {
+			/*
+			 * For NFSv4.1, if confirmp->lval[1] is non-zero, the
+			 * client is trying to update a confirmed clientid.
+			 */
+			NFSLOCKV4ROOTMUTEX();
+			nfsv4_unlock(&nfsv4rootfs_lock, 1);
+			NFSUNLOCKV4ROOTMUTEX();
+			confirmp->lval[1] = 0;
+			error = NFSERR_NOENT;
+			goto out;
+		}
 		/*
 		 * Get rid of the old one.
 		 */
@@ -205,7 +226,12 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp,
 		 * Add it after assigning a client id to it.
 		 */
 		new_clp->lc_flags |= LCL_NEEDSCONFIRM;
-		confirmp->qval = new_clp->lc_confirm.qval = ++confirm_index;
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			new_clp->lc_confirm.lval[0] = confirmp->lval[0] =
+			    ++confirm_index;
+		else
+			confirmp->qval = new_clp->lc_confirm.qval =
+			    ++confirm_index;
 		clientidp->lval[0] = new_clp->lc_clientid.lval[0] =
 		    (u_int32_t)nfsrvboottime;
 		clientidp->lval[1] = new_clp->lc_clientid.lval[1] =
@@ -217,6 +243,7 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp,
 		LIST_INIT(&new_clp->lc_open);
 		LIST_INIT(&new_clp->lc_deleg);
 		LIST_INIT(&new_clp->lc_olddeleg);
+		LIST_INIT(&new_clp->lc_session);
 		for (i = 0; i < NFSSTATEHASHSIZE; i++)
 			LIST_INIT(&new_clp->lc_stateid[i]);
 		LIST_INSERT_HEAD(NFSCLIENTHASH(new_clp->lc_clientid), new_clp,
@@ -289,7 +316,12 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp,
 		 */
 		LIST_REMOVE(clp, lc_hash);
 		new_clp->lc_flags |= LCL_NEEDSCONFIRM;
-		confirmp->qval = new_clp->lc_confirm.qval = ++confirm_index;
+		if ((nd->nd_flag & ND_NFSV41) != 0)
+			new_clp->lc_confirm.lval[0] = confirmp->lval[0] =
+			    ++confirm_index;
+		else
+			confirmp->qval = new_clp->lc_confirm.qval =
+			    ++confirm_index;
 		clientidp->lval[0] = new_clp->lc_clientid.lval[0] =
 		    nfsrvboottime;
 		clientidp->lval[1] = new_clp->lc_clientid.lval[1] =
@@ -342,60 +374,68 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp,
 		*new_clpp = NULL;
 		goto out;
 	}
-	/*
-	 * id and verifier match, so update the net address info
-	 * and get rid of any existing callback authentication
-	 * handle, so a new one will be acquired.
-	 */
-	LIST_REMOVE(clp, lc_hash);
-	new_clp->lc_flags |= (LCL_NEEDSCONFIRM | LCL_DONTCLEAN);
-	new_clp->lc_expiry = nfsrv_leaseexpiry();
-	confirmp->qval = new_clp->lc_confirm.qval = ++confirm_index;
-	clientidp->lval[0] = new_clp->lc_clientid.lval[0] =
-	    clp->lc_clientid.lval[0];
-	clientidp->lval[1] = new_clp->lc_clientid.lval[1] =
-	    clp->lc_clientid.lval[1];
-	new_clp->lc_delegtime = clp->lc_delegtime;
-	new_clp->lc_stateindex = clp->lc_stateindex;
-	new_clp->lc_statemaxindex = clp->lc_statemaxindex;
-	new_clp->lc_cbref = 0;
-	LIST_NEWHEAD(&new_clp->lc_open, &clp->lc_open, ls_list);
-	LIST_FOREACH(tstp, &new_clp->lc_open, ls_list)
-		tstp->ls_clp = new_clp;
-	LIST_NEWHEAD(&new_clp->lc_deleg, &clp->lc_deleg, ls_list);
-	LIST_FOREACH(tstp, &new_clp->lc_deleg, ls_list)
-		tstp->ls_clp = new_clp;
-	LIST_NEWHEAD(&new_clp->lc_olddeleg, &clp->lc_olddeleg, ls_list);
-	LIST_FOREACH(tstp, &new_clp->lc_olddeleg, ls_list)
-		tstp->ls_clp = new_clp;
-	for (i = 0; i < NFSSTATEHASHSIZE; i++) {
-		LIST_NEWHEAD(&new_clp->lc_stateid[i], &clp->lc_stateid[i],
-		    ls_hash);
-		LIST_FOREACH(tstp, &new_clp->lc_stateid[i], ls_hash)
+
+	/* For NFSv4.1, mark that we found a confirmed clientid. */
+	if ((nd->nd_flag & ND_NFSV41) != 0)
+		confirmp->lval[1] = 1;
+	else {
+		/*
+		 * id and verifier match, so update the net address info
+		 * and get rid of any existing callback authentication
+		 * handle, so a new one will be acquired.
+		 */
+		LIST_REMOVE(clp, lc_hash);
+		new_clp->lc_flags |= (LCL_NEEDSCONFIRM | LCL_DONTCLEAN);
+		new_clp->lc_expiry = nfsrv_leaseexpiry();
+		confirmp->qval = new_clp->lc_confirm.qval = ++confirm_index;
+		clientidp->lval[0] = new_clp->lc_clientid.lval[0] =
+		    clp->lc_clientid.lval[0];
+		clientidp->lval[1] = new_clp->lc_clientid.lval[1] =
+		    clp->lc_clientid.lval[1];
+		new_clp->lc_delegtime = clp->lc_delegtime;
+		new_clp->lc_stateindex = clp->lc_stateindex;
+		new_clp->lc_statemaxindex = clp->lc_statemaxindex;
+		new_clp->lc_cbref = 0;
+		LIST_NEWHEAD(&new_clp->lc_open, &clp->lc_open, ls_list);
+		LIST_FOREACH(tstp, &new_clp->lc_open, ls_list)
 			tstp->ls_clp = new_clp;
+		LIST_NEWHEAD(&new_clp->lc_deleg, &clp->lc_deleg, ls_list);
+		LIST_FOREACH(tstp, &new_clp->lc_deleg, ls_list)
+			tstp->ls_clp = new_clp;
+		LIST_NEWHEAD(&new_clp->lc_olddeleg, &clp->lc_olddeleg, ls_list);
+		LIST_FOREACH(tstp, &new_clp->lc_olddeleg, ls_list)
+			tstp->ls_clp = new_clp;
+		for (i = 0; i < NFSSTATEHASHSIZE; i++) {
+			LIST_NEWHEAD(&new_clp->lc_stateid[i],
+			    &clp->lc_stateid[i], ls_hash);
+			LIST_FOREACH(tstp, &new_clp->lc_stateid[i], ls_hash)
+				tstp->ls_clp = new_clp;
+		}
+		LIST_INSERT_HEAD(NFSCLIENTHASH(new_clp->lc_clientid), new_clp,
+		    lc_hash);
+		newnfsstats.srvclients++;
+		nfsrv_openpluslock++;
+		nfsrv_clients++;
 	}
-	LIST_INSERT_HEAD(NFSCLIENTHASH(new_clp->lc_clientid), new_clp,
-	    lc_hash);
-	newnfsstats.srvclients++;
-	nfsrv_openpluslock++;
-	nfsrv_clients++;
 	NFSLOCKV4ROOTMUTEX();
 	nfsv4_unlock(&nfsv4rootfs_lock, 1);
 	NFSUNLOCKV4ROOTMUTEX();
 
-	/*
-	 * Must wait until any outstanding callback on the old clp
-	 * completes.
-	 */
-	NFSLOCKSTATE();
-	while (clp->lc_cbref) {
-		clp->lc_flags |= LCL_WAKEUPWANTED;
-		(void)mtx_sleep(clp, NFSSTATEMUTEXPTR, PZERO - 1, "nfsd clp",
-		    10 * hz);
+	if ((nd->nd_flag & ND_NFSV41) == 0) {
+		/*
+		 * Must wait until any outstanding callback on the old clp
+		 * completes.
+		 */
+		NFSLOCKSTATE();
+		while (clp->lc_cbref) {
+			clp->lc_flags |= LCL_WAKEUPWANTED;
+			(void)mtx_sleep(clp, NFSSTATEMUTEXPTR, PZERO - 1,
+			    "nfsdclp", 10 * hz);
+		}
+		NFSUNLOCKSTATE();
+		nfsrv_zapclient(clp, p);
+		*new_clpp = NULL;
 	}
-	NFSUNLOCKSTATE();
-	nfsrv_zapclient(clp, p);
-	*new_clpp = NULL;
 
 out:
 	NFSEXITCODE2(error, nd);
@@ -407,17 +447,23 @@ nfsrv_setclient(struct nfsrv_descript *nd, struct nfsclient **new_clpp,
  */
 APPLESTATIC int
 nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp,
-    nfsquad_t confirm, struct nfsrv_descript *nd, NFSPROC_T *p)
+    struct nfsdsession *nsep, nfsquad_t confirm, uint32_t cbprogram,
+    struct nfsrv_descript *nd, NFSPROC_T *p)
 {
 	struct nfsclient *clp;
 	struct nfsstate *stp;
 	int i;
 	struct nfsclienthashhead *hp;
 	int error = 0, igotlock, doneok;
+	struct nfssessionhash *shp;
+	struct nfsdsession *sep;
+	uint64_t sessid[2];
+	static uint64_t next_sess = 0;
 
 	if (clpp)
 		*clpp = NULL;
-	if (nfsrvboottime != clientid.lval[0]) {
+	if ((nd == NULL || (nd->nd_flag & ND_NFSV41) == 0 ||
+	    opflags != CLOPS_RENEW) && nfsrvboottime != clientid.lval[0]) {
 		error = NFSERR_STALECLIENTID;
 		goto out;
 	}
@@ -434,17 +480,39 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp,
 			igotlock = nfsv4_lock(&nfsv4rootfs_lock, 1, NULL,
 			    NFSV4ROOTLOCKMUTEXPTR, NULL);
 		} while (!igotlock);
+		/*
+		 * Create a new sessionid here, since we need to do it where
+		 * there is a mutex held to serialize update of next_sess.
+		 */
+		if ((nd->nd_flag & ND_NFSV41) != 0) {
+			sessid[0] = ++next_sess;
+			sessid[1] = clientid.qval;
+		}
 		NFSUNLOCKV4ROOTMUTEX();
 	} else if (opflags != CLOPS_RENEW) {
 		NFSLOCKSTATE();
 	}
 
-	hp = NFSCLIENTHASH(clientid);
-	LIST_FOREACH(clp, hp, lc_hash) {
-		if (clp->lc_clientid.lval[1] == clientid.lval[1])
-			break;
+	/* For NFSv4.1, the clp is acquired from the associated session. */
+	if (nd != NULL && (nd->nd_flag & ND_NFSV41) != 0 &&
+	    opflags == CLOPS_RENEW) {
+		clp = NULL;
+		if ((nd->nd_flag & ND_HASSEQUENCE) != 0) {
+			shp = NFSSESSIONHASH(nd->nd_sessionid);
+			NFSLOCKSESSION(shp);
+			sep = nfsrv_findsession(nd->nd_sessionid);
+			if (sep != NULL)
+				clp = sep->sess_clp;
+			NFSUNLOCKSESSION(shp);
+		}
+	} else {
+		hp = NFSCLIENTHASH(clientid);
+		LIST_FOREACH(clp, hp, lc_hash) {
+			if (clp->lc_clientid.lval[1] == clientid.lval[1])
+				break;
+		}
 	}
-	if (clp == LIST_END(hp)) {
+	if (clp == NULL) {
 		if (opflags & CLOPS_CONFIRM)
 			error = NFSERR_STALECLIENTID;
 		else
@@ -470,7 +538,10 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp,
 	 * Perform any operations specified by the opflags.
 	 */
 	if (opflags & CLOPS_CONFIRM) {
-		if (clp->lc_confirm.qval != confirm.qval)
+		if (((nd->nd_flag & ND_NFSV41) != 0 &&
+		     clp->lc_confirm.lval[0] != confirm.lval[0]) ||
+		    ((nd->nd_flag & ND_NFSV41) == 0 &&
+		     clp->lc_confirm.qval != confirm.qval))
 			error = NFSERR_STALECLIENTID;
 		else if (nfsrv_notsamecredname(nd, clp))
 			error = NFSERR_CLIDINUSE;
@@ -485,7 +556,7 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp,
 			 */
 			nfsrv_cleanclient(clp, p);
 			nfsrv_freedeleglist(&clp->lc_olddeleg);
-			if (nfsrv_checkgrace(0)) {
+			if (nfsrv_checkgrace(nd, clp, 0)) {
 			    /* In grace, so just delete delegations */
 			    nfsrv_freedeleglist(&clp->lc_deleg);
 			} else {
@@ -496,10 +567,43 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp,
 			    LIST_NEWHEAD(&clp->lc_olddeleg, &clp->lc_deleg,
 				ls_list);
 			}
+			if ((nd->nd_flag & ND_NFSV41) != 0)
+			    clp->lc_program = cbprogram;
 		    }
 		    clp->lc_flags &= ~(LCL_NEEDSCONFIRM | LCL_DONTCLEAN);
 		    if (clp->lc_program)
 			clp->lc_flags |= LCL_NEEDSCBNULL;
+		    /* For NFSv4.1, link the session onto the client. */
+		    if (nsep != NULL) {
+			/* Hold a reference on the xprt for a backchannel. */
+			if ((nsep->sess_crflags & NFSV4CRSESS_CONNBACKCHAN)
+			    != 0 && clp->lc_req.nr_client == NULL) {
+			    clp->lc_req.nr_client = (struct __rpc_client *)
+				clnt_bck_create(nd->nd_xprt->xp_socket,
+				cbprogram, NFSV4_CBVERS);
+			    if (clp->lc_req.nr_client != NULL) {
+				SVC_ACQUIRE(nd->nd_xprt);
+				nd->nd_xprt->xp_p2 =
+				    clp->lc_req.nr_client->cl_private;
+				/* Disable idle timeout. */
+				nd->nd_xprt->xp_idletimeout = 0;
+				nsep->sess_cbsess.nfsess_xprt = nd->nd_xprt;
+			    } else
+				nsep->sess_crflags &= ~NFSV4CRSESS_CONNBACKCHAN;
+			}
+			NFSBCOPY(sessid, nsep->sess_sessionid,
+			    NFSX_V4SESSIONID);
+			NFSBCOPY(sessid, nsep->sess_cbsess.nfsess_sessionid,
+			    NFSX_V4SESSIONID);
+			shp = NFSSESSIONHASH(nsep->sess_sessionid);
+			NFSLOCKSESSION(shp);
+			LIST_INSERT_HEAD(&shp->list, nsep, sess_hash);
+			NFSLOCKSTATE();
+			LIST_INSERT_HEAD(&clp->lc_session, nsep, sess_list);
+			nsep->sess_clp = clp;
+			NFSUNLOCKSTATE();
+			NFSUNLOCKSESSION(shp);
+		    }
 		}
 	} else if (clp->lc_flags & LCL_NEEDSCONFIRM) {
 		error = NFSERR_EXPIRED;
@@ -545,6 +649,74 @@ nfsrv_getclient(nfsquad_t clientid, int opflags, struct nfsclient **clpp,
 	return (error);
 }
 
+/*
+ * Perform the NFSv4.1 destroy clientid.
+ */
+int
+nfsrv_destroyclient(nfsquad_t clientid, NFSPROC_T *p)
+{
+	struct nfsclient *clp;
+	struct nfsclienthashhead *hp;
+	int error = 0, i, igotlock;
+
+	if (nfsrvboottime != clientid.lval[0]) {
+		error = NFSERR_STALECLIENTID;
+		goto out;
+	}
+
+	/* Lock out other nfsd threads */
+	NFSLOCKV4ROOTMUTEX();
+	nfsv4_relref(&nfsv4rootfs_lock);
+	do {
+		igotlock = nfsv4_lock(&nfsv4rootfs_lock, 1, NULL,
+		    NFSV4ROOTLOCKMUTEXPTR, NULL);
+	} while (igotlock == 0);
+	NFSUNLOCKV4ROOTMUTEX();
+
+	hp = NFSCLIENTHASH(clientid);
+	LIST_FOREACH(clp, hp, lc_hash) {
+		if (clp->lc_clientid.lval[1] == clientid.lval[1])
+			break;
+	}
+	if (clp == NULL) {
+		NFSLOCKV4ROOTMUTEX();
+		nfsv4_unlock(&nfsv4rootfs_lock, 1);
+		NFSUNLOCKV4ROOTMUTEX();
+		/* Just return ok, since it is gone. */
+		goto out;
+	}
+
+	/* Scan for state on the clientid. */
+	for (i = 0; i < NFSSTATEHASHSIZE; i++)
+		if (!LIST_EMPTY(&clp->lc_stateid[i])) {
+			NFSLOCKV4ROOTMUTEX();
+			nfsv4_unlock(&nfsv4rootfs_lock, 1);
+			NFSUNLOCKV4ROOTMUTEX();
+			error = NFSERR_CLIENTIDBUSY;
+			goto out;
+		}
+	if (!LIST_EMPTY(&clp->lc_session) || !LIST_EMPTY(&clp->lc_deleg)) {
+		NFSLOCKV4ROOTMUTEX();
+		nfsv4_unlock(&nfsv4rootfs_lock, 1);
+		NFSUNLOCKV4ROOTMUTEX();
+		error = NFSERR_CLIENTIDBUSY;
+		goto out;
+	}
+
+	/* Destroy the clientid and return ok. */
+	nfsrv_cleanclient(clp, p);
+	nfsrv_freedeleglist(&clp->lc_deleg);
+	nfsrv_freedeleglist(&clp->lc_olddeleg);
+	LIST_REMOVE(clp, lc_hash);
+	NFSLOCKV4ROOTMUTEX();
+	nfsv4_unlock(&nfsv4rootfs_lock, 1);
+	NFSUNLOCKV4ROOTMUTEX();
+	nfsrv_zapclient(clp, p);
+out:
+	NFSEXITCODE2(error, nd);
+	return (error);
+}
+
 /*
  * Called from the new nfssvc syscall to admin revoke a clientid.
  * Returns 0 for success, error otherwise.
@@ -983,9 +1155,13 @@ APPLESTATIC void
 nfsrv_cleanclient(struct nfsclient *clp, NFSPROC_T *p)
 {
 	struct nfsstate *stp, *nstp;
+	struct nfsdsession *sep, *nsep;
 
 	LIST_FOREACH_SAFE(stp, &clp->lc_open, ls_list, nstp)
 		nfsrv_freeopenowner(stp, 1, p);
+	if ((clp->lc_flags & LCL_ADMINREVOKED) == 0)
+		LIST_FOREACH_SAFE(sep, &clp->lc_session, sess_list, nsep)
+			(void)nfsrv_freesession(sep, NULL);
 }
 
 /*
@@ -1425,8 +1601,8 @@ nfsrv_lockctrl(vnode_t vp, struct nfsstate **new_stpp,
 		 * lease, but the concensus seems to be that it is ok
 		 * for a server to do so.
 		 */
-		error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp,
-		    (nfsquad_t)((u_quad_t)0), NULL, p);
+		error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp, NULL,
+		    (nfsquad_t)((u_quad_t)0), 0, nd, p);
 
 		/*
 		 * Since NFSERR_EXPIRED, NFSERR_ADMINREVOKED are not valid
@@ -1438,8 +1614,8 @@ nfsrv_lockctrl(vnode_t vp, struct nfsstate **new_stpp,
 		    error = 0;
 		lckstp = new_stp;
 	    } else {
-	      error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp,
-		(nfsquad_t)((u_quad_t)0), NULL, p);
+	      error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp, NULL,
+		(nfsquad_t)((u_quad_t)0), 0, nd, p);
 	      if (error == 0)
 		/*
 		 * Look up the stateid
@@ -1528,8 +1704,11 @@ nfsrv_lockctrl(vnode_t vp, struct nfsstate **new_stpp,
 	       * allow for either server configuration.)
 	       */
 	      if (!error && stp->ls_stateid.seqid!=new_stp->ls_stateid.seqid &&
-		  (!(new_stp->ls_flags & NFSLCK_CHECK) ||
-		   nfsrv_returnoldstateid))
+		  (((nd->nd_flag & ND_NFSV41) == 0 &&
+		   (!(new_stp->ls_flags & NFSLCK_CHECK) ||
+		    nfsrv_returnoldstateid)) ||
+		   ((nd->nd_flag & ND_NFSV41) != 0 &&
+		    new_stp->ls_stateid.seqid != 0)))
 		    error = NFSERR_OLDSTATEID;
 	    }
 	}
@@ -1538,7 +1717,7 @@ nfsrv_lockctrl(vnode_t vp, struct nfsstate **new_stpp,
 	 * Now we can check for grace.
 	 */
 	if (!error)
-		error = nfsrv_checkgrace(new_stp->ls_flags);
+		error = nfsrv_checkgrace(nd, clp, new_stp->ls_flags);
 	if ((new_stp->ls_flags & NFSLCK_RECLAIM) && !error &&
 		nfsrv_checkstable(clp))
 		error = NFSERR_NOGRACE;
@@ -1785,6 +1964,8 @@ nfsrv_lockctrl(vnode_t vp, struct nfsstate **new_stpp,
 		end = new_lop->lo_end;
 		nfsrv_updatelock(stp, new_lopp, &other_lop, lfp);
 		stateidp->seqid = ++(stp->ls_stateid.seqid);
+		if ((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0)
+			stateidp->seqid = stp->ls_stateid.seqid = 1;
 		stateidp->other[0] = stp->ls_stateid.other[0];
 		stateidp->other[1] = stp->ls_stateid.other[1];
 		stateidp->other[2] = stp->ls_stateid.other[2];
@@ -1892,6 +2073,8 @@ nfsrv_lockctrl(vnode_t vp, struct nfsstate **new_stpp,
 	if (!(new_stp->ls_flags & NFSLCK_OPENTOLOCK)) {
 		nfsrv_updatelock(lckstp, new_lopp, &other_lop, lfp);
 		stateidp->seqid = ++(lckstp->ls_stateid.seqid);
+		if ((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0)
+			stateidp->seqid = lckstp->ls_stateid.seqid = 1;
 		stateidp->other[0] = lckstp->ls_stateid.other[0];
 		stateidp->other[1] = lckstp->ls_stateid.other[1];
 		stateidp->other[2] = lckstp->ls_stateid.other[2];
@@ -1991,8 +2174,8 @@ nfsrv_opencheck(nfsquad_t clientid, nfsv4stateid_t *stateidp,
 	/*
 	 * Get the nfsclient structure.
 	 */
-	error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp,
-	    (nfsquad_t)((u_quad_t)0), NULL, p);
+	error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp, NULL,
+	    (nfsquad_t)((u_quad_t)0), 0, nd, p);
 
 	/*
 	 * Look up the open owner. See if it needs confirmation and
@@ -2018,7 +2201,7 @@ nfsrv_opencheck(nfsquad_t clientid, nfsv4stateid_t *stateidp,
 	 * Check for grace.
 	 */
 	if (!error)
-		error = nfsrv_checkgrace(new_stp->ls_flags);
+		error = nfsrv_checkgrace(nd, clp, new_stp->ls_flags);
 	if ((new_stp->ls_flags & NFSLCK_RECLAIM) && !error &&
 		nfsrv_checkstable(clp))
 		error = NFSERR_NOGRACE;
@@ -2084,7 +2267,9 @@ nfsrv_opencheck(nfsquad_t clientid, nfsv4stateid_t *stateidp,
 	     */
 	    LIST_FOREACH(stp, &lfp->lf_deleg, ls_file) {
 		if (!(stp->ls_flags & NFSLCK_OLDDELEG) &&
-		    stateidp->seqid == stp->ls_stateid.seqid &&
+		    (((nd->nd_flag & ND_NFSV41) != 0 &&
+		    stateidp->seqid == 0) ||
+		    stateidp->seqid == stp->ls_stateid.seqid) &&
 		    !NFSBCMP(stateidp->other, stp->ls_stateid.other,
 			  NFSX_STATEIDOTHER))
 			break;
@@ -2252,8 +2437,8 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
 	 *     storage file must be written prior to completion of state
 	 *     expiration.
 	 */
-	error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp,
-	    (nfsquad_t)((u_quad_t)0), NULL, p);
+	error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp, NULL,
+	    (nfsquad_t)((u_quad_t)0), 0, nd, p);
 	if (!error && (clp->lc_flags & LCL_NEEDSCBNULL) &&
 	    clp->lc_program) {
 		/*
@@ -2341,7 +2526,9 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
 	     */
 	    LIST_FOREACH(stp, &lfp->lf_deleg, ls_file) {
 		if (!(stp->ls_flags & NFSLCK_OLDDELEG) &&
-		    stateidp->seqid == stp->ls_stateid.seqid &&
+		    (((nd->nd_flag & ND_NFSV41) != 0 &&
+		    stateidp->seqid == 0) ||
+		    stateidp->seqid == stp->ls_stateid.seqid) &&
 		    !NFSBCMP(stateidp->other, stp->ls_stateid.other,
 			NFSX_STATEIDOTHER))
 			break;
@@ -2506,7 +2693,7 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
 		    LIST_REMOVE(stp, ls_list);
 		    LIST_REMOVE(stp, ls_hash);
 		    stp->ls_flags &= ~NFSLCK_OLDDELEG;
-		    stp->ls_stateid.seqid = delegstateidp->seqid = 0;
+		    stp->ls_stateid.seqid = delegstateidp->seqid = 1;
 		    stp->ls_stateid.other[0] = delegstateidp->other[0] =
 			clp->lc_clientid.lval[0];
 		    stp->ls_stateid.other[1] = delegstateidp->other[1] =
@@ -2527,7 +2714,7 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
 		    /*
 		     * Now, do the associated open.
 		     */
-		    new_open->ls_stateid.seqid = 0;
+		    new_open->ls_stateid.seqid = 1;
 		    new_open->ls_stateid.other[0] = clp->lc_clientid.lval[0];
 		    new_open->ls_stateid.other[1] = clp->lc_clientid.lval[1];
 		    new_open->ls_stateid.other[2] = nfsrv_nextstateindex(clp);
@@ -2592,7 +2779,7 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
 		 * First, add the delegation. (Although we must issue the
 		 * delegation, we can also ask for an immediate return.)
 		 */
-		new_deleg->ls_stateid.seqid = delegstateidp->seqid = 0;
+		new_deleg->ls_stateid.seqid = delegstateidp->seqid = 1;
 		new_deleg->ls_stateid.other[0] = delegstateidp->other[0] =
 		    clp->lc_clientid.lval[0];
 		new_deleg->ls_stateid.other[1] = delegstateidp->other[1] =
@@ -2631,7 +2818,7 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
 		/*
 		 * Now, do the associated open.
 		 */
-		new_open->ls_stateid.seqid = 0;
+		new_open->ls_stateid.seqid = 1;
 		new_open->ls_stateid.other[0] = clp->lc_clientid.lval[0];
 		new_open->ls_stateid.other[1] = clp->lc_clientid.lval[1];
 		new_open->ls_stateid.other[2] = nfsrv_nextstateindex(clp);
@@ -2686,7 +2873,7 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
 		    stp = LIST_FIRST(&ownerstp->ls_open);
 		    stp->ls_flags = (new_stp->ls_flags & NFSLCK_SHAREBITS) |
 			NFSLCK_OPEN;
-		    stp->ls_stateid.seqid = 0;
+		    stp->ls_stateid.seqid = 1;
 		    stp->ls_uid = new_stp->ls_uid;
 		    if (lfp != stp->ls_lfp) {
 			LIST_REMOVE(stp, ls_file);
@@ -2697,18 +2884,28 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
 		} else if (openstp) {
 		    openstp->ls_flags |= (new_stp->ls_flags & NFSLCK_SHAREBITS);
 		    openstp->ls_stateid.seqid++;
+		    if ((nd->nd_flag & ND_NFSV41) != 0 &&
+			openstp->ls_stateid.seqid == 0)
+			openstp->ls_stateid.seqid = 1;
 
 		    /*
 		     * This is where we can choose to issue a delegation.
 		     */
-		    if (delegate && nfsrv_issuedelegs &&
-			writedeleg && !NFSVNO_EXRDONLY(exp) &&
-			(nfsrv_writedelegifpos || !readonly) &&
-			(clp->lc_flags & (LCL_CALLBACKSON | LCL_CBDOWN)) ==
-			 LCL_CALLBACKSON &&
-			!NFSRV_V4DELEGLIMIT(nfsrv_delegatecnt) &&
-			NFSVNO_DELEGOK(vp)) {
-			new_deleg->ls_stateid.seqid = delegstateidp->seqid = 0;
+		    if (delegate == 0 || writedeleg == 0 ||
+			NFSVNO_EXRDONLY(exp) || (readonly != 0 &&
+			nfsrv_writedelegifpos == 0) ||
+			!NFSVNO_DELEGOK(vp) ||
+			(new_stp->ls_flags & NFSLCK_WANTRDELEG) != 0 ||
+			(clp->lc_flags & (LCL_CALLBACKSON | LCL_CBDOWN)) !=
+			 LCL_CALLBACKSON)
+			*rflagsp |= NFSV4OPEN_WDCONTENTION;
+		    else if (nfsrv_issuedelegs == 0 ||
+			NFSRV_V4DELEGLIMIT(nfsrv_delegatecnt))
+			*rflagsp |= NFSV4OPEN_WDRESOURCE;
+		    else if ((new_stp->ls_flags & NFSLCK_WANTNODELEG) != 0)
+			*rflagsp |= NFSV4OPEN_WDNOTWANTED;
+		    else {
+			new_deleg->ls_stateid.seqid = delegstateidp->seqid = 1;
 			new_deleg->ls_stateid.other[0] = delegstateidp->other[0]
 			    = clp->lc_clientid.lval[0];
 			new_deleg->ls_stateid.other[1] = delegstateidp->other[1]
@@ -2733,7 +2930,7 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
 			nfsrv_delegatecnt++;
 		    }
 		} else {
-		    new_open->ls_stateid.seqid = 0;
+		    new_open->ls_stateid.seqid = 1;
 		    new_open->ls_stateid.other[0] = clp->lc_clientid.lval[0];
 		    new_open->ls_stateid.other[1] = clp->lc_clientid.lval[1];
 		    new_open->ls_stateid.other[2] = nfsrv_nextstateindex(clp);
@@ -2756,13 +2953,18 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
 		    /*
 		     * This is where we can choose to issue a delegation.
 		     */
-		    if (delegate && nfsrv_issuedelegs &&
-			(writedeleg || readonly) &&
-			(clp->lc_flags & (LCL_CALLBACKSON | LCL_CBDOWN)) ==
-			 LCL_CALLBACKSON &&
-			!NFSRV_V4DELEGLIMIT(nfsrv_delegatecnt) &&
-			NFSVNO_DELEGOK(vp)) {
-			new_deleg->ls_stateid.seqid = delegstateidp->seqid = 0;
+		    if (delegate == 0 || (writedeleg == 0 && readonly == 0) ||
+			!NFSVNO_DELEGOK(vp) ||
+			(clp->lc_flags & (LCL_CALLBACKSON | LCL_CBDOWN)) !=
+			 LCL_CALLBACKSON)
+			*rflagsp |= NFSV4OPEN_WDCONTENTION;
+		    else if (nfsrv_issuedelegs == 0 ||
+			NFSRV_V4DELEGLIMIT(nfsrv_delegatecnt))
+			*rflagsp |= NFSV4OPEN_WDRESOURCE;
+		    else if ((new_stp->ls_flags & NFSLCK_WANTNODELEG) != 0)
+			*rflagsp |= NFSV4OPEN_WDNOTWANTED;
+		    else {
+			new_deleg->ls_stateid.seqid = delegstateidp->seqid = 1;
 			new_deleg->ls_stateid.other[0] = delegstateidp->other[0]
 			    = clp->lc_clientid.lval[0];
 			new_deleg->ls_stateid.other[1] = delegstateidp->other[1]
@@ -2770,7 +2972,8 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
 			new_deleg->ls_stateid.other[2] = delegstateidp->other[2]
 			    = nfsrv_nextstateindex(clp);
 			if (writedeleg && !NFSVNO_EXRDONLY(exp) &&
-			    (nfsrv_writedelegifpos || !readonly)) {
+			    (nfsrv_writedelegifpos || !readonly) &&
+			    (new_stp->ls_flags & NFSLCK_WANTRDELEG) == 0) {
 			    new_deleg->ls_flags = (NFSLCK_DELEGWRITE |
 				NFSLCK_READACCESS | NFSLCK_WRITEACCESS);
 			    *rflagsp |= NFSV4OPEN_WRITEDELEGATE;
@@ -2800,7 +3003,7 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
 		 * Needs confirmation (unless a reclaim) and hang the
 		 * new open off it.
 		 */
-		new_open->ls_stateid.seqid = 0;
+		new_open->ls_stateid.seqid = 1;
 		new_open->ls_stateid.other[0] = clp->lc_clientid.lval[0];
 		new_open->ls_stateid.other[1] = clp->lc_clientid.lval[1];
 		new_open->ls_stateid.other[2] = nfsrv_nextstateindex(clp);
@@ -2814,6 +3017,64 @@ nfsrv_openctrl(struct nfsrv_descript *nd, vnode_t vp,
 		LIST_INSERT_HEAD(&lfp->lf_open, new_open, ls_file);
 		if (new_stp->ls_flags & NFSLCK_RECLAIM) {
 			new_stp->ls_flags = 0;
+		} else if ((nd->nd_flag & ND_NFSV41) != 0) {
+			/* NFSv4.1 never needs confirmation. */
+			new_stp->ls_flags = 0;
+
+			/*
+			 * This is where we can choose to issue a delegation.
+			 */
+			if (delegate && nfsrv_issuedelegs &&
+			    (writedeleg || readonly) &&
+			    (clp->lc_flags & (LCL_CALLBACKSON | LCL_CBDOWN)) ==
+			     LCL_CALLBACKSON &&
+			    !NFSRV_V4DELEGLIMIT(nfsrv_delegatecnt) &&
+			    NFSVNO_DELEGOK(vp) &&
+			    ((nd->nd_flag & ND_NFSV41) == 0 ||
+			     (new_stp->ls_flags & NFSLCK_WANTNODELEG) == 0)) {
+				new_deleg->ls_stateid.seqid =
+				    delegstateidp->seqid = 1;
+				new_deleg->ls_stateid.other[0] =
+				    delegstateidp->other[0]
+				    = clp->lc_clientid.lval[0];
+				new_deleg->ls_stateid.other[1] =
+				    delegstateidp->other[1]
+				    = clp->lc_clientid.lval[1];
+				new_deleg->ls_stateid.other[2] =
+				    delegstateidp->other[2]
+				    = nfsrv_nextstateindex(clp);
+				if (writedeleg && !NFSVNO_EXRDONLY(exp) &&
+				    (nfsrv_writedelegifpos || !readonly) &&
+				    ((nd->nd_flag & ND_NFSV41) == 0 ||
+				     (new_stp->ls_flags & NFSLCK_WANTRDELEG) ==
+				     0)) {
+					new_deleg->ls_flags =
+					    (NFSLCK_DELEGWRITE |
+					     NFSLCK_READACCESS |
+					     NFSLCK_WRITEACCESS);
+					*rflagsp |= NFSV4OPEN_WRITEDELEGATE;
+				} else {
+					new_deleg->ls_flags =
+					    (NFSLCK_DELEGREAD |
+					     NFSLCK_READACCESS);
+					*rflagsp |= NFSV4OPEN_READDELEGATE;
+				}
+				new_deleg->ls_uid = new_stp->ls_uid;
+				new_deleg->ls_lfp = lfp;
+				new_deleg->ls_clp = clp;
+				new_deleg->ls_filerev = filerev;
+				new_deleg->ls_compref = nd->nd_compref;
+				LIST_INSERT_HEAD(&lfp->lf_deleg, new_deleg,
+				    ls_file);
+				LIST_INSERT_HEAD(NFSSTATEHASH(clp,
+				    new_deleg->ls_stateid), new_deleg, ls_hash);
+				LIST_INSERT_HEAD(&clp->lc_deleg, new_deleg,
+				    ls_list);
+				new_deleg = NULL;
+				newnfsstats.srvdelegates++;
+				nfsrv_openpluslock++;
+				nfsrv_delegatecnt++;
+			}
 		} else {
 			*rflagsp |= NFSV4OPEN_RESULTCONFIRM;
 			new_stp->ls_flags = NFSLCK_NEEDSCONFIRM;
@@ -2881,8 +3142,8 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid,
 	/*
 	 * Get the open structure via clientid and stateid.
 	 */
-	error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp,
-	    (nfsquad_t)((u_quad_t)0), NULL, p);
+	error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp, NULL,
+	    (nfsquad_t)((u_quad_t)0), 0, nd, p);
 	if (!error)
 		error = nfsrv_getstate(clp, &new_stp->ls_stateid,
 		    new_stp->ls_flags, &stp);
@@ -2901,7 +3162,10 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid,
 		error = nfsrv_checkseqid(nd, new_stp->ls_seq,
 		    stp->ls_openowner, new_stp->ls_op);
 	if (!error && stp->ls_stateid.seqid != new_stp->ls_stateid.seqid &&
-	    !(new_stp->ls_flags & NFSLCK_CONFIRM))
+	    (((nd->nd_flag & ND_NFSV41) == 0 &&
+	      !(new_stp->ls_flags & NFSLCK_CONFIRM)) ||
+	     ((nd->nd_flag & ND_NFSV41) != 0 &&
+	      new_stp->ls_stateid.seqid != 0)))
 		error = NFSERR_OLDSTATEID;
 	if (!error && vnode_vtype(vp) != VREG) {
 		if (vnode_vtype(vp) == VDIR)
@@ -2929,6 +3193,8 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid,
 	 * Set the return stateid.
 	 */
 	stateidp->seqid = stp->ls_stateid.seqid + 1;
+	if ((nd->nd_flag & ND_NFSV41) != 0 && stateidp->seqid == 0)
+		stateidp->seqid = 1;
 	stateidp->other[0] = stp->ls_stateid.other[0];
 	stateidp->other[1] = stp->ls_stateid.other[1];
 	stateidp->other[2] = stp->ls_stateid.other[2];
@@ -2944,6 +3210,9 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid,
 			printf("Nfsv4d: stray open confirm\n");
 		stp->ls_openowner->ls_flags = 0;
 		stp->ls_stateid.seqid++;
+		if ((nd->nd_flag & ND_NFSV41) != 0 &&
+		    stp->ls_stateid.seqid == 0)
+			stp->ls_stateid.seqid = 1;
 		if (!(clp->lc_flags & LCL_STAMPEDSTABLE)) {
 			clp->lc_flags |= LCL_STAMPEDSTABLE;
 			len = clp->lc_idlen;
@@ -2980,6 +3249,9 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid,
 		}
 		stp->ls_flags = (bits | NFSLCK_OPEN);
 		stp->ls_stateid.seqid++;
+		if ((nd->nd_flag & ND_NFSV41) != 0 &&
+		    stp->ls_stateid.seqid == 0)
+			stp->ls_stateid.seqid = 1;
 		NFSUNLOCKSTATE();
 	}
 
@@ -3001,8 +3273,9 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid,
  * Delegation update. Does the purge and return.
  */
 APPLESTATIC int
-nfsrv_delegupdate(nfsquad_t clientid, nfsv4stateid_t *stateidp,
-    vnode_t vp, int op, struct ucred *cred, NFSPROC_T *p)
+nfsrv_delegupdate(struct nfsrv_descript *nd, nfsquad_t clientid,
+    nfsv4stateid_t *stateidp, vnode_t vp, int op, struct ucred *cred,
+    NFSPROC_T *p)
 {
 	struct nfsstate *stp;
 	struct nfsclient *clp;
@@ -3032,8 +3305,8 @@ nfsrv_delegupdate(nfsquad_t clientid, nfsv4stateid_t *stateidp,
 	 * Get the open structure via clientid and stateid.
 	 */
 	if (!error)
-	    error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp,
-		(nfsquad_t)((u_quad_t)0), NULL, p);
+	    error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp, NULL,
+		(nfsquad_t)((u_quad_t)0), 0, nd, p);
 	if (error) {
 		if (error == NFSERR_CBPATHDOWN)
 			error = 0;
@@ -3042,7 +3315,8 @@ nfsrv_delegupdate(nfsquad_t clientid, nfsv4stateid_t *stateidp,
 	}
 	if (!error && op == NFSV4OP_DELEGRETURN) {
 	    error = nfsrv_getstate(clp, stateidp, NFSLCK_DELEGRETURN, &stp);
-	    if (!error && stp->ls_stateid.seqid != stateidp->seqid)
+	    if (!error && stp->ls_stateid.seqid != stateidp->seqid &&
+		((nd->nd_flag & ND_NFSV41) == 0 || stateidp->seqid != 0))
 		error = NFSERR_OLDSTATEID;
 	}
 	/*
@@ -3101,8 +3375,8 @@ nfsrv_releaselckown(struct nfsstate *new_stp, nfsquad_t clientid,
 	/*
 	 * Get the lock owner by name.
 	 */
-	error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp,
-	    (nfsquad_t)((u_quad_t)0), NULL, p);
+	error = nfsrv_getclient(clientid, CLOPS_RENEW, &clp, NULL,
+	    (nfsquad_t)((u_quad_t)0), 0, NULL, p);
 	if (error) {
 		NFSUNLOCKSTATE();
 		goto out;
@@ -3419,6 +3693,9 @@ nfsrv_checkseqid(struct nfsrv_descript *nd, u_int32_t seqid,
 {
 	int error = 0;
 
+	if ((nd->nd_flag & ND_NFSV41) != 0)
+		/* NFSv4.1 ignores the open_seqid and lock_seqid. */
+		goto out;
 	if (op != nd->nd_rp)
 		panic("nfsrvstate checkseqid");
 	if (!(op->rc_flag & RC_INPROG))
@@ -3637,7 +3914,7 @@ nfsrv_checkrestart(nfsquad_t clientid, u_int32_t flags,
 		goto out;
 
 	NFSLOCKSTATE();
-	ret = nfsrv_checkgrace(flags);
+	ret = nfsrv_checkgrace(NULL, NULL, flags);
 	NFSUNLOCKSTATE();
 
 out:
@@ -3649,11 +3926,12 @@ nfsrv_checkrestart(nfsquad_t clientid, u_int32_t flags,
  * Check for grace.
  */
 static int
-nfsrv_checkgrace(u_int32_t flags)
+nfsrv_checkgrace(struct nfsrv_descript *nd, struct nfsclient *clp,
+    u_int32_t flags)
 {
 	int error = 0;
 
-	if (nfsrv_stablefirst.nsf_flags & NFSNSF_GRACEOVER) {
+	if ((nfsrv_stablefirst.nsf_flags & NFSNSF_GRACEOVER) != 0) {
 		if (flags & NFSLCK_RECLAIM) {
 			error = NFSERR_NOGRACE;
 			goto out;
@@ -3663,6 +3941,12 @@ nfsrv_checkgrace(u_int32_t flags)
 			error = NFSERR_GRACE;
 			goto out;
 		}
+		if (nd != NULL && clp != NULL &&
+		    (nd->nd_flag & ND_NFSV41) != 0 &&
+		    (clp->lc_flags & LCL_RECLAIMCOMPLETE) != 0) {
+			error = NFSERR_NOGRACE;
+			goto out;
+		}
 
 		/*
 		 * If grace is almost over and we are still getting Reclaims,
@@ -3693,6 +3977,7 @@ nfsrv_docallback(struct nfsclient *clp, int procnum,
 	struct ucred *cred;
 	int error = 0;
 	u_int32_t callback;
+	struct nfsdsession *sep = NULL;
 
 	cred = newnfs_getcred();
 	NFSLOCKSTATE();	/* mostly for lc_cbref++ */
@@ -3707,7 +3992,12 @@ nfsrv_docallback(struct nfsclient *clp, int procnum,
 	 * structure for newnfs_connect() to use.
 	 */
 	clp->lc_req.nr_prog = clp->lc_program;
-	clp->lc_req.nr_vers = NFSV4_CBVERS;
+#ifdef notnow
+	if ((clp->lc_flags & LCL_NFSV41) != 0)
+		clp->lc_req.nr_vers = NFSV41_CBVERS;
+	else
+#endif
+		clp->lc_req.nr_vers = NFSV4_CBVERS;
 
 	/*
 	 * First, fill in some of the fields of nd and cr.
@@ -3715,6 +4005,8 @@ nfsrv_docallback(struct nfsclient *clp, int procnum,
 	nd->nd_flag = ND_NFSV4;
 	if (clp->lc_flags & LCL_GSS)
 		nd->nd_flag |= ND_KERBV;
+	if ((clp->lc_flags & LCL_NFSV41) != 0)
+		nd->nd_flag |= ND_NFSV41;
 	nd->nd_repstat = 0;
 	cred->cr_uid = clp->lc_uid;
 	cred->cr_gid = clp->lc_gid;
@@ -3735,22 +4027,23 @@ nfsrv_docallback(struct nfsclient *clp, int procnum,
 	 */
 	if (procnum == NFSV4OP_CBGETATTR) {
 		nd->nd_procnum = NFSV4PROC_CBCOMPOUND;
-		(void) nfsm_strtom(nd, "CB Getattr", 10);
-		NFSM_BUILD(tl, u_int32_t *, 4 * NFSX_UNSIGNED);
-		*tl++ = txdr_unsigned(NFSV4_MINORVERSION);
-		*tl++ = txdr_unsigned(callback);
-		*tl++ = txdr_unsigned(1);
-		*tl = txdr_unsigned(NFSV4OP_CBGETATTR);
-		(void) nfsm_fhtom(nd, (u_int8_t *)fhp, NFSX_MYFH, 0);
-		(void) nfsrv_putattrbit(nd, attrbitp);
+		error = nfsrv_cbcallargs(nd, clp, callback, NFSV4OP_CBGETATTR,
+		    "CB Getattr", &sep);
+		if (error != 0) {
+			mbuf_freem(nd->nd_mreq);
+			goto errout;
+		}
+		(void)nfsm_fhtom(nd, (u_int8_t *)fhp, NFSX_MYFH, 0);
+		(void)nfsrv_putattrbit(nd, attrbitp);
 	} else if (procnum == NFSV4OP_CBRECALL) {
 		nd->nd_procnum = NFSV4PROC_CBCOMPOUND;
-		(void) nfsm_strtom(nd, "CB Recall", 9);
-		NFSM_BUILD(tl, u_int32_t *, 5 * NFSX_UNSIGNED + NFSX_STATEID);
-		*tl++ = txdr_unsigned(NFSV4_MINORVERSION);
-		*tl++ = txdr_unsigned(callback);
-		*tl++ = txdr_unsigned(1);
-		*tl++ = txdr_unsigned(NFSV4OP_CBRECALL);
+		error = nfsrv_cbcallargs(nd, clp, callback, NFSV4OP_CBRECALL,
+		    "CB Recall", &sep);
+		if (error != 0) {
+			mbuf_freem(nd->nd_mreq);
+			goto errout;
+		}
+		NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED + NFSX_STATEID);
 		*tl++ = txdr_unsigned(stateidp->seqid);
 		NFSBCOPY((caddr_t)stateidp->other, (caddr_t)tl,
 		    NFSX_STATEIDOTHER);
@@ -3759,9 +4052,20 @@ nfsrv_docallback(struct nfsclient *clp, int procnum,
 			*tl = newnfs_true;
 		else
 			*tl = newnfs_false;
-		(void) nfsm_fhtom(nd, (u_int8_t *)fhp, NFSX_MYFH, 0);
-	} else {
+		(void)nfsm_fhtom(nd, (u_int8_t *)fhp, NFSX_MYFH, 0);
+	} else if (procnum == NFSV4PROC_CBNULL) {
 		nd->nd_procnum = NFSV4PROC_CBNULL;
+		if ((clp->lc_flags & LCL_NFSV41) != 0) {
+			error = nfsv4_getcbsession(clp, &sep);
+			if (error != 0) {
+				mbuf_freem(nd->nd_mreq);
+				goto errout;
+			}
+		}
+	} else {
+		error = NFSERR_SERVERFAULT;
+		mbuf_freem(nd->nd_mreq);
+		goto errout;
 	}
 
 	/*
@@ -3769,7 +4073,9 @@ nfsrv_docallback(struct nfsclient *clp, int procnum,
 	 */
 	(void) newnfs_sndlock(&clp->lc_req.nr_lock);
 	if (clp->lc_req.nr_client == NULL) {
-		if (nd->nd_procnum == NFSV4PROC_CBNULL)
+		if ((clp->lc_flags & LCL_NFSV41) != 0)
+			error = ECONNREFUSED;
+		else if (nd->nd_procnum == NFSV4PROC_CBNULL)
 			error = newnfs_connect(NULL, &clp->lc_req, cred,
 			    NULL, 1);
 		else
@@ -3778,10 +4084,19 @@ nfsrv_docallback(struct nfsclient *clp, int procnum,
 	}
 	newnfs_sndunlock(&clp->lc_req.nr_lock);
 	if (!error) {
-		error = newnfs_request(nd, NULL, clp, &clp->lc_req, NULL,
-		    NULL, cred, clp->lc_program, NFSV4_CBVERS, NULL, 1, NULL,
-		    NULL);
+		if ((nd->nd_flag & ND_NFSV41) != 0) {
+			KASSERT(sep != NULL, ("sep NULL"));
+			error = newnfs_request(nd, NULL, clp, &clp->lc_req,
+			    NULL, NULL, cred, clp->lc_program,
+			    clp->lc_req.nr_vers, NULL, 1, NULL,
+			    &sep->sess_cbsess);
+			nfsrv_freesession(sep, NULL);
+		} else
+			error = newnfs_request(nd, NULL, clp, &clp->lc_req,
+			    NULL, NULL, cred, clp->lc_program,
+			    clp->lc_req.nr_vers, NULL, 1, NULL, NULL);
 	}
+errout:
 	NFSFREECRED(cred);
 
 	/*
@@ -3811,7 +4126,7 @@ nfsrv_docallback(struct nfsclient *clp, int procnum,
 		NFSUNLOCKSTATE();
 		if (nd->nd_repstat)
 			error = nd->nd_repstat;
-		else if (procnum == NFSV4OP_CBGETATTR)
+		else if (error == 0 && procnum == NFSV4OP_CBGETATTR)
 			error = nfsv4_loadattr(nd, NULL, nap, NULL, NULL, 0,
 			    NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL,
 			    p, NULL);
@@ -3829,6 +4144,38 @@ nfsrv_docallback(struct nfsclient *clp, int procnum,
 	return (error);
 }
 
+/*
+ * Set up the compound RPC for the callback.
+ */
+static int
+nfsrv_cbcallargs(struct nfsrv_descript *nd, struct nfsclient *clp,
+    uint32_t callback, int op, const char *optag, struct nfsdsession **sepp)
+{
+	uint32_t *tl;
+	int error, len;
+
+	len = strlen(optag);
+	(void)nfsm_strtom(nd, optag, len);
+	NFSM_BUILD(tl, uint32_t *, 4 * NFSX_UNSIGNED);
+	if ((nd->nd_flag & ND_NFSV41) != 0) {
+		*tl++ = txdr_unsigned(NFSV41_MINORVERSION);
+		*tl++ = txdr_unsigned(callback);
+		*tl++ = txdr_unsigned(2);
+		*tl = txdr_unsigned(NFSV4OP_CBSEQUENCE);
+		error = nfsv4_setcbsequence(nd, clp, 1, sepp);
+		if (error != 0)
+			return (error);
+		NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED);
+		*tl = txdr_unsigned(op);
+	} else {
+		*tl++ = txdr_unsigned(NFSV4_MINORVERSION);
+		*tl++ = txdr_unsigned(callback);
+		*tl++ = txdr_unsigned(1);
+		*tl = txdr_unsigned(op);
+	}
+	return (0);
+}
+
 /*
  * Return the next index# for a clientid. Mostly just increment and return
  * the next one, but... if the 32bit unsigned does actually wrap around,
@@ -5281,3 +5628,307 @@ nfsrv_throwawayallstate(NFSPROC_T *p)
 	}
 }
 
+/*
+ * Check the sequence# for the session and slot provided as an argument.
+ * Also, renew the lease if the session will return NFS_OK.
+ */
+int
+nfsrv_checksequence(struct nfsrv_descript *nd, uint32_t sequenceid,
+    uint32_t *highest_slotidp, uint32_t *target_highest_slotidp, int cache_this,
+    uint32_t *sflagsp, NFSPROC_T *p)
+{
+	struct nfsdsession *sep;
+	struct nfssessionhash *shp;
+	int error;
+	SVCXPRT *savxprt;
+
+	shp = NFSSESSIONHASH(nd->nd_sessionid);
+	NFSLOCKSESSION(shp);
+	sep = nfsrv_findsession(nd->nd_sessionid);
+	if (sep == NULL) {
+		NFSUNLOCKSESSION(shp);
+		return (NFSERR_BADSESSION);
+	}
+	error = nfsv4_seqsession(sequenceid, nd->nd_slotid, *highest_slotidp,
+	    sep->sess_slots, NULL, NFSV4_SLOTS - 1);
+	if (error != 0) {
+		NFSUNLOCKSESSION(shp);
+		return (error);
+	}
+	if (cache_this != 0)
+		nd->nd_flag |= ND_SAVEREPLY;
+	/* Renew the lease. */
+	sep->sess_clp->lc_expiry = nfsrv_leaseexpiry();
+	nd->nd_clientid.qval = sep->sess_clp->lc_clientid.qval;
+	nd->nd_flag |= ND_IMPLIEDCLID;
+
+	/*
+	 * If this session handles the backchannel, save the nd_xprt for this
+	 * RPC, since this is the one being used.
+	 */
+	if (sep->sess_cbsess.nfsess_xprt != NULL &&
+	    (sep->sess_crflags & NFSV4CRSESS_CONNBACKCHAN) != 0) {
+		savxprt = sep->sess_cbsess.nfsess_xprt;
+		SVC_ACQUIRE(nd->nd_xprt);
+		nd->nd_xprt->xp_p2 = savxprt->xp_p2;
+		nd->nd_xprt->xp_idletimeout = 0;	/* Disable timeout. */
+		sep->sess_cbsess.nfsess_xprt = nd->nd_xprt;
+		SVC_RELEASE(savxprt);
+	}
+
+	*sflagsp = 0;
+	if (sep->sess_clp->lc_req.nr_client == NULL)
+		*sflagsp |= NFSV4SEQ_CBPATHDOWN;
+	NFSUNLOCKSESSION(shp);
+	if (error == NFSERR_EXPIRED) {
+		*sflagsp |= NFSV4SEQ_EXPIREDALLSTATEREVOKED;
+		error = 0;
+	} else if (error == NFSERR_ADMINREVOKED) {
+		*sflagsp |= NFSV4SEQ_ADMINSTATEREVOKED;
+		error = 0;
+	}
+	*highest_slotidp = *target_highest_slotidp = NFSV4_SLOTS - 1;
+	return (0);
+}
+
+/*
+ * Check/set reclaim complete for this session/clientid.
+ */
+int
+nfsrv_checkreclaimcomplete(struct nfsrv_descript *nd)
+{
+	struct nfsdsession *sep;
+	struct nfssessionhash *shp;
+	int error = 0;
+
+	shp = NFSSESSIONHASH(nd->nd_sessionid);
+	NFSLOCKSTATE();
+	NFSLOCKSESSION(shp);
+	sep = nfsrv_findsession(nd->nd_sessionid);
+	if (sep == NULL) {
+		NFSUNLOCKSESSION(shp);
+		NFSUNLOCKSTATE();
+		return (NFSERR_BADSESSION);
+	}
+
+	/* Check to see if reclaim complete has already happened. */
+	if ((sep->sess_clp->lc_flags & LCL_RECLAIMCOMPLETE) != 0)
+		error = NFSERR_COMPLETEALREADY;
+	else
+		sep->sess_clp->lc_flags |= LCL_RECLAIMCOMPLETE;
+	NFSUNLOCKSESSION(shp);
+	NFSUNLOCKSTATE();
+	return (error);
+}
+
+/*
+ * Cache the reply in a session slot.
+ */
+void
+nfsrv_cache_session(uint8_t *sessionid, uint32_t slotid, int repstat,
+   struct mbuf **m)
+{
+	struct nfsdsession *sep;
+	struct nfssessionhash *shp;
+
+	shp = NFSSESSIONHASH(sessionid);
+	NFSLOCKSESSION(shp);
+	sep = nfsrv_findsession(sessionid);
+	if (sep == NULL) {
+		NFSUNLOCKSESSION(shp);
+		printf("nfsrv_cache_session: no session\n");
+		m_freem(*m);
+		return;
+	}
+	nfsv4_seqsess_cacherep(slotid, sep->sess_slots, repstat, m);
+	NFSUNLOCKSESSION(shp);
+}
+
+/*
+ * Search for a session that matches the sessionid.
+ */
+static struct nfsdsession *
+nfsrv_findsession(uint8_t *sessionid)
+{
+	struct nfsdsession *sep;
+	struct nfssessionhash *shp;
+
+	shp = NFSSESSIONHASH(sessionid);
+	LIST_FOREACH(sep, &shp->list, sess_hash) {
+		if (!NFSBCMP(sessionid, sep->sess_sessionid, NFSX_V4SESSIONID))
+			break;
+	}
+	return (sep);
+}
+
+/*
+ * Destroy a session.
+ */
+int
+nfsrv_destroysession(struct nfsrv_descript *nd, uint8_t *sessionid)
+{
+	int error, samesess;
+
+	samesess = 0;
+	if (!NFSBCMP(sessionid, nd->nd_sessionid, NFSX_V4SESSIONID)) {
+		samesess = 1;
+		if ((nd->nd_flag & ND_LASTOP) == 0)
+			return (NFSERR_BADSESSION);
+	}
+	error = nfsrv_freesession(NULL, sessionid);
+	if (error == 0 && samesess != 0)
+		nd->nd_flag &= ~ND_HASSEQUENCE;
+	return (error);
+}
+
+/*
+ * Free up a session structure.
+ */
+static int
+nfsrv_freesession(struct nfsdsession *sep, uint8_t *sessionid)
+{
+	struct nfssessionhash *shp;
+	int i;
+
+	if (sep == NULL) {
+		shp = NFSSESSIONHASH(sessionid);
+		NFSLOCKSESSION(shp);
+		sep = nfsrv_findsession(sessionid);
+	} else {
+		shp = NFSSESSIONHASH(sep->sess_sessionid);
+		NFSLOCKSESSION(shp);
+	}
+	if (sep != NULL) {
+		NFSLOCKSTATE();
+		sep->sess_refcnt--;
+		if (sep->sess_refcnt > 0) {
+			NFSUNLOCKSTATE();
+			NFSUNLOCKSESSION(shp);
+			return (0);
+		}
+		LIST_REMOVE(sep, sess_hash);
+		LIST_REMOVE(sep, sess_list);
+		NFSUNLOCKSTATE();
+	}
+	NFSUNLOCKSESSION(shp);
+	if (sep == NULL)
+		return (NFSERR_BADSESSION);
+	for (i = 0; i < NFSV4_SLOTS; i++)
+		if (sep->sess_slots[i].nfssl_reply != NULL)
+			m_freem(sep->sess_slots[i].nfssl_reply);
+	if (sep->sess_cbsess.nfsess_xprt != NULL)
+		SVC_RELEASE(sep->sess_cbsess.nfsess_xprt);
+	free(sep, M_NFSDSESSION);
+	return (0);
+}
+
+/*
+ * Free a stateid.
+ * RFC5661 says that it should fail when there are associated opens, locks
+ * or delegations. Since stateids represent opens, I don't see how you can
+ * free an open stateid (it will be free'd when closed), so this function
+ * only works for lock stateids (freeing the lock_owner) or delegations.
+ */
+int
+nfsrv_freestateid(struct nfsrv_descript *nd, nfsv4stateid_t *stateidp,
+    NFSPROC_T *p)
+{
+	struct nfsclient *clp;
+	struct nfsstate *stp;
+	int error;
+
+	NFSLOCKSTATE();
+	/*
+	 * Look up the stateid
+	 */
+	error = nfsrv_getclient((nfsquad_t)((u_quad_t)0), CLOPS_RENEW, &clp,
+	    NULL, (nfsquad_t)((u_quad_t)0), 0, nd, p);
+	if (error == 0) {
+		/* First, check for a delegation. */
+		LIST_FOREACH(stp, &clp->lc_deleg, ls_list) {
+			if (!NFSBCMP(stp->ls_stateid.other, stateidp->other,
+			    NFSX_STATEIDOTHER))
+				break;
+		}
+		if (stp != NULL) {
+			nfsrv_freedeleg(stp);
+			NFSUNLOCKSTATE();
+			return (error);
+		}
+	}
+	/* Not a delegation, try for a lock_owner. */
+	if (error == 0)
+		error = nfsrv_getstate(clp, stateidp, 0, &stp);
+	if (error == 0 && ((stp->ls_flags & (NFSLCK_OPEN | NFSLCK_DELEGREAD |
+	    NFSLCK_DELEGWRITE)) != 0 || (stp->ls_flags & NFSLCK_LOCK) == 0))
+		/* Not a lock_owner stateid. */
+		error = NFSERR_LOCKSHELD;
+	if (error == 0 && !LIST_EMPTY(&stp->ls_lock))
+		error = NFSERR_LOCKSHELD;
+	if (error == 0)
+		nfsrv_freelockowner(stp, NULL, 0, p);
+	NFSUNLOCKSTATE();
+	return (error);
+}
+
+/*
+ * Generate the xdr for an NFSv4.1 CBSequence Operation.
+ */
+static int
+nfsv4_setcbsequence(struct nfsrv_descript *nd, struct nfsclient *clp,
+    int dont_replycache, struct nfsdsession **sepp)
+{
+	struct nfsdsession *sep;
+	uint32_t *tl, slotseq = 0;
+	int maxslot, slotpos;
+	uint8_t sessionid[NFSX_V4SESSIONID];
+	int error;
+
+	error = nfsv4_getcbsession(clp, sepp);
+	if (error != 0)
+		return (error);
+	sep = *sepp;
+	(void)nfsv4_sequencelookup(NULL, &sep->sess_cbsess, &slotpos, &maxslot,
+	    &slotseq, sessionid);
+	KASSERT(maxslot >= 0, ("nfsv4_setcbsequence neg maxslot"));
+
+	/* Build the Sequence arguments. */
+	NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID + 5 * NFSX_UNSIGNED);
+	bcopy(sessionid, tl, NFSX_V4SESSIONID);
+	tl += NFSX_V4SESSIONID / NFSX_UNSIGNED;
+	nd->nd_slotseq = tl;
+	*tl++ = txdr_unsigned(slotseq);
+	*tl++ = txdr_unsigned(slotpos);
+	*tl++ = txdr_unsigned(maxslot);
+	if (dont_replycache == 0)
+		*tl++ = newnfs_true;
+	else
+		*tl++ = newnfs_false;
+	*tl = 0;			/* No referring call list, for now. */
+	nd->nd_flag |= ND_HASSEQUENCE;
+	return (0);
+}
+
+/*
+ * Get a session for the callback.
+ */
+static int
+nfsv4_getcbsession(struct nfsclient *clp, struct nfsdsession **sepp)
+{
+	struct nfsdsession *sep;
+
+	NFSLOCKSTATE();
+	LIST_FOREACH(sep, &clp->lc_session, sess_list) {
+		if ((sep->sess_crflags & NFSV4CRSESS_CONNBACKCHAN) != 0)
+			break;
+	}
+	if (sep == NULL) {
+		NFSUNLOCKSTATE();
+		return (NFSERR_BADSESSION);
+	}
+	sep->sess_refcnt++;
+	*sepp = sep;
+	NFSUNLOCKSTATE();
+	return (0);
+}
+
diff --git a/sys/fs/nfsserver/nfs_nfsdsubs.c b/sys/fs/nfsserver/nfs_nfsdsubs.c
index 404ad870aed0..de496dbbcf6a 100644
--- a/sys/fs/nfsserver/nfs_nfsdsubs.c
+++ b/sys/fs/nfsserver/nfs_nfsdsubs.c
@@ -46,6 +46,7 @@ extern u_int32_t newnfs_true, newnfs_false;
 extern int nfs_pubfhset;
 extern struct nfsclienthashhead nfsclienthash[NFSCLIENTHASHSIZE];
 extern struct nfslockhashhead nfslockhash[NFSLOCKHASHSIZE];
+extern struct nfssessionhash nfssessionhash[NFSSESSIONHASHSIZE];
 extern int nfsrv_useacl;
 extern uid_t nfsrv_defaultuid;
 extern gid_t nfsrv_defaultgid;
@@ -56,6 +57,8 @@ static nfstype newnfsv2_type[9] = { NFNON, NFREG, NFDIR, NFBLK, NFCHR, NFLNK,
 extern nfstype nfsv34_type[9];
 #endif	/* !APPLEKEXT */
 
+static u_int32_t nfsrv_isannfserr(u_int32_t);
+
 SYSCTL_DECL(_vfs_nfsd);
 
 static int	disable_checkutf8 = 0;
@@ -68,16 +71,16 @@ static char nfsrv_hexdigit(char, int *);
 /*
  * Maps errno values to nfs error numbers.
  * Use NFSERR_IO as the catch all for ones not specifically defined in
- * RFC 1094.
+ * RFC 1094. (It now includes the errors added for NFSv3.)
  */
-static u_char nfsrv_v2errmap[ELAST] = {
+static u_char nfsrv_v2errmap[NFSERR_REMOTE] = {
   NFSERR_PERM,	NFSERR_NOENT,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,
   NFSERR_NXIO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,
   NFSERR_IO,	NFSERR_IO,	NFSERR_ACCES,	NFSERR_IO,	NFSERR_IO,
-  NFSERR_IO,	NFSERR_EXIST,	NFSERR_IO,	NFSERR_NODEV,	NFSERR_NOTDIR,
-  NFSERR_ISDIR,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,
+  NFSERR_IO,	NFSERR_EXIST,	NFSERR_XDEV,	NFSERR_NODEV,	NFSERR_NOTDIR,
+  NFSERR_ISDIR,	NFSERR_INVAL,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,
   NFSERR_IO,	NFSERR_FBIG,	NFSERR_NOSPC,	NFSERR_IO,	NFSERR_ROFS,
-  NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,
+  NFSERR_MLINK,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,
   NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,
   NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,
   NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,
@@ -85,9 +88,7 @@ static u_char nfsrv_v2errmap[ELAST] = {
   NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,
   NFSERR_IO,	NFSERR_IO,	NFSERR_NAMETOL,	NFSERR_IO,	NFSERR_IO,
   NFSERR_NOTEMPTY, NFSERR_IO,	NFSERR_IO,	NFSERR_DQUOT,	NFSERR_STALE,
-  NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,
-  NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,	NFSERR_IO,
-  NFSERR_IO,
+  NFSERR_REMOTE,
 };
 
 /*
@@ -1493,18 +1494,40 @@ nfsd_errmap(struct nfsrv_descript *nd)
 		else if (nd->nd_repstat == NFSERR_MINORVERMISMATCH ||
 			 nd->nd_repstat == NFSERR_OPILLEGAL)
 			return (txdr_unsigned(nd->nd_repstat));
-		else
+		else if ((nd->nd_flag & ND_NFSV41) != 0) {
+			if (nd->nd_repstat == EOPNOTSUPP)
+				nd->nd_repstat = NFSERR_NOTSUPP;
+			nd->nd_repstat = nfsrv_isannfserr(nd->nd_repstat);
+			return (txdr_unsigned(nd->nd_repstat));
+		} else
 		    errp = defaulterrp = nfsrv_v4errmap[nd->nd_procnum];
 		while (*++errp)
 			if (*errp == nd->nd_repstat)
 				return (txdr_unsigned(nd->nd_repstat));
 		return (txdr_unsigned(*defaulterrp));
 	}
-	if (nd->nd_repstat <= ELAST)
+	if (nd->nd_repstat <= NFSERR_REMOTE)
 		return (txdr_unsigned(nfsrv_v2errmap[nd->nd_repstat - 1]));
 	return (txdr_unsigned(NFSERR_IO));
 }
 
+/*
+ * Check to see if the error is a valid NFS one. If not, replace it with
+ * NFSERR_IO.
+ */
+static u_int32_t
+nfsrv_isannfserr(u_int32_t errval)
+{
+
+	if (errval == NFSERR_OK)
+		return (errval);
+	if (errval >= NFSERR_BADHANDLE && errval <= NFSERR_DELEGREVOKED)
+		return (errval);
+	if (errval > 0 && errval <= NFSERR_REMOTE)
+		return (nfsrv_v2errmap[errval - 1]);
+	return (NFSERR_IO);
+}
+
 /*
  * Check to see if setting a uid/gid is permitted when creating a new
  * file object. (Called when uid and/or gid is specified in the
@@ -2005,6 +2028,8 @@ nfsd_init(void)
 		LIST_INIT(&nfsclienthash[i]);
 	for (i = 0; i < NFSLOCKHASHSIZE; i++)
 		LIST_INIT(&nfslockhash[i]);
+	for (i = 0; i < NFSSESSIONHASHSIZE; i++)
+		LIST_INIT(&nfssessionhash[i].list);
 
 	/* and the v2 pubfh should be all zeros */
 	NFSBZERO(nfs_v2pubfh, NFSX_V2FH);
@@ -2032,3 +2057,42 @@ nfsd_checkrootexp(struct nfsrv_descript *nd)
 	return (1);
 }
 
+/*
+ * Parse the first part of an NFSv4 compound to find out what the minor
+ * version# is.
+ */
+void
+nfsd_getminorvers(struct nfsrv_descript *nd, u_char *tag, u_char **tagstrp,
+    int *taglenp, u_int32_t *minversp)
+{
+	uint32_t *tl;
+	int error = 0, taglen = -1;
+	u_char *tagstr = NULL;
+
+	NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
+	taglen = fxdr_unsigned(int, *tl);
+	if (taglen < 0 || taglen > NFSV4_OPAQUELIMIT) {
+		error = EBADRPC;
+		goto nfsmout;
+	}
+	if (taglen <= NFSV4_SMALLSTR)
+		tagstr = tag;
+	else
+		tagstr = malloc(taglen + 1, M_TEMP, M_WAITOK);
+	error = nfsrv_mtostr(nd, tagstr, taglen);
+	if (error != 0)
+		goto nfsmout;
+	NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
+	*minversp = fxdr_unsigned(u_int32_t, *tl);
+	*tagstrp = tagstr;
+	if (*minversp == NFSV41_MINORVERSION)
+		nd->nd_flag |= ND_NFSV41;
+nfsmout:
+	if (error != 0) {
+		if (tagstr != NULL && taglen > NFSV4_SMALLSTR)
+			free(tagstr, M_TEMP);
+		taglen = -1;
+	}
+	*taglenp = taglen;
+}
+
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index cf3762eda39d..4762a3c8679e 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -361,9 +361,11 @@ null_lookup(struct vop_lookup_args *ap)
 	struct vnode *dvp = ap->a_dvp;
 	int flags = cnp->cn_flags;
 	struct vnode *vp, *ldvp, *lvp;
+	struct mount *mp;
 	int error;
 
-	if ((flags & ISLASTCN) && (dvp->v_mount->mnt_flag & MNT_RDONLY) &&
+	mp = dvp->v_mount;
+	if ((flags & ISLASTCN) != 0 && (mp->mnt_flag & MNT_RDONLY) != 0 &&
 	    (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME))
 		return (EROFS);
 	/*
@@ -372,9 +374,47 @@ null_lookup(struct vop_lookup_args *ap)
 	 */
 	ldvp = NULLVPTOLOWERVP(dvp);
 	vp = lvp = NULL;
+	KASSERT((ldvp->v_vflag & VV_ROOT) == 0 ||
+	    ((dvp->v_vflag & VV_ROOT) != 0 && (flags & ISDOTDOT) == 0),
+	    ("ldvp %p fl %#x dvp %p fl %#x flags %#x", ldvp, ldvp->v_vflag,
+	     dvp, dvp->v_vflag, flags));
+
+	/*
+	 * Hold ldvp.  The reference on it, owned by dvp, is lost in
+	 * case of dvp reclamation, and we need ldvp to move our lock
+	 * from ldvp to dvp.
+	 */
+	vhold(ldvp);
+
 	error = VOP_LOOKUP(ldvp, &lvp, cnp);
-	if (error == EJUSTRETURN && (flags & ISLASTCN) &&
-	    (dvp->v_mount->mnt_flag & MNT_RDONLY) &&
+
+	/*
+	 * VOP_LOOKUP() on lower vnode may unlock ldvp, which allows
+	 * dvp to be reclaimed due to shared v_vnlock.  Check for the
+	 * doomed state and return error.
+	 */
+	if ((error == 0 || error == EJUSTRETURN) &&
+	    (dvp->v_iflag & VI_DOOMED) != 0) {
+		error = ENOENT;
+		if (lvp != NULL)
+			vput(lvp);
+
+		/*
+		 * If vgone() did reclaimed dvp before curthread
+		 * relocked ldvp, the locks of dvp and ldpv are no
+		 * longer shared.  In this case, relock of ldvp in
+		 * lower fs VOP_LOOKUP() does not restore the locking
+		 * state of dvp.  Compensate for this by unlocking
+		 * ldvp and locking dvp, which is also correct if the
+		 * locks are still shared.
+		 */
+		VOP_UNLOCK(ldvp, 0);
+		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
+	}
+	vdrop(ldvp);
+
+	if (error == EJUSTRETURN && (flags & ISLASTCN) != 0 &&
+	    (mp->mnt_flag & MNT_RDONLY) != 0 &&
 	    (cnp->cn_nameiop == CREATE || cnp->cn_nameiop == RENAME))
 		error = EROFS;
 
@@ -384,7 +424,7 @@ null_lookup(struct vop_lookup_args *ap)
 			VREF(dvp);
 			vrele(lvp);
 		} else {
-			error = null_nodeget(dvp->v_mount, lvp, &vp);
+			error = null_nodeget(mp, lvp, &vp);
 			if (error == 0)
 				*ap->a_vpp = vp;
 		}
@@ -738,7 +778,7 @@ null_reclaim(struct vop_reclaim_args *ap)
 	lowervp = xp->null_lowervp;
 
 	KASSERT(lowervp != NULL && vp->v_vnlock != &vp->v_lock,
-	    ("Reclaiming inclomplete null vnode %p", vp));
+	    ("Reclaiming incomplete null vnode %p", vp));
 
 	null_hashrem(xp);
 	/*
@@ -858,15 +898,6 @@ null_vptocnp(struct vop_vptocnp_args *ap)
 	return (error);
 }
 
-static int
-null_link(struct vop_link_args *ap)
-{
-
-	if (ap->a_tdvp->v_mount != ap->a_vp->v_mount)
-		return (EXDEV);
-	return (null_bypass((struct vop_generic_args *)ap));
-}
-
 /*
  * Global vfs data structures
  */
@@ -880,7 +911,6 @@ struct vop_vector null_vnodeops = {
 	.vop_getwritemount =	null_getwritemount,
 	.vop_inactive =		null_inactive,
 	.vop_islocked =		vop_stdislocked,
-	.vop_link =		null_link,
 	.vop_lock1 =		null_lock,
 	.vop_lookup =		null_lookup,
 	.vop_open =		null_open,
diff --git a/sys/fs/tmpfs/tmpfs.h b/sys/fs/tmpfs/tmpfs.h
index 196749ba1015..445bf61505a8 100644
--- a/sys/fs/tmpfs/tmpfs.h
+++ b/sys/fs/tmpfs/tmpfs.h
@@ -35,9 +35,6 @@
 #ifndef _FS_TMPFS_TMPFS_H_
 #define _FS_TMPFS_TMPFS_H_
 
-/* ---------------------------------------------------------------------
- * KERNEL-SPECIFIC DEFINITIONS
- * --------------------------------------------------------------------- */
 #include <sys/dirent.h>
 #include <sys/mount.h>
 #include <sys/queue.h>
@@ -46,7 +43,6 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 
-/* --------------------------------------------------------------------- */
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/tree.h>
@@ -56,8 +52,6 @@
 MALLOC_DECLARE(M_TMPFSMNT);
 MALLOC_DECLARE(M_TMPFSNAME);
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Internal representation of a tmpfs directory entry.
  */
@@ -137,8 +131,6 @@ RB_HEAD(tmpfs_dir, tmpfs_dirent);
 #define	TMPFS_DIRCOOKIE_DUP_MAX		\
 	(TMPFS_DIRCOOKIE_DUP | TMPFS_DIRCOOKIE_MASK)
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Internal representation of a tmpfs file system node.
  *
@@ -284,6 +276,8 @@ LIST_HEAD(tmpfs_node_list, tmpfs_node);
 #define TMPFS_NODE_LOCK(node) mtx_lock(&(node)->tn_interlock)
 #define TMPFS_NODE_UNLOCK(node) mtx_unlock(&(node)->tn_interlock)
 #define TMPFS_NODE_MTX(node) (&(node)->tn_interlock)
+#define	TMPFS_NODE_ASSERT_LOCKED(node) mtx_assert(TMPFS_NODE_MTX(node), \
+    MA_OWNED)
 
 #ifdef INVARIANTS
 #define TMPFS_ASSERT_LOCKED(node) do {					\
@@ -308,7 +302,6 @@ LIST_HEAD(tmpfs_node_list, tmpfs_node);
 #define TMPFS_VNODE_WANT	2
 #define TMPFS_VNODE_DOOMED	4
 #define	TMPFS_VNODE_WRECLAIM	8
-/* --------------------------------------------------------------------- */
 
 /*
  * Internal representation of a tmpfs mount point.
@@ -375,8 +368,6 @@ struct tmpfs_mount {
 #define TMPFS_LOCK(tm) mtx_lock(&(tm)->allnode_lock)
 #define TMPFS_UNLOCK(tm) mtx_unlock(&(tm)->allnode_lock)
 
-/* --------------------------------------------------------------------- */
-
 /*
  * This structure maps a file identifier to a tmpfs node.  Used by the
  * NFS code.
@@ -388,14 +379,12 @@ struct tmpfs_fid {
 	unsigned long		tf_gen;
 };
 
-/* --------------------------------------------------------------------- */
-
 #ifdef _KERNEL
 /*
  * Prototypes for tmpfs_subr.c.
  */
 
-int	tmpfs_alloc_node(struct tmpfs_mount *, enum vtype,
+int	tmpfs_alloc_node(struct mount *mp, struct tmpfs_mount *, enum vtype,
 	    uid_t uid, gid_t gid, mode_t mode, struct tmpfs_node *,
 	    char *, dev_t, struct tmpfs_node **);
 void	tmpfs_free_node(struct tmpfs_mount *, struct tmpfs_node *);
@@ -425,24 +414,20 @@ int	tmpfs_chmod(struct vnode *, mode_t, struct ucred *, struct thread *);
 int	tmpfs_chown(struct vnode *, uid_t, gid_t, struct ucred *,
 	    struct thread *);
 int	tmpfs_chsize(struct vnode *, u_quad_t, struct ucred *, struct thread *);
-int	tmpfs_chtimes(struct vnode *, struct timespec *, struct timespec *,
-	    struct timespec *, int, struct ucred *, struct thread *);
+int	tmpfs_chtimes(struct vnode *, struct vattr *, struct ucred *cred,
+	    struct thread *);
 void	tmpfs_itimes(struct vnode *, const struct timespec *,
 	    const struct timespec *);
 
 void	tmpfs_update(struct vnode *);
 int	tmpfs_truncate(struct vnode *, off_t);
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Convenience macros to simplify some logical expressions.
  */
 #define IMPLIES(a, b) (!(a) || (b))
 #define IFF(a, b) (IMPLIES(a, b) && IMPLIES(b, a))
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Checks that the directory entry pointed by 'de' matches the name 'name'
  * with a length of 'len'.
@@ -451,8 +436,6 @@ int	tmpfs_truncate(struct vnode *, off_t);
     (de->td_namelen == len && \
     bcmp((de)->ud.td_name, (name), (de)->td_namelen) == 0)
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Ensures that the node pointed by 'node' is a directory and that its
  * contents are consistent with respect to directories.
@@ -462,8 +445,6 @@ int	tmpfs_truncate(struct vnode *, off_t);
 	MPASS((node)->tn_size % sizeof(struct tmpfs_dirent) == 0); \
 } while (0)
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Memory management stuff.
  */
@@ -480,8 +461,6 @@ size_t tmpfs_pages_used(struct tmpfs_mount *tmp);
 
 #endif
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Macros/functions to convert from generic data structures to tmpfs
  * specific ones.
diff --git a/sys/fs/tmpfs/tmpfs_fifoops.c b/sys/fs/tmpfs/tmpfs_fifoops.c
index 347732b9321f..89ebe85aed22 100644
--- a/sys/fs/tmpfs/tmpfs_fifoops.c
+++ b/sys/fs/tmpfs/tmpfs_fifoops.c
@@ -48,8 +48,6 @@
 #include <fs/tmpfs/tmpfs_fifoops.h>
 #include <fs/tmpfs/tmpfs_vnops.h>
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_fifo_kqfilter(struct vop_kqfilter_args *ap)
 {
@@ -71,8 +69,6 @@ tmpfs_fifo_kqfilter(struct vop_kqfilter_args *ap)
 	return fifo_specops.vop_kqfilter(ap);
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_fifo_close(struct vop_close_args *v)
 {
diff --git a/sys/fs/tmpfs/tmpfs_fifoops.h b/sys/fs/tmpfs/tmpfs_fifoops.h
index 7ac061a0ea15..96c011d76187 100644
--- a/sys/fs/tmpfs/tmpfs_fifoops.h
+++ b/sys/fs/tmpfs/tmpfs_fifoops.h
@@ -41,13 +41,10 @@
 
 #include <fs/tmpfs/tmpfs_vnops.h>
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Declarations for tmpfs_fifoops.c.
  */
 
 extern struct vop_vector tmpfs_fifoop_entries;
 
-/* --------------------------------------------------------------------- */
 #endif /* _FS_TMPFS_TMPFS_FIFOOPS_H_ */
diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c
index b32ec7b195fa..d0d9a1583958 100644
--- a/sys/fs/tmpfs/tmpfs_subr.c
+++ b/sys/fs/tmpfs/tmpfs_subr.c
@@ -136,8 +136,6 @@ tmpfs_pages_check_avail(struct tmpfs_mount *tmp, size_t req_pages)
 	return (1);
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Allocates a new node of type 'type' inside the 'tmp' mount point, with
  * its owner set to 'uid', its group to 'gid' and its mode set to 'mode',
@@ -161,7 +159,7 @@ tmpfs_pages_check_avail(struct tmpfs_mount *tmp, size_t req_pages)
  * Returns zero on success or an appropriate error code on failure.
  */
 int
-tmpfs_alloc_node(struct tmpfs_mount *tmp, enum vtype type,
+tmpfs_alloc_node(struct mount *mp, struct tmpfs_mount *tmp, enum vtype type,
     uid_t uid, gid_t gid, mode_t mode, struct tmpfs_node *parent,
     char *target, dev_t rdev, struct tmpfs_node **node)
 {
@@ -171,6 +169,8 @@ tmpfs_alloc_node(struct tmpfs_mount *tmp, enum vtype type,
 	/* If the root directory of the 'tmp' file system is not yet
 	 * allocated, this must be the request to do it. */
 	MPASS(IMPLIES(tmp->tm_root == NULL, parent == NULL && type == VDIR));
+	KASSERT(tmp->tm_root == NULL || mp->mnt_writeopcount > 0,
+	    ("creating node not under vn_start_write"));
 
 	MPASS(IFF(type == VLNK, target != NULL));
 	MPASS(IFF(type == VBLK || type == VCHR, rdev != VNOVAL));
@@ -180,6 +180,24 @@ tmpfs_alloc_node(struct tmpfs_mount *tmp, enum vtype type,
 	if (tmpfs_pages_check_avail(tmp, 1) == 0)
 		return (ENOSPC);
 
+	if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0) {
+		/*
+		 * When a new tmpfs node is created for fully
+		 * constructed mount point, there must be a parent
+		 * node, which vnode is locked exclusively.  As
+		 * consequence, if the unmount is executing in
+		 * parallel, vflush() cannot reclaim the parent vnode.
+		 * Due to this, the check for MNTK_UNMOUNT flag is not
+		 * racy: if we did not see MNTK_UNMOUNT flag, then tmp
+		 * cannot be destroyed until node construction is
+		 * finished and the parent vnode unlocked.
+		 *
+		 * Tmpfs does not need to instantiate new nodes during
+		 * unmount.
+		 */
+		return (EBUSY);
+	}
+
 	nnode = (struct tmpfs_node *)uma_zalloc_arg(
 				tmp->tm_node_pool, tmp, M_WAITOK);
 
@@ -233,7 +251,7 @@ tmpfs_alloc_node(struct tmpfs_mount *tmp, enum vtype type,
 			NULL /* XXXKIB - tmpfs needs swap reservation */);
 		VM_OBJECT_WLOCK(obj);
 		/* OBJ_TMPFS is set together with the setting of vp->v_object */
-		vm_object_set_flag(obj, OBJ_NOSPLIT);
+		vm_object_set_flag(obj, OBJ_NOSPLIT | OBJ_TMPFS_NODE);
 		vm_object_clear_flag(obj, OBJ_ONEMAPPING);
 		VM_OBJECT_WUNLOCK(obj);
 		break;
@@ -251,8 +269,6 @@ tmpfs_alloc_node(struct tmpfs_mount *tmp, enum vtype type,
 	return 0;
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Destroys the node pointed to by node from the file system 'tmp'.
  * If the node does not belong to the given mount point, the results are
@@ -328,8 +344,6 @@ tmpfs_free_node(struct tmpfs_mount *tmp, struct tmpfs_node *node)
 	uma_zfree(tmp->tm_node_pool, node);
 }
 
-/* --------------------------------------------------------------------- */
-
 static __inline uint32_t
 tmpfs_dirent_hash(const char *name, u_int len)
 {
@@ -406,8 +420,6 @@ tmpfs_alloc_dirent(struct tmpfs_mount *tmp, struct tmpfs_node *node,
 	return 0;
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Frees a directory entry.  It is the caller's responsibility to destroy
  * the node referenced by it if needed.
@@ -432,12 +444,11 @@ tmpfs_free_dirent(struct tmpfs_mount *tmp, struct tmpfs_dirent *de)
 	uma_zfree(tmp->tm_dirent_pool, de);
 }
 
-/* --------------------------------------------------------------------- */
-
 void
 tmpfs_destroy_vobject(struct vnode *vp, vm_object_t obj)
 {
 
+	ASSERT_VOP_ELOCKED(vp, "tmpfs_destroy_vobject");
 	if (vp->v_type != VREG || obj == NULL)
 		return;
 
@@ -557,6 +568,7 @@ tmpfs_alloc_vp(struct mount *mp, struct tmpfs_node *node, int lkflag,
 		goto unlock;
 	MPASS(vp != NULL);
 
+	/* lkflag is ignored, the lock is exclusive */
 	(void) vn_lock(vp, lkflag | LK_RETRY);
 
 	vp->v_data = node;
@@ -631,8 +643,6 @@ tmpfs_alloc_vp(struct mount *mp, struct tmpfs_node *node, int lkflag,
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Destroys the association between the vnode vp and the node it
  * references.
@@ -644,7 +654,7 @@ tmpfs_free_vp(struct vnode *vp)
 
 	node = VP_TO_TMPFS_NODE(vp);
 
-	mtx_assert(TMPFS_NODE_MTX(node), MA_OWNED);
+	TMPFS_NODE_ASSERT_LOCKED(node);
 	node->tn_vnode = NULL;
 	if ((node->tn_vpstate & TMPFS_VNODE_WRECLAIM) != 0)
 		wakeup(&node->tn_vnode);
@@ -652,8 +662,6 @@ tmpfs_free_vp(struct vnode *vp)
 	vp->v_data = NULL;
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Allocates a new file of type 'type' and adds it to the parent directory
  * 'dvp'; this addition is done using the component name given in 'cnp'.
@@ -690,8 +698,7 @@ tmpfs_alloc_file(struct vnode *dvp, struct vnode **vpp, struct vattr *vap,
 		 * imposed by the system. */
 		MPASS(dnode->tn_links <= LINK_MAX);
 		if (dnode->tn_links == LINK_MAX) {
-			error = EMLINK;
-			goto out;
+			return (EMLINK);
 		}
 
 		parent = dnode;
@@ -700,17 +707,18 @@ tmpfs_alloc_file(struct vnode *dvp, struct vnode **vpp, struct vattr *vap,
 		parent = NULL;
 
 	/* Allocate a node that represents the new file. */
-	error = tmpfs_alloc_node(tmp, vap->va_type, cnp->cn_cred->cr_uid,
+	error = tmpfs_alloc_node(dvp->v_mount, tmp, vap->va_type,
+	    cnp->cn_cred->cr_uid,
 	    dnode->tn_gid, vap->va_mode, parent, target, vap->va_rdev, &node);
 	if (error != 0)
-		goto out;
+		return (error);
 
 	/* Allocate a directory entry that points to the new file. */
 	error = tmpfs_alloc_dirent(tmp, node, cnp->cn_nameptr, cnp->cn_namelen,
 	    &de);
 	if (error != 0) {
 		tmpfs_free_node(tmp, node);
-		goto out;
+		return (error);
 	}
 
 	/* Allocate a vnode for the new file. */
@@ -718,7 +726,7 @@ tmpfs_alloc_file(struct vnode *dvp, struct vnode **vpp, struct vattr *vap,
 	if (error != 0) {
 		tmpfs_free_dirent(tmp, de);
 		tmpfs_free_node(tmp, node);
-		goto out;
+		return (error);
 	}
 
 	/* Now that all required items are allocated, we can proceed to
@@ -727,14 +735,9 @@ tmpfs_alloc_file(struct vnode *dvp, struct vnode **vpp, struct vattr *vap,
 	if (cnp->cn_flags & ISWHITEOUT)
 		tmpfs_dir_whiteout_remove(dvp, cnp);
 	tmpfs_dir_attach(dvp, de);
-
-out:
-
-	return error;
+	return (0);
 }
 
-/* --------------------------------------------------------------------- */
-
 static struct tmpfs_dirent *
 tmpfs_dir_first(struct tmpfs_node *dnode, struct tmpfs_dir_cursor *dc)
 {
@@ -990,8 +993,6 @@ tmpfs_dir_attach(struct vnode *vp, struct tmpfs_dirent *de)
 	    TMPFS_NODE_MODIFIED;
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Detaches the directory entry de from the directory represented by vp.
  * Note that this does not change the link count of the node pointed by
@@ -1057,8 +1058,6 @@ tmpfs_dir_destroy(struct tmpfs_mount *tmp, struct tmpfs_node *dnode)
 	}
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Helper function for tmpfs_readdir.  Creates a '.' entry for the given
  * directory and returns it in the uio space.  The function returns 0
@@ -1092,8 +1091,6 @@ tmpfs_dir_getdotdent(struct tmpfs_node *node, struct uio *uio)
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Helper function for tmpfs_readdir.  Creates a '..' entry for the given
  * directory and returns it in the uio space.  The function returns 0
@@ -1139,8 +1136,6 @@ tmpfs_dir_getdotdotdent(struct tmpfs_node *node, struct uio *uio)
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Helper function for tmpfs_readdir.  Returns as much directory entries
  * as can fit in the uio space.  The read starts at uio->uio_offset.
@@ -1310,8 +1305,6 @@ tmpfs_dir_whiteout_remove(struct vnode *dvp, struct componentname *cnp)
 	tmpfs_free_dirent(VFS_TO_TMPFS(dvp->v_mount), de);
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Resizes the aobj associated with the regular file pointed to by 'vp' to the
  * size 'newsize'.  'vp' must point to a vnode that represents a regular file.
@@ -1422,8 +1415,6 @@ tmpfs_reg_resize(struct vnode *vp, off_t newsize, boolean_t ignerr)
 	return (0);
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Change flags of the given vnode.
  * Caller should execute tmpfs_update on vp after a successful execution.
@@ -1481,8 +1472,6 @@ tmpfs_chflags(struct vnode *vp, u_long flags, struct ucred *cred,
 	return 0;
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Change access mode on the given vnode.
  * Caller should execute tmpfs_update on vp after a successful execution.
@@ -1539,8 +1528,6 @@ tmpfs_chmod(struct vnode *vp, mode_t mode, struct ucred *cred, struct thread *p)
 	return 0;
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Change ownership of the given vnode.  At least one of uid or gid must
  * be different than VNOVAL.  If one is set to that value, the attribute
@@ -1612,8 +1599,6 @@ tmpfs_chown(struct vnode *vp, uid_t uid, gid_t gid, struct ucred *cred,
 	return 0;
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Change size of the given vnode.
  * Caller should execute tmpfs_update on vp after a successful execution.
@@ -1669,16 +1654,14 @@ tmpfs_chsize(struct vnode *vp, u_quad_t size, struct ucred *cred,
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Change access and modification times of the given vnode.
  * Caller should execute tmpfs_update on vp after a successful execution.
  * The vnode must be locked on entry and remain locked on exit.
  */
 int
-tmpfs_chtimes(struct vnode *vp, struct timespec *atime, struct timespec *mtime,
-	struct timespec *birthtime, int vaflags, struct ucred *cred, struct thread *l)
+tmpfs_chtimes(struct vnode *vp, struct vattr *vap,
+    struct ucred *cred, struct thread *l)
 {
 	int error;
 	struct tmpfs_node *node;
@@ -1695,35 +1678,30 @@ tmpfs_chtimes(struct vnode *vp, struct timespec *atime, struct timespec *mtime,
 	if (node->tn_flags & (IMMUTABLE | APPEND))
 		return EPERM;
 
-	/* Determine if the user have proper privilege to update time. */
-	if (vaflags & VA_UTIMES_NULL) {
-		error = VOP_ACCESS(vp, VADMIN, cred, l);
-		if (error)
-			error = VOP_ACCESS(vp, VWRITE, cred, l);
-	} else
-		error = VOP_ACCESS(vp, VADMIN, cred, l);
-	if (error)
+	error = vn_utimes_perm(vp, vap, cred, l);
+	if (error != 0)
 		return (error);
 
-	if (atime->tv_sec != VNOVAL && atime->tv_nsec != VNOVAL)
+	if (vap->va_atime.tv_sec != VNOVAL && vap->va_atime.tv_nsec != VNOVAL)
 		node->tn_status |= TMPFS_NODE_ACCESSED;
 
-	if (mtime->tv_sec != VNOVAL && mtime->tv_nsec != VNOVAL)
+	if (vap->va_mtime.tv_sec != VNOVAL && vap->va_mtime.tv_nsec != VNOVAL)
 		node->tn_status |= TMPFS_NODE_MODIFIED;
 
-	if (birthtime->tv_nsec != VNOVAL && birthtime->tv_nsec != VNOVAL)
+	if (vap->va_birthtime.tv_nsec != VNOVAL &&
+	    vap->va_birthtime.tv_nsec != VNOVAL)
 		node->tn_status |= TMPFS_NODE_MODIFIED;
 
-	tmpfs_itimes(vp, atime, mtime);
+	tmpfs_itimes(vp, &vap->va_atime, &vap->va_mtime);
 
-	if (birthtime->tv_nsec != VNOVAL && birthtime->tv_nsec != VNOVAL)
-		node->tn_birthtime = *birthtime;
+	if (vap->va_birthtime.tv_nsec != VNOVAL &&
+	    vap->va_birthtime.tv_nsec != VNOVAL)
+		node->tn_birthtime = vap->va_birthtime;
 	MPASS(VOP_ISLOCKED(vp));
 
 	return 0;
 }
 
-/* --------------------------------------------------------------------- */
 /* Sync timestamps */
 void
 tmpfs_itimes(struct vnode *vp, const struct timespec *acc,
@@ -1756,8 +1734,6 @@ tmpfs_itimes(struct vnode *vp, const struct timespec *acc,
 	    ~(TMPFS_NODE_ACCESSED | TMPFS_NODE_MODIFIED | TMPFS_NODE_CHANGED);
 }
 
-/* --------------------------------------------------------------------- */
-
 void
 tmpfs_update(struct vnode *vp)
 {
@@ -1765,8 +1741,6 @@ tmpfs_update(struct vnode *vp)
 	tmpfs_itimes(vp, NULL, NULL);
 }
 
-/* --------------------------------------------------------------------- */
-
 int
 tmpfs_truncate(struct vnode *vp, off_t length)
 {
diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c
index d5967ae4d323..cb4a32b9044e 100644
--- a/sys/fs/tmpfs/tmpfs_vfsops.c
+++ b/sys/fs/tmpfs/tmpfs_vfsops.c
@@ -68,8 +68,6 @@ __FBSDID("$FreeBSD$");
 MALLOC_DEFINE(M_TMPFSMNT, "tmpfs mount", "tmpfs mount structures");
 MALLOC_DEFINE(M_TMPFSNAME, "tmpfs name", "tmpfs file names");
 
-/* --------------------------------------------------------------------- */
-
 static int	tmpfs_mount(struct mount *);
 static int	tmpfs_unmount(struct mount *, int);
 static int	tmpfs_root(struct mount *, int flags, struct vnode **);
@@ -77,8 +75,6 @@ static int	tmpfs_fhtovp(struct mount *, struct fid *, int,
 		    struct vnode **);
 static int	tmpfs_statfs(struct mount *, struct statfs *);
 
-/* --------------------------------------------------------------------- */
-
 static const char *tmpfs_opts[] = {
 	"from", "size", "maxfilesize", "inodes", "uid", "gid", "mode", "export",
 	"union", NULL
@@ -88,8 +84,6 @@ static const char *tmpfs_updateopts[] = {
 	"from", "export", NULL
 };
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_node_ctor(void *mem, int size, void *arg, int flags)
 {
@@ -244,7 +238,7 @@ tmpfs_mount(struct mount *mp)
 	tmp->tm_ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
 
 	/* Allocate the root node. */
-	error = tmpfs_alloc_node(tmp, VDIR, root_uid,
+	error = tmpfs_alloc_node(mp, tmp, VDIR, root_uid,
 	    root_gid, root_mode & ALLPERMS, NULL, NULL,
 	    VNOVAL, &root);
 
@@ -271,44 +265,53 @@ tmpfs_mount(struct mount *mp)
 	return 0;
 }
 
-/* --------------------------------------------------------------------- */
-
 /* ARGSUSED2 */
 static int
 tmpfs_unmount(struct mount *mp, int mntflags)
 {
-	int error;
-	int flags = 0;
 	struct tmpfs_mount *tmp;
 	struct tmpfs_node *node;
+	int error, flags;
 
-	/* Handle forced unmounts. */
-	if (mntflags & MNT_FORCE)
-		flags |= FORCECLOSE;
-
-	/* Finalize all pending I/O. */
-	error = vflush(mp, 0, flags, curthread);
-	if (error != 0)
-		return error;
-
+	flags = (mntflags & MNT_FORCE) != 0 ? FORCECLOSE : 0;
 	tmp = VFS_TO_TMPFS(mp);
 
-	/* Free all associated data.  The loop iterates over the linked list
-	 * we have containing all used nodes.  For each of them that is
-	 * a directory, we free all its directory entries.  Note that after
-	 * freeing a node, it will automatically go to the available list,
-	 * so we will later have to iterate over it to release its items. */
-	node = LIST_FIRST(&tmp->tm_nodes_used);
-	while (node != NULL) {
-		struct tmpfs_node *next;
+	/* Stop writers */
+	error = vfs_write_suspend_umnt(mp);
+	if (error != 0)
+		return (error);
+	/*
+	 * At this point, nodes cannot be destroyed by any other
+	 * thread because write suspension is started.
+	 */
 
+	for (;;) {
+		error = vflush(mp, 0, flags, curthread);
+		if (error != 0) {
+			vfs_write_resume(mp, VR_START_WRITE);
+			return (error);
+		}
+		MNT_ILOCK(mp);
+		if (mp->mnt_nvnodelistsize == 0) {
+			MNT_IUNLOCK(mp);
+			break;
+		}
+		MNT_IUNLOCK(mp);
+		if ((mntflags & MNT_FORCE) == 0) {
+			vfs_write_resume(mp, VR_START_WRITE);
+			return (EBUSY);
+		}
+	}
+
+	TMPFS_LOCK(tmp);
+	while ((node = LIST_FIRST(&tmp->tm_nodes_used)) != NULL) {
+		TMPFS_UNLOCK(tmp);
 		if (node->tn_type == VDIR)
 			tmpfs_dir_destroy(tmp, node);
-
-		next = LIST_NEXT(node, tn_entries);
 		tmpfs_free_node(tmp, node);
-		node = next;
+		TMPFS_LOCK(tmp);
 	}
+	TMPFS_UNLOCK(tmp);
 
 	uma_zdestroy(tmp->tm_dirent_pool);
 	uma_zdestroy(tmp->tm_node_pool);
@@ -321,14 +324,14 @@ tmpfs_unmount(struct mount *mp, int mntflags)
 	/* Throw away the tmpfs_mount structure. */
 	free(mp->mnt_data, M_TMPFSMNT);
 	mp->mnt_data = NULL;
+	vfs_write_resume(mp, VR_START_WRITE);
 
 	MNT_ILOCK(mp);
 	mp->mnt_flag &= ~MNT_LOCAL;
 	MNT_IUNLOCK(mp);
-	return 0;
-}
 
-/* --------------------------------------------------------------------- */
+	return (0);
+}
 
 static int
 tmpfs_root(struct mount *mp, int flags, struct vnode **vpp)
@@ -342,8 +345,6 @@ tmpfs_root(struct mount *mp, int flags, struct vnode **vpp)
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_fhtovp(struct mount *mp, struct fid *fhp, int flags,
     struct vnode **vpp)
@@ -380,8 +381,6 @@ tmpfs_fhtovp(struct mount *mp, struct fid *fhp, int flags,
 	return (EINVAL);
 }
 
-/* --------------------------------------------------------------------- */
-
 /* ARGSUSED2 */
 static int
 tmpfs_statfs(struct mount *mp, struct statfs *sbp)
@@ -415,7 +414,17 @@ tmpfs_statfs(struct mount *mp, struct statfs *sbp)
 	return 0;
 }
 
-/* --------------------------------------------------------------------- */
+static int
+tmpfs_sync(struct mount *mp, int waitfor)
+{
+
+	if (waitfor == MNT_SUSPEND) {
+		MNT_ILOCK(mp);
+		mp->mnt_kern_flag |= MNTK_SUSPEND2 | MNTK_SUSPENDED;
+		MNT_IUNLOCK(mp);
+	}
+	return (0);
+}
 
 /*
  * tmpfs vfs operations.
@@ -427,5 +436,6 @@ struct vfsops tmpfs_vfsops = {
 	.vfs_root =			tmpfs_root,
 	.vfs_statfs =			tmpfs_statfs,
 	.vfs_fhtovp =			tmpfs_fhtovp,
+	.vfs_sync =			tmpfs_sync,
 };
 VFS_SET(tmpfs_vfsops, tmpfs, VFCF_JAIL);
diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c
index 7f74f2058706..5ffab5013e5a 100644
--- a/sys/fs/tmpfs/tmpfs_vnops.c
+++ b/sys/fs/tmpfs/tmpfs_vnops.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/rwlock.h>
 #include <sys/sched.h>
-#include <sys/sf_buf.h>
 #include <sys/stat.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
@@ -68,7 +67,13 @@ SYSCTL_INT(_vfs_tmpfs, OID_AUTO, rename_restarts, CTLFLAG_RD,
     __DEVOLATILE(int *, &tmpfs_rename_restarts), 0,
     "Times rename had to restart due to lock contention");
 
-/* --------------------------------------------------------------------- */
+static int
+tmpfs_vn_get_ino_alloc(struct mount *mp, void *arg, int lkflags,
+    struct vnode **rvp)
+{
+
+	return (tmpfs_alloc_vp(mp, arg, lkflags, rvp));
+}
 
 static int
 tmpfs_lookup(struct vop_cachedlookup_args *v)
@@ -76,10 +81,9 @@ tmpfs_lookup(struct vop_cachedlookup_args *v)
 	struct vnode *dvp = v->a_dvp;
 	struct vnode **vpp = v->a_vpp;
 	struct componentname *cnp = v->a_cnp;
-
-	int error;
 	struct tmpfs_dirent *de;
 	struct tmpfs_node *dnode;
+	int error;
 
 	dnode = VP_TO_TMPFS_DIR(dvp);
 	*vpp = NULLVP;
@@ -100,17 +104,10 @@ tmpfs_lookup(struct vop_cachedlookup_args *v)
 		goto out;
 	}
 	if (cnp->cn_flags & ISDOTDOT) {
-		int ltype = 0;
-
-		ltype = VOP_ISLOCKED(dvp);
-		vhold(dvp);
-		VOP_UNLOCK(dvp, 0);
-		/* Allocate a new vnode on the matching entry. */
-		error = tmpfs_alloc_vp(dvp->v_mount, dnode->tn_dir.tn_parent,
-		    cnp->cn_lkflags, vpp);
-
-		vn_lock(dvp, ltype | LK_RETRY);
-		vdrop(dvp);
+		error = vn_vget_ino_gen(dvp, tmpfs_vn_get_ino_alloc,
+		    dnode->tn_dir.tn_parent, cnp->cn_lkflags, vpp);
+		if (error != 0)
+			goto out;
 	} else if (cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.') {
 		VREF(dvp);
 		*vpp = dvp;
@@ -173,7 +170,7 @@ tmpfs_lookup(struct vop_cachedlookup_args *v)
 
 				/* Allocate a new vnode on the matching entry. */
 				error = tmpfs_alloc_vp(dvp->v_mount, tnode,
-						cnp->cn_lkflags, vpp);
+				    cnp->cn_lkflags, vpp);
 				if (error != 0)
 					goto out;
 
@@ -188,7 +185,9 @@ tmpfs_lookup(struct vop_cachedlookup_args *v)
 				cnp->cn_flags |= SAVENAME;
 			} else {
 				error = tmpfs_alloc_vp(dvp->v_mount, tnode,
-						cnp->cn_lkflags, vpp);
+				    cnp->cn_lkflags, vpp);
+				if (error != 0)
+					goto out;
 			}
 		}
 	}
@@ -207,8 +206,6 @@ tmpfs_lookup(struct vop_cachedlookup_args *v)
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_create(struct vop_create_args *v)
 {
@@ -221,7 +218,6 @@ tmpfs_create(struct vop_create_args *v)
 
 	return tmpfs_alloc_file(dvp, vpp, vap, cnp, NULL);
 }
-/* --------------------------------------------------------------------- */
 
 static int
 tmpfs_mknod(struct vop_mknod_args *v)
@@ -238,8 +234,6 @@ tmpfs_mknod(struct vop_mknod_args *v)
 	return tmpfs_alloc_file(dvp, vpp, vap, cnp, NULL);
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_open(struct vop_open_args *v)
 {
@@ -265,6 +259,8 @@ tmpfs_open(struct vop_open_args *v)
 	else {
 		error = 0;
 		/* For regular files, the call below is nop. */
+		KASSERT(vp->v_type != VREG || (node->tn_reg.tn_aobj->flags &
+		    OBJ_DEAD) == 0, ("dead object"));
 		vnode_create_vobject(vp, node->tn_size, v->a_td);
 	}
 
@@ -272,8 +268,6 @@ tmpfs_open(struct vop_open_args *v)
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_close(struct vop_close_args *v)
 {
@@ -285,8 +279,6 @@ tmpfs_close(struct vop_close_args *v)
 	return (0);
 }
 
-/* --------------------------------------------------------------------- */
-
 int
 tmpfs_access(struct vop_access_args *v)
 {
@@ -341,8 +333,6 @@ tmpfs_access(struct vop_access_args *v)
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 int
 tmpfs_getattr(struct vop_getattr_args *v)
 {
@@ -378,10 +368,6 @@ tmpfs_getattr(struct vop_getattr_args *v)
 	return 0;
 }
 
-/* --------------------------------------------------------------------- */
-
-/* XXX Should this operation be atomic?  I think it should, but code in
- * XXX other places (e.g., ufs) doesn't seem to be... */
 int
 tmpfs_setattr(struct vop_setattr_args *v)
 {
@@ -425,8 +411,7 @@ tmpfs_setattr(struct vop_setattr_args *v)
 	    vap->va_mtime.tv_nsec != VNOVAL) ||
 	    (vap->va_birthtime.tv_sec != VNOVAL &&
 	    vap->va_birthtime.tv_nsec != VNOVAL)))
-		error = tmpfs_chtimes(vp, &vap->va_atime, &vap->va_mtime,
-			&vap->va_birthtime, vap->va_vaflags, cred, td);
+		error = tmpfs_chtimes(vp, vap, cred, td);
 
 	/* Update the node times.  We give preference to the error codes
 	 * generated by this function rather than the ones that may arise
@@ -509,8 +494,6 @@ tmpfs_write(struct vop_write_args *v)
 	return (error);
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_fsync(struct vop_fsync_args *v)
 {
@@ -523,8 +506,6 @@ tmpfs_fsync(struct vop_fsync_args *v)
 	return 0;
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_remove(struct vop_remove_args *v)
 {
@@ -577,8 +558,6 @@ tmpfs_remove(struct vop_remove_args *v)
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_link(struct vop_link_args *v)
 {
@@ -593,23 +572,8 @@ tmpfs_link(struct vop_link_args *v)
 	MPASS(VOP_ISLOCKED(dvp));
 	MPASS(cnp->cn_flags & HASBUF);
 	MPASS(dvp != vp); /* XXX When can this be false? */
-
 	node = VP_TO_TMPFS_NODE(vp);
 
-	/* XXX: Why aren't the following two tests done by the caller? */
-
-	/* Hard links of directories are forbidden. */
-	if (vp->v_type == VDIR) {
-		error = EPERM;
-		goto out;
-	}
-
-	/* Cannot create cross-device links. */
-	if (dvp->v_mount != vp->v_mount) {
-		error = EXDEV;
-		goto out;
-	}
-
 	/* Ensure that we do not overflow the maximum number of links imposed
 	 * by the system. */
 	MPASS(node->tn_links <= LINK_MAX);
@@ -645,8 +609,6 @@ tmpfs_link(struct vop_link_args *v)
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * We acquire all but fdvp locks using non-blocking acquisitions.  If we
  * fail to acquire any lock in the path we will drop all held locks,
@@ -1056,8 +1018,6 @@ tmpfs_rename(struct vop_rename_args *v)
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_mkdir(struct vop_mkdir_args *v)
 {
@@ -1071,8 +1031,6 @@ tmpfs_mkdir(struct vop_mkdir_args *v)
 	return tmpfs_alloc_file(dvp, vpp, vap, cnp, NULL);
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_rmdir(struct vop_rmdir_args *v)
 {
@@ -1166,8 +1124,6 @@ tmpfs_rmdir(struct vop_rmdir_args *v)
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_symlink(struct vop_symlink_args *v)
 {
@@ -1186,8 +1142,6 @@ tmpfs_symlink(struct vop_symlink_args *v)
 	return tmpfs_alloc_file(dvp, vpp, vap, cnp, target);
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_readdir(struct vop_readdir_args *v)
 {
@@ -1240,8 +1194,6 @@ tmpfs_readdir(struct vop_readdir_args *v)
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_readlink(struct vop_readlink_args *v)
 {
@@ -1263,8 +1215,6 @@ tmpfs_readlink(struct vop_readlink_args *v)
 	return error;
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_inactive(struct vop_inactive_args *v)
 {
@@ -1280,8 +1230,6 @@ tmpfs_inactive(struct vop_inactive_args *v)
 	return 0;
 }
 
-/* --------------------------------------------------------------------- */
-
 int
 tmpfs_reclaim(struct vop_reclaim_args *v)
 {
@@ -1319,8 +1267,6 @@ tmpfs_reclaim(struct vop_reclaim_args *v)
 	return 0;
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_print(struct vop_print_args *v)
 {
@@ -1344,8 +1290,6 @@ tmpfs_print(struct vop_print_args *v)
 	return 0;
 }
 
-/* --------------------------------------------------------------------- */
-
 static int
 tmpfs_pathconf(struct vop_pathconf_args *v)
 {
@@ -1435,8 +1379,6 @@ tmpfs_whiteout(struct vop_whiteout_args *ap)
 	}
 }
 
-/* --------------------------------------------------------------------- */
-
 /*
  * vnode operations vector used for files stored in a tmpfs file system.
  */
diff --git a/sys/fs/tmpfs/tmpfs_vnops.h b/sys/fs/tmpfs/tmpfs_vnops.h
index 985218c7cac8..1e06c135fe76 100644
--- a/sys/fs/tmpfs/tmpfs_vnops.h
+++ b/sys/fs/tmpfs/tmpfs_vnops.h
@@ -39,8 +39,6 @@
 #error not supposed to be exposed to userland.
 #endif
 
-/* --------------------------------------------------------------------- */
-
 /*
  * Declarations for tmpfs_vnops.c.
  */
@@ -52,6 +50,4 @@ vop_getattr_t	tmpfs_getattr;
 vop_setattr_t	tmpfs_setattr;
 vop_reclaim_t	tmpfs_reclaim;
 
-/* --------------------------------------------------------------------- */
-
 #endif /* _FS_TMPFS_TMPFS_VNOPS_H_ */
diff --git a/sys/gdb/gdb_cons.c b/sys/gdb/gdb_cons.c
index ff746658601f..47f453fc3eea 100644
--- a/sys/gdb/gdb_cons.c
+++ b/sys/gdb/gdb_cons.c
@@ -58,9 +58,8 @@ struct gdbcons {
 static struct gdbcons state = { -1 };
 
 static	int gdbcons_enable = 0;
-SYSCTL_INT(_debug, OID_AUTO, gdbcons, CTLFLAG_RW, &gdbcons_enable,
-	    0, "copy console messages to gdb");
-TUNABLE_INT("debug.gdbcons", &gdbcons_enable);
+SYSCTL_INT(_debug, OID_AUTO, gdbcons, CTLFLAG_RWTUN, &gdbcons_enable,
+	    0, "copy console messages to GDB");
 
 static void
 gdb_cnprobe(struct consdev *cp)
diff --git a/sys/geom/cache/g_cache.c b/sys/geom/cache/g_cache.c
index ba701acff181..8a624cf5c1bd 100644
--- a/sys/geom/cache/g_cache.c
+++ b/sys/geom/cache/g_cache.c
@@ -73,7 +73,7 @@ sysctl_handle_pct(SYSCTL_HANDLER_ARGS)
 	error = sysctl_handle_int(oidp, &val, 0, req);
 	if (error || !req->newptr)
 		return (error);
-	if (val < 0 || val > 100)
+	if (val > 100)
 		return (EINVAL);
 	if ((arg1 == &g_cache_used_lo && val > g_cache_used_hi) ||
 	    (arg1 == &g_cache_used_hi && g_cache_used_lo > val))
diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c
index 2efc1b53fd61..4627ff9fa2ca 100644
--- a/sys/geom/concat/g_concat.c
+++ b/sys/geom/concat/g_concat.c
@@ -48,8 +48,7 @@ SYSCTL_DECL(_kern_geom);
 static SYSCTL_NODE(_kern_geom, OID_AUTO, concat, CTLFLAG_RW, 0,
     "GEOM_CONCAT stuff");
 static u_int g_concat_debug = 0;
-TUNABLE_INT("kern.geom.concat.debug", &g_concat_debug);
-SYSCTL_UINT(_kern_geom_concat, OID_AUTO, debug, CTLFLAG_RW, &g_concat_debug, 0,
+SYSCTL_UINT(_kern_geom_concat, OID_AUTO, debug, CTLFLAG_RWTUN, &g_concat_debug, 0,
     "Debug level");
 
 static int g_concat_destroy(struct g_concat_softc *sc, boolean_t force);
diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c
index d1f3cd25a0fb..2c4dc2c41ae5 100644
--- a/sys/geom/eli/g_eli.c
+++ b/sys/geom/eli/g_eli.c
@@ -63,29 +63,23 @@ static int g_eli_version = G_ELI_VERSION;
 SYSCTL_INT(_kern_geom_eli, OID_AUTO, version, CTLFLAG_RD, &g_eli_version, 0,
     "GELI version");
 int g_eli_debug = 0;
-TUNABLE_INT("kern.geom.eli.debug", &g_eli_debug);
-SYSCTL_INT(_kern_geom_eli, OID_AUTO, debug, CTLFLAG_RW, &g_eli_debug, 0,
+SYSCTL_INT(_kern_geom_eli, OID_AUTO, debug, CTLFLAG_RWTUN, &g_eli_debug, 0,
     "Debug level");
 static u_int g_eli_tries = 3;
-TUNABLE_INT("kern.geom.eli.tries", &g_eli_tries);
-SYSCTL_UINT(_kern_geom_eli, OID_AUTO, tries, CTLFLAG_RW, &g_eli_tries, 0,
+SYSCTL_UINT(_kern_geom_eli, OID_AUTO, tries, CTLFLAG_RWTUN, &g_eli_tries, 0,
     "Number of tries for entering the passphrase");
 static u_int g_eli_visible_passphrase = GETS_NOECHO;
-TUNABLE_INT("kern.geom.eli.visible_passphrase", &g_eli_visible_passphrase);
-SYSCTL_UINT(_kern_geom_eli, OID_AUTO, visible_passphrase, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_eli, OID_AUTO, visible_passphrase, CTLFLAG_RWTUN,
     &g_eli_visible_passphrase, 0,
     "Visibility of passphrase prompt (0 = invisible, 1 = visible, 2 = asterisk)");
 u_int g_eli_overwrites = G_ELI_OVERWRITES;
-TUNABLE_INT("kern.geom.eli.overwrites", &g_eli_overwrites);
-SYSCTL_UINT(_kern_geom_eli, OID_AUTO, overwrites, CTLFLAG_RW, &g_eli_overwrites,
+SYSCTL_UINT(_kern_geom_eli, OID_AUTO, overwrites, CTLFLAG_RWTUN, &g_eli_overwrites,
     0, "Number of times on-disk keys should be overwritten when destroying them");
 static u_int g_eli_threads = 0;
-TUNABLE_INT("kern.geom.eli.threads", &g_eli_threads);
-SYSCTL_UINT(_kern_geom_eli, OID_AUTO, threads, CTLFLAG_RW, &g_eli_threads, 0,
+SYSCTL_UINT(_kern_geom_eli, OID_AUTO, threads, CTLFLAG_RWTUN, &g_eli_threads, 0,
     "Number of threads doing crypto work");
 u_int g_eli_batch = 0;
-TUNABLE_INT("kern.geom.eli.batch", &g_eli_batch);
-SYSCTL_UINT(_kern_geom_eli, OID_AUTO, batch, CTLFLAG_RW, &g_eli_batch, 0,
+SYSCTL_UINT(_kern_geom_eli, OID_AUTO, batch, CTLFLAG_RWTUN, &g_eli_batch, 0,
     "Use crypto operations batching");
 
 static eventhandler_tag g_eli_pre_sync = NULL;
diff --git a/sys/geom/eli/g_eli_key_cache.c b/sys/geom/eli/g_eli_key_cache.c
index 9530495050ec..cb867166cee3 100644
--- a/sys/geom/eli/g_eli_key_cache.c
+++ b/sys/geom/eli/g_eli_key_cache.c
@@ -47,7 +47,6 @@ SYSCTL_DECL(_kern_geom_eli);
  * provider with 512 bytes sectors and will take around 1MB of memory.
  */
 static u_int g_eli_key_cache_limit = 8192;
-TUNABLE_INT("kern.geom.eli.key_cache_limit", &g_eli_key_cache_limit);
 SYSCTL_UINT(_kern_geom_eli, OID_AUTO, key_cache_limit, CTLFLAG_RDTUN,
     &g_eli_key_cache_limit, 0, "Maximum number of encryption keys to cache");
 static uint64_t g_eli_key_cache_hits;
diff --git a/sys/geom/gate/g_gate.c b/sys/geom/gate/g_gate.c
index eed4abbc54a2..ae0d7b094a5f 100644
--- a/sys/geom/gate/g_gate.c
+++ b/sys/geom/gate/g_gate.c
@@ -62,11 +62,9 @@ SYSCTL_DECL(_kern_geom);
 static SYSCTL_NODE(_kern_geom, OID_AUTO, gate, CTLFLAG_RW, 0,
     "GEOM_GATE configuration");
 static int g_gate_debug = 0;
-TUNABLE_INT("kern.geom.gate.debug", &g_gate_debug);
-SYSCTL_INT(_kern_geom_gate, OID_AUTO, debug, CTLFLAG_RW, &g_gate_debug, 0,
+SYSCTL_INT(_kern_geom_gate, OID_AUTO, debug, CTLFLAG_RWTUN, &g_gate_debug, 0,
     "Debug level");
 static u_int g_gate_maxunits = 256;
-TUNABLE_INT("kern.geom.gate.maxunits", &g_gate_maxunits);
 SYSCTL_UINT(_kern_geom_gate, OID_AUTO, maxunits, CTLFLAG_RDTUN,
     &g_gate_maxunits, 0, "Maximum number of ggate devices");
 
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index eb72597dbe34..5cfdaf0af369 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -561,12 +561,9 @@ g_disk_create(void *arg, int flag)
 		SYSCTL_STATIC_CHILDREN(_kern_geom_disk), OID_AUTO, gp->name,
 		CTLFLAG_RD, 0, tmpstr);
 	if (sc->sysctl_tree != NULL) {
-		snprintf(tmpstr, sizeof(tmpstr),
-		    "kern.geom.disk.%s.led", gp->name);
-		TUNABLE_STR_FETCH(tmpstr, sc->led, sizeof(sc->led));
 		SYSCTL_ADD_STRING(&sc->sysctl_ctx,
 		    SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO, "led",
-		    CTLFLAG_RW | CTLFLAG_TUN, sc->led, sizeof(sc->led),
+		    CTLFLAG_RWTUN, sc->led, sizeof(sc->led),
 		    "LED name");
 	}
 	pp->private = sc;
diff --git a/sys/geom/geom_kern.c b/sys/geom/geom_kern.c
index 79afb14abe9e..3559daf5fcab 100644
--- a/sys/geom/geom_kern.c
+++ b/sys/geom/geom_kern.c
@@ -212,8 +212,7 @@ SYSCTL_PROC(_kern_geom, OID_AUTO, conftxt, CTLTYPE_STRING|CTLFLAG_RD,
 	0, 0, sysctl_kern_geom_conftxt, "",
 	"Dump the GEOM config in txt");
 
-TUNABLE_INT("kern.geom.debugflags", &g_debugflags);
-SYSCTL_INT(_kern_geom, OID_AUTO, debugflags, CTLFLAG_RW,
+SYSCTL_INT(_kern_geom, OID_AUTO, debugflags, CTLFLAG_RWTUN,
 	&g_debugflags, 0, "Set various trace levels for GEOM debugging");
 
 SYSCTL_INT(_kern_geom, OID_AUTO, notaste, CTLFLAG_RW,
diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c
index 390847864812..9cc324c32a2c 100644
--- a/sys/geom/journal/g_journal.c
+++ b/sys/geom/journal/g_journal.c
@@ -84,7 +84,6 @@ const struct g_journal_desc *g_journal_filesystems[] = {
 SYSCTL_DECL(_kern_geom);
 
 int g_journal_debug = 0;
-TUNABLE_INT("kern.geom.journal.debug", &g_journal_debug);
 static u_int g_journal_switch_time = 10;
 static u_int g_journal_force_switch = 70;
 static u_int g_journal_parallel_flushes = 16;
@@ -95,7 +94,7 @@ static u_int g_journal_do_optimize = 1;
 
 static SYSCTL_NODE(_kern_geom, OID_AUTO, journal, CTLFLAG_RW, 0,
     "GEOM_JOURNAL stuff");
-SYSCTL_INT(_kern_geom_journal, OID_AUTO, debug, CTLFLAG_RW, &g_journal_debug, 0,
+SYSCTL_INT(_kern_geom_journal, OID_AUTO, debug, CTLFLAG_RWTUN, &g_journal_debug, 0,
     "Debug level");
 SYSCTL_UINT(_kern_geom_journal, OID_AUTO, switch_time, CTLFLAG_RW,
     &g_journal_switch_time, 0, "Switch journals every N seconds");
@@ -133,9 +132,7 @@ SYSCTL_UINT(_kern_geom_journal, OID_AUTO, optimize, CTLFLAG_RW,
 
 static u_int g_journal_cache_used = 0;
 static u_int g_journal_cache_limit = 64 * 1024 * 1024;
-TUNABLE_INT("kern.geom.journal.cache.limit", &g_journal_cache_limit);
 static u_int g_journal_cache_divisor = 2;
-TUNABLE_INT("kern.geom.journal.cache.divisor", &g_journal_cache_divisor);
 static u_int g_journal_cache_switch = 90;
 static u_int g_journal_cache_misses = 0;
 static u_int g_journal_cache_alloc_failures = 0;
@@ -160,7 +157,7 @@ g_journal_cache_limit_sysctl(SYSCTL_HANDLER_ARGS)
 	return (0);
 }
 SYSCTL_PROC(_kern_geom_journal_cache, OID_AUTO, limit,
-    CTLTYPE_UINT | CTLFLAG_RW, NULL, 0, g_journal_cache_limit_sysctl, "I",
+    CTLTYPE_UINT | CTLFLAG_RWTUN, NULL, 0, g_journal_cache_limit_sysctl, "I",
     "Maximum number of allocated bytes");
 SYSCTL_UINT(_kern_geom_journal_cache, OID_AUTO, divisor, CTLFLAG_RDTUN,
     &g_journal_cache_divisor, 0,
@@ -175,7 +172,7 @@ g_journal_cache_switch_sysctl(SYSCTL_HANDLER_ARGS)
 	error = sysctl_handle_int(oidp, &cswitch, 0, req);
 	if (error != 0 || req->newptr == NULL)
 		return (error);
-	if (cswitch < 0 || cswitch > 100)
+	if (cswitch > 100)
 		return (EINVAL);
 	g_journal_cache_switch = cswitch;
 	g_journal_cache_low = (g_journal_cache_limit / 100) * cswitch;
diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c
index ce1376e269ca..36498e1c3b1e 100644
--- a/sys/geom/label/g_label.c
+++ b/sys/geom/label/g_label.c
@@ -50,8 +50,7 @@ FEATURE(geom_label, "GEOM labeling support");
 SYSCTL_DECL(_kern_geom);
 SYSCTL_NODE(_kern_geom, OID_AUTO, label, CTLFLAG_RW, 0, "GEOM_LABEL stuff");
 u_int g_label_debug = 0;
-TUNABLE_INT("kern.geom.label.debug", &g_label_debug);
-SYSCTL_UINT(_kern_geom_label, OID_AUTO, debug, CTLFLAG_RW, &g_label_debug, 0,
+SYSCTL_UINT(_kern_geom_label, OID_AUTO, debug, CTLFLAG_RWTUN, &g_label_debug, 0,
     "Debug level");
 
 static int g_label_destroy_geom(struct gctl_req *req, struct g_class *mp,
diff --git a/sys/geom/label/g_label.h b/sys/geom/label/g_label.h
index eca31264ec16..66b762c6f920 100644
--- a/sys/geom/label/g_label.h
+++ b/sys/geom/label/g_label.h
@@ -65,9 +65,7 @@ SYSCTL_DECL(_kern_geom_label);
 	SYSCTL_NODE(_kern_geom_label, OID_AUTO, kind, CTLFLAG_RD,	\
 	    NULL, "");							\
 	SYSCTL_INT(_kern_geom_label_##kind, OID_AUTO, enable, 		\
-	    CTLFLAG_RW, &label.ld_enabled, 1, descr);			\
-	TUNABLE_INT("kern.geom.label." __XSTRING(kind) ".enable",	\
-	    &label.ld_enabled)
+	    CTLFLAG_RWTUN, &label.ld_enabled, 1, descr)
 
 typedef void g_label_taste_t (struct g_consumer *cp, char *label, size_t size);
 
diff --git a/sys/geom/linux_lvm/g_linux_lvm.c b/sys/geom/linux_lvm/g_linux_lvm.c
index 2ac19e06958f..bf2f1e795f3b 100644
--- a/sys/geom/linux_lvm/g_linux_lvm.c
+++ b/sys/geom/linux_lvm/g_linux_lvm.c
@@ -79,8 +79,7 @@ SYSCTL_DECL(_kern_geom);
 SYSCTL_NODE(_kern_geom, OID_AUTO, linux_lvm, CTLFLAG_RW, 0,
     "GEOM_LINUX_LVM stuff");
 static u_int g_llvm_debug = 0;
-TUNABLE_INT("kern.geom.linux_lvm.debug", &g_llvm_debug);
-SYSCTL_UINT(_kern_geom_linux_lvm, OID_AUTO, debug, CTLFLAG_RW, &g_llvm_debug, 0,
+SYSCTL_UINT(_kern_geom_linux_lvm, OID_AUTO, debug, CTLFLAG_RWTUN, &g_llvm_debug, 0,
     "Debug level");
 
 LIST_HEAD(, g_llvm_vg) vg_list;
diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c
index e4dffdcae2c1..2fae439c99f6 100644
--- a/sys/geom/mirror/g_mirror.c
+++ b/sys/geom/mirror/g_mirror.c
@@ -54,24 +54,18 @@ SYSCTL_DECL(_kern_geom);
 static SYSCTL_NODE(_kern_geom, OID_AUTO, mirror, CTLFLAG_RW, 0,
     "GEOM_MIRROR stuff");
 u_int g_mirror_debug = 0;
-TUNABLE_INT("kern.geom.mirror.debug", &g_mirror_debug);
-SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, debug, CTLFLAG_RW, &g_mirror_debug, 0,
+SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, debug, CTLFLAG_RWTUN, &g_mirror_debug, 0,
     "Debug level");
 static u_int g_mirror_timeout = 4;
-TUNABLE_INT("kern.geom.mirror.timeout", &g_mirror_timeout);
-SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, timeout, CTLFLAG_RW, &g_mirror_timeout,
+SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, timeout, CTLFLAG_RWTUN, &g_mirror_timeout,
     0, "Time to wait on all mirror components");
 static u_int g_mirror_idletime = 5;
-TUNABLE_INT("kern.geom.mirror.idletime", &g_mirror_idletime);
-SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, idletime, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, idletime, CTLFLAG_RWTUN,
     &g_mirror_idletime, 0, "Mark components as clean when idling");
 static u_int g_mirror_disconnect_on_failure = 1;
-TUNABLE_INT("kern.geom.mirror.disconnect_on_failure",
-    &g_mirror_disconnect_on_failure);
-SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, disconnect_on_failure, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, disconnect_on_failure, CTLFLAG_RWTUN,
     &g_mirror_disconnect_on_failure, 0, "Disconnect component on I/O failure.");
 static u_int g_mirror_syncreqs = 2;
-TUNABLE_INT("kern.geom.mirror.sync_requests", &g_mirror_syncreqs);
 SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, sync_requests, CTLFLAG_RDTUN,
     &g_mirror_syncreqs, 0, "Parallel synchronization I/O requests.");
 
diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c
index 8429fa06a26b..9a1730b0e702 100644
--- a/sys/geom/part/g_part.c
+++ b/sys/geom/part/g_part.c
@@ -117,15 +117,15 @@ struct g_part_alias_list {
 	{ "dragonfly-legacy", G_PART_ALIAS_DFBSD_LEGACY },
 	{ "dragonfly-hammer", G_PART_ALIAS_DFBSD_HAMMER },
 	{ "dragonfly-hammer2", G_PART_ALIAS_DFBSD_HAMMER2 },
+	{ "prep-boot", G_PART_ALIAS_PREP_BOOT },
 };
 
 SYSCTL_DECL(_kern_geom);
 SYSCTL_NODE(_kern_geom, OID_AUTO, part, CTLFLAG_RW, 0,
     "GEOM_PART stuff");
 static u_int check_integrity = 1;
-TUNABLE_INT("kern.geom.part.check_integrity", &check_integrity);
 SYSCTL_UINT(_kern_geom_part, OID_AUTO, check_integrity,
-    CTLFLAG_RW | CTLFLAG_TUN, &check_integrity, 1,
+    CTLFLAG_RWTUN, &check_integrity, 1,
     "Enable integrity checking");
 
 /*
diff --git a/sys/geom/part/g_part.h b/sys/geom/part/g_part.h
index 06522f50eb3e..d2c2d231994a 100644
--- a/sys/geom/part/g_part.h
+++ b/sys/geom/part/g_part.h
@@ -84,6 +84,7 @@ enum g_part_alias {
 	G_PART_ALIAS_DFBSD_LEGACY,	/* A DfBSD legacy partition entry */
 	G_PART_ALIAS_DFBSD_HAMMER,	/* A DfBSD HAMMER FS partition entry */
 	G_PART_ALIAS_DFBSD_HAMMER2,	/* A DfBSD HAMMER2 FS partition entry */
+	G_PART_ALIAS_PREP_BOOT,		/* A PREP/CHRP boot partition entry. */
 	/* Keep the following last */
 	G_PART_ALIAS_COUNT
 };
diff --git a/sys/geom/part/g_part_apm.c b/sys/geom/part/g_part_apm.c
index bb79e568156f..90357cf047af 100644
--- a/sys/geom/part/g_part_apm.c
+++ b/sys/geom/part/g_part_apm.c
@@ -149,11 +149,6 @@ apm_parse_type(const char *type, char *buf, size_t bufsz)
 		strcpy(buf, APM_ENT_TYPE_APPLE_UFS);
 		return (0);
 	}
-	alias = g_part_alias_name(G_PART_ALIAS_FREEBSD_BOOT);
-	if (!strcasecmp(type, alias)) {
-		strcpy(buf, APM_ENT_TYPE_APPLE_BOOT);
-		return (0);
-	}
 	alias = g_part_alias_name(G_PART_ALIAS_FREEBSD);
 	if (!strcasecmp(type, alias)) {
 		strcpy(buf, APM_ENT_TYPE_FREEBSD);
diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c
index b9e6bae14882..5e04d93f29e0 100644
--- a/sys/geom/part/g_part_gpt.c
+++ b/sys/geom/part/g_part_gpt.c
@@ -190,6 +190,7 @@ static struct uuid gpt_uuid_dfbsd_hammer = GPT_ENT_TYPE_DRAGONFLY_HAMMER;
 static struct uuid gpt_uuid_dfbsd_hammer2 = GPT_ENT_TYPE_DRAGONFLY_HAMMER2;
 static struct uuid gpt_uuid_dfbsd_label32 = GPT_ENT_TYPE_DRAGONFLY_LABEL32;
 static struct uuid gpt_uuid_dfbsd_label64 = GPT_ENT_TYPE_DRAGONFLY_LABEL64;
+static struct uuid gpt_uuid_prep_boot = GPT_ENT_TYPE_PREP_BOOT;
 
 static struct g_part_uuid_alias {
 	struct uuid *uuid;
@@ -240,6 +241,7 @@ static struct g_part_uuid_alias {
 	{ &gpt_uuid_dfbsd_hammer2,	G_PART_ALIAS_DFBSD_HAMMER2,	 0 },
 	{ &gpt_uuid_dfbsd_label32,	G_PART_ALIAS_DFBSD,		 0xa5 },
 	{ &gpt_uuid_dfbsd_label64,	G_PART_ALIAS_DFBSD64,		 0xa5 },
+	{ &gpt_uuid_prep_boot,		G_PART_ALIAS_PREP_BOOT,		 0x41 },
 	{ NULL, 0, 0 }
 };
 
diff --git a/sys/geom/part/g_part_ldm.c b/sys/geom/part/g_part_ldm.c
index 40c2eb877b07..82bf76dad522 100644
--- a/sys/geom/part/g_part_ldm.c
+++ b/sys/geom/part/g_part_ldm.c
@@ -55,18 +55,16 @@ static SYSCTL_NODE(_kern_geom_part, OID_AUTO, ldm, CTLFLAG_RW, 0,
     "GEOM_PART_LDM Logical Disk Manager");
 
 static u_int ldm_debug = 0;
-TUNABLE_INT("kern.geom.part.ldm.debug", &ldm_debug);
 SYSCTL_UINT(_kern_geom_part_ldm, OID_AUTO, debug,
-    CTLFLAG_RW | CTLFLAG_TUN, &ldm_debug, 0, "Debug level");
+    CTLFLAG_RWTUN, &ldm_debug, 0, "Debug level");
 
 /*
  * This allows access to mirrored LDM volumes. Since we do not
  * doing mirroring here, it is not enabled by default.
  */
 static u_int show_mirrors = 0;
-TUNABLE_INT("kern.geom.part.ldm.show_mirrors", &show_mirrors);
 SYSCTL_UINT(_kern_geom_part_ldm, OID_AUTO, show_mirrors,
-    CTLFLAG_RW | CTLFLAG_TUN, &show_mirrors, 0, "Show mirrored volumes");
+    CTLFLAG_RWTUN, &show_mirrors, 0, "Show mirrored volumes");
 
 #define	LDM_DEBUG(lvl, fmt, ...)	do {				\
 	if (ldm_debug >= (lvl)) {					\
diff --git a/sys/geom/part/g_part_mbr.c b/sys/geom/part/g_part_mbr.c
index 73101ff6929b..5073398c954c 100644
--- a/sys/geom/part/g_part_mbr.c
+++ b/sys/geom/part/g_part_mbr.c
@@ -49,6 +49,14 @@ __FBSDID("$FreeBSD$");
 
 FEATURE(geom_part_mbr, "GEOM partitioning class for MBR support");
 
+SYSCTL_DECL(_kern_geom_part);
+static SYSCTL_NODE(_kern_geom_part, OID_AUTO, mbr, CTLFLAG_RW, 0,
+    "GEOM_PART_MBR Master Boot Record");
+
+static u_int enforce_chs = 0;
+SYSCTL_UINT(_kern_geom_part_mbr, OID_AUTO, enforce_chs,
+    CTLFLAG_RWTUN, &enforce_chs, 0, "Enforce alignment to CHS addressing");
+
 #define	MBRSIZE		512
 
 struct g_part_mbr_table {
@@ -127,7 +135,7 @@ static struct g_part_mbr_alias {
 	{ DOSPTYP_LINUX,	G_PART_ALIAS_LINUX_DATA },
 	{ DOSPTYP_LINLVM,	G_PART_ALIAS_LINUX_LVM },
 	{ DOSPTYP_LINRAID,	G_PART_ALIAS_LINUX_RAID },
-	{ DOSPTYP_PPCBOOT,	G_PART_ALIAS_FREEBSD_BOOT },
+	{ DOSPTYP_PPCBOOT,	G_PART_ALIAS_PREP_BOOT },
 	{ DOSPTYP_VMFS,		G_PART_ALIAS_VMFS },
 	{ DOSPTYP_VMKDIAG,	G_PART_ALIAS_VMKDIAG },
 };
@@ -200,6 +208,8 @@ mbr_align(struct g_part_table *basetable, uint32_t *start, uint32_t *size)
 {
 	uint32_t sectors;
 
+	if (enforce_chs == 0)
+		return (0);
 	sectors = basetable->gpt_sectors;
 	if (*size < sectors)
 		return (EINVAL);
diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c
index 858cf4c75b27..db9cf445ecb2 100644
--- a/sys/geom/raid/g_raid.c
+++ b/sys/geom/raid/g_raid.c
@@ -53,49 +53,38 @@ static MALLOC_DEFINE(M_RAID, "raid_data", "GEOM_RAID Data");
 SYSCTL_DECL(_kern_geom);
 SYSCTL_NODE(_kern_geom, OID_AUTO, raid, CTLFLAG_RW, 0, "GEOM_RAID stuff");
 int g_raid_enable = 1;
-TUNABLE_INT("kern.geom.raid.enable", &g_raid_enable);
-SYSCTL_INT(_kern_geom_raid, OID_AUTO, enable, CTLFLAG_RW,
+SYSCTL_INT(_kern_geom_raid, OID_AUTO, enable, CTLFLAG_RWTUN,
     &g_raid_enable, 0, "Enable on-disk metadata taste");
 u_int g_raid_aggressive_spare = 0;
-TUNABLE_INT("kern.geom.raid.aggressive_spare", &g_raid_aggressive_spare);
-SYSCTL_UINT(_kern_geom_raid, OID_AUTO, aggressive_spare, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid, OID_AUTO, aggressive_spare, CTLFLAG_RWTUN,
     &g_raid_aggressive_spare, 0, "Use disks without metadata as spare");
 u_int g_raid_debug = 0;
-TUNABLE_INT("kern.geom.raid.debug", &g_raid_debug);
-SYSCTL_UINT(_kern_geom_raid, OID_AUTO, debug, CTLFLAG_RW, &g_raid_debug, 0,
+SYSCTL_UINT(_kern_geom_raid, OID_AUTO, debug, CTLFLAG_RWTUN, &g_raid_debug, 0,
     "Debug level");
 int g_raid_read_err_thresh = 10;
-TUNABLE_INT("kern.geom.raid.read_err_thresh", &g_raid_read_err_thresh);
-SYSCTL_UINT(_kern_geom_raid, OID_AUTO, read_err_thresh, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid, OID_AUTO, read_err_thresh, CTLFLAG_RWTUN,
     &g_raid_read_err_thresh, 0,
     "Number of read errors equated to disk failure");
 u_int g_raid_start_timeout = 30;
-TUNABLE_INT("kern.geom.raid.start_timeout", &g_raid_start_timeout);
-SYSCTL_UINT(_kern_geom_raid, OID_AUTO, start_timeout, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid, OID_AUTO, start_timeout, CTLFLAG_RWTUN,
     &g_raid_start_timeout, 0,
     "Time to wait for all array components");
 static u_int g_raid_clean_time = 5;
-TUNABLE_INT("kern.geom.raid.clean_time", &g_raid_clean_time);
-SYSCTL_UINT(_kern_geom_raid, OID_AUTO, clean_time, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid, OID_AUTO, clean_time, CTLFLAG_RWTUN,
     &g_raid_clean_time, 0, "Mark volume as clean when idling");
 static u_int g_raid_disconnect_on_failure = 1;
-TUNABLE_INT("kern.geom.raid.disconnect_on_failure",
-    &g_raid_disconnect_on_failure);
-SYSCTL_UINT(_kern_geom_raid, OID_AUTO, disconnect_on_failure, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid, OID_AUTO, disconnect_on_failure, CTLFLAG_RWTUN,
     &g_raid_disconnect_on_failure, 0, "Disconnect component on I/O failure.");
 static u_int g_raid_name_format = 0;
-TUNABLE_INT("kern.geom.raid.name_format", &g_raid_name_format);
-SYSCTL_UINT(_kern_geom_raid, OID_AUTO, name_format, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid, OID_AUTO, name_format, CTLFLAG_RWTUN,
     &g_raid_name_format, 0, "Providers name format.");
 static u_int g_raid_idle_threshold = 1000000;
-TUNABLE_INT("kern.geom.raid.idle_threshold", &g_raid_idle_threshold);
-SYSCTL_UINT(_kern_geom_raid, OID_AUTO, idle_threshold, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid, OID_AUTO, idle_threshold, CTLFLAG_RWTUN,
     &g_raid_idle_threshold, 1000000,
     "Time in microseconds to consider a volume idle.");
 static u_int ar_legacy_aliases = 1;
-SYSCTL_INT(_kern_geom_raid, OID_AUTO, legacy_aliases, CTLFLAG_RW,
+SYSCTL_INT(_kern_geom_raid, OID_AUTO, legacy_aliases, CTLFLAG_RWTUN,
            &ar_legacy_aliases, 0, "Create aliases named as the legacy ataraid style.");
-TUNABLE_INT("kern.geom_raid.legacy_aliases", &ar_legacy_aliases);
 
 
 #define	MSLEEP(rv, ident, mtx, priority, wmesg, timeout)	do {	\
diff --git a/sys/geom/raid/g_raid.h b/sys/geom/raid/g_raid.h
index 8a96fa9f4698..f6aa6dbb98d0 100644
--- a/sys/geom/raid/g_raid.h
+++ b/sys/geom/raid/g_raid.h
@@ -364,10 +364,8 @@ int g_raid_md_modevent(module_t, int, void *);
     SYSCTL_NODE(_kern_geom_raid, OID_AUTO, name, CTLFLAG_RD,	\
 	NULL, label " metadata module");			\
     SYSCTL_INT(_kern_geom_raid_##name, OID_AUTO, enable,	\
-	CTLFLAG_RW, &g_raid_md_##name##_class.mdc_enable, 0,	\
-	"Enable " label " metadata format taste");		\
-    TUNABLE_INT("kern.geom.raid." __XSTRING(name) ".enable",	\
-	&g_raid_md_##name##_class.mdc_enable)
+	CTLFLAG_RWTUN, &g_raid_md_##name##_class.mdc_enable, 0,	\
+	"Enable " label " metadata format taste")
 
 /*
  * KOBJ parent class of data transformation modules.
@@ -403,10 +401,8 @@ int g_raid_tr_modevent(module_t, int, void *);
     SYSCTL_NODE(_kern_geom_raid, OID_AUTO, name, CTLFLAG_RD,	\
 	NULL, label " transformation module");			\
     SYSCTL_INT(_kern_geom_raid_##name, OID_AUTO, enable,	\
-	CTLFLAG_RW, &g_raid_tr_##name##_class.trc_enable, 0,	\
-	"Enable " label " transformation module taste");	\
-    TUNABLE_INT("kern.geom.raid." __XSTRING(name) ".enable",	\
-	&g_raid_tr_##name##_class.trc_enable)
+	CTLFLAG_RWTUN, &g_raid_tr_##name##_class.trc_enable, 0,	\
+	"Enable " label " transformation module taste")
 
 const char * g_raid_volume_level2str(int level, int qual);
 int g_raid_volume_str2level(const char *str, int *level, int *qual);
diff --git a/sys/geom/raid/tr_raid1.c b/sys/geom/raid/tr_raid1.c
index 833655bb854f..17c7a2599744 100644
--- a/sys/geom/raid/tr_raid1.c
+++ b/sys/geom/raid/tr_raid1.c
@@ -46,33 +46,25 @@ SYSCTL_DECL(_kern_geom_raid_raid1);
 
 #define RAID1_REBUILD_SLAB	(1 << 20) /* One transation in a rebuild */
 static int g_raid1_rebuild_slab = RAID1_REBUILD_SLAB;
-TUNABLE_INT("kern.geom.raid.raid1.rebuild_slab_size",
-    &g_raid1_rebuild_slab);
-SYSCTL_UINT(_kern_geom_raid_raid1, OID_AUTO, rebuild_slab_size, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid_raid1, OID_AUTO, rebuild_slab_size, CTLFLAG_RWTUN,
     &g_raid1_rebuild_slab, 0,
     "Amount of the disk to rebuild each read/write cycle of the rebuild.");
 
 #define RAID1_REBUILD_FAIR_IO 20 /* use 1/x of the available I/O */
 static int g_raid1_rebuild_fair_io = RAID1_REBUILD_FAIR_IO;
-TUNABLE_INT("kern.geom.raid.raid1.rebuild_fair_io",
-    &g_raid1_rebuild_fair_io);
-SYSCTL_UINT(_kern_geom_raid_raid1, OID_AUTO, rebuild_fair_io, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid_raid1, OID_AUTO, rebuild_fair_io, CTLFLAG_RWTUN,
     &g_raid1_rebuild_fair_io, 0,
     "Fraction of the I/O bandwidth to use when disk busy for rebuild.");
 
 #define RAID1_REBUILD_CLUSTER_IDLE 100
 static int g_raid1_rebuild_cluster_idle = RAID1_REBUILD_CLUSTER_IDLE;
-TUNABLE_INT("kern.geom.raid.raid1.rebuild_cluster_idle",
-    &g_raid1_rebuild_cluster_idle);
-SYSCTL_UINT(_kern_geom_raid_raid1, OID_AUTO, rebuild_cluster_idle, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid_raid1, OID_AUTO, rebuild_cluster_idle, CTLFLAG_RWTUN,
     &g_raid1_rebuild_cluster_idle, 0,
     "Number of slabs to do each time we trigger a rebuild cycle");
 
 #define RAID1_REBUILD_META_UPDATE 1024 /* update meta data every 1GB or so */
 static int g_raid1_rebuild_meta_update = RAID1_REBUILD_META_UPDATE;
-TUNABLE_INT("kern.geom.raid.raid1.rebuild_meta_update",
-    &g_raid1_rebuild_meta_update);
-SYSCTL_UINT(_kern_geom_raid_raid1, OID_AUTO, rebuild_meta_update, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid_raid1, OID_AUTO, rebuild_meta_update, CTLFLAG_RWTUN,
     &g_raid1_rebuild_meta_update, 0,
     "When to update the meta data.");
 
diff --git a/sys/geom/raid/tr_raid1e.c b/sys/geom/raid/tr_raid1e.c
index 404b9e609344..b3577429daca 100644
--- a/sys/geom/raid/tr_raid1e.c
+++ b/sys/geom/raid/tr_raid1e.c
@@ -48,33 +48,25 @@ SYSCTL_DECL(_kern_geom_raid_raid1e);
 
 #define RAID1E_REBUILD_SLAB	(1 << 20) /* One transation in a rebuild */
 static int g_raid1e_rebuild_slab = RAID1E_REBUILD_SLAB;
-TUNABLE_INT("kern.geom.raid.raid1e.rebuild_slab_size",
-    &g_raid1e_rebuild_slab);
-SYSCTL_UINT(_kern_geom_raid_raid1e, OID_AUTO, rebuild_slab_size, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid_raid1e, OID_AUTO, rebuild_slab_size, CTLFLAG_RWTUN,
     &g_raid1e_rebuild_slab, 0,
     "Amount of the disk to rebuild each read/write cycle of the rebuild.");
 
 #define RAID1E_REBUILD_FAIR_IO 20 /* use 1/x of the available I/O */
 static int g_raid1e_rebuild_fair_io = RAID1E_REBUILD_FAIR_IO;
-TUNABLE_INT("kern.geom.raid.raid1e.rebuild_fair_io",
-    &g_raid1e_rebuild_fair_io);
-SYSCTL_UINT(_kern_geom_raid_raid1e, OID_AUTO, rebuild_fair_io, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid_raid1e, OID_AUTO, rebuild_fair_io, CTLFLAG_RWTUN,
     &g_raid1e_rebuild_fair_io, 0,
     "Fraction of the I/O bandwidth to use when disk busy for rebuild.");
 
 #define RAID1E_REBUILD_CLUSTER_IDLE 100
 static int g_raid1e_rebuild_cluster_idle = RAID1E_REBUILD_CLUSTER_IDLE;
-TUNABLE_INT("kern.geom.raid.raid1e.rebuild_cluster_idle",
-    &g_raid1e_rebuild_cluster_idle);
-SYSCTL_UINT(_kern_geom_raid_raid1e, OID_AUTO, rebuild_cluster_idle, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid_raid1e, OID_AUTO, rebuild_cluster_idle, CTLFLAG_RWTUN,
     &g_raid1e_rebuild_cluster_idle, 0,
     "Number of slabs to do each time we trigger a rebuild cycle");
 
 #define RAID1E_REBUILD_META_UPDATE 1024 /* update meta data every 1GB or so */
 static int g_raid1e_rebuild_meta_update = RAID1E_REBUILD_META_UPDATE;
-TUNABLE_INT("kern.geom.raid.raid1e.rebuild_meta_update",
-    &g_raid1e_rebuild_meta_update);
-SYSCTL_UINT(_kern_geom_raid_raid1e, OID_AUTO, rebuild_meta_update, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid_raid1e, OID_AUTO, rebuild_meta_update, CTLFLAG_RWTUN,
     &g_raid1e_rebuild_meta_update, 0,
     "When to update the meta data.");
 
diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c
index 927cb3173e71..f935f788a937 100644
--- a/sys/geom/raid3/g_raid3.c
+++ b/sys/geom/raid3/g_raid3.c
@@ -54,42 +54,32 @@ SYSCTL_DECL(_kern_geom);
 static SYSCTL_NODE(_kern_geom, OID_AUTO, raid3, CTLFLAG_RW, 0,
     "GEOM_RAID3 stuff");
 u_int g_raid3_debug = 0;
-TUNABLE_INT("kern.geom.raid3.debug", &g_raid3_debug);
-SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, debug, CTLFLAG_RW, &g_raid3_debug, 0,
+SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, debug, CTLFLAG_RWTUN, &g_raid3_debug, 0,
     "Debug level");
 static u_int g_raid3_timeout = 4;
-TUNABLE_INT("kern.geom.raid3.timeout", &g_raid3_timeout);
-SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, timeout, CTLFLAG_RW, &g_raid3_timeout,
+SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, timeout, CTLFLAG_RWTUN, &g_raid3_timeout,
     0, "Time to wait on all raid3 components");
 static u_int g_raid3_idletime = 5;
-TUNABLE_INT("kern.geom.raid3.idletime", &g_raid3_idletime);
-SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, idletime, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, idletime, CTLFLAG_RWTUN,
     &g_raid3_idletime, 0, "Mark components as clean when idling");
 static u_int g_raid3_disconnect_on_failure = 1;
-TUNABLE_INT("kern.geom.raid3.disconnect_on_failure",
-    &g_raid3_disconnect_on_failure);
-SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, disconnect_on_failure, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, disconnect_on_failure, CTLFLAG_RWTUN,
     &g_raid3_disconnect_on_failure, 0, "Disconnect component on I/O failure.");
 static u_int g_raid3_syncreqs = 2;
-TUNABLE_INT("kern.geom.raid3.sync_requests", &g_raid3_syncreqs);
 SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, sync_requests, CTLFLAG_RDTUN,
     &g_raid3_syncreqs, 0, "Parallel synchronization I/O requests.");
 static u_int g_raid3_use_malloc = 0;
-TUNABLE_INT("kern.geom.raid3.use_malloc", &g_raid3_use_malloc);
 SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, use_malloc, CTLFLAG_RDTUN,
     &g_raid3_use_malloc, 0, "Use malloc(9) instead of uma(9).");
 
 static u_int g_raid3_n64k = 50;
-TUNABLE_INT("kern.geom.raid3.n64k", &g_raid3_n64k);
-SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, n64k, CTLFLAG_RD, &g_raid3_n64k, 0,
+SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, n64k, CTLFLAG_RDTUN, &g_raid3_n64k, 0,
     "Maximum number of 64kB allocations");
 static u_int g_raid3_n16k = 200;
-TUNABLE_INT("kern.geom.raid3.n16k", &g_raid3_n16k);
-SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, n16k, CTLFLAG_RD, &g_raid3_n16k, 0,
+SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, n16k, CTLFLAG_RDTUN, &g_raid3_n16k, 0,
     "Maximum number of 16kB allocations");
 static u_int g_raid3_n4k = 1200;
-TUNABLE_INT("kern.geom.raid3.n4k", &g_raid3_n4k);
-SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, n4k, CTLFLAG_RD, &g_raid3_n4k, 0,
+SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, n4k, CTLFLAG_RDTUN, &g_raid3_n4k, 0,
     "Maximum number of 4kB allocations");
 
 static SYSCTL_NODE(_kern_geom_raid3, OID_AUTO, stat, CTLFLAG_RW, 0,
diff --git a/sys/geom/shsec/g_shsec.c b/sys/geom/shsec/g_shsec.c
index 9f8723f619c8..bfdc8fdc1672 100644
--- a/sys/geom/shsec/g_shsec.c
+++ b/sys/geom/shsec/g_shsec.c
@@ -71,12 +71,10 @@ SYSCTL_DECL(_kern_geom);
 static SYSCTL_NODE(_kern_geom, OID_AUTO, shsec, CTLFLAG_RW, 0,
     "GEOM_SHSEC stuff");
 static u_int g_shsec_debug = 0;
-TUNABLE_INT("kern.geom.shsec.debug", &g_shsec_debug);
-SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, debug, CTLFLAG_RW, &g_shsec_debug, 0,
+SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, debug, CTLFLAG_RWTUN, &g_shsec_debug, 0,
     "Debug level");
 static u_int g_shsec_maxmem = MAXPHYS * 100;
-TUNABLE_INT("kern.geom.shsec.maxmem", &g_shsec_maxmem);
-SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, maxmem, CTLFLAG_RD, &g_shsec_maxmem,
+SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, maxmem, CTLFLAG_RDTUN, &g_shsec_maxmem,
     0, "Maximum memory that can be allocated for I/O (in bytes)");
 static u_int g_shsec_alloc_failed = 0;
 SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, alloc_failed, CTLFLAG_RD,
diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c
index 474d888b4b67..1e88e6d606f0 100644
--- a/sys/geom/stripe/g_stripe.c
+++ b/sys/geom/stripe/g_stripe.c
@@ -71,11 +71,9 @@ SYSCTL_DECL(_kern_geom);
 static SYSCTL_NODE(_kern_geom, OID_AUTO, stripe, CTLFLAG_RW, 0,
     "GEOM_STRIPE stuff");
 static u_int g_stripe_debug = 0;
-TUNABLE_INT("kern.geom.stripe.debug", &g_stripe_debug);
-SYSCTL_UINT(_kern_geom_stripe, OID_AUTO, debug, CTLFLAG_RW, &g_stripe_debug, 0,
+SYSCTL_UINT(_kern_geom_stripe, OID_AUTO, debug, CTLFLAG_RWTUN, &g_stripe_debug, 0,
     "Debug level");
 static int g_stripe_fast = 0;
-TUNABLE_INT("kern.geom.stripe.fast", &g_stripe_fast);
 static int
 g_sysctl_stripe_fast(SYSCTL_HANDLER_ARGS)
 {
@@ -87,11 +85,10 @@ g_sysctl_stripe_fast(SYSCTL_HANDLER_ARGS)
 		g_stripe_fast = fast;
 	return (error);
 }
-SYSCTL_PROC(_kern_geom_stripe, OID_AUTO, fast, CTLTYPE_INT | CTLFLAG_RW,
+SYSCTL_PROC(_kern_geom_stripe, OID_AUTO, fast, CTLTYPE_INT | CTLFLAG_RWTUN,
     NULL, 0, g_sysctl_stripe_fast, "I", "Fast, but memory-consuming, mode");
 static u_int g_stripe_maxmem = MAXPHYS * 100;
-TUNABLE_INT("kern.geom.stripe.maxmem", &g_stripe_maxmem);
-SYSCTL_UINT(_kern_geom_stripe, OID_AUTO, maxmem, CTLFLAG_RD, &g_stripe_maxmem,
+SYSCTL_UINT(_kern_geom_stripe, OID_AUTO, maxmem, CTLFLAG_RDTUN, &g_stripe_maxmem,
     0, "Maximum memory that can be allocated in \"fast\" mode (in bytes)");
 static u_int g_stripe_fast_failed = 0;
 SYSCTL_UINT(_kern_geom_stripe, OID_AUTO, fast_failed, CTLFLAG_RD,
diff --git a/sys/geom/uzip/g_uzip.c b/sys/geom/uzip/g_uzip.c
index 1dacfa0b4e9e..c2ed64b365c8 100644
--- a/sys/geom/uzip/g_uzip.c
+++ b/sys/geom/uzip/g_uzip.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2004 Max Khon
+ * Copyright (c) 2014 Juniper Networks, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -86,6 +87,8 @@ struct g_uzip_softc {
 	int req_cached;			/* cached requests */
 };
 
+static void g_uzip_done(struct bio *bp);
+
 static void
 g_uzip_softc_free(struct g_uzip_softc *sc, struct g_geom *gp)
 {
@@ -120,213 +123,229 @@ z_free(void *nil, void *ptr)
 	free(ptr, M_GEOM_UZIP);
 }
 
+static int
+g_uzip_cached(struct g_geom *gp, struct bio *bp)
+{
+	struct g_uzip_softc *sc;
+	off_t ofs;
+	size_t blk, blkofs, usz;
+
+	sc = gp->softc;
+	ofs = bp->bio_offset + bp->bio_completed;
+	blk = ofs / sc->blksz;
+	mtx_lock(&sc->last_mtx);
+	if (blk == sc->last_blk) {
+		blkofs = ofs % sc->blksz;
+		usz = sc->blksz - blkofs;
+		if (bp->bio_resid < usz)
+			usz = bp->bio_resid;
+		memcpy(bp->bio_data + bp->bio_completed, sc->last_buf + blkofs,
+		    usz);
+		sc->req_cached++;
+		mtx_unlock(&sc->last_mtx);
+
+		DPRINTF(("%s/%s: %p: offset=%jd: got %jd bytes from cache\n",
+		    __func__, gp->name, bp, (intmax_t)ofs, (intmax_t)usz));
+
+		bp->bio_completed += usz;
+		bp->bio_resid -= usz;
+
+		if (bp->bio_resid == 0) {
+			g_io_deliver(bp, 0);
+			return (1);
+		}
+	} else
+		mtx_unlock(&sc->last_mtx);
+
+	return (0);
+}
+
+static int
+g_uzip_request(struct g_geom *gp, struct bio *bp)
+{
+	struct g_uzip_softc *sc;
+	struct bio *bp2;
+	struct g_consumer *cp;
+	struct g_provider *pp;
+	off_t ofs;
+	size_t start_blk, end_blk;
+
+	if (g_uzip_cached(gp, bp) != 0)
+		return (1);
+
+	sc = gp->softc;
+
+	bp2 = g_clone_bio(bp);
+	if (bp2 == NULL) {
+		g_io_deliver(bp, ENOMEM);
+		return (1);
+	}
+	bp2->bio_done = g_uzip_done;
+
+	cp = LIST_FIRST(&gp->consumer);
+	pp = cp->provider;
+
+	ofs = bp->bio_offset + bp->bio_completed;
+	start_blk = ofs / sc->blksz;
+	KASSERT(start_blk < sc->nblocks, ("start_blk out of range"));
+	end_blk = (ofs + bp->bio_resid + sc->blksz - 1) / sc->blksz;
+	KASSERT(end_blk <= sc->nblocks, ("end_blk out of range"));
+
+	DPRINTF(("%s/%s: %p: start=%u (%jd), end=%u (%jd)\n",
+	    __func__, gp->name, bp,
+	    (u_int)start_blk, (intmax_t)sc->offsets[start_blk],
+	    (u_int)end_blk, (intmax_t)sc->offsets[end_blk]));
+
+	bp2->bio_offset = sc->offsets[start_blk] - 
+	    sc->offsets[start_blk] % pp->sectorsize;
+	while (1) {
+		bp2->bio_length = sc->offsets[end_blk] - bp2->bio_offset;
+		bp2->bio_length = (bp2->bio_length + pp->sectorsize - 1) /
+		    pp->sectorsize * pp->sectorsize;
+		if (bp2->bio_length <= MAXPHYS)
+			break;
+
+		end_blk--;
+	}
+
+	bp2->bio_data = malloc(bp2->bio_length, M_GEOM_UZIP, M_NOWAIT);
+	if (bp2->bio_data == NULL) {
+		g_destroy_bio(bp2);
+		g_io_deliver(bp, ENOMEM);
+		return (1);
+	}
+
+	DPRINTF(("%s/%s: %p: reading %jd bytes from offset %jd\n",
+	    __func__, gp->name, bp,
+	    (intmax_t)bp2->bio_length, (intmax_t)bp2->bio_offset));
+
+	g_io_request(bp2, cp);
+	return (0);
+}
+
 static void
 g_uzip_done(struct bio *bp)
 {
-	int err;
-	struct bio *bp2;
 	z_stream zs;
-	struct g_provider *pp, *pp2;
+	struct bio *bp2;
+	struct g_provider *pp;
 	struct g_consumer *cp;
 	struct g_geom *gp;
 	struct g_uzip_softc *sc;
-	off_t iolen, pos, upos;
-	uint32_t start_blk, i;
-	size_t bsize;
+	char *data, *data2;
+	off_t ofs;
+	size_t blk, blkofs, len, ulen;
 
 	bp2 = bp->bio_parent;
-	pp = bp2->bio_to;
-	gp = pp->geom;
-	cp = LIST_FIRST(&gp->consumer);
-	pp2 = cp->provider;
+	gp = bp2->bio_to->geom;
 	sc = gp->softc;
-	DPRINTF(("%s: done\n", gp->name));
+
+	cp = LIST_FIRST(&gp->consumer);
+	pp = cp->provider;
 
 	bp2->bio_error = bp->bio_error;
 	if (bp2->bio_error != 0)
 		goto done;
 
-	/*
-	 * Uncompress data.
-	 */
+	/* Make sure there's forward progress. */
+	if (bp->bio_completed == 0) {
+		bp2->bio_error = ECANCELED;
+		goto done;
+	}
+
 	zs.zalloc = z_alloc;
 	zs.zfree = z_free;
-	err = inflateInit(&zs);
-	if (err != Z_OK) {
-		bp2->bio_error = EIO;
+	if (inflateInit(&zs) != Z_OK) {
+		bp2->bio_error = EILSEQ;
 		goto done;
 	}
-	start_blk = bp2->bio_offset / sc->blksz;
-	bsize = pp2->sectorsize;
-	iolen = bp->bio_completed;
-	pos = sc->offsets[start_blk] % bsize;
-	upos = 0;
-	DPRINTF(("%s: done: start_blk %d, pos %jd, upos %jd, iolen %jd "
-	    "(%jd, %d, %zd)\n",
-	    gp->name, start_blk, (intmax_t)pos, (intmax_t)upos,
-	    (intmax_t)iolen, (intmax_t)bp2->bio_offset, sc->blksz, bsize));
-	for (i = start_blk; upos < bp2->bio_length; i++) {
-		off_t len, ulen, uoff;
-
-		uoff = i == start_blk ? bp2->bio_offset % sc->blksz : 0;
-		ulen = MIN(sc->blksz - uoff, bp2->bio_length - upos);
-		len = sc->offsets[i + 1] - sc->offsets[i];
 
+	ofs = bp2->bio_offset + bp2->bio_completed;
+	blk = ofs / sc->blksz;
+	blkofs = ofs % sc->blksz;
+	data = bp->bio_data + sc->offsets[blk] % pp->sectorsize;
+	data2 = bp2->bio_data + bp2->bio_completed;
+	while (bp->bio_completed && bp2->bio_resid) {
+		ulen = MIN(sc->blksz - blkofs, bp2->bio_resid);
+		len = sc->offsets[blk + 1] - sc->offsets[blk];
+		DPRINTF(("%s/%s: %p/%ju: data2=%p, ulen=%u, data=%p, len=%u\n",
+		    __func__, gp->name, gp, bp->bio_completed,
+		    data2, (u_int)ulen, data, (u_int)len));
 		if (len == 0) {
 			/* All zero block: no cache update */
-			bzero(bp2->bio_data + upos, ulen);
-			upos += ulen;
-			bp2->bio_completed += ulen;
-			continue;
-		}
-		if (len > iolen) {
-			DPRINTF(("%s: done: early termination: len (%jd) > "
-			    "iolen (%jd)\n",
-			    gp->name, (intmax_t)len, (intmax_t)iolen));
-			break;
-		}
-		zs.next_in = bp->bio_data + pos;
-		zs.avail_in = len;
-		zs.next_out = sc->last_buf;
-		zs.avail_out = sc->blksz;
-		mtx_lock(&sc->last_mtx);
-		err = inflate(&zs, Z_FINISH);
-		if (err != Z_STREAM_END) {
-			sc->last_blk = -1;
+			bzero(data2, ulen);
+		} else if (len <= bp->bio_completed) {
+			zs.next_in = data;
+			zs.avail_in = len;
+			zs.next_out = sc->last_buf;
+			zs.avail_out = sc->blksz;
+			mtx_lock(&sc->last_mtx);
+			if (inflate(&zs, Z_FINISH) != Z_STREAM_END) {
+				sc->last_blk = -1;
+				mtx_unlock(&sc->last_mtx);
+				inflateEnd(&zs);
+				bp2->bio_error = EILSEQ;
+				goto done;
+			}
+			sc->last_blk = blk;
+			memcpy(data2, sc->last_buf + blkofs, ulen);
 			mtx_unlock(&sc->last_mtx);
-			DPRINTF(("%s: done: inflate failed (%jd + %jd -> %jd + %jd + %jd)\n",
-			    gp->name, (intmax_t)pos, (intmax_t)len,
-			    (intmax_t)uoff, (intmax_t)upos, (intmax_t)ulen));
-			inflateEnd(&zs);
-			bp2->bio_error = EIO;
-			goto done;
-		}
-		sc->last_blk = i;
-		DPRINTF(("%s: done: inflated %jd + %jd -> %jd + %jd + %jd\n",
-		    gp->name, (intmax_t)pos, (intmax_t)len, (intmax_t)uoff,
-		    (intmax_t)upos, (intmax_t)ulen));
-		memcpy(bp2->bio_data + upos, sc->last_buf + uoff, ulen);
-		mtx_unlock(&sc->last_mtx);
+			if (inflateReset(&zs) != Z_OK) {
+				inflateEnd(&zs);
+				bp2->bio_error = EILSEQ;
+				goto done;
+			}
+			data += len;
+		} else
+			break;
 
-		pos += len;
-		iolen -= len;
-		upos += ulen;
+		data2 += ulen;
 		bp2->bio_completed += ulen;
-		err = inflateReset(&zs);
-		if (err != Z_OK) {
-			inflateEnd(&zs);
-			bp2->bio_error = EIO;
-			goto done;
-		}
-	}
-	err = inflateEnd(&zs);
-	if (err != Z_OK) {
-		bp2->bio_error = EIO;
-		goto done;
+		bp2->bio_resid -= ulen;
+		bp->bio_completed -= len;
+		blkofs = 0;
+		blk++;
 	}
 
+	if (inflateEnd(&zs) != Z_OK)
+		bp2->bio_error = EILSEQ;
+
 done:
-	/*
-	 * Finish processing the request.
-	 */
-	DPRINTF(("%s: done: (%d, %jd, %ld)\n",
-	    gp->name, bp2->bio_error, (intmax_t)bp2->bio_completed,
-	    bp2->bio_resid));
+	/* Finish processing the request. */
 	free(bp->bio_data, M_GEOM_UZIP);
 	g_destroy_bio(bp);
-	g_io_deliver(bp2, bp2->bio_error);
+	if (bp2->bio_error != 0 || bp2->bio_resid == 0)
+		g_io_deliver(bp2, bp2->bio_error);
+	else
+		g_uzip_request(gp, bp2);
 }
 
 static void
 g_uzip_start(struct bio *bp)
 {
-	struct bio *bp2;
-	struct g_provider *pp, *pp2;
+	struct g_provider *pp;
 	struct g_geom *gp;
-	struct g_consumer *cp;
 	struct g_uzip_softc *sc;
-	uint32_t start_blk, end_blk;
-	size_t bsize;
 
 	pp = bp->bio_to;
 	gp = pp->geom;
-	DPRINTF(("%s: start (%d)\n", gp->name, bp->bio_cmd));
+
+	DPRINTF(("%s/%s: %p: cmd=%d, offset=%jd, length=%jd, buffer=%p\n",
+	    __func__, gp->name, bp, bp->bio_cmd, (intmax_t)bp->bio_offset,
+	    (intmax_t)bp->bio_length, bp->bio_data));
+
+	sc = gp->softc;
+	sc->req_total++;
 
 	if (bp->bio_cmd != BIO_READ) {
 		g_io_deliver(bp, EOPNOTSUPP);
 		return;
 	}
 
-	cp = LIST_FIRST(&gp->consumer);
-	pp2 = cp->provider;
-	sc = gp->softc;
+	bp->bio_resid = bp->bio_length;
+	bp->bio_completed = 0;
 
-	start_blk = bp->bio_offset / sc->blksz;
-	end_blk = (bp->bio_offset + bp->bio_length + sc->blksz - 1) / sc->blksz;
-	KASSERT(start_blk < sc->nblocks, ("start_blk out of range"));
-	KASSERT(end_blk <= sc->nblocks, ("end_blk out of range"));
-
-	sc->req_total++;
-	if (start_blk + 1 == end_blk) {
-		mtx_lock(&sc->last_mtx);
-		if (start_blk == sc->last_blk) {
-			off_t uoff;
-
-			uoff = bp->bio_offset % sc->blksz;
-			KASSERT(bp->bio_length <= sc->blksz - uoff,
-			    ("cached data error"));
-			memcpy(bp->bio_data, sc->last_buf + uoff,
-			    bp->bio_length);
-			sc->req_cached++;
-			mtx_unlock(&sc->last_mtx);
-
-			DPRINTF(("%s: start: cached 0 + %jd, %jd + 0 + %jd\n",
-			    gp->name, (intmax_t)bp->bio_length, (intmax_t)uoff,
-			    (intmax_t)bp->bio_length));
-			bp->bio_completed = bp->bio_length;
-			g_io_deliver(bp, 0);
-			return;
-		}
-		mtx_unlock(&sc->last_mtx);
-	}
-
-	bp2 = g_clone_bio(bp);
-	if (bp2 == NULL) {
-		g_io_deliver(bp, ENOMEM);
-		return;
-	}
-	bp2->bio_done = g_uzip_done;
-	DPRINTF(("%s: start (%d..%d), %s: %d + %jd, %s: %d + %jd\n",
-	    gp->name, start_blk, end_blk,
-	    pp->name, pp->sectorsize, (intmax_t)pp->mediasize,
-	    pp2->name, pp2->sectorsize, (intmax_t)pp2->mediasize));
-	bsize = pp2->sectorsize;
-	bp2->bio_offset = sc->offsets[start_blk] - sc->offsets[start_blk] % bsize;
-	while (1) {
-		bp2->bio_length = sc->offsets[end_blk] - bp2->bio_offset;
-		bp2->bio_length = (bp2->bio_length + bsize - 1) / bsize * bsize;
-		if (bp2->bio_length < MAXPHYS)
-			break;
-
-		end_blk--;
-		DPRINTF(("%s: bio_length (%jd) > MAXPHYS: lowering end_blk "
-		    "to %u\n", gp->name, (intmax_t)bp2->bio_length, end_blk));
-	}
-	DPRINTF(("%s: start %jd + %jd -> %ju + %ju -> %jd + %jd\n",
-	    gp->name,
-	    (intmax_t)bp->bio_offset, (intmax_t)bp->bio_length,
-	    (uintmax_t)sc->offsets[start_blk],
-	    (uintmax_t)sc->offsets[end_blk] - sc->offsets[start_blk],
-	    (intmax_t)bp2->bio_offset, (intmax_t)bp2->bio_length));
-	bp2->bio_data = malloc(bp2->bio_length, M_GEOM_UZIP, M_NOWAIT);
-	if (bp2->bio_data == NULL) {
-		g_destroy_bio(bp2);
-		g_io_deliver(bp, ENOMEM);
-		return;
-	}
-
-	g_io_request(bp2, cp);
-	DPRINTF(("%s: start ok\n", gp->name));
+	g_uzip_request(gp, bp);
 }
 
 static void
diff --git a/sys/geom/vinum/geom_vinum.c b/sys/geom/vinum/geom_vinum.c
index 15a62a1d1704..84d10a51fc86 100644
--- a/sys/geom/vinum/geom_vinum.c
+++ b/sys/geom/vinum/geom_vinum.c
@@ -50,8 +50,7 @@ SYSCTL_DECL(_kern_geom);
 static SYSCTL_NODE(_kern_geom, OID_AUTO, vinum, CTLFLAG_RW, 0,
     "GEOM_VINUM stuff");
 u_int g_vinum_debug = 0;
-TUNABLE_INT("kern.geom.vinum.debug", &g_vinum_debug);
-SYSCTL_UINT(_kern_geom_vinum, OID_AUTO, debug, CTLFLAG_RW, &g_vinum_debug, 0,
+SYSCTL_UINT(_kern_geom_vinum, OID_AUTO, debug, CTLFLAG_RWTUN, &g_vinum_debug, 0,
     "Debug level");
 
 static int	gv_create(struct g_geom *, struct gctl_req *);
diff --git a/sys/geom/virstor/g_virstor.c b/sys/geom/virstor/g_virstor.c
index 40e25d15a1ec..a1774a9c4984 100644
--- a/sys/geom/virstor/g_virstor.c
+++ b/sys/geom/virstor/g_virstor.c
@@ -84,20 +84,16 @@ static SYSCTL_NODE(_kern_geom, OID_AUTO, virstor, CTLFLAG_RW, 0,
     "GEOM_GVIRSTOR information");
 
 static u_int g_virstor_debug = 2; /* XXX: lower to 2 when released to public */
-TUNABLE_INT("kern.geom.virstor.debug", &g_virstor_debug);
-SYSCTL_UINT(_kern_geom_virstor, OID_AUTO, debug, CTLFLAG_RW, &g_virstor_debug,
+SYSCTL_UINT(_kern_geom_virstor, OID_AUTO, debug, CTLFLAG_RWTUN, &g_virstor_debug,
     0, "Debug level (2=production, 5=normal, 15=excessive)");
 
 static u_int g_virstor_chunk_watermark = 100;
-TUNABLE_INT("kern.geom.virstor.chunk_watermark", &g_virstor_chunk_watermark);
-SYSCTL_UINT(_kern_geom_virstor, OID_AUTO, chunk_watermark, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_virstor, OID_AUTO, chunk_watermark, CTLFLAG_RWTUN,
     &g_virstor_chunk_watermark, 0,
     "Minimum number of free chunks before issuing administrative warning");
 
 static u_int g_virstor_component_watermark = 1;
-TUNABLE_INT("kern.geom.virstor.component_watermark",
-    &g_virstor_component_watermark);
-SYSCTL_UINT(_kern_geom_virstor, OID_AUTO, component_watermark, CTLFLAG_RW,
+SYSCTL_UINT(_kern_geom_virstor, OID_AUTO, component_watermark, CTLFLAG_RWTUN,
     &g_virstor_component_watermark, 0,
     "Minimum number of free components before issuing administrative warning");
 
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index a244e7377c95..049354b0c213 100644
--- a/sys/i386/acpica/acpi_machdep.c
+++ b/sys/i386/acpica/acpi_machdep.c
@@ -45,8 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/nexusvar.h>
 
 uint32_t acpi_resume_beep;
-TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep);
-SYSCTL_UINT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep,
+SYSCTL_UINT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RWTUN, &acpi_resume_beep,
     0, "Beep the PC speaker when resuming");
 
 uint32_t acpi_reset_video;
diff --git a/sys/i386/acpica/acpi_wakecode.S b/sys/i386/acpica/acpi_wakecode.S
index 88f32d7c119b..ee3d5a1017e2 100644
--- a/sys/i386/acpica/acpi_wakecode.S
+++ b/sys/i386/acpica/acpi_wakecode.S
@@ -151,14 +151,7 @@ wakeup_32:
 	movl	wakeup_cr3 - wakeup_start(%ebx), %eax
 	mov	%eax, %cr3
 
-	/*
-	 * Finally, switch to long bit mode by enabling paging.  We have
-	 * to be very careful here because all the segmentation disappears
-	 * out from underneath us.  The spec says we can depend on the
-	 * subsequent pipelined branch to execute, but *only if* everthing
-	 * is still identity mapped.  If any mappings change, the pipeline
-	 * will flush.
-	 */
+	/* Enable paging. */
 	mov	%cr0, %eax
 	orl	$CR0_PG, %eax
 	mov	%eax, %cr0
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index bf5071f0dedd..a4d3bd79ee39 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -134,8 +134,7 @@ SYSCTL_INT(_machdep, OID_AUTO, apm_suspend_delay, CTLFLAG_RW, &apm_suspend_delay
 SYSCTL_INT(_machdep, OID_AUTO, apm_standby_delay, CTLFLAG_RW, &apm_standby_delay, 1, "");
 SYSCTL_INT(_debug, OID_AUTO, apm_debug, CTLFLAG_RW, &apm_debug, 0, "");
 
-TUNABLE_INT("machdep.apm_swab_batt_minutes", &apm_swab_batt_minutes);
-SYSCTL_INT(_machdep, OID_AUTO, apm_swab_batt_minutes, CTLFLAG_RW,
+SYSCTL_INT(_machdep, OID_AUTO, apm_swab_batt_minutes, CTLFLAG_RWTUN,
 	   &apm_swab_batt_minutes, 0, "Byte swap battery time value.");
 
 #ifdef PC98
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 3948bb202730..0cbf5c8c9e17 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -187,6 +187,10 @@ device		splash			# Splash screen and screen saver support
 device		sc
 options 	SC_PIXEL_MODE		# add support for the raster text mode
 
+# vt is the new video console driver
+device		vt
+device		vt_vga
+
 device		agp			# support several AGP chipsets
 
 # Power management support (see NOTES for more options)
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 2642ec033d15..3b3619758ef4 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -466,6 +466,9 @@ options 	VGA_WIDTH90		# support 90 column modes
 # Debugging.
 options 	VGA_DEBUG
 
+# vt(4) drivers.
+device		vt_vga
+
 # Linear framebuffer driver for S3 VESA 1.2 cards. Works on top of VESA.
 device		s3pci
 
diff --git a/sys/i386/conf/VT b/sys/i386/conf/VT
deleted file mode 100644
index 7d0547f11456..000000000000
--- a/sys/i386/conf/VT
+++ /dev/null
@@ -1,14 +0,0 @@
-# VT -- kernel config using the vt(9) system console instead of legacy syscons
-#                                                                              
-# For more information see https://wiki.freebsd.org/Newcons
-#
-# $FreeBSD$
-
-include		GENERIC
-ident		VT
-
-nodevice	sc
-nodevice	vga
-
-device		vt
-device		vt_vga
diff --git a/sys/i386/i386/i686_mem.c b/sys/i386/i386/i686_mem.c
index 84db1ec0d02c..2721cfb35aaa 100644
--- a/sys/i386/i386/i686_mem.c
+++ b/sys/i386/i386/i686_mem.c
@@ -65,7 +65,6 @@ static char *mem_owner_bios = "BIOS";
 	(((curr) & ~MDF_ATTRMASK) | ((new) & MDF_ATTRMASK))
 
 static int mtrrs_disabled;
-TUNABLE_INT("machdep.disable_mtrrs", &mtrrs_disabled);
 SYSCTL_INT(_machdep, OID_AUTO, disable_mtrrs, CTLFLAG_RDTUN,
     &mtrrs_disabled, 0, "Disable i686 MTRRs.");
 
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 3d92e6e56f4b..ac41c2796237 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -1231,8 +1231,7 @@ cpu_halt(void)
 void (*cpu_idle_hook)(sbintime_t) = NULL;	/* ACPI idle hook. */
 static int	cpu_ident_amdc1e = 0;	/* AMD C1E supported. */
 static int	idle_mwait = 1;		/* Use MONITOR/MWAIT for short idle. */
-TUNABLE_INT("machdep.idle_mwait", &idle_mwait);
-SYSCTL_INT(_machdep, OID_AUTO, idle_mwait, CTLFLAG_RW, &idle_mwait,
+SYSCTL_INT(_machdep, OID_AUTO, idle_mwait, CTLFLAG_RWTUN, &idle_mwait,
     0, "Use MONITOR/MWAIT for short idle");
 
 #define	STATE_RUNNING	0x0
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 222e8e286c55..e7ccdda0fae5 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -168,9 +168,7 @@ static u_long *ipi_hardclock_counts[MAXCPU];
 #endif
 
 /* Default cpu_ops implementation. */
-struct cpu_ops cpu_ops = {
-	.ipi_vectored = lapic_ipi_vectored
-};
+struct cpu_ops cpu_ops;
 
 /*
  * Local data and functions.
@@ -1208,7 +1206,7 @@ ipi_send_cpu(int cpu, u_int ipi)
 		if (old_pending)
 			return;
 	}
-	cpu_ops.ipi_vectored(ipi, cpu_apic_ids[cpu]);
+	lapic_ipi_vectored(ipi, cpu_apic_ids[cpu]);
 }
 
 /*
@@ -1459,7 +1457,7 @@ ipi_all_but_self(u_int ipi)
 		CPU_OR_ATOMIC(&ipi_nmi_pending, &other_cpus);
 
 	CTR2(KTR_SMP, "%s: ipi: %x", __func__, ipi);
-	cpu_ops.ipi_vectored(ipi, APIC_IPI_DEST_OTHERS);
+	lapic_ipi_vectored(ipi, APIC_IPI_DEST_OTHERS);
 }
 
 int
diff --git a/sys/i386/i386/mp_watchdog.c b/sys/i386/i386/mp_watchdog.c
index b1799a20b3db..b03d2614d9b5 100644
--- a/sys/i386/i386/mp_watchdog.c
+++ b/sys/i386/i386/mp_watchdog.c
@@ -68,8 +68,7 @@ static int	watchdog_dontfire = 1;
 static int	watchdog_timer = -1;
 static int	watchdog_nmi = 1;
 
-TUNABLE_INT("debug.watchdog", &watchdog_cpu);
-SYSCTL_INT(_debug, OID_AUTO, watchdog_nmi, CTLFLAG_RW, &watchdog_nmi, 0,
+SYSCTL_INT(_debug, OID_AUTO, watchdog_nmi, CTLFLAG_RWTUN, &watchdog_nmi, 0,
     "IPI the boot processor with an NMI to enter the debugger");
 
 static struct callout	watchdog_callout;
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 2515f7fec7bc..06d0ab8bc7da 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -225,8 +225,8 @@ SYSCTL_INT(_vm_pmap, OID_AUTO, pat_works, CTLFLAG_RD, &pat_works, 1,
     "Is page attribute table fully functional?");
 
 static int pg_ps_enabled = 1;
-SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RDTUN, &pg_ps_enabled, 0,
-    "Are large page mappings enabled?");
+SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
+    &pg_ps_enabled, 0, "Are large page mappings enabled?");
 
 #define	PAT_INDEX_SIZE	8
 static int pat_index[PAT_INDEX_SIZE];	/* cache mode to PAT index conversion */
@@ -331,9 +331,9 @@ static void pmap_update_pde(pmap_t pmap, vm_offset_t va, pd_entry_t *pde,
     pd_entry_t newpde);
 static void pmap_update_pde_invalidate(vm_offset_t va, pd_entry_t newpde);
 
-static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags);
+static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, u_int flags);
 
-static vm_page_t _pmap_allocpte(pmap_t pmap, u_int ptepindex, int flags);
+static vm_page_t _pmap_allocpte(pmap_t pmap, u_int ptepindex, u_int flags);
 static void _pmap_unwire_ptp(pmap_t pmap, vm_page_t m, struct spglist *free);
 static pt_entry_t *pmap_pte_quick(pmap_t pmap, vm_offset_t va);
 static void pmap_pte_release(pt_entry_t *pte);
@@ -1286,6 +1286,13 @@ pmap_pte_release(pt_entry_t *pte)
 		mtx_unlock(&PMAP2mutex);
 }
 
+/*
+ * NB:  The sequence of updating a page table followed by accesses to the
+ * corresponding pages is subject to the situation described in the "AMD64
+ * Architecture Programmer's Manual Volume 2: System Programming" rev. 3.23,
+ * "7.3.1 Special Coherency Considerations".  Therefore, issuing the INVLPG
+ * right after modifying the PTE bits is crucial.
+ */
 static __inline void
 invlcaddr(void *caddr)
 {
@@ -1811,21 +1818,17 @@ pmap_pinit(pmap_t pmap)
  * mapped correctly.
  */
 static vm_page_t
-_pmap_allocpte(pmap_t pmap, u_int ptepindex, int flags)
+_pmap_allocpte(pmap_t pmap, u_int ptepindex, u_int flags)
 {
 	vm_paddr_t ptepa;
 	vm_page_t m;
 
-	KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT ||
-	    (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK,
-	    ("_pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK"));
-
 	/*
 	 * Allocate a page table page.
 	 */
 	if ((m = vm_page_alloc(NULL, ptepindex, VM_ALLOC_NOOBJ |
 	    VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) {
-		if (flags & M_WAITOK) {
+		if ((flags & PMAP_ENTER_NOSLEEP) == 0) {
 			PMAP_UNLOCK(pmap);
 			rw_wunlock(&pvh_global_lock);
 			VM_WAIT;
@@ -1857,16 +1860,12 @@ _pmap_allocpte(pmap_t pmap, u_int ptepindex, int flags)
 }
 
 static vm_page_t
-pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags)
+pmap_allocpte(pmap_t pmap, vm_offset_t va, u_int flags)
 {
 	u_int ptepindex;
 	pd_entry_t ptepa;
 	vm_page_t m;
 
-	KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT ||
-	    (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK,
-	    ("pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK"));
-
 	/*
 	 * Calculate pagetable page index
 	 */
@@ -1899,7 +1898,7 @@ pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags)
 		 * been deallocated. 
 		 */
 		m = _pmap_allocpte(pmap, ptepindex, flags);
-		if (m == NULL && (flags & M_WAITOK))
+		if (m == NULL && (flags & PMAP_ENTER_NOSLEEP) == 0)
 			goto retry;
 	}
 	return (m);
@@ -2368,7 +2367,7 @@ free_pv_chunk(struct pv_chunk *pc)
 	/* entire chunk is free, return it */
 	m = PHYS_TO_VM_PAGE(pmap_kextract((vm_offset_t)pc));
 	pmap_qremove((vm_offset_t)pc, 1);
-	vm_page_unwire(m, 0);
+	vm_page_unwire(m, PQ_INACTIVE);
 	vm_page_free(m);
 	pmap_ptelist_free(&pv_vafree, (vm_offset_t)pc);
 }
@@ -3451,9 +3450,9 @@ pmap_promote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va)
  *	or lose information.  That is, this routine must actually
  *	insert this page into the given map NOW.
  */
-void
-pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
-    vm_prot_t prot, boolean_t wired)
+int
+pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
+    u_int flags, int8_t psind)
 {
 	pd_entry_t *pde;
 	pt_entry_t *pte;
@@ -3461,17 +3460,18 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 	pv_entry_t pv;
 	vm_paddr_t opa, pa;
 	vm_page_t mpte, om;
-	boolean_t invlva;
+	boolean_t invlva, wired;
 
 	va = trunc_page(va);
+	mpte = NULL;
+	wired = (flags & PMAP_ENTER_WIRED) != 0;
+
 	KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig"));
 	KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS,
 	    ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%x)",
 	    va));
 	if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m))
-		VM_OBJECT_ASSERT_WLOCKED(m->object);
-
-	mpte = NULL;
+		VM_OBJECT_ASSERT_LOCKED(m->object);
 
 	rw_wlock(&pvh_global_lock);
 	PMAP_LOCK(pmap);
@@ -3482,7 +3482,15 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 	 * resident, we are creating it here.
 	 */
 	if (va < VM_MAXUSER_ADDRESS) {
-		mpte = pmap_allocpte(pmap, va, M_WAITOK);
+		mpte = pmap_allocpte(pmap, va, flags);
+		if (mpte == NULL) {
+			KASSERT((flags & PMAP_ENTER_NOSLEEP) != 0,
+			    ("pmap_allocpte failed with sleep allowed"));
+			sched_unpin();
+			rw_wunlock(&pvh_global_lock);
+			PMAP_UNLOCK(pmap);
+			return (KERN_RESOURCE_SHORTAGE);
+		}
 	}
 
 	pde = pmap_pde(pmap, va);
@@ -3600,7 +3608,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 	 */
 	if ((origpte & ~(PG_M|PG_A)) != newpte) {
 		newpte |= PG_A;
-		if ((access & VM_PROT_WRITE) != 0)
+		if ((flags & VM_PROT_WRITE) != 0)
 			newpte |= PG_M;
 		if (origpte & PG_V) {
 			invlva = FALSE;
@@ -3645,6 +3653,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 	sched_unpin();
 	rw_wunlock(&pvh_global_lock);
 	PMAP_UNLOCK(pmap);
+	return (KERN_SUCCESS);
 }
 
 /*
@@ -3810,7 +3819,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m,
 				mpte->wire_count++;
 			} else {
 				mpte = _pmap_allocpte(pmap, ptepindex,
-				    M_NOWAIT);
+				    PMAP_ENTER_NOSLEEP);
 				if (mpte == NULL)
 					return (mpte);
 			}
@@ -3961,59 +3970,100 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object,
 }
 
 /*
- *	Routine:	pmap_change_wiring
- *	Function:	Change the wiring attribute for a map/virtual-address
- *			pair.
- *	In/out conditions:
- *			The mapping must already exist in the pmap.
+ *	Clear the wired attribute from the mappings for the specified range of
+ *	addresses in the given pmap.  Every valid mapping within that range
+ *	must have the wired attribute set.  In contrast, invalid mappings
+ *	cannot have the wired attribute set, so they are ignored.
+ *
+ *	The wired attribute of the page table entry is not a hardware feature,
+ *	so there is no need to invalidate any TLB entries.
  */
 void
-pmap_change_wiring(pmap_t pmap, vm_offset_t va, boolean_t wired)
+pmap_unwire(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
+	vm_offset_t pdnxt;
 	pd_entry_t *pde;
 	pt_entry_t *pte;
-	boolean_t are_queues_locked;
+	boolean_t pv_lists_locked;
 
-	are_queues_locked = FALSE;
-retry:
-	PMAP_LOCK(pmap);
-	pde = pmap_pde(pmap, va);
-	if ((*pde & PG_PS) != 0) {
-		if (!wired != ((*pde & PG_W) == 0)) {
-			if (!are_queues_locked) {
-				are_queues_locked = TRUE;
-				if (!rw_try_wlock(&pvh_global_lock)) {
-					PMAP_UNLOCK(pmap);
-					rw_wlock(&pvh_global_lock);
-					goto retry;
-				}
-			}
-			if (!pmap_demote_pde(pmap, pde, va))
-				panic("pmap_change_wiring: demotion failed");
-		} else
-			goto out;
+	if (pmap_is_current(pmap))
+		pv_lists_locked = FALSE;
+	else {
+		pv_lists_locked = TRUE;
+resume:
+		rw_wlock(&pvh_global_lock);
+		sched_pin();
 	}
-	pte = pmap_pte(pmap, va);
+	PMAP_LOCK(pmap);
+	for (; sva < eva; sva = pdnxt) {
+		pdnxt = (sva + NBPDR) & ~PDRMASK;
+		if (pdnxt < sva)
+			pdnxt = eva;
+		pde = pmap_pde(pmap, sva);
+		if ((*pde & PG_V) == 0)
+			continue;
+		if ((*pde & PG_PS) != 0) {
+			if ((*pde & PG_W) == 0)
+				panic("pmap_unwire: pde %#jx is missing PG_W",
+				    (uintmax_t)*pde);
 
-	if (wired && !pmap_pte_w(pte))
-		pmap->pm_stats.wired_count++;
-	else if (!wired && pmap_pte_w(pte))
-		pmap->pm_stats.wired_count--;
+			/*
+			 * Are we unwiring the entire large page?  If not,
+			 * demote the mapping and fall through.
+			 */
+			if (sva + NBPDR == pdnxt && eva >= pdnxt) {
+				/*
+				 * Regardless of whether a pde (or pte) is 32
+				 * or 64 bits in size, PG_W is among the least
+				 * significant 32 bits.
+				 */
+				atomic_clear_int((u_int *)pde, PG_W);
+				pmap->pm_stats.wired_count -= NBPDR /
+				    PAGE_SIZE;
+				continue;
+			} else {
+				if (!pv_lists_locked) {
+					pv_lists_locked = TRUE;
+					if (!rw_try_wlock(&pvh_global_lock)) {
+						PMAP_UNLOCK(pmap);
+						/* Repeat sva. */
+						goto resume;
+					}
+					sched_pin();
+				}
+				if (!pmap_demote_pde(pmap, pde, sva))
+					panic("pmap_unwire: demotion failed");
+			}
+		}
+		if (pdnxt > eva)
+			pdnxt = eva;
+		for (pte = pmap_pte_quick(pmap, sva); sva != pdnxt; pte++,
+		    sva += PAGE_SIZE) {
+			if ((*pte & PG_V) == 0)
+				continue;
+			if ((*pte & PG_W) == 0)
+				panic("pmap_unwire: pte %#jx is missing PG_W",
+				    (uintmax_t)*pte);
 
-	/*
-	 * Wiring is not a hardware characteristic so there is no need to
-	 * invalidate TLB.
-	 */
-	pmap_pte_set_w(pte, wired);
-	pmap_pte_release(pte);
-out:
-	if (are_queues_locked)
+			/*
+			 * PG_W must be cleared atomically.  Although the pmap
+			 * lock synchronizes access to PG_W, another processor
+			 * could be setting PG_M and/or PG_A concurrently.
+			 *
+			 * PG_W is among the least significant 32 bits.
+			 */
+			atomic_clear_int((u_int *)pte, PG_W);
+			pmap->pm_stats.wired_count--;
+		}
+	}
+	if (pv_lists_locked) {
+		sched_unpin();
 		rw_wunlock(&pvh_global_lock);
+	}
 	PMAP_UNLOCK(pmap);
 }
 
 
-
 /*
  *	Copy the range specified by src_addr/len
  *	from the source map to the range dst_addr/len
@@ -4095,7 +4145,7 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr, vm_size_t len,
 			 */
 			if ((ptetemp & PG_MANAGED) != 0) {
 				dstmpte = pmap_allocpte(dst_pmap, addr,
-				    M_NOWAIT);
+				    PMAP_ENTER_NOSLEEP);
 				if (dstmpte == NULL)
 					goto out;
 				dst_pte = pmap_pte_quick(dst_pmap, addr);
@@ -4240,12 +4290,12 @@ pmap_copy_page(vm_page_t src, vm_page_t dst)
 	if (*sysmaps->CMAP2)
 		panic("pmap_copy_page: CMAP2 busy");
 	sched_pin();
-	invlpg((u_int)sysmaps->CADDR1);
-	invlpg((u_int)sysmaps->CADDR2);
 	*sysmaps->CMAP1 = PG_V | VM_PAGE_TO_PHYS(src) | PG_A |
 	    pmap_cache_bits(src->md.pat_mode, 0);
+	invlcaddr(sysmaps->CADDR1);
 	*sysmaps->CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M |
 	    pmap_cache_bits(dst->md.pat_mode, 0);
+	invlcaddr(sysmaps->CADDR2);
 	bcopy(sysmaps->CADDR1, sysmaps->CADDR2, PAGE_SIZE);
 	*sysmaps->CMAP1 = 0;
 	*sysmaps->CMAP2 = 0;
@@ -4273,8 +4323,6 @@ pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset, vm_page_t mb[],
 		panic("pmap_copy_pages: CMAP2 busy");
 	sched_pin();
 	while (xfersize > 0) {
-		invlpg((u_int)sysmaps->CADDR1);
-		invlpg((u_int)sysmaps->CADDR2);
 		a_pg = ma[a_offset >> PAGE_SHIFT];
 		a_pg_offset = a_offset & PAGE_MASK;
 		cnt = min(xfersize, PAGE_SIZE - a_pg_offset);
@@ -4282,9 +4330,11 @@ pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset, vm_page_t mb[],
 		b_pg_offset = b_offset & PAGE_MASK;
 		cnt = min(cnt, PAGE_SIZE - b_pg_offset);
 		*sysmaps->CMAP1 = PG_V | VM_PAGE_TO_PHYS(a_pg) | PG_A |
-		    pmap_cache_bits(b_pg->md.pat_mode, 0);
+		    pmap_cache_bits(a_pg->md.pat_mode, 0);
+		invlcaddr(sysmaps->CADDR1);
 		*sysmaps->CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(b_pg) | PG_A |
 		    PG_M | pmap_cache_bits(b_pg->md.pat_mode, 0);
+		invlcaddr(sysmaps->CADDR2);
 		a_cp = sysmaps->CADDR1 + a_pg_offset;
 		b_cp = sysmaps->CADDR2 + b_pg_offset;
 		bcopy(a_cp, b_cp, cnt);
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 83cb699b0a7d..4245748efa4b 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -164,19 +164,14 @@ sysarch(td, uap)
 		break;
 	case I386_SET_LDT:
 		if (kargs.largs.descs != NULL) {
-			lp = (union descriptor *)kmem_malloc(kernel_arena,
+			lp = (union descriptor *)malloc(
 			    kargs.largs.num * sizeof(union descriptor),
-			    M_WAITOK);
-			if (lp == NULL) {
-				error = ENOMEM;
-				break;
-			}
+			    M_TEMP, M_WAITOK);
 			error = copyin(kargs.largs.descs, lp,
 			    kargs.largs.num * sizeof(union descriptor));
 			if (error == 0)
 				error = i386_set_ldt(td, &kargs.largs, lp);
-			kmem_free(kernel_arena, (vm_offset_t)lp,
-			    kargs.largs.num * sizeof(union descriptor));
+			free(lp, M_TEMP);
 		} else {
 			error = i386_set_ldt(td, &kargs.largs, NULL);
 		}
@@ -300,10 +295,7 @@ i386_extend_pcb(struct thread *td)
 	};
 
 	ext = (struct pcb_ext *)kmem_malloc(kernel_arena, ctob(IOPAGES+1),
-	    M_WAITOK);
-	if (ext == 0)
-		return (ENOMEM);
-	bzero(ext, sizeof(struct pcb_ext)); 
+	    M_WAITOK | M_ZERO);
 	/* -16 is so we can convert a trapframe into vm86trapframe inplace */
 	ext->ext_tss.tss_esp0 = td->td_kstack + ctob(KSTACK_PAGES) -
 	    sizeof(struct pcb) - 16;
@@ -474,12 +466,7 @@ user_ldt_alloc(struct mdproc *mdp, int len)
  
         new_ldt->ldt_len = len = NEW_MAX_LD(len); 
         new_ldt->ldt_base = (caddr_t)kmem_malloc(kernel_arena, 
-                round_page(len * sizeof(union descriptor)), M_WAITOK);
-        if (new_ldt->ldt_base == NULL) { 
-                free(new_ldt, M_SUBPROC);
-		mtx_lock_spin(&dt_lock);
-                return (NULL);
-        } 
+	    round_page(len * sizeof(union descriptor)), M_WAITOK);
         new_ldt->ldt_refcnt = 1; 
         new_ldt->ldt_active = 0; 
  
@@ -514,12 +501,7 @@ user_ldt_alloc(struct mdproc *mdp, int len)
 
 	new_ldt->ldt_len = len = NEW_MAX_LD(len);
 	new_ldt->ldt_base = (caddr_t)kmem_malloc(kernel_arena,
-		len * sizeof(union descriptor), M_WAITOK);
-	if (new_ldt->ldt_base == NULL) {
-		free(new_ldt, M_SUBPROC);
-		mtx_lock_spin(&dt_lock);
-		return (NULL);
-	}
+	    len * sizeof(union descriptor), M_WAITOK);
 	new_ldt->ldt_refcnt = 1;
 	new_ldt->ldt_active = 0;
 
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 97254f25bde4..e7fb99584de3 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -158,14 +158,12 @@ extern int has_f00f_bug;
 
 #ifdef KDB
 static int kdb_on_nmi = 1;
-SYSCTL_INT(_machdep, OID_AUTO, kdb_on_nmi, CTLFLAG_RW,
+SYSCTL_INT(_machdep, OID_AUTO, kdb_on_nmi, CTLFLAG_RWTUN,
 	&kdb_on_nmi, 0, "Go to KDB on NMI");
-TUNABLE_INT("machdep.kdb_on_nmi", &kdb_on_nmi);
 #endif
 static int panic_on_nmi = 1;
-SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW,
+SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RWTUN,
 	&panic_on_nmi, 0, "Panic on NMI");
-TUNABLE_INT("machdep.panic_on_nmi", &panic_on_nmi);
 static int prot_fault_translation = 0;
 SYSCTL_INT(_machdep, OID_AUTO, prot_fault_translation, CTLFLAG_RW,
 	&prot_fault_translation, 0, "Select signal to deliver on protection fault");
@@ -248,7 +246,7 @@ trap(struct trapframe *frame)
 	 * flag is cleared and finally re-scheduling is enabled.
 	 */
 	if ((type == T_PROTFLT || type == T_PAGEFLT) &&
-	    dtrace_trap_func != NULL && (*dtrace_trap_func)(frame, type))
+	    dtrace_trap_func != NULL && (*dtrace_trap_func)(frame))
 		goto out;
 #endif
 
@@ -368,6 +366,10 @@ trap(struct trapframe *frame)
 			i = SIGBUS;
 			ucode = BUS_OBJERR;
 			break;
+		case T_ALIGNFLT:
+			i = SIGBUS;
+			ucode = BUS_ADRALN;
+			break;
 		case T_DOUBLEFLT:	/* double fault */
 		default:
 			i = SIGBUS;
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 78cc9c91958a..9c875484edee 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -118,38 +118,6 @@ static u_int	cpu_reset_proxyid;
 static volatile u_int	cpu_reset_proxy_active;
 #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;
-
 extern int	_ucodesel, _udatasel;
 
 /*
@@ -749,122 +717,13 @@ cpu_reset_real()
 	while(1);
 }
 
-/*
- * 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;
-
-	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);
-}
-
-/*
- * Invalidate the cache lines that may belong to the page, if
- * (possibly old) mapping of the page by sf buffer exists.  Returns
- * TRUE when mapping was found and cache invalidated.
- */
-boolean_t
-sf_buf_invalidate_cache(vm_page_t m)
-{
-	struct sf_head *hash_list;
-	struct sf_buf *sf;
-	boolean_t ret;
-
-	hash_list = &sf_buf_active[SF_BUF_HASH(m)];
-	ret = FALSE;
-	mtx_lock(&sf_buf_lock);
-	LIST_FOREACH(sf, hash_list, list_entry) {
-		if (sf->m == m) {
-			/*
-			 * Use pmap_qenter to update the pte for
-			 * existing mapping, in particular, the PAT
-			 * settings are recalculated.
-			 */
-			pmap_qenter(sf->kva, &m, 1);
-			pmap_invalidate_cache_range(sf->kva, sf->kva +
-			    PAGE_SIZE);
-			ret = TRUE;
-			break;
-		}
-	}
-	mtx_unlock(&sf_buf_lock);
-	return (ret);
-}
-
 /*
  * Get an sf_buf from the freelist.  May block if none are available.
  */
-struct sf_buf *
-sf_buf_alloc(struct vm_page *m, int flags)
+void
+sf_buf_map(struct sf_buf *sf, int flags)
 {
 	pt_entry_t opte, *ptep;
-	struct sf_head *hash_list;
-	struct sf_buf *sf;
-#ifdef SMP
-	cpuset_t other_cpus;
-	u_int cpuid;
-#endif
-	int error;
-
-	KASSERT(curthread->td_pinned > 0 || (flags & SFB_CPUPRIVATE) == 0,
-	    ("sf_buf_alloc(SFB_CPUPRIVATE): curthread not pinned"));
-	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);
-			}
-#ifdef SMP
-			goto shootdown;	
-#else
-			goto done;
-#endif
-		}
-	}
-	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);
 
 	/*
 	 * Update the sf_buf's virtual-to-physical mapping, flushing the
@@ -876,11 +735,11 @@ sf_buf_alloc(struct vm_page *m, int flags)
 	ptep = vtopte(sf->kva);
 	opte = *ptep;
 #ifdef XEN
-       PT_SET_MA(sf->kva, xpmap_ptom(VM_PAGE_TO_PHYS(m)) | pgeflag
-	   | PG_RW | PG_V | pmap_cache_bits(m->md.pat_mode, 0));
+       PT_SET_MA(sf->kva, xpmap_ptom(VM_PAGE_TO_PHYS(sf->m)) | pgeflag
+	   | PG_RW | PG_V | pmap_cache_bits(sf->m->md.pat_mode, 0));
 #else
-	*ptep = VM_PAGE_TO_PHYS(m) | pgeflag | PG_RW | PG_V |
-	    pmap_cache_bits(m->md.pat_mode, 0);
+	*ptep = VM_PAGE_TO_PHYS(sf->m) | pgeflag | PG_RW | PG_V |
+	    pmap_cache_bits(sf->m->md.pat_mode, 0);
 #endif
 
 	/*
@@ -892,7 +751,21 @@ sf_buf_alloc(struct vm_page *m, int flags)
 #ifdef SMP
 	if ((opte & (PG_V | PG_A)) ==  (PG_V | PG_A))
 		CPU_ZERO(&sf->cpumask);
-shootdown:
+
+	sf_buf_shootdown(sf, flags);
+#else
+	if ((opte & (PG_V | PG_A)) ==  (PG_V | PG_A))
+		pmap_invalidate_page(kernel_pmap, sf->kva);
+#endif
+}
+
+#ifdef SMP
+void
+sf_buf_shootdown(struct sf_buf *sf, int flags)
+{
+	cpuset_t other_cpus;
+	u_int cpuid;
+
 	sched_pin();
 	cpuid = PCPU_GET(cpuid);
 	if (!CPU_ISSET(cpuid, &sf->cpumask)) {
@@ -909,42 +782,50 @@ sf_buf_alloc(struct vm_page *m, int flags)
 		}
 	}
 	sched_unpin();
-#else
-	if ((opte & (PG_V | PG_A)) ==  (PG_V | PG_A))
-		pmap_invalidate_page(kernel_pmap, sf->kva);
+}
 #endif
-done:
-	mtx_unlock(&sf_buf_lock);
-	return (sf);
+
+/*
+ * MD part of sf_buf_free().
+ */
+int
+sf_buf_unmap(struct sf_buf *sf)
+{
+#ifdef XEN
+	/*
+	 * Xen doesn't like having dangling R/W mappings
+	 */
+	pmap_qremove(sf->kva, 1);
+	return (1);
+#else
+	return (0);
+#endif
+}
+
+static void
+sf_buf_invalidate(struct sf_buf *sf)
+{
+	vm_page_t m = sf->m;
+
+	/*
+	 * Use pmap_qenter to update the pte for
+	 * existing mapping, in particular, the PAT
+	 * settings are recalculated.
+	 */
+	pmap_qenter(sf->kva, &m, 1);
+	pmap_invalidate_cache_range(sf->kva, sf->kva + PAGE_SIZE);
 }
 
 /*
- * 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).
+ * Invalidate the cache lines that may belong to the page, if
+ * (possibly old) mapping of the page by sf buffer exists.  Returns
+ * TRUE when mapping was found and cache invalidated.
  */
-void
-sf_buf_free(struct sf_buf *sf)
+boolean_t
+sf_buf_invalidate_cache(vm_page_t m)
 {
 
-	mtx_lock(&sf_buf_lock);
-	sf->ref_count--;
-	if (sf->ref_count == 0) {
-		TAILQ_INSERT_TAIL(&sf_buf_freelist, sf, free_entry);
-		nsfbufsused--;
-#ifdef XEN
-/*
- * Xen doesn't like having dangling R/W mappings
- */
-		pmap_qremove(sf->kva, 1);
-		sf->m = NULL;
-		LIST_REMOVE(sf, list_entry);
-#endif
-		if (sf_buf_alloc_want > 0)
-			wakeup(&sf_buf_freelist);
-	}
-	mtx_unlock(&sf_buf_lock);
+	return (sf_buf_process_page(m, sf_buf_invalidate));
 }
 
 /*
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index 49a8815a6faa..e0662450d039 100644
--- a/sys/i386/include/cpu.h
+++ b/sys/i386/include/cpu.h
@@ -63,7 +63,6 @@
 struct cpu_ops {
 	void (*cpu_init)(void);
 	void (*cpu_resume)(void);
-	void (*ipi_vectored)(u_int, int);
 };
 
 extern struct	cpu_ops cpu_ops;
diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h
index 33a47b368cc3..19e9b3136941 100644
--- a/sys/i386/include/npx.h
+++ b/sys/i386/include/npx.h
@@ -71,6 +71,7 @@ int	is_fpu_kern_thread(u_int flags);
  */
 #define	FPU_KERN_NORMAL	0x0000
 #define	FPU_KERN_NOWAIT	0x0001
+#define	FPU_KERN_KTHR	0x0002
 
 #endif
 
diff --git a/sys/i386/include/sf_buf.h b/sys/i386/include/sf_buf.h
index 20296b3c1537..f1f1cd3ee243 100644
--- a/sys/i386/include/sf_buf.h
+++ b/sys/i386/include/sf_buf.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2003, 2005 Alan L. Cox <alc@cs.rice.edu>
+ * Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,39 +29,8 @@
 #ifndef _MACHINE_SF_BUF_H_
 #define _MACHINE_SF_BUF_H_
 
-#include <sys/_cpuset.h>
-#include <sys/queue.h>
-
-struct vm_page;
-
-struct sf_buf {
-	LIST_ENTRY(sf_buf) list_entry;	/* list of buffers */
-	TAILQ_ENTRY(sf_buf) free_entry;	/* list of buffers */
-	struct		vm_page *m;	/* currently mapped page */
-	vm_offset_t	kva;		/* va of mapping */
-	int		ref_count;	/* usage of this mapping */
-#ifdef SMP
-	cpuset_t	cpumask;	/* cpus on which mapping is valid */
-#endif
-};
-
-struct sf_buf * sf_buf_alloc(struct vm_page *m, int flags);
-void sf_buf_free(struct sf_buf *sf);
-
-static __inline vm_offset_t
-sf_buf_kva(struct sf_buf *sf)
-{
-
-	return (sf->kva);
-}
-
-static __inline struct vm_page *
-sf_buf_page(struct sf_buf *sf)
-{
-
-	return (sf->m);
-}
-
-boolean_t sf_buf_invalidate_cache(vm_page_t m);
+void sf_buf_map(struct sf_buf *, int);
+int sf_buf_unmap(struct sf_buf *);
+boolean_t sf_buf_invalidate_cache(vm_page_t);
 
 #endif /* !_MACHINE_SF_BUF_H_ */
diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h
index c086d76d49aa..975b30231b62 100644
--- a/sys/i386/include/vmparam.h
+++ b/sys/i386/include/vmparam.h
@@ -198,4 +198,9 @@
 #define VM_MAX_AUTOTUNE_MAXUSERS 384
 #endif
 
+#define	SFBUF
+#define	SFBUF_MAP
+#define	SFBUF_CPUSET
+#define	SFBUF_PROCESS_PAGE
+
 #endif /* _MACHINE_VMPARAM_H_ */
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 622e5b7f15bb..dec73660f8f1 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -1008,6 +1008,7 @@ static MALLOC_DEFINE(M_FPUKERN_CTX, "fpukern_ctx",
 #define	XSAVE_AREA_ALIGN	64
 
 #define	FPU_KERN_CTX_NPXINITDONE 0x01
+#define	FPU_KERN_CTX_DUMMY	 0x02
 
 struct fpu_kern_ctx {
 	union savefpu *prev;
@@ -1051,6 +1052,10 @@ fpu_kern_enter(struct thread *td, struct fpu_kern_ctx *ctx, u_int flags)
 {
 	struct pcb *pcb;
 
+	if ((flags & FPU_KERN_KTHR) != 0 && is_fpu_kern_thread(0)) {
+		ctx->flags = FPU_KERN_CTX_DUMMY;
+		return (0);
+	}
 	pcb = td->td_pcb;
 	KASSERT(!PCB_USER_FPU(pcb) || pcb->pcb_save == &pcb->pcb_user_save,
 	    ("mangled pcb_save"));
@@ -1070,6 +1075,8 @@ fpu_kern_leave(struct thread *td, struct fpu_kern_ctx *ctx)
 {
 	struct pcb *pcb;
 
+	if (is_fpu_kern_thread(0) && (ctx->flags & FPU_KERN_CTX_DUMMY) != 0)
+		return (0);
 	pcb = td->td_pcb;
 	critical_enter();
 	if (curthread == PCPU_GET(fpcurthread))
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 60df6a2c1247..0ad67910e756 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -1058,7 +1058,7 @@ static Elf32_Brandinfo linux_brand = {
 	.sysvec		= &elf_linux_sysvec,
 	.interp_newpath	= NULL,
 	.brand_note	= &linux_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE | BI_CAN_EXEC_INTERP 
+	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
 static Elf32_Brandinfo linux_glibc2brand = {
@@ -1070,7 +1070,7 @@ static Elf32_Brandinfo linux_glibc2brand = {
 	.sysvec		= &elf_linux_sysvec,
 	.interp_newpath	= NULL,
 	.brand_note	= &linux_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE | BI_CAN_EXEC_INTERP 
+	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
 };
 
 Elf32_Brandinfo *linux_brandlist[] = {
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index cce4981d9c9d..5d57e89334a1 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -86,7 +86,6 @@ static int cfgmech;
 static int devmax;
 static struct mtx pcicfg_mtx;
 static int mcfg_enable = 1;
-TUNABLE_INT("hw.pci.mcfg", &mcfg_enable);
 SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0,
     "Enable support for PCI-e memory mapped config access");
 
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index c275de094f5c..0d64cabf4aab 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -117,7 +117,6 @@ SYSCTL_DECL(_hw_pci);
 #endif
 
 static uint32_t pci_irq_override_mask = PCI_IRQ_OVERRIDE_MASK;
-TUNABLE_INT("hw.pci.irq_override_mask", &pci_irq_override_mask);
 SYSCTL_INT(_hw_pci, OID_AUTO, irq_override_mask, CTLFLAG_RDTUN,
     &pci_irq_override_mask, PCI_IRQ_OVERRIDE_MASK,
     "Mask of allowed irqs to try to route when it has no good clue about\n"
diff --git a/sys/i386/xen/pmap.c b/sys/i386/xen/pmap.c
index ece4857b6ebf..3cc8937f39cb 100644
--- a/sys/i386/xen/pmap.c
+++ b/sys/i386/xen/pmap.c
@@ -298,9 +298,9 @@ static void pmap_remove_entry(struct pmap *pmap, vm_page_t m,
 static boolean_t pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va,
     vm_page_t m);
 
-static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags);
+static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, u_int flags);
 
-static vm_page_t _pmap_allocpte(pmap_t pmap, u_int ptepindex, int flags);
+static vm_page_t _pmap_allocpte(pmap_t pmap, u_int ptepindex, u_int flags);
 static void _pmap_unwire_ptp(pmap_t pmap, vm_page_t m, vm_page_t *free);
 static pt_entry_t *pmap_pte_quick(pmap_t pmap, vm_offset_t va);
 static void pmap_pte_release(pt_entry_t *pte);
@@ -1546,21 +1546,17 @@ pmap_pinit(pmap_t pmap)
  * mapped correctly.
  */
 static vm_page_t
-_pmap_allocpte(pmap_t pmap, u_int ptepindex, int flags)
+_pmap_allocpte(pmap_t pmap, u_int ptepindex, u_int flags)
 {
 	vm_paddr_t ptema;
 	vm_page_t m;
 
-	KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT ||
-	    (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK,
-	    ("_pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK"));
-
 	/*
 	 * Allocate a page table page.
 	 */
 	if ((m = vm_page_alloc(NULL, ptepindex, VM_ALLOC_NOOBJ |
 	    VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) {
-		if (flags & M_WAITOK) {
+		if ((flags & PMAP_ENTER_NOSLEEP) == 0) {
 			PMAP_UNLOCK(pmap);
 			rw_wunlock(&pvh_global_lock);
 			VM_WAIT;
@@ -1595,16 +1591,12 @@ _pmap_allocpte(pmap_t pmap, u_int ptepindex, int flags)
 }
 
 static vm_page_t
-pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags)
+pmap_allocpte(pmap_t pmap, vm_offset_t va, u_int flags)
 {
 	u_int ptepindex;
 	pd_entry_t ptema;
 	vm_page_t m;
 
-	KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT ||
-	    (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK,
-	    ("pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK"));
-
 	/*
 	 * Calculate pagetable page index
 	 */
@@ -1644,7 +1636,7 @@ pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags)
 		CTR3(KTR_PMAP, "pmap_allocpte: pmap=%p va=0x%08x flags=0x%x",
 		    pmap, va, flags);
 		m = _pmap_allocpte(pmap, ptepindex, flags);
-		if (m == NULL && (flags & M_WAITOK))
+		if (m == NULL && (flags & PMAP_ENTER_NOSLEEP) == 0)
 			goto retry;
 
 		KASSERT(pmap->pm_pdir[ptepindex], ("ptepindex=%d did not get mapped", ptepindex));
@@ -2144,7 +2136,7 @@ free_pv_chunk(struct pv_chunk *pc)
 	/* entire chunk is free, return it */
 	m = PHYS_TO_VM_PAGE(pmap_kextract((vm_offset_t)pc));
 	pmap_qremove((vm_offset_t)pc, 1);
-	vm_page_unwire(m, 0);
+	vm_page_unwire(m, PQ_INACTIVE);
 	vm_page_free(m);
 	pmap_ptelist_free(&pv_vafree, (vm_offset_t)pc);
 }
@@ -2643,9 +2635,9 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
  *	or lose information.  That is, this routine must actually
  *	insert this page into the given map NOW.
  */
-void
-pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
-    vm_prot_t prot, boolean_t wired)
+int
+pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
+    u_int flags, int8_t psind __unused)
 {
 	pd_entry_t *pde;
 	pt_entry_t *pte;
@@ -2653,19 +2645,21 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 	pv_entry_t pv;
 	vm_paddr_t opa, pa;
 	vm_page_t mpte, om;
-	boolean_t invlva;
+	boolean_t invlva, wired;
 
-	CTR6(KTR_PMAP, "pmap_enter: pmap=%08p va=0x%08x access=0x%x ma=0x%08x prot=0x%x wired=%d",
-	    pmap, va, access, VM_PAGE_TO_MACH(m), prot, wired);
+	CTR5(KTR_PMAP,
+	    "pmap_enter: pmap=%08p va=0x%08x ma=0x%08x prot=0x%x flags=0x%x",
+	    pmap, va, VM_PAGE_TO_MACH(m), prot, flags);
 	va = trunc_page(va);
 	KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig"));
 	KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS,
 	    ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%x)",
 	    va));
 	if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m))
-		VM_OBJECT_ASSERT_WLOCKED(m->object);
+		VM_OBJECT_ASSERT_LOCKED(m->object);
 
 	mpte = NULL;
+	wired = (flags & PMAP_ENTER_WIRED) != 0;
 
 	rw_wlock(&pvh_global_lock);
 	PMAP_LOCK(pmap);
@@ -2676,7 +2670,15 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 	 * resident, we are creating it here.
 	 */
 	if (va < VM_MAXUSER_ADDRESS) {
-		mpte = pmap_allocpte(pmap, va, M_WAITOK);
+		mpte = pmap_allocpte(pmap, va, flags);
+		if (mpte == NULL) {
+			KASSERT((flags & PMAP_ENTER_NOSLEEP) != 0,
+			    ("pmap_allocpte failed with sleep allowed"));
+			sched_unpin();
+			rw_wunlock(&pvh_global_lock);
+			PMAP_UNLOCK(pmap);
+			return (KERN_RESOURCE_SHORTAGE);
+		}
 	}
 
 	pde = pmap_pde(pmap, va);
@@ -2842,6 +2844,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 	sched_unpin();
 	rw_wunlock(&pvh_global_lock);
 	PMAP_UNLOCK(pmap);
+	return (KERN_SUCCESS);
 }
 
 /*
@@ -2996,7 +2999,7 @@ pmap_enter_quick_locked(multicall_entry_t **mclpp, int *count, pmap_t pmap, vm_o
 				mpte->wire_count++;
 			} else {
 				mpte = _pmap_allocpte(pmap, ptepindex,
-				    M_NOWAIT);
+				    PMAP_ENTER_NOSLEEP);
 				if (mpte == NULL)
 					return (mpte);
 			}
@@ -3167,40 +3170,58 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object,
 }
 
 /*
- *	Routine:	pmap_change_wiring
- *	Function:	Change the wiring attribute for a map/virtual-address
- *			pair.
- *	In/out conditions:
- *			The mapping must already exist in the pmap.
+ *	Clear the wired attribute from the mappings for the specified range of
+ *	addresses in the given pmap.  Every valid mapping within that range
+ *	must have the wired attribute set.  In contrast, invalid mappings
+ *	cannot have the wired attribute set, so they are ignored.
+ *
+ *	The wired attribute of the page table entry is not a hardware feature,
+ *	so there is no need to invalidate any TLB entries.
  */
 void
-pmap_change_wiring(pmap_t pmap, vm_offset_t va, boolean_t wired)
+pmap_unwire(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
+	vm_offset_t pdnxt;
+	pd_entry_t *pde;
 	pt_entry_t *pte;
 
+	CTR3(KTR_PMAP, "pmap_unwire: pmap=%p sva=0x%x eva=0x%x", pmap, sva,
+	    eva);
 	rw_wlock(&pvh_global_lock);
+	sched_pin();
 	PMAP_LOCK(pmap);
-	pte = pmap_pte(pmap, va);
-
-	if (wired && !pmap_pte_w(pte)) {
-		PT_SET_VA_MA((pte), *(pte) | PG_W, TRUE);
-		pmap->pm_stats.wired_count++;
-	} else if (!wired && pmap_pte_w(pte)) {
-		PT_SET_VA_MA((pte), *(pte) & ~PG_W, TRUE);
-		pmap->pm_stats.wired_count--;
+	for (; sva < eva; sva = pdnxt) {
+		pdnxt = (sva + NBPDR) & ~PDRMASK;
+		if (pdnxt < sva)
+			pdnxt = eva;
+		pde = pmap_pde(pmap, sva);
+		if ((*pde & PG_V) == 0)
+			continue;
+		if ((*pde & PG_PS) != 0)
+			panic("pmap_unwire: unexpected PG_PS in pde %#jx",
+			    (uintmax_t)*pde);
+		if (pdnxt > eva)
+			pdnxt = eva;
+		for (pte = pmap_pte_quick(pmap, sva); sva != pdnxt; pte++,
+		    sva += PAGE_SIZE) {
+			if ((*pte & PG_V) == 0)
+				continue;
+			if ((*pte & PG_W) == 0)
+				panic("pmap_unwire: pte %#jx is missing PG_W",
+				    (uintmax_t)*pte);
+			PT_SET_VA_MA(pte, *pte & ~PG_W, FALSE);
+			pmap->pm_stats.wired_count--;
+		}
 	}
-	
-	/*
-	 * Wiring is not a hardware characteristic so there is no need to
-	 * invalidate TLB.
-	 */
-	pmap_pte_release(pte);
-	PMAP_UNLOCK(pmap);
+	if (*PMAP1)
+		PT_CLEAR_VA(PMAP1, FALSE);
+	PT_UPDATES_FLUSH();
+	sched_unpin();
 	rw_wunlock(&pvh_global_lock);
+	PMAP_UNLOCK(pmap);
 }
 
 
-
 /*
  *	Copy the range specified by src_addr/len
  *	from the source map to the range dst_addr/len
@@ -3287,7 +3308,7 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr, vm_size_t len,
 			 */
 			if ((ptetemp & PG_MANAGED) != 0) {
 				dstmpte = pmap_allocpte(dst_pmap, addr,
-				    M_NOWAIT);
+				    PMAP_ENTER_NOSLEEP);
 				if (dstmpte == NULL)
 					goto out;
 				dst_pte = pmap_pte_quick(dst_pmap, addr);
diff --git a/sys/ia64/acpica/OsdEnvironment.c b/sys/ia64/acpica/OsdEnvironment.c
deleted file mode 100644
index 7aa281f2cc25..000000000000
--- a/sys/ia64/acpica/OsdEnvironment.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2000,2001 Michael Smith
- * Copyright (c) 2000 BSDi
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <sys/efi.h>
-#include <sys/sysctl.h>
-
-#include <contrib/dev/acpica/include/acpi.h>
-
-static u_long acpi_root_phys;
-
-SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &acpi_root_phys, 0,
-    "The physical address of the RSDP");
-
-ACPI_STATUS
-AcpiOsInitialize(void)
-{
-
-	return (AE_OK);
-}
-
-ACPI_STATUS
-AcpiOsTerminate(void)
-{
-
-	return (AE_OK);
-}
-
-static u_long
-acpi_get_root_from_efi(void)
-{
-	static struct uuid acpi_root_uuid = EFI_TABLE_ACPI20;
-	void *acpi_root;
-
-	acpi_root = efi_get_table(&acpi_root_uuid);
-	if (acpi_root != NULL)
-		return (IA64_RR_MASK((uintptr_t)acpi_root));
-
-	return (0);
-}
-
-ACPI_PHYSICAL_ADDRESS
-AcpiOsGetRootPointer(void)
-{
-
-	if (acpi_root_phys == 0)
-		acpi_root_phys = acpi_get_root_from_efi();
-
-	return (acpi_root_phys);
-}
diff --git a/sys/ia64/acpica/acpi_machdep.c b/sys/ia64/acpica/acpi_machdep.c
deleted file mode 100644
index 1466cfe59a98..000000000000
--- a/sys/ia64/acpica/acpi_machdep.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * Copyright (c) 2001 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/param.h>
-#include <sys/bus.h>
-#include <machine/md_var.h>
-#include <machine/pal.h>
-
-#include <contrib/dev/acpica/include/acpi.h>
-#include <contrib/dev/acpica/include/actables.h>
-#include <dev/acpica/acpivar.h>
-
-int
-acpi_machdep_init(device_t dev)
-{
-	struct	acpi_softc *sc;
-
-        sc = device_get_softc(dev);
-
-	acpi_install_wakeup_handler(sc);
-
-	return (0);
-}
-
-int
-acpi_machdep_quirks(int *quirks)
-{
-	return (0);
-}
-
-void
-acpi_cpu_c1()
-{
-#ifdef INVARIANTS
-	register_t ie;
-
-	ie = intr_disable();
-	KASSERT(ie == 0, ("%s called with interrupts enabled\n", __func__));
-#endif
-	ia64_call_pal_static(PAL_HALT_LIGHT, 0, 0, 0);
-	ia64_enable_intr();
-}
-
-void *
-acpi_find_table(const char *sig)
-{
-	ACPI_PHYSICAL_ADDRESS rsdp_ptr;
-	ACPI_TABLE_RSDP *rsdp;
-	ACPI_TABLE_XSDT *xsdt;
-	ACPI_TABLE_HEADER *table;
-	UINT64 addr;
-	u_int i, count;
-
-	if ((rsdp_ptr = AcpiOsGetRootPointer()) == 0)
-		return (NULL);
-
-	rsdp = (ACPI_TABLE_RSDP *)IA64_PHYS_TO_RR7(rsdp_ptr);
-	xsdt = (ACPI_TABLE_XSDT *)IA64_PHYS_TO_RR7(rsdp->XsdtPhysicalAddress);
-
-	count = (UINT64 *)((char *)xsdt + xsdt->Header.Length) -
-	    xsdt->TableOffsetEntry;
-
-	for (i = 0; i < count; i++) {
-		addr = xsdt->TableOffsetEntry[i];
-		table = (ACPI_TABLE_HEADER *)IA64_PHYS_TO_RR7(addr);
-
-		if (strncmp(table->Signature, sig, ACPI_NAME_SIZE) != 0)
-			continue;
-		if (ACPI_FAILURE(AcpiTbChecksum((void *)table, table->Length)))
-			continue;
-
-		return (table);
-	}
-
-	return (NULL);
-}
diff --git a/sys/ia64/acpica/acpi_wakeup.c b/sys/ia64/acpica/acpi_wakeup.c
deleted file mode 100644
index 6c70ca701145..000000000000
--- a/sys/ia64/acpica/acpi_wakeup.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2001 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/param.h>
-#include <sys/bus.h>
-
-#include <contrib/dev/acpica/include/acpi.h>
-
-#include <dev/acpica/acpivar.h>
-
-int
-acpi_sleep_machdep(struct acpi_softc *sc, int state)
-{
-	return (0);
-}
-
-int
-acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result,
-    int intr_enabled)
-{
-	return (0);
-}
-
-void
-acpi_install_wakeup_handler(struct acpi_softc *sc)
-{
-}
diff --git a/sys/ia64/acpica/madt.c b/sys/ia64/acpica/madt.c
deleted file mode 100644
index 51193fffcc80..000000000000
--- a/sys/ia64/acpica/madt.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/*-
- * Copyright (c) 2001 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 <contrib/dev/acpica/include/acpi.h>
-#include <contrib/dev/acpica/include/actables.h>
-
-#include <machine/md_var.h>
-
-struct sapic *sapic_create(int, int, u_int64_t);
-
-static void
-print_entry(ACPI_SUBTABLE_HEADER *entry)
-{
-
-	switch (entry->Type) {
-	case ACPI_MADT_TYPE_INTERRUPT_OVERRIDE: {
-		ACPI_MADT_INTERRUPT_OVERRIDE *iso =
-		    (ACPI_MADT_INTERRUPT_OVERRIDE *)entry;
-		printf("\tInterrupt source override entry\n");
-		printf("\t\tBus=%u, Source=%u, Irq=0x%x\n", iso->Bus,
-		    iso->SourceIrq, iso->GlobalIrq);
-		break;
-	}
-
-	case ACPI_MADT_TYPE_IO_APIC:
-		printf("\tI/O APIC entry\n");
-		break;
-
-	case ACPI_MADT_TYPE_IO_SAPIC: {
-		ACPI_MADT_IO_SAPIC *sapic = (ACPI_MADT_IO_SAPIC *)entry;
-		printf("\tI/O SAPIC entry\n");
-		printf("\t\tId=0x%x, InterruptBase=0x%x, Address=0x%lx\n",
-		    sapic->Id, sapic->GlobalIrqBase, sapic->Address);
-		break;
-	}
-
-	case ACPI_MADT_TYPE_LOCAL_APIC_NMI:
-		printf("\tLocal APIC NMI entry\n");
-		break;
-
-	case ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE: {
-		ACPI_MADT_LOCAL_APIC_OVERRIDE *lapic =
-		    (ACPI_MADT_LOCAL_APIC_OVERRIDE *)entry;
-		printf("\tLocal APIC override entry\n");
-		printf("\t\tLocal APIC address=0x%jx\n", lapic->Address);
-		break;
-	}
-
-	case ACPI_MADT_TYPE_LOCAL_SAPIC: {
-		ACPI_MADT_LOCAL_SAPIC *sapic = (ACPI_MADT_LOCAL_SAPIC *)entry;
-		printf("\tLocal SAPIC entry\n");
-		printf("\t\tProcessorId=0x%x, Id=0x%x, Eid=0x%x",
-		    sapic->ProcessorId, sapic->Id, sapic->Eid);
-		if (!(sapic->LapicFlags & ACPI_MADT_ENABLED))
-			printf(" (disabled)");
-		printf("\n");
-		break;
-	}
-
-	case ACPI_MADT_TYPE_NMI_SOURCE:
-		printf("\tNMI entry\n");
-		break;
-
-	case ACPI_MADT_TYPE_INTERRUPT_SOURCE: {
-		ACPI_MADT_INTERRUPT_SOURCE *pis =
-		    (ACPI_MADT_INTERRUPT_SOURCE *)entry;
-		printf("\tPlatform interrupt entry\n");
-		printf("\t\tPolarity=%u, TriggerMode=%u, Id=0x%x, "
-		    "Eid=0x%x, Vector=0x%x, Irq=%d\n",
-		    pis->IntiFlags & ACPI_MADT_POLARITY_MASK,
-		    (pis->IntiFlags & ACPI_MADT_TRIGGER_MASK) >> 2,
-		    pis->Id, pis->Eid, pis->IoSapicVector, pis->GlobalIrq);
-		break;
-	}
-
-	case ACPI_MADT_TYPE_LOCAL_APIC:
-		printf("\tLocal APIC entry\n");
-		break;
-
-	default:
-		printf("\tUnknown type %d entry\n", entry->Type);
-		break;
-	}
-}
-
-void
-ia64_probe_sapics(void)
-{
-	ACPI_PHYSICAL_ADDRESS rsdp_ptr;
-	ACPI_SUBTABLE_HEADER *entry;
-	ACPI_TABLE_MADT *table;
-	ACPI_TABLE_RSDP *rsdp;
-	ACPI_TABLE_XSDT *xsdt;
-	char *end, *p;
-	int t, tables;
-
-	if ((rsdp_ptr = AcpiOsGetRootPointer()) == 0)
-		return;
-
-	rsdp = (ACPI_TABLE_RSDP *)IA64_PHYS_TO_RR7(rsdp_ptr);
-	xsdt = (ACPI_TABLE_XSDT *)IA64_PHYS_TO_RR7(rsdp->XsdtPhysicalAddress);
-
-	tables = (UINT64 *)((char *)xsdt + xsdt->Header.Length) -
-	    xsdt->TableOffsetEntry;
-
-	for (t = 0; t < tables; t++) {
-		table = (ACPI_TABLE_MADT *)
-		    IA64_PHYS_TO_RR7(xsdt->TableOffsetEntry[t]);
-
-		if (bootverbose)
-			printf("Table '%c%c%c%c' at %p\n",
-			    table->Header.Signature[0],
-			    table->Header.Signature[1],
-			    table->Header.Signature[2],
-			    table->Header.Signature[3], table);
-
-		if (strncmp(table->Header.Signature, ACPI_SIG_MADT,
-		    ACPI_NAME_SIZE) != 0 ||
-		    ACPI_FAILURE(AcpiTbChecksum((void *)table,
-		    table->Header.Length)))
-			continue;
-
-		/* Save the address of the processor interrupt block. */
-		if (bootverbose)
-			printf("\tLocal APIC address=0x%x\n", table->Address);
-		ia64_lapic_addr = table->Address;
-
-		end = (char *)table + table->Header.Length;
-		p = (char *)(table + 1);
-		while (p < end) {
-			entry = (ACPI_SUBTABLE_HEADER *)p;
-
-			if (bootverbose)
-				print_entry(entry);
-
-			switch (entry->Type) {
-			case ACPI_MADT_TYPE_IO_SAPIC: {
-				ACPI_MADT_IO_SAPIC *sapic =
-				    (ACPI_MADT_IO_SAPIC *)entry;
-				sapic_create(sapic->Id, sapic->GlobalIrqBase,
-				    sapic->Address);
-				break;
-			}
-
-			case ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE: {
-				ACPI_MADT_LOCAL_APIC_OVERRIDE *lapic =
-				    (ACPI_MADT_LOCAL_APIC_OVERRIDE *)entry;
-				ia64_lapic_addr = lapic->Address;
-				break;
-			}
-
-#ifdef SMP
-			case ACPI_MADT_TYPE_LOCAL_SAPIC: {
-				ACPI_MADT_LOCAL_SAPIC *sapic =
-				    (ACPI_MADT_LOCAL_SAPIC *)entry;
-				if (sapic->LapicFlags & ACPI_MADT_ENABLED)
-					cpu_mp_add(sapic->ProcessorId,
-					    sapic->Id, sapic->Eid);
-				break;
-			}
-#endif
-
-			default:
-				break;
-			}
-
-			p += entry->Length;
-		}
-	}
-}
-
-/*
- * Count the number of local SAPIC entries in the APIC table. Every enabled
- * entry corresponds to a processor.
- */
-int
-ia64_count_cpus(void)
-{
-	ACPI_PHYSICAL_ADDRESS rsdp_ptr;
-	ACPI_MADT_LOCAL_SAPIC *entry;
-	ACPI_TABLE_MADT *table;
-	ACPI_TABLE_RSDP *rsdp;
-	ACPI_TABLE_XSDT *xsdt;
-	char *end, *p;
-	int cpus, t, tables;
-
-	if ((rsdp_ptr = AcpiOsGetRootPointer()) == 0)
-		return (0);
-
-	rsdp = (ACPI_TABLE_RSDP *)IA64_PHYS_TO_RR7(rsdp_ptr);
-	xsdt = (ACPI_TABLE_XSDT *)IA64_PHYS_TO_RR7(rsdp->XsdtPhysicalAddress);
-
-	tables = (UINT64 *)((char *)xsdt + xsdt->Header.Length) -
-	    xsdt->TableOffsetEntry;
-
-	cpus = 0;
-
-	for (t = 0; t < tables; t++) {
-		table = (ACPI_TABLE_MADT *)
-		    IA64_PHYS_TO_RR7(xsdt->TableOffsetEntry[t]);
-
-		if (strncmp(table->Header.Signature, ACPI_SIG_MADT,
-		    ACPI_NAME_SIZE) != 0 ||
-		    ACPI_FAILURE(AcpiTbChecksum((void *)table,
-			table->Header.Length)))
-			continue;
-
-		end = (char *)table + table->Header.Length;
-		p = (char *)(table + 1);
-		while (p < end) {
-			entry = (ACPI_MADT_LOCAL_SAPIC *)p;
-
-			if (entry->Header.Type == ACPI_MADT_TYPE_LOCAL_SAPIC &&
-			    (entry->LapicFlags & ACPI_MADT_ENABLED))
-				cpus++;
-
-			p += entry->Header.Length;
-		}
-	}
-
-	return (cpus);
-}
diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS
deleted file mode 100644
index a3e10d614c67..000000000000
--- a/sys/ia64/conf/DEFAULTS
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# DEFAULTS -- Default kernel configuration file for FreeBSD/ia64
-#
-# $FreeBSD$
-
-machine		ia64
-
-# Bus support.
-device		acpi		# ACPI support
-
-# Pseudo devices.
-device		io		# I/O & EFI runtime device
-device		mem		# Memory and kernel memory devices
-
-# UART chips on this platform
-device		uart_ns8250
-
-options 	GEOM_PART_BSD
-options 	GEOM_PART_GPT
-options 	GEOM_PART_MBR
-
-options 	NEW_PCIB
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
deleted file mode 100644
index 532b74b16935..000000000000
--- a/sys/ia64/conf/GENERIC
+++ /dev/null
@@ -1,213 +0,0 @@
-#
-# GENERIC -- Generic kernel configuration file for FreeBSD/ia64
-#
-# 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.
-#
-# For hardware specific information check HARDWARE.TXT
-#
-# $FreeBSD$
-
-cpu		ITANIUM2
-ident		GENERIC
-
-makeoptions	DEBUG=-g	# Build kernel with gdb(1) debug symbols
-
-options 	AUDIT		# Security event auditing
-options 	CAPABILITY_MODE	# Capsicum capability mode
-options 	CAPABILITIES	# Capsicum capabilities
-options 	CD9660		# ISO 9660 Filesystem
-options 	COMPAT_FREEBSD7	# Compatible with FreeBSD7
-options 	FFS		# Berkeley Fast Filesystem
-options 	GEOM_LABEL	# Provides labelization
-options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
-options 	INET		# InterNETworking
-options 	INET6		# IPv6 communications protocols
-options 	KTRACE		# ktrace(1) syscall trace support
-options 	MAC		# TrustedBSD MAC Framework
-options 	MD_ROOT		# MD usable as root device
-options 	MSDOSFS		# MSDOS Filesystem
-options 	NFSCL		# New Network Filesystem Client
-options 	NFSLOCKD	# Network Lock Manager
-options 	NFSD		# New Network Filesystem Server
-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 	PROCFS		# Process filesystem (/proc)
-options 	PSEUDOFS	# Pseudo-filesystem framework
-options 	SCHED_ULE	# ULE scheduler
-options 	SCSI_DELAY=5000	# Delay (in ms) before probing SCSI
-options 	SCTP		# Stream Control Transmission Protocol
-options 	SMP		# Symmetric Multi-Processor support
-options 	SOFTUPDATES	# Enable FFS soft updates support
-options 	STACK		# stack(9) support
-options 	SYSVMSG		# SYSV-style message queues
-options 	SYSVSEM		# SYSV-style semaphores
-options 	SYSVSHM		# SYSV-style shared memory
-options 	UFS_ACL		# Support for access control lists
-options 	UFS_DIRHASH	# Hash-based directory lookup scheme
-options 	UFS_GJOURNAL	# Enable gjournal-based UFS journaling
-options 	QUOTA		# Enable disk quotas for UFS
-options 	_KPOSIX_PRIORITY_SCHEDULING	# Posix P1003_1B RT extensions
-
-# Debugging support.  Always need this:
-options 	KDB		# Enable kernel debugger support.
-options 	KDB_TRACE	# Print a stack trace for a panic.
-# For full debugger support use (turn off in stable branch):
-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 # required by INVARIANTS
-options 	WITNESS		# Enable checks to detect deadlocks and cycles
-options 	WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
-options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
-
-# Various "busses"
-device		miibus		# MII bus support (Ethernet)
-device		pci		# PCI bus support
-device		scbus		# SCSI bus (required for ATA/SCSI)
-device		usb		# USB Bus (required for USB)
-
-# ATA controllers
-device		ahci		# AHCI-compatible SATA controllers
-device		ata		# Legacy ATA/SATA controllers
-device		mvs		# Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
-device		siis		# SiliconImage SiI3124/SiI3132/SiI3531 SATA
-
-# SCSI Controllers
-device		ahc		# AHA2940 and AIC7xxx devices
-device		ahd		# AHA39320/29320 and AIC79xx devices
-device		hptiop		# Highpoint RocketRaid 3xxx series
-device		isp		# Qlogic family
-device		mpt		# LSI-Logic MPT-Fusion
-device		mps		# LSI-Logic MPT-Fusion 2
-device		mpr		# LSI-Logic MPT-Fusion 3
-device		sym		# NCR/Symbios Logic
-
-# RAID controllers interfaced to the SCSI subsystem
-device		amr		# AMI MegaRAID
-device		ciss		# Compaq Smart RAID 5*
-device		dpt		# DPT Smartcache III, IV
-device		iir		# Intel Integrated RAID
-device		ips		# IBM (Adaptec) ServeRAID
-device		mly		# Mylex AcceleRAID/eXtremeRAID
-device		twa		# 3ware 9000 series PATA/SATA RAID
-
-# ATA/SCSI peripherals
-device		cd		# CD-ROM, DVD-ROM etc.
-device		ch		# Media changer
-device		da		# Direct Access (ie disk)
-device		pass		# Passthrough (direct ATA/SCSI access)
-device		sa		# Sequential Access (ie tape)
-device		ses		# Enclosure Services (SES and SAF-TE)
-#device		ctl		# CAM Target Layer
-
-# RAID controllers
-device		aac		# Adaptec FSA RAID
-device		aacp		# SCSI passthrough for aac (requires CAM)
-device		aacraid		# Adaptec by PMC RAID
-device		ida		# Compaq Smart RAID
-device		mlx		# Mylex DAC960 family
-
-# USB host controllers and peripherals
-options 	USB_DEBUG	# enable debug msgs
-device		ehci		# EHCI host controller
-device		ohci		# OHCI PCI->USB interface
-device		uhci		# UHCI PCI->USB interface
-device		uhid		# Human Interface Devices
-device		ukbd		# Keyboard
-device		ulpt		# Printer
-device		umass		# Disks/Mass storage (need scbus & da)
-device		ums		# Mouse
-
-# PCI Ethernet NICs.
-device		de		# DEC/Intel DC21x4x (``Tulip'')
-device		em		# Intel PRO/1000 Gigabit Ethernet Family
-device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
-device		ixgbe		# Intel PRO/10GbE PCIE Ethernet Family
-device		txp		# 3Com 3cR990 (``Typhoon'')
-
-# PCI Ethernet NICs that use the common MII bus controller code.
-device		ae		# Attansic/Atheros L2 FastEthernet
-device		age		# Attansic/Atheros L1 Gigabit Ethernet
-device		alc		# Atheros AR8131/AR8132 Ethernet
-device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
-device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
-device		bfe		# Broadcom BCM440x 10/100 Ethernet
-device		bge		# Broadcom BCM570xx Gigabit Ethernet
-device		et		# Agere ET1310 10/100/Gigabit Ethernet
-device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
-device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-device		nge		# NatSemi DP83820 gigabit Ethernet
-device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
-device		re		# RealTek 8139C+/8169/8169S/8110S
-device		sf		# Adaptec AIC-6915 (``Starfire'')
-device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
-device		ste		# Sundance ST201 (D-Link DFE-550TX)
-device		stge		# Sundance/Tamarack TC9021 gigabit Ethernet
-device		tx		# SMC EtherPower II (83c170 ``EPIC'')
-device		vge		# VIA VT612x gigabit Ethernet
-device		xl		# 3Com 3c90x ("Boomerang", "Cyclone")
-
-# USB Ethernet
-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 Serial
-device		uark		# Technologies ARK3116 based serial adapters
-device		ubsa		# Belkin F5U103 and compatible serial adapters
-device		uftdi		# For FTDI usb serial adapters
-device		uipaq		# Some WinCE based devices
-device		uplcom		# Prolific PL-2303 serial adapters
-device		uslcom		# SI Labs CP2101/CP2102 serial adapters
-device		uvisor		# Visor and Palm devices
-device		uvscom		# USB serial support for DDI pocket's PHS
-
-# Wireless NIC cards.
-# The wlan(4) module assumes this, so just define it so it
-# at least correctly loads.
-options 	IEEE80211_SUPPORT_MESH
-
-# The ath(4) and ath_hal(4) code requires this.  The module currently
-# builds everything including AR5416 (and later 11n NIC) support.
-options 	AH_SUPPORT_AR5416
-
-# Various (pseudo) devices
-device		ether		# Ethernet support
-device		faith		# IPv6-to-IPv4 relaying (translation)
-device		firmware	# firmware assist module
-device		gif		# IPv6 and IPv4 tunneling
-device		kbdmux		# keyboard multiplexer
-device		loop		# Network loopback
-device		md		# Memory "disks"
-device		puc		# Multi I/O cards and multi-channel UARTs
-device		random		# Entropy device
-device		tun		# Packet tunnel.
-device		uart		# Serial port (UART)
-device		vlan		# 802.1Q VLAN support
-device		vt		# Virtual terminals
-device		vt_vga		# VGA terminal device
-
-# 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
diff --git a/sys/ia64/conf/GENERIC.hints b/sys/ia64/conf/GENERIC.hints
deleted file mode 100644
index ee222500e0d7..000000000000
--- a/sys/ia64/conf/GENERIC.hints
+++ /dev/null
@@ -1,2 +0,0 @@
-# $FreeBSD$
-hw.uart.console="io:0x3f8"
diff --git a/sys/ia64/conf/Makefile b/sys/ia64/conf/Makefile
deleted file mode 100644
index 122a7d09c252..000000000000
--- a/sys/ia64/conf/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-TARGET=ia64
-
-.include "${.CURDIR}/../../conf/makeLINT.mk"
diff --git a/sys/ia64/conf/NOTES b/sys/ia64/conf/NOTES
deleted file mode 100644
index 107c70fd1b7c..000000000000
--- a/sys/ia64/conf/NOTES
+++ /dev/null
@@ -1,105 +0,0 @@
-# $FreeBSD$
-#
-# This file contains machine dependent kernel configuration notes.  For
-# machine independent notes, look in /sys/conf/NOTES.
-
-# directive: cpu
-# You must specify at least one CPU (the one you intend to run on). Deleting
-# the support for CPUs you don't need to use may make parts of the system run
-# faster. There's currently no special code for the different CPUs. Note also
-# that the cpu declares the family. We may need to add support for specifying
-# particular models.
-cpu		ITANIUM
-cpu		ITANIUM2
-
-# option: COMPAT_FREEBSD32
-# This option enables the support for execution of i386 (32-bit) programs on
-# ia64. It is based on the ia32 emulation in the processor.
-options 	COMPAT_FREEBSD32
-
-# option: LOG2_ID_PAGE_SIZE
-# Specify the log2 size of the identity (direct) mappings in regions 6 and 7
-# of the virtual address space.
-options 	LOG2_ID_PAGE_SIZE=27		# 128M
-
-# option: LOG2_PAGE_SIZE
-# Specify the log2 size of the page to be used for virtual memory management.
-# The page size being equal to 1<<LOG2_PAGE_SIZE.
-options 	LOG2_PAGE_SIZE=14		# 16K
-
-# option: UWX_TRACE_ENABLE
-# Build the unwinder with tracing support. This option is used to debug the
-# unwinder itself and the glue around it.
-options 	UWX_TRACE_ENABLE
-
-# MI options
-options 	ACPI_DEBUG
-options 	KSTACK_PAGES=3
-
-device		acpi
-
-device		agp
-device		isa
-device		pci
-
-# PS/2 mouse
-device		psm
-hint.psm.0.at="atkbdc"
-hint.psm.0.irq="12"
-
-# Options for psm:
-options 	PSM_HOOKRESUME		#hook the system resume event, useful
-					#for some laptops
-options 	PSM_RESETAFTERSUSPEND	#reset the device at the resume event
-
-# The keyboard controller; it controls the keyboard and the PS/2 mouse.
-device		atkbdc
-hint.atkbdc.0.at="isa"
-hint.atkbdc.0.port="0x060"
-
-# The AT keyboard
-device		atkbd
-hint.atkbd.0.at="atkbdc"
-hint.atkbd.0.irq="1"
-
-# Options for atkbd:
-options 	ATKBD_DFLT_KEYMAP	# specify the built-in keymap
-makeoptions	ATKBD_DFLT_KEYMAP=jp.106
-
-# `flags' for atkbd:
-#       0x01    Force detection of keyboard, else we always assume a keyboard
-#       0x02    Don't reset keyboard, useful for some newer ThinkPads
-#	0x03	Force detection and avoid reset, might help with certain
-#		dockingstations
-#       0x04    Old-style (XT) keyboard support, useful for older ThinkPads
-
-# Video card driver for VGA adapters.
-device		vga
-hint.vga.0.at="isa"
-
-# Options for vga:
-# Try the following option if the mouse pointer is not drawn correctly
-# or font does not seem to be loaded properly.  May cause flicker on
-# some systems.
-options 	VGA_ALT_SEQACCESS
-
-# If you can dispense with some vga driver features, you may want to
-# use the following options to save some memory.
-#options 	VGA_NO_FONT_LOADING	# don't save/load font
-#options 	VGA_NO_MODE_CHANGE	# don't change video modes
-
-# Older video cards may require this option for proper operation.
-options 	VGA_SLOW_IOACCESS	# do byte-wide i/o's to TS and GDC regs
-
-# The following option probably won't work with the LCD displays.
-options 	VGA_WIDTH90		# support 90 column modes
-
-# Debugging.
-options 	VGA_DEBUG
-
-# AGP debugging.
-options 	AGP_DEBUG
-
-# The following devices are not supported.
-nodevice	fdc
-nooption	FDC_DEBUG
diff --git a/sys/ia64/disasm/disasm.h b/sys/ia64/disasm/disasm.h
deleted file mode 100644
index 7a9419773936..000000000000
--- a/sys/ia64/disasm/disasm.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/*-
- * Copyright (c) 2000-2006 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 _DISASM_H_
-#define	_DISASM_H_
-
-#ifndef _DISASM_INT_H_
-#define	ASM_ADDITIONAL_OPCODES		ASM_OP_NUMBER_OF_OPCODES
-#endif
-
-/* Application registers. */
-#define	AR_K0		0
-#define	AR_K1		1
-#define	AR_K2		2
-#define	AR_K3		3
-#define	AR_K4		4
-#define	AR_K5		5
-#define	AR_K6		6
-#define	AR_K7		7
-#define	AR_RSC		16
-#define	AR_BSP		17
-#define	AR_BSPSTORE	18
-#define	AR_RNAT		19
-#define	AR_FCR		21
-#define	AR_EFLAG	24
-#define	AR_CSD		25
-#define	AR_SSD		26
-#define	AR_CFLG		27
-#define	AR_FSR		28
-#define	AR_FIR		29
-#define	AR_FDR		30
-#define	AR_CCV		32
-#define	AR_UNAT		36
-#define	AR_FPSR		40
-#define	AR_ITC		44
-#define	AR_PFS		64
-#define	AR_LC		65
-#define	AR_EC		66
-
-/* Control registers. */
-#define	CR_DCR		0
-#define	CR_ITM		1
-#define	CR_IVA		2
-#define	CR_PTA		8
-#define	CR_IPSR		16
-#define	CR_ISR		17
-#define	CR_IIP		19
-#define	CR_IFA		20
-#define	CR_ITIR		21
-#define	CR_IIPA		22
-#define	CR_IFS		23
-#define	CR_IIM		24
-#define	CR_IHA		25
-#define	CR_LID		64
-#define	CR_IVR		65
-#define	CR_TPR		66
-#define	CR_EOI		67
-#define	CR_IRR0		68
-#define	CR_IRR1		69
-#define	CR_IRR2		70
-#define	CR_IRR3		71
-#define	CR_ITV		72
-#define	CR_PMV		73
-#define	CR_CMCV		74
-#define	CR_LRR0		80
-#define	CR_LRR1		81
-
-enum asm_cmpltr_class {
-	ASM_CC_NONE,
-	ASM_CC_ACLR,
-	ASM_CC_BSW, ASM_CC_BTYPE, ASM_CC_BWH,
-	ASM_CC_CHK, ASM_CC_CLRRRB, ASM_CC_CREL, ASM_CC_CTYPE,
-	ASM_CC_DEP, ASM_CC_DH,
-	ASM_CC_FC, ASM_CC_FCREL, ASM_CC_FCTYPE, ASM_CC_FCVT, ASM_CC_FLDTYPE,
-	ASM_CC_FMERGE, ASM_CC_FREL, ASM_CC_FSWAP,
-	ASM_CC_GETF,
-	ASM_CC_IH, ASM_CC_INVALA, ASM_CC_IPWH, ASM_CC_ITC, ASM_CC_ITR,
-	ASM_CC_LDHINT, ASM_CC_LDTYPE, ASM_CC_LFETCH, ASM_CC_LFHINT,
-	ASM_CC_LFTYPE, ASM_CC_LR,
-	ASM_CC_MF, ASM_CC_MOV, ASM_CC_MWH,
-	ASM_CC_PAVG, ASM_CC_PC, ASM_CC_PH, ASM_CC_PREL, ASM_CC_PRTYPE,
-	ASM_CC_PTC, ASM_CC_PTR, ASM_CC_PVEC,
-	ASM_CC_SAT, ASM_CC_SEM, ASM_CC_SETF, ASM_CC_SF, ASM_CC_SRLZ,
-	ASM_CC_STHINT, ASM_CC_STTYPE, ASM_CC_SYNC,
-	ASM_CC_RW,
-	ASM_CC_TREL, ASM_CC_TRUNC,
-	ASM_CC_UNIT, ASM_CC_UNPACK, ASM_CC_UNS,
-	ASM_CC_VMSW,
-	ASM_CC_XMA
-};
-
-enum asm_cmpltr_type {
-	ASM_CT_NONE,
-	ASM_CT_COND = ASM_CT_NONE,
-
-	ASM_CT_0, ASM_CT_1,
-	ASM_CT_A, ASM_CT_ACQ, ASM_CT_AND,
-	ASM_CT_B, ASM_CT_BIAS,
-	ASM_CT_C_CLR, ASM_CT_C_CLR_ACQ, ASM_CT_C_NC, ASM_CT_CALL,
-	ASM_CT_CEXIT, ASM_CT_CLOOP, ASM_CT_CLR, ASM_CT_CTOP,
-	ASM_CT_D, ASM_CT_DC_DC, ASM_CT_DC_NT, ASM_CT_DPNT, ASM_CT_DPTK,
-	ASM_CT_E, ASM_CT_EQ, ASM_CT_EXCL, ASM_CT_EXIT, ASM_CT_EXP,
-	ASM_CT_F, ASM_CT_FAULT, ASM_CT_FEW, ASM_CT_FILL, ASM_CT_FX, ASM_CT_FXU,
-	ASM_CT_G, ASM_CT_GA, ASM_CT_GE, ASM_CT_GT,
-	ASM_CT_H, ASM_CT_HU,
-	ASM_CT_I, ASM_CT_IA, ASM_CT_IMP,
-	ASM_CT_L, ASM_CT_LE, ASM_CT_LOOP, ASM_CT_LR, ASM_CT_LT, ASM_CT_LTU,
-	ASM_CT_M, ASM_CT_MANY,
-	ASM_CT_NC, ASM_CT_NE, ASM_CT_NEQ, ASM_CT_NL, ASM_CT_NLE, ASM_CT_NLT,
-	ASM_CT_NM, ASM_CT_NR, ASM_CT_NS, ASM_CT_NT_DC, ASM_CT_NT_NT,
-	ASM_CT_NT_TK, ASM_CT_NT1, ASM_CT_NT2, ASM_CT_NTA, ASM_CT_NZ,
-	ASM_CT_OR, ASM_CT_OR_ANDCM, ASM_CT_ORD,
-	ASM_CT_PR,
-	ASM_CT_R, ASM_CT_RAZ, ASM_CT_REL, ASM_CT_RET, ASM_CT_RW,
-	ASM_CT_S, ASM_CT_S0, ASM_CT_S1, ASM_CT_S2, ASM_CT_S3, ASM_CT_SA,
-	ASM_CT_SE, ASM_CT_SIG, ASM_CT_SPILL, ASM_CT_SPNT, ASM_CT_SPTK,
-	ASM_CT_SSS,
-	ASM_CT_TK_DC, ASM_CT_TK_NT, ASM_CT_TK_TK, ASM_CT_TRUNC,
-	ASM_CT_U, ASM_CT_UNC, ASM_CT_UNORD, ASM_CT_USS, ASM_CT_UUS, ASM_CT_UUU,
-	ASM_CT_W, ASM_CT_WEXIT, ASM_CT_WTOP,
-	ASM_CT_X, ASM_CT_XF,
-	ASM_CT_Z,
-};
-
-/* Completer. */
-struct asm_cmpltr {
-	enum asm_cmpltr_class	c_class;
-	enum asm_cmpltr_type	c_type;
-};
-
-/* Operand types. */
-enum asm_oper_type {
-	ASM_OPER_NONE,
-	ASM_OPER_AREG,		/* = ar# */
-	ASM_OPER_BREG,		/* = b# */
-	ASM_OPER_CPUID,		/* = cpuid[r#] */
-	ASM_OPER_CREG,		/* = cr# */
-	ASM_OPER_DBR,		/* = dbr[r#] */
-	ASM_OPER_DISP,		/* IP relative displacement. */
-	ASM_OPER_DTR,		/* = dtr[r#] */
-	ASM_OPER_FREG,		/* = f# */
-	ASM_OPER_GREG,		/* = r# */
-	ASM_OPER_IBR,		/* = ibr[r#] */
-	ASM_OPER_IMM,		/* Immediate */
-	ASM_OPER_IP,		/* = ip */
-	ASM_OPER_ITR,		/* = itr[r#] */
-	ASM_OPER_MEM,		/* = [r#] */
-	ASM_OPER_MSR,		/* = msr[r#] */
-	ASM_OPER_PKR,		/* = pkr[r#] */
-	ASM_OPER_PMC,		/* = pmc[r#] */
-	ASM_OPER_PMD,		/* = pmd[r#] */
-	ASM_OPER_PR,		/* = pr */
-	ASM_OPER_PR_ROT,	/* = pr.rot */
-	ASM_OPER_PREG,		/* = p# */
-	ASM_OPER_PSR,		/* = psr */
-	ASM_OPER_PSR_L,		/* = psr.l */
-	ASM_OPER_PSR_UM,	/* = psr.um */
-	ASM_OPER_RR		/* = rr[r#] */
-};
-
-/* Operand */
-struct asm_oper {
-	enum asm_oper_type	o_type;
-	uint64_t		o_value;
-};
-
-/* Instruction formats. */
-enum asm_fmt {
-	ASM_FMT_NONE,
-	ASM_FMT_A = 0x0100,
-	ASM_FMT_A1,  ASM_FMT_A2,  ASM_FMT_A3,  ASM_FMT_A4,
-	ASM_FMT_A5,  ASM_FMT_A6,  ASM_FMT_A7,  ASM_FMT_A8,
-	ASM_FMT_A9,  ASM_FMT_A10,
-	ASM_FMT_B = 0x0200,
-	ASM_FMT_B1,  ASM_FMT_B2,  ASM_FMT_B3,  ASM_FMT_B4,
-	ASM_FMT_B5,  ASM_FMT_B6,  ASM_FMT_B7,  ASM_FMT_B8,
-	ASM_FMT_B9,
-	ASM_FMT_F = 0x0300,
-	ASM_FMT_F1,  ASM_FMT_F2,  ASM_FMT_F3,  ASM_FMT_F4,
-	ASM_FMT_F5,  ASM_FMT_F6,  ASM_FMT_F7,  ASM_FMT_F8,
-	ASM_FMT_F9,  ASM_FMT_F10, ASM_FMT_F11, ASM_FMT_F12,
-	ASM_FMT_F13, ASM_FMT_F14, ASM_FMT_F15, ASM_FMT_F16,
-	ASM_FMT_I = 0x0400,
-	ASM_FMT_I1,  ASM_FMT_I2,  ASM_FMT_I3,  ASM_FMT_I4,
-	ASM_FMT_I5,  ASM_FMT_I6,  ASM_FMT_I7,  ASM_FMT_I8,
-	ASM_FMT_I9,  ASM_FMT_I10, ASM_FMT_I11, ASM_FMT_I12,
-	ASM_FMT_I13, ASM_FMT_I14, ASM_FMT_I15, ASM_FMT_I16,
-	ASM_FMT_I17, ASM_FMT_I18, ASM_FMT_I19, ASM_FMT_I20,
-	ASM_FMT_I21, ASM_FMT_I22, ASM_FMT_I23, ASM_FMT_I24,
-	ASM_FMT_I25, ASM_FMT_I26, ASM_FMT_I27, ASM_FMT_I28,
-	ASM_FMT_I29, ASM_FMT_I30,
-	ASM_FMT_M = 0x0500,
-	ASM_FMT_M1,  ASM_FMT_M2,  ASM_FMT_M3,  ASM_FMT_M4,
-	ASM_FMT_M5,  ASM_FMT_M6,  ASM_FMT_M7,  ASM_FMT_M8,
-	ASM_FMT_M9,  ASM_FMT_M10, ASM_FMT_M11, ASM_FMT_M12,
-	ASM_FMT_M13, ASM_FMT_M14, ASM_FMT_M15, ASM_FMT_M16,
-	ASM_FMT_M17, ASM_FMT_M18, ASM_FMT_M19, ASM_FMT_M20,
-	ASM_FMT_M21, ASM_FMT_M22, ASM_FMT_M23, ASM_FMT_M24,
-	ASM_FMT_M25, ASM_FMT_M26, ASM_FMT_M27, ASM_FMT_M28,
-	ASM_FMT_M29, ASM_FMT_M30, ASM_FMT_M31, ASM_FMT_M32,
-	ASM_FMT_M33, ASM_FMT_M34, ASM_FMT_M35, ASM_FMT_M36,
-	ASM_FMT_M37, ASM_FMT_M38, ASM_FMT_M39, ASM_FMT_M40,
-	ASM_FMT_M41, ASM_FMT_M42, ASM_FMT_M43, ASM_FMT_M44,
-	ASM_FMT_M45, ASM_FMT_M46, ASM_FMT_M47, ASM_FMT_M48,
-	ASM_FMT_X = 0x0600,
-	ASM_FMT_X1,  ASM_FMT_X2,  ASM_FMT_X3,  ASM_FMT_X4,
-	ASM_FMT_X5
-};
-
-/* Instruction opcodes. */
-enum asm_op {
-	ASM_OP_NONE,
-	ASM_OP_ADD, ASM_OP_ADDL, ASM_OP_ADDP4, ASM_OP_ADDS, ASM_OP_ALLOC,
-	ASM_OP_AND, ASM_OP_ANDCM,
-	ASM_OP_BR, ASM_OP_BREAK, ASM_OP_BRL, ASM_OP_BRP, ASM_OP_BSW,
-	ASM_OP_CHK, ASM_OP_CLRRRB, ASM_OP_CMP, ASM_OP_CMP4, ASM_OP_CMP8XCHG16,
-	ASM_OP_CMPXCHG1, ASM_OP_CMPXCHG2, ASM_OP_CMPXCHG4, ASM_OP_CMPXCHG8,
-	ASM_OP_COVER, ASM_OP_CZX1, ASM_OP_CZX2,
-	ASM_OP_DEP,
-	ASM_OP_EPC, ASM_OP_EXTR,
-	ASM_OP_FAMAX, ASM_OP_FAMIN, ASM_OP_FAND, ASM_OP_FANDCM, ASM_OP_FC,
-	ASM_OP_FCHKF, ASM_OP_FCLASS, ASM_OP_FCLRF, ASM_OP_FCMP, ASM_OP_FCVT,
-	ASM_OP_FETCHADD4, ASM_OP_FETCHADD8, ASM_OP_FLUSHRS, ASM_OP_FMA,
-	ASM_OP_FMAX, ASM_OP_FMERGE, ASM_OP_FMIN, ASM_OP_FMIX, ASM_OP_FMS,
-	ASM_OP_FNMA, ASM_OP_FOR, ASM_OP_FPACK, ASM_OP_FPAMAX, ASM_OP_FPAMIN,
-	ASM_OP_FPCMP, ASM_OP_FPCVT, ASM_OP_FPMA, ASM_OP_FPMAX, ASM_OP_FPMERGE,
-	ASM_OP_FPMIN, ASM_OP_FPMS, ASM_OP_FPNMA, ASM_OP_FPRCPA,
-	ASM_OP_FPRSQRTA, ASM_OP_FRCPA, ASM_OP_FRSQRTA, ASM_OP_FSELECT,
-	ASM_OP_FSETC, ASM_OP_FSWAP, ASM_OP_FSXT, ASM_OP_FWB, ASM_OP_FXOR,
-	ASM_OP_GETF,
-	ASM_OP_HINT,
-	ASM_OP_INVALA, ASM_OP_ITC, ASM_OP_ITR,
-	ASM_OP_LD1, ASM_OP_LD16, ASM_OP_LD2, ASM_OP_LD4, ASM_OP_LD8,
-	ASM_OP_LDF, ASM_OP_LDF8, ASM_OP_LDFD, ASM_OP_LDFE, ASM_OP_LDFP8,
-	ASM_OP_LDFPD, ASM_OP_LDFPS, ASM_OP_LDFS, ASM_OP_LFETCH, ASM_OP_LOADRS,
-	ASM_OP_MF, ASM_OP_MIX1, ASM_OP_MIX2, ASM_OP_MIX4, ASM_OP_MOV,
-	ASM_OP_MOVL, ASM_OP_MUX1, ASM_OP_MUX2,
-	ASM_OP_NOP,
-	ASM_OP_OR,
-	ASM_OP_PACK2, ASM_OP_PACK4, ASM_OP_PADD1, ASM_OP_PADD2, ASM_OP_PADD4,
-	ASM_OP_PAVG1, ASM_OP_PAVG2, ASM_OP_PAVGSUB1, ASM_OP_PAVGSUB2,
-	ASM_OP_PCMP1, ASM_OP_PCMP2, ASM_OP_PCMP4, ASM_OP_PMAX1, ASM_OP_PMAX2,
-	ASM_OP_PMIN1, ASM_OP_PMIN2, ASM_OP_PMPY2, ASM_OP_PMPYSHR2,
-	ASM_OP_POPCNT, ASM_OP_PROBE, ASM_OP_PSAD1, ASM_OP_PSHL2, ASM_OP_PSHL4,
-	ASM_OP_PSHLADD2, ASM_OP_PSHR2, ASM_OP_PSHR4, ASM_OP_PSHRADD2,
-	ASM_OP_PSUB1, ASM_OP_PSUB2, ASM_OP_PSUB4, ASM_OP_PTC, ASM_OP_PTR,
-	ASM_OP_RFI, ASM_OP_RSM, ASM_OP_RUM,
-	ASM_OP_SETF, ASM_OP_SHL, ASM_OP_SHLADD, ASM_OP_SHLADDP4, ASM_OP_SHR,
-	ASM_OP_SHRP, ASM_OP_SRLZ, ASM_OP_SSM, ASM_OP_ST1, ASM_OP_ST16,
-	ASM_OP_ST2, ASM_OP_ST4, ASM_OP_ST8, ASM_OP_STF, ASM_OP_STF8,
-	ASM_OP_STFD, ASM_OP_STFE, ASM_OP_STFS, ASM_OP_SUB, ASM_OP_SUM,
-	ASM_OP_SXT1, ASM_OP_SXT2, ASM_OP_SXT4, ASM_OP_SYNC,
-	ASM_OP_TAK, ASM_OP_TBIT, ASM_OP_TF, ASM_OP_THASH, ASM_OP_TNAT,
-	ASM_OP_TPA, ASM_OP_TTAG,
-	ASM_OP_UNPACK1, ASM_OP_UNPACK2, ASM_OP_UNPACK4,
-	ASM_OP_VMSW,
-	ASM_OP_XCHG1, ASM_OP_XCHG2, ASM_OP_XCHG4, ASM_OP_XCHG8, ASM_OP_XMA,
-	ASM_OP_XOR,
-	ASM_OP_ZXT1, ASM_OP_ZXT2, ASM_OP_ZXT4,
-	/* Additional opcodes used only internally. */
-	ASM_ADDITIONAL_OPCODES
-};
-
-/* Instruction. */
-struct asm_inst {
-	uint64_t		i_bits;
-	struct asm_oper		i_oper[7];
-	struct asm_cmpltr	i_cmpltr[5];
-	enum asm_fmt		i_format;
-	enum asm_op		i_op;
-	int			i_ncmpltrs;
-	int			i_srcidx;
-};
-
-struct asm_bundle {
-	const char		*b_templ;
-	struct asm_inst		b_inst[3];
-};
-
-/* Functional units. */
-enum asm_unit {
-	ASM_UNIT_NONE,
-	ASM_UNIT_A = 0x0100,	/* A unit. */
-	ASM_UNIT_B = 0x0200,	/* B unit. */
-	ASM_UNIT_F = 0x0300,	/* F unit. */
-	ASM_UNIT_I = 0x0400,	/* I unit. */
-	ASM_UNIT_M = 0x0500,	/* M unit. */
-	ASM_UNIT_X = 0x0600	/* X unit. */
-};
-
-#ifdef _DISASM_INT_H_
-int asm_extract(enum asm_op, enum asm_fmt, uint64_t, struct asm_bundle *, int);
-#endif
-
-int asm_decode(uint64_t, struct asm_bundle *);
-
-void asm_completer(const struct asm_cmpltr *, char *);
-void asm_mnemonic(const enum asm_op, char *);
-void asm_operand(const struct asm_oper *, char *, uint64_t);
-void asm_print_bundle(const struct asm_bundle *, uint64_t);
-void asm_print_inst(const struct asm_bundle *, int, uint64_t);
-
-#endif /* _DISASM_H_ */
diff --git a/sys/ia64/disasm/disasm_decode.c b/sys/ia64/disasm/disasm_decode.c
deleted file mode 100644
index 0359e44e8e56..000000000000
--- a/sys/ia64/disasm/disasm_decode.c
+++ /dev/null
@@ -1,2565 +0,0 @@
-/*-
- * Copyright (c) 2000-2006 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-
-#include <ia64/disasm/disasm_int.h>
-#include <ia64/disasm/disasm.h>
-
-/*
- * Template names.
- */
-static const char *asm_templname[] = {
-	"MII", "MII;", "MI;I", "MI;I;", "MLX", "MLX;", 0, 0,
-	"MMI", "MMI;", "M;MI", "M;MI;", "MFI", "MFI;", "MMF", "MMF;",
-	"MIB", "MIB;", "MBB", "MBB;", 0, 0, "BBB", "BBB;",
-	"MMB", "MMB;", 0, 0, "MFB", "MFB;", 0, 0
-};
-
-/*
- * Decode A-unit instructions.
- */
-static int
-asm_decodeA(uint64_t bits, struct asm_bundle *b, int slot)
-{
-	enum asm_fmt fmt;
-	enum asm_op op;
-
-	fmt = ASM_FMT_NONE, op = ASM_OP_NONE;
-	switch((int)OPCODE(bits)) {
-	case 0x8:
-		switch (FIELD(bits, 34, 2)) { /* x2a */
-		case 0x0:
-			if (FIELD(bits, 33, 1) == 0) { /* ve */
-				switch (FIELD(bits, 29, 4)) { /* x4 */
-				case 0x0:
-					if (FIELD(bits, 27, 2) <= 1) /* x2b */
-						op = ASM_OP_ADD,
-						    fmt = ASM_FMT_A1;
-					break;
-				case 0x1:
-					if (FIELD(bits, 27, 2) <= 1) /* x2b */
-						op = ASM_OP_SUB,
-						    fmt = ASM_FMT_A1;
-					break;
-				case 0x2:
-					if (FIELD(bits, 27, 2) == 0) /* x2b */
-						op = ASM_OP_ADDP4,
-						    fmt = ASM_FMT_A1;
-					break;
-				case 0x3:
-					switch (FIELD(bits, 27, 2)) { /* x2b */
-					case 0x0:
-						op = ASM_OP_AND,
-						    fmt = ASM_FMT_A1;
-						break;
-					case 0x1:
-						op = ASM_OP_ANDCM,
-						    fmt = ASM_FMT_A1;
-						break;
-					case 0x2:
-						op = ASM_OP_OR,
-						    fmt = ASM_FMT_A1;
-						break;
-					case 0x3:
-						op = ASM_OP_XOR,
-						    fmt = ASM_FMT_A1;
-						break;
-					}
-					break;
-				case 0xB:
-					switch (FIELD(bits, 27, 2)) { /* x2b */
-					case 0x0:
-						op = ASM_OP_AND,
-						    fmt = ASM_FMT_A3;
-						break;
-					case 0x1:
-						op = ASM_OP_ANDCM,
-						    fmt = ASM_FMT_A3;
-						break;
-					case 0x2:
-						op = ASM_OP_OR,
-						    fmt = ASM_FMT_A3;
-						break;
-					case 0x3:
-						op = ASM_OP_XOR,
-						    fmt = ASM_FMT_A3;
-						break;
-					}
-					break;
-				case 0x4:
-					op = ASM_OP_SHLADD, fmt = ASM_FMT_A2;
-					break;
-				case 0x6:
-					op = ASM_OP_SHLADDP4, fmt = ASM_FMT_A2;
-					break;
-				case 0x9:
-					if (FIELD(bits, 27, 2) == 1) /* x2b */
-						op = ASM_OP_SUB,
-						    fmt = ASM_FMT_A3;
-					break;
-				}
-			}
-			break;
-		case 0x1:
-			switch (FIELD(bits, 29, 8)) { /* za + x2a + zb + x4 */
-			case 0x20:
-				switch (FIELD(bits, 27, 2)) { /* x2b */
-				case 0x0:
-					op = ASM_OP_PADD1_, fmt = ASM_FMT_A9;
-					break;
-				case 0x1:
-					op = ASM_OP_PADD1_SSS,
-					    fmt = ASM_FMT_A9;
-					break;
-				case 0x2:
-					op = ASM_OP_PADD1_UUU,
-					    fmt = ASM_FMT_A9;
-					break;
-				case 0x3:
-					op = ASM_OP_PADD1_UUS,
-					    fmt = ASM_FMT_A9;
-					break;
-				}
-				break;
-			case 0x21:
-				switch (FIELD(bits, 27, 2)) { /* x2b */
-				case 0x0:
-					op = ASM_OP_PSUB1_, fmt = ASM_FMT_A9;
-					break;
-				case 0x1:
-					op = ASM_OP_PSUB1_SSS,
-					    fmt = ASM_FMT_A9;
-					break;
-				case 0x2:
-					op = ASM_OP_PSUB1_UUU,
-					    fmt = ASM_FMT_A9;
-					break;
-				case 0x3:
-					op = ASM_OP_PSUB1_UUS,
-					    fmt = ASM_FMT_A9;
-					break;
-				}
-				break;
-			case 0x22:
-				switch (FIELD(bits, 27, 2)) { /* x2b */
-				case 0x2:
-					op = ASM_OP_PAVG1_, fmt = ASM_FMT_A9;
-					break;
-				case 0x3:
-					op = ASM_OP_PAVG1_RAZ,
-					    fmt = ASM_FMT_A9;
-					break;
-				}
-				break;
-			case 0x23:
-				if (FIELD(bits, 27, 2) == 2) /* x2b */
-					op = ASM_OP_PAVGSUB1, fmt = ASM_FMT_A9;
-				break;
-			case 0x29:
-				switch (FIELD(bits, 27, 2)) { /* x2b */
-				case 0x0:
-					op = ASM_OP_PCMP1_EQ, fmt = ASM_FMT_A9;
-					break;
-				case 0x1:
-					op = ASM_OP_PCMP1_GT, fmt = ASM_FMT_A9;
-					break;
-				}
-				break;
-			case 0x30:
-				switch (FIELD(bits, 27, 2)) { /* x2b */
-				case 0x0:
-					op = ASM_OP_PADD2_, fmt = ASM_FMT_A9;
-					break;
-				case 0x1:
-					op = ASM_OP_PADD2_SSS,
-					    fmt = ASM_FMT_A9;
-					break;
-				case 0x2:
-					op = ASM_OP_PADD2_UUU,
-					    fmt = ASM_FMT_A9;
-					break;
-				case 0x3:
-					op = ASM_OP_PADD2_UUS,
-					    fmt = ASM_FMT_A9;
-					break;
-				}
-				break;
-			case 0x31:
-				switch (FIELD(bits, 27, 2)) { /* x2b */
-				case 0x0:
-					op = ASM_OP_PSUB2_, fmt = ASM_FMT_A9;
-					break;
-				case 0x1:
-					op = ASM_OP_PSUB2_SSS,
-					    fmt = ASM_FMT_A9;
-					break;
-				case 0x2:
-					op = ASM_OP_PSUB2_UUU,
-					    fmt = ASM_FMT_A9;
-					break;
-				case 0x3:
-					op = ASM_OP_PSUB2_UUS,
-					    fmt = ASM_FMT_A9;
-					break;
-				}
-				break;
-			case 0x32:
-				switch (FIELD(bits, 27, 2)) { /* x2b */
-				case 0x2:
-					op = ASM_OP_PAVG2_, fmt = ASM_FMT_A9;
-					break;
-				case 0x3:
-					op = ASM_OP_PAVG2_RAZ,
-					    fmt = ASM_FMT_A9;
-					break;
-				}
-				break;
-			case 0x33:
-				if (FIELD(bits, 27, 2) == 2) /* x2b */
-					op = ASM_OP_PAVGSUB2, fmt = ASM_FMT_A9;
-				break;
-			case 0x34:
-				op = ASM_OP_PSHLADD2, fmt = ASM_FMT_A10;
-				break;
-			case 0x36:
-				op = ASM_OP_PSHRADD2, fmt = ASM_FMT_A10;
-				break;
-			case 0x39:
-				switch (FIELD(bits, 27, 2)) { /* x2b */
-				case 0x0:
-					op = ASM_OP_PCMP2_EQ, fmt = ASM_FMT_A9;
-					break;
-				case 0x1:
-					op = ASM_OP_PCMP2_GT, fmt = ASM_FMT_A9;
-					break;
-				}
-				break;
-			case 0xA0:
-				if (FIELD(bits, 27, 2) == 0) /* x2b */
-					op = ASM_OP_PADD4, fmt = ASM_FMT_A9;
-				break;
-			case 0xA1:
-				if (FIELD(bits, 27, 2) == 0) /* x2b */
-					op = ASM_OP_PSUB4, fmt = ASM_FMT_A9;
-				break;
-			case 0xA9:
-				switch (FIELD(bits, 27, 2)) { /* x2b */
-				case 0x0:
-					op = ASM_OP_PCMP4_EQ, fmt = ASM_FMT_A9;
-					break;
-				case 0x1:
-					op = ASM_OP_PCMP4_GT, fmt = ASM_FMT_A9;
-					break;
-				}
-				break;
-			}
-			break;
-		case 0x2:
-			if (FIELD(bits, 33, 1) == 0) /* ve */
-				op = ASM_OP_ADDS, fmt = ASM_FMT_A4;
-			break;
-		case 0x3:
-			if (FIELD(bits, 33, 1) == 0) /* ve */
-				op = ASM_OP_ADDP4, fmt = ASM_FMT_A4;
-			break;
-		}
-		break;
-	case 0x9:
-		op = ASM_OP_ADDL, fmt = ASM_FMT_A5;
-		break;
-	case 0xC: case 0xD: case 0xE:
-		if (FIELD(bits, 12, 1) == 0) { /* c */
-			switch (FIELD(bits, 33, 8)) { /* maj + tb + x2 + ta */
-			case 0xC0:
-				op = ASM_OP_CMP_LT, fmt = ASM_FMT_A6;
-				break;
-			case 0xC1:
-				op = ASM_OP_CMP_EQ_AND, fmt = ASM_FMT_A6;
-				break;
-			case 0xC2:
-				op = ASM_OP_CMP4_LT, fmt = ASM_FMT_A6;
-				break;
-			case 0xC3:
-				op = ASM_OP_CMP4_EQ_AND, fmt = ASM_FMT_A6;
-				break;
-			case 0xC4: case 0xCC:
-				op = ASM_OP_CMP_LT, fmt = ASM_FMT_A8;
-				break;
-			case 0xC5: case 0xCD:
-				op = ASM_OP_CMP_EQ_AND, fmt = ASM_FMT_A8;
-				break;
-			case 0xC6: case 0xCE:
-				op = ASM_OP_CMP4_LT, fmt = ASM_FMT_A8;
-				break;
-			case 0xC7: case 0xCF:
-				op = ASM_OP_CMP4_EQ_AND, fmt = ASM_FMT_A8;
-				break;
-			case 0xC8:
-				op = ASM_OP_CMP_GT_AND, fmt = ASM_FMT_A7;
-				break;
-			case 0xC9:
-				op = ASM_OP_CMP_GE_AND, fmt = ASM_FMT_A7;
-				break;
-			case 0xCA:
-				op = ASM_OP_CMP4_GT_AND, fmt = ASM_FMT_A7;
-				break;
-			case 0xCB:
-				op = ASM_OP_CMP4_GE_AND, fmt = ASM_FMT_A7;
-				break;
-			case 0xD0:
-				op = ASM_OP_CMP_LTU, fmt = ASM_FMT_A6;
-				break;
-			case 0xD1:
-				op = ASM_OP_CMP_EQ_OR, fmt = ASM_FMT_A6;
-				break;
-			case 0xD2:
-				op = ASM_OP_CMP4_LTU, fmt = ASM_FMT_A6;
-				break;
-			case 0xD3:
-				op = ASM_OP_CMP4_EQ_OR, fmt = ASM_FMT_A6;
-				break;
-			case 0xD4: case 0xDC:
-				op = ASM_OP_CMP_LTU, fmt = ASM_FMT_A8;
-				break;
-			case 0xD5: case 0xDD:
-				op = ASM_OP_CMP_EQ_OR, fmt = ASM_FMT_A8;
-				break;
-			case 0xD6: case 0xDE:
-				op = ASM_OP_CMP4_LTU, fmt = ASM_FMT_A8;
-				break;
-			case 0xD7: case 0xDF:
-				op = ASM_OP_CMP4_EQ_OR, fmt = ASM_FMT_A8;
-				break;
-			case 0xD8:
-				op = ASM_OP_CMP_GT_OR, fmt = ASM_FMT_A7;
-				break;
-			case 0xD9:
-				op = ASM_OP_CMP_GE_OR, fmt = ASM_FMT_A7;
-				break;
-			case 0xDA:
-				op = ASM_OP_CMP4_GT_OR, fmt = ASM_FMT_A7;
-				break;
-			case 0xDB:
-				op = ASM_OP_CMP4_GE_OR, fmt = ASM_FMT_A7;
-				break;
-			case 0xE0:
-				op = ASM_OP_CMP_EQ, fmt = ASM_FMT_A6;
-				break;
-			case 0xE1:
-				op = ASM_OP_CMP_EQ_OR_ANDCM, fmt = ASM_FMT_A6;
-				break;
-			case 0xE2:
-				op = ASM_OP_CMP4_EQ, fmt = ASM_FMT_A6;
-				break;
-			case 0xE3:
-				op = ASM_OP_CMP4_EQ_OR_ANDCM, fmt = ASM_FMT_A6;
-				break;
-			case 0xE4: case 0xEC:
-				op = ASM_OP_CMP_EQ, fmt = ASM_FMT_A8;
-				break;
-			case 0xE5: case 0xED:
-				op = ASM_OP_CMP_EQ_OR_ANDCM, fmt = ASM_FMT_A8;
-				break;
-			case 0xE6: case 0xEE:
-				op = ASM_OP_CMP4_EQ, fmt = ASM_FMT_A8;
-				break;
-			case 0xE7: case 0xEF:
-				op = ASM_OP_CMP4_EQ_OR_ANDCM, fmt = ASM_FMT_A8;
-				break;
-			case 0xE8:
-				op = ASM_OP_CMP_GT_OR_ANDCM, fmt = ASM_FMT_A7;
-				break;
-			case 0xE9:
-				op = ASM_OP_CMP_GE_OR_ANDCM, fmt = ASM_FMT_A7;
-				break;
-			case 0xEA:
-				op = ASM_OP_CMP4_GT_OR_ANDCM, fmt = ASM_FMT_A7;
-				break;
-			case 0xEB:
-				op = ASM_OP_CMP4_GE_OR_ANDCM, fmt = ASM_FMT_A7;
-				break;
-			}
-		} else {
-			switch (FIELD(bits, 33, 8)) { /* maj + tb + x2 + ta */
-			case 0xC0:
-				op = ASM_OP_CMP_LT_UNC, fmt = ASM_FMT_A6;
-				break;
-			case 0xC1:
-				op = ASM_OP_CMP_NE_AND, fmt = ASM_FMT_A6;
-				break;
-			case 0xC2:
-				op = ASM_OP_CMP4_LT_UNC, fmt = ASM_FMT_A6;
-				break;
-			case 0xC3:
-				op = ASM_OP_CMP4_NE_AND, fmt = ASM_FMT_A6;
-				break;
-			case 0xC4: case 0xCC:
-				op = ASM_OP_CMP_LT_UNC, fmt = ASM_FMT_A8;
-				break;
-			case 0xC5: case 0xCD:
-				op = ASM_OP_CMP_NE_AND, fmt = ASM_FMT_A8;
-				break;
-			case 0xC6: case 0xCE:
-				op = ASM_OP_CMP4_LT_UNC, fmt = ASM_FMT_A8;
-				break;
-			case 0xC7: case 0xCF:
-				op = ASM_OP_CMP4_NE_AND, fmt = ASM_FMT_A8;
-				break;
-			case 0xC8:
-				op = ASM_OP_CMP_LE_AND, fmt = ASM_FMT_A7;
-				break;
-			case 0xC9:
-				op = ASM_OP_CMP_LT_AND, fmt = ASM_FMT_A7;
-				break;
-			case 0xCA:
-				op = ASM_OP_CMP4_LE_AND, fmt = ASM_FMT_A7;
-				break;
-			case 0xCB:
-				op = ASM_OP_CMP4_LT_AND, fmt = ASM_FMT_A7;
-				break;
-			case 0xD0:
-				op = ASM_OP_CMP_LTU_UNC, fmt = ASM_FMT_A6;
-				break;
-			case 0xD1:
-				op = ASM_OP_CMP_NE_OR, fmt = ASM_FMT_A6;
-				break;
-			case 0xD2:
-				op = ASM_OP_CMP4_LTU_UNC, fmt = ASM_FMT_A6;
-				break;
-			case 0xD3:
-				op = ASM_OP_CMP4_NE_OR, fmt = ASM_FMT_A6;
-				break;
-			case 0xD4: case 0xDC:
-				op = ASM_OP_CMP_LTU_UNC, fmt = ASM_FMT_A8;
-				break;
-			case 0xD5: case 0xDD:
-				op = ASM_OP_CMP_NE_OR, fmt = ASM_FMT_A8;
-				break;
-			case 0xD6: case 0xDE:
-				op = ASM_OP_CMP4_LTU_UNC, fmt = ASM_FMT_A8;
-				break;
-			case 0xD7: case 0xDF:
-				op = ASM_OP_CMP4_NE_OR, fmt = ASM_FMT_A8;
-				break;
-			case 0xD8:
-				op = ASM_OP_CMP_LE_OR, fmt = ASM_FMT_A7;
-				break;
-			case 0xD9:
-				op = ASM_OP_CMP_LT_OR, fmt = ASM_FMT_A7;
-				break;
-			case 0xDA:
-				op = ASM_OP_CMP4_LE_OR, fmt = ASM_FMT_A7;
-				break;
-			case 0xDB:
-				op = ASM_OP_CMP4_LT_OR, fmt = ASM_FMT_A7;
-				break;
-			case 0xE0:
-				op = ASM_OP_CMP_EQ_UNC, fmt = ASM_FMT_A6;
-				break;
-			case 0xE1:
-				op = ASM_OP_CMP_NE_OR_ANDCM, fmt = ASM_FMT_A6;
-				break;
-			case 0xE2:
-				op = ASM_OP_CMP4_EQ_UNC, fmt = ASM_FMT_A6;
-				break;
-			case 0xE3:
-				op = ASM_OP_CMP4_NE_OR_ANDCM, fmt = ASM_FMT_A6;
-				break;
-			case 0xE4: case 0xEC:
-				op = ASM_OP_CMP_EQ_UNC, fmt = ASM_FMT_A8;
-				break;
-			case 0xE5: case 0xED:
-				op = ASM_OP_CMP_NE_OR_ANDCM, fmt = ASM_FMT_A8;
-				break;
-			case 0xE6: case 0xEE:
-				op = ASM_OP_CMP4_EQ_UNC, fmt = ASM_FMT_A8;
-				break;
-			case 0xE7: case 0xEF:
-				op = ASM_OP_CMP4_NE_OR_ANDCM, fmt = ASM_FMT_A8;
-				break;
-			case 0xE8:
-				op = ASM_OP_CMP_LE_OR_ANDCM, fmt = ASM_FMT_A7;
-				break;
-			case 0xE9:
-				op = ASM_OP_CMP_LT_OR_ANDCM, fmt = ASM_FMT_A7;
-				break;
-			case 0xEA:
-				op = ASM_OP_CMP4_LE_OR_ANDCM, fmt = ASM_FMT_A7;
-				break;
-			case 0xEB:
-				op = ASM_OP_CMP4_LT_OR_ANDCM, fmt = ASM_FMT_A7;
-				break;
-			}
-		}
-		break;
-	}
-
-	if (op != ASM_OP_NONE)
-		return (asm_extract(op, fmt, bits, b, slot));
-	return (0);
-}
-
-/*
- * Decode B-unit instructions.
- */
-static int
-asm_decodeB(uint64_t ip, struct asm_bundle *b, int slot)
-{
-	uint64_t bits;
-	enum asm_fmt fmt;
-	enum asm_op op;
-
-	bits = SLOT(ip, slot);
-	fmt = ASM_FMT_NONE, op = ASM_OP_NONE;
-
-	switch((int)OPCODE(bits)) {
-	case 0x0:
-		switch (FIELD(bits, 27, 6)) { /* x6 */
-		case 0x0:
-			op = ASM_OP_BREAK_B, fmt = ASM_FMT_B9;
-			break;
-		case 0x2:
-			op = ASM_OP_COVER, fmt = ASM_FMT_B8;
-			break;
-		case 0x4:
-			op = ASM_OP_CLRRRB_, fmt = ASM_FMT_B8;
-			break;
-		case 0x5:
-			op = ASM_OP_CLRRRB_PR, fmt = ASM_FMT_B8;
-			break;
-		case 0x8:
-			op = ASM_OP_RFI, fmt = ASM_FMT_B8;
-			break;
-		case 0xC:
-			op = ASM_OP_BSW_0, fmt = ASM_FMT_B8;
-			break;
-		case 0xD:
-			op = ASM_OP_BSW_1, fmt = ASM_FMT_B8;
-			break;
-		case 0x10:
-			op = ASM_OP_EPC, fmt = ASM_FMT_B8;
-			break;
-		case 0x18:
-			op = ASM_OP_VMSW_0, fmt = ASM_FMT_B8;
-			break;
-		case 0x19:
-			op = ASM_OP_VMSW_1, fmt = ASM_FMT_B8;
-			break;
-		case 0x20:
-			switch (FIELD(bits, 6, 3)) { /* btype */
-			case 0x0:
-				op = ASM_OP_BR_COND, fmt = ASM_FMT_B4;
-				break;
-			case 0x1:
-				op = ASM_OP_BR_IA, fmt = ASM_FMT_B4;
-				break;
-			}
-			break;
-		case 0x21:
-			if (FIELD(bits, 6, 3) == 4) /* btype */
-				op = ASM_OP_BR_RET, fmt = ASM_FMT_B4;
-			break;
-		}
-		break;
-	case 0x1:
-		op = ASM_OP_BR_CALL, fmt = ASM_FMT_B5;
-		break;
-	case 0x2:
-		switch (FIELD(bits, 27, 6)) { /* x6 */
-		case 0x0:
-			op = ASM_OP_NOP_B, fmt = ASM_FMT_B9;
-			break;
-		case 0x1:
-			op = ASM_OP_HINT_B, fmt = ASM_FMT_B9;
-			break;
-		case 0x10:
-			op = ASM_OP_BRP_, fmt = ASM_FMT_B7;
-			break;
-		case 0x11:
-			op = ASM_OP_BRP_RET, fmt = ASM_FMT_B7;
-			break;
-		}
-		break;
-	case 0x4:
-		switch (FIELD(bits, 6, 3)) { /* btype */
-		case 0x0:
-			op = ASM_OP_BR_COND, fmt = ASM_FMT_B1;
-			break;
-		case 0x2:
-			op = ASM_OP_BR_WEXIT, fmt = ASM_FMT_B1;
-			break;
-		case 0x3:
-			op = ASM_OP_BR_WTOP, fmt = ASM_FMT_B1;
-			break;
-		case 0x5:
-			op = ASM_OP_BR_CLOOP, fmt = ASM_FMT_B2;
-			break;
-		case 0x6:
-			op = ASM_OP_BR_CEXIT, fmt = ASM_FMT_B2;
-			break;
-		case 0x7:
-			op = ASM_OP_BR_CTOP, fmt = ASM_FMT_B2;
-			break;
-		}
-		break;
-	case 0x5:
-		op = ASM_OP_BR_CALL, fmt = ASM_FMT_B3;
-		break;
-	case 0x7:
-		op = ASM_OP_BRP_, fmt = ASM_FMT_B6;
-		break;
-	}
-
-	if (op != ASM_OP_NONE)
-		return (asm_extract(op, fmt, bits, b, slot));
-	return (0);
-}
-
-/*
- * Decode F-unit instructions.
- */
-static int
-asm_decodeF(uint64_t ip, struct asm_bundle *b, int slot)
-{
-	uint64_t bits;
-	enum asm_fmt fmt;
-	enum asm_op op;
-
-	bits = SLOT(ip, slot);
-	fmt = ASM_FMT_NONE, op = ASM_OP_NONE;
-
-	switch((int)OPCODE(bits)) {
-	case 0x0:
-		if (FIELD(bits, 33, 1) == 0) { /* x */
-			switch (FIELD(bits, 27, 6)) { /* x6 */
-			case 0x0:
-				op = ASM_OP_BREAK_F, fmt = ASM_FMT_F15;
-				break;
-			case 0x1:
-				if (FIELD(bits, 26, 1) == 0) /* y */
-					op = ASM_OP_NOP_F, fmt = ASM_FMT_F16;
-				else  
-					op = ASM_OP_HINT_F, fmt = ASM_FMT_F16;
-				break;
-			case 0x4:
-				op = ASM_OP_FSETC, fmt = ASM_FMT_F12;
-				break;
-			case 0x5:
-				op = ASM_OP_FCLRF, fmt = ASM_FMT_F13;
-				break;
-			case 0x8:
-				op = ASM_OP_FCHKF, fmt = ASM_FMT_F14;
-				break;
-			case 0x10:
-				op = ASM_OP_FMERGE_S, fmt = ASM_FMT_F9;
-				break;
-			case 0x11:
-				op = ASM_OP_FMERGE_NS, fmt = ASM_FMT_F9;
-				break;
-			case 0x12:
-				op = ASM_OP_FMERGE_SE, fmt = ASM_FMT_F9;
-				break;
-			case 0x14:
-				op = ASM_OP_FMIN, fmt = ASM_FMT_F8;
-				break;
-			case 0x15:
-				op = ASM_OP_FMAX, fmt = ASM_FMT_F8;
-				break;
-			case 0x16:
-				op = ASM_OP_FAMIN, fmt = ASM_FMT_F8;
-				break;
-			case 0x17:
-				op = ASM_OP_FAMAX, fmt = ASM_FMT_F8;
-				break;
-			case 0x18:
-				op = ASM_OP_FCVT_FX, fmt = ASM_FMT_F10;
-				break;
-			case 0x19:
-				op = ASM_OP_FCVT_FXU, fmt = ASM_FMT_F10;
-				break;
-			case 0x1A:
-				op = ASM_OP_FCVT_FX_TRUNC, fmt = ASM_FMT_F10;
-				break;
-			case 0x1B:
-				op = ASM_OP_FCVT_FXU_TRUNC, fmt = ASM_FMT_F10;
-				break;
-			case 0x1C:
-				op = ASM_OP_FCVT_XF, fmt = ASM_FMT_F11;
-				break;
-			case 0x28:
-				op = ASM_OP_FPACK, fmt = ASM_FMT_F9;
-				break;
-			case 0x2C:
-				op = ASM_OP_FAND, fmt = ASM_FMT_F9;
-				break;
-			case 0x2D:
-				op = ASM_OP_FANDCM, fmt = ASM_FMT_F9;
-				break;
-			case 0x2E:
-				op = ASM_OP_FOR, fmt = ASM_FMT_F9;
-				break;
-			case 0x2F:
-				op = ASM_OP_FXOR, fmt = ASM_FMT_F9;
-				break;
-			case 0x34:
-				op = ASM_OP_FSWAP_, fmt = ASM_FMT_F9;
-				break;
-			case 0x35:
-				op = ASM_OP_FSWAP_NL, fmt = ASM_FMT_F9;
-				break;
-			case 0x36:
-				op = ASM_OP_FSWAP_NR, fmt = ASM_FMT_F9;
-				break;
-			case 0x39:
-				op = ASM_OP_FMIX_LR, fmt = ASM_FMT_F9;
-				break;
-			case 0x3A:
-				op = ASM_OP_FMIX_R, fmt = ASM_FMT_F9;
-				break;
-			case 0x3B:
-				op = ASM_OP_FMIX_L, fmt = ASM_FMT_F9;
-				break;
-			case 0x3C:
-				op = ASM_OP_FSXT_R, fmt = ASM_FMT_F9;
-				break;
-			case 0x3D:
-				op = ASM_OP_FSXT_L, fmt = ASM_FMT_F9;
-				break;
-			}
-		} else {
-			if (FIELD(bits, 36, 1) == 0) /* q */
-				op = ASM_OP_FRCPA, fmt = ASM_FMT_F6;
-			else
-				op = ASM_OP_FRSQRTA, fmt = ASM_FMT_F7;
-		}
-		break;
-	case 0x1:
-		if (FIELD(bits, 33, 1) == 0) { /* x */
-			switch (FIELD(bits, 27, 6)) { /* x6 */
-			case 0x10:
-				op = ASM_OP_FPMERGE_S, fmt = ASM_FMT_F9;
-				break;
-			case 0x11:
-				op = ASM_OP_FPMERGE_NS, fmt = ASM_FMT_F9;
-				break;
-			case 0x12:
-				op = ASM_OP_FPMERGE_SE, fmt = ASM_FMT_F9;
-				break;
-			case 0x14:
-				op = ASM_OP_FPMIN, fmt = ASM_FMT_F8;
-				break;
-			case 0x15:
-				op = ASM_OP_FPMAX, fmt = ASM_FMT_F8;
-				break;
-			case 0x16:
-				op = ASM_OP_FPAMIN, fmt = ASM_FMT_F8;
-				break;
-			case 0x17:
-				op = ASM_OP_FPAMAX, fmt = ASM_FMT_F8;
-				break;
-			case 0x18:
-				op = ASM_OP_FPCVT_FX, fmt = ASM_FMT_F10;
-				break;
-			case 0x19:
-				op = ASM_OP_FPCVT_FXU, fmt = ASM_FMT_F10;
-				break;
-			case 0x1A:
-				op = ASM_OP_FPCVT_FX_TRUNC, fmt = ASM_FMT_F10;
-				break;
-			case 0x1B:
-				op = ASM_OP_FPCVT_FXU_TRUNC, fmt = ASM_FMT_F10;
-				break;
-			case 0x30:
-				op = ASM_OP_FPCMP_EQ, fmt = ASM_FMT_F8;
-				break;
-			case 0x31:
-				op = ASM_OP_FPCMP_LT, fmt = ASM_FMT_F8;
-				break;
-			case 0x32:
-				op = ASM_OP_FPCMP_LE, fmt = ASM_FMT_F8;
-				break;
-			case 0x33:
-				op = ASM_OP_FPCMP_UNORD, fmt = ASM_FMT_F8;
-				break;
-			case 0x34:
-				op = ASM_OP_FPCMP_NEQ, fmt = ASM_FMT_F8;
-				break;
-			case 0x35:
-				op = ASM_OP_FPCMP_NLT, fmt = ASM_FMT_F8;
-				break;
-			case 0x36:
-				op = ASM_OP_FPCMP_NLE, fmt = ASM_FMT_F8;
-				break;
-			case 0x37:
-				op = ASM_OP_FPCMP_ORD, fmt = ASM_FMT_F8;
-				break;
-			}
-		} else {
-			if (FIELD(bits, 36, 1) == 0) /* q */
-				op = ASM_OP_FPRCPA, fmt = ASM_FMT_F6;
-			else
-				op = ASM_OP_FPRSQRTA, fmt = ASM_FMT_F7;
-		}
-		break;
-	case 0x4:
-		op = ASM_OP_FCMP, fmt = ASM_FMT_F4;
-		break;
-	case 0x5:
-		op = ASM_OP_FCLASS_M, fmt = ASM_FMT_F5;
-		break;
-	case 0x8:
-		if (FIELD(bits, 36, 1) == 0) /* x */
-			op = ASM_OP_FMA_, fmt = ASM_FMT_F1;
-		else
-			op = ASM_OP_FMA_S, fmt = ASM_FMT_F1;
-		break;
-	case 0x9:
-		if (FIELD(bits, 36, 1) == 0) /* x */
-			op = ASM_OP_FMA_D, fmt = ASM_FMT_F1;
-		else
-			op = ASM_OP_FPMA, fmt = ASM_FMT_F1;
-		break;
-	case 0xA:
-		if (FIELD(bits, 36, 1) == 0) /* x */
-			op = ASM_OP_FMS_, fmt = ASM_FMT_F1;
-		else
-			op = ASM_OP_FMS_S, fmt = ASM_FMT_F1;
-		break;
-	case 0xB:
-		if (FIELD(bits, 36, 1) == 0) /* x */
-			op = ASM_OP_FMS_D, fmt = ASM_FMT_F1;
-		else
-			op = ASM_OP_FPMS, fmt = ASM_FMT_F1;
-		break;
-	case 0xC:
-		if (FIELD(bits, 36, 1) == 0) /* x */
-			op = ASM_OP_FNMA_, fmt = ASM_FMT_F1;
-		else
-			op = ASM_OP_FNMA_S, fmt = ASM_FMT_F1;
-		break;
-	case 0xD:
-		if (FIELD(bits, 36, 1) == 0) /* x */
-			op = ASM_OP_FNMA_D, fmt = ASM_FMT_F1;
-		else
-			op = ASM_OP_FPNMA, fmt = ASM_FMT_F1;
-		break;
-	case 0xE:
-		if (FIELD(bits, 36, 1) == 1) { /* x */
-			switch (FIELD(bits, 34, 2)) { /* x2 */
-			case 0x0:
-				op = ASM_OP_XMA_L, fmt = ASM_FMT_F2;
-				break;
-			case 0x2:
-				op = ASM_OP_XMA_HU, fmt = ASM_FMT_F2;
-				break;
-			case 0x3:
-				op = ASM_OP_XMA_H, fmt = ASM_FMT_F2;
-				break;
-			}
-		} else
-			op = ASM_OP_FSELECT, fmt = ASM_FMT_F3;
-		break;
-	}
-
-	if (op != ASM_OP_NONE)
-		return (asm_extract(op, fmt, bits, b, slot));
-	return (0);
-}
-
-/*
- * Decode I-unit instructions.
- */
-static int
-asm_decodeI(uint64_t ip, struct asm_bundle *b, int slot)
-{
-	uint64_t bits;
-	enum asm_fmt fmt;
-	enum asm_op op;
-
-	bits = SLOT(ip, slot);
-	if ((int)OPCODE(bits) >= 8)
-		return (asm_decodeA(bits, b, slot));
-	fmt = ASM_FMT_NONE, op = ASM_OP_NONE;
-
-	switch((int)OPCODE(bits)) {
-	case 0x0:
-		switch (FIELD(bits, 33, 3)) { /* x3 */
-		case 0x0:
-			switch (FIELD(bits, 27, 6)) { /* x6 */
-			case 0x0:
-				op = ASM_OP_BREAK_I, fmt = ASM_FMT_I19;
-				break;
-			case 0x1:
-				if (FIELD(bits, 26, 1) == 0) /* y */
-					op = ASM_OP_NOP_I, fmt = ASM_FMT_I18;
-				else
-					op = ASM_OP_HINT_I, fmt = ASM_FMT_I18;
-				break;
-			case 0xA:
-				op = ASM_OP_MOV_I, fmt = ASM_FMT_I27;
-				break;
-			case 0x10:
-				op = ASM_OP_ZXT1, fmt = ASM_FMT_I29;
-				break;
-			case 0x11:
-				op = ASM_OP_ZXT2, fmt = ASM_FMT_I29;
-				break;
-			case 0x12:
-				op = ASM_OP_ZXT4, fmt = ASM_FMT_I29;
-				break;
-			case 0x14:
-				op = ASM_OP_SXT1, fmt = ASM_FMT_I29;
-				break;
-			case 0x15:
-				op = ASM_OP_SXT2, fmt = ASM_FMT_I29;
-				break;
-			case 0x16:
-				op = ASM_OP_SXT4, fmt = ASM_FMT_I29;
-				break;
-			case 0x18:
-				op = ASM_OP_CZX1_L, fmt = ASM_FMT_I29;
-				break;
-			case 0x19:
-				op = ASM_OP_CZX2_L, fmt = ASM_FMT_I29;
-				break;
-			case 0x1C:
-				op = ASM_OP_CZX1_R, fmt = ASM_FMT_I29;
-				break;
-			case 0x1D:
-				op = ASM_OP_CZX2_R, fmt = ASM_FMT_I29;
-				break;
-			case 0x2A:
-				op = ASM_OP_MOV_I, fmt = ASM_FMT_I26;
-				break;
-			case 0x30:
-				op = ASM_OP_MOV_IP, fmt = ASM_FMT_I25;
-				break;
-			case 0x31:
-				op = ASM_OP_MOV_, fmt = ASM_FMT_I22;
-				break;
-			case 0x32:
-				op = ASM_OP_MOV_I, fmt = ASM_FMT_I28;
-				break;
-			case 0x33:
-				op = ASM_OP_MOV_PR, fmt = ASM_FMT_I25;
-				break;
-			}
-			break;
-		case 0x1:
-			op = ASM_OP_CHK_S_I, fmt = ASM_FMT_I20;
-			break;
-		case 0x2:
-			op = ASM_OP_MOV_, fmt = ASM_FMT_I24;
-			break;
-		case 0x3:
-			op = ASM_OP_MOV_, fmt = ASM_FMT_I23;
-			break;
-		case 0x7:
-			if (FIELD(bits, 22, 1) == 0) /* x */
-				op = ASM_OP_MOV_, fmt = ASM_FMT_I21;
-			else
-				op = ASM_OP_MOV_RET, fmt = ASM_FMT_I21;
-			break;
-		}
-		break;
-	case 0x4:
-		op = ASM_OP_DEP_, fmt = ASM_FMT_I15;
-		break;
-	case 0x5:
-		switch (FIELD(bits, 33, 3)) { /* x + x2 */
-		case 0x0:
-			if (FIELD(bits, 36, 1) == 0) { /* tb */
-				switch (FIELD(bits, 12, 2)) { /* c + y */
-				case 0x0:
-					op = ASM_OP_TBIT_Z, fmt = ASM_FMT_I16;
-					break;
-				case 0x1:
-					op = ASM_OP_TBIT_Z_UNC,
-					    fmt = ASM_FMT_I16;
-					break;
-				case 0x2:
-					if (FIELD(bits, 19, 1) == 0) /* x */
-						op = ASM_OP_TNAT_Z,
-						    fmt = ASM_FMT_I17;
-					else
-						op = ASM_OP_TF_Z,
-						    fmt = ASM_FMT_I30;
-					break;
-				case 0x3:
-					if (FIELD(bits, 19, 1) == 0) /* x */
-						op = ASM_OP_TNAT_Z_UNC,
-						    fmt = ASM_FMT_I17;
-					else
-						op = ASM_OP_TF_Z_UNC,
-						    fmt = ASM_FMT_I30;
-					break;
-				}
-			} else {
-				switch (FIELD(bits, 12, 2)) { /* c + y */
-				case 0x0:
-					op = ASM_OP_TBIT_Z_AND,
-					    fmt = ASM_FMT_I16;
-					break;
-				case 0x1:
-					op = ASM_OP_TBIT_NZ_AND,
-					    fmt = ASM_FMT_I16;
-					break;
-				case 0x2:
-					if (FIELD(bits, 19, 1) == 0) /* x */
-						op = ASM_OP_TNAT_Z_AND,
-						    fmt = ASM_FMT_I17;
-					else
-						op = ASM_OP_TF_Z_AND,
-						    fmt = ASM_FMT_I30;
-					break;
-				case 0x3:
-					if (FIELD(bits, 19, 1) == 0) /* x */
-						op = ASM_OP_TNAT_NZ_AND,
-						    fmt = ASM_FMT_I17;
-					else
-						op = ASM_OP_TF_NZ_AND,
-						    fmt = ASM_FMT_I30;
-					break;
-				}
-			}
-			break;
-		case 0x1:
-			if (FIELD(bits, 36, 1) == 0) { /* tb */
-				switch (FIELD(bits, 12, 2)) { /* c + y */
-				case 0x0:
-					op = ASM_OP_TBIT_Z_OR,
-					    fmt = ASM_FMT_I16;
-					break;
-				case 0x1:
-					op = ASM_OP_TBIT_NZ_OR,
-					    fmt = ASM_FMT_I16;
-					break;
-				case 0x2:
-					if (FIELD(bits, 19, 1) == 0) /* x */
-						op = ASM_OP_TNAT_Z_OR,
-						    fmt = ASM_FMT_I17;
-					else
-						op = ASM_OP_TF_Z_OR,
-						    fmt = ASM_FMT_I30;
-					break;
-				case 0x3:
-					if (FIELD(bits, 19, 1) == 0) /* x */
-						op = ASM_OP_TNAT_NZ_OR,
-						    fmt = ASM_FMT_I17;
-					else
-						op = ASM_OP_TF_NZ_OR,
-						    fmt = ASM_FMT_I30;
-					break;
-				}
-			} else {
-				switch (FIELD(bits, 12, 2)) { /* c + y */
-				case 0x0:
-					op = ASM_OP_TBIT_Z_OR_ANDCM,
-					    fmt = ASM_FMT_I16;
-					break;
-				case 0x1:
-					op = ASM_OP_TBIT_NZ_OR_ANDCM,
-					    fmt = ASM_FMT_I16;
-					break;
-				case 0x2:
-					if (FIELD(bits, 19, 1) == 0) /* x */
-						op = ASM_OP_TNAT_Z_OR_ANDCM,
-						    fmt = ASM_FMT_I17;
-					else
-						op = ASM_OP_TF_Z_OR_ANDCM,
-						    fmt = ASM_FMT_I30;
-					break;
-				case 0x3:
-					if (FIELD(bits, 19, 1) == 0) /* x */
-						op = ASM_OP_TNAT_NZ_OR_ANDCM,
-						    fmt = ASM_FMT_I17;
-					else
-						op = ASM_OP_TF_NZ_OR_ANDCM,
-						    fmt = ASM_FMT_I30;
-					break;
-				}
-			}
-			break;
-		case 0x2:
-			op = ASM_OP_EXTR, fmt = ASM_FMT_I11;
-			break;
-		case 0x3:
-			if (FIELD(bits, 26, 1) == 0) /* y */
-				op = ASM_OP_DEP_Z, fmt = ASM_FMT_I12;
-			else
-				op = ASM_OP_DEP_Z, fmt = ASM_FMT_I13;
-			break;
-		case 0x6:
-			op = ASM_OP_SHRP, fmt = ASM_FMT_I10;
-			break;
-		case 0x7:
-			op = ASM_OP_DEP_, fmt = ASM_FMT_I14;
-			break;
-		}
-		break;
-	case 0x7:
-		switch (FIELD(bits, 32, 5)) { /* ve + zb + x2a + za */
-		case 0x2:
-			switch (FIELD(bits, 28, 4)) { /* x2b + x2c */
-			case 0x0:
-				op = ASM_OP_PSHR2_U, fmt = ASM_FMT_I5;
-				break;
-			case 0x1: case 0x5: case 0x9: case 0xD:
-				op = ASM_OP_PMPYSHR2_U, fmt = ASM_FMT_I1;
-				break;
-			case 0x2:
-				op = ASM_OP_PSHR2_, fmt = ASM_FMT_I5;
-				break;
-			case 0x3: case 0x7: case 0xB: case 0xF:
-				op = ASM_OP_PMPYSHR2_, fmt = ASM_FMT_I1;
-				break;
-			case 0x4:
-				op = ASM_OP_PSHL2, fmt = ASM_FMT_I7;
-				break;
-			}
-			break;
-		case 0x6:
-			switch (FIELD(bits, 28, 4)) { /* x2b + x2c */
-			case 0x1:
-				op = ASM_OP_PSHR2_U, fmt = ASM_FMT_I6;
-				break;
-			case 0x3:
-				op = ASM_OP_PSHR2_, fmt = ASM_FMT_I6;
-				break;
-			case 0x9:
-				op = ASM_OP_POPCNT, fmt = ASM_FMT_I9;
-				break;
-			}
-			break;
-		case 0x8:
-			switch (FIELD(bits, 28, 4)) { /* x2b + x2c */
-			case 0x1:
-				op = ASM_OP_PMIN1_U, fmt = ASM_FMT_I2;
-				break;
-			case 0x4:
-				op = ASM_OP_UNPACK1_H, fmt = ASM_FMT_I2;
-				break;
-			case 0x5:
-				op = ASM_OP_PMAX1_U, fmt = ASM_FMT_I2;
-				break;
-			case 0x6:
-				op = ASM_OP_UNPACK1_L, fmt = ASM_FMT_I2;
-				break;
-			case 0x8:
-				op = ASM_OP_MIX1_R, fmt = ASM_FMT_I2;
-				break;
-			case 0xA:
-				op = ASM_OP_MIX1_L, fmt = ASM_FMT_I2;
-				break;
-			case 0xB:
-				op = ASM_OP_PSAD1, fmt = ASM_FMT_I2;
-				break;
-			}
-			break;
-		case 0xA:
-			switch (FIELD(bits, 28, 4)) { /* x2b + x2c */
-			case 0x0:
-				op = ASM_OP_PACK2_USS, fmt = ASM_FMT_I2;
-				break;
-			case 0x2:
-				op = ASM_OP_PACK2_SSS, fmt = ASM_FMT_I2;
-				break;
-			case 0x3:
-				op = ASM_OP_PMIN2, fmt = ASM_FMT_I2;
-				break;
-			case 0x4:
-				op = ASM_OP_UNPACK2_H, fmt = ASM_FMT_I2;
-				break;
-			case 0x6:
-				op = ASM_OP_UNPACK2_L, fmt = ASM_FMT_I2;
-				break;
-			case 0x7:
-				op = ASM_OP_PMAX2, fmt = ASM_FMT_I2;
-				break;
-			case 0x8:
-				op = ASM_OP_MIX2_R, fmt = ASM_FMT_I2;
-				break;
-			case 0xA:
-				op = ASM_OP_MIX2_L, fmt = ASM_FMT_I2;
-				break;
-			case 0xD:
-				op = ASM_OP_PMPY2_R, fmt = ASM_FMT_I2;
-				break;
-			case 0xF:
-				op = ASM_OP_PMPY2_L, fmt = ASM_FMT_I2;
-				break;
-			}
-			break;
-		case 0xC:
-			switch (FIELD(bits, 28, 4)) { /* x2b + x2c */
-			case 0xA:
-				op = ASM_OP_MUX1, fmt = ASM_FMT_I3;
-				break;
-			}
-			break;
-		case 0xE:
-			switch (FIELD(bits, 28, 4)) { /* x2b + x2c */
-			case 0x5:
-				op = ASM_OP_PSHL2, fmt = ASM_FMT_I8;
-				break;
-			case 0xA:
-				op = ASM_OP_MUX2, fmt = ASM_FMT_I4;
-				break;
-			}
-			break;
-		case 0x10:
-			switch (FIELD(bits, 28, 4)) { /* x2b + x2c */
-			case 0x0:
-				op = ASM_OP_PSHR4_U, fmt = ASM_FMT_I5;
-				break;
-			case 0x2:
-				op = ASM_OP_PSHR4_, fmt = ASM_FMT_I5;
-				break;
-			case 0x4:
-				op = ASM_OP_PSHL4, fmt = ASM_FMT_I7;
-				break;
-			}
-			break;
-		case 0x12:
-			switch (FIELD(bits, 28, 4)) { /* x2b + x2c */
-			case 0x0:
-				op = ASM_OP_SHR_U, fmt = ASM_FMT_I5;
-				break;
-			case 0x2:
-				op = ASM_OP_SHR_, fmt = ASM_FMT_I5;
-				break;
-			case 0x4:
-				op = ASM_OP_SHL, fmt = ASM_FMT_I7;
-				break;
-			}
-			break;
-		case 0x14:
-			switch (FIELD(bits, 28, 4)) { /* x2b + x2c */
-			case 0x1:
-				op = ASM_OP_PSHR4_U, fmt = ASM_FMT_I6;
-				break;
-			case 0x3:
-				op = ASM_OP_PSHR4_, fmt = ASM_FMT_I6;
-				break;
-			}
-			break;
-		case 0x18:
-			switch (FIELD(bits, 28, 4)) { /* x2b + x2c */
-			case 0x2:
-				op = ASM_OP_PACK4_SSS, fmt = ASM_FMT_I2;
-				break;
-			case 0x4:
-				op = ASM_OP_UNPACK4_H, fmt = ASM_FMT_I2;
-				break;
-			case 0x6:
-				op = ASM_OP_UNPACK4_L, fmt = ASM_FMT_I2;
-				break;
-			case 0x8:
-				op = ASM_OP_MIX4_R, fmt = ASM_FMT_I2;
-				break;
-			case 0xA:
-				op = ASM_OP_MIX4_L, fmt = ASM_FMT_I2;
-				break;
-			}
-			break;
-		case 0x1C:
-			switch (FIELD(bits, 28, 4)) { /* x2b + x2c */
-			case 0x5:
-				op = ASM_OP_PSHL4, fmt = ASM_FMT_I8;
-				break;
-			}
-			break;
-		}
-		break;
-	}
-
-	if (op != ASM_OP_NONE)
-		return (asm_extract(op, fmt, bits, b, slot));
-	return (0);
-}
-
-/*
- * Decode M-unit instructions.
- */
-static int
-asm_decodeM(uint64_t ip, struct asm_bundle *b, int slot)
-{
-	uint64_t bits;
-	enum asm_fmt fmt;
-	enum asm_op op;
-
-	bits = SLOT(ip, slot);
-	if ((int)OPCODE(bits) >= 8)
-		return (asm_decodeA(bits, b, slot));
-	fmt = ASM_FMT_NONE, op = ASM_OP_NONE;
-
-	switch((int)OPCODE(bits)) {
-	case 0x0:
-		switch (FIELD(bits, 33, 3)) { /* x3 */
-		case 0x0:
-			switch (FIELD(bits, 27, 6)) { /* x6 (x4 + x2) */
-			case 0x0:
-				op = ASM_OP_BREAK_M, fmt = ASM_FMT_M37;
-				break;
-			case 0x1:
-				if (FIELD(bits, 26, 1) == 0) /* y */
-					op = ASM_OP_NOP_M, fmt = ASM_FMT_M48;
-				else
-					op = ASM_OP_HINT_M, fmt = ASM_FMT_M48;
-				break;
-			case 0x4: case 0x14: case 0x24: case 0x34:
-				op = ASM_OP_SUM, fmt = ASM_FMT_M44;
-				break;
-			case 0x5: case 0x15: case 0x25: case 0x35:
-				op = ASM_OP_RUM, fmt = ASM_FMT_M44;
-				break;
-			case 0x6: case 0x16: case 0x26: case 0x36:
-				op = ASM_OP_SSM, fmt = ASM_FMT_M44;
-				break;
-			case 0x7: case 0x17: case 0x27: case 0x37:
-				op = ASM_OP_RSM, fmt = ASM_FMT_M44;
-				break;
-			case 0xA:
-				op = ASM_OP_LOADRS, fmt = ASM_FMT_M25;
-				break;
-			case 0xC:
-				op = ASM_OP_FLUSHRS, fmt = ASM_FMT_M25;
-				break;
-			case 0x10:
-				op = ASM_OP_INVALA_, fmt = ASM_FMT_M24;
-				break;
-			case 0x12:
-				op = ASM_OP_INVALA_E, fmt = ASM_FMT_M26;
-				break;
-			case 0x13:
-				op = ASM_OP_INVALA_E, fmt = ASM_FMT_M27;
-				break;
-			case 0x20:
-				op = ASM_OP_FWB, fmt = ASM_FMT_M24;
-				break;
-			case 0x22:
-				op = ASM_OP_MF_, fmt = ASM_FMT_M24;
-				break;
-			case 0x23:
-				op = ASM_OP_MF_A, fmt = ASM_FMT_M24;
-				break;
-			case 0x28:
-				op = ASM_OP_MOV_M, fmt = ASM_FMT_M30;
-				break;
-			case 0x30:
-				op = ASM_OP_SRLZ_D, fmt = ASM_FMT_M24;
-				break;
-			case 0x31:
-				op = ASM_OP_SRLZ_I, fmt = ASM_FMT_M24;
-				break;
-			case 0x33:
-				op = ASM_OP_SYNC_I, fmt = ASM_FMT_M24;
-				break;
-			}
-			break;
-		case 0x4:
-			op = ASM_OP_CHK_A_NC, fmt = ASM_FMT_M22;
-			break;
-		case 0x5:
-			op = ASM_OP_CHK_A_CLR, fmt = ASM_FMT_M22;
-			break;
-		case 0x6:
-			op = ASM_OP_CHK_A_NC, fmt = ASM_FMT_M23;
-			break;
-		case 0x7:
-			op = ASM_OP_CHK_A_CLR, fmt = ASM_FMT_M23;
-			break;
-		}
-		break;
-	case 0x1:
-		switch (FIELD(bits, 33, 3)) { /* x3 */
-		case 0x0:
-			switch (FIELD(bits, 27, 6)) { /* x6 (x4 + x2) */
-			case 0x0:
-				op = ASM_OP_MOV_RR, fmt = ASM_FMT_M42;
-				break;
-			case 0x1:
-				op = ASM_OP_MOV_DBR, fmt = ASM_FMT_M42;
-				break;
-			case 0x2:
-				op = ASM_OP_MOV_IBR, fmt = ASM_FMT_M42;
-				break;
-			case 0x3:
-				op = ASM_OP_MOV_PKR, fmt = ASM_FMT_M42;
-				break;
-			case 0x4:
-				op = ASM_OP_MOV_PMC, fmt = ASM_FMT_M42;
-				break;
-			case 0x5:
-				op = ASM_OP_MOV_PMD, fmt = ASM_FMT_M42;
-				break;
-			case 0x6:
-				op = ASM_OP_MOV_MSR, fmt = ASM_FMT_M42;
-				break;
-			case 0x9:
-				op = ASM_OP_PTC_L, fmt = ASM_FMT_M45;
-				break;
-			case 0xA:
-				op = ASM_OP_PTC_G, fmt = ASM_FMT_M45;
-				break;
-			case 0xB:
-				op = ASM_OP_PTC_GA, fmt = ASM_FMT_M45;
-				break;
-			case 0xC:
-				op = ASM_OP_PTR_D, fmt = ASM_FMT_M45;
-				break;
-			case 0xD:
-				op = ASM_OP_PTR_I, fmt = ASM_FMT_M45;
-				break;
-			case 0xE:
-				op = ASM_OP_ITR_D, fmt = ASM_FMT_M42;
-				break;
-			case 0xF:
-				op = ASM_OP_ITR_I, fmt = ASM_FMT_M42;
-				break;
-			case 0x10:
-				op = ASM_OP_MOV_RR, fmt = ASM_FMT_M43;
-				break;
-			case 0x11:
-				op = ASM_OP_MOV_DBR, fmt = ASM_FMT_M43;
-				break;
-			case 0x12:
-				op = ASM_OP_MOV_IBR, fmt = ASM_FMT_M43;
-				break;
-			case 0x13:
-				op = ASM_OP_MOV_PKR, fmt = ASM_FMT_M43;
-				break;
-			case 0x14:
-				op = ASM_OP_MOV_PMC, fmt = ASM_FMT_M43;
-				break;
-			case 0x15:
-				op = ASM_OP_MOV_PMD, fmt = ASM_FMT_M43;
-				break;
-			case 0x16:
-				op = ASM_OP_MOV_MSR, fmt = ASM_FMT_M43;
-				break;
-			case 0x17:
-				op = ASM_OP_MOV_CPUID, fmt = ASM_FMT_M43;
-				break;
-			case 0x18:
-				op = ASM_OP_PROBE_R, fmt = ASM_FMT_M39;
-				break;
-			case 0x19:
-				op = ASM_OP_PROBE_W, fmt = ASM_FMT_M39;
-				break;
-			case 0x1A:
-				op = ASM_OP_THASH, fmt = ASM_FMT_M46;
-				break;
-			case 0x1B:
-				op = ASM_OP_TTAG, fmt = ASM_FMT_M46;
-				break;
-			case 0x1E:
-				op = ASM_OP_TPA, fmt = ASM_FMT_M46;
-				break;
-			case 0x1F:
-				op = ASM_OP_TAK, fmt = ASM_FMT_M46;
-				break;
-			case 0x21:
-				op = ASM_OP_MOV_PSR_UM, fmt = ASM_FMT_M36;
-				break;
-			case 0x22:
-				op = ASM_OP_MOV_M, fmt = ASM_FMT_M31;
-				break;
-			case 0x24:
-				op = ASM_OP_MOV_, fmt = ASM_FMT_M33;
-				break;
-			case 0x25:
-				op = ASM_OP_MOV_PSR, fmt = ASM_FMT_M36;
-				break;
-			case 0x29:
-				op = ASM_OP_MOV_PSR_UM, fmt = ASM_FMT_M35;
-				break;
-			case 0x2A:
-				op = ASM_OP_MOV_M, fmt = ASM_FMT_M29;
-				break;
-			case 0x2C:
-				op = ASM_OP_MOV_, fmt = ASM_FMT_M32;
-				break;
-			case 0x2D:
-				op = ASM_OP_MOV_PSR_L, fmt = ASM_FMT_M35;
-				break;
-			case 0x2E:
-				op = ASM_OP_ITC_D, fmt = ASM_FMT_M41;
-				break;
-			case 0x2F:
-				op = ASM_OP_ITC_I, fmt = ASM_FMT_M41;
-				break;
-			case 0x30:
-				if (FIELD(bits, 36, 1) == 0) /* x */
-					op = ASM_OP_FC_, fmt = ASM_FMT_M28;
-				else
-					op = ASM_OP_FC_I, fmt = ASM_FMT_M28;
-				break;
-			case 0x31:
-				op = ASM_OP_PROBE_RW_FAULT, fmt = ASM_FMT_M40;
-				break;
-			case 0x32:
-				op = ASM_OP_PROBE_R_FAULT, fmt = ASM_FMT_M40;
-				break;
-			case 0x33:
-				op = ASM_OP_PROBE_W_FAULT, fmt = ASM_FMT_M40;
-				break;
-			case 0x34:
-				op = ASM_OP_PTC_E, fmt = ASM_FMT_M47;
-				break;
-			case 0x38:
-				op = ASM_OP_PROBE_R, fmt = ASM_FMT_M38;
-				break;
-			case 0x39:
-				op = ASM_OP_PROBE_W, fmt = ASM_FMT_M38;
-				break;
-			}
-			break;
-		case 0x1:
-			op = ASM_OP_CHK_S_M, fmt = ASM_FMT_M20;
-			break;
-		case 0x3:
-			op = ASM_OP_CHK_S, fmt = ASM_FMT_M21;
-			break;
-		case 0x6:
-			op = ASM_OP_ALLOC, fmt = ASM_FMT_M34;
-			break;
-		}
-		break;
-	case 0x4:
-		if (FIELD(bits, 27, 1) == 0) { /* x */
-			switch (FIELD(bits, 30, 7)) { /* x6 + m */
-			case 0x0:
-				op = ASM_OP_LD1_, fmt = ASM_FMT_M1;
-				break;
-			case 0x1:
-				op = ASM_OP_LD2_, fmt = ASM_FMT_M1;
-				break;
-			case 0x2:
-				op = ASM_OP_LD4_, fmt = ASM_FMT_M1;
-				break;
-			case 0x3:
-				op = ASM_OP_LD8_, fmt = ASM_FMT_M1;
-				break;
-			case 0x4:
-				op = ASM_OP_LD1_S, fmt = ASM_FMT_M1;
-				break;
-			case 0x5:
-				op = ASM_OP_LD2_S, fmt = ASM_FMT_M1;
-				break;
-			case 0x6:
-				op = ASM_OP_LD4_S, fmt = ASM_FMT_M1;
-				break;
-			case 0x7:
-				op = ASM_OP_LD8_S, fmt = ASM_FMT_M1;
-				break;
-			case 0x8:
-				op = ASM_OP_LD1_A, fmt = ASM_FMT_M1;
-				break;
-			case 0x9:
-				op = ASM_OP_LD2_A, fmt = ASM_FMT_M1;
-				break;
-			case 0xA:
-				op = ASM_OP_LD4_A, fmt = ASM_FMT_M1;
-				break;
-			case 0xB:
-				op = ASM_OP_LD8_A, fmt = ASM_FMT_M1;
-				break;
-			case 0xC:
-				op = ASM_OP_LD1_SA, fmt = ASM_FMT_M1;
-				break;
-			case 0xD:
-				op = ASM_OP_LD2_SA, fmt = ASM_FMT_M1;
-				break;
-			case 0xE:
-				op = ASM_OP_LD4_SA, fmt = ASM_FMT_M1;
-				break;
-			case 0xF:
-				op = ASM_OP_LD8_SA, fmt = ASM_FMT_M1;
-				break;
-			case 0x10:
-				op = ASM_OP_LD1_BIAS, fmt = ASM_FMT_M1;
-				break;
-			case 0x11:
-				op = ASM_OP_LD2_BIAS, fmt = ASM_FMT_M1;
-				break;
-			case 0x12:
-				op = ASM_OP_LD4_BIAS, fmt = ASM_FMT_M1;
-				break;
-			case 0x13:
-				op = ASM_OP_LD8_BIAS, fmt = ASM_FMT_M1;
-				break;
-			case 0x14:
-				op = ASM_OP_LD1_ACQ, fmt = ASM_FMT_M1;
-				break;
-			case 0x15:
-				op = ASM_OP_LD2_ACQ, fmt = ASM_FMT_M1;
-				break;
-			case 0x16:
-				op = ASM_OP_LD4_ACQ, fmt = ASM_FMT_M1;
-				break;
-			case 0x17:
-				op = ASM_OP_LD8_ACQ, fmt = ASM_FMT_M1;
-				break;
-			case 0x1B:
-				op = ASM_OP_LD8_FILL, fmt = ASM_FMT_M1;
-				break;
-			case 0x20:
-				op = ASM_OP_LD1_C_CLR, fmt = ASM_FMT_M1;
-				break;
-			case 0x21:
-				op = ASM_OP_LD2_C_CLR, fmt = ASM_FMT_M1;
-				break;
-			case 0x22:
-				op = ASM_OP_LD4_C_CLR, fmt = ASM_FMT_M1;
-				break;
-			case 0x23:
-				op = ASM_OP_LD8_C_CLR, fmt = ASM_FMT_M1;
-				break;
-			case 0x24:
-				op = ASM_OP_LD1_C_NC, fmt = ASM_FMT_M1;
-				break;
-			case 0x25:
-				op = ASM_OP_LD2_C_NC, fmt = ASM_FMT_M1;
-				break;
-			case 0x26:
-				op = ASM_OP_LD4_C_NC, fmt = ASM_FMT_M1;
-				break;
-			case 0x27:
-				op = ASM_OP_LD8_C_NC, fmt = ASM_FMT_M1;
-				break;
-			case 0x28:
-				op = ASM_OP_LD1_C_CLR_ACQ, fmt = ASM_FMT_M1;
-				break;
-			case 0x29:
-				op = ASM_OP_LD2_C_CLR_ACQ, fmt = ASM_FMT_M1;
-				break;
-			case 0x2A:
-				op = ASM_OP_LD4_C_CLR_ACQ, fmt = ASM_FMT_M1;
-				break;
-			case 0x2B:
-				op = ASM_OP_LD8_C_CLR_ACQ, fmt = ASM_FMT_M1;
-				break;
-			case 0x30:
-				op = ASM_OP_ST1_, fmt = ASM_FMT_M4;
-				break;
-			case 0x31:
-				op = ASM_OP_ST2_, fmt = ASM_FMT_M4;
-				break;
-			case 0x32:
-				op = ASM_OP_ST4_, fmt = ASM_FMT_M4;
-				break;
-			case 0x33:
-				op = ASM_OP_ST8_, fmt = ASM_FMT_M4;
-				break;
-			case 0x34:
-				op = ASM_OP_ST1_REL, fmt = ASM_FMT_M4;
-				break;
-			case 0x35:
-				op = ASM_OP_ST2_REL, fmt = ASM_FMT_M4;
-				break;
-			case 0x36:
-				op = ASM_OP_ST4_REL, fmt = ASM_FMT_M4;
-				break;
-			case 0x37:
-				op = ASM_OP_ST8_REL, fmt = ASM_FMT_M4;
-				break;
-			case 0x3B:
-				op = ASM_OP_ST8_SPILL, fmt = ASM_FMT_M4;
-				break;
-			case 0x40:
-				op = ASM_OP_LD1_, fmt = ASM_FMT_M2;
-				break;
-			case 0x41:
-				op = ASM_OP_LD2_, fmt = ASM_FMT_M2;
-				break;
-			case 0x42:
-				op = ASM_OP_LD4_, fmt = ASM_FMT_M2;
-				break;
-			case 0x43:
-				op = ASM_OP_LD8_, fmt = ASM_FMT_M2;
-				break;
-			case 0x44:
-				op = ASM_OP_LD1_S, fmt = ASM_FMT_M2;
-				break;
-			case 0x45:
-				op = ASM_OP_LD2_S, fmt = ASM_FMT_M2;
-				break;
-			case 0x46:
-				op = ASM_OP_LD4_S, fmt = ASM_FMT_M2;
-				break;
-			case 0x47:
-				op = ASM_OP_LD8_S, fmt = ASM_FMT_M2;
-				break;
-			case 0x48:
-				op = ASM_OP_LD1_A, fmt = ASM_FMT_M2;
-				break;
-			case 0x49:
-				op = ASM_OP_LD2_A, fmt = ASM_FMT_M2;
-				break;
-			case 0x4A:
-				op = ASM_OP_LD4_A, fmt = ASM_FMT_M2;
-				break;
-			case 0x4B:
-				op = ASM_OP_LD8_A, fmt = ASM_FMT_M2;
-				break;
-			case 0x4C:
-				op = ASM_OP_LD1_SA, fmt = ASM_FMT_M2;
-				break;
-			case 0x4D:
-				op = ASM_OP_LD2_SA, fmt = ASM_FMT_M2;
-				break;
-			case 0x4E:
-				op = ASM_OP_LD4_SA, fmt = ASM_FMT_M2;
-				break;
-			case 0x4F:
-				op = ASM_OP_LD8_SA, fmt = ASM_FMT_M2;
-				break;
-			case 0x50:
-				op = ASM_OP_LD1_BIAS, fmt = ASM_FMT_M2;
-				break;
-			case 0x51:
-				op = ASM_OP_LD2_BIAS, fmt = ASM_FMT_M2;
-				break;
-			case 0x52:
-				op = ASM_OP_LD4_BIAS, fmt = ASM_FMT_M2;
-				break;
-			case 0x53:
-				op = ASM_OP_LD8_BIAS, fmt = ASM_FMT_M2;
-				break;
-			case 0x54:
-				op = ASM_OP_LD1_ACQ, fmt = ASM_FMT_M2;
-				break;
-			case 0x55:
-				op = ASM_OP_LD2_ACQ, fmt = ASM_FMT_M2;
-				break;
-			case 0x56:
-				op = ASM_OP_LD4_ACQ, fmt = ASM_FMT_M2;
-				break;
-			case 0x57:
-				op = ASM_OP_LD8_ACQ, fmt = ASM_FMT_M2;
-				break;
-			case 0x5B:
-				op = ASM_OP_LD8_FILL, fmt = ASM_FMT_M2;
-				break;
-			case 0x60:
-				op = ASM_OP_LD1_C_CLR, fmt = ASM_FMT_M2;
-				break;
-			case 0x61:
-				op = ASM_OP_LD2_C_CLR, fmt = ASM_FMT_M2;
-				break;
-			case 0x62:
-				op = ASM_OP_LD4_C_CLR, fmt = ASM_FMT_M2;
-				break;
-			case 0x63:
-				op = ASM_OP_LD8_C_CLR, fmt = ASM_FMT_M2;
-				break;
-			case 0x64:
-				op = ASM_OP_LD1_C_NC, fmt = ASM_FMT_M2;
-				break;
-			case 0x65:
-				op = ASM_OP_LD2_C_NC, fmt = ASM_FMT_M2;
-				break;
-			case 0x66:
-				op = ASM_OP_LD4_C_NC, fmt = ASM_FMT_M2;
-				break;
-			case 0x67:
-				op = ASM_OP_LD8_C_NC, fmt = ASM_FMT_M2;
-				break;
-			case 0x68:
-				op = ASM_OP_LD1_C_CLR_ACQ, fmt = ASM_FMT_M2;
-				break;
-			case 0x69:
-				op = ASM_OP_LD2_C_CLR_ACQ, fmt = ASM_FMT_M2;
-				break;
-			case 0x6A:
-				op = ASM_OP_LD4_C_CLR_ACQ, fmt = ASM_FMT_M2;
-				break;
-			case 0x6B:
-				op = ASM_OP_LD8_C_CLR_ACQ, fmt = ASM_FMT_M2;
-				break;
-			}
-		} else {
-			switch (FIELD(bits, 30, 7)) { /* x6 + m */
-			case 0x0:
-				op = ASM_OP_CMPXCHG1_ACQ, fmt = ASM_FMT_M16;
-				break;
-			case 0x1:
-				op = ASM_OP_CMPXCHG2_ACQ, fmt = ASM_FMT_M16;
-				break;
-			case 0x2:
-				op = ASM_OP_CMPXCHG4_ACQ, fmt = ASM_FMT_M16;
-				break;
-			case 0x3:
-				op = ASM_OP_CMPXCHG8_ACQ, fmt = ASM_FMT_M16;
-				break;
-			case 0x4:
-				op = ASM_OP_CMPXCHG1_REL, fmt = ASM_FMT_M16;
-				break;
-			case 0x5:
-				op = ASM_OP_CMPXCHG2_REL, fmt = ASM_FMT_M16;
-				break;
-			case 0x6:
-				op = ASM_OP_CMPXCHG4_REL, fmt = ASM_FMT_M16;
-				break;
-			case 0x7:
-				op = ASM_OP_CMPXCHG8_REL, fmt = ASM_FMT_M16;
-				break;
-			case 0x8:
-				op = ASM_OP_XCHG1, fmt = ASM_FMT_M16;
-				break;
-			case 0x9:
-				op = ASM_OP_XCHG2, fmt = ASM_FMT_M16;
-				break;
-			case 0xA:
-				op = ASM_OP_XCHG4, fmt = ASM_FMT_M16;
-				break;
-			case 0xB:
-				op = ASM_OP_XCHG8, fmt = ASM_FMT_M16;
-				break;
-			case 0x12:
-				op = ASM_OP_FETCHADD4_ACQ, fmt = ASM_FMT_M17;
-				break;
-			case 0x13:
-				op = ASM_OP_FETCHADD8_ACQ, fmt = ASM_FMT_M17;
-				break;
-			case 0x16:
-				op = ASM_OP_FETCHADD4_REL, fmt = ASM_FMT_M17;
-				break;
-			case 0x17:
-				op = ASM_OP_FETCHADD8_REL, fmt = ASM_FMT_M17;
-				break;
-			case 0x1C:
-				op = ASM_OP_GETF_SIG, fmt = ASM_FMT_M19;
-				break;
-			case 0x1D:
-				op = ASM_OP_GETF_EXP, fmt = ASM_FMT_M19;
-				break;
-			case 0x1E:
-				op = ASM_OP_GETF_S, fmt = ASM_FMT_M19;
-				break;
-			case 0x1F:
-				op = ASM_OP_GETF_D, fmt = ASM_FMT_M19;
-				break;
-			case 0x20:
-				op = ASM_OP_CMP8XCHG16_ACQ, fmt = ASM_FMT_M16;
-				break;
-			case 0x24:
-				op = ASM_OP_CMP8XCHG16_REL, fmt = ASM_FMT_M16;
-				break;
-			case 0x28:
-				op = ASM_OP_LD16_, fmt = ASM_FMT_M1;
-				break;
-			case 0x2C:
-				op = ASM_OP_LD16_ACQ, fmt = ASM_FMT_M1;
-				break;
-			case 0x30:
-				op = ASM_OP_ST16_, fmt = ASM_FMT_M4;
-				break;
-			case 0x34:
-				op = ASM_OP_ST16_REL, fmt = ASM_FMT_M4;
-				break;
-			}
-		}
-		break;
-	case 0x5:
-		switch (FIELD(bits, 30, 6)) { /* x6 */
-		case 0x0:
-			op = ASM_OP_LD1_, fmt = ASM_FMT_M3;
-			break;
-		case 0x1:
-			op = ASM_OP_LD2_, fmt = ASM_FMT_M3;
-			break;
-		case 0x2:
-			op = ASM_OP_LD4_, fmt = ASM_FMT_M3;
-			break;
-		case 0x3:
-			op = ASM_OP_LD8_, fmt = ASM_FMT_M3;
-			break;
-		case 0x4:
-			op = ASM_OP_LD1_S, fmt = ASM_FMT_M3;
-			break;
-		case 0x5:
-			op = ASM_OP_LD2_S, fmt = ASM_FMT_M3;
-			break;
-		case 0x6:
-			op = ASM_OP_LD4_S, fmt = ASM_FMT_M3;
-			break;
-		case 0x7:
-			op = ASM_OP_LD8_S, fmt = ASM_FMT_M3;
-			break;
-		case 0x8:
-			op = ASM_OP_LD1_A, fmt = ASM_FMT_M3;
-			break;
-		case 0x9:
-			op = ASM_OP_LD2_A, fmt = ASM_FMT_M3;
-			break;
-		case 0xA:
-			op = ASM_OP_LD4_A, fmt = ASM_FMT_M3;
-			break;
-		case 0xB:
-			op = ASM_OP_LD8_A, fmt = ASM_FMT_M3;
-			break;
-		case 0xC:
-			op = ASM_OP_LD1_SA, fmt = ASM_FMT_M3;
-			break;
-		case 0xD:
-			op = ASM_OP_LD2_SA, fmt = ASM_FMT_M3;
-			break;
-		case 0xE:
-			op = ASM_OP_LD4_SA, fmt = ASM_FMT_M3;
-			break;
-		case 0xF:
-			op = ASM_OP_LD8_SA, fmt = ASM_FMT_M3;
-			break;
-		case 0x10:
-			op = ASM_OP_LD1_BIAS, fmt = ASM_FMT_M3;
-			break;
-		case 0x11:
-			op = ASM_OP_LD2_BIAS, fmt = ASM_FMT_M3;
-			break;
-		case 0x12:
-			op = ASM_OP_LD4_BIAS, fmt = ASM_FMT_M3;
-			break;
-		case 0x13:
-			op = ASM_OP_LD8_BIAS, fmt = ASM_FMT_M3;
-			break;
-		case 0x14:
-			op = ASM_OP_LD1_ACQ, fmt = ASM_FMT_M3;
-			break;
-		case 0x15:
-			op = ASM_OP_LD2_ACQ, fmt = ASM_FMT_M3;
-			break;
-		case 0x16:
-			op = ASM_OP_LD4_ACQ, fmt = ASM_FMT_M3;
-			break;
-		case 0x17:
-			op = ASM_OP_LD8_ACQ, fmt = ASM_FMT_M3;
-			break;
-		case 0x1B:
-			op = ASM_OP_LD8_FILL, fmt = ASM_FMT_M3;
-			break;
-		case 0x20:
-			op = ASM_OP_LD1_C_CLR, fmt = ASM_FMT_M3;
-			break;
-		case 0x21:
-			op = ASM_OP_LD2_C_CLR, fmt = ASM_FMT_M3;
-			break;
-		case 0x22:
-			op = ASM_OP_LD4_C_CLR, fmt = ASM_FMT_M3;
-			break;
-		case 0x23:
-			op = ASM_OP_LD8_C_CLR, fmt = ASM_FMT_M3;
-			break;
-		case 0x24:
-			op = ASM_OP_LD1_C_NC, fmt = ASM_FMT_M3;
-			break;
-		case 0x25:
-			op = ASM_OP_LD2_C_NC, fmt = ASM_FMT_M3;
-			break;
-		case 0x26:
-			op = ASM_OP_LD4_C_NC, fmt = ASM_FMT_M3;
-			break;
-		case 0x27:
-			op = ASM_OP_LD8_C_NC, fmt = ASM_FMT_M3;
-			break;
-		case 0x28:
-			op = ASM_OP_LD1_C_CLR_ACQ, fmt = ASM_FMT_M3;
-			break;
-		case 0x29:
-			op = ASM_OP_LD2_C_CLR_ACQ, fmt = ASM_FMT_M3;
-			break;
-		case 0x2A:
-			op = ASM_OP_LD4_C_CLR_ACQ, fmt = ASM_FMT_M3;
-			break;
-		case 0x2B:
-			op = ASM_OP_LD8_C_CLR_ACQ, fmt = ASM_FMT_M3;
-			break;
-		case 0x30:
-			op = ASM_OP_ST1_, fmt = ASM_FMT_M5;
-			break;
-		case 0x31:
-			op = ASM_OP_ST2_, fmt = ASM_FMT_M5;
-			break;
-		case 0x32:
-			op = ASM_OP_ST4_, fmt = ASM_FMT_M5;
-			break;
-		case 0x33:
-			op = ASM_OP_ST8_, fmt = ASM_FMT_M5;
-			break;
-		case 0x34:
-			op = ASM_OP_ST1_REL, fmt = ASM_FMT_M5;
-			break;
-		case 0x35:
-			op = ASM_OP_ST2_REL, fmt = ASM_FMT_M5;
-			break;
-		case 0x36:
-			op = ASM_OP_ST4_REL, fmt = ASM_FMT_M5;
-			break;
-		case 0x37:
-			op = ASM_OP_ST8_REL, fmt = ASM_FMT_M5;
-			break;
-		case 0x3B:
-			op = ASM_OP_ST8_SPILL, fmt = ASM_FMT_M5;
-			break;
-		}
-		break;
-	case 0x6:
-		if (FIELD(bits, 27, 1) == 0) { /* x */
-			switch (FIELD(bits, 30, 7)) { /* x6 + m */
-			case 0x0:
-				op = ASM_OP_LDFE_, fmt = ASM_FMT_M6;
-				break;
-			case 0x1:
-				op = ASM_OP_LDF8_, fmt = ASM_FMT_M6;
-				break;
-			case 0x2:
-				op = ASM_OP_LDFS_, fmt = ASM_FMT_M6;
-				break;
-			case 0x3:
-				op = ASM_OP_LDFD_, fmt = ASM_FMT_M6;
-				break;
-			case 0x4:
-				op = ASM_OP_LDFE_S, fmt = ASM_FMT_M6;
-				break;
-			case 0x5:
-				op = ASM_OP_LDF8_S, fmt = ASM_FMT_M6;
-				break;
-			case 0x6:
-				op = ASM_OP_LDFS_S, fmt = ASM_FMT_M6;
-				break;
-			case 0x7:
-				op = ASM_OP_LDFD_S, fmt = ASM_FMT_M6;
-				break;
-			case 0x8:
-				op = ASM_OP_LDFE_A, fmt = ASM_FMT_M6;
-				break;
-			case 0x9:
-				op = ASM_OP_LDF8_A, fmt = ASM_FMT_M6;
-				break;
-			case 0xA:
-				op = ASM_OP_LDFS_A, fmt = ASM_FMT_M6;
-				break;
-			case 0xB:
-				op = ASM_OP_LDFD_A, fmt = ASM_FMT_M6;
-				break;
-			case 0xC:
-				op = ASM_OP_LDFE_SA, fmt = ASM_FMT_M6;
-				break;
-			case 0xD:
-				op = ASM_OP_LDF8_SA, fmt = ASM_FMT_M6;
-				break;
-			case 0xE:
-				op = ASM_OP_LDFS_SA, fmt = ASM_FMT_M6;
-				break;
-			case 0xF:
-				op = ASM_OP_LDFD_SA, fmt = ASM_FMT_M6;
-				break;
-			case 0x1B:
-				op = ASM_OP_LDF_FILL, fmt = ASM_FMT_M6;
-				break;
-			case 0x20:
-				op = ASM_OP_LDFE_C_CLR, fmt = ASM_FMT_M6;
-				break;
-			case 0x21:
-				op = ASM_OP_LDF8_C_CLR, fmt = ASM_FMT_M6;
-				break;
-			case 0x22:
-				op = ASM_OP_LDFS_C_CLR, fmt = ASM_FMT_M6;
-				break;
-			case 0x23:
-				op = ASM_OP_LDFD_C_CLR, fmt = ASM_FMT_M6;
-				break;
-			case 0x24:
-				op = ASM_OP_LDFE_C_NC, fmt = ASM_FMT_M6;
-				break;
-			case 0x25:
-				op = ASM_OP_LDF8_C_NC, fmt = ASM_FMT_M6;
-				break;
-			case 0x26:
-				op = ASM_OP_LDFS_C_NC, fmt = ASM_FMT_M6;
-				break;
-			case 0x27:
-				op = ASM_OP_LDFD_C_NC, fmt = ASM_FMT_M6;
-				break;
-			case 0x2C:
-				op = ASM_OP_LFETCH_, fmt = ASM_FMT_M13;
-				break;
-			case 0x2D:
-				op = ASM_OP_LFETCH_EXCL, fmt = ASM_FMT_M13;
-				break;
-			case 0x2E:
-				op = ASM_OP_LFETCH_FAULT, fmt = ASM_FMT_M13;
-				break;
-			case 0x2F:
-				op = ASM_OP_LFETCH_FAULT_EXCL,
-				    fmt = ASM_FMT_M13;
-				break;
-			case 0x30:
-				op = ASM_OP_STFE, fmt = ASM_FMT_M9;
-				break;
-			case 0x31:
-				op = ASM_OP_STF8, fmt = ASM_FMT_M9;
-				break;
-			case 0x32:
-				op = ASM_OP_STFS, fmt = ASM_FMT_M9;
-				break;
-			case 0x33:
-				op = ASM_OP_STFD, fmt = ASM_FMT_M9;
-				break;
-			case 0x3B:
-				op = ASM_OP_STF_SPILL, fmt = ASM_FMT_M9;
-				break;
-			case 0x40:
-				op = ASM_OP_LDFE_, fmt = ASM_FMT_M7;
-				break;
-			case 0x41:
-				op = ASM_OP_LDF8_, fmt = ASM_FMT_M7;
-				break;
-			case 0x42:
-				op = ASM_OP_LDFS_, fmt = ASM_FMT_M7;
-				break;
-			case 0x43:
-				op = ASM_OP_LDFD_, fmt = ASM_FMT_M7;
-				break;
-			case 0x44:
-				op = ASM_OP_LDFE_S, fmt = ASM_FMT_M7;
-				break;
-			case 0x45:
-				op = ASM_OP_LDF8_S, fmt = ASM_FMT_M7;
-				break;
-			case 0x46:
-				op = ASM_OP_LDFS_S, fmt = ASM_FMT_M7;
-				break;
-			case 0x47:
-				op = ASM_OP_LDFD_S, fmt = ASM_FMT_M7;
-				break;
-			case 0x48:
-				op = ASM_OP_LDFE_A, fmt = ASM_FMT_M7;
-				break;
-			case 0x49:
-				op = ASM_OP_LDF8_A, fmt = ASM_FMT_M7;
-				break;
-			case 0x4A:
-				op = ASM_OP_LDFS_A, fmt = ASM_FMT_M7;
-				break;
-			case 0x4B:
-				op = ASM_OP_LDFD_A, fmt = ASM_FMT_M7;
-				break;
-			case 0x4C:
-				op = ASM_OP_LDFE_SA, fmt = ASM_FMT_M7;
-				break;
-			case 0x4D:
-				op = ASM_OP_LDF8_SA, fmt = ASM_FMT_M7;
-				break;
-			case 0x4E:
-				op = ASM_OP_LDFS_SA, fmt = ASM_FMT_M7;
-				break;
-			case 0x4F:
-				op = ASM_OP_LDFD_SA, fmt = ASM_FMT_M7;
-				break;
-			case 0x5B:
-				op = ASM_OP_LDF_FILL, fmt = ASM_FMT_M7;
-				break;
-			case 0x60:
-				op = ASM_OP_LDFE_C_CLR, fmt = ASM_FMT_M7;
-				break;
-			case 0x61:
-				op = ASM_OP_LDF8_C_CLR, fmt = ASM_FMT_M7;
-				break;
-			case 0x62:
-				op = ASM_OP_LDFS_C_CLR, fmt = ASM_FMT_M7;
-				break;
-			case 0x63:
-				op = ASM_OP_LDFD_C_CLR, fmt = ASM_FMT_M7;
-				break;
-			case 0x64:
-				op = ASM_OP_LDFE_C_NC, fmt = ASM_FMT_M7;
-				break;
-			case 0x65:
-				op = ASM_OP_LDF8_C_NC, fmt = ASM_FMT_M7;
-				break;
-			case 0x66:
-				op = ASM_OP_LDFS_C_NC, fmt = ASM_FMT_M7;
-				break;
-			case 0x67:
-				op = ASM_OP_LDFD_C_NC, fmt = ASM_FMT_M7;
-				break;
-			case 0x6C:
-				op = ASM_OP_LFETCH_, fmt = ASM_FMT_M14;
-				break;
-			case 0x6D:
-				op = ASM_OP_LFETCH_EXCL, fmt = ASM_FMT_M14;
-				break;
-			case 0x6E:
-				op = ASM_OP_LFETCH_FAULT, fmt = ASM_FMT_M14;
-				break;
-			case 0x6F:
-				op = ASM_OP_LFETCH_FAULT_EXCL,
-				    fmt = ASM_FMT_M14;
-				break;
-			}
-		} else {
-			switch (FIELD(bits, 30, 7)) { /* x6 + m */
-			case 0x1:
-				op = ASM_OP_LDFP8_, fmt = ASM_FMT_M11;
-				break;
-			case 0x2:
-				op = ASM_OP_LDFPS_, fmt = ASM_FMT_M11;
-				break;
-			case 0x3:
-				op = ASM_OP_LDFPD_, fmt = ASM_FMT_M11;
-				break;
-			case 0x5:
-				op = ASM_OP_LDFP8_S, fmt = ASM_FMT_M11;
-				break;
-			case 0x6:
-				op = ASM_OP_LDFPS_S, fmt = ASM_FMT_M11;
-				break;
-			case 0x7:
-				op = ASM_OP_LDFPD_S, fmt = ASM_FMT_M11;
-				break;
-			case 0x9:
-				op = ASM_OP_LDFP8_A, fmt = ASM_FMT_M11;
-				break;
-			case 0xA:
-				op = ASM_OP_LDFPS_A, fmt = ASM_FMT_M11;
-				break;
-			case 0xB:
-				op = ASM_OP_LDFPD_A, fmt = ASM_FMT_M11;
-				break;
-			case 0xD:
-				op = ASM_OP_LDFP8_SA, fmt = ASM_FMT_M11;
-				break;
-			case 0xE:
-				op = ASM_OP_LDFPS_SA, fmt = ASM_FMT_M11;
-				break;
-			case 0xF:
-				op = ASM_OP_LDFPD_SA, fmt = ASM_FMT_M11;
-				break;
-			case 0x1C:
-				op = ASM_OP_SETF_SIG, fmt = ASM_FMT_M18;
-				break;
-			case 0x1D:
-				op = ASM_OP_SETF_EXP, fmt = ASM_FMT_M18;
-				break;
-			case 0x1E:
-				op = ASM_OP_SETF_S, fmt = ASM_FMT_M18;
-				break;
-			case 0x1F:
-				op = ASM_OP_SETF_D, fmt = ASM_FMT_M18;
-				break;
-			case 0x21:
-				op = ASM_OP_LDFP8_C_CLR, fmt = ASM_FMT_M11;
-				break;
-			case 0x22:
-				op = ASM_OP_LDFPS_C_CLR, fmt = ASM_FMT_M11;
-				break;
-			case 0x23:
-				op = ASM_OP_LDFPD_C_CLR, fmt = ASM_FMT_M11;
-				break;
-			case 0x25:
-				op = ASM_OP_LDFP8_C_NC, fmt = ASM_FMT_M11;
-				break;
-			case 0x26:
-				op = ASM_OP_LDFPS_C_NC, fmt = ASM_FMT_M11;
-				break;
-			case 0x27:
-				op = ASM_OP_LDFPD_C_NC, fmt = ASM_FMT_M11;
-				break;
-			case 0x41:
-				op = ASM_OP_LDFP8_, fmt = ASM_FMT_M12;
-				break;
-			case 0x42:
-				op = ASM_OP_LDFPS_, fmt = ASM_FMT_M12;
-				break;
-			case 0x43:
-				op = ASM_OP_LDFPD_, fmt = ASM_FMT_M12;
-				break;
-			case 0x45:
-				op = ASM_OP_LDFP8_S, fmt = ASM_FMT_M12;
-				break;
-			case 0x46:
-				op = ASM_OP_LDFPS_S, fmt = ASM_FMT_M12;
-				break;
-			case 0x47:
-				op = ASM_OP_LDFPD_S, fmt = ASM_FMT_M12;
-				break;
-			case 0x49:
-				op = ASM_OP_LDFP8_A, fmt = ASM_FMT_M12;
-				break;
-			case 0x4A:
-				op = ASM_OP_LDFPS_A, fmt = ASM_FMT_M12;
-				break;
-			case 0x4B:
-				op = ASM_OP_LDFPD_A, fmt = ASM_FMT_M12;
-				break;
-			case 0x4D:
-				op = ASM_OP_LDFP8_SA, fmt = ASM_FMT_M12;
-				break;
-			case 0x4E:
-				op = ASM_OP_LDFPS_SA, fmt = ASM_FMT_M12;
-				break;
-			case 0x4F:
-				op = ASM_OP_LDFPD_SA, fmt = ASM_FMT_M12;
-				break;
-			case 0x61:
-				op = ASM_OP_LDFP8_C_CLR, fmt = ASM_FMT_M12;
-				break;
-			case 0x62:
-				op = ASM_OP_LDFPS_C_CLR, fmt = ASM_FMT_M12;
-				break;
-			case 0x63:
-				op = ASM_OP_LDFPD_C_CLR, fmt = ASM_FMT_M12;
-				break;
-			case 0x65:
-				op = ASM_OP_LDFP8_C_NC, fmt = ASM_FMT_M12;
-				break;
-			case 0x66:
-				op = ASM_OP_LDFPS_C_NC, fmt = ASM_FMT_M12;
-				break;
-			case 0x67:
-				op = ASM_OP_LDFPD_C_NC, fmt = ASM_FMT_M12;
-				break;
-			}
-		}
-		break;
-	case 0x7:
-		switch (FIELD(bits, 30, 6)) { /* x6 */
-		case 0x0:
-			op = ASM_OP_LDFE_, fmt = ASM_FMT_M8;
-			break;
-		case 0x1:
-			op = ASM_OP_LDF8_, fmt = ASM_FMT_M8;
-			break;
-		case 0x2:
-			op = ASM_OP_LDFS_, fmt = ASM_FMT_M8;
-			break;
-		case 0x3:
-			op = ASM_OP_LDFD_, fmt = ASM_FMT_M8;
-			break;
-		case 0x4:
-			op = ASM_OP_LDFE_S, fmt = ASM_FMT_M8;
-			break;
-		case 0x5:
-			op = ASM_OP_LDF8_S, fmt = ASM_FMT_M8;
-			break;
-		case 0x6:
-			op = ASM_OP_LDFS_S, fmt = ASM_FMT_M8;
-			break;
-		case 0x7:
-			op = ASM_OP_LDFD_S, fmt = ASM_FMT_M8;
-			break;
-		case 0x8:
-			op = ASM_OP_LDFE_A, fmt = ASM_FMT_M8;
-			break;
-		case 0x9:
-			op = ASM_OP_LDF8_A, fmt = ASM_FMT_M8;
-			break;
-		case 0xA:
-			op = ASM_OP_LDFS_A, fmt = ASM_FMT_M8;
-			break;
-		case 0xB:
-			op = ASM_OP_LDFD_A, fmt = ASM_FMT_M8;
-			break;
-		case 0xC:
-			op = ASM_OP_LDFE_SA, fmt = ASM_FMT_M8;
-			break;
-		case 0xD:
-			op = ASM_OP_LDF8_SA, fmt = ASM_FMT_M8;
-			break;
-		case 0xE:
-			op = ASM_OP_LDFS_SA, fmt = ASM_FMT_M8;
-			break;
-		case 0xF:
-			op = ASM_OP_LDFD_SA, fmt = ASM_FMT_M8;
-			break;
-		case 0x1B:
-			op = ASM_OP_LDF_FILL, fmt = ASM_FMT_M8;
-			break;
-		case 0x20:
-			op = ASM_OP_LDFE_C_CLR, fmt = ASM_FMT_M8;
-			break;
-		case 0x21:
-			op = ASM_OP_LDF8_C_CLR, fmt = ASM_FMT_M8;
-			break;
-		case 0x22:
-			op = ASM_OP_LDFS_C_CLR, fmt = ASM_FMT_M8;
-			break;
-		case 0x23:
-			op = ASM_OP_LDFD_C_CLR, fmt = ASM_FMT_M8;
-			break;
-		case 0x24:
-			op = ASM_OP_LDFE_C_NC, fmt = ASM_FMT_M8;
-			break;
-		case 0x25:
-			op = ASM_OP_LDF8_C_NC, fmt = ASM_FMT_M8;
-			break;
-		case 0x26:
-			op = ASM_OP_LDFS_C_NC, fmt = ASM_FMT_M8;
-			break;
-		case 0x27:
-			op = ASM_OP_LDFD_C_NC, fmt = ASM_FMT_M8;
-			break;
-		case 0x2C:
-			op = ASM_OP_LFETCH_, fmt = ASM_FMT_M15;
-			break;
-		case 0x2D:
-			op = ASM_OP_LFETCH_EXCL, fmt = ASM_FMT_M15;
-			break;
-		case 0x2E:
-			op = ASM_OP_LFETCH_FAULT, fmt = ASM_FMT_M15;
-			break;
-		case 0x2F:
-			op = ASM_OP_LFETCH_FAULT_EXCL, fmt = ASM_FMT_M15;
-			break;
-		case 0x30:
-			op = ASM_OP_STFE, fmt = ASM_FMT_M10;
-			break;
-		case 0x31:
-			op = ASM_OP_STF8, fmt = ASM_FMT_M10;
-			break;
-		case 0x32:
-			op = ASM_OP_STFS, fmt = ASM_FMT_M10;
-			break;
-		case 0x33:
-			op = ASM_OP_STFD, fmt = ASM_FMT_M10;
-			break;
-		case 0x3B:
-			op = ASM_OP_STF_SPILL, fmt = ASM_FMT_M10;
-			break;
-		}
-		break;
-	}
-
-	if (op != ASM_OP_NONE)
-		return (asm_extract(op, fmt, bits, b, slot));
-	return (0);
-}
-
-/*
- * Decode X-unit instructions.
- */
-static int
-asm_decodeX(uint64_t ip, struct asm_bundle *b, int slot)
-{
-	uint64_t bits;
-	enum asm_fmt fmt;
-	enum asm_op op;
-
-	KASSERT(slot == 2, ("foo"));
-	bits = SLOT(ip, slot);
-	fmt = ASM_FMT_NONE, op = ASM_OP_NONE;
-	/* Initialize slot 1 (slot - 1) */
-	b->b_inst[slot - 1].i_format = ASM_FMT_NONE;
-	b->b_inst[slot - 1].i_bits = SLOT(ip, slot - 1);
-
-	switch((int)OPCODE(bits)) {
-	case 0x0:
-		if (FIELD(bits, 33, 3) == 0) { /* x3 */
-			switch (FIELD(bits, 27, 6)) { /* x6 */
-			case 0x0:
-				op = ASM_OP_BREAK_X, fmt = ASM_FMT_X1;
-				break;
-			case 0x1:
-				if (FIELD(bits, 26, 1) == 0) /* y */
-					op = ASM_OP_NOP_X, fmt = ASM_FMT_X5;
-				else
-					op = ASM_OP_HINT_X, fmt = ASM_FMT_X5;
-				break;
-			}
-		}
-		break;
-	case 0x6:
-		if (FIELD(bits, 20, 1) == 0)
-			op = ASM_OP_MOVL, fmt = ASM_FMT_X2;
-		break;
-	case 0xC:
-		if (FIELD(bits, 6, 3) == 0) /* btype */
-			op = ASM_OP_BRL_COND, fmt = ASM_FMT_X3;
-		break;
-	case 0xD:
-		op = ASM_OP_BRL_CALL, fmt = ASM_FMT_X4;
-		break;
-	}
-
-	if (op != ASM_OP_NONE)
-		return (asm_extract(op, fmt, bits, b, slot));
-	return (0);
-}
-
-int
-asm_decode(uint64_t ip, struct asm_bundle *b)
-{
-	const char *tp;
-	unsigned int slot;
-	int ok;
-
-	memset(b, 0, sizeof(*b));
-
-	b->b_templ = asm_templname[TMPL(ip)];
-	if (b->b_templ == 0)
-		return (0);
-
-	slot = 0;
-	tp = b->b_templ;
-
-	ok = 1;
-	while (ok && *tp != 0) {
-		switch (*tp++) {
-		case 'B':
-			ok = asm_decodeB(ip, b, slot++);
-			break;
-		case 'F':
-			ok = asm_decodeF(ip, b, slot++);
-			break;
-		case 'I':
-			ok = asm_decodeI(ip, b, slot++);
-			break;
-		case 'L':
-			ok = (slot++ == 1) ? 1 : 0;
-			break;
-		case 'M':
-			ok = asm_decodeM(ip, b, slot++);
-			break;
-		case 'X':
-			ok = asm_decodeX(ip, b, slot++);
-			break;
-		case ';':
-			ok = 1;
-			break;
-		default:
-			ok = 0;
-			break;
-		}
-	}
-	return (ok);
-}
diff --git a/sys/ia64/disasm/disasm_extract.c b/sys/ia64/disasm/disasm_extract.c
deleted file mode 100644
index 1cec07e980f5..000000000000
--- a/sys/ia64/disasm/disasm_extract.c
+++ /dev/null
@@ -1,2609 +0,0 @@
-/*-
- * Copyright (c) 2000-2006 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-
-#include <machine/stdarg.h>
-
-#include <ia64/disasm/disasm_int.h>
-#include <ia64/disasm/disasm.h>
-
-#define FRAG(o,l)	((int)((o << 8) | (l & 0xff)))
-#define FRAG_OFS(f)	(f >> 8)
-#define FRAG_LEN(f)	(f & 0xff)
-
-/*
- * Support functions.
- */
-static void
-asm_cmpltr_add(struct asm_inst *i, enum asm_cmpltr_class c,
-    enum asm_cmpltr_type t)
-{
-
-	i->i_cmpltr[i->i_ncmpltrs].c_class = c;
-	i->i_cmpltr[i->i_ncmpltrs].c_type = t;
-	i->i_ncmpltrs++;
-	KASSERT(i->i_ncmpltrs < 6, ("foo"));
-}
-
-static void
-asm_hint(struct asm_inst *i, enum asm_cmpltr_class c)
-{
-
-	switch (FIELD(i->i_bits, 28, 2)) { /* hint */
-	case 0:
-		asm_cmpltr_add(i, c, ASM_CT_NONE);
-		break;
-	case 1:
-		asm_cmpltr_add(i, c, ASM_CT_NT1);
-		break;
-	case 2:
-		asm_cmpltr_add(i, c, ASM_CT_NT2);
-		break;
-	case 3:
-		asm_cmpltr_add(i, c, ASM_CT_NTA);
-		break;
-	}
-}
-
-static void
-asm_sf(struct asm_inst *i)
-{
-
-	switch (FIELD(i->i_bits, 34, 2)) {
-	case 0:
-		asm_cmpltr_add(i, ASM_CC_SF, ASM_CT_S0);
-		break;
-	case 1:
-		asm_cmpltr_add(i, ASM_CC_SF, ASM_CT_S1);
-		break;
-	case 2:
-		asm_cmpltr_add(i, ASM_CC_SF, ASM_CT_S2);
-		break;
-	case 3:
-		asm_cmpltr_add(i, ASM_CC_SF, ASM_CT_S3);
-		break;
-	}
-}
-
-static void
-asm_brhint(struct asm_inst *i)
-{
-	uint64_t bits = i->i_bits;
-
-	switch (FIELD(bits, 33, 2)) { /* bwh */
-	case 0:
-		asm_cmpltr_add(i, ASM_CC_BWH, ASM_CT_SPTK);
-		break;
-	case 1:
-		asm_cmpltr_add(i, ASM_CC_BWH, ASM_CT_SPNT);
-		break;
-	case 2:
-		asm_cmpltr_add(i, ASM_CC_BWH, ASM_CT_DPTK);
-		break;
-	case 3:
-		asm_cmpltr_add(i, ASM_CC_BWH, ASM_CT_DPNT);
-		break;
-	}
-
-	if (FIELD(bits, 12, 1)) /* ph */
-		asm_cmpltr_add(i, ASM_CC_PH, ASM_CT_MANY);
-	else
-		asm_cmpltr_add(i, ASM_CC_PH, ASM_CT_FEW);
-
-	if (FIELD(bits, 35, 1)) /* dh */
-		asm_cmpltr_add(i, ASM_CC_DH, ASM_CT_CLR);
-	else
-		asm_cmpltr_add(i, ASM_CC_DH, ASM_CT_NONE);
-}
-
-static void
-asm_brphint(struct asm_inst *i)
-{
-	uint64_t bits = i->i_bits;
-
-	switch (FIELD(bits, 3, 2)) { /* ipwh, indwh */
-	case 0:
-		asm_cmpltr_add(i, ASM_CC_IPWH, ASM_CT_SPTK);
-		break;
-	case 1:
-		asm_cmpltr_add(i, ASM_CC_IPWH, ASM_CT_LOOP);
-		break;
-	case 2:
-		asm_cmpltr_add(i, ASM_CC_IPWH, ASM_CT_DPTK);
-		break;
-	case 3:
-		asm_cmpltr_add(i, ASM_CC_IPWH, ASM_CT_EXIT);
-		break;
-	}
-
-	if (FIELD(bits, 5, 1)) /* ph */
-		asm_cmpltr_add(i, ASM_CC_PH, ASM_CT_MANY);
-	else
-		asm_cmpltr_add(i, ASM_CC_PH, ASM_CT_FEW);
-
-	switch (FIELD(bits, 0, 3)) { /* pvec */
-	case 0:
-		asm_cmpltr_add(i, ASM_CC_PVEC, ASM_CT_DC_DC);
-		break;
-	case 1:
-		asm_cmpltr_add(i, ASM_CC_PVEC, ASM_CT_DC_NT);
-		break;
-	case 2:
-		asm_cmpltr_add(i, ASM_CC_PVEC, ASM_CT_TK_DC);
-		break;
-	case 3:
-		asm_cmpltr_add(i, ASM_CC_PVEC, ASM_CT_TK_TK);
-		break;
-	case 4:
-		asm_cmpltr_add(i, ASM_CC_PVEC, ASM_CT_TK_NT);
-		break;
-	case 5:
-		asm_cmpltr_add(i, ASM_CC_PVEC, ASM_CT_NT_DC);
-		break;
-	case 6:
-		asm_cmpltr_add(i, ASM_CC_PVEC, ASM_CT_NT_TK);
-		break;
-	case 7:
-		asm_cmpltr_add(i, ASM_CC_PVEC, ASM_CT_NT_NT);
-		break;
-	}
-
-	if (FIELD(bits, 35, 1)) /* ih */
-		asm_cmpltr_add(i, ASM_CC_IH, ASM_CT_IMP);
-	else
-		asm_cmpltr_add(i, ASM_CC_IH, ASM_CT_NONE);
-}
-
-static enum asm_oper_type
-asm_normalize(struct asm_inst *i, enum asm_op op)
-{
-	enum asm_oper_type ot = ASM_OPER_NONE;
-
-	switch (op) {
-	case ASM_OP_BR_CALL:
-		asm_cmpltr_add(i, ASM_CC_BTYPE, ASM_CT_CALL);
-		op = ASM_OP_BR;
-		break;
-	case ASM_OP_BR_CEXIT:
-		asm_cmpltr_add(i, ASM_CC_BTYPE, ASM_CT_CEXIT);
-		op = ASM_OP_BR;
-		break;
-	case ASM_OP_BR_CLOOP:
-		asm_cmpltr_add(i, ASM_CC_BTYPE, ASM_CT_CLOOP);
-		op = ASM_OP_BR;
-		break;
-	case ASM_OP_BR_COND:
-		asm_cmpltr_add(i, ASM_CC_BTYPE, ASM_CT_COND);
-		op = ASM_OP_BR;
-		break;
-	case ASM_OP_BR_CTOP:
-		asm_cmpltr_add(i, ASM_CC_BTYPE, ASM_CT_CTOP);
-		op = ASM_OP_BR;
-		break;
-	case ASM_OP_BR_IA:
-		asm_cmpltr_add(i, ASM_CC_BTYPE, ASM_CT_IA);
-		op = ASM_OP_BR;
-		break;
-	case ASM_OP_BR_RET:
-		asm_cmpltr_add(i, ASM_CC_BTYPE, ASM_CT_RET);
-		op = ASM_OP_BR;
-		break;
-	case ASM_OP_BR_WEXIT:
-		asm_cmpltr_add(i, ASM_CC_BTYPE, ASM_CT_WEXIT);
-		op = ASM_OP_BR;
-		break;
-	case ASM_OP_BR_WTOP:
-		asm_cmpltr_add(i, ASM_CC_BTYPE, ASM_CT_WTOP);
-		op = ASM_OP_BR;
-		break;
-	case ASM_OP_BREAK_B:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_B);
-		op = ASM_OP_BREAK;
-		break;
-	case ASM_OP_BREAK_F:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_F);
-		op = ASM_OP_BREAK;
-		break;
-	case ASM_OP_BREAK_I:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_I);
-		op = ASM_OP_BREAK;
-		break;
-	case ASM_OP_BREAK_M:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_M);
-		op = ASM_OP_BREAK;
-		break;
-	case ASM_OP_BREAK_X:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_X);
-		op = ASM_OP_BREAK;
-		break;
-	case ASM_OP_BRL_COND:
-		asm_cmpltr_add(i, ASM_CC_BTYPE, ASM_CT_COND);
-		op = ASM_OP_BRL;
-		break;
-	case ASM_OP_BRL_CALL:
-		asm_cmpltr_add(i, ASM_CC_BTYPE, ASM_CT_CALL);
-		op = ASM_OP_BRL;
-		break;
-	case ASM_OP_BRP_:
-		asm_cmpltr_add(i, ASM_CC_BTYPE, ASM_CT_NONE);
-		op = ASM_OP_BRP;
-		break;
-	case ASM_OP_BRP_RET:
-		asm_cmpltr_add(i, ASM_CC_BTYPE, ASM_CT_RET);
-		op = ASM_OP_BRP;
-		break;
-	case ASM_OP_BSW_0:
-		asm_cmpltr_add(i, ASM_CC_BSW, ASM_CT_0);
-		op = ASM_OP_BSW;
-		break;
-	case ASM_OP_BSW_1:
-		asm_cmpltr_add(i, ASM_CC_BSW, ASM_CT_1);
-		op = ASM_OP_BSW;
-		break;
-	case ASM_OP_CHK_A_CLR:
-		asm_cmpltr_add(i, ASM_CC_CHK, ASM_CT_A);
-		asm_cmpltr_add(i, ASM_CC_ACLR, ASM_CT_CLR);
-		op = ASM_OP_CHK;
-		break;
-	case ASM_OP_CHK_A_NC:
-		asm_cmpltr_add(i, ASM_CC_CHK, ASM_CT_A);
-		asm_cmpltr_add(i, ASM_CC_ACLR, ASM_CT_NC);
-		op = ASM_OP_CHK;
-		break;
-	case ASM_OP_CHK_S:
-		asm_cmpltr_add(i, ASM_CC_CHK, ASM_CT_S);
-		op = ASM_OP_CHK;
-		break;
-	case ASM_OP_CHK_S_I:
-		asm_cmpltr_add(i, ASM_CC_CHK, ASM_CT_S);
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_I);
-		op = ASM_OP_CHK;
-		break;
-	case ASM_OP_CHK_S_M:
-		asm_cmpltr_add(i, ASM_CC_CHK, ASM_CT_S);
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_M);
-		op = ASM_OP_CHK;
-		break;
-	case ASM_OP_CLRRRB_:
-		asm_cmpltr_add(i, ASM_CC_CLRRRB, ASM_CT_NONE);
-		op = ASM_OP_CLRRRB;
-		break;
-	case ASM_OP_CLRRRB_PR:
-		asm_cmpltr_add(i, ASM_CC_CLRRRB, ASM_CT_PR);
-		op = ASM_OP_CLRRRB;
-		break;
-	case ASM_OP_CMP_EQ:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_EQ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_NONE);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_EQ_AND:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_EQ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_EQ_OR:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_EQ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_EQ_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_EQ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_EQ_UNC:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_EQ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_UNC);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_GE_AND:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_GE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_GE_OR:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_GE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_GE_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_GE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_GT_AND:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_GT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_GT_OR:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_GT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_GT_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_GT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_LE_AND:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_LE_OR:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_LE_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_LT:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_NONE);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_LT_AND:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_LT_OR:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_LT_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_LT_UNC:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_UNC);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_LTU:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LTU);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_NONE);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_LTU_UNC:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LTU);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_UNC);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_NE_AND:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_NE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_NE_OR:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_NE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP_NE_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_NE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_CMP;
-		break;
-	case ASM_OP_CMP4_EQ:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_EQ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_NONE);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_EQ_AND:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_EQ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_EQ_OR:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_EQ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_EQ_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_EQ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_EQ_UNC:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_EQ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_UNC);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_GE_AND:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_GE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_GE_OR:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_GE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_GE_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_GE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_GT_AND:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_GT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_GT_OR:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_GT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_GT_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_GT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_LE_AND:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_LE_OR:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_LE_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_LT:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_NONE);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_LT_AND:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_LT_OR:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_LT_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_LT_UNC:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LT);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_UNC);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_LTU:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LTU);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_NONE);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_LTU_UNC:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_LTU);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_UNC);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_NE_AND:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_NE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_NE_OR:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_NE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP4_NE_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_CREL, ASM_CT_NE);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_CMP4;
-		break;
-	case ASM_OP_CMP8XCHG16_ACQ:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_ACQ);
-		op = ASM_OP_CMP8XCHG16;
-		break;
-	case ASM_OP_CMP8XCHG16_REL:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_REL);
-		op = ASM_OP_CMP8XCHG16;
-		break;
-	case ASM_OP_CMPXCHG1_ACQ:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_ACQ);
-		op = ASM_OP_CMPXCHG1;
-		break;
-	case ASM_OP_CMPXCHG1_REL:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_REL);
-		op = ASM_OP_CMPXCHG1;
-		break;
-	case ASM_OP_CMPXCHG2_ACQ:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_ACQ);
-		op = ASM_OP_CMPXCHG2;
-		break;
-	case ASM_OP_CMPXCHG2_REL:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_REL);
-		op = ASM_OP_CMPXCHG2;
-		break;
-	case ASM_OP_CMPXCHG4_ACQ:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_ACQ);
-		op = ASM_OP_CMPXCHG4;
-		break;
-	case ASM_OP_CMPXCHG4_REL:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_REL);
-		op = ASM_OP_CMPXCHG4;
-		break;
-	case ASM_OP_CMPXCHG8_ACQ:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_ACQ);
-		op = ASM_OP_CMPXCHG8;
-		break;
-	case ASM_OP_CMPXCHG8_REL:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_REL);
-		op = ASM_OP_CMPXCHG8;
-		break;
-	case ASM_OP_CZX1_L:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_L);
-		op = ASM_OP_CZX1;
-		break;
-	case ASM_OP_CZX1_R:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_R);
-		op = ASM_OP_CZX1;
-		break;
-	case ASM_OP_CZX2_L:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_L);
-		op = ASM_OP_CZX2;
-		break;
-	case ASM_OP_CZX2_R:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_R);
-		op = ASM_OP_CZX2;
-		break;
-	case ASM_OP_DEP_:
-		asm_cmpltr_add(i, ASM_CC_DEP, ASM_CT_NONE);
-		op = ASM_OP_DEP;
-		break;
-	case ASM_OP_DEP_Z:
-		asm_cmpltr_add(i, ASM_CC_DEP, ASM_CT_Z);
-		op = ASM_OP_DEP;
-		break;
-	case ASM_OP_FC_:
-		asm_cmpltr_add(i, ASM_CC_FC, ASM_CT_NONE);
-		op = ASM_OP_FC;
-		break;
-	case ASM_OP_FC_I:
-		asm_cmpltr_add(i, ASM_CC_FC, ASM_CT_I);
-		op = ASM_OP_FC;
-		break;
-	case ASM_OP_FCLASS_M:
-		asm_cmpltr_add(i, ASM_CC_FCREL, ASM_CT_M);
-		op = ASM_OP_FCLASS;
-		break;
-	case ASM_OP_FCVT_FX:
-		asm_cmpltr_add(i, ASM_CC_FCVT, ASM_CT_FX);
-		asm_cmpltr_add(i, ASM_CC_TRUNC, ASM_CT_NONE);
-		op = ASM_OP_FCVT;
-		break;
-	case ASM_OP_FCVT_FX_TRUNC:
-		asm_cmpltr_add(i, ASM_CC_FCVT, ASM_CT_FX);
-		asm_cmpltr_add(i, ASM_CC_TRUNC, ASM_CT_TRUNC);
-		op = ASM_OP_FCVT;
-		break;
-	case ASM_OP_FCVT_FXU:
-		asm_cmpltr_add(i, ASM_CC_FCVT, ASM_CT_FXU);
-		asm_cmpltr_add(i, ASM_CC_TRUNC, ASM_CT_NONE);
-		op = ASM_OP_FCVT;
-		break;
-	case ASM_OP_FCVT_FXU_TRUNC:
-		asm_cmpltr_add(i, ASM_CC_FCVT, ASM_CT_FXU);
-		asm_cmpltr_add(i, ASM_CC_TRUNC, ASM_CT_TRUNC);
-		op = ASM_OP_FCVT;
-		break;
-	case ASM_OP_FCVT_XF:
-		asm_cmpltr_add(i, ASM_CC_FCVT, ASM_CT_XF);
-		asm_cmpltr_add(i, ASM_CC_TRUNC, ASM_CT_NONE);
-		op = ASM_OP_FCVT;
-		break;
-	case ASM_OP_FETCHADD4_ACQ:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_ACQ);
-		op = ASM_OP_FETCHADD4;
-		break;
-	case ASM_OP_FETCHADD4_REL:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_REL);
-		op = ASM_OP_FETCHADD4;
-		break;
-	case ASM_OP_FETCHADD8_ACQ:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_ACQ);
-		op = ASM_OP_FETCHADD8;
-		break;
-	case ASM_OP_FETCHADD8_REL:
-		asm_cmpltr_add(i, ASM_CC_SEM, ASM_CT_REL);
-		op = ASM_OP_FETCHADD8;
-		break;
-	case ASM_OP_FMA_:
-		asm_cmpltr_add(i, ASM_CC_PC, ASM_CT_NONE);
-		op = ASM_OP_FMA;
-		break;
-	case ASM_OP_FMA_D:
-		asm_cmpltr_add(i, ASM_CC_PC, ASM_CT_D);
-		op = ASM_OP_FMA;
-		break;
-	case ASM_OP_FMA_S:
-		asm_cmpltr_add(i, ASM_CC_PC, ASM_CT_S);
-		op = ASM_OP_FMA;
-		break;
-	case ASM_OP_FMERGE_NS:
-		asm_cmpltr_add(i, ASM_CC_FMERGE, ASM_CT_NS);
-		op = ASM_OP_FMERGE;
-		break;
-	case ASM_OP_FMERGE_S:
-		asm_cmpltr_add(i, ASM_CC_FMERGE, ASM_CT_S);
-		op = ASM_OP_FMERGE;
-		break;
-	case ASM_OP_FMERGE_SE:
-		asm_cmpltr_add(i, ASM_CC_FMERGE, ASM_CT_SE);
-		op = ASM_OP_FMERGE;
-		break;
-	case ASM_OP_FMIX_L:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_L);
-		op = ASM_OP_FMIX;
-		break;
-	case ASM_OP_FMIX_LR:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_LR);
-		op = ASM_OP_FMIX;
-		break;
-	case ASM_OP_FMIX_R:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_R);
-		op = ASM_OP_FMIX;
-		break;
-	case ASM_OP_FMS_:
-		asm_cmpltr_add(i, ASM_CC_PC, ASM_CT_NONE);
-		op = ASM_OP_FMS;
-		break;
-	case ASM_OP_FMS_D:
-		asm_cmpltr_add(i, ASM_CC_PC, ASM_CT_D);
-		op = ASM_OP_FMS;
-		break;
-	case ASM_OP_FMS_S:
-		asm_cmpltr_add(i, ASM_CC_PC, ASM_CT_S);
-		op = ASM_OP_FMS;
-		break;
-	case ASM_OP_FNMA_:
-		asm_cmpltr_add(i, ASM_CC_PC, ASM_CT_NONE);
-		op = ASM_OP_FNMA;
-		break;
-	case ASM_OP_FNMA_D:
-		asm_cmpltr_add(i, ASM_CC_PC, ASM_CT_D);
-		op = ASM_OP_FNMA;
-		break;
-	case ASM_OP_FNMA_S:
-		asm_cmpltr_add(i, ASM_CC_PC, ASM_CT_S);
-		op = ASM_OP_FNMA;
-		break;
-	case ASM_OP_FPCMP_EQ:
-		asm_cmpltr_add(i, ASM_CC_FREL, ASM_CT_EQ);
-		op = ASM_OP_FPCMP;
-		break;
-	case ASM_OP_FPCMP_LE:
-		asm_cmpltr_add(i, ASM_CC_FREL, ASM_CT_LE);
-		op = ASM_OP_FPCMP;
-		break;
-	case ASM_OP_FPCMP_LT:
-		asm_cmpltr_add(i, ASM_CC_FREL, ASM_CT_LT);
-		op = ASM_OP_FPCMP;
-		break;
-	case ASM_OP_FPCMP_NEQ:
-		asm_cmpltr_add(i, ASM_CC_FREL, ASM_CT_NEQ);
-		op = ASM_OP_FPCMP;
-		break;
-	case ASM_OP_FPCMP_NLE:
-		asm_cmpltr_add(i, ASM_CC_FREL, ASM_CT_NLE);
-		op = ASM_OP_FPCMP;
-		break;
-	case ASM_OP_FPCMP_NLT:
-		asm_cmpltr_add(i, ASM_CC_FREL, ASM_CT_NLT);
-		op = ASM_OP_FPCMP;
-		break;
-	case ASM_OP_FPCMP_ORD:
-		asm_cmpltr_add(i, ASM_CC_FREL, ASM_CT_ORD);
-		op = ASM_OP_FPCMP;
-		break;
-	case ASM_OP_FPCMP_UNORD:
-		asm_cmpltr_add(i, ASM_CC_FREL, ASM_CT_UNORD);
-		op = ASM_OP_FPCMP;
-		break;
-	case ASM_OP_FPCVT_FX:
-		asm_cmpltr_add(i, ASM_CC_FCVT, ASM_CT_FX);
-		asm_cmpltr_add(i, ASM_CC_TRUNC, ASM_CT_NONE);
-		op = ASM_OP_FPCVT;
-		break;
-	case ASM_OP_FPCVT_FX_TRUNC:
-		asm_cmpltr_add(i, ASM_CC_FCVT, ASM_CT_FX);
-		asm_cmpltr_add(i, ASM_CC_TRUNC, ASM_CT_TRUNC);
-		op = ASM_OP_FPCVT;
-		break;
-	case ASM_OP_FPCVT_FXU:
-		asm_cmpltr_add(i, ASM_CC_FCVT, ASM_CT_FXU);
-		asm_cmpltr_add(i, ASM_CC_TRUNC, ASM_CT_NONE);
-		op = ASM_OP_FPCVT;
-		break;
-	case ASM_OP_FPCVT_FXU_TRUNC:
-		asm_cmpltr_add(i, ASM_CC_FCVT, ASM_CT_FXU);
-		asm_cmpltr_add(i, ASM_CC_TRUNC, ASM_CT_TRUNC);
-		op = ASM_OP_FPCVT;
-		break;
-	case ASM_OP_FPMERGE_NS:
-		asm_cmpltr_add(i, ASM_CC_FMERGE, ASM_CT_NS);
-		op = ASM_OP_FPMERGE;
-		break;
-	case ASM_OP_FPMERGE_S:
-		asm_cmpltr_add(i, ASM_CC_FMERGE, ASM_CT_S);
-		op = ASM_OP_FPMERGE;
-		break;
-	case ASM_OP_FPMERGE_SE:
-		asm_cmpltr_add(i, ASM_CC_FMERGE, ASM_CT_SE);
-		op = ASM_OP_FPMERGE;
-		break;
-	case ASM_OP_FSWAP_:
-		asm_cmpltr_add(i, ASM_CC_FSWAP, ASM_CT_NONE);
-		op = ASM_OP_FSWAP;
-		break;
-	case ASM_OP_FSWAP_NL:
-		asm_cmpltr_add(i, ASM_CC_FSWAP, ASM_CT_NL);
-		op = ASM_OP_FSWAP;
-		break;
-	case ASM_OP_FSWAP_NR:
-		asm_cmpltr_add(i, ASM_CC_FSWAP, ASM_CT_NR);
-		op = ASM_OP_FSWAP;
-		break;
-	case ASM_OP_FSXT_L:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_L);
-		op = ASM_OP_FSXT;
-		break;
-	case ASM_OP_FSXT_R:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_R);
-		op = ASM_OP_FSXT;
-		break;
-	case ASM_OP_GETF_D:
-		asm_cmpltr_add(i, ASM_CC_GETF, ASM_CT_D);
-		op = ASM_OP_GETF;
-		break;
-	case ASM_OP_GETF_EXP:
-		asm_cmpltr_add(i, ASM_CC_GETF, ASM_CT_EXP);
-		op = ASM_OP_GETF;
-		break;
-	case ASM_OP_GETF_S:
-		asm_cmpltr_add(i, ASM_CC_GETF, ASM_CT_S);
-		op = ASM_OP_GETF;
-		break;
-	case ASM_OP_GETF_SIG:
-		asm_cmpltr_add(i, ASM_CC_GETF, ASM_CT_SIG);
-		op = ASM_OP_GETF;
-		break;
-	case ASM_OP_HINT_B:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_B);
-		op = ASM_OP_HINT;
-		break;
-	case ASM_OP_HINT_F:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_F);
-		op = ASM_OP_HINT;
-		break;
-	case ASM_OP_HINT_I:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_I);
-		op = ASM_OP_HINT;
-		break;
-	case ASM_OP_HINT_M:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_M);
-		op = ASM_OP_HINT;
-		break;
-	case ASM_OP_HINT_X:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_X);
-		op = ASM_OP_HINT;
-		break;
-	case ASM_OP_INVALA_:
-		asm_cmpltr_add(i, ASM_CC_INVALA, ASM_CT_NONE);
-		op = ASM_OP_INVALA;
-		break;
-	case ASM_OP_INVALA_E:
-		asm_cmpltr_add(i, ASM_CC_INVALA, ASM_CT_E);
-		op = ASM_OP_INVALA;
-		break;
-	case ASM_OP_ITC_D:
-		asm_cmpltr_add(i, ASM_CC_ITC, ASM_CT_D);
-		op = ASM_OP_ITC;
-		break;
-	case ASM_OP_ITC_I:
-		asm_cmpltr_add(i, ASM_CC_ITC, ASM_CT_I);
-		op = ASM_OP_ITC;
-		break;
-	case ASM_OP_ITR_D:
-		asm_cmpltr_add(i, ASM_CC_ITR, ASM_CT_D);
-		ot = ASM_OPER_DTR;
-		op = ASM_OP_ITR;
-		break;
-	case ASM_OP_ITR_I:
-		asm_cmpltr_add(i, ASM_CC_ITR, ASM_CT_I);
-		ot = ASM_OPER_ITR;
-		op = ASM_OP_ITR;
-		break;
-	case ASM_OP_LD1_:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_NONE);
-		op = ASM_OP_LD1;
-		break;
-	case ASM_OP_LD1_A:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_A);
-		op = ASM_OP_LD1;
-		break;
-	case ASM_OP_LD1_ACQ:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_ACQ);
-		op = ASM_OP_LD1;
-		break;
-	case ASM_OP_LD1_BIAS:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_BIAS);
-		op = ASM_OP_LD1;
-		break;
-	case ASM_OP_LD1_C_CLR:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_C_CLR);
-		op = ASM_OP_LD1;
-		break;
-	case ASM_OP_LD1_C_CLR_ACQ:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_C_CLR_ACQ);
-		op = ASM_OP_LD1;
-		break;
-	case ASM_OP_LD1_C_NC:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_C_NC);
-		op = ASM_OP_LD1;
-		break;
-	case ASM_OP_LD1_S:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_S);
-		op = ASM_OP_LD1;
-		break;
-	case ASM_OP_LD1_SA: 
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_SA);
-		op = ASM_OP_LD1;
-		break;
-	case ASM_OP_LD16_:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_NONE);
-		op = ASM_OP_LD16;
-		break;
-	case ASM_OP_LD16_ACQ:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_ACQ);
-		op = ASM_OP_LD16;
-		break;
-	case ASM_OP_LD2_:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_NONE);
-		op = ASM_OP_LD2;
-		break;
-	case ASM_OP_LD2_A:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_A);
-		op = ASM_OP_LD2;
-		break;
-	case ASM_OP_LD2_ACQ:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_ACQ);
-		op = ASM_OP_LD2;
-		break;
-	case ASM_OP_LD2_BIAS:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_BIAS);
-		op = ASM_OP_LD2;
-		break;
-	case ASM_OP_LD2_C_CLR:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_C_CLR);
-		op = ASM_OP_LD2;
-		break;
-	case ASM_OP_LD2_C_CLR_ACQ:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_C_CLR_ACQ);
-		op = ASM_OP_LD2;
-		break;
-	case ASM_OP_LD2_C_NC:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_C_NC);
-		op = ASM_OP_LD2;
-		break;
-	case ASM_OP_LD2_S:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_S);
-		op = ASM_OP_LD2;
-		break;
-	case ASM_OP_LD2_SA: 
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_SA);
-		op = ASM_OP_LD2;
-		break;
-	case ASM_OP_LD4_:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_NONE);
-		op = ASM_OP_LD4;
-		break;
-	case ASM_OP_LD4_A:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_A);
-		op = ASM_OP_LD4;
-		break;
-	case ASM_OP_LD4_ACQ:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_ACQ);
-		op = ASM_OP_LD4;
-		break;
-	case ASM_OP_LD4_BIAS:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_BIAS);
-		op = ASM_OP_LD4;
-		break;
-	case ASM_OP_LD4_C_CLR:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_C_CLR);
-		op = ASM_OP_LD4;
-		break;
-	case ASM_OP_LD4_C_CLR_ACQ:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_C_CLR_ACQ);
-		op = ASM_OP_LD4;
-		break;
-	case ASM_OP_LD4_C_NC:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_C_NC);
-		op = ASM_OP_LD4;
-		break;
-	case ASM_OP_LD4_S:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_S);
-		op = ASM_OP_LD4;
-		break;
-	case ASM_OP_LD4_SA: 
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_SA);
-		op = ASM_OP_LD4;
-		break;
-	case ASM_OP_LD8_:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_NONE);
-		op = ASM_OP_LD8;
-		break;
-	case ASM_OP_LD8_A:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_A);
-		op = ASM_OP_LD8;
-		break;
-	case ASM_OP_LD8_ACQ:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_ACQ);
-		op = ASM_OP_LD8;
-		break;
-	case ASM_OP_LD8_BIAS:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_BIAS);
-		op = ASM_OP_LD8;
-		break;
-	case ASM_OP_LD8_C_CLR:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_C_CLR);
-		op = ASM_OP_LD8;
-		break;
-	case ASM_OP_LD8_C_CLR_ACQ:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_C_CLR_ACQ);
-		op = ASM_OP_LD8;
-		break;
-	case ASM_OP_LD8_C_NC:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_C_NC);
-		op = ASM_OP_LD8;
-		break;
-	case ASM_OP_LD8_FILL:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_FILL);
-		op = ASM_OP_LD8;
-		break;
-	case ASM_OP_LD8_S:
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_S);
-		op = ASM_OP_LD8;
-		break;
-	case ASM_OP_LD8_SA: 
-		asm_cmpltr_add(i, ASM_CC_LDTYPE, ASM_CT_SA);
-		op = ASM_OP_LD8;
-		break;
-	case ASM_OP_LDF_FILL:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_FILL);
-		op = ASM_OP_LDF;
-		break;
-	case ASM_OP_LDF8_:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_NONE);
-		op = ASM_OP_LDF8;
-		break;
-	case ASM_OP_LDF8_A:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_A);
-		op = ASM_OP_LDF8;
-		break;
-	case ASM_OP_LDF8_C_CLR:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_CLR);
-		op = ASM_OP_LDF8;
-		break;
-	case ASM_OP_LDF8_C_NC:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_NC);
-		op = ASM_OP_LDF8;
-		break;
-	case ASM_OP_LDF8_S:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_S);
-		op = ASM_OP_LDF8;
-		break;
-	case ASM_OP_LDF8_SA:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_SA);
-		op = ASM_OP_LDF8;
-		break;
-	case ASM_OP_LDFD_:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_NONE);
-		op = ASM_OP_LDFD;
-		break;
-	case ASM_OP_LDFD_A:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_A);
-		op = ASM_OP_LDFD;
-		break;
-	case ASM_OP_LDFD_C_CLR:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_CLR);
-		op = ASM_OP_LDFD;
-		break;
-	case ASM_OP_LDFD_C_NC:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_NC);
-		op = ASM_OP_LDFD;
-		break;
-	case ASM_OP_LDFD_S:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_S);
-		op = ASM_OP_LDFD;
-		break;
-	case ASM_OP_LDFD_SA:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_SA);
-		op = ASM_OP_LDFD;
-		break;
-	case ASM_OP_LDFE_:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_NONE);
-		op = ASM_OP_LDFE;
-		break;
-	case ASM_OP_LDFE_A:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_A);
-		op = ASM_OP_LDFE;
-		break;
-	case ASM_OP_LDFE_C_CLR:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_CLR);
-		op = ASM_OP_LDFE;
-		break;
-	case ASM_OP_LDFE_C_NC:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_NC);
-		op = ASM_OP_LDFE;
-		break;
-	case ASM_OP_LDFE_S:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_S);
-		op = ASM_OP_LDFE;
-		break;
-	case ASM_OP_LDFE_SA:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_SA);
-		op = ASM_OP_LDFE;
-		break;
-	case ASM_OP_LDFP8_:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_NONE);
-		op = ASM_OP_LDFP8;
-		break;
-	case ASM_OP_LDFP8_A:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_A);
-		op = ASM_OP_LDFP8;
-		break;
-	case ASM_OP_LDFP8_C_CLR:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_CLR);
-		op = ASM_OP_LDFP8;
-		break;
-	case ASM_OP_LDFP8_C_NC:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_NC);
-		op = ASM_OP_LDFP8;
-		break;
-	case ASM_OP_LDFP8_S:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_S);
-		op = ASM_OP_LDFP8;
-		break;
-	case ASM_OP_LDFP8_SA:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_SA);
-		op = ASM_OP_LDFP8;
-		break;
-	case ASM_OP_LDFPD_:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_NONE);
-		op = ASM_OP_LDFPD;
-		break;
-	case ASM_OP_LDFPD_A:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_A);
-		op = ASM_OP_LDFPD;
-		break;
-	case ASM_OP_LDFPD_C_CLR:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_CLR);
-		op = ASM_OP_LDFPD;
-		break;
-	case ASM_OP_LDFPD_C_NC:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_NC);
-		op = ASM_OP_LDFPD;
-		break;
-	case ASM_OP_LDFPD_S:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_S);
-		op = ASM_OP_LDFPD;
-		break;
-	case ASM_OP_LDFPD_SA:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_SA);
-		op = ASM_OP_LDFPD;
-		break;
-	case ASM_OP_LDFPS_:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_NONE);
-		op = ASM_OP_LDFPS;
-		break;
-	case ASM_OP_LDFPS_A:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_A);
-		op = ASM_OP_LDFPS;
-		break;
-	case ASM_OP_LDFPS_C_CLR:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_CLR);
-		op = ASM_OP_LDFPS;
-		break;
-	case ASM_OP_LDFPS_C_NC:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_NC);
-		op = ASM_OP_LDFPS;
-		break;
-	case ASM_OP_LDFPS_S:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_S);
-		op = ASM_OP_LDFPS;
-		break;
-	case ASM_OP_LDFPS_SA:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_SA);
-		op = ASM_OP_LDFPS;
-		break;
-	case ASM_OP_LDFS_:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_NONE);
-		op = ASM_OP_LDFS;
-		break;
-	case ASM_OP_LDFS_A:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_A);
-		op = ASM_OP_LDFS;
-		break;
-	case ASM_OP_LDFS_C_CLR:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_CLR);
-		op = ASM_OP_LDFS;
-		break;
-	case ASM_OP_LDFS_C_NC:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_C_NC);
-		op = ASM_OP_LDFS;
-		break;
-	case ASM_OP_LDFS_S:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_S);
-		op = ASM_OP_LDFS;
-		break;
-	case ASM_OP_LDFS_SA:
-		asm_cmpltr_add(i, ASM_CC_FLDTYPE, ASM_CT_SA);
-		op = ASM_OP_LDFS;
-		break;
-	case ASM_OP_LFETCH_:
-		asm_cmpltr_add(i, ASM_CC_LFTYPE, ASM_CT_NONE);
-		asm_cmpltr_add(i, ASM_CC_LFETCH, ASM_CT_NONE);
-		op = ASM_OP_LFETCH;
-		break;
-	case ASM_OP_LFETCH_EXCL:
-		asm_cmpltr_add(i, ASM_CC_LFTYPE, ASM_CT_NONE);
-		asm_cmpltr_add(i, ASM_CC_LFETCH, ASM_CT_EXCL);
-		op = ASM_OP_LFETCH;
-		break;
-	case ASM_OP_LFETCH_FAULT:
-		asm_cmpltr_add(i, ASM_CC_LFTYPE, ASM_CT_FAULT);
-		asm_cmpltr_add(i, ASM_CC_LFETCH, ASM_CT_NONE);
-		op = ASM_OP_LFETCH;
-		break;
-	case ASM_OP_LFETCH_FAULT_EXCL:
-		asm_cmpltr_add(i, ASM_CC_LFTYPE, ASM_CT_FAULT);
-		asm_cmpltr_add(i, ASM_CC_LFETCH, ASM_CT_EXCL);
-		op = ASM_OP_LFETCH;
-		break;
-	case ASM_OP_MF_:
-		asm_cmpltr_add(i, ASM_CC_MF, ASM_CT_NONE);
-		op = ASM_OP_MF;
-		break;
-	case ASM_OP_MF_A:
-		asm_cmpltr_add(i, ASM_CC_MF, ASM_CT_A);
-		op = ASM_OP_MF;
-		break;
-	case ASM_OP_MIX1_L:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_L);
-		op = ASM_OP_MIX1;
-		break;
-	case ASM_OP_MIX1_R:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_R);
-		op = ASM_OP_MIX1;
-		break;
-	case ASM_OP_MIX2_L:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_L);
-		op = ASM_OP_MIX2;
-		break;
-	case ASM_OP_MIX2_R:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_R);
-		op = ASM_OP_MIX2;
-		break;
-	case ASM_OP_MIX4_L:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_L);
-		op = ASM_OP_MIX4;
-		break;
-	case ASM_OP_MIX4_R:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_R);
-		op = ASM_OP_MIX4;
-		break;
-	case ASM_OP_MOV_:
-		asm_cmpltr_add(i, ASM_CC_MOV, ASM_CT_NONE);
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_I:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_I);
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_M:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_M);
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_RET:
-		asm_cmpltr_add(i, ASM_CC_MOV, ASM_CT_RET);
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_CPUID:
-		ot = ASM_OPER_CPUID;
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_DBR:
-		ot = ASM_OPER_DBR;
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_IBR:
-		ot = ASM_OPER_IBR;
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_IP:
-		ot = ASM_OPER_IP;
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_MSR:
-		ot = ASM_OPER_MSR;
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_PKR:
-		ot = ASM_OPER_PKR;
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_PMC:
-		ot = ASM_OPER_PMC;
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_PMD:
-		ot = ASM_OPER_PMD;
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_PR:
-		ot = ASM_OPER_PR;
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_PSR:
-		ot = ASM_OPER_PSR;
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_PSR_L:
-		ot = ASM_OPER_PSR_L;
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_PSR_UM:
-		ot = ASM_OPER_PSR_UM;
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_MOV_RR:
-		ot = ASM_OPER_RR;
-		op = ASM_OP_MOV;
-		break;
-	case ASM_OP_NOP_B:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_B);
-		op = ASM_OP_NOP;
-		break;
-	case ASM_OP_NOP_F:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_F);
-		op = ASM_OP_NOP;
-		break;
-	case ASM_OP_NOP_I:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_I);
-		op = ASM_OP_NOP;
-		break;
-	case ASM_OP_NOP_M:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_M);
-		op = ASM_OP_NOP;
-		break;
-	case ASM_OP_NOP_X:
-		asm_cmpltr_add(i, ASM_CC_UNIT, ASM_CT_X);
-		op = ASM_OP_NOP;
-		break;
-	case ASM_OP_PACK2_SSS:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_SSS);
-		op = ASM_OP_PACK2;
-		break;
-	case ASM_OP_PACK2_USS:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_USS);
-		op = ASM_OP_PACK2;
-		break;
-	case ASM_OP_PACK4_SSS:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_SSS);
-		op = ASM_OP_PACK4;
-		break;
-	case ASM_OP_PADD1_:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_NONE);
-		op = ASM_OP_PADD1;
-		break;
-	case ASM_OP_PADD1_SSS:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_SSS);
-		op = ASM_OP_PADD1;
-		break;
-	case ASM_OP_PADD1_UUS:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_UUS);
-		op = ASM_OP_PADD1;
-		break;
-	case ASM_OP_PADD1_UUU:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_UUU);
-		op = ASM_OP_PADD1;
-		break;
-	case ASM_OP_PADD2_:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_NONE);
-		op = ASM_OP_PADD2;
-		break;
-	case ASM_OP_PADD2_SSS:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_SSS);
-		op = ASM_OP_PADD2;
-		break;
-	case ASM_OP_PADD2_UUS:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_UUS);
-		op = ASM_OP_PADD2;
-		break;
-	case ASM_OP_PADD2_UUU:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_UUU);
-		op = ASM_OP_PADD2;
-		break;
-	case ASM_OP_PAVG1_:
-		asm_cmpltr_add(i, ASM_CC_PAVG, ASM_CT_NONE);
-		op = ASM_OP_PAVG1;
-		break;
-	case ASM_OP_PAVG1_RAZ:
-		asm_cmpltr_add(i, ASM_CC_PAVG, ASM_CT_RAZ);
-		op = ASM_OP_PAVG1;
-		break;
-	case ASM_OP_PAVG2_:
-		asm_cmpltr_add(i, ASM_CC_PAVG, ASM_CT_NONE);
-		op = ASM_OP_PAVG2;
-		break;
-	case ASM_OP_PAVG2_RAZ:
-		asm_cmpltr_add(i, ASM_CC_PAVG, ASM_CT_RAZ);
-		op = ASM_OP_PAVG2;
-		break;
-	case ASM_OP_PCMP1_EQ:
-		asm_cmpltr_add(i, ASM_CC_PREL, ASM_CT_EQ);
-		op = ASM_OP_PCMP1;
-		break;
-	case ASM_OP_PCMP1_GT:
-		asm_cmpltr_add(i, ASM_CC_PREL, ASM_CT_GT);
-		op = ASM_OP_PCMP1;
-		break;
-	case ASM_OP_PCMP2_EQ:
-		asm_cmpltr_add(i, ASM_CC_PREL, ASM_CT_EQ);
-		op = ASM_OP_PCMP2;
-		break;
-	case ASM_OP_PCMP2_GT:
-		asm_cmpltr_add(i, ASM_CC_PREL, ASM_CT_GT);
-		op = ASM_OP_PCMP2;
-		break;
-	case ASM_OP_PCMP4_EQ:
-		asm_cmpltr_add(i, ASM_CC_PREL, ASM_CT_EQ);
-		op = ASM_OP_PCMP4;
-		break;
-	case ASM_OP_PCMP4_GT:
-		asm_cmpltr_add(i, ASM_CC_PREL, ASM_CT_GT);
-		op = ASM_OP_PCMP4;
-		break;
-	case ASM_OP_PMAX1_U:
-		asm_cmpltr_add(i, ASM_CC_UNS, ASM_CT_U);
-		op = ASM_OP_PMAX1;
-		break;
-	case ASM_OP_PMIN1_U:
-		asm_cmpltr_add(i, ASM_CC_UNS, ASM_CT_U);
-		op = ASM_OP_PMIN1;
-		break;
-	case ASM_OP_PMPY2_L:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_L);
-		op = ASM_OP_PMPY2;
-		break;
-	case ASM_OP_PMPY2_R:
-		asm_cmpltr_add(i, ASM_CC_LR, ASM_CT_R);
-		op = ASM_OP_PMPY2;
-		break;
-	case ASM_OP_PMPYSHR2_:
-		asm_cmpltr_add(i, ASM_CC_UNS, ASM_CT_NONE);
-		op = ASM_OP_PMPYSHR2;
-		break;
-	case ASM_OP_PMPYSHR2_U:
-		asm_cmpltr_add(i, ASM_CC_UNS, ASM_CT_U);
-		op = ASM_OP_PMPYSHR2;
-		break;
-	case ASM_OP_PROBE_R:
-		asm_cmpltr_add(i, ASM_CC_RW, ASM_CT_R);
-		asm_cmpltr_add(i, ASM_CC_PRTYPE, ASM_CT_NONE);
-		op = ASM_OP_PROBE;
-		break;
-	case ASM_OP_PROBE_R_FAULT:
-		asm_cmpltr_add(i, ASM_CC_RW, ASM_CT_R);
-		asm_cmpltr_add(i, ASM_CC_PRTYPE, ASM_CT_FAULT);
-		op = ASM_OP_PROBE;
-		break;
-	case ASM_OP_PROBE_RW_FAULT:
-		asm_cmpltr_add(i, ASM_CC_RW, ASM_CT_RW);
-		asm_cmpltr_add(i, ASM_CC_PRTYPE, ASM_CT_FAULT);
-		op = ASM_OP_PROBE;
-		break;
-	case ASM_OP_PROBE_W:
-		asm_cmpltr_add(i, ASM_CC_RW, ASM_CT_W);
-		asm_cmpltr_add(i, ASM_CC_PRTYPE, ASM_CT_NONE);
-		op = ASM_OP_PROBE;
-		break;
-	case ASM_OP_PROBE_W_FAULT:
-		asm_cmpltr_add(i, ASM_CC_RW, ASM_CT_W);
-		asm_cmpltr_add(i, ASM_CC_PRTYPE, ASM_CT_FAULT);
-		op = ASM_OP_PROBE;
-		break;
-	case ASM_OP_PSHR2_:
-		asm_cmpltr_add(i, ASM_CC_UNS, ASM_CT_NONE);
-		op = ASM_OP_PSHR2;
-		break;
-	case ASM_OP_PSHR2_U:
-		asm_cmpltr_add(i, ASM_CC_UNS, ASM_CT_U);
-		op = ASM_OP_PSHR2;
-		break;
-	case ASM_OP_PSHR4_:
-		asm_cmpltr_add(i, ASM_CC_UNS, ASM_CT_NONE);
-		op = ASM_OP_PSHR4;
-		break;
-	case ASM_OP_PSHR4_U:
-		asm_cmpltr_add(i, ASM_CC_UNS, ASM_CT_U);
-		op = ASM_OP_PSHR4;
-		break;
-	case ASM_OP_PSUB1_:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_NONE);
-		op = ASM_OP_PSUB1;
-		break;
-	case ASM_OP_PSUB1_SSS:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_SSS);
-		op = ASM_OP_PSUB1;
-		break;
-	case ASM_OP_PSUB1_UUS:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_UUS);
-		op = ASM_OP_PSUB1;
-		break;
-	case ASM_OP_PSUB1_UUU:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_UUU);
-		op = ASM_OP_PSUB1;
-		break;
-	case ASM_OP_PSUB2_:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_NONE);
-		op = ASM_OP_PSUB2;
-		break;
-	case ASM_OP_PSUB2_SSS:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_SSS);
-		op = ASM_OP_PSUB2;
-		break;
-	case ASM_OP_PSUB2_UUS:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_UUS);
-		op = ASM_OP_PSUB2;
-		break;
-	case ASM_OP_PSUB2_UUU:
-		asm_cmpltr_add(i, ASM_CC_SAT, ASM_CT_UUU);
-		op = ASM_OP_PSUB2;
-		break;
-	case ASM_OP_PTC_E:
-		asm_cmpltr_add(i, ASM_CC_PTC, ASM_CT_E);
-		op = ASM_OP_PTC;
-		break;
-	case ASM_OP_PTC_G:
-		asm_cmpltr_add(i, ASM_CC_PTC, ASM_CT_G);
-		op = ASM_OP_PTC;
-		break;
-	case ASM_OP_PTC_GA:
-		asm_cmpltr_add(i, ASM_CC_PTC, ASM_CT_GA);
-		op = ASM_OP_PTC;
-		break;
-	case ASM_OP_PTC_L:
-		asm_cmpltr_add(i, ASM_CC_PTC, ASM_CT_L);
-		op = ASM_OP_PTC;
-		break;
-	case ASM_OP_PTR_D:
-		asm_cmpltr_add(i, ASM_CC_PTR, ASM_CT_D);
-		op = ASM_OP_PTR;
-		break;
-	case ASM_OP_PTR_I:
-		asm_cmpltr_add(i, ASM_CC_PTR, ASM_CT_I);
-		op = ASM_OP_PTR;
-		break;
-	case ASM_OP_SETF_D:
-		asm_cmpltr_add(i, ASM_CC_SETF, ASM_CT_D);
-		op = ASM_OP_SETF;
-		break;
-	case ASM_OP_SETF_EXP:
-		asm_cmpltr_add(i, ASM_CC_SETF, ASM_CT_EXP);
-		op = ASM_OP_SETF;
-		break;
-	case ASM_OP_SETF_S:
-		asm_cmpltr_add(i, ASM_CC_SETF, ASM_CT_S);
-		op = ASM_OP_SETF;
-		break;
-	case ASM_OP_SETF_SIG:
-		asm_cmpltr_add(i, ASM_CC_SETF, ASM_CT_SIG);
-		op = ASM_OP_SETF;
-		break;
-	case ASM_OP_SHR_:
-		asm_cmpltr_add(i, ASM_CC_UNS, ASM_CT_NONE);
-		op = ASM_OP_SHR;
-		break;
-	case ASM_OP_SHR_U:
-		asm_cmpltr_add(i, ASM_CC_UNS, ASM_CT_U);
-		op = ASM_OP_SHR;
-		break;
-	case ASM_OP_SRLZ_D:
-		asm_cmpltr_add(i, ASM_CC_SRLZ, ASM_CT_D);
-		op = ASM_OP_SRLZ;
-		break;
-	case ASM_OP_SRLZ_I:
-		asm_cmpltr_add(i, ASM_CC_SRLZ, ASM_CT_I);
-		op = ASM_OP_SRLZ;
-		break;
-	case ASM_OP_ST1_:
-		asm_cmpltr_add(i, ASM_CC_STTYPE, ASM_CT_NONE);
-		op = ASM_OP_ST1;
-		break;
-	case ASM_OP_ST1_REL:
-		asm_cmpltr_add(i, ASM_CC_STTYPE, ASM_CT_REL);
-		op = ASM_OP_ST1;
-		break;
-	case ASM_OP_ST16_:
-		asm_cmpltr_add(i, ASM_CC_STTYPE, ASM_CT_NONE);
-		op = ASM_OP_ST16;
-		break;
-	case ASM_OP_ST16_REL:
-		asm_cmpltr_add(i, ASM_CC_STTYPE, ASM_CT_REL);
-		op = ASM_OP_ST16;
-		break;
-	case ASM_OP_ST2_:
-		asm_cmpltr_add(i, ASM_CC_STTYPE, ASM_CT_NONE);
-		op = ASM_OP_ST2;
-		break;
-	case ASM_OP_ST2_REL:
-		asm_cmpltr_add(i, ASM_CC_STTYPE, ASM_CT_REL);
-		op = ASM_OP_ST2;
-		break;
-	case ASM_OP_ST4_:
-		asm_cmpltr_add(i, ASM_CC_STTYPE, ASM_CT_NONE);
-		op = ASM_OP_ST4;
-		break;
-	case ASM_OP_ST4_REL:
-		asm_cmpltr_add(i, ASM_CC_STTYPE, ASM_CT_REL);
-		op = ASM_OP_ST4;
-		break;
-	case ASM_OP_ST8_:
-		asm_cmpltr_add(i, ASM_CC_STTYPE, ASM_CT_NONE);
-		op = ASM_OP_ST8;
-		break;
-	case ASM_OP_ST8_REL:
-		asm_cmpltr_add(i, ASM_CC_STTYPE, ASM_CT_REL);
-		op = ASM_OP_ST8;
-		break;
-	case ASM_OP_ST8_SPILL:
-		asm_cmpltr_add(i, ASM_CC_STTYPE, ASM_CT_SPILL);
-		op = ASM_OP_ST8;
-		break;
-	case ASM_OP_STF_SPILL:
-		asm_cmpltr_add(i, ASM_CC_STTYPE, ASM_CT_SPILL);
-		op = ASM_OP_STF;
-		break;
-	case ASM_OP_SYNC_I:
-		asm_cmpltr_add(i, ASM_CC_SYNC, ASM_CT_I);
-		op = ASM_OP_SYNC;
-		break;
-	case ASM_OP_TBIT_NZ_AND:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_NZ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_TBIT;
-		break;
-	case ASM_OP_TBIT_NZ_OR:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_NZ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_TBIT;
-		break;
-	case ASM_OP_TBIT_NZ_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_NZ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_TBIT;
-		break;
-	case ASM_OP_TBIT_Z:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_NONE);
-		op = ASM_OP_TBIT;
-		break;
-	case ASM_OP_TBIT_Z_AND:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_TBIT;
-		break;
-	case ASM_OP_TBIT_Z_OR:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_TBIT;
-		break;
-	case ASM_OP_TBIT_Z_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_TBIT;
-		break;
-	case ASM_OP_TBIT_Z_UNC:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_UNC);
-		op = ASM_OP_TBIT;
-		break;
-	case ASM_OP_TF_NZ_AND:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_NZ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_TF;
-		break;
-	case ASM_OP_TF_NZ_OR:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_NZ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_TF;
-		break;
-	case ASM_OP_TF_NZ_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_NZ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_TF;
-		break;
-	case ASM_OP_TF_Z:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_NONE);
-		op = ASM_OP_TF;
-		break;
-	case ASM_OP_TF_Z_AND:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_TF;
-		break;
-	case ASM_OP_TF_Z_OR:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_TF;
-		break;
-	case ASM_OP_TF_Z_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_TF;
-		break;
-	case ASM_OP_TF_Z_UNC:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_UNC);
-		op = ASM_OP_TF;
-		break;
-	case ASM_OP_TNAT_NZ_AND:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_NZ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_TNAT;
-		break;
-	case ASM_OP_TNAT_NZ_OR:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_NZ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_TNAT;
-		break;
-	case ASM_OP_TNAT_NZ_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_NZ);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_TNAT;
-		break;
-	case ASM_OP_TNAT_Z:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_NONE);
-		op = ASM_OP_TNAT;
-		break;
-	case ASM_OP_TNAT_Z_AND:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_AND);
-		op = ASM_OP_TNAT;
-		break;
-	case ASM_OP_TNAT_Z_OR:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR);
-		op = ASM_OP_TNAT;
-		break;
-	case ASM_OP_TNAT_Z_OR_ANDCM:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_OR_ANDCM);
-		op = ASM_OP_TNAT;
-		break;
-	case ASM_OP_TNAT_Z_UNC:
-		asm_cmpltr_add(i, ASM_CC_TREL, ASM_CT_Z);
-		asm_cmpltr_add(i, ASM_CC_CTYPE, ASM_CT_UNC);
-		op = ASM_OP_TNAT;
-		break;
-	case ASM_OP_UNPACK1_H:
-		asm_cmpltr_add(i, ASM_CC_UNPACK, ASM_CT_H);
-		op = ASM_OP_UNPACK1;
-		break;
-	case ASM_OP_UNPACK1_L:
-		asm_cmpltr_add(i, ASM_CC_UNPACK, ASM_CT_L);
-		op = ASM_OP_UNPACK1;
-		break;
-	case ASM_OP_UNPACK2_H:
-		asm_cmpltr_add(i, ASM_CC_UNPACK, ASM_CT_H);
-		op = ASM_OP_UNPACK2;
-		break;
-	case ASM_OP_UNPACK2_L:
-		asm_cmpltr_add(i, ASM_CC_UNPACK, ASM_CT_L);
-		op = ASM_OP_UNPACK2;
-		break;
-	case ASM_OP_UNPACK4_H:
-		asm_cmpltr_add(i, ASM_CC_UNPACK, ASM_CT_H);
-		op = ASM_OP_UNPACK4;
-		break;
-	case ASM_OP_UNPACK4_L:
-		asm_cmpltr_add(i, ASM_CC_UNPACK, ASM_CT_L);
-		op = ASM_OP_UNPACK4;
-		break;
-	case ASM_OP_VMSW_0:
-		asm_cmpltr_add(i, ASM_CC_VMSW, ASM_CT_0);
-		op = ASM_OP_VMSW;
-		break;
-	case ASM_OP_VMSW_1:
-		asm_cmpltr_add(i, ASM_CC_VMSW, ASM_CT_1);
-		op = ASM_OP_VMSW;
-		break;
-	case ASM_OP_XMA_H:
-		asm_cmpltr_add(i, ASM_CC_XMA, ASM_CT_H);
-		op = ASM_OP_XMA;
-		break;
-	case ASM_OP_XMA_HU:
-		asm_cmpltr_add(i, ASM_CC_XMA, ASM_CT_HU);
-		op = ASM_OP_XMA;
-		break;
-	case ASM_OP_XMA_L:
-		asm_cmpltr_add(i, ASM_CC_XMA, ASM_CT_L);
-		op = ASM_OP_XMA;
-		break;
-	default:
-		KASSERT(op < ASM_OP_NUMBER_OF_OPCODES, ("foo"));
-		break;
-	}
-	i->i_op = op;
-	return (ot);
-}
-
-static __inline void
-op_imm(struct asm_inst *i, int op, uint64_t val)
-{
-	i->i_oper[op].o_type = ASM_OPER_IMM;
-	i->i_oper[op].o_value = val;
-}
-
-static __inline void
-op_type(struct asm_inst *i, int op, enum asm_oper_type ot)
-{
-	i->i_oper[op].o_type = ot;
-}
-
-static __inline void
-op_value(struct asm_inst *i, int op, uint64_t val)
-{
-	i->i_oper[op].o_value = val;
-}
-
-static __inline void
-operand(struct asm_inst *i, int op, enum asm_oper_type ot, uint64_t bits,
-    int o, int l)
-{
-	i->i_oper[op].o_type = ot;
-	i->i_oper[op].o_value = FIELD(bits, o, l);
-}
-
-static uint64_t
-imm(uint64_t bits, int sign, int o, int l)
-{
-	uint64_t val = FIELD(bits, o, l);
-
-	if (sign && (val & (1LL << (l - 1))) != 0)
-		val |= -1LL << l;
-	return (val);
-}
-
-static void
-s_imm(struct asm_inst *i, int op, uint64_t bits, int o, int l)
-{
-	i->i_oper[op].o_type = ASM_OPER_IMM;
-	i->i_oper[op].o_value = imm(bits, 1, o, l);
-}
-
-static void
-u_imm(struct asm_inst *i, int op, uint64_t bits, int o, int l)
-{
-	i->i_oper[op].o_type = ASM_OPER_IMM;
-	i->i_oper[op].o_value = imm(bits, 0, o, l);
-}
-
-static uint64_t
-vimm(uint64_t bits, int sign, va_list ap)
-{
-	uint64_t val = 0;
-	int len = 0;
-	int frag;
-
-	while ((frag = va_arg(ap, int)) != 0) {
-		val |= (uint64_t)FIELD(bits, FRAG_OFS(frag), FRAG_LEN(frag))
-		    << len;
-		len += FRAG_LEN(frag);
-	}
-	if (sign && (val & (1LL << (len - 1))) != 0)
-		val |= -1LL << len;
-	return (val);
-}
-
-static void
-s_immf(struct asm_inst *i, int op, uint64_t bits, ...)
-{
-	va_list ap;
-	va_start(ap, bits);
-	i->i_oper[op].o_type = ASM_OPER_IMM;
-	i->i_oper[op].o_value = vimm(bits, 1, ap);
-	va_end(ap);
-}
-
-static void
-u_immf(struct asm_inst *i, int op, uint64_t bits, ...)
-{
-	va_list ap;
-	va_start(ap, bits);
-	i->i_oper[op].o_type = ASM_OPER_IMM;
-	i->i_oper[op].o_value = vimm(bits, 0, ap);
-	va_end(ap);
-}
-
-static void
-disp(struct asm_inst *i, int op, uint64_t bits, ...)
-{
-	va_list ap;
-	va_start(ap, bits);
-	i->i_oper[op].o_type = ASM_OPER_DISP;
-	i->i_oper[op].o_value = vimm(bits, 1, ap) << 4;
-	va_end(ap);
-}
-
-static __inline void
-combine(uint64_t *dst, int dl, uint64_t src, int sl, int so)
-{
-	*dst = (*dst & ((1LL << dl) - 1LL)) |
-	    ((uint64_t)_FLD64(src, so, sl) << dl);
-}
-
-int
-asm_extract(enum asm_op op, enum asm_fmt fmt, uint64_t bits,
-    struct asm_bundle *b, int slot)
-{
-	struct asm_inst *i = b->b_inst + slot;
-	enum asm_oper_type ot;
-
-	KASSERT(op != ASM_OP_NONE, ("foo"));
-	i->i_bits = bits;
-	i->i_format = fmt;
-	i->i_srcidx = 2;
-
-	ot = asm_normalize(i, op);
-
-	if (fmt != ASM_FMT_B6 && fmt != ASM_FMT_B7)
-		operand(i, 0, ASM_OPER_PREG, bits, 0, 6);
-
-	switch (fmt) {
-	case ASM_FMT_A1:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_GREG, bits, 20, 7);
-		if ((op == ASM_OP_ADD && FIELD(bits, 27, 2) == 1) ||
-		    (op == ASM_OP_SUB && FIELD(bits, 27, 2) == 0))
-			op_imm(i, 4, 1LL);
-		break;
-	case ASM_FMT_A2:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		op_imm(i, 3, 1LL + FIELD(bits, 27, 2));
-		operand(i, 4, ASM_OPER_GREG, bits, 20, 7);
-		break;
-	case ASM_FMT_A3:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		s_immf(i, 2, bits, FRAG(13,7), FRAG(36,1), 0);
-		operand(i, 3, ASM_OPER_GREG, bits, 20, 7);
-		break;
-	case ASM_FMT_A4:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		s_immf(i, 2, bits, FRAG(13,7), FRAG(27,6), FRAG(36,1), 0);
-		operand(i, 3, ASM_OPER_GREG, bits, 20, 7);
-		break;
-	case ASM_FMT_A5:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		s_immf(i, 2, bits, FRAG(13,7), FRAG(27,9), FRAG(22,5),
-		    FRAG(36,1), 0);
-		operand(i, 3, ASM_OPER_GREG, bits, 20, 2);
-		break;
-	case ASM_FMT_A6: /* 2 dst */
-		operand(i, 1, ASM_OPER_PREG, bits, 6, 6);
-		operand(i, 2, ASM_OPER_PREG, bits, 27, 6);
-		operand(i, 3, ASM_OPER_GREG, bits, 13, 7);
-		operand(i, 4, ASM_OPER_GREG, bits, 20, 7);
-		i->i_srcidx++;
-		break;
-	case ASM_FMT_A7: /* 2 dst */
-		if (FIELD(bits, 13, 7) != 0)
-			return (0);
-		operand(i, 1, ASM_OPER_PREG, bits, 6, 6);
-		operand(i, 2, ASM_OPER_PREG, bits, 27, 6);
-		operand(i, 3, ASM_OPER_GREG, bits, 13, 7);
-		operand(i, 4, ASM_OPER_GREG, bits, 20, 7);
-		i->i_srcidx++;
-		break;
-	case ASM_FMT_A8: /* 2 dst */
-		operand(i, 1, ASM_OPER_PREG, bits, 6, 6);
-		operand(i, 2, ASM_OPER_PREG, bits, 27, 6);
-		s_immf(i, 3, bits, FRAG(13,7), FRAG(36,1), 0);
-		operand(i, 4, ASM_OPER_GREG, bits, 20, 7);
-		i->i_srcidx++;
-		break;
-	case ASM_FMT_A9:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_GREG, bits, 20, 7);
-		break;
-	case ASM_FMT_A10:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		op_imm(i, 3, 1LL + FIELD(bits, 27, 2));
-		operand(i, 4, ASM_OPER_GREG, bits, 20, 7);
-		break;
-	case ASM_FMT_B1: /* 0 dst */
-		asm_brhint(i);
-		disp(i, 1, bits, FRAG(13,20), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_B2: /* 0 dst */
-		if (FIELD(bits, 0, 6) != 0)
-			return (0);
-		asm_brhint(i);
-		disp(i, 1, bits, FRAG(13,20), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_B3:
-		asm_brhint(i);
-		operand(i, 1, ASM_OPER_BREG, bits, 6, 3);
-		disp(i, 2, bits, FRAG(13,20), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_B4: /* 0 dst */
-		asm_brhint(i);
-		operand(i, 1, ASM_OPER_BREG, bits, 13, 3);
-		break;
-	case ASM_FMT_B5:
-#if 0
-		if (FIELD(bits, 32, 1) == 0)
-			return (0);
-#endif
-		asm_brhint(i);
-		operand(i, 1, ASM_OPER_BREG, bits, 6, 3);
-		operand(i, 2, ASM_OPER_BREG, bits, 13, 3);
-		break;
-	case ASM_FMT_B6: /* 0 dst */
-		asm_brphint(i);
-		disp(i, 1, bits, FRAG(13,20), FRAG(36,1), 0);
-		disp(i, 2, bits, FRAG(6,7), FRAG(33,2), 0);
-		i->i_srcidx--;
-		break;
-	case ASM_FMT_B7: /* 0 dst */
-		asm_brphint(i);
-		operand(i, 1, ASM_OPER_BREG, bits, 13, 3);
-		disp(i, 2, bits, FRAG(6,7), FRAG(33,2), 0);
-		i->i_srcidx--;
-		break;
-	case ASM_FMT_B8:
-		/* no operands */
-		break;
-	case ASM_FMT_B9: /* 0 dst */
-		u_immf(i, 1, bits, FRAG(6,20), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_F1:
-		asm_sf(i);
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_FREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_FREG, bits, 20, 7);
-		operand(i, 4, ASM_OPER_FREG, bits, 27, 7);
-		break;
-	case ASM_FMT_F2:
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_FREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_FREG, bits, 20, 7);
-		operand(i, 4, ASM_OPER_FREG, bits, 27, 7);
-		break;
-	case ASM_FMT_F3:
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_FREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_FREG, bits, 20, 7);
-		operand(i, 4, ASM_OPER_FREG, bits, 27, 7);
-		break;
-	case ASM_FMT_F4: /* 2 dst */
-		if (FIELD(bits, 33, 1)) { /* ra */
-			if (FIELD(bits, 36, 1)) /* rb */
-				asm_cmpltr_add(i, ASM_CC_FREL, ASM_CT_UNORD);
-			else
-				asm_cmpltr_add(i, ASM_CC_FREL, ASM_CT_LE);
-		} else {
-			if (FIELD(bits, 36, 1)) /* rb */
-				asm_cmpltr_add(i, ASM_CC_FREL, ASM_CT_LT);
-			else
-				asm_cmpltr_add(i, ASM_CC_FREL, ASM_CT_EQ);
-		}
-		if (FIELD(bits, 12, 1)) /* ta */
-			asm_cmpltr_add(i, ASM_CC_FCTYPE, ASM_CT_UNC);
-		else
-			asm_cmpltr_add(i, ASM_CC_FCTYPE, ASM_CT_NONE);
-		asm_sf(i);
-		operand(i, 1, ASM_OPER_PREG, bits, 6, 6);
-		operand(i, 2, ASM_OPER_PREG, bits, 27, 6);
-		operand(i, 3, ASM_OPER_FREG, bits, 13, 7);
-		operand(i, 4, ASM_OPER_FREG, bits, 20, 7);
-		i->i_srcidx++;
-		break;
-	case ASM_FMT_F5: /* 2 dst */
-		operand(i, 1, ASM_OPER_PREG, bits, 6, 6);
-		operand(i, 2, ASM_OPER_PREG, bits, 27, 6);
-		operand(i, 3, ASM_OPER_FREG, bits, 13, 7);
-		u_immf(i, 4, bits, FRAG(33,2), FRAG(20,7), 0);
-		i->i_srcidx++;
-		break;
-	case ASM_FMT_F6: /* 2 dst */
-		asm_sf(i);
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_PREG, bits, 27, 6);
-		operand(i, 3, ASM_OPER_FREG, bits, 13, 7);
-		operand(i, 4, ASM_OPER_FREG, bits, 20, 7);
-		i->i_srcidx++;
-		break;
-	case ASM_FMT_F7: /* 2 dst */
-		asm_sf(i);
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_PREG, bits, 27, 6);
-		operand(i, 3, ASM_OPER_FREG, bits, 20, 7);
-		i->i_srcidx++;
-		break;
-	case ASM_FMT_F8:
-		asm_sf(i);
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_FREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_FREG, bits, 20, 7);
-		break;
-	case ASM_FMT_F9:
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_FREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_FREG, bits, 20, 7);
-		break;
-	case ASM_FMT_F10:
-		asm_sf(i);
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_FREG, bits, 13, 7);
-		break;
-	case ASM_FMT_F11:
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_FREG, bits, 13, 7);
-		break;
-	case ASM_FMT_F12: /* 0 dst */
-		asm_sf(i);
-		u_imm(i, 1, bits, 13, 7);
-		u_imm(i, 2, bits, 20, 7);
-		i->i_srcidx--;
-		break;
-	case ASM_FMT_F13:
-		asm_sf(i);
-		/* no operands */
-		break;
-	case ASM_FMT_F14: /* 0 dst */
-		asm_sf(i);
-		disp(i, 1, bits, FRAG(6,20), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_F15: /* 0 dst */
-		u_imm(i, 1, bits, 6, 20);
-		break;
-	case ASM_FMT_F16: /* 0 dst */
-		u_imm(i, 1, bits, 6, 20);
-		break;
-	case ASM_FMT_I1:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_GREG, bits, 20, 7);
-		switch (FIELD(bits, 30, 2)) {
-		case 0:	op_imm(i, 4, 0LL); break;
-		case 1: op_imm(i, 4, 7LL); break;
-		case 2: op_imm(i, 4, 15LL); break;
-		case 3: op_imm(i, 4, 16LL); break;
-		}
-		break;
-	case ASM_FMT_I2:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_GREG, bits, 20, 7);
-		break;
-	case ASM_FMT_I3:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		u_imm(i, 3, bits, 20, 4);
-		break;
-	case ASM_FMT_I4:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		u_imm(i, 3, bits, 20, 8);
-		break;
-	case ASM_FMT_I5:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 20, 7);
-		operand(i, 3, ASM_OPER_GREG, bits, 13, 7);
-		break;
-	case ASM_FMT_I6:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 20, 7);
-		u_imm(i, 3, bits, 14, 5);
-		break;
-	case ASM_FMT_I7:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_GREG, bits, 20, 7);
-		break;
-	case ASM_FMT_I8:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		op_imm(i, 3, 31LL - FIELD(bits, 20, 5));
-		break;
-	case ASM_FMT_I9:
-		if (FIELD(bits, 13, 7) != 0)
-			return (0);
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 20, 7);
-		break;
-	case ASM_FMT_I10:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_GREG, bits, 20, 7);
-		u_imm(i, 4, bits, 27, 6);
-		break;
-	case ASM_FMT_I11:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 20, 7);
-		u_imm(i, 3, bits, 14, 6);
-		op_imm(i, 4, 1LL + FIELD(bits, 27, 6));
-		break;
-	case ASM_FMT_I12:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		op_imm(i, 3, 63LL - FIELD(bits, 20, 6));
-		op_imm(i, 4, 1LL + FIELD(bits, 27, 6));
-		break;
-	case ASM_FMT_I13:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		s_immf(i, 2, bits, FRAG(13,7), FRAG(36,1), 0);
-		op_imm(i, 3, 63LL - FIELD(bits, 20, 6));
-		op_imm(i, 4, 1LL + FIELD(bits, 27, 6));
-		break;
-	case ASM_FMT_I14:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		s_imm(i, 2, bits, 36, 1);
-		operand(i, 3, ASM_OPER_GREG, bits, 20, 7);
-		op_imm(i, 4, 63LL - FIELD(bits, 14, 6));
-		op_imm(i, 5, 1LL + FIELD(bits, 27, 6));
-		break;
-	case ASM_FMT_I15:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_GREG, bits, 20, 7);
-		op_imm(i, 4, 63LL - FIELD(bits, 31, 6));
-		op_imm(i, 5, 1LL + FIELD(bits, 27, 4));
-		break;
-	case ASM_FMT_I16: /* 2 dst */
-		operand(i, 1, ASM_OPER_PREG, bits, 6, 6);
-		operand(i, 2, ASM_OPER_PREG, bits, 27, 6);
-		operand(i, 3, ASM_OPER_GREG, bits, 20, 7);
-		u_imm(i, 4, bits, 14, 6);
-		i->i_srcidx++;
-		break;
-	case ASM_FMT_I17: /* 2 dst */
-		operand(i, 1, ASM_OPER_PREG, bits, 6, 6);
-		operand(i, 2, ASM_OPER_PREG, bits, 27, 6);
-		operand(i, 3, ASM_OPER_GREG, bits, 20, 7);
-		i->i_srcidx++;
-		break;
-	case ASM_FMT_I18:
-		u_immf(i, 1, bits, FRAG(6,20), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_I19:
-		u_immf(i, 1, bits, FRAG(6,20), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_I20: /* 0 dst */
-		operand(i, 1, ASM_OPER_GREG, bits, 13, 7);
-		disp(i, 2, bits, FRAG(6,7), FRAG(20,13), FRAG(36,1), 0);
-		i->i_srcidx--;
-		break;
-	case ASM_FMT_I21:
-		switch (FIELD(bits, 20, 2)) { /* wh */
-		case 0:	asm_cmpltr_add(i, ASM_CC_MWH, ASM_CT_SPTK); break;
-		case 1:	asm_cmpltr_add(i, ASM_CC_MWH, ASM_CT_NONE); break;
-		case 2:	asm_cmpltr_add(i, ASM_CC_MWH, ASM_CT_DPTK); break;
-		case 3:	return (0);
-		}
-		if (FIELD(bits, 23, 1)) /* ih */
-			asm_cmpltr_add(i, ASM_CC_IH, ASM_CT_IMP);
-		else
-			asm_cmpltr_add(i, ASM_CC_IH, ASM_CT_NONE);
-		operand(i, 1, ASM_OPER_BREG, bits, 6, 3);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		disp(i, 3, bits, FRAG(24,9), 0);
-		break;
-	case ASM_FMT_I22:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_BREG, bits, 13, 3);
-		break;
-	case ASM_FMT_I23:
-		op_type(i, 1, ASM_OPER_PR);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		u_immf(i, 3, bits, FRAG(6,7), FRAG(24,8), FRAG(36,1), 0);
-		i->i_oper[3].o_value <<= 1;
-		break;
-	case ASM_FMT_I24:
-		op_type(i, 1, ASM_OPER_PR_ROT);
-		s_immf(i, 2, bits, FRAG(6,27), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_I25:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		op_type(i, 2, ot);
-		break;
-	case ASM_FMT_I26:
-		operand(i, 1, ASM_OPER_AREG, bits, 20, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		break;
-	case ASM_FMT_I27:
-		operand(i, 1, ASM_OPER_AREG, bits, 20, 7);
-		s_immf(i, 2, bits, FRAG(13,7), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_I28:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_AREG, bits, 20, 7);
-		break;
-	case ASM_FMT_I29:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 20, 7);
-		break;
-	case ASM_FMT_I30: /* 2 dst */
-		operand(i, 1, ASM_OPER_PREG, bits, 6, 6);
-		operand(i, 2, ASM_OPER_PREG, bits, 27, 6);
-		op_imm(i, 3, 32LL + FIELD(bits, 14, 5));
-		i->i_srcidx++;
-		break;
-	case ASM_FMT_M1:
-		asm_hint(i, ASM_CC_LDHINT);
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		if (i->i_op == ASM_OP_LD16) {
-			op_type(i, 2, ASM_OPER_AREG);
-			op_value(i, 2, AR_CSD);
-			i->i_srcidx++;
-		}
-		operand(i, i->i_srcidx, ASM_OPER_MEM, bits, 20, 7);
-		break;
-	case ASM_FMT_M2:
-		asm_hint(i, ASM_CC_LDHINT);
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_MEM, bits, 20, 7);
-		operand(i, 3, ASM_OPER_GREG, bits, 13, 7);
-		break;
-	case ASM_FMT_M3:
-		asm_hint(i, ASM_CC_LDHINT);
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_MEM, bits, 20, 7);
-		s_immf(i, 3, bits, FRAG(13,7), FRAG(27,1), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_M4:
-		asm_hint(i, ASM_CC_STHINT);
-		operand(i, 1, ASM_OPER_MEM, bits, 20, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		if (i->i_op == ASM_OP_ST16) {
-			op_type(i, 3, ASM_OPER_AREG);
-			op_value(i, 3, AR_CSD);
-		}
-		break;
-	case ASM_FMT_M5:
-		asm_hint(i, ASM_CC_STHINT);
-		operand(i, 1, ASM_OPER_MEM, bits, 20, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		s_immf(i, 3, bits, FRAG(6,7), FRAG(27,1), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_M6:
-		asm_hint(i, ASM_CC_LDHINT);
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_MEM, bits, 20, 7);
-		break;
-	case ASM_FMT_M7:
-		asm_hint(i, ASM_CC_LDHINT);
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_MEM, bits, 20, 7);
-		operand(i, 3, ASM_OPER_GREG, bits, 13, 7);
-		break;
-	case ASM_FMT_M8:
-		asm_hint(i, ASM_CC_LDHINT);
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_MEM, bits, 20, 7);
-		s_immf(i, 3, bits, FRAG(13,7), FRAG(27,1), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_M9:
-		asm_hint(i, ASM_CC_STHINT);
-		operand(i, 1, ASM_OPER_MEM, bits, 20, 7);
-		operand(i, 2, ASM_OPER_FREG, bits, 13, 7);
-		break;
-	case ASM_FMT_M10:
-		asm_hint(i, ASM_CC_STHINT);
-		operand(i, 1, ASM_OPER_MEM, bits, 20, 7);
-		operand(i, 2, ASM_OPER_FREG, bits, 13, 7);
-		s_immf(i, 3, bits, FRAG(6,7), FRAG(27,1), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_M11: /* 2 dst */
-		asm_hint(i, ASM_CC_LDHINT);
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_FREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_MEM, bits, 20, 7);
-		i->i_srcidx++;
-		break;
-	case ASM_FMT_M12: /* 2 dst */
-		asm_hint(i, ASM_CC_LDHINT);
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_FREG, bits, 13, 7);
-		operand(i, 3, ASM_OPER_MEM, bits, 20, 7);
-		op_imm(i, 4, 8LL << FIELD(bits, 30, 1));
-		i->i_srcidx++;
-		break;
-	case ASM_FMT_M13:
-		asm_hint(i, ASM_CC_LFHINT);
-		operand(i, 1, ASM_OPER_MEM, bits, 20, 7);
-		break;
-	case ASM_FMT_M14: /* 0 dst */
-		asm_hint(i, ASM_CC_LFHINT);
-		operand(i, 1, ASM_OPER_MEM, bits, 20, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		i->i_srcidx--;
-		break;
-	case ASM_FMT_M15: /* 0 dst */
-		asm_hint(i, ASM_CC_LFHINT);
-		operand(i, 1, ASM_OPER_MEM, bits, 20, 7);
-		s_immf(i, 2, bits, FRAG(13,7), FRAG(27,1), FRAG(36,1), 0);
-		i->i_srcidx--;
-		break;
-	case ASM_FMT_M16:
-		asm_hint(i, ASM_CC_LDHINT);
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_MEM, bits, 20, 7);
-		operand(i, 3, ASM_OPER_GREG, bits, 13, 7);
-		if (i->i_op == ASM_OP_CMP8XCHG16) {
-			op_type(i, 4, ASM_OPER_AREG);
-			op_value(i, 4, AR_CSD);
-			op_type(i, 5, ASM_OPER_AREG);
-			op_value(i, 5, AR_CCV);
-		} else {
-			if (FIELD(bits, 30, 6) < 8) {
-				op_type(i, 4, ASM_OPER_AREG);
-				op_value(i, 4, AR_CCV);
-			}
-		}
-		break;
-	case ASM_FMT_M17:
-		asm_hint(i, ASM_CC_LDHINT);
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_MEM, bits, 20, 7);
-		switch (FIELD(bits, 13, 2)) {
-		case 0: op_imm(i, 3, 1LL << 4); break;
-		case 1: op_imm(i, 3, 1LL << 3); break;
-		case 2:	op_imm(i, 3, 1LL << 2); break;
-		case 3: op_imm(i, 3, 1LL); break;
-		}
-		if (FIELD(bits, 15, 1))
-			i->i_oper[3].o_value *= -1LL;
-		break;
-	case ASM_FMT_M18:
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		break;
-	case ASM_FMT_M19:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_FREG, bits, 13, 7);
-		break;
-	case ASM_FMT_M20: /* 0 dst */
-		operand(i, 1, ASM_OPER_GREG, bits, 13, 7);
-		disp(i, 2, bits, FRAG(6,7), FRAG(20,13), FRAG(36,1), 0);
-		i->i_srcidx--;
-		break;
-	case ASM_FMT_M21: /* 0 dst */
-		operand(i, 1, ASM_OPER_FREG, bits, 13, 7);
-		disp(i, 2, bits, FRAG(6,7), FRAG(20,13), FRAG(36,1), 0);
-		i->i_srcidx--;
-		break;
-	case ASM_FMT_M22: /* 0 dst */
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		disp(i, 2, bits, FRAG(13,20), FRAG(36,1), 0);
-		i->i_srcidx--;
-		break;
-	case ASM_FMT_M23: /* 0 dst */
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		disp(i, 2, bits, FRAG(13,20), FRAG(36,1), 0);
-		i->i_srcidx--;
-		break;
-	case ASM_FMT_M24:
-		/* no operands */
-		break;
-	case ASM_FMT_M25:
-		if (FIELD(bits, 0, 6) != 0)
-			return (0);
-		/* no operands */
-		break;
-	case ASM_FMT_M26:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		break;
-	case ASM_FMT_M27:
-		operand(i, 1, ASM_OPER_FREG, bits, 6, 7);
-		break;
-	case ASM_FMT_M28:
-		operand(i, 1, ASM_OPER_GREG, bits, 20, 7);
-		break;
-	case ASM_FMT_M29:
-		operand(i, 1, ASM_OPER_AREG, bits, 20, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		break;
-	case ASM_FMT_M30:
-		operand(i, 1, ASM_OPER_AREG, bits, 20, 7);
-		s_immf(i, 2, bits, FRAG(13,7), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_M31:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_AREG, bits, 20, 7);
-		break;
-	case ASM_FMT_M32:
-		operand(i, 1, ASM_OPER_CREG, bits, 20, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		break;
-	case ASM_FMT_M33:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_CREG, bits, 20, 7);
-		break;
-	case ASM_FMT_M34: {
-		uint64_t loc, out;
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		op_type(i, 2, ASM_OPER_AREG);
-		op_value(i, 2, AR_PFS);
-		loc = FIELD(bits, 20, 7);
-		out = FIELD(bits, 13, 7) - loc;
-		op_imm(i, 3, 0);
-		op_imm(i, 4, loc);
-		op_imm(i, 5, out);
-		op_imm(i, 6, (uint64_t)FIELD(bits, 27, 4) << 3);
-		break;
-	}
-	case ASM_FMT_M35:
-		if (FIELD(bits, 27, 6) == 0x2D)
-			op_type(i, 1, ASM_OPER_PSR_L);
-		else
-			op_type(i, 1, ASM_OPER_PSR_UM);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		break;
-	case ASM_FMT_M36:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		if (FIELD(bits, 27, 6) == 0x25)
-			op_type(i, 2, ASM_OPER_PSR);
-		else
-			op_type(i, 2, ASM_OPER_PSR_UM);
-		break;
-	case ASM_FMT_M37:
-		u_immf(i, 1, bits, FRAG(6,20), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_M38:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 20, 7);
-		operand(i, 3, ASM_OPER_GREG, bits, 13, 7);
-		break;
-	case ASM_FMT_M39:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 20, 7);
-		u_imm(i, 3, bits, 13, 2);
-		break;
-	case ASM_FMT_M40: /* 0 dst */
-		operand(i, 1, ASM_OPER_GREG, bits, 20, 7);
-		u_imm(i, 2, bits, 13, 2);
-		i->i_srcidx--;
-		break;
-	case ASM_FMT_M41:
-		operand(i, 1, ASM_OPER_GREG, bits, 13, 7);
-		break;
-	case ASM_FMT_M42:
-		operand(i, 1, ot, bits, 20, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		break;
-	case ASM_FMT_M43:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ot, bits, 20, 7);
-		break;
-	case ASM_FMT_M44:
-		u_immf(i, 1, bits, FRAG(6,21), FRAG(31,2), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_M45: /* 0 dst */
-		operand(i, 1, ASM_OPER_GREG, bits, 20, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 13, 7);
-		i->i_srcidx--;
-		break;
-	case ASM_FMT_M46:
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		operand(i, 2, ASM_OPER_GREG, bits, 20, 7);
-		break;
-	case ASM_FMT_M47:
-		operand(i, 1, ASM_OPER_GREG, bits, 20, 7);
-		break;
-	case ASM_FMT_M48:
-		u_immf(i, 1, bits, FRAG(6,20), FRAG(36,1), 0);
-		break;
-	case ASM_FMT_X1:
-		KASSERT(slot == 2, ("foo"));
-		u_immf(i, 1, bits, FRAG(6,20), FRAG(36,1), 0);
-		combine(&i->i_oper[1].o_value, 21, b->b_inst[1].i_bits, 41, 0);
-		break;
-	case ASM_FMT_X2:
-		KASSERT(slot == 2, ("foo"));
-		operand(i, 1, ASM_OPER_GREG, bits, 6, 7);
-		u_immf(i, 2, bits, FRAG(13,7), FRAG(27,9), FRAG(22,5),
-		    FRAG(21,1), 0);
-		combine(&i->i_oper[2].o_value, 22, b->b_inst[1].i_bits, 41, 0);
-		combine(&i->i_oper[2].o_value, 63, bits, 1, 36);
-		break;
-	case ASM_FMT_X3:
-		KASSERT(slot == 2, ("foo"));
-		asm_brhint(i);
-		u_imm(i, 1, bits, 13, 20);
-		combine(&i->i_oper[1].o_value, 20, b->b_inst[1].i_bits, 39, 2);
-		combine(&i->i_oper[1].o_value, 59, bits, 1, 36);
-		i->i_oper[1].o_value <<= 4;
-		i->i_oper[1].o_type = ASM_OPER_DISP;
-		break;
-	case ASM_FMT_X4:
-		KASSERT(slot == 2, ("foo"));
-		asm_brhint(i);
-		operand(i, 1, ASM_OPER_BREG, bits, 6, 3);
-		u_imm(i, 2, bits, 13, 20);
-		combine(&i->i_oper[2].o_value, 20, b->b_inst[1].i_bits, 39, 2);
-		combine(&i->i_oper[2].o_value, 59, bits, 1, 36);
-		i->i_oper[2].o_value <<= 4;
-		i->i_oper[2].o_type = ASM_OPER_DISP;
-		break;
-	case ASM_FMT_X5:
-		KASSERT(slot == 2, ("foo"));
-		u_immf(i, 1, bits, FRAG(6,20), FRAG(36,1), 0);
-		combine(&i->i_oper[1].o_value, 21, b->b_inst[1].i_bits, 41, 0);
-		break;
-	default:
-		KASSERT(fmt == ASM_FMT_NONE, ("foo"));
-		return (0);
-	}
-
-	return (1);
-}
diff --git a/sys/ia64/disasm/disasm_format.c b/sys/ia64/disasm/disasm_format.c
deleted file mode 100644
index 37a365091570..000000000000
--- a/sys/ia64/disasm/disasm_format.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/*-
- * Copyright (c) 2000-2006 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-
-#include <ia64/disasm/disasm_int.h>
-#include <ia64/disasm/disasm.h>
-
-/*
- * Mnemonics (keep in sync with enum asm_op).
- */
-static const char *asm_mnemonics[] = {
-	NULL,
-	"add", "addl", "addp4", "adds", "alloc", "and", "andcm",
-	"br", "break", "brl", "brp", "bsw",
-	"chk", "clrrrb", "cmp", "cmp4", "cmp8xchg16", "cmpxchg1", "cmpxchg2",
-	"cmpxchg4", "cmpxchg8", "cover", "czx1", "czx2",
-	"dep",
-	"epc", "extr",
-	"famax", "famin", "fand", "fandcm", "fc", "fchkf", "fclass", "fclrf",
-	"fcmp", "fcvt", "fetchadd4", "fetchadd8", "flushrs", "fma", "fmax",
-	"fmerge", "fmin", "fmix", "fms", "fnma", "for", "fpack", "fpamax",
-	"fpamin", "fpcmp", "fpcvt", "fpma", "fpmax", "fpmerge", "fpmin",
-	"fpms", "fpnma", "fprcpa", "fprsqrta", "frcpa", "frsqrta", "fselect",
-	"fsetc", "fswap", "fsxt", "fwb", "fxor",
-	"getf",
-	"hint",
-	"invala", "itc", "itr",
-	"ld1", "ld16", "ld2", "ld4", "ld8", "ldf", "ldf8", "ldfd", "ldfe",
-	"ldfp8", "ldfpd", "ldfps", "ldfs", "lfetch", "loadrs",
-	"mf", "mix1", "mix2", "mix4", "mov", "movl", "mux1", "mux2",
-	"nop",
-	"or",
-	"pack2", "pack4", "padd1", "padd2", "padd4", "pavg1", "pavg2",
-	"pavgsub1", "pavgsub2", "pcmp1", "pcmp2", "pcmp4", "pmax1", "pmax2",
-	"pmin1", "pmin2", "pmpy2", "pmpyshr2", "popcnt", "probe", "psad1",
-	"pshl2", "pshl4", "pshladd2", "pshr2", "pshr4", "pshradd2", "psub1",
-	"psub2", "psub4", "ptc", "ptr",
-	"rfi", "rsm", "rum",
-	"setf", "shl", "shladd", "shladdp4", "shr", "shrp", "srlz", "ssm",
-	"st1", "st16", "st2", "st4", "st8", "stf", "stf8", "stfd", "stfe",
-	"stfs", "sub", "sum", "sxt1", "sxt2", "sxt4", "sync",
-	"tak", "tbit", "tf", "thash", "tnat", "tpa", "ttag",
-	"unpack1", "unpack2", "unpack4",
-	"vmsw",
-	"xchg1", "xchg2", "xchg4", "xchg8", "xma", "xor",
-	"zxt1", "zxt2", "zxt4"
-};
-
-/*
- * Completers (keep in sync with enum asm_cmpltr_type).
- */
-static const char *asm_completers[] = {
-	"",
-	".0", ".1",
-	".a", ".acq", ".and",
-	".b", ".bias",
-	".c.clr", ".c.clr.acq", ".c.nc", ".call", ".cexit", ".cloop", ".clr",
-	".ctop",
-	".d", ".dc.dc", ".dc.nt", ".dpnt", ".dptk",
-	".e", ".eq", ".excl", ".exit", ".exp",
-	".f", ".fault", ".few", ".fill", ".fx", ".fxu",
-	".g", ".ga", ".ge", ".gt",
-	".h", ".hu",
-	".i", ".ia", ".imp",
-	".l", ".le", ".loop", ".lr", ".lt", ".ltu",
-	".m", ".many",
-	".nc", ".ne", ".neq", ".nl", ".nle", ".nlt", ".nm", ".nr", ".ns",
-	".nt.dc", ".nt.nt", ".nt.tk", ".nt1", ".nt2", ".nta", ".nz",
-	".or", ".or.andcm", ".ord",
-	".pr",
-	".r", ".raz", ".rel", ".ret", ".rw",
-	".s", ".s0", ".s1", ".s2", ".s3", ".sa", ".se", ".sig", ".spill",
-	".spnt", ".sptk", ".sss",
-	".tk.dc", ".tk.nt", ".tk.tk", ".trunc",
-	".u", ".unc", ".unord", ".uss", ".uus", ".uuu",
-	".w", ".wexit", ".wtop",
-	".x", ".xf",
-	".z"
-};
-
-void
-asm_completer(const struct asm_cmpltr *c, char *buf)
-{
-	strcpy(buf, asm_completers[c->c_type]);
-}
-
-void
-asm_mnemonic(enum asm_op op, char *buf)
-{
-	strcpy(buf, asm_mnemonics[(op < ASM_OP_INTERNAL_OPCODES) ? op : 0]);
-}
-
-void
-asm_operand(const struct asm_oper *o, char *buf, uint64_t ip)
-{
-	const char *n;
-
-	n = NULL;
-	switch (o->o_type) {
-	case ASM_OPER_AREG:
-		switch ((int)o->o_value) {
-		case AR_K0: n = "k0"; break;
-		case AR_K1: n = "k1"; break;
-		case AR_K2: n = "k2"; break;
-		case AR_K3: n = "k3"; break;
-		case AR_K4: n = "k4"; break;
-		case AR_K5: n = "k5"; break;
-		case AR_K6: n = "k6"; break;
-		case AR_K7: n = "k7"; break;
-		case AR_RSC: n = "rsc"; break;
-		case AR_BSP: n = "bsp"; break;
-		case AR_BSPSTORE: n = "bspstore"; break;
-		case AR_RNAT: n = "rnat"; break;
-		case AR_FCR: n = "fcr"; break;
-		case AR_EFLAG: n = "eflag"; break;
-		case AR_CSD: n = "csd"; break;
-		case AR_SSD: n = "ssd"; break;
-		case AR_CFLG: n = "cflg"; break;
-		case AR_FSR: n = "fsr"; break;
-		case AR_FIR: n = "fir"; break;
-		case AR_FDR: n = "fdr"; break;
-		case AR_CCV: n = "ccv"; break;
-		case AR_UNAT: n = "unat"; break;
-		case AR_FPSR: n = "fpsr"; break;
-		case AR_ITC: n = "itc"; break;
-		case AR_PFS: n = "pfs"; break;
-		case AR_LC: n = "lc"; break;
-		case AR_EC: n = "ec"; break;
-		default:
-			sprintf(buf, "ar%d", (int)o->o_value);
-			return;
-		}
-		sprintf(buf, "ar.%s", n);
-		return;
-	case ASM_OPER_BREG:
-		if (o->o_value != 0)
-			sprintf(buf, "b%d", (int)o->o_value);
-		else
-			strcpy(buf, "rp");
-		return;
-	case ASM_OPER_CPUID:
-		n = "cpuid";
-		break;
-	case ASM_OPER_CREG:
-		switch ((int)o->o_value) {
-		case CR_DCR: n = "dcr"; break;
-		case CR_ITM: n = "itm"; break;
-		case CR_IVA: n = "iva"; break;
-		case CR_PTA: n = "pta"; break;
-		case CR_IPSR: n = "ipsr"; break;
-		case CR_ISR: n = "isr"; break;
-		case CR_IIP: n = "iip"; break;
-		case CR_IFA: n = "ifa"; break;
-		case CR_ITIR: n = "itir"; break;
-		case CR_IIPA: n = "iipa"; break;
-		case CR_IFS: n = "ifs"; break;
-		case CR_IIM: n = "iim"; break;
-		case CR_IHA: n = "iha"; break;
-		case CR_LID: n = "lid"; break;
-		case CR_IVR: n = "ivr"; break;
-		case CR_TPR: n = "tpr"; break;
-		case CR_EOI: n = "eoi"; break;
-		case CR_IRR0: n = "irr0"; break;
-		case CR_IRR1: n = "irr1"; break;
-		case CR_IRR2: n = "irr2"; break;
-		case CR_IRR3: n = "irr3"; break;
-		case CR_ITV: n = "itv"; break;
-		case CR_PMV: n = "pmv"; break;
-		case CR_CMCV: n = "cmcv"; break;
-		case CR_LRR0: n = "lrr0"; break;
-		case CR_LRR1: n = "lrr1"; break;
-		default:
-			sprintf(buf, "cr%d", (int)o->o_value);
-			return;
-		}
-		sprintf(buf, "cr.%s", n);
-		return;
-	case ASM_OPER_DBR:
-		n = "dbr";
-		break;
-	case ASM_OPER_DISP:
-		sprintf(buf, "%lx", ip + o->o_value);
-		return;
-	case ASM_OPER_DTR:
-		n = "dtr";
-		break;
-	case ASM_OPER_FREG:
-		sprintf(buf, "f%d", (int)o->o_value);
-		return;
-	case ASM_OPER_GREG:
-		break;
-	case ASM_OPER_IBR:
-		n = "ibr";
-		break;
-	case ASM_OPER_IMM:
-		sprintf(buf, "0x%lx", o->o_value);
-		return;
-	case ASM_OPER_IP:
-		strcpy(buf, "ip");
-		return;
-	case ASM_OPER_ITR:
-		n = "itr";
-		break;
-	case ASM_OPER_MEM:
-		n = "";
-		break;
-	case ASM_OPER_MSR:
-		n = "msr";
-		break;
-	case ASM_OPER_PKR:
-		n = "pkr";
-		break;
-	case ASM_OPER_PMC:
-		n = "pmc";
-		break;
-	case ASM_OPER_PMD:
-		n = "pmd";
-		break;
-	case ASM_OPER_PR:
-		strcpy(buf, "pr");
-                return;
-	case ASM_OPER_PR_ROT:
-		strcpy(buf, "pr.rot");
-		return;
-	case ASM_OPER_PREG:
-		sprintf(buf, "p%d", (int)o->o_value);
-		return;
-	case ASM_OPER_PSR:
-		strcpy(buf, "psr");
-		return;
-	case ASM_OPER_PSR_L:
-		strcpy(buf, "psr.l");
-		return;
-	case ASM_OPER_PSR_UM:
-		strcpy(buf, "psr.um");
-		return;
-	case ASM_OPER_RR:
-		n = "rr";
-		break;
-	case ASM_OPER_NONE:
-		KASSERT(0, ("foo"));
-		break;
-	}
-	if (n != NULL)
-		buf += sprintf(buf, "%s[", n);
-	switch ((int)o->o_value) {
-	case 1:	strcpy(buf, "gp"); buf += 2; break;
-	case 12: strcpy(buf, "sp"); buf += 2; break;
-	case 13: strcpy(buf, "tp"); buf += 2; break;
-	default: buf += sprintf(buf, "r%d", (int)o->o_value); break;
-	}
-	if (n != NULL)
-		strcpy(buf, "]");
-}
-
-void
-asm_print_bundle(const struct asm_bundle *b, uint64_t ip)
-{
-	asm_print_inst(b, 0, ip);
-	asm_print_inst(b, 1, ip);
-	asm_print_inst(b, 2, ip);
-}
-
-void
-asm_print_inst(const struct asm_bundle *b, int slot, uint64_t ip)
-{
-	char buf[32];
-	const struct asm_inst *i;
-	const char *tmpl;
-	int n, w;
-
-	tmpl = b->b_templ + slot;
-	if (*tmpl == ';' || (slot == 2 && b->b_templ[1] == ';'))
-		tmpl++;
-	i = b->b_inst + slot;
-	if (*tmpl == 'L' || i->i_op == ASM_OP_NONE)
-		return;
-
-	/* Address + slot. */
-	printf("%lx[%c] ", ip + slot, *tmpl);
-
-	/* Predicate. */
-	if (i->i_oper[0].o_value != 0) {
-		asm_operand(i->i_oper+0, buf, ip);
-		w = printf("(%s)", buf);
-	} else
-		w = 0;
-	while (w++ < 8)
-		printf(" ");
-
-	/* Mnemonic & completers. */
-	asm_mnemonic(i->i_op, buf);
-	w = printf(buf);
-	n = 0;
-	while (n < i->i_ncmpltrs) {
-		asm_completer(i->i_cmpltr + n, buf);
-		w += printf(buf);
-		n++;
-	}
-	while (w++ < 15)
-		printf(" ");
-	printf(" ");
-
-	/* Operands. */
-	n = 1;
-	while (n < 7 && i->i_oper[n].o_type != ASM_OPER_NONE) {
-		if (n > 1) {
-			if (n == i->i_srcidx)
-				printf(" = ");
-			else
-				printf(", ");
-		}
-		asm_operand(i->i_oper + n, buf, ip);
-		printf(buf);
-		n++;
-	}
-	printf("\n");
-}
diff --git a/sys/ia64/disasm/disasm_int.h b/sys/ia64/disasm/disasm_int.h
deleted file mode 100644
index e1410c135c16..000000000000
--- a/sys/ia64/disasm/disasm_int.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*-
- * Copyright (c) 2000-2006 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 _DISASM_INT_H_
-#define	_DISASM_INT_H_
-
-#ifdef _DISASM_H_
-#error	Include disasm_int.h before disasm.h
-#endif
-
-/*
- * Instruction bundle specifics.
- */
-#define	TMPL_BITS	5
-#define	SLOT_BITS	41
-#define	SLOT_COUNT	3
-
-#define	BUNDLE_SIZE	(SLOT_COUNT * SLOT_BITS + TMPL_BITS)
-#define	BUNDLE_BYTES	((BUNDLE_SIZE+7) >> 3)
-#define	TMPL_MASK	((1 << TMPL_BITS) - 1)
-#define	SLOT_MASK	((1ULL << SLOT_BITS) - 1ULL)
-#define	TMPL(p)		(*(const uint8_t*)(p) & TMPL_MASK)
-#define	_U32(p,i)	((uint64_t)(((const uint32_t*)(p))[i]))
-#define	_SLOT(p,i)	(_U32(p,i) | (_U32(p,(i)+1)<<32))
-#define	SLOT(p,i)	((_SLOT(p,i) >> (TMPL_BITS+((i)<<3)+(i))) & SLOT_MASK)
-
-/*
- * Instruction specifics
- */
-#define	_FLD64(i,o,l)	((i >> o) & ((1LL << l) - 1LL))
-#define	FIELD(i,o,l)	((uint32_t)_FLD64(i,o,l))
-#define	OPCODE(i)	FIELD(i, 37, 4)
-#define	QP_BITS		6
-#define	QP(i)		FIELD(i, 0, QP_BITS)
-#define	REG_BITS	7
-#define	REG(i,r)	FIELD(i, ((r) - 1) * REG_BITS + QP_BITS, REG_BITS)
-
-/*
- * Opcodes used internally as sentinels to denote either a lack of more
- * specific information or to preserve the additional state/information
- * we already have and need to pass around for later use.
- */
-#define	ASM_ADDITIONAL_OPCODES						\
-	ASM_OP_INTERNAL_OPCODES,					\
-	ASM_OP_BR_CALL, ASM_OP_BR_CEXIT, ASM_OP_BR_CLOOP,		\
-	ASM_OP_BR_COND, ASM_OP_BR_CTOP, ASM_OP_BR_IA, ASM_OP_BR_RET,	\
-	ASM_OP_BR_WEXIT, ASM_OP_BR_WTOP,				\
-	ASM_OP_BREAK_B, ASM_OP_BREAK_F, ASM_OP_BREAK_I, ASM_OP_BREAK_M,	\
-	ASM_OP_BREAK_X,							\
-	ASM_OP_BRL_COND, ASM_OP_BRL_CALL,				\
-	ASM_OP_BRP_, ASM_OP_BRP_RET,					\
-	ASM_OP_BSW_0, ASM_OP_BSW_1,					\
-	ASM_OP_CHK_A_CLR, ASM_OP_CHK_A_NC, ASM_OP_CHK_S,		\
-	ASM_OP_CHK_S_I, ASM_OP_CHK_S_M,					\
-	ASM_OP_CLRRRB_, ASM_OP_CLRRRB_PR,				\
-	ASM_OP_CMP_EQ, ASM_OP_CMP_EQ_AND, ASM_OP_CMP_EQ_OR,		\
-	ASM_OP_CMP_EQ_OR_ANDCM, ASM_OP_CMP_EQ_UNC, ASM_OP_CMP_GE_AND,	\
-	ASM_OP_CMP_GE_OR, ASM_OP_CMP_GE_OR_ANDCM, ASM_OP_CMP_GT_AND,	\
-	ASM_OP_CMP_GT_OR, ASM_OP_CMP_GT_OR_ANDCM, ASM_OP_CMP_LE_AND,	\
-	ASM_OP_CMP_LE_OR, ASM_OP_CMP_LE_OR_ANDCM, ASM_OP_CMP_LT,	\
-	ASM_OP_CMP_LT_AND, ASM_OP_CMP_LT_OR, ASM_OP_CMP_LT_OR_ANDCM,	\
-	ASM_OP_CMP_LT_UNC, ASM_OP_CMP_LTU, ASM_OP_CMP_LTU_UNC,		\
-	ASM_OP_CMP_NE_AND, ASM_OP_CMP_NE_OR, ASM_OP_CMP_NE_OR_ANDCM,	\
-	ASM_OP_CMP4_EQ, ASM_OP_CMP4_EQ_AND, ASM_OP_CMP4_EQ_OR,		\
-	ASM_OP_CMP4_EQ_OR_ANDCM, ASM_OP_CMP4_EQ_UNC, ASM_OP_CMP4_GE_AND,\
-	ASM_OP_CMP4_GE_OR, ASM_OP_CMP4_GE_OR_ANDCM, ASM_OP_CMP4_GT_AND,	\
-	ASM_OP_CMP4_GT_OR, ASM_OP_CMP4_GT_OR_ANDCM, ASM_OP_CMP4_LE_AND,	\
-	ASM_OP_CMP4_LE_OR, ASM_OP_CMP4_LE_OR_ANDCM, ASM_OP_CMP4_LT,	\
-	ASM_OP_CMP4_LT_AND, ASM_OP_CMP4_LT_OR, ASM_OP_CMP4_LT_OR_ANDCM,	\
-	ASM_OP_CMP4_LT_UNC, ASM_OP_CMP4_LTU, ASM_OP_CMP4_LTU_UNC,	\
-	ASM_OP_CMP4_NE_AND, ASM_OP_CMP4_NE_OR, ASM_OP_CMP4_NE_OR_ANDCM,	\
-	ASM_OP_CMP8XCHG16_ACQ, ASM_OP_CMP8XCHG16_REL,			\
-	ASM_OP_CMPXCHG1_ACQ, ASM_OP_CMPXCHG1_REL,			\
-	ASM_OP_CMPXCHG2_ACQ, ASM_OP_CMPXCHG2_REL,			\
-	ASM_OP_CMPXCHG4_ACQ, ASM_OP_CMPXCHG4_REL,			\
-	ASM_OP_CMPXCHG8_ACQ, ASM_OP_CMPXCHG8_REL,			\
-	ASM_OP_CZX1_L, ASM_OP_CZX1_R,					\
-	ASM_OP_CZX2_L, ASM_OP_CZX2_R,					\
-	ASM_OP_DEP_, ASM_OP_DEP_Z,					\
-	ASM_OP_FC_, ASM_OP_FC_I,					\
-	ASM_OP_FCLASS_M,						\
-	ASM_OP_FCVT_FX, ASM_OP_FCVT_FX_TRUNC, ASM_OP_FCVT_FXU,		\
-	ASM_OP_FCVT_FXU_TRUNC, ASM_OP_FCVT_XF,				\
-	ASM_OP_FETCHADD4_ACQ, ASM_OP_FETCHADD4_REL,			\
-	ASM_OP_FETCHADD8_ACQ, ASM_OP_FETCHADD8_REL,			\
-	ASM_OP_FMA_, ASM_OP_FMA_D, ASM_OP_FMA_S,			\
-	ASM_OP_FMERGE_NS, ASM_OP_FMERGE_S, ASM_OP_FMERGE_SE,		\
-	ASM_OP_FMIX_L, ASM_OP_FMIX_LR, ASM_OP_FMIX_R,			\
-	ASM_OP_FMS_, ASM_OP_FMS_D, ASM_OP_FMS_S,			\
-	ASM_OP_FNMA_, ASM_OP_FNMA_D, ASM_OP_FNMA_S,			\
-	ASM_OP_FPCMP_EQ, ASM_OP_FPCMP_LE, ASM_OP_FPCMP_LT,		\
-	ASM_OP_FPCMP_NEQ, ASM_OP_FPCMP_NLE, ASM_OP_FPCMP_NLT,		\
-	ASM_OP_FPCMP_ORD, ASM_OP_FPCMP_UNORD,				\
-	ASM_OP_FPCVT_FX, ASM_OP_FPCVT_FX_TRUNC, ASM_OP_FPCVT_FXU,	\
-	ASM_OP_FPCVT_FXU_TRUNC,						\
-	ASM_OP_FPMERGE_NS, ASM_OP_FPMERGE_S, ASM_OP_FPMERGE_SE,		\
-	ASM_OP_FSWAP_, ASM_OP_FSWAP_NL, ASM_OP_FSWAP_NR,		\
-	ASM_OP_FSXT_L, ASM_OP_FSXT_R,					\
-	ASM_OP_GETF_D, ASM_OP_GETF_EXP, ASM_OP_GETF_S, ASM_OP_GETF_SIG,	\
-	ASM_OP_HINT_B, ASM_OP_HINT_F, ASM_OP_HINT_I, ASM_OP_HINT_M,	\
-	ASM_OP_HINT_X,							\
-	ASM_OP_INVALA_, ASM_OP_INVALA_E,				\
-	ASM_OP_ITC_D, ASM_OP_ITC_I,					\
-	ASM_OP_ITR_D, ASM_OP_ITR_I,					\
-	ASM_OP_LD1_, ASM_OP_LD1_A, ASM_OP_LD1_ACQ, ASM_OP_LD1_BIAS,	\
-	ASM_OP_LD1_C_CLR, ASM_OP_LD1_C_CLR_ACQ, ASM_OP_LD1_C_NC,	\
-	ASM_OP_LD1_S, ASM_OP_LD1_SA,					\
-	ASM_OP_LD16_, ASM_OP_LD16_ACQ,					\
-	ASM_OP_LD2_, ASM_OP_LD2_A, ASM_OP_LD2_ACQ, ASM_OP_LD2_BIAS,	\
-	ASM_OP_LD2_C_CLR, ASM_OP_LD2_C_CLR_ACQ, ASM_OP_LD2_C_NC,	\
-	ASM_OP_LD2_S, ASM_OP_LD2_SA,					\
-	ASM_OP_LD4_, ASM_OP_LD4_A, ASM_OP_LD4_ACQ, ASM_OP_LD4_BIAS,	\
-	ASM_OP_LD4_C_CLR, ASM_OP_LD4_C_CLR_ACQ, ASM_OP_LD4_C_NC,	\
-	ASM_OP_LD4_S, ASM_OP_LD4_SA,					\
-	ASM_OP_LD8_, ASM_OP_LD8_A, ASM_OP_LD8_ACQ, ASM_OP_LD8_BIAS,	\
-	ASM_OP_LD8_C_CLR, ASM_OP_LD8_C_CLR_ACQ, ASM_OP_LD8_C_NC,	\
-	ASM_OP_LD8_FILL, ASM_OP_LD8_S, ASM_OP_LD8_SA,			\
-	ASM_OP_LDF_FILL,						\
-	ASM_OP_LDF8_, ASM_OP_LDF8_A, ASM_OP_LDF8_C_CLR,			\
-	ASM_OP_LDF8_C_NC, ASM_OP_LDF8_S, ASM_OP_LDF8_SA,		\
-	ASM_OP_LDFD_, ASM_OP_LDFD_A, ASM_OP_LDFD_C_CLR,			\
-	ASM_OP_LDFD_C_NC, ASM_OP_LDFD_S, ASM_OP_LDFD_SA,		\
-	ASM_OP_LDFE_, ASM_OP_LDFE_A, ASM_OP_LDFE_C_CLR,			\
-	ASM_OP_LDFE_C_NC, ASM_OP_LDFE_S, ASM_OP_LDFE_SA,		\
-	ASM_OP_LDFP8_, ASM_OP_LDFP8_A, ASM_OP_LDFP8_C_CLR,		\
-	ASM_OP_LDFP8_C_NC, ASM_OP_LDFP8_S, ASM_OP_LDFP8_SA,		\
-	ASM_OP_LDFPD_, ASM_OP_LDFPD_A, ASM_OP_LDFPD_C_CLR,		\
-	ASM_OP_LDFPD_C_NC, ASM_OP_LDFPD_S, ASM_OP_LDFPD_SA,		\
-	ASM_OP_LDFPS_, ASM_OP_LDFPS_A, ASM_OP_LDFPS_C_CLR,		\
-	ASM_OP_LDFPS_C_NC, ASM_OP_LDFPS_S, ASM_OP_LDFPS_SA,		\
-	ASM_OP_LDFS_, ASM_OP_LDFS_A, ASM_OP_LDFS_C_CLR,			\
-	ASM_OP_LDFS_C_NC, ASM_OP_LDFS_S, ASM_OP_LDFS_SA,		\
-	ASM_OP_LFETCH_, ASM_OP_LFETCH_EXCL, ASM_OP_LFETCH_FAULT,	\
-	ASM_OP_LFETCH_FAULT_EXCL,					\
-	ASM_OP_MF_, ASM_OP_MF_A,					\
-	ASM_OP_MIX1_L, ASM_OP_MIX1_R,					\
-	ASM_OP_MIX2_L, ASM_OP_MIX2_R,					\
-	ASM_OP_MIX4_L, ASM_OP_MIX4_R,					\
-	ASM_OP_MOV_, ASM_OP_MOV_CPUID, ASM_OP_MOV_DBR, ASM_OP_MOV_I,	\
-	ASM_OP_MOV_IBR, ASM_OP_MOV_IP, ASM_OP_MOV_M, ASM_OP_MOV_MSR,	\
-	ASM_OP_MOV_PKR, ASM_OP_MOV_PMC, ASM_OP_MOV_PMD, ASM_OP_MOV_PR,	\
-	ASM_OP_MOV_PSR, ASM_OP_MOV_PSR_L, ASM_OP_MOV_PSR_UM,		\
-	ASM_OP_MOV_RET, ASM_OP_MOV_RR,					\
-	ASM_OP_NOP_B, ASM_OP_NOP_F, ASM_OP_NOP_I, ASM_OP_NOP_M,		\
-	ASM_OP_NOP_X,							\
-	ASM_OP_PACK2_SSS, ASM_OP_PACK2_USS,				\
-	ASM_OP_PACK4_SSS,						\
-	ASM_OP_PADD1_, ASM_OP_PADD1_SSS, ASM_OP_PADD1_UUS,		\
-	ASM_OP_PADD1_UUU,						\
-	ASM_OP_PADD2_, ASM_OP_PADD2_SSS, ASM_OP_PADD2_UUS,		\
-	ASM_OP_PADD2_UUU,						\
-	ASM_OP_PAVG1_, ASM_OP_PAVG1_RAZ,				\
-	ASM_OP_PAVG2_, ASM_OP_PAVG2_RAZ,				\
-	ASM_OP_PCMP1_EQ, ASM_OP_PCMP1_GT,				\
-	ASM_OP_PCMP2_EQ, ASM_OP_PCMP2_GT,				\
-	ASM_OP_PCMP4_EQ, ASM_OP_PCMP4_GT,				\
-	ASM_OP_PMAX1_U,							\
-	ASM_OP_PMIN1_U,							\
-	ASM_OP_PMPY2_L, ASM_OP_PMPY2_R,					\
-	ASM_OP_PMPYSHR2_, ASM_OP_PMPYSHR2_U,				\
-	ASM_OP_PROBE_R, ASM_OP_PROBE_R_FAULT, ASM_OP_PROBE_RW_FAULT,	\
-	ASM_OP_PROBE_W, ASM_OP_PROBE_W_FAULT,				\
-	ASM_OP_PSHR2_, ASM_OP_PSHR2_U,					\
-	ASM_OP_PSHR4_, ASM_OP_PSHR4_U,					\
-	ASM_OP_PSUB1_, ASM_OP_PSUB1_SSS, ASM_OP_PSUB1_UUS,		\
-	ASM_OP_PSUB1_UUU,						\
-	ASM_OP_PSUB2_, ASM_OP_PSUB2_SSS, ASM_OP_PSUB2_UUS,		\
-	ASM_OP_PSUB2_UUU,						\
-	ASM_OP_PTC_E, ASM_OP_PTC_G, ASM_OP_PTC_GA, ASM_OP_PTC_L,	\
-	ASM_OP_PTR_D, ASM_OP_PTR_I,					\
-	ASM_OP_SETF_EXP, ASM_OP_SETF_D, ASM_OP_SETF_S, ASM_OP_SETF_SIG,	\
-	ASM_OP_SHR_, ASM_OP_SHR_U,					\
-	ASM_OP_SRLZ_D, ASM_OP_SRLZ_I,					\
-	ASM_OP_ST1_, ASM_OP_ST1_REL,					\
-	ASM_OP_ST16_, ASM_OP_ST16_REL,					\
-	ASM_OP_ST2_, ASM_OP_ST2_REL,					\
-	ASM_OP_ST4_, ASM_OP_ST4_REL,					\
-	ASM_OP_ST8_, ASM_OP_ST8_REL, ASM_OP_ST8_SPILL,			\
-	ASM_OP_STF_SPILL,						\
-	ASM_OP_SYNC_I,							\
-	ASM_OP_TBIT_NZ_AND, ASM_OP_TBIT_NZ_OR, ASM_OP_TBIT_NZ_OR_ANDCM,	\
-	ASM_OP_TBIT_Z, ASM_OP_TBIT_Z_AND, ASM_OP_TBIT_Z_OR,		\
-	ASM_OP_TBIT_Z_OR_ANDCM, ASM_OP_TBIT_Z_UNC,			\
-	ASM_OP_TF_NZ_AND, ASM_OP_TF_NZ_OR, ASM_OP_TF_NZ_OR_ANDCM,	\
-	ASM_OP_TF_Z, ASM_OP_TF_Z_AND, ASM_OP_TF_Z_OR,			\
-	ASM_OP_TF_Z_OR_ANDCM, ASM_OP_TF_Z_UNC,				\
-	ASM_OP_TNAT_NZ_AND, ASM_OP_TNAT_NZ_OR, ASM_OP_TNAT_NZ_OR_ANDCM,	\
-	ASM_OP_TNAT_Z, ASM_OP_TNAT_Z_AND, ASM_OP_TNAT_Z_OR,		\
-	ASM_OP_TNAT_Z_OR_ANDCM, ASM_OP_TNAT_Z_UNC,			\
-	ASM_OP_UNPACK1_H, ASM_OP_UNPACK1_L,				\
-	ASM_OP_UNPACK2_H, ASM_OP_UNPACK2_L,				\
-	ASM_OP_UNPACK4_H, ASM_OP_UNPACK4_L,				\
-	ASM_OP_VMSW_0, ASM_OP_VMSW_1,					\
-	ASM_OP_XMA_H, ASM_OP_XMA_HU, ASM_OP_XMA_L,			\
-	ASM_OP_NUMBER_OF_OPCODES
-
-#endif /* _DISASM_INT_H_ */
diff --git a/sys/ia64/ia32/ia32_misc.c b/sys/ia64/ia32/ia32_misc.c
deleted file mode 100644
index 148e31a6e7cc..000000000000
--- a/sys/ia64/ia32/ia32_misc.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 2009 Konstantin Belousov
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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/mount.h>
-#include <sys/proc.h>
-#include <sys/socket.h>
-#include <sys/sysent.h>
-#include <sys/sysproto.h>
-#include <sys/systm.h>
-#include <sys/uio.h>
-
-#include <compat/freebsd32/freebsd32_util.h>
-#include <compat/freebsd32/freebsd32.h>
-#include <compat/freebsd32/freebsd32_proto.h>
-
-int
-freebsd32_sysarch(struct thread *td, struct freebsd32_sysarch_args *uap)
-{
-
-	return (EOPNOTSUPP);
-}
-
-#ifdef COMPAT_43
-int
-ofreebsd32_getpagesize(struct thread *td,
-    struct ofreebsd32_getpagesize_args *uap)
-{
-
-	td->td_retval[0] = IA32_PAGE_SIZE;
-	return (0);
-}
-#endif
diff --git a/sys/ia64/ia32/ia32_reg.c b/sys/ia64/ia32/ia32_reg.c
deleted file mode 100644
index ae47f726c253..000000000000
--- a/sys/ia64/ia32/ia32_reg.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 2005 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "opt_compat.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/procfs.h>
-
-int
-fill_regs32(struct thread *td, struct reg32 *regs)
-{
-
-	bzero(regs, sizeof(*regs));
-	return (EOPNOTSUPP);
-}
-
-int
-set_regs32(struct thread *td, struct reg32 *regs)
-{
-
-	return (EOPNOTSUPP);
-}
-
-int
-fill_fpregs32(struct thread *td, struct fpreg32 *regs)
-{
-
-	bzero(regs, sizeof(*regs));
-	return (EOPNOTSUPP);
-}
-
-int
-set_fpregs32(struct thread *td, struct fpreg32 *regs)
-{
-
-	return (EOPNOTSUPP);
-}
-
-int
-fill_dbregs32(struct thread *td, struct dbreg32 *regs)
-{
-
-	bzero(regs, sizeof(*regs));
-	return (EOPNOTSUPP);
-}
-
-int
-set_dbregs32(struct thread *td, struct dbreg32 *regs)
-{
-
-	return (EOPNOTSUPP);
-}
diff --git a/sys/ia64/ia32/ia32_signal.c b/sys/ia64/ia32/ia32_signal.c
deleted file mode 100644
index d17f06049280..000000000000
--- a/sys/ia64/ia32/ia32_signal.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/*-
- * Copyright (c) 2002 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "opt_compat.h"
-
-#define __ELF_WORD_SIZE 32
-
-#include <sys/param.h>
-#include <sys/exec.h>
-#include <sys/fcntl.h>
-#include <sys/imgact.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/mman.h>
-#include <sys/namei.h>
-#include <sys/pioctl.h>
-#include <sys/proc.h>
-#include <sys/procfs.h>
-#include <sys/resourcevar.h>
-#include <sys/systm.h>
-#include <sys/signalvar.h>
-#include <sys/stat.h>
-#include <sys/sx.h>
-#include <sys/syscall.h>
-#include <sys/sysctl.h>
-#include <sys/sysent.h>
-#include <sys/vnode.h>
-#include <sys/imgact_elf.h>
-#include <sys/sysproto.h>
-
-#include <machine/frame.h>
-#include <machine/md_var.h>
-#include <machine/pcb.h>
-
-#include <vm/vm.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-#include <vm/vm_map.h>
-#include <vm/vm_object.h>
-#include <vm/vm_extern.h>
-
-#include <compat/freebsd32/freebsd32_signal.h>
-#include <compat/freebsd32/freebsd32_util.h>
-#include <compat/freebsd32/freebsd32_proto.h>
-#include <compat/ia32/ia32_signal.h>
-#include <x86/include/psl.h>
-#include <x86/include/segments.h>
-#include <x86/include/specialreg.h>
-
-char ia32_sigcode[] = {
-	0xff, 0x54, 0x24, 0x10,		/* call *SIGF_HANDLER(%esp) */
-	0x8d, 0x44, 0x24, 0x14,		/* lea SIGF_UC(%esp),%eax */
-	0x50,				/* pushl %eax */
-	0xf7, 0x40, 0x54, 0x00, 0x00, 0x02, 0x02, /* testl $PSL_VM,UC_EFLAGS(%ea
-x) */
-	0x75, 0x03,			/* jne 9f */
-	0x8e, 0x68, 0x14,		/* movl UC_GS(%eax),%gs */
-	0xb8, 0x57, 0x01, 0x00, 0x00,	/* 9: movl $SYS_sigreturn,%eax */
-	0x50,				/* pushl %eax */
-	0xcd, 0x80,			/* int $0x80 */
-	0xeb, 0xfe,			/* 0: jmp 0b */
-	0
-};
-int sz_ia32_sigcode = sizeof(ia32_sigcode);
-
-#ifdef COMPAT_43
-int
-ofreebsd32_sigreturn(struct thread *td, struct ofreebsd32_sigreturn_args *uap)
-{
-
-	return (EOPNOTSUPP);
-}
-#endif
-
-/*
- * Signal sending has not been implemented on ia64.  This causes
- * the sigtramp code to not understand the arguments and the application
- * will generally crash if it tries to handle a signal.  Calling
- * sendsig() means that at least untrapped signals will work.
- */
-void
-ia32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
-{
-	sendsig(catcher, ksi, mask);
-}
-
-#ifdef COMPAT_FREEBSD4
-int
-freebsd4_freebsd32_sigreturn(struct thread *td, struct freebsd4_freebsd32_sigreturn_args *uap)
-{
-	return (sys_sigreturn(td, (struct sigreturn_args *)uap));
-}
-#endif
-
-int
-freebsd32_sigreturn(struct thread *td, struct freebsd32_sigreturn_args *uap)
-{
-	return (sys_sigreturn(td, (struct sigreturn_args *)uap));
-}
-
-
-void
-ia32_setregs(struct thread *td, struct image_params *imgp, u_long stack)
-{
-	struct trapframe *tf = td->td_frame;
-	vm_offset_t gdt, ldt;
-	u_int64_t codesel, datasel, ldtsel;
-	u_int64_t codeseg, dataseg, gdtseg, ldtseg;
-	struct segment_descriptor desc;
-	struct vmspace *vmspace = td->td_proc->p_vmspace;
-	struct sysentvec *sv;
-
-	sv = td->td_proc->p_sysent;
-	exec_setregs(td, imgp, stack);
-
-	/* Non-syscall frames are cleared by exec_setregs() */
-	if (tf->tf_flags & FRAME_SYSCALL) {
-		bzero(&tf->tf_scratch, sizeof(tf->tf_scratch));
-		bzero(&tf->tf_scratch_fp, sizeof(tf->tf_scratch_fp));
-	} else
-		tf->tf_special.ndirty = 0;
-
-	tf->tf_special.psr |= IA64_PSR_IS;
-	tf->tf_special.sp = stack;
-
-	/* Point the RSE backstore to something harmless. */
-	tf->tf_special.bspstore = (sv->sv_psstrings - sz_ia32_sigcode -
-	    SPARE_USRSPACE + 15) & ~15;
-
-	codesel = LSEL(LUCODE_SEL, SEL_UPL);
-	datasel = LSEL(LUDATA_SEL, SEL_UPL);
-	ldtsel = GSEL(GLDT_SEL, SEL_UPL);
-
-	/* Setup ia32 segment registers. */
-	tf->tf_scratch.gr16 = (datasel << 48) | (datasel << 32) |
-	    (datasel << 16) | datasel;
-	tf->tf_scratch.gr17 = (ldtsel << 32) | (datasel << 16) | codesel;
-
-	/*
-	 * Build the GDT and LDT.
-	 */
-	gdt = sv->sv_usrstack;
-	vm_map_find(&vmspace->vm_map, NULL, 0, &gdt, IA32_PAGE_SIZE << 1, 0,
-	    VMFS_NO_SPACE, VM_PROT_ALL, VM_PROT_ALL, 0);
-	ldt = gdt + IA32_PAGE_SIZE;
-
-	desc.sd_lolimit = 8*NLDT-1;
-	desc.sd_lobase = ldt & 0xffffff;
-	desc.sd_type = SDT_SYSLDT;
-	desc.sd_dpl = SEL_UPL;
-	desc.sd_p = 1;
-	desc.sd_hilimit = 0;
-	desc.sd_def32 = 0;
-	desc.sd_gran = 0;
-	desc.sd_hibase = ldt >> 24;
-	copyout(&desc, (caddr_t) gdt + 8*GLDT_SEL, sizeof(desc));
-
-	desc.sd_lolimit = ((sv->sv_usrstack >> 12) - 1) & 0xffff;
-	desc.sd_lobase = 0;
-	desc.sd_type = SDT_MEMERA;
-	desc.sd_dpl = SEL_UPL;
-	desc.sd_p = 1;
-	desc.sd_hilimit = ((sv->sv_usrstack >> 12) - 1) >> 16;
-	desc.sd_def32 = 1;
-	desc.sd_gran = 1;
-	desc.sd_hibase = 0;
-	copyout(&desc, (caddr_t) ldt + 8*LUCODE_SEL, sizeof(desc));
-	desc.sd_type = SDT_MEMRWA;
-	copyout(&desc, (caddr_t) ldt + 8*LUDATA_SEL, sizeof(desc));
-
-	codeseg = 0		/* base */
-		+ (((sv->sv_usrstack >> 12) - 1) << 32) /* limit */
-		+ ((long)SDT_MEMERA << 52)
-		+ ((long)SEL_UPL << 57)
-		+ (1L << 59) /* present */
-		+ (1L << 62) /* 32 bits */
-		+ (1L << 63); /* page granularity */
-	dataseg = 0		/* base */
-		+ (((sv->sv_usrstack >> 12) - 1) << 32) /* limit */
-		+ ((long)SDT_MEMRWA << 52)
-		+ ((long)SEL_UPL << 57)
-		+ (1L << 59) /* present */
-		+ (1L << 62) /* 32 bits */
-		+ (1L << 63); /* page granularity */
-
-	tf->tf_scratch.csd = codeseg;
-	tf->tf_scratch.ssd = dataseg;
-	tf->tf_scratch.gr24 = dataseg; /* ESD */
-	tf->tf_scratch.gr27 = dataseg; /* DSD */
-	tf->tf_scratch.gr28 = dataseg; /* FSD */
-	tf->tf_scratch.gr29 = dataseg; /* GSD */
-
-	gdtseg = gdt		/* base */
-		+ ((8L*NGDT - 1) << 32) /* limit */
-		+ ((long)SDT_SYSNULL << 52)
-		+ ((long)SEL_UPL << 57)
-		+ (1L << 59) /* present */
-		+ (0L << 62) /* 16 bits */
-		+ (0L << 63); /* byte granularity */
-	ldtseg = ldt		/* base */
-		+ ((8L*NLDT - 1) << 32) /* limit */
-		+ ((long)SDT_SYSLDT << 52)
-		+ ((long)SEL_UPL << 57)
-		+ (1L << 59) /* present */
-		+ (0L << 62) /* 16 bits */
-		+ (0L << 63); /* byte granularity */
-
-	tf->tf_scratch.gr30 = ldtseg; /* LDTD */
-	tf->tf_scratch.gr31 = gdtseg; /* GDTD */
-
-	/* Set ia32 control registers on this processor. */
-	ia64_set_cflg(CR0_PE | CR0_PG | ((long)(CR4_XMM | CR4_FXSR) << 32));
-	ia64_set_eflag(PSL_USER);
-
-	/* PS_STRINGS value for BSD/OS binaries.  It is 0 for non-BSD/OS. */
-	tf->tf_scratch.gr11 = td->td_proc->p_sysent->sv_psstrings;
-
-	/*
-	 * XXX - Linux emulator
-	 * Make sure sure edx is 0x0 on entry. Linux binaries depend
-	 * on it.
-	 */
-	td->td_retval[1] = 0;
-}
-
-void
-ia32_restorectx(struct pcb *pcb)
-{
-
-	ia64_set_cflg(pcb->pcb_ia32_cflg);
-	ia64_set_eflag(pcb->pcb_ia32_eflag);
-	ia64_set_fcr(pcb->pcb_ia32_fcr);
-	ia64_set_fdr(pcb->pcb_ia32_fdr);
-	ia64_set_fir(pcb->pcb_ia32_fir);
-	ia64_set_fsr(pcb->pcb_ia32_fsr);
-}
-
-void
-ia32_savectx(struct pcb *pcb)
-{
-
-	pcb->pcb_ia32_cflg = ia64_get_cflg();
-	pcb->pcb_ia32_eflag = ia64_get_eflag();
-	pcb->pcb_ia32_fcr = ia64_get_fcr();
-	pcb->pcb_ia32_fdr = ia64_get_fdr();
-	pcb->pcb_ia32_fir = ia64_get_fir();
-	pcb->pcb_ia32_fsr = ia64_get_fsr();
-}
-
-int
-freebsd32_getcontext(struct thread *td, struct freebsd32_getcontext_args *uap)
-{
-
-	return (nosys(td, NULL));
-}
-
-int
-freebsd32_setcontext(struct thread *td, struct freebsd32_setcontext_args *uap)
-{
-
-	return (nosys(td, NULL));
-}
-
-int
-freebsd32_swapcontext(struct thread *td, struct freebsd32_swapcontext_args *uap)
-{
-
-	return (nosys(td, NULL));
-}
diff --git a/sys/ia64/ia32/ia32_trap.c b/sys/ia64/ia32/ia32_trap.c
deleted file mode 100644
index cea8f9200915..000000000000
--- a/sys/ia64/ia32/ia32_trap.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/*-
- * Copyright (c) 2004 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/ktr.h>
-#include <sys/sysproto.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/pioctl.h>
-#include <sys/proc.h>
-#include <sys/ptrace.h>
-#include <sys/signalvar.h>
-#include <sys/syscall.h>
-#include <sys/sysent.h>
-#include <machine/cpu.h>
-#include <machine/fpu.h>
-#include <machine/frame.h>
-#include <machine/md_var.h>
-#include <x86/include/psl.h>
-
-#include <security/audit/audit.h>
-
-#include <compat/ia32/ia32_util.h>
-
-void
-ia32_set_syscall_retval(struct thread *td, int error)
-{
-	struct proc *p;
-	struct trapframe *tf;
-
-	tf = td->td_frame;
-
-	switch (error) {
-	case 0:
-		tf->tf_scratch.gr8 = td->td_retval[0];	/* eax */
-		tf->tf_scratch.gr10 = td->td_retval[1];	/* edx */
-		ia64_set_eflag(ia64_get_eflag() & ~PSL_C);
-		break;
-
-	case ERESTART:
-		/*
-		 * Reconstruct pc, assuming lcall $X,y is 7 bytes,
-		 * int 0x80 is 2 bytes. XXX Assume int 0x80.
-		 */
-		tf->tf_special.iip -= 2;
-		break;
-
-	case EJUSTRETURN:
-		break;
-
-	default:
-		p = td->td_proc;
-		if (p->p_sysent->sv_errsize) {
-			if (error >= p->p_sysent->sv_errsize)
-				error = -1;	/* XXX */
-			else
-				error = p->p_sysent->sv_errtbl[error];
-		}
-		tf->tf_scratch.gr8 = error;
-		ia64_set_eflag(ia64_get_eflag() | PSL_C);
-		break;
-	}
-}
-
-int
-ia32_fetch_syscall_args(struct thread *td, struct syscall_args *sa)
-{
-	struct trapframe *tf;
-	struct proc *p;
-	uint32_t args[8];
-	caddr_t params;
-	int error, i;
-
-	tf = td->td_frame;
-	p = td->td_proc;
-
-	params = (caddr_t)(tf->tf_special.sp & ((1L<<32)-1)) +
-	    sizeof(uint32_t);
-	sa->code = tf->tf_scratch.gr8;		/* eax */
-
-	if (sa->code == SYS_syscall) {
-		/* Code is first argument, followed by actual args. */
-		sa->code = fuword32(params);
-		params += sizeof(int);
-	} else if (sa->code == SYS___syscall) {
-		/*
-		 * Like syscall, but code is a quad, so as to maintain
-		 * quad alignment for the rest of the arguments.  We
-		 * use a 32-bit fetch in case params is not aligned.
-		 */
-		sa->code = fuword32(params);
-		params += sizeof(quad_t);
-	}
-
-	if (p->p_sysent->sv_mask)
-		sa->code &= p->p_sysent->sv_mask;
-	if (sa->code >= p->p_sysent->sv_size)
-		sa->callp = &p->p_sysent->sv_table[0];
-	else
-		sa->callp = &p->p_sysent->sv_table[sa->code];
-	sa->narg = sa->callp->sy_narg;
-
-	if (params != NULL && sa->narg != 0)
-		error = copyin(params, (caddr_t)args, sa->narg * sizeof(int));
-	else
-		error = 0;
-	sa->args = &sa->args32[0];
-
-	if (error == 0) {
-		for (i = 0; i < sa->narg; i++)
-			sa->args32[i] = args[i];
-		td->td_retval[0] = 0;
-		td->td_retval[1] = tf->tf_scratch.gr10;	/* edx */
-	}
-
-	return (error);
-}
-
-#include "../../kern/subr_syscall.c"
-
-static void
-ia32_syscall(struct trapframe *tf)
-{
-	struct thread *td;
-	struct syscall_args sa;
-	register_t eflags;
-	int error;
-	ksiginfo_t ksi;
-
-	td = curthread;
-	eflags = ia64_get_eflag();
-
-	error = syscallenter(td, &sa);
-
-	/*
-	 * Traced syscall.
-	 */
-	if ((eflags & PSL_T) && !(eflags & PSL_VM)) {
-		ia64_set_eflag(ia64_get_eflag() & ~PSL_T);
-		ksiginfo_init_trap(&ksi);
-		ksi.ksi_signo = SIGTRAP;
-		ksi.ksi_code = TRAP_TRACE;
-		ksi.ksi_addr = (void *)tf->tf_special.iip;
-		trapsignal(td, &ksi);
-	}
-
-	syscallret(td, error, &sa);
-}
-
-/*
- * ia32_trap() is called from exception.S to handle the IA-32 specific
- * interruption vectors.
- */
-void
-ia32_trap(int vector, struct trapframe *tf)
-{
-	struct proc *p;
-	struct thread *td;
-	uint64_t ucode;
-	int sig;
-	ksiginfo_t ksi;
-
-	KASSERT(TRAPF_USERMODE(tf), ("%s: In kernel mode???", __func__));
-
-	ia64_set_fpsr(IA64_FPSR_DEFAULT);
-	PCPU_INC(cnt.v_trap);
-
-	td = curthread;
-	td->td_frame = tf;
-	td->td_pticks = 0;
-	p = td->td_proc;
-	if (td->td_ucred != p->p_ucred)
-		cred_update_thread(td);
-	sig = 0;
-	ucode = 0;
-	switch (vector) {
-	case IA64_VEC_IA32_EXCEPTION:
-		switch ((tf->tf_special.isr >> 16) & 0xffff) {
-		case IA32_EXCEPTION_DIVIDE:
-			ucode = FPE_INTDIV;
-			sig = SIGFPE;
-			break;
-		case IA32_EXCEPTION_DEBUG:
-		case IA32_EXCEPTION_BREAK:
-			sig = SIGTRAP;
-			break;
-		case IA32_EXCEPTION_OVERFLOW:
-			ucode = FPE_INTOVF;
-			sig = SIGFPE;
-			break;
-		case IA32_EXCEPTION_BOUND:
-			ucode = FPE_FLTSUB;
-			sig = SIGFPE;
-			break;
-		case IA32_EXCEPTION_DNA:
-			ucode = 0;
-			sig = SIGFPE;
-			break;
-		case IA32_EXCEPTION_NOT_PRESENT:
-		case IA32_EXCEPTION_STACK_FAULT:
-		case IA32_EXCEPTION_GPFAULT:
-			ucode = (tf->tf_special.isr & 0xffff) + BUS_SEGM_FAULT;
-			sig = SIGBUS;
-			break;
-		case IA32_EXCEPTION_FPERROR:
-			ucode = 0;	/* XXX */
-			sig = SIGFPE;
-			break;
-		case IA32_EXCEPTION_ALIGNMENT_CHECK:
-			ucode = tf->tf_special.ifa;	/* VA */
-			sig = SIGBUS;
-			break;
-		case IA32_EXCEPTION_STREAMING_SIMD:
-			ucode = 0; /* XXX */
-			sig = SIGFPE;
-			break;
-		default:
-			trap_panic(vector, tf);
-			break;
-		}
-		break;
-
-	case IA64_VEC_IA32_INTERCEPT:
-		/* XXX Maybe need to emulate ia32 instruction. */
-		trap_panic(vector, tf);
-
-	case IA64_VEC_IA32_INTERRUPT:
-		/* INT n instruction - probably a syscall. */
-		if (((tf->tf_special.isr >> 16) & 0xffff) == 0x80) {
-			ia32_syscall(tf);
-			goto out;
-		}
-		ucode = (tf->tf_special.isr >> 16) & 0xffff;
-		sig = SIGILL;
-		break;
-
-	default:
-		/* Should never happen of course. */
-		trap_panic(vector, tf);
-		break;
-	}
-
-	KASSERT(sig != 0, ("%s: signal not set", __func__));
-
-	ksiginfo_init_trap(&ksi);
-	ksi.ksi_signo = sig;
-	ksi.ksi_code = (int)ucode; /* XXX */
-	/* ksi.ksi_addr */
-	trapsignal(td, &ksi);
-
-out:
-	userret(td, tf);
-	do_ast(tf);
-}
diff --git a/sys/ia64/ia64/autoconf.c b/sys/ia64/ia64/autoconf.c
deleted file mode 100644
index fa99ecbc4e44..000000000000
--- a/sys/ia64/ia64/autoconf.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 1998 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 "opt_isa.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/reboot.h>
-#include <sys/kernel.h>
-#include <sys/mount.h>
-#include <sys/sysctl.h>
-#include <sys/bus.h>
-#include <sys/cons.h>
-
-#include <machine/intr.h>
-#include <machine/md_var.h>
-
-static void	configure_first(void *);
-static void	configure(void *);
-static void	configure_final(void *);
-
-SYSINIT(configure1, SI_SUB_CONFIGURE, SI_ORDER_FIRST, configure_first, NULL);
-/* SI_ORDER_SECOND is hookable */
-SYSINIT(configure2, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL);
-/* SI_ORDER_MIDDLE is hookable */
-SYSINIT(configure3, SI_SUB_CONFIGURE, SI_ORDER_ANY, configure_final, NULL);
-
-#ifdef DEV_ISA
-#include <isa/isavar.h>
-device_t isa_bus_device = 0;
-#endif
-
-/*
- * Determine i/o configuration for a machine.
- */
-static void
-configure_first(void *dummy)
-{
-
-	device_add_child(root_bus, "nexus", 0);
-}
-
-static void
-configure(void *dummy)
-{
-
-	root_bus_configure();
-
-	/*
-	 * Probe ISA devices after everything.
-	 */
-#ifdef DEV_ISA
-	if (isa_bus_device)
-		isa_probe_children(isa_bus_device);
-#endif
-}
-
-static void
-configure_final(void *dummy)
-{
-
-	cninit_finish();
-
-	ia64_enable_intr();
-
-	cold = 0;
-}
diff --git a/sys/ia64/ia64/bus_machdep.c b/sys/ia64/ia64/bus_machdep.c
deleted file mode 100644
index cd9ebc8ce461..000000000000
--- a/sys/ia64/ia64/bus_machdep.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/*-
- * Copyright (c) 2009 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <machine/bus.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
-
-extern u_long ia64_port_base;
-
-#define __PIO_ADDR(port)        \
-        (void *)(ia64_port_base | (((port) & 0xfffc) << 10) | ((port) & 0xFFF))
-
-int
-bus_space_map(bus_space_tag_t bst, bus_addr_t addr, bus_size_t size,
-    int flags __unused, bus_space_handle_t *bshp)
-{
-
-        *bshp = (__predict_false(bst == IA64_BUS_SPACE_IO))
-            ? addr : (uintptr_t)pmap_mapdev(addr, size);
-        return (0);
-}
-
-
-void
-bus_space_unmap(bus_space_tag_t bst __unused, bus_space_handle_t bsh,
-    bus_size_t size)
-{
-
-	pmap_unmapdev(bsh, size);
-}
-
-uint8_t
-bus_space_read_io_1(u_long port)
-{
-	uint8_t v;
-
-	ia64_mf();
-	v = ia64_ld1(__PIO_ADDR(port));
-	ia64_mf_a();
-	ia64_mf();
-	return (v);
-}
-
-uint16_t
-bus_space_read_io_2(u_long port)
-{
-	uint16_t v;
-
-	ia64_mf();
-	v = ia64_ld2(__PIO_ADDR(port));
-	ia64_mf_a();
-	ia64_mf();
-	return (v);
-}
-
-uint32_t
-bus_space_read_io_4(u_long port)
-{
-	uint32_t v;
-
-	ia64_mf();
-	v = ia64_ld4(__PIO_ADDR(port));
-	ia64_mf_a();
-	ia64_mf();
-	return (v);
-}
-
-#if 0
-uint64_t
-bus_space_read_io_8(u_long port)
-{
-}
-#endif
-
-void
-bus_space_write_io_1(u_long port, uint8_t val)
-{
-
-	ia64_mf();
-	ia64_st1(__PIO_ADDR(port), val);
-	ia64_mf_a();
-	ia64_mf();
-}
-
-void
-bus_space_write_io_2(u_long port, uint16_t val)
-{
-
-	ia64_mf();
-	ia64_st2(__PIO_ADDR(port), val);
-	ia64_mf_a();
-	ia64_mf();
-}
-
-void
-bus_space_write_io_4(u_long port, uint32_t val)
-{
-
-	ia64_mf();
-	ia64_st4(__PIO_ADDR(port), val);
-	ia64_mf_a();
-	ia64_mf();
-}
-
-#if 0
-void
-bus_space_write_io_8(u_long port, uint64_t val)
-{
-}
-#endif
-
-void
-bus_space_read_multi_io_1(u_long port, uint8_t *ptr, size_t count)
-{
-
-	while (count-- > 0)
-		*ptr++ = bus_space_read_io_1(port);
-}
-
-void
-bus_space_read_multi_io_2(u_long port, uint16_t *ptr, size_t count)
-{
-
-	while (count-- > 0)
-		*ptr++ = bus_space_read_io_2(port);
-}
-
-void
-bus_space_read_multi_io_4(u_long port, uint32_t *ptr, size_t count)
-{
-
-	while (count-- > 0)
-		*ptr++ = bus_space_read_io_4(port);
-}
-
-#if 0
-void
-bus_space_read_multi_io_8(u_long port, uint64_t *ptr, size_t count)
-{
-}
-#endif
-
-void
-bus_space_write_multi_io_1(u_long port, const uint8_t *ptr, size_t count)
-{
-
-	while (count-- > 0)
-		bus_space_write_io_1(port, *ptr++);
-}
-
-void
-bus_space_write_multi_io_2(u_long port, const uint16_t *ptr, size_t count)
-{
-
-	while (count-- > 0)
-		bus_space_write_io_2(port, *ptr++);
-}
-
-void
-bus_space_write_multi_io_4(u_long port, const uint32_t *ptr, size_t count)
-{
-
-	while (count-- > 0)
-		bus_space_write_io_4(port, *ptr++);
-}
-
-#if 0
-void
-bus_space_write_multi_io_8(u_long port, const uint64_t *ptr, size_t count)
-{
-}
-#endif
-
-void
-bus_space_read_region_io_1(u_long port, uint8_t *ptr, size_t count)
-{
-
-	while (count-- > 0) {
-		*ptr++ = bus_space_read_io_1(port);
-		port += 1;
-	}
-}
-
-void
-bus_space_read_region_io_2(u_long port, uint16_t *ptr, size_t count) 
-{
-
-	while (count-- > 0) {
-		*ptr++ = bus_space_read_io_2(port);
-		port += 2;
-	}
-}
-
-void
-bus_space_read_region_io_4(u_long port, uint32_t *ptr, size_t count) 
-{
-
-	while (count-- > 0) {
-		*ptr++ = bus_space_read_io_4(port);
-		port += 4;
-	}
-}
-
-#if 0
-void bus_space_read_region_io_8(u_long, uint64_t *, size_t);
-#endif
-
-void
-bus_space_write_region_io_1(u_long port, const uint8_t *ptr, size_t count)
-{
-
-	while (count-- > 0) {
-		bus_space_write_io_1(port, *ptr++);
-		port += 1;
-	}
-}
-
-void
-bus_space_write_region_io_2(u_long port, const uint16_t *ptr, size_t count)
-{
-
-	while (count-- > 0) {
-		bus_space_write_io_2(port, *ptr++);
-		port += 2;
-	}
-}
-
-void
-bus_space_write_region_io_4(u_long port, const uint32_t *ptr, size_t count)
-{
-
-	while (count-- > 0) {
-		bus_space_write_io_4(port, *ptr++);
-		port += 4;
-	}
-}
-
-#if 0
-void
-bus_space_write_region_io_8(u_long port, const uint64_t *ptr, size_t count)
-{
-}
-#endif
-
-void
-bus_space_set_region_io_1(u_long port, uint8_t val, size_t count)
-{
-
-	while (count-- > 0) {
-		bus_space_write_io_1(port, val);
-		port += 1;
-	}
-}
-
-void
-bus_space_set_region_io_2(u_long port, uint16_t val, size_t count)
-{
-
-	while (count-- > 0) {
-		bus_space_write_io_2(port, val);
-		port += 2;
-	}
-}
-
-void
-bus_space_set_region_io_4(u_long port, uint32_t val, size_t count)
-{
-
-	while (count-- > 0) {
-		bus_space_write_io_4(port, val);
-		port += 4;
-	}
-}
-
-#if 0
-void
-bus_space_set_region_io_8(u_long port, uint64_t val, size_t count)
-{
-}
-#endif
-
-void 
-bus_space_copy_region_io_1(u_long src, u_long dst, size_t count) 
-{
-	long delta;
-	uint8_t val;
-
-	if (src < dst) {
-		src += count - 1;
-		dst += count - 1;
-		delta = -1;
-	} else
-		delta = 1;
-
-	while (count-- > 0) {
-		val = bus_space_read_io_1(src);
-		bus_space_write_io_1(dst, val);
-		src += delta;
-		dst += delta;
-	}
-}
-
-void 
-bus_space_copy_region_io_2(u_long src, u_long dst, size_t count) 
-{
-	long delta;
-	uint16_t val;
-
-	if (src < dst) {
-		src += 2 * (count - 1);
-		dst += 2 * (count - 1);
-		delta = -2;
-	} else
-		delta = 2;
-
-	while (count-- > 0) {
-		val = bus_space_read_io_2(src);
-		bus_space_write_io_2(dst, val);
-		src += delta;
-		dst += delta;
-	}
-}
-
-void 
-bus_space_copy_region_io_4(u_long src, u_long dst, size_t count) 
-{
-	long delta;
-	uint32_t val;
-
-	if (src < dst) {
-		src += 4 * (count - 1);
-		dst += 4 * (count - 1);
-		delta = -4;
-	} else
-		delta = 4;
-
-	while (count-- > 0) {
-		val = bus_space_read_io_4(src);
-		bus_space_write_io_4(dst, val);
-		src += delta;
-		dst += delta;
-	}
-}
-
-#if 0
-void
-bus_space_copy_region_io_8(u_long src, u_long dst, size_t count)
-{
-}
-#endif
diff --git a/sys/ia64/ia64/busdma_machdep.c b/sys/ia64/ia64/busdma_machdep.c
deleted file mode 100644
index 206fc6e7da8a..000000000000
--- a/sys/ia64/ia64/busdma_machdep.c
+++ /dev/null
@@ -1,975 +0,0 @@
-/*-
- * Copyright (c) 1997 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/kernel.h>
-#include <sys/malloc.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/bus.h>
-#include <sys/interrupt.h>
-#include <sys/memdesc.h>
-#include <sys/proc.h>
-#include <sys/sysctl.h>
-#include <sys/uio.h>
-
-#include <vm/vm.h>
-#include <vm/vm_page.h>
-#include <vm/vm_map.h>
-
-#include <machine/atomic.h>
-#include <machine/bus.h>
-#include <machine/md_var.h>
-
-#define	MAX_BPAGES	1024
-
-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_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;
-};
-
-u_int busdma_swi_pending;
-
-static struct mtx bounce_lock;
-static STAILQ_HEAD(bp_list, bounce_page) bounce_page_list;
-static int free_bpages;
-static int reserved_bpages;
-static int active_bpages;
-static int total_bpages;
-static int total_bounced;
-static int total_deferred;
-
-static SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD, 0, "Busdma parameters");
-SYSCTL_INT(_hw_busdma, OID_AUTO, free_bpages, CTLFLAG_RD, &free_bpages, 0,
-    "Free bounce pages");
-SYSCTL_INT(_hw_busdma, OID_AUTO, reserved_bpages, CTLFLAG_RD, &reserved_bpages,
-    0, "Reserved bounce pages");
-SYSCTL_INT(_hw_busdma, OID_AUTO, active_bpages, CTLFLAG_RD, &active_bpages, 0,
-    "Active bounce pages");
-SYSCTL_INT(_hw_busdma, OID_AUTO, total_bpages, CTLFLAG_RD, &total_bpages, 0,
-    "Total bounce pages");
-SYSCTL_INT(_hw_busdma, OID_AUTO, total_bounced, CTLFLAG_RD, &total_bounced, 0,
-    "Total bounce requests");
-SYSCTL_INT(_hw_busdma, OID_AUTO, total_deferred, CTLFLAG_RD, &total_deferred,
-    0, "Total bounce requests that were deferred");
-
-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;
-
-static void init_bounce_pages(void *dummy);
-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);
-static __inline int run_filter(bus_dma_tag_t dmat, bus_addr_t paddr,
-    bus_size_t len);
-
-/*
- * 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.
- */
-static __inline int
-run_filter(bus_dma_tag_t dmat, bus_addr_t paddr, bus_size_t len)
-{
-	bus_addr_t bndy;
-	int retval;
-
-	retval = 0;
-	bndy = dmat->boundary;
-	do {
-		if (((paddr > dmat->lowaddr && paddr <= dmat->highaddr) ||
-		    (paddr & (dmat->alignment - 1)) != 0 ||
-		    (paddr & bndy) != ((paddr + len) & bndy)) &&
-		    (dmat->filter == NULL ||
-		    (*dmat->filter)(dmat->filterarg, paddr) != 0))
-			retval = 1;
-		dmat = dmat->parent;
-	} while (retval == 0 && dmat != NULL);
-	return (retval);
-}
-
-/*
- * Convenience function for manipulating driver locks from busdma (during
- * busdma_swi, for example).  Drivers that don't provide their own locks
- * should specify &Giant to dmat->lockfuncarg.  Drivers that use their own
- * non-mutex locking scheme don't have to use this at all.
- */
-void
-busdma_lock_mutex(void *arg, bus_dma_lock_op_t op)
-{
-	struct mtx *dmtx;
-
-	dmtx = (struct mtx *)arg;
-	switch (op) {
-	case BUS_DMA_LOCK:
-		mtx_lock(dmtx);
-		break;
-	case BUS_DMA_UNLOCK:
-		mtx_unlock(dmtx);
-		break;
-	default:
-		panic("Unknown operation 0x%x for busdma_lock_mutex!", op);
-	}
-}
-
-/*
- * dflt_lock should never get called.  It gets put into the dma tag when
- * lockfunc == NULL, which is only valid if the maps that are associated
- * 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)
-{
-	panic("driver error: busdma dflt_lock called");
-}
-
-#define BUS_DMA_MIN_ALLOC_COMP BUS_DMA_BUS4
-
-/*
- * 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_dma_tag_t newtag;
-	int error = 0;
-
-	/* Basic sanity checking */
-	if (boundary != 0 && boundary < maxsegsz)
-		maxsegsz = boundary;
-
-	/* Return a NULL tag on failure */
-	*dmat = NULL;
-
-	newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF, M_NOWAIT);
-	if (newtag == NULL)
-		return (ENOMEM);
-
-	newtag->parent = parent;
-	newtag->alignment = alignment;
-	newtag->boundary = boundary;
-	newtag->lowaddr = trunc_page(lowaddr) + (PAGE_SIZE - 1);
-	newtag->highaddr = trunc_page(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;
-	} else {
-		newtag->lockfunc = dflt_lock;
-		newtag->lockfuncarg = NULL;
-	}
-	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) {
-			/*
-			 * 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 < paddr_max && (flags & BUS_DMA_ALLOCNOW) != 0) {
-		/* Must bounce */
-
-		if (ptoa(total_bpages) < maxsize) {
-			int pages;
-
-			pages = atop(maxsize) - 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;
-	}
-	return (error);
-}
-
-int
-bus_dma_tag_destroy(bus_dma_tag_t dmat)
-{
-	if (dmat != NULL) {
-
-		if (dmat->map_count != 0)
-			return (EBUSY);
-
-		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;
-		}
-	}
-	return (0);
-}
-
-/*
- * Allocate a handle for mapping from kva/uva/physical
- * address space into bus device space.
- */
-int
-bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
-{
-	int error;
-
-	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)
-			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->lowaddr < paddr_max) {
-		/* Must bounce */
-		int maxpages;
-
-		*mapp = (bus_dmamap_t)malloc(sizeof(**mapp), M_DEVBUF,
-		    M_NOWAIT | M_ZERO);
-		if (*mapp == NULL)
-			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.
-		 */
-		maxpages = MIN(MAX_BPAGES, atop(paddr_max - dmat->lowaddr));
-		if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0
-		 || (dmat->map_count > 0 && total_bpages < maxpages)) {
-			int pages;
-
-			pages = MAX(atop(dmat->maxsize), 1);
-			pages = MIN(maxpages - total_bpages, pages);
-			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;
-			}
-		}
-	} else {
-		*mapp = NULL;
-	}
-	if (error == 0)
-		dmat->map_count++;
-	return (error);
-}
-
-/*
- * Destroy a handle for mapping from kva/uva/physical
- * address space into bus device space.
- */
-int
-bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map)
-{
-
-	if (map != NULL && map != &nobounce_dmamap) {
-		if (STAILQ_FIRST(&map->bpages) != NULL)
-			return (EBUSY);
-		free(map, M_DEVBUF);
-	}
-	dmat->map_count--;
-	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.
- */
-int
-bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
-    bus_dmamap_t *mapp)
-{
-	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->nsegments, M_DEVBUF,
-		    mflags);
-		if (dmat->segments == NULL)
-			return (ENOMEM);
-	}
-	if (flags & BUS_DMA_ZERO)
-		mflags |= M_ZERO;
-
-	/*
-	 * 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 >= paddr_max) {
-		*vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags);
-	} else {
-		/*
-		 * XXX Use Contigmalloc until it is merged into this facility
-		 *     and handles multi-seg allocations.  Nobody is doing
-		 *     multi-seg allocations yet though.
-		 * XXX Certain AGP hardware does.
-		 */
-		*vaddr = contigmalloc(dmat->maxsize, M_DEVBUF, mflags,
-		    0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
-		    dmat->boundary);
-	}
-	if (*vaddr == NULL)
-		return (ENOMEM);
-	else if (vtophys(*vaddr) & (dmat->alignment - 1))
-		printf("bus_dmamem_alloc failed to align memory properly.\n");
-	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.
- */
-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 (map != NULL)
-		panic("bus_dmamem_free: Invalid map freed\n");
-	if ((dmat->maxsize <= PAGE_SIZE) &&
-	   (dmat->alignment < dmat->maxsize) &&
-	    dmat->lowaddr >= paddr_max)
-		free(vaddr, M_DEVBUF);
-	else {
-		contigfree(vaddr, dmat->maxsize, M_DEVBUF);
-	}
-}
-
-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 ((dmat->lowaddr < paddr_max || dmat->boundary > 0 ||
-	    dmat->alignment > 1) && 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, 0) != 0) {
-				sgsize = MIN(sgsize, PAGE_SIZE);
-				map->pagesneeded++;
-			}
-			curaddr += sgsize;
-			buflen -= sgsize;
-		}
-	}
-}
-
-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 ((dmat->lowaddr < paddr_max || dmat->boundary > 0 ||
-	    dmat->alignment > 1) && map != &nobounce_dmamap &&
-	    map->pagesneeded == 0) {
-		/*
-		 * Count the number of bounce pages
-		 * needed in order to complete this transfer
-		 */
-		vaddr = trunc_page((vm_offset_t)buf);
-		vendaddr = (vm_offset_t)buf + buflen;
-
-		while (vaddr < vendaddr) {
-			if (pmap == kernel_pmap)
-				paddr = pmap_kextract(vaddr);
-			else
-				paddr = pmap_extract(pmap, vaddr);
-			if (run_filter(dmat, paddr, 0) != 0)
-				map->pagesneeded++;
-			vaddr += PAGE_SIZE;
-		}
-	}
-}
-
-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);
-}
-
-/*
- * Utility function to load a physical buffer.  segp contains
- * 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_addr_t curaddr;
-	bus_size_t sgsize;
-	int error;
-
-	if (map == NULL)
-		map = &nobounce_dmamap;
-
-	if (segs == NULL)
-		segs = dmat->segments;
-
-	if (map != &nobounce_dmamap) {
-		_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 (map->pagesneeded != 0 &&
-		    run_filter(dmat, curaddr, sgsize)) {
-			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? */
-}
-
-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.
- */
-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_size_t sgsize;
-	bus_addr_t curaddr;
-	vm_offset_t vaddr;
-	int error;
-
-	if (map == NULL)
-		map = &nobounce_dmamap;
-
-	if (segs == NULL)
-		segs = dmat->segments;
-
-	if (map != &nobounce_dmamap) {
-		_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.
-		 */
-		sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK);
-		if (sgsize > dmat->maxsegsz)
-			sgsize = dmat->maxsegsz;
-		if (buflen < sgsize)
-			sgsize = buflen;
-
-		if (map->pagesneeded != 0 && run_filter(dmat, curaddr, sgsize))
-			curaddr = add_bounce_page(dmat, map, vaddr, curaddr,
-			    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? */
-}
-
-
-void
-__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) {
-		map->dmat = dmat;
-		map->mem = *mem;
-		map->callback = callback;
-		map->callback_arg = 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)
-{
-
-	if (segs == NULL)
-		segs = dmat->segments;
-	return (segs);
-}
-
-/*
- * Release the mapping held by map.
- */
-void
-_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);
-	}
-}
-
-void
-_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
-		 */
-
-		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);
-			}
-			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);
-			}
-			total_bounced++;
-		}
-	}
-}
-
-static void
-init_bounce_pages(void *dummy __unused)
-{
-
-	free_bpages = 0;
-	reserved_bpages = 0;
-	active_bpages = 0;
-	total_bpages = 0;
-	STAILQ_INIT(&bounce_page_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 int
-alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages)
-{
-	int count;
-
-	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, dmat->lowaddr, PAGE_SIZE, dmat->boundary);
-		if (bpage->vaddr == 0) {
-			free(bpage, M_DEVBUF);
-			break;
-		}
-		bpage->busaddr = pmap_kextract(bpage->vaddr);
-		mtx_lock(&bounce_lock);
-		STAILQ_INSERT_TAIL(&bounce_page_list, bpage, links);
-		total_bpages++;
-		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)
-{
-	int pages;
-
-	mtx_assert(&bounce_lock, MA_OWNED);
-	pages = MIN(free_bpages, map->pagesneeded - map->pagesreserved);
-	if (commit == 0 && map->pagesneeded > (map->pagesreserved + pages))
-		return (map->pagesneeded - (map->pagesreserved + pages));
-	free_bpages -= pages;
-	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_page *bpage;
-
-	KASSERT(map != NULL && map != &nobounce_dmamap,
-	    ("add_bounce_page: bad map %p", map));
-
-	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(&bounce_page_list);
-	if (bpage == NULL)
-		panic("add_bounce_page: free page list is empty");
-
-	STAILQ_REMOVE_HEAD(&bounce_page_list, links);
-	reserved_bpages--;
-	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;
-
-	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(&bounce_page_list, bpage, links);
-	free_bpages++;
-	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;
-			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);
-}
diff --git a/sys/ia64/ia64/clock.c b/sys/ia64/ia64/clock.c
deleted file mode 100644
index 4a672beb3a25..000000000000
--- a/sys/ia64/ia64/clock.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*-
- * Copyright (c) 2005, 2009-2011 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/bus.h>
-#include <sys/efi.h>
-#include <sys/interrupt.h>
-#include <sys/priority.h>
-#include <sys/proc.h>
-#include <sys/queue.h>
-#include <sys/sysctl.h>
-#include <sys/systm.h>
-#include <sys/timeet.h>
-#include <sys/timetc.h>
-#include <sys/pcpu.h>
-
-#include <machine/cpu.h>
-#include <machine/intr.h>
-#include <machine/intrcnt.h>
-#include <machine/md_var.h>
-#include <machine/smp.h>
-
-#define	CLOCK_ET_OFF		0
-#define	CLOCK_ET_PERIODIC	1
-#define	CLOCK_ET_ONESHOT	2
-
-static struct eventtimer ia64_clock_et;
-static u_int ia64_clock_xiv;
-
-#ifndef SMP
-static timecounter_get_t ia64_get_timecount;
-
-static struct timecounter ia64_timecounter = {
-	ia64_get_timecount,	/* get_timecount */
-	0,			/* no poll_pps */
-	~0u,			/* counter_mask */
-	0,			/* frequency */
-	"ITC"			/* name */
-};
-
-static u_int
-ia64_get_timecount(struct timecounter* tc)
-{
-	return ia64_get_itc();
-}
-#endif
-
-static u_int
-ia64_ih_clock(struct thread *td, u_int xiv, struct trapframe *tf)
-{
-	struct eventtimer *et;
-	struct trapframe *stf;
-	uint64_t itc, load;
-	uint32_t mode;
-
-	PCPU_INC(md.stats.pcs_nclks);
-	intrcnt[INTRCNT_CLOCK]++;
-
-	itc = ia64_get_itc();
-	PCPU_SET(md.clock, itc);
-
-	mode = PCPU_GET(md.clock_mode);
-	if (mode == CLOCK_ET_PERIODIC) {
-		load = PCPU_GET(md.clock_load);
-		ia64_set_itm(itc + load);
-	} else
-		ia64_set_itv((1 << 16) | xiv);
-
-	ia64_set_eoi(0);
-	ia64_srlz_d();
-
-	et = &ia64_clock_et;
-	if (et->et_active) {
-		stf = td->td_intr_frame;
-		td->td_intr_frame = tf;
-		et->et_event_cb(et, et->et_arg);
-		td->td_intr_frame = stf;
-	}
-	return (1);
-}
-
-/*
- * Event timer start method.
- */
-static int
-ia64_clock_start(struct eventtimer *et, sbintime_t first, sbintime_t period)
-{
-	u_long itc, load;
-	register_t is;
-
-	if (period != 0) {
-		PCPU_SET(md.clock_mode, CLOCK_ET_PERIODIC);
-		load = (et->et_frequency * period) >> 32;
-	} else {
-		PCPU_SET(md.clock_mode, CLOCK_ET_ONESHOT);
-		load = 0;
-	}
-
-	PCPU_SET(md.clock_load, load);
-
-	if (first != 0)
-		load = (et->et_frequency * first) >> 32;
-
-	is = intr_disable();
-	itc = ia64_get_itc();
-	ia64_set_itm(itc + load);
-	ia64_set_itv(ia64_clock_xiv);
-	ia64_srlz_d();
-	intr_restore(is);
-	return (0);
-}
-
-/*
- * Event timer stop method.
- */
-static int
-ia64_clock_stop(struct eventtimer *et)
-{
-
-	ia64_set_itv((1 << 16) | ia64_clock_xiv);
-	ia64_srlz_d();
-	PCPU_SET(md.clock_mode, CLOCK_ET_OFF);
-	PCPU_SET(md.clock_load, 0);
-	return (0);
-}
-
-/*
- * We call cpu_initclocks() on the APs as well. It allows us to
- * group common initialization in the same function.
- */
-void
-cpu_initclocks()
-{
-
-	ia64_clock_stop(NULL);
-	if (PCPU_GET(cpuid) == 0)
-		cpu_initclocks_bsp();
-	else
-		cpu_initclocks_ap();
-}
-
-static void
-clock_configure(void *dummy)
-{
-	struct eventtimer *et;
-	u_long itc_freq;
-
-	ia64_clock_xiv = ia64_xiv_alloc(PI_REALTIME, IA64_XIV_IPI,
-	    ia64_ih_clock);
-	if (ia64_clock_xiv == 0)
-		panic("No XIV for clock interrupts");
-
-	itc_freq = (u_long)ia64_itc_freq() * 1000000ul;
-
-	et = &ia64_clock_et;
-	et->et_name = "ITC";
-	et->et_flags = ET_FLAGS_PERIODIC | ET_FLAGS_ONESHOT | ET_FLAGS_PERCPU;
-	et->et_quality = 1000;
-	et->et_frequency = itc_freq;
-	et->et_min_period = SBT_1S / (10 * hz);
-	et->et_max_period = (0xfffffffeul << 32) / itc_freq;
-	et->et_start = ia64_clock_start;
-	et->et_stop = ia64_clock_stop;
-	et->et_priv = NULL;
-	et_register(et);
-
-#ifndef SMP
-	ia64_timecounter.tc_frequency = itc_freq;
-	tc_init(&ia64_timecounter);
-#endif
-}
-SYSINIT(clkcfg, SI_SUB_CONFIGURE, SI_ORDER_SECOND, clock_configure, NULL);
diff --git a/sys/ia64/ia64/context.S b/sys/ia64/ia64/context.S
deleted file mode 100644
index 84d8fd1ccc51..000000000000
--- a/sys/ia64/ia64/context.S
+++ /dev/null
@@ -1,804 +0,0 @@
-/*-
- * Copyright (c) 2003 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$
- */
-
-#include <machine/asm.h>
-#include <assym.s>
-
-	.text
-
-/*
- * void restorectx(struct pcb *)
- */
-ENTRY(restorectx, 1)
-{	.mmi
-	invala
-	mov		ar.rsc=0
-	add		r31=8,r32
-	;;
-}
-{	.mmi
-	ld8		r12=[r32]		// sp
-	ld8		r16=[r31],16		// unat (before)
-	add		r30=16,r32
-	;;
-}
-{	.mmi
-	ld8		r17=[r30],16		// rp
-	ld8		r18=[r31],16		// pr
-	add		r14=SIZEOF_SPECIAL,r32
-	;;
-}
-{	.mmi
-	ld8		r19=[r30],16		// pfs
-	ld8		r20=[r31],16		// bspstore
-	mov		rp=r17
-	;;
-}
-{	.mmi
-	loadrs
-	ld8		r21=[r30],16		// rnat
-	mov		pr=r18,0x1fffe
-	;;
-}
-{	.mmi
-	ld8		r17=[r14],8		// unat (after)
-	mov		ar.bspstore=r20
-	mov		ar.pfs=r19
-	;;
-}
-{	.mmi
-	mov		ar.unat=r17
-	mov		ar.rnat=r21
-	add		r15=8,r14
-	;;
-}
-{	.mmi
-	ld8.fill	r4=[r14],16		// r4
-	ld8.fill	r5=[r15],16		// r5
-	nop		0
-	;;
-}
-{	.mmi
-	ld8.fill	r6=[r14],16		// r6
-	ld8.fill	r7=[r15],16		// r7
-	nop		0
-	;;
-}
-{	.mmi
-	mov		ar.unat=r16
-	mov		ar.rsc=3
-	nop		0
-}
-{	.mmi
-	ld8		r17=[r14],16		// b1
-	ld8		r18=[r15],16		// b2
-	nop		0
-	;;
-}
-{	.mmi
-	ld8		r19=[r14],16		// b3
-	ld8		r20=[r15],16		// b4
-	mov		b1=r17
-	;;
-}
-{	.mmi
-	ld8		r16=[r14],24		// b5
-	ld8		r17=[r15],32		// lc
-	mov		b2=r18
-	;;
-}
-{	.mmi
-	ldf.fill	f2=[r14],32
-	ldf.fill	f3=[r15],32
-	mov		b3=r19
-	;;
-}
-{	.mmi
-	ldf.fill	f4=[r14],32
-	ldf.fill	f5=[r15],32
-	mov		b4=r20
-	;;
-}
-{	.mmi
-	ldf.fill	f16=[r14],32
-	ldf.fill	f17=[r15],32
-	mov		b5=r16
-	;;
-}
-{	.mmi
-	ldf.fill	f18=[r14],32
-	ldf.fill	f19=[r15],32
-	mov		ar.lc=r17
-	;;
-}
-	ldf.fill	f20=[r14],32
-	ldf.fill	f21=[r15],32
-	;;
-	ldf.fill	f22=[r14],32
-	ldf.fill	f23=[r15],32
-	;;
-	ldf.fill	f24=[r14],32
-	ldf.fill	f25=[r15],32
-	;;
-	ldf.fill	f26=[r14],32
-	ldf.fill	f27=[r15],32
-	;;
-{	.mmi
-	ldf.fill	f28=[r14],32
-	ldf.fill	f29=[r15],32
-	add		r8=1,r0
-	;;
-}
-{	.mmb
-	ldf.fill	f30=[r14]
-	ldf.fill	f31=[r15]
-	br.ret.sptk	rp
-	;;
-}
-END(restorectx)
-
-/*
- * void swapctx(struct pcb *old, struct pcb *new)
- */
-
-ENTRY(swapctx, 2)
-{	.mmi
-	mov		ar.rsc=0
-	mov		r16=ar.unat
-	add		r31=8,r32
-	;;
-}
-{	.mmi
-	flushrs
-	st8		[r32]=sp,16		// sp
-	mov		r17=rp
-	;;
-}
-{	.mmi
-	st8		[r31]=r16,16		// unat (before)
-	st8		[r32]=r17,16		// rp
-	mov		r16=pr
-	;;
-}
-{	.mmi
-	st8		[r31]=r16,16		// pr
-	mov		r17=ar.bsp
-	mov		r16=ar.pfs
-	;;
-}
-{	.mmi
-	st8		[r32]=r16,16		// pfs
-	st8		[r31]=r17,16		// bspstore
-	cmp.eq		p15,p0=0,r33
-	;;
-}
-{	.mmi
-	mov		r16=ar.rnat
-(p15)	mov		ar.rsc=3
-	add		r30=SIZEOF_SPECIAL-(6*8),r32
-	;;
-}
-{	.mmi
-	st8		[r32]=r16,SIZEOF_SPECIAL-(4*8)		// rnat
-	st8		[r31]=r0,SIZEOF_SPECIAL-(6*8)		// __spare
-	mov		r16=b1
-	;;
-}
-	/* callee_saved */
-{	.mmi
-	.mem.offset	8,0
-	st8.spill	[r31]=r4,16		// r4
-	.mem.offset	16,0
-	st8.spill	[r32]=r5,16		// r5
-	mov		r17=b2
-	;;
-}
-{	.mmi
-	.mem.offset	24,0
-	st8.spill	[r31]=r6,16		// r6
-	.mem.offset	32,0
-	st8.spill	[r32]=r7,16		// r7
-	mov		r18=b3
-	;;
-}
-{	.mmi
-	st8		[r31]=r16,16		// b1
-	mov		r16=ar.unat
-	mov		r19=b4
-	;;
-}
-{	.mmi
-	st8		[r30]=r16		// unat (after)
-	st8		[r32]=r17,16		// b2
-	mov		r16=b5
-	;;
-}
-{	.mmi
-	st8		[r31]=r18,16		// b3
-	st8		[r32]=r19,16		// b4
-	mov		r17=ar.lc
-	;;
-}
-	st8		[r31]=r16,16		// b5
-	st8		[r32]=r17,16		// lc
-	;;
-	st8		[r31]=r0,24		// __spare
-	stf.spill	[r32]=f2,32
-	;;
-	stf.spill	[r31]=f3,32
-	stf.spill	[r32]=f4,32
-	;;
-	stf.spill	[r31]=f5,32
-	stf.spill	[r32]=f16,32
-	;;
-	stf.spill	[r31]=f17,32
-	stf.spill	[r32]=f18,32
-	;;
-	stf.spill	[r31]=f19,32
-	stf.spill	[r32]=f20,32
-	;;
-	stf.spill	[r31]=f21,32
-	stf.spill	[r32]=f22,32
-	;;
-	stf.spill	[r31]=f23,32
-	stf.spill	[r32]=f24,32
-	;;
-	stf.spill	[r31]=f25,32
-	stf.spill	[r32]=f26,32
-	;;
-	stf.spill	[r31]=f27,32
-	stf.spill	[r32]=f28,32
-	;;
-{	.mmi
-	stf.spill	[r31]=f29,32
-	stf.spill	[r32]=f30
-(p15)	add		r8=0,r0
-	;;
-}
-{	.mmb
-	stf.spill	[r31]=f31
-	mf
-(p15)	br.ret.sptk	rp
-	;;
-}
-{	.mib
-	mov		r32=r33
-	nop		0
-	br.sptk		restorectx
-	;;
-}
-END(swapctx)
-
-/*
- * save_callee_saved(struct _callee_saved *)
- */
-ENTRY(save_callee_saved, 1)
-{	.mii
-	nop		0
-	add		r14=8,r32
-	add		r15=16,r32
-	;;
-}
-{	.mmi
-	.mem.offset	8,0
-	st8.spill	[r14]=r4,16		// r4
-	.mem.offset	16,0
-	st8.spill	[r15]=r5,16		// r5
-	mov		r16=b1
-	;;
-}
-{	.mmi
-	.mem.offset	24,0
-	st8.spill	[r14]=r6,16		// r6
-	.mem.offset	32,0
-	st8.spill	[r15]=r7,16		// r7
-	mov		r17=b2
-	;;
-}
-{	.mmi
-	st8		[r14]=r16,16		// b1
-	mov		r18=ar.unat
-	mov		r19=b3
-	;;
-}
-{	.mmi
-	st8		[r32]=r18		// nat (after)
-	st8		[r15]=r17,16		// b2
-	mov		r16=b4
-	;;
-}
-{	.mmi
-	st8		[r14]=r19,16		// b3
-	st8		[r15]=r16,16		// b4
-	mov		r17=b5
-	;;
-}
-{	.mii
-	st8		[r14]=r17,16		// b5
-	mov		r16=ar.lc
-	nop		0
-	;;
-}
-{	.mmb
-	st8		[r15]=r16		// ar.lc
-	st8		[r14]=r0		// __spare
-	br.ret.sptk	rp
-	;;
-}
-END(save_callee_saved)
-
-/*
- * restore_callee_saved(struct _callee_saved *)
- */
-ENTRY(restore_callee_saved, 1)
-{	.mmi
-	ld8		r30=[r32],16		// nat (after)
-	;;
-	mov		ar.unat=r30
-	add		r31=-8,r32
-	;;
-}
-{	.mmi
-	ld8.fill	r4=[r31],16		// r4
-	ld8.fill	r5=[r32],16		// r5
-	nop		0
-	;;
-}
-{	.mmi
-	ld8.fill	r6=[r31],16		// r6
-	ld8.fill	r7=[r32],16		// r7
-	nop		0
-	;;
-}
-{	.mmi
-	ld8		r30=[r31],16		// b1
-	ld8		r29=[r32],16		// b2
-	nop		0
-	;;
-}
-{	.mmi
-	ld8		r28=[r31],16		// b3
-	ld8		r27=[r32],16		// b4
-	mov		b1=r30
-	;;
-}
-{	.mii
-	ld8		r26=[r31]		// b5
-	mov		b2=r29
-	mov		b3=r28
-	;;
-}
-{	.mii
-	ld8		r25=[r32]		// lc
-	mov		b4=r27
-	mov		b5=r26
-	;;
-}
-{	.mib
-	nop		0
-	mov		ar.lc=r25
-	br.ret.sptk	rp
-	;;
-}
-END(restore_callee_saved)
-
-/*
- * save_callee_saved_fp(struct _callee_saved_fp *)
- */
-ENTRY(save_callee_saved_fp, 1)
-	add		r31=16,r32
-	stf.spill	[r32]=f2,32
-	;;
-	stf.spill	[r31]=f3,32
-	stf.spill	[r32]=f4,32
-	;;
-	stf.spill	[r31]=f5,32
-	stf.spill	[r32]=f16,32
-	;;
-	stf.spill	[r31]=f17,32
-	stf.spill	[r32]=f18,32
-	;;
-	stf.spill	[r31]=f19,32
-	stf.spill	[r32]=f20,32
-	;;
-	stf.spill	[r31]=f21,32
-	stf.spill	[r32]=f22,32
-	;;
-	stf.spill	[r31]=f23,32
-	stf.spill	[r32]=f24,32
-	;;
-	stf.spill	[r31]=f25,32
-	stf.spill	[r32]=f26,32
-	;;
-	stf.spill	[r31]=f27,32
-	stf.spill	[r32]=f28,32
-	;;
-	stf.spill	[r31]=f29,32
-	stf.spill	[r32]=f30
-	;;
-	stf.spill	[r31]=f31
-	br.ret.sptk	rp
-	;;
-END(save_callee_saved_fp)
-
-/*
- * restore_callee_saved_fp(struct _callee_saved_fp *)
- */
-ENTRY(restore_callee_saved_fp, 1)
-	add		r31=16,r32
-	ldf.fill	f2=[r32],32
-	;;
-	ldf.fill	f3=[r31],32
-	ldf.fill	f4=[r32],32
-	;;
-	ldf.fill	f5=[r31],32
-	ldf.fill	f16=[r32],32
-	;;
-	ldf.fill	f17=[r31],32
-	ldf.fill	f18=[r32],32
-	;;
-	ldf.fill	f19=[r31],32
-	ldf.fill	f20=[r32],32
-	;;
-	ldf.fill	f21=[r31],32
-	ldf.fill	f22=[r32],32
-	;;
-	ldf.fill	f23=[r31],32
-	ldf.fill	f24=[r32],32
-	;;
-	ldf.fill	f25=[r31],32
-	ldf.fill	f26=[r32],32
-	;;
-	ldf.fill	f27=[r31],32
-	ldf.fill	f28=[r32],32
-	;;
-	ldf.fill	f29=[r31],32
-	ldf.fill	f30=[r32]
-	;;
-	ldf.fill	f31=[r31]
-	br.ret.sptk	rp
-	;;
-END(restore_callee_saved_fp)
-
-/*
- * save_high_fp(struct _high_fp *)
- */
-ENTRY(save_high_fp, 1)
-	rsm		psr.dfh
-	;;
-	srlz.d
-	add		r31=16,r32
-	stf.spill	[r32]=f32,32
-	;;
-	stf.spill	[r31]=f33,32
-	stf.spill	[r32]=f34,32
-	;;
-	stf.spill	[r31]=f35,32
-	stf.spill	[r32]=f36,32
-	;;
-	stf.spill	[r31]=f37,32
-	stf.spill	[r32]=f38,32
-	;;
-	stf.spill	[r31]=f39,32
-	stf.spill	[r32]=f40,32
-	;;
-	stf.spill	[r31]=f41,32
-	stf.spill	[r32]=f42,32
-	;;
-	stf.spill	[r31]=f43,32
-	stf.spill	[r32]=f44,32
-	;;
-	stf.spill	[r31]=f45,32
-	stf.spill	[r32]=f46,32
-	;;
-	stf.spill	[r31]=f47,32
-	stf.spill	[r32]=f48,32
-	;;
-	stf.spill	[r31]=f49,32
-	stf.spill	[r32]=f50,32
-	;;
-	stf.spill	[r31]=f51,32
-	stf.spill	[r32]=f52,32
-	;;
-	stf.spill	[r31]=f53,32
-	stf.spill	[r32]=f54,32
-	;;
-	stf.spill	[r31]=f55,32
-	stf.spill	[r32]=f56,32
-	;;
-	stf.spill	[r31]=f57,32
-	stf.spill	[r32]=f58,32
-	;;
-	stf.spill	[r31]=f59,32
-	stf.spill	[r32]=f60,32
-	;;
-	stf.spill	[r31]=f61,32
-	stf.spill	[r32]=f62,32
-	;;
-	stf.spill	[r31]=f63,32
-	stf.spill	[r32]=f64,32
-	;;
-	stf.spill	[r31]=f65,32
-	stf.spill	[r32]=f66,32
-	;;
-	stf.spill	[r31]=f67,32
-	stf.spill	[r32]=f68,32
-	;;
-	stf.spill	[r31]=f69,32
-	stf.spill	[r32]=f70,32
-	;;
-	stf.spill	[r31]=f71,32
-	stf.spill	[r32]=f72,32
-	;;
-	stf.spill	[r31]=f73,32
-	stf.spill	[r32]=f74,32
-	;;
-	stf.spill	[r31]=f75,32
-	stf.spill	[r32]=f76,32
-	;;
-	stf.spill	[r31]=f77,32
-	stf.spill	[r32]=f78,32
-	;;
-	stf.spill	[r31]=f79,32
-	stf.spill	[r32]=f80,32
-	;;
-	stf.spill	[r31]=f81,32
-	stf.spill	[r32]=f82,32
-	;;
-	stf.spill	[r31]=f83,32
-	stf.spill	[r32]=f84,32
-	;;
-	stf.spill	[r31]=f85,32
-	stf.spill	[r32]=f86,32
-	;;
-	stf.spill	[r31]=f87,32
-	stf.spill	[r32]=f88,32
-	;;
-	stf.spill	[r31]=f89,32
-	stf.spill	[r32]=f90,32
-	;;
-	stf.spill	[r31]=f91,32
-	stf.spill	[r32]=f92,32
-	;;
-	stf.spill	[r31]=f93,32
-	stf.spill	[r32]=f94,32
-	;;
-	stf.spill	[r31]=f95,32
-	stf.spill	[r32]=f96,32
-	;;
-	stf.spill	[r31]=f97,32
-	stf.spill	[r32]=f98,32
-	;;
-	stf.spill	[r31]=f99,32
-	stf.spill	[r32]=f100,32
-	;;
-	stf.spill	[r31]=f101,32
-	stf.spill	[r32]=f102,32
-	;;
-	stf.spill	[r31]=f103,32
-	stf.spill	[r32]=f104,32
-	;;
-	stf.spill	[r31]=f105,32
-	stf.spill	[r32]=f106,32
-	;;
-	stf.spill	[r31]=f107,32
-	stf.spill	[r32]=f108,32
-	;;
-	stf.spill	[r31]=f109,32
-	stf.spill	[r32]=f110,32
-	;;
-	stf.spill	[r31]=f111,32
-	stf.spill	[r32]=f112,32
-	;;
-	stf.spill	[r31]=f113,32
-	stf.spill	[r32]=f114,32
-	;;
-	stf.spill	[r31]=f115,32
-	stf.spill	[r32]=f116,32
-	;;
-	stf.spill	[r31]=f117,32
-	stf.spill	[r32]=f118,32
-	;;
-	stf.spill	[r31]=f119,32
-	stf.spill	[r32]=f120,32
-	;;
-	stf.spill	[r31]=f121,32
-	stf.spill	[r32]=f122,32
-	;;
-	stf.spill	[r31]=f123,32
-	stf.spill	[r32]=f124,32
-	;;
-	stf.spill	[r31]=f125,32
-	stf.spill	[r32]=f126
-	;;
-	stf.spill	[r31]=f127
-	ssm		psr.dfh
-	;;
-	srlz.d
-	br.ret.sptk	rp
-	;;
-END(save_high_fp)
-
-/*
- * restore_high_fp(struct _high_fp *)
- */
-ENTRY(restore_high_fp, 1)
-	rsm		psr.dfh
-	;;
-	srlz.d
-	add		r31=16,r32
-	ldf.fill	f32=[r32],32
-	;;
-	ldf.fill	f33=[r31],32
-	ldf.fill	f34=[r32],32	
-	;;
-	ldf.fill	f35=[r31],32
-	ldf.fill	f36=[r32],32
-	;;
-	ldf.fill	f37=[r31],32
-	ldf.fill	f38=[r32],32
-	;;
-	ldf.fill	f39=[r31],32
-	ldf.fill	f40=[r32],32
-	;;
-	ldf.fill	f41=[r31],32
-	ldf.fill	f42=[r32],32
-	;;
-	ldf.fill	f43=[r31],32
-	ldf.fill	f44=[r32],32
-	;;
-	ldf.fill	f45=[r31],32
-	ldf.fill	f46=[r32],32
-	;;
-	ldf.fill	f47=[r31],32
-	ldf.fill	f48=[r32],32
-	;;
-	ldf.fill	f49=[r31],32
-	ldf.fill	f50=[r32],32
-	;;
-	ldf.fill	f51=[r31],32
-	ldf.fill	f52=[r32],32
-	;;
-	ldf.fill	f53=[r31],32
-	ldf.fill	f54=[r32],32
-	;;
-	ldf.fill	f55=[r31],32
-	ldf.fill	f56=[r32],32
-	;;
-	ldf.fill	f57=[r31],32
-	ldf.fill	f58=[r32],32
-	;;
-	ldf.fill	f59=[r31],32
-	ldf.fill	f60=[r32],32
-	;;
-	ldf.fill	f61=[r31],32
-	ldf.fill	f62=[r32],32
-	;;
-	ldf.fill	f63=[r31],32
-	ldf.fill	f64=[r32],32
-	;;
-	ldf.fill	f65=[r31],32
-	ldf.fill	f66=[r32],32
-	;;
-	ldf.fill	f67=[r31],32
-	ldf.fill	f68=[r32],32
-	;;
-	ldf.fill	f69=[r31],32
-	ldf.fill	f70=[r32],32
-	;;
-	ldf.fill	f71=[r31],32
-	ldf.fill	f72=[r32],32
-	;;
-	ldf.fill	f73=[r31],32
-	ldf.fill	f74=[r32],32
-	;;
-	ldf.fill	f75=[r31],32
-	ldf.fill	f76=[r32],32
-	;;
-	ldf.fill	f77=[r31],32
-	ldf.fill	f78=[r32],32
-	;;
-	ldf.fill	f79=[r31],32
-	ldf.fill	f80=[r32],32
-	;;
-	ldf.fill	f81=[r31],32
-	ldf.fill	f82=[r32],32
-	;;
-	ldf.fill	f83=[r31],32
-	ldf.fill	f84=[r32],32
-	;;
-	ldf.fill	f85=[r31],32
-	ldf.fill	f86=[r32],32
-	;;
-	ldf.fill	f87=[r31],32
-	ldf.fill	f88=[r32],32
-	;;
-	ldf.fill	f89=[r31],32
-	ldf.fill	f90=[r32],32
-	;;
-	ldf.fill	f91=[r31],32
-	ldf.fill	f92=[r32],32
-	;;
-	ldf.fill	f93=[r31],32
-	ldf.fill	f94=[r32],32
-	;;
-	ldf.fill	f95=[r31],32
-	ldf.fill	f96=[r32],32
-	;;
-	ldf.fill	f97=[r31],32
-	ldf.fill	f98=[r32],32
-	;;
-	ldf.fill	f99=[r31],32
-	ldf.fill	f100=[r32],32
-	;;
-	ldf.fill	f101=[r31],32
-	ldf.fill	f102=[r32],32
-	;;
-	ldf.fill	f103=[r31],32
-	ldf.fill	f104=[r32],32
-	;;
-	ldf.fill	f105=[r31],32
-	ldf.fill	f106=[r32],32
-	;;
-	ldf.fill	f107=[r31],32
-	ldf.fill	f108=[r32],32
-	;;
-	ldf.fill	f109=[r31],32
-	ldf.fill	f110=[r32],32
-	;;
-	ldf.fill	f111=[r31],32
-	ldf.fill	f112=[r32],32
-	;;
-	ldf.fill	f113=[r31],32
-	ldf.fill	f114=[r32],32
-	;;
-	ldf.fill	f115=[r31],32
-	ldf.fill	f116=[r32],32
-	;;
-	ldf.fill	f117=[r31],32
-	ldf.fill	f118=[r32],32
-	;;
-	ldf.fill	f119=[r31],32
-	ldf.fill	f120=[r32],32
-	;;
-	ldf.fill	f121=[r31],32
-	ldf.fill	f122=[r32],32
-	;;
-	ldf.fill	f123=[r31],32
-	ldf.fill	f124=[r32],32
-	;;
-	ldf.fill	f125=[r31],32
-	ldf.fill	f126=[r32]
-	;;
-	ldf.fill	f127=[r31]
-	ssm		psr.dfh
-	;;
-	srlz.d
-	br.ret.sptk	rp
-	;;
-END(restore_high_fp)
diff --git a/sys/ia64/ia64/db_machdep.c b/sys/ia64/ia64/db_machdep.c
deleted file mode 100644
index 3befbd83d469..000000000000
--- a/sys/ia64/ia64/db_machdep.c
+++ /dev/null
@@ -1,610 +0,0 @@
-/*-
- * Copyright (c) 2003-2005 Marcel Moolenaar
- * Copyright (c) 2000-2001 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.
- */
-
-#include "opt_xtrace.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/cons.h>
-#include <sys/kdb.h>
-#include <sys/ktr.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/reboot.h>
-#include <sys/smp.h>
-#include <sys/stack.h>
-
-#include <vm/vm.h>
-
-#include <machine/db_machdep.h>
-#include <machine/frame.h>
-#include <machine/kdb.h>
-#include <machine/md_var.h>
-#include <machine/pcb.h>
-#include <machine/setjmp.h>
-#include <machine/unwind.h>
-#include <machine/vmparam.h>
-
-#include <ddb/ddb.h>
-#include <ddb/db_access.h>
-#include <ddb/db_output.h>
-#include <ddb/db_sym.h>
-#include <ddb/db_variables.h>
-
-#include <ia64/disasm/disasm.h>
-
-#define	TMPL_BITS	5
-#define	TMPL_MASK	((1 << TMPL_BITS) - 1)
-#define	SLOT_BITS	41
-#define	SLOT_COUNT	3
-#define	SLOT_MASK	((1ULL << SLOT_BITS) - 1ULL)
-#define	SLOT_SHIFT(i)	(TMPL_BITS+((i)<<3)+(i))
-
-typedef db_expr_t __db_f(db_expr_t, db_expr_t, db_expr_t, db_expr_t, db_expr_t,
-    db_expr_t, db_expr_t, db_expr_t);
-
-register uint64_t __db_gp __asm__("gp");
-
-static db_varfcn_t db_frame;
-static db_varfcn_t db_getip;
-static db_varfcn_t db_getrse;
-
-#define	DB_OFFSET(x)	(db_expr_t *)offsetof(struct trapframe, x)
-struct db_variable db_regs[] = {
-	{"ip",		NULL,				db_getip},
-	{"cr.ifs",	DB_OFFSET(tf_special.cfm),	db_frame},
-	{"cr.ifa",	DB_OFFSET(tf_special.ifa),	db_frame},
-	{"ar.bspstore",	DB_OFFSET(tf_special.bspstore),	db_frame},
-	{"ndirty",	DB_OFFSET(tf_special.ndirty),	db_frame},
-	{"rp",		DB_OFFSET(tf_special.rp),	db_frame},
-	{"ar.pfs",	DB_OFFSET(tf_special.pfs),	db_frame},
-	{"psr",		DB_OFFSET(tf_special.psr),	db_frame},
-	{"cr.isr",	DB_OFFSET(tf_special.isr),	db_frame},
-	{"pr",		DB_OFFSET(tf_special.pr),	db_frame},
-	{"ar.rsc",	DB_OFFSET(tf_special.rsc),	db_frame},
-	{"ar.rnat",	DB_OFFSET(tf_special.rnat),	db_frame},
-	{"ar.unat",	DB_OFFSET(tf_special.unat),	db_frame},
-	{"ar.fpsr",	DB_OFFSET(tf_special.fpsr),	db_frame},
-	{"gp",		DB_OFFSET(tf_special.gp),	db_frame},
-	{"sp",		DB_OFFSET(tf_special.sp),	db_frame},
-	{"tp",		DB_OFFSET(tf_special.tp),	db_frame},
-	{"b6",		DB_OFFSET(tf_scratch.br6),	db_frame},
-	{"b7",		DB_OFFSET(tf_scratch.br7),	db_frame},
-	{"r2",		DB_OFFSET(tf_scratch.gr2),	db_frame},
-	{"r3",		DB_OFFSET(tf_scratch.gr3),	db_frame},
-	{"r8",		DB_OFFSET(tf_scratch.gr8),	db_frame},
-	{"r9",		DB_OFFSET(tf_scratch.gr9),	db_frame},
-	{"r10",		DB_OFFSET(tf_scratch.gr10),	db_frame},
-	{"r11",		DB_OFFSET(tf_scratch.gr11),	db_frame},
-	{"r14",		DB_OFFSET(tf_scratch.gr14),	db_frame},
-	{"r15",		DB_OFFSET(tf_scratch.gr15),	db_frame},
-	{"r16",		DB_OFFSET(tf_scratch.gr16),	db_frame},
-	{"r17",		DB_OFFSET(tf_scratch.gr17),	db_frame},
-	{"r18",		DB_OFFSET(tf_scratch.gr18),	db_frame},
-	{"r19",		DB_OFFSET(tf_scratch.gr19),	db_frame},
-	{"r20",		DB_OFFSET(tf_scratch.gr20),	db_frame},
-	{"r21",		DB_OFFSET(tf_scratch.gr21),	db_frame},
-	{"r22",		DB_OFFSET(tf_scratch.gr22),	db_frame},
-	{"r23",		DB_OFFSET(tf_scratch.gr23),	db_frame},
-	{"r24",		DB_OFFSET(tf_scratch.gr24),	db_frame},
-	{"r25",		DB_OFFSET(tf_scratch.gr25),	db_frame},
-	{"r26",		DB_OFFSET(tf_scratch.gr26),	db_frame},
-	{"r27",		DB_OFFSET(tf_scratch.gr27),	db_frame},
-	{"r28",		DB_OFFSET(tf_scratch.gr28),	db_frame},
-	{"r29",		DB_OFFSET(tf_scratch.gr29),	db_frame},
-	{"r30",		DB_OFFSET(tf_scratch.gr30),	db_frame},
-	{"r31",		DB_OFFSET(tf_scratch.gr31),	db_frame},
-	{"r32",		(db_expr_t*)0,			db_getrse},
-	{"r33",		(db_expr_t*)1,			db_getrse},
-	{"r34",		(db_expr_t*)2,			db_getrse},
-	{"r35",		(db_expr_t*)3,			db_getrse},
-	{"r36",		(db_expr_t*)4,			db_getrse},
-	{"r37",		(db_expr_t*)5,			db_getrse},
-	{"r38",		(db_expr_t*)6,			db_getrse},
-	{"r39",		(db_expr_t*)7,			db_getrse},
-	{"r40",		(db_expr_t*)8,			db_getrse},
-	{"r41",		(db_expr_t*)9,			db_getrse},
-	{"r42",		(db_expr_t*)10,			db_getrse},
-	{"r43",		(db_expr_t*)11,			db_getrse},
-	{"r44",		(db_expr_t*)12,			db_getrse},
-	{"r45",		(db_expr_t*)13,			db_getrse},
-	{"r46",		(db_expr_t*)14,			db_getrse},
-	{"r47",		(db_expr_t*)15,			db_getrse},
-	{"r48",		(db_expr_t*)16,			db_getrse},
-	{"r49",		(db_expr_t*)17,			db_getrse},
-	{"r50",		(db_expr_t*)18,			db_getrse},
-	{"r51",		(db_expr_t*)19,			db_getrse},
-	{"r52",		(db_expr_t*)20,			db_getrse},
-	{"r53",		(db_expr_t*)21,			db_getrse},
-	{"r54",		(db_expr_t*)22,			db_getrse},
-	{"r55",		(db_expr_t*)23,			db_getrse},
-	{"r56",		(db_expr_t*)24,			db_getrse},
-	{"r57",		(db_expr_t*)25,			db_getrse},
-	{"r58",		(db_expr_t*)26,			db_getrse},
-	{"r59",		(db_expr_t*)27,			db_getrse},
-	{"r60",		(db_expr_t*)28,			db_getrse},
-	{"r61",		(db_expr_t*)29,			db_getrse},
-	{"r62",		(db_expr_t*)30,			db_getrse},
-	{"r63",		(db_expr_t*)31,			db_getrse},
-	{"r64",		(db_expr_t*)32,			db_getrse},
-	{"r65",		(db_expr_t*)33,			db_getrse},
-	{"r66",		(db_expr_t*)34,			db_getrse},
-	{"r67",		(db_expr_t*)35,			db_getrse},
-	{"r68",		(db_expr_t*)36,			db_getrse},
-	{"r69",		(db_expr_t*)37,			db_getrse},
-	{"r70",		(db_expr_t*)38,			db_getrse},
-	{"r71",		(db_expr_t*)39,			db_getrse},
-	{"r72",		(db_expr_t*)40,			db_getrse},
-	{"r73",		(db_expr_t*)41,			db_getrse},
-	{"r74",		(db_expr_t*)42,			db_getrse},
-	{"r75",		(db_expr_t*)43,			db_getrse},
-	{"r76",		(db_expr_t*)44,			db_getrse},
-	{"r77",		(db_expr_t*)45,			db_getrse},
-	{"r78",		(db_expr_t*)46,			db_getrse},
-	{"r79",		(db_expr_t*)47,			db_getrse},
-	{"r80",		(db_expr_t*)48,			db_getrse},
-	{"r81",		(db_expr_t*)49,			db_getrse},
-	{"r82",		(db_expr_t*)50,			db_getrse},
-	{"r83",		(db_expr_t*)51,			db_getrse},
-	{"r84",		(db_expr_t*)52,			db_getrse},
-	{"r85",		(db_expr_t*)53,			db_getrse},
-	{"r86",		(db_expr_t*)54,			db_getrse},
-	{"r87",		(db_expr_t*)55,			db_getrse},
-	{"r88",		(db_expr_t*)56,			db_getrse},
-	{"r89",		(db_expr_t*)57,			db_getrse},
-	{"r90",		(db_expr_t*)58,			db_getrse},
-	{"r91",		(db_expr_t*)59,			db_getrse},
-	{"r92",		(db_expr_t*)60,			db_getrse},
-	{"r93",		(db_expr_t*)61,			db_getrse},
-	{"r94",		(db_expr_t*)62,			db_getrse},
-	{"r95",		(db_expr_t*)63,			db_getrse},
-	{"r96",		(db_expr_t*)64,			db_getrse},
-	{"r97",		(db_expr_t*)65,			db_getrse},
-	{"r98",		(db_expr_t*)66,			db_getrse},
-	{"r99",		(db_expr_t*)67,			db_getrse},
-	{"r100",	(db_expr_t*)68,			db_getrse},
-	{"r101",	(db_expr_t*)69,			db_getrse},
-	{"r102",	(db_expr_t*)70,			db_getrse},
-	{"r103",	(db_expr_t*)71,			db_getrse},
-	{"r104",	(db_expr_t*)72,			db_getrse},
-	{"r105",	(db_expr_t*)73,			db_getrse},
-	{"r106",	(db_expr_t*)74,			db_getrse},
-	{"r107",	(db_expr_t*)75,			db_getrse},
-	{"r108",	(db_expr_t*)76,			db_getrse},
-	{"r109",	(db_expr_t*)77,			db_getrse},
-	{"r110",	(db_expr_t*)78,			db_getrse},
-	{"r111",	(db_expr_t*)79,			db_getrse},
-	{"r112",	(db_expr_t*)80,			db_getrse},
-	{"r113",	(db_expr_t*)81,			db_getrse},
-	{"r114",	(db_expr_t*)82,			db_getrse},
-	{"r115",	(db_expr_t*)83,			db_getrse},
-	{"r116",	(db_expr_t*)84,			db_getrse},
-	{"r117",	(db_expr_t*)85,			db_getrse},
-	{"r118",	(db_expr_t*)86,			db_getrse},
-	{"r119",	(db_expr_t*)87,			db_getrse},
-	{"r120",	(db_expr_t*)88,			db_getrse},
-	{"r121",	(db_expr_t*)89,			db_getrse},
-	{"r122",	(db_expr_t*)90,			db_getrse},
-	{"r123",	(db_expr_t*)91,			db_getrse},
-	{"r124",	(db_expr_t*)92,			db_getrse},
-	{"r125",	(db_expr_t*)93,			db_getrse},
-	{"r126",	(db_expr_t*)94,			db_getrse},
-	{"r127",	(db_expr_t*)95,			db_getrse},
-};
-struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
-
-static int
-db_backtrace(struct thread *td, struct pcb *pcb, int count)
-{
-	struct unw_regstate rs;
-	struct trapframe *tf;
-	const char *name;
-	db_expr_t offset;
-	uint64_t bsp, cfm, ip, pfs, reg, sp;
-	c_db_sym_t sym;
-	int args, error, i;
-
-	error = unw_create_from_pcb(&rs, pcb);
-	while (!error && count-- && !db_pager_quit) {
-		error = unw_get_cfm(&rs, &cfm);
-		if (!error)
-			error = unw_get_bsp(&rs, &bsp);
-		if (!error)
-			error = unw_get_ip(&rs, &ip);
-		if (!error)
-			error = unw_get_sp(&rs, &sp);
-		if (error)
-			break;
-
-		args = IA64_CFM_SOL(cfm);
-		if (args > 8)
-			args = 8;
-
-		error = unw_step(&rs);
-		if (!error) {
-			if (!unw_get_cfm(&rs, &pfs)) {
-				i = IA64_CFM_SOF(pfs) - IA64_CFM_SOL(pfs);
-				if (args > i)
-					args = i;
-			}
-		}
-
-		sym = db_search_symbol(ip, DB_STGY_ANY, &offset);
-		db_symbol_values(sym, &name, NULL);
-		db_printf("%s(", name);
-		if (bsp >= VM_MAXUSER_ADDRESS) {
-			for (i = 0; i < args; i++) {
-				if ((bsp & 0x1ff) == 0x1f8)
-					bsp += 8;
-				db_read_bytes(bsp, sizeof(reg), (void*)&reg);
-				if (i > 0)
-					db_printf(", ");
-				db_printf("0x%lx", reg);
-				bsp += 8;
-			}
-		} else
-			db_printf("...");
-		db_printf(") at ");
-
-		db_printsym(ip, DB_STGY_PROC);
-		db_printf("\n");
-
-		if (error != ERESTART)
-			continue;
-		if (sp < VM_MAXUSER_ADDRESS)
-			break;
-
-		tf = (struct trapframe *)(sp + 16);
-		if ((tf->tf_flags & FRAME_SYSCALL) != 0 ||
-		    tf->tf_special.iip < VM_MAXUSER_ADDRESS)
-			break;
-
-		/* XXX ask if we should unwind across the trapframe. */
-		db_printf("--- trapframe at %p\n", tf);
-		unw_delete(&rs);
-		error = unw_create_from_frame(&rs, tf);
-	}
-
-	unw_delete(&rs);
-	/*
-	 * EJUSTRETURN and ERESTART signal the end of a trace and
-	 * are not really errors.
-	 */
-	return ((error > 0) ? error : 0);
-}
-
-void
-db_bkpt_clear(db_addr_t addr, BKPT_INST_TYPE *storage)
-{
-	BKPT_INST_TYPE tmp;
-	db_addr_t loc;
-	int slot;
-
-	slot = addr & 0xfUL;
-	if (slot >= SLOT_COUNT)
-		return;
-	loc = (addr & ~0xfUL) + (slot << 2);
-
-	db_read_bytes(loc, sizeof(BKPT_INST_TYPE), (char *)&tmp);
-	tmp &= ~(SLOT_MASK << SLOT_SHIFT(slot));
-	tmp |= *storage << SLOT_SHIFT(slot);
-	db_write_bytes(loc, sizeof(BKPT_INST_TYPE), (char *)&tmp);
-}
-
-void
-db_bkpt_skip(void)
-{
-
-	if (kdb_frame == NULL)
-		return;
-
-	kdb_frame->tf_special.psr += IA64_PSR_RI_1;
-	if ((kdb_frame->tf_special.psr & IA64_PSR_RI) > IA64_PSR_RI_2) {
-		kdb_frame->tf_special.psr &= ~IA64_PSR_RI;
-		kdb_frame->tf_special.iip += 16;
-	}
-}
-
-void
-db_bkpt_write(db_addr_t addr, BKPT_INST_TYPE *storage)
-{
-	BKPT_INST_TYPE tmp;
-	db_addr_t loc;
-	int slot;
-
-	slot = addr & 0xfUL;
-	if (slot >= SLOT_COUNT)
-		return;
-	loc = (addr & ~0xfUL) + (slot << 2);
-
-	db_read_bytes(loc, sizeof(BKPT_INST_TYPE), (char *)&tmp);
-	*storage = (tmp >> SLOT_SHIFT(slot)) & SLOT_MASK;
-
-	tmp &= ~(SLOT_MASK << SLOT_SHIFT(slot));
-	tmp |= (0x84000 << 6) << SLOT_SHIFT(slot);
-	db_write_bytes(loc, sizeof(BKPT_INST_TYPE), (char *)&tmp);
-}
-
-db_addr_t
-db_disasm(db_addr_t loc, boolean_t altfmt)
-{
-	char buf[32];
-	struct asm_bundle bundle;
-	const struct asm_inst *i;
-	const char *tmpl;
-	int n, slot;
-
-	slot = loc & 0xf;
-	loc &= ~0xful;
-	db_read_bytes(loc, 16, buf);
-	if (asm_decode((uintptr_t)buf, &bundle)) {
-		i = bundle.b_inst + slot;
-		tmpl = bundle.b_templ + slot;
-		if (*tmpl == ';' || (slot == 2 && bundle.b_templ[1] == ';'))
-			tmpl++;
-		if (*tmpl == 'L' || i->i_op == ASM_OP_NONE) {
-			db_printf("\n");
-			goto out;
-		}
-
-		/* Unit + slot. */
-		db_printf("[%c%d] ", *tmpl, slot);
-
-		/* Predicate. */
-		if (i->i_oper[0].o_value != 0) {
-			asm_operand(i->i_oper+0, buf, loc);
-			db_printf("(%s) ", buf);
-		} else
-			db_printf("   ");
-
-		/* Mnemonic & completers. */
-		asm_mnemonic(i->i_op, buf);
-		db_printf(buf);
-		n = 0;
-		while (n < i->i_ncmpltrs) {
-			asm_completer(i->i_cmpltr + n, buf);
-			db_printf(buf);
-			n++;
-		}
-		db_printf(" ");
-
-		/* Operands. */
-		n = 1;
-		while (n < 7 && i->i_oper[n].o_type != ASM_OPER_NONE) {
-			if (n > 1) {
-				if (n == i->i_srcidx)
-					db_printf("=");
-				else
-					db_printf(",");
-			}
-			asm_operand(i->i_oper + n, buf, loc);
-			db_printf(buf);
-			n++;
-		}
-		if (tmpl[1] == ';')
-			db_printf(" ;;");
-	} else {
-		tmpl = NULL;
-		slot = 2;
-	}
-	db_printf("\n");
-
-out:
-	slot++;
-	if (slot == 1 && tmpl[1] == 'L')
-		slot++;
-	if (slot > 2)
-		slot = 16;
-	return (loc + slot);
-}
-
-int
-db_fncall_ia64(db_expr_t addr, db_expr_t *rv, int nargs, db_expr_t args[])
-{
-	struct ia64_fdesc fdesc;
-	__db_f *f;
-
-	f = (__db_f *)&fdesc;
-	fdesc.func = addr;
-	fdesc.gp = __db_gp;	/* XXX doesn't work for modules. */
-	*rv = (*f)(args[0], args[1], args[2], args[3], args[4], args[5],
-	    args[6], args[7]);
-	return (1);
-}
-
-static int
-db_frame(struct db_variable *vp, db_expr_t *valuep, int op)
-{
-	uint64_t *reg;
-
-	if (kdb_frame == NULL)
-		return (0);
-	reg = (uint64_t*)((uintptr_t)kdb_frame + (uintptr_t)vp->valuep);
-	if (op == DB_VAR_GET)
-		*valuep = *reg;
-	else
-		*reg = *valuep;
-	return (1);
-}
-
-static int
-db_getip(struct db_variable *vp, db_expr_t *valuep, int op)
-{
-	u_long iip, slot;
-
-	if (kdb_frame == NULL)
-		return (0);
-
-	if (op == DB_VAR_GET) {
-		iip = kdb_frame->tf_special.iip;
-		slot = (kdb_frame->tf_special.psr >> 41) & 3;
-		*valuep = iip + slot;
-	} else {
-		iip = *valuep & ~0xf;
-		slot = *valuep & 0xf;
-		if (slot > 2)
-			return (0);
-		kdb_frame->tf_special.iip = iip;
-		kdb_frame->tf_special.psr &= ~IA64_PSR_RI;
-		kdb_frame->tf_special.psr |= slot << 41;
-	}
-	return (1);
-}
-
-static int
-db_getrse(struct db_variable *vp, db_expr_t *valuep, int op)
-{
-	u_int64_t *reg;
-	uint64_t bsp;
-	int nats, regno, sof;
-
-	if (kdb_frame == NULL)
-		return (0);
-
-	regno = (int)(intptr_t)valuep;
-	bsp = kdb_frame->tf_special.bspstore + kdb_frame->tf_special.ndirty;
-	sof = (int)(kdb_frame->tf_special.cfm & 0x7f);
-
-	if (regno >= sof)
-		return (0);
-
-	nats = (sof - regno + 63 - ((int)(bsp >> 3) & 0x3f)) / 63;
-	reg = (void*)(bsp - ((sof - regno + nats) << 3));
-	if (op == DB_VAR_GET)
-		*valuep = *reg;
-	else
-		*reg = *valuep;
-	return (1);
-}
-
-int
-db_md_clr_watchpoint(db_expr_t addr, db_expr_t size)
-{
-
-	return (-1);
-}
-
-void
-db_md_list_watchpoints()
-{
-
-	return;
-}
-
-int
-db_md_set_watchpoint(db_expr_t addr, db_expr_t size)
-{
-
-	return (-1);
-}
-
-/*
- * Read bytes from kernel address space for debugger.
- */
-int
-db_read_bytes(vm_offset_t addr, size_t size, char *data)
-{
-	jmp_buf jb;
-	void *prev_jb;
-	char *src;
-	int ret;
-
-	prev_jb = kdb_jmpbuf(jb);
-	ret = setjmp(jb);
-	if (ret == 0) {
-		src = (char *)addr;
-		while (size-- > 0)
-			*data++ = *src++;
-	}
-	(void)kdb_jmpbuf(prev_jb);
-	return (ret);
-}
-
-/*
- * Write bytes to kernel address space for debugger.
- */
-int
-db_write_bytes(vm_offset_t addr, size_t size, char *data)
-{
-	jmp_buf jb;
-	void *prev_jb;
-	size_t cnt;
-	char *dst;
-	int ret;
-
-	prev_jb = kdb_jmpbuf(jb);
-	ret = setjmp(jb);
-	if (ret == 0) {
-		dst = (char *)addr;
-		cnt = size;
-		while (cnt-- > 0)
-			*dst++ = *data++;
-		kdb_cpu_sync_icache((void *)addr, size);
-	}
-	(void)kdb_jmpbuf(prev_jb);
-	return (ret);
-}
-
-void
-db_show_mdpcpu(struct pcpu *pc)
-{
-	struct pcpu_md *md = &pc->pc_md;
-
-	db_printf("MD: vhpt       = %#lx\n", md->vhpt);
-	db_printf("MD: lid        = %#lx\n", md->lid);
-	db_printf("MD: clock      = %#lx\n", md->clock);
-	db_printf("MD: clock_mode = %u\n", md->clock_mode);
-	db_printf("MD: clock_load = %#lx\n", md->clock_load);
-	db_printf("MD: stats      = %p\n", &md->stats);
-	db_printf("MD: pmap       = %p\n", md->current_pmap);
-#ifdef XTRACE
-	db_printf("MD: xtrace_buffer = %p\n", md->xtrace_buffer);
-	db_printf("MD: xtrace_tail   = %#lx\n", md->xtrace_tail);
-#endif
-}
-
-void
-db_trace_self(void)
-{
-	struct pcb pcb;
-
-	savectx(&pcb);
-	db_backtrace(curthread, &pcb, -1);
-}
-
-int
-db_trace_thread(struct thread *td, int count)
-{
-	struct pcb *ctx;
-
-	ctx = kdb_thr_ctx(td);
-	return (db_backtrace(td, ctx, count));
-}
diff --git a/sys/ia64/ia64/dump_machdep.c b/sys/ia64/ia64/dump_machdep.c
deleted file mode 100644
index 9a058bb1f4ba..000000000000
--- a/sys/ia64/ia64/dump_machdep.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/*-
- * Copyright (c) 2002 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "opt_watchdog.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/cons.h>
-#include <sys/efi.h>
-#include <sys/kernel.h>
-#include <sys/kerneldump.h>
-#ifdef SW_WATCHDOG
-#include <sys/watchdog.h>
-#endif
-#include <vm/vm.h>
-#include <vm/pmap.h>
-#include <machine/bootinfo.h>
-#include <machine/elf.h>
-#include <machine/md_var.h>
-
-CTASSERT(sizeof(struct kerneldumpheader) == 512);
-
-/*
- * Don't touch the first SIZEOF_METADATA bytes on the dump device. This
- * is to protect us from metadata and to protect metadata from us.
- */
-#define	SIZEOF_METADATA		(64*1024)
-
-#define	MD_ALIGN(x)	(((off_t)(x) + EFI_PAGE_MASK) & ~EFI_PAGE_MASK)
-#define	DEV_ALIGN(x)	(((off_t)(x) + (DEV_BSIZE-1)) & ~(DEV_BSIZE-1))
-
-static int minidump = 0;
-TUNABLE_INT("debug.minidump", &minidump);
-SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RW, &minidump, 0,
-    "Enable mini crash dumps");
-
-static struct kerneldumpheader kdh;
-static off_t dumplo, fileofs;
-
-/* Handle buffered writes. */
-static char buffer[DEV_BSIZE];
-static size_t fragsz;
-
-static int
-buf_write(struct dumperinfo *di, char *ptr, size_t sz)
-{
-	size_t len;
-	int error;
-
-	while (sz) {
-		len = DEV_BSIZE - fragsz;
-		if (len > sz)
-			len = sz;
-		bcopy(ptr, buffer + fragsz, len);
-		fragsz += len;
-		ptr += len;
-		sz -= len;
-		if (fragsz == DEV_BSIZE) {
-			error = dump_write(di, buffer, 0, dumplo,
-			    DEV_BSIZE);
-			if (error)
-				return (error);
-			dumplo += DEV_BSIZE;
-			fragsz = 0;
-		}
-	}
-
-	return (0);
-}
-
-static int
-buf_flush(struct dumperinfo *di)
-{
-	int error;
-
-	if (fragsz == 0)
-		return (0);
-
-	error = dump_write(di, buffer, 0, dumplo, DEV_BSIZE);
-	dumplo += DEV_BSIZE;
-	fragsz = 0;
-	return (error);
-}
-
-/*
- * Physical dump support
- */
-
-typedef int phys_callback_t(struct efi_md*, int, void*);
-
-static int
-phys_cb_dumpdata(struct efi_md *mdp, int seqnr, void *arg)
-{
-	struct dumperinfo *di = (struct dumperinfo*)arg;
-	vm_offset_t pa;
-	uint64_t pgs;
-	size_t counter, sz;
-	int c, error, twiddle;
-
-	error = 0;	/* catch case in which mdp->md_pages is 0 */
-	counter = 0;	/* Update twiddle every 16MB */
-	twiddle = 0;
-	pgs = mdp->md_pages;
-	pa = IA64_PHYS_TO_RR7(mdp->md_phys);
-
-	printf("  chunk %d: %ld pages ", seqnr, (long)pgs);
-
-	while (pgs) {
-		sz = (pgs > (DFLTPHYS >> EFI_PAGE_SHIFT))
-		    ? DFLTPHYS : pgs << EFI_PAGE_SHIFT;
-		counter += sz;
-		if (counter >> 24) {
-			printf("%c\b", "|/-\\"[twiddle++ & 3]);
-			counter &= (1<<24) - 1;
-		}
-#ifdef SW_WATCHDOG
-		wdog_kern_pat(WD_LASTVAL);
-#endif
-		error = dump_write(di, (void*)pa, 0, dumplo, sz);
-		if (error)
-			break;
-		dumplo += sz;
-		pgs -= sz >> EFI_PAGE_SHIFT;
-		pa += sz;
-
-		/* Check for user abort. */
-		c = cncheckc();
-		if (c == 0x03)
-			return (ECANCELED);
-		if (c != -1)
-			printf("(CTRL-C to abort)  ");
-	}
-	printf("... %s\n", (error) ? "fail" : "ok");
-	return (error);
-}
-
-static int
-phys_cb_dumphdr(struct efi_md *mdp, int seqnr, void *arg)
-{
-	struct dumperinfo *di = (struct dumperinfo*)arg;
-	Elf64_Phdr phdr;
-	int error;
-
-	bzero(&phdr, sizeof(phdr));
-	phdr.p_type = PT_LOAD;
-	phdr.p_flags = PF_R;			/* XXX */
-	phdr.p_offset = fileofs;
-	phdr.p_vaddr = (uintptr_t)mdp->md_virt;	/* XXX probably bogus. */
-	phdr.p_paddr = mdp->md_phys;
-	phdr.p_filesz = mdp->md_pages << EFI_PAGE_SHIFT;
-	phdr.p_memsz = mdp->md_pages << EFI_PAGE_SHIFT;
-	phdr.p_align = EFI_PAGE_SIZE;
-
-	error = buf_write(di, (char*)&phdr, sizeof(phdr));
-	fileofs += phdr.p_filesz;
-	return (error);
-}
-
-static int
-phys_cb_size(struct efi_md *mdp, int seqnr, void *arg)
-{
-	uint64_t *sz = (uint64_t*)arg;
-
-	*sz += (uint64_t)mdp->md_pages << EFI_PAGE_SHIFT;
-	return (0);
-}
-
-static int
-phys_foreach(phys_callback_t cb, void *arg)
-{
-	struct efi_md *mdp;
-	int error, seqnr;
-
-	seqnr = 0;
-	mdp = efi_md_first();
-	while (mdp != NULL) {
-		if (mdp->md_type == EFI_MD_TYPE_FREE ||
-		    mdp->md_type == EFI_MD_TYPE_DATA ||
-		    mdp->md_type == EFI_MD_TYPE_CODE ||
-		    mdp->md_type == EFI_MD_TYPE_BS_DATA ||
-		    mdp->md_type == EFI_MD_TYPE_BS_CODE) {
-			error = (*cb)(mdp, seqnr++, arg);
-			if (error)
-				return (-error);
-		}
-		mdp = efi_md_next(mdp);
-	}
-	return (seqnr);
-}
-
-/*
- * Virtual dump (aka minidump) support
- */
-
-typedef int virt_callback_t(vm_offset_t, vm_size_t, int, void*);
-
-static int
-virt_cb_size(vm_offset_t va, vm_size_t sz, int seqnr, void *arg)
-{
-	uint64_t *dumpsize = (uint64_t *)arg;
-
-	*dumpsize += sz;
-	return (0);
-}
-
-static int
-virt_cb_dumphdr(vm_offset_t va, vm_size_t sz, int seqnr, void *arg)
-{
-	struct dumperinfo *di = (struct dumperinfo *)arg;
-	Elf64_Phdr phdr;
-	int error;
- 
-	bzero(&phdr, sizeof(phdr));
-	phdr.p_type = PT_LOAD;
-	phdr.p_flags = PF_R;			/* XXX */
-	phdr.p_offset = fileofs;
-	phdr.p_vaddr = va;
-	phdr.p_paddr = ~0UL;
-	phdr.p_filesz = sz;
-	phdr.p_memsz = sz;
-	phdr.p_align = PAGE_SIZE;
-
-	error = buf_write(di, (char*)&phdr, sizeof(phdr));
-	fileofs += phdr.p_filesz;
-	return (error);
-}
-
-static int
-virt_cb_dumpdata(vm_offset_t va, vm_size_t sz, int seqnr, void *arg) 
-{
-	struct dumperinfo *di = (struct dumperinfo *)arg;
-	size_t counter, iosz;
-	int c, error, twiddle;
- 
-	error = 0;	/* catch case in which pgs is 0 */
-	counter = 0;	/* Update twiddle every 16MB */
-	twiddle = 0;
-
-	printf("  chunk %d: %ld pages ", seqnr, atop(sz));
-
-	while (sz) {
-		iosz = (sz > DFLTPHYS) ? DFLTPHYS : sz;
-		counter += iosz;
-		if (counter >> 24) {
-			printf("%c\b", "|/-\\"[twiddle++ & 3]);
-			counter &= (1<<24) - 1;
-		}
-#ifdef SW_WATCHDOG
-		wdog_kern_pat(WD_LASTVAL);
-#endif
-		error = dump_write(di, (void*)va, 0, dumplo, iosz);
-		if (error)
-			break;
-		dumplo += iosz;
-		sz -= iosz;
-		va += iosz;
-
-		/* Check for user abort. */
-		c = cncheckc();
-		if (c == 0x03)
-			return (ECANCELED);
-		if (c != -1)
-			printf("(CTRL-C to abort)  ");
-	}
-	printf("... %s\n", (error) ? "fail" : "ok");
-	return (error);
-}
-
-static int
-virt_foreach(virt_callback_t cb, void *arg)
-{
-	vm_offset_t va;
-	vm_size_t sz;
-	int error, seqnr;
-
-	seqnr = 0;
-	while (1) {
-		switch (seqnr) {
-		case 0:
-			va = IA64_PBVM_BASE;
-			sz = round_page(bootinfo->bi_kernend) - va;
-			break;
-		default:
-			va = 0;
-			sz = 0;
-			break;
-		}
-		if (va == 0 && sz == 0)
-			break;
-		error = (*cb)(va, sz, seqnr, arg);
-		if (error)
-			return (-error);
-		seqnr++;
-	}
-	return (seqnr);
-}
-
-/*
- * main entry point.
- */
-
-void
-dumpsys(struct dumperinfo *di)
-{
-	Elf64_Ehdr ehdr;
-	uint64_t dumpsize;
-	off_t hdrgap;
-	size_t hdrsz;
-	int error, status;
-
-	bzero(&ehdr, sizeof(ehdr));
-	ehdr.e_ident[EI_MAG0] = ELFMAG0;
-	ehdr.e_ident[EI_MAG1] = ELFMAG1;
-	ehdr.e_ident[EI_MAG2] = ELFMAG2;
-	ehdr.e_ident[EI_MAG3] = ELFMAG3;
-	ehdr.e_ident[EI_CLASS] = ELFCLASS64;
-#if BYTE_ORDER == LITTLE_ENDIAN
-	ehdr.e_ident[EI_DATA] = ELFDATA2LSB;
-#else
-	ehdr.e_ident[EI_DATA] = ELFDATA2MSB;
-#endif
-	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_IA_64;
-	ehdr.e_entry = (minidump) ? (uintptr_t)bootinfo :
-	    ia64_tpa((uintptr_t)bootinfo);
-	ehdr.e_phoff = sizeof(ehdr);
-	ehdr.e_flags = (minidump) ? 0 : EF_IA_64_ABSOLUTE; /* XXX misuse? */
-	ehdr.e_ehsize = sizeof(ehdr);
-	ehdr.e_phentsize = sizeof(Elf64_Phdr);
-	ehdr.e_shentsize = sizeof(Elf64_Shdr);
-
-	/* Calculate dump size. */
-	dumpsize = 0L;
-	status = (minidump) ? virt_foreach(virt_cb_size, &dumpsize) :
-	    phys_foreach(phys_cb_size, &dumpsize);
-	if (status < 0) {
-		error = -status;
-		goto fail;
-	}
-	ehdr.e_phnum = status;
-	hdrsz = ehdr.e_phoff + ehdr.e_phnum * ehdr.e_phentsize;
-	fileofs = (minidump) ? round_page(hdrsz) : MD_ALIGN(hdrsz);
-	dumpsize += fileofs;
-	hdrgap = fileofs - DEV_ALIGN(hdrsz);
-
-	/* Determine dump offset on device. */
-	if (di->mediasize < SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
-		error = ENOSPC;
-		goto fail;
-	}
-	dumplo = di->mediaoffset + di->mediasize - dumpsize;
-	dumplo -= sizeof(kdh) * 2;
-
-	mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_IA64_VERSION, dumpsize, di->blocksize);
-
-	printf("Dumping %llu MB (%d chunks)\n", (long long)dumpsize >> 20,
-	    ehdr.e_phnum);
-
-	/* Dump leader */
-	error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh));
-	if (error)
-		goto fail;
-	dumplo += sizeof(kdh);
-
-	/* Dump ELF header */
-	error = buf_write(di, (char*)&ehdr, sizeof(ehdr));
-	if (error)
-		goto fail;
-
-	/* Dump program headers */
-	status = (minidump) ? virt_foreach(virt_cb_dumphdr, di) :
-	    phys_foreach(phys_cb_dumphdr, di);
-	if (status < 0) {
-		error = -status;
-		goto fail;
-	}
-	buf_flush(di);
-
-	/*
-	 * All headers are written using blocked I/O, so we know the
-	 * current offset is (still) block aligned. Skip the alignment
-	 * in the file to have the segment contents aligned at page
-	 * boundary. For physical dumps, it's the EFI page size (= 4K).
-	 * For minidumps it's the kernel's page size (= 8K).
-	 */
-	dumplo += hdrgap;
-
-	/* Dump memory chunks (updates dumplo) */
-	status = (minidump) ? virt_foreach(virt_cb_dumpdata, di) :
-	    phys_foreach(phys_cb_dumpdata, di);
-	if (status < 0) {
-		error = -status;
-		goto fail;
-	}
-
-	/* Dump trailer */
-	error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh));
-	if (error)
-		goto fail;
-
-	/* Signal completion, signoff and exit stage left. */
-	dump_write(di, NULL, 0, 0, 0);
-	printf("\nDump complete\n");
-	return;
-
- fail:
-	if (error == ECANCELED)
-		printf("\nDump aborted\n");
-	else
-		printf("\n** DUMP FAILED (ERROR %d) **\n", error);
-}
diff --git a/sys/ia64/ia64/efi.c b/sys/ia64/ia64/efi.c
deleted file mode 100644
index 55adb67caa2d..000000000000
--- a/sys/ia64/ia64/efi.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/*-
- * Copyright (c) 2004 Marcel Moolenaar
- * Copyright (c) 2001 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/efi.h>
-#include <sys/systm.h>
-#include <machine/bootinfo.h>
-#include <machine/md_var.h>
-#include <machine/sal.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
-
-static struct efi_systbl *efi_systbl;
-static struct efi_cfgtbl *efi_cfgtbl;
-static struct efi_rt *efi_runtime;
-
-static int efi_status2err[25] = {
-	0,		/* EFI_SUCCESS */
-	ENOEXEC,	/* EFI_LOAD_ERROR */
-	EINVAL,		/* EFI_INVALID_PARAMETER */
-	ENOSYS,		/* EFI_UNSUPPORTED */
-	EMSGSIZE, 	/* EFI_BAD_BUFFER_SIZE */
-	EOVERFLOW,	/* EFI_BUFFER_TOO_SMALL */
-	EBUSY,		/* EFI_NOT_READY */
-	EIO,		/* EFI_DEVICE_ERROR */
-	EROFS,		/* EFI_WRITE_PROTECTED */
-	EAGAIN,		/* EFI_OUT_OF_RESOURCES */
-	EIO,		/* EFI_VOLUME_CORRUPTED */
-	ENOSPC,		/* EFI_VOLUME_FULL */
-	ENXIO,		/* EFI_NO_MEDIA */
-	ESTALE,		/* EFI_MEDIA_CHANGED */
-	ENOENT,		/* EFI_NOT_FOUND */
-	EACCES,		/* EFI_ACCESS_DENIED */
-	ETIMEDOUT,	/* EFI_NO_RESPONSE */
-	EADDRNOTAVAIL,	/* EFI_NO_MAPPING */
-	ETIMEDOUT,	/* EFI_TIMEOUT */
-	EDOOFUS,	/* EFI_NOT_STARTED */
-	EALREADY,	/* EFI_ALREADY_STARTED */
-	ECANCELED,	/* EFI_ABORTED */
-	EPROTO,		/* EFI_ICMP_ERROR */
-	EPROTO,		/* EFI_TFTP_ERROR */
-	EPROTO		/* EFI_PROTOCOL_ERROR */
-};
-
-static int
-efi_status_to_errno(efi_status status)
-{
-	u_long code;
-	int error;
-
-	code = status & 0x3ffffffffffffffful;
-	error = (code < 25) ? efi_status2err[code] : EDOOFUS;
-	return (error);
-}
-
-void
-efi_boot_finish(void)
-{
-}
-
-/*
- * Collect the entry points for PAL and SAL. Be extra careful about NULL
- * pointer values. We're running pre-console, so it's better to return
- * error values than to cause panics, machine checks and other traps and
- * faults. Keep this minimal...
- */
-int
-efi_boot_minimal(uint64_t systbl)
-{
-	ia64_efi_f setvirt;
-	struct efi_md *md;
-	efi_status status;
-
-	if (systbl == 0)
-		return (EINVAL);
-	efi_systbl = (struct efi_systbl *)IA64_PHYS_TO_RR7(systbl);
-	if (efi_systbl->st_hdr.th_sig != EFI_SYSTBL_SIG) {
-		efi_systbl = NULL;
-		return (EFAULT);
-	}
-	efi_cfgtbl = (efi_systbl->st_cfgtbl == 0) ? NULL :
-	    (struct efi_cfgtbl *)IA64_PHYS_TO_RR7(efi_systbl->st_cfgtbl);
-	if (efi_cfgtbl == NULL)
-		return (ENOENT);
-	efi_runtime = (efi_systbl->st_rt == 0) ? NULL :
-	    (struct efi_rt *)IA64_PHYS_TO_RR7(efi_systbl->st_rt);
-	if (efi_runtime == NULL)
-		return (ENOENT);
-
-	/*
-	 * Relocate runtime memory segments for firmware.
-	 */
-	md = efi_md_first();
-	while (md != NULL) {
-		if (md->md_attr & EFI_MD_ATTR_RT) {
-			md->md_virt = (md->md_attr & EFI_MD_ATTR_WB) ?
-			    (void *)IA64_PHYS_TO_RR7(md->md_phys) :
-			    (void *)IA64_PHYS_TO_RR6(md->md_phys);
-		}
-		md = efi_md_next(md);
-	}
-	setvirt = (void *)IA64_PHYS_TO_RR7((u_long)efi_runtime->rt_setvirtual);
-	status = ia64_efi_physical(setvirt, bootinfo->bi_memmap_size,
-	    bootinfo->bi_memdesc_size, bootinfo->bi_memdesc_version,
-	    ia64_tpa(bootinfo->bi_memmap));
-	return ((status < 0) ? EFAULT : 0);
-}
-
-void *
-efi_get_table(struct uuid *uuid)
-{
-	struct efi_cfgtbl *ct;
-	u_long count;
-
-	if (efi_cfgtbl == NULL)
-		return (NULL);
-	count = efi_systbl->st_entries;
-	ct = efi_cfgtbl;
-	while (count--) {
-		if (!bcmp(&ct->ct_uuid, uuid, sizeof(*uuid)))
-			return ((void *)IA64_PHYS_TO_RR7(ct->ct_data));
-		ct++;
-	}
-	return (NULL);
-}
-
-void
-efi_get_time(struct efi_tm *tm)
-{
-
-	efi_runtime->rt_gettime(tm, NULL);
-}
-
-struct efi_md *
-efi_md_first(void)
-{
-	struct efi_md *md;
-
-	if (bootinfo->bi_memmap == 0)
-		return (NULL);
-	md = (struct efi_md *)bootinfo->bi_memmap;
-	return (md);
-}
-
-struct efi_md *
-efi_md_last(void)
-{
-	struct efi_md *md;
-
-	if (bootinfo->bi_memmap == 0)
-		return (NULL);
-	md = (struct efi_md *)(bootinfo->bi_memmap + bootinfo->bi_memmap_size -
-	    bootinfo->bi_memdesc_size);
-	return (md);
-}
-
-struct efi_md *
-efi_md_next(struct efi_md *md)
-{
-	struct efi_md *lim;
-
-	lim = efi_md_last();
-	md = (struct efi_md *)((uintptr_t)md + bootinfo->bi_memdesc_size);
-	return ((md > lim) ? NULL : md);
-}
-
-struct efi_md *
-efi_md_prev(struct efi_md *md)
-{
-	struct efi_md *lim;
-
-	lim = efi_md_first();
-	md = (struct efi_md *)((uintptr_t)md - bootinfo->bi_memdesc_size);
-	return ((md < lim) ? NULL : md);
-}
-
-struct efi_md *
-efi_md_find(vm_paddr_t pa)
-{
-	static struct efi_md *last = NULL;
-	struct efi_md *md, *p0, *p1;
-
-	md = (last != NULL) ? last : efi_md_first();
-	p1 = p0 = NULL;
-	while (md != NULL && md != p1) {
-		if (pa >= md->md_phys &&
-		    pa < md->md_phys + md->md_pages * EFI_PAGE_SIZE) {
-			last = md;
-			return (md);
-		}
-
-		p1 = p0;
-		p0 = md;
-		md = (pa < md->md_phys) ? efi_md_prev(md) : efi_md_next(md);
-	}
-
-	return (NULL);
-}
-
-void
-efi_reset_system(void)
-{
-
-	if (efi_runtime != NULL)
-		efi_runtime->rt_reset(EFI_RESET_WARM, 0, 0, NULL);
-	panic("%s: unable to reset the machine", __func__);
-}
-
-int
-efi_set_time(struct efi_tm *tm)
-{
-
-	return (efi_status_to_errno(efi_runtime->rt_settime(tm)));
-}
-
-int
-efi_var_get(efi_char *name, struct uuid *vendor, uint32_t *attrib,
-    size_t *datasize, void *data)
-{
-	efi_status status;
-
-	status = efi_runtime->rt_getvar(name, vendor, attrib, datasize, data);
-	return (efi_status_to_errno(status));
-}
-
-int
-efi_var_nextname(size_t *namesize, efi_char *name, struct uuid *vendor)
-{
-	efi_status status;
-
-	status = efi_runtime->rt_scanvar(namesize, name, vendor);
-	return (efi_status_to_errno(status));
-}
- 
-int
-efi_var_set(efi_char *name, struct uuid *vendor, uint32_t attrib,
-    size_t datasize, void *data)
-{
-	efi_status status;
- 
-	status = efi_runtime->rt_setvar(name, vendor, attrib, datasize, data);
-	return (efi_status_to_errno(status));
-}
diff --git a/sys/ia64/ia64/elf_machdep.c b/sys/ia64/ia64/elf_machdep.c
deleted file mode 100644
index 05cb641f32e4..000000000000
--- a/sys/ia64/ia64/elf_machdep.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/*-
- * Copyright 1996-1998 John D. Polstra.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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$
- */
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/exec.h>
-#include <sys/imgact.h>
-#include <sys/malloc.h>
-#include <sys/proc.h>
-#include <sys/namei.h>
-#include <sys/fcntl.h>
-#include <sys/vnode.h>
-#include <sys/linker.h>
-#include <sys/sysent.h>
-#include <sys/imgact_elf.h>
-#include <sys/syscall.h>
-#include <sys/signalvar.h>
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-
-#include <machine/elf.h>
-#include <machine/frame.h>
-#include <machine/md_var.h>
-#include <machine/unwind.h>
-
-Elf_Addr link_elf_get_gp(linker_file_t);
-
-extern Elf_Addr fptr_storage[];
-
-struct sysentvec elf64_freebsd_sysvec = {
-	.sv_size	= SYS_MAXSYSCALL,
-	.sv_table	= sysent,
-	.sv_mask	= 0,
-	.sv_sigsize	= 0,
-	.sv_sigtbl	= NULL,
-	.sv_errsize	= 0,
-	.sv_errtbl	= NULL,
-	.sv_transtrap	= NULL,
-	.sv_fixup	= __elfN(freebsd_fixup),
-	.sv_sendsig	= sendsig,
-	.sv_sigcode	= NULL,
-	.sv_szsigcode	= NULL,
-	.sv_prepsyscall	= NULL,
-	.sv_name	= "FreeBSD ELF64",
-	.sv_coredump	= __elfN(coredump),
-	.sv_imgact_try	= NULL,
-	.sv_minsigstksz	= MINSIGSTKSZ,
-	.sv_pagesize	= PAGE_SIZE,
-	.sv_minuser	= VM_MIN_ADDRESS,
-	.sv_maxuser	= VM_MAXUSER_ADDRESS,
-	.sv_usrstack	= USRSTACK,
-	.sv_psstrings	= PS_STRINGS,
-	.sv_stackprot	= VM_PROT_READ|VM_PROT_WRITE,
-	.sv_copyout_strings = exec_copyout_strings,
-	.sv_setregs	= exec_setregs,
-	.sv_fixlimit	= NULL,
-	.sv_maxssiz	= NULL,
-	.sv_flags	= SV_ABI_FREEBSD | SV_LP64,
-	.sv_set_syscall_retval = cpu_set_syscall_retval,
-	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
-	.sv_syscallnames = syscallnames,
-	.sv_schedtail	= NULL,
-};
-
-static Elf64_Brandinfo freebsd_brand_info = {
-	.brand		= ELFOSABI_FREEBSD,
-	.machine	= EM_IA_64,
-	.compat_3_brand	= "FreeBSD",
-	.emul_path	= NULL,
-	.interp_path	= "/libexec/ld-elf.so.1",
-	.sysvec		= &elf64_freebsd_sysvec,
-	.interp_newpath	= NULL,
-	.brand_note	= &elf64_freebsd_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
-};
-SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_FIRST,
-    (sysinit_cfunc_t)elf64_insert_brand_entry, &freebsd_brand_info);
-
-static Elf64_Brandinfo freebsd_brand_oinfo = {
-	.brand		= ELFOSABI_FREEBSD,
-	.machine	= EM_IA_64,
-	.compat_3_brand	= "FreeBSD",
-	.emul_path	= NULL,
-	.interp_path	= "/usr/libexec/ld-elf.so.1",
-	.sysvec		= &elf64_freebsd_sysvec,
-	.interp_newpath	= NULL,
-	.brand_note	= &elf64_freebsd_brandnote,
-	.flags		= BI_CAN_EXEC_DYN | BI_BRAND_NOTE
-};
-SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY,
-    (sysinit_cfunc_t)elf64_insert_brand_entry, &freebsd_brand_oinfo);
-
-
-void
-elf64_dump_thread(struct thread *td, void *dst, size_t *off __unused)
-{
-
-	/* Flush the dirty registers onto the backingstore. */
-	if (dst == NULL)
-		ia64_flush_dirty(td, &td->td_frame->tf_special);
-}
-
-
-static Elf_Addr
-lookup_fdesc(linker_file_t lf, Elf_Size symidx, elf_lookup_fn lookup)
-{
-	linker_file_t top;
-	Elf_Addr addr;
-	const char *symname;
-	int i;
-	static int eot = 0;
-
-	addr = lookup(lf, symidx, 0);
-	if (addr == 0) {
-		top = lf;
-		symname = elf_get_symname(top, symidx);
-		for (i = 0; i < top->ndeps; i++) {
-			lf = top->deps[i];
-			addr = (Elf_Addr)linker_file_lookup_symbol(lf,
-			    symname, 0);
-			if (addr != 0)
-				break;
-		}
-		if (addr == 0)
-			return (0);
-	}
-
-	if (eot)
-		return (0);
-
-	/*
-	 * Lookup and/or construct OPD
-	 */
-	for (i = 0; i < 8192; i += 2) {
-		if (fptr_storage[i] == addr)
-			return (Elf_Addr)(fptr_storage + i);
-
-		if (fptr_storage[i] == 0) {
-			fptr_storage[i] = addr;
-			fptr_storage[i+1] = link_elf_get_gp(lf);
-			return (Elf_Addr)(fptr_storage + i);
-		}
-	}
-
-	printf("%s: fptr table full\n", __func__);
-	eot = 1;
-
-	return (0);
-}
-
-/* Process one elf relocation with addend. */
-static int
-elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
-    int type, int local, elf_lookup_fn lookup)
-{
-	Elf_Addr *where;
-	Elf_Addr addend, addr;
-	Elf_Size rtype, symidx;
-	const Elf_Rel *rel;
-	const Elf_Rela *rela;
-
-	switch (type) {
-	case ELF_RELOC_REL:
-		rel = (const Elf_Rel *)data;
-		where = (Elf_Addr *)(relocbase + rel->r_offset);
-		rtype = ELF_R_TYPE(rel->r_info);
-		symidx = ELF_R_SYM(rel->r_info);
-		switch (rtype) {
-		case R_IA_64_DIR64LSB:
-		case R_IA_64_FPTR64LSB:
-		case R_IA_64_REL64LSB:
-			addend = *where;
-			break;
-		default:
-			addend = 0;
-			break;
-		}
-		break;
-	case ELF_RELOC_RELA:
-		rela = (const Elf_Rela *)data;
-		where = (Elf_Addr *)(relocbase + rela->r_offset);
-		rtype = ELF_R_TYPE(rela->r_info);
-		symidx = ELF_R_SYM(rela->r_info);
-		addend = rela->r_addend;
-		break;
-	default:
-		panic("%s: invalid ELF relocation (0x%x)\n", __func__, type);
-	}
-
-	if (local) {
-		if (rtype == R_IA_64_REL64LSB)
-			*where = elf_relocaddr(lf, relocbase + addend);
-		return (0);
-	}
-
-	switch (rtype) {
-	case R_IA_64_NONE:
-		break;
-	case R_IA_64_DIR64LSB:	/* word64 LSB	S + A */
-		addr = lookup(lf, symidx, 1);
-		if (addr == 0)
-			return (-1);
-		*where = addr + addend;
-		break;
-	case R_IA_64_FPTR64LSB:	/* word64 LSB	@fptr(S + A) */
-		if (addend != 0) {
-			printf("%s: addend ignored for OPD relocation\n",
-			    __func__);
-		}
-		addr = lookup_fdesc(lf, symidx, lookup);
-		if (addr == 0)
-			return (-1);
-		*where = addr;
-		break;
-	case R_IA_64_REL64LSB:	/* word64 LSB	BD + A */
-		break;
-	case R_IA_64_IPLTLSB:
-		addr = lookup_fdesc(lf, symidx, lookup);
-		if (addr == 0)
-			return (-1);
-		where[0] = *((Elf_Addr*)addr) + addend;
-		where[1] = *((Elf_Addr*)addr + 1);
-		break;
-	default:
-		printf("%s: unknown relocation (0x%x)\n", __func__,
-		    (int)rtype);
-		return -1;
-	}
-
-	return (0);
-}
-
-int
-elf_reloc(linker_file_t lf, Elf_Addr relocbase, const void *data, int type,
-    elf_lookup_fn lookup)
-{
-
-	return (elf_reloc_internal(lf, relocbase, data, type, 0, lookup));
-}
-
-int
-elf_reloc_local(linker_file_t lf, Elf_Addr relocbase, const void *data,
-    int type, elf_lookup_fn lookup)
-{
-
-	return (elf_reloc_internal(lf, relocbase, data, type, 1, lookup));
-}
-
-int
-elf_cpu_load_file(linker_file_t lf)
-{
-	Elf_Ehdr *hdr;
-	Elf_Phdr *ph, *phlim;
-	Elf_Addr reloc, vaddr;
-
-	hdr = (Elf_Ehdr *)(lf->address);
-	if (!IS_ELF(*hdr)) {
-		printf("Missing or corrupted ELF header at %p\n", hdr);
-		return (EFTYPE);
-	}
-
-	/*
-	 * Iterate over the segments and register the unwind table if
-	 * we come across it.
-	 */
-	ph = (Elf_Phdr *)(lf->address + hdr->e_phoff);
-	phlim = ph + hdr->e_phnum;
-	reloc = ~0ULL;
-	while (ph < phlim) {
-		if (ph->p_type == PT_LOAD && reloc == ~0ULL)
-			reloc = (Elf_Addr)lf->address - ph->p_vaddr;
-
-		if (ph->p_type == PT_IA_64_UNWIND) {
-			vaddr = ph->p_vaddr + reloc;
-			unw_table_add((vm_offset_t)lf->address, vaddr,
-			    vaddr + ph->p_memsz);
-		}
-		++ph;
-	}
-
-	/*
-	 * Make the I-cache coherent, but don't worry obout the kernel
-	 * itself because the loader needs to do that.
-	 */
-	if (lf->id != 1)
-		ia64_sync_icache((uintptr_t)lf->address, lf->size);
-
-	return (0);
-}
-
-int
-elf_cpu_unload_file(linker_file_t lf)
-{
-
-	unw_table_remove((vm_offset_t)lf->address);
-	return (0);
-}
diff --git a/sys/ia64/ia64/emulate.c b/sys/ia64/ia64/emulate.c
deleted file mode 100644
index 37fcf5595e7d..000000000000
--- a/sys/ia64/ia64/emulate.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 2006 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-
-#include <machine/frame.h>
-#include <machine/md_var.h>
-
-#include <ia64/disasm/disasm.h>
-
-int
-ia64_emulate(struct trapframe *tf, struct thread *td)
-{
-	struct asm_bundle bundle;
-	struct asm_inst *i;
-	int slot;
-
-	if (!asm_decode(tf->tf_special.iip, &bundle))
-		return (SIGILL);
-
-	slot = ((tf->tf_special.psr & IA64_PSR_RI) == IA64_PSR_RI_0) ? 0 :
-	    ((tf->tf_special.psr & IA64_PSR_RI) == IA64_PSR_RI_1) ? 1 : 2;
-	if (slot == 1 && bundle.b_templ[slot] == 'L')
-		slot++;
-
-	i = bundle.b_inst + slot;
-	switch (i->i_op) {
-	case ASM_OP_BRL:
-		/*
-		 * We get the fault even if the predicate is false, so we
-		 * need to check the predicate first and simply advance to
-		 * the next bundle in that case.
-		 */
-		if (!(tf->tf_special.pr & (1UL << i->i_oper[0].o_value))) {
-			tf->tf_special.psr &= ~IA64_PSR_RI;
-			tf->tf_special.iip += 16;
-			return (0);
-		}
-		/*
-		 * The brl.cond is the simplest form. We only have to set
-		 * the IP to the address in the instruction and return.
-		 */
-		if (i->i_cmpltr[0].c_type == ASM_CT_COND) {
-			tf->tf_special.psr &= ~IA64_PSR_RI;
-			tf->tf_special.iip += i->i_oper[1].o_value;
-			return (0);
-		}
-		/* Sanity check... */
-		if (i->i_cmpltr[0].c_type != ASM_CT_CALL)
-			break;
-		/*
-		 * The brl.call is more difficult as we need to set-up the
-		 * call properly.
-		 */
-		break;
-	default:
-		break;
-	}
-
-	return (SIGILL);
-}
diff --git a/sys/ia64/ia64/exception.S b/sys/ia64/ia64/exception.S
deleted file mode 100644
index 4a927e7a14cc..000000000000
--- a/sys/ia64/ia64/exception.S
+++ /dev/null
@@ -1,1758 +0,0 @@
-/*-
- * Copyright (c) 2003,2004 Marcel Moolenaar
- * Copyright (c) 2000 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD$");
-
-#include "opt_xtrace.h"
-
-#include <machine/pte.h>
-#include <assym.s>
-
-/*
- * Nested TLB restart tokens. These are used by the
- * nested TLB handler for jumping back to the code
- * where the nested TLB was caused.
- */
-#define	NTLBRT_SAVE	0x12c12c
-#define	NTLBRT_RESTORE  0x12c12d
-
-/*
- * ar.k7 = kernel memory stack
- * ar.k6 = kernel register stack
- * ar.k5 = EPC gateway page
- * ar.k4 = PCPU data
- */
-
-	.section .ivt.data, "aw"
-
-	.align	8
-	.global ia64_kptdir
-	.size	ia64_kptdir, 8
-ia64_kptdir:	data8	0
-
-#ifdef XTRACE
-
-	.align	8
-	.global	ia64_xtrace_mask
-	.size	ia64_xtrace_mask, 8
-ia64_xtrace_mask:	data8	0
-
-	.align	4
-	.global	ia64_xtrace_enabled
-	.size	ia64_xtrace_enabled, 4
-ia64_xtrace_enabled:	data4	0
-
-#define	XTRACE_HOOK(offset)			\
-{	.mii ;					\
-	nop		0 ;			\
-	mov		r31 = b7 ;		\
-	mov		r28 = pr ;		\
-} ;						\
-{	.mib ;					\
-	nop		0 ;			\
-	mov		r25 = ip ;		\
-	br.sptk		ia64_xtrace_write ;;	\
-} ;						\
-{	.mii ;					\
-	nop		0 ;			\
-	mov		b7 = r31 ;		\
-	mov		pr = r28, 0x1ffff ;;	\
-}
-
-	.section .ivt.text, "ax"
-
-// We can only use r25, r26 & r27
-ENTRY_NOPROFILE(ia64_xtrace_write, 0)
-{	.mlx
-	add	r25 = 16, r25
-	movl	r26 = ia64_xtrace_enabled
-	;;
-}
-{	.mmi
-	mov	r27 = ar.k3
-	ld4	r26 = [r26]
-	mov	b7 = r25
-	;;
-}
-{	.mib
-	add	r25 = -32, r25
-	cmp.eq	p15,p0 = r0, r26
-(p15)	br.dptk.few	b7
-	;;
-}
-{	.mib
-	nop	0
-	cmp.eq	p15,p0 = r0, r27
-(p15)	br.dptk.few	b7
-	;;
-}
-{	.mmi
-	st8	[r27] = r25, 8		// 0x00 IVT
-	mov	r26 = ar.itc
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r26, 8		// 0x08 ITC
-	mov	r25 = cr.iip
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r25, 8		// 0x10 IIP
-	mov	r26 = cr.ifa
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r26, 8		// 0x18 IFA
-	mov	r25 = cr.isr
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r25, 8		// 0x20 ISR
-	mov	r26 = cr.ipsr
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r26, 8		// 0x28 IPSR
-	mov	r25 = cr.itir
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r25, 8		// 0x30 ITIR
-	mov	r26 = cr.iipa
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r26, 8		// 0x38 IIPA
-	mov	r25 = cr.ifs
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r25, 8		// 0x40 IFS
-	mov	r26 = cr.iim
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r26, 8		// 0x48 IIM
-	mov	r25 = cr.iha
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r25, 8		// 0x50 IHA
-	mov	r26 = ar.unat
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r26, 8		// 0x58 UNAT
-	mov	r25 = ar.rsc
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r25, 8		// 0x60 RSC
-	mov	r26 = ar.bsp
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r26, 8		// 0x68 BSP
-	mov	r25 = r13
-	nop	0
-	;;
-}
-{	.mmi
-	st8	[r27] = r25, 8		// 0x70 PCPU/TLS
-	mov	r26 = r12
-	nop	0
-	;;
-}
-{	.mlx
-	st8	[r27] = r26, 8		// 0x78 SP
-	movl	r25 = ia64_xtrace_mask
-	;;
-}
-{	.mmi
-	ld8	r26 = [r25]
-	;;
-	and	r25 = r27, r26
-	nop	0
-	;;
-}
-{	.mib
-	mov	ar.k3 = r25
-	nop	0
-	br.sptk	b7
-	;;
-}
-END(ia64_xtrace_write)
-
-#else /* XTRACE */
-
-#define	XTRACE_HOOK(offset)
-
-	.section .ivt.text, "ax"
-
-#endif /* XTRACE */
-
-/*
- * exception_save: save interrupted state
- *
- * Arguments:
- *	r16	address of bundle that contains the branch. The
- *		return address will be the next bundle.
- *	r17	the value to save as ifa in the trapframe. This
- *		normally is cr.ifa, but some interruptions set
- *		set cr.iim and not cr.ifa.
- *
- * Returns:
- *	p15	interrupted from user stack
- *	p14	interrupted from kernel stack
- *	p13	interrupted from user backing store
- *	p12	interrupted from kernel backing store
- *	p11	interrupts were enabled
- *	p10	interrupts were disabled
- */
-ENTRY_NOPROFILE(exception_save, 0)
-{	.mii
-	mov		r20=ar.unat
-	extr.u		r31=sp,61,3
-	mov		r18=pr
-	;;
-}
-{	.mmi
-	cmp.le		p14,p15=IA64_VM_MINKERN_REGION,r31
-	;;
-(p15)	mov		r23=ar.k7		// kernel memory stack
-(p14)	mov		r23=sp
-	;;
-}
-{	.mii
-	mov		r21=ar.rsc
-	add		r30=-SIZEOF_TRAPFRAME,r23
-	;;
-	dep		r30=0,r30,0,10
-	;;
-}
-{	.mmi
-	mov		ar.rsc=0
-	mov		r22=cr.iip
-	addl		r29=NTLBRT_SAVE,r0	// 22-bit restart token.
-	;;
-}
-
-	/*
-	 * We have a 1KB aligned trapframe, pointed to by r30. We can't
-	 * reliably write to the trapframe using virtual addressing, due
-	 * to the fact that TC entries we depend on can be removed by:
-	 * 1.  ptc.g instructions issued by other threads/cores/CPUs, or
-	 * 2.  TC modifications in another thread on the same core.
-	 * When our TC entry gets removed, we get nested TLB faults and
-	 * since no state is saved, we can only deal with those when
-	 * explicitly coded and expected.
-	 * As such, we switch to physical addressing and account for the
-	 * fact that the tpa instruction can cause a nested TLB fault.
-	 * Since the data nested TLB fault does not preserve any state,
-	 * we have to be careful what we clobber. Consequently, we have
-	 * to be careful what we use here. Below a list of registers that
-	 * are considered alive:
-	 *	r16,r17=arguments
-	 *	r18=pr, r19=length, r20=unat, r21=rsc, r22=iip, r23=TOS
-	 *	r29=restart token
-	 *	r30=trapframe pointers
-	 *	p14,p15=memory stack switch
-	 */
-exception_save_restart:
-	tpa		r24=r30			// Nested TLB fault possible
-	sub		r19=r23,r30
-	nop		0
-	;;
-
-	rsm		psr.dt
-	add		r29=16,r19		// Clobber restart token
-	mov		r30=r24
-	;;
-	srlz.d
-	add		r31=8,r24
-	;;
-
-	// r18=pr, r19=length, r20=unat, r21=rsc, r22=iip, r23=TOS
-	// r29=delta
-{	.mmi
-	st8		[r30]=r19,16		// length
-	st8		[r31]=r0,16		// flags
-	;;
-}
-{	.mmi
-	st8.spill	[r30]=sp,16		// sp
-	st8		[r31]=r20,16		// unat
-	sub		sp=r23,r29
-	;;
-}
-{	.mmi
-	mov		r19=ar.rnat
-	mov		r20=ar.bspstore
-	mov		r23=rp
-	;;
-}
-	// r18=pr, r19=rnat, r20=bspstore, r21=rsc, r22=iip, r23=rp
-	// r24=pfs
-{	.mmi
-	st8		[r30]=r23,16		// rp
-	st8		[r31]=r18,16		// pr
-	mov		r24=ar.pfs
-	;;
-}
-{	.mmb
-	st8		[r30]=r24,16		// pfs
-	st8		[r31]=r20,16		// bspstore
-	cover
-	;;
-}
-{	.mmi
-	mov		r18=ar.fpsr
-	mov		r23=cr.ipsr
-	extr.u		r24=r20,61,3
-	;;
-}
-	// r18=fpsr, r19=rnat, r20=bspstore, r21=rsc, r22=iip, r23=ipsr
-{	.mmi
-	st8		[r30]=r19,16		// rnat
-	st8		[r31]=r0,16		// __spare
-	cmp.le		p12,p13=IA64_VM_MINKERN_REGION,r24
-	;;
-}
-{	.mmi
-	st8.spill	[r30]=r13,16		// tp
-	st8		[r31]=r21,16		// rsc
-	tbit.nz		p11,p10=r23,14		// p11=interrupts enabled
-	;;
-}
-{	.mmi
-(p13)	mov		r21=ar.k6		// kernel register stack
-	;;
-	st8		[r30]=r18,16		// fpsr
-(p13)	dep		r20=r20,r21,0,9		// align dirty registers
-	;;
-}
-	// r19=rnat, r20=bspstore, r22=iip, r23=ipsr
-{	.mmi
-	st8		[r31]=r23,16		// psr
-(p13)	mov		ar.bspstore=r20
-	nop		0
-	;;
-}
-{	.mmi
-(p13)	mov		ar.rnat=r19
-	mov		r18=ar.bsp
-	nop		0
-	;;
-}
-{	.mmi
-	mov		r19=cr.ifs
-	st8.spill	[r30]=gp,16		// gp
-	sub		r18=r18,r20
-	;;
-}
-	// r18=ndirty, r19=ifs, r22=iip
-{	.mmi
-	st8		[r31]=r18,16		// ndirty
-	st8		[r30]=r19,16		// cfm
-	nop		0
-	;;
-}
-{	.mmi
-	mov		r18=cr.isr
-	st8		[r31]=r22,16		// iip
-	add		r29=16,r30
-	;;
-}
-{	.mmi
-	st8		[r30]=r17,24		// ifa
-	st8		[r31]=r18,24		// isr
-	nop		0
-	;;
-}
-{	.mmi
-	.mem.offset	0,0
-	st8.spill	[r30]=r2,16		// r2
-	.mem.offset	8,0
-	st8.spill	[r31]=r3,16		// r3
-	add		r2=9*8,r29
-	;;
-}
-{	.mmi
-	.mem.offset	0,0
-	st8.spill	[r30]=r8,16		// r8
-	.mem.offset	8,0
-	st8.spill	[r31]=r9,16		// r9
-	add		r3=8,r2
-	;;
-}
-{	.mmi
-	.mem.offset	0,0
-	st8.spill	[r30]=r10,16		// r10
-	.mem.offset	8,0
-	st8.spill	[r31]=r11,16		// r11
-	add		r8=16,r16
-	;;
-}
-{	.mmi
-	.mem.offset	0,0
-	st8.spill	[r30]=r14		// r14
-	.mem.offset	8,0
-	st8.spill	[r31]=r15		// r15
-	mov		r9=r29
-}
-{	.mmb
-	mov		r10=ar.csd
-	mov		r11=ar.ssd
-	bsw.1
-	;;
-}
-{	.mmi
-	.mem.offset	0,0
-	st8.spill	[r2]=r16,16		// r16
-	.mem.offset	8,0
-	st8.spill	[r3]=r17,16		// r17
-	mov		r14=b6
-	;;
-}
-{	.mmi
-	.mem.offset	0,0
-	st8.spill	[r2]=r18,16		// r18
-	.mem.offset	8,0
-	st8.spill	[r3]=r19,16		// r19
-	mov		r15=b7
-	;;
-}
-{	.mmi
-	.mem.offset	0,0
-	st8.spill	[r2]=r20,16		// r20
-	.mem.offset	8,0
-	st8.spill	[r3]=r21,16		// r21
-	mov		b7=r8
-	;;
-}
-{	.mmi
-	.mem.offset	0,0
-	st8.spill	[r2]=r22,16		// r22
-	.mem.offset	8,0
-	st8.spill	[r3]=r23,16		// r23
-	;;
-}
-
-	.mem.offset	0,0
-	st8.spill	[r2]=r24,16		// r24
-	.mem.offset	8,0
-	st8.spill	[r3]=r25,16		// r25
-	;;
-	.mem.offset	0,0
-	st8.spill	[r2]=r26,16		// r26
-	.mem.offset	8,0
-	st8.spill	[r3]=r27,16		// r27
-	;;
-	.mem.offset	0,0
-	st8.spill	[r2]=r28,16		// r28
-	.mem.offset	8,0
-	st8.spill	[r3]=r29,16		// r29
-	;;
-	.mem.offset	0,0
-	st8.spill	[r2]=r30,16		// r30
-	.mem.offset	8,0
-	st8.spill	[r3]=r31,16		// r31
-	;;
-
-{	.mmi
-	st8		[r2]=r14,16		// b6
-	mov		r17=ar.unat
-	nop		0
-	;;
-}
-{	.mmi
-	st8		[r3]=r15,16		// b7
-	mov		r16=ar.ccv
-	nop		0
-	;;
-}
-{	.mmi
-	st8		[r2]=r16,16		// ccv
-	st8		[r3]=r10,16		// csd
-	nop		0
-	;;
-}
-{	.mmi
-	st8		[r2]=r11,24		// ssd
-	st8		[r9]=r17
-	nop		0
-	;;
-}
-
-	stf.spill	[r3]=f6,32		// f6
-	stf.spill	[r2]=f7,32		// f7
-	;;
-	stf.spill	[r3]=f8,32		// f8
-	stf.spill	[r2]=f9,32		// f9
-	;;
-	stf.spill	[r3]=f10,32		// f10
-	stf.spill	[r2]=f11,32		// f11
-	;;
-	stf.spill	[r3]=f12,32		// f12
-	stf.spill	[r2]=f13,32		// f13
-	;;
-	stf.spill	[r3]=f14		// f14
-	stf.spill	[r2]=f15		// f15
-	;;
-{	.mmi
-	mov		ar.rsc=3
-	mov		r13=ar.k4
-	nop		0
-	;;
-}
-{	.mlx
-	ssm		psr.dt|psr.ic|psr.dfh
-	movl		gp=__gp
-	;;
-}
-{	.mib
-	srlz.d
-	nop		0
-	br.sptk		b7
-	;;
-}
-END(exception_save)
-
-/*
- * exception_restore:	restore interrupted state
- *
- * Arguments:
- *	sp+16	trapframe pointer
- */
-ENTRY_NOPROFILE(exception_restore, 0)
-{	.mmi
-	rsm		psr.i
-	add		sp=16,sp
-	nop		0
-	;;
-}
-
-	// The next instruction can fault. Let it be...
-	tpa		r9=sp
-	;;
-	rsm		psr.dt|psr.ic
-	add		r8=SIZEOF_SPECIAL+16,r9
-	;;
-	srlz.d
-	add		r2=SIZEOF_TRAPFRAME-16,r9
-	add		r3=SIZEOF_TRAPFRAME-32,r9
-	;;
-
-{	.mmi
-	ldf.fill	f15=[r2],-32		// f15
-	ldf.fill	f14=[r3],-32		// f14
-	nop		0
-	;;
-}
-{	.mmi
-	ldf.fill	f13=[r2],-32		// f13
-	ldf.fill	f12=[r3],-32		// f12
-	nop		0
-	;;
-}
-{	.mmi
-	ldf.fill	f11=[r2],-32		// f11
-	ldf.fill	f10=[r3],-32		// f10
-	nop		0
-	;;
-}
-{	.mmi
-	ldf.fill	f9=[r2],-32		// f9
-	ldf.fill	f8=[r3],-32		// f8
-	nop		0
-	;;
-}
-{	.mmi
-	ldf.fill	f7=[r2],-24		// f7
-	ldf.fill	f6=[r3],-16		// f6
-	nop		0
-	;;
-}
-{	.mmi
-	ld8		r8=[r8]			// unat (after)
-	;;
-	mov		ar.unat=r8
-	nop		0
-	;;
-}
-
-	ld8		r10=[r2],-16		// ssd
-	ld8		r11=[r3],-16		// csd
-	;;
-	mov		ar.ssd=r10
-	mov		ar.csd=r11
-
-	ld8		r14=[r2],-16		// ccv
-	ld8		r15=[r3],-16		// b7
-	;;
-
-{	.mmi
-	mov		ar.ccv=r14
-	ld8		r8=[r2],-16		// b6
-	mov		b7=r15
-	;;
-}
-{	.mmi
-	ld8.fill	r31=[r3],-16		// r31
-	ld8.fill	r30=[r2],-16		// r30
-	mov		b6=r8
-	;;
-}
-
-	ld8.fill	r29=[r3],-16		// r29
-	ld8.fill	r28=[r2],-16		// r28
-	;;
-	ld8.fill	r27=[r3],-16		// r27
-	ld8.fill	r26=[r2],-16		// r26
-	;;
-	ld8.fill	r25=[r3],-16		// r25
-	ld8.fill	r24=[r2],-16		// r24
-	;;
-	ld8.fill	r23=[r3],-16		// r23
-	ld8.fill	r22=[r2],-16		// r22
-	;;
-	ld8.fill	r21=[r3],-16		// r21
-	ld8.fill	r20=[r2],-16		// r20
-	;;
-	ld8.fill	r19=[r3],-16		// r19
-	ld8.fill	r18=[r2],-16		// r18
-	;;
-
-{	.mmb
-	ld8.fill	r17=[r3],-16		// r17
-	ld8.fill	r16=[r2],-16		// r16
-	bsw.0
-	;;
-}
-{	.mii
-	ld8		r16=[r9]		// tf_length
-	add		r31=16,r9
-	add		r30=24,r9
-}
-{	.mmi
-	ld8.fill	r15=[r3],-16		// r15
-	ld8.fill	r14=[r2],-16		// r14
-	nop		0
-	;;
-}
-{	.mmi
-	ld8.fill	r11=[r3],-16		// r11
-	ld8.fill	r10=[r2],-16		// r10
-	add		r16=r16,sp		// ar.k7
-	;;
-}
-{	.mmi
-	ld8.fill	r9=[r3],-16		// r9
-	ld8.fill	r8=[r2],-16		// r8
-	nop		0
-	;;
-}
-{	.mmi
-	ld8.fill	r3=[r3]			// r3
-	ld8.fill	r2=[r2]			// r2
-	nop		0
-	;;
-}
-
-	ld8.fill	sp=[r31],16		// sp
-	ld8		r17=[r30],16		// unat
-	;;
-	ld8		r29=[r31],16		// rp
-	ld8		r18=[r30],16		// pr
-	;;
-	ld8		r28=[r31],16		// pfs
-	ld8		r20=[r30],24		// bspstore
-	mov		rp=r29
-	;;
-	ld8		r21=[r31],24		// rnat
-	mov		ar.pfs=r28
-	;;
-	ld8.fill	r26=[r30],16		// tp
-	ld8		r22=[r31],16		// rsc
-	;;
-
-{	.mmi
-	ld8		r23=[r30],16		// fpsr
-	ld8		r24=[r31],16		// psr
-	extr.u		r28=r20,61,3
-	;;
-}
-{	.mmi
-	ld8.fill	r1=[r30],16		// gp
-	ld8		r27=[r31],16		// ndirty
-	cmp.le		p14,p15=IA64_VM_MINKERN_REGION,r28
-	;;
-}
-{	.mmi
-	ld8		r25=[r30]		// cfm
-	ld8		r19=[r31]		// ip
-	nop		0
-	;;
-}
-{	.mii
-	// Switch register stack
-	alloc		r30=ar.pfs,0,0,0,0	// discard current frame
-	shl		r31=r27,16		// value for ar.rsc
-(p15)	mov		r13=r26
-	;;
-}
-	// The loadrs can fault if the backing store is not currently
-	// mapped. We assured forward progress by getting everything we
-	// need from the trapframe so that we don't care if the CPU
-	// purges that translation when it needs to insert a new one for
-	// the backing store.
-{	.mmi
-	mov		ar.rsc=r31		// setup for loadrs
-	mov		ar.k7=r16
-	addl		r29=NTLBRT_RESTORE,r0	// 22-bit restart token 
-	;;
-}
-
-	ssm		psr.dt
-	;;
-	srlz.d
-	mov		r16 = r25
-
-exception_restore_restart:
-{	.mmi
-	mov		r30=ar.bspstore
-	;;
-	loadrs					// load user regs
-	mov		r29=0			// Clobber restart token
-	;;
-}
-{	.mmi
-	mov		r31=ar.bspstore
-	;;
-	mov		ar.bspstore=r20
-	dep		r31=0,r31,0,13		// 8KB aligned
-	;;
-}
-{	.mmi
-	mov		cr.ifs=r16
-	mov		ar.k6=r31
-	mov		pr=r18,0x1ffff
-	;;
-}
-{	.mmi
-	mov		cr.iip=r19
-	mov		ar.unat=r17
-	nop		0
-	;;
-}
-{	.mmi
-	mov		cr.ipsr=r24
-	mov		ar.rnat=r21
-	nop		0
-	;;
-}
-{	.mmb
-	mov		ar.rsc=r22
-	mov		ar.fpsr=r23
-	rfi
-	;;
-}
-END(exception_restore)
-
-/*
- * Call exception_save_regs to preserve the interrupted state in a
- * trapframe. Note that we don't use a call instruction because we
- * must be careful not to lose track of the RSE state. We then call
- * trap() with the value of _n_ as an argument to handle the
- * exception. We arrange for trap() to return to exception_restore
- * which will restore the interrupted state before executing an rfi to
- * resume it.
- */
-#define CALL(_func_, _n_, _ifa_)		\
-{	.mib ;					\
-	mov		r17=_ifa_ ;		\
-	mov		r16=ip ;		\
-	br.sptk		exception_save ;;	\
-} ;						\
-{	.mmi ;					\
-	alloc		r15=ar.pfs,0,0,2,0 ;;	\
-(p11)	ssm		psr.i ;			\
-	mov		out0=_n_ ;;		\
-} ;						\
-{	.mib ;					\
-(p11)	srlz.d ;				\
-	add		out1=16,sp ;		\
-	br.call.sptk	rp=_func_ ;;		\
-} ;						\
-{	.mib ;					\
-	nop		0 ;			\
-	nop		0 ;			\
-	br.sptk		exception_restore ;;	\
-}
-
-#define	IVT_ENTRY(name, offset)			\
-	.org	ia64_vector_table + offset;	\
-	.global	ivt_##name;			\
-	.proc	ivt_##name;			\
-	.prologue;				\
-	.unwabi	@svr4, 'I';			\
-	.save	rp, r0;				\
-	.body;					\
-ivt_##name:					\
-	XTRACE_HOOK(offset)
-
-#define	IVT_END(name)				\
-	.endp	ivt_##name
-
-#ifdef COMPAT_FREEBSD32
-#define	IA32_TRAP	ia32_trap
-#else
-#define	IA32_TRAP	trap
-#endif
-
-/*
- * The IA64 Interrupt Vector Table (IVT) contains 20 slots with 64
- * bundles per vector and 48 slots with 16 bundles per vector.
- */
-
-	.section .ivt, "ax"
-
-	.align	32768
-	.global ia64_vector_table
-	.size	ia64_vector_table, 32768
-ia64_vector_table:
-
-IVT_ENTRY(VHPT_Translation, 0x0000)
-	CALL(trap, 0, cr.ifa)
-IVT_END(VHPT_Translation)
-
-IVT_ENTRY(Instruction_TLB, 0x0400)
-	mov	r16=cr.ifa
-	mov	r17=pr
-	;;
-	thash	r18=r16
-	ttag	r19=r16
-	;;
-	add	r21=16,r18		// tag
-	add	r20=24,r18		// collision chain
-	;; 
-	ld8	r21=[r21]		// check VHPT tag
-	ld8	r20=[r20]		// bucket head
-	;;
-	cmp.ne	p15,p0=r21,r19
-(p15)	br.dpnt.few 1f
-	;;
-	ld8	r21=[r18]		// read pte
-	;;
-	itc.i	r21			// insert pte
-	mov	pr=r17,0x1ffff
-	;;
-	rfi				// done
-	;;
-1:	rsm	psr.dt			// turn off data translations
-	dep	r20=0,r20,61,3		// convert vhpt ptr to physical
-	;;
-	srlz.d				// serialize
-	ld8	r20=[r20]		// first entry
-	;;
-2:	cmp.eq	p15,p0=r0,r20		// done?
-(p15)	br.cond.spnt.few 9f		// bail if done
-	;;
-	add	r21=16,r20		// tag location
-	;;
-	ld8	r21=[r21]		// read tag
-	;;
-	cmp.ne	p15,p0=r21,r19		// compare tags
-(p15)	br.cond.sptk.few 3f		// if not, read next in chain
-	;;
-	ld8	r21=[r20]		// read pte
-	mov	r22=PTE_ACCESSED
-	;;
-	or	r21=r21,r22
-	;;
-	st8	[r20]=r21,8
-	;; 
-	ld8	r22=[r20]		// read rest of pte
-	;;
-	dep	r18=0,r18,61,3		// convert vhpt ptr to physical
-	;;
-	add	r20=16,r18		// address of tag
-	;;
-	ld8.acq	r23=[r20]		// read old tag
-	;;
-	dep	r23=-1,r23,63,1		// set ti bit
-	;;
-	st8.rel	[r20]=r23		// store old tag + ti
-	;;
-	mf				// make sure everyone sees
-	;;
-	st8	[r18]=r21,8		// store pte
-	;;
-	st8	[r18]=r22,8
-	;;
-	st8.rel	[r18]=r19		// store new tag
-	;;
-	itc.i	r21			// and place in TLB
-	ssm	psr.dt
-	;; 
-	srlz.d
-	mov	pr=r17,0x1ffff		// restore predicates
-	rfi
-	;;
-3:	add	r20=24,r20		// next in chain
-	;;
-	ld8	r20=[r20]		// read chain
-	br.sptk	2b			// loop
-	;;
-9:	ssm	psr.dt
-	mov	pr=r17,0x1ffff		// restore predicates
-	;;
-	srlz.d
-	;; 
-	CALL(trap, 20, cr.ifa)		// Page Not Present trap
-IVT_END(Instruction_TLB)
-
-IVT_ENTRY(Data_TLB, 0x0800)
-	mov	r16=cr.ifa
-	mov	r17=pr
-	;;
-	thash	r18=r16
-	ttag	r19=r16
-	;;
-	add	r21=16,r18		// tag
-	add	r20=24,r18		// collision chain
-	;; 
-	ld8	r21=[r21]		// check VHPT tag
-	ld8	r20=[r20]		// bucket head
-	;;
-	cmp.ne	p15,p0=r21,r19
-(p15)	br.dpnt.few 1f
-	;;
-	ld8	r21=[r18]		// read pte
-	;;
-	itc.d	r21			// insert pte
-	mov	pr=r17,0x1ffff
-	;;
-	rfi				// done
-	;;
-1:	rsm	psr.dt			// turn off data translations
-	dep	r20=0,r20,61,3		// convert vhpt ptr to physical
-	;; 
-	srlz.d				// serialize
-	ld8	r20=[r20]		// first entry
-	;;
-2:	cmp.eq	p15,p0=r0,r20		// done?
-(p15)	br.cond.spnt.few 9f		// bail if done
-	;;
-	add	r21=16,r20		// tag location
-	;;
-	ld8	r21=[r21]		// read tag
-	;;
-	cmp.ne	p15,p0=r21,r19		// compare tags
-(p15)	br.cond.sptk.few 3f		// if not, read next in chain
-	;;
-	ld8	r21=[r20]		// read pte
-	mov	r22=PTE_ACCESSED
-	;;
-	or	r21=r21,r22
-	;;
-	st8	[r20]=r21,8
-	;; 
-	ld8	r22=[r20]		// read rest of pte
-	;;
-	dep	r18=0,r18,61,3		// convert vhpt ptr to physical
-	;;
-	add	r20=16,r18		// address of tag
-	;;
-	ld8.acq	r23=[r20]		// read old tag
-	;;
-	dep	r23=-1,r23,63,1		// set ti bit
-	;;
-	st8.rel	[r20]=r23		// store old tag + ti
-	;;
-	mf				// make sure everyone sees
-	;;
-	st8	[r18]=r21,8		// store pte
-	;;
-	st8	[r18]=r22,8
-	;;
-	st8.rel	[r18]=r19		// store new tag
-	;;
-	itc.d	r21			// and place in TLB
-	ssm	psr.dt
-	;; 
-	srlz.d
-	mov	pr=r17,0x1ffff		// restore predicates
-	rfi
-	;;
-3:	add	r20=24,r20		// next in chain
-	;;
-	ld8	r20=[r20]		// read chain
-	br.sptk	2b			// loop
-	;;
-9:	ssm	psr.dt
-	mov	pr=r17,0x1ffff		// restore predicates
-	;;
-	srlz.d
-	;; 
-	CALL(trap, 20, cr.ifa)		// Page Not Present trap
-IVT_END(Data_TLB)
-
-IVT_ENTRY(Alternate_Instruction_TLB, 0x0c00)
-	mov	r16=cr.ifa		// where did it happen
-	mov	r18=pr			// save predicates
-	;;
-	extr.u	r17=r16,61,3		// get region number
-	mov	r19=PTE_PRESENT+PTE_ACCESSED+PTE_DIRTY+PTE_PL_KERN+PTE_AR_RWX
-	;;
-	cmp.eq	p13,p0=IA64_PBVM_RR,r17		// RR4?
-(p13)	br.cond.sptk.few	4f
-	;;
-	cmp.ge	p13,p0=5,r17		// RR0-RR5?
-	cmp.eq	p14,p15=7,r17		// RR7?
-(p13)	br.cond.spnt.few	9f
-	;;
-(p14)	add	r19=PTE_MA_WB,r19
-(p15)	add	r19=PTE_MA_UC,r19
-	dep	r17=0,r16,50,14		// clear bits above PPN
-	;;
-1:	dep	r16=r19,r17,0,12	// put pte bits in 0..11
-	;;
-	itc.i	r16
-	mov	pr=r18,0x1ffff		// restore predicates
-	;;
-	rfi
-	;;
-4:
-	add	r19=PTE_MA_WB,r19
-	movl	r17=IA64_PBVM_BASE
-	;;
-	sub	r17=r16,r17
-	movl	r16=IA64_PBVM_PGTBL
-	;;
-	extr.u	r17=r17,IA64_PBVM_PAGE_SHIFT,61-IA64_PBVM_PAGE_SHIFT
-	;;
-	shladd	r16=r17,3,r16
-	;;
-	ld8	r17=[r16]
-	br.sptk	1b
-	;;
-9:	mov	pr=r18,0x1ffff		// restore predicates
-	CALL(trap, 3, cr.ifa)
-IVT_END(Alternate_Instruction_TLB)
-
-IVT_ENTRY(Alternate_Data_TLB, 0x1000)
-	mov	r16=cr.ifa		// where did it happen
-	mov	r18=pr			// save predicates
-	;;
-	extr.u	r17=r16,61,3		// get region number
-	mov	r19=PTE_PRESENT+PTE_ACCESSED+PTE_DIRTY+PTE_PL_KERN+PTE_AR_RWX
-	;;
-	cmp.eq	p13,p0=IA64_PBVM_RR,r17		// RR4?
-(p13)	br.cond.sptk.few	4f
-	;;
-	cmp.ge	p13,p0=5,r17		// RR0-RR5?
-	cmp.eq	p14,p15=7,r17		// RR7?
-(p13)	br.cond.spnt.few	9f
-	;;
-(p14)	add	r19=PTE_MA_WB,r19
-(p15)	add	r19=PTE_MA_UC,r19
-	dep	r17=0,r16,50,14		// clear bits above PPN
-	;;
-1:	dep	r16=r19,r17,0,12	// put pte bits in 0..11
-	;;
-	itc.d	r16
-	mov	pr=r18,0x1ffff		// restore predicates
-	;;
-	rfi
-	;;
-4:
-	add	r19=PTE_MA_WB,r19
-	movl	r17=IA64_PBVM_BASE
-	;;
-	sub	r17=r16,r17
-	movl	r16=IA64_PBVM_PGTBL
-	;;
-	extr.u	r17=r17,IA64_PBVM_PAGE_SHIFT,61-IA64_PBVM_PAGE_SHIFT
-	;;
-	shladd	r16=r17,3,r16
-	;;
-	ld8	r17=[r16]
-	br.sptk	1b
-	;;
-9:	mov	pr=r18,0x1ffff		// restore predicates
-	CALL(trap, 4, cr.ifa)
-IVT_END(Alternate_Data_TLB)
-
-IVT_ENTRY(Data_Nested_TLB, 0x1400)
-	// See exception_save_restart and exception_restore_restart for the
-	// contexts that may cause a data nested TLB. We can only use the
-	// banked general registers and predicates, but don't use:
-	//	p14 & p15	-	Set in exception save
-	//	r16 & r17	-	Arguments to exception save
-	//	r30		-	Faulting address (modulo page size)
-	// We assume r30 has the virtual addresses that relate to the data
-	// nested TLB fault. The address does not have to be exact, as long
-	// as it's in the same page. We use physical addressing to avoid
-	// double nested faults. Since all virtual addresses we encounter
-	// here are direct mapped region 7 addresses, we have no problem
-	// constructing physical addresses.
-
-{	.mmi
-	mov		cr.ifa=r30
-	mov		r26=rr[r30]
-	extr.u		r27=r30,61,3
-	;;
-}
-{	.mii
-	nop		0
-	dep		r26=0,r26,0,2
-	cmp.eq		p12,p13=7,r27
-	;;
-}
-{	.mii
-	mov		cr.itir=r26
-(p12)	dep		r28=0,r30,0,12
-(p13)	extr.u		r28=r30,3*PAGE_SHIFT-8, PAGE_SHIFT-3	// dir L0 index
-	;;
-}
-{	.mlx
-(p12)	add		r28=PTE_PRESENT+PTE_ACCESSED+PTE_DIRTY+PTE_PL_KERN+PTE_AR_RWX+PTE_MA_WB,r28
-(p13)	movl		r27=ia64_kptdir
-	;;
-}
-{	.mib
-(p13)	ld8		r27=[r27]
-(p13)	extr.u		r26=r30,2*PAGE_SHIFT-5, PAGE_SHIFT-3	// dir L1 index
-(p12)	br.cond.spnt.few 1f
-	;;
-}
-{	.mmi
-	rsm		psr.dt
-	;;
-	srlz.d
-	dep		r27=0,r27,61,3
-	;;
-}
-{	.mmi
-	shladd		r27=r28,3,r27
-	;;
-	ld8		r27=[r27]				// dir L1 page
-	extr.u		r28=r30,PAGE_SHIFT,PAGE_SHIFT-5		// pte index
-	;;
-}
-{	.mii
-	shladd		r27=r26,3,r27
-	shl		r28=r28,5
-	;;
-	dep		r27=0,r27,61,3
-	;;
-}
-	ld8		r27=[r27]				// pte page
-	;;
-	add		r27=r28,r27
-	;;
-	dep		r27=0,r27,61,3
-	;;
-	ld8		r28=[r27]				// pte
-	;;
-	or		r28=PTE_DIRTY+PTE_ACCESSED,r28
-	;;
-	st8		[r27]=r28
-	;;
-	ssm		psr.dt
-	;;
-1:
-{	.mmi
-	itc.d		r28
-	;;
-	addl		r26=NTLBRT_SAVE,r0
-	addl		r27=NTLBRT_RESTORE,r0
-	;;
-}
-{	.mmi
-	srlz.d
-	cmp.eq		p12,p0=r29,r26
-	cmp.eq		p13,p0=r29,r27
-	;;
-}
-{	.mbb
-	nop		0
-(p12)	br.cond.sptk.few	exception_save_restart
-(p13)	br.cond.sptk.few	exception_restore_restart
-	;;
-}
-
-{	.mlx
-	mov		r26=ar.bsp
-	movl		r29=kstack
-	;;
-}
-{	.mlx
-	mov		r28=sp
-	movl		r27=kstack_top
-	;;
-}
-{	.mmi
-	add		sp=-16,r27
-	;;
-	mov		r27=ar.bspstore
-	nop		0
-	;;
-}
-	mov		ar.rsc=0
-	dep		r29=r27,r29,0,9
-	;;
-	mov		ar.bspstore=r29
-	;;
-	CALL(trap, 5, r30)
-IVT_END(Data_Nested_TLB)
-
-IVT_ENTRY(Instruction_Key_Miss, 0x1800)
-	CALL(trap, 6, cr.ifa)
-IVT_END(Instruction_Key_Miss)
-
-IVT_ENTRY(Data_Key_Miss, 0x1c00)
-	CALL(trap, 7, cr.ifa)
-IVT_END(Data_Key_Miss)
-
-IVT_ENTRY(Dirty_Bit, 0x2000)
-	mov	r16=cr.ifa
-	mov	r17=pr
-	;;
-	thash	r18=r16
-	;;
-	ttag	r19=r16
-	add	r20=24,r18		// collision chain
-	;; 
-	ld8	r20=[r20]		// bucket head
-	;;
-	rsm	psr.dt			// turn off data translations
-	dep	r20=0,r20,61,3		// convert vhpt ptr to physical
-	;;
-	srlz.d				// serialize
-	ld8	r20=[r20]		// first entry
-	;;
-1:	cmp.eq	p15,p0=r0,r20		// done?
-(p15)	br.cond.spnt.few 9f		// bail if done
-	;;
-	add	r21=16,r20		// tag location
-	;;
-	ld8	r21=[r21]		// read tag
-	;;
-	cmp.ne	p15,p0=r21,r19		// compare tags
-(p15)	br.cond.sptk.few 2f		// if not, read next in chain
-	;;
-	ld8	r21=[r20]		// read pte
-	mov	r22=PTE_DIRTY+PTE_ACCESSED
-	;;
-	or	r21=r22,r21		// set dirty & access bit
-	;;
-	st8	[r20]=r21,8		// store back
-	;; 
-	ld8	r22=[r20]		// read rest of pte
-	;;
-	dep	r18=0,r18,61,3		// convert vhpt ptr to physical
-	;;
-	add	r20=16,r18		// address of tag
-	;;
-	ld8.acq	r23=[r20]		// read old tag
-	;;
-	dep	r23=-1,r23,63,1		// set ti bit
-	;;
-	st8.rel	[r20]=r23		// store old tag + ti
-	;;
-	mf				// make sure everyone sees
-	;;
-	st8	[r18]=r21,8		// store pte
-	;;
-	st8	[r18]=r22,8
-	;;
-	st8.rel	[r18]=r19		// store new tag
-	;;
-	itc.d	r21			// and place in TLB
-	ssm	psr.dt
-	;; 
-	srlz.d
-	mov	pr=r17,0x1ffff		// restore predicates
-	rfi
-	;;
-2:	add	r20=24,r20		// next in chain
-	;;
-	ld8	r20=[r20]		// read chain
-	br.sptk	1b			// loop
-	;;
-9:	ssm	psr.dt
-	mov	pr=r17,0x1ffff		// restore predicates
-	;;
-	srlz.d
-	;;
-	CALL(trap, 8, cr.ifa)			// die horribly
-IVT_END(Dirty_Bit)
-
-IVT_ENTRY(Instruction_Access_Bit, 0x2400)
-	mov	r16=cr.ifa
-	mov	r17=pr
-	;;
-	thash	r18=r16
-	;;
-	ttag	r19=r16
-	add	r20=24,r18		// collision chain
-	;; 
-	ld8	r20=[r20]		// bucket head
-	;;
-	rsm	psr.dt			// turn off data translations
-	dep	r20=0,r20,61,3		// convert vhpt ptr to physical
-	;;
-	srlz.d				// serialize
-	ld8	r20=[r20]		// first entry
-	;;
-1:	cmp.eq	p15,p0=r0,r20		// done?
-(p15)	br.cond.spnt.few 9f		// bail if done
-	;;
-	add	r21=16,r20		// tag location
-	;;
-	ld8	r21=[r21]		// read tag
-	;;
-	cmp.ne	p15,p0=r21,r19		// compare tags
-(p15)	br.cond.sptk.few 2f		// if not, read next in chain
-	;;
-	ld8	r21=[r20]		// read pte
-	mov	r22=PTE_ACCESSED
-	;;
-	or	r21=r22,r21		// set accessed bit
-	;;
-	st8	[r20]=r21,8		// store back
-	;;
-	ld8	r22=[r20]		// read rest of pte
-	;;
-	dep	r18=0,r18,61,3		// convert vhpt ptr to physical
-	;;
-	add	r20=16,r18		// address of tag
-	;;
-	ld8.acq	r23=[r20]		// read old tag
-	;;
-	dep	r23=-1,r23,63,1		// set ti bit
-	;;
-	st8.rel	[r20]=r23		// store old tag + ti
-	;;
-	mf				// make sure everyone sees
-	;;
-	st8	[r18]=r21,8		// store pte
-	;;
-	st8	[r18]=r22,8
-	;;
-	st8.rel	[r18]=r19		// store new tag
-	;;
-	itc.i	r21			// and place in TLB
-	ssm	psr.dt
-	;; 
-	srlz.d
-	mov	pr=r17,0x1ffff		// restore predicates
-	rfi				// walker will retry the access
-	;;
-2:	add	r20=24,r20		// next in chain
-	;;
-	ld8	r20=[r20]		// read chain
-	br.sptk	1b			// loop
-	;;
-9:	ssm	psr.dt
-	mov	pr=r17,0x1ffff		// restore predicates
-	;;
-	srlz.d
-	;;
-	CALL(trap, 9, cr.ifa)
-IVT_END(Instruction_Access_Bit)
-
-IVT_ENTRY(Data_Access_Bit, 0x2800)
-	mov	r16=cr.ifa
-	mov	r17=pr
-	;;
-	thash	r18=r16
-	;;
-	ttag	r19=r16
-	add	r20=24,r18		// collision chain
-	;;
-	ld8	r20=[r20]		// bucket head
-	;;
-	rsm	psr.dt			// turn off data translations
-	dep	r20=0,r20,61,3		// convert vhpt ptr to physical
-	;;
-	srlz.d				// serialize
-	ld8	r20=[r20]		// first entry
-	;;
-1:	cmp.eq	p15,p0=r0,r20		// done?
-(p15)	br.cond.spnt.few 9f		// bail if done
-	;;
-	add	r21=16,r20		// tag location
-	;;
-	ld8	r21=[r21]		// read tag
-	;;
-	cmp.ne	p15,p0=r21,r19		// compare tags
-(p15)	br.cond.sptk.few 2f		// if not, read next in chain
-	;;
-	ld8	r21=[r20]		// read pte
-	mov	r22=PTE_ACCESSED
-	;;
-	or	r21=r22,r21		// set accessed bit
-	;;
-	st8	[r20]=r21,8		// store back
-	;; 
-	ld8	r22=[r20]		// read rest of pte
-	;;
-	dep	r18=0,r18,61,3		// convert vhpt ptr to physical
-	;;
-	add	r20=16,r18		// address of tag
-	;;
-	ld8.acq	r23=[r20]		// read old tag
-	;;
-	dep	r23=-1,r23,63,1		// set ti bit
-	;;
-	st8.rel	[r20]=r23		// store old tag + ti
-	;;
-	mf				// make sure everyone sees
-	;;
-	st8	[r18]=r21,8		// store pte
-	;;
-	st8	[r18]=r22,8
-	;;
-	st8.rel	[r18]=r19		// store new tag
-	;;
-	itc.d	r21			// and place in TLB
-	ssm	psr.dt
-	;; 
-	srlz.d
-	mov	pr=r17,0x1ffff		// restore predicates
-	rfi				// walker will retry the access
-	;;
-2:	add	r20=24,r20		// next in chain
-	;;
-	ld8	r20=[r20]		// read chain
-	br.sptk	1b			// loop
-	;;
-9:	ssm	psr.dt
-	mov	pr=r17,0x1ffff		// restore predicates
-	;;
-	srlz.d
-	;;
-	CALL(trap, 10, cr.ifa)
-IVT_END(Data_Access_Bit)
-
-IVT_ENTRY(Break_Instruction, 0x2c00)
-{	.mib
-	mov		r17=cr.iim
-	mov		r16=ip
-	br.sptk		exception_save
-	;;
-}
-{	.mmi
-	alloc		r15=ar.pfs,0,0,2,0
-	;;
-(p11)	ssm		psr.i
-	mov		out0=11
-	;;
-}
-{	.mmi
-	flushrs
-	;;
-(p11)	srlz.d
-	add		out1=16,sp
-}
-{	.mib
-	nop		0
-	nop		0
-	br.call.sptk	rp=trap
-	;;
-}
-{	.mib
-	nop		0
-	nop		0
-	br.sptk		exception_restore
-	;;
-}
-IVT_END(Break_Instruction)
-
-IVT_ENTRY(External_Interrupt, 0x3000)
-{	.mib
-	mov		r17=0
-	mov		r16=ip
-	br.sptk		exception_save
-	;;
-}
-{	.mmi
-	alloc		r15=ar.pfs,0,0,1,0
-	nop		0
-	nop		0
-	;;
-}
-{	.mib
-	add		out0=16,sp
-	nop		0
-	br.call.sptk	rp=ia64_handle_intr
-	;;
-}
-{	.mib
-	nop		0
-	nop		0
-	br.sptk		exception_restore
-	;;
-}
-IVT_END(External_Interrupt)
-
-IVT_ENTRY(Reserved_3400, 0x3400)
-	CALL(trap, 13, cr.ifa)
-IVT_END(Reserved_3400)
-
-IVT_ENTRY(Reserved_3800, 0x3800)
-	CALL(trap, 14, cr.ifa)
-IVT_END(Reserved_3800)
-
-IVT_ENTRY(Reserved_3c00, 0x3c00)
-	CALL(trap, 15, cr.ifa)
-IVT_END(Reserved_3c00)
-
-IVT_ENTRY(Reserved_4000, 0x4000)
-	CALL(trap, 16, cr.ifa)
-IVT_END(Reserved_4000)
-
-IVT_ENTRY(Reserved_4400, 0x4400)
-	CALL(trap, 17, cr.ifa)
-IVT_END(Reserved_4400)
-
-IVT_ENTRY(Reserved_4800, 0x4800)
-	CALL(trap, 18, cr.ifa)
-IVT_END(Reserved_4800)
-
-IVT_ENTRY(Reserved_4c00, 0x4c00)
-	CALL(trap, 19, cr.ifa)
-IVT_END(Reserved_4c00)
-
-IVT_ENTRY(Page_Not_Present, 0x5000)
-	CALL(trap, 20, cr.ifa)
-IVT_END(Page_Not_Present)
-
-IVT_ENTRY(Key_Permission, 0x5100)
-	CALL(trap, 21, cr.ifa)
-IVT_END(Key_Permission)
-
-IVT_ENTRY(Instruction_Access_Rights, 0x5200)
-	CALL(trap, 22, cr.ifa)
-IVT_END(Instruction_Access_Rights)
-
-IVT_ENTRY(Data_Access_Rights, 0x5300)
-	CALL(trap, 23, cr.ifa)
-IVT_END(Data_Access_Rights)
-
-IVT_ENTRY(General_Exception, 0x5400)
-	CALL(trap, 24, cr.ifa)
-IVT_END(General_Exception)
-
-IVT_ENTRY(Disabled_FP_Register, 0x5500)
-	CALL(trap, 25, cr.ifa)
-IVT_END(Disabled_FP_Register)
-
-IVT_ENTRY(NaT_Consumption, 0x5600)
-	CALL(trap, 26, cr.ifa)
-IVT_END(NaT_Consumption)
-
-IVT_ENTRY(Speculation, 0x5700)
-	CALL(trap, 27, cr.iim)
-IVT_END(Speculation)
-
-IVT_ENTRY(Reserved_5800, 0x5800)
-	CALL(trap, 28, cr.ifa)
-IVT_END(Reserved_5800)
-
-IVT_ENTRY(Debug, 0x5900)
-	CALL(trap, 29, cr.ifa)
-IVT_END(Debug)
-
-IVT_ENTRY(Unaligned_Reference, 0x5a00)
-	CALL(trap, 30, cr.ifa)
-IVT_END(Unaligned_Reference)
-
-IVT_ENTRY(Unsupported_Data_Reference, 0x5b00)
-	CALL(trap, 31, cr.ifa)
-IVT_END(Unsupported_Data_Reference)
-
-IVT_ENTRY(Floating_Point_Fault, 0x5c00)
-	CALL(trap, 32, cr.ifa)
-IVT_END(Floating_Point_Fault)
-
-IVT_ENTRY(Floating_Point_Trap, 0x5d00)
-	CALL(trap, 33, cr.ifa)
-IVT_END(Floating_Point_Trap)
-
-IVT_ENTRY(Lower_Privilege_Transfer_Trap, 0x5e00)
-	CALL(trap, 34, cr.ifa)
-IVT_END(Lower_Privilege_Transfer_Trap)
-
-IVT_ENTRY(Taken_Branch_Trap, 0x5f00)
-	CALL(trap, 35, cr.ifa)
-IVT_END(Taken_Branch_Trap)
-
-IVT_ENTRY(Single_Step_Trap, 0x6000)
-	CALL(trap, 36, cr.ifa)
-IVT_END(Single_Step_Trap)
-
-IVT_ENTRY(Reserved_6100, 0x6100)
-	CALL(trap, 37, cr.ifa)
-IVT_END(Reserved_6100)
-
-IVT_ENTRY(Reserved_6200, 0x6200)
-	CALL(trap, 38, cr.ifa)
-IVT_END(Reserved_6200)
-
-IVT_ENTRY(Reserved_6300, 0x6300)
-	CALL(trap, 39, cr.ifa)
-IVT_END(Reserved_6300)
-
-IVT_ENTRY(Reserved_6400, 0x6400)
-	CALL(trap, 40, cr.ifa)
-IVT_END(Reserved_6400)
-
-IVT_ENTRY(Reserved_6500, 0x6500)
-	CALL(trap, 41, cr.ifa)
-IVT_END(Reserved_6500)
-
-IVT_ENTRY(Reserved_6600, 0x6600)
-	CALL(trap, 42, cr.ifa)
-IVT_END(Reserved_6600)
-
-IVT_ENTRY(Reserved_6700, 0x6700)
-	CALL(trap, 43, cr.ifa)
-IVT_END(Reserved_6700)
-
-IVT_ENTRY(Reserved_6800, 0x6800)
-	CALL(trap, 44, cr.ifa)
-IVT_END(Reserved_6800)
-
-IVT_ENTRY(IA_32_Exception, 0x6900)
-	CALL(IA32_TRAP, 45, cr.ifa)
-IVT_END(IA_32_Exception)
-
-IVT_ENTRY(IA_32_Intercept, 0x6a00)
-	CALL(IA32_TRAP, 46, cr.iim)
-IVT_END(IA_32_Intercept)
-
-IVT_ENTRY(IA_32_Interrupt, 0x6b00)
-	CALL(IA32_TRAP, 47, cr.ifa)
-IVT_END(IA_32_Interrupt)
-
-IVT_ENTRY(Reserved_6c00, 0x6c00)
-	CALL(trap, 48, cr.ifa)
-IVT_END(Reserved_6c00)
-
-IVT_ENTRY(Reserved_6d00, 0x6d00)
-	CALL(trap, 49, cr.ifa)
-IVT_END(Reserved_6d00)
-
-IVT_ENTRY(Reserved_6e00, 0x6e00)
-	CALL(trap, 50, cr.ifa)
-IVT_END(Reserved_6e00)
-
-IVT_ENTRY(Reserved_6f00, 0x6f00)
-	CALL(trap, 51, cr.ifa)
-IVT_END(Reserved_6f00)
-
-IVT_ENTRY(Reserved_7000, 0x7000)
-	CALL(trap, 52, cr.ifa)
-IVT_END(Reserved_7000)
-
-IVT_ENTRY(Reserved_7100, 0x7100)
-	CALL(trap, 53, cr.ifa)
-IVT_END(Reserved_7100)
-
-IVT_ENTRY(Reserved_7200, 0x7200)
-	CALL(trap, 54, cr.ifa)
-IVT_END(Reserved_7200)
-
-IVT_ENTRY(Reserved_7300, 0x7300)
-	CALL(trap, 55, cr.ifa)
-IVT_END(Reserved_7300)
-
-IVT_ENTRY(Reserved_7400, 0x7400)
-	CALL(trap, 56, cr.ifa)
-IVT_END(Reserved_7400)
-
-IVT_ENTRY(Reserved_7500, 0x7500)
-	CALL(trap, 57, cr.ifa)
-IVT_END(Reserved_7500)
-
-IVT_ENTRY(Reserved_7600, 0x7600)
-	CALL(trap, 58, cr.ifa)
-IVT_END(Reserved_7600)
-
-IVT_ENTRY(Reserved_7700, 0x7700)
-	CALL(trap, 59, cr.ifa)
-IVT_END(Reserved_7700)
-
-IVT_ENTRY(Reserved_7800, 0x7800)
-	CALL(trap, 60, cr.ifa)
-IVT_END(Reserved_7800)
-
-IVT_ENTRY(Reserved_7900, 0x7900)
-	CALL(trap, 61, cr.ifa)
-IVT_END(Reserved_7900)
-
-IVT_ENTRY(Reserved_7a00, 0x7a00)
-	CALL(trap, 62, cr.ifa)
-IVT_END(Reserved_7a00)
-
-IVT_ENTRY(Reserved_7b00, 0x7b00)
-	CALL(trap, 63, cr.ifa)
-IVT_END(Reserved_7b00)
-
-IVT_ENTRY(Reserved_7c00, 0x7c00)
-	CALL(trap, 64, cr.ifa)
-IVT_END(Reserved_7c00)
-
-IVT_ENTRY(Reserved_7d00, 0x7d00)
-	CALL(trap, 65, cr.ifa)
-IVT_END(Reserved_7d00)
-
-IVT_ENTRY(Reserved_7e00, 0x7e00)
-	CALL(trap, 66, cr.ifa)
-IVT_END(Reserved_7e00)
-
-IVT_ENTRY(Reserved_7f00, 0x7f00)
-	CALL(trap, 67, cr.ifa)
-IVT_END(Reserved_7f00)
diff --git a/sys/ia64/ia64/gdb_machdep.c b/sys/ia64/ia64/gdb_machdep.c
deleted file mode 100644
index 54d27d9f3b96..000000000000
--- a/sys/ia64/ia64/gdb_machdep.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*-
- * Copyright (c) 2004 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 AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED 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 BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) 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/kdb.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/signal.h>
-
-#include <machine/gdb_machdep.h>
-#include <machine/md_var.h>
-#include <machine/pcb.h>
-#include <machine/reg.h>
-
-#include <gdb/gdb.h>
-#include <gdb/gdb_int.h>
-
-void *
-gdb_cpu_getreg(int regnum, size_t *regsz)
-{
-	static uint64_t synth;
-	uint64_t cfm;
-
-	*regsz = gdb_cpu_regsz(regnum);
-	switch (regnum) {
-	/* Registers 0-127: general registers. */
-	case 1:  return (&kdb_thrctx->pcb_special.gp);
-	case 4:  return (&kdb_thrctx->pcb_preserved.gr4);
-	case 5:  return (&kdb_thrctx->pcb_preserved.gr5);
-	case 6:  return (&kdb_thrctx->pcb_preserved.gr6);
-	case 7:  return (&kdb_thrctx->pcb_preserved.gr7);
-	case 12: return (&kdb_thrctx->pcb_special.sp);
-	case 13: return (&kdb_thrctx->pcb_special.tp);
-	/* Registers 128-255: floating-point registers. */
-	case 130: return (&kdb_thrctx->pcb_preserved_fp.fr2);
-	case 131: return (&kdb_thrctx->pcb_preserved_fp.fr3);
-	case 132: return (&kdb_thrctx->pcb_preserved_fp.fr4);
-	case 133: return (&kdb_thrctx->pcb_preserved_fp.fr5);
-	case 144: return (&kdb_thrctx->pcb_preserved_fp.fr16);
-	case 145: return (&kdb_thrctx->pcb_preserved_fp.fr17);
-	case 146: return (&kdb_thrctx->pcb_preserved_fp.fr18);
-	case 147: return (&kdb_thrctx->pcb_preserved_fp.fr19);
-	case 148: return (&kdb_thrctx->pcb_preserved_fp.fr20);
-	case 149: return (&kdb_thrctx->pcb_preserved_fp.fr21);
-	case 150: return (&kdb_thrctx->pcb_preserved_fp.fr22);
-	case 151: return (&kdb_thrctx->pcb_preserved_fp.fr23);
-	case 152: return (&kdb_thrctx->pcb_preserved_fp.fr24);
-	case 153: return (&kdb_thrctx->pcb_preserved_fp.fr25);
-	case 154: return (&kdb_thrctx->pcb_preserved_fp.fr26);
-	case 155: return (&kdb_thrctx->pcb_preserved_fp.fr27);
-	case 156: return (&kdb_thrctx->pcb_preserved_fp.fr28);
-	case 157: return (&kdb_thrctx->pcb_preserved_fp.fr29);
-	case 158: return (&kdb_thrctx->pcb_preserved_fp.fr30);
-	case 159: return (&kdb_thrctx->pcb_preserved_fp.fr31);
-	/* Registers 320-327: branch registers. */
-	case 320:
-		if (kdb_thrctx->pcb_special.__spare == ~0UL)
-			return (&kdb_thrctx->pcb_special.rp);
-		break;
-	case 321: return (&kdb_thrctx->pcb_preserved.br1);
-	case 322: return (&kdb_thrctx->pcb_preserved.br2);
-	case 323: return (&kdb_thrctx->pcb_preserved.br3);
-	case 324: return (&kdb_thrctx->pcb_preserved.br4);
-	case 325: return (&kdb_thrctx->pcb_preserved.br5);
-	/* Registers 328-333: misc. other registers. */
-	case 330: return (&kdb_thrctx->pcb_special.pr);
-	case 331:
-		if (kdb_thrctx->pcb_special.__spare == ~0UL) {
-			synth = kdb_thrctx->pcb_special.iip;
-			synth += (kdb_thrctx->pcb_special.psr >> 41) & 3;
-			return (&synth);
-		}
-		return (&kdb_thrctx->pcb_special.rp);
-	case 333:
-		if (kdb_thrctx->pcb_special.__spare == ~0UL)
-			return (&kdb_thrctx->pcb_special.cfm);
-		return (&kdb_thrctx->pcb_special.pfs);
-	/* Registers 334-461: application registers. */
-	case 350: return (&kdb_thrctx->pcb_special.rsc);
-	case 351: /* bsp */
-	case 352: /* bspstore. */
-		synth = kdb_thrctx->pcb_special.bspstore;
-		if (kdb_thrctx->pcb_special.__spare == ~0UL) {
-			synth += kdb_thrctx->pcb_special.ndirty;
-		} else {
-			cfm = kdb_thrctx->pcb_special.pfs;
-			synth = ia64_bsp_adjust(synth,
-			    IA64_CFM_SOF(cfm) - IA64_CFM_SOL(cfm));
-		}
-		return (&synth);
-	case 353: return (&kdb_thrctx->pcb_special.rnat);
-	case 370: return (&kdb_thrctx->pcb_special.unat);
-	case 374: return (&kdb_thrctx->pcb_special.fpsr);
-	case 398:
-		if (kdb_thrctx->pcb_special.__spare == ~0UL)
-			return (&kdb_thrctx->pcb_special.pfs);
-		break;
-	case 399: return (&kdb_thrctx->pcb_preserved.lc);
-	}
-	return (NULL);
-}
-
-void
-gdb_cpu_setreg(int regnum, void *val)
-{
-
-	switch (regnum) {
-	case GDB_REG_PC: break;
-	}
-}
-
-int
-gdb_cpu_signal(int vector, int dummy __unused)
-{
-
-	if (vector == IA64_VEC_BREAK || vector == IA64_VEC_SINGLE_STEP_TRAP)
-		return (SIGTRAP);
-	/* Add 100 so GDB won't translate the vector into signal names. */
-	return (vector + 100);
-}
-
-int
-gdb_cpu_query(void)
-{
-#if 0
-	uint64_t bspstore, *kstack;
-#endif
-	uintmax_t slot;
-
-	if (!gdb_rx_equal("Part:dirty:read::"))
-		return (0);
-
-	if (gdb_rx_varhex(&slot) < 0) {
-		gdb_tx_err(EINVAL);
-		return (-1);
-	}
-
-	gdb_tx_err(EINVAL);
-	return (-1);
-
-#if 0
-	/* slot is unsigned. No need to test for negative values. */
-	if (slot >= (kdb_frame->tf_special.ndirty >> 3)) {
-		return (-1);
-	}
-
-	/*
-	 * If the trapframe describes a kernel entry, bspstore holds
-	 * the address of the user backing store. Calculate the right
-	 * kernel stack address. See also ptrace_machdep().
-	 */
-	bspstore = kdb_frame->tf_special.bspstore;
-	kstack = (bspstore >= VM_MAXUSER_ADDRESS) ? (uint64_t*)bspstore :
-	    (uint64_t*)(kdb_thread->td_kstack + (bspstore & 0x1ffUL));
-	gdb_tx_begin('\0');
-	gdb_tx_mem((void*)(kstack + slot), 8);
-	gdb_tx_end();
-	return (1);
-#endif
-}
diff --git a/sys/ia64/ia64/genassym.c b/sys/ia64/ia64/genassym.c
deleted file mode 100644
index 10ba5abfd77a..000000000000
--- a/sys/ia64/ia64/genassym.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * Copyright (c) 1982, 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 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.
- *
- * $FreeBSD$
- */
-
-#include "opt_compat.h"
-#include "opt_kstack_pages.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/assym.h>
-#include <sys/proc.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
-#include <sys/errno.h>
-#include <sys/proc.h>
-#include <sys/mount.h>
-#include <sys/socket.h>
-#include <sys/resource.h>
-#include <sys/resourcevar.h>
-#include <sys/ucontext.h>
-#include <machine/frame.h>
-#include <machine/elf.h>
-#include <machine/pal.h>
-#include <machine/pcb.h>
-#include <sys/vmmeter.h>
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-#include <vm/vm_map.h>
-#include <net/if.h>
-#include <netinet/in.h>
-
-#ifdef COMPAT_FREEBSD32
-ASSYM(COMPAT_FREEBSD32,	COMPAT_FREEBSD32);
-#endif
-
-ASSYM(DT_NULL,		DT_NULL);
-ASSYM(DT_RELA,		DT_RELA);
-ASSYM(DT_RELAENT,	DT_RELAENT);
-ASSYM(DT_RELASZ,	DT_RELASZ);
-ASSYM(DT_SYMTAB,	DT_SYMTAB);
-ASSYM(DT_SYMENT,	DT_SYMENT);
-
-ASSYM(EFAULT,		EFAULT);
-ASSYM(ENAMETOOLONG,	ENAMETOOLONG);
-ASSYM(ERESTART,		ERESTART);
-
-ASSYM(FRAME_SYSCALL,	FRAME_SYSCALL);
-
-ASSYM(IA64_PBVM_BASE,	IA64_PBVM_BASE);
-ASSYM(IA64_PBVM_PAGE_SHIFT, IA64_PBVM_PAGE_SHIFT);
-ASSYM(IA64_PBVM_PGTBL,	IA64_PBVM_PGTBL);
-ASSYM(IA64_PBVM_RR,	IA64_PBVM_RR);
-
-ASSYM(IA64_VM_MINKERN_REGION, IA64_VM_MINKERN_REGION);
-
-ASSYM(KSTACK_PAGES,	KSTACK_PAGES);
-
-ASSYM(MC_PRESERVED,	offsetof(mcontext_t, mc_preserved));
-ASSYM(MC_PRESERVED_FP,	offsetof(mcontext_t, mc_preserved_fp));
-ASSYM(MC_SPECIAL,	offsetof(mcontext_t, mc_special));
-ASSYM(MC_SPECIAL_BSPSTORE, offsetof(mcontext_t, mc_special.bspstore));
-ASSYM(MC_SPECIAL_RNAT,	offsetof(mcontext_t, mc_special.rnat));
-
-ASSYM(PAGE_SHIFT,	PAGE_SHIFT);
-ASSYM(PAGE_SIZE,	PAGE_SIZE);
-
-ASSYM(PC_CURRENT_PMAP,	offsetof(struct pcpu, pc_md.current_pmap));
-ASSYM(PC_IDLETHREAD,	offsetof(struct pcpu, pc_idlethread));
-
-ASSYM(PCB_CURRENT_PMAP,	offsetof(struct pcb, pcb_current_pmap));
-ASSYM(PCB_ONFAULT,	offsetof(struct pcb, pcb_onfault));
-ASSYM(PCB_SPECIAL_RP,	offsetof(struct pcb, pcb_special.rp));
-
-ASSYM(R_IA_64_DIR64LSB,	R_IA_64_DIR64LSB);
-ASSYM(R_IA_64_FPTR64LSB, R_IA_64_FPTR64LSB);
-ASSYM(R_IA_64_NONE,	R_IA_64_NONE);
-ASSYM(R_IA_64_REL64LSB,	R_IA_64_REL64LSB);
-
-ASSYM(SIZEOF_PCB,	sizeof(struct pcb));
-ASSYM(SIZEOF_SPECIAL,	sizeof(struct _special));
-ASSYM(SIZEOF_TRAPFRAME,	sizeof(struct trapframe));
-
-ASSYM(TD_FLAGS,		offsetof(struct thread, td_flags));
-ASSYM(TD_KSTACK,	offsetof(struct thread, td_kstack));
-ASSYM(TD_PCB,		offsetof(struct thread, td_pcb));
-
-ASSYM(TDF_ASTPENDING,	TDF_ASTPENDING);
-ASSYM(TDF_NEEDRESCHED,	TDF_NEEDRESCHED);
-
-ASSYM(UC_MCONTEXT,	offsetof(ucontext_t, uc_mcontext));
-
-ASSYM(VM_MAXUSER_ADDRESS, VM_MAXUSER_ADDRESS);
diff --git a/sys/ia64/ia64/highfp.c b/sys/ia64/ia64/highfp.c
deleted file mode 100644
index f18773bdb56a..000000000000
--- a/sys/ia64/ia64/highfp.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * Copyright (c) 2009 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
-
-#include <machine/frame.h>
-#include <machine/md_var.h>
-#include <machine/smp.h>
-
-static struct mtx ia64_highfp_mtx;
-
-static void
-ia64_highfp_init(void *_)
-{
-	mtx_init(&ia64_highfp_mtx, "High FP lock", NULL, MTX_SPIN);
-}
-SYSINIT(ia64_highfp_init, SI_SUB_LOCK, SI_ORDER_ANY, ia64_highfp_init, NULL);
-
-#ifdef SMP
-static int
-ia64_highfp_ipi(struct pcpu *cpu)
-{
-	int error;
-
-	ipi_send(cpu, ia64_ipi_highfp);
-	error = msleep_spin(&cpu->pc_fpcurthread, &ia64_highfp_mtx,
-	    "High FP", 0);
-	return (error);
-}
-#endif
-
-int
-ia64_highfp_drop(struct thread *td)
-{
-	struct pcb *pcb;
-	struct pcpu *cpu;
-
-	pcb = td->td_pcb;
-
-	mtx_lock_spin(&ia64_highfp_mtx);
-	cpu = pcb->pcb_fpcpu;
-	if (cpu != NULL) {
-		KASSERT(cpu->pc_fpcurthread == td,
-		    ("cpu->pc_fpcurthread != td"));
-		td->td_frame->tf_special.psr |= IA64_PSR_DFH;
-		pcb->pcb_fpcpu = NULL;
-		cpu->pc_fpcurthread = NULL;
-	}
-	mtx_unlock_spin(&ia64_highfp_mtx);
-
-	return ((cpu != NULL) ? 1 : 0);
-}
-
-int
-ia64_highfp_enable(struct thread *td, struct trapframe *tf)
-{
-	struct pcb *pcb;
-	struct pcpu *cpu;
-	struct thread *td1;
-
-	pcb = td->td_pcb;
-
-	mtx_lock_spin(&ia64_highfp_mtx);
-	cpu = pcb->pcb_fpcpu;
-#ifdef SMP
-	if (cpu != NULL && cpu != pcpup) {
-		KASSERT(cpu->pc_fpcurthread == td,
-		    ("cpu->pc_fpcurthread != td"));
-		ia64_highfp_ipi(cpu);
-	}
-#endif
-	td1 = PCPU_GET(fpcurthread);
-	if (td1 != NULL && td1 != td) {
-		KASSERT(td1->td_pcb->pcb_fpcpu == pcpup,
-		    ("td1->td_pcb->pcb_fpcpu != pcpup"));
-		save_high_fp(&td1->td_pcb->pcb_high_fp);
-		td1->td_frame->tf_special.psr |= IA64_PSR_DFH;
-		td1->td_pcb->pcb_fpcpu = NULL;
-		PCPU_SET(fpcurthread, NULL);
-		td1 = NULL;
-	}
-	if (td1 == NULL) {
-		KASSERT(pcb->pcb_fpcpu == NULL, ("pcb->pcb_fpcpu != NULL"));
-		KASSERT(PCPU_GET(fpcurthread) == NULL,
-		    ("PCPU_GET(fpcurthread) != NULL"));
-		restore_high_fp(&pcb->pcb_high_fp);
-		PCPU_SET(fpcurthread, td);
-		pcb->pcb_fpcpu = pcpup;
-		tf->tf_special.psr &= ~IA64_PSR_MFH;
-	}
-	tf->tf_special.psr &= ~IA64_PSR_DFH;
-	mtx_unlock_spin(&ia64_highfp_mtx);
-
-	return ((td1 != NULL) ? 1 : 0);
-}
-
-int
-ia64_highfp_save(struct thread *td)
-{
-	struct pcb *pcb;
-	struct pcpu *cpu;
-
-	pcb = td->td_pcb;
-
-	mtx_lock_spin(&ia64_highfp_mtx);
-	cpu = pcb->pcb_fpcpu;
-#ifdef SMP
-	if (cpu != NULL && cpu != pcpup) {
-		KASSERT(cpu->pc_fpcurthread == td,
-		    ("cpu->pc_fpcurthread != td"));
-		ia64_highfp_ipi(cpu);
-	} else
-#endif
-	if (cpu != NULL) {
-		KASSERT(cpu->pc_fpcurthread == td,
-		    ("cpu->pc_fpcurthread != td"));
-		save_high_fp(&pcb->pcb_high_fp);
-		td->td_frame->tf_special.psr |= IA64_PSR_DFH;
-		pcb->pcb_fpcpu = NULL;
-		cpu->pc_fpcurthread = NULL;
-	}
-	mtx_unlock_spin(&ia64_highfp_mtx);
-
-	return ((cpu != NULL) ? 1 : 0);
-}
-
-#ifdef SMP
-int
-ia64_highfp_save_ipi(void)
-{
-	struct thread *td;
-
-	mtx_lock_spin(&ia64_highfp_mtx);
-	td = PCPU_GET(fpcurthread);
-	if (td != NULL) {
-		KASSERT(td->td_pcb->pcb_fpcpu == pcpup,
-		    ("td->td_pcb->pcb_fpcpu != pcpup"));
-		save_high_fp(&td->td_pcb->pcb_high_fp);
-		td->td_frame->tf_special.psr |= IA64_PSR_DFH;
-		td->td_pcb->pcb_fpcpu = NULL;
-		PCPU_SET(fpcurthread, NULL);
-	}
-	mtx_unlock_spin(&ia64_highfp_mtx);
-	wakeup(&PCPU_GET(fpcurthread));
-
-	return ((td != NULL) ? 1 : 0);
-}
-#endif
diff --git a/sys/ia64/ia64/in_cksum.c b/sys/ia64/ia64/in_cksum.c
deleted file mode 100644
index 6c9959fe9fa1..000000000000
--- a/sys/ia64/ia64/in_cksum.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/* $FreeBSD$ */
-/* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
-
-/*-
- * Copyright (c) 1988, 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- * Copyright (c) 1996
- *	Matt Thomas <matt@3am-software.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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.
- *
- *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- */
-
-#include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-
-#include <sys/param.h>
-#include <sys/mbuf.h>
-#include <sys/systm.h>
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <machine/in_cksum.h>
-
-/*
- * Checksum routine for Internet Protocol family headers
- *    (Portable Alpha version).
- *
- * This routine is very heavily used in the network
- * code and should be modified for each CPU to be as fast as possible.
- */
-
-#define ADDCARRY(x)  (x > 65535 ? x -= 65535 : x)
-#define REDUCE32							  \
-    {									  \
-	q_util.q = sum;							  \
-	sum = q_util.s[0] + q_util.s[1] + q_util.s[2] + q_util.s[3];	  \
-    }
-#define REDUCE16							  \
-    {									  \
-	q_util.q = sum;							  \
-	l_util.l = q_util.s[0] + q_util.s[1] + q_util.s[2] + q_util.s[3]; \
-	sum = l_util.s[0] + l_util.s[1];				  \
-	ADDCARRY(sum);							  \
-    }
-
-static const u_int32_t in_masks[] = {
-	/*0 bytes*/ /*1 byte*/	/*2 bytes*/ /*3 bytes*/
-	0x00000000, 0x000000FF, 0x0000FFFF, 0x00FFFFFF,	/* offset 0 */
-	0x00000000, 0x0000FF00, 0x00FFFF00, 0xFFFFFF00,	/* offset 1 */
-	0x00000000, 0x00FF0000, 0xFFFF0000, 0xFFFF0000,	/* offset 2 */
-	0x00000000, 0xFF000000, 0xFF000000, 0xFF000000,	/* offset 3 */
-};
-
-union l_util {
-	u_int16_t s[2];
-	u_int32_t l;
-};
-union q_util {
-	u_int16_t s[4];
-	u_int32_t l[2];
-	u_int64_t q;
-};
-
-static u_int64_t
-in_cksumdata(const void *buf, int len)
-{
-	const u_int32_t *lw = (const u_int32_t *) buf;
-	u_int64_t sum = 0;
-	u_int64_t prefilled;
-	int offset;
-	union q_util q_util;
-
-	if ((3 & (long) lw) == 0 && len == 20) {
-	     sum = (u_int64_t) lw[0] + lw[1] + lw[2] + lw[3] + lw[4];
-	     REDUCE32;
-	     return sum;
-	}
-
-	if ((offset = 3 & (long) lw) != 0) {
-		const u_int32_t *masks = in_masks + (offset << 2);
-		lw = (u_int32_t *) (((long) lw) - offset);
-		sum = *lw++ & masks[len >= 3 ? 3 : len];
-		len -= 4 - offset;
-		if (len <= 0) {
-			REDUCE32;
-			return sum;
-		}
-	}
-#if 0
-	/*
-	 * Force to cache line boundary.
-	 */
-	offset = 32 - (0x1f & (long) lw);
-	if (offset < 32 && len > offset) {
-		len -= offset;
-		if (4 & offset) {
-			sum += (u_int64_t) lw[0];
-			lw += 1;
-		}
-		if (8 & offset) {
-			sum += (u_int64_t) lw[0] + lw[1];
-			lw += 2;
-		}
-		if (16 & offset) {
-			sum += (u_int64_t) lw[0] + lw[1] + lw[2] + lw[3];
-			lw += 4;
-		}
-	}
-#endif
-	/*
-	 * access prefilling to start load of next cache line.
-	 * then add current cache line
-	 * save result of prefilling for loop iteration.
-	 */
-	prefilled = lw[0];
-	while ((len -= 32) >= 4) {
-		u_int64_t prefilling = lw[8];
-		sum += prefilled + lw[1] + lw[2] + lw[3]
-			+ lw[4] + lw[5] + lw[6] + lw[7];
-		lw += 8;
-		prefilled = prefilling;
-	}
-	if (len >= 0) {
-		sum += prefilled + lw[1] + lw[2] + lw[3]
-			+ lw[4] + lw[5] + lw[6] + lw[7];
-		lw += 8;
-	} else {
-		len += 32;
-	}
-	while ((len -= 16) >= 0) {
-		sum += (u_int64_t) lw[0] + lw[1] + lw[2] + lw[3];
-		lw += 4;
-	}
-	len += 16;
-	while ((len -= 4) >= 0) {
-		sum += (u_int64_t) *lw++;
-	}
-	len += 4;
-	if (len > 0)
-		sum += (u_int64_t) (in_masks[len] & *lw);
-	REDUCE32;
-	return sum;
-}
-
-u_short
-in_addword(u_short a, u_short b)
-{
-	u_int64_t sum = a + b;
-
-	ADDCARRY(sum);
-	return (sum);
-}
-
-u_short
-in_pseudo(u_int32_t a, u_int32_t b, u_int32_t c)
-{
-	u_int64_t sum;
-	union q_util q_util;
-	union l_util l_util;
-		    
-	sum = (u_int64_t) a + b + c;
-	REDUCE16;
-	return (sum);
-}
-
-u_short
-in_cksum_skip(struct mbuf *m, int len, int skip)
-{
-	u_int64_t sum = 0;
-	int mlen = 0;
-	int clen = 0;
-	caddr_t addr;
-	union q_util q_util;
-	union l_util l_util;
-
-        len -= skip;
-        for (; skip && m; m = m->m_next) {
-                if (m->m_len > skip) {
-                        mlen = m->m_len - skip;
-			addr = mtod(m, caddr_t) + skip;
-                        goto skip_start;
-                } else {
-                        skip -= m->m_len;
-                }
-        }
-
-	for (; m && len; m = m->m_next) {
-		if (m->m_len == 0)
-			continue;
-		mlen = m->m_len;
-		addr = mtod(m, caddr_t);
-skip_start:
-		if (len < mlen)
-			mlen = len;
-		if ((clen ^ (long) addr) & 1)
-		    sum += in_cksumdata(addr, mlen) << 8;
-		else
-		    sum += in_cksumdata(addr, mlen);
-
-		clen += mlen;
-		len -= mlen;
-	}
-	REDUCE16;
-	return (~sum & 0xffff);
-}
-
-u_int in_cksum_hdr(const struct ip *ip)
-{
-    u_int64_t sum = in_cksumdata(ip, sizeof(struct ip));
-    union q_util q_util;
-    union l_util l_util;
-    REDUCE16;
-    return (~sum & 0xffff);
-}
diff --git a/sys/ia64/ia64/interrupt.c b/sys/ia64/ia64/interrupt.c
deleted file mode 100644
index 2d80c09888eb..000000000000
--- a/sys/ia64/ia64/interrupt.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/*-
- * Copyright (c) 2010-2011 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "opt_ddb.h"
-#include "opt_xtrace.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/vmmeter.h>
-#include <sys/bus.h>
-#include <sys/interrupt.h>
-#include <sys/malloc.h>
-#include <sys/ktr.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/sched.h>
-#include <sys/smp.h>
-#include <sys/sysctl.h>
-#include <sys/syslog.h>
-
-#include <machine/cpu.h>
-#include <machine/fpu.h>
-#include <machine/frame.h>
-#include <machine/intr.h>
-#include <machine/intrcnt.h>
-#include <machine/md_var.h>
-#include <machine/pcb.h>
-#include <machine/reg.h>
-#include <machine/smp.h>
-
-#ifdef DDB
-#include <ddb/ddb.h>
-#endif
-
-struct ia64_intr {
-	struct intr_event *event;	/* interrupt event */
-	volatile long *cntp;		/* interrupt counter */
-	struct sapic *sapic;
-	u_int	irq;
-};
-
-ia64_ihtype *ia64_handler[IA64_NXIVS];
-
-static enum ia64_xiv_use ia64_xiv[IA64_NXIVS];
-static struct ia64_intr *ia64_intrs[IA64_NXIVS];
-
-static ia64_ihtype ia64_ih_invalid;
-static ia64_ihtype ia64_ih_irq;
-
-void
-ia64_xiv_init(void)
-{
-	u_int xiv;
-
-	for (xiv = 0; xiv < IA64_NXIVS; xiv++) {
-		ia64_handler[xiv] = ia64_ih_invalid;
-		ia64_xiv[xiv] = IA64_XIV_FREE;
-		ia64_intrs[xiv] = NULL;
-	}
-	(void)ia64_xiv_reserve(15, IA64_XIV_ARCH, NULL);
-}
-
-int
-ia64_xiv_free(u_int xiv, enum ia64_xiv_use what)
-{
-
-	if (xiv >= IA64_NXIVS)
-		return (EINVAL);
-	if (what == IA64_XIV_FREE || what == IA64_XIV_ARCH)
-		return (EINVAL);
-	if (ia64_xiv[xiv] != what)
-		return (ENXIO);
-	ia64_xiv[xiv] = IA64_XIV_FREE;
-	ia64_handler[xiv] = ia64_ih_invalid;
-	return (0);
-}
-
-int
-ia64_xiv_reserve(u_int xiv, enum ia64_xiv_use what, ia64_ihtype ih)
-{
-
-	if (xiv >= IA64_NXIVS)
-		return (EINVAL);
-	if (what == IA64_XIV_FREE)
-		return (EINVAL);
-	if (ia64_xiv[xiv] != IA64_XIV_FREE)
-		return (EBUSY);
-	ia64_xiv[xiv] = what;
-	ia64_handler[xiv] = (ih == NULL) ? ia64_ih_invalid: ih;
-	if (bootverbose)
-		printf("XIV %u: use=%u, IH=%p\n", xiv, what, ih);
-	return (0);
-}
-
-u_int
-ia64_xiv_alloc(u_int prio, enum ia64_xiv_use what, ia64_ihtype ih)
-{
-	u_int hwprio;
-	u_int xiv0, xiv;
-
-	hwprio = prio >> 2;
-	if (hwprio > IA64_MAX_HWPRIO)
-		hwprio = IA64_MAX_HWPRIO;
-
-	xiv0 = IA64_NXIVS - (hwprio + 1) * 16;
-
-	KASSERT(xiv0 >= IA64_MIN_XIV, ("%s: min XIV", __func__));
-	KASSERT(xiv0 < IA64_NXIVS, ("%s: max XIV", __func__));
-
-	xiv = xiv0;
-	while (xiv < IA64_NXIVS && ia64_xiv_reserve(xiv, what, ih))
-		xiv++;
-
-	if (xiv < IA64_NXIVS)
-		return (xiv);
-
-	xiv = xiv0;
-	while (xiv >= IA64_MIN_XIV && ia64_xiv_reserve(xiv, what, ih))
-		xiv--;
-
-	return ((xiv >= IA64_MIN_XIV) ? xiv : 0);
-}
-
-static void
-ia64_intr_eoi(void *arg)
-{
-	u_int xiv = (uintptr_t)arg;
-	struct ia64_intr *i;
-
-	i = ia64_intrs[xiv];
-	KASSERT(i != NULL, ("%s", __func__));
-	sapic_eoi(i->sapic, xiv);
-}
-
-static void
-ia64_intr_mask(void *arg)
-{
-	u_int xiv = (uintptr_t)arg;
-	struct ia64_intr *i;
-
-	i = ia64_intrs[xiv];
-	KASSERT(i != NULL, ("%s", __func__));
-	sapic_mask(i->sapic, i->irq);
-	sapic_eoi(i->sapic, xiv);
-}
-
-static void
-ia64_intr_unmask(void *arg)
-{
-	u_int xiv = (uintptr_t)arg;
-	struct ia64_intr *i;
-
-	i = ia64_intrs[xiv];
-	KASSERT(i != NULL, ("%s", __func__));
-	sapic_unmask(i->sapic, i->irq);
-}
-
-int
-ia64_setup_intr(const char *name, int irq, driver_filter_t filter,
-    driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep)
-{
-	struct ia64_intr *i;
-	struct sapic *sa;
-	char *intrname;
-	u_int prio, xiv;
-	int error;
-
-	prio = intr_priority(flags);
-	if (prio > PRI_MAX_ITHD)
-		return (EINVAL);
-
-	/* XXX lock */
-
-	/* Get the I/O SAPIC and XIV that corresponds to the IRQ. */
-	sa = sapic_lookup(irq, &xiv);
-	if (sa == NULL) {
-		/* XXX unlock */
-		return (EINVAL);
-	}
-
-	if (xiv == 0) {
-		/* XXX unlock */
-		i = malloc(sizeof(struct ia64_intr), M_DEVBUF,
-		    M_ZERO | M_WAITOK);
-		/* XXX lock */
-		sa = sapic_lookup(irq, &xiv);
-		KASSERT(sa != NULL, ("sapic_lookup"));
-		if (xiv != 0)
-			free(i, M_DEVBUF);
-	}
-
-	/*
-	 * If the IRQ has no XIV assigned to it yet, assign one based
-	 * on the priority.
-	 */
-	if (xiv == 0) {
-		xiv = ia64_xiv_alloc(prio, IA64_XIV_IRQ, ia64_ih_irq);
-		if (xiv == 0) {
-			/* XXX unlock */
-			free(i, M_DEVBUF);
-			return (ENOSPC);
-		}
-
-		error = intr_event_create(&i->event, (void *)(uintptr_t)xiv,
-		    0, irq, ia64_intr_mask, ia64_intr_unmask, ia64_intr_eoi,
-		    NULL, "irq%u:", irq);
-		if (error) {
-			ia64_xiv_free(xiv, IA64_XIV_IRQ);
-			/* XXX unlock */
-			free(i, M_DEVBUF);
-			return (error);
-		}
-
-		i->sapic = sa;
-		i->irq = irq;
-		i->cntp = intrcnt + xiv;
-		ia64_intrs[xiv] = i;
-
-		/* XXX unlock */
-
-		sapic_enable(sa, irq, xiv);
-
-		if (name != NULL && *name != '\0') {
-			/* XXX needs abstraction. Too error prone. */
-			intrname = intrnames + xiv * INTRNAME_LEN;
-			memset(intrname, ' ', INTRNAME_LEN - 1);
-			bcopy(name, intrname, strlen(name));
-		}
-	} else {
-		i = ia64_intrs[xiv];
-		/* XXX unlock */
-	}
-
-	KASSERT(i != NULL, ("XIV mapping bug"));
-
-	error = intr_event_add_handler(i->event, name, filter, handler, arg,
-	    prio, flags, cookiep);
-	return (error);
-}
-
-int
-ia64_teardown_intr(void *cookie)
-{
-
-	return (intr_event_remove_handler(cookie));
-}
-
-void
-ia64_bind_intr(void)
-{
-	struct ia64_intr *i;
-	struct pcpu *pc;
-	u_int xiv;
-	int cpu;
-
-	cpu = MAXCPU;
-	for (xiv = IA64_NXIVS - 1; xiv >= IA64_MIN_XIV; xiv--) {
-		if (ia64_xiv[xiv] != IA64_XIV_IRQ)
-			continue;
-		i = ia64_intrs[xiv];
-		do {
-			cpu = (cpu == 0) ? MAXCPU - 1 : cpu - 1;
-			pc = cpuid_to_pcpu[cpu];
-		} while (pc == NULL || !pc->pc_md.awake);
-		sapic_bind_intr(i->irq, pc);
-	}
-}
-
-/*
- * Interrupt handlers.
- */
-
-void
-ia64_handle_intr(struct trapframe *tf)
-{
-	struct thread *td;
-	u_int xiv;
-
-	td = curthread;
-	ia64_set_fpsr(IA64_FPSR_DEFAULT);
-
-#ifdef XTRACE
-	ia64_xtrace_save();
-#endif
-
-	PCPU_INC(cnt.v_intr);
-
-	xiv = ia64_get_ivr();
-	ia64_srlz_d();
-	if (xiv == 15) {
-		PCPU_INC(md.stats.pcs_nstrays);
-		goto out;
-	}
-
-	critical_enter();
-	do {
-		CTR3(KTR_INTR, "INTR: XIV=%u, #%u: frame=%p", xiv,
-		    PCPU_GET(cnt.v_intr), tf);
-		if (!(ia64_handler[xiv])(td, xiv, tf)) {
-			ia64_set_eoi(0);
-			ia64_srlz_d();
-		}
-		xiv = ia64_get_ivr();
-		ia64_srlz_d();
-	} while (xiv != 15);
-	critical_exit();
-
- out:
-	if (TRAPF_USERMODE(tf)) {
-		while (td->td_flags & (TDF_ASTPENDING|TDF_NEEDRESCHED)) {
-			ia64_enable_intr();
-			ast(tf);
-			ia64_disable_intr();
-		}
-	}
-}
-
-static u_int
-ia64_ih_invalid(struct thread *td, u_int xiv, struct trapframe *tf)
-{
-
-	panic("invalid XIV: %u", xiv);
-	return (0);
-}
-
-static u_int
-ia64_ih_irq(struct thread *td, u_int xiv, struct trapframe *tf)
-{
-	struct ia64_intr *i;
-	struct intr_event *ie;			/* our interrupt event */
-
-	PCPU_INC(md.stats.pcs_nhwints);
-
-	/* Find the interrupt thread for this XIV. */
-	i = ia64_intrs[xiv];
-	KASSERT(i != NULL, ("%s: unassigned XIV", __func__));
-
-	(*i->cntp)++;
-
-	ie = i->event;
-	KASSERT(ie != NULL, ("%s: interrupt without event", __func__));
-
-	if (intr_event_handle(ie, tf) != 0) {
-		ia64_intr_mask((void *)(uintptr_t)xiv);
-		log(LOG_ERR, "stray irq%u\n", i->irq);
-	}
-
-	return (0);
-}
-
-#ifdef DDB
-
-static void
-db_print_xiv(u_int xiv, int always)
-{
-	struct ia64_intr *i;
-
-	i = ia64_intrs[xiv];
-	if (i != NULL) {
-		db_printf("XIV %u (%p): ", xiv, i);
-		sapic_print(i->sapic, i->irq);
-	} else if (always)
-		db_printf("XIV %u: unassigned\n", xiv);
-}
-
-DB_SHOW_COMMAND(xiv, db_show_xiv)
-{
-	u_int xiv;
-
-	if (have_addr) {
-		xiv = ((addr >> 4) % 16) * 10 + (addr % 16);
-		if (xiv >= IA64_NXIVS)
-			db_printf("error: XIV %u not in range [0..%u]\n",
-			    xiv, IA64_NXIVS - 1);
-		else
-			db_print_xiv(xiv, 1);
-	} else {
-		for (xiv = 0; xiv < IA64_NXIVS; xiv++)
-			db_print_xiv(xiv, 0);
-	}
-}
-
-#endif
diff --git a/sys/ia64/ia64/iodev_machdep.c b/sys/ia64/ia64/iodev_machdep.c
deleted file mode 100644
index a5aaf9f87d05..000000000000
--- a/sys/ia64/ia64/iodev_machdep.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/*-
- * Copyright (c) 2010 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/conf.h>
-#include <sys/efi.h>
-#include <sys/fcntl.h>
-#include <sys/ioccom.h>
-#include <sys/malloc.h>
-#include <sys/priv.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-
-#include <machine/bus.h>
-#include <machine/iodev.h>
-
-static int iodev_efivar_getvar(struct iodev_efivar_req *req);
-static int iodev_efivar_nextname(struct iodev_efivar_req *req);
-static int iodev_efivar_setvar(struct iodev_efivar_req *req);
-
-/* ARGSUSED */
-int
-iodev_open(struct thread *td __unused)
-{
-
-	return (0);
-}
-
-/* ARGSUSED */
-int
-iodev_close(struct thread *td __unused)
-{
-
-	return (0);
-}
-
-int
-iodev_ioctl(u_long cmd, caddr_t data)
-{
-	struct iodev_efivar_req *efivar_req;
-	int error;
-
-	switch (cmd) {
-	case IODEV_EFIVAR:
-		efivar_req = (struct iodev_efivar_req *)data;
-		efivar_req->result = 0;		/* So it's well-defined */
-		switch (efivar_req->access) {
-		case IODEV_EFIVAR_GETVAR:
-			error = iodev_efivar_getvar(efivar_req);
-			break;
-		case IODEV_EFIVAR_NEXTNAME:
-			error = iodev_efivar_nextname(efivar_req);
-			break;
-		case IODEV_EFIVAR_SETVAR:
-			error = iodev_efivar_setvar(efivar_req);
-			break;
-		default:
-			error = EINVAL;
-			break;
-		}
-		break;
-	default:
-		error = ENOIOCTL;
-	}
-
-	return (error);
-}
-
-static int
-iodev_efivar_getvar(struct iodev_efivar_req *req)
-{
-	void *data;
-	efi_char *name;
-	int error;
-
-	if ((req->namesize & 1) != 0 || req->namesize < 4)
-		return (EINVAL);
-	if (req->datasize == 0)
-		return (EINVAL);
-
-	/*
-	 * Pre-zero the allocated memory and don't copy the last 2 bytes
-	 * of the name. That should be the closing nul character (ucs-2)
-	 * and if not, then we ensured a nul-terminating string. This is
-	 * to protect the firmware and thus ourselves.
-	 */
-	name = malloc(req->namesize, M_TEMP, M_WAITOK | M_ZERO);
-	error = copyin(req->name, name, req->namesize - 2);
-	if (error) {
-		free(name, M_TEMP);
-		return (error);
-	}
-
-	data = malloc(req->datasize, M_TEMP, M_WAITOK);
-	error = efi_var_get(name, &req->vendor, &req->attrib, &req->datasize,
-	    data);
-	if (error == EOVERFLOW || error == ENOENT) {
-		req->result = error;
-		error = 0;
-	}
-	if (!error && !req->result)
-		error = copyout(data, req->data, req->datasize);
-
-	free(data, M_TEMP);
-	free(name, M_TEMP);
-	return (error);
-}
-
-static int 
-iodev_efivar_nextname(struct iodev_efivar_req *req) 
-{
-	efi_char *name;
-	int error;
-
-	/* Enforce a reasonable minimum size of the name buffer. */
-	if (req->namesize < 4)
-		return (EINVAL);
-
-	name = malloc(req->namesize, M_TEMP, M_WAITOK);
-	error = copyin(req->name, name, req->namesize);
-	if (error) {
-		free(name, M_TEMP);
-		return (error);
-	}
-
-	error = efi_var_nextname(&req->namesize, name, &req->vendor);
-	if (error == EOVERFLOW || error == ENOENT) {
-		req->result = error;
-		error = 0;
-	}
-	if (!error && !req->result)
-		error = copyout(name, req->name, req->namesize);
-
-	free(name, M_TEMP);
-	return (error);
-}
-
-static int 
-iodev_efivar_setvar(struct iodev_efivar_req *req) 
-{
-	void *data;
-	efi_char *name;
-	int error;
-
-	if ((req->namesize & 1) != 0 || req->namesize < 4)
-		return (EINVAL);
-
-	/*
-	 * Pre-zero the allocated memory and don't copy the last 2 bytes
-	 * of the name. That should be the closing nul character (ucs-2)
-	 * and if not, then we ensured a nul-terminating string. This is
-	 * to protect the firmware and thus ourselves.
-	 */
-	name = malloc(req->namesize, M_TEMP, M_WAITOK | M_ZERO);
-	error = copyin(req->name, name, req->namesize - 2);
-	if (error) {
-		free(name, M_TEMP);
-		return (error);
-	}
-
-	if (req->datasize) {
-		data = malloc(req->datasize, M_TEMP, M_WAITOK);
-		error = copyin(req->data, data, req->datasize);
-		if (error) {
-			free(data, M_TEMP);
-			free(name, M_TEMP);
-			return (error);
-		}
-	} else
-		data = NULL;
-
-	error = efi_var_set(name, &req->vendor, req->attrib, req->datasize,
-	    data);
-	if (error == EAGAIN || error == ENOENT) {
-		req->result = error;
-		error = 0;
-	}
-
-	free(data, M_TEMP);
-	free(name, M_TEMP);
-	return (error);
-}
diff --git a/sys/ia64/ia64/locore.S b/sys/ia64/ia64/locore.S
deleted file mode 100644
index f79ca68f37ca..000000000000
--- a/sys/ia64/ia64/locore.S
+++ /dev/null
@@ -1,361 +0,0 @@
-/*-
- * Copyright (c) 2001-2011 Marcel Moolenaar
- * Copyright (c) 1998 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 <machine/asm.h>
-#include <machine/ia64_cpu.h>
-#include <machine/intrcnt.h>
-#include <machine/pte.h>
-#include <assym.s>
-
-/*
- * The Altix 350 needs more than the architected 16KB (8KB for stack and
- * 8KB for RSE backing store) when calling EFI to setup virtual mode.
- */
-#define	FW_STACK_SIZE	3*PAGE_SIZE
-
-	.section .ivt.data, "aw"
-	.align	PAGE_SIZE
-	.global	kstack
-kstack:	.space	FW_STACK_SIZE
-	.global	kstack_top
-kstack_top:
-
-	.text
-
-/*
- * Not really a leaf but we can't return.
- * The EFI loader passes the physical address of the bootinfo block in
- * register r8.
- */
-ENTRY_NOPROFILE(__start, 1)
-	.prologue
-	.save	rp,r0
-	.body
-{	.mlx
-	mov	ar.rsc=0
-	movl	r16=ia64_vector_table	// set up IVT early
-	;;
-}
-{	.mlx
-	mov	cr.iva=r16
-	movl	r16=kstack
-	;;
-}
-{	.mmi
-	srlz.i
-	;;
-	ssm	IA64_PSR_DFH
-	mov	r17=FW_STACK_SIZE-16
-	;;
-}
-{	.mlx
-	add	sp=r16,r17		// proc0's stack
-	movl	gp=__gp			// find kernel globals
-	;;
-}
-{	.mlx
-	mov	ar.bspstore=r16		// switch backing store
-	movl	r16=bootinfo
-	;;
-}
-{	.mmi
-	st8	[r16]=r8		// save the PA of the bootinfo block
-	loadrs				// invalidate regs
-	mov	r17=IA64_DCR_DEFAULT
-	;;
-}
-{	.mmi
-	mov	cr.dcr=r17
-	mov	ar.rsc=3		// turn rse back on
-	nop	0
-	;;
-}
-{	.mmi
-	srlz.d
-	alloc	r16=ar.pfs,0,0,1,0
-	mov	out0=r0			// we are linked at the right address 
-	;;				// we just need to process fptrs
-}
-{	.mib
-	nop	0
-	nop	0
-	br.call.sptk.many rp=_reloc
-	;;
-}
-{	.mib
-	nop	0
-	nop	0
-	br.call.sptk.many rp=ia64_init
-	;;
-}
-	// We have the new bspstore in r8 and the new sp in r9.
-	// Switch onto the new stack and call mi_startup().
-{	.mmi
-	mov	ar.rsc = 0
-	;;
-	mov	ar.bspstore = r8
-	mov	sp = r9
-	;;
-}
-{	.mmi
-	loadrs
-	;;
-	mov	ar.rsc = 3
-	nop	0
-	;;
-}
-{	.mib
-	nop	0
-	nop	0
-	br.call.sptk.many rp=mi_startup
-	;;
-}
-	/* NOTREACHED */
-1:	br.cond.sptk.few 1b
-END(__start)
-
-/*
- * fork_trampoline()
- *
- * Arrange for a function to be invoked neatly, after a cpu_switch().
- *
- * Invokes fork_exit() passing in three arguments: a callout function, an
- * argument to the callout, and a trapframe pointer.  For child processes
- * returning from fork(2), the argument is a pointer to the child process.
- *
- * The callout function and its argument is in the trapframe in scratch
- * registers r2 and r3.
- */
-ENTRY(fork_trampoline, 0)
-	.prologue
-	.save	rp,r0
-	.body
-{	.mmi
-	alloc		r14=ar.pfs,0,0,3,0
-	add		r15=32+SIZEOF_SPECIAL+8,sp
-	add		r16=32+SIZEOF_SPECIAL+16,sp
-	;;
-}
-{	.mmi
-	ld8		out0=[r15]
-	ld8		out1=[r16]
-	nop		0
-}
-{	.mib
-	add		out2=16,sp
-	nop		0
-	br.call.sptk	rp=fork_exit
-	;;
-}
-	// If we get back here, it means we're a user space process that's
-	// the immediate result of fork(2).
-	.global		enter_userland
-	.type		enter_userland, @function
-enter_userland:
-{	.mib
-	nop		0
-	nop		0
-	br.sptk		epc_syscall_return
-	;;
-}
-END(fork_trampoline)
-
-/*
- * Create a default interrupt name table. The first entry (vector 0) is
- * hardwaired to the clock interrupt.
- */
-	.data
-	.align 8
-EXPORT(intrnames)
-	.ascii "clock"
-	.fill INTRNAME_LEN - 5 - 1, 1, ' '
-	.byte 0
-intr_n = 1
-.rept INTRCNT_COUNT - 1
-	.ascii "#"
-	.byte intr_n / 100 + '0'
-	.byte (intr_n % 100) / 10 + '0'
-	.byte intr_n % 10 + '0'
-	.fill INTRNAME_LEN - 1 - 3 - 1, 1, ' '
-	.byte 0
-	intr_n = intr_n + 1
-.endr
-EXPORT(sintrnames)
-	data8 INTRCNT_COUNT * INTRNAME_LEN
-
-	.align 8
-EXPORT(intrcnt)
-	.fill INTRCNT_COUNT, 8, 0
-EXPORT(sintrcnt)
-	data8 INTRCNT_COUNT * 8
-
-	.text
-	// in0:	image base
-STATIC_ENTRY(_reloc, 1)
-	alloc	loc0=ar.pfs,1,2,0,0
-	mov	loc1=rp
-	;; 
-	movl	r15=@gprel(_DYNAMIC)	// find _DYNAMIC etc.
-	movl	r2=@gprel(fptr_storage)
-	movl	r3=@gprel(fptr_storage_end)
-	;;
-	add	r15=r15,gp		// relocate _DYNAMIC etc.
-	add	r2=r2,gp
-	add	r3=r3,gp
-	;;
-1:	ld8	r16=[r15],8		// read r15->d_tag
-	;;
-	ld8	r17=[r15],8		// and r15->d_val
-	;;
-	cmp.eq	p6,p0=DT_NULL,r16	// done?
-(p6)	br.cond.dpnt.few 2f
-	;; 
-	cmp.eq	p6,p0=DT_RELA,r16
-	;; 
-(p6)	add	r18=r17,in0		// found rela section
-	;; 
-	cmp.eq	p6,p0=DT_RELASZ,r16
-	;; 
-(p6)	mov	r19=r17			// found rela size
-	;; 
-	cmp.eq	p6,p0=DT_SYMTAB,r16
-	;; 
-(p6)	add	r20=r17,in0		// found symbol table
-	;; 
-(p6)	setf.sig f8=r20
-	;; 
-	cmp.eq	p6,p0=DT_SYMENT,r16
-	;; 
-(p6)	setf.sig f9=r17			// found symbol entry size
-	;; 
-	cmp.eq	p6,p0=DT_RELAENT,r16
-	;; 
-(p6)	mov	r22=r17			// found rela entry size
-	;;
-	br.sptk.few 1b
-	
-2:	
-	ld8	r15=[r18],8		// read r_offset
-	;; 
-	ld8	r16=[r18],8		// read r_info
-	add	r15=r15,in0		// relocate r_offset
-	;;
-	ld8	r17=[r18],8		// read r_addend
-	sub	r19=r19,r22		// update relasz
-
-	extr.u	r23=r16,0,32		// ELF64_R_TYPE(r16)
-	;;
-	cmp.eq	p6,p0=R_IA_64_NONE,r23
-(p6)	br.cond.dpnt.few 3f
-	;;
-	cmp.eq	p6,p0=R_IA_64_REL64LSB,r23
-(p6)	br.cond.dptk.few 4f
-	;;
-
-	extr.u	r16=r16,32,32		// ELF64_R_SYM(r16)
-	;; 
-	setf.sig f10=r16		// so we can multiply
-	;;
-	xma.lu	f10=f10,f9,f8		// f10=symtab + r_sym*syment
-	;;
-	getf.sig r16=f10
-	;;
-	add	r16=8,r16		// address of st_value
-	;;
-	ld8	r16=[r16]		// read symbol value
-	;;
-	add	r16=r16,in0		// relocate symbol value
-	;;
-
-	cmp.eq	p6,p0=R_IA_64_DIR64LSB,r23
-(p6)	br.cond.dptk.few 5f
-	;;
-	cmp.eq	p6,p0=R_IA_64_FPTR64LSB,r23
-(p6)	br.cond.dptk.few 6f
-	;;
-
-3:
-	cmp.ltu	p6,p0=0,r19		// more?
-(p6)	br.cond.dptk.few 2b		// loop
-	mov	r8=0			// success return value
-	br.cond.sptk.few 9f		// done
-
-4:
-	add	r16=in0,r17		// BD + A
-	;;
-	st8	[r15]=r16		// word64 (LSB)
-	br.cond.sptk.few 3b
-
-5:
-	add	r16=r16,r17		// S + A
-	;;
-	st8	[r15]=r16		// word64 (LSB)
-	br.cond.sptk.few 3b
-
-6:
-	movl	r17=@gprel(fptr_storage)
-	;;
-	add	r17=r17,gp		// start of fptrs
-	;;
-7:	cmp.geu	p6,p0=r17,r2		// end of fptrs?
-(p6)	br.cond.dpnt.few 8f		// can't find existing fptr
-	ld8	r20=[r17]		// read function from fptr
-	;;
-	cmp.eq	p6,p0=r16,r20		// same function?
-	;;
-(p6)	st8	[r15]=r17		// reuse fptr
-(p6)	br.cond.sptk.few 3b		// done
-	add	r17=16,r17		// next fptr
-	br.cond.sptk.few 7b
-
-8:					// allocate new fptr
-	mov	r8=1			// failure return value
-	cmp.geu	p6,p0=r2,r3		// space left?
-(p6)	br.cond.dpnt.few 9f		// bail out
-
-	st8	[r15]=r2		// install fptr
-	st8	[r2]=r16,8		// write fptr address
-	;;
-	st8	[r2]=gp,8		// write fptr gp
-	br.cond.sptk.few 3b
-
-9:
-	mov	ar.pfs=loc0
-	mov	rp=loc1
-	;;
-	br.ret.sptk.few rp
-
-END(_reloc)
-
-	.data
-	.align	16
-	.global fptr_storage
-fptr_storage:
-	.space	4096*16			// XXX
-fptr_storage_end:
diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c
deleted file mode 100644
index eaa82a8bf1e3..000000000000
--- a/sys/ia64/ia64/machdep.c
+++ /dev/null
@@ -1,1540 +0,0 @@
-/*-
- * Copyright (c) 2003,2004 Marcel Moolenaar
- * Copyright (c) 2000,2001 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "opt_compat.h"
-#include "opt_ddb.h"
-#include "opt_kstack_pages.h"
-#include "opt_sched.h"
-#include "opt_xtrace.h"
-
-#include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
-#include <sys/bus.h>
-#include <sys/cons.h>
-#include <sys/cpu.h>
-#include <sys/efi.h>
-#include <sys/eventhandler.h>
-#include <sys/exec.h>
-#include <sys/imgact.h>
-#include <sys/kdb.h>
-#include <sys/kernel.h>
-#include <sys/linker.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/msgbuf.h>
-#include <sys/pcpu.h>
-#include <sys/ptrace.h>
-#include <sys/random.h>
-#include <sys/reboot.h>
-#include <sys/rwlock.h>
-#include <sys/sched.h>
-#include <sys/signalvar.h>
-#include <sys/syscall.h>
-#include <sys/syscallsubr.h>
-#include <sys/sysctl.h>
-#include <sys/sysproto.h>
-#include <sys/ucontext.h>
-#include <sys/uio.h>
-#include <sys/uuid.h>
-#include <sys/vmmeter.h>
-#include <sys/vnode.h>
-
-#include <ddb/ddb.h>
-
-#include <net/netisr.h>
-
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_page.h>
-#include <vm/vm_map.h>
-#include <vm/vm_object.h>
-#include <vm/vm_pager.h>
-
-#include <machine/bootinfo.h>
-#include <machine/cpu.h>
-#include <machine/elf.h>
-#include <machine/fpu.h>
-#include <machine/intr.h>
-#include <machine/kdb.h>
-#include <machine/mca.h>
-#include <machine/md_var.h>
-#include <machine/pal.h>
-#include <machine/pcb.h>
-#include <machine/reg.h>
-#include <machine/sal.h>
-#include <machine/sigframe.h>
-#ifdef SMP
-#include <machine/smp.h>
-#endif
-#include <machine/unwind.h>
-#include <machine/vmparam.h>
-
-/*
- * For atomicity reasons, we demand that pc_curthread is the first
- * field in the struct pcpu. It allows us to read the pointer with
- * a single atomic instruction:
- *	ld8 %curthread = [r13]
- * Otherwise we would first have to calculate the load address and
- * store the result in a temporary register and that for the load:
- *	add %temp = %offsetof(struct pcpu), r13
- *	ld8 %curthread = [%temp]
- * A context switch inbetween the add and the ld8 could have the
- * thread migrate to a different core. In that case,  %curthread
- * would be the thread running on the original core and not actually
- * the current thread.
- */
-CTASSERT(offsetof(struct pcpu, pc_curthread) == 0);
-
-static SYSCTL_NODE(_hw, OID_AUTO, freq, CTLFLAG_RD, 0, "");
-static SYSCTL_NODE(_machdep, OID_AUTO, cpu, CTLFLAG_RD, 0, "");
-
-static u_int bus_freq;
-SYSCTL_UINT(_hw_freq, OID_AUTO, bus, CTLFLAG_RD, &bus_freq, 0,
-    "Bus clock frequency");
-
-static u_int cpu_freq;
-SYSCTL_UINT(_hw_freq, OID_AUTO, cpu, CTLFLAG_RD, &cpu_freq, 0,
-    "CPU clock frequency");
-
-static u_int itc_freq;
-SYSCTL_UINT(_hw_freq, OID_AUTO, itc, CTLFLAG_RD, &itc_freq, 0,
-    "ITC frequency");
-
-int cold = 1;
-int unmapped_buf_allowed = 0;
-
-struct bootinfo *bootinfo;
-
-struct pcpu pcpu0;
-
-extern u_int64_t kernel_text[], _end[];
-
-extern u_int64_t ia64_gateway_page[];
-extern u_int64_t break_sigtramp[];
-extern u_int64_t epc_sigtramp[];
-
-struct fpswa_iface *fpswa_iface;
-
-vm_size_t ia64_pal_size;
-vm_paddr_t ia64_pal_base;
-vm_offset_t ia64_port_base;
-
-u_int64_t ia64_lapic_addr = PAL_PIB_DEFAULT_ADDR;
-
-struct ia64_pib *ia64_pib;
-
-static int ia64_sync_icache_needed;
-
-char machine[] = MACHINE;
-SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "");
-
-static char cpu_model[64];
-SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, cpu_model, 0,
-    "The CPU model name");
-
-static char cpu_family[64];
-SYSCTL_STRING(_hw, OID_AUTO, family, CTLFLAG_RD, cpu_family, 0,
-    "The CPU family name");
-
-#ifdef DDB
-extern vm_offset_t ksym_start, ksym_end;
-#endif
-
-struct msgbuf *msgbufp = NULL;
-
-/* Other subsystems (e.g., ACPI) can hook this later. */
-void (*cpu_idle_hook)(sbintime_t) = NULL;
-
-struct kva_md_info kmi;
-
-static void
-identifycpu(void)
-{
-	char vendor[17];
-	char *family_name, *model_name;
-	u_int64_t features, tmp;
-	int number, revision, model, family, archrev;
-
-	/*
-	 * Assumes little-endian.
-	 */
-	*(u_int64_t *) &vendor[0] = ia64_get_cpuid(0);
-	*(u_int64_t *) &vendor[8] = ia64_get_cpuid(1);
-	vendor[16] = '\0';
-
-	tmp = ia64_get_cpuid(3);
-	number = (tmp >> 0) & 0xff;
-	revision = (tmp >> 8) & 0xff;
-	model = (tmp >> 16) & 0xff;
-	family = (tmp >> 24) & 0xff;
-	archrev = (tmp >> 32) & 0xff;
-
-	family_name = model_name = "unknown";
-	switch (family) {
-	case 0x07:
-		family_name = "Itanium";
-		model_name = "Merced";
-		break;
-	case 0x1f:
-		family_name = "Itanium 2";
-		switch (model) {
-		case 0x00:
-			model_name = "McKinley";
-			break;
-		case 0x01:
-			/*
-			 * Deerfield is a low-voltage variant based on the
-			 * Madison core. We need circumstantial evidence
-			 * (i.e. the clock frequency) to identify those.
-			 * Allow for roughly 1% error margin.
-			 */
-			if (cpu_freq > 990 && cpu_freq < 1010)
-				model_name = "Deerfield";
-			else
-				model_name = "Madison";
-			break;
-		case 0x02:
-			model_name = "Madison II";
-			break;
-		}
-		break;
-	case 0x20:
-		ia64_sync_icache_needed = 1;
-
-		family_name = "Itanium 2";
-		switch (model) {
-		case 0x00:
-			model_name = "Montecito";
-			break;
-		case 0x01:
-			model_name = "Montvale";
-			break;
-		}
-		break;
-	}
-	snprintf(cpu_family, sizeof(cpu_family), "%s", family_name);
-	snprintf(cpu_model, sizeof(cpu_model), "%s", model_name);
-
-	features = ia64_get_cpuid(4);
-
-	printf("CPU: %s (", model_name);
-	if (cpu_freq)
-		printf("%u MHz ", cpu_freq);
-	printf("%s)\n", family_name);
-	printf("  Origin = \"%s\"  Revision = %d\n", vendor, revision);
-	printf("  Features = 0x%b\n", (u_int32_t) features,
-	    "\020"
-	    "\001LB"	/* long branch (brl) instruction. */
-	    "\002SD"	/* Spontaneous deferral. */
-	    "\003AO"	/* 16-byte atomic operations (ld, st, cmpxchg). */ );
-}
-
-static void
-cpu_startup(void *dummy)
-{
-	char nodename[16];
-	struct pcpu *pc;
-	struct pcpu_stats *pcs;
-
-	/*
-	 * Good {morning,afternoon,evening,night}.
-	 */
-	identifycpu();
-
-#ifdef PERFMON
-	perfmon_init();
-#endif
-	printf("real memory  = %ld (%ld MB)\n", ptoa(realmem),
-	    ptoa(realmem) / 1048576);
-
-	vm_ksubmap_init(&kmi);
-
-	printf("avail memory = %ld (%ld MB)\n", ptoa(vm_cnt.v_free_count),
-	    ptoa(vm_cnt.v_free_count) / 1048576);
- 
-	if (fpswa_iface == NULL)
-		printf("Warning: no FPSWA package supplied\n");
-	else
-		printf("FPSWA Revision = 0x%lx, Entry = %p\n",
-		    (long)fpswa_iface->if_rev, (void *)fpswa_iface->if_fpswa);
-
-	/*
-	 * Set up buffers, so they can be used to read disk labels.
-	 */
-	bufinit();
-	vm_pager_bufferinit();
-
-	/*
-	 * Traverse the MADT to discover IOSAPIC and Local SAPIC
-	 * information.
-	 */
-	ia64_probe_sapics();
-	ia64_pib = pmap_mapdev(ia64_lapic_addr, sizeof(*ia64_pib));
-
-	ia64_mca_init();
-
-	/*
-	 * Create sysctl tree for per-CPU information.
-	 */
-	STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) {
-		snprintf(nodename, sizeof(nodename), "%u", pc->pc_cpuid);
-		sysctl_ctx_init(&pc->pc_md.sysctl_ctx);
-		pc->pc_md.sysctl_tree = SYSCTL_ADD_NODE(&pc->pc_md.sysctl_ctx,
-		    SYSCTL_STATIC_CHILDREN(_machdep_cpu), OID_AUTO, nodename,
-		    CTLFLAG_RD, NULL, "");
-		if (pc->pc_md.sysctl_tree == NULL)
-			continue;
-
-		pcs = &pc->pc_md.stats;
-
-		SYSCTL_ADD_ULONG(&pc->pc_md.sysctl_ctx,
-		    SYSCTL_CHILDREN(pc->pc_md.sysctl_tree), OID_AUTO,
-		    "nasts", CTLFLAG_RD, &pcs->pcs_nasts,
-		    "Number of IPI_AST interrupts");
-
-		SYSCTL_ADD_ULONG(&pc->pc_md.sysctl_ctx,
-		    SYSCTL_CHILDREN(pc->pc_md.sysctl_tree), OID_AUTO,
-		    "nclks", CTLFLAG_RD, &pcs->pcs_nclks,
-		    "Number of clock interrupts");
-
-		SYSCTL_ADD_ULONG(&pc->pc_md.sysctl_ctx,
-		    SYSCTL_CHILDREN(pc->pc_md.sysctl_tree), OID_AUTO,
-		    "nextints", CTLFLAG_RD, &pcs->pcs_nextints,
-		    "Number of ExtINT interrupts");
-
-		SYSCTL_ADD_ULONG(&pc->pc_md.sysctl_ctx,
-		    SYSCTL_CHILDREN(pc->pc_md.sysctl_tree), OID_AUTO,
-		    "nhardclocks", CTLFLAG_RD, &pcs->pcs_nhardclocks,
-		    "Number of IPI_HARDCLOCK interrupts");
-
-		SYSCTL_ADD_ULONG(&pc->pc_md.sysctl_ctx,
-		    SYSCTL_CHILDREN(pc->pc_md.sysctl_tree), OID_AUTO,
-		    "nhighfps", CTLFLAG_RD, &pcs->pcs_nhighfps,
-		    "Number of IPI_HIGH_FP interrupts");
-
-		SYSCTL_ADD_ULONG(&pc->pc_md.sysctl_ctx,
-		    SYSCTL_CHILDREN(pc->pc_md.sysctl_tree), OID_AUTO,
-		    "nhwints", CTLFLAG_RD, &pcs->pcs_nhwints,
-		    "Number of hardware (device) interrupts");
-
-		SYSCTL_ADD_ULONG(&pc->pc_md.sysctl_ctx,
-		    SYSCTL_CHILDREN(pc->pc_md.sysctl_tree), OID_AUTO,
-		    "npreempts", CTLFLAG_RD, &pcs->pcs_npreempts,
-		    "Number of IPI_PREEMPT interrupts");
-
-		SYSCTL_ADD_ULONG(&pc->pc_md.sysctl_ctx,
-		    SYSCTL_CHILDREN(pc->pc_md.sysctl_tree), OID_AUTO,
-		    "nrdvs", CTLFLAG_RD, &pcs->pcs_nrdvs,
-		    "Number of IPI_RENDEZVOUS interrupts");
-
-		SYSCTL_ADD_ULONG(&pc->pc_md.sysctl_ctx,
-		    SYSCTL_CHILDREN(pc->pc_md.sysctl_tree), OID_AUTO,
-		    "nstops", CTLFLAG_RD, &pcs->pcs_nstops,
-		    "Number of IPI_STOP interrupts");
-
-		SYSCTL_ADD_ULONG(&pc->pc_md.sysctl_ctx,
-		    SYSCTL_CHILDREN(pc->pc_md.sysctl_tree), OID_AUTO,
-		    "nstrays", CTLFLAG_RD, &pcs->pcs_nstrays,
-		    "Number of stray interrupts");
-	}
-}
-SYSINIT(cpu_startup, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL);
-
-void
-cpu_flush_dcache(void *ptr, size_t len)
-{
-	vm_offset_t lim, va;
-
-	va = (uintptr_t)ptr & ~31;
-	lim = (uintptr_t)ptr + len;
-	while (va < lim) {
-		ia64_fc(va);
-		va += 32;
-	}
-
-	ia64_srlz_d();
-}
-
-/* Get current clock frequency for the given cpu id. */
-int
-cpu_est_clockrate(int cpu_id, uint64_t *rate)
-{
-
-	if (pcpu_find(cpu_id) == NULL || rate == NULL)
-		return (EINVAL);
-	*rate = (u_long)cpu_freq * 1000000ul;
-	return (0);
-}
-
-void
-cpu_halt()
-{
-
-	efi_reset_system();
-}
-
-void
-cpu_idle(int busy)
-{
-	register_t ie;
-	sbintime_t sbt = -1;
-
-	if (!busy) {
-		critical_enter();
-		sbt = cpu_idleclock();
-	}
-
-	ie = intr_disable();
-	KASSERT(ie != 0, ("%s called with interrupts disabled\n", __func__));
-
-	if (sched_runnable())
-		ia64_enable_intr();
-	else if (cpu_idle_hook != NULL) {
-		(*cpu_idle_hook)(sbt);
-		/* The hook must enable interrupts! */
-	} else {
-		ia64_call_pal_static(PAL_HALT_LIGHT, 0, 0, 0);
-		ia64_enable_intr();
-	}
-
-	if (!busy) {
-		cpu_activeclock();
-		critical_exit();
-	}
-}
-
-int
-cpu_idle_wakeup(int cpu)
-{
-
-	return (0);
-}
-
-void
-cpu_reset()
-{
-
-	efi_reset_system();
-}
-
-void
-cpu_switch(struct thread *old, struct thread *new, struct mtx *mtx)
-{
-	struct pcb *oldpcb, *newpcb;
-
-	oldpcb = old->td_pcb;
-#ifdef COMPAT_FREEBSD32
-	ia32_savectx(oldpcb);
-#endif
-	if (PCPU_GET(fpcurthread) == old)
-		old->td_frame->tf_special.psr |= IA64_PSR_DFH;
-	if (!savectx(oldpcb)) {
-		newpcb = new->td_pcb;
-		oldpcb->pcb_current_pmap =
-		    pmap_switch(newpcb->pcb_current_pmap);
-
-		atomic_store_rel_ptr(&old->td_lock, mtx);
-
-#if defined(SCHED_ULE) && defined(SMP)
-		while (atomic_load_acq_ptr(&new->td_lock) == &blocked_lock)
-			cpu_spinwait();
-#endif
-
-		PCPU_SET(curthread, new);
-
-#ifdef COMPAT_FREEBSD32
-		ia32_restorectx(newpcb);
-#endif
-
-		if (PCPU_GET(fpcurthread) == new)
-			new->td_frame->tf_special.psr &= ~IA64_PSR_DFH;
-		restorectx(newpcb);
-		/* We should not get here. */
-		panic("cpu_switch: restorectx() returned");
-		/* NOTREACHED */
-	}
-}
-
-void
-cpu_throw(struct thread *old __unused, struct thread *new)
-{
-	struct pcb *newpcb;
-
-	newpcb = new->td_pcb;
-	(void)pmap_switch(newpcb->pcb_current_pmap);
-
-#if defined(SCHED_ULE) && defined(SMP)
-	while (atomic_load_acq_ptr(&new->td_lock) == &blocked_lock)
-		cpu_spinwait();
-#endif
-
-	PCPU_SET(curthread, new);
-
-#ifdef COMPAT_FREEBSD32
-	ia32_restorectx(newpcb);
-#endif
-
-	restorectx(newpcb);
-	/* We should not get here. */
-	panic("cpu_throw: restorectx() returned");
-	/* NOTREACHED */
-}
-
-void
-cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t size)
-{
-
-	/*
-	 * Set pc_acpi_id to "uninitialized".
-	 * See sys/dev/acpica/acpi_cpu.c
-	 */
-	pcpu->pc_acpi_id = 0xffffffff;
-}
-
-void
-cpu_pcpu_setup(struct pcpu *pc, u_int acpi_id, u_int sapic_id)
-{
-
-	pc->pc_acpi_id = acpi_id;
-	pc->pc_md.lid = IA64_LID_SET_SAPIC_ID(sapic_id);
-}
- 
-void
-spinlock_enter(void)
-{
-	struct thread *td;
-	int intr;
-
-	td = curthread;
-	if (td->td_md.md_spinlock_count == 0) {
-		intr = intr_disable();
-		td->td_md.md_spinlock_count = 1;
-		td->td_md.md_saved_intr = intr;
-	} else
-		td->td_md.md_spinlock_count++;
-	critical_enter();
-}
-
-void
-spinlock_exit(void)
-{
-	struct thread *td;
-	int intr;
-
-	td = curthread;
-	critical_exit();
-	intr = td->td_md.md_saved_intr;
-	td->td_md.md_spinlock_count--;
-	if (td->td_md.md_spinlock_count == 0)
-		intr_restore(intr);
-}
-
-void
-kdb_cpu_trap(int vector, int code __unused)
-{
-
-#ifdef XTRACE
-	ia64_xtrace_stop();
-#endif
-	__asm __volatile("flushrs;;");
-
-	/* Restart after the break instruction. */
-	if (vector == IA64_VEC_BREAK &&
-	    kdb_frame->tf_special.ifa == IA64_FIXED_BREAK)
-		kdb_frame->tf_special.psr += IA64_PSR_RI_1;
-}
-
-void
-map_vhpt(uintptr_t vhpt)
-{
-	pt_entry_t pte;
-	uint64_t psr;
-
-	pte = PTE_PRESENT | PTE_MA_WB | PTE_ACCESSED | PTE_DIRTY |
-	    PTE_PL_KERN | PTE_AR_RW;
-	pte |= vhpt & PTE_PPN_MASK;
-
-	__asm __volatile("ptr.d %0,%1" :: "r"(vhpt),
-	    "r"(pmap_vhpt_log2size << 2));
-
-	__asm __volatile("mov   %0=psr" : "=r"(psr));
-	__asm __volatile("rsm   psr.ic|psr.i");
-	ia64_srlz_i();
-	ia64_set_ifa(vhpt);
-	ia64_set_itir(pmap_vhpt_log2size << 2);
-	ia64_srlz_d();
-	__asm __volatile("itr.d dtr[%0]=%1" :: "r"(3), "r"(pte));
-	__asm __volatile("mov   psr.l=%0" :: "r" (psr));
-	ia64_srlz_i();
-}
-
-void
-map_pal_code(void)
-{
-	pt_entry_t pte;
-	vm_offset_t va;
-	vm_size_t sz;
-	uint64_t psr;
-	u_int shft;
-
-	if (ia64_pal_size == 0)
-		return;
-
-	va = IA64_PHYS_TO_RR7(ia64_pal_base);
-
-	sz = ia64_pal_size;
-	shft = 0;
-	while (sz > 1) {
-		shft++;
-		sz >>= 1;
-	}
-
-	pte = PTE_PRESENT | PTE_MA_WB | PTE_ACCESSED | PTE_DIRTY |
-	    PTE_PL_KERN | PTE_AR_RWX;
-	pte |= ia64_pal_base & PTE_PPN_MASK;
-
-	__asm __volatile("ptr.d %0,%1; ptr.i %0,%1" :: "r"(va), "r"(shft<<2));
-
-	__asm __volatile("mov	%0=psr" : "=r"(psr));
-	__asm __volatile("rsm	psr.ic|psr.i");
-	ia64_srlz_i();
-	ia64_set_ifa(va);
-	ia64_set_itir(shft << 2);
-	ia64_srlz_d();
-	__asm __volatile("itr.d	dtr[%0]=%1" :: "r"(4), "r"(pte));
-	ia64_srlz_d();
-	__asm __volatile("itr.i	itr[%0]=%1" :: "r"(1), "r"(pte));
-	__asm __volatile("mov	psr.l=%0" :: "r" (psr));
-	ia64_srlz_i();
-}
-
-void
-map_gateway_page(void)
-{
-	pt_entry_t pte;
-	uint64_t psr;
-
-	pte = PTE_PRESENT | PTE_MA_WB | PTE_ACCESSED | PTE_DIRTY |
-	    PTE_PL_KERN | PTE_AR_X_RX;
-	pte |= ia64_tpa((uint64_t)ia64_gateway_page) & PTE_PPN_MASK;
-
-	__asm __volatile("ptr.d %0,%1; ptr.i %0,%1" ::
-	    "r"(VM_MAXUSER_ADDRESS), "r"(PAGE_SHIFT << 2));
-
-	__asm __volatile("mov	%0=psr" : "=r"(psr));
-	__asm __volatile("rsm	psr.ic|psr.i");
-	ia64_srlz_i();
-	ia64_set_ifa(VM_MAXUSER_ADDRESS);
-	ia64_set_itir(PAGE_SHIFT << 2);
-	ia64_srlz_d();
-	__asm __volatile("itr.d	dtr[%0]=%1" :: "r"(5), "r"(pte));
-	ia64_srlz_d();
-	__asm __volatile("itr.i	itr[%0]=%1" :: "r"(2), "r"(pte));
-	__asm __volatile("mov	psr.l=%0" :: "r" (psr));
-	ia64_srlz_i();
-
-	/* Expose the mapping to userland in ar.k5 */
-	ia64_set_k5(VM_MAXUSER_ADDRESS);
-}
-
-static u_int
-freq_ratio(u_long base, u_long ratio)
-{
-	u_long f;
-
-	f = (base * (ratio >> 32)) / (ratio & 0xfffffffful);
-	return ((f + 500000) / 1000000);
-}
-
-static void
-calculate_frequencies(void)
-{
-	struct ia64_sal_result sal;
-	struct ia64_pal_result pal;
-	register_t ie;
-
-	ie = intr_disable();
-	sal = ia64_sal_entry(SAL_FREQ_BASE, 0, 0, 0, 0, 0, 0, 0);
-	pal = ia64_call_pal_static(PAL_FREQ_RATIOS, 0, 0, 0);
-	intr_restore(ie);
-
-	if (sal.sal_status == 0 && pal.pal_status == 0) {
-		if (bootverbose) {
-			printf("Platform clock frequency %ld Hz\n",
-			       sal.sal_result[0]);
-			printf("Processor ratio %ld/%ld, Bus ratio %ld/%ld, "
-			       "ITC ratio %ld/%ld\n",
-			       pal.pal_result[0] >> 32,
-			       pal.pal_result[0] & ((1L << 32) - 1),
-			       pal.pal_result[1] >> 32,
-			       pal.pal_result[1] & ((1L << 32) - 1),
-			       pal.pal_result[2] >> 32,
-			       pal.pal_result[2] & ((1L << 32) - 1));
-		}
-		cpu_freq = freq_ratio(sal.sal_result[0], pal.pal_result[0]);
-		bus_freq = freq_ratio(sal.sal_result[0], pal.pal_result[1]);
-		itc_freq = freq_ratio(sal.sal_result[0], pal.pal_result[2]);
-	}
-}
-
-struct ia64_init_return
-ia64_init(void)
-{
-	struct ia64_init_return ret;
-	struct efi_md *md;
-	pt_entry_t *pbvm_pgtbl_ent, *pbvm_pgtbl_lim;
-	char *p;
-	vm_size_t mdlen;
-	int metadata_missing;
-
-	/*
-	 * NO OUTPUT ALLOWED UNTIL FURTHER NOTICE.
-	 */
-
-	ia64_set_fpsr(IA64_FPSR_DEFAULT);
-
-	/*
-	 * Region 6 is direct mapped UC and region 7 is direct mapped
-	 * WC. The details of this is controlled by the Alt {I,D}TLB
-	 * 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) | (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 */
-	ia64_physmem_init();
-
-	/*
-	 * Process the memory map. This gives us the PAL locations,
-	 * the I/O port base address, the available memory regions
-	 * for initializing the physical memory map.
-	 */
-	for (md = efi_md_first(); md != NULL; md = efi_md_next(md)) {
-		mdlen = md->md_pages * EFI_PAGE_SIZE;
-		switch (md->md_type) {
-		case EFI_MD_TYPE_IOPORT:
-			ia64_port_base = pmap_mapdev_priv(md->md_phys,
-			    mdlen, VM_MEMATTR_UNCACHEABLE);
-			break;
-		case EFI_MD_TYPE_PALCODE:
-			ia64_pal_base = md->md_phys;
-			ia64_pal_size = mdlen;
-			/*FALLTHROUGH*/
-		case EFI_MD_TYPE_BAD:
-		case EFI_MD_TYPE_FIRMWARE:
-		case EFI_MD_TYPE_RECLAIM:
-		case EFI_MD_TYPE_RT_CODE:
-		case EFI_MD_TYPE_RT_DATA:
-			/* Don't use these memory regions. */
-			ia64_physmem_track(md->md_phys, mdlen);
-			break;
-		case EFI_MD_TYPE_BS_CODE:
-		case EFI_MD_TYPE_BS_DATA:
-		case EFI_MD_TYPE_CODE:
-		case EFI_MD_TYPE_DATA:
-		case EFI_MD_TYPE_FREE:
-			/* These are ok to use. */
-			ia64_physmem_add(md->md_phys, mdlen);
-			break;
-		}
-	}
-
-	/*
-	 * Remove the PBVM and its page table from phys_avail. The loader
-	 * passes the physical address of the page table to us. The virtual
-	 * address of the page table is fixed.
-	 * Track and the PBVM limit for later use.
-	 */
-	ia64_physmem_delete(bootinfo->bi_pbvm_pgtbl, bootinfo->bi_pbvm_pgtblsz);
-	pbvm_pgtbl_ent = (void *)IA64_PBVM_PGTBL;
-	pbvm_pgtbl_lim = (void *)(IA64_PBVM_PGTBL + bootinfo->bi_pbvm_pgtblsz);
-	while (pbvm_pgtbl_ent < pbvm_pgtbl_lim) {
-		if ((*pbvm_pgtbl_ent & PTE_PRESENT) == 0)
-			break;
-		ia64_physmem_delete(*pbvm_pgtbl_ent & PTE_PPN_MASK,
-		    IA64_PBVM_PAGE_SIZE);
-		pbvm_pgtbl_ent++;
-	}
-
-	/* Finalize physical memory datastructures */
-	ia64_physmem_fini();
-
-	metadata_missing = 0;
-	if (bootinfo->bi_modulep)
-		preload_metadata = (caddr_t)bootinfo->bi_modulep;
-	else
-		metadata_missing = 1;
-
-	if (envmode == 0 && bootinfo->bi_envp)
-		kern_envp = (caddr_t)bootinfo->bi_envp;
-	else
-		kern_envp = static_env;
-
-	/*
-	 * Look at arguments passed to us and compute boothowto.
-	 */
-	boothowto = bootinfo->bi_boothowto;
-
-	if (boothowto & RB_VERBOSE)
-		bootverbose = 1;
-
-	/*
-	 * Wire things up so we can call the firmware.
-	 */
-	map_pal_code();
-	efi_boot_minimal(bootinfo->bi_systab);
-	ia64_xiv_init();
-	ia64_sal_init();
-	calculate_frequencies();
-
-	set_cputicker(ia64_get_itc, (u_long)itc_freq * 1000000, 0);
-
-	/*
-	 * Setup the PCPU data for the bootstrap processor. It is needed
-	 * by printf(). Also, since printf() has critical sections, we
-	 * need to initialize at least pc_curthread.
-	 */
-	pcpup = &pcpu0;
-	ia64_set_k4((u_int64_t)pcpup);
-	pcpu_init(pcpup, 0, sizeof(pcpu0));
-	dpcpu_init(ia64_physmem_alloc(DPCPU_SIZE, PAGE_SIZE), 0);
-	cpu_pcpu_setup(pcpup, ~0U, ia64_get_lid());
-	PCPU_SET(curthread, &thread0);
-
-	/*
-	 * Initialize the console before we print anything out.
-	 */
-	cninit();
-
-	/* OUTPUT NOW ALLOWED */
-
-	if (metadata_missing)
-		printf("WARNING: loader(8) metadata is missing!\n");
-
-	/* Get FPSWA interface */
-	fpswa_iface = (bootinfo->bi_fpswa == 0) ? NULL :
-	    (struct fpswa_iface *)IA64_PHYS_TO_RR7(bootinfo->bi_fpswa);
-
-	/* Init basic tunables, including hz */
-	init_param1();
-
-	p = getenv("kernelname");
-	if (p != NULL) {
-		strlcpy(kernelname, p, sizeof(kernelname));
-		freeenv(p);
-	}
-
-	init_param2(physmem);
-
-	/*
-	 * Initialize error message buffer (at end of core).
-	 */
-	msgbufp = ia64_physmem_alloc(msgbufsize, PAGE_SIZE);
-	msgbufinit(msgbufp, msgbufsize);
-
-	proc_linkup0(&proc0, &thread0);
-	/*
-	 * Init mapping for kernel stack for proc 0
-	 */
-	p = ia64_physmem_alloc(KSTACK_PAGES * PAGE_SIZE, PAGE_SIZE);
-	thread0.td_kstack = (uintptr_t)p;
-	thread0.td_kstack_pages = KSTACK_PAGES;
-
-	mutex_init();
-
-	/*
-	 * Initialize the rest of proc 0's PCB.
-	 *
-	 * Set the kernel sp, reserving space for an (empty) trapframe,
-	 * and make proc0's trapframe pointer point to it for sanity.
-	 * Initialise proc0's backing store to start after u area.
-	 */
-	cpu_thread_alloc(&thread0);
-	thread0.td_frame->tf_flags = FRAME_SYSCALL;
-	thread0.td_pcb->pcb_special.sp =
-	    (u_int64_t)thread0.td_frame - 16;
-	thread0.td_pcb->pcb_special.bspstore = thread0.td_kstack;
-
-	/*
-	 * Initialize the virtual memory system.
-	 */
-	pmap_bootstrap();
-
-#ifdef XTRACE
-	ia64_xtrace_init_bsp();
-#endif
-
-	/*
-	 * Initialize debuggers, and break into them if appropriate.
-	 */
-#ifdef DDB
-	ksym_start = bootinfo->bi_symtab;
-	ksym_end = bootinfo->bi_esymtab;
-#endif
-
-	kdb_init();
-
-#ifdef KDB
-	if (boothowto & RB_KDB)
-		kdb_enter(KDB_WHY_BOOTFLAGS,
-		    "Boot flags requested debugger\n");
-#endif
-
-	ia64_set_tpr(0);
-	ia64_srlz_d();
-
-	ret.bspstore = thread0.td_pcb->pcb_special.bspstore;
-	ret.sp = thread0.td_pcb->pcb_special.sp;
-	return (ret);
-}
-
-uint64_t
-ia64_get_hcdp(void)
-{
-
-	return (bootinfo->bi_hcdp);
-}
-
-void
-bzero(void *buf, size_t len)
-{
-	caddr_t p = buf;
-
-	while (((vm_offset_t) p & (sizeof(u_long) - 1)) && len) {
-		*p++ = 0;
-		len--;
-	}
-	while (len >= sizeof(u_long) * 8) {
-		*(u_long*) p = 0;
-		*((u_long*) p + 1) = 0;
-		*((u_long*) p + 2) = 0;
-		*((u_long*) p + 3) = 0;
-		len -= sizeof(u_long) * 8;
-		*((u_long*) p + 4) = 0;
-		*((u_long*) p + 5) = 0;
-		*((u_long*) p + 6) = 0;
-		*((u_long*) p + 7) = 0;
-		p += sizeof(u_long) * 8;
-	}
-	while (len >= sizeof(u_long)) {
-		*(u_long*) p = 0;
-		len -= sizeof(u_long);
-		p += sizeof(u_long);
-	}
-	while (len) {
-		*p++ = 0;
-		len--;
-	}
-}
-
-u_int
-ia64_itc_freq(void)
-{
-
-	return (itc_freq);
-}
-
-void
-DELAY(int n)
-{
-	u_int64_t start, end, now;
-
-	sched_pin();
-
-	start = ia64_get_itc();
-	end = start + itc_freq * n;
-	/* printf("DELAY from 0x%lx to 0x%lx\n", start, end); */
-	do {
-		now = ia64_get_itc();
-	} while (now < end || (now > start && end < start));
-
-	sched_unpin();
-}
-
-/*
- * Send an interrupt (signal) to a process.
- */
-void
-sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
-{
-	struct proc *p;
-	struct thread *td;
-	struct trapframe *tf;
-	struct sigacts *psp;
-	struct sigframe sf, *sfp;
-	u_int64_t sbs, sp;
-	int oonstack;
-	int sig;
-	u_long code;
-
-	td = curthread;
-	p = td->td_proc;
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-	sig = ksi->ksi_signo;
-	code = ksi->ksi_code;
-	psp = p->p_sigacts;
-	mtx_assert(&psp->ps_mtx, MA_OWNED);
-	tf = td->td_frame;
-	sp = tf->tf_special.sp;
-	oonstack = sigonstack(sp);
-	sbs = 0;
-
-	/* save user context */
-	bzero(&sf, sizeof(struct sigframe));
-	sf.sf_uc.uc_sigmask = *mask;
-	sf.sf_uc.uc_stack = td->td_sigstk;
-	sf.sf_uc.uc_stack.ss_flags = (td->td_pflags & TDP_ALTSTACK)
-	    ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE;
-
-	/*
-	 * Allocate and validate space for the signal handler
-	 * context. Note that if the stack is in P0 space, the
-	 * call to grow() is a nop, and the useracc() check
-	 * will fail if the process has not already allocated
-	 * the space with a `brk'.
-	 */
-	if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack &&
-	    SIGISMEMBER(psp->ps_sigonstack, sig)) {
-		sbs = (u_int64_t)td->td_sigstk.ss_sp;
-		sbs = (sbs + 15) & ~15;
-		sfp = (struct sigframe *)(sbs + td->td_sigstk.ss_size);
-#if defined(COMPAT_43)
-		td->td_sigstk.ss_flags |= SS_ONSTACK;
-#endif
-	} else
-		sfp = (struct sigframe *)sp;
-	sfp = (struct sigframe *)((u_int64_t)(sfp - 1) & ~15);
-
-	/* Fill in the siginfo structure for POSIX handlers. */
-	if (SIGISMEMBER(psp->ps_siginfo, sig)) {
-		sf.sf_si = ksi->ksi_info;
-		sf.sf_si.si_signo = sig;
-		/*
-		 * XXX this shouldn't be here after code in trap.c
-		 * is fixed
-		 */
-		sf.sf_si.si_addr = (void*)tf->tf_special.ifa;
-		code = (u_int64_t)&sfp->sf_si;
-	}
-
-	mtx_unlock(&psp->ps_mtx);
-	PROC_UNLOCK(p);
-
-	get_mcontext(td, &sf.sf_uc.uc_mcontext, 0);
-
-	/* Copy the frame out to userland. */
-	if (copyout(&sf, sfp, sizeof(sf)) != 0) {
-		/*
-		 * Process has trashed its stack; give it an illegal
-		 * instruction to halt it in its tracks.
-		 */
-		PROC_LOCK(p);
-		sigexit(td, SIGILL);
-		return;
-	}
-
-	if ((tf->tf_flags & FRAME_SYSCALL) == 0) {
-		tf->tf_special.psr &= ~IA64_PSR_RI;
-		tf->tf_special.iip = ia64_get_k5() +
-		    ((uint64_t)break_sigtramp - (uint64_t)ia64_gateway_page);
-	} else
-		tf->tf_special.iip = ia64_get_k5() +
-		    ((uint64_t)epc_sigtramp - (uint64_t)ia64_gateway_page);
-
-	/*
-	 * Setup the trapframe to return to the signal trampoline. We pass
-	 * information to the trampoline in the following registers:
-	 *
-	 *	gp	new backing store or NULL
-	 *	r8	signal number
-	 *	r9	signal code or siginfo pointer
-	 *	r10	signal handler (function descriptor)
-	 */
-	tf->tf_special.sp = (u_int64_t)sfp - 16;
-	tf->tf_special.gp = sbs;
-	tf->tf_special.bspstore = sf.sf_uc.uc_mcontext.mc_special.bspstore;
-	tf->tf_special.ndirty = 0;
-	tf->tf_special.rnat = sf.sf_uc.uc_mcontext.mc_special.rnat;
-	tf->tf_scratch.gr8 = sig;
-	tf->tf_scratch.gr9 = code;
-	tf->tf_scratch.gr10 = (u_int64_t)catcher;
-
-	PROC_LOCK(p);
-	mtx_lock(&psp->ps_mtx);
-}
-
-/*
- * System call to cleanup state after a signal
- * has been taken.  Reset signal mask and
- * stack state from context left by sendsig (above).
- * Return to previous pc and psl as specified by
- * context left by sendsig. Check carefully to
- * make sure that the user has not modified the
- * state to gain improper privileges.
- *
- * MPSAFE
- */
-int
-sys_sigreturn(struct thread *td,
-	struct sigreturn_args /* {
-		ucontext_t *sigcntxp;
-	} */ *uap)
-{
-	ucontext_t uc;
-	struct trapframe *tf;
-	struct pcb *pcb;
-
-	tf = td->td_frame;
-	pcb = td->td_pcb;
-
-	/*
-	 * Fetch the entire context structure at once for speed.
-	 * We don't use a normal argument to simplify RSE handling.
-	 */
-	if (copyin(uap->sigcntxp, (caddr_t)&uc, sizeof(uc)))
-		return (EFAULT);
-
-	set_mcontext(td, &uc.uc_mcontext);
-
-#if defined(COMPAT_43)
-	if (sigonstack(tf->tf_special.sp))
-		td->td_sigstk.ss_flags |= SS_ONSTACK;
-	else
-		td->td_sigstk.ss_flags &= ~SS_ONSTACK;
-#endif
-	kern_sigprocmask(td, SIG_SETMASK, &uc.uc_sigmask, NULL, 0);
-
-	return (EJUSTRETURN);
-}
-
-#ifdef COMPAT_FREEBSD4
-int
-freebsd4_sigreturn(struct thread *td, struct freebsd4_sigreturn_args *uap)
-{
-
-	return sys_sigreturn(td, (struct sigreturn_args *)uap);
-}
-#endif
-
-/*
- * Construct a PCB from a trapframe. This is called from kdb_trap() where
- * we want to start a backtrace from the function that caused us to enter
- * the debugger. We have the context in the trapframe, but base the trace
- * on the PCB. The PCB doesn't have to be perfect, as long as it contains
- * enough for a backtrace.
- */
-void
-makectx(struct trapframe *tf, struct pcb *pcb)
-{
-
-	pcb->pcb_special = tf->tf_special;
-	pcb->pcb_special.__spare = ~0UL;	/* XXX see unwind.c */
-	save_callee_saved(&pcb->pcb_preserved);
-	save_callee_saved_fp(&pcb->pcb_preserved_fp);
-}
-
-int
-ia64_flush_dirty(struct thread *td, struct _special *r)
-{
-	struct iovec iov;
-	struct uio uio;
-	uint64_t bspst, kstk, rnat;
-	int error, locked;
-
-	if (r->ndirty == 0)
-		return (0);
-
-	kstk = td->td_kstack + (r->bspstore & 0x1ffUL);
-	if (td == curthread) {
-		__asm __volatile("mov	ar.rsc=0;;");
-		__asm __volatile("mov	%0=ar.bspstore" : "=r"(bspst));
-		/* Make sure we have all the user registers written out. */
-		if (bspst - kstk < r->ndirty) {
-			__asm __volatile("flushrs;;");
-			__asm __volatile("mov	%0=ar.bspstore" : "=r"(bspst));
-		}
-		__asm __volatile("mov	%0=ar.rnat;;" : "=r"(rnat));
-		__asm __volatile("mov	ar.rsc=3");
-		error = copyout((void*)kstk, (void*)r->bspstore, r->ndirty);
-		kstk += r->ndirty;
-		r->rnat = (bspst > kstk && (bspst & 0x1ffL) < (kstk & 0x1ffL))
-		    ? *(uint64_t*)(kstk | 0x1f8L) : rnat;
-	} else {
-		locked = PROC_LOCKED(td->td_proc);
-		if (!locked)
-			PHOLD(td->td_proc);
-		iov.iov_base = (void*)(uintptr_t)kstk;
-		iov.iov_len = r->ndirty;
-		uio.uio_iov = &iov;
-		uio.uio_iovcnt = 1;
-		uio.uio_offset = r->bspstore;
-		uio.uio_resid = r->ndirty;
-		uio.uio_segflg = UIO_SYSSPACE;
-		uio.uio_rw = UIO_WRITE;
-		uio.uio_td = td;
-		error = proc_rwmem(td->td_proc, &uio);
-		/*
-		 * XXX proc_rwmem() doesn't currently return ENOSPC,
-		 * so I think it can bogusly return 0. Neither do
-		 * we allow short writes.
-		 */
-		if (uio.uio_resid != 0 && error == 0)
-			error = ENOSPC;
-		if (!locked)
-			PRELE(td->td_proc);
-	}
-
-	r->bspstore += r->ndirty;
-	r->ndirty = 0;
-	return (error);
-}
-
-int
-get_mcontext(struct thread *td, mcontext_t *mc, int flags)
-{
-	struct trapframe *tf;
-	int error;
-
-	tf = td->td_frame;
-	bzero(mc, sizeof(*mc));
-	mc->mc_special = tf->tf_special;
-	error = ia64_flush_dirty(td, &mc->mc_special);
-	if (tf->tf_flags & FRAME_SYSCALL) {
-		mc->mc_flags |= _MC_FLAGS_SYSCALL_CONTEXT;
-		mc->mc_scratch = tf->tf_scratch;
-		if (flags & GET_MC_CLEAR_RET) {
-			mc->mc_scratch.gr8 = 0;
-			mc->mc_scratch.gr9 = 0;
-			mc->mc_scratch.gr10 = 0;
-			mc->mc_scratch.gr11 = 0;
-		}
-	} else {
-		mc->mc_flags |= _MC_FLAGS_ASYNC_CONTEXT;
-		mc->mc_scratch = tf->tf_scratch;
-		mc->mc_scratch_fp = tf->tf_scratch_fp;
-		/*
-		 * XXX If the thread never used the high FP registers, we
-		 * probably shouldn't waste time saving them.
-		 */
-		ia64_highfp_save(td);
-		mc->mc_flags |= _MC_FLAGS_HIGHFP_VALID;
-		mc->mc_high_fp = td->td_pcb->pcb_high_fp;
-	}
-	save_callee_saved(&mc->mc_preserved);
-	save_callee_saved_fp(&mc->mc_preserved_fp);
-	return (error);
-}
-
-int
-set_mcontext(struct thread *td, const mcontext_t *mc)
-{
-	struct _special s;
-	struct trapframe *tf;
-	uint64_t psrmask;
-
-	tf = td->td_frame;
-
-	KASSERT((tf->tf_special.ndirty & ~PAGE_MASK) == 0,
-	    ("Whoa there! We have more than 8KB of dirty registers!"));
-
-	s = mc->mc_special;
-	/*
-	 * Only copy the user mask and the restart instruction bit from
-	 * the new context.
-	 */
-	psrmask = IA64_PSR_BE | IA64_PSR_UP | IA64_PSR_AC | IA64_PSR_MFL |
-	    IA64_PSR_MFH | IA64_PSR_RI;
-	s.psr = (tf->tf_special.psr & ~psrmask) | (s.psr & psrmask);
-	/* We don't have any dirty registers of the new context. */
-	s.ndirty = 0;
-	if (mc->mc_flags & _MC_FLAGS_ASYNC_CONTEXT) {
-		/*
-		 * We can get an async context passed to us while we
-		 * entered the kernel through a syscall: sigreturn(2)
-		 * takes contexts that could previously be the result of
-		 * a trap or interrupt.
-		 * Hence, we cannot assert that the trapframe is not
-		 * a syscall frame, but we can assert that it's at
-		 * least an expected syscall.
-		 */
-		if (tf->tf_flags & FRAME_SYSCALL) {
-			KASSERT(tf->tf_scratch.gr15 == SYS_sigreturn, ("foo"));
-			tf->tf_flags &= ~FRAME_SYSCALL;
-		}
-		tf->tf_scratch = mc->mc_scratch;
-		tf->tf_scratch_fp = mc->mc_scratch_fp;
-		if (mc->mc_flags & _MC_FLAGS_HIGHFP_VALID)
-			td->td_pcb->pcb_high_fp = mc->mc_high_fp;
-	} else {
-		KASSERT((tf->tf_flags & FRAME_SYSCALL) != 0, ("foo"));
-		if ((mc->mc_flags & _MC_FLAGS_SYSCALL_CONTEXT) == 0) {
-			s.cfm = tf->tf_special.cfm;
-			s.iip = tf->tf_special.iip;
-			tf->tf_scratch.gr15 = 0;	/* Clear syscall nr. */
-		} else
-			tf->tf_scratch = mc->mc_scratch;
-	}
-	tf->tf_special = s;
-	restore_callee_saved(&mc->mc_preserved);
-	restore_callee_saved_fp(&mc->mc_preserved_fp);
-
-	return (0);
-}
-
-/*
- * Clear registers on exec.
- */
-void
-exec_setregs(struct thread *td, struct image_params *imgp, u_long stack)
-{
-	struct trapframe *tf;
-	uint64_t *ksttop, *kst;
-
-	tf = td->td_frame;
-	ksttop = (uint64_t*)(td->td_kstack + tf->tf_special.ndirty +
-	    (tf->tf_special.bspstore & 0x1ffUL));
-
-	/*
-	 * We can ignore up to 8KB of dirty registers by masking off the
-	 * lower 13 bits in exception_restore() or epc_syscall(). This
-	 * should be enough for a couple of years, but if there are more
-	 * than 8KB of dirty registers, we lose track of the bottom of
-	 * the kernel stack. The solution is to copy the active part of
-	 * the kernel stack down 1 page (or 2, but not more than that)
-	 * so that we always have less than 8KB of dirty registers.
-	 */
-	KASSERT((tf->tf_special.ndirty & ~PAGE_MASK) == 0,
-	    ("Whoa there! We have more than 8KB of dirty registers!"));
-
-	bzero(&tf->tf_special, sizeof(tf->tf_special));
-	if ((tf->tf_flags & FRAME_SYSCALL) == 0) {	/* break syscalls. */
-		bzero(&tf->tf_scratch, sizeof(tf->tf_scratch));
-		bzero(&tf->tf_scratch_fp, sizeof(tf->tf_scratch_fp));
-		tf->tf_special.cfm = (1UL<<63) | (3UL<<7) | 3UL;
-		tf->tf_special.bspstore = IA64_BACKINGSTORE;
-		/*
-		 * Copy the arguments onto the kernel register stack so that
-		 * they get loaded by the loadrs instruction. Skip over the
-		 * NaT collection points.
-		 */
-		kst = ksttop - 1;
-		if (((uintptr_t)kst & 0x1ff) == 0x1f8)
-			*kst-- = 0;
-		*kst-- = 0;
-		if (((uintptr_t)kst & 0x1ff) == 0x1f8)
-			*kst-- = 0;
-		*kst-- = imgp->ps_strings;
-		if (((uintptr_t)kst & 0x1ff) == 0x1f8)
-			*kst-- = 0;
-		*kst = stack;
-		tf->tf_special.ndirty = (ksttop - kst) << 3;
-	} else {				/* epc syscalls (default). */
-		tf->tf_special.cfm = (3UL<<62) | (3UL<<7) | 3UL;
-		tf->tf_special.bspstore = IA64_BACKINGSTORE + 24;
-		/*
-		 * Write values for out0, out1 and out2 to the user's backing
-		 * store and arrange for them to be restored into the user's
-		 * initial register frame.
-		 * Assumes that (bspstore & 0x1f8) < 0x1e0.
-		 */
-		suword((caddr_t)tf->tf_special.bspstore - 24, stack);
-		suword((caddr_t)tf->tf_special.bspstore - 16, imgp->ps_strings);
-		suword((caddr_t)tf->tf_special.bspstore -  8, 0);
-	}
-
-	tf->tf_special.iip = imgp->entry_addr;
-	tf->tf_special.sp = (stack & ~15) - 16;
-	tf->tf_special.rsc = 0xf;
-	tf->tf_special.fpsr = IA64_FPSR_DEFAULT;
-	tf->tf_special.psr = IA64_PSR_IC | IA64_PSR_I | IA64_PSR_IT |
-	    IA64_PSR_DT | IA64_PSR_RT | IA64_PSR_DFH | IA64_PSR_BN |
-	    IA64_PSR_CPL_USER;
-}
-
-int
-ptrace_set_pc(struct thread *td, unsigned long addr)
-{
-	uint64_t slot;
-
-	switch (addr & 0xFUL) {
-	case 0:
-		slot = IA64_PSR_RI_0;
-		break;
-	case 1:
-		/* XXX we need to deal with MLX bundles here */
-		slot = IA64_PSR_RI_1;
-		break;
-	case 2:
-		slot = IA64_PSR_RI_2;
-		break;
-	default:
-		return (EINVAL);
-	}
-
-	td->td_frame->tf_special.iip = addr & ~0x0FULL;
-	td->td_frame->tf_special.psr =
-	    (td->td_frame->tf_special.psr & ~IA64_PSR_RI) | slot;
-	return (0);
-}
-
-int
-ptrace_single_step(struct thread *td)
-{
-	struct trapframe *tf;
-
-	/*
-	 * There's no way to set single stepping when we're leaving the
-	 * kernel through the EPC syscall path. The way we solve this is
-	 * by enabling the lower-privilege trap so that we re-enter the
-	 * kernel as soon as the privilege level changes. See trap.c for
-	 * how we proceed from there.
-	 */
-	tf = td->td_frame;
-	if (tf->tf_flags & FRAME_SYSCALL)
-		tf->tf_special.psr |= IA64_PSR_LP;
-	else
-		tf->tf_special.psr |= IA64_PSR_SS;
-	return (0);
-}
-
-int
-ptrace_clear_single_step(struct thread *td)
-{
-	struct trapframe *tf;
-
-	/*
-	 * Clear any and all status bits we may use to implement single
-	 * stepping.
-	 */
-	tf = td->td_frame;
-	tf->tf_special.psr &= ~IA64_PSR_SS;
-	tf->tf_special.psr &= ~IA64_PSR_LP;
-	tf->tf_special.psr &= ~IA64_PSR_TB;
-	return (0);
-}
-
-int
-fill_regs(struct thread *td, struct reg *regs)
-{
-	struct trapframe *tf;
-
-	tf = td->td_frame;
-	regs->r_special = tf->tf_special;
-	regs->r_scratch = tf->tf_scratch;
-	save_callee_saved(&regs->r_preserved);
-	return (0);
-}
-
-int
-set_regs(struct thread *td, struct reg *regs)
-{
-	struct trapframe *tf;
-	int error;
-
-	tf = td->td_frame;
-	error = ia64_flush_dirty(td, &tf->tf_special);
-	if (!error) {
-		tf->tf_special = regs->r_special;
-		tf->tf_special.bspstore += tf->tf_special.ndirty;
-		tf->tf_special.ndirty = 0;
-		tf->tf_scratch = regs->r_scratch;
-		restore_callee_saved(&regs->r_preserved);
-	}
-	return (error);
-}
-
-int
-fill_dbregs(struct thread *td, struct dbreg *dbregs)
-{
-
-	return (ENOSYS);
-}
-
-int
-set_dbregs(struct thread *td, struct dbreg *dbregs)
-{
-
-	return (ENOSYS);
-}
-
-int
-fill_fpregs(struct thread *td, struct fpreg *fpregs)
-{
-	struct trapframe *frame = td->td_frame;
-	struct pcb *pcb = td->td_pcb;
-
-	/* Save the high FP registers. */
-	ia64_highfp_save(td);
-
-	fpregs->fpr_scratch = frame->tf_scratch_fp;
-	save_callee_saved_fp(&fpregs->fpr_preserved);
-	fpregs->fpr_high = pcb->pcb_high_fp;
-	return (0);
-}
-
-int
-set_fpregs(struct thread *td, struct fpreg *fpregs)
-{
-	struct trapframe *frame = td->td_frame;
-	struct pcb *pcb = td->td_pcb;
-
-	/* Throw away the high FP registers (should be redundant). */
-	ia64_highfp_drop(td);
-
-	frame->tf_scratch_fp = fpregs->fpr_scratch;
-	restore_callee_saved_fp(&fpregs->fpr_preserved);
-	pcb->pcb_high_fp = fpregs->fpr_high;
-	return (0);
-}
-
-void
-ia64_sync_icache(vm_offset_t va, vm_offset_t sz)
-{
-	vm_offset_t lim;
-
-	if (!ia64_sync_icache_needed)
-		return;
-
-	lim = va + sz;
-	while (va < lim) {
-		ia64_fc_i(va);
-		va += 32;	/* XXX */
-	}
-
-	ia64_sync_i();
-	ia64_srlz_i();
-}
diff --git a/sys/ia64/ia64/mca.c b/sys/ia64/ia64/mca.c
deleted file mode 100644
index dd0b9c386538..000000000000
--- a/sys/ia64/ia64/mca.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/*-
- * Copyright (c) 2002-2010 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$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/sysctl.h>
-#include <sys/uuid.h>
-#include <vm/vm.h>
-#include <vm/vm_kern.h>
-#include <machine/intr.h>
-#include <machine/mca.h>
-#include <machine/pal.h>
-#include <machine/sal.h>
-#include <machine/smp.h>
-
-static MALLOC_DEFINE(M_MCA, "MCA", "Machine Check Architecture");
-
-struct mca_info {
-	STAILQ_ENTRY(mca_info) mi_link;
-	u_long	mi_seqnr;
-	u_int	mi_cpuid;
-	size_t	mi_recsz;
-	char	mi_record[0];
-};
-
-STAILQ_HEAD(mca_info_list, mca_info);
-
-static int64_t		mca_info_size[SAL_INFO_TYPES];
-static vm_offset_t	mca_info_block;
-static struct mtx	mca_info_block_lock;
-
-static SYSCTL_NODE(_hw, OID_AUTO, mca, CTLFLAG_RW, NULL, "MCA container");
-
-static int mca_count;		/* Number of records stored. */
-static int mca_first;		/* First (lowest) record ID. */
-static int mca_last;		/* Last (highest) record ID. */
-
-SYSCTL_INT(_hw_mca, OID_AUTO, count, CTLFLAG_RD, &mca_count, 0,
-    "Record count");
-SYSCTL_INT(_hw_mca, OID_AUTO, first, CTLFLAG_RD, &mca_first, 0,
-    "First record id");
-SYSCTL_INT(_hw_mca, OID_AUTO, last, CTLFLAG_RD, &mca_last, 0,
-    "Last record id");
-
-static struct mtx mca_sysctl_lock;
-
-static u_int mca_xiv_cmc;
-
-static int
-mca_sysctl_inject(SYSCTL_HANDLER_ARGS)
-{
-	struct ia64_pal_result res;
-	u_int val;
-	int error;
-
-	val = 0;
-	error = sysctl_wire_old_buffer(req, sizeof(u_int));
-	if (!error)
-		error = sysctl_handle_int(oidp, &val, 0, req);
-
-	if (error != 0 || req->newptr == NULL)
-		return (error);
-
-	/*
-	 * Example values for injecting PAL determined machine checks:
-	 *	corrected	9
-	 *	recoverable	73
-	 *	fatal		137
-	 */
-	res = ia64_call_pal_stacked(PAL_MC_ERROR_INJECT, val, 0, 0);
-	printf("%s: %#lx, %#lx, %#lx, %#lx\n", __func__, res.pal_status,
-	    res.pal_result[0], res.pal_result[1], res.pal_result[2]);
-	return (0);
-}
-SYSCTL_PROC(_hw_mca, OID_AUTO, inject, CTLTYPE_INT | CTLFLAG_RW, NULL, 0,
-    mca_sysctl_inject, "I", "set to trigger a MCA");
-
-static int
-mca_sysctl_handler(SYSCTL_HANDLER_ARGS)
-{
-	int error = 0;
-
-	if (!arg1)
-		return (EINVAL);
-	error = SYSCTL_OUT(req, arg1, arg2);
-
-	if (error || !req->newptr)
-		return (error);
-
-	error = SYSCTL_IN(req, arg1, arg2);
-	return (error);
-}
-
-static void
-ia64_mca_collect_state(int type, struct mca_info_list *reclst)
-{
-	struct ia64_sal_result result;
-	struct mca_record_header *hdr;
-	struct mca_info *rec;
-	uint64_t seqnr;
-	size_t recsz;
-
-	/*
-	 * Don't try to get the state if we couldn't get the size of
-	 * the state information previously.
-	 */
-	if (mca_info_size[type] == -1)
-		return;
-
-	if (mca_info_block == 0)
-		return;
-
-	while (1) {
-		mtx_lock_spin(&mca_info_block_lock);
-		result = ia64_sal_entry(SAL_GET_STATE_INFO, type, 0,
-		    mca_info_block, 0, 0, 0, 0);
-		if (result.sal_status < 0) {
-			mtx_unlock_spin(&mca_info_block_lock);
-			break;
-		}
-
-		hdr = (struct mca_record_header *)mca_info_block;
-		recsz = hdr->rh_length;
-		seqnr = hdr->rh_seqnr;
-
-		mtx_unlock_spin(&mca_info_block_lock);
-
-		rec = malloc(sizeof(struct mca_info) + recsz, M_MCA,
-		    M_NOWAIT | M_ZERO);
-		if (rec == NULL)
-			/* XXX: Not sure what to do. */
-			break;
-
-		rec->mi_seqnr = seqnr;
-		rec->mi_cpuid = PCPU_GET(cpuid);
-
-		mtx_lock_spin(&mca_info_block_lock);
-
-		/*
-		 * If the info block doesn't have our record anymore because
-		 * we temporarily unlocked it, get it again from SAL. I assume
-		 * that it's possible that we could get a different record.
-		 * I expect this to happen in a SMP configuration where the
-		 * record has been cleared by a different processor. So, if
-		 * we get a different record we simply abort with this record
-		 * and start over.
-		 */
-		if (seqnr != hdr->rh_seqnr) {
-			result = ia64_sal_entry(SAL_GET_STATE_INFO, type, 0,
-			    mca_info_block, 0, 0, 0, 0);
-			if (seqnr != hdr->rh_seqnr) {
-				mtx_unlock_spin(&mca_info_block_lock);
-				free(rec, M_MCA);
-				continue;
-			}
-		}
-
-		rec->mi_recsz = recsz;
-		bcopy((char*)mca_info_block, rec->mi_record, recsz);
-
-		/*
-		 * Clear the state so that we get any other records when
-		 * they exist.
-		 */
-		result = ia64_sal_entry(SAL_CLEAR_STATE_INFO, type, 0, 0, 0,
-		    0, 0, 0);
-
-		mtx_unlock_spin(&mca_info_block_lock);
-
-		STAILQ_INSERT_TAIL(reclst, rec, mi_link);
-	}
-}
-
-void
-ia64_mca_save_state(int type)
-{
-	char name[64];
-	struct mca_info_list reclst = STAILQ_HEAD_INITIALIZER(reclst);
-	struct mca_info *rec;
-	struct sysctl_oid *oid;
-
-	ia64_mca_collect_state(type, &reclst);
-
-	STAILQ_FOREACH(rec, &reclst, mi_link) {
-		sprintf(name, "%lu", rec->mi_seqnr);
-		oid = SYSCTL_ADD_NODE(NULL, SYSCTL_STATIC_CHILDREN(_hw_mca),
-		    OID_AUTO, name, CTLFLAG_RW, NULL, name);
-		if (oid == NULL)
-			continue;
-
-		mtx_lock(&mca_sysctl_lock);
-		if (mca_count > 0) {
-			if (rec->mi_seqnr < mca_first)
-				mca_first = rec->mi_seqnr;
-			else if (rec->mi_seqnr > mca_last)
-				mca_last = rec->mi_seqnr;
-		} else
-			mca_first = mca_last = rec->mi_seqnr;
-		mca_count++;
-		mtx_unlock(&mca_sysctl_lock);
-
-		sprintf(name, "%u", rec->mi_cpuid);
-		SYSCTL_ADD_PROC(NULL, SYSCTL_CHILDREN(oid), rec->mi_cpuid,
-		    name, CTLTYPE_OPAQUE | CTLFLAG_RD, rec->mi_record,
-		    rec->mi_recsz, mca_sysctl_handler, "S,MCA", "MCA record");
-	}
-}
-
-static u_int
-ia64_mca_intr(struct thread *td, u_int xiv, struct trapframe *tf)
-{
-
-	if (xiv == mca_xiv_cmc) {
-		printf("MCA: corrected machine check (CMC) interrupt\n");
-		return (0);
-	}
-
-	return (0);
-}
-
-void
-ia64_mca_init_ap(void)
-{
-
-	if (mca_xiv_cmc != 0)
-		ia64_set_cmcv(mca_xiv_cmc);
-}
-
-void
-ia64_mca_init(void)
-{
-	struct ia64_sal_result result;
-	uint64_t max_size;
-	char *p;
-	int i;
-
-	/*
-	 * Get the sizes of the state information we can get from SAL and
-	 * allocate a common block (forgive me my Fortran :-) for use by
-	 * support functions. We create a region 7 address to make it
-	 * easy on the OS_MCA or OS_INIT handlers to get the state info
-	 * under unreliable conditions.
-	 */
-	max_size = 0;
-	for (i = 0; i < SAL_INFO_TYPES; i++) {
-		result = ia64_sal_entry(SAL_GET_STATE_INFO_SIZE, i, 0, 0, 0,
-		    0, 0, 0);
-		if (result.sal_status == 0) {
-			mca_info_size[i] = result.sal_result[0];
-			if (mca_info_size[i] > max_size)
-				max_size = mca_info_size[i];
-		} else
-			mca_info_size[i] = -1;
-	}
-	max_size = round_page(max_size);
-
-	p = (max_size) ? contigmalloc(max_size, M_TEMP, M_NOWAIT, 0ul, ~0ul,
-	    PAGE_SIZE, 256*1024*1024) : NULL;
-	if (p != NULL) {
-		mca_info_block = IA64_PHYS_TO_RR7(ia64_tpa((u_int64_t)p));
-
-		if (bootverbose)
-			printf("MCA: allocated %ld bytes for state info.\n",
-			    max_size);
-	}
-
-	/*
-	 * Initialize the spin lock used to protect the info block. When APs
-	 * get launched, there's a short moment of contention, but in all other
-	 * cases it's not a hot spot. I think it's possible to have the MCA
-	 * handler be called on multiple processors at the same time, but that
-	 * should be rare. On top of that, performance is not an issue when
-	 * dealing with machine checks...
-	 */
-	mtx_init(&mca_info_block_lock, "MCA info lock", NULL, MTX_SPIN);
-
-	/*
-	 * Serialize sysctl operations with a sleep lock. Note that this
-	 * implies that we update the sysctl tree in a context that allows
-	 * sleeping.
-	 */
-	mtx_init(&mca_sysctl_lock, "MCA sysctl lock", NULL, MTX_DEF);
-
-	/*
-	 * Get and save any processor and platfom error records. Note that in
-	 * a SMP configuration the processor records are for the BSP only. We
-	 * let the APs get and save their own records when we wake them up.
-	 */
-	for (i = 0; i < SAL_INFO_TYPES; i++)
-		ia64_mca_save_state(i);
-
-	/*
-	 * Allocate a XIV for CMC interrupts, so that we can collect and save
-	 * the corrected processor checks.
-	 */
-	mca_xiv_cmc = ia64_xiv_alloc(PI_SOFT, IA64_XIV_PLAT, ia64_mca_intr);
-	if (mca_xiv_cmc != 0)
-		ia64_set_cmcv(mca_xiv_cmc);
-	else
-		printf("MCA: CMC vector could not be allocated\n");
-}
diff --git a/sys/ia64/ia64/mem.c b/sys/ia64/ia64/mem.c
deleted file mode 100644
index 6faf437a7aec..000000000000
--- a/sys/ia64/ia64/mem.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * Copyright (c) 1988 University of Utah.
- * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
- * 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 code derived from software contributed to
- * Berkeley by William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 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: Utah $Hdr: mem.c 1.13 89/10/08$
- *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * Memory special file
- */
-
-#include <sys/param.h>
-#include <sys/conf.h>
-#include <sys/efi.h>
-#include <sys/fcntl.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/memrange.h>
-#include <sys/systm.h>
-#include <sys/uio.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-#include <vm/vm_extern.h>
-
-#include <machine/memdev.h>
-
-struct mem_range_softc mem_range_softc;
-
-static int
-mem_phys2virt(vm_offset_t offset, int prot, void **ptr, u_long *limit)
-{
-	struct efi_md *md;
-
-	if (prot & ~(VM_PROT_READ | VM_PROT_WRITE))
-		return (EPERM);
-
-	md = efi_md_find(offset);
-	if (md == NULL)
-		return (EFAULT);
-
-	if (md->md_type == EFI_MD_TYPE_BAD)
-		return (EIO);
-
-	*ptr = (void *)((md->md_attr & EFI_MD_ATTR_WB)
-	    ? IA64_PHYS_TO_RR7(offset) : IA64_PHYS_TO_RR6(offset));
-	*limit = (md->md_pages * EFI_PAGE_SIZE) - (offset - md->md_phys);
-	return (0);
-}
-
-/* ARGSUSED */
-int
-memrw(struct cdev *dev, struct uio *uio, int flags)
-{
-	struct iovec *iov;
-	off_t ofs;
-	vm_offset_t addr;
-	void *ptr;
-	u_long limit;
-	int count, error, phys, rw;
-
-	error = 0;
-	rw = (uio->uio_rw == UIO_READ) ? VM_PROT_READ : VM_PROT_WRITE;
-
-	while (uio->uio_resid > 0 && !error) {
-		iov = uio->uio_iov;
-		if (iov->iov_len == 0) {
-			uio->uio_iov++;
-			uio->uio_iovcnt--;
-			if (uio->uio_iovcnt < 0)
-				panic("memrw");
-			continue;
-		}
-
-		ofs = uio->uio_offset;
-
-		phys = (dev2unit(dev) == CDEV_MINOR_MEM) ? 1 : 0;
-		if (phys == 0 && ofs >= IA64_RR_BASE(6)) {
-			ofs = IA64_RR_MASK(ofs);
-			phys++;
-		}
-
-		if (phys) {
-			error = mem_phys2virt(ofs, rw, &ptr, &limit);
-			if (error)
-				return (error);
-
-			count = min(uio->uio_resid, limit);
-			error = uiomove(ptr, count, uio);
-		} else {
-			ptr = (void *)ofs;
-			count = iov->iov_len;
-
-			/*
-			 * Make sure that all of the pages are currently
-			 * resident so that we don't create any zero-fill
-			 * pages.
-			 */
-			limit = round_page(ofs + count);
-			addr = trunc_page(ofs);
-			if (addr < VM_MAXUSER_ADDRESS)
-				return (EINVAL);
-			for (; addr < limit; addr += PAGE_SIZE) {
-				if (pmap_kextract(addr) == 0)
-					return (EFAULT);
-			}
-			if (!kernacc(ptr, count, rw))
-				return (EFAULT);
-			error = uiomove(ptr, count, uio);
-		}
-		/* else panic! */
-	}
-	return (error);
-}
-
-/*
- * allow user processes to MMAP some memory sections
- * instead of going through read/write
- */
-int
-memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
-    int prot, vm_memattr_t *memattr)
-{
-	void *ptr;
-	u_long limit;
-	int error;
-
-	/*
-	 * /dev/mem is the only one that makes sense through this
-	 * interface.  For /dev/kmem any physaddr we return here
-	 * could be transient and hence incorrect or invalid at
-	 * a later time.
-	 */
-	if (dev2unit(dev) != CDEV_MINOR_MEM)
-		return (ENXIO);
-
-	error = mem_phys2virt(offset, prot, &ptr, &limit);
-	if (error)
-		return (error);
-
-	*paddr = offset;
-	*memattr = ((uintptr_t)ptr >= IA64_RR_BASE(7)) ?
-	    VM_MEMATTR_WRITE_BACK : VM_MEMATTR_UNCACHEABLE;
-	return (0);
-}
diff --git a/sys/ia64/ia64/mp_locore.S b/sys/ia64/ia64/mp_locore.S
deleted file mode 100644
index 75f75a958c2f..000000000000
--- a/sys/ia64/ia64/mp_locore.S
+++ /dev/null
@@ -1,275 +0,0 @@
-/*-
- * Copyright (c) 2011 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <machine/asm.h>
-#include <machine/ia64_cpu.h>
-#include <machine/pte.h>
-#include <assym.s>
-
-/*
- * AP wake-up entry point. The handoff state is similar as for the BSP,
- * as described on page 3-9 of the IPF SAL Specification. The difference
- * lies in the contents of register b0. For APs this register holds the
- * return address into the SAL rendezvous routine.
- *
- * Note that we're responsible for clearing the IRR bit by reading cr.ivr
- * and issuing the EOI to the local SAPIC.
- */
-	.align	32
-ENTRY_NOPROFILE(os_boot_rendez,0)
-{	.mmi
-	st8	[gp] = gp		// trace = 0x00
-	mov	r8 = cr.ivr		// clear IRR bit
-	add	r2 = 8, gp
-	;;
-}
-{	.mmi
-	srlz.d
-	mov	cr.eoi = r0		// ACK the wake-up
-	add	r3 = 16, gp
-	;;
-}
-{	.mmi
-	srlz.d
-	rsm	IA64_PSR_IC | IA64_PSR_I
-	mov	r16 = (IA64_PBVM_RR << 8) | (IA64_PBVM_PAGE_SHIFT << 2)
-	;;
-}
-{	.mmi
-	srlz.d
-	st8	[gp] = r2		// trace = 0x08
-	dep.z	r17 = IA64_PBVM_RR, 61, 3
-	;;
-}
-{	.mlx
-	mov     rr[r17] = r16
-	movl	r18 = IA64_PBVM_PGTBL
-	;;
-}
-{	.mmi
-	srlz.i
-	;;
-	st8	[gp] = r3		// trace = 0x10
-	nop	0
-	;;
-}
-{	.mmi
-	ld8	r16 = [r2], 16		// as_pgtbl_pte
-	ld8	r17 = [r3], 16		// as_pgtbl_itir
-	nop	0
-	;;
-}
-{	.mmi
-	mov	cr.itir = r17
-	mov	cr.ifa = r18
-	nop	0
-	;;
-}
-{	.mmi
-	srlz.d
-	ptr.d	r18, r17
-	nop	0
-	;;
-}
-{	.mmi
-	srlz.d
-	st8	[gp] = r2		// trace = 0x18
-	mov	r8 = r0
-	;;
-}
-{	.mmi
-	itr.d	dtr[r8] = r16
-	;;
-	srlz.d
-	mov	r9 = r0
-	;;
-}
-{	.mmi
-	ld8	r16 = [r2], 16		// as_text_va
-	st8	[gp] = r3		// trace = 0x20
-	add	r8 = 1, r8
-	;;
-}
-{	.mmi
-	ld8	r17 = [r3], 16		// as_text_pte
-	ld8	r18 = [r2], 16		// as_text_itir
-	nop	0
-	;;
-}
-{	.mmi
-	mov	cr.ifa = r16
-	mov	cr.itir = r18
-	nop	0
-	;;
-}
-{	.mmi
-	srlz.d
-	ptr.d	r16, r18
-	nop	0
-	;;
-}
-{	.mmi
-	srlz.d
-	st8	[gp] = r3		// trace = 0x30
-	nop	0
-	;;
-}
-{	.mmi
-	itr.d	dtr[r8] = r17
-	;;
-	srlz.d
-	nop	0
-}
-{	.mmi
-	st8	[gp] = r2		// trace = 0x38
-	ptr.i	r16, r18
-	add	r8 = 1, r8
-	;;
-}
-{	.mmi
-	srlz.i
-	;;
-	itr.i	itr[r9] = r17
-	nop	0
-	;;
-}
-{	.mmi
-	srlz.i
-	;;
-	ld8	r16 = [r3], 16          // as_data_va
-	add	r9 = 1, r9
-	;;
-}
-{	.mmi
-	st8	[gp] = r3		// trace = 0x40
-	ld8	r17 = [r2], 16		// as_data_pte
-	nop	0
-	;;
-}
-{	.mmi
-	mov	cr.ifa = r16
-	ld8	r18 = [r3], 16		// as_data_itir
-	nop	0
-	;;
-}
-{	.mmi
-	mov	cr.itir = r18
-	;;
-	srlz.d
-	nop	0
-	;;
-}
-{	.mmi
-	ptr.d	r16, r18
-	;;
-	srlz.d
-	mov	r19 = IA64_DCR_DEFAULT
-	;;
-}
-{	.mmi
-	itr.d	dtr[r8] = r17
-	;;
-	srlz.d
-	add	r8 = 1, r8
-	;;
-}
-{	.mmi
-	st8	[gp] = r2		// trace = 0x48
-	;;
-	ld8	r16 = [r2], 16		// as_kstack
-	nop	0
-}
-{	.mmi
-	ld8	r17 = [r3], 16		// as_kstack_top
-	mov	cr.dcr = r19
-	nop	0
-	;;
-}
-{	.mlx
-	srlz.i
-	movl	r18 = IA64_PSR_BN | IA64_PSR_IT | IA64_PSR_DT | IA64_PSR_IC | \
-			IA64_PSR_RT | IA64_PSR_DFH
-	;;
-}
-{	.mlx
-	mov	cr.ipsr = r18
-	movl	r19 = ia64_vector_table		// set up IVT early
-	;;
-}
-{	.mlx
-	mov	cr.iva = r19
-	movl	r18 = 1f
-	;;
-}
-{	.mmi
-	mov	cr.iip = r18
-	mov	cr.ifs = r0
-	nop	0
-	;;
-}
-{	.mmb
-	srlz.d
-	st8	[gp] = r2		// trace = 0x58
-	rfi
-	;;
-}
-
-	.align	32
-1:
-{	.mlx
-	mov	ar.bspstore = r16
-	movl	gp = __gp
-	;;
-}
-{	.mmi
-	loadrs
-	add	sp = -16, r17
-	nop	0
-	;;
-}
-{	.mmi
-	mov	ar.rsc = 3
-	;;
-	alloc	r18 = ar.pfs, 0, 0, 0, 0
-	;;
-}
-{	.mib
-	nop	0
-	nop	0
-	br.call.sptk.few rp = ia64_ap_startup
-	;;
-}
-	/* NOT REACHED */
-9:
-{	.mib
-	nop	0
-	nop	0
-	br.sptk	9b
-	;;
-}
-END(os_boot_rendez)
diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c
deleted file mode 100644
index 4e7ffb835e29..000000000000
--- a/sys/ia64/ia64/mp_machdep.c
+++ /dev/null
@@ -1,543 +0,0 @@
-/*-
- * Copyright (c) 2001-2005 Marcel Moolenaar
- * Copyright (c) 2000 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "opt_kstack_pages.h"
-#include "opt_xtrace.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/ktr.h>
-#include <sys/proc.h>
-#include <sys/bus.h>
-#include <sys/kthread.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/kernel.h>
-#include <sys/pcpu.h>
-#include <sys/sched.h>
-#include <sys/smp.h>
-#include <sys/sysctl.h>
-#include <sys/uuid.h>
-
-#include <machine/atomic.h>
-#include <machine/bootinfo.h>
-#include <machine/cpu.h>
-#include <machine/fpu.h>
-#include <machine/intr.h>
-#include <machine/mca.h>
-#include <machine/md_var.h>
-#include <machine/pal.h>
-#include <machine/pcb.h>
-#include <machine/sal.h>
-#include <machine/smp.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-#include <vm/vm_extern.h>
-#include <vm/vm_kern.h>
-
-extern uint64_t bdata[];
-
-extern int smp_disabled;
-
-MALLOC_DEFINE(M_SMP, "SMP", "SMP related allocations");
-
-void ia64_ap_startup(void);
-
-#define	SAPIC_ID_GET_ID(x)	((u_int)((x) >> 8) & 0xff)
-#define	SAPIC_ID_GET_EID(x)	((u_int)(x) & 0xff)
-#define	SAPIC_ID_SET(id, eid)	((u_int)(((id) & 0xff) << 8) | ((eid) & 0xff))
-
-/* State used to wake and bootstrap APs. */
-struct ia64_ap_state ia64_ap_state;
-
-int ia64_ipi_ast;
-int ia64_ipi_hardclock;
-int ia64_ipi_highfp;
-int ia64_ipi_nmi;
-int ia64_ipi_preempt;
-int ia64_ipi_rndzvs;
-int ia64_ipi_stop;
-
-static u_int
-sz2shft(uint64_t sz)
-{
-	uint64_t s;
-	u_int shft;
-
-	shft = 12;      /* Start with 4K */
-	s = 1 << shft;
-	while (s < sz) {
-		shft++;
-		s <<= 1;
-	}
-	return (shft);
-}
-
-static u_int
-ia64_ih_ast(struct thread *td, u_int xiv, struct trapframe *tf)
-{
-
-	PCPU_INC(md.stats.pcs_nasts);
-	CTR1(KTR_SMP, "IPI_AST, cpuid=%d", PCPU_GET(cpuid));
-	return (0);
-}
-
-static u_int
-ia64_ih_hardclock(struct thread *td, u_int xiv, struct trapframe *tf)
-{
-	struct trapframe *stf;
-
-	PCPU_INC(md.stats.pcs_nhardclocks);
-	CTR1(KTR_SMP, "IPI_HARDCLOCK, cpuid=%d", PCPU_GET(cpuid));
-	stf = td->td_intr_frame;
-	td->td_intr_frame = tf;
-	hardclockintr();
-	td->td_intr_frame = stf;
-	return (0);
-}
-
-static u_int
-ia64_ih_highfp(struct thread *td, u_int xiv, struct trapframe *tf)
-{
-
-	PCPU_INC(md.stats.pcs_nhighfps);
-	ia64_highfp_save_ipi();
-	return (0);
-}
-
-static u_int
-ia64_ih_preempt(struct thread *td, u_int xiv, struct trapframe *tf)
-{
-
-	PCPU_INC(md.stats.pcs_npreempts);
-	CTR1(KTR_SMP, "IPI_PREEMPT, cpuid=%d", PCPU_GET(cpuid));
-	sched_preempt(curthread);
-	return (0);
-}
-
-static u_int
-ia64_ih_rndzvs(struct thread *td, u_int xiv, struct trapframe *tf)
-{
-
-	PCPU_INC(md.stats.pcs_nrdvs);
-	CTR1(KTR_SMP, "IPI_RENDEZVOUS, cpuid=%d", PCPU_GET(cpuid));
-	smp_rendezvous_action();
-	return (0);
-}
-
-static u_int
-ia64_ih_stop(struct thread *td, u_int xiv, struct trapframe *tf)
-{
-	u_int cpuid;
-
-	PCPU_INC(md.stats.pcs_nstops);
-	cpuid = PCPU_GET(cpuid);
-
-	savectx(PCPU_PTR(md.pcb));
-
-	CPU_SET_ATOMIC(cpuid, &stopped_cpus);
-	while (!CPU_ISSET(cpuid, &started_cpus))
-		cpu_spinwait();
-	CPU_CLR_ATOMIC(cpuid, &started_cpus);
-	CPU_CLR_ATOMIC(cpuid, &stopped_cpus);
-	return (0);
-}
-
-struct cpu_group *
-cpu_topo(void)
-{
-
-	return smp_topo_none();
-}
-
-static void
-ia64_store_mca_state(void* arg)
-{
-	struct pcpu *pc = arg;
-	struct thread *td = curthread;
-
-	/*
-	 * ia64_mca_save_state() is CPU-sensitive, so bind ourself to our
-	 * target CPU.
-	 */
-	thread_lock(td);
-	sched_bind(td, pc->pc_cpuid);
-	thread_unlock(td);
-
-	ia64_mca_init_ap();
-
-	/*
-	 * Get and save the CPU specific MCA records. Should we get the
-	 * MCA state for each processor, or just the CMC state?
-	 */
-	ia64_mca_save_state(SAL_INFO_MCA);
-	ia64_mca_save_state(SAL_INFO_CMC);
-
-	kproc_exit(0);
-}
-
-void
-ia64_ap_startup(void)
-{
-	uint64_t vhpt;
-
-	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) | (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;
-	ia64_set_k4((intptr_t)pcpup);
-
-	ia64_ap_state.as_trace = 0x108;
-
-	vhpt = PCPU_GET(md.vhpt);
-	map_vhpt(vhpt);
-	ia64_set_pta(vhpt + (1 << 8) + (pmap_vhpt_log2size << 2) + 1);
-	ia64_srlz_i();
-
-	ia64_ap_state.as_trace = 0x110;
-
-	ia64_ap_state.as_awake = 1;
-	ia64_ap_state.as_delay = 0;
-
-	map_pal_code();
-	map_gateway_page();
-
-	ia64_set_fpsr(IA64_FPSR_DEFAULT);
-
-#ifdef XTRACE
-	ia64_xtrace_init_ap(ia64_ap_state.as_xtrace_buffer);
-#endif
-
-	/* Wait until it's time for us to be unleashed */
-	while (ia64_ap_state.as_spin)
-		cpu_spinwait();
-
-	/* Initialize curthread. */
-	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();
-
-	CTR1(KTR_SMP, "SMP: cpu%d launched", PCPU_GET(cpuid));
-
-	cpu_initclocks();
-
-	ia64_set_tpr(0);
-	ia64_srlz_d();
-
-	sched_throw(NULL);
-	/* NOTREACHED */
-}
-
-void
-cpu_mp_setmaxid(void)
-{
-
-	/*
-	 * Count the number of processors in the system by walking the ACPI
-	 * tables. Note that we record the actual number of processors, even
-	 * if this is larger than MAXCPU. We only activate MAXCPU processors.
-	 */
-	mp_ncpus = ia64_count_cpus();
-
-	/*
-	 * Set the largest cpuid we're going to use. This is necessary for
-	 * VM initialization.
-	 */
-	mp_maxid = min(mp_ncpus, MAXCPU) - 1;
-}
-
-int
-cpu_mp_probe(void)
-{
-
-	/*
-	 * If there's only 1 processor, or we don't have a wake-up vector,
-	 * we're not going to enable SMP. Note that no wake-up vector can
-	 * also mean that the wake-up mechanism is not supported. In this
-	 * case we can have multiple processors, but we simply can't wake
-	 * them up...
-	 */
-	return (mp_ncpus > 1 && ia64_ipi_wakeup != 0);
-}
-
-void
-cpu_mp_add(u_int acpi_id, u_int id, u_int eid)
-{
-	struct pcpu *pc;
-	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++;
-
-	KASSERT(!CPU_ISSET(cpuid, &all_cpus),
-	    ("%s: cpu%d already in CPU map", __func__, acpi_id));
-
-	if (cpuid != 0) {
-		pc = (struct pcpu *)malloc(sizeof(*pc), M_SMP, M_WAITOK);
-		pcpu_init(pc, cpuid, sizeof(*pc));
-		dpcpu = (void *)kmem_malloc(kernel_arena, DPCPU_SIZE,
-		    M_WAITOK | M_ZERO);
-		dpcpu_init(dpcpu, cpuid);
-	} else
-		pc = pcpup;
-
-	cpu_pcpu_setup(pc, acpi_id, sapic_id);
- 
-	CPU_SET(pc->pc_cpuid, &all_cpus);
-}
-
-void
-cpu_mp_announce()
-{
-	struct pcpu *pc;
-	uint32_t sapic_id;
-	int i;
-
-	for (i = 0; i <= mp_maxid; i++) {
-		pc = pcpu_find(i);
-		if (pc != NULL) {
-			sapic_id = IA64_LID_GET_SAPIC_ID(pc->pc_md.lid);
-			printf("cpu%d: ACPI Id=%x, SAPIC Id=%x, SAPIC Eid=%x",
-			    i, pc->pc_acpi_id, SAPIC_ID_GET_ID(sapic_id),
-			    SAPIC_ID_GET_EID(sapic_id));
-			if (i == 0)
-				printf(" (BSP)\n");
-			else
-				printf("\n");
-		}
-	}
-}
-
-void
-cpu_mp_start()
-{
-	struct ia64_sal_result result;
-	struct ia64_fdesc *fd;
-	struct pcpu *pc;
-	uintptr_t state;
-	u_char *stp;
-
-	state = ia64_tpa((uintptr_t)&ia64_ap_state);
-	fd = (struct ia64_fdesc *) os_boot_rendez;
-	result = ia64_sal_entry(SAL_SET_VECTORS, SAL_OS_BOOT_RENDEZ,
-	    ia64_tpa(fd->func), state, 0, 0, 0, 0);
-
-	ia64_ap_state.as_pgtbl_pte = PTE_PRESENT | PTE_MA_WB |
-	    PTE_ACCESSED | PTE_DIRTY | PTE_PL_KERN | PTE_AR_RW |
-	    (bootinfo->bi_pbvm_pgtbl & PTE_PPN_MASK);
-	ia64_ap_state.as_pgtbl_itir = sz2shft(bootinfo->bi_pbvm_pgtblsz) << 2;
-	ia64_ap_state.as_text_va = IA64_PBVM_BASE;
-	ia64_ap_state.as_text_pte = PTE_PRESENT | PTE_MA_WB |
-	    PTE_ACCESSED | PTE_DIRTY | PTE_PL_KERN | PTE_AR_RX |
-	    (ia64_tpa(IA64_PBVM_BASE) & PTE_PPN_MASK);
-	ia64_ap_state.as_text_itir = bootinfo->bi_text_mapped << 2;
-	ia64_ap_state.as_data_va = (uintptr_t)bdata;
-	ia64_ap_state.as_data_pte = PTE_PRESENT | PTE_MA_WB |
-	    PTE_ACCESSED | PTE_DIRTY | PTE_PL_KERN | PTE_AR_RW |
-	    (ia64_tpa((uintptr_t)bdata) & PTE_PPN_MASK);
-	ia64_ap_state.as_data_itir = bootinfo->bi_data_mapped << 2;
-
-	/* Keep 'em spinning until we unleash them... */
-	ia64_ap_state.as_spin = 1;
-
-	STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) {
-		pc->pc_md.current_pmap = kernel_pmap;
-		/* The BSP is obviously running already. */
-		if (pc->pc_cpuid == 0) {
-			pc->pc_md.awake = 1;
-			continue;
-		}
-
-		ia64_ap_state.as_pcpu = pc;
-		pc->pc_md.vhpt = pmap_alloc_vhpt();
-		if (pc->pc_md.vhpt == 0) {
-			printf("SMP: WARNING: unable to allocate VHPT"
-			    " for cpu%d", pc->pc_cpuid);
-			continue;
-		}
-
-		stp = malloc(KSTACK_PAGES * PAGE_SIZE, M_SMP, M_WAITOK);
-		ia64_ap_state.as_kstack = stp;
-		ia64_ap_state.as_kstack_top = stp + KSTACK_PAGES * PAGE_SIZE;
-
-#ifdef XTRACE
-		ia64_ap_state.as_xtrace_buffer = ia64_xtrace_alloc();
-#endif
-
-		ia64_ap_state.as_trace = 0;
-		ia64_ap_state.as_delay = 2000;
-		ia64_ap_state.as_awake = 0;
-
-		if (bootverbose)
-			printf("SMP: waking up cpu%d\n", pc->pc_cpuid);
-
-		/* Here she goes... */
-		ipi_send(pc, ia64_ipi_wakeup);
-		do {
-			DELAY(1000);
-		} while (--ia64_ap_state.as_delay > 0);
-
-		pc->pc_md.awake = ia64_ap_state.as_awake;
-
-		if (!ia64_ap_state.as_awake) {
-			printf("SMP: WARNING: cpu%d did not wake up (code "
-			    "%#lx)\n", pc->pc_cpuid,
-			    ia64_ap_state.as_trace - state);
-		}
-	}
-}
-
-static void
-cpu_mp_unleash(void *dummy)
-{
-	struct pcpu *pc;
-	int cpus;
-
-	if (mp_ncpus <= 1)
-		return;
-
-	/* Allocate XIVs for IPIs */
-	ia64_ipi_ast = ia64_xiv_alloc(PI_DULL, IA64_XIV_IPI, ia64_ih_ast);
-	ia64_ipi_hardclock = ia64_xiv_alloc(PI_REALTIME, IA64_XIV_IPI,
-	    ia64_ih_hardclock);
-	ia64_ipi_highfp = ia64_xiv_alloc(PI_AV, IA64_XIV_IPI, ia64_ih_highfp);
-	ia64_ipi_preempt = ia64_xiv_alloc(PI_SOFT, IA64_XIV_IPI,
-	    ia64_ih_preempt);
-	ia64_ipi_rndzvs = ia64_xiv_alloc(PI_AV, IA64_XIV_IPI, ia64_ih_rndzvs);
-	ia64_ipi_stop = ia64_xiv_alloc(PI_REALTIME, IA64_XIV_IPI, ia64_ih_stop);
-
-	/* Reserve the NMI vector for IPI_STOP_HARD if possible */
-	ia64_ipi_nmi = (ia64_xiv_reserve(2, IA64_XIV_IPI, ia64_ih_stop) != 0)
-	    ? ia64_ipi_stop : 0x400;	/* DM=NMI, Vector=n/a */
-
-	cpus = 0;
-	smp_cpus = 0;
-	STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) {
-		cpus++;
-		if (pc->pc_md.awake) {
-			kproc_create(ia64_store_mca_state, pc, NULL, 0, 0,
-			    "mca %u", pc->pc_cpuid);
-			smp_cpus++;
-		}
-	}
-
-	ia64_ap_state.as_awake = 1;
-	ia64_ap_state.as_spin = 0;
-
-	while (ia64_ap_state.as_awake != smp_cpus)
-		cpu_spinwait();
-
-	if (smp_cpus != cpus || cpus != mp_ncpus) {
-		printf("SMP: %d CPUs found; %d CPUs usable; %d CPUs woken\n",
-		    mp_ncpus, cpus, smp_cpus);
-	}
-
-	/* XXX Atomic set operation? */
-	smp_started = 1;
-
-	/*
-	 * Now that all CPUs are up and running, bind interrupts to each of
-	 * them.
-	 */
-	ia64_bind_intr();
-}
-SYSINIT(start_aps, SI_SUB_KICK_SCHEDULER, SI_ORDER_ANY, cpu_mp_unleash, NULL);
-
-/*
- * send an IPI to a set of cpus.
- */
-void
-ipi_selected(cpuset_t cpus, int ipi)
-{
-	struct pcpu *pc;
-
-	STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) {
-		if (CPU_ISSET(pc->pc_cpuid, &cpus))
-			ipi_send(pc, ipi);
-	}
-}
-
-/*
- * send an IPI to a specific CPU.
- */
-void
-ipi_cpu(int cpu, u_int ipi)
-{
-
-	ipi_send(cpuid_to_pcpu[cpu], ipi);
-}
-
-/*
- * send an IPI to all CPUs EXCEPT myself.
- */
-void
-ipi_all_but_self(int ipi)
-{
-	struct pcpu *pc;
-
-	STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) {
-		if (pc != pcpup)
-			ipi_send(pc, ipi);
-	}
-}
-
-/*
- * Send an IPI to the specified processor.
- */
-void
-ipi_send(struct pcpu *cpu, int xiv)
-{
-	u_int sapic_id;
-
-	KASSERT(xiv != 0, ("ipi_send"));
-
-	sapic_id = IA64_LID_GET_SAPIC_ID(cpu->pc_md.lid);
-
-	ia64_mf();
-	ia64_st8(&(ia64_pib->ib_ipi[sapic_id][0]), xiv);
-	ia64_mf_a();
-	CTR3(KTR_SMP, "ipi_send(%p, %d): cpuid=%d", cpu, xiv, PCPU_GET(cpuid));
-}
diff --git a/sys/ia64/ia64/nexus.c b/sys/ia64/ia64/nexus.c
deleted file mode 100644
index a4d3e24bb3a3..000000000000
--- a/sys/ia64/ia64/nexus.c
+++ /dev/null
@@ -1,530 +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.
- *
- * $FreeBSD$
- */
-
-/*
- * This code implements a `root nexus' for Intel Architecture
- * machines.  The function of the root nexus is to serve as an
- * attachment point for both processors and buses, and to manage
- * resources which are common to all of them.  In particular,
- * this code implements the core resource managers for interrupt
- * requests, DMA requests (which rightfully should be a part of the
- * ISA code but it's easier to do it here for now), I/O port addresses,
- * and I/O memory address space.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/clock.h>
-#include <sys/efi.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <machine/bus.h>
-#include <sys/rman.h>
-#include <sys/interrupt.h>
-#include <sys/pcpu.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-
-#include <machine/intr.h>
-#include <machine/pmap.h>
-#include <machine/resource.h>
-#include <machine/vmparam.h>
-
-#include <contrib/dev/acpica/include/acpi.h>
-
-#include <dev/acpica/acpivar.h>
-
-#include "clock_if.h"
-
-static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device");
-struct nexus_device {
-	struct resource_list	nx_resources;
-};
-
-#define DEVTONX(dev)	((struct nexus_device *)device_get_ivars(dev))
-
-static struct rman irq_rman, port_rman, mem_rman;
-
-static	int nexus_probe(device_t);
-static	int nexus_attach(device_t);
-static	int nexus_print_child(device_t, device_t);
-static device_t nexus_add_child(device_t bus, u_int order, const char *name,
-				int unit);
-static	struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
-					      u_long, u_long, u_long, u_int);
-static	int nexus_adjust_resource(device_t, device_t, int, struct resource *,
-				  u_long, u_long);
-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 *);
-static	int nexus_setup_intr(device_t, device_t, struct resource *, int flags,
-			     driver_filter_t filter, void (*)(void *), void *, 
-			     void **);
-static	int nexus_teardown_intr(device_t, device_t, struct resource *,
-				void *);
-static struct resource_list *nexus_get_reslist(device_t dev, device_t child);
-static	int nexus_set_resource(device_t, device_t, int, int, u_long, u_long);
-static	int nexus_get_resource(device_t, device_t, int, int, u_long *,
-			       u_long *);
-static void nexus_delete_resource(device_t, device_t, int, int);
-static int nexus_bind_intr(device_t, device_t, struct resource *, int);
-static	int nexus_config_intr(device_t, int, enum intr_trigger,
-			      enum intr_polarity);
-
-static int nexus_gettime(device_t, struct timespec *);
-static int nexus_settime(device_t, struct timespec *);
-
-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_add_child,	nexus_add_child),
-	DEVMETHOD(bus_alloc_resource,	nexus_alloc_resource),
-	DEVMETHOD(bus_adjust_resource,	nexus_adjust_resource),
-	DEVMETHOD(bus_release_resource,	nexus_release_resource),
-	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),
-	DEVMETHOD(bus_get_resource_list, nexus_get_reslist),
-	DEVMETHOD(bus_set_resource,	nexus_set_resource),
-	DEVMETHOD(bus_get_resource,	nexus_get_resource),
-	DEVMETHOD(bus_delete_resource,	nexus_delete_resource),
-	DEVMETHOD(bus_bind_intr,	nexus_bind_intr),
-	DEVMETHOD(bus_config_intr,	nexus_config_intr),
-
-	/* Clock interface */
-	DEVMETHOD(clock_gettime,	nexus_gettime),
-	DEVMETHOD(clock_settime,	nexus_settime),
-
-	{ 0, 0 }
-};
-
-static driver_t nexus_driver = {
-	"nexus",
-	nexus_methods,
-	1,			/* no softc */
-};
-static devclass_t nexus_devclass;
-
-DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0);
-
-static int
-nexus_probe(device_t dev)
-{
-
-	device_quiet(dev);	/* suppress attach message for neatness */
-
-	irq_rman.rm_type = RMAN_ARRAY;
-	irq_rman.rm_descr = "Interrupt request lines";
-	irq_rman.rm_start = 0;
-	irq_rman.rm_end = IA64_NXIVS - 1;
-	if (rman_init(&irq_rman)
-	    || rman_manage_region(&irq_rman,
-				  irq_rman.rm_start, irq_rman.rm_end))
-		panic("nexus_probe irq_rman");
-
-	port_rman.rm_start = 0;
-	port_rman.rm_end = 0xffff;
-	port_rman.rm_type = RMAN_ARRAY;
-	port_rman.rm_descr = "I/O ports";
-	if (rman_init(&port_rman)
-	    || rman_manage_region(&port_rman, 0, 0xffff))
-		panic("nexus_probe port_rman");
-
-	mem_rman.rm_start = 0;
-	mem_rman.rm_end = ~0ul;
-	mem_rman.rm_type = RMAN_ARRAY;
-	mem_rman.rm_descr = "I/O memory addresses";
-	if (rman_init(&mem_rman)
-	    || rman_manage_region(&mem_rman, 0, ~0))
-		panic("nexus_probe mem_rman");
-
-	return bus_generic_probe(dev);
-}
-
-static int
-nexus_attach(device_t dev)
-{
-
-	if (acpi_identify() == 0)
-		BUS_ADD_CHILD(dev, 10, "acpi", 0);
-	clock_register(dev, 1000);
-	bus_generic_attach(dev);
-	return 0;
-}
-
-static int
-nexus_print_child(device_t bus, device_t child)
-{
-	struct nexus_device *ndev = DEVTONX(child);
-	struct resource_list *rl = &ndev->nx_resources;
-	int retval = 0;
-
-	retval += bus_print_child_header(bus, child);
-	retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx");
-	retval += resource_list_print_type(rl, "iomem", SYS_RES_MEMORY, "%#lx");
-	retval += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
-	if (device_get_flags(child))
-		retval += printf(" flags %#x", device_get_flags(child));
-	retval += printf(" on motherboard\n");	/* XXX "motherboard", ick */
-
-	return (retval);
-}
-
-static device_t
-nexus_add_child(device_t bus, u_int order, const char *name, int unit)
-{
-	device_t		child;
-	struct nexus_device	*ndev;
-
-	ndev = malloc(sizeof(struct nexus_device), M_NEXUSDEV, M_NOWAIT|M_ZERO);
-	if (!ndev)
-		return(0);
-	resource_list_init(&ndev->nx_resources);
-
-	child = device_add_child_ordered(bus, order, name, unit); 
-
-	/* should we free this in nexus_child_detached? */
-	device_set_ivars(child, ndev);
-
-	return(child);
-}
-
-static struct rman *
-nexus_rman(int type)
-{
-	switch (type) {
-	case SYS_RES_IRQ:
-		return (&irq_rman);
-	case SYS_RES_IOPORT:
-		return (&port_rman);
-	case SYS_RES_MEMORY:
-		return (&mem_rman);
-	default:
-		return (NULL);
-	}
-}
-
-/*
- * Allocate a resource on behalf of child.  NB: child is usually going to be a
- * child of one of our descendants, not a direct child of nexus0.
- * (Exceptions include npx.)
- */
-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_device *ndev = DEVTONX(child);
-	struct	resource *rv;
-	struct resource_list_entry *rle;
-	struct	rman *rm;
-	int needactivate = flags & RF_ACTIVE;
-
-	/*
-	 * If this is an allocation of the "default" range for a given RID, and
-	 * we know what the resources for this device are (ie. they aren't maintained
-	 * by a child bus), then work out the start/end values.
-	 */
-	if ((start == 0UL) && (end == ~0UL) && (count == 1)) {
-		if (ndev == NULL)
-			return(NULL);
-		rle = resource_list_find(&ndev->nx_resources, type, *rid);
-		if (rle == NULL)
-			return(NULL);
-		start = rle->start;
-		end = rle->end;
-		count = rle->count;
-	}
-
-	flags &= ~RF_ACTIVE;
-	rm = nexus_rman(type);
-	if (rm == NULL)
-		return (NULL);
-
-	rv = rman_reserve_resource(rm, start, end, count, flags, child);
-	if (rv == 0)
-		return 0;
-	rman_set_rid(rv, *rid);
-
-	if (needactivate) {
-		if (bus_activate_resource(child, type, *rid, rv)) {
-			rman_release_resource(rv);
-			return 0;
-		}
-	}
-	
-	return rv;
-}
-
-static int
-nexus_adjust_resource(device_t bus, device_t child, int type,
-    struct resource *r, u_long start, u_long end)
-{
-	struct rman *rm;
-
-	rm = nexus_rman(type);
-	if (rm == NULL)
-		return (ENXIO);
-	if (!rman_is_region_manager(r, rm))
-		return (EINVAL);
-	return (rman_adjust_resource(r, start, end));
-}
-
-static int
-nexus_activate_resource(device_t bus, device_t child, int type, int rid,
-    struct resource *r)
-{
-	vm_paddr_t paddr;
-	void *vaddr;
-
-	paddr = rman_get_start(r);
-
-	switch (type) {
-	case SYS_RES_IOPORT:
-		rman_set_bustag(r, IA64_BUS_SPACE_IO);
-		rman_set_bushandle(r, paddr);
-		break;
-	case SYS_RES_MEMORY:
-		vaddr = pmap_mapdev(paddr, rman_get_size(r));
-		rman_set_bustag(r, IA64_BUS_SPACE_MEM);
-		rman_set_bushandle(r, (bus_space_handle_t) vaddr);
-		rman_set_virtual(r, vaddr);
-		break;
-	}
-	return (rman_activate_resource(r));
-}
-
-static int
-nexus_deactivate_resource(device_t bus, device_t child, int type, int rid,
-			  struct resource *r)
-{
-		
-	return (rman_deactivate_resource(r));
-}
-
-static int
-nexus_release_resource(device_t bus, device_t child, int type, int rid,
-		       struct resource *r)
-{
-	if (rman_get_flags(r) & RF_ACTIVE) {
-		int error = bus_deactivate_resource(child, type, rid, r);
-		if (error)
-			return error;
-	}
-	return (rman_release_resource(r));
-}
-
-/*
- * Currently this uses the really grody interface from kern/kern_intr.c
- * (which really doesn't belong in kern/anything.c).  Eventually, all of
- * the code in kern_intr.c and machdep_intr.c should get moved here, since
- * this is going to be the official interface.
- */
-static int
-nexus_setup_intr(device_t bus, device_t child, struct resource *irq,
-		 int flags, driver_filter_t filter, void (*ihand)(void *), 
-		 void *arg, void **cookiep)
-{
-	driver_t	*driver;
-	int		error;
-
-	/* somebody tried to setup an irq that failed to allocate! */
-	if (irq == NULL)
-		panic("nexus_setup_intr: NULL irq resource!");
-
-	*cookiep = 0;
-	if ((rman_get_flags(irq) & RF_SHAREABLE) == 0)
-		flags |= INTR_EXCL;
-
-	driver = device_get_driver(child);
-
-	/*
-	 * We depend here on rman_activate_resource() being idempotent.
-	 */
-	error = rman_activate_resource(irq);
-	if (error)
-		return (error);
-
-	error = ia64_setup_intr(device_get_nameunit(child),
-	    rman_get_start(irq), filter, ihand, arg, flags, cookiep);
-
-	return (error);
-}
-
-static int
-nexus_teardown_intr(device_t dev, device_t child, struct resource *ires,
-    void *cookie)
-{
-
-	return (ia64_teardown_intr(cookie));
-}
-
-static struct resource_list *
-nexus_get_reslist(device_t dev, device_t child)
-{
-	struct nexus_device *ndev = DEVTONX(child);
-
-	return (&ndev->nx_resources);
-}
-
-static int
-nexus_set_resource(device_t dev, device_t child, int type, int rid,
-    u_long start, u_long count)
-{
-	struct nexus_device	*ndev = DEVTONX(child);
-	struct resource_list	*rl = &ndev->nx_resources;
-
-	if (type == SYS_RES_IOPORT && start > (0x10000 - count)) {
-		/*
-		 * Work around a firmware bug in the HP rx2660, where in ACPI
-		 * an I/O port is really a memory mapped I/O address. The bug
-		 * is in the GAS that describes the address and in particular
-		 * the SpaceId field. The field should not say the address is
-		 * an I/O port when it is in fact an I/O memory address.
-		 */
-		if (bootverbose)
-			printf("%s: invalid port range (%#lx-%#lx); "
-			    "assuming I/O memory range.\n", __func__, start,
-			    start + count - 1);
-		type = SYS_RES_MEMORY;
-	}
-
-	/* XXX this should return a success/failure indicator */
-	resource_list_add(rl, type, rid, start, start + count - 1, count);
-	return(0);
-}
-
-static int
-nexus_get_resource(device_t dev, device_t child, int type, int rid, u_long *startp, u_long *countp)
-{
-	struct nexus_device	*ndev = DEVTONX(child);
-	struct resource_list	*rl = &ndev->nx_resources;
-	struct resource_list_entry *rle;
-
-	rle = resource_list_find(rl, type, rid);
-	device_printf(child, "type %d  rid %d  startp %p  countp %p - got %p\n",
-		      type, rid, startp, countp, rle);
-	if (!rle)
-		return(ENOENT);
-	if (startp)
-		*startp = rle->start;
-	if (countp)
-		*countp = rle->count;
-	return(0);
-}
-
-static void
-nexus_delete_resource(device_t dev, device_t child, int type, int rid)
-{
-	struct nexus_device	*ndev = DEVTONX(child);
-	struct resource_list	*rl = &ndev->nx_resources;
-
-	resource_list_delete(rl, type, rid);
-}
-
-static int
-nexus_config_intr(device_t dev, int irq, enum intr_trigger trig,
-    enum intr_polarity pol)
-{
-
-	return (sapic_config_intr(irq, trig, pol));
-}
-
-static int
-nexus_bind_intr(device_t dev, device_t child, struct resource *irq, int cpu)
-{
-	struct pcpu *pc;
-
-	pc = cpuid_to_pcpu[cpu];
-	if (pc == NULL)
-		return (EINVAL);
-	return (sapic_bind_intr(rman_get_start(irq), pc));
-}
-
-static int
-nexus_gettime(device_t dev, struct timespec *ts)
-{
-	struct clocktime ct;
-	struct efi_tm tm;
-
-	efi_get_time(&tm);
-
-	/*
-	 * This code was written in 2005, so logically EFI cannot return
-	 * a year smaller than that. Assume the EFI clock is out of whack
-	 * in that case and reset the EFI clock.
-	 */
-	if (tm.tm_year < 2005)
-		return (EINVAL);
-
-	ct.nsec = tm.tm_nsec;
-	ct.sec = tm.tm_sec;
-	ct.min = tm.tm_min;
-	ct.hour = tm.tm_hour;
-	ct.day = tm.tm_mday;
-	ct.mon = tm.tm_mon;
-	ct.year = tm.tm_year;
-	ct.dow = -1;
-	return (clock_ct_to_ts(&ct, ts));
-}
-
-static int
-nexus_settime(device_t dev, struct timespec *ts)
-{
-	struct clocktime ct;
-	struct efi_tm tm;
-
-	efi_get_time(&tm);
-
-	clock_ts_to_ct(ts, &ct);
-	tm.tm_nsec = ts->tv_nsec;
-	tm.tm_sec = ct.sec;
-	tm.tm_min = ct.min;
-	tm.tm_hour = ct.hour;
-	tm.tm_year = ct.year;
-	tm.tm_mon = ct.mon;
-	tm.tm_mday = ct.day;
-	return (efi_set_time(&tm));
-}
diff --git a/sys/ia64/ia64/pal.S b/sys/ia64/ia64/pal.S
deleted file mode 100644
index 2e3f4cd85ac4..000000000000
--- a/sys/ia64/ia64/pal.S
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * Copyright (c) 2000-2001 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 <machine/asm.h>
-
-	.data
-	.global ia64_pal_entry
-ia64_pal_entry:	.quad 0
-	.text
-
-/*
- * struct ia64_pal_result ia64_call_pal_static(u_int64_t proc,
- *	u_int64_t arg1, u_int64_t arg2, u_int64_t arg3)
- */
-ENTRY(ia64_call_pal_static, 4)
-
-	.regstk	4,4,0,0
-palret	=	loc0
-entry	=	loc1
-rpsave	=	loc2
-pfssave =	loc3
-
-	alloc	pfssave=ar.pfs,4,4,0,0
-	;; 
-	mov	rpsave=rp
-	movl	entry=@gprel(ia64_pal_entry)
-
-1:	mov	palret=ip		// for return address
-	;;
-	add	entry=entry,gp
-	add	palret=2f-1b,palret	// calculate return address
-	mov	r28=in0			// procedure number
-	mov	r29=in1			// copy arguments
-	mov	r30=in2
-	mov	r31=in3
-	;;
-	ld8	entry=[entry]		// read entry point
-	mov	b0=palret
-	;;
-	mov	b6=entry
-	;;
-	br.cond.sptk b6			// call into firmware
-	;;
-2:
-	mov	rp=rpsave
-	mov	ar.pfs=pfssave
-	;;
-	br.ret.sptk rp
-	;;
-END(ia64_call_pal_static)
-
-/*
- * struct ia64_pal_result ia64_call_pal_stacked(u_int64_t proc,
- *	u_int64_t arg1, u_int64_t arg2, u_int64_t arg3)
- */
-ENTRY(ia64_call_pal_stacked, 4)
-	
-	.regstk	4,4,4,0
-entry	=	loc0
-rpsave	=	loc1
-pfssave =	loc2
-psrsave	=	loc3
-
-	alloc	pfssave=ar.pfs,4,4,4,0
-	;; 
-	mov	rpsave=rp
-	movl	entry=@gprel(ia64_pal_entry)
-	;;
-	add	entry=entry,gp
-	mov	psrsave=psr
-	mov	r28=in0			// procedure number
-	mov	out0=in0
-	;;
-	ld8	entry=[entry]		// read entry point
-	mov	out1=in1		// copy arguments
-	mov	out2=in2
-	mov	out3=in3
-	;;
-	mov	b6=entry
-	;;
-	rsm	psr.i			// disable interrupts
-	;;
-	br.call.sptk.many rp=b6		// call into firmware
-	mov	psr.l=psrsave
-	mov	rp=rpsave
-	mov	ar.pfs=pfssave
-	;;
-	srlz.d
-	br.ret.sptk rp
-
-END(ia64_call_pal_stacked)
diff --git a/sys/ia64/ia64/physical.S b/sys/ia64/ia64/physical.S
deleted file mode 100644
index 1dd5b36d86ac..000000000000
--- a/sys/ia64/ia64/physical.S
+++ /dev/null
@@ -1,258 +0,0 @@
-/*-
- * Copyright (c) 2011 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$
- */
-
-#include <machine/asm.h>
-#include <machine/ia64_cpu.h>
-
-		.text
-
-/*
- * u_long ia64_efi_physical(ia64_efi_f, u_long, u_long, u_long, u_long)
- *
- *	loc0 = ar.pfs
- *	loc1 = rp
- *	loc2 = psr
- *	loc3 = sp
- *	loc4 = bsp
- *	loc5 = gp
- */
-ENTRY(ia64_efi_physical, 5)
-		.prologue
-		.regstk 5,6,4,0
-		.save	ar.pfs,loc0
-		alloc	loc0=ar.pfs,5,6,4,0
-		;;
-		.save   rp,loc1
-		mov	loc1=rp
-		;;
-		.body
-		mov	loc2=psr		// save psr
-		movl	r16=IA64_PSR_I | IA64_PSR_IT | IA64_PSR_DT | \
-			    IA64_PSR_RT | IA64_PSR_DFL | IA64_PSR_DFH
-		;;
-		andcm	r14=loc2,r16
-		movl	r15=IA64_PSR_BN
-		;;
-		rsm	psr.i
-		mov	r17=ar.rsc
-		or	r16=r14,r15		// new psr
-		;;
-		mov	ar.rsc=0
-		or	loc2=loc2,r15
-		;;
-		flushrs
-		mov	loc3=sp			// save sp
-		;;
-		mov	loc4=ar.bsp		// save ar.bsp
-		mov	r18=ar.rnat
-		;;
-		tpa	r19=loc4		// new bspstore
-		mov	loc5=gp
-		;;
-		tpa	r20=loc3		// new sp
-		ld8	r21=[in0],8
-		;;
-1:
-		mov	r14=ip
-		;;
-		ld8	r22=[in0]
-		add	r15=2f-1b,r14
-		;;
-		tpa	r14=r15
-		;;
-		rsm	psr.ic
-		;;
-		srlz.i
-		;;
-		mov	cr.iip=r14
-		mov	cr.ifs=r0
-		mov	cr.ipsr=r16
-		;;
-		rfi
-2:
-		mov	ar.bspstore=r19
-		mov	sp=r20
-		;;
-		mov	ar.rnat=r18
-		mov	ar.rsc=r17
-		;;
-		mov	b6=r21
-		mov	gp=r22
-		mov	out0=in1
-		mov	out1=in2
-		mov	out2=in3
-		mov	out3=in4
-		;;
-		br.call.sptk.many	rp=b6
-		mov	gp=loc5
-		;;
-		rsm	psr.i | psr.ic
-		mov	r16=ar.rsc
-		;;
-		srlz.i
-		mov	ar.rsc=0
-		;;
-		flushrs
-		;;
-		mov	r17=ar.rnat
-		movl	r18=3f
-		;;
-		mov	cr.iip=r18
-		mov	cr.ifs=r0
-		mov	cr.ipsr=loc2
-		;;
-		rfi
-3:
-		mov	ar.bspstore=loc4
-		mov	sp=loc3
-		;;
-		mov	ar.rnat=r17
-		mov	ar.rsc=r16
-		;;
-		mov	rp=loc1
-		mov	ar.pfs=loc0
-		;;
-		br.ret.sptk.many	rp
-END(ia64_efi_physical)
-
-
-/*
- * ia64_pal_ret ia64_pal_physical(ia64_fw_f, u_long, u_long, u_long, u_long)
- *
- *	loc0 = ar.pfs
- *	loc1 = rp
- *	loc2 = psr
- *	loc3 = sp
- *	loc4 = bsp
- *	loc5 = gp
- */
-ENTRY(ia64_pal_physical, 5)
-		.prologue
-		.regstk 5,6,4,0
-		.save	ar.pfs,loc0
-		alloc	loc0=ar.pfs,5,6,4,0
-		;;
-		.save   rp,loc1
-		mov	loc1=rp
-		;;
-		.body
-		mov	loc2=psr		// save psr
-		movl	r16=IA64_PSR_I | IA64_PSR_IT | IA64_PSR_DT | \
-			    IA64_PSR_RT | IA64_PSR_DFL | IA64_PSR_DFH
-		;;
-		andcm	r14=loc2,r16
-		movl	r15=IA64_PSR_BN
-		;;
-		rsm	psr.i
-		mov	r17=ar.rsc
-		or	r16=r14,r15		// new psr
-		;;
-		mov	ar.rsc=0
-		or	loc2=loc2,r15
-		;;
-		flushrs
-		mov	loc3=sp			// save sp
-		;;
-		mov	loc4=ar.bsp		// save ar.bsp
-		mov	r18=ar.rnat
-		;;
-		mov	loc5=gp
-		movl	r14=kstack
-		;;
-		tpa	r19=r14			// new bspstore
-		movl	r15=kstack_top
-		;;
-		tpa	r20=r15			// new sp
-		movl	r21=ia64_pal_entry
-		;;
-1:
-		mov	r14=ip
-		ld8	r22=[r21]
-		;;
-		tpa	r21=r22
-		add	r15=2f-1b,r14
-		;;
-		tpa	r14=r15
-		;;
-		rsm	psr.ic
-		;;
-		srlz.i
-		;;
-		mov	cr.iip=r14
-		mov	cr.ifs=r0
-		mov	cr.ipsr=r16
-		;;
-		rfi
-2:
-		mov	ar.bspstore=r19
-		add	sp=-16,r20
-		;;
-		mov	ar.rnat=r18
-		mov	ar.rsc=r17
-		;;
-		mov	b6=r21
-		mov	out0=in0
-		mov	out1=in1
-		mov	out2=in2
-		mov	out3=in3
-		// PAL static calls
-		mov	r28=in0
-		mov	r29=in1
-		mov	r30=in2
-		mov	r31=in3
-		br.call.sptk.many	rp=b6
-		mov	gp=loc5
-		;;
-		rsm	psr.i | psr.ic
-		mov	r16=ar.rsc
-		;;
-		srlz.i
-		mov	ar.rsc=0
-		;;
-		flushrs
-		;;
-		mov	r17=ar.rnat
-		movl	r18=3f
-		;;
-		mov	cr.iip=r18
-		mov	cr.ifs=r0
-		mov	cr.ipsr=loc2
-		;;
-		rfi
-3:
-		mov	ar.bspstore=loc4
-		mov	sp=loc3
-		;;
-		mov	ar.rnat=r17
-		mov	ar.rsc=r16
-		;;
-		mov	rp=loc1
-		mov	ar.pfs=loc0
-		;;
-		br.ret.sptk.many	rp
-END(ia64_pal_physical)
diff --git a/sys/ia64/ia64/physmem.c b/sys/ia64/ia64/physmem.c
deleted file mode 100644
index 11ee840fff32..000000000000
--- a/sys/ia64/ia64/physmem.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*-
- * Copyright (c) 2012 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-
-#include <machine/md_var.h>
-#include <machine/vmparam.h>
-
-static u_int phys_avail_segs;
-
-vm_paddr_t phys_avail[2 * VM_PHYSSEG_MAX + 2];
-
-vm_paddr_t paddr_max;
-
-long realmem;
-
-static u_int
-ia64_physmem_find(vm_paddr_t base, vm_paddr_t lim)
-{
-	u_int idx;
-
-	for (idx = 0; phys_avail[idx + 1] != 0; idx += 2) {
-		if (phys_avail[idx] >= lim ||
-		    phys_avail[idx + 1] > base)
-			break;
-	}
-	return (idx);
-}
-
-static int
-ia64_physmem_insert(u_int idx, vm_paddr_t base, vm_paddr_t lim)
-{
-	u_int ridx;
-
-	if (phys_avail_segs == VM_PHYSSEG_MAX)
-		return (ENOMEM);
-
-	ridx = phys_avail_segs * 2;
-	while (idx < ridx) {
-		phys_avail[ridx + 1] = phys_avail[ridx - 1];
-		phys_avail[ridx] = phys_avail[ridx - 2];
-		ridx -= 2;
-	}
-	phys_avail[idx] = base;
-	phys_avail[idx + 1] = lim;
-	phys_avail_segs++;
-	return (0);
-}
-
-static int
-ia64_physmem_remove(u_int idx)
-{
-
-	if (phys_avail_segs == 0)
-		return (ENOENT);
-	do {
-		phys_avail[idx] = phys_avail[idx + 2];
-		phys_avail[idx + 1] = phys_avail[idx + 3];
-		idx += 2;
-	} while (phys_avail[idx + 1] != 0);
-	phys_avail_segs--;
-	return (0);
-}
-
-int
-ia64_physmem_add(vm_paddr_t base, vm_size_t len)
-{
-	vm_paddr_t lim;
-	u_int idx;
-
-	realmem += len;
-
-	lim = base + len;
-	idx = ia64_physmem_find(base, lim);
-	if (phys_avail[idx] == lim) {
-		phys_avail[idx] = base;
-		return (0);
-	}
-	if (idx > 0 && phys_avail[idx - 1] == base) {
-		phys_avail[idx - 1] = lim;
-		return (0);
-	}
-	return (ia64_physmem_insert(idx, base, lim));
-}
-
-int
-ia64_physmem_delete(vm_paddr_t base, vm_size_t len)
-{
-	vm_paddr_t lim;
-	u_int idx;
-
-	lim = base + len;
-	idx = ia64_physmem_find(base, lim);
-	if (phys_avail[idx] >= lim || phys_avail[idx + 1] == 0)
-		return (ENOENT);
-	if (phys_avail[idx] < base && phys_avail[idx + 1] > lim) {
-		len = phys_avail[idx + 1] - lim;
-		phys_avail[idx + 1] = base;
-		base = lim;
-		lim = base + len;
-		return (ia64_physmem_insert(idx + 2, base, lim));
-	} else {
-		if (phys_avail[idx] == base)
-			phys_avail[idx] = lim;
-		if (phys_avail[idx + 1] == lim)
-			phys_avail[idx + 1] = base;
-		if (phys_avail[idx] >= phys_avail[idx + 1])
-			return (ia64_physmem_remove(idx));
-	}
-	return (0);
-}
-
-int
-ia64_physmem_fini(void)
-{
-	vm_paddr_t base, lim, size;
-	u_int idx;
-
-	idx = 0;
-	while (phys_avail[idx + 1] != 0) {
-		base = round_page(phys_avail[idx]);
-		lim = trunc_page(phys_avail[idx + 1]);
-		if (base < lim) {
-			phys_avail[idx] = base;
-			phys_avail[idx + 1] = lim;
-			size = lim - base;
-			physmem += atop(size);
-			paddr_max = lim;
-			idx += 2;
-		} else
-			ia64_physmem_remove(idx);
-	}
-
-	/*
-	 * Round realmem to a multple of 128MB. Hopefully that compensates
-	 * for any loss of DRAM that isn't accounted for in the memory map.
-	 * I'm thinking legacy BIOS or VGA here. In any case, it's ok if
-	 * we got it wrong, because we don't actually use realmem. It's
-	 * just for show...
-	 */
-	size = 1U << 27;
-	realmem = (realmem + size - 1) & ~(size - 1);
-	realmem = atop(realmem);
-	return (0);
-}
-
-int
-ia64_physmem_init(void)
-{
-
-	/* Nothing to do just yet. */
-	return (0);
-}
-
-int
-ia64_physmem_track(vm_paddr_t base, vm_size_t len)
-{
-
-	realmem += len;
-	return (0);
-}
-
-void *
-ia64_physmem_alloc(vm_size_t len, vm_size_t align)
-{
-	vm_paddr_t base, lim, pa;
-	void *ptr;
-	u_int idx;
-
-	if (phys_avail_segs == 0)
-		return (NULL);
-
-	len = round_page(len);
-
-	/*
-	 * Try and allocate with least effort.
-	 */
-	idx = phys_avail_segs * 2;
-	while (idx > 0) {
-		idx -= 2;
-		base = phys_avail[idx];
-		lim = phys_avail[idx + 1];
-
-		if (lim - base < len)
-			continue;
-
-		/* First try from the end. */
-		pa = lim - len;
-		if ((pa & (align - 1)) == 0) {
-			if (pa == base)
-				ia64_physmem_remove(idx);
-			else
-				phys_avail[idx + 1] = pa;
-			goto gotit;
-		}
-
-		/* Try from the start next. */
-		pa = base;
-		if ((pa & (align - 1)) == 0) {
-			if (pa + len == lim)
-				ia64_physmem_remove(idx);
-			else
-				phys_avail[idx] += len;
-			goto gotit;
-		}
-	}
-
-	/*
-	 * Find a good segment and split it up.
-	 */
-	idx = phys_avail_segs * 2;
-	while (idx > 0) {
-		idx -= 2;
-		base = phys_avail[idx];
-		lim = phys_avail[idx + 1];
-
-		pa = (base + align - 1) & ~(align - 1);
-		if (pa + len <= lim) {
-			ia64_physmem_delete(pa, len);
-			goto gotit;
-		}
-	}
-
-	/* Out of luck. */
-	return (NULL);
-
- gotit:
-	ptr = (void *)IA64_PHYS_TO_RR7(pa);
-	bzero(ptr, len);
-	return (ptr);
-}
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
deleted file mode 100644
index 6211e5151d62..000000000000
--- a/sys/ia64/ia64/pmap.c
+++ /dev/null
@@ -1,2886 +0,0 @@
-/*-
- * Copyright (c) 1991 Regents of the University of California.
- * All rights reserved.
- * Copyright (c) 1994 John S. Dyson
- * All rights reserved.
- * Copyright (c) 1994 David Greenman
- * All rights reserved.
- * Copyright (c) 1998,2000 Doug Rabson
- * 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 of UUNET Technologies Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed 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:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	from:	i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp
- *		with some ideas from NetBSD's alpha pmap
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "opt_pmap.h"
-
-#include <sys/param.h>
-#include <sys/efi.h>
-#include <sys/kernel.h>
-#include <sys/ktr.h>
-#include <sys/lock.h>
-#include <sys/mman.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
-#include <sys/rwlock.h>
-#include <sys/smp.h>
-#include <sys/sysctl.h>
-#include <sys/systm.h>
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_page.h>
-#include <vm/vm_map.h>
-#include <vm/vm_object.h>
-#include <vm/vm_pageout.h>
-#include <vm/uma.h>
-
-#include <machine/bootinfo.h>
-#include <machine/md_var.h>
-#include <machine/pal.h>
-
-/*
- *	Manages physical address maps.
- *
- *	Since the information managed by this module is
- *	also stored by the logical address mapping module,
- *	this module may throw away valid virtual-to-physical
- *	mappings at almost any time.  However, invalidations
- *	of virtual-to-physical mappings must be done as
- *	requested.
- *
- *	In order to cope with hardware architectures which
- *	make virtual-to-physical map invalidates expensive,
- *	this module may delay invalidate or reduced protection
- *	operations until such time as they are actually
- *	necessary.  This module is given full information as
- *	to which processors are currently using which maps,
- *	and to when physical maps must be made correct.
- */
-
-/*
- * Following the Linux model, region IDs are allocated in groups of
- * eight so that a single region ID can be used for as many RRs as we
- * want by encoding the RR number into the low bits of the ID.
- *
- * We reserve region ID 0 for the kernel and allocate the remaining
- * IDs for user pmaps.
- *
- * Region 0-3:	User virtually mapped
- * Region 4:	PBVM and special mappings
- * Region 5:	Kernel virtual memory
- * Region 6:	Direct-mapped uncacheable
- * Region 7:	Direct-mapped cacheable
- */
-
-/* XXX move to a header. */
-extern uint64_t ia64_gateway_page[];
-
-#if !defined(DIAGNOSTIC)
-#define PMAP_INLINE __inline
-#else
-#define PMAP_INLINE
-#endif
-
-#ifdef PV_STATS
-#define PV_STAT(x)	do { x ; } while (0)
-#else
-#define PV_STAT(x)	do { } while (0)
-#endif
-
-#define	pmap_accessed(lpte)		((lpte)->pte & PTE_ACCESSED)
-#define	pmap_dirty(lpte)		((lpte)->pte & PTE_DIRTY)
-#define	pmap_exec(lpte)			((lpte)->pte & PTE_AR_RX)
-#define	pmap_managed(lpte)		((lpte)->pte & PTE_MANAGED)
-#define	pmap_ppn(lpte)			((lpte)->pte & PTE_PPN_MASK)
-#define	pmap_present(lpte)		((lpte)->pte & PTE_PRESENT)
-#define	pmap_prot(lpte)			(((lpte)->pte & PTE_PROT_MASK) >> 56)
-#define	pmap_wired(lpte)		((lpte)->pte & PTE_WIRED)
-
-#define	pmap_clear_accessed(lpte)	(lpte)->pte &= ~PTE_ACCESSED
-#define	pmap_clear_dirty(lpte)		(lpte)->pte &= ~PTE_DIRTY
-#define	pmap_clear_present(lpte)	(lpte)->pte &= ~PTE_PRESENT
-#define	pmap_clear_wired(lpte)		(lpte)->pte &= ~PTE_WIRED
-
-#define	pmap_set_wired(lpte)		(lpte)->pte |= PTE_WIRED
-
-/*
- * Individual PV entries are stored in per-pmap chunks.  This saves
- * space by eliminating the need to record the pmap within every PV
- * entry.
- */
-#if PAGE_SIZE == 8192
-#define	_NPCM	6
-#define	_NPCPV	337
-#define	_NPCS	2
-#elif PAGE_SIZE == 16384
-#define	_NPCM	11
-#define	_NPCPV	677
-#define	_NPCS	1
-#endif
-struct pv_chunk {
-	pmap_t			pc_pmap;
-	TAILQ_ENTRY(pv_chunk)	pc_list;
-	u_long			pc_map[_NPCM];	/* bitmap; 1 = free */
-	TAILQ_ENTRY(pv_chunk)	pc_lru;
-	u_long			pc_spare[_NPCS];
-	struct pv_entry		pc_pventry[_NPCPV];
-};
-
-/*
- * The VHPT bucket head structure.
- */
-struct ia64_bucket {
-	uint64_t	chain;
-	struct mtx	mutex;
-	u_int		length;
-};
-
-/*
- * Statically allocated kernel pmap
- */
-struct pmap kernel_pmap_store;
-
-vm_offset_t virtual_avail;	/* VA of first avail page (after kernel bss) */
-vm_offset_t virtual_end;	/* VA of last avail page (end of kernel AS) */
-
-/*
- * Kernel virtual memory management.
- */
-static int nkpt;
-extern struct ia64_lpte ***ia64_kptdir;
-
-#define KPTE_DIR0_INDEX(va) \
-	(((va) >> (3*PAGE_SHIFT-8)) & ((1<<(PAGE_SHIFT-3))-1))
-#define KPTE_DIR1_INDEX(va) \
-	(((va) >> (2*PAGE_SHIFT-5)) & ((1<<(PAGE_SHIFT-3))-1))
-#define KPTE_PTE_INDEX(va) \
-	(((va) >> PAGE_SHIFT) & ((1<<(PAGE_SHIFT-5))-1))
-#define NKPTEPG		(PAGE_SIZE / sizeof(struct ia64_lpte))
-
-vm_offset_t kernel_vm_end;
-
-/* 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;
-
-/*
- * Data for the RID allocator
- */
-static int pmap_ridcount;
-static int pmap_rididx;
-static int pmap_ridmapsz;
-static int pmap_ridmax;
-static uint64_t *pmap_ridmap;
-struct mtx pmap_ridmutex;
-
-static struct rwlock_padalign pvh_global_lock;
-
-/*
- * Data for the pv entry allocation mechanism
- */
-static TAILQ_HEAD(pch, pv_chunk) pv_chunks = TAILQ_HEAD_INITIALIZER(pv_chunks);
-static int pv_entry_count;
-
-/*
- * Data for allocating PTEs for user processes.
- */
-static uma_zone_t ptezone;
-
-/*
- * Virtual Hash Page Table (VHPT) data.
- */
-/* SYSCTL_DECL(_machdep); */
-static SYSCTL_NODE(_machdep, OID_AUTO, vhpt, CTLFLAG_RD, 0, "");
-
-struct ia64_bucket *pmap_vhpt_bucket;
-
-int pmap_vhpt_nbuckets;
-SYSCTL_INT(_machdep_vhpt, OID_AUTO, nbuckets, CTLFLAG_RD,
-    &pmap_vhpt_nbuckets, 0, "");
-
-int pmap_vhpt_log2size = 0;
-TUNABLE_INT("machdep.vhpt.log2size", &pmap_vhpt_log2size);
-SYSCTL_INT(_machdep_vhpt, OID_AUTO, log2size, CTLFLAG_RD,
-    &pmap_vhpt_log2size, 0, "");
-
-static int pmap_vhpt_inserts;
-SYSCTL_INT(_machdep_vhpt, OID_AUTO, inserts, CTLFLAG_RD,
-    &pmap_vhpt_inserts, 0, "");
-
-static int pmap_vhpt_population(SYSCTL_HANDLER_ARGS);
-SYSCTL_PROC(_machdep_vhpt, OID_AUTO, population, CTLTYPE_INT | CTLFLAG_RD,
-    NULL, 0, pmap_vhpt_population, "I", "");
-
-static struct ia64_lpte *pmap_find_vhpt(vm_offset_t va);
-
-static void free_pv_chunk(struct pv_chunk *pc);
-static void free_pv_entry(pmap_t pmap, pv_entry_t pv);
-static pv_entry_t get_pv_entry(pmap_t pmap, boolean_t try);
-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 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);
-static boolean_t pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va,
-		    vm_page_t m);
-
-static void
-pmap_initialize_vhpt(vm_offset_t vhpt)
-{
-	struct ia64_lpte *pte;
-	u_int i;
-
-	pte = (struct ia64_lpte *)vhpt;
-	for (i = 0; i < pmap_vhpt_nbuckets; i++) {
-		pte[i].pte = 0;
-		pte[i].itir = 0;
-		pte[i].tag = 1UL << 63; /* Invalid tag */
-		pte[i].chain = (uintptr_t)(pmap_vhpt_bucket + i);
-	}
-}
-
-#ifdef SMP
-vm_offset_t
-pmap_alloc_vhpt(void)
-{
-	vm_offset_t vhpt;
-	vm_page_t m;
-	vm_size_t size;
-
-	size = 1UL << pmap_vhpt_log2size;
-	m = vm_page_alloc_contig(NULL, 0, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ |
-	    VM_ALLOC_WIRED, atop(size), 0UL, ~0UL, size, 0UL,
-	    VM_MEMATTR_DEFAULT);
-	if (m != NULL) {
-		vhpt = IA64_PHYS_TO_RR7(VM_PAGE_TO_PHYS(m));
-		pmap_initialize_vhpt(vhpt);
-		return (vhpt);
-	}
-	return (0);
-}
-#endif
-
-/*
- *	Bootstrap the system enough to run with virtual memory.
- */
-void
-pmap_bootstrap()
-{
-	struct ia64_pal_result res;
-	vm_offset_t base;
-	size_t size;
-	int i, ridbits;
-
-	/*
-	 * Query the PAL Code to find the loop parameters for the
-	 * ptc.e instruction.
-	 */
-	res = ia64_call_pal_static(PAL_PTCE_INFO, 0, 0, 0);
-	if (res.pal_status != 0)
-		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];
-	pmap_ptc_e_stride1 = res.pal_result[2] >> 32;
-	pmap_ptc_e_stride2 = res.pal_result[2];
-	if (bootverbose)
-		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,
-		       pmap_ptc_e_stride1,
-		       pmap_ptc_e_stride2);
-
-	mtx_init(&pmap_ptc_mutex, "PTC.G mutex", NULL, MTX_SPIN);
-
-	/*
-	 * Setup RIDs. RIDs 0..7 are reserved for the kernel.
-	 *
-	 * We currently need at least 19 bits in the RID because PID_MAX
-	 * can only be encoded in 17 bits and we need RIDs for 4 regions
-	 * per process. With PID_MAX equalling 99999 this means that we
-	 * need to be able to encode 399996 (=4*PID_MAX).
-	 * The Itanium processor only has 18 bits and the architected
-	 * minimum is exactly that. So, we cannot use a PID based scheme
-	 * in those cases. Enter pmap_ridmap...
-	 * We should avoid the map when running on a processor that has
-	 * implemented enough bits. This means that we should pass the
-	 * process/thread ID to pmap. This we currently don't do, so we
-	 * use the map anyway. However, we don't want to allocate a map
-	 * that is large enough to cover the range dictated by the number
-	 * of bits in the RID, because that may result in a RID map of
-	 * 2MB in size for a 24-bit RID. A 64KB map is enough.
-	 * The bottomline: we create a 32KB map when the processor only
-	 * implements 18 bits (or when we can't figure it out). Otherwise
-	 * we create a 64KB map.
-	 */
-	res = ia64_call_pal_static(PAL_VM_SUMMARY, 0, 0, 0);
-	if (res.pal_status != 0) {
-		if (bootverbose)
-			printf("Can't read VM Summary - assuming 18 Region ID bits\n");
-		ridbits = 18; /* guaranteed minimum */
-	} else {
-		ridbits = (res.pal_result[1] >> 8) & 0xff;
-		if (bootverbose)
-			printf("Processor supports %d Region ID bits\n",
-			    ridbits);
-	}
-	if (ridbits > 19)
-		ridbits = 19;
-
-	pmap_ridmax = (1 << ridbits);
-	pmap_ridmapsz = pmap_ridmax / 64;
-	pmap_ridmap = ia64_physmem_alloc(pmap_ridmax / 8, PAGE_SIZE);
-	pmap_ridmap[0] |= 0xff;
-	pmap_rididx = 0;
-	pmap_ridcount = 8;
-	mtx_init(&pmap_ridmutex, "RID allocator lock", NULL, MTX_DEF);
-
-	/*
-	 * Allocate some memory for initial kernel 'page tables'.
-	 */
-	ia64_kptdir = ia64_physmem_alloc(PAGE_SIZE, PAGE_SIZE);
-	nkpt = 0;
-	kernel_vm_end = VM_INIT_KERNEL_ADDRESS;
-
-	/*
-	 * Determine a valid (mappable) VHPT size.
-	 */
-	TUNABLE_INT_FETCH("machdep.vhpt.log2size", &pmap_vhpt_log2size);
-	if (pmap_vhpt_log2size == 0)
-		pmap_vhpt_log2size = 20;
-	else if (pmap_vhpt_log2size < 16)
-		pmap_vhpt_log2size = 16;
-	else if (pmap_vhpt_log2size > 28)
-		pmap_vhpt_log2size = 28;
-	if (pmap_vhpt_log2size & 1)
-		pmap_vhpt_log2size--;
-
-	size = 1UL << pmap_vhpt_log2size;
-	base = (uintptr_t)ia64_physmem_alloc(size, size);
-	if (base == 0)
-		panic("Unable to allocate VHPT");
-
-	PCPU_SET(md.vhpt, base);
-	if (bootverbose)
-		printf("VHPT: address=%#lx, size=%#lx\n", base, size);
-
-	pmap_vhpt_nbuckets = size / sizeof(struct ia64_lpte);
-	pmap_vhpt_bucket = ia64_physmem_alloc(pmap_vhpt_nbuckets *
-	    sizeof(struct ia64_bucket), PAGE_SIZE);
-	for (i = 0; i < pmap_vhpt_nbuckets; i++) {
-		/* Stolen memory is zeroed. */
-		mtx_init(&pmap_vhpt_bucket[i].mutex, "VHPT bucket lock", NULL,
-		    MTX_NOWITNESS | MTX_SPIN);
-	}
-
-	pmap_initialize_vhpt(base);
-	map_vhpt(base);
-	ia64_set_pta(base + (1 << 8) + (pmap_vhpt_log2size << 2) + 1);
-	ia64_srlz_i();
-
-	virtual_avail = VM_INIT_KERNEL_ADDRESS;
-	virtual_end = VM_MAX_KERNEL_ADDRESS;
-
-	/*
-	 * Initialize the kernel pmap (which is statically allocated).
-	 */
-	PMAP_LOCK_INIT(kernel_pmap);
-	for (i = 0; i < IA64_VM_MINKERN_REGION; i++)
-		kernel_pmap->pm_rid[i] = 0;
-	TAILQ_INIT(&kernel_pmap->pm_pvchunk);
-	PCPU_SET(md.current_pmap, kernel_pmap);
-
- 	/*
-	 * Initialize the global pv list lock.
-	 */
-	rw_init(&pvh_global_lock, "pmap pv global");
-
-	/* Region 5 is mapped via the VHPT. */
-	ia64_set_rr(IA64_RR_BASE(5), (5 << 8) | (PAGE_SHIFT << 2) | 1);
-
-	/*
-	 * Clear out any random TLB entries left over from booting.
-	 */
-	pmap_invalidate_all();
-
-	map_gateway_page();
-}
-
-static int
-pmap_vhpt_population(SYSCTL_HANDLER_ARGS)
-{
-	int count, error, i;
-
-	count = 0;
-	for (i = 0; i < pmap_vhpt_nbuckets; i++)
-		count += pmap_vhpt_bucket[i].length;
-
-	error = SYSCTL_OUT(req, &count, sizeof(count));
-	return (error);
-}
-
-vm_offset_t
-pmap_page_to_va(vm_page_t m)
-{
-	vm_paddr_t pa;
-	vm_offset_t va;
-
-	pa = VM_PAGE_TO_PHYS(m);
-	va = (m->md.memattr == VM_MEMATTR_UNCACHEABLE) ? IA64_PHYS_TO_RR6(pa) :
-	    IA64_PHYS_TO_RR7(pa);
-	return (va);
-}
-
-/*
- *	Initialize a vm_page's machine-dependent fields.
- */
-void
-pmap_page_init(vm_page_t m)
-{
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, m);
-
-	TAILQ_INIT(&m->md.pv_list);
-	m->md.memattr = VM_MEMATTR_DEFAULT;
-}
-
-/*
- *	Initialize the pmap module.
- *	Called by vm_init, to initialize any structures that the pmap
- *	system needs to map virtual memory.
- */
-void
-pmap_init(void)
-{
-
-	CTR1(KTR_PMAP, "%s()", __func__);
-
-	ptezone = uma_zcreate("PT ENTRY", sizeof (struct ia64_lpte), 
-	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM|UMA_ZONE_NOFREE);
-}
-
-
-/***************************************************
- * Manipulate TLBs for a pmap
- ***************************************************/
-
-static void
-pmap_invalidate_page(vm_offset_t va)
-{
-	struct ia64_lpte *pte;
-	struct pcpu *pc;
-	uint64_t tag;
-	u_int vhpt_ofs;
-
-	critical_enter();
-
-	vhpt_ofs = ia64_thash(va) - PCPU_GET(md.vhpt);
-	tag = ia64_ttag(va);
-	STAILQ_FOREACH(pc, &cpuhead, pc_allcpu) {
-		pte = (struct ia64_lpte *)(pc->pc_md.vhpt + vhpt_ofs);
-		atomic_cmpset_64(&pte->tag, tag, 1UL << 63);
-	}
-
-	mtx_lock_spin(&pmap_ptc_mutex);
-
-	ia64_ptc_ga(va, PAGE_SHIFT << 2);
-	ia64_mf();
-	ia64_srlz_i();
-
-	mtx_unlock_spin(&pmap_ptc_mutex);
-
-	ia64_invala();
-
-	critical_exit();
-}
-
-void
-pmap_invalidate_all(void)
-{
-	uint64_t addr;
-	int i, j;
-
-	addr = pmap_ptc_e_base;
-	for (i = 0; i < pmap_ptc_e_count1; i++) {
-		for (j = 0; j < pmap_ptc_e_count2; j++) {
-			ia64_ptc_e(addr);
-			addr += pmap_ptc_e_stride2;
-		}
-		addr += pmap_ptc_e_stride1;
-	}
-	ia64_srlz_i();
-}
-
-static uint32_t
-pmap_allocate_rid(void)
-{
-	uint64_t bit, bits;
-	int rid;
-
-	mtx_lock(&pmap_ridmutex);
-	if (pmap_ridcount == pmap_ridmax)
-		panic("pmap_allocate_rid: All Region IDs used");
-
-	/* Find an index with a free bit. */
-	while ((bits = pmap_ridmap[pmap_rididx]) == ~0UL) {
-		pmap_rididx++;
-		if (pmap_rididx == pmap_ridmapsz)
-			pmap_rididx = 0;
-	}
-	rid = pmap_rididx * 64;
-
-	/* Find a free bit. */
-	bit = 1UL;
-	while (bits & bit) {
-		rid++;
-		bit <<= 1;
-	}
-
-	pmap_ridmap[pmap_rididx] |= bit;
-	pmap_ridcount++;
-	mtx_unlock(&pmap_ridmutex);
-
-	return rid;
-}
-
-static void
-pmap_free_rid(uint32_t rid)
-{
-	uint64_t bit;
-	int idx;
-
-	idx = rid / 64;
-	bit = ~(1UL << (rid & 63));
-
-	mtx_lock(&pmap_ridmutex);
-	pmap_ridmap[idx] &= bit;
-	pmap_ridcount--;
-	mtx_unlock(&pmap_ridmutex);
-}
-
-/***************************************************
- * Page table page management routines.....
- ***************************************************/
-
-static void
-pmap_pinit_common(pmap_t pmap)
-{
-	int i;
-
-	for (i = 0; i < IA64_VM_MINKERN_REGION; i++)
-		pmap->pm_rid[i] = pmap_allocate_rid();
-	TAILQ_INIT(&pmap->pm_pvchunk);
-	bzero(&pmap->pm_stats, sizeof pmap->pm_stats);
-}
-
-void
-pmap_pinit0(pmap_t pmap)
-{
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, pmap);
-
-	PMAP_LOCK_INIT(pmap);
-	pmap_pinit_common(pmap);
-}
-
-/*
- * Initialize a preallocated and zeroed pmap structure,
- * such as one in a vmspace structure.
- */
-int
-pmap_pinit(pmap_t pmap)
-{
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, pmap);
-
-	pmap_pinit_common(pmap);
-	return (1);
-}
-
-/***************************************************
- * Pmap allocation/deallocation routines.
- ***************************************************/
-
-/*
- * Release any resources held by the given physical map.
- * Called when a pmap initialized by pmap_pinit is being released.
- * Should only be called if the map contains no valid mappings.
- */
-void
-pmap_release(pmap_t pmap)
-{
-	int i;
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, pmap);
-
-	for (i = 0; i < IA64_VM_MINKERN_REGION; i++)
-		if (pmap->pm_rid[i])
-			pmap_free_rid(pmap->pm_rid[i]);
-}
-
-/*
- * grow the number of kernel page table entries, if needed
- */
-void
-pmap_growkernel(vm_offset_t addr)
-{
-	struct ia64_lpte **dir1;
-	struct ia64_lpte *leaf;
-	vm_page_t nkpg;
-
-	CTR2(KTR_PMAP, "%s(%#x)", __func__, addr);
-
-	while (kernel_vm_end <= addr) {
-		if (nkpt == PAGE_SIZE/8 + PAGE_SIZE*PAGE_SIZE/64)
-			panic("%s: out of kernel address space", __func__);
-
-		dir1 = ia64_kptdir[KPTE_DIR0_INDEX(kernel_vm_end)];
-		if (dir1 == NULL) {
-			nkpg = vm_page_alloc(NULL, nkpt++,
-			    VM_ALLOC_NOOBJ|VM_ALLOC_INTERRUPT|VM_ALLOC_WIRED);
-			if (!nkpg)
-				panic("%s: cannot add dir. page", __func__);
-
-			dir1 = (struct ia64_lpte **)pmap_page_to_va(nkpg);
-			bzero(dir1, PAGE_SIZE);
-			ia64_kptdir[KPTE_DIR0_INDEX(kernel_vm_end)] = dir1;
-		}
-
-		nkpg = vm_page_alloc(NULL, nkpt++,
-		    VM_ALLOC_NOOBJ|VM_ALLOC_INTERRUPT|VM_ALLOC_WIRED);
-		if (!nkpg)
-			panic("%s: cannot add PTE page", __func__);
-
-		leaf = (struct ia64_lpte *)pmap_page_to_va(nkpg);
-		bzero(leaf, PAGE_SIZE);
-		dir1[KPTE_DIR1_INDEX(kernel_vm_end)] = leaf;
-
-		kernel_vm_end += PAGE_SIZE * NKPTEPG;
-	}
-}
-
-/***************************************************
- * page management routines.
- ***************************************************/
-
-CTASSERT(sizeof(struct pv_chunk) == PAGE_SIZE);
-
-static __inline struct pv_chunk *
-pv_to_chunk(pv_entry_t pv)
-{
-
-	return ((struct pv_chunk *)((uintptr_t)pv & ~(uintptr_t)PAGE_MASK));
-}
-
-#define PV_PMAP(pv) (pv_to_chunk(pv)->pc_pmap)
-
-#define	PC_FREE_FULL	0xfffffffffffffffful
-#define	PC_FREE_PARTIAL	\
-	((1UL << (_NPCPV - sizeof(u_long) * 8 * (_NPCM - 1))) - 1)
-
-#if PAGE_SIZE == 8192
-static const u_long pc_freemask[_NPCM] = {
-	PC_FREE_FULL, PC_FREE_FULL, PC_FREE_FULL,
-	PC_FREE_FULL, PC_FREE_FULL, PC_FREE_PARTIAL
-};
-#elif PAGE_SIZE == 16384
-static const u_long pc_freemask[_NPCM] = {
-	PC_FREE_FULL, PC_FREE_FULL, PC_FREE_FULL,
-	PC_FREE_FULL, PC_FREE_FULL, PC_FREE_FULL,
-	PC_FREE_FULL, PC_FREE_FULL, PC_FREE_FULL,
-	PC_FREE_FULL, PC_FREE_PARTIAL
-};
-#endif
-
-static SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
-
-SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_count, CTLFLAG_RD, &pv_entry_count, 0,
-    "Current number of pv entries");
-
-#ifdef PV_STATS
-static int pc_chunk_count, pc_chunk_allocs, pc_chunk_frees, pc_chunk_tryfail;
-
-SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_count, CTLFLAG_RD, &pc_chunk_count, 0,
-    "Current number of pv entry chunks");
-SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_allocs, CTLFLAG_RD, &pc_chunk_allocs, 0,
-    "Current number of pv entry chunks allocated");
-SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_frees, CTLFLAG_RD, &pc_chunk_frees, 0,
-    "Current number of pv entry chunks frees");
-SYSCTL_INT(_vm_pmap, OID_AUTO, pc_chunk_tryfail, CTLFLAG_RD, &pc_chunk_tryfail, 0,
-    "Number of times tried to get a chunk page but failed.");
-
-static long pv_entry_frees, pv_entry_allocs;
-static int pv_entry_spare;
-
-SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_frees, CTLFLAG_RD, &pv_entry_frees, 0,
-    "Current number of pv entry frees");
-SYSCTL_LONG(_vm_pmap, OID_AUTO, pv_entry_allocs, CTLFLAG_RD, &pv_entry_allocs, 0,
-    "Current number of pv entry allocs");
-SYSCTL_INT(_vm_pmap, OID_AUTO, pv_entry_spare, CTLFLAG_RD, &pv_entry_spare, 0,
-    "Current number of spare pv entries");
-#endif
-
-/*
- * We are in a serious low memory condition.  Resort to
- * drastic measures to free some pages so we can allocate
- * another pv entry chunk.
- */
-static vm_page_t
-pmap_pv_reclaim(pmap_t locked_pmap)
-{
-	struct pch newtail;
-	struct pv_chunk *pc;
-	struct ia64_lpte *pte;
-	pmap_t pmap;
-	pv_entry_t pv;
-	vm_offset_t va;
-	vm_page_t m, m_pc;
-	u_long inuse;
-	int bit, field, freed, idx;
-
-	PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED);
-	pmap = NULL;
-	m_pc = NULL;
-	TAILQ_INIT(&newtail);
-	while ((pc = TAILQ_FIRST(&pv_chunks)) != NULL) {
-		TAILQ_REMOVE(&pv_chunks, pc, pc_lru);
-		if (pmap != pc->pc_pmap) {
-			if (pmap != NULL) {
-				if (pmap != locked_pmap) {
-					pmap_switch(locked_pmap);
-					PMAP_UNLOCK(pmap);
-				}
-			}
-			pmap = pc->pc_pmap;
-			/* Avoid deadlock and lock recursion. */
-			if (pmap > locked_pmap)
-				PMAP_LOCK(pmap);
-			else if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap)) {
-				pmap = NULL;
-				TAILQ_INSERT_TAIL(&newtail, pc, pc_lru);
-				continue;
-			}
-			pmap_switch(pmap);
-		}
-
-		/*
-		 * Destroy every non-wired, 8 KB page mapping in the chunk.
-		 */
-		freed = 0;
-		for (field = 0; field < _NPCM; field++) {
-			for (inuse = ~pc->pc_map[field] & pc_freemask[field];
-			    inuse != 0; inuse &= ~(1UL << bit)) {
-				bit = ffsl(inuse) - 1;
-				idx = field * sizeof(inuse) * NBBY + bit;
-				pv = &pc->pc_pventry[idx];
-				va = pv->pv_va;
-				pte = pmap_find_vhpt(va);
-				KASSERT(pte != NULL, ("pte"));
-				if (pmap_wired(pte))
-					continue;
-				pmap_remove_vhpt(va);
-				pmap_invalidate_page(va);
-				m = PHYS_TO_VM_PAGE(pmap_ppn(pte));
-				if (pmap_accessed(pte))
-					vm_page_aflag_set(m, PGA_REFERENCED);
-				if (pmap_dirty(pte))
-					vm_page_dirty(m);
-				pmap_free_pte(pte, va);
-				TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
-				if (TAILQ_EMPTY(&m->md.pv_list))
-					vm_page_aflag_clear(m, PGA_WRITEABLE);
-				pc->pc_map[field] |= 1UL << bit;
-				freed++;
-			}
-		}
-		if (freed == 0) {
-			TAILQ_INSERT_TAIL(&newtail, pc, pc_lru);
-			continue;
-		}
-		/* Every freed mapping is for a 8 KB page. */
-		pmap->pm_stats.resident_count -= freed;
-		PV_STAT(pv_entry_frees += freed);
-		PV_STAT(pv_entry_spare += freed);
-		pv_entry_count -= freed;
-		TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list);
-		for (field = 0; field < _NPCM; field++)
-			if (pc->pc_map[field] != pc_freemask[field]) {
-				TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc,
-				    pc_list);
-				TAILQ_INSERT_TAIL(&newtail, pc, pc_lru);
-
-				/*
-				 * One freed pv entry in locked_pmap is
-				 * sufficient.
-				 */
-				if (pmap == locked_pmap)
-					goto out;
-				break;
-			}
-		if (field == _NPCM) {
-			PV_STAT(pv_entry_spare -= _NPCPV);
-			PV_STAT(pc_chunk_count--);
-			PV_STAT(pc_chunk_frees++);
-			/* Entire chunk is free; return it. */
-			m_pc = PHYS_TO_VM_PAGE(IA64_RR_MASK((vm_offset_t)pc));
-			break;
-		}
-	}
-out:
-	TAILQ_CONCAT(&pv_chunks, &newtail, pc_lru);
-	if (pmap != NULL) {
-		if (pmap != locked_pmap) {
-			pmap_switch(locked_pmap);
-			PMAP_UNLOCK(pmap);
-		}
-	}
-	return (m_pc);
-}
-
-/*
- * free the pv_entry back to the free list
- */
-static void
-free_pv_entry(pmap_t pmap, pv_entry_t pv)
-{
-	struct pv_chunk *pc;
-	int bit, field, idx;
-
-	rw_assert(&pvh_global_lock, RA_WLOCKED);
-	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
-	PV_STAT(pv_entry_frees++);
-	PV_STAT(pv_entry_spare++);
-	pv_entry_count--;
-	pc = pv_to_chunk(pv);
-	idx = pv - &pc->pc_pventry[0];
-	field = idx / (sizeof(u_long) * NBBY);
-	bit = idx % (sizeof(u_long) * NBBY);
-	pc->pc_map[field] |= 1ul << bit;
-	for (idx = 0; idx < _NPCM; idx++)
-		if (pc->pc_map[idx] != pc_freemask[idx]) {
-			/*
-			 * 98% of the time, pc is already at the head of the
-			 * list.  If it isn't already, move it to the head.
-			 */
-			if (__predict_false(TAILQ_FIRST(&pmap->pm_pvchunk) !=
-			    pc)) {
-				TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list);
-				TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc,
-				    pc_list);
-			}
-			return;
-		}
-	TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list);
-	free_pv_chunk(pc);
-}
-
-static void
-free_pv_chunk(struct pv_chunk *pc)
-{
-	vm_page_t m;
-
- 	TAILQ_REMOVE(&pv_chunks, pc, pc_lru);
-	PV_STAT(pv_entry_spare -= _NPCPV);
-	PV_STAT(pc_chunk_count--);
-	PV_STAT(pc_chunk_frees++);
-	/* entire chunk is free, return it */
-	m = PHYS_TO_VM_PAGE(IA64_RR_MASK((vm_offset_t)pc));
-	vm_page_unwire(m, 0);
-	vm_page_free(m);
-}
-
-/*
- * get a new pv_entry, allocating a block from the system
- * when needed.
- */
-static pv_entry_t
-get_pv_entry(pmap_t pmap, boolean_t try)
-{
-	struct pv_chunk *pc;
-	pv_entry_t pv;
-	vm_page_t m;
-	int bit, field, idx;
-
-	rw_assert(&pvh_global_lock, RA_WLOCKED);
-	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
-	PV_STAT(pv_entry_allocs++);
-	pv_entry_count++;
-retry:
-	pc = TAILQ_FIRST(&pmap->pm_pvchunk);
-	if (pc != NULL) {
-		for (field = 0; field < _NPCM; field++) {
-			if (pc->pc_map[field]) {
-				bit = ffsl(pc->pc_map[field]) - 1;
-				break;
-			}
-		}
-		if (field < _NPCM) {
-			idx = field * sizeof(pc->pc_map[field]) * NBBY + bit;
-			pv = &pc->pc_pventry[idx];
-			pc->pc_map[field] &= ~(1ul << bit);
-			/* If this was the last item, move it to tail */
-			for (field = 0; field < _NPCM; field++)
-				if (pc->pc_map[field] != 0) {
-					PV_STAT(pv_entry_spare--);
-					return (pv);	/* not full, return */
-				}
-			TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list);
-			TAILQ_INSERT_TAIL(&pmap->pm_pvchunk, pc, pc_list);
-			PV_STAT(pv_entry_spare--);
-			return (pv);
-		}
-	}
-	/* No free items, allocate another chunk */
-	m = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ |
-	    VM_ALLOC_WIRED);
-	if (m == NULL) {
-		if (try) {
-			pv_entry_count--;
-			PV_STAT(pc_chunk_tryfail++);
-			return (NULL);
-		}
-		m = pmap_pv_reclaim(pmap);
-		if (m == NULL)
-			goto retry;
-	}
-	PV_STAT(pc_chunk_count++);
-	PV_STAT(pc_chunk_allocs++);
-	pc = (struct pv_chunk *)IA64_PHYS_TO_RR7(VM_PAGE_TO_PHYS(m));
-	pc->pc_pmap = pmap;
-	pc->pc_map[0] = pc_freemask[0] & ~1ul;	/* preallocated bit 0 */
-	for (field = 1; field < _NPCM; field++)
-		pc->pc_map[field] = pc_freemask[field];
-	TAILQ_INSERT_TAIL(&pv_chunks, pc, pc_lru);
-	pv = &pc->pc_pventry[0];
-	TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list);
-	PV_STAT(pv_entry_spare += _NPCPV - 1);
-	return (pv);
-}
-
-/*
- * Conditionally create a pv entry.
- */
-static boolean_t
-pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va, vm_page_t m)
-{
-	pv_entry_t pv;
-
-	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
-	rw_assert(&pvh_global_lock, RA_WLOCKED);
-	if ((pv = get_pv_entry(pmap, TRUE)) != NULL) {
-		pv->pv_va = va;
-		TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
-		return (TRUE);
-	} else
-		return (FALSE);
-}
-
-/*
- * Add an ia64_lpte to the VHPT.
- */
-static void
-pmap_enter_vhpt(struct ia64_lpte *pte, vm_offset_t va)
-{
-	struct ia64_bucket *bckt;
-	struct ia64_lpte *vhpte;
-	uint64_t pte_pa;
-
-	/* Can fault, so get it out of the way. */
-	pte_pa = ia64_tpa((vm_offset_t)pte);
-
-	vhpte = (struct ia64_lpte *)ia64_thash(va);
-	bckt = (struct ia64_bucket *)vhpte->chain;
-
-	mtx_lock_spin(&bckt->mutex);
-	pte->chain = bckt->chain;
-	ia64_mf();
-	bckt->chain = pte_pa;
-
-	pmap_vhpt_inserts++;
-	bckt->length++;
-	mtx_unlock_spin(&bckt->mutex);
-}
-
-/*
- * Remove the ia64_lpte matching va from the VHPT. Return zero if it
- * worked or an appropriate error code otherwise.
- */
-static int
-pmap_remove_vhpt(vm_offset_t va)
-{
-	struct ia64_bucket *bckt;
-	struct ia64_lpte *pte;
-	struct ia64_lpte *lpte;
-	struct ia64_lpte *vhpte;
-	uint64_t chain, tag;
-
-	tag = ia64_ttag(va);
-	vhpte = (struct ia64_lpte *)ia64_thash(va);
-	bckt = (struct ia64_bucket *)vhpte->chain;
-
-	lpte = NULL;
-	mtx_lock_spin(&bckt->mutex);
-	chain = bckt->chain;
-	pte = (struct ia64_lpte *)IA64_PHYS_TO_RR7(chain);
-	while (chain != 0 && pte->tag != tag) {
-		lpte = pte;
-		chain = pte->chain;
-		pte = (struct ia64_lpte *)IA64_PHYS_TO_RR7(chain);
-	}
-	if (chain == 0) {
-		mtx_unlock_spin(&bckt->mutex);
-		return (ENOENT);
-	}
-
-	/* Snip this pv_entry out of the collision chain. */
-	if (lpte == NULL)
-		bckt->chain = pte->chain;
-	else
-		lpte->chain = pte->chain;
-	ia64_mf();
-
-	bckt->length--;
-	mtx_unlock_spin(&bckt->mutex);
-	return (0);
-}
-
-/*
- * Find the ia64_lpte for the given va, if any.
- */
-static struct ia64_lpte *
-pmap_find_vhpt(vm_offset_t va)
-{
-	struct ia64_bucket *bckt;
-	struct ia64_lpte *pte;
-	uint64_t chain, tag;
-
-	tag = ia64_ttag(va);
-	pte = (struct ia64_lpte *)ia64_thash(va);
-	bckt = (struct ia64_bucket *)pte->chain;
-
-	mtx_lock_spin(&bckt->mutex);
-	chain = bckt->chain;
-	pte = (struct ia64_lpte *)IA64_PHYS_TO_RR7(chain);
-	while (chain != 0 && pte->tag != tag) {
-		chain = pte->chain;
-		pte = (struct ia64_lpte *)IA64_PHYS_TO_RR7(chain);
-	}
-	mtx_unlock_spin(&bckt->mutex);
-	return ((chain != 0) ? pte : NULL);
-}
-
-/*
- * Remove an entry from the list of managed mappings.
- */
-static int
-pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va, pv_entry_t pv)
-{
-
-	rw_assert(&pvh_global_lock, RA_WLOCKED);
-	if (!pv) {
-		TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
-			if (pmap == PV_PMAP(pv) && va == pv->pv_va) 
-				break;
-		}
-	}
-
-	if (pv) {
-		TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
-		if (TAILQ_FIRST(&m->md.pv_list) == NULL)
-			vm_page_aflag_clear(m, PGA_WRITEABLE);
-
-		free_pv_entry(pmap, pv);
-		return 0;
-	} else {
-		return ENOENT;
-	}
-}
-
-/*
- * Create a pv entry for page at pa for
- * (pmap, va).
- */
-static void
-pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t m)
-{
-	pv_entry_t pv;
-
-	rw_assert(&pvh_global_lock, RA_WLOCKED);
-	pv = get_pv_entry(pmap, FALSE);
-	pv->pv_va = va;
-	TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
-}
-
-/*
- *	Routine:	pmap_extract
- *	Function:
- *		Extract the physical page address associated
- *		with the given map/virtual_address pair.
- */
-vm_paddr_t
-pmap_extract(pmap_t pmap, vm_offset_t va)
-{
-	struct ia64_lpte *pte;
-	pmap_t oldpmap;
-	vm_paddr_t pa;
-
-	CTR3(KTR_PMAP, "%s(%p, %#x)", __func__, pmap, va);
-
-	pa = 0;
-	PMAP_LOCK(pmap);
-	oldpmap = pmap_switch(pmap);
-	pte = pmap_find_vhpt(va);
-	if (pte != NULL && pmap_present(pte))
-		pa = pmap_ppn(pte);
-	pmap_switch(oldpmap);
-	PMAP_UNLOCK(pmap);
-	return (pa);
-}
-
-/*
- *	Routine:	pmap_extract_and_hold
- *	Function:
- *		Atomically extract and hold the physical page
- *		with the given pmap and virtual address pair
- *		if that mapping permits the given protection.
- */
-vm_page_t
-pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot)
-{
-	struct ia64_lpte *pte;
-	pmap_t oldpmap;
-	vm_page_t m;
-	vm_paddr_t pa;
-
-	CTR4(KTR_PMAP, "%s(%p, %#x, %#x)", __func__, pmap, va, prot);
-
-	pa = 0;
-	m = NULL;
-	PMAP_LOCK(pmap);
-	oldpmap = pmap_switch(pmap);
-retry:
-	pte = pmap_find_vhpt(va);
-	if (pte != NULL && pmap_present(pte) &&
-	    (pmap_prot(pte) & prot) == prot) {
-		m = PHYS_TO_VM_PAGE(pmap_ppn(pte));
-		if (vm_page_pa_tryrelock(pmap, pmap_ppn(pte), &pa))
-			goto retry;
-		vm_page_hold(m);
-	}
-	PA_UNLOCK_COND(pa);
-	pmap_switch(oldpmap);
-	PMAP_UNLOCK(pmap);
-	return (m);
-}
-
-/***************************************************
- * Low level mapping routines.....
- ***************************************************/
-
-/*
- * Find the kernel lpte for mapping the given virtual address, which
- * must be in the part of region 5 which we can cover with our kernel
- * 'page tables'.
- */
-static struct ia64_lpte *
-pmap_find_kpte(vm_offset_t va)
-{
-	struct ia64_lpte **dir1;
-	struct ia64_lpte *leaf;
-
-	KASSERT((va >> 61) == 5,
-		("kernel mapping 0x%lx not in region 5", va));
-	KASSERT(va < kernel_vm_end,
-		("kernel mapping 0x%lx out of range", va));
-
-	dir1 = ia64_kptdir[KPTE_DIR0_INDEX(va)];
-	leaf = dir1[KPTE_DIR1_INDEX(va)];
-	return (&leaf[KPTE_PTE_INDEX(va)]);
-}
-
-/*
- * Find a pte suitable for mapping a user-space address. If one exists 
- * in the VHPT, that one will be returned, otherwise a new pte is
- * allocated.
- */
-static struct ia64_lpte *
-pmap_find_pte(vm_offset_t va)
-{
-	struct ia64_lpte *pte;
-
-	if (va >= VM_MAXUSER_ADDRESS)
-		return pmap_find_kpte(va);
-
-	pte = pmap_find_vhpt(va);
-	if (pte == NULL) {
-		pte = uma_zalloc(ptezone, M_NOWAIT | M_ZERO);
-		pte->tag = 1UL << 63;
-	}
-	return (pte);
-}
-
-/*
- * Free a pte which is now unused. This simply returns it to the zone
- * allocator if it is a user mapping. For kernel mappings, clear the
- * valid bit to make it clear that the mapping is not currently used.
- */
-static void
-pmap_free_pte(struct ia64_lpte *pte, vm_offset_t va)
-{
-	if (va < VM_MAXUSER_ADDRESS)
-		uma_zfree(ptezone, pte);
-	else
-		pmap_clear_present(pte);
-}
-
-static PMAP_INLINE void
-pmap_pte_prot(pmap_t pm, struct ia64_lpte *pte, vm_prot_t prot)
-{
-	static long prot2ar[4] = {
-		PTE_AR_R,		/* VM_PROT_NONE */
-		PTE_AR_RW,		/* VM_PROT_WRITE */
-		PTE_AR_RX|PTE_ED,	/* VM_PROT_EXECUTE */
-		PTE_AR_RWX|PTE_ED	/* VM_PROT_WRITE|VM_PROT_EXECUTE */
-	};
-
-	pte->pte &= ~(PTE_PROT_MASK | PTE_PL_MASK | PTE_AR_MASK | PTE_ED);
-	pte->pte |= (uint64_t)(prot & VM_PROT_ALL) << 56;
-	pte->pte |= (prot == VM_PROT_NONE || pm == kernel_pmap)
-	    ? PTE_PL_KERN : PTE_PL_USER;
-	pte->pte |= prot2ar[(prot & VM_PROT_ALL) >> 1];
-}
-
-static PMAP_INLINE void
-pmap_pte_attr(struct ia64_lpte *pte, vm_memattr_t ma)
-{
-
-	pte->pte &= ~PTE_MA_MASK;
-	pte->pte |= (ma & PTE_MA_MASK);
-}
-
-/*
- * Set a pte to contain a valid mapping and enter it in the VHPT. If
- * the pte was orginally valid, then its assumed to already be in the
- * VHPT.
- * This functions does not set the protection bits.  It's expected
- * that those have been set correctly prior to calling this function.
- */
-static void
-pmap_set_pte(struct ia64_lpte *pte, vm_offset_t va, vm_offset_t pa,
-    boolean_t wired, boolean_t managed)
-{
-
-	pte->pte &= PTE_PROT_MASK | PTE_MA_MASK | PTE_PL_MASK |
-	    PTE_AR_MASK | PTE_ED;
-	pte->pte |= PTE_PRESENT;
-	pte->pte |= (managed) ? PTE_MANAGED : (PTE_DIRTY | PTE_ACCESSED);
-	pte->pte |= (wired) ? PTE_WIRED : 0;
-	pte->pte |= pa & PTE_PPN_MASK;
-
-	pte->itir = PAGE_SHIFT << 2;
-
-	ia64_mf();
-
-	pte->tag = ia64_ttag(va);
-}
-
-/*
- * Remove the (possibly managed) mapping represented by pte from the
- * given pmap.
- */
-static int
-pmap_remove_pte(pmap_t pmap, struct ia64_lpte *pte, vm_offset_t va,
-		pv_entry_t pv, int freepte)
-{
-	int error;
-	vm_page_t m;
-
-	/*
-	 * First remove from the VHPT.
-	 */
-	error = pmap_remove_vhpt(va);
-	KASSERT(error == 0, ("%s: pmap_remove_vhpt returned %d",
-	    __func__, error));
-
-	pmap_invalidate_page(va);
-
-	if (pmap_wired(pte))
-		pmap->pm_stats.wired_count -= 1;
-
-	pmap->pm_stats.resident_count -= 1;
-	if (pmap_managed(pte)) {
-		m = PHYS_TO_VM_PAGE(pmap_ppn(pte));
-		if (pmap_dirty(pte))
-			vm_page_dirty(m);
-		if (pmap_accessed(pte))
-			vm_page_aflag_set(m, PGA_REFERENCED);
-
-		error = pmap_remove_entry(pmap, m, va, pv);
-	}
-	if (freepte)
-		pmap_free_pte(pte, va);
-
-	return (error);
-}
-
-/*
- * Extract the physical page address associated with a kernel
- * virtual address.
- */
-vm_paddr_t
-pmap_kextract(vm_offset_t va)
-{
-	struct ia64_lpte *pte;
-	uint64_t *pbvm_pgtbl;
-	vm_paddr_t pa;
-	u_int idx;
-
-	CTR2(KTR_PMAP, "%s(%#x)", __func__, va);
-
-	KASSERT(va >= VM_MAXUSER_ADDRESS, ("Must be kernel VA"));
-
-	/* Regions 6 and 7 are direct mapped. */
-	if (va >= IA64_RR_BASE(6)) {
-		pa = IA64_RR_MASK(va);
-		goto out;
-	}
-
-	/* Region 5 is our KVA. Bail out if the VA is beyond our limits. */
-	if (va >= kernel_vm_end)
-		goto err_out;
-	if (va >= VM_INIT_KERNEL_ADDRESS) {
-		pte = pmap_find_kpte(va);
-		pa = pmap_present(pte) ? pmap_ppn(pte) | (va & PAGE_MASK) : 0;
-		goto out;
-	}
-
-	/* The PBVM page table. */
-	if (va >= IA64_PBVM_PGTBL + bootinfo->bi_pbvm_pgtblsz)
-		goto err_out;
-	if (va >= IA64_PBVM_PGTBL) {
-		pa = (va - IA64_PBVM_PGTBL) + bootinfo->bi_pbvm_pgtbl;
-		goto out;
-	}
-
-	/* The PBVM itself. */
-	if (va >= IA64_PBVM_BASE) {
-		pbvm_pgtbl = (void *)IA64_PBVM_PGTBL;
-		idx = (va - IA64_PBVM_BASE) >> IA64_PBVM_PAGE_SHIFT;
-		if (idx >= (bootinfo->bi_pbvm_pgtblsz >> 3))
-			goto err_out;
-		if ((pbvm_pgtbl[idx] & PTE_PRESENT) == 0)
-			goto err_out;
-		pa = (pbvm_pgtbl[idx] & PTE_PPN_MASK) +
-		    (va & IA64_PBVM_PAGE_MASK);
-		goto out;
-	}
-
- err_out:
-	printf("XXX: %s: va=%#lx is invalid\n", __func__, va);
-	pa = 0;
-	/* FALLTHROUGH */
-
- out:
-	return (pa);
-}
-
-/*
- * Add a list of wired pages to the kva this routine is only used for
- * temporary kernel mappings that do not need to have page modification
- * or references recorded.  Note that old mappings are simply written
- * over.  The page is effectively wired, but it's customary to not have
- * the PTE reflect that, nor update statistics.
- */
-void
-pmap_qenter(vm_offset_t va, vm_page_t *m, int count)
-{
-	struct ia64_lpte *pte;
-	int i;
-
-	CTR4(KTR_PMAP, "%s(%#x, %p, %d)", __func__, va, m, count);
-
-	for (i = 0; i < count; i++) {
-		pte = pmap_find_kpte(va);
-		if (pmap_present(pte))
-			pmap_invalidate_page(va);
-		else
-			pmap_enter_vhpt(pte, va);
-		pmap_pte_prot(kernel_pmap, pte, VM_PROT_ALL);
-		pmap_pte_attr(pte, m[i]->md.memattr);
-		pmap_set_pte(pte, va, VM_PAGE_TO_PHYS(m[i]), FALSE, FALSE);
-		va += PAGE_SIZE;
-	}
-}
-
-/*
- * this routine jerks page mappings from the
- * kernel -- it is meant only for temporary mappings.
- */
-void
-pmap_qremove(vm_offset_t va, int count)
-{
-	struct ia64_lpte *pte;
-	int i;
-
-	CTR3(KTR_PMAP, "%s(%#x, %d)", __func__, va, count);
-
-	for (i = 0; i < count; i++) {
-		pte = pmap_find_kpte(va);
-		if (pmap_present(pte)) {
-			pmap_remove_vhpt(va);
-			pmap_invalidate_page(va);
-			pmap_clear_present(pte);
-		}
-		va += PAGE_SIZE;
-	}
-}
-
-/*
- * Add a wired page to the kva.  As for pmap_qenter(), it's customary
- * to not have the PTE reflect that, nor update statistics.
- */
-void 
-pmap_kenter(vm_offset_t va, vm_paddr_t pa)
-{
-	struct ia64_lpte *pte;
-
-	CTR3(KTR_PMAP, "%s(%#x, %#x)", __func__, va, pa);
-
-	pte = pmap_find_kpte(va);
-	if (pmap_present(pte))
-		pmap_invalidate_page(va);
-	else
-		pmap_enter_vhpt(pte, va);
-	pmap_pte_prot(kernel_pmap, pte, VM_PROT_ALL);
-	pmap_pte_attr(pte, VM_MEMATTR_DEFAULT);
-	pmap_set_pte(pte, va, pa, FALSE, FALSE);
-}
-
-/*
- * Remove a page from the kva
- */
-void
-pmap_kremove(vm_offset_t va)
-{
-	struct ia64_lpte *pte;
-
-	CTR2(KTR_PMAP, "%s(%#x)", __func__, va);
-
-	pte = pmap_find_kpte(va);
-	if (pmap_present(pte)) {
-		pmap_remove_vhpt(va);
-		pmap_invalidate_page(va);
-		pmap_clear_present(pte);
-	}
-}
-
-/*
- *	Used to map a range of physical addresses into kernel
- *	virtual address space.
- *
- *	The value passed in '*virt' is a suggested virtual address for
- *	the mapping. Architectures which can support a direct-mapped
- *	physical to virtual region can return the appropriate address
- *	within that region, leaving '*virt' unchanged. Other
- *	architectures should map the pages starting at '*virt' and
- *	update '*virt' with the first usable address after the mapped
- *	region.
- */
-vm_offset_t
-pmap_map(vm_offset_t *virt, vm_offset_t start, vm_offset_t end, int prot)
-{
-
-	CTR5(KTR_PMAP, "%s(%p, %#x, %#x, %#x)", __func__, virt, start, end,
-	    prot);
-
-	return IA64_PHYS_TO_RR7(start);
-}
-
-/*
- *	Remove the given range of addresses from the specified map.
- *
- *	It is assumed that the start and end are properly
- *	rounded to the page size.
- *
- *	Sparsely used ranges are inefficiently removed.  The VHPT is
- *	probed for every page within the range.  XXX
- */
-void
-pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
-{
-	pmap_t oldpmap;
-	vm_offset_t va;
-	struct ia64_lpte *pte;
-
-	CTR4(KTR_PMAP, "%s(%p, %#x, %#x)", __func__, pmap, sva, eva);
-
-	/*
-	 * Perform an unsynchronized read.  This is, however, safe.
-	 */
-	if (pmap->pm_stats.resident_count == 0)
-		return;
-
-	rw_wlock(&pvh_global_lock);
-	PMAP_LOCK(pmap);
-	oldpmap = pmap_switch(pmap);
-	for (va = sva; va < eva; va += PAGE_SIZE) {
-		pte = pmap_find_vhpt(va);
-		if (pte != NULL)
-			pmap_remove_pte(pmap, pte, va, 0, 1);
-	}
-	rw_wunlock(&pvh_global_lock);
-	pmap_switch(oldpmap);
-	PMAP_UNLOCK(pmap);
-}
-
-/*
- *	Routine:	pmap_remove_all
- *	Function:
- *		Removes this physical page from
- *		all physical maps in which it resides.
- *		Reflects back modify bits to the pager.
- *
- *	Notes:
- *		Original versions of this routine were very
- *		inefficient because they iteratively called
- *		pmap_remove (slow...)
- */
-void
-pmap_remove_all(vm_page_t m)
-{
-	pmap_t oldpmap;
-	pv_entry_t pv;
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, m);
-
-	KASSERT((m->oflags & VPO_UNMANAGED) == 0,
-	    ("pmap_remove_all: page %p is not managed", m));
-	rw_wlock(&pvh_global_lock);
-	while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) {
-		struct ia64_lpte *pte;
-		pmap_t pmap = PV_PMAP(pv);
-		vm_offset_t va = pv->pv_va;
-
-		PMAP_LOCK(pmap);
-		oldpmap = pmap_switch(pmap);
-		pte = pmap_find_vhpt(va);
-		KASSERT(pte != NULL, ("pte"));
-		if (pmap_ppn(pte) != VM_PAGE_TO_PHYS(m))
-			panic("pmap_remove_all: pv_table for %lx is inconsistent", VM_PAGE_TO_PHYS(m));
-		pmap_remove_pte(pmap, pte, va, pv, 1);
-		pmap_switch(oldpmap);
-		PMAP_UNLOCK(pmap);
-	}
-	vm_page_aflag_clear(m, PGA_WRITEABLE);
-	rw_wunlock(&pvh_global_lock);
-}
-
-/*
- *	Set the physical protection on the
- *	specified range of this map as requested.
- */
-void
-pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
-{
-	pmap_t oldpmap;
-	struct ia64_lpte *pte;
-
-	CTR5(KTR_PMAP, "%s(%p, %#x, %#x, %#x)", __func__, pmap, sva, eva,
-	    prot);
-
-	if ((prot & VM_PROT_READ) == VM_PROT_NONE) {
-		pmap_remove(pmap, sva, eva);
-		return;
-	}
-
-	if ((prot & (VM_PROT_WRITE|VM_PROT_EXECUTE)) ==
-	    (VM_PROT_WRITE|VM_PROT_EXECUTE))
-		return;
-
-	if ((sva & PAGE_MASK) || (eva & PAGE_MASK))
-		panic("pmap_protect: unaligned addresses");
-
-	PMAP_LOCK(pmap);
-	oldpmap = pmap_switch(pmap);
-	for ( ; sva < eva; sva += PAGE_SIZE) {
-		/* If page is invalid, skip this page */
-		pte = pmap_find_vhpt(sva);
-		if (pte == NULL)
-			continue;
-
-		/* If there's no change, skip it too */
-		if (pmap_prot(pte) == prot)
-			continue;
-
-		if ((prot & VM_PROT_WRITE) == 0 &&
-		    pmap_managed(pte) && pmap_dirty(pte)) {
-			vm_paddr_t pa = pmap_ppn(pte);
-			vm_page_t m = PHYS_TO_VM_PAGE(pa);
-
-			vm_page_dirty(m);
-			pmap_clear_dirty(pte);
-		}
-
-		if (prot & VM_PROT_EXECUTE)
-			ia64_sync_icache(sva, PAGE_SIZE);
-
-		pmap_pte_prot(pmap, pte, prot);
-		pmap_invalidate_page(sva);
-	}
-	pmap_switch(oldpmap);
-	PMAP_UNLOCK(pmap);
-}
-
-/*
- *	Insert the given physical page (p) at
- *	the specified virtual address (v) in the
- *	target physical map with the protection requested.
- *
- *	If specified, the page will be wired down, meaning
- *	that the related pte can not be reclaimed.
- *
- *	NB:  This is the only routine which MAY NOT lazy-evaluate
- *	or lose information.  That is, this routine must actually
- *	insert this page into the given map NOW.
- */
-void
-pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
-    vm_prot_t prot, boolean_t wired)
-{
-	pmap_t oldpmap;
-	vm_offset_t pa;
-	vm_offset_t opa;
-	struct ia64_lpte origpte;
-	struct ia64_lpte *pte;
-	boolean_t icache_inval, managed;
-
-	CTR6(KTR_PMAP, "pmap_enter(%p, %#x, %#x, %p, %#x, %u)", pmap, va,
-	    access, m, prot, wired);
-
-	rw_wlock(&pvh_global_lock);
-	PMAP_LOCK(pmap);
-	oldpmap = pmap_switch(pmap);
-
-	va &= ~PAGE_MASK;
- 	KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig"));
-	KASSERT((m->oflags & VPO_UNMANAGED) != 0 || vm_page_xbusied(m),
-	    ("pmap_enter: page %p is not busy", m));
-
-	/*
-	 * Find (or create) a pte for the given mapping.
-	 */
-	while ((pte = pmap_find_pte(va)) == NULL) {
-		pmap_switch(oldpmap);
-		PMAP_UNLOCK(pmap);
-		rw_wunlock(&pvh_global_lock);
-		VM_WAIT;
-		rw_wlock(&pvh_global_lock);
-		PMAP_LOCK(pmap);
-		oldpmap = pmap_switch(pmap);
-	}
-	origpte = *pte;
-	if (!pmap_present(pte)) {
-		opa = ~0UL;
-		pmap_enter_vhpt(pte, va);
-	} else
-		opa = pmap_ppn(pte);
-	managed = FALSE;
-	pa = VM_PAGE_TO_PHYS(m);
-
-	icache_inval = (prot & VM_PROT_EXECUTE) ? TRUE : FALSE;
-
-	/*
-	 * Mapping has not changed, must be protection or wiring change.
-	 */
-	if (opa == pa) {
-		/*
-		 * Wiring change, just update stats. We don't worry about
-		 * wiring PT pages as they remain resident as long as there
-		 * are valid mappings in them. Hence, if a user page is wired,
-		 * the PT page will be also.
-		 */
-		if (wired && !pmap_wired(&origpte))
-			pmap->pm_stats.wired_count++;
-		else if (!wired && pmap_wired(&origpte))
-			pmap->pm_stats.wired_count--;
-
-		managed = (pmap_managed(&origpte)) ? TRUE : FALSE;
-
-		/*
-		 * We might be turning off write access to the page,
-		 * so we go ahead and sense modify status. Otherwise,
-		 * we can avoid I-cache invalidation if the page
-		 * already allowed execution.
-		 */
-		if (managed && pmap_dirty(&origpte))
-			vm_page_dirty(m);
-		else if (pmap_exec(&origpte))
-			icache_inval = FALSE;
-
-		pmap_invalidate_page(va);
-		goto validate;
-	}
-
-	/*
-	 * Mapping has changed, invalidate old range and fall
-	 * through to handle validating new mapping.
-	 */
-	if (opa != ~0UL) {
-		pmap_remove_pte(pmap, pte, va, 0, 0);
-		pmap_enter_vhpt(pte, va);
-	}
-
-	/*
-	 * Enter on the PV list if part of our managed memory.
-	 */
-	if ((m->oflags & VPO_UNMANAGED) == 0) {
-		KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva,
-		    ("pmap_enter: managed mapping within the clean submap"));
-		pmap_insert_entry(pmap, va, m);
-		managed = TRUE;
-	}
-
-	/*
-	 * Increment counters
-	 */
-	pmap->pm_stats.resident_count++;
-	if (wired)
-		pmap->pm_stats.wired_count++;
-
-validate:
-
-	/*
-	 * Now validate mapping with desired protection/wiring. This
-	 * adds the pte to the VHPT if necessary.
-	 */
-	pmap_pte_prot(pmap, pte, prot);
-	pmap_pte_attr(pte, m->md.memattr);
-	pmap_set_pte(pte, va, pa, wired, managed);
-
-	/* Invalidate the I-cache when needed. */
-	if (icache_inval)
-		ia64_sync_icache(va, PAGE_SIZE);
-
-	if ((prot & VM_PROT_WRITE) != 0 && managed)
-		vm_page_aflag_set(m, PGA_WRITEABLE);
-	rw_wunlock(&pvh_global_lock);
-	pmap_switch(oldpmap);
-	PMAP_UNLOCK(pmap);
-}
-
-/*
- * Maps a sequence of resident pages belonging to the same object.
- * The sequence begins with the given page m_start.  This page is
- * mapped at the given virtual address start.  Each subsequent page is
- * mapped at a virtual address that is offset from start by the same
- * amount as the page is offset from m_start within the object.  The
- * last page in the sequence is the page with the largest offset from
- * m_start that can be mapped at a virtual address less than the given
- * virtual address end.  Not every virtual page between start and end
- * is mapped; only those for which a resident page exists with the
- * corresponding offset from m_start are mapped.
- */
-void
-pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end,
-    vm_page_t m_start, vm_prot_t prot)
-{
-	pmap_t oldpmap;
-	vm_page_t m;
-	vm_pindex_t diff, psize;
-
-	CTR6(KTR_PMAP, "%s(%p, %#x, %#x, %p, %#x)", __func__, pmap, start,
-	    end, m_start, prot);
-
-	VM_OBJECT_ASSERT_LOCKED(m_start->object);
-
-	psize = atop(end - start);
-	m = m_start;
-	rw_wlock(&pvh_global_lock);
-	PMAP_LOCK(pmap);
-	oldpmap = pmap_switch(pmap);
-	while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) {
-		pmap_enter_quick_locked(pmap, start + ptoa(diff), m, prot);
-		m = TAILQ_NEXT(m, listq);
-	}
-	rw_wunlock(&pvh_global_lock);
-	pmap_switch(oldpmap);
- 	PMAP_UNLOCK(pmap);
-}
-
-/*
- * this code makes some *MAJOR* assumptions:
- * 1. Current pmap & pmap exists.
- * 2. Not wired.
- * 3. Read access.
- * 4. No page table pages.
- * but is *MUCH* faster than pmap_enter...
- */
-void
-pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot)
-{
-	pmap_t oldpmap;
-
-	CTR5(KTR_PMAP, "%s(%p, %#x, %p, %#x)", __func__, pmap, va, m, prot);
-
-	rw_wlock(&pvh_global_lock);
-	PMAP_LOCK(pmap);
-	oldpmap = pmap_switch(pmap);
-	pmap_enter_quick_locked(pmap, va, m, prot);
-	rw_wunlock(&pvh_global_lock);
-	pmap_switch(oldpmap);
-	PMAP_UNLOCK(pmap);
-}
-
-static void
-pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m,
-    vm_prot_t prot)
-{
-	struct ia64_lpte *pte;
-	boolean_t managed;
-
-	KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva ||
-	    (m->oflags & VPO_UNMANAGED) != 0,
-	    ("pmap_enter_quick_locked: managed mapping within the clean submap"));
-	rw_assert(&pvh_global_lock, RA_WLOCKED);
-	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
-
-	if ((pte = pmap_find_pte(va)) == NULL)
-		return;
-
-	if (!pmap_present(pte)) {
-		/* Enter on the PV list if the page is managed. */
-		if ((m->oflags & VPO_UNMANAGED) == 0) {
-			if (!pmap_try_insert_pv_entry(pmap, va, m)) {
-				pmap_free_pte(pte, va);
-				return;
-			}
-			managed = TRUE;
-		} else
-			managed = FALSE;
-
-		/* Increment counters. */
-		pmap->pm_stats.resident_count++;
-
-		/* Initialise with R/O protection and enter into VHPT. */
-		pmap_enter_vhpt(pte, va);
-		pmap_pte_prot(pmap, pte,
-		    prot & (VM_PROT_READ | VM_PROT_EXECUTE));
-		pmap_pte_attr(pte, m->md.memattr);
-		pmap_set_pte(pte, va, VM_PAGE_TO_PHYS(m), FALSE, managed);
-
-		if (prot & VM_PROT_EXECUTE)
-			ia64_sync_icache(va, PAGE_SIZE);
-	}
-}
-
-/*
- * pmap_object_init_pt preloads the ptes for a given object
- * into the specified pmap.  This eliminates the blast of soft
- * faults on process startup and immediately after an mmap.
- */
-void
-pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object,
-    vm_pindex_t pindex, vm_size_t size)
-{
-
-	CTR6(KTR_PMAP, "%s(%p, %#x, %p, %u, %#x)", __func__, pmap, addr,
-	    object, pindex, size);
-
-	VM_OBJECT_ASSERT_WLOCKED(object);
-	KASSERT(object->type == OBJT_DEVICE || object->type == OBJT_SG,
-	    ("pmap_object_init_pt: non-device object"));
-}
-
-/*
- *	Routine:	pmap_change_wiring
- *	Function:	Change the wiring attribute for a map/virtual-address
- *			pair.
- *	In/out conditions:
- *			The mapping must already exist in the pmap.
- */
-void
-pmap_change_wiring(pmap_t pmap, vm_offset_t va, boolean_t wired)
-{
-	pmap_t oldpmap;
-	struct ia64_lpte *pte;
-
-	CTR4(KTR_PMAP, "%s(%p, %#x, %u)", __func__, pmap, va, wired);
-
-	PMAP_LOCK(pmap);
-	oldpmap = pmap_switch(pmap);
-
-	pte = pmap_find_vhpt(va);
-	KASSERT(pte != NULL, ("pte"));
-	if (wired && !pmap_wired(pte)) {
-		pmap->pm_stats.wired_count++;
-		pmap_set_wired(pte);
-	} else if (!wired && pmap_wired(pte)) {
-		pmap->pm_stats.wired_count--;
-		pmap_clear_wired(pte);
-	}
-
-	pmap_switch(oldpmap);
-	PMAP_UNLOCK(pmap);
-}
-
-/*
- *	Copy the range specified by src_addr/len
- *	from the source map to the range dst_addr/len
- *	in the destination map.
- *
- *	This routine is only advisory and need not do anything.
- */
-void
-pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_va, vm_size_t len,
-    vm_offset_t src_va)
-{
-
-	CTR6(KTR_PMAP, "%s(%p, %p, %#x, %#x, %#x)", __func__, dst_pmap,
-	    src_pmap, dst_va, len, src_va);
-}
-
-/*
- *	pmap_zero_page zeros the specified hardware page by
- *	mapping it into virtual memory and using bzero to clear
- *	its contents.
- */
-void
-pmap_zero_page(vm_page_t m)
-{
-	void *p;
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, m);
-
-	p = (void *)pmap_page_to_va(m);
-	bzero(p, PAGE_SIZE);
-}
-
-/*
- *	pmap_zero_page_area zeros the specified hardware page by
- *	mapping it into virtual memory and using bzero to clear
- *	its contents.
- *
- *	off and size must reside within a single page.
- */
-void
-pmap_zero_page_area(vm_page_t m, int off, int size)
-{
-	char *p;
-
-	CTR4(KTR_PMAP, "%s(%p, %d, %d)", __func__, m, off, size);
-
-	p = (void *)pmap_page_to_va(m);
-	bzero(p + off, size);
-}
-
-/*
- *	pmap_zero_page_idle zeros the specified hardware page by
- *	mapping it into virtual memory and using bzero to clear
- *	its contents.  This is for the vm_idlezero process.
- */
-void
-pmap_zero_page_idle(vm_page_t m)
-{
-	void *p;
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, m);
-
-	p = (void *)pmap_page_to_va(m);
-	bzero(p, PAGE_SIZE);
-}
-
-/*
- *	pmap_copy_page copies the specified (machine independent)
- *	page by mapping the page into virtual memory and using
- *	bcopy to copy the page, one machine dependent page at a
- *	time.
- */
-void
-pmap_copy_page(vm_page_t msrc, vm_page_t mdst)
-{
-	void *dst, *src;
-
-	CTR3(KTR_PMAP, "%s(%p, %p)", __func__, msrc, mdst);
-
-	src = (void *)pmap_page_to_va(msrc);
-	dst = (void *)pmap_page_to_va(mdst);
-	bcopy(src, dst, PAGE_SIZE);
-}
-
-void
-pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset, vm_page_t mb[],
-    vm_offset_t b_offset, int xfersize)
-{
-	void *a_cp, *b_cp;
-	vm_offset_t a_pg_offset, b_pg_offset;
-	int cnt;
-
-	CTR6(KTR_PMAP, "%s(%p, %#x, %p, %#x, %#x)", __func__, ma,
-	    a_offset, mb, b_offset, xfersize);
-
-	while (xfersize > 0) {
-		a_pg_offset = a_offset & PAGE_MASK;
-		cnt = min(xfersize, PAGE_SIZE - a_pg_offset);
-		a_cp = (char *)pmap_page_to_va(ma[a_offset >> PAGE_SHIFT]) +
-		    a_pg_offset;
-		b_pg_offset = b_offset & PAGE_MASK;
-		cnt = min(cnt, PAGE_SIZE - b_pg_offset);
-		b_cp = (char *)pmap_page_to_va(mb[b_offset >> PAGE_SHIFT]) +
-		    b_pg_offset;
-		bcopy(a_cp, b_cp, cnt);
-		a_offset += cnt;
-		b_offset += cnt;
-		xfersize -= cnt;
-	}
-}
-
-/*
- * Returns true if the pmap's pv is one of the first
- * 16 pvs linked to from this page.  This count may
- * be changed upwards or downwards in the future; it
- * is only necessary that true be returned for a small
- * subset of pmaps for proper page aging.
- */
-boolean_t
-pmap_page_exists_quick(pmap_t pmap, vm_page_t m)
-{
-	pv_entry_t pv;
-	int loops = 0;
-	boolean_t rv;
-
-	CTR3(KTR_PMAP, "%s(%p, %p)", __func__, pmap, m);
-
-	KASSERT((m->oflags & VPO_UNMANAGED) == 0,
-	    ("pmap_page_exists_quick: page %p is not managed", m));
-	rv = FALSE;
-	rw_wlock(&pvh_global_lock);
-	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
-		if (PV_PMAP(pv) == pmap) {
-			rv = TRUE;
-			break;
-		}
-		loops++;
-		if (loops >= 16)
-			break;
-	}
-	rw_wunlock(&pvh_global_lock);
-	return (rv);
-}
-
-/*
- *	pmap_page_wired_mappings:
- *
- *	Return the number of managed mappings to the given physical page
- *	that are wired.
- */
-int
-pmap_page_wired_mappings(vm_page_t m)
-{
-	struct ia64_lpte *pte;
-	pmap_t oldpmap, pmap;
-	pv_entry_t pv;
-	int count;
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, m);
-
-	count = 0;
-	if ((m->oflags & VPO_UNMANAGED) != 0)
-		return (count);
-	rw_wlock(&pvh_global_lock);
-	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
-		pmap = PV_PMAP(pv);
-		PMAP_LOCK(pmap);
-		oldpmap = pmap_switch(pmap);
-		pte = pmap_find_vhpt(pv->pv_va);
-		KASSERT(pte != NULL, ("pte"));
-		if (pmap_wired(pte))
-			count++;
-		pmap_switch(oldpmap);
-		PMAP_UNLOCK(pmap);
-	}
-	rw_wunlock(&pvh_global_lock);
-	return (count);
-}
-
-/*
- * Remove all pages from specified address space
- * this aids process exit speeds.  Also, this code
- * is special cased for current process only, but
- * can have the more generic (and slightly slower)
- * mode enabled.  This is much faster than pmap_remove
- * in the case of running down an entire address space.
- */
-void
-pmap_remove_pages(pmap_t pmap)
-{
-	struct pv_chunk *pc, *npc;
-	struct ia64_lpte *pte;
-	pmap_t oldpmap;
-	pv_entry_t pv;
-	vm_offset_t va;
-	vm_page_t m;
-	u_long inuse, bitmask;
-	int allfree, bit, field, idx;
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, pmap);
-
-	rw_wlock(&pvh_global_lock);
-	PMAP_LOCK(pmap);
-	oldpmap = pmap_switch(pmap);
-	TAILQ_FOREACH_SAFE(pc, &pmap->pm_pvchunk, pc_list, npc) {
-		allfree = 1;
-		for (field = 0; field < _NPCM; field++) {
-			inuse = ~pc->pc_map[field] & pc_freemask[field];
-			while (inuse != 0) {
-				bit = ffsl(inuse) - 1;
-				bitmask = 1UL << bit;
-				idx = field * sizeof(inuse) * NBBY + bit;
-				pv = &pc->pc_pventry[idx];
-				inuse &= ~bitmask;
-				va = pv->pv_va;
-				pte = pmap_find_vhpt(va);
-				KASSERT(pte != NULL, ("pte"));
-				if (pmap_wired(pte)) {
-					allfree = 0;
-					continue;
-				}
-				pmap_remove_vhpt(va);
-				pmap_invalidate_page(va);
-				m = PHYS_TO_VM_PAGE(pmap_ppn(pte));
-				if (pmap_dirty(pte))
-					vm_page_dirty(m);
-				pmap_free_pte(pte, va);
-				/* Mark free */
-				PV_STAT(pv_entry_frees++);
-				PV_STAT(pv_entry_spare++);
-				pv_entry_count--;
-				pc->pc_map[field] |= bitmask;
-				pmap->pm_stats.resident_count--;
-				TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
-				if (TAILQ_EMPTY(&m->md.pv_list))
-					vm_page_aflag_clear(m, PGA_WRITEABLE);
-			}
-		}
-		if (allfree) {
-			TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list);
-			free_pv_chunk(pc);
-		}
-	}
-	pmap_switch(oldpmap);
-	PMAP_UNLOCK(pmap);
-	rw_wunlock(&pvh_global_lock);
-}
-
-/*
- *	pmap_ts_referenced:
- *
- *	Return a count of reference bits for a page, clearing those bits.
- *	It is not necessary for every reference bit to be cleared, but it
- *	is necessary that 0 only be returned when there are truly no
- *	reference bits set.
- * 
- *	XXX: The exact number of bits to check and clear is a matter that
- *	should be tested and standardized at some point in the future for
- *	optimal aging of shared pages.
- */
-int
-pmap_ts_referenced(vm_page_t m)
-{
-	struct ia64_lpte *pte;
-	pmap_t oldpmap, pmap;
-	pv_entry_t pv;
-	int count = 0;
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, m);
-
-	KASSERT((m->oflags & VPO_UNMANAGED) == 0,
-	    ("pmap_ts_referenced: page %p is not managed", m));
-	rw_wlock(&pvh_global_lock);
-	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
-		pmap = PV_PMAP(pv);
-		PMAP_LOCK(pmap);
-		oldpmap = pmap_switch(pmap);
-		pte = pmap_find_vhpt(pv->pv_va);
-		KASSERT(pte != NULL, ("pte"));
-		if (pmap_accessed(pte)) {
-			count++;
-			pmap_clear_accessed(pte);
-			pmap_invalidate_page(pv->pv_va);
-		}
-		pmap_switch(oldpmap);
-		PMAP_UNLOCK(pmap);
-	}
-	rw_wunlock(&pvh_global_lock);
-	return (count);
-}
-
-/*
- *	pmap_is_modified:
- *
- *	Return whether or not the specified physical page was modified
- *	in any physical maps.
- */
-boolean_t
-pmap_is_modified(vm_page_t m)
-{
-	struct ia64_lpte *pte;
-	pmap_t oldpmap, pmap;
-	pv_entry_t pv;
-	boolean_t rv;
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, m);
-
-	KASSERT((m->oflags & VPO_UNMANAGED) == 0,
-	    ("pmap_is_modified: page %p is not managed", m));
-	rv = FALSE;
-
-	/*
-	 * If the page is not exclusive busied, then PGA_WRITEABLE cannot be
-	 * concurrently set while the object is locked.  Thus, if PGA_WRITEABLE
-	 * is clear, no PTEs can be dirty.
-	 */
-	VM_OBJECT_ASSERT_WLOCKED(m->object);
-	if (!vm_page_xbusied(m) && (m->aflags & PGA_WRITEABLE) == 0)
-		return (rv);
-	rw_wlock(&pvh_global_lock);
-	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
-		pmap = PV_PMAP(pv);
-		PMAP_LOCK(pmap);
-		oldpmap = pmap_switch(pmap);
-		pte = pmap_find_vhpt(pv->pv_va);
-		pmap_switch(oldpmap);
-		KASSERT(pte != NULL, ("pte"));
-		rv = pmap_dirty(pte) ? TRUE : FALSE;
-		PMAP_UNLOCK(pmap);
-		if (rv)
-			break;
-	}
-	rw_wunlock(&pvh_global_lock);
-	return (rv);
-}
-
-/*
- *	pmap_is_prefaultable:
- *
- *	Return whether or not the specified virtual address is elgible
- *	for prefault.
- */
-boolean_t
-pmap_is_prefaultable(pmap_t pmap, vm_offset_t addr)
-{
-	struct ia64_lpte *pte;
-
-	CTR3(KTR_PMAP, "%s(%p, %#x)", __func__, pmap, addr);
-
-	pte = pmap_find_vhpt(addr);
-	if (pte != NULL && pmap_present(pte))
-		return (FALSE);
-	return (TRUE);
-}
-
-/*
- *	pmap_is_referenced:
- *
- *	Return whether or not the specified physical page was referenced
- *	in any physical maps.
- */
-boolean_t
-pmap_is_referenced(vm_page_t m)
-{
-	struct ia64_lpte *pte;
-	pmap_t oldpmap, pmap;
-	pv_entry_t pv;
-	boolean_t rv;
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, m);
-
-	KASSERT((m->oflags & VPO_UNMANAGED) == 0,
-	    ("pmap_is_referenced: page %p is not managed", m));
-	rv = FALSE;
-	rw_wlock(&pvh_global_lock);
-	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
-		pmap = PV_PMAP(pv);
-		PMAP_LOCK(pmap);
-		oldpmap = pmap_switch(pmap);
-		pte = pmap_find_vhpt(pv->pv_va);
-		pmap_switch(oldpmap);
-		KASSERT(pte != NULL, ("pte"));
-		rv = pmap_accessed(pte) ? TRUE : FALSE;
-		PMAP_UNLOCK(pmap);
-		if (rv)
-			break;
-	}
-	rw_wunlock(&pvh_global_lock);
-	return (rv);
-}
-
-/*
- *	Apply the given advice to the specified range of addresses within the
- *	given pmap.  Depending on the advice, clear the referenced and/or
- *	modified flags in each mapping and set the mapped page's dirty field.
- */
-void
-pmap_advise(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, int advice)
-{
-	struct ia64_lpte *pte;
-	pmap_t oldpmap;
-	vm_page_t m;
-
-	CTR5(KTR_PMAP, "%s(%p, %#x, %#x, %d)", __func__, pmap, sva, eva,
-	    advice);
-
-	PMAP_LOCK(pmap);
-	oldpmap = pmap_switch(pmap);
-	for (; sva < eva; sva += PAGE_SIZE) {
-		/* If page is invalid, skip this page. */
-		pte = pmap_find_vhpt(sva);
-		if (pte == NULL)
-			continue;
-
-		/* If it isn't managed, skip it too. */
-		if (!pmap_managed(pte))
-			continue;
-
-		/* Clear its modified and referenced bits. */
-		if (pmap_dirty(pte)) {
-			if (advice == MADV_DONTNEED) {
-				/*
-				 * Future calls to pmap_is_modified() can be
-				 * avoided by making the page dirty now.
-				 */
-				m = PHYS_TO_VM_PAGE(pmap_ppn(pte));
-				vm_page_dirty(m);
-			}
-			pmap_clear_dirty(pte);
-		} else if (!pmap_accessed(pte))
-			continue;
-		pmap_clear_accessed(pte);
-		pmap_invalidate_page(sva);
-	}
-	pmap_switch(oldpmap);
-	PMAP_UNLOCK(pmap);
-}
-
-/*
- *	Clear the modify bits on the specified physical page.
- */
-void
-pmap_clear_modify(vm_page_t m)
-{
-	struct ia64_lpte *pte;
-	pmap_t oldpmap, pmap;
-	pv_entry_t pv;
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, m);
-
-	KASSERT((m->oflags & VPO_UNMANAGED) == 0,
-	    ("pmap_clear_modify: page %p is not managed", m));
-	VM_OBJECT_ASSERT_WLOCKED(m->object);
-	KASSERT(!vm_page_xbusied(m),
-	    ("pmap_clear_modify: page %p is exclusive busied", m));
-
-	/*
-	 * If the page is not PGA_WRITEABLE, then no PTEs can be modified.
-	 * If the object containing the page is locked and the page is not
-	 * exclusive busied, then PGA_WRITEABLE cannot be concurrently set.
-	 */
-	if ((m->aflags & PGA_WRITEABLE) == 0)
-		return;
-	rw_wlock(&pvh_global_lock);
-	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
-		pmap = PV_PMAP(pv);
-		PMAP_LOCK(pmap);
-		oldpmap = pmap_switch(pmap);
-		pte = pmap_find_vhpt(pv->pv_va);
-		KASSERT(pte != NULL, ("pte"));
-		if (pmap_dirty(pte)) {
-			pmap_clear_dirty(pte);
-			pmap_invalidate_page(pv->pv_va);
-		}
-		pmap_switch(oldpmap);
-		PMAP_UNLOCK(pmap);
-	}
-	rw_wunlock(&pvh_global_lock);
-}
-
-/*
- * Clear the write and modified bits in each of the given page's mappings.
- */
-void
-pmap_remove_write(vm_page_t m)
-{
-	struct ia64_lpte *pte;
-	pmap_t oldpmap, pmap;
-	pv_entry_t pv;
-	vm_prot_t prot;
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, m);
-
-	KASSERT((m->oflags & VPO_UNMANAGED) == 0,
-	    ("pmap_remove_write: page %p is not managed", m));
-
-	/*
-	 * If the page is not exclusive busied, then PGA_WRITEABLE cannot be
-	 * set by another thread while the object is locked.  Thus,
-	 * if PGA_WRITEABLE is clear, no page table entries need updating.
-	 */
-	VM_OBJECT_ASSERT_WLOCKED(m->object);
-	if (!vm_page_xbusied(m) && (m->aflags & PGA_WRITEABLE) == 0)
-		return;
-	rw_wlock(&pvh_global_lock);
-	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
-		pmap = PV_PMAP(pv);
-		PMAP_LOCK(pmap);
-		oldpmap = pmap_switch(pmap);
-		pte = pmap_find_vhpt(pv->pv_va);
-		KASSERT(pte != NULL, ("pte"));
-		prot = pmap_prot(pte);
-		if ((prot & VM_PROT_WRITE) != 0) {
-			if (pmap_dirty(pte)) {
-				vm_page_dirty(m);
-				pmap_clear_dirty(pte);
-			}
-			prot &= ~VM_PROT_WRITE;
-			pmap_pte_prot(pmap, pte, prot);
-			pmap_pte_attr(pte, m->md.memattr);
-			pmap_invalidate_page(pv->pv_va);
-		}
-		pmap_switch(oldpmap);
-		PMAP_UNLOCK(pmap);
-	}
-	vm_page_aflag_clear(m, PGA_WRITEABLE);
-	rw_wunlock(&pvh_global_lock);
-}
-
-vm_offset_t
-pmap_mapdev_priv(vm_paddr_t pa, vm_size_t sz, vm_memattr_t attr)
-{
-	static vm_offset_t last_va = 0;
-	static vm_paddr_t last_pa = ~0UL;
-	static vm_size_t last_sz = 0;
-	struct efi_md *md;
-
-	if (pa == last_pa && sz == last_sz)
-		return (last_va);
-
-	md = efi_md_find(pa);
-	if (md == NULL) {
-		printf("%s: [%#lx..%#lx] not covered by memory descriptor\n",
-		    __func__, pa, pa + sz - 1);
-		return (IA64_PHYS_TO_RR6(pa));
-	}
-
-	if (md->md_type == EFI_MD_TYPE_FREE) {
-		printf("%s: [%#lx..%#lx] is in DRAM\n", __func__, pa,
-		    pa + sz - 1);
-		return (0);
-	}
-
-	last_va = (md->md_attr & EFI_MD_ATTR_WB) ? IA64_PHYS_TO_RR7(pa) :
-	    IA64_PHYS_TO_RR6(pa);
-	last_pa = pa;
-	last_sz = sz;
-	return (last_va);
-}
-
-/*
- * 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_attr(vm_paddr_t pa, vm_size_t sz, vm_memattr_t attr)
-{
-	vm_offset_t va;
-
-	CTR4(KTR_PMAP, "%s(%#x, %#x, %#x)", __func__, pa, sz, attr);
-
-	va = pmap_mapdev_priv(pa, sz, attr);
-	return ((void *)(uintptr_t)va);
-}
-
-/*
- * 'Unmap' a range mapped by pmap_mapdev_attr().
- */
-void
-pmap_unmapdev(vm_offset_t va, vm_size_t size)
-{
-
-	CTR3(KTR_PMAP, "%s(%#x, %#x)", __func__, va, size);
-}
-
-/*
- * Sets the memory attribute for the specified page.
- */
-static void
-pmap_page_set_memattr_1(void *arg)
-{
-	struct ia64_pal_result res;
-	register_t is;
-	uintptr_t pp = (uintptr_t)arg;
-
-	is = intr_disable();
-	res = ia64_call_pal_static(pp, 0, 0, 0);
-	intr_restore(is);
-}
-
-void
-pmap_page_set_memattr(vm_page_t m, vm_memattr_t ma)
-{
-	struct ia64_lpte *pte;
-	pmap_t oldpmap, pmap;
-	pv_entry_t pv;
-	void *va;
-
-	CTR3(KTR_PMAP, "%s(%p, %#x)", __func__, m, ma);
-
-	rw_wlock(&pvh_global_lock);
-	m->md.memattr = ma;
-	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
-		pmap = PV_PMAP(pv);
-		PMAP_LOCK(pmap);
-		oldpmap = pmap_switch(pmap);
-		pte = pmap_find_vhpt(pv->pv_va);
-		KASSERT(pte != NULL, ("pte"));
-		pmap_pte_attr(pte, ma);
-		pmap_invalidate_page(pv->pv_va);
-		pmap_switch(oldpmap);
-		PMAP_UNLOCK(pmap);
-	}
-	rw_wunlock(&pvh_global_lock);
-
-	if (ma == VM_MEMATTR_UNCACHEABLE) {
-#ifdef SMP
-		smp_rendezvous(NULL, pmap_page_set_memattr_1, NULL,
-		    (void *)PAL_PREFETCH_VISIBILITY);
-#else
-		pmap_page_set_memattr_1((void *)PAL_PREFETCH_VISIBILITY);
-#endif
-		va = (void *)pmap_page_to_va(m);
-		critical_enter();
-		cpu_flush_dcache(va, PAGE_SIZE);
-		critical_exit();
-#ifdef SMP
-		smp_rendezvous(NULL, pmap_page_set_memattr_1, NULL,
-		    (void *)PAL_MC_DRAIN);
-#else
-		pmap_page_set_memattr_1((void *)PAL_MC_DRAIN);
-#endif
-	}
-}
-
-/*
- * perform the pmap work for mincore
- */
-int
-pmap_mincore(pmap_t pmap, vm_offset_t addr, vm_paddr_t *locked_pa)
-{
-	pmap_t oldpmap;
-	struct ia64_lpte *pte, tpte;
-	vm_paddr_t pa;
-	int val;
-
-	CTR4(KTR_PMAP, "%s(%p, %#x, %p)", __func__, pmap, addr, locked_pa);
-
-	PMAP_LOCK(pmap);
-retry:
-	oldpmap = pmap_switch(pmap);
-	pte = pmap_find_vhpt(addr);
-	if (pte != NULL) {
-		tpte = *pte;
-		pte = &tpte;
-	}
-	pmap_switch(oldpmap);
-	if (pte == NULL || !pmap_present(pte)) {
-		val = 0;
-		goto out;
-	}
-	val = MINCORE_INCORE;
-	if (pmap_dirty(pte))
-		val |= MINCORE_MODIFIED | MINCORE_MODIFIED_OTHER;
-	if (pmap_accessed(pte))
-		val |= MINCORE_REFERENCED | MINCORE_REFERENCED_OTHER;
-	if ((val & (MINCORE_MODIFIED_OTHER | MINCORE_REFERENCED_OTHER)) !=
-	    (MINCORE_MODIFIED_OTHER | MINCORE_REFERENCED_OTHER) &&
-	    pmap_managed(pte)) {
-		pa = pmap_ppn(pte);
-		/* Ensure that "PHYS_TO_VM_PAGE(pa)->object" doesn't change. */
-		if (vm_page_pa_tryrelock(pmap, pa, locked_pa))
-			goto retry;
-	} else
-out:
-		PA_UNLOCK_COND(*locked_pa);
-	PMAP_UNLOCK(pmap);
-	return (val);
-}
-
-/*
- *
- */
-void
-pmap_activate(struct thread *td)
-{
-
-	CTR2(KTR_PMAP, "%s(%p)", __func__, td);
-
-	pmap_switch(vmspace_pmap(td->td_proc->p_vmspace));
-}
-
-pmap_t
-pmap_switch(pmap_t pm)
-{
-	pmap_t prevpm;
-	int i;
-
-	critical_enter();
-	prevpm = PCPU_GET(md.current_pmap);
-	if (prevpm == pm)
-		goto out;
-	if (pm == NULL) {
-		for (i = 0; i < IA64_VM_MINKERN_REGION; i++) {
-			ia64_set_rr(IA64_RR_BASE(i),
-			    (i << 8)|(PAGE_SHIFT << 2)|1);
-		}
-	} else {
-		for (i = 0; i < IA64_VM_MINKERN_REGION; i++) {
-			ia64_set_rr(IA64_RR_BASE(i),
-			    (pm->pm_rid[i] << 8)|(PAGE_SHIFT << 2)|1);
-		}
-	}
-	PCPU_SET(md.current_pmap, pm);
-	ia64_srlz_d();
-
-out:
-	critical_exit();
-	return (prevpm);
-}
-
-/*
- *
- */
-void
-pmap_sync_icache(pmap_t pm, vm_offset_t va, vm_size_t sz)
-{
-	pmap_t oldpm;
-	struct ia64_lpte *pte;
-	vm_offset_t lim;
-	vm_size_t len;
-
-	CTR4(KTR_PMAP, "%s(%p, %#x, %#x)", __func__, pm, va, sz);
-
-	sz += va & 31;
-	va &= ~31;
-	sz = (sz + 31) & ~31;
-
-	PMAP_LOCK(pm);
-	oldpm = pmap_switch(pm);
-	while (sz > 0) {
-		lim = round_page(va);
-		len = MIN(lim - va, sz);
-		pte = pmap_find_vhpt(va);
-		if (pte != NULL && pmap_present(pte))
-			ia64_sync_icache(va, len);
-		va += len;
-		sz -= len;
-	}
-	pmap_switch(oldpm);
-	PMAP_UNLOCK(pm);
-}
-
-/*
- *	Increase the starting virtual address of the given mapping if a
- *	different alignment might result in more superpage mappings.
- */
-void
-pmap_align_superpage(vm_object_t object, vm_ooffset_t offset,
-    vm_offset_t *addr, vm_size_t size)
-{
-
-	CTR5(KTR_PMAP, "%s(%p, %#x, %p, %#x)", __func__, object, offset, addr,
-	    size);
-}
-
-#include "opt_ddb.h"
-
-#ifdef DDB
-
-#include <ddb/ddb.h>
-
-static const char*	psnames[] = {
-	"1B",	"2B",	"4B",	"8B",
-	"16B",	"32B",	"64B",	"128B",
-	"256B",	"512B",	"1K",	"2K",
-	"4K",	"8K",	"16K",	"32K",
-	"64K",	"128K",	"256K",	"512K",
-	"1M",	"2M",	"4M",	"8M",
-	"16M",	"32M",	"64M",	"128M",
-	"256M",	"512M",	"1G",	"2G"
-};
-
-static void
-print_trs(int type)
-{
-	struct ia64_pal_result res;
-	int i, maxtr;
-	struct {
-		pt_entry_t	pte;
-		uint64_t	itir;
-		uint64_t	ifa;
-		struct ia64_rr	rr;
-	} buf;
-	static const char *manames[] = {
-		"WB",	"bad",	"bad",	"bad",
-		"UC",	"UCE",	"WC",	"NaT",
-	};
-
-	res = ia64_call_pal_static(PAL_VM_SUMMARY, 0, 0, 0);
-	if (res.pal_status != 0) {
-		db_printf("Can't get VM summary\n");
-		return;
-	}
-
-	if (type == 0)
-		maxtr = (res.pal_result[0] >> 40) & 0xff;
-	else
-		maxtr = (res.pal_result[0] >> 32) & 0xff;
-
-	db_printf("V RID    Virtual Page  Physical Page PgSz ED AR PL D A MA  P KEY\n");
-	for (i = 0; i <= maxtr; i++) {
-		bzero(&buf, sizeof(buf));
-		res = ia64_pal_physical(PAL_VM_TR_READ, i, type,
-		    ia64_tpa((uint64_t)&buf));
-		if (!(res.pal_result[0] & 1))
-			buf.pte &= ~PTE_AR_MASK;
-		if (!(res.pal_result[0] & 2))
-			buf.pte &= ~PTE_PL_MASK;
-		if (!(res.pal_result[0] & 4))
-			pmap_clear_dirty(&buf);
-		if (!(res.pal_result[0] & 8))
-			buf.pte &= ~PTE_MA_MASK;
-		db_printf("%d %06x %013lx %013lx %4s %d  %d  %d  %d %d %-3s "
-		    "%d %06x\n", (int)buf.ifa & 1, buf.rr.rr_rid,
-		    buf.ifa >> 12, (buf.pte & PTE_PPN_MASK) >> 12,
-		    psnames[(buf.itir & ITIR_PS_MASK) >> 2],
-		    (buf.pte & PTE_ED) ? 1 : 0,
-		    (int)(buf.pte & PTE_AR_MASK) >> 9,
-		    (int)(buf.pte & PTE_PL_MASK) >> 7,
-		    (pmap_dirty(&buf)) ? 1 : 0,
-		    (pmap_accessed(&buf)) ? 1 : 0,
-		    manames[(buf.pte & PTE_MA_MASK) >> 2],
-		    (pmap_present(&buf)) ? 1 : 0,
-		    (int)((buf.itir & ITIR_KEY_MASK) >> 8));
-	}
-}
-
-DB_COMMAND(itr, db_itr)
-{
-	print_trs(0);
-}
-
-DB_COMMAND(dtr, db_dtr)
-{
-	print_trs(1);
-}
-
-DB_COMMAND(rr, db_rr)
-{
-	int i;
-	uint64_t t;
-	struct ia64_rr rr;
-
-	printf("RR RID    PgSz VE\n");
-	for (i = 0; i < 8; i++) {
-		__asm __volatile ("mov %0=rr[%1]"
-				  : "=r"(t)
-				  : "r"(IA64_RR_BASE(i)));
-		*(uint64_t *) &rr = t;
-		printf("%d  %06x %4s %d\n",
-		       i, rr.rr_rid, psnames[rr.rr_ps], rr.rr_ve);
-	}
-}
-
-DB_COMMAND(thash, db_thash)
-{
-	if (!have_addr)
-		return;
-
-	db_printf("%p\n", (void *) ia64_thash(addr));
-}
-
-DB_COMMAND(ttag, db_ttag)
-{
-	if (!have_addr)
-		return;
-
-	db_printf("0x%lx\n", ia64_ttag(addr));
-}
-
-DB_COMMAND(kpte, db_kpte)
-{
-	struct ia64_lpte *pte;
-
-	if (!have_addr) {
-		db_printf("usage: kpte <kva>\n");
-		return;
-	}
-	if (addr < VM_INIT_KERNEL_ADDRESS) {
-		db_printf("kpte: error: invalid <kva>\n");
-		return;
-	}
-	pte = pmap_find_kpte(addr);
-	db_printf("kpte at %p:\n", pte);
-	db_printf("  pte  =%016lx\n", pte->pte);
-	db_printf("  itir =%016lx\n", pte->itir);
-	db_printf("  tag  =%016lx\n", pte->tag);
-	db_printf("  chain=%016lx\n", pte->chain);
-}
-
-#endif
diff --git a/sys/ia64/ia64/ptrace_machdep.c b/sys/ia64/ia64/ptrace_machdep.c
deleted file mode 100644
index c7c510480494..000000000000
--- a/sys/ia64/ia64/ptrace_machdep.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2003 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/ptrace.h>
-#include <machine/frame.h>
-
-int
-cpu_ptrace(struct thread *td, int req, void *addr, int data)
-{
-	struct trapframe *tf;
-	uint64_t *kstack;
-	int error;
-
-	error = EINVAL;
-	tf = td->td_frame;
-
-	switch (req) {
-	case PT_GETKSTACK:
-		if (data >= 0 && data < (tf->tf_special.ndirty >> 3)) {
-			kstack = (uint64_t*)(td->td_kstack +
-			    (tf->tf_special.bspstore & 0x1ffUL));
-			error = copyout(kstack + data, addr, 8);
-		}
-		break;
-	case PT_SETKSTACK:
-		if (data >= 0 && data < (tf->tf_special.ndirty >> 3)) {
-			kstack = (uint64_t*)(td->td_kstack +
-			    (tf->tf_special.bspstore & 0x1ffUL));
-			error = copyin(addr, kstack + data, 8);
-		}
-		break;
-	}
-
-	return (error);
-}
diff --git a/sys/ia64/ia64/sal.c b/sys/ia64/ia64/sal.c
deleted file mode 100644
index b0fe070d7783..000000000000
--- a/sys/ia64/ia64/sal.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * Copyright (c) 2001 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/efi.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <vm/vm.h>
-#include <vm/vm_kern.h>
-#include <machine/intr.h>
-#include <machine/md_var.h>
-#include <machine/sal.h>
-#include <machine/smp.h>
-
-int ia64_ipi_wakeup;
-
-static struct ia64_fdesc sal_fdesc;
-static sal_entry_t	fake_sal;
-
-extern u_int64_t	ia64_pal_entry;
-sal_entry_t		*ia64_sal_entry = fake_sal;
-
-static struct uuid sal_table = EFI_TABLE_SAL;
-static struct sal_system_table *sal_systbl;
-
-static struct ia64_sal_result
-fake_sal(u_int64_t a1, u_int64_t a2, u_int64_t a3, u_int64_t a4,
-	 u_int64_t a5, u_int64_t a6, u_int64_t a7, u_int64_t a8)
-{
-	struct ia64_sal_result res;
-	res.sal_status = -3;
-	res.sal_result[0] = 0;
-	res.sal_result[1] = 0;
-	res.sal_result[2] = 0;
-	return res;
-}
-
-void
-ia64_sal_init(void)
-{
-	static int sizes[6] = {
-		48, 32, 16, 32, 16, 16
-	};
-	u_int8_t *p;
-	int error, i;
-
-	sal_systbl = efi_get_table(&sal_table);
-	if (sal_systbl == NULL)
-		return;
-
-	if (bcmp(sal_systbl->sal_signature, SAL_SIGNATURE, 4)) {
-		printf("Bad signature for SAL System Table\n");
-		return;
-	}
-
-	p = (u_int8_t *) (sal_systbl + 1);
-	for (i = 0; i < sal_systbl->sal_entry_count; i++) {
-		switch (*p) {
-		case 0: {
-			struct sal_entrypoint_descriptor *dp;
-
-			dp = (struct sal_entrypoint_descriptor*)p;
-			ia64_pal_entry = IA64_PHYS_TO_RR7(dp->sale_pal_proc);
-			if (bootverbose)
-				printf("PAL Proc at 0x%lx\n", ia64_pal_entry);
-			sal_fdesc.func = IA64_PHYS_TO_RR7(dp->sale_sal_proc);
-			sal_fdesc.gp = IA64_PHYS_TO_RR7(dp->sale_sal_gp);
-			if (bootverbose)
-				printf("SAL Proc at 0x%lx, GP at 0x%lx\n",
-				    sal_fdesc.func, sal_fdesc.gp);
-			ia64_sal_entry = (sal_entry_t *) &sal_fdesc;
-			break;
-		}
-		case 5: {
-			struct sal_ap_wakeup_descriptor *dp;
-
-			dp = (struct sal_ap_wakeup_descriptor*)p;
-			if (dp->sale_mechanism != 0) {
-				printf("SAL: unsupported AP wake-up mechanism "
-				    "(%d)\n", dp->sale_mechanism);
-				break;
-			}
-
-			/* Reserve the XIV so that we won't use it. */
-			error = ia64_xiv_reserve(dp->sale_vector,
-			    IA64_XIV_PLAT, NULL);
-			if (error) {
-				printf("SAL: invalid AP wake-up XIV (%#lx)\n",
-				    dp->sale_vector);
-				break;
-			}
-
-			ia64_ipi_wakeup = dp->sale_vector;
-			if (bootverbose)
-				printf("SAL: AP wake-up XIV: %#x\n",
-				    ia64_ipi_wakeup);
-			break;
-		}
-		}
-		p += sizes[*p];
-	}
-}
diff --git a/sys/ia64/ia64/sapic.c b/sys/ia64/ia64/sapic.c
deleted file mode 100644
index 58c342629a36..000000000000
--- a/sys/ia64/ia64/sapic.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/*-
- * Copyright (c) 2001 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 "opt_ddb.h"
-
-#include <sys/param.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/pcpu.h>
-#include <sys/sysctl.h>
-
-#include <machine/intr.h>
-#include <machine/pal.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-
-/*
- * Offsets from the SAPIC base in memory. Most registers are accessed
- * by indexing using the SAPIC_IO_SELECT register.
- */
-#define	SAPIC_IO_SELECT		0x00
-#define	SAPIC_IO_WINDOW		0x10
-#define	SAPIC_APIC_EOI		0x40
-
-/*
- * Indexed registers.
- */
-#define SAPIC_ID		0x00
-#define SAPIC_VERSION		0x01
-#define SAPIC_ARBITRATION_ID	0x02
-#define SAPIC_RTE_BASE		0x10
-
-/* Interrupt polarity. */
-#define	SAPIC_POLARITY_HIGH	0
-#define	SAPIC_POLARITY_LOW	1
-
-/* Interrupt trigger. */
-#define	SAPIC_TRIGGER_EDGE	0
-#define	SAPIC_TRIGGER_LEVEL	1
-
-/* Interrupt delivery mode. */
-#define	SAPIC_DELMODE_FIXED	0
-#define	SAPIC_DELMODE_LOWPRI	1
-#define	SAPIC_DELMODE_PMI	2
-#define	SAPIC_DELMODE_NMI	4
-#define	SAPIC_DELMODE_INIT	5
-#define	SAPIC_DELMODE_EXTINT	7
-
-struct sapic {
-	struct mtx	sa_mtx;
-	uint64_t	sa_registers;	/* virtual address of sapic */
-	u_int		sa_id;		/* I/O SAPIC Id */
-	u_int		sa_base;	/* ACPI vector base */
-	u_int		sa_limit;	/* last ACPI vector handled here */
-};
-
-struct sapic_rte {
-	uint64_t	rte_vector		:8;
-	uint64_t	rte_delivery_mode	:3;
-	uint64_t	rte_destination_mode	:1;
-	uint64_t	rte_delivery_status	:1;
-	uint64_t	rte_polarity		:1;
-	uint64_t	rte_rirr		:1;
-	uint64_t	rte_trigger_mode	:1;
-	uint64_t	rte_mask		:1;
-	uint64_t	rte_flushen		:1;
-	uint64_t	rte_reserved		:30;
-	uint64_t	rte_destination_eid	:8;
-	uint64_t	rte_destination_id	:8;
-};
-
-static MALLOC_DEFINE(M_SAPIC, "sapic", "I/O SAPIC devices");
-
-struct sapic *ia64_sapics[16];		/* XXX make this resizable */
-int ia64_sapic_count;
-
-static int sysctl_machdep_apic(SYSCTL_HANDLER_ARGS);
-
-SYSCTL_OID(_machdep, OID_AUTO, apic, CTLTYPE_STRING|CTLFLAG_RD,
-    NULL, 0, sysctl_machdep_apic, "A", "(x)APIC redirection table entries");
-
-static __inline uint32_t
-sapic_read(struct sapic *sa, int which)
-{
-	uint32_t value;
-
-	ia64_st4((void *)(sa->sa_registers + SAPIC_IO_SELECT), which);
-	ia64_mf_a();
-	value = ia64_ld4((void *)(sa->sa_registers + SAPIC_IO_WINDOW));
-	return (value);
-}
-
-static __inline void
-sapic_write(struct sapic *sa, int which, uint32_t value)
-{
-
-	ia64_st4((void *)(sa->sa_registers + SAPIC_IO_SELECT), which);
-	ia64_mf_a();
-	ia64_st4((void *)(sa->sa_registers + SAPIC_IO_WINDOW), value);
-	ia64_mf_a();
-}
-
-static __inline void
-sapic_read_rte(struct sapic *sa, int which, struct sapic_rte *rte)
-{
-	uint32_t *p = (uint32_t *) rte;
-
-	p[0] = sapic_read(sa, SAPIC_RTE_BASE + 2 * which);
-	p[1] = sapic_read(sa, SAPIC_RTE_BASE + 2 * which + 1);
-}
-
-static __inline void
-sapic_write_rte(struct sapic *sa, int which, struct sapic_rte *rte)
-{
-	uint32_t *p = (uint32_t *) rte;
-
-	sapic_write(sa, SAPIC_RTE_BASE + 2 * which, p[0]);
-	sapic_write(sa, SAPIC_RTE_BASE + 2 * which + 1, p[1]);
-}
-
-struct sapic *
-sapic_lookup(u_int irq, u_int *vecp)
-{
-	struct sapic_rte rte;
-	struct sapic *sa;
-	int i;
-
-	for (i = 0; i < ia64_sapic_count; i++) {
-		sa = ia64_sapics[i];
-		if (irq >= sa->sa_base && irq <= sa->sa_limit) {
-			if (vecp != NULL) {
-				mtx_lock_spin(&sa->sa_mtx);
-				sapic_read_rte(sa, irq - sa->sa_base, &rte);
-				mtx_unlock_spin(&sa->sa_mtx);
-				*vecp = rte.rte_vector;
-			}
-			return (sa);
-		}
-	}
-
-	return (NULL);
-}
-
-
-int
-sapic_bind_intr(u_int irq, struct pcpu *pc)
-{
-	struct sapic_rte rte;
-	struct sapic *sa;
-
-	sa = sapic_lookup(irq, NULL);
-	if (sa == NULL)
-		return (EINVAL);
-
-	mtx_lock_spin(&sa->sa_mtx);
-	sapic_read_rte(sa, irq - sa->sa_base, &rte);
-	rte.rte_destination_id = (pc->pc_md.lid >> 24) & 255;
-	rte.rte_destination_eid = (pc->pc_md.lid >> 16) & 255;
-	rte.rte_delivery_mode = SAPIC_DELMODE_FIXED;
-	sapic_write_rte(sa, irq - sa->sa_base, &rte);
-	mtx_unlock_spin(&sa->sa_mtx);
-	return (0);
-}
-
-int
-sapic_config_intr(u_int irq, enum intr_trigger trig, enum intr_polarity pol)
-{
-	struct sapic_rte rte;
-	struct sapic *sa;
-
-	sa = sapic_lookup(irq, NULL);
-	if (sa == NULL)
-		return (EINVAL);
-
-	mtx_lock_spin(&sa->sa_mtx);
-	sapic_read_rte(sa, irq - sa->sa_base, &rte);
-	if (trig != INTR_TRIGGER_CONFORM)
-		rte.rte_trigger_mode = (trig == INTR_TRIGGER_EDGE) ?
-		    SAPIC_TRIGGER_EDGE : SAPIC_TRIGGER_LEVEL;
-	else
-		rte.rte_trigger_mode = (irq < 16) ? SAPIC_TRIGGER_EDGE :
-		    SAPIC_TRIGGER_LEVEL;
-	if (pol != INTR_POLARITY_CONFORM)
-		rte.rte_polarity = (pol == INTR_POLARITY_HIGH) ?
-		    SAPIC_POLARITY_HIGH : SAPIC_POLARITY_LOW;
-	else
-		rte.rte_polarity = (irq < 16) ? SAPIC_POLARITY_HIGH :
-		    SAPIC_POLARITY_LOW;
-	sapic_write_rte(sa, irq - sa->sa_base, &rte);
-	mtx_unlock_spin(&sa->sa_mtx);
-	return (0);
-}
-
-struct sapic *
-sapic_create(u_int id, u_int base, uint64_t address)
-{
-	struct sapic_rte rte;
-	struct sapic *sa;
-	u_int i, max;
-
-	sa = malloc(sizeof(struct sapic), M_SAPIC, M_ZERO | M_NOWAIT);
-	if (sa == NULL)
-		return (NULL);
-
-	sa->sa_id = id;
-	sa->sa_base = base;
-	sa->sa_registers = (uintptr_t)pmap_mapdev(address, 1048576);
-
-	mtx_init(&sa->sa_mtx, "I/O SAPIC lock", NULL, MTX_SPIN);
-
-	max = (sapic_read(sa, SAPIC_VERSION) >> 16) & 0xff;
-	sa->sa_limit = base + max;
-
-	ia64_sapics[ia64_sapic_count++] = sa;
-
-	/*
-	 * Initialize all RTEs with a default trigger mode and polarity.
-	 * This may be changed later by calling sapic_config_intr(). We
-	 * mask all interrupts by default.
-	 */
-	bzero(&rte, sizeof(rte));
-	rte.rte_mask = 1;
-	for (i = base; i <= sa->sa_limit; i++) {
-		rte.rte_trigger_mode = (i < 16) ? SAPIC_TRIGGER_EDGE :
-		    SAPIC_TRIGGER_LEVEL;
-		rte.rte_polarity = (i < 16) ? SAPIC_POLARITY_HIGH :
-		    SAPIC_POLARITY_LOW;
-		sapic_write_rte(sa, i - base, &rte);
-	}
-
-	return (sa);
-}
-
-int
-sapic_enable(struct sapic *sa, u_int irq, u_int vector)
-{
-	struct sapic_rte rte;
-	uint64_t lid = ia64_get_lid();
-
-	mtx_lock_spin(&sa->sa_mtx);
-	sapic_read_rte(sa, irq - sa->sa_base, &rte);
-	rte.rte_destination_id = (lid >> 24) & 255;
-	rte.rte_destination_eid = (lid >> 16) & 255;
-	rte.rte_delivery_mode = SAPIC_DELMODE_FIXED;
-	rte.rte_vector = vector;
-	rte.rte_mask = 0;
-	sapic_write_rte(sa, irq - sa->sa_base, &rte);
-	mtx_unlock_spin(&sa->sa_mtx);
-	return (0);
-}
-
-void
-sapic_eoi(struct sapic *sa, u_int vector)
-{
-
-	ia64_st4((void *)(sa->sa_registers + SAPIC_APIC_EOI), vector);
-	ia64_mf_a();
-}
-
-/* Expected to be called with interrupts disabled. */
-void
-sapic_mask(struct sapic *sa, u_int irq)
-{
-	struct sapic_rte rte;
-
-	mtx_lock_spin(&sa->sa_mtx);
-	sapic_read_rte(sa, irq - sa->sa_base, &rte);
-	rte.rte_mask = 1;
-	sapic_write_rte(sa, irq - sa->sa_base, &rte);
-	mtx_unlock_spin(&sa->sa_mtx);
-}
-
-/* Expected to be called with interrupts disabled. */
-void
-sapic_unmask(struct sapic *sa, u_int irq)
-{
-	struct sapic_rte rte;
-
-	mtx_lock_spin(&sa->sa_mtx);
-	sapic_read_rte(sa, irq - sa->sa_base, &rte);
-	rte.rte_mask = 0;
-	sapic_write_rte(sa, irq - sa->sa_base, &rte);
-	mtx_unlock_spin(&sa->sa_mtx);
-}
-
-static int
-sysctl_machdep_apic(SYSCTL_HANDLER_ARGS)
-{
-	char buf[80];
-	struct sapic_rte rte;
-	struct sapic *sa;
-	int apic, count, error, index, len;
-
-	len = sprintf(buf, "\n    APIC Idx: Id,EId : RTE\n");
-	error = SYSCTL_OUT(req, buf, len);
-	if (error)
-		return (error);
-
-	for (apic = 0; apic < ia64_sapic_count; apic++) {
-		sa = ia64_sapics[apic];
-		count = sa->sa_limit - sa->sa_base + 1;
-		for (index = 0; index < count; index++) {
-			mtx_lock_spin(&sa->sa_mtx);
-			sapic_read_rte(sa, index, &rte);
-			mtx_unlock_spin(&sa->sa_mtx);
-			if (rte.rte_vector == 0)
-				continue;
-			len = sprintf(buf,
-    "    0x%02x %3d: (%02x,%02x): %3d %d %d %s %s %s %s %s\n",
-			    sa->sa_id, index,
-			    rte.rte_destination_id, rte.rte_destination_eid,
-			    rte.rte_vector, rte.rte_delivery_mode,
-			    rte.rte_destination_mode,
-			    rte.rte_delivery_status ? "DS" : "  ",
-			    rte.rte_polarity ? "low-active " : "high-active",
-			    rte.rte_rirr ? "RIRR" : "    ",
-			    rte.rte_trigger_mode ? "level" : "edge ",
-			    rte.rte_flushen ? "F" : " ");
-			error = SYSCTL_OUT(req, buf, len);
-			if (error)
-				return (error);
-		}
-	}
-
-	return (0);
-}
-
-#ifdef DDB
-
-#include <ddb/ddb.h>
-
-void
-sapic_print(struct sapic *sa, u_int irq)
-{
-	struct sapic_rte rte;
-
-	db_printf("sapic=%u, irq=%u: ", sa->sa_id, irq);
-	sapic_read_rte(sa, irq - sa->sa_base, &rte);
-	db_printf("%3d %x->%x:%x %d %s %s %s %s %s %s\n", rte.rte_vector,
-	    rte.rte_delivery_mode,
-	    rte.rte_destination_id, rte.rte_destination_eid,
-	    rte.rte_destination_mode,
-	    rte.rte_delivery_status ? "DS" : "  ",
-	    rte.rte_polarity ? "low-active " : "high-active",
-	    rte.rte_rirr ? "RIRR" : "    ",
-	    rte.rte_trigger_mode ? "level" : "edge ",
-	    rte.rte_flushen ? "F" : " ",
-	    rte.rte_mask ? "(masked)" : "");
-}
-
-#endif
diff --git a/sys/ia64/ia64/setjmp.S b/sys/ia64/ia64/setjmp.S
deleted file mode 100644
index 82d02194e238..000000000000
--- a/sys/ia64/ia64/setjmp.S
+++ /dev/null
@@ -1,349 +0,0 @@
-// $FreeBSD$
-
-//-
-// Copyright (c) 1999, 2000
-// Intel Corporation.
-// All rights reserved.
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-// 
-// 1. Redistributions of source code must retain the above copyright
-//    notice, this list of conditions and the following disclaimer.
-// 
-// 2. Redistributions in binary form must reproduce the above copyright
-//   notice, this list of conditions and the following disclaimer in the
-//    documentation and/or other materials provided with the distribution.
-// 
-// 3. All advertising materials mentioning features or use of this software
-//    must display the following acknowledgement:
-// 
-//    This product includes software developed by Intel Corporation and
-//    its contributors.
-// 
-// 4. Neither the name of Intel Corporation or its contributors may be
-//    used to endorse or promote products derived from this software
-//    without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION AND CONTRIBUTORS ``AS IS''
-// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-// ARE DISCLAIMED.  IN NO EVENT SHALL INTEL CORPORATION OR CONTRIBUTORS BE
-// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-// THE POSSIBILITY OF SUCH DAMAGE.
-// 
-//
-
-//
-// Module Name:
-//
-//  setjmp.s
-//
-// Abstract:
-//
-//  Contains an implementation of setjmp and longjmp for the
-//  IA-64 architecture.
-
-    .file   "setjmp.s"
-
-#include    <machine/asm.h>
-#include    <machine/setjmp.h>
-
-// int setjmp(struct jmp_buffer *)
-//
-//  Setup a non-local goto.
-//
-// Description:
-//
-//  SetJump stores the current register set in the area pointed to
-//  by "save".  It returns zero.  Subsequent calls to "LongJump" will
-//  restore the registers and return non-zero to the same location.
-//
-// On entry, r32 contains the pointer to the jmp_buffer
-//
-
-ENTRY(setjmp, 1)
-    //
-    //  Make sure buffer is aligned at 16byte boundary
-    //
-    add     r10 = -0x10,r0  ;;  // mask the lower 4 bits
-    and     r32 = r32, r10;; 
-    add     r32 = 0x10, r32;;   // move to next 16 byte boundary
-
-    add     r10 = J_PREDS, r32  // skip Unats & pfs save area
-    add     r11 = J_BSP, r32
-    //
-    //  save immediate context
-    //
-    mov     r2 = ar.bsp         // save backing store pointer
-    mov     r3 = pr             // save predicates
-    flushrs
-    ;;
-    //
-    // save user Unat register
-    //
-    mov     r16 = ar.lc         // save loop count register
-    mov     r14 = ar.unat       // save user Unat register
-
-    st8     [r10] = r3, J_LC-J_PREDS
-    st8     [r11] = r2, J_R4-J_BSP
-    ;;
-    st8     [r10] = r16, J_R5-J_LC
-    st8     [r32] = r14, J_NATS // Note: Unat at the 
-                                // beginning of the save area
-    mov     r15 = ar.pfs
-    ;;
-    //
-    //  save preserved general registers & NaT's
-    //
-    st8.spill   [r11] = r4, J_R6-J_R4
-    ;;
-    st8.spill   [r10] = r5, J_R7-J_R5 
-    ;;
-    st8.spill   [r11] = r6, J_SP-J_R6
-    ;;
-    st8.spill   [r10] = r7, J_F3-J_R7 
-    ;;
-    st8.spill   [r11] = sp, J_F2-J_SP
-    ;;
-    //
-    // save spilled Unat and pfs registers
-    //
-    mov     r2 = ar.unat        // save Unat register after spill
-    ;;
-    st8     [r32] = r2, J_PFS-J_NATS    // save unat for spilled regs
-    ;;
-    st8     [r32] = r15         // save pfs
-    //
-    //  save floating registers 
-    //
-    stf.spill   [r11] = f2, J_F4-J_F2
-    stf.spill   [r10] = f3, J_F5-J_F3 
-    ;;
-    stf.spill   [r11] = f4, J_F16-J_F4
-    stf.spill   [r10] = f5, J_F17-J_F5 
-    ;;
-    stf.spill   [r11] = f16, J_F18-J_F16
-    stf.spill   [r10] = f17, J_F19-J_F17 
-    ;;
-    stf.spill   [r11] = f18, J_F20-J_F18
-    stf.spill   [r10] = f19, J_F21-J_F19 
-    ;;
-    stf.spill   [r11] = f20, J_F22-J_F20
-    stf.spill   [r10] = f21, J_F23-J_F21 
-    ;;
-    stf.spill   [r11] = f22, J_F24-J_F22
-    stf.spill   [r10] = f23, J_F25-J_F23 
-    ;;
-    stf.spill   [r11] = f24, J_F26-J_F24
-    stf.spill   [r10] = f25, J_F27-J_F25 
-    ;;
-    stf.spill   [r11] = f26, J_F28-J_F26
-    stf.spill   [r10] = f27, J_F29-J_F27 
-    ;;
-    stf.spill   [r11] = f28, J_F30-J_F28
-    stf.spill   [r10] = f29, J_F31-J_F29 
-    ;;
-    stf.spill   [r11] = f30, J_FPSR-J_F30
-    stf.spill   [r10] = f31, J_B0-J_F31     // size of f31 + fpsr
-    //
-    // save FPSR register & branch registers
-    //
-    mov     r2 = ar.fpsr    // save fpsr register
-    mov     r3 = b0 
-    ;;
-    st8     [r11] = r2, J_B1-J_FPSR
-    st8     [r10] = r3, J_B2-J_B0
-    mov     r2 = b1
-    mov     r3 = b2 
-    ;;
-    st8     [r11] = r2, J_B3-J_B1
-    st8     [r10] = r3, J_B4-J_B2
-    mov     r2 = b3
-    mov     r3 = b4 
-    ;;
-    st8     [r11] = r2, J_B5-J_B3
-    st8     [r10] = r3
-    mov     r2 = b5 
-    ;;
-    st8     [r11] = r2
-    ;;
-    //
-    // return
-    //
-    mov     r8 = r0         // return 0 from setjmp
-    mov     ar.unat = r14   // restore unat
-    br.ret.sptk b0
-
-END(setjmp)
-
-
-//
-// void longjmp(struct jmp_buffer *, int val)
-//
-//  Perform a non-local goto.
-//
-// Description:
-//
-//  LongJump initializes the register set to the values saved by a
-//  previous 'SetJump' and jumps to the return location saved by that
-//  'SetJump'.  This has the effect of unwinding the stack and returning
-//  for a second time to the 'SetJump'.
-//
-
-ENTRY(longjmp, 2)
-    //
-    //  Make sure buffer is aligned at 16byte boundary
-    //
-    add     r10 = -0x10,r0  ;;  // mask the lower 4 bits
-    and     r32 = r32, r10;; 
-    add     r32 = 0x10, r32;;   // move to next 16 byte boundary
-
-    //
-    // caching the return value as we do invala in the end
-    //
-    mov     r8 = r33            // return value
-
-    //
-    //  get immediate context
-    //
-    mov     r14 = ar.rsc        // get user RSC conf 
-    add     r10 = J_PFS, r32    // get address of pfs
-    add     r11 = J_NATS, r32
-    ;;
-    ld8     r15 = [r10], J_BSP-J_PFS    // get pfs
-    ld8     r2 = [r11], J_LC-J_NATS     // get unat for spilled regs
-    ;;
-    mov     ar.unat = r2
-    ;;
-    ld8     r16 = [r10], J_PREDS-J_BSP  // get backing store pointer
-    mov     ar.rsc = r0         // put RSE in enforced lazy 
-    mov     ar.pfs = r15
-    ;;
-    
-    //
-    // while returning from longjmp the BSPSTORE and BSP needs to be
-    // same and discard all the registers allocated after we did
-    // setjmp. Also, we need to generate the RNAT register since we
-    // did not flushed the RSE on setjmp.
-    //
-    mov     r17 = ar.bspstore   // get current BSPSTORE
-    ;;
-    cmp.ltu p6,p7 = r17, r16    // is it less than BSP of 
-(p6)    br.spnt.few .flush_rse
-    mov     r19 = ar.rnat       // get current RNAT
-    ;;
-    loadrs                      // invalidate dirty regs
-    br.sptk.many    .restore_rnat       // restore RNAT
-
-.flush_rse:
-    flushrs
-    ;;
-    mov     r19 = ar.rnat       // get current RNAT
-    mov     r17 = r16           // current BSPSTORE
-    ;;
-.restore_rnat:
-    //
-    // check if RNAT is saved between saved BSP and curr BSPSTORE
-    //
-    mov     r18 = 0x3f
-    ;; 
-    dep     r18 = r18,r16,3,6   // get RNAT address
-    ;;
-    cmp.ltu p8,p9 = r18, r17    // RNAT saved on RSE
-    ;;
-(p8)    ld8     r19 = [r18]     // get RNAT from RSE
-    ;;
-    mov     ar.bspstore = r16   // set new BSPSTORE 
-    ;;
-    mov     ar.rnat = r19       // restore RNAT
-    mov     ar.rsc = r14        // restore RSC conf
-
-
-    ld8     r3 = [r11], J_R4-J_LC       // get lc register
-    ld8     r2 = [r10], J_R5-J_PREDS    // get predicates
-    ;;
-    mov     pr = r2, -1
-    mov     ar.lc = r3
-    //
-    //  restore preserved general registers & NaT's
-    //
-    ld8.fill    r4 = [r11], J_R6-J_R4
-    ;;
-    ld8.fill    r5 = [r10], J_R7-J_R5 
-    ld8.fill    r6 = [r11], J_SP-J_R6
-    ;;
-    ld8.fill    r7 = [r10], J_F2-J_R7
-    ld8.fill    sp = [r11], J_F3-J_SP
-    ;;
-    //
-    //  restore floating registers 
-    //
-    ldf.fill    f2 = [r10], J_F4-J_F2
-    ldf.fill    f3 = [r11], J_F5-J_F3 
-    ;;
-    ldf.fill    f4 = [r10], J_F16-J_F4
-    ldf.fill    f5 = [r11], J_F17-J_F5 
-    ;;
-    ldf.fill    f16 = [r10], J_F18-J_F16
-    ldf.fill    f17 = [r11], J_F19-J_F17
-    ;;
-    ldf.fill    f18 = [r10], J_F20-J_F18
-    ldf.fill    f19 = [r11], J_F21-J_F19
-    ;;
-    ldf.fill    f20 = [r10], J_F22-J_F20
-    ldf.fill    f21 = [r11], J_F23-J_F21
-    ;;
-    ldf.fill    f22 = [r10], J_F24-J_F22
-    ldf.fill    f23 = [r11], J_F25-J_F23 
-    ;;
-    ldf.fill    f24 = [r10], J_F26-J_F24
-    ldf.fill    f25 = [r11], J_F27-J_F25
-    ;;
-    ldf.fill    f26 = [r10], J_F28-J_F26
-    ldf.fill    f27 = [r11], J_F29-J_F27
-    ;;
-    ldf.fill    f28 = [r10], J_F30-J_F28
-    ldf.fill    f29 = [r11], J_F31-J_F29 
-    ;;
-    ldf.fill    f30 = [r10], J_FPSR-J_F30
-    ldf.fill    f31 = [r11], J_B0-J_F31 ;;
-
-    //
-    // restore branch registers and fpsr
-    //
-    ld8     r16 = [r10], J_B1-J_FPSR    // get fpsr
-    ld8     r17 = [r11], J_B2-J_B0      // get return pointer
-    ;;
-    mov     ar.fpsr = r16
-    mov     b0 = r17
-    ld8     r2 = [r10], J_B3-J_B1
-    ld8     r3 = [r11], J_B4-J_B2
-    ;;
-    mov     b1 = r2
-    mov     b2 = r3
-    ld8     r2 = [r10], J_B5-J_B3
-    ld8     r3 = [r11]
-    ;;
-    mov     b3 = r2
-    mov     b4 = r3 
-    ld8     r2 = [r10]
-    ld8     r21 = [r32]         // get user unat
-    ;;
-    mov     b5 = r2
-    mov     ar.unat = r21
-
-    //
-    // invalidate ALAT
-    //
-    invala ;;
-
-    br.ret.sptk b0
-
-END(longjmp)
diff --git a/sys/ia64/ia64/stack_machdep.c b/sys/ia64/ia64/stack_machdep.c
deleted file mode 100644
index 5e513ea73af7..000000000000
--- a/sys/ia64/ia64/stack_machdep.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 2005 Antoine Brodin
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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/proc.h>
-#include <sys/stack.h>
-
-void
-stack_save_td(struct stack *st, struct thread *td)
-{
-
-	if (TD_IS_SWAPPED(td))
-		panic("stack_save_td: swapped");
-	if (TD_IS_RUNNING(td))
-		panic("stack_save_td: running");
-
-	stack_zero(st);
-}
-
-void
-stack_save(struct stack *st)
-{
-
-	stack_zero(st);
-	/*
-	 * Nothing for now.
-	 * Is libuwx reentrant?
-	 * Can unw_create* sleep?
-	 */
-}
diff --git a/sys/ia64/ia64/support.S b/sys/ia64/ia64/support.S
deleted file mode 100644
index 46e5972cbe6c..000000000000
--- a/sys/ia64/ia64/support.S
+++ /dev/null
@@ -1,843 +0,0 @@
-/*-
- * Copyright (c) 1998 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$
- */
-/*-
- * 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 <machine/asm.h>
-#include <machine/ia64_cpu.h>
-#include <assym.s>
-
-	.text
-
-ENTRY(fusufault, 0)
-{	.mib
-	st8.rel		[r15]=r0		// Clear onfault.
-	add		ret0=-1,r0
-	br.ret.sptk	rp
-	;;
-}
-END(fusufault)
-
-/*
- * casuword(u_long *p, u_long old, u_long new)
- *	Perform a compare-exchange in user space.
- */
-ENTRY(casuword, 3)
-{	.mlx
-	ld8.acq		r15=[r13]		// r15 = curthread
-	movl		r14=VM_MAXUSER_ADDRESS
-	;;
-}
-{	.mib
-	add		r15=TD_PCB,r15
-	cmp.geu		p6,p0=in0,r14
-(p6)	br.dpnt.few	1f
-	;;
-}
-{	.mlx
-	ld8		r15=[r15]		// r15 = PCB
-	movl		r14=fusufault
-	;;
-}
-{	.mmi
-	mov		ar.ccv=in1
-	add		r15=PCB_ONFAULT,r15
-	nop		0
-	;;
-}
-{	.mmi
-	st8		[r15]=r14		// Set onfault
-	;;
-	cmpxchg8.rel	ret0=[in0],in2,ar.ccv
-	nop		0
-	;;
-}
-{	.mib
-	st8.rel		[r15]=r0		// Clear onfault
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-1:
-{	.mib
-	add		ret0=-1,r0
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-END(casuword)
-
-/*
- * casuword32(uint32_t *p, uint32_t old, uint32_t new)
- *	Perform a 32-bit compare-exchange in user space.
- */
-ENTRY(casuword32, 3)
-{	.mlx
-	movl		r14=VM_MAXUSER_ADDRESS
-	;;
-}
-{	.mib
-	ld8.acq		r15=[r13]		// r15 = curthread
-	cmp.geu		p6,p0=in0,r14
-(p6)	br.dpnt.few	1f
-	;;
-}
-{	.mlx
-	add		r15=TD_PCB,r15
-	movl		r14=fusufault
-	;;
-}
-{	.mmi
-	ld8		r15=[r15]		// r15 = PCB
-	;;
-	mov		ar.ccv=in1
-	add		r15=PCB_ONFAULT,r15
-	;;
-}
-{	.mmi
-	st8		[r15]=r14		// Set onfault
-	;;
-	cmpxchg4.rel	ret0=[in0],in2,ar.ccv
-	nop		0
-	;;
-}
-{	.mib
-	st8.rel		[r15]=r0		// Clear onfault
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-1:
-{	.mib
-	add		ret0=-1,r0
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-END(casuword32)
-
-/*
- * subyte(void *addr, int byte)
- * suword16(void *addr, int word)
- * suword32(void *addr, int word)
- * suword64|suword(void *addr, long word)
- *	Store in user space
- */
-
-ENTRY(subyte, 2)
-{	.mlx
-	movl		r14=VM_MAXUSER_ADDRESS
-	;;
-}
-{	.mib
-	ld8.acq		r15=[r13]		// r15 = curthread
-	cmp.geu		p6,p0=in0,r14
-(p6)	br.dpnt.few	1f
-	;;
-}
-{	.mlx
-	add		r15=TD_PCB,r15
-	movl		r14=fusufault
-	;;
-}
-{	.mmi
-	ld8		r15=[r15]		// r15 = PCB
-	;;
-	nop		0
-	add		r15=PCB_ONFAULT,r15
-	;;
-}
-{	.mmi
-	st8		[r15]=r14		// Set onfault
-	;;
-	st1.rel		[in0]=in1
-	nop		0
-	;;
-}
-{	.mib
-	st8.rel		[r15]=r0		// Clear onfault
-	mov		ret0=r0
-	br.ret.sptk	rp
-	;;
-}
-1:
-{	.mib
-	add		ret0=-1,r0
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-END(subyte)
-
-ENTRY(suword16, 2)
-{	.mlx
-	movl		r14=VM_MAXUSER_ADDRESS
-	;;
-}
-{	.mib
-	ld8.acq		r15=[r13]		// r15 = curthread
-	cmp.geu		p6,p0=in0,r14
-(p6)	br.dpnt.few	1f
-	;;
-}
-{	.mlx
-	add		r15=TD_PCB,r15
-	movl		r14=fusufault
-	;;
-}
-{	.mmi
-	ld8		r15=[r15]		// r15 = PCB
-	;;
-	nop		0
-	add		r15=PCB_ONFAULT,r15
-	;;
-}
-{	.mmi
-	st8		[r15]=r14		// Set onfault
-	;;
-	st2.rel		[in0]=in1
-	nop		0
-	;;
-}
-{	.mib
-	st8.rel		[r15]=r0		// Clear onfault
-	mov		ret0=r0
-	br.ret.sptk	rp
-	;;
-}
-1:
-{	.mib
-	add		ret0=-1,r0
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-END(suword16)
-
-ENTRY(suword32, 2)
-{	.mlx
-	movl		r14=VM_MAXUSER_ADDRESS
-	;;
-}
-{	.mib
-	ld8.acq		r15=[r13]		// r15 = curthread
-	cmp.geu		p6,p0=in0,r14
-(p6)	br.dpnt.few	1f
-	;;
-}
-{	.mlx
-	add		r15=TD_PCB,r15
-	movl		r14=fusufault
-	;;
-}
-{	.mmi
-	ld8		r15=[r15]		// r15 = PCB
-	;;
-	nop		0
-	add		r15=PCB_ONFAULT,r15
-	;;
-}
-{	.mmi
-	st8		[r15]=r14		// Set onfault
-	;;
-	st4.rel		[in0]=in1
-	nop		0
-	;;
-}
-{	.mib
-	st8.rel		[r15]=r0		// Clear onfault
-	mov		ret0=r0
-	br.ret.sptk	rp
-	;;
-}
-1:
-{	.mib
-	add		ret0=-1,r0
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-END(suword32)
-
-ENTRY(suword64, 2)
-XENTRY(suword)
-{	.mlx
-	movl		r14=VM_MAXUSER_ADDRESS
-	;;
-}
-{	.mib
-	ld8.acq		r15=[r13]		// r15 = curthread
-	cmp.geu		p6,p0=in0,r14
-(p6)	br.dpnt.few	1f
-	;;
-}
-{	.mlx
-	add		r15=TD_PCB,r15
-	movl		r14=fusufault
-	;;
-}
-{	.mmi
-	ld8		r15=[r15]		// r15 = PCB
-	;;
-	nop		0
-	add		r15=PCB_ONFAULT,r15
-	;;
-}
-{	.mmi
-	st8		[r15]=r14		// Set onfault
-	;;
-	st8.rel		[in0]=in1
-	nop		0
-	;;
-}
-{	.mib
-	st8.rel		[r15]=r0		// Clear onfault
-	mov		ret0=r0
-	br.ret.sptk	rp
-	;;
-}
-1:
-{	.mib
-	add		ret0=-1,r0
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-END(suword64)
-
-/*
- * fubyte(void *addr, int byte)
- * fuword16(void *addr, int word)
- * fuword32(void *addr, int word)
- * fuword64|fuword(void *addr, long word)
- *	Fetch from user space
- */
-
-ENTRY(fubyte, 1)
-{	.mlx
-	movl		r14=VM_MAXUSER_ADDRESS
-	;;
-}
-{	.mib
-	ld8.acq		r15=[r13]		// r15 = curthread
-	cmp.geu		p6,p0=in0,r14
-(p6)	br.dpnt.few	1f
-	;;
-}
-{	.mlx
-	add		r15=TD_PCB,r15
-	movl		r14=fusufault
-	;;
-}
-{	.mmi
-	ld8		r15=[r15]		// r15 = PCB
-	;;
-	nop		0
-	add		r15=PCB_ONFAULT,r15
-	;;
-}
-{	.mmi
-	st8		[r15]=r14		// Set onfault
-	;;
-	mf
-	nop		0
-	;;
-}
-{	.mmb
-	ld1		ret0=[in0]
-	st8.rel		[r15]=r0		// Clear onfault
-	br.ret.sptk	rp
-	;;
-}
-1:
-{	.mib
-	add		ret0=-1,r0
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-END(fubyte)
-
-ENTRY(fuword16, 2)
-{	.mlx
-	movl		r14=VM_MAXUSER_ADDRESS
-	;;
-}
-{	.mib
-	ld8.acq		r15=[r13]		// r15 = curthread
-	cmp.geu		p6,p0=in0,r14
-(p6)	br.dpnt.few	1f
-	;;
-}
-{	.mlx
-	add		r15=TD_PCB,r15
-	movl		r14=fusufault
-	;;
-}
-{	.mmi
-	ld8		r15=[r15]		// r15 = PCB
-	;;
-	nop		0
-	add		r15=PCB_ONFAULT,r15
-	;;
-}
-{	.mmi
-	st8		[r15]=r14		// Set onfault
-	;;
-	mf
-	nop		0
-	;;
-}
-{	.mmb
-	ld2		ret0=[in0]
-	st8.rel		[r15]=r0		// Clear onfault
-	br.ret.sptk	rp
-	;;
-}
-1:
-{	.mib
-	add		ret0=-1,r0
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-END(fuword16)
-
-ENTRY(fuword32, 2)
-{	.mlx
-	movl		r14=VM_MAXUSER_ADDRESS
-	;;
-}
-{	.mib
-	ld8.acq		r15=[r13]		// r15 = curthread
-	cmp.geu		p6,p0=in0,r14
-(p6)	br.dpnt.few	1f
-	;;
-}
-{	.mlx
-	add		r15=TD_PCB,r15
-	movl		r14=fusufault
-	;;
-}
-{	.mmi
-	ld8		r15=[r15]		// r15 = PCB
-	;;
-	nop		0
-	add		r15=PCB_ONFAULT,r15
-	;;
-}
-{	.mmi
-	st8		[r15]=r14		// Set onfault
-	;;
-	mf
-	nop		0
-	;;
-}
-{	.mmb
-	ld4		ret0=[in0]
-	st8.rel		[r15]=r0		// Clear onfault
-	br.ret.sptk	rp
-	;;
-}
-1:
-{	.mib
-	add		ret0=-1,r0
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-END(fuword32)
-
-ENTRY(fuword64, 2)
-XENTRY(fuword)
-{	.mlx
-	movl		r14=VM_MAXUSER_ADDRESS
-	;;
-}
-{	.mib
-	ld8.acq		r15=[r13]		// r15 = curthread
-	cmp.geu		p6,p0=in0,r14
-(p6)	br.dpnt.few	1f
-	;;
-}
-{	.mlx
-	add		r15=TD_PCB,r15
-	movl		r14=fusufault
-	;;
-}
-{	.mmi
-	ld8		r15=[r15]		// r15 = PCB
-	;;
-	nop		0
-	add		r15=PCB_ONFAULT,r15
-	;;
-}
-{	.mmi
-	st8		[r15]=r14		// Set onfault
-	;;
-	mf
-	nop		0
-	;;
-}
-{	.mmb
-	ld8		ret0=[in0]
-	st8.rel		[r15]=r0		// Clear onfault
-	br.ret.sptk	rp
-	;;
-}
-1:
-{	.mib
-	add		ret0=-1,r0
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-END(fuword64)
-
-/*
- * fuswintr(void *addr)
- * suswintr(void *addr)
- */
-
-ENTRY(fuswintr, 1)
-{	.mib
-	add		ret0=-1,r0
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-END(fuswintr)
-
-ENTRY(suswintr, 0)
-{	.mib
-	add		ret0=-1,r0
-	nop		0
-	br.ret.sptk	rp
-	;;
-}
-END(suswintr)
-
-/**************************************************************************/
-
-/*
- * Copy a null-terminated string within the kernel's address space.
- * If lenp is not NULL, store the number of chars copied in *lenp
- *
- * int copystr(char *from, char *to, size_t len, size_t *lenp);
- */
-ENTRY(copystr, 4)
-	mov	r14=in2			// r14 = i = len
-	cmp.eq	p6,p0=r0,in2
-(p6)	br.cond.spnt.few 2f		// if (len == 0), bail out
-
-1:	ld1	r15=[in0],1		// read one byte
-	;;
-	st1	[in1]=r15,1		// write that byte
-	add	in2=-1,in2		// len--
-	;;
-	cmp.eq	p6,p0=r0,r15
-	cmp.ne	p7,p0=r0,in2
-	;; 
-(p6)	br.cond.spnt.few 2f		// if (*from == 0), bail out
-(p7)	br.cond.sptk.few 1b		// if (len != 0) copy more
-
-2:	cmp.eq	p6,p0=r0,in3
-(p6)	br.cond.dpnt.few 3f		// if (lenp != NULL)
-	sub	r14=r14,in2		// *lenp = (i - len)
-	;;
-	st8	[in3]=r14
-	
-3:	cmp.eq	p6,p0=r0,r15
-(p6)	br.cond.spnt.few 4f		// *from == '\0'; leave quietly
-
-	mov	ret0=ENAMETOOLONG	// *from != '\0'; error.
-	br.ret.sptk.few rp
-
-4:	mov	ret0=0			// return 0.
-	br.ret.sptk.few rp
-END(copystr)
-
-ENTRY(copyinstr, 4)
-	.prologue
-	.regstk	4, 3, 4, 0
-	.save	ar.pfs,loc0
-	alloc	loc0=ar.pfs,4,3,4,0
-	.save	rp,loc1
-	mov	loc1=rp
-	.body
-
-	movl	loc2=VM_MAXUSER_ADDRESS		// make sure that src addr
-	;; 
-	cmp.geu	p6,p0=in0,loc2			// is in user space.
-	;; 
-(p6)	br.cond.spnt.few copyerr		// if it's not, error out.
-	ld8.acq	r15=[r13]
-	movl	r14=copyerr			// set up fault handler.
-	;;
-	add	r15=TD_PCB,r15			// find pcb
-	;;
-	ld8	r15=[r15]
-	;;
-	add	loc2=PCB_ONFAULT,r15
-	;;
-	st8	[loc2]=r14
-	;;
-	mov	out0=in0
-	mov	out1=in1
-	mov	out2=in2
-	mov	out3=in3
-	;;
-	br.call.sptk.few rp=copystr		// do the copy.
-	st8	[loc2]=r0			// kill the fault handler.
-	mov	ar.pfs=loc0			// restore ar.pfs
-	mov	rp=loc1				// restore ra.
-	br.ret.sptk.few rp			// ret0 left over from copystr
-END(copyinstr)
-
-/*
- * Not the fastest bcopy in the world.
- */
-ENTRY(bcopy, 3)
-	mov	ret0=r0				// return zero for copy{in,out}
-	;; 
-	cmp.le	p6,p0=in2,r0			// bail if len <= 0
-(p6)	br.ret.spnt.few rp
-
-	sub	r14=in1,in0 ;;			// check for overlap
-	cmp.ltu	p6,p0=r14,in2			// dst-src < len
-(p6)	br.cond.spnt.few 5f
-
-	extr.u	r14=in0,0,3			// src & 7
-	extr.u	r15=in1,0,3 ;;			// dst & 7
-	cmp.eq	p6,p0=r14,r15			// different alignment?
-(p6)	br.cond.spnt.few 2f			// branch if same alignment
-
-1:	ld1	r14=[in0],1 ;;			// copy bytewise
-	st1	[in1]=r14,1
-	add	in2=-1,in2 ;;			// len--
-	cmp.ne	p6,p0=r0,in2
-(p6)	br.cond.dptk.few 1b			// loop
-	br.ret.sptk.few rp			// done
-
-2:	cmp.eq	p6,p0=r14,r0			// aligned?
-(p6)	br.cond.sptk.few 4f
-
-3:	ld1	r14=[in0],1 ;;			// copy bytewise
-	st1	[in1]=r14,1
-	extr.u	r15=in0,0,3			// src & 7
-	add	in2=-1,in2 ;;			// len--
-	cmp.eq	p6,p0=r0,in2			// done?
-	cmp.eq	p7,p0=r0,r15 ;;			// aligned now?
-(p6)	br.ret.spnt.few rp			// return if done
-(p7)	br.cond.spnt.few 4f			// go to main copy
-	br.cond.sptk.few 3b			// more bytes to copy
-
-	// At this point, in2 is non-zero
-
-4:	mov	r14=8 ;;
-	cmp.ltu	p6,p0=in2,r14 ;;		// len < 8?
-(p6)	br.cond.spnt.few 1b			// byte copy the end
-	ld8	r15=[in0],8 ;;			// copy word
-	st8	[in1]=r15,8
-	add	in2=-8,in2 ;;			// len -= 8
-	cmp.ne	p6,p0=r0,in2			// done?
-(p6)	br.cond.spnt.few 4b			// again
-
-	br.ret.sptk.few rp			// return
-
-	// Don't bother optimising overlap case
-
-5:	add	in0=in0,in2
-	add	in1=in1,in2 ;;
-	add	in0=-1,in0
-	add	in1=-1,in1 ;;
-
-6:	ld1	r14=[in0],-1 ;;
-	st1	[in1]=r14,-1
-	add	in2=-1,in2 ;;
-	cmp.ne	p6,p0=r0,in2
-(p6)	br.cond.spnt.few 6b
-
-	br.ret.sptk.few rp
-END(bcopy)
-
-ENTRY(memcpy,3)
-	mov	r14=in0 ;;
-	mov	in0=in1 ;;
-	mov	in1=r14
-	br.cond.sptk.few bcopy
-END(memcpy)
-	
-ENTRY(copyin, 3)
-	.prologue
-	.regstk	3, 3, 3, 0
-	.save	ar.pfs,loc0
-	alloc	loc0=ar.pfs,3,3,3,0
-	.save	rp,loc1
-	mov	loc1=rp
-	.body
-
-	movl	loc2=VM_MAXUSER_ADDRESS		// make sure that src addr
-	;; 
-	cmp.geu	p6,p0=in0,loc2			// is in user space.
-	;; 
-(p6)	br.cond.spnt.few copyerr		// if it's not, error out.
-	ld8.acq	r15=[r13]
-	movl	r14=copyerr			// set up fault handler.
-	;;
-	add	r15=TD_PCB,r15			// find pcb
-	;;
-	ld8	r15=[r15]
-	;;
-	add	loc2=PCB_ONFAULT,r15
-	;;
-	st8	[loc2]=r14
-	;;
-	mov	out0=in0
-	mov	out1=in1
-	mov	out2=in2
-	;;
-	br.call.sptk.few rp=bcopy		// do the copy.
-	st8	[loc2]=r0			// kill the fault handler.
-	mov	ar.pfs=loc0			// restore ar.pfs
-	mov	rp=loc1				// restore ra.
-	br.ret.sptk.few rp			// ret0 left over from bcopy
-END(copyin)
-
-ENTRY(copyout, 3)
-	.prologue
-	.regstk	3, 3, 3, 0
-	.save	ar.pfs,loc0
-	alloc	loc0=ar.pfs,3,3,3,0
-	.save	rp,loc1
-	mov	loc1=rp
-	.body
-
-	movl	loc2=VM_MAXUSER_ADDRESS		// make sure that dest addr
-	;; 
-	cmp.geu	p6,p0=in1,loc2			// is in user space.
-	;; 
-(p6)	br.cond.spnt.few copyerr		// if it's not, error out.
-	ld8.acq	r15=[r13]
-	movl	r14=copyerr			// set up fault handler.
-	;;
-	add	r15=TD_PCB,r15			// find pcb
-	;;
-	ld8	r15=[r15]
-	;;
-	add	loc2=PCB_ONFAULT,r15
-	;;
-	st8	[loc2]=r14
-	;;
-	mov	out0=in0
-	mov	out1=in1
-	mov	out2=in2
-	;;
-	br.call.sptk.few rp=bcopy		// do the copy.
-	st8	[loc2]=r0			// kill the fault handler.
-	mov	ar.pfs=loc0			// restore ar.pfs
-	mov	rp=loc1				// restore ra.
-	br.ret.sptk.few rp			// ret0 left over from bcopy
-END(copyout)
-
-ENTRY(copyerr, 0)
-	ld8.acq	r14=[r13] ;;
-	add	r14=TD_PCB,r14 ;;		// curthread->td_addr
-	ld8	r14=[r14] ;;
-	add	r14=PCB_ONFAULT,r14 ;;		// &curthread->td_pcb->pcb_onfault
-	st8	[r14]=r0			// reset fault handler
-	
-	mov	ret0=EFAULT			// return EFAULT
-	br.ret.sptk.few rp
-END(copyerr)
-
-#if defined(GPROF)
-/*
- * Important registers:
- *      r8      structure return address
- *      rp      our return address
- *      in0     caller's ar.pfs
- *      in1     caller's gp
- *      in2     caller's rp
- *      in3     GOT entry
- *      ar.pfs  our pfs
- */
-ENTRY_NOPROFILE(_mcount, 4)
-	alloc		loc0 = ar.pfs, 4, 3, 2, 0
-	mov		loc1 = r8
-	mov		loc2 = rp
-	;;
-	mov		out0 = in2
-	mov		out1 = rp
-	br.call.sptk	rp = __mcount
-	;;
-1:
-	mov		gp = in1
-	mov		r14 = ip
-	mov		b7 = loc2
-	;;
-	add		r14 = 2f - 1b, r14
-	mov		ar.pfs = loc0
-	mov		rp = in2
-	;;
-	mov		b7 = r14
-	mov		b6 = loc2
-	mov		r8 = loc1
-	mov		r14 = in0
-	br.ret.sptk	b7
-	;;
-2:
-	mov		ar.pfs = r14
-	br.sptk		b6
-	;;
-END(_mcount)
-#endif
diff --git a/sys/ia64/ia64/sys_machdep.c b/sys/ia64/ia64/sys_machdep.c
deleted file mode 100644
index 764df2ea0276..000000000000
--- a/sys/ia64/ia64/sys_machdep.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/sysproto.h>
-#include <sys/sysent.h>
-
-#include <machine/bus.h>
-#include <machine/cpu.h>
-#include <machine/sysarch.h>
-
-#ifndef _SYS_SYSPROTO_H_
-struct sysarch_args {
-	int op;
-	char *parms;
-};
-#endif
-
-int
-sysarch(struct thread *td, struct sysarch_args *uap)
-{
-	int error;
-
-	switch(uap->op) {
-	default:
-		error = EINVAL;
-		break;
-	}
-	return (error);
-}
diff --git a/sys/ia64/ia64/syscall.S b/sys/ia64/ia64/syscall.S
deleted file mode 100644
index 84a03dae8a19..000000000000
--- a/sys/ia64/ia64/syscall.S
+++ /dev/null
@@ -1,569 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 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$
- */
-
-#include <sys/syscall.h>
-#include <machine/asm.h>
-#include <assym.s>
-
-/*
- * A process performs a syscall by performing an indirect call to the
- * address stored in ar.k5. The contents of ar.pfs and rp should be
- * saved prior to the syscall in r9 and r10 respectively. The kernel
- * will restore these values on return. The value of gp is preserved
- * across the call. This allows for small enough syscall stubs without
- * getting too weird.
- * The address in ar.k5 is the start of the EPC gateway page and also
- * the syscall entry point. The syscall code in the gateway page is
- * primarily responsible for increasing the privilege level, but will
- * also make sure we have a reliable psr.
- *
- * A process defines:
- *	r8		-	syscall number
- *	r9		-	copy of ar.pfs
- *	r10		-	copy of rp
- *	in0-in7		-	syscall arguments
- *
- * A syscall returns:
- *	r8+r9		-	syscall return value(s)
- *	r10		-	syscall error flag
- *	ar.pfs		-	restored from r9
- *	rp		-	restored from r10
- *	gp		-	preserved
- *
- * The EPC syscall code defines:
- *	r11		-	copy of psr.l
- *	r14		-	Kernel memory stack
- *	r15		-	Kernel register stack
- *
- * Also in the gateway page are the signal trampolines. As such, stacks
- * don't have to be made executable per se. Since debuggers have a need
- * to know about trampolines, we probably need to define a table of
- * vectors or something along those lines so that debuggers can get the
- * information they need and we have the freedom to move code around.
- */
-
-	.section	.text.gateway, "ax"
-	.align		PAGE_SIZE
-	.global		ia64_gateway_page
-ia64_gateway_page:
-{	.mmb
-	mov		r14=ar.k7		// Memory stack
-	mov		r15=ar.k6		// Register stack
-	epc
-	;;
-}
-{	.mlx
-	mov		r11=psr
-	movl		r31=epc_syscall
-	;;
-}
-{	.mib
-	rum		psr.be
-	mov		b7=r31
-	br		b7
-	;;
-}
-gw_ret:
-{	.mmi
-	mov		ar.rnat=r22
-	;;
-	mov		ar.rsc=r24
-	mov		ar.pfs=r20
-}
-{	.mib
-	mov		ar.fpsr=r25
-	mov		b0=r18
-	br.sptk		b6
-	;;
-}
-gw_ret_ia32:
-{	.mmi
-	flushrs
-	nop		0
-	nop		0
-	;;
-}
-{	.mib
-	nop		0
-	nop		0
-	br.ia.sptk	b6
-	;;
-}
-
-
-ENTRY_NOPROFILE(break_sigtramp, 0)
-{	.mib
-	mov		ar.rsc=0
-	cmp.ne		p15,p0=0,gp
-	cover
-	;;
-}
-{	.mmi
-	flushrs
-(p15)	invala
-	add		r16=16+UC_MCONTEXT+MC_SPECIAL,sp
-	;;
-}
-{	.mmi
-	mov		r17=ar.bsp
-	mov		r18=ar.rnat
-	add		r14=40,r16
-	;;
-}
-{	.mmi
-	st8		[r14]=r17,64		// bspstore
-(p15)	mov		ar.bspstore=gp
-	add		r15=48,r16
-	;;
-}
-{	.mmi
-	st8		[r15]=r18		// rnat
-	st8		[r14]=r0		// ndirty
-	nop		0
-	;;
-}
-{	.mmi
-	alloc		r14=ar.pfs, 0, 0, 3, 0
-	mov		ar.rsc=15
-	mov		out0=r8
-	;;
-}
-{	.mmi
-	ld8		r16=[r10],8		// function address
-	;;
-	ld8		gp=[r10]		// function's gp value
-	mov		b7=r16
-	;;
-}
-{	.mib
-	mov		out1=r9
-	add		out2=16,sp
-	br.call.sptk	rp=b7
-	;;
-}
-{	.mmi
-	mov		r15=SYS_sigreturn
-	add		out0=16,sp
-	break		0x100000
-	;;
-}
-{	.mmi
-	mov		r15=SYS_exit
-	mov		out0=ret0
-	break		0x100000
-	;;
-}
-END(break_sigtramp)
-
-ENTRY_NOPROFILE(epc_sigtramp, 0)
-{	.mmi
-	ld8		r16=[r10],8		// function address
-	mov		ar.rsc=0
-	cmp.ne		p15,p0=0,gp
-	;;
-}
-{	.mmi
-(p15)	invala
-(p15)	mov		ar.bspstore=gp
-	mov		b7=r16
-	;;
-}
-{	.mmi
-	alloc		r14=ar.pfs, 0, 0, 3, 0
-	mov		ar.rsc=15
-	nop		0
-	;;
-}
-{	.mii
-	ld8		gp=[r10]		// function's gp value
-	mov		out0=r8
-	mov		out1=r9
-}
-{	.mib
-	add		out2=16,sp
-	nop		0
-	br.call.sptk	rp=b7
-	;;
-}
-	add		out0=16,sp
-	CALLSYS_NOERROR(sigreturn)
-	mov		out0=ret0
-	CALLSYS_NOERROR(exit)
-END(epc_sigtramp)
-
-	.align		PAGE_SIZE
-
-	.text
-
-ENTRY_NOPROFILE(epc_syscall, 8)
-	.prologue
-	.unwabi		@svr4, 'E'
-	.save		rp, r0
-	.body
-{	.mmi
-	mov		r16=ar.rsc
-	mov		ar.rsc=0
-	nop		0
-	;;
-}
-{	.mmi
-	mov		r18=ar.bspstore
-	;;
-	mov		r19=ar.rnat
-	dep		r15=r18,r15,0,9
-	;;
-}
-{	.mmi
-	mov		r21=ar.unat
-	add		r30=-SIZEOF_TRAPFRAME,r14
-	mov		r20=sp
-	;;
-}
-{	.mii
-	mov		r17=r13
-	dep		r30=0,r30,0,10
-	;;
-	add		sp=-16,r30
-	;;
-}
-{	.mmi
-	mov		ar.bspstore=r15
-	;;
-	mov		ar.rnat=r19
-	add		r31=8,r30
-	;;
-}
-{	.mmi
-	mov		r13=ar.k4
-	mov		r22=ar.fpsr
-	sub		r29=r14,r30
-}
-{	.mmi
-	mov		r23=ar.bsp
-	mov		ar.rsc=3
-	add		r28=FRAME_SYSCALL,r0
-	;;
-}
-{	.mmi
-	st8		[r30]=r29,16		// tf_length
-	st8		[r31]=r28,16		// tf_flags
-	mov		r24=rp
-	;;
-}
-{	.mmi
-	st8		[r30]=r20,16		// sp
-	st8		[r31]=r21,16		// unat
-	mov		r25=pr
-	;;
-}
-{	.mmi
-	st8		[r30]=r10,16		// rp (syscall caller)
-	st8		[r31]=r25,16		// pr
-	mov		r26=ar.pfs
-	;;
-}
-{	.mmi
-	st8		[r30]=r9,16		// pfs (syscall caller)
-	st8		[r31]=r18,16		// bspstore
-	sub		r27=r23,r15
-	;;
-}
-{	.mmi
-	st8		[r30]=r19,16		// rnat
-	st8		[r31]=r0,16		// __spare
-	nop		0
-	;;
-}
-{	.mmi
-	st8		[r30]=r17,16		// tp
-	st8		[r31]=r16,16		// rsc
-	dep		r11=-1,r11,32,2		// Set psr.cpl=3
-	;;
-}
-{	.mmi
-	st8		[r30]=r22,16		// fpsr
-	st8		[r31]=r11,16		// psr
-	nop		0
-	;;
-}
-{	.mmi
-	st8		[r30]=r1,16		// gp
-	st8		[r31]=r27,16		// ndirty
-	nop		0
-	;;
-}
-{	.mmi
-	st8		[r30]=r26,16		// pfs (syscall stub)
-	st8		[r31]=r24,16		// rp (syscall stub)
-	nop		0
-	;;
-}
-{	.mmi
-	st8		[r30]=r0,80		// ifa
-	st8		[r31]=r0,80		// isr
-	nop		0
-	;;
-}
-{	.mmi
-	alloc		r14=ar.pfs,0,0,8,0
-	st8		[r30]=r8,16		// syscall number (=r15)
-	nop		0
-	;;
-}
-{	.mmi
-	.mem.offset	0,0
-	st8.spill	[r31]=r32,16		// arg0 (=r16)
-	.mem.offset	8,0
-	st8.spill	[r30]=r33,16		// arg1 (=r17)
-	nop		0
-	;;
-}
-{	.mmi
-	.mem.offset	16,0
-	st8.spill	[r31]=r34,16		// arg2 (=r18)
-	.mem.offset	24,0
-	st8.spill	[r30]=r35,16		// arg3 (=r19)
-	nop		0
-	;;
-}
-{	.mmi
-	.mem.offset	32,0
-	st8.spill	[r31]=r36,16		// arg4 (=r20)
-	.mem.offset	40,0
-	st8.spill	[r30]=r37,16		// arg5 (=r21)
-	nop		0
-	;;
-}
-{	.mmi
-	.mem.offset	48,0
-	st8.spill	[r31]=r38		// arg6 (=r22)
-	.mem.offset	56,0
-	st8.spill	[r30]=r39		// arg7 (=r23)
-	nop		0
-	;;
-}
-{	.mlx
-	ssm		psr.dfh|psr.ac
-	movl		gp=__gp
-	;;
-}
-1:
-{	.mib
-	srlz.d
-	add		out0=16,sp
-	br.call.sptk	rp=syscall
-	;;
-}
-	.global		epc_syscall_return
-epc_syscall_return:
-{	.mib
-	add		out0=16,sp
-	nop		0
-	br.call.sptk	rp=do_ast
-	;;
-}
-{	.mib
-	cmp4.eq		p15,p0=ERESTART,r8
-	add		r14=24,sp
-(p15)	br.spnt		1b			// restart syscall
-	;;
-}
-{	.mmi
-	ld8		r14=[r14]		// tf_flags
-	nop		0
-	nop		0
-	;;
-}
-{	.mib
-	nop		0
-	tbit.z		p15,p0=r14,0
-(p15)	br.spnt		exception_restore
-	;;
-}
-{	.mmi
-	alloc		r31=ar.pfs,0,0,0,0
-	add		r14=32,sp
-	add		r15=16,sp
-	;;
-}
-{	.mmi
-	ld8		r31=[r15],24		// tf_length
-	ld8		r16=[r14],16		// sp
-	add		sp=16,sp
-	;;
-}
-{	.mmi
-	ld8		r17=[r15],16		// unat (before)
-	ld8		r18=[r14],16		// rp (syscall caller)
-	add		r31=r31,sp
-	;;
-}
-{	.mmi
-	ld8		r19=[r15],16		// pr
-	ld8		r20=[r14],16		// pfs (syscall caller)
-	nop		0
-	;;
-}
-{	.mmi
-	ld8		r21=[r15],24		// bspstore
-	ld8		r22=[r14],24		// rnat
-	mov		pr=r19,0x1fffe
-	;;
-}
-{	.mmi
-	ld8		r23=[r15],16		// tp
-	ld8		r24=[r14],16		// rsc
-	nop		0
-	;;
-}
-{	.mmi
-	ld8		r25=[r15],16		// fpsr
-	ld8		r26=[r14],16		// psr
-	nop		0
-	;;
-}
-{	.mmi
-	ld8		gp=[r15],16		// gp
-	ld8		r27=[r14],16		// ndirty
-	tbit.z		p14,p15=r26,34		// p14=ia64, p15=ia32
-	;;
-}
-{	.mmi
-	ld8		r28=[r15],56		// pfs (syscall stub)
-	ld8		r29=[r14],56		// rp (syscall stub)
-	shl		r27=r27,16
-	;;
-}
-{	.mmi
-	ld8		r8=[r15],16		// r8
-	mov		ar.rsc=r27
-	mov		b6=r29
-	;;
-}
-{	.mmb
-	ld8		r9=[r14],40		// r9
-	ld8		r10=[r15],40		// r10
-(p15)	br.spnt		epc_syscall_setup_ia32
-	;;
-}
-{	.mmi
-	loadrs
-	mov		ar.k7=r31
-	mov		sp=r16
-	;;
-}
-{	.mmi
-	mov		r30=ar.bspstore
-	mov		r14=ar.k5
-	mov		ar.pfs=r28
-	;;
-}
-{	.mmi
-	mov		ar.bspstore=r21
-	add		r14=gw_ret-ia64_gateway_page,r14
-	dep		r30=0,r30,0,13		// 8KB aligned.
-	;;
-}
-{	.mii
-	mov		ar.k6=r30
-	mov		r13=r23
-	nop		0
-}
-{	.mmi
-	mov		psr.l=r26
-	mov		ar.unat=r17
-	nop		0
-	;;
-}
-{	.mib
-	srlz.d
-	mov		b7=r14
-	br.ret.sptk	b7
-	;;
-}
-epc_syscall_setup_ia32:
-{	.mmi
-	loadrs
-	mov		ar.k7=r31
-	mov		sp=r16
-	;;
-}
-{	.mmi
-	mov		r30=ar.bspstore
-	;;
-	mov		ar.unat=r17
-	dep		r30=0,r30,0,13		// 8KB aligned
-	;;
-}
-{	.mmi
-	mov		ar.k6=r30
-	mov		ar.bspstore=r21
-	mov		r11=r0
-	;;
-}
-{	.mmi
-	ld8		r16=[r14],64
-	ld8		r17=[r15],80
-	mov		r13=r0
-	;;
-}
- 
-	ld8		r24=[r14],32
-	ld8		r27=[r15],16
-	;;
-	ld8		r28=[r14],16
-	ld8		r29=[r15],16
-	;;
-	ld8		r30=[r14],40
-	ld8		r31=[r15],40
-	;;
-
-{	.mmi
-	ld8		r2=[r14]
-	ld8		r3=[r15]
-	mov		r14=r0
-	;;
-}
-{	.mmi
-	mov		ar.csd=r2
-	mov		ar.ssd=r3
-	mov		r15=r0
-	;;
-}
-
-	mov		r2=ar.k5
-	mov		psr.l=r26
-	;;
-	srlz.d
-	add		r2=gw_ret_ia32-ia64_gateway_page,r2
-	;;
-	mov		ar.rsc=0
-	mov		b7=r2
-	br.ret.sptk	b7
-	;;
-END(epc_syscall)
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
deleted file mode 100644
index 987b144dfb9f..000000000000
--- a/sys/ia64/ia64/trap.c
+++ /dev/null
@@ -1,962 +0,0 @@
-/*-
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "opt_ddb.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kdb.h>
-#include <sys/ktr.h>
-#include <sys/sysproto.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/efi.h>
-#include <sys/exec.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/sched.h>
-#include <sys/smp.h>
-#include <sys/vmmeter.h>
-#include <sys/sysent.h>
-#include <sys/signalvar.h>
-#include <sys/syscall.h>
-#include <sys/pioctl.h>
-#include <sys/ptrace.h>
-#include <sys/sysctl.h>
-#include <vm/vm.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_page.h>
-#include <vm/vm_map.h>
-#include <vm/vm_extern.h>
-#include <vm/vm_param.h>
-#include <sys/ptrace.h>
-#include <machine/cpu.h>
-#include <machine/md_var.h>
-#include <machine/reg.h>
-#include <machine/pal.h>
-#include <machine/fpu.h>
-#include <machine/pcb.h>
-#ifdef SMP
-#include <machine/smp.h>
-#endif
-
-#include <security/audit/audit.h>
-
-#include <ia64/disasm/disasm.h>
-
-static int print_usertrap = 0;
-SYSCTL_INT(_machdep, OID_AUTO, print_usertrap,
-    CTLFLAG_RW, &print_usertrap, 0, "");
-
-static void break_syscall(struct trapframe *tf);
-
-/*
- * EFI-Provided FPSWA interface (Floating Point SoftWare Assist)
- */
-extern struct fpswa_iface *fpswa_iface;
-
-static const char *ia64_vector_names[] = {
-	"VHPT Translation",			/* 0 */
-	"Instruction TLB",			/* 1 */
-	"Data TLB",				/* 2 */
-	"Alternate Instruction TLB",		/* 3 */
-	"Alternate Data TLB",			/* 4 */
-	"Data Nested TLB",			/* 5 */
-	"Instruction Key Miss",			/* 6 */
-	"Data Key Miss",			/* 7 */
-	"Dirty-Bit",				/* 8 */
-	"Instruction Access-Bit",		/* 9 */
-	"Data Access-Bit",			/* 10 */
-	"Break Instruction",			/* 11 */
-	"External Interrupt",			/* 12 */
-	"Reserved 13",				/* 13 */
-	"Reserved 14",				/* 14 */
-	"Reserved 15",				/* 15 */
-	"Reserved 16",				/* 16 */
-	"Reserved 17",				/* 17 */
-	"Reserved 18",				/* 18 */
-	"Reserved 19",				/* 19 */
-	"Page Not Present",			/* 20 */
-	"Key Permission",			/* 21 */
-	"Instruction Access Rights",		/* 22 */
-	"Data Access Rights",			/* 23 */
-	"General Exception",			/* 24 */
-	"Disabled FP-Register",			/* 25 */
-	"NaT Consumption",			/* 26 */
-	"Speculation",				/* 27 */
-	"Reserved 28",				/* 28 */
-	"Debug",				/* 29 */
-	"Unaligned Reference",			/* 30 */
-	"Unsupported Data Reference",		/* 31 */
-	"Floating-point Fault",			/* 32 */
-	"Floating-point Trap",			/* 33 */
-	"Lower-Privilege Transfer Trap",	/* 34 */
-	"Taken Branch Trap",			/* 35 */
-	"Single Step Trap",			/* 36 */
-	"Reserved 37",				/* 37 */
-	"Reserved 38",				/* 38 */
-	"Reserved 39",				/* 39 */
-	"Reserved 40",				/* 40 */
-	"Reserved 41",				/* 41 */
-	"Reserved 42",				/* 42 */
-	"Reserved 43",				/* 43 */
-	"Reserved 44",				/* 44 */
-	"IA-32 Exception",			/* 45 */
-	"IA-32 Intercept",			/* 46 */
-	"IA-32 Interrupt",			/* 47 */
-	"Reserved 48",				/* 48 */
-	"Reserved 49",				/* 49 */
-	"Reserved 50",				/* 50 */
-	"Reserved 51",				/* 51 */
-	"Reserved 52",				/* 52 */
-	"Reserved 53",				/* 53 */
-	"Reserved 54",				/* 54 */
-	"Reserved 55",				/* 55 */
-	"Reserved 56",				/* 56 */
-	"Reserved 57",				/* 57 */
-	"Reserved 58",				/* 58 */
-	"Reserved 59",				/* 59 */
-	"Reserved 60",				/* 60 */
-	"Reserved 61",				/* 61 */
-	"Reserved 62",				/* 62 */
-	"Reserved 63",				/* 63 */
-	"Reserved 64",				/* 64 */
-	"Reserved 65",				/* 65 */
-	"Reserved 66",				/* 66 */
-	"Reserved 67",				/* 67 */
-};
-
-struct bitname {
-	uint64_t mask;
-	const char* name;
-};
-
-static void
-printbits(uint64_t mask, struct bitname *bn, int count)
-{
-	int i, first = 1;
-	uint64_t bit;
-
-	for (i = 0; i < count; i++) {
-		/*
-		 * Handle fields wider than one bit.
-		 */
-		bit = bn[i].mask & ~(bn[i].mask - 1);
-		if (bn[i].mask > bit) {
-			if (first)
-				first = 0;
-			else
-				printf(",");
-			printf("%s=%ld", bn[i].name,
-			       (mask & bn[i].mask) / bit);
-		} else if (mask & bit) {
-			if (first)
-				first = 0;
-			else
-				printf(",");
-			printf("%s", bn[i].name);
-		}
-	}
-}
-
-struct bitname psr_bits[] = {
-	{IA64_PSR_BE,	"be"},
-	{IA64_PSR_UP,	"up"},
-	{IA64_PSR_AC,	"ac"},
-	{IA64_PSR_MFL,	"mfl"},
-	{IA64_PSR_MFH,	"mfh"},
-	{IA64_PSR_IC,	"ic"},
-	{IA64_PSR_I,	"i"},
-	{IA64_PSR_PK,	"pk"},
-	{IA64_PSR_DT,	"dt"},
-	{IA64_PSR_DFL,	"dfl"},
-	{IA64_PSR_DFH,	"dfh"},
-	{IA64_PSR_SP,	"sp"},
-	{IA64_PSR_PP,	"pp"},
-	{IA64_PSR_DI,	"di"},
-	{IA64_PSR_SI,	"si"},
-	{IA64_PSR_DB,	"db"},
-	{IA64_PSR_LP,	"lp"},
-	{IA64_PSR_TB,	"tb"},
-	{IA64_PSR_RT,	"rt"},
-	{IA64_PSR_CPL,	"cpl"},
-	{IA64_PSR_IS,	"is"},
-	{IA64_PSR_MC,	"mc"},
-	{IA64_PSR_IT,	"it"},
-	{IA64_PSR_ID,	"id"},
-	{IA64_PSR_DA,	"da"},
-	{IA64_PSR_DD,	"dd"},
-	{IA64_PSR_SS,	"ss"},
-	{IA64_PSR_RI,	"ri"},
-	{IA64_PSR_ED,	"ed"},
-	{IA64_PSR_BN,	"bn"},
-	{IA64_PSR_IA,	"ia"},
-};
-
-static void
-printpsr(uint64_t psr)
-{
-	printbits(psr, psr_bits, sizeof(psr_bits)/sizeof(psr_bits[0]));
-}
-
-struct bitname isr_bits[] = {
-	{IA64_ISR_CODE,	"code"},
-	{IA64_ISR_VECTOR, "vector"},
-	{IA64_ISR_X,	"x"},
-	{IA64_ISR_W,	"w"},
-	{IA64_ISR_R,	"r"},
-	{IA64_ISR_NA,	"na"},
-	{IA64_ISR_SP,	"sp"},
-	{IA64_ISR_RS,	"rs"},
-	{IA64_ISR_IR,	"ir"},
-	{IA64_ISR_NI,	"ni"},
-	{IA64_ISR_SO,	"so"},
-	{IA64_ISR_EI,	"ei"},
-	{IA64_ISR_ED,	"ed"},
-};
-
-static void printisr(uint64_t isr)
-{
-	printbits(isr, isr_bits, sizeof(isr_bits)/sizeof(isr_bits[0]));
-}
-
-static void
-printtrap(int vector, struct trapframe *tf, int isfatal, int user)
-{
-	printf("\n");
-	printf("%s %s trap (cpu %d):\n", isfatal? "fatal" : "handled",
-	       user ? "user" : "kernel", PCPU_GET(cpuid));
-	printf("\n");
-	printf("    trap vector = 0x%x (%s)\n",
-	       vector, ia64_vector_names[vector]);
-	printf("    cr.iip      = 0x%lx\n", tf->tf_special.iip);
-	printf("    cr.ipsr     = 0x%lx (", tf->tf_special.psr);
-	printpsr(tf->tf_special.psr);
-	printf(")\n");
-	printf("    cr.isr      = 0x%lx (", tf->tf_special.isr);
-	printisr(tf->tf_special.isr);
-	printf(")\n");
-	printf("    cr.ifa      = 0x%lx\n", tf->tf_special.ifa);
-	if (tf->tf_special.psr & IA64_PSR_IS) {
-		printf("    ar.cflg     = 0x%lx\n", ia64_get_cflg());
-		printf("    ar.csd      = 0x%lx\n", ia64_get_csd());
-		printf("    ar.ssd      = 0x%lx\n", ia64_get_ssd());
-	}
-	printf("    curthread   = %p\n", curthread);
-	if (curthread != NULL)
-		printf("        pid = %d, comm = %s\n",
-		       curthread->td_proc->p_pid, curthread->td_name);
-	printf("\n");
-}
-
-/*
- * We got a trap caused by a break instruction and the immediate was 0.
- * This indicates that we may have a break.b with some non-zero immediate.
- * The break.b doesn't cause the immediate to be put in cr.iim.  Hence,
- * we need to disassemble the bundle and return the immediate found there.
- * This may be a 0 value anyway.  Return 0 for any error condition.  This
- * will result in a SIGILL, which is pretty much the best thing to do.
- */
-static uint64_t
-trap_decode_break(struct trapframe *tf)
-{
-	struct asm_bundle bundle;
-	struct asm_inst *inst;
-	int slot;
-
-	if (!asm_decode(tf->tf_special.iip, &bundle))
-		return (0);
-
-	slot = ((tf->tf_special.psr & IA64_PSR_RI) == IA64_PSR_RI_0) ? 0 :
-            ((tf->tf_special.psr & IA64_PSR_RI) == IA64_PSR_RI_1) ? 1 : 2;
-	inst = bundle.b_inst + slot;
-
-	/*
-	 * Sanity checking: It must be a break instruction and the operand
-	 * that has the break value must be an immediate.
-	 */
-	if (inst->i_op != ASM_OP_BREAK ||
-	    inst->i_oper[1].o_type != ASM_OPER_IMM)
-		return (0);
-
-	return (inst->i_oper[1].o_value);
-}
-
-void
-trap_panic(int vector, struct trapframe *tf)
-{
-
-	printtrap(vector, tf, 1, TRAPF_USERMODE(tf));
-#ifdef KDB
-	kdb_trap(vector, 0, tf);
-#endif
-	panic("trap");
-}
-
-/*
- *
- */
-int
-do_ast(struct trapframe *tf)
-{
-
-	ia64_disable_intr();
-	while (curthread->td_flags & (TDF_ASTPENDING|TDF_NEEDRESCHED)) {
-		ia64_enable_intr();
-		ast(tf);
-		ia64_disable_intr();
-	}
-	/*
-	 * Keep interrupts disabled. We return r10 as a favor to the EPC
-	 * syscall code so that it can quicky determine if the syscall
-	 * needs to be restarted or not.
-	 */
-	return (tf->tf_scratch.gr10);
-}
-
-/*
- * Trap is called from exception.s to handle most types of processor traps.
- */
-/*ARGSUSED*/
-void
-trap(int vector, struct trapframe *tf)
-{
-	struct proc *p;
-	struct thread *td;
-	uint64_t ucode;
-	int error, sig, user;
-	ksiginfo_t ksi;
-
-	user = TRAPF_USERMODE(tf) ? 1 : 0;
-	if (user)
-		ia64_set_fpsr(IA64_FPSR_DEFAULT);
-
-#ifdef XTRACE
-	ia64_xtrace_save();
-#endif
-
-	PCPU_INC(cnt.v_trap);
-
-	td = curthread;
-	p = td->td_proc;
-	ucode = 0;
-
-	if (user) {
-		td->td_pticks = 0;
-		td->td_frame = tf;
-		if (td->td_ucred != p->p_ucred)
-			cred_update_thread(td);
-	} else {
-		KASSERT(cold || td->td_ucred != NULL,
-		    ("kernel trap doesn't have ucred"));
-#ifdef KDB
-		if (kdb_active)
-			kdb_reenter();
-#endif
-	}
-
-	sig = 0;
-	switch (vector) {
-	case IA64_VEC_VHPT:
-		/*
-		 * This one is tricky. We should hardwire the VHPT, but
-		 * don't at this time. I think we're mostly lucky that
-		 * the VHPT is mapped.
-		 */
-		trap_panic(vector, tf);
-		break;
-
-	case IA64_VEC_ITLB:
-	case IA64_VEC_DTLB:
-	case IA64_VEC_EXT_INTR:
-		/* We never call trap() with these vectors. */
-		trap_panic(vector, tf);
-		break;
-
-	case IA64_VEC_ALT_ITLB:
-	case IA64_VEC_ALT_DTLB:
-		/*
-		 * These should never happen, because regions 0-4 use the
-		 * VHPT. If we get one of these it means we didn't program
-		 * the region registers correctly.
-		 */
-		trap_panic(vector, tf);
-		break;
-
-	case IA64_VEC_NESTED_DTLB:
-		/*
-		 * When the nested TLB handler encounters an unexpected
-		 * condition, it'll switch to the backup stack and transfer
-		 * here. All we need to do is panic.
-		 */
-		trap_panic(vector, tf);
-		break;
-
-	case IA64_VEC_IKEY_MISS:
-	case IA64_VEC_DKEY_MISS:
-	case IA64_VEC_KEY_PERMISSION:
-		/*
-		 * We don't use protection keys, so we should never get
-		 * these faults.
-		 */
-		trap_panic(vector, tf);
-		break;
-
-	case IA64_VEC_DIRTY_BIT:
-	case IA64_VEC_INST_ACCESS:
-	case IA64_VEC_DATA_ACCESS:
-		/*
-		 * We get here if we read or write to a page of which the
-		 * PTE does not have the access bit or dirty bit set and
-		 * we can not find the PTE in our datastructures. This
-		 * either means we have a stale PTE in the TLB, or we lost
-		 * the PTE in our datastructures.
-		 */
-		trap_panic(vector, tf);
-		break;
-
-	case IA64_VEC_BREAK:
-		if (user) {
-			ucode = (int)tf->tf_special.ifa & 0x1FFFFF;
-			if (ucode == 0) {
-				/*
-				 * A break.b doesn't cause the immediate to be
-				 * stored in cr.iim (and saved in the TF in
-				 * tf_special.ifa).  We need to decode the
-				 * instruction to find out what the immediate
-				 * was.  Note that if the break instruction
-				 * didn't happen to be a break.b, but any
-				 * other break with an immediate of 0, we
-				 * will do unnecessary work to get the value
-				 * we already had.  Not an issue, because a
-				 * break 0 is invalid.
-				 */
-				ucode = trap_decode_break(tf);
-			}
-			if (ucode < 0x80000) {
-				/* Software interrupts. */
-				switch (ucode) {
-				case 0:		/* Unknown error. */
-					sig = SIGILL;
-					break;
-				case 1:		/* Integer divide by zero. */
-					sig = SIGFPE;
-					ucode = FPE_INTDIV;
-					break;
-				case 2:		/* Integer overflow. */
-					sig = SIGFPE;
-					ucode = FPE_INTOVF;
-					break;
-				case 3:		/* Range check/bounds check. */
-					sig = SIGFPE;
-					ucode = FPE_FLTSUB;
-					break;
-				case 6: 	/* Decimal overflow. */
-				case 7: 	/* Decimal divide by zero. */
-				case 8: 	/* Packed decimal error. */
-				case 9: 	/* Invalid ASCII digit. */
-				case 10:	/* Invalid decimal digit. */
-					sig = SIGFPE;
-					ucode = FPE_FLTINV;
-					break;
-				case 4:		/* Null pointer dereference. */
-				case 5:		/* Misaligned data. */
-				case 11:	/* Paragraph stack overflow. */
-					sig = SIGSEGV;
-					break;
-				default:
-					sig = SIGILL;
-					break;
-				}
-			} else if (ucode < 0x100000) {
-				/* Debugger breakpoint. */
-				tf->tf_special.psr &= ~IA64_PSR_SS;
-				sig = SIGTRAP;
-			} else if (ucode == 0x100000) {
-				break_syscall(tf);
-				return;		/* do_ast() already called. */
-			} else if (ucode == 0x180000) {
-				mcontext_t mc;
-
-				error = copyin((void*)tf->tf_scratch.gr8,
-				    &mc, sizeof(mc));
-				if (!error) {
-					set_mcontext(td, &mc);
-					return;	/* Don't call do_ast()!!! */
-				}
-				sig = SIGSEGV;
-				ucode = tf->tf_scratch.gr8;
-			} else
-				sig = SIGILL;
-		} else {
-#ifdef KDB
-			if (kdb_trap(vector, 0, tf))
-				return;
-			panic("trap");
-#else
-			trap_panic(vector, tf);
-#endif
-		}
-		break;
-
-	case IA64_VEC_PAGE_NOT_PRESENT:
-	case IA64_VEC_INST_ACCESS_RIGHTS:
-	case IA64_VEC_DATA_ACCESS_RIGHTS: {
-		vm_offset_t va;
-		struct vmspace *vm;
-		vm_map_t map;
-		vm_prot_t ftype;
-		int rv;
-
-		rv = 0;
-		va = trunc_page(tf->tf_special.ifa);
-
-		if (va >= VM_MAXUSER_ADDRESS) {
-			/*
-			 * Don't allow user-mode faults for kernel virtual
-			 * addresses, including the gateway page.
-			 */
-			if (user)
-				goto no_fault_in;
-			map = kernel_map;
-		} else {
-			vm = (p != NULL) ? p->p_vmspace : NULL;
-			if (vm == NULL)
-				goto no_fault_in;
-			map = &vm->vm_map;
-		}
-
-		if (tf->tf_special.isr & IA64_ISR_X)
-			ftype = VM_PROT_EXECUTE;
-		else if (tf->tf_special.isr & IA64_ISR_W)
-			ftype = VM_PROT_WRITE;
-		else
-			ftype = VM_PROT_READ;
-
-		if (map != kernel_map) {
-			/*
-			 * Keep swapout from messing with us during this
-			 * critical time.
-			 */
-			PROC_LOCK(p);
-			++p->p_lock;
-			PROC_UNLOCK(p);
-
-			/* Fault in the user page: */
-			rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL);
-
-			PROC_LOCK(p);
-			--p->p_lock;
-			PROC_UNLOCK(p);
-		} else {
-			/*
-			 * Don't have to worry about process locking or
-			 * stacks in the kernel.
-			 */
-			rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL);
-		}
-
-		if (rv == KERN_SUCCESS)
-			goto out;
-
-	no_fault_in:
-		if (!user) {
-			/* Check for copyin/copyout fault. */
-			if (td != NULL && td->td_pcb->pcb_onfault != 0) {
-				tf->tf_special.iip =
-				    td->td_pcb->pcb_onfault;
-				tf->tf_special.psr &= ~IA64_PSR_RI;
-				td->td_pcb->pcb_onfault = 0;
-				goto out;
-			}
-			trap_panic(vector, tf);
-		}
-		ucode = va;
-		sig = (rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV;
-		break;
-	}
-
-	case IA64_VEC_GENERAL_EXCEPTION: {
-		int code;
-
-		if (!user)
-			trap_panic(vector, tf);
-
-		code = tf->tf_special.isr & (IA64_ISR_CODE & 0xf0ull);
-		switch (code) {
-		case 0x0:	/* Illegal Operation Fault. */
-			sig = ia64_emulate(tf, td);
-			break;
-		default:
-			sig = SIGILL;
-			break;
-		}
-		if (sig == 0)
-			goto out;
-		ucode = vector;
-		break;
-	}
-
-	case IA64_VEC_SPECULATION:
-		/*
-		 * The branching behaviour of the chk instruction is not
-		 * implemented by the processor. All we need to do is
-		 * compute the target address of the branch and make sure
-		 * that control is transfered to that address.
-		 * We should do this in the IVT table and not by entring
-		 * the kernel...
-		 */
-		tf->tf_special.iip += tf->tf_special.ifa << 4;
-		tf->tf_special.psr &= ~IA64_PSR_RI;
-		goto out;
-
-	case IA64_VEC_NAT_CONSUMPTION:
-	case IA64_VEC_UNSUPP_DATA_REFERENCE:
-		if (user) {
-			ucode = vector;
-			sig = SIGILL;
-		} else
-			trap_panic(vector, tf);
-		break;
-
-	case IA64_VEC_DISABLED_FP: {
-		if (user)
-			ia64_highfp_enable(td, tf);
-		else
-			trap_panic(vector, tf);
-		goto out;
-	}
-
-	case IA64_VEC_DEBUG:
-	case IA64_VEC_SINGLE_STEP_TRAP:
-		tf->tf_special.psr &= ~IA64_PSR_SS;
-		if (!user) {
-#ifdef KDB
-			if (kdb_trap(vector, 0, tf))
-				return;
-			panic("trap");
-#else
-			trap_panic(vector, tf);
-#endif
-		}
-		sig = SIGTRAP;
-		break;
-
-	case IA64_VEC_UNALIGNED_REFERENCE:
-		/*
-		 * If user-land, do whatever fixups, printing, and
-		 * signalling is appropriate (based on system-wide
-		 * and per-process unaligned-access-handling flags).
-		 */
-		if (user) {
-			sig = unaligned_fixup(tf, td);
-			if (sig == 0)
-				goto out;
-			ucode = tf->tf_special.ifa;	/* VA */
-		} else {
-			/* Check for copyin/copyout fault. */
-			if (td != NULL && td->td_pcb->pcb_onfault != 0) {
-				tf->tf_special.iip =
-				    td->td_pcb->pcb_onfault;
-				tf->tf_special.psr &= ~IA64_PSR_RI;
-				td->td_pcb->pcb_onfault = 0;
-				goto out;
-			}
-			trap_panic(vector, tf);
-		}
-		break;
-
-	case IA64_VEC_FLOATING_POINT_FAULT:
-	case IA64_VEC_FLOATING_POINT_TRAP: {
-		struct fpswa_bundle bundle;
-		struct fpswa_fpctx fpctx;
-		struct fpswa_ret ret;
-		char *ip;
-		u_long fault;
-
-		/* Always fatal in kernel. Should never happen. */
-		if (!user)
-			trap_panic(vector, tf);
-
-		if (fpswa_iface == NULL) {
-			sig = SIGFPE;
-			ucode = 0;
-			break;
-		}
-
-		ip = (char *)tf->tf_special.iip;
-		if (vector == IA64_VEC_FLOATING_POINT_TRAP &&
-		    (tf->tf_special.psr & IA64_PSR_RI) == 0)
-			ip -= 16;
-		error = copyin(ip, &bundle, sizeof(bundle));
-		if (error) {
-			sig = SIGBUS;	/* EFAULT, basically */
-			ucode = 0;	/* exception summary */
-			break;
-		}
-
-		/* f6-f15 are saved in exception_save */
-		fpctx.mask_low = 0xffc0;		/* bits 6 - 15 */
-		fpctx.mask_high = 0;
-		fpctx.fp_low_preserved = NULL;
-		fpctx.fp_low_volatile = &tf->tf_scratch_fp.fr6;
-		fpctx.fp_high_preserved = NULL;
-		fpctx.fp_high_volatile = NULL;
-
-		fault = (vector == IA64_VEC_FLOATING_POINT_FAULT) ? 1 : 0;
-
-		/*
-		 * We have the high FP registers disabled while in the
-		 * kernel. Enable them for the FPSWA handler only.
-		 */
-		ia64_enable_highfp();
-
-		/* The docs are unclear.  Is Fpswa reentrant? */
-		ret = fpswa_iface->if_fpswa(fault, &bundle,
-		    &tf->tf_special.psr, &tf->tf_special.fpsr,
-		    &tf->tf_special.isr, &tf->tf_special.pr,
-		    &tf->tf_special.cfm, &fpctx);
-
-		ia64_disable_highfp();
-
-		/*
-		 * Update ipsr and iip to next instruction. We only
-		 * have to do that for faults.
-		 */
-		if (fault && (ret.status == 0 || (ret.status & 2))) {
-			int ei;
-
-			ei = (tf->tf_special.isr >> 41) & 0x03;
-			if (ei == 0) {		/* no template for this case */
-				tf->tf_special.psr &= ~IA64_ISR_EI;
-				tf->tf_special.psr |= IA64_ISR_EI_1;
-			} else if (ei == 1) {	/* MFI or MFB */
-				tf->tf_special.psr &= ~IA64_ISR_EI;
-				tf->tf_special.psr |= IA64_ISR_EI_2;
-			} else if (ei == 2) {	/* MMF */
-				tf->tf_special.psr &= ~IA64_ISR_EI;
-				tf->tf_special.iip += 0x10;
-			}
-		}
-
-		if (ret.status == 0) {
-			goto out;
-		} else if (ret.status == -1) {
-			printf("FATAL: FPSWA err1 %lx, err2 %lx, err3 %lx\n",
-			    ret.err1, ret.err2, ret.err3);
-			panic("fpswa fatal error on fp fault");
-		} else {
-			sig = SIGFPE;
-			ucode = 0;		/* XXX exception summary */
-			break;
-		}
-	}
-
-	case IA64_VEC_LOWER_PRIVILEGE_TRANSFER:
-		/*
-		 * The lower-privilege transfer trap is used by the EPC
-		 * syscall code to trigger re-entry into the kernel when the
-		 * process should be single stepped. The problem is that
-		 * there's no way to set single stepping directly without
-		 * using the rfi instruction. So instead we enable the
-		 * lower-privilege transfer trap and when we get here we
-		 * know that the process is about to enter userland (and
-		 * has already lowered its privilege).
-		 * However, there's another gotcha. When the process has
-		 * lowered it's privilege it's still running in the gateway
-		 * page. If we enable single stepping, we'll be stepping
-		 * the code in the gateway page. In and by itself this is
-		 * not a problem, but it's an address debuggers won't know
-		 * anything about. Hence, it can only cause confusion.
-		 * We know that we need to branch to get out of the gateway
-		 * page, so what we do here is enable the taken branch
-		 * trap and just let the process continue. When we branch
-		 * out of the gateway page we'll get back into the kernel
-		 * and then we enable single stepping.
-		 * Since this a rather round-about way of enabling single
-		 * stepping, don't make things even more complicated by
-		 * calling userret() and do_ast(). We do that later...
-		 */
-		tf->tf_special.psr &= ~IA64_PSR_LP;
-		tf->tf_special.psr |= IA64_PSR_TB;
-		return;
-
-	case IA64_VEC_TAKEN_BRANCH_TRAP:
-		/*
-		 * Don't assume there aren't any branches other than the
-		 * branch that takes us out of the gateway page. Check the
-		 * iip and enable single stepping only when it's an user
-		 * address.
-		 */
-		if (tf->tf_special.iip >= VM_MAXUSER_ADDRESS)
-			return;
-		tf->tf_special.psr &= ~IA64_PSR_TB;
-		tf->tf_special.psr |= IA64_PSR_SS;
-		return;
-
-	case IA64_VEC_IA32_EXCEPTION:
-	case IA64_VEC_IA32_INTERCEPT:
-	case IA64_VEC_IA32_INTERRUPT:
-		sig = SIGEMT;
-		ucode = tf->tf_special.iip;
-		break;
-
-	default:
-		/* Reserved vectors get here. Should never happen of course. */
-		trap_panic(vector, tf);
-		break;
-	}
-
-	KASSERT(sig != 0, ("foo"));
-
-	if (print_usertrap)
-		printtrap(vector, tf, 1, user);
-
-	ksiginfo_init(&ksi);
-	ksi.ksi_signo = sig;
-	ksi.ksi_code = ucode;
-	trapsignal(td, &ksi);
-
-out:
-	if (user) {
-		userret(td, tf);
-		do_ast(tf);
-	}
-	return;
-}
-
-/*
- * Handle break instruction based system calls.
- */
-void
-break_syscall(struct trapframe *tf)
-{
-	uint64_t *bsp, *tfp;
-	uint64_t iip, psr;
-	int error, nargs;
-
-	/* Save address of break instruction. */
-	iip = tf->tf_special.iip;
-	psr = tf->tf_special.psr;
-
-	/* Advance to the next instruction. */
-	tf->tf_special.psr += IA64_PSR_RI_1;
-	if ((tf->tf_special.psr & IA64_PSR_RI) > IA64_PSR_RI_2) {
-		tf->tf_special.iip += 16;
-		tf->tf_special.psr &= ~IA64_PSR_RI;
-	}
-
-	/*
-	 * Copy the arguments on the register stack into the trapframe
-	 * to avoid having interleaved NaT collections.
-	 */
-	tfp = &tf->tf_scratch.gr16;
-	nargs = tf->tf_special.cfm & 0x7f;
-	bsp = (uint64_t*)(curthread->td_kstack + tf->tf_special.ndirty +
-	    (tf->tf_special.bspstore & 0x1ffUL));
-	bsp -= (((uintptr_t)bsp & 0x1ff) < (nargs << 3)) ? (nargs + 1): nargs;
-	while (nargs--) {
-		*tfp++ = *bsp++;
-		if (((uintptr_t)bsp & 0x1ff) == 0x1f8)
-			bsp++;
-	}
-	error = syscall(tf);
-	if (error == ERESTART) {
-		tf->tf_special.iip = iip;
-		tf->tf_special.psr = psr;
-	}
-
-	do_ast(tf);
-}
-
-int
-cpu_fetch_syscall_args(struct thread *td, struct syscall_args *sa)
-{
-	struct proc *p;
-	struct trapframe *tf;
-
-	p = td->td_proc;
-	tf = td->td_frame;
-
-	sa->code = tf->tf_scratch.gr15;
-	sa->args = &tf->tf_scratch.gr16;
-
-	/*
-	 * syscall() and __syscall() are handled the same on
-	 * the ia64, as everything is 64-bit aligned, anyway.
-	 */
-	if (sa->code == SYS_syscall || sa->code == SYS___syscall) {
-		/*
-		 * Code is first argument, followed by actual args.
-		 */
-		sa->code = sa->args[0];
-		sa->args++;
-	}
-
- 	if (p->p_sysent->sv_mask)
- 		sa->code &= p->p_sysent->sv_mask;
- 	if (sa->code >= p->p_sysent->sv_size)
- 		sa->callp = &p->p_sysent->sv_table[0];
- 	else
-		sa->callp = &p->p_sysent->sv_table[sa->code];
-	sa->narg = sa->callp->sy_narg;
-
-	td->td_retval[0] = 0;
-	td->td_retval[1] = 0;
-
-	return (0);
-}
-
-#include "../../kern/subr_syscall.c"
-
-/*
- * Process a system call.
- *
- * See syscall.s for details as to how we get here. In order to support
- * the ERESTART case, we return the error to our caller. They deal with
- * the hairy details.
- */
-int
-syscall(struct trapframe *tf)
-{
-	struct syscall_args sa;
-	struct thread *td;
-	int error;
-
-	td = curthread;
-	td->td_frame = tf;
-
-	ia64_set_fpsr(IA64_FPSR_DEFAULT);
-	tf->tf_scratch.gr10 = EJUSTRETURN;
-
-	error = syscallenter(td, &sa);
-	syscallret(td, error, &sa);
-
-	return (error);
-}
diff --git a/sys/ia64/ia64/uio_machdep.c b/sys/ia64/ia64/uio_machdep.c
deleted file mode 100644
index 35a4d42fa8e7..000000000000
--- a/sys/ia64/ia64/uio_machdep.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * Copyright (c) 2004 Alan L. Cox <alc@cs.rice.edu>
- * Copyright (c) 1982, 1986, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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.
- *
- *	@(#)kern_subr.c	8.3 (Berkeley) 1/21/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/uio.h>
-
-#include <vm/vm.h>
-#include <vm/vm_page.h>
-
-#include <machine/vmparam.h>
-
-/*
- * Implement uiomove(9) from physical memory using the direct map to
- * avoid the creation and destruction of ephemeral mappings.
- */
-int
-uiomove_fromphys(vm_page_t ma[], vm_offset_t offset, int n, struct uio *uio)
-{
-	struct thread *td = curthread;
-	struct iovec *iov;
-	void *cp;
-	vm_offset_t page_offset;
-	size_t cnt;
-	int error = 0;
-	int save = 0;
-
-	KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE,
-	    ("uiomove_fromphys: mode"));
-	KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread,
-	    ("uiomove_fromphys proc"));
-	save = td->td_pflags & TDP_DEADLKTREAT;
-	td->td_pflags |= TDP_DEADLKTREAT;
-	while (n > 0 && uio->uio_resid) {
-		iov = uio->uio_iov;
-		cnt = iov->iov_len;
-		if (cnt == 0) {
-			uio->uio_iov++;
-			uio->uio_iovcnt--;
-			continue;
-		}
-		if (cnt > n)
-			cnt = n;
-		page_offset = offset & PAGE_MASK;
-		cnt = min(cnt, PAGE_SIZE - page_offset);
-		cp = (char *)
-		    IA64_PHYS_TO_RR7(ma[offset >> PAGE_SHIFT]->phys_addr) +
-		    page_offset;
-		switch (uio->uio_segflg) {
-		case UIO_USERSPACE:
-			maybe_yield();
-			if (uio->uio_rw == UIO_READ)
-				error = copyout(cp, iov->iov_base, cnt);
-			else
-				error = copyin(iov->iov_base, cp, cnt);
-			if (error)
-				goto out;
-			break;
-		case UIO_SYSSPACE:
-			if (uio->uio_rw == UIO_READ)
-				bcopy(cp, iov->iov_base, cnt);
-			else
-				bcopy(iov->iov_base, cp, cnt);
-			break;
-		case UIO_NOCOPY:
-			break;
-		}
-		iov->iov_base = (char *)iov->iov_base + cnt;
-		iov->iov_len -= cnt;
-		uio->uio_resid -= cnt;
-		uio->uio_offset += cnt;
-		offset += cnt;
-		n -= cnt;
-	}
-out:
-	if (save == 0)
-		td->td_pflags &= ~TDP_DEADLKTREAT;
-	return (error);
-}
diff --git a/sys/ia64/ia64/uma_machdep.c b/sys/ia64/ia64/uma_machdep.c
deleted file mode 100644
index 29a45eaa9e7e..000000000000
--- a/sys/ia64/ia64/uma_machdep.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2003 The FreeBSD Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, 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/lock.h>
-#include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/systm.h>
-#include <vm/vm.h>
-#include <vm/vm_page.h>
-#include <vm/vm_pageout.h>
-#include <vm/uma.h>
-#include <vm/uma_int.h>
-#include <machine/vmparam.h>
-
-void *
-uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
-{
-	void *va;
-	vm_page_t m;
-	int pflags;
-
-	*flags = UMA_SLAB_PRIV;
-	pflags = malloc2vm_flags(wait) | VM_ALLOC_WIRED;
-
-	for (;;) {
-		m = vm_page_alloc(NULL, 0, pflags | VM_ALLOC_NOOBJ);
-		if (m == NULL) {
-			if (wait & M_NOWAIT)
-				return (NULL);
-			VM_WAIT;
-		} else
-			break;
-	}
-
-	va = (void *)IA64_PHYS_TO_RR7(VM_PAGE_TO_PHYS(m));
-	if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0)
-		bzero(va, PAGE_SIZE);
-	return (va);
-}
-
-void
-uma_small_free(void *mem, int size, u_int8_t flags)
-{
-	vm_page_t m;
-
-	m = PHYS_TO_VM_PAGE(IA64_RR_MASK((u_int64_t)mem));
-	m->wire_count--;
-	vm_page_free(m);
-	atomic_subtract_int(&vm_cnt.v_wire_count, 1);
-}
diff --git a/sys/ia64/ia64/unaligned.c b/sys/ia64/ia64/unaligned.c
deleted file mode 100644
index d4478f2717b4..000000000000
--- a/sys/ia64/ia64/unaligned.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/*-
- * Copyright (c) 2003 Marcel Moolenaar
- * Copyright (c) 2001 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/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/sysctl.h>
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-#include <machine/frame.h>
-#include <machine/md_var.h>
-#include <ia64/disasm/disasm.h>
-
-static int ia64_unaligned_print = 0;
-SYSCTL_INT(_debug, OID_AUTO, unaligned_print, CTLFLAG_RW,
-    &ia64_unaligned_print, 0, "warn about unaligned accesses");
-
-static int ia64_unaligned_test = 0;
-SYSCTL_INT(_debug, OID_AUTO, unaligned_test, CTLFLAG_RW,
-    &ia64_unaligned_test, 0, "test emulation when PSR.ac is set");
-
-static void *
-fpreg_ptr(mcontext_t *mc, int fr)
-{
-	union _ia64_fpreg *p;
-
-	if (fr <= 1 || fr >= 128)
-		return (NULL);
-	if (fr >= 32) {
-		p = &mc->mc_high_fp.fr32;
-		fr -= 32;
-	} else if (fr >= 16) {
-		p = &mc->mc_preserved_fp.fr16;
-		fr -= 16;
-	} else if (fr >= 6) {
-		p = &mc->mc_scratch_fp.fr6;
-		fr -= 6;
-	} else {
-		p = &mc->mc_preserved_fp.fr2;
-		fr -= 2;
-	}
-	return ((void*)(p + fr));
-}
-
-static void *
-greg_ptr(mcontext_t *mc, int gr)
-{
-	uint64_t *p;
-	int nslots;
-
-	if (gr <= 0 || gr >= 32 + (mc->mc_special.cfm & 0x7f))
-		return (NULL);
-	if (gr >= 32) {
-	 	nslots = IA64_CFM_SOF(mc->mc_special.cfm) - gr + 32;
-		p = (void *)ia64_bsp_adjust(mc->mc_special.bspstore, -nslots);
-		gr = 0;
-	} else if (gr >= 14) {
-		p = &mc->mc_scratch.gr14;
-		gr -= 14;
-	} else if (gr == 13) {
-		p = &mc->mc_special.tp;
-		gr = 0;
-	} else if (gr == 12) {
-		p = &mc->mc_special.sp;
-		gr = 0;
-	} else if (gr >= 8) {
-		p = &mc->mc_scratch.gr8;
-		gr -= 8;
-	} else if (gr >= 4) {
-		p = &mc->mc_preserved.gr4;
-		gr -= 4;
-	} else if (gr >= 2) {
-		p = &mc->mc_scratch.gr2;
-		gr -= 2;
-	} else {
-		p = &mc->mc_special.gp;
-		gr = 0;
-	}
-	return ((void*)(p + gr));
-}
-
-static uint64_t
-rdreg(uint64_t *addr)
-{
-	if ((uintptr_t)addr < VM_MAXUSER_ADDRESS)
-		return (fuword(addr));
-	return (*addr);
-}
-
-static void
-wrreg(uint64_t *addr, uint64_t val)
-{
-	if ((uintptr_t)addr < VM_MAXUSER_ADDRESS)
-		suword(addr, val);
-	else
-		*addr = val;
-}
-
-static int
-fixup(struct asm_inst *i, mcontext_t *mc, uint64_t va)
-{
-	union {
-		double d;
-		long double e;
-		uint64_t i;
-		float s;
-	} buf;
-	void *reg;
-	uint64_t postinc;
-
-	switch (i->i_op) {
-	case ASM_OP_LD2:
-		copyin((void*)va, (void*)&buf.i, 2);
-		reg = greg_ptr(mc, (int)i->i_oper[1].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		wrreg(reg, buf.i & 0xffffU);
-		break;
-	case ASM_OP_LD4:
-		copyin((void*)va, (void*)&buf.i, 4);
-		reg = greg_ptr(mc, (int)i->i_oper[1].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		wrreg(reg, buf.i & 0xffffffffU);
-		break;
-	case ASM_OP_LD8:
-		copyin((void*)va, (void*)&buf.i, 8);
-		reg = greg_ptr(mc, (int)i->i_oper[1].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		wrreg(reg, buf.i);
-		break;
-	case ASM_OP_LDFD:
-		copyin((void*)va, (void*)&buf.d, sizeof(buf.d));
-		reg = fpreg_ptr(mc, (int)i->i_oper[1].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		__asm("ldfd f6=%1;; stf.spill %0=f6" : "=m"(*(double *)reg) :
-		    "m"(buf.d) : "f6");
-		break;
-	case ASM_OP_LDFE:
-		copyin((void*)va, (void*)&buf.e, sizeof(buf.e));
-		reg = fpreg_ptr(mc, (int)i->i_oper[1].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		__asm("ldfe f6=%1;; stf.spill %0=f6" :
-		    "=m"(*(long double *)reg) : "m"(buf.e) : "f6");
-		break;
-	case ASM_OP_LDFS:
-		copyin((void*)va, (void*)&buf.s, sizeof(buf.s));
-		reg = fpreg_ptr(mc, (int)i->i_oper[1].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		__asm("ldfs f6=%1;; stf.spill %0=f6" : "=m"(*(float *)reg) :
-		    "m"(buf.s) : "f6");
-		break;
-	case ASM_OP_ST2:
-		reg = greg_ptr(mc, (int)i->i_oper[2].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		buf.i = rdreg(reg);
-		copyout((void*)&buf.i, (void*)va, 2);
-		break;
-	case ASM_OP_ST4:
-		reg = greg_ptr(mc, (int)i->i_oper[2].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		buf.i = rdreg(reg);
-		copyout((void*)&buf.i, (void*)va, 4);
-		break;
-	case ASM_OP_ST8:
-		reg = greg_ptr(mc, (int)i->i_oper[2].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		buf.i = rdreg(reg);
-		copyout((void*)&buf.i, (void*)va, 8);
-		break;
-	case ASM_OP_STFD:
-		reg = fpreg_ptr(mc, (int)i->i_oper[2].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		__asm("ldf.fill f6=%1;; stfd %0=f6" : "=m"(buf.d) :
-		    "m"(*(double *)reg) : "f6");
-		copyout((void*)&buf.d, (void*)va, sizeof(buf.d));
-		break;
-	case ASM_OP_STFE:
-		reg = fpreg_ptr(mc, (int)i->i_oper[2].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		__asm("ldf.fill f6=%1;; stfe %0=f6" : "=m"(buf.e) :
-		    "m"(*(long double *)reg) : "f6");
-		copyout((void*)&buf.e, (void*)va, sizeof(buf.e));
-		break;
-	case ASM_OP_STFS:
-		reg = fpreg_ptr(mc, (int)i->i_oper[2].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		__asm("ldf.fill f6=%1;; stfs %0=f6" : "=m"(buf.s) :
-		    "m"(*(float *)reg) : "f6");
-		copyout((void*)&buf.s, (void*)va, sizeof(buf.s));
-		break;
-	default:
-		return (ENOENT);
-	}
-
-	/* Handle post-increment. */
-	if (i->i_oper[3].o_type == ASM_OPER_GREG) {
-		reg = greg_ptr(mc, (int)i->i_oper[3].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		postinc = rdreg(reg);
-	} else
-		postinc = (i->i_oper[3].o_type == ASM_OPER_IMM)
-		    ? i->i_oper[3].o_value : 0;
-	if (postinc != 0) {
-		if (i->i_oper[1].o_type == ASM_OPER_MEM)
-			reg = greg_ptr(mc, (int)i->i_oper[1].o_value);
-		else
-			reg = greg_ptr(mc, (int)i->i_oper[2].o_value);
-		if (reg == NULL)
-			return (EINVAL);
-		postinc += rdreg(reg);
-		wrreg(reg, postinc);
-	}
-	return (0);
-}
-
-int
-unaligned_fixup(struct trapframe *tf, struct thread *td)
-{
-	mcontext_t context;
-	struct asm_bundle bundle;
-	int error, slot;
-
-	slot = ((tf->tf_special.psr & IA64_PSR_RI) == IA64_PSR_RI_0) ? 0 :
-	    ((tf->tf_special.psr & IA64_PSR_RI) == IA64_PSR_RI_1) ? 1 : 2;
-
-	if (ia64_unaligned_print) {
-		uprintf("pid %d (%s): unaligned access: va=0x%lx, pc=0x%lx\n",
-		    td->td_proc->p_pid, td->td_proc->p_comm,
-		    tf->tf_special.ifa, tf->tf_special.iip + slot);
-	}
-
-	/*
-	 * If PSR.ac is set, the process wants to be signalled about mis-
-	 * aligned loads and stores. Send it a SIGBUS. In order for us to
-	 * test the emulation of misaligned loads and stores, we have a
-	 * sysctl that tells us that we must emulate the load or store,
-	 * instead of sending the signal. We need the sysctl because if
-	 * PSR.ac is not set, the CPU may (and likely will) deal with the
-	 * misaligned load or store itself. As such, we won't get the
-	 * exception.
-	 */
-	if ((tf->tf_special.psr & IA64_PSR_AC) && !ia64_unaligned_test)
-		return (SIGBUS);
-
-	if (!asm_decode(tf->tf_special.iip, &bundle))
-		return (SIGILL);
-
-	get_mcontext(td, &context, 0);
-
-	error = fixup(bundle.b_inst + slot, &context, tf->tf_special.ifa);
-	if (error == ENOENT) {
-		printf("unhandled misaligned memory access:\n\t");
-		asm_print_inst(&bundle, slot, tf->tf_special.iip);
-		return (SIGILL);
-	} else if (error != 0)
-		return (SIGBUS);
-
-	set_mcontext(td, &context);
-
-	/* Advance to the next instruction. */
-	if (slot == 2) {
-		tf->tf_special.psr &= ~IA64_PSR_RI;
-		tf->tf_special.iip += 16;
-	} else
-		tf->tf_special.psr += IA64_PSR_RI_1;
-
-	return (0);
-}
diff --git a/sys/ia64/ia64/unwind.c b/sys/ia64/ia64/unwind.c
deleted file mode 100644
index 7b4c6d2912ac..000000000000
--- a/sys/ia64/ia64/unwind.c
+++ /dev/null
@@ -1,483 +0,0 @@
-/*-
- * Copyright (c) 2003, 2004 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/kdb.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/queue.h>
-
-#include <machine/frame.h>
-#include <machine/md_var.h>
-#include <machine/pcb.h>
-#include <machine/unwind.h>
-
-#include <uwx.h>
-
-static MALLOC_DEFINE(M_UNWIND, "Unwind", "Unwind information");
-
-struct unw_entry {
-	uint64_t	ue_start;	/* procedure start */
-	uint64_t	ue_end;		/* procedure end */
-	uint64_t	ue_info;	/* offset to procedure descriptors */
-};
-
-struct unw_table {
-	LIST_ENTRY(unw_table) ut_link;
-	uint64_t	ut_base;
-	uint64_t	ut_limit;
-	struct unw_entry *ut_start;
-	struct unw_entry *ut_end;
-};
-
-LIST_HEAD(unw_table_list, unw_table);
-
-static struct unw_table_list unw_tables;
-
-#ifdef KDB
-#define	KDBHEAPSZ	8192
-
-struct mhdr {
-	uint32_t	sig;
-#define	MSIG_FREE	0x65657246	/* "Free". */
-#define	MSIG_USED	0x64657355	/* "Used". */
-	uint32_t	size;
-	int32_t		next;
-	int32_t		prev;
-};
-
-static struct mhdr *kdbheap;
-#endif /* KDB */
-
-static void *
-unw_alloc(size_t sz)
-{
-#ifdef KDB
-	struct mhdr *hdr, *hfree;
-
-	if (kdb_active) {
-		sz = (sz + 15) >> 4;
-		hdr = kdbheap;
-		while (hdr->sig != MSIG_FREE || hdr->size < sz) {
-			if (hdr->next == -1)
-				return (NULL);
-			hdr = kdbheap + hdr->next;
-		}
-		if (hdr->size > sz + 1) {
-			hfree = hdr + sz + 1;
-			hfree->sig = MSIG_FREE;
-			hfree->size = hdr->size - sz - 1;
-			hfree->prev = hdr - kdbheap;
-			hfree->next = hdr->next;
-			hdr->size = sz;
-			hdr->next = hfree - kdbheap;
-			if (hfree->next >= 0) {
-				hfree = kdbheap + hfree->next;
-				hfree->prev = hdr->next;
-			}
-		}
-		hdr->sig = MSIG_USED;
-		return (void*)(hdr + 1);
-	}
-#endif
-	return (malloc(sz, M_UNWIND, M_NOWAIT));
-}
-
-static void
-unw_free(void *p)
-{
-#ifdef KDB
-	struct mhdr *hdr, *hfree;
-
-	if (kdb_active) {
-		hdr = (struct mhdr*)p - 1;
-		if (hdr->sig != MSIG_USED)
-			return;
-		hdr->sig = MSIG_FREE;
-		if (hdr->prev >= 0 && kdbheap[hdr->prev].sig == MSIG_FREE) {
-			hfree = kdbheap + hdr->prev;
-			hfree->size += hdr->size + 1;
-			hfree->next = hdr->next;
-			if (hdr->next >= 0) {
-				hfree = kdbheap + hdr->next;
-				hfree->prev = hdr->prev;
-			}
-		} else if (hdr->next >= 0 &&
-		    kdbheap[hdr->next].sig == MSIG_FREE) {
-			hfree = kdbheap + hdr->next;
-			hdr->size += hfree->size + 1;
-			hdr->next = hfree->next;
-			if (hdr->next >= 0) {
-				hfree = kdbheap + hdr->next;
-				hfree->prev = hdr - kdbheap;
-			}
-		}
-		return;
-	}
-#endif
-	free(p, M_UNWIND);
-}
-
-static struct unw_table *
-unw_table_lookup(uint64_t ip)
-{
-	struct unw_table *ut;
-
-	LIST_FOREACH(ut, &unw_tables, ut_link) {
-		if (ip >= ut->ut_base && ip < ut->ut_limit)
-			return (ut);
-	}
-	return (NULL);
-}
-
-static uint64_t
-unw_copyin_from_frame(struct trapframe *tf, uint64_t from)
-{
-	uint64_t val;
-	int reg;
-
-	if (from == UWX_REG_AR_PFS)
-		val = tf->tf_special.pfs;
-	else if (from == UWX_REG_PREDS)
-		val = tf->tf_special.pr;
-	else if (from == UWX_REG_AR_RNAT)
-		val = tf->tf_special.rnat;
-	else if (from == UWX_REG_AR_UNAT)
-		val = tf->tf_special.unat;
-	else if (from >= UWX_REG_GR(0) && from <= UWX_REG_GR(127)) {
-		reg = from - UWX_REG_GR(0);
-		if (reg == 1)
-			val = tf->tf_special.gp;
-		else if (reg == 12)
-			val = tf->tf_special.sp;
-		else if (reg == 13)
-			val = tf->tf_special.tp;
-		else if (reg >= 2 && reg <= 3)
-			val = (&tf->tf_scratch.gr2)[reg - 2];
-		else if (reg >= 8 && reg <= 11)
-			val = (&tf->tf_scratch.gr8)[reg - 8];
-		else if (reg >= 14 && reg <= 31)
-			val = (&tf->tf_scratch.gr14)[reg - 14];
-		else
-			goto oops;
-	} else if (from >= UWX_REG_BR(0) && from <= UWX_REG_BR(7)) {
-		reg = from - UWX_REG_BR(0);
-		if (reg == 0)
-			val = tf->tf_special.rp;
-		else if (reg >= 6 && reg <= 7)
-			val = (&tf->tf_scratch.br6)[reg - 6];
-		else
-			goto oops;
-	} else
-		goto oops;
-	return (val);
-
- oops:
-	printf("UNW: %s(%p, %lx)\n", __func__, tf, from);
-	return (0UL);
-}
-
-static uint64_t
-unw_copyin_from_pcb(struct pcb *pcb, uint64_t from)
-{
-	uint64_t val;
-	int reg;
-
-	if (from == UWX_REG_AR_PFS)
-		val = pcb->pcb_special.pfs;
-	else if (from == UWX_REG_PREDS)
-		val = pcb->pcb_special.pr;
-	else if (from == UWX_REG_AR_RNAT)
-		val = pcb->pcb_special.rnat;
-	else if (from == UWX_REG_AR_UNAT)
-		val = pcb->pcb_special.unat;
-	else if (from >= UWX_REG_GR(0) && from <= UWX_REG_GR(127)) {
-		reg = from - UWX_REG_GR(0);
-		if (reg == 1)
-			val = pcb->pcb_special.gp;
-		else if (reg == 12)
-			val = pcb->pcb_special.sp;
-		else if (reg == 13)
-			val = pcb->pcb_special.tp;
-		else if (reg >= 4 && reg <= 7)
-			val = (&pcb->pcb_preserved.gr4)[reg - 4];
-		else
-			goto oops;
-	} else if (from >= UWX_REG_BR(0) && from <= UWX_REG_BR(7)) {
-		reg = from - UWX_REG_BR(0);
-		if (reg == 0)
-			val = pcb->pcb_special.rp;
-		else if (reg >= 1 && reg <= 5)
-			val = (&pcb->pcb_preserved.br1)[reg - 1];
-		else
-			goto oops;
-	} else
-		goto oops;
-	return (val);
-
- oops:
-	printf("UNW: %s(%p, %lx)\n", __func__, pcb, from);
-	return (0UL);
-}
-
-static int
-unw_cb_copyin(int req, char *to, uint64_t from, int len, intptr_t tok)
-{
-	struct unw_regstate *rs = (void*)tok;
-	uint64_t val;
-
-	switch (req) {
-	case UWX_COPYIN_UINFO:
-		break;
-	case UWX_COPYIN_MSTACK:
-		*((uint64_t*)to) = *((uint64_t*)from);
-		return (8);
-	case UWX_COPYIN_RSTACK:
-		*((uint64_t*)to) = *((uint64_t*)from);
-		return (8);
-	case UWX_COPYIN_REG:
-		if (rs->frame != NULL)
-			val = unw_copyin_from_frame(rs->frame, from);
-		else if (rs->pcb != NULL)
-			val = unw_copyin_from_pcb(rs->pcb, from);
-		else
-			goto oops;
-		*((uint64_t*)to) = val;
-		return (len);
-	}
-
- oops:
-	printf("UNW: %s(%d, %p, %lx, %d, %lx)\n", __func__, req, to, from,
-	    len, tok);
-	return (0);
-}
-
-static int
-unw_cb_lookup(int req, uint64_t ip, intptr_t tok, uint64_t **vec)
-{
-	struct unw_regstate *rs = (void*)tok;
-	struct unw_table *ut;
-
-	switch (req) {
-	case UWX_LKUP_LOOKUP:
-		ut = unw_table_lookup(ip);
-		if (ut == NULL)
-			return (UWX_LKUP_NOTFOUND);
-		rs->keyval[0] = UWX_KEY_TBASE;
-		rs->keyval[1] = ut->ut_base;
-		rs->keyval[2] = UWX_KEY_USTART;
-		rs->keyval[3] = (intptr_t)ut->ut_start;
-		rs->keyval[4] = UWX_KEY_UEND;
-		rs->keyval[5] = (intptr_t)ut->ut_end;
-		rs->keyval[6] = 0;
-		rs->keyval[7] = 0;
-		*vec = rs->keyval;
-		return (UWX_LKUP_UTABLE);
-	case UWX_LKUP_FREE:
-		return (0);
-	}
-
-	return (UWX_LKUP_ERR);
-}
-
-int
-unw_create_from_frame(struct unw_regstate *rs, struct trapframe *tf)
-{
-	uint64_t bsp, ip;
-	int uwxerr;
-
-	rs->frame = tf;
-	rs->pcb = NULL;
-	rs->env = uwx_init();
-	if (rs->env == NULL)
-		return (ENOMEM);
-
-	uwxerr = uwx_register_callbacks(rs->env, (intptr_t)rs,
-	    unw_cb_copyin, unw_cb_lookup);
-	if (uwxerr)
-		return (EINVAL);		/* XXX */
-
-	bsp = tf->tf_special.bspstore + tf->tf_special.ndirty;
-	bsp = ia64_bsp_adjust(bsp, -IA64_CFM_SOF(tf->tf_special.cfm));
-	ip = tf->tf_special.iip + ((tf->tf_special.psr >> 41) & 3);
-
-	uwxerr = uwx_init_context(rs->env, ip, tf->tf_special.sp, bsp,
-	    tf->tf_special.cfm);
-
-	return ((uwxerr) ? EINVAL : 0);		/* XXX */
-}
-
-int
-unw_create_from_pcb(struct unw_regstate *rs, struct pcb *pcb)
-{
-	uint64_t bsp, cfm, ip;
-	int uwxerr;
-
-	rs->frame = NULL;
-	rs->pcb = pcb;
-	rs->env = uwx_init();
-	if (rs->env == NULL)
-		return (ENOMEM);
-
-	uwxerr = uwx_register_callbacks(rs->env, (intptr_t)rs,
-	    unw_cb_copyin, unw_cb_lookup);
-	if (uwxerr)
-		return (EINVAL);		/* XXX */
-
-	bsp = pcb->pcb_special.bspstore;
-	if (pcb->pcb_special.__spare == ~0UL) {
-		ip = pcb->pcb_special.iip + ((pcb->pcb_special.psr >> 41) & 3);
-		cfm = pcb->pcb_special.cfm;
-		bsp += pcb->pcb_special.ndirty;
-		bsp = ia64_bsp_adjust(bsp, -IA64_CFM_SOF(cfm));
-	} else {
-		ip = pcb->pcb_special.rp;
-		cfm = pcb->pcb_special.pfs;
-		bsp = ia64_bsp_adjust(bsp, -IA64_CFM_SOL(cfm));
-	}
-	uwxerr = uwx_init_context(rs->env, ip, pcb->pcb_special.sp, bsp, cfm);
-
-	return ((uwxerr) ? EINVAL : 0);		/* XXX */
-}
-
-void
-unw_delete(struct unw_regstate *rs)
-{
-
-	if (rs->env != NULL)
-		uwx_free(rs->env);
-}
-
-int
-unw_step(struct unw_regstate *rs)
-{
-	int err;
-
-	switch (uwx_step(rs->env)) {
-	case UWX_ABI_FRAME:
-		err = ERESTART;
-		break;
-	case UWX_BOTTOM:
-		err = EJUSTRETURN;
-		break;
-	case UWX_OK:
-		err = 0;
-		break;
-	default:
-		err = EINVAL;		/* XXX */
-		break;
-	}
-	return (err);
-}
-
-int
-unw_get_bsp(struct unw_regstate *s, uint64_t *r)
-{
-	int uwxerr;
-
-	uwxerr = uwx_get_reg(s->env, UWX_REG_BSP, r);
-	return ((uwxerr) ? EINVAL : 0); 	/* XXX */
-}
-
-int
-unw_get_cfm(struct unw_regstate *s, uint64_t *r)
-{
-	int uwxerr;
-
-	uwxerr = uwx_get_reg(s->env, UWX_REG_CFM, r);
-	return ((uwxerr) ? EINVAL : 0); 	/* XXX */
-}
-
-int
-unw_get_ip(struct unw_regstate *s, uint64_t *r)
-{
-	int uwxerr;
-
-	uwxerr = uwx_get_reg(s->env, UWX_REG_IP, r);
-	return ((uwxerr) ? EINVAL : 0); 	/* XXX */
-}
-
-int
-unw_get_sp(struct unw_regstate *s, uint64_t *r)
-{
-	int uwxerr;
-
-	uwxerr = uwx_get_reg(s->env, UWX_REG_SP, r);
-	return ((uwxerr) ? EINVAL : 0); 	/* XXX */
-}
-
-int
-unw_table_add(uint64_t base, uint64_t start, uint64_t end)
-{
-	struct unw_table *ut;
-
-	ut = malloc(sizeof(struct unw_table), M_UNWIND, M_WAITOK);
-	ut->ut_base = base;
-	ut->ut_start = (struct unw_entry*)start;
-	ut->ut_end = (struct unw_entry*)end;
-	ut->ut_limit = base + ut->ut_end[-1].ue_end;
-	LIST_INSERT_HEAD(&unw_tables, ut, ut_link);
-
-	if (bootverbose)
-		printf("UNWIND: table added: base=%lx, start=%lx, end=%lx\n",
-		    base, start, end);
-
-	return (0);
-}
-
-void
-unw_table_remove(uint64_t base)
-{
-	struct unw_table *ut;
-
-	ut = unw_table_lookup(base);
-	if (ut != NULL) {
-		LIST_REMOVE(ut, ut_link);
-		free(ut, M_UNWIND);
-		if (bootverbose)
-			printf("UNWIND: table removed: base=%lx\n", base);
-	}
-}
-
-static void
-unw_initialize(void *dummy __unused)
-{
-
-	LIST_INIT(&unw_tables);
-	uwx_register_alloc_cb(unw_alloc, unw_free);
-#ifdef KDB
-	kdbheap = malloc(KDBHEAPSZ, M_UNWIND, M_WAITOK);
-	kdbheap->sig = MSIG_FREE;
-	kdbheap->size = (KDBHEAPSZ - sizeof(struct mhdr)) >> 4;
-	kdbheap->next = -1;
-	kdbheap->prev = -1;
-#endif
-}
-SYSINIT(unwind, SI_SUB_KMEM, SI_ORDER_ANY, unw_initialize, 0);
diff --git a/sys/ia64/ia64/vm_machdep.c b/sys/ia64/ia64/vm_machdep.c
deleted file mode 100644
index 186897ba8553..000000000000
--- a/sys/ia64/ia64/vm_machdep.c
+++ /dev/null
@@ -1,363 +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/lock.h>
-#include <sys/malloc.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
-#include <sys/sysent.h>
-#include <sys/vnode.h>
-#include <sys/vmmeter.h>
-#include <sys/kernel.h>
-#include <sys/mbuf.h>
-#include <sys/sysctl.h>
-#include <sys/unistd.h>
-
-#include <machine/cpu.h>
-#include <machine/fpu.h>
-#include <machine/md_var.h>
-#include <machine/pcb.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>
-
-void
-cpu_thread_exit(struct thread *td)
-{
-
-	/* Throw away the high FP registers. */
-	ia64_highfp_drop(td);
-}
-
-void
-cpu_thread_clean(struct thread *td)
-{
-}
-
-void
-cpu_thread_alloc(struct thread *td)
-{
-	intptr_t sp;
-
-	sp = td->td_kstack + td->td_kstack_pages * PAGE_SIZE;
-	sp -= sizeof(struct pcb);
-	td->td_pcb = (struct pcb *)sp;
-	sp -= sizeof(struct trapframe);
-	td->td_frame = (struct trapframe *)sp;
-	td->td_frame->tf_length = sizeof(struct trapframe);
-}
-
-void
-cpu_thread_free(struct thread *td)
-{
-}
-
-void
-cpu_thread_swapin(struct thread *td)
-{
-}
-
-void
-cpu_thread_swapout(struct thread *td)
-{
-
-	ia64_highfp_save(td);
-}
-
-void
-cpu_set_syscall_retval(struct thread *td, int error)
-{
-	struct proc *p;
-	struct trapframe *tf;
-
-	if (error == EJUSTRETURN)
-		return;
-
-	tf = td->td_frame;
-
-	/*
-	 * Save the "raw" error code in r10. We use this to handle
-	 * syscall restarts (see do_ast()).
-	 */
-	tf->tf_scratch.gr10 = error;
-	if (error == 0) {
-		tf->tf_scratch.gr8 = td->td_retval[0];
-		tf->tf_scratch.gr9 = td->td_retval[1];
-	} else if (error != ERESTART) {
-		p = td->td_proc;
-		if (error < p->p_sysent->sv_errsize)
-			error = p->p_sysent->sv_errtbl[error];
-		/*
-		 * Translated error codes are returned in r8. User
-		 */
-		tf->tf_scratch.gr8 = error;
-	}
-}
-
-void
-cpu_set_upcall(struct thread *td, struct thread *td0)
-{
-	struct pcb *pcb;
-	struct trapframe *tf;
-
-	ia64_highfp_save(td0);
-
-	tf = td->td_frame;
-	KASSERT(tf != NULL, ("foo"));
-	bcopy(td0->td_frame, tf, sizeof(*tf));
-	tf->tf_length = sizeof(struct trapframe);
-	tf->tf_flags = FRAME_SYSCALL;
-	tf->tf_special.ndirty = 0;
-	tf->tf_special.bspstore &= ~0x1ffUL;
-	tf->tf_scratch.gr8 = 0;
-	tf->tf_scratch.gr9 = 1;
-	tf->tf_scratch.gr10 = 0;
-
-	pcb = td->td_pcb;
-	KASSERT(pcb != NULL, ("foo"));
-	bcopy(td0->td_pcb, pcb, sizeof(*pcb));
-	pcb->pcb_special.bspstore = td->td_kstack;
-	pcb->pcb_special.pfs = 0;
-	pcb->pcb_current_pmap = vmspace_pmap(td0->td_proc->p_vmspace);
-	pcb->pcb_special.sp = (uintptr_t)tf - 16;
-	pcb->pcb_special.rp = FDESC_FUNC(fork_trampoline);
-	cpu_set_fork_handler(td, (void (*)(void*))fork_return, td);
-
-	/* Setup to release the spin count in fork_exit(). */
-	td->td_md.md_spinlock_count = 1;
-	td->td_md.md_saved_intr = 1;
-}
-
-void
-cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg,
-	stack_t *stack)
-{
-	struct ia64_fdesc *fd;
-	struct trapframe *tf;
-	uint64_t ndirty, sp;
-
-	tf = td->td_frame;
-	ndirty = tf->tf_special.ndirty + (tf->tf_special.bspstore & 0x1ffUL);
-
-	KASSERT((ndirty & ~PAGE_MASK) == 0,
-	    ("Whoa there! We have more than 8KB of dirty registers!"));
-
-	fd = (struct ia64_fdesc *)entry;
-	sp = (uint64_t)stack->ss_sp;
-
-	bzero(&tf->tf_special, sizeof(tf->tf_special));
-	tf->tf_special.iip = fuword(&fd->func);
-	tf->tf_special.gp = fuword(&fd->gp);
-	tf->tf_special.sp = (sp + stack->ss_size - 16) & ~15;
-	tf->tf_special.rsc = 0xf;
-	tf->tf_special.fpsr = IA64_FPSR_DEFAULT;
-	tf->tf_special.psr = IA64_PSR_IC | IA64_PSR_I | IA64_PSR_IT |
-	    IA64_PSR_DT | IA64_PSR_RT | IA64_PSR_DFH | IA64_PSR_BN |
-	    IA64_PSR_CPL_USER;
-
-	if (tf->tf_flags & FRAME_SYSCALL) {
-		tf->tf_special.cfm = (3UL<<62) | (1UL<<7) | 1UL;
-		tf->tf_special.bspstore = sp + 8;
-		suword((caddr_t)sp, (uint64_t)arg);
-	} else {
-		tf->tf_special.cfm = (1UL<<63) | (1UL<<7) | 1UL;
-		tf->tf_special.bspstore = sp;
-		tf->tf_special.ndirty = 8;
-		sp = td->td_kstack + ndirty - 8;
-		if ((sp & 0x1ff) == 0x1f8) {
-			*(uint64_t*)sp = 0;
-			tf->tf_special.ndirty += 8;
-			sp -= 8;
-		}
-		*(uint64_t*)sp = (uint64_t)arg;
-	}
-}
-
-int
-cpu_set_user_tls(struct thread *td, void *tls_base)
-{
-	td->td_frame->tf_special.tp = (unsigned long)tls_base;
-	return (0);
-}
-
-/*
- * 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 __unused, struct thread *td2,
-    int flags)
-{
-	char *stackp;
-	uint64_t ndirty;
-
-	KASSERT(td1 == curthread || td1 == &thread0,
-	    ("cpu_fork: td1 not curthread and not thread0"));
-
-	if ((flags & RFPROC) == 0)
-		return;
-
-	/*
-	 * Save the preserved registers and the high FP registers in the
-	 * PCB if we're the parent (ie td1 == curthread) so that we have
-	 * a valid PCB. This also causes a RSE flush. We don't have to
-	 * do that otherwise, because there wouldn't be anything important
-	 * to save.
-	 */
-	if (td1 == curthread) {
-		if (savectx(td1->td_pcb) != 0)
-			panic("unexpected return from savectx()");
-		ia64_highfp_save(td1);
-	}
-
-	/*
-	 * create the child's kernel stack and backing store. We basicly
-	 * create an image of the parent's stack and backing store and
-	 * adjust where necessary.
-	 */
-	stackp = (char *)(td2->td_kstack + td2->td_kstack_pages * PAGE_SIZE);
-
-	stackp -= sizeof(struct pcb);
-	td2->td_pcb = (struct pcb *)stackp;
-	bcopy(td1->td_pcb, td2->td_pcb, sizeof(struct pcb));
-
-	stackp -= sizeof(struct trapframe);
-	td2->td_frame = (struct trapframe *)stackp;
-	bcopy(td1->td_frame, td2->td_frame, sizeof(struct trapframe));
-	td2->td_frame->tf_length = sizeof(struct trapframe);
-	ndirty = td2->td_frame->tf_special.ndirty +
-	    (td2->td_frame->tf_special.bspstore & 0x1ffUL);
-	bcopy((void*)td1->td_kstack, (void*)td2->td_kstack, ndirty);
-
-	/* Set-up the return values as expected by the fork() libc stub. */
-	if (td2->td_frame->tf_special.psr & IA64_PSR_IS) {
-		td2->td_frame->tf_scratch.gr8 = 0;
-		td2->td_frame->tf_scratch.gr10 = 1;
-	} else {
-		td2->td_frame->tf_scratch.gr8 = 0;
-		td2->td_frame->tf_scratch.gr9 = 1;
-		td2->td_frame->tf_scratch.gr10 = 0;
-	}
-
-	td2->td_pcb->pcb_special.bspstore = td2->td_kstack + ndirty;
-	td2->td_pcb->pcb_special.pfs = 0;
-	td2->td_pcb->pcb_current_pmap = vmspace_pmap(td2->td_proc->p_vmspace);
-
-	td2->td_pcb->pcb_special.sp = (uintptr_t)stackp - 16;
-	td2->td_pcb->pcb_special.rp = FDESC_FUNC(fork_trampoline);
-	cpu_set_fork_handler(td2, (void (*)(void*))fork_return, td2);
-
-	/* Setup to release the spin count in fork_exit(). */
-	td2->td_md.md_spinlock_count = 1;
-	td2->td_md.md_saved_intr = 1;
-}
-
-/*
- * 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;
-{
-	td->td_frame->tf_scratch.gr2 = (u_int64_t)func;
-	td->td_frame->tf_scratch.gr3 = (u_int64_t)arg;
-}
-
-/*
- * cpu_exit is called as the last action during exit.
- * We drop the fp state (if we have it) and switch to a live one.
- */
-void
-cpu_exit(struct thread *td)
-{
-}
-
-/*
- * Software interrupt handler for queued VM system processing.
- */   
-void  
-swi_vm(void *dummy) 
-{
-
-	if (busdma_swi_pending != 0)
-		busdma_swi();
-}
diff --git a/sys/ia64/ia64/xtrace.c b/sys/ia64/ia64/xtrace.c
deleted file mode 100644
index 486c091ba703..000000000000
--- a/sys/ia64/ia64/xtrace.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*-
- * Copyright (c) 2014 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "opt_ddb.h"
-#include "opt_xtrace.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/ktr.h>
-#include <sys/malloc.h>
-#include <sys/pcpu.h>
-#include <machine/md_var.h>
-#include <machine/pte.h>
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-#include <vm/vm_kern.h>
-
-#define	XTRACE_LOG2SZ	14	/* 16KB trace buffers */
-
-struct ia64_xtrace_record {
-	uint64_t	ivt;
-	uint64_t	itc;
-	uint64_t	iip;
-	uint64_t	ifa;
-	uint64_t	isr;
-	uint64_t	ipsr;
-	uint64_t	itir;
-	uint64_t	iipa;
-
-	uint64_t	ifs;
-	uint64_t	iim;
-	uint64_t	iha;
-	uint64_t	unat;
-	uint64_t	rsc;
-	uint64_t	bsp;
-	uint64_t	tp;
-	uint64_t	sp;
-};
-
-extern uint32_t ia64_xtrace_enabled;
-extern uint64_t ia64_xtrace_mask;
-
-static uint64_t ia64_xtrace_base;
-
-static void
-ia64_xtrace_init_common(vm_paddr_t pa)
-{
-	uint64_t psr;
-	pt_entry_t pte;
-
-	pte = PTE_PRESENT | PTE_MA_WB | PTE_ACCESSED | PTE_DIRTY |
-	    PTE_PL_KERN | PTE_AR_RW;
-	pte |= pa & PTE_PPN_MASK;
-
-	__asm __volatile("ptr.d %0,%1" :: "r"(ia64_xtrace_base),
-	    "r"(XTRACE_LOG2SZ << 2));
-
-	__asm __volatile("mov   %0=psr" : "=r"(psr));
-	__asm __volatile("rsm   psr.ic|psr.i");
-	ia64_srlz_i();
-
-	ia64_set_ifa(ia64_xtrace_base);
-	ia64_set_itir(XTRACE_LOG2SZ << 2);
-	ia64_srlz_d();
-	__asm __volatile("itr.d dtr[%0]=%1" :: "r"(6), "r"(pte));
-
-	__asm __volatile("mov   psr.l=%0" :: "r" (psr));
-	ia64_srlz_i();
-
-	PCPU_SET(md.xtrace_tail, ia64_xtrace_base);
-	ia64_set_k3(ia64_xtrace_base);
-}
-
-void *
-ia64_xtrace_alloc(void)
-{
-	uintptr_t buf;
-	size_t sz;
-
-	sz = 1UL << XTRACE_LOG2SZ;
-	buf = kmem_alloc_contig(kernel_arena, sz, M_WAITOK | M_ZERO,
-	    0UL, ~0UL, sz, 0, VM_MEMATTR_DEFAULT);
-	return ((void *)buf);
-}
-
-void
-ia64_xtrace_init_ap(void *buf)
-{
-	vm_paddr_t pa;
-
-	if (buf == NULL) {
-		ia64_set_k3(0);
-		return;
-	}
-	PCPU_SET(md.xtrace_buffer, buf);
-	pa = ia64_tpa((uintptr_t)buf);
-	ia64_xtrace_init_common(pa);
-}
-
-void
-ia64_xtrace_init_bsp(void)
-{
-	void *buf;
-	vm_paddr_t pa;
-	size_t sz;
-
-	sz = 1UL << XTRACE_LOG2SZ;
-	ia64_xtrace_base = VM_MIN_KERNEL_ADDRESS + (sz << 1);
-	ia64_xtrace_mask = ~sz;
-
-	buf = ia64_physmem_alloc(sz, sz);
-	if (buf == NULL) {
-		ia64_set_k3(0);
-		return;
-	}
-	PCPU_SET(md.xtrace_buffer, buf);
-	pa = IA64_RR_MASK((uintptr_t)buf);
-	ia64_xtrace_init_common(pa);
-}
-
-static void
-ia64_xtrace_init(void *dummy __unused)
-{
-
-	TUNABLE_INT_FETCH("machdep.xtrace.enabled", &ia64_xtrace_enabled);
-}
-SYSINIT(xtrace, SI_SUB_CPU, SI_ORDER_ANY, ia64_xtrace_init, NULL);
-
-void
-ia64_xtrace_save(void)
-{
-	struct ia64_xtrace_record *rec;
-	uint64_t head, tail;
-
-	critical_enter();
-	head = ia64_get_k3();
-	tail = PCPU_GET(md.xtrace_tail);
-	if (head == 0 || tail == 0) {
-		critical_exit();
-		return;
-	}
-	while (head != tail) {
-		rec = (void *)(uintptr_t)tail;
-		CTR6(KTR_TRAP, "XTRACE: itc=%lu, ticks=%d: "
-		    "IVT=%#lx, IIP=%#lx, IFA=%#lx, ISR=%#lx",
-		    rec->itc, ticks,
-		    rec->ivt, rec->iip, rec->ifa, rec->isr);
-		tail += sizeof(*rec);
-		tail &= ia64_xtrace_mask;
-	}
-	PCPU_SET(md.xtrace_tail, tail);
-	critical_exit();
-}
-
-void
-ia64_xtrace_stop(void)
-{
-	ia64_xtrace_enabled = 0;
-}
-
-#if 0
-#ifdef DDB
-
-#include <ddb/ddb.h>
-
-DB_SHOW_COMMAND(xtrace, db_xtrace)
-{
-        struct ia64_xtrace_record *p, *r;
-
-        p = (ia64_xtptr == 0) ? ia64_xtptr1 : ia64_xtptr;
-        if (p == 0) {
-                db_printf("Exception trace buffer not allocated\n");
-                return;
-        }
-
-        r = (p->ivt == 0) ? ia64_xtbase : p;
-        if (r->ivt == 0) {
-                db_printf("No exception trace records written\n");
-                return;
-        }
-
-        db_printf("IVT\t\t ITC\t\t  IIP\t\t   IFA\n");
-        do {
-                db_printf("%016lx %016lx %016lx %016lx\n",
-                    r->ivt, r->itc, r->iip, r->ifa);
-                r++;
-                if (r == ia64_xtlim)
-                        r = ia64_xtbase;
-        } while (r != p);
-}
-
-#endif /* DDB */
-#endif
diff --git a/sys/ia64/include/_align.h b/sys/ia64/include/_align.h
deleted file mode 100644
index 26df35b1487f..000000000000
--- a/sys/ia64/include/_align.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $FreeBSD$ */
-/* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
-
-/*-
- * Copyright (c) 1988 University of Utah.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  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 Ralph Campbell.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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: Utah $Hdr: machparam.h 1.11 89/08/14$
- *
- *	@(#)param.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _IA64_INCLUDE__ALIGN_H_
-#define	_IA64_INCLUDE__ALIGN_H_
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value for all
- * data types (int, long, ...).   The result is u_long and must be cast to
- * any desired pointer type.
- */
-#define	_ALIGNBYTES		15
-#define	_ALIGN(p)		(((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES)
-
-#endif /* !_IA64_INCLUDE__ALIGN_H_ */
diff --git a/sys/ia64/include/_bus.h b/sys/ia64/include/_bus.h
deleted file mode 100644
index 95d94b40387f..000000000000
--- a/sys/ia64/include/_bus.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2005 M. Warner Losh.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification, immediately at the beginning of the file.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef IA64_INCLUDE__BUS_H
-#define IA64_INCLUDE__BUS_H
-
-/*
- * Bus address and size types
- */
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
-
-/*
- * Access methods for bus resources and address space.
- */
-typedef	int bus_space_tag_t;
-typedef	u_long bus_space_handle_t;
-
-#endif /* IA64_INCLUDE__BUS_H */
diff --git a/sys/ia64/include/_inttypes.h b/sys/ia64/include/_inttypes.h
deleted file mode 100644
index a7cbea593b93..000000000000
--- a/sys/ia64/include/_inttypes.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (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: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_INTTYPES_H_
-#define _MACHINE_INTTYPES_H_
-
-/*
- * Macros for format specifiers.
- */
-
-/* fprintf(3) macros for signed integers. */
-
-#define	PRId8		"d"	/* int8_t */
-#define	PRId16		"d"	/* int16_t */
-#define	PRId32		"d"	/* int32_t */
-#define	PRId64		"ld"	/* int64_t */
-#define	PRIdLEAST8	"d"	/* int_least8_t */
-#define	PRIdLEAST16	"d"	/* int_least16_t */
-#define	PRIdLEAST32	"d"	/* int_least32_t */
-#define	PRIdLEAST64	"ld"	/* int_least64_t */
-#define	PRIdFAST8	"d"	/* int_fast8_t */
-#define	PRIdFAST16	"d"	/* int_fast16_t */
-#define	PRIdFAST32	"d"	/* int_fast32_t */
-#define	PRIdFAST64	"ld"	/* int_fast64_t */
-#define	PRIdMAX		"jd"	/* intmax_t */
-#define	PRIdPTR		"ld"	/* intptr_t */
-
-#define	PRIi8		"i"	/* int8_t */
-#define	PRIi16		"i"	/* int16_t */
-#define	PRIi32		"i"	/* int32_t */
-#define	PRIi64		"li"	/* int64_t */
-#define	PRIiLEAST8	"i"	/* int_least8_t  */
-#define	PRIiLEAST16	"i"	/* int_least16_t */
-#define	PRIiLEAST32	"i"	/* int_least32_t */
-#define	PRIiLEAST64	"li"	/* int_least64_t */
-#define	PRIiFAST8	"i"	/* int_fast8_t */
-#define	PRIiFAST16	"i"	/* int_fast16_t */
-#define	PRIiFAST32	"i"	/* int_fast32_t */
-#define	PRIiFAST64	"li"	/* int_fast64_t */
-#define	PRIiMAX		"ji"	/* intmax_t */
-#define	PRIiPTR		"li"	/* intptr_t */
-
-/* fprintf(3) macros for unsigned integers. */
-
-#define	PRIo8		"o"	/* uint8_t */
-#define	PRIo16		"o"	/* uint16_t */
-#define	PRIo32		"o"	/* uint32_t */
-#define	PRIo64		"lo"	/* uint64_t */
-#define	PRIoLEAST8	"o"	/* uint_least8_t */
-#define	PRIoLEAST16	"o"	/* uint_least16_t */
-#define	PRIoLEAST32	"o"	/* uint_least32_t */
-#define	PRIoLEAST64	"lo"	/* uint_least64_t */
-#define	PRIoFAST8	"o"	/* uint_fast8_t */
-#define	PRIoFAST16	"o"	/* uint_fast16_t */
-#define	PRIoFAST32	"o"	/* uint_fast32_t */
-#define	PRIoFAST64	"lo"	/* uint_fast64_t */
-#define	PRIoMAX		"jo"	/* uintmax_t */
-#define	PRIoPTR		"lo"	/* uintptr_t */
-
-#define	PRIu8		"u"	/* uint8_t */
-#define	PRIu16		"u"	/* uint16_t */
-#define	PRIu32		"u"	/* uint32_t */
-#define	PRIu64		"lu"	/* uint64_t */
-#define	PRIuLEAST8	"u"	/* uint_least8_t */
-#define	PRIuLEAST16	"u"	/* uint_least16_t */
-#define	PRIuLEAST32	"u"	/* uint_least32_t */
-#define	PRIuLEAST64	"lu"	/* uint_least64_t */
-#define	PRIuFAST8	"u"	/* uint_fast8_t */
-#define	PRIuFAST16	"u"	/* uint_fast16_t */
-#define	PRIuFAST32	"u"	/* uint_fast32_t */
-#define	PRIuFAST64	"lu"	/* uint_fast64_t */
-#define	PRIuMAX		"ju"	/* uintmax_t */
-#define	PRIuPTR		"lu"	/* uintptr_t */
-
-#define	PRIx8		"x"	/* uint8_t */
-#define	PRIx16		"x"	/* uint16_t */
-#define	PRIx32		"x"	/* uint32_t */
-#define	PRIx64		"lx"	/* uint64_t */
-#define	PRIxLEAST8	"x"	/* uint_least8_t */
-#define	PRIxLEAST16	"x"	/* uint_least16_t */
-#define	PRIxLEAST32	"x"	/* uint_least32_t */
-#define	PRIxLEAST64	"lx"	/* uint_least64_t */
-#define	PRIxFAST8	"x"	/* uint_fast8_t */
-#define	PRIxFAST16	"x"	/* uint_fast16_t */
-#define	PRIxFAST32	"x"	/* uint_fast32_t */
-#define	PRIxFAST64	"lx"	/* uint_fast64_t */
-#define	PRIxMAX		"jx"	/* uintmax_t */
-#define	PRIxPTR		"lx"	/* uintptr_t */
-
-#define	PRIX8		"X"	/* uint8_t */
-#define	PRIX16		"X"	/* uint16_t */
-#define	PRIX32		"X"	/* uint32_t */
-#define	PRIX64		"lX"	/* uint64_t */
-#define	PRIXLEAST8	"X"	/* uint_least8_t */
-#define	PRIXLEAST16	"X"	/* uint_least16_t */
-#define	PRIXLEAST32	"X"	/* uint_least32_t */
-#define	PRIXLEAST64	"lX"	/* uint_least64_t */
-#define	PRIXFAST8	"X"	/* uint_fast8_t */
-#define	PRIXFAST16	"X"	/* uint_fast16_t */
-#define	PRIXFAST32	"X"	/* uint_fast32_t */
-#define	PRIXFAST64	"lX"	/* uint_fast64_t */
-#define	PRIXMAX		"jX"	/* uintmax_t */
-#define	PRIXPTR		"lX"	/* uintptr_t */
-
-/* fscanf(3) macros for signed integers. */
-
-#define	SCNd8		"hhd"	/* int8_t */
-#define	SCNd16		"hd"	/* int16_t */
-#define	SCNd32		"d"	/* int32_t */
-#define	SCNd64		"ld"	/* int64_t */
-#define	SCNdLEAST8	"hhd"	/* int_least8_t */
-#define	SCNdLEAST16	"hd"	/* int_least16_t */
-#define	SCNdLEAST32	"d"	/* int_least32_t */
-#define	SCNdLEAST64	"ld"	/* int_least64_t */
-#define	SCNdFAST8	"d"	/* int_fast8_t */
-#define	SCNdFAST16	"d"	/* int_fast16_t */
-#define	SCNdFAST32	"d"	/* int_fast32_t */
-#define	SCNdFAST64	"ld"	/* int_fast64_t */
-#define	SCNdMAX		"jd"	/* intmax_t */
-#define	SCNdPTR		"ld"	/* intptr_t */
-
-#define	SCNi8		"hhi"	/* int8_t */
-#define	SCNi16		"hi"	/* int16_t */
-#define	SCNi32		"i"	/* int32_t */
-#define	SCNi64		"li"	/* int64_t */
-#define	SCNiLEAST8	"hhi"	/* int_least8_t */
-#define	SCNiLEAST16	"hi"	/* int_least16_t */
-#define	SCNiLEAST32	"i"	/* int_least32_t */
-#define	SCNiLEAST64	"li"	/* int_least64_t */
-#define	SCNiFAST8	"i"	/* int_fast8_t */
-#define	SCNiFAST16	"i"	/* int_fast16_t */
-#define	SCNiFAST32	"i"	/* int_fast32_t */
-#define	SCNiFAST64	"li"	/* int_fast64_t */
-#define	SCNiMAX		"ji"	/* intmax_t */
-#define	SCNiPTR		"li"	/* intptr_t */
-
-/* fscanf(3) macros for unsigned integers. */
-
-#define	SCNo8		"hho"	/* uint8_t */
-#define	SCNo16		"ho"	/* uint16_t */
-#define	SCNo32		"o"	/* uint32_t */
-#define	SCNo64		"lo"	/* uint64_t */
-#define	SCNoLEAST8	"hho"	/* uint_least8_t */
-#define	SCNoLEAST16	"ho"	/* uint_least16_t */
-#define	SCNoLEAST32	"o"	/* uint_least32_t */
-#define	SCNoLEAST64	"lo"	/* uint_least64_t */
-#define	SCNoFAST8	"o"	/* uint_fast8_t */
-#define	SCNoFAST16	"o"	/* uint_fast16_t */
-#define	SCNoFAST32	"o"	/* uint_fast32_t */
-#define	SCNoFAST64	"lo"	/* uint_fast64_t */
-#define	SCNoMAX		"jo"	/* uintmax_t */
-#define	SCNoPTR		"lo"	/* uintptr_t */
-
-#define	SCNu8		"hhu"	/* uint8_t */
-#define	SCNu16		"hu"	/* uint16_t */
-#define	SCNu32		"u"	/* uint32_t */
-#define	SCNu64		"lu"	/* uint64_t */
-#define	SCNuLEAST8	"hhu"	/* uint_least8_t */
-#define	SCNuLEAST16	"hu"	/* uint_least16_t */
-#define	SCNuLEAST32	"u"	/* uint_least32_t */
-#define	SCNuLEAST64	"lu"	/* uint_least64_t */
-#define	SCNuFAST8	"u"	/* uint_fast8_t */
-#define	SCNuFAST16	"u"	/* uint_fast16_t */
-#define	SCNuFAST32	"u"	/* uint_fast32_t */
-#define	SCNuFAST64	"lu"	/* uint_fast64_t */
-#define	SCNuMAX		"ju"	/* uintmax_t */
-#define	SCNuPTR		"lu"	/* uintptr_t */
-
-#define	SCNx8		"hhx"	/* uint8_t */
-#define	SCNx16		"hx"	/* uint16_t */
-#define	SCNx32		"x"	/* uint32_t */
-#define	SCNx64		"lx"	/* uint64_t */
-#define	SCNxLEAST8	"hhx"	/* uint_least8_t */
-#define	SCNxLEAST16	"hx"	/* uint_least16_t */
-#define	SCNxLEAST32	"x"	/* uint_least32_t */
-#define	SCNxLEAST64	"lx"	/* uint_least64_t */
-#define	SCNxFAST8	"x"	/* uint_fast8_t */
-#define	SCNxFAST16	"x"	/* uint_fast16_t */
-#define	SCNxFAST32	"x"	/* uint_fast32_t */
-#define	SCNxFAST64	"lx"	/* uint_fast64_t */
-#define	SCNxMAX		"jx"	/* uintmax_t */
-#define	SCNxPTR		"lx"	/* uintptr_t */
-
-#endif /* !_MACHINE_INTTYPES_H_ */
diff --git a/sys/ia64/include/_limits.h b/sys/ia64/include/_limits.h
deleted file mode 100644
index 938412fc0714..000000000000
--- a/sys/ia64/include/_limits.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* $FreeBSD$ */
-/* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp */
-
-/*-
- * Copyright (c) 1988, 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.
- *
- *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- */
-
-#ifndef _MACHINE__LIMITS_H_
-#define	_MACHINE__LIMITS_H_
-
-/*
- * According to ANSI (section 2.2.4.2), the values below must be usable by
- * #if preprocessing directives.  Additionally, the expression must have the
- * same type as would an expression that is an object of the corresponding
- * type converted according to the integral promotions.  The subtraction for
- * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an
- * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
- */
-
-#define	__CHAR_BIT	8		/* number of bits in a char */
-
-#define	__SCHAR_MAX	0x7f		/* max value for a signed char */
-#define	__SCHAR_MIN	(-0x7f-1)	/* min value for a signed char */
-
-#define	__UCHAR_MAX	0xff		/* max value for an unsigned char */
-
-#define	__USHRT_MAX	0xffff		/* max value for an unsigned short */
-#define	__SHRT_MAX	0x7fff		/* max value for a short */
-#define	__SHRT_MIN	(-0x7fff-1)	/* min value for a short */
-
-#define	__UINT_MAX	0xffffffff	/* max value for an unsigned int */
-#define	__INT_MAX	0x7fffffff	/* max value for an int */
-#define	__INT_MIN	(-0x7fffffff-1)	/* min value for an int */
-
-#define	__ULONG_MAX	0xffffffffffffffff	/* max for an unsigned long */
-#define	__LONG_MAX	0x7fffffffffffffff	/* max for a long */
-#define	__LONG_MIN	(-0x7fffffffffffffff-1) /* min for a long */
-
-/* Long longs have the same size but not the same type as longs. */
-					/* max for an unsigned long long */
-#define	__ULLONG_MAX	0xffffffffffffffffULL
-#define	__LLONG_MAX	0x7fffffffffffffffLL	/* max for a long long */
-#define	__LLONG_MIN	(-0x7fffffffffffffffLL-1) /* min for a long long */
-
-#define	__SSIZE_MAX	__LONG_MAX	/* max value for a ssize_t */
-
-#define	__SIZE_T_MAX	__ULONG_MAX	/* max value for a size_t */
-
-#define	__OFF_MAX	__LONG_MAX	/* max value for an off_t */
-#define	__OFF_MIN	__LONG_MIN	/* min value for an off_t */
-
-/* Quads and longs are the same.  Ensure they stay in sync. */
-#define	__UQUAD_MAX	(__ULONG_MAX)	/* max value for a uquad_t */
-#define	__QUAD_MAX	(__LONG_MAX)	/* max value for a quad_t */
-#define	__QUAD_MIN	(__LONG_MIN)	/* min value for a quad_t */
-
-#define	__LONG_BIT	64
-#define	__WORD_BIT	32
-
-/* Minimum signal stack size. */
-#define	__MINSIGSTKSZ	(3072 * 4)
-
-#endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/ia64/include/_regset.h b/sys/ia64/include/_regset.h
deleted file mode 100644
index 1abe2ab06163..000000000000
--- a/sys/ia64/include/_regset.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 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 _MACHINE_REGSET_H_
-#define	_MACHINE_REGSET_H_
-
-/*
- * Create register sets, based on the runtime specification. This allows
- * us to better reuse code and to copy sets around more efficiently.
- * Contexts are defined in terms of these sets. These include trapframe,
- * sigframe, pcb, mcontext, reg and fpreg. Other candidates are unwind
- * and coredump related contexts.
- *
- * Notes:
- * o  Constant registers (r0, f0 and f1) are not accounted for,
- * o  The stacked registers (r32-r127) are not accounted for,
- * o  Predicates are not split across sets.
- */
-
-/* A single FP register. */
-union _ia64_fpreg {
-	unsigned char	fpr_bits[16];
-	long double	fpr_flt;
-};
-
-/*
- * Special registers.
- */
-struct _special {
-	unsigned long		sp;
-	unsigned long		unat;		/* NaT before spilling */
-	unsigned long		rp;
-	unsigned long		pr;
-	unsigned long		pfs;
-	unsigned long		bspstore;
-	unsigned long		rnat;
-	unsigned long		__spare;
-	/* Userland context and syscalls */
-	unsigned long		tp;
-	unsigned long		rsc;
-	unsigned long		fpsr;
-	unsigned long		psr;
-	/* ASYNC: Interrupt specific */
-	unsigned long		gp;
-	unsigned long		ndirty;
-	unsigned long		cfm;
-	unsigned long		iip;
-	unsigned long		ifa;
-	unsigned long		isr;
-};
-
-struct _high_fp {
-	union _ia64_fpreg	fr32;
-	union _ia64_fpreg	fr33;
-	union _ia64_fpreg	fr34;
-	union _ia64_fpreg	fr35;
-	union _ia64_fpreg	fr36;
-	union _ia64_fpreg	fr37;
-	union _ia64_fpreg	fr38;
-	union _ia64_fpreg	fr39;
-	union _ia64_fpreg	fr40;
-	union _ia64_fpreg	fr41;
-	union _ia64_fpreg	fr42;
-	union _ia64_fpreg	fr43;
-	union _ia64_fpreg	fr44;
-	union _ia64_fpreg	fr45;
-	union _ia64_fpreg	fr46;
-	union _ia64_fpreg	fr47;
-	union _ia64_fpreg	fr48;
-	union _ia64_fpreg	fr49;
-	union _ia64_fpreg	fr50;
-	union _ia64_fpreg	fr51;
-	union _ia64_fpreg	fr52;
-	union _ia64_fpreg	fr53;
-	union _ia64_fpreg	fr54;
-	union _ia64_fpreg	fr55;
-	union _ia64_fpreg	fr56;
-	union _ia64_fpreg	fr57;
-	union _ia64_fpreg	fr58;
-	union _ia64_fpreg	fr59;
-	union _ia64_fpreg	fr60;
-	union _ia64_fpreg	fr61;
-	union _ia64_fpreg	fr62;
-	union _ia64_fpreg	fr63;
-	union _ia64_fpreg	fr64;
-	union _ia64_fpreg	fr65;
-	union _ia64_fpreg	fr66;
-	union _ia64_fpreg	fr67;
-	union _ia64_fpreg	fr68;
-	union _ia64_fpreg	fr69;
-	union _ia64_fpreg	fr70;
-	union _ia64_fpreg	fr71;
-	union _ia64_fpreg	fr72;
-	union _ia64_fpreg	fr73;
-	union _ia64_fpreg	fr74;
-	union _ia64_fpreg	fr75;
-	union _ia64_fpreg	fr76;
-	union _ia64_fpreg	fr77;
-	union _ia64_fpreg	fr78;
-	union _ia64_fpreg	fr79;
-	union _ia64_fpreg	fr80;
-	union _ia64_fpreg	fr81;
-	union _ia64_fpreg	fr82;
-	union _ia64_fpreg	fr83;
-	union _ia64_fpreg	fr84;
-	union _ia64_fpreg	fr85;
-	union _ia64_fpreg	fr86;
-	union _ia64_fpreg	fr87;
-	union _ia64_fpreg	fr88;
-	union _ia64_fpreg	fr89;
-	union _ia64_fpreg	fr90;
-	union _ia64_fpreg	fr91;
-	union _ia64_fpreg	fr92;
-	union _ia64_fpreg	fr93;
-	union _ia64_fpreg	fr94;
-	union _ia64_fpreg	fr95;
-	union _ia64_fpreg	fr96;
-	union _ia64_fpreg	fr97;
-	union _ia64_fpreg	fr98;
-	union _ia64_fpreg	fr99;
-	union _ia64_fpreg	fr100;
-	union _ia64_fpreg	fr101;
-	union _ia64_fpreg	fr102;
-	union _ia64_fpreg	fr103;
-	union _ia64_fpreg	fr104;
-	union _ia64_fpreg	fr105;
-	union _ia64_fpreg	fr106;
-	union _ia64_fpreg	fr107;
-	union _ia64_fpreg	fr108;
-	union _ia64_fpreg	fr109;
-	union _ia64_fpreg	fr110;
-	union _ia64_fpreg	fr111;
-	union _ia64_fpreg	fr112;
-	union _ia64_fpreg	fr113;
-	union _ia64_fpreg	fr114;
-	union _ia64_fpreg	fr115;
-	union _ia64_fpreg	fr116;
-	union _ia64_fpreg	fr117;
-	union _ia64_fpreg	fr118;
-	union _ia64_fpreg	fr119;
-	union _ia64_fpreg	fr120;
-	union _ia64_fpreg	fr121;
-	union _ia64_fpreg	fr122;
-	union _ia64_fpreg	fr123;
-	union _ia64_fpreg	fr124;
-	union _ia64_fpreg	fr125;
-	union _ia64_fpreg	fr126;
-	union _ia64_fpreg	fr127;
-};
-
-/*
- * Preserved registers.
- */
-struct _callee_saved {
-	unsigned long		unat;		/* NaT after spilling. */
-	unsigned long		gr4;
-	unsigned long		gr5;
-	unsigned long		gr6;
-	unsigned long		gr7;
-	unsigned long		br1;
-	unsigned long		br2;
-	unsigned long		br3;
-	unsigned long		br4;
-	unsigned long		br5;
-	unsigned long		lc;
-	unsigned long		__spare;
-};
-
-struct _callee_saved_fp {
-	union _ia64_fpreg	fr2;
-	union _ia64_fpreg	fr3;
-	union _ia64_fpreg	fr4;
-	union _ia64_fpreg	fr5;
-	union _ia64_fpreg	fr16;
-	union _ia64_fpreg	fr17;
-	union _ia64_fpreg	fr18;
-	union _ia64_fpreg	fr19;
-	union _ia64_fpreg	fr20;
-	union _ia64_fpreg	fr21;
-	union _ia64_fpreg	fr22;
-	union _ia64_fpreg	fr23;
-	union _ia64_fpreg	fr24;
-	union _ia64_fpreg	fr25;
-	union _ia64_fpreg	fr26;
-	union _ia64_fpreg	fr27;
-	union _ia64_fpreg	fr28;
-	union _ia64_fpreg	fr29;
-	union _ia64_fpreg	fr30;
-	union _ia64_fpreg	fr31;
-};
-
-/*
- * Scratch registers.
- */
-struct _caller_saved {
-	unsigned long		unat;		/* NaT after spilling. */
-	unsigned long		gr2;
-	unsigned long		gr3;
-	unsigned long		gr8;
-	unsigned long		gr9;
-	unsigned long		gr10;
-	unsigned long		gr11;
-	unsigned long		gr14;
-	unsigned long		gr15;
-	unsigned long		gr16;
-	unsigned long		gr17;
-	unsigned long		gr18;
-	unsigned long		gr19;
-	unsigned long		gr20;
-	unsigned long		gr21;
-	unsigned long		gr22;
-	unsigned long		gr23;
-	unsigned long		gr24;
-	unsigned long		gr25;
-	unsigned long		gr26;
-	unsigned long		gr27;
-	unsigned long		gr28;
-	unsigned long		gr29;
-	unsigned long		gr30;
-	unsigned long		gr31;
-	unsigned long		br6;
-	unsigned long		br7;
-	unsigned long		ccv;
-	unsigned long		csd;
-	unsigned long		ssd;
-};
-
-struct _caller_saved_fp {
-	union _ia64_fpreg	fr6;
-	union _ia64_fpreg	fr7;
-	union _ia64_fpreg	fr8;
-	union _ia64_fpreg	fr9;
-	union _ia64_fpreg	fr10;
-	union _ia64_fpreg	fr11;
-	union _ia64_fpreg	fr12;
-	union _ia64_fpreg	fr13;
-	union _ia64_fpreg	fr14;
-	union _ia64_fpreg	fr15;
-};
-
-#ifdef _KERNEL
-void	restore_callee_saved(const struct _callee_saved *);
-void	restore_callee_saved_fp(const struct _callee_saved_fp *);
-void	restore_high_fp(const struct _high_fp *);
-void	save_callee_saved(struct _callee_saved *);
-void	save_callee_saved_fp(struct _callee_saved_fp *);
-void	save_high_fp(struct _high_fp *);
-#endif
-
-#endif	/* _MACHINE_REGSET_H_ */
diff --git a/sys/ia64/include/_stdint.h b/sys/ia64/include/_stdint.h
deleted file mode 100644
index cb3b1a230595..000000000000
--- a/sys/ia64/include/_stdint.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*-
- * Copyright (c) 2001, 2002 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (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__STDINT_H_
-#define	_MACHINE__STDINT_H_
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
-
-#define	INT8_C(c)		(c)
-#define	INT16_C(c)		(c)
-#define	INT32_C(c)		(c)
-#define	INT64_C(c)		(c ## L)
-
-#define	UINT8_C(c)		(c)
-#define	UINT16_C(c)		(c)
-#define	UINT32_C(c)		(c ## U)
-#define	UINT64_C(c)		(c ## UL)
-
-#define	INTMAX_C(c)		INT64_C(c)
-#define	UINTMAX_C(c)		UINT64_C(c)
-
-#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.1 Limits of exact-width integer types
- */
-/* Minimum values of exact-width signed integer types. */
-#define	INT8_MIN	(-0x7f-1)
-#define	INT16_MIN	(-0x7fff-1)
-#define	INT32_MIN	(-0x7fffffff-1)
-#define	INT64_MIN	(-0x7fffffffffffffffL-1)
-
-/* Maximum values of exact-width signed integer types. */
-#define	INT8_MAX	0x7f
-#define	INT16_MAX	0x7fff
-#define	INT32_MAX	0x7fffffff
-#define	INT64_MAX	0x7fffffffffffffffL
-
-/* Maximum values of exact-width unsigned integer types. */
-#define	UINT8_MAX	0xff
-#define	UINT16_MAX	0xffff
-#define	UINT32_MAX	0xffffffffU
-#define	UINT64_MAX	0xffffffffffffffffUL
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.2  Limits of minimum-width integer types
- */
-/* Minimum values of minimum-width signed integer types. */
-#define	INT_LEAST8_MIN	INT8_MIN
-#define	INT_LEAST16_MIN	INT16_MIN
-#define	INT_LEAST32_MIN	INT32_MIN
-#define	INT_LEAST64_MIN	INT64_MIN
-
-/* Maximum values of minimum-width signed integer types. */
-#define	INT_LEAST8_MAX	INT8_MAX
-#define	INT_LEAST16_MAX	INT16_MAX
-#define	INT_LEAST32_MAX	INT32_MAX
-#define	INT_LEAST64_MAX	INT64_MAX
-
-/* Maximum values of minimum-width unsigned integer types. */
-#define	UINT_LEAST8_MAX	 UINT8_MAX
-#define	UINT_LEAST16_MAX UINT16_MAX
-#define	UINT_LEAST32_MAX UINT32_MAX
-#define	UINT_LEAST64_MAX UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.3  Limits of fastest minimum-width integer types
- */
-/* Minimum values of fastest minimum-width signed integer types. */
-#define	INT_FAST8_MIN	INT32_MIN
-#define	INT_FAST16_MIN	INT32_MIN
-#define	INT_FAST32_MIN	INT32_MIN
-#define	INT_FAST64_MIN	INT64_MIN
-
-/* Maximum values of fastest minimum-width signed integer types. */
-#define	INT_FAST8_MAX	INT32_MAX
-#define	INT_FAST16_MAX	INT32_MAX
-#define	INT_FAST32_MAX	INT32_MAX
-#define	INT_FAST64_MAX	INT64_MAX
-
-/* Maximum values of fastest minimum-width unsigned integer types. */
-#define	UINT_FAST8_MAX	UINT32_MAX
-#define	UINT_FAST16_MAX	UINT32_MAX
-#define	UINT_FAST32_MAX	UINT32_MAX
-#define	UINT_FAST64_MAX	UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.4  Limits of integer types capable of holding object pointers
- */
-#define	INTPTR_MIN	INT64_MIN
-#define	INTPTR_MAX	INT64_MAX
-#define	UINTPTR_MAX	UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.5  Limits of greatest-width integer types
- */
-#define	INTMAX_MIN	INT64_MIN
-#define	INTMAX_MAX	INT64_MAX
-#define	UINTMAX_MAX	UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.3  Limits of other integer types
- */
-/* Limits of ptrdiff_t. */
-#define	PTRDIFF_MIN	INT64_MIN	
-#define	PTRDIFF_MAX	INT64_MAX
-
-/* Limits of sig_atomic_t. */
-#define	SIG_ATOMIC_MIN	INT32_MIN
-#define	SIG_ATOMIC_MAX	INT32_MAX
-
-/* Limit of size_t. */
-#define	SIZE_MAX	UINT64_MAX
-
-/* Limits of wint_t. */
-#define	WINT_MIN	INT32_MIN
-#define	WINT_MAX	INT32_MAX
-
-#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */
-
-#endif /* !_MACHINE__STDINT_H_ */
diff --git a/sys/ia64/include/_types.h b/sys/ia64/include/_types.h
deleted file mode 100644
index 572b9694f2ce..000000000000
--- a/sys/ia64/include/_types.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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: @(#)ansi.h	8.2 (Berkeley) 1/4/94
- *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD$
- */
-
-#ifndef _MACHINE__TYPES_H_
-#define	_MACHINE__TYPES_H_
-
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-
-/*
- * Basic types upon which most other types are built.
- */
-typedef	signed char		__int8_t;
-typedef	unsigned char		__uint8_t;
-typedef	short			__int16_t;
-typedef	unsigned short		__uint16_t;
-typedef	int			__int32_t;
-typedef	unsigned int		__uint32_t;
-typedef	long			__int64_t;
-typedef	unsigned long		__uint64_t;
-
-/*
- * Standard type definitions.
- */
-typedef	__int32_t	__clock_t;		/* clock()... */
-typedef	__int64_t	__critical_t;
-typedef	double		__double_t;
-typedef	float		__float_t;
-typedef	__int64_t	__intfptr_t;
-typedef	__int64_t	__intmax_t;
-typedef	__int64_t	__intptr_t;
-typedef	__int32_t	__int_fast8_t;
-typedef	__int32_t	__int_fast16_t;
-typedef	__int32_t	__int_fast32_t;
-typedef	__int64_t	__int_fast64_t;
-typedef	__int8_t	__int_least8_t;
-typedef	__int16_t	__int_least16_t;
-typedef	__int32_t	__int_least32_t;
-typedef	__int64_t	__int_least64_t;
-typedef	__int64_t	__ptrdiff_t;		/* ptr1 - ptr2 */
-typedef	__int64_t	__register_t;
-typedef	__int64_t	__segsz_t;		/* segment size (in pages) */
-typedef	__uint64_t	__size_t;		/* sizeof() */
-typedef	__int64_t	__ssize_t;		/* byte count or error */
-typedef	__int64_t	__time_t;		/* time()... */
-typedef	__uint64_t	__uintfptr_t;
-typedef	__uint64_t	__uintmax_t;
-typedef	__uint64_t	__uintptr_t;
-typedef	__uint32_t	__uint_fast8_t;
-typedef	__uint32_t	__uint_fast16_t;
-typedef	__uint32_t	__uint_fast32_t;
-typedef	__uint64_t	__uint_fast64_t;
-typedef	__uint8_t	__uint_least8_t;
-typedef	__uint16_t	__uint_least16_t;
-typedef	__uint32_t	__uint_least32_t;
-typedef	__uint64_t	__uint_least64_t;
-typedef	__uint64_t	__u_register_t;
-typedef	__uint64_t	__vm_offset_t;
-typedef	__int64_t	__vm_ooffset_t;
-typedef	__uint64_t	__vm_paddr_t;
-typedef	__uint64_t	__vm_pindex_t;
-typedef	__uint64_t	__vm_size_t;
-typedef	int		___wchar_t;
-
-#define	__WCHAR_MIN	__INT_MIN	/* min value for a wchar_t */
-#define	__WCHAR_MAX	__INT_MAX	/* max value for a wchar_t */
-
-/*
- * Unusual type definitions.
- */
-#ifdef __GNUCLIKE_BUILTIN_VARARGS
-typedef __builtin_va_list	__va_list;	/* internally known to gcc */
-#if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \
-    && !defined(__NO_GNUC_VA_LIST)
-#define	__GNUC_VA_LIST
-typedef	__va_list	__gnuc_va_list;		/* compat. with GNU headers */
-#endif
-#else
-#ifdef lint
-typedef char *			__va_list;	/* non-functional */
-#else
-#error Must add va_list support for this non-GCC compiler.   
-#endif /* lint */
-#endif /* __GNUCLIKE_BUILTIN_VARARGS */
-
-#endif /* !_MACHINE__TYPES_H_ */
diff --git a/sys/ia64/include/acpica_machdep.h b/sys/ia64/include/acpica_machdep.h
deleted file mode 100644
index 2f861e847b3e..000000000000
--- a/sys/ia64/include/acpica_machdep.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2002 Mitsuru IWASAKI
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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$
- */
-
-/******************************************************************************
- *
- * Name: acpica_machdep.h - arch-specific defines, etc.
- *       $Revision$
- *
- *****************************************************************************/
-
-#ifndef __ACPICA_MACHDEP_H__
-#define	__ACPICA_MACHDEP_H__
-
-#ifdef _KERNEL
-
-/*
- * Calling conventions:
- *
- * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)
- * ACPI_EXTERNAL_XFACE      - External ACPI interfaces 
- * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces
- * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces
- */
-#define	ACPI_SYSTEM_XFACE
-#define	ACPI_EXTERNAL_XFACE
-#define	ACPI_INTERNAL_XFACE
-#define	ACPI_INTERNAL_VAR_XFACE
-
-/* Asm macros */
-
-#define	ACPI_ASM_MACROS
-#define	BREAKPOINT3
-#define	ACPI_DISABLE_IRQS()	ia64_disable_intr()
-#define	ACPI_ENABLE_IRQS()	ia64_enable_intr()
-
-#define	ACPI_FLUSH_CPU_CACHE()	/* XXX ia64_fc()? */
-
-/* Section 5.2.10.1: global lock acquire/release functions */
-int	acpi_acquire_global_lock(volatile uint32_t *);
-int	acpi_release_global_lock(volatile uint32_t *);
-#define	ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq)	do {			\
-	(Acq) = acpi_acquire_global_lock(&((GLptr)->GlobalLock));	\
-} while (0)
-#define	ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq)	do {			\
-	(Acq) = acpi_release_global_lock(&((GLptr)->GlobalLock));	\
-} while (0)
-
-void	acpi_cpu_c1(void);
-
-#endif /* _KERNEL */
-
-#endif /* __ACPICA_MACHDEP_H__ */
diff --git a/sys/ia64/include/asm.h b/sys/ia64/include/asm.h
deleted file mode 100644
index 4b4236d7eda1..000000000000
--- a/sys/ia64/include/asm.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/* $FreeBSD$ */
-/* From: NetBSD: asm.h,v 1.18 1997/11/03 04:22:06 ross Exp */
-
-/*-
- * Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * 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 Mellon
- * the rights to redistribute these changes.
- */
-
-/*
- *	Assembly coding style
- *
- *	This file contains macros and register defines to
- *	aid in writing more readable assembly code.
- *	Some rules to make assembly code understandable by
- *	a debugger are also noted.
- */
-
-/*
- * Macro to make a local label name.
- */
-#define	LLABEL(name,num)	L ## name ## num
-
-/*
- * MCOUNT
- */
-#if defined(PROF) || (defined(_KERNEL) && defined(GPROF))
-#define	MCOUNT					\
-	alloc	out0 = ar.pfs, 8, 0, 4, 0;	\
-	mov	out1 = r1;			\
-	mov	out2 = b0;;			\
-	mov	out3 = r0;			\
-	br.call.sptk b0 = _mcount;;
-#else
-#define	MCOUNT	/* nothing */
-#endif
-
-/*
- * ENTRY
- *	Declare a global leaf function.
- *	A leaf function does not call other functions.
- */
-#define	ENTRY(_name_, _n_args_)			\
-	.global	_name_;				\
-	.align	32;				\
-	.proc	_name_;				\
-_name_:;					\
-	.regstk	_n_args_, 0, 0, 0;		\
-	MCOUNT
-
-#define	ENTRY_NOPROFILE(_name_, _n_args_)	\
-	.global	_name_;				\
-	.align	32;				\
-	.proc	_name_;				\
-_name_:;					\
-	.regstk	_n_args_, 0, 0, 0
-
-/*
- * STATIC_ENTRY
- *	Declare a local leaf function.
- */
-#define STATIC_ENTRY(_name_, _n_args_)		\
-	.align	32;				\
-	.proc	_name_;				\
-_name_:;					\
-	.regstk	_n_args_, 0, 0, 0		\
-	MCOUNT
-/*
- * XENTRY
- *	Global alias for a leaf function, or alternate entry point
- */
-#define	XENTRY(_name_)				\
-	.globl	_name_;				\
-_name_:
-
-/*
- * STATIC_XENTRY
- *	Local alias for a leaf function, or alternate entry point
- */
-#define	STATIC_XENTRY(_name_)			\
-_name_:
-
-
-/*
- * END
- *	Function delimiter
- */
-#define	END(_name_)						\
-	.endp	_name_
-
-
-/*
- * EXPORT
- *	Export a symbol
- */
-#define	EXPORT(_name_)						\
-	.global	_name_;						\
-_name_:
-
-
-/*
- * IMPORT
- *	Make an external name visible, typecheck the size
- */
-#define	IMPORT(_name_, _size_)					\
-	/* .extern	_name_,_size_ */
-
-
-/*
- * ABS
- *	Define an absolute symbol
- */
-#define	ABS(_name_, _value_)					\
-	.globl	_name_;						\
-_name_	=	_value_
-
-
-/*
- * BSS
- *	Allocate un-initialized space for a global symbol
- */
-#define	BSS(_name_,_numbytes_)					\
-	.comm	_name_,_numbytes_
-
-
-/*
- * MSG
- *	Allocate space for a message (a read-only ascii string)
- */
-#define	ASCIZ	.asciz
-#define	MSG(msg,reg,label)			\
-	addl reg,@ltoff(label),gp;;		\
-	ld8 reg=[reg];;				\
-	.data;					\
-label:	ASCIZ msg;				\
-	.text;
-
-
-/*
- * System call glue.
- */
-#define	SYSCALLNUM(name)	SYS_ ## name
-
-#define	CALLSYS_NOERROR(name)					\
-	.prologue ;						\
-	.unwabi		@svr4, 'S' ;				\
-	.save		rp, r0 ;				\
-	.body ;							\
-{	.mmi ;							\
-	alloc		r9 = ar.pfs, 0, 0, 8, 0 ;		\
-	mov		r31 = ar.k5 ;				\
-	mov		r10 = b0 ;; }				\
-{	.mib ;							\
-	mov		r8 = SYSCALLNUM(name) ;			\
-	mov		b7 = r31 ; 				\
-	br.call.sptk	b0 = b7 ;; }
-
-
-/*
- * WEAK_ALIAS: create a weak alias (ELF only).
- */
-#define WEAK_ALIAS(alias,sym)					\
-	.weak alias;						\
-	alias = sym
-
-/*
- * ID tag macros
- */
-#if !defined(lint) && !defined(STRIP_FBSDID)
-#define __FBSDID(s)	.ident s
-#else
-#define __FBSDID(s)	/* nothing */
-#endif /* not lint and not STRIP_FBSDID */
diff --git a/sys/ia64/include/atomic.h b/sys/ia64/include/atomic.h
deleted file mode 100644
index e8ac7a715631..000000000000
--- a/sys/ia64/include/atomic.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/*-
- * Copyright (c) 1998 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$
- */
-
-#ifndef _MACHINE_ATOMIC_H_
-#define	_MACHINE_ATOMIC_H_
-
-#define	mb()	__asm __volatile("mf")
-#define	wmb()	mb()
-#define	rmb()	mb()
-
-/*
- * Various simple arithmetic on memory which is atomic in the presence
- * of interrupts and SMP safe.
- */
-
-/*
- * Everything is built out of cmpxchg.
- */
-#define	IA64_CMPXCHG(sz, sem, p, cmpval, newval, ret)			\
-	__asm __volatile (						\
-		"mov ar.ccv=%2;;\n\t"					\
-		"cmpxchg" #sz "." #sem " %0=%4,%3,ar.ccv\n\t"		\
-		: "=r" (ret), "=m" (*p)					\
-		: "r" ((uint64_t)cmpval), "r" (newval), "m" (*p)	\
-		: "memory")
-
-/*
- * Some common forms of cmpxch.
- */
-static __inline uint32_t
-ia64_cmpxchg_acq_32(volatile uint32_t* p, uint32_t cmpval, uint32_t newval)
-{
-	uint32_t ret;
-	IA64_CMPXCHG(4, acq, p, cmpval, newval, ret);
-	return (ret);
-}
-
-static __inline uint32_t
-ia64_cmpxchg_rel_32(volatile uint32_t* p, uint32_t cmpval, uint32_t newval)
-{
-	uint32_t ret;
-	IA64_CMPXCHG(4, rel, p, cmpval, newval, ret);
-	return (ret);
-}
-
-static __inline uint64_t
-ia64_cmpxchg_acq_64(volatile uint64_t* p, uint64_t cmpval, uint64_t newval)
-{
-	uint64_t ret;
-	IA64_CMPXCHG(8, acq, p, cmpval, newval, ret);
-	return (ret);
-}
-
-static __inline uint64_t
-ia64_cmpxchg_rel_64(volatile uint64_t* p, uint64_t cmpval, uint64_t newval)
-{
-	uint64_t ret;
-	IA64_CMPXCHG(8, rel, p, cmpval, newval, ret);
-	return (ret);
-}
-
-#define	ATOMIC_STORE_LOAD(type, width, size)				\
-	static __inline uint##width##_t					\
-	ia64_ld_acq_##width(volatile uint##width##_t* p)		\
-	{								\
-		uint##width##_t v;					\
-		__asm __volatile ("ld" size ".acq %0=%1" : "=r" (v)	\
-		    : "m" (*p) : "memory");				\
-		return (v);						\
-	}								\
-									\
-	static __inline uint##width##_t					\
-	atomic_load_acq_##width(volatile uint##width##_t* p)		\
-	{								\
-		uint##width##_t v;					\
-		__asm __volatile ("ld" size ".acq %0=%1" : "=r" (v)	\
-		    : "m" (*p) : "memory");				\
-		return (v);						\
-	}								\
-									\
-	static __inline uint##width##_t					\
-	atomic_load_acq_##type(volatile uint##width##_t* p)		\
-	{								\
-		uint##width##_t v;					\
-		__asm __volatile ("ld" size ".acq %0=%1" : "=r" (v)	\
-		    : "m" (*p) : "memory");				\
-		return (v);						\
-	}								\
-								       	\
-	static __inline void						\
-	ia64_st_rel_##width(volatile uint##width##_t* p, uint##width##_t v) \
-	{								\
-		__asm __volatile ("st" size ".rel %0=%1" : "=m" (*p)	\
-		    : "r" (v) : "memory");				\
-	}								\
-									\
-	static __inline void						\
-	atomic_store_rel_##width(volatile uint##width##_t* p,		\
-	    uint##width##_t v)						\
-	{								\
-		__asm __volatile ("st" size ".rel %0=%1" : "=m" (*p)	\
-		    : "r" (v) : "memory");				\
-	}								\
-									\
-	static __inline void						\
-	atomic_store_rel_##type(volatile uint##width##_t* p,		\
-	    uint##width##_t v)						\
-	{								\
-		__asm __volatile ("st" size ".rel %0=%1" : "=m" (*p)	\
-		    : "r" (v) : "memory");				\
-	}
-
-ATOMIC_STORE_LOAD(char,	 8,  "1")
-ATOMIC_STORE_LOAD(short, 16, "2")
-ATOMIC_STORE_LOAD(int,	 32, "4")
-ATOMIC_STORE_LOAD(long,	 64, "8")
-
-#undef ATOMIC_STORE_LOAD
-
-#define	atomic_load_acq_ptr(p)		\
-    ((void *)atomic_load_acq_64((volatile uint64_t *)p))
-
-#define	atomic_store_rel_ptr(p, v)	\
-    atomic_store_rel_64((volatile uint64_t *)p, (uint64_t)v)
-
-#define	IA64_ATOMIC(sz, type, name, width, op)				\
-	static __inline type						\
-	atomic_##name##_acq_##width(volatile type *p, type v)		\
-	{								\
-		type old, ret;						\
-		do {							\
-			old = *p;					\
-			IA64_CMPXCHG(sz, acq, p, old, old op v, ret);	\
-		} while (ret != old);					\
-		return (old);						\
-	}								\
-									\
-	static __inline type						\
-	atomic_##name##_rel_##width(volatile type *p, type v)		\
-	{								\
-		type old, ret;						\
-		do {							\
-			old = *p;					\
-			IA64_CMPXCHG(sz, rel, p, old, old op v, ret);	\
-		} while (ret != old);					\
-		return (old);						\
-	}
-
-IA64_ATOMIC(1, uint8_t,	 set, 8,  |)
-IA64_ATOMIC(2, uint16_t, set, 16, |)
-IA64_ATOMIC(4, uint32_t, set, 32, |)
-IA64_ATOMIC(8, uint64_t, set, 64, |)
-
-IA64_ATOMIC(1, uint8_t,  clear,	8,  &~)
-IA64_ATOMIC(2, uint16_t, clear,	16, &~)
-IA64_ATOMIC(4, uint32_t, clear,	32, &~)
-IA64_ATOMIC(8, uint64_t, clear,	64, &~)
-
-IA64_ATOMIC(1, uint8_t,  add, 8,  +)
-IA64_ATOMIC(2, uint16_t, add, 16, +)
-IA64_ATOMIC(4, uint32_t, add, 32, +)
-IA64_ATOMIC(8, uint64_t, add, 64, +)
-
-IA64_ATOMIC(1, uint8_t,  subtract, 8,  -)
-IA64_ATOMIC(2, uint16_t, subtract, 16, -)
-IA64_ATOMIC(4, uint32_t, subtract, 32, -)
-IA64_ATOMIC(8, uint64_t, subtract, 64, -)
-
-#undef IA64_ATOMIC
-
-#define	atomic_set_8			atomic_set_acq_8
-#define	atomic_clear_8			atomic_clear_acq_8
-#define	atomic_add_8			atomic_add_acq_8
-#define	atomic_subtract_8		atomic_subtract_acq_8
-
-#define	atomic_set_16			atomic_set_acq_16
-#define	atomic_clear_16			atomic_clear_acq_16
-#define	atomic_add_16			atomic_add_acq_16
-#define	atomic_subtract_16		atomic_subtract_acq_16
-
-#define	atomic_set_32			atomic_set_acq_32
-#define	atomic_clear_32			atomic_clear_acq_32
-#define	atomic_add_32			atomic_add_acq_32
-#define	atomic_subtract_32		atomic_subtract_acq_32
-
-#define	atomic_set_64			atomic_set_acq_64
-#define	atomic_clear_64			atomic_clear_acq_64
-#define	atomic_add_64			atomic_add_acq_64
-#define	atomic_subtract_64		atomic_subtract_acq_64
-
-#define	atomic_set_char			atomic_set_8
-#define	atomic_clear_char		atomic_clear_8
-#define	atomic_add_char			atomic_add_8
-#define	atomic_subtract_char		atomic_subtract_8
-#define	atomic_set_acq_char		atomic_set_acq_8
-#define	atomic_clear_acq_char		atomic_clear_acq_8
-#define	atomic_add_acq_char		atomic_add_acq_8
-#define	atomic_subtract_acq_char	atomic_subtract_acq_8
-#define	atomic_set_rel_char		atomic_set_rel_8
-#define	atomic_clear_rel_char		atomic_clear_rel_8
-#define	atomic_add_rel_char		atomic_add_rel_8
-#define	atomic_subtract_rel_char	atomic_subtract_rel_8
-
-#define	atomic_set_short		atomic_set_16
-#define	atomic_clear_short		atomic_clear_16
-#define	atomic_add_short		atomic_add_16
-#define	atomic_subtract_short		atomic_subtract_16
-#define	atomic_set_acq_short		atomic_set_acq_16
-#define	atomic_clear_acq_short		atomic_clear_acq_16
-#define	atomic_add_acq_short		atomic_add_acq_16
-#define	atomic_subtract_acq_short	atomic_subtract_acq_16
-#define	atomic_set_rel_short		atomic_set_rel_16
-#define	atomic_clear_rel_short		atomic_clear_rel_16
-#define	atomic_add_rel_short		atomic_add_rel_16
-#define	atomic_subtract_rel_short	atomic_subtract_rel_16
-
-#define	atomic_set_int			atomic_set_32
-#define	atomic_clear_int		atomic_clear_32
-#define	atomic_add_int			atomic_add_32
-#define	atomic_subtract_int		atomic_subtract_32
-#define	atomic_set_acq_int		atomic_set_acq_32
-#define	atomic_clear_acq_int		atomic_clear_acq_32
-#define	atomic_add_acq_int		atomic_add_acq_32
-#define	atomic_subtract_acq_int		atomic_subtract_acq_32
-#define	atomic_set_rel_int		atomic_set_rel_32
-#define	atomic_clear_rel_int		atomic_clear_rel_32
-#define	atomic_add_rel_int		atomic_add_rel_32
-#define	atomic_subtract_rel_int		atomic_subtract_rel_32
-
-#define	atomic_set_long			atomic_set_64
-#define	atomic_clear_long		atomic_clear_64
-#define	atomic_add_long			atomic_add_64
-#define	atomic_subtract_long		atomic_subtract_64
-#define	atomic_set_acq_long		atomic_set_acq_64
-#define	atomic_clear_acq_long		atomic_clear_acq_64
-#define	atomic_add_acq_long		atomic_add_acq_64
-#define	atomic_subtract_acq_long	atomic_subtract_acq_64
-#define	atomic_set_rel_long		atomic_set_rel_64
-#define	atomic_clear_rel_long		atomic_clear_rel_64
-#define	atomic_add_rel_long		atomic_add_rel_64
-#define	atomic_subtract_rel_long	atomic_subtract_rel_64
-
-/* XXX Needs casting. */
-#define	atomic_set_ptr			atomic_set_64
-#define	atomic_clear_ptr		atomic_clear_64
-#define	atomic_add_ptr			atomic_add_64
-#define	atomic_subtract_ptr		atomic_subtract_64
-#define	atomic_set_acq_ptr		atomic_set_acq_64
-#define	atomic_clear_acq_ptr		atomic_clear_acq_64
-#define	atomic_add_acq_ptr		atomic_add_acq_64
-#define	atomic_subtract_acq_ptr		atomic_subtract_acq_64
-#define	atomic_set_rel_ptr		atomic_set_rel_64
-#define	atomic_clear_rel_ptr		atomic_clear_rel_64
-#define	atomic_add_rel_ptr		atomic_add_rel_64
-#define	atomic_subtract_rel_ptr		atomic_subtract_rel_64
-
-#undef IA64_CMPXCHG
-
-/*
- * Atomically compare the value stored at *p with cmpval and if the
- * two values are equal, update the value of *p with newval. Returns
- * zero if the compare failed, nonzero otherwise.
- */
-static __inline int
-atomic_cmpset_acq_32(volatile uint32_t* p, uint32_t cmpval, uint32_t newval)
-{
-	return (ia64_cmpxchg_acq_32(p, cmpval, newval) == cmpval);
-}
-
-static __inline int
-atomic_cmpset_rel_32(volatile uint32_t* p, uint32_t cmpval, uint32_t newval)
-{
-	return (ia64_cmpxchg_rel_32(p, cmpval, newval) == cmpval);
-}
-
-/*
- * Atomically compare the value stored at *p with cmpval and if the
- * two values are equal, update the value of *p with newval. Returns
- * zero if the compare failed, nonzero otherwise.
- */
-static __inline int
-atomic_cmpset_acq_64(volatile uint64_t* p, uint64_t cmpval, uint64_t newval)
-{
-	return (ia64_cmpxchg_acq_64(p, cmpval, newval) == cmpval);
-}
-
-static __inline int
-atomic_cmpset_rel_64(volatile uint64_t* p, uint64_t cmpval, uint64_t newval)
-{
-	return (ia64_cmpxchg_rel_64(p, cmpval, newval) == cmpval);
-}
-
-#define	atomic_cmpset_32		atomic_cmpset_acq_32
-#define	atomic_cmpset_64		atomic_cmpset_acq_64
-#define	atomic_cmpset_int		atomic_cmpset_32
-#define	atomic_cmpset_long		atomic_cmpset_64
-#define	atomic_cmpset_acq_int		atomic_cmpset_acq_32
-#define	atomic_cmpset_rel_int		atomic_cmpset_rel_32
-#define	atomic_cmpset_acq_long		atomic_cmpset_acq_64
-#define	atomic_cmpset_rel_long		atomic_cmpset_rel_64
-
-#define	atomic_cmpset_acq_ptr(p, o, n)	\
-    (atomic_cmpset_acq_64((volatile uint64_t *)p, (uint64_t)o, (uint64_t)n))
-
-#define	atomic_cmpset_ptr		atomic_cmpset_acq_ptr
-
-#define	atomic_cmpset_rel_ptr(p, o, n)	\
-    (atomic_cmpset_rel_64((volatile uint64_t *)p, (uint64_t)o, (uint64_t)n))
-
-static __inline uint32_t
-atomic_readandclear_32(volatile uint32_t* p)
-{
-	uint32_t val;
-	do {
-		val = *p;
-	} while (!atomic_cmpset_32(p, val, 0));
-	return (val);
-}
-
-static __inline uint64_t
-atomic_readandclear_64(volatile uint64_t* p)
-{
-	uint64_t val;
-	do {
-		val = *p;
-	} while (!atomic_cmpset_64(p, val, 0));
-	return (val);
-}
-
-#define	atomic_readandclear_int		atomic_readandclear_32
-#define	atomic_readandclear_long	atomic_readandclear_64
-#define	atomic_readandclear_ptr		atomic_readandclear_64
-
-/*
- * Atomically add the value of v to the integer pointed to by p and return
- * the previous value of *p.
- *
- * XXX: Should we use the fetchadd instruction here?
- */
-static __inline uint32_t
-atomic_fetchadd_32(volatile uint32_t *p, uint32_t v)
-{
-	uint32_t value;
-
-	do {
-		value = *p;
-	} while (!atomic_cmpset_32(p, value, value + v));
-	return (value);
-}
-
-#define	atomic_fetchadd_int		atomic_fetchadd_32
-
-static __inline u_long
-atomic_fetchadd_long(volatile u_long *p, u_long v)
-{
-	u_long value;
-
-	do {
-		value = *p;
-	} while (!atomic_cmpset_64(p, value, value + v));
-	return (value);
-}
-
-/*
- * <type> atomic_swap_<type>(volatile <type> *p, <type> v);
- */
-
-static __inline uint32_t
-atomic_swap_32(volatile uint32_t *p, uint32_t v)
-{
-	uint32_t r;
-
-	__asm __volatile ("xchg4 %0 = %3, %2;;" : "=r"(r), "=m"(*p) :
-	    "r"(v), "m"(*p) : "memory");
-	return (r);
-}
-
-static __inline uint64_t
-atomic_swap_64(volatile uint64_t *p, uint64_t v)
-{
-	uint64_t r;
-
-	__asm __volatile ("xchg8 %0 = %3, %2;;" : "=r"(r), "=m"(*p) :
-	    "r"(v), "m"(*p) : "memory");
-	return (r);
-}
-
-#define	atomic_swap_int		atomic_swap_32
-#define	atomic_swap_long	atomic_swap_64
-#define	atomic_swap_ptr		atomic_swap_64
-
-#endif /* ! _MACHINE_ATOMIC_H_ */
diff --git a/sys/ia64/include/bootinfo.h b/sys/ia64/include/bootinfo.h
deleted file mode 100644
index ed3accd05972..000000000000
--- a/sys/ia64/include/bootinfo.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* $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.
- */
-
-struct bootinfo {
-	uint64_t	bi_magic;		/* BOOTINFO_MAGIC */
-#define	BOOTINFO_MAGIC		0xdeadbeeffeedface
-	uint64_t	bi_version;		/* version 1 */
-	uint64_t	bi_spare[3];		/* was: name of booted kernel */
-	uint32_t	bi_itr_used;		/* Number of ITR and DTR ... */
-	uint32_t	bi_dtr_used;		/* ... entries used. */
-	uint32_t	bi_text_mapped;		/* Size of text mapped. */
-	uint32_t	bi_data_mapped;		/* Size of data mapped. */
-	uint64_t	bi_pbvm_pgtbl;		/* PA of PBVM page table. */
-	uint64_t	bi_hcdp;		/* DIG64 HCDP table */
-	uint64_t	bi_fpswa;		/* FPSWA interface */
-	uint64_t	bi_boothowto;		/* value for boothowto */
-	uint64_t	bi_systab;		/* pa of EFI system table */
-	uint64_t	bi_memmap;		/* pa of EFI memory map */
-	uint64_t	bi_memmap_size;		/* size of EFI memory map */
-	uint64_t	bi_memdesc_size;	/* sizeof EFI memory desc */
-	uint32_t	bi_memdesc_version;	/* EFI memory desc version */
-	uint32_t	bi_pbvm_pgtblsz;	/* PBVM page table size. */
-	uint64_t	bi_symtab;		/* start of kernel sym table */
-	uint64_t	bi_esymtab;		/* end of kernel sym table */
-	uint64_t	bi_kernend;		/* end of kernel space */
-	uint64_t	bi_envp;		/* environment */
-	uint64_t	bi_modulep;		/* preloaded modules */
-};
-
-extern struct bootinfo *bootinfo;
diff --git a/sys/ia64/include/bus.h b/sys/ia64/include/bus.h
deleted file mode 100644
index 966a75d349e5..000000000000
--- a/sys/ia64/include/bus.h
+++ /dev/null
@@ -1,820 +0,0 @@
-/*-
- * Copyright (c) 2009 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*	$NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*-
- * Copyright (c) 1996 Charles M. Hannum.  All rights reserved.
- * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Christopher G. Demetriou
- *	for the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-/* $FreeBSD$ */
-
-#ifndef _MACHINE_BUS_H_
-#define _MACHINE_BUS_H_
-
-#include <machine/_bus.h>
-#include <machine/cpufunc.h>
-
-/*
- * I/O port reads with ia32 semantics.
- */
-#define inb     bus_space_read_io_1
-#define inw     bus_space_read_io_2
-#define inl     bus_space_read_io_4
-
-#define outb    bus_space_write_io_1
-#define outw    bus_space_write_io_2
-#define outl    bus_space_write_io_4
-
-/*
- * Values for the ia64 bus space tag, not to be used directly by MI code.
- */
-#define	IA64_BUS_SPACE_IO	0	/* space is i/o space */
-#define IA64_BUS_SPACE_MEM	1	/* space is mem space */
-
-#define	BUS_SPACE_BARRIER_READ	0x01	/* force read barrier */
-#define	BUS_SPACE_BARRIER_WRITE	0x02	/* force write barrier */
-
-#define BUS_SPACE_MAXSIZE_24BIT	0xFFFFFF
-#define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF
-#define BUS_SPACE_MAXSIZE	0xFFFFFFFFFFFFFFFF
-#define BUS_SPACE_MAXADDR_24BIT	0xFFFFFF
-#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF
-#define BUS_SPACE_MAXADDR	0xFFFFFFFFFFFFFFFF
-
-#define BUS_SPACE_UNRESTRICTED	(~0)
-
-
-/*
- * Map and unmap a region of device bus space into CPU virtual address space.
- */
-int
-bus_space_map(bus_space_tag_t, bus_addr_t, bus_size_t, int,
-    bus_space_handle_t *);
-
-void
-bus_space_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t size);
-
-/*
- * Get a new handle for a subregion of an already-mapped area of bus space.
- */
-static __inline int
-bus_space_subregion(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, bus_size_t size __unused, bus_space_handle_t *nbshp)
-{
-	*nbshp = bsh + ofs;
-	return (0);
-}
-
-
-/*
- * Allocate a region of memory that is accessible to devices in bus space.
- */
-int
-bus_space_alloc(bus_space_tag_t bst, bus_addr_t rstart, bus_addr_t rend,
-    bus_size_t size, bus_size_t align, bus_size_t boundary, int flags,
-    bus_addr_t *addrp, bus_space_handle_t *bshp);
-
-
-/*
- * Free a region of bus space accessible memory.
- */
-void
-bus_space_free(bus_space_tag_t bst, bus_space_handle_t bsh, bus_size_t size);
-
-
-/*
- * Bus read/write barrier method.
- */
-static __inline void
-bus_space_barrier(bus_space_tag_t bst __unused, bus_space_handle_t bsh __unused,
-    bus_size_t ofs __unused, bus_size_t size __unused, int flags __unused)
-{
-	ia64_mf_a();
-	ia64_mf();
-}
-
-
-/*
- * Read 1 unit of data from bus space described by the tag, handle and ofs
- * tuple. A unit of data can be 1 byte, 2 bytes, 4 bytes or 8 bytes. The
- * data is returned.
- */
-uint8_t  bus_space_read_io_1(u_long);
-uint16_t bus_space_read_io_2(u_long);
-uint32_t bus_space_read_io_4(u_long);
-uint64_t bus_space_read_io_8(u_long);
-
-static __inline uint8_t
-bus_space_read_1(bus_space_tag_t bst, bus_space_handle_t bsh, bus_size_t ofs)
-{
-	uint8_t val;
-
-	val = (__predict_false(bst == IA64_BUS_SPACE_IO))
-	    ? bus_space_read_io_1(bsh + ofs)
-	    : ia64_ld1((void *)(bsh + ofs));
-	return (val);
-}
-
-static __inline uint16_t
-bus_space_read_2(bus_space_tag_t bst, bus_space_handle_t bsh, bus_size_t ofs)
-{
-	uint16_t val;
-
-	val = (__predict_false(bst == IA64_BUS_SPACE_IO))
-	    ? bus_space_read_io_2(bsh + ofs)
-	    : ia64_ld2((void *)(bsh + ofs));
-	return (val);
-}
-
-static __inline uint32_t
-bus_space_read_4(bus_space_tag_t bst, bus_space_handle_t bsh, bus_size_t ofs)
-{
-	uint32_t val;
-
-	val = (__predict_false(bst == IA64_BUS_SPACE_IO))
-	    ? bus_space_read_io_4(bsh + ofs)
-	    : ia64_ld4((void *)(bsh + ofs));
-	return (val);
-}
-
-static __inline uint64_t
-bus_space_read_8(bus_space_tag_t bst, bus_space_handle_t bsh, bus_size_t ofs)
-{
-	uint64_t val;
-
-	val = (__predict_false(bst == IA64_BUS_SPACE_IO))
-	    ? bus_space_read_io_8(bsh + ofs)
-	    : ia64_ld8((void *)(bsh + ofs));
-	return (val);
-}
-
-
-/*
- * Write 1 unit of data to bus space described by the tag, handle and ofs
- * tuple. A unit of data can be 1 byte, 2 bytes, 4 bytes or 8 bytes. The
- * data is passed by value.
- */
-void bus_space_write_io_1(u_long, uint8_t);
-void bus_space_write_io_2(u_long, uint16_t);
-void bus_space_write_io_4(u_long, uint32_t);
-void bus_space_write_io_8(u_long, uint64_t);
-
-static __inline void
-bus_space_write_1(bus_space_tag_t bst, bus_space_handle_t bsh, bus_size_t ofs,
-    uint8_t val)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_write_io_1(bsh + ofs, val);
-	else
-		ia64_st1((void *)(bsh + ofs), val);
-}
-
-static __inline void
-bus_space_write_2(bus_space_tag_t bst, bus_space_handle_t bsh, bus_size_t ofs,
-    uint16_t val)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_write_io_2(bsh + ofs, val);
-	else
-		ia64_st2((void *)(bsh + ofs), val);
-}
-
-static __inline void
-bus_space_write_4(bus_space_tag_t bst, bus_space_handle_t bsh, bus_size_t ofs,
-    uint32_t val)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_write_io_4(bsh + ofs, val);
-	else
-		ia64_st4((void *)(bsh + ofs), val);
-}
-
-static __inline void
-bus_space_write_8(bus_space_tag_t bst, bus_space_handle_t bsh, bus_size_t ofs,
-    uint64_t val)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_write_io_8(bsh + ofs, val);
-	else
-		ia64_st8((void *)(bsh + ofs), val);
-}
-
-
-/*
- * Read count units of data from bus space described by the tag, handle and
- * ofs tuple. A unit of data can be 1 byte, 2 bytes, 4 bytes or 8 bytes. The
- * data is returned in the buffer passed by reference.
- */
-void bus_space_read_multi_io_1(u_long, uint8_t *, size_t);
-void bus_space_read_multi_io_2(u_long, uint16_t *, size_t);
-void bus_space_read_multi_io_4(u_long, uint32_t *, size_t);
-void bus_space_read_multi_io_8(u_long, uint64_t *, size_t);
-
-static __inline void
-bus_space_read_multi_1(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint8_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_read_multi_io_1(bsh + ofs, bufp, count);
-	else {
-		while (count-- > 0)
-			*bufp++ = ia64_ld1((void *)(bsh + ofs));
-	}
-}
-
-static __inline void
-bus_space_read_multi_2(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint16_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_read_multi_io_2(bsh + ofs, bufp, count);
-	else {
-		while (count-- > 0)
-			*bufp++ = ia64_ld2((void *)(bsh + ofs));
-	}
-}
-
-static __inline void
-bus_space_read_multi_4(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint32_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_read_multi_io_4(bsh + ofs, bufp, count);
-	else {
-		while (count-- > 0)
-			*bufp++ = ia64_ld4((void *)(bsh + ofs));
-	}
-}
-
-static __inline void
-bus_space_read_multi_8(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint64_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_read_multi_io_8(bsh + ofs, bufp, count);
-	else {
-		while (count-- > 0)
-			*bufp++ = ia64_ld8((void *)(bsh + ofs));
-	}
-}
-
-
-/*
- * Write count units of data to bus space described by the tag, handle and
- * ofs tuple. A unit of data can be 1 byte, 2 bytes, 4 bytes or 8 bytes. The
- * data is read from the buffer passed by reference.
- */
-void bus_space_write_multi_io_1(u_long, const uint8_t *, size_t);
-void bus_space_write_multi_io_2(u_long, const uint16_t *, size_t);
-void bus_space_write_multi_io_4(u_long, const uint32_t *, size_t);
-void bus_space_write_multi_io_8(u_long, const uint64_t *, size_t);
-
-static __inline void
-bus_space_write_multi_1(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, const uint8_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_write_multi_io_1(bsh + ofs, bufp, count);
-	else {
-		while (count-- > 0)
-			ia64_st1((void *)(bsh + ofs), *bufp++);
-	}
-}
-
-static __inline void
-bus_space_write_multi_2(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, const uint16_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_write_multi_io_2(bsh + ofs, bufp, count);
-	else {
-		while (count-- > 0)
-			ia64_st2((void *)(bsh + ofs), *bufp++);
-	}
-}
-
-static __inline void
-bus_space_write_multi_4(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, const uint32_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_write_multi_io_4(bsh + ofs, bufp, count);
-	else {
-		while (count-- > 0)
-			ia64_st4((void *)(bsh + ofs), *bufp++);
-	}
-}
-
-static __inline void
-bus_space_write_multi_8(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, const uint64_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_write_multi_io_8(bsh + ofs, bufp, count);
-	else {
-		while (count-- > 0)
-			ia64_st8((void *)(bsh + ofs), *bufp++);
-	}
-}
-
-
-/*
- * Read count units of data from bus space described by the tag, handle and
- * ofs tuple. A unit of data can be 1 byte, 2 bytes, 4 bytes or 8 bytes. The
- * data is written to the buffer passed by reference and read from successive
- * bus space addresses. Access is unordered.
- */
-void bus_space_read_region_io_1(u_long, uint8_t *, size_t);
-void bus_space_read_region_io_2(u_long, uint16_t *, size_t);
-void bus_space_read_region_io_4(u_long, uint32_t *, size_t);
-void bus_space_read_region_io_8(u_long, uint64_t *, size_t);
-
-static __inline void
-bus_space_read_region_1(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint8_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_read_region_io_1(bsh + ofs, bufp, count);
-	else {
-		uint8_t *bsp = (void *)(bsh + ofs);
-		while (count-- > 0)
-			*bufp++ = ia64_ld1(bsp++);
-	}
-}
-
-static __inline void
-bus_space_read_region_2(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint16_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_read_region_io_2(bsh + ofs, bufp, count);
-	else {
-		uint16_t *bsp = (void *)(bsh + ofs);
-		while (count-- > 0)
-			*bufp++ = ia64_ld2(bsp++);
-	}
-}
-
-static __inline void
-bus_space_read_region_4(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint32_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_read_region_io_4(bsh + ofs, bufp, count);
-	else {
-		uint32_t *bsp = (void *)(bsh + ofs);
-		while (count-- > 0)
-			*bufp++ = ia64_ld4(bsp++);
-	}
-}
-
-static __inline void
-bus_space_read_region_8(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint64_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_read_region_io_8(bsh + ofs, bufp, count);
-	else {
-		uint64_t *bsp = (void *)(bsh + ofs);
-		while (count-- > 0)
-			*bufp++ = ia64_ld8(bsp++);
-	}
-}
-
-
-/*
- * Write count units of data from bus space described by the tag, handle and
- * ofs tuple. A unit of data can be 1 byte, 2 bytes, 4 bytes or 8 bytes. The
- * data is read from the buffer passed by reference and written to successive
- * bus space addresses. Access is unordered.
- */
-void bus_space_write_region_io_1(u_long, const uint8_t *, size_t);
-void bus_space_write_region_io_2(u_long, const uint16_t *, size_t);
-void bus_space_write_region_io_4(u_long, const uint32_t *, size_t);
-void bus_space_write_region_io_8(u_long, const uint64_t *, size_t);
-
-static __inline void
-bus_space_write_region_1(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, const uint8_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_write_region_io_1(bsh + ofs, bufp, count);
-	else {
-		uint8_t *bsp = (void *)(bsh + ofs);
-		while (count-- > 0)
-			ia64_st1(bsp++, *bufp++);
-	}
-}
-
-static __inline void
-bus_space_write_region_2(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, const uint16_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_write_region_io_2(bsh + ofs, bufp, count);
-	else {
-		uint16_t *bsp = (void *)(bsh + ofs);
-		while (count-- > 0)
-			ia64_st2(bsp++, *bufp++);
-	}
-}
-
-static __inline void
-bus_space_write_region_4(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, const uint32_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_write_region_io_4(bsh + ofs, bufp, count);
-	else {
-		uint32_t *bsp = (void *)(bsh + ofs);
-		while (count-- > 0)
-			ia64_st4(bsp++, *bufp++);
-	}
-}
-
-static __inline void
-bus_space_write_region_8(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, const uint64_t *bufp, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_write_region_io_8(bsh + ofs, bufp, count);
-	else {
-		uint64_t *bsp = (void *)(bsh + ofs);
-		while (count-- > 0)
-			ia64_st8(bsp++, *bufp++);
-	}
-}
-
-
-/*
- * Write count units of data from bus space described by the tag, handle and
- * ofs tuple. A unit of data can be 1 byte, 2 bytes, 4 bytes or 8 bytes. The
- * data is passed by value. Writes are unordered.
- */
-static __inline void
-bus_space_set_multi_1(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint8_t val, size_t count)
-{
-
-	while (count-- > 0)
-		bus_space_write_1(bst, bsh, ofs, val);
-}
-
-static __inline void
-bus_space_set_multi_2(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint16_t val, size_t count)
-{
-
-	while (count-- > 0)
-		bus_space_write_2(bst, bsh, ofs, val);
-}
-
-static __inline void
-bus_space_set_multi_4(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint32_t val, size_t count)
-{
-
-	while (count-- > 0)
-		bus_space_write_4(bst, bsh, ofs, val);
-}
-
-static __inline void
-bus_space_set_multi_8(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint64_t val, size_t count)
-{
-
-	while (count-- > 0)
-		bus_space_write_8(bst, bsh, ofs, val);
-}
-
-
-/*
- * Write count units of data from bus space described by the tag, handle and
- * ofs tuple. A unit of data can be 1 byte, 2 bytes, 4 bytes or 8 bytes. The
- * data is passed by value and written to successive bus space addresses.
- * Writes are unordered.
- */
-void bus_space_set_region_io_1(u_long, uint8_t, size_t);
-void bus_space_set_region_io_2(u_long, uint16_t, size_t);
-void bus_space_set_region_io_4(u_long, uint32_t, size_t);
-void bus_space_set_region_io_8(u_long, uint64_t, size_t);
-
-static __inline void
-bus_space_set_region_1(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint8_t val, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_set_region_io_1(bsh + ofs, val, count);
-	else {
-		uint8_t *bsp = (void *)(bsh + ofs);
-		while (count-- > 0)
-			ia64_st1(bsp++, val);
-	}
-}
-
-static __inline void
-bus_space_set_region_2(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint16_t val, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_set_region_io_2(bsh + ofs, val, count);
-	else {
-		uint16_t *bsp = (void *)(bsh + ofs);
-		while (count-- > 0)
-			ia64_st2(bsp++, val);
-	}
-}
-
-static __inline void
-bus_space_set_region_4(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint32_t val, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_set_region_io_4(bsh + ofs, val, count);
-	else {
-		uint32_t *bsp = (void *)(bsh + ofs);
-		while (count-- > 0)
-			ia64_st4(bsp++, val);
-	}
-}
-
-static __inline void
-bus_space_set_region_8(bus_space_tag_t bst, bus_space_handle_t bsh,
-    bus_size_t ofs, uint64_t val, size_t count)
-{
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO))
-		bus_space_set_region_io_4(bsh + ofs, val, count);
-	else {
-		uint64_t *bsp = (void *)(bsh + ofs);
-		while (count-- > 0)
-			ia64_st8(bsp++, val);
-	}
-}
-
-
-/*
- * Copy count units of data from bus space described by the tag and the first
- * handle and ofs pair to bus space described by the tag and the second handle
- * and ofs pair. A unit of data can be 1 byte, 2 bytes, 4 bytes or 8 bytes.
- * The data is read from successive bus space addresses and also written to
- * successive bus space addresses. Both reads and writes are unordered.
- */
-void bus_space_copy_region_io_1(u_long, u_long, size_t);
-void bus_space_copy_region_io_2(u_long, u_long, size_t);
-void bus_space_copy_region_io_4(u_long, u_long, size_t);
-void bus_space_copy_region_io_8(u_long, u_long, size_t);
-
-static __inline void
-bus_space_copy_region_1(bus_space_tag_t bst, bus_space_handle_t sbsh,
-    bus_size_t sofs, bus_space_handle_t dbsh, bus_size_t dofs, size_t count)
-{
-	uint8_t *dst, *src;
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO)) {
-		bus_space_copy_region_io_1(sbsh + sofs, dbsh + dofs, count);
-		return;
-	}
-
-	src = (void *)(sbsh + sofs);
-	dst = (void *)(dbsh + dofs);
-	if (src < dst) {
-		src += count - 1;
-		dst += count - 1;
-		while (count-- > 0)
-			ia64_st1(dst--, ia64_ld1(src--));
-	} else {
-		while (count-- > 0)
-			ia64_st1(dst++, ia64_ld1(src++));
-	}
-}
-
-static __inline void
-bus_space_copy_region_2(bus_space_tag_t bst, bus_space_handle_t sbsh,
-    bus_size_t sofs, bus_space_handle_t dbsh, bus_size_t dofs, size_t count)
-{
-	uint16_t *dst, *src;
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO)) {
-		bus_space_copy_region_io_2(sbsh + sofs, dbsh + dofs, count);
-		return;
-	}
-
-	src = (void *)(sbsh + sofs);
-	dst = (void *)(dbsh + dofs);
-	if (src < dst) {
-		src += count - 1;
-		dst += count - 1;
-		while (count-- > 0)
-			ia64_st2(dst--, ia64_ld2(src--));
-	} else {
-		while (count-- > 0)
-			ia64_st2(dst++, ia64_ld2(src++));
-	}
-}
-
-static __inline void
-bus_space_copy_region_4(bus_space_tag_t bst, bus_space_handle_t sbsh,
-    bus_size_t sofs, bus_space_handle_t dbsh, bus_size_t dofs, size_t count)
-{
-	uint32_t *dst, *src;
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO)) {
-		bus_space_copy_region_io_4(sbsh + sofs, dbsh + dofs, count);
-		return;
-	}
-
-	src = (void *)(sbsh + sofs);
-	dst = (void *)(dbsh + dofs);
-	if (src < dst) {
-		src += count - 1;
-		dst += count - 1;
-		while (count-- > 0)
-			ia64_st4(dst--, ia64_ld4(src--));
-	} else {
-		while (count-- > 0)
-			ia64_st4(dst++, ia64_ld4(src++));
-	}
-}
-
-static __inline void
-bus_space_copy_region_8(bus_space_tag_t bst, bus_space_handle_t sbsh,
-    bus_size_t sofs, bus_space_handle_t dbsh, bus_size_t dofs, size_t count)
-{
-	uint64_t *dst, *src;
-
-	if (__predict_false(bst == IA64_BUS_SPACE_IO)) {
-		bus_space_copy_region_io_8(sbsh + sofs, dbsh + dofs, count);
-		return;
-	}
-
-	src = (void *)(sbsh + sofs);
-	dst = (void *)(dbsh + dofs);
-	if (src < dst) {
-		src += count - 1;
-		dst += count - 1;
-		while (count-- > 0)
-			ia64_st8(dst--, ia64_ld8(src--));
-	} else {
-		while (count-- > 0)
-			ia64_st8(dst++, ia64_ld8(src++));
-	}
-}
-
-
-/*
- * Stream accesses are the same as normal accesses on ia64; there are no
- * supported bus systems with an endianess different from the host one.
- */
-
-#define	bus_space_read_stream_1		bus_space_read_1
-#define	bus_space_read_stream_2		bus_space_read_2
-#define	bus_space_read_stream_4		bus_space_read_4
-#define	bus_space_read_stream_8		bus_space_read_8
-
-#define	bus_space_write_stream_1	bus_space_write_1
-#define	bus_space_write_stream_2	bus_space_write_2
-#define	bus_space_write_stream_4	bus_space_write_4
-#define	bus_space_write_stream_8	bus_space_write_8
-
-#define	bus_space_read_multi_stream_1	bus_space_read_multi_1
-#define	bus_space_read_multi_stream_2	bus_space_read_multi_2
-#define	bus_space_read_multi_stream_4	bus_space_read_multi_4
-#define	bus_space_read_multi_stream_8	bus_space_read_multi_8
-
-#define	bus_space_write_multi_stream_1	bus_space_write_multi_1
-#define	bus_space_write_multi_stream_2	bus_space_write_multi_2
-#define	bus_space_write_multi_stream_4	bus_space_write_multi_4
-#define	bus_space_write_multi_stream_8	bus_space_write_multi_8
-
-#define	bus_space_read_region_stream_1	bus_space_read_region_1
-#define	bus_space_read_region_stream_2	bus_space_read_region_2
-#define	bus_space_read_region_stream_4	bus_space_read_region_4
-#define	bus_space_read_region_stream_8	bus_space_read_region_8
-
-#define	bus_space_write_region_stream_1	bus_space_write_region_1
-#define	bus_space_write_region_stream_2	bus_space_write_region_2
-#define	bus_space_write_region_stream_4	bus_space_write_region_4
-#define	bus_space_write_region_stream_8	bus_space_write_region_8
-
-#define	bus_space_set_multi_stream_1	bus_space_set_multi_1
-#define	bus_space_set_multi_stream_2	bus_space_set_multi_2
-#define	bus_space_set_multi_stream_4	bus_space_set_multi_4
-#define	bus_space_set_multi_stream_8	bus_space_set_multi_8
-
-#define	bus_space_set_region_stream_1	bus_space_set_region_1
-#define	bus_space_set_region_stream_2	bus_space_set_region_2
-#define	bus_space_set_region_stream_4	bus_space_set_region_4
-#define	bus_space_set_region_stream_8	bus_space_set_region_8
-
-#define	bus_space_copy_region_stream_1	bus_space_copy_region_1
-#define	bus_space_copy_region_stream_2	bus_space_copy_region_2
-#define	bus_space_copy_region_stream_4	bus_space_copy_region_4
-#define	bus_space_copy_region_stream_8	bus_space_copy_region_8
-
-#include <machine/bus_dma.h>
-
-#endif /* _MACHINE_BUS_H_ */
diff --git a/sys/ia64/include/bus_dma.h b/sys/ia64/include/bus_dma.h
deleted file mode 100644
index 0a80f2fd56d8..000000000000
--- a/sys/ia64/include/bus_dma.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * Copyright (c) 2005 Scott Long
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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 _IA64_BUS_DMA_H_
-#define _IA64_BUS_DMA_H_
-
-#include <sys/bus_dma.h>
-
-#endif /* _IA64_BUS_DMA_H_ */
diff --git a/sys/ia64/include/clock.h b/sys/ia64/include/clock.h
deleted file mode 100644
index 6b87a89f9ede..000000000000
--- a/sys/ia64/include/clock.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*-
- * Kernel interface to machine-dependent clock driver.
- * Garrett Wollman, September 1994.
- * This file is in the public domain.
- *
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_CLOCK_H_
-#define	_MACHINE_CLOCK_H_
-
-#endif /* !_MACHINE_CLOCK_H_ */
diff --git a/sys/ia64/include/counter.h b/sys/ia64/include/counter.h
deleted file mode 100644
index a3fe871d9693..000000000000
--- a/sys/ia64/include/counter.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 2012 Konstantin Belousov <kib@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_COUNTER_H__
-#define __MACHINE_COUNTER_H__
-
-#include <sys/pcpu.h>
-#ifdef INVARIANTS
-#include <sys/proc.h>
-#endif
-
-#define	counter_enter()	critical_enter()
-#define	counter_exit()	critical_exit()
-
-#ifdef IN_SUBR_COUNTER_C
-static inline uint64_t
-counter_u64_read_one(uint64_t *p, int cpu)
-{
-
-	return (*(uint64_t *)((char *)p + sizeof(struct pcpu) * cpu));
-}
-
-static inline uint64_t
-counter_u64_fetch_inline(uint64_t *p)
-{
-	uint64_t r;
-	int i;
-
-	r = 0;
-	for (i = 0; i < mp_ncpus; i++)
-		r += counter_u64_read_one((uint64_t *)p, i);
-
-	return (r);
-}
-
-/* XXXKIB might interrupt increment */
-static void
-counter_u64_zero_one_cpu(void *arg)
-{
-
-	*((uint64_t *)((char *)arg + sizeof(struct pcpu) *
-	    PCPU_GET(cpuid))) = 0;
-}
-
-static inline void
-counter_u64_zero_inline(counter_u64_t c)
-{
-
-	smp_rendezvous(smp_no_rendevous_barrier, counter_u64_zero_one_cpu,
-	    smp_no_rendevous_barrier, c);
-}
-#endif
-
-#define	counter_u64_add_protected(c, inc)	do {	\
-	CRITICAL_ASSERT(curthread);			\
-	*(uint64_t *)zpcpu_get(c) += (inc);		\
-} while (0)
-
-static inline void
-counter_u64_add(counter_u64_t c, int64_t inc)
-{
-
-	counter_enter();
-	counter_u64_add_protected(c, inc);
-	counter_exit();
-}
-
-#endif	/* ! __MACHINE_COUNTER_H__ */
diff --git a/sys/ia64/include/cpufunc.h b/sys/ia64/include/cpufunc.h
deleted file mode 100644
index 925d4bafa4a2..000000000000
--- a/sys/ia64/include/cpufunc.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * Copyright (c) 1998 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$
- */
-
-#ifndef _MACHINE_CPUFUNC_H_
-#define _MACHINE_CPUFUNC_H_
-
-#ifdef _KERNEL
-
-#include <sys/types.h>
-#include <machine/ia64_cpu.h>
-#include <machine/vmparam.h>
-
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-
-struct thread;
-
-#define	IA64_FIXED_BREAK	0x84B5D
-
-#ifdef __GNUCLIKE_ASM
-
-static __inline void
-breakpoint(void)
-{
-	__asm __volatile("break.m %0" :: "i"(IA64_FIXED_BREAK));
-}
-
-#define	HAVE_INLINE_FFS
-#define	ffs(x)	__builtin_ffs(x)
-
-
-static __inline void
-ia64_disable_intr(void)
-{
-	__asm __volatile ("rsm psr.i");
-}
-
-static __inline void
-ia64_enable_intr(void)
-{
-	__asm __volatile ("ssm psr.i;; srlz.d");
-}
-
-static __inline register_t
-intr_disable(void)
-{
-	register_t psr;
-
-	__asm __volatile ("mov %0=psr;;" : "=r"(psr));
-	ia64_disable_intr();
-	return ((psr & IA64_PSR_I) ? 1 : 0);
-}
-
-static __inline void
-intr_restore(register_t ie)
-{
-	if (ie)
-		ia64_enable_intr();
-}
-
-#endif /* __GNUCLIKE_ASM */
-
-#endif /* _KERNEL */
-
-#endif /* !_MACHINE_CPUFUNC_H_ */
diff --git a/sys/ia64/include/db_machdep.h b/sys/ia64/include/db_machdep.h
deleted file mode 100644
index cbf01a70e59f..000000000000
--- a/sys/ia64/include/db_machdep.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 2004 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	_MACHINE_DB_MACHDEP_H_
-#define	_MACHINE_DB_MACHDEP_H_
-
-#include <machine/ia64_cpu.h>
-
-/* We define some of our own commands. */
-#define	DB_MACHINE_COMMANDS
-
-/* We use Elf64 symbols in DDB. */
-#define	DB_ELFSIZE	64
-
-/* Pretty arbitrary. */
-#define	DB_SMALL_VALUE_MAX	0x7fffffff
-#define	DB_SMALL_VALUE_MIN	(-0x400001)
-
-typedef	vm_offset_t	db_addr_t;	/* address - unsigned */
-typedef	long		db_expr_t;	/* expression - signed */
-
-#define	PC_REGS()	((kdb_thrctx->pcb_special.__spare == 0) ?	\
-	kdb_thrctx->pcb_special.rp :					\
-	kdb_thrctx->pcb_special.iip + ((kdb_thrctx->pcb_special.psr>>41) & 3))
-
-#define BKPT_WRITE(addr, storage)	db_bkpt_write(addr, storage)
-#define BKPT_CLEAR(addr, storage)	db_bkpt_clear(addr, storage)
-#define BKPT_SKIP			db_bkpt_skip()
-#define BKPT_INST_TYPE			uint64_t
-
-void db_bkpt_write(db_addr_t, BKPT_INST_TYPE *storage);
-void db_bkpt_clear(db_addr_t, uint64_t *storage);
-void db_bkpt_skip(void);
-
-#define db_clear_single_step		kdb_cpu_clear_singlestep
-#define db_set_single_step		kdb_cpu_set_singlestep
-
-#define	IS_BREAKPOINT_TRAP(type, code)	(type == IA64_VEC_BREAK)
-#define	IS_WATCHPOINT_TRAP(type, code)	0
-
-#define	inst_trap_return(ins)	(ins & 0)
-#define	inst_return(ins)	(ins & 0)
-#define	inst_call(ins)		(ins & 0)
-#define	inst_branch(ins)	(ins & 0)
-#define	inst_load(ins)		(ins & 0)
-#define	inst_store(ins)		(ins & 0)
-#define	inst_unconditional_flow_transfer(ins) (ins & 0)
-
-#define	branch_taken(ins, pc, regs) pc
-
-/* Function call support. */
-#define	DB_MAXARGS	8	/* Only support arguments in registers. */
-#define	DB_CALL		db_fncall_ia64
-
-#endif	/* _MACHINE_DB_MACHDEP_H_ */
diff --git a/sys/ia64/include/dig64.h b/sys/ia64/include/dig64.h
deleted file mode 100644
index e8362ad735cd..000000000000
--- a/sys/ia64/include/dig64.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 2002 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 _MACHINE_DIG64_H_
-#define	_MACHINE_DIG64_H_
-
-struct dig64_gas {
-	uint8_t		addr_space;
-	uint8_t		bit_width;
-	uint8_t		bit_offset;
-	uint8_t		_reserved_;
-	/*
-	 * XXX using a 64-bit type for the address would cause padding and
-	 * using __packed would cause unaligned accesses...
-	 */
-	uint32_t	addr_low;
-	uint32_t	addr_high;
-};
-
-struct dig64_hcdp_entry {
-	uint8_t		type;
-#define	DIG64_HCDP_CONSOLE	0
-#define	DIG64_HCDP_DBGPORT	1
-	uint8_t		databits;
-	uint8_t		parity;
-	uint8_t		stopbits;
-	uint8_t		pci_segment;
-	uint8_t		pci_bus;
-	uint8_t		pci_device:5;
-	uint8_t		_reserved1_:3;
-	uint8_t		pci_function:3;
-	uint8_t		_reserved2_:3;
-	uint8_t		interrupt:1;
-	uint8_t		pci_flag:1;
-	/*
-	 * XXX using a 64-bit type for the baudrate would cause padding and
-	 * using __packed would cause unaligned accesses...
-	 */
-	uint32_t	baud_low;
-	uint32_t	baud_high;
-	struct dig64_gas address;
-	uint16_t	pci_devid;
-	uint16_t	pci_vendor;
-	uint32_t	irq;
-	uint32_t	pclock;
-	uint8_t		pci_interface;
-	uint8_t		_reserved3_[7];
-};
-
-struct dig64_hcdp_table {
-	char		signature[4];
-#define	HCDP_SIGNATURE	"HCDP"
-	uint32_t	length;
-	uint8_t		revision;
-	uint8_t		checksum;
-	char		oem_id[6];
-	char		oem_tbl_id[8];
-	uint32_t	oem_rev;
-	char		creator_id[4];
-	uint32_t	creator_rev;
-	uint32_t	entries;
-	struct dig64_hcdp_entry entry[1];
-};
-
-#endif
diff --git a/sys/ia64/include/elf.h b/sys/ia64/include/elf.h
deleted file mode 100644
index 34135ac41050..000000000000
--- a/sys/ia64/include/elf.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * Copyright (c) 1996-1997 John D. Polstra.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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_ELF_H_
-#define	_MACHINE_ELF_H_ 1
-
-/*
- * ELF definitions for the IA-64 architecture.
- */
-
-#ifndef __ELF_WORD_SIZE
-#define	__ELF_WORD_SIZE	64
-#endif
-
-#include <sys/elf64.h>	/* Definitions common to all 64 bit architectures. */
-#include <sys/elf32.h>	/* Definitions common to all 32 bit architectures. */
-
-#include <sys/elf_generic.h>
-
-#define	ELF_ARCH	EM_IA_64
-#define	ELF_ARCH32	EM_386
-
-#define	ELF_MACHINE_OK(x) ((x) == EM_IA_64)
-
-/*
- * Auxiliary vector entries for passing information to the interpreter.
- *
- * The i386 supplement to the SVR4 ABI specification names this "auxv_t",
- * but POSIX lays claim to all symbols ending with "_t".
- */
-
-typedef struct {	/* Auxiliary vector entry on initial stack */
-	int	a_type;			/* Entry type. */
-	union {
-		int	a_val;		/* Integer value. */
-	} a_un;
-} Elf32_Auxinfo;
-
-typedef struct {	/* Auxiliary vector entry on initial stack */
-	int	a_type;			/* Entry type. */
-	union {
-		long	a_val;		/* Integer value. */
-		void	*a_ptr;		/* Address. */
-		void	(*a_fcn)(void);	/* Function pointer (not used). */
-	} a_un;
-} Elf64_Auxinfo;
-
-__ElfType(Auxinfo);
-
-/* Values for a_type. */
-#define	AT_NULL		0	/* Terminates the vector. */
-#define	AT_IGNORE	1	/* Ignored entry. */
-#define	AT_EXECFD	2	/* File descriptor of program to load. */
-#define	AT_PHDR		3	/* Program header of program already loaded. */
-#define	AT_PHENT	4	/* Size of each program header entry. */
-#define	AT_PHNUM	5	/* Number of program header entries. */
-#define	AT_PAGESZ	6	/* Page size in bytes. */
-#define	AT_BASE		7	/* Interpreter's base address. */
-#define	AT_FLAGS	8	/* Flags (unused for i386). */
-#define	AT_ENTRY	9	/* Where interpreter should transfer control. */
-#define	AT_NOTELF	10	/* Program is not ELF ?? */
-#define	AT_UID		11	/* Real uid. */
-#define	AT_EUID		12	/* Effective uid. */
-#define	AT_GID		13	/* Real gid. */
-#define	AT_EGID		14	/* Effective gid. */
-#define	AT_EXECPATH	15	/* Path to the executable. */
-#define	AT_CANARY	16	/* Canary for SSP */
-#define	AT_CANARYLEN	17	/* Length of the canary. */
-#define	AT_OSRELDATE	18	/* OSRELDATE. */
-#define	AT_NCPUS	19	/* Number of CPUs. */
-#define	AT_PAGESIZES	20	/* Pagesizes. */
-#define	AT_PAGESIZESLEN	21	/* Number of pagesizes. */
-#define	AT_TIMEKEEP	22	/* Pointer to timehands. */
-#define	AT_STACKPROT	23	/* Initial stack protection. */
-
-#define	AT_COUNT	24	/* Count of defined aux entry types. */
-
-/*
- * Values for e_flags.
- */
-#define	EF_IA_64_MASKOS		0x00ff000f
-#define	EF_IA_64_ABI64		0x00000010
-#define	EF_IA_64_REDUCEDFP	0x00000020
-#define	EF_IA_64_CONS_GP	0x00000040
-#define	EF_IA_64_NOFUNCDESC_CONS_GP 0x00000080
-#define	EF_IA_64_ABSOLUTE	0x00000100
-#define	EF_IA_64_ARCH		0xff000000
-
-/*
- * Segment types.
- */
-#define	PT_IA_64_ARCHEXT	0x70000000
-#define	PT_IA_64_UNWIND		0x70000001
-
-/*
- * Segment attributes.
- */
-#define	PF_IA_64_NORECOV	0x80000000
-
-/*
- * Section types.
- */
-#define	SHT_IA_64_EXT		0x70000000
-#define	SHT_IA_64_UNWIND	0x70000001
-#define	SHT_IA_64_LOPSREG	0x78000000
-#define	SHT_IA_64_HIPSREG	0x7fffffff
-
-/*
- * Section attribute flags.
- */
-#define	SHF_IA_64_SHORT		0x10000000
-#define	SHF_IA_64_NORECOV	0x20000000
-
-/* Define "machine" characteristics */
-#if __ELF_WORD_SIZE == 32
-#define	ELF_TARG_CLASS	ELFCLASS32
-#else
-#define	ELF_TARG_CLASS	ELFCLASS64
-#endif
-#define	ELF_TARG_DATA	ELFDATA2LSB
-#define	ELF_TARG_MACH	EM_IA_64
-#define	ELF_TARG_VER	1
-
-/* Processor specific dynmamic section tags. */
-
-#define	DT_IA_64_PLT_RESERVE	0x70000000
-
-#define	ET_DYN_LOAD_ADDR 0x2500000000000000
-
-#endif /* !_MACHINE_ELF_H_ */
diff --git a/sys/ia64/include/endian.h b/sys/ia64/include/endian.h
deleted file mode 100644
index 5b3d9788fe69..000000000000
--- a/sys/ia64/include/endian.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * Copyright (c) 1987, 1991, 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.
- *
- *	@(#)endian.h	8.1 (Berkeley) 6/10/93
- *	$NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_ENDIAN_H_
-#define	_MACHINE_ENDIAN_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-/*
- * Define the order of 32-bit words in 64-bit words.
- */
-#define	_QUAD_HIGHWORD 1
-#define	_QUAD_LOWWORD 0
-
-/*
- * Definitions for byte order, according to byte significance from low
- * address to high.
- */
-#define	_LITTLE_ENDIAN	1234	/* LSB first: i386, vax */
-#define	_BIG_ENDIAN	4321	/* MSB first: 68000, ibm, net */
-#define	_PDP_ENDIAN	3412	/* LSB first in word, MSW first in long */
-
-#define	_BYTE_ORDER	_LITTLE_ENDIAN
-
-/*
- * Deprecated variants that don't have enough underscores to be useful in more
- * strict namespaces.
- */
-#if __BSD_VISIBLE
-#define	LITTLE_ENDIAN	_LITTLE_ENDIAN
-#define	BIG_ENDIAN	_BIG_ENDIAN
-#define	PDP_ENDIAN	_PDP_ENDIAN
-#define	BYTE_ORDER	_BYTE_ORDER
-#endif
-
-#if defined(__CC_SUPPORTS___INLINE) && defined(__GNUCLIKE_ASM)
-
-static __inline __uint64_t
-__bswap64(__uint64_t _x)
-{
-	__uint64_t __r;
-
-	__asm __volatile("mux1 %0=%1,@rev"
-			 : "=r" (__r) : "r"(_x));
-	return __r;
-}
-
-static __inline __uint32_t
-__bswap32(__uint32_t _x)
-{
-
-	return (__bswap64(_x) >> 32);
-}
-
-static __inline __uint16_t
-__bswap16(__uint16_t _x)
-{
-
-	return (__bswap64(_x) >> 48);
-}
-
-#define	__htonl(x)	__bswap32(x)
-#define	__htons(x)	__bswap16(x)
-#define	__ntohl(x)	__bswap32(x)
-#define	__ntohs(x)	__bswap16(x)
-
-#else /* !(__CC_SUPPORTS___INLINE && __GNUCLIKE_ASM) */
-
-/*
- * No optimizations are available for this compiler.  Fall back to
- * non-optimized functions by defining the constant usually used to prevent
- * redefinition.
- */
-#define	_BYTEORDER_FUNC_DEFINED
-
-#endif /* __CC_SUPPORTS___INLINE && __GNUCLIKE_ASM */
-
-#endif /* !_MACHINE_ENDIAN_H_ */
diff --git a/sys/ia64/include/exec.h b/sys/ia64/include/exec.h
deleted file mode 100644
index 0386728c7d3d..000000000000
--- a/sys/ia64/include/exec.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED 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.
- *
- * $FreeBSD$
- */
-
-#ifndef	_MACHINE_EXEC_H_
-#define	_MACHINE_EXEC_H_
-
-#define	__LDPGSZ	4096
-
-#endif /* !_MACHINE_EXEC_H_ */
diff --git a/sys/ia64/include/float.h b/sys/ia64/include/float.h
deleted file mode 100644
index 171be6b22512..000000000000
--- a/sys/ia64/include/float.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* $FreeBSD$ */
-/* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */
-
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 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.
- */
-
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern int __flt_rounds(void);
-__END_DECLS
-
-#define FLT_RADIX	2		/* b */
-#define FLT_ROUNDS	__flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define	FLT_EVAL_METHOD	0		/* no promotions */
-#define	DECIMAL_DIG	21		/* max precision in decimal digits */
-#endif
-
-#define FLT_MANT_DIG	24		/* p */
-#define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
-#define FLT_DIG		6		/* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP	(-125)		/* emin */
-#define FLT_MIN		1.17549435E-38F	/* b**(emin-1) */
-#define FLT_MIN_10_EXP	(-37)		/* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP	128		/* emax */
-#define FLT_MAX		3.40282347E+38F	/* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP	38		/* floor(log10((1-b**(-p))*b**emax)) */
-#if __ISO_C_VISIBLE >= 2011
-#define	FLT_TRUE_MIN	1.40129846E-45F	/* b**(emin-p) */
-#define	FLT_DECIMAL_DIG	9		/* ceil(1+p*log10(b)) */
-#define	FLT_HAS_SUBNORM	1
-#endif /* __ISO_C_VISIBLE >= 2011 */
-
-#define DBL_MANT_DIG	53
-#define DBL_EPSILON	2.2204460492503131E-16
-#define DBL_DIG		15
-#define DBL_MIN_EXP	(-1021)
-#define DBL_MIN		2.2250738585072014E-308
-#define DBL_MIN_10_EXP	(-307)
-#define DBL_MAX_EXP	1024
-#define DBL_MAX		1.7976931348623157E+308
-#define DBL_MAX_10_EXP	308
-#if __ISO_C_VISIBLE >= 2011
-#define	DBL_TRUE_MIN	4.9406564584124654E-324
-#define	DBL_DECIMAL_DIG	17
-#define	DBL_HAS_SUBNORM	1
-#endif /* __ISO_C_VISIBLE >= 2011 */
-
-#define LDBL_MANT_DIG	64
-#define LDBL_EPSILON	1.0842021724855044340E-19L
-#define LDBL_DIG	18
-#define LDBL_MIN_EXP	(-16381)
-#define LDBL_MIN	3.3621031431120935063E-4932L
-#define LDBL_MIN_10_EXP	(-4931)
-#define LDBL_MAX_EXP	16384
-#define LDBL_MAX	1.1897314953572317650E+4932L
-#define LDBL_MAX_10_EXP	4932
-#if __ISO_C_VISIBLE >= 2011
-#define	LDBL_TRUE_MIN	3.6451995318824746025E-4951L
-#define	LDBL_DECIMAL_DIG 21
-#define	LDBL_HAS_SUBNORM 1
-#endif /* __ISO_C_VISIBLE >= 2011 */
-
-#endif	/* _MACHINE_FLOAT_H_ */
diff --git a/sys/ia64/include/floatingpoint.h b/sys/ia64/include/floatingpoint.h
deleted file mode 100644
index 22be759195cb..000000000000
--- a/sys/ia64/include/floatingpoint.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED 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.
- *
- * $FreeBSD$
- */
-
-#include <machine/ieeefp.h>
diff --git a/sys/ia64/include/fpu.h b/sys/ia64/include/fpu.h
deleted file mode 100644
index 7a068ddf0fcd..000000000000
--- a/sys/ia64/include/fpu.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * Copyright (c) 1998 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$
- */
-
-#ifndef _MACHINE_FPU_H_
-#define _MACHINE_FPU_H_
-
-/*
- * Floating point status register bits.
- */
-
-#define IA64_FPSR_TRAP_VD	0x0000000000000001L
-#define IA64_FPSR_TRAP_DD	0x0000000000000002L
-#define IA64_FPSR_TRAP_ZD	0x0000000000000004L
-#define IA64_FPSR_TRAP_OD	0x0000000000000008L
-#define IA64_FPSR_TRAP_UD	0x0000000000000010L
-#define IA64_FPSR_TRAP_ID	0x0000000000000020L
-#define IA64_FPSR_SF(i,v)	((v) << ((i)*13+6))
-
-#define IA64_SF_FTZ		0x0001L
-#define IA64_SF_WRE		0x0002L
-#define IA64_SF_PC		0x000cL
-#define IA64_SF_PC_0		0x0000L
-#define IA64_SF_PC_1		0x0004L
-#define IA64_SF_PC_2		0x0008L
-#define IA64_SF_PC_3		0x000cL
-#define IA64_SF_RC		0x0030L
-#define IA64_SF_RC_NEAREST	0x0000L
-#define IA64_SF_RC_NEGINF	0x0010L
-#define IA64_SF_RC_POSINF	0x0020L
-#define IA64_SF_RC_TRUNC	0x0030L
-#define IA64_SF_TD		0x0040L
-#define IA64_SF_V		0x0080L
-#define IA64_SF_D		0x0100L
-#define IA64_SF_Z		0x0200L
-#define IA64_SF_O		0x0400L
-#define IA64_SF_U		0x0800L
-#define IA64_SF_I		0x1000L
-
-#define IA64_SF_DEFAULT		(IA64_SF_PC_3 | IA64_SF_RC_NEAREST)
-
-#define IA64_FPSR_DEFAULT	(IA64_FPSR_TRAP_VD			\
-				 | IA64_FPSR_TRAP_DD			\
-				 | IA64_FPSR_TRAP_ZD			\
-				 | IA64_FPSR_TRAP_OD			\
-				 | IA64_FPSR_TRAP_UD			\
-				 | IA64_FPSR_TRAP_ID			\
-				 | IA64_FPSR_SF(0, IA64_SF_DEFAULT)	\
-				 | IA64_FPSR_SF(1, (IA64_SF_DEFAULT	\
-						    | IA64_SF_TD	\
-						    | IA64_SF_WRE))	\
-				 | IA64_FPSR_SF(2, (IA64_SF_DEFAULT	\
-						    | IA64_SF_TD))	\
-				 | IA64_FPSR_SF(3, (IA64_SF_DEFAULT	\
-						    | IA64_SF_TD)))
-
-struct fpswa_ret {
-	unsigned long	status;
-	unsigned long	err1;
-	unsigned long	err2;
-	unsigned long	err3;
-};
-
-struct fpswa_bundle {
-	long double	bits;		/* Force 16-byte alignment. */
-};
-
-struct fpswa_fpctx {
-	unsigned long	mask_low;			/* f63 - f2 */
-	unsigned long	mask_high;			/* f127 - f64 */
-	union _ia64_fpreg *fp_low_preserved;		/* f2 - f5 */
-	union _ia64_fpreg *fp_low_volatile;		/* f6 - f15 */
-	union _ia64_fpreg *fp_high_preserved;		/* f16 - f31 */
-	union _ia64_fpreg *fp_high_volatile;		/* f32 - f127 */
-};
-
-struct fpswa_iface {
-	unsigned int	if_rev;
-	unsigned int	__res;
-	struct fpswa_ret (*if_fpswa)(unsigned long, struct fpswa_bundle *,
-	    unsigned long *, unsigned long *, unsigned long *, unsigned long *,
-	    unsigned long *, struct fpswa_fpctx *);
-};
-
-#endif /* ! _MACHINE_FPU_H_ */
diff --git a/sys/ia64/include/frame.h b/sys/ia64/include/frame.h
deleted file mode 100644
index 683d16446429..000000000000
--- a/sys/ia64/include/frame.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2000 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$
- */
-
-#ifndef _MACHINE_FRAME_H_
-#define	_MACHINE_FRAME_H_
-
-#ifndef _MACHINE_REGSET_H_
-#include <machine/_regset.h>
-#endif
-
-/*
- * Software trap, exception, and syscall frame.
- */
-struct trapframe {
-	uint64_t		tf_length;
-	uint64_t		tf_flags;
-#define FRAME_SYSCALL		1	/* syscalls use a partial trapframe */
-	struct _special		tf_special;
-	struct _caller_saved	tf_scratch;
-	struct _caller_saved_fp	tf_scratch_fp;
-};
-
-#endif /* _MACHINE_FRAME_H_ */
diff --git a/sys/ia64/include/gdb_machdep.h b/sys/ia64/include/gdb_machdep.h
deleted file mode 100644
index bc6ec4c66a2e..000000000000
--- a/sys/ia64/include/gdb_machdep.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2004 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 _MACHINE_GDB_MACHDEP_H_
-#define	_MACHINE_GDB_MACHDEP_H_
-
-#define GDB_NREGS	462
-#define	GDB_REG_PC	331
-
-#define	GDB_BUFSZ	(GDB_NREGS*16+128*16)
-
-static __inline size_t
-gdb_cpu_regsz(int regnum)
-{
-	return ((regnum >= 128 && regnum < 256) ? 16 : 8);
-}
-
-void *gdb_cpu_getreg(int, size_t *);
-void gdb_cpu_setreg(int, void *);
-int gdb_cpu_signal(int, int);
-int gdb_cpu_query(void);
-
-#endif /* !_MACHINE_GDB_MACHDEP_H_ */
diff --git a/sys/ia64/include/ia64_cpu.h b/sys/ia64/include/ia64_cpu.h
deleted file mode 100644
index 74e649b06871..000000000000
--- a/sys/ia64/include/ia64_cpu.h
+++ /dev/null
@@ -1,532 +0,0 @@
-/*-
- * Copyright (c) 2007 Marcel Moolenaar
- * Copyright (c) 2000 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$
- */
-
-#ifndef _MACHINE_IA64_CPU_H_
-#define _MACHINE_IA64_CPU_H_
-
-/*
- * Local Interrupt ID.
- */
-#define	IA64_LID_GET_SAPIC_ID(x)	((u_int)((x) >> 16) & 0xffff)
-#define	IA64_LID_SET_SAPIC_ID(x)	((u_int)((x) & 0xffff) << 16)
-
-/*
- * Definition of DCR bits.
- */
-#define	IA64_DCR_PP		0x0000000000000001
-#define	IA64_DCR_BE		0x0000000000000002
-#define	IA64_DCR_LC		0x0000000000000004
-#define	IA64_DCR_DM		0x0000000000000100
-#define	IA64_DCR_DP		0x0000000000000200
-#define	IA64_DCR_DK		0x0000000000000400
-#define	IA64_DCR_DX		0x0000000000000800
-#define	IA64_DCR_DR		0x0000000000001000
-#define	IA64_DCR_DA		0x0000000000002000
-#define	IA64_DCR_DD		0x0000000000004000
-
-#define	IA64_DCR_DEFAULT					\
-    (IA64_DCR_DM | IA64_DCR_DP | IA64_DCR_DK | IA64_DCR_DX |	\
-     IA64_DCR_DR | IA64_DCR_DA | IA64_DCR_DD)
-
-/*
- * Definition of PSR and IPSR bits.
- */
-#define IA64_PSR_BE		0x0000000000000002
-#define IA64_PSR_UP		0x0000000000000004
-#define IA64_PSR_AC		0x0000000000000008
-#define IA64_PSR_MFL		0x0000000000000010
-#define IA64_PSR_MFH		0x0000000000000020
-#define IA64_PSR_IC		0x0000000000002000
-#define IA64_PSR_I		0x0000000000004000
-#define IA64_PSR_PK		0x0000000000008000
-#define IA64_PSR_DT		0x0000000000020000
-#define IA64_PSR_DFL		0x0000000000040000
-#define IA64_PSR_DFH		0x0000000000080000
-#define IA64_PSR_SP		0x0000000000100000
-#define IA64_PSR_PP		0x0000000000200000
-#define IA64_PSR_DI		0x0000000000400000
-#define IA64_PSR_SI		0x0000000000800000
-#define IA64_PSR_DB		0x0000000001000000
-#define IA64_PSR_LP		0x0000000002000000
-#define IA64_PSR_TB		0x0000000004000000
-#define IA64_PSR_RT		0x0000000008000000
-#define IA64_PSR_CPL		0x0000000300000000
-#define IA64_PSR_CPL_KERN	0x0000000000000000
-#define IA64_PSR_CPL_1		0x0000000100000000
-#define IA64_PSR_CPL_2		0x0000000200000000
-#define IA64_PSR_CPL_USER	0x0000000300000000
-#define IA64_PSR_IS		0x0000000400000000
-#define IA64_PSR_MC		0x0000000800000000
-#define IA64_PSR_IT		0x0000001000000000
-#define IA64_PSR_ID		0x0000002000000000
-#define IA64_PSR_DA		0x0000004000000000
-#define IA64_PSR_DD		0x0000008000000000
-#define IA64_PSR_SS		0x0000010000000000
-#define IA64_PSR_RI		0x0000060000000000
-#define IA64_PSR_RI_0		0x0000000000000000
-#define IA64_PSR_RI_1		0x0000020000000000
-#define IA64_PSR_RI_2		0x0000040000000000
-#define IA64_PSR_ED		0x0000080000000000
-#define IA64_PSR_BN		0x0000100000000000
-#define IA64_PSR_IA		0x0000200000000000
-
-/*
- * Definition of ISR bits.
- */
-#define IA64_ISR_CODE		0x000000000000ffff
-#define IA64_ISR_VECTOR		0x0000000000ff0000
-#define IA64_ISR_X		0x0000000100000000
-#define IA64_ISR_W		0x0000000200000000
-#define IA64_ISR_R		0x0000000400000000
-#define IA64_ISR_NA		0x0000000800000000
-#define IA64_ISR_SP		0x0000001000000000
-#define IA64_ISR_RS		0x0000002000000000
-#define IA64_ISR_IR		0x0000004000000000
-#define IA64_ISR_NI		0x0000008000000000
-#define IA64_ISR_SO		0x0000010000000000
-#define IA64_ISR_EI		0x0000060000000000
-#define IA64_ISR_EI_0		0x0000000000000000
-#define IA64_ISR_EI_1		0x0000020000000000
-#define IA64_ISR_EI_2		0x0000040000000000
-#define IA64_ISR_ED		0x0000080000000000
-
-/*
- * Vector numbers for various ia64 interrupts.
- */
-#define IA64_VEC_VHPT			0
-#define IA64_VEC_ITLB			1
-#define IA64_VEC_DTLB			2
-#define IA64_VEC_ALT_ITLB		3
-#define IA64_VEC_ALT_DTLB		4
-#define IA64_VEC_NESTED_DTLB		5
-#define IA64_VEC_IKEY_MISS		6
-#define IA64_VEC_DKEY_MISS		7
-#define IA64_VEC_DIRTY_BIT		8
-#define IA64_VEC_INST_ACCESS		9
-#define IA64_VEC_DATA_ACCESS		10
-#define IA64_VEC_BREAK			11
-#define IA64_VEC_EXT_INTR		12
-#define IA64_VEC_PAGE_NOT_PRESENT	20
-#define IA64_VEC_KEY_PERMISSION		21
-#define IA64_VEC_INST_ACCESS_RIGHTS	22
-#define IA64_VEC_DATA_ACCESS_RIGHTS	23
-#define IA64_VEC_GENERAL_EXCEPTION	24
-#define IA64_VEC_DISABLED_FP		25
-#define IA64_VEC_NAT_CONSUMPTION	26
-#define IA64_VEC_SPECULATION		27
-#define IA64_VEC_DEBUG			29
-#define IA64_VEC_UNALIGNED_REFERENCE	30
-#define IA64_VEC_UNSUPP_DATA_REFERENCE	31
-#define IA64_VEC_FLOATING_POINT_FAULT	32
-#define IA64_VEC_FLOATING_POINT_TRAP	33
-#define IA64_VEC_LOWER_PRIVILEGE_TRANSFER 34
-#define IA64_VEC_TAKEN_BRANCH_TRAP	35
-#define IA64_VEC_SINGLE_STEP_TRAP	36
-#define IA64_VEC_IA32_EXCEPTION		45
-#define IA64_VEC_IA32_INTERCEPT		46
-#define IA64_VEC_IA32_INTERRUPT		47
-
-/*
- * IA-32 exceptions.
- */
-#define IA32_EXCEPTION_DIVIDE		0
-#define IA32_EXCEPTION_DEBUG		1
-#define IA32_EXCEPTION_BREAK		3
-#define IA32_EXCEPTION_OVERFLOW		4
-#define IA32_EXCEPTION_BOUND		5
-#define IA32_EXCEPTION_DNA		7
-#define IA32_EXCEPTION_NOT_PRESENT	11
-#define IA32_EXCEPTION_STACK_FAULT	12
-#define IA32_EXCEPTION_GPFAULT		13
-#define IA32_EXCEPTION_FPERROR		16
-#define IA32_EXCEPTION_ALIGNMENT_CHECK	17
-#define IA32_EXCEPTION_STREAMING_SIMD	19
-
-#define IA32_INTERCEPT_INSTRUCTION	0
-#define IA32_INTERCEPT_GATE		1
-#define IA32_INTERCEPT_SYSTEM_FLAG	2
-#define IA32_INTERCEPT_LOCK		4
-
-#ifndef LOCORE
-
-/*
- * Various special ia64 instructions.
- */
-
-/*
- * Memory Fence.
- */
-static __inline void
-ia64_mf(void)
-{
-	__asm __volatile("mf");
-}
-
-static __inline void
-ia64_mf_a(void)
-{
-	__asm __volatile("mf.a");
-}
-
-/*
- * Flush Cache.
- */
-static __inline void
-ia64_fc(uint64_t va)
-{
-	__asm __volatile("fc %0" :: "r"(va));
-}
-
-static __inline void
-ia64_fc_i(uint64_t va)
-{
-	__asm __volatile("fc.i %0" :: "r"(va));
-}
-
-/*
- * Sync instruction stream.
- */
-static __inline void
-ia64_sync_i(void)
-{
-	__asm __volatile("sync.i");
-}
-
-/*
- * Calculate address in VHPT for va.
- */
-static __inline uint64_t
-ia64_thash(uint64_t va)
-{
-	uint64_t result;
-	__asm __volatile("thash %0=%1" : "=r" (result) : "r" (va));
-	return result;
-}
-
-/*
- * Calculate VHPT tag for va.
- */
-static __inline uint64_t
-ia64_ttag(uint64_t va)
-{
-	uint64_t result;
-	__asm __volatile("ttag %0=%1" : "=r" (result) : "r" (va));
-	return result;
-}
-
-/*
- * Convert virtual address to physical.
- */
-static __inline uint64_t
-ia64_tpa(uint64_t va)
-{
-	uint64_t result;
-	__asm __volatile("tpa %0=%1" : "=r" (result) : "r" (va));
-	return result;
-}
-
-/*
- * Generate a ptc.e instruction.
- */
-static __inline void
-ia64_ptc_e(uint64_t v)
-{
-	__asm __volatile("ptc.e %0;; srlz.i;;" :: "r"(v));
-}
-
-/*
- * Generate a ptc.g instruction.
- */
-static __inline void
-ia64_ptc_g(uint64_t va, uint64_t log2size)
-{
-	__asm __volatile("ptc.g %0,%1;;" :: "r"(va), "r"(log2size));
-}
-
-/*
- * Generate a ptc.ga instruction.
- */
-static __inline void
-ia64_ptc_ga(uint64_t va, uint64_t log2size)
-{
-	__asm __volatile("ptc.ga %0,%1;;" :: "r"(va), "r"(log2size));
-}
-
-/*
- * Generate a ptc.l instruction.
- */
-static __inline void
-ia64_ptc_l(uint64_t va, uint64_t log2size)
-{
-	__asm __volatile("ptc.l %0,%1;; srlz.i;;" :: "r"(va), "r"(log2size));
-}
-
-/*
- * Invalidate the ALAT on the local processor.
- */
-static __inline void
-ia64_invala(void)
-{
-	__asm __volatile("invala;;");
-}
-
-/*
- * Unordered memory load.
- */
-
-static __inline uint8_t
-ia64_ld1(uint8_t *p)
-{
-	uint8_t v;
-
-	__asm __volatile("ld1 %0=[%1];;" : "=r"(v) : "r"(p));
-	return (v);
-}
-
-static __inline uint16_t
-ia64_ld2(uint16_t *p)        
-{
-	uint16_t v;
-
-	__asm __volatile("ld2 %0=[%1];;" : "=r"(v) : "r"(p));
-	return (v);
-}
-
-static __inline uint32_t
-ia64_ld4(uint32_t *p)        
-{
-	uint32_t v;
-
-	__asm __volatile("ld4 %0=[%1];;" : "=r"(v) : "r"(p));
-	return (v);
-}
-
-static __inline uint64_t
-ia64_ld8(uint64_t *p)        
-{
-	uint64_t v;
-
-	__asm __volatile("ld8 %0=[%1];;" : "=r"(v) : "r"(p));
-	return (v);
-}
-
-/*
- * Unordered memory store.
- */
-
-static __inline void
-ia64_st1(uint8_t *p, uint8_t v)
-{
-	__asm __volatile("st1 [%0]=%1;;" :: "r"(p), "r"(v));
-}
-
-static __inline void
-ia64_st2(uint16_t *p, uint16_t v)
-{
-	__asm __volatile("st2 [%0]=%1;;" :: "r"(p), "r"(v));
-}
-
-static __inline void
-ia64_st4(uint32_t *p, uint32_t v)
-{
-	__asm __volatile("st4 [%0]=%1;;" :: "r"(p), "r"(v));
-}
-
-static __inline void
-ia64_st8(uint64_t *p, uint64_t v)
-{
-	__asm __volatile("st8 [%0]=%1;;" :: "r"(p), "r"(v));
-}
-
-/*
- * Read the value of psr.
- */
-static __inline uint64_t
-ia64_get_psr(void)
-{
-	uint64_t result;
-	__asm __volatile("mov %0=psr;;" : "=r" (result));
-	return result;
-}
-
-/*
- * Define accessors for application registers.
- */
-
-#define IA64_AR(name)						\
-								\
-static __inline uint64_t					\
-ia64_get_##name(void)						\
-{								\
-	uint64_t result;					\
-	__asm __volatile("mov %0=ar." #name : "=r" (result));	\
-	return result;						\
-}								\
-								\
-static __inline void						\
-ia64_set_##name(uint64_t v)					\
-{								\
-	__asm __volatile("mov ar." #name "=%0;;" :: "r" (v));	\
-}
-
-IA64_AR(k0)
-IA64_AR(k1)
-IA64_AR(k2)
-IA64_AR(k3)
-IA64_AR(k4)
-IA64_AR(k5)
-IA64_AR(k6)
-IA64_AR(k7)
-
-IA64_AR(rsc)
-IA64_AR(bsp)
-IA64_AR(bspstore)
-IA64_AR(rnat)
-
-IA64_AR(fcr)
-
-IA64_AR(eflag)
-IA64_AR(csd)
-IA64_AR(ssd)
-IA64_AR(cflg)
-IA64_AR(fsr)
-IA64_AR(fir)
-IA64_AR(fdr)
-
-IA64_AR(ccv)
-
-IA64_AR(unat)
-
-IA64_AR(fpsr)
-
-IA64_AR(itc)
-
-IA64_AR(pfs)
-IA64_AR(lc)
-IA64_AR(ec)
-
-/*
- * Define accessors for control registers.
- */
-
-#define IA64_CR(name)						\
-								\
-static __inline uint64_t					\
-ia64_get_##name(void)						\
-{								\
-	uint64_t result;					\
-	__asm __volatile("mov %0=cr." #name : "=r" (result));	\
-	return result;						\
-}								\
-								\
-static __inline void						\
-ia64_set_##name(uint64_t v)					\
-{								\
-	__asm __volatile("mov cr." #name "=%0;;" :: "r" (v));	\
-}
-
-IA64_CR(dcr)
-IA64_CR(itm)
-IA64_CR(iva)
-
-IA64_CR(pta)
-
-IA64_CR(ipsr)
-IA64_CR(isr)
-
-IA64_CR(iip)
-IA64_CR(ifa)
-IA64_CR(itir)
-IA64_CR(iipa)
-IA64_CR(ifs)
-IA64_CR(iim)
-IA64_CR(iha)
-
-IA64_CR(lid)
-IA64_CR(ivr)
-IA64_CR(tpr)
-IA64_CR(eoi)
-IA64_CR(irr0)
-IA64_CR(irr1)
-IA64_CR(irr2)
-IA64_CR(irr3)
-IA64_CR(itv)
-IA64_CR(pmv)
-IA64_CR(cmcv)
-
-IA64_CR(lrr0)
-IA64_CR(lrr1)
-
-/*
- * Write a region register.
- */
-static __inline void
-ia64_set_rr(uint64_t rrbase, uint64_t v)
-{
-	__asm __volatile("mov rr[%0]=%1"
-			 :: "r"(rrbase), "r"(v) : "memory");
-}
-
-/*
- * Read a CPUID register.
- */
-static __inline uint64_t
-ia64_get_cpuid(int i)
-{
-	uint64_t result;
-	__asm __volatile("mov %0=cpuid[%1]"
-			 : "=r" (result) : "r"(i));
-	return result;
-}
-
-static __inline void
-ia64_disable_highfp(void)
-{
-	__asm __volatile("ssm psr.dfh;; srlz.d");
-}
-
-static __inline void
-ia64_enable_highfp(void)
-{
-	__asm __volatile("rsm psr.dfh;; srlz.d");
-}
-
-/*
- * Avoid inline functions for the following so that they still work
- * correctly when inlining is not enabled (e.g. -O0). Function calls
- * need data serialization after setting psr, which results in a
- * hazard.
- */
-#define	ia64_srlz_d()	__asm __volatile("srlz.d")
-#define	ia64_srlz_i()	__asm __volatile("srlz.i;;")
-
-#endif /* !LOCORE */
-
-#endif /* _MACHINE_IA64_CPU_H_ */
-
diff --git a/sys/ia64/include/ieee.h b/sys/ia64/include/ieee.h
deleted file mode 100644
index 0b1f6312bead..000000000000
--- a/sys/ia64/include/ieee.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* $FreeBSD$ */
-/* From: NetBSD: ieee.h,v 1.2 1997/04/06 08:47:27 cgd Exp */
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- *	@(#)ieee.h	8.1 (Berkeley) 6/11/93
- *
- * from: Header: ieee.h,v 1.7 92/11/26 02:04:37 torek Exp 
- */
-
-/*
- * ieee.h defines the machine-dependent layout of the machine's IEEE
- * floating point.  It does *not* define (yet?) any of the rounding
- * mode bits, exceptions, and so forth.
- */
-
-/*
- * Define the number of bits in each fraction and exponent.
- *
- *		     k	         k+1
- * Note that  1.0 x 2  == 0.1 x 2      and that denorms are represented
- *
- *					  (-exp_bias+1)
- * as fractions that look like 0.fffff x 2             .  This means that
- *
- *			 -126
- * the number 0.10000 x 2    , for instance, is the same as the normalized
- *
- *		-127			   -128
- * float 1.0 x 2    .  Thus, to represent 2    , we need one leading zero
- *
- *				  -129
- * in the fraction; to represent 2    , we need two, and so on.  This
- *
- *						     (-exp_bias-fracbits+1)
- * implies that the smallest denormalized number is 2
- *
- * for whichever format we are talking about: for single precision, for
- *
- *						-126		-149
- * instance, we get .00000000000000000000001 x 2    , or 1.0 x 2    , and
- *
- * -149 == -127 - 23 + 1.
- */
-#define	SNG_EXPBITS	8
-#define	SNG_FRACBITS	23
-
-#define	DBL_EXPBITS	11
-#define	DBL_FRACBITS	52
-
-struct ieee_single {
-	u_int	sng_frac:23;
-	u_int	sng_exp:8;
-	u_int	sng_sign:1;
-};
-
-struct ieee_double {
-	u_int	dbl_fracl;
-	u_int	dbl_frach:20;
-	u_int	dbl_exp:11;
-	u_int	dbl_sign:1;
-};
-
-/*
- * Floats whose exponent is in [1..INFNAN) (of whatever type) are
- * `normal'.  Floats whose exponent is INFNAN are either Inf or NaN.
- * Floats whose exponent is zero are either zero (iff all fraction
- * bits are zero) or subnormal values.
- *
- * A NaN is a `signalling NaN' if its QUIETNAN bit is clear in its
- * high fraction; if the bit is set, it is a `quiet NaN'.
- */
-#define	SNG_EXP_INFNAN	255
-#define	DBL_EXP_INFNAN	2047
-
-#if 0
-#define	SNG_QUIETNAN	(1 << 22)
-#define	DBL_QUIETNAN	(1 << 19)
-#endif
-
-/*
- * Exponent biases.
- */
-#define	SNG_EXP_BIAS	127
-#define	DBL_EXP_BIAS	1023
diff --git a/sys/ia64/include/ieeefp.h b/sys/ia64/include/ieeefp.h
deleted file mode 100644
index 7cde91b4814c..000000000000
--- a/sys/ia64/include/ieeefp.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 2001 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$
- */
-
-#ifndef _MACHINE_IEEEFP_H_
-#define _MACHINE_IEEEFP_H_
-
-/* Deprecated historical FPU control interface */
-
-#include <machine/fpu.h>
-
-typedef int fp_except_t;
-#define	FP_X_INV	IA64_FPSR_TRAP_VD /* invalid operation exception */
-#define	FP_X_DZ		IA64_FPSR_TRAP_ZD /* divide-by-zero exception */
-#define	FP_X_OFL	IA64_FPSR_TRAP_OD /* overflow exception */
-#define	FP_X_UFL	IA64_FPSR_TRAP_UD /* underflow exception */
-#define	FP_X_IMP	IA64_FPSR_TRAP_ID /* imprecise(inexact) exception */
-
-typedef enum {
-	FP_RN = 0,		/* round to nearest */
-	FP_RM,			/* round toward minus infinity */
-	FP_RP,			/* round toward plus infinity */
-	FP_RZ			/* round toward zero */
-} fp_rnd_t;
-
-__BEGIN_DECLS
-extern fp_rnd_t    fpgetround(void);
-extern fp_rnd_t    fpsetround(fp_rnd_t);
-extern fp_except_t fpgetmask(void);
-extern fp_except_t fpsetmask(fp_except_t);
-__END_DECLS
-
-#endif /* !_MACHINE_IEEEFP_H_ */
diff --git a/sys/ia64/include/in_cksum.h b/sys/ia64/include/in_cksum.h
deleted file mode 100644
index 4fe1b4023f7b..000000000000
--- a/sys/ia64/include/in_cksum.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 1990 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 tahoe:	in_cksum.c	1.2	86/01/05
- *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
- *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_IN_CKSUM_H_
-#define	_MACHINE_IN_CKSUM_H_	1
-
-#include <sys/cdefs.h>
-
-#define in_cksum(m, len)	in_cksum_skip(m, len, 0)
-
-#if defined(IPVERSION) && (IPVERSION == 4)
-/*
- * It it useful to have an Internet checksum routine which is inlineable
- * and optimized specifically for the task of computing IP header checksums
- * in the normal case (where there are no options and the header length is
- * therefore always exactly five 32-bit words.
- */
-#ifdef __CC_SUPPORTS___INLINE
-
-static __inline void
-in_cksum_update(struct ip *ip)
-{
-	int __tmpsum;
-	__tmpsum = (int)ntohs(ip->ip_sum) + 256;
-	ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16));
-}
-
-#else
-
-#define	in_cksum_update(ip) \
-	do { \
-		int __tmpsum; \
-		__tmpsum = (int)ntohs(ip->ip_sum) + 256; \
-		ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16)); \
-	} while(0)
-
-#endif
-#endif
-
-#ifdef _KERNEL
-#if defined(IPVERSION) && (IPVERSION == 4)
-u_int in_cksum_hdr(const struct ip *ip);
-#endif
-u_short	in_addword(u_short sum, u_short b);
-u_short	in_pseudo(u_int sum, u_int b, u_int c);
-u_short	in_cksum_skip(struct mbuf *m, int len, int skip);
-#endif
-
-#endif /* _MACHINE_IN_CKSUM_H_ */
diff --git a/sys/ia64/include/intr.h b/sys/ia64/include/intr.h
deleted file mode 100644
index 81603cfabfdf..000000000000
--- a/sys/ia64/include/intr.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 2007-2010 Marcel Moolenaar
- * Copyright (c) 1998 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$
- */
-
-#ifndef _MACHINE_INTR_H_
-#define	_MACHINE_INTR_H_
-
-#define	IA64_NXIVS		256	/* External Interrupt Vectors */
-#define	IA64_MIN_XIV		16
-
-#define	IA64_MAX_HWPRIO		14
-
-struct pcpu;
-struct sapic;
-struct thread;
-struct trapframe;
-
-/*
- * Layout of the Processor Interrupt Block.
- */
-struct ia64_pib
-{
-	uint64_t	ib_ipi[65536][2];	/* 64K-way IPIs (1MB area). */
-	uint8_t		_rsvd1[0xe0000];
-	uint8_t		ib_inta;		/* Generate INTA cycle. */
-	uint8_t		_rsvd2[7];
-	uint8_t		ib_xtp;			/* External Task Priority. */
-	uint8_t		_rsvd3[7];
-	uint8_t		_rsvd4[0x1fff0];
-};
-
-enum ia64_xiv_use {
-	IA64_XIV_FREE,
-	IA64_XIV_ARCH,		/* Architecturally defined. */
-	IA64_XIV_PLAT,		/* Platform defined. */
-	IA64_XIV_IPI,		/* Used for IPIs. */
-	IA64_XIV_IRQ		/* Used for external interrupts. */
-};
-
-typedef u_int (ia64_ihtype)(struct thread *, u_int, struct trapframe *);
-
-extern struct ia64_pib *ia64_pib;
-
-void	ia64_bind_intr(void);
-void	ia64_handle_intr(struct trapframe *);
-int	ia64_setup_intr(const char *, int, driver_filter_t, driver_intr_t,
-	    void *, enum intr_type, void **);
-int	ia64_teardown_intr(void *);
-
-void	ia64_xiv_init(void);
-u_int	ia64_xiv_alloc(u_int, enum ia64_xiv_use, ia64_ihtype);
-int	ia64_xiv_free(u_int, enum ia64_xiv_use);
-int	ia64_xiv_reserve(u_int, enum ia64_xiv_use, ia64_ihtype);
-
-int	sapic_bind_intr(u_int, struct pcpu *);
-int	sapic_config_intr(u_int, enum intr_trigger, enum intr_polarity);
-struct sapic *sapic_create(u_int, u_int, uint64_t);
-int	sapic_enable(struct sapic *, u_int, u_int);
-void	sapic_eoi(struct sapic *, u_int);
-struct sapic *sapic_lookup(u_int, u_int *);
-void	sapic_mask(struct sapic *, u_int);
-void	sapic_unmask(struct sapic *, u_int);
-
-#ifdef DDB
-void	sapic_print(struct sapic *, u_int);
-#endif
-
-#endif /* !_MACHINE_INTR_H_ */
diff --git a/sys/ia64/include/intrcnt.h b/sys/ia64/include/intrcnt.h
deleted file mode 100644
index 5e165ea75efe..000000000000
--- a/sys/ia64/include/intrcnt.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $FreeBSD$ */
-/* $NetBSD: intrcnt.h,v 1.17 1998/11/19 01:48:04 ross Exp $ */
-
-/*-
- * Copyright (c) 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.
- */
-
-#define	INTRCNT_CLOCK		0
-#define	INTRCNT_COUNT		256
-
-/*
- * Maximum name length in intrnames table (including terminating '\0'.
- * Since vmstat(8) assumes a maximum length of 13 (including '\0'), we're
- * pretty much limited to that (unless we don't care about the alignment
- * of the columns :-)
- */
-#define INTRNAME_LEN		13
diff --git a/sys/ia64/include/iodev.h b/sys/ia64/include/iodev.h
deleted file mode 100644
index cf349d9b068e..000000000000
--- a/sys/ia64/include/iodev.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 2010 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_IODEV_H_
-#define	_MACHINE_IODEV_H_
-
-#include <sys/uuid.h>
-
-#ifdef _KERNEL
-#include <machine/bus.h>
-#endif
-
-#define	IODEV_EFIVAR_GETVAR	0
-#define	IODEV_EFIVAR_NEXTNAME	1
-#define	IODEV_EFIVAR_SETVAR	2
-
-struct iodev_efivar_req {
-	u_int	access;
-	u_int	result;			/* errno value */
-	size_t	namesize;
-	u_short	*name;			/* UCS-2 */
-	struct uuid vendor;
-	uint32_t attrib;
-	size_t	datasize;
-	void	*data;
-};
-
-#define	IODEV_EFIVAR	_IOWR('I', 1, struct iodev_efivar_req)
-
-#ifdef _KERNEL
-#define	iodev_read_1	bus_space_read_io_1
-#define	iodev_read_2	bus_space_read_io_2
-#define	iodev_read_4	bus_space_read_io_4
-#define	iodev_write_1	bus_space_write_io_1
-#define	iodev_write_2	bus_space_write_io_2
-#define	iodev_write_4	bus_space_write_io_4
-
-int	 iodev_open(struct thread *td);
-int	 iodev_close(struct thread *td);
-int	 iodev_ioctl(u_long, caddr_t data);
-
-#endif /* _KERNEL */
-#endif /* _MACHINE_IODEV_H_ */
diff --git a/sys/ia64/include/kdb.h b/sys/ia64/include/kdb.h
deleted file mode 100644
index 0304f510f919..000000000000
--- a/sys/ia64/include/kdb.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 2004 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 _MACHINE_KDB_H_
-#define _MACHINE_KDB_H_
-
-#include <machine/cpufunc.h>
-#include <machine/frame.h>
-#include <machine/ia64_cpu.h>
-
-#define	KDB_STOPPEDPCB(pc)	(&(pc)->pc_md.pcb)
-
-void kdb_cpu_trap(int, int);
-
-static __inline void
-kdb_cpu_clear_singlestep(void)
-{
-	kdb_frame->tf_special.psr &= ~IA64_PSR_SS;
-}
-
-static __inline void
-kdb_cpu_set_singlestep(void)
-{
-	kdb_frame->tf_special.psr |= IA64_PSR_SS;
-}
-
-static __inline void
-kdb_cpu_sync_icache(unsigned char *addr, size_t size)
-{
-	vm_offset_t cacheline;
-
-	cacheline = (uintptr_t)addr & ~31;
-	size += (uintptr_t)addr - cacheline;
-	size = (size + 31) & ~31;
-	while (size > 0) {
-		__asm __volatile("fc %0;; sync.i;; srlz.i;;" :: "r"(cacheline));
-		cacheline += 32;
-		size -= 32;
-	}
-}
-
-#endif /* _MACHINE_KDB_H_ */
diff --git a/sys/ia64/include/mca.h b/sys/ia64/include/mca.h
deleted file mode 100644
index 1f38c135aafb..000000000000
--- a/sys/ia64/include/mca.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*-
- * Copyright (c) 2002-2010 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 _MACHINE_MCA_H_
-#define _MACHINE_MCA_H_
-
-struct mca_record_header {
-	uint64_t	rh_seqnr;		/* Record id. */
-	uint8_t		rh_major;		/* BCD (=02). */
-	uint8_t		rh_minor;		/* BCD (=00). */
-	uint8_t		rh_error;		/* Error severity. */
-#define	MCA_RH_ERROR_RECOVERABLE	0
-#define	MCA_RH_ERROR_FATAL		1
-#define	MCA_RH_ERROR_CORRECTED		2
-	uint8_t		rh_flags;
-#define	MCA_RH_FLAGS_PLATFORM_ID	0x01	/* Platform_id present. */
-#define	MCA_RH_FLAGS_TIME_STAMP		0x02	/* Timestamp invalid. */
-	uint32_t	rh_length;		/* Size including header. */
-	uint8_t		rh_time[8];
-#define	MCA_RH_TIME_SEC		0
-#define	MCA_RH_TIME_MIN		1
-#define	MCA_RH_TIME_HOUR	2
-#define	MCA_RH_TIME_MDAY	4
-#define	MCA_RH_TIME_MON		5
-#define	MCA_RH_TIME_YEAR	6
-#define	MCA_RH_TIME_CENT	7
-	struct uuid	rh_platform;
-};
-
-struct mca_section_header {
-	struct uuid	sh_uuid;
-	uint8_t		sh_major;		/* BCD (=02). */
-	uint8_t		sh_minor;		/* BCD (=00). */
-	uint8_t		sh_flags;
-#define	MCA_SH_FLAGS_CORRECTED	0x01		/* Error has been corrected. */
-#define	MCA_SH_FLAGS_PROPAGATE	0x02		/* Possible propagation. */
-#define	MCA_SH_FLAGS_RESET	0x04		/* Reset device before use. */
-#define	MCA_SH_FLAGS_VALID	0x80		/* Flags are valid. */
-	uint8_t		__reserved;
-	uint32_t	sh_length;		/* Size including header. */
-};
-
-struct mca_cpu_record {
-	uint64_t	cpu_flags;
-#define	MCA_CPU_FLAGS_ERRMAP		(1ULL << 0)
-#define	MCA_CPU_FLAGS_STATE		(1ULL << 1)
-#define	MCA_CPU_FLAGS_CR_LID		(1ULL << 2)
-#define	MCA_CPU_FLAGS_PSI_STRUCT	(1ULL << 3)
-#define	MCA_CPU_FLAGS_CACHE(x)		(((x) >> 4) & 15)
-#define	MCA_CPU_FLAGS_TLB(x)		(((x) >> 8) & 15)
-#define	MCA_CPU_FLAGS_BUS(x)		(((x) >> 12) & 15)
-#define	MCA_CPU_FLAGS_REG(x)		(((x) >> 16) & 15)
-#define	MCA_CPU_FLAGS_MS(x)		(((x) >> 20) & 15)
-#define	MCA_CPU_FLAGS_CPUID		(1ULL << 24)
-	uint64_t	cpu_errmap;
-	uint64_t	cpu_state;
-	uint64_t	cpu_cr_lid;
-	/* Nx cpu_mod (cache). */
-	/* Nx cpu_mod (TLB). */
-	/* Nx cpu_mod (bus). */
-	/* Nx cpu_mod (reg). */
-	/* Nx cpu_mod (MS). */
-	/* cpu_cpuid. */
-	/* cpu_psi. */
-};
-
-struct mca_cpu_cpuid {
-	uint64_t	cpuid[6];
-};
-
-struct mca_cpu_mod {
-	uint64_t	cpu_mod_flags;
-#define	MCA_CPU_MOD_FLAGS_INFO	(1ULL << 0)
-#define	MCA_CPU_MOD_FLAGS_REQID	(1ULL << 1)
-#define	MCA_CPU_MOD_FLAGS_RSPID	(1ULL << 2)
-#define	MCA_CPU_MOD_FLAGS_TGTID	(1ULL << 3)
-#define	MCA_CPU_MOD_FLAGS_IP	(1ULL << 4)
-	uint64_t	cpu_mod_info;
-	uint64_t	cpu_mod_reqid;
-	uint64_t	cpu_mod_rspid;
-	uint64_t	cpu_mod_tgtid;
-	uint64_t	cpu_mod_ip;
-};
-
-struct mca_cpu_psi {
-	uint64_t	cpu_psi_flags;
-#define	MCA_CPU_PSI_FLAGS_STATE	(1ULL << 0)
-#define	MCA_CPU_PSI_FLAGS_BR	(1ULL << 1)
-#define	MCA_CPU_PSI_FLAGS_CR	(1ULL << 2)
-#define	MCA_CPU_PSI_FLAGS_AR	(1ULL << 3)
-#define	MCA_CPU_PSI_FLAGS_RR	(1ULL << 4)
-#define	MCA_CPU_PSI_FLAGS_FR	(1ULL << 5)
-	uint8_t		cpu_psi_state[1024];	/* XXX variable? */
-	uint64_t	cpu_psi_br[8];
-	uint64_t	cpu_psi_cr[128];	/* XXX variable? */
-	uint64_t	cpu_psi_ar[128];	/* XXX variable? */
-	uint64_t	cpu_psi_rr[8];
-	uint64_t	cpu_psi_fr[256];	/* 16 bytes per register! */
-};
-
-struct mca_mem_record {
-	uint64_t	mem_flags;
-#define	MCA_MEM_FLAGS_STATUS		(1ULL << 0)
-#define	MCA_MEM_FLAGS_ADDR		(1ULL << 1)
-#define	MCA_MEM_FLAGS_ADDRMASK		(1ULL << 2)
-#define	MCA_MEM_FLAGS_NODE		(1ULL << 3)
-#define	MCA_MEM_FLAGS_CARD		(1ULL << 4)
-#define	MCA_MEM_FLAGS_MODULE		(1ULL << 5)
-#define	MCA_MEM_FLAGS_BANK		(1ULL << 6)
-#define	MCA_MEM_FLAGS_DEVICE		(1ULL << 7)
-#define	MCA_MEM_FLAGS_ROW		(1ULL << 8)
-#define	MCA_MEM_FLAGS_COLUMN		(1ULL << 9)
-#define	MCA_MEM_FLAGS_BITPOS		(1ULL << 10)
-#define	MCA_MEM_FLAGS_REQID		(1ULL << 11)
-#define	MCA_MEM_FLAGS_RSPID		(1ULL << 12)
-#define	MCA_MEM_FLAGS_TGTID		(1ULL << 13)
-#define	MCA_MEM_FLAGS_BUSDATA		(1ULL << 14)
-#define	MCA_MEM_FLAGS_OEM_ID		(1ULL << 15)
-#define	MCA_MEM_FLAGS_OEM_DATA		(1ULL << 16)
-	uint64_t	mem_status;
-	uint64_t	mem_addr;
-	uint64_t	mem_addrmask;
-	uint16_t	mem_node;
-	uint16_t	mem_card;
-	uint16_t	mem_module;
-	uint16_t	mem_bank;
-	uint16_t	mem_device;
-	uint16_t	mem_row;
-	uint16_t	mem_column;
-	uint16_t	mem_bitpos;
-	uint64_t	mem_reqid;
-	uint64_t	mem_rspid;
-	uint64_t	mem_tgtid;
-	uint64_t	mem_busdata;
-	struct uuid	mem_oem_id;
-	uint16_t	mem_oem_length;		/* Size of OEM data. */
-	/* N bytes of OEM platform data. */
-};
-
-struct mca_pcibus_record {
-	uint64_t	pcibus_flags;
-#define	MCA_PCIBUS_FLAGS_STATUS		(1ULL << 0)
-#define	MCA_PCIBUS_FLAGS_ERROR		(1ULL << 1)
-#define	MCA_PCIBUS_FLAGS_BUS		(1ULL << 2)
-#define	MCA_PCIBUS_FLAGS_ADDR		(1ULL << 3)
-#define	MCA_PCIBUS_FLAGS_DATA		(1ULL << 4)
-#define	MCA_PCIBUS_FLAGS_CMD		(1ULL << 5)
-#define	MCA_PCIBUS_FLAGS_REQID		(1ULL << 6)
-#define	MCA_PCIBUS_FLAGS_RSPID		(1ULL << 7)
-#define	MCA_PCIBUS_FLAGS_TGTID		(1ULL << 8)
-#define	MCA_PCIBUS_FLAGS_OEM_ID		(1ULL << 9)
-#define	MCA_PCIBUS_FLAGS_OEM_DATA	(1ULL << 10)
-	uint64_t	pcibus_status;
-	uint16_t	pcibus_error;
-	uint16_t	pcibus_bus;
-	uint32_t	__reserved;
-	uint64_t	pcibus_addr;
-	uint64_t	pcibus_data;
-	uint64_t	pcibus_cmd;
-	uint64_t	pcibus_reqid;
-	uint64_t	pcibus_rspid;
-	uint64_t	pcibus_tgtid;
-	struct uuid	pcibus_oem_id;
-	uint16_t	pcibus_oem_length;	/* Size of OEM data. */
-	/* N bytes of OEM platform data. */
-};
-
-struct mca_pcidev_record {
-	uint64_t	pcidev_flags;
-#define	MCA_PCIDEV_FLAGS_STATUS		(1ULL << 0)
-#define	MCA_PCIDEV_FLAGS_INFO		(1ULL << 1)
-#define	MCA_PCIDEV_FLAGS_REG_MEM	(1ULL << 2)
-#define	MCA_PCIDEV_FLAGS_REG_IO		(1ULL << 3)
-#define	MCA_PCIDEV_FLAGS_REG_DATA	(1ULL << 4)
-#define	MCA_PCIDEV_FLAGS_OEM_DATA	(1ULL << 5)
-	uint64_t	pcidev_status;
-	struct {
-		uint16_t	info_vendor;
-		uint16_t	info_device;
-		uint32_t	info_ccfn;	/* Class code & funct. nr. */
-#define	MCA_PCIDEV_INFO_CLASS(x)	((x) & 0xffffff)
-#define	MCA_PCIDEV_INFO_FUNCTION(x)	(((x) >> 24) & 0xff)
-		uint8_t		info_slot;
-		uint8_t		info_bus;
-		uint8_t		info_segment;
-		uint8_t		__res0;
-		uint32_t	__res1;
-	} pcidev_info;
-	uint32_t	pcidev_reg_mem;
-	uint32_t	pcidev_reg_io;
-	/* Nx pcidev_reg. */
-	/* M bytes of OEM platform data. */
-};
-
-struct mca_pcidev_reg {
-	uint64_t	pcidev_reg_addr;
-	uint64_t	pcidev_reg_data;
-};
-
-#define	MCA_UUID_CPU		\
-	{0xe429faf1,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define	MCA_UUID_MEMORY		\
-	{0xe429faf2,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define	MCA_UUID_SEL		\
-	{0xe429faf3,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define	MCA_UUID_PCI_BUS	\
-	{0xe429faf4,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define	MCA_UUID_SMBIOS		\
-	{0xe429faf5,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define	MCA_UUID_PCI_DEV	\
-	{0xe429faf6,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define	MCA_UUID_GENERIC	\
-	{0xe429faf7,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
-
-#ifdef _KERNEL
-
-void ia64_mca_init(void);
-void ia64_mca_init_ap(void);
-void ia64_mca_save_state(int);
-
-#endif /* _KERNEL */
-
-#endif /* _MACHINE_MCA_H_ */
diff --git a/sys/ia64/include/md_var.h b/sys/ia64/include/md_var.h
deleted file mode 100644
index b69b1af4fd52..000000000000
--- a/sys/ia64/include/md_var.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * Copyright (c) 1998 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$
- */
-
-#ifndef _MACHINE_MD_VAR_H_
-#define	_MACHINE_MD_VAR_H_
-
-/*
- * Miscellaneous machine-dependent declarations.
- */
-
-struct ia64_fdesc {
-	uint64_t	func;
-	uint64_t	gp;
-};
-
-#define FDESC_FUNC(fn)  (((struct ia64_fdesc *) fn)->func)
-#define FDESC_GP(fn)    (((struct ia64_fdesc *) fn)->gp)
-
-/* Convenience macros to decompose CFM & ar.pfs. */
-#define	IA64_CFM_SOF(x)		((x) & 0x7f)
-#define	IA64_CFM_SOL(x)		(((x) >> 7) & 0x7f)
-#define	IA64_CFM_SOR(x)		(((x) >> 14) & 0x0f)
-#define	IA64_CFM_RRB_GR(x)	(((x) >> 18) & 0x7f)
-#define	IA64_CFM_RRB_FR(x)	(((x) >> 25) & 0x7f)
-#define	IA64_CFM_RRB_PR(x)	(((x) >> 32) & 0x3f)
-
-/* Convenience function (inline) to adjust backingstore pointers. */
-static __inline uint64_t
-ia64_bsp_adjust(uint64_t bsp, int nslots)
-{
-	int bias = ((unsigned int)bsp & 0x1f8) >> 3;
-	nslots += (nslots + bias + 63*8) / 63 - 8;
-	return bsp + (nslots << 3);
-}
-
-#ifdef _KERNEL
-
-struct _special;
-struct pcpu;
-struct thread;
-struct trapframe;
-
-/*
- * Return value from ia64_init. Describes stack to switch to.
- */
-struct ia64_init_return {
-	uint64_t	bspstore;
-	uint64_t	sp;
-};
-
-extern uint64_t ia64_lapic_addr;
-extern vm_paddr_t paddr_max;
-extern u_int busdma_swi_pending;
-
-void	*acpi_find_table(const char *sig);
-void	busdma_swi(void);
-int	copyout_regstack(struct thread *, uint64_t *, uint64_t *);
-void	cpu_mp_add(u_int, u_int, u_int);
-void	cpu_pcpu_setup(struct pcpu *, u_int, u_int);
-int	do_ast(struct trapframe *);
-void	ia32_trap(int, struct trapframe *);
-int	ia64_count_cpus(void);
-int	ia64_emulate(struct trapframe *, struct thread *);
-int	ia64_flush_dirty(struct thread *, struct _special *);
-uint64_t ia64_get_hcdp(void);
-int	ia64_highfp_drop(struct thread *);
-int	ia64_highfp_enable(struct thread *, struct trapframe *);
-int	ia64_highfp_save(struct thread *);
-int	ia64_highfp_save_ipi(void);
-struct ia64_init_return ia64_init(void);
-u_int	ia64_itc_freq(void);
-int	ia64_physmem_add(vm_paddr_t, vm_size_t);
-void	*ia64_physmem_alloc(vm_size_t, vm_size_t);
-int	ia64_physmem_delete(vm_paddr_t, vm_size_t);
-int	ia64_physmem_fini(void);
-int	ia64_physmem_init(void);
-int	ia64_physmem_track(vm_paddr_t, vm_size_t);
-void	ia64_probe_sapics(void);
-void	ia64_sync_icache(vm_offset_t, vm_size_t);
-void	*ia64_xtrace_alloc(void);
-void	ia64_xtrace_init_ap(void *);
-void	ia64_xtrace_init_bsp(void);
-void	ia64_xtrace_save(void);
-void	ia64_xtrace_stop(void);
-void	interrupt(struct trapframe *);
-void	map_gateway_page(void);
-void	map_pal_code(void);
-void	map_vhpt(uintptr_t);
-void	os_boot_rendez(void);
-void	os_mca(void);
-int	syscall(struct trapframe *);
-void	trap(int, struct trapframe *);
-void	trap_panic(int, struct trapframe *);
-int	unaligned_fixup(struct trapframe *, struct thread *);
-
-#endif	/* _KERNEL */
-
-#endif /* !_MACHINE_MD_VAR_H_ */
diff --git a/sys/ia64/include/memdev.h b/sys/ia64/include/memdev.h
deleted file mode 100644
index 85fca0790cec..000000000000
--- a/sys/ia64/include/memdev.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2004 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 AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, 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 _MACHINE_MEMDEV_H_
-#define	_MACHINE_MEMDEV_H_
-
-#define	CDEV_MINOR_MEM	0
-#define	CDEV_MINOR_KMEM	1
-
-d_open_t	memopen;
-d_read_t	memrw;
-#define		memioctl	(d_ioctl_t *)NULL
-d_mmap_t	memmmap;
-
-#endif /* _MACHINE_MEMDEV_H_ */
diff --git a/sys/ia64/include/pal.h b/sys/ia64/include/pal.h
deleted file mode 100644
index a8a5e90f7ede..000000000000
--- a/sys/ia64/include/pal.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright (c) 2000 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$
- */
-
-#ifndef _MACHINE_PAL_H_
-#define _MACHINE_PAL_H_
-
-/*
- * Architected static calling convention procedures.
- */
-#define PAL_CACHE_FLUSH		1
-#define PAL_CACHE_INFO		2
-#define PAL_CACHE_INIT		3
-#define PAL_CACHE_SUMMARY	4
-#define PAL_MEM_ATTRIB		5
-#define PAL_PTCE_INFO		6
-#define PAL_VM_INFO		7
-#define PAL_VM_SUMMARY		8
-#define PAL_BUS_GET_FEATURES	9
-#define PAL_BUS_SET_FEATURES	10
-#define PAL_DEBUG_INFO		11
-#define PAL_FIXED_ADDR		12
-#define PAL_FREQ_BASE		13
-#define PAL_FREQ_RATIOS		14
-#define PAL_PERF_MON_INFO	15
-#define PAL_PLATFORM_ADDR	16
-#define PAL_PROC_GET_FEATURE	17
-#define PAL_PROC_SET_FEATURE	18
-#define PAL_RSE_INFO		19
-#define PAL_VERSION		20
-#define PAL_MC_CLEAR_LOG	21
-#define PAL_MC_DRAIN		22
-#define	PAL_MC_EXPECTED		23
-#define PAL_MC_DYNAMIC_STATE	24
-#define PAL_MC_ERROR_INFO	25
-#define	PAL_MC_RESUME		26
-#define PAL_MC_REGISTER_MEM	27
-#define PAL_HALT		28
-#define PAL_HALT_LIGHT		29
-#define PAL_COPY_INFO		30
-#define PAL_CACHE_LINE_INIT	31
-#define PAL_PMI_ENTRYPOINT	32
-#define PAL_ENTER_IA_32_ENV	33
-#define PAL_VM_PAGE_SIZE	34
-#define	PAL_TEST_INFO		37
-#define PAL_CACHE_PROT_INFO	38
-#define PAL_REGISTER_INFO	39
-#define PAL_PREFETCH_VISIBILITY	41
-#define	PAL_LOGICAL_TO_PHYSICAL	42
-#define	PAL_CACHE_SHARED_INFO	43
-#define	PAL_PSTATE_INFO		44
-#define	PAL_SHUTDOWN		45
-#define	PAL_GET_HW_POLICY	48
-#define	PAL_SET_HW_POLICY	49
-
-/*
- * Architected stacked calling convention procedures.
- */
-#define PAL_COPY_PAL		256
-#define PAL_HALT_INFO		257
-#define PAL_TEST_PROC		258
-#define PAL_CACHE_READ		259
-#define PAL_CACHE_WRITE		260
-#define PAL_VM_TR_READ		261
-#define	PAL_GET_PSTATE		262
-#define	PAL_SET_PSTATE		263
-#define	PAL_VP_CREATE		265
-#define	PAL_VP_ENV_INFO		266
-#define	PAL_VP_EXIT_ENV		267
-#define	PAL_VP_INIT_ENV		268
-#define	PAL_VP_REGISTER		269
-#define	PAL_VP_RESTORE		270
-#define	PAL_VP_SAVE		271
-#define	PAL_VP_TERMINATE	272
-#define	PAL_BRAND_INFO		274
-#define	PAL_MC_ERROR_INJECT	276
-#define	PAL_MEMORY_BUFFER	277
-
-/*
- * Default physical address of the Processor Interrupt Block (PIB).
- * See also: IA-64 SDM, rev 1.1, volume 2, page 5-31.
- */
-#define	PAL_PIB_DEFAULT_ADDR	0x00000000FEE00000L
-
-struct ia64_pal_result {
-	int64_t		pal_status;
-	uint64_t	pal_result[3];
-};
-
-struct ia64_pal_result ia64_pal_physical(u_long, u_long, u_long, u_long);
-
-struct ia64_pal_result ia64_call_pal_static(uint64_t proc, uint64_t arg1,
-    uint64_t arg2, uint64_t arg3);
-
-struct ia64_pal_result ia64_call_pal_stacked(uint64_t proc, uint64_t arg1,
-    uint64_t arg2, uint64_t arg3);
-
-#endif /* _MACHINE_PAL_H_ */
diff --git a/sys/ia64/include/param.h b/sys/ia64/include/param.h
deleted file mode 100644
index a260a7598ef8..000000000000
--- a/sys/ia64/include/param.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* $FreeBSD$ */
-/* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
-
-/*-
- * Copyright (c) 1988 University of Utah.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  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 Ralph Campbell.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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: Utah $Hdr: machparam.h 1.11 89/08/14$
- *
- *	@(#)param.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _IA64_INCLUDE_PARAM_H_
-#define	_IA64_INCLUDE_PARAM_H_
-
-/*
- * Machine dependent constants for the IA64.
- */
-
-#include <machine/_align.h>
-
-#define __HAVE_ACPI
-#define __PCI_REROUTE_INTERRUPT
-
-#ifndef MACHINE
-#define	MACHINE		"ia64"
-#endif
-#ifndef MACHINE_ARCH
-#define	MACHINE_ARCH	"ia64"
-#endif
-#ifndef MACHINE_ARCH32
-#define	MACHINE_ARCH32	"i386"
-#endif
-
-#if defined(SMP) || defined(KLD_MODULE)
-#ifndef MAXCPU
-#define	MAXCPU		64
-#endif
-#else
-#define MAXCPU		1
-#endif
-
-#ifndef MAXMEMDOM
-#define	MAXMEMDOM	1
-#endif
-
-#define	ALIGNBYTES		_ALIGNBYTES
-#define	ALIGN(p)		_ALIGN(p)
-/*
- * ALIGNED_POINTER is a boolean macro that checks whether an address
- * is valid to fetch data elements of type t from on this architecture.
- * This does not reflect the optimal alignment, just the possibility
- * (within reasonable limits). 
- */
-#define	ALIGNED_POINTER(p,t)	((((u_long)(p)) & (sizeof(t)-1)) == 0)
-
-/*
- * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
- * architecture.  It should be used with appropriate caution.
- */
-#define	CACHE_LINE_SHIFT	7
-#define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
-
-#ifndef LOG2_PAGE_SIZE
-#define	LOG2_PAGE_SIZE		13		/* 8K pages by default. */
-#endif
-#define	PAGE_SHIFT	(LOG2_PAGE_SIZE)
-#define	PAGE_SIZE	(1<<(LOG2_PAGE_SIZE))
-#define PAGE_MASK	(PAGE_SIZE-1)
-#define NPTEPG		(PAGE_SIZE/(sizeof (pt_entry_t)))
-
-#define	MAXPAGESIZES	1		/* maximum number of supported page sizes */
-
-#ifndef	KSTACK_PAGES
-#define	KSTACK_PAGES	4		/* pages of kernel stack */
-#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
- */
-#define	round_page(x)	((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK))
-#define	trunc_page(x)	((unsigned long)(x) & ~(PAGE_MASK))
-
-#define atop(x)			((unsigned long)(x) >> PAGE_SHIFT)
-#define ptoa(x)			((unsigned long)(x) << PAGE_SHIFT)
-
-#define pgtok(x)                ((x) * (PAGE_SIZE / 1024)) 
-
-#endif	/* !_IA64_INCLUDE_PARAM_H_ */
diff --git a/sys/ia64/include/pc/display.h b/sys/ia64/include/pc/display.h
deleted file mode 100644
index fad568c0cb81..000000000000
--- a/sys/ia64/include/pc/display.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * IBM PC display definitions
- *
- * $FreeBSD$
- *	from: i386/include/pc display.h,v 1.4
- */
-
-/* Color attributes for foreground text */
-
-#define	FG_BLACK		   0
-#define	FG_BLUE			   1
-#define	FG_GREEN		   2
-#define	FG_CYAN			   3
-#define	FG_RED			   4
-#define	FG_MAGENTA		   5
-#define	FG_BROWN		   6
-#define	FG_LIGHTGREY		   7
-#define	FG_DARKGREY		   8
-#define	FG_LIGHTBLUE		   9
-#define	FG_LIGHTGREEN		  10
-#define	FG_LIGHTCYAN		  11
-#define	FG_LIGHTRED		  12
-#define	FG_LIGHTMAGENTA		  13
-#define	FG_YELLOW		  14
-#define	FG_WHITE		  15
-#define	FG_BLINK		0x80
-
-/* Color attributes for text background */
-
-#define	BG_BLACK		0x00
-#define	BG_BLUE			0x10
-#define	BG_GREEN		0x20
-#define	BG_CYAN			0x30
-#define	BG_RED			0x40
-#define	BG_MAGENTA		0x50
-#define	BG_BROWN		0x60
-#define	BG_LIGHTGREY		0x70
-
-/* Monochrome attributes for foreground text */
-
-#define	FG_UNDERLINE		0x01
-#define	FG_INTENSE		0x08
-
-/* Monochrome attributes for text background */
-
-#define	BG_INTENSE		0x10
diff --git a/sys/ia64/include/pcb.h b/sys/ia64/include/pcb.h
deleted file mode 100644
index dac7169b3f42..000000000000
--- a/sys/ia64/include/pcb.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 2003,2004 Marcel Moolenaar
- * Copyright (c) 2000 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$
- */
-
-#ifndef _MACHINE_PCB_H_
-#define _MACHINE_PCB_H_
-
-#ifndef _MACHINE_REGSET_H_
-#include <machine/_regset.h>
-#endif
-
-/*
- * PCB: process control block
- */
-struct pmap;
-struct pcb {
-	struct _special		pcb_special;
-	struct _callee_saved	pcb_preserved;
-	struct _callee_saved_fp	pcb_preserved_fp;
-	struct _high_fp		pcb_high_fp;
-	struct pcpu		*pcb_fpcpu;
-	struct pmap 		*pcb_current_pmap;
-
-	uint64_t		pcb_onfault;	/* for copy faults */
-
-	/* IA32 specific registers. */
-	uint64_t		pcb_ia32_cflg;
-	uint64_t		pcb_ia32_eflag;
-	uint64_t		pcb_ia32_fcr;
-	uint64_t		pcb_ia32_fdr;
-	uint64_t		pcb_ia32_fir;
-	uint64_t		pcb_ia32_fsr;
-};
-
-#ifdef _KERNEL
-
-#define	savectx(p)	swapctx(p, NULL)
-
-struct trapframe;
-
-void makectx(struct trapframe *, struct pcb *);
-void restorectx(struct pcb *) __dead2;
-int swapctx(struct pcb *old, struct pcb *new) __returns_twice;
-
-void ia32_restorectx(struct pcb *);
-void ia32_savectx(struct pcb *) __returns_twice;
-
-#endif
-
-#endif /* _MACHINE_PCB_H_ */
diff --git a/sys/ia64/include/pci_cfgreg.h b/sys/ia64/include/pci_cfgreg.h
deleted file mode 100644
index a0bc6e1f9b58..000000000000
--- a/sys/ia64/include/pci_cfgreg.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2010 Marcel Moolenaar <marcel@FreeBSD.org>
- * Copyright (c) 1997, Stefan Esser <se@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 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.
- *
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_PCI_CFGREG_H_
-#define	_MACHINE_PCI_CFGREG_H_
-
-int	pci_cfgregopen(void);
-uint32_t pci_cfgregread(int bus, int slot, int func, int reg, int len);
-void	pci_cfgregwrite(int bus, int slot, int func, int reg, uint32_t data,
-    int bytes);
-
-#endif /* _MACHINE_PCI_CFGREG_H_ */
diff --git a/sys/ia64/include/pcpu.h b/sys/ia64/include/pcpu.h
deleted file mode 100644
index 4c3f5e822954..000000000000
--- a/sys/ia64/include/pcpu.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * Copyright (c) 1999 Luoqi Chen <luoqi@freebsd.org>
- * Copyright (c) Peter Wemm <peter@netplex.com.au>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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_PCPU_H_
-#define	_MACHINE_PCPU_H_
-
-#include <sys/sysctl.h>
-#include <machine/pcb.h>
-
-struct pcpu_stats {
-	u_long		pcs_nasts;		/* IPI_AST counter. */
-	u_long		pcs_nclks;		/* Clock interrupt counter. */
-	u_long		pcs_nextints;		/* ExtINT counter. */
-	u_long		pcs_nhardclocks;	/* IPI_HARDCLOCK counter. */
-	u_long		pcs_nhighfps;		/* IPI_HIGH_FP counter. */
-	u_long		pcs_nhwints;		/* Hardware int. counter. */
-	u_long		pcs_npreempts;		/* IPI_PREEMPT counter. */
-	u_long		pcs_nrdvs;		/* IPI_RENDEZVOUS counter. */
-	u_long		pcs_nstops;		/* IPI_STOP counter. */
-	u_long		pcs_nstrays;		/* Stray interrupt counter. */
-};
-
-struct pcpu_md {
-	struct pcb	pcb;			/* Used by IPI_STOP */
-	struct pmap	*current_pmap;		/* active pmap */
-	vm_offset_t	vhpt;			/* Address of VHPT */
-	uint64_t	lid;			/* local CPU ID */
-	uint64_t	clock;			/* Clock counter. */
-	uint64_t	clock_load;		/* Clock reload value. */
-	uint32_t	clock_mode;		/* Clock ET mode */
-	uint32_t	awake:1;		/* CPU is awake? */
-	struct pcpu_stats stats;		/* Interrupt stats. */
-	void		*xtrace_buffer;
-	uint64_t	xtrace_tail;
-#ifdef _KERNEL
-	struct sysctl_ctx_list sysctl_ctx;
-	struct sysctl_oid *sysctl_tree;
-#endif
-};
-
-#define	PCPU_MD_FIELDS							\
-	uint32_t	pc_acpi_id;		/* ACPI CPU id. */	\
-	struct pcpu_md	pc_md;			/* MD fields. */	\
-	char		__pad[10*128]
-
-#ifdef _KERNEL
-
-struct pcpu;
-
-register struct pcpu * volatile pcpup __asm__("r13");
-
-static __inline __pure2 struct thread *
-__curthread(void)
-{
-	struct thread *td;
-
-	__asm("ld8.acq %0=[r13]" : "=r"(td));
-	return (td);
-}
-#define	curthread	(__curthread())
-
-#define	PCPU_GET(member)	(pcpup->pc_ ## member)
-
-/*
- * XXX The implementation of this operation should be made atomic
- * with respect to preemption.
- */
-#define	PCPU_ADD(member, value)	(pcpup->pc_ ## member += (value))
-#define	PCPU_INC(member)	PCPU_ADD(member, 1)
-#define	PCPU_PTR(member)	(&pcpup->pc_ ## member)
-#define	PCPU_SET(member,value)	(pcpup->pc_ ## member = (value))
-
-#endif	/* _KERNEL */
-
-#endif	/* !_MACHINE_PCPU_H_ */
diff --git a/sys/ia64/include/pmap.h b/sys/ia64/include/pmap.h
deleted file mode 100644
index e9c89529eb5f..000000000000
--- a/sys/ia64/include/pmap.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*-
- * Copyright (c) 1991 Regents of the University of California.
- * 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 of UUNET Technologies Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 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.
- *
- * Derived from hp300 version by Mike Hibler, this version by William
- * Jolitz uses a recursive map [a pde points to the page directory] to
- * map the page tables using the pagetables themselves. This is done to
- * reduce the impact on kernel virtual memory for lots of sparse address
- * space, and to reduce the cost of memory to each process.
- *
- *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
- *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- *	from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_PMAP_H_
-#define	_MACHINE_PMAP_H_
-
-#include <sys/queue.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <machine/atomic.h>
-#include <machine/pte.h>
-#include <machine/vmparam.h>
-
-#ifdef _KERNEL
-
-#define MAXKPT		(PAGE_SIZE/sizeof(vm_offset_t))
-
-#define	vtophys(va)	pmap_kextract((vm_offset_t)(va))
-
-#endif /* _KERNEL */
-
-/*
- * Pmap stuff
- */
-struct	pv_entry;
-struct	pv_chunk;
-
-struct md_page {
-	TAILQ_HEAD(,pv_entry)	pv_list;
-	vm_memattr_t		memattr;
-};
-
-struct pmap {
-	struct mtx		pm_mtx;
-	TAILQ_HEAD(,pv_chunk)	pm_pvchunk;	/* list of mappings in pmap */
-	uint32_t		pm_rid[IA64_VM_MINKERN_REGION];
-	struct pmap_statistics	pm_stats;	/* pmap statistics */
-};
-
-typedef struct pmap	*pmap_t;
-
-#ifdef _KERNEL
-extern struct pmap	kernel_pmap_store;
-#define kernel_pmap	(&kernel_pmap_store)
-
-#define	PMAP_LOCK(pmap)		mtx_lock(&(pmap)->pm_mtx)
-#define	PMAP_LOCK_ASSERT(pmap, type) \
-				mtx_assert(&(pmap)->pm_mtx, (type))
-#define	PMAP_LOCK_DESTROY(pmap)	mtx_destroy(&(pmap)->pm_mtx)
-#define	PMAP_LOCK_INIT(pmap)	mtx_init(&(pmap)->pm_mtx, "pmap", \
-				    NULL, MTX_DEF)
-#define	PMAP_LOCKED(pmap)	mtx_owned(&(pmap)->pm_mtx)
-#define	PMAP_MTX(pmap)		(&(pmap)->pm_mtx)
-#define	PMAP_TRYLOCK(pmap)	mtx_trylock(&(pmap)->pm_mtx)
-#define	PMAP_UNLOCK(pmap)	mtx_unlock(&(pmap)->pm_mtx)
-#endif
-
-/*
- * For each vm_page_t, there is a list of all currently valid virtual
- * mappings of that page.  An entry is a pv_entry_t, the list is pv_list.
- */
-typedef struct pv_entry {
-	vm_offset_t	pv_va;		/* virtual address for mapping */
-	TAILQ_ENTRY(pv_entry)	pv_list;
-} *pv_entry_t;
-
-#ifdef	_KERNEL
-
-extern vm_paddr_t phys_avail[];
-extern vm_offset_t virtual_avail;
-extern vm_offset_t virtual_end;
-
-extern uint64_t pmap_vhpt_base[];
-extern int pmap_vhpt_log2size;
-
-#define	pmap_mapbios(pa,sz)	pmap_mapdev_attr(pa,sz,VM_MEMATTR_UNCACHEABLE)
-#define	pmap_mapdev(pa,sz)	pmap_mapdev_attr(pa,sz,VM_MEMATTR_UNCACHEABLE)
-#define	pmap_unmapbios(va,sz)	pmap_unmapdev(va,sz)
-
-#define	pmap_page_get_memattr(m)	((m)->md.memattr)
-#define	pmap_page_is_mapped(m)		(!TAILQ_EMPTY(&(m)->md.pv_list))
-#define	pmap_page_is_write_mapped(m)	(((m)->aflags & PGA_WRITEABLE) != 0)
-
-void	pmap_kenter(vm_offset_t va, vm_paddr_t pa);
-vm_paddr_t pmap_kextract(vm_offset_t va);
-void	pmap_kremove(vm_offset_t);
-void	*pmap_mapdev_attr(vm_paddr_t, vm_size_t, vm_memattr_t);
-void	pmap_page_set_memattr(vm_page_t, vm_memattr_t);
-void	pmap_unmapdev(vm_offset_t, vm_size_t);
-
-/* Machine-architecture private */
-vm_offset_t pmap_alloc_vhpt(void);
-void	pmap_bootstrap(void);
-void	pmap_invalidate_all(void);
-vm_offset_t pmap_mapdev_priv(vm_paddr_t, vm_size_t, vm_memattr_t);
-vm_offset_t pmap_page_to_va(vm_page_t);
-vm_offset_t pmap_steal_memory(vm_size_t);
-struct pmap *pmap_switch(struct pmap *pmap);
-
-#endif /* _KERNEL */
-
-#endif /* !_MACHINE_PMAP_H_ */
diff --git a/sys/ia64/include/pmc_mdep.h b/sys/ia64/include/pmc_mdep.h
deleted file mode 100644
index 7ced0b9559e9..000000000000
--- a/sys/ia64/include/pmc_mdep.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*-
- * This file is in the public domain.
- *
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_PMC_MDEP_H_
-#define	_MACHINE_PMC_MDEP_H_
-
-union pmc_md_op_pmcallocate {
-	uint64_t		__pad[4];
-};
-
-/* Logging */
-#define	PMCLOG_READADDR		PMCLOG_READ64
-#define	PMCLOG_EMITADDR		PMCLOG_EMIT64
-
-#if	_KERNEL
-union pmc_md_pmc {
-};
-
-#define	PMC_TRAPFRAME_TO_PC(TF)	(0)	/* Stubs */
-#define	PMC_TRAPFRAME_TO_FP(TF)	(0)
-#define	PMC_TRAPFRAME_TO_SP(TF)	(0)
-
-#endif
-
-#endif /* !_MACHINE_PMC_MDEP_H_ */
diff --git a/sys/ia64/include/proc.h b/sys/ia64/include/proc.h
deleted file mode 100644
index b0468720800f..000000000000
--- a/sys/ia64/include/proc.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2003 The FreeBSD Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, 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 _MACHINE_PROC_H_
-#define	_MACHINE_PROC_H_
-
-struct mdthread {
-	int	md_spinlock_count;	/* (k) */
-	int	md_saved_intr;		/* (k) */
-};
-
-struct mdproc {
-	int		__dummy;	/* Avoid having an empty struct. */
-};
-
-#define	KINFO_PROC_SIZE 1088
-#define	KINFO_PROC32_SIZE 768
-
-#ifdef _KERNEL
-struct syscall_args {
-	u_int code;
-	int narg;
-	struct sysent *callp;
-	register_t *args;
-	register_t args32[8];
-};
-#endif
-
-#endif /* !_MACHINE_PROC_H_ */
diff --git a/sys/ia64/include/profile.h b/sys/ia64/include/profile.h
deleted file mode 100644
index cdf1434b05c3..000000000000
--- a/sys/ia64/include/profile.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 2004 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 _MACHINE_PROFILE_H_
-#define	_MACHINE_PROFILE_H_
-
-#define	_MCOUNT_DECL	void __mcount
-#define	MCOUNT
-
-#define	FUNCTION_ALIGNMENT	16
-
-typedef unsigned long	fptrdiff_t;
-
-#ifdef _KERNEL
-/*
- * The following two macros do splhigh and splx respectively.
- */
-#define	MCOUNT_ENTER(s)	s = intr_disable()
-#define	MCOUNT_EXIT(s)	intr_restore(s)
-#define	MCOUNT_DECL(s)	register_t s;
-
-void bintr(void);
-void btrap(void);
-void eintr(void);
-void user(void);
-
-#define	MCOUNT_FROMPC_USER(pc)		\
-	((pc < (uintfptr_t)VM_MAXUSER_ADDRESS) ? ~0UL : pc)
-
-#define	MCOUNT_FROMPC_INTR(pc)		(~0UL)
-
-_MCOUNT_DECL(uintfptr_t, uintfptr_t);
-
-#else /* !_KERNEL */
-
-typedef unsigned long	uintfptr_t;
-
-#endif
-
-#endif /* _MACHINE_PROFILE_H_ */
diff --git a/sys/ia64/include/pte.h b/sys/ia64/include/pte.h
deleted file mode 100644
index f57cb4dd17ae..000000000000
--- a/sys/ia64/include/pte.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 2001 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$
- */
-
-#ifndef _MACHINE_PTE_H_
-#define	_MACHINE_PTE_H_
-
-#define	PTE_PRESENT	0x0000000000000001
-#define	PTE__RV1_	0x0000000000000002
-#define	PTE_MA_MASK	0x000000000000001C
-#define	PTE_MA_WB	0x0000000000000000
-#define	PTE_MA_UC	0x0000000000000010
-#define	PTE_MA_UCE	0x0000000000000014
-#define	PTE_MA_WC	0x0000000000000018
-#define	PTE_MA_NATPAGE	0x000000000000001C
-#define	PTE_ACCESSED	0x0000000000000020
-#define	PTE_DIRTY	0x0000000000000040
-#define	PTE_PL_MASK	0x0000000000000180
-#define	PTE_PL_KERN	0x0000000000000000
-#define	PTE_PL_USER	0x0000000000000180
-#define	PTE_AR_MASK	0x0000000000000E00
-#define	PTE_AR_R	0x0000000000000000
-#define	PTE_AR_RX	0x0000000000000200
-#define	PTE_AR_RW	0x0000000000000400
-#define	PTE_AR_RWX	0x0000000000000600
-#define	PTE_AR_R_RW	0x0000000000000800
-#define	PTE_AR_RX_RWX	0x0000000000000A00
-#define	PTE_AR_RWX_RW	0x0000000000000C00
-#define	PTE_AR_X_RX	0x0000000000000E00
-#define	PTE_PPN_MASK	0x0003FFFFFFFFF000
-#define	PTE__RV2_	0x000C000000000000
-#define	PTE_ED		0x0010000000000000
-#define	PTE_IG_MASK	0xFFE0000000000000
-#define	PTE_WIRED	0x0020000000000000
-#define	PTE_MANAGED	0x0040000000000000
-#define	PTE_PROT_MASK	0x0700000000000000
-
-#define	ITIR__RV1_	0x0000000000000003
-#define	ITIR_PS_MASK	0x00000000000000FC
-#define	ITIR_KEY_MASK	0x00000000FFFFFF00
-#define	ITIR__RV2_	0xFFFFFFFF00000000
-
-#ifndef LOCORE
-
-typedef uint64_t pt_entry_t;
-
-static __inline pt_entry_t
-pte_atomic_clear(pt_entry_t *ptep, uint64_t val)
-{
-	return (atomic_clear_64(ptep, val));
-}
-
-static __inline pt_entry_t
-pte_atomic_set(pt_entry_t *ptep, uint64_t val)
-{
-	return (atomic_set_64(ptep, val));
-}
-
-/*
- * A long-format VHPT entry.
- */
-struct ia64_lpte {
-	pt_entry_t	pte;
-	uint64_t	itir;
-	uint64_t	tag;		/* includes ti */
-	uint64_t	chain;		/* pa of collision chain */
-};
-
-/*
- * Layout of rr[x].
- */
-struct ia64_rr {
-	uint64_t	rr_ve	:1;	/* bit 0 */
-	uint64_t	__rv1__	:1;	/* bit 1 */
-	uint64_t	rr_ps	:6;	/* bits 2..7 */
-	uint64_t	rr_rid	:24;	/* bits 8..31 */
-	uint64_t	__rv2__	:32;	/* bits 32..63 */
-};
-
-#endif /* !LOCORE */
-
-#endif /* !_MACHINE_PTE_H_ */
diff --git a/sys/ia64/include/ptrace.h b/sys/ia64/include/ptrace.h
deleted file mode 100644
index d73077dabf21..000000000000
--- a/sys/ia64/include/ptrace.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- *
- *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_PTRACE_H_
-#define	_MACHINE_PTRACE_H_
-
-#define	__HAVE_PTRACE_MACHDEP
-
-/* Fetch/store dirty registers on the kernel stack. */
-#define	PT_GETKSTACK	(PT_FIRSTMACH + 0)
-#define	PT_SETKSTACK	(PT_FIRSTMACH + 1)
-
-#endif /* _MACHINE_PTRACE_H_ */
diff --git a/sys/ia64/include/reg.h b/sys/ia64/include/reg.h
deleted file mode 100644
index af6489de89c5..000000000000
--- a/sys/ia64/include/reg.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 2000 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$
- */
-
-#ifndef _MACHINE_REG_H_
-#define _MACHINE_REG_H_
-
-#include <machine/_regset.h>
-
-struct reg32 {
-	unsigned int	r_fs;
-	unsigned int	r_es;
-	unsigned int	r_ds;
-	unsigned int	r_edi;
-	unsigned int	r_esi;
-	unsigned int	r_ebp;
-	unsigned int	r_isp;
-	unsigned int	r_ebx;
-	unsigned int	r_edx;
-	unsigned int	r_ecx;
-	unsigned int	r_eax;
-	unsigned int	r_trapno;
-	unsigned int	r_err;
-	unsigned int	r_eip;
-	unsigned int	r_cs;
-	unsigned int	r_eflags;
-	unsigned int	r_esp;
-	unsigned int	r_ss;
-	unsigned int	r_gs;
-};
-
-struct reg {
-	struct _special		r_special;
-	struct _callee_saved	r_preserved;
-	struct _caller_saved	r_scratch;
-};
-
-struct fpreg32 {
-	unsigned int	fpr_env[7];
-	unsigned char	fpr_acc[8][10];
-	unsigned int	fpr_ex_sw;
-	unsigned char	fpr_pad[64];
-};
-
-struct fpreg {
-	struct _callee_saved_fp	fpr_preserved;
-	struct _caller_saved_fp	fpr_scratch;
-	struct _high_fp		fpr_high;
-};
-
-struct dbreg32 {
-	unsigned int	dr[8];
-};
-
-struct dbreg {
-	unsigned long	dbr_data[8];
-	unsigned long	dbr_inst[8];
-};
-
-#ifdef _KERNEL
-struct thread;
-
-/* XXX these interfaces are MI, so they should be declared in a MI place. */
-int	fill_regs(struct thread *, struct reg *);
-int	set_regs(struct thread *, struct reg *);
-int	fill_fpregs(struct thread *, struct fpreg *);
-int	set_fpregs(struct thread *, struct fpreg *);
-int	fill_dbregs(struct thread *, struct dbreg *);
-int	set_dbregs(struct thread *, struct dbreg *);
-#ifdef COMPAT_FREEBSD32
-int	fill_regs32(struct thread *, struct reg32 *);
-int	set_regs32(struct thread *, struct reg32 *);
-int	fill_fpregs32(struct thread *, struct fpreg32 *);
-int	set_fpregs32(struct thread *, struct fpreg32 *);
-int	fill_dbregs32(struct thread *, struct dbreg32 *);
-int	set_dbregs32(struct thread *, struct dbreg32 *);
-#endif
-#endif
-
-#endif /* _MACHINE_REG_H_ */
diff --git a/sys/ia64/include/reloc.h b/sys/ia64/include/reloc.h
deleted file mode 100644
index 0e4155dac4cf..000000000000
--- a/sys/ia64/include/reloc.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED 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.
- *
- * $FreeBSD$
- */
diff --git a/sys/ia64/include/resource.h b/sys/ia64/include/resource.h
deleted file mode 100644
index edde5eb29908..000000000000
--- a/sys/ia64/include/resource.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $FreeBSD$ */
-/*-
- * 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.
- */
-
-#ifndef _MACHINE_RESOURCE_H_
-#define	_MACHINE_RESOURCE_H_	1
-
-/*
- * Definitions of resource types for Intel Architecture machines
- * with support for legacy ISA devices and drivers.
- */
-
-#define	SYS_RES_IRQ	1	/* interrupt lines */
-#define	SYS_RES_DRQ	2	/* isa dma lines */
-#define	SYS_RES_MEMORY	3	/* i/o memory */
-#define	SYS_RES_IOPORT	4	/* i/o ports */
-
-#endif /* !_MACHINE_RESOURCE_H_ */
diff --git a/sys/ia64/include/runq.h b/sys/ia64/include/runq.h
deleted file mode 100644
index c2486d1b0b4d..000000000000
--- a/sys/ia64/include/runq.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 2001 Jake Burkholder <jake@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_RUNQ_H_
-#define	_MACHINE_RUNQ_H_
-
-#define	RQB_LEN		(1UL)		/* Number of priority status words. */
-#define	RQB_L2BPW	(6UL)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
-#define	RQB_BPW		(1UL<<RQB_L2BPW)	/* Bits in an rqb_word_t. */
-
-#define	RQB_BIT(pri)	(1UL << ((pri) & (RQB_BPW - 1)))
-#define	RQB_WORD(pri)	((pri) >> RQB_L2BPW)
-
-#define	RQB_FFS(word)	(__ffsl(word) - 1)
-
-/*
- * Type of run queue status word.
- */
-typedef	uint64_t	rqb_word_t;
-
-static __inline uint64_t
-__popcnt(uint64_t bits)
-{
-        uint64_t result;
-
-	__asm __volatile("popcnt %0=%1" : "=r" (result) : "r" (bits));
-	return result;
-}
-
-
-static __inline int
-__ffsl(u_long mask)
-{
-
-	if (__predict_false(mask == 0ul))
-		return (0);
-	return (__popcnt(mask ^ (mask - 1)));
-}
-
-#endif
diff --git a/sys/ia64/include/sal.h b/sys/ia64/include/sal.h
deleted file mode 100644
index 485746457a9e..000000000000
--- a/sys/ia64/include/sal.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * Copyright (c) 2001 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$
- */
-
-#ifndef _MACHINE_SAL_H_
-#define _MACHINE_SAL_H_
-
-struct sal_system_table {
-	char		sal_signature[4];
-#define	SAL_SIGNATURE	"SST_"
-	uint32_t	sal_length;
-	uint8_t		sal_rev[2];
-	uint16_t	sal_entry_count;
-	uint8_t		sal_checksum;
-	uint8_t		sal_reserved1[7];
-	uint8_t		sal_a_version[2];
-	uint8_t		sal_b_version[2];
-	char		sal_oem_id[32];
-	char		sal_product_id[32];
-	uint8_t		sal_reserved2[8];
-};
-
-struct sal_entrypoint_descriptor {
-	uint8_t		sale_type;	/* == 0 */
-	uint8_t		sale_reserved1[7];
-	uint64_t	sale_pal_proc;
-	uint64_t	sale_sal_proc;
-	uint64_t	sale_sal_gp;
-	uint8_t		sale_reserved2[16];
-};
-
-struct sal_memory_descriptor {
-	uint8_t		sale_type;	/* == 1 */
-	uint8_t		sale_need_virtual;
-	uint8_t		sale_current_attribute;
-	uint8_t		sale_access_rights;
-	uint8_t		sale_supported_attributes;
-	uint8_t		sale_reserved1;
-	uint8_t		sale_memory_type[2];
-	uint64_t	sale_physical_address;
-	uint32_t	sale_length;
-	uint8_t		sale_reserved2[12];
-};
-
-struct sal_platform_descriptor {
-	uint8_t		sale_type;	/* == 2 */
-	uint8_t		sale_features;
-	uint8_t		sale_reserved[14];
-};
-
-struct sal_tr_descriptor {
-	uint8_t		sale_type;	/* == 3 */
-	uint8_t		sale_register_type;
-	uint8_t		sale_register_number;
-	uint8_t		sale_reserved1[5];
-	uint64_t	sale_virtual_address;
-	uint64_t	sale_page_size;
-	uint8_t		sale_reserved2[8];
-};
-
-struct sal_ptc_cache_descriptor {
-	uint8_t		sale_type;	/* == 4 */
-	uint8_t		sale_reserved[3];
-	uint32_t	sale_domains;
-	uint64_t	sale_address;
-};
-
-struct sal_ap_wakeup_descriptor {
-	uint8_t		sale_type;	/* == 5 */
-	uint8_t		sale_mechanism;
-	uint8_t		sale_reserved[6];
-	uint64_t	sale_vector;
-};
-
-/*
- * SAL Procedure numbers.
- */
-
-#define SAL_SET_VECTORS		0x01000000
-#define SAL_GET_STATE_INFO	0x01000001
-#define SAL_GET_STATE_INFO_SIZE	0x01000002
-#define SAL_CLEAR_STATE_INFO	0x01000003
-#define SAL_MC_RENDEZ		0x01000004
-#define SAL_MC_SET_PARAMS	0x01000005
-#define SAL_REGISTER_PHYSICAL_ADDR 0x01000006
-#define SAL_CACHE_FLUSH		0x01000008
-#define SAL_CACHE_INIT		0x01000009
-#define SAL_PCI_CONFIG_READ	0x01000010
-#define SAL_PCI_CONFIG_WRITE	0x01000011
-#define SAL_FREQ_BASE		0x01000012
-#define SAL_UPDATE_PAL		0x01000020
-
-/* SAL_SET_VECTORS event handler types */
-#define	SAL_OS_MCA		0
-#define	SAL_OS_INIT		1
-#define	SAL_OS_BOOT_RENDEZ	2
-
-/* SAL_GET_STATE_INFO, SAL_GET_STATE_INFO_SIZE types */
-#define	SAL_INFO_MCA		0
-#define	SAL_INFO_INIT		1
-#define	SAL_INFO_CMC		2
-#define	SAL_INFO_CPE		3
-#define	SAL_INFO_TYPES		4	/* number of types we know about */
-
-struct ia64_sal_result {
-	int64_t		sal_status;
-	uint64_t	sal_result[3];
-};
-
-typedef struct ia64_sal_result sal_entry_t(uint64_t, uint64_t, uint64_t,
-    uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
-
-extern sal_entry_t *ia64_sal_entry;
-
-extern void ia64_sal_init(void);
-
-#endif /* _MACHINE_SAL_H_ */
diff --git a/sys/ia64/include/setjmp.h b/sys/ia64/include/setjmp.h
deleted file mode 100644
index 0e7641eea403..000000000000
--- a/sys/ia64/include/setjmp.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * Copyright (c) 2000
- * Intel Corporation.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 
- *    This product includes software developed by Intel Corporation and
- *    its contributors.
- * 
- * 4. Neither the name of Intel Corporation or its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION AND CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL INTEL CORPORATION OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (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_SETJMP_H_
-#define	_MACHINE_SETJMP_H_
-
-#include <sys/cdefs.h>
-
-#if __BSD_VISIBLE
-#define	JMPBUF_ADDR_OF(buf, item)	((unsigned long)((char *)buf + item))
-
-#define	J_UNAT		0
-#define	J_NATS		0x8
-#define	J_PFS		0x10
-#define	J_BSP		0x18
-#define	J_RNAT		0x20
-#define	J_PREDS		0x28
-#define	J_LC		0x30
-#define	J_R4		0x38
-#define	J_R5		0x40
-#define	J_R6		0x48
-#define	J_R7		0x50
-#define	J_SP		0x58
-#define	J_F2		0x60
-#define	J_F3		0x70
-#define	J_F4		0x80
-#define	J_F5		0x90
-#define	J_F16		0xa0
-#define	J_F17		0xb0
-#define	J_F18		0xc0
-#define	J_F19		0xd0
-#define	J_F20		0xe0
-#define	J_F21		0xf0
-#define	J_F22		0x100
-#define	J_F23		0x110
-#define	J_F24		0x120
-#define	J_F25		0x130
-#define	J_F26		0x140
-#define	J_F27		0x150
-#define	J_F28		0x160
-#define	J_F29		0x170
-#define	J_F30		0x180
-#define	J_F31		0x190
-#define	J_FPSR		0x1a0
-#define	J_B0		0x1a8
-#define	J_B1		0x1b0
-#define	J_B2		0x1b8
-#define	J_B3		0x1c0
-#define	J_B4		0x1c8
-#define	J_B5		0x1d0
-#define	J_SIGMASK	0x1d8
-#define	J_SIGSET	0x1e0
-#endif /* __BSD_VISIBLE */
-
-#define	_JBLEN		0x20			/* Size in long doubles */
-
-/*
- * XXX this check is wrong, since LOCORE is in the application namespace and
- * applications shouldn't be able to affect the implementation.  One workaround
- * would be to only check LOCORE if _KERNEL is defined, but unfortunately
- * LOCORE is used outside of the kernel.  The best solution would be to rename
- * LOCORE to _LOCORE, so that it can be used in userland to safely affect the
- * implementation.
- */
-#ifndef LOCORE
-
-/*
- * jmp_buf and sigjmp_buf are encapsulated in different structs to force
- * compile-time diagnostics for mismatches.  The structs are the same
- * internally to avoid some run-time errors for mismatches.
- */
-#if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE
-struct _sigjmp_buf {
-	long double buf[_JBLEN];
-};
-typedef struct _sigjmp_buf sigjmp_buf[1];
-#endif
-
-struct _jmp_buf {
-	long double buf[_JBLEN];
-};
-typedef struct _jmp_buf	jmp_buf[1];
-
-#ifdef _KERNEL
-#ifdef CTASSERT
-CTASSERT(sizeof(struct _jmp_buf) == 512);
-#endif
-#endif
-
-#endif /* !LOCORE */
-
-#endif /* !_MACHINE_SETJMP_H_ */
diff --git a/sys/ia64/include/signal.h b/sys/ia64/include/signal.h
deleted file mode 100644
index d99013c36202..000000000000
--- a/sys/ia64/include/signal.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* $FreeBSD$ */
-/* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */
-
-/*-
- * Copyright (c) 1994, 1995 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.
- */
-
-#ifndef _MACHINE_SIGNAL_H_
-#define	_MACHINE_SIGNAL_H_
-
-#include <sys/cdefs.h>
-#include <sys/_sigset.h>
-
-typedef long	sig_atomic_t;
-
-#if __BSD_VISIBLE
-/* portable macros for SIGFPE/ARITHTRAP */
-#define FPE_INTOVF	1	/* integer overflow */
-#define FPE_INTDIV	2	/* integer divide by zero */
-#define FPE_FLTDIV	3	/* floating point divide by zero */
-#define FPE_FLTOVF	4	/* floating point overflow */
-#define FPE_FLTUND	5	/* floating point underflow */
-#define FPE_FLTRES	6	/* floating point inexact result */
-#define FPE_FLTINV	7	/* invalid floating point operation */
-#define FPE_FLTSUB	8	/* subscript out of range */
-
-#define BUS_SEGM_FAULT	30	/* segment protection base */
-#endif
-
-/*
- * Information pushed on stack when a signal is delivered.
- * This is used by the kernel to restore state following
- * execution of the signal handler.  It is also made available
- * to the handler to allow it to restore state properly if
- * a non-standard exit is performed.
- */
-
-#if __BSD_VISIBLE
-#include <machine/_regset.h>
-
-/*
- * The sequence of the fields should match those in
- * mcontext_t. Keep them in sync!
- */
-struct sigcontext {
-	struct __sigset		sc_mask;	/* signal mask to restore */
-	unsigned long		sc_onstack;
-	unsigned long		sc_flags;
-	struct _special		sc_special;
-	struct _callee_saved	sc_preserved;
-	struct _callee_saved_fp	sc_preserved_fp;
-	struct _caller_saved	sc_scratch;
-	struct _caller_saved_fp	sc_scratch_fp;
-	struct _high_fp		sc_high_fp;
-};
-#endif /* __BSD_VISIBLE */
-
-#endif /* !_MACHINE_SIGNAL_H_*/
diff --git a/sys/ia64/include/smp.h b/sys/ia64/include/smp.h
deleted file mode 100644
index 1623609d9b3d..000000000000
--- a/sys/ia64/include/smp.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * $FreeBSD$
- */
-#ifndef _MACHINE_SMP_H_
-#define _MACHINE_SMP_H_
-
-#ifdef _KERNEL
-
-#define	IPI_AST			ia64_ipi_ast
-#define	IPI_HARDCLOCK		ia64_ipi_hardclock
-#define	IPI_PREEMPT		ia64_ipi_preempt
-#define	IPI_RENDEZVOUS		ia64_ipi_rndzvs
-#define	IPI_STOP		ia64_ipi_stop
-#define	IPI_STOP_HARD		ia64_ipi_nmi
-
-#ifndef LOCORE
-
-#include <sys/_cpuset.h>
-
-struct pcpu;
-
-struct ia64_ap_state {
-	uint64_t	as_trace;
-	uint64_t	as_pgtbl_pte;
-	uint64_t	as_pgtbl_itir;
-	uint64_t	as_text_va;
-	uint64_t	as_text_pte;
-	uint64_t	as_text_itir;
-	uint64_t	as_data_va;
-	uint64_t	as_data_pte;
-	uint64_t	as_data_itir;
-	void		*as_kstack;
-	void		*as_kstack_top;
-	struct pcpu	*as_pcpu;
-	void		*as_xtrace_buffer;
-	volatile int	as_delay;
-	volatile u_int	as_awake;
-	volatile u_int	as_spin;
-};
-
-extern int ia64_ipi_ast;
-extern int ia64_ipi_hardclock;
-extern int ia64_ipi_highfp;
-extern int ia64_ipi_nmi;
-extern int ia64_ipi_preempt;
-extern int ia64_ipi_rndzvs;
-extern int ia64_ipi_stop;
-extern int ia64_ipi_wakeup;
-
-void	ipi_all_but_self(int ipi);
-void	ipi_cpu(int cpu, u_int ipi);
-void	ipi_selected(cpuset_t cpus, int ipi);
-void	ipi_send(struct pcpu *, int ipi);
-
-#endif /* !LOCORE */
-#endif /* _KERNEL */
-#endif /* !_MACHINE_SMP_H */
diff --git a/sys/ia64/include/stdarg.h b/sys/ia64/include/stdarg.h
deleted file mode 100644
index e6d0988e65ea..000000000000
--- a/sys/ia64/include/stdarg.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 2002 David E. O'Brien.  All rights reserved.
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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.
- *
- *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_STDARG_H_
-#define	_MACHINE_STDARG_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _VA_LIST_DECLARED
-#define	_VA_LIST_DECLARED
-typedef	__va_list	va_list;
-#endif
-
-#if defined(__GNUCLIKE_BUILTIN_STDARG)
-
-#define	va_start(ap, last) \
-	__builtin_va_start((ap), (last))
-
-#define	va_arg(ap, type) \
-	__builtin_va_arg((ap), type)
-
-#if __ISO_C_VISIBLE >= 1999
-#define	va_copy(dest, src) \
-	__builtin_va_copy((dest), (src))
-#endif
-
-#define	va_end(ap) \
-	__builtin_va_end(ap)
-
-#endif
-
-#endif /* !_MACHINE_STDARG_H_ */
diff --git a/sys/ia64/include/sysarch.h b/sys/ia64/include/sysarch.h
deleted file mode 100644
index c46d100beea5..000000000000
--- a/sys/ia64/include/sysarch.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 1993 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_SYSARCH_H_
-#define	_MACHINE_SYSARCH_H_
-
-#ifndef _KERNEL
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	sysarch(int, void *);
-__END_DECLS
-#endif
-
-#endif /* !_MACHINE_SYSARCH_H_ */
diff --git a/sys/ia64/include/ucontext.h b/sys/ia64/include/ucontext.h
deleted file mode 100644
index f4af26cd6872..000000000000
--- a/sys/ia64/include/ucontext.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 1999, 2003 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 
- *    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.
- * 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 _MACHINE_UCONTEXT_H_
-#define	_MACHINE_UCONTEXT_H_
-
-#include <machine/_regset.h>
-
-/*
- * The mc_flags field provides the necessary clues when dealing with the gory
- * details of ia64 specific contexts. A comprehensive explanation is added for
- * everybody's sanity, including the author's.
- *
- * The first and foremost variation in the context is synchronous contexts
- * (= synctx) versus asynchronous contexts (= asynctx). A synctx is created
- * synchronously WRT program execution and has the advantage that none of the
- * scratch registers have to be saved. They are assumed to be clobbered by the
- * call to the function that creates the context. An asynctx needs to have the
- * scratch registers preserved because it can describe any point in a thread's
- * (or process') execution.
- * The second variation is for synchronous contexts. When the kernel creates
- * a synchronous context if needs to preserve the scratch registers, because
- * the syscall argument and return values are stored there in the trapframe
- * and they need to be preserved in order to restart a syscall or return the
- * proper return values. Also, the IIP and CFM fields need to be preserved
- * as they point to the syscall stub, which the kernel saves as a favor to
- * userland (it keeps the stubs small and simple).
- *
- * Below a description of the flags and their meaning:
- *
- *	_MC_FLAGS_ASYNC_CONTEXT
- *		If set, indicates that mc_scratch and mc_scratch_fp are both
- *		valid. IFF not set, _MC_FLAGS_SYSCALL_CONTEXT indicates if the
- *		synchronous context is one corresponding to a syscall or not.
- *		Only the kernel is expected to create such a context and it's
- *		probably wise to let the kernel restore it.
- *	_MC_FLAGS_HIGHFP_VALID
- *		If set, indicates that the high FP registers (f32-f127) are
- *		valid. This flag is very likely not going to be set for any
- *		sensible synctx, but is not explicitly disallowed. Any synctx
- *		that has this flag may or may not have the high FP registers
- *		restored. In short: don't do it.
- *	_MC_FLAGS_SYSCALL_CONTEXT
- *		If set (hence _MC_FLAGS_ASYNC_CONTEXT is not set) indicates
- *		that the scratch registers contain syscall arguments and
- *		return values and that additionally IIP and CFM are valid.
- *		Only the kernel is expected to create such a context. It's
- *		probably wise to let the kernel restore it.
- */
-
-typedef struct __mcontext {
-	unsigned long		mc_flags;
-#define	_MC_FLAGS_ASYNC_CONTEXT		0x0001
-#define	_MC_FLAGS_HIGHFP_VALID		0x0002
-#define	_MC_FLAGS_SYSCALL_CONTEXT	0x0008
-	unsigned long		_reserved_;
-	struct _special		mc_special;
-	struct _callee_saved	mc_preserved;
-	struct _callee_saved_fp	mc_preserved_fp;
-	struct _caller_saved	mc_scratch;
-	struct _caller_saved_fp	mc_scratch_fp;
-	struct _high_fp		mc_high_fp;
-} mcontext_t;
-
-#endif /* !_MACHINE_UCONTEXT_H_ */
diff --git a/sys/ia64/include/unwind.h b/sys/ia64/include/unwind.h
deleted file mode 100644
index b1d512c349e4..000000000000
--- a/sys/ia64/include/unwind.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2003 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 _MACHINE_UNWIND_H_
-#define	_MACHINE_UNWIND_H_
-
-struct pcb;
-struct trapframe;
-struct uwx_env;
-
-struct unw_regstate {
-	struct pcb	*pcb;
-	struct trapframe *frame;
-	struct uwx_env	*env;
-	uint64_t	keyval[8];
-};
-
-int unw_create_from_pcb(struct unw_regstate *s, struct pcb *pcb);
-int unw_create_from_frame(struct unw_regstate *s, struct trapframe *tf);
-void unw_delete(struct unw_regstate *s);
-int unw_step(struct unw_regstate *s);
-
-int unw_get_bsp(struct unw_regstate *s, uint64_t *r);
-int unw_get_cfm(struct unw_regstate *s, uint64_t *r);
-int unw_get_ip(struct unw_regstate *s, uint64_t *r);
-int unw_get_sp(struct unw_regstate *s, uint64_t *r);
-
-int unw_table_add(uint64_t, uint64_t, uint64_t);
-void unw_table_remove(uint64_t);
-
-#endif /* _MACHINE_UNWIND_H_ */
diff --git a/sys/ia64/include/varargs.h b/sys/ia64/include/varargs.h
deleted file mode 100644
index 3ed42315c8c8..000000000000
--- a/sys/ia64/include/varargs.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2002 David E. O'Brien.  All rights reserved.
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed 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.
- *
- *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $FreeBSD$
- */
-
-#ifndef _MACHINE_VARARGS_H_
-#define	_MACHINE_VARARGS_H_
-
-#error "<varargs.h> is obsolete on ia64. Use <stdarg.h> instead."
-
-#endif /* !_MACHINE_VARARGS_H_ */
diff --git a/sys/ia64/include/vm.h b/sys/ia64/include/vm.h
deleted file mode 100644
index 717677159ec7..000000000000
--- a/sys/ia64/include/vm.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, 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_VM_H_
-#define	_MACHINE_VM_H_
-
-#include <machine/atomic.h>
-#include <machine/pte.h>
-
-/* Memory attributes. */
-#define	VM_MEMATTR_WRITE_BACK		((vm_memattr_t)PTE_MA_WB)
-#define	VM_MEMATTR_UNCACHEABLE		((vm_memattr_t)PTE_MA_UC)
-#define	VM_MEMATTR_UNCACHEABLE_EXPORTED	((vm_memattr_t)PTE_MA_UCE)
-#define	VM_MEMATTR_WRITE_COMBINING	((vm_memattr_t)PTE_MA_WC)
-#define	VM_MEMATTR_NATPAGE		((vm_memattr_t)PTE_MA_NATPAGE)
-
-#define	VM_MEMATTR_DEFAULT		VM_MEMATTR_WRITE_BACK
-
-#endif /* !_MACHINE_VM_H_ */
diff --git a/sys/ia64/include/vmparam.h b/sys/ia64/include/vmparam.h
deleted file mode 100644
index edae4c4689f7..000000000000
--- a/sys/ia64/include/vmparam.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*-
- * Copyright (c) 1988 University of Utah.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  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 Ralph Campbell.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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: Utah $Hdr: vmparam.h 1.16 91/01/18$
- *
- *	@(#)vmparam.h	8.2 (Berkeley) 4/22/94
- *
- * $FreeBSD$
- */
-
-#ifndef	_MACHINE_VMPARAM_H_
-#define	_MACHINE_VMPARAM_H_
-
-/*
- * Virtual memory related constants, all in bytes
- */
-#ifndef MAXTSIZ
-#define	MAXTSIZ		(1<<30)			/* max text size (1G) */
-#endif
-#ifndef DFLDSIZ
-#define	DFLDSIZ		(1<<27)			/* initial data size (128M) */
-#endif
-#ifndef MAXDSIZ
-#define	MAXDSIZ		(1<<30)			/* max data size (1G) */
-#endif
-#ifndef	DFLSSIZ
-#define	DFLSSIZ		(1<<21)			/* initial stack size (2M) */
-#endif
-#ifndef	MAXSSIZ
-#define	MAXSSIZ		(1<<28)			/* max stack size (256M) */
-#endif
-#ifndef SGROWSIZ
-#define SGROWSIZ	(128UL*1024)		/* amount to grow stack */
-#endif
-
-/*
- * We need region 7 virtual addresses for pagetables.
- */
-#define UMA_MD_SMALL_ALLOC
-
-/*
- * The physical address space is sparsely populated.
- */
-#define	VM_PHYSSEG_SPARSE
-
-/*
- * The number of PHYSSEG entries is equal to the number of phys_avail
- * entries.
- */
-#define	VM_PHYSSEG_MAX		49
-
-/*
- * 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.
- */
-#define	VM_NFREEPOOL		3
-#define	VM_FREEPOOL_CACHE	2
-#define	VM_FREEPOOL_DEFAULT	0
-#define	VM_FREEPOOL_DIRECT	1
-
-/*
- * Create one free page list.
- */
-#define	VM_NFREELIST		1
-#define	VM_FREELIST_DEFAULT	0
-
-/*
- * An allocation size of 256MB is supported in order to optimize the
- * use of the identity mappings in region 7 by UMA.
- */
-#define	VM_NFREEORDER		16
-
-/*
- * Disable superpage reservations.
- */
-#ifndef	VM_NRESERVLEVEL
-#define	VM_NRESERVLEVEL		0
-#endif
-
-#define	IA64_VM_MINKERN_REGION	4
-
-/*
- * Manipulating region bits of an address.
- */
-#define IA64_RR_BASE(n)         (((uint64_t) (n)) << 61)
-#define IA64_RR_MASK(x)         ((x) & ((1L << 61) - 1))
-
-#define	IA64_PHYS_TO_RR6(x)	((x) | IA64_RR_BASE(6))
-#define	IA64_PHYS_TO_RR7(x)	((x) | IA64_RR_BASE(7))
-
-/*
- * The Itanium architecture defines that all implementations support at
- * least 51 virtual address bits (i.e. IMPL_VA_MSB=50). The unimplemented
- * bits are sign-extended from VA{IMPL_VA_MSB}. As such, there's a gap in
- * the virtual address range, which extends at most from 0x0004000000000000
- * to 0x1ffbffffffffffff. We define the top half of a region in terms of
- * this worst-case gap.
- */
-#define	IA64_REGION_GAP_START	0x0004000000000000
-#define	IA64_REGION_GAP_EXTEND	0x1ffc000000000000
-
-/*
- * Parameters for Pre-Boot Virtual Memory (PBVM).
- * The kernel, its modules and metadata are loaded in the PBVM by the loader.
- * The PBVM consists of pages for which the mapping is maintained in a page
- * table. The page table is at least 1 EFI page large (i.e. 4KB), but can be
- * larger to accommodate more PBVM. The maximum page table size is 1MB. With
- * 8 bytes per page table entry, this means that the PBVM has at least 512
- * pages and at most 128K pages.
- * The GNU toolchain (in particular GNU ld) does not support an alignment
- * larger than 64K. This means that we cannot guarantee page alignment for
- * a page size that's larger than 64K. We do want to have text and data in
- * different pages, which means that the maximum usable page size is 64KB.
- * Consequently:
- * The maximum total PBVM size is 8GB -- enough for a DVD image. A page table
- * of a single EFI page (4KB) allows for 32MB of PBVM.
- *
- * The kernel is given the PA and size of the page table that provides the
- * mapping of the PBVM. The page table itself is assumed to be mapped at a
- * known virtual address and using a single translation wired into the CPU.
- * As such, the page table is assumed to be a power of 2 and naturally aligned.
- * The kernel also assumes that a good portion of the kernel text is mapped
- * and wired into the CPU, but does not assume that the mapping covers the
- * whole of PBVM.
- */
-#define	IA64_PBVM_RR		IA64_VM_MINKERN_REGION
-#define	IA64_PBVM_BASE		\
-		(IA64_RR_BASE(IA64_PBVM_RR) + IA64_REGION_GAP_EXTEND)
-
-#define	IA64_PBVM_PGTBL_MAXSZ	1048576
-#define	IA64_PBVM_PGTBL		\
-		(IA64_RR_BASE(IA64_PBVM_RR + 1) - IA64_PBVM_PGTBL_MAXSZ)
-
-#define	IA64_PBVM_PAGE_SHIFT	16	/* 64KB */
-#define	IA64_PBVM_PAGE_SIZE	(1 << IA64_PBVM_PAGE_SHIFT)
-#define	IA64_PBVM_PAGE_MASK	(IA64_PBVM_PAGE_SIZE - 1)
-
-/*
- * Mach derived constants
- */
-
-/* user/kernel map constants */
-#define	VM_MIN_ADDRESS		0
-#define	VM_MAXUSER_ADDRESS	IA64_RR_BASE(IA64_VM_MINKERN_REGION)
-#define	VM_MIN_KERNEL_ADDRESS	VM_MAXUSER_ADDRESS
-#define	VM_INIT_KERNEL_ADDRESS	IA64_RR_BASE(IA64_VM_MINKERN_REGION + 1)
-#define	VM_MAX_KERNEL_ADDRESS	(IA64_RR_BASE(IA64_VM_MINKERN_REGION + 2) - 1)
-#define	VM_MAX_ADDRESS		~0UL
-
-/* We link the kernel at IA64_PBVM_BASE. */
-#define	KERNBASE		IA64_PBVM_BASE
-
-/*
- * USRSTACK is the top (end) of the user stack.  Immediately above the user
- * stack resides the syscall gateway page.
- */
-#define	USRSTACK		VM_MAXUSER_ADDRESS
-#define	IA64_BACKINGSTORE	(USRSTACK - (2 * MAXSSIZ) - PAGE_SIZE)
-
-/*
- * How many physical pages per kmem arena virtual page.
- */
-#ifndef VM_KMEM_SIZE_SCALE
-#define	VM_KMEM_SIZE_SCALE	(4)
-#endif
-
-/* initial pagein size of beginning of executable file */
-#ifndef VM_INITIAL_PAGEIN
-#define	VM_INITIAL_PAGEIN	16
-#endif
-
-#define	ZERO_REGION_SIZE	(2 * 1024 * 1024)	/* 2MB */
-
-#endif	/* !_MACHINE_VMPARAM_H_ */
diff --git a/sys/ia64/isa/isa.c b/sys/ia64/isa/isa.c
deleted file mode 100644
index cdb93cc35c1a..000000000000
--- a/sys/ia64/isa/isa.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * Copyright (c) 1998 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$
- */
-
-/*
- * Modifications for Intel architecture by Garrett A. Wollman.
- * 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.
- */
-
-#include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/malloc.h>
-#include <machine/bus.h>
-#include <sys/rman.h>
-
-#include <machine/resource.h>
-
-#include <isa/isareg.h>
-#include <isa/isavar.h>
-#include <isa/isa_common.h>
-
-void
-isa_init(device_t dev)
-{
-}
-
-/*
- * This implementation simply passes the request up to the parent
- * bus, which in our case is the special i386 nexus, substituting any
- * configured values if the caller defaulted.  We can get away with
- * this because there is no special mapping for ISA resources on an Intel
- * platform.  When porting this code to another architecture, it may be
- * necessary to interpose a mapping layer here.
- */
-struct resource *
-isa_alloc_resource(device_t bus, device_t child, int type, int *rid,
-		   u_long start, u_long end, u_long count, u_int flags)
-{
-	/*
-	 * Consider adding a resource definition.
-	 */
-	int passthrough = (device_get_parent(child) != bus);
-	int isdefault = (start == 0UL && end == ~0UL);
-	struct isa_device* idev = DEVTOISA(child);
-	struct resource_list *rl = &idev->id_resources;
-	struct resource_list_entry *rle;
-	
-	if (!passthrough && !isdefault) {
-		rle = resource_list_find(rl, type, *rid);
-		if (!rle) {
-			if (*rid < 0)
-				return 0;
-			switch (type) {
-			case SYS_RES_IRQ:
-				if (*rid >= ISA_NIRQ)
-					return 0;
-				break;
-			case SYS_RES_DRQ:
-				if (*rid >= ISA_NDRQ)
-					return 0;
-				break;
-			case SYS_RES_MEMORY:
-				if (*rid >= ISA_NMEM)
-					return 0;
-				break;
-			case SYS_RES_IOPORT:
-				if (*rid >= ISA_NPORT)
-					return 0;
-				break;
-			default:
-				return 0;
-			}
-			resource_list_add(rl, type, *rid, start, end, count);
-		}
-	}
-
-	return resource_list_alloc(rl, bus, child, type, rid,
-				   start, end, count, flags);
-}
-
-int
-isa_release_resource(device_t bus, device_t child, int type, int rid,
-		     struct resource *r)
-{
-	struct isa_device* idev = DEVTOISA(child);
-	struct resource_list *rl = &idev->id_resources;
-	return resource_list_release(rl, bus, child, type, rid, r);
-}
diff --git a/sys/ia64/isa/isa_dma.c b/sys/ia64/isa/isa_dma.c
deleted file mode 100644
index 1b093e57fe14..000000000000
--- a/sys/ia64/isa/isa_dma.c
+++ /dev/null
@@ -1,508 +0,0 @@
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 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: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	from: isa_dma.c,v 1.3 1999/05/09 23:56:00 peter Exp $
- * $FreeBSD$
- */
-
-/*
- * code to manage AT bus
- *
- * 92/08/18  Frank P. MacLachlan (fpm@crash.cts.com):
- * Fixed uninitialized variable problem and added code to deal
- * with DMA page boundaries in isa_dmarangecheck().  Fixed word
- * mode DMA count compution and reorganized DMA setup code in
- * isa_dmastart()
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/bus.h>
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-#include <isa/isareg.h>
-#include <isa/isavar.h>
-#include <isa/isa_dmareg.h>
-#include <machine/bus.h>
-
-static bus_dma_tag_t dma_tag[8];
-static bus_dmamap_t dma_map[8];
-static u_int8_t	dma_busy = 0;		/* Used in isa_dmastart() */
-static u_int8_t	dma_inuse = 0;		/* User for acquire/release */
-static u_int8_t dma_auto_mode = 0;
-static u_int8_t dma_bounced = 0;
-
-#define VALID_DMA_MASK (7)
-
-/* high byte of address is stored in this port for i-th dma channel */
-static int dmapageport[8] = { 0x87, 0x83, 0x81, 0x82, 0x8f, 0x8b, 0x89, 0x8a };
-
-/*
- * Setup a DMA channel's bounce buffer.
- */
-int
-isa_dma_init(int chan, u_int bouncebufsize, int flag __unused)
-{
-	static int initted = 0;
-	bus_addr_t boundary = chan >= 4 ? 0x20000 : 0x10000;
-
-	if (!initted) {
-		/*
-		 * Reset the DMA hardware.
-		 */
-		outb(DMA1_RESET, 0);
-		outb(DMA2_RESET, 0);
-		isa_dmacascade(4);
-	    
-		initted = 1;
-	}
-
-#ifdef DIAGNOSTIC
-	if (chan & ~VALID_DMA_MASK)
-		panic("isa_dma_init: channel out of range");
-
-	if (dma_tag[chan] || dma_map[chan])
-		panic("isa_dma_init: impossible request"); 
-#endif
-
-	if (bus_dma_tag_create(/*parent*/NULL,
-			       /*alignment*/2,
-			       /*boundary*/boundary,
-			       /*lowaddr*/BUS_SPACE_MAXADDR_24BIT,
-			       /*highaddr*/BUS_SPACE_MAXADDR,
-			       /*filter*/NULL, /*filterarg*/NULL,
-			       /*maxsize*/bouncebufsize,
-			       /*nsegments*/1, /*maxsegz*/0x3ffff,
-			       /*flags*/0,
-			       /*lockfunc*/busdma_lock_mutex,
-			       /*lockarg*/&Giant,
-			       &dma_tag[chan]) != 0) {
-		panic("isa_dma_init: unable to create dma tag\n");
-	}
-	
-	if (bus_dmamap_create(dma_tag[chan], 0, &dma_map[chan])) {
-		panic("isa_dma_init: unable to create dma map\n");
-	}
-
-	return (0);
-}
-
-/*
- * Register a DMA channel's usage.  Usually called from a device driver
- * in open() or during its initialization.
- */
-int
-isa_dma_acquire(chan)
-	int chan;
-{
-#ifdef DIAGNOSTIC
-	if (chan & ~VALID_DMA_MASK)
-		panic("isa_dma_acquire: channel out of range");
-#endif
-
-	if (dma_inuse & (1 << chan)) {
-		printf("isa_dma_acquire: channel %d already in use\n", chan);
-		return (EBUSY);
-	}
-	dma_inuse |= (1 << chan);
-	dma_auto_mode &= ~(1 << chan);
-
-	return (0);
-}
-
-/*
- * Unregister a DMA channel's usage.  Usually called from a device driver
- * during close() or during its shutdown.
- */
-void
-isa_dma_release(chan)
-	int chan;
-{
-#ifdef DIAGNOSTIC
-	if (chan & ~VALID_DMA_MASK)
-		panic("isa_dma_release: channel out of range");
-
-	if ((dma_inuse & (1 << chan)) == 0)
-		printf("isa_dma_release: channel %d not in use\n", chan);
-#endif
-
-	if (dma_busy & (1 << chan)) {
-		dma_busy &= ~(1 << chan);
-		/* 
-		 * XXX We should also do "dma_bounced &= (1 << chan);"
-		 * because we are acting on behalf of isa_dmadone() which
-		 * was not called to end the last DMA operation.  This does
-		 * not matter now, but it may in the future.
-		 */
-	}
-
-	dma_inuse &= ~(1 << chan);
-	dma_auto_mode &= ~(1 << chan);
-}
-
-/*
- * isa_dmacascade(): program 8237 DMA controller channel to accept
- * external dma control by a board.
- */
-void
-isa_dmacascade(chan)
-	int chan;
-{
-#ifdef DIAGNOSTIC
-	if (chan & ~VALID_DMA_MASK)
-		panic("isa_dmacascade: channel out of range");
-#endif
-
-	/* set dma channel mode, and set dma channel mode */
-	if ((chan & 4) == 0) {
-		outb(DMA1_MODE, DMA37MD_CASCADE | chan);
-		outb(DMA1_SMSK, chan);
-	} else {
-		outb(DMA2_MODE, DMA37MD_CASCADE | (chan & 3));
-		outb(DMA2_SMSK, chan & 3);
-	}
-}
-
-/*
- * isa_dmastart(): program 8237 DMA controller channel.
- */
-
-struct isa_dmastart_arg {
-	caddr_t addr;
-	int 	chan;
-	int 	flags;
-};
-
-static void isa_dmastart_cb(void *arg, bus_dma_segment_t *segs, int nseg,
-			    int error)
-{
-#if 0
-	caddr_t addr = ((struct isa_dmastart_arg *) arg)->addr;
-#endif
-	int chan = ((struct isa_dmastart_arg *) arg)->chan;
-	int flags = ((struct isa_dmastart_arg *) arg)->flags;
-	bus_addr_t phys = segs->ds_addr;
-	int nbytes = segs->ds_len;
-	int waport;
-
-	if (nseg != 1)
-		panic("isa_dmastart: transfer mapping not contiguous");
-
-#if 0
-	if ((chipset.sgmap == NULL) && 
-	    (pmap_extract(kernel_pmap, (vm_offset_t)addr)
-		> BUS_SPACE_MAXADDR_24BIT)) { 
-		/* we bounced */
-		dma_bounced |= (1 << chan);
-                /* copy bounce buffer on write */
-                if (!(flags & ISADMA_READ)) 
-                        bus_dmamap_sync(dma_tag[chan], dma_map[chan], 
-			                  BUS_DMASYNC_PREWRITE);
-	}
-#endif
-	
-	if ((chan & 4) == 0) {
-		/*
-		 * Program one of DMA channels 0..3.  These are
-		 * byte mode channels.
-		 */
-		/* set dma channel mode, and reset address ff */
-
-		/* If ISADMA_RAW flag is set, then use autoinitialise mode */
-		if (flags & ISADMA_RAW) {
-		  if (flags & ISADMA_READ)
-			outb(DMA1_MODE, DMA37MD_AUTO|DMA37MD_WRITE|chan);
-		  else
-			outb(DMA1_MODE, DMA37MD_AUTO|DMA37MD_READ|chan);
-		}
-		else
-		if (flags & ISADMA_READ)
-			outb(DMA1_MODE, DMA37MD_SINGLE|DMA37MD_WRITE|chan);
-		else
-			outb(DMA1_MODE, DMA37MD_SINGLE|DMA37MD_READ|chan);
-		outb(DMA1_FFC, 0);
-
-		/* send start address */
-		waport =  DMA1_CHN(chan);
-		outb(waport, phys);
-		outb(waport, phys>>8);
-		outb(dmapageport[chan], phys>>16);
-
-		/* send count */
-		outb(waport + 1, --nbytes);
-		outb(waport + 1, nbytes>>8);
-
-		/* unmask channel */
-		outb(DMA1_SMSK, chan);
-	} else {
-		/*
-		 * Program one of DMA channels 4..7.  These are
-		 * word mode channels.
-		 */
-		/* set dma channel mode, and reset address ff */
-
-		/* If ISADMA_RAW flag is set, then use autoinitialise mode */
-		if (flags & ISADMA_RAW) {
-		  if (flags & ISADMA_READ)
-			outb(DMA2_MODE, DMA37MD_AUTO|DMA37MD_WRITE|(chan&3));
-		  else
-			outb(DMA2_MODE, DMA37MD_AUTO|DMA37MD_READ|(chan&3));
-		}
-		else
-		if (flags & ISADMA_READ)
-			outb(DMA2_MODE, DMA37MD_SINGLE|DMA37MD_WRITE|(chan&3));
-		else
-			outb(DMA2_MODE, DMA37MD_SINGLE|DMA37MD_READ|(chan&3));
-		outb(DMA2_FFC, 0);
-
-		/* send start address */
-		waport = DMA2_CHN(chan - 4);
-		outb(waport, phys>>1);
-		outb(waport, phys>>9);
-		outb(dmapageport[chan], phys>>16);
-
-		/* send count */
-		nbytes >>= 1;
-		outb(waport + 2, --nbytes);
-		outb(waport + 2, nbytes>>8);
-
-		/* unmask channel */
-		outb(DMA2_SMSK, chan & 3);
-	}
-}
-
-void
-isa_dmastart(int flags, caddr_t addr, u_int nbytes, int chan)
-{
-	struct isa_dmastart_arg args;
-
-#ifdef DIAGNOSTIC
-	if (chan & ~VALID_DMA_MASK)
-		panic("isa_dmastart: channel out of range");
-
-	if ((chan < 4 && nbytes > (1<<16))
-	    || (chan >= 4 && (nbytes > (1<<17) || (uintptr_t)addr & 1)))
-		panic("isa_dmastart: impossible request");
-
-	if ((dma_inuse & (1 << chan)) == 0)
-		printf("isa_dmastart: channel %d not acquired\n", chan);
-#endif
-
-#if 0
-	/*
-	 * XXX This should be checked, but drivers like ad1848 only call
-	 * isa_dmastart() once because they use Auto DMA mode.  If we
-	 * leave this in, drivers that do this will print this continuously.
-	 */
-	if (dma_busy & (1 << chan))
-		printf("isa_dmastart: channel %d busy\n", chan);
-#endif
-
-	if (!dma_tag[chan] || !dma_map[chan])
-		panic("isa_dmastart: called without isa_dma_init");
-
-	dma_busy |= (1 << chan);
-
-	if (flags & ISADMA_RAW) {
-		dma_auto_mode |= (1 << chan);
-	} else { 
-		dma_auto_mode &= ~(1 << chan);
-	}
-
-	/*
-	 * Freeze dma while updating registers.
-	 */
-	outb(chan & 4 ? DMA2_SMSK : DMA1_SMSK, (chan & 3) | 4);
-
-        args.addr = addr;
-	args.chan = chan;
-	args.flags = flags;
-	bus_dmamap_load(dma_tag[chan], dma_map[chan], addr, nbytes,
-			isa_dmastart_cb, &args, 0);
-}
-
-void
-isa_dmadone(int flags, caddr_t addr, int nbytes, int chan)
-{  
-#ifdef DIAGNOSTIC
-	if (chan & ~VALID_DMA_MASK)
-		panic("isa_dmadone: channel out of range");
-
-	if ((dma_inuse & (1 << chan)) == 0)
-		printf("isa_dmadone: channel %d not acquired\n", chan);
-#endif
-
-	if (((dma_busy & (1 << chan)) == 0) && 
-	    (dma_auto_mode & (1 << chan)) == 0 )
-		printf("isa_dmadone: channel %d not busy\n", chan);
-
-	if (dma_bounced & (1 << chan)) {
-		/* copy bounce buffer on read */
-		if (flags & ISADMA_READ) {
-			bus_dmamap_sync(dma_tag[chan], dma_map[chan],
-			                  BUS_DMASYNC_POSTREAD);
-		}
-		dma_bounced &= ~(1 << chan);
-	}
-
-	if ((dma_auto_mode & (1 << chan)) == 0) {
-		outb(chan & 4 ? DMA2_SMSK : DMA1_SMSK, (chan & 3) | 4);
-		bus_dmamap_unload(dma_tag[chan], dma_map[chan]);
-	}
-
-	dma_busy &= ~(1 << chan);
-}
-
-/*
- * Query the progress of a transfer on a DMA channel.
- *
- * To avoid having to interrupt a transfer in progress, we sample
- * each of the high and low databytes twice, and apply the following
- * logic to determine the correct count.
- *
- * Reads are performed with interrupts disabled, thus it is to be
- * expected that the time between reads is very small.  At most
- * one rollover in the low count byte can be expected within the
- * four reads that are performed.
- *
- * There are three gaps in which a rollover can occur :
- *
- * - read low1
- *              gap1
- * - read high1
- *              gap2
- * - read low2
- *              gap3
- * - read high2
- *
- * If a rollover occurs in gap1 or gap2, the low2 value will be
- * greater than the low1 value.  In this case, low2 and high2 are a
- * corresponding pair. 
- *
- * In any other case, low1 and high1 can be considered to be correct.
- *
- * The function returns the number of bytes remaining in the transfer,
- * or -1 if the channel requested is not active.
- *
- */
-int
-isa_dmastatus(int chan)
-{
-	u_long	cnt = 0;
-	int	ffport, waport;
-	u_long	low1, high1, low2, high2;
-	int s;
-
-	/* channel active? */
-	if ((dma_inuse & (1 << chan)) == 0) {
-		printf("isa_dmastatus: channel %d not active\n", chan);
-		return(-1);
-	}
-	/* channel busy? */
-
-	if (((dma_busy & (1 << chan)) == 0) &&
-	    (dma_auto_mode & (1 << chan)) == 0 ) {
-	    printf("chan %d not busy\n", chan);
-	    return -2 ;
-	}	
-	if (chan < 4) {			/* low DMA controller */
-		ffport = DMA1_FFC;
-		waport = DMA1_CHN(chan) + 1;
-	} else {			/* high DMA controller */
-		ffport = DMA2_FFC;
-		waport = DMA2_CHN(chan - 4) + 2;
-	}
-
-	s = splhigh();			/* no interrupts Mr Jones! */
-	outb(ffport, 0);		/* clear register LSB flipflop */
-	low1 = inb(waport);
-	high1 = inb(waport);
-	outb(ffport, 0);		/* clear again */
-	low2 = inb(waport);
-	high2 = inb(waport);
-	splx(s);			/* enable interrupts again */
-
-	/* 
-	 * Now decide if a wrap has tried to skew our results.
-	 * Note that after TC, the count will read 0xffff, while we want 
-	 * to return zero, so we add and then mask to compensate.
-	 */
-	if (low1 >= low2) {
-		cnt = (low1 + (high1 << 8) + 1) & 0xffff;
-	} else {
-		cnt = (low2 + (high2 << 8) + 1) & 0xffff;
-	}
-
-	if (chan >= 4)			/* high channels move words */
-		cnt *= 2;
-	return(cnt);
-}
-
-/*
- * Reached terminal count yet ?
- */
-int
-isa_dmatc(int chan)
-{
-
-	if (chan < 4)
-		return(inb(DMA1_STATUS) & (1 << chan));
-	else
-		return(inb(DMA2_STATUS) & (1 << (chan & 3)));
-}
-
-/*
- * Stop a DMA transfer currently in progress.
- */
-int
-isa_dmastop(int chan) 
-{
-	if ((dma_inuse & (1 << chan)) == 0)
-		printf("isa_dmastop: channel %d not acquired\n", chan);  
-
-	if (((dma_busy & (1 << chan)) == 0) &&
-	    ((dma_auto_mode & (1 << chan)) == 0)) {
-		printf("chan %d not busy\n", chan);
-		return -2 ;
-	}
-    
-	if ((chan & 4) == 0) {
-		outb(DMA1_SMSK, (chan & 3) | 4 /* disable mask */);
-	} else {
-		outb(DMA2_SMSK, (chan & 3) | 4 /* disable mask */);
-	}
-	return(isa_dmastatus(chan));
-}
diff --git a/sys/ia64/pci/pci_cfgreg.c b/sys/ia64/pci/pci_cfgreg.c
deleted file mode 100644
index e3f472b80d67..000000000000
--- a/sys/ia64/pci/pci_cfgreg.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 2010 Marcel Moolenaar
- * Copyright (c) 2001 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/param.h>
-#include <machine/cpufunc.h>
-#include <machine/pci_cfgreg.h>
-#include <machine/sal.h>
-
-static u_long
-pci_sal_address(int dom, int bus, int slot, int func, int reg)
-{
-	u_long addr;
-
-	addr = ~0ul;
-	if (dom >= 0 && dom <= 255 && bus >= 0 && bus <= 255 &&
-	    slot >= 0 && slot <= 31 && func >= 0 && func <= 7 &&
-	    reg >= 0 && reg <= 255) {
-		addr = ((u_long)dom << 24) | ((u_long)bus << 16) |
-		    ((u_long)slot << 11) | ((u_long)func << 8) | (u_long)reg;
-	}
-	return (addr);
-}
-
-static int
-pci_valid_access(int reg, int len)
-{
-	int ok;
-
-	ok = ((len == 1 || len == 2 || len == 4) && (reg & (len - 1)) == 0)
-	    ? 1 : 0;
-	return (ok);
-}
-
-int
-pci_cfgregopen(void)
-{
-	return (1);
-}
-
-uint32_t
-pci_cfgregread(int bus, int slot, int func, int reg, int len)
-{
-	struct ia64_sal_result res;
-	register_t is;
-	u_long addr;
-
-	addr = pci_sal_address(bus >> 8, bus & 0xff, slot, func, reg);
-	if (addr == ~0ul)
-		return (~0);
-
-	if (!pci_valid_access(reg, len))
-		return (~0);
-
-	is = intr_disable();
-	res = ia64_sal_entry(SAL_PCI_CONFIG_READ, addr, len, 0, 0, 0, 0, 0);
-	intr_restore(is);
-
-	return ((res.sal_status < 0) ? ~0 : res.sal_result[0]);
-}
-
-void
-pci_cfgregwrite(int bus, int slot, int func, int reg, uint32_t data, int len)
-{
-	struct ia64_sal_result res;
-	register_t is;
-	u_long addr;
-
-	addr = pci_sal_address(bus >> 8, bus & 0xff, slot, func, reg);
-	if (addr == ~0ul)
-		return;
-
-	if (!pci_valid_access(reg, len))
-		return;
-
-	is = intr_disable();
-	res = ia64_sal_entry(SAL_PCI_CONFIG_WRITE, addr, len, data, 0, 0, 0, 0);
-	intr_restore(is);
-}
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index a62efb8d677b..6342119d1545 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -112,10 +112,8 @@ static int compress_core(gzFile, char *, char *, unsigned int,
 
 int __elfN(fallback_brand) = -1;
 SYSCTL_INT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO,
-    fallback_brand, CTLFLAG_RW, &__elfN(fallback_brand), 0,
+    fallback_brand, CTLFLAG_RWTUN, &__elfN(fallback_brand), 0,
     __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) " brand of last resort");
-TUNABLE_INT("kern.elf" __XSTRING(__ELF_WORD_SIZE) ".fallback_brand",
-    &__elfN(fallback_brand));
 
 static int elf_legacy_coredump = 0;
 SYSCTL_INT(_debug, OID_AUTO, __elfN(legacy_coredump), CTLFLAG_RW, 
@@ -132,7 +130,7 @@ SYSCTL_INT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO,
     __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": enable non-executable stack");
 
 #if __ELF_WORD_SIZE == 32
-#if defined(__amd64__) || defined(__ia64__)
+#if defined(__amd64__)
 int i386_read_exec = 0;
 SYSCTL_INT(_kern_elf32, OID_AUTO, read_exec, CTLFLAG_RW, &i386_read_exec, 0,
     "enable execution from readable segments");
@@ -261,8 +259,6 @@ __elfN(get_brandinfo)(struct image_params *imgp, const char *interp,
 {
 	const Elf_Ehdr *hdr = (const Elf_Ehdr *)imgp->image_header;
 	Elf_Brandinfo *bi;
-	const char *fname_name, *interp_brand_name;
-	int fname_len, interp_len;
 	boolean_t ret;
 	int i;
 
@@ -313,33 +309,6 @@ __elfN(get_brandinfo)(struct image_params *imgp, const char *interp,
 		}
 	}
 
-	/* Some ABI allows to run the interpreter itself. */
-	for (i = 0; i < MAX_BRANDS; i++) {
-		bi = elf_brand_list[i];
-		if (bi == NULL || bi->flags & BI_BRAND_NOTE_MANDATORY)
-			continue;
-		if (hdr->e_machine != bi->machine ||
-		    (bi->flags & BI_CAN_EXEC_INTERP) == 0)
-			continue;
-		/*
-		 * Compare the interpreter name not the path to allow run it
-		 * from everywhere.
-		 */
-		interp_brand_name = strrchr(bi->interp_path, '/');
-		if (interp_brand_name == NULL)
-			interp_brand_name = bi->interp_path;
-		interp_len = strlen(interp_brand_name);
-		fname_name = strrchr(imgp->args->fname, '/');
-		if (fname_name == NULL)
-			fname_name = imgp->args->fname;
-		fname_len = strlen(fname_name);
-		if (fname_len < interp_len)
-			continue;
-		ret = strncmp(fname_name, interp_brand_name, interp_len);
-		if (ret == 0)
-			return (bi);
-	}
-
 	/* Lacking a recognized interpreter, try the default brand */
 	for (i = 0; i < MAX_BRANDS; i++) {
 		bi = elf_brand_list[i];
@@ -2143,7 +2112,7 @@ __elfN(trans_prot)(Elf_Word flags)
 	if (flags & PF_R)
 		prot |= VM_PROT_READ;
 #if __ELF_WORD_SIZE == 32
-#if defined(__amd64__) || defined(__ia64__)
+#if defined(__amd64__)
 	if (i386_read_exec && (flags & PF_R))
 		prot |= VM_PROT_EXECUTE;
 #endif
diff --git a/sys/kern/kern_clocksource.c b/sys/kern/kern_clocksource.c
index ae64c616c1f6..092c81807b17 100644
--- a/sys/kern/kern_clocksource.c
+++ b/sys/kern/kern_clocksource.c
@@ -96,23 +96,21 @@ static sbintime_t	statperiod;	/* statclock() events period. */
 static sbintime_t	profperiod;	/* profclock() events period. */
 static sbintime_t	nexttick;	/* Next global timer tick time. */
 static u_int		busy = 1;	/* Reconfiguration is in progress. */
-static int		profiling = 0;	/* Profiling events enabled. */
+static int		profiling;	/* Profiling events enabled. */
 
 static char		timername[32];	/* Wanted timer. */
 TUNABLE_STR("kern.eventtimer.timer", timername, sizeof(timername));
 
-static int		singlemul = 0;	/* Multiplier for periodic mode. */
-TUNABLE_INT("kern.eventtimer.singlemul", &singlemul);
-SYSCTL_INT(_kern_eventtimer, OID_AUTO, singlemul, CTLFLAG_RW, &singlemul,
+static int		singlemul;	/* Multiplier for periodic mode. */
+SYSCTL_INT(_kern_eventtimer, OID_AUTO, singlemul, CTLFLAG_RWTUN, &singlemul,
     0, "Multiplier for periodic mode");
 
-static u_int		idletick = 0;	/* Run periodic events when idle. */
-TUNABLE_INT("kern.eventtimer.idletick", &idletick);
-SYSCTL_UINT(_kern_eventtimer, OID_AUTO, idletick, CTLFLAG_RW, &idletick,
+static u_int		idletick;	/* Run periodic events when idle. */
+SYSCTL_UINT(_kern_eventtimer, OID_AUTO, idletick, CTLFLAG_RWTUN, &idletick,
     0, "Run periodic events when idle");
 
-static int		periodic = 0;	/* Periodic or one-shot mode. */
-static int		want_periodic = 0; /* What mode to prefer. */
+static int		periodic;	/* Periodic or one-shot mode. */
+static int		want_periodic;	/* What mode to prefer. */
 TUNABLE_INT("kern.eventtimer.periodic", &want_periodic);
 
 struct pcpu_state {
diff --git a/sys/kern/kern_cons.c b/sys/kern/kern_cons.c
index ad2ba201551c..da157ecccfa9 100644
--- a/sys/kern/kern_cons.c
+++ b/sys/kern/kern_cons.c
@@ -41,6 +41,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
+#include "opt_syscons.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -648,3 +649,63 @@ sysbeep(int pitch __unused, int period __unused)
 
 #endif
 
+/*
+ * Temporary support for sc(4) to vt(4) transition.
+ */
+static unsigned vty_prefer;
+static char vty_name[16];
+SYSCTL_STRING(_kern, OID_AUTO, vty, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, vty_name,
+    0, "Console vty driver");
+
+int
+vty_enabled(unsigned vty)
+{
+	static unsigned vty_selected = 0;
+
+	if (vty_selected == 0) {
+		TUNABLE_STR_FETCH("kern.vty", vty_name, sizeof(vty_name));
+		do {
+#if defined(DEV_SC)
+			if (strcmp(vty_name, "sc") == 0) {
+				vty_selected = VTY_SC;
+				break;
+			}
+#endif
+#if defined(DEV_VT)
+			if (strcmp(vty_name, "vt") == 0) {
+				vty_selected = VTY_VT;
+				break;
+			}
+#endif
+			if (vty_prefer != 0) {
+				vty_selected = vty_prefer;
+				break;
+			}
+#if defined(DEV_SC)
+			vty_selected = VTY_SC;
+#elif defined(DEV_VT)
+			vty_selected = VTY_VT;
+#endif
+		} while (0);
+
+		if (vty_selected == VTY_VT)
+			strcpy(vty_name, "vt");
+		else if (vty_selected == VTY_SC)
+			strcpy(vty_name, "sc");
+	}
+	return ((vty_selected & vty) != 0);
+}
+
+void
+vty_set_preferred(unsigned vty)
+{
+
+	vty_prefer = vty;
+#if !defined(DEV_SC)
+	vty_prefer &= ~VTY_SC;
+#endif
+#if !defined(DEV_VT)
+	vty_prefer &= ~VTY_VT;
+#endif
+}
+
diff --git a/sys/kern/kern_cpu.c b/sys/kern/kern_cpu.c
index 7206c388f76a..293b940683ba 100644
--- a/sys/kern/kern_cpu.c
+++ b/sys/kern/kern_cpu.c
@@ -133,13 +133,11 @@ DRIVER_MODULE(cpufreq, cpu, cpufreq_driver, cpufreq_dc, 0, 0);
 
 static int		cf_lowest_freq;
 static int		cf_verbose;
-TUNABLE_INT("debug.cpufreq.lowest", &cf_lowest_freq);
-TUNABLE_INT("debug.cpufreq.verbose", &cf_verbose);
 static SYSCTL_NODE(_debug, OID_AUTO, cpufreq, CTLFLAG_RD, NULL,
     "cpufreq debugging");
-SYSCTL_INT(_debug_cpufreq, OID_AUTO, lowest, CTLFLAG_RW, &cf_lowest_freq, 1,
+SYSCTL_INT(_debug_cpufreq, OID_AUTO, lowest, CTLFLAG_RWTUN, &cf_lowest_freq, 1,
     "Don't provide levels below this frequency.");
-SYSCTL_INT(_debug_cpufreq, OID_AUTO, verbose, CTLFLAG_RW, &cf_verbose, 1,
+SYSCTL_INT(_debug_cpufreq, OID_AUTO, verbose, CTLFLAG_RWTUN, &cf_verbose, 1,
     "Print verbose debugging messages");
 
 static int
diff --git a/sys/kern/kern_cpuset.c b/sys/kern/kern_cpuset.c
index 42c95c93a9d3..aca26efc50b5 100644
--- a/sys/kern/kern_cpuset.c
+++ b/sys/kern/kern_cpuset.c
@@ -106,7 +106,7 @@ static uma_zone_t cpuset_zone;
 static struct mtx cpuset_lock;
 static struct setlist cpuset_ids;
 static struct unrhdr *cpuset_unr;
-static struct cpuset *cpuset_zero;
+static struct cpuset *cpuset_zero, *cpuset_default;
 
 /* Return the size of cpuset_t at the kernel level */
 SYSCTL_INT(_kern_sched, OID_AUTO, cpusetsize, CTLFLAG_RD,
@@ -715,6 +715,89 @@ cpuset_setthread(lwpid_t id, cpuset_t *mask)
 	return (error);
 }
 
+/*
+ * Apply new cpumask to the ithread.
+ */
+int
+cpuset_setithread(lwpid_t id, u_char cpu)
+{
+	struct cpuset *nset, *rset;
+	struct cpuset *parent, *old_set;
+	struct thread *td;
+	struct proc *p;
+	cpusetid_t cs_id;
+	cpuset_t mask;
+	int error;
+
+	nset = uma_zalloc(cpuset_zone, M_WAITOK);
+	rset = uma_zalloc(cpuset_zone, M_WAITOK);
+
+	CPU_ZERO(&mask);
+	if (cpu == NOCPU)
+		CPU_COPY(cpuset_root, &mask);
+	else
+		CPU_SET(cpu, &mask);
+
+	error = cpuset_which(CPU_WHICH_TID, id, &p, &td, &old_set);
+	if (((cs_id = alloc_unr(cpuset_unr)) == CPUSET_INVALID) || error != 0)
+		goto out;
+
+	thread_lock(td);
+	old_set = td->td_cpuset;
+
+	if (cpu == NOCPU) {
+		/*
+		 * roll back to default set. We're not using cpuset_shadow()
+		 * here because we can fail CPU_SUBSET() check. This can happen
+		 * if default set does not contain all CPUs.
+		 */
+		error = _cpuset_create(nset, cpuset_default, &mask,
+		    CPUSET_INVALID);
+
+		goto applyset;
+	}
+
+	if (old_set->cs_id == 1 || (old_set->cs_id == CPUSET_INVALID &&
+	    old_set->cs_parent->cs_id == 1)) {
+		/* Default mask, we need to use new root set */
+		error = _cpuset_create(rset, cpuset_zero,
+		    &cpuset_zero->cs_mask, cs_id);
+		if (error != 0) {
+			PROC_UNLOCK(p);
+			goto out;
+		}
+		rset->cs_flags |= CPU_SET_ROOT;
+		parent = rset;
+		rset = NULL;
+		cs_id = CPUSET_INVALID;
+	} else {
+		/* Assume existing set was already allocated by previous call */
+		parent = td->td_cpuset;
+		old_set = NULL;
+	}
+
+	error = cpuset_shadow(parent, nset, &mask);
+applyset:
+	if (error == 0) {
+		td->td_cpuset = nset;
+		sched_affinity(td);
+		nset = NULL;
+	}
+	thread_unlock(td);
+	PROC_UNLOCK(p);
+	if (old_set != NULL)
+		cpuset_rel(old_set);
+out:
+	if (nset != NULL)
+		uma_zfree(cpuset_zone, nset);
+	if (rset != NULL)
+		uma_zfree(cpuset_zone, rset);
+	if (cs_id != CPUSET_INVALID)
+		free_unr(cpuset_unr, cs_id);
+	return (error);
+}
+
+
 /*
  * Creates the cpuset for thread0.  We make two sets:
  * 
@@ -735,6 +818,7 @@ cpuset_thread0(void)
 	cpuset_zone = uma_zcreate("cpuset", sizeof(struct cpuset), NULL, NULL,
 	    NULL, NULL, UMA_ALIGN_PTR, 0);
 	mtx_init(&cpuset_lock, "cpuset", NULL, MTX_SPIN | MTX_RECURSE);
+
 	/*
 	 * Create the root system set for the whole machine.  Doesn't use
 	 * cpuset_create() due to NULL parent.
@@ -747,12 +831,15 @@ cpuset_thread0(void)
 	set->cs_flags = CPU_SET_ROOT;
 	cpuset_zero = set;
 	cpuset_root = &set->cs_mask;
+
 	/*
 	 * Now derive a default, modifiable set from that to give out.
 	 */
 	set = uma_zalloc(cpuset_zone, M_WAITOK);
 	error = _cpuset_create(set, cpuset_zero, &cpuset_zero->cs_mask, 1);
 	KASSERT(error == 0, ("Error creating default set: %d\n", error));
+	cpuset_default = set;
+
 	/*
 	 * Initialize the unit allocator. 0 and 1 are allocated above.
 	 */
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 88b26af30cc5..7abdca03b2c0 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -294,18 +294,36 @@ fdunused(struct filedesc *fdp, int fd)
 
 /*
  * Free a file descriptor.
+ *
+ * Avoid some work if fdp is about to be destroyed.
  */
 static inline void
-fdfree(struct filedesc *fdp, int fd)
+_fdfree(struct filedesc *fdp, int fd, int last)
 {
 	struct filedescent *fde;
 
 	fde = &fdp->fd_ofiles[fd];
 	filecaps_free(&fde->fde_caps);
+	if (last)
+		return;
 	bzero(fde, sizeof(*fde));
 	fdunused(fdp, fd);
 }
 
+static inline void
+fdfree(struct filedesc *fdp, int fd)
+{
+
+	_fdfree(fdp, fd, 0);
+}
+
+static inline void
+fdfree_last(struct filedesc *fdp, int fd)
+{
+
+	_fdfree(fdp, fd, 1);
+}
+
 /*
  * System calls on descriptors.
  */
@@ -885,8 +903,6 @@ do_dup(struct thread *td, int flags, int old, int new,
 		newfde->fde_flags = oldfde->fde_flags | UF_EXCLOSE;
 	else
 		newfde->fde_flags = oldfde->fde_flags & ~UF_EXCLOSE;
-	if (new > fdp->fd_lastfile)
-		fdp->fd_lastfile = new;
 	*retval = new;
 
 	if (delfp != NULL) {
@@ -1236,7 +1252,7 @@ sys_closefrom(struct thread *td, struct closefrom_args *uap)
 	if (uap->lowfd < 0)
 		uap->lowfd = 0;
 	FILEDESC_SLOCK(fdp);
-	for (fd = uap->lowfd; fd < fdp->fd_nfiles; fd++) {
+	for (fd = uap->lowfd; fd <= fdp->fd_lastfile; fd++) {
 		if (fdp->fd_ofiles[fd].fde_file != NULL) {
 			FILEDESC_SUNLOCK(fdp);
 			(void)kern_close(td, fd);
@@ -1852,19 +1868,17 @@ fdshare(struct filedesc *fdp)
  * Unshare a filedesc structure, if necessary by making a copy
  */
 void
-fdunshare(struct proc *p, struct thread *td)
+fdunshare(struct thread *td)
 {
+	struct filedesc *tmp;
+	struct proc *p = td->td_proc;
 
-	FILEDESC_XLOCK(p->p_fd);
-	if (p->p_fd->fd_refcnt > 1) {
-		struct filedesc *tmp;
+	if (p->p_fd->fd_refcnt == 1)
+		return;
 
-		FILEDESC_XUNLOCK(p->p_fd);
-		tmp = fdcopy(p->p_fd);
-		fdescfree(td);
-		p->p_fd = tmp;
-	} else
-		FILEDESC_XUNLOCK(p->p_fd);
+	tmp = fdcopy(p->p_fd);
+	fdescfree(td);
+	p->p_fd = tmp;
 }
 
 /*
@@ -2008,34 +2022,17 @@ fdescfree(struct thread *td)
 		if (fdtol != NULL)
 			free(fdtol, M_FILEDESC_TO_LEADER);
 	}
-	FILEDESC_XLOCK(fdp);
-	i = --fdp->fd_refcnt;
-	FILEDESC_XUNLOCK(fdp);
-	if (i > 0)
-		return;
 
-	for (i = 0; i <= fdp->fd_lastfile; i++) {
-		fp = fdp->fd_ofiles[i].fde_file;
-		if (fp != NULL) {
-			FILEDESC_XLOCK(fdp);
-			fdfree(fdp, i);
-			FILEDESC_XUNLOCK(fdp);
-			(void) closef(fp, td);
-		}
-	}
-	FILEDESC_XLOCK(fdp);
-
-	/* XXX This should happen earlier. */
 	mtx_lock(&fdesc_mtx);
 	td->td_proc->p_fd = NULL;
 	mtx_unlock(&fdesc_mtx);
 
-	if (fdp->fd_nfiles > NDFILE)
-		free(fdp->fd_ofiles, M_FILEDESC);
-	if (NDSLOTS(fdp->fd_nfiles) > NDSLOTS(NDFILE))
-		free(fdp->fd_map, M_FILEDESC);
-
-	fdp->fd_nfiles = 0;
+	FILEDESC_XLOCK(fdp);
+	i = --fdp->fd_refcnt;
+	if (i > 0) {
+		FILEDESC_XUNLOCK(fdp);
+		return;
+	}
 
 	cdir = fdp->fd_cdir;
 	fdp->fd_cdir = NULL;
@@ -2045,6 +2042,19 @@ fdescfree(struct thread *td)
 	fdp->fd_jdir = NULL;
 	FILEDESC_XUNLOCK(fdp);
 
+	for (i = 0; i <= fdp->fd_lastfile; i++) {
+		fp = fdp->fd_ofiles[i].fde_file;
+		if (fp != NULL) {
+			fdfree_last(fdp, i);
+			(void) closef(fp, td);
+		}
+	}
+
+	if (fdp->fd_nfiles > NDFILE)
+		free(fdp->fd_ofiles, M_FILEDESC);
+	if (NDSLOTS(fdp->fd_nfiles) > NDSLOTS(NDFILE))
+		free(fdp->fd_map, M_FILEDESC);
+
 	if (cdir != NULL)
 		vrele(cdir);
 	if (rdir != NULL)
@@ -2086,15 +2096,8 @@ setugidsafety(struct thread *td)
 	struct file *fp;
 	int i;
 
-	/* Certain daemons might not have file descriptors. */
 	fdp = td->td_proc->p_fd;
-	if (fdp == NULL)
-		return;
-
-	/*
-	 * Note: fdp->fd_ofiles may be reallocated out from under us while
-	 * we are blocked in a close.  Be careful!
-	 */
+	KASSERT(fdp->fd_refcnt == 1, ("the fdtable should not be shared"));
 	FILEDESC_XLOCK(fdp);
 	for (i = 0; i <= fdp->fd_lastfile; i++) {
 		if (i > 2)
@@ -2146,15 +2149,8 @@ fdcloseexec(struct thread *td)
 	struct file *fp;
 	int i;
 
-	/* Certain daemons might not have file descriptors. */
 	fdp = td->td_proc->p_fd;
-	if (fdp == NULL)
-		return;
-
-	/*
-	 * We cannot cache fd_ofiles since operations
-	 * may block and rip them out from under us.
-	 */
+	KASSERT(fdp->fd_refcnt == 1, ("the fdtable should not be shared"));
 	FILEDESC_XLOCK(fdp);
 	for (i = 0; i <= fdp->fd_lastfile; i++) {
 		fde = &fdp->fd_ofiles[i];
@@ -2185,8 +2181,6 @@ fdcheckstd(struct thread *td)
 	int i, error, devnull;
 
 	fdp = td->td_proc->p_fd;
-	if (fdp == NULL)
-		return (0);
 	KASSERT(fdp->fd_refcnt == 1, ("the fdtable should not be shared"));
 	devnull = -1;
 	error = 0;
@@ -2307,6 +2301,9 @@ int
 fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp,
     int needfcntl, struct file **fpp, cap_rights_t *haverightsp)
 {
+#ifdef CAPABILITIES
+	struct filedescent fde;
+#endif
 	struct file *fp;
 	u_int count;
 #ifdef CAPABILITIES
@@ -2329,17 +2326,22 @@ fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp,
 	 * due to preemption.
 	 */
 	for (;;) {
+#ifdef CAPABILITIES
+		fde = fdp->fd_ofiles[fd];
+		fp = fde.fde_file;
+#else
 		fp = fdp->fd_ofiles[fd].fde_file;
+#endif
 		if (fp == NULL)
 			return (EBADF);
 #ifdef CAPABILITIES
-		haverights = *cap_rights(fdp, fd);
+		haverights = *cap_rights_fde(&fde);
 		if (needrightsp != NULL) {
 			error = cap_check(&haverights, needrightsp);
 			if (error != 0)
 				return (error);
 			if (cap_rights_is_set(needrightsp, CAP_FCNTL)) {
-				error = cap_fcntl_check(fdp, fd, needfcntl);
+				error = cap_fcntl_check_fde(&fde, needfcntl);
 				if (error != 0)
 					return (error);
 			}
@@ -2918,7 +2920,7 @@ sysctl_kern_file(SYSCTL_HANDLER_ARGS)
 		if (fdp == NULL)
 			continue;
 		FILEDESC_SLOCK(fdp);
-		for (n = 0; fdp->fd_refcnt > 0 && n < fdp->fd_nfiles; ++n) {
+		for (n = 0; fdp->fd_refcnt > 0 && n <= fdp->fd_lastfile; ++n) {
 			if ((fp = fdp->fd_ofiles[n].fde_file) == NULL)
 				continue;
 			xf.xf_fd = n;
@@ -3028,7 +3030,7 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS)
 	if (fdp->fd_jdir != NULL)
 		export_vnode_for_osysctl(fdp->fd_jdir, KF_FD_TYPE_JAIL, kif,
 				fdp, req);
-	for (i = 0; fdp->fd_refcnt > 0 && i < fdp->fd_nfiles; i++) {
+	for (i = 0; fdp->fd_refcnt > 0 && i <= fdp->fd_lastfile; i++) {
 		if ((fp = fdp->fd_ofiles[i].fde_file) == NULL)
 			continue;
 		bzero(kif, sizeof(*kif));
@@ -3397,7 +3399,7 @@ kern_proc_filedesc_out(struct proc *p,  struct sbuf *sb, ssize_t maxlen)
 		export_fd_to_sb(data, KF_TYPE_VNODE, KF_FD_TYPE_JAIL,
 		    FREAD, -1, -1, NULL, efbuf);
 	}
-	for (i = 0; fdp->fd_refcnt > 0 && i < fdp->fd_nfiles; i++) {
+	for (i = 0; fdp->fd_refcnt > 0 && i <= fdp->fd_lastfile; i++) {
 		if ((fp = fdp->fd_ofiles[i].fde_file) == NULL)
 			continue;
 		data = NULL;
@@ -3768,7 +3770,7 @@ file_to_first_proc(struct file *fp)
 		fdp = p->p_fd;
 		if (fdp == NULL)
 			continue;
-		for (n = 0; n < fdp->fd_nfiles; n++) {
+		for (n = 0; n <= fdp->fd_lastfile; n++) {
 			if (fp == fdp->fd_ofiles[n].fde_file)
 				return (p);
 		}
@@ -3818,7 +3820,7 @@ DB_SHOW_COMMAND(files, db_show_files)
 			continue;
 		if ((fdp = p->p_fd) == NULL)
 			continue;
-		for (n = 0; n < fdp->fd_nfiles; ++n) {
+		for (n = 0; n <= fdp->fd_lastfile; ++n) {
 			if ((fp = fdp->fd_ofiles[n].fde_file) == NULL)
 				continue;
 			db_print_file(fp, header);
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 9615d91843cd..fc256f120525 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -523,15 +523,38 @@ knote_fork(struct knlist *list, int pid)
  * XXX: EVFILT_TIMER should perhaps live in kern_time.c beside the
  * interval timer support code.
  */
+
+#define NOTE_TIMER_PRECMASK	(NOTE_SECONDS|NOTE_MSECONDS|NOTE_USECONDS| \
+				NOTE_NSECONDS)
+
 static __inline sbintime_t
-timer2sbintime(intptr_t data)
+timer2sbintime(intptr_t data, int flags)
 {
+	sbintime_t modifier;
+
+	switch (flags & NOTE_TIMER_PRECMASK) {
+	case NOTE_SECONDS:
+		modifier = SBT_1S;
+		break;
+	case NOTE_MSECONDS: /* FALLTHROUGH */
+	case 0:
+		modifier = SBT_1MS;
+		break;
+	case NOTE_USECONDS:
+		modifier = SBT_1US;
+		break;
+	case NOTE_NSECONDS:
+		modifier = SBT_1NS;
+		break;
+	default:
+		return (-1);
+	}
 
 #ifdef __LP64__
-	if (data > SBT_MAX / SBT_1MS)
+	if (data > SBT_MAX / modifier)
 		return (SBT_MAX);
 #endif
-	return (SBT_1MS * data);
+	return (modifier * data);
 }
 
 static void
@@ -547,13 +570,13 @@ filt_timerexpire(void *knx)
 	if ((kn->kn_flags & EV_ONESHOT) != EV_ONESHOT) {
 		calloutp = (struct callout *)kn->kn_hook;
 		callout_reset_sbt_on(calloutp,
-		    timer2sbintime(kn->kn_sdata), 0 /* 1ms? */,
+		    timer2sbintime(kn->kn_sdata, kn->kn_sfflags), 0,
 		    filt_timerexpire, kn, PCPU_GET(cpuid), 0);
 	}
 }
 
 /*
- * data contains amount of time to sleep, in milliseconds
+ * data contains amount of time to sleep
  */
 static int
 filt_timerattach(struct knote *kn)
@@ -566,7 +589,11 @@ filt_timerattach(struct knote *kn)
 		return (EINVAL);
 	if ((intptr_t)kn->kn_sdata == 0 && (kn->kn_flags & EV_ONESHOT) == 0)
 		kn->kn_sdata = 1;
-	to = timer2sbintime(kn->kn_sdata);
+	/* Only precision unit are supported in flags so far */
+	if (kn->kn_sfflags & ~NOTE_TIMER_PRECMASK)
+		return (EINVAL);
+
+	to = timer2sbintime(kn->kn_sdata, kn->kn_sfflags);
 	if (to < 0)
 		return (EINVAL);
 
@@ -583,7 +610,7 @@ filt_timerattach(struct knote *kn)
 	calloutp = malloc(sizeof(*calloutp), M_KQUEUE, M_WAITOK);
 	callout_init(calloutp, CALLOUT_MPSAFE);
 	kn->kn_hook = calloutp;
-	callout_reset_sbt_on(calloutp, to, 0 /* 1ms? */,
+	callout_reset_sbt_on(calloutp, to, 0,
 	    filt_timerexpire, kn, PCPU_GET(cpuid), 0);
 
 	return (0);
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 667715e943e2..8ef082162d95 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/capsicum.h>
 #include <sys/systm.h>
-#include <sys/capsicum.h>
 #include <sys/eventhandler.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
@@ -128,8 +127,7 @@ SYSCTL_INT(_kern, OID_AUTO, disallow_high_osrel, CTLFLAG_RW,
     "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,
+SYSCTL_INT(_security_bsd, OID_AUTO, map_at_zero, CTLFLAG_RWTUN, &map_at_zero, 0,
     "Permit processes to map an object at virtual address 0.");
 
 static int
@@ -338,7 +336,7 @@ do_execve(td, args, mac_p)
 	struct proc *p = td->td_proc;
 	struct nameidata nd;
 	struct ucred *newcred = NULL, *oldcred;
-	struct uidinfo *euip;
+	struct uidinfo *euip = NULL;
 	register_t *stack_base;
 	int error, i;
 	struct image_params image_params, *imgp;
@@ -596,13 +594,13 @@ do_execve(td, args, mac_p)
 	 * For security and other reasons, the file descriptor table cannot
 	 * be shared after an exec.
 	 */
-	fdunshare(p, td);
+	fdunshare(td);
+	/* close files on exec */
+	fdcloseexec(td);
 
 	/*
 	 * Malloc things before we need locks.
 	 */
-	newcred = crget();
-	euip = uifind(attr.va_uid);
 	i = imgp->args->begin_envv - imgp->args->begin_argv;
 	/* Cache arguments if they fit inside our allowance */
 	if (ps_arg_cache_limit >= i + sizeof(struct pargs)) {
@@ -610,8 +608,6 @@ do_execve(td, args, mac_p)
 		bcopy(imgp->args->begin_argv, newargs->ar_args, i);
 	}
 
-	/* close files on exec */
-	fdcloseexec(td);
 	vn_lock(imgp->vp, LK_SHARED | LK_RETRY);
 
 	/* Get a reference to the vnode prior to locking the proc */
@@ -623,18 +619,19 @@ do_execve(td, args, mac_p)
 	 * handlers. In execsigs(), the new process will have its signals
 	 * reset.
 	 */
-	PROC_LOCK(p);
-	oldcred = crcopysafe(p, newcred);
 	if (sigacts_shared(p->p_sigacts)) {
 		oldsigacts = p->p_sigacts;
-		PROC_UNLOCK(p);
 		newsigacts = sigacts_alloc();
 		sigacts_copy(newsigacts, oldsigacts);
-		PROC_LOCK(p);
-		p->p_sigacts = newsigacts;
-	} else
+	} else {
 		oldsigacts = NULL;
+		newsigacts = NULL; /* satisfy gcc */
+	}
 
+	PROC_LOCK(p);
+	if (oldsigacts)
+		p->p_sigacts = newsigacts;
+	oldcred = p->p_ucred;
 	/* Stop profiling */
 	stopprofclock(p);
 
@@ -658,7 +655,7 @@ do_execve(td, args, mac_p)
 	 * it that it now has its own resources back
 	 */
 	p->p_flag |= P_EXEC;
-	if (p->p_pptr && (p->p_flag & P_PPWAIT)) {
+	if (p->p_flag & P_PPWAIT) {
 		p->p_flag &= ~(P_PPWAIT | P_PPTRACE);
 		cv_broadcast(&p->p_pwait);
 	}
@@ -721,9 +718,11 @@ do_execve(td, args, mac_p)
 		VOP_UNLOCK(imgp->vp, 0);
 		setugidsafety(td);
 		error = fdcheckstd(td);
-		vn_lock(imgp->vp, LK_SHARED | LK_RETRY);
 		if (error != 0)
 			goto done1;
+		newcred = crdup(oldcred);
+		euip = uifind(attr.va_uid);
+		vn_lock(imgp->vp, LK_SHARED | LK_RETRY);
 		PROC_LOCK(p);
 		/*
 		 * Set the new credentials.
@@ -748,7 +747,6 @@ do_execve(td, args, mac_p)
 		change_svuid(newcred, newcred->cr_uid);
 		change_svgid(newcred, newcred->cr_gid);
 		p->p_ucred = newcred;
-		newcred = NULL;
 	} else {
 		if (oldcred->cr_uid == oldcred->cr_ruid &&
 		    oldcred->cr_gid == oldcred->cr_rgid)
@@ -767,10 +765,14 @@ do_execve(td, args, mac_p)
 		 */
 		if (oldcred->cr_svuid != oldcred->cr_uid ||
 		    oldcred->cr_svgid != oldcred->cr_gid) {
+			PROC_UNLOCK(p);
+			VOP_UNLOCK(imgp->vp, 0);
+			newcred = crdup(oldcred);
+			vn_lock(imgp->vp, LK_SHARED | LK_RETRY);
+			PROC_LOCK(p);
 			change_svuid(newcred, newcred->cr_uid);
 			change_svgid(newcred, newcred->cr_gid);
 			p->p_ucred = newcred;
-			newcred = NULL;
 		}
 	}
 
@@ -843,16 +845,15 @@ do_execve(td, args, mac_p)
 
 	SDT_PROBE(proc, kernel, , exec__success, args->fname, 0, 0, 0, 0);
 
+	VOP_UNLOCK(imgp->vp, 0);
 done1:
 	/*
 	 * Free any resources malloc'd earlier that we didn't use.
 	 */
-	uifree(euip);
-	if (newcred == NULL)
+	if (euip != NULL)
+		uifree(euip);
+	if (newcred != NULL)
 		crfree(oldcred);
-	else
-		crfree(newcred);
-	VOP_UNLOCK(imgp->vp, 0);
 
 	/*
 	 * Handle deferred decrement of ref counts.
@@ -992,6 +993,7 @@ exec_map_first_page(imgp)
 	vm_page_xunbusy(ma[0]);
 	vm_page_lock(ma[0]);
 	vm_page_hold(ma[0]);
+	vm_page_activate(ma[0]);
 	vm_page_unlock(ma[0]);
 	VM_OBJECT_WUNLOCK(object);
 
@@ -1092,15 +1094,6 @@ exec_new_vmspace(imgp, sv)
 	if (error)
 		return (error);
 
-#ifdef __ia64__
-	/* Allocate a new register stack */
-	stack_addr = IA64_BACKINGSTORE;
-	error = vm_map_stack(map, stack_addr, (vm_size_t)ssiz,
-	    sv->sv_stackprot, VM_PROT_ALL, MAP_STACK_GROWS_UP);
-	if (error)
-		return (error);
-#endif
-
 	/*
 	 * vm_ssize and vm_maxsaddr are somewhat antiquated concepts, but they
 	 * are still used to enforce the stack rlimit on the process stack.
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index cce042813951..8dad2ad187b8 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -97,16 +97,44 @@ SDT_PROBE_DEFINE1(proc, kernel, , exit, "int");
 /* Hook for NFS teardown procedure. */
 void (*nlminfo_release_p)(struct proc *p);
 
+struct proc *
+proc_realparent(struct proc *child)
+{
+	struct proc *p, *parent;
+
+	sx_assert(&proctree_lock, SX_LOCKED);
+	if ((child->p_treeflag & P_TREE_ORPHANED) == 0) {
+		return (child->p_pptr->p_pid == child->p_oppid ?
+		    child->p_pptr : initproc);
+	}
+	for (p = child; (p->p_treeflag & P_TREE_FIRST_ORPHAN) == 0;) {
+		/* Cannot use LIST_PREV(), since the list head is not known. */
+		p = __containerof(p->p_orphan.le_prev, struct proc,
+		    p_orphan.le_next);
+		KASSERT((p->p_treeflag & P_TREE_ORPHANED) != 0,
+		    ("missing P_ORPHAN %p", p));
+	}
+	parent = __containerof(p->p_orphan.le_prev, struct proc,
+	    p_orphans.lh_first);
+	return (parent);
+}
+
 static void
 clear_orphan(struct proc *p)
 {
+	struct proc *p1;
 
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-
-	if (p->p_flag & P_ORPHAN) {
-		LIST_REMOVE(p, p_orphan);
-		p->p_flag &= ~P_ORPHAN;
+	sx_assert(&proctree_lock, SA_XLOCKED);
+	if ((p->p_treeflag & P_TREE_ORPHANED) == 0)
+		return;
+	if ((p->p_treeflag & P_TREE_FIRST_ORPHAN) != 0) {
+		p1 = LIST_NEXT(p, p_orphan);
+		if (p1 != NULL)
+			p1->p_treeflag |= P_TREE_FIRST_ORPHAN;
+		p->p_treeflag &= ~P_TREE_FIRST_ORPHAN;
 	}
+	LIST_REMOVE(p, p_orphan);
+	p->p_treeflag &= ~P_TREE_ORPHANED;
 }
 
 /*
@@ -129,9 +157,7 @@ void
 exit1(struct thread *td, int rv)
 {
 	struct proc *p, *nq, *q;
-	struct vnode *vtmp;
 	struct vnode *ttyvp = NULL;
-	struct plimit *plim;
 
 	mtx_assert(&Giant, MA_NOTOWNED);
 
@@ -377,17 +403,16 @@ exit1(struct thread *td, int rv)
 	/*
 	 * Release reference to text vnode
 	 */
-	if ((vtmp = p->p_textvp) != NULL) {
+	if (p->p_textvp != NULL) {
+		vrele(p->p_textvp);
 		p->p_textvp = NULL;
-		vrele(vtmp);
 	}
 
 	/*
 	 * Release our limits structure.
 	 */
-	plim = p->p_limit;
+	lim_free(p->p_limit);
 	p->p_limit = NULL;
-	lim_free(plim);
 
 	tidhash_remove(td);
 
@@ -775,7 +800,9 @@ proc_reap(struct thread *td, struct proc *p, int *status, int options)
 	 * If we got the child via a ptrace 'attach', we need to give it back
 	 * to the old parent.
 	 */
-	if (p->p_oppid && (t = pfind(p->p_oppid)) != NULL) {
+	if (p->p_oppid != 0) {
+		t = proc_realparent(p);
+		PROC_LOCK(t);
 		PROC_LOCK(p);
 		proc_reparent(p, t);
 		p->p_oppid = 0;
@@ -1246,8 +1273,15 @@ proc_reparent(struct proc *child, struct proc *parent)
 
 	clear_orphan(child);
 	if (child->p_flag & P_TRACED) {
-		LIST_INSERT_HEAD(&child->p_pptr->p_orphans, child, p_orphan);
-		child->p_flag |= P_ORPHAN;
+		if (LIST_EMPTY(&child->p_pptr->p_orphans)) {
+			child->p_treeflag |= P_TREE_FIRST_ORPHAN;
+			LIST_INSERT_HEAD(&child->p_pptr->p_orphans, child,
+			    p_orphan);
+		} else {
+			LIST_INSERT_AFTER(child,
+			    LIST_FIRST(&child->p_pptr->p_orphans), p_orphan);
+		}
+		child->p_treeflag |= P_TREE_ORPHANED;
 	}
 
 	child->p_pptr = parent;
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index b3d9c243f942..8135afba7e28 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -341,8 +341,8 @@ fork_norfproc(struct thread *td, int flags)
 	/*
 	 * Unshare file descriptors (from parent).
 	 */
-	if (flags & RFFDG) 
-		fdunshare(p1, td);
+	if (flags & RFFDG)
+		fdunshare(td);
 
 fail:
 	if (((p1->p_flag & (P_HADTHREADS|P_SYSTEM)) == P_HADTHREADS) &&
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index e4f1c823c88d..25032f278c1d 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -89,8 +89,7 @@ struct proc *intrproc;
 static MALLOC_DEFINE(M_ITHREAD, "ithread", "Interrupt Threads");
 
 static int intr_storm_threshold = 1000;
-TUNABLE_INT("hw.intr_storm_threshold", &intr_storm_threshold);
-SYSCTL_INT(_hw, OID_AUTO, intr_storm_threshold, CTLFLAG_RW,
+SYSCTL_INT(_hw, OID_AUTO, intr_storm_threshold, CTLFLAG_RWTUN,
     &intr_storm_threshold, 0,
     "Number of consecutive interrupts before storm protection is enabled");
 static TAILQ_HEAD(, intr_event) event_list =
@@ -295,7 +294,6 @@ intr_event_create(struct intr_event **event, void *source, int flags, int irq,
 int
 intr_event_bind(struct intr_event *ie, u_char cpu)
 {
-	cpuset_t mask;
 	lwpid_t id;
 	int error;
 
@@ -316,14 +314,9 @@ intr_event_bind(struct intr_event *ie, u_char cpu)
 	 */
 	mtx_lock(&ie->ie_lock);
 	if (ie->ie_thread != NULL) {
-		CPU_ZERO(&mask);
-		if (cpu == NOCPU)
-			CPU_COPY(cpuset_root, &mask);
-		else
-			CPU_SET(cpu, &mask);
 		id = ie->ie_thread->it_thread->td_tid;
 		mtx_unlock(&ie->ie_lock);
-		error = cpuset_setthread(id, &mask);
+		error = cpuset_setithread(id, cpu);
 		if (error)
 			return (error);
 	} else
@@ -332,14 +325,10 @@ intr_event_bind(struct intr_event *ie, u_char cpu)
 	if (error) {
 		mtx_lock(&ie->ie_lock);
 		if (ie->ie_thread != NULL) {
-			CPU_ZERO(&mask);
-			if (ie->ie_cpu == NOCPU)
-				CPU_COPY(cpuset_root, &mask);
-			else
-				CPU_SET(ie->ie_cpu, &mask);
+			cpu = ie->ie_cpu;
 			id = ie->ie_thread->it_thread->td_tid;
 			mtx_unlock(&ie->ie_lock);
-			(void)cpuset_setthread(id, &mask);
+			(void)cpuset_setithread(id, cpu);
 		} else
 			mtx_unlock(&ie->ie_lock);
 		return (error);
diff --git a/sys/kern/kern_ktr.c b/sys/kern/kern_ktr.c
index e302ae228d45..2a405936320d 100644
--- a/sys/kern/kern_ktr.c
+++ b/sys/kern/kern_ktr.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/alq.h>
 #include <sys/cons.h>
 #include <sys/cpuset.h>
+#include <sys/kdb.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/libkern.h>
@@ -102,11 +103,6 @@ int	ktr_version = KTR_VERSION;
 struct	ktr_entry ktr_buf_init[KTR_BOOT_ENTRIES];
 struct	ktr_entry *ktr_buf = ktr_buf_init;
 cpuset_t ktr_cpumask = CPUSET_T_INITIALIZER(KTR_CPUMASK);
-static char ktr_cpumask_str[CPUSETBUFSIZ];
-
-TUNABLE_INT("debug.ktr.mask", &ktr_mask);
-
-TUNABLE_STR("debug.ktr.cpumask", ktr_cpumask_str, sizeof(ktr_cpumask_str));
 
 static SYSCTL_NODE(_debug, OID_AUTO, ktr, CTLFLAG_RD, 0, "KTR options");
 
@@ -116,21 +112,6 @@ SYSCTL_INT(_debug_ktr, OID_AUTO, version, CTLFLAG_RD,
 SYSCTL_UINT(_debug_ktr, OID_AUTO, compile, CTLFLAG_RD,
     &ktr_compile, 0, "Bitmask of KTR event classes compiled into the kernel");
 
-static void
-ktr_cpumask_initializer(void *dummy __unused)
-{
-
-	/*
-	 * TUNABLE_STR() runs with SI_ORDER_MIDDLE priority, thus it must be
-	 * already set, if necessary.
-	 */
-	if (ktr_cpumask_str[0] != '\0' &&
-	    cpusetobj_strscan(&ktr_cpumask, ktr_cpumask_str) == -1)
-		CPU_FILL(&ktr_cpumask);
-}
-SYSINIT(ktr_cpumask_initializer, SI_SUB_TUNABLES, SI_ORDER_ANY,
-    ktr_cpumask_initializer, NULL);
-
 static int
 sysctl_debug_ktr_cpumask(SYSCTL_HANDLER_ARGS)
 {
@@ -150,7 +131,7 @@ sysctl_debug_ktr_cpumask(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 SYSCTL_PROC(_debug_ktr, OID_AUTO, cpumask,
-    CTLFLAG_RW | CTLFLAG_MPSAFE | CTLTYPE_STRING, NULL, 0,
+    CTLFLAG_RWTUN | CTLFLAG_MPSAFE | CTLTYPE_STRING, NULL, 0,
     sysctl_debug_ktr_cpumask, "S",
     "Bitmask of CPUs on which KTR logging is enabled");
 
@@ -191,7 +172,7 @@ sysctl_debug_ktr_mask(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 
-SYSCTL_PROC(_debug_ktr, OID_AUTO, mask, CTLTYPE_UINT|CTLFLAG_RW, 0, 0,
+SYSCTL_PROC(_debug_ktr, OID_AUTO, mask, CTLTYPE_UINT|CTLFLAG_RWTUN, 0, 0,
     sysctl_debug_ktr_mask, "IU",
     "Bitmask of KTR event classes for which logging is enabled");
 
@@ -343,7 +324,7 @@ ktr_tracepoint(u_int mask, const char *file, int line, const char *format,
 #endif
 	int cpu;
 
-	if (panicstr)
+	if (panicstr || kdb_active)
 		return;
 	if ((ktr_mask & mask) == 0 || ktr_buf == NULL)
 		return;
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index b74d48ecffb8..367610b34a3a 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -133,8 +133,7 @@ static u_int ktr_requestpool = KTRACE_REQUEST_POOL;
 TUNABLE_INT("kern.ktrace.request_pool", &ktr_requestpool);
 
 static u_int ktr_geniosize = PAGE_SIZE;
-TUNABLE_INT("kern.ktrace.genio_size", &ktr_geniosize);
-SYSCTL_UINT(_kern_ktrace, OID_AUTO, genio_size, CTLFLAG_RW, &ktr_geniosize,
+SYSCTL_UINT(_kern_ktrace, OID_AUTO, genio_size, CTLFLAG_RWTUN, &ktr_geniosize,
     0, "Maximum size of genio event payload");
 
 static int print_message = 1;
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index e379f5f89f95..dbc0fb30974d 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -66,9 +66,8 @@ __FBSDID("$FreeBSD$");
 
 #ifdef KLD_DEBUG
 int kld_debug = 0;
-SYSCTL_INT(_debug, OID_AUTO, kld_debug, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_debug, OID_AUTO, kld_debug, CTLFLAG_RWTUN,
     &kld_debug, 0, "Set various levels of KLD debug");
-TUNABLE_INT("debug.kld_debug", &kld_debug);
 #endif
 
 /*
@@ -1643,7 +1642,7 @@ SYSINIT(preload, SI_SUB_KLD, SI_ORDER_MIDDLE, linker_preload, 0);
 static char linker_hintfile[] = "linker.hints";
 static char linker_path[MAXPATHLEN] = "/boot/kernel;/boot/modules";
 
-SYSCTL_STRING(_kern, OID_AUTO, module_path, CTLFLAG_RW, linker_path,
+SYSCTL_STRING(_kern, OID_AUTO, module_path, CTLFLAG_RWTUN, linker_path,
     sizeof(linker_path), "module load search path");
 
 TUNABLE_STR("module_path", linker_path, sizeof(linker_path));
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index 6d6dc51b80db..8d5c57681fe3 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -469,6 +469,9 @@ lf_advlockasync(struct vop_advlockasync_args *ap, struct lockf **statep,
 			return (EOVERFLOW);
 		end = start + oadd;
 	}
+
+retry_setlock:
+
 	/*
 	 * Avoid the common case of unlocking when inode has no locks.
 	 */
@@ -744,6 +747,11 @@ lf_advlockasync(struct vop_advlockasync_args *ap, struct lockf **statep,
 		sx_destroy(&freestate->ls_lock);
 		free(freestate, M_LOCKF);
 	}
+
+	if (error == EDOOFUS) {
+		KASSERT(ap->a_op == F_SETLK, ("EDOOFUS"));
+		goto retry_setlock;
+	}
 	return (error);
 }
 
@@ -1459,7 +1467,7 @@ lf_setlock(struct lockf *state, struct lockf_entry *lock, struct vnode *vp,
 		lock->lf_refs++;
 		error = sx_sleep(lock, &state->ls_lock, priority, lockstr, 0);
 		if (lf_free_lock(lock)) {
-			error = EINTR;
+			error = EDOOFUS;
 			goto out;
 		}
 
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 658908c65634..464303a0fa42 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -236,9 +236,8 @@ static SYSCTL_NODE(_debug, OID_AUTO, malloc, CTLFLAG_RD, 0,
 static int malloc_failure_rate;
 static int malloc_nowait_count;
 static int malloc_failure_count;
-SYSCTL_INT(_debug_malloc, OID_AUTO, failure_rate, CTLFLAG_RW,
+SYSCTL_INT(_debug_malloc, OID_AUTO, failure_rate, CTLFLAG_RWTUN,
     &malloc_failure_rate, 0, "Every (n) mallocs with M_NOWAIT will fail");
-TUNABLE_INT("debug.malloc.failure_rate", &malloc_failure_rate);
 SYSCTL_INT(_debug_malloc, OID_AUTO, failure_count, CTLFLAG_RD,
     &malloc_failure_count, 0, "Number of imposed M_NOWAIT malloc failures");
 #endif
@@ -280,7 +279,7 @@ tunable_set_numzones(void)
 		numzones = MALLOC_DEBUG_MAXZONES;
 }
 SYSINIT(numzones, SI_SUB_TUNABLES, SI_ORDER_ANY, tunable_set_numzones, NULL);
-SYSCTL_INT(_debug_malloc, OID_AUTO, numzones, CTLFLAG_RDTUN,
+SYSCTL_INT(_debug_malloc, OID_AUTO, numzones, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
     &numzones, 0, "Number of malloc uma subzones");
 
 /*
@@ -693,8 +692,21 @@ CTASSERT(VM_KMEM_SIZE_SCALE >= 1);
 void
 kmeminit(void)
 {
-	u_long mem_size, tmp;
+	u_long mem_size;
+	u_long tmp;
 
+#ifdef VM_KMEM_SIZE
+	if (vm_kmem_size == 0)
+		vm_kmem_size = VM_KMEM_SIZE;
+#endif
+#ifdef VM_KMEM_SIZE_MIN
+	if (vm_kmem_size_min == 0)
+		vm_kmem_size_min = VM_KMEM_SIZE_MIN;
+#endif
+#ifdef VM_KMEM_SIZE_MAX
+	if (vm_kmem_size_max == 0)
+		vm_kmem_size_max = VM_KMEM_SIZE_MAX;
+#endif
 	/*
 	 * Calculate the amount of kernel virtual address (KVA) space that is
 	 * preallocated to the kmem arena.  In order to support a wide range
@@ -713,38 +725,29 @@ kmeminit(void)
 	 */
 	mem_size = vm_cnt.v_page_count;
 
-	vm_kmem_size_scale = VM_KMEM_SIZE_SCALE;
-	TUNABLE_INT_FETCH("vm.kmem_size_scale", &vm_kmem_size_scale);
 	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;
+	/*
+	 * Check if we should use defaults for the "vm_kmem_size"
+	 * variable:
+	 */
+	if (vm_kmem_size == 0) {
+		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)
-		vm_kmem_size = vm_kmem_size_min;
-
-#if defined(VM_KMEM_SIZE_MAX)
-	vm_kmem_size_max = VM_KMEM_SIZE_MAX;
-#endif
-	TUNABLE_ULONG_FETCH("vm.kmem_size_max", &vm_kmem_size_max);
-	if (vm_kmem_size_max > 0 && vm_kmem_size >= vm_kmem_size_max)
-		vm_kmem_size = vm_kmem_size_max;
+		if (vm_kmem_size_min > 0 && vm_kmem_size < vm_kmem_size_min)
+			vm_kmem_size = vm_kmem_size_min;
+		if (vm_kmem_size_max > 0 && vm_kmem_size >= vm_kmem_size_max)
+			vm_kmem_size = vm_kmem_size_max;
+	}
 
 	/*
-	 * Alternatively, the amount of KVA space that is preallocated to the
+	 * 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;
 
@@ -811,7 +814,7 @@ mallocinit(void *dummy)
 		
 	}
 }
-SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, mallocinit, NULL);
+SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_SECOND, mallocinit, NULL);
 
 void
 malloc_init(void *data)
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c
index 119e4b832525..00cc93298f30 100644
--- a/sys/kern/kern_mbuf.c
+++ b/sys/kern/kern_mbuf.c
@@ -105,7 +105,7 @@ int nmbjumbo16;			/* limits number of 16k jumbo clusters */
 
 static quad_t maxmbufmem;	/* overall real memory limit for all mbufs */
 
-SYSCTL_QUAD(_kern_ipc, OID_AUTO, maxmbufmem, CTLFLAG_RDTUN, &maxmbufmem, 0,
+SYSCTL_QUAD(_kern_ipc, OID_AUTO, maxmbufmem, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &maxmbufmem, 0,
     "Maximum real memory allocatable to various mbuf types");
 
 /*
@@ -449,7 +449,6 @@ mb_dtor_mbuf(void *mem, int size, void *arg)
 
 	if ((m->m_flags & M_PKTHDR) && !SLIST_EMPTY(&m->m_pkthdr.tags))
 		m_tag_delete_chain(m, NULL);
-	KASSERT((m->m_flags & M_EXT) == 0, ("%s: M_EXT set", __func__));
 	KASSERT((m->m_flags & M_NOFREE) == 0, ("%s: M_NOFREE set", __func__));
 #ifdef INVARIANTS
 	trash_dtor(mem, size, arg);
@@ -476,7 +475,7 @@ mb_dtor_pack(void *mem, int size, void *arg)
 	KASSERT(m->m_ext.ext_arg2 == NULL, ("%s: ext_arg2 != NULL", __func__));
 	KASSERT(m->m_ext.ext_size == MCLBYTES, ("%s: ext_size != MCLBYTES", __func__));
 	KASSERT(m->m_ext.ext_type == EXT_PACKET, ("%s: ext_type != EXT_PACKET", __func__));
-	KASSERT(*m->m_ext.ref_cnt == 1, ("%s: ref_cnt != 1", __func__));
+	KASSERT(*m->m_ext.ext_cnt == 1, ("%s: ext_cnt != 1", __func__));
 #ifdef INVARIANTS
 	trash_dtor(m->m_ext.ext_buf, MCLBYTES, arg);
 #endif
@@ -548,7 +547,7 @@ mb_ctor_clust(void *mem, int size, void *arg, int how)
 		m->m_ext.ext_size = size;
 		m->m_ext.ext_type = type;
 		m->m_ext.ext_flags = 0;
-		m->m_ext.ref_cnt = refcnt;
+		m->m_ext.ext_cnt = refcnt;
 	}
 
 	return (0);
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index 213482b42c91..9d3153b4a5bb 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -55,35 +55,35 @@ __FBSDID("$FreeBSD$");
 #include <sys/sx.h>
 #include <sys/unistd.h>
 
-SYSCTL_NODE(, 0,	  sysctl, CTLFLAG_RW, 0,
+SYSCTL_ROOT_NODE(0,	  sysctl, CTLFLAG_RW, 0,
 	"Sysctl internal magic");
-SYSCTL_NODE(, CTL_KERN,	  kern,   CTLFLAG_RW|CTLFLAG_CAPRD, 0,
+SYSCTL_ROOT_NODE(CTL_KERN,	  kern,   CTLFLAG_RW|CTLFLAG_CAPRD, 0,
 	"High kernel, proc, limits &c");
-SYSCTL_NODE(, CTL_VM,	  vm,     CTLFLAG_RW, 0,
+SYSCTL_ROOT_NODE(CTL_VM,	  vm,     CTLFLAG_RW, 0,
 	"Virtual memory");
-SYSCTL_NODE(, CTL_VFS,	  vfs,     CTLFLAG_RW, 0,
+SYSCTL_ROOT_NODE(CTL_VFS,	  vfs,     CTLFLAG_RW, 0,
 	"File system");
-SYSCTL_NODE(, CTL_NET,	  net,    CTLFLAG_RW, 0,
+SYSCTL_ROOT_NODE(CTL_NET,	  net,    CTLFLAG_RW, 0,
 	"Network, (see socket.h)");
-SYSCTL_NODE(, CTL_DEBUG,  debug,  CTLFLAG_RW, 0,
+SYSCTL_ROOT_NODE(CTL_DEBUG,  debug,  CTLFLAG_RW, 0,
 	"Debugging");
 SYSCTL_NODE(_debug, OID_AUTO,  sizeof,  CTLFLAG_RW, 0,
 	"Sizeof various things");
-SYSCTL_NODE(, CTL_HW,	  hw,     CTLFLAG_RW, 0,
+SYSCTL_ROOT_NODE(CTL_HW,	  hw,     CTLFLAG_RW, 0,
 	"hardware");
-SYSCTL_NODE(, CTL_MACHDEP, machdep, CTLFLAG_RW, 0,
+SYSCTL_ROOT_NODE(CTL_MACHDEP, machdep, CTLFLAG_RW, 0,
 	"machine dependent");
-SYSCTL_NODE(, CTL_USER,	  user,   CTLFLAG_RW, 0,
+SYSCTL_ROOT_NODE(CTL_USER,	  user,   CTLFLAG_RW, 0,
 	"user-level");
-SYSCTL_NODE(, CTL_P1003_1B,  p1003_1b,   CTLFLAG_RW, 0,
+SYSCTL_ROOT_NODE(CTL_P1003_1B,  p1003_1b,   CTLFLAG_RW, 0,
 	"p1003_1b, (see p1003_1b.h)");
 
-SYSCTL_NODE(, OID_AUTO,  compat, CTLFLAG_RW, 0,
+SYSCTL_ROOT_NODE(OID_AUTO,  compat, CTLFLAG_RW, 0,
 	"Compatibility code");
-SYSCTL_NODE(, OID_AUTO, security, CTLFLAG_RW, 0, 
+SYSCTL_ROOT_NODE(OID_AUTO, security, CTLFLAG_RW, 0, 
      	"Security");
 #ifdef REGRESSION
-SYSCTL_NODE(, OID_AUTO, regression, CTLFLAG_RW, 0,
+SYSCTL_ROOT_NODE(OID_AUTO, regression, CTLFLAG_RW, 0,
      "Regression test MIB");
 #endif
 
@@ -112,13 +112,13 @@ SYSCTL_STRING(_kern, KERN_OSTYPE, ostype, CTLFLAG_RD|CTLFLAG_MPSAFE|
 SYSCTL_INT(_kern, KERN_OSRELDATE, osreldate, CTLFLAG_RD|CTLFLAG_CAPRD,
     &osreldate, 0, "Kernel release date");
 
-SYSCTL_INT(_kern, KERN_MAXPROC, maxproc, CTLFLAG_RDTUN,
+SYSCTL_INT(_kern, KERN_MAXPROC, maxproc, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
     &maxproc, 0, "Maximum number of processes");
 
 SYSCTL_INT(_kern, KERN_MAXPROCPERUID, maxprocperuid, CTLFLAG_RW,
     &maxprocperuid, 0, "Maximum processes allowed per userid");
 
-SYSCTL_INT(_kern, OID_AUTO, maxusers, CTLFLAG_RDTUN,
+SYSCTL_INT(_kern, OID_AUTO, maxusers, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
     &maxusers, 0, "Hint for kernel tuning");
 
 SYSCTL_INT(_kern, KERN_ARGMAX, argmax, CTLFLAG_RD|CTLFLAG_CAPRD,
@@ -127,8 +127,8 @@ SYSCTL_INT(_kern, KERN_ARGMAX, argmax, CTLFLAG_RD|CTLFLAG_CAPRD,
 SYSCTL_INT(_kern, KERN_POSIX1, posix1version, CTLFLAG_RD|CTLFLAG_CAPRD,
     0, _POSIX_VERSION, "Version of POSIX attempting to comply to");
 
-SYSCTL_INT(_kern, KERN_NGROUPS, ngroups, CTLFLAG_RDTUN|CTLFLAG_CAPRD,
-    &ngroups_max, 0,
+SYSCTL_INT(_kern, KERN_NGROUPS, ngroups, CTLFLAG_RDTUN |
+    CTLFLAG_NOFETCH | CTLFLAG_CAPRD, &ngroups_max, 0,
     "Maximum number of supplemental groups a user can belong to");
 
 SYSCTL_INT(_kern, KERN_JOB_CONTROL, job_control, CTLFLAG_RD|CTLFLAG_CAPRD,
@@ -526,9 +526,9 @@ sysctl_kern_pid_max(SYSCTL_HANDLER_ARGS)
 	sx_xunlock(&proctree_lock);
 	return (error);
 }
-SYSCTL_PROC(_kern, OID_AUTO, pid_max, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_TUN |
-    CTLFLAG_MPSAFE, 0, 0, sysctl_kern_pid_max, "I",
-    "Maximum allowed pid");
+SYSCTL_PROC(_kern, OID_AUTO, pid_max, CTLTYPE_INT |
+    CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE,
+    0, 0, sysctl_kern_pid_max, "I", "Maximum allowed pid");
 
 #include <sys/bio.h>
 #include <sys/buf.h>
diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c
index 7c95575293d4..638cd53332aa 100644
--- a/sys/kern/kern_ntptime.c
+++ b/sys/kern/kern_ntptime.c
@@ -1025,18 +1025,20 @@ sysctl_resettodr_period(SYSCTL_HANDLER_ARGS)
 	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
 	if (error || !req->newptr)
 		return (error);
+	if (cold)
+		goto done;
 	if (resettodr_period == 0)
 		callout_stop(&resettodr_callout);
 	else
 		callout_reset(&resettodr_callout, resettodr_period * hz,
 		    periodic_resettodr, NULL);
+done:
 	return (0);
 }
 
-SYSCTL_PROC(_machdep, OID_AUTO, rtc_save_period, CTLTYPE_INT|CTLFLAG_RW,
+SYSCTL_PROC(_machdep, OID_AUTO, rtc_save_period, CTLTYPE_INT|CTLFLAG_RWTUN,
 	&resettodr_period, 1800, sysctl_resettodr_period, "I",
 	"Save system time to RTC with this period (in seconds)");
-TUNABLE_INT("machdep.rtc_save_period", &resettodr_period);
 
 static void
 start_periodic_resettodr(void *arg __unused)
diff --git a/sys/kern/kern_osd.c b/sys/kern/kern_osd.c
index 184c4f00ba08..cc9bed1fab3d 100644
--- a/sys/kern/kern_osd.c
+++ b/sys/kern/kern_osd.c
@@ -47,8 +47,7 @@ __FBSDID("$FreeBSD$");
 static MALLOC_DEFINE(M_OSD, "osd", "Object Specific Data");
 
 static int osd_debug = 0;
-TUNABLE_INT("debug.osd", &osd_debug);
-SYSCTL_INT(_debug, OID_AUTO, osd, CTLFLAG_RW, &osd_debug, 0, "OSD debug level");
+SYSCTL_INT(_debug, OID_AUTO, osd, CTLFLAG_RWTUN, &osd_debug, 0, "OSD debug level");
 
 #define	OSD_DEBUG(...)	do {						\
 	if (osd_debug) {						\
diff --git a/sys/kern/kern_pmc.c b/sys/kern/kern_pmc.c
index 2b50be0343fc..09dc6edbcffe 100644
--- a/sys/kern/kern_pmc.c
+++ b/sys/kern/kern_pmc.c
@@ -96,8 +96,7 @@ struct trapframe pmc_tf[MAXCPU];
 SYSCTL_NODE(_kern, OID_AUTO, hwpmc, CTLFLAG_RW, 0, "HWPMC parameters");
 
 static int pmc_softevents = 16;
-TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "softevents", &pmc_softevents);
-SYSCTL_INT(_kern_hwpmc, OID_AUTO, softevents, CTLFLAG_TUN|CTLFLAG_RD,
+SYSCTL_INT(_kern_hwpmc, OID_AUTO, softevents, CTLFLAG_RDTUN,
     &pmc_softevents, 0, "maximum number of soft events");
 
 struct mtx pmc_softs_mtx;
diff --git a/sys/kern/kern_priv.c b/sys/kern/kern_priv.c
index 2daa5c29fe42..4b9a4443de3a 100644
--- a/sys/kern/kern_priv.c
+++ b/sys/kern/kern_priv.c
@@ -53,14 +53,12 @@ __FBSDID("$FreeBSD$");
  * the consequences.
  */
 static int	suser_enabled = 1;
-SYSCTL_INT(_security_bsd, OID_AUTO, suser_enabled, CTLFLAG_RW,
+SYSCTL_INT(_security_bsd, OID_AUTO, suser_enabled, CTLFLAG_RWTUN,
     &suser_enabled, 0, "processes with uid 0 have privilege");
-TUNABLE_INT("security.bsd.suser_enabled", &suser_enabled);
 
 static int	unprivileged_mlock = 1;
-SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_mlock, CTLFLAG_RW|CTLFLAG_TUN,
+SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_mlock, CTLFLAG_RWTUN,
     &unprivileged_mlock, 0, "Allow non-root users to call mlock(2)");
-TUNABLE_INT("security.bsd.unprivileged_mlock", &unprivileged_mlock);
 
 SDT_PROVIDER_DEFINE(priv);
 SDT_PROBE_DEFINE1(priv, kernel, priv_check, priv__ok, "int");
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index e38d01169498..668918618b36 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -141,6 +141,10 @@ uma_zone_t proc_zone;
 int kstack_pages = KSTACK_PAGES;
 SYSCTL_INT(_kern, OID_AUTO, kstack_pages, CTLFLAG_RD, &kstack_pages, 0,
     "Kernel stack size in pages");
+static int vmmap_skip_res_cnt = 0;
+SYSCTL_INT(_kern, OID_AUTO, proc_vmmap_skip_resident_count, CTLFLAG_RW,
+    &vmmap_skip_res_cnt, 0,
+    "Skip calculation of the pages resident count in kern.proc.vmmap");
 
 CTASSERT(sizeof(struct kinfo_proc) == KINFO_PROC_SIZE);
 #ifdef COMPAT_FREEBSD32
@@ -259,14 +263,15 @@ proc_fini(void *mem, int size)
  * Is p an inferior of the current process?
  */
 int
-inferior(p)
-	register struct proc *p;
+inferior(struct proc *p)
 {
 
 	sx_assert(&proctree_lock, SX_LOCKED);
-	for (; p != curproc; p = p->p_pptr)
+	PROC_LOCK_ASSERT(p, MA_OWNED);
+	for (; p != curproc; p = proc_realparent(p)) {
 		if (p->p_pid == 0)
 			return (0);
+	}
 	return (1);
 }
 
@@ -2129,6 +2134,66 @@ sysctl_kern_proc_ovmmap(SYSCTL_HANDLER_ARGS)
 CTASSERT(sizeof(struct kinfo_vmentry) == KINFO_VMENTRY_SIZE);
 #endif
 
+static void
+kern_proc_vmmap_resident(vm_map_t map, vm_map_entry_t entry,
+    struct kinfo_vmentry *kve)
+{
+	vm_object_t obj, tobj;
+	vm_page_t m, m_adv;
+	vm_offset_t addr;
+	vm_paddr_t locked_pa;
+	vm_pindex_t pi, pi_adv, pindex;
+
+	locked_pa = 0;
+	obj = entry->object.vm_object;
+	addr = entry->start;
+	m_adv = NULL;
+	pi = OFF_TO_IDX(entry->offset);
+	for (; addr < entry->end; addr += IDX_TO_OFF(pi_adv), pi += pi_adv) {
+		if (m_adv != NULL) {
+			m = m_adv;
+		} else {
+			pi_adv = OFF_TO_IDX(entry->end - addr);
+			pindex = pi;
+			for (tobj = obj;; tobj = tobj->backing_object) {
+				m = vm_page_find_least(tobj, pindex);
+				if (m != NULL) {
+					if (m->pindex == pindex)
+						break;
+					if (pi_adv > m->pindex - pindex) {
+						pi_adv = m->pindex - pindex;
+						m_adv = m;
+					}
+				}
+				if (tobj->backing_object == NULL)
+					goto next;
+				pindex += OFF_TO_IDX(tobj->
+				    backing_object_offset);
+			}
+		}
+		m_adv = NULL;
+		if (m->psind != 0 && addr + pagesizes[1] <= entry->end &&
+		    (addr & (pagesizes[1] - 1)) == 0 &&
+		    (pmap_mincore(map->pmap, addr, &locked_pa) &
+		    MINCORE_SUPER) != 0) {
+			kve->kve_flags |= KVME_FLAG_SUPER;
+			pi_adv = OFF_TO_IDX(pagesizes[1]);
+		} else {
+			/*
+			 * We do not test the found page on validity.
+			 * Either the page is busy and being paged in,
+			 * or it was invalidated.  The first case
+			 * should be counted as resident, the second
+			 * is not so clear; we do account both.
+			 */
+			pi_adv = 1;
+		}
+		kve->kve_resident += pi_adv;
+next:;
+	}
+	PA_UNLOCK_COND(locked_pa);
+}
+
 /*
  * Must be called with the process locked and will return unlocked.
  */
@@ -2136,15 +2201,17 @@ int
 kern_proc_vmmap_out(struct proc *p, struct sbuf *sb)
 {
 	vm_map_entry_t entry, tmp_entry;
-	unsigned int last_timestamp;
+	struct vattr va;
+	vm_map_t map;
+	vm_object_t obj, tobj, lobj;
 	char *fullpath, *freepath;
 	struct kinfo_vmentry *kve;
-	struct vattr va;
 	struct ucred *cred;
-	int error;
 	struct vnode *vp;
 	struct vmspace *vm;
-	vm_map_t map;
+	vm_offset_t addr;
+	unsigned int last_timestamp;
+	int error;
 
 	PROC_LOCK_ASSERT(p, MA_OWNED);
 
@@ -2162,44 +2229,30 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb)
 	vm_map_lock_read(map);
 	for (entry = map->header.next; entry != &map->header;
 	    entry = entry->next) {
-		vm_object_t obj, tobj, lobj;
-		vm_offset_t addr;
-		vm_paddr_t locked_pa;
-		int mincoreinfo;
-
 		if (entry->eflags & MAP_ENTRY_IS_SUB_MAP)
 			continue;
 
+		addr = entry->end;
 		bzero(kve, sizeof(*kve));
-
-		kve->kve_private_resident = 0;
 		obj = entry->object.vm_object;
 		if (obj != NULL) {
-			VM_OBJECT_RLOCK(obj);
-			if (obj->shadow_count == 1)
+			for (tobj = obj; tobj != NULL;
+			    tobj = tobj->backing_object) {
+				VM_OBJECT_RLOCK(tobj);
+				lobj = tobj;
+			}
+			if (obj->backing_object == NULL)
 				kve->kve_private_resident =
 				    obj->resident_page_count;
-		}
-		kve->kve_resident = 0;
-		addr = entry->start;
-		while (addr < entry->end) {
-			locked_pa = 0;
-			mincoreinfo = pmap_mincore(map->pmap, addr, &locked_pa);
-			if (locked_pa != 0)
-				vm_page_unlock(PHYS_TO_VM_PAGE(locked_pa));
-			if (mincoreinfo & MINCORE_INCORE)
-				kve->kve_resident++;
-			if (mincoreinfo & MINCORE_SUPER)
-				kve->kve_flags |= KVME_FLAG_SUPER;
-			addr += PAGE_SIZE;
-		}
-
-		for (lobj = tobj = obj; tobj; tobj = tobj->backing_object) {
-			if (tobj != obj)
-				VM_OBJECT_RLOCK(tobj);
-			if (lobj != obj)
-				VM_OBJECT_RUNLOCK(lobj);
-			lobj = tobj;
+			if (!vmmap_skip_res_cnt)
+				kern_proc_vmmap_resident(map, entry, kve);
+			for (tobj = obj; tobj != NULL;
+			    tobj = tobj->backing_object) {
+				if (tobj != obj && tobj != lobj)
+					VM_OBJECT_RUNLOCK(tobj);
+			}
+		} else {
+			lobj = NULL;
 		}
 
 		kve->kve_start = entry->start;
@@ -2229,7 +2282,7 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb)
 
 		freepath = NULL;
 		fullpath = "";
-		if (lobj) {
+		if (lobj != NULL) {
 			vp = NULL;
 			switch (lobj->type) {
 			case OBJT_DEFAULT:
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 4700e68e53c3..dfdca15194aa 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -90,10 +90,9 @@ __FBSDID("$FreeBSD$");
 #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,
+SYSCTL_INT(_kern, OID_AUTO, panic_reboot_wait_time, CTLFLAG_RWTUN,
     &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
@@ -108,9 +107,8 @@ int debugger_on_panic = 0;
 int debugger_on_panic = 1;
 #endif
 SYSCTL_INT(_debug, OID_AUTO, debugger_on_panic,
-    CTLFLAG_RW | CTLFLAG_SECURE | CTLFLAG_TUN,
+    CTLFLAG_RWTUN | CTLFLAG_SECURE,
     &debugger_on_panic, 0, "Run debugger on kernel panic");
-TUNABLE_INT("debug.debugger_on_panic", &debugger_on_panic);
 
 #ifdef KDB_TRACE
 static int trace_on_panic = 1;
@@ -118,15 +116,13 @@ static int trace_on_panic = 1;
 static int trace_on_panic = 0;
 #endif
 SYSCTL_INT(_debug, OID_AUTO, trace_on_panic,
-    CTLFLAG_RW | CTLFLAG_SECURE | CTLFLAG_TUN,
+    CTLFLAG_RWTUN | CTLFLAG_SECURE,
     &trace_on_panic, 0, "Print stack trace on kernel panic");
-TUNABLE_INT("debug.trace_on_panic", &trace_on_panic);
 #endif /* KDB */
 
 static int sync_on_panic = 0;
-SYSCTL_INT(_kern, OID_AUTO, sync_on_panic, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_kern, OID_AUTO, sync_on_panic, CTLFLAG_RWTUN,
 	&sync_on_panic, 0, "Do a sync before rebooting from a panic");
-TUNABLE_INT("kern.sync_on_panic", &sync_on_panic);
 
 static SYSCTL_NODE(_kern, OID_AUTO, shutdown, CTLFLAG_RW, 0,
     "Shutdown environment");
@@ -253,7 +249,9 @@ int
 doadump(boolean_t textdump)
 {
 	boolean_t coredump;
+	int error;
 
+	error = 0;
 	if (dumping)
 		return (EBUSY);
 	if (dumper.dumper == NULL)
@@ -271,10 +269,10 @@ doadump(boolean_t textdump)
 	}
 #endif
 	if (coredump)
-		dumpsys(&dumper);
+		error = dumpsys(&dumper);
 
 	dumping--;
-	return (0);
+	return (error);
 }
 
 static int
@@ -559,43 +557,35 @@ static int kassert_warnings = 0;
 
 SYSCTL_NODE(_debug, OID_AUTO, kassert, CTLFLAG_RW, NULL, "kassert options");
 
-SYSCTL_INT(_debug_kassert, OID_AUTO, warn_only, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_debug_kassert, OID_AUTO, warn_only, CTLFLAG_RWTUN,
     &kassert_warn_only, 0,
     "KASSERT triggers a panic (1) or just a warning (0)");
-TUNABLE_INT("debug.kassert.warn_only", &kassert_warn_only);
 
 #ifdef KDB
-SYSCTL_INT(_debug_kassert, OID_AUTO, do_kdb, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_debug_kassert, OID_AUTO, do_kdb, CTLFLAG_RWTUN,
     &kassert_do_kdb, 0, "KASSERT will enter the debugger");
-TUNABLE_INT("debug.kassert.do_kdb", &kassert_do_kdb);
 #endif
 
 #ifdef KTR
-SYSCTL_UINT(_debug_kassert, OID_AUTO, do_ktr, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_UINT(_debug_kassert, OID_AUTO, do_ktr, CTLFLAG_RWTUN,
     &kassert_do_ktr, 0,
     "KASSERT does a KTR, set this to the KTRMASK you want");
-TUNABLE_INT("debug.kassert.do_ktr", &kassert_do_ktr);
 #endif
 
-SYSCTL_INT(_debug_kassert, OID_AUTO, do_log, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_debug_kassert, OID_AUTO, do_log, CTLFLAG_RWTUN,
     &kassert_do_log, 0, "KASSERT triggers a panic (1) or just a warning (0)");
-TUNABLE_INT("debug.kassert.do_log", &kassert_do_log);
 
-SYSCTL_INT(_debug_kassert, OID_AUTO, warnings, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_debug_kassert, OID_AUTO, warnings, CTLFLAG_RWTUN,
     &kassert_warnings, 0, "number of KASSERTs that have been triggered");
-TUNABLE_INT("debug.kassert.warnings", &kassert_warnings);
 
-SYSCTL_INT(_debug_kassert, OID_AUTO, log_panic_at, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_debug_kassert, OID_AUTO, log_panic_at, CTLFLAG_RWTUN,
     &kassert_log_panic_at, 0, "max number of KASSERTS before we will panic");
-TUNABLE_INT("debug.kassert.log_panic_at", &kassert_log_panic_at);
 
-SYSCTL_INT(_debug_kassert, OID_AUTO, log_pps_limit, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_debug_kassert, OID_AUTO, log_pps_limit, CTLFLAG_RWTUN,
     &kassert_log_pps_limit, 0, "limit number of log messages per second");
-TUNABLE_INT("debug.kassert.log_pps_limit", &kassert_log_pps_limit);
 
-SYSCTL_INT(_debug_kassert, OID_AUTO, log_mute_at, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_debug_kassert, OID_AUTO, log_mute_at, CTLFLAG_RWTUN,
     &kassert_log_mute_at, 0, "max number of KASSERTS to log");
-TUNABLE_INT("debug.kassert.log_mute_at", &kassert_log_mute_at);
 
 static int kassert_sysctl_kassert(SYSCTL_HANDLER_ARGS);
 
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index b405779905f6..561ea0a125b7 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
+#include <sys/refcount.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/procdesc.h>
@@ -136,8 +137,7 @@ SYSCTL_INT(_kern_sigqueue, OID_AUTO, max_pending_per_proc, CTLFLAG_RW,
     &max_pending_per_proc, 0, "Max pending signals per proc");
 
 static int	preallocate_siginfo = 1024;
-TUNABLE_INT("kern.sigqueue.preallocate", &preallocate_siginfo);
-SYSCTL_INT(_kern_sigqueue, OID_AUTO, preallocate, CTLFLAG_RD,
+SYSCTL_INT(_kern_sigqueue, OID_AUTO, preallocate, CTLFLAG_RDTUN,
     &preallocate_siginfo, 0, "Preallocated signal memory size");
 
 static int	signal_overflow = 0;
@@ -163,13 +163,11 @@ SYSINIT(signal, SI_SUB_P1003_1B, SI_ORDER_FIRST+3, sigqueue_start, NULL);
 	    (cr1)->cr_uid == (cr2)->cr_uid)
 
 static int	sugid_coredump;
-TUNABLE_INT("kern.sugid_coredump", &sugid_coredump);
-SYSCTL_INT(_kern, OID_AUTO, sugid_coredump, CTLFLAG_RW,
+SYSCTL_INT(_kern, OID_AUTO, sugid_coredump, CTLFLAG_RWTUN,
     &sugid_coredump, 0, "Allow setuid and setgid processes to dump core");
 
 static int	capmode_coredump;
-TUNABLE_INT("kern.capmode_coredump", &capmode_coredump);
-SYSCTL_INT(_kern, OID_AUTO, capmode_coredump, CTLFLAG_RW,
+SYSCTL_INT(_kern, OID_AUTO, capmode_coredump, CTLFLAG_RWTUN,
     &capmode_coredump, 0, "Allow processes in capability mode to dump core");
 
 static int	do_coredump = 1;
@@ -3052,8 +3050,7 @@ SYSCTL_INT(_kern, OID_AUTO, compress_user_cores_gzlevel, CTLFLAG_RW,
 #endif
 
 static char corefilename[MAXPATHLEN] = {"%N.core"};
-TUNABLE_STR("kern.corefile", corefilename, sizeof(corefilename));
-SYSCTL_STRING(_kern, OID_AUTO, corefile, CTLFLAG_RW, corefilename,
+SYSCTL_STRING(_kern, OID_AUTO, corefile, CTLFLAG_RWTUN, corefilename,
     sizeof(corefilename), "Process corefile name format string");
 
 /*
@@ -3426,21 +3423,17 @@ void
 sigacts_free(struct sigacts *ps)
 {
 
-	mtx_lock(&ps->ps_mtx);
-	ps->ps_refcnt--;
-	if (ps->ps_refcnt == 0) {
-		mtx_destroy(&ps->ps_mtx);
-		free(ps, M_SUBPROC);
-	} else
-		mtx_unlock(&ps->ps_mtx);
+	if (refcount_release(&ps->ps_refcnt) == 0)
+		return;
+	mtx_destroy(&ps->ps_mtx);
+	free(ps, M_SUBPROC);
 }
 
 struct sigacts *
 sigacts_hold(struct sigacts *ps)
 {
-	mtx_lock(&ps->ps_mtx);
-	ps->ps_refcnt++;
-	mtx_unlock(&ps->ps_mtx);
+
+	refcount_acquire(&ps->ps_refcnt);
 	return (ps);
 }
 
@@ -3457,10 +3450,6 @@ sigacts_copy(struct sigacts *dest, struct sigacts *src)
 int
 sigacts_shared(struct sigacts *ps)
 {
-	int shared;
 
-	mtx_lock(&ps->ps_mtx);
-	shared = ps->ps_refcnt > 1;
-	mtx_unlock(&ps->ps_mtx);
-	return (shared);
+	return (ps->ps_refcnt > 1);
 }
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index fec4aeabe1f5..5e74d87ea01d 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -98,10 +98,13 @@ static struct sx sysctlmemlock;
 
 static int sysctl_root(SYSCTL_HANDLER_ARGS);
 
-struct sysctl_oid_list sysctl__children; /* root list */
+/* Root list */
+struct sysctl_oid_list sysctl__children = SLIST_HEAD_INITIALIZER(&sysctl__children);
 
 static int	sysctl_remove_oid_locked(struct sysctl_oid *oidp, int del,
 		    int recurse);
+static int	sysctl_old_kernel(struct sysctl_req *, const void *, size_t);
+static int	sysctl_new_kernel(struct sysctl_req *, void *, size_t);
 
 static struct sysctl_oid *
 sysctl_find_oidname(const char *name, struct sysctl_oid_list *list)
@@ -136,6 +139,126 @@ sysctl_unlock(void)
 	SYSCTL_XUNLOCK();
 }
 
+static int
+sysctl_root_handler_locked(struct sysctl_oid *oid, void *arg1, intptr_t arg2,
+    struct sysctl_req *req)
+{
+	int error;
+
+	oid->oid_running++;
+	SYSCTL_XUNLOCK();
+
+	if (!(oid->oid_kind & CTLFLAG_MPSAFE))
+		mtx_lock(&Giant);
+	error = oid->oid_handler(oid, arg1, arg2, req);
+	if (!(oid->oid_kind & CTLFLAG_MPSAFE))
+		mtx_unlock(&Giant);
+
+	SYSCTL_XLOCK();
+	oid->oid_running--;
+	if (oid->oid_running == 0 && (oid->oid_kind & CTLFLAG_DYING) != 0)
+		wakeup(&oid->oid_running);
+
+	return (error);
+}
+
+static void
+sysctl_load_tunable_by_oid_locked(struct sysctl_oid *oidp)
+{
+	struct sysctl_req req;
+	struct sysctl_oid *curr;
+	char *penv = NULL;
+	char path[64];
+	ssize_t rem = sizeof(path);
+	ssize_t len;
+	int val_int;
+	long val_long;
+	int64_t val_64;
+	quad_t val_quad;
+	int error;
+
+	path[--rem] = 0;
+
+	for (curr = oidp; curr != NULL; curr = SYSCTL_PARENT(curr)) {
+		len = strlen(curr->oid_name);
+		rem -= len;
+		if (curr != oidp)
+			rem -= 1;
+		if (rem < 0) {
+			printf("OID path exceeds %d bytes\n", (int)sizeof(path));
+			return;
+		}
+		memcpy(path + rem, curr->oid_name, len);
+		if (curr != oidp)
+			path[rem + len] = '.';
+	}
+
+	memset(&req, 0, sizeof(req));
+
+	req.td = curthread;
+	req.oldfunc = sysctl_old_kernel;
+	req.newfunc = sysctl_new_kernel;
+	req.lock = REQ_UNWIRED;
+
+	switch (oidp->oid_kind & CTLTYPE) {
+	case CTLTYPE_INT:
+		if (getenv_int(path + rem, &val_int) == 0)
+			return;
+		req.newlen = sizeof(val_int);
+		req.newptr = &val_int;
+		break;
+	case CTLTYPE_UINT:
+		if (getenv_uint(path + rem, (unsigned int *)&val_int) == 0)
+			return;
+		req.newlen = sizeof(val_int);
+		req.newptr = &val_int;
+		break;
+	case CTLTYPE_LONG:
+		if (getenv_long(path + rem, &val_long) == 0)
+			return;
+		req.newlen = sizeof(val_long);
+		req.newptr = &val_long;
+		break;
+	case CTLTYPE_ULONG:
+		if (getenv_ulong(path + rem, (unsigned long *)&val_long) == 0)
+			return;
+		req.newlen = sizeof(val_long);
+		req.newptr = &val_long;
+		break;
+	case CTLTYPE_S64:
+		if (getenv_quad(path + rem, &val_quad) == 0)
+			return;
+		val_64 = val_quad;
+		req.newlen = sizeof(val_64);
+		req.newptr = &val_64;
+		break;
+	case CTLTYPE_U64:
+		/* XXX there is no getenv_uquad() */
+		if (getenv_quad(path + rem, &val_quad) == 0)
+			return;
+		val_64 = val_quad;
+		req.newlen = sizeof(val_64);
+		req.newptr = &val_64;
+		break;
+	case CTLTYPE_STRING:
+		penv = getenv(path + rem);
+		if (penv == NULL)
+			return;
+		req.newlen = strlen(penv);
+		req.newptr = penv;
+		break;
+	default:
+		return;
+	}
+	error = sysctl_root_handler_locked(oidp, oidp->oid_arg1,
+	    oidp->oid_arg2, &req);
+	if (error != 0) {
+		printf("Setting sysctl '%s' to '%s' failed: %d\n",
+		    path, penv, error);
+	}
+	freeenv(penv);
+}
+
 void
 sysctl_register_oid(struct sysctl_oid *oidp)
 {
@@ -192,6 +315,15 @@ sysctl_register_oid(struct sysctl_oid *oidp)
 		SLIST_INSERT_AFTER(q, oidp, oid_link);
 	else
 		SLIST_INSERT_HEAD(parent, oidp, oid_link);
+
+	if ((oidp->oid_kind & CTLTYPE) != CTLTYPE_NODE &&
+#ifdef VIMAGE
+	    (oidp->oid_kind & CTLFLAG_VNET) == 0 &&
+#endif
+	    (oidp->oid_kind & CTLFLAG_TUN) != 0 &&
+	    (oidp->oid_kind & CTLFLAG_NOFETCH) == 0) {
+		sysctl_load_tunable_by_oid_locked(oidp);
+	}
 }
 
 void
@@ -423,8 +555,6 @@ sysctl_remove_oid_locked(struct sysctl_oid *oidp, int del, int recurse)
 				if (error)
 					return (error);
 			}
-			if (del)
-				free(SYSCTL_CHILDREN(oidp), M_SYSCTLOID);
 		}
 	}
 	if (oidp->oid_refcnt > 1 ) {
@@ -489,24 +619,16 @@ sysctl_add_oid(struct sysctl_ctx_list *clist, struct sysctl_oid_list *parent,
 	}
 	oidp = malloc(sizeof(struct sysctl_oid), M_SYSCTLOID, M_WAITOK|M_ZERO);
 	oidp->oid_parent = parent;
-	SLIST_NEXT(oidp, oid_link) = NULL;
+	SLIST_INIT(&oidp->oid_children);
 	oidp->oid_number = number;
 	oidp->oid_refcnt = 1;
 	oidp->oid_name = strdup(name, M_SYSCTLOID);
 	oidp->oid_handler = handler;
 	oidp->oid_kind = CTLFLAG_DYN | kind;
-	if ((kind & CTLTYPE) == CTLTYPE_NODE) {
-		/* Allocate space for children */
-		SYSCTL_CHILDREN_SET(oidp, malloc(sizeof(struct sysctl_oid_list),
-		    M_SYSCTLOID, M_WAITOK));
-		SLIST_INIT(SYSCTL_CHILDREN(oidp));
-		oidp->oid_arg2 = arg2;
-	} else {
-		oidp->oid_arg1 = arg1;
-		oidp->oid_arg2 = arg2;
-	}
+	oidp->oid_arg1 = arg1;
+	oidp->oid_arg2 = arg2;
 	oidp->oid_fmt = fmt;
-	if (descr)
+	if (descr != NULL)
 		oidp->oid_descr = strdup(descr, M_SYSCTLOID);
 	/* Update the context, if used */
 	if (clist != NULL)
@@ -577,7 +699,7 @@ sysctl_register_all(void *arg)
 		sysctl_register_oid(*oidp);
 	SYSCTL_XUNLOCK();
 }
-SYSINIT(sysctl, SI_SUB_KMEM, SI_ORDER_ANY, sysctl_register_all, 0);
+SYSINIT(sysctl, SI_SUB_KMEM, SI_ORDER_FIRST, sysctl_register_all, 0);
 
 /*
  * "Staff-functions"
@@ -625,7 +747,7 @@ sysctl_sysctl_debug_dump_node(struct sysctl_oid_list *l, int i)
 				printf(" Node\n");
 				if (!oidp->oid_handler) {
 					sysctl_sysctl_debug_dump_node(
-						oidp->oid_arg1, i+2);
+					    SYSCTL_CHILDREN(oidp), i + 2);
 				}
 				break;
 			case CTLTYPE_INT:    printf(" Int\n"); break;
@@ -1093,26 +1215,38 @@ sysctl_handle_64(SYSCTL_HANDLER_ARGS)
 int
 sysctl_handle_string(SYSCTL_HANDLER_ARGS)
 {
-	int error=0;
-	char *tmparg;
 	size_t outlen;
+	int error = 0, ro_string = 0;
 
 	/*
-	 * Attempt to get a coherent snapshot by copying to a
-	 * temporary kernel buffer.
+	 * A zero-length buffer indicates a fixed size read-only
+	 * string:
 	 */
-retry:
-	outlen = strlen((char *)arg1)+1;
-	tmparg = malloc(outlen, M_SYSCTLTMP, M_WAITOK);
-
-	if (strlcpy(tmparg, (char *)arg1, outlen) >= outlen) {
-		free(tmparg, M_SYSCTLTMP);
-		goto retry;
+	if (arg2 == 0) {
+		arg2 = strlen((char *)arg1) + 1;
+		ro_string = 1;
 	}
 
-	error = SYSCTL_OUT(req, tmparg, outlen);
-	free(tmparg, M_SYSCTLTMP);
+	if (req->oldptr != NULL) {
+		char *tmparg;
 
+		if (ro_string) {
+			tmparg = arg1;
+		} else {
+			/* try to make a coherent snapshot of the string */
+			tmparg = malloc(arg2, M_SYSCTLTMP, M_WAITOK);
+			memcpy(tmparg, arg1, arg2);
+		}
+
+		outlen = strnlen(tmparg, arg2 - 1) + 1;
+		error = SYSCTL_OUT(req, tmparg, outlen);
+
+		if (!ro_string)
+			free(tmparg, M_SYSCTLTMP);
+	} else {
+		outlen = strnlen((char *)arg1, arg2 - 1) + 1;
+		error = SYSCTL_OUT(req, NULL, outlen);
+	}
 	if (error || !req->newptr)
 		return (error);
 
@@ -1123,7 +1257,6 @@ sysctl_handle_string(SYSCTL_HANDLER_ARGS)
 		error = SYSCTL_IN(req, arg1, arg2);
 		((char *)arg1)[arg2] = '\0';
 	}
-
 	return (error);
 }
 
@@ -1489,24 +1622,14 @@ sysctl_root(SYSCTL_HANDLER_ARGS)
 	if (error != 0)
 		return (error);
 #endif
-	oid->oid_running++;
-	SYSCTL_XUNLOCK();
 #ifdef VIMAGE
 	if ((oid->oid_kind & CTLFLAG_VNET) && arg1 != NULL)
 		arg1 = (void *)(curvnet->vnet_data_base + (uintptr_t)arg1);
 #endif
-	if (!(oid->oid_kind & CTLFLAG_MPSAFE))
-		mtx_lock(&Giant);
-	error = oid->oid_handler(oid, arg1, arg2, req);
-	if (!(oid->oid_kind & CTLFLAG_MPSAFE))
-		mtx_unlock(&Giant);
+	error = sysctl_root_handler_locked(oid, arg1, arg2, req);
 
 	KFAIL_POINT_ERROR(_debug_fail_point, sysctl_running, error);
 
-	SYSCTL_XLOCK();
-	oid->oid_running--;
-	if (oid->oid_running == 0 && (oid->oid_kind & CTLFLAG_DYING) != 0)
-		wakeup(&oid->oid_running);
 	return (error);
 }
 
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 9fe7ebe6b361..78ceff2ad5be 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -128,10 +128,9 @@ struct bintime tc_tick_bt;
 sbintime_t tc_tick_sbt;
 int tc_precexp;
 int tc_timepercentage = TC_DEFAULTPERC;
-TUNABLE_INT("kern.timecounter.alloweddeviation", &tc_timepercentage);
 static int sysctl_kern_timecounter_adjprecision(SYSCTL_HANDLER_ARGS);
 SYSCTL_PROC(_kern_timecounter, OID_AUTO, alloweddeviation,
-    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0,
+    CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, 0, 0,
     sysctl_kern_timecounter_adjprecision, "I",
     "Allowed time interval deviation in percents");
 
@@ -1794,7 +1793,10 @@ sysctl_kern_timecounter_adjprecision(SYSCTL_HANDLER_ARGS)
 	if (error != 0 || req->newptr == NULL)
 		return (error);
 	tc_timepercentage = val;
+	if (cold)
+		goto done;
 	tc_adjprecision();
+done:
 	return (0);
 }
 
diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c
index b21a4f00cdb6..05b07ff115e8 100644
--- a/sys/kern/kern_thread.c
+++ b/sys/kern/kern_thread.c
@@ -234,7 +234,7 @@ thread_fini(void *mem, int size)
  * For a newly created process,
  * link up all the structures and its initial threads etc.
  * called from:
- * {arch}/{arch}/machdep.c   ia64_init(), init386() etc.
+ * {arch}/{arch}/machdep.c   {arch}_init(), init386() etc.
  * proc_dtor() (should go away)
  * proc_init()
  */
@@ -546,7 +546,7 @@ thread_link(struct thread *td, struct proc *p)
 	LIST_INIT(&td->td_lprof[1]);
 	sigqueue_init(&td->td_sigqueue, p);
 	callout_init(&td->td_slpcallout, CALLOUT_MPSAFE);
-	TAILQ_INSERT_HEAD(&p->p_threads, td, td_plist);
+	TAILQ_INSERT_TAIL(&p->p_threads, td, td_plist);
 	p->p_numthreads++;
 }
 
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index f6974c6fe5e3..e8430e4b602d 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -1360,14 +1360,21 @@ struct timer_getoverrun_args {
 #endif
 int
 sys_ktimer_getoverrun(struct thread *td, struct ktimer_getoverrun_args *uap)
+{
+
+	return (kern_ktimer_getoverrun(td, uap->timerid));
+}
+
+int
+kern_ktimer_getoverrun(struct thread *td, int timer_id)
 {
 	struct proc *p = td->td_proc;
 	struct itimer *it;
 	int error ;
 
 	PROC_LOCK(p);
-	if (uap->timerid < 3 ||
-	    (it = itimer_find(p, uap->timerid)) == NULL) {
+	if (timer_id < 3 ||
+	    (it = itimer_find(p, timer_id)) == NULL) {
 		PROC_UNLOCK(p);
 		error = EINVAL;
 	} else {
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index eee54745aac7..b503633e5e04 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #if defined(__arm__)
 #include "opt_timer.h"
 #endif
+#include "opt_rss.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -101,15 +102,20 @@ SYSCTL_INT(_debug, OID_AUTO, to_avg_mpcalls_dir, CTLFLAG_RD, &avg_mpcalls_dir,
 #endif
 
 static int ncallout;
-SYSCTL_INT(_kern, OID_AUTO, ncallout, CTLFLAG_RDTUN, &ncallout, 0,
+SYSCTL_INT(_kern, OID_AUTO, ncallout, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &ncallout, 0,
     "Number of entries in callwheel and size of timeout() preallocation");
 
+#ifdef	RSS
+static int pin_default_swi = 1;
+static int pin_pcpu_swi = 1;
+#else
 static int pin_default_swi = 0;
 static int pin_pcpu_swi = 0;
+#endif
 
-SYSCTL_INT(_kern, OID_AUTO, pin_default_swi, CTLFLAG_RDTUN, &pin_default_swi,
+SYSCTL_INT(_kern, OID_AUTO, pin_default_swi, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &pin_default_swi,
     0, "Pin the default (non-per-cpu) swi (shared with PCPU 0 swi)");
-SYSCTL_INT(_kern, OID_AUTO, pin_pcpu_swi, CTLFLAG_RDTUN, &pin_pcpu_swi,
+SYSCTL_INT(_kern, OID_AUTO, pin_pcpu_swi, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &pin_pcpu_swi,
     0, "Pin the per-CPU swis (except PCPU 0, which is also default");
 
 /*
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 631ba752b7d6..ecee5a72a3fa 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -317,10 +317,6 @@ link_elf_delete_gdb(struct link_map *l)
 }
 #endif /* GDB */
 
-#ifdef __ia64__
-Elf_Addr link_elf_get_gp(linker_file_t);
-#endif
-
 /*
  * The kernel symbol table starts here.
  */
@@ -1454,21 +1450,6 @@ link_elf_each_function_nameval(linker_file_t file,
 	return (0);
 }
 
-#ifdef __ia64__
-/*
- * Each KLD has its own GP. The GP value for each load module is given by
- * DT_PLTGOT on ia64. We need GP to construct function descriptors, but
- * don't have direct access to the ELF file structure. The link_elf_get_gp()
- * function returns the GP given a pointer to a generic linker file struct.
- */
-Elf_Addr
-link_elf_get_gp(linker_file_t lf)
-{
-	elf_file_t ef = (elf_file_t)lf;
-	return ((Elf_Addr)ef->got);
-}
-#endif
-
 const Elf_Sym *
 elf_get_sym(linker_file_t lf, Elf_Size symidx)
 {
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index cc737e3b6320..12743b2a944e 100644
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -622,12 +622,14 @@ struct cpu_search {
 	for ((cpu) = 0; (cpu) <= mp_maxid; (cpu)++)		\
 		if (CPU_ISSET(cpu, &mask))
 
-static __inline int cpu_search(const struct cpu_group *cg, struct cpu_search *low,
-    struct cpu_search *high, const int match);
-int cpu_search_lowest(const struct cpu_group *cg, struct cpu_search *low);
-int cpu_search_highest(const struct cpu_group *cg, struct cpu_search *high);
-int cpu_search_both(const struct cpu_group *cg, struct cpu_search *low,
+static __always_inline int cpu_search(const struct cpu_group *cg,
+    struct cpu_search *low, struct cpu_search *high, const int match);
+int __noinline cpu_search_lowest(const struct cpu_group *cg,
+    struct cpu_search *low);
+int __noinline cpu_search_highest(const struct cpu_group *cg,
     struct cpu_search *high);
+int __noinline cpu_search_both(const struct cpu_group *cg,
+    struct cpu_search *low, struct cpu_search *high);
 
 /*
  * Search the tree of cpu_groups for the lowest or highest loaded cpu
@@ -640,7 +642,7 @@ int cpu_search_both(const struct cpu_group *cg, struct cpu_search *low,
  * match argument.  It is reduced to the minimum set for each case.  It is
  * also recursive to the depth of the tree.
  */
-static __inline int
+static __always_inline int
 cpu_search(const struct cpu_group *cg, struct cpu_search *low,
     struct cpu_search *high, const int match)
 {
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 53b10ec1fa20..7e2e5fb7e998 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 SYSCTL_NODE(_hw, OID_AUTO, bus, CTLFLAG_RW, NULL, NULL);
-SYSCTL_NODE(, OID_AUTO, dev, CTLFLAG_RW, NULL, NULL);
+SYSCTL_ROOT_NODE(OID_AUTO, dev, CTLFLAG_RW, NULL, NULL);
 
 /*
  * Used to attach drivers to devclasses.
@@ -149,9 +149,8 @@ static MALLOC_DEFINE(M_BUS_SC, "bus-sc", "Bus data structures, softc");
 #ifdef BUS_DEBUG
 
 static int bus_debug = 1;
-TUNABLE_INT("bus.debug", &bus_debug);
-SYSCTL_INT(_debug, OID_AUTO, bus_debug, CTLFLAG_RW, &bus_debug, 0,
-    "Debug bus code");
+SYSCTL_INT(_debug, OID_AUTO, bus_debug, CTLFLAG_RWTUN, &bus_debug, 0,
+    "Bus debug level");
 
 #define PDEBUG(a)	if (bus_debug) {printf("%s:%d: ", __func__, __LINE__), printf a; printf("\n");}
 #define DEVICENAME(d)	((d)? device_get_name(d): "no device")
@@ -357,16 +356,14 @@ device_sysctl_fini(device_t dev)
 
 /* Deprecated way to adjust queue length */
 static int sysctl_devctl_disable(SYSCTL_HANDLER_ARGS);
-/* XXX Need to support old-style tunable hw.bus.devctl_disable" */
-SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_disable, CTLTYPE_INT | CTLFLAG_RW |
+SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_disable, CTLTYPE_INT | CTLFLAG_RWTUN |
     CTLFLAG_MPSAFE, NULL, 0, sysctl_devctl_disable, "I",
     "devctl disable -- deprecated");
 
 #define DEVCTL_DEFAULT_QUEUE_LEN 1000
 static int sysctl_devctl_queue(SYSCTL_HANDLER_ARGS);
 static int devctl_queue_length = DEVCTL_DEFAULT_QUEUE_LEN;
-TUNABLE_INT("hw.bus.devctl_queue", &devctl_queue_length);
-SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_queue, CTLTYPE_INT | CTLFLAG_RW |
+SYSCTL_PROC(_hw_bus, OID_AUTO, devctl_queue, CTLTYPE_INT | CTLFLAG_RWTUN |
     CTLFLAG_MPSAFE, NULL, 0, sysctl_devctl_queue, "I", "devctl queue length");
 
 static d_open_t		devopen;
@@ -441,8 +438,6 @@ devopen(struct cdev *dev, int oflags, int devtype, struct thread *td)
 	}
 	/* move to init */
 	devsoftc.inuse = 1;
-	devsoftc.nonblock = 0;
-	devsoftc.async = 0;
 	mtx_unlock(&devsoftc.mtx);
 	return (0);
 }
@@ -453,6 +448,8 @@ devclose(struct cdev *dev, int fflag, int devtype, struct thread *td)
 
 	mtx_lock(&devsoftc.mtx);
 	devsoftc.inuse = 0;
+	devsoftc.nonblock = 0;
+	devsoftc.async = 0;
 	cv_broadcast(&devsoftc.cv);
 	funsetown(&devsoftc.sigio);
 	mtx_unlock(&devsoftc.mtx);
@@ -791,11 +788,12 @@ sysctl_devctl_disable(SYSCTL_HANDLER_ARGS)
 	struct dev_event_info *n1;
 	int dis, error;
 
-	dis = devctl_queue_length == 0;
+	dis = (devctl_queue_length == 0);
 	error = sysctl_handle_int(oidp, &dis, 0, req);
 	if (error || !req->newptr)
 		return (error);
-	mtx_lock(&devsoftc.mtx);
+	if (mtx_initialized(&devsoftc.mtx))
+		mtx_lock(&devsoftc.mtx);
 	if (dis) {
 		while (!TAILQ_EMPTY(&devsoftc.devq)) {
 			n1 = TAILQ_FIRST(&devsoftc.devq);
@@ -808,7 +806,8 @@ sysctl_devctl_disable(SYSCTL_HANDLER_ARGS)
 	} else {
 		devctl_queue_length = DEVCTL_DEFAULT_QUEUE_LEN;
 	}
-	mtx_unlock(&devsoftc.mtx);
+	if (mtx_initialized(&devsoftc.mtx))
+		mtx_unlock(&devsoftc.mtx);
 	return (0);
 }
 
@@ -824,7 +823,8 @@ sysctl_devctl_queue(SYSCTL_HANDLER_ARGS)
 		return (error);
 	if (q < 0)
 		return (EINVAL);
-	mtx_lock(&devsoftc.mtx);
+	if (mtx_initialized(&devsoftc.mtx))
+		mtx_lock(&devsoftc.mtx);
 	devctl_queue_length = q;
 	while (devsoftc.queued > devctl_queue_length) {
 		n1 = TAILQ_FIRST(&devsoftc.devq);
@@ -833,7 +833,8 @@ sysctl_devctl_queue(SYSCTL_HANDLER_ARGS)
 		free(n1, M_BUS);
 		devsoftc.queued--;
 	}
-	mtx_unlock(&devsoftc.mtx);
+	if (mtx_initialized(&devsoftc.mtx))
+		mtx_unlock(&devsoftc.mtx);
 	return (0);
 }
 
diff --git a/sys/kern/subr_capability.c b/sys/kern/subr_capability.c
index 1504435eb13f..f3daa5e2b619 100644
--- a/sys/kern/subr_capability.c
+++ b/sys/kern/subr_capability.c
@@ -34,16 +34,14 @@ __FBSDID("$FreeBSD$");
  * Note that this file is compiled into the kernel and into libc.
  */
 
-#ifdef _KERNEL
 #include <sys/types.h>
 #include <sys/capsicum.h>
+
+#ifdef _KERNEL
 #include <sys/systm.h>
 
 #include <machine/stdarg.h>
 #else	/* !_KERNEL */
-#include <sys/types.h>
-#include <sys/capsicum.h>
-
 #include <assert.h>
 #include <stdarg.h>
 #include <stdbool.h>
diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c
index a7ed944a61fb..c26d271663f6 100644
--- a/sys/kern/subr_kdb.c
+++ b/sys/kern/subr_kdb.c
@@ -108,14 +108,12 @@ SYSCTL_PROC(_debug_kdb, OID_AUTO, trap_code,
     kdb_sysctl_trap_code, "I", "set to cause a page fault via code access");
 
 SYSCTL_INT(_debug_kdb, OID_AUTO, break_to_debugger,
-    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_TUN | CTLFLAG_SECURE,
+    CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_SECURE,
     &kdb_break_to_debugger, 0, "Enable break to debugger");
-TUNABLE_INT("debug.kdb.break_to_debugger", &kdb_break_to_debugger);
 
 SYSCTL_INT(_debug_kdb, OID_AUTO, alt_break_to_debugger,
-    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_TUN | CTLFLAG_SECURE,
+    CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_SECURE,
     &kdb_alt_break_to_debugger, 0, "Enable alternative break to debugger");
-TUNABLE_INT("debug.kdb.alt_break_to_debugger", &kdb_alt_break_to_debugger);
 
 /*
  * Flag to indicate to debuggers why the debugger was entered.
diff --git a/sys/kern/subr_mbpool.c b/sys/kern/subr_mbpool.c
index 0b8cda62428f..bf52d8565653 100644
--- a/sys/kern/subr_mbpool.c
+++ b/sys/kern/subr_mbpool.c
@@ -283,12 +283,11 @@ mbp_free(struct mbpool *p, void *ptr)
 /*
  * Mbuf system external mbuf free routine
  */
-int
+void
 mbp_ext_free(struct mbuf *m, void *buf, void *arg)
 {
-	mbp_free(arg, buf);
 
-	return (EXT_FREE_OK);
+	mbp_free(arg, buf);
 }
 
 /*
diff --git a/sys/kern/subr_msgbuf.c b/sys/kern/subr_msgbuf.c
index ecdbe722ddc6..fa23c91f658f 100644
--- a/sys/kern/subr_msgbuf.c
+++ b/sys/kern/subr_msgbuf.c
@@ -53,9 +53,8 @@ static u_int msgbuf_cksum(struct msgbuf *mbp);
  * or other actions occured.
  */
 static int msgbuf_show_timestamp = 0;
-SYSCTL_INT(_kern, OID_AUTO, msgbuf_show_timestamp, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_kern, OID_AUTO, msgbuf_show_timestamp, CTLFLAG_RWTUN,
     &msgbuf_show_timestamp, 0, "Show timestamp in msgbuf");
-TUNABLE_INT("kern.msgbuf_show_timestamp", &msgbuf_show_timestamp);
 
 /*
  * Initialize a message buffer of the specified size at the specified
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index afd3eacc7178..f589097ffb74 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -107,32 +107,32 @@ u_long	dflssiz;			/* initial stack size limit */
 u_long	maxssiz;			/* max stack size */
 u_long	sgrowsiz;			/* amount to grow stack */
 
-SYSCTL_INT(_kern, OID_AUTO, hz, CTLFLAG_RDTUN, &hz, 0,
+SYSCTL_INT(_kern, OID_AUTO, hz, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &hz, 0,
     "Number of clock ticks per second");
-SYSCTL_INT(_kern, OID_AUTO, nbuf, CTLFLAG_RDTUN, &nbuf, 0,
+SYSCTL_INT(_kern, OID_AUTO, nbuf, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &nbuf, 0,
     "Number of buffers in the buffer cache");
-SYSCTL_INT(_kern, OID_AUTO, nswbuf, CTLFLAG_RDTUN, &nswbuf, 0,
+SYSCTL_INT(_kern, OID_AUTO, nswbuf, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &nswbuf, 0,
     "Number of swap buffers");
-SYSCTL_INT(_kern, OID_AUTO, msgbufsize, CTLFLAG_RDTUN, &msgbufsize, 0,
+SYSCTL_INT(_kern, OID_AUTO, msgbufsize, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &msgbufsize, 0,
     "Size of the kernel message buffer");
-SYSCTL_LONG(_kern, OID_AUTO, maxswzone, CTLFLAG_RDTUN, &maxswzone, 0,
+SYSCTL_LONG(_kern, OID_AUTO, maxswzone, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &maxswzone, 0,
     "Maximum memory for swap metadata");
-SYSCTL_LONG(_kern, OID_AUTO, maxbcache, CTLFLAG_RDTUN, &maxbcache, 0,
+SYSCTL_LONG(_kern, OID_AUTO, maxbcache, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &maxbcache, 0,
     "Maximum value of vfs.maxbufspace");
-SYSCTL_INT(_kern, OID_AUTO, bio_transient_maxcnt, CTLFLAG_RDTUN,
+SYSCTL_INT(_kern, OID_AUTO, bio_transient_maxcnt, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
     &bio_transient_maxcnt, 0,
     "Maximum number of transient BIOs mappings");
-SYSCTL_ULONG(_kern, OID_AUTO, maxtsiz, CTLFLAG_RW | CTLFLAG_TUN, &maxtsiz, 0,
+SYSCTL_ULONG(_kern, OID_AUTO, maxtsiz, CTLFLAG_RWTUN | CTLFLAG_NOFETCH, &maxtsiz, 0,
     "Maximum text size");
-SYSCTL_ULONG(_kern, OID_AUTO, dfldsiz, CTLFLAG_RW | CTLFLAG_TUN, &dfldsiz, 0,
+SYSCTL_ULONG(_kern, OID_AUTO, dfldsiz, CTLFLAG_RWTUN | CTLFLAG_NOFETCH, &dfldsiz, 0,
     "Initial data size limit");
-SYSCTL_ULONG(_kern, OID_AUTO, maxdsiz, CTLFLAG_RW | CTLFLAG_TUN, &maxdsiz, 0,
+SYSCTL_ULONG(_kern, OID_AUTO, maxdsiz, CTLFLAG_RWTUN | CTLFLAG_NOFETCH, &maxdsiz, 0,
     "Maximum data size");
-SYSCTL_ULONG(_kern, OID_AUTO, dflssiz, CTLFLAG_RW | CTLFLAG_TUN, &dflssiz, 0,
+SYSCTL_ULONG(_kern, OID_AUTO, dflssiz, CTLFLAG_RWTUN | CTLFLAG_NOFETCH, &dflssiz, 0,
     "Initial stack size limit");
-SYSCTL_ULONG(_kern, OID_AUTO, maxssiz, CTLFLAG_RW | CTLFLAG_TUN, &maxssiz, 0,
+SYSCTL_ULONG(_kern, OID_AUTO, maxssiz, CTLFLAG_RWTUN | CTLFLAG_NOFETCH, &maxssiz, 0,
     "Maximum stack size");
-SYSCTL_ULONG(_kern, OID_AUTO, sgrowsiz, CTLFLAG_RW | CTLFLAG_TUN, &sgrowsiz, 0,
+SYSCTL_ULONG(_kern, OID_AUTO, sgrowsiz, CTLFLAG_RWTUN | CTLFLAG_NOFETCH, &sgrowsiz, 0,
     "Amount to grow stack on a stack fault");
 SYSCTL_PROC(_kern, OID_AUTO, vm_guest, CTLFLAG_RD | CTLTYPE_STRING,
     NULL, 0, sysctl_kern_vm_guest, "A",
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 28e33a4b4b2b..814e57f47947 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -102,23 +102,20 @@ static void  snprintf_func(int ch, void *arg);
 static int msgbufmapped;		/* Set when safe to use msgbuf */
 int msgbuftrigger;
 
-static int      log_console_output = 1;
-TUNABLE_INT("kern.log_console_output", &log_console_output);
-SYSCTL_INT(_kern, OID_AUTO, log_console_output, CTLFLAG_RW,
-    &log_console_output, 0, "Duplicate console output to the syslog.");
+static int log_console_output = 1;
+SYSCTL_INT(_kern, OID_AUTO, log_console_output, CTLFLAG_RWTUN,
+    &log_console_output, 0, "Duplicate console output to the syslog");
 
 /*
  * See the comment in log_console() below for more explanation of this.
  */
-static int log_console_add_linefeed = 0;
-TUNABLE_INT("kern.log_console_add_linefeed", &log_console_add_linefeed);
-SYSCTL_INT(_kern, OID_AUTO, log_console_add_linefeed, CTLFLAG_RW,
-    &log_console_add_linefeed, 0, "log_console() adds extra newlines.");
+static int log_console_add_linefeed;
+SYSCTL_INT(_kern, OID_AUTO, log_console_add_linefeed, CTLFLAG_RWTUN,
+    &log_console_add_linefeed, 0, "log_console() adds extra newlines");
 
-static int	always_console_output = 0;
-TUNABLE_INT("kern.always_console_output", &always_console_output);
-SYSCTL_INT(_kern, OID_AUTO, always_console_output, CTLFLAG_RW,
-    &always_console_output, 0, "Always output to console despite TIOCCONS.");
+static int always_console_output;
+SYSCTL_INT(_kern, OID_AUTO, always_console_output, CTLFLAG_RWTUN,
+    &always_console_output, 0, "Always output to console despite TIOCCONS");
 
 /*
  * Warn that a system table is full.
diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c
index c466b44b0fcd..61e951f4e5d7 100644
--- a/sys/kern/subr_rman.c
+++ b/sys/kern/subr_rman.c
@@ -94,26 +94,22 @@ struct resource_i {
 	u_long	r_end;		/* index of the last entry (inclusive) */
 	u_int	r_flags;
 	void	*r_virtual;	/* virtual address of this resource */
-	struct	device *r_dev;	/* device which has allocated this resource */
-	struct	rman *r_rm;	/* resource manager from whence this came */
+	struct device *r_dev;	/* device which has allocated this resource */
+	struct rman *r_rm;	/* resource manager from whence this came */
 	int	r_rid;		/* optional rid for this resource. */
 };
 
-static int     rman_debug = 0;
-TUNABLE_INT("debug.rman_debug", &rman_debug);
-SYSCTL_INT(_debug, OID_AUTO, rman_debug, CTLFLAG_RW,
+static int rman_debug = 0;
+SYSCTL_INT(_debug, OID_AUTO, rman_debug, CTLFLAG_RWTUN,
     &rman_debug, 0, "rman debug");
 
 #define DPRINTF(params) if (rman_debug) printf params
 
 static MALLOC_DEFINE(M_RMAN, "rman", "Resource manager");
 
-struct	rman_head rman_head;
-static	struct mtx rman_mtx; /* mutex to protect rman_head */
-static	int int_rman_activate_resource(struct rman *rm, struct resource_i *r,
-				       struct resource_i **whohas);
-static	int int_rman_deactivate_resource(struct resource_i *r);
-static	int int_rman_release_resource(struct rman *rm, struct resource_i *r);
+struct rman_head rman_head;
+static struct mtx rman_mtx; /* mutex to protect rman_head */
+static int int_rman_release_resource(struct rman *rm, struct resource_i *r);
 
 static __inline struct resource_i *
 int_alloc_resource(int malloc_flag)
@@ -317,12 +313,12 @@ rman_last_free_region(struct rman *rm, u_long *start, u_long *end)
 int
 rman_adjust_resource(struct resource *rr, u_long start, u_long end)
 {
-	struct	resource_i *r, *s, *t, *new;
-	struct	rman *rm;
+	struct resource_i *r, *s, *t, *new;
+	struct rman *rm;
 
 	/* Not supported for shared resources. */
 	r = rr->__r_i;
-	if (r->r_flags & (RF_TIMESHARE | RF_SHAREABLE))
+	if (r->r_flags & RF_SHAREABLE)
 		return (EINVAL);
 
 	/*
@@ -435,16 +431,16 @@ rman_adjust_resource(struct resource *rr, u_long start, u_long end)
 	return (0);
 }
 
-#define	SHARE_TYPE(f)	(f & (RF_SHAREABLE | RF_TIMESHARE | RF_PREFETCHABLE))
+#define	SHARE_TYPE(f)	(f & (RF_SHAREABLE | RF_PREFETCHABLE))
 
 struct resource *
 rman_reserve_resource_bound(struct rman *rm, u_long start, u_long end,
-		      u_long count, u_long bound,  u_int flags,
-		      struct device *dev)
+			    u_long count, u_long bound, u_int flags,
+			    struct device *dev)
 {
-	u_int	new_rflags;
-	struct	resource_i *r, *s, *rv;
-	u_long	rstart, rend, amask, bmask;
+	u_int new_rflags;
+	struct resource_i *r, *s, *rv;
+	u_long rstart, rend, amask, bmask;
 
 	rv = NULL;
 
@@ -452,10 +448,9 @@ rman_reserve_resource_bound(struct rman *rm, u_long start, u_long end,
 	       "length %#lx, flags %u, device %s\n", rm->rm_descr, start, end,
 	       count, flags,
 	       dev == NULL ? "<null>" : device_get_nameunit(dev)));
-	KASSERT((flags & (RF_WANTED | RF_FIRSTSHARE)) == 0,
+	KASSERT((flags & RF_FIRSTSHARE) == 0,
 	    ("invalid flags %#x", flags));
-	new_rflags = (flags & ~(RF_ACTIVE | RF_WANTED | RF_FIRSTSHARE)) |
-	    RF_ALLOCATED;
+	new_rflags = (flags & ~RF_FIRSTSHARE) | RF_ALLOCATED;
 
 	mtx_lock(rm->rm_mtx);
 
@@ -601,7 +596,7 @@ rman_reserve_resource_bound(struct rman *rm, u_long start, u_long end,
 	 * additional work, but this does not seem warranted.)
 	 */
 	DPRINTF(("no unshared regions found\n"));
-	if ((flags & (RF_SHAREABLE | RF_TIMESHARE)) == 0)
+	if ((flags & RF_SHAREABLE) == 0)
 		goto out;
 
 	for (s = r; s && s->r_end <= end; s = TAILQ_NEXT(s, r_link)) {
@@ -636,25 +631,11 @@ rman_reserve_resource_bound(struct rman *rm, u_long start, u_long end,
 			goto out;
 		}
 	}
-
 	/*
 	 * We couldn't find anything.
 	 */
-out:
-	/*
-	 * If the user specified RF_ACTIVE in flags, we attempt to atomically
-	 * activate the resource.  If this fails, we release the resource
-	 * and indicate overall failure.  (This behavior probably doesn't
-	 * make sense for RF_TIMESHARE-type resources.)
-	 */
-	if (rv && (flags & RF_ACTIVE) != 0) {
-		struct resource_i *whohas;
-		if (int_rman_activate_resource(rm, rv, &whohas)) {
-			int_rman_release_resource(rm, rv);
-			rv = NULL;
-		}
-	}
 
+out:
 	mtx_unlock(rm->rm_mtx);
 	return (rv == NULL ? NULL : &rv->r_r);
 }
@@ -668,102 +649,28 @@ rman_reserve_resource(struct rman *rm, u_long start, u_long end, u_long count,
 	    dev));
 }
 
-static int
-int_rman_activate_resource(struct rman *rm, struct resource_i *r,
-			   struct resource_i **whohas)
-{
-	struct resource_i *s;
-	int ok;
-
-	/*
-	 * If we are not timesharing, then there is nothing much to do.
-	 * If we already have the resource, then there is nothing at all to do.
-	 * If we are not on a sharing list with anybody else, then there is
-	 * little to do.
-	 */
-	if ((r->r_flags & RF_TIMESHARE) == 0
-	    || (r->r_flags & RF_ACTIVE) != 0
-	    || r->r_sharehead == NULL) {
-		r->r_flags |= RF_ACTIVE;
-		return 0;
-	}
-
-	ok = 1;
-	for (s = LIST_FIRST(r->r_sharehead); s && ok;
-	     s = LIST_NEXT(s, r_sharelink)) {
-		if ((s->r_flags & RF_ACTIVE) != 0) {
-			ok = 0;
-			*whohas = s;
-		}
-	}
-	if (ok) {
-		r->r_flags |= RF_ACTIVE;
-		return 0;
-	}
-	return EBUSY;
-}
-
 int
 rman_activate_resource(struct resource *re)
 {
-	int rv;
-	struct resource_i *r, *whohas;
+	struct resource_i *r;
 	struct rman *rm;
 
 	r = re->__r_i;
 	rm = r->r_rm;
 	mtx_lock(rm->rm_mtx);
-	rv = int_rman_activate_resource(rm, r, &whohas);
+	r->r_flags |= RF_ACTIVE;
 	mtx_unlock(rm->rm_mtx);
-	return rv;
-}
-
-int
-rman_await_resource(struct resource *re, int pri, int timo)
-{
-	int	rv;
-	struct	resource_i *r, *whohas;
-	struct	rman *rm;
-
-	r = re->__r_i;
-	rm = r->r_rm;
-	mtx_lock(rm->rm_mtx);
-	for (;;) {
-		rv = int_rman_activate_resource(rm, r, &whohas);
-		if (rv != EBUSY)
-			return (rv);	/* returns with mutex held */
-
-		if (r->r_sharehead == NULL)
-			panic("rman_await_resource");
-		whohas->r_flags |= RF_WANTED;
-		rv = msleep(r->r_sharehead, rm->rm_mtx, pri, "rmwait", timo);
-		if (rv) {
-			mtx_unlock(rm->rm_mtx);
-			return (rv);
-		}
-	}
-}
-
-static int
-int_rman_deactivate_resource(struct resource_i *r)
-{
-
-	r->r_flags &= ~RF_ACTIVE;
-	if (r->r_flags & RF_WANTED) {
-		r->r_flags &= ~RF_WANTED;
-		wakeup(r->r_sharehead);
-	}
 	return 0;
 }
 
 int
 rman_deactivate_resource(struct resource *r)
 {
-	struct	rman *rm;
+	struct rman *rm;
 
 	rm = r->__r_i->r_rm;
 	mtx_lock(rm->rm_mtx);
-	int_rman_deactivate_resource(r->__r_i);
+	r->__r_i->r_flags &= ~RF_ACTIVE;
 	mtx_unlock(rm->rm_mtx);
 	return 0;
 }
@@ -771,10 +678,10 @@ rman_deactivate_resource(struct resource *r)
 static int
 int_rman_release_resource(struct rman *rm, struct resource_i *r)
 {
-	struct	resource_i *s, *t;
+	struct resource_i *s, *t;
 
 	if (r->r_flags & RF_ACTIVE)
-		int_rman_deactivate_resource(r);
+		r->r_flags &= ~RF_ACTIVE;
 
 	/*
 	 * Check for a sharing list first.  If there is one, then we don't
@@ -865,9 +772,9 @@ int_rman_release_resource(struct rman *rm, struct resource_i *r)
 int
 rman_release_resource(struct resource *re)
 {
-	int	rv;
-	struct	resource_i *r;
-	struct	rman *rm;
+	int rv;
+	struct resource_i *r;
+	struct rman *rm;
 
 	r = re->__r_i;
 	rm = r->r_rm;
@@ -880,7 +787,7 @@ rman_release_resource(struct resource *re)
 uint32_t
 rman_make_alignment_flags(uint32_t size)
 {
-	int	i;
+	int i;
 
 	/*
 	 * Find the hightest bit set, and add one if more than one bit
@@ -898,96 +805,112 @@ rman_make_alignment_flags(uint32_t size)
 void
 rman_set_start(struct resource *r, u_long start)
 {
+
 	r->__r_i->r_start = start;
 }
 
 u_long
 rman_get_start(struct resource *r)
 {
+
 	return (r->__r_i->r_start);
 }
 
 void
 rman_set_end(struct resource *r, u_long end)
 {
+
 	r->__r_i->r_end = end;
 }
 
 u_long
 rman_get_end(struct resource *r)
 {
+
 	return (r->__r_i->r_end);
 }
 
 u_long
 rman_get_size(struct resource *r)
 {
+
 	return (r->__r_i->r_end - r->__r_i->r_start + 1);
 }
 
 u_int
 rman_get_flags(struct resource *r)
 {
+
 	return (r->__r_i->r_flags);
 }
 
 void
 rman_set_virtual(struct resource *r, void *v)
 {
+
 	r->__r_i->r_virtual = v;
 }
 
 void *
 rman_get_virtual(struct resource *r)
 {
+
 	return (r->__r_i->r_virtual);
 }
 
 void
 rman_set_bustag(struct resource *r, bus_space_tag_t t)
 {
+
 	r->r_bustag = t;
 }
 
 bus_space_tag_t
 rman_get_bustag(struct resource *r)
 {
+
 	return (r->r_bustag);
 }
 
 void
 rman_set_bushandle(struct resource *r, bus_space_handle_t h)
 {
+
 	r->r_bushandle = h;
 }
 
 bus_space_handle_t
 rman_get_bushandle(struct resource *r)
 {
+
 	return (r->r_bushandle);
 }
 
 void
 rman_set_rid(struct resource *r, int rid)
 {
+
 	r->__r_i->r_rid = rid;
 }
 
 int
 rman_get_rid(struct resource *r)
 {
+
 	return (r->__r_i->r_rid);
 }
 
 void
 rman_set_device(struct resource *r, struct device *dev)
 {
+
 	r->__r_i->r_dev = dev;
 }
 
 struct device *
 rman_get_device(struct resource *r)
 {
+
 	return (r->__r_i->r_dev);
 }
 
diff --git a/sys/kern/subr_sfbuf.c b/sys/kern/subr_sfbuf.c
new file mode 100644
index 000000000000..707ace220639
--- /dev/null
+++ b/sys/kern/subr_sfbuf.c
@@ -0,0 +1,240 @@
+/*-
+ * Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org>
+ * Copyright (c) 2003, 2005 Alan L. Cox <alc@cs.rice.edu>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, 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/sf_buf.h>
+#include <sys/smp.h>
+#include <sys/sysctl.h>
+
+#include <vm/vm.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_page.h>
+
+#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;
+
+/*
+ * 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;
+
+#ifdef SFBUF_OPTIONAL_DIRECT_MAP
+	if (SFBUF_OPTIONAL_DIRECT_MAP)
+		return;
+#endif
+
+	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_WAITOK | 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.  May 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;
+
+#ifdef SFBUF_OPTIONAL_DIRECT_MAP
+	if (SFBUF_OPTIONAL_DIRECT_MAP)
+		return ((struct sf_buf *)m);
+#endif
+
+	KASSERT(curthread->td_pinned > 0 || (flags & SFB_CPUPRIVATE) == 0,
+	    ("sf_buf_alloc(SFB_CPUPRIVATE): curthread not pinned"));
+	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);
+			}
+#if defined(SMP) && defined(SFBUF_CPUSET)
+			sf_buf_shootdown(sf, flags);
+#endif
+			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);
+	sf_buf_map(sf, flags);
+done:
+	mtx_unlock(&sf_buf_lock);
+	return (sf);
+}
+
+/*
+ * 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)
+{
+
+#ifdef SFBUF_OPTIONAL_DIRECT_MAP
+	if (SFBUF_OPTIONAL_DIRECT_MAP)
+		return;
+#endif
+
+	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_unmap(sf)) {
+			sf->m = NULL;
+			LIST_REMOVE(sf, list_entry);
+		}
+		if (sf_buf_alloc_want > 0)
+			wakeup(&sf_buf_freelist);
+	}
+	mtx_unlock(&sf_buf_lock);
+}
+
+void
+sf_buf_ref(struct sf_buf *sf)
+{
+
+#ifdef SFBUF_OPTIONAL_DIRECT_MAP
+	if (SFBUF_OPTIONAL_DIRECT_MAP)
+		return;
+#endif
+
+	mtx_lock(&sf_buf_lock);
+	KASSERT(sf->ref_count > 0, ("%s: sf %p not allocated", __func__, sf));
+	sf->ref_count++;
+	mtx_unlock(&sf_buf_lock);
+}
+
+#ifdef SFBUF_PROCESS_PAGE
+/*
+ * Run callback function on sf_buf that holds a certain page.
+ */
+boolean_t
+sf_buf_process_page(vm_page_t m, void (*cb)(struct sf_buf *))
+{
+	struct sf_head *hash_list;
+	struct sf_buf *sf;
+
+	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) {
+			cb(sf);
+			mtx_unlock(&sf_buf_lock);
+			return (TRUE);
+		}
+	}
+	mtx_unlock(&sf_buf_lock);
+	return (FALSE);
+}
+#endif	/* SFBUF_PROCESS_PAGE */
diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c
index c9d5123d7883..bbbec920ef0d 100644
--- a/sys/kern/subr_sleepqueue.c
+++ b/sys/kern/subr_sleepqueue.c
@@ -166,24 +166,20 @@ SDT_PROBE_DECLARE(sched, , , sleep);
 SDT_PROBE_DECLARE(sched, , , wakeup);
 
 /*
- * Early initialization of sleep queues that is called from the sleepinit()
- * SYSINIT.
+ * Initialize SLEEPQUEUE_PROFILING specific sysctl nodes.
+ * Note that it must happen after sleepinit() has been fully executed, so
+ * it must happen after SI_SUB_KMEM SYSINIT() subsystem setup.
  */
-void
-init_sleepqueues(void)
-{
 #ifdef SLEEPQUEUE_PROFILING
-	struct sysctl_oid *chain_oid;
+static void
+init_sleepqueue_profiling(void)
+{
 	char chain_name[10];
-#endif
-	int i;
+	struct sysctl_oid *chain_oid;
+	u_int i;
 
 	for (i = 0; i < SC_TABLESIZE; i++) {
-		LIST_INIT(&sleepq_chains[i].sc_queues);
-		mtx_init(&sleepq_chains[i].sc_lock, "sleepq chain", NULL,
-		    MTX_SPIN | MTX_RECURSE);
-#ifdef SLEEPQUEUE_PROFILING
-		snprintf(chain_name, sizeof(chain_name), "%d", i);
+		snprintf(chain_name, sizeof(chain_name), "%u", i);
 		chain_oid = SYSCTL_ADD_NODE(NULL, 
 		    SYSCTL_STATIC_CHILDREN(_debug_sleepq_chains), OID_AUTO,
 		    chain_name, CTLFLAG_RD, NULL, "sleepq chain stats");
@@ -192,7 +188,26 @@ init_sleepqueues(void)
 		SYSCTL_ADD_UINT(NULL, SYSCTL_CHILDREN(chain_oid), OID_AUTO,
 		    "max_depth", CTLFLAG_RD, &sleepq_chains[i].sc_max_depth, 0,
 		    NULL);
+	}
+}
+
+SYSINIT(sleepqueue_profiling, SI_SUB_LOCK, SI_ORDER_ANY,
+    init_sleepqueue_profiling, NULL);
 #endif
+
+/*
+ * Early initialization of sleep queues that is called from the sleepinit()
+ * SYSINIT.
+ */
+void
+init_sleepqueues(void)
+{
+	int i;
+
+	for (i = 0; i < SC_TABLESIZE; i++) {
+		LIST_INIT(&sleepq_chains[i].sc_queues);
+		mtx_init(&sleepq_chains[i].sc_lock, "sleepq chain", NULL,
+		    MTX_SPIN | MTX_RECURSE);
 	}
 	sleepq_zone = uma_zcreate("SLEEPQUEUE", sizeof(struct sleepqueue),
 #ifdef INVARIANTS
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 122fc4c5fede..90bbc5fd22a1 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -87,16 +87,14 @@ SYSCTL_PROC(_kern_smp, OID_AUTO, active, CTLFLAG_RD | CTLTYPE_INT, NULL, 0,
 int smp_disabled = 0;	/* has smp been disabled? */
 SYSCTL_INT(_kern_smp, OID_AUTO, disabled, CTLFLAG_RDTUN|CTLFLAG_CAPRD,
     &smp_disabled, 0, "SMP has been disabled from the loader");
-TUNABLE_INT("kern.smp.disabled", &smp_disabled);
 
 int smp_cpus = 1;	/* how many cpu's running */
 SYSCTL_INT(_kern_smp, OID_AUTO, cpus, CTLFLAG_RD|CTLFLAG_CAPRD, &smp_cpus, 0,
     "Number of CPUs online");
 
 int smp_topology = 0;	/* Which topology we're using. */
-SYSCTL_INT(_kern_smp, OID_AUTO, topology, CTLFLAG_RD, &smp_topology, 0,
+SYSCTL_INT(_kern_smp, OID_AUTO, topology, CTLFLAG_RDTUN, &smp_topology, 0,
     "Topology override setting; 0 is default provided by hardware.");
-TUNABLE_INT("kern.smp.topology", &smp_topology);
 
 #ifdef SMP
 /* Enable forwarding of a signal to a process running on a different CPU */
diff --git a/sys/kern/subr_terminal.c b/sys/kern/subr_terminal.c
index 5f8ffec7e4ad..d8d1836d55fa 100644
--- a/sys/kern/subr_terminal.c
+++ b/sys/kern/subr_terminal.c
@@ -119,20 +119,20 @@ static teken_funcs_t terminal_drawmethods = {
 
 /* Kernel message formatting. */
 static const teken_attr_t kernel_message = {
-	.ta_fgcolor	= TC_WHITE,
-	.ta_bgcolor	= TC_BLACK,
-	.ta_format	= TF_BOLD,
+	.ta_fgcolor	= TCHAR_FGCOLOR(TERMINAL_KERN_ATTR),
+	.ta_bgcolor	= TCHAR_BGCOLOR(TERMINAL_KERN_ATTR),
+	.ta_format	= TCHAR_FORMAT(TERMINAL_KERN_ATTR)
 };
 
 static const teken_attr_t default_message = {
-	.ta_fgcolor	= TC_WHITE,
-	.ta_bgcolor	= TC_BLACK,
+	.ta_fgcolor	= TCHAR_FGCOLOR(TERMINAL_NORM_ATTR),
+	.ta_bgcolor	= TCHAR_BGCOLOR(TERMINAL_NORM_ATTR),
+	.ta_format	= TCHAR_FORMAT(TERMINAL_NORM_ATTR)
 };
 
-#define	TCHAR_CREATE(c, a)	((c) | \
-	(a)->ta_format << 21 | \
-	teken_256to8((a)->ta_fgcolor) << 26 | \
-	teken_256to8((a)->ta_bgcolor) << 29)
+#define	TCHAR_CREATE(c, a)	((c) | TFORMAT((a)->ta_format) |	\
+	TCOLOR_FG(teken_256to8((a)->ta_fgcolor)) |			\
+	TCOLOR_BG(teken_256to8((a)->ta_bgcolor)))
 
 static void
 terminal_init(struct terminal *tm)
@@ -191,7 +191,7 @@ terminal_maketty(struct terminal *tm, const char *fmt, ...)
 
 void
 terminal_set_winsize_blank(struct terminal *tm, const struct winsize *size,
-    int blank)
+    int blank, const term_attr_t *attr)
 {
 	term_rect_t r;
 
@@ -209,8 +209,8 @@ terminal_set_winsize_blank(struct terminal *tm, const struct winsize *size,
 	TERMINAL_UNLOCK(tm);
 
 	if ((blank != 0) && !(tm->tm_flags & TF_MUTE))
-		tm->tm_class->tc_fill(tm, &r, TCHAR_CREATE((teken_char_t)' ',
-		    &default_message));
+		tm->tm_class->tc_fill(tm, &r,
+		    TCHAR_CREATE((teken_char_t)' ', attr));
 
 	terminal_sync_ttysize(tm);
 }
@@ -219,7 +219,8 @@ void
 terminal_set_winsize(struct terminal *tm, const struct winsize *size)
 {
 
-	terminal_set_winsize_blank(tm, size, 1);
+	terminal_set_winsize_blank(tm, size, 1,
+	    (const term_attr_t *)&default_message);
 }
 
 /*
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index 86e1b16015e0..309f2e23ce6e 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -132,7 +132,9 @@ __FBSDID("$FreeBSD$");
 /* Define this to check for blessed mutexes */
 #undef BLESSING
 
+#ifndef WITNESS_COUNT
 #define	WITNESS_COUNT 		1536
+#endif
 #define	WITNESS_CHILDCOUNT 	(WITNESS_COUNT * 4)
 #define	WITNESS_HASH_SIZE	251	/* Prime, gives load factor < 2 */
 #define	WITNESS_PENDLIST	(1024 + MAXCPU)
@@ -380,8 +382,7 @@ static SYSCTL_NODE(_debug, OID_AUTO, witness, CTLFLAG_RW, NULL,
  * completely disabled.
  */
 static int witness_watch = 1;
-TUNABLE_INT("debug.witness.watch", &witness_watch);
-SYSCTL_PROC(_debug_witness, OID_AUTO, watch, CTLFLAG_RW | CTLTYPE_INT, NULL, 0,
+SYSCTL_PROC(_debug_witness, OID_AUTO, watch, CTLFLAG_RWTUN | CTLTYPE_INT, NULL, 0,
     sysctl_debug_witness_watch, "I", "witness is watching lock operations");
 
 #ifdef KDB
@@ -396,8 +397,7 @@ int	witness_kdb = 1;
 #else
 int	witness_kdb = 0;
 #endif
-TUNABLE_INT("debug.witness.kdb", &witness_kdb);
-SYSCTL_INT(_debug_witness, OID_AUTO, kdb, CTLFLAG_RW, &witness_kdb, 0, "");
+SYSCTL_INT(_debug_witness, OID_AUTO, kdb, CTLFLAG_RWTUN, &witness_kdb, 0, "");
 
 /*
  * When KDB is enabled and witness_trace is 1, it will cause the system
@@ -406,8 +406,7 @@ SYSCTL_INT(_debug_witness, OID_AUTO, kdb, CTLFLAG_RW, &witness_kdb, 0, "");
  *	- locks are held when going to sleep.
  */
 int	witness_trace = 1;
-TUNABLE_INT("debug.witness.trace", &witness_trace);
-SYSCTL_INT(_debug_witness, OID_AUTO, trace, CTLFLAG_RW, &witness_trace, 0, "");
+SYSCTL_INT(_debug_witness, OID_AUTO, trace, CTLFLAG_RWTUN, &witness_trace, 0, "");
 #endif /* KDB */
 
 #ifdef WITNESS_SKIPSPIN
@@ -415,9 +414,7 @@ int	witness_skipspin = 1;
 #else
 int	witness_skipspin = 0;
 #endif
-TUNABLE_INT("debug.witness.skipspin", &witness_skipspin);
-SYSCTL_INT(_debug_witness, OID_AUTO, skipspin, CTLFLAG_RDTUN, &witness_skipspin,
-    0, "");
+SYSCTL_INT(_debug_witness, OID_AUTO, skipspin, CTLFLAG_RDTUN, &witness_skipspin, 0, "");
 
 /*
  * Call this to print out the relations between locks.
@@ -665,9 +662,6 @@ static struct witness_order_list_entry order_lists[] = {
 	{ "mprof lock", &lock_class_mtx_spin },
 	{ "zombie lock", &lock_class_mtx_spin },
 	{ "ALD Queue", &lock_class_mtx_spin },
-#ifdef __ia64__
-	{ "MCA spin lock", &lock_class_mtx_spin },
-#endif
 #if defined(__i386__) || defined(__amd64__)
 	{ "pcicfg", &lock_class_mtx_spin },
 	{ "NDIS thread lock", &lock_class_mtx_spin },
diff --git a/sys/kern/sys_capability.c b/sys/kern/sys_capability.c
index e4a42f71088d..b3099056cfff 100644
--- a/sys/kern/sys_capability.c
+++ b/sys/kern/sys_capability.c
@@ -199,11 +199,19 @@ cap_rights_to_vmprot(cap_rights_t *havep)
  * any other way, as we want to keep all capability permission evaluation in
  * this one file.
  */
+
+cap_rights_t *
+cap_rights_fde(struct filedescent *fde)
+{
+
+	return (&fde->fde_rights);
+}
+
 cap_rights_t *
 cap_rights(struct filedesc *fdp, int fd)
 {
 
-	return (&fdp->fd_ofiles[fd].fde_rights);
+	return (cap_rights_fde(&fdp->fd_ofiles[fd]));
 }
 
 /*
@@ -486,23 +494,30 @@ sys_cap_ioctls_get(struct thread *td, struct cap_ioctls_get_args *uap)
  * Test whether a capability grants the given fcntl command.
  */
 int
-cap_fcntl_check(struct filedesc *fdp, int fd, int cmd)
+cap_fcntl_check_fde(struct filedescent *fde, int cmd)
 {
 	uint32_t fcntlcap;
 
-	KASSERT(fd >= 0 && fd < fdp->fd_nfiles,
-	    ("%s: invalid fd=%d", __func__, fd));
-
 	fcntlcap = (1 << cmd);
 	KASSERT((CAP_FCNTL_ALL & fcntlcap) != 0,
 	    ("Unsupported fcntl=%d.", cmd));
 
-	if ((fdp->fd_ofiles[fd].fde_fcntls & fcntlcap) != 0)
+	if ((fde->fde_fcntls & fcntlcap) != 0)
 		return (0);
 
 	return (ENOTCAPABLE);
 }
 
+int
+cap_fcntl_check(struct filedesc *fdp, int fd, int cmd)
+{
+
+	KASSERT(fd >= 0 && fd < fdp->fd_nfiles,
+	    ("%s: invalid fd=%d", __func__, fd));
+
+	return (cap_fcntl_check_fde(&fdp->fd_ofiles[fd], cmd));
+}
+
 int
 sys_cap_fcntls_limit(struct thread *td, struct cap_fcntls_limit_args *uap)
 {
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 6cc4f13fe1a4..50bc91dea015 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -1458,7 +1458,7 @@ pollscan(td, fds, nfd)
 
 	FILEDESC_SLOCK(fdp);
 	for (i = 0; i < nfd; i++, fds++) {
-		if (fds->fd >= fdp->fd_nfiles) {
+		if (fds->fd > fdp->fd_lastfile) {
 			fds->revents = POLLNVAL;
 			n++;
 		} else if (fds->fd < 0) {
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index f3c3c0e01d61..01cfeb9c1ffd 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -205,7 +205,7 @@ static int pipeallocfail;
 static int piperesizefail;
 static int piperesizeallowed = 1;
 
-SYSCTL_LONG(_kern_ipc, OID_AUTO, maxpipekva, CTLFLAG_RDTUN,
+SYSCTL_LONG(_kern_ipc, OID_AUTO, maxpipekva, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
 	   &maxpipekva, 0, "Pipe KVA limit");
 SYSCTL_LONG(_kern_ipc, OID_AUTO, pipekva, CTLFLAG_RD,
 	   &amountpipekva, 0, "Pipe KVA usage");
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 821c779b7e38..b30e12a5ac63 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -917,19 +917,11 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data)
 		case PT_DETACH:
 			/* reset process parent */
 			if (p->p_oppid != p->p_pptr->p_pid) {
-				struct proc *pp;
-
 				PROC_LOCK(p->p_pptr);
 				sigqueue_take(p->p_ksi);
 				PROC_UNLOCK(p->p_pptr);
 
-				PROC_UNLOCK(p);
-				pp = pfind(p->p_oppid);
-				if (pp == NULL)
-					pp = initproc;
-				else
-					PROC_UNLOCK(pp);
-				PROC_LOCK(p);
+				pp = proc_realparent(p);
 				proc_reparent(p, pp);
 				if (pp == initproc)
 					p->p_sigparent = SIGCHLD;
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index d58cb7e791e8..a572a0e0c145 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -196,13 +196,7 @@ msginit()
 {
 	int i, error;
 
-	TUNABLE_INT_FETCH("kern.ipc.msgseg", &msginfo.msgseg);
-	TUNABLE_INT_FETCH("kern.ipc.msgssz", &msginfo.msgssz);
 	msginfo.msgmax = msginfo.msgseg * msginfo.msgssz;
-	TUNABLE_INT_FETCH("kern.ipc.msgmni", &msginfo.msgmni);
-	TUNABLE_INT_FETCH("kern.ipc.msgmnb", &msginfo.msgmnb);
-	TUNABLE_INT_FETCH("kern.ipc.msgtql", &msginfo.msgtql);
-
 	msgpool = malloc(msginfo.msgmax, M_MSG, M_WAITOK);
 	msgmaps = malloc(sizeof(struct msgmap) * msginfo.msgseg, M_MSG, M_WAITOK);
 	msghdrs = malloc(sizeof(struct msg) * msginfo.msgtql, M_MSG, M_WAITOK);
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index f9ff2170dc32..c63290240799 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -196,7 +196,7 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, semmns, CTLFLAG_RDTUN, &seminfo.semmns, 0,
     "Maximum number of semaphores in the system");
 SYSCTL_INT(_kern_ipc, OID_AUTO, semmnu, CTLFLAG_RDTUN, &seminfo.semmnu, 0,
     "Maximum number of undo structures in the system");
-SYSCTL_INT(_kern_ipc, OID_AUTO, semmsl, CTLFLAG_RW, &seminfo.semmsl, 0,
+SYSCTL_INT(_kern_ipc, OID_AUTO, semmsl, CTLFLAG_RWTUN, &seminfo.semmsl, 0,
     "Max semaphores per id");
 SYSCTL_INT(_kern_ipc, OID_AUTO, semopm, CTLFLAG_RDTUN, &seminfo.semopm, 0,
     "Max operations per semop call");
@@ -204,9 +204,9 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, semume, CTLFLAG_RDTUN, &seminfo.semume, 0,
     "Max undo entries per process");
 SYSCTL_INT(_kern_ipc, OID_AUTO, semusz, CTLFLAG_RDTUN, &seminfo.semusz, 0,
     "Size in bytes of undo structure");
-SYSCTL_INT(_kern_ipc, OID_AUTO, semvmx, CTLFLAG_RW, &seminfo.semvmx, 0,
+SYSCTL_INT(_kern_ipc, OID_AUTO, semvmx, CTLFLAG_RWTUN, &seminfo.semvmx, 0,
     "Semaphore maximum value");
-SYSCTL_INT(_kern_ipc, OID_AUTO, semaem, CTLFLAG_RW, &seminfo.semaem, 0,
+SYSCTL_INT(_kern_ipc, OID_AUTO, semaem, CTLFLAG_RWTUN, &seminfo.semaem, 0,
     "Adjust on exit max value");
 SYSCTL_PROC(_kern_ipc, OID_AUTO, sema, CTLTYPE_OPAQUE | CTLFLAG_RD,
     NULL, 0, sysctl_sema, "", "Semaphore id pool");
@@ -249,16 +249,6 @@ seminit(void)
 {
 	int i, error;
 
-	TUNABLE_INT_FETCH("kern.ipc.semmni", &seminfo.semmni);
-	TUNABLE_INT_FETCH("kern.ipc.semmns", &seminfo.semmns);
-	TUNABLE_INT_FETCH("kern.ipc.semmnu", &seminfo.semmnu);
-	TUNABLE_INT_FETCH("kern.ipc.semmsl", &seminfo.semmsl);
-	TUNABLE_INT_FETCH("kern.ipc.semopm", &seminfo.semopm);
-	TUNABLE_INT_FETCH("kern.ipc.semume", &seminfo.semume);
-	TUNABLE_INT_FETCH("kern.ipc.semusz", &seminfo.semusz);
-	TUNABLE_INT_FETCH("kern.ipc.semvmx", &seminfo.semvmx);
-	TUNABLE_INT_FETCH("kern.ipc.semaem", &seminfo.semaem);
-
 	sem = malloc(sizeof(struct sem) * seminfo.semmns, M_SEM, M_WAITOK);
 	sema = malloc(sizeof(struct semid_kernel) * seminfo.semmni, M_SEM,
 	    M_WAITOK);
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 4144d9431f9d..a7a7c167e550 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -156,29 +156,29 @@ static int sysctl_shmsegs(SYSCTL_HANDLER_ARGS);
 #endif
 
 struct	shminfo shminfo = {
-	SHMMAX,
-	SHMMIN,
-	SHMMNI,
-	SHMSEG,
-	SHMALL
+	.shmmax = SHMMAX,
+	.shmmin = SHMMIN,
+	.shmmni = SHMMNI,
+	.shmseg = SHMSEG,
+	.shmall = SHMALL
 };
 
 static int shm_use_phys;
 static int shm_allow_removed;
 
-SYSCTL_ULONG(_kern_ipc, OID_AUTO, shmmax, CTLFLAG_RW, &shminfo.shmmax, 0,
+SYSCTL_ULONG(_kern_ipc, OID_AUTO, shmmax, CTLFLAG_RWTUN, &shminfo.shmmax, 0,
     "Maximum shared memory segment size");
-SYSCTL_ULONG(_kern_ipc, OID_AUTO, shmmin, CTLFLAG_RW, &shminfo.shmmin, 0,
+SYSCTL_ULONG(_kern_ipc, OID_AUTO, shmmin, CTLFLAG_RWTUN, &shminfo.shmmin, 0,
     "Minimum shared memory segment size");
 SYSCTL_ULONG(_kern_ipc, OID_AUTO, shmmni, CTLFLAG_RDTUN, &shminfo.shmmni, 0,
     "Number of shared memory identifiers");
 SYSCTL_ULONG(_kern_ipc, OID_AUTO, shmseg, CTLFLAG_RDTUN, &shminfo.shmseg, 0,
     "Number of segments per process");
-SYSCTL_ULONG(_kern_ipc, OID_AUTO, shmall, CTLFLAG_RW, &shminfo.shmall, 0,
+SYSCTL_ULONG(_kern_ipc, OID_AUTO, shmall, CTLFLAG_RWTUN, &shminfo.shmall, 0,
     "Maximum number of pages available for shared memory");
-SYSCTL_INT(_kern_ipc, OID_AUTO, shm_use_phys, CTLFLAG_RW,
+SYSCTL_INT(_kern_ipc, OID_AUTO, shm_use_phys, CTLFLAG_RWTUN,
     &shm_use_phys, 0, "Enable/Disable locking of shared memory pages in core");
-SYSCTL_INT(_kern_ipc, OID_AUTO, shm_allow_removed, CTLFLAG_RW,
+SYSCTL_INT(_kern_ipc, OID_AUTO, shm_allow_removed, CTLFLAG_RWTUN,
     &shm_allow_removed, 0,
     "Enable/Disable attachment to attached segments marked for removal");
 SYSCTL_PROC(_kern_ipc, OID_AUTO, shmsegs, CTLTYPE_OPAQUE | CTLFLAG_RD,
@@ -887,20 +887,14 @@ shminit()
 	if (TUNABLE_ULONG_FETCH("kern.ipc.shmmaxpgs", &shminfo.shmall) != 0)
 		printf("kern.ipc.shmmaxpgs is now called kern.ipc.shmall!\n");
 #endif
-	TUNABLE_ULONG_FETCH("kern.ipc.shmall", &shminfo.shmall);
-	if (!TUNABLE_ULONG_FETCH("kern.ipc.shmmax", &shminfo.shmmax)) {
+	if (shminfo.shmmax == SHMMAX) {
 		/* Initialize shmmax dealing with possible overflow. */
-		for (i = PAGE_SIZE; i > 0; i--) {
+		for (i = PAGE_SIZE; i != 0; i--) {
 			shminfo.shmmax = shminfo.shmall * i;
-			if (shminfo.shmmax >= shminfo.shmall)
+			if ((shminfo.shmmax / shminfo.shmall) == (u_long)i)
 				break;
 		}
 	}
-	TUNABLE_ULONG_FETCH("kern.ipc.shmmin", &shminfo.shmmin);
-	TUNABLE_ULONG_FETCH("kern.ipc.shmmni", &shminfo.shmmni);
-	TUNABLE_ULONG_FETCH("kern.ipc.shmseg", &shminfo.shmseg);
-	TUNABLE_INT_FETCH("kern.ipc.shm_use_phys", &shm_use_phys);
-
 	shmalloced = shminfo.shmmni;
 	shmsegs = malloc(shmalloced * sizeof(shmsegs[0]), M_SHM, M_WAITOK);
 	for (i = 0; i < shmalloced; i++) {
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 1923499f69dd..e918d1cfd187 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1370,14 +1370,14 @@ tty_wait(struct tty *tp, struct cv *cv)
 
 	error = cv_wait_sig(cv, tp->t_mtx);
 
-	/* Restart the system call when we may have been revoked. */
-	if (tp->t_revokecnt != revokecnt)
-		return (ERESTART);
-
 	/* Bail out when the device slipped away. */
 	if (tty_gone(tp))
 		return (ENXIO);
 
+	/* Restart the system call when we may have been revoked. */
+	if (tp->t_revokecnt != revokecnt)
+		return (ERESTART);
+
 	return (error);
 }
 
diff --git a/sys/kern/uipc_accf.c b/sys/kern/uipc_accf.c
index 236b60d01cfd..78ddd8641145 100644
--- a/sys/kern/uipc_accf.c
+++ b/sys/kern/uipc_accf.c
@@ -60,9 +60,8 @@ MALLOC_DEFINE(M_ACCF, "accf", "accept filter data");
 
 static int unloadable = 0;
 
-SYSCTL_DECL(_net_inet);	/* XXX: some header should do this for me */
-SYSCTL_NODE(_net_inet, OID_AUTO, accf, CTLFLAG_RW, 0, "Accept filters");
-SYSCTL_INT(_net_inet_accf, OID_AUTO, unloadable, CTLFLAG_RW, &unloadable, 0,
+SYSCTL_NODE(_net, OID_AUTO, accf, CTLFLAG_RW, 0, "Accept filters");
+SYSCTL_INT(_net_accf, OID_AUTO, unloadable, CTLFLAG_RW, &unloadable, 0,
 	"Allow unload of accept filters (not recommended)");
 
 /*
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 61ef0833ab48..d56af02022a4 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -255,18 +255,18 @@ m_freem(struct mbuf *mb)
  */
 int
 m_extadd(struct mbuf *mb, caddr_t buf, u_int size,
-    int (*freef)(struct mbuf *, void *, void *), void *arg1, void *arg2,
+    void (*freef)(struct mbuf *, void *, void *), void *arg1, void *arg2,
     int flags, int type, int wait)
 {
 	KASSERT(type != EXT_CLUSTER, ("%s: EXT_CLUSTER not allowed", __func__));
 
 	if (type != EXT_EXTREF)
-		mb->m_ext.ref_cnt = uma_zalloc(zone_ext_refcnt, wait);
+		mb->m_ext.ext_cnt = uma_zalloc(zone_ext_refcnt, wait);
 
-	if (mb->m_ext.ref_cnt == NULL)
+	if (mb->m_ext.ext_cnt == NULL)
 		return (ENOMEM);
 
-	*(mb->m_ext.ref_cnt) = 1;
+	*(mb->m_ext.ext_cnt) = 1;
 	mb->m_flags |= (M_EXT | flags);
 	mb->m_ext.ext_buf = buf;
 	mb->m_data = mb->m_ext.ext_buf;
@@ -287,23 +287,35 @@ m_extadd(struct mbuf *mb, caddr_t buf, u_int size,
 void
 mb_free_ext(struct mbuf *m)
 {
-	int skipmbuf;
+	int freembuf;
 
-	KASSERT((m->m_flags & M_EXT) == M_EXT, ("%s: M_EXT not set", __func__));
-	KASSERT(m->m_ext.ref_cnt != NULL, ("%s: ref_cnt not set", __func__));
+	KASSERT(m->m_flags & M_EXT, ("%s: M_EXT not set on %p", __func__, m));
 
 	/*
-	 * check if the header is embedded in the cluster
+	 * Check if the header is embedded in the cluster.
 	 */
-	skipmbuf = (m->m_flags & M_NOFREE);
+	freembuf = (m->m_flags & M_NOFREE) ? 0 : 1;
+
+	switch (m->m_ext.ext_type) {
+	case EXT_SFBUF:
+		sf_ext_free(m->m_ext.ext_arg1, m->m_ext.ext_arg2);
+		break;
+	default:
+		KASSERT(m->m_ext.ext_cnt != NULL,
+		    ("%s: no refcounting pointer on %p", __func__, m));
+		/* 
+		 * Free attached storage if this mbuf is the only
+		 * reference to it.
+		 */
+		if (*(m->m_ext.ext_cnt) != 1) {
+			if (atomic_fetchadd_int(m->m_ext.ext_cnt, -1) != 1)
+				break;
+		}
 
-	/* Free attached storage if this mbuf is the only reference to it. */
-	if (*(m->m_ext.ref_cnt) == 1 ||
-	    atomic_fetchadd_int(m->m_ext.ref_cnt, -1) == 1) {
 		switch (m->m_ext.ext_type) {
 		case EXT_PACKET:	/* The packet zone is special. */
-			if (*(m->m_ext.ref_cnt) == 0)
-				*(m->m_ext.ref_cnt) = 1;
+			if (*(m->m_ext.ext_cnt) == 0)
+				*(m->m_ext.ext_cnt) = 1;
 			uma_zfree(zone_pack, m);
 			return;		/* Job done. */
 		case EXT_CLUSTER:
@@ -318,18 +330,17 @@ mb_free_ext(struct mbuf *m)
 		case EXT_JUMBO16:
 			uma_zfree(zone_jumbo16, m->m_ext.ext_buf);
 			break;
-		case EXT_SFBUF:
 		case EXT_NET_DRV:
 		case EXT_MOD_TYPE:
 		case EXT_DISPOSABLE:
-			*(m->m_ext.ref_cnt) = 0;
+			*(m->m_ext.ext_cnt) = 0;
 			uma_zfree(zone_ext_refcnt, __DEVOLATILE(u_int *,
-				m->m_ext.ref_cnt));
+				m->m_ext.ext_cnt));
 			/* FALLTHROUGH */
 		case EXT_EXTREF:
 			KASSERT(m->m_ext.ext_free != NULL,
 				("%s: ext_free not set", __func__));
-			(void)(*(m->m_ext.ext_free))(m, m->m_ext.ext_arg1,
+			(*(m->m_ext.ext_free))(m, m->m_ext.ext_arg1,
 			    m->m_ext.ext_arg2);
 			break;
 		default:
@@ -337,23 +348,9 @@ mb_free_ext(struct mbuf *m)
 				("%s: unknown ext_type", __func__));
 		}
 	}
-	if (skipmbuf)
-		return;
 
-	/*
-	 * Free this mbuf back to the mbuf zone with all m_ext
-	 * information purged.
-	 */
-	m->m_ext.ext_buf = NULL;
-	m->m_ext.ext_free = NULL;
-	m->m_ext.ext_arg1 = NULL;
-	m->m_ext.ext_arg2 = NULL;
-	m->m_ext.ref_cnt = NULL;
-	m->m_ext.ext_size = 0;
-	m->m_ext.ext_type = 0;
-	m->m_ext.ext_flags = 0;
-	m->m_flags &= ~M_EXT;
-	uma_zfree(zone_mbuf, m);
+	if (freembuf)
+		uma_zfree(zone_mbuf, m);
 }
 
 /*
@@ -363,22 +360,24 @@ mb_free_ext(struct mbuf *m)
 static void
 mb_dupcl(struct mbuf *n, struct mbuf *m)
 {
-	KASSERT((m->m_flags & M_EXT) == M_EXT, ("%s: M_EXT not set", __func__));
-	KASSERT(m->m_ext.ref_cnt != NULL, ("%s: ref_cnt not set", __func__));
-	KASSERT((n->m_flags & M_EXT) == 0, ("%s: M_EXT set", __func__));
 
-	if (*(m->m_ext.ref_cnt) == 1)
-		*(m->m_ext.ref_cnt) += 1;
-	else
-		atomic_add_int(m->m_ext.ref_cnt, 1);
-	n->m_ext.ext_buf = m->m_ext.ext_buf;
-	n->m_ext.ext_free = m->m_ext.ext_free;
-	n->m_ext.ext_arg1 = m->m_ext.ext_arg1;
-	n->m_ext.ext_arg2 = m->m_ext.ext_arg2;
-	n->m_ext.ext_size = m->m_ext.ext_size;
-	n->m_ext.ref_cnt = m->m_ext.ref_cnt;
-	n->m_ext.ext_type = m->m_ext.ext_type;
-	n->m_ext.ext_flags = m->m_ext.ext_flags;
+	KASSERT(m->m_flags & M_EXT, ("%s: M_EXT not set on %p", __func__, m));
+	KASSERT(!(n->m_flags & M_EXT), ("%s: M_EXT set on %p", __func__, n));
+
+	switch (m->m_ext.ext_type) {
+	case EXT_SFBUF:
+		sf_ext_ref(m->m_ext.ext_arg1, m->m_ext.ext_arg2);
+		break;
+	default:
+		KASSERT(m->m_ext.ext_cnt != NULL,
+		    ("%s: no refcounting pointer on %p", __func__, m));
+		if (*(m->m_ext.ext_cnt) == 1)
+			*(m->m_ext.ext_cnt) += 1;
+		else
+			atomic_add_int(m->m_ext.ext_cnt, 1);
+	}
+
+	n->m_ext = m->m_ext;
 	n->m_flags |= M_EXT;
 	n->m_flags |= m->m_flags & M_RDONLY;
 }
diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c
index 030ee120002b..084341005158 100644
--- a/sys/kern/uipc_shm.c
+++ b/sys/kern/uipc_shm.c
@@ -45,6 +45,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_capsicum.h"
+#include "opt_ktrace.h"
 
 #include <sys/param.h>
 #include <sys/capsicum.h>
@@ -53,6 +54,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/filedesc.h>
 #include <sys/fnv_hash.h>
 #include <sys/kernel.h>
+#include <sys/uio.h>
+#include <sys/signal.h>
+#include <sys/ktrace.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mman.h>
@@ -193,16 +197,6 @@ uiomove_object_page(vm_object_t obj, size_t len, struct uio *uio)
 	vm_page_xunbusy(m);
 	vm_page_lock(m);
 	vm_page_hold(m);
-	vm_page_unlock(m);
-	VM_OBJECT_WUNLOCK(obj);
-	error = uiomove_fromphys(&m, offset, tlen, uio);
-	if (uio->uio_rw == UIO_WRITE && error == 0) {
-		VM_OBJECT_WLOCK(obj);
-		vm_page_dirty(m);
-		VM_OBJECT_WUNLOCK(obj);
-	}
-	vm_page_lock(m);
-	vm_page_unhold(m);
 	if (m->queue == PQ_NONE) {
 		vm_page_deactivate(m);
 	} else {
@@ -210,6 +204,17 @@ uiomove_object_page(vm_object_t obj, size_t len, struct uio *uio)
 		vm_page_requeue(m);
 	}
 	vm_page_unlock(m);
+	VM_OBJECT_WUNLOCK(obj);
+	error = uiomove_fromphys(&m, offset, tlen, uio);
+	if (uio->uio_rw == UIO_WRITE && error == 0) {
+		VM_OBJECT_WLOCK(obj);
+		vm_page_dirty(m);
+		vm_pager_page_unswapped(m);
+		VM_OBJECT_WUNLOCK(obj);
+	}
+	vm_page_lock(m);
+	vm_page_unhold(m);
+	vm_page_unlock(m);
 
 	return (error);
 }
@@ -726,7 +731,10 @@ sys_shm_open(struct thread *td, struct shm_open_args *uap)
 	} else {
 		path = malloc(MAXPATHLEN, M_SHMFD, M_WAITOK);
 		error = copyinstr(uap->path, path, MAXPATHLEN, NULL);
-
+#ifdef KTRACE
+		if (error == 0 && KTRPOINT(curthread, KTR_NAMEI))
+			ktrnamei(path);
+#endif
 		/* Require paths to start with a '/' character. */
 		if (error == 0 && path[0] != '/')
 			error = EINVAL;
@@ -824,7 +832,10 @@ sys_shm_unlink(struct thread *td, struct shm_unlink_args *uap)
 		free(path, M_TEMP);
 		return (error);
 	}
-
+#ifdef KTRACE
+	if (KTRPOINT(curthread, KTR_NAMEI))
+		ktrnamei(path);
+#endif
 	fnv = fnv_32_str(path, FNV1_32_INIT);
 	sx_xlock(&shm_dict_lock);
 	error = shm_remove(path, fnv, td->td_ucred);
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index d804d9ae3f39..258208959801 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -1071,6 +1071,11 @@ sbcreatecontrol(caddr_t p, int size, int type, int level)
 	m->m_len = 0;
 	KASSERT(CMSG_SPACE((u_int)size) <= M_TRAILINGSPACE(m),
 	    ("sbcreatecontrol: short mbuf"));
+	/*
+	 * Don't leave the padding between the msg header and the
+	 * cmsg data and the padding after the cmsg data un-initialized.
+	 */
+	bzero(cp, CMSG_SPACE((u_int)size));
 	if (p != NULL)
 		(void)memcpy(CMSG_DATA(cp), p, size);
 	m->m_len = CMSG_SPACE(size);
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 52c244e97aa2..ddf52b08c90f 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -378,11 +378,9 @@ sodealloc(struct socket *so)
 	if (so->so_snd.sb_hiwat)
 		(void)chgsbsize(so->so_cred->cr_uidinfo,
 		    &so->so_snd.sb_hiwat, 0, RLIM_INFINITY);
-#ifdef INET
 	/* remove acccept filter if one is present. */
 	if (so->so_accf != NULL)
 		do_setopt_accept_filter(so, NULL);
-#endif
 #ifdef MAC
 	mac_socket_destroy(so);
 #endif
@@ -2402,13 +2400,12 @@ sosetopt(struct socket *so, struct sockopt *sopt)
 		error = ENOPROTOOPT;
 	} else {
 		switch (sopt->sopt_name) {
-#ifdef INET
 		case SO_ACCEPTFILTER:
 			error = do_setopt_accept_filter(so, sopt);
 			if (error)
 				goto bad;
 			break;
-#endif
+
 		case SO_LINGER:
 			error = sooptcopyin(sopt, &l, sizeof l, sizeof l);
 			if (error)
@@ -2547,8 +2544,10 @@ sosetopt(struct socket *so, struct sockopt *sopt)
 				error = EDOM;
 				goto bad;
 			}
-			val = tvtosbt(tv);
-
+			if (tv.tv_sec > INT32_MAX)
+				val = SBT_MAX;
+			else
+				val = tvtosbt(tv);
 			switch (sopt->sopt_name) {
 			case SO_SNDTIMEO:
 				so->so_snd.sb_timeo = val;
@@ -2635,11 +2634,10 @@ sogetopt(struct socket *so, struct sockopt *sopt)
 		return (error);
 	} else {
 		switch (sopt->sopt_name) {
-#ifdef INET
 		case SO_ACCEPTFILTER:
 			error = do_getopt_accept_filter(so, sopt);
 			break;
-#endif
+
 		case SO_LINGER:
 			SOCK_LOCK(so);
 			l.l_onoff = so->so_options & SO_LINGER;
@@ -2698,10 +2696,8 @@ sogetopt(struct socket *so, struct sockopt *sopt)
 
 		case SO_SNDTIMEO:
 		case SO_RCVTIMEO:
-			optval = (sopt->sopt_name == SO_SNDTIMEO ?
-				  so->so_snd.sb_timeo : so->so_rcv.sb_timeo);
-
-			tv = sbttotv(optval);
+			tv = sbttotv(sopt->sopt_name == SO_SNDTIMEO ?
+			    so->so_snd.sb_timeo : so->so_rcv.sb_timeo);
 #ifdef COMPAT_FREEBSD32
 			if (SV_CURPROC_FLAG(SV_ILP32)) {
 				struct timeval32 tv32;
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 52dc021b6850..43dd56b6cf1e 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1983,36 +1983,55 @@ filt_sfsync(struct knote *kn, long hint)
 	return (ret);
 }
 
+/*
+ * Add more references to a vm_page + sf_buf + sendfile_sync.
+ */
+void
+sf_ext_ref(void *arg1, void *arg2)
+{
+	struct sf_buf *sf = arg1;
+	struct sendfile_sync *sfs = arg2;
+	vm_page_t pg = sf_buf_page(sf);
+
+	sf_buf_ref(sf);
+
+	vm_page_lock(pg);
+	vm_page_wire(pg);
+	vm_page_unlock(pg);
+
+	if (sfs != NULL) {
+		mtx_lock(&sfs->mtx);
+		KASSERT(sfs->count > 0, ("Sendfile sync botchup count == 0"));
+		sfs->count++;
+		mtx_unlock(&sfs->mtx);
+	}
+}
 
 /*
  * Detach mapped page and release resources back to the system.
  */
-int
-sf_buf_mext(struct mbuf *mb, void *addr, void *args)
+void
+sf_ext_free(void *arg1, void *arg2)
 {
-	vm_page_t m;
-	struct sendfile_sync *sfs;
+	struct sf_buf *sf = arg1;
+	struct sendfile_sync *sfs = arg2;
+	vm_page_t pg = sf_buf_page(sf);
 
-	m = sf_buf_page(args);
-	sf_buf_free(args);
-	vm_page_lock(m);
-	vm_page_unwire(m, 0);
+	sf_buf_free(sf);
+
+	vm_page_lock(pg);
+	vm_page_unwire(pg, PQ_INACTIVE);
 	/*
 	 * 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 (m->wire_count == 0 && m->object == NULL)
-		vm_page_free(m);
-	vm_page_unlock(m);
-	if (addr != NULL) {
-		sfs = addr;
+	if (pg->wire_count == 0 && pg->object == NULL)
+		vm_page_free(pg);
+	vm_page_unlock(pg);
+
+	if (sfs != NULL)
 		sf_sync_deref(sfs);
-	}
-	/*
-	 * sfs may be invalid at this point, don't use it!
-	 */
-	return (EXT_FREE_OK);
 }
 
 /*
@@ -2128,7 +2147,7 @@ sf_sync_alloc(uint32_t flags)
 /*
  * Take a reference to a sfsync instance.
  *
- * This has to map 1:1 to free calls coming in via sf_buf_mext(),
+ * This has to map 1:1 to free calls coming in via sf_ext_free(),
  * so typically this will be referenced once for each mbuf allocated.
  */
 void
@@ -2692,7 +2711,7 @@ sendfile_readpage(vm_object_t obj, struct vnode *vp, int nd,
 	} else if (m != NULL) {
 free_page:
 		vm_page_lock(m);
-		vm_page_unwire(m, 0);
+		vm_page_unwire(m, PQ_INACTIVE);
 
 		/*
 		 * See if anyone else might know about this page.  If
@@ -3050,7 +3069,7 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio,
 			if (sf == NULL) {
 				SFSTAT_INC(sf_allocfail);
 				vm_page_lock(pg);
-				vm_page_unwire(pg, 0);
+				vm_page_unwire(pg, PQ_INACTIVE);
 				KASSERT(pg->object != NULL,
 				    ("%s: object disappeared", __func__));
 				vm_page_unlock(pg);
@@ -3066,17 +3085,19 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio,
 			m0 = m_get((mnw ? M_NOWAIT : M_WAITOK), MT_DATA);
 			if (m0 == NULL) {
 				error = (mnw ? EAGAIN : ENOBUFS);
-				(void)sf_buf_mext(NULL, NULL, sf);
-				break;
-			}
-			if (m_extadd(m0, (caddr_t )sf_buf_kva(sf), PAGE_SIZE,
-			    sf_buf_mext, sfs, sf, M_RDONLY, EXT_SFBUF,
-			    (mnw ? M_NOWAIT : M_WAITOK)) != 0) {
-				error = (mnw ? EAGAIN : ENOBUFS);
-				(void)sf_buf_mext(NULL, NULL, sf);
-				m_freem(m0);
+				sf_ext_free(sf, NULL);
 				break;
 			}
+			/*
+			 * Attach EXT_SFBUF external storage.
+			 */
+			m0->m_ext.ext_buf = (caddr_t )sf_buf_kva(sf);
+			m0->m_ext.ext_size = PAGE_SIZE;
+			m0->m_ext.ext_arg1 = sf;
+			m0->m_ext.ext_arg2 = sfs;
+			m0->m_ext.ext_type = EXT_SFBUF;
+			m0->m_ext.ext_flags = 0;
+			m0->m_flags |= (M_EXT|M_RDONLY);
 			m0->m_data = (char *)sf_buf_kva(sf) + pgoff;
 			m0->m_len = xfsize;
 
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 90a815c02aab..11b27d93d115 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -467,6 +467,9 @@ uipc_bindat(int fd, struct socket *so, struct sockaddr *nam, struct thread *td)
 	cap_rights_t rights;
 	char *buf;
 
+	if (nam->sa_family != AF_UNIX)
+		return (EAFNOSUPPORT);
+
 	unp = sotounpcb(so);
 	KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
 
@@ -894,7 +897,7 @@ uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
 			from = &sun_noname;
 		so2 = unp2->unp_socket;
 		SOCKBUF_LOCK(&so2->so_rcv);
-		if (sbappendaddr_nospacecheck_locked(&so2->so_rcv, from, m,
+		if (sbappendaddr_locked(&so2->so_rcv, from, m,
 		    control)) {
 			sorwakeup_locked(so2);
 			m = NULL;
@@ -1278,6 +1281,9 @@ unp_connectat(int fd, struct socket *so, struct sockaddr *nam,
 	cap_rights_t rights;
 	int error, len;
 
+	if (nam->sa_family != AF_UNIX)
+		return (EAFNOSUPPORT);
+
 	UNP_LINK_WLOCK_ASSERT();
 
 	unp = sotounpcb(so);
@@ -1847,7 +1853,7 @@ unp_internalize(struct mbuf **controlp, struct thread *td)
 	struct filedescent *fde, **fdep, *fdev;
 	struct file *fp;
 	struct timeval *tv;
-	int i, fd, *fdp;
+	int i, *fdp;
 	void *data;
 	socklen_t clen = control->m_len, datalen;
 	int error, oldfds;
@@ -1859,7 +1865,7 @@ unp_internalize(struct mbuf **controlp, struct thread *td)
 	*controlp = NULL;
 	while (cm != NULL) {
 		if (sizeof(*cm) > clen || cm->cmsg_level != SOL_SOCKET
-		    || cm->cmsg_len > clen) {
+		    || cm->cmsg_len > clen || cm->cmsg_len < sizeof(*cm)) {
 			error = EINVAL;
 			goto out;
 		}
@@ -1900,14 +1906,13 @@ unp_internalize(struct mbuf **controlp, struct thread *td)
 			 */
 			fdp = data;
 			FILEDESC_SLOCK(fdesc);
-			for (i = 0; i < oldfds; i++) {
-				fd = *fdp++;
-				if (fget_locked(fdesc, fd) == NULL) {
+			for (i = 0; i < oldfds; i++, fdp++) {
+				fp = fget_locked(fdesc, *fdp);
+				if (fp == NULL) {
 					FILEDESC_SUNLOCK(fdesc);
 					error = EBADF;
 					goto out;
 				}
-				fp = fdesc->fd_ofiles[fd].fde_file;
 				if (!(fp->f_ops->fo_flags & DFLAG_PASSABLE)) {
 					FILEDESC_SUNLOCK(fdesc);
 					error = EOPNOTSUPP;
@@ -2342,7 +2347,7 @@ unp_scan(struct mbuf *m0, void (*op)(struct filedescent **, int))
 				}
 			}
 		}
-		m0 = m0->m_act;
+		m0 = m0->m_nextpkt;
 	}
 }
 
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 0311bed63da5..2354adaf3f9c 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -98,7 +98,8 @@ struct	buf_ops buf_ops_bio = {
 struct buf *buf;		/* buffer header pool */
 caddr_t unmapped_buf;
 
-static struct proc *bufdaemonproc;
+/* Used below and for softdep flushing threads in ufs/ffs/ffs_softdep.c */
+struct proc *bufdaemonproc;
 
 static int inmem(struct vnode *vp, daddr_t blkno);
 static void vm_hold_free_pages(struct buf *bp, int newbsize);
@@ -1896,7 +1897,7 @@ vfs_vmio_release(struct buf *bp)
 		 * everything on the inactive queue.
 		 */
 		vm_page_lock(m);
-		vm_page_unwire(m, 0);
+		vm_page_unwire(m, PQ_INACTIVE);
 
 		/*
 		 * Might as well free the page if we can and it has
@@ -3483,7 +3484,7 @@ allocbuf(struct buf *bp, int size)
 
 					bp->b_pages[i] = NULL;
 					vm_page_lock(m);
-					vm_page_unwire(m, 0);
+					vm_page_unwire(m, PQ_INACTIVE);
 					vm_page_unlock(m);
 				}
 				VM_OBJECT_WUNLOCK(bp->b_bufobj->bo_object);
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 33f5cce65c52..96ddbd97a8fc 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -1424,7 +1424,7 @@ cache_enter(struct vnode *dvp, struct vnode *vp, struct componentname *cnp)
  * This function updates path string to vnode's full global path
  * and checks the size of the new path string against the pathlen argument.
  *
- * Requires a locked, referenced vnode and GIANT lock held.
+ * Requires a locked, referenced vnode.
  * Vnode is re-locked on success or ENODEV, otherwise unlocked.
  *
  * If sysctl debug.disablefullpath is set, ENODEV is returned,
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index eab48fbea798..fb95417ab15d 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/linker.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
+#include <sys/sx.h>
 #include <sys/syscallsubr.h>
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
@@ -64,6 +65,8 @@ int maxvfsconf = VFS_GENERIC + 1;
  * New entries are added/deleted by vfs_register()/vfs_unregister()
  */
 struct vfsconfhead vfsconf = TAILQ_HEAD_INITIALIZER(vfsconf);
+struct sx vfsconf_sx;
+SX_SYSINIT(vfsconf, &vfsconf_sx, "vfsconf");
 
 /*
  * Loader.conf variable vfs.typenumhash enables setting vfc_typenum using a hash
@@ -72,7 +75,6 @@ struct vfsconfhead vfsconf = TAILQ_HEAD_INITIALIZER(vfsconf);
  * changing for file systems that use vfc_typenum in their fsid.
  */
 static int	vfs_typenumhash = 1;
-TUNABLE_INT("vfs.typenumhash", &vfs_typenumhash);
 SYSCTL_INT(_vfs, OID_AUTO, typenumhash, CTLFLAG_RDTUN, &vfs_typenumhash, 0,
     "Set vfc_typenum using a hash calculation on vfc_name, so that it does not"
     "change when file systems are loaded in a different order.");
@@ -105,17 +107,30 @@ struct vattr va_null;
  * Routines having to do with the management of the vnode table.
  */
 
+static struct vfsconf *
+vfs_byname_locked(const char *name)
+{
+	struct vfsconf *vfsp;
+
+	sx_assert(&vfsconf_sx, SA_LOCKED);
+	if (!strcmp(name, "ffs"))
+		name = "ufs";
+	TAILQ_FOREACH(vfsp, &vfsconf, vfc_list) {
+		if (!strcmp(name, vfsp->vfc_name))
+			return (vfsp);
+	}
+	return (NULL);
+}
+
 struct vfsconf *
 vfs_byname(const char *name)
 {
 	struct vfsconf *vfsp;
 
-	if (!strcmp(name, "ffs"))
-		name = "ufs";
-	TAILQ_FOREACH(vfsp, &vfsconf, vfc_list)
-		if (!strcmp(name, vfsp->vfc_name))
-			return (vfsp);
-	return (NULL);
+	vfsconf_slock();
+	vfsp = vfs_byname_locked(name);
+	vfsconf_sunlock();
+	return (vfsp);
 }
 
 struct vfsconf *
@@ -169,8 +184,11 @@ vfs_register(struct vfsconf *vfc)
 		    vfc->vfc_name, vfc->vfc_version);
 		return (EINVAL);
 	}
-	if (vfs_byname(vfc->vfc_name) != NULL)
+	vfsconf_lock();
+	if (vfs_byname_locked(vfc->vfc_name) != NULL) {
+		vfsconf_unlock();
 		return (EEXIST);
+	}
 
 	if (vfs_typenumhash != 0) {
 		/*
@@ -202,26 +220,6 @@ vfs_register(struct vfsconf *vfc)
 		vfc->vfc_typenum = maxvfsconf++;
 	TAILQ_INSERT_TAIL(&vfsconf, vfc, vfc_list);
 
-	/*
-	 * If this filesystem has a sysctl node under vfs
-	 * (i.e. vfs.xxfs), then change the oid number of that node to 
-	 * match the filesystem's type number.  This allows user code
-	 * which uses the type number to read sysctl variables defined
-	 * by the filesystem to continue working. Since the oids are
-	 * in a sorted list, we need to make sure the order is
-	 * preserved by re-registering the oid after modifying its
-	 * number.
-	 */
-	sysctl_lock();
-	SLIST_FOREACH(oidp, &sysctl__vfs_children, oid_link)
-		if (strcmp(oidp->oid_name, vfc->vfc_name) == 0) {
-			sysctl_unregister_oid(oidp);
-			oidp->oid_number = vfc->vfc_typenum;
-			sysctl_register_oid(oidp);
-			break;
-		}
-	sysctl_unlock();
-
 	/*
 	 * Initialise unused ``struct vfsops'' fields, to use
 	 * the vfs_std*() functions.  Note, we need the mount
@@ -281,8 +279,30 @@ vfs_register(struct vfsconf *vfc)
 	 * Call init function for this VFS...
 	 */
 	(*(vfc->vfc_vfsops->vfs_init))(vfc);
+	vfsconf_unlock();
 
-	return 0;
+	/*
+	 * If this filesystem has a sysctl node under vfs
+	 * (i.e. vfs.xxfs), then change the oid number of that node to
+	 * match the filesystem's type number.  This allows user code
+	 * which uses the type number to read sysctl variables defined
+	 * by the filesystem to continue working. Since the oids are
+	 * in a sorted list, we need to make sure the order is
+	 * preserved by re-registering the oid after modifying its
+	 * number.
+	 */
+	sysctl_lock();
+	SLIST_FOREACH(oidp, SYSCTL_CHILDREN(&sysctl___vfs), oid_link) {
+		if (strcmp(oidp->oid_name, vfc->vfc_name) == 0) {
+			sysctl_unregister_oid(oidp);
+			oidp->oid_number = vfc->vfc_typenum;
+			sysctl_register_oid(oidp);
+			break;
+		}
+	}
+	sysctl_unlock();
+
+	return (0);
 }
 
 
@@ -295,15 +315,22 @@ vfs_unregister(struct vfsconf *vfc)
 
 	i = vfc->vfc_typenum;
 
-	vfsp = vfs_byname(vfc->vfc_name);
-	if (vfsp == NULL)
-		return EINVAL;
-	if (vfsp->vfc_refcount)
-		return EBUSY;
+	vfsconf_lock();
+	vfsp = vfs_byname_locked(vfc->vfc_name);
+	if (vfsp == NULL) {
+		vfsconf_unlock();
+		return (EINVAL);
+	}
+	if (vfsp->vfc_refcount != 0) {
+		vfsconf_unlock();
+		return (EBUSY);
+	}
 	if (vfc->vfc_vfsops->vfs_uninit != NULL) {
 		error = (*vfc->vfc_vfsops->vfs_uninit)(vfsp);
-		if (error)
+		if (error != 0) {
+			vfsconf_unlock();
 			return (error);
+		}
 	}
 	TAILQ_REMOVE(&vfsconf, vfsp, vfc_list);
 	maxtypenum = VFS_GENERIC;
@@ -311,7 +338,8 @@ vfs_unregister(struct vfsconf *vfc)
 		if (maxtypenum < vfsp->vfc_typenum)
 			maxtypenum = vfsp->vfc_typenum;
 	maxvfsconf = maxtypenum + 1;
-	return 0;
+	vfsconf_unlock();
+	return (0);
 }
 
 /*
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 00dd496e9e37..f466ca468256 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -96,9 +96,8 @@ nameiinit(void *dummy __unused)
 SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nameiinit, NULL);
 
 static int lookup_shared = 1;
-SYSCTL_INT(_vfs, OID_AUTO, lookup_shared, CTLFLAG_RW, &lookup_shared, 0,
+SYSCTL_INT(_vfs, OID_AUTO, lookup_shared, CTLFLAG_RWTUN, &lookup_shared, 0,
     "Enables/Disables shared locks for path name translation");
-TUNABLE_INT("vfs.lookup_shared", &lookup_shared);
 
 /*
  * Convert a pathname into a pointer to a locked vnode.
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 8b764f7d8d0e..674e52674879 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -463,9 +463,9 @@ vfs_mount_alloc(struct vnode *vp, struct vfsconf *vfsp, const char *fspath,
 	mp->mnt_activevnodelistsize = 0;
 	mp->mnt_ref = 0;
 	(void) vfs_busy(mp, MBF_NOWAIT);
+	atomic_add_acq_int(&vfsp->vfc_refcount, 1);
 	mp->mnt_op = vfsp->vfc_vfsops;
 	mp->mnt_vfc = vfsp;
-	vfsp->vfc_refcount++;	/* XXX Unlocked */
 	mp->mnt_stat.f_type = vfsp->vfc_typenum;
 	mp->mnt_gen++;
 	strlcpy(mp->mnt_stat.f_fstypename, vfsp->vfc_name, MFSNAMELEN);
@@ -505,7 +505,7 @@ vfs_mount_destroy(struct mount *mp)
 		panic("vfs_mount_destroy: nonzero writeopcount");
 	if (mp->mnt_secondary_writes != 0)
 		panic("vfs_mount_destroy: nonzero secondary_writes");
-	mp->mnt_vfc->vfc_refcount--;
+	atomic_subtract_rel_int(&mp->mnt_vfc->vfc_refcount, 1);
 	if (!TAILQ_EMPTY(&mp->mnt_nvnodelist)) {
 		struct vnode *vp;
 
@@ -736,17 +736,12 @@ sys_mount(td, uap)
 	}
 
 	AUDIT_ARG_TEXT(fstype);
-	mtx_lock(&Giant);
 	vfsp = vfs_byname_kld(fstype, td, &error);
 	free(fstype, M_TEMP);
-	if (vfsp == NULL) {
-		mtx_unlock(&Giant);
+	if (vfsp == NULL)
 		return (ENOENT);
-	}
-	if (vfsp->vfc_vfsops->vfs_cmount == NULL) {
-		mtx_unlock(&Giant);
+	if (vfsp->vfc_vfsops->vfs_cmount == NULL)
 		return (EOPNOTSUPP);
-	}
 
 	ma = mount_argsu(ma, "fstype", uap->type, MFSNAMELEN);
 	ma = mount_argsu(ma, "fspath", uap->path, MNAMELEN);
@@ -755,7 +750,6 @@ sys_mount(td, uap)
 	ma = mount_argb(ma, !(flags & MNT_NOEXEC), "noexec");
 
 	error = vfsp->vfc_vfsops->vfs_cmount(ma, uap->data, flags);
-	mtx_unlock(&Giant);
 	return (error);
 }
 
@@ -777,7 +771,6 @@ vfs_domount_first(
 	struct vnode *newdp;
 	int error;
 
-	mtx_assert(&Giant, MA_OWNED);
 	ASSERT_VOP_ELOCKED(vp, __func__);
 	KASSERT((fsflags & MNT_UPDATE) == 0, ("MNT_UPDATE shouldn't be here"));
 
@@ -889,7 +882,6 @@ vfs_domount_update(
 	int error, export_error;
 	uint64_t flag;
 
-	mtx_assert(&Giant, MA_OWNED);
 	ASSERT_VOP_ELOCKED(vp, __func__);
 	KASSERT((fsflags & MNT_UPDATE) != 0, ("MNT_UPDATE should be here"));
 
@@ -1091,7 +1083,6 @@ vfs_domount(
 	error = namei(&nd);
 	if (error != 0)
 		return (error);
-	mtx_lock(&Giant);
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	vp = nd.ni_vp;
 	if ((fsflags & MNT_UPDATE) == 0) {
@@ -1106,7 +1097,6 @@ vfs_domount(
 		free(pathbuf, M_TEMP);
 	} else
 		error = vfs_domount_update(td, vp, fsflags, optlist);
-	mtx_unlock(&Giant);
 
 	ASSERT_VI_UNLOCKED(vp, __func__);
 	ASSERT_VOP_UNLOCKED(vp, __func__);
@@ -1153,12 +1143,10 @@ sys_unmount(td, uap)
 		free(pathbuf, M_TEMP);
 		return (error);
 	}
-	mtx_lock(&Giant);
 	if (uap->flags & MNT_BYFSID) {
 		AUDIT_ARG_TEXT(pathbuf);
 		/* Decode the filesystem ID. */
 		if (sscanf(pathbuf, "FSID:%d:%d", &id0, &id1) != 2) {
-			mtx_unlock(&Giant);
 			free(pathbuf, M_TEMP);
 			return (EINVAL);
 		}
@@ -1198,19 +1186,15 @@ sys_unmount(td, uap)
 		 * now, so in the !MNT_BYFSID case return the more likely
 		 * EINVAL for compatibility.
 		 */
-		mtx_unlock(&Giant);
 		return ((uap->flags & MNT_BYFSID) ? ENOENT : EINVAL);
 	}
 
 	/*
 	 * Don't allow unmounting the root filesystem.
 	 */
-	if (mp->mnt_flag & MNT_ROOTFS) {
-		mtx_unlock(&Giant);
+	if (mp->mnt_flag & MNT_ROOTFS)
 		return (EINVAL);
-	}
 	error = dounmount(mp, uap->flags, td);
-	mtx_unlock(&Giant);
 	return (error);
 }
 
@@ -1228,8 +1212,6 @@ dounmount(mp, flags, td)
 	uint64_t async_flag;
 	int mnt_gen_r;
 
-	mtx_assert(&Giant, MA_OWNED);
-
 	if ((coveredvp = mp->mnt_vnodecovered) != NULL) {
 		mnt_gen_r = mp->mnt_gen;
 		VI_LOCK(coveredvp);
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index e7aa92b0fbaf..9289e6a3524a 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -275,14 +275,6 @@ static int vnlru_nowhere;
 SYSCTL_INT(_debug, OID_AUTO, vnlru_nowhere, CTLFLAG_RW,
     &vnlru_nowhere, 0, "Number of times the vnlru process ran without success");
 
-/*
- * Macros to control when a vnode is freed and recycled.  All require
- * the vnode interlock.
- */
-#define VCANRECYCLE(vp) (((vp)->v_iflag & VI_FREE) && !(vp)->v_holdcnt)
-#define VSHOULDFREE(vp) (!((vp)->v_iflag & VI_FREE) && !(vp)->v_holdcnt)
-#define VSHOULDBUSY(vp) (((vp)->v_iflag & VI_FREE) && (vp)->v_holdcnt)
-
 /* Shift count for (uintptr_t)vp to initialize vp->v_hash. */
 static int vnsz2log;
 
@@ -500,23 +492,53 @@ vfs_getvfs(fsid_t *fsid)
 /*
  * Lookup a mount point by filesystem identifier, busying it before
  * returning.
+ *
+ * To avoid congestion on mountlist_mtx, implement simple direct-mapped
+ * cache for popular filesystem identifiers.  The cache is lockess, using
+ * the fact that struct mount's are never freed.  In worst case we may
+ * get pointer to unmounted or even different filesystem, so we have to
+ * check what we got, and go slow way if so.
  */
 struct mount *
 vfs_busyfs(fsid_t *fsid)
 {
+#define	FSID_CACHE_SIZE	256
+	typedef struct mount * volatile vmp_t;
+	static vmp_t cache[FSID_CACHE_SIZE];
 	struct mount *mp;
 	int error;
+	uint32_t hash;
 
 	CTR2(KTR_VFS, "%s: fsid %p", __func__, fsid);
+	hash = fsid->val[0] ^ fsid->val[1];
+	hash = (hash >> 16 ^ hash) & (FSID_CACHE_SIZE - 1);
+	mp = cache[hash];
+	if (mp == NULL ||
+	    mp->mnt_stat.f_fsid.val[0] != fsid->val[0] ||
+	    mp->mnt_stat.f_fsid.val[1] != fsid->val[1])
+		goto slow;
+	if (vfs_busy(mp, 0) != 0) {
+		cache[hash] = NULL;
+		goto slow;
+	}
+	if (mp->mnt_stat.f_fsid.val[0] == fsid->val[0] &&
+	    mp->mnt_stat.f_fsid.val[1] == fsid->val[1])
+		return (mp);
+	else
+	    vfs_unbusy(mp);
+
+slow:
 	mtx_lock(&mountlist_mtx);
 	TAILQ_FOREACH(mp, &mountlist, mnt_list) {
 		if (mp->mnt_stat.f_fsid.val[0] == fsid->val[0] &&
 		    mp->mnt_stat.f_fsid.val[1] == fsid->val[1]) {
 			error = vfs_busy(mp, MBF_MNTLSTLOCK);
 			if (error) {
+				cache[hash] = NULL;
 				mtx_unlock(&mountlist_mtx);
 				return (NULL);
 			}
+			cache[hash] = mp;
 			return (mp);
 		}
 	}
@@ -819,11 +841,21 @@ vnlru_free(int count)
 			TAILQ_INSERT_TAIL(&vnode_free_list, vp, v_actfreelist);
 			continue;
 		}
-		VNASSERT(VCANRECYCLE(vp), vp,
-		    ("vp inconsistent on freelist"));
+		VNASSERT((vp->v_iflag & VI_FREE) != 0 && vp->v_holdcnt == 0,
+		    vp, ("vp inconsistent on freelist"));
+
+		/*
+		 * The clear of VI_FREE prevents activation of the
+		 * vnode.  There is no sense in putting the vnode on
+		 * the mount point active list, only to remove it
+		 * later during recycling.  Inline the relevant part
+		 * of vholdl(), to avoid triggering assertions or
+		 * activating.
+		 */
 		freevnodes--;
 		vp->v_iflag &= ~VI_FREE;
-		vholdl(vp);
+		vp->v_holdcnt++;
+
 		mtx_unlock(&vnode_free_list_mtx);
 		VI_UNLOCK(vp);
 		vtryrecycle(vp);
@@ -2012,13 +2044,13 @@ v_incr_usecount(struct vnode *vp)
 {
 
 	CTR2(KTR_VFS, "%s: vp %p", __func__, vp);
+	vholdl(vp);
 	vp->v_usecount++;
 	if (vp->v_type == VCHR && vp->v_rdev != NULL) {
 		dev_lock();
 		vp->v_rdev->si_usecount++;
 		dev_unlock();
 	}
-	vholdl(vp);
 }
 
 /*
@@ -2295,11 +2327,18 @@ vholdl(struct vnode *vp)
 	struct mount *mp;
 
 	CTR2(KTR_VFS, "%s: vp %p", __func__, vp);
+#ifdef INVARIANTS
+	/* getnewvnode() calls v_incr_usecount() without holding interlock. */
+	if (vp->v_type != VNON || vp->v_data != NULL) {
+		ASSERT_VI_LOCKED(vp, "vholdl");
+		VNASSERT(vp->v_holdcnt > 0 || (vp->v_iflag & VI_FREE) != 0,
+		    vp, ("vholdl: free vnode is held"));
+	}
+#endif
 	vp->v_holdcnt++;
-	if (!VSHOULDBUSY(vp))
+	if ((vp->v_iflag & VI_FREE) == 0)
 		return;
-	ASSERT_VI_LOCKED(vp, "vholdl");
-	VNASSERT((vp->v_iflag & VI_FREE) != 0, vp, ("vnode not free"));
+	VNASSERT(vp->v_holdcnt == 1, vp, ("vholdl: wrong hold count"));
 	VNASSERT(vp->v_op != NULL, vp, ("vholdl: vnode already reclaimed."));
 	/*
 	 * Remove a vnode from the free list, mark it as in use,
@@ -2362,7 +2401,7 @@ vdropl(struct vnode *vp)
 		    ("vdropl: vnode already reclaimed."));
 		VNASSERT((vp->v_iflag & VI_FREE) == 0, vp,
 		    ("vnode already free"));
-		VNASSERT(VSHOULDFREE(vp), vp,
+		VNASSERT(vp->v_holdcnt == 0, vp,
 		    ("vdropl: freeing when we shouldn't"));
 		active = vp->v_iflag & VI_ACTIVE;
 		vp->v_iflag &= ~VI_ACTIVE;
@@ -3194,6 +3233,7 @@ sysctl_vfs_conflist(SYSCTL_HANDLER_ARGS)
 	int error;
 
 	error = 0;
+	vfsconf_slock();
 	TAILQ_FOREACH(vfsp, &vfsconf, vfc_list) {
 #ifdef COMPAT_FREEBSD32
 		if (req->flags & SCTL_MASK32)
@@ -3204,11 +3244,12 @@ sysctl_vfs_conflist(SYSCTL_HANDLER_ARGS)
 		if (error)
 			break;
 	}
+	vfsconf_sunlock();
 	return (error);
 }
 
-SYSCTL_PROC(_vfs, OID_AUTO, conflist, CTLTYPE_OPAQUE | CTLFLAG_RD,
-    NULL, 0, sysctl_vfs_conflist,
+SYSCTL_PROC(_vfs, OID_AUTO, conflist, CTLTYPE_OPAQUE | CTLFLAG_RD |
+    CTLFLAG_MPSAFE, NULL, 0, sysctl_vfs_conflist,
     "S,xvfsconf", "List of all configured filesystems");
 
 #ifndef BURN_BRIDGES
@@ -3238,9 +3279,12 @@ vfs_sysctl(SYSCTL_HANDLER_ARGS)
 	case VFS_CONF:
 		if (namelen != 3)
 			return (ENOTDIR);	/* overloaded */
-		TAILQ_FOREACH(vfsp, &vfsconf, vfc_list)
+		vfsconf_slock();
+		TAILQ_FOREACH(vfsp, &vfsconf, vfc_list) {
 			if (vfsp->vfc_typenum == name[2])
 				break;
+		}
+		vfsconf_sunlock();
 		if (vfsp == NULL)
 			return (EOPNOTSUPP);
 #ifdef COMPAT_FREEBSD32
@@ -3253,8 +3297,9 @@ vfs_sysctl(SYSCTL_HANDLER_ARGS)
 	return (EOPNOTSUPP);
 }
 
-static SYSCTL_NODE(_vfs, VFS_GENERIC, generic, CTLFLAG_RD | CTLFLAG_SKIP,
-    vfs_sysctl, "Generic filesystem");
+static SYSCTL_NODE(_vfs, VFS_GENERIC, generic, CTLFLAG_RD | CTLFLAG_SKIP |
+    CTLFLAG_MPSAFE, vfs_sysctl,
+    "Generic filesystem");
 
 #if 1 || defined(COMPAT_PRELITE2)
 
@@ -3265,6 +3310,7 @@ sysctl_ovfs_conf(SYSCTL_HANDLER_ARGS)
 	struct vfsconf *vfsp;
 	struct ovfsconf ovfs;
 
+	vfsconf_slock();
 	TAILQ_FOREACH(vfsp, &vfsconf, vfc_list) {
 		bzero(&ovfs, sizeof(ovfs));
 		ovfs.vfc_vfsops = vfsp->vfc_vfsops;	/* XXX used as flag */
@@ -3273,10 +3319,13 @@ sysctl_ovfs_conf(SYSCTL_HANDLER_ARGS)
 		ovfs.vfc_refcount = vfsp->vfc_refcount;
 		ovfs.vfc_flags = vfsp->vfc_flags;
 		error = SYSCTL_OUT(req, &ovfs, sizeof ovfs);
-		if (error)
-			return error;
+		if (error != 0) {
+			vfsconf_sunlock();
+			return (error);
+		}
 	}
-	return 0;
+	vfsconf_sunlock();
+	return (0);
 }
 
 #endif /* 1 || COMPAT_PRELITE2 */
@@ -3374,8 +3423,9 @@ sysctl_vnode(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 
-SYSCTL_PROC(_kern, KERN_VNODE, vnode, CTLTYPE_OPAQUE|CTLFLAG_RD,
-    0, 0, sysctl_vnode, "S,xvnode", "");
+SYSCTL_PROC(_kern, KERN_VNODE, vnode, CTLTYPE_OPAQUE | CTLFLAG_RD |
+    CTLFLAG_MPSAFE, 0, 0, sysctl_vnode, "S,xvnode",
+    "");
 #endif
 
 /*
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 8481fb48f130..1406e0f8bc5f 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -828,7 +828,7 @@ chroot_refuse_vdir_fds(fdp)
 
 	FILEDESC_LOCK_ASSERT(fdp);
 
-	for (fd = 0; fd < fdp->fd_nfiles ; fd++) {
+	for (fd = 0; fd <= fdp->fd_lastfile; fd++) {
 		fp = fget_locked(fdp, fd);
 		if (fp == NULL)
 			continue;
@@ -1554,6 +1554,7 @@ kern_linkat(struct thread *td, int fd1, int fd2, char *path1, char *path2,
 	bwillwrite();
 	NDINIT_AT(&nd, LOOKUP, follow | AUDITVNODE1, segflg, path1, fd1, td);
 
+again:
 	if ((error = namei(&nd)) != 0)
 		return (error);
 	NDFREE(&nd, NDF_ONLY_PNBUF);
@@ -1576,9 +1577,16 @@ kern_linkat(struct thread *td, int fd1, int fd2, char *path1, char *path2,
 				vput(nd.ni_dvp);
 			vrele(nd.ni_vp);
 			error = EEXIST;
-		} else if ((error = vn_lock(vp, LK_EXCLUSIVE | LK_RETRY))
-		    == 0) {
-			error = can_hardlink(vp, td->td_ucred);
+		} else if ((error = vn_lock(vp, LK_EXCLUSIVE)) == 0) {
+			/*
+			 * Check for cross-device links.  No need to
+			 * recheck vp->v_type, since it cannot change
+			 * for non-doomed vnode.
+			 */
+			if (nd.ni_dvp->v_mount != vp->v_mount)
+				error = EXDEV;
+			else
+				error = can_hardlink(vp, td->td_ucred);
 			if (error == 0)
 #ifdef MAC
 				error = mac_vnode_check_link(td->td_ucred,
@@ -1588,6 +1596,12 @@ kern_linkat(struct thread *td, int fd1, int fd2, char *path1, char *path2,
 				error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd);
 			VOP_UNLOCK(vp, 0);
 			vput(nd.ni_dvp);
+		} else {
+			vput(nd.ni_dvp);
+			NDFREE(&nd, NDF_ONLY_PNBUF);
+			vrele(vp);
+			vn_finished_write(mp);
+			goto again;
 		}
 		NDFREE(&nd, NDF_ONLY_PNBUF);
 	}
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 8cde4287f02b..f1d19acbca04 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -8,7 +8,7 @@
  * the permission of UNIX System Laboratories, Inc.
  *
  * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
- * Copyright (c) 2013 The FreeBSD Foundation
+ * Copyright (c) 2013, 2014 The FreeBSD Foundation
  *
  * Portions of this software were developed by Konstantin Belousov
  * under sponsorship from the FreeBSD Foundation.
@@ -106,6 +106,53 @@ struct 	fileops vnops = {
 	.fo_flags = DFLAG_PASSABLE | DFLAG_SEEKABLE
 };
 
+static const int io_hold_cnt = 16;
+static int vn_io_fault_enable = 1;
+SYSCTL_INT(_debug, OID_AUTO, vn_io_fault_enable, CTLFLAG_RW,
+    &vn_io_fault_enable, 0, "Enable vn_io_fault lock avoidance");
+static u_long vn_io_faults_cnt;
+SYSCTL_ULONG(_debug, OID_AUTO, vn_io_faults, CTLFLAG_RD,
+    &vn_io_faults_cnt, 0, "Count of vn_io_fault lock avoidance triggers");
+
+/*
+ * Returns true if vn_io_fault mode of handling the i/o request should
+ * be used.
+ */
+static bool
+do_vn_io_fault(struct vnode *vp, struct uio *uio)
+{
+	struct mount *mp;
+
+	return (uio->uio_segflg == UIO_USERSPACE && vp->v_type == VREG &&
+	    (mp = vp->v_mount) != NULL &&
+	    (mp->mnt_kern_flag & MNTK_NO_IOPF) != 0 && vn_io_fault_enable);
+}
+
+/*
+ * Structure used to pass arguments to vn_io_fault1(), to do either
+ * file- or vnode-based I/O calls.
+ */
+struct vn_io_fault_args {
+	enum {
+		VN_IO_FAULT_FOP,
+		VN_IO_FAULT_VOP
+	} kind;
+	struct ucred *cred;
+	int flags;
+	union {
+		struct fop_args_tag {
+			struct file *fp;
+			fo_rdwr_t *doio;
+		} fop_args;
+		struct vop_args_tag {
+			struct vnode *vp;
+		} vop_args;
+	} args;
+};
+
+static int vn_io_fault1(struct vnode *vp, struct uio *uio,
+    struct vn_io_fault_args *args, struct thread *td);
+
 int
 vn_open(ndp, flagp, cmode, fp)
 	struct nameidata *ndp;
@@ -439,6 +486,7 @@ vn_rdwr(enum uio_rw rw, struct vnode *vp, void *base, int len, off_t offset,
 	struct mount *mp;
 	struct ucred *cred;
 	void *rl_cookie;
+	struct vn_io_fault_args args;
 	int error, lock_flags;
 
 	auio.uio_iov = &aiov;
@@ -493,10 +541,17 @@ vn_rdwr(enum uio_rw rw, struct vnode *vp, void *base, int len, off_t offset,
 			cred = file_cred;
 		else
 			cred = active_cred;
-		if (rw == UIO_READ)
+		if (do_vn_io_fault(vp, &auio)) {
+			args.kind = VN_IO_FAULT_VOP;
+			args.cred = cred;
+			args.flags = ioflg;
+			args.args.vop_args.vp = vp;
+			error = vn_io_fault1(vp, &auio, &args, td);
+		} else if (rw == UIO_READ) {
 			error = VOP_READ(vp, &auio, ioflg, cred);
-		else
+		} else /* if (rw == UIO_WRITE) */ {
 			error = VOP_WRITE(vp, &auio, ioflg, cred);
+		}
 	}
 	if (aresid)
 		*aresid = auio.uio_resid;
@@ -883,14 +938,6 @@ vn_write(fp, uio, active_cred, flags, td)
 	return (error);
 }
 
-static const int io_hold_cnt = 16;
-static int vn_io_fault_enable = 1;
-SYSCTL_INT(_debug, OID_AUTO, vn_io_fault_enable, CTLFLAG_RW,
-    &vn_io_fault_enable, 0, "Enable vn_io_fault lock avoidance");
-static u_long vn_io_faults_cnt;
-SYSCTL_ULONG(_debug, OID_AUTO, vn_io_faults, CTLFLAG_RD,
-    &vn_io_faults_cnt, 0, "Count of vn_io_fault lock avoidance triggers");
-
 /*
  * The vn_io_fault() is a wrapper around vn_read() and vn_write() to
  * prevent the following deadlock:
@@ -924,38 +971,55 @@ SYSCTL_ULONG(_debug, OID_AUTO, vn_io_faults, CTLFLAG_RD,
  * make the current i/o request atomic with respect to other i/os and
  * truncations.
  */
+
+/*
+ * Decode vn_io_fault_args and perform the corresponding i/o.
+ */
 static int
-vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred,
-    int flags, struct thread *td)
+vn_io_fault_doio(struct vn_io_fault_args *args, struct uio *uio,
+    struct thread *td)
+{
+
+	switch (args->kind) {
+	case VN_IO_FAULT_FOP:
+		return ((args->args.fop_args.doio)(args->args.fop_args.fp,
+		    uio, args->cred, args->flags, td));
+	case VN_IO_FAULT_VOP:
+		if (uio->uio_rw == UIO_READ) {
+			return (VOP_READ(args->args.vop_args.vp, uio,
+			    args->flags, args->cred));
+		} else if (uio->uio_rw == UIO_WRITE) {
+			return (VOP_WRITE(args->args.vop_args.vp, uio,
+			    args->flags, args->cred));
+		}
+		break;
+	}
+	panic("vn_io_fault_doio: unknown kind of io %d %d", args->kind,
+	    uio->uio_rw);
+}
+
+/*
+ * Common code for vn_io_fault(), agnostic to the kind of i/o request.
+ * Uses vn_io_fault_doio() to make the call to an actual i/o function.
+ * Used from vn_rdwr() and vn_io_fault(), which encode the i/o request
+ * into args and call vn_io_fault1() to handle faults during the user
+ * mode buffer accesses.
+ */
+static int
+vn_io_fault1(struct vnode *vp, struct uio *uio, struct vn_io_fault_args *args,
+    struct thread *td)
 {
 	vm_page_t ma[io_hold_cnt + 2];
 	struct uio *uio_clone, short_uio;
 	struct iovec short_iovec[1];
-	fo_rdwr_t *doio;
-	struct vnode *vp;
-	void *rl_cookie;
-	struct mount *mp;
 	vm_page_t *prev_td_ma;
-	int error, cnt, save, saveheld, prev_td_ma_cnt;
-	vm_offset_t addr, end;
 	vm_prot_t prot;
+	vm_offset_t addr, end;
 	size_t len, resid;
 	ssize_t adv;
+	int error, cnt, save, saveheld, prev_td_ma_cnt;
 
-	if (uio->uio_rw == UIO_READ)
-		doio = vn_read;
-	else
-		doio = vn_write;
-	vp = fp->f_vnode;
-	foffset_lock_uio(fp, uio, flags);
-
-	if (uio->uio_segflg != UIO_USERSPACE || vp->v_type != VREG ||
-	    ((mp = vp->v_mount) != NULL &&
-	    (mp->mnt_kern_flag & MNTK_NO_IOPF) == 0) ||
-	    !vn_io_fault_enable) {
-		error = doio(fp, uio, active_cred, flags | FOF_OFFSET, td);
-		goto out_last;
-	}
+	prot = uio->uio_rw == UIO_READ ? VM_PROT_WRITE : VM_PROT_READ;
 
 	/*
 	 * The UFS follows IO_UNIT directive and replays back both
@@ -973,22 +1037,8 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred,
 	short_uio.uio_rw = uio->uio_rw;
 	short_uio.uio_td = uio->uio_td;
 
-	if (uio->uio_rw == UIO_READ) {
-		prot = VM_PROT_WRITE;
-		rl_cookie = vn_rangelock_rlock(vp, uio->uio_offset,
-		    uio->uio_offset + uio->uio_resid);
-	} else {
-		prot = VM_PROT_READ;
-		if ((fp->f_flag & O_APPEND) != 0 || (flags & FOF_OFFSET) == 0)
-			/* For appenders, punt and lock the whole range. */
-			rl_cookie = vn_rangelock_wlock(vp, 0, OFF_MAX);
-		else
-			rl_cookie = vn_rangelock_wlock(vp, uio->uio_offset,
-			    uio->uio_offset + uio->uio_resid);
-	}
-
 	save = vm_fault_disable_pagefaults();
-	error = doio(fp, uio, active_cred, flags | FOF_OFFSET, td);
+	error = vn_io_fault_doio(args, uio, td);
 	if (error != EFAULT)
 		goto out;
 
@@ -1038,8 +1088,7 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred,
 		td->td_ma = ma;
 		td->td_ma_cnt = cnt;
 
-		error = doio(fp, &short_uio, active_cred, flags | FOF_OFFSET,
-		    td);
+		error = vn_io_fault_doio(args, &short_uio, td);
 		vm_page_unhold_pages(ma, cnt);
 		adv = len - short_uio.uio_resid;
 
@@ -1060,9 +1109,45 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred,
 	curthread_pflags_restore(saveheld);
 out:
 	vm_fault_enable_pagefaults(save);
-	vn_rangelock_unlock(vp, rl_cookie);
 	free(uio_clone, M_IOV);
-out_last:
+	return (error);
+}
+
+static int
+vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred,
+    int flags, struct thread *td)
+{
+	fo_rdwr_t *doio;
+	struct vnode *vp;
+	void *rl_cookie;
+	struct vn_io_fault_args args;
+	int error;
+
+	doio = uio->uio_rw == UIO_READ ? vn_read : vn_write;
+	vp = fp->f_vnode;
+	foffset_lock_uio(fp, uio, flags);
+	if (do_vn_io_fault(vp, uio)) {
+		args.kind = VN_IO_FAULT_FOP;
+		args.args.fop_args.fp = fp;
+		args.args.fop_args.doio = doio;
+		args.cred = active_cred;
+		args.flags = flags | FOF_OFFSET;
+		if (uio->uio_rw == UIO_READ) {
+			rl_cookie = vn_rangelock_rlock(vp, uio->uio_offset,
+			    uio->uio_offset + uio->uio_resid);
+		} else if ((fp->f_flag & O_APPEND) != 0 ||
+		    (flags & FOF_OFFSET) == 0) {
+			/* For appenders, punt and lock the whole range. */
+			rl_cookie = vn_rangelock_wlock(vp, 0, OFF_MAX);
+		} else {
+			rl_cookie = vn_rangelock_wlock(vp, uio->uio_offset,
+			    uio->uio_offset + uio->uio_resid);
+		}
+		error = vn_io_fault1(vp, uio, &args, td);
+		vn_rangelock_unlock(vp, rl_cookie);
+	} else {
+		error = doio(fp, uio, active_cred, flags | FOF_OFFSET, td);
+	}
 	foffset_unlock_uio(fp, uio, flags);
 	return (error);
 }
@@ -1744,6 +1829,37 @@ vfs_write_resume(struct mount *mp, int flags)
 	}
 }
 
+/*
+ * Helper loop around vfs_write_suspend() for filesystem unmount VFS
+ * methods.
+ */
+int
+vfs_write_suspend_umnt(struct mount *mp)
+{
+	int error;
+
+	KASSERT((curthread->td_pflags & TDP_IGNSUSP) == 0,
+	    ("vfs_write_suspend_umnt: recursed"));
+
+	/* dounmount() already called vn_start_write(). */
+	for (;;) {
+		vn_finished_write(mp);
+		error = vfs_write_suspend(mp, 0);
+		if (error != 0)
+			return (error);
+		MNT_ILOCK(mp);
+		if ((mp->mnt_kern_flag & MNTK_SUSPENDED) != 0)
+			break;
+		MNT_IUNLOCK(mp);
+		vn_start_write(NULL, &mp, V_WAIT);
+	}
+	mp->mnt_kern_flag &= ~(MNTK_SUSPENDED | MNTK_SUSPEND2);
+	wakeup(&mp->mnt_flag);
+	MNT_IUNLOCK(mp);
+	curthread->td_pflags |= TDP_IGNSUSP;
+	return (0);
+}
+
 /*
  * Implement kqueues for files by translating it to vnode operation.
  */
@@ -1868,12 +1984,30 @@ vn_extattr_rm(struct vnode *vp, int ioflg, int attrnamespace,
 	return (error);
 }
 
+static int
+vn_get_ino_alloc_vget(struct mount *mp, void *arg, int lkflags,
+    struct vnode **rvp)
+{
+
+	return (VFS_VGET(mp, *(ino_t *)arg, lkflags, rvp));
+}
+
 int
 vn_vget_ino(struct vnode *vp, ino_t ino, int lkflags, struct vnode **rvp)
+{
+
+	return (vn_vget_ino_gen(vp, vn_get_ino_alloc_vget, &ino,
+	    lkflags, rvp));
+}
+
+int
+vn_vget_ino_gen(struct vnode *vp, vn_get_ino_t alloc, void *alloc_arg,
+    int lkflags, struct vnode **rvp)
 {
 	struct mount *mp;
 	int ltype, error;
 
+	ASSERT_VOP_LOCKED(vp, "vn_vget_ino_get");
 	mp = vp->v_mount;
 	ltype = VOP_ISLOCKED(vp);
 	KASSERT(ltype == LK_EXCLUSIVE || ltype == LK_SHARED,
@@ -1893,12 +2027,17 @@ vn_vget_ino(struct vnode *vp, ino_t ino, int lkflags, struct vnode **rvp)
 		}
 	}
 	VOP_UNLOCK(vp, 0);
-	error = VFS_VGET(mp, ino, lkflags, rvp);
+	error = alloc(mp, alloc_arg, lkflags, rvp);
 	vfs_unbusy(mp);
-	vn_lock(vp, ltype | LK_RETRY);
+	if (*rvp != vp)
+		vn_lock(vp, ltype | LK_RETRY);
 	if (vp->v_iflag & VI_DOOMED) {
-		if (error == 0)
-			vput(*rvp);
+		if (error == 0) {
+			if (*rvp == vp)
+				vunref(vp);
+			else
+				vput(*rvp);
+		}
 		error = ENOENT;
 	}
 	return (error);
@@ -2085,3 +2224,27 @@ vn_seek(struct file *fp, off_t offset, int whence, struct thread *td)
 	foffset_unlock(fp, offset, error != 0 ? FOF_NOUPDATE : 0);
 	return (error);
 }
+
+int
+vn_utimes_perm(struct vnode *vp, struct vattr *vap, struct ucred *cred,
+    struct thread *td)
+{
+	int error;
+
+	error = VOP_ACCESSX(vp, VWRITE_ATTRIBUTES, cred, td);
+
+	/*
+	 * From utimes(2):
+	 * Grant permission if the caller is the owner of the file or
+	 * the super-user.  If the time pointer is null, then write
+	 * permission on the file is also sufficient.
+	 *
+	 * From NFSv4.1, draft 21, 6.2.1.3.1, Discussion of Mask Attributes:
+	 * A user having ACL_WRITE_DATA or ACL_WRITE_ATTRIBUTES
+	 * will be allowed to set the times [..] to the current
+	 * server time.
+	 */
+	if (error != 0 && (vap->va_vaflags & VA_UTIMES_NULL) != 0)
+		error = VOP_ACCESS(vp, VWRITE, cred, td);
+	return (error);
+}
diff --git a/sys/libkern/arm/divsi3.S b/sys/libkern/arm/divsi3.S
index 302f17984329..46e7c63652cc 100644
--- a/sys/libkern/arm/divsi3.S
+++ b/sys/libkern/arm/divsi3.S
@@ -51,11 +51,11 @@ ENTRY_NP(__modsi3)
 	RET
 END(__modsi3)
 
-#ifdef __ARM_EABI__
-ENTRY_NP(__aeabi_uidiv)
-ENTRY_NP(__aeabi_uidivmod)
-#endif
 ENTRY_NP(__udivsi3)
+#ifdef __ARM_EABI__
+EENTRY_NP(__aeabi_uidiv)
+EENTRY_NP(__aeabi_uidivmod)
+#endif
 .L_udivide:				/* r0 = r0 / r1; r1 = r0 % r1 */
 	eor     r0, r1, r0 
 	eor     r1, r0, r1 
@@ -77,16 +77,16 @@ ENTRY_NP(__udivsi3)
 	mov	r1, #0
 	RET
 #ifdef __ARM_EABI__
-END(__aeabi_uidiv)
-END(__aeabi_uidivmod)
+EEND(__aeabi_uidiv)
+EEND(__aeabi_uidivmod)
 #endif
 END(__udivsi3)
 
-#ifdef __ARM_EABI__
-ENTRY_NP(__aeabi_idiv)
-ENTRY_NP(__aeabi_idivmod)
-#endif
 ENTRY_NP(__divsi3)
+#ifdef __ARM_EABI__
+EENTRY_NP(__aeabi_idiv)
+EENTRY_NP(__aeabi_idivmod)
+#endif
 .L_divide:				/* r0 = r0 / r1; r1 = r0 % r1 */
 	eor     r0, r1, r0 
 	eor     r1, r0, r1 
@@ -401,8 +401,8 @@ ENTRY_NP(__divsi3)
 	mov	r0, r3
 	RET
 #ifdef __ARM_EABI__
-END(__aeabi_idiv)
-END(__aeabi_idivmod)
+EEND(__aeabi_idiv)
+EEND(__aeabi_idivmod)
 #endif
 END(__divsi3)
 
diff --git a/sys/libkern/ia64/__divdi3.S b/sys/libkern/ia64/__divdi3.S
deleted file mode 100644
index 9465c9c97d0b..000000000000
--- a/sys/libkern/ia64/__divdi3.S
+++ /dev/null
@@ -1,142 +0,0 @@
-.file "__divdi3.s"
-
-// $FreeBSD$
-
-//-
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-.section .text
-.proc __divdi3#
-.align 32
-.global __divdi3#
-.align 32
-
-// 64-bit signed integer divide
-
-__divdi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mmi
-
-  // 64-BIT SIGNED INTEGER DIVIDE BEGINS HERE
-
-  setf.sig f8=r32
-  setf.sig f9=r33
-  nop.i 0;;
-} { .mfb
-  nop.m 0
-  fcvt.xf f6=f8
-  nop.b 0
-} { .mfb
-  nop.m 0
-  fcvt.xf f7=f9
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // e0 = 1 - b * y0 in f9
-  (p6) fnma.s1 f9=f7,f8,f1
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // q0 = a * y0 in f10
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f9,f9,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // q1 = q0 + e0 * q0 in f10
-  (p6) fma.s1 f10=f9,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f9,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // r2 = a - b * q2 in f10
-  (p6) fnma.s1 f10=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (10)
-  // q3 = q2 + r2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f9
-  nop.i 0;;
-} { .mfb
-  nop.m 0
-  // Step (11)
-  // q = trunc (q3)
-  fcvt.fx.trunc.s1 f8=f8
-  nop.b 0;;
-} { .mmi
-  // quotient will be in r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 64-BIT SIGNED INTEGER DIVIDE ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __divdi3
diff --git a/sys/libkern/ia64/__divsi3.S b/sys/libkern/ia64/__divsi3.S
deleted file mode 100644
index f7edd97abe2e..000000000000
--- a/sys/libkern/ia64/__divsi3.S
+++ /dev/null
@@ -1,124 +0,0 @@
-.file "__divsi3.s"
-
-// $FreeBSD$
-
-//-
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-.section .text
-
-// 32-bit signed integer divide
-
-.proc __divsi3#
-.align 32
-.global __divsi3#
-.align 32
-
-__divsi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mii
-  nop.m 0
-
-  // 32-BIT SIGNED INTEGER DIVIDE BEGINS HERE
-
-  // general register used:
-  //    r32 - 32-bit signed integer dividend
-  //    r33 - 32-bit signed integer divisor
-  //    r8 - 32-bit signed integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9
-  // predicate registers used: p6
-
-  sxt4 r32=r32
-  sxt4 r33=r33;;
-} { .mmb
-  setf.sig f6=r32
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  fcvt.xf f6=f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xf f7=f7
-  mov r2 = 0x0ffdd;;
-} { .mfi
-  setf.exp f9 = r2
-  // (1) y0
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-}  { .mfi
-  nop.m 0
-  // (2) q0 = a * y0
-  (p6) fma.s1 f6=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (3) e0 = 1 - b * y0
-  (p6) fnma.s1 f7=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (4) q1 = q0 + e0 * q0
-  (p6) fma.s1 f6=f7,f6,f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (5) e1 = e0 * e0 + 2^-34
-  (p6) fma.s1 f7=f7,f7,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (6) q2 = q1 + e1 * q1
-  (p6) fma.s1 f8=f7,f6,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (7) q = trunc(q2)
-  fcvt.fx.trunc.s1 f8=f8
-  nop.i 0;;
-} { .mmi
-  // quotient will be in the least significant 32 bits of r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 32-BIT SIGNED INTEGER DIVIDE ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __divsi3
diff --git a/sys/libkern/ia64/__moddi3.S b/sys/libkern/ia64/__moddi3.S
deleted file mode 100644
index e731adc23bac..000000000000
--- a/sys/libkern/ia64/__moddi3.S
+++ /dev/null
@@ -1,159 +0,0 @@
-.file "__moddi3.s"
-
-// $FreeBSD$
-
-//-
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-.section .text
-
-// 64-bit signed integer remainder
-
-.proc __moddi3#
-.align 32
-.global __moddi3#
-.align 32
-
-__moddi3:
-
-{ .mii
-  alloc r31=ar.pfs,3,0,0,0
-  nop.i 0
-  nop.i 0
-} { .mmb
-
-  // 64-BIT SIGNED INTEGER REMAINDER BEGINS HERE
-
-  // general register used:
-  //    r32 - 64-bit signed integer dividend, called a below
-  //    r33 - 64-bit signed integer divisor, called b below
-  //    r8 - 64-bit signed integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9, f10, f11, f12
-  // predicate registers used: p6
-
-  setf.sig f12=r32  // holds a in integer form
-  setf.sig f7=r33
-  nop.b 0
-} { .mlx
-  nop.m 0
-  //movl r2=0x8000000000000000;;
-  movl r2=0xffffffffffffffff;;
-} { .mfi
-  // get the 2's complement of b
-  sub r33=r0,r33
-  fcvt.xf f6=f12
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xf f7=f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // q0 = a * y0 in f10
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // e0 = 1 - b * y0 in f9
-  (p6) fnma.s1 f9=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // q1 = q0 + e0 * q0 in f10
-  (p6) fma.s1 f10=f9,f10,f10
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f9,f9,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f9,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // r2 = a - b * q2 in f10
-  (p6) fnma.s1 f10=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  setf.sig f7=r33
-  // Step (10)
-  // q3 = q2 + r2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (11) q = trunc(q3)
-  fcvt.fx.trunc.s1 f8=f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (12) r = a + (-b) * q
-  xma.l f8=f8,f7,f12
-  nop.i 0;;
-}  { .mib
-  getf.sig r8=f8
-  nop.i 0
-  nop.b 0
-} 
-
-  // 64-BIT SIGNED INTEGER REMAINDER ENDS HERE
-
-{ .mib
-  nop.m 0
-  nop.i 0
-  br.ret.sptk b0;;
-}
-
-.endp __moddi3
diff --git a/sys/libkern/ia64/__modsi3.S b/sys/libkern/ia64/__modsi3.S
deleted file mode 100644
index 568b20b1b3fc..000000000000
--- a/sys/libkern/ia64/__modsi3.S
+++ /dev/null
@@ -1,131 +0,0 @@
-.file "__modsi3.s"
-
-// $FreeBSD$
-
-//-
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-.section .text
-
-// 32-bit signed integer remainder
-
-.proc __modsi3#
-.align 32
-.global __modsi3#
-.align 32
-
-__modsi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mii
-  nop.m 0
-
-  // 32-BIT SIGNED INTEGER REMAINDER BEGINS HERE
-
-  // general register used:
-  //    r32 - 32-bit signed integer dividend
-  //    r33 - 32-bit signed integer divisor
-  //    r8 - 32-bit signed integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9, f10, f11
-  // predicate registers used: p6
-
-  sxt4 r32=r32
-  sxt4 r33=r33;;
-} { .mmb
-  setf.sig f11=r32
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  // get 2's complement of b
-  sub r33=r0,r33
-  fcvt.xf f6=f11
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xf f7=f7
-  mov r2 = 0x0ffdd;;
-} { .mfi
-  setf.exp f9 = r2
-  // (1) y0
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (2) q0 = a * y0
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (3) e0 = 1 - b * y0
-  (p6) fnma.s1 f8=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  // 2's complement of b
-  setf.sig f7=r33
-  // (4) q1 = q0 + e0 * q0
-  (p6) fma.s1 f10=f8,f10,f10
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (5) e1 = e0 * e0 + 2^-34
-  (p6) fma.s1 f8=f8,f8,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (6) q2 = q1 + e1 * q1
-  (p6) fma.s1 f8=f8,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (7) q = trunc(q2)
-  fcvt.fx.trunc.s1 f8=f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (8) r = a + (-b) * q
-  xma.l f8=f8,f7,f11
-  nop.i 0;;
-}  { .mmi
-  // remainder will be in the least significant 32 bits of r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 32-BIT SIGNED INTEGER REMAINDER ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __modsi3
diff --git a/sys/libkern/ia64/__udivdi3.S b/sys/libkern/ia64/__udivdi3.S
deleted file mode 100644
index 91c94294b93d..000000000000
--- a/sys/libkern/ia64/__udivdi3.S
+++ /dev/null
@@ -1,143 +0,0 @@
-.file "__udivdi3.s"
-
-// $FreeBSD$
-
-//-
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-.section .text
-.proc __udivdi3#
-.align 32
-.global __udivdi3#
-.align 32
-
-// 64-bit unsigned integer divide
-
-__udivdi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-}
-
-{ .mmi
-
-  // 64-BIT UNSIGNED INTEGER DIVIDE BEGINS HERE
-
-  setf.sig f8=r32
-  setf.sig f9=r33
-  nop.i 0;;
-} { .mfb
-  nop.m 0
-  fma.s1 f6=f8,f1,f0
-  nop.b 0
-} { .mfb
-  nop.m 0
-  fma.s1 f7=f9,f1,f0
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // e0 = 1 - b * y0 in f9
-  (p6) fnma.s1 f9=f7,f8,f1
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // q0 = a * y0 in f10
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f9,f9,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // q1 = q0 + e0 * q0 in f10
-  (p6) fma.s1 f10=f9,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f9,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // r2 = a - b * q2 in f10
-  (p6) fnma.s1 f10=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (10)
-  // q3 = q2 + r2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f9
-  nop.i 0;;
-} { .mfb
-  nop.m 0
-  // (11) q = trunc(q3)
-  fcvt.fxu.trunc.s1 f8=f8
-  nop.b 0;;
-} { .mmi
-  // quotient will be in r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 64-BIT UNSIGNED INTEGER DIVIDE ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __udivdi3
diff --git a/sys/libkern/ia64/__udivsi3.S b/sys/libkern/ia64/__udivsi3.S
deleted file mode 100644
index 9597abdc0541..000000000000
--- a/sys/libkern/ia64/__udivsi3.S
+++ /dev/null
@@ -1,124 +0,0 @@
-.file "__udivsi3.s"
-
-// $FreeBSD$
-
-//-
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-.section .text
-
-// 32-bit unsigned integer divide
-
-.proc __udivsi3#
-.align 32
-.global __udivsi3#
-.align 32
-
-__udivsi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mii
-  nop.m 0
-
-  // 32-BIT UNSIGNED INTEGER DIVIDE BEGINS HERE
-
-  // general register used:
-  //    r32 - 32-bit unsigned integer dividend
-  //    r33 - 32-bit unsigned integer divisor
-  //    r8 - 32-bit unsigned integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9
-  // predicate registers used: p6
-
-  zxt4 r32=r32
-  zxt4 r33=r33;;
-} { .mmb
-  setf.sig f6=r32
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  fcvt.xf f6=f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xf f7=f7
-  mov r2 = 0x0ffdd;;
-} { .mfi
-  setf.exp f9 = r2
-  // (1) y0
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (2) q0 = a * y0
-  (p6) fma.s1 f6=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (3) e0 = 1 - b * y0
-  (p6) fnma.s1 f7=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (4) q1 = q0 + e0 * q0
-  (p6) fma.s1 f6=f7,f6,f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (5) e1 = e0 * e0 + 2^-34
-  (p6) fma.s1 f7=f7,f7,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (6) q2 = q1 + e1 * q1
-  (p6) fma.s1 f8=f7,f6,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (7) q = trunc(q2)
-  fcvt.fxu.trunc.s1 f8=f8
-  nop.i 0;;
-} { .mmi
-  // quotient will be in the least significant 32 bits of r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 32-BIT UNSIGNED INTEGER DIVIDE ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __udivsi3
diff --git a/sys/libkern/ia64/__umoddi3.S b/sys/libkern/ia64/__umoddi3.S
deleted file mode 100644
index 98708e43b7eb..000000000000
--- a/sys/libkern/ia64/__umoddi3.S
+++ /dev/null
@@ -1,155 +0,0 @@
-.file "__umoddi3.s"
-
-// $FreeBSD$
-
-//-
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-.section .text
-
-  // 64-bit unsigned integer remainder
-
-.proc __umoddi3#
-.align 32
-.global __umoddi3#
-.align 32
-
-__umoddi3:
-
-{ .mii
-  alloc r31=ar.pfs,3,0,0,0
-  nop.i 0
-  nop.i 0
-} { .mmb
-
-  // 64-BIT UNSIGNED INTEGER REMAINDER BEGINS HERE
-
-  // general register used:
-  //    r32 - 64-bit unsigned integer dividend, called a below
-  //    r33 - 64-bit unsigned integer divisor, called b below
-  //    r8 - 64-bit unsigned integer result
-  // floating-point registers used: f6, f7, f8, f9, f10, f11, f12
-  // predicate registers used: p6
-
-  setf.sig f12=r32  // holds a in integer form
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  // get 2's complement of b
-  sub r33=r0,r33
-  fcvt.xuf.s1 f6=f12
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xuf.s1 f7=f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // q0 = a * y0 in f10
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // e0 = 1 - b * y0 in f9
-  (p6) fnma.s1 f9=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // q1 = q0 + e0 * q0 in f10
-  (p6) fma.s1 f10=f9,f10,f10
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f9,f9,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f9,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // r2 = a - b * q2 in f10
-  (p6) fnma.s1 f10=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  // f7=-b
-  setf.sig f7=r33
-  // Step (10)
-  // q3 = q2 + r2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (11) q = trunc(q3)
-  fcvt.fxu.trunc.s1 f8=f8
-  nop.i 0;;
-}  { .mfi
-  nop.m 0
-  // (12) r = a + (-b) * q
-  xma.l f8=f8,f7,f12
-  nop.i 0;;
-}  { .mib
-  getf.sig r8=f8
-  nop.i 0
-  nop.b 0
-}
-
-  // 64-BIT UNSIGNED INTEGER REMAINDER ENDS HERE
-
-{ .mib
-  nop.m 0
-  nop.i 0
-  br.ret.sptk b0;;
-}
-
-.endp __umoddi3
diff --git a/sys/libkern/ia64/__umodsi3.S b/sys/libkern/ia64/__umodsi3.S
deleted file mode 100644
index 7df61a65a351..000000000000
--- a/sys/libkern/ia64/__umodsi3.S
+++ /dev/null
@@ -1,131 +0,0 @@
-.file "__umodsi3.s"
-
-// $FreeBSD$
-
-//-
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// 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 INTEL OR ITS 
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-.section .text
-
-// 32-bit unsigned integer remainder
-
-.proc __umodsi3#
-.align 32
-.global __umodsi3#
-.align 32
-
-__umodsi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mii
-  nop.m 0
-
-  // 32-BIT UNSIGNED INTEGER REMAINDER BEGINS HERE
-
-  // general register used:
-  //    r32 - 32-bit unsigned integer dividend
-  //    r33 - 32-bit unsigned integer divisor
-  //    r8 - 32-bit unsigned integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9, f10, f11
-  // predicate registers used: p6
-
-  zxt4 r32=r32
-  zxt4 r33=r33;;
-} { .mmb
-  setf.sig f11=r32
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  fcvt.xf f6=f11
-  nop.i 0
-} { .mfi
-  // get 2's complement of b
-  sub r33=r0,r33
-  fcvt.xf f7=f7
-  mov r2 = 0x0ffdd;;
-} { .mfi
-  setf.exp f9 = r2
-  // (1) y0
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-}  { .mfi
-  nop.m 0
-  // (2) q0 = a * y0
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (3) e0 = 1 - b * y0
-  (p6) fnma.s1 f8=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (4) q1 = q0 + e0 * q0
-  (p6) fma.s1 f10=f8,f10,f10
-  nop.i 0
-} { .mfi
-  // get 2's complement of b
-  setf.sig f7=r33
-  // (5) e1 = e0 * e0 + 2^-34
-  (p6) fma.s1 f8=f8,f8,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (6) q2 = q1 + e1 * q1
-  (p6) fma.s1 f8=f8,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (7) q = trunc(q2)
-  fcvt.fxu.trunc.s1 f8=f8
-  nop.i 0;;
-}  { .mfi
-  nop.m 0
-  // (8) r = a + (-b) * q
-  xma.l f8=f8,f7,f11
-  nop.i 0;;
-}  { .mmi
-  // remainder will be in the least significant 32 bits of r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 32-BIT UNSIGNED INTEGER REMAINDER ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __umodsi3
diff --git a/sys/libkern/ia64/bswap16.S b/sys/libkern/ia64/bswap16.S
deleted file mode 100644
index d3adc2e92141..000000000000
--- a/sys/libkern/ia64/bswap16.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 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.
- *
- *	from: NetBSD: htons.S,v 1.1 1996/04/17 22:36:54 cgd
- *	from: src/sys/libkern/ia64/htons.S,v 1.2 2002/02/18 20:35:21
- *
- * $FreeBSD$
- */
-
-#define	NAME	__bswap16
-
-#include <libkern/ia64/byte_swap_2.S>
diff --git a/sys/libkern/ia64/bswap32.S b/sys/libkern/ia64/bswap32.S
deleted file mode 100644
index c1c76d188494..000000000000
--- a/sys/libkern/ia64/bswap32.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 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.
- *
- *	from: NetBSD: htonl.S,v 1.1 1996/04/17 22:36:52 cgd
- *	from: src/sys/libkern/ia64/htonl.S,v 1.2 2002/02/18 20:35:21
- *
- * $FreeBSD$
- */
-
-#define	NAME	__bswap32
-
-#include <libkern/ia64/byte_swap_4.S>
diff --git a/sys/libkern/ia64/byte_swap_2.S b/sys/libkern/ia64/byte_swap_2.S
deleted file mode 100644
index 74ad5f79248e..000000000000
--- a/sys/libkern/ia64/byte_swap_2.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $FreeBSD$ */
-/*	$NetBSD: byte_swap_2.S,v 1.2 1996/10/17 03:08:08 cgd Exp $	*/
-
-/*-
- * Copyright (c) 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 <machine/asm.h>
-
-#ifndef NAME
-#error NAME not defined
-#endif
-
-/*
- * Byte-swap a 2-byte quantity.  (Convert 0x0123 to 0x2301.)
- *
- * Argument is an unsigned 2-byte integer (u_int16_t).
- */
-ENTRY(NAME, 1)
-	mux1	r16=in0,@rev
-	;;
-	extr.u	r8=r16,48,16
-	br.ret.sptk.few rp
-END(NAME)
diff --git a/sys/libkern/ia64/byte_swap_4.S b/sys/libkern/ia64/byte_swap_4.S
deleted file mode 100644
index 9aba08d325db..000000000000
--- a/sys/libkern/ia64/byte_swap_4.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $FreeBSD$ */
-/*	$NetBSD: byte_swap_4.S,v 1.2 1996/10/17 03:08:09 cgd Exp $	*/
-
-/*-
- * Copyright (c) 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 <machine/asm.h>
-
-#ifndef NAME
-#error NAME not defined
-#endif
-
-/*
- * Byte-swap a 4-byte quantity.  (Convert 0x01234567 to 0x67452301.)
- *
- * Argument is an unsigned 4-byte integer (u_int32_t).
- */
-ENTRY(NAME, 1)
-	mux1	r16=in0,@rev
-	;;
-	extr.u	r8=r16,32,32
-	br.ret.sptk.few rp
-END(NAME)
diff --git a/sys/mips/atheros/if_arge.c b/sys/mips/atheros/if_arge.c
index f4ead993004b..85617387f5d7 100644
--- a/sys/mips/atheros/if_arge.c
+++ b/sys/mips/atheros/if_arge.c
@@ -703,6 +703,9 @@ arge_attach(device_t dev)
 	ifp->if_snd.ifq_maxlen = ifqmaxlen;
 	IFQ_SET_READY(&ifp->if_snd);
 
+	/* Tell the upper layer(s) we support long frames. */
+	ifp->if_capabilities |= IFCAP_VLAN_MTU;
+
 	ifp->if_capenable = ifp->if_capabilities;
 #ifdef DEVICE_POLLING
 	ifp->if_capabilities |= IFCAP_POLLING;
diff --git a/sys/mips/atheros/uart_dev_ar933x.c b/sys/mips/atheros/uart_dev_ar933x.c
index f719805dde2c..7be92bca2d21 100644
--- a/sys/mips/atheros/uart_dev_ar933x.c
+++ b/sys/mips/atheros/uart_dev_ar933x.c
@@ -428,8 +428,6 @@ ar933x_bus_getsig(struct uart_softc *sc)
 
 	/*
 	 * For now, let's just return that DSR/DCD/CTS is asserted.
-	 *
-	 * XXX TODO: actually verify whether this is correct!
 	 */
 	SIGCHG(1, sig, SER_DSR, SER_DDSR);
 	SIGCHG(1, sig, SER_CTS, SER_DCTS);
@@ -441,80 +439,31 @@ ar933x_bus_getsig(struct uart_softc *sc)
 	return (sig);
 }
 
+/*
+ * XXX TODO: actually implement the rest of this!
+ */
 static int
 ar933x_bus_ioctl(struct uart_softc *sc, int request, intptr_t data)
 {
-#if 0
-	struct uart_bas *bas;
-	int baudrate, divisor, error;
-	uint8_t efr, lcr;
+	int error = 0;
 
-	bas = &sc->sc_bas;
-	error = 0;
-	uart_lock(sc->sc_hwmtx);
+	/* XXX lock */
 	switch (request) {
 	case UART_IOCTL_BREAK:
-		lcr = uart_getreg(bas, REG_LCR);
-		if (data)
-			lcr |= LCR_SBREAK;
-		else
-			lcr &= ~LCR_SBREAK;
-		uart_setreg(bas, REG_LCR, lcr);
-		uart_barrier(bas);
-		break;
 	case UART_IOCTL_IFLOW:
-		lcr = uart_getreg(bas, REG_LCR);
-		uart_barrier(bas);
-		uart_setreg(bas, REG_LCR, 0xbf);
-		uart_barrier(bas);
-		efr = uart_getreg(bas, REG_EFR);
-		if (data)
-			efr |= EFR_RTS;
-		else
-			efr &= ~EFR_RTS;
-		uart_setreg(bas, REG_EFR, efr);
-		uart_barrier(bas);
-		uart_setreg(bas, REG_LCR, lcr);
-		uart_barrier(bas);
-		break;
 	case UART_IOCTL_OFLOW:
-		lcr = uart_getreg(bas, REG_LCR);
-		uart_barrier(bas);
-		uart_setreg(bas, REG_LCR, 0xbf);
-		uart_barrier(bas);
-		efr = uart_getreg(bas, REG_EFR);
-		if (data)
-			efr |= EFR_CTS;
-		else
-			efr &= ~EFR_CTS;
-		uart_setreg(bas, REG_EFR, efr);
-		uart_barrier(bas);
-		uart_setreg(bas, REG_LCR, lcr);
-		uart_barrier(bas);
 		break;
 	case UART_IOCTL_BAUD:
-		lcr = uart_getreg(bas, REG_LCR);
-		uart_setreg(bas, REG_LCR, lcr | LCR_DLAB);
-		uart_barrier(bas);
-		divisor = uart_getreg(bas, REG_DLL) |
-		    (uart_getreg(bas, REG_DLH) << 8);
-		uart_barrier(bas);
-		uart_setreg(bas, REG_LCR, lcr);
-		uart_barrier(bas);
-		baudrate = (divisor > 0) ? bas->rclk / divisor / 16 : 0;
-		if (baudrate > 0)
-			*(int*)data = baudrate;
-		else
-			error = ENXIO;
+		*(int*)data = 115200;
 		break;
 	default:
 		error = EINVAL;
 		break;
 	}
-	uart_unlock(sc->sc_hwmtx);
+
+	/* XXX unlock */
+
 	return (error);
-#endif
-	return (ENXIO);
 }
 
 /*
@@ -581,6 +530,8 @@ ar933x_bus_ipend(struct uart_softc *sc)
 
 	/*
 	 * Only signal TX idle if we're not busy transmitting.
+	 *
+	 * XXX I never get _out_ of txbusy? Debug that!
 	 */
 	if (sc->sc_txbusy) {
 		if (isr & AR933X_UART_INT_TX_EMPTY) {
diff --git a/sys/mips/cavium/usb/octusb.c b/sys/mips/cavium/usb/octusb.c
index cad3ef5ef211..c4d4ac76d8ac 100644
--- a/sys/mips/cavium/usb/octusb.c
+++ b/sys/mips/cavium/usb/octusb.c
@@ -82,11 +82,8 @@ __FBSDID("$FreeBSD$");
 static int octusbdebug = 0;
 
 static SYSCTL_NODE(_hw_usb, OID_AUTO, octusb, CTLFLAG_RW, 0, "OCTUSB");
-SYSCTL_INT(_hw_usb_octusb, OID_AUTO, debug, CTLFLAG_RW,
+SYSCTL_INT(_hw_usb_octusb, OID_AUTO, debug, CTLFLAG_RWTUN,
     &octusbdebug, 0, "OCTUSB debug level");
-
-TUNABLE_INT("hw.usb.octusb.debug", &octusbdebug);
-
 #endif
 
 struct octusb_std_temp {
diff --git a/sys/mips/conf/BERI_NETFPGA_MDROOT b/sys/mips/conf/BERI_NETFPGA_MDROOT
index 2ba4917d007a..307f579cc285 100644
--- a/sys/mips/conf/BERI_NETFPGA_MDROOT
+++ b/sys/mips/conf/BERI_NETFPGA_MDROOT
@@ -23,6 +23,7 @@ device		bpf
 
 options 	DEVICE_POLLING
 device		netfpga10g_nf10bmac
+options 	NF10BMAC_64BIT
 
 #
 # This kernel configuration uses an embedded memory root file system.
diff --git a/sys/mips/include/elf.h b/sys/mips/include/elf.h
index 427906d8fe7e..c1e792bf5a35 100644
--- a/sys/mips/include/elf.h
+++ b/sys/mips/include/elf.h
@@ -77,6 +77,8 @@
 #define ELF_ARCH	EM_MIPS
 #define ELF_ARCH32	EM_MIPS
 
+#define	ELF_MACHINE_OK(x)	((x) == ELF_ARCH)
+
 /* Define "machine" characteristics */
 #if __ELF_WORD_SIZE == 32
 #define	ELF_TARG_CLASS	ELFCLASS32
diff --git a/sys/mips/include/sf_buf.h b/sys/mips/include/sf_buf.h
index e5d981f3b789..76fb993da878 100644
--- a/sys/mips/include/sf_buf.h
+++ b/sys/mips/include/sf_buf.h
@@ -29,31 +29,9 @@
 #ifndef _MACHINE_SF_BUF_H_
 #define _MACHINE_SF_BUF_H_
 
-#ifdef __mips_n64
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_page.h>
-#else
-#include <sys/queue.h>
-#endif
+#ifdef __mips_n64	/* In 64 bit the whole memory is directly mapped */
 
-#ifdef __mips_n64
-/* In 64 bit the whole memory is directly mapped */
-struct	sf_buf;
-
-static inline struct sf_buf *
-sf_buf_alloc(struct vm_page *m, int pri)
-{
-
-	return ((struct sf_buf *)m);
-}
-
-static inline void
-sf_buf_free(struct sf_buf *sf)
-{
-}
-
-static __inline vm_offset_t
+static inline vm_offset_t
 sf_buf_kva(struct sf_buf *sf)
 {
 	vm_page_t	m;
@@ -62,38 +40,12 @@ sf_buf_kva(struct sf_buf *sf)
 	return (MIPS_PHYS_TO_DIRECT(VM_PAGE_TO_PHYS(m)));
 }
 
-static __inline struct vm_page *
+static inline struct vm_page *
 sf_buf_page(struct sf_buf *sf)
 {
 
 	return ((vm_page_t)sf);
 }
 
-#else /* ! __mips_n64 */
-struct vm_page;
-
-struct sf_buf {
-	SLIST_ENTRY(sf_buf) free_list;	/* list of free buffer slots */
-	struct		vm_page *m;	/* currently mapped page */
-	vm_offset_t	kva;		/* va of mapping */
-};
-
-struct sf_buf * sf_buf_alloc(struct vm_page *m, int flags);
-void sf_buf_free(struct sf_buf *sf);
-
-static __inline vm_offset_t
-sf_buf_kva(struct sf_buf *sf)
-{
-
-	return (sf->kva);
-}
-
-static __inline struct vm_page *
-sf_buf_page(struct sf_buf *sf)
-{
-
-	return (sf->m);
-}
 #endif /* __mips_n64 */
-
 #endif /* !_MACHINE_SF_BUF_H_ */
diff --git a/sys/mips/include/vmparam.h b/sys/mips/include/vmparam.h
index 8922924faa76..d3b833ebd4a8 100644
--- a/sys/mips/include/vmparam.h
+++ b/sys/mips/include/vmparam.h
@@ -187,4 +187,8 @@
 
 #define	ZERO_REGION_SIZE	(64 * 1024)	/* 64KB */
 
+#ifndef __mips_n64
+#define	SFBUF
+#endif
+
 #endif /* !_MACHINE_VMPARAM_H_ */
diff --git a/sys/mips/mips/dump_machdep.c b/sys/mips/mips/dump_machdep.c
index bf8c4a3152f3..26f93ff5eb4a 100644
--- a/sys/mips/mips/dump_machdep.c
+++ b/sys/mips/mips/dump_machdep.c
@@ -50,8 +50,7 @@ __FBSDID("$FreeBSD$");
 CTASSERT(sizeof(struct kerneldumpheader) == 512);
 
 int do_minidump = 1;
-TUNABLE_INT("debug.minidump", &do_minidump);
-SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RW, &do_minidump, 0,
+SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RWTUN, &do_minidump, 0,
     "Enable mini crash dumps");
 
 /*
@@ -258,7 +257,7 @@ foreach_chunk(callback_t cb, void *arg)
 	return (seqnr);
 }
 
-void
+int
 dumpsys(struct dumperinfo *di)
 {
 	Elf_Ehdr ehdr;
@@ -269,7 +268,7 @@ dumpsys(struct dumperinfo *di)
 
 	if (do_minidump) {
 		minidumpsys(di);
-		return;
+		return (0);
 	}
 
 	bzero(&ehdr, sizeof(ehdr));
@@ -355,7 +354,7 @@ dumpsys(struct dumperinfo *di)
 	/* Signal completion, signoff and exit stage left. */
 	dump_write(di, NULL, 0, 0, 0);
 	printf("\nDump complete\n");
-	return;
+	return (0);
 
  fail:
 	if (error < 0)
@@ -367,4 +366,5 @@ dumpsys(struct dumperinfo *di)
 		printf("\nDump failed. Partition too small.\n");
 	else
 		printf("\n** DUMP FAILED (ERROR %d) **\n", error);
+	return (error);
 }
diff --git a/sys/mips/mips/pmap.c b/sys/mips/mips/pmap.c
index 414bd89fb51c..2ca8ed57ff30 100644
--- a/sys/mips/mips/pmap.c
+++ b/sys/mips/mips/pmap.c
@@ -177,8 +177,8 @@ static void pmap_invalidate_all(pmap_t pmap);
 static void pmap_invalidate_page(pmap_t pmap, vm_offset_t va);
 static void _pmap_unwire_ptp(pmap_t pmap, vm_offset_t va, vm_page_t m);
 
-static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags);
-static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags);
+static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, u_int flags);
+static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex, u_int flags);
 static int pmap_unuse_pt(pmap_t, vm_offset_t, pd_entry_t);
 static pt_entry_t init_pte_prot(vm_page_t m, vm_prot_t access, vm_prot_t prot);
 
@@ -1094,20 +1094,16 @@ pmap_pinit(pmap_t pmap)
  * mapped correctly.
  */
 static vm_page_t
-_pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags)
+_pmap_allocpte(pmap_t pmap, unsigned ptepindex, u_int flags)
 {
 	vm_offset_t pageva;
 	vm_page_t m;
 
-	KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT ||
-	    (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK,
-	    ("_pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK"));
-
 	/*
 	 * Find or fabricate a new pagetable page
 	 */
 	if ((m = pmap_alloc_direct_page(ptepindex, VM_ALLOC_NORMAL)) == NULL) {
-		if (flags & M_WAITOK) {
+		if ((flags & PMAP_ENTER_NOSLEEP) == 0) {
 			PMAP_UNLOCK(pmap);
 			rw_wunlock(&pvh_global_lock);
 			pmap_grow_direct_page_cache();
@@ -1164,16 +1160,12 @@ _pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags)
 }
 
 static vm_page_t
-pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags)
+pmap_allocpte(pmap_t pmap, vm_offset_t va, u_int flags)
 {
 	unsigned ptepindex;
 	pd_entry_t *pde;
 	vm_page_t m;
 
-	KASSERT((flags & (M_NOWAIT | M_WAITOK)) == M_NOWAIT ||
-	    (flags & (M_NOWAIT | M_WAITOK)) == M_WAITOK,
-	    ("pmap_allocpte: flags is neither M_NOWAIT nor M_WAITOK"));
-
 	/*
 	 * Calculate pagetable page index
 	 */
@@ -1197,7 +1189,7 @@ pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags)
 		 * deallocated.
 		 */
 		m = _pmap_allocpte(pmap, ptepindex, flags);
-		if (m == NULL && (flags & M_WAITOK))
+		if (m == NULL && (flags & PMAP_ENTER_NOSLEEP) == 0)
 			goto retry;
 	}
 	return (m);
@@ -1535,7 +1527,7 @@ free_pv_chunk(struct pv_chunk *pc)
 	PV_STAT(pc_chunk_frees++);
 	/* entire chunk is free, return it */
 	m = PHYS_TO_VM_PAGE(MIPS_DIRECT_TO_PHYS((vm_offset_t)pc));
-	vm_page_unwire(m, 0);
+	vm_page_unwire(m, PQ_INACTIVE);
 	vm_page_free(m);
 }
 
@@ -1994,9 +1986,9 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
  *	or lose information.  That is, this routine must actually
  *	insert this page into the given map NOW.
  */
-void
-pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
-    vm_prot_t prot, boolean_t wired)
+int
+pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
+    u_int flags, int8_t psind __unused)
 {
 	vm_paddr_t pa, opa;
 	pt_entry_t *pte;
@@ -2009,11 +2001,11 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 	KASSERT((m->oflags & VPO_UNMANAGED) != 0 || va < kmi.clean_sva ||
 	    va >= kmi.clean_eva,
 	    ("pmap_enter: managed mapping within the clean submap"));
-	KASSERT((m->oflags & VPO_UNMANAGED) != 0 || vm_page_xbusied(m),
-	    ("pmap_enter: page %p is not busy", m));
+	if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m))
+		VM_OBJECT_ASSERT_LOCKED(m->object);
 	pa = VM_PAGE_TO_PHYS(m);
-	newpte = TLBLO_PA_TO_PFN(pa) | init_pte_prot(m, access, prot);
-	if (wired)
+	newpte = TLBLO_PA_TO_PFN(pa) | init_pte_prot(m, flags, prot);
+	if ((flags & PMAP_ENTER_WIRED) != 0)
 		newpte |= PTE_W;
 	if (is_kernel_pmap(pmap))
 		newpte |= PTE_G;
@@ -2032,7 +2024,14 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 	 * creating it here.
 	 */
 	if (va < VM_MAXUSER_ADDRESS) {
-		mpte = pmap_allocpte(pmap, va, M_WAITOK);
+		mpte = pmap_allocpte(pmap, va, flags);
+		if (mpte == NULL) {
+			KASSERT((flags & PMAP_ENTER_NOSLEEP) != 0,
+			    ("pmap_allocpte failed with sleep allowed"));
+			rw_wunlock(&pvh_global_lock);
+			PMAP_UNLOCK(pmap);
+			return (KERN_RESOURCE_SHORTAGE);
+		}
 	}
 	pte = pmap_pte(pmap, va);
 
@@ -2057,9 +2056,10 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 		 * are valid mappings in them. Hence, if a user page is
 		 * wired, the PT page will be also.
 		 */
-		if (wired && !pte_test(&origpte, PTE_W))
+		if (pte_test(&newpte, PTE_W) && !pte_test(&origpte, PTE_W))
 			pmap->pm_stats.wired_count++;
-		else if (!wired && pte_test(&origpte, PTE_W))
+		else if (!pte_test(&newpte, PTE_W) && pte_test(&origpte,
+		    PTE_W))
 			pmap->pm_stats.wired_count--;
 
 		KASSERT(!pte_test(&origpte, PTE_D | PTE_RO),
@@ -2123,7 +2123,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 	/*
 	 * Increment counters
 	 */
-	if (wired)
+	if (pte_test(&newpte, PTE_W))
 		pmap->pm_stats.wired_count++;
 
 validate:
@@ -2170,6 +2170,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m,
 	}
 	rw_wunlock(&pvh_global_lock);
 	PMAP_UNLOCK(pmap);
+	return (KERN_SUCCESS);
 }
 
 /*
@@ -2235,7 +2236,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va, vm_page_t m,
 				mpte->wire_count++;
 			} else {
 				mpte = _pmap_allocpte(pmap, ptepindex,
-				    M_NOWAIT);
+				    PMAP_ENTER_NOSLEEP);
 				if (mpte == NULL)
 					return (mpte);
 			}
@@ -2425,33 +2426,51 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr,
 }
 
 /*
- *	Routine:	pmap_change_wiring
- *	Function:	Change the wiring attribute for a map/virtual-address
- *			pair.
- *	In/out conditions:
- *			The mapping must already exist in the pmap.
+ *	Clear the wired attribute from the mappings for the specified range of
+ *	addresses in the given pmap.  Every valid mapping within that range
+ *	must have the wired attribute set.  In contrast, invalid mappings
+ *	cannot have the wired attribute set, so they are ignored.
+ *
+ *	The wired attribute of the page table entry is not a hardware feature,
+ *	so there is no need to invalidate any TLB entries.
  */
 void
-pmap_change_wiring(pmap_t pmap, vm_offset_t va, boolean_t wired)
+pmap_unwire(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
+	pd_entry_t *pde, *pdpe;
 	pt_entry_t *pte;
+	vm_offset_t va_next;
 
 	PMAP_LOCK(pmap);
-	pte = pmap_pte(pmap, va);
-
-	if (wired && !pte_test(pte, PTE_W))
-		pmap->pm_stats.wired_count++;
-	else if (!wired && pte_test(pte, PTE_W))
-		pmap->pm_stats.wired_count--;
-
-	/*
-	 * Wiring is not a hardware characteristic so there is no need to
-	 * invalidate TLB.
-	 */
-	if (wired)
-		pte_set(pte, PTE_W);
-	else
-		pte_clear(pte, PTE_W);
+	for (; sva < eva; sva = va_next) {
+		pdpe = pmap_segmap(pmap, sva);
+#ifdef __mips_n64
+		if (*pdpe == NULL) {
+			va_next = (sva + NBSEG) & ~SEGMASK;
+			if (va_next < sva)
+				va_next = eva;
+			continue;
+		}
+#endif
+		va_next = (sva + NBPDR) & ~PDRMASK;
+		if (va_next < sva)
+			va_next = eva;
+		pde = pmap_pdpe_to_pde(pdpe, sva);
+		if (*pde == NULL)
+			continue;
+		if (va_next > eva)
+			va_next = eva;
+		for (pte = pmap_pde_to_pte(pde, sva); sva != va_next; pte++,
+		    sva += PAGE_SIZE) {
+			if (!pte_test(pte, PTE_V))
+				continue;
+			if (!pte_test(pte, PTE_W))
+				panic("pmap_unwire: pte %#jx is missing PG_W",
+				    (uintmax_t)*pte);
+			pte_clear(pte, PTE_W);
+			pmap->pm_stats.wired_count--;
+		}
+	}
 	PMAP_UNLOCK(pmap);
 }
 
diff --git a/sys/mips/mips/trap.c b/sys/mips/mips/trap.c
index f0df09c8629e..df5efc02033a 100644
--- a/sys/mips/mips/trap.c
+++ b/sys/mips/mips/trap.c
@@ -605,7 +605,7 @@ trap(struct trapframe *trapframe)
 	/*
 	 * A trap can occur while DTrace executes a probe. Before
 	 * executing the probe, DTrace blocks re-scheduling and sets
-	 * a flag in it's per-cpu flags to indicate that it doesn't
+	 * a flag in its per-cpu flags to indicate that it doesn't
 	 * want to fault. On returning from the probe, the no-fault
 	 * flag is cleared and finally re-scheduling is enabled.
 	 *
@@ -618,7 +618,7 @@ trap(struct trapframe *trapframe)
 	 * XXXDTRACE: add pid probe handler here (if ever)
 	 */
 	if (!usermode) {
-		if (dtrace_trap_func != NULL && (*dtrace_trap_func)(trapframe, type))
+		if (dtrace_trap_func != NULL && (*dtrace_trap_func)(trapframe))
 			return (trapframe->pc);
 	}
 #endif
diff --git a/sys/mips/mips/vm_machdep.c b/sys/mips/mips/vm_machdep.c
index dd294e954897..26cdbff2fc31 100644
--- a/sys/mips/mips/vm_machdep.c
+++ b/sys/mips/mips/vm_machdep.c
@@ -76,9 +76,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/user.h>
 #include <sys/mbuf.h>
-#ifndef __mips_n64
-#include <sys/sf_buf.h>
-#endif
 
 /* Duplicated from asm.h */
 #if defined(__mips_o32)
@@ -92,38 +89,6 @@ __FBSDID("$FreeBSD$");
 #define	CALLFRAME_SIZ	(SZREG * 4)
 #endif
 
-#ifndef __mips_n64
-
-#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);
-
-/*
- * Expanded sf_freelist head.  Really an SLIST_HEAD() in disguise, with the
- * sf_freelist head with the sf_lock mutex.
- */
-static struct {
-	SLIST_HEAD(, sf_buf) sf_head;
-	struct mtx sf_lock;
-} sf_freelist;
-
-static u_int	sf_buf_alloc_want;
-#endif /* !__mips_n64 */
-
 /*
  * Finish a fork operation, with process p2 nearly set up.
  * Copy and update the pcb, set up the stack so that the child
@@ -512,84 +477,6 @@ cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg,
 #define	ZIDLE_LO(v)	((v) * 2 / 3)
 #define	ZIDLE_HI(v)	((v) * 4 / 5)
 
-/*
- * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-))
- */
-#ifndef __mips_n64
-static void
-sf_buf_init(void *arg)
-{
-	struct sf_buf *sf_bufs;
-	vm_offset_t sf_base;
-	int i;
-
-	nsfbufs = NSFBUFS;
-	TUNABLE_INT_FETCH("kern.ipc.nsfbufs", &nsfbufs);
-
-	mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF);
-	SLIST_INIT(&sf_freelist.sf_head);
-	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;
-		SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list);
-	}
-	sf_buf_alloc_want = 0;
-}
-
-/*
- * 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_buf *sf;
-	int error;
-
-	mtx_lock(&sf_freelist.sf_lock);
-	while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) {
-		if (flags & SFB_NOWAIT)
-			break;
-		sf_buf_alloc_want++;
-		SFSTAT_INC(sf_allocwait);
-		error = msleep(&sf_freelist, &sf_freelist.sf_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)
-			break;
-	}
-	if (sf != NULL) {
-		SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list);
-		sf->m = m;
-		nsfbufsused++;
-		nsfbufspeak = imax(nsfbufspeak, nsfbufsused);
-		pmap_qenter(sf->kva, &sf->m, 1);
-	}
-	mtx_unlock(&sf_freelist.sf_lock);
-	return (sf);
-}
-
-/*
- * Release resources back to the system.
- */
-void
-sf_buf_free(struct sf_buf *sf)
-{
-	pmap_qremove(sf->kva, 1);
-	mtx_lock(&sf_freelist.sf_lock);
-	SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list);
-	nsfbufsused--;
-	if (sf_buf_alloc_want > 0)
-		wakeup(&sf_freelist);
-	mtx_unlock(&sf_freelist.sf_lock);
-}
-#endif	/* !__mips_n64 */
-
 /*
  * Software interrupt handler for queued VM system processing.
  */
diff --git a/sys/mips/rmi/rootfs_list.txt b/sys/mips/rmi/rootfs_list.txt
index 79c4b21a2020..048321a30ad9 100644
--- a/sys/mips/rmi/rootfs_list.txt
+++ b/sys/mips/rmi/rootfs_list.txt
@@ -64,8 +64,6 @@
 ./etc/defaults/rc.conf
 ./etc/devd
 ./etc/devd/asus.conf
-./etc/gnats
-./etc/gnats/freefall
 ./etc/gss
 ./etc/gss/mech
 ./etc/gss/qop
diff --git a/sys/mips/rt305x/uart_dev_rt305x.c b/sys/mips/rt305x/uart_dev_rt305x.c
index 3154cb97437f..d4f23196d053 100644
--- a/sys/mips/rt305x/uart_dev_rt305x.c
+++ b/sys/mips/rt305x/uart_dev_rt305x.c
@@ -73,13 +73,9 @@ static struct uart_ops uart_rt305x_uart_ops = {
 };
 
 static int	uart_output = 1;
-TUNABLE_INT("kern.uart_output", &uart_output);
-SYSCTL_INT(_kern, OID_AUTO, uart_output, CTLFLAG_RW,
+SYSCTL_INT(_kern, OID_AUTO, uart_output, CTLFLAG_RWTUN,
     &uart_output, 0, "UART output enabled.");
 
-
-
-
 static int
 rt305x_uart_probe(struct uart_bas *bas)
 {
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 5518e4397f4c..d22e95229cde 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,12 +1,16 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+SYSDIR?=${.CURDIR}/..
+.include "${SYSDIR}/conf/kern.opts.mk"
 
 SUBDIR_PARALLEL=
 
 # Modules that include binary-only blobs of microcode should be selectable by
 # MK_SOURCELESS_UCODE option (see below).
 
+.if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES)
+SUBDIR=${MODULES_OVERRIDE}
+.else
 SUBDIR=	\
 	${_3dfx} \
 	${_3dfx_linux} \
@@ -82,6 +86,7 @@ SUBDIR=	\
 	${_ct} \
 	${_ctau} \
 	ctl \
+	cuse \
 	${_cxgb} \
 	${_cxgbe} \
 	${_cyclic} \
@@ -781,46 +786,6 @@ _cpsw=		cpsw
 _sound=		sound
 .endif
 
-.if ${MACHINE_CPUARCH} == "ia64"
-_aac=		aac
-_aacraid=	aacraid
-_aic=		aic
-_an=		an
-_arcnet=	arcnet
-_asr=		asr
-_bktr=		bktr
-_cardbus=	cardbus
-_cbb=		cbb
-_ciss=		ciss
-_cm=		cm
-_cmx=		cmx
-_coff=		coff
-_cpufreq=	cpufreq
-_dpt=		dpt
-_em=		em
-_ep=		ep
-_et=		et
-_exca=		exca
-_fe=		fe
-_hptiop=	hptiop
-_ida=		ida
-_igb=		igb
-_iir=		iir
-_ips=		ips
-_mly=		mly
-_pccard=	pccard
-_scsi_low=	scsi_low
-_smbfs=		smbfs
-_sound=		sound
-_splash=	splash
-_sppp=		sppp
-_streams=	streams
-_tpm=		tpm
-_twa=		twa
-_wi=		wi
-_xe=		xe
-.endif
-
 .if ${MACHINE_CPUARCH} == "powerpc"
 _agp=		agp
 _an=		an
@@ -868,9 +833,6 @@ _sound=		sound
 _zfs=		zfs
 .endif
 .endif
-
-.if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES)
-SUBDIR=${MODULES_OVERRIDE}
 .endif
 
 .for reject in ${WITHOUT_MODULES}
diff --git a/sys/modules/acl_nfs4/Makefile b/sys/modules/acl_nfs4/Makefile
index 8d3ac74d2e53..baff941eb589 100644
--- a/sys/modules/acl_nfs4/Makefile
+++ b/sys/modules/acl_nfs4/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH:  ${.CURDIR}/../../kern
 KMOD=	acl_nfs4
 SRCS=	vnode_if.h subr_acl_nfs4.c
diff --git a/sys/modules/acl_posix1e/Makefile b/sys/modules/acl_posix1e/Makefile
index ca8735df6b06..cb0c6e9eb8d4 100644
--- a/sys/modules/acl_posix1e/Makefile
+++ b/sys/modules/acl_posix1e/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH:  ${.CURDIR}/../../kern
 KMOD=	acl_posix1e
 SRCS=	vnode_if.h subr_acl_posix1e.c
diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile
index 9cf28b598ef9..572269224272 100644
--- a/sys/modules/acpi/acpi/Makefile
+++ b/sys/modules/acpi/acpi/Makefile
@@ -4,10 +4,6 @@
 .error "The ACPI module is deprecated, set FORCE_BUILD to force it"
 .endif
 
-.if ${MACHINE_CPUARCH} == "ia64"
-.error "ACPI can only be compiled into the kernel on the ia64 platform"
-.endif
-
 .if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
 .error "The ACPI module is only for amd64 and i386"
 .endif
diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile
index cb59d9aa4c95..beca7484b3ca 100644
--- a/sys/modules/aic7xxx/ahc/Makefile
+++ b/sys/modules/aic7xxx/ahc/Makefile
@@ -1,9 +1,10 @@
 
 # $FreeBSD$
 
-.include <src.opts.mk>
+SYSDIR?=${.CURDIR}/../../..
+.include "${SYSDIR}/conf/kern.opts.mk"
 
-.PATH:	${.CURDIR}/../../../dev/aic7xxx
+.PATH:	${SYSDIR}/dev/aic7xxx
 KMOD=	ahc
 .if ${MK_EISA} != "no"
 SUBDIR+= ahc_eisa
@@ -20,20 +21,20 @@ REG_PRINT_OPT= -p aic7xxx_reg_print.c
 .endif
 BEFORE_DEPEND = ${GENSRCS}
 
-../aicasm/aicasm: ${.CURDIR}/../../../dev/aic7xxx/aicasm/*.[chyl]
+../aicasm/aicasm: ${SYSDIR}/dev/aic7xxx/aicasm/*.[chyl]
 	( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm; )
 
 .if make(ahcfirmware)
 ahcfirmware: ${GENSRCS}
 ${GENSRCS}:								 \
-		${.CURDIR}/../../../dev/aic7xxx/aic7xxx.{reg,seq}	 \
-		${.CURDIR}/../../../cam/scsi/scsi_message.h 
-	../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi	 \
-			-I${.CURDIR}/../../../dev/aic7xxx		 \
+		${SYSDIR}/dev/aic7xxx/aic7xxx.{reg,seq}	 \
+		${SYSDIR}/cam/scsi/scsi_message.h 
+	../aicasm/aicasm ${INCLUDES} -I${SYSDIR}/cam/scsi	 \
+			-I${SYSDIR}/dev/aic7xxx		 \
 			-o aic7xxx_seq.h -r aic7xxx_reg.h		 \
 			${REG_PRINT_OPT}				 \
-			-i ${.CURDIR}/../../../dev/aic7xxx/aic7xxx_osm.h \
-			${.CURDIR}/../../../dev/aic7xxx/aic7xxx.seq
+			-i ${SYSDIR}/dev/aic7xxx/aic7xxx_osm.h \
+			${SYSDIR}/dev/aic7xxx/aic7xxx.seq
 .else
 ${GENSRCS}:
 	@echo "Error: ${.TARGET} is missing.  Run 'make ahcfirmware'"
diff --git a/sys/modules/alq/Makefile b/sys/modules/alq/Makefile
index 28b94d9e3920..782c3706d3cb 100644
--- a/sys/modules/alq/Makefile
+++ b/sys/modules/alq/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH:  ${.CURDIR}/../../kern
 KMOD=	alq
 SRCS=	opt_mac.h vnode_if.h kern_alq.c
diff --git a/sys/modules/an/Makefile b/sys/modules/an/Makefile
index b22f9d1144fb..82c4421fffb7 100644
--- a/sys/modules/an/Makefile
+++ b/sys/modules/an/Makefile
@@ -7,9 +7,4 @@ SRCS=	if_an.c if_an_pccard.c if_an_pci.c if_an_isa.c
 SRCS+=	opt_inet.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h
 SRCS+=	pccarddevs.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/arcnet/Makefile b/sys/modules/arcnet/Makefile
index 0b55a591bd17..2b2b4654f774 100644
--- a/sys/modules/arcnet/Makefile
+++ b/sys/modules/arcnet/Makefile
@@ -16,12 +16,4 @@ EXPORT_SYMS=	arc_frag_init	\
 		arc_output	\
 		arc_storelladdr
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/bxe/Makefile b/sys/modules/bxe/Makefile
index 2d2d662a1155..dff22bdc6a8f 100644
--- a/sys/modules/bxe/Makefile
+++ b/sys/modules/bxe/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
-BXE	= ${.CURDIR}/../../dev/bxe
+
+SYSDIR	?= ${.CURDIR}/../..
+
+BXE	= ${SYSDIR}/dev/bxe
 .PATH:	${BXE}
 
 KMOD	= if_bxe
diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile
index c3ecf56af8f9..7e5465edebb3 100644
--- a/sys/modules/cam/Makefile
+++ b/sys/modules/cam/Makefile
@@ -43,9 +43,4 @@ SRCS+=	ata_pmp.c
 
 EXPORT_SYMS=	YES	# XXX evaluate
 
-.if !defined(KERNBUILDDIR)
-opt_scsi.h:
-	echo "#define SCSI_DELAY 15000" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/carp/Makefile b/sys/modules/carp/Makefile
index 6b1bde0c4345..e1890d4c4f92 100644
--- a/sys/modules/carp/Makefile
+++ b/sys/modules/carp/Makefile
@@ -3,23 +3,9 @@
 .PATH: ${.CURDIR}/../../netinet
 .PATH: ${.CURDIR}/../../crypto
 
-.include <src.opts.mk>
-
 KMOD=	carp
 SRCS=	ip_carp.c sha1.c
 SRCS+=	device_if.h bus_if.h vnode_if.h
 SRCS+=	opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h opt_ofed.h
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	@echo "#define INET 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/cc/cc_cdg/Makefile b/sys/modules/cc/cc_cdg/Makefile
index bc6f62dffa23..f61cb61ae905 100644
--- a/sys/modules/cc/cc_cdg/Makefile
+++ b/sys/modules/cc/cc_cdg/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH: ${.CURDIR}/../../../netinet/cc
 KMOD=	cc_cdg
 SRCS=	cc_cdg.c
diff --git a/sys/modules/cc/cc_chd/Makefile b/sys/modules/cc/cc_chd/Makefile
index 20577f88218a..b3881b87a099 100644
--- a/sys/modules/cc/cc_chd/Makefile
+++ b/sys/modules/cc/cc_chd/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH: ${.CURDIR}/../../../netinet/cc
 KMOD=	cc_chd
 SRCS=	cc_chd.c
diff --git a/sys/modules/cc/cc_cubic/Makefile b/sys/modules/cc/cc_cubic/Makefile
index 8ffece2aa3bc..e22d902eae35 100644
--- a/sys/modules/cc/cc_cubic/Makefile
+++ b/sys/modules/cc/cc_cubic/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH: ${.CURDIR}/../../../netinet/cc
 KMOD=	cc_cubic
 SRCS=	cc_cubic.c
diff --git a/sys/modules/cc/cc_hd/Makefile b/sys/modules/cc/cc_hd/Makefile
index 4bf77bb1d902..3a2b041e99d6 100644
--- a/sys/modules/cc/cc_hd/Makefile
+++ b/sys/modules/cc/cc_hd/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH: ${.CURDIR}/../../../netinet/cc
 KMOD=	cc_hd
 SRCS=	cc_hd.c
diff --git a/sys/modules/cc/cc_htcp/Makefile b/sys/modules/cc/cc_htcp/Makefile
index dd3637dce3ef..787a709753a0 100644
--- a/sys/modules/cc/cc_htcp/Makefile
+++ b/sys/modules/cc/cc_htcp/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH: ${.CURDIR}/../../../netinet/cc
 KMOD=	cc_htcp
 SRCS=	cc_htcp.c
diff --git a/sys/modules/cc/cc_vegas/Makefile b/sys/modules/cc/cc_vegas/Makefile
index 075bd41e4a2a..731a80f3a473 100644
--- a/sys/modules/cc/cc_vegas/Makefile
+++ b/sys/modules/cc/cc_vegas/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH: ${.CURDIR}/../../../netinet/cc
 KMOD=	cc_vegas
 SRCS=	cc_vegas.c
diff --git a/sys/modules/ctl/Makefile b/sys/modules/ctl/Makefile
index c4fe6497ad2a..77dc4e12b382 100644
--- a/sys/modules/ctl/Makefile
+++ b/sys/modules/ctl/Makefile
@@ -14,6 +14,8 @@ SRCS+=	ctl_frontend_cam_sim.c
 SRCS+=	ctl_frontend_internal.c
 SRCS+=	ctl_frontend_iscsi.c
 SRCS+=	ctl_scsi_all.c
+SRCS+=	ctl_tpc.c
+SRCS+=	ctl_tpc_local.c
 SRCS+=	ctl_error.c
 SRCS+=	ctl_util.c
 SRCS+=	scsi_ctl.c
diff --git a/sys/modules/cxgb/Makefile b/sys/modules/cxgb/Makefile
index b866287b2d8b..8a6bb331b8c5 100644
--- a/sys/modules/cxgb/Makefile
+++ b/sys/modules/cxgb/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+SYSDIR?=${.CURDIR}/../..
+.include "${SYSDIR}/conf/kern.opts.mk"
 
 SUBDIR= cxgb
 SUBDIR+= cxgb_t3fw
diff --git a/sys/modules/cxgb/cxgb/Makefile b/sys/modules/cxgb/cxgb/Makefile
index 3f0f68af2de4..911f2bb2ee14 100644
--- a/sys/modules/cxgb/cxgb/Makefile
+++ b/sys/modules/cxgb/cxgb/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 CXGB = ${.CURDIR}/../../../dev/cxgb
 .PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys
 
@@ -15,17 +13,4 @@ SRCS+=	uipc_mvec.c
 
 CFLAGS+= -g -DDEFAULT_JUMBO -I${CXGB}
 
-.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/cxgb/iw_cxgb/Makefile b/sys/modules/cxgb/iw_cxgb/Makefile
index 2ee4990b4646..8df1ffc28005 100644
--- a/sys/modules/cxgb/iw_cxgb/Makefile
+++ b/sys/modules/cxgb/iw_cxgb/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 CXGB = ${.CURDIR}/../../../dev/cxgb
 .PATH: ${CXGB}/ulp/iw_cxgb
 
@@ -13,12 +11,4 @@ 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${CXGB} -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
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cxgb/tom/Makefile b/sys/modules/cxgb/tom/Makefile
index f4a277641fdb..64eecaf367fd 100644
--- a/sys/modules/cxgb/tom/Makefile
+++ b/sys/modules/cxgb/tom/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 CXGB = ${.CURDIR}/../../../dev/cxgb
 .PATH: ${CXGB}/ulp/tom
 
@@ -14,12 +12,4 @@ CFLAGS+= -g -I${CXGB}
 
 #CFLAGS+= -DDEBUG_PRINT -DDEBUG
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-	echo "#define TCP_OFFLOAD 1" >> ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cxgbe/Makefile b/sys/modules/cxgbe/Makefile
index b46bf224a1c3..f7862b5cd722 100644
--- a/sys/modules/cxgbe/Makefile
+++ b/sys/modules/cxgbe/Makefile
@@ -2,23 +2,24 @@
 # $FreeBSD$
 #
 
-.include <src.opts.mk>
+SYSDIR?=${.CURDIR}/../..
+.include "${SYSDIR}/conf/kern.opts.mk"
 
-SUBDIR = if_cxgbe
-SUBDIR+= t4_firmware
-SUBDIR+= t5_firmware
-SUBDIR+= ${_tom}
-SUBDIR+= ${_iw_cxgbe}
+SUBDIR=	if_cxgbe
+SUBDIR+=	t4_firmware
+SUBDIR+=	t5_firmware
+SUBDIR+=	${_tom}
+SUBDIR+=	${_iw_cxgbe}
 
 .if ${MACHINE_CPUARCH} == "amd64"
-_tom=		tom
+_tom=	tom
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _iw_cxgbe=	iw_cxgbe
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386"
-_tom=		tom
+_tom=	tom
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/cxgbe/if_cxgbe/Makefile b/sys/modules/cxgbe/if_cxgbe/Makefile
index cc2ba6ee1817..e4828f7787ad 100644
--- a/sys/modules/cxgbe/if_cxgbe/Makefile
+++ b/sys/modules/cxgbe/if_cxgbe/Makefile
@@ -2,34 +2,26 @@
 # $FreeBSD$
 #
 
-.include <src.opts.mk>
-
-CXGBE = ${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${.CURDIR}/../../../dev/cxgbe
 .PATH: ${CXGBE} ${CXGBE}/common
 
-KMOD = if_cxgbe
-SRCS = t4_main.c t4_sge.c t4_l2t.c t4_tracer.c t4_netmap.c
-SRCS+= t4_hw.c
-SRCS+= device_if.h bus_if.h pci_if.h
-SRCS+= opt_inet.h opt_inet6.h
-SRCS+= opt_ofed.h
-
-CFLAGS+= -I${CXGBE}
+KMOD=	if_cxgbe
+SRCS=	bus_if.h
+SRCS+=	device_if.h
+SRCS+=	opt_inet.h
+SRCS+=	opt_inet6.h
+SRCS+=	opt_ofed.h
+SRCS+=	pci_if.h
+SRCS+=	t4_hw.c
+SRCS+=	t4_l2t.c
+SRCS+=	t4_main.c
+SRCS+=	t4_netmap.c
+SRCS+=	t4_sge.c
+SRCS+=	t4_tracer.c
 
 # Provide the timestamp of a packet in its header mbuf.
 #CFLAGS+= -DT4_PKT_TIMESTAMP
 
-.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
+CFLAGS+= -I${CXGBE}
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cxgbe/iw_cxgbe/Makefile b/sys/modules/cxgbe/iw_cxgbe/Makefile
index fdf50639ab55..e1f362aa0b97 100644
--- a/sys/modules/cxgbe/iw_cxgbe/Makefile
+++ b/sys/modules/cxgbe/iw_cxgbe/Makefile
@@ -1,27 +1,28 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
-CXGBE = ${.CURDIR}/../../../dev/cxgbe
+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
+KMOD=	iw_cxgbe
+SRCS=	bus_if.h
+SRCS+=	cm.c
+SRCS+=	cq.c
+SRCS+=	device.c
+SRCS+=	device_if.h
+SRCS+=	ev.c
+SRCS+=	id_table.c
+SRCS+=	mem.c
+SRCS+=	opt_inet.h
+SRCS+=	opt_ktr.h
+SRCS+=	opt_ofed.h
+SRCS+=	opt_sched.h
+SRCS+=	pci_if.h
+SRCS+=	pcib_if.h
+SRCS+=	provider.c
+SRCS+=	qp.c
+SRCS+=	resource.c
+SRCS+=	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 a92dc0bb44a4..de2b601165a1 100644
--- a/sys/modules/cxgbe/t4_firmware/Makefile
+++ b/sys/modules/cxgbe/t4_firmware/Makefile
@@ -2,24 +2,24 @@
 # $FreeBSD$
 #
 
-T4FW = ${.CURDIR}/../../../dev/cxgbe/firmware
+T4FW=	${.CURDIR}/../../../dev/cxgbe/firmware
 .PATH: ${T4FW}
 
-KMOD = t4fw_cfg
-FIRMWS = ${KMOD}.txt:${KMOD}:1.0.0.0
+KMOD=	t4fw_cfg
+FIRMWS=	${KMOD}.txt:${KMOD}:1.0.0.0
 
 # You can have additional configuration files in the ${T4FW} directory.
 # t4fw_cfg_<name>.txt
 CFG_FILES != cd ${T4FW} && echo ${KMOD}_*.txt
 .for F in ${CFG_FILES}
 .if exists(${F})
-FIRMWS += ${F}:${F:C/.txt//}:1.0.0.0
+FIRMWS+=	${F}:${F:C/.txt//}:1.0.0.0
 .endif
 .endfor
 
-T4FW_VER = 1.9.12.0
-FIRMWS += t4fw.fw:t4fw:${T4FW_VER}
-CLEANFILES += t4fw.fw
+T4FW_VER=	1.11.27.0
+FIRMWS+=	t4fw.fw:t4fw:${T4FW_VER}
+CLEANFILES+=	t4fw.fw
 
 t4fw.fw: t4fw-${T4FW_VER}.bin.uu
 	uudecode -o ${.TARGET} ${.ALLSRC}
diff --git a/sys/modules/cxgbe/t5_firmware/Makefile b/sys/modules/cxgbe/t5_firmware/Makefile
index fe2c43e8337f..2f414f3ede08 100644
--- a/sys/modules/cxgbe/t5_firmware/Makefile
+++ b/sys/modules/cxgbe/t5_firmware/Makefile
@@ -2,24 +2,24 @@
 # $FreeBSD$
 #
 
-T5FW = ${.CURDIR}/../../../dev/cxgbe/firmware
+T5FW=	${.CURDIR}/../../../dev/cxgbe/firmware
 .PATH: ${T5FW}
 
-KMOD = t5fw_cfg
-FIRMWS = ${KMOD}.txt:${KMOD}:1.0.0.0
+KMOD=	t5fw_cfg
+FIRMWS=	${KMOD}.txt:${KMOD}:1.0.0.0
 
 # You can have additional configuration files in the ${T5FW} directory.
 # t5fw_cfg_<name>.txt
 CFG_FILES != cd ${T5FW} && echo ${KMOD}_*.txt
 .for F in ${CFG_FILES}
 .if exists(${F})
-FIRMWS += ${F}:${F:C/.txt//}:1.0.0.0
+FIRMWS+=	${F}:${F:C/.txt//}:1.0.0.0
 .endif
 .endfor
 
-T5FW_VER = 1.9.12.0
-FIRMWS += t5fw.fw:t5fw:${T5FW_VER}
-CLEANFILES += t5fw.fw
+T5FW_VER=	1.11.27.0
+FIRMWS+=	t5fw.fw:t5fw:${T5FW_VER}
+CLEANFILES+=	t5fw.fw
 
 t5fw.fw: t5fw-${T5FW_VER}.bin.uu
 	uudecode -o ${.TARGET} ${.ALLSRC}
diff --git a/sys/modules/cxgbe/tom/Makefile b/sys/modules/cxgbe/tom/Makefile
index 99c1f4e68596..5f460e04d65a 100644
--- a/sys/modules/cxgbe/tom/Makefile
+++ b/sys/modules/cxgbe/tom/Makefile
@@ -2,29 +2,22 @@
 # $FreeBSD$
 #
 
-.include <src.opts.mk>
-
-CXGBE = ${.CURDIR}/../../../dev/cxgbe
+CXGBE=	${.CURDIR}/../../../dev/cxgbe
 .PATH: ${CXGBE}/tom
 
-KMOD = t4_tom
-SRCS = t4_tom.c t4_connect.c t4_listen.c t4_cpl_io.c t4_tom_l2t.c t4_ddp.c
-SRCS+= device_if.h bus_if.h pci_if.h
-SRCS+= opt_inet.h opt_inet6.h
+KMOD=	t4_tom
+SRCS=	bus_if.h
+SRCS+=	device_if.h
+SRCS+=	opt_inet.h
+SRCS+=	opt_inet6.h
+SRCS+=	pci_if.h
+SRCS+=	t4_connect.c
+SRCS+=	t4_cpl_io.c
+SRCS+=	t4_ddp.c
+SRCS+=	t4_listen.c
+SRCS+=	t4_tom.c
+SRCS+=	t4_tom_l2t.c
 
 CFLAGS+= -I${CXGBE}
 
-.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/dpt/Makefile b/sys/modules/dpt/Makefile
index c96bb4b016e5..15019e090011 100644
--- a/sys/modules/dpt/Makefile
+++ b/sys/modules/dpt/Makefile
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+SYSDIR?=${.CURDIR}/../..
+.include "${SYSDIR}/conf/kern.opts.mk"
 
-.PATH:	${.CURDIR}/../../dev/dpt
+.PATH:	${SYSDIR}/dev/dpt
 KMOD=	dpt
 SRCS=	dpt_scsi.c dpt.h \
 	dpt_pci.c pci_if.h \
diff --git a/sys/modules/drm/Makefile b/sys/modules/drm/Makefile
index f75eb3b815d4..5c4b99c22bc0 100644
--- a/sys/modules/drm/Makefile
+++ b/sys/modules/drm/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+SYSDIR?=${.CURDIR}/../..
+.include "${SYSDIR}/conf/kern.opts.mk"
 
 # Modules that include binary-only blobs of microcode should be selectable by
 # MK_SOURCELESS_UCODE option (see below).
diff --git a/sys/modules/drm2/Makefile b/sys/modules/drm2/Makefile
index a0ee800e0787..a04b3e25a23a 100644
--- a/sys/modules/drm2/Makefile
+++ b/sys/modules/drm2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-.include <bsd.own.mk>
+SYSDIR?=${.CURDIR}/../..
+.include "${SYSDIR}/conf/kern.opts.mk"
 
 .if ${MACHINE_CPUARCH} == "amd64"
 _radeonkms=	radeonkms
diff --git a/sys/modules/drm2/radeonkms/Makefile b/sys/modules/drm2/radeonkms/Makefile
index 6315a85dc5d2..076b8256e936 100644
--- a/sys/modules/drm2/radeonkms/Makefile
+++ b/sys/modules/drm2/radeonkms/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH:	${.CURDIR}/../../../dev/drm2/radeon
 
 KMOD	= radeonkms
diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile
index 1b1237175858..b84c632d4829 100644
--- a/sys/modules/dtrace/Makefile
+++ b/sys/modules/dtrace/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
 .include "Makefile.inc"
 
 SUBDIR=		dtmalloc	\
diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile
index ea2c1f1654aa..5492c6f2d55a 100644
--- a/sys/modules/dtrace/dtrace/Makefile
+++ b/sys/modules/dtrace/dtrace/Makefile
@@ -42,6 +42,7 @@ CFLAGS+=	-I${SYSDIR}/cddl/compat/opensolaris \
 		-I${SYSDIR}/cddl/dev/dtrace \
 		-I${SYSDIR}/cddl/dev/dtrace/${ARCHDIR} \
 		-I${SYSDIR}/cddl/contrib/opensolaris/uts/common \
+		-I${SYSDIR}/cddl/contrib/opensolaris/common/util \
 		-I${SYSDIR} -DDIS_MEM
 
 CFLAGS+=	-DSMP
diff --git a/sys/modules/dtrace/fasttrap/Makefile b/sys/modules/dtrace/fasttrap/Makefile
index 45ff7bf51eef..90e1277eaaa7 100644
--- a/sys/modules/dtrace/fasttrap/Makefile
+++ b/sys/modules/dtrace/fasttrap/Makefile
@@ -20,9 +20,13 @@ CFLAGS+=	-I${SYSDIR}/cddl/contrib/opensolaris/uts/powerpc
 .PATH:		${SYSDIR}/cddl/contrib/opensolaris/uts/powerpc/dtrace
 .endif
 
+.PATH:		${SYSDIR}/cddl/contrib/opensolaris/common/unicode
+SRCS+=		u8_textprep.c
+
 CFLAGS+=	-DSMP
 
 .include <bsd.kmod.mk>
 
 CFLAGS+=	-include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h
+CWARNFLAGS+=	-Wno-cast-qual
 CWARNFLAGS+=	-Wno-unused
diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile
index c1f8bb1cfad7..d7d8b1be86e5 100644
--- a/sys/modules/dummynet/Makefile
+++ b/sys/modules/dummynet/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 .PATH:  ${.CURDIR}/../../netpfil/ipfw
 KMOD=   dummynet
 SRCS=   ip_dummynet.c
@@ -10,11 +8,4 @@ SRCS+= dn_heap.c dn_sched_fifo.c dn_sched_qfq.c dn_sched_rr.c dn_sched_wf2q.c
 SRCS+= dn_sched_prio.c
 SRCS+=	opt_inet6.h
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/em/Makefile b/sys/modules/em/Makefile
index 5e71f2f00eaf..3112d010a372 100644
--- a/sys/modules/em/Makefile
+++ b/sys/modules/em/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 .PATH:  ${.CURDIR}/../../dev/e1000
 KMOD    = if_em
 SRCS    = device_if.h bus_if.h pci_if.h opt_inet.h opt_inet6.h
@@ -21,16 +19,4 @@ CFLAGS += -I${.CURDIR}/../../dev/e1000
 # DEVICE_POLLING for a non-interrupt-driven method
 #CFLAGS  += -DDEVICE_POLLING
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	@echo "#define INET 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/en/Makefile b/sys/modules/en/Makefile
index 8f342e32fb3b..05672f03cdb8 100644
--- a/sys/modules/en/Makefile
+++ b/sys/modules/en/Makefile
@@ -8,15 +8,4 @@ SRCS+=	opt_inet.h opt_natm.h opt_ddb.h
 CFLAGS+= -DENABLE_BPF
 # CFLAGS+= -DINVARIANT_SUPPORT -DINVARIANTS -DEN_DEBUG=0
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-opt_natm.h:
-	echo "#define NATM 1" > ${.TARGET}
-
-# opt_ddb.h:
-# 	echo "#define DDB 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ep/Makefile b/sys/modules/ep/Makefile
index 99281a46421d..9f1dbee23a6d 100644
--- a/sys/modules/ep/Makefile
+++ b/sys/modules/ep/Makefile
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+SYSDIR?=${.CURDIR}/../..
+.include "${SYSDIR}/conf/kern.opts.mk"
 
-.PATH: ${.CURDIR}/../../dev/ep
+.PATH: ${SYSDIR}/dev/ep
 
 KMOD=	if_ep
 SRCS=	if_ep.c
diff --git a/sys/modules/fatm/Makefile b/sys/modules/fatm/Makefile
index 3e0b8410fe25..8e1e7bb5d7bc 100644
--- a/sys/modules/fatm/Makefile
+++ b/sys/modules/fatm/Makefile
@@ -9,12 +9,4 @@ SRCS=	if_fatm.c device_if.h bus_if.h pci_if.h opt_inet.h opt_natm.h
 
 # CFLAGS+= -DFATM_DEBUG=0 -DINVARIANT_SUPPORT -DINVARIANTS
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-opt_natm.h:
-	echo "#define NATM 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/firewire/fwip/Makefile b/sys/modules/firewire/fwip/Makefile
index f26f98c15dae..992d35601c98 100644
--- a/sys/modules/firewire/fwip/Makefile
+++ b/sys/modules/firewire/fwip/Makefile
@@ -11,11 +11,6 @@ SRCS    = bus_if.h device_if.h \
           firewire.h firewirereg.h \
           if_fwsubr.c
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET      1" > ${.TARGET}
-.endif
-
 #CFLAGS += -DDEVICE_POLLING
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hatm/Makefile b/sys/modules/hatm/Makefile
index ec1a8788ebef..557819956597 100644
--- a/sys/modules/hatm/Makefile
+++ b/sys/modules/hatm/Makefile
@@ -11,12 +11,4 @@ SRCS=	if_hatm.c if_hatm_intr.c if_hatm_ioctl.c if_hatm_tx.c if_hatm_rx.c \
 CFLAGS+= -DENABLE_BPF
 # CFLAGS+= -DHATM_DEBUG -DINVARIANT_SUPPORT -DINVARIANTS
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-opt_natm.h:
-	echo "#define NATM 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/hwpmc/Makefile b/sys/modules/hwpmc/Makefile
index fd059405dab9..c9c60fcf8585 100644
--- a/sys/modules/hwpmc/Makefile
+++ b/sys/modules/hwpmc/Makefile
@@ -24,10 +24,6 @@ SRCS+=	hwpmc_pentium.c hwpmc_tsc.c hwpmc_x86.c hwpmc_uncore.c
 SRCS+=	device_if.h bus_if.h
 .endif
 
-.if ${MACHINE_CPUARCH} == "ia64"
-SRCS+=	hwpmc_ia64.c
-.endif
-
 .if ${MACHINE_CPUARCH} == "powerpc"
 SRCS+=	hwpmc_powerpc.c hwpmc_mpc7xxx.c hwpmc_ppc970.c
 .endif
diff --git a/sys/modules/i40e/Makefile b/sys/modules/i40e/Makefile
index 7d06a6836a50..52608ce3bf58 100755
--- a/sys/modules/i40e/Makefile
+++ b/sys/modules/i40e/Makefile
@@ -1,7 +1,5 @@
 #$FreeBSD$
 
-.include <src.opts.mk>
-
 .PATH:  ${.CURDIR}/../../dev/i40e
 
 KMOD    = if_i40e
@@ -11,25 +9,11 @@ SRCS    += if_i40e.c i40e_txrx.c i40e_osdep.c
 # Shared source
 SRCS    += i40e_common.c i40e_nvm.c i40e_adminq.c i40e_lan_hmc.c i40e_hmc.c
 
-CFLAGS	+= -DSMP -DFORTVILLE_HW
+CFLAGS	+= -DSMP
 
 # Add Flow Director support
 # CFLAGS += -DI40E_FDIR
-# A0 hardware support
-# CFLAGS += -DFORTVILLE_A0_SUPPORT
 # Debug messages / sysctls
 # CFLAGS += -DI40E_DEBUG
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	@echo "#define INET 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/ibcore/Makefile b/sys/modules/ibcore/Makefile
index d7973c868908..b667ef8565d1 100644
--- a/sys/modules/ibcore/Makefile
+++ b/sys/modules/ibcore/Makefile
@@ -2,8 +2,6 @@
 .PATH:  ${.CURDIR}/../../ofed/drivers/infiniband/core
 .PATH:  ${.CURDIR}/../../ofed/include/linux
 
-.include <bsd.own.mk>
-
 KMOD    = ibcore
 SRCS    = addr.c cm_msgs.h iwcm.c mad_rmpp.h sa_query.c ucma.c uverbs_cmd.c
 SRCS+= agent.c    local_sa.c iwcm.h multicast.c smi.c ud_header.c uverbs_main.c
diff --git a/sys/modules/if_bridge/Makefile b/sys/modules/if_bridge/Makefile
index 0cc231e3da1b..c4febee5006b 100644
--- a/sys/modules/if_bridge/Makefile
+++ b/sys/modules/if_bridge/Makefile
@@ -1,19 +1,7 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 .PATH:	${.CURDIR}/../../net
 KMOD=	if_bridge
 SRCS=	if_bridge.c opt_inet.h opt_inet6.h opt_carp.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-	
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile
index 9dc5742eaa0b..7a501f151c13 100644
--- a/sys/modules/if_disc/Makefile
+++ b/sys/modules/if_disc/Makefile
@@ -5,12 +5,4 @@
 KMOD=	if_disc
 SRCS=	if_disc.c opt_inet.h opt_inet6.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-#opt_inet6.h:
-#	echo "#define INET6 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/if_faith/Makefile b/sys/modules/if_faith/Makefile
index a46d5fd399d6..fe78ec9be48c 100644
--- a/sys/modules/if_faith/Makefile
+++ b/sys/modules/if_faith/Makefile
@@ -5,12 +5,4 @@
 KMOD=	if_faith
 SRCS=	if_faith.c opt_inet.h opt_inet6.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile
index f2db9136f5fa..fd1ace27ebb0 100644
--- a/sys/modules/if_gif/Makefile
+++ b/sys/modules/if_gif/Makefile
@@ -1,27 +1,17 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+SYSDIR?=${.CURDIR}/../..
+.include "${SYSDIR}/conf/kern.opts.mk"
 
-.PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
+.PATH: ${SYSDIR}/net ${SYSDIR}/netinet ${SYSDIR}/netinet6
 
 KMOD=	if_gif
 SRCS=	if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
-opt_mrouting.h:
-	echo "#define MROUTING 1" > ${.TARGET}
-.else
+.if defined(KERNBUILDDIR)
 OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h
 .if empty(OPT_INET6)
-MK_INET6_SUPPORT= no
+MK_INET6_SUPPORT=no
 .endif
 .endif
 
diff --git a/sys/modules/if_gre/Makefile b/sys/modules/if_gre/Makefile
index 4f79ec147ad5..9c618d3651ff 100644
--- a/sys/modules/if_gre/Makefile
+++ b/sys/modules/if_gre/Makefile
@@ -5,12 +5,4 @@
 KMOD=	if_gre
 SRCS=	if_gre.c ip_gre.c opt_inet.h opt_inet6.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/if_lagg/Makefile b/sys/modules/if_lagg/Makefile
index f2f1a6e48406..cdcc8928f6c7 100644
--- a/sys/modules/if_lagg/Makefile
+++ b/sys/modules/if_lagg/Makefile
@@ -1,19 +1,7 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 .PATH:	${.CURDIR}/../../net
 KMOD=	if_lagg
 SRCS=	if_lagg.c ieee8023ad_lacp.c opt_inet.h opt_inet6.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/if_stf/Makefile b/sys/modules/if_stf/Makefile
index 5e8bd2fba27f..709c2555132b 100644
--- a/sys/modules/if_stf/Makefile
+++ b/sys/modules/if_stf/Makefile
@@ -5,12 +5,4 @@
 KMOD=	if_stf
 SRCS=	if_stf.c opt_inet.h opt_inet6.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/if_tap/Makefile b/sys/modules/if_tap/Makefile
index b993093a29db..af35fdbb5bfa 100644
--- a/sys/modules/if_tap/Makefile
+++ b/sys/modules/if_tap/Makefile
@@ -10,9 +10,6 @@ SRCS=	if_tap.c opt_compat.h opt_inet.h vnode_if.h
 .if !defined(KERNBUILDDIR)
 opt_compat.h:
 	echo "#define COMPAT_FREEBSD6 1" > ${.TARGET}
-
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
 .endif
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index 293846e585c1..4226329ddcde 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -5,12 +5,4 @@
 KMOD=	if_tun
 SRCS=	if_tun.c opt_inet.h opt_inet6.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/igb/Makefile b/sys/modules/igb/Makefile
index 5da3cf515240..57a74fa89ff5 100644
--- a/sys/modules/igb/Makefile
+++ b/sys/modules/igb/Makefile
@@ -1,10 +1,8 @@
 #$FreeBSD$
 
-.include <src.opts.mk>
-
 .PATH:  ${.CURDIR}/../../dev/e1000
 KMOD    = if_igb
-SRCS    = device_if.h bus_if.h pci_if.h opt_inet.h opt_inet6.h
+SRCS    = device_if.h bus_if.h pci_if.h opt_inet.h opt_inet6.h opt_rss.h
 SRCS    += if_igb.c $(SHARED_SRCS)
 SHARED_SRCS = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c
 SHARED_SRCS += e1000_80003es2lan.c e1000_82542.c e1000_82541.c e1000_82543.c
@@ -23,16 +21,4 @@ CFLAGS += -I${.CURDIR}/../../dev/e1000 -DSMP
 # ALTQ. 
 #CFLAGS  += -DIGB_LEGACY_TX
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	@echo "#define INET 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/ip6_mroute_mod/Makefile b/sys/modules/ip6_mroute_mod/Makefile
index 943f9ab92368..a0f94f1e73f8 100644
--- a/sys/modules/ip6_mroute_mod/Makefile
+++ b/sys/modules/ip6_mroute_mod/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH: ${.CURDIR}/../../netinet6
 
 KMOD=	ip6_mroute
@@ -9,11 +7,4 @@ KMOD=	ip6_mroute
 SRCS=	ip6_mroute.c
 SRCS+=	opt_inet6.h opt_mrouting.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-opt_mrouting.h:
-	echo "#define MROUTING 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile
index df5424b639f7..1c82717cbede 100644
--- a/sys/modules/ip_mroute_mod/Makefile
+++ b/sys/modules/ip_mroute_mod/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH: ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
 
 KMOD=	ip_mroute
@@ -9,11 +7,4 @@ KMOD=	ip_mroute
 SRCS=	ip_mroute.c
 SRCS+=	opt_inet.h opt_mrouting.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-opt_mrouting.h:
-	echo "#define MROUTING 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ipdivert/Makefile b/sys/modules/ipdivert/Makefile
index 9e1e89d29d0a..f67ce4b5a171 100644
--- a/sys/modules/ipdivert/Makefile
+++ b/sys/modules/ipdivert/Makefile
@@ -1,21 +1,8 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 .PATH: ${.CURDIR}/../../netinet
 
 KMOD=   ipdivert
 SRCS=   ip_divert.c opt_inet.h opt_inet6.h opt_sctp.h
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	echo "#define INET 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/ipfilter/Makefile b/sys/modules/ipfilter/Makefile
index 0bdfbf2dfcee..0d8fa8a05816 100644
--- a/sys/modules/ipfilter/Makefile
+++ b/sys/modules/ipfilter/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$ 
 
-.include <src.opts.mk>
-
 .PATH: ${.CURDIR}/../../contrib/ipfilter/netinet
 
 KMOD=	ipl
@@ -11,15 +9,6 @@ SRCS=	mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \
 	ip_nat6.c ip_rules.c ip_scan.c ip_dstlist.c radix_ipf.c
 SRCS+=	opt_bpf.h opt_inet6.h
 
-.if !defined(KERNBUILDDIR)
-opt_bpf.h:
-	echo "#define DEV_BPF 1" > ${.TARGET}
-
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-.endif
 CFLAGS+=  -I${.CURDIR}/../../contrib/ipfilter
 CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DIPFILTER_LOOKUP
 #
diff --git a/sys/modules/ipoib/Makefile b/sys/modules/ipoib/Makefile
index 6cf805dcde1b..70a3f6f7cec5 100644
--- a/sys/modules/ipoib/Makefile
+++ b/sys/modules/ipoib/Makefile
@@ -2,8 +2,6 @@
 .PATH:  ${.CURDIR}/../../ofed/drivers/infiniband/ulp/ipoib
 .PATH:  ${.CURDIR}/../../ofed/include/linux
 
-.include <src.opts.mk>
-
 KMOD    = ipoib
 SRCS    = device_if.h bus_if.h opt_ofed.h vnode_if.h opt_inet.h opt_inet6.h
 SRCS    += ipoib_cm.c ipoib_ib.c ipoib_main.c ipoib_multicast.c ipoib_verbs.c ipoib.h
@@ -14,18 +12,6 @@ CFLAGS+= -I${.CURDIR}/../ibcore
 CFLAGS+= -I${.CURDIR}/../../ofed/include/
 CFLAGS+= -DINET6 -DINET -DOFED
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	@echo "#define INET 1" > ${.TARGET}
-.endif
-
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	@echo "#define INET6 1" > ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
 
 CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
diff --git a/sys/modules/ixgbe/Makefile b/sys/modules/ixgbe/Makefile
index d7409d7e37e7..16bee5b1e1d0 100644
--- a/sys/modules/ixgbe/Makefile
+++ b/sys/modules/ixgbe/Makefile
@@ -1,12 +1,10 @@
 #$FreeBSD$
 
-.include <src.opts.mk>
-
 .PATH:  ${.CURDIR}/../../dev/ixgbe
 
 KMOD    = if_ixgbe
 SRCS    = device_if.h bus_if.h pci_if.h
-SRCS	+= opt_inet.h opt_inet6.h
+SRCS	+= opt_inet.h opt_inet6.h opt_rss.h
 SRCS    += ixgbe.c ixv.c
 # Shared source
 SRCS    += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
@@ -14,16 +12,4 @@ SRCS    += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c
 SRCS    += ixgbe_82599.c ixgbe_82598.c ixgbe_x540.c
 CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP -DIXGBE_FDIR
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	@echo "#define INET 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/khelp/h_ertt/Makefile b/sys/modules/khelp/h_ertt/Makefile
index 33d8c7b0e765..956d419a6899 100644
--- a/sys/modules/khelp/h_ertt/Makefile
+++ b/sys/modules/khelp/h_ertt/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH: ${.CURDIR}/../../../netinet/khelp
 KMOD=	h_ertt
 SRCS=	h_ertt.c
diff --git a/sys/modules/krpc/Makefile b/sys/modules/krpc/Makefile
index 2f3d3a7f0ae3..0f4b5362fff2 100644
--- a/sys/modules/krpc/Makefile
+++ b/sys/modules/krpc/Makefile
@@ -5,6 +5,7 @@ KMOD=	krpc
 SRCS=	auth_none.c \
 	auth_unix.c \
 	authunix_prot.c \
+	clnt_bck.c \
 	clnt_dg.c \
 	clnt_rc.c \
 	clnt_vc.c \
@@ -31,13 +32,4 @@ SRCS+=	xdr.c \
 
 SRCS+=	opt_inet6.h
 
-.if !defined(KERNBUILDDIR)
-NFS_INET6?=	1	# 0/1 - requires INET6 to be configured in kernel
-
-.if ${NFS_INET6} > 0
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index f79ad1b7a1c0..25615a7464b8 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -56,8 +56,6 @@ linux${SFX}_genassym.o: linux${SFX}_genassym.c linux.h @ machine x86
 	${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC}
 
 .if !defined(KERNBUILDDIR)
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
 .if defined(KTR)
 CFLAGS+=	-DKTR
 .endif
diff --git a/sys/modules/lmc/Makefile b/sys/modules/lmc/Makefile
index 70e27b50eddd..7a53f3e4bb07 100644
--- a/sys/modules/lmc/Makefile
+++ b/sys/modules/lmc/Makefile
@@ -10,15 +10,9 @@ SRCS += opt_netgraph.h
 SRCS += opt_global.h
 SRCS += opt_bpf.h
 
-opt_inet.h:
-	echo "#define INET 1"     > ${.TARGET}
-opt_inet6.h:
-	echo "#define INET6 0"    > ${.TARGET}
 opt_netgraph.h:
 	echo "#define NETGRAPH 1" > ${.TARGET}
 opt_global.h:
 	echo "#define ALTQ 1"     > ${.TARGET}
-opt_bpf.h: # FreeBSD-5:
-	echo "#define DEV_BPF 1"  > ${.TARGET}
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/mlx4/Makefile b/sys/modules/mlx4/Makefile
index 1af961ff81ca..94957e882446 100644
--- a/sys/modules/mlx4/Makefile
+++ b/sys/modules/mlx4/Makefile
@@ -1,8 +1,5 @@
 # $FreeBSD$
 .PATH:  ${.CURDIR}/../../ofed/drivers/net/mlx4
-
-.include <src.opts.mk>
-
 .PATH:  ${.CURDIR}/../../ofed/include/linux
 KMOD    = mlx4
 SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h
@@ -12,18 +9,6 @@ SRCS+=	pd.c port.c profile.c qp.c reset.c sense.c srq.c resource_tracker.c sys_t
 CFLAGS+= -I${.CURDIR}/../../ofed/drivers/net/mlx4
 CFLAGS+= -I${.CURDIR}/../../ofed/include/
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	@echo "#define INET 1" > ${.TARGET}
-.endif
-
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	@echo "#define INET6 1" > ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
 
 CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
diff --git a/sys/modules/mlx4ib/Makefile b/sys/modules/mlx4ib/Makefile
index 68a8cd826096..e6a78fa0b6e9 100644
--- a/sys/modules/mlx4ib/Makefile
+++ b/sys/modules/mlx4ib/Makefile
@@ -2,8 +2,6 @@
 .PATH:  ${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4
 .PATH:  ${.CURDIR}/../../ofed/include/linux
 
-.include <src.opts.mk>
-
 KMOD    = mlx4ib
 SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h
 SRCS+= linux_compat.c linux_radix.c linux_idr.c 
@@ -17,18 +15,6 @@ CFLAGS+= -I${.CURDIR}/../../ofed/include/
 CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM
 CFLAGS+= -DINET6 -DINET -DOFED
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	@echo "#define INET 1" > ${.TARGET}
-.endif
-
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	@echo "#define INET6 1" > ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
 
 CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
diff --git a/sys/modules/mlxen/Makefile b/sys/modules/mlxen/Makefile
index 3611f25fa8e1..64ed50d7a053 100644
--- a/sys/modules/mlxen/Makefile
+++ b/sys/modules/mlxen/Makefile
@@ -1,8 +1,6 @@
 # $FreeBSD$
 .PATH:  ${.CURDIR}/../../ofed/drivers/net/mlx4
 
-.include <src.opts.mk>
-
 KMOD    = mlxen
 SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h
 SRCS	+= en_cq.c en_frag.c en_main.c en_netdev.c en_port.c en_resources.c
@@ -11,18 +9,6 @@ SRCS	+= opt_inet.h opt_inet6.h
 CFLAGS+= -I${.CURDIR}/../../ofed/drivers/net/mlx4
 CFLAGS+= -I${.CURDIR}/../../ofed/include/
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	@echo "#define INET 1" > ${.TARGET}
-.endif
-
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	@echo "#define INET6 1" > ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
 
 CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
diff --git a/sys/modules/mthca/Makefile b/sys/modules/mthca/Makefile
index dd34d70114f3..25daedb0e3d3 100644
--- a/sys/modules/mthca/Makefile
+++ b/sys/modules/mthca/Makefile
@@ -2,8 +2,6 @@
 
 .PATH:  ${.CURDIR}/../../ofed/drivers/infiniband/hw/mthca
 
-.include <src.opts.mk>
-
 KMOD    = mthca
 SRCS    = device_if.h bus_if.h pci_if.h vnode_if.h
 SRCS+=	mthca_allocator.c mthca_av.c mthca_catas.c mthca_cmd.c mthca_cq.c
@@ -14,18 +12,6 @@ SRCS+=	opt_inet.h opt_inet6.h
 
 CFLAGS+= -I${.CURDIR}/../../ofed/include
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	@echo "#define INET 1" > ${.TARGET}
-.endif
-
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	@echo "#define INET6 1" > ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
 
 CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS}
diff --git a/sys/modules/netfpga10g/nf10bmac/Makefile b/sys/modules/netfpga10g/nf10bmac/Makefile
index 06636d9e5b72..adc447194c1e 100644
--- a/sys/modules/netfpga10g/nf10bmac/Makefile
+++ b/sys/modules/netfpga10g/nf10bmac/Makefile
@@ -6,11 +6,10 @@ KMOD=	if_nf10bmac
 SRCS=	if_nf10bmac.c
 SRCS+=	device_if.h bus_if.h pci_if.h
 SRCS+=	opt_device_polling.h
+SRCS+=	opt_netfpga.h
 
 .if ${MACHINE_CPUARCH} == "mips"
 SRCS+=	if_nf10bmac_fdt.c ofw_bus_if.h
 .endif
 
-CFLAGS+=	-DDEVICE_POLLING
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile
index cccbd656c151..c9b5748a7b4b 100644
--- a/sys/modules/netgraph/Makefile
+++ b/sys/modules/netgraph/Makefile
@@ -1,7 +1,8 @@
 # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $
 # $FreeBSD$
 
-.include <src.opts.mk>
+SYSDIR?=${.CURDIR}/../..
+.include "${SYSDIR}/conf/kern.opts.mk"
 
 SUBDIR=	async \
 	atm \
@@ -57,7 +58,7 @@ SUBDIR=	async \
 _bluetooth=	bluetooth
 .endif
 
-.if ${MK_CRYPT} != "no" && exists(${.CURDIR}/../../crypto/rc4/rc4.c)
+.if ${MK_CRYPT} != "no" && exists(${SYSDIR}/crypto/rc4/rc4.c)
 _mppc=		mppc
 .endif
 
diff --git a/sys/modules/netgraph/gif/Makefile b/sys/modules/netgraph/gif/Makefile
index acf4373f26bf..ecfb7d73d089 100644
--- a/sys/modules/netgraph/gif/Makefile
+++ b/sys/modules/netgraph/gif/Makefile
@@ -3,12 +3,4 @@
 KMOD=	ng_gif
 SRCS= 	ng_gif.c opt_inet.h opt_inet6.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/iface/Makefile b/sys/modules/netgraph/iface/Makefile
index e688004c198e..8b50a3c4a46f 100644
--- a/sys/modules/netgraph/iface/Makefile
+++ b/sys/modules/netgraph/iface/Makefile
@@ -4,12 +4,4 @@
 KMOD=	ng_iface
 SRCS= 	ng_iface.c opt_inet.h opt_inet6.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/ipfw/Makefile b/sys/modules/netgraph/ipfw/Makefile
index 5805c09f8a49..c51546bdb311 100644
--- a/sys/modules/netgraph/ipfw/Makefile
+++ b/sys/modules/netgraph/ipfw/Makefile
@@ -1,20 +1,6 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 KMOD=	ng_ipfw
 SRCS= 	ng_ipfw.c opt_inet.h opt_inet6.h
 
-.if !defined(KERNBUILDDIR)
-
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	echo "#define INET 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/netgraph/netflow/Makefile b/sys/modules/netgraph/netflow/Makefile
index 2a8fd626cc02..10345c1517e5 100644
--- a/sys/modules/netgraph/netflow/Makefile
+++ b/sys/modules/netgraph/netflow/Makefile
@@ -3,20 +3,9 @@
 # Author: Gleb Smirnoff <glebius@freebsd.org>
 #
 
-.include <src.opts.mk>
-
 .PATH: ${.CURDIR}/../../../netgraph/netflow
 
 KMOD=   ng_netflow
 SRCS=   ng_netflow.c netflow.c netflow_v9.c opt_inet6.h opt_route.h
 
-.if !defined(KERNBUILDDIR)
-
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/nfscl/Makefile b/sys/modules/nfscl/Makefile
index ba78d05d4451..171b1e1c644f 100644
--- a/sys/modules/nfscl/Makefile
+++ b/sys/modules/nfscl/Makefile
@@ -23,20 +23,8 @@ SRCS=	vnode_if.h \
 	opt_ufs.h
 
 .if !defined(KERNBUILDDIR)
-NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
-NFS_INET6?=	1	# 0/1 - requires INET6 to be configured in kernel
 NFS_ROOT?=	1	# 0/1 - requires NFS_ROOT to be configured in kernel
 
-.if ${NFS_INET} > 0
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-.endif
-
-.if ${NFS_INET6} > 0
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
 .if ${NFS_ROOT} > 0
 opt_nfsroot.h:
 	echo "#define NFS_ROOT 1" > ${.TARGET}
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index aaa6a04449d5..a015f343b64e 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -10,20 +10,8 @@ SRCS=	vnode_if.h \
 SRCS+=	opt_inet6.h opt_kgssapi.h
 
 .if !defined(KERNBUILDDIR)
-NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
-NFS_INET6?=	1	# 0/1 - requires INET6 to be configured in kernel
 NFS_ROOT?=	1	# 0/1 - requires NFS_ROOT to be configured in kernel
 
-.if ${NFS_INET} > 0
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-.endif
-
-.if ${NFS_INET6} > 0
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
 .if ${NFS_ROOT} > 0
 opt_nfsroot.h:
 	echo "#define NFS_ROOT 1" > ${.TARGET}
diff --git a/sys/modules/nfslockd/Makefile b/sys/modules/nfslockd/Makefile
index 337314470d4e..407a4aba0221 100644
--- a/sys/modules/nfslockd/Makefile
+++ b/sys/modules/nfslockd/Makefile
@@ -12,14 +12,4 @@ SRCS=	vnode_if.h \
 	sm_inter_xdr.c
 SRCS+=	opt_inet6.h opt_nfs.h
 
-.if !defined(KERNBUILDDIR)
-NFS_INET6?=	1	# 0/1 - requires INET6 to be configured in kernel
-
-.if ${NFS_INET6} > 0
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile
index cdf24ed3febc..d00fe47bd03a 100644
--- a/sys/modules/nfsserver/Makefile
+++ b/sys/modules/nfsserver/Makefile
@@ -9,13 +9,4 @@ SRCS=	vnode_if.h \
 	opt_nfs.h
 SRCS+=	opt_inet6.h
 
-.if !defined(KERNBUILDDIR)
-NFS_INET6?=	1	# 0/1 - requires INET6 to be configured in kernel
-
-.if ${NFS_INET6} > 0
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/patm/Makefile b/sys/modules/patm/Makefile
index 5d5200e73945..7df3165d3eea 100644
--- a/sys/modules/patm/Makefile
+++ b/sys/modules/patm/Makefile
@@ -12,12 +12,4 @@ SRCS=	if_patm.c if_patm_attach.c if_patm_ioctl.c if_patm_intr.c \
 CFLAGS+= -DENABLE_BPF
 # CFLAGS+= -DPATM_DEBUG=0x0 -DINVARIANT_SUPPORT -DINVARIANTS -DDIAGNOSTIC
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-opt_natm.h:
-	echo "#define NATM 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index e327b5c5c3ea..b934e0566133 100644
--- a/sys/modules/pf/Makefile
+++ b/sys/modules/pf/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 .PATH: ${.CURDIR}/../../netpfil/pf
 
 KMOD=	pf
@@ -11,19 +9,6 @@ SRCS=	pf.c pf_if.c pf_lb.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \
 	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_global.h
 
 .if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-.endif
-
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
-opt_bpf.h:
-	echo "#define DEV_BPF 1" > ${.TARGET}
-
 # pflog can be loaded as a module, have the additional checks turned on
 # pfsync can be loaded as a module, have the additional checks turned on
 opt_pf.h:
diff --git a/sys/modules/pflog/Makefile b/sys/modules/pflog/Makefile
index 4da24b3a0dfa..18896815c2a9 100644
--- a/sys/modules/pflog/Makefile
+++ b/sys/modules/pflog/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 .PATH: ${.CURDIR}/../../netpfil/pf
 
 KMOD=	pflog
@@ -12,19 +10,6 @@ SRCS+=	bus_if.h device_if.h
 .if defined(KERNBUILDDIR)
 MKDEP+=		-include ${KERNBUILDDIR}/opt_global.h
 .else
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-.endif
-
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
-opt_bpf.h:
-	echo "#define DEV_BPF 1" > ${.TARGET}
-
 .if defined(VIMAGE)
 opt_global.h:
 	echo "#define VIMAGE 1" >> ${.TARGET}
diff --git a/sys/modules/pfsync/Makefile b/sys/modules/pfsync/Makefile
index 9c085fceafdd..d38bde7acd31 100644
--- a/sys/modules/pfsync/Makefile
+++ b/sys/modules/pfsync/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 .PATH: ${.CURDIR}/../../netpfil/pf
 
 KMOD=	pfsync
@@ -12,16 +10,6 @@ SRCS+=	bus_if.h device_if.h
 .if defined(KERNBUILDDIR)
 MKDEP+=		-include ${KERNBUILDDIR}/opt_global.h
 .else
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-.endif
-
-.if ${MK_INET6_SUPPORT} != "no"
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
 .if defined(VIMAGE)
 opt_global.h:
 	echo "#define VIMAGE 1" >> ${.TARGET}
diff --git a/sys/modules/ppc/Makefile b/sys/modules/ppc/Makefile
index c097002a62c1..53621f119baa 100644
--- a/sys/modules/ppc/Makefile
+++ b/sys/modules/ppc/Makefile
@@ -17,8 +17,4 @@ SRCS+=	ppc_acpi.c
 SRCS+=	ppc_isa.c
 .endif
 
-.if ${MACHINE_CPUARCH} == "ia64"
-SRCS+=	ppc_acpi.c
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/siftr/Makefile b/sys/modules/siftr/Makefile
index 4e07d3bf51a6..773d215c5563 100644
--- a/sys/modules/siftr/Makefile
+++ b/sys/modules/siftr/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
-
 .PATH:  ${.CURDIR}/../../netinet
 KMOD=	siftr
 SRCS=	siftr.c
diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile
index 031933fa239c..04ffc9a65c9a 100644
--- a/sys/modules/smbfs/Makefile
+++ b/sys/modules/smbfs/Makefile
@@ -26,20 +26,10 @@ SRCS+=	des_enc.S
 SRCS+=	des_enc.c
 .endif
 
-# Build with INET support (1|0)
-SMB_INET?=	1
-
 CFLAGS+= ${KDEBUG}
 
 .if defined(VNPRINT)
 CFLAGS+= -DVNPRINT
 .endif
 
-.if !defined(KERNBUILDDIR)
-.if ${SMB_INET} > 0
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-.endif
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/snc/Makefile b/sys/modules/snc/Makefile
index 056619e78b72..837248609c87 100644
--- a/sys/modules/snc/Makefile
+++ b/sys/modules/snc/Makefile
@@ -6,9 +6,4 @@ KMOD=	if_snc
 SRCS=	if_snc.c if_snc_cbus.c if_snc_pccard.c dp83932.c dp83932subr.c
 SRCS+=	opt_inet.h device_if.h bus_if.h isa_if.h card_if.h pccarddevs.h
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile
index 2c51f45f8557..7adecbcbc9d5 100644
--- a/sys/modules/sound/driver/Makefile
+++ b/sys/modules/sound/driver/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+SYSDIR?=${.CURDIR}/../../..
+.include "${SYSDIR}/conf/kern.opts.mk"
 
 # Modules that include binary-only blobs of microcode should be selectable by
 # MK_SOURCELESS_UCODE option (see below).
diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile
index 0db294bce2e3..9650adf21d70 100644
--- a/sys/modules/sound/sound/Makefile
+++ b/sys/modules/sound/sound/Makefile
@@ -45,7 +45,7 @@ CLEANFILES+=	feeder_eq_gen.h feeder_rate_gen.h snd_fxdiv_gen.h
 EXPORT_SYMS=	YES	# XXX evaluate
 
 .if ${MACHINE_CPUARCH} != "i386" && ${MACHINE_CPUARCH} != "amd64" && \
-    ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "pc98"
+    ${MACHINE_CPUARCH} != "pc98"
 # Create an empty opt_isa.h in order to keep kmod.mk from linking in an
 # existing one from KERNBUILDDIR which possibly has DEV_ISA defined so
 # sound.ko is always built without isadma support.
diff --git a/sys/modules/sppp/Makefile b/sys/modules/sppp/Makefile
index 9a3ed7684cfe..643308e54045 100644
--- a/sys/modules/sppp/Makefile
+++ b/sys/modules/sppp/Makefile
@@ -15,12 +15,4 @@ EXPORT_SYMS=	sppp_attach	\
 		sppp_isempty	\
 		sppp_flush
 
-.if !defined(KERNBUILDDIR)
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-
-opt_inet6.h:
-	echo "#define INET6 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/svr4/README b/sys/modules/svr4/README
index a14e2b735401..47ab660dddff 100644
--- a/sys/modules/svr4/README
+++ b/sys/modules/svr4/README
@@ -30,7 +30,7 @@ To use it:
 It's early days yet, folks -- You'll probably have trouble getting 100%
 functionality out of most things (specifically, poll() on a socket doesn't
 look like it works at the moment, so Netscape doesn't work (among other
-things)).  Patches will be appreciated (use send-pr).
+things)).  Patches will be appreciated.
 
    - Mark Newton
      newton@atdot.dotat.org
diff --git a/sys/modules/trm/Makefile b/sys/modules/trm/Makefile
index 48df9f5bff32..7c42e401a678 100644
--- a/sys/modules/trm/Makefile
+++ b/sys/modules/trm/Makefile
@@ -6,9 +6,4 @@ KMOD=	trm
 SRCS=	trm.c trm.h opt_cam.h device_if.h bus_if.h \
 	opt_scsi.h pci_if.h
 
-.if !defined(KERNBUILDDIR)
-opt_scsi.h:
-	echo "#define SCSI_DELAY 15000" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/tsec/Makefile b/sys/modules/tsec/Makefile
new file mode 100644
index 000000000000..678d611e3808
--- /dev/null
+++ b/sys/modules/tsec/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+SYSDIR?=${.CURDIR}/../..
+
+.PATH:	${SYSDIR}/dev/tsec
+
+KMOD=	if_tsec
+SRCS=	if_tsec.c if_tsec_fdt.c
+SRCS+=	bus_if.h device_if.h miibus_if.h miidevs.h ofw_bus_if.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index 8dccf3874999..83ca0696a901 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -25,7 +25,8 @@
 # SUCH DAMAGE.
 #
 
-.include <src.opts.mk>
+SYSDIR?=${.CURDIR}/../..
+.include "${SYSDIR}/conf/kern.opts.mk"
 
 #
 # Check for common USB debug flags to pass when building the USB
diff --git a/sys/modules/usb/template/Makefile b/sys/modules/usb/template/Makefile
index e67303e75022..61406c1d974b 100644
--- a/sys/modules/usb/template/Makefile
+++ b/sys/modules/usb/template/Makefile
@@ -38,6 +38,7 @@ SRCS=	opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h vnode_if.h usbdevs.h \
 	usb_template_modem.c \
 	usb_template_mouse.c \
 	usb_template_msc.c \
-	usb_template_mtp.c
+	usb_template_mtp.c \
+	usb_template_phone.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/virtio/network/Makefile b/sys/modules/virtio/network/Makefile
index 41a5101b8d72..bc5de9740603 100644
--- a/sys/modules/virtio/network/Makefile
+++ b/sys/modules/virtio/network/Makefile
@@ -23,8 +23,6 @@
 # SUCH DAMAGE.
 #
 
-.include <src.opts.mk>
-
 .PATH: ${.CURDIR}/../../../dev/virtio/network
 
 KMOD=	if_vtnet
@@ -36,16 +34,4 @@ SRCS+=	opt_inet.h opt_inet6.h
 MFILES=	kern/bus_if.m kern/device_if.m \
 	dev/virtio/virtio_bus_if.m dev/virtio/virtio_if.m
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	@echo "#define INET 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/vmware/vmxnet3/Makefile b/sys/modules/vmware/vmxnet3/Makefile
index 9d4299707ec9..340e593c25bc 100644
--- a/sys/modules/vmware/vmxnet3/Makefile
+++ b/sys/modules/vmware/vmxnet3/Makefile
@@ -23,8 +23,6 @@
 # SUCH DAMAGE.
 #
 
-.include <src.opts.mk>
-
 .PATH: ${.CURDIR}/../../../dev/vmware/vmxnet3
 
 KMOD=	if_vmx
@@ -35,16 +33,4 @@ SRCS+=	bus_if.h device_if.h pci_if.h opt_inet.h opt_inet6.h
 # capable if_start interface.
 #CFLAGS+= -DVMXNET3_LEGACY_TX
 
-.if !defined(KERNBUILDDIR)
-.if ${MK_INET_SUPPORT} != "no"
-opt_inet.h:
-	@echo "#define INET 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/vx/Makefile b/sys/modules/vx/Makefile
index e700efe3780c..6012429fb023 100644
--- a/sys/modules/vx/Makefile
+++ b/sys/modules/vx/Makefile
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+SYSDIR?=${.CURDIR}/../..
+.include "${SYSDIR}/conf/kern.opts.mk"
 
-.PATH: ${.CURDIR}/../../dev/vx
+.PATH: ${SYSDIR}/dev/vx
 
 KMOD=	if_vx
 SRCS=	if_vx.c if_vx_pci.c
diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile
index d25e5f3fab35..7c5a4190ea33 100644
--- a/sys/modules/wlan/Makefile
+++ b/sys/modules/wlan/Makefile
@@ -16,18 +16,6 @@ SRCS=	ieee80211.c ieee80211_action.c ieee80211_ageq.c \
 SRCS+=	bus_if.h device_if.h opt_ddb.h opt_inet.h opt_inet6.h \
 	opt_tdma.h opt_wlan.h
 
-.if !defined(KERNBUILDDIR)
-opt_wlan.h:
-	echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
-	echo "#define IEEE80211_AMPDU_AGE 1" >> ${.TARGET}
-	echo "#define IEEE80211_SUPPORT_MESH 1" >> ${.TARGET}
-opt_inet.h:
-	echo "#define INET 1" > ${.TARGET}
-# override to get ddb support?
-opt_ddb.h:
-	:> ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
 
 CWARNFLAGS.ieee80211_adhoc.c=	-Wno-unused-function
diff --git a/sys/modules/wlan_acl/Makefile b/sys/modules/wlan_acl/Makefile
index 6de7be405965..f0ce538ab1e0 100644
--- a/sys/modules/wlan_acl/Makefile
+++ b/sys/modules/wlan_acl/Makefile
@@ -6,9 +6,4 @@ KMOD=	wlan_acl
 SRCS=	ieee80211_acl.c
 SRCS+=	opt_wlan.h
 
-.if !defined(KERNBUILDDIR)
-opt_wlan.h:
-	echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_amrr/Makefile b/sys/modules/wlan_amrr/Makefile
index d4593389ac58..1c9ef8c3ece6 100644
--- a/sys/modules/wlan_amrr/Makefile
+++ b/sys/modules/wlan_amrr/Makefile
@@ -6,9 +6,4 @@ KMOD=	wlan_amrr
 SRCS=	ieee80211_amrr.c
 SRCS+=	opt_wlan.h
 
-.if !defined(KERNBUILDDIR)
-opt_wlan.h:
-	echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_ccmp/Makefile b/sys/modules/wlan_ccmp/Makefile
index 8655c801f663..99274dc6805c 100644
--- a/sys/modules/wlan_ccmp/Makefile
+++ b/sys/modules/wlan_ccmp/Makefile
@@ -8,9 +8,4 @@ SRCS=	ieee80211_crypto_ccmp.c
 SRCS+=	rijndael-alg-fst.c rijndael-api.c
 SRCS+=	opt_wlan.h
 
-.if !defined(KERNBUILDDIR)
-opt_wlan.h:
-	echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_rssadapt/Makefile b/sys/modules/wlan_rssadapt/Makefile
index be70989d9d85..732db05b1e2f 100644
--- a/sys/modules/wlan_rssadapt/Makefile
+++ b/sys/modules/wlan_rssadapt/Makefile
@@ -6,9 +6,4 @@ KMOD=	wlan_rssadapt
 SRCS=	ieee80211_rssadapt.c
 SRCS+=	opt_wlan.h
 
-.if !defined(KERNBUILDDIR)
-opt_wlan.h:
-	echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_tkip/Makefile b/sys/modules/wlan_tkip/Makefile
index 46a7257a915c..13ea0638899b 100644
--- a/sys/modules/wlan_tkip/Makefile
+++ b/sys/modules/wlan_tkip/Makefile
@@ -6,9 +6,4 @@ KMOD=	wlan_tkip
 SRCS=	ieee80211_crypto_tkip.c
 SRCS+=	opt_wlan.h
 
-.if !defined(KERNBUILDDIR)
-opt_wlan.h:
-	echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_wep/Makefile b/sys/modules/wlan_wep/Makefile
index 89fca2fb2632..6ebbdb03baa5 100644
--- a/sys/modules/wlan_wep/Makefile
+++ b/sys/modules/wlan_wep/Makefile
@@ -6,9 +6,4 @@ KMOD=	wlan_wep
 SRCS=	ieee80211_crypto_wep.c
 SRCS+=	opt_wlan.h
 
-.if !defined(KERNBUILDDIR)
-opt_wlan.h:
-	echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/wlan_xauth/Makefile b/sys/modules/wlan_xauth/Makefile
index ccab4d3d51a0..308d8f2ebb94 100644
--- a/sys/modules/wlan_xauth/Makefile
+++ b/sys/modules/wlan_xauth/Makefile
@@ -6,9 +6,4 @@ KMOD=	wlan_xauth
 SRCS=	ieee80211_xauth.c
 SRCS+=	opt_wlan.h
 
-.if !defined(KERNBUILDDIR)
-opt_wlan.h:
-	echo "#define IEEE80211_DEBUG 1" > ${.TARGET}
-.endif
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile
index 36c08d2dcd71..3e857264d1b9 100644
--- a/sys/modules/zfs/Makefile
+++ b/sys/modules/zfs/Makefile
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
+SYSDIR?=${.CURDIR}/../..
+
 KMOD=	zfs
 
 SRCS=	bus_if.h device_if.h vnode_if.h
 
-SUNW=	${.CURDIR}/../../cddl/contrib/opensolaris
+SUNW=	${SYSDIR}/cddl/contrib/opensolaris
 
 .PATH:	${SUNW}/common/acl
 SRCS+=	acl_common.c
@@ -14,10 +16,10 @@ SRCS+=	avl.c
 SRCS+=	nvpair.c
 SRCS+=	nvpair_alloc_fixed.c
 SRCS+=	fnvpair.c
-.PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/unicode
+.PATH:	${SYSDIR}/cddl/contrib/opensolaris/common/unicode
 SRCS+=	u8_textprep.c
 
-.PATH:	${.CURDIR}/../../cddl/compat/opensolaris/kern
+.PATH:	${SYSDIR}/cddl/compat/opensolaris/kern
 SRCS+=	opensolaris_acl.c
 SRCS+=	opensolaris_kobj.c
 SRCS+=	opensolaris_kstat.c
@@ -31,7 +33,7 @@ SRCS+=	opensolaris_vfs.c
 SRCS+=	opensolaris_vm.c
 SRCS+=	opensolaris_zone.c
 
-_A=${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic
+_A=${SYSDIR}/cddl/contrib/opensolaris/common/atomic
 .if exists(${_A}/${MACHINE_CPUARCH}/opensolaris_atomic.S)
 .PATH:	${_A}/${MACHINE_CPUARCH}
 SRCS+=		opensolaris_atomic.S
@@ -64,7 +66,7 @@ SRCS+=	zmod.c
 SRCS+=	zmod_subr.c
 SRCS+=	zutil.c
 
-.PATH:	${.CURDIR}/../../crypto/sha2
+.PATH:	${SYSDIR}/crypto/sha2
 SRCS+=	sha2.c sha256c.c
 
 .PATH:	${SUNW}/common/zfs
@@ -78,11 +80,11 @@ SRCS+=	trim_map.c
 # Use FreeBSD's namecache.
 CFLAGS+=-DFREEBSD_NAMECACHE
 
-CFLAGS+=-I${.CURDIR}/../../cddl/compat/opensolaris
+CFLAGS+=-I${SYSDIR}/cddl/compat/opensolaris
 CFLAGS+=-I${SUNW}/uts/common/fs/zfs
 CFLAGS+=-I${SUNW}/uts/common/zmod
 CFLAGS+=-I${SUNW}/uts/common
-CFLAGS+=-I${.CURDIR}/../..
+CFLAGS+=-I${SYSDIR}
 CFLAGS+=-I${SUNW}/common/zfs
 CFLAGS+=-I${SUNW}/common
 CFLAGS+=-DBUILDING_ZFS
@@ -96,7 +98,7 @@ CFLAGS+=-mminimal-toc
 
 .include <bsd.kmod.mk>
 
-CFLAGS+=	-include ${.CURDIR}/../../cddl/compat/opensolaris/sys/debug_compat.h
+CFLAGS+=	-include ${SYSDIR}/cddl/compat/opensolaris/sys/debug_compat.h
 
 CWARNFLAGS+=-Wno-unknown-pragmas
 CWARNFLAGS+=-Wno-missing-prototypes
diff --git a/sys/net/bpf_zerocopy.c b/sys/net/bpf_zerocopy.c
index a8ef8d56ebd7..5d54f649e133 100644
--- a/sys/net/bpf_zerocopy.c
+++ b/sys/net/bpf_zerocopy.c
@@ -114,7 +114,7 @@ zbuf_page_free(vm_page_t pp)
 {
 
 	vm_page_lock(pp);
-	vm_page_unwire(pp, 0);
+	vm_page_unwire(pp, PQ_INACTIVE);
 	if (pp->wire_count == 0 && pp->object == NULL)
 		vm_page_free(pp);
 	vm_page_unlock(pp);
diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c
index aa38efabd50d..12cc72176187 100644
--- a/sys/net/ieee8023ad_lacp.c
+++ b/sys/net/ieee8023ad_lacp.c
@@ -192,9 +192,8 @@ static void	lacp_dprintf(const struct lacp_port *, const char *, ...)
 
 static int lacp_debug = 0;
 SYSCTL_NODE(_net_link_lagg, OID_AUTO, lacp, CTLFLAG_RD, 0, "ieee802.3ad");
-SYSCTL_INT(_net_link_lagg_lacp, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_net_link_lagg_lacp, OID_AUTO, debug, CTLFLAG_RWTUN,
     &lacp_debug, 0, "Enable LACP debug logging (1=debug, 2=trace)");
-TUNABLE_INT("net.link.lagg.lacp.debug", &lacp_debug);
 
 #define LACP_DPRINTF(a) if (lacp_debug & 0x01) { lacp_dprintf a ; }
 #define LACP_TRACE(a) if (lacp_debug & 0x02) { lacp_dprintf(a,"%s\n",__func__); }
diff --git a/sys/net/if.c b/sys/net/if.c
index 47b5b9d687a7..14e28749dd87 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -106,7 +106,6 @@ struct ifindex_entry {
 SYSCTL_NODE(_net, PF_LINK, link, CTLFLAG_RW, 0, "Link layers");
 SYSCTL_NODE(_net_link, 0, generic, CTLFLAG_RW, 0, "Generic link-management");
 
-TUNABLE_INT("net.link.ifqmaxlen", &ifqmaxlen);
 SYSCTL_INT(_net_link, OID_AUTO, ifqmaxlen, CTLFLAG_RDTUN,
     &ifqmaxlen, 0, "max send queue size");
 
@@ -1747,19 +1746,6 @@ next:				continue;
 					goto done;
 				}
 			} else {
-				/*
-				 * if we have a special address handler,
-				 * then use it instead of the generic one.
-				 */
-				if (ifa->ifa_claim_addr) {
-					if ((*ifa->ifa_claim_addr)(ifa, addr)) {
-						ifa_ref(ifa);
-						IF_ADDR_RUNLOCK(ifp);
-						goto done;
-					}
-					continue;
-				}
-
 				/*
 				 * Scan all the bits in the ifa's address.
 				 * If a bit dissagrees with what we are
@@ -2088,7 +2074,7 @@ if_qflush(struct ifnet *ifp)
 #endif
 	n = ifq->ifq_head;
 	while ((m = n) != 0) {
-		n = m->m_act;
+		n = m->m_nextpkt;
 		m_freem(m);
 	}
 	ifq->ifq_head = 0;
diff --git a/sys/net/if.h b/sys/net/if.h
index 1910cbd24358..8482dafa2cf7 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -304,7 +304,7 @@ struct ifa_msghdr {
 	int	ifam_addrs;	/* like rtm_addrs */
 	int	ifam_flags;	/* value of ifa_flags */
 	u_short	ifam_index;	/* index for associated ifp */
-	int	ifam_metric;	/* value of ifa_metric */
+	int	ifam_metric;	/* value of ifa_ifp->if_metric */
 };
 
 /*
@@ -329,7 +329,7 @@ struct ifa_msghdrl {
 	u_short _ifam_spare1;	/* spare space to grow if_index, see if_var.h */
 	u_short	ifam_len;	/* length of ifa_msghdrl incl. if_data */
 	u_short	ifam_data_off;	/* offset of if_data from beginning */
-	int	ifam_metric;	/* value of ifa_metric */
+	int	ifam_metric;	/* value of ifa_ifp->if_metric */
 	struct	if_data ifam_data;/* statistics and other data about if or
 				 * address */
 };
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 4e085731feea..59d63ee4f227 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -359,27 +359,20 @@ static int pfil_local_phys = 0; /* run pfil hooks on the physical interface for
                                    locally destined packets */
 static int log_stp   = 0;   /* log STP state changes */
 static int bridge_inherit_mac = 0;   /* share MAC with first bridge member */
-TUNABLE_INT("net.link.bridge.pfil_onlyip", &pfil_onlyip);
-SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_onlyip, CTLFLAG_RW,
+SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_onlyip, CTLFLAG_RWTUN,
     &pfil_onlyip, 0, "Only pass IP packets when pfil is enabled");
-TUNABLE_INT("net.link.bridge.ipfw_arp", &pfil_ipfw_arp);
-SYSCTL_INT(_net_link_bridge, OID_AUTO, ipfw_arp, CTLFLAG_RW,
+SYSCTL_INT(_net_link_bridge, OID_AUTO, ipfw_arp, CTLFLAG_RWTUN,
     &pfil_ipfw_arp, 0, "Filter ARP packets through IPFW layer2");
-TUNABLE_INT("net.link.bridge.pfil_bridge", &pfil_bridge);
-SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_bridge, CTLFLAG_RW,
+SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_bridge, CTLFLAG_RWTUN,
     &pfil_bridge, 0, "Packet filter on the bridge interface");
-TUNABLE_INT("net.link.bridge.pfil_member", &pfil_member);
-SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_member, CTLFLAG_RW,
+SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_member, CTLFLAG_RWTUN,
     &pfil_member, 0, "Packet filter on the member interface");
-TUNABLE_INT("net.link.bridge.pfil_local_phys", &pfil_local_phys);
-SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_local_phys, CTLFLAG_RW,
+SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_local_phys, CTLFLAG_RWTUN,
     &pfil_local_phys, 0,
     "Packet filter on the physical interface for locally destined packets");
-TUNABLE_INT("net.link.bridge.log_stp", &log_stp);
-SYSCTL_INT(_net_link_bridge, OID_AUTO, log_stp, CTLFLAG_RW,
+SYSCTL_INT(_net_link_bridge, OID_AUTO, log_stp, CTLFLAG_RWTUN,
     &log_stp, 0, "Log STP state changes");
-TUNABLE_INT("net.link.bridge.inherit_mac", &bridge_inherit_mac);
-SYSCTL_INT(_net_link_bridge, OID_AUTO, inherit_mac, CTLFLAG_RW,
+SYSCTL_INT(_net_link_bridge, OID_AUTO, inherit_mac, CTLFLAG_RWTUN,
     &bridge_inherit_mac, 0,
     "Inherit MAC address from the first bridge member");
 
diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c
index 1bab4f948e3b..8d53526c6a02 100644
--- a/sys/net/if_lagg.c
+++ b/sys/net/if_lagg.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if_clone.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
-#include <net/if_llc.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 #include <net/if_var.h>
@@ -180,13 +179,11 @@ SYSCTL_INT(_net_link_lagg, OID_AUTO, failover_rx_all, CTLFLAG_RW,
     &lagg_failover_rx_all, 0,
     "Accept input from any interface in a failover lagg");
 static int def_use_flowid = 1; /* Default value for using M_FLOWID */
-TUNABLE_INT("net.link.lagg.default_use_flowid", &def_use_flowid);
-SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_flowid, CTLFLAG_RW,
+SYSCTL_INT(_net_link_lagg, OID_AUTO, default_use_flowid, CTLFLAG_RWTUN,
     &def_use_flowid, 0,
     "Default setting for using flow id for load sharing");
 static int def_flowid_shift = 16; /* Default value for using M_FLOWID */
-TUNABLE_INT("net.link.lagg.default_flowid_shift", &def_flowid_shift);
-SYSCTL_INT(_net_link_lagg, OID_AUTO, default_flowid_shift, CTLFLAG_RW,
+SYSCTL_INT(_net_link_lagg, OID_AUTO, default_flowid_shift, CTLFLAG_RWTUN,
     &def_flowid_shift, 0,
     "Default setting for flowid shift for load sharing");
 
@@ -1219,35 +1216,39 @@ lagg_ether_cmdmulti(struct lagg_port *lp, int set)
 	struct ifnet *ifp = lp->lp_ifp;
 	struct ifnet *scifp = sc->sc_ifp;
 	struct lagg_mc *mc;
-	struct ifmultiaddr *ifma, *rifma = NULL;
-	struct sockaddr_dl sdl;
+	struct ifmultiaddr *ifma;
 	int error;
 
 	LAGG_WLOCK_ASSERT(sc);
 
-	link_init_sdl(ifp, (struct sockaddr *)&sdl, IFT_ETHER);
-	sdl.sdl_alen = ETHER_ADDR_LEN;
-
 	if (set) {
+		IF_ADDR_WLOCK(scifp);
 		TAILQ_FOREACH(ifma, &scifp->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);
+			mc = malloc(sizeof(struct lagg_mc), M_DEVBUF, M_NOWAIT);
+			if (mc == NULL) {
+				IF_ADDR_WUNLOCK(scifp);
+				return (ENOMEM);
+			}
+			bcopy(ifma->ifma_addr, &mc->mc_addr,
+			    ifma->ifma_addr->sa_len);
+			mc->mc_addr.sdl_index = ifp->if_index;
+			mc->mc_ifma = NULL;
+			SLIST_INSERT_HEAD(&lp->lp_mc_head, mc, mc_entries);
+		}
+		IF_ADDR_WUNLOCK(scifp);
+		SLIST_FOREACH (mc, &lp->lp_mc_head, mc_entries) {
+			error = if_addmulti(ifp,
+			    (struct sockaddr *)&mc->mc_addr, &mc->mc_ifma);
 			if (error)
 				return (error);
-			mc = malloc(sizeof(struct lagg_mc), M_DEVBUF, M_NOWAIT);
-			if (mc == NULL)
-				return (ENOMEM);
-			mc->mc_ifma = rifma;
-			SLIST_INSERT_HEAD(&lp->lp_mc_head, mc, mc_entries);
 		}
 	} else {
 		while ((mc = SLIST_FIRST(&lp->lp_mc_head)) != NULL) {
 			SLIST_REMOVE(&lp->lp_mc_head, mc, lagg_mc, mc_entries);
-			if_delmulti_ifma(mc->mc_ifma);
+			if (mc->mc_ifma && !lp->lp_detaching)
+				if_delmulti_ifma(mc->mc_ifma);
 			free(mc, M_DEVBUF);
 		}
 	}
diff --git a/sys/net/if_lagg.h b/sys/net/if_lagg.h
index e52f9014ca1e..4a1d9a0a77cb 100644
--- a/sys/net/if_lagg.h
+++ b/sys/net/if_lagg.h
@@ -174,6 +174,7 @@ struct lagg_lb {
 };
 
 struct lagg_mc {
+	struct sockaddr_dl	mc_addr;
 	struct ifmultiaddr      *mc_ifma;
 	SLIST_ENTRY(lagg_mc)	mc_entries;
 };
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 74bcfa063039..3340612e6ff5 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -4753,7 +4753,7 @@ sppp_qflush(struct ifqueue *ifq)
 
 	n = ifq->ifq_head;
 	while ((m = n)) {
-		n = m->m_act;
+		n = m->m_nextpkt;
 		m_freem (m);
 	}
 	ifq->ifq_head = 0;
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index 28888edff5f4..14116cc87981 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -129,8 +129,7 @@ SYSCTL_INT(_net_link_stf, OID_AUTO, route_cache, CTLFLAG_RW,
     &stf_route_cache, 0, "Caching of IPv4 routes for 6to4 Output");
 
 static int stf_permit_rfc1918 = 0;
-TUNABLE_INT("net.link.stf.permit_rfc1918", &stf_permit_rfc1918);
-SYSCTL_INT(_net_link_stf, OID_AUTO, permit_rfc1918, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_net_link_stf, OID_AUTO, permit_rfc1918, CTLFLAG_RWTUN,
     &stf_permit_rfc1918, 0, "Permit the use of private IPv4 addresses");
 
 #define STFUNIT		0
@@ -679,23 +678,23 @@ stf_checkaddr6(sc, in6, inifp)
 	return 0;
 }
 
-void
-in_stf_input(m, off)
-	struct mbuf *m;
-	int off;
+int
+in_stf_input(struct mbuf **mp, int *offp, int proto)
 {
-	int proto;
 	struct stf_softc *sc;
 	struct ip *ip;
 	struct ip6_hdr *ip6;
+	struct mbuf *m;
 	u_int8_t otos, itos;
 	struct ifnet *ifp;
+	int off;
 
-	proto = mtod(m, struct ip *)->ip_p;
+	m = *mp;
+	off = *offp;
 
 	if (proto != IPPROTO_IPV6) {
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	ip = mtod(m, struct ip *);
@@ -704,7 +703,7 @@ in_stf_input(m, off)
 
 	if (sc == NULL || (STF2IFP(sc)->if_flags & IFF_UP) == 0) {
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	ifp = STF2IFP(sc);
@@ -720,7 +719,7 @@ in_stf_input(m, off)
 	if (stf_checkaddr4(sc, &ip->ip_dst, NULL) < 0 ||
 	    stf_checkaddr4(sc, &ip->ip_src, m->m_pkthdr.rcvif) < 0) {
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	otos = ip->ip_tos;
@@ -729,7 +728,7 @@ in_stf_input(m, off)
 	if (m->m_len < sizeof(*ip6)) {
 		m = m_pullup(m, sizeof(*ip6));
 		if (!m)
-			return;
+			return (IPPROTO_DONE);
 	}
 	ip6 = mtod(m, struct ip6_hdr *);
 
@@ -740,7 +739,7 @@ in_stf_input(m, off)
 	if (stf_checkaddr6(sc, &ip6->ip6_dst, NULL) < 0 ||
 	    stf_checkaddr6(sc, &ip6->ip6_src, m->m_pkthdr.rcvif) < 0) {
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	itos = (ntohl(ip6->ip6_flow) >> 20) & 0xff;
@@ -775,6 +774,7 @@ in_stf_input(m, off)
 	ifp->if_ibytes += m->m_pkthdr.len;
 	M_SETFIB(m, ifp->if_fib);
 	netisr_dispatch(NETISR_IPV6, m);
+	return (IPPROTO_DONE);
 }
 
 /* ARGSUSED */
diff --git a/sys/net/if_stf.h b/sys/net/if_stf.h
index cbaf67033c54..07f585b8c7ab 100644
--- a/sys/net/if_stf.h
+++ b/sys/net/if_stf.h
@@ -33,6 +33,6 @@
 #ifndef _NET_IF_STF_H_
 #define _NET_IF_STF_H_
 
-void in_stf_input(struct mbuf *, int);
+int in_stf_input(struct mbuf **, int *, int);
 
 #endif /* _NET_IF_STF_H_ */
diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c
index d788635a59e1..89cac22f264e 100644
--- a/sys/net/if_tap.c
+++ b/sys/net/if_tap.c
@@ -170,12 +170,10 @@ SYSCTL_INT(_net_link_tap, OID_AUTO, user_open, CTLFLAG_RW, &tapuopen, 0,
 	"Allow user to open /dev/tap (based on node permissions)");
 SYSCTL_INT(_net_link_tap, OID_AUTO, up_on_open, CTLFLAG_RW, &tapuponopen, 0,
 	"Bring interface up when /dev/tap is opened");
-SYSCTL_INT(_net_link_tap, OID_AUTO, devfs_cloning, CTLFLAG_RW, &tapdclone, 0,
+SYSCTL_INT(_net_link_tap, OID_AUTO, devfs_cloning, CTLFLAG_RWTUN, &tapdclone, 0,
 	"Enably legacy devfs interface creation");
 SYSCTL_INT(_net_link_tap, OID_AUTO, debug, CTLFLAG_RW, &tapdebug, 0, "");
 
-TUNABLE_INT("net.link.tap.devfs_cloning", &tapdclone);
-
 DEV_MODULE(if_tap, tapmodevent, NULL);
 
 static int
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 504bab050367..e4bc2afc7afc 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -116,11 +116,9 @@ SYSCTL_INT(_debug, OID_AUTO, if_tun_debug, CTLFLAG_RW, &tundebug, 0, "");
 SYSCTL_DECL(_net_link);
 static SYSCTL_NODE(_net_link, OID_AUTO, tun, CTLFLAG_RW, 0,
     "IP tunnel software network interface.");
-SYSCTL_INT(_net_link_tun, OID_AUTO, devfs_cloning, CTLFLAG_RW, &tundclone, 0,
+SYSCTL_INT(_net_link_tun, OID_AUTO, devfs_cloning, CTLFLAG_RWTUN, &tundclone, 0,
     "Enable legacy devfs interface creation.");
 
-TUNABLE_INT("net.link.tun.devfs_cloning", &tundclone);
-
 static void	tunclone(void *arg, struct ucred *cred, char *name,
 		    int namelen, struct cdev **dev);
 static void	tuncreate(const char *name, struct cdev *dev);
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 0224e3a468dc..730c7f11e6cf 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -366,9 +366,6 @@ struct ifaddr {
 		(int, struct rtentry *, struct rt_addrinfo *);
 	u_short	ifa_flags;		/* mostly rt_flags for cloning */
 	u_int	ifa_refcnt;		/* references to this structure */
-	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 *);
 
 	counter_u64_t	ifa_ipackets;
 	counter_u64_t	ifa_opackets;	 
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 00d99ed777bf..763020b2b050 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -460,48 +460,48 @@ trunk_destroy(struct ifvlantrunk *trunk)
  * traffic that it doesn't really want, which ends up being discarded
  * later by the upper protocol layers. Unfortunately, there's no way
  * to avoid this: there really is only one physical interface.
- *
- * XXX: There is a possible race here if more than one thread is
- *      modifying the multicast state of the vlan interface at the same time.
  */
 static int
 vlan_setmulti(struct ifnet *ifp)
 {
 	struct ifnet		*ifp_p;
-	struct ifmultiaddr	*ifma, *rifma = NULL;
+	struct ifmultiaddr	*ifma;
 	struct ifvlan		*sc;
 	struct vlan_mc_entry	*mc;
 	int			error;
 
-	/*VLAN_LOCK_ASSERT();*/
-
 	/* Find the parent. */
 	sc = ifp->if_softc;
+	TRUNK_LOCK_ASSERT(TRUNK(sc));
 	ifp_p = PARENT(sc);
 
 	CURVNET_SET_QUIET(ifp_p->if_vnet);
 
 	/* First, remove any existing filter entries. */
 	while ((mc = SLIST_FIRST(&sc->vlan_mc_listhead)) != NULL) {
-		error = if_delmulti(ifp_p, (struct sockaddr *)&mc->mc_addr);
-		if (error)
-			return (error);
 		SLIST_REMOVE_HEAD(&sc->vlan_mc_listhead, mc_entries);
+		(void)if_delmulti(ifp_p, (struct sockaddr *)&mc->mc_addr);
 		free(mc, M_VLAN);
 	}
 
 	/* Now program new ones. */
+	IF_ADDR_WLOCK(ifp);
 	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
 		if (ifma->ifma_addr->sa_family != AF_LINK)
 			continue;
 		mc = malloc(sizeof(struct vlan_mc_entry), M_VLAN, M_NOWAIT);
-		if (mc == NULL)
+		if (mc == NULL) {
+			IF_ADDR_WUNLOCK(ifp);
 			return (ENOMEM);
+		}
 		bcopy(ifma->ifma_addr, &mc->mc_addr, ifma->ifma_addr->sa_len);
 		mc->mc_addr.sdl_index = ifp_p->if_index;
 		SLIST_INSERT_HEAD(&sc->vlan_mc_listhead, mc, mc_entries);
+	}
+	IF_ADDR_WUNLOCK(ifp);
+	SLIST_FOREACH (mc, &sc->vlan_mc_listhead, mc_entries) {
 		error = if_addmulti(ifp_p, (struct sockaddr *)&mc->mc_addr,
-		    &rifma);
+		    NULL);
 		if (error)
 			return (error);
 	}
@@ -1374,7 +1374,7 @@ vlan_unconfig_locked(struct ifnet *ifp, int departing)
 		 * Check if we were the last.
 		 */
 		if (trunk->refcnt == 0) {
-			trunk->parent->if_vlantrunk = NULL;
+			parent->if_vlantrunk = NULL;
 			/*
 			 * XXXGL: If some ithread has already entered
 			 * vlan_input() and is now blocked on the trunk
@@ -1568,6 +1568,7 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	struct ifreq *ifr;
 	struct ifaddr *ifa;
 	struct ifvlan *ifv;
+	struct ifvlantrunk *trunk;
 	struct vlanreq vlr;
 	int error = 0;
 
@@ -1712,8 +1713,12 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		 * If we don't have a parent, just remember the membership for
 		 * when we do.
 		 */
-		if (TRUNK(ifv) != NULL)
+		trunk = TRUNK(ifv);
+		if (trunk != NULL) {
+			TRUNK_LOCK(trunk);
 			error = vlan_setmulti(ifp);
+			TRUNK_UNLOCK(trunk);
+		}
 		break;
 
 	default:
diff --git a/sys/net/netisr.c b/sys/net/netisr.c
index 7974cc891ea1..049bbf192b53 100644
--- a/sys/net/netisr.c
+++ b/sys/net/netisr.c
@@ -149,8 +149,8 @@ static SYSCTL_NODE(_net, OID_AUTO, isr, CTLFLAG_RW, 0, "netisr");
 #define	NETISR_DISPATCH_POLICY_MAXSTR	20 /* Used for temporary buffers. */
 static u_int	netisr_dispatch_policy = NETISR_DISPATCH_POLICY_DEFAULT;
 static int	sysctl_netisr_dispatch_policy(SYSCTL_HANDLER_ARGS);
-SYSCTL_PROC(_net_isr, OID_AUTO, dispatch, CTLTYPE_STRING | CTLFLAG_RW |
-    CTLFLAG_TUN, 0, 0, sysctl_netisr_dispatch_policy, "A",
+SYSCTL_PROC(_net_isr, OID_AUTO, dispatch, CTLTYPE_STRING | CTLFLAG_RWTUN,
+    0, 0, sysctl_netisr_dispatch_policy, "A",
     "netisr dispatch policy");
 
 /*
@@ -160,13 +160,11 @@ SYSCTL_PROC(_net_isr, OID_AUTO, dispatch, CTLTYPE_STRING | CTLFLAG_RW |
  * We will create at most one thread per CPU.
  */
 static int	netisr_maxthreads = -1;		/* Max number of threads. */
-TUNABLE_INT("net.isr.maxthreads", &netisr_maxthreads);
 SYSCTL_INT(_net_isr, OID_AUTO, maxthreads, CTLFLAG_RDTUN,
     &netisr_maxthreads, 0,
     "Use at most this many CPUs for netisr processing");
 
 static int	netisr_bindthreads = 0;		/* Bind threads to CPUs. */
-TUNABLE_INT("net.isr.bindthreads", &netisr_bindthreads);
 SYSCTL_INT(_net_isr, OID_AUTO, bindthreads, CTLFLAG_RDTUN,
     &netisr_bindthreads, 0, "Bind netisr threads to CPUs.");
 
@@ -177,7 +175,6 @@ SYSCTL_INT(_net_isr, OID_AUTO, bindthreads, CTLFLAG_RDTUN,
  */
 #define	NETISR_DEFAULT_MAXQLIMIT	10240
 static u_int	netisr_maxqlimit = NETISR_DEFAULT_MAXQLIMIT;
-TUNABLE_INT("net.isr.maxqlimit", &netisr_maxqlimit);
 SYSCTL_UINT(_net_isr, OID_AUTO, maxqlimit, CTLFLAG_RDTUN,
     &netisr_maxqlimit, 0,
     "Maximum netisr per-protocol, per-CPU queue depth.");
@@ -189,7 +186,6 @@ SYSCTL_UINT(_net_isr, OID_AUTO, maxqlimit, CTLFLAG_RDTUN,
  */
 #define	NETISR_DEFAULT_DEFAULTQLIMIT	256
 static u_int	netisr_defaultqlimit = NETISR_DEFAULT_DEFAULTQLIMIT;
-TUNABLE_INT("net.isr.defaultqlimit", &netisr_defaultqlimit);
 SYSCTL_UINT(_net_isr, OID_AUTO, defaultqlimit, CTLFLAG_RDTUN,
     &netisr_defaultqlimit, 0,
     "Default netisr per-protocol, per-CPU queue limit if not set by protocol");
@@ -1120,10 +1116,6 @@ netisr_start_swi(u_int cpuid, struct pcpu *pc)
 static void
 netisr_init(void *arg)
 {
-	char tmp[NETISR_DISPATCH_POLICY_MAXSTR];
-	u_int dispatch_policy;
-	int error;
-
 	KASSERT(curcpu == 0, ("%s: not on CPU 0", __func__));
 
 	NETISR_LOCK_INIT();
@@ -1152,20 +1144,6 @@ netisr_init(void *arg)
 		netisr_bindthreads = 0;
 	}
 #endif
-
-	if (TUNABLE_STR_FETCH("net.isr.dispatch", tmp, sizeof(tmp))) {
-		error = netisr_dispatch_policy_from_str(tmp,
-		    &dispatch_policy);
-		if (error == 0 && dispatch_policy == NETISR_DISPATCH_DEFAULT)
-			error = EINVAL;
-		if (error == 0)
-			netisr_dispatch_policy = dispatch_policy;
-		else
-			printf(
-			    "%s: invalid dispatch policy %s, using default\n",
-			    __func__, tmp);
-	}
-
 	netisr_start_swi(curcpu, pcpu_find(curcpu));
 }
 SYSINIT(netisr_init, SI_SUB_SOFTINTR, SI_ORDER_FIRST, netisr_init, NULL);
diff --git a/sys/net/route.c b/sys/net/route.c
index 83cc857ef7b2..547418af84b9 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -96,9 +96,7 @@ extern void sctp_addr_change(struct ifaddr *ifa, int cmd);
 
 /* This is read-only.. */
 u_int rt_numfibs = RT_NUMFIBS;
-SYSCTL_UINT(_net, OID_AUTO, fibs, CTLFLAG_RD, &rt_numfibs, 0, "");
-/* and this can be set too big but will be fixed before it is used */
-TUNABLE_INT("net.fibs", &rt_numfibs);
+SYSCTL_UINT(_net, OID_AUTO, fibs, CTLFLAG_RDTUN, &rt_numfibs, 0, "");
 
 /*
  * By default add routes to all fibs for new interfaces.
@@ -111,9 +109,8 @@ TUNABLE_INT("net.fibs", &rt_numfibs);
  * from the network stack context.
  */
 u_int rt_add_addr_allfibs = 1;
-SYSCTL_UINT(_net, OID_AUTO, add_addr_allfibs, CTLFLAG_RW,
+SYSCTL_UINT(_net, OID_AUTO, add_addr_allfibs, CTLFLAG_RWTUN,
     &rt_add_addr_allfibs, 0, "");
-TUNABLE_INT("net.add_addr_allfibs", &rt_add_addr_allfibs);
 
 VNET_DEFINE(struct rtstat, rtstat);
 #define	V_rtstat	VNET(rtstat)
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index f745f69061e1..a8cb57760f65 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1289,7 +1289,7 @@ rtsock_addrmsg(int cmd, struct ifaddr *ifa, int fibnum)
 		return (ENOBUFS);
 	ifam = mtod(m, struct ifa_msghdr *);
 	ifam->ifam_index = ifp->if_index;
-	ifam->ifam_metric = ifa->ifa_metric;
+	ifam->ifam_metric = ifa->ifa_ifp->if_metric;
 	ifam->ifam_flags = ifa->ifa_flags;
 	ifam->ifam_addrs = info.rti_addrs;
 
@@ -1638,7 +1638,7 @@ sysctl_iflist_ifaml(struct ifaddr *ifa, struct rt_addrinfo *info,
 		ifam32->ifam_len = sizeof(*ifam32);
 		ifam32->ifam_data_off =
 		    offsetof(struct ifa_msghdrl32, ifam_data);
-		ifam32->ifam_metric = ifa->ifa_metric;
+		ifam32->ifam_metric = ifa->ifa_ifp->if_metric;
 		ifd = &ifam32->ifam_data;
 	} else
 #endif
@@ -1649,7 +1649,7 @@ sysctl_iflist_ifaml(struct ifaddr *ifa, struct rt_addrinfo *info,
 		ifam->_ifam_spare1 = 0;
 		ifam->ifam_len = sizeof(*ifam);
 		ifam->ifam_data_off = offsetof(struct ifa_msghdrl, ifam_data);
-		ifam->ifam_metric = ifa->ifa_metric;
+		ifam->ifam_metric = ifa->ifa_ifp->if_metric;
 		ifd = &ifam->ifam_data;
 	}
 
@@ -1677,7 +1677,7 @@ sysctl_iflist_ifam(struct ifaddr *ifa, struct rt_addrinfo *info,
 	ifam->ifam_addrs = info->rti_addrs;
 	ifam->ifam_flags = ifa->ifa_flags;
 	ifam->ifam_index = ifa->ifa_ifp->if_index;
-	ifam->ifam_metric = ifa->ifa_metric;
+	ifam->ifam_metric = ifa->ifa_ifp->if_metric;
 
 	return (SYSCTL_OUT(w->w_req, w->w_tmem, len));
 }
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index 538a873ad0be..73018c18ebaa 100644
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c
@@ -570,15 +570,9 @@ ieee80211_vap_attach(struct ieee80211vap *vap,
 		ifp->if_baudrate = IF_Mbps(maxrate);
 
 	ether_ifattach(ifp, vap->iv_myaddr);
-	if (vap->iv_opmode == IEEE80211_M_MONITOR) {
-		/* NB: disallow transmit */
-		ifp->if_transmit = null_transmit;
-		ifp->if_output = null_output;
-	} else {
-		/* hook output method setup by ether_ifattach */
-		vap->iv_output = ifp->if_output;
-		ifp->if_output = ieee80211_output;
-	}
+	/* hook output method setup by ether_ifattach */
+	vap->iv_output = ifp->if_output;
+	ifp->if_output = ieee80211_output;
 	/* NB: if_mtu set by ether_ifattach to ETHERMTU */
 
 	IEEE80211_LOCK(ic);
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
index e83967be8f07..1970965e2e25 100644
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -2954,13 +2954,10 @@ static int			numthreads = 0; /* number of queue threads */
 static int			maxalloc = 4096;/* limit the damage of a leak */
 static int			maxdata = 512;	/* limit the damage of a DoS */
 
-TUNABLE_INT("net.graph.threads", &numthreads);
 SYSCTL_INT(_net_graph, OID_AUTO, threads, CTLFLAG_RDTUN, &numthreads,
     0, "Number of queue processing threads");
-TUNABLE_INT("net.graph.maxalloc", &maxalloc);
 SYSCTL_INT(_net_graph, OID_AUTO, maxalloc, CTLFLAG_RDTUN, &maxalloc,
     0, "Maximum number of non-data queue items to allocate");
-TUNABLE_INT("net.graph.maxdata", &maxdata);
 SYSCTL_INT(_net_graph, OID_AUTO, maxdata, CTLFLAG_RDTUN, &maxdata,
     0, "Maximum number of data queue items to allocate");
 
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index 98ecd445aff5..a390e1bbc876 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -236,6 +236,9 @@ ng_eiface_start2(node_p node, hook_p hook, void *arg1, int arg2)
 		if (m == NULL)
 			break;
 
+		/* Peel the mbuf off any stale tags */
+		m_tag_delete_chain(m, NULL);
+
 		/*
 		 * Berkeley packet filter.
 		 * Pass packet to bpf if there is a listener.
diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c
index 14d44de49dc0..76f4c3b89b4f 100644
--- a/sys/netgraph/ng_mppc.c
+++ b/sys/netgraph/ng_mppc.c
@@ -111,18 +111,15 @@ static MALLOC_DEFINE(M_NETGRAPH_MPPC, "netgraph_mppc", "netgraph mppc node");
 SYSCTL_NODE(_net_graph, OID_AUTO, mppe, CTLFLAG_RW, 0, "MPPE");
 
 static int mppe_block_on_max_rekey = 0;
-TUNABLE_INT("net.graph.mppe.block_on_max_rekey", &mppe_block_on_max_rekey);
-SYSCTL_INT(_net_graph_mppe, OID_AUTO, block_on_max_rekey, CTLFLAG_RW,
+SYSCTL_INT(_net_graph_mppe, OID_AUTO, block_on_max_rekey, CTLFLAG_RWTUN,
     &mppe_block_on_max_rekey, 0, "Block node on max MPPE key re-calculations");
 
 static int mppe_log_max_rekey = 1;
-TUNABLE_INT("net.graph.mppe.log_max_rekey", &mppe_log_max_rekey);
-SYSCTL_INT(_net_graph_mppe, OID_AUTO, log_max_rekey, CTLFLAG_RW,
+SYSCTL_INT(_net_graph_mppe, OID_AUTO, log_max_rekey, CTLFLAG_RWTUN,
     &mppe_log_max_rekey, 0, "Log max MPPE key re-calculations event");
 
 static int mppe_max_rekey = MPPE_MAX_REKEY;
-TUNABLE_INT("net.graph.mppe.max_rekey", &mppe_max_rekey);
-SYSCTL_INT(_net_graph_mppe, OID_AUTO, max_rekey, CTLFLAG_RW,
+SYSCTL_INT(_net_graph_mppe, OID_AUTO, max_rekey, CTLFLAG_RWTUN,
     &mppe_max_rekey, 0, "Maximum number of MPPE key re-calculations");
 
 /* MPPC packet header bits */
diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c
index d6f978a38e2c..19d84abca00b 100644
--- a/sys/netinet/cc/cc.c
+++ b/sys/netinet/cc/cc.c
@@ -101,7 +101,7 @@ cc_default_algo(SYSCTL_HANDLER_ARGS)
 		CC_LIST_RLOCK();
 		strlcpy(default_cc, CC_DEFAULT()->name, TCP_CA_NAME_MAX);
 		CC_LIST_RUNLOCK();
-		err = sysctl_handle_string(oidp, default_cc, 1, req);
+		err = sysctl_handle_string(oidp, default_cc, 0, req);
 	} else {
 		/* Find algo with specified name and set it to default. */
 		CC_LIST_RLOCK();
@@ -166,7 +166,7 @@ cc_list_available(SYSCTL_HANDLER_ARGS)
 
 	if (!err) {
 		sbuf_finish(s);
-		err = sysctl_handle_string(oidp, sbuf_data(s), 1, req);
+		err = sysctl_handle_string(oidp, sbuf_data(s), 0, req);
 	}
 
 	sbuf_delete(s);
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 4e2294824bbd..a13260fd3452 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -1424,26 +1424,29 @@ igmp_input_v2_report(struct ifnet *ifp, /*const*/ struct ip *ip,
 	return (0);
 }
 
-void
-igmp_input(struct mbuf *m, int off)
+int
+igmp_input(struct mbuf **mp, int *offp, int proto)
 {
 	int iphlen;
 	struct ifnet *ifp;
 	struct igmp *igmp;
 	struct ip *ip;
+	struct mbuf *m;
 	int igmplen;
 	int minlen;
 	int queryver;
 
-	CTR3(KTR_IGMPV3, "%s: called w/mbuf (%p,%d)", __func__, m, off);
+	CTR3(KTR_IGMPV3, "%s: called w/mbuf (%p,%d)", __func__, *mp, *offp);
 
+	m = *mp;
 	ifp = m->m_pkthdr.rcvif;
+	*mp = NULL;
 
 	IGMPSTAT_INC(igps_rcv_total);
 
 	ip = mtod(m, struct ip *);
-	iphlen = off;
-	igmplen = ntohs(ip->ip_len) - off;
+	iphlen = *offp;
+	igmplen = ntohs(ip->ip_len) - iphlen;
 
 	/*
 	 * Validate lengths.
@@ -1451,7 +1454,7 @@ igmp_input(struct mbuf *m, int off)
 	if (igmplen < IGMP_MINLEN) {
 		IGMPSTAT_INC(igps_rcv_tooshort);
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	/*
@@ -1466,7 +1469,7 @@ igmp_input(struct mbuf *m, int off)
 	if ((m->m_flags & M_EXT || m->m_len < minlen) &&
 	    (m = m_pullup(m, minlen)) == 0) {
 		IGMPSTAT_INC(igps_rcv_tooshort);
-		return;
+		return (IPPROTO_DONE);
 	}
 	ip = mtod(m, struct ip *);
 
@@ -1479,7 +1482,7 @@ igmp_input(struct mbuf *m, int off)
 	if (in_cksum(m, igmplen)) {
 		IGMPSTAT_INC(igps_rcv_badsum);
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 	m->m_data -= iphlen;
 	m->m_len += iphlen;
@@ -1492,7 +1495,7 @@ igmp_input(struct mbuf *m, int off)
 	if (igmp->igmp_type != IGMP_DVMRP && ip->ip_ttl != 1) {
 		IGMPSTAT_INC(igps_rcv_badttl);
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	switch (igmp->igmp_type) {
@@ -1507,7 +1510,7 @@ igmp_input(struct mbuf *m, int off)
 		} else {
 			IGMPSTAT_INC(igps_rcv_tooshort);
 			m_freem(m);
-			return;
+			return (IPPROTO_DONE);
 		}
 
 		switch (queryver) {
@@ -1517,7 +1520,7 @@ igmp_input(struct mbuf *m, int off)
 				break;
 			if (igmp_input_v1_query(ifp, ip, igmp) != 0) {
 				m_freem(m);
-				return;
+				return (IPPROTO_DONE);
 			}
 			break;
 
@@ -1527,7 +1530,7 @@ igmp_input(struct mbuf *m, int off)
 				break;
 			if (igmp_input_v2_query(ifp, ip, igmp) != 0) {
 				m_freem(m);
-				return;
+				return (IPPROTO_DONE);
 			}
 			break;
 
@@ -1546,7 +1549,7 @@ igmp_input(struct mbuf *m, int off)
 				srclen = sizeof(struct in_addr) * nsrc;
 				if (nsrc * sizeof(in_addr_t) > srclen) {
 					IGMPSTAT_INC(igps_rcv_tooshort);
-					return;
+					return (IPPROTO_DONE);
 				}
 				/*
 				 * m_pullup() may modify m, so pullup in
@@ -1558,13 +1561,13 @@ igmp_input(struct mbuf *m, int off)
 				     m->m_len < igmpv3len) &&
 				    (m = m_pullup(m, igmpv3len)) == NULL) {
 					IGMPSTAT_INC(igps_rcv_tooshort);
-					return;
+					return (IPPROTO_DONE);
 				}
 				igmpv3 = (struct igmpv3 *)(mtod(m, uint8_t *)
 				    + iphlen);
 				if (igmp_input_v3_query(ifp, ip, igmpv3) != 0) {
 					m_freem(m);
-					return;
+					return (IPPROTO_DONE);
 				}
 			}
 			break;
@@ -1576,7 +1579,7 @@ igmp_input(struct mbuf *m, int off)
 			break;
 		if (igmp_input_v1_report(ifp, ip, igmp) != 0) {
 			m_freem(m);
-			return;
+			return (IPPROTO_DONE);
 		}
 		break;
 
@@ -1587,7 +1590,7 @@ igmp_input(struct mbuf *m, int off)
 			IGMPSTAT_INC(igps_rcv_nora);
 		if (igmp_input_v2_report(ifp, ip, igmp) != 0) {
 			m_freem(m);
-			return;
+			return (IPPROTO_DONE);
 		}
 		break;
 
@@ -1608,7 +1611,8 @@ igmp_input(struct mbuf *m, int off)
 	 * Pass all valid IGMP packets up to any process(es) listening on a
 	 * raw IGMP socket.
 	 */
-	rip_input(m, off);
+	*mp = m;
+	return (rip_input(mp, offp, proto));
 }
 
 
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index 8d91cc146a61..b8e5bf746db4 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -205,7 +205,7 @@ struct igmp_ifinfo *
 	igmp_domifattach(struct ifnet *);
 void	igmp_domifdetach(struct ifnet *);
 void	igmp_ifdetach(struct ifnet *);
-void	igmp_input(struct mbuf *, int);
+int	igmp_input(struct mbuf **, int *, int);
 void	igmp_slowtimo(void);
 
 SYSCTL_DECL(_net_inet_igmp);
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 336c9e549028..2d5e3cc870f5 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -363,7 +363,6 @@ in_aifaddr_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *td)
 	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;
@@ -408,6 +407,12 @@ in_aifaddr_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *td)
 	if (ifp->if_flags & IFF_LOOPBACK)
                 ia->ia_dstaddr = ia->ia_addr;
 
+	if (vhid != 0) {
+		error = (*carp_attach_p)(&ia->ia_ifa, vhid);
+		if (error)
+			return (error);
+	}
+
 	/* if_addrhead is already referenced by ifa_alloc() */
 	IF_ADDR_WLOCK(ifp);
 	TAILQ_INSERT_TAIL(&ifp->if_addrhead, ifa, ifa_link);
@@ -419,20 +424,16 @@ in_aifaddr_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *td)
 	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)
+	if (ifp->if_ioctl != NULL) {
 		error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia);
-	if (error)
-		goto fail2;
+		if (error)
+			goto fail1;
+	}
 
 	/*
 	 * Add route for the network.
@@ -445,7 +446,7 @@ in_aifaddr_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *td)
 
 		error = in_addprefix(ia, flags);
 		if (error)
-			goto fail2;
+			goto fail1;
 	}
 
 	/*
@@ -463,7 +464,7 @@ in_aifaddr_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *td)
 			error = ifa_add_loopback_route((struct ifaddr *)ia,
 			    (struct sockaddr *)&ia->ia_addr);
 			if (error)
-				goto fail3;
+				goto fail2;
 		} else
 			ifa_free(&eia->ia_ifa);
 	}
@@ -483,15 +484,14 @@ in_aifaddr_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *td)
 
 	return (error);
 
-fail3:
+fail2:
 	if (vhid == 0)
 		(void )in_scrubprefix(ia, LLE_STATIC);
 
-fail2:
+fail1:
 	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);
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 08809d53dce0..254401fc75e4 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -432,6 +432,8 @@ __END_DECLS
 
 #define	IP_ONESBCAST		23   /* bool: send all-ones broadcast */
 #define	IP_BINDANY		24   /* bool: allow bind to any address */
+#define	IP_BINDMULTI		25   /* bool: allow multiple listeners on a tuple */
+#define	IP_RSS_LISTEN_BUCKET	26   /* int; set RSS listen bucket */
 
 /*
  * Options for controlling the firewall and dummynet.
@@ -468,9 +470,6 @@ __END_DECLS
 #define	IP_MINTTL		66   /* minimum TTL for packet or drop */
 #define	IP_DONTFRAG		67   /* don't fragment packet */
 #define	IP_RECVTOS		68   /* bool; receive IP TOS w/dgram */
-#define	IP_FLOWID		69   /* flow id for the given socket/inp */
-#define	IP_FLOWTYPE		70   /* flow type (M_HASHTYPE) */
-#define	IP_RSSCPUID		71   /* RSS flowid -> CPU id mapping */
 
 /* IPv4 Source Filter Multicast API [RFC3678] */
 #define	IP_ADD_SOURCE_MEMBERSHIP	70   /* join a source-specific group */
@@ -489,6 +488,11 @@ __END_DECLS
 #define	MCAST_BLOCK_SOURCE		84   /* block a source */
 #define	MCAST_UNBLOCK_SOURCE		85   /* unblock a source */
 
+/* Flow and RSS definitions */
+#define	IP_FLOWID		90   /* get flow id for the given socket/inp */
+#define	IP_FLOWTYPE		91   /* get flow type (M_HASHTYPE) */
+#define	IP_RSSBUCKETID		92   /* get RSS flowid -> bucket mapping */
+
 /*
  * Defaults and limits for options
  */
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 6559454320c8..6ee1634c9a23 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -81,7 +81,7 @@ struct protosw in_gif_protosw = {
 	.pr_protocol =		0/* IPPROTO_IPV[46] */,
 	.pr_flags =		PR_ATOMIC|PR_ADDR,
 	.pr_input =		in_gif_input,
-	.pr_output =		(pr_output_t*)rip_output,
+	.pr_output =		(pr_output_t *)rip_output,
 	.pr_ctloutput =		rip_ctloutput,
 	.pr_usrreqs =		&rip_usrreqs
 };
@@ -170,6 +170,7 @@ in_gif_output(struct ifnet *ifp, int family, struct mbuf *m)
  			return ENOBUFS;
  		bcopy(&eiphdr, mtod(m, struct etherip_header *),
 		    sizeof(struct etherip_header));
+		tos = 0;
 		break;
 
 	default:
@@ -257,6 +258,7 @@ in_gif_output(struct ifnet *ifp, int family, struct mbuf *m)
 #endif
 	}
 
+	m->m_flags &= ~(M_BCAST|M_MCAST);
 	error = ip_output(m, NULL, &sc->gif_ro, 0, NULL, NULL);
 
 	if (!(GIF2IFP(sc)->if_flags & IFF_LINK0) &&
@@ -268,31 +270,34 @@ in_gif_output(struct ifnet *ifp, int family, struct mbuf *m)
 	return (error);
 }
 
-void
-in_gif_input(struct mbuf *m, int off)
+int
+in_gif_input(struct mbuf **mp, int *offp, int proto)
 {
+	struct mbuf *m;
 	struct ifnet *gifp = NULL;
 	struct gif_softc *sc;
 	struct ip *ip;
 	int af;
+	int off;
 	u_int8_t otos;
-	int proto;
 
+	m = *mp;
 	ip = mtod(m, struct ip *);
-	proto = ip->ip_p;
+	off = *offp;
+	*mp = NULL;
 
 	sc = (struct gif_softc *)encap_getarg(m);
 	if (sc == NULL) {
 		m_freem(m);
 		KMOD_IPSTAT_INC(ips_nogif);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	gifp = GIF2IFP(sc);
 	if (gifp == NULL || (gifp->if_flags & IFF_UP) == 0) {
 		m_freem(m);
 		KMOD_IPSTAT_INC(ips_nogif);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	otos = ip->ip_tos;
@@ -307,14 +312,14 @@ in_gif_input(struct mbuf *m, int off)
 		if (m->m_len < sizeof(*ip)) {
 			m = m_pullup(m, sizeof(*ip));
 			if (!m)
-				return;
+				return (IPPROTO_DONE);
 		}
 		ip = mtod(m, struct ip *);
 		if (ip_ecn_egress((gifp->if_flags & IFF_LINK1) ?
 				  ECN_ALLOWED : ECN_NOCARE,
 				  &otos, &ip->ip_tos) == 0) {
 			m_freem(m);
-			return;
+			return (IPPROTO_DONE);
 		}
 		break;
 	    }
@@ -329,7 +334,7 @@ in_gif_input(struct mbuf *m, int off)
 		if (m->m_len < sizeof(*ip6)) {
 			m = m_pullup(m, sizeof(*ip6));
 			if (!m)
-				return;
+				return (IPPROTO_DONE);
 		}
 		ip6 = mtod(m, struct ip6_hdr *);
 		itos = oitos = (ntohl(ip6->ip6_flow) >> 20) & 0xff;
@@ -337,7 +342,7 @@ in_gif_input(struct mbuf *m, int off)
 				  ECN_ALLOWED : ECN_NOCARE,
 				  &otos, &itos) == 0) {
 			m_freem(m);
-			return;
+			return (IPPROTO_DONE);
 		}
 		if (itos != oitos) {
 			ip6->ip6_flow &= ~htonl(0xff << 20);
@@ -353,10 +358,10 @@ in_gif_input(struct mbuf *m, int off)
 	default:
 		KMOD_IPSTAT_INC(ips_nogif);
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 	gif_input(m, af, gifp);
-	return;
+	return (IPPROTO_DONE);
 }
 
 /*
diff --git a/sys/netinet/in_gif.h b/sys/netinet/in_gif.h
index e1f4ae48d6ed..15cbef1338fd 100644
--- a/sys/netinet/in_gif.h
+++ b/sys/netinet/in_gif.h
@@ -36,7 +36,7 @@
 #define GIF_TTL		30
 
 struct gif_softc;
-void in_gif_input(struct mbuf *, int);
+int in_gif_input(struct mbuf **, int *, int);
 int in_gif_output(struct ifnet *, int, struct mbuf *);
 int gif_encapcheck4(const struct mbuf *, int, int, void *);
 int in_gif_attach(struct gif_softc *);
diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c
index d996bd189281..26d4e8e3a135 100644
--- a/sys/netinet/in_mcast.c
+++ b/sys/netinet/in_mcast.c
@@ -166,20 +166,17 @@ static SYSCTL_NODE(_net_inet_ip, OID_AUTO, mcast, CTLFLAG_RW, 0,
 
 static u_long in_mcast_maxgrpsrc = IP_MAX_GROUP_SRC_FILTER;
 SYSCTL_ULONG(_net_inet_ip_mcast, OID_AUTO, maxgrpsrc,
-    CTLFLAG_RW | CTLFLAG_TUN, &in_mcast_maxgrpsrc, 0,
+    CTLFLAG_RWTUN, &in_mcast_maxgrpsrc, 0,
     "Max source filters per group");
-TUNABLE_ULONG("net.inet.ip.mcast.maxgrpsrc", &in_mcast_maxgrpsrc);
 
 static u_long in_mcast_maxsocksrc = IP_MAX_SOCK_SRC_FILTER;
 SYSCTL_ULONG(_net_inet_ip_mcast, OID_AUTO, maxsocksrc,
-    CTLFLAG_RW | CTLFLAG_TUN, &in_mcast_maxsocksrc, 0,
+    CTLFLAG_RWTUN, &in_mcast_maxsocksrc, 0,
     "Max source filters per socket");
-TUNABLE_ULONG("net.inet.ip.mcast.maxsocksrc", &in_mcast_maxsocksrc);
 
 int in_mcast_loop = IP_DEFAULT_MULTICAST_LOOP;
-SYSCTL_INT(_net_inet_ip_mcast, OID_AUTO, loop, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_net_inet_ip_mcast, OID_AUTO, loop, CTLFLAG_RWTUN,
     &in_mcast_loop, 0, "Loopback multicast datagrams by default");
-TUNABLE_INT("net.inet.ip.mcast.loop", &in_mcast_loop);
 
 static SYSCTL_NODE(_net_inet_ip_mcast, OID_AUTO, filters,
     CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_ip_mcast_filters,
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index e8f5bb764de3..1a5de4012cfa 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -349,6 +349,9 @@ in_pcbbind(struct inpcb *inp, struct sockaddr *nam, struct ucred *cred)
 }
 #endif
 
+/*
+ * Select a local port (number) to use.
+ */
 #if defined(INET) || defined(INET6)
 int
 in_pcb_lport(struct inpcb *inp, struct in_addr *laddrp, u_short *lportp,
@@ -462,7 +465,7 @@ in_pcb_lport(struct inpcb *inp, struct in_addr *laddrp, u_short *lportp,
 #ifdef INET
 	if ((inp->inp_vflag & (INP_IPV4|INP_IPV6)) == INP_IPV4)
 		laddrp->s_addr = laddr.s_addr;
-#endif                 
+#endif
 	*lportp = lport;
 
 	return (0);
@@ -486,6 +489,36 @@ inp_so_options(const struct inpcb *inp)
 }
 #endif /* INET || INET6 */
 
+/*
+ * Check if a new BINDMULTI socket is allowed to be created.
+ *
+ * ni points to the new inp.
+ * oi points to the exisitng inp.
+ *
+ * This checks whether the existing inp also has BINDMULTI and
+ * whether the credentials match.
+ */
+int
+in_pcbbind_check_bindmulti(const struct inpcb *ni, const struct inpcb *oi)
+{
+	/* Check permissions match */
+	if ((ni->inp_flags2 & INP_BINDMULTI) &&
+	    (ni->inp_cred->cr_uid !=
+	    oi->inp_cred->cr_uid))
+		return (0);
+
+	/* Check the existing inp has BINDMULTI set */
+	if ((ni->inp_flags2 & INP_BINDMULTI) &&
+	    ((oi->inp_flags2 & INP_BINDMULTI) == 0))
+		return (0);
+
+	/*
+	 * We're okay - either INP_BINDMULTI isn't set on ni, or
+	 * it is and it matches the checks.
+	 */
+	return (1);
+}
+
 #ifdef INET
 /*
  * Set up a bind operation on a PCB, performing port allocation
@@ -589,6 +622,7 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr *nam, in_addr_t *laddrp,
 	 * This entire block sorely needs a rewrite.
 	 */
 				if (t &&
+				    ((inp->inp_flags2 & INP_BINDMULTI) == 0) &&
 				    ((t->inp_flags & INP_TIMEWAIT) == 0) &&
 				    (so->so_type != SOCK_STREAM ||
 				     ntohl(t->inp_faddr.s_addr) == INADDR_ANY) &&
@@ -598,6 +632,15 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr *nam, in_addr_t *laddrp,
 				    (inp->inp_cred->cr_uid !=
 				     t->inp_cred->cr_uid))
 					return (EADDRINUSE);
+
+				/*
+				 * If the socket is a BINDMULTI socket, then
+				 * the credentials need to match and the
+				 * original socket also has to have been bound
+				 * with BINDMULTI.
+				 */
+				if (t && (! in_pcbbind_check_bindmulti(inp, t)))
+					return (EADDRINUSE);
 			}
 			t = in_pcblookup_local(pcbinfo, sin->sin_addr,
 			    lport, lookupflags, cred);
@@ -612,7 +655,9 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr *nam, in_addr_t *laddrp,
 				if (tw == NULL ||
 				    (reuseport & tw->tw_so_options) == 0)
 					return (EADDRINUSE);
-			} else if (t && (reuseport & inp_so_options(t)) == 0) {
+			} else if (t &&
+			    ((inp->inp_flags2 & INP_BINDMULTI) == 0) &&
+			    (reuseport & inp_so_options(t)) == 0) {
 #ifdef INET6
 				if (ntohl(sin->sin_addr.s_addr) !=
 				    INADDR_ANY ||
@@ -622,6 +667,8 @@ in_pcbbind_setup(struct inpcb *inp, struct sockaddr *nam, in_addr_t *laddrp,
 				    (t->inp_vflag & INP_IPV6PROTO) == 0)
 #endif
 				return (EADDRINUSE);
+				if (t && (! in_pcbbind_check_bindmulti(inp, t)))
+					return (EADDRINUSE);
 			}
 		}
 	}
@@ -1556,6 +1603,88 @@ in_pcblookup_group(struct inpcbinfo *pcbinfo, struct inpcbgroup *pcbgroup,
 		goto found;
 	}
 
+#ifdef	RSS
+	/*
+	 * For incoming connections, we may wish to do a wildcard
+	 * match for an RSS-local socket.
+	 */
+	if ((lookupflags & INPLOOKUP_WILDCARD) != 0) {
+		struct inpcb *local_wild = NULL, *local_exact = NULL;
+#ifdef INET6
+		struct inpcb *local_wild_mapped = NULL;
+#endif
+		struct inpcb *jail_wild = NULL;
+		struct inpcbhead *head;
+		int injail;
+
+		/*
+		 * Order of socket selection - we always prefer jails.
+		 *      1. jailed, non-wild.
+		 *      2. jailed, wild.
+		 *      3. non-jailed, non-wild.
+		 *      4. non-jailed, wild.
+		 */
+
+		head = &pcbgroup->ipg_hashbase[INP_PCBHASH(INADDR_ANY,
+		    lport, 0, pcbgroup->ipg_hashmask)];
+		LIST_FOREACH(inp, head, inp_pcbgrouphash) {
+#ifdef INET6
+			/* XXX inp locking */
+			if ((inp->inp_vflag & INP_IPV4) == 0)
+				continue;
+#endif
+			if (inp->inp_faddr.s_addr != INADDR_ANY ||
+			    inp->inp_lport != lport)
+				continue;
+
+			/* XXX inp locking */
+			if (ifp && ifp->if_type == IFT_FAITH &&
+			    (inp->inp_flags & INP_FAITH) == 0)
+				continue;
+
+			injail = prison_flag(inp->inp_cred, PR_IP4);
+			if (injail) {
+				if (prison_check_ip4(inp->inp_cred,
+				    &laddr) != 0)
+					continue;
+			} else {
+				if (local_exact != NULL)
+					continue;
+			}
+
+			if (inp->inp_laddr.s_addr == laddr.s_addr) {
+				if (injail)
+					goto found;
+				else
+					local_exact = inp;
+			} else if (inp->inp_laddr.s_addr == INADDR_ANY) {
+#ifdef INET6
+				/* XXX inp locking, NULL check */
+				if (inp->inp_vflag & INP_IPV6PROTO)
+					local_wild_mapped = inp;
+				else
+#endif
+					if (injail)
+						jail_wild = inp;
+					else
+						local_wild = inp;
+			}
+		} /* LIST_FOREACH */
+
+		inp = jail_wild;
+		if (inp == NULL)
+			inp = local_exact;
+		if (inp == NULL)
+			inp = local_wild;
+#ifdef INET6
+		if (inp == NULL)
+			inp = local_wild_mapped;
+#endif
+		if (inp != NULL)
+			goto found;
+	}
+#endif
+
 	/*
 	 * Then look for a wildcard match, if requested.
 	 */
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 7cfc72a43778..8c73f2d657ad 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -181,7 +181,8 @@ struct inpcb {
 	u_int	inp_refcount;		/* (i) refcount */
 	void	*inp_pspare[5];		/* (x) route caching / general use */
 	uint32_t inp_flowtype;		/* (x) M_HASHTYPE value */
-	u_int	inp_ispare[5];		/* (x) route caching / user cookie /
+	uint32_t inp_rss_listen_bucket;	/* (x) overridden RSS listen bucket */
+	u_int	inp_ispare[4];		/* (x) route caching / user cookie /
 					 *     general use */
 
 	/* Local and foreign ports, local and foreign addr. */
@@ -546,6 +547,8 @@ short	inp_so_options(const struct inpcb *inp);
 #define	INP_REUSEPORT		0x00000008 /* SO_REUSEPORT option is set */
 #define	INP_FREED		0x00000010 /* inp itself is not valid */
 #define	INP_REUSEADDR		0x00000020 /* SO_REUSEADDR option is set */
+#define	INP_BINDMULTI		0x00000040 /* IP_BINDMULTI option is set */
+#define	INP_RSS_BUCKET_SET	0x00000080 /* IP_RSS_LISTEN_BUCKET is set */
 
 /*
  * Flags passed to in_pcblookup*() functions.
@@ -604,6 +607,9 @@ void	in_pcbinfo_destroy(struct inpcbinfo *);
 void	in_pcbinfo_init(struct inpcbinfo *, const char *, struct inpcbhead *,
 	    int, int, char *, uma_init, uma_fini, uint32_t, u_int);
 
+int	in_pcbbind_check_bindmulti(const struct inpcb *ni,
+	    const struct inpcb *oi);
+
 struct inpcbgroup *
 	in_pcbgroup_byhash(struct inpcbinfo *, u_int, uint32_t);
 struct inpcbgroup *
diff --git a/sys/netinet/in_pcbgroup.c b/sys/netinet/in_pcbgroup.c
index 22d07989c4d0..aa2f1c642a23 100644
--- a/sys/netinet/in_pcbgroup.c
+++ b/sys/netinet/in_pcbgroup.c
@@ -243,6 +243,8 @@ in_pcbgroup_byhash(struct inpcbinfo *pcbinfo, u_int hashtype, uint32_t hash)
 #ifdef RSS
 	if ((pcbinfo->ipi_hashfields == IPI_HASHFIELDS_4TUPLE &&
 	    hashtype == M_HASHTYPE_RSS_TCP_IPV4) ||
+	    (pcbinfo->ipi_hashfields == IPI_HASHFIELDS_4TUPLE &&
+	    hashtype == M_HASHTYPE_RSS_UDP_IPV4) ||
 	    (pcbinfo->ipi_hashfields == IPI_HASHFIELDS_2TUPLE &&
 	    hashtype == M_HASHTYPE_RSS_IPV4))
 		return (&pcbinfo->ipi_pcbgroups[
@@ -297,6 +299,18 @@ in_pcbgroup_bytuple(struct inpcbinfo *pcbinfo, struct in_addr laddr,
 struct inpcbgroup *
 in_pcbgroup_byinpcb(struct inpcb *inp)
 {
+#ifdef	RSS
+	/*
+	 * Listen sockets with INP_RSS_BUCKET_SET set have a pre-determined
+	 * RSS bucket and thus we should use this pcbgroup, rather than
+	 * using a tuple or hash.
+	 *
+	 * XXX should verify that there's actually pcbgroups and inp_rss_listen_bucket
+	 * fits in that!
+	 */
+	if (inp->inp_flags2 & INP_RSS_BUCKET_SET)
+		return (&inp->inp_pcbinfo->ipi_pcbgroups[inp->inp_rss_listen_bucket]);
+#endif
 
 	return (in_pcbgroup_bytuple(inp->inp_pcbinfo, inp->inp_laddr,
 	    inp->inp_lport, inp->inp_faddr, inp->inp_fport));
@@ -346,6 +360,15 @@ in_pcbwild_remove(struct inpcb *inp)
 static __inline int
 in_pcbwild_needed(struct inpcb *inp)
 {
+#ifdef	RSS
+	/*
+	 * If it's a listen socket and INP_RSS_BUCKET_SET is set,
+	 * it's a wildcard socket _but_ it's in a specific pcbgroup.
+	 * Thus we don't treat it as a pcbwild inp.
+	 */
+	if (inp->inp_flags2 & INP_RSS_BUCKET_SET)
+		return (0);
+#endif
 
 #ifdef INET6
 	if (inp->inp_vflag & INP_IPV6)
@@ -398,9 +421,24 @@ in_pcbgroup_update_internal(struct inpcbinfo *pcbinfo,
 #endif
 			hashkey_faddr = inp->inp_faddr.s_addr;
 		INP_GROUP_LOCK(newpcbgroup);
-		pcbhash = &newpcbgroup->ipg_hashbase[
-		    INP_PCBHASH(hashkey_faddr, inp->inp_lport, inp->inp_fport,
-		    newpcbgroup->ipg_hashmask)];
+		/*
+		 * If the inp is an RSS bucket wildcard entry, ensure
+		 * that the PCB hash is calculated correctly.
+		 *
+		 * The wildcard hash calculation differs from the
+		 * non-wildcard definition.  The source address is
+		 * INADDR_ANY and the far port is 0.
+		 */
+		if (inp->inp_flags2 & INP_RSS_BUCKET_SET) {
+			pcbhash = &newpcbgroup->ipg_hashbase[
+			    INP_PCBHASH(INADDR_ANY, inp->inp_lport, 0,
+			    newpcbgroup->ipg_hashmask)];
+		} else {
+			pcbhash = &newpcbgroup->ipg_hashbase[
+			    INP_PCBHASH(hashkey_faddr, inp->inp_lport,
+			    inp->inp_fport,
+			    newpcbgroup->ipg_hashmask)];
+		}
 		LIST_INSERT_HEAD(pcbhash, inp, inp_pcbgrouphash);
 		inp->inp_pcbgroup = newpcbgroup;
 		INP_GROUP_UNLOCK(newpcbgroup);
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index e5ebdaa0bab3..94d29e5be679 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -394,3 +394,5 @@ SYSCTL_NODE(_net_inet, IPPROTO_IPCOMP,	ipcomp,	CTLFLAG_RW, 0,	"IPCOMP");
 SYSCTL_NODE(_net_inet, IPPROTO_IPIP,	ipip,	CTLFLAG_RW, 0,	"IPIP");
 #endif /* IPSEC */
 SYSCTL_NODE(_net_inet, IPPROTO_RAW,	raw,	CTLFLAG_RW, 0,	"RAW");
+SYSCTL_NODE(_net_inet, OID_AUTO,	accf,	CTLFLAG_RW, 0,
+    "Accept filters");
diff --git a/sys/netinet/in_rss.c b/sys/netinet/in_rss.c
index f081db8aaf76..33b061aed395 100644
--- a/sys/netinet/in_rss.c
+++ b/sys/netinet/in_rss.c
@@ -91,9 +91,8 @@ SYSCTL_NODE(_net_inet, OID_AUTO, rss, CTLFLAG_RW, 0, "Receive-side steering");
  * default.
  */
 static u_int	rss_hashalgo = RSS_HASH_TOEPLITZ;
-SYSCTL_INT(_net_inet_rss, OID_AUTO, hashalgo, CTLFLAG_RD, &rss_hashalgo, 0,
+SYSCTL_INT(_net_inet_rss, OID_AUTO, hashalgo, CTLFLAG_RDTUN, &rss_hashalgo, 0,
     "RSS hash algorithm");
-TUNABLE_INT("net.inet.rss.hashalgo", &rss_hashalgo);
 
 /*
  * Size of the indirection table; at most 128 entries per the RSS spec.  We
@@ -104,9 +103,8 @@ TUNABLE_INT("net.inet.rss.hashalgo", &rss_hashalgo);
  * XXXRW: buckets might be better to use for the tunable than bits.
  */
 static u_int	rss_bits;
-SYSCTL_INT(_net_inet_rss, OID_AUTO, bits, CTLFLAG_RD, &rss_bits, 0,
+SYSCTL_INT(_net_inet_rss, OID_AUTO, bits, CTLFLAG_RDTUN, &rss_bits, 0,
     "RSS bits");
-TUNABLE_INT("net.inet.rss.bits", &rss_bits);
 
 static u_int	rss_mask;
 SYSCTL_INT(_net_inet_rss, OID_AUTO, mask, CTLFLAG_RD, &rss_mask, 0,
@@ -151,16 +149,15 @@ SYSCTL_INT(_net_inet_rss, OID_AUTO, basecpu, CTLFLAG_RD,
  *
  * XXXRW: And that we don't randomize it yet!
  *
- * XXXRW: This default is actually the default key from Chelsio T3 cards, as
- * it offers reasonable distribution, unlike all-0 keys which always
- * generate a hash of 0 (upsettingly).
+ * This is the default Microsoft RSS specification key which is also
+ * the Chelsio T5 firmware default key.
  */
-static uint8_t	rss_key[RSS_KEYSIZE] = {
-	0x43, 0xa3, 0x8f, 0xb0, 0x41, 0x67, 0x25, 0x3d,
-	0x25, 0x5b, 0x0e, 0xc2, 0x6d, 0x5a, 0x56, 0xda,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+static uint8_t rss_key[RSS_KEYSIZE] = {
+	0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2,
+	0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0,
+	0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4,
+	0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30, 0xf2, 0x0c,
+	0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa,
 };
 
 /*
@@ -399,6 +396,26 @@ rss_getbucket(u_int hash)
 	return (hash & rss_mask);
 }
 
+/*
+ * Query the RSS layer bucket associated with the given
+ * entry in the RSS hash space.
+ *
+ * The RSS indirection table is 0 .. rss_buckets-1,
+ * covering the low 'rss_bits' of the total 128 slot
+ * RSS indirection table.  So just mask off rss_bits and
+ * return that.
+ *
+ * NIC drivers can then iterate over the 128 slot RSS
+ * indirection table and fetch which RSS bucket to
+ * map it to.  This will typically be a CPU queue
+ */
+u_int
+rss_get_indirection_to_bucket(u_int index)
+{
+
+	return (index & rss_mask);
+}
+
 /*
  * Query the RSS CPU associated with an RSS bucket.
  */
@@ -419,6 +436,10 @@ rss_hash2cpuid(uint32_t hash_val, uint32_t hash_type)
 	switch (hash_type) {
 	case M_HASHTYPE_RSS_IPV4:
 	case M_HASHTYPE_RSS_TCP_IPV4:
+	case M_HASHTYPE_RSS_UDP_IPV4:
+	case M_HASHTYPE_RSS_IPV6:
+	case M_HASHTYPE_RSS_TCP_IPV6:
+	case M_HASHTYPE_RSS_UDP_IPV6:
 		return (rss_getcpu(rss_getbucket(hash_val)));
 	default:
 		return (NETISR_CPUID_NONE);
@@ -436,6 +457,10 @@ rss_hash2bucket(uint32_t hash_val, uint32_t hash_type, uint32_t *bucket_id)
 	switch (hash_type) {
 	case M_HASHTYPE_RSS_IPV4:
 	case M_HASHTYPE_RSS_TCP_IPV4:
+	case M_HASHTYPE_RSS_UDP_IPV4:
+	case M_HASHTYPE_RSS_IPV6:
+	case M_HASHTYPE_RSS_TCP_IPV6:
+	case M_HASHTYPE_RSS_UDP_IPV6:
 		*bucket_id = rss_getbucket(hash_val);
 		return (0);
 	default:
@@ -513,6 +538,40 @@ rss_getnumcpus(void)
 	return (rss_ncpus);
 }
 
+/*
+ * Return the supported RSS hash configuration.
+ *
+ * NICs should query this to determine what to configure in their redirection
+ * matching table.
+ */
+u_int
+rss_gethashconfig(void)
+{
+	/* Return 4-tuple for TCP; 2-tuple for others */
+	/*
+	 * UDP may fragment more often than TCP and thus we'll end up with
+	 * NICs returning 2-tuple fragments.
+	 * udp_init() and udplite_init() both currently initialise things
+	 * as 2-tuple.
+	 * So for now disable UDP 4-tuple hashing until all of the other
+	 * pieces are in place.
+	 */
+	return (
+	    RSS_HASHTYPE_RSS_IPV4
+	|    RSS_HASHTYPE_RSS_TCP_IPV4
+	|    RSS_HASHTYPE_RSS_IPV6
+	|    RSS_HASHTYPE_RSS_TCP_IPV6
+	|    RSS_HASHTYPE_RSS_IPV6_EX
+	|    RSS_HASHTYPE_RSS_TCP_IPV6_EX
+#if 0
+	|    RSS_HASHTYPE_RSS_UDP_IPV4
+	|    RSS_HASHTYPE_RSS_UDP_IPV4_EX
+	|    RSS_HASHTYPE_RSS_UDP_IPV6
+	|    RSS_HASHTYPE_RSS_UDP_IPV6_EX
+#endif
+	);
+}
+
 /*
  * XXXRW: Confirm that sysctl -a won't dump this keying material, don't want
  * it appearing in debugging output unnecessarily.
diff --git a/sys/netinet/in_rss.h b/sys/netinet/in_rss.h
index 0ee704b9f50f..a911e3c0f926 100644
--- a/sys/netinet/in_rss.h
+++ b/sys/netinet/in_rss.h
@@ -51,6 +51,25 @@
 #define	RSS_HASHFIELDS_4TUPLE		1
 #define	RSS_HASHFIELDS_2TUPLE		2
 
+/*
+ * Define RSS representations of the M_HASHTYPE_* values, representing
+ * which particular bits are supported.  The NICs can then use this to
+ * calculate which hash types to enable and which not to enable.
+ *
+ * The fact that these line up with M_HASHTYPE_* is not to be relied
+ * upon.
+ */
+#define	RSS_HASHTYPE_RSS_IPV4		(1 << 1)	/* IPv4 2-tuple */
+#define	RSS_HASHTYPE_RSS_TCP_IPV4	(1 << 2)	/* TCPv4 4-tuple */
+#define	RSS_HASHTYPE_RSS_IPV6		(1 << 3)	/* IPv6 2-tuple */
+#define	RSS_HASHTYPE_RSS_TCP_IPV6	(1 << 4)	/* TCPv6 4-tuple */
+#define	RSS_HASHTYPE_RSS_IPV6_EX	(1 << 5)	/* IPv6 2-tuple + ext hdrs */
+#define	RSS_HASHTYPE_RSS_TCP_IPV6_EX	(1 << 6)	/* TCPv6 4-tiple + ext hdrs */
+#define	RSS_HASHTYPE_RSS_UDP_IPV4	(1 << 7)	/* IPv4 UDP 4-tuple */
+#define	RSS_HASHTYPE_RSS_UDP_IPV4_EX	(1 << 8)	/* IPv4 UDP 4-tuple + ext hdrs */
+#define	RSS_HASHTYPE_RSS_UDP_IPV6	(1 << 9)	/* IPv6 UDP 4-tuple */
+#define	RSS_HASHTYPE_RSS_UDP_IPV6_EX	(1 << 10)	/* IPv6 UDP 4-tuple + ext hdrs */
+
 /*
  * Compile-time limits on the size of the indirection table.
  */
@@ -69,11 +88,13 @@
  */
 u_int	rss_getbits(void);
 u_int	rss_getbucket(u_int hash);
+u_int	rss_get_indirection_to_bucket(u_int index);
 u_int	rss_getcpu(u_int bucket);
 void	rss_getkey(uint8_t *key);
 u_int	rss_gethashalgo(void);
 u_int	rss_getnumbuckets(void);
 u_int	rss_getnumcpus(void);
+u_int	rss_gethashconfig(void);
 
 /*
  * Network stack interface to generate a hash for a protocol tuple.
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index c6499bce85bf..1600f8c022ad 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -78,7 +78,6 @@ __FBSDID("$FreeBSD$");
 #ifdef INET6
 #include <netinet/icmp6.h>
 #include <netinet/ip6.h>
-#include <netinet6/ip6protosw.h>
 #include <netinet6/in6_var.h>
 #include <netinet6/ip6_var.h>
 #include <netinet6/scope6_var.h>
@@ -435,18 +434,22 @@ carp_hmac_verify(struct carp_softc *sc, uint32_t counter[2],
  * but it seems more efficient this way or not possible otherwise.
  */
 #ifdef INET
-void
-carp_input(struct mbuf *m, int hlen)
+int
+carp_input(struct mbuf **mp, int *offp, int proto)
 {
+	struct mbuf *m = *mp;
 	struct ip *ip = mtod(m, struct ip *);
 	struct carp_header *ch;
 	int iplen, len;
 
+	iplen = *offp;
+	*mp = NULL;
+
 	CARPSTATS_INC(carps_ipackets);
 
 	if (!V_carp_allow) {
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	/* verify that the IP TTL is 255.  */
@@ -456,7 +459,7 @@ carp_input(struct mbuf *m, int hlen)
 		    ip->ip_ttl,
 		    m->m_pkthdr.rcvif->if_xname);
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	iplen = ip->ip_hl << 2;
@@ -467,14 +470,14 @@ carp_input(struct mbuf *m, int hlen)
 		    "on %s\n", __func__, m->m_len - sizeof(struct ip),
 		    m->m_pkthdr.rcvif->if_xname);
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	if (iplen + sizeof(*ch) < m->m_len) {
 		if ((m = m_pullup(m, iplen + sizeof(*ch))) == NULL) {
 			CARPSTATS_INC(carps_hdrops);
 			CARP_DEBUG("%s: pullup failed\n", __func__);
-			return;
+			return (IPPROTO_DONE);
 		}
 		ip = mtod(m, struct ip *);
 	}
@@ -491,12 +494,12 @@ carp_input(struct mbuf *m, int hlen)
 		    m->m_pkthdr.len,
 		    m->m_pkthdr.rcvif->if_xname);
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	if ((m = m_pullup(m, len)) == NULL) {
 		CARPSTATS_INC(carps_hdrops);
-		return;
+		return (IPPROTO_DONE);
 	}
 	ip = mtod(m, struct ip *);
 	ch = (struct carp_header *)((char *)ip + iplen);
@@ -508,11 +511,12 @@ carp_input(struct mbuf *m, int hlen)
 		CARP_DEBUG("%s: checksum failed on %s\n", __func__,
 		    m->m_pkthdr.rcvif->if_xname);
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 	m->m_data -= iplen;
 
 	carp_input_c(m, ch, AF_INET);
+	return (IPPROTO_DONE);
 }
 #endif
 
@@ -2058,13 +2062,13 @@ static struct protosw in_carp_protosw = {
 
 #ifdef INET6
 extern	struct domain inet6domain;
-static struct ip6protosw in6_carp_protosw = {
+static struct protosw in6_carp_protosw = {
 	.pr_type =		SOCK_RAW,
 	.pr_domain =		&inet6domain,
 	.pr_protocol =		IPPROTO_CARP,
 	.pr_flags =		PR_ATOMIC|PR_ADDR,
 	.pr_input =		carp6_input,
-	.pr_output =		rip6_output,
+	.pr_output =		(pr_output_t *)rip6_output,
 	.pr_ctloutput =		rip6_ctloutput,
 	.pr_usrreqs =		&rip6_usrreqs
 };
diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h
index 9f03d581771c..5b7e5064b461 100644
--- a/sys/netinet/ip_carp.h
+++ b/sys/netinet/ip_carp.h
@@ -140,7 +140,7 @@ int		carp_ioctl(struct ifreq *, u_long, struct thread *);
 int		carp_attach(struct ifaddr *, int);
 void		carp_detach(struct ifaddr *);
 void		carp_carpdev_state(struct ifnet *);
-void		carp_input (struct mbuf *, int);
+int		carp_input(struct mbuf **, int *, int);
 int		carp6_input (struct mbuf **, int *, int);
 int		carp_output (struct ifnet *, struct mbuf *,
 		    const struct sockaddr *);
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 89511822040a..97fb191af5f7 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -173,12 +173,14 @@ div_destroy(void)
  * IPPROTO_DIVERT is not in the real IP protocol number space; this
  * function should never be called.  Just in case, drop any packets.
  */
-static void
-div_input(struct mbuf *m, int off)
+static int
+div_input(struct mbuf **mp, int *offp, int proto)
 {
+	struct mbuf *m = *mp;
 
 	KMOD_IPSTAT_INC(ips_noproto);
 	m_freem(m);
+	return (IPPROTO_DONE);
 }
 
 /*
diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c
index ce1319d447ef..fcd048a90c94 100644
--- a/sys/netinet/ip_encap.c
+++ b/sys/netinet/ip_encap.c
@@ -84,7 +84,6 @@ __FBSDID("$FreeBSD$");
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/ip6protosw.h>
 #endif
 
 #include <machine/stdarg.h>
@@ -115,18 +114,20 @@ encap_init(void)
 }
 
 #ifdef INET
-void
-encap4_input(struct mbuf *m, int off)
+int
+encap4_input(struct mbuf **mp, int *offp, int proto)
 {
 	struct ip *ip;
-	int proto;
+	struct mbuf *m;
 	struct sockaddr_in s, d;
 	const struct protosw *psw;
 	struct encaptab *ep, *match;
-	int prio, matchprio;
+	int matchprio, off, prio;
 
+	m = *mp;
+	off = *offp;
 	ip = mtod(m, struct ip *);
-	proto = ip->ip_p;
+	*mp = NULL;
 
 	bzero(&s, sizeof(s));
 	s.sin_family = AF_INET;
@@ -188,14 +189,16 @@ encap4_input(struct mbuf *m, int off)
 		psw = match->psw;
 		if (psw && psw->pr_input) {
 			encap_fillarg(m, match);
-			(*psw->pr_input)(m, off);
+			*mp = m;
+			(*psw->pr_input)(mp, offp, proto);
 		} else
 			m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	/* last resort: inject to raw socket */
-	rip_input(m, off);
+	*mp = m;
+	return (rip_input(mp, offp, proto));
 }
 #endif
 
@@ -206,7 +209,7 @@ encap6_input(struct mbuf **mp, int *offp, int proto)
 	struct mbuf *m = *mp;
 	struct ip6_hdr *ip6;
 	struct sockaddr_in6 s, d;
-	const struct ip6protosw *psw;
+	const struct protosw *psw;
 	struct encaptab *ep, *match;
 	int prio, matchprio;
 
@@ -252,7 +255,7 @@ encap6_input(struct mbuf **mp, int *offp, int proto)
 
 	if (match) {
 		/* found a match */
-		psw = (const struct ip6protosw *)match->psw;
+		psw = match->psw;
 		if (psw && psw->pr_input) {
 			encap_fillarg(m, match);
 			return (*psw->pr_input)(mp, offp, proto);
diff --git a/sys/netinet/ip_encap.h b/sys/netinet/ip_encap.h
index 3b1a5aeeb738..0b8dbd6fcbc9 100644
--- a/sys/netinet/ip_encap.h
+++ b/sys/netinet/ip_encap.h
@@ -49,7 +49,7 @@ struct encaptab {
 };
 
 void	encap_init(void);
-void	encap4_input(struct mbuf *, int);
+int	encap4_input(struct mbuf **, int *, int);
 int	encap6_input(struct mbuf **, int *, int);
 const struct encaptab *encap_attach(int, int, const struct sockaddr *,
 	const struct sockaddr *, const struct sockaddr *,
diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c
index 10fcbce2868d..21a665a99e22 100644
--- a/sys/netinet/ip_gre.c
+++ b/sys/netinet/ip_gre.c
@@ -92,12 +92,15 @@ static struct mbuf *gre_input2(struct mbuf *, int, u_char);
  * IPPROTO_GRE and a local destination address).
  * This really is simple
  */
-void
-gre_input(struct mbuf *m, int off)
+int
+gre_input(struct mbuf **mp, int *offp, int proto)
 {
-	int proto;
+	struct mbuf *m;
+	int off;
 
-	proto = (mtod(m, struct ip *))->ip_p;
+	m = *mp;
+	off = *offp;
+	*mp = NULL;
 
 	m = gre_input2(m, off, proto);
 
@@ -105,8 +108,11 @@ gre_input(struct mbuf *m, int off)
 	 * If no matching tunnel that is up is found. We inject
 	 * the mbuf to raw ip socket to see if anyone picks it up.
 	 */
-	if (m != NULL)
-		rip_input(m, off);
+	if (m != NULL) {
+		*mp = m;
+		rip_input(mp, offp, proto);
+	}
+	return (IPPROTO_DONE);
 }
 
 /*
@@ -213,24 +219,26 @@ gre_input2(struct mbuf *m ,int hlen, u_char proto)
  * between IP header and payload
  */
 
-void
-gre_mobile_input(struct mbuf *m, int hlen)
+int
+gre_mobile_input(struct mbuf **mp, int *offp, int proto)
 {
 	struct ip *ip;
 	struct mobip_h *mip;
+	struct mbuf *m;
 	struct gre_softc *sc;
 	int msiz;
 
+	m = *mp;
 	if ((sc = gre_lookup(m, IPPROTO_MOBILE)) == NULL) {
 		/* No matching tunnel or tunnel is down. */
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	if (m->m_len < sizeof(*mip)) {
 		m = m_pullup(m, sizeof(*mip));
 		if (m == NULL)
-			return;
+			return (IPPROTO_DONE);
 	}
 	ip = mtod(m, struct ip *);
 	mip = mtod(m, struct mobip_h *);
@@ -247,7 +255,7 @@ gre_mobile_input(struct mbuf *m, int hlen)
 	if (m->m_len < (ip->ip_hl << 2) + msiz) {
 		m = m_pullup(m, (ip->ip_hl << 2) + msiz);
 		if (m == NULL)
-			return;
+			return (IPPROTO_DONE);
 		ip = mtod(m, struct ip *);
 		mip = mtod(m, struct mobip_h *);
 	}
@@ -257,7 +265,7 @@ gre_mobile_input(struct mbuf *m, int hlen)
 
 	if (gre_in_cksum((u_int16_t *)&mip->mh, msiz) != 0) {
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	bcopy((caddr_t)(ip) + (ip->ip_hl << 2) + msiz, (caddr_t)(ip) +
@@ -282,12 +290,13 @@ gre_mobile_input(struct mbuf *m, int hlen)
 
 	if ((GRE2IFP(sc)->if_flags & IFF_MONITOR) != 0) {
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	m->m_pkthdr.rcvif = GRE2IFP(sc);
 
 	netisr_queue(NETISR_IP, m);
+	return (IPPROTO_DONE);
 }
 
 /*
diff --git a/sys/netinet/ip_gre.h b/sys/netinet/ip_gre.h
index d2f3866ab97e..18d5302da494 100644
--- a/sys/netinet/ip_gre.h
+++ b/sys/netinet/ip_gre.h
@@ -31,6 +31,6 @@
  */
 
 #ifdef _KERNEL
-void gre_input(struct mbuf *, int);
-void gre_mobile_input(struct mbuf *, int);
+int gre_input(struct mbuf **, int *, int);
+int gre_mobile_input(struct mbuf **, int *, int);
 #endif /* _KERNEL */
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 605060e68fae..007364375834 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -358,19 +358,22 @@ stdreply:	icmpelen = max(8, min(V_icmp_quotelen, ntohs(oip->ip_len) - oiphlen));
 /*
  * Process a received ICMP message.
  */
-void
-icmp_input(struct mbuf *m, int off)
+int
+icmp_input(struct mbuf **mp, int *offp, int proto)
 {
 	struct icmp *icp;
 	struct in_ifaddr *ia;
+	struct mbuf *m = *mp;
 	struct ip *ip = mtod(m, struct ip *);
 	struct sockaddr_in icmpsrc, icmpdst, icmpgw;
-	int hlen = off;
-	int icmplen = ntohs(ip->ip_len) - off;
+	int hlen = *offp;
+	int icmplen = ntohs(ip->ip_len) - *offp;
 	int i, code;
 	void (*ctlfunc)(int, struct sockaddr *, void *);
 	int fibnum;
 
+	*mp = NULL;
+
 	/*
 	 * Locate icmp structure in mbuf, and check
 	 * that not corrupted and of at least minimum length.
@@ -390,7 +393,7 @@ icmp_input(struct mbuf *m, int off)
 	i = hlen + min(icmplen, ICMP_ADVLENMIN);
 	if (m->m_len < i && (m = m_pullup(m, i)) == NULL)  {
 		ICMPSTAT_INC(icps_tooshort);
-		return;
+		return (IPPROTO_DONE);
 	}
 	ip = mtod(m, struct ip *);
 	m->m_len -= hlen;
@@ -602,7 +605,7 @@ icmp_input(struct mbuf *m, int off)
 		ICMPSTAT_INC(icps_reflect);
 		ICMPSTAT_INC(icps_outhist[icp->icmp_type]);
 		icmp_reflect(m);
-		return;
+		return (IPPROTO_DONE);
 
 	case ICMP_REDIRECT:
 		if (V_log_redirect) {
@@ -679,11 +682,13 @@ icmp_input(struct mbuf *m, int off)
 	}
 
 raw:
-	rip_input(m, off);
-	return;
+	*mp = m;
+	rip_input(mp, offp, proto);
+	return (IPPROTO_DONE);
 
 freeit:
 	m_freem(m);
+	return (IPPROTO_DONE);
 }
 
 /*
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index 9cabdb58c570..ca1e963abaa4 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -207,7 +207,7 @@ struct icmp {
 
 #ifdef _KERNEL
 void	icmp_error(struct mbuf *, int, int, uint32_t, int);
-void	icmp_input(struct mbuf *, int);
+int	icmp_input(struct mbuf **, int *, int);
 int	ip_next_mtu(int, int);
 #endif
 
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 3a24296f9338..d622e011ead0 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -726,7 +726,7 @@ ip_input(struct mbuf *m)
 	 */
 	IPSTAT_INC(ips_delivered);
 
-	(*inetsw[ip_protox[ip->ip_p]].pr_input)(m, hlen);
+	(*inetsw[ip_protox[ip->ip_p]].pr_input)(&m, &hlen, ip->ip_p);
 	return;
 bad:
 	m_freem(m);
@@ -1715,13 +1715,18 @@ ip_rsvp_done(void)
 	return 0;
 }
 
-void
-rsvp_input(struct mbuf *m, int off)	/* XXX must fixup manually */
+int
+rsvp_input(struct mbuf **mp, int *offp, int proto)
 {
+	struct mbuf *m;
+
+	m = *mp;
+	*mp = NULL;
 
 	if (rsvp_input_p) { /* call the real one if loaded */
-		rsvp_input_p(m, off);
-		return;
+		*mp = m;
+		rsvp_input_p(mp, offp, proto);
+		return (IPPROTO_DONE);
 	}
 
 	/* Can still get packets with rsvp_on = 0 if there is a local member
@@ -1731,13 +1736,15 @@ rsvp_input(struct mbuf *m, int off)	/* XXX must fixup manually */
 	
 	if (!V_rsvp_on) {
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	if (V_ip_rsvpd != NULL) { 
-		rip_input(m, off);
-		return;
+		*mp = m;
+		rip_input(mp, offp, proto);
+		return (IPPROTO_DONE);
 	}
 	/* Drop the packet */
 	m_freem(m);
+	return (IPPROTO_DONE);
 }
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 35e552eaa992..6c4a0d75426e 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -247,7 +247,7 @@ static const struct protosw in_pim_protosw = {
 	.pr_protocol =		IPPROTO_PIM,
 	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
 	.pr_input =		pim_input,
-	.pr_output =		(pr_output_t*)rip_output,
+	.pr_output =		(pr_output_t *)rip_output,
 	.pr_ctloutput =		rip_ctloutput,
 	.pr_usrreqs =		&rip_usrreqs
 };
@@ -1718,12 +1718,16 @@ X_ip_rsvp_force_done(struct socket *so __unused)
 
 }
 
-static void
-X_rsvp_input(struct mbuf *m, int off __unused)
+static int
+X_rsvp_input(struct mbuf **mp, int *offp, int proto)
 {
+	struct mbuf *m;
 
+	m = *mp;
+	*mp = NULL;
 	if (!V_rsvp_on)
 		m_freem(m);
+	return (IPPROTO_DONE);
 }
 
 /*
@@ -2556,15 +2560,19 @@ pim_encapcheck(const struct mbuf *m, int off, int proto, void *arg)
  * (used by PIM-SM): the PIM header is stripped off, and the inner packet
  * is passed to if_simloop().
  */
-void
-pim_input(struct mbuf *m, int iphlen)
+int
+pim_input(struct mbuf **mp, int *offp, int proto)
 {
+    struct mbuf *m = *mp;
     struct ip *ip = mtod(m, struct ip *);
     struct pim *pim;
+    int iphlen = *offp;
     int minlen;
     int datalen = ntohs(ip->ip_len) - iphlen;
     int ip_tos;
 
+    *mp = NULL;
+
     /* Keep statistics */
     PIMSTAT_INC(pims_rcv_total_msgs);
     PIMSTAT_ADD(pims_rcv_total_bytes, datalen);
@@ -2577,7 +2585,7 @@ pim_input(struct mbuf *m, int iphlen)
 	CTR3(KTR_IPMF, "%s: short packet (%d) from %s",
 	    __func__, datalen, inet_ntoa(ip->ip_src));
 	m_freem(m);
-	return;
+	return (IPPROTO_DONE);
     }
 
     /*
@@ -2595,7 +2603,7 @@ pim_input(struct mbuf *m, int iphlen)
      */
     if (m->m_len < minlen && (m = m_pullup(m, minlen)) == 0) {
 	CTR1(KTR_IPMF, "%s: m_pullup() failed", __func__);
-	return;
+	return (IPPROTO_DONE);
     }
 
     /* m_pullup() may have given us a new mbuf so reset ip. */
@@ -2620,7 +2628,7 @@ pim_input(struct mbuf *m, int iphlen)
 	PIMSTAT_INC(pims_rcv_badsum);
 	CTR1(KTR_IPMF, "%s: invalid checksum", __func__);
 	m_freem(m);
-	return;
+	return (IPPROTO_DONE);
     }
 
     /* PIM version check */
@@ -2629,7 +2637,7 @@ pim_input(struct mbuf *m, int iphlen)
 	CTR3(KTR_IPMF, "%s: bad version %d expect %d", __func__,
 	    (int)PIM_VT_V(pim->pim_vt), PIM_VERSION);
 	m_freem(m);
-	return;
+	return (IPPROTO_DONE);
     }
 
     /* restore mbuf back to the outer IP */
@@ -2654,7 +2662,7 @@ pim_input(struct mbuf *m, int iphlen)
 	    CTR2(KTR_IPMF, "%s: register vif not set: %d", __func__,
 		(int)V_reg_vif_num);
 	    m_freem(m);
-	    return;
+	    return (IPPROTO_DONE);
 	}
 	/* XXX need refcnt? */
 	vifp = V_viftable[V_reg_vif_num].v_ifp;
@@ -2668,7 +2676,7 @@ pim_input(struct mbuf *m, int iphlen)
 	    PIMSTAT_INC(pims_rcv_badregisters);
 	    CTR1(KTR_IPMF, "%s: register packet size too small", __func__);
 	    m_freem(m);
-	    return;
+	    return (IPPROTO_DONE);
 	}
 
 	reghdr = (u_int32_t *)(pim + 1);
@@ -2682,7 +2690,7 @@ pim_input(struct mbuf *m, int iphlen)
 	    PIMSTAT_INC(pims_rcv_badregisters);
 	    CTR1(KTR_IPMF, "%s: bad encap ip version", __func__);
 	    m_freem(m);
-	    return;
+	    return (IPPROTO_DONE);
 	}
 
 	/* verify the inner packet is destined to a mcast group */
@@ -2691,7 +2699,7 @@ pim_input(struct mbuf *m, int iphlen)
 	    CTR2(KTR_IPMF, "%s: bad encap ip dest %s", __func__,
 		inet_ntoa(encap_ip->ip_dst));
 	    m_freem(m);
-	    return;
+	    return (IPPROTO_DONE);
 	}
 
 	/* If a NULL_REGISTER, pass it to the daemon */
@@ -2730,7 +2738,7 @@ pim_input(struct mbuf *m, int iphlen)
 	if (mcp == NULL) {
 	    CTR1(KTR_IPMF, "%s: m_copy() failed", __func__);
 	    m_freem(m);
-	    return;
+	    return (IPPROTO_DONE);
 	}
 
 	/* Keep statistics */
@@ -2766,9 +2774,10 @@ pim_input(struct mbuf *m, int iphlen)
      * XXX: the outer IP header pkt size of a Register is not adjust to
      * reflect the fact that the inner multicast data is truncated.
      */
-    rip_input(m, iphlen);
+    *mp = m;
+    rip_input(mp, offp, proto);
 
-    return;
+    return (IPPROTO_DONE);
 }
 
 static int
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 168fc98669bb..4aea44fcdc29 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -136,6 +136,7 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 	struct rtentry *rte;	/* cache for ro->ro_rt */
 	struct in_addr odst;
 	struct m_tag *fwd_tag = NULL;
+	int have_ia_ref;
 #ifdef IPSEC
 	int no_route_but_check_spd = 0;
 #endif
@@ -202,6 +203,7 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 	gw = dst = (struct sockaddr_in *)&ro->ro_dst;
 again:
 	ia = NULL;
+	have_ia_ref = 0;
 	/*
 	 * If there is a cached route, check that it is to the same
 	 * destination and is still up.  If not, free it and try again.
@@ -238,6 +240,7 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 			error = ENETUNREACH;
 			goto bad;
 		}
+		have_ia_ref = 1;
 		ip->ip_dst.s_addr = INADDR_BROADCAST;
 		dst->sin_addr = ip->ip_dst;
 		ifp = ia->ia_ifp;
@@ -250,6 +253,7 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 			error = ENETUNREACH;
 			goto bad;
 		}
+		have_ia_ref = 1;
 		ifp = ia->ia_ifp;
 		ip->ip_ttl = 1;
 		isbroadcast = in_broadcast(dst->sin_addr, ifp);
@@ -261,6 +265,8 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 		 */
 		ifp = imo->imo_multicast_ifp;
 		IFP_TO_IA(ifp, ia);
+		if (ia)
+			have_ia_ref = 1;
 		isbroadcast = 0;	/* fool gcc */
 	} else {
 		/*
@@ -552,8 +558,11 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 #endif
 			error = netisr_queue(NETISR_IP, m);
 			goto done;
-		} else
+		} else {
+			if (have_ia_ref)
+				ifa_free(&ia->ia_ifa);
 			goto again;	/* Redo the routing table lookup. */
+		}
 	}
 
 	/* See if local, if yes, send it to netisr with IP_FASTFWD_OURS. */
@@ -582,6 +591,8 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 		m->m_flags |= M_SKIP_FIREWALL;
 		m->m_flags &= ~M_IP_NEXTHOP;
 		m_tag_delete(m, fwd_tag);
+		if (have_ia_ref)
+			ifa_free(&ia->ia_ifa);
 		goto again;
 	}
 
@@ -694,6 +705,8 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags,
 done:
 	if (ro == &iproute)
 		RO_RTFREE(ro);
+	if (have_ia_ref)
+		ifa_free(&ia->ia_ifa);
 	return (error);
 bad:
 	m_freem(m);
@@ -905,6 +918,10 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 {
 	struct	inpcb *inp = sotoinpcb(so);
 	int	error, optval;
+#ifdef	RSS
+	uint32_t rss_bucket;
+	int retval;
+#endif
 
 	error = optval = 0;
 	if (sopt->sopt_level != IPPROTO_IP) {
@@ -983,6 +1000,10 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 					break;
 			}
 			/* FALLTHROUGH */
+		case IP_BINDMULTI:
+#ifdef	RSS
+		case IP_RSS_LISTEN_BUCKET:
+#endif
 		case IP_TOS:
 		case IP_TTL:
 		case IP_MINTTL:
@@ -1025,6 +1046,15 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 	INP_WUNLOCK(inp);						\
 } while (0)
 
+#define	OPTSET2(bit, val) do {						\
+	INP_WLOCK(inp);							\
+	if (val)							\
+		inp->inp_flags2 |= bit;					\
+	else								\
+		inp->inp_flags2 &= ~bit;				\
+	INP_WUNLOCK(inp);						\
+} while (0)
+
 			case IP_RECVOPTS:
 				OPTSET(INP_RECVOPTS);
 				break;
@@ -1061,9 +1091,24 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 			case IP_RECVTOS:
 				OPTSET(INP_RECVTOS);
 				break;
+			case IP_BINDMULTI:
+				OPTSET2(INP_BINDMULTI, optval);
+				break;
+#ifdef	RSS
+			case IP_RSS_LISTEN_BUCKET:
+				if ((optval >= 0) &&
+				    (optval < rss_getnumbuckets())) {
+					inp->inp_rss_listen_bucket = optval;
+					OPTSET2(INP_RSS_BUCKET_SET, 1);
+				} else {
+					error = EINVAL;
+				}
+				break;
+#endif
 			}
 			break;
 #undef OPTSET
+#undef OPTSET2
 
 		/*
 		 * Multicast socket options are processed by the in_mcast
@@ -1171,10 +1216,11 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 		case IP_DONTFRAG:
 		case IP_BINDANY:
 		case IP_RECVTOS:
+		case IP_BINDMULTI:
 		case IP_FLOWID:
 		case IP_FLOWTYPE:
 #ifdef	RSS
-		case IP_RSSCPUID:
+		case IP_RSSBUCKETID:
 #endif
 			switch (sopt->sopt_name) {
 
@@ -1191,6 +1237,7 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 				break;
 
 #define	OPTBIT(bit)	(inp->inp_flags & bit ? 1 : 0)
+#define	OPTBIT2(bit)	(inp->inp_flags2 & bit ? 1 : 0)
 
 			case IP_RECVOPTS:
 				optval = OPTBIT(INP_RECVOPTS);
@@ -1244,11 +1291,19 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 				optval = inp->inp_flowtype;
 				break;
 #ifdef	RSS
-			case IP_RSSCPUID:
-				optval = rss_hash2cpuid(inp->inp_flowid,
-				    inp->inp_flowtype);
+			case IP_RSSBUCKETID:
+				retval = rss_hash2bucket(inp->inp_flowid,
+				    inp->inp_flowtype,
+				    &rss_bucket);
+				if (retval == 0)
+					optval = rss_bucket;
+				else
+					error = EINVAL;
 				break;
 #endif
+			case IP_BINDMULTI:
+				optval = OPTBIT2(INP_BINDMULTI);
+				break;
 			}
 			error = sooptcopyout(sopt, &optval, sizeof optval);
 			break;
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index b2251acfd0b8..4b4b135217f1 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -234,15 +234,15 @@ void	rip_init(void);
 #ifdef VIMAGE
 void	rip_destroy(void);
 #endif
-void	rip_input(struct mbuf *, int);
+int	rip_input(struct mbuf **, int *, int);
 int	rip_output(struct mbuf *, struct socket *, u_long);
-void	ipip_input(struct mbuf *, int);
-void	rsvp_input(struct mbuf *, int);
+int	ipip_input(struct mbuf **, int *, int);
+int	rsvp_input(struct mbuf **, int *, int);
 int	ip_rsvp_init(struct socket *);
 int	ip_rsvp_done(void);
 extern int	(*ip_rsvp_vif)(struct socket *, struct sockopt *);
 extern void	(*ip_rsvp_force_done)(struct socket *);
-extern void	(*rsvp_input_p)(struct mbuf *m, int off);
+extern int	(*rsvp_input_p)(struct mbuf **, int *, int);
 
 VNET_DECLARE(struct pfil_head, inet_pfil_hook);	/* packet filter hooks */
 #define	V_inet_pfil_hook	VNET(inet_pfil_hook)
diff --git a/sys/netinet/pim_var.h b/sys/netinet/pim_var.h
index d7c4493dad3f..ae876c948fc7 100644
--- a/sys/netinet/pim_var.h
+++ b/sys/netinet/pim_var.h
@@ -72,7 +72,7 @@ struct pimstat {
 
 #ifdef _KERNEL
 
-void pim_input(struct mbuf *, int);
+int pim_input(struct mbuf **, int *, int);
 SYSCTL_DECL(_net_inet_pim);
 #endif
 
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 83c8f480f189..1c90d0c1dedb 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -124,7 +124,7 @@ int (*mrt_ioctl)(u_long, caddr_t, int);
 int (*legal_vif_num)(int);
 u_long (*ip_mcast_src)(int);
 
-void (*rsvp_input_p)(struct mbuf *m, int off);
+int (*rsvp_input_p)(struct mbuf **, int *, int);
 int (*ip_rsvp_vif)(struct socket *, struct sockopt *);
 void (*ip_rsvp_force_done)(struct socket *);
 #endif /* INET */
@@ -270,16 +270,18 @@ rip_append(struct inpcb *last, struct ip *ip, struct mbuf *n,
  * Setup generic address and protocol structures for raw_input routine, then
  * pass them along with mbuf chain.
  */
-void
-rip_input(struct mbuf *m, int off)
+int
+rip_input(struct mbuf **mp, int *offp, int proto)
 {
 	struct ifnet *ifp;
+	struct mbuf *m = *mp;
 	struct ip *ip = mtod(m, struct ip *);
-	int proto = ip->ip_p;
 	struct inpcb *inp, *last;
 	struct sockaddr_in ripsrc;
 	int hash;
 
+	*mp = NULL;
+
 	bzero(&ripsrc, sizeof(ripsrc));
 	ripsrc.sin_len = sizeof(ripsrc);
 	ripsrc.sin_family = AF_INET;
@@ -416,6 +418,7 @@ rip_input(struct mbuf *m, int off)
 		IPSTAT_INC(ips_noproto);
 		IPSTAT_DEC(ips_delivered);
 	}
+	return (IPPROTO_DONE);
 }
 
 /*
diff --git a/sys/netinet/sctp.h b/sys/netinet/sctp.h
index 4c5c03dcb433..c2497a7d40b4 100644
--- a/sys/netinet/sctp.h
+++ b/sys/netinet/sctp.h
@@ -121,6 +121,13 @@ struct sctp_paramhdr {
 #define SCTP_DEFAULT_PRINFO             0x00000022
 #define SCTP_PEER_ADDR_THLDS            0x00000023
 #define SCTP_REMOTE_UDP_ENCAPS_PORT     0x00000024
+#define SCTP_ECN_SUPPORTED              0x00000025
+#define SCTP_PR_SUPPORTED               0x00000026
+#define SCTP_AUTH_SUPPORTED             0x00000027
+#define SCTP_ASCONF_SUPPORTED           0x00000028
+#define SCTP_RECONFIG_SUPPORTED         0x00000029
+#define SCTP_NRSACK_SUPPORTED           0x00000030
+#define SCTP_PKTDROP_SUPPORTED          0x00000031
 
 /*
  * read-only options
diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c
index a2daf1800d2f..127710171c38 100644
--- a/sys/netinet/sctp_asconf.c
+++ b/sys/netinet/sctp_asconf.c
@@ -724,13 +724,11 @@ sctp_handle_asconf(struct mbuf *m, unsigned int offset,
 		}
 		switch (param_type) {
 		case SCTP_ADD_IP_ADDRESS:
-			asoc->peer_supports_asconf = 1;
 			m_result = sctp_process_asconf_add_ip(src, aph, stcb,
 			    (cnt < SCTP_BASE_SYSCTL(sctp_hb_maxburst)), error);
 			cnt++;
 			break;
 		case SCTP_DEL_IP_ADDRESS:
-			asoc->peer_supports_asconf = 1;
 			m_result = sctp_process_asconf_delete_ip(src, aph, stcb,
 			    error);
 			break;
@@ -738,7 +736,6 @@ sctp_handle_asconf(struct mbuf *m, unsigned int offset,
 			/* not valid in an ASCONF chunk */
 			break;
 		case SCTP_SET_PRIM_ADDR:
-			asoc->peer_supports_asconf = 1;
 			m_result = sctp_process_asconf_set_primary(src, aph,
 			    stcb, error);
 			break;
@@ -930,8 +927,6 @@ sctp_addr_match(struct sctp_paramhdr *ph, struct sockaddr *sa)
 void
 sctp_asconf_cleanup(struct sctp_tcb *stcb, struct sctp_nets *net)
 {
-	/* mark peer as ASCONF incapable */
-	stcb->asoc.peer_supports_asconf = 0;
 	/*
 	 * clear out any existing asconfs going out
 	 */
@@ -1340,7 +1335,7 @@ sctp_asconf_queue_add(struct sctp_tcb *stcb, struct sctp_ifa *ifa,
 	int pending_delete_queued = 0;
 
 	/* see if peer supports ASCONF */
-	if (stcb->asoc.peer_supports_asconf == 0) {
+	if (stcb->asoc.asconf_supported == 0) {
 		return (-1);
 	}
 	/*
@@ -1430,7 +1425,7 @@ sctp_asconf_queue_sa_delete(struct sctp_tcb *stcb, struct sockaddr *sa)
 		return (-1);
 	}
 	/* see if peer supports ASCONF */
-	if (stcb->asoc.peer_supports_asconf == 0) {
+	if (stcb->asoc.asconf_supported == 0) {
 		return (-1);
 	}
 	/* make sure the request isn't already in the queue */
@@ -1550,7 +1545,7 @@ sctp_asconf_find_param(struct sctp_tcb *stcb, uint32_t correlation_id)
  * notifications based on the error response
  */
 static void
-sctp_asconf_process_error(struct sctp_tcb *stcb,
+sctp_asconf_process_error(struct sctp_tcb *stcb SCTP_UNUSED,
     struct sctp_asconf_paramhdr *aph)
 {
 	struct sctp_error_cause *eh;
@@ -1588,10 +1583,7 @@ sctp_asconf_process_error(struct sctp_tcb *stcb,
 		switch (param_type) {
 		case SCTP_ADD_IP_ADDRESS:
 		case SCTP_DEL_IP_ADDRESS:
-			stcb->asoc.peer_supports_asconf = 0;
-			break;
 		case SCTP_SET_PRIM_ADDR:
-			stcb->asoc.peer_supports_asconf = 0;
 			break;
 		default:
 			break;
@@ -1627,8 +1619,6 @@ sctp_asconf_process_param_ack(struct sctp_tcb *stcb,
 		SCTPDBG(SCTP_DEBUG_ASCONF1,
 		    "process_param_ack: set primary IP address\n");
 		/* nothing to do... peer may start using this addr */
-		if (flag == 0)
-			stcb->asoc.peer_supports_asconf = 0;
 		break;
 	default:
 		/* should NEVER happen */
@@ -1646,11 +1636,11 @@ sctp_asconf_process_param_ack(struct sctp_tcb *stcb,
  * cleanup from a bad asconf ack parameter
  */
 static void
-sctp_asconf_ack_clear(struct sctp_tcb *stcb)
+sctp_asconf_ack_clear(struct sctp_tcb *stcb SCTP_UNUSED)
 {
 	/* assume peer doesn't really know how to do asconfs */
-	stcb->asoc.peer_supports_asconf = 0;
 	/* XXX we could free the pending queue here */
+
 }
 
 void
@@ -1889,14 +1879,22 @@ sctp_addr_mgmt_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 	 * this is boundall or subset bound w/ASCONF allowed
 	 */
 
-	/* first, make sure it's a good address family */
+	/* first, make sure that the address is IPv4 or IPv6 and not jailed */
 	switch (ifa->address.sa.sa_family) {
 #ifdef INET6
 	case AF_INET6:
+		if (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+		    &ifa->address.sin6.sin6_addr) != 0) {
+			return;
+		}
 		break;
 #endif
 #ifdef INET
 	case AF_INET:
+		if (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+		    &ifa->address.sin.sin_addr) != 0) {
+			return;
+		}
 		break;
 #endif
 	default:
@@ -1980,7 +1978,7 @@ sctp_addr_mgmt_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 	/* queue an asconf for this address add/delete */
 	if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_DO_ASCONF)) {
 		/* does the peer do asconf? */
-		if (stcb->asoc.peer_supports_asconf) {
+		if (stcb->asoc.asconf_supported) {
 			/* queue an asconf for this addr */
 			status = sctp_asconf_queue_add(stcb, ifa, type);
 
@@ -2122,6 +2120,10 @@ sctp_asconf_iterator_stcb(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 					/* we skip unspecifed addresses */
 					continue;
 				}
+				if (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+				    &sin6->sin6_addr) != 0) {
+					continue;
+				}
 				if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
 					if (stcb->asoc.scope.local_scope == 0) {
 						continue;
@@ -2152,6 +2154,10 @@ sctp_asconf_iterator_stcb(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 					/* we skip unspecifed addresses */
 					continue;
 				}
+				if (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+				    &sin->sin_addr) != 0) {
+					continue;
+				}
 				if (stcb->asoc.scope.ipv4_local_scope == 0 &&
 				    IN4_ISPRIVATE_ADDRESS(&sin->sin_addr)) {
 					continue;
@@ -2222,7 +2228,7 @@ sctp_asconf_iterator_stcb(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 		}
 		/* queue an asconf for this address add/delete */
 		if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_DO_ASCONF) &&
-		    stcb->asoc.peer_supports_asconf) {
+		    stcb->asoc.asconf_supported == 1) {
 			/* queue an asconf for this addr */
 			status = sctp_asconf_queue_add(stcb, ifa, type);
 			/*
@@ -2465,6 +2471,10 @@ sctp_find_valid_localaddr(struct sctp_tcb *stcb, int addr_locked)
 						/* skip unspecifed addresses */
 						continue;
 					}
+					if (prison_check_ip4(stcb->sctp_ep->ip_inp.inp.inp_cred,
+					    &sin->sin_addr) != 0) {
+						continue;
+					}
 					if (stcb->asoc.scope.ipv4_local_scope == 0 &&
 					    IN4_ISPRIVATE_ADDRESS(&sin->sin_addr))
 						continue;
@@ -2498,6 +2508,10 @@ sctp_find_valid_localaddr(struct sctp_tcb *stcb, int addr_locked)
 						 */
 						continue;
 					}
+					if (prison_check_ip6(stcb->sctp_ep->ip_inp.inp.inp_cred,
+					    &sin6->sin6_addr) != 0) {
+						continue;
+					}
 					if (stcb->asoc.scope.local_scope == 0 &&
 					    IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr))
 						continue;
@@ -2862,7 +2876,7 @@ sctp_process_initack_addresses(struct sctp_tcb *stcb, struct mbuf *m,
 			/* are ASCONFs allowed ? */
 			if ((sctp_is_feature_on(stcb->sctp_ep,
 			    SCTP_PCB_FLAGS_DO_ASCONF)) &&
-			    stcb->asoc.peer_supports_asconf) {
+			    stcb->asoc.asconf_supported) {
 				/* queue an ASCONF DEL_IP_ADDRESS */
 				status = sctp_asconf_queue_sa_delete(stcb, sa);
 				/*
@@ -3112,6 +3126,10 @@ sctp_check_address_list_all(struct sctp_tcb *stcb, struct mbuf *m, int offset,
 #ifdef INET
 			case AF_INET:
 				sin = (struct sockaddr_in *)&sctp_ifa->address.sin;
+				if (prison_check_ip4(stcb->sctp_ep->ip_inp.inp.inp_cred,
+				    &sin->sin_addr) != 0) {
+					continue;
+				}
 				if ((ipv4_scope == 0) &&
 				    (IN4_ISPRIVATE_ADDRESS(&sin->sin_addr))) {
 					/* private address not in scope */
@@ -3122,6 +3140,10 @@ sctp_check_address_list_all(struct sctp_tcb *stcb, struct mbuf *m, int offset,
 #ifdef INET6
 			case AF_INET6:
 				sin6 = (struct sockaddr_in6 *)&sctp_ifa->address.sin6;
+				if (prison_check_ip6(stcb->sctp_ep->ip_inp.inp.inp_cred,
+				    &sin6->sin6_addr) != 0) {
+					continue;
+				}
 				if ((local_scope == 0) &&
 				    (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr))) {
 					continue;
@@ -3407,6 +3429,10 @@ sctp_asconf_send_nat_state_update(struct sctp_tcb *stcb,
 #ifdef INET
 				case AF_INET:
 					to = &sctp_ifap->address.sin;
+					if (prison_check_ip4(stcb->sctp_ep->ip_inp.inp.inp_cred,
+					    &to->sin_addr) != 0) {
+						continue;
+					}
 					if (IN4_ISPRIVATE_ADDRESS(&to->sin_addr)) {
 						continue;
 					}
@@ -3418,6 +3444,10 @@ sctp_asconf_send_nat_state_update(struct sctp_tcb *stcb,
 #ifdef INET6
 				case AF_INET6:
 					to6 = &sctp_ifap->address.sin6;
+					if (prison_check_ip6(stcb->sctp_ep->ip_inp.inp.inp_cred,
+					    &to6->sin6_addr) != 0) {
+						continue;
+					}
 					if (IN6_IS_ADDR_LOOPBACK(&to6->sin6_addr)) {
 						continue;
 					}
diff --git a/sys/netinet/sctp_auth.c b/sys/netinet/sctp_auth.c
index 08b6a4927c13..1f301030b2d4 100644
--- a/sys/netinet/sctp_auth.c
+++ b/sys/netinet/sctp_auth.c
@@ -133,11 +133,6 @@ sctp_auth_delete_chunk(uint8_t chunk, sctp_auth_chklist_t * list)
 	if (list == NULL)
 		return (-1);
 
-	/* is chunk restricted? */
-	if ((chunk == SCTP_ASCONF) ||
-	    (chunk == SCTP_ASCONF_ACK)) {
-		return (-1);
-	}
 	if (list->chunks[chunk] == 1) {
 		list->chunks[chunk] = 0;
 		list->num_chunks--;
@@ -157,16 +152,6 @@ sctp_auth_get_chklist_size(const sctp_auth_chklist_t * list)
 		return (list->num_chunks);
 }
 
-/*
- * set the default list of chunks requiring AUTH
- */
-void
-sctp_auth_set_default_chunks(sctp_auth_chklist_t * list)
-{
-	(void)sctp_auth_add_chunk(SCTP_ASCONF, list);
-	(void)sctp_auth_add_chunk(SCTP_ASCONF_ACK, list);
-}
-
 /*
  * return the current number and list of required chunks caller must
  * guarantee ptr has space for up to 256 bytes
@@ -1790,6 +1775,7 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication,
 
 	SCTP_BUF_LEN(m_notify) = 0;
 	auth = mtod(m_notify, struct sctp_authkey_event *);
+	memset(auth, 0, sizeof(struct sctp_authkey_event));
 	auth->auth_type = SCTP_AUTHENTICATION_EVENT;
 	auth->auth_flags = 0;
 	auth->auth_length = sizeof(*auth);
@@ -1948,8 +1934,7 @@ sctp_validate_init_auth_params(struct mbuf *m, int offset, int limit)
 		    "SCTP: peer sent chunk list w/o AUTH\n");
 		return (-1);
 	}
-	if (!SCTP_BASE_SYSCTL(sctp_asconf_auth_nochk) && peer_supports_asconf &&
-	    !peer_supports_auth) {
+	if (peer_supports_asconf && !peer_supports_auth) {
 		SCTPDBG(SCTP_DEBUG_AUTH1,
 		    "SCTP: peer supports ASCONF but not AUTH\n");
 		return (-1);
diff --git a/sys/netinet/sctp_auth.h b/sys/netinet/sctp_auth.h
index 535c0fc0de12..423a5cc50538 100644
--- a/sys/netinet/sctp_auth.h
+++ b/sys/netinet/sctp_auth.h
@@ -112,7 +112,6 @@ extern sctp_auth_chklist_t *sctp_copy_chunklist(sctp_auth_chklist_t * chklist);
 extern int sctp_auth_add_chunk(uint8_t chunk, sctp_auth_chklist_t * list);
 extern int sctp_auth_delete_chunk(uint8_t chunk, sctp_auth_chklist_t * list);
 extern size_t sctp_auth_get_chklist_size(const sctp_auth_chklist_t * list);
-extern void sctp_auth_set_default_chunks(sctp_auth_chklist_t * list);
 extern int 
 sctp_serialize_auth_chunks(const sctp_auth_chklist_t * list,
     uint8_t * ptr);
diff --git a/sys/netinet/sctp_header.h b/sys/netinet/sctp_header.h
index 8f898a4b58ad..9e03d787d5d5 100644
--- a/sys/netinet/sctp_header.h
+++ b/sys/netinet/sctp_header.h
@@ -82,12 +82,6 @@ struct sctp_supported_addr_param {
 	uint16_t addr_type[2];	/* array of supported address types */
 }                         SCTP_PACKED;
 
-/* ECN parameter */
-struct sctp_ecn_supported_param {
-	struct sctp_paramhdr ph;/* type=SCTP_ECN_CAPABLE */
-}                        SCTP_PACKED;
-
-
 /* heartbeat info parameter */
 struct sctp_heartbeat_info_param {
 	struct sctp_paramhdr ph;
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index 52ba8654903a..2065bb4fdae4 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -250,6 +250,11 @@ sctp_build_ctl_nchunk(struct sctp_inpcb *inp, struct sctp_sndrcvinfo *sinfo)
 
 	/* We need a CMSG header followed by the struct */
 	cmh = mtod(ret, struct cmsghdr *);
+	/*
+	 * Make sure that there is no un-initialized padding between the
+	 * cmsg header and cmsg data and after the cmsg data.
+	 */
+	memset(cmh, 0, len);
 	if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_RECVRCVINFO)) {
 		cmh->cmsg_level = IPPROTO_SCTP;
 		cmh->cmsg_len = CMSG_LEN(sizeof(struct sctp_rcvinfo));
@@ -2500,7 +2505,7 @@ sctp_process_data(struct mbuf **mm, int iphlen, int *offset, int length,
 						SCTP_BUF_LEN(merr) = sizeof(*phd);
 						SCTP_BUF_NEXT(merr) = SCTP_M_COPYM(m, *offset, chk_length, M_NOWAIT);
 						if (SCTP_BUF_NEXT(merr)) {
-							if (sctp_pad_lastmbuf(SCTP_BUF_NEXT(merr), SCTP_SIZE32(chk_length) - chk_length, NULL)) {
+							if (sctp_pad_lastmbuf(SCTP_BUF_NEXT(merr), SCTP_SIZE32(chk_length) - chk_length, NULL) == NULL) {
 								sctp_m_freem(merr);
 							} else {
 								sctp_queue_op_err(stcb, merr);
@@ -2955,7 +2960,7 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc,
 				num_dests_sacked++;
 		}
 	}
-	if (stcb->asoc.peer_supports_prsctp) {
+	if (stcb->asoc.prsctp_supported) {
 		(void)SCTP_GETTIME_TIMEVAL(&now);
 	}
 	TAILQ_FOREACH(tp1, &asoc->sent_queue, sctp_next) {
@@ -2976,7 +2981,7 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc,
 			/* done */
 			break;
 		}
-		if (stcb->asoc.peer_supports_prsctp) {
+		if (stcb->asoc.prsctp_supported) {
 			if ((PR_SCTP_TTL_ENABLED(tp1->flags)) && tp1->sent < SCTP_DATAGRAM_ACKED) {
 				/* Is it expired? */
 				if (timevalcmp(&now, &tp1->rec.data.timetodrop, >)) {
@@ -3230,7 +3235,7 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc,
 			/* remove from the total flight */
 			sctp_total_flight_decrease(stcb, tp1);
 
-			if ((stcb->asoc.peer_supports_prsctp) &&
+			if ((stcb->asoc.prsctp_supported) &&
 			    (PR_SCTP_RTX_ENABLED(tp1->flags))) {
 				/*
 				 * Has it been retransmitted tv_sec times? -
@@ -3375,7 +3380,7 @@ sctp_try_advance_peer_ack_point(struct sctp_tcb *stcb,
 	struct timeval now;
 	int now_filled = 0;
 
-	if (asoc->peer_supports_prsctp == 0) {
+	if (asoc->prsctp_supported == 0) {
 		return (NULL);
 	}
 	TAILQ_FOREACH_SAFE(tp1, &asoc->sent_queue, sctp_next, tp2) {
@@ -4037,7 +4042,7 @@ sctp_express_handle_sack(struct sctp_tcb *stcb, uint32_t cumack,
 		asoc->advanced_peer_ack_point = cumack;
 	}
 	/* PR-Sctp issues need to be addressed too */
-	if ((asoc->peer_supports_prsctp) && (asoc->pr_sctp_cnt > 0)) {
+	if ((asoc->prsctp_supported) && (asoc->pr_sctp_cnt > 0)) {
 		struct sctp_tmit_chunk *lchk;
 		uint32_t old_adv_peer_ack_point;
 
@@ -4474,7 +4479,7 @@ sctp_handle_sack(struct mbuf *m, int offset_seg, int offset_dup,
 			sctp_free_bufspace(stcb, asoc, tp1, 1);
 			sctp_m_freem(tp1->data);
 			tp1->data = NULL;
-			if (asoc->peer_supports_prsctp && PR_SCTP_BUF_ENABLED(tp1->flags)) {
+			if (asoc->prsctp_supported && PR_SCTP_BUF_ENABLED(tp1->flags)) {
 				asoc->sent_queue_cnt_removeable--;
 			}
 		}
@@ -4886,7 +4891,7 @@ sctp_handle_sack(struct mbuf *m, int offset_seg, int offset_dup,
 		asoc->advanced_peer_ack_point = cum_ack;
 	}
 	/* C2. try to further move advancedPeerAckPoint ahead */
-	if ((asoc->peer_supports_prsctp) && (asoc->pr_sctp_cnt > 0)) {
+	if ((asoc->prsctp_supported) && (asoc->pr_sctp_cnt > 0)) {
 		struct sctp_tmit_chunk *lchk;
 		uint32_t old_adv_peer_ack_point;
 
diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index 2be2b8781813..3af6710740d4 100644
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -47,7 +47,9 @@ __FBSDID("$FreeBSD$");
 #include <netinet/sctp_bsd_addr.h>
 #include <netinet/sctp_timer.h>
 #include <netinet/sctp_crc32.h>
+#if defined(INET) || defined(INET6)
 #include <netinet/udp.h>
+#endif
 #include <sys/smp.h>
 
 
@@ -478,7 +480,7 @@ sctp_process_init_ack(struct mbuf *m, int iphlen, int offset,
 		return (-1);
 	}
 	/* if the peer doesn't support asconf, flush the asconf queue */
-	if (asoc->peer_supports_asconf == 0) {
+	if (asoc->asconf_supported == 0) {
 		struct sctp_asconf_addr *param, *nparam;
 
 		TAILQ_FOREACH_SAFE(param, &asoc->asconf_queue, next, nparam) {
@@ -754,7 +756,7 @@ sctp_handle_nat_missing_state(struct sctp_tcb *stcb,
 	 * return 0 means we want you to proceed with the abort non-zero
 	 * means no abort processing
 	 */
-	if (stcb->asoc.peer_supports_auth == 0) {
+	if (stcb->asoc.auth_supported == 0) {
 		SCTPDBG(SCTP_DEBUG_INPUT2, "sctp_handle_nat_missing_state: Peer does not support AUTH, cannot send an asconf\n");
 		return (0);
 	}
@@ -1080,7 +1082,7 @@ sctp_process_unrecog_chunk(struct sctp_tcb *stcb, struct sctp_paramhdr *phdr,
 		sctp_asconf_cleanup(stcb, net);
 		break;
 	case SCTP_FORWARD_CUM_TSN:
-		stcb->asoc.peer_supports_prsctp = 0;
+		stcb->asoc.prsctp_supported = 0;
 		break;
 	default:
 		SCTPDBG(SCTP_DEBUG_INPUT2,
@@ -1094,6 +1096,7 @@ sctp_process_unrecog_chunk(struct sctp_tcb *stcb, struct sctp_paramhdr *phdr,
  * Skip past the param header and then we will find the param that caused the
  * problem.  There are a number of param's in a ASCONF OR the prsctp param
  * these will turn of specific features.
+ * XXX: Is this the right thing to do?
  */
 static void
 sctp_process_unrecog_param(struct sctp_tcb *stcb, struct sctp_paramhdr *phdr)
@@ -1104,7 +1107,7 @@ sctp_process_unrecog_param(struct sctp_tcb *stcb, struct sctp_paramhdr *phdr)
 	switch (ntohs(pbad->param_type)) {
 		/* pr-sctp draft */
 	case SCTP_PRSCTP_SUPPORTED:
-		stcb->asoc.peer_supports_prsctp = 0;
+		stcb->asoc.prsctp_supported = 0;
 		break;
 	case SCTP_SUPPORTED_CHUNK_EXT:
 		break;
@@ -1115,14 +1118,14 @@ sctp_process_unrecog_param(struct sctp_tcb *stcb, struct sctp_paramhdr *phdr)
 	case SCTP_ADD_IP_ADDRESS:
 	case SCTP_DEL_IP_ADDRESS:
 	case SCTP_SET_PRIM_ADDR:
-		stcb->asoc.peer_supports_asconf = 0;
+		stcb->asoc.asconf_supported = 0;
 		break;
 	case SCTP_SUCCESS_REPORT:
 	case SCTP_ERROR_CAUSE_IND:
 		SCTPDBG(SCTP_DEBUG_INPUT2, "Huh, the peer does not support success? or error cause?\n");
 		SCTPDBG(SCTP_DEBUG_INPUT2,
 		    "Turning off ASCONF to this strange peer\n");
-		stcb->asoc.peer_supports_asconf = 0;
+		stcb->asoc.asconf_supported = 0;
 		break;
 	default:
 		SCTPDBG(SCTP_DEBUG_INPUT2,
@@ -2783,7 +2786,13 @@ sctp_handle_cookie_echo(struct mbuf *m, int iphlen, int offset,
 			inp->sctp_socket = so;
 			inp->sctp_frag_point = (*inp_p)->sctp_frag_point;
 			inp->sctp_cmt_on_off = (*inp_p)->sctp_cmt_on_off;
-			inp->sctp_ecn_enable = (*inp_p)->sctp_ecn_enable;
+			inp->ecn_supported = (*inp_p)->ecn_supported;
+			inp->prsctp_supported = (*inp_p)->prsctp_supported;
+			inp->auth_supported = (*inp_p)->auth_supported;
+			inp->asconf_supported = (*inp_p)->asconf_supported;
+			inp->reconfig_supported = (*inp_p)->reconfig_supported;
+			inp->nrsack_supported = (*inp_p)->nrsack_supported;
+			inp->pktdrop_supported = (*inp_p)->pktdrop_supported;
 			inp->partial_delivery_point = (*inp_p)->partial_delivery_point;
 			inp->sctp_context = (*inp_p)->sctp_context;
 			inp->local_strreset_support = (*inp_p)->local_strreset_support;
@@ -2960,7 +2969,7 @@ sctp_handle_cookie_ack(struct sctp_cookie_ack_chunk *cp SCTP_UNUSED,
 		 * in flight)
 		 */
 		if ((sctp_is_feature_on(stcb->sctp_ep, SCTP_PCB_FLAGS_DO_ASCONF)) &&
-		    (stcb->asoc.peer_supports_asconf) &&
+		    (stcb->asoc.asconf_supported == 1) &&
 		    (!TAILQ_EMPTY(&stcb->asoc.asconf_queue))) {
 #ifdef SCTP_TIMER_BASED_ASCONF
 			sctp_timer_start(SCTP_TIMER_TYPE_ASCONF,
@@ -4433,7 +4442,7 @@ __attribute__((noinline))
 		 */
 		if ((ch->chunk_type == SCTP_AUTHENTICATION) &&
 		    (stcb == NULL) &&
-		    !SCTP_BASE_SYSCTL(sctp_auth_disable)) {
+		    (inp->auth_supported == 1)) {
 			/* save this chunk for later processing */
 			auth_skipped = 1;
 			auth_offset = *offset;
@@ -4700,7 +4709,7 @@ __attribute__((noinline))
 
 		/* check to see if this chunk required auth, but isn't */
 		if ((stcb != NULL) &&
-		    !SCTP_BASE_SYSCTL(sctp_auth_disable) &&
+		    (stcb->asoc.auth_supported == 1) &&
 		    sctp_auth_is_required_chunk(ch->chunk_type, stcb->asoc.local_auth_chunks) &&
 		    !stcb->asoc.authenticated) {
 			/* "silently" ignore */
@@ -4908,8 +4917,7 @@ __attribute__((noinline))
 					SCTPDBG(SCTP_DEBUG_INDATA1, "No stcb when processing NR-SACK chunk\n");
 					break;
 				}
-				if ((stcb->asoc.sctp_nr_sack_on_off == 0) ||
-				    (stcb->asoc.peer_supports_nr_sack == 0)) {
+				if (stcb->asoc.nrsack_supported == 0) {
 					goto unknown_chunk;
 				}
 				if (chk_length < sizeof(struct sctp_nr_sack_chunk)) {
@@ -5220,6 +5228,9 @@ __attribute__((noinline))
 				return (NULL);
 			}
 			if (stcb) {
+				if (stcb->asoc.ecn_supported == 0) {
+					goto unknown_chunk;
+				}
 				if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
 					sctp_misc_ints(SCTP_THRESHOLD_CLEAR,
 					    stcb->asoc.overall_error_count,
@@ -5245,6 +5256,9 @@ __attribute__((noinline))
 				return (NULL);
 			}
 			if (stcb) {
+				if (stcb->asoc.ecn_supported == 0) {
+					goto unknown_chunk;
+				}
 				if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
 					sctp_misc_ints(SCTP_THRESHOLD_CLEAR,
 					    stcb->asoc.overall_error_count,
@@ -5278,6 +5292,9 @@ __attribute__((noinline))
 			SCTPDBG(SCTP_DEBUG_INPUT3, "SCTP_ASCONF\n");
 			/* He's alive so give him credit */
 			if (stcb) {
+				if (stcb->asoc.asconf_supported == 0) {
+					goto unknown_chunk;
+				}
 				if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
 					sctp_misc_ints(SCTP_THRESHOLD_CLEAR,
 					    stcb->asoc.overall_error_count,
@@ -5302,6 +5319,9 @@ __attribute__((noinline))
 				return (NULL);
 			}
 			if ((stcb) && netp && *netp) {
+				if (stcb->asoc.asconf_supported == 0) {
+					goto unknown_chunk;
+				}
 				/* He's alive so give him credit */
 				if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
 					sctp_misc_ints(SCTP_THRESHOLD_CLEAR,
@@ -5331,6 +5351,9 @@ __attribute__((noinline))
 			if (stcb) {
 				int abort_flag = 0;
 
+				if (stcb->asoc.prsctp_supported == 0) {
+					goto unknown_chunk;
+				}
 				stcb->asoc.overall_error_count = 0;
 				if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_THRESHOLD_LOGGING) {
 					sctp_misc_ints(SCTP_THRESHOLD_CLEAR,
@@ -5385,13 +5408,8 @@ __attribute__((noinline))
 				*offset = length;
 				return (NULL);
 			}
-			if (stcb->asoc.peer_supports_strreset == 0) {
-				/*
-				 * hmm, peer should have announced this, but
-				 * we will turn it on since he is sending us
-				 * a stream reset.
-				 */
-				stcb->asoc.peer_supports_strreset = 1;
+			if (stcb->asoc.reconfig_supported == 0) {
+				goto unknown_chunk;
 			}
 			if (sctp_handle_stream_reset(stcb, m, *offset, ch)) {
 				/* stop processing */
@@ -5411,18 +5429,17 @@ __attribute__((noinline))
 				return (NULL);
 			}
 			if (ch && (stcb) && netp && (*netp)) {
+				if (stcb->asoc.pktdrop_supported == 0) {
+					goto unknown_chunk;
+				}
 				sctp_handle_packet_dropped((struct sctp_pktdrop_chunk *)ch,
 				    stcb, *netp,
 				    min(chk_length, (sizeof(chunk_buf) - 4)));
 
 			}
 			break;
-
 		case SCTP_AUTHENTICATION:
 			SCTPDBG(SCTP_DEBUG_INPUT3, "SCTP_AUTHENTICATION\n");
-			if (SCTP_BASE_SYSCTL(sctp_auth_disable))
-				goto unknown_chunk;
-
 			if (stcb == NULL) {
 				/* save the first AUTH for later processing */
 				if (auth_skipped == 0) {
@@ -5433,6 +5450,9 @@ __attribute__((noinline))
 				/* skip this chunk (temporarily) */
 				goto next_chunk;
 			}
+			if (stcb->asoc.auth_supported == 0) {
+				goto unknown_chunk;
+			}
 			if ((chk_length < (sizeof(struct sctp_auth_chunk))) ||
 			    (chk_length > (sizeof(struct sctp_auth_chunk) +
 			    SCTP_AUTH_DIGEST_LEN_MAX))) {
@@ -5482,7 +5502,7 @@ __attribute__((noinline))
 					SCTP_BUF_LEN(mm) = sizeof(*phd);
 					SCTP_BUF_NEXT(mm) = SCTP_M_COPYM(m, *offset, chk_length, M_NOWAIT);
 					if (SCTP_BUF_NEXT(mm)) {
-						if (sctp_pad_lastmbuf(SCTP_BUF_NEXT(mm), SCTP_SIZE32(chk_length) - chk_length, NULL)) {
+						if (sctp_pad_lastmbuf(SCTP_BUF_NEXT(mm), SCTP_SIZE32(chk_length) - chk_length, NULL) == NULL) {
 							sctp_m_freem(mm);
 						} else {
 #ifdef SCTP_MBUF_LOGGING
@@ -5603,12 +5623,14 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt
 			    calc_check, check, (void *)m, length, iphlen);
 			stcb = sctp_findassociation_addr(m, offset, src, dst,
 			    sh, ch, &inp, &net, vrf_id);
+#if defined(INET) || defined(INET6)
 			if ((net != NULL) && (port != 0)) {
 				if (net->port == 0) {
 					sctp_pathmtu_adjustment(stcb, net->mtu - sizeof(struct udphdr));
 				}
 				net->port = port;
 			}
+#endif
 			if ((net != NULL) && (use_mflowid != 0)) {
 				net->flowid = mflowid;
 #ifdef INVARIANTS
@@ -5634,12 +5656,14 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt
 	}
 	stcb = sctp_findassociation_addr(m, offset, src, dst,
 	    sh, ch, &inp, &net, vrf_id);
+#if defined(INET) || defined(INET6)
 	if ((net != NULL) && (port != 0)) {
 		if (net->port == 0) {
 			sctp_pathmtu_adjustment(stcb, net->mtu - sizeof(struct udphdr));
 		}
 		net->port = port;
 	}
+#endif
 	if ((net != NULL) && (use_mflowid != 0)) {
 		net->flowid = mflowid;
 #ifdef INVARIANTS
@@ -5748,12 +5772,14 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt
 			 * it changes our INP.
 			 */
 			inp = stcb->sctp_ep;
+#if defined(INET) || defined(INET6)
 			if ((net) && (port)) {
 				if (net->port == 0) {
 					sctp_pathmtu_adjustment(stcb, net->mtu - sizeof(struct udphdr));
 				}
 				net->port = port;
 			}
+#endif
 		}
 	} else {
 		/*
@@ -5767,7 +5793,7 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt
 		 * chunks
 		 */
 		if ((stcb != NULL) &&
-		    !SCTP_BASE_SYSCTL(sctp_auth_disable) &&
+		    (stcb->asoc.auth_supported == 1) &&
 		    sctp_auth_is_required_chunk(SCTP_DATA, stcb->asoc.local_auth_chunks)) {
 			/* "silently" ignore */
 			SCTP_STAT_INCR(sctps_recvauthmissing);
@@ -5809,7 +5835,7 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt
 	 */
 	if ((length > offset) &&
 	    (stcb != NULL) &&
-	    !SCTP_BASE_SYSCTL(sctp_auth_disable) &&
+	    (stcb->asoc.auth_supported == 1) &&
 	    sctp_auth_is_required_chunk(SCTP_DATA, stcb->asoc.local_auth_chunks) &&
 	    !stcb->asoc.authenticated) {
 		/* "silently" ignore */
@@ -5890,7 +5916,7 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, int lengt
 	}
 	/* take care of ecn */
 	if ((data_processed == 1) &&
-	    (stcb->asoc.ecn_allowed == 1) &&
+	    (stcb->asoc.ecn_supported == 1) &&
 	    ((ecn_bits & SCTP_CE_BITS) == SCTP_CE_BITS)) {
 		/* Yep, we need to add a ECNE */
 		sctp_send_ecn_echo(stcb, net, high_tsn);
@@ -6097,17 +6123,22 @@ extern int *sctp_cpuarry;
 
 #endif
 
-void
-sctp_input(struct mbuf *m, int off)
+int
+sctp_input(struct mbuf **mp, int *offp, int proto SCTP_UNUSED)
 {
-#if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
-	struct ip *ip;
-	struct sctphdr *sh;
-	int offset;
-	int cpu_to_use;
-	uint32_t flowid, tag;
+	struct mbuf *m;
+	int off;
 
+	m = *mp;
+	off = *offp;
+#if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
 	if (mp_ncpus > 1) {
+		struct ip *ip;
+		struct sctphdr *sh;
+		int offset;
+		int cpu_to_use;
+		uint32_t flowid, tag;
+
 		if (m->m_flags & M_FLOWID) {
 			flowid = m->m_pkthdr.flowid;
 		} else {
@@ -6119,7 +6150,7 @@ sctp_input(struct mbuf *m, int off)
 			if (SCTP_BUF_LEN(m) < offset) {
 				if ((m = m_pullup(m, offset)) == NULL) {
 					SCTP_STAT_INCR(sctps_hdrops);
-					return;
+					return (IPPROTO_DONE);
 				}
 			}
 			ip = mtod(m, struct ip *);
@@ -6131,10 +6162,11 @@ sctp_input(struct mbuf *m, int off)
 		}
 		cpu_to_use = sctp_cpuarry[flowid % mp_ncpus];
 		sctp_queue_to_mcore(m, off, cpu_to_use);
-		return;
+		return (IPPROTO_DONE);
 	}
 #endif
 	sctp_input_with_port(m, off, 0);
+	return (IPPROTO_DONE);
 }
 
 #endif
diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h
index 855b41109209..b241f75a0152 100644
--- a/sys/netinet/sctp_os_bsd.h
+++ b/sys/netinet/sctp_os_bsd.h
@@ -166,19 +166,19 @@ MALLOC_DECLARE(SCTP_M_MCORE);
 #if defined(SCTP_DEBUG)
 #define SCTPDBG(level, params...)					\
 {									\
-    do {								\
-	if (SCTP_BASE_SYSCTL(sctp_debug_on) & level ) {			\
-	    SCTP_PRINTF(params);						\
-	}								\
-    } while (0);							\
+	do {								\
+		if (SCTP_BASE_SYSCTL(sctp_debug_on) & level ) {		\
+			SCTP_PRINTF(params);				\
+		}							\
+	} while (0);							\
 }
 #define SCTPDBG_ADDR(level, addr)					\
 {									\
-    do {								\
+	do {								\
 	if (SCTP_BASE_SYSCTL(sctp_debug_on) & level ) {			\
-	    sctp_print_address(addr);					\
+		sctp_print_address(addr);				\
 	}								\
-    } while (0);							\
+	} while (0);							\
 }
 #else
 #define SCTPDBG(level, params...)
@@ -194,11 +194,11 @@ MALLOC_DECLARE(SCTP_M_MCORE);
 #ifdef SCTP_LTRACE_ERRORS
 #define SCTP_LTRACE_ERR_RET_PKT(m, inp, stcb, net, file, err) \
 	if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LTRACE_ERROR_ENABLE) \
-        	SCTP_PRINTF("mbuf:%p inp:%p stcb:%p net:%p file:%x line:%d error:%d\n", \
+		SCTP_PRINTF("mbuf:%p inp:%p stcb:%p net:%p file:%x line:%d error:%d\n", \
 		            m, inp, stcb, net, file, __LINE__, err);
 #define SCTP_LTRACE_ERR_RET(inp, stcb, net, file, err) \
 	if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LTRACE_ERROR_ENABLE) \
-        	SCTP_PRINTF("inp:%p stcb:%p net:%p file:%x line:%d error:%d\n", \
+		SCTP_PRINTF("inp:%p stcb:%p net:%p file:%x line:%d error:%d\n", \
 		            inp, stcb, net, file, __LINE__, err);
 #else
 #define SCTP_LTRACE_ERR_RET_PKT(m, inp, stcb, net, file, err)
@@ -232,16 +232,16 @@ MALLOC_DECLARE(SCTP_M_MCORE);
  * general memory allocation
  */
 #define SCTP_MALLOC(var, type, size, name) \
-    do { \
-	var = (type)malloc(size, name, M_NOWAIT); \
-    } while (0)
+	do { \
+		var = (type)malloc(size, name, M_NOWAIT); \
+	} while (0)
 
 #define SCTP_FREE(var, type)	free(var, type)
 
 #define SCTP_MALLOC_SONAME(var, type, size) \
-    do { \
-	var = (type)malloc(size, M_SONAME, M_WAITOK | M_ZERO); \
-    } while (0)
+	do { \
+		var = (type)malloc(size, M_SONAME, M_WAITOK | M_ZERO); \
+	} while (0)
 
 #define SCTP_FREE_SONAME(var)	free(var, M_SONAME)
 
@@ -346,7 +346,7 @@ typedef struct callout sctp_os_timer_t;
 /* return the base ext data pointer */
 #define SCTP_BUF_EXTEND_BASE(m) (m->m_ext.ext_buf)
  /* return the refcnt of the data pointer */
-#define SCTP_BUF_EXTEND_REFCNT(m) (*m->m_ext.ref_cnt)
+#define SCTP_BUF_EXTEND_REFCNT(m) (*m->m_ext.ext_cnt)
 /* return any buffer related flags, this is
  * used beyond logging for apple only.
  */
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 269ec498be4a..b9b85733dfcd 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -50,7 +50,9 @@ __FBSDID("$FreeBSD$");
 #include <netinet/sctp_bsd_addr.h>
 #include <netinet/sctp_input.h>
 #include <netinet/sctp_crc32.h>
+#if defined(INET) || defined(INET6)
 #include <netinet/udp.h>
+#endif
 #include <netinet/udp_var.h>
 #include <machine/in_cksum.h>
 
@@ -2060,6 +2062,20 @@ sctp_add_addresses_to_i_ia(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 				continue;
 			}
 			LIST_FOREACH(sctp_ifap, &sctp_ifnp->ifalist, next_ifa) {
+#ifdef INET
+				if ((sctp_ifap->address.sa.sa_family == AF_INET) &&
+				    (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+				    &sctp_ifap->address.sin.sin_addr) != 0)) {
+					continue;
+				}
+#endif
+#ifdef INET6
+				if ((sctp_ifap->address.sa.sa_family == AF_INET6) &&
+				    (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+				    &sctp_ifap->address.sin6.sin6_addr) != 0)) {
+					continue;
+				}
+#endif
 				if (sctp_is_addr_restricted(stcb, sctp_ifap)) {
 					continue;
 				}
@@ -2089,6 +2105,20 @@ sctp_add_addresses_to_i_ia(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 					continue;
 				}
 				LIST_FOREACH(sctp_ifap, &sctp_ifnp->ifalist, next_ifa) {
+#ifdef INET
+					if ((sctp_ifap->address.sa.sa_family == AF_INET) &&
+					    (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+					    &sctp_ifap->address.sin.sin_addr) != 0)) {
+						continue;
+					}
+#endif
+#ifdef INET6
+					if ((sctp_ifap->address.sa.sa_family == AF_INET6) &&
+					    (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+					    &sctp_ifap->address.sin6.sin6_addr) != 0)) {
+						continue;
+					}
+#endif
 					if (sctp_is_addr_restricted(stcb, sctp_ifap)) {
 						continue;
 					}
@@ -2453,6 +2483,20 @@ sctp_choose_boundspecific_inp(struct sctp_inpcb *inp,
 	if (sctp_ifn) {
 		/* is a preferred one on the interface we route out? */
 		LIST_FOREACH(sctp_ifa, &sctp_ifn->ifalist, next_ifa) {
+#ifdef INET
+			if ((sctp_ifa->address.sa.sa_family == AF_INET) &&
+			    (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+			    &sctp_ifa->address.sin.sin_addr) != 0)) {
+				continue;
+			}
+#endif
+#ifdef INET6
+			if ((sctp_ifa->address.sa.sa_family == AF_INET6) &&
+			    (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+			    &sctp_ifa->address.sin6.sin6_addr) != 0)) {
+				continue;
+			}
+#endif
 			if ((sctp_ifa->localifa_flags & SCTP_ADDR_DEFER_USE) &&
 			    (non_asoc_addr_ok == 0))
 				continue;
@@ -2576,6 +2620,20 @@ sctp_choose_boundspecific_stcb(struct sctp_inpcb *inp,
 	if (sctp_ifn) {
 		/* first try for a preferred address on the ep */
 		LIST_FOREACH(sctp_ifa, &sctp_ifn->ifalist, next_ifa) {
+#ifdef INET
+			if ((sctp_ifa->address.sa.sa_family == AF_INET) &&
+			    (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+			    &sctp_ifa->address.sin.sin_addr) != 0)) {
+				continue;
+			}
+#endif
+#ifdef INET6
+			if ((sctp_ifa->address.sa.sa_family == AF_INET6) &&
+			    (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+			    &sctp_ifa->address.sin6.sin6_addr) != 0)) {
+				continue;
+			}
+#endif
 			if ((sctp_ifa->localifa_flags & SCTP_ADDR_DEFER_USE) && (non_asoc_addr_ok == 0))
 				continue;
 			if (sctp_is_addr_in_ep(inp, sctp_ifa)) {
@@ -2596,6 +2654,20 @@ sctp_choose_boundspecific_stcb(struct sctp_inpcb *inp,
 		}
 		/* next try for an acceptable address on the ep */
 		LIST_FOREACH(sctp_ifa, &sctp_ifn->ifalist, next_ifa) {
+#ifdef INET
+			if ((sctp_ifa->address.sa.sa_family == AF_INET) &&
+			    (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+			    &sctp_ifa->address.sin.sin_addr) != 0)) {
+				continue;
+			}
+#endif
+#ifdef INET6
+			if ((sctp_ifa->address.sa.sa_family == AF_INET6) &&
+			    (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+			    &sctp_ifa->address.sin6.sin6_addr) != 0)) {
+				continue;
+			}
+#endif
 			if ((sctp_ifa->localifa_flags & SCTP_ADDR_DEFER_USE) && (non_asoc_addr_ok == 0))
 				continue;
 			if (sctp_is_addr_in_ep(inp, sctp_ifa)) {
@@ -2700,6 +2772,7 @@ sctp_choose_boundspecific_stcb(struct sctp_inpcb *inp,
 
 static struct sctp_ifa *
 sctp_select_nth_preferred_addr_from_ifn_boundall(struct sctp_ifn *ifn,
+    struct sctp_inpcb *inp,
     struct sctp_tcb *stcb,
     int non_asoc_addr_ok,
     uint8_t dest_is_loop,
@@ -2721,6 +2794,20 @@ sctp_select_nth_preferred_addr_from_ifn_boundall(struct sctp_ifn *ifn,
 	}
 #endif				/* INET6 */
 	LIST_FOREACH(ifa, &ifn->ifalist, next_ifa) {
+#ifdef INET
+		if ((ifa->address.sa.sa_family == AF_INET) &&
+		    (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+		    &ifa->address.sin.sin_addr) != 0)) {
+			continue;
+		}
+#endif
+#ifdef INET6
+		if ((ifa->address.sa.sa_family == AF_INET6) &&
+		    (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+		    &ifa->address.sin6.sin6_addr) != 0)) {
+			continue;
+		}
+#endif
 		if ((ifa->localifa_flags & SCTP_ADDR_DEFER_USE) &&
 		    (non_asoc_addr_ok == 0))
 			continue;
@@ -2806,6 +2893,7 @@ sctp_select_nth_preferred_addr_from_ifn_boundall(struct sctp_ifn *ifn,
 
 static int
 sctp_count_num_preferred_boundall(struct sctp_ifn *ifn,
+    struct sctp_inpcb *inp,
     struct sctp_tcb *stcb,
     int non_asoc_addr_ok,
     uint8_t dest_is_loop,
@@ -2816,6 +2904,21 @@ sctp_count_num_preferred_boundall(struct sctp_ifn *ifn,
 	int num_eligible_addr = 0;
 
 	LIST_FOREACH(ifa, &ifn->ifalist, next_ifa) {
+#ifdef INET
+		if ((ifa->address.sa.sa_family == AF_INET) &&
+		    (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+		    &ifa->address.sin.sin_addr) != 0)) {
+			continue;
+		}
+#endif
+#ifdef INET6
+		if ((ifa->address.sa.sa_family == AF_INET6) &&
+		    (stcb != NULL) &&
+		    (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+		    &ifa->address.sin6.sin6_addr) != 0)) {
+			continue;
+		}
+#endif
 		if ((ifa->localifa_flags & SCTP_ADDR_DEFER_USE) &&
 		    (non_asoc_addr_ok == 0)) {
 			continue;
@@ -2847,7 +2950,8 @@ sctp_count_num_preferred_boundall(struct sctp_ifn *ifn,
 }
 
 static struct sctp_ifa *
-sctp_choose_boundall(struct sctp_tcb *stcb,
+sctp_choose_boundall(struct sctp_inpcb *inp,
+    struct sctp_tcb *stcb,
     struct sctp_nets *net,
     sctp_route_t * ro,
     uint32_t vrf_id,
@@ -2902,7 +3006,7 @@ sctp_choose_boundall(struct sctp_tcb *stcb,
 		cur_addr_num = net->indx_of_eligible_next_to_use;
 	}
 	num_preferred = sctp_count_num_preferred_boundall(sctp_ifn,
-	    stcb,
+	    inp, stcb,
 	    non_asoc_addr_ok,
 	    dest_is_loop,
 	    dest_is_priv, fam);
@@ -2929,7 +3033,7 @@ sctp_choose_boundall(struct sctp_tcb *stcb,
 	 */
 	SCTPDBG(SCTP_DEBUG_OUTPUT2, "cur_addr_num:%d\n", cur_addr_num);
 
-	sctp_ifa = sctp_select_nth_preferred_addr_from_ifn_boundall(sctp_ifn, stcb, non_asoc_addr_ok, dest_is_loop,
+	sctp_ifa = sctp_select_nth_preferred_addr_from_ifn_boundall(sctp_ifn, inp, stcb, non_asoc_addr_ok, dest_is_loop,
 	    dest_is_priv, cur_addr_num, fam, ro);
 
 	/* if sctp_ifa is NULL something changed??, fall to plan b. */
@@ -2960,7 +3064,7 @@ sctp_choose_boundall(struct sctp_tcb *stcb,
 			SCTPDBG(SCTP_DEBUG_OUTPUT2, "already seen\n");
 			continue;
 		}
-		num_preferred = sctp_count_num_preferred_boundall(sctp_ifn, stcb, non_asoc_addr_ok,
+		num_preferred = sctp_count_num_preferred_boundall(sctp_ifn, inp, stcb, non_asoc_addr_ok,
 		    dest_is_loop, dest_is_priv, fam);
 		SCTPDBG(SCTP_DEBUG_OUTPUT2,
 		    "Found ifn:%p %d preferred source addresses\n",
@@ -2982,7 +3086,7 @@ sctp_choose_boundall(struct sctp_tcb *stcb,
 		if (cur_addr_num >= num_preferred) {
 			cur_addr_num = 0;
 		}
-		sifa = sctp_select_nth_preferred_addr_from_ifn_boundall(sctp_ifn, stcb, non_asoc_addr_ok, dest_is_loop,
+		sifa = sctp_select_nth_preferred_addr_from_ifn_boundall(sctp_ifn, inp, stcb, non_asoc_addr_ok, dest_is_loop,
 		    dest_is_priv, cur_addr_num, fam, ro);
 		if (sifa == NULL)
 			continue;
@@ -3010,6 +3114,22 @@ sctp_choose_boundall(struct sctp_tcb *stcb,
 	}
 	LIST_FOREACH(sctp_ifa, &emit_ifn->ifalist, next_ifa) {
 		SCTPDBG(SCTP_DEBUG_OUTPUT2, "ifa:%p\n", (void *)sctp_ifa);
+#ifdef INET
+		if ((sctp_ifa->address.sa.sa_family == AF_INET) &&
+		    (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+		    &sctp_ifa->address.sin.sin_addr) != 0)) {
+			SCTPDBG(SCTP_DEBUG_OUTPUT2, "Jailed\n");
+			continue;
+		}
+#endif
+#ifdef INET6
+		if ((sctp_ifa->address.sa.sa_family == AF_INET6) &&
+		    (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+		    &sctp_ifa->address.sin6.sin6_addr) != 0)) {
+			SCTPDBG(SCTP_DEBUG_OUTPUT2, "Jailed\n");
+			continue;
+		}
+#endif
 		if ((sctp_ifa->localifa_flags & SCTP_ADDR_DEFER_USE) &&
 		    (non_asoc_addr_ok == 0)) {
 			SCTPDBG(SCTP_DEBUG_OUTPUT2, "Defer\n");
@@ -3060,6 +3180,20 @@ sctp_choose_boundall(struct sctp_tcb *stcb,
 			continue;
 		}
 		LIST_FOREACH(sctp_ifa, &sctp_ifn->ifalist, next_ifa) {
+#ifdef INET
+			if ((sctp_ifa->address.sa.sa_family == AF_INET) &&
+			    (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+			    &sctp_ifa->address.sin.sin_addr) != 0)) {
+				continue;
+			}
+#endif
+#ifdef INET6
+			if ((sctp_ifa->address.sa.sa_family == AF_INET6) &&
+			    (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+			    &sctp_ifa->address.sin6.sin6_addr) != 0)) {
+				continue;
+			}
+#endif
 			if ((sctp_ifa->localifa_flags & SCTP_ADDR_DEFER_USE) &&
 			    (non_asoc_addr_ok == 0))
 				continue;
@@ -3110,6 +3244,20 @@ sctp_choose_boundall(struct sctp_tcb *stcb,
 				LIST_FOREACH(sctp_ifa, &sctp_ifn->ifalist, next_ifa) {
 					struct sctp_ifa *tmp_sifa;
 
+#ifdef INET
+					if ((sctp_ifa->address.sa.sa_family == AF_INET) &&
+					    (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+					    &sctp_ifa->address.sin.sin_addr) != 0)) {
+						continue;
+					}
+#endif
+#ifdef INET6
+					if ((sctp_ifa->address.sa.sa_family == AF_INET6) &&
+					    (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+					    &sctp_ifa->address.sin6.sin6_addr) != 0)) {
+						continue;
+					}
+#endif
 					if ((sctp_ifa->localifa_flags & SCTP_ADDR_DEFER_USE) &&
 					    (non_asoc_addr_ok == 0))
 						continue;
@@ -3295,7 +3443,7 @@ sctp_source_address_selection(struct sctp_inpcb *inp,
 		/*
 		 * Bound all case
 		 */
-		answer = sctp_choose_boundall(stcb, net, ro, vrf_id,
+		answer = sctp_choose_boundall(inp, stcb, net, ro, vrf_id,
 		    dest_is_priv, dest_is_loop,
 		    non_asoc_addr_ok, fam);
 		SCTP_IPI_ADDR_RUNLOCK();
@@ -3766,7 +3914,7 @@ sctp_add_cookie(struct mbuf *init, int init_offset,
 static uint8_t
 sctp_get_ect(struct sctp_tcb *stcb)
 {
-	if ((stcb != NULL) && (stcb->asoc.ecn_allowed == 1)) {
+	if ((stcb != NULL) && (stcb->asoc.ecn_supported == 1)) {
 		return (SCTP_ECT0_BIT);
 	} else {
 		return (0);
@@ -4552,7 +4700,7 @@ sctp_send_initiate(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int so_locked
 #endif
 )
 {
-	struct mbuf *m;
+	struct mbuf *m, *m_last;
 	struct sctp_nets *net;
 	struct sctp_init_chunk *init;
 	struct sctp_supported_addr_param *sup_addr;
@@ -4605,12 +4753,6 @@ sctp_send_initiate(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int so_locked
 	}
 	chunk_len = (uint16_t) sizeof(struct sctp_init_chunk);
 	padding_len = 0;
-	/*
-	 * assume peer supports asconf in order to be able to queue local
-	 * address changes while an INIT is in flight and before the assoc
-	 * is established.
-	 */
-	stcb->asoc.peer_supports_asconf = 1;
 	/* Now lets put the chunk header in place */
 	init = mtod(m, struct sctp_init_chunk *);
 	/* now the chunk header */
@@ -4627,9 +4769,148 @@ sctp_send_initiate(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int so_locked
 	init->init.num_inbound_streams = htons(stcb->asoc.max_inbound_streams);
 	init->init.initial_tsn = htonl(stcb->asoc.init_seq_number);
 
+	/* Adaptation layer indication parameter */
+	if (inp->sctp_ep.adaptation_layer_indicator_provided) {
+		parameter_len = (uint16_t) sizeof(struct sctp_adaptation_layer_indication);
+		ali = (struct sctp_adaptation_layer_indication *)(mtod(m, caddr_t)+chunk_len);
+		ali->ph.param_type = htons(SCTP_ULP_ADAPTATION);
+		ali->ph.param_length = htons(parameter_len);
+		ali->indication = htonl(inp->sctp_ep.adaptation_layer_indicator);
+		chunk_len += parameter_len;
+	}
+	/* ECN parameter */
+	if (stcb->asoc.ecn_supported == 1) {
+		parameter_len = (uint16_t) sizeof(struct sctp_paramhdr);
+		ph = (struct sctp_paramhdr *)(mtod(m, caddr_t)+chunk_len);
+		ph->param_type = htons(SCTP_ECN_CAPABLE);
+		ph->param_length = htons(parameter_len);
+		chunk_len += parameter_len;
+	}
+	/* PR-SCTP supported parameter */
+	if (stcb->asoc.prsctp_supported == 1) {
+		parameter_len = (uint16_t) sizeof(struct sctp_paramhdr);
+		ph = (struct sctp_paramhdr *)(mtod(m, caddr_t)+chunk_len);
+		ph->param_type = htons(SCTP_PRSCTP_SUPPORTED);
+		ph->param_length = htons(parameter_len);
+		chunk_len += parameter_len;
+	}
+	/* Add NAT friendly parameter. */
+	if (SCTP_BASE_SYSCTL(sctp_inits_include_nat_friendly)) {
+		parameter_len = (uint16_t) sizeof(struct sctp_paramhdr);
+		ph = (struct sctp_paramhdr *)(mtod(m, caddr_t)+chunk_len);
+		ph->param_type = htons(SCTP_HAS_NAT_SUPPORT);
+		ph->param_length = htons(parameter_len);
+		chunk_len += parameter_len;
+	}
+	/* And now tell the peer which extensions we support */
+	num_ext = 0;
+	pr_supported = (struct sctp_supported_chunk_types_param *)(mtod(m, caddr_t)+chunk_len);
+	if (stcb->asoc.prsctp_supported == 1) {
+		pr_supported->chunk_types[num_ext++] = SCTP_FORWARD_CUM_TSN;
+	}
+	if (stcb->asoc.auth_supported == 1) {
+		pr_supported->chunk_types[num_ext++] = SCTP_AUTHENTICATION;
+	}
+	if (stcb->asoc.asconf_supported == 1) {
+		pr_supported->chunk_types[num_ext++] = SCTP_ASCONF;
+		pr_supported->chunk_types[num_ext++] = SCTP_ASCONF_ACK;
+	}
+	if (stcb->asoc.reconfig_supported == 1) {
+		pr_supported->chunk_types[num_ext++] = SCTP_STREAM_RESET;
+	}
+	if (stcb->asoc.nrsack_supported == 1) {
+		pr_supported->chunk_types[num_ext++] = SCTP_NR_SELECTIVE_ACK;
+	}
+	if (stcb->asoc.pktdrop_supported == 1) {
+		pr_supported->chunk_types[num_ext++] = SCTP_PACKET_DROPPED;
+	}
+	if (num_ext > 0) {
+		parameter_len = (uint16_t) sizeof(struct sctp_supported_chunk_types_param) + num_ext;
+		pr_supported->ph.param_type = htons(SCTP_SUPPORTED_CHUNK_EXT);
+		pr_supported->ph.param_length = htons(parameter_len);
+		padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
+		chunk_len += parameter_len;
+	}
+	/* add authentication parameters */
+	if (stcb->asoc.auth_supported) {
+		/* attach RANDOM parameter, if available */
+		if (stcb->asoc.authinfo.random != NULL) {
+			struct sctp_auth_random *randp;
+
+			if (padding_len > 0) {
+				memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
+				chunk_len += padding_len;
+				padding_len = 0;
+			}
+			randp = (struct sctp_auth_random *)(mtod(m, caddr_t)+chunk_len);
+			parameter_len = (uint16_t) sizeof(struct sctp_auth_random) + stcb->asoc.authinfo.random_len;
+			/* random key already contains the header */
+			memcpy(randp, stcb->asoc.authinfo.random->key, parameter_len);
+			padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
+			chunk_len += parameter_len;
+		}
+		/* add HMAC_ALGO parameter */
+		if (stcb->asoc.local_hmacs != NULL) {
+			struct sctp_auth_hmac_algo *hmacs;
+
+			if (padding_len > 0) {
+				memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
+				chunk_len += padding_len;
+				padding_len = 0;
+			}
+			hmacs = (struct sctp_auth_hmac_algo *)(mtod(m, caddr_t)+chunk_len);
+			parameter_len = (uint16_t) (sizeof(struct sctp_auth_hmac_algo) +
+			    stcb->asoc.local_hmacs->num_algo * sizeof(uint16_t));
+			hmacs->ph.param_type = htons(SCTP_HMAC_LIST);
+			hmacs->ph.param_length = htons(parameter_len);
+			sctp_serialize_hmaclist(stcb->asoc.local_hmacs, (uint8_t *) hmacs->hmac_ids);
+			padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
+			chunk_len += parameter_len;
+		}
+		/* add CHUNKS parameter */
+		if (stcb->asoc.local_auth_chunks != NULL) {
+			struct sctp_auth_chunk_list *chunks;
+
+			if (padding_len > 0) {
+				memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
+				chunk_len += padding_len;
+				padding_len = 0;
+			}
+			chunks = (struct sctp_auth_chunk_list *)(mtod(m, caddr_t)+chunk_len);
+			parameter_len = (uint16_t) (sizeof(struct sctp_auth_chunk_list) +
+			    sctp_auth_get_chklist_size(stcb->asoc.local_auth_chunks));
+			chunks->ph.param_type = htons(SCTP_CHUNK_LIST);
+			chunks->ph.param_length = htons(parameter_len);
+			sctp_serialize_auth_chunks(stcb->asoc.local_auth_chunks, chunks->chunk_types);
+			padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
+			chunk_len += parameter_len;
+		}
+	}
+	/* now any cookie time extensions */
+	if (stcb->asoc.cookie_preserve_req) {
+		struct sctp_cookie_perserve_param *cookie_preserve;
+
+		if (padding_len > 0) {
+			memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
+			chunk_len += padding_len;
+			padding_len = 0;
+		}
+		parameter_len = (uint16_t) sizeof(struct sctp_cookie_perserve_param);
+		cookie_preserve = (struct sctp_cookie_perserve_param *)(mtod(m, caddr_t)+chunk_len);
+		cookie_preserve->ph.param_type = htons(SCTP_COOKIE_PRESERVE);
+		cookie_preserve->ph.param_length = htons(parameter_len);
+		cookie_preserve->time = htonl(stcb->asoc.cookie_preserve_req);
+		stcb->asoc.cookie_preserve_req = 0;
+		chunk_len += parameter_len;
+	}
 	if (stcb->asoc.scope.ipv4_addr_legal || stcb->asoc.scope.ipv6_addr_legal) {
 		uint8_t i;
 
+		if (padding_len > 0) {
+			memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
+			chunk_len += padding_len;
+			padding_len = 0;
+		}
 		parameter_len = (uint16_t) sizeof(struct sctp_paramhdr);
 		if (stcb->asoc.scope.ipv4_addr_legal) {
 			parameter_len += (uint16_t) sizeof(uint16_t);
@@ -4650,153 +4931,7 @@ sctp_send_initiate(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int so_locked
 		padding_len = 4 - 2 * i;
 		chunk_len += parameter_len;
 	}
-	/* Adaptation layer indication parameter */
-	if (inp->sctp_ep.adaptation_layer_indicator_provided) {
-		if (padding_len > 0) {
-			memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
-			chunk_len += padding_len;
-			padding_len = 0;
-		}
-		parameter_len = (uint16_t) sizeof(struct sctp_adaptation_layer_indication);
-		ali = (struct sctp_adaptation_layer_indication *)(mtod(m, caddr_t)+chunk_len);
-		ali->ph.param_type = htons(SCTP_ULP_ADAPTATION);
-		ali->ph.param_length = htons(parameter_len);
-		ali->indication = ntohl(inp->sctp_ep.adaptation_layer_indicator);
-		chunk_len += parameter_len;
-	}
-	if (SCTP_BASE_SYSCTL(sctp_inits_include_nat_friendly)) {
-		/* Add NAT friendly parameter. */
-		if (padding_len > 0) {
-			memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
-			chunk_len += padding_len;
-			padding_len = 0;
-		}
-		parameter_len = (uint16_t) sizeof(struct sctp_paramhdr);
-		ph = (struct sctp_paramhdr *)(mtod(m, caddr_t)+chunk_len);
-		ph->param_type = htons(SCTP_HAS_NAT_SUPPORT);
-		ph->param_length = htons(parameter_len);
-		chunk_len += parameter_len;
-	}
-	/* now any cookie time extensions */
-	if (stcb->asoc.cookie_preserve_req) {
-		struct sctp_cookie_perserve_param *cookie_preserve;
-
-		if (padding_len > 0) {
-			memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
-			chunk_len += padding_len;
-			padding_len = 0;
-		}
-		parameter_len = (uint16_t) sizeof(struct sctp_cookie_perserve_param);
-		cookie_preserve = (struct sctp_cookie_perserve_param *)(mtod(m, caddr_t)+chunk_len);
-		cookie_preserve->ph.param_type = htons(SCTP_COOKIE_PRESERVE);
-		cookie_preserve->ph.param_length = htons(parameter_len);
-		cookie_preserve->time = htonl(stcb->asoc.cookie_preserve_req);
-		stcb->asoc.cookie_preserve_req = 0;
-		chunk_len += parameter_len;
-	}
-	/* ECN parameter */
-	if (stcb->asoc.ecn_allowed == 1) {
-		if (padding_len > 0) {
-			memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
-			chunk_len += padding_len;
-			padding_len = 0;
-		}
-		parameter_len = (uint16_t) sizeof(struct sctp_paramhdr);
-		ph = (struct sctp_paramhdr *)(mtod(m, caddr_t)+chunk_len);
-		ph->param_type = htons(SCTP_ECN_CAPABLE);
-		ph->param_length = htons(parameter_len);
-		chunk_len += parameter_len;
-	}
-	/* And now tell the peer we do support PR-SCTP. */
-	if (padding_len > 0) {
-		memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
-		chunk_len += padding_len;
-		padding_len = 0;
-	}
-	parameter_len = (uint16_t) sizeof(struct sctp_paramhdr);
-	ph = (struct sctp_paramhdr *)(mtod(m, caddr_t)+chunk_len);
-	ph->param_type = htons(SCTP_PRSCTP_SUPPORTED);
-	ph->param_length = htons(parameter_len);
-	chunk_len += parameter_len;
-
-	/* And now tell the peer we do all the extensions */
-	pr_supported = (struct sctp_supported_chunk_types_param *)(mtod(m, caddr_t)+chunk_len);
-	pr_supported->ph.param_type = htons(SCTP_SUPPORTED_CHUNK_EXT);
-	num_ext = 0;
-	pr_supported->chunk_types[num_ext++] = SCTP_ASCONF;
-	pr_supported->chunk_types[num_ext++] = SCTP_ASCONF_ACK;
-	pr_supported->chunk_types[num_ext++] = SCTP_FORWARD_CUM_TSN;
-	pr_supported->chunk_types[num_ext++] = SCTP_PACKET_DROPPED;
-	pr_supported->chunk_types[num_ext++] = SCTP_STREAM_RESET;
-	if (!SCTP_BASE_SYSCTL(sctp_auth_disable)) {
-		pr_supported->chunk_types[num_ext++] = SCTP_AUTHENTICATION;
-	}
-	if (stcb->asoc.sctp_nr_sack_on_off == 1) {
-		pr_supported->chunk_types[num_ext++] = SCTP_NR_SELECTIVE_ACK;
-	}
-	parameter_len = (uint16_t) sizeof(struct sctp_supported_chunk_types_param) + num_ext;
-	pr_supported->ph.param_length = htons(parameter_len);
-	padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
-	chunk_len += parameter_len;
-
-	/* add authentication parameters */
-	if (!SCTP_BASE_SYSCTL(sctp_auth_disable)) {
-		/* attach RANDOM parameter, if available */
-		if (stcb->asoc.authinfo.random != NULL) {
-			struct sctp_auth_random *randp;
-
-			if (padding_len > 0) {
-				memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
-				chunk_len += padding_len;
-				padding_len = 0;
-			}
-			randp = (struct sctp_auth_random *)(mtod(m, caddr_t)+chunk_len);
-			parameter_len = (uint16_t) sizeof(struct sctp_auth_random) + stcb->asoc.authinfo.random_len;
-			/* random key already contains the header */
-			memcpy(randp, stcb->asoc.authinfo.random->key, parameter_len);
-			padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
-			chunk_len += parameter_len;
-		}
-		/* add HMAC_ALGO parameter */
-		if ((stcb->asoc.local_hmacs != NULL) &&
-		    (stcb->asoc.local_hmacs->num_algo > 0)) {
-			struct sctp_auth_hmac_algo *hmacs;
-
-			if (padding_len > 0) {
-				memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
-				chunk_len += padding_len;
-				padding_len = 0;
-			}
-			hmacs = (struct sctp_auth_hmac_algo *)(mtod(m, caddr_t)+chunk_len);
-			parameter_len = (uint16_t) (sizeof(struct sctp_auth_hmac_algo) +
-			    stcb->asoc.local_hmacs->num_algo * sizeof(uint16_t));
-			hmacs->ph.param_type = htons(SCTP_HMAC_LIST);
-			hmacs->ph.param_length = htons(parameter_len);
-			sctp_serialize_hmaclist(stcb->asoc.local_hmacs, (uint8_t *) hmacs->hmac_ids);
-			padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
-			chunk_len += parameter_len;
-		}
-		/* add CHUNKS parameter */
-		if (sctp_auth_get_chklist_size(stcb->asoc.local_auth_chunks) > 0) {
-			struct sctp_auth_chunk_list *chunks;
-
-			if (padding_len > 0) {
-				memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
-				chunk_len += padding_len;
-				padding_len = 0;
-			}
-			chunks = (struct sctp_auth_chunk_list *)(mtod(m, caddr_t)+chunk_len);
-			parameter_len = (uint16_t) (sizeof(struct sctp_auth_chunk_list) +
-			    sctp_auth_get_chklist_size(stcb->asoc.local_auth_chunks));
-			chunks->ph.param_type = htons(SCTP_CHUNK_LIST);
-			chunks->ph.param_length = htons(parameter_len);
-			sctp_serialize_auth_chunks(stcb->asoc.local_auth_chunks, chunks->chunk_types);
-			padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
-			chunk_len += parameter_len;
-		}
-	}
 	SCTP_BUF_LEN(m) = chunk_len;
-
 	/* now the addresses */
 	/*
 	 * To optimize this we could put the scoping stuff into a structure
@@ -4804,18 +4939,13 @@ sctp_send_initiate(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int so_locked
 	 * we could just sifa in the address within the stcb. But for now
 	 * this is a quick hack to get the address stuff teased apart.
 	 */
-	sctp_add_addresses_to_i_ia(inp, stcb, &stcb->asoc.scope, m, cnt_inits_to, &padding_len, &chunk_len);
+	m_last = sctp_add_addresses_to_i_ia(inp, stcb, &stcb->asoc.scope,
+	    m, cnt_inits_to,
+	    &padding_len, &chunk_len);
 
 	init->ch.chunk_length = htons(chunk_len);
 	if (padding_len > 0) {
-		struct mbuf *m_at, *mp_last;
-
-		mp_last = NULL;
-		for (m_at = m; m_at; m_at = SCTP_BUF_NEXT(m_at)) {
-			if (SCTP_BUF_NEXT(m_at) == NULL)
-				mp_last = m_at;
-		}
-		if ((mp_last == NULL) || sctp_add_pad_tombuf(mp_last, padding_len)) {
+		if (sctp_add_pad_tombuf(m_last, padding_len) == NULL) {
 			sctp_m_freem(m);
 			return;
 		}
@@ -4952,7 +5082,6 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt,
 			*nat_friendly = 1;
 			/* fall through */
 		case SCTP_PRSCTP_SUPPORTED:
-
 			if (padded_size != sizeof(struct sctp_paramhdr)) {
 				SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error prsctp/nat support %d\n", plen);
 				goto invalid_size;
@@ -4960,7 +5089,7 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt,
 			at += padded_size;
 			break;
 		case SCTP_ECN_CAPABLE:
-			if (padded_size != sizeof(struct sctp_ecn_supported_param)) {
+			if (padded_size != sizeof(struct sctp_paramhdr)) {
 				SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error ecn %d\n", plen);
 				goto invalid_size;
 			}
@@ -5345,13 +5474,13 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
     uint32_t vrf_id, uint16_t port, int hold_inp_lock)
 {
 	struct sctp_association *asoc;
-	struct mbuf *m, *m_at, *m_tmp, *m_cookie, *op_err, *mp_last;
+	struct mbuf *m, *m_tmp, *m_last, *m_cookie, *op_err;
 	struct sctp_init_ack_chunk *initack;
 	struct sctp_adaptation_layer_indication *ali;
-	struct sctp_ecn_supported_param *ecn;
-	struct sctp_prsctp_supported_param *prsctp;
 	struct sctp_supported_chunk_types_param *pr_supported;
+	struct sctp_paramhdr *ph;
 	union sctp_sockstore *over_addr;
+	struct sctp_scoping scp;
 
 #ifdef INET
 	struct sockaddr_in *dst4 = (struct sockaddr_in *)dst;
@@ -5371,18 +5500,16 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 	uint8_t *signature = NULL;
 	int cnt_inits_to = 0;
 	uint16_t his_limit, i_want;
-	int abort_flag, padval;
-	int num_ext;
-	int p_len;
+	int abort_flag;
 	int nat_friendly = 0;
 	struct socket *so;
+	uint16_t num_ext, chunk_len, padding_len, parameter_len;
 
 	if (stcb) {
 		asoc = &stcb->asoc;
 	} else {
 		asoc = NULL;
 	}
-	mp_last = NULL;
 	if ((asoc != NULL) &&
 	    (SCTP_GET_STATE(asoc) != SCTP_STATE_COOKIE_WAIT) &&
 	    (sctp_are_there_new_addresses(asoc, init_pkt, offset, src))) {
@@ -5425,7 +5552,8 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 			sctp_m_freem(op_err);
 		return;
 	}
-	SCTP_BUF_LEN(m) = sizeof(struct sctp_init_chunk);
+	chunk_len = (uint16_t) sizeof(struct sctp_init_ack_chunk);
+	padding_len = 0;
 
 	/*
 	 * We might not overwrite the identification[] completely and on
@@ -5749,161 +5877,174 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 
 	/* adaptation layer indication parameter */
 	if (inp->sctp_ep.adaptation_layer_indicator_provided) {
-		ali = (struct sctp_adaptation_layer_indication *)((caddr_t)initack + sizeof(*initack));
+		parameter_len = (uint16_t) sizeof(struct sctp_adaptation_layer_indication);
+		ali = (struct sctp_adaptation_layer_indication *)(mtod(m, caddr_t)+chunk_len);
 		ali->ph.param_type = htons(SCTP_ULP_ADAPTATION);
-		ali->ph.param_length = htons(sizeof(*ali));
-		ali->indication = ntohl(inp->sctp_ep.adaptation_layer_indicator);
-		SCTP_BUF_LEN(m) += sizeof(*ali);
-		ecn = (struct sctp_ecn_supported_param *)((caddr_t)ali + sizeof(*ali));
-	} else {
-		ecn = (struct sctp_ecn_supported_param *)((caddr_t)initack + sizeof(*initack));
+		ali->ph.param_length = htons(parameter_len);
+		ali->indication = htonl(inp->sctp_ep.adaptation_layer_indicator);
+		chunk_len += parameter_len;
 	}
-
 	/* ECN parameter */
-	if (((asoc != NULL) && (asoc->ecn_allowed == 1)) ||
-	    (inp->sctp_ecn_enable == 1)) {
-		ecn->ph.param_type = htons(SCTP_ECN_CAPABLE);
-		ecn->ph.param_length = htons(sizeof(*ecn));
-		SCTP_BUF_LEN(m) += sizeof(*ecn);
-
-		prsctp = (struct sctp_prsctp_supported_param *)((caddr_t)ecn +
-		    sizeof(*ecn));
-	} else {
-		prsctp = (struct sctp_prsctp_supported_param *)((caddr_t)ecn);
+	if (((asoc != NULL) && (asoc->ecn_supported == 1)) ||
+	    ((asoc == NULL) && (inp->ecn_supported == 1))) {
+		parameter_len = (uint16_t) sizeof(struct sctp_paramhdr);
+		ph = (struct sctp_paramhdr *)(mtod(m, caddr_t)+chunk_len);
+		ph->param_type = htons(SCTP_ECN_CAPABLE);
+		ph->param_length = htons(parameter_len);
+		chunk_len += parameter_len;
 	}
-	/* And now tell the peer we do  pr-sctp */
-	prsctp->ph.param_type = htons(SCTP_PRSCTP_SUPPORTED);
-	prsctp->ph.param_length = htons(sizeof(*prsctp));
-	SCTP_BUF_LEN(m) += sizeof(*prsctp);
+	/* PR-SCTP supported parameter */
+	if (((asoc != NULL) && (asoc->prsctp_supported == 1)) ||
+	    ((asoc == NULL) && (inp->prsctp_supported == 1))) {
+		parameter_len = (uint16_t) sizeof(struct sctp_paramhdr);
+		ph = (struct sctp_paramhdr *)(mtod(m, caddr_t)+chunk_len);
+		ph->param_type = htons(SCTP_PRSCTP_SUPPORTED);
+		ph->param_length = htons(parameter_len);
+		chunk_len += parameter_len;
+	}
+	/* Add NAT friendly parameter */
 	if (nat_friendly) {
-		/* Add NAT friendly parameter */
-		struct sctp_paramhdr *ph;
-
-		ph = (struct sctp_paramhdr *)(mtod(m, caddr_t)+SCTP_BUF_LEN(m));
+		parameter_len = (uint16_t) sizeof(struct sctp_paramhdr);
+		ph = (struct sctp_paramhdr *)(mtod(m, caddr_t)+chunk_len);
 		ph->param_type = htons(SCTP_HAS_NAT_SUPPORT);
 		ph->param_length = htons(sizeof(struct sctp_paramhdr));
-		SCTP_BUF_LEN(m) += sizeof(struct sctp_paramhdr);
+		chunk_len += sizeof(struct sctp_paramhdr);
 	}
-	/* And now tell the peer we do all the extensions */
-	pr_supported = (struct sctp_supported_chunk_types_param *)(mtod(m, caddr_t)+SCTP_BUF_LEN(m));
-	pr_supported->ph.param_type = htons(SCTP_SUPPORTED_CHUNK_EXT);
+	/* And now tell the peer which extensions we support */
 	num_ext = 0;
-	pr_supported->chunk_types[num_ext++] = SCTP_ASCONF;
-	pr_supported->chunk_types[num_ext++] = SCTP_ASCONF_ACK;
-	pr_supported->chunk_types[num_ext++] = SCTP_FORWARD_CUM_TSN;
-	pr_supported->chunk_types[num_ext++] = SCTP_PACKET_DROPPED;
-	pr_supported->chunk_types[num_ext++] = SCTP_STREAM_RESET;
-	if (!SCTP_BASE_SYSCTL(sctp_auth_disable))
+	pr_supported = (struct sctp_supported_chunk_types_param *)(mtod(m, caddr_t)+chunk_len);
+	if (((asoc != NULL) && (asoc->prsctp_supported == 1)) ||
+	    ((asoc == NULL) && (inp->prsctp_supported == 1))) {
+		pr_supported->chunk_types[num_ext++] = SCTP_FORWARD_CUM_TSN;
+	}
+	if (((asoc != NULL) && (asoc->auth_supported == 1)) ||
+	    ((asoc == NULL) && (inp->auth_supported == 1))) {
 		pr_supported->chunk_types[num_ext++] = SCTP_AUTHENTICATION;
-	if (SCTP_BASE_SYSCTL(sctp_nr_sack_on_off))
+	}
+	if (((asoc != NULL) && (asoc->asconf_supported == 1)) ||
+	    ((asoc == NULL) && (inp->asconf_supported == 1))) {
+		pr_supported->chunk_types[num_ext++] = SCTP_ASCONF;
+		pr_supported->chunk_types[num_ext++] = SCTP_ASCONF_ACK;
+	}
+	if (((asoc != NULL) && (asoc->reconfig_supported == 1)) ||
+	    ((asoc == NULL) && (inp->reconfig_supported == 1))) {
+		pr_supported->chunk_types[num_ext++] = SCTP_STREAM_RESET;
+	}
+	if (((asoc != NULL) && (asoc->nrsack_supported == 1)) ||
+	    ((asoc == NULL) && (inp->nrsack_supported == 1))) {
 		pr_supported->chunk_types[num_ext++] = SCTP_NR_SELECTIVE_ACK;
-	p_len = sizeof(*pr_supported) + num_ext;
-	pr_supported->ph.param_length = htons(p_len);
-	bzero((caddr_t)pr_supported + p_len, SCTP_SIZE32(p_len) - p_len);
-	SCTP_BUF_LEN(m) += SCTP_SIZE32(p_len);
-
+	}
+	if (((asoc != NULL) && (asoc->pktdrop_supported == 1)) ||
+	    ((asoc == NULL) && (inp->pktdrop_supported == 1))) {
+		pr_supported->chunk_types[num_ext++] = SCTP_PACKET_DROPPED;
+	}
+	if (num_ext > 0) {
+		parameter_len = (uint16_t) sizeof(struct sctp_supported_chunk_types_param) + num_ext;
+		pr_supported->ph.param_type = htons(SCTP_SUPPORTED_CHUNK_EXT);
+		pr_supported->ph.param_length = htons(parameter_len);
+		padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
+		chunk_len += parameter_len;
+	}
 	/* add authentication parameters */
-	if (!SCTP_BASE_SYSCTL(sctp_auth_disable)) {
+	if (((asoc != NULL) && (asoc->auth_supported == 1)) ||
+	    ((asoc == NULL) && (inp->auth_supported == 1))) {
 		struct sctp_auth_random *randp;
 		struct sctp_auth_hmac_algo *hmacs;
 		struct sctp_auth_chunk_list *chunks;
-		uint16_t random_len;
 
+		if (padding_len > 0) {
+			memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
+			chunk_len += padding_len;
+			padding_len = 0;
+		}
 		/* generate and add RANDOM parameter */
-		random_len = SCTP_AUTH_RANDOM_SIZE_DEFAULT;
-		randp = (struct sctp_auth_random *)(mtod(m, caddr_t)+SCTP_BUF_LEN(m));
+		randp = (struct sctp_auth_random *)(mtod(m, caddr_t)+chunk_len);
+		parameter_len = (uint16_t) sizeof(struct sctp_auth_random) +
+		    SCTP_AUTH_RANDOM_SIZE_DEFAULT;
 		randp->ph.param_type = htons(SCTP_RANDOM);
-		p_len = sizeof(*randp) + random_len;
-		randp->ph.param_length = htons(p_len);
-		SCTP_READ_RANDOM(randp->random_data, random_len);
-		/* zero out any padding required */
-		bzero((caddr_t)randp + p_len, SCTP_SIZE32(p_len) - p_len);
-		SCTP_BUF_LEN(m) += SCTP_SIZE32(p_len);
+		randp->ph.param_length = htons(parameter_len);
+		SCTP_READ_RANDOM(randp->random_data, SCTP_AUTH_RANDOM_SIZE_DEFAULT);
+		padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
+		chunk_len += parameter_len;
 
+		if (padding_len > 0) {
+			memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
+			chunk_len += padding_len;
+			padding_len = 0;
+		}
 		/* add HMAC_ALGO parameter */
-		hmacs = (struct sctp_auth_hmac_algo *)(mtod(m, caddr_t)+SCTP_BUF_LEN(m));
-		p_len = sctp_serialize_hmaclist(inp->sctp_ep.local_hmacs,
+		hmacs = (struct sctp_auth_hmac_algo *)(mtod(m, caddr_t)+chunk_len);
+		parameter_len = (uint16_t) sizeof(struct sctp_auth_hmac_algo) +
+		    sctp_serialize_hmaclist(inp->sctp_ep.local_hmacs,
 		    (uint8_t *) hmacs->hmac_ids);
-		if (p_len > 0) {
-			p_len += sizeof(*hmacs);
-			hmacs->ph.param_type = htons(SCTP_HMAC_LIST);
-			hmacs->ph.param_length = htons(p_len);
-			/* zero out any padding required */
-			bzero((caddr_t)hmacs + p_len, SCTP_SIZE32(p_len) - p_len);
-			SCTP_BUF_LEN(m) += SCTP_SIZE32(p_len);
+		hmacs->ph.param_type = htons(SCTP_HMAC_LIST);
+		hmacs->ph.param_length = htons(parameter_len);
+		padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
+		chunk_len += parameter_len;
+
+		if (padding_len > 0) {
+			memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
+			chunk_len += padding_len;
+			padding_len = 0;
 		}
 		/* add CHUNKS parameter */
-		chunks = (struct sctp_auth_chunk_list *)(mtod(m, caddr_t)+SCTP_BUF_LEN(m));
-		p_len = sctp_serialize_auth_chunks(inp->sctp_ep.local_auth_chunks,
+		chunks = (struct sctp_auth_chunk_list *)(mtod(m, caddr_t)+chunk_len);
+		parameter_len = (uint16_t) sizeof(struct sctp_auth_chunk_list) +
+		    sctp_serialize_auth_chunks(inp->sctp_ep.local_auth_chunks,
 		    chunks->chunk_types);
-		if (p_len > 0) {
-			p_len += sizeof(*chunks);
-			chunks->ph.param_type = htons(SCTP_CHUNK_LIST);
-			chunks->ph.param_length = htons(p_len);
-			/* zero out any padding required */
-			bzero((caddr_t)chunks + p_len, SCTP_SIZE32(p_len) - p_len);
-			SCTP_BUF_LEN(m) += SCTP_SIZE32(p_len);
-		}
+		chunks->ph.param_type = htons(SCTP_CHUNK_LIST);
+		chunks->ph.param_length = htons(parameter_len);
+		padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
+		chunk_len += parameter_len;
 	}
-	m_at = m;
+	SCTP_BUF_LEN(m) = chunk_len;
+	m_last = m;
 	/* now the addresses */
-	{
-		struct sctp_scoping scp;
-
-		/*
-		 * To optimize this we could put the scoping stuff into a
-		 * structure and remove the individual uint8's from the stc
-		 * structure. Then we could just sifa in the address within
-		 * the stc.. but for now this is a quick hack to get the
-		 * address stuff teased apart.
-		 */
-		scp.ipv4_addr_legal = stc.ipv4_addr_legal;
-		scp.ipv6_addr_legal = stc.ipv6_addr_legal;
-		scp.loopback_scope = stc.loopback_scope;
-		scp.ipv4_local_scope = stc.ipv4_scope;
-		scp.local_scope = stc.local_scope;
-		scp.site_scope = stc.site_scope;
-		m_at = sctp_add_addresses_to_i_ia(inp, stcb, &scp, m_at, cnt_inits_to, NULL, NULL);
+	/*
+	 * To optimize this we could put the scoping stuff into a structure
+	 * and remove the individual uint8's from the stc structure. Then we
+	 * could just sifa in the address within the stc.. but for now this
+	 * is a quick hack to get the address stuff teased apart.
+	 */
+	scp.ipv4_addr_legal = stc.ipv4_addr_legal;
+	scp.ipv6_addr_legal = stc.ipv6_addr_legal;
+	scp.loopback_scope = stc.loopback_scope;
+	scp.ipv4_local_scope = stc.ipv4_scope;
+	scp.local_scope = stc.local_scope;
+	scp.site_scope = stc.site_scope;
+	m_last = sctp_add_addresses_to_i_ia(inp, stcb, &scp, m_last,
+	    cnt_inits_to,
+	    &padding_len, &chunk_len);
+	/* padding_len can only be positive, if no addresses have been added */
+	if (padding_len > 0) {
+		memset(mtod(m, caddr_t)+chunk_len, 0, padding_len);
+		chunk_len += padding_len;
+		SCTP_BUF_LEN(m) += padding_len;
+		padding_len = 0;
 	}
-
 	/* tack on the operational error if present */
 	if (op_err) {
-		struct mbuf *ol;
-		int llen;
-
-		llen = 0;
-		ol = op_err;
-
-		while (ol) {
-			llen += SCTP_BUF_LEN(ol);
-			ol = SCTP_BUF_NEXT(ol);
+		parameter_len = 0;
+		for (m_tmp = op_err; m_tmp != NULL; m_tmp = SCTP_BUF_NEXT(m_tmp)) {
+			parameter_len += SCTP_BUF_LEN(m_tmp);
 		}
-		if (llen % 4) {
-			/* must add a pad to the param */
-			uint32_t cpthis = 0;
-			int padlen;
-
-			padlen = 4 - (llen % 4);
-			m_copyback(op_err, llen, padlen, (caddr_t)&cpthis);
-		}
-		while (SCTP_BUF_NEXT(m_at) != NULL) {
-			m_at = SCTP_BUF_NEXT(m_at);
-		}
-		SCTP_BUF_NEXT(m_at) = op_err;
-		while (SCTP_BUF_NEXT(m_at) != NULL) {
-			m_at = SCTP_BUF_NEXT(m_at);
+		padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
+		SCTP_BUF_NEXT(m_last) = op_err;
+		while (SCTP_BUF_NEXT(m_last) != NULL) {
+			m_last = SCTP_BUF_NEXT(m_last);
 		}
+		chunk_len += parameter_len;
 	}
-	/* pre-calulate the size and update pkt header and chunk header */
-	p_len = 0;
-	for (m_tmp = m; m_tmp; m_tmp = SCTP_BUF_NEXT(m_tmp)) {
-		p_len += SCTP_BUF_LEN(m_tmp);
-		if (SCTP_BUF_NEXT(m_tmp) == NULL) {
-			/* m_tmp should now point to last one */
-			break;
+	if (padding_len > 0) {
+		m_last = sctp_add_pad_tombuf(m_last, padding_len);
+		if (m_last == NULL) {
+			/* Houston we have a problem, no space */
+			sctp_m_freem(m);
+			return;
 		}
+		chunk_len += padding_len;
+		padding_len = 0;
 	}
-
 	/* Now we must build a cookie */
 	m_cookie = sctp_add_cookie(init_pkt, offset, m, 0, &stc, &signature);
 	if (m_cookie == NULL) {
@@ -5912,21 +6053,22 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 		return;
 	}
 	/* Now append the cookie to the end and update the space/size */
-	SCTP_BUF_NEXT(m_tmp) = m_cookie;
-
-	for (m_tmp = m_cookie; m_tmp; m_tmp = SCTP_BUF_NEXT(m_tmp)) {
-		p_len += SCTP_BUF_LEN(m_tmp);
+	SCTP_BUF_NEXT(m_last) = m_cookie;
+	parameter_len = 0;
+	for (m_tmp = m_cookie; m_tmp != NULL; m_tmp = SCTP_BUF_NEXT(m_tmp)) {
+		parameter_len += SCTP_BUF_LEN(m_tmp);
 		if (SCTP_BUF_NEXT(m_tmp) == NULL) {
-			/* m_tmp should now point to last one */
-			mp_last = m_tmp;
-			break;
+			m_last = m_tmp;
 		}
 	}
+	padding_len = SCTP_SIZE32(parameter_len) - parameter_len;
+	chunk_len += parameter_len;
+
 	/*
 	 * Place in the size, but we don't include the last pad (if any) in
 	 * the INIT-ACK.
 	 */
-	initack->ch.chunk_length = htons(p_len);
+	initack->ch.chunk_length = htons(chunk_len);
 
 	/*
 	 * Time to sign the cookie, we don't sign over the cookie signature
@@ -5940,11 +6082,8 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 	 * We sifa 0 here to NOT set IP_DF if its IPv4, we ignore the return
 	 * here since the timer will drive a retranmission.
 	 */
-	padval = p_len % 4;
-	if ((padval) && (mp_last)) {
-		/* see my previous comments on mp_last */
-		if (sctp_add_pad_tombuf(mp_last, (4 - padval))) {
-			/* Houston we have a problem, no space */
+	if (padding_len > 0) {
+		if (sctp_add_pad_tombuf(m_last, padding_len) == NULL) {
 			sctp_m_freem(m);
 			return;
 		}
@@ -5975,7 +6114,7 @@ sctp_prune_prsctp(struct sctp_tcb *stcb,
 	struct sctp_tmit_chunk *chk, *nchk;
 
 	SCTP_TCB_LOCK_ASSERT(stcb);
-	if ((asoc->peer_supports_prsctp) &&
+	if ((asoc->prsctp_supported) &&
 	    (asoc->sent_queue_cnt_removeable > 0)) {
 		TAILQ_FOREACH(chk, &asoc->sent_queue, sctp_next) {
 			/*
@@ -7434,12 +7573,10 @@ sctp_move_to_outqueue(struct sctp_tcb *stcb,
 		int pads;
 
 		pads = SCTP_SIZE32(chk->book_size) - chk->send_size;
-		if (sctp_pad_lastmbuf(chk->data, pads, chk->last_mbuf) == 0) {
-			chk->pad_inplace = 1;
-		}
-		if ((lm = SCTP_BUF_NEXT(chk->last_mbuf)) != NULL) {
-			/* pad added an mbuf */
+		lm = sctp_pad_lastmbuf(chk->data, pads, chk->last_mbuf);
+		if (lm != NULL) {
 			chk->last_mbuf = lm;
+			chk->pad_inplace = 1;
 		}
 		chk->send_size += pads;
 	}
@@ -7671,7 +7808,6 @@ sctp_med_chunk_output(struct sctp_inpcb *inp,
 
 	*num_out = 0;
 	auth_keyid = stcb->asoc.authinfo.active_keyid;
-
 	if ((asoc->state & SCTP_STATE_SHUTDOWN_PENDING) ||
 	    (asoc->state & SCTP_STATE_SHUTDOWN_RECEIVED) ||
 	    (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_EXPLICIT_EOR))) {
@@ -10295,8 +10431,7 @@ sctp_send_sack(struct sctp_tcb *stcb, int so_locked
 	uint8_t type;
 	uint8_t tsn_map;
 
-	if ((stcb->asoc.sctp_nr_sack_on_off == 1) &&
-	    (stcb->asoc.peer_supports_nr_sack == 1)) {
+	if (stcb->asoc.nrsack_supported == 1) {
 		type = SCTP_NR_SELECTIVE_ACK;
 	} else {
 		type = SCTP_SELECTIVE_ACK;
@@ -10752,7 +10887,8 @@ sctp_send_abort_tcb(struct sctp_tcb *stcb, struct mbuf *operr, int so_locked
 	abort->ch.chunk_length = htons(chunk_len);
 	/* Add padding, if necessary. */
 	if (padding_len > 0) {
-		if ((m_last == NULL) || sctp_add_pad_tombuf(m_last, padding_len)) {
+		if ((m_last == NULL) ||
+		    (sctp_add_pad_tombuf(m_last, padding_len) == NULL)) {
 			sctp_m_freem(m_out);
 			return;
 		}
@@ -10818,13 +10954,14 @@ sctp_send_resp_msg(struct sockaddr *src, struct sockaddr *dst,
 	struct mbuf *mout;
 	struct sctphdr *shout;
 	struct sctp_chunkhdr *ch;
-	struct udphdr *udp;
-	int len, cause_len, padding_len;
 
 #if defined(INET) || defined(INET6)
+	struct udphdr *udp;
 	int ret;
 
 #endif
+	int len, cause_len, padding_len;
+
 #ifdef INET
 	struct sockaddr_in *src_sin, *dst_sin;
 	struct ip *ip;
@@ -10851,7 +10988,7 @@ sctp_send_resp_msg(struct sockaddr *src, struct sockaddr *dst,
 			padding_len = 4 - padding_len;
 		}
 		if (padding_len != 0) {
-			if (sctp_add_pad_tombuf(m_last, padding_len)) {
+			if (sctp_add_pad_tombuf(m_last, padding_len) == NULL) {
 				sctp_m_freem(cause);
 				return;
 			}
@@ -10875,9 +11012,11 @@ sctp_send_resp_msg(struct sockaddr *src, struct sockaddr *dst,
 	default:
 		break;
 	}
+#if defined(INET) || defined(INET6)
 	if (port) {
 		len += sizeof(struct udphdr);
 	}
+#endif
 	mout = sctp_get_mbuf_for_msg(len + max_linkhdr, 1, M_NOWAIT, 1, MT_DATA);
 	if (mout == NULL) {
 		if (cause) {
@@ -10948,6 +11087,7 @@ sctp_send_resp_msg(struct sockaddr *src, struct sockaddr *dst,
 		shout = mtod(mout, struct sctphdr *);
 		break;
 	}
+#if defined(INET) || defined(INET6)
 	if (port) {
 		if (htons(SCTP_BASE_SYSCTL(sctp_udp_tunneling_port)) == 0) {
 			sctp_m_freem(mout);
@@ -10966,6 +11106,7 @@ sctp_send_resp_msg(struct sockaddr *src, struct sockaddr *dst,
 	} else {
 		udp = NULL;
 	}
+#endif
 	shout->src_port = sh->dest_port;
 	shout->dest_port = sh->src_port;
 	shout->checksum = 0;
@@ -11269,7 +11410,7 @@ sctp_send_packet_dropped(struct sctp_tcb *stcb, struct sctp_nets *net,
 	}
 	asoc = &stcb->asoc;
 	SCTP_TCB_LOCK_ASSERT(stcb);
-	if (asoc->peer_supports_pktdrop == 0) {
+	if (asoc->pktdrop_supported == 0) {
 		/*-
 		 * peer must declare support before I send one.
 		 */
@@ -12826,7 +12967,7 @@ sctp_lower_sosend(struct socket *so,
 				continue;
 			}
 			/* PR-SCTP? */
-			if ((asoc->peer_supports_prsctp) && (asoc->sent_queue_cnt_removeable > 0)) {
+			if ((asoc->prsctp_supported) && (asoc->sent_queue_cnt_removeable > 0)) {
 				/*
 				 * This is ugly but we must assure locking
 				 * order
@@ -13277,12 +13418,7 @@ sctp_add_auth_chunk(struct mbuf *m, struct mbuf **m_end,
 	    (stcb == NULL))
 		return (m);
 
-	/* sysctl disabled auth? */
-	if (SCTP_BASE_SYSCTL(sctp_auth_disable))
-		return (m);
-
-	/* peer doesn't do auth... */
-	if (!stcb->asoc.peer_supports_auth) {
+	if (stcb->asoc.auth_supported == 0) {
 		return (m);
 	}
 	/* does the requested chunk require auth? */
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index 861455c40b8d..39348a472042 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -46,7 +46,9 @@ __FBSDID("$FreeBSD$");
 #include <netinet/sctp_timer.h>
 #include <netinet/sctp_bsd_addr.h>
 #include <netinet/sctp_dtrace_define.h>
+#if defined(INET) || defined(INET6)
 #include <netinet/udp.h>
+#endif
 #ifdef INET6
 #include <netinet6/ip6_var.h>
 #endif
@@ -898,6 +900,10 @@ sctp_does_stcb_own_this_addr(struct sctp_tcb *stcb, struct sockaddr *to)
 						    IN4_ISPRIVATE_ADDRESS(&sin->sin_addr)) {
 							continue;
 						}
+						if (prison_check_ip4(stcb->sctp_ep->ip_inp.inp.inp_cred,
+						    &sin->sin_addr) != 0) {
+							continue;
+						}
 						if (sin->sin_addr.s_addr == rsin->sin_addr.s_addr) {
 							SCTP_IPI_ADDR_RUNLOCK();
 							return (1);
@@ -913,6 +919,10 @@ sctp_does_stcb_own_this_addr(struct sctp_tcb *stcb, struct sockaddr *to)
 
 						sin6 = &sctp_ifa->address.sin6;
 						rsin6 = (struct sockaddr_in6 *)to;
+						if (prison_check_ip6(stcb->sctp_ep->ip_inp.inp.inp_cred,
+						    &sin6->sin6_addr) != 0) {
+							continue;
+						}
 						if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
 							if (local_scope == 0)
 								continue;
@@ -1060,6 +1070,39 @@ sctp_tcb_special_locate(struct sctp_inpcb **inp_p, struct sockaddr *from,
 			SCTP_INP_RUNLOCK(inp);
 			continue;
 		}
+		switch (to->sa_family) {
+#ifdef INET
+		case AF_INET:
+			{
+				struct sockaddr_in *sin;
+
+				sin = (struct sockaddr_in *)to;
+				if (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+				    &sin->sin_addr) != 0) {
+					SCTP_INP_RUNLOCK(inp);
+					continue;
+				}
+				break;
+			}
+#endif
+#ifdef INET6
+		case AF_INET6:
+			{
+				struct sockaddr_in6 *sin6;
+
+				sin6 = (struct sockaddr_in6 *)to;
+				if (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+				    &sin6->sin6_addr) != 0) {
+					SCTP_INP_RUNLOCK(inp);
+					continue;
+				}
+				break;
+			}
+#endif
+		default:
+			SCTP_INP_RUNLOCK(inp);
+			continue;
+		}
 		if (inp->def_vrf_id != vrf_id) {
 			SCTP_INP_RUNLOCK(inp);
 			continue;
@@ -1628,23 +1671,45 @@ sctp_endpoint_probe(struct sockaddr *nam, struct sctppcbhead *head,
 		if ((inp->sctp_flags & SCTP_PCB_FLAGS_BOUNDALL) &&
 		    (inp->sctp_lport == lport)) {
 			/* got it */
+			switch (nam->sa_family) {
 #ifdef INET
-			if ((nam->sa_family == AF_INET) &&
-			    (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) &&
-			    SCTP_IPV6_V6ONLY(inp)) {
-				/* IPv4 on a IPv6 socket with ONLY IPv6 set */
-				SCTP_INP_RUNLOCK(inp);
-				continue;
-			}
+			case AF_INET:
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) &&
+				    SCTP_IPV6_V6ONLY(inp)) {
+					/*
+					 * IPv4 on a IPv6 socket with ONLY
+					 * IPv6 set
+					 */
+					SCTP_INP_RUNLOCK(inp);
+					continue;
+				}
+				if (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+				    &sin->sin_addr) != 0) {
+					SCTP_INP_RUNLOCK(inp);
+					continue;
+				}
+				break;
 #endif
 #ifdef INET6
-			/* A V6 address and the endpoint is NOT bound V6 */
-			if (nam->sa_family == AF_INET6 &&
-			    (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) == 0) {
-				SCTP_INP_RUNLOCK(inp);
-				continue;
-			}
+			case AF_INET6:
+				/*
+				 * A V6 address and the endpoint is NOT
+				 * bound V6
+				 */
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) == 0) {
+					SCTP_INP_RUNLOCK(inp);
+					continue;
+				}
+				if (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+				    &sin6->sin6_addr) != 0) {
+					SCTP_INP_RUNLOCK(inp);
+					continue;
+				}
+				break;
 #endif
+			default:
+				break;
+			}
 			/* does a VRF id match? */
 			fnd = 0;
 			if (inp->def_vrf_id == vrf_id)
@@ -2403,6 +2468,7 @@ sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id)
 	/* setup socket pointers */
 	inp->sctp_socket = so;
 	inp->ip_inp.inp.inp_socket = so;
+	inp->ip_inp.inp.inp_cred = crhold(so->so_cred);
 #ifdef INET6
 	if (INP_SOCKAF(so) == AF_INET6) {
 		if (MODULE_GLOBAL(ip6_auto_flowlabel)) {
@@ -2417,10 +2483,17 @@ sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id)
 	inp->partial_delivery_point = SCTP_SB_LIMIT_RCV(so) >> SCTP_PARTIAL_DELIVERY_SHIFT;
 	inp->sctp_frag_point = SCTP_DEFAULT_MAXSEGMENT;
 	inp->sctp_cmt_on_off = SCTP_BASE_SYSCTL(sctp_cmt_on_off);
-	inp->sctp_ecn_enable = SCTP_BASE_SYSCTL(sctp_ecn_enable);
+	inp->ecn_supported = (uint8_t) SCTP_BASE_SYSCTL(sctp_ecn_enable);
+	inp->prsctp_supported = (uint8_t) SCTP_BASE_SYSCTL(sctp_pr_enable);
+	inp->auth_supported = (uint8_t) SCTP_BASE_SYSCTL(sctp_auth_enable);
+	inp->asconf_supported = (uint8_t) SCTP_BASE_SYSCTL(sctp_asconf_enable);
+	inp->reconfig_supported = (uint8_t) SCTP_BASE_SYSCTL(sctp_reconfig_enable);
+	inp->nrsack_supported = (uint8_t) SCTP_BASE_SYSCTL(sctp_nrsack_enable);
+	inp->pktdrop_supported = (uint8_t) SCTP_BASE_SYSCTL(sctp_pktdrop_enable);
 	/* init the small hash table we use to track asocid <-> tcb */
 	inp->sctp_asocidhash = SCTP_HASH_INIT(SCTP_STACK_VTAG_HASH_SIZE, &inp->hashasocidmark);
 	if (inp->sctp_asocidhash == NULL) {
+		crfree(inp->ip_inp.inp.inp_cred);
 		SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_ep), inp);
 		SCTP_INP_INFO_WUNLOCK();
 		return (ENOBUFS);
@@ -2435,6 +2508,7 @@ sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id)
 		((struct in6pcb *)(&inp->ip_inp.inp))->in6p_sp = pcb_sp;
 	}
 	if (error != 0) {
+		crfree(inp->ip_inp.inp.inp_cred);
 		SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_ep), inp);
 		SCTP_INP_INFO_WUNLOCK();
 		return error;
@@ -2465,6 +2539,7 @@ sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id)
 		 */
 		SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_PCB, EOPNOTSUPP);
 		so->so_pcb = NULL;
+		crfree(inp->ip_inp.inp.inp_cred);
 		SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_ep), inp);
 		return (EOPNOTSUPP);
 	}
@@ -2484,6 +2559,7 @@ sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id)
 		SCTP_PRINTF("Out of SCTP-INPCB->hashinit - no resources\n");
 		SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_PCB, ENOBUFS);
 		so->so_pcb = NULL;
+		crfree(inp->ip_inp.inp.inp_cred);
 		SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_ep), inp);
 		return (ENOBUFS);
 	}
@@ -2577,12 +2653,15 @@ sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id)
 	 */
 	m->local_hmacs = sctp_default_supported_hmaclist();
 	m->local_auth_chunks = sctp_alloc_chunklist();
+	if (inp->asconf_supported) {
+		sctp_auth_add_chunk(SCTP_ASCONF, m->local_auth_chunks);
+		sctp_auth_add_chunk(SCTP_ASCONF_ACK, m->local_auth_chunks);
+	}
 	m->default_dscp = 0;
 #ifdef INET6
 	m->default_flowlabel = 0;
 #endif
 	m->port = 0;		/* encapsulation disabled by default */
-	sctp_auth_set_default_chunks(m->local_auth_chunks);
 	LIST_INIT(&m->shared_keys);
 	/* add default NULL key as key id 0 */
 	null_key = sctp_alloc_sharedkey();
@@ -3630,6 +3709,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from)
 		inp->sctp_tcbhash = NULL;
 	}
 	/* Now we must put the ep memory back into the zone pool */
+	crfree(inp->ip_inp.inp.inp_cred);
 	INP_LOCK_DESTROY(&inp->ip_inp.inp);
 	SCTP_INP_LOCK_DESTROY(inp);
 	SCTP_INP_READ_DESTROY(inp);
@@ -3897,9 +3977,14 @@ sctp_add_remote_addr(struct sctp_tcb *stcb, struct sockaddr *newaddr,
 		    net,
 		    0,
 		    stcb->asoc.vrf_id);
-		/* Now get the interface MTU */
-		if (net->ro._s_addr && net->ro._s_addr->ifn_p) {
-			net->mtu = SCTP_GATHER_MTU_FROM_INTFC(net->ro._s_addr->ifn_p);
+		if (net->ro._s_addr != NULL) {
+			net->src_addr_selected = 1;
+			/* Now get the interface MTU */
+			if (net->ro._s_addr->ifn_p != NULL) {
+				net->mtu = SCTP_GATHER_MTU_FROM_INTFC(net->ro._s_addr->ifn_p);
+			}
+		} else {
+			net->src_addr_selected = 0;
 		}
 		if (net->mtu > 0) {
 			uint32_t rmtu;
@@ -3921,6 +4006,8 @@ sctp_add_remote_addr(struct sctp_tcb *stcb, struct sockaddr *newaddr,
 				net->mtu = rmtu;
 			}
 		}
+	} else {
+		net->src_addr_selected = 0;
 	}
 	if (net->mtu == 0) {
 		switch (newaddr->sa_family) {
@@ -3938,9 +4025,11 @@ sctp_add_remote_addr(struct sctp_tcb *stcb, struct sockaddr *newaddr,
 			break;
 		}
 	}
+#if defined(INET) || defined(INET6)
 	if (net->port) {
 		net->mtu -= (uint32_t) sizeof(struct udphdr);
 	}
+#endif
 	if (from == SCTP_ALLOC_ASOC) {
 		stcb->asoc.smallest_mtu = net->mtu;
 	}
@@ -3966,7 +4055,6 @@ sctp_add_remote_addr(struct sctp_tcb *stcb, struct sockaddr *newaddr,
 	 */
 	net->find_pseudo_cumack = 1;
 	net->find_rtx_pseudo_cumack = 1;
-	net->src_addr_selected = 0;
 	/* Choose an initial flowid. */
 	net->flowid = stcb->asoc.my_vtag ^
 	    ntohs(stcb->rport) ^
@@ -6002,7 +6090,14 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m,
 	sctp_key_t *new_key;
 	uint32_t keylen;
 	int got_random = 0, got_hmacs = 0, got_chklist = 0;
-	uint8_t ecn_allowed;
+	uint8_t peer_supports_ecn;
+	uint8_t peer_supports_prsctp;
+	uint8_t peer_supports_auth;
+	uint8_t peer_supports_asconf;
+	uint8_t peer_supports_asconf_ack;
+	uint8_t peer_supports_reconfig;
+	uint8_t peer_supports_nrsack;
+	uint8_t peer_supports_pktdrop;
 
 #ifdef INET
 	struct sockaddr_in sin;
@@ -6031,8 +6126,14 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m,
 	} else {
 		sa = src;
 	}
-	/* Turn off ECN until we get through all params */
-	ecn_allowed = 0;
+	peer_supports_ecn = 0;
+	peer_supports_prsctp = 0;
+	peer_supports_auth = 0;
+	peer_supports_asconf = 0;
+	peer_supports_asconf = 0;
+	peer_supports_reconfig = 0;
+	peer_supports_nrsack = 0;
+	peer_supports_pktdrop = 0;
 	TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) {
 		/* mark all addresses that we have currently on the list */
 		net->dest_state |= SCTP_ADDR_NOT_IN_ASSOC;
@@ -6082,12 +6183,6 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m,
 		/* the assoc was freed? */
 		return (-4);
 	}
-	/*
-	 * peer must explicitly turn this on. This may have been initialized
-	 * to be "on" in order to allow local addr changes while INIT's are
-	 * in flight.
-	 */
-	stcb->asoc.peer_supports_asconf = 0;
 	/* now we must go through each of the params. */
 	phdr = sctp_get_next_param(m, offset, &parm_buf, sizeof(parm_buf));
 	while (phdr) {
@@ -6281,7 +6376,7 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m,
 		} else
 #endif
 		if (ptype == SCTP_ECN_CAPABLE) {
-			ecn_allowed = 1;
+			peer_supports_ecn = 1;
 		} else if (ptype == SCTP_ULP_ADAPTATION) {
 			if (stcb->asoc.state != SCTP_STATE_OPEN) {
 				struct sctp_adaptation_layer_indication ai,
@@ -6305,7 +6400,9 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m,
 
 #endif
 
-			stcb->asoc.peer_supports_asconf = 1;
+			if (stcb->asoc.asconf_supported == 0) {
+				return (-100);
+			}
 			if (plen > sizeof(lstore)) {
 				return (-23);
 			}
@@ -6357,7 +6454,7 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m,
 			stcb->asoc.peer_supports_nat = 1;
 		} else if (ptype == SCTP_PRSCTP_SUPPORTED) {
 			/* Peer supports pr-sctp */
-			stcb->asoc.peer_supports_prsctp = 1;
+			peer_supports_prsctp = 1;
 		} else if (ptype == SCTP_SUPPORTED_CHUNK_EXT) {
 			/* A supported extension chunk */
 			struct sctp_supported_chunk_types_param *pr_supported;
@@ -6369,34 +6466,29 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m,
 			if (phdr == NULL) {
 				return (-25);
 			}
-			stcb->asoc.peer_supports_asconf = 0;
-			stcb->asoc.peer_supports_prsctp = 0;
-			stcb->asoc.peer_supports_pktdrop = 0;
-			stcb->asoc.peer_supports_strreset = 0;
-			stcb->asoc.peer_supports_nr_sack = 0;
-			stcb->asoc.peer_supports_auth = 0;
 			pr_supported = (struct sctp_supported_chunk_types_param *)phdr;
 			num_ent = plen - sizeof(struct sctp_paramhdr);
 			for (i = 0; i < num_ent; i++) {
 				switch (pr_supported->chunk_types[i]) {
 				case SCTP_ASCONF:
+					peer_supports_asconf = 1;
 				case SCTP_ASCONF_ACK:
-					stcb->asoc.peer_supports_asconf = 1;
+					peer_supports_asconf_ack = 1;
 					break;
 				case SCTP_FORWARD_CUM_TSN:
-					stcb->asoc.peer_supports_prsctp = 1;
+					peer_supports_prsctp = 1;
 					break;
 				case SCTP_PACKET_DROPPED:
-					stcb->asoc.peer_supports_pktdrop = 1;
+					peer_supports_pktdrop = 1;
 					break;
 				case SCTP_NR_SELECTIVE_ACK:
-					stcb->asoc.peer_supports_nr_sack = 1;
+					peer_supports_nrsack = 1;
 					break;
 				case SCTP_STREAM_RESET:
-					stcb->asoc.peer_supports_strreset = 1;
+					peer_supports_reconfig = 1;
 					break;
 				case SCTP_AUTHENTICATION:
-					stcb->asoc.peer_supports_auth = 1;
+					peer_supports_auth = 1;
 					break;
 				default:
 					/* one I have not learned yet */
@@ -6533,24 +6625,47 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m,
 			}
 		}
 	}
-	if (ecn_allowed == 0) {
-		stcb->asoc.ecn_allowed = 0;
+	if ((stcb->asoc.ecn_supported == 1) &&
+	    (peer_supports_ecn == 0)) {
+		stcb->asoc.ecn_supported = 0;
+	}
+	if ((stcb->asoc.prsctp_supported == 1) &&
+	    (peer_supports_prsctp == 0)) {
+		stcb->asoc.prsctp_supported = 0;
+	}
+	if ((stcb->asoc.auth_supported == 1) &&
+	    ((peer_supports_auth == 0) ||
+	    (got_random == 0) || (got_hmacs == 0))) {
+		stcb->asoc.auth_supported = 0;
+	}
+	if ((stcb->asoc.asconf_supported == 1) &&
+	    ((peer_supports_asconf == 0) || (peer_supports_asconf_ack == 0) ||
+	    (stcb->asoc.auth_supported == 0) ||
+	    (saw_asconf == 0) || (saw_asconf_ack == 0))) {
+		stcb->asoc.asconf_supported = 0;
+	}
+	if ((stcb->asoc.reconfig_supported == 1) &&
+	    (peer_supports_reconfig == 0)) {
+		stcb->asoc.reconfig_supported = 0;
+	}
+	if ((stcb->asoc.nrsack_supported == 1) &&
+	    (peer_supports_nrsack == 0)) {
+		stcb->asoc.nrsack_supported = 0;
+	}
+	if ((stcb->asoc.pktdrop_supported == 1) &&
+	    (peer_supports_pktdrop == 0)) {
+		stcb->asoc.pktdrop_supported = 0;
 	}
 	/* validate authentication required parameters */
-	if (got_random && got_hmacs) {
-		stcb->asoc.peer_supports_auth = 1;
-	} else {
-		stcb->asoc.peer_supports_auth = 0;
-	}
-	if (!stcb->asoc.peer_supports_auth && got_chklist) {
+	if ((peer_supports_auth == 0) && (got_chklist == 1)) {
 		/* peer does not support auth but sent a chunks list? */
 		return (-31);
 	}
-	if (!SCTP_BASE_SYSCTL(sctp_asconf_auth_nochk) && stcb->asoc.peer_supports_asconf &&
-	    !stcb->asoc.peer_supports_auth) {
+	if ((peer_supports_asconf == 1) && (peer_supports_auth == 0)) {
 		/* peer supports asconf but not auth? */
 		return (-32);
-	} else if ((stcb->asoc.peer_supports_asconf) && (stcb->asoc.peer_supports_auth) &&
+	} else if ((peer_supports_asconf == 1) &&
+		    (peer_supports_auth == 1) &&
 	    ((saw_asconf == 0) || (saw_asconf_ack == 0))) {
 		return (-33);
 	}
diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h
index 8045765c4c5e..c9183b1d8207 100644
--- a/sys/netinet/sctp_pcb.h
+++ b/sys/netinet/sctp_pcb.h
@@ -406,7 +406,13 @@ struct sctp_inpcb {
 	uint32_t sctp_context;
 	uint8_t local_strreset_support;
 	uint32_t sctp_cmt_on_off;
-	uint32_t sctp_ecn_enable;
+	uint8_t ecn_supported;
+	uint8_t prsctp_supported;
+	uint8_t auth_supported;
+	uint8_t asconf_supported;
+	uint8_t reconfig_supported;
+	uint8_t nrsack_supported;
+	uint8_t pktdrop_supported;
 	struct sctp_nonpad_sndrcvinfo def_send;
 	/*-
 	 * These three are here for the sosend_dgram
diff --git a/sys/netinet/sctp_peeloff.c b/sys/netinet/sctp_peeloff.c
index fd8c93c54763..cf41d29f71cd 100644
--- a/sys/netinet/sctp_peeloff.c
+++ b/sys/netinet/sctp_peeloff.c
@@ -118,7 +118,13 @@ sctp_do_peeloff(struct socket *head, struct socket *so, sctp_assoc_t assoc_id)
 	n_inp->sctp_mobility_features = inp->sctp_mobility_features;
 	n_inp->sctp_frag_point = inp->sctp_frag_point;
 	n_inp->sctp_cmt_on_off = inp->sctp_cmt_on_off;
-	n_inp->sctp_ecn_enable = inp->sctp_ecn_enable;
+	n_inp->ecn_supported = inp->ecn_supported;
+	n_inp->prsctp_supported = inp->prsctp_supported;
+	n_inp->auth_supported = inp->auth_supported;
+	n_inp->asconf_supported = inp->asconf_supported;
+	n_inp->reconfig_supported = inp->reconfig_supported;
+	n_inp->nrsack_supported = inp->nrsack_supported;
+	n_inp->pktdrop_supported = inp->pktdrop_supported;
 	n_inp->partial_delivery_point = inp->partial_delivery_point;
 	n_inp->sctp_context = inp->sctp_context;
 	n_inp->local_strreset_support = inp->local_strreset_support;
diff --git a/sys/netinet/sctp_structs.h b/sys/netinet/sctp_structs.h
index a8b86c620400..9be861493c67 100644
--- a/sys/netinet/sctp_structs.h
+++ b/sys/netinet/sctp_structs.h
@@ -1150,30 +1150,21 @@ struct sctp_association {
 	 * sum is updated as well.
 	 */
 
-	/* Flag to tell if ECN is allowed */
-	uint8_t ecn_allowed;
+	/* Flags whether an extension is supported or not */
+	uint8_t ecn_supported;
+	uint8_t prsctp_supported;
+	uint8_t auth_supported;
+	uint8_t asconf_supported;
+	uint8_t reconfig_supported;
+	uint8_t nrsack_supported;
+	uint8_t pktdrop_supported;
 
 	/* Did the peer make the stream config (add out) request */
 	uint8_t peer_req_out;
 
-	/* flag to indicate if peer can do asconf */
-	uint8_t peer_supports_asconf;
-	/* EY - flag to indicate if peer can do nr_sack */
-	uint8_t peer_supports_nr_sack;
-	/* pr-sctp support flag */
-	uint8_t peer_supports_prsctp;
-	/* peer authentication support flag */
-	uint8_t peer_supports_auth;
-	/* stream resets are supported by the peer */
-	uint8_t peer_supports_strreset;
 	uint8_t local_strreset_support;
 
 	uint8_t peer_supports_nat;
-	/*
-	 * packet drop's are supported by the peer, we don't really care
-	 * about this but we bookkeep it anyway.
-	 */
-	uint8_t peer_supports_pktdrop;
 
 	struct sctp_scoping scope;
 	/* flags to handle send alternate net tracking */
@@ -1198,8 +1189,6 @@ struct sctp_association {
 	uint8_t sctp_cmt_on_off;
 	uint8_t iam_blocking;
 	uint8_t cookie_how[8];
-	/* EY 05/05/08 - NR_SACK variable */
-	uint8_t sctp_nr_sack_on_off;
 	/* JRS 5/21/07 - CMT PF variable */
 	uint8_t sctp_cmt_pf;
 	uint8_t use_precise_time;
diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c
index 5836dcb1d77f..5bdb08a49556 100644
--- a/sys/netinet/sctp_sysctl.c
+++ b/sys/netinet/sctp_sysctl.c
@@ -54,6 +54,12 @@ sctp_init_sysctls()
 	SCTP_BASE_SYSCTL(sctp_auto_asconf) = SCTPCTL_AUTOASCONF_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_multiple_asconfs) = SCTPCTL_MULTIPLEASCONFS_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_ecn_enable) = SCTPCTL_ECN_ENABLE_DEFAULT;
+	SCTP_BASE_SYSCTL(sctp_pr_enable) = SCTPCTL_PR_ENABLE_DEFAULT;
+	SCTP_BASE_SYSCTL(sctp_auth_enable) = SCTPCTL_AUTH_ENABLE_DEFAULT;
+	SCTP_BASE_SYSCTL(sctp_asconf_enable) = SCTPCTL_ASCONF_ENABLE_DEFAULT;
+	SCTP_BASE_SYSCTL(sctp_reconfig_enable) = SCTPCTL_RECONFIG_ENABLE_DEFAULT;
+	SCTP_BASE_SYSCTL(sctp_nrsack_enable) = SCTPCTL_NRSACK_ENABLE_DEFAULT;
+	SCTP_BASE_SYSCTL(sctp_pktdrop_enable) = SCTPCTL_PKTDROP_ENABLE_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_strict_sacks) = SCTPCTL_STRICT_SACKS_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_peer_chunk_oh) = SCTPCTL_PEER_CHKOH_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_max_burst_default) = SCTPCTL_MAXBURST_DEFAULT;
@@ -84,12 +90,8 @@ sctp_init_sysctls()
 	SCTP_BASE_SYSCTL(sctp_nr_incoming_streams_default) = SCTPCTL_INCOMING_STREAMS_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_nr_outgoing_streams_default) = SCTPCTL_OUTGOING_STREAMS_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_cmt_on_off) = SCTPCTL_CMT_ON_OFF_DEFAULT;
-	/* EY */
-	SCTP_BASE_SYSCTL(sctp_nr_sack_on_off) = SCTPCTL_NR_SACK_ON_OFF_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_cmt_use_dac) = SCTPCTL_CMT_USE_DAC_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_use_cwnd_based_maxburst) = SCTPCTL_CWND_MAXBURST_DEFAULT;
-	SCTP_BASE_SYSCTL(sctp_asconf_auth_nochk) = SCTPCTL_ASCONF_AUTH_NOCHK_DEFAULT;
-	SCTP_BASE_SYSCTL(sctp_auth_disable) = SCTPCTL_AUTH_DISABLE_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_nat_friendly) = SCTPCTL_NAT_FRIENDLY_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_L2_abc_variable) = SCTPCTL_ABC_L_VAR_DEFAULT;
 	SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count) = SCTPCTL_MAX_CHAINED_MBUFS_DEFAULT;
@@ -252,6 +254,10 @@ copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct s
 						sin = (struct sockaddr_in *)&sctp_ifa->address.sa;
 						if (sin->sin_addr.s_addr == 0)
 							continue;
+						if (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+						    &sin->sin_addr) != 0) {
+							continue;
+						}
 						if ((ipv4_local_scope == 0) && (IN4_ISPRIVATE_ADDRESS(&sin->sin_addr)))
 							continue;
 					} else {
@@ -267,6 +273,10 @@ copy_out_local_addresses(struct sctp_inpcb *inp, struct sctp_tcb *stcb, struct s
 						sin6 = (struct sockaddr_in6 *)&sctp_ifa->address.sa;
 						if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr))
 							continue;
+						if (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+						    &sin6->sin6_addr) != 0) {
+							continue;
+						}
 						if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
 							if (local_scope == 0)
 								continue;
@@ -593,6 +603,10 @@ sysctl_sctp_check(SYSCTL_HANDLER_ARGS)
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_recvspace), SCTPCTL_RECVSPACE_MIN, SCTPCTL_RECVSPACE_MAX);
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_auto_asconf), SCTPCTL_AUTOASCONF_MIN, SCTPCTL_AUTOASCONF_MAX);
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_ecn_enable), SCTPCTL_ECN_ENABLE_MIN, SCTPCTL_ECN_ENABLE_MAX);
+		RANGECHK(SCTP_BASE_SYSCTL(sctp_pr_enable), SCTPCTL_PR_ENABLE_MIN, SCTPCTL_PR_ENABLE_MAX);
+		RANGECHK(SCTP_BASE_SYSCTL(sctp_reconfig_enable), SCTPCTL_RECONFIG_ENABLE_MIN, SCTPCTL_RECONFIG_ENABLE_MAX);
+		RANGECHK(SCTP_BASE_SYSCTL(sctp_nrsack_enable), SCTPCTL_NRSACK_ENABLE_MIN, SCTPCTL_NRSACK_ENABLE_MAX);
+		RANGECHK(SCTP_BASE_SYSCTL(sctp_pktdrop_enable), SCTPCTL_PKTDROP_ENABLE_MIN, SCTPCTL_PKTDROP_ENABLE_MAX);
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_strict_sacks), SCTPCTL_STRICT_SACKS_MIN, SCTPCTL_STRICT_SACKS_MAX);
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_peer_chunk_oh), SCTPCTL_PEER_CHKOH_MIN, SCTPCTL_PEER_CHKOH_MAX);
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_max_burst_default), SCTPCTL_MAXBURST_MIN, SCTPCTL_MAXBURST_MAX);
@@ -623,12 +637,8 @@ sysctl_sctp_check(SYSCTL_HANDLER_ARGS)
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_nr_incoming_streams_default), SCTPCTL_INCOMING_STREAMS_MIN, SCTPCTL_INCOMING_STREAMS_MAX);
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_nr_outgoing_streams_default), SCTPCTL_OUTGOING_STREAMS_MIN, SCTPCTL_OUTGOING_STREAMS_MAX);
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_cmt_on_off), SCTPCTL_CMT_ON_OFF_MIN, SCTPCTL_CMT_ON_OFF_MAX);
-		/* EY */
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_nr_sack_on_off), SCTPCTL_NR_SACK_ON_OFF_MIN, SCTPCTL_NR_SACK_ON_OFF_MAX);
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_cmt_use_dac), SCTPCTL_CMT_USE_DAC_MIN, SCTPCTL_CMT_USE_DAC_MAX);
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_use_cwnd_based_maxburst), SCTPCTL_CWND_MAXBURST_MIN, SCTPCTL_CWND_MAXBURST_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_asconf_auth_nochk), SCTPCTL_ASCONF_AUTH_NOCHK_MIN, SCTPCTL_ASCONF_AUTH_NOCHK_MAX);
-		RANGECHK(SCTP_BASE_SYSCTL(sctp_auth_disable), SCTPCTL_AUTH_DISABLE_MIN, SCTPCTL_AUTH_DISABLE_MAX);
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_nat_friendly), SCTPCTL_NAT_FRIENDLY_MIN, SCTPCTL_NAT_FRIENDLY_MAX);
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_L2_abc_variable), SCTPCTL_ABC_L_VAR_MIN, SCTPCTL_ABC_L_VAR_MAX);
 		RANGECHK(SCTP_BASE_SYSCTL(sctp_mbuf_threshold_count), SCTPCTL_MAX_CHAINED_MBUFS_MIN, SCTPCTL_MAX_CHAINED_MBUFS_MAX);
@@ -667,6 +677,56 @@ sysctl_sctp_check(SYSCTL_HANDLER_ARGS)
 	return (error);
 }
 
+static int
+sysctl_sctp_auth_check(SYSCTL_HANDLER_ARGS)
+{
+	int error;
+
+	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
+	if (error == 0) {
+		if (SCTP_BASE_SYSCTL(sctp_auth_enable) < SCTPCTL_AUTH_ENABLE_MIN) {
+			SCTP_BASE_SYSCTL(sctp_auth_enable) = SCTPCTL_AUTH_ENABLE_MIN;
+		}
+		if (SCTP_BASE_SYSCTL(sctp_auth_enable) > SCTPCTL_AUTH_ENABLE_MAX) {
+			SCTP_BASE_SYSCTL(sctp_auth_enable) = SCTPCTL_AUTH_ENABLE_MAX;
+		}
+		if ((SCTP_BASE_SYSCTL(sctp_auth_enable) == 0) &&
+		    (SCTP_BASE_SYSCTL(sctp_asconf_enable) == 1)) {
+			/*
+			 * You can't disable AUTH with disabling ASCONF
+			 * first
+			 */
+			SCTP_BASE_SYSCTL(sctp_auth_enable) = 1;
+		}
+	}
+	return (error);
+}
+
+static int
+sysctl_sctp_asconf_check(SYSCTL_HANDLER_ARGS)
+{
+	int error;
+
+	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
+	if (error == 0) {
+		if (SCTP_BASE_SYSCTL(sctp_asconf_enable) < SCTPCTL_ASCONF_ENABLE_MIN) {
+			SCTP_BASE_SYSCTL(sctp_asconf_enable) = SCTPCTL_ASCONF_ENABLE_MIN;
+		}
+		if (SCTP_BASE_SYSCTL(sctp_asconf_enable) > SCTPCTL_ASCONF_ENABLE_MAX) {
+			SCTP_BASE_SYSCTL(sctp_asconf_enable) = SCTPCTL_ASCONF_ENABLE_MAX;
+		}
+		if ((SCTP_BASE_SYSCTL(sctp_asconf_enable) == 1) &&
+		    (SCTP_BASE_SYSCTL(sctp_auth_enable) == 0)) {
+			/*
+			 * You can't enable ASCONF without enabling AUTH
+			 * first
+			 */
+			SCTP_BASE_SYSCTL(sctp_asconf_enable) = 0;
+		}
+	}
+	return (error);
+}
+
 #if defined(__FreeBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
 static int
 sysctl_stat_get(SYSCTL_HANDLER_ARGS)
@@ -855,6 +915,30 @@ SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, ecn_enable, CTLTYPE_UINT | CTLFLAG_RW
     &SCTP_BASE_SYSCTL(sctp_ecn_enable), 0, sysctl_sctp_check, "IU",
     SCTPCTL_ECN_ENABLE_DESC);
 
+SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, pr_enable, CTLTYPE_UINT | CTLFLAG_RW,
+    &SCTP_BASE_SYSCTL(sctp_pr_enable), 0, sysctl_sctp_check, "IU",
+    SCTPCTL_PR_ENABLE_DESC);
+
+SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, auth_enable, CTLTYPE_UINT | CTLFLAG_RW,
+    &SCTP_BASE_SYSCTL(sctp_auth_enable), 0, sysctl_sctp_auth_check, "IU",
+    SCTPCTL_AUTH_ENABLE_DESC);
+
+SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, asconf_enable, CTLTYPE_UINT | CTLFLAG_RW,
+    &SCTP_BASE_SYSCTL(sctp_asconf_enable), 0, sysctl_sctp_asconf_check, "IU",
+    SCTPCTL_ASCONF_ENABLE_DESC);
+
+SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, reconfig_enable, CTLTYPE_UINT | CTLFLAG_RW,
+    &SCTP_BASE_SYSCTL(sctp_reconfig_enable), 0, sysctl_sctp_check, "IU",
+    SCTPCTL_RECONFIG_ENABLE_DESC);
+
+SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, nrsack_enable, CTLTYPE_UINT | CTLFLAG_RW,
+    &SCTP_BASE_SYSCTL(sctp_nrsack_enable), 0, sysctl_sctp_check, "IU",
+    SCTPCTL_NRSACK_ENABLE_DESC);
+
+SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, pktdrop_enable, CTLTYPE_UINT | CTLFLAG_RW,
+    &SCTP_BASE_SYSCTL(sctp_pktdrop_enable), 0, sysctl_sctp_check, "IU",
+    SCTPCTL_PKTDROP_ENABLE_DESC);
+
 SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, strict_sacks, CTLTYPE_UINT | CTLFLAG_RW,
     &SCTP_BASE_SYSCTL(sctp_strict_sacks), 0, sysctl_sctp_check, "IU",
     SCTPCTL_STRICT_SACKS_DESC);
@@ -976,10 +1060,6 @@ SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, cmt_on_off, CTLTYPE_UINT | CTLFLAG_RW
     &SCTP_BASE_SYSCTL(sctp_cmt_on_off), 0, sysctl_sctp_check, "IU",
     SCTPCTL_CMT_ON_OFF_DESC);
 
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, nr_sack_on_off, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_nr_sack_on_off), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_NR_SACK_ON_OFF_DESC);
-
 SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, cmt_use_dac, CTLTYPE_UINT | CTLFLAG_RW,
     &SCTP_BASE_SYSCTL(sctp_cmt_use_dac), 0, sysctl_sctp_check, "IU",
     SCTPCTL_CMT_USE_DAC_DESC);
@@ -988,14 +1068,6 @@ SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, cwnd_maxburst, CTLTYPE_UINT | CTLFLAG
     &SCTP_BASE_SYSCTL(sctp_use_cwnd_based_maxburst), 0, sysctl_sctp_check, "IU",
     SCTPCTL_CWND_MAXBURST_DESC);
 
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, asconf_auth_nochk, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_asconf_auth_nochk), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_ASCONF_AUTH_NOCHK_DESC);
-
-SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, auth_disable, CTLTYPE_UINT | CTLFLAG_RW,
-    &SCTP_BASE_SYSCTL(sctp_auth_disable), 0, sysctl_sctp_check, "IU",
-    SCTPCTL_AUTH_DISABLE_DESC);
-
 SYSCTL_VNET_PROC(_net_inet_sctp, OID_AUTO, nat_friendly, CTLTYPE_UINT | CTLFLAG_RW,
     &SCTP_BASE_SYSCTL(sctp_nat_friendly), 0, sysctl_sctp_check, "IU",
     SCTPCTL_NAT_FRIENDLY_DESC);
diff --git a/sys/netinet/sctp_sysctl.h b/sys/netinet/sctp_sysctl.h
index 432d36a4c6b9..8488919cb56f 100644
--- a/sys/netinet/sctp_sysctl.h
+++ b/sys/netinet/sctp_sysctl.h
@@ -45,6 +45,12 @@ struct sctp_sysctl {
 	uint32_t sctp_auto_asconf;
 	uint32_t sctp_multiple_asconfs;
 	uint32_t sctp_ecn_enable;
+	uint32_t sctp_pr_enable;
+	uint32_t sctp_auth_enable;
+	uint32_t sctp_asconf_enable;
+	uint32_t sctp_reconfig_enable;
+	uint32_t sctp_nrsack_enable;
+	uint32_t sctp_pktdrop_enable;
 	uint32_t sctp_fr_max_burst_default;
 	uint32_t sctp_strict_sacks;
 	uint32_t sctp_peer_chunk_oh;
@@ -76,11 +82,7 @@ struct sctp_sysctl {
 	uint32_t sctp_nr_outgoing_streams_default;
 	uint32_t sctp_cmt_on_off;
 	uint32_t sctp_cmt_use_dac;
-	/* EY 5/5/08 - nr_sack flag variable */
-	uint32_t sctp_nr_sack_on_off;
 	uint32_t sctp_use_cwnd_based_maxburst;
-	uint32_t sctp_asconf_auth_nochk;
-	uint32_t sctp_auth_disable;
 	uint32_t sctp_nat_friendly;
 	uint32_t sctp_L2_abc_variable;
 	uint32_t sctp_mbuf_threshold_count;
@@ -155,6 +157,42 @@ struct sctp_sysctl {
 #define SCTPCTL_ECN_ENABLE_MAX		1
 #define SCTPCTL_ECN_ENABLE_DEFAULT	1
 
+/* pr_enable: Enable PR-SCTP */
+#define SCTPCTL_PR_ENABLE_DESC		"Enable PR-SCTP"
+#define SCTPCTL_PR_ENABLE_MIN		0
+#define SCTPCTL_PR_ENABLE_MAX		1
+#define SCTPCTL_PR_ENABLE_DEFAULT	1
+
+/* auth_enable: Enable SCTP AUTH function */
+#define SCTPCTL_AUTH_ENABLE_DESC	"Enable SCTP AUTH function"
+#define SCTPCTL_AUTH_ENABLE_MIN		0
+#define SCTPCTL_AUTH_ENABLE_MAX		1
+#define SCTPCTL_AUTH_ENABLE_DEFAULT	1
+
+/* asconf_enable: Enable SCTP ASCONF */
+#define SCTPCTL_ASCONF_ENABLE_DESC	"Enable SCTP ASCONF"
+#define SCTPCTL_ASCONF_ENABLE_MIN	0
+#define SCTPCTL_ASCONF_ENABLE_MAX	1
+#define SCTPCTL_ASCONF_ENABLE_DEFAULT	1
+
+/* reconfig_enable: Enable SCTP RE-CONFIG */
+#define SCTPCTL_RECONFIG_ENABLE_DESC	"Enable SCTP RE-CONFIG"
+#define SCTPCTL_RECONFIG_ENABLE_MIN	0
+#define SCTPCTL_RECONFIG_ENABLE_MAX	1
+#define SCTPCTL_RECONFIG_ENABLE_DEFAULT	1
+
+/* nrsack_enable: Enable NR_SACK */
+#define SCTPCTL_NRSACK_ENABLE_DESC	"Enable SCTP NR-SACK"
+#define SCTPCTL_NRSACK_ENABLE_MIN	0
+#define SCTPCTL_NRSACK_ENABLE_MAX	1
+#define SCTPCTL_NRSACK_ENABLE_DEFAULT	0
+
+/* pktdrop_enable: Enable SCTP Packet Drop Reports */
+#define SCTPCTL_PKTDROP_ENABLE_DESC	"Enable SCTP PKTDROP"
+#define SCTPCTL_PKTDROP_ENABLE_MIN	0
+#define SCTPCTL_PKTDROP_ENABLE_MAX	1
+#define SCTPCTL_PKTDROP_ENABLE_DEFAULT	0
+
 /* strict_sacks: Enable SCTP Strict SACK checking */
 #define SCTPCTL_STRICT_SACKS_DESC	"Enable SCTP Strict SACK checking"
 #define SCTPCTL_STRICT_SACKS_MIN	0
@@ -342,12 +380,6 @@ struct sctp_sysctl {
 #define SCTPCTL_CMT_ON_OFF_MAX		SCTP_CMT_MAX
 #define SCTPCTL_CMT_ON_OFF_DEFAULT	SCTP_CMT_OFF
 
-/* EY - nr_sack_on_off: NR_SACK on/off flag */
-#define SCTPCTL_NR_SACK_ON_OFF_DESC	"NR_SACK on/off flag"
-#define SCTPCTL_NR_SACK_ON_OFF_MIN	0
-#define SCTPCTL_NR_SACK_ON_OFF_MAX	1
-#define SCTPCTL_NR_SACK_ON_OFF_DEFAULT	0
-
 /* cmt_use_dac: CMT DAC on/off flag */
 #define SCTPCTL_CMT_USE_DAC_DESC	"CMT DAC on/off flag"
 #define SCTPCTL_CMT_USE_DAC_MIN		0
@@ -360,18 +392,6 @@ struct sctp_sysctl {
 #define SCTPCTL_CWND_MAXBURST_MAX	1
 #define SCTPCTL_CWND_MAXBURST_DEFAULT	1
 
-/* asconf_auth_nochk: Disable SCTP ASCONF AUTH requirement */
-#define SCTPCTL_ASCONF_AUTH_NOCHK_DESC	"Disable SCTP ASCONF AUTH requirement"
-#define SCTPCTL_ASCONF_AUTH_NOCHK_MIN	0
-#define SCTPCTL_ASCONF_AUTH_NOCHK_MAX	1
-#define SCTPCTL_ASCONF_AUTH_NOCHK_DEFAULT	0
-
-/* auth_disable: Disable SCTP AUTH function */
-#define SCTPCTL_AUTH_DISABLE_DESC	"Disable SCTP AUTH function"
-#define SCTPCTL_AUTH_DISABLE_MIN	0
-#define SCTPCTL_AUTH_DISABLE_MAX	1
-#define SCTPCTL_AUTH_DISABLE_DEFAULT	0
-
 /* nat_friendly: SCTP NAT friendly operation */
 #define SCTPCTL_NAT_FRIENDLY_DESC	"SCTP NAT friendly operation"
 #define SCTPCTL_NAT_FRIENDLY_MIN	0
diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c
index 2aef4123feab..7d861acbefff 100644
--- a/sys/netinet/sctp_timer.c
+++ b/sys/netinet/sctp_timer.c
@@ -49,7 +49,9 @@ __FBSDID("$FreeBSD$");
 #include <netinet/sctp_input.h>
 #include <netinet/sctp.h>
 #include <netinet/sctp_uio.h>
+#if defined(INET) || defined(INET6)
 #include <netinet/udp.h>
+#endif
 
 
 void
@@ -443,7 +445,7 @@ sctp_recover_sent_list(struct sctp_tcb *stcb)
 				sctp_free_bufspace(stcb, asoc, chk, 1);
 				sctp_m_freem(chk->data);
 				chk->data = NULL;
-				if (asoc->peer_supports_prsctp && PR_SCTP_BUF_ENABLED(chk->flags)) {
+				if (asoc->prsctp_supported && PR_SCTP_BUF_ENABLED(chk->flags)) {
 					asoc->sent_queue_cnt_removeable--;
 				}
 			}
@@ -598,7 +600,7 @@ sctp_mark_all_for_resend(struct sctp_tcb *stcb,
 					continue;
 				}
 			}
-			if (stcb->asoc.peer_supports_prsctp && PR_SCTP_TTL_ENABLED(chk->flags)) {
+			if (stcb->asoc.prsctp_supported && PR_SCTP_TTL_ENABLED(chk->flags)) {
 				/* Is it expired? */
 				if (timevalcmp(&now, &chk->rec.data.timetodrop, >)) {
 					/* Yes so drop it */
@@ -612,7 +614,7 @@ sctp_mark_all_for_resend(struct sctp_tcb *stcb,
 					continue;
 				}
 			}
-			if (stcb->asoc.peer_supports_prsctp && PR_SCTP_RTX_ENABLED(chk->flags)) {
+			if (stcb->asoc.prsctp_supported && PR_SCTP_RTX_ENABLED(chk->flags)) {
 				/* Has it been retransmitted tv_sec times? */
 				if (chk->snd_count > chk->rec.data.timetodrop.tv_sec) {
 					if (chk->data) {
@@ -955,7 +957,7 @@ sctp_t3rxt_timer(struct sctp_inpcb *inp,
 		sctp_timer_start(SCTP_TIMER_TYPE_SEND, inp, stcb, net);
 		return (0);
 	}
-	if (stcb->asoc.peer_supports_prsctp) {
+	if (stcb->asoc.prsctp_supported) {
 		struct sctp_tmit_chunk *lchk;
 
 		lchk = sctp_try_advance_peer_ack_point(stcb, &stcb->asoc);
@@ -1480,9 +1482,11 @@ sctp_pathmtu_timer(struct sctp_inpcb *inp,
 		}
 		if (net->ro._s_addr) {
 			mtu = SCTP_GATHER_MTU_FROM_ROUTE(net->ro._s_addr, &net->ro._s_addr.sa, net->ro.ro_rt);
+#if defined(INET) || defined(INET6)
 			if (net->port) {
 				mtu -= sizeof(struct udphdr);
 			}
+#endif
 			if (mtu > next_mtu) {
 				net->mtu = next_mtu;
 			}
diff --git a/sys/netinet/sctp_uio.h b/sys/netinet/sctp_uio.h
index 129539170cb3..18d58b0b5e2f 100644
--- a/sys/netinet/sctp_uio.h
+++ b/sys/netinet/sctp_uio.h
@@ -323,7 +323,6 @@ struct sctp_paddr_change {
 	uint32_t spc_state;
 	uint32_t spc_error;
 	sctp_assoc_t spc_assoc_id;
-	uint8_t spc_padding[4];
 };
 
 /* paddr state values */
@@ -346,7 +345,7 @@ struct sctp_remote_error {
 	uint32_t sre_length;
 	uint16_t sre_error;
 	sctp_assoc_t sre_assoc_id;
-	uint8_t sre_data[4];
+	uint8_t sre_data[];
 };
 
 /* data send failure event (deprecated) */
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index 83bb0adf342a..1d49ef591567 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -214,8 +214,6 @@ sctp_notify_mbuf(struct sctp_inpcb *inp,
 	SCTP_TCB_UNLOCK(stcb);
 }
 
-#endif
-
 void
 sctp_notify(struct sctp_inpcb *inp,
     struct ip *ip,
@@ -302,6 +300,8 @@ sctp_notify(struct sctp_inpcb *inp,
 	}
 }
 
+#endif
+
 #ifdef INET
 void
 sctp_ctlinput(cmd, sa, vip)
@@ -1197,6 +1197,10 @@ sctp_fill_up_addresses_vrf(struct sctp_inpcb *inp,
 							 */
 							continue;
 						}
+						if (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+						    &sin->sin_addr) != 0) {
+							continue;
+						}
 						if ((ipv4_local_scope == 0) &&
 						    (IN4_ISPRIVATE_ADDRESS(&sin->sin_addr))) {
 							continue;
@@ -1238,6 +1242,10 @@ sctp_fill_up_addresses_vrf(struct sctp_inpcb *inp,
 							 */
 							continue;
 						}
+						if (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+						    &sin6->sin6_addr) != 0) {
+							continue;
+						}
 						if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
 							if (local_scope == 0)
 								continue;
@@ -3286,6 +3294,195 @@ sctp_getopt(struct socket *so, int optname, void *optval, size_t *optsize,
 			}
 			break;
 		}
+	case SCTP_ECN_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, *optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				av->assoc_value = stcb->asoc.ecn_supported;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					SCTP_INP_RLOCK(inp);
+					av->assoc_value = inp->ecn_supported;
+					SCTP_INP_RUNLOCK(inp);
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			if (error == 0) {
+				*optsize = sizeof(struct sctp_assoc_value);
+			}
+			break;
+		}
+	case SCTP_PR_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, *optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				av->assoc_value = stcb->asoc.prsctp_supported;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					SCTP_INP_RLOCK(inp);
+					av->assoc_value = inp->prsctp_supported;
+					SCTP_INP_RUNLOCK(inp);
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			if (error == 0) {
+				*optsize = sizeof(struct sctp_assoc_value);
+			}
+			break;
+		}
+	case SCTP_AUTH_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, *optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				av->assoc_value = stcb->asoc.auth_supported;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					SCTP_INP_RLOCK(inp);
+					av->assoc_value = inp->auth_supported;
+					SCTP_INP_RUNLOCK(inp);
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			if (error == 0) {
+				*optsize = sizeof(struct sctp_assoc_value);
+			}
+			break;
+		}
+	case SCTP_ASCONF_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, *optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				av->assoc_value = stcb->asoc.asconf_supported;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					SCTP_INP_RLOCK(inp);
+					av->assoc_value = inp->asconf_supported;
+					SCTP_INP_RUNLOCK(inp);
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			if (error == 0) {
+				*optsize = sizeof(struct sctp_assoc_value);
+			}
+			break;
+		}
+	case SCTP_RECONFIG_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, *optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				av->assoc_value = stcb->asoc.reconfig_supported;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					SCTP_INP_RLOCK(inp);
+					av->assoc_value = inp->reconfig_supported;
+					SCTP_INP_RUNLOCK(inp);
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			if (error == 0) {
+				*optsize = sizeof(struct sctp_assoc_value);
+			}
+			break;
+		}
+	case SCTP_NRSACK_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, *optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				av->assoc_value = stcb->asoc.nrsack_supported;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					SCTP_INP_RLOCK(inp);
+					av->assoc_value = inp->nrsack_supported;
+					SCTP_INP_RUNLOCK(inp);
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			if (error == 0) {
+				*optsize = sizeof(struct sctp_assoc_value);
+			}
+			break;
+		}
+	case SCTP_PKTDROP_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, *optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				av->assoc_value = stcb->asoc.pktdrop_supported;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					SCTP_INP_RLOCK(inp);
+					av->assoc_value = inp->pktdrop_supported;
+					SCTP_INP_RUNLOCK(inp);
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			if (error == 0) {
+				*optsize = sizeof(struct sctp_assoc_value);
+			}
+			break;
+		}
 	case SCTP_ENABLE_STREAM_RESET:
 		{
 			struct sctp_assoc_value *av;
@@ -4158,7 +4355,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
 				error = ENOENT;
 				break;
 			}
-			if (stcb->asoc.peer_supports_strreset == 0) {
+			if (stcb->asoc.reconfig_supported == 0) {
 				/*
 				 * Peer does not support the chunk type.
 				 */
@@ -4225,7 +4422,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
 				error = ENOENT;
 				break;
 			}
-			if (stcb->asoc.peer_supports_strreset == 0) {
+			if (stcb->asoc.reconfig_supported == 0) {
 				/*
 				 * Peer does not support the chunk type.
 				 */
@@ -4294,7 +4491,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
 				error = ENOENT;
 				break;
 			}
-			if (stcb->asoc.peer_supports_strreset == 0) {
+			if (stcb->asoc.reconfig_supported == 0) {
 				/*
 				 * Peer does not support the chunk type.
 				 */
@@ -5239,6 +5436,43 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
 						error = EINVAL;
 						goto out_of_it;
 					}
+				} else {
+					switch (sspp->sspp_addr.ss_family) {
+#ifdef INET
+					case AF_INET:
+						{
+							struct sockaddr_in *sin;
+
+							sin = (struct sockaddr_in *)&sspp->sspp_addr;
+							if (prison_check_ip4(inp->ip_inp.inp.inp_cred,
+							    &sin->sin_addr) != 0) {
+								SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+								error = EINVAL;
+								goto out_of_it;
+							}
+							break;
+						}
+#endif
+#ifdef INET6
+					case AF_INET6:
+						{
+							struct sockaddr_in6 *sin6;
+
+							sin6 = (struct sockaddr_in6 *)&sspp->sspp_addr;
+							if (prison_check_ip6(inp->ip_inp.inp.inp_cred,
+							    &sin6->sin6_addr) != 0) {
+								SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+								error = EINVAL;
+								goto out_of_it;
+							}
+							break;
+						}
+#endif
+					default:
+						SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+						error = EINVAL;
+						goto out_of_it;
+					}
 				}
 				if (sctp_set_primary_ip_address_sa(stcb,
 				    (struct sockaddr *)&sspp->sspp_addr) != 0) {
@@ -5597,7 +5831,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
 			SCTP_FIND_STCB(inp, stcb, thlds->spt_assoc_id);
 			net = NULL;
 			if (stcb) {
-				net = sctp_findnet(stcb, (struct sockaddr *)&thlds->spt_assoc_id);
+				net = sctp_findnet(stcb, (struct sockaddr *)&thlds->spt_address);
 			} else {
 				/*
 				 * We increment here since
@@ -5608,7 +5842,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
 				 */
 				SCTP_INP_INCR_REF(inp);
 				stcb = sctp_findassociation_ep_addr(&inp,
-				    (struct sockaddr *)&thlds->spt_assoc_id,
+				    (struct sockaddr *)&thlds->spt_address,
 				    &net, NULL, NULL);
 				if (stcb == NULL) {
 					SCTP_INP_DECR_REF(inp);
@@ -5617,7 +5851,7 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
 			if (stcb && (net == NULL)) {
 				struct sockaddr *sa;
 
-				sa = (struct sockaddr *)&thlds->spt_assoc_id;
+				sa = (struct sockaddr *)&thlds->spt_address;
 #ifdef INET
 				if (sa->sa_family == AF_INET) {
 
@@ -5812,6 +6046,237 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
 			}
 			break;
 		}
+	case SCTP_ECN_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+				error = EINVAL;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					SCTP_INP_WLOCK(inp);
+					if (av->assoc_value == 0) {
+						inp->ecn_supported = 0;
+					} else {
+						inp->ecn_supported = 1;
+					}
+					SCTP_INP_WUNLOCK(inp);
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			break;
+		}
+	case SCTP_PR_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+				error = EINVAL;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					SCTP_INP_WLOCK(inp);
+					if (av->assoc_value == 0) {
+						inp->prsctp_supported = 0;
+					} else {
+						inp->prsctp_supported = 1;
+					}
+					SCTP_INP_WUNLOCK(inp);
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			break;
+		}
+	case SCTP_AUTH_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+				error = EINVAL;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					if ((av->assoc_value == 0) &&
+					    (inp->asconf_supported == 1)) {
+						/*
+						 * AUTH is required for
+						 * ASCONF
+						 */
+						SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+						error = EINVAL;
+					} else {
+						SCTP_INP_WLOCK(inp);
+						if (av->assoc_value == 0) {
+							inp->auth_supported = 0;
+						} else {
+							inp->auth_supported = 1;
+						}
+						SCTP_INP_WUNLOCK(inp);
+					}
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			break;
+		}
+	case SCTP_ASCONF_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+				error = EINVAL;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					if ((av->assoc_value != 0) &&
+					    (inp->auth_supported == 0)) {
+						/*
+						 * AUTH is required for
+						 * ASCONF
+						 */
+						SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+						error = EINVAL;
+					} else {
+						SCTP_INP_WLOCK(inp);
+						if (av->assoc_value == 0) {
+							inp->asconf_supported = 0;
+							sctp_auth_delete_chunk(SCTP_ASCONF,
+							    inp->sctp_ep.local_auth_chunks);
+							sctp_auth_delete_chunk(SCTP_ASCONF_ACK,
+							    inp->sctp_ep.local_auth_chunks);
+						} else {
+							inp->asconf_supported = 1;
+							sctp_auth_add_chunk(SCTP_ASCONF,
+							    inp->sctp_ep.local_auth_chunks);
+							sctp_auth_add_chunk(SCTP_ASCONF_ACK,
+							    inp->sctp_ep.local_auth_chunks);
+						}
+						SCTP_INP_WUNLOCK(inp);
+					}
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			break;
+		}
+	case SCTP_RECONFIG_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+				error = EINVAL;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					SCTP_INP_WLOCK(inp);
+					if (av->assoc_value == 0) {
+						inp->reconfig_supported = 0;
+					} else {
+						inp->reconfig_supported = 1;
+					}
+					SCTP_INP_WUNLOCK(inp);
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			break;
+		}
+	case SCTP_NRSACK_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+				error = EINVAL;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					SCTP_INP_WLOCK(inp);
+					if (av->assoc_value == 0) {
+						inp->nrsack_supported = 0;
+					} else {
+						inp->nrsack_supported = 1;
+					}
+					SCTP_INP_WUNLOCK(inp);
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			break;
+		}
+	case SCTP_PKTDROP_SUPPORTED:
+		{
+			struct sctp_assoc_value *av;
+
+			SCTP_CHECK_AND_CAST(av, optval, struct sctp_assoc_value, optsize);
+			SCTP_FIND_STCB(inp, stcb, av->assoc_id);
+
+			if (stcb) {
+				SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+				error = EINVAL;
+				SCTP_TCB_UNLOCK(stcb);
+			} else {
+				if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) ||
+				    (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) ||
+				    (av->assoc_id == SCTP_FUTURE_ASSOC)) {
+					SCTP_INP_WLOCK(inp);
+					if (av->assoc_value == 0) {
+						inp->pktdrop_supported = 0;
+					} else {
+						inp->pktdrop_supported = 1;
+					}
+					SCTP_INP_WUNLOCK(inp);
+				} else {
+					SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
+					error = EINVAL;
+				}
+			}
+			break;
+		}
 	default:
 		SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, ENOPROTOOPT);
 		error = ENOPROTOOPT;
@@ -6053,30 +6518,29 @@ sctp_listen(struct socket *so, int backlog, struct thread *p)
 	if (sctp_is_feature_on(inp, SCTP_PCB_FLAGS_PORTREUSE)) {
 		/* See if we have a listener */
 		struct sctp_inpcb *tinp;
-		union sctp_sockstore store, *sp;
+		union sctp_sockstore store;
 
-		sp = &store;
 		if ((inp->sctp_flags & SCTP_PCB_FLAGS_BOUNDALL) == 0) {
 			/* not bound all */
 			struct sctp_laddr *laddr;
 
 			LIST_FOREACH(laddr, &inp->sctp_addr_list, sctp_nxt_addr) {
 				memcpy(&store, &laddr->ifa->address, sizeof(store));
-				switch (sp->sa.sa_family) {
+				switch (store.sa.sa_family) {
 #ifdef INET
 				case AF_INET:
-					sp->sin.sin_port = inp->sctp_lport;
+					store.sin.sin_port = inp->sctp_lport;
 					break;
 #endif
 #ifdef INET6
 				case AF_INET6:
-					sp->sin6.sin6_port = inp->sctp_lport;
+					store.sin6.sin6_port = inp->sctp_lport;
 					break;
 #endif
 				default:
 					break;
 				}
-				tinp = sctp_pcb_findep(&sp->sa, 0, 0, inp->def_vrf_id);
+				tinp = sctp_pcb_findep(&store.sa, 0, 0, inp->def_vrf_id);
 				if (tinp && (tinp != inp) &&
 				    ((tinp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) == 0) &&
 				    ((tinp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) == 0) &&
@@ -6094,20 +6558,6 @@ sctp_listen(struct socket *so, int backlog, struct thread *p)
 		} else {
 			/* Setup a local addr bound all */
 			memset(&store, 0, sizeof(store));
-			switch (sp->sa.sa_family) {
-#ifdef INET
-			case AF_INET:
-				store.sin.sin_port = inp->sctp_lport;
-				break;
-#endif
-#ifdef INET6
-			case AF_INET6:
-				sp->sin6.sin6_port = inp->sctp_lport;
-				break;
-#endif
-			default:
-				break;
-			}
 #ifdef INET6
 			if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) {
 				store.sa.sa_family = AF_INET6;
@@ -6120,7 +6570,21 @@ sctp_listen(struct socket *so, int backlog, struct thread *p)
 				store.sa.sa_len = sizeof(struct sockaddr_in);
 			}
 #endif
-			tinp = sctp_pcb_findep(&sp->sa, 0, 0, inp->def_vrf_id);
+			switch (store.sa.sa_family) {
+#ifdef INET
+			case AF_INET:
+				store.sin.sin_port = inp->sctp_lport;
+				break;
+#endif
+#ifdef INET6
+			case AF_INET6:
+				store.sin6.sin6_port = inp->sctp_lport;
+				break;
+#endif
+			default:
+				break;
+			}
+			tinp = sctp_pcb_findep(&store.sa, 0, 0, inp->def_vrf_id);
 			if (tinp && (tinp != inp) &&
 			    ((tinp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) == 0) &&
 			    ((tinp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) == 0) &&
diff --git a/sys/netinet/sctp_var.h b/sys/netinet/sctp_var.h
index d88a23768fb7..31d93dd21bd9 100644
--- a/sys/netinet/sctp_var.h
+++ b/sys/netinet/sctp_var.h
@@ -72,7 +72,7 @@ extern struct pr_usrreqs sctp_usrreqs;
 	  ((stcb->asoc.sctp_features & feature) == 0)) || \
 	 ((stcb == NULL) && (inp != NULL) && \
 	  ((inp->sctp_features & feature) == 0)) || \
-         ((stcb == NULL) && (inp == NULL)))
+	 ((stcb == NULL) && (inp == NULL)))
 
 /* managing mobility_feature in inpcb (by micchie) */
 #define sctp_mobility_feature_on(inp, feature)  (inp->sctp_mobility_features |= feature)
@@ -106,7 +106,7 @@ extern struct pr_usrreqs sctp_usrreqs;
 #define sctp_alloc_a_readq(_stcb, _readq) { \
 	(_readq) = SCTP_ZONE_GET(SCTP_BASE_INFO(ipi_zone_readq), struct sctp_queued_to_read); \
 	if ((_readq)) { \
- 	     SCTP_INCR_READQ_COUNT(); \
+	     SCTP_INCR_READQ_COUNT(); \
 	} \
 }
 
@@ -121,11 +121,11 @@ extern struct pr_usrreqs sctp_usrreqs;
 
 #define sctp_alloc_a_strmoq(_stcb, _strmoq) { \
 	(_strmoq) = SCTP_ZONE_GET(SCTP_BASE_INFO(ipi_zone_strmoq), struct sctp_stream_queue_pending); \
-         if ((_strmoq)) {			  \
+	if ((_strmoq)) { \
 		memset(_strmoq, 0, sizeof(struct sctp_stream_queue_pending)); \
 		SCTP_INCR_STRMOQ_COUNT(); \
 		(_strmoq)->holds_key_ref = 0; \
- 	} \
+	} \
 }
 
 #define sctp_free_a_chunk(_stcb, _chk, _so_locked) { \
@@ -133,22 +133,22 @@ extern struct pr_usrreqs sctp_usrreqs;
 		sctp_auth_key_release((_stcb), (_chk)->auth_keyid, _so_locked); \
 		(_chk)->holds_key_ref = 0; \
 	} \
-        if (_stcb) { \
-          SCTP_TCB_LOCK_ASSERT((_stcb)); \
-          if ((_chk)->whoTo) { \
-                  sctp_free_remote_addr((_chk)->whoTo); \
-                  (_chk)->whoTo = NULL; \
-          } \
-          if (((_stcb)->asoc.free_chunk_cnt > SCTP_BASE_SYSCTL(sctp_asoc_free_resc_limit)) || \
-               (SCTP_BASE_INFO(ipi_free_chunks) > SCTP_BASE_SYSCTL(sctp_system_free_resc_limit))) { \
-	 	SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_chunk), (_chk)); \
-	 	SCTP_DECR_CHK_COUNT(); \
-	  } else { \
-	 	TAILQ_INSERT_TAIL(&(_stcb)->asoc.free_chunks, (_chk), sctp_next); \
-	 	(_stcb)->asoc.free_chunk_cnt++; \
-	 	atomic_add_int(&SCTP_BASE_INFO(ipi_free_chunks), 1); \
-          } \
-        } else { \
+	if (_stcb) { \
+		SCTP_TCB_LOCK_ASSERT((_stcb)); \
+		if ((_chk)->whoTo) { \
+			sctp_free_remote_addr((_chk)->whoTo); \
+			(_chk)->whoTo = NULL; \
+		} \
+		if (((_stcb)->asoc.free_chunk_cnt > SCTP_BASE_SYSCTL(sctp_asoc_free_resc_limit)) || \
+		    (SCTP_BASE_INFO(ipi_free_chunks) > SCTP_BASE_SYSCTL(sctp_system_free_resc_limit))) { \
+			SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_chunk), (_chk)); \
+			SCTP_DECR_CHK_COUNT(); \
+		} else { \
+			TAILQ_INSERT_TAIL(&(_stcb)->asoc.free_chunks, (_chk), sctp_next); \
+			(_stcb)->asoc.free_chunk_cnt++; \
+			atomic_add_int(&SCTP_BASE_INFO(ipi_free_chunks), 1); \
+		} \
+	} else { \
 		SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_chunk), (_chk)); \
 		SCTP_DECR_CHK_COUNT(); \
 	} \
@@ -159,7 +159,7 @@ extern struct pr_usrreqs sctp_usrreqs;
 		(_chk) = SCTP_ZONE_GET(SCTP_BASE_INFO(ipi_zone_chunk), struct sctp_tmit_chunk); \
 		if ((_chk)) { \
 			SCTP_INCR_CHK_COUNT(); \
-                        (_chk)->whoTo = NULL; \
+			(_chk)->whoTo = NULL; \
 			(_chk)->holds_key_ref = 0; \
 		} \
 	} else { \
@@ -167,7 +167,7 @@ extern struct pr_usrreqs sctp_usrreqs;
 		TAILQ_REMOVE(&(_stcb)->asoc.free_chunks, (_chk), sctp_next); \
 		atomic_subtract_int(&SCTP_BASE_INFO(ipi_free_chunks), 1); \
 		(_chk)->holds_key_ref = 0; \
-                SCTP_STAT_INCR(sctps_cached_chk); \
+		SCTP_STAT_INCR(sctps_cached_chk); \
 		(_stcb)->asoc.free_chunk_cnt--; \
 	} \
 }
@@ -178,15 +178,15 @@ extern struct pr_usrreqs sctp_usrreqs;
 		if (SCTP_DECREMENT_AND_CHECK_REFCOUNT(&(__net)->ref_count)) { \
 			(void)SCTP_OS_TIMER_STOP(&(__net)->rxt_timer.timer); \
 			(void)SCTP_OS_TIMER_STOP(&(__net)->pmtu_timer.timer); \
-                        if ((__net)->ro.ro_rt) { \
+			if ((__net)->ro.ro_rt) { \
 				RTFREE((__net)->ro.ro_rt); \
 				(__net)->ro.ro_rt = NULL; \
-                        } \
+			} \
 			if ((__net)->src_addr_selected) { \
 				sctp_free_ifa((__net)->ro._s_addr); \
 				(__net)->ro._s_addr = NULL; \
 			} \
-                        (__net)->src_addr_selected = 0; \
+			(__net)->src_addr_selected = 0; \
 			(__net)->dest_state &= ~SCTP_ADDR_REACHABLE; \
 			SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_net), (__net)); \
 			SCTP_DECR_RADDR_COUNT(); \
@@ -250,12 +250,12 @@ extern struct pr_usrreqs sctp_usrreqs;
 } while (0)
 
 #define sctp_flight_size_increase(tp1) do { \
-       (tp1)->whoTo->flight_size += (tp1)->book_size; \
+	(tp1)->whoTo->flight_size += (tp1)->book_size; \
 } while (0)
 
 #ifdef SCTP_FS_SPEC_LOG
 #define sctp_total_flight_decrease(stcb, tp1) do { \
-        if (stcb->asoc.fs_index > SCTP_FS_SPEC_LOG_SIZE) \
+	if (stcb->asoc.fs_index > SCTP_FS_SPEC_LOG_SIZE) \
 		stcb->asoc.fs_index = 0;\
 	stcb->asoc.fslog[stcb->asoc.fs_index].total_flight = stcb->asoc.total_flight; \
 	stcb->asoc.fslog[stcb->asoc.fs_index].tsn = tp1->rec.data.TSN_seq; \
@@ -264,7 +264,7 @@ extern struct pr_usrreqs sctp_usrreqs;
 	stcb->asoc.fslog[stcb->asoc.fs_index].incr = 0; \
 	stcb->asoc.fslog[stcb->asoc.fs_index].decr = 1; \
 	stcb->asoc.fs_index++; \
-        tp1->window_probe = 0; \
+	tp1->window_probe = 0; \
 	if (stcb->asoc.total_flight >= tp1->book_size) { \
 		stcb->asoc.total_flight -= tp1->book_size; \
 		if (stcb->asoc.total_flight_count > 0) \
@@ -276,7 +276,7 @@ extern struct pr_usrreqs sctp_usrreqs;
 } while (0)
 
 #define sctp_total_flight_increase(stcb, tp1) do { \
-        if (stcb->asoc.fs_index > SCTP_FS_SPEC_LOG_SIZE) \
+	if (stcb->asoc.fs_index > SCTP_FS_SPEC_LOG_SIZE) \
 		stcb->asoc.fs_index = 0;\
 	stcb->asoc.fslog[stcb->asoc.fs_index].total_flight = stcb->asoc.total_flight; \
 	stcb->asoc.fslog[stcb->asoc.fs_index].tsn = tp1->rec.data.TSN_seq; \
@@ -285,14 +285,14 @@ extern struct pr_usrreqs sctp_usrreqs;
 	stcb->asoc.fslog[stcb->asoc.fs_index].incr = 1; \
 	stcb->asoc.fslog[stcb->asoc.fs_index].decr = 0; \
 	stcb->asoc.fs_index++; \
-       (stcb)->asoc.total_flight_count++; \
-       (stcb)->asoc.total_flight += (tp1)->book_size; \
+	(stcb)->asoc.total_flight_count++; \
+	(stcb)->asoc.total_flight += (tp1)->book_size; \
 } while (0)
 
 #else
 
 #define sctp_total_flight_decrease(stcb, tp1) do { \
-        tp1->window_probe = 0; \
+	tp1->window_probe = 0; \
 	if (stcb->asoc.total_flight >= tp1->book_size) { \
 		stcb->asoc.total_flight -= tp1->book_size; \
 		if (stcb->asoc.total_flight_count > 0) \
@@ -304,8 +304,8 @@ extern struct pr_usrreqs sctp_usrreqs;
 } while (0)
 
 #define sctp_total_flight_increase(stcb, tp1) do { \
-       (stcb)->asoc.total_flight_count++; \
-       (stcb)->asoc.total_flight += (tp1)->book_size; \
+	(stcb)->asoc.total_flight_count++; \
+	(stcb)->asoc.total_flight += (tp1)->book_size; \
 } while (0)
 
 #endif
@@ -326,7 +326,7 @@ int sctp_ctloutput(struct socket *, struct sockopt *);
 
 #ifdef INET
 void sctp_input_with_port(struct mbuf *, int, uint16_t);
-void sctp_input(struct mbuf *, int);
+int sctp_input(struct mbuf **, int *, int);
 
 #endif
 void sctp_pathmtu_adjustment(struct sctp_tcb *, uint16_t);
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 92ee88fd7818..d2a1f8f16a48 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -904,8 +904,13 @@ sctp_init_asoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 	asoc->heart_beat_delay = TICKS_TO_MSEC(inp->sctp_ep.sctp_timeoutticks[SCTP_TIMER_HEARTBEAT]);
 	asoc->cookie_life = inp->sctp_ep.def_cookie_life;
 	asoc->sctp_cmt_on_off = inp->sctp_cmt_on_off;
-	asoc->ecn_allowed = inp->sctp_ecn_enable;
-	asoc->sctp_nr_sack_on_off = (uint8_t) SCTP_BASE_SYSCTL(sctp_nr_sack_on_off);
+	asoc->ecn_supported = inp->ecn_supported;
+	asoc->prsctp_supported = inp->prsctp_supported;
+	asoc->auth_supported = inp->auth_supported;
+	asoc->asconf_supported = inp->asconf_supported;
+	asoc->reconfig_supported = inp->reconfig_supported;
+	asoc->nrsack_supported = inp->nrsack_supported;
+	asoc->pktdrop_supported = inp->pktdrop_supported;
 	asoc->sctp_cmt_pf = (uint8_t) 0;
 	asoc->sctp_frag_point = inp->sctp_frag_point;
 	asoc->sctp_features = inp->sctp_features;
@@ -951,7 +956,6 @@ sctp_init_asoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
 	    sctp_select_initial_TSN(&inp->sctp_ep);
 	asoc->asconf_seq_out_acked = asoc->asconf_seq_out - 1;
 	/* we are optimisitic here */
-	asoc->peer_supports_pktdrop = 1;
 	asoc->peer_supports_nat = 0;
 	asoc->sent_queue_retran_cnt = 0;
 
@@ -2516,58 +2520,44 @@ sctp_get_next_param(struct mbuf *m,
 }
 
 
-int
+struct mbuf *
 sctp_add_pad_tombuf(struct mbuf *m, int padlen)
 {
-	/*
-	 * add padlen bytes of 0 filled padding to the end of the mbuf. If
-	 * padlen is > 3 this routine will fail.
-	 */
-	uint8_t *dp;
-	int i;
+	struct mbuf *m_last;
+	caddr_t dp;
 
 	if (padlen > 3) {
-		SCTP_LTRACE_ERR_RET_PKT(m, NULL, NULL, NULL, SCTP_FROM_SCTPUTIL, ENOBUFS);
-		return (ENOBUFS);
+		return (NULL);
 	}
 	if (padlen <= M_TRAILINGSPACE(m)) {
 		/*
 		 * The easy way. We hope the majority of the time we hit
 		 * here :)
 		 */
-		dp = (uint8_t *) (mtod(m, caddr_t)+SCTP_BUF_LEN(m));
-		SCTP_BUF_LEN(m) += padlen;
+		m_last = m;
 	} else {
-		/* Hard way we must grow the mbuf */
-		struct mbuf *tmp;
-
-		tmp = sctp_get_mbuf_for_msg(padlen, 0, M_NOWAIT, 1, MT_DATA);
-		if (tmp == NULL) {
-			/* Out of space GAK! we are in big trouble. */
-			SCTP_LTRACE_ERR_RET_PKT(m, NULL, NULL, NULL, SCTP_FROM_SCTPUTIL, ENOBUFS);
-			return (ENOBUFS);
+		/* Hard way we must grow the mbuf chain */
+		m_last = sctp_get_mbuf_for_msg(padlen, 0, M_NOWAIT, 1, MT_DATA);
+		if (m_last == NULL) {
+			return (NULL);
 		}
-		/* setup and insert in middle */
-		SCTP_BUF_LEN(tmp) = padlen;
-		SCTP_BUF_NEXT(tmp) = NULL;
-		SCTP_BUF_NEXT(m) = tmp;
-		dp = mtod(tmp, uint8_t *);
+		SCTP_BUF_LEN(m_last) = 0;
+		SCTP_BUF_NEXT(m_last) = NULL;
+		SCTP_BUF_NEXT(m) = m_last;
 	}
-	/* zero out the pad */
-	for (i = 0; i < padlen; i++) {
-		*dp = 0;
-		dp++;
-	}
-	return (0);
+	dp = mtod(m_last, caddr_t)+SCTP_BUF_LEN(m_last);
+	SCTP_BUF_LEN(m_last) += padlen;
+	memset(dp, 0, padlen);
+	return (m_last);
 }
 
-int
+struct mbuf *
 sctp_pad_lastmbuf(struct mbuf *m, int padval, struct mbuf *last_mbuf)
 {
 	/* find the last mbuf in chain and pad it */
 	struct mbuf *m_at;
 
-	if (last_mbuf) {
+	if (last_mbuf != NULL) {
 		return (sctp_add_pad_tombuf(last_mbuf, padval));
 	} else {
 		for (m_at = m; m_at; m_at = SCTP_BUF_NEXT(m_at)) {
@@ -2576,8 +2566,7 @@ sctp_pad_lastmbuf(struct mbuf *m, int padval, struct mbuf *last_mbuf)
 			}
 		}
 	}
-	SCTP_LTRACE_ERR_RET_PKT(m, NULL, NULL, NULL, SCTP_FROM_SCTPUTIL, EFAULT);
-	return (EFAULT);
+	return (NULL);
 }
 
 static void
@@ -2622,6 +2611,7 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb,
 		}
 		SCTP_BUF_NEXT(m_notify) = NULL;
 		sac = mtod(m_notify, struct sctp_assoc_change *);
+		memset(sac, 0, notif_len);
 		sac->sac_type = SCTP_ASSOC_CHANGE;
 		sac->sac_flags = 0;
 		sac->sac_length = sizeof(struct sctp_assoc_change);
@@ -2634,17 +2624,17 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb,
 		if (notif_len > sizeof(struct sctp_assoc_change)) {
 			if ((state == SCTP_COMM_UP) || (state == SCTP_RESTART)) {
 				i = 0;
-				if (stcb->asoc.peer_supports_prsctp) {
+				if (stcb->asoc.prsctp_supported == 1) {
 					sac->sac_info[i++] = SCTP_ASSOC_SUPPORTS_PR;
 				}
-				if (stcb->asoc.peer_supports_auth) {
+				if (stcb->asoc.auth_supported == 1) {
 					sac->sac_info[i++] = SCTP_ASSOC_SUPPORTS_AUTH;
 				}
-				if (stcb->asoc.peer_supports_asconf) {
+				if (stcb->asoc.asconf_supported == 1) {
 					sac->sac_info[i++] = SCTP_ASSOC_SUPPORTS_ASCONF;
 				}
 				sac->sac_info[i++] = SCTP_ASSOC_SUPPORTS_MULTIBUF;
-				if (stcb->asoc.peer_supports_strreset) {
+				if (stcb->asoc.reconfig_supported == 1) {
 					sac->sac_info[i++] = SCTP_ASSOC_SUPPORTS_RE_CONFIG;
 				}
 				sac->sac_length += i;
@@ -2745,6 +2735,7 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state,
 		return;
 	SCTP_BUF_LEN(m_notify) = 0;
 	spc = mtod(m_notify, struct sctp_paddr_change *);
+	memset(spc, 0, sizeof(struct sctp_paddr_change));
 	spc->spc_type = SCTP_PEER_ADDR_CHANGE;
 	spc->spc_flags = 0;
 	spc->spc_length = sizeof(struct sctp_paddr_change);
@@ -2835,21 +2826,21 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uint8_t sent, uint32_t error,
 	if (m_notify == NULL)
 		/* no space left */
 		return;
-	length += chk->send_size;
-	length -= sizeof(struct sctp_data_chunk);
 	SCTP_BUF_LEN(m_notify) = 0;
 	if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) {
 		ssfe = mtod(m_notify, struct sctp_send_failed_event *);
+		memset(ssfe, 0, length);
 		ssfe->ssfe_type = SCTP_SEND_FAILED_EVENT;
 		if (sent) {
 			ssfe->ssfe_flags = SCTP_DATA_SENT;
 		} else {
 			ssfe->ssfe_flags = SCTP_DATA_UNSENT;
 		}
+		length += chk->send_size;
+		length -= sizeof(struct sctp_data_chunk);
 		ssfe->ssfe_length = length;
 		ssfe->ssfe_error = error;
 		/* not exactly what the user sent in, but should be close :) */
-		bzero(&ssfe->ssfe_info, sizeof(ssfe->ssfe_info));
 		ssfe->ssfe_info.snd_sid = chk->rec.data.stream_number;
 		ssfe->ssfe_info.snd_flags = chk->rec.data.rcv_flags;
 		ssfe->ssfe_info.snd_ppid = chk->rec.data.payloadtype;
@@ -2859,12 +2850,15 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uint8_t sent, uint32_t error,
 		SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_send_failed_event);
 	} else {
 		ssf = mtod(m_notify, struct sctp_send_failed *);
+		memset(ssf, 0, length);
 		ssf->ssf_type = SCTP_SEND_FAILED;
 		if (sent) {
 			ssf->ssf_flags = SCTP_DATA_SENT;
 		} else {
 			ssf->ssf_flags = SCTP_DATA_UNSENT;
 		}
+		length += chk->send_size;
+		length -= sizeof(struct sctp_data_chunk);
 		ssf->ssf_length = length;
 		ssf->ssf_error = error;
 		/* not exactly what the user sent in, but should be close :) */
@@ -2948,16 +2942,16 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, uint32_t error,
 		/* no space left */
 		return;
 	}
-	length += sp->length;
 	SCTP_BUF_LEN(m_notify) = 0;
 	if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) {
 		ssfe = mtod(m_notify, struct sctp_send_failed_event *);
+		memset(ssfe, 0, length);
 		ssfe->ssfe_type = SCTP_SEND_FAILED_EVENT;
 		ssfe->ssfe_flags = SCTP_DATA_UNSENT;
+		length += sp->length;
 		ssfe->ssfe_length = length;
 		ssfe->ssfe_error = error;
 		/* not exactly what the user sent in, but should be close :) */
-		bzero(&ssfe->ssfe_info, sizeof(ssfe->ssfe_info));
 		ssfe->ssfe_info.snd_sid = sp->stream;
 		if (sp->some_taken) {
 			ssfe->ssfe_info.snd_flags = SCTP_DATA_LAST_FRAG;
@@ -2971,12 +2965,13 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, uint32_t error,
 		SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_send_failed_event);
 	} else {
 		ssf = mtod(m_notify, struct sctp_send_failed *);
+		memset(ssf, 0, length);
 		ssf->ssf_type = SCTP_SEND_FAILED;
 		ssf->ssf_flags = SCTP_DATA_UNSENT;
+		length += sp->length;
 		ssf->ssf_length = length;
 		ssf->ssf_error = error;
 		/* not exactly what the user sent in, but should be close :) */
-		bzero(&ssf->ssf_info, sizeof(ssf->ssf_info));
 		ssf->ssf_info.sinfo_stream = sp->stream;
 		ssf->ssf_info.sinfo_ssn = 0;
 		if (sp->some_taken) {
@@ -3038,6 +3033,7 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb)
 		return;
 	SCTP_BUF_LEN(m_notify) = 0;
 	sai = mtod(m_notify, struct sctp_adaptation_event *);
+	memset(sai, 0, sizeof(struct sctp_adaptation_event));
 	sai->sai_type = SCTP_ADAPTATION_INDICATION;
 	sai->sai_flags = 0;
 	sai->sai_length = sizeof(struct sctp_adaptation_event);
@@ -3093,6 +3089,7 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error,
 		return;
 	SCTP_BUF_LEN(m_notify) = 0;
 	pdapi = mtod(m_notify, struct sctp_pdapi_event *);
+	memset(pdapi, 0, sizeof(struct sctp_pdapi_event));
 	pdapi->pdapi_type = SCTP_PARTIAL_DELIVERY_EVENT;
 	pdapi->pdapi_flags = 0;
 	pdapi->pdapi_length = sizeof(struct sctp_pdapi_event);
@@ -3202,6 +3199,7 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb)
 		/* no space left */
 		return;
 	sse = mtod(m_notify, struct sctp_shutdown_event *);
+	memset(sse, 0, sizeof(struct sctp_shutdown_event));
 	sse->sse_type = SCTP_SHUTDOWN_EVENT;
 	sse->sse_flags = 0;
 	sse->sse_length = sizeof(struct sctp_shutdown_event);
@@ -3252,6 +3250,7 @@ sctp_notify_sender_dry_event(struct sctp_tcb *stcb,
 	}
 	SCTP_BUF_LEN(m_notify) = 0;
 	event = mtod(m_notify, struct sctp_sender_dry_event *);
+	memset(event, 0, sizeof(struct sctp_sender_dry_event));
 	event->sender_dry_type = SCTP_SENDER_DRY_EVENT;
 	event->sender_dry_flags = 0;
 	event->sender_dry_length = sizeof(struct sctp_sender_dry_event);
@@ -3284,7 +3283,6 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, uint16_t
 	struct mbuf *m_notify;
 	struct sctp_queued_to_read *control;
 	struct sctp_stream_change_event *stradd;
-	int len;
 
 	if ((stcb == NULL) ||
 	    (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_CHANGEEVNT))) {
@@ -3297,25 +3295,20 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, uint16_t
 		return;
 	}
 	stcb->asoc.peer_req_out = 0;
-	m_notify = sctp_get_mbuf_for_msg(MCLBYTES, 0, M_NOWAIT, 1, MT_DATA);
+	m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_stream_change_event), 0, M_NOWAIT, 1, MT_DATA);
 	if (m_notify == NULL)
 		/* no space left */
 		return;
 	SCTP_BUF_LEN(m_notify) = 0;
-	len = sizeof(struct sctp_stream_change_event);
-	if (len > M_TRAILINGSPACE(m_notify)) {
-		/* never enough room */
-		sctp_m_freem(m_notify);
-		return;
-	}
 	stradd = mtod(m_notify, struct sctp_stream_change_event *);
+	memset(stradd, 0, sizeof(struct sctp_stream_change_event));
 	stradd->strchange_type = SCTP_STREAM_CHANGE_EVENT;
 	stradd->strchange_flags = flag;
-	stradd->strchange_length = len;
+	stradd->strchange_length = sizeof(struct sctp_stream_change_event);
 	stradd->strchange_assoc_id = sctp_get_associd(stcb);
 	stradd->strchange_instrms = numberin;
 	stradd->strchange_outstrms = numberout;
-	SCTP_BUF_LEN(m_notify) = len;
+	SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_stream_change_event);
 	SCTP_BUF_NEXT(m_notify) = NULL;
 	if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) {
 		/* no space */
@@ -3346,32 +3339,26 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32
 	struct mbuf *m_notify;
 	struct sctp_queued_to_read *control;
 	struct sctp_assoc_reset_event *strasoc;
-	int len;
 
 	if ((stcb == NULL) ||
 	    (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ASSOC_RESETEVNT))) {
 		/* event not enabled */
 		return;
 	}
-	m_notify = sctp_get_mbuf_for_msg(MCLBYTES, 0, M_NOWAIT, 1, MT_DATA);
+	m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_assoc_reset_event), 0, M_NOWAIT, 1, MT_DATA);
 	if (m_notify == NULL)
 		/* no space left */
 		return;
 	SCTP_BUF_LEN(m_notify) = 0;
-	len = sizeof(struct sctp_assoc_reset_event);
-	if (len > M_TRAILINGSPACE(m_notify)) {
-		/* never enough room */
-		sctp_m_freem(m_notify);
-		return;
-	}
 	strasoc = mtod(m_notify, struct sctp_assoc_reset_event *);
+	memset(strasoc, 0, sizeof(struct sctp_assoc_reset_event));
 	strasoc->assocreset_type = SCTP_ASSOC_RESET_EVENT;
 	strasoc->assocreset_flags = flag;
-	strasoc->assocreset_length = len;
+	strasoc->assocreset_length = sizeof(struct sctp_assoc_reset_event);
 	strasoc->assocreset_assoc_id = sctp_get_associd(stcb);
 	strasoc->assocreset_local_tsn = sending_tsn;
 	strasoc->assocreset_remote_tsn = recv_tsn;
-	SCTP_BUF_LEN(m_notify) = len;
+	SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_assoc_reset_event);
 	SCTP_BUF_NEXT(m_notify) = NULL;
 	if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) {
 		/* no space */
@@ -3424,6 +3411,7 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb,
 		return;
 	}
 	strreset = mtod(m_notify, struct sctp_stream_reset_event *);
+	memset(strreset, 0, len);
 	strreset->strreset_type = SCTP_STREAM_RESET_EVENT;
 	strreset->strreset_flags = flag;
 	strreset->strreset_length = len;
@@ -3490,6 +3478,7 @@ sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, struct sctp_erro
 	}
 	SCTP_BUF_NEXT(m_notify) = NULL;
 	sre = mtod(m_notify, struct sctp_remote_error *);
+	memset(sre, 0, notif_len);
 	sre->sre_type = SCTP_REMOTE_ERROR;
 	sre->sre_flags = 0;
 	sre->sre_length = sizeof(struct sctp_remote_error);
@@ -3554,7 +3543,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb,
 		if (stcb->asoc.adaptation_needed && (stcb->asoc.adaptation_sent == 0)) {
 			sctp_notify_adaptation_layer(stcb);
 		}
-		if (stcb->asoc.peer_supports_auth == 0) {
+		if (stcb->asoc.auth_supported == 0) {
 			sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0,
 			    NULL, so_locked);
 		}
@@ -3628,7 +3617,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb,
 		break;
 	case SCTP_NOTIFY_ASSOC_RESTART:
 		sctp_notify_assoc_change(SCTP_RESTART, stcb, error, NULL, 0, so_locked);
-		if (stcb->asoc.peer_supports_auth == 0) {
+		if (stcb->asoc.auth_supported == 0) {
 			sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0,
 			    NULL, so_locked);
 		}
@@ -6236,9 +6225,12 @@ sctp_soreceive(struct socket *so,
 		fromlen = 0;
 	}
 
+	if (filling_sinfo) {
+		memset(&sinfo, 0, sizeof(struct sctp_extrcvinfo));
+	}
 	error = sctp_sorecvmsg(so, uio, mp0, from, fromlen, flagsp,
 	    (struct sctp_sndrcvinfo *)&sinfo, filling_sinfo);
-	if ((controlp) && (filling_sinfo)) {
+	if (controlp != NULL) {
 		/* copy back the sinfo in a CMSG format */
 		if (filling_sinfo)
 			*controlp = sctp_build_ctl_nchunk(inp,
@@ -6693,6 +6685,10 @@ sctp_local_addr_count(struct sctp_tcb *stcb)
 							 */
 							continue;
 						}
+						if (prison_check_ip4(stcb->sctp_ep->ip_inp.inp.inp_cred,
+						    &sin->sin_addr) != 0) {
+							continue;
+						}
 						if ((ipv4_local_scope == 0) &&
 						    (IN4_ISPRIVATE_ADDRESS(&sin->sin_addr))) {
 							continue;
@@ -6713,6 +6709,10 @@ sctp_local_addr_count(struct sctp_tcb *stcb)
 						if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
 							continue;
 						}
+						if (prison_check_ip6(stcb->sctp_ep->ip_inp.inp.inp_cred,
+						    &sin6->sin6_addr) != 0) {
+							continue;
+						}
 						if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
 							if (local_scope == 0)
 								continue;
diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h
index af5a0f298596..559daa3764fa 100644
--- a/sys/netinet/sctputil.h
+++ b/sys/netinet/sctputil.h
@@ -147,9 +147,11 @@ struct sctp_paramhdr *
 sctp_get_next_param(struct mbuf *, int,
     struct sctp_paramhdr *, int);
 
-int sctp_add_pad_tombuf(struct mbuf *, int);
+struct mbuf *
+     sctp_add_pad_tombuf(struct mbuf *, int);
 
-int sctp_pad_lastmbuf(struct mbuf *, int, struct mbuf *);
+struct mbuf *
+     sctp_pad_lastmbuf(struct mbuf *, int, struct mbuf *);
 
 void 
 sctp_ulp_notify(uint32_t, struct sctp_tcb *, uint32_t, void *, int
@@ -276,42 +278,42 @@ sctp_free_bufspace(struct sctp_tcb *, struct sctp_association *,
 #define sctp_free_bufspace(stcb, asoc, tp1, chk_cnt)  \
 do { \
 	if (tp1->data != NULL) { \
-                atomic_subtract_int(&((asoc)->chunks_on_out_queue), chk_cnt); \
+		atomic_subtract_int(&((asoc)->chunks_on_out_queue), chk_cnt); \
 		if ((asoc)->total_output_queue_size >= tp1->book_size) { \
 			atomic_subtract_int(&((asoc)->total_output_queue_size), tp1->book_size); \
 		} else { \
 			(asoc)->total_output_queue_size = 0; \
 		} \
-   	        if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \
-	            (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \
+		if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \
+		    (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \
 			if (stcb->sctp_socket->so_snd.sb_cc >= tp1->book_size) { \
 				atomic_subtract_int(&((stcb)->sctp_socket->so_snd.sb_cc), tp1->book_size); \
 			} else { \
 				stcb->sctp_socket->so_snd.sb_cc = 0; \
 			} \
 		} \
-        } \
+	} \
 } while (0)
 
 #endif
 
 #define sctp_free_spbufspace(stcb, asoc, sp)  \
 do { \
- 	if (sp->data != NULL) { \
+	if (sp->data != NULL) { \
 		if ((asoc)->total_output_queue_size >= sp->length) { \
 			atomic_subtract_int(&(asoc)->total_output_queue_size, sp->length); \
 		} else { \
 			(asoc)->total_output_queue_size = 0; \
 		} \
-   	        if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \
-	            (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \
+		if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \
+		    (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \
 			if (stcb->sctp_socket->so_snd.sb_cc >= sp->length) { \
 				atomic_subtract_int(&stcb->sctp_socket->so_snd.sb_cc,sp->length); \
 			} else { \
 				stcb->sctp_socket->so_snd.sb_cc = 0; \
 			} \
 		} \
-        } \
+	} \
 } while (0)
 
 #define sctp_snd_sb_alloc(stcb, sz)  \
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 7f006695436b..c8404fcd8926 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -522,25 +522,26 @@ tcp6_input(struct mbuf **mp, int *offp, int proto)
 		ip6 = mtod(m, struct ip6_hdr *);
 		icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADDR,
 			    (caddr_t)&ip6->ip6_dst - (caddr_t)ip6);
-		return IPPROTO_DONE;
+		return (IPPROTO_DONE);
 	}
 	if (ia6)
 		ifa_free(&ia6->ia_ifa);
 
-	tcp_input(m, *offp);
-	return IPPROTO_DONE;
+	return (tcp_input(mp, offp, proto));
 }
 #endif /* INET6 */
 
-void
-tcp_input(struct mbuf *m, int off0)
+int
+tcp_input(struct mbuf **mp, int *offp, int proto)
 {
+	struct mbuf *m = *mp;
 	struct tcphdr *th = NULL;
 	struct ip *ip = NULL;
 	struct inpcb *inp = NULL;
 	struct tcpcb *tp = NULL;
 	struct socket *so = NULL;
 	u_char *optp = NULL;
+	int off0;
 	int optlen = 0;
 #ifdef INET
 	int len;
@@ -580,6 +581,9 @@ tcp_input(struct mbuf *m, int off0)
 	isipv6 = (mtod(m, struct ip *)->ip_v == 6) ? 1 : 0;
 #endif
 
+	off0 = *offp;
+	m = *mp;
+	*mp = NULL;
 	to.to_flags = 0;
 	TCPSTAT_INC(tcps_rcvtotal);
 
@@ -591,7 +595,7 @@ tcp_input(struct mbuf *m, int off0)
 			m = m_pullup(m, sizeof(*ip6) + sizeof(*th));
 			if (m == NULL) {
 				TCPSTAT_INC(tcps_rcvshort);
-				return;
+				return (IPPROTO_DONE);
 			}
 		}
 
@@ -643,7 +647,7 @@ tcp_input(struct mbuf *m, int off0)
 			if ((m = m_pullup(m, sizeof (struct tcpiphdr)))
 			    == NULL) {
 				TCPSTAT_INC(tcps_rcvshort);
-				return;
+				return (IPPROTO_DONE);
 			}
 		}
 		ip = mtod(m, struct ip *);
@@ -706,7 +710,7 @@ tcp_input(struct mbuf *m, int off0)
 	if (off > sizeof (struct tcphdr)) {
 #ifdef INET6
 		if (isipv6) {
-			IP6_EXTHDR_CHECK(m, off0, off, );
+			IP6_EXTHDR_CHECK(m, off0, off, IPPROTO_DONE);
 			ip6 = mtod(m, struct ip6_hdr *);
 			th = (struct tcphdr *)((caddr_t)ip6 + off0);
 		}
@@ -720,7 +724,7 @@ tcp_input(struct mbuf *m, int off0)
 				if ((m = m_pullup(m, sizeof (struct ip) + off))
 				    == NULL) {
 					TCPSTAT_INC(tcps_rcvshort);
-					return;
+					return (IPPROTO_DONE);
 				}
 				ip = mtod(m, struct ip *);
 				th = (struct tcphdr *)((caddr_t)ip + off0);
@@ -949,7 +953,7 @@ tcp_input(struct mbuf *m, int off0)
 		if (tcp_twcheck(inp, &to, th, m, tlen))
 			goto findpcb;
 		INP_INFO_WUNLOCK(&V_tcbinfo);
-		return;
+		return (IPPROTO_DONE);
 	}
 	/*
 	 * The TCPCB may no longer exist if the connection is winding
@@ -1138,7 +1142,7 @@ tcp_input(struct mbuf *m, int off0)
 			tcp_do_segment(m, th, so, tp, drop_hdrlen, tlen,
 			    iptos, ti_locked);
 			INP_INFO_UNLOCK_ASSERT(&V_tcbinfo);
-			return;
+			return (IPPROTO_DONE);
 		}
 		/*
 		 * Segment flag validation for new connection attempts:
@@ -1338,7 +1342,7 @@ tcp_input(struct mbuf *m, int off0)
 		 * Everything already unlocked by syncache_add().
 		 */
 		INP_INFO_UNLOCK_ASSERT(&V_tcbinfo);
-		return;
+		return (IPPROTO_DONE);
 	} else if (tp->t_state == TCPS_LISTEN) {
 		/*
 		 * When a listen socket is torn down the SO_ACCEPTCONN
@@ -1378,7 +1382,7 @@ tcp_input(struct mbuf *m, int off0)
 	 */
 	tcp_do_segment(m, th, so, tp, drop_hdrlen, tlen, iptos, ti_locked);
 	INP_INFO_UNLOCK_ASSERT(&V_tcbinfo);
-	return;
+	return (IPPROTO_DONE);
 
 dropwithreset:
 	TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th);
@@ -1428,6 +1432,7 @@ tcp_input(struct mbuf *m, int off0)
 		free(s, M_TCPLOG);
 	if (m != NULL)
 		m_freem(m);
+	return (IPPROTO_DONE);
 }
 
 static void
@@ -1788,11 +1793,13 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
 		 * reassembly queue.
 		 *
 		 * The criteria to step up the receive buffer one notch are:
-		 *  1. the number of bytes received during the time it takes
+		 *  1. Application has not set receive buffer size with
+		 *     SO_RCVBUF. Setting SO_RCVBUF clears SB_AUTOSIZE.
+		 *  2. the number of bytes received during the time it takes
 		 *     one timestamp to be reflected back to us (the RTT);
-		 *  2. received bytes per RTT is within seven eighth of the
+		 *  3. received bytes per RTT is within seven eighth of the
 		 *     current socket buffer size;
-		 *  3. receive buffer size has not hit maximal automatic size;
+		 *  4. receive buffer size has not hit maximal automatic size;
 		 *
 		 * This algorithm does one step per RTT at most and only if
 		 * we receive a bulk stream w/o packet losses or reorderings.
@@ -3472,8 +3479,8 @@ tcp_mss_update(struct tcpcb *tp, int offer, int mtuoffer,
 		bcopy(&metrics, metricptr, sizeof(struct hc_metrics_lite));
 
 	/*
-	 * If there's a discovered mtu int tcp hostcache, use it
-	 * else, use the link mtu.
+	 * If there's a discovered mtu in tcp hostcache, use it.
+	 * Else, use the link mtu.
 	 */
 	if (metrics.rmx_mtu)
 		mss = min(metrics.rmx_mtu, maxmtu) - min_protoh;
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 72958ca3c3f5..12d8e754ab5b 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1160,7 +1160,7 @@ tcp_output(struct tcpcb *tp)
 	 * the template, but need a way to checksum without them.
 	 */
 	/*
-	 * m->m_pkthdr.len should have been set before cksum calcuration,
+	 * m->m_pkthdr.len should have been set before checksum calculation,
 	 * because in6_cksum() need it.
 	 */
 #ifdef INET6
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index fb2c415aee98..ac0aad31bc50 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -188,8 +188,8 @@ static int	tcp_log_debug = 0;
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, log_debug, CTLFLAG_RW,
     &tcp_log_debug, 0, "Log errors caused by incoming TCP segments");
 
-static int	tcp_tcbhashsize = 0;
-SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RDTUN,
+static int	tcp_tcbhashsize;
+SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
     &tcp_tcbhashsize, 0, "Size of TCP control-block hashtable");
 
 static int	do_tcpdrain = 1;
@@ -211,7 +211,7 @@ SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, isn_reseed_interval, CTLFLAG_RW,
     &VNET_NAME(tcp_isn_reseed_interval), 0,
     "Seconds between reseeding of ISN secret");
 
-static int	tcp_soreceive_stream = 0;
+static int	tcp_soreceive_stream;
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, soreceive_stream, CTLFLAG_RDTUN,
     &tcp_soreceive_stream, 0, "Using soreceive_stream for TCP sockets");
 
@@ -398,7 +398,6 @@ tcp_init(void)
 	tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT;
 	tcp_tcbhashsize = hashsize;
 
-	TUNABLE_INT_FETCH("net.inet.tcp.soreceive_stream", &tcp_soreceive_stream);
 	if (tcp_soreceive_stream) {
 #ifdef INET
 		tcp_usrreqs.pru_soreceive = soreceive_stream;
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 3874f133746b..1767e1ed83d3 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -127,7 +127,11 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, rexmit_drop_options, CTLFLAG_RW,
     &tcp_rexmit_drop_options, 0,
     "Drop TCP options from 3rd and later retransmitted SYN");
 
+#ifdef	RSS
+static int	per_cpu_timers = 1;
+#else
 static int	per_cpu_timers = 0;
+#endif
 SYSCTL_INT(_net_inet_tcp, OID_AUTO, per_cpu_timers, CTLFLAG_RW,
     &per_cpu_timers , 0, "run tcp timers on all cpus");
 
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index 716358569d41..33555d9fe980 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -275,6 +275,11 @@ tcp_twstart(struct tcpcb *tp)
 
 	tw = uma_zalloc(V_tcptw_zone, M_NOWAIT);
 	if (tw == NULL) {
+		/*
+		 * Reached limit on total number of TIMEWAIT connections
+		 * allowed. Remove a connection from TIMEWAIT queue in LRU
+		 * fashion to make room for this connection.
+		 */
 		tw = tcp_tw_2msl_reuse();
 		if (tw == NULL) {
 			tp = tcp_close(tp);
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 2ed00e236fe6..5163f6e7177c 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -654,7 +654,7 @@ char	*tcp_log_vain(struct in_conninfo *, struct tcphdr *, void *,
 	    const void *);
 int	 tcp_reass(struct tcpcb *, struct tcphdr *, int *, struct mbuf *);
 void	 tcp_reass_flush(struct tcpcb *);
-void	 tcp_input(struct mbuf *, int);
+int	 tcp_input(struct mbuf **, int *, int);
 u_long	 tcp_maxmtu(struct in_conninfo *, struct tcp_ifcap *);
 u_long	 tcp_maxmtu6(struct in_conninfo *, struct tcp_ifcap *);
 void	 tcp_mss_update(struct tcpcb *, int, int, struct hc_metrics_lite *,
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 4b565fcc4f86..5860c579e749 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -368,10 +368,9 @@ udp_append(struct inpcb *inp, struct ip *ip, struct mbuf *n, int off,
 		sorwakeup_locked(so);
 }
 
-void
-udp_input(struct mbuf *m, int off)
+int
+udp_input(struct mbuf **mp, int *offp, int proto)
 {
-	int iphlen = off;
 	struct ip *ip;
 	struct udphdr *uh;
 	struct ifnet *ifp;
@@ -380,11 +379,14 @@ udp_input(struct mbuf *m, int off)
 	struct inpcbinfo *pcbinfo;
 	struct ip save_ip;
 	struct sockaddr_in udp_in;
+	struct mbuf *m;
 	struct m_tag *fwd_tag;
-	int cscov_partial;
-	uint8_t pr;
+	int cscov_partial, iphlen;
 
+	m = *mp;
+	iphlen = *offp;
 	ifp = m->m_pkthdr.rcvif;
+	*mp = NULL;
 	UDPSTAT_INC(udps_ipackets);
 
 	/*
@@ -404,13 +406,12 @@ udp_input(struct mbuf *m, int off)
 	if (m->m_len < iphlen + sizeof(struct udphdr)) {
 		if ((m = m_pullup(m, iphlen + sizeof(struct udphdr))) == NULL) {
 			UDPSTAT_INC(udps_hdrops);
-			return;
+			return (IPPROTO_DONE);
 		}
 		ip = mtod(m, struct ip *);
 	}
 	uh = (struct udphdr *)((caddr_t)ip + iphlen);
-	pr = ip->ip_p;
-	cscov_partial = (pr == IPPROTO_UDPLITE) ? 1 : 0;
+	cscov_partial = (proto == IPPROTO_UDPLITE) ? 1 : 0;
 
 	/*
 	 * Destination port of 0 is illegal, based on RFC768.
@@ -434,7 +435,7 @@ udp_input(struct mbuf *m, int off)
 	 */
 	len = ntohs((u_short)uh->uh_ulen);
 	ip_len = ntohs(ip->ip_len) - iphlen;
-	if (pr == IPPROTO_UDPLITE && len == 0) {
+	if (proto == IPPROTO_UDPLITE && len == 0) {
 		/* Zero means checksum over the complete packet. */
 		len = ip_len;
 		cscov_partial = 0;
@@ -444,7 +445,7 @@ udp_input(struct mbuf *m, int off)
 			UDPSTAT_INC(udps_badlen);
 			goto badunlocked;
 		}
-		if (pr == IPPROTO_UDP)
+		if (proto == IPPROTO_UDP)
 			m_adj(m, len - ip_len);
 	}
 
@@ -470,14 +471,14 @@ udp_input(struct mbuf *m, int off)
 			else
 				uh_sum = in_pseudo(ip->ip_src.s_addr,
 				    ip->ip_dst.s_addr, htonl((u_short)len +
-				    m->m_pkthdr.csum_data + pr));
+				    m->m_pkthdr.csum_data + proto));
 			uh_sum ^= 0xffff;
 		} else {
 			char b[9];
 
 			bcopy(((struct ipovly *)ip)->ih_x1, b, 9);
 			bzero(((struct ipovly *)ip)->ih_x1, 9);
-			((struct ipovly *)ip)->ih_len = (pr == IPPROTO_UDP) ?
+			((struct ipovly *)ip)->ih_len = (proto == IPPROTO_UDP) ?
 			    uh->uh_ulen : htons(ip_len);
 			uh_sum = in_cksum(m, len + sizeof (struct ip));
 			bcopy(b, ((struct ipovly *)ip)->ih_x1, 9);
@@ -485,12 +486,12 @@ udp_input(struct mbuf *m, int off)
 		if (uh_sum) {
 			UDPSTAT_INC(udps_badsum);
 			m_freem(m);
-			return;
+			return (IPPROTO_DONE);
 		}
 	} else
 		UDPSTAT_INC(udps_nosum);
 
-	pcbinfo = get_inpcbinfo(pr);
+	pcbinfo = get_inpcbinfo(proto);
 	if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) ||
 	    in_broadcast(ip->ip_dst, ifp)) {
 		struct inpcb *last;
@@ -498,7 +499,7 @@ udp_input(struct mbuf *m, int off)
 		struct ip_moptions *imo;
 
 		INP_INFO_RLOCK(pcbinfo);
-		pcblist = get_pcblist(pr);
+		pcblist = get_pcblist(proto);
 		last = NULL;
 		LIST_FOREACH(inp, pcblist, inp_list) {
 			if (inp->inp_lport != uh->uh_dport)
@@ -592,7 +593,7 @@ udp_input(struct mbuf *m, int off)
 		udp_append(last, ip, m, iphlen, &udp_in);
 		INP_RUNLOCK(last);
 		INP_INFO_RUNLOCK(pcbinfo);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	/*
@@ -654,7 +655,7 @@ udp_input(struct mbuf *m, int off)
 			goto badunlocked;
 		*ip = save_ip;
 		icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PORT, 0, 0);
-		return;
+		return (IPPROTO_DONE);
 	}
 
 	/*
@@ -664,7 +665,7 @@ udp_input(struct mbuf *m, int off)
 	if (inp->inp_ip_minttl && inp->inp_ip_minttl > ip->ip_ttl) {
 		INP_RUNLOCK(inp);
 		m_freem(m);
-		return;
+		return (IPPROTO_DONE);
 	}
 	if (cscov_partial) {
 		struct udpcb *up;
@@ -673,17 +674,18 @@ udp_input(struct mbuf *m, int off)
 		if (up->u_rxcslen > len) {
 			INP_RUNLOCK(inp);
 			m_freem(m);
-			return;
+			return (IPPROTO_DONE);
 		}
 	}
 
 	UDP_PROBE(receive, NULL, inp, ip, inp, uh);
 	udp_append(inp, ip, m, iphlen, &udp_in);
 	INP_RUNLOCK(inp);
-	return;
+	return (IPPROTO_DONE);
 
 badunlocked:
 	m_freem(m);
+	return (IPPROTO_DONE);
 }
 #endif /* INET */
 
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index ef4460c23a43..04b4dbb265f3 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -148,13 +148,13 @@ VNET_DECLARE(int, udp_blackhole);
 extern int			udp_log_in_vain;
 
 static __inline struct inpcbinfo *
-get_inpcbinfo(uint8_t protocol)
+get_inpcbinfo(int protocol)
 {
 	return (protocol == IPPROTO_UDP) ? &V_udbinfo : &V_ulitecbinfo;
 }
 
 static __inline struct inpcbhead *
-get_pcblist(uint8_t protocol)
+get_pcblist(int protocol)
 {
 	return (protocol == IPPROTO_UDP) ? &V_udb : &V_ulitecb;
 }
@@ -171,7 +171,7 @@ void		udplite_init(void);
 void		udp_destroy(void);
 void		udplite_destroy(void);
 #endif
-void		udp_input(struct mbuf *, int);
+int		udp_input(struct mbuf **, int *, int);
 void		udplite_input(struct mbuf *, int);
 struct inpcb	*udp_notify(struct inpcb *inp, int errno);
 int		udp_shutdown(struct socket *so);
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index f17c4a08d7cc..7c31827918a7 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1249,9 +1249,6 @@ in6_update_ifa_internal(struct ifnet *ifp, struct in6_aliasreq *ifra,
 		ia->ia6_lifetime.ia6t_preferred = time_uptime;
 	}
 
-	/* Update metric */
-	ia->ia_ifa.ifa_metric = ifp->if_metric;
-
 	/*
 	 * configure address flags.
 	 */
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index f7d7e7601b2b..34daed8f46ec 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -481,6 +481,12 @@ struct route_in6 {
 
 #define	IPV6_BINDANY		64 /* bool: allow bind to any address */
 
+#define	IPV6_BINDMULTI		65 /* bool; allow multibind to same addr/port */
+#define	IPV6_RSS_LISTEN_BUCKET	66 /* int; set RSS listen bucket */
+#define	IPV6_FLOWID		67 /* int; flowid of given socket */
+#define	IPV6_FLOWTYPE		68 /* int; flowtype of given socket */
+#define	IPV6_RSSBUCKETID	69 /* int; RSS bucket ID of given socket */
+
 /*
  * The following option is private; do not use it from user applications.
  * It is deliberately defined to the same value as IP_MSFILTER.
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index 53188f143a41..f740b375c3b2 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/in6_gif.h>
 #include <netinet6/in6_var.h>
 #endif
-#include <netinet6/ip6protosw.h>
 #include <netinet/ip_ecn.h>
 #ifdef INET6
 #include <netinet6/ip6_ecn.h>
@@ -84,13 +83,13 @@ static int gif_validate6(const struct ip6_hdr *, struct gif_softc *,
 			 struct ifnet *);
 
 extern  struct domain inet6domain;
-struct ip6protosw in6_gif_protosw = {
+struct protosw in6_gif_protosw = {
 	.pr_type =	SOCK_RAW,
 	.pr_domain =	&inet6domain,
 	.pr_protocol =	0,			/* IPPROTO_IPV[46] */
 	.pr_flags =	PR_ATOMIC|PR_ADDR,
 	.pr_input =	in6_gif_input,
-	.pr_output =	rip6_output,
+	.pr_output =	(pr_output_t *)rip6_output,
 	.pr_ctloutput =	rip6_ctloutput,
 	.pr_usrreqs =	&rip6_usrreqs
 };
@@ -176,6 +175,7 @@ in6_gif_output(struct ifnet *ifp,
 			return ENOBUFS;
 		bcopy(&eiphdr, mtod(m, struct etherip_header *),
 		    sizeof(struct etherip_header));
+		itos = 0;
 		break;
 
 	default:
@@ -266,6 +266,7 @@ in6_gif_output(struct ifnet *ifp,
 #endif
 	}
 
+	m->m_flags &= ~(M_BCAST|M_MCAST);
 #ifdef IPV6_MINMTU
 	/*
 	 * force fragmentation to minimum MTU, to avoid path MTU discovery.
diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c
index d25999763501..f9ff10a302f3 100644
--- a/sys/netinet6/in6_mcast.c
+++ b/sys/netinet6/in6_mcast.c
@@ -158,21 +158,18 @@ static SYSCTL_NODE(_net_inet6_ip6, OID_AUTO, mcast, CTLFLAG_RW, 0,
 
 static u_long in6_mcast_maxgrpsrc = IPV6_MAX_GROUP_SRC_FILTER;
 SYSCTL_ULONG(_net_inet6_ip6_mcast, OID_AUTO, maxgrpsrc,
-    CTLFLAG_RW | CTLFLAG_TUN, &in6_mcast_maxgrpsrc, 0,
+    CTLFLAG_RWTUN, &in6_mcast_maxgrpsrc, 0,
     "Max source filters per group");
-TUNABLE_ULONG("net.inet6.ip6.mcast.maxgrpsrc", &in6_mcast_maxgrpsrc);
 
 static u_long in6_mcast_maxsocksrc = IPV6_MAX_SOCK_SRC_FILTER;
 SYSCTL_ULONG(_net_inet6_ip6_mcast, OID_AUTO, maxsocksrc,
-    CTLFLAG_RW | CTLFLAG_TUN, &in6_mcast_maxsocksrc, 0,
+    CTLFLAG_RWTUN, &in6_mcast_maxsocksrc, 0,
     "Max source filters per socket");
-TUNABLE_ULONG("net.inet6.ip6.mcast.maxsocksrc", &in6_mcast_maxsocksrc);
 
 /* TODO Virtualize this switch. */
 int in6_mcast_loop = IPV6_DEFAULT_MULTICAST_LOOP;
-SYSCTL_INT(_net_inet6_ip6_mcast, OID_AUTO, loop, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_net_inet6_ip6_mcast, OID_AUTO, loop, CTLFLAG_RWTUN,
     &in6_mcast_loop, 0, "Loopback multicast datagrams by default");
-TUNABLE_INT("net.inet6.ip6.mcast.loop", &in6_mcast_loop);
 
 static SYSCTL_NODE(_net_inet6_ip6_mcast, OID_AUTO, filters,
     CTLFLAG_RD | CTLFLAG_MPSAFE, sysctl_ip6_mcast_filters,
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 068ac7269444..65f7824f1006 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -202,6 +202,7 @@ in6_pcbbind(register struct inpcb *inp, struct sockaddr *nam,
 				    &sin6->sin6_addr, lport,
 				    INPLOOKUP_WILDCARD, cred);
 				if (t &&
+				    ((inp->inp_flags2 & INP_BINDMULTI) == 0) &&
 				    ((t->inp_flags & INP_TIMEWAIT) == 0) &&
 				    (so->so_type != SOCK_STREAM ||
 				     IN6_IS_ADDR_UNSPECIFIED(&t->in6p_faddr)) &&
@@ -211,6 +212,16 @@ in6_pcbbind(register struct inpcb *inp, struct sockaddr *nam,
 				    (inp->inp_cred->cr_uid !=
 				     t->inp_cred->cr_uid))
 					return (EADDRINUSE);
+
+				/*
+				 * If the socket is a BINDMULTI socket, then
+				 * the credentials need to match and the
+				 * original socket also has to have been bound
+				 * with BINDMULTI.
+				 */
+				if (t && (! in_pcbbind_check_bindmulti(inp, t)))
+					return (EADDRINUSE);
+
 #ifdef INET
 				if ((inp->inp_flags & IN6P_IPV6_V6ONLY) == 0 &&
 				    IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
@@ -221,6 +232,7 @@ in6_pcbbind(register struct inpcb *inp, struct sockaddr *nam,
 					    sin.sin_addr, lport,
 					    INPLOOKUP_WILDCARD, cred);
 					if (t &&
+					    ((inp->inp_flags2 & INP_BINDMULTI) == 0) &&
 					    ((t->inp_flags &
 					      INP_TIMEWAIT) == 0) &&
 					    (so->so_type != SOCK_STREAM ||
@@ -229,6 +241,9 @@ in6_pcbbind(register struct inpcb *inp, struct sockaddr *nam,
 					    (inp->inp_cred->cr_uid !=
 					     t->inp_cred->cr_uid))
 						return (EADDRINUSE);
+
+					if (t && (! in_pcbbind_check_bindmulti(inp, t)))
+						return (EADDRINUSE);
 				}
 #endif
 			}
@@ -890,6 +905,71 @@ in6_pcblookup_group(struct inpcbinfo *pcbinfo, struct inpcbgroup *pcbgroup,
 		goto found;
 	}
 
+	/*
+	 * Then look for a wildcard match in the pcbgroup.
+	 */
+	if ((lookupflags & INPLOOKUP_WILDCARD) != 0) {
+		struct inpcb *local_wild = NULL, *local_exact = NULL;
+		struct inpcb *jail_wild = NULL;
+		int injail;
+
+		/*
+		 * Order of socket selection - we always prefer jails.
+		 *      1. jailed, non-wild.
+		 *      2. jailed, wild.
+		 *      3. non-jailed, non-wild.
+		 *      4. non-jailed, wild.
+		 */
+		head = &pcbgroup->ipg_hashbase[
+		    INP_PCBHASH(INADDR_ANY, lport, 0, pcbgroup->ipg_hashmask)];
+		LIST_FOREACH(inp, head, inp_pcbgrouphash) {
+			/* XXX inp locking */
+			if ((inp->inp_vflag & INP_IPV6) == 0)
+				continue;
+
+			if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr) ||
+			    inp->inp_lport != lport) {
+				continue;
+			}
+
+			/* XXX inp locking */
+			if (faith && (inp->inp_flags & INP_FAITH) == 0)
+				continue;
+
+			injail = prison_flag(inp->inp_cred, PR_IP6);
+			if (injail) {
+				if (prison_check_ip6(inp->inp_cred,
+				    laddr) != 0)
+					continue;
+			} else {
+				if (local_exact != NULL)
+					continue;
+			}
+
+			if (IN6_ARE_ADDR_EQUAL(&inp->in6p_laddr, laddr)) {
+				if (injail)
+					goto found;
+				else
+					local_exact = inp;
+			} else if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr)) {
+				if (injail)
+					jail_wild = inp;
+				else
+					local_wild = inp;
+			}
+		} /* LIST_FOREACH */
+
+		inp = jail_wild;
+		if (inp == NULL)
+			inp = jail_wild;
+		if (inp == NULL)
+			inp = local_exact;
+		if (inp == NULL)
+			inp = local_wild;
+		if (inp != NULL)
+			goto found;
+	}
+
 	/*
 	 * Then look for a wildcard match, if requested.
 	 */
diff --git a/sys/netinet6/in6_pcbgroup.c b/sys/netinet6/in6_pcbgroup.c
index 3e2700c0eb55..204370dc18d2 100644
--- a/sys/netinet6/in6_pcbgroup.c
+++ b/sys/netinet6/in6_pcbgroup.c
@@ -72,9 +72,11 @@ in6_pcbgroup_byhash(struct inpcbinfo *pcbinfo, u_int hashtype, uint32_t hash)
 
 #ifdef RSS
 	if ((pcbinfo->ipi_hashfields == IPI_HASHFIELDS_4TUPLE &&
-	    hashtype == M_HASHTYPE_RSS_TCP_IPV4) ||
+	    hashtype == M_HASHTYPE_RSS_TCP_IPV6) ||
+	    (pcbinfo->ipi_hashfields == IPI_HASHFIELDS_4TUPLE &&
+	    hashtype == M_HASHTYPE_RSS_UDP_IPV6) ||
 	    (pcbinfo->ipi_hashfields == IPI_HASHFIELDS_2TUPLE &&
-	    hashtype == M_HASHTYPE_RSS_IPV4))
+	    hashtype == M_HASHTYPE_RSS_IPV6))
 		return (&pcbinfo->ipi_pcbgroups[
 		    in6_pcbgroup_getbucket(pcbinfo, hash)]);
 #endif
@@ -128,6 +130,19 @@ struct inpcbgroup *
 in6_pcbgroup_byinpcb(struct inpcb *inp)
 {
 
+#ifdef	RSS
+	/*
+	 * Listen sockets with INP_RSS_BUCKET_SET set have a pre-determined
+	 * RSS bucket and thus we should use this pcbgroup, rather than
+	 * using a tuple or hash.
+	 *
+	 * XXX should verify that there's actually pcbgroups and inp_rss_listen_bucket
+	 * fits in that!
+	 */
+	if (inp->inp_flags2 & INP_RSS_BUCKET_SET)
+		return (&inp->inp_pcbinfo->ipi_pcbgroups[inp->inp_rss_listen_bucket]);
+#endif
+
 	return (in6_pcbgroup_bytuple(inp->inp_pcbinfo, &inp->in6p_laddr,
 	    inp->inp_lport, &inp->in6p_faddr, inp->inp_fport));
 }
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index 47bbe3dd00c9..209dc3a30180 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -146,7 +146,7 @@ static	struct pr_usrreqs nousrreqs;
 	.pr_usrreqs =		&nousrreqs	\
 }
 
-struct ip6protosw inet6sw[] = {
+struct protosw inet6sw[] = {
 {
 	.pr_type =		0,
 	.pr_domain =		&inet6domain,
@@ -233,7 +233,7 @@ struct ip6protosw inet6sw[] = {
 	.pr_protocol =		IPPROTO_RAW,
 	.pr_flags =		PR_ATOMIC|PR_ADDR,
 	.pr_input =		rip6_input,
-	.pr_output =		rip6_output,
+	.pr_output =		(pr_output_t *)rip6_output,
 	.pr_ctlinput =		rip6_ctlinput,
 	.pr_ctloutput =		rip6_ctloutput,
 #ifndef INET	/* Do not call initialization twice. */
@@ -247,7 +247,7 @@ struct ip6protosw inet6sw[] = {
 	.pr_protocol =		IPPROTO_ICMPV6,
 	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
 	.pr_input =		icmp6_input,
-	.pr_output =		rip6_output,
+	.pr_output =		(pr_output_t *)rip6_output,
 	.pr_ctlinput =		rip6_ctlinput,
 	.pr_ctloutput =		rip6_ctloutput,
 	.pr_fasttimo =		icmp6_fasttimo,
@@ -312,7 +312,7 @@ struct ip6protosw inet6sw[] = {
 	.pr_protocol =		IPPROTO_IPV4,
 	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
 	.pr_input =		encap6_input,
-	.pr_output =		rip6_output,
+	.pr_output =		(pr_output_t *)rip6_output,
 	.pr_ctloutput =		rip6_ctloutput,
 	.pr_init =		encap_init,
 	.pr_usrreqs =		&rip6_usrreqs
@@ -324,7 +324,7 @@ struct ip6protosw inet6sw[] = {
 	.pr_protocol =		IPPROTO_IPV6,
 	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
 	.pr_input =		encap6_input,
-	.pr_output =		rip6_output,
+	.pr_output =		(pr_output_t *)rip6_output,
 	.pr_ctloutput =		rip6_ctloutput,
 	.pr_init =		encap_init,
 	.pr_usrreqs =		&rip6_usrreqs
@@ -335,7 +335,7 @@ struct ip6protosw inet6sw[] = {
 	.pr_protocol =		IPPROTO_PIM,
 	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
 	.pr_input =		encap6_input,
-	.pr_output =		rip6_output,
+	.pr_output =		(pr_output_t *)rip6_output,
 	.pr_ctloutput =		rip6_ctloutput,
 	.pr_usrreqs =		&rip6_usrreqs
 },
@@ -354,7 +354,7 @@ IP6PROTOSPACER,
 	.pr_domain =		&inet6domain,
 	.pr_flags =		PR_ATOMIC|PR_ADDR,
 	.pr_input =		rip6_input,
-	.pr_output =		rip6_output,
+	.pr_output =		(pr_output_t *)rip6_output,
 	.pr_ctloutput =		rip6_ctloutput,
 	.pr_usrreqs =		&rip6_usrreqs
 },
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index f0ba9291e801..2c022ae92cb5 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -443,6 +443,12 @@ in6_selectsrc(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts,
 		    (ia->ia_ifp->if_flags & IFF_UP))
 			REPLACE(8);
 
+		/*
+		 * Rule 9: prefer address with better virtual status.
+		 */
+		if (ifa_preferred(&ia_best->ia_ifa, &ia->ia_ifa))
+			REPLACE(9);
+
 		/*
 		 * Rule 14: Use longest matching prefix.
 		 * Note: in the address selection draft, this rule is
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 13b4b793bc83..fb8cedd779be 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -76,8 +76,6 @@ __FBSDID("$FreeBSD$");
 #include <netipsec/key.h>
 #endif /* IPSEC */
 
-#include <netinet6/ip6protosw.h>
-
 /*
  * Forward a packet.  If some error occurs return the sender
  * an icmp packet.  Note we can't always generate a meaningful
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index a33341d8f0c3..1f89bd05ffa2 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -164,7 +164,7 @@ static struct mbuf *ip6_pullexthdr(struct mbuf *, size_t, int);
 void
 ip6_init(void)
 {
-	struct ip6protosw *pr;
+	struct protosw *pr;
 	int i;
 
 	TUNABLE_INT_FETCH("net.inet6.ip6.auto_linklocal",
@@ -194,11 +194,7 @@ ip6_init(void)
 	if (!IS_DEFAULT_VNET(curvnet))
 		return;
 
-#ifdef DIAGNOSTIC
-	if (sizeof(struct protosw) != sizeof(struct ip6protosw))
-		panic("sizeof(protosw) != sizeof(ip6protosw)");
-#endif
-	pr = (struct ip6protosw *)pffindproto(PF_INET6, IPPROTO_RAW, SOCK_RAW);
+	pr = pffindproto(PF_INET6, IPPROTO_RAW, SOCK_RAW);
 	if (pr == NULL)
 		panic("ip6_init");
 
@@ -209,8 +205,8 @@ ip6_init(void)
 	 * Cycle through IP protocols and put them into the appropriate place
 	 * in ip6_protox[].
 	 */
-	for (pr = (struct ip6protosw *)inet6domain.dom_protosw;
-	    pr < (struct ip6protosw *)inet6domain.dom_protoswNPROTOSW; pr++)
+	for (pr = inet6domain.dom_protosw;
+	    pr < inet6domain.dom_protoswNPROTOSW; pr++)
 		if (pr->pr_domain->dom_family == PF_INET6 &&
 		    pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW) {
 			/* Be careful to only index valid IP protocols. */
@@ -228,7 +224,7 @@ ip6_init(void)
 int
 ip6proto_register(short ip6proto)
 {
-	struct ip6protosw *pr;
+	struct protosw *pr;
 
 	/* Sanity checks. */
 	if (ip6proto <= 0 || ip6proto >= IPPROTO_MAX)
@@ -238,7 +234,7 @@ ip6proto_register(short ip6proto)
 	 * The protocol slot must not be occupied by another protocol
 	 * already.  An index pointing to IPPROTO_RAW is unused.
 	 */
-	pr = (struct ip6protosw *)pffindproto(PF_INET6, IPPROTO_RAW, SOCK_RAW);
+	pr = pffindproto(PF_INET6, IPPROTO_RAW, SOCK_RAW);
 	if (pr == NULL)
 		return (EPFNOSUPPORT);
 	if (ip6_protox[ip6proto] != pr - inet6sw)	/* IPPROTO_RAW */
@@ -247,8 +243,8 @@ ip6proto_register(short ip6proto)
 	/*
 	 * Find the protocol position in inet6sw[] and set the index.
 	 */
-	for (pr = (struct ip6protosw *)inet6domain.dom_protosw;
-	    pr < (struct ip6protosw *)inet6domain.dom_protoswNPROTOSW; pr++) {
+	for (pr = inet6domain.dom_protosw;
+	    pr < inet6domain.dom_protoswNPROTOSW; pr++) {
 		if (pr->pr_domain->dom_family == PF_INET6 &&
 		    pr->pr_protocol && pr->pr_protocol == ip6proto) {
 			ip6_protox[pr->pr_protocol] = pr - inet6sw;
@@ -261,14 +257,14 @@ ip6proto_register(short ip6proto)
 int
 ip6proto_unregister(short ip6proto)
 {
-	struct ip6protosw *pr;
+	struct protosw *pr;
 
 	/* Sanity checks. */
 	if (ip6proto <= 0 || ip6proto >= IPPROTO_MAX)
 		return (EPROTONOSUPPORT);
 
 	/* Check if the protocol was indeed registered. */
-	pr = (struct ip6protosw *)pffindproto(PF_INET6, IPPROTO_RAW, SOCK_RAW);
+	pr = pffindproto(PF_INET6, IPPROTO_RAW, SOCK_RAW);
 	if (pr == NULL)
 		return (EPFNOSUPPORT);
 	if (ip6_protox[ip6proto] == pr - inet6sw)	/* IPPROTO_RAW */
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 1ded0f6e4d51..77bff1f4fdcb 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -121,7 +121,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/scope6_var.h>
 #include <netinet6/nd6.h>
 #include <netinet6/ip6_mroute.h>
-#include <netinet6/ip6protosw.h>
 #include <netinet6/pim6.h>
 #include <netinet6/pim6_var.h>
 
@@ -141,13 +140,13 @@ extern int in6_mcast_loop;
 extern struct domain inet6domain;
 
 static const struct encaptab *pim6_encap_cookie;
-static const struct ip6protosw in6_pim_protosw = {
+static const struct protosw in6_pim_protosw = {
 	.pr_type =		SOCK_RAW,
 	.pr_domain =		&inet6domain,
 	.pr_protocol =		IPPROTO_PIM,
 	.pr_flags =		PR_ATOMIC|PR_ADDR|PR_LASTHDR,
 	.pr_input =		pim6_input,
-	.pr_output =		rip6_output,
+	.pr_output =		(pr_output_t *)rip6_output,
 	.pr_ctloutput =		rip6_ctloutput,
 	.pr_usrreqs =		&rip6_usrreqs
 };
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 05b47010bbae..6f2e8927af5d 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_ipsec.h"
 #include "opt_sctp.h"
 #include "opt_route.h"
+#include "opt_rss.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -102,6 +103,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in_pcb.h>
 #include <netinet/tcp_var.h>
 #include <netinet6/nd6.h>
+#include <netinet/in_rss.h>
 
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
@@ -1287,6 +1289,10 @@ ip6_ctloutput(struct socket *so, struct sockopt *sopt)
 	int level, op, optname;
 	int optlen;
 	struct thread *td;
+#ifdef	RSS
+	uint32_t rss_bucket;
+	int retval;
+#endif
 
 	level = sopt->sopt_level;
 	op = sopt->sopt_dir;
@@ -1390,6 +1396,10 @@ ip6_ctloutput(struct socket *so, struct sockopt *sopt)
 			case IPV6_V6ONLY:
 			case IPV6_AUTOFLOWLABEL:
 			case IPV6_BINDANY:
+			case IPV6_BINDMULTI:
+#ifdef	RSS
+			case IPV6_RSS_LISTEN_BUCKET:
+#endif
 				if (optname == IPV6_BINDANY && td != NULL) {
 					error = priv_check(td,
 					    PRIV_NETINET_BINDANY);
@@ -1439,6 +1449,16 @@ do { \
 } while (/*CONSTCOND*/ 0)
 #define OPTBIT(bit) (in6p->inp_flags & (bit) ? 1 : 0)
 
+#define OPTSET2(bit, val) do {						\
+	INP_WLOCK(in6p);						\
+	if (val)							\
+		in6p->inp_flags2 |= bit;				\
+	else								\
+		in6p->inp_flags2 &= ~bit;				\
+	INP_WUNLOCK(in6p);						\
+} while (0)
+#define OPTBIT2(bit) (in6p->inp_flags2 & (bit) ? 1 : 0)
+
 				case IPV6_RECVPKTINFO:
 					/* cannot mix with RFC2292 */
 					if (OPTBIT(IN6P_RFC2292)) {
@@ -1557,6 +1577,21 @@ do { \
 				case IPV6_BINDANY:
 					OPTSET(INP_BINDANY);
 					break;
+
+				case IPV6_BINDMULTI:
+					OPTSET2(INP_BINDMULTI, optval);
+					break;
+#ifdef	RSS
+				case IPV6_RSS_LISTEN_BUCKET:
+					if ((optval >= 0) &&
+					    (optval < rss_getnumbuckets())) {
+						in6p->inp_rss_listen_bucket = optval;
+						OPTSET2(INP_RSS_BUCKET_SET, 1);
+					} else {
+						error = EINVAL;
+					}
+					break;
+#endif
 				}
 				break;
 
@@ -1772,6 +1807,11 @@ do { \
 			case IPV6_RECVTCLASS:
 			case IPV6_AUTOFLOWLABEL:
 			case IPV6_BINDANY:
+			case IPV6_FLOWID:
+			case IPV6_FLOWTYPE:
+#ifdef	RSS
+			case IPV6_RSSBUCKETID:
+#endif
 				switch (optname) {
 
 				case IPV6_RECVHOPOPTS:
@@ -1837,6 +1877,31 @@ do { \
 				case IPV6_BINDANY:
 					optval = OPTBIT(INP_BINDANY);
 					break;
+
+				case IPV6_FLOWID:
+					optval = in6p->inp_flowid;
+					break;
+
+				case IPV6_FLOWTYPE:
+					optval = in6p->inp_flowtype;
+					break;
+#ifdef	RSS
+				case IPV6_RSSBUCKETID:
+					retval =
+					    rss_hash2bucket(in6p->inp_flowid,
+					    in6p->inp_flowtype,
+					    &rss_bucket);
+					if (retval == 0)
+						optval = rss_bucket;
+					else
+						error = EINVAL;
+					break;
+#endif
+
+				case IPV6_BINDMULTI:
+					optval = OPTBIT2(INP_BINDMULTI);
+					break;
+
 				}
 				if (error)
 					break;
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index a9729f9b51fa..b13d7ea07d5c 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -438,7 +438,7 @@ void	rip6_init(void);
 int	rip6_input(struct mbuf **, int *, int);
 void	rip6_ctlinput(int, struct sockaddr *, void *);
 int	rip6_ctloutput(struct socket *, struct sockopt *);
-int	rip6_output(struct mbuf *, ...);
+int	rip6_output(struct mbuf *, struct socket *, ...);
 int	rip6_usrreq(struct socket *,
 	    int, struct mbuf *, struct mbuf *, struct mbuf *, struct thread *);
 
diff --git a/sys/netinet6/ip6protosw.h b/sys/netinet6/ip6protosw.h
index ec802a51a6b3..e8d4bad90b02 100644
--- a/sys/netinet6/ip6protosw.h
+++ b/sys/netinet6/ip6protosw.h
@@ -110,39 +110,8 @@ struct ip6ctlparam {
 	u_int8_t ip6c_nxt;		/* final next header field */
 };
 
-struct ip6protosw {
-	short	pr_type;		/* socket type used for */
-	struct	domain *pr_domain;	/* domain protocol a member of */
-	short	pr_protocol;		/* protocol number */
-	short	pr_flags;		/* see below */
-
-/* protocol-protocol hooks */
-	int	(*pr_input)		/* input to protocol (from below) */
-			(struct mbuf **, int *, int);
-	int	(*pr_output)		/* output to protocol (from above) */
-			(struct mbuf *, ...);
-	void	(*pr_ctlinput)		/* control input (from below) */
-			(int, struct sockaddr *, void *);
-	int	(*pr_ctloutput)		/* control output (from above) */
-			(struct socket *, struct sockopt *);
-
-/* utility hooks */
-	void	(*pr_init)		/* initialization hook */
-			(void);
-	void	(*pr_destroy)		/* cleanup hook */
-			(void);
-
-	void	(*pr_fasttimo)		/* fast timeout (200ms) */
-			(void);
-	void	(*pr_slowtimo)		/* slow timeout (500ms) */
-			(void);
-	void	(*pr_drain)		/* flush any excess space possible */
-			(void);
-	struct	pr_usrreqs *pr_usrreqs;	/* supersedes pr_usrreq() */
-};
-
 #ifdef _KERNEL
-extern struct ip6protosw inet6sw[];
+extern struct protosw inet6sw[];
 #endif
 
 #endif /* !_NETINET6_IP6PROTOSW_H_ */
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index c40ef9e3dee5..2e46208ce73b 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -238,14 +238,12 @@ static SYSCTL_NODE(_net_inet6_mld, OID_AUTO, ifinfo,
     "Per-interface MLDv2 state");
 
 static int	mld_v1enable = 1;
-SYSCTL_INT(_net_inet6_mld, OID_AUTO, v1enable, CTLFLAG_RW,
+SYSCTL_INT(_net_inet6_mld, OID_AUTO, v1enable, CTLFLAG_RWTUN,
     &mld_v1enable, 0, "Enable fallback to MLDv1");
-TUNABLE_INT("net.inet6.mld.v1enable", &mld_v1enable);
 
 static int	mld_use_allow = 1;
-SYSCTL_INT(_net_inet6_mld, OID_AUTO, use_allow, CTLFLAG_RW,
+SYSCTL_INT(_net_inet6_mld, OID_AUTO, use_allow, CTLFLAG_RWTUN,
     &mld_use_allow, 0, "Use ALLOW/BLOCK for RFC 4604 SSM joins/leaves");
-TUNABLE_INT("net.inet6.mld.use_allow", &mld_use_allow);
 
 /*
  * Packed Router Alert option structure declaration.
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 602e95e1c3a0..54366eecd948 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -2147,7 +2147,7 @@ nd6_output_lle(struct ifnet *ifp, struct ifnet *origifp, struct mbuf *m,
 	IP_PROBE(send, NULL, NULL, mtod(m, struct ip6_hdr *), ifp, NULL,
 	    mtod(m, struct ip6_hdr *));
 
-	if ((ifp->if_flags & IFF_LOOPBACK) != 0)
+	if ((ifp->if_flags & IFF_LOOPBACK) == 0)
 		origifp = ifp;
 
 	error = (*ifp->if_output)(origifp, m, (struct sockaddr *)dst, NULL);
@@ -2369,6 +2369,8 @@ SYSCTL_NODE(_net_inet6_icmp6, ICMPV6CTL_ND6_PRLIST, nd6_prlist,
 	CTLFLAG_RD, nd6_sysctl_prlist, "");
 SYSCTL_VNET_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_MAXQLEN, nd6_maxqueuelen,
 	CTLFLAG_RW, &VNET_NAME(nd6_maxqueuelen), 1, "");
+SYSCTL_VNET_INT(_net_inet6_icmp6, OID_AUTO, nd6_gctimer,
+	CTLFLAG_RW, &VNET_NAME(nd6_gctimer), (60 * 60 * 24), "");
 
 static int
 nd6_sysctl_drlist(SYSCTL_HANDLER_ARGS)
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index 57f7e901acec..34e38e496b78 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -390,17 +390,10 @@ rip6_ctlinput(int cmd, struct sockaddr *sa, void *d)
  * may have setup with control call.
  */
 int
-#if __STDC__
-rip6_output(struct mbuf *m, ...)
-#else
-rip6_output(m, va_alist)
-	struct mbuf *m;
-	va_dcl
-#endif
+rip6_output(struct mbuf *m, struct socket *so, ...)
 {
 	struct mbuf *control;
 	struct m_tag *mtag;
-	struct socket *so;
 	struct sockaddr_in6 *dstsock;
 	struct in6_addr *dst;
 	struct ip6_hdr *ip6;
@@ -415,8 +408,7 @@ rip6_output(m, va_alist)
 	struct in6_addr in6a;
 	va_list ap;
 
-	va_start(ap, m);
-	so = va_arg(ap, struct socket *);
+	va_start(ap, so);
 	dstsock = va_arg(ap, struct sockaddr_in6 *);
 	control = va_arg(ap, struct mbuf *);
 	va_end(ap);
diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h
index 24e2543d0b8c..87413bd6cacf 100644
--- a/sys/netipsec/ipsec.h
+++ b/sys/netipsec/ipsec.h
@@ -354,11 +354,11 @@ extern const char *ipsec_logsastr __P((struct secasvar *));
 extern void ipsec_dumpmbuf __P((struct mbuf *));
 
 struct m_tag;
-extern void ah4_input(struct mbuf *m, int off);
+extern int ah4_input(struct mbuf **mp, int *offp, int proto);
 extern void ah4_ctlinput(int cmd, struct sockaddr *sa, void *);
-extern void esp4_input(struct mbuf *m, int off);
+extern int esp4_input(struct mbuf **mp, int *offp, int proto);
 extern void esp4_ctlinput(int cmd, struct sockaddr *sa, void *);
-extern void ipcomp4_input(struct mbuf *m, int off);
+extern int ipcomp4_input(struct mbuf **mp, int *offp, int proto);
 extern int ipsec4_common_input(struct mbuf *m, ...);
 extern int ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav,
 			int skip, int protoff, struct m_tag *mt);
diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c
index 40ac8d9e54eb..717ae9a805f7 100644
--- a/sys/netipsec/ipsec_input.c
+++ b/sys/netipsec/ipsec_input.c
@@ -254,10 +254,18 @@ ipsec4_common_input(struct mbuf *m, ...)
 				  AF_INET, nxt);
 }
 
-void
-ah4_input(struct mbuf *m, int off)
+int
+ah4_input(struct mbuf **mp, int *offp, int proto)
 {
+	struct mbuf *m;
+	int off;
+
+	m = *mp;
+	off = *offp;
+	*mp = NULL;
+
 	ipsec4_common_input(m, off, IPPROTO_AH);
+	return (IPPROTO_DONE);
 }
 void
 ah4_ctlinput(int cmd, struct sockaddr *sa, void *v)
@@ -267,11 +275,20 @@ ah4_ctlinput(int cmd, struct sockaddr *sa, void *v)
 		ipsec4_common_ctlinput(cmd, sa, v, IPPROTO_AH);
 }
 
-void
-esp4_input(struct mbuf *m, int off)
+int
+esp4_input(struct mbuf **mp, int *offp, int proto)
 {
+	struct mbuf *m;
+	int off;
+
+	m = *mp;
+	off = *offp;
+	mp = NULL;
+
 	ipsec4_common_input(m, off, IPPROTO_ESP);
+	return (IPPROTO_DONE);
 }
+
 void
 esp4_ctlinput(int cmd, struct sockaddr *sa, void *v)
 {
@@ -280,10 +297,18 @@ esp4_ctlinput(int cmd, struct sockaddr *sa, void *v)
 		ipsec4_common_ctlinput(cmd, sa, v, IPPROTO_ESP);
 }
 
-void
-ipcomp4_input(struct mbuf *m, int off)
+int
+ipcomp4_input(struct mbuf **mp, int *offp, int proto)
 {
+	struct mbuf *m;
+	int off;
+
+	m = *mp;
+	off = *offp;
+	mp = NULL;
+
 	ipsec4_common_input(m, off, IPPROTO_IPCOMP);
+	return (IPPROTO_DONE);
 }
 
 /*
diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c
index 3e83175c0b67..8566bb4ffa38 100644
--- a/sys/netipsec/ipsec_output.c
+++ b/sys/netipsec/ipsec_output.c
@@ -498,9 +498,11 @@ ipsec4_process_packet(
 				goto bad;
 			}
 			ip = mtod(m, struct ip *);
-			ip->ip_len = htons(m->m_pkthdr.len);
-			ip->ip_sum = 0;
-			ip->ip_sum = in_cksum(m, ip->ip_hl << 2);
+			if (ip->ip_v == IPVERSION) {
+				ip->ip_len = htons(m->m_pkthdr.len);
+				ip->ip_sum = 0;
+				ip->ip_sum = in_cksum(m, ip->ip_hl << 2);
+			}
 
 			/* Encapsulate the packet */
 			error = ipip_output(m, isr, &mp, 0, 0);
diff --git a/sys/netipsec/key_debug.c b/sys/netipsec/key_debug.c
index da5dd7599674..81a9a2f30ad6 100644
--- a/sys/netipsec/key_debug.c
+++ b/sys/netipsec/key_debug.c
@@ -663,9 +663,9 @@ kdebug_mbufhdr(m)
 
 	if (m->m_flags & M_EXT) {
 		printf("  m_ext{ ext_buf:%p ext_free:%p "
-		       "ext_size:%u ref_cnt:%p }\n",
+		       "ext_size:%u ext_cnt:%p }\n",
 			m->m_ext.ext_buf, m->m_ext.ext_free,
-			m->m_ext.ext_size, m->m_ext.ref_cnt);
+			m->m_ext.ext_size, m->m_ext.ext_cnt);
 	}
 
 	return;
diff --git a/sys/netipsec/xform.h b/sys/netipsec/xform.h
index e389cab33cd6..62e8ca5dbdec 100644
--- a/sys/netipsec/xform.h
+++ b/sys/netipsec/xform.h
@@ -110,7 +110,7 @@ struct cryptoini;
 
 /* XF_IP4 */
 extern	int ip4_input6(struct mbuf **m, int *offp, int proto);
-extern	void ip4_input(struct mbuf *m, int);
+extern	int ip4_input(struct mbuf **, int *, int);
 extern	int ipip_output(struct mbuf *, struct ipsecrequest *,
 			struct mbuf **, int, int);
 
diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c
index 07a63916e205..c0ce7b790460 100644
--- a/sys/netipsec/xform_ipip.c
+++ b/sys/netipsec/xform_ipip.c
@@ -133,8 +133,8 @@ ip4_input6(struct mbuf **m, int *offp, int proto)
 /*
  * Really only a wrapper for ipip_input(), for use with IPv4.
  */
-void
-ip4_input(struct mbuf *m, int off)
+int
+ip4_input(struct mbuf **mp, int *offp, int proto)
 {
 #if 0
 	/* If we do not accept IP-in-IP explicitly, drop.  */
@@ -145,7 +145,8 @@ ip4_input(struct mbuf *m, int off)
 		return;
 	}
 #endif
-	_ipip_input(m, off, NULL);
+	_ipip_input(*mp, *offp, NULL);
+	return (IPPROTO_DONE);
 }
 #endif /* INET */
 
@@ -619,7 +620,7 @@ static struct protosw ipe4_protosw = {
 };
 #endif /* INET */
 #if defined(INET6) && defined(INET)
-static struct ip6protosw ipe6_protosw = {
+static struct protosw ipe6_protosw = {
 	.pr_type =	SOCK_RAW,
 	.pr_domain =	&inetdomain,
 	.pr_protocol =	IPPROTO_IPV6,
diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c
index 5e2451ffe6a7..90e77b0ecdc1 100644
--- a/sys/netpfil/ipfw/ip_fw2.c
+++ b/sys/netpfil/ipfw/ip_fw2.c
@@ -193,7 +193,6 @@ SYSCTL_VNET_PROC(_net_inet_ip_fw, OID_AUTO, tables_sets,
 SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, default_to_accept, CTLFLAG_RDTUN,
     &default_to_accept, 0,
     "Make the default rule accept all packets.");
-TUNABLE_INT("net.inet.ip.fw.default_to_accept", &default_to_accept);
 TUNABLE_INT("net.inet.ip.fw.tables_max", (int *)&default_fw_tables);
 SYSCTL_VNET_INT(_net_inet_ip_fw, OID_AUTO, static_count,
     CTLFLAG_RD, &VNET_NAME(layer3_chain.n_rules), 0,
diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index 6ab0596adc5e..d5a6ffae61d9 100644
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -402,6 +402,10 @@ static int
 pfsync_state_import(struct pfsync_state *sp, u_int8_t flags)
 {
 	struct pfsync_softc *sc = V_pfsyncif;
+#ifndef	__NO_STRICT_ALIGNMENT
+	struct pfsync_state_key key[2];
+#endif
+	struct pfsync_state_key *kw, *ks;
 	struct pf_state	*st = NULL;
 	struct pf_state_key *skw = NULL, *sks = NULL;
 	struct pf_rule *r = NULL;
@@ -451,12 +455,19 @@ pfsync_state_import(struct pfsync_state *sp, u_int8_t flags)
 	if ((skw = uma_zalloc(V_pf_state_key_z, M_NOWAIT)) == NULL)
 		goto cleanup;
 
-	if (PF_ANEQ(&sp->key[PF_SK_WIRE].addr[0],
-	    &sp->key[PF_SK_STACK].addr[0], sp->af) ||
-	    PF_ANEQ(&sp->key[PF_SK_WIRE].addr[1],
-	    &sp->key[PF_SK_STACK].addr[1], sp->af) ||
-	    sp->key[PF_SK_WIRE].port[0] != sp->key[PF_SK_STACK].port[0] ||
-	    sp->key[PF_SK_WIRE].port[1] != sp->key[PF_SK_STACK].port[1]) {
+#ifndef	__NO_STRICT_ALIGNMENT
+	bcopy(&sp->key, key, sizeof(struct pfsync_state_key) * 2);
+	kw = &key[PF_SK_WIRE];
+	ks = &key[PF_SK_STACK];
+#else
+	kw = &sp->key[PF_SK_WIRE];
+	ks = &sp->key[PF_SK_STACK];
+#endif
+
+	if (PF_ANEQ(&kw->addr[0], &ks->addr[0], sp->af) ||
+	    PF_ANEQ(&kw->addr[1], &ks->addr[1], sp->af) ||
+	    kw->port[0] != ks->port[0] ||
+	    kw->port[1] != ks->port[1]) {
 		sks = uma_zalloc(V_pf_state_key_z, M_NOWAIT);
 		if (sks == NULL)
 			goto cleanup;
@@ -468,18 +479,18 @@ pfsync_state_import(struct pfsync_state *sp, u_int8_t flags)
 	    pfsync_alloc_scrub_memory(&sp->dst, &st->dst))
 		goto cleanup;
 
-	/* copy to state key(s) */
-	skw->addr[0] = sp->key[PF_SK_WIRE].addr[0];
-	skw->addr[1] = sp->key[PF_SK_WIRE].addr[1];
-	skw->port[0] = sp->key[PF_SK_WIRE].port[0];
-	skw->port[1] = sp->key[PF_SK_WIRE].port[1];
+	/* Copy to state key(s). */
+	skw->addr[0] = kw->addr[0];
+	skw->addr[1] = kw->addr[1];
+	skw->port[0] = kw->port[0];
+	skw->port[1] = kw->port[1];
 	skw->proto = sp->proto;
 	skw->af = sp->af;
 	if (sks != skw) {
-		sks->addr[0] = sp->key[PF_SK_STACK].addr[0];
-		sks->addr[1] = sp->key[PF_SK_STACK].addr[1];
-		sks->port[0] = sp->key[PF_SK_STACK].port[0];
-		sks->port[1] = sp->key[PF_SK_STACK].port[1];
+		sks->addr[0] = ks->addr[0];
+		sks->addr[1] = ks->addr[1];
+		sks->port[0] = ks->port[0];
+		sks->port[1] = ks->port[1];
 		sks->proto = sp->proto;
 		sks->af = sp->af;
 	}
@@ -559,11 +570,12 @@ pfsync_state_import(struct pfsync_state *sp, u_int8_t flags)
 	return (error);
 }
 
-static void
-pfsync_input(struct mbuf *m, __unused int off)
+static int
+pfsync_input(struct mbuf **mp, int *offp __unused, int proto __unused)
 {
 	struct pfsync_softc *sc = V_pfsyncif;
 	struct pfsync_pkt pkt;
+	struct mbuf *m = *mp;
 	struct ip *ip = mtod(m, struct ip *);
 	struct pfsync_header *ph;
 	struct pfsync_subheader subh;
@@ -572,6 +584,7 @@ pfsync_input(struct mbuf *m, __unused int off)
 	int rv;
 	uint16_t count;
 
+	*mp = NULL;
 	V_pfsyncstats.pfsyncs_ipackets++;
 
 	/* Verify that we have a sync interface configured. */
@@ -602,7 +615,7 @@ pfsync_input(struct mbuf *m, __unused int off)
 	if (offset + sizeof(*ph) > m->m_len) {
 		if (m_pullup(m, offset + sizeof(*ph)) == NULL) {
 			V_pfsyncstats.pfsyncs_hdrops++;
-			return;
+			return (IPPROTO_DONE);
 		}
 		ip = mtod(m, struct ip *);
 	}
@@ -649,7 +662,7 @@ pfsync_input(struct mbuf *m, __unused int off)
 		rv = (*pfsync_acts[subh.action])(&pkt, m, offset, count);
 		if (rv == -1) {
 			PF_RULES_RUNLOCK();
-			return;
+			return (IPPROTO_DONE);
 		}
 
 		offset += rv;
@@ -658,6 +671,7 @@ pfsync_input(struct mbuf *m, __unused int off)
 
 done:
 	m_freem(m);
+	return (IPPROTO_DONE);
 }
 
 static int
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index 094520147cd2..6c971516e560 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -743,10 +743,8 @@ pf_initialize()
 	struct pf_srchash	*sh;
 	u_int i;
 
-	TUNABLE_ULONG_FETCH("net.pf.states_hashsize", &pf_hashsize);
 	if (pf_hashsize == 0 || !powerof2(pf_hashsize))
 		pf_hashsize = PF_HASHSIZ;
-	TUNABLE_ULONG_FETCH("net.pf.source_nodes_hashsize", &pf_srchashsize);
 	if (pf_srchashsize == 0 || !powerof2(pf_srchashsize))
 		pf_srchashsize = PF_HASHSIZ / 4;
 
diff --git a/sys/nfs/nfs_fha.c b/sys/nfs/nfs_fha.c
index 86f31ec1c889..45e17011fb54 100644
--- a/sys/nfs/nfs_fha.c
+++ b/sys/nfs/nfs_fha.c
@@ -468,14 +468,14 @@ fha_nd_complete(SVCTHREAD *thread, struct svc_req *req)
 int
 fhe_stats_sysctl(SYSCTL_HANDLER_ARGS, struct fha_params *softc)
 {
-	int error, count, i;
+	int error, i;
 	struct sbuf sb;
 	struct fha_hash_entry *fhe;
-	bool_t first = TRUE;
+	bool_t first, hfirst;
 	SVCTHREAD *thread;
 	SVCPOOL *pool;
 
-	sbuf_new(&sb, NULL, 4096, SBUF_FIXEDLEN);
+	sbuf_new(&sb, NULL, 65536, SBUF_FIXEDLEN);
 
 	pool = NULL;
 
@@ -485,42 +485,44 @@ fhe_stats_sysctl(SYSCTL_HANDLER_ARGS, struct fha_params *softc)
 	}
 	pool = *softc->pool;
 
-	count = 0;
 	for (i = 0; i < FHA_HASH_SIZE; i++)
 		if (!LIST_EMPTY(&softc->fha_hash[i].list))
-			count++;
+			break;
 
-	if (count == 0) {
+	if (i == FHA_HASH_SIZE) {
 		sbuf_printf(&sb, "No file handle entries.\n");
 		goto out;
 	}
 
-	for (i = 0; i < FHA_HASH_SIZE; i++) {
+	hfirst = TRUE;
+	for (; i < FHA_HASH_SIZE; i++) {
 		mtx_lock(&softc->fha_hash[i].mtx);
+		if (LIST_EMPTY(&softc->fha_hash[i].list)) {
+			mtx_unlock(&softc->fha_hash[i].mtx);
+			continue;
+		}
+		sbuf_printf(&sb, "%shash %d: {\n", hfirst ? "" : ", ", i);
+		first = TRUE;
 		LIST_FOREACH(fhe, &softc->fha_hash[i].list, link) {
-			sbuf_printf(&sb, "%sfhe %p: {\n", first ? "" : ", ", fhe);
+			sbuf_printf(&sb, "%sfhe %p: {\n", first ? "  " : ", ", fhe);
 
 			sbuf_printf(&sb, "    fh: %ju\n", (uintmax_t) fhe->fh);
-			sbuf_printf(&sb, "    num_rw: %d\n", fhe->num_rw);
-			sbuf_printf(&sb, "    num_exclusive: %d\n", fhe->num_exclusive);
+			sbuf_printf(&sb, "    num_rw/exclusive: %d/%d\n",
+			    fhe->num_rw, fhe->num_exclusive);
 			sbuf_printf(&sb, "    num_threads: %d\n", fhe->num_threads);
 
 			LIST_FOREACH(thread, &fhe->threads, st_alink) {
-				sbuf_printf(&sb, "    thread %p offset %ju "
-				    "(count %d)\n", thread,
+				sbuf_printf(&sb, "      thread %p offset %ju "
+				    "reqs %d\n", thread,
 				    thread->st_p3, thread->st_p2);
 			}
 
-			sbuf_printf(&sb, "}");
+			sbuf_printf(&sb, "  }");
 			first = FALSE;
-
-			/* Limit the output. */
-			if (++count > 128) {
-				sbuf_printf(&sb, "...");
-				break;
-			}
 		}
+		sbuf_printf(&sb, "\n}");
 		mtx_unlock(&softc->fha_hash[i].mtx);
+		hfirst = FALSE;
 	}
 
  out:
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index de58421d8dab..1010da66d10e 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -2627,7 +2627,7 @@ nfsrv_readdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 	int v3 = (nfsd->nd_flag & ND_NFSV3);
 	u_quad_t off, toff, verf;
 	u_long *cookies = NULL, *cookiep; /* needs to be int64_t or off_t */
-	int not_zfs;
+	int is_ufs;
 
 	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
 	fhp = &nfh.fh_generic;
@@ -2690,7 +2690,7 @@ nfsrv_readdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 		error = 0;
 		goto nfsmout;
 	}
-	not_zfs = strcmp(vp->v_mount->mnt_vfc->vfc_name, "zfs") != 0;
+	is_ufs = strcmp(vp->v_mount->mnt_vfc->vfc_name, "ufs") == 0;
 	VOP_UNLOCK(vp, 0);
 
 	/*
@@ -2777,12 +2777,10 @@ nfsrv_readdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 	 * skip over the records that precede the requested offset. This
 	 * requires the assumption that file offset cookies monotonically
 	 * increase.
-	 * Since the offset cookies don't monotonically increase for ZFS,
-	 * this is not done when ZFS is the file system.
 	 */
 	while (cpos < cend && ncookies > 0 &&
 		(dp->d_fileno == 0 || dp->d_type == DT_WHT ||
-		 (not_zfs != 0 && ((u_quad_t)(*cookiep)) <= toff))) {
+		 (is_ufs == 1 && ((u_quad_t)(*cookiep)) <= toff))) {
 		cpos += dp->d_reclen;
 		dp = (struct dirent *)cpos;
 		cookiep++;
@@ -2928,7 +2926,7 @@ nfsrv_readdirplus(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 	int usevget = 1;
 	struct componentname cn;
 	struct mount *mntp = NULL;
-	int not_zfs;
+	int is_ufs;
 
 	nfsdbprintf(("%s %d\n", __FILE__, __LINE__));
 	vp_locked = 0;
@@ -2988,7 +2986,7 @@ nfsrv_readdirplus(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 		error = 0;
 		goto nfsmout;
 	}
-	not_zfs = strcmp(vp->v_mount->mnt_vfc->vfc_name, "zfs") != 0;
+	is_ufs = strcmp(vp->v_mount->mnt_vfc->vfc_name, "ufs") == 0;
 	VOP_UNLOCK(vp, 0);
 	vp_locked = 0;
 	rbuf = malloc(siz, M_TEMP, M_WAITOK);
@@ -3068,12 +3066,10 @@ nfsrv_readdirplus(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
 	 * skip over the records that precede the requested offset. This
 	 * requires the assumption that file offset cookies monotonically
 	 * increase.
-	 * Since the offset cookies don't monotonically increase for ZFS,
-	 * this is not done when ZFS is the file system.
 	 */
 	while (cpos < cend && ncookies > 0 &&
 		(dp->d_fileno == 0 || dp->d_type == DT_WHT ||
-		 (not_zfs != 0 && ((u_quad_t)(*cookiep)) <= toff))) {
+		 (is_ufs == 1 && ((u_quad_t)(*cookiep)) <= toff))) {
 		cpos += dp->d_reclen;
 		dp = (struct dirent *)cpos;
 		cookiep++;
diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/main.c b/sys/ofed/drivers/infiniband/hw/mlx4/main.c
index 056ed1979ff4..beef89e8bac9 100644
--- a/sys/ofed/drivers/infiniband/hw/mlx4/main.c
+++ b/sys/ofed/drivers/infiniband/hw/mlx4/main.c
@@ -2414,6 +2414,6 @@ static moduledata_t mlx4ib_mod = {
         .evhand = mlx4ib_evhand,
 };
 
-DECLARE_MODULE(mlx4ib, mlx4ib_mod, SI_SUB_SMP, SI_ORDER_ANY);
+DECLARE_MODULE(mlx4ib, mlx4ib_mod, SI_SUB_OFED_PREINIT, SI_ORDER_ANY);
 MODULE_DEPEND(mlx4ib, mlx4, 1, 1, 1);
 MODULE_DEPEND(mlx4ib, ibcore, 1, 1, 1);
diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c b/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c
index 5489323df048..e70dfe9f4ab5 100644
--- a/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c
+++ b/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c
@@ -665,7 +665,7 @@ static void mlx4_ib_mcg_work_handler(struct work_struct *work)
 			if (!list_empty(&group->pending_list))
 				req = list_first_entry(&group->pending_list,
 						struct mcast_req, group_list);
-			if ((method == IB_MGMT_METHOD_GET_RESP)) {
+			if (method == IB_MGMT_METHOD_GET_RESP) {
 					if (req) {
 						send_reply_to_slave(req->func, group, &req->sa_mad, status);
 						--group->func[req->func].num_pend_reqs;
diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/qp.c b/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
index 9b5cb95aaac4..b2d1a7acd04a 100644
--- a/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
+++ b/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
@@ -264,7 +264,7 @@ static void post_nop_wqe(struct mlx4_ib_qp *qp, int n, int size)
 	/* Pad the remainder of the WQE with an inline data segment. */
 	if (size > s) {
 		inl = wqe + s;
-		inl->byte_count = cpu_to_be32(1 << 31 | (size - s - sizeof *inl));
+		inl->byte_count = cpu_to_be32(1U << 31 | (size - s - sizeof *inl));
 	}
 	ctrl->srcrb_flags = 0;
 	ctrl->fence_size = size / 16;
@@ -1146,7 +1146,7 @@ static void mlx4_ib_lock_cqs(struct mlx4_ib_cq *send_cq, struct mlx4_ib_cq *recv
 {
 	if (send_cq == recv_cq) {
 		spin_lock_irq(&send_cq->lock);
-		__acquire(&recv_cq->lock);
+		(void) __acquire(&recv_cq->lock);
 	} else if (send_cq->mcq.cqn < recv_cq->mcq.cqn) {
 		spin_lock_irq(&send_cq->lock);
 		spin_lock_nested(&recv_cq->lock, SINGLE_DEPTH_NESTING);
@@ -1160,7 +1160,7 @@ static void mlx4_ib_unlock_cqs(struct mlx4_ib_cq *send_cq, struct mlx4_ib_cq *re
 	__releases(&send_cq->lock) __releases(&recv_cq->lock)
 {
 	if (send_cq == recv_cq) {
-		__release(&recv_cq->lock);
+		(void) __release(&recv_cq->lock);
 		spin_unlock_irq(&send_cq->lock);
 	} else if (send_cq->mcq.cqn < recv_cq->mcq.cqn) {
 		spin_unlock(&recv_cq->lock);
@@ -2422,11 +2422,11 @@ static int build_sriov_qp0_header(struct mlx4_ib_sqp *sqp,
 	spc = MLX4_INLINE_ALIGN -
 	      ((unsigned long) (inl + 1) & (MLX4_INLINE_ALIGN - 1));
 	if (header_size <= spc) {
-		inl->byte_count = cpu_to_be32(1 << 31 | header_size);
+		inl->byte_count = cpu_to_be32(1U << 31 | header_size);
 		memcpy(inl + 1, sqp->header_buf, header_size);
 		i = 1;
 	} else {
-		inl->byte_count = cpu_to_be32(1 << 31 | spc);
+		inl->byte_count = cpu_to_be32(1U << 31 | spc);
 		memcpy(inl + 1, sqp->header_buf, spc);
 
 		inl = (void *) (inl + 1) + spc;
@@ -2445,7 +2445,7 @@ static int build_sriov_qp0_header(struct mlx4_ib_sqp *sqp,
 		 * of 16 mod 64.
 		 */
 		wmb();
-		inl->byte_count = cpu_to_be32(1 << 31 | (header_size - spc));
+		inl->byte_count = cpu_to_be32(1U << 31 | (header_size - spc));
 		i = 2;
 	}
 
@@ -2629,11 +2629,11 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr,
 	spc = MLX4_INLINE_ALIGN -
 		((unsigned long) (inl + 1) & (MLX4_INLINE_ALIGN - 1));
 	if (header_size <= spc) {
-		inl->byte_count = cpu_to_be32(1 << 31 | header_size);
+		inl->byte_count = cpu_to_be32(1U << 31 | header_size);
 		memcpy(inl + 1, sqp->header_buf, header_size);
 		i = 1;
 	} else {
-		inl->byte_count = cpu_to_be32(1 << 31 | spc);
+		inl->byte_count = cpu_to_be32(1U << 31 | spc);
 		memcpy(inl + 1, sqp->header_buf, spc);
 
 		inl = (void *) (inl + 1) + spc;
@@ -2652,7 +2652,7 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr,
 		 * of 16 mod 64.
 		 */
 		wmb();
-		inl->byte_count = cpu_to_be32(1 << 31 | (header_size - spc));
+		inl->byte_count = cpu_to_be32(1U << 31 | (header_size - spc));
 		i = 2;
 	}
 
@@ -2797,17 +2797,17 @@ static void build_tunnel_header(struct ib_send_wr *wr, void *wqe, unsigned *mlx_
 	if (sizeof (hdr) <= spc) {
 		memcpy(inl + 1, &hdr, sizeof (hdr));
 		wmb();
-		inl->byte_count = cpu_to_be32(1 << 31 | sizeof (hdr));
+		inl->byte_count = cpu_to_be32(1U << 31 | sizeof (hdr));
 		i = 1;
 	} else {
 		memcpy(inl + 1, &hdr, spc);
 		wmb();
-		inl->byte_count = cpu_to_be32(1 << 31 | spc);
+		inl->byte_count = cpu_to_be32(1U << 31 | spc);
 
 		inl = (void *) (inl + 1) + spc;
 		memcpy(inl + 1, (void *) &hdr + spc, sizeof (hdr) - spc);
 		wmb();
-		inl->byte_count = cpu_to_be32(1 << 31 | (sizeof (hdr) - spc));
+		inl->byte_count = cpu_to_be32(1U << 31 | (sizeof (hdr) - spc));
 		i = 2;
 	}
 
diff --git a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
index f02c3335d45d..910424dd768d 100644
--- a/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/route.h>
 #include <net/vnet.h>
+#include <sys/sysctl.h>
 
 uma_zone_t	sdp_zone;
 struct rwlock	sdp_lock;
diff --git a/sys/ofed/drivers/net/mlx4/en_main.c b/sys/ofed/drivers/net/mlx4/en_main.c
index b56766bea6a7..302be528544d 100644
--- a/sys/ofed/drivers/net/mlx4/en_main.c
+++ b/sys/ofed/drivers/net/mlx4/en_main.c
@@ -383,5 +383,5 @@ static moduledata_t mlxen_mod = {
         .name = "mlxen",
 	.evhand = mlxen_evhand,
 };
-DECLARE_MODULE(mlxen, mlxen_mod, SI_SUB_SMP, SI_ORDER_ANY);
+DECLARE_MODULE(mlxen, mlxen_mod, SI_SUB_OFED_PREINIT, SI_ORDER_ANY);
 MODULE_DEPEND(mlxen, mlx4, 1, 1, 1);
diff --git a/sys/ofed/drivers/net/mlx4/en_netdev.c b/sys/ofed/drivers/net/mlx4/en_netdev.c
index a992ae97599d..97dd5b2d2e6c 100644
--- a/sys/ofed/drivers/net/mlx4/en_netdev.c
+++ b/sys/ofed/drivers/net/mlx4/en_netdev.c
@@ -42,6 +42,7 @@
 #include <net/ethernet.h>
 #include <net/if_vlan_var.h>
 #include <sys/sockio.h>
+#include <sys/sysctl.h>
 
 static void mlx4_en_init_locked(struct mlx4_en_priv *priv);
 static void mlx4_en_sysctl_stat(struct mlx4_en_priv *priv);
diff --git a/sys/ofed/drivers/net/mlx4/main.c b/sys/ofed/drivers/net/mlx4/main.c
index 907e63e8f54c..c7388a0b8035 100644
--- a/sys/ofed/drivers/net/mlx4/main.c
+++ b/sys/ofed/drivers/net/mlx4/main.c
@@ -2875,4 +2875,4 @@ static moduledata_t mlx4_mod = {
 	.evhand = mlx4_evhand,
 };
 MODULE_VERSION(mlx4, 1);
-DECLARE_MODULE(mlx4, mlx4_mod, SI_SUB_SMP, SI_ORDER_ANY);
+DECLARE_MODULE(mlx4, mlx4_mod, SI_SUB_OFED_PREINIT, SI_ORDER_ANY);
diff --git a/sys/ofed/include/linux/bitops.h b/sys/ofed/include/linux/bitops.h
index bac688af5e72..04bd5e6607ec 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], 1UL << (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], 1UL << (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]) &	\
-    1UL << ((i) % NBLONG))
+    (1UL << ((i) % NBLONG)))
 
 static inline long
 test_and_clear_bit(long bit, long *var)
@@ -302,7 +302,7 @@ test_and_clear_bit(long bit, long *var)
 
 	var += bit / (sizeof(long) * NBBY);
 	bit %= sizeof(long) * NBBY;
-	bit = 1 << bit;
+	bit = (1UL << bit);
 	do {
 		val = *(volatile long *)var;
 	} while (atomic_cmpset_long(var, val, val & ~bit) == 0);
@@ -317,7 +317,7 @@ test_and_set_bit(long bit, long *var)
 
 	var += bit / (sizeof(long) * NBBY);
 	bit %= sizeof(long) * NBBY;
-	bit = 1 << bit;
+	bit = (1UL << bit);
 	do {
 		val = *(volatile long *)var;
 	} while (atomic_cmpset_long(var, val, val | bit) == 0);
diff --git a/sys/ofed/include/linux/linux_compat.c b/sys/ofed/include/linux/linux_compat.c
index 80d1e1e8cf1f..01c95e8884e8 100644
--- a/sys/ofed/include/linux/linux_compat.c
+++ b/sys/ofed/include/linux/linux_compat.c
@@ -678,7 +678,7 @@ linux_compat_init(void)
 	struct sysctl_oid *rootoid;
 	int i;
 
-	rootoid = SYSCTL_ADD_NODE(NULL, SYSCTL_STATIC_CHILDREN(),
+	rootoid = SYSCTL_ADD_ROOT_NODE(NULL,
 	    OID_AUTO, "sys", CTLFLAG_RD|CTLFLAG_MPSAFE, NULL, "sys");
 	kobject_init(&class_root, &class_ktype);
 	kobject_set_name(&class_root, "class");
diff --git a/sys/ofed/include/linux/linux_radix.c b/sys/ofed/include/linux/linux_radix.c
index 4503f5544a7a..1e387efb692d 100644
--- a/sys/ofed/include/linux/linux_radix.c
+++ b/sys/ofed/include/linux/linux_radix.c
@@ -123,40 +123,84 @@ int
 radix_tree_insert(struct radix_tree_root *root, unsigned long index, void *item)
 {
 	struct radix_tree_node *node;
+	struct radix_tree_node *temp[RADIX_TREE_MAX_HEIGHT - 1];
 	int height;
 	int idx;
 
-	/*
- 	 * Expand the tree to fit indexes as big as requested.
-	 */
-	while (root->rnode == NULL || radix_max(root) < index) {
+	/* bail out upon insertion of a NULL item */
+	if (item == NULL)
+		return (-EINVAL);
+
+	/* get root node, if any */
+	node = root->rnode;
+
+	/* allocate root node, if any */
+	if (node == NULL) {
 		node = malloc(sizeof(*node), M_RADIX, root->gfp_mask | M_ZERO);
 		if (node == NULL)
 			return (-ENOMEM);
-		node->slots[0] = root->rnode;
-		if (root->rnode)
-			node->count++;
 		root->rnode = node;
 		root->height++;
 	}
-	node = root->rnode;
-	height = root->height - 1;
-	/*
-	 * Walk down the tree finding the correct node and allocating any
-	 * missing nodes along the way.
-	 */
-	while (height) {
-		idx = radix_pos(index, height);
-		if (node->slots[idx] == NULL) {
-			node->slots[idx] = malloc(sizeof(*node), M_RADIX,
-			    root->gfp_mask | M_ZERO);
-			if (node->slots[idx] == NULL)
+
+	/* expand radix tree as needed */
+	while (radix_max(root) < index) {
+
+		/* check if the radix tree is getting too big */
+		if (root->height == RADIX_TREE_MAX_HEIGHT)
+			return (-E2BIG);
+
+		/*
+		 * If the root radix level is not empty, we need to
+		 * allocate a new radix level:
+		 */
+		if (node->count != 0) {
+			node = malloc(sizeof(*node), M_RADIX, root->gfp_mask | M_ZERO);
+			if (node == NULL)
 				return (-ENOMEM);
+			node->slots[0] = root->rnode;
 			node->count++;
+			root->rnode = node;
 		}
-		node = node->slots[idx];
-		height--;
+		root->height++;
 	}
+
+	/* get radix tree height index */
+	height = root->height - 1;
+
+	/* walk down the tree until the first missing node, if any */
+	for ( ; height != 0; height--) {
+		idx = radix_pos(index, height);
+		if (node->slots[idx] == NULL)
+			break;
+		node = node->slots[idx];
+	}
+
+	/* allocate the missing radix levels, if any */
+	for (idx = 0; idx != height; idx++) {
+		temp[idx] = malloc(sizeof(*node), M_RADIX,
+		    root->gfp_mask | M_ZERO);
+		if (temp[idx] == NULL) {
+			while(idx--)
+				free(temp[idx], M_RADIX);
+			/* check if we should free the root node aswell */
+			if (root->rnode->count == 0) {
+				free(root->rnode, M_RADIX);
+				root->rnode = NULL;
+				root->height = 0;
+			}
+			return (-ENOMEM);
+		}
+	}
+
+	/* setup new radix levels, if any */
+	for ( ; height != 0; height--) {
+		idx = radix_pos(index, height);
+		node->slots[idx] = temp[height - 1];
+		node->count++;
+		node = node->slots[idx];
+	}
+
 	/*
 	 * Insert and adjust count if the item does not already exist.
 	 */
diff --git a/sys/ofed/include/linux/module.h b/sys/ofed/include/linux/module.h
index 8c83006841b1..fc9d530676dd 100644
--- a/sys/ofed/include/linux/module.h
+++ b/sys/ofed/include/linux/module.h
@@ -44,6 +44,11 @@
 #define	EXPORT_SYMBOL(name)
 #define	EXPORT_SYMBOL_GPL(name)
 
+/* OFED pre-module initialization */
+#define	SI_SUB_OFED_PREINIT	(SI_SUB_KTHREAD_INIT - 2)
+/* OFED default module initialization */
+#define	SI_SUB_OFED_MODINIT	(SI_SUB_KTHREAD_INIT - 1)
+
 #include <sys/linker.h>
 
 static inline void
@@ -68,17 +73,17 @@ _module_run(void *arg)
 }
 
 #define	module_init(fn)							\
-	SYSINIT(fn, SI_SUB_LAST, SI_ORDER_FIRST, _module_run, (fn))
+	SYSINIT(fn, SI_SUB_OFED_MODINIT, SI_ORDER_FIRST, _module_run, (fn))
 
 /*
  * XXX This is a freebsdism designed to work around not having a module
  * load order resolver built in.
  */
 #define	module_init_order(fn, order)					\
-	SYSINIT(fn, SI_SUB_LAST, (order), _module_run, (fn))
+	SYSINIT(fn, SI_SUB_OFED_MODINIT, (order), _module_run, (fn))
 
 #define	module_exit(fn)						\
-	SYSUNINIT(fn, SI_SUB_LAST, SI_ORDER_FIRST, _module_run, (fn))
+	SYSUNINIT(fn, SI_SUB_OFED_MODINIT, SI_ORDER_FIRST, _module_run, (fn))
 
 #define	module_get(module)
 #define	module_put(module)
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 754d4ad12cbb..d128658bf222 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -704,7 +704,7 @@ sysctl_machdep_comdefaultrate(SYSCTL_HANDLER_ARGS)
 	return error;
 }
 
-SYSCTL_PROC(_machdep, OID_AUTO, conspeed, CTLTYPE_INT | CTLFLAG_RW,
+SYSCTL_PROC(_machdep, OID_AUTO, conspeed, CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NOFETCH,
 	    0, 0, sysctl_machdep_comdefaultrate, "I", "");
 TUNABLE_INT("machdep.conspeed", __DEVOLATILE(int *, &comdefaultrate));
 
diff --git a/sys/pc98/pc98/canbus.c b/sys/pc98/pc98/canbus.c
index 96190473ff08..daacdbd3e46a 100644
--- a/sys/pc98/pc98/canbus.c
+++ b/sys/pc98/pc98/canbus.c
@@ -188,9 +188,8 @@ canbus_attach(device_t dev)
 
 	/* Dynamic sysctl tree setup */
 	sysctl_ctx_init(&sc->canbus_sysctl_ctx);
-	canbus_sysctl_tree = SYSCTL_ADD_NODE(&sc->canbus_sysctl_ctx,
-	    SYSCTL_STATIC_CHILDREN(/* tree top */), OID_AUTO,
-	    "canbus", CTLFLAG_RD, 0, "CanBe I/O Bus");
+	canbus_sysctl_tree = SYSCTL_ADD_ROOT_NODE(&sc->canbus_sysctl_ctx,
+	    OID_AUTO, "canbus", CTLFLAG_RD, 0, "CanBe I/O Bus");
 	SYSCTL_ADD_INT(&sc->canbus_sysctl_ctx,
 	    SYSCTL_CHILDREN(canbus_sysctl_tree), OID_AUTO, "io_delay_time",
 	    CTLFLAG_RW, &sc->io_delay_time, 0, "CanBe Bus I/O delay time");
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index b9c6a4ef235c..f7883c441082 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -1113,8 +1113,7 @@ cpu_halt(void)
 }
 
 static int	idle_mwait = 1;		/* Use MONITOR/MWAIT for short idle. */
-TUNABLE_INT("machdep.idle_mwait", &idle_mwait);
-SYSCTL_INT(_machdep, OID_AUTO, idle_mwait, CTLFLAG_RW, &idle_mwait,
+SYSCTL_INT(_machdep, OID_AUTO, idle_mwait, CTLFLAG_RWTUN, &idle_mwait,
     0, "Use MONITOR/MWAIT for short idle");
 
 #define	STATE_RUNNING	0x0
diff --git a/sys/pc98/pc98/pc98_machdep.c b/sys/pc98/pc98/pc98_machdep.c
index aed4eaa6f141..9f9fbcc347f2 100644
--- a/sys/pc98/pc98/pc98_machdep.c
+++ b/sys/pc98/pc98/pc98_machdep.c
@@ -49,8 +49,7 @@
 
 static	int	ad_geom_method = AD_GEOM_ADJUST_COMPATIDE;
 
-TUNABLE_INT("machdep.ad_geom_method", &ad_geom_method);
-SYSCTL_INT(_machdep, OID_AUTO, ad_geom_method, CTLFLAG_RW, &ad_geom_method, 0,
+SYSCTL_INT(_machdep, OID_AUTO, ad_geom_method, CTLFLAG_RWTUN, &ad_geom_method, 0,
     "IDE disk geometry conversion method");
 
 /*
diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c
index e9b3a448bbf9..742dd7028e4c 100644
--- a/sys/powerpc/aim/mmu_oea.c
+++ b/sys/powerpc/aim/mmu_oea.c
@@ -258,8 +258,8 @@ static struct	pte *moea_pvo_to_pte(const struct pvo_entry *, int);
 /*
  * Utility routines.
  */
-static void		moea_enter_locked(pmap_t, vm_offset_t, vm_page_t,
-			    vm_prot_t, boolean_t);
+static int		moea_enter_locked(pmap_t, vm_offset_t, vm_page_t,
+			    vm_prot_t, u_int, int8_t);
 static void		moea_syncicache(vm_offset_t, vm_size_t);
 static boolean_t	moea_query_bit(vm_page_t, int);
 static u_int		moea_clear_bit(vm_page_t, int);
@@ -269,12 +269,12 @@ int		moea_pte_spill(vm_offset_t);
 /*
  * Kernel MMU interface
  */
-void moea_change_wiring(mmu_t, pmap_t, vm_offset_t, boolean_t);
 void moea_clear_modify(mmu_t, vm_page_t);
 void moea_copy_page(mmu_t, vm_page_t, vm_page_t);
 void moea_copy_pages(mmu_t mmu, vm_page_t *ma, vm_offset_t a_offset,
     vm_page_t *mb, vm_offset_t b_offset, int xfersize);
-void moea_enter(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t, boolean_t);
+int moea_enter(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t, u_int,
+    int8_t);
 void moea_enter_object(mmu_t, pmap_t, vm_offset_t, vm_offset_t, vm_page_t,
     vm_prot_t);
 void moea_enter_quick(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t);
@@ -297,6 +297,7 @@ void moea_release(mmu_t, pmap_t);
 void moea_remove(mmu_t, pmap_t, vm_offset_t, vm_offset_t);
 void moea_remove_all(mmu_t, vm_page_t);
 void moea_remove_write(mmu_t, vm_page_t);
+void moea_unwire(mmu_t, pmap_t, vm_offset_t, vm_offset_t);
 void moea_zero_page(mmu_t, vm_page_t);
 void moea_zero_page_area(mmu_t, vm_page_t, int, int);
 void moea_zero_page_idle(mmu_t, vm_page_t);
@@ -318,7 +319,6 @@ vm_offset_t moea_dumpsys_map(mmu_t mmu, struct pmap_md *md, vm_size_t ofs,
 struct pmap_md * moea_scan_md(mmu_t mmu, struct pmap_md *prev);
 
 static mmu_method_t moea_methods[] = {
-	MMUMETHOD(mmu_change_wiring,	moea_change_wiring),
 	MMUMETHOD(mmu_clear_modify,	moea_clear_modify),
 	MMUMETHOD(mmu_copy_page,	moea_copy_page),
 	MMUMETHOD(mmu_copy_pages,	moea_copy_pages),
@@ -345,6 +345,7 @@ static mmu_method_t moea_methods[] = {
 	MMUMETHOD(mmu_remove_all,      	moea_remove_all),
 	MMUMETHOD(mmu_remove_write,	moea_remove_write),
 	MMUMETHOD(mmu_sync_icache,	moea_sync_icache),
+	MMUMETHOD(mmu_unwire,		moea_unwire),
 	MMUMETHOD(mmu_zero_page,       	moea_zero_page),
 	MMUMETHOD(mmu_zero_page_area,	moea_zero_page_area),
 	MMUMETHOD(mmu_zero_page_idle,	moea_zero_page_idle),
@@ -1014,23 +1015,19 @@ moea_deactivate(mmu_t mmu, struct thread *td)
 }
 
 void
-moea_change_wiring(mmu_t mmu, pmap_t pm, vm_offset_t va, boolean_t wired)
+moea_unwire(mmu_t mmu, pmap_t pm, vm_offset_t sva, vm_offset_t eva)
 {
-	struct	pvo_entry *pvo;
+	struct	pvo_entry key, *pvo;
 
 	PMAP_LOCK(pm);
-	pvo = moea_pvo_find_va(pm, va & ~ADDR_POFF, NULL);
-
-	if (pvo != NULL) {
-		if (wired) {
-			if ((pvo->pvo_vaddr & PVO_WIRED) == 0)
-				pm->pm_stats.wired_count++;
-			pvo->pvo_vaddr |= PVO_WIRED;
-		} else {
-			if ((pvo->pvo_vaddr & PVO_WIRED) != 0)
-				pm->pm_stats.wired_count--;
-			pvo->pvo_vaddr &= ~PVO_WIRED;
-		}
+	key.pvo_vaddr = sva;
+	for (pvo = RB_NFIND(pvo_tree, &pm->pmap_pvo, &key);
+	    pvo != NULL && PVO_VADDR(pvo) < eva;
+	    pvo = RB_NEXT(pvo_tree, &pm->pmap_pvo, pvo)) {
+		if ((pvo->pvo_vaddr & PVO_WIRED) == 0)
+			panic("moea_unwire: pvo %p is missing PVO_WIRED", pvo);
+		pvo->pvo_vaddr &= ~PVO_WIRED;
+		pm->pm_stats.wired_count--;
 	}
 	PMAP_UNLOCK(pm);
 }
@@ -1104,16 +1101,25 @@ moea_zero_page_idle(mmu_t mmu, vm_page_t m)
  * target pmap with the protection requested.  If specified the page
  * will be wired down.
  */
-void
+int
 moea_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
-	   boolean_t wired)
+    u_int flags, int8_t psind)
 {
+	int error;
 
-	rw_wlock(&pvh_global_lock);
-	PMAP_LOCK(pmap);
-	moea_enter_locked(pmap, va, m, prot, wired);
-	rw_wunlock(&pvh_global_lock);
-	PMAP_UNLOCK(pmap);
+	for (;;) {
+		rw_wlock(&pvh_global_lock);
+		PMAP_LOCK(pmap);
+		error = moea_enter_locked(pmap, va, m, prot, flags, psind);
+		rw_wunlock(&pvh_global_lock);
+		PMAP_UNLOCK(pmap);
+		if (error != ENOMEM)
+			return (KERN_SUCCESS);
+		if ((flags & PMAP_ENTER_NOSLEEP) != 0)
+			return (KERN_RESOURCE_SHORTAGE);
+		VM_OBJECT_ASSERT_UNLOCKED(m->object);
+		VM_WAIT;
+	}
 }
 
 /*
@@ -1121,40 +1127,31 @@ moea_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
  * target pmap with the protection requested.  If specified the page
  * will be wired down.
  *
- * The page queues and pmap must be locked.
+ * The global pvh and pmap must be locked.
  */
-static void
+static int
 moea_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
-    boolean_t wired)
+    u_int flags, int8_t psind __unused)
 {
 	struct		pvo_head *pvo_head;
 	uma_zone_t	zone;
-	vm_page_t	pg;
 	u_int		pte_lo, pvo_flags;
 	int		error;
 
-	if (!moea_initialized) {
-		pvo_head = &moea_pvo_kunmanaged;
-		zone = moea_upvo_zone;
-		pvo_flags = 0;
-		pg = NULL;
-	} else {
-		pvo_head = vm_page_to_pvoh(m);
-		pg = m;
-		zone = moea_mpvo_zone;
-		pvo_flags = PVO_MANAGED;
-	}
 	if (pmap_bootstrapped)
 		rw_assert(&pvh_global_lock, RA_WLOCKED);
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 	if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m))
 		VM_OBJECT_ASSERT_LOCKED(m->object);
 
-	/* XXX change the pvo head for fake pages */
-	if ((m->oflags & VPO_UNMANAGED) != 0) {
-		pvo_flags &= ~PVO_MANAGED;
+	if ((m->oflags & VPO_UNMANAGED) != 0 || !moea_initialized) {
 		pvo_head = &moea_pvo_kunmanaged;
 		zone = moea_upvo_zone;
+		pvo_flags = 0;
+	} else {
+		pvo_head = vm_page_to_pvoh(m);
+		zone = moea_mpvo_zone;
+		pvo_flags = PVO_MANAGED;
 	}
 
 	pte_lo = moea_calc_wimg(VM_PAGE_TO_PHYS(m), pmap_page_get_memattr(m));
@@ -1167,10 +1164,7 @@ moea_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 	} else
 		pte_lo |= PTE_BR;
 
-	if (prot & VM_PROT_EXECUTE)
-		pvo_flags |= PVO_EXECUTABLE;
-
-	if (wired)
+	if ((flags & PMAP_ENTER_WIRED) != 0)
 		pvo_flags |= PVO_WIRED;
 
 	error = moea_pvo_enter(pmap, zone, pvo_head, va, VM_PAGE_TO_PHYS(m),
@@ -1185,6 +1179,8 @@ moea_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 	if (pmap != kernel_pmap && error == ENOENT &&
 	    (pte_lo & (PTE_I | PTE_G)) == 0)
 		moea_syncicache(VM_PAGE_TO_PHYS(m), PAGE_SIZE);
+
+	return (error);
 }
 
 /*
@@ -1214,7 +1210,7 @@ moea_enter_object(mmu_t mmu, pmap_t pm, vm_offset_t start, vm_offset_t end,
 	PMAP_LOCK(pm);
 	while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) {
 		moea_enter_locked(pm, start + ptoa(diff), m, prot &
-		    (VM_PROT_READ | VM_PROT_EXECUTE), FALSE);
+		    (VM_PROT_READ | VM_PROT_EXECUTE), 0, 0);
 		m = TAILQ_NEXT(m, listq);
 	}
 	rw_wunlock(&pvh_global_lock);
@@ -1229,7 +1225,7 @@ moea_enter_quick(mmu_t mmu, pmap_t pm, vm_offset_t va, vm_page_t m,
 	rw_wlock(&pvh_global_lock);
 	PMAP_LOCK(pm);
 	moea_enter_locked(pm, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE),
-	    FALSE);
+	    0, 0);
 	rw_wunlock(&pvh_global_lock);
 	PMAP_UNLOCK(pm);
 }
@@ -1725,8 +1721,6 @@ moea_protect(mmu_t mmu, pmap_t pm, vm_offset_t sva, vm_offset_t eva,
 	for (pvo = RB_NFIND(pvo_tree, &pm->pmap_pvo, &key);
 	    pvo != NULL && PVO_VADDR(pvo) < eva; pvo = tpvo) {
 		tpvo = RB_NEXT(pvo_tree, &pm->pmap_pvo, pvo);
-		if ((prot & VM_PROT_EXECUTE) == 0)
-			pvo->pvo_vaddr &= ~PVO_EXECUTABLE;
 
 		/*
 		 * Grab the PTE pointer before we diddle with the cached PTE
@@ -1934,7 +1928,21 @@ moea_pvo_enter(pmap_t pm, uma_zone_t zone, struct pvo_head *pvo_head,
 			if ((pvo->pvo_pte.pte.pte_lo & PTE_RPGN) == pa &&
 			    (pvo->pvo_pte.pte.pte_lo & PTE_PP) ==
 			    (pte_lo & PTE_PP)) {
+				/*
+				 * The PTE is not changing.  Instead, this may
+				 * be a request to change the mapping's wired
+				 * attribute.
+				 */
 				mtx_unlock(&moea_table_mutex);
+				if ((flags & PVO_WIRED) != 0 &&
+				    (pvo->pvo_vaddr & PVO_WIRED) == 0) {
+					pvo->pvo_vaddr |= PVO_WIRED;
+					pm->pm_stats.wired_count++;
+				} else if ((flags & PVO_WIRED) == 0 &&
+				    (pvo->pvo_vaddr & PVO_WIRED) != 0) {
+					pvo->pvo_vaddr &= ~PVO_WIRED;
+					pm->pm_stats.wired_count--;
+				}
 				return (0);
 			}
 			moea_pvo_remove(pvo, -1);
@@ -1968,8 +1976,6 @@ moea_pvo_enter(pmap_t pm, uma_zone_t zone, struct pvo_head *pvo_head,
 	pvo->pvo_pmap = pm;
 	LIST_INSERT_HEAD(&moea_pvo_table[ptegidx], pvo, pvo_olink);
 	pvo->pvo_vaddr &= ~ADDR_POFF;
-	if (flags & VM_PROT_EXECUTE)
-		pvo->pvo_vaddr |= PVO_EXECUTABLE;
 	if (flags & PVO_WIRED)
 		pvo->pvo_vaddr |= PVO_WIRED;
 	if (pvo_head != &moea_pvo_kunmanaged)
@@ -1992,7 +1998,7 @@ moea_pvo_enter(pmap_t pm, uma_zone_t zone, struct pvo_head *pvo_head,
 		first = 1;
 	LIST_INSERT_HEAD(pvo_head, pvo, pvo_vlink);
 
-	if (pvo->pvo_pte.pte.pte_lo & PVO_WIRED)
+	if (pvo->pvo_vaddr & PVO_WIRED)
 		pm->pm_stats.wired_count++;
 	pm->pm_stats.resident_count++;
 
@@ -2031,7 +2037,7 @@ moea_pvo_remove(struct pvo_entry *pvo, int pteidx)
 	 * Update our statistics.
 	 */
 	pvo->pvo_pmap->pm_stats.resident_count--;
-	if (pvo->pvo_pte.pte.pte_lo & PVO_WIRED)
+	if (pvo->pvo_vaddr & PVO_WIRED)
 		pvo->pvo_pmap->pm_stats.wired_count--;
 
 	/*
diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c
index b47b94d14a99..2db7fcb97334 100644
--- a/sys/powerpc/aim/mmu_oea64.c
+++ b/sys/powerpc/aim/mmu_oea64.c
@@ -267,7 +267,7 @@ int		moea64_large_page_shift = 0;
  * PVO calls.
  */
 static int	moea64_pvo_enter(mmu_t, pmap_t, uma_zone_t, struct pvo_head *,
-		    vm_offset_t, vm_offset_t, uint64_t, int);
+		    vm_offset_t, vm_offset_t, uint64_t, int, int8_t);
 static void	moea64_pvo_remove(mmu_t, struct pvo_entry *);
 static struct	pvo_entry *moea64_pvo_find_va(pmap_t, vm_offset_t);
 
@@ -283,12 +283,12 @@ static void		moea64_syncicache(mmu_t, pmap_t pmap, vm_offset_t va,
 /*
  * Kernel MMU interface
  */
-void moea64_change_wiring(mmu_t, pmap_t, vm_offset_t, boolean_t);
 void moea64_clear_modify(mmu_t, vm_page_t);
 void moea64_copy_page(mmu_t, vm_page_t, vm_page_t);
 void moea64_copy_pages(mmu_t mmu, vm_page_t *ma, vm_offset_t a_offset,
     vm_page_t *mb, vm_offset_t b_offset, int xfersize);
-void moea64_enter(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t, boolean_t);
+int moea64_enter(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t,
+    u_int flags, int8_t psind);
 void moea64_enter_object(mmu_t, pmap_t, vm_offset_t, vm_offset_t, vm_page_t,
     vm_prot_t);
 void moea64_enter_quick(mmu_t, pmap_t, vm_offset_t, vm_page_t, vm_prot_t);
@@ -312,6 +312,7 @@ void moea64_remove(mmu_t, pmap_t, vm_offset_t, vm_offset_t);
 void moea64_remove_pages(mmu_t, pmap_t);
 void moea64_remove_all(mmu_t, vm_page_t);
 void moea64_remove_write(mmu_t, vm_page_t);
+void moea64_unwire(mmu_t, pmap_t, vm_offset_t, vm_offset_t);
 void moea64_zero_page(mmu_t, vm_page_t);
 void moea64_zero_page_area(mmu_t, vm_page_t, int, int);
 void moea64_zero_page_idle(mmu_t, vm_page_t);
@@ -331,7 +332,6 @@ vm_offset_t moea64_dumpsys_map(mmu_t mmu, struct pmap_md *md, vm_size_t ofs,
 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),
 	MMUMETHOD(mmu_clear_modify,	moea64_clear_modify),
 	MMUMETHOD(mmu_copy_page,	moea64_copy_page),
 	MMUMETHOD(mmu_copy_pages,	moea64_copy_pages),
@@ -359,6 +359,7 @@ static mmu_method_t moea64_methods[] = {
 	MMUMETHOD(mmu_remove_all,      	moea64_remove_all),
 	MMUMETHOD(mmu_remove_write,	moea64_remove_write),
 	MMUMETHOD(mmu_sync_icache,	moea64_sync_icache),
+	MMUMETHOD(mmu_unwire,		moea64_unwire),
 	MMUMETHOD(mmu_zero_page,       	moea64_zero_page),
 	MMUMETHOD(mmu_zero_page_area,	moea64_zero_page_area),
 	MMUMETHOD(mmu_zero_page_idle,	moea64_zero_page_idle),
@@ -627,7 +628,7 @@ moea64_setup_direct_map(mmu_t mmup, vm_offset_t kernelstart,
 
 			moea64_pvo_enter(mmup, kernel_pmap, moea64_upvo_zone,
 				    NULL, pa, pa, pte_lo,
-				    PVO_WIRED | PVO_LARGE);
+				    PVO_WIRED | PVO_LARGE, 0);
 		  }
 		}
 		PMAP_UNLOCK(kernel_pmap);
@@ -1024,55 +1025,38 @@ moea64_deactivate(mmu_t mmu, struct thread *td)
 }
 
 void
-moea64_change_wiring(mmu_t mmu, pmap_t pm, vm_offset_t va, boolean_t wired)
+moea64_unwire(mmu_t mmu, pmap_t pm, vm_offset_t sva, vm_offset_t eva)
 {
-	struct	pvo_entry *pvo;
+	struct	pvo_entry key, *pvo;
 	uintptr_t pt;
-	uint64_t vsid;
-	int	i, ptegidx;
 
-	LOCK_TABLE_WR();
+	LOCK_TABLE_RD();
 	PMAP_LOCK(pm);
-	pvo = moea64_pvo_find_va(pm, va & ~ADDR_POFF);
-
-	if (pvo != NULL) {
+	key.pvo_vaddr = sva;
+	for (pvo = RB_NFIND(pvo_tree, &pm->pmap_pvo, &key);
+	    pvo != NULL && PVO_VADDR(pvo) < eva;
+	    pvo = RB_NEXT(pvo_tree, &pm->pmap_pvo, pvo)) {
 		pt = MOEA64_PVO_TO_PTE(mmu, pvo);
-
-		if (wired) {
-			if ((pvo->pvo_vaddr & PVO_WIRED) == 0)
-				pm->pm_stats.wired_count++;
-			pvo->pvo_vaddr |= PVO_WIRED;
-			pvo->pvo_pte.lpte.pte_hi |= LPTE_WIRED;
-		} else {
-			if ((pvo->pvo_vaddr & PVO_WIRED) != 0)
-				pm->pm_stats.wired_count--;
-			pvo->pvo_vaddr &= ~PVO_WIRED;
-			pvo->pvo_pte.lpte.pte_hi &= ~LPTE_WIRED;
-		}
-
+		if ((pvo->pvo_vaddr & PVO_WIRED) == 0)
+			panic("moea64_unwire: pvo %p is missing PVO_WIRED",
+			    pvo);
+		pvo->pvo_vaddr &= ~PVO_WIRED;
+		if ((pvo->pvo_pte.lpte.pte_hi & LPTE_WIRED) == 0)
+			panic("moea64_unwire: pte %p is missing LPTE_WIRED",
+			    &pvo->pvo_pte.lpte);
+		pvo->pvo_pte.lpte.pte_hi &= ~LPTE_WIRED;
 		if (pt != -1) {
-			/* Update wiring flag in page table. */
+			/*
+			 * The PTE's wired attribute is not a hardware
+			 * feature, so there is no need to invalidate any TLB
+			 * entries.
+			 */
 			MOEA64_PTE_CHANGE(mmu, pt, &pvo->pvo_pte.lpte,
 			    pvo->pvo_vpn);
-		} else if (wired) {
-			/*
-			 * If we are wiring the page, and it wasn't in the
-			 * page table before, add it.
-			 */
-			vsid = PVO_VSID(pvo);
-			ptegidx = va_to_pteg(vsid, PVO_VADDR(pvo),
-			    pvo->pvo_vaddr & PVO_LARGE);
-
-			i = MOEA64_PTE_INSERT(mmu, ptegidx, &pvo->pvo_pte.lpte);
-			
-			if (i >= 0) {
-				PVO_PTEGIDX_CLR(pvo);
-				PVO_PTEGIDX_SET(pvo, i);
-			}
 		}
-			
+		pm->pm_stats.wired_count--;
 	}
-	UNLOCK_TABLE_WR();
+	UNLOCK_TABLE_RD();
 	PMAP_UNLOCK(pm);
 }
 
@@ -1245,39 +1229,29 @@ moea64_zero_page_idle(mmu_t mmu, vm_page_t m)
  * will be wired down.
  */
 
-void
+int
 moea64_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m, 
-    vm_prot_t prot, boolean_t wired)
+    vm_prot_t prot, u_int flags, int8_t psind)
 {
 	struct		pvo_head *pvo_head;
 	uma_zone_t	zone;
-	vm_page_t	pg;
 	uint64_t	pte_lo;
 	u_int		pvo_flags;
 	int		error;
 
-	if (!moea64_initialized) {
+	if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m))
+		VM_OBJECT_ASSERT_LOCKED(m->object);
+
+	if ((m->oflags & VPO_UNMANAGED) != 0 || !moea64_initialized) {
 		pvo_head = NULL;
-		pg = NULL;
 		zone = moea64_upvo_zone;
 		pvo_flags = 0;
 	} else {
 		pvo_head = vm_page_to_pvoh(m);
-		pg = m;
 		zone = moea64_mpvo_zone;
 		pvo_flags = PVO_MANAGED;
 	}
 
-	if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m))
-		VM_OBJECT_ASSERT_LOCKED(m->object);
-
-	/* XXX change the pvo head for fake pages */
-	if ((m->oflags & VPO_UNMANAGED) != 0) {
-		pvo_flags &= ~PVO_MANAGED;
-		pvo_head = NULL;
-		zone = moea64_upvo_zone;
-	}
-
 	pte_lo = moea64_calc_wimg(VM_PAGE_TO_PHYS(m), pmap_page_get_memattr(m));
 
 	if (prot & VM_PROT_WRITE) {
@@ -1291,15 +1265,23 @@ moea64_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m,
 	if ((prot & VM_PROT_EXECUTE) == 0)
 		pte_lo |= LPTE_NOEXEC;
 
-	if (wired)
+	if ((flags & PMAP_ENTER_WIRED) != 0)
 		pvo_flags |= PVO_WIRED;
 
-	LOCK_TABLE_WR();
-	PMAP_LOCK(pmap);
-	error = moea64_pvo_enter(mmu, pmap, zone, pvo_head, va,
-	    VM_PAGE_TO_PHYS(m), pte_lo, pvo_flags);
-	PMAP_UNLOCK(pmap);
-	UNLOCK_TABLE_WR();
+	for (;;) {
+		LOCK_TABLE_WR();
+		PMAP_LOCK(pmap);
+		error = moea64_pvo_enter(mmu, pmap, zone, pvo_head, va,
+		    VM_PAGE_TO_PHYS(m), pte_lo, pvo_flags, psind);
+		PMAP_UNLOCK(pmap);
+		UNLOCK_TABLE_WR();
+		if (error != ENOMEM)
+			break;
+		if ((flags & PMAP_ENTER_NOSLEEP) != 0)
+			return (KERN_RESOURCE_SHORTAGE);
+		VM_OBJECT_ASSERT_UNLOCKED(m->object);
+		VM_WAIT;
+	}
 
 	/*
 	 * Flush the page from the instruction cache if this page is
@@ -1310,6 +1292,7 @@ moea64_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m,
 		vm_page_aflag_set(m, PGA_EXECUTABLE);
 		moea64_syncicache(mmu, pmap, va, VM_PAGE_TO_PHYS(m), PAGE_SIZE);
 	}
+	return (KERN_SUCCESS);
 }
 
 static void
@@ -1374,7 +1357,7 @@ moea64_enter_object(mmu_t mmu, pmap_t pm, vm_offset_t start, vm_offset_t end,
 	m = m_start;
 	while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) {
 		moea64_enter(mmu, pm, start + ptoa(diff), m, prot &
-		    (VM_PROT_READ | VM_PROT_EXECUTE), FALSE);
+		    (VM_PROT_READ | VM_PROT_EXECUTE), PMAP_ENTER_NOSLEEP, 0);
 		m = TAILQ_NEXT(m, listq);
 	}
 }
@@ -1384,8 +1367,8 @@ moea64_enter_quick(mmu_t mmu, pmap_t pm, vm_offset_t va, vm_page_t m,
     vm_prot_t prot)
 {
 
-	moea64_enter(mmu, pm, va, m,
-	    prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE);
+	moea64_enter(mmu, pm, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE),
+	    PMAP_ENTER_NOSLEEP, 0);
 }
 
 vm_paddr_t
@@ -1473,7 +1456,8 @@ moea64_uma_page_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
 		PMAP_LOCK(kernel_pmap);
 
 	moea64_pvo_enter(installed_mmu, kernel_pmap, moea64_upvo_zone,
-	    NULL, va, VM_PAGE_TO_PHYS(m), LPTE_M, PVO_WIRED | PVO_BOOTSTRAP);
+	    NULL, va, VM_PAGE_TO_PHYS(m), LPTE_M, PVO_WIRED | PVO_BOOTSTRAP,
+	    0);
 
 	if (needed_lock)
 		PMAP_UNLOCK(kernel_pmap);
@@ -1695,7 +1679,7 @@ moea64_kenter_attr(mmu_t mmu, vm_offset_t va, vm_offset_t pa, vm_memattr_t ma)
 	LOCK_TABLE_WR();
 	PMAP_LOCK(kernel_pmap);
 	error = moea64_pvo_enter(mmu, kernel_pmap, moea64_upvo_zone,
-	    NULL, va, pa, pte_lo, PVO_WIRED);
+	    NULL, va, pa, pte_lo, PVO_WIRED, 0);
 	PMAP_UNLOCK(kernel_pmap);
 	UNLOCK_TABLE_WR();
 
@@ -2193,9 +2177,10 @@ moea64_bootstrap_alloc(vm_size_t size, u_int align)
 static int
 moea64_pvo_enter(mmu_t mmu, pmap_t pm, uma_zone_t zone,
     struct pvo_head *pvo_head, vm_offset_t va, vm_offset_t pa,
-    uint64_t pte_lo, int flags)
+    uint64_t pte_lo, int flags, int8_t psind __unused)
 {
 	struct	 pvo_entry *pvo;
+	uintptr_t pt;
 	uint64_t vsid;
 	int	 first;
 	u_int	 ptegidx;
@@ -2238,13 +2223,42 @@ moea64_pvo_enter(mmu_t mmu, pmap_t pm, uma_zone_t zone,
 			if ((pvo->pvo_pte.lpte.pte_lo & LPTE_RPGN) == pa &&
 			    (pvo->pvo_pte.lpte.pte_lo & (LPTE_NOEXEC | LPTE_PP))
 			    == (pte_lo & (LPTE_NOEXEC | LPTE_PP))) {
+				/*
+				 * The physical page and protection are not
+				 * changing.  Instead, this may be a request
+				 * to change the mapping's wired attribute.
+				 */
+				pt = -1;
+				if ((flags & PVO_WIRED) != 0 &&
+				    (pvo->pvo_vaddr & PVO_WIRED) == 0) {
+					pt = MOEA64_PVO_TO_PTE(mmu, pvo);
+					pvo->pvo_vaddr |= PVO_WIRED;
+					pvo->pvo_pte.lpte.pte_hi |= LPTE_WIRED;
+					pm->pm_stats.wired_count++;
+				} else if ((flags & PVO_WIRED) == 0 &&
+				    (pvo->pvo_vaddr & PVO_WIRED) != 0) {
+					pt = MOEA64_PVO_TO_PTE(mmu, pvo);
+					pvo->pvo_vaddr &= ~PVO_WIRED;
+					pvo->pvo_pte.lpte.pte_hi &= ~LPTE_WIRED;
+					pm->pm_stats.wired_count--;
+				}
 			    	if (!(pvo->pvo_pte.lpte.pte_hi & LPTE_VALID)) {
+					KASSERT(pt == -1,
+					    ("moea64_pvo_enter: valid pt"));
 					/* Re-insert if spilled */
 					i = MOEA64_PTE_INSERT(mmu, ptegidx,
 					    &pvo->pvo_pte.lpte);
 					if (i >= 0)
 						PVO_PTEGIDX_SET(pvo, i);
 					moea64_pte_overflow--;
+				} else if (pt != -1) {
+					/*
+					 * The PTE's wired attribute is not a
+					 * hardware feature, so there is no
+					 * need to invalidate any TLB entries.
+					 */
+					MOEA64_PTE_CHANGE(mmu, pt,
+					    &pvo->pvo_pte.lpte, pvo->pvo_vpn);
 				}
 				return (0);
 			}
diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c
index a3380e3bf387..cc54e593c00f 100644
--- a/sys/powerpc/aim/trap.c
+++ b/sys/powerpc/aim/trap.c
@@ -167,7 +167,7 @@ trap(struct trapframe *frame)
 	/*
 	 * A trap can occur while DTrace executes a probe. Before
 	 * executing the probe, DTrace blocks re-scheduling and sets
-	 * a flag in it's per-cpu flags to indicate that it doesn't
+	 * a flag in its per-cpu flags to indicate that it doesn't
 	 * want to fault. On returning from the probe, the no-fault
 	 * flag is cleared and finally re-scheduling is enabled.
 	 *
@@ -176,7 +176,7 @@ trap(struct trapframe *frame)
 	 * handled the trap and modified the trap frame so that this
 	 * function can return normally.
 	 */
-	if (dtrace_trap_func != NULL && (*dtrace_trap_func)(frame, type))
+	if (dtrace_trap_func != NULL && (*dtrace_trap_func)(frame))
 		return;
 #endif
 
@@ -192,6 +192,7 @@ trap(struct trapframe *frame)
 		case EXC_TRC:
 			frame->srr1 &= ~PSL_SE;
 			sig = SIGTRAP;
+			ucode = TRAP_TRACE;
 			break;
 
 #ifdef __powerpc64__
@@ -199,13 +200,17 @@ trap(struct trapframe *frame)
 		case EXC_DSE:
 			if (handle_user_slb_spill(&p->p_vmspace->vm_pmap,
 			    (type == EXC_ISE) ? frame->srr0 :
-			    frame->cpu.aim.dar) != 0)
+			    frame->cpu.aim.dar) != 0) {
 				sig = SIGSEGV;
+				ucode = SEGV_MAPERR;
+			}
 			break;
 #endif
 		case EXC_DSI:
 		case EXC_ISI:
 			sig = trap_pfault(frame, 1);
+			if (sig == SIGSEGV)
+				ucode = SEGV_MAPERR;
 			break;
 
 		case EXC_SC:
@@ -240,8 +245,10 @@ trap(struct trapframe *frame)
 			break;
 
 		case EXC_ALI:
-			if (fix_unaligned(td, frame) != 0)
+			if (fix_unaligned(td, frame) != 0) {
 				sig = SIGBUS;
+				ucode = BUS_ADRALN;
+			}
 			else
 				frame->srr0 += 4;
 			break;
@@ -259,11 +266,29 @@ trap(struct trapframe *frame)
 				}
 #endif
  				sig = SIGTRAP;
+				ucode = TRAP_BRKPT;
 			} else {
 				sig = ppc_instr_emulate(frame, td->td_pcb);
+				if (sig == SIGILL) {
+					if (frame->srr1 & EXC_PGM_PRIV)
+						ucode = ILL_PRVOPC;
+					else if (frame->srr1 & EXC_PGM_ILLEGAL)
+						ucode = ILL_ILLOPC;
+				} else if (sig == SIGFPE)
+					ucode = FPE_FLTINV;	/* Punt for now, invalid operation. */
 			}
 			break;
 
+		case EXC_MCHK:
+			/*
+			 * Note that this may not be recoverable for the user
+			 * process, depending on the type of machine check,
+			 * but it at least prevents the kernel from dying.
+			 */
+			sig = SIGBUS;
+			ucode = BUS_OBJERR;
+			break;
+
 		default:
 			trap_fatal(frame);
 		}
diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c
index 57df896cce44..942ad125087e 100644
--- a/sys/powerpc/booke/pmap.c
+++ b/sys/powerpc/booke/pmap.c
@@ -146,8 +146,8 @@ static struct mtx copy_page_mutex;
 /* PMAP */
 /**************************************************************************/
 
-static void mmu_booke_enter_locked(mmu_t, pmap_t, vm_offset_t, vm_page_t,
-    vm_prot_t, boolean_t);
+static int mmu_booke_enter_locked(mmu_t, pmap_t, vm_offset_t, vm_page_t,
+    vm_prot_t, u_int flags, int8_t psind);
 
 unsigned int kptbl_min;		/* Index of the first kernel ptbl. */
 unsigned int kernel_ptbls;	/* Number of KVA ptbls. */
@@ -228,14 +228,14 @@ static struct ptbl_buf *ptbl_buf_alloc(void);
 static void ptbl_buf_free(struct ptbl_buf *);
 static void ptbl_free_pmap_ptbl(pmap_t, pte_t *);
 
-static pte_t *ptbl_alloc(mmu_t, pmap_t, unsigned int);
+static pte_t *ptbl_alloc(mmu_t, pmap_t, unsigned int, boolean_t);
 static void ptbl_free(mmu_t, pmap_t, unsigned int);
 static void ptbl_hold(mmu_t, pmap_t, unsigned int);
 static int ptbl_unhold(mmu_t, pmap_t, unsigned int);
 
 static vm_paddr_t pte_vatopa(mmu_t, pmap_t, vm_offset_t);
 static pte_t *pte_find(mmu_t, pmap_t, vm_offset_t);
-static void pte_enter(mmu_t, pmap_t, vm_page_t, vm_offset_t, uint32_t);
+static int pte_enter(mmu_t, pmap_t, vm_page_t, vm_offset_t, uint32_t, boolean_t);
 static int pte_remove(mmu_t, pmap_t, vm_offset_t, uint8_t);
 
 static pv_entry_t pv_alloc(void);
@@ -266,15 +266,14 @@ void pmap_bootstrap_ap(volatile uint32_t *);
 /*
  * Kernel MMU interface
  */
-static void		mmu_booke_change_wiring(mmu_t, pmap_t, vm_offset_t, boolean_t);
 static void		mmu_booke_clear_modify(mmu_t, vm_page_t);
 static void		mmu_booke_copy(mmu_t, pmap_t, pmap_t, vm_offset_t,
     vm_size_t, vm_offset_t);
 static void		mmu_booke_copy_page(mmu_t, vm_page_t, vm_page_t);
 static void		mmu_booke_copy_pages(mmu_t, vm_page_t *,
     vm_offset_t, vm_page_t *, vm_offset_t, int);
-static void		mmu_booke_enter(mmu_t, pmap_t, vm_offset_t, vm_page_t,
-    vm_prot_t, boolean_t);
+static int		mmu_booke_enter(mmu_t, pmap_t, vm_offset_t, vm_page_t,
+    vm_prot_t, u_int flags, int8_t psind);
 static void		mmu_booke_enter_object(mmu_t, pmap_t, vm_offset_t, vm_offset_t,
     vm_page_t, vm_prot_t);
 static void		mmu_booke_enter_quick(mmu_t, pmap_t, vm_offset_t, vm_page_t,
@@ -306,6 +305,7 @@ static void		mmu_booke_release(mmu_t, pmap_t);
 static void		mmu_booke_remove(mmu_t, pmap_t, vm_offset_t, vm_offset_t);
 static void		mmu_booke_remove_all(mmu_t, vm_page_t);
 static void		mmu_booke_remove_write(mmu_t, vm_page_t);
+static void		mmu_booke_unwire(mmu_t, pmap_t, vm_offset_t, vm_offset_t);
 static void		mmu_booke_zero_page(mmu_t, vm_page_t);
 static void		mmu_booke_zero_page_area(mmu_t, vm_page_t, int, int);
 static void		mmu_booke_zero_page_idle(mmu_t, vm_page_t);
@@ -330,7 +330,6 @@ static struct pmap_md	*mmu_booke_scan_md(mmu_t, struct pmap_md *);
 
 static mmu_method_t mmu_booke_methods[] = {
 	/* pmap dispatcher interface */
-	MMUMETHOD(mmu_change_wiring,	mmu_booke_change_wiring),
 	MMUMETHOD(mmu_clear_modify,	mmu_booke_clear_modify),
 	MMUMETHOD(mmu_copy,		mmu_booke_copy),
 	MMUMETHOD(mmu_copy_page,	mmu_booke_copy_page),
@@ -361,6 +360,7 @@ static mmu_method_t mmu_booke_methods[] = {
 	MMUMETHOD(mmu_remove_all,	mmu_booke_remove_all),
 	MMUMETHOD(mmu_remove_write,	mmu_booke_remove_write),
 	MMUMETHOD(mmu_sync_icache,	mmu_booke_sync_icache),
+	MMUMETHOD(mmu_unwire,		mmu_booke_unwire),
 	MMUMETHOD(mmu_zero_page,	mmu_booke_zero_page),
 	MMUMETHOD(mmu_zero_page_area,	mmu_booke_zero_page_area),
 	MMUMETHOD(mmu_zero_page_idle,	mmu_booke_zero_page_idle),
@@ -558,14 +558,14 @@ ptbl_free_pmap_ptbl(pmap_t pmap, pte_t *ptbl)
 
 /* Allocate page table. */
 static pte_t *
-ptbl_alloc(mmu_t mmu, pmap_t pmap, unsigned int pdir_idx)
+ptbl_alloc(mmu_t mmu, pmap_t pmap, unsigned int pdir_idx, boolean_t nosleep)
 {
 	vm_page_t mtbl[PTBL_PAGES];
 	vm_page_t m;
 	struct ptbl_buf *pbuf;
 	unsigned int pidx;
 	pte_t *ptbl;
-	int i;
+	int i, j;
 
 	CTR4(KTR_PMAP, "%s: pmap = %p su = %d pdir_idx = %d", __func__, pmap,
 	    (pmap == kernel_pmap), pdir_idx);
@@ -588,9 +588,15 @@ ptbl_alloc(mmu_t mmu, pmap_t pmap, unsigned int pdir_idx)
 		pidx = (PTBL_PAGES * pdir_idx) + i;
 		while ((m = vm_page_alloc(NULL, pidx,
 		    VM_ALLOC_NOOBJ | VM_ALLOC_WIRED)) == NULL) {
-
 			PMAP_UNLOCK(pmap);
 			rw_wunlock(&pvh_global_lock);
+			if (nosleep) {
+				ptbl_free_pmap_ptbl(pmap, ptbl);
+				for (j = 0; j < i; j++)
+					vm_page_free(mtbl[j]);
+				atomic_subtract_int(&vm_cnt.v_wire_count, i);
+				return (NULL);
+			}
 			VM_WAIT;
 			rw_wlock(&pvh_global_lock);
 			PMAP_LOCK(pmap);
@@ -885,8 +891,9 @@ pte_remove(mmu_t mmu, pmap_t pmap, vm_offset_t va, uint8_t flags)
 /*
  * Insert PTE for a given page and virtual address.
  */
-static void
-pte_enter(mmu_t mmu, pmap_t pmap, vm_page_t m, vm_offset_t va, uint32_t flags)
+static int
+pte_enter(mmu_t mmu, pmap_t pmap, vm_page_t m, vm_offset_t va, uint32_t flags,
+    boolean_t nosleep)
 {
 	unsigned int pdir_idx = PDIR_IDX(va);
 	unsigned int ptbl_idx = PTBL_IDX(va);
@@ -900,7 +907,11 @@ pte_enter(mmu_t mmu, pmap_t pmap, vm_page_t m, vm_offset_t va, uint32_t flags)
 
 	if (ptbl == NULL) {
 		/* Allocate page table pages. */
-		ptbl = ptbl_alloc(mmu, pmap, pdir_idx);
+		ptbl = ptbl_alloc(mmu, pmap, pdir_idx, nosleep);
+		if (ptbl == NULL) {
+			KASSERT(nosleep, ("nosleep and NULL ptbl"));
+			return (ENOMEM);
+		}
 	} else {
 		/*
 		 * Check if there is valid mapping for requested
@@ -949,6 +960,7 @@ pte_enter(mmu_t mmu, pmap_t pmap, vm_page_t m, vm_offset_t va, uint32_t flags)
 
 	tlb_miss_unlock();
 	mtx_unlock_spin(&tlbivax_mutex);
+	return (0);
 }
 
 /* Return the pa for the given pmap/va. */
@@ -1576,35 +1588,37 @@ mmu_booke_release(mmu_t mmu, pmap_t pmap)
  * target physical map with the protection requested. If specified the page
  * will be wired down.
  */
-static void
+static int
 mmu_booke_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m,
-    vm_prot_t prot, boolean_t wired)
+    vm_prot_t prot, u_int flags, int8_t psind)
 {
+	int error;
 
 	rw_wlock(&pvh_global_lock);
 	PMAP_LOCK(pmap);
-	mmu_booke_enter_locked(mmu, pmap, va, m, prot, wired);
+	error = mmu_booke_enter_locked(mmu, pmap, va, m, prot, flags, psind);
 	rw_wunlock(&pvh_global_lock);
 	PMAP_UNLOCK(pmap);
+	return (error);
 }
 
-static void
+static int
 mmu_booke_enter_locked(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m,
-    vm_prot_t prot, boolean_t wired)
+    vm_prot_t prot, u_int pmap_flags, int8_t psind __unused)
 {
 	pte_t *pte;
 	vm_paddr_t pa;
 	uint32_t flags;
-	int su, sync;
+	int error, su, sync;
 
 	pa = VM_PAGE_TO_PHYS(m);
 	su = (pmap == kernel_pmap);
 	sync = 0;
 
 	//debugf("mmu_booke_enter_locked: s (pmap=0x%08x su=%d tid=%d m=0x%08x va=0x%08x "
-	//		"pa=0x%08x prot=0x%08x wired=%d)\n",
+	//		"pa=0x%08x prot=0x%08x flags=%#x)\n",
 	//		(u_int32_t)pmap, su, pmap->pm_tid,
-	//		(u_int32_t)m, va, pa, prot, wired);
+	//		(u_int32_t)m, va, pa, prot, flags);
 
 	if (su) {
 		KASSERT(((va >= virtual_avail) &&
@@ -1634,7 +1648,7 @@ mmu_booke_enter_locked(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m,
 		flags &= ~(PTE_UW | PTE_UX | PTE_SW | PTE_SX | PTE_MODIFIED);
 
 		/* Wiring change, just update stats. */
-		if (wired) {
+		if ((pmap_flags & PMAP_ENTER_WIRED) != 0) {
 			if (!PTE_ISWIRED(pte)) {
 				flags |= PTE_WIRED;
 				pmap->pm_stats.wired_count++;
@@ -1730,12 +1744,16 @@ mmu_booke_enter_locked(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m,
 		}
 
 		/* If its wired update stats. */
-		if (wired) {
-			pmap->pm_stats.wired_count++;
+		if ((pmap_flags & PMAP_ENTER_WIRED) != 0)
 			flags |= PTE_WIRED;
-		}
 
-		pte_enter(mmu, pmap, m, va, flags);
+		error = pte_enter(mmu, pmap, m, va, flags,
+		    (pmap_flags & PMAP_ENTER_NOSLEEP) != 0);
+		if (error != 0)
+			return (KERN_RESOURCE_SHORTAGE);
+
+		if ((flags & PMAP_ENTER_WIRED) != 0)
+			pmap->pm_stats.wired_count++;
 
 		/* Flush the real memory from the instruction cache. */
 		if (prot & VM_PROT_EXECUTE)
@@ -1746,6 +1764,8 @@ mmu_booke_enter_locked(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m,
 		__syncicache((void *)va, PAGE_SIZE);
 		sync = 0;
 	}
+
+	return (KERN_SUCCESS);
 }
 
 /*
@@ -1775,7 +1795,8 @@ mmu_booke_enter_object(mmu_t mmu, pmap_t pmap, vm_offset_t start,
 	PMAP_LOCK(pmap);
 	while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) {
 		mmu_booke_enter_locked(mmu, pmap, start + ptoa(diff), m,
-		    prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE);
+		    prot & (VM_PROT_READ | VM_PROT_EXECUTE),
+		    PMAP_ENTER_NOSLEEP, 0);
 		m = TAILQ_NEXT(m, listq);
 	}
 	rw_wunlock(&pvh_global_lock);
@@ -1790,7 +1811,8 @@ mmu_booke_enter_quick(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m,
 	rw_wlock(&pvh_global_lock);
 	PMAP_LOCK(pmap);
 	mmu_booke_enter_locked(mmu, pmap, va, m,
-	    prot & (VM_PROT_READ | VM_PROT_EXECUTE), FALSE);
+	    prot & (VM_PROT_READ | VM_PROT_EXECUTE), PMAP_ENTER_NOSLEEP,
+	    0);
 	rw_wunlock(&pvh_global_lock);
 	PMAP_UNLOCK(pmap);
 }
@@ -2074,7 +2096,7 @@ mmu_booke_sync_icache(mmu_t mmu, pmap_t pm, vm_offset_t va, vm_size_t sz)
 				m = PHYS_TO_VM_PAGE(pa);
 				PMAP_LOCK(pmap);
 				pte_enter(mmu, pmap, m, addr,
-				    PTE_SR | PTE_VALID | PTE_UR);
+				    PTE_SR | PTE_VALID | PTE_UR, FALSE);
 				__syncicache((void *)addr, PAGE_SIZE);
 				pte_remove(mmu, pmap, addr, PTBL_UNHOLD);
 				PMAP_UNLOCK(pmap);
@@ -2410,28 +2432,33 @@ mmu_booke_ts_referenced(mmu_t mmu, vm_page_t m)
 }
 
 /*
- * Change wiring attribute for a map/virtual-address pair.
+ * Clear the wired attribute from the mappings for the specified range of
+ * addresses in the given pmap.  Every valid mapping within that range must
+ * have the wired attribute set.  In contrast, invalid mappings cannot have
+ * the wired attribute set, so they are ignored.
+ *
+ * The wired attribute of the page table entry is not a hardware feature, so
+ * there is no need to invalidate any TLB entries.
  */
 static void
-mmu_booke_change_wiring(mmu_t mmu, pmap_t pmap, vm_offset_t va, boolean_t wired)
+mmu_booke_unwire(mmu_t mmu, pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
+	vm_offset_t va;
 	pte_t *pte;
 
 	PMAP_LOCK(pmap);
-	if ((pte = pte_find(mmu, pmap, va)) != NULL) {
-		if (wired) {
-			if (!PTE_ISWIRED(pte)) {
-				pte->flags |= PTE_WIRED;
-				pmap->pm_stats.wired_count++;
-			}
-		} else {
-			if (PTE_ISWIRED(pte)) {
-				pte->flags &= ~PTE_WIRED;
-				pmap->pm_stats.wired_count--;
-			}
+	for (va = sva; va < eva; va += PAGE_SIZE) {
+		if ((pte = pte_find(mmu, pmap, va)) != NULL &&
+		    PTE_ISVALID(pte)) {
+			if (!PTE_ISWIRED(pte))
+				panic("mmu_booke_unwire: pte %p isn't wired",
+				    pte);
+			pte->flags &= ~PTE_WIRED;
+			pmap->pm_stats.wired_count--;
 		}
 	}
 	PMAP_UNLOCK(pmap);
+
 }
 
 /*
diff --git a/sys/powerpc/include/endian.h b/sys/powerpc/include/endian.h
index bfca169f58ec..1ce1d31f4e43 100644
--- a/sys/powerpc/include/endian.h
+++ b/sys/powerpc/include/endian.h
@@ -39,8 +39,13 @@
 /*
  * Define the order of 32-bit words in 64-bit words.
  */
+#ifdef __LITTLE_ENDIAN__
+#define	_QUAD_HIGHWORD 1
+#define	_QUAD_LOWWORD 0
+#else
 #define	_QUAD_HIGHWORD 0
 #define	_QUAD_LOWWORD 1
+#endif
 
 /*
  * GCC defines _BIG_ENDIAN and _LITTLE_ENDIAN equal to __BIG_ENDIAN__
@@ -131,9 +136,16 @@ __bswap64_var(__uint64_t _x)
 #define	__bswap64(x)	(__is_constant(x) ? __bswap64_const(x) : \
 	__bswap64_var(x))
 
+#ifdef __LITTLE_ENDIAN__
+#define	__htonl(x)	(__bswap32((__uint32_t)(x)))
+#define	__htons(x)	(__bswap16((__uint16_t)(x)))
+#define	__ntohl(x)	(__bswap32((__uint32_t)(x)))
+#define	__ntohs(x)	(__bswap16((__uint16_t)(x)))
+#else
 #define	__htonl(x)	((__uint32_t)(x))
 #define	__htons(x)	((__uint16_t)(x))
 #define	__ntohl(x)	((__uint32_t)(x))
 #define	__ntohs(x)	((__uint16_t)(x))
+#endif
 
 #endif /* !_MACHINE_ENDIAN_H_ */
diff --git a/sys/powerpc/include/pmap.h b/sys/powerpc/include/pmap.h
index 2c9c786d1176..663cd1adc6c6 100644
--- a/sys/powerpc/include/pmap.h
+++ b/sys/powerpc/include/pmap.h
@@ -112,7 +112,6 @@ RB_PROTOTYPE(pvo_tree, pvo_entry, pvo_plink, pvo_vaddr_compare);
 #define	PVO_PTEGIDX_VALID	0x008UL		/* slot is valid */
 #define	PVO_WIRED		0x010UL		/* PVO entry is wired */
 #define	PVO_MANAGED		0x020UL		/* PVO entry is managed */
-#define	PVO_EXECUTABLE		0x040UL		/* PVO entry is executable */
 #define	PVO_BOOTSTRAP		0x080UL		/* PVO entry allocated during
 						   bootstrap */
 #define PVO_LARGE		0x200UL		/* large page */
diff --git a/sys/powerpc/include/sf_buf.h b/sys/powerpc/include/sf_buf.h
deleted file mode 100644
index f8a5936f8054..000000000000
--- a/sys/powerpc/include/sf_buf.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, 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_SF_BUF_H_
-#define _MACHINE_SF_BUF_H_
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_page.h>
-#include <machine/md_var.h>
-#include <sys/queue.h>
-
-struct vm_page;
-
-struct sf_buf {
-	LIST_ENTRY(sf_buf) list_entry;	/* list of buffers */
-	TAILQ_ENTRY(sf_buf) free_entry;	/* list of buffers */
-	struct		vm_page *m;	/* currently mapped page */
-	vm_offset_t	kva;		/* va of mapping */
-	int		ref_count;	/* usage of this mapping */
-};
-
-struct sf_buf * sf_buf_alloc(struct vm_page *m, int flags);
-void sf_buf_free(struct sf_buf *sf);
-
-/*
- * On 32-bit OEA, the only purpose for which sf_buf is used is to implement
- * an opaque pointer required by the machine-independent parts of the kernel.
- * That pointer references the vm_page that is "mapped" by the sf_buf.  The
- * actual mapping is provided by the direct virtual-to-physical mapping.  
- *
- * On OEA64 and Book-E, we need to do something a little more complicated. Use
- * the runtime-detected hw_direct_map to pick between the two cases. Our
- * friends in vm_machdep.c will do the same to ensure nothing gets confused.
- */
-
-static __inline vm_offset_t
-sf_buf_kva(struct sf_buf *sf)
-{
-	if (hw_direct_map)
-		return (VM_PAGE_TO_PHYS((vm_page_t)sf));
-
-	return (sf->kva);
-}
-
-static __inline struct vm_page *
-sf_buf_page(struct sf_buf *sf)
-{
-	if (hw_direct_map)
-		return ((vm_page_t)sf);
-
-	return (sf->m);
-}
-
-#endif /* !_MACHINE_SF_BUF_H_ */
diff --git a/sys/powerpc/include/spr.h b/sys/powerpc/include/spr.h
index b9fb3c19589b..a352025ac928 100644
--- a/sys/powerpc/include/spr.h
+++ b/sys/powerpc/include/spr.h
@@ -169,7 +169,8 @@
 #define	  IBM970MP		  0x0044
 #define	  IBM970GX		  0x0045
 #define	  IBMPOWER7PLUS		  0x004a
-#define	  IBMPOWER8		  0x004b
+#define	  IBMPOWER8E		  0x004b
+#define	  IBMPOWER8		  0x004d
 #define	  MPC860		  0x0050
 #define	  IBMCELLBE		  0x0070
 #define	  MPC8240		  0x0081
diff --git a/sys/powerpc/include/vmparam.h b/sys/powerpc/include/vmparam.h
index 2d50f94c9dcd..c46f3954bb50 100644
--- a/sys/powerpc/include/vmparam.h
+++ b/sys/powerpc/include/vmparam.h
@@ -197,4 +197,18 @@ struct pmap_physseg {
 
 #define	ZERO_REGION_SIZE	(64 * 1024)	/* 64KB */
 
+/*
+ * On 32-bit OEA, the only purpose for which sf_buf is used is to implement
+ * an opaque pointer required by the machine-independent parts of the kernel.
+ * That pointer references the vm_page that is "mapped" by the sf_buf.  The
+ * actual mapping is provided by the direct virtual-to-physical mapping.
+ *
+ * On OEA64 and Book-E, we need to do something a little more complicated. Use
+ * the runtime-detected hw_direct_map to pick between the two cases. Our
+ * friends in vm_machdep.c will do the same to ensure nothing gets confused.
+ */
+#define	SFBUF
+#define	SFBUF_NOMD
+#define	SFBUF_OPTIONAL_DIRECT_MAP	hw_direct_map
+ 
 #endif /* _MACHINE_VMPARAM_H_ */
diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c
index 99c8ca11dbe8..3a9f91326395 100644
--- a/sys/powerpc/powerpc/cpu.c
+++ b/sys/powerpc/powerpc/cpu.c
@@ -146,6 +146,9 @@ static const struct cputab models[] = {
         { "IBM POWER7+",	IBMPOWER7PLUS,	REVFMT_MAJMIN,
 	   PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU,
 	   NULL },
+        { "IBM POWER8E",	IBMPOWER8E,	REVFMT_MAJMIN,
+	   PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU,
+	   NULL },
         { "IBM POWER8",		IBMPOWER8,	REVFMT_MAJMIN,
 	   PPC_FEATURE_64 | PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_FPU,
 	   NULL },
diff --git a/sys/powerpc/powerpc/dump_machdep.c b/sys/powerpc/powerpc/dump_machdep.c
index 2de664c8d5de..14e2f0f8ae96 100644
--- a/sys/powerpc/powerpc/dump_machdep.c
+++ b/sys/powerpc/powerpc/dump_machdep.c
@@ -205,7 +205,7 @@ foreach_chunk(callback_t cb, void *arg)
 	return (seqnr);
 }
 
-void
+int
 dumpsys(struct dumperinfo *di)
 {
 	Elf_Ehdr ehdr;
@@ -299,7 +299,7 @@ dumpsys(struct dumperinfo *di)
 	/* Signal completion, signoff and exit stage left. */
 	dump_write(di, NULL, 0, 0, 0);
 	printf("\nDump complete\n");
-	return;
+	return (0);
 
  fail:
 	if (error < 0)
@@ -311,4 +311,5 @@ dumpsys(struct dumperinfo *di)
 		printf("\nDump failed. Partition too small.\n");
 	else
 		printf("\n** DUMP FAILED (ERROR %d) **\n", error);
+	return (error);
 }
diff --git a/sys/powerpc/powerpc/elf32_machdep.c b/sys/powerpc/powerpc/elf32_machdep.c
index dbe58df1573d..2c62df2b5dae 100644
--- a/sys/powerpc/powerpc/elf32_machdep.c
+++ b/sys/powerpc/powerpc/elf32_machdep.c
@@ -190,8 +190,7 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
        		addr = lookup(lf, symidx, 1);
 	       	if (addr == 0)
 	       		return -1;
-		addr += addend;
-	       	*where = addr;
+		*where = elf_relocaddr(lf, addr + addend);
 	       	break;
 
        	case R_PPC_ADDR16_LO: /* #lo(S) */
@@ -204,9 +203,8 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
 		 * are relative to relocbase. Detect this condition.
 		 */
 		if (addr > relocbase && addr <= (relocbase + addend))
-			addr = relocbase + addend;
-		else
-			addr += addend;
+			addr = relocbase;
+		addr = elf_relocaddr(lf, addr + addend);
 		*hwhere = addr & 0xffff;
 		break;
 
@@ -220,9 +218,8 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
 		 * are relative to relocbase. Detect this condition.
 		 */
 		if (addr > relocbase && addr <= (relocbase + addend))
-			addr = relocbase + addend;
-		else
-			addr += addend;
+			addr = relocbase;
+		addr = elf_relocaddr(lf, addr + addend);
 	       	*hwhere = ((addr >> 16) + ((addr & 0x8000) ? 1 : 0))
 		    & 0xffff;
 		break;
diff --git a/sys/powerpc/powerpc/mem.c b/sys/powerpc/powerpc/mem.c
index 08e1cce88cd1..358871cbd55f 100644
--- a/sys/powerpc/powerpc/mem.c
+++ b/sys/powerpc/powerpc/mem.c
@@ -179,22 +179,13 @@ memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
 {
 	int i;
 
-	/*
-	 * /dev/mem is the only one that makes sense through this
-	 * interface.  For /dev/kmem any physaddr we return here
-	 * could be transient and hence incorrect or invalid at
-	 * a later time.
-	 */
-	if (dev2unit(dev) != CDEV_MINOR_MEM)
-		return (-1);
-
-	/* Only direct-mapped addresses. */
-	if (mem_valid(offset, 0)
-	    && pmap_dev_direct_mapped(offset, 0))
+	if (dev2unit(dev) == CDEV_MINOR_MEM)
+		*paddr = offset;
+	else if (dev2unit(dev) == CDEV_MINOR_KMEM)
+		*paddr = vtophys(offset);
+	else
 		return (EFAULT);
 
-	*paddr = offset;
-
 	for (i = 0; i < mem_range_softc.mr_ndesc; i++) {
 		if (!(mem_range_softc.mr_desc[i].mr_flags & MDF_ACTIVE))
 			continue;
@@ -231,9 +222,7 @@ ppc_mrinit(struct mem_range_softc *sc)
 	sc->mr_cap = 0;
 	sc->mr_ndesc = 8; /* XXX: Should be dynamically expandable */
 	sc->mr_desc = malloc(sc->mr_ndesc * sizeof(struct mem_range_desc),
-	    M_MEMDESC, M_NOWAIT | M_ZERO);
-	if (sc->mr_desc == NULL)
-		panic("%s: malloc returns NULL", __func__);
+	    M_MEMDESC, M_WAITOK | M_ZERO);
 }
 
 static int
@@ -328,3 +317,4 @@ memioctl(struct cdev *dev __unused, u_long cmd, caddr_t data, int flags,
 	}
 	return (error);
 }
+
diff --git a/sys/powerpc/powerpc/mmu_if.m b/sys/powerpc/powerpc/mmu_if.m
index 67222a5e3241..5c44b71f069a 100644
--- a/sys/powerpc/powerpc/mmu_if.m
+++ b/sys/powerpc/powerpc/mmu_if.m
@@ -151,22 +151,6 @@ METHOD void advise {
 };
 
 
-/**
- * @brief Change the wiring attribute for the page in the given physical
- * map and virtual address.
- *
- * @param _pmap		physical map of page
- * @param _va		page virtual address
- * @param _wired	TRUE to increment wired count, FALSE to decrement
- */
-METHOD void change_wiring {
-	mmu_t		_mmu;
-	pmap_t		_pmap;
-	vm_offset_t	_va;
-	boolean_t	_wired;
-};
-
-
 /**
  * @brief Clear the 'modified' bit on the given physical page
  *
@@ -240,15 +224,17 @@ METHOD void copy_pages {
  * @param _va		mapping virtual address
  * @param _p		mapping physical page
  * @param _prot		mapping page protection
- * @param _wired	TRUE if page will be wired
+ * @param _flags	pmap_enter flags
+ * @param _psind	superpage size index
  */
-METHOD void enter {
+METHOD int enter {
 	mmu_t		_mmu;
 	pmap_t		_pmap;
 	vm_offset_t	_va;
 	vm_page_t	_p;
 	vm_prot_t	_prot;
-	boolean_t	_wired;
+	u_int		_flags;
+	int8_t		_psind;
 };
 
 
@@ -627,6 +613,22 @@ METHOD void remove_pages {
 } DEFAULT mmu_null_remove_pages;
 
 
+/**
+ * @brief Clear the wired attribute from the mappings for the specified range
+ * of addresses in the given pmap.
+ *
+ * @param _pmap		physical map
+ * @param _start	virtual range start
+ * @param _end		virtual range end
+ */
+METHOD void unwire {
+	mmu_t		_mmu;
+	pmap_t		_pmap;
+	vm_offset_t	_start;
+	vm_offset_t	_end;
+};
+
+
 /**
  * @brief Zero a physical page. It is not assumed that the page is mapped,
  * so a temporary (or direct) mapping may need to be used.
diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c
index 773ede1cd0b0..7f3f913b2249 100644
--- a/sys/powerpc/powerpc/pmap_dispatch.c
+++ b/sys/powerpc/powerpc/pmap_dispatch.c
@@ -99,14 +99,6 @@ pmap_advise(pmap_t pmap, vm_offset_t start, vm_offset_t end, int advice)
 	MMU_ADVISE(mmu_obj, pmap, start, end, advice);
 }
 
-void
-pmap_change_wiring(pmap_t pmap, vm_offset_t va, boolean_t wired)
-{
-
-	CTR4(KTR_PMAP, "%s(%p, %#x, %u)", __func__, pmap, va, wired);
-	MMU_CHANGE_WIRING(mmu_obj, pmap, va, wired);
-}
-
 void
 pmap_clear_modify(vm_page_t m)
 {
@@ -143,14 +135,14 @@ pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset, vm_page_t mb[],
 	MMU_COPY_PAGES(mmu_obj, ma, a_offset, mb, b_offset, xfersize);
 }
 
-void
-pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t p,
-    vm_prot_t prot, boolean_t wired)
+int
+pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t p, vm_prot_t prot,
+    u_int flags, int8_t psind)
 {
 
-	CTR6(KTR_PMAP, "pmap_enter(%p, %#x, %#x, %p, %#x, %u)", pmap, va,
-	    access, p, prot, wired);
-	MMU_ENTER(mmu_obj, pmap, va, p, prot, wired);
+	CTR6(KTR_PMAP, "pmap_enter(%p, %#x, %p, %#x, %x, %d)", pmap, va,
+	    p, prot, flags, psind);
+	return (MMU_ENTER(mmu_obj, pmap, va, p, prot, flags, psind));
 }
 
 void
@@ -360,6 +352,14 @@ pmap_remove_write(vm_page_t m)
 	MMU_REMOVE_WRITE(mmu_obj, m);
 }
 
+void
+pmap_unwire(pmap_t pmap, vm_offset_t start, vm_offset_t end)
+{
+
+	CTR4(KTR_PMAP, "%s(%p, %#x, %#x)", __func__, pmap, start, end);
+	MMU_UNWIRE(mmu_obj, pmap, start, end);
+}
+
 void
 pmap_zero_page(vm_page_t m)
 {
diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
index d9d3987c23a2..d6840947f0f8 100644
--- a/sys/powerpc/powerpc/vm_machdep.c
+++ b/sys/powerpc/powerpc/vm_machdep.c
@@ -80,7 +80,6 @@
 #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>
@@ -100,47 +99,6 @@
 #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
@@ -244,124 +202,6 @@ cpu_exit(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);
-}
-
-/*
- * Detach 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.
  */
diff --git a/sys/powerpc/ps3/platform_ps3.c b/sys/powerpc/ps3/platform_ps3.c
index c772a8db3709..94df37db6035 100644
--- a/sys/powerpc/ps3/platform_ps3.c
+++ b/sys/powerpc/ps3/platform_ps3.c
@@ -110,14 +110,6 @@ ps3_probe(platform_t plat)
 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;
@@ -152,6 +144,11 @@ ps3_mem_regions(platform_t plat, struct mem_region *phys, int *physsz,
 	/* 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);
+
+	/* Allocate extended memory region */
+	lv1_allocate_memory(avail_regions[1].mr_size, 24 /* 16 MB pages */,
+	    0, 0x04 /* any address */, &avail_regions[1].mr_start, &junk);
+
 	*availsz = 2;
 
 	if (phys != NULL) {
diff --git a/sys/powerpc/ps3/ps3_syscons.c b/sys/powerpc/ps3/ps3_syscons.c
index 032653bdc8b8..3b1aea9dc870 100644
--- a/sys/powerpc/ps3/ps3_syscons.c
+++ b/sys/powerpc/ps3/ps3_syscons.c
@@ -77,7 +77,8 @@ static struct vt_driver vt_ps3fb_driver = {
 	.vd_init = ps3fb_init,
 	.vd_blank = vt_fb_blank,
 	.vd_bitbltchr = vt_fb_bitbltchr,
-	.vd_maskbitbltchr = vt_fb_maskbitbltchr,
+	.vd_fb_ioctl = vt_fb_ioctl,
+	.vd_fb_mmap = vt_fb_mmap,
 	/* Better than VGA, but still generic driver. */
 	.vd_priority = VD_PRIORITY_GENERIC + 1,
 };
@@ -177,8 +178,8 @@ ps3fb_init(struct vt_device *vd)
 	sc->fb_info.fb_vbase = 0x10000000;
 
 	/* 32-bit VGA palette */
-	vt_generate_vga_palette(sc->fb_info.fb_cmap, COLOR_FORMAT_RGB,
-	    255, 16, 255, 8, 255, 0);
+	vt_generate_cons_palette(sc->fb_info.fb_cmap, COLOR_FORMAT_RGB,
+	    255, 0, 255, 8, 255, 16);
 
 	/* Set correct graphics context */
 	lv1_gpu_context_attribute(sc->sc_fbcontext,
@@ -186,11 +187,8 @@ ps3fb_init(struct vt_device *vd)
 	lv1_gpu_context_attribute(sc->sc_fbcontext,
 	    L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_FLIP, 1, 0, 0, 0);
 
-	fb_probe(&sc->fb_info);
 	vt_fb_init(vd);
-
-	/* Clear the screen. */
-	vt_fb_blank(vd, TC_BLACK);
+	sc->fb_info.fb_flags &= ~FB_FLAG_NOMMAP; /* Set wrongly by vt_fb_init */
 
 	return (CN_INTERNAL);
 }
diff --git a/sys/rpc/clnt_bck.c b/sys/rpc/clnt_bck.c
new file mode 100644
index 000000000000..b63b2b15ba44
--- /dev/null
+++ b/sys/rpc/clnt_bck.c
@@ -0,0 +1,593 @@
+/*	$NetBSD: clnt_vc.c,v 1.4 2000/07/14 08:40:42 fvdl Exp $	*/
+
+/*-
+ * 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.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char *sccsid2 = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
+static char *sccsid = "@(#)clnt_tcp.c	2.2 88/08/01 4.0 RPCSRC";
+static char sccsid3[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+ 
+/*
+ * clnt_tcp.c, Implements a TCP/IP based, client side RPC.
+ *
+ * Copyright (C) 1984, Sun Microsystems, Inc.
+ *
+ * TCP based RPC supports 'batched calls'.
+ * A sequence of calls may be batched-up in a send buffer.  The rpc call
+ * return immediately to the client even though the call was not necessarily
+ * sent.  The batching occurs if the results' xdr routine is NULL (0) AND
+ * the rpc timeout value is zero (see clnt.h, rpc).
+ *
+ * Clients should NOT casually batch calls that in fact return results; that is,
+ * the server side should be aware that a call is batched and not produce any
+ * return message.  Batched calls that produce many result messages can
+ * deadlock (netlock) the client and the server....
+ *
+ * Now go hang yourself.
+ */
+
+/*
+ * This code handles the special case of a NFSv4.n backchannel for
+ * callback RPCs. It is similar to clnt_vc.c, but uses the TCP
+ * connection provided by the client to the server.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/mutex.h>
+#include <sys/pcpu.h>
+#include <sys/proc.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/sx.h>
+#include <sys/syslog.h>
+#include <sys/time.h>
+#include <sys/uio.h>
+
+#include <net/vnet.h>
+
+#include <netinet/tcp.h>
+
+#include <rpc/rpc.h>
+#include <rpc/rpc_com.h>
+#include <rpc/krpc.h>
+
+struct cmessage {
+        struct cmsghdr cmsg;
+        struct cmsgcred cmcred;
+};
+
+static void clnt_bck_geterr(CLIENT *, struct rpc_err *);
+static bool_t clnt_bck_freeres(CLIENT *, xdrproc_t, void *);
+static void clnt_bck_abort(CLIENT *);
+static bool_t clnt_bck_control(CLIENT *, u_int, void *);
+static void clnt_bck_close(CLIENT *);
+static void clnt_bck_destroy(CLIENT *);
+
+static struct clnt_ops clnt_bck_ops = {
+	.cl_abort =	clnt_bck_abort,
+	.cl_geterr =	clnt_bck_geterr,
+	.cl_freeres =	clnt_bck_freeres,
+	.cl_close =	clnt_bck_close,
+	.cl_destroy =	clnt_bck_destroy,
+	.cl_control =	clnt_bck_control
+};
+
+/*
+ * Create a client handle for a connection.
+ * Default options are set, which the user can change using clnt_control()'s.
+ * This code handles the special case of an NFSv4.1 session backchannel
+ * call, which is sent on a TCP connection created against the server
+ * by a client.
+ */
+void *
+clnt_bck_create(
+	struct socket *so,		/* Server transport socket. */
+	const rpcprog_t prog,		/* program number */
+	const rpcvers_t vers)		/* version number */
+{
+	CLIENT *cl;			/* client handle */
+	struct ct_data *ct = NULL;	/* client handle */
+	struct timeval now;
+	struct rpc_msg call_msg;
+	static uint32_t disrupt;
+	XDR xdrs;
+
+	if (disrupt == 0)
+		disrupt = (uint32_t)(long)so;
+
+	cl = (CLIENT *)mem_alloc(sizeof (*cl));
+	ct = (struct ct_data *)mem_alloc(sizeof (*ct));
+
+	mtx_init(&ct->ct_lock, "ct->ct_lock", NULL, MTX_DEF);
+	ct->ct_threads = 0;
+	ct->ct_closing = FALSE;
+	ct->ct_closed = FALSE;
+	ct->ct_upcallrefs = 0;
+	ct->ct_closeit = FALSE;
+
+	/*
+	 * Set up private data struct
+	 */
+	ct->ct_wait.tv_sec = -1;
+	ct->ct_wait.tv_usec = -1;
+
+	/*
+	 * Initialize call message
+	 */
+	getmicrotime(&now);
+	ct->ct_xid = ((uint32_t)++disrupt) ^ __RPC_GETXID(&now);
+	call_msg.rm_xid = ct->ct_xid;
+	call_msg.rm_direction = CALL;
+	call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
+	call_msg.rm_call.cb_prog = (uint32_t)prog;
+	call_msg.rm_call.cb_vers = (uint32_t)vers;
+
+	/*
+	 * pre-serialize the static part of the call msg and stash it away
+	 */
+	xdrmem_create(&xdrs, ct->ct_mcallc, MCALL_MSG_SIZE,
+	    XDR_ENCODE);
+	if (!xdr_callhdr(&xdrs, &call_msg))
+		goto err;
+	ct->ct_mpos = XDR_GETPOS(&xdrs);
+	XDR_DESTROY(&xdrs);
+	ct->ct_waitchan = "rpcbck";
+	ct->ct_waitflag = 0;
+	cl->cl_refs = 1;
+	cl->cl_ops = &clnt_bck_ops;
+	cl->cl_private = ct;
+	cl->cl_auth = authnone_create();
+	TAILQ_INIT(&ct->ct_pending);
+	return (cl);
+
+err:
+	if (cl) {
+		if (ct) {
+			mtx_destroy(&ct->ct_lock);
+			mem_free(ct, sizeof (struct ct_data));
+		}
+		if (cl)
+			mem_free(cl, sizeof (CLIENT));
+	}
+	return (NULL);
+}
+
+enum clnt_stat
+clnt_bck_call(
+	CLIENT		*cl,		/* client handle */
+	struct rpc_callextra *ext,	/* call metadata */
+	rpcproc_t	proc,		/* procedure number */
+	struct mbuf	*args,		/* pointer to args */
+	struct mbuf	**resultsp,	/* pointer to results */
+	struct timeval	utimeout,
+	SVCXPRT		*xprt)
+{
+	struct ct_data *ct = (struct ct_data *) cl->cl_private;
+	AUTH *auth;
+	struct rpc_err *errp;
+	enum clnt_stat stat;
+	XDR xdrs;
+	struct rpc_msg reply_msg;
+	bool_t ok;
+	int nrefreshes = 2;		/* number of times to refresh cred */
+	struct timeval timeout;
+	uint32_t xid;
+	struct mbuf *mreq = NULL, *results;
+	struct ct_request *cr;
+	int error;
+
+	cr = malloc(sizeof(struct ct_request), M_RPC, M_WAITOK);
+
+	mtx_lock(&ct->ct_lock);
+
+	if (ct->ct_closing || ct->ct_closed) {
+		mtx_unlock(&ct->ct_lock);
+		free(cr, M_RPC);
+		return (RPC_CANTSEND);
+	}
+	ct->ct_threads++;
+
+	if (ext) {
+		auth = ext->rc_auth;
+		errp = &ext->rc_err;
+	} else {
+		auth = cl->cl_auth;
+		errp = &ct->ct_error;
+	}
+
+	cr->cr_mrep = NULL;
+	cr->cr_error = 0;
+
+	if (ct->ct_wait.tv_usec == -1)
+		timeout = utimeout;	/* use supplied timeout */
+	else
+		timeout = ct->ct_wait;	/* use default timeout */
+
+call_again:
+	mtx_assert(&ct->ct_lock, MA_OWNED);
+
+	ct->ct_xid++;
+	xid = ct->ct_xid;
+
+	mtx_unlock(&ct->ct_lock);
+
+	/*
+	 * Leave space to pre-pend the record mark.
+	 */
+	mreq = m_gethdr(M_WAITOK, MT_DATA);
+	mreq->m_data += sizeof(uint32_t);
+	KASSERT(ct->ct_mpos + sizeof(uint32_t) <= MHLEN,
+	    ("RPC header too big"));
+	bcopy(ct->ct_mcallc, mreq->m_data, ct->ct_mpos);
+	mreq->m_len = ct->ct_mpos;
+
+	/*
+	 * The XID is the first thing in the request.
+	 */
+	*mtod(mreq, uint32_t *) = htonl(xid);
+
+	xdrmbuf_create(&xdrs, mreq, XDR_ENCODE);
+
+	errp->re_status = stat = RPC_SUCCESS;
+
+	if ((!XDR_PUTINT32(&xdrs, &proc)) ||
+	    (!AUTH_MARSHALL(auth, xid, &xdrs,
+	     m_copym(args, 0, M_COPYALL, M_WAITOK)))) {
+		errp->re_status = stat = RPC_CANTENCODEARGS;
+		mtx_lock(&ct->ct_lock);
+		goto out;
+	}
+	mreq->m_pkthdr.len = m_length(mreq, NULL);
+
+	/*
+	 * Prepend a record marker containing the packet length.
+	 */
+	M_PREPEND(mreq, sizeof(uint32_t), M_WAITOK);
+	*mtod(mreq, uint32_t *) =
+	    htonl(0x80000000 | (mreq->m_pkthdr.len - sizeof(uint32_t)));
+
+	cr->cr_xid = xid;
+	mtx_lock(&ct->ct_lock);
+	/*
+	 * Check to see if the client end has already started to close down
+	 * the connection. The svc code will have set ct_error.re_status
+	 * to RPC_CANTRECV if this is the case.
+	 * If the client starts to close down the connection after this
+	 * point, it will be detected later when cr_error is checked,
+	 * since the request is in the ct_pending queue.
+	 */
+	if (ct->ct_error.re_status == RPC_CANTRECV) {
+		if (errp != &ct->ct_error) {
+			errp->re_errno = ct->ct_error.re_errno;
+			errp->re_status = RPC_CANTRECV;
+		}
+		stat = RPC_CANTRECV;
+		goto out;
+	}
+	TAILQ_INSERT_TAIL(&ct->ct_pending, cr, cr_link);
+	mtx_unlock(&ct->ct_lock);
+
+	/*
+	 * sosend consumes mreq.
+	 */
+	sx_xlock(&xprt->xp_lock);
+	error = sosend(xprt->xp_socket, NULL, NULL, mreq, NULL, 0, curthread);
+if (error != 0) printf("sosend=%d\n", error);
+	mreq = NULL;
+	if (error == EMSGSIZE) {
+printf("emsgsize\n");
+		SOCKBUF_LOCK(&xprt->xp_socket->so_snd);
+		sbwait(&xprt->xp_socket->so_snd);
+		SOCKBUF_UNLOCK(&xprt->xp_socket->so_snd);
+		sx_xunlock(&xprt->xp_lock);
+		AUTH_VALIDATE(auth, xid, NULL, NULL);
+		mtx_lock(&ct->ct_lock);
+		TAILQ_REMOVE(&ct->ct_pending, cr, cr_link);
+		goto call_again;
+	}
+	sx_xunlock(&xprt->xp_lock);
+
+	reply_msg.acpted_rply.ar_verf.oa_flavor = AUTH_NULL;
+	reply_msg.acpted_rply.ar_verf.oa_base = cr->cr_verf;
+	reply_msg.acpted_rply.ar_verf.oa_length = 0;
+	reply_msg.acpted_rply.ar_results.where = NULL;
+	reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
+
+	mtx_lock(&ct->ct_lock);
+	if (error) {
+		TAILQ_REMOVE(&ct->ct_pending, cr, cr_link);
+		errp->re_errno = error;
+		errp->re_status = stat = RPC_CANTSEND;
+		goto out;
+	}
+
+	/*
+	 * Check to see if we got an upcall while waiting for the
+	 * lock. In both these cases, the request has been removed
+	 * from ct->ct_pending.
+	 */
+	if (cr->cr_error) {
+		TAILQ_REMOVE(&ct->ct_pending, cr, cr_link);
+		errp->re_errno = cr->cr_error;
+		errp->re_status = stat = RPC_CANTRECV;
+		goto out;
+	}
+	if (cr->cr_mrep) {
+		TAILQ_REMOVE(&ct->ct_pending, cr, cr_link);
+		goto got_reply;
+	}
+
+	/*
+	 * Hack to provide rpc-based message passing
+	 */
+	if (timeout.tv_sec == 0 && timeout.tv_usec == 0) {
+		TAILQ_REMOVE(&ct->ct_pending, cr, cr_link);
+		errp->re_status = stat = RPC_TIMEDOUT;
+		goto out;
+	}
+
+	error = msleep(cr, &ct->ct_lock, ct->ct_waitflag, ct->ct_waitchan,
+	    tvtohz(&timeout));
+
+	TAILQ_REMOVE(&ct->ct_pending, cr, cr_link);
+
+	if (error) {
+		/*
+		 * The sleep returned an error so our request is still
+		 * on the list. Turn the error code into an
+		 * appropriate client status.
+		 */
+		errp->re_errno = error;
+		switch (error) {
+		case EINTR:
+			stat = RPC_INTR;
+			break;
+		case EWOULDBLOCK:
+			stat = RPC_TIMEDOUT;
+			break;
+		default:
+			stat = RPC_CANTRECV;
+		};
+		errp->re_status = stat;
+		goto out;
+	} else {
+		/*
+		 * We were woken up by the svc thread.  If the
+		 * upcall had a receive error, report that,
+		 * otherwise we have a reply.
+		 */
+		if (cr->cr_error) {
+			errp->re_errno = cr->cr_error;
+			errp->re_status = stat = RPC_CANTRECV;
+			goto out;
+		}
+	}
+
+got_reply:
+	/*
+	 * Now decode and validate the response. We need to drop the
+	 * lock since xdr_replymsg may end up sleeping in malloc.
+	 */
+	mtx_unlock(&ct->ct_lock);
+
+	if (ext && ext->rc_feedback)
+		ext->rc_feedback(FEEDBACK_OK, proc, ext->rc_feedback_arg);
+
+	xdrmbuf_create(&xdrs, cr->cr_mrep, XDR_DECODE);
+	ok = xdr_replymsg(&xdrs, &reply_msg);
+	cr->cr_mrep = NULL;
+
+	if (ok) {
+		if ((reply_msg.rm_reply.rp_stat == MSG_ACCEPTED) &&
+		    (reply_msg.acpted_rply.ar_stat == SUCCESS))
+			errp->re_status = stat = RPC_SUCCESS;
+		else
+			stat = _seterr_reply(&reply_msg, errp);
+
+		if (stat == RPC_SUCCESS) {
+			results = xdrmbuf_getall(&xdrs);
+			if (!AUTH_VALIDATE(auth, xid,
+			    &reply_msg.acpted_rply.ar_verf, &results)) {
+				errp->re_status = stat = RPC_AUTHERROR;
+				errp->re_why = AUTH_INVALIDRESP;
+			} else {
+				KASSERT(results,
+				    ("auth validated but no result"));
+				*resultsp = results;
+			}
+		}		/* end successful completion */
+		/*
+		 * If unsuccesful AND error is an authentication error
+		 * then refresh credentials and try again, else break
+		 */
+		else if (stat == RPC_AUTHERROR)
+			/* maybe our credentials need to be refreshed ... */
+			if (nrefreshes > 0 && AUTH_REFRESH(auth, &reply_msg)) {
+				nrefreshes--;
+				XDR_DESTROY(&xdrs);
+				mtx_lock(&ct->ct_lock);
+				goto call_again;
+			}
+			/* end of unsuccessful completion */
+		/* end of valid reply message */
+	} else
+		errp->re_status = stat = RPC_CANTDECODERES;
+	XDR_DESTROY(&xdrs);
+	mtx_lock(&ct->ct_lock);
+out:
+	mtx_assert(&ct->ct_lock, MA_OWNED);
+
+	KASSERT(stat != RPC_SUCCESS || *resultsp,
+	    ("RPC_SUCCESS without reply"));
+
+	if (mreq != NULL)
+		m_freem(mreq);
+	if (cr->cr_mrep != NULL)
+		m_freem(cr->cr_mrep);
+
+	ct->ct_threads--;
+	if (ct->ct_closing)
+		wakeup(ct);
+		
+	mtx_unlock(&ct->ct_lock);
+
+	if (auth && stat != RPC_SUCCESS)
+		AUTH_VALIDATE(auth, xid, NULL, NULL);
+
+	free(cr, M_RPC);
+
+	return (stat);
+}
+
+static void
+clnt_bck_geterr(CLIENT *cl, struct rpc_err *errp)
+{
+	struct ct_data *ct = (struct ct_data *) cl->cl_private;
+
+	*errp = ct->ct_error;
+}
+
+static bool_t
+clnt_bck_freeres(CLIENT *cl, xdrproc_t xdr_res, void *res_ptr)
+{
+	XDR xdrs;
+	bool_t dummy;
+
+	xdrs.x_op = XDR_FREE;
+	dummy = (*xdr_res)(&xdrs, res_ptr);
+
+	return (dummy);
+}
+
+/*ARGSUSED*/
+static void
+clnt_bck_abort(CLIENT *cl)
+{
+}
+
+static bool_t
+clnt_bck_control(CLIENT *cl, u_int request, void *info)
+{
+
+	return (TRUE);
+}
+
+static void
+clnt_bck_close(CLIENT *cl)
+{
+	struct ct_data *ct = (struct ct_data *) cl->cl_private;
+
+	mtx_lock(&ct->ct_lock);
+
+	if (ct->ct_closed) {
+		mtx_unlock(&ct->ct_lock);
+		return;
+	}
+
+	if (ct->ct_closing) {
+		while (ct->ct_closing)
+			msleep(ct, &ct->ct_lock, 0, "rpcclose", 0);
+		KASSERT(ct->ct_closed, ("client should be closed"));
+		mtx_unlock(&ct->ct_lock);
+		return;
+	}
+
+	ct->ct_closing = FALSE;
+	ct->ct_closed = TRUE;
+	mtx_unlock(&ct->ct_lock);
+	wakeup(ct);
+}
+
+static void
+clnt_bck_destroy(CLIENT *cl)
+{
+	struct ct_data *ct = (struct ct_data *) cl->cl_private;
+
+	clnt_bck_close(cl);
+
+	mtx_destroy(&ct->ct_lock);
+	mem_free(ct, sizeof(struct ct_data));
+	if (cl->cl_netid && cl->cl_netid[0])
+		mem_free(cl->cl_netid, strlen(cl->cl_netid) +1);
+	if (cl->cl_tp && cl->cl_tp[0])
+		mem_free(cl->cl_tp, strlen(cl->cl_tp) +1);
+	mem_free(cl, sizeof(CLIENT));
+}
+
+/*
+ * This call is done by the svc code when a backchannel RPC reply is
+ * received.
+ */
+void
+clnt_bck_svccall(void *arg, struct mbuf *mrep, uint32_t xid)
+{
+	struct ct_data *ct = (struct ct_data *)arg;
+	struct ct_request *cr;
+	int foundreq;
+
+	mtx_lock(&ct->ct_lock);
+	ct->ct_upcallrefs++;
+	/*
+	 * See if we can match this reply to a request.
+	 */
+	foundreq = 0;
+	TAILQ_FOREACH(cr, &ct->ct_pending, cr_link) {
+		if (cr->cr_xid == xid) {
+			/*
+			 * This one matches. We leave the reply mbuf list in
+			 * cr->cr_mrep. Set the XID to zero so that we will
+			 * ignore any duplicated replies.
+			 */
+			cr->cr_xid = 0;
+			cr->cr_mrep = mrep;
+			cr->cr_error = 0;
+			foundreq = 1;
+			wakeup(cr);
+			break;
+		}
+	}
+
+	ct->ct_upcallrefs--;
+	if (ct->ct_upcallrefs < 0)
+		panic("rpcvc svccall refcnt");
+	if (ct->ct_upcallrefs == 0)
+		wakeup(&ct->ct_upcallrefs);
+	mtx_unlock(&ct->ct_lock);
+	if (foundreq == 0)
+		m_freem(mrep);
+}
+
diff --git a/sys/rpc/krpc.h b/sys/rpc/krpc.h
index 280860b652ee..2e61b3cdf5ee 100644
--- a/sys/rpc/krpc.h
+++ b/sys/rpc/krpc.h
@@ -37,6 +37,10 @@
  */
 #define MCALL_MSG_SIZE 24
 
+void clnt_bck_svccall(void *, struct mbuf *, uint32_t);
+enum clnt_stat clnt_bck_call(CLIENT *, struct rpc_callextra *, rpcproc_t,
+    struct mbuf *, struct mbuf **, struct timeval, SVCXPRT *);
+
 /*
  * A pending RPC request which awaits a reply. Requests which have
  * received their reply will have cr_xid set to zero and cr_mrep to
diff --git a/sys/rpc/svc.h b/sys/rpc/svc.h
index 4f2c853ea993..1c7bbce009e8 100644
--- a/sys/rpc/svc.h
+++ b/sys/rpc/svc.h
@@ -145,6 +145,7 @@ struct __rpc_svcthread;
  * Server side transport handle. In the kernel, transports have a
  * reference count which tracks the number of currently assigned
  * worker threads plus one for the service pool's reference.
+ * For NFSv4.1 sessions, a reference is also held for a backchannel.
  */
 typedef struct __rpc_svcxprt {
 #ifdef _KERNEL
@@ -774,6 +775,13 @@ extern SVCXPRT *svc_vc_create(SVCPOOL *, struct socket *,
 
 extern SVCXPRT *svc_vc_create_backchannel(SVCPOOL *);
 
+extern void *clnt_bck_create(struct socket *, const rpcprog_t, const rpcvers_t);
+	/*
+	 * struct socket *;			-- server transport socket
+	 * const rpcprog_t prog;		-- RPC program number
+	 * const rpcvers_t vers;		-- RPC program version
+	 */
+
 /*
  * Generic TLI create routine
  */
diff --git a/sys/rpc/svc_vc.c b/sys/rpc/svc_vc.c
index 5fe6488a36bb..df1d86e045cd 100644
--- a/sys/rpc/svc_vc.c
+++ b/sys/rpc/svc_vc.c
@@ -654,6 +654,7 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_msg *msg,
 	struct socket* so = xprt->xp_socket;
 	XDR xdrs;
 	int error, rcvflag;
+	uint32_t xid_plus_direction[2];
 
 	/*
 	 * Serialise access to the socket and our own record parsing
@@ -672,6 +673,32 @@ svc_vc_recv(SVCXPRT *xprt, struct rpc_msg *msg,
 		/* Process and return complete request in cd->mreq. */
 		if (cd->mreq != NULL && cd->resid == 0 && cd->eor) {
 
+			/*
+			 * Now, check for a backchannel reply.
+			 * The XID is in the first uint32_t of the reply
+			 * and the message direction is the second one.
+			 */
+			if ((cd->mreq->m_len >= sizeof(xid_plus_direction) ||
+			    m_length(cd->mreq, NULL) >=
+			    sizeof(xid_plus_direction)) &&
+			    xprt->xp_p2 != NULL) {
+				m_copydata(cd->mreq, 0,
+				    sizeof(xid_plus_direction),
+				    (char *)xid_plus_direction);
+				xid_plus_direction[0] =
+				    ntohl(xid_plus_direction[0]);
+				xid_plus_direction[1] =
+				    ntohl(xid_plus_direction[1]);
+				/* Check message direction. */
+				if (xid_plus_direction[1] == REPLY) {
+					clnt_bck_svccall(xprt->xp_p2,
+					    cd->mreq,
+					    xid_plus_direction[0]);
+					cd->mreq = NULL;
+					continue;
+				}
+			}
+
 			xdrmbuf_create(&xdrs, cd->mreq, XDR_DECODE);
 			cd->mreq = NULL;
 
@@ -848,7 +875,6 @@ svc_vc_reply(SVCXPRT *xprt, struct rpc_msg *msg,
 	}
 
 	XDR_DESTROY(&xdrs);
-	xprt->xp_p2 = NULL;
 
 	return (stat);
 }
diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c
index 375b8a3eb795..b5bf8c32dbef 100644
--- a/sys/security/mac_biba/mac_biba.c
+++ b/sys/security/mac_biba/mac_biba.c
@@ -100,43 +100,36 @@ SYSCTL_INT(_security_mac_biba, OID_AUTO, label_size, CTLFLAG_RD,
     &biba_label_size, 0, "Size of struct mac_biba");
 
 static int	biba_enabled = 1;
-SYSCTL_INT(_security_mac_biba, OID_AUTO, enabled, CTLFLAG_RW, &biba_enabled,
+SYSCTL_INT(_security_mac_biba, OID_AUTO, enabled, CTLFLAG_RWTUN, &biba_enabled,
     0, "Enforce MAC/Biba policy");
-TUNABLE_INT("security.mac.biba.enabled", &biba_enabled);
 
 static int	destroyed_not_inited;
 SYSCTL_INT(_security_mac_biba, OID_AUTO, destroyed_not_inited, CTLFLAG_RD,
     &destroyed_not_inited, 0, "Count of labels destroyed but not inited");
 
 static int	trust_all_interfaces = 0;
-SYSCTL_INT(_security_mac_biba, OID_AUTO, trust_all_interfaces, CTLFLAG_RD,
+SYSCTL_INT(_security_mac_biba, OID_AUTO, trust_all_interfaces, CTLFLAG_RDTUN,
     &trust_all_interfaces, 0, "Consider all interfaces 'trusted' by MAC/Biba");
-TUNABLE_INT("security.mac.biba.trust_all_interfaces", &trust_all_interfaces);
 
 static char	trusted_interfaces[128];
-SYSCTL_STRING(_security_mac_biba, OID_AUTO, trusted_interfaces, CTLFLAG_RD,
+SYSCTL_STRING(_security_mac_biba, OID_AUTO, trusted_interfaces, CTLFLAG_RDTUN,
     trusted_interfaces, 0, "Interfaces considered 'trusted' by MAC/Biba");
-TUNABLE_STR("security.mac.biba.trusted_interfaces", trusted_interfaces,
-    sizeof(trusted_interfaces));
 
 static int	max_compartments = MAC_BIBA_MAX_COMPARTMENTS;
 SYSCTL_INT(_security_mac_biba, OID_AUTO, max_compartments, CTLFLAG_RD,
     &max_compartments, 0, "Maximum supported compartments");
 
 static int	ptys_equal = 0;
-SYSCTL_INT(_security_mac_biba, OID_AUTO, ptys_equal, CTLFLAG_RW, &ptys_equal,
+SYSCTL_INT(_security_mac_biba, OID_AUTO, ptys_equal, CTLFLAG_RWTUN, &ptys_equal,
     0, "Label pty devices as biba/equal on create");
-TUNABLE_INT("security.mac.biba.ptys_equal", &ptys_equal);
 
 static int	interfaces_equal = 1;
-SYSCTL_INT(_security_mac_biba, OID_AUTO, interfaces_equal, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_biba, OID_AUTO, interfaces_equal, CTLFLAG_RWTUN,
     &interfaces_equal, 0, "Label network interfaces as biba/equal on create");
-TUNABLE_INT("security.mac.biba.interfaces_equal", &interfaces_equal);
 
 static int	revocation_enabled = 0;
-SYSCTL_INT(_security_mac_biba, OID_AUTO, revocation_enabled, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_biba, OID_AUTO, revocation_enabled, CTLFLAG_RWTUN,
     &revocation_enabled, 0, "Revoke access to objects on relabel");
-TUNABLE_INT("security.mac.biba.revocation_enabled", &revocation_enabled);
 
 static int	biba_slot;
 #define	SLOT(l)	((struct mac_biba *)mac_label_get((l), biba_slot))
diff --git a/sys/security/mac_bsdextended/mac_bsdextended.c b/sys/security/mac_bsdextended/mac_bsdextended.c
index ccbc525552f8..377fd250ad2d 100644
--- a/sys/security/mac_bsdextended/mac_bsdextended.c
+++ b/sys/security/mac_bsdextended/mac_bsdextended.c
@@ -76,9 +76,8 @@ static SYSCTL_NODE(_security_mac, OID_AUTO, bsdextended, CTLFLAG_RW, 0,
     "TrustedBSD extended BSD MAC policy controls");
 
 static int	ugidfw_enabled = 1;
-SYSCTL_INT(_security_mac_bsdextended, OID_AUTO, enabled, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_bsdextended, OID_AUTO, enabled, CTLFLAG_RWTUN,
     &ugidfw_enabled, 0, "Enforce extended BSD policy");
-TUNABLE_INT("security.mac.bsdextended.enabled", &ugidfw_enabled);
 
 static MALLOC_DEFINE(M_MACBSDEXTENDED, "mac_bsdextended",
     "BSD Extended MAC rule");
diff --git a/sys/security/mac_ifoff/mac_ifoff.c b/sys/security/mac_ifoff/mac_ifoff.c
index 7165f905c83d..28097b502989 100644
--- a/sys/security/mac_ifoff/mac_ifoff.c
+++ b/sys/security/mac_ifoff/mac_ifoff.c
@@ -66,25 +66,21 @@ static SYSCTL_NODE(_security_mac, OID_AUTO, ifoff, CTLFLAG_RW, 0,
     "TrustedBSD mac_ifoff policy controls");
 
 static int	ifoff_enabled = 1;
-SYSCTL_INT(_security_mac_ifoff, OID_AUTO, enabled, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_ifoff, OID_AUTO, enabled, CTLFLAG_RWTUN,
     &ifoff_enabled, 0, "Enforce ifoff policy");
-TUNABLE_INT("security.mac.ifoff.enabled", &ifoff_enabled);
 
 static int	ifoff_lo_enabled = 1;
-SYSCTL_INT(_security_mac_ifoff, OID_AUTO, lo_enabled, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_ifoff, OID_AUTO, lo_enabled, CTLFLAG_RWTUN,
     &ifoff_lo_enabled, 0, "Enable loopback interfaces");
-TUNABLE_INT("security.mac.ifoff.lo_enabled", &ifoff_lo_enabled);
 
 static int	ifoff_other_enabled = 0;
-SYSCTL_INT(_security_mac_ifoff, OID_AUTO, other_enabled, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_ifoff, OID_AUTO, other_enabled, CTLFLAG_RWTUN,
     &ifoff_other_enabled, 0, "Enable other interfaces");
-TUNABLE_INT("security.mac.ifoff.other_enabled", &ifoff_other_enabled);
 
 static int	ifoff_bpfrecv_enabled = 0;
-SYSCTL_INT(_security_mac_ifoff, OID_AUTO, bpfrecv_enabled, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_ifoff, OID_AUTO, bpfrecv_enabled, CTLFLAG_RWTUN,
     &ifoff_bpfrecv_enabled, 0, "Enable BPF reception even when interface "
     "is disabled");
-TUNABLE_INT("security.mac.ifoff.bpfrecv.enabled", &ifoff_bpfrecv_enabled);
 
 static int
 ifnet_check_outgoing(struct ifnet *ifp)
diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c
index b2b9f74afb55..cf66423a91c6 100644
--- a/sys/security/mac_lomac/mac_lomac.c
+++ b/sys/security/mac_lomac/mac_lomac.c
@@ -101,34 +101,28 @@ SYSCTL_INT(_security_mac_lomac, OID_AUTO, label_size, CTLFLAG_RD,
     &lomac_label_size, 0, "Size of struct mac_lomac");
 
 static int	lomac_enabled = 1;
-SYSCTL_INT(_security_mac_lomac, OID_AUTO, enabled, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_lomac, OID_AUTO, enabled, CTLFLAG_RWTUN,
     &lomac_enabled, 0, "Enforce MAC/LOMAC policy");
-TUNABLE_INT("security.mac.lomac.enabled", &lomac_enabled);
 
 static int	destroyed_not_inited;
 SYSCTL_INT(_security_mac_lomac, OID_AUTO, destroyed_not_inited, CTLFLAG_RD,
     &destroyed_not_inited, 0, "Count of labels destroyed but not inited");
 
 static int	trust_all_interfaces = 0;
-SYSCTL_INT(_security_mac_lomac, OID_AUTO, trust_all_interfaces, CTLFLAG_RD,
+SYSCTL_INT(_security_mac_lomac, OID_AUTO, trust_all_interfaces, CTLFLAG_RDTUN,
     &trust_all_interfaces, 0, "Consider all interfaces 'trusted' by MAC/LOMAC");
-TUNABLE_INT("security.mac.lomac.trust_all_interfaces", &trust_all_interfaces);
 
 static char	trusted_interfaces[128];
-SYSCTL_STRING(_security_mac_lomac, OID_AUTO, trusted_interfaces, CTLFLAG_RD,
+SYSCTL_STRING(_security_mac_lomac, OID_AUTO, trusted_interfaces, CTLFLAG_RDTUN,
     trusted_interfaces, 0, "Interfaces considered 'trusted' by MAC/LOMAC");
-TUNABLE_STR("security.mac.lomac.trusted_interfaces", trusted_interfaces,
-    sizeof(trusted_interfaces));
 
 static int	ptys_equal = 0;
-SYSCTL_INT(_security_mac_lomac, OID_AUTO, ptys_equal, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_lomac, OID_AUTO, ptys_equal, CTLFLAG_RWTUN,
     &ptys_equal, 0, "Label pty devices as lomac/equal on create");
-TUNABLE_INT("security.mac.lomac.ptys_equal", &ptys_equal);
 
 static int	revocation_enabled = 1;
-SYSCTL_INT(_security_mac_lomac, OID_AUTO, revocation_enabled, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_lomac, OID_AUTO, revocation_enabled, CTLFLAG_RWTUN,
     &revocation_enabled, 0, "Revoke access to objects on relabel");
-TUNABLE_INT("security.mac.lomac.revocation_enabled", &revocation_enabled);
 
 static int	lomac_slot;
 #define	SLOT(l)	((struct mac_lomac *)mac_label_get((l), lomac_slot))
diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c
index d7ca5a55362f..6a074d0279bd 100644
--- a/sys/security/mac_mls/mac_mls.c
+++ b/sys/security/mac_mls/mac_mls.c
@@ -101,23 +101,20 @@ SYSCTL_INT(_security_mac_mls, OID_AUTO, label_size, CTLFLAG_RD,
     &mls_label_size, 0, "Size of struct mac_mls");
 
 static int	mls_enabled = 1;
-SYSCTL_INT(_security_mac_mls, OID_AUTO, enabled, CTLFLAG_RW, &mls_enabled, 0,
+SYSCTL_INT(_security_mac_mls, OID_AUTO, enabled, CTLFLAG_RWTUN, &mls_enabled, 0,
     "Enforce MAC/MLS policy");
-TUNABLE_INT("security.mac.mls.enabled", &mls_enabled);
 
 static int	destroyed_not_inited;
 SYSCTL_INT(_security_mac_mls, OID_AUTO, destroyed_not_inited, CTLFLAG_RD,
     &destroyed_not_inited, 0, "Count of labels destroyed but not inited");
 
 static int	ptys_equal = 0;
-SYSCTL_INT(_security_mac_mls, OID_AUTO, ptys_equal, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_mls, OID_AUTO, ptys_equal, CTLFLAG_RWTUN,
     &ptys_equal, 0, "Label pty devices as mls/equal on create");
-TUNABLE_INT("security.mac.mls.ptys_equal", &ptys_equal);
 
 static int	revocation_enabled = 0;
-SYSCTL_INT(_security_mac_mls, OID_AUTO, revocation_enabled, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_mls, OID_AUTO, revocation_enabled, CTLFLAG_RWTUN,
     &revocation_enabled, 0, "Revoke access to objects on relabel");
-TUNABLE_INT("security.mac.mls.revocation_enabled", &revocation_enabled);
 
 static int	max_compartments = MAC_MLS_MAX_COMPARTMENTS;
 SYSCTL_INT(_security_mac_mls, OID_AUTO, max_compartments, CTLFLAG_RD,
diff --git a/sys/security/mac_portacl/mac_portacl.c b/sys/security/mac_portacl/mac_portacl.c
index 1dbd1996e562..17427ee200f3 100644
--- a/sys/security/mac_portacl/mac_portacl.c
+++ b/sys/security/mac_portacl/mac_portacl.c
@@ -87,27 +87,21 @@ static SYSCTL_NODE(_security_mac, OID_AUTO, portacl, CTLFLAG_RW, 0,
     "TrustedBSD mac_portacl policy controls");
 
 static int	portacl_enabled = 1;
-SYSCTL_INT(_security_mac_portacl, OID_AUTO, enabled, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_portacl, OID_AUTO, enabled, CTLFLAG_RWTUN,
     &portacl_enabled, 0, "Enforce portacl policy");
-TUNABLE_INT("security.mac.portacl.enabled", &portacl_enabled);
 
 static int	portacl_suser_exempt = 1;
-SYSCTL_INT(_security_mac_portacl, OID_AUTO, suser_exempt, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_portacl, OID_AUTO, suser_exempt, CTLFLAG_RWTUN,
     &portacl_suser_exempt, 0, "Privilege permits binding of any port");
-TUNABLE_INT("security.mac.portacl.suser_exempt",
-    &portacl_suser_exempt);
 
 static int	portacl_autoport_exempt = 1;
-SYSCTL_INT(_security_mac_portacl, OID_AUTO, autoport_exempt, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_portacl, OID_AUTO, autoport_exempt, CTLFLAG_RWTUN,
     &portacl_autoport_exempt, 0, "Allow automatic allocation through "
     "binding port 0 if not IP_PORTRANGELOW");
-TUNABLE_INT("security.mac.portacl.autoport_exempt",
-    &portacl_autoport_exempt);
 
 static int	portacl_port_high = 1023;
-SYSCTL_INT(_security_mac_portacl, OID_AUTO, port_high, CTLFLAG_RW,
+SYSCTL_INT(_security_mac_portacl, OID_AUTO, port_high, CTLFLAG_RWTUN,
     &portacl_port_high, 0, "Highest port to enforce for");
-TUNABLE_INT("security.mac.portacl.port_high", &portacl_port_high);
 
 static MALLOC_DEFINE(M_PORTACL, "portacl_rule", "Rules for mac_portacl");
 
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index ddb5421b0da2..575476d8524c 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -140,6 +140,9 @@ device		machfb		# ATI Mach64 framebuffers
 device		splash		# Splash screen and screen saver support
 options 	KBD_INSTALL_CDEV # install a CDEV entry in /dev
 
+# vt is the new video console driver
+device		vt
+
 # Builtin hardware
 device		auxio		# auxiliary I/O device
 device		eeprom		# eeprom (really a front-end for the MK48Txx)
diff --git a/sys/sparc64/include/sf_buf.h b/sys/sparc64/include/sf_buf.h
index ebbbea8389ce..3566f80f22b4 100644
--- a/sys/sparc64/include/sf_buf.h
+++ b/sys/sparc64/include/sf_buf.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
+ * Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,31 +29,7 @@
 #ifndef _MACHINE_SF_BUF_H_
 #define _MACHINE_SF_BUF_H_
 
-#include <sys/queue.h>
-
-struct vm_page;
-
-struct sf_buf {
-	SLIST_ENTRY(sf_buf) free_list;	/* list of free buffer slots */
-	struct		vm_page *m;	/* currently mapped page */
-	vm_offset_t	kva;		/* va of mapping */
-};
-
-struct sf_buf * sf_buf_alloc(struct vm_page *m, int flags);
-void sf_buf_free(struct sf_buf *sf);
-
-static __inline vm_offset_t
-sf_buf_kva(struct sf_buf *sf)
-{
-
-	return (sf->kva);
-}
-
-static __inline struct vm_page *
-sf_buf_page(struct sf_buf *sf)
-{
-
-	return (sf->m);
-}
+void sf_buf_map(struct sf_buf *, int);
+int sf_buf_unmap(struct sf_buf *);
 
 #endif /* !_MACHINE_SF_BUF_H_ */
diff --git a/sys/sparc64/include/vmparam.h b/sys/sparc64/include/vmparam.h
index b1c90d290a8b..8e7d76c62d00 100644
--- a/sys/sparc64/include/vmparam.h
+++ b/sys/sparc64/include/vmparam.h
@@ -239,4 +239,7 @@ extern vm_offset_t vm_max_kernel_address;
  */
 #define	ZERO_REGION_SIZE	PAGE_SIZE
 
+#define	SFBUF
+#define	SFBUF_MAP
+
 #endif /* !_MACHINE_VMPARAM_H_ */
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index ec8d90fe22cb..57e0f4817b5a 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -167,7 +167,6 @@ EARLY_DRIVER_MODULE(psycho, nexus, psycho_driver, psycho_devclass, NULL, NULL,
 static SYSCTL_NODE(_hw, OID_AUTO, psycho, CTLFLAG_RD, 0, "psycho parameters");
 
 static u_int psycho_powerfail = 1;
-TUNABLE_INT("hw.psycho.powerfail", &psycho_powerfail);
 SYSCTL_UINT(_hw_psycho, OID_AUTO, powerfail, CTLFLAG_RDTUN, &psycho_powerfail,
     0, "powerfail action (0: none, 1: shutdown (default), 2: debugger)");
 
diff --git a/sys/sparc64/sparc64/dump_machdep.c b/sys/sparc64/sparc64/dump_machdep.c
index d5409ac4f75a..5af21cc07baa 100644
--- a/sys/sparc64/sparc64/dump_machdep.c
+++ b/sys/sparc64/sparc64/dump_machdep.c
@@ -142,7 +142,7 @@ blk_dump(struct dumperinfo *di, vm_paddr_t pa, vm_size_t size)
 	return (error);
 }
 
-void
+int
 dumpsys(struct dumperinfo *di)
 {
 	struct sparc64_dump_hdr hdr;
@@ -218,9 +218,10 @@ dumpsys(struct dumperinfo *di)
 	/* Signal completion, signoff and exit stage left. */
 	dump_write(di, NULL, 0, 0, 0);
 	printf("\nDump complete\n");
-	return;
+	return (0);
 
  fail:
 	/* XXX It should look more like VMS :-) */
 	printf("** DUMP FAILED (ERROR %d) **\n", error);
+	return (error);
 }
diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c
index 28fcb1f952e3..b056a703383a 100644
--- a/sys/sparc64/sparc64/pmap.c
+++ b/sys/sparc64/sparc64/pmap.c
@@ -141,6 +141,8 @@ static void pmap_bootstrap_set_tte(struct tte *tp, u_long vpn, u_long data);
 static void pmap_cache_remove(vm_page_t m, vm_offset_t va);
 static int pmap_protect_tte(struct pmap *pm1, struct pmap *pm2,
     struct tte *tp, vm_offset_t va);
+static int pmap_unwire_tte(pmap_t pm, pmap_t pm2, struct tte *tp,
+    vm_offset_t va);
 
 /*
  * Map the given physical page at the specified virtual address in the
@@ -149,8 +151,8 @@ static int pmap_protect_tte(struct pmap *pm1, struct pmap *pm2,
  *
  * The page queues and pmap must be locked.
  */
-static void pmap_enter_locked(pmap_t pm, vm_offset_t va, vm_page_t m,
-    vm_prot_t prot, boolean_t wired);
+static int pmap_enter_locked(pmap_t pm, vm_offset_t va, vm_page_t m,
+    vm_prot_t prot, u_int flags, int8_t psind);
 
 extern int tl1_dmmu_miss_direct_patch_tsb_phys_1[];
 extern int tl1_dmmu_miss_direct_patch_tsb_phys_end_1[];
@@ -1459,16 +1461,18 @@ pmap_protect(pmap_t pm, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
  * target pmap with the protection requested.  If specified the page
  * will be wired down.
  */
-void
-pmap_enter(pmap_t pm, vm_offset_t va, vm_prot_t access, vm_page_t m,
-    vm_prot_t prot, boolean_t wired)
+int
+pmap_enter(pmap_t pm, vm_offset_t va, vm_page_t m, vm_prot_t prot,
+    u_int flags, int8_t psind)
 {
+	int rv;
 
 	rw_wlock(&tte_list_global_lock);
 	PMAP_LOCK(pm);
-	pmap_enter_locked(pm, va, m, prot, wired);
+	rv = pmap_enter_locked(pm, va, m, prot, flags, psind);
 	rw_wunlock(&tte_list_global_lock);
 	PMAP_UNLOCK(pm);
+	return (rv);
 }
 
 /*
@@ -1478,14 +1482,15 @@ pmap_enter(pmap_t pm, vm_offset_t va, vm_prot_t access, vm_page_t m,
  *
  * The page queues and pmap must be locked.
  */
-static void
+static int
 pmap_enter_locked(pmap_t pm, vm_offset_t va, vm_page_t m, vm_prot_t prot,
-    boolean_t wired)
+    u_int flags, int8_t psind __unused)
 {
 	struct tte *tp;
 	vm_paddr_t pa;
 	vm_page_t real;
 	u_long data;
+	boolean_t wired;
 
 	rw_assert(&tte_list_global_lock, RA_WLOCKED);
 	PMAP_LOCK_ASSERT(pm, MA_OWNED);
@@ -1493,6 +1498,7 @@ pmap_enter_locked(pmap_t pm, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 		VM_OBJECT_ASSERT_LOCKED(m->object);
 	PMAP_STATS_INC(pmap_nenter);
 	pa = VM_PAGE_TO_PHYS(m);
+	wired = (flags & PMAP_ENTER_WIRED) != 0;
 
 	/*
 	 * If this is a fake page from the device_pager, but it covers actual
@@ -1606,6 +1612,8 @@ pmap_enter_locked(pmap_t pm, vm_offset_t va, vm_page_t m, vm_prot_t prot,
 
 		tsb_tte_enter(pm, m, va, TS_8K, data);
 	}
+
+	return (KERN_SUCCESS);
 }
 
 /*
@@ -1635,7 +1643,7 @@ pmap_enter_object(pmap_t pm, vm_offset_t start, vm_offset_t end,
 	PMAP_LOCK(pm);
 	while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) {
 		pmap_enter_locked(pm, start + ptoa(diff), m, prot &
-		    (VM_PROT_READ | VM_PROT_EXECUTE), FALSE);
+		    (VM_PROT_READ | VM_PROT_EXECUTE), 0, 0);
 		m = TAILQ_NEXT(m, listq);
 	}
 	rw_wunlock(&tte_list_global_lock);
@@ -1649,7 +1657,7 @@ pmap_enter_quick(pmap_t pm, vm_offset_t va, vm_page_t m, vm_prot_t prot)
 	rw_wlock(&tte_list_global_lock);
 	PMAP_LOCK(pm);
 	pmap_enter_locked(pm, va, m, prot & (VM_PROT_READ | VM_PROT_EXECUTE),
-	    FALSE);
+	    0, 0);
 	rw_wunlock(&tte_list_global_lock);
 	PMAP_UNLOCK(pm);
 }
@@ -1664,27 +1672,40 @@ pmap_object_init_pt(pmap_t pm, vm_offset_t addr, vm_object_t object,
 	    ("pmap_object_init_pt: non-device object"));
 }
 
+static int
+pmap_unwire_tte(pmap_t pm, pmap_t pm2, struct tte *tp, vm_offset_t va)
+{
+
+	PMAP_LOCK_ASSERT(pm, MA_OWNED);
+	if ((tp->tte_data & TD_WIRED) == 0)
+		panic("pmap_unwire_tte: tp %p is missing TD_WIRED", tp);
+	atomic_clear_long(&tp->tte_data, TD_WIRED);
+	pm->pm_stats.wired_count--;
+	return (1);
+}
+
 /*
- * Change the wiring attribute for a map/virtual-address pair.
- * The mapping must already exist in the pmap.
+ * Clear the wired attribute from the mappings for the specified range of
+ * addresses in the given pmap.  Every valid mapping within that range must
+ * have the wired attribute set.  In contrast, invalid mappings cannot have
+ * the wired attribute set, so they are ignored.
+ *
+ * The wired attribute of the translation table entry is not a hardware
+ * feature, so there is no need to invalidate any TLB entries.
  */
 void
-pmap_change_wiring(pmap_t pm, vm_offset_t va, boolean_t wired)
+pmap_unwire(pmap_t pm, vm_offset_t sva, vm_offset_t eva)
 {
+	vm_offset_t va;
 	struct tte *tp;
-	u_long data;
 
 	PMAP_LOCK(pm);
-	if ((tp = tsb_tte_lookup(pm, va)) != NULL) {
-		if (wired) {
-			data = atomic_set_long(&tp->tte_data, TD_WIRED);
-			if ((data & TD_WIRED) == 0)
-				pm->pm_stats.wired_count++;
-		} else {
-			data = atomic_clear_long(&tp->tte_data, TD_WIRED);
-			if ((data & TD_WIRED) != 0)
-				pm->pm_stats.wired_count--;
-		}
+	if (eva - sva > PMAP_TSB_THRESH)
+		tsb_foreach(pm, NULL, sva, eva, pmap_unwire_tte);
+	else {
+		for (va = sva; va < eva; va += PAGE_SIZE)
+			if ((tp = tsb_tte_lookup(pm, va)) != NULL)
+				pmap_unwire_tte(pm, NULL, tp, va);
 	}
 	PMAP_UNLOCK(pm);
 }
diff --git a/sys/sparc64/sparc64/vm_machdep.c b/sys/sparc64/sparc64/vm_machdep.c
index 8615aa2fd9dc..df184fa418bb 100644
--- a/sys/sparc64/sparc64/vm_machdep.c
+++ b/sys/sparc64/sparc64/vm_machdep.c
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/sysent.h>
-#include <sys/sf_buf.h>
 #include <sys/sched.h>
+#include <sys/sf_buf.h>
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
 #include <sys/vmmeter.h>
@@ -84,35 +84,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/tlb.h>
 #include <machine/tstate.h>
 
-#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);
-
-/*
- * Expanded sf_freelist head.  Really an SLIST_HEAD() in disguise, with the
- * sf_freelist head with the sf_lock mutex.
- */
-static struct {
-	SLIST_HEAD(, sf_buf) sf_head;
-	struct mtx sf_lock;
-} sf_freelist;
-
-static u_int	sf_buf_alloc_want;
-
 PMAP_STATS_VAR(uma_nsmall_alloc);
 PMAP_STATS_VAR(uma_nsmall_alloc_oc);
 PMAP_STATS_VAR(uma_nsmall_free);
@@ -417,83 +388,6 @@ is_physical_memory(vm_paddr_t addr)
 	return (0);
 }
 
-/*
- * 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;
-
-	nsfbufs = NSFBUFS;
-	TUNABLE_INT_FETCH("kern.ipc.nsfbufs", &nsfbufs);
-
-	mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF);
-	SLIST_INIT(&sf_freelist.sf_head);
-	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;
-		SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list);
-	}
-	sf_buf_alloc_want = 0;
-}
-
-/*
- * 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_buf *sf;
-	int error;
-
-	mtx_lock(&sf_freelist.sf_lock);
-	while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) {
-		if (flags & SFB_NOWAIT)
-			break;
-		sf_buf_alloc_want++;
-		SFSTAT_INC(sf_allocwait);
-		error = msleep(&sf_freelist, &sf_freelist.sf_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)
-			break;
-	}
-	if (sf != NULL) {
-		SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list);
-		sf->m = m;
-		nsfbufsused++;
-		nsfbufspeak = imax(nsfbufspeak, nsfbufsused);
-		pmap_qenter(sf->kva, &sf->m, 1);
-	}
-	mtx_unlock(&sf_freelist.sf_lock);
-	return (sf);
-}
-
-/*
- * Release resources back to the system.
- */
-void
-sf_buf_free(struct sf_buf *sf)
-{
-
-	pmap_qremove(sf->kva, 1);
-	mtx_lock(&sf_freelist.sf_lock);
-	SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list);
-	nsfbufsused--;
-	if (sf_buf_alloc_want > 0)
-		wakeup(&sf_freelist);
-	mtx_unlock(&sf_freelist.sf_lock);
-}
-
 void
 swi_vm(void *v)
 {
@@ -550,3 +444,18 @@ uma_small_free(void *mem, int size, u_int8_t flags)
 	vm_page_free(m);
 	atomic_subtract_int(&vm_cnt.v_wire_count, 1);
 }
+
+void
+sf_buf_map(struct sf_buf *sf, int flags)
+{
+
+	pmap_qenter(sf->kva, &sf->m, 1);
+}
+
+int
+sf_buf_unmap(struct sf_buf *sf)
+{
+
+	pmap_qremove(sf->kva, 1);
+	return (1);
+}
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index c384e187493c..9923562e19f0 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -210,10 +210,10 @@ struct buf {
 #define	B_CLUSTEROK	0x00020000	/* Pagein op, so swap() can count it. */
 #define	B_000400000	0x00040000	/* Available flag. */
 #define	B_000800000	0x00080000	/* Available flag. */
-#define	B_00100000	0x00100000	/* Available flag. */
+#define	B_001000000	0x00100000	/* Available flag. */
 #define	B_DIRTY		0x00200000	/* Needs writing later (in EXT2FS). */
 #define	B_RELBUF	0x00400000	/* Release VMIO buffer. */
-#define	B_00800000	0x00800000	/* Available flag. */
+#define	B_FS_FLAG1	0x00800000	/* Available flag for FS use. */
 #define	B_NOCOPY	0x01000000	/* Don't copy-on-write this buf. */
 #define	B_INFREECNT	0x02000000	/* buf is counted in numfreebufs */
 #define	B_PAGING	0x04000000	/* volatile paging I/O -- bypass VMIO */
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index ae05726bb710..86bd40af7de0 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -568,6 +568,12 @@ void	bus_data_generation_update(void);
 #define	BUS_PASS_SCHEDULER	60	/* Start scheduler. */
 #define	BUS_PASS_DEFAULT	__INT_MAX /* Everything else. */
 
+#define	BUS_PASS_ORDER_FIRST	0
+#define	BUS_PASS_ORDER_EARLY	2
+#define	BUS_PASS_ORDER_MIDDLE	5
+#define	BUS_PASS_ORDER_LATE	7
+#define	BUS_PASS_ORDER_LAST	9
+
 extern int bus_current_pass;
 
 void	bus_set_pass(int pass);
diff --git a/sys/sys/capsicum.h b/sys/sys/capsicum.h
index 4942f8d96e52..618881160943 100644
--- a/sys/sys/capsicum.h
+++ b/sys/sys/capsicum.h
@@ -341,6 +341,7 @@ __END_DECLS
 #define IN_CAPABILITY_MODE(td) (((td)->td_ucred->cr_flags & CRED_FLAG_CAPMODE) != 0)
 
 struct filedesc;
+struct filedescent;
 
 /*
  * Test whether a capability grants the requested rights.
@@ -355,9 +356,11 @@ u_char	cap_rights_to_vmprot(cap_rights_t *havep);
  * For the purposes of procstat(1) and similar tools, allow kern_descrip.c to
  * extract the rights from a capability.
  */
+cap_rights_t	*cap_rights_fde(struct filedescent *fde);
 cap_rights_t	*cap_rights(struct filedesc *fdp, int fd);
 
 int	cap_ioctl_check(struct filedesc *fdp, int fd, u_long cmd);
+int	cap_fcntl_check_fde(struct filedescent *fde, int cmd);
 int	cap_fcntl_check(struct filedesc *fdp, int fd, int cmd);
 
 #else /* !_KERNEL */
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index 81acb6b243b9..4c4c2af719a8 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -210,7 +210,9 @@
 #define	__packed
 #define	__aligned(x)
 #define	__section(x)
+#define	__weak
 #else
+#define	__weak		__attribute__((__weak__))
 #if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER)
 #define	__dead2
 #define	__pure2
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index e9a2f55ee89a..f8a9a3c498f1 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -336,7 +336,7 @@ struct dumperinfo {
 
 int set_dumper(struct dumperinfo *, const char *_devname);
 int dump_write(struct dumperinfo *, void *, vm_offset_t, off_t, size_t);
-void dumpsys(struct dumperinfo *);
+int dumpsys(struct dumperinfo *);
 int doadump(boolean_t);
 extern int dumping;		/* system is dumping */
 
diff --git a/sys/sys/cons.h b/sys/sys/cons.h
index 8442bf3a76e9..0085daa68289 100644
--- a/sys/sys/cons.h
+++ b/sys/sys/cons.h
@@ -133,6 +133,12 @@ int	cnunavailable(void);
 void	constty_set(struct tty *tp);
 void	constty_clear(void);
 
+/* sc(4) / vt(4) coexistence shim */
+#define	VTY_SC 0x01
+#define	VTY_VT 0x02
+int	vty_enabled(unsigned int);
+void	vty_set_preferred(unsigned int);
+
 #endif /* _KERNEL */
 
 #endif /* !_MACHINE_CONS_H_ */
diff --git a/sys/sys/cpuctl.h b/sys/sys/cpuctl.h
index 4bddb345611c..30af52405c66 100644
--- a/sys/sys/cpuctl.h
+++ b/sys/sys/cpuctl.h
@@ -35,10 +35,16 @@ typedef struct {
 } cpuctl_msr_args_t;
 
 typedef struct {
-	int		level;	/* CPUID level */
+	int		level;		/* CPUID level */
 	uint32_t	data[4];
 } cpuctl_cpuid_args_t;
 
+typedef struct {
+	int		level;		/* CPUID level */
+	int		level_type;	/* CPUID level type */
+	uint32_t	data[4];
+} cpuctl_cpuid_count_args_t;
+
 typedef struct {
 	void	*data;
 	size_t	size;
@@ -50,5 +56,6 @@ typedef struct {
 #define	CPUCTL_UPDATE	_IOWR('c', 4, cpuctl_update_args_t)
 #define	CPUCTL_MSRSBIT	_IOWR('c', 5, cpuctl_msr_args_t)
 #define	CPUCTL_MSRCBIT	_IOWR('c', 6, cpuctl_msr_args_t)
+#define	CPUCTL_CPUID_COUNT _IOWR('c', 7, cpuctl_cpuid_count_args_t)
 
 #endif /* _CPUCTL_H_ */
diff --git a/sys/sys/cpuset.h b/sys/sys/cpuset.h
index e1ee37d020de..e1ad341d3b24 100644
--- a/sys/sys/cpuset.h
+++ b/sys/sys/cpuset.h
@@ -118,6 +118,7 @@ struct cpuset *cpuset_thread0(void);
 struct cpuset *cpuset_ref(struct cpuset *);
 void	cpuset_rel(struct cpuset *);
 int	cpuset_setthread(lwpid_t id, cpuset_t *);
+int	cpuset_setithread(lwpid_t id, u_char cpu);
 int	cpuset_create_root(struct prison *, struct cpuset **);
 int	cpuset_setproc_update_set(struct proc *, struct cpuset *);
 char	*cpusetobj_strprint(char *, const cpuset_t *);
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index c3501e0d148f..80d57c46c968 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -52,7 +52,7 @@
 
 /* XXX these should be defined per controller (or drive) elsewhere, not here! */
 #if defined(__i386__) || defined(__amd64__) || defined(__arm__) || \
-    defined(__ia64__) || defined(__powerpc__) || defined(__mips__)
+    defined(__powerpc__) || defined(__mips__)
 #define LABELSECTOR	1			/* sector containing label */
 #define LABELOFFSET	0			/* offset of label in sector */
 #endif
diff --git a/sys/sys/dtrace_bsd.h b/sys/sys/dtrace_bsd.h
index 6dd902419cfe..b4510225b19b 100644
--- a/sys/sys/dtrace_bsd.h
+++ b/sys/sys/dtrace_bsd.h
@@ -48,15 +48,14 @@ extern cyclic_clock_func_t	cyclic_clock_func;
 
 void clocksource_cyc_set(const struct bintime *t);
 
+int dtrace_trap(struct trapframe *);
+
 /*
  * The dtrace module handles traps that occur during a DTrace probe.
  * This type definition is used in the trap handler to provide a
- * hook for the dtrace module to register it's handler with.
+ * hook for the dtrace module to register its handler with.
  */
-typedef int (*dtrace_trap_func_t)(struct trapframe *, u_int);
-
-int	dtrace_trap(struct trapframe *, u_int);
-
+typedef int (*dtrace_trap_func_t)(struct trapframe *);
 extern dtrace_trap_func_t	dtrace_trap_func;
 
 /*
diff --git a/sys/sys/efi.h b/sys/sys/efi.h
index 749f09450348..4c5d937ba3b5 100644
--- a/sys/sys/efi.h
+++ b/sys/sys/efi.h
@@ -151,27 +151,4 @@ struct efi_systbl {
 	uint64_t	st_cfgtbl;
 };
 
-#if defined(_KERNEL) && defined(__ia64__)
-
-typedef u_long (*ia64_efi_f)(u_long, u_long, u_long, u_long);
-
-u_long ia64_efi_physical(ia64_efi_f, u_long, u_long, u_long, u_long);
-
-void efi_boot_finish(void);
-int efi_boot_minimal(uint64_t);
-void *efi_get_table(struct uuid *);
-void efi_get_time(struct efi_tm *);
-struct efi_md *efi_md_find(vm_paddr_t);
-struct efi_md *efi_md_first(void);
-struct efi_md *efi_md_last(void);
-struct efi_md *efi_md_next(struct efi_md *);
-struct efi_md *efi_md_prev(struct efi_md *);
-void efi_reset_system(void);
-int efi_set_time(struct efi_tm *);
-int efi_var_get(efi_char *, struct uuid *, uint32_t *, size_t *, void *);
-int efi_var_nextname(size_t *, efi_char *, struct uuid *);
-int efi_var_set(efi_char *, struct uuid *, uint32_t, size_t, void *);
-
-#endif /* _KERNEL && __ia64__ */
-
 #endif /* _SYS_EFI_H_ */
diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h
index 677d136b4fca..13551f1f0088 100644
--- a/sys/sys/elf_common.h
+++ b/sys/sys/elf_common.h
@@ -237,6 +237,7 @@ typedef struct {
 #define	EM_ARCA		109	/* Arca RISC Microprocessor. */
 #define	EM_UNICORE	110	/* Microprocessor series from PKU-Unity Ltd.
 				   and MPRC of Peking University */
+#define	EM_AARCH64	183	/* AArch64 (64-bit ARM) */
 
 /* Non-standard or deprecated. */
 #define	EM_486		6	/* Intel i486. */
diff --git a/sys/sys/event.h b/sys/sys/event.h
index 1f27c4d49c71..47ebd7667086 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -133,6 +133,12 @@ struct kevent {
 #define	NOTE_TRACKERR	0x00000002		/* could not track child */
 #define	NOTE_CHILD	0x00000004		/* am a child process */
 
+/* additional flags for EVFILT_TIMER */
+#define NOTE_SECONDS		0x00000001	/* data is seconds */
+#define NOTE_MSECONDS		0x00000002	/* data is milliseconds */
+#define NOTE_USECONDS		0x00000004	/* data is microseconds */
+#define NOTE_NSECONDS		0x00000008	/* data is nanoseconds */
+
 struct knote;
 SLIST_HEAD(klist, knote);
 struct kqueue;
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index 140ab2e6df51..cccebfd1fb59 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -39,12 +39,17 @@
 #define _SYS_EXEC_H_
 
 /*
- * The following structure is found at the top of the user stack of each
- * user process. The ps program uses it to locate argv and environment
- * strings. Programs that wish ps to display other information may modify
- * it; normally ps_argvstr points to the argv vector, and ps_nargvstr
- * is the same as the program's argc. The fields ps_envstr and ps_nenvstr
- * are the equivalent for the environment.
+ * Before ps_args existed, the following structure, found at the top of
+ * the user stack of each user process, was used by ps(1) to locate
+ * environment and argv strings.  Normally ps_argvstr points to the
+ * argv vector, and ps_nargvstr is the same as the program's argc. The
+ * fields ps_envstr and ps_nenvstr are the equivalent for the environment.
+ *
+ * Programs should now use setproctitle(3) to change ps output.
+ * setproctitle() always informs the kernel with sysctl and sets the
+ * pointers in ps_strings.  The kern.proc.args sysctl first tries p_args.
+ * If p_args is NULL, it then falls back to reading ps_strings and following
+ * the pointers.
  */
 struct ps_strings {
 	char	**ps_argvstr;	/* first of 0 or more argument strings */
@@ -55,6 +60,7 @@ struct ps_strings {
 
 /*
  * Address of ps_strings structure (in user space).
+ * Prefer the kern.ps_strings or kern.proc.ps_strings sysctls to this constant.
  */
 #define	PS_STRINGS	(USRSTACK - sizeof(struct ps_strings))
 #define SPARE_USRSPACE	4096
diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index 160eb7a6145b..a88e305a4455 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -115,19 +115,6 @@ 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);
-
-typedef int fb_ioctl_t(struct cdev *, u_long, caddr_t, int, struct thread *);
-typedef int fb_mmap_t(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
-    int prot, vm_memattr_t *memattr);
 
 struct fb_info {
 	/* Raw copy of fbtype. Do not change. */
@@ -138,18 +125,8 @@ struct fb_info {
 	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_ioctl_t	*fb_ioctl;	/* Can be NULL. */
-	fb_mmap_t	*fb_mmap;	/* Can be NULL. */
-
 	struct cdev 	*fb_cdev;
 
-	fb_wr1_t	*wr1;
-	fb_wr2_t	*wr2;
-	fb_wr4_t	*wr4;
-	fb_copy_t	*copy;
 	fb_enter_t	*enter;
 	fb_leave_t	*leave;
 
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index 516ef1b6192e..d407cd20f44b 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -152,7 +152,7 @@ int	fdcheckstd(struct thread *td);
 void	fdclose(struct filedesc *fdp, struct file *fp, int idx, struct thread *td);
 void	fdcloseexec(struct thread *td);
 struct	filedesc *fdcopy(struct filedesc *fdp);
-void	fdunshare(struct proc *p, struct thread *td);
+void	fdunshare(struct thread *td);
 void	fdescfree(struct thread *td);
 struct	filedesc *fdinit(struct filedesc *fdp);
 struct	filedesc *fdshare(struct filedesc *fdp);
@@ -175,7 +175,7 @@ fget_locked(struct filedesc *fdp, int fd)
 
 	FILEDESC_LOCK_ASSERT(fdp);
 
-	if (fd < 0 || fd >= fdp->fd_nfiles)
+	if (fd < 0 || fd > fdp->fd_lastfile)
 		return (NULL);
 
 	return (fdp->fd_ofiles[fd].fde_file);
diff --git a/sys/sys/fnv_hash.h b/sys/sys/fnv_hash.h
index c1452a67d974..901603eac18a 100644
--- a/sys/sys/fnv_hash.h
+++ b/sys/sys/fnv_hash.h
@@ -60,7 +60,7 @@ static __inline Fnv64_t
 fnv_64_str(const char *str, Fnv64_t hval)
 {
 	const u_int8_t *s = (const u_int8_t *)str;
-	u_register_t c;		 /* 32 bit on i386, 64 bit on alpha,ia64 */
+	u_register_t c;		 /* 32 bit on i386, 64 bit on alpha */
 
 	while ((c = *s++) != 0) {
 		hval *= FNV_64_PRIME;
diff --git a/sys/sys/gpt.h b/sys/sys/gpt.h
index 0f14f3934ff9..ecf75368a234 100644
--- a/sys/sys/gpt.h
+++ b/sys/sys/gpt.h
@@ -91,6 +91,8 @@ struct gpt_ent {
 	{0x516e7cb8,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}}
 #define	GPT_ENT_TYPE_FREEBSD_ZFS	\
 	{0x516e7cba,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}}
+#define	GPT_ENT_TYPE_PREP_BOOT		\
+	{0x9e1a2d38,0xc612,0x4316,0xaa,0x26,{0x8b,0x49,0x52,0x1e,0x5a,0x8b}}
 
 /*
  * The following are unused but documented here to avoid reuse.
@@ -114,7 +116,8 @@ struct gpt_ent {
 #define	GPT_ENT_TYPE_MS_LDM_DATA	\
 	{0xaf9b60a0,0x1431,0x4f62,0xbc,0x68,{0x33,0x11,0x71,0x4a,0x69,0xad}}
 
-#define	GPT_ENT_TYPE_LINUX_DATA		GPT_ENT_TYPE_MS_BASIC_DATA
+#define	GPT_ENT_TYPE_LINUX_DATA		\
+	{0x0fc63daf,0x8483,0x4772,0x8e,0x79,{0x3d,0x69,0xd8,0x47,0x7d,0xe4}}
 #define	GPT_ENT_TYPE_LINUX_RAID		\
 	{0xa19d880f,0x05fc,0x4d3b,0xa0,0x06,{0x74,0x3f,0x0f,0x84,0x91,0x1e}}
 #define	GPT_ENT_TYPE_LINUX_SWAP		\
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
index 3b34854be8b8..faef5f8518de 100644
--- a/sys/sys/imgact_elf.h
+++ b/sys/sys/imgact_elf.h
@@ -77,7 +77,6 @@ typedef struct {
 #define	BI_CAN_EXEC_DYN		0x0001
 #define	BI_BRAND_NOTE		0x0002	/* May have note.ABI-tag section. */
 #define	BI_BRAND_NOTE_MANDATORY	0x0004	/* Must have note.ABI-tag section. */
-#define	BI_CAN_EXEC_INTERP	0x0008	/* Allow to run interpreter itself. */
 } __ElfN(Brandinfo);
 
 __ElfType(Auxargs);
diff --git a/sys/sys/kerneldump.h b/sys/sys/kerneldump.h
index 6342f7d67ff9..a148736c1217 100644
--- a/sys/sys/kerneldump.h
+++ b/sys/sys/kerneldump.h
@@ -70,7 +70,6 @@ struct kerneldumpheader {
 #define	KERNELDUMP_AMD64_VERSION	2
 #define	KERNELDUMP_ARM_VERSION		1
 #define	KERNELDUMP_I386_VERSION		2
-#define	KERNELDUMP_IA64_VERSION		1
 #define	KERNELDUMP_MIPS_VERSION		1
 #define	KERNELDUMP_POWERPC_VERSION	1
 #define	KERNELDUMP_SPARC64_VERSION	1
diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
index 45b943016283..35fe68eb2927 100644
--- a/sys/sys/link_elf.h
+++ b/sys/sys/link_elf.h
@@ -95,6 +95,10 @@ extern int dl_iterate_phdr(__dl_iterate_hdr_callback, void *);
 int _rtld_addr_phdr(const void *, struct dl_phdr_info *);
 int _rtld_get_stack_prot(void);
 
+#ifdef __ARM_EABI__
+void * dl_unwind_find_exidx(const void *, int *);
+#endif
+
 __END_DECLS
 
 #endif /* _SYS_LINK_ELF_H_ */
diff --git a/sys/sys/linker_set.h b/sys/sys/linker_set.h
index 2edb55b24f8f..5742ec625586 100644
--- a/sys/sys/linker_set.h
+++ b/sys/sys/linker_set.h
@@ -40,15 +40,26 @@
  * For ELF, this is done by constructing a separate segment for each set.
  */
 
+#if defined(__powerpc64__)
+/*
+ * Move the symbol pointer from ".text" to ".data" segment, to make
+ * the GCC compiler happy:
+ */
+#define	__MAKE_SET_CONST
+#else
+#define	__MAKE_SET_CONST const
+#endif
+
 /*
  * Private macros, not to be used outside this header file.
  */
 #ifdef __GNUCLIKE___SECTION
-#define __MAKE_SET(set, sym)						\
-	__GLOBL(__CONCAT(__start_set_,set));				\
-	__GLOBL(__CONCAT(__stop_set_,set));				\
-	static void const * const __set_##set##_sym_##sym 		\
-	__section("set_" #set) __used = &sym
+#define __MAKE_SET(set, sym)				\
+	__GLOBL(__CONCAT(__start_set_,set));		\
+	__GLOBL(__CONCAT(__stop_set_,set));		\
+	static void const * __MAKE_SET_CONST		\
+	__set_##set##_sym_##sym __section("set_" #set)	\
+	__used = &(sym)
 #else /* !__GNUCLIKE___SECTION */
 #ifndef lint
 #error this file needs to be ported to your compiler
@@ -68,9 +79,9 @@
 /*
  * Initialize before referring to a given linker set.
  */
-#define SET_DECLARE(set, ptype)						\
-	extern ptype *__CONCAT(__start_set_,set);			\
-	extern ptype *__CONCAT(__stop_set_,set)
+#define SET_DECLARE(set, ptype)					\
+	extern ptype __weak *__CONCAT(__start_set_,set);	\
+	extern ptype __weak *__CONCAT(__stop_set_,set)
 
 #define SET_BEGIN(set)							\
 	(&__CONCAT(__start_set_,set))
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index 8f51606b72ff..dcb4290a8acb 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -134,7 +134,7 @@ struct malloc_type_header {
 	struct malloc_type type[1] = {					\
 		{ NULL, M_MAGIC, shortdesc, NULL }			\
 	};								\
-	SYSINIT(type##_init, SI_SUB_KMEM, SI_ORDER_SECOND, malloc_init,	\
+	SYSINIT(type##_init, SI_SUB_KMEM, SI_ORDER_THIRD, malloc_init,	\
 	    type);							\
 	SYSUNINIT(type##_uninit, SI_SUB_KMEM, SI_ORDER_ANY,		\
 	    malloc_uninit, type)
diff --git a/sys/sys/mbpool.h b/sys/sys/mbpool.h
index 585b66d48645..48fd89eb99b5 100644
--- a/sys/sys/mbpool.h
+++ b/sys/sys/mbpool.h
@@ -69,7 +69,7 @@ void *mbp_alloc(struct mbpool *, bus_addr_t *, uint32_t *);
 void mbp_free(struct mbpool *, void *);
 
 /* free a chunk that is an external mbuf */
-int mbp_ext_free(struct mbuf *, void *, void *);
+void mbp_ext_free(struct mbuf *, void *, void *);
 
 /* free all buffers that are marked to be on the card */
 void mbp_card_free(struct mbpool *);
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index e056bc7ee94f..b12cdfebfd4f 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -168,12 +168,12 @@ struct pkthdr {
  *	 LP64: 48
  */
 struct m_ext {
-	volatile u_int	*ref_cnt;	/* pointer to ref count info */
+	volatile u_int	*ext_cnt;	/* pointer to ref count info */
 	caddr_t		 ext_buf;	/* start of buffer */
 	uint32_t	 ext_size;	/* size of buffer, for ext_free */
 	uint32_t	 ext_type:8,	/* type of external storage */
 			 ext_flags:24;	/* external storage mbuf flags */
-	int		(*ext_free)	/* free routine if not the usual */
+	void		(*ext_free)	/* free routine if not the usual */
 			    (struct mbuf *, void *, void *);
 	void		*ext_arg1;	/* optional argument pointer */
 	void		*ext_arg2;	/* optional argument pointer */
@@ -202,7 +202,6 @@ struct mbuf {
 #define	m_type		m_hdr.mh_type
 #define	m_flags		m_hdr.mh_flags
 #define	m_nextpkt	m_hdr.mh_nextpkt
-#define	m_act		m_nextpkt
 #define	m_pkthdr	M_dat.MH.MH_pkthdr
 #define	m_ext		M_dat.MH.MH_dat.MH_ext
 #define	m_pktdat	M_dat.MH.MH_dat.MH_databuf
@@ -279,6 +278,7 @@ struct mbuf {
  * that provide an opaque flow identifier, allowing for ordering and
  * distribution without explicit affinity.
  */
+/* Microsoft RSS standard hash types */
 #define	M_HASHTYPE_NONE			0
 #define	M_HASHTYPE_RSS_IPV4		1	/* IPv4 2-tuple */
 #define	M_HASHTYPE_RSS_TCP_IPV4		2	/* TCPv4 4-tuple */
@@ -286,6 +286,12 @@ struct mbuf {
 #define	M_HASHTYPE_RSS_TCP_IPV6		4	/* TCPv6 4-tuple */
 #define	M_HASHTYPE_RSS_IPV6_EX		5	/* IPv6 2-tuple + ext hdrs */
 #define	M_HASHTYPE_RSS_TCP_IPV6_EX	6	/* TCPv6 4-tiple + ext hdrs */
+/* Non-standard RSS hash types */
+#define	M_HASHTYPE_RSS_UDP_IPV4		7	/* IPv4 UDP 4-tuple */
+#define	M_HASHTYPE_RSS_UDP_IPV4_EX	8	/* IPv4 UDP 4-tuple + ext hdrs */
+#define	M_HASHTYPE_RSS_UDP_IPV6		9	/* IPv6 UDP 4-tuple */
+#define	M_HASHTYPE_RSS_UDP_IPV6_EX	10	/* IPv6 UDP 4-tuple + ext hdrs */
+
 #define	M_HASHTYPE_OPAQUE		255	/* ordering, not affinity */
 
 #define	M_HASHTYPE_CLEAR(m)	((m)->m_pkthdr.rsstype = 0)
@@ -344,14 +350,14 @@ struct mbuf {
 #define	EXT_NET_DRV	252	/* custom ext_buf provided by net driver(s) */
 #define	EXT_MOD_TYPE	253	/* custom module's ext_buf type */
 #define	EXT_DISPOSABLE	254	/* can throw this buffer away w/page flipping */
-#define	EXT_EXTREF	255	/* has externally maintained ref_cnt ptr */
+#define	EXT_EXTREF	255	/* has externally maintained ext_cnt ptr */
 
 /*
  * Flags for external mbuf buffer types.
  * NB: limited to the lower 24 bits.
  */
-#define	EXT_FLAG_EMBREF		0x000001	/* embedded ref_cnt, notyet */
-#define	EXT_FLAG_EXTREF		0x000002	/* external ref_cnt, notyet */
+#define	EXT_FLAG_EMBREF		0x000001	/* embedded ext_cnt, notyet */
+#define	EXT_FLAG_EXTREF		0x000002	/* external ext_cnt, notyet */
 #define	EXT_FLAG_NOFREE		0x000010	/* don't free mbuf to pool, notyet */
 
 #define	EXT_FLAG_VENDOR1	0x010000	/* for vendor-internal use */
@@ -374,9 +380,10 @@ struct mbuf {
     "\30EXT_FLAG_EXP4"
 
 /*
- * Return values for (*ext_free).
+ * External reference/free functions.
  */
-#define	EXT_FREE_OK	0	/* Normal return */
+void sf_ext_ref(void *, void *);
+void sf_ext_free(void *, void *);
 
 /*
  * Flags indicating checksum, segmentation and other offload work to be
@@ -543,7 +550,7 @@ m_gettype(int size)
  */
 static __inline void
 m_extaddref(struct mbuf *m, caddr_t buf, u_int size, u_int *ref_cnt,
-    int (*freef)(struct mbuf *, void *, void *), void *arg1, void *arg2)
+    void (*freef)(struct mbuf *, void *, void *), void *arg1, void *arg2)
 {
 
 	KASSERT(ref_cnt != NULL, ("%s: ref_cnt not provided", __func__));
@@ -551,7 +558,7 @@ m_extaddref(struct mbuf *m, caddr_t buf, u_int size, u_int *ref_cnt,
 	atomic_add_int(ref_cnt, 1);
 	m->m_flags |= M_EXT;
 	m->m_ext.ext_buf = buf;
-	m->m_ext.ref_cnt = ref_cnt;
+	m->m_ext.ext_cnt = ref_cnt;
 	m->m_data = m->m_ext.ext_buf;
 	m->m_ext.ext_size = size;
 	m->m_ext.ext_free = freef;
@@ -735,7 +742,7 @@ m_cljset(struct mbuf *m, void *cl, int type)
 	m->m_ext.ext_size = size;
 	m->m_ext.ext_type = type;
 	m->m_ext.ext_flags = 0;
-	m->m_ext.ref_cnt = uma_find_refcnt(zone, cl);
+	m->m_ext.ext_cnt = uma_find_refcnt(zone, cl);
 	m->m_flags |= M_EXT;
 
 }
@@ -784,7 +791,7 @@ m_last(struct mbuf *m)
  */
 #define	M_WRITABLE(m)	(!((m)->m_flags & M_RDONLY) &&			\
 			 (!(((m)->m_flags & M_EXT)) ||			\
-			 (*((m)->m_ext.ref_cnt) == 1)) )		\
+			 (*((m)->m_ext.ext_cnt) == 1)) )		\
 
 /* Check if the supplied mbuf has a packet header, or else panic. */
 #define	M_ASSERTPKTHDR(m)						\
@@ -910,7 +917,7 @@ int		 m_apply(struct mbuf *, int, int,
 int		 m_append(struct mbuf *, int, c_caddr_t);
 void		 m_cat(struct mbuf *, struct mbuf *);
 int		 m_extadd(struct mbuf *, caddr_t, u_int,
-		    int (*)(struct mbuf *, void *, void *), void *, void *,
+		    void (*)(struct mbuf *, void *, void *), void *, void *,
 		    int, int, int);
 struct mbuf	*m_collapse(struct mbuf *, int, int);
 void		 m_copyback(struct mbuf *, int, int, c_caddr_t);
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index eaea818d1512..e89bee335db9 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -89,6 +89,7 @@
 /*
  * Extended flags
  */
+#define	MAP_EXCL	 0x00004000 /* for MAP_FIXED, fail if address is used */
 #define	MAP_NOCORE	 0x00020000 /* dont include these pages in a coredump */
 #define	MAP_PREFAULT_READ 0x00040000 /* prefault mapping for reading */
 #ifdef __LP64__
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index ca7e55c767e4..ca3bc436a3d2 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -39,6 +39,7 @@
 #include <sys/lock.h>
 #include <sys/lockmgr.h>
 #include <sys/_mutex.h>
+#include <sys/_sx.h>
 #endif
 
 /*
@@ -889,6 +890,11 @@ void	vfs_unmountall(void);
 extern	TAILQ_HEAD(mntlist, mount) mountlist;	/* mounted filesystem list */
 extern	struct mtx mountlist_mtx;
 extern	struct nfs_public nfs_pub;
+extern	struct sx vfsconf_sx;
+#define	vfsconf_lock()		sx_xlock(&vfsconf_sx)
+#define	vfsconf_unlock()	sx_xunlock(&vfsconf_sx)
+#define	vfsconf_slock()		sx_slock(&vfsconf_sx)
+#define	vfsconf_sunlock()	sx_sunlock(&vfsconf_sx)
 
 /*
  * Declarations for these vfs default operations are located in
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 32edc3b23e16..8920f78cb9d4 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 1100022	/* Master, propagated to newvers */
+#define __FreeBSD_version 1100028	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index fbd064cd6769..374a4dc0651d 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -549,6 +549,7 @@ struct proc {
 	int		p_pendingcnt;	/* how many signals are pending */
 	struct itimers	*p_itimers;	/* (c) POSIX interval timers. */
 	struct procdesc	*p_procdesc;	/* (e) Process descriptor, if any. */
+	u_int		p_treeflag;	/* (e) P_TREE flags */
 /* End area that is zeroed on creation. */
 #define	p_endzero	p_magic
 
@@ -632,7 +633,7 @@ struct proc {
 #define	P_SINGLE_BOUNDARY 0x400000 /* Threads should suspend at user boundary. */
 #define	P_HWPMC		0x800000 /* Process is using HWPMCs */
 #define	P_JAILED	0x1000000 /* Process is in jail. */
-#define	P_ORPHAN	0x2000000 /* Orphaned. */
+#define	P_UNUSED1	0x2000000
 #define	P_INEXEC	0x4000000 /* Process is in execve(). */
 #define	P_STATCHILD	0x8000000 /* Child process stopped or exited. */
 #define	P_INMEM		0x10000000 /* Loaded into memory. */
@@ -647,6 +648,11 @@ struct proc {
 /* These flags are kept in p_flag2. */
 #define	P2_INHERIT_PROTECTED 0x00000001 /* New children get P_PROTECTED. */
 
+/* Flags protected by proctree_lock, kept in p_treeflags. */
+#define	P_TREE_ORPHANED		0x00000001	/* Reparented, on orphan list */
+#define	P_TREE_FIRST_ORPHAN	0x00000002	/* First element of orphan
+						   list */
+
 /*
  * These were process status values (p_stat), now they are only used in
  * legacy conversion code.
@@ -887,6 +893,7 @@ int	proc_getenvv(struct thread *td, struct proc *p, struct sbuf *sb);
 void	procinit(void);
 void	proc_linkup0(struct proc *p, struct thread *td);
 void	proc_linkup(struct proc *p, struct thread *td);
+struct proc *proc_realparent(struct proc *child);
 void	proc_reap(struct thread *td, struct proc *p, int *status, int options);
 void	proc_reparent(struct proc *child, struct proc *newparent);
 struct	pstats *pstats_alloc(void);
diff --git a/sys/sys/procdesc.h b/sys/sys/procdesc.h
index b48b79ab25cb..1a3bc98d1322 100644
--- a/sys/sys/procdesc.h
+++ b/sys/sys/procdesc.h
@@ -48,7 +48,7 @@
  * Locking key:
  * (c) - Constant after initial setup.
  * (p) - Protected by the process descriptor mutex.
- * (r) - Atomic eference count.
+ * (r) - Atomic reference count.
  * (s) - Protected by selinfo.
  * (t) - Protected by the proctree_lock
  */
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index 8553bafdff16..ce8dd7423fad 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -64,8 +64,7 @@ struct sockopt;
  * similar to the vnode VOP interface.
  */
 /* USE THESE FOR YOUR PROTOTYPES ! */
-typedef void	pr_input_t (struct mbuf *, int);
-typedef int	pr_input6_t (struct mbuf **, int*, int);  /* XXX FIX THIS */
+typedef int	pr_input_t (struct mbuf **, int*, int);
 typedef int	pr_output_t (struct mbuf *, struct socket *);
 typedef void	pr_ctlinput_t (int, struct sockaddr *, void *);
 typedef int	pr_ctloutput_t (struct socket *, struct sockopt *);
diff --git a/sys/sys/rman.h b/sys/sys/rman.h
index 1914a72c858f..d98dac7f1526 100644
--- a/sys/sys/rman.h
+++ b/sys/sys/rman.h
@@ -42,8 +42,8 @@
 #define	RF_ALLOCATED	0x0001	/* resource has been reserved */
 #define	RF_ACTIVE	0x0002	/* resource allocation has been activated */
 #define	RF_SHAREABLE	0x0004	/* resource permits contemporaneous sharing */
-#define	RF_TIMESHARE	0x0008	/* resource permits time-division sharing */
-#define	RF_WANTED	0x0010	/* somebody is waiting for this resource */
+#define	RF_SPARE1	0x0008
+#define	RF_SPARE2	0x0010
 #define	RF_FIRSTSHARE	0x0020	/* first in sharing list */
 #define	RF_PREFETCHABLE	0x0040	/* resource is prefetchable */
 #define	RF_OPTIONAL	0x0080	/* for bus_alloc_resources() */
diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h
index ca820f68bce1..eda1a12b1e97 100644
--- a/sys/sys/sdt.h
+++ b/sys/sys/sdt.h
@@ -33,8 +33,6 @@
 
 #ifndef _KERNEL
 
-#define	_DTRACE_VERSION	1
-
 #define	DTRACE_PROBE(prov, name) {				\
 	extern void __dtrace_##prov##___##name(void);		\
 	__dtrace_##prov##___##name();				\
diff --git a/sys/sys/sf_buf.h b/sys/sys/sf_buf.h
index c30c7c0b2e19..7ab944328e99 100644
--- a/sys/sys/sf_buf.h
+++ b/sys/sys/sf_buf.h
@@ -1,4 +1,5 @@
 /*-
+ * Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org>
  * Copyright (c) 2003-2004 Alan L. Cox <alc@cs.rice.edu>
  * All rights reserved.
  *
@@ -29,6 +30,152 @@
 #ifndef _SYS_SF_BUF_H_
 #define _SYS_SF_BUF_H_
 
+struct sfstat {				/* sendfile statistics */
+	uint64_t	sf_iocnt;	/* times sendfile had to do disk I/O */
+	uint64_t	sf_allocfail;	/* times sfbuf allocation failed */
+	uint64_t	sf_allocwait;	/* times sfbuf allocation had to wait */
+};
+
+#ifdef _KERNEL
+#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/counter.h>
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_page.h>
+
+/*
+ * Sf_bufs, or sendfile(2) buffers provide a vm_page that is mapped
+ * into kernel address space. Note, that they aren't used only
+ * by sendfile(2)!
+ *
+ * Sf_bufs could be implemented as a feature of vm_page_t, but that
+ * would require growth of the structure. That's why they are implemented
+ * as a separate hash indexed by vm_page address. Implementation lives in
+ * kern/subr_sfbuf.c. Meanwhile, most 64-bit machines have a physical map,
+ * so they don't require this hash at all, thus ignore subr_sfbuf.c.
+ *
+ * Different 32-bit architectures demand different requirements on sf_buf
+ * hash and functions. They request features in machine/vmparam.h, which
+ * enable parts of this file. They can also optionally provide helpers in
+ * machine/sf_buf.h
+ *
+ * Defines are:
+ * SFBUF		This machine requires sf_buf hash.
+ * 			subr_sfbuf.c should be compiled.
+ * SFBUF_CPUSET		This machine can perform SFB_CPUPRIVATE mappings,
+ *			that do no invalidate cache on the rest of CPUs.
+ * SFBUF_NOMD		This machine doesn't have machine/sf_buf.h
+ *
+ * SFBUF_OPTIONAL_DIRECT_MAP	Value of this define is used as boolean
+ *				variable that tells whether machine is
+ *				capable of direct map or not at runtime.
+ * SFBUF_MAP		This machine provides its own sf_buf_map() and
+ *			sf_buf_unmap().
+ * SFBUF_PROCESS_PAGE	This machine provides sf_buf_process_page()
+ *			function.
+ */
+
+#ifdef SFBUF
+#if defined(SMP) && defined(SFBUF_CPUSET)
+#include <sys/_cpuset.h>
+#endif
+#include <sys/queue.h>
+
+struct sf_buf {
+	LIST_ENTRY(sf_buf)	list_entry;	/* list of buffers */
+	TAILQ_ENTRY(sf_buf)	free_entry;	/* list of buffers */
+	vm_page_t		m;		/* currently mapped page */
+	vm_offset_t		kva;		/* va of mapping */
+	int			ref_count;	/* usage of this mapping */
+#if defined(SMP) && defined(SFBUF_CPUSET)
+	cpuset_t		cpumask;	/* where mapping is valid */
+#endif
+};
+#else /* ! SFBUF */
+struct sf_buf;
+#endif /* SFBUF */
+
+#ifndef SFBUF_NOMD
+#include <machine/sf_buf.h>
+#endif
+#ifdef SFBUF_OPTIONAL_DIRECT_MAP
+#include <machine/md_var.h>
+#endif
+
+#ifdef SFBUF
+struct sf_buf *sf_buf_alloc(struct vm_page *, int);
+void sf_buf_free(struct sf_buf *);
+void sf_buf_ref(struct sf_buf *);
+
+static inline vm_offset_t
+sf_buf_kva(struct sf_buf *sf)
+{
+#ifdef SFBUF_OPTIONAL_DIRECT_MAP
+	if (SFBUF_OPTIONAL_DIRECT_MAP)
+		return (VM_PAGE_TO_PHYS((vm_page_t)sf));
+#endif
+
+        return (sf->kva);
+}
+
+static inline vm_page_t
+sf_buf_page(struct sf_buf *sf)
+{
+#ifdef SFBUF_OPTIONAL_DIRECT_MAP
+	if (SFBUF_OPTIONAL_DIRECT_MAP)
+		return ((vm_page_t)sf);
+#endif
+
+        return (sf->m);
+}
+
+#ifndef SFBUF_MAP
+#include <vm/pmap.h>
+
+static inline void
+sf_buf_map(struct sf_buf *sf, int flags)
+{
+
+	pmap_qenter(sf->kva, &sf->m, 1);
+}
+
+static inline int
+sf_buf_unmap(struct sf_buf *sf)
+{
+
+	return (0);
+}
+#endif /* SFBUF_MAP */
+
+#if defined(SMP) && defined(SFBUF_CPUSET)
+void sf_buf_shootdown(struct sf_buf *, int);
+#endif
+
+#ifdef SFBUF_PROCESS_PAGE
+boolean_t sf_buf_process_page(vm_page_t, void (*)(struct sf_buf *));
+#endif
+
+#else /* ! SFBUF */
+
+static inline struct sf_buf *
+sf_buf_alloc(struct vm_page *m, int pri)
+{
+
+	return ((struct sf_buf *)m);
+}
+
+static inline void
+sf_buf_free(struct sf_buf *sf)
+{
+}
+
+static inline void
+sf_buf_ref(struct sf_buf *sf)
+{
+}
+#endif /* SFBUF */
+
 /*
  * Options to sf_buf_alloc() are specified through its flags argument.  This
  * argument's value should be the result of a bitwise or'ing of one or more
@@ -40,27 +187,10 @@
 #define	SFB_DEFAULT	0
 #define	SFB_NOWAIT	4		/* Return NULL if all bufs are used. */
 
-struct vm_page;
-
-struct sfstat {				/* sendfile statistics */
-	uint64_t	sf_iocnt;	/* times sendfile had to do disk I/O */
-	uint64_t	sf_allocfail;	/* times sfbuf allocation failed */
-	uint64_t	sf_allocwait;	/* times sfbuf allocation had to wait */
-};
-
-#ifdef _KERNEL
-#include <machine/sf_buf.h>
-#include <sys/systm.h>
-#include <sys/counter.h>
-struct mbuf;	/* for sf_buf_mext() */
-
 extern counter_u64_t sfstat[sizeof(struct sfstat) / sizeof(uint64_t)];
 #define	SFSTAT_ADD(name, val)	\
     counter_u64_add(sfstat[offsetof(struct sfstat, name) / sizeof(uint64_t)],\
 	(val))
 #define	SFSTAT_INC(name)	SFSTAT_ADD(name, 1)
 #endif /* _KERNEL */
-
-int	sf_buf_mext(struct mbuf *mb, void *addr, void *args);
-
 #endif /* !_SYS_SF_BUF_H_ */
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index c784cfa73958..f7fcaa9c4cae 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -63,7 +63,7 @@ struct sigacts {
 	sigset_t ps_osigset;		/* Signals using <= 3.x osigset_t. */
 	sigset_t ps_usertramp;		/* SunOS compat; libc sigtramp. XXX */
 	int	ps_flag;
-	int	ps_refcnt;
+	u_int	ps_refcnt;
 	struct mtx ps_mtx;
 };
 
diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h
index ed11b34ddab0..2694e336695e 100644
--- a/sys/sys/syscallsubr.h
+++ b/sys/sys/syscallsubr.h
@@ -239,6 +239,7 @@ int	kern_ktimer_settime(struct thread *td, int timer_id, int flags,
 	    struct itimerspec *val, struct itimerspec *oval);
 int	kern_ktimer_gettime(struct thread *td, int timer_id,
 	    struct itimerspec *val);
+int	kern_ktimer_getoverrun(struct thread *td, int timer_id);
 int	kern_thr_new(struct thread *td, struct thr_param *param);
 int	kern_thr_suspend(struct thread *td, struct timespec *tsp);
 int	kern_truncate(struct thread *td, char *path, enum uio_seg pathseg,
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 62469978d255..21ad521800e6 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -83,7 +83,7 @@ struct ctlname {
 #define	CTLFLAG_DYN	0x02000000	/* Dynamic oid - can be freed */
 #define	CTLFLAG_SKIP	0x01000000	/* Skip this sysctl when listing */
 #define	CTLMASK_SECURE	0x00F00000	/* Secure level */
-#define	CTLFLAG_TUN	0x00080000	/* Tunable variable */
+#define	CTLFLAG_TUN	0x00080000	/* Default value is loaded from getenv() */
 #define	CTLFLAG_RDTUN	(CTLFLAG_RD|CTLFLAG_TUN)
 #define	CTLFLAG_RWTUN	(CTLFLAG_RW|CTLFLAG_TUN)
 #define	CTLFLAG_MPSAFE	0x00040000	/* Handler is MP safe */
@@ -92,6 +92,7 @@ struct ctlname {
 #define	CTLFLAG_CAPRD	0x00008000	/* Can be read in capability mode */
 #define	CTLFLAG_CAPWR	0x00004000	/* Can be written in capability mode */
 #define	CTLFLAG_STATS	0x00002000	/* Statistics, not a tuneable */
+#define	CTLFLAG_NOFETCH	0x00001000	/* Don't fetch tunable from getenv() */
 #define	CTLFLAG_CAPRW	(CTLFLAG_CAPRD|CTLFLAG_CAPWR)
 
 /*
@@ -130,7 +131,7 @@ struct ctlname {
 #define	REQ_WIRED	2
 
 /* definitions for sysctl_req 'flags' member */
-#if defined(__amd64__) || defined(__ia64__) || defined(__powerpc64__) ||\
+#if defined(__amd64__) || defined(__powerpc64__) ||\
     (defined(__mips__) && defined(__mips_n64))
 #define	SCTL_MASK32	1	/* 32 bit emulation */
 #endif
@@ -161,6 +162,7 @@ SLIST_HEAD(sysctl_oid_list, sysctl_oid);
  * be hidden behind it, expanded by the handler.
  */
 struct sysctl_oid {
+	struct sysctl_oid_list oid_children;
 	struct sysctl_oid_list *oid_parent;
 	SLIST_ENTRY(sysctl_oid) oid_link;
 	int		 oid_number;
@@ -200,14 +202,16 @@ void sysctl_register_oid(struct sysctl_oid *oidp);
 void sysctl_unregister_oid(struct sysctl_oid *oidp);
 
 /* Declare a static oid to allow child oids to be added to it. */
-#define	SYSCTL_DECL(name)						\
-	extern struct sysctl_oid_list sysctl_##name##_children
+#define	SYSCTL_DECL(name)			\
+	extern struct sysctl_oid sysctl__##name
 
 /* Hide these in macros. */
-#define	SYSCTL_CHILDREN(oid_ptr)					\
-	(struct sysctl_oid_list *)(oid_ptr)->oid_arg1
-#define	SYSCTL_CHILDREN_SET(oid_ptr, val)	(oid_ptr)->oid_arg1 = (val)
-#define	SYSCTL_STATIC_CHILDREN(oid_name)	(&sysctl_##oid_name##_children)
+#define	SYSCTL_CHILDREN(oid_ptr)		(&(oid_ptr)->oid_children)
+#define	SYSCTL_PARENT(oid_ptr)					\
+    (((oid_ptr)->oid_parent != &sysctl__children) ?		\
+	__containerof((oid_ptr)->oid_parent, struct sysctl_oid,	\
+	oid_children) : (struct sysctl_oid *)NULL)
+#define	SYSCTL_STATIC_CHILDREN(oid_name)	(&sysctl__##oid_name.oid_children)
 
 /* === Structs and macros related to context handling. === */
 
@@ -220,7 +224,7 @@ struct sysctl_ctx_entry {
 TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry);
 
 #define	SYSCTL_NODE_CHILDREN(parent, name) \
-	sysctl_##parent##_##name##_children
+	sysctl__##parent##_##name.oid_children
 
 /*
  * These macros provide type safety for sysctls.  SYSCTL_ALLOWED_TYPES()
@@ -275,37 +279,56 @@ SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a; unsigned long long *b; );
 #define	__DESCR(d) ""
 #endif
 
-/* This constructs a "raw" MIB oid. */
-#define	SYSCTL_OID(parent, nbr, name, kind, a1, a2, handler, fmt, descr)\
-	static struct sysctl_oid sysctl__##parent##_##name = {		\
-		&sysctl_##parent##_children,				\
-		{ NULL },						\
-		nbr,							\
-		kind,							\
-		a1,							\
-		a2,							\
-		#name,							\
-		handler,						\
-		fmt,							\
-		0,							\
-		0,							\
-		__DESCR(descr)						\
-		};							\
-	DATA_SET(sysctl_set, sysctl__##parent##_##name)
+/* This macro is only for internal use */
+#define	SYSCTL_OID_RAW(id, parent_child_head, nbr, name, kind, a1, a2, handler, fmt, descr) \
+	struct sysctl_oid id = {					\
+		.oid_parent = (parent_child_head),			\
+		.oid_children = SLIST_HEAD_INITIALIZER(&id.oid_children), \
+		.oid_number = (nbr),					\
+		.oid_kind = (kind),					\
+		.oid_arg1 = (a1),					\
+		.oid_arg2 = (a2),					\
+		.oid_name = (name),					\
+		.oid_handler = (handler),				\
+		.oid_fmt = (fmt),					\
+		.oid_descr = __DESCR(descr)				\
+	};								\
+	DATA_SET(sysctl_set, id)
+
+/* This constructs a static "raw" MIB oid. */
+#define	SYSCTL_OID(parent, nbr, name, kind, a1, a2, handler, fmt, descr) \
+    static SYSCTL_OID_RAW(sysctl__##parent##_##name, \
+	SYSCTL_CHILDREN(&sysctl__##parent), \
+	nbr, #name, kind, a1, a2, handler, fmt, descr)
+
+/* This constructs a global "raw" MIB oid. */
+#define	SYSCTL_OID_GLOBAL(parent, nbr, name, kind, a1, a2, handler, fmt, descr) \
+    SYSCTL_OID_RAW(sysctl__##parent##_##name, \
+	SYSCTL_CHILDREN(&sysctl__##parent),	\
+	nbr, #name, kind, a1, a2, handler, fmt, descr)
 
 #define	SYSCTL_ADD_OID(ctx, parent, nbr, name, kind, a1, a2, handler, fmt, descr) \
 	sysctl_add_oid(ctx, parent, nbr, name, kind, a1, a2, handler, fmt, __DESCR(descr))
 
+/* This constructs a root node from which other nodes can hang. */
+#define	SYSCTL_ROOT_NODE(nbr, name, access, handler, descr)	\
+	SYSCTL_OID_RAW(sysctl___##name, &sysctl__children,	\
+		nbr, #name, CTLTYPE_NODE|(access), NULL, 0,	\
+		handler, "N", descr)
+
 /* This constructs a node from which other oids can hang. */
 #define	SYSCTL_NODE(parent, nbr, name, access, handler, descr)		    \
-	struct sysctl_oid_list SYSCTL_NODE_CHILDREN(parent, name);	    \
-	SYSCTL_OID(parent, nbr, name, CTLTYPE_NODE|(access),		    \
-	    (void*)&SYSCTL_NODE_CHILDREN(parent, name), 0, handler, "N", descr)
+	SYSCTL_OID_GLOBAL(parent, nbr, name, CTLTYPE_NODE|(access),	    \
+		NULL, 0, handler, "N", descr)
 
 #define	SYSCTL_ADD_NODE(ctx, parent, nbr, name, access, handler, descr)	    \
 	sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_NODE|(access),	    \
 	NULL, 0, handler, "N", __DESCR(descr))
 
+#define	SYSCTL_ADD_ROOT_NODE(ctx, nbr, name, access, handler, descr)	\
+	sysctl_add_oid(ctx, &sysctl__children, nbr, name,		\
+        CTLTYPE_NODE|(access), NULL, 0, handler, "N", __DESCR(descr))
+
 /* Oid for a string.  len can be 0 to indicate '\0' termination. */
 #define	SYSCTL_STRING(parent, nbr, name, access, arg, len, descr) \
 	SYSCTL_OID(parent, nbr, name, CTLTYPE_STRING|(access), \
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index c49db41844ac..0f1c256135f1 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -155,7 +155,7 @@ extern struct sysentvec null_sysvec;
 extern struct sysent sysent[];
 extern const char *syscallnames[];
 
-#if defined(__amd64__) || defined(__ia64__)
+#if defined(__amd64__)
 extern int i386_read_exec;
 #endif
 
diff --git a/sys/sys/terminal.h b/sys/sys/terminal.h
index 1809c0ac941c..15641dcc634d 100644
--- a/sys/sys/terminal.h
+++ b/sys/sys/terminal.h
@@ -41,6 +41,9 @@
 
 #include <teken/teken.h>
 
+#include "opt_syscons.h"
+#include "opt_teken.h"
+
 struct terminal;
 struct thread;
 struct tty;
@@ -71,11 +74,71 @@ typedef uint32_t term_char_t;
 #define	TCHAR_CHARACTER(c)	((c) & 0x1fffff)
 #define	TCHAR_FORMAT(c)		(((c) >> 21) & 0x1f)
 #define	TCHAR_FGCOLOR(c)	(((c) >> 26) & 0x7)
-#define	TCHAR_BGCOLOR(c)	((c) >> 29)
+#define	TCHAR_BGCOLOR(c)	(((c) >> 29) & 0x7)
+
+typedef teken_attr_t term_attr_t;
 
 typedef teken_color_t term_color_t;
+#define	TCOLOR_FG(c)	(((c) & 0x7) << 26)
+#define	TCOLOR_BG(c)	(((c) & 0x7) << 29)
 #define	TCOLOR_LIGHT(c)	((c) | 0x8)
 #define	TCOLOR_DARK(c)	((c) & ~0x8)
+
+#define	TFORMAT(c)	(((c) & 0x1f) << 21)
+
+/* syscons(4) compatible color attributes for foreground text */
+#define	FG_BLACK		TCOLOR_FG(TC_BLACK)
+#define	FG_BLUE			TCOLOR_FG(TC_BLUE)
+#define	FG_GREEN		TCOLOR_FG(TC_GREEN)
+#define	FG_CYAN			TCOLOR_FG(TC_CYAN)
+#define	FG_RED			TCOLOR_FG(TC_RED)
+#define	FG_MAGENTA		TCOLOR_FG(TC_MAGENTA)
+#define	FG_BROWN		TCOLOR_FG(TC_BROWN)
+#define	FG_LIGHTGREY		TCOLOR_FG(TC_WHITE)
+#define	FG_DARKGREY		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_BLACK))
+#define	FG_LIGHTBLUE		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_BLUE))
+#define	FG_LIGHTGREEN		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_GREEN))
+#define	FG_LIGHTCYAN		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_CYAN))
+#define	FG_LIGHTRED		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_RED))
+#define	FG_LIGHTMAGENTA		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_MAGENTA))
+#define	FG_YELLOW		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_BROWN))
+#define	FG_WHITE		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_WHITE))
+#define	FG_BLINK		TFORMAT(TF_BLINK)
+
+/* syscons(4) compatible color attributes for text background */
+#define	BG_BLACK		TCOLOR_BG(TC_BLACK)
+#define	BG_BLUE			TCOLOR_BG(TC_BLUE)
+#define	BG_GREEN		TCOLOR_BG(TC_GREEN)
+#define	BG_CYAN			TCOLOR_BG(TC_CYAN)
+#define	BG_RED			TCOLOR_BG(TC_RED)
+#define	BG_MAGENTA		TCOLOR_BG(TC_MAGENTA)
+#define	BG_BROWN		TCOLOR_BG(TC_BROWN)
+#define	BG_LIGHTGREY		TCOLOR_BG(TC_WHITE)
+#define	BG_DARKGREY		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_BLACK))
+#define	BG_LIGHTBLUE		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_BLUE))
+#define	BG_LIGHTGREEN		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_GREEN))
+#define	BG_LIGHTCYAN		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_CYAN))
+#define	BG_LIGHTRED		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_RED))
+#define	BG_LIGHTMAGENTA		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_MAGENTA))
+#define	BG_YELLOW		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_BROWN))
+#define	BG_WHITE		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_WHITE))
+
+#ifndef TERMINAL_NORM_ATTR
+#ifdef SC_NORM_ATTR
+#define	TERMINAL_NORM_ATTR	SC_NORM_ATTR
+#else
+#define	TERMINAL_NORM_ATTR	(FG_LIGHTGREY | BG_BLACK)
+#endif
+#endif
+
+#ifndef TERMINAL_KERN_ATTR
+#ifdef SC_KERNEL_CONS_ATTR
+#define	TERMINAL_KERN_ATTR	SC_KERNEL_CONS_ATTR
+#else
+#define	TERMINAL_KERN_ATTR	(FG_WHITE | BG_BLACK)
+#endif
+#endif
+
 typedef teken_pos_t term_pos_t;
 typedef teken_rect_t term_rect_t;
 
@@ -138,7 +201,7 @@ struct terminal {
 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);
+    const struct winsize *size, int blank, const term_attr_t *attr);
 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);
diff --git a/sys/sys/time.h b/sys/sys/time.h
index 9d3deadac76a..1f0a5301e612 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -129,7 +129,7 @@ bintime_shift(struct bintime *_bt, int _exp)
 #define	SBT_1MS	(SBT_1S / 1000)
 #define	SBT_1US	(SBT_1S / 1000000)
 #define	SBT_1NS	(SBT_1S / 1000000000)
-#define	SBT_MAX	INT64_MAX
+#define	SBT_MAX	0x7fffffffffffffffLL
 
 static __inline int
 sbintime_getsec(sbintime_t _sbt)
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index b0cbcc078428..2bc4a46165ea 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -593,6 +593,8 @@ struct uio;
 struct vattr;
 struct vnode;
 
+typedef int (*vn_get_ino_t)(struct mount *, void *, int, struct vnode **);
+
 /* cache_* may belong in namei.h. */
 #define	cache_enter(dvp, vp, cnp)					\
 	cache_enter_time(dvp, vp, cnp, NULL, NULL)
@@ -696,6 +698,10 @@ int	vn_extattr_rm(struct vnode *vp, int ioflg, int attrnamespace,
 	    const char *attrname, struct thread *td);
 int	vn_vget_ino(struct vnode *vp, ino_t ino, int lkflags,
 	    struct vnode **rvp);
+int	vn_vget_ino_gen(struct vnode *vp, vn_get_ino_t alloc,
+	    void *alloc_arg, int lkflags, struct vnode **rvp);
+int	vn_utimes_perm(struct vnode *vp, struct vattr *vap,
+	    struct ucred *cred, struct thread *td);
 
 int	vn_io_fault_uiomove(char *data, int xfersize, struct uio *uio);
 int	vn_io_fault_pgmove(vm_page_t ma[], vm_offset_t offset, int xfersize,
@@ -715,6 +721,7 @@ int	vfs_cache_lookup(struct vop_lookup_args *ap);
 void	vfs_timestamp(struct timespec *);
 void	vfs_write_resume(struct mount *mp, int flags);
 int	vfs_write_suspend(struct mount *mp, int flags);
+int	vfs_write_suspend_umnt(struct mount *mp);
 int	vop_stdbmap(struct vop_bmap_args *);
 int	vop_stdfsync(struct vop_fsync_args *);
 int	vop_stdgetwritemount(struct vop_getwritemount_args *);
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 0760f3ec969f..ecb7ffaf4fdd 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -908,9 +908,9 @@ static	void add_to_worklist(struct worklist *, int);
 static	void wake_worklist(struct worklist *);
 static	void wait_worklist(struct worklist *, char *);
 static	void remove_from_worklist(struct worklist *);
-static	void softdep_flush(void);
+static	void softdep_flush(void *);
 static	void softdep_flushjournal(struct mount *);
-static	int softdep_speedup(void);
+static	int softdep_speedup(struct ufsmount *);
 static	void worklist_speedup(struct mount *);
 static	int journal_mount(struct mount *, struct fs *, struct ucred *);
 static	void journal_unmount(struct ufsmount *);
@@ -931,6 +931,7 @@ static	inline struct jsegdep *inoref_jseg(struct inoref *);
 static	struct jmvref *newjmvref(struct inode *, ino_t, off_t, off_t);
 static	struct jfreeblk *newjfreeblk(struct freeblks *, ufs_lbn_t,
 	    ufs2_daddr_t, int);
+static	void adjust_newfreework(struct freeblks *, int);
 static	struct jtrunc *newjtrunc(struct freeblks *, off_t, int);
 static	void move_newblock_dep(struct jaddref *, struct inodedep *);
 static	void cancel_jfreeblk(struct freeblks *, ufs2_daddr_t);
@@ -962,18 +963,21 @@ 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");
+static struct mtx lk;
+MTX_SYSINIT(softdep_lock, &lk, "Global Softdep Lock", MTX_DEF);
+
+#define ACQUIRE_GBLLOCK(lk)	mtx_lock(lk)
+#define FREE_GBLLOCK(lk)	mtx_unlock(lk)
+#define GBLLOCK_OWNED(lk)	mtx_assert((lk), MA_OWNED)
 
 /*
- * Allow per-filesystem soft-updates locking.
- * For now all use the same global lock defined above.
+ * Per-filesystem soft-updates locking.
  */
-#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, \
+#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)
@@ -1178,7 +1182,7 @@ workitem_free(item, 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]--;
+	atomic_subtract_long(&dep_current[item->wk_type], 1);
 	ump->softdep_curdeps[item->wk_type] -= 1;
 	free(item, DtoM(type));
 }
@@ -1196,11 +1200,13 @@ workitem_alloc(item, type, mp)
 	item->wk_state = 0;
 
 	ump = VFSTOUFS(mp);
-	ACQUIRE_LOCK(ump);
+	ACQUIRE_GBLLOCK(&lk);
 	dep_current[type]++;
 	if (dep_current[type] > dep_highuse[type])
 		dep_highuse[type] = dep_current[type];
 	dep_total[type]++;
+	FREE_GBLLOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	ump->softdep_curdeps[type] += 1;
 	ump->softdep_deps++;
 	ump->softdep_accdeps++;
@@ -1224,11 +1230,13 @@ workitem_reassign(item, newtype)
 	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)));
-	dep_current[item->wk_type]--;
+	ACQUIRE_GBLLOCK(&lk);
 	dep_current[newtype]++;
+	dep_current[item->wk_type]--;
 	if (dep_current[newtype] > dep_highuse[newtype])
 		dep_highuse[newtype] = dep_current[newtype];
 	dep_total[newtype]++;
+	FREE_GBLLOCK(&lk);
 	item->wk_type = newtype;
 }
 
@@ -1236,13 +1244,10 @@ workitem_reassign(item, newtype)
  * Workitem queue management
  */
 static int max_softdeps;	/* maximum number of structs before slowdown */
-static int maxindirdeps = 50;	/* max number of indirdeps before slowdown */
 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 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? */
@@ -1250,7 +1255,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_flush_threads;	/* number of softdep flushing threads */
 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 */
@@ -1281,10 +1286,8 @@ SYSCTL_INT(_debug_softdep, OID_AUTO, max_softdeps, CTLFLAG_RW,
     &max_softdeps, 0, "");
 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, flush_threads, CTLFLAG_RD,
+    &stat_flush_threads, 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,
@@ -1344,53 +1347,67 @@ SYSCTL_DECL(_vfs_ffs);
 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",
-	softdep_flush,
-	&softdepproc
-};
-SYSINIT(sdproc, SI_SUB_KTHREAD_UPDATE, SI_ORDER_ANY, kproc_start,
-    &softdep_kp);
+static int print_threads = 0;
+SYSCTL_INT(_debug_softdep, OID_AUTO, print_threads, CTLFLAG_RW,
+    &print_threads, 0, "Notify flusher thread start/stop");
 
+/* List of all filesystems mounted with soft updates */
+static TAILQ_HEAD(, mount_softdeps) softdepmounts;
+
+/*
+ * This function cleans the worklist for a filesystem.
+ * Each filesystem running with soft dependencies gets its own
+ * thread to run in this function. The thread is started up in
+ * softdep_mount and shutdown in softdep_unmount. They show up
+ * as part of the kernel "bufdaemon" process whose process
+ * entry is available in bufdaemonproc.
+ */
+static int searchfailed;
+extern struct proc *bufdaemonproc;
 static void
-softdep_flush(void)
+softdep_flush(addr)
+	void *addr;
 {
-	struct mount *nmp;
 	struct mount *mp;
-	struct ufsmount *ump;
 	struct thread *td;
-	int remaining;
-	int progress;
+	struct ufsmount *ump;
 
 	td = curthread;
 	td->td_pflags |= TDP_NORUNNINGBUF;
-
+	mp = (struct mount *)addr;
+	ump = VFSTOUFS(mp);
+	atomic_add_int(&stat_flush_threads, 1);
+	if (print_threads) {
+		if (stat_flush_threads == 1)
+			printf("Running %s at pid %d\n", bufdaemonproc->p_comm,
+			    bufdaemonproc->p_pid);
+		printf("Start thread %s\n", td->td_name);
+	}
 	for (;;) {	
-		kproc_suspend_check(softdepproc);
-		remaining = progress = 0;
-		mtx_lock(&mountlist_mtx);
-		for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp)  {
-			nmp = TAILQ_NEXT(mp, mnt_list);
-			if (MOUNTEDSOFTDEP(mp) == 0)
-				continue;
-			if (vfs_busy(mp, MBF_NOWAIT | MBF_MNTLSTLOCK))
-				continue;
-			ump = VFSTOUFS(mp);
-			progress += softdep_process_worklist(mp, 0);
-			remaining += ump->softdep_on_worklist;
-			mtx_lock(&mountlist_mtx);
-			nmp = TAILQ_NEXT(mp, mnt_list);
-			vfs_unbusy(mp);
-		}
-		mtx_unlock(&mountlist_mtx);
-		if (remaining && progress)
+		while (softdep_process_worklist(mp, 0) > 0 ||
+		    (MOUNTEDSUJ(mp) &&
+		    VFSTOUFS(mp)->softdep_jblocks->jb_suspended))
+			kthread_suspend_check();
+		ACQUIRE_LOCK(ump);
+		if ((ump->softdep_flags & FLUSH_CLEANUP) == 0)
+			msleep(&ump->softdep_flushtd, LOCK_PTR(ump), PVM,
+			    "sdflush", hz / 2);
+		ump->softdep_flags &= ~FLUSH_CLEANUP;
+		/*
+		 * Check to see if we are done and need to exit.
+		 */
+		if ((ump->softdep_flags & FLUSH_EXIT) == 0) {
+			FREE_LOCK(ump);
 			continue;
-		rw_wlock(&lk);
-		if (req_pending == NULL)
-			msleep(&req_pending, &lk, PVM, "sdflush", hz);
-		req_pending = NULL;
-		rw_wunlock(&lk);
+		}
+		ump->softdep_flags &= ~FLUSH_EXIT;
+		FREE_LOCK(ump);
+		wakeup(&ump->softdep_flags);
+		if (print_threads)
+			printf("Stop thread %s: searchfailed %d, did cleanups %d\n", td->td_name, searchfailed, ump->um_softdep->sd_cleanups);
+		atomic_subtract_int(&stat_flush_threads, 1);
+		kthread_exit();
+		panic("kthread_exit failed\n");
 	}
 }
 
@@ -1398,19 +1415,70 @@ static void
 worklist_speedup(mp)
 	struct mount *mp;
 {
-	rw_assert(&lk, RA_WLOCKED);
-	if (req_pending == 0) {
-		req_pending = mp;
-		wakeup(&req_pending);
+	struct ufsmount *ump;
+
+	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
+	if ((ump->softdep_flags & (FLUSH_CLEANUP | FLUSH_EXIT)) == 0) {
+		ump->softdep_flags |= FLUSH_CLEANUP;
+		if (ump->softdep_flushtd->td_wchan == &ump->softdep_flushtd)
+			wakeup(&ump->softdep_flushtd);
 	}
 }
 
 static int
-softdep_speedup(void)
+softdep_speedup(ump)
+	struct ufsmount *ump;
 {
+	struct ufsmount *altump;
+	struct mount_softdeps *sdp;
 
-	worklist_speedup(ALLCLEAN);
+	LOCK_OWNED(ump);
+	worklist_speedup(ump->um_mountp);
 	bd_speedup();
+	/*
+	 * If we have global shortages, then we need other
+	 * filesystems to help with the cleanup. Here we wakeup a
+	 * flusher thread for a filesystem that is over its fair
+	 * share of resources.
+	 */
+	if (req_clear_inodedeps || req_clear_remove) {
+		ACQUIRE_GBLLOCK(&lk);
+		TAILQ_FOREACH(sdp, &softdepmounts, sd_next) {
+			if ((altump = sdp->sd_ump) == ump)
+				continue;
+			if (((req_clear_inodedeps &&
+			    altump->softdep_curdeps[D_INODEDEP] >
+			    max_softdeps / stat_flush_threads) ||
+			    (req_clear_remove &&
+			    altump->softdep_curdeps[D_DIRREM] >
+			    (max_softdeps / 2) / stat_flush_threads)) &&
+			    TRY_ACQUIRE_LOCK(altump))
+				break;
+		}
+		if (sdp == NULL) {
+			searchfailed++;
+			FREE_GBLLOCK(&lk);
+		} else {
+			/*
+			 * Move to the end of the list so we pick a
+			 * different one on out next try.
+			 */
+			TAILQ_REMOVE(&softdepmounts, sdp, sd_next);
+			TAILQ_INSERT_TAIL(&softdepmounts, sdp, sd_next);
+			FREE_GBLLOCK(&lk);
+			if ((altump->softdep_flags &
+			    (FLUSH_CLEANUP | FLUSH_EXIT)) == 0) {
+				altump->softdep_flags |= FLUSH_CLEANUP;
+				altump->um_softdep->sd_cleanups++;
+				if (altump->softdep_flushtd->td_wchan ==
+				    &altump->softdep_flushtd) {
+					wakeup(&altump->softdep_flushtd);
+				}
+			}
+			FREE_LOCK(altump);
+		}
+	}
 	return (speedup_syncer());
 }
 
@@ -2126,9 +2194,14 @@ inodedep_lookup(mp, inum, flags, inodedeppp)
 	if ((flags & DEPALLOC) == 0)
 		return (0);
 	/*
-	 * If we are over our limit, try to improve the situation.
+	 * If the system is over its limit and our filesystem is
+	 * responsible for more than our share of that usage and
+	 * we are not in a rush, request some inodedep cleanup.
 	 */
-	if (dep_current[D_INODEDEP] > max_softdeps && (flags & NODELAY) == 0)
+	while (dep_current[D_INODEDEP] > max_softdeps &&
+	    (flags & NODELAY) == 0 &&
+	    ump->softdep_curdeps[D_INODEDEP] >
+	    max_softdeps / stat_flush_threads)
 		request_cleanup(mp, FLUSH_INODES);
 	FREE_LOCK(ump);
 	inodedep = malloc(sizeof(struct inodedep),
@@ -2320,6 +2393,7 @@ void
 softdep_initialize()
 {
 
+	TAILQ_INIT(&softdepmounts);
 	max_softdeps = desiredvnodes * 4;
 
 	/* initialise bioops hack */
@@ -2378,7 +2452,8 @@ softdep_mount(devvp, mp, fs, cred)
 	ump = VFSTOUFS(mp);
 	ump->um_softdep = sdp;
 	MNT_IUNLOCK(mp);
-	LOCK_PTR(ump) = &lk;
+	rw_init(LOCK_PTR(ump), "Per-Filesystem Softdep Lock");
+	sdp->sd_ump = ump;
 	LIST_INIT(&ump->softdep_workitem_pending);
 	LIST_INIT(&ump->softdep_journal_pending);
 	TAILQ_INIT(&ump->softdep_unlinked);
@@ -2403,13 +2478,21 @@ softdep_mount(devvp, mp, fs, cred)
 	ump->indir_hash_size = i - 1;
 	for (i = 0; i <= ump->indir_hash_size; i++)
 		TAILQ_INIT(&ump->indir_hashtbl[i]);
+	ACQUIRE_GBLLOCK(&lk);
+	TAILQ_INSERT_TAIL(&softdepmounts, sdp, sd_next);
+	FREE_GBLLOCK(&lk);
 	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);
+	/*
+	 * Start our flushing thread in the bufdaemon process.
+	 */
+	kproc_kthread_add(&softdep_flush, mp, &bufdaemonproc,
+	    &ump->softdep_flushtd, 0, 0, "softdepflush", "%s worker",
+	    mp->mnt_stat.f_mntonname);
 	/*
 	 * When doing soft updates, the counters in the
 	 * superblock may have gotten out of sync. Recomputation
@@ -2465,7 +2548,26 @@ softdep_unmount(mp)
 		MNT_IUNLOCK(mp);
 		journal_unmount(ump);
 	}
-	atomic_subtract_int(&stat_softdep_mounts, 1);
+	/*
+	 * Shut down our flushing thread. Check for NULL is if
+	 * softdep_mount errors out before the thread has been created.
+	 */
+	if (ump->softdep_flushtd != NULL) {
+		ACQUIRE_LOCK(ump);
+		ump->softdep_flags |= FLUSH_EXIT;
+		wakeup(&ump->softdep_flushtd);
+		msleep(&ump->softdep_flags, LOCK_PTR(ump), PVM | PDROP,
+		    "sdwait", 0);
+		KASSERT((ump->softdep_flags & FLUSH_EXIT) == 0,
+		    ("Thread shutdown failed"));
+	}
+	/*
+	 * Free up our resources.
+	 */
+	ACQUIRE_GBLLOCK(&lk);
+	TAILQ_REMOVE(&softdepmounts, ump->um_softdep, sd_next);
+	FREE_GBLLOCK(&lk);
+	rw_destroy(LOCK_PTR(ump));
 	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);
@@ -2788,7 +2890,7 @@ journal_space(ump, thresh)
 	 */
 	limit = (max_softdeps / 10) * 9;
 	if (dep_current[D_INODEDEP] > limit &&
-	    ump->softdep_curdeps[D_INODEDEP] > limit / stat_softdep_mounts)
+	    ump->softdep_curdeps[D_INODEDEP] > limit / stat_flush_threads)
 		return (0);
 	if (thresh)
 		thresh = jblocks->jb_min;
@@ -2813,7 +2915,7 @@ journal_suspend(ump)
 	if ((mp->mnt_kern_flag & MNTK_SUSPEND) == 0) {
 		stat_journal_min++;
 		mp->mnt_kern_flag |= MNTK_SUSPEND;
-		mp->mnt_susp_owner = FIRST_THREAD_IN_PROC(softdepproc);
+		mp->mnt_susp_owner = ump->softdep_flushtd;
 	}
 	jblocks->jb_suspended = 1;
 	MNT_IUNLOCK(mp);
@@ -2888,7 +2990,7 @@ softdep_prealloc(vp, waitok)
 	process_removes(vp);
 	process_truncates(vp);
 	if (journal_space(ump, 0) == 0) {
-		softdep_speedup();
+		softdep_speedup(ump);
 		if (journal_space(ump, 1) == 0)
 			journal_suspend(ump);
 	}
@@ -2932,10 +3034,10 @@ softdep_prelink(dvp, vp)
 	}
 	process_removes(dvp);
 	process_truncates(dvp);
-	softdep_speedup();
+	softdep_speedup(ump);
 	process_worklist_item(UFSTOVFS(ump), 2, LK_NOWAIT);
 	if (journal_space(ump, 0) == 0) {
-		softdep_speedup();
+		softdep_speedup(ump);
 		if (journal_space(ump, 1) == 0)
 			journal_suspend(ump);
 	}
@@ -3257,7 +3359,7 @@ softdep_process_journal(mp, needwk, flags)
 			if (flags != MNT_WAIT)
 				break;
 			printf("softdep: Out of journal space!\n");
-			softdep_speedup();
+			softdep_speedup(ump);
 			msleep(jblocks, LOCK_PTR(ump), PRIBIO, "jblocks", hz);
 		}
 		FREE_LOCK(ump);
@@ -3970,7 +4072,7 @@ 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 the soft updates lock held
+ * freework structures are allocated without the per-filesystem lock held
  * and before the freeblks is visible outside of softdep_setup_freeblocks().
  */
 static struct freework *
@@ -4039,7 +4141,7 @@ 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 the soft updates
+ * a file.  The caller must add this to the worklist when the per-filesystem
  * lock is held.
  */
 static struct jfreeblk *
@@ -4065,6 +4167,33 @@ newjfreeblk(freeblks, lbn, blkno, frags)
 	return (jfreeblk);
 }
 
+/*
+ * The journal is only prepared to handle full-size block numbers, so we
+ * have to adjust the record to reflect the change to a full-size block.
+ * For example, suppose we have a block made up of fragments 8-15 and
+ * want to free its last two fragments. We are given a request that says:
+ *     FREEBLK ino=5, blkno=14, lbn=0, frags=2, oldfrags=0
+ * where frags are the number of fragments to free and oldfrags are the
+ * number of fragments to keep. To block align it, we have to change it to
+ * have a valid full-size blkno, so it becomes:
+ *     FREEBLK ino=5, blkno=8, lbn=0, frags=2, oldfrags=6
+ */
+static void
+adjust_newfreework(freeblks, frag_offset)
+	struct freeblks *freeblks;
+	int frag_offset;
+{
+	struct jfreeblk *jfreeblk;
+
+	KASSERT((LIST_FIRST(&freeblks->fb_jblkdephd) != NULL &&
+	    LIST_FIRST(&freeblks->fb_jblkdephd)->jb_list.wk_type == D_JFREEBLK),
+	    ("adjust_newfreework: Missing freeblks dependency"));
+
+	jfreeblk = WK_JFREEBLK(LIST_FIRST(&freeblks->fb_jblkdephd));
+	jfreeblk->jf_blkno -= frag_offset;
+	jfreeblk->jf_frags += frag_offset;
+}
+
 /*
  * Allocate a new jtrunc to track a partial truncation.
  */
@@ -6432,6 +6561,9 @@ softdep_journal_freeblocks(ip, cred, length, flags)
 				blkno += numfrags(ip->i_fs, frags);
 				newfreework(ump, freeblks, NULL, lastlbn,
 				    blkno, oldfrags, 0, needj);
+				if (needj)
+					adjust_newfreework(freeblks,
+					    numfrags(ip->i_fs, frags));
 			} else if (blkno == 0)
 				allocblock = 1;
 		}
@@ -7419,7 +7551,7 @@ softdep_freefile(pvp, ino, mode)
 			clear_unlinked_inodedep(inodedep);
 			/*
 			 * Re-acquire inodedep as we've dropped the
-			 * soft updates lock in clear_unlinked_inodedep().
+			 * per-filesystem lock in clear_unlinked_inodedep().
 			 */
 			inodedep_lookup(pvp->v_mount, ino, 0, &inodedep);
 		}
@@ -7965,10 +8097,8 @@ indir_trunc(freework, dbn, lbn)
 		 * If we're goingaway, free the indirdep.  Otherwise it will
 		 * linger until the write completes.
 		 */
-		if (goingaway) {
+		if (goingaway)
 			free_indirdep(indirdep);
-			ump->softdep_numindirdeps -= 1;
-		}
 	}
 	FREE_LOCK(ump);
 	/* Initialize pointers depending on block size. */
@@ -8140,7 +8270,7 @@ 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 the soft updates
+ * and updating id_mkdiradd.  This function returns with the per-filesystem
  * lock held.
  */
 static struct mkdir *
@@ -8958,12 +9088,16 @@ newdirrem(bp, dp, ip, isrmdir, prevdirremp)
 		panic("newdirrem: whiteout");
 	dvp = ITOV(dp);
 	/*
-	 * If we are over our limit, try to improve the situation.
+	 * If the system is over its limit and our filesystem is
+	 * responsible for more than our share of that usage and
+	 * we are not a snapshot, request some inodedep cleanup.
 	 * Limiting the number of dirrem structures will also limit
 	 * the number of freefile and freeblks structures.
 	 */
 	ACQUIRE_LOCK(ip->i_ump);
-	if (!IS_SNAPSHOT(ip) && dep_current[D_DIRREM] > max_softdeps / 2)
+	while (!IS_SNAPSHOT(ip) && dep_current[D_DIRREM] > max_softdeps / 2 &&
+	    ip->i_ump->softdep_curdeps[D_DIRREM] >
+	    (max_softdeps / 2) / stat_flush_threads)
 		(void) request_cleanup(ITOV(dp)->v_mount, FLUSH_BLOCKS);
 	FREE_LOCK(ip->i_ump);
 	dirrem = malloc(sizeof(struct dirrem),
@@ -9914,7 +10048,7 @@ 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.
-	 * The soft updates lock may be dropped and re-acquired, however 
+	 * The per-filesystem 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)
@@ -10378,7 +10512,6 @@ cancel_indirdep(indirdep, bp, freeblks)
 		LIST_REMOVE(indirdep, ir_next);
 	}
 	indirdep->ir_state |= GOINGAWAY;
-	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.
@@ -10805,7 +10938,7 @@ softdep_disk_write_complete(bp)
 	ACQUIRE_LOCK(ump);
 	while ((wk = LIST_FIRST(&bp->b_dep)) != NULL) {
 		WORKLIST_REMOVE(wk);
-		dep_write[wk->wk_type]++;
+		atomic_add_long(&dep_write[wk->wk_type], 1);
 		if (wk == owk)
 			panic("duplicate worklist: %p\n", wk);
 		owk = wk;
@@ -11488,7 +11621,7 @@ diradd_inode_written(dap, inodedep)
 
 /*
  * 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.
+ * be called with the per-filesystem lock and the buf lock on the cg held.
  */
 static int
 bmsafemap_backgroundwrite(bmsafemap, bp)
@@ -12912,18 +13045,42 @@ softdep_slowdown(vp)
 		if (journal_space(ump, 0) == 0)
 			jlow = 1;
 	}
+	/*
+	 * If the system is under its limits and our filesystem is
+	 * not responsible for more than our share of the usage and
+	 * we are not low on journal space, then no need to slow down.
+	 */
 	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)->softdep_numindirdeps < maxindirdeps &&
-	    dep_current[D_FREEBLKS] < max_softdeps_hard && jlow == 0) {
+	    dep_current[D_INDIRDEP] < max_softdeps_hard / 1000 &&
+	    dep_current[D_FREEBLKS] < max_softdeps_hard && jlow == 0 &&
+	    ump->softdep_curdeps[D_DIRREM] <
+	    (max_softdeps_hard / 2) / stat_flush_threads &&
+	    ump->softdep_curdeps[D_INODEDEP] <
+	    max_softdeps_hard / stat_flush_threads &&
+	    ump->softdep_curdeps[D_INDIRDEP] <
+	    (max_softdeps_hard / 1000) / stat_flush_threads &&
+	    ump->softdep_curdeps[D_FREEBLKS] <
+	    max_softdeps_hard / stat_flush_threads) {
 		FREE_LOCK(ump);
   		return (0);
 	}
-	if (VFSTOUFS(vp->v_mount)->softdep_numindirdeps >= maxindirdeps || jlow)
-		softdep_speedup();
+	/*
+	 * If the journal is low or our filesystem is over its limit
+	 * then speedup the cleanup.
+	 */
+	if (ump->softdep_curdeps[D_INDIRDEP] <
+	    (max_softdeps_hard / 1000) / stat_flush_threads || jlow)
+		softdep_speedup(ump);
 	stat_sync_limit_hit += 1;
 	FREE_LOCK(ump);
+	/*
+	 * We only slow down the rate at which new dependencies are
+	 * generated if we are not using journaling. With journaling,
+	 * the cleanup should always be sufficient to keep things
+	 * under control.
+	 */
 	if (DOINGSUJ(vp))
 		return (0);
 	return (1);
@@ -12981,13 +13138,12 @@ softdep_request_cleanup(fs, vp, cred, resource)
 		return (0);
 	}
 	/*
-	 * If we are in need of resources, consider pausing for
-	 * tickdelay to give ourselves some breathing room.
+	 * If we are in need of resources, start by cleaning up
+	 * any block removals associated with our inode.
 	 */
 	ACQUIRE_LOCK(ump);
 	process_removes(vp);
 	process_truncates(vp);
-	request_cleanup(UFSTOVFS(ump), resource);
 	FREE_LOCK(ump);
 	/*
 	 * Now clean up at least as many resources as we will need.
@@ -13120,7 +13276,7 @@ request_cleanup(mp, resource)
 	 * Next, we attempt to speed up the syncer process. If that
 	 * is successful, then we allow the process to continue.
 	 */
-	if (softdep_speedup() &&
+	if (softdep_speedup(ump) &&
 	    resource != FLUSH_BLOCKS_WAIT &&
 	    resource != FLUSH_INODES_WAIT)
 		return(0);
@@ -13138,15 +13294,19 @@ request_cleanup(mp, resource)
 
 	case FLUSH_INODES:
 	case FLUSH_INODES_WAIT:
+		ACQUIRE_GBLLOCK(&lk);
 		stat_ino_limit_push += 1;
 		req_clear_inodedeps += 1;
+		FREE_GBLLOCK(&lk);
 		stat_countp = &stat_ino_limit_hit;
 		break;
 
 	case FLUSH_BLOCKS:
 	case FLUSH_BLOCKS_WAIT:
+		ACQUIRE_GBLLOCK(&lk);
 		stat_blk_limit_push += 1;
 		req_clear_remove += 1;
+		FREE_GBLLOCK(&lk);
 		stat_countp = &stat_blk_limit_hit;
 		break;
 
@@ -13157,6 +13317,8 @@ request_cleanup(mp, resource)
 	 * Hopefully the syncer daemon will catch up and awaken us.
 	 * We wait at most tickdelay before proceeding in any case.
 	 */
+	ACQUIRE_GBLLOCK(&lk);
+	FREE_LOCK(ump);
 	proc_waiting += 1;
 	if (callout_pending(&softdep_callout) == FALSE)
 		callout_reset(&softdep_callout, tickdelay > 2 ? tickdelay : 2,
@@ -13164,6 +13326,8 @@ request_cleanup(mp, resource)
 
 	msleep((caddr_t)&proc_waiting, &lk, PPAUSE, "softupdate", 0);
 	proc_waiting -= 1;
+	FREE_GBLLOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	return (1);
 }
 
@@ -13177,16 +13341,13 @@ pause_timer(arg)
 	void *arg;
 {
 
-	rw_assert(&lk, RA_WLOCKED);
+	GBLLOCK_OWNED(&lk);
 	/*
 	 * The callout_ API has acquired mtx and will hold it around this
 	 * function call.
 	 */
-	*stat_countp += 1;
-	wakeup_one(&proc_waiting);
-	if (proc_waiting > 0)
-		callout_reset(&softdep_callout, tickdelay > 2 ? tickdelay : 2,
-		    pause_timer, 0);
+	*stat_countp += proc_waiting;
+	wakeup(&proc_waiting);
 }
 
 /*
@@ -13197,7 +13358,6 @@ 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.
@@ -13207,16 +13367,22 @@ check_clear_deps(mp)
 	/*
 	 * General requests for cleanup of backed up dependencies
 	 */
+	ACQUIRE_GBLLOCK(&lk);
 	if (req_clear_inodedeps) {
 		req_clear_inodedeps -= 1;
+		FREE_GBLLOCK(&lk);
 		clear_inodedeps(mp);
-		wakeup_one(&proc_waiting);
+		ACQUIRE_GBLLOCK(&lk);
+		wakeup(&proc_waiting);
 	}
 	if (req_clear_remove) {
 		req_clear_remove -= 1;
+		FREE_GBLLOCK(&lk);
 		clear_remove(mp);
-		wakeup_one(&proc_waiting);
+		ACQUIRE_GBLLOCK(&lk);
+		wakeup(&proc_waiting);
 	}
+	FREE_GBLLOCK(&lk);
 }
 
 /*
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 40b335e4ad4d..576dd873517b 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -255,31 +255,9 @@ ffs_mount(struct mount *mp)
 			 */
 			if ((error = vn_start_write(NULL, &mp, V_WAIT)) != 0)
 				return (error);
-			for (;;) {
-				vn_finished_write(mp);
-				if ((error = vfs_write_suspend(mp, 0)) != 0)
-					return (error);
-				MNT_ILOCK(mp);
-				if (mp->mnt_kern_flag & MNTK_SUSPENDED) {
-					/*
-					 * Allow the secondary writes
-					 * to proceed.
-					 */
-					mp->mnt_kern_flag &= ~(MNTK_SUSPENDED |
-					    MNTK_SUSPEND2);
-					wakeup(&mp->mnt_flag);
-					MNT_IUNLOCK(mp);
-					/*
-					 * Allow the curthread to
-					 * ignore the suspension to
-					 * synchronize on-disk state.
-					 */
-					td->td_pflags |= TDP_IGNSUSP;
-					break;
-				}
-				MNT_IUNLOCK(mp);
-				vn_start_write(NULL, &mp, V_WAIT);
-			}
+			error = vfs_write_suspend_umnt(mp);
+			if (error != 0)
+				return (error);
 			/*
 			 * Check for and optionally get rid of files open
 			 * for writing.
@@ -1250,25 +1228,9 @@ ffs_unmount(mp, mntflags)
 	}
 #endif
 	if (susp) {
-		/*
-		 * dounmount already called vn_start_write().
-		 */
-		for (;;) {
-			vn_finished_write(mp);
-			if ((error = vfs_write_suspend(mp, 0)) != 0)
-				return (error);
-			MNT_ILOCK(mp);
-			if (mp->mnt_kern_flag & MNTK_SUSPENDED) {
-				mp->mnt_kern_flag &= ~(MNTK_SUSPENDED |
-				    MNTK_SUSPEND2);
-				wakeup(&mp->mnt_flag);
-				MNT_IUNLOCK(mp);
-				td->td_pflags |= TDP_IGNSUSP;
-				break;
-			}
-			MNT_IUNLOCK(mp);
-			vn_start_write(NULL, &mp, V_WAIT);
-		}
+		error = vfs_write_suspend_umnt(mp);
+		if (error != 0)
+			goto fail1;
 	}
 	if (MOUNTEDSOFTDEP(mp))
 		error = softdep_flushfiles(mp, flags, td);
@@ -1331,6 +1293,7 @@ ffs_unmount(mp, mntflags)
 fail:
 	if (susp)
 		vfs_write_resume(mp, VR_START_WRITE);
+fail1:
 #ifdef UFS_EXTATTR
 	if (e_restart) {
 		ufs_extattr_uepm_init(&ump->um_extattr);
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h
index efa8c9befc77..514f054cf2d9 100644
--- a/sys/ufs/ffs/softdep.h
+++ b/sys/ufs/ffs/softdep.h
@@ -1025,7 +1025,7 @@ TAILQ_HEAD(indir_hashhead, freework);
  * Allocated at mount and freed at unmount.
  */
 struct mount_softdeps {
-	struct	rwlock *sd_fslock;		/* softdep lock */
+	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 */
@@ -1046,14 +1046,23 @@ struct mount_softdeps {
 	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. */
+	int	sd_flags;			/* comm with flushing thread */
+	int	sd_cleanups;			/* Calls to cleanup */
+	struct	thread *sd_flushtd;		/* thread handling flushing */
+	TAILQ_ENTRY(mount_softdeps) sd_next;	/* List of softdep filesystem */
+	struct	ufsmount *sd_ump;		/* our ufsmount structure */
 	u_long	sd_curdeps[D_LAST + 1];		/* count of current deps */
 };
+/*
+ * Flags for communicating with the syncer thread.
+ */
+#define FLUSH_EXIT	0x0001	/* time to exit */
+#define FLUSH_CLEANUP	0x0002	/* need to clear out softdep structures */
 /*
  * Keep the old names from when these were in the ufsmount structure.
  */
@@ -1077,10 +1086,11 @@ struct mount_softdeps {
 #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_flags			um_softdep->sd_flags
+#define	softdep_flushtd			um_softdep->sd_flushtd
 #define	softdep_curdeps			um_softdep->sd_curdeps
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 56e24a300658..c7ccc25824d2 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -382,8 +382,7 @@ ufs_accessx(ap)
 
 	/*
 	 * If immutable bit set, nobody gets to write it.  "& ~VADMIN_PERMS"
-	 * is here, because without it, * it would be impossible for the owner
-	 * to remove the IMMUTABLE flag.
+	 * permits the owner of the file to remove the IMMUTABLE flag.
 	 */
 	if ((accmode & (VMODIFY_PERMS & ~VADMIN_PERMS)) &&
 	    (ip->i_flags & (IMMUTABLE | SF_SNAPSHOT)))
@@ -635,35 +634,8 @@ ufs_setattr(ap)
 			return (EROFS);
 		if ((ip->i_flags & SF_SNAPSHOT) != 0)
 			return (EPERM);
-		/*
-		 * From utimes(2):
-		 * If times is NULL, ... The caller must be the owner of
-		 * the file, have permission to write the file, or be the
-		 * super-user.
-		 * If times is non-NULL, ... The caller must be the owner of
-		 * the file or be the super-user.
-		 *
-		 * Possibly for historical reasons, try to use VADMIN in
-		 * preference to VWRITE for a NULL timestamp.  This means we
-		 * will return EACCES in preference to EPERM if neither
-		 * check succeeds.
-		 */
-		if (vap->va_vaflags & VA_UTIMES_NULL) {
-			/*
-			 * NFSv4.1, draft 21, 6.2.1.3.1, Discussion of Mask Attributes
-			 *
-			 * "A user having ACL_WRITE_DATA or ACL_WRITE_ATTRIBUTES
-			 * will be allowed to set the times [..] to the current
-			 * server time."
-			 *
-			 * XXX: Calling it four times seems a little excessive.
-			 */
-			error = VOP_ACCESSX(vp, VWRITE_ATTRIBUTES, cred, td);
-			if (error)
-				error = VOP_ACCESS(vp, VWRITE, cred, td);
-		} else
-			error = VOP_ACCESSX(vp, VWRITE_ATTRIBUTES, cred, td);
-		if (error)
+		error = vn_utimes_perm(vp, vap, cred, td);
+		if (error != 0)
 			return (error);
 		if (vap->va_atime.tv_sec != VNOVAL)
 			ip->i_flag |= IN_ACCESS;
@@ -995,10 +967,6 @@ ufs_link(ap)
 	if ((cnp->cn_flags & HASBUF) == 0)
 		panic("ufs_link: no name");
 #endif
-	if (tdvp->v_mount != vp->v_mount) {
-		error = EXDEV;
-		goto out;
-	}
 	if (VTOI(tdvp)->i_effnlink < 2)
 		panic("ufs_link: Bad link count %d on parent",
 		    VTOI(tdvp)->i_effnlink);
diff --git a/sys/vm/memguard.c b/sys/vm/memguard.c
index 1d3b4125a149..d502ca569bde 100644
--- a/sys/vm/memguard.c
+++ b/sys/vm/memguard.c
@@ -67,7 +67,7 @@ static SYSCTL_NODE(_vm, OID_AUTO, memguard, CTLFLAG_RW, NULL, "MemGuard data");
  * reserved for MemGuard.
  */
 static u_int vm_memguard_divisor;
-SYSCTL_UINT(_vm_memguard, OID_AUTO, divisor, CTLFLAG_RDTUN,
+SYSCTL_UINT(_vm_memguard, OID_AUTO, divisor, CTLFLAG_RDTUN | CTLFLAG_NOFETCH,
     &vm_memguard_divisor,
     0, "(kmem_size/memguard_divisor) == memguard submap size");     
 
@@ -132,8 +132,7 @@ SYSCTL_ULONG(_vm_memguard, OID_AUTO, fail_pgs, CTLFLAG_RD,
 #define MG_GUARD_ALLLARGE	0x002
 #define MG_GUARD_NOFREE		0x004
 static int memguard_options = MG_GUARD_AROUND;
-TUNABLE_INT("vm.memguard.options", &memguard_options);
-SYSCTL_INT(_vm_memguard, OID_AUTO, options, CTLFLAG_RW,
+SYSCTL_INT(_vm_memguard, OID_AUTO, options, CTLFLAG_RWTUN,
     &memguard_options, 0,
     "MemGuard options:\n"
     "\t0x001 - add guard pages around each allocation\n"
@@ -149,8 +148,7 @@ SYSCTL_ULONG(_vm_memguard, OID_AUTO, minsize_reject, CTLFLAG_RD,
 
 static u_int memguard_frequency;
 static u_long memguard_frequency_hits;
-TUNABLE_INT("vm.memguard.frequency", &memguard_frequency);
-SYSCTL_UINT(_vm_memguard, OID_AUTO, frequency, CTLFLAG_RW,
+SYSCTL_UINT(_vm_memguard, OID_AUTO, frequency, CTLFLAG_RWTUN,
     &memguard_frequency, 0, "Times in 100000 that MemGuard will randomly run");
 SYSCTL_ULONG(_vm_memguard, OID_AUTO, frequency_hits, CTLFLAG_RD,
     &memguard_frequency_hits, 0, "# times MemGuard randomly chose");
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index 0c45e338227f..d73babc83ccd 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -97,19 +97,25 @@ struct thread;
  */
 extern vm_offset_t kernel_vm_end;
 
+/*
+ * Flags for pmap_enter().  The bits in the low-order byte are reserved
+ * for the protection code (vm_prot_t) that describes the fault type.
+ */
+#define	PMAP_ENTER_NOSLEEP	0x0100
+#define	PMAP_ENTER_WIRED	0x0200
+
 void		 pmap_activate(struct thread *td);
 void		 pmap_advise(pmap_t pmap, vm_offset_t sva, vm_offset_t eva,
 		    int advice);
 void		 pmap_align_superpage(vm_object_t, vm_ooffset_t, vm_offset_t *,
 		    vm_size_t);
-void		 pmap_change_wiring(pmap_t, vm_offset_t, boolean_t);
 void		 pmap_clear_modify(vm_page_t m);
 void		 pmap_copy(pmap_t, pmap_t, vm_offset_t, vm_size_t, vm_offset_t);
 void		 pmap_copy_page(vm_page_t, vm_page_t);
 void		 pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset,
 		    vm_page_t mb[], vm_offset_t b_offset, int xfersize);
-void		 pmap_enter(pmap_t, vm_offset_t, vm_prot_t, vm_page_t,
-		    vm_prot_t, boolean_t);
+int		 pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m,
+		    vm_prot_t prot, u_int flags, int8_t psind);
 void		 pmap_enter_object(pmap_t pmap, vm_offset_t start,
 		    vm_offset_t end, vm_page_t m_start, vm_prot_t prot);
 void		 pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m,
@@ -142,6 +148,7 @@ void		 pmap_remove_pages(pmap_t);
 void		 pmap_remove_write(vm_page_t m);
 void		 pmap_sync_icache(pmap_t, vm_offset_t, vm_size_t);
 boolean_t	 pmap_ts_referenced(vm_page_t m);
+void		 pmap_unwire(pmap_t pmap, vm_offset_t start, vm_offset_t end);
 void		 pmap_zero_page(vm_page_t);
 void		 pmap_zero_page_area(vm_page_t, int off, int size);
 void		 pmap_zero_page_idle(vm_page_t);
diff --git a/sys/vm/redzone.c b/sys/vm/redzone.c
index e4b5f6ccc9c0..a66a793f27f0 100644
--- a/sys/vm/redzone.c
+++ b/sys/vm/redzone.c
@@ -41,8 +41,7 @@ static u_long redzone_extra_mem = 0;
 SYSCTL_ULONG(_vm_redzone, OID_AUTO, extra_mem, CTLFLAG_RD, &redzone_extra_mem,
     0, "Extra memory allocated by redzone");     
 static int redzone_panic = 0;
-TUNABLE_INT("vm.redzone.panic", &redzone_panic);
-SYSCTL_INT(_vm_redzone, OID_AUTO, panic, CTLFLAG_RW, &redzone_panic, 0,
+SYSCTL_INT(_vm_redzone, OID_AUTO, panic, CTLFLAG_RWTUN, &redzone_panic, 0,
     "Panic when buffer corruption is detected");     
 
 #define	REDZONE_CHSIZE	(16)
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index 335035693b9c..81b714a9f32d 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -205,7 +205,7 @@ struct uma_bucket_zone {
 #define	BUCKET_SIZE(n)						\
     (((sizeof(void *) * (n)) - sizeof(struct uma_bucket)) / sizeof(void *))
 
-#define	BUCKET_MAX	BUCKET_SIZE(128)
+#define	BUCKET_MAX	BUCKET_SIZE(256)
 
 struct uma_bucket_zone bucket_zones[] = {
 	{ NULL, "4 Bucket", BUCKET_SIZE(4), 4096 },
@@ -216,6 +216,7 @@ struct uma_bucket_zone bucket_zones[] = {
 	{ NULL, "32 Bucket", BUCKET_SIZE(32), 512 },
 	{ NULL, "64 Bucket", BUCKET_SIZE(64), 256 },
 	{ NULL, "128 Bucket", BUCKET_SIZE(128), 128 },
+	{ NULL, "256 Bucket", BUCKET_SIZE(256), 64 },
 	{ NULL, NULL, 0}
 };
 
@@ -280,8 +281,7 @@ SYSCTL_PROC(_vm, OID_AUTO, zone_stats, CTLFLAG_RD|CTLTYPE_STRUCT,
     0, 0, sysctl_vm_zone_stats, "s,struct uma_type_header", "Zone Stats");
 
 static int zone_warnings = 1;
-TUNABLE_INT("vm.zone_warnings", &zone_warnings);
-SYSCTL_INT(_vm, OID_AUTO, zone_warnings, CTLFLAG_RW, &zone_warnings, 0,
+SYSCTL_INT(_vm, OID_AUTO, zone_warnings, CTLFLAG_RWTUN, &zone_warnings, 0,
     "Warn when UMA zones becomes full");
 
 /*
@@ -381,6 +381,8 @@ bucket_alloc(uma_zone_t zone, void *udata, int flags)
 	if ((uintptr_t)udata & UMA_ZFLAG_CACHEONLY)
 		flags |= M_NOVM;
 	ubz = bucket_zone_lookup(zone->uz_count);
+	if (ubz->ubz_zone == zone && (ubz + 1)->ubz_entries != 0)
+		ubz++;
 	bucket = uma_zalloc_arg(ubz->ubz_zone, udata, flags);
 	if (bucket) {
 #ifdef INVARIANTS
@@ -1151,7 +1153,7 @@ noobj_alloc(uma_zone_t zone, int bytes, uint8_t *flags, int wait)
 		 * exit.
 		 */
 		TAILQ_FOREACH_SAFE(p, &alloctail, listq, p_next) {
-			vm_page_unwire(p, 0);
+			vm_page_unwire(p, PQ_INACTIVE);
 			vm_page_free(p); 
 		}
 		return (NULL);
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 39a1a21b61aa..f639a22a5c43 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -81,8 +81,6 @@ int vm_fault_hold(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type,
     int fault_flags, vm_page_t *m_hold);
 int vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len,
     vm_prot_t prot, vm_page_t *ma, int max_count);
-void vm_fault_unwire(vm_map_t, vm_offset_t, vm_offset_t, boolean_t);
-int vm_fault_wire(vm_map_t, vm_offset_t, vm_offset_t, boolean_t);
 int vm_forkproc(struct thread *, struct proc *, struct thread *, struct vmspace *, int);
 void vm_waitproc(struct proc *);
 int vm_mmap(vm_map_t, vm_offset_t *, vm_size_t, vm_prot_t, vm_prot_t, int, objtype_t, void *, vm_ooffset_t);
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 35aea6b5c56e..5a1b2c20d487 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -755,7 +755,7 @@ RetryFault:;
 					vm_page_unlock(fs.first_m);
 					
 					vm_page_lock(fs.m);
-					vm_page_unwire(fs.m, FALSE);
+					vm_page_unwire(fs.m, PQ_INACTIVE);
 					vm_page_unlock(fs.m);
 				}
 				/*
@@ -902,7 +902,8 @@ RetryFault:;
 	 * back on the active queue until later so that the pageout daemon
 	 * won't find it (yet).
 	 */
-	pmap_enter(fs.map->pmap, vaddr, fault_type, fs.m, prot, wired);
+	pmap_enter(fs.map->pmap, vaddr, fs.m, prot,
+	    fault_type | (wired ? PMAP_ENTER_WIRED : 0), 0);
 	if (faultcount != 1 && (fault_flags & VM_FAULT_CHANGE_WIRING) == 0 &&
 	    wired == 0)
 		vm_fault_prefault(&fs, vaddr, faultcount, reqpage);
@@ -917,7 +918,7 @@ RetryFault:;
 		if (wired)
 			vm_page_wire(fs.m);
 		else
-			vm_page_unwire(fs.m, 1);
+			vm_page_unwire(fs.m, PQ_ACTIVE);
 	} else
 		vm_page_activate(fs.m);
 	if (m_hold != NULL) {
@@ -1153,68 +1154,6 @@ vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len,
 	return (-1);
 }
 
-/*
- *	vm_fault_wire:
- *
- *	Wire down a range of virtual addresses in a map.
- */
-int
-vm_fault_wire(vm_map_t map, vm_offset_t start, vm_offset_t end,
-    boolean_t fictitious)
-{
-	vm_offset_t va;
-	int rv;
-
-	/*
-	 * We simulate a fault to get the page and enter it in the physical
-	 * map.  For user wiring, we only ask for read access on currently
-	 * read-only sections.
-	 */
-	for (va = start; va < end; va += PAGE_SIZE) {
-		rv = vm_fault(map, va, VM_PROT_NONE, VM_FAULT_CHANGE_WIRING);
-		if (rv) {
-			if (va != start)
-				vm_fault_unwire(map, start, va, fictitious);
-			return (rv);
-		}
-	}
-	return (KERN_SUCCESS);
-}
-
-/*
- *	vm_fault_unwire:
- *
- *	Unwire a range of virtual addresses in a map.
- */
-void
-vm_fault_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end,
-    boolean_t fictitious)
-{
-	vm_paddr_t pa;
-	vm_offset_t va;
-	vm_page_t m;
-	pmap_t pmap;
-
-	pmap = vm_map_pmap(map);
-
-	/*
-	 * Since the pages are wired down, we must be able to get their
-	 * mappings from the physical map system.
-	 */
-	for (va = start; va < end; va += PAGE_SIZE) {
-		pa = pmap_extract(pmap, va);
-		if (pa != 0) {
-			pmap_change_wiring(pmap, va, FALSE);
-			if (!fictitious) {
-				m = PHYS_TO_VM_PAGE(pa);
-				vm_page_lock(m);
-				vm_page_unwire(m, TRUE);
-				vm_page_unlock(m);
-			}
-		}
-	}
-}
-
 /*
  *	Routine:
  *		vm_fault_copy_entry
@@ -1380,7 +1319,8 @@ vm_fault_copy_entry(vm_map_t dst_map, vm_map_t src_map,
 		 * mapping is being replaced by a write-enabled
 		 * mapping, then wire that new mapping.
 		 */
-		pmap_enter(dst_map->pmap, vaddr, access, dst_m, prot, upgrade);
+		pmap_enter(dst_map->pmap, vaddr, dst_m, prot,
+		    access | (upgrade ? PMAP_ENTER_WIRED : 0), 0);
 
 		/*
 		 * Mark it no longer busy, and put it on the active list.
@@ -1390,7 +1330,7 @@ vm_fault_copy_entry(vm_map_t dst_map, vm_map_t src_map,
 		if (upgrade) {
 			if (src_m != dst_m) {
 				vm_page_lock(src_m);
-				vm_page_unwire(src_m, 0);
+				vm_page_unwire(src_m, PQ_INACTIVE);
 				vm_page_unlock(src_m);
 				vm_page_lock(dst_m);
 				vm_page_wire(dst_m);
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 7d000973f336..61c003bec8b7 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -251,6 +251,7 @@ vm_imgact_hold_page(vm_object_t object, vm_ooffset_t offset)
 	vm_page_xunbusy(m);
 	vm_page_lock(m);
 	vm_page_hold(m);
+	vm_page_activate(m);
 	vm_page_unlock(m);
 out:
 	VM_OBJECT_WUNLOCK(object);
@@ -418,7 +419,7 @@ vm_thread_stack_dispose(vm_object_t ksobj, vm_offset_t ks, int pages)
 		if (m == NULL)
 			panic("vm_thread_dispose: kstack already missing?");
 		vm_page_lock(m);
-		vm_page_unwire(m, 0);
+		vm_page_unwire(m, PQ_INACTIVE);
 		vm_page_free(m);
 		vm_page_unlock(m);
 	}
@@ -507,7 +508,7 @@ vm_thread_swapout(struct thread *td)
 			panic("vm_thread_swapout: kstack already missing?");
 		vm_page_dirty(m);
 		vm_page_lock(m);
-		vm_page_unwire(m, 0);
+		vm_page_unwire(m, PQ_INACTIVE);
 		vm_page_unlock(m);
 	}
 	VM_OBJECT_WUNLOCK(ksobj);
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index 30faa5a2aeb2..be1038758824 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -91,8 +91,7 @@ __FBSDID("$FreeBSD$");
 long physmem;
 
 static int exec_map_entries = 16;
-TUNABLE_INT("vm.exec_map_entries", &exec_map_entries);
-SYSCTL_INT(_vm, OID_AUTO, exec_map_entries, CTLFLAG_RD, &exec_map_entries, 0,
+SYSCTL_INT(_vm, OID_AUTO, exec_map_entries, CTLFLAG_RDTUN, &exec_map_entries, 0,
     "Maximum number of simultaneous execs");
 
 /*
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index c0e56ce25635..5aa15e84bc6d 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -193,7 +193,7 @@ kmem_alloc_attr(vmem_t *vmem, vm_size_t size, int flags, vm_paddr_t low,
 				i -= PAGE_SIZE;
 				m = vm_page_lookup(object,
 				    OFF_TO_IDX(offset + i));
-				vm_page_unwire(m, 0);
+				vm_page_unwire(m, PQ_INACTIVE);
 				vm_page_free(m);
 			}
 			vmem_free(vmem, addr, size);
@@ -202,8 +202,8 @@ kmem_alloc_attr(vmem_t *vmem, vm_size_t size, int flags, vm_paddr_t low,
 		if ((flags & M_ZERO) && (m->flags & PG_ZERO) == 0)
 			pmap_zero_page(m);
 		m->valid = VM_PAGE_BITS_ALL;
-		pmap_enter(kernel_pmap, addr + i, VM_PROT_ALL, m, VM_PROT_ALL,
-		    TRUE);
+		pmap_enter(kernel_pmap, addr + i, m, VM_PROT_ALL,
+		    VM_PROT_ALL | PMAP_ENTER_WIRED, 0);
 	}
 	VM_OBJECT_WUNLOCK(object);
 	return (addr);
@@ -255,7 +255,8 @@ kmem_alloc_contig(struct vmem *vmem, vm_size_t size, int flags, vm_paddr_t low,
 		if ((flags & M_ZERO) && (m->flags & PG_ZERO) == 0)
 			pmap_zero_page(m);
 		m->valid = VM_PAGE_BITS_ALL;
-		pmap_enter(kernel_pmap, tmp, VM_PROT_ALL, m, VM_PROT_ALL, true);
+		pmap_enter(kernel_pmap, tmp, m, VM_PROT_ALL,
+		    VM_PROT_ALL | PMAP_ENTER_WIRED, 0);
 		tmp += PAGE_SIZE;
 	}
 	VM_OBJECT_WUNLOCK(object);
@@ -367,7 +368,7 @@ kmem_back(vm_object_t object, vm_offset_t addr, vm_size_t size, int flags)
 				i -= PAGE_SIZE;
 				m = vm_page_lookup(object,
 						   OFF_TO_IDX(offset + i));
-				vm_page_unwire(m, 0);
+				vm_page_unwire(m, PQ_INACTIVE);
 				vm_page_free(m);
 			}
 			VM_OBJECT_WUNLOCK(object);
@@ -378,8 +379,8 @@ kmem_back(vm_object_t object, vm_offset_t addr, vm_size_t size, int flags)
 		KASSERT((m->oflags & VPO_UNMANAGED) != 0,
 		    ("kmem_malloc: page %p is managed", m));
 		m->valid = VM_PAGE_BITS_ALL;
-		pmap_enter(kernel_pmap, addr + i, VM_PROT_ALL, m, VM_PROT_ALL,
-		    TRUE);
+		pmap_enter(kernel_pmap, addr + i, m, VM_PROT_ALL,
+		    VM_PROT_ALL | PMAP_ENTER_WIRED, 0);
 	}
 	VM_OBJECT_WUNLOCK(object);
 
@@ -401,7 +402,7 @@ kmem_unback(vm_object_t object, vm_offset_t addr, vm_size_t size)
 	VM_OBJECT_WLOCK(object);
 	for (i = 0; i < size; i += PAGE_SIZE) {
 		m = vm_page_lookup(object, OFF_TO_IDX(offset + i));
-		vm_page_unwire(m, 0);
+		vm_page_unwire(m, PQ_INACTIVE);
 		vm_page_free(m);
 	}
 	VM_OBJECT_WUNLOCK(object);
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index cfafc270365b..68ae0d2f4829 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -132,6 +132,7 @@ static void _vm_map_init(vm_map_t map, pmap_t pmap, vm_offset_t min,
     vm_offset_t max);
 static void vm_map_entry_deallocate(vm_map_entry_t entry, boolean_t system_map);
 static void vm_map_entry_dispose(vm_map_t map, vm_map_entry_t entry);
+static void vm_map_entry_unwire(vm_map_t map, vm_map_entry_t entry);
 #ifdef INVARIANTS
 static void vm_map_zdtor(void *mem, int size, void *arg);
 static void vmspace_zdtor(void *mem, int size, void *arg);
@@ -139,6 +140,8 @@ static void vmspace_zdtor(void *mem, int size, void *arg);
 static int vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos,
     vm_size_t max_ssize, vm_size_t growsize, vm_prot_t prot, vm_prot_t max,
     int cow);
+static void vm_map_wire_entry_failure(vm_map_t map, vm_map_entry_t entry,
+    vm_offset_t failed_addr);
 
 #define	ENTRY_CHARGED(e) ((e)->cred != NULL || \
     ((e)->object.vm_object != NULL && (e)->object.vm_object->cred != NULL && \
@@ -940,6 +943,15 @@ vm_map_entry_link(vm_map_t map,
 	    "vm_map_entry_link: map %p, nentries %d, entry %p, after %p", map,
 	    map->nentries, entry, after_where);
 	VM_MAP_ASSERT_LOCKED(map);
+	KASSERT(after_where == &map->header ||
+	    after_where->end <= entry->start,
+	    ("vm_map_entry_link: prev end %jx new start %jx overlap",
+	    (uintmax_t)after_where->end, (uintmax_t)entry->start));
+	KASSERT(after_where->next == &map->header ||
+	    entry->end <= after_where->next->start,
+	    ("vm_map_entry_link: new end %jx next start %jx overlap",
+	    (uintmax_t)entry->end, (uintmax_t)after_where->next->start));
+
 	map->nentries++;
 	entry->prev = after_where;
 	entry->next = after_where->next;
@@ -1112,18 +1124,19 @@ vm_map_lookup_entry(
  */
 int
 vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
-	      vm_offset_t start, vm_offset_t end, vm_prot_t prot, vm_prot_t max,
-	      int cow)
+    vm_offset_t start, vm_offset_t end, vm_prot_t prot, vm_prot_t max, int cow)
 {
-	vm_map_entry_t new_entry;
-	vm_map_entry_t prev_entry;
-	vm_map_entry_t temp_entry;
+	vm_map_entry_t new_entry, prev_entry, temp_entry;
 	vm_eflags_t protoeflags;
 	struct ucred *cred;
 	vm_inherit_t inheritance;
-	boolean_t charge_prev_obj;
 
 	VM_MAP_ASSERT_LOCKED(map);
+	KASSERT((object != kmem_object && object != kernel_object) ||
+	    (cow & MAP_COPY_ON_WRITE) == 0,
+	    ("vm_map_insert: kmem or kernel object and COW"));
+	KASSERT(object == NULL || (cow & MAP_NOFAULT) == 0,
+	    ("vm_map_insert: paradoxical MAP_NOFAULT request"));
 
 	/*
 	 * Check that the start and end points are not bogus.
@@ -1149,21 +1162,18 @@ vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
 		return (KERN_NO_SPACE);
 
 	protoeflags = 0;
-	charge_prev_obj = FALSE;
-
 	if (cow & MAP_COPY_ON_WRITE)
-		protoeflags |= MAP_ENTRY_COW|MAP_ENTRY_NEEDS_COPY;
-
-	if (cow & MAP_NOFAULT) {
+		protoeflags |= MAP_ENTRY_COW | MAP_ENTRY_NEEDS_COPY;
+	if (cow & MAP_NOFAULT)
 		protoeflags |= MAP_ENTRY_NOFAULT;
-
-		KASSERT(object == NULL,
-			("vm_map_insert: paradoxical MAP_NOFAULT request"));
-	}
 	if (cow & MAP_DISABLE_SYNCER)
 		protoeflags |= MAP_ENTRY_NOSYNC;
 	if (cow & MAP_DISABLE_COREDUMP)
 		protoeflags |= MAP_ENTRY_NOCOREDUMP;
+	if (cow & MAP_STACK_GROWS_DOWN)
+		protoeflags |= MAP_ENTRY_GROWS_DOWN;
+	if (cow & MAP_STACK_GROWS_UP)
+		protoeflags |= MAP_ENTRY_GROWS_UP;
 	if (cow & MAP_VN_WRITECOUNT)
 		protoeflags |= MAP_ENTRY_VN_WRITECNT;
 	if (cow & MAP_INHERIT_SHARE)
@@ -1172,10 +1182,6 @@ vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
 		inheritance = VM_INHERIT_DEFAULT;
 
 	cred = NULL;
-	KASSERT((object != kmem_object && object != kernel_object) ||
-	    ((object == kmem_object || object == kernel_object) &&
-		!(protoeflags & MAP_ENTRY_NEEDS_COPY)),
-	    ("kmem or kernel object and cow"));
 	if (cow & (MAP_ACC_NO_CHARGE | MAP_NOFAULT))
 		goto charged;
 	if ((cow & MAP_ACC_CHARGED) || ((prot & VM_PROT_WRITE) &&
@@ -1186,9 +1192,6 @@ vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
 		    object->cred == NULL,
 		    ("OVERCOMMIT: vm_map_insert o %p", object));
 		cred = curthread->td_ucred;
-		crhold(cred);
-		if (object == NULL && !(protoeflags & MAP_ENTRY_NEEDS_COPY))
-			charge_prev_obj = TRUE;
 	}
 
 charged:
@@ -1210,7 +1213,7 @@ vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
 	}
 	else if ((prev_entry != &map->header) &&
 		 (prev_entry->eflags == protoeflags) &&
-		 (cow & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP)) == 0 &&
+		 (cow & (MAP_STACK_GROWS_DOWN | MAP_STACK_GROWS_UP)) == 0 &&
 		 (prev_entry->end == start) &&
 		 (prev_entry->wired_count == 0) &&
 		 (prev_entry->cred == cred ||
@@ -1219,7 +1222,8 @@ vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
 		   vm_object_coalesce(prev_entry->object.vm_object,
 		       prev_entry->offset,
 		       (vm_size_t)(prev_entry->end - prev_entry->start),
-		       (vm_size_t)(end - prev_entry->end), charge_prev_obj)) {
+		       (vm_size_t)(end - prev_entry->end), cred != NULL &&
+		       (protoeflags & MAP_ENTRY_NEEDS_COPY) == 0)) {
 		/*
 		 * We were able to extend the object.  Determine if we
 		 * can extend the previous map entry to include the
@@ -1232,8 +1236,6 @@ vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
 			prev_entry->end = end;
 			vm_map_entry_resize_free(map, prev_entry);
 			vm_map_simplify_entry(map, prev_entry);
-			if (cred != NULL)
-				crfree(cred);
 			return (KERN_SUCCESS);
 		}
 
@@ -1250,16 +1252,11 @@ vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
 		if (cred != NULL && object != NULL && object->cred != NULL &&
 		    !(prev_entry->eflags & MAP_ENTRY_NEEDS_COPY)) {
 			/* Object already accounts for this uid. */
-			crfree(cred);
 			cred = NULL;
 		}
 	}
-
-	/*
-	 * NOTE: if conditionals fail, object can be NULL here.  This occurs
-	 * in things like the buffer map where we manage kva but do not manage
-	 * backing objects.
-	 */
+	if (cred != NULL)
+		crhold(cred);
 
 	/*
 	 * Create a new entry
@@ -1293,12 +1290,12 @@ vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
 	map->size += new_entry->end - new_entry->start;
 
 	/*
-	 * It may be possible to merge the new entry with the next and/or
-	 * previous entries.  However, due to MAP_STACK_* being a hack, a
-	 * panic can result from merging such entries.
+	 * Try to coalesce the new entry with both the previous and next
+	 * entries in the list.  Previously, we only attempted to coalesce
+	 * with the previous entry when object is NULL.  Here, we handle the
+	 * other cases, which are less common.
 	 */
-	if ((cow & (MAP_STACK_GROWS_DOWN | MAP_STACK_GROWS_UP)) == 0)
-		vm_map_simplify_entry(map, new_entry);
+	vm_map_simplify_entry(map, new_entry);
 
 	if (cow & (MAP_PREFAULT|MAP_PREFAULT_PARTIAL)) {
 		vm_map_pmap_enter(map, start, prot,
@@ -1407,7 +1404,8 @@ vm_map_fixed(vm_map_t map, vm_object_t object, vm_ooffset_t offset,
 	    ("vm_map_fixed: non-NULL backing object for stack"));
 	vm_map_lock(map);
 	VM_MAP_RANGE_CHECK(map, start, end);
-	(void) vm_map_delete(map, start, end);
+	if ((cow & MAP_CHECK_EXCL) == 0)
+		vm_map_delete(map, start, end);
 	if ((cow & (MAP_STACK_GROWS_DOWN | MAP_STACK_GROWS_UP)) != 0) {
 		result = vm_map_stack_locked(map, start, length, sgrowsiz,
 		    prot, max, cow);
@@ -1512,7 +1510,8 @@ vm_map_simplify_entry(vm_map_t map, vm_map_entry_t entry)
 	vm_map_entry_t next, prev;
 	vm_size_t prevsize, esize;
 
-	if (entry->eflags & (MAP_ENTRY_IN_TRANSITION | MAP_ENTRY_IS_SUB_MAP))
+	if ((entry->eflags & (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP |
+	    MAP_ENTRY_IN_TRANSITION | MAP_ENTRY_IS_SUB_MAP)) != 0)
 		return;
 
 	prev = entry->prev;
@@ -2397,16 +2396,10 @@ vm_map_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end,
 		    (entry->eflags & MAP_ENTRY_USER_WIRED))) {
 			if (user_unwire)
 				entry->eflags &= ~MAP_ENTRY_USER_WIRED;
-			entry->wired_count--;
-			if (entry->wired_count == 0) {
-				/*
-				 * Retain the map lock.
-				 */
-				vm_fault_unwire(map, entry->start, entry->end,
-				    entry->object.vm_object != NULL &&
-				    (entry->object.vm_object->flags &
-				    OBJ_FICTITIOUS) != 0);
-			}
+			if (entry->wired_count == 1)
+				vm_map_entry_unwire(map, entry);
+			else
+				entry->wired_count--;
 		}
 		KASSERT((entry->eflags & MAP_ENTRY_IN_TRANSITION) != 0,
 		    ("vm_map_unwire: in-transition flag missing %p", entry));
@@ -2426,6 +2419,42 @@ vm_map_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end,
 	return (rv);
 }
 
+/*
+ *	vm_map_wire_entry_failure:
+ *
+ *	Handle a wiring failure on the given entry.
+ *
+ *	The map should be locked.
+ */
+static void
+vm_map_wire_entry_failure(vm_map_t map, vm_map_entry_t entry,
+    vm_offset_t failed_addr)
+{
+
+	VM_MAP_ASSERT_LOCKED(map);
+	KASSERT((entry->eflags & MAP_ENTRY_IN_TRANSITION) != 0 &&
+	    entry->wired_count == 1,
+	    ("vm_map_wire_entry_failure: entry %p isn't being wired", entry));
+	KASSERT(failed_addr < entry->end,
+	    ("vm_map_wire_entry_failure: entry %p was fully wired", entry));
+
+	/*
+	 * If any pages at the start of this entry were successfully wired,
+	 * then unwire them.
+	 */
+	if (failed_addr > entry->start) {
+		pmap_unwire(map->pmap, entry->start, failed_addr);
+		vm_object_unwire(entry->object.vm_object, entry->offset,
+		    failed_addr - entry->start, PQ_ACTIVE);
+	}
+
+	/*
+	 * Assign an out-of-range value to represent the failure to wire this
+	 * entry.
+	 */
+	entry->wired_count = -1;
+}
+
 /*
  *	vm_map_wire:
  *
@@ -2436,10 +2465,10 @@ vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset_t end,
     int flags)
 {
 	vm_map_entry_t entry, first_entry, tmp_entry;
-	vm_offset_t saved_end, saved_start;
+	vm_offset_t faddr, saved_end, saved_start;
 	unsigned int last_timestamp;
 	int rv;
-	boolean_t fictitious, need_wakeup, result, user_wire;
+	boolean_t need_wakeup, result, user_wire;
 	vm_prot_t prot;
 
 	if (start == end)
@@ -2532,17 +2561,24 @@ vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset_t end,
 			entry->wired_count++;
 			saved_start = entry->start;
 			saved_end = entry->end;
-			fictitious = entry->object.vm_object != NULL &&
-			    (entry->object.vm_object->flags &
-			    OBJ_FICTITIOUS) != 0;
+
 			/*
 			 * Release the map lock, relying on the in-transition
 			 * mark.  Mark the map busy for fork.
 			 */
 			vm_map_busy(map);
 			vm_map_unlock(map);
-			rv = vm_fault_wire(map, saved_start, saved_end,
-			    fictitious);
+
+			faddr = saved_start;
+			do {
+				/*
+				 * Simulate a fault to get the page and enter
+				 * it into the physical map.
+				 */
+				if ((rv = vm_fault(map, faddr, VM_PROT_NONE,
+				    VM_FAULT_CHANGE_WIRING)) != KERN_SUCCESS)
+					break;
+			} while ((faddr += PAGE_SIZE) < saved_end);
 			vm_map_lock(map);
 			vm_map_unbusy(map);
 			if (last_timestamp + 1 != map->timestamp) {
@@ -2561,23 +2597,22 @@ vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset_t end,
 					first_entry = NULL;
 				entry = tmp_entry;
 				while (entry->end < saved_end) {
-					if (rv != KERN_SUCCESS) {
-						KASSERT(entry->wired_count == 1,
-						    ("vm_map_wire: bad count"));
-						entry->wired_count = -1;
-					}
+					/*
+					 * In case of failure, handle entries
+					 * that were not fully wired here;
+					 * fully wired entries are handled
+					 * later.
+					 */
+					if (rv != KERN_SUCCESS &&
+					    faddr < entry->end)
+						vm_map_wire_entry_failure(map,
+						    entry, faddr);
 					entry = entry->next;
 				}
 			}
 			last_timestamp = map->timestamp;
 			if (rv != KERN_SUCCESS) {
-				KASSERT(entry->wired_count == 1,
-				    ("vm_map_wire: bad count"));
-				/*
-				 * Assign an out-of-range value to represent
-				 * the failure to wire this entry.
-				 */
-				entry->wired_count = -1;
+				vm_map_wire_entry_failure(map, entry, faddr);
 				end = entry->end;
 				goto done;
 			}
@@ -2639,19 +2674,16 @@ vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset_t end,
 			 * unnecessary.
 			 */
 			entry->wired_count = 0;
-		} else {
-			if (!user_wire ||
-			    (entry->eflags & MAP_ENTRY_USER_WIRED) == 0)
+		} else if (!user_wire ||
+		    (entry->eflags & MAP_ENTRY_USER_WIRED) == 0) {
+			/*
+			 * Undo the wiring.  Wiring succeeded on this entry
+			 * but failed on a later entry.  
+			 */
+			if (entry->wired_count == 1)
+				vm_map_entry_unwire(map, entry);
+			else
 				entry->wired_count--;
-			if (entry->wired_count == 0) {
-				/*
-				 * Retain the map lock.
-				 */
-				vm_fault_unwire(map, entry->start, entry->end,
-				    entry->object.vm_object != NULL &&
-				    (entry->object.vm_object->flags &
-				    OBJ_FICTITIOUS) != 0);
-			}
 		}
 	next_entry_done:
 		KASSERT((entry->eflags & MAP_ENTRY_IN_TRANSITION) != 0,
@@ -2787,9 +2819,13 @@ vm_map_sync(
 static void
 vm_map_entry_unwire(vm_map_t map, vm_map_entry_t entry)
 {
-	vm_fault_unwire(map, entry->start, entry->end,
-	    entry->object.vm_object != NULL &&
-	    (entry->object.vm_object->flags & OBJ_FICTITIOUS) != 0);
+
+	VM_MAP_ASSERT_LOCKED(map);
+	KASSERT(entry->wired_count > 0,
+	    ("vm_map_entry_unwire: entry %p isn't wired", entry));
+	pmap_unwire(map->pmap, entry->start, entry->end);
+	vm_object_unwire(entry->object.vm_object, entry->offset, entry->end -
+	    entry->start, PQ_ACTIVE);
 	entry->wired_count = 0;
 }
 
@@ -3388,7 +3424,7 @@ vm_map_stack(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize,
 		rv = KERN_NO_SPACE;
 		goto out;
 	}
-	rv = vm_map_stack_locked(map, addrbos, max_ssize, sgrowsiz, prot,
+	rv = vm_map_stack_locked(map, addrbos, max_ssize, growsize, prot,
 	    max, cow);
 out:
 	vm_map_unlock(map);
@@ -3458,25 +3494,24 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize,
 
 	/* Now set the avail_ssize amount. */
 	if (rv == KERN_SUCCESS) {
-		if (prev_entry != &map->header)
-			vm_map_clip_end(map, prev_entry, bot);
 		new_entry = prev_entry->next;
 		if (new_entry->end != top || new_entry->start != bot)
 			panic("Bad entry start/end for new stack entry");
 
 		new_entry->avail_ssize = max_ssize - init_ssize;
-		if (orient & MAP_STACK_GROWS_DOWN)
-			new_entry->eflags |= MAP_ENTRY_GROWS_DOWN;
-		if (orient & MAP_STACK_GROWS_UP)
-			new_entry->eflags |= MAP_ENTRY_GROWS_UP;
+		KASSERT((orient & MAP_STACK_GROWS_DOWN) == 0 ||
+		    (new_entry->eflags & MAP_ENTRY_GROWS_DOWN) != 0,
+		    ("new entry lacks MAP_ENTRY_GROWS_DOWN"));
+		KASSERT((orient & MAP_STACK_GROWS_UP) == 0 ||
+		    (new_entry->eflags & MAP_ENTRY_GROWS_UP) != 0,
+		    ("new entry lacks MAP_ENTRY_GROWS_UP"));
 	}
 
 	return (rv);
 }
 
 static int stack_guard_page = 0;
-TUNABLE_INT("security.bsd.stack_guard_page", &stack_guard_page);
-SYSCTL_INT(_security_bsd, OID_AUTO, stack_guard_page, CTLFLAG_RW,
+SYSCTL_INT(_security_bsd, OID_AUTO, stack_guard_page, CTLFLAG_RWTUN,
     &stack_guard_page, 0,
     "Insert stack guard page ahead of the growable segments.");
 
@@ -3688,21 +3723,21 @@ vm_map_growstack(struct proc *p, vm_offset_t addr)
 		}
 
 		rv = vm_map_insert(map, NULL, 0, addr, stack_entry->start,
-		    next_entry->protection, next_entry->max_protection, 0);
+		    next_entry->protection, next_entry->max_protection,
+		    MAP_STACK_GROWS_DOWN);
 
 		/* Adjust the available stack space by the amount we grew. */
 		if (rv == KERN_SUCCESS) {
-			if (prev_entry != &map->header)
-				vm_map_clip_end(map, prev_entry, addr);
 			new_entry = prev_entry->next;
 			KASSERT(new_entry == stack_entry->prev, ("foo"));
 			KASSERT(new_entry->end == stack_entry->start, ("foo"));
 			KASSERT(new_entry->start == addr, ("foo"));
+			KASSERT((new_entry->eflags & MAP_ENTRY_GROWS_DOWN) !=
+			    0, ("new entry lacks MAP_ENTRY_GROWS_DOWN"));
 			grow_amount = new_entry->end - new_entry->start;
 			new_entry->avail_ssize = stack_entry->avail_ssize -
 			    grow_amount;
 			stack_entry->eflags &= ~MAP_ENTRY_GROWS_DOWN;
-			new_entry->eflags |= MAP_ENTRY_GROWS_DOWN;
 		}
 	} else {
 		/*
@@ -3739,9 +3774,6 @@ vm_map_growstack(struct proc *p, vm_offset_t addr)
 			stack_entry->avail_ssize -= grow_amount;
 			vm_map_entry_resize_free(map, stack_entry);
 			rv = KERN_SUCCESS;
-
-			if (next_entry != &map->header)
-				vm_map_clip_start(map, next_entry, addr);
 		} else
 			rv = KERN_FAILURE;
 	}
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index 850bf257c53b..8cced057ea12 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -315,6 +315,7 @@ long vmspace_resident_count(struct vmspace *vmspace);
 #define MAP_PREFAULT		0x0008
 #define MAP_PREFAULT_PARTIAL	0x0010
 #define MAP_DISABLE_SYNCER	0x0020
+#define	MAP_CHECK_EXCL		0x0040
 #define MAP_DISABLE_COREDUMP	0x0100
 #define MAP_PREFAULT_MADVISE	0x0200	/* from (user) madvise request */
 #define	MAP_VN_WRITECOUNT	0x0400
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 0fc5bb409a9a..1ae7189b97ca 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -92,9 +92,8 @@ __FBSDID("$FreeBSD$");
 #endif
 
 int old_mlock = 0;
-SYSCTL_INT(_vm, OID_AUTO, old_mlock, CTLFLAG_RW | CTLFLAG_TUN, &old_mlock, 0,
+SYSCTL_INT(_vm, OID_AUTO, old_mlock, CTLFLAG_RWTUN, &old_mlock, 0,
     "Do not apply RLIMIT_MEMLOCK on mlockall");
-TUNABLE_INT("vm.old_mlock", &old_mlock);
 
 #ifdef MAP_32BIT
 #define	MAP_32BIT_MAX_ADDR	((vm_offset_t)1 << 31)
@@ -245,6 +244,8 @@ sys_mmap(td, uap)
 		flags |= MAP_ANON;
 		pos = 0;
 	}
+	if ((flags & (MAP_EXCL | MAP_FIXED)) == MAP_EXCL)
+		return (EINVAL);
 
 	/*
 	 * Align the file position to a page boundary,
@@ -486,7 +487,7 @@ ommap(td, uap)
 	nargs.len = uap->len;
 	nargs.prot = cvtbsdprot[uap->prot & 0x7];
 #ifdef COMPAT_FREEBSD32
-#if defined(__amd64__) || defined(__ia64__)
+#if defined(__amd64__)
 	if (i386_read_exec && SV_PROC_FLAG(td->td_proc, SV_ILP32) &&
 	    nargs.prot != 0)
 		nargs.prot |= PROT_EXEC;
@@ -1626,6 +1627,8 @@ vm_mmap(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot,
 			return (EINVAL);
 		docow |= MAP_STACK_GROWS_DOWN;
 	}
+	if ((flags & MAP_EXCL) != 0)
+		docow |= MAP_CHECK_EXCL;
 
 	if (fitit) {
 		if ((flags & MAP_ALIGNMENT_MASK) == MAP_ALIGNED_SUPER)
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index b428219bdd5d..c3af9d760698 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -553,14 +553,12 @@ vm_object_deallocate(vm_object_t object)
 			    object->handle == NULL &&
 			    (object->type == OBJT_DEFAULT ||
 			    (object->type == OBJT_SWAP &&
-			    (object->flags & OBJ_TMPFS) == 0))) {
+			    (object->flags & OBJ_TMPFS_NODE) == 0))) {
 				vm_object_set_flag(object, OBJ_ONEMAPPING);
 			} else if ((object->shadow_count == 1) &&
 			    (object->handle == NULL) &&
 			    (object->type == OBJT_DEFAULT ||
 			     object->type == OBJT_SWAP)) {
-				KASSERT((object->flags & OBJ_TMPFS) == 0,
-				    ("shadowed tmpfs v_object %p", object));
 				vm_object_t robject;
 
 				robject = LIST_FIRST(&object->shadow_head);
@@ -568,6 +566,8 @@ vm_object_deallocate(vm_object_t object)
 				    ("vm_object_deallocate: ref_count: %d, shadow_count: %d",
 					 object->ref_count,
 					 object->shadow_count));
+				KASSERT((robject->flags & OBJ_TMPFS_NODE) == 0,
+				    ("shadowed tmpfs v_object %p", object));
 				if (!VM_OBJECT_TRYWLOCK(robject)) {
 					/*
 					 * Avoid a potential deadlock.
@@ -637,6 +637,8 @@ vm_object_deallocate(vm_object_t object)
 doterm:
 		temp = object->backing_object;
 		if (temp != NULL) {
+			KASSERT((object->flags & OBJ_TMPFS_NODE) == 0,
+			    ("shadowed tmpfs v_object 2 %p", object));
 			VM_OBJECT_WLOCK(temp);
 			LIST_REMOVE(object, shadow_list);
 			temp->shadow_count--;
@@ -2103,7 +2105,7 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset,
 	VM_OBJECT_WLOCK(prev_object);
 	if ((prev_object->type != OBJT_DEFAULT &&
 	    prev_object->type != OBJT_SWAP) ||
-	    (prev_object->flags & OBJ_TMPFS) != 0) {
+	    (prev_object->flags & OBJ_TMPFS_NODE) != 0) {
 		VM_OBJECT_WUNLOCK(prev_object);
 		return (FALSE);
 	}
@@ -2200,6 +2202,78 @@ vm_object_set_writeable_dirty(vm_object_t object)
 	vm_object_set_flag(object, OBJ_MIGHTBEDIRTY);
 }
 
+/*
+ *	vm_object_unwire:
+ *
+ *	For each page offset within the specified range of the given object,
+ *	find the highest-level page in the shadow chain and unwire it.  A page
+ *	must exist at every page offset, and the highest-level page must be
+ *	wired.
+ */
+void
+vm_object_unwire(vm_object_t object, vm_ooffset_t offset, vm_size_t length,
+    uint8_t queue)
+{
+	vm_object_t tobject;
+	vm_page_t m, tm;
+	vm_pindex_t end_pindex, pindex, tpindex;
+	int depth, locked_depth;
+
+	KASSERT((offset & PAGE_MASK) == 0,
+	    ("vm_object_unwire: offset is not page aligned"));
+	KASSERT((length & PAGE_MASK) == 0,
+	    ("vm_object_unwire: length is not a multiple of PAGE_SIZE"));
+	/* The wired count of a fictitious page never changes. */
+	if ((object->flags & OBJ_FICTITIOUS) != 0)
+		return;
+	pindex = OFF_TO_IDX(offset);
+	end_pindex = pindex + atop(length);
+	locked_depth = 1;
+	VM_OBJECT_RLOCK(object);
+	m = vm_page_find_least(object, pindex);
+	while (pindex < end_pindex) {
+		if (m == NULL || pindex < m->pindex) {
+			/*
+			 * The first object in the shadow chain doesn't
+			 * contain a page at the current index.  Therefore,
+			 * the page must exist in a backing object.
+			 */
+			tobject = object;
+			tpindex = pindex;
+			depth = 0;
+			do {
+				tpindex +=
+				    OFF_TO_IDX(tobject->backing_object_offset);
+				tobject = tobject->backing_object;
+				KASSERT(tobject != NULL,
+				    ("vm_object_unwire: missing page"));
+				if ((tobject->flags & OBJ_FICTITIOUS) != 0)
+					goto next_page;
+				depth++;
+				if (depth == locked_depth) {
+					locked_depth++;
+					VM_OBJECT_RLOCK(tobject);
+				}
+			} while ((tm = vm_page_lookup(tobject, tpindex)) ==
+			    NULL);
+		} else {
+			tm = m;
+			m = TAILQ_NEXT(m, listq);
+		}
+		vm_page_lock(tm);
+		vm_page_unwire(tm, queue);
+		vm_page_unlock(tm);
+next_page:
+		pindex++;
+	}
+	/* Release the accumulated object locks. */
+	for (depth = 0; depth < locked_depth; depth++) {
+		tobject = object->backing_object;
+		VM_OBJECT_RUNLOCK(object);
+		object = tobject;
+	}
+}
+
 #include "opt_ddb.h"
 #ifdef DDB
 #include <sys/kernel.h>
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index d59a9e61fdf3..48ba743bf2ec 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -186,10 +186,11 @@ struct vm_object {
 #define	OBJ_NOSPLIT	0x0010		/* dont split this object */
 #define OBJ_PIPWNT	0x0040		/* paging in progress wanted */
 #define OBJ_MIGHTBEDIRTY 0x0100		/* object might be dirty, only for vnode */
+#define	OBJ_TMPFS_NODE	0x0200		/* object belongs to tmpfs VREG node */
 #define	OBJ_COLORED	0x1000		/* pg_color is defined */
 #define	OBJ_ONEMAPPING	0x2000		/* One USE (a single, non-forked) mapping flag */
 #define	OBJ_DISCONNECTWNT 0x4000	/* disconnect from vnode wanted */
-#define	OBJ_TMPFS	0x8000
+#define	OBJ_TMPFS	0x8000		/* has tmpfs vnode allocated */
 
 #define IDX_TO_OFF(idx) (((vm_ooffset_t)(idx)) << PAGE_SHIFT)
 #define OFF_TO_IDX(off) ((vm_pindex_t)(((vm_ooffset_t)(off)) >> PAGE_SHIFT))
@@ -224,6 +225,8 @@ extern struct vm_object kmem_object_store;
 	rw_assert(&(object)->lock, RA_RLOCKED)
 #define	VM_OBJECT_ASSERT_WLOCKED(object)				\
 	rw_assert(&(object)->lock, RA_WLOCKED)
+#define	VM_OBJECT_ASSERT_UNLOCKED(object)				\
+	rw_assert(&(object)->lock, RA_UNLOCKED)
 #define	VM_OBJECT_LOCK_DOWNGRADE(object)				\
 	rw_downgrade(&(object)->lock)
 #define	VM_OBJECT_RLOCK(object)						\
@@ -236,6 +239,8 @@ extern struct vm_object kmem_object_store;
 	rw_try_rlock(&(object)->lock)
 #define	VM_OBJECT_TRYWLOCK(object)					\
 	rw_try_wlock(&(object)->lock)
+#define	VM_OBJECT_TRYUPGRADE(object)					\
+	rw_try_upgrade(&(object)->lock)
 #define	VM_OBJECT_WLOCK(object)						\
 	rw_wlock(&(object)->lock)
 #define	VM_OBJECT_WUNLOCK(object)					\
@@ -290,6 +295,8 @@ void vm_object_shadow (vm_object_t *, vm_ooffset_t *, vm_size_t);
 void vm_object_split(vm_map_entry_t);
 boolean_t vm_object_sync(vm_object_t, vm_ooffset_t, vm_size_t, boolean_t,
     boolean_t);
+void vm_object_unwire(vm_object_t object, vm_ooffset_t offset,
+    vm_size_t length, uint8_t queue);
 #endif				/* _KERNEL */
 
 #endif				/* _VM_OBJECT_ */
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 788b9ea569e2..7ce12d63de48 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -134,8 +134,7 @@ long first_page;
 int vm_page_zero_count;
 
 static int boot_pages = UMA_BOOT_PAGES;
-TUNABLE_INT("vm.boot_pages", &boot_pages);
-SYSCTL_INT(_vm, OID_AUTO, boot_pages, CTLFLAG_RD, &boot_pages, 0,
+SYSCTL_INT(_vm, OID_AUTO, boot_pages, CTLFLAG_RDTUN, &boot_pages, 0,
 	"number of pages allocated for bootstrapping the VM system");
 
 static int pa_tryrelock_restart;
@@ -147,7 +146,7 @@ static uma_zone_t fakepg_zone;
 static struct vnode *vm_page_alloc_init(vm_page_t m);
 static void vm_page_cache_turn_free(vm_page_t m);
 static void vm_page_clear_dirty_mask(vm_page_t m, vm_page_bits_t pagebits);
-static void vm_page_enqueue(int queue, vm_page_t m);
+static void vm_page_enqueue(uint8_t queue, vm_page_t m);
 static void vm_page_init_fakepg(void *dummy);
 static int vm_page_insert_after(vm_page_t m, vm_object_t object,
     vm_pindex_t pindex, vm_page_t mpred);
@@ -2029,8 +2028,8 @@ vm_page_dequeue(vm_page_t m)
 	struct vm_pagequeue *pq;
 
 	vm_page_assert_locked(m);
-	KASSERT(m->queue == PQ_ACTIVE || m->queue == PQ_INACTIVE,
-	    ("vm_page_dequeue: page %p is not queued", m));
+	KASSERT(m->queue < PQ_COUNT, ("vm_page_dequeue: page %p is not queued",
+	    m));
 	pq = vm_page_pagequeue(m);
 	vm_pagequeue_lock(pq);
 	m->queue = PQ_NONE;
@@ -2067,11 +2066,14 @@ vm_page_dequeue_locked(vm_page_t m)
  *	The page must be locked.
  */
 static void
-vm_page_enqueue(int queue, vm_page_t m)
+vm_page_enqueue(uint8_t queue, vm_page_t m)
 {
 	struct vm_pagequeue *pq;
 
 	vm_page_lock_assert(m, MA_OWNED);
+	KASSERT(queue < PQ_COUNT,
+	    ("vm_page_enqueue: invalid queue %u request for page %p",
+	    queue, m));
 	pq = &vm_phys_domain(m)->vmd_pagequeues[queue];
 	vm_pagequeue_lock(pq);
 	m->queue = queue;
@@ -2330,9 +2332,7 @@ vm_page_wire(vm_page_t m)
  *
  * Release one wiring of the specified page, potentially enabling it to be
  * paged again.  If paging is enabled, then the value of the parameter
- * "activate" determines to which queue the page is added.  If "activate" is
- * non-zero, then the page is added to the active queue.  Otherwise, it is
- * added to the inactive queue.
+ * "queue" determines the queue to which the page is added.
  *
  * However, unless the page belongs to an object, it is not enqueued because
  * it cannot be paged out.
@@ -2342,9 +2342,12 @@ vm_page_wire(vm_page_t m)
  * A managed page must be locked.
  */
 void
-vm_page_unwire(vm_page_t m, int activate)
+vm_page_unwire(vm_page_t m, uint8_t queue)
 {
 
+	KASSERT(queue < PQ_COUNT,
+	    ("vm_page_unwire: invalid queue %u request for page %p",
+	    queue, m));
 	if ((m->oflags & VPO_UNMANAGED) == 0)
 		vm_page_lock_assert(m, MA_OWNED);
 	if ((m->flags & PG_FICTITIOUS) != 0) {
@@ -2359,9 +2362,9 @@ vm_page_unwire(vm_page_t m, int activate)
 			if ((m->oflags & VPO_UNMANAGED) != 0 ||
 			    m->object == NULL)
 				return;
-			if (!activate)
+			if (queue == PQ_INACTIVE)
 				m->flags &= ~PG_WINATCFLS;
-			vm_page_enqueue(activate ? PQ_ACTIVE : PQ_INACTIVE, m);
+			vm_page_enqueue(queue, m);
 		}
 	} else
 		panic("vm_page_unwire: page %p's wire count is zero", m);
@@ -3131,6 +3134,24 @@ vm_page_object_lock_assert(vm_page_t m)
 	if (m->object != NULL && !vm_page_xbusied(m))
 		VM_OBJECT_ASSERT_WLOCKED(m->object);
 }
+
+void
+vm_page_assert_pga_writeable(vm_page_t m, uint8_t bits)
+{
+
+	if ((bits & PGA_WRITEABLE) == 0)
+		return;
+
+	/*
+	 * The PGA_WRITEABLE flag can only be set if the page is
+	 * managed, is exclusively busied or the object is locked.
+	 * Currently, this flag is only set by pmap_enter().
+	 */
+	KASSERT((m->oflags & VPO_UNMANAGED) == 0,
+	    ("PGA_WRITEABLE on unmanaged page"));
+	if (!vm_page_xbusied(m))
+		VM_OBJECT_ASSERT_LOCKED(m->object);
+}
 #endif
 
 #include "opt_ddb.h"
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 29c7dec41602..f12b76c34280 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -305,10 +305,10 @@ extern struct mtx_padalign pa_lock[];
  * both the MI and MD VM layers.  However, kernel loadable modules should not
  * directly set this flag.  They should call vm_page_reference() instead.
  *
- * PGA_WRITEABLE is set exclusively on managed pages by pmap_enter().  When it
- * does so, the page must be exclusive busied.  The MI VM layer must never
- * access this flag directly.  Instead, it should call
- * pmap_page_is_write_mapped().
+ * PGA_WRITEABLE is set exclusively on managed pages by pmap_enter().
+ * When it does so, the object must be locked, or the page must be
+ * exclusive busied.  The MI VM layer must never access this flag
+ * directly.  Instead, it should call pmap_page_is_write_mapped().
  *
  * PGA_EXECUTABLE may be set by pmap routines, and indicates that a page has
  * at least one executable mapping.  It is not consumed by the MI VM layer.
@@ -465,7 +465,7 @@ vm_offset_t vm_page_startup(vm_offset_t vaddr);
 void vm_page_sunbusy(vm_page_t m);
 int vm_page_trysbusy(vm_page_t m);
 void vm_page_unhold_pages(vm_page_t *ma, int count);
-void vm_page_unwire (vm_page_t, int);
+void vm_page_unwire (vm_page_t m, uint8_t queue);
 void vm_page_updatefake(vm_page_t m, vm_paddr_t paddr, vm_memattr_t memattr);
 void vm_page_wire (vm_page_t);
 void vm_page_xunbusy_hard(vm_page_t m);
@@ -533,8 +533,12 @@ void vm_page_lock_assert_KBI(vm_page_t m, int a, const char *file, int line);
 #ifdef INVARIANTS
 void vm_page_object_lock_assert(vm_page_t m);
 #define	VM_PAGE_OBJECT_LOCK_ASSERT(m)	vm_page_object_lock_assert(m)
+void vm_page_assert_pga_writeable(vm_page_t m, uint8_t bits);
+#define	VM_PAGE_ASSERT_PGA_WRITEABLE(m, bits)				\
+	vm_page_assert_pga_writeable(m, bits)
 #else
 #define	VM_PAGE_OBJECT_LOCK_ASSERT(m)	(void)0
+#define	VM_PAGE_ASSERT_PGA_WRITEABLE(m, bits)	(void)0
 #endif
 
 /*
@@ -582,13 +586,7 @@ vm_page_aflag_set(vm_page_t m, uint8_t bits)
 {
 	uint32_t *addr, val;
 
-	/*
-	 * The PGA_WRITEABLE flag can only be set if the page is managed and
-	 * exclusive busied.  Currently, this flag is only set by pmap_enter().
-	 */
-	KASSERT((bits & PGA_WRITEABLE) == 0 ||
-	    ((m->oflags & VPO_UNMANAGED) == 0 && vm_page_xbusied(m)),
-	    ("vm_page_aflag_set: PGA_WRITEABLE and not exclusive busy"));
+	VM_PAGE_ASSERT_PGA_WRITEABLE(m, bits);
 
 	/*
 	 * Access the whole 32-bit word containing the aflags field with an
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 65743d79eb32..264aff4fe251 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -875,14 +875,6 @@ vm_pageout_map_deactivate_pages(map, desired)
 		tmpe = tmpe->next;
 	}
 
-#ifdef __ia64__
-	/*
-	 * Remove all non-wired, managed mappings if a process is swapped out.
-	 * This will free page table pages.
-	 */
-	if (desired == 0)
-		pmap_remove_pages(map->pmap);
-#else
 	/*
 	 * Remove all mappings if a process is swapped out, this will free page
 	 * table pages.
@@ -891,7 +883,6 @@ vm_pageout_map_deactivate_pages(map, desired)
 		pmap_remove(vm_map_pmap(map), vm_map_min(map),
 		    vm_map_max(map));
 	}
-#endif
 
 	vm_map_unlock(map);
 }
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index aa1b7f078c96..62265a23d277 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -187,7 +187,7 @@ static __inline void
 vm_pager_page_unswapped(vm_page_t m)
 {
 
-	VM_OBJECT_ASSERT_WLOCKED(m->object);
+	VM_OBJECT_ASSERT_LOCKED(m->object);
 	if (pagertab[m->object->type]->pgo_pageunswapped)
 		(*pagertab[m->object->type]->pgo_pageunswapped)(m);
 }
diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c
index 14960c885734..be3d5be78079 100644
--- a/sys/vm/vm_phys.c
+++ b/sys/vm/vm_phys.c
@@ -52,8 +52,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #endif
 #include <sys/queue.h>
+#include <sys/rwlock.h>
 #include <sys/sbuf.h>
 #include <sys/sysctl.h>
+#include <sys/tree.h>
 #include <sys/vmmeter.h>
 
 #include <ddb/ddb.h>
@@ -75,13 +77,25 @@ int vm_ndomains = 1;
 struct vm_phys_seg vm_phys_segs[VM_PHYSSEG_MAX];
 int vm_phys_nsegs;
 
-#define VM_PHYS_FICTITIOUS_NSEGS	8
-static struct vm_phys_fictitious_seg {
+struct vm_phys_fictitious_seg;
+static int vm_phys_fictitious_cmp(struct vm_phys_fictitious_seg *,
+    struct vm_phys_fictitious_seg *);
+
+RB_HEAD(fict_tree, vm_phys_fictitious_seg) vm_phys_fictitious_tree =
+    RB_INITIALIZER(_vm_phys_fictitious_tree);
+
+struct vm_phys_fictitious_seg {
+	RB_ENTRY(vm_phys_fictitious_seg) node;
+	/* Memory region data */
 	vm_paddr_t	start;
 	vm_paddr_t	end;
 	vm_page_t	first_page;
-} vm_phys_fictitious_segs[VM_PHYS_FICTITIOUS_NSEGS];
-static struct mtx vm_phys_fictitious_reg_mtx;
+};
+
+RB_GENERATE_STATIC(fict_tree, vm_phys_fictitious_seg, node,
+    vm_phys_fictitious_cmp);
+
+static struct rwlock vm_phys_fictitious_reg_lock;
 MALLOC_DEFINE(M_FICT_PAGES, "vm_fictitious", "Fictitious VM pages");
 
 static struct vm_freelist
@@ -113,6 +127,47 @@ static int vm_phys_paddr_to_segind(vm_paddr_t pa);
 static void vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl,
     int order);
 
+/*
+ * Red-black tree helpers for vm fictitious range management.
+ */
+static inline int
+vm_phys_fictitious_in_range(struct vm_phys_fictitious_seg *p,
+    struct vm_phys_fictitious_seg *range)
+{
+
+	KASSERT(range->start != 0 && range->end != 0,
+	    ("Invalid range passed on search for vm_fictitious page"));
+	if (p->start >= range->end)
+		return (1);
+	if (p->start < range->start)
+		return (-1);
+
+	return (0);
+}
+
+static int
+vm_phys_fictitious_cmp(struct vm_phys_fictitious_seg *p1,
+    struct vm_phys_fictitious_seg *p2)
+{
+
+	/* Check if this is a search for a page */
+	if (p1->end == 0)
+		return (vm_phys_fictitious_in_range(p1, p2));
+
+	KASSERT(p2->end != 0,
+    ("Invalid range passed as second parameter to vm fictitious comparison"));
+
+	/* Searching to add a new range */
+	if (p1->end <= p2->start)
+		return (-1);
+	if (p1->start >= p2->end)
+		return (1);
+
+	panic("Trying to add overlapping vm fictitious ranges:\n"
+	    "[%#jx:%#jx] and [%#jx:%#jx]", (uintmax_t)p1->start,
+	    (uintmax_t)p1->end, (uintmax_t)p2->start, (uintmax_t)p2->end);
+}
+
 static __inline int
 vm_rr_selectdomain(void)
 {
@@ -353,7 +408,7 @@ vm_phys_init(void)
 			}
 		}
 	}
-	mtx_init(&vm_phys_fictitious_reg_mtx, "vmfctr", NULL, MTX_DEF);
+	rw_init(&vm_phys_fictitious_reg_lock, "vmfctr");
 }
 
 /*
@@ -517,109 +572,183 @@ vm_phys_paddr_to_vm_page(vm_paddr_t pa)
 vm_page_t
 vm_phys_fictitious_to_vm_page(vm_paddr_t pa)
 {
-	struct vm_phys_fictitious_seg *seg;
+	struct vm_phys_fictitious_seg tmp, *seg;
 	vm_page_t m;
-	int segind;
 
 	m = NULL;
-	for (segind = 0; segind < VM_PHYS_FICTITIOUS_NSEGS; segind++) {
-		seg = &vm_phys_fictitious_segs[segind];
-		if (pa >= seg->start && pa < seg->end) {
-			m = &seg->first_page[atop(pa - seg->start)];
-			KASSERT((m->flags & PG_FICTITIOUS) != 0,
-			    ("%p not fictitious", m));
-			break;
-		}
-	}
+	tmp.start = pa;
+	tmp.end = 0;
+
+	rw_rlock(&vm_phys_fictitious_reg_lock);
+	seg = RB_FIND(fict_tree, &vm_phys_fictitious_tree, &tmp);
+	rw_runlock(&vm_phys_fictitious_reg_lock);
+	if (seg == NULL)
+		return (NULL);
+
+	m = &seg->first_page[atop(pa - seg->start)];
+	KASSERT((m->flags & PG_FICTITIOUS) != 0, ("%p not fictitious", m));
+
 	return (m);
 }
 
+static inline void
+vm_phys_fictitious_init_range(vm_page_t range, vm_paddr_t start,
+    long page_count, vm_memattr_t memattr)
+{
+	long i;
+
+	for (i = 0; i < page_count; i++) {
+		vm_page_initfake(&range[i], start + PAGE_SIZE * i, memattr);
+		range[i].oflags &= ~VPO_UNMANAGED;
+		range[i].busy_lock = VPB_UNBUSIED;
+	}
+}
+
 int
 vm_phys_fictitious_reg_range(vm_paddr_t start, vm_paddr_t end,
     vm_memattr_t memattr)
 {
 	struct vm_phys_fictitious_seg *seg;
 	vm_page_t fp;
-	long i, page_count;
-	int segind;
+	long page_count;
 #ifdef VM_PHYSSEG_DENSE
-	long pi;
-	boolean_t malloced;
+	long pi, pe;
+	long dpage_count;
 #endif
 
+	KASSERT(start < end,
+	    ("Start of segment isn't less than end (start: %jx end: %jx)",
+	    (uintmax_t)start, (uintmax_t)end));
+
 	page_count = (end - start) / PAGE_SIZE;
 
 #ifdef VM_PHYSSEG_DENSE
 	pi = atop(start);
-	if (pi >= first_page && pi < vm_page_array_size + first_page) {
-		if (atop(end) >= vm_page_array_size + first_page)
-			return (EINVAL);
+	pe = atop(end);
+	if (pi >= first_page && (pi - first_page) < vm_page_array_size) {
 		fp = &vm_page_array[pi - first_page];
-		malloced = FALSE;
-	} else
+		if ((pe - first_page) > vm_page_array_size) {
+			/*
+			 * We have a segment that starts inside
+			 * of vm_page_array, but ends outside of it.
+			 *
+			 * Use vm_page_array pages for those that are
+			 * inside of the vm_page_array range, and
+			 * allocate the remaining ones.
+			 */
+			dpage_count = vm_page_array_size - (pi - first_page);
+			vm_phys_fictitious_init_range(fp, start, dpage_count,
+			    memattr);
+			page_count -= dpage_count;
+			start += ptoa(dpage_count);
+			goto alloc;
+		}
+		/*
+		 * We can allocate the full range from vm_page_array,
+		 * so there's no need to register the range in the tree.
+		 */
+		vm_phys_fictitious_init_range(fp, start, page_count, memattr);
+		return (0);
+	} else if (pe > first_page && (pe - first_page) < vm_page_array_size) {
+		/*
+		 * We have a segment that ends inside of vm_page_array,
+		 * but starts outside of it.
+		 */
+		fp = &vm_page_array[0];
+		dpage_count = pe - first_page;
+		vm_phys_fictitious_init_range(fp, ptoa(first_page), dpage_count,
+		    memattr);
+		end -= ptoa(dpage_count);
+		page_count -= dpage_count;
+		goto alloc;
+	} else if (pi < first_page && pe > (first_page + vm_page_array_size)) {
+		/*
+		 * Trying to register a fictitious range that expands before
+		 * and after vm_page_array.
+		 */
+		return (EINVAL);
+	} else {
+alloc:
 #endif
-	{
 		fp = malloc(page_count * sizeof(struct vm_page), M_FICT_PAGES,
 		    M_WAITOK | M_ZERO);
 #ifdef VM_PHYSSEG_DENSE
-		malloced = TRUE;
+	}
 #endif
-	}
-	for (i = 0; i < page_count; i++) {
-		vm_page_initfake(&fp[i], start + PAGE_SIZE * i, memattr);
-		fp[i].oflags &= ~VPO_UNMANAGED;
-		fp[i].busy_lock = VPB_UNBUSIED;
-	}
-	mtx_lock(&vm_phys_fictitious_reg_mtx);
-	for (segind = 0; segind < VM_PHYS_FICTITIOUS_NSEGS; segind++) {
-		seg = &vm_phys_fictitious_segs[segind];
-		if (seg->start == 0 && seg->end == 0) {
-			seg->start = start;
-			seg->end = end;
-			seg->first_page = fp;
-			mtx_unlock(&vm_phys_fictitious_reg_mtx);
-			return (0);
-		}
-	}
-	mtx_unlock(&vm_phys_fictitious_reg_mtx);
-#ifdef VM_PHYSSEG_DENSE
-	if (malloced)
-#endif
-		free(fp, M_FICT_PAGES);
-	return (EBUSY);
+	vm_phys_fictitious_init_range(fp, start, page_count, memattr);
+
+	seg = malloc(sizeof(*seg), M_FICT_PAGES, M_WAITOK | M_ZERO);
+	seg->start = start;
+	seg->end = end;
+	seg->first_page = fp;
+
+	rw_wlock(&vm_phys_fictitious_reg_lock);
+	RB_INSERT(fict_tree, &vm_phys_fictitious_tree, seg);
+	rw_wunlock(&vm_phys_fictitious_reg_lock);
+
+	return (0);
 }
 
 void
 vm_phys_fictitious_unreg_range(vm_paddr_t start, vm_paddr_t end)
 {
-	struct vm_phys_fictitious_seg *seg;
-	vm_page_t fp;
-	int segind;
+	struct vm_phys_fictitious_seg *seg, tmp;
 #ifdef VM_PHYSSEG_DENSE
-	long pi;
+	long pi, pe;
 #endif
 
+	KASSERT(start < end,
+	    ("Start of segment isn't less than end (start: %jx end: %jx)",
+	    (uintmax_t)start, (uintmax_t)end));
+
 #ifdef VM_PHYSSEG_DENSE
 	pi = atop(start);
-#endif
-
-	mtx_lock(&vm_phys_fictitious_reg_mtx);
-	for (segind = 0; segind < VM_PHYS_FICTITIOUS_NSEGS; segind++) {
-		seg = &vm_phys_fictitious_segs[segind];
-		if (seg->start == start && seg->end == end) {
-			seg->start = seg->end = 0;
-			fp = seg->first_page;
-			seg->first_page = NULL;
-			mtx_unlock(&vm_phys_fictitious_reg_mtx);
-#ifdef VM_PHYSSEG_DENSE
-			if (pi < first_page || atop(end) >= vm_page_array_size)
-#endif
-				free(fp, M_FICT_PAGES);
+	pe = atop(end);
+	if (pi >= first_page && (pi - first_page) < vm_page_array_size) {
+		if ((pe - first_page) <= vm_page_array_size) {
+			/*
+			 * This segment was allocated using vm_page_array
+			 * only, there's nothing to do since those pages
+			 * were never added to the tree.
+			 */
 			return;
 		}
+		/*
+		 * We have a segment that starts inside
+		 * of vm_page_array, but ends outside of it.
+		 *
+		 * Calculate how many pages were added to the
+		 * tree and free them.
+		 */
+		start = ptoa(first_page + vm_page_array_size);
+	} else if (pe > first_page && (pe - first_page) < vm_page_array_size) {
+		/*
+		 * We have a segment that ends inside of vm_page_array,
+		 * but starts outside of it.
+		 */
+		end = ptoa(first_page);
+	} else if (pi < first_page && pe > (first_page + vm_page_array_size)) {
+		/* Since it's not possible to register such a range, panic. */
+		panic(
+		    "Unregistering not registered fictitious range [%#jx:%#jx]",
+		    (uintmax_t)start, (uintmax_t)end);
 	}
-	mtx_unlock(&vm_phys_fictitious_reg_mtx);
-	KASSERT(0, ("Unregistering not registered fictitious range"));
+#endif
+	tmp.start = start;
+	tmp.end = 0;
+
+	rw_wlock(&vm_phys_fictitious_reg_lock);
+	seg = RB_FIND(fict_tree, &vm_phys_fictitious_tree, &tmp);
+	if (seg->start != start || seg->end != end) {
+		rw_wunlock(&vm_phys_fictitious_reg_lock);
+		panic(
+		    "Unregistering not registered fictitious range [%#jx:%#jx]",
+		    (uintmax_t)start, (uintmax_t)end);
+	}
+	RB_REMOVE(fict_tree, &vm_phys_fictitious_tree, seg);
+	rw_wunlock(&vm_phys_fictitious_reg_lock);
+	free(seg->first_page, M_FICT_PAGES);
+	free(seg, M_FICT_PAGES);
 }
 
 /*
diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c
index bb45ba0d801c..4f4b6d24d526 100644
--- a/sys/vm/vm_radix.c
+++ b/sys/vm/vm_radix.c
@@ -302,7 +302,7 @@ vm_radix_reserve_kva(void *arg __unused)
 	    sizeof(struct vm_radix_node))))
 		panic("%s: unable to reserve KVA", __func__);
 }
-SYSINIT(vm_radix_reserve_kva, SI_SUB_KMEM, SI_ORDER_SECOND,
+SYSINIT(vm_radix_reserve_kva, SI_SUB_KMEM, SI_ORDER_THIRD,
     vm_radix_reserve_kva, NULL);
 #endif
 
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index edb6eccebcfb..de9aa78c134f 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -162,7 +162,7 @@ sys_obreak(td, uap)
 #endif
 		prot = VM_PROT_RW;
 #ifdef COMPAT_FREEBSD32
-#if defined(__amd64__) || defined(__ia64__)
+#if defined(__amd64__)
 		if (i386_read_exec && SV_PROC_FLAG(td->td_proc, SV_ILP32))
 			prot |= VM_PROT_EXECUTE;
 #endif
diff --git a/sys/vm/vm_zeroidle.c b/sys/vm/vm_zeroidle.c
index 458539eb1782..dac4abe3a46e 100644
--- a/sys/vm/vm_zeroidle.c
+++ b/sys/vm/vm_zeroidle.c
@@ -55,10 +55,9 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_phys.h>
 
 static int idlezero_enable_default = 0;
-TUNABLE_INT("vm.idlezero_enable", &idlezero_enable_default);
 /* Defer setting the enable flag until the kthread is running. */
 static int idlezero_enable = 0;
-SYSCTL_INT(_vm, OID_AUTO, idlezero_enable, CTLFLAG_RW, &idlezero_enable, 0,
+SYSCTL_INT(_vm, OID_AUTO, idlezero_enable, CTLFLAG_RWTUN, &idlezero_enable, 0,
     "Allow the kernel to use idle cpu cycles to zero-out pages");
 /*
  * Implement the pre-zeroed page mechanism.
diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c
index bf0aba674ceb..b9cc895fbd06 100644
--- a/sys/x86/acpica/madt.c
+++ b/sys/x86/acpica/madt.c
@@ -57,7 +57,7 @@ static struct lapic_info {
 	u_int la_acpi_id:8;
 } lapics[MAX_APIC_ID + 1];
 
-static int madt_found_sci_override;
+int madt_found_sci_override;
 static ACPI_TABLE_MADT *madt;
 static vm_paddr_t madt_physaddr;
 static vm_offset_t madt_length;
@@ -102,7 +102,7 @@ madt_probe(void)
 	madt_physaddr = acpi_find_table(ACPI_SIG_MADT);
 	if (madt_physaddr == 0)
 		return (ENXIO);
-	return (0);
+	return (-50);
 }
 
 /*
@@ -299,7 +299,7 @@ interrupt_polarity(UINT16 IntiFlags, UINT8 Source)
 
 	switch (IntiFlags & ACPI_MADT_POLARITY_MASK) {
 	default:
-		printf("WARNING: Bogus Interrupt Polarity. Assume CONFORMS");
+		printf("WARNING: Bogus Interrupt Polarity. Assume CONFORMS\n");
 		/* FALLTHROUGH*/
 	case ACPI_MADT_POLARITY_CONFORMS:
 		if (Source == AcpiGbl_FADT.SciInterrupt)
@@ -319,7 +319,7 @@ interrupt_trigger(UINT16 IntiFlags, UINT8 Source)
 
 	switch (IntiFlags & ACPI_MADT_TRIGGER_MASK) {
 	default:
-		printf("WARNING: Bogus Interrupt Trigger Mode. Assume CONFORMS.");
+		printf("WARNING: Bogus Interrupt Trigger Mode. Assume CONFORMS.\n");
 		/*FALLTHROUGH*/
 	case ACPI_MADT_TRIGGER_CONFORMS:
 		if (Source == AcpiGbl_FADT.SciInterrupt)
@@ -380,6 +380,61 @@ madt_find_interrupt(int intr, void **apic, u_int *pin)
 	return (0);
 }
 
+void
+madt_parse_interrupt_values(void *entry,
+    enum intr_trigger *trig, enum intr_polarity *pol)
+{
+	ACPI_MADT_INTERRUPT_OVERRIDE *intr;
+	char buf[64];
+
+	intr = entry;
+
+	if (bootverbose)
+		printf("MADT: Interrupt override: source %u, irq %u\n",
+		    intr->SourceIrq, intr->GlobalIrq);
+	KASSERT(intr->Bus == 0, ("bus for interrupt overrides must be zero"));
+
+	/*
+	 * Lookup the appropriate trigger and polarity modes for this
+	 * entry.
+	 */
+	*trig = interrupt_trigger(intr->IntiFlags, intr->SourceIrq);
+	*pol = interrupt_polarity(intr->IntiFlags, intr->SourceIrq);
+
+	/*
+	 * If the SCI is identity mapped but has edge trigger and
+	 * active-hi polarity or the force_sci_lo tunable is set,
+	 * force it to use level/lo.
+	 */
+	if (intr->SourceIrq == AcpiGbl_FADT.SciInterrupt) {
+		madt_found_sci_override = 1;
+		if (getenv_string("hw.acpi.sci.trigger", buf, sizeof(buf))) {
+			if (tolower(buf[0]) == 'e')
+				*trig = INTR_TRIGGER_EDGE;
+			else if (tolower(buf[0]) == 'l')
+				*trig = INTR_TRIGGER_LEVEL;
+			else
+				panic(
+				"Invalid trigger %s: must be 'edge' or 'level'",
+				    buf);
+			printf("MADT: Forcing SCI to %s trigger\n",
+			    *trig == INTR_TRIGGER_EDGE ? "edge" : "level");
+		}
+		if (getenv_string("hw.acpi.sci.polarity", buf, sizeof(buf))) {
+			if (tolower(buf[0]) == 'h')
+				*pol = INTR_POLARITY_HIGH;
+			else if (tolower(buf[0]) == 'l')
+				*pol = INTR_POLARITY_LOW;
+			else
+				panic(
+				"Invalid polarity %s: must be 'high' or 'low'",
+				    buf);
+			printf("MADT: Forcing SCI to active %s polarity\n",
+			    *pol == INTR_POLARITY_HIGH ? "high" : "low");
+		}
+	}
+}
+
 /*
  * Parse an interrupt source override for an ISA interrupt.
  */
@@ -390,7 +445,6 @@ madt_parse_interrupt_override(ACPI_MADT_INTERRUPT_OVERRIDE *intr)
 	u_int new_pin, old_pin;
 	enum intr_trigger trig;
 	enum intr_polarity pol;
-	char buf[64];
 
 	if (acpi_quirks & ACPI_Q_MADT_IRQ0 && intr->SourceIrq == 0 &&
 	    intr->GlobalIrq == 2) {
@@ -398,55 +452,14 @@ madt_parse_interrupt_override(ACPI_MADT_INTERRUPT_OVERRIDE *intr)
 			printf("MADT: Skipping timer override\n");
 		return;
 	}
-	if (bootverbose)
-		printf("MADT: Interrupt override: source %u, irq %u\n",
-		    intr->SourceIrq, intr->GlobalIrq);
-	KASSERT(intr->Bus == 0, ("bus for interrupt overrides must be zero"));
+
 	if (madt_find_interrupt(intr->GlobalIrq, &new_ioapic, &new_pin) != 0) {
 		printf("MADT: Could not find APIC for vector %u (IRQ %u)\n",
 		    intr->GlobalIrq, intr->SourceIrq);
 		return;
 	}
 
-	/*
-	 * Lookup the appropriate trigger and polarity modes for this
-	 * entry.
-	 */
-	trig = interrupt_trigger(intr->IntiFlags, intr->SourceIrq);
-	pol = interrupt_polarity(intr->IntiFlags, intr->SourceIrq);
-	
-	/*
-	 * If the SCI is identity mapped but has edge trigger and
-	 * active-hi polarity or the force_sci_lo tunable is set,
-	 * force it to use level/lo.
-	 */
-	if (intr->SourceIrq == AcpiGbl_FADT.SciInterrupt) {
-		madt_found_sci_override = 1;
-		if (getenv_string("hw.acpi.sci.trigger", buf, sizeof(buf))) {
-			if (tolower(buf[0]) == 'e')
-				trig = INTR_TRIGGER_EDGE;
-			else if (tolower(buf[0]) == 'l')
-				trig = INTR_TRIGGER_LEVEL;
-			else
-				panic(
-				"Invalid trigger %s: must be 'edge' or 'level'",
-				    buf);
-			printf("MADT: Forcing SCI to %s trigger\n",
-			    trig == INTR_TRIGGER_EDGE ? "edge" : "level");
-		}
-		if (getenv_string("hw.acpi.sci.polarity", buf, sizeof(buf))) {
-			if (tolower(buf[0]) == 'h')
-				pol = INTR_POLARITY_HIGH;
-			else if (tolower(buf[0]) == 'l')
-				pol = INTR_POLARITY_LOW;
-			else
-				panic(
-				"Invalid polarity %s: must be 'high' or 'low'",
-				    buf);
-			printf("MADT: Forcing SCI to active %s polarity\n",
-			    pol == INTR_POLARITY_HIGH ? "high" : "low");
-		}
-	}
+	madt_parse_interrupt_values(intr, &trig, &pol);
 
 	/* Remap the IRQ if it is mapped to a different interrupt vector. */
 	if (intr->SourceIrq != intr->GlobalIrq) {
diff --git a/sys/x86/cpufreq/hwpstate.c b/sys/x86/cpufreq/hwpstate.c
index e86e31aab4cd..d4c70b773c70 100644
--- a/sys/x86/cpufreq/hwpstate.c
+++ b/sys/x86/cpufreq/hwpstate.c
@@ -118,9 +118,8 @@ static int	hwpstate_get_info_from_msr(device_t dev);
 static int	hwpstate_goto_pstate(device_t dev, int pstate_id);
 
 static int	hwpstate_verbose = 0;
-SYSCTL_INT(_debug, OID_AUTO, hwpstate_verbose, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_debug, OID_AUTO, hwpstate_verbose, CTLFLAG_RWTUN,
        &hwpstate_verbose, 0, "Debug hwpstate");
-TUNABLE_INT("debug.hwpstate_verbose", &hwpstate_verbose);
 
 static device_method_t hwpstate_methods[] = {
 	/* Device interface */
diff --git a/sys/x86/include/acpica_machdep.h b/sys/x86/include/acpica_machdep.h
index 474378685892..46080c0e8faf 100644
--- a/sys/x86/include/acpica_machdep.h
+++ b/sys/x86/include/acpica_machdep.h
@@ -69,11 +69,18 @@ int	acpi_release_global_lock(volatile uint32_t *);
 	(Acq) = acpi_release_global_lock(&((GLptr)->GlobalLock));	\
 } while (0)
  
+enum intr_trigger;
+enum intr_polarity;
+
 void	acpi_SetDefaultIntrModel(int model);
 void	acpi_cpu_c1(void);
 void	*acpi_map_table(vm_paddr_t pa, const char *sig);
 void	acpi_unmap_table(void *table);
 vm_paddr_t acpi_find_table(const char *sig);
+void	madt_parse_interrupt_values(void *entry,
+	    enum intr_trigger *trig, enum intr_polarity *pol);
+
+extern int madt_found_sci_override;
 
 #endif /* _KERNEL */
 
diff --git a/sys/x86/include/apicvar.h b/sys/x86/include/apicvar.h
index 62e3e91c29f4..35603e8ce190 100644
--- a/sys/x86/include/apicvar.h
+++ b/sys/x86/include/apicvar.h
@@ -168,15 +168,7 @@ inthand_t
 extern vm_paddr_t lapic_paddr;
 extern int apic_cpuids[];
 
-u_int	apic_alloc_vector(u_int apic_id, u_int irq);
-u_int	apic_alloc_vectors(u_int apic_id, u_int *irqs, u_int count,
-	    u_int align);
-void	apic_disable_vector(u_int apic_id, u_int vector);
-void	apic_enable_vector(u_int apic_id, u_int vector);
-void	apic_free_vector(u_int apic_id, u_int vector, u_int irq);
-u_int	apic_idt_to_irq(u_int apic_id, u_int vector);
 void	apic_register_enumerator(struct apic_enumerator *enumerator);
-u_int	apic_cpuid(u_int apic_id);
 void	*ioapic_create(vm_paddr_t addr, int32_t apic_id, int intbase);
 int	ioapic_disable_pin(void *cookie, u_int pin);
 int	ioapic_get_vector(void *cookie, u_int pin);
@@ -189,33 +181,240 @@ int	ioapic_set_polarity(void *cookie, u_int pin, enum intr_polarity pol);
 int	ioapic_set_triggermode(void *cookie, u_int pin,
 	    enum intr_trigger trigger);
 int	ioapic_set_smi(void *cookie, u_int pin);
-void	lapic_create(u_int apic_id, int boot_cpu);
-void	lapic_disable(void);
-void	lapic_disable_pmc(void);
-void	lapic_dump(const char *str);
-void	lapic_enable_cmc(void);
-int	lapic_enable_pmc(void);
-void	lapic_eoi(void);
-int	lapic_id(void);
-void	lapic_init(vm_paddr_t addr);
-int	lapic_intr_pending(u_int vector);
-void	lapic_ipi_raw(register_t icrlo, u_int dest);
-void	lapic_ipi_vectored(u_int vector, int dest);
-int	lapic_ipi_wait(int delay);
+
+/*
+ * Struct containing pointers to APIC functions whose
+ * implementation is run time selectable.
+ */
+struct apic_ops {
+	void	(*create)(u_int, int);
+	void	(*init)(vm_paddr_t);
+	void	(*setup)(int);
+	void	(*dump)(const char *);
+	void	(*disable)(void);
+	void	(*eoi)(void);
+	int	(*id)(void);
+	int	(*intr_pending)(u_int);
+	void	(*set_logical_id)(u_int, u_int, u_int);
+	u_int	(*cpuid)(u_int);
+
+	/* Vectors */
+	u_int	(*alloc_vector)(u_int, u_int);
+	u_int	(*alloc_vectors)(u_int, u_int *, u_int, u_int);
+	void	(*enable_vector)(u_int, u_int);
+	void	(*disable_vector)(u_int, u_int);
+	void	(*free_vector)(u_int, u_int, u_int);
+
+
+	/* PMC */
+	int	(*enable_pmc)(void);
+	void	(*disable_pmc)(void);
+	void	(*reenable_pmc)(void);
+
+	/* CMC */
+	void	(*enable_cmc)(void);
+
+	/* IPI */
+	void	(*ipi_raw)(register_t, u_int);
+	void	(*ipi_vectored)(u_int, int);
+	int	(*ipi_wait)(int);
+
+	/* LVT */
+	int	(*set_lvt_mask)(u_int, u_int, u_char);
+	int	(*set_lvt_mode)(u_int, u_int, u_int32_t);
+	int	(*set_lvt_polarity)(u_int, u_int, enum intr_polarity);
+	int	(*set_lvt_triggermode)(u_int, u_int, enum intr_trigger);
+};
+
+extern struct apic_ops apic_ops;
+
+static inline void
+lapic_create(u_int apic_id, int boot_cpu)
+{
+
+	apic_ops.create(apic_id, boot_cpu);
+}
+
+static inline void
+lapic_init(vm_paddr_t addr)
+{
+
+	apic_ops.init(addr);
+}
+
+static inline void
+lapic_setup(int boot)
+{
+
+	apic_ops.setup(boot);
+}
+
+static inline void
+lapic_dump(const char *str)
+{
+
+	apic_ops.dump(str);
+}
+
+static inline void
+lapic_disable(void)
+{
+
+	apic_ops.disable();
+}
+
+static inline void
+lapic_eoi(void)
+{
+
+	apic_ops.eoi();
+}
+
+static inline int
+lapic_id(void)
+{
+
+	return (apic_ops.id());
+}
+
+static inline int
+lapic_intr_pending(u_int vector)
+{
+
+	return (apic_ops.intr_pending(vector));
+}
+
+/* XXX: UNUSED */
+static inline void
+lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id)
+{
+
+	apic_ops.set_logical_id(apic_id, cluster, cluster_id);
+}
+
+static inline u_int
+apic_cpuid(u_int apic_id)
+{
+
+	return (apic_ops.cpuid(apic_id));
+}
+
+static inline u_int
+apic_alloc_vector(u_int apic_id, u_int irq)
+{
+
+	return (apic_ops.alloc_vector(apic_id, irq));
+}
+
+static inline u_int
+apic_alloc_vectors(u_int apic_id, u_int *irqs, u_int count, u_int align)
+{
+
+	return (apic_ops.alloc_vectors(apic_id, irqs, count, align));
+}
+
+static inline void
+apic_enable_vector(u_int apic_id, u_int vector)
+{
+
+	apic_ops.enable_vector(apic_id, vector);
+}
+
+static inline void
+apic_disable_vector(u_int apic_id, u_int vector)
+{
+
+	apic_ops.disable_vector(apic_id, vector);
+}
+
+static inline void
+apic_free_vector(u_int apic_id, u_int vector, u_int irq)
+{
+
+	apic_ops.free_vector(apic_id, vector, irq);
+}
+
+static inline int
+lapic_enable_pmc(void)
+{
+
+	return (apic_ops.enable_pmc());
+}
+
+static inline void
+lapic_disable_pmc(void)
+{
+
+	apic_ops.disable_pmc();
+}
+
+static inline void
+lapic_reenable_pmc(void)
+{
+
+	apic_ops.reenable_pmc();
+}
+
+static inline void
+lapic_enable_cmc(void)
+{
+
+	apic_ops.enable_cmc();
+}
+
+static inline void
+lapic_ipi_raw(register_t icrlo, u_int dest)
+{
+
+	apic_ops.ipi_raw(icrlo, dest);
+}
+
+static inline void
+lapic_ipi_vectored(u_int vector, int dest)
+{
+
+	apic_ops.ipi_vectored(vector, dest);
+}
+
+static inline int
+lapic_ipi_wait(int delay)
+{
+
+	return (apic_ops.ipi_wait(delay));
+}
+
+static inline int
+lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked)
+{
+
+	return (apic_ops.set_lvt_mask(apic_id, lvt, masked));
+}
+
+static inline int
+lapic_set_lvt_mode(u_int apic_id, u_int lvt, u_int32_t mode)
+{
+
+	return (apic_ops.set_lvt_mode(apic_id, lvt, mode));
+}
+
+static inline int
+lapic_set_lvt_polarity(u_int apic_id, u_int lvt, enum intr_polarity pol)
+{
+
+	return (apic_ops.set_lvt_polarity(apic_id, lvt, pol));
+}
+
+static inline int
+lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, enum intr_trigger trigger)
+{
+
+	return (apic_ops.set_lvt_triggermode(apic_id, lvt, trigger));
+}
+
 void	lapic_handle_cmc(void);
 void	lapic_handle_error(void);
 void	lapic_handle_intr(int vector, struct trapframe *frame);
 void	lapic_handle_timer(struct trapframe *frame);
-void	lapic_reenable_pmc(void);
-void	lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id);
-int	lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked);
-int	lapic_set_lvt_mode(u_int apic_id, u_int lvt, u_int32_t mode);
-int	lapic_set_lvt_polarity(u_int apic_id, u_int lvt,
-	    enum intr_polarity pol);
-int	lapic_set_lvt_triggermode(u_int apic_id, u_int lvt,
-	    enum intr_trigger trigger);
-void	lapic_set_tpr(u_int vector);
-void	lapic_setup(int boot);
 void	xen_intr_handle_upcall(struct trapframe *frame);
 
 #endif /* !LOCORE */
diff --git a/sys/x86/include/init.h b/sys/x86/include/init.h
index e1ff5cf2133a..47dc4f5839e8 100644
--- a/sys/x86/include/init.h
+++ b/sys/x86/include/init.h
@@ -45,4 +45,13 @@ struct init_ops {
 
 extern struct init_ops init_ops;
 
+/* Knob to disable acpi_cpu devices */
+extern bool acpi_cpu_disabled;
+
+/* Knob to disable acpi_hpet device */
+extern bool acpi_hpet_disabled;
+
+/* Knob to disable acpi_timer device */
+extern bool acpi_timer_disabled;
+
 #endif /* __X86_INIT_H__ */
diff --git a/sys/x86/include/segments.h b/sys/x86/include/segments.h
index 0d6a282c3c8f..a5c1ea46b7b4 100644
--- a/sys/x86/include/segments.h
+++ b/sys/x86/include/segments.h
@@ -219,7 +219,7 @@ union descriptor {
 #define	IDT_DTRACE_RET	0x92	/* DTrace pid provider Interrupt Vector */
 #define	IDT_EVTCHN	0x93	/* Xen HVM Event Channel Interrupt Vector */
 
-#if defined(__i386__) || defined(__ia64__)
+#if defined(__i386__)
 /*
  * Entries in the Global Descriptor Table (GDT)
  * Note that each 4 entries share a single 32 byte L1 cache line.
@@ -264,7 +264,7 @@ union descriptor {
 #define	LBSDICALLS_SEL	16	/* BSDI system call gate */
 #define	NLDT		(LBSDICALLS_SEL + 1)
 
-#else /* !__i386__ && !__ia64__ */
+#else /* !__i386__ */
 /*
  * Entries in the Global Descriptor Table (GDT)
  */
@@ -282,6 +282,6 @@ union descriptor {
 #define	GUSERLDT_SEL	11	/* LDT */
 /* slot 12 is second half of GUSERLDT_SEL */
 #define	NGDT 		13
-#endif /* __i386__ || __ia64__ */
+#endif /* __i386__ */
 
 #endif /* !_X86_SEGMENTS_H_ */
diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h
index e1e8d81af055..bdc16e7fcb74 100644
--- a/sys/x86/include/specialreg.h
+++ b/sys/x86/include/specialreg.h
@@ -435,6 +435,25 @@
 #define	MSR_MC4_ADDR		0x412
 #define	MSR_MC4_MISC		0x413
 
+/*
+ * VMX MSRs
+ */
+#define	MSR_VMX_BASIC		0x480
+#define	MSR_VMX_PINBASED_CTLS	0x481
+#define	MSR_VMX_PROCBASED_CTLS	0x482
+#define	MSR_VMX_EXIT_CTLS	0x483
+#define	MSR_VMX_ENTRY_CTLS	0x484
+#define	MSR_VMX_CR0_FIXED0	0x486
+#define	MSR_VMX_CR0_FIXED1	0x487
+#define	MSR_VMX_CR4_FIXED0	0x488
+#define	MSR_VMX_CR4_FIXED1	0x489
+#define	MSR_VMX_PROCBASED_CTLS2	0x48b
+#define	MSR_VMX_EPT_VPID_CAP	0x48c
+#define	MSR_VMX_TRUE_PINBASED_CTLS	0x48d
+#define	MSR_VMX_TRUE_PROCBASED_CTLS	0x48e
+#define	MSR_VMX_TRUE_EXIT_CTLS	0x48f
+#define	MSR_VMX_TRUE_ENTRY_CTLS	0x490
+
 /*
  * X2APIC MSRs
  */
diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c
index ce3f284c32a9..a71c02f2be16 100644
--- a/sys/x86/iommu/intel_drv.c
+++ b/sys/x86/iommu/intel_drv.c
@@ -31,7 +31,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_acpi.h"
-#if defined(__amd64__) /* || defined(__ia64__) */
+#if defined(__amd64__)
 #define	DEV_APIC
 #else
 #include "opt_apic.h"
diff --git a/sys/x86/iommu/intel_utils.c b/sys/x86/iommu/intel_utils.c
index e221a1e6546b..444329c581fe 100644
--- a/sys/x86/iommu/intel_utils.c
+++ b/sys/x86/iommu/intel_utils.c
@@ -549,17 +549,16 @@ dmar_barrier_exit(struct dmar_unit *dmar, u_int barrier_id)
 
 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,
+static SYSCTL_NODE(_hw, OID_AUTO, dmar, CTLFLAG_RD, NULL, "");
+SYSCTL_INT(_hw_dmar, OID_AUTO, tbl_pagecnt, CTLFLAG_RD,
     &dmar_tbl_pagecnt, 0,
     "Count of pages used for DMAR pagetables");
-SYSCTL_INT(_hw_dmar, OID_AUTO, match_verbose, CTLFLAG_RW | CTLFLAG_TUN,
+SYSCTL_INT(_hw_dmar, OID_AUTO, match_verbose, CTLFLAG_RWTUN,
     &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,
+SYSCTL_INT(_hw_dmar, OID_AUTO, check_free, CTLFLAG_RWTUN,
     &dmar_check_free, 0,
     "Check the GPA RBtree for free_down and free_after validity");
 #endif
diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c
index 6ce6d1a2cb1f..e3fdb34d7f29 100644
--- a/sys/x86/isa/atpic.c
+++ b/sys/x86/isa/atpic.c
@@ -524,7 +524,7 @@ atpic_init(void *dummy __unused)
 		intr_register_source(&ai->at_intsrc);
 	}
 }
-SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_SECOND + 1, atpic_init, NULL);
+SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_FOURTH, atpic_init, NULL);
 
 void
 atpic_handle_intr(u_int vector, struct trapframe *frame)
diff --git a/sys/x86/isa/isa.c b/sys/x86/isa/isa.c
index 1a5713731836..605af59259a5 100644
--- a/sys/x86/isa/isa.c
+++ b/sys/x86/isa/isa.c
@@ -241,3 +241,8 @@ isa_release_resource(device_t bus, device_t child, int type, int rid,
  * On this platform, isa can also attach to the legacy bus.
  */
 DRIVER_MODULE(isa, legacy, isa_driver, isa_devclass, 0, 0);
+
+/*
+ * Attach the ISA bus to the xenpv bus in order to get syscons.
+ */
+DRIVER_MODULE(isa, xenpv, isa_driver, isa_devclass, 0, 0);
diff --git a/sys/x86/pci/pci_bus.c b/sys/x86/pci/pci_bus.c
index 88cabc724fe3..f64659eec2ad 100644
--- a/sys/x86/pci/pci_bus.c
+++ b/sys/x86/pci/pci_bus.c
@@ -575,7 +575,6 @@ legacy_pcib_write_ivar(device_t dev, device_t child, int which,
 SYSCTL_DECL(_hw_pci);
 
 static unsigned long host_mem_start = 0x80000000;
-TUNABLE_ULONG("hw.pci.host_mem_start", &host_mem_start);
 SYSCTL_ULONG(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN, &host_mem_start,
     0, "Limit the host bridge memory to being above this address.");
 
diff --git a/sys/x86/x86/dump_machdep.c b/sys/x86/x86/dump_machdep.c
index 5c874f4847b6..940c51939eae 100644
--- a/sys/x86/x86/dump_machdep.c
+++ b/sys/x86/x86/dump_machdep.c
@@ -53,8 +53,7 @@ __FBSDID("$FreeBSD$");
 CTASSERT(sizeof(struct kerneldumpheader) == 512);
 
 int do_minidump = 1;
-TUNABLE_INT("debug.minidump", &do_minidump);
-SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RW, &do_minidump, 0,
+SYSCTL_INT(_debug, OID_AUTO, minidump, CTLFLAG_RWTUN, &do_minidump, 0,
     "Enable mini crash dumps");
 
 /*
@@ -267,7 +266,7 @@ foreach_chunk(callback_t cb, void *arg)
 	return (seqnr);
 }
 
-void
+int
 dumpsys(struct dumperinfo *di)
 {
 	Elf_Ehdr ehdr;
@@ -278,7 +277,7 @@ dumpsys(struct dumperinfo *di)
 
 	if (do_minidump) {
 		minidumpsys(di);
-		return;
+		return (0);
 	}
 	bzero(&ehdr, sizeof(ehdr));
 	ehdr.e_ident[EI_MAG0] = ELFMAG0;
@@ -364,7 +363,7 @@ dumpsys(struct dumperinfo *di)
 	/* Signal completion, signoff and exit stage left. */
 	dump_write(di, NULL, 0, 0, 0);
 	printf("\nDump complete\n");
-	return;
+	return (0);
 
  fail:
 	if (error < 0)
@@ -376,4 +375,5 @@ dumpsys(struct dumperinfo *di)
 		printf("\nDump failed. Partition too small.\n");
 	else
 		printf("\n** DUMP FAILED (ERROR %d) **\n", error);
+	return (error);
 }
diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c
index ec469ad685e7..5667120661b4 100644
--- a/sys/x86/x86/io_apic.c
+++ b/sys/x86/x86/io_apic.c
@@ -134,7 +134,6 @@ static SYSCTL_NODE(_hw, OID_AUTO, apic, CTLFLAG_RD, 0, "APIC options");
 static int enable_extint;
 SYSCTL_INT(_hw_apic, OID_AUTO, enable_extint, CTLFLAG_RDTUN, &enable_extint, 0,
     "Enable the ExtINT pin in the first I/O APIC");
-TUNABLE_INT("hw.apic.enable_extint", &enable_extint);
 
 static __inline void
 _ioapic_eoi_source(struct intsrc *isrc)
diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c
index 6a33cf167ee5..a9b8c442724d 100644
--- a/sys/x86/x86/local_apic.c
+++ b/sys/x86/x86/local_apic.c
@@ -169,11 +169,78 @@ static void	lapic_timer_stop(struct lapic *);
 static void	lapic_timer_set_divisor(u_int divisor);
 static uint32_t	lvt_mode(struct lapic *la, u_int pin, uint32_t value);
 static int	lapic_et_start(struct eventtimer *et,
-    sbintime_t first, sbintime_t period);
+		    sbintime_t first, sbintime_t period);
 static int	lapic_et_stop(struct eventtimer *et);
+static u_int	apic_idt_to_irq(u_int apic_id, u_int vector);
+static void	lapic_set_tpr(u_int vector);
 
 struct pic lapic_pic = { .pic_resume = lapic_resume };
 
+/* Forward declarations for apic_ops */
+static void	native_lapic_create(u_int apic_id, int boot_cpu);
+static void	native_lapic_init(vm_paddr_t addr);
+static void	native_lapic_setup(int boot);
+static void	native_lapic_dump(const char *str);
+static void	native_lapic_disable(void);
+static void	native_lapic_eoi(void);
+static int	native_lapic_id(void);
+static int	native_lapic_intr_pending(u_int vector);
+static u_int	native_apic_cpuid(u_int apic_id);
+static u_int	native_apic_alloc_vector(u_int apic_id, u_int irq);
+static u_int	native_apic_alloc_vectors(u_int apic_id, u_int *irqs,
+		    u_int count, u_int align);
+static void 	native_apic_disable_vector(u_int apic_id, u_int vector);
+static void 	native_apic_enable_vector(u_int apic_id, u_int vector);
+static void 	native_apic_free_vector(u_int apic_id, u_int vector, u_int irq);
+static void 	native_lapic_set_logical_id(u_int apic_id, u_int cluster,
+		    u_int cluster_id);
+static int 	native_lapic_enable_pmc(void);
+static void 	native_lapic_disable_pmc(void);
+static void 	native_lapic_reenable_pmc(void);
+static void 	native_lapic_enable_cmc(void);
+static void 	native_lapic_ipi_raw(register_t icrlo, u_int dest);
+static void 	native_lapic_ipi_vectored(u_int vector, int dest);
+static int 	native_lapic_ipi_wait(int delay);
+static int 	native_lapic_set_lvt_mask(u_int apic_id, u_int lvt,
+		    u_char masked);
+static int 	native_lapic_set_lvt_mode(u_int apic_id, u_int lvt,
+		    uint32_t mode);
+static int 	native_lapic_set_lvt_polarity(u_int apic_id, u_int lvt,
+		    enum intr_polarity pol);
+static int 	native_lapic_set_lvt_triggermode(u_int apic_id, u_int lvt,
+		    enum intr_trigger trigger);
+
+struct apic_ops apic_ops = {
+	.create			= native_lapic_create,
+	.init			= native_lapic_init,
+	.setup			= native_lapic_setup,
+	.dump			= native_lapic_dump,
+	.disable		= native_lapic_disable,
+	.eoi			= native_lapic_eoi,
+	.id			= native_lapic_id,
+	.intr_pending		= native_lapic_intr_pending,
+	.set_logical_id		= native_lapic_set_logical_id,
+	.cpuid			= native_apic_cpuid,
+	.alloc_vector		= native_apic_alloc_vector,
+	.alloc_vectors		= native_apic_alloc_vectors,
+	.enable_vector		= native_apic_enable_vector,
+	.disable_vector		= native_apic_disable_vector,
+	.free_vector		= native_apic_free_vector,
+	.enable_pmc		= native_lapic_enable_pmc,
+	.disable_pmc		= native_lapic_disable_pmc,
+	.reenable_pmc		= native_lapic_reenable_pmc,
+	.enable_cmc		= native_lapic_enable_cmc,
+#ifdef SMP
+	.ipi_raw		= native_lapic_ipi_raw,
+	.ipi_vectored		= native_lapic_ipi_vectored,
+	.ipi_wait		= native_lapic_ipi_wait,
+#endif
+	.set_lvt_mask		= native_lapic_set_lvt_mask,
+	.set_lvt_mode		= native_lapic_set_lvt_mode,
+	.set_lvt_polarity	= native_lapic_set_lvt_polarity,
+	.set_lvt_triggermode	= native_lapic_set_lvt_triggermode,
+};
+
 static uint32_t
 lvt_mode(struct lapic *la, u_int pin, uint32_t value)
 {
@@ -218,8 +285,8 @@ lvt_mode(struct lapic *la, u_int pin, uint32_t value)
 /*
  * Map the local APIC and setup necessary interrupt vectors.
  */
-void
-lapic_init(vm_paddr_t addr)
+static void
+native_lapic_init(vm_paddr_t addr)
 {
 	u_int regs[4];
 	int i, arat;
@@ -280,8 +347,8 @@ lapic_init(vm_paddr_t addr)
 /*
  * Create a local APIC instance.
  */
-void
-lapic_create(u_int apic_id, int boot_cpu)
+static void
+native_lapic_create(u_int apic_id, int boot_cpu)
 {
 	int i;
 
@@ -326,8 +393,8 @@ lapic_create(u_int apic_id, int boot_cpu)
 /*
  * Dump contents of local APIC registers
  */
-void
-lapic_dump(const char* str)
+static void
+native_lapic_dump(const char* str)
 {
 	uint32_t maxlvt;
 
@@ -346,8 +413,8 @@ lapic_dump(const char* str)
 		printf("   cmci: 0x%08x\n", lapic->lvt_cmci);
 }
 
-void
-lapic_setup(int boot)
+static void
+native_lapic_setup(int boot)
 {
 	struct lapic *la;
 	u_int32_t maxlvt;
@@ -405,8 +472,8 @@ lapic_setup(int boot)
 	intr_restore(saveintr);
 }
 
-void
-lapic_reenable_pmc(void)
+static void
+native_lapic_reenable_pmc(void)
 {
 #ifdef HWPMC_HOOKS
 	uint32_t value;
@@ -428,8 +495,8 @@ lapic_update_pmc(void *dummy)
 }
 #endif
 
-int
-lapic_enable_pmc(void)
+static int
+native_lapic_enable_pmc(void)
 {
 #ifdef HWPMC_HOOKS
 	u_int32_t maxlvt;
@@ -462,8 +529,8 @@ lapic_enable_pmc(void)
 #endif
 }
 
-void
-lapic_disable_pmc(void)
+static void
+native_lapic_disable_pmc(void)
 {
 #ifdef HWPMC_HOOKS
 	u_int32_t maxlvt;
@@ -540,8 +607,8 @@ lapic_et_stop(struct eventtimer *et)
 	return (0);
 }
 
-void
-lapic_disable(void)
+static void
+native_lapic_disable(void)
 {
 	uint32_t value;
 
@@ -571,16 +638,16 @@ lapic_resume(struct pic *pic, bool suspend_cancelled)
 	lapic_setup(0);
 }
 
-int
-lapic_id(void)
+static int
+native_lapic_id(void)
 {
 
 	KASSERT(lapic != NULL, ("local APIC is not mapped"));
 	return (lapic->id >> APIC_ID_SHIFT);
 }
 
-int
-lapic_intr_pending(u_int vector)
+static int
+native_lapic_intr_pending(u_int vector)
 {
 	volatile u_int32_t *irr;
 
@@ -597,8 +664,8 @@ lapic_intr_pending(u_int vector)
 	return (irr[(vector / 32) * 4] & 1 << (vector % 32));
 }
 
-void
-lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id)
+static void
+native_lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id)
 {
 	struct lapic *la;
 
@@ -613,8 +680,8 @@ lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id)
 	la->la_cluster_id = cluster_id;
 }
 
-int
-lapic_set_lvt_mask(u_int apic_id, u_int pin, u_char masked)
+static int
+native_lapic_set_lvt_mask(u_int apic_id, u_int pin, u_char masked)
 {
 
 	if (pin > APIC_LVT_MAX)
@@ -636,8 +703,8 @@ lapic_set_lvt_mask(u_int apic_id, u_int pin, u_char masked)
 	return (0);
 }
 
-int
-lapic_set_lvt_mode(u_int apic_id, u_int pin, u_int32_t mode)
+static int
+native_lapic_set_lvt_mode(u_int apic_id, u_int pin, u_int32_t mode)
 {
 	struct lvt *lvt;
 
@@ -692,8 +759,8 @@ lapic_set_lvt_mode(u_int apic_id, u_int pin, u_int32_t mode)
 	return (0);
 }
 
-int
-lapic_set_lvt_polarity(u_int apic_id, u_int pin, enum intr_polarity pol)
+static int
+native_lapic_set_lvt_polarity(u_int apic_id, u_int pin, enum intr_polarity pol)
 {
 
 	if (pin > APIC_LVT_MAX || pol == INTR_POLARITY_CONFORM)
@@ -717,8 +784,9 @@ lapic_set_lvt_polarity(u_int apic_id, u_int pin, enum intr_polarity pol)
 	return (0);
 }
 
-int
-lapic_set_lvt_triggermode(u_int apic_id, u_int pin, enum intr_trigger trigger)
+static int
+native_lapic_set_lvt_triggermode(u_int apic_id, u_int pin,
+     enum intr_trigger trigger)
 {
 
 	if (pin > APIC_LVT_MAX || trigger == INTR_TRIGGER_CONFORM)
@@ -746,7 +814,7 @@ lapic_set_lvt_triggermode(u_int apic_id, u_int pin, enum intr_trigger trigger)
  * Adjust the TPR of the current CPU so that it blocks all interrupts below
  * the passed in vector.
  */
-void
+static void
 lapic_set_tpr(u_int vector)
 {
 #ifdef CHEAP_TPR
@@ -760,8 +828,8 @@ lapic_set_tpr(u_int vector)
 #endif
 }
 
-void
-lapic_eoi(void)
+static void
+native_lapic_eoi(void)
 {
 
 	lapic->eoi = 0;
@@ -882,8 +950,8 @@ lapic_handle_cmc(void)
  * is called prior to lapic_setup() during boot, this just needs to unmask
  * this CPU's LVT_CMCI entry.
  */
-void
-lapic_enable_cmc(void)
+static void
+native_lapic_enable_cmc(void)
 {
 	u_int apic_id;
 
@@ -918,8 +986,8 @@ lapic_handle_error(void)
 	lapic_eoi();
 }
 
-u_int
-apic_cpuid(u_int apic_id)
+static u_int
+native_apic_cpuid(u_int apic_id)
 {
 #ifdef SMP
 	return apic_cpuids[apic_id];
@@ -929,8 +997,8 @@ apic_cpuid(u_int apic_id)
 }
 
 /* Request a free IDT vector to be used by the specified IRQ. */
-u_int
-apic_alloc_vector(u_int apic_id, u_int irq)
+static u_int
+native_apic_alloc_vector(u_int apic_id, u_int irq)
 {
 	u_int vector;
 
@@ -958,8 +1026,8 @@ apic_alloc_vector(u_int apic_id, u_int irq)
  * aligned on a boundary of 'align'.  If the request cannot be
  * satisfied, 0 is returned.
  */
-u_int
-apic_alloc_vectors(u_int apic_id, u_int *irqs, u_int count, u_int align)
+static u_int
+native_apic_alloc_vectors(u_int apic_id, u_int *irqs, u_int count, u_int align)
 {
 	u_int first, run, vector;
 
@@ -1018,8 +1086,8 @@ apic_alloc_vectors(u_int apic_id, u_int *irqs, u_int count, u_int align)
  * which do not have the vector configured would report spurious interrupts
  * should it fire.
  */
-void
-apic_enable_vector(u_int apic_id, u_int vector)
+static void
+native_apic_enable_vector(u_int apic_id, u_int vector)
 {
 
 	KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry"));
@@ -1033,8 +1101,8 @@ apic_enable_vector(u_int apic_id, u_int vector)
 	    GSEL_APIC);
 }
 
-void
-apic_disable_vector(u_int apic_id, u_int vector)
+static void
+native_apic_disable_vector(u_int apic_id, u_int vector)
 {
 
 	KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry"));
@@ -1054,8 +1122,8 @@ apic_disable_vector(u_int apic_id, u_int vector)
 }
 
 /* Release an APIC vector when it's no longer in use. */
-void
-apic_free_vector(u_int apic_id, u_int vector, u_int irq)
+static void
+native_apic_free_vector(u_int apic_id, u_int vector, u_int irq)
 {
 	struct thread *td;
 
@@ -1093,7 +1161,7 @@ apic_free_vector(u_int apic_id, u_int vector, u_int irq)
 }
 
 /* Map an IDT vector (APIC) to an IRQ (interrupt source). */
-u_int
+static u_int
 apic_idt_to_irq(u_int apic_id, u_int vector)
 {
 	int irq;
@@ -1381,7 +1449,7 @@ apic_setup_io(void *dummy __unused)
 	/* Enable the MSI "pic". */
 	msi_init();
 }
-SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_SECOND, apic_setup_io, NULL);
+SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_THIRD, apic_setup_io, NULL);
 
 #ifdef SMP
 /*
@@ -1389,8 +1457,8 @@ SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_SECOND, apic_setup_io, NULL);
  * private to the MD code.  The public interface for the rest of the
  * kernel is defined in mp_machdep.c.
  */
-int
-lapic_ipi_wait(int delay)
+static int
+native_lapic_ipi_wait(int delay)
 {
 	int x, incr;
 
@@ -1412,8 +1480,8 @@ lapic_ipi_wait(int delay)
 	return (0);
 }
 
-void
-lapic_ipi_raw(register_t icrlo, u_int dest)
+static void
+native_lapic_ipi_raw(register_t icrlo, u_int dest)
 {
 	register_t value, saveintr;
 
@@ -1446,8 +1514,8 @@ lapic_ipi_raw(register_t icrlo, u_int dest)
 #define	AFTER_SPIN	1000
 #endif
 
-void
-lapic_ipi_vectored(u_int vector, int dest)
+static void
+native_lapic_ipi_vectored(u_int vector, int dest)
 {
 	register_t icrlo, destfield;
 
diff --git a/sys/x86/x86/mca.c b/sys/x86/x86/mca.c
index 8a0d2b12e9c6..2fd959f0dd8c 100644
--- a/sys/x86/x86/mca.c
+++ b/sys/x86/x86/mca.c
@@ -92,15 +92,17 @@ static SYSCTL_NODE(_hw, OID_AUTO, mca, CTLFLAG_RD, NULL,
     "Machine Check Architecture");
 
 static int mca_enabled = 1;
-TUNABLE_INT("hw.mca.enabled", &mca_enabled);
 SYSCTL_INT(_hw_mca, OID_AUTO, enabled, CTLFLAG_RDTUN, &mca_enabled, 0,
     "Administrative toggle for machine check support");
 
 static int amd10h_L1TP = 1;
-TUNABLE_INT("hw.mca.amd10h_L1TP", &amd10h_L1TP);
 SYSCTL_INT(_hw_mca, OID_AUTO, amd10h_L1TP, CTLFLAG_RDTUN, &amd10h_L1TP, 0,
     "Administrative toggle for logging of level one TLB parity (L1TP) errors");
 
+static int intel6h_HSD131;
+SYSCTL_INT(_hw_mca, OID_AUTO, intel6h_HSD131, CTLFLAG_RDTUN, &intel6h_HSD131, 0,
+    "Administrative toggle for logging of spurious corrected errors");
+
 int workaround_erratum383;
 SYSCTL_INT(_hw_mca, OID_AUTO, erratum383, CTLFLAG_RD, &workaround_erratum383, 0,
     "Is the workaround for Erratum 383 on AMD Family 10h processors enabled?");
@@ -244,12 +246,34 @@ mca_error_mmtype(uint16_t mca_error)
 	return ("???");
 }
 
+static int __nonnull(1)
+mca_mute(const struct mca_record *rec)
+{
+
+	/*
+	 * Skip spurious corrected parity errors generated by desktop Haswell
+	 * (see HSD131 erratum) unless reporting is enabled.
+	 * Note that these errors also have been observed with D0-stepping,
+	 * while the revision 014 desktop Haswell specification update only
+	 * talks about C0-stepping.
+	 */
+	if (rec->mr_cpu_vendor_id == CPU_VENDOR_INTEL &&
+	    rec->mr_cpu_id == 0x306c3 && rec->mr_bank == 0 &&
+	    rec->mr_status == 0x90000040000f0005 && !intel6h_HSD131)
+	    	return (1);
+
+	return (0);
+}
+
 /* Dump details about a single machine check. */
 static void __nonnull(1)
 mca_log(const struct mca_record *rec)
 {
 	uint16_t mca_error;
 
+	if (mca_mute(rec))
+	    	return;
+
 	printf("MCA: Bank %d, Status 0x%016llx\n", rec->mr_bank,
 	    (long long)rec->mr_status);
 	printf("MCA: Global Cap 0x%016llx, Status 0x%016llx\n",
diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c
index 2a6c81d786d3..54c4d02497cf 100644
--- a/sys/x86/x86/tsc.c
+++ b/sys/x86/x86/tsc.c
@@ -58,34 +58,28 @@ static eventhandler_tag tsc_levels_tag, tsc_pre_tag, tsc_post_tag;
 
 SYSCTL_INT(_kern_timecounter, OID_AUTO, invariant_tsc, CTLFLAG_RDTUN,
     &tsc_is_invariant, 0, "Indicates whether the TSC is P-state invariant");
-TUNABLE_INT("kern.timecounter.invariant_tsc", &tsc_is_invariant);
 
 #ifdef SMP
 int	smp_tsc;
 SYSCTL_INT(_kern_timecounter, OID_AUTO, smp_tsc, CTLFLAG_RDTUN, &smp_tsc, 0,
     "Indicates whether the TSC is safe to use in SMP mode");
-TUNABLE_INT("kern.timecounter.smp_tsc", &smp_tsc);
 
 int	smp_tsc_adjust = 0;
 SYSCTL_INT(_kern_timecounter, OID_AUTO, smp_tsc_adjust, CTLFLAG_RDTUN,
     &smp_tsc_adjust, 0, "Try to adjust TSC on APs to match BSP");
-TUNABLE_INT("kern.timecounter.smp_tsc_adjust", &smp_tsc_adjust);
 #endif
 
 static int	tsc_shift = 1;
 SYSCTL_INT(_kern_timecounter, OID_AUTO, tsc_shift, CTLFLAG_RDTUN,
     &tsc_shift, 0, "Shift to pre-apply for the maximum TSC frequency");
-TUNABLE_INT("kern.timecounter.tsc_shift", &tsc_shift);
 
 static int	tsc_disabled;
 SYSCTL_INT(_machdep, OID_AUTO, disable_tsc, CTLFLAG_RDTUN, &tsc_disabled, 0,
     "Disable x86 Time Stamp Counter");
-TUNABLE_INT("machdep.disable_tsc", &tsc_disabled);
 
 static int	tsc_skip_calibration;
 SYSCTL_INT(_machdep, OID_AUTO, disable_tsc_calibration, CTLFLAG_RDTUN,
     &tsc_skip_calibration, 0, "Disable TSC frequency calibration");
-TUNABLE_INT("machdep.disable_tsc_calibration", &tsc_skip_calibration);
 
 static void tsc_freq_changed(void *arg, const struct cf_level *level,
     int status);
diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c
index 64418b2c9304..8fda923b8a60 100644
--- a/sys/x86/xen/hvm.c
+++ b/sys/x86/xen/hvm.c
@@ -59,37 +59,14 @@ __FBSDID("$FreeBSD$");
 
 /*--------------------------- Forward Declarations ---------------------------*/
 #ifdef SMP
-static driver_filter_t xen_smp_rendezvous_action;
-static driver_filter_t xen_invltlb;
-static driver_filter_t xen_invlpg;
-static driver_filter_t xen_invlrng;
-static driver_filter_t xen_invlcache;
-#ifdef __i386__
-static driver_filter_t xen_lazypmap;
-#endif
-static driver_filter_t xen_ipi_bitmap_handler;
-static driver_filter_t xen_cpustop_handler;
-static driver_filter_t xen_cpususpend_handler;
-static driver_filter_t xen_cpustophard_handler;
-static void xen_ipi_vectored(u_int vector, int dest);
 static void xen_hvm_cpu_resume(void);
 #endif
 static void xen_hvm_cpu_init(void);
 
 /*---------------------------- Extern Declarations ---------------------------*/
-#ifdef __i386__
-extern void pmap_lazyfix_action(void);
-#endif
-#ifdef __amd64__
-extern int pmap_pcid_enabled;
-#endif
-
 /* Variables used by mp_machdep to perform the bitmap IPI */
 extern volatile u_int cpu_ipi_pending[MAXCPU];
 
-/*---------------------------------- Macros ----------------------------------*/
-#define	IPI_TO_IDX(ipi) ((ipi) - APIC_IPI_INTS)
-
 /*-------------------------------- Local Types -------------------------------*/
 enum xen_hvm_init_type {
 	XEN_HVM_INIT_COLD,
@@ -97,18 +74,11 @@ enum xen_hvm_init_type {
 	XEN_HVM_INIT_RESUME
 };
 
-struct xen_ipi_handler
-{
-	driver_filter_t	*filter;
-	const char	*description;
-};
-
 /*-------------------------------- Global Data -------------------------------*/
 enum xen_domain_type xen_domain_type = XEN_NATIVE;
 
 #ifdef SMP
 struct cpu_ops xen_hvm_cpu_ops = {
-	.ipi_vectored	= lapic_ipi_vectored,
 	.cpu_init	= xen_hvm_cpu_init,
 	.cpu_resume	= xen_hvm_cpu_resume
 };
@@ -116,24 +86,6 @@ struct cpu_ops xen_hvm_cpu_ops = {
 
 static MALLOC_DEFINE(M_XENHVM, "xen_hvm", "Xen HVM PV Support");
 
-#ifdef SMP
-static struct xen_ipi_handler xen_ipis[] = 
-{
-	[IPI_TO_IDX(IPI_RENDEZVOUS)]	= { xen_smp_rendezvous_action,	"r"   },
-	[IPI_TO_IDX(IPI_INVLTLB)]	= { xen_invltlb,		"itlb"},
-	[IPI_TO_IDX(IPI_INVLPG)]	= { xen_invlpg,			"ipg" },
-	[IPI_TO_IDX(IPI_INVLRNG)]	= { xen_invlrng,		"irg" },
-	[IPI_TO_IDX(IPI_INVLCACHE)]	= { xen_invlcache,		"ic"  },
-#ifdef __i386__
-	[IPI_TO_IDX(IPI_LAZYPMAP)]	= { xen_lazypmap,		"lp"  },
-#endif
-	[IPI_TO_IDX(IPI_BITMAP_VECTOR)] = { xen_ipi_bitmap_handler,	"b"   },
-	[IPI_TO_IDX(IPI_STOP)]		= { xen_cpustop_handler,	"st"  },
-	[IPI_TO_IDX(IPI_SUSPEND)]	= { xen_cpususpend_handler,	"sp"  },
-	[IPI_TO_IDX(IPI_STOP_HARD)]	= { xen_cpustophard_handler,	"sth" },
-};
-#endif
-
 /**
  * If non-zero, the hypervisor has been configured to use a direct
  * IDT event callback for interrupt injection.
@@ -143,9 +95,6 @@ int xen_vector_callback_enabled;
 /*------------------------------- Per-CPU Data -------------------------------*/
 DPCPU_DEFINE(struct vcpu_info, vcpu_local_info);
 DPCPU_DEFINE(struct vcpu_info *, vcpu_info);
-#ifdef SMP
-DPCPU_DEFINE(xen_intr_handle_t, ipi_handle[nitems(xen_ipis)]);
-#endif
 
 /*------------------ Hypervisor Access Shared Memory Regions -----------------*/
 /** Hypercall table accessed via HYPERVISOR_*_op() methods. */
@@ -154,156 +103,6 @@ shared_info_t *HYPERVISOR_shared_info;
 start_info_t *HYPERVISOR_start_info;
 
 #ifdef SMP
-/*---------------------------- XEN PV IPI Handlers ---------------------------*/
-/*
- * This are C clones of the ASM functions found in apic_vector.s
- */
-static int
-xen_ipi_bitmap_handler(void *arg)
-{
-	struct trapframe *frame;
-
-	frame = arg;
-	ipi_bitmap_handler(*frame);
-	return (FILTER_HANDLED);
-}
-
-static int
-xen_smp_rendezvous_action(void *arg)
-{
-#ifdef COUNT_IPIS
-	(*ipi_rendezvous_counts[PCPU_GET(cpuid)])++;
-#endif /* COUNT_IPIS */
-
-	smp_rendezvous_action();
-	return (FILTER_HANDLED);
-}
-
-static int
-xen_invltlb(void *arg)
-{
-
-	invltlb_handler();
-	return (FILTER_HANDLED);
-}
-
-#ifdef __amd64__
-static int
-xen_invltlb_pcid(void *arg)
-{
-
-	invltlb_pcid_handler();
-	return (FILTER_HANDLED);
-}
-#endif
-
-static int
-xen_invlpg(void *arg)
-{
-
-	invlpg_handler();
-	return (FILTER_HANDLED);
-}
-
-#ifdef __amd64__
-static int
-xen_invlpg_pcid(void *arg)
-{
-
-	invlpg_pcid_handler();
-	return (FILTER_HANDLED);
-}
-#endif
-
-static int
-xen_invlrng(void *arg)
-{
-
-	invlrng_handler();
-	return (FILTER_HANDLED);
-}
-
-static int
-xen_invlcache(void *arg)
-{
-
-	invlcache_handler();
-	return (FILTER_HANDLED);
-}
-
-#ifdef __i386__
-static int
-xen_lazypmap(void *arg)
-{
-
-	pmap_lazyfix_action();
-	return (FILTER_HANDLED);
-}
-#endif
-
-static int
-xen_cpustop_handler(void *arg)
-{
-
-	cpustop_handler();
-	return (FILTER_HANDLED);
-}
-
-static int
-xen_cpususpend_handler(void *arg)
-{
-
-	cpususpend_handler();
-	return (FILTER_HANDLED);
-}
-
-static int
-xen_cpustophard_handler(void *arg)
-{
-
-	ipi_nmi_handler();
-	return (FILTER_HANDLED);
-}
-
-/* Xen PV IPI sender */
-static void
-xen_ipi_vectored(u_int vector, int dest)
-{
-	xen_intr_handle_t *ipi_handle;
-	int ipi_idx, to_cpu, self;
-
-	ipi_idx = IPI_TO_IDX(vector);
-	if (ipi_idx > nitems(xen_ipis))
-		panic("IPI out of range");
-
-	switch(dest) {
-	case APIC_IPI_DEST_SELF:
-		ipi_handle = DPCPU_GET(ipi_handle);
-		xen_intr_signal(ipi_handle[ipi_idx]);
-		break;
-	case APIC_IPI_DEST_ALL:
-		CPU_FOREACH(to_cpu) {
-			ipi_handle = DPCPU_ID_GET(to_cpu, ipi_handle);
-			xen_intr_signal(ipi_handle[ipi_idx]);
-		}
-		break;
-	case APIC_IPI_DEST_OTHERS:
-		self = PCPU_GET(cpuid);
-		CPU_FOREACH(to_cpu) {
-			if (to_cpu != self) {
-				ipi_handle = DPCPU_ID_GET(to_cpu, ipi_handle);
-				xen_intr_signal(ipi_handle[ipi_idx]);
-			}
-		}
-		break;
-	default:
-		to_cpu = apic_cpuid(dest);
-		ipi_handle = DPCPU_ID_GET(to_cpu, ipi_handle);
-		xen_intr_signal(ipi_handle[ipi_idx]);
-		break;
-	}
-}
-
 /* XEN diverged cpu operations */
 static void
 xen_hvm_cpu_resume(void)
@@ -319,56 +118,7 @@ xen_hvm_cpu_resume(void)
 	/* register vcpu_info area */
 	xen_hvm_cpu_init();
 }
-
-static void
-xen_cpu_ipi_init(int cpu)
-{
-	xen_intr_handle_t *ipi_handle;
-	const struct xen_ipi_handler *ipi;
-	device_t dev;
-	int idx, rc;
-
-	ipi_handle = DPCPU_ID_GET(cpu, ipi_handle);
-	dev = pcpu_find(cpu)->pc_device;
-	KASSERT((dev != NULL), ("NULL pcpu device_t"));
-
-	for (ipi = xen_ipis, idx = 0; idx < nitems(xen_ipis); ipi++, idx++) {
-
-		if (ipi->filter == NULL) {
-			ipi_handle[idx] = NULL;
-			continue;
-		}
-
-		rc = xen_intr_alloc_and_bind_ipi(dev, cpu, ipi->filter,
-		    INTR_TYPE_TTY, &ipi_handle[idx]);
-		if (rc != 0)
-			panic("Unable to allocate a XEN IPI port");
-		xen_intr_describe(ipi_handle[idx], "%s", ipi->description);
-	}
-}
-
-static void
-xen_setup_cpus(void)
-{
-	int i;
-
-	if (!xen_vector_callback_enabled)
-		return;
-
-#ifdef __amd64__
-	if (pmap_pcid_enabled) {
-		xen_ipis[IPI_TO_IDX(IPI_INVLTLB)].filter = xen_invltlb_pcid;
-		xen_ipis[IPI_TO_IDX(IPI_INVLPG)].filter = xen_invlpg_pcid;
-	}
 #endif
-	CPU_FOREACH(i)
-		xen_cpu_ipi_init(i);
-
-	/* Set the xen pv ipi ops to replace the native ones */
-	cpu_ops.ipi_vectored = xen_ipi_vectored;
-}
-#endif
-
 /*---------------------- XEN Hypervisor Probe and Setup ----------------------*/
 static uint32_t
 xen_hvm_cpuid_base(void)
@@ -655,9 +405,5 @@ xen_hvm_cpu_init(void)
 }
 
 SYSINIT(xen_hvm_init, SI_SUB_HYPERVISOR, SI_ORDER_FIRST, xen_hvm_sysinit, NULL);
-#ifdef SMP
-/* We need to setup IPIs before APs are started */
-SYSINIT(xen_setup_cpus, SI_SUB_SMP-1, 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/pv.c b/sys/x86/xen/pv.c
index fa36f3ac9e86..c98c8bc912cd 100644
--- a/sys/x86/xen/pv.c
+++ b/sys/x86/xen/pv.c
@@ -51,6 +51,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_pager.h>
 #include <vm/vm_param.h>
 
+#include <machine/intr_machdep.h>
+#include <x86/apicvar.h>
 #include <x86/init.h>
 #include <machine/pc/bios.h>
 #include <machine/smp.h>
@@ -58,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <xen/xen-os.h>
 #include <xen/hypervisor.h>
 #include <xen/xenstore/xenstorevar.h>
+#include <xen/xen_pv.h>
 
 #include <xen/interface/vcpu.h>
 
@@ -93,12 +96,12 @@ extern char *bootSTK;
 /*-------------------------------- Global Data -------------------------------*/
 /* Xen init_ops implementation. */
 struct init_ops xen_init_ops = {
-	.parse_preload_data =	xen_pv_parse_preload_data,
-	.early_clock_source_init =	xen_clock_init,
-	.early_delay =			xen_delay,
-	.parse_memmap =			xen_pv_parse_memmap,
+	.parse_preload_data		= xen_pv_parse_preload_data,
+	.early_clock_source_init	= xen_clock_init,
+	.early_delay			= xen_delay,
+	.parse_memmap			= xen_pv_parse_memmap,
 #ifdef SMP
-	.start_all_aps =		xen_pv_start_all_aps,
+	.start_all_aps			= xen_pv_start_all_aps,
 #endif
 };
 
@@ -155,15 +158,24 @@ hammer_time_xen(start_info_t *si, uint64_t xenstack)
 	 * by the boot trampoline).
 	 */
 	for (i = 0; i < (PAGE_SIZE / sizeof(uint64_t)); i++) {
-		/* Each slot of the level 4 pages points to the same level 3 page */
+		/*
+		 * Each slot of the level 4 pages points
+		 * to the same level 3 page
+		 */
 		PT4[i] = ((uint64_t)&PT3[0]) - KERNBASE;
 		PT4[i] |= PG_V | PG_RW | PG_U;
 
-		/* Each slot of the level 3 pages points to the same level 2 page */
+		/*
+		 * Each slot of the level 3 pages points
+		 * to the same level 2 page
+		 */
 		PT3[i] = ((uint64_t)&PT2[0]) - KERNBASE;
 		PT3[i] |= PG_V | PG_RW | PG_U;
 
-		/* The level 2 page slots are mapped with 2MB pages for 1GB. */
+		/*
+		 * The level 2 page slots are mapped with
+		 * 2MB pages for 1GB.
+		 */
 		PT2[i] = i * (2 * 1024 * 1024);
 		PT2[i] |= PG_V | PG_RW | PG_PS | PG_U;
 	}
@@ -171,6 +183,7 @@ hammer_time_xen(start_info_t *si, uint64_t xenstack)
 
 	/* Set the hooks for early functions that diverge from bare metal */
 	init_ops = xen_init_ops;
+	apic_ops = xen_apic_ops;
 
 	/* Now we can jump into the native init function */
 	return (hammer_time(0, physfree));
diff --git a/sys/x86/xen/pvcpu_enum.c b/sys/x86/xen/pvcpu_enum.c
index df092cb8c523..42944642cd00 100644
--- a/sys/x86/xen/pvcpu_enum.c
+++ b/sys/x86/xen/pvcpu_enum.c
@@ -44,15 +44,25 @@ __FBSDID("$FreeBSD$");
 #include <machine/smp.h>
 
 #include <xen/xen-os.h>
+#include <xen/xen_intr.h>
 #include <xen/hypervisor.h>
 
 #include <xen/interface/vcpu.h>
 
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/actables.h>
+
+#include <dev/acpica/acpivar.h>
+
 static int xenpv_probe(void);
 static int xenpv_probe_cpus(void);
 static int xenpv_setup_local(void);
 static int xenpv_setup_io(void);
 
+static ACPI_TABLE_MADT *madt;
+static vm_paddr_t madt_physaddr;
+static vm_offset_t madt_length;
+
 static struct apic_enumerator xenpv_enumerator = {
 	"Xen PV",
 	xenpv_probe,
@@ -61,13 +71,62 @@ static struct apic_enumerator xenpv_enumerator = {
 	xenpv_setup_io
 };
 
+/*--------------------- Helper functions to parse MADT -----------------------*/
+
+/*
+ * Parse an interrupt source override for an ISA interrupt.
+ */
+static void
+madt_parse_interrupt_override(ACPI_MADT_INTERRUPT_OVERRIDE *intr)
+{
+	enum intr_trigger trig;
+	enum intr_polarity pol;
+
+	if (acpi_quirks & ACPI_Q_MADT_IRQ0 && intr->SourceIrq == 0 &&
+	    intr->GlobalIrq == 2) {
+		if (bootverbose)
+			printf("MADT: Skipping timer override\n");
+		return;
+	}
+
+	madt_parse_interrupt_values(intr, &trig, &pol);
+
+	/* Register the IRQ with the polarity and trigger mode found. */
+	xen_register_pirq(intr->GlobalIrq, trig, pol);
+}
+
+/*
+ * Call the handler routine for each entry in the MADT table.
+ */
+static void
+madt_walk_table(acpi_subtable_handler *handler, void *arg)
+{
+
+	acpi_walk_subtables(madt + 1, (char *)madt + madt->Header.Length,
+	    handler, arg);
+}
+
+/*
+ * Parse interrupt entries.
+ */
+static void
+madt_parse_ints(ACPI_SUBTABLE_HEADER *entry, void *arg __unused)
+{
+
+	if (entry->Type == ACPI_MADT_TYPE_INTERRUPT_OVERRIDE)
+		madt_parse_interrupt_override(
+		    (ACPI_MADT_INTERRUPT_OVERRIDE *)entry);
+}
+
+/*---------------------------- Xen PV enumerator -----------------------------*/
+
 /*
  * This enumerator will only be registered on PVH
  */
 static int
 xenpv_probe(void)
 {
-	return (-100);
+	return (0);
 }
 
 /*
@@ -105,6 +164,40 @@ xenpv_setup_local(void)
 static int
 xenpv_setup_io(void)
 {
+
+	if (xen_initial_domain()) {
+		int i;
+
+		/* Map MADT */
+		madt_physaddr = acpi_find_table(ACPI_SIG_MADT);
+		madt = acpi_map_table(madt_physaddr, ACPI_SIG_MADT);
+		madt_length = madt->Header.Length;
+
+		/* Try to initialize ACPI so that we can access the FADT. */
+		i = acpi_Startup();
+		if (ACPI_FAILURE(i)) {
+			printf("MADT: ACPI Startup failed with %s\n",
+			    AcpiFormatException(i));
+			printf("Try disabling either ACPI or apic support.\n");
+			panic("Using MADT but ACPI doesn't work");
+		}
+
+		/* Run through the table to see if there are any overrides. */
+		madt_walk_table(madt_parse_ints, NULL);
+
+		/*
+		 * If there was not an explicit override entry for the SCI,
+		 * force it to use level trigger and active-low polarity.
+		 */
+		if (!madt_found_sci_override) {
+			printf(
+	"MADT: Forcing active-low polarity and level trigger for SCI\n");
+			xen_register_pirq(AcpiGbl_FADT.SciInterrupt,
+			    INTR_TRIGGER_LEVEL, INTR_POLARITY_LOW);
+		}
+
+		acpi_SetDefaultIntrModel(ACPI_INTR_APIC);
+	}
 	return (0);
 }
 
diff --git a/sys/x86/xen/xen_apic.c b/sys/x86/xen/xen_apic.c
new file mode 100644
index 000000000000..53083ac56ffd
--- /dev/null
+++ b/sys/x86/xen/xen_apic.c
@@ -0,0 +1,550 @@
+/*
+ * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/proc.h>
+#include <sys/smp.h>
+#include <sys/systm.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <machine/cpufunc.h>
+#include <machine/cpu.h>
+#include <machine/intr_machdep.h>
+#include <machine/smp.h>
+
+#include <x86/apicreg.h>
+#include <x86/apicvar.h>
+
+#include <xen/xen-os.h>
+#include <xen/features.h>
+#include <xen/gnttab.h>
+#include <xen/hypervisor.h>
+#include <xen/hvm.h>
+#include <xen/xen_intr.h>
+
+#include <xen/interface/vcpu.h>
+
+/*--------------------------------- Macros -----------------------------------*/
+
+#define XEN_APIC_UNSUPPORTED \
+	panic("%s: not available in Xen PV port.", __func__)
+
+
+/*--------------------------- Forward Declarations ---------------------------*/
+#ifdef SMP
+static driver_filter_t xen_smp_rendezvous_action;
+static driver_filter_t xen_invltlb;
+static driver_filter_t xen_invlpg;
+static driver_filter_t xen_invlrng;
+static driver_filter_t xen_invlcache;
+#ifdef __i386__
+static driver_filter_t xen_lazypmap;
+#endif
+static driver_filter_t xen_ipi_bitmap_handler;
+static driver_filter_t xen_cpustop_handler;
+static driver_filter_t xen_cpususpend_handler;
+static driver_filter_t xen_cpustophard_handler;
+#endif
+
+/*---------------------------- Extern Declarations ---------------------------*/
+/* Variables used by mp_machdep to perform the MMU related IPIs */
+#ifdef __i386__
+extern void pmap_lazyfix_action(void);
+#endif
+#ifdef __amd64__
+extern int pmap_pcid_enabled;
+#endif
+
+/*---------------------------------- Macros ----------------------------------*/
+#define	IPI_TO_IDX(ipi) ((ipi) - APIC_IPI_INTS)
+
+/*--------------------------------- Xen IPIs ---------------------------------*/
+#ifdef SMP
+struct xen_ipi_handler
+{
+	driver_filter_t	*filter;
+	const char	*description;
+};
+
+static struct xen_ipi_handler xen_ipis[] = 
+{
+	[IPI_TO_IDX(IPI_RENDEZVOUS)]	= { xen_smp_rendezvous_action,	"r"   },
+	[IPI_TO_IDX(IPI_INVLTLB)]	= { xen_invltlb,		"itlb"},
+	[IPI_TO_IDX(IPI_INVLPG)]	= { xen_invlpg,			"ipg" },
+	[IPI_TO_IDX(IPI_INVLRNG)]	= { xen_invlrng,		"irg" },
+	[IPI_TO_IDX(IPI_INVLCACHE)]	= { xen_invlcache,		"ic"  },
+#ifdef __i386__
+	[IPI_TO_IDX(IPI_LAZYPMAP)]	= { xen_lazypmap,		"lp"  },
+#endif
+	[IPI_TO_IDX(IPI_BITMAP_VECTOR)] = { xen_ipi_bitmap_handler,	"b"   },
+	[IPI_TO_IDX(IPI_STOP)]		= { xen_cpustop_handler,	"st"  },
+	[IPI_TO_IDX(IPI_SUSPEND)]	= { xen_cpususpend_handler,	"sp"  },
+	[IPI_TO_IDX(IPI_STOP_HARD)]	= { xen_cpustophard_handler,	"sth" },
+};
+#endif
+
+/*------------------------------- Per-CPU Data -------------------------------*/
+#ifdef SMP
+DPCPU_DEFINE(xen_intr_handle_t, ipi_handle[nitems(xen_ipis)]);
+#endif
+
+/*------------------------------- Xen PV APIC --------------------------------*/
+
+static void
+xen_pv_lapic_create(u_int apic_id, int boot_cpu)
+{
+#ifdef SMP
+	cpu_add(apic_id, boot_cpu);
+#endif
+}
+
+static void
+xen_pv_lapic_init(vm_paddr_t addr)
+{
+
+}
+
+static void
+xen_pv_lapic_setup(int boot)
+{
+
+}
+
+static void
+xen_pv_lapic_dump(const char *str)
+{
+
+	printf("cpu%d %s XEN PV LAPIC\n", PCPU_GET(cpuid), str);
+}
+
+static void
+xen_pv_lapic_disable(void)
+{
+
+}
+
+static void
+xen_pv_lapic_eoi(void)
+{
+
+	XEN_APIC_UNSUPPORTED;
+}
+
+static int
+xen_pv_lapic_id(void)
+{
+
+	return (PCPU_GET(apic_id));
+}
+
+static int
+xen_pv_lapic_intr_pending(u_int vector)
+{
+
+	XEN_APIC_UNSUPPORTED;
+	return (0);
+}
+
+static u_int
+xen_pv_apic_cpuid(u_int apic_id)
+{
+#ifdef SMP
+	return (apic_cpuids[apic_id]);
+#else
+	return (0);
+#endif
+}
+
+static u_int
+xen_pv_apic_alloc_vector(u_int apic_id, u_int irq)
+{
+
+	XEN_APIC_UNSUPPORTED;
+	return (0);
+}
+
+static u_int
+xen_pv_apic_alloc_vectors(u_int apic_id, u_int *irqs, u_int count, u_int align)
+{
+
+	XEN_APIC_UNSUPPORTED;
+	return (0);
+}
+
+static void
+xen_pv_apic_disable_vector(u_int apic_id, u_int vector)
+{
+
+	XEN_APIC_UNSUPPORTED;
+}
+
+static void
+xen_pv_apic_enable_vector(u_int apic_id, u_int vector)
+{
+
+	XEN_APIC_UNSUPPORTED;
+}
+
+static void
+xen_pv_apic_free_vector(u_int apic_id, u_int vector, u_int irq)
+{
+
+	XEN_APIC_UNSUPPORTED;
+}
+
+static void
+xen_pv_lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id)
+{
+
+	XEN_APIC_UNSUPPORTED;
+}
+
+static int
+xen_pv_lapic_enable_pmc(void)
+{
+
+	XEN_APIC_UNSUPPORTED;
+	return (0);
+}
+
+static void
+xen_pv_lapic_disable_pmc(void)
+{
+
+	XEN_APIC_UNSUPPORTED;
+}
+
+static void
+xen_pv_lapic_reenable_pmc(void)
+{
+
+	XEN_APIC_UNSUPPORTED;
+}
+
+static void
+xen_pv_lapic_enable_cmc(void)
+{
+
+}
+
+#ifdef SMP
+static void
+xen_pv_lapic_ipi_raw(register_t icrlo, u_int dest)
+{
+
+	XEN_APIC_UNSUPPORTED;
+}
+
+static void
+xen_pv_lapic_ipi_vectored(u_int vector, int dest)
+{
+	xen_intr_handle_t *ipi_handle;
+	int ipi_idx, to_cpu, self;
+
+	ipi_idx = IPI_TO_IDX(vector);
+	if (ipi_idx >= nitems(xen_ipis))
+		panic("IPI out of range");
+
+	switch(dest) {
+	case APIC_IPI_DEST_SELF:
+		ipi_handle = DPCPU_GET(ipi_handle);
+		xen_intr_signal(ipi_handle[ipi_idx]);
+		break;
+	case APIC_IPI_DEST_ALL:
+		CPU_FOREACH(to_cpu) {
+			ipi_handle = DPCPU_ID_GET(to_cpu, ipi_handle);
+			xen_intr_signal(ipi_handle[ipi_idx]);
+		}
+		break;
+	case APIC_IPI_DEST_OTHERS:
+		self = PCPU_GET(cpuid);
+		CPU_FOREACH(to_cpu) {
+			if (to_cpu != self) {
+				ipi_handle = DPCPU_ID_GET(to_cpu, ipi_handle);
+				xen_intr_signal(ipi_handle[ipi_idx]);
+			}
+		}
+		break;
+	default:
+		to_cpu = apic_cpuid(dest);
+		ipi_handle = DPCPU_ID_GET(to_cpu, ipi_handle);
+		xen_intr_signal(ipi_handle[ipi_idx]);
+		break;
+	}
+}
+
+static int
+xen_pv_lapic_ipi_wait(int delay)
+{
+
+	XEN_APIC_UNSUPPORTED;
+	return (0);
+}
+#endif
+
+static int
+xen_pv_lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked)
+{
+
+	XEN_APIC_UNSUPPORTED;
+	return (0);
+}
+
+static int
+xen_pv_lapic_set_lvt_mode(u_int apic_id, u_int lvt, uint32_t mode)
+{
+
+	XEN_APIC_UNSUPPORTED;
+	return (0);
+}
+
+static int
+xen_pv_lapic_set_lvt_polarity(u_int apic_id, u_int lvt, enum intr_polarity pol)
+{
+
+	XEN_APIC_UNSUPPORTED;
+	return (0);
+}
+
+static int
+xen_pv_lapic_set_lvt_triggermode(u_int apic_id, u_int lvt,
+    enum intr_trigger trigger)
+{
+
+	XEN_APIC_UNSUPPORTED;
+	return (0);
+}
+
+/* Xen apic_ops implementation */
+struct apic_ops xen_apic_ops = {
+	.create			= xen_pv_lapic_create,
+	.init			= xen_pv_lapic_init,
+	.setup			= xen_pv_lapic_setup,
+	.dump			= xen_pv_lapic_dump,
+	.disable		= xen_pv_lapic_disable,
+	.eoi			= xen_pv_lapic_eoi,
+	.id			= xen_pv_lapic_id,
+	.intr_pending		= xen_pv_lapic_intr_pending,
+	.set_logical_id		= xen_pv_lapic_set_logical_id,
+	.cpuid			= xen_pv_apic_cpuid,
+	.alloc_vector		= xen_pv_apic_alloc_vector,
+	.alloc_vectors		= xen_pv_apic_alloc_vectors,
+	.enable_vector		= xen_pv_apic_enable_vector,
+	.disable_vector		= xen_pv_apic_disable_vector,
+	.free_vector		= xen_pv_apic_free_vector,
+	.enable_pmc		= xen_pv_lapic_enable_pmc,
+	.disable_pmc		= xen_pv_lapic_disable_pmc,
+	.reenable_pmc		= xen_pv_lapic_reenable_pmc,
+	.enable_cmc		= xen_pv_lapic_enable_cmc,
+#ifdef SMP
+	.ipi_raw		= xen_pv_lapic_ipi_raw,
+	.ipi_vectored		= xen_pv_lapic_ipi_vectored,
+	.ipi_wait		= xen_pv_lapic_ipi_wait,
+#endif
+	.set_lvt_mask		= xen_pv_lapic_set_lvt_mask,
+	.set_lvt_mode		= xen_pv_lapic_set_lvt_mode,
+	.set_lvt_polarity	= xen_pv_lapic_set_lvt_polarity,
+	.set_lvt_triggermode	= xen_pv_lapic_set_lvt_triggermode,
+};
+
+#ifdef SMP
+/*---------------------------- XEN PV IPI Handlers ---------------------------*/
+/*
+ * These are C clones of the ASM functions found in apic_vector.
+ */
+static int
+xen_ipi_bitmap_handler(void *arg)
+{
+	struct trapframe *frame;
+
+	frame = arg;
+	ipi_bitmap_handler(*frame);
+	return (FILTER_HANDLED);
+}
+
+static int
+xen_smp_rendezvous_action(void *arg)
+{
+#ifdef COUNT_IPIS
+	(*ipi_rendezvous_counts[PCPU_GET(cpuid)])++;
+#endif /* COUNT_IPIS */
+
+	smp_rendezvous_action();
+	return (FILTER_HANDLED);
+}
+
+static int
+xen_invltlb(void *arg)
+{
+
+	invltlb_handler();
+	return (FILTER_HANDLED);
+}
+
+#ifdef __amd64__
+static int
+xen_invltlb_pcid(void *arg)
+{
+
+	invltlb_pcid_handler();
+	return (FILTER_HANDLED);
+}
+#endif
+
+static int
+xen_invlpg(void *arg)
+{
+
+	invlpg_handler();
+	return (FILTER_HANDLED);
+}
+
+#ifdef __amd64__
+static int
+xen_invlpg_pcid(void *arg)
+{
+
+	invlpg_pcid_handler();
+	return (FILTER_HANDLED);
+}
+#endif
+
+static int
+xen_invlrng(void *arg)
+{
+
+	invlrng_handler();
+	return (FILTER_HANDLED);
+}
+
+static int
+xen_invlcache(void *arg)
+{
+
+	invlcache_handler();
+	return (FILTER_HANDLED);
+}
+
+#ifdef __i386__
+static int
+xen_lazypmap(void *arg)
+{
+
+	pmap_lazyfix_action();
+	return (FILTER_HANDLED);
+}
+#endif
+
+static int
+xen_cpustop_handler(void *arg)
+{
+
+	cpustop_handler();
+	return (FILTER_HANDLED);
+}
+
+static int
+xen_cpususpend_handler(void *arg)
+{
+
+	cpususpend_handler();
+	return (FILTER_HANDLED);
+}
+
+static int
+xen_cpustophard_handler(void *arg)
+{
+
+	ipi_nmi_handler();
+	return (FILTER_HANDLED);
+}
+
+/*----------------------------- XEN PV IPI setup -----------------------------*/
+/*
+ * Those functions are provided outside of the Xen PV APIC implementation
+ * so PVHVM guests can also use PV IPIs without having an actual Xen PV APIC,
+ * because on PVHVM there's an emulated LAPIC provided by Xen.
+ */
+static void
+xen_cpu_ipi_init(int cpu)
+{
+	xen_intr_handle_t *ipi_handle;
+	const struct xen_ipi_handler *ipi;
+	device_t dev;
+	int idx, rc;
+
+	ipi_handle = DPCPU_ID_GET(cpu, ipi_handle);
+	dev = pcpu_find(cpu)->pc_device;
+	KASSERT((dev != NULL), ("NULL pcpu device_t"));
+
+	for (ipi = xen_ipis, idx = 0; idx < nitems(xen_ipis); ipi++, idx++) {
+
+		if (ipi->filter == NULL) {
+			ipi_handle[idx] = NULL;
+			continue;
+		}
+
+		rc = xen_intr_alloc_and_bind_ipi(dev, cpu, ipi->filter,
+		    INTR_TYPE_TTY, &ipi_handle[idx]);
+		if (rc != 0)
+			panic("Unable to allocate a XEN IPI port");
+		xen_intr_describe(ipi_handle[idx], "%s", ipi->description);
+	}
+}
+
+static void
+xen_setup_cpus(void)
+{
+	int i;
+
+	if (!xen_vector_callback_enabled)
+		return;
+
+#ifdef __amd64__
+	if (pmap_pcid_enabled) {
+		xen_ipis[IPI_TO_IDX(IPI_INVLTLB)].filter = xen_invltlb_pcid;
+		xen_ipis[IPI_TO_IDX(IPI_INVLPG)].filter = xen_invlpg_pcid;
+	}
+#endif
+	CPU_FOREACH(i)
+		xen_cpu_ipi_init(i);
+
+	/* Set the xen pv ipi ops to replace the native ones */
+	if (xen_hvm_domain())
+		apic_ops.ipi_vectored = xen_pv_lapic_ipi_vectored;
+}
+
+/* We need to setup IPIs before APs are started */
+SYSINIT(xen_setup_cpus, SI_SUB_SMP-1, SI_ORDER_FIRST, xen_setup_cpus, NULL);
+#endif /* SMP */
diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c
index 18f88c268e84..a4318c140b1a 100644
--- a/sys/x86/xen/xen_intr.c
+++ b/sys/x86/xen/xen_intr.c
@@ -32,6 +32,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_ddb.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -62,6 +64,10 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/xen/xenpci/xenpcivar.h>
 
+#ifdef DDB
+#include <ddb/ddb.h>
+#endif
+
 static MALLOC_DEFINE(M_XENINTR, "xen_intr", "Xen Interrupt Services");
 
 /**
@@ -104,6 +110,9 @@ DPCPU_DECLARE(struct vcpu_info *, vcpu_info);
 
 #define is_valid_evtchn(x)	((x) != 0)
 
+#define	XEN_EEXIST		17 /* Xen "already exists" error */
+#define	XEN_ALLOCATE_VECTOR	0 /* Allocate a vector for this event channel */
+
 struct xenisrc {
 	struct intsrc	xi_intsrc;
 	enum evtchn_type xi_type;
@@ -113,8 +122,9 @@ struct xenisrc {
 	int		xi_pirq;
 	int		xi_virq;
 	u_int		xi_close:1;	/* close on unbind? */
-	u_int		xi_needs_eoi:1;
 	u_int		xi_shared:1;	/* Shared with other domains. */
+	u_int		xi_activehi:1;
+	u_int		xi_edgetrigger:1;
 };
 
 #define ARRAY_SIZE(a)	(sizeof(a) / sizeof(a[0]))
@@ -136,6 +146,9 @@ static void	xen_intr_pirq_enable_source(struct intsrc *isrc);
 static void	xen_intr_pirq_disable_source(struct intsrc *isrc, int eoi);
 static void	xen_intr_pirq_eoi_source(struct intsrc *isrc);
 static void	xen_intr_pirq_enable_intr(struct intsrc *isrc);
+static void	xen_intr_pirq_disable_intr(struct intsrc *isrc);
+static int	xen_intr_pirq_config_intr(struct intsrc *isrc,
+		     enum intr_trigger trig, enum intr_polarity pol);
 
 /**
  * PIC interface for all event channel port types except physical IRQs.
@@ -163,18 +176,20 @@ struct pic xen_intr_pirq_pic = {
 	.pic_disable_source = xen_intr_pirq_disable_source,
 	.pic_eoi_source     = xen_intr_pirq_eoi_source,
 	.pic_enable_intr    = xen_intr_pirq_enable_intr,
-	.pic_disable_intr   = xen_intr_disable_intr,
+	.pic_disable_intr   = xen_intr_pirq_disable_intr,
 	.pic_vector         = xen_intr_vector,
 	.pic_source_pending = xen_intr_source_pending,
 	.pic_suspend        = xen_intr_suspend,
 	.pic_resume         = xen_intr_resume,
-	.pic_config_intr    = xen_intr_config_intr,
+	.pic_config_intr    = xen_intr_pirq_config_intr,
 	.pic_assign_cpu     = xen_intr_assign_cpu
 };
 
-static struct mtx	xen_intr_isrc_lock;
-static int		xen_intr_isrc_count;
-static struct xenisrc  *xen_intr_port_to_isrc[NR_EVENT_CHANNELS];
+static struct mtx	 xen_intr_isrc_lock;
+static int		 xen_intr_auto_vector_count;
+static struct xenisrc	*xen_intr_port_to_isrc[NR_EVENT_CHANNELS];
+static u_long		*xen_intr_pirq_eoi_map;
+static boolean_t	 xen_intr_pirq_eoi_map_enabled;
 
 /*------------------------- Private Functions --------------------------------*/
 /**
@@ -256,7 +271,7 @@ xen_intr_find_unused_isrc(enum evtchn_type type)
 
 	KASSERT(mtx_owned(&xen_intr_isrc_lock), ("Evtchn isrc lock not held"));
 
-	for (isrc_idx = 0; isrc_idx < xen_intr_isrc_count; isrc_idx ++) {
+	for (isrc_idx = 0; isrc_idx < xen_intr_auto_vector_count; isrc_idx ++) {
 		struct xenisrc *isrc;
 		u_int vector;
 
@@ -282,27 +297,33 @@ xen_intr_find_unused_isrc(enum evtchn_type type)
  *          object or NULL.
  */
 static struct xenisrc *
-xen_intr_alloc_isrc(enum evtchn_type type)
+xen_intr_alloc_isrc(enum evtchn_type type, int vector)
 {
 	static int warned;
 	struct xenisrc *isrc;
-	int vector;
 
 	KASSERT(mtx_owned(&xen_intr_isrc_lock), ("Evtchn alloc lock not held"));
 
-	if (xen_intr_isrc_count > NR_EVENT_CHANNELS) {
+	if (xen_intr_auto_vector_count > NR_EVENT_CHANNELS) {
 		if (!warned) {
 			warned = 1;
 			printf("xen_intr_alloc: Event channels exhausted.\n");
 		}
 		return (NULL);
 	}
-	vector = FIRST_EVTCHN_INT + xen_intr_isrc_count;
-	xen_intr_isrc_count++;
+
+	if (type != EVTCHN_TYPE_PIRQ) {
+		vector = FIRST_EVTCHN_INT + xen_intr_auto_vector_count;
+		xen_intr_auto_vector_count++;
+	}
+
+	KASSERT((intr_lookup_source(vector) == NULL),
+	    ("Trying to use an already allocated vector"));
 
 	mtx_unlock(&xen_intr_isrc_lock);
 	isrc = malloc(sizeof(*isrc), M_XENINTR, M_WAITOK | M_ZERO);
-	isrc->xi_intsrc.is_pic = &xen_intr_pic;
+	isrc->xi_intsrc.is_pic =
+	    (type == EVTCHN_TYPE_PIRQ) ? &xen_intr_pirq_pic : &xen_intr_pic;
 	isrc->xi_vector = vector;
 	isrc->xi_type = type;
 	intr_register_source(&isrc->xi_intsrc);
@@ -388,7 +409,7 @@ xen_intr_bind_isrc(struct xenisrc **isrcp, evtchn_port_t local_port,
 	mtx_lock(&xen_intr_isrc_lock);
 	isrc = xen_intr_find_unused_isrc(type);
 	if (isrc == NULL) {
-		isrc = xen_intr_alloc_isrc(type);
+		isrc = xen_intr_alloc_isrc(type, XEN_ALLOCATE_VECTOR);
 		if (isrc == NULL) {
 			mtx_unlock(&xen_intr_isrc_lock);
 			return (ENOSPC);
@@ -569,8 +590,10 @@ xen_intr_handle_upcall(struct trapframe *trap_frame)
 static int
 xen_intr_init(void *dummy __unused)
 {
+	shared_info_t *s = HYPERVISOR_shared_info;
 	struct xen_intr_pcpu_data *pcpu;
-	int i;
+	struct physdev_pirq_eoi_gmfn eoi_gmfn;
+	int i, rc;
 
 	if (!xen_domain())
 		return (0);
@@ -591,11 +614,27 @@ xen_intr_init(void *dummy __unused)
 		xen_intr_intrcnt_add(i);
 	}
 
+	for (i = 0; i < nitems(s->evtchn_mask); i++)
+		atomic_store_rel_long(&s->evtchn_mask[i], ~0);
+
+	/* Try to register PIRQ EOI map */
+	xen_intr_pirq_eoi_map = malloc(PAGE_SIZE, M_XENINTR, M_WAITOK | M_ZERO);
+	eoi_gmfn.gmfn = atop(vtophys(xen_intr_pirq_eoi_map));
+	rc = HYPERVISOR_physdev_op(PHYSDEVOP_pirq_eoi_gmfn_v2, &eoi_gmfn);
+	if (rc != 0 && bootverbose)
+		printf("Xen interrupts: unable to register PIRQ EOI map\n");
+	else
+		xen_intr_pirq_eoi_map_enabled = true;
+
 	intr_register_pic(&xen_intr_pic);
+	intr_register_pic(&xen_intr_pirq_pic);
+
+	if (bootverbose)
+		printf("Xen interrupt system initialized\n");
 
 	return (0);
 }
-SYSINIT(xen_intr_init, SI_SUB_INTR, SI_ORDER_MIDDLE, xen_intr_init, NULL);
+SYSINIT(xen_intr_init, SI_SUB_INTR, SI_ORDER_SECOND, xen_intr_init, NULL);
 
 /*--------------------------- Common PIC Functions ---------------------------*/
 /**
@@ -696,7 +735,7 @@ xen_intr_resume(struct pic *unused, bool suspend_cancelled)
 	memset(xen_intr_port_to_isrc, 0, sizeof(xen_intr_port_to_isrc));
 
 	/* Free unused isrcs and rebind VIRQs and IPIs */
-	for (isrc_idx = 0; isrc_idx < xen_intr_isrc_count; isrc_idx++) {
+	for (isrc_idx = 0; isrc_idx < xen_intr_auto_vector_count; isrc_idx++) {
 		u_int vector;
 
 		vector = FIRST_EVTCHN_INT + isrc_idx;
@@ -916,6 +955,9 @@ xen_intr_pirq_disable_source(struct intsrc *base_isrc, int eoi)
 
 	isrc = (struct xenisrc *)base_isrc;
 	evtchn_mask_port(isrc->xi_port);
+
+	if (eoi == PIC_EOI)
+		xen_intr_pirq_eoi_source(base_isrc);
 }
 
 /*
@@ -944,7 +986,7 @@ xen_intr_pirq_eoi_source(struct intsrc *base_isrc)
 
 	/* XXX Use shared page of flags for this. */
 	isrc = (struct xenisrc *)base_isrc;
-	if (isrc->xi_needs_eoi != 0) {
+	if (test_bit(isrc->xi_pirq, xen_intr_pirq_eoi_map)) {
 		struct physdev_eoi eoi = { .irq = isrc->xi_pirq };
 
 		(void)HYPERVISOR_physdev_op(PHYSDEVOP_eoi, &eoi);
@@ -957,8 +999,116 @@ xen_intr_pirq_eoi_source(struct intsrc *base_isrc)
  * \param isrc  The interrupt source to enable.
  */
 static void
-xen_intr_pirq_enable_intr(struct intsrc *isrc)
+xen_intr_pirq_enable_intr(struct intsrc *base_isrc)
 {
+	struct xenisrc *isrc;
+	struct evtchn_bind_pirq bind_pirq;
+	struct physdev_irq_status_query irq_status;
+	int error;
+
+	isrc = (struct xenisrc *)base_isrc;
+
+	if (!xen_intr_pirq_eoi_map_enabled) {
+		irq_status.irq = isrc->xi_pirq;
+		error = HYPERVISOR_physdev_op(PHYSDEVOP_irq_status_query,
+		    &irq_status);
+		if (error)
+			panic("unable to get status of IRQ#%d", isrc->xi_pirq);
+
+		if (irq_status.flags & XENIRQSTAT_needs_eoi) {
+			/*
+			 * Since the dynamic PIRQ EOI map is not available
+			 * mark the PIRQ as needing EOI unconditionally.
+			 */
+			set_bit(isrc->xi_pirq, xen_intr_pirq_eoi_map);
+		}
+	}
+
+	bind_pirq.pirq = isrc->xi_pirq;
+	bind_pirq.flags = isrc->xi_edgetrigger ? 0 : BIND_PIRQ__WILL_SHARE;
+	error = HYPERVISOR_event_channel_op(EVTCHNOP_bind_pirq, &bind_pirq);
+	if (error)
+		panic("unable to bind IRQ#%d", isrc->xi_pirq);
+
+	isrc->xi_port = bind_pirq.port;
+
+	mtx_lock(&xen_intr_isrc_lock);
+	KASSERT((xen_intr_port_to_isrc[bind_pirq.port] == NULL),
+	    ("trying to override an already setup event channel port"));
+	xen_intr_port_to_isrc[bind_pirq.port] = isrc;
+	mtx_unlock(&xen_intr_isrc_lock);
+
+	evtchn_unmask_port(isrc->xi_port);
+}
+
+/*
+ * Disable an interrupt source.
+ *
+ * \param isrc  The interrupt source to disable.
+ */
+static void
+xen_intr_pirq_disable_intr(struct intsrc *base_isrc)
+{
+	struct xenisrc *isrc;
+	struct evtchn_close close;
+	int error;
+
+	isrc = (struct xenisrc *)base_isrc;
+
+	evtchn_mask_port(isrc->xi_port);
+
+	close.port = isrc->xi_port;
+	error = HYPERVISOR_event_channel_op(EVTCHNOP_close, &close);
+	if (error)
+		panic("unable to close event channel %d IRQ#%d",
+		    isrc->xi_port, isrc->xi_pirq);
+
+	mtx_lock(&xen_intr_isrc_lock);
+	xen_intr_port_to_isrc[isrc->xi_port] = NULL;
+	mtx_unlock(&xen_intr_isrc_lock);
+
+	isrc->xi_port = 0;
+}
+
+/**
+ * Perform configuration of an interrupt source.
+ *
+ * \param isrc  The interrupt source to configure.
+ * \param trig  Edge or level.
+ * \param pol   Active high or low.
+ *
+ * \returns  0 if no events are pending, otherwise non-zero.
+ */
+static int
+xen_intr_pirq_config_intr(struct intsrc *base_isrc, enum intr_trigger trig,
+    enum intr_polarity pol)
+{
+	struct xenisrc *isrc = (struct xenisrc *)base_isrc;
+	struct physdev_setup_gsi setup_gsi;
+	int error;
+
+	KASSERT(!(trig == INTR_TRIGGER_CONFORM || pol == INTR_POLARITY_CONFORM),
+	    ("%s: Conforming trigger or polarity\n", __func__));
+
+	setup_gsi.gsi = isrc->xi_pirq;
+	setup_gsi.triggering = trig == INTR_TRIGGER_EDGE ? 0 : 1;
+	setup_gsi.polarity = pol == INTR_POLARITY_HIGH ? 0 : 1;
+
+	error = HYPERVISOR_physdev_op(PHYSDEVOP_setup_gsi, &setup_gsi);
+	if (error == -XEN_EEXIST) {
+		if ((isrc->xi_edgetrigger && (trig != INTR_TRIGGER_EDGE)) ||
+		    (isrc->xi_activehi && (pol != INTR_POLARITY_HIGH)))
+			panic("unable to reconfigure interrupt IRQ#%d",
+			    isrc->xi_pirq);
+		error = 0;
+	}
+	if (error)
+		panic("unable to configure IRQ#%d\n", isrc->xi_pirq);
+
+	isrc->xi_activehi = pol == INTR_POLARITY_HIGH ? 1 : 0;
+	isrc->xi_edgetrigger = trig == INTR_TRIGGER_EDGE ? 1 : 0;
+
+	return (0);
 }
 
 /*--------------------------- Public Functions -------------------------------*/
@@ -1180,6 +1330,50 @@ xen_intr_alloc_and_bind_ipi(device_t dev, u_int cpu,
 #endif
 }
 
+int
+xen_register_pirq(int vector, enum intr_trigger trig, enum intr_polarity pol)
+{
+	struct physdev_map_pirq map_pirq;
+	struct physdev_irq alloc_pirq;
+	struct xenisrc *isrc;
+	int error;
+
+	if (vector == 0)
+		return (EINVAL);
+
+	if (bootverbose)
+		printf("xen: register IRQ#%d\n", vector);
+
+	map_pirq.domid = DOMID_SELF;
+	map_pirq.type = MAP_PIRQ_TYPE_GSI;
+	map_pirq.index = vector;
+	map_pirq.pirq = vector;
+
+	error = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_pirq);
+	if (error) {
+		printf("xen: unable to map IRQ#%d\n", vector);
+		return (error);
+	}
+
+	alloc_pirq.irq = vector;
+	alloc_pirq.vector = 0;
+	error = HYPERVISOR_physdev_op(PHYSDEVOP_alloc_irq_vector, &alloc_pirq);
+	if (error) {
+		printf("xen: unable to alloc PIRQ for IRQ#%d\n", vector);
+		return (error);
+	}
+
+	mtx_lock(&xen_intr_isrc_lock);
+	isrc = xen_intr_alloc_isrc(EVTCHN_TYPE_PIRQ, vector);
+	mtx_unlock(&xen_intr_isrc_lock);
+	KASSERT((isrc != NULL), ("xen: unable to allocate isrc for interrupt"));
+	isrc->xi_pirq = vector;
+	isrc->xi_activehi = pol == INTR_POLARITY_HIGH ? 1 : 0;
+	isrc->xi_edgetrigger = trig == INTR_TRIGGER_EDGE ? 1 : 0;
+
+	return (0);
+}
+
 int
 xen_intr_describe(xen_intr_handle_t port_handle, const char *fmt, ...)
 {
@@ -1239,3 +1433,74 @@ xen_intr_port(xen_intr_handle_t handle)
 	
 	return (isrc->xi_port);
 }
+
+#ifdef DDB
+static const char *
+xen_intr_print_type(enum evtchn_type type)
+{
+	static const char *evtchn_type_to_string[EVTCHN_TYPE_COUNT] = {
+		[EVTCHN_TYPE_UNBOUND]	= "UNBOUND",
+		[EVTCHN_TYPE_PIRQ]	= "PIRQ",
+		[EVTCHN_TYPE_VIRQ]	= "VIRQ",
+		[EVTCHN_TYPE_IPI]	= "IPI",
+		[EVTCHN_TYPE_PORT]	= "PORT",
+	};
+
+	if (type >= EVTCHN_TYPE_COUNT)
+		return ("UNKNOWN");
+
+	return (evtchn_type_to_string[type]);
+}
+
+static void
+xen_intr_dump_port(struct xenisrc *isrc)
+{
+	struct xen_intr_pcpu_data *pcpu;
+	shared_info_t *s = HYPERVISOR_shared_info;
+	int i;
+
+	db_printf("Port %d Type: %s\n",
+	    isrc->xi_port, xen_intr_print_type(isrc->xi_type));
+	if (isrc->xi_type == EVTCHN_TYPE_PIRQ) {
+		db_printf("\tPirq: %d ActiveHi: %d EdgeTrigger: %d "
+		    "NeedsEOI: %d Shared: %d\n",
+		    isrc->xi_pirq, isrc->xi_activehi, isrc->xi_edgetrigger,
+		    !!test_bit(isrc->xi_pirq, xen_intr_pirq_eoi_map),
+		    isrc->xi_shared);
+	}
+	if (isrc->xi_type == EVTCHN_TYPE_VIRQ)
+		db_printf("\tVirq: %d\n", isrc->xi_virq);
+
+	db_printf("\tMasked: %d Pending: %d\n",
+	    !!test_bit(isrc->xi_port, &s->evtchn_mask[0]),
+	    !!test_bit(isrc->xi_port, &s->evtchn_pending[0]));
+
+	db_printf("\tPer-CPU Masks: ");
+	CPU_FOREACH(i) {
+		pcpu = DPCPU_ID_PTR(i, xen_intr_pcpu);
+		db_printf("cpu#%d: %d ", i,
+		    !!test_bit(isrc->xi_port, pcpu->evtchn_enabled));
+	}
+	db_printf("\n");
+}
+
+DB_SHOW_COMMAND(xen_evtchn, db_show_xen_evtchn)
+{
+	int i;
+
+	if (!xen_domain()) {
+		db_printf("Only available on Xen guests\n");
+		return;
+	}
+
+	for (i = 0; i < NR_EVENT_CHANNELS; i++) {
+		struct xenisrc *isrc;
+
+		isrc = xen_intr_port_to_isrc[i];
+		if (isrc == NULL)
+			continue;
+
+		xen_intr_dump_port(isrc);
+	}
+}
+#endif /* DDB */
diff --git a/sys/x86/xen/xen_nexus.c b/sys/x86/xen/xen_nexus.c
new file mode 100644
index 000000000000..e4634f93ae36
--- /dev/null
+++ b/sys/x86/xen/xen_nexus.c
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2013 Roger Pau Monné <roger.pau@citrix.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
+#include <sys/smp.h>
+
+#include <contrib/dev/acpica/include/acpi.h>
+
+#include <dev/acpica/acpivar.h>
+
+#include <x86/init.h>
+#include <machine/nexusvar.h>
+#include <machine/intr_machdep.h>
+
+#include <xen/xen-os.h>
+#include <xen/xen_intr.h>
+
+/*
+ * Xen nexus(4) driver.
+ */
+static int
+nexus_xen_probe(device_t dev)
+{
+
+	if (!xen_pv_domain())
+		return (ENXIO);
+
+	return (BUS_PROBE_SPECIFIC);
+}
+
+static int
+nexus_xen_attach(device_t dev)
+{
+	int error;
+#ifndef XEN
+	device_t acpi_dev;
+#endif
+
+	nexus_init_resources();
+	bus_generic_probe(dev);
+
+#ifndef XEN
+	if (xen_initial_domain()) {
+		/* Disable some ACPI devices that are not usable by Dom0 */
+		acpi_cpu_disabled = true;
+		acpi_hpet_disabled = true;
+		acpi_timer_disabled = true;
+
+		acpi_dev = BUS_ADD_CHILD(dev, 10, "acpi", 0);
+		if (acpi_dev == NULL)
+			panic("Unable to add ACPI bus to Xen Dom0");
+	}
+#endif
+
+	error = bus_generic_attach(dev);
+#ifndef XEN
+	if (xen_initial_domain() && (error == 0))
+		acpi_install_wakeup_handler(device_get_softc(acpi_dev));
+#endif
+
+	return (error);
+}
+
+static int
+nexus_xen_config_intr(device_t dev, int irq, enum intr_trigger trig,
+    enum intr_polarity pol)
+{
+	int ret;
+
+	/*
+	 * ISA and PCI intline IRQs are not preregistered on Xen, so
+	 * intercept calls to configure those and register them on the fly.
+	 */
+	if ((irq < FIRST_MSI_INT) && (intr_lookup_source(irq) == NULL)) {
+		ret = xen_register_pirq(irq, trig, pol);
+		if (ret != 0)
+			return (ret);
+		nexus_add_irq(irq);
+	}
+	return (intr_config_intr(irq, trig, pol));
+}
+
+static device_method_t nexus_xen_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		nexus_xen_probe),
+	DEVMETHOD(device_attach,	nexus_xen_attach),
+
+	/* INTR */
+	DEVMETHOD(bus_config_intr,	nexus_xen_config_intr),
+
+	{ 0, 0 }
+};
+
+DEFINE_CLASS_1(nexus, nexus_xen_driver, nexus_xen_methods, 1, nexus_driver);
+static devclass_t nexus_devclass;
+
+DRIVER_MODULE(nexus_xen, root, nexus_xen_driver, nexus_devclass, 0, 0);
diff --git a/sys/x86/xen/xenpv.c b/sys/x86/xen/xenpv.c
new file mode 100644
index 000000000000..9dd5db4a23be
--- /dev/null
+++ b/sys/x86/xen/xenpv.c
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/pcpu.h>
+#include <sys/smp.h>
+
+#include <xen/xen-os.h>
+#include <xen/gnttab.h>
+
+static devclass_t xenpv_devclass;
+
+static void
+xenpv_identify(driver_t *driver, device_t parent)
+{
+	if (!xen_domain())
+		return;
+
+	/* Make sure there's only one xenpv device. */
+	if (devclass_get_device(xenpv_devclass, 0))
+		return;
+
+	if (BUS_ADD_CHILD(parent, 0, "xenpv", 0) == NULL)
+		panic("Unable to attach xenpv bus.");
+}
+
+static int
+xenpv_probe(device_t dev)
+{
+
+	device_set_desc(dev, "Xen PV bus");
+	return (BUS_PROBE_NOWILDCARD);
+}
+
+static int
+xenpv_attach(device_t dev)
+{
+	device_t child;
+	int error;
+
+	/* Initialize grant table before any Xen specific device is attached */
+	error = gnttab_init(dev);
+	if (error != 0) {
+		device_printf(dev, "error initializing grant table: %d\n",
+		    error);
+		return (error);
+	}
+
+	/*
+	 * Let our child drivers identify any child devices that they
+	 * can find.  Once that is done attach any devices that we
+	 * found.
+	 */
+	bus_generic_probe(dev);
+	bus_generic_attach(dev);
+
+	if (!devclass_get_device(devclass_find("isa"), 0)) {
+		child = BUS_ADD_CHILD(dev, 0, "isa", 0);
+		if (child == NULL)
+			panic("Failed to attach ISA bus.");
+		device_probe_and_attach(child);
+	}
+
+	return (0);
+}
+
+static device_method_t xenpv_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_identify,		xenpv_identify),
+	DEVMETHOD(device_probe,			xenpv_probe),
+	DEVMETHOD(device_attach,		xenpv_attach),
+	DEVMETHOD(device_suspend,		bus_generic_suspend),
+	DEVMETHOD(device_resume,		bus_generic_resume),
+
+	/* Bus interface */
+	DEVMETHOD(bus_add_child,		bus_generic_add_child),
+	DEVMETHOD(bus_alloc_resource,		bus_generic_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_END
+};
+
+static driver_t xenpv_driver = {
+	"xenpv",
+	xenpv_methods,
+	0,
+};
+
+DRIVER_MODULE(xenpv, nexus, xenpv_driver, xenpv_devclass, 0, 0);
diff --git a/sys/xen/gnttab.c b/sys/xen/gnttab.c
index 03c32b724fd6..ca6fa3b8863c 100644
--- a/sys/xen/gnttab.c
+++ b/sys/xen/gnttab.c
@@ -25,6 +25,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mman.h>
+#include <sys/limits.h>
+#include <sys/rman.h>
+#include <machine/resource.h>
 
 #include <xen/xen-os.h>
 #include <xen/hypervisor.h>
@@ -51,6 +54,17 @@ static int gnttab_free_count;
 static grant_ref_t gnttab_free_head;
 static struct mtx gnttab_list_lock;
 
+#ifdef XENHVM
+/*
+ * Resource representing allocated physical address space
+ * for the grant table metainfo
+ */
+static struct resource *gnttab_pseudo_phys_res;
+
+/* Resource id for allocated physical address space. */
+static int gnttab_pseudo_phys_res_id;
+#endif
+
 static grant_entry_t *shared;
 
 static struct gnttab_free_callback *gnttab_free_callback_list = NULL;
@@ -542,7 +556,7 @@ gnttab_map(unsigned int start_idx, unsigned int end_idx)
 }
 
 int
-gnttab_resume(void)
+gnttab_resume(device_t dev)
 {
 
 	if (max_nr_grant_frames() < nr_grant_frames)
@@ -563,8 +577,6 @@ gnttab_suspend(void)
 
 #else /* XENHVM */
 
-#include <dev/xen/xenpci/xenpcivar.h>
-
 static vm_paddr_t resume_frames;
 
 static int
@@ -603,9 +615,8 @@ gnttab_map(unsigned int start_idx, unsigned int end_idx)
 }
 
 int
-gnttab_resume(void)
+gnttab_resume(device_t dev)
 {
-	int error;
 	unsigned int max_nr_gframes, nr_gframes;
 
 	nr_gframes = nr_grant_frames;
@@ -614,12 +625,15 @@ gnttab_resume(void)
 		return (ENOSYS);
 
 	if (!resume_frames) {
-		error = xenpci_alloc_space(PAGE_SIZE * max_nr_gframes,
-		    &resume_frames);
-		if (error) {
-			printf("error mapping gnttab share frames\n");
-			return (error);
-		}
+		KASSERT(dev != NULL,
+		    ("No resume frames and no device provided"));
+
+		gnttab_pseudo_phys_res = bus_alloc_resource(dev,
+		    SYS_RES_MEMORY, &gnttab_pseudo_phys_res_id, 0, ~0,
+		    PAGE_SIZE * max_nr_gframes, RF_ACTIVE);
+		if (gnttab_pseudo_phys_res == NULL)
+			panic("Unable to reserve physical memory for gnttab");
+		resume_frames = rman_get_start(gnttab_pseudo_phys_res);
 	}
 
 	return (gnttab_map(0, nr_gframes - 1));
@@ -647,7 +661,7 @@ gnttab_expand(unsigned int req_entries)
 }
 
 int 
-gnttab_init()
+gnttab_init(device_t dev)
 {
 	int i;
 	unsigned int max_nr_glist_frames;
@@ -679,7 +693,7 @@ gnttab_init()
 			goto ini_nomem;
 	}
 
-	if (gnttab_resume())
+	if (gnttab_resume(dev))
 		return (ENODEV);
 
 	nr_init_grefs = nr_grant_frames * GREFS_PER_GRANT_FRAME;
diff --git a/sys/xen/gnttab.h b/sys/xen/gnttab.h
index d81e965fc43a..afbe600607a0 100644
--- a/sys/xen/gnttab.h
+++ b/sys/xen/gnttab.h
@@ -51,7 +51,7 @@ struct gnttab_free_callback {
 	uint16_t count;
 };
 
-int gnttab_init(void);
+int gnttab_init(device_t);
 
 /*
  * Allocate a grant table reference and return it in *result. Returns
@@ -116,7 +116,7 @@ void gnttab_grant_foreign_transfer_ref(grant_ref_t, domid_t domid,
 				       unsigned long pfn);
 
 int gnttab_suspend(void);
-int gnttab_resume(void);
+int gnttab_resume(device_t);
 
 #if 0
 
diff --git a/sys/xen/interface/arch-ia64.h b/sys/xen/interface/arch-ia64.h
deleted file mode 100644
index c9da5d4f8283..000000000000
--- a/sys/xen/interface/arch-ia64.h
+++ /dev/null
@@ -1,637 +0,0 @@
-/******************************************************************************
- * arch-ia64/hypervisor-if.h
- * 
- * Guest OS interface to IA64 Xen.
- *
- * 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
- * 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 "xen.h"
-
-#ifndef __HYPERVISOR_IF_IA64_H__
-#define __HYPERVISOR_IF_IA64_H__
-
-#if !defined(__GNUC__) || defined(__STRICT_ANSI__)
-#error "Anonymous structs/unions are a GNU extension."
-#endif
-
-/* Structural guest handles introduced in 0x00030201. */
-#if __XEN_INTERFACE_VERSION__ >= 0x00030201
-#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
-    typedef struct { type *p; } __guest_handle_ ## name
-#else
-#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
-    typedef type * __guest_handle_ ## name
-#endif
-
-#define __DEFINE_XEN_GUEST_HANDLE(name, type) \
-    ___DEFINE_XEN_GUEST_HANDLE(name, type);   \
-    ___DEFINE_XEN_GUEST_HANDLE(const_##name, const type)
-
-#define DEFINE_XEN_GUEST_HANDLE(name)   __DEFINE_XEN_GUEST_HANDLE(name, name)
-#define XEN_GUEST_HANDLE(name)          __guest_handle_ ## name
-#define XEN_GUEST_HANDLE_64(name)       XEN_GUEST_HANDLE(name)
-#define uint64_aligned_t                uint64_t
-#define set_xen_guest_handle_raw(hnd, val)  do { (hnd).p = val; } while (0)
-#ifdef __XEN_TOOLS__
-#define get_xen_guest_handle(val, hnd)  do { val = (hnd).p; } while (0)
-#endif
-#define set_xen_guest_handle(hnd, val) set_xen_guest_handle_raw(hnd, val)
-
-#ifndef __ASSEMBLY__
-typedef unsigned long xen_pfn_t;
-#define PRI_xen_pfn "lx"
-#endif
-
-/* Arch specific VIRQs definition */
-#define VIRQ_ITC        VIRQ_ARCH_0 /* V. Virtual itc timer */
-#define VIRQ_MCA_CMC    VIRQ_ARCH_1 /* MCA cmc interrupt */
-#define VIRQ_MCA_CPE    VIRQ_ARCH_2 /* MCA cpe interrupt */
-
-/* Maximum number of virtual CPUs in multi-processor guests. */
-/* WARNING: before changing this, check that shared_info fits on a page */
-#define XEN_LEGACY_MAX_VCPUS 64
-
-/* IO ports location for PV.  */
-#define IO_PORTS_PADDR          0x00000ffffc000000UL
-#define IO_PORTS_SIZE           0x0000000004000000UL
-
-#ifndef __ASSEMBLY__
-
-typedef unsigned long xen_ulong_t;
-
-#ifdef __XEN_TOOLS__
-#define XEN_PAGE_SIZE XC_PAGE_SIZE
-#else
-#define XEN_PAGE_SIZE PAGE_SIZE
-#endif
-
-#define INVALID_MFN       (~0UL)
-
-struct pt_fpreg {
-    union {
-        unsigned long bits[2];
-        long double __dummy;    /* force 16-byte alignment */
-    } u;
-};
-
-union vac {
-    unsigned long value;
-    struct {
-        int a_int:1;
-        int a_from_int_cr:1;
-        int a_to_int_cr:1;
-        int a_from_psr:1;
-        int a_from_cpuid:1;
-        int a_cover:1;
-        int a_bsw:1;
-        long reserved:57;
-    };
-};
-typedef union vac vac_t;
-
-union vdc {
-    unsigned long value;
-    struct {
-        int d_vmsw:1;
-        int d_extint:1;
-        int d_ibr_dbr:1;
-        int d_pmc:1;
-        int d_to_pmd:1;
-        int d_itm:1;
-        long reserved:58;
-    };
-};
-typedef union vdc vdc_t;
-
-struct mapped_regs {
-    union vac   vac;
-    union vdc   vdc;
-    unsigned long  virt_env_vaddr;
-    unsigned long  reserved1[29];
-    unsigned long  vhpi;
-    unsigned long  reserved2[95];
-    union {
-        unsigned long  vgr[16];
-        unsigned long bank1_regs[16]; // bank1 regs (r16-r31) when bank0 active
-    };
-    union {
-        unsigned long  vbgr[16];
-        unsigned long bank0_regs[16]; // bank0 regs (r16-r31) when bank1 active
-    };
-    unsigned long  vnat;
-    unsigned long  vbnat;
-    unsigned long  vcpuid[5];
-    unsigned long  reserved3[11];
-    unsigned long  vpsr;
-    unsigned long  vpr;
-    unsigned long  reserved4[76];
-    union {
-        unsigned long  vcr[128];
-        struct {
-            unsigned long dcr;  // CR0
-            unsigned long itm;
-            unsigned long iva;
-            unsigned long rsv1[5];
-            unsigned long pta;  // CR8
-            unsigned long rsv2[7];
-            unsigned long ipsr;  // CR16
-            unsigned long isr;
-            unsigned long rsv3;
-            unsigned long iip;
-            unsigned long ifa;
-            unsigned long itir;
-            unsigned long iipa;
-            unsigned long ifs;
-            unsigned long iim;  // CR24
-            unsigned long iha;
-            unsigned long rsv4[38];
-            unsigned long lid;  // CR64
-            unsigned long ivr;
-            unsigned long tpr;
-            unsigned long eoi;
-            unsigned long irr[4];
-            unsigned long itv;  // CR72
-            unsigned long pmv;
-            unsigned long cmcv;
-            unsigned long rsv5[5];
-            unsigned long lrr0;  // CR80
-            unsigned long lrr1;
-            unsigned long rsv6[46];
-        };
-    };
-    union {
-        unsigned long  reserved5[128];
-        struct {
-            unsigned long precover_ifs;
-            unsigned long unat;  // not sure if this is needed until NaT arch is done
-            int interrupt_collection_enabled; // virtual psr.ic
-            /* virtual interrupt deliverable flag is evtchn_upcall_mask in
-             * shared info area now. interrupt_mask_addr is the address
-             * of evtchn_upcall_mask for current vcpu
-             */
-            unsigned char *interrupt_mask_addr;
-            int pending_interruption;
-            unsigned char vpsr_pp;
-            unsigned char vpsr_dfh;
-            unsigned char hpsr_dfh;
-            unsigned char hpsr_mfh;
-            unsigned long reserved5_1[4];
-            int metaphysical_mode; // 1 = use metaphys mapping, 0 = use virtual
-            int banknum; // 0 or 1, which virtual register bank is active
-            unsigned long rrs[8]; // region registers
-            unsigned long krs[8]; // kernel registers
-            unsigned long tmp[16]; // temp registers (e.g. for hyperprivops)
-
-            /* itc paravirtualization
-             * vAR.ITC = mAR.ITC + itc_offset
-             * itc_last is one which was lastly passed to
-             * the guest OS in order to prevent it from
-             * going backwords.
-             */
-            unsigned long itc_offset;
-            unsigned long itc_last;
-        };
-    };
-};
-typedef struct mapped_regs mapped_regs_t;
-
-struct vpd {
-    struct mapped_regs vpd_low;
-    unsigned long  reserved6[3456];
-    unsigned long  vmm_avail[128];
-    unsigned long  reserved7[4096];
-};
-typedef struct vpd vpd_t;
-
-struct arch_vcpu_info {
-};
-typedef struct arch_vcpu_info arch_vcpu_info_t;
-
-/*
- * This structure is used for magic page in domain pseudo physical address
- * space and the result of XENMEM_machine_memory_map.
- * As the XENMEM_machine_memory_map result,
- * xen_memory_map::nr_entries indicates the size in bytes 
- * including struct xen_ia64_memmap_info. Not the number of entries.
- */
-struct xen_ia64_memmap_info {
-    uint64_t efi_memmap_size;       /* size of EFI memory map */
-    uint64_t efi_memdesc_size;      /* size of an EFI memory map descriptor */
-    uint32_t efi_memdesc_version;   /* memory descriptor version */
-    void *memdesc[0];               /* array of efi_memory_desc_t */
-};
-typedef struct xen_ia64_memmap_info xen_ia64_memmap_info_t;
-
-struct arch_shared_info {
-    /* PFN of the start_info page.  */
-    unsigned long start_info_pfn;
-
-    /* Interrupt vector for event channel.  */
-    int evtchn_vector;
-
-    /* PFN of memmap_info page */
-    unsigned int memmap_info_num_pages;/* currently only = 1 case is
-                                          supported. */
-    unsigned long memmap_info_pfn;
-
-    uint64_t pad[31];
-};
-typedef struct arch_shared_info arch_shared_info_t;
-
-typedef unsigned long xen_callback_t;
-
-struct ia64_tr_entry {
-    unsigned long pte;
-    unsigned long itir;
-    unsigned long vadr;
-    unsigned long rid;
-};
-typedef struct ia64_tr_entry ia64_tr_entry_t;
-DEFINE_XEN_GUEST_HANDLE(ia64_tr_entry_t);
-
-struct vcpu_tr_regs {
-    struct ia64_tr_entry itrs[12];
-    struct ia64_tr_entry dtrs[12];
-};
-
-union vcpu_ar_regs {
-    unsigned long ar[128];
-    struct {
-        unsigned long kr[8];
-        unsigned long rsv1[8];
-        unsigned long rsc;
-        unsigned long bsp;
-        unsigned long bspstore;
-        unsigned long rnat;
-        unsigned long rsv2;
-        unsigned long fcr;
-        unsigned long rsv3[2];
-        unsigned long eflag;
-        unsigned long csd;
-        unsigned long ssd;
-        unsigned long cflg;
-        unsigned long fsr;
-        unsigned long fir;
-        unsigned long fdr;
-        unsigned long rsv4;
-        unsigned long ccv; /* 32 */
-        unsigned long rsv5[3];
-        unsigned long unat;
-        unsigned long rsv6[3];
-        unsigned long fpsr;
-        unsigned long rsv7[3];
-        unsigned long itc;
-        unsigned long rsv8[3];
-        unsigned long ign1[16];
-        unsigned long pfs; /* 64 */
-        unsigned long lc;
-        unsigned long ec;
-        unsigned long rsv9[45];
-        unsigned long ign2[16];
-    };
-};
-
-union vcpu_cr_regs {
-    unsigned long cr[128];
-    struct {
-        unsigned long dcr;  // CR0
-        unsigned long itm;
-        unsigned long iva;
-        unsigned long rsv1[5];
-        unsigned long pta;  // CR8
-        unsigned long rsv2[7];
-        unsigned long ipsr;  // CR16
-        unsigned long isr;
-        unsigned long rsv3;
-        unsigned long iip;
-        unsigned long ifa;
-        unsigned long itir;
-        unsigned long iipa;
-        unsigned long ifs;
-        unsigned long iim;  // CR24
-        unsigned long iha;
-        unsigned long rsv4[38];
-        unsigned long lid;  // CR64
-        unsigned long ivr;
-        unsigned long tpr;
-        unsigned long eoi;
-        unsigned long irr[4];
-        unsigned long itv;  // CR72
-        unsigned long pmv;
-        unsigned long cmcv;
-        unsigned long rsv5[5];
-        unsigned long lrr0;  // CR80
-        unsigned long lrr1;
-        unsigned long rsv6[46];
-    };
-};
-
-struct vcpu_guest_context_regs {
-        unsigned long r[32];
-        unsigned long b[8];
-        unsigned long bank[16];
-        unsigned long ip;
-        unsigned long psr;
-        unsigned long cfm;
-        unsigned long pr;
-        unsigned int nats; /* NaT bits for r1-r31.  */
-        unsigned int bnats; /* Nat bits for banked registers.  */
-        union vcpu_ar_regs ar;
-        union vcpu_cr_regs cr;
-        struct pt_fpreg f[128];
-        unsigned long dbr[8];
-        unsigned long ibr[8];
-        unsigned long rr[8];
-        unsigned long pkr[16];
-
-        /* FIXME: cpuid,pmd,pmc */
-
-        unsigned long xip;
-        unsigned long xpsr;
-        unsigned long xfs;
-        unsigned long xr[4];
-
-        struct vcpu_tr_regs tr;
-
-        /* Physical registers in case of debug event.  */
-        unsigned long excp_iipa;
-        unsigned long excp_ifa;
-        unsigned long excp_isr;
-        unsigned int excp_vector;
-
-        /*
-         * The rbs is intended to be the image of the stacked registers still
-         * in the cpu (not yet stored in memory).  It is laid out as if it
-         * were written in memory at a 512 (64*8) aligned address + offset.
-         * rbs_voff is (offset / 8).  rbs_nat contains NaT bits for the
-         * remaining rbs registers.  rbs_rnat contains NaT bits for in memory
-         * rbs registers.
-         * Note: loadrs is 2**14 bytes == 2**11 slots.
-         */
-        unsigned int rbs_voff;
-        unsigned long rbs[2048];
-        unsigned long rbs_rnat;
-
-        /*
-         * RSE.N_STACKED_PHYS via PAL_RSE_INFO
-         * Strictly this isn't cpu context, but this value is necessary
-         * for domain save/restore. So is here.
-         */
-        unsigned long num_phys_stacked;
-};
-
-struct vcpu_guest_context {
-#define VGCF_EXTRA_REGS (1UL << 1)	/* Set extra regs.  */
-#define VGCF_SET_CR_IRR (1UL << 2)	/* Set cr_irr[0:3]. */
-#define VGCF_online     (1UL << 3)  /* make this vcpu online */
-#define VGCF_SET_AR_ITC (1UL << 4)  /* set pv ar.itc. itc_offset, itc_last */
-    unsigned long flags;       /* VGCF_* flags */
-
-    struct vcpu_guest_context_regs regs;
-
-    unsigned long event_callback_ip;
-
-    /* xen doesn't share privregs pages with hvm domain so that this member
-     * doesn't make sense for hvm domain.
-     * ~0UL is already used for INVALID_P2M_ENTRY. */
-#define VGC_PRIVREGS_HVM       (~(-2UL))
-    unsigned long privregs_pfn;
-};
-typedef struct vcpu_guest_context vcpu_guest_context_t;
-DEFINE_XEN_GUEST_HANDLE(vcpu_guest_context_t);
-
-/* dom0 vp op */
-#define __HYPERVISOR_ia64_dom0vp_op     __HYPERVISOR_arch_0
-/*  Map io space in machine address to dom0 physical address space.
-    Currently physical assigned address equals to machine address.  */
-#define IA64_DOM0VP_ioremap             0
-
-/* Convert a pseudo physical page frame number to the corresponding
-   machine page frame number. If no page is assigned, INVALID_MFN or
-   GPFN_INV_MASK is returned depending on domain's non-vti/vti mode.  */
-#define IA64_DOM0VP_phystomach          1
-
-/* Convert a machine page frame number to the corresponding pseudo physical
-   page frame number of the caller domain.  */
-#define IA64_DOM0VP_machtophys          3
-
-/* Reserved for future use.  */
-#define IA64_DOM0VP_iounmap             4
-
-/* Unmap and free pages contained in the specified pseudo physical region.  */
-#define IA64_DOM0VP_zap_physmap         5
-
-/* Assign machine page frame to dom0's pseudo physical address space.  */
-#define IA64_DOM0VP_add_physmap         6
-
-/* expose the p2m table into domain */
-#define IA64_DOM0VP_expose_p2m          7
-
-/* xen perfmon */
-#define IA64_DOM0VP_perfmon             8
-
-/* gmfn version of IA64_DOM0VP_add_physmap */
-#define IA64_DOM0VP_add_physmap_with_gmfn       9
-
-/* get fpswa revision */
-#define IA64_DOM0VP_fpswa_revision      10
-
-/* Add an I/O port space range */
-#define IA64_DOM0VP_add_io_space        11
-
-/* expose the foreign domain's p2m table into privileged domain */
-#define IA64_DOM0VP_expose_foreign_p2m  12
-#define         IA64_DOM0VP_EFP_ALLOC_PTE       0x1 /* allocate p2m table */
-
-/* unexpose the foreign domain's p2m table into privileged domain */
-#define IA64_DOM0VP_unexpose_foreign_p2m        13
-
-/* get memmap_info and memmap. It is possible to map the page directly
-   by foreign page mapping, but there is a race between writer.
-   This hypercall avoids such race. */
-#define IA64_DOM0VP_get_memmap          14
-
-// flags for page assignement to pseudo physical address space
-#define _ASSIGN_readonly                0
-#define ASSIGN_readonly                 (1UL << _ASSIGN_readonly)
-#define ASSIGN_writable                 (0UL << _ASSIGN_readonly) // dummy flag
-/* Internal only: memory attribute must be WC/UC/UCE.  */
-#define _ASSIGN_nocache                 1
-#define ASSIGN_nocache                  (1UL << _ASSIGN_nocache)
-// tlb tracking
-#define _ASSIGN_tlb_track               2
-#define ASSIGN_tlb_track                (1UL << _ASSIGN_tlb_track)
-/* Internal only: associated with PGC_allocated bit */
-#define _ASSIGN_pgc_allocated           3
-#define ASSIGN_pgc_allocated            (1UL << _ASSIGN_pgc_allocated)
-/* Page is an IO page.  */
-#define _ASSIGN_io                      4
-#define ASSIGN_io                       (1UL << _ASSIGN_io)
-
-/* This structure has the same layout of struct ia64_boot_param, defined in
-   <asm/system.h>.  It is redefined here to ease use.  */
-struct xen_ia64_boot_param {
-	unsigned long command_line;	/* physical address of cmd line args */
-	unsigned long efi_systab;	/* physical address of EFI system table */
-	unsigned long efi_memmap;	/* physical address of EFI memory map */
-	unsigned long efi_memmap_size;	/* size of EFI memory map */
-	unsigned long efi_memdesc_size;	/* size of an EFI memory map descriptor */
-	unsigned int  efi_memdesc_version;	/* memory descriptor version */
-	struct {
-		unsigned short num_cols;	/* number of columns on console.  */
-		unsigned short num_rows;	/* number of rows on console.  */
-		unsigned short orig_x;	/* cursor's x position */
-		unsigned short orig_y;	/* cursor's y position */
-	} console_info;
-	unsigned long fpswa;		/* physical address of the fpswa interface */
-	unsigned long initrd_start;
-	unsigned long initrd_size;
-	unsigned long domain_start;	/* va where the boot time domain begins */
-	unsigned long domain_size;	/* how big is the boot domain */
-};
-
-#endif /* !__ASSEMBLY__ */
-
-/* Size of the shared_info area (this is not related to page size).  */
-#define XSI_SHIFT			14
-#define XSI_SIZE			(1 << XSI_SHIFT)
-/* Log size of mapped_regs area (64 KB - only 4KB is used).  */
-#define XMAPPEDREGS_SHIFT		12
-#define XMAPPEDREGS_SIZE		(1 << XMAPPEDREGS_SHIFT)
-/* Offset of XASI (Xen arch shared info) wrt XSI_BASE.  */
-#define XMAPPEDREGS_OFS			XSI_SIZE
-
-/* Hyperprivops.  */
-#define HYPERPRIVOP_START		0x1
-#define HYPERPRIVOP_RFI			(HYPERPRIVOP_START + 0x0)
-#define HYPERPRIVOP_RSM_DT		(HYPERPRIVOP_START + 0x1)
-#define HYPERPRIVOP_SSM_DT		(HYPERPRIVOP_START + 0x2)
-#define HYPERPRIVOP_COVER		(HYPERPRIVOP_START + 0x3)
-#define HYPERPRIVOP_ITC_D		(HYPERPRIVOP_START + 0x4)
-#define HYPERPRIVOP_ITC_I		(HYPERPRIVOP_START + 0x5)
-#define HYPERPRIVOP_SSM_I		(HYPERPRIVOP_START + 0x6)
-#define HYPERPRIVOP_GET_IVR		(HYPERPRIVOP_START + 0x7)
-#define HYPERPRIVOP_GET_TPR		(HYPERPRIVOP_START + 0x8)
-#define HYPERPRIVOP_SET_TPR		(HYPERPRIVOP_START + 0x9)
-#define HYPERPRIVOP_EOI			(HYPERPRIVOP_START + 0xa)
-#define HYPERPRIVOP_SET_ITM		(HYPERPRIVOP_START + 0xb)
-#define HYPERPRIVOP_THASH		(HYPERPRIVOP_START + 0xc)
-#define HYPERPRIVOP_PTC_GA		(HYPERPRIVOP_START + 0xd)
-#define HYPERPRIVOP_ITR_D		(HYPERPRIVOP_START + 0xe)
-#define HYPERPRIVOP_GET_RR		(HYPERPRIVOP_START + 0xf)
-#define HYPERPRIVOP_SET_RR		(HYPERPRIVOP_START + 0x10)
-#define HYPERPRIVOP_SET_KR		(HYPERPRIVOP_START + 0x11)
-#define HYPERPRIVOP_FC			(HYPERPRIVOP_START + 0x12)
-#define HYPERPRIVOP_GET_CPUID		(HYPERPRIVOP_START + 0x13)
-#define HYPERPRIVOP_GET_PMD		(HYPERPRIVOP_START + 0x14)
-#define HYPERPRIVOP_GET_EFLAG		(HYPERPRIVOP_START + 0x15)
-#define HYPERPRIVOP_SET_EFLAG		(HYPERPRIVOP_START + 0x16)
-#define HYPERPRIVOP_RSM_BE		(HYPERPRIVOP_START + 0x17)
-#define HYPERPRIVOP_GET_PSR		(HYPERPRIVOP_START + 0x18)
-#define HYPERPRIVOP_SET_RR0_TO_RR4	(HYPERPRIVOP_START + 0x19)
-#define HYPERPRIVOP_MAX			(0x1a)
-
-/* Fast and light hypercalls.  */
-#define __HYPERVISOR_ia64_fast_eoi	__HYPERVISOR_arch_1
-
-/* Extra debug features.  */
-#define __HYPERVISOR_ia64_debug_op  __HYPERVISOR_arch_2
-
-/* Xencomm macros.  */
-#define XENCOMM_INLINE_MASK 0xf800000000000000UL
-#define XENCOMM_INLINE_FLAG 0x8000000000000000UL
-
-#ifndef __ASSEMBLY__
-
-/*
- * Optimization features.
- * The hypervisor may do some special optimizations for guests. This hypercall
- * can be used to switch on/of these special optimizations.
- */
-#define __HYPERVISOR_opt_feature	0x700UL
-
-#define XEN_IA64_OPTF_OFF	0x0
-#define XEN_IA64_OPTF_ON	0x1
-
-/*
- * If this feature is switched on, the hypervisor inserts the
- * tlb entries without calling the guests traphandler.
- * This is useful in guests using region 7 for identity mapping
- * like the linux kernel does.
- */
-#define XEN_IA64_OPTF_IDENT_MAP_REG7    1
-
-/* Identity mapping of region 4 addresses in HVM. */
-#define XEN_IA64_OPTF_IDENT_MAP_REG4    2
-
-/* Identity mapping of region 5 addresses in HVM. */
-#define XEN_IA64_OPTF_IDENT_MAP_REG5    3
-
-#define XEN_IA64_OPTF_IDENT_MAP_NOT_SET  (0)
-
-struct xen_ia64_opt_feature {
-	unsigned long cmd;		/* Which feature */
-	unsigned char on;		/* Switch feature on/off */
-	union {
-		struct {
-				/* The page protection bit mask of the pte.
-			 	 * This will be or'ed with the pte. */
-			unsigned long pgprot;
-			unsigned long key;	/* A protection key for itir. */
-		};
-	};
-};
-
-#endif /* __ASSEMBLY__ */
-
-/* xen perfmon */
-#ifdef XEN
-#ifndef __ASSEMBLY__
-#ifndef _ASM_IA64_PERFMON_H
-
-#include <xen/list.h>   // asm/perfmon.h requires struct list_head
-#include <asm/perfmon.h>
-// for PFM_xxx and pfarg_features_t, pfarg_context_t, pfarg_reg_t, pfarg_load_t
-
-#endif /* _ASM_IA64_PERFMON_H */
-
-DEFINE_XEN_GUEST_HANDLE(pfarg_features_t);
-DEFINE_XEN_GUEST_HANDLE(pfarg_context_t);
-DEFINE_XEN_GUEST_HANDLE(pfarg_reg_t);
-DEFINE_XEN_GUEST_HANDLE(pfarg_load_t);
-#endif /* __ASSEMBLY__ */
-#endif /* XEN */
-
-#ifndef __ASSEMBLY__
-#include "arch-ia64/hvm/memmap.h"
-#endif
-
-#endif /* __HYPERVISOR_IF_IA64_H__ */
-
-/*
- * Local variables:
- * mode: C
- * c-set-style: "BSD"
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: nil
- * End:
- */
diff --git a/sys/xen/interface/arch-ia64/debug_op.h b/sys/xen/interface/arch-ia64/debug_op.h
deleted file mode 100644
index 8f4735821303..000000000000
--- a/sys/xen/interface/arch-ia64/debug_op.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/******************************************************************************
- * debug_op.h
- *
- * Copyright (c) 2007 Tristan Gingold <tgingold@free.fr>
- *
- * 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
- * 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 __XEN_PUBLIC_IA64_DEBUG_OP_H__
-#define __XEN_PUBLIC_IA64_DEBUG_OP_H__
-
-/* Set/Get extra conditions to break.  */
-#define XEN_IA64_DEBUG_OP_SET_FLAGS 1
-#define XEN_IA64_DEBUG_OP_GET_FLAGS 2
-
-/* Break on kernel single step.  */
-#define XEN_IA64_DEBUG_ON_KERN_SSTEP   (1 << 0)
-
-/* Break on kernel debug (breakpoint or watch point).  */
-#define XEN_IA64_DEBUG_ON_KERN_DEBUG   (1 << 1)
-
-/* Break on kernel taken branch.  */
-#define XEN_IA64_DEBUG_ON_KERN_TBRANCH (1 << 2)
-
-/* Break on interrupt injection.  */
-#define XEN_IA64_DEBUG_ON_EXTINT       (1 << 3)
-
-/* Break on interrupt injection.  */
-#define XEN_IA64_DEBUG_ON_EXCEPT       (1 << 4)
-
-/* Break on event injection.  */
-#define XEN_IA64_DEBUG_ON_EVENT        (1 << 5)
-
-/* Break on privop/virtualized instruction (slow path only).  */
-#define XEN_IA64_DEBUG_ON_PRIVOP       (1 << 6)
-
-/* Break on emulated PAL call (at entry).  */
-#define XEN_IA64_DEBUG_ON_PAL          (1 << 7)
-
-/* Break on emulated SAL call (at entry).  */
-#define XEN_IA64_DEBUG_ON_SAL          (1 << 8)
-
-/* Break on emulated EFI call (at entry).  */
-#define XEN_IA64_DEBUG_ON_EFI          (1 << 9)
-
-/* Break on rfi emulation (slow path only, before exec).  */
-#define XEN_IA64_DEBUG_ON_RFI          (1 << 10)
-
-/* Break on address translation switch.  */
-#define XEN_IA64_DEBUG_ON_MMU          (1 << 11)
-
-/* Break on bad guest physical address.  */
-#define XEN_IA64_DEBUG_ON_BAD_MPA      (1 << 12)
-
-/* Force psr.ss bit.  */
-#define XEN_IA64_DEBUG_FORCE_SS        (1 << 13)
-
-/* Force psr.db bit.  */
-#define XEN_IA64_DEBUG_FORCE_DB        (1 << 14)
-
-/* Break on ITR/PTR.  */
-#define XEN_IA64_DEBUG_ON_TR           (1 << 15)
-
-/* Break on ITC/PTC.L/PTC.G/PTC.GA.  */
-#define XEN_IA64_DEBUG_ON_TC           (1 << 16)
-
-/* Get translation cache.  */
-#define XEN_IA64_DEBUG_OP_GET_TC   3
-
-/* Translate virtual address to guest physical address.  */
-#define XEN_IA64_DEBUG_OP_TRANSLATE 4
-
-union xen_ia64_debug_op {
-    uint64_t flags;
-    struct xen_ia64_debug_vtlb {
-        uint64_t nbr;                             /* IN/OUT */
-        XEN_GUEST_HANDLE_64(ia64_tr_entry_t) tr;  /* IN/OUT */
-    } vtlb;
-};
-typedef union xen_ia64_debug_op xen_ia64_debug_op_t;
-DEFINE_XEN_GUEST_HANDLE(xen_ia64_debug_op_t);
-
-#endif /* __XEN_PUBLIC_IA64_DEBUG_OP_H__ */
diff --git a/sys/xen/interface/arch-ia64/hvm/memmap.h b/sys/xen/interface/arch-ia64/hvm/memmap.h
deleted file mode 100644
index 68d14f335cca..000000000000
--- a/sys/xen/interface/arch-ia64/hvm/memmap.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/******************************************************************************
- * memmap.h
- *
- * Copyright (c) 2008 Tristan Gingold <tgingold AT free fr>
- *
- * 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
- * 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 __XEN_PUBLIC_HVM_MEMMAP_IA64_H__
-#define __XEN_PUBLIC_HVM_MEMMAP_IA64_H__
-
-#define MEM_G  (1UL << 30)
-#define MEM_M  (1UL << 20)
-#define MEM_K  (1UL << 10)
-
-/* Guest physical address of IO ports space.  */
-#define MMIO_START  (3 * MEM_G)
-#define MMIO_SIZE   (512 * MEM_M)
-
-#define VGA_IO_START  0xA0000UL
-#define VGA_IO_SIZE   0x20000
-
-#define LEGACY_IO_START  (MMIO_START + MMIO_SIZE)
-#define LEGACY_IO_SIZE   (64 * MEM_M)
-
-#define IO_PAGE_START  (LEGACY_IO_START + LEGACY_IO_SIZE)
-#define IO_PAGE_SIZE   XEN_PAGE_SIZE
-
-#define STORE_PAGE_START  (IO_PAGE_START + IO_PAGE_SIZE)
-#define STORE_PAGE_SIZE   XEN_PAGE_SIZE
-
-#define BUFFER_IO_PAGE_START  (STORE_PAGE_START + STORE_PAGE_SIZE)
-#define BUFFER_IO_PAGE_SIZE   XEN_PAGE_SIZE
-
-#define BUFFER_PIO_PAGE_START  (BUFFER_IO_PAGE_START + BUFFER_IO_PAGE_SIZE)
-#define BUFFER_PIO_PAGE_SIZE   XEN_PAGE_SIZE
-
-#define IO_SAPIC_START  0xfec00000UL
-#define IO_SAPIC_SIZE   0x100000
-
-#define PIB_START  0xfee00000UL
-#define PIB_SIZE   0x200000
-
-#define GFW_START  (4 * MEM_G - 16 * MEM_M)
-#define GFW_SIZE   (16 * MEM_M)
-
-/* domVTI */
-#define GPFN_FRAME_BUFFER  0x1 /* VGA framebuffer */
-#define GPFN_LOW_MMIO      0x2 /* Low MMIO range */
-#define GPFN_PIB           0x3 /* PIB base */
-#define GPFN_IOSAPIC       0x4 /* IOSAPIC base */
-#define GPFN_LEGACY_IO     0x5 /* Legacy I/O base */
-#define GPFN_HIGH_MMIO     0x6 /* High MMIO range */
-
-/* Nvram belongs to GFW memory space  */
-#define NVRAM_SIZE   (MEM_K * 64)
-#define NVRAM_START  (GFW_START + 10 * MEM_M)
-
-#define NVRAM_VALID_SIG  0x4650494e45584948 /* "HIXENIPF" */
-struct nvram_save_addr {
-    unsigned long addr;
-    unsigned long signature;
-};
-
-#endif /* __XEN_PUBLIC_HVM_MEMMAP_IA64_H__ */
-
-/*
- * Local variables:
- * mode: C
- * c-set-style: "BSD"
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: nil
- * End:
- */
diff --git a/sys/xen/interface/arch-ia64/hvm/save.h b/sys/xen/interface/arch-ia64/hvm/save.h
deleted file mode 100644
index c44e913b2352..000000000000
--- a/sys/xen/interface/arch-ia64/hvm/save.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/******************************************************************************
- * save_types.h
- *
- * Copyright (c) 2007 Isaku Yamahata <yamahata at valinux co jp>
- *                    VA Linux Systems Japan K.K.
- *
- * 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
- * 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 __XEN_PUBLIC_HVM_SAVE_IA64_H__
-#define __XEN_PUBLIC_HVM_SAVE_IA64_H__
-
-#include "../../hvm/save.h"
-#include "../../arch-ia64.h"
-
-/* 
- * Save/restore header: general info about the save file. 
- */
-
-/* x86 uses 0x54381286 */
-#define HVM_FILE_MAGIC   0x343641492f6e6558UL   /* "Xen/IA64" */
-#define HVM_FILE_VERSION 0x0000000000000001UL
-
-struct hvm_save_header {
-    uint64_t magic;             /* Must be HVM_FILE_MAGIC */
-    uint64_t version;           /* File format version */
-    uint64_t changeset;         /* Version of Xen that saved this file */
-    uint64_t cpuid[5];          /* CPUID[0x01][%eax] on the saving machine */
-};
-
-DECLARE_HVM_SAVE_TYPE(HEADER, 1, struct hvm_save_header);
-
-/*
- * CPU
- */
-struct hvm_hw_ia64_cpu {
-    uint64_t    ipsr;
-};
-DECLARE_HVM_SAVE_TYPE(CPU, 2, struct hvm_hw_ia64_cpu);
-
-/*
- * CPU
- */
-struct hvm_hw_ia64_vpd {
-    struct vpd      vpd;
-};
-DECLARE_HVM_SAVE_TYPE(VPD, 3, struct hvm_hw_ia64_vpd);
-
-/*
- * device dependency
- * vacpi => viosapic => vlsapic
- */
-/*
- * vlsapic
- */
-struct hvm_hw_ia64_vlsapic {
-    uint64_t insvc[4];
-    uint64_t vhpi; // ??? should this be saved in vpd
-    uint8_t xtp;
-    uint8_t pal_init_pending;
-    uint8_t pad[2];
-};
-DECLARE_HVM_SAVE_TYPE(VLSAPIC, 4, struct hvm_hw_ia64_vlsapic);
-/* set
- * unconditionaly set v->arch.irq_new_peding = 1 
- * unconditionaly set v->arch.irq_new_condition = 0
- */
-
-/*
- * vtime
- */
-/* itc, itm, itv are saved by arch vcpu context */
-struct hvm_hw_ia64_vtime {
-    uint64_t itc;
-    uint64_t itm;
-
-    uint64_t last_itc;
-    uint64_t pending;
-};
-DECLARE_HVM_SAVE_TYPE(VTIME, 5, struct hvm_hw_ia64_vtime);
-/*
- * calculate v->vtm.vtm_offset
- * ??? Or should vtm_offset be set by leave_hypervisor_tail()?
- * start vtm_timer if necessary by vtm_set_itm().
- * ??? Or should vtm_timer be set by leave_hypervisor_tail()?
- *
- * ??? or should be done by schedule_tail()
- *        => schedule_tail() should do.
- */
-
-/*
- * viosapic
- */
-#define VIOSAPIC_NUM_PINS     48
-
-/* To share VT-d code which uses vioapic_redir_entry.
- * Although on ia64 this is for vsapic, but we have to vioapic_redir_entry
- * instead of viosapic_redir_entry.
- */
-union vioapic_redir_entry
-{
-    uint64_t bits;
-    struct {
-        uint8_t vector;
-
-        uint8_t delivery_mode  : 3;
-        uint8_t reserve1       : 1;
-        uint8_t delivery_status: 1;
-        uint8_t polarity       : 1;
-        uint8_t reserve2       : 1;
-        uint8_t trig_mode      : 1;
-
-        uint8_t mask           : 1;
-        uint8_t reserve3       : 7;
-
-        uint8_t reserved[3];
-        uint16_t dest_id;
-    } fields;
-};
-
-struct hvm_hw_ia64_viosapic {
-    uint64_t    irr;
-    uint64_t    isr;
-    uint32_t    ioregsel;
-    uint32_t    pad;
-    uint64_t    lowest_vcpu_id;
-    uint64_t    base_address;
-    union vioapic_redir_entry  redirtbl[VIOSAPIC_NUM_PINS];
-};
-DECLARE_HVM_SAVE_TYPE(VIOSAPIC, 6, struct hvm_hw_ia64_viosapic);
-  
-/*
- * vacpi
- * PM timer
- */
-struct vacpi_regs {
-    union {
-        struct {
-            uint32_t pm1a_sts:16;/* PM1a_EVT_BLK.PM1a_STS: status register */
-            uint32_t pm1a_en:16; /* PM1a_EVT_BLK.PM1a_EN: enable register */
-        };
-        uint32_t evt_blk;
-    };
-    uint32_t tmr_val;   /* PM_TMR_BLK.TMR_VAL: 32bit free-running counter */
-};
-
-struct hvm_hw_ia64_vacpi {
-    struct vacpi_regs   regs;
-};
-DECLARE_HVM_SAVE_TYPE(VACPI, 7, struct hvm_hw_ia64_vacpi);
-/* update last_gtime and setup timer of struct vacpi */
-
-/*
- * opt_feature: identity mapping of region 4, 5 and 7.
- * With the c/s 16396:d2935f9c217f of xen-ia64-devel.hg,
- * opt_feature hypercall supports only region 4,5,7 identity mappings.
- * structure hvm_hw_ia64_identity_mappings only supports them.
- * The new structure, struct hvm_hw_ia64_identity_mappings, is created to
- * avoid to keep up with change of the xen/ia64 internal structure, struct
- * opt_feature.
- *
- * If it is enhanced in the future, new structure will be created.
- */
-struct hvm_hw_ia64_identity_mapping {
-    uint64_t on;        /* on/off */
-    uint64_t pgprot;    /* The page protection bit mask of the pte. */
-    uint64_t key;       /* A protection key. */
-};
-
-struct hvm_hw_ia64_identity_mappings {
-    struct hvm_hw_ia64_identity_mapping im_reg4;/* Region 4 identity mapping */
-    struct hvm_hw_ia64_identity_mapping im_reg5;/* Region 5 identity mapping */
-    struct hvm_hw_ia64_identity_mapping im_reg7;/* Region 7 identity mapping */
-};
-DECLARE_HVM_SAVE_TYPE(OPT_FEATURE_IDENTITY_MAPPINGS, 8, struct hvm_hw_ia64_identity_mappings);
-
-/* 
- * Largest type-code in use
- */
-#define HVM_SAVE_CODE_MAX       8
-
-#endif /* __XEN_PUBLIC_HVM_SAVE_IA64_H__ */
-
-/*
- * Local variables:
- * mode: C
- * c-set-style: "BSD"
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: nil
- * End:
- */
diff --git a/sys/xen/interface/arch-ia64/sioemu.h b/sys/xen/interface/arch-ia64/sioemu.h
deleted file mode 100644
index d48da1a20fe4..000000000000
--- a/sys/xen/interface/arch-ia64/sioemu.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/******************************************************************************
- * sioemu.h
- *
- * Copyright (c) 2008 Tristan Gingold <tgingold@free.fr>
- *
- * 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
- * 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 __XEN_PUBLIC_IA64_SIOEMU_H__
-#define __XEN_PUBLIC_IA64_SIOEMU_H__
-
-/* SIOEMU specific hypercalls.
-   The numbers are the minor part of FW_HYPERCALL_SIOEMU.  */
-
-/* Defines the callback entry point.  r8=ip, r9=data.
-   Must be called per-vcpu.  */
-#define SIOEMU_HYPERCALL_SET_CALLBACK 0x01
-
-/* Finish sioemu fw initialization and start firmware.  r8=ip.  */
-#define SIOEMU_HYPERCALL_START_FW 0x02
-
-/* Add IO pages in physmap.  */
-#define SIOEMU_HYPERCALL_ADD_IO_PHYSMAP 0x03
-
-/* Get wallclock time.  */
-#define SIOEMU_HYPERCALL_GET_TIME 0x04
-
-/* Flush cache.  */
-#define SIOEMU_HYPERCALL_FLUSH_CACHE 0x07
-
-/* Get freq base.  */
-#define SIOEMU_HYPERCALL_FREQ_BASE 0x08
-
-/* Return from callback.  */
-#define SIOEMU_HYPERCALL_CALLBACK_RETURN 0x09
-
-/* Deliver an interrupt.  */
-#define SIOEMU_HYPERCALL_DELIVER_INT 0x0a
-
-/* SIOEMU callback reason.  */
-
-/* An event (from event channel) has to be delivered.  */
-#define SIOEMU_CB_EVENT       0x00
-
-/* Emulate an IO access.  */
-#define SIOEMU_CB_IO_EMULATE  0x01
-
-/* An IPI is sent to a dead vcpu.  */
-#define SIOEMU_CB_WAKEUP_VCPU 0x02
-
-/* A SAL hypercall is executed.  */
-#define SIOEMU_CB_SAL_ASSIST  0x03
-
-#ifndef __ASSEMBLY__
-struct sioemu_callback_info {
-    /* Saved registers.  */
-    unsigned long ip;
-    unsigned long psr;
-    unsigned long ifs;
-    unsigned long nats;
-    unsigned long r8;
-    unsigned long r9;
-    unsigned long r10;
-    unsigned long r11;
-
-    /* Callback parameters.  */
-    unsigned long cause;
-    unsigned long arg0;
-    unsigned long arg1;
-    unsigned long arg2;
-    unsigned long arg3;
-    unsigned long _pad2[2];
-    unsigned long r2;
-};
-#endif /* __ASSEMBLY__ */
-#endif /* __XEN_PUBLIC_IA64_SIOEMU_H__ */
diff --git a/sys/xen/xen_intr.h b/sys/xen/xen_intr.h
index 3b339a5d12bb..a1ff6666b17a 100644
--- a/sys/xen/xen_intr.h
+++ b/sys/xen/xen_intr.h
@@ -158,6 +158,18 @@ int xen_intr_alloc_and_bind_ipi(device_t dev, u_int cpu,
 	driver_filter_t filter, enum intr_type irqflags,
 	xen_intr_handle_t *handlep);
 
+/**
+ * Register a physical interrupt vector and setup the interrupt source.
+ *
+ * \param vector        The global vector to use.
+ * \param trig          Default trigger method.
+ * \param pol           Default polarity of the interrupt.
+ *
+ * \returns  0 on success, otherwise an errno.
+ */
+int xen_register_pirq(int vector, enum intr_trigger trig,
+	enum intr_polarity pol);
+
 /**
  * Unbind an interrupt handler from its interrupt source.
  *
diff --git a/usr.bin/csup/lister.h b/sys/xen/xen_pv.h
similarity index 85%
rename from usr.bin/csup/lister.h
rename to sys/xen/xen_pv.h
index a0a9bbe3556b..ffc7388aef8f 100644
--- a/usr.bin/csup/lister.h
+++ b/sys/xen/xen_pv.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2003-2004, Maxime Henrion <mux@FreeBSD.org>
+ * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@
  *    notice, this 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
+ * 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
@@ -25,9 +25,10 @@
  *
  * $FreeBSD$
  */
-#ifndef _LISTER_H_
-#define _LISTER_H_
 
-void	*lister(void *);
+#ifndef __XEN_PV_H__
+#define __XEN_PV_H__
 
-#endif /* !_LISTER_H_ */
+extern struct apic_ops xen_apic_ops;
+
+#endif
diff --git a/sys/xen/xenstore/xenstore.c b/sys/xen/xenstore/xenstore.c
index d404862ab55d..f7425da7b98f 100644
--- a/sys/xen/xenstore/xenstore.c
+++ b/sys/xen/xenstore/xenstore.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/stdarg.h>
 
 #include <xen/xen-os.h>
-#include <xen/gnttab.h>
 #include <xen/hypervisor.h>
 #include <xen/xen_intr.h>
 
@@ -229,13 +228,11 @@ struct xs_softc {
 	 */
 	struct sx xenwatch_mutex;
 
-#ifdef XENHVM
 	/**
 	 * The HVM guest pseudo-physical frame number.  This is Xen's mapping
 	 * of the true machine frame number into our "physical address space".
 	 */
 	unsigned long gpfn;
-#endif
 
 	/**
 	 * The event channel for communicating with the
@@ -1130,30 +1127,18 @@ xs_attach(device_t dev)
 	xs.xs_dev = dev;
 	device_set_softc(dev, &xs);
 
-	/*
-	 * This seems to be a layering violation.  The XenStore is just
-	 * one of many clients of the Grant Table facility.  It happens
-	 * to be the first and a gating consumer to all other devices,
-	 * so this does work.  A better place would be in the PV support
-	 * code for fully PV kernels and the xenpci driver for HVM kernels.
-	 */
-	error = gnttab_init();
-	if (error != 0) {
-		log(LOG_WARNING,
-		    "XENSTORE: Error initializing grant tables: %d\n", error);
-		return (ENXIO);
-	}
-
 	/* Initialize the interface to xenstore. */
 	struct proc *p;
 
-#ifdef XENHVM
-	xs.evtchn = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN);
-	xs.gpfn = hvm_get_parameter(HVM_PARAM_STORE_PFN);
-	xen_store = pmap_mapdev(xs.gpfn * PAGE_SIZE, PAGE_SIZE);
-#else
-	xs.evtchn = xen_start_info->store_evtchn;
-#endif
+	if (xen_hvm_domain()) {
+		xs.evtchn = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN);
+		xs.gpfn = hvm_get_parameter(HVM_PARAM_STORE_PFN);
+		xen_store = pmap_mapdev(xs.gpfn * PAGE_SIZE, PAGE_SIZE);
+	} else if (xen_pv_domain()) {
+		xs.evtchn = HYPERVISOR_start_info->store_evtchn;
+	} else {
+		panic("Unknown domain type, cannot initialize xenstore.");
+	}
 
 	TAILQ_INIT(&xs.reply_list);
 	TAILQ_INIT(&xs.watch_events);
@@ -1261,11 +1246,7 @@ static device_method_t xenstore_methods[] = {
 DEFINE_CLASS_0(xenstore, xenstore_driver, xenstore_methods, 0);
 static devclass_t xenstore_devclass; 
  
-#ifdef XENHVM
-DRIVER_MODULE(xenstore, xenpci, xenstore_driver, xenstore_devclass, 0, 0);
-#else
-DRIVER_MODULE(xenstore, nexus, xenstore_driver, xenstore_devclass, 0, 0);
-#endif
+DRIVER_MODULE(xenstore, xenpv, xenstore_driver, xenstore_devclass, 0, 0);
 
 /*------------------------------- Sysctl Data --------------------------------*/
 /* XXX Shouldn't the node be somewhere else? */
diff --git a/tools/bsdbox/Makefile b/tools/bsdbox/Makefile
index 2e3d6a3b4926..aaf6ab9ea352 100644
--- a/tools/bsdbox/Makefile
+++ b/tools/bsdbox/Makefile
@@ -57,7 +57,7 @@ CRUNCH_SRCDIRS+= bin
 # statically - and that ends very badly.
 CRUNCH_SHLIBS+=	-lc -lutil -lcrypt
 CRUNCH_LIBS+= -lkvm -lmemstat -lnetgraph
-CRUNCH_LIBS+= -lcrypt -ledit -ll -ltermcap
+CRUNCH_LIBS+= -lcrypt -ledit -ll -ltermcapw
 
 ###################################################################
 # Programs from standard /sbin
@@ -70,7 +70,7 @@ CRUNCH_LIBS+= -lcrypt -ledit -ll -ltermcap
 #
 CRUNCH_SRCDIRS+= sbin
 
-CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec
+CRUNCH_LIBS+= -lalias -lcam -lcursesw -ldevstat -lipsec
 # Don't forget this - ifconfig, etc -adrian
 CRUNCH_LIBS+= -lgeom -lbsdxml -ljail -lkiconv -lmd -lsbuf -lufs
 
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 82e0b9b28d32..d3cf72f1d994 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1283,8 +1283,6 @@ OLD_FILES+=usr/include/gcc/4.2/pmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/tmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/wmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/xmmintrin.h
-.elif ${TARGET_ARCH} == "ia64"
-OLD_FILES+=usr/include/gcc/4.2/ia64intrin.h
 .elif ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
 .elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
@@ -1833,6 +1831,9 @@ OLD_DIRS+=usr/share/tmac
 .endif
 
 .if ${MK_GSSAPI} == no
+OLD_FILES+=usr/include/gssapi/gssapi.h
+OLD_DIRS+=usr/include/gssapi
+OLD_FILES+=usr/include/gssapi.h
 OLD_FILES+=usr/lib/libgssapi.a
 OLD_FILES+=usr/lib/libgssapi.so
 OLD_LIBS+=usr/lib/libgssapi.so.10
@@ -1976,9 +1977,39 @@ OLD_FILES+=usr/share/man/man8/traceroute6.8.gz
 OLD_FILES+=rescue/ping6
 .endif
 
-#.if ${MK_INFO} == no
-# to be filled in
-#.endif
+.if ${MK_INFO} == no
+OLD_FILES+=usr/bin/info
+OLD_FILES+=usr/bin/infokey
+OLD_FILES+=usr/bin/install-info
+OLD_FILES+=usr/bin/makeinfo
+OLD_FILES+=usr/bin/texindex
+OLD_FILES+=usr/share/info/am-utils.info.gz
+OLD_FILES+=usr/share/info/as-utils.info.gz
+OLD_FILES+=usr/share/info/binutils.info.gz
+OLD_FILES+=usr/share/info/com_err.info.gz
+OLD_FILES+=usr/share/info/diff.info.gz
+OLD_FILES+=usr/share/info/gdb.info.gz
+OLD_FILES+=usr/share/info/gdbint.info.gz
+OLD_FILES+=usr/share/info/gperf.info.gz
+OLD_FILES+=usr/share/info/grep.info.gz
+OLD_FILES+=usr/share/info/groff.info.gz
+OLD_FILES+=usr/share/info/heimdal.info.gz
+OLD_FILES+=usr/share/info/history.info.gz
+OLD_FILES+=usr/share/info/info-stnd.info.gz
+OLD_FILES+=usr/share/info/info.info.gz
+OLD_FILES+=usr/share/info/ld.info.gz
+OLD_FILES+=usr/share/info/regex.info.gz
+OLD_FILES+=usr/share/info/rluserman.info.gz
+OLD_FILES+=usr/share/info/stabs.info.gz
+OLD_FILES+=usr/share/info/texinfo.info.gz
+OLD_FILES+=usr/share/man/man1/info.1.gz
+OLD_FILES+=usr/share/man/man1/infokey.1.gz
+OLD_FILES+=usr/share/man/man1/install-info.1.gz
+OLD_FILES+=usr/share/man/man1/makeinfo.1.gz
+OLD_FILES+=usr/share/man/man1/texindex.1.gz
+OLD_FILES+=usr/share/man/man5/info.5.gz
+OLD_FILES+=usr/share/man/man5/texinfo.5.gz
+.endif
 
 .if ${MK_IPFILTER} == no
 OLD_FILES+=etc/periodic/security/510.ipfdenied
@@ -3357,9 +3388,10 @@ OLD_FILES+=var/yp/Makefile
 OLD_FILES+=var/yp/Makefile.dist
 .endif
 
-#.if ${MK_NLS} == no
+.if ${MK_NLS} == no
+OLD_FILES+=usr/tests/bin/sh/builtins/locale1.0
 # to be filled in
-#.endif
+.endif
 
 .if ${MK_NTP} == no
 OLD_FILES+=etc/ntp.conf
@@ -3699,7 +3731,6 @@ OLD_FILES+=usr/lib/libpcap_p.a
 OLD_FILES+=usr/lib/libpmc_p.a
 OLD_FILES+=usr/lib/libpthread_p.a
 OLD_FILES+=usr/lib/libradius_p.a
-OLD_FILES+=usr/lib/libreadline_p.a
 OLD_FILES+=usr/lib/libroken_p.a
 OLD_FILES+=usr/lib/librpcsvc_p.a
 OLD_FILES+=usr/lib/librt_p.a
@@ -4136,6 +4167,9 @@ OLD_FILES+=usr/share/aclocal/atf-c.m4
 OLD_FILES+=usr/share/aclocal/atf-common.m4
 OLD_FILES+=usr/share/aclocal/atf-sh.m4
 OLD_DIRS+=usr/share/aclocal
+OLD_FILES+=usr/tests/bin/chown/units_basics
+OLD_FILES+=usr/tests/bin/date/legacy_test
+OLD_FILES+=usr/tests/bin/sh/legacy_test
 OLD_FILES+=usr/tests/usr.bin/atf/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/atf_check_test
@@ -4543,6 +4577,24 @@ OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod
 OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd
 OLD_DIRS+=usr/tests/usr.bin/make/archives
 OLD_DIRS+=usr/tests/usr.bin/make
+OLD_FILES+=usr/tests/usr.bin/yacc/legacy_test
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.00.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.01.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.02.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.03.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.04.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.05.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.06.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.07.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.08.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.09.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.10.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.11.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.12.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.13.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.14.out
+OLD_FILES+=usr/tests/usr.bin/yacc/regress.sh
+OLD_FILES+=usr/tests/usr.bin/yacc/undefined.y
 .endif
 .else
 # ATF libraries.
@@ -4689,6 +4741,7 @@ OLD_FILES+=usr/bin/svnliterdump
 OLD_FILES+=usr/bin/svnliteserve
 OLD_FILES+=usr/bin/svnlitesync
 OLD_FILES+=usr/bin/svnliteversion
+OLD_FILES+=usr/share/man/man1/svnlite.1.gz
 .endif
 
 .if ${MK_SVN} == no
diff --git a/tools/build/options/WITHOUT_TESTS b/tools/build/options/WITHOUT_TESTS
new file mode 100644
index 000000000000..4d58f9abedc7
--- /dev/null
+++ b/tools/build/options/WITHOUT_TESTS
@@ -0,0 +1,9 @@
+.\" $FreeBSD$
+Set to not build nor install the
+.Fx
+Test Suite in
+.Pa /usr/tests/ .
+See
+.Xr tests 7
+for more details.
+This also disables the build of all test-related dependencies, including ATF.
diff --git a/tools/build/options/WITHOUT_VT_SUPPORT b/tools/build/options/WITHOUT_VT
similarity index 53%
rename from tools/build/options/WITHOUT_VT_SUPPORT
rename to tools/build/options/WITHOUT_VT
index b517e0c5b484..ea01349fe617 100644
--- a/tools/build/options/WITHOUT_VT_SUPPORT
+++ b/tools/build/options/WITHOUT_VT
@@ -1,4 +1,4 @@
 .\" $FreeBSD$
 Set to not build
 .Xr vt 4
-support files (fonts).
+support files (fonts and keymaps).
diff --git a/tools/build/options/WITH_INFO b/tools/build/options/WITH_INFO
new file mode 100644
index 000000000000..01c82916ffa1
--- /dev/null
+++ b/tools/build/options/WITH_INFO
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to make or install
+.Xr info 5
+files.
diff --git a/tools/build/options/WITH_TESTS b/tools/build/options/WITH_TESTS
deleted file mode 100644
index acc9f19ab227..000000000000
--- a/tools/build/options/WITH_TESTS
+++ /dev/null
@@ -1,8 +0,0 @@
-.\" $FreeBSD$
-Set to install the
-.Fx
-Test Suite in
-.Pa /usr/tests/ .
-See
-.Xr tests 7
-for more details.
diff --git a/tools/ifnet/convert_drvapi.sh b/tools/ifnet/convert_drvapi.sh
index bdd58ecd73ea..dd30c7a229e0 100755
--- a/tools/ifnet/convert_drvapi.sh
+++ b/tools/ifnet/convert_drvapi.sh
@@ -94,7 +94,7 @@ handle_set() {
 
 handle_inc() {
 	line=$1	
-	inc=`echo $line | grep "$__ifp__->.*++"`
+	inc=`echo $line | grep "$__ifp__->.*++\|++$__ifp__->.*"`
 	if [ ! -z "$inc" ]
 	then
 		word=`echo $line | awk -F"if_" '{ print $2 }'|awk -F"\+" '{ print $1}'`
@@ -161,6 +161,17 @@ handle_and() {
 
 }
 
+handle_toggle() {
+	line=$1
+	if [ ! -z `echo $line | grep "\^="` ]
+	then
+		line=`echo $line | sed -e 's/'"$__ifp__"'->if_\(.*\) ^=\(.*\);/if_toggle\1('"$__ifp__"',\2);/g'`
+		return 0;
+	fi
+	return 1
+
+}
+
 # XXX - this needs updating
 handle_misc() {
 	line=$1
@@ -179,6 +190,35 @@ handle_misc() {
 
 }
 
+replace_str ()
+{
+	line=$1
+	orig=$2
+	new=$3
+	line=`echo $line | sed -e 's/'"$orig"'\(.*\)/'"$new"'\1/g'`
+	return 0;
+}
+
+# Handle special cases which do not fall under regular patterns
+handle_special ()
+{
+	line=$1
+	replace_str $line "(\*$__ifp__->if_input)" "if_input"
+	replace_str $line "if_setinit" "if_setinitfn"
+	replace_str $line "if_setioctl" "if_setioctlfn"
+	replace_str $line "if_getdrv_flags" "if_getdrvflags"
+	replace_str $line "if_setdrv_flagsbit" "if_setdrvflagbits"
+	replace_str $line "if_setstart" "if_setstartfn"
+	replace_str $line "if_sethwassistbit" "if_sethwassistbits"
+	replace_str $line "ifmedia_init" "ifmedia_init_drv"
+	replace_str $line "IFQ_DRV_IS_EMPTY(&$__ifp__->if_snd)" "if_sendq_empty($__ifp__)"
+	replace_str $line "IFQ_DRV_PREPEND(&$__ifp__->if_snd" "if_sendq_prepend($__ifp__"
+	replace_str $line "IFQ_SET_READY(&ifp->if_snd)" "if_setsendqready($__ifp__)"
+	line=`echo $line | sed -e 's/IFQ_SET_MAXLEN(&'$__ifp__'->if_snd, \(.*\))/if_setsendqlen('$__ifp__', \1)/g'`
+	line=`echo $line | sed -e 's/IFQ_DRV_DEQUEUE(&'$__ifp__'->if_snd, \(.*\))/\1 = if_dequeue('$__ifp__')/g'`
+	return 0
+}
+
 if [ -e $file.tmp ]
 then
 	rm $file.tmp
@@ -201,9 +241,9 @@ do
 	fi
 
 	handle_set $line
-	
+
 	if [ $? != 0 ]
-		then 
+	then 
 		handle_inc $line
 	fi
 
@@ -223,19 +263,26 @@ do
 	fi
 
 	if [ $? != 0 ]
+	then
+		handle_toggle $line
+	fi
 
+	if [ $? != 0 ]
 	then
 		handle_misc $line
 	fi
 	
 	if [ $? != 0 ]
 	then
-		if [ ! -z `echo $line | grep "$__ifp__->"` ]
-		then
-			line=`echo $line | sed -e 's:$: \/* '${FAIL_PAT}' *\/:g'`
-		fi
+		handle_special $line
+	fi	
+
+	if [ ! -z `echo $line | grep "$__ifp__->"` ]
+	then
+		line=`echo $line | sed -e 's:$: \/* '${FAIL_PAT}' *\/:g'`
 	fi
 done
+	line=`echo "$line" | sed -e 's:VLAN_CAPABILITIES('$__ifp__'):if_vlancap('$__ifp__'):g'`
 	# Replace the ifnet * with if_t
 	if [ ! -z `echo $line | grep "struct ifnet"` ]
 	then
diff --git a/tools/regression/README b/tools/regression/README
index 87e4ab335305..a2de3721f834 100644
--- a/tools/regression/README
+++ b/tools/regression/README
@@ -77,7 +77,6 @@ this file.
 
 acct		Exercise the integer to float conversion used in acct(5)
 geom		Some tests and an out-of-kernel simulator for the GEOM code
-ia64		ia64 specific regression tests
 nfsmmap		Some tests to exercise some tricky cases in NFS and mmap
 p1003_1b	Exercise 1003.1B scheduler
 pipe		Pipe code regression test
diff --git a/tools/regression/file/flock/flock.c b/tools/regression/file/flock/flock.c
index c411853b1775..fd426b0e625b 100644
--- a/tools/regression/file/flock/flock.c
+++ b/tools/regression/file/flock/flock.c
@@ -27,6 +27,7 @@
  * $FreeBSD$
  */
 
+#include <sys/file.h>
 #include <sys/time.h>
 #ifdef __FreeBSD__
 #include <sys/mount.h>
@@ -39,6 +40,7 @@
 #include <fcntl.h>
 #include <pthread.h>
 #include <signal.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -51,9 +53,13 @@
 #include <sys/cdefs.h>
 #else
 #ifndef __unused
+#ifdef __GNUC__
+#define	__unused	__attribute__((__unused__))
+#else
 #define __unused
 #endif
 #endif
+#endif
 
 int verbose = 0;
 
@@ -1329,7 +1335,6 @@ test15(int fd, __unused int argc, const __unused char **argv)
 	 */
 	int pid;
 	int pfd[2];
-	int fd2;
 	struct flock fl;
 	char ch;
 	int res;
@@ -1366,7 +1371,7 @@ test15(int fd, __unused int argc, const __unused char **argv)
 	if (read(pfd[0], &ch, 1) != 1)
 		err(1, "reading from pipe (child)");
 
-	fd2 = dup(fd);
+	(void)dup(fd);
 	if (flock(fd, LOCK_SH) < 0)
 		err(1, "flock shared");
 
diff --git a/tools/regression/filemon/Makefile b/tools/regression/filemon/Makefile
index 6ee88f44505d..3911d33899f2 100644
--- a/tools/regression/filemon/Makefile
+++ b/tools/regression/filemon/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
+.if ${MACHINE_ARCH} == "amd64"
 BI_BITS=
 .endif
 
diff --git a/tools/regression/ia64/emulated/brl.t b/tools/regression/ia64/emulated/brl.t
deleted file mode 100644
index c47989cf016a..000000000000
--- a/tools/regression/ia64/emulated/brl.t
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env perl -w
-#
-# Copyright (c) 2006 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$
-
-my $srcdir = `dirname $0`;
-chomp $srcdir;
-
-my @types = ("Call", "Cond");
-my @preds = ("False", "True");
-my %variant_mapping = (
-	"Call" => "",
-	"Cond" => "Backward Forward"
-);
-
-sub run ($$$$) {
-    local ($nr, $type, $pred, $var) = @_;
-    local $test = "${type}_${pred}_${var}";
-    local $tmpfile = "/tmp/" . $$ . "_$test";
-    local $st;
-
-    $st = system("cc -o $tmpfile -DTYPE=$type -DPRED=$pred -DVAR=$var -Wall -O1 -g $srcdir/test.c");
-    if ($st != 0) {
-        print "not ok $nr $test # compiling $test\n";
-    }
-    else {
-        $st = system($tmpfile);
-        if ($st == 0) {
-            print "ok $nr $test\n";
-        }
-        elsif ($st == 256) {
-            print "not ok $nr $test # invalid combination\n";
-        }
-        elsif ($st == 512) {
-            print "not ok $nr $test # long branch failure\n";
-        }
-        else {
-            print "not ok $nr $test # signalled (exit status $st)\n";
-            return; # Preserve the executable
-        }
-    }
-    unlink $tmpfile;
-}
-
-#
-# We can only test the long brach emulation on the Merced processor.
-# Check for that and skip these tests if it's not...
-#
-$_ = `sysctl -n hw.model`;
-if (! /^Merced$/) {
-    print "1..0 # SKIP This test can only be run on the Merced\n";
-    exit 0;
-}
-
-#
-# Get the total number of tests we're going to perform.
-#
-my $count = 0;
-foreach $type (@types) {
-    my @variants = split(/ /, $variant_mapping{$type});
-    $count += @preds * @variants;
-}
-
-print "1..$count\n";
-
-my $nr=0;
-foreach $type (@types) {
-    my @variants = split(/ /, $variant_mapping{$type});
-    foreach $pred (@preds) {
-	foreach $var (@variants) {
-	    run ++$nr, $type, $pred, $var;
-        }
-    }
-}
-
-exit 0;
diff --git a/tools/regression/ia64/emulated/test.c b/tools/regression/ia64/emulated/test.c
deleted file mode 100644
index 35d4b05cf571..000000000000
--- a/tools/regression/ia64/emulated/test.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2006 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$
- */
-
-#include <sys/mman.h>
-#include <stdio.h>
-#include <string.h>
-
-/* Supported long branch types */
-#define	Call		1
-#define	Cond		2
-
-/* Supported predicates */
-#define	False		1
-#define	True		2
-
-/* Supported variations */
-#define	Backward	1
-#define	Forward		2
-
-#if TYPE == 0 || PRED == 0 || VAR == 0
-#error Define TYPE, PRED and/or VAR
-#endif
-
-union bundle {
-	unsigned char bytes[16];
-	long double _align;
-};
-
-/*
- * Machine code of a bundle containing a long branch. The predicate of the
- * long branch is the result of the compare in the first slot.
- * The assembly of the bundle is:
- *	{	.mlx
- *		cmp.eq		p0,p15= <PREDICATE>,r0
- *	  (p15)	brl.few		<TARGET> ;;
- *	}
- * the predicate is written to bit 18:1
- * The branch target is written to bits 100:20, 48:39 and 123:1
- */
-unsigned char mc_brl_cond[16] = {
-	0x05, 0x00, 0x00, 0x00, 0x0f, 0x39,
-	0x00, 0x00, 0x00, 0x00, 0x80, 0x07,
-	0x00, 0x00, 0x00, 0xc0 
-};
-
-/*
- * Machine code of the epilogue of a typical function returning an integer.
- * The assembly of the epilogue is:
- *	{	.mib
- *		nop.m		0
- *		addl		r8 = <RETVAL>, r0
- *		br.ret.sptk.few b0 ;;
- *	}
- * The return value is written to bits 59:7, 73:9, 68:5, and 82:1.
- */
-unsigned char mc_epilogue[16] = {
-	0x11, 0x00, 0x00, 0x00, 0x01, 0x00,
-	0x80, 0x00, 0x00, 0x00, 0x48, 0x80,
-	0x00, 0x00, 0x84, 0x00
-};
-
-void
-mc_patch(union bundle *b, unsigned long val, int start, int len)
-{
-	unsigned long mask;
-	int bit, byte, run;
-
-	byte = start >> 3;
-	bit = start & 7;
-	while (len) {
-		run = ((len > (8 - bit)) ? (8 - bit) : len);
-		mask = (1UL << run) - 1UL;
-		b->bytes[byte] |= (val & mask) << bit;
-		val >>= run;
-		len -= run;
-		byte++;
-		bit = 0;
-	}
-}
-
-void
-assemble_brl_cond(union bundle *b, int pred, unsigned long tgt)
-{
-	unsigned long iprel;
-
-	iprel = tgt - (unsigned long)b;
-	memcpy(b->bytes, mc_brl_cond, sizeof(mc_brl_cond));
-	mc_patch(b, pred ? 1 : 0, 18, 1);
-	mc_patch(b, iprel >> 4, 100, 20);
-	mc_patch(b, iprel >> 24, 48, 39);
-	mc_patch(b, iprel >> 63, 123, 1);
-}
-
-void
-assemble_epilogue(union bundle *b, int retval)
-{
-	memcpy(b->bytes, mc_epilogue, sizeof(mc_epilogue));
-	mc_patch(b, retval, 59, 7);
-	mc_patch(b, retval >> 7, 73, 9);
-	mc_patch(b, retval >> 16, 68, 5);
-	mc_patch(b, retval >> 21, 82, 1);
-}
-
-int
-doit(void *addr)
-{
-	asm("mov b6 = %0; br.sptk b6;;" :: "r"(addr));
-	return 1;
-}
-
-int
-test_cond(int pred, union bundle *src, union bundle *dst)
-{
-	assemble_epilogue(dst, pred ? 0 : 2);
-	assemble_brl_cond(src, pred ? 1 : 0, (unsigned long)dst);
-	assemble_epilogue(src + 1, !pred ? 0 : 2);
-	return doit(src);
-}
-
-int
-main()
-{
-	static union bundle blob_low[2];
-	union bundle *blob_high;
-	void *addr;
-
-	addr = (void *)0x7FFFFFFF00000000L;
-	blob_high = mmap(addr, 32, PROT_EXEC | PROT_READ | PROT_WRITE,
-	    MAP_ANON, -1, 0L);
-	if (blob_high != addr)
-		printf("NOTICE: blob_high is at %p, not at %p\n", blob_high,
-		    addr);
-
-#if TYPE == Call
-	return (test_call(blob_high, blob_low));
-#elif TYPE == Cond
-  #if VAR == Forward
-	return (test_cond(PRED - 1, blob_low, blob_high));
-  #elif VAR == Backward
-	return (test_cond(PRED - 1, blob_high, blob_low));
-  #else
-	return (1);
-  #endif
-#else
-	return (1);
-#endif
-}
diff --git a/tools/regression/ia64/unaligned/test.c b/tools/regression/ia64/unaligned/test.c
deleted file mode 100644
index 869c86436b80..000000000000
--- a/tools/regression/ia64/unaligned/test.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * 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$
- */
-
-#include <machine/float.h>
-#include <string.h>
-
-/* Memory accesses. */
-#define	Load			0x01
-#define	Store			0x02
-
-/* Data type. */
-#define	Integer			0x11
-#define	FloatingPoint		0x12
-
-/* Data size. */
-#define	Small			0x21
-#define	Medium			0x22
-#define	Large			0x23
-
-/* Post increment. */
-#define	NoPostInc		0x31
-#define	MinConstPostInc		0x32
-#define	PlusConstPostInc	0x33
-#define	ScratchRegPostInc	0x34
-#define	PreservedRegPostInc	0x35
-
-#if ACCESS == 0 || TYPE == 0 || SIZE == 0 || POSTINC == 0
-#error define ACCESS, TYPE, SIZE and/or POSTINC
-#endif
-
-#if TYPE == Integer
-#  define	REG		"r8"
-#  if SIZE == Small
-#    define	DATA_TYPE	short
-#    define	DATA_VALUE	0x1234
-#    define	LD		"ld2"
-#    define	ST		"st2"
-#  elif SIZE == Medium
-#    define	DATA_TYPE	int
-#    define	DATA_VALUE	0x12345678
-#    define	LD		"ld4"
-#    define	ST		"st4"
-#  elif SIZE == Large
-#    define	DATA_TYPE	long
-#    define	DATA_VALUE	0x1234567890ABCDEF
-#    define	LD		"ld8"
-#    define	ST		"st8"
-#  endif
-#elif TYPE == FloatingPoint
-#  define	REG		"f6"
-#  if SIZE == Small
-#    define	DATA_TYPE	float
-#    define	DATA_VALUE	FLT_MIN
-#    define	LD		"ldfs"
-#    define	ST		"stfs"
-#  elif SIZE == Medium
-#    define	DATA_TYPE	double
-#    define	DATA_VALUE	DBL_MIN
-#    define	LD		"ldfd"
-#    define	ST		"stfd"
-#  elif SIZE == Large
-#    define	DATA_TYPE	long double
-#    define	DATA_VALUE	LDBL_MIN
-#    define	LD		"ldfe"
-#    define	ST		"stfe"
-#  endif
-#endif
-
-struct {
-	DATA_TYPE aligned;
-	char _;
-	char misaligned[sizeof(DATA_TYPE)];
-} data;
-
-DATA_TYPE *aligned = &data.aligned;
-DATA_TYPE *misaligned = (DATA_TYPE *)data.misaligned;
-DATA_TYPE value = DATA_VALUE;
-
-void
-block_copy(void *dst, void *src, size_t sz)
-{
-
-	memcpy(dst, src, sz);
-}
-
-int
-main()
-{
-
-	/* Set PSR.ac. */
-	asm volatile("sum 8");
-
-#if ACCESS == Load
-	/*
-	 * LOAD
-	 */
-	block_copy(misaligned, &value, sizeof(DATA_TYPE));
-
-#  if POSTINC == NoPostInc
-	/* Misaligned load. */
-	*aligned = *misaligned;
-#  elif POSTINC == MinConstPostInc
-	asm volatile(
-		"ld8 r2=%0;;"
-		LD " " REG "=[r2],%2;;"
-		"st8 %0=r2;" ST " %1=" REG ";;"
-	    : "=m"(misaligned), "=m"(*aligned)
-	    : "i"(-sizeof(DATA_TYPE))
-	    : REG, "r2", "memory");
-#  elif POSTINC == PlusConstPostInc
-	asm volatile(
-		"ld8 r2=%0;;"
-		LD " " REG "=[r2],%2;;"
-		"st8 %0=r2;" ST " %1=" REG ";;"
-	    : "=m"(misaligned), "=m"(*aligned)
-	    : "i"(sizeof(DATA_TYPE))
-	    : REG, "r2", "memory");
-#  elif POSTINC == ScratchRegPostInc
-	asm volatile(
-		"ld8 r2=%0; mov r3=%2;;"
-		LD " " REG "=[r2],r3;;"
-		"st8 %0=r2;" ST " %1=" REG ";;"
-	    : "=m"(misaligned), "=m"(*aligned)
-	    : "i"(sizeof(DATA_TYPE))
-	    : REG, "r2", "r3", "memory");
-#  elif POSTINC == PreservedRegPostInc
-	asm volatile(
-		"ld8 r2=%0; mov r4=%2;;"
-		LD " " REG "=[r2],r4;;"
-		"st8 %0=r2;" ST " %1=" REG ";;"
-	    : "=m"(misaligned), "=m"(*aligned)
-	    : "i"(sizeof(DATA_TYPE))
-	    : REG, "r2", "r4", "memory");
-#  endif
-
-#elif ACCESS == Store
-	/*
-	 * STORE
-	 */
-
-#  if POSTINC == NoPostInc
-	/* Misaligned store. */
-	*misaligned = value;
-#  elif POSTINC == MinConstPostInc
-	asm volatile(
-		"ld8 r2=%0;" LD " " REG "=%1;;"
-		ST " [r2]=" REG ",%2;;"
-		"st8 %0=r2;;"
-	    : "=m"(misaligned)
-	    : "m"(value), "i"(-sizeof(DATA_TYPE))
-	    : REG, "r2", "memory");
-#  elif POSTINC == PlusConstPostInc
-	asm volatile(
-		"ld8 r2=%0;" LD " " REG "=%1;;"
-		ST " [r2]=" REG ",%2;;"
-		"st8 %0=r2;;"
-	    : "=m"(misaligned)
-	    : "m"(value), "i"(sizeof(DATA_TYPE))
-	    : REG, "r2", "memory");
-#  elif POSTINC == ScratchRegPostInc || POSTINC == PreservedRegPostInc
-	return (1);
-#  endif
-
-	block_copy(aligned, data.misaligned, sizeof(DATA_TYPE));
-#endif
-
-	if (*aligned != value)
-		return (2);
-
-#if POSTINC == NoPostInc
-	return (0);
-#elif POSTINC == MinConstPostInc
-	return (((char *)misaligned == data.misaligned - sizeof(DATA_TYPE))
-	    ? 0 : 4);
-#else
-	return (((char *)misaligned == data.misaligned + sizeof(DATA_TYPE))
-	    ? 0 : 4);
-#endif
-}
diff --git a/tools/regression/ia64/unaligned/unaligned.t b/tools/regression/ia64/unaligned/unaligned.t
deleted file mode 100644
index 5d061bdef574..000000000000
--- a/tools/regression/ia64/unaligned/unaligned.t
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env perl -w
-#
-# 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$
-
-my $srcdir = `dirname $0`;
-chomp $srcdir;
-
-my @accesses = ("Load", "Store");
-my @types = ("Integer", "FloatingPoint");
-my @sizes = ("Small", "Medium", "Large");
-my @postincs = ("NoPostInc", "MinConstPostInc", "PlusConstPostInc",
-		"ScratchRegPostInc", "PreservedRegPostInc");
-
-sub run ($$$$$) {
-    local ($nr, $access, $type, $size, $postinc) = @_;
-    local $test = "${access}_${type}_${size}_${postinc}";
-    local $tmpfile = "/tmp/" . $$ . "_$test";
-    local $st;
-
-    $st = system("cc -o $tmpfile -DACCESS=$access -DTYPE=$type -DSIZE=$size -DPOSTINC=$postinc -Wall -O -g $srcdir/test.c");
-    if ($st != 0) {
-	print "not ok $nr $test # compiling $test\n";
-    }
-    else {
-	$st = system($tmpfile);
-	if ($st == 0) {
-	    print "ok $nr $test\n";
-	}
-	elsif ($st == 256) {
-	    print "not ok $nr $test # invalid combination\n";
-	}
-	elsif ($st == 512) {
-	    print "not ok $nr $test # value mismatch\n";
-	}
-	elsif ($st == 1024) {
-	    print "not ok $nr $test # post increment mismatch\n";
-	}
-	else {
-	    print "not ok $nr $test # signalled (exit status $st)\n";
-	    return; # Preserve the executable
-	}
-    }
-    unlink $tmpfile;
-}
-
-system("sysctl debug.unaligned_test=1");
-if (`sysctl -n debug.unaligned_test` != "1") {
-    print "1..0 # SKIP The debug.unaligned_test sysctl could not be set\n";
-    exit 0;
-}
-
-my $count = @accesses * @types * @sizes * @postincs;
-
-# There's no register based post inc. for stores.
-$count -= 12;
-
-print "1..$count\n";
-
-my $nr=0;
-foreach $access (@accesses) {
-    foreach $postinc (@postincs) {
-	$_ = "$access $postinc";
-	if (! /Store.+RegPostInc/) {
-	    foreach $type (@types) {
-		foreach $size (@sizes) {
-		    run ++$nr, $access, $type, $size, $postinc;
-		}
-	    }
-	}
-    }
-}
-
-system("sysctl debug.unaligned_test=0");
-
-exit 0;
diff --git a/tools/regression/lib/libmp/Makefile b/tools/regression/lib/libmp/Makefile
deleted file mode 100644
index a6f60b63bdbd..000000000000
--- a/tools/regression/lib/libmp/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-TESTS=	test-libmp
-CFLAGS+= -g -Wall -lcrypto -lmp
-
-.PHONY: tests
-tests: ${TESTS}
-	for p in ${TESTS}; do ${.OBJDIR}/$$p; done
-
-.PHONY: clean
-clean:
-	-rm -f ${TESTS}
diff --git a/tools/regression/lib/libmp/test-libmp.t b/tools/regression/lib/libmp/test-libmp.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/libmp/test-libmp.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/libnv/Makefile b/tools/regression/lib/libnv/Makefile
deleted file mode 100644
index a64cb63fbe66..000000000000
--- a/tools/regression/lib/libnv/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $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/libutil/Makefile b/tools/regression/lib/libutil/Makefile
deleted file mode 100644
index 229b4d264ebe..000000000000
--- a/tools/regression/lib/libutil/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-TESTS=	test-trimdomain test-trimdomain-nodomain test-flopen test-grp \
-	test-pidfile test-humanize_number
-CFLAGS+= -g -Wall -Wextra -Werror -lutil
-
-.PHONY: tests
-tests: ${TESTS}
-	for p in ${TESTS}; do ${.OBJDIR}/$$p; done
-
-.PHONY: clean
-clean:
-	-rm -f ${TESTS}
diff --git a/tools/regression/lib/libutil/test-flopen.t b/tools/regression/lib/libutil/test-flopen.t
deleted file mode 100644
index cbb7c8cfed26..000000000000
--- a/tools/regression/lib/libutil/test-flopen.t
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-base=$(realpath $(dirname $0))
-name=$(basename $0 .t)
-
-set -e
-cd $base
-make -s $name >/dev/null
-exec $base/$name
diff --git a/tools/regression/lib/libutil/test-grp.t b/tools/regression/lib/libutil/test-grp.t
deleted file mode 100644
index cbb7c8cfed26..000000000000
--- a/tools/regression/lib/libutil/test-grp.t
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-base=$(realpath $(dirname $0))
-name=$(basename $0 .t)
-
-set -e
-cd $base
-make -s $name >/dev/null
-exec $base/$name
diff --git a/tools/regression/lib/libutil/test-humanize_number.t b/tools/regression/lib/libutil/test-humanize_number.t
deleted file mode 100755
index 516bc4c25757..000000000000
--- a/tools/regression/lib/libutil/test-humanize_number.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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/lib/libutil/test-trimdomain-nodomain.t b/tools/regression/lib/libutil/test-trimdomain-nodomain.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/libutil/test-trimdomain-nodomain.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/lib/libutil/test-trimdomain.t b/tools/regression/lib/libutil/test-trimdomain.t
deleted file mode 100644
index 8bdfd03be81b..000000000000
--- a/tools/regression/lib/libutil/test-trimdomain.t
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-cd `dirname $0`
-
-executable=`basename $0 .t`
-
-make $executable 2>&1 > /dev/null
-
-exec ./$executable
diff --git a/tools/regression/net80211/ccmp/test_ccmp.c b/tools/regression/net80211/ccmp/test_ccmp.c
index d78be95fde82..058e7289a0ac 100644
--- a/tools/regression/net80211/ccmp/test_ccmp.c
+++ b/tools/regression/net80211/ccmp/test_ccmp.c
@@ -680,7 +680,7 @@ runtest(struct ieee80211com *ic, struct ciphertest *t)
 		printf("FAIL: decap botch; data does not compare\n");
 		printtest(t);
 		cmpfail(mtod(m, const void *), m->m_pkthdr.len,
-			t->plaintext, sizeof(t->plaintext));
+			t->plaintext, t_plaintext_len);
 		goto bad;
 	}
 	m_freem(m);
diff --git a/tools/regression/net80211/wep/test_wep.c b/tools/regression/net80211/wep/test_wep.c
index b498195c2c1d..ba6cd46d6895 100644
--- a/tools/regression/net80211/wep/test_wep.c
+++ b/tools/regression/net80211/wep/test_wep.c
@@ -242,7 +242,7 @@ runtest(struct ieee80211com *ic, struct ciphertest *t)
 	} else if (memcmp(mtod(m, const void *), t->plaintext, t->plaintext_len)) {
 		printf("FAIL: decap botch; data does not compare\n");
 		cmpfail(mtod(m, const void *), m->m_pkthdr.len,
-			t->plaintext, sizeof(t->plaintext));
+			t->plaintext, t->plaintext_len);
 		goto bad;
 	}
 
diff --git a/tools/test/dtrace/Makefile b/tools/test/dtrace/Makefile
index b14ccab1e71a..012a116097f6 100644
--- a/tools/test/dtrace/Makefile
+++ b/tools/test/dtrace/Makefile
@@ -337,7 +337,7 @@ listprgs	:
 
 .for _f in ${ALL_TESTCFILES}
 ${_f:T:S/c$/exe/} : ${_f}
-	gcc -o ${.TARGET} ${_f} -lrt
+	${CC} -o ${.TARGET} ${_f} -lrt
 .endfor
 
 .for _f in ${ALL_TESTEXEFILES}
diff --git a/tools/test/netfibs/reflect.c b/tools/test/netfibs/reflect.c
index 3790617b1a49..47c7846948df 100644
--- a/tools/test/netfibs/reflect.c
+++ b/tools/test/netfibs/reflect.c
@@ -94,7 +94,7 @@ reflect_conn(int s, char *buf, size_t buflen, ssize_t l, struct sockaddr *sa,
 		fprintf(stderr, "<< %s: %s\n", testcase, buf);
 
 	if (reflectfib != (u_int)-1)
-		l = snprintf(buf, sizeof(buf), "FIB %u\n", reflectfib);
+		l = snprintf(buf, buflen, "FIB %u\n", reflectfib);
 
 	/* If debug is on, log. */
 	if (debug > 0) {
diff --git a/tools/tools/README b/tools/tools/README
index ef05ee017c43..44d13bd9fd0e 100644
--- a/tools/tools/README
+++ b/tools/tools/README
@@ -55,7 +55,6 @@ pciid		Generate src/share/misc/pci_vendors.
 pciroms		A tool for dumping PCI ROM images. WARNING: alpha quality.
 pirtool		A tool for dumping the $PIR table on i386 machines at runtime.
 portsinfo 	Generate list of new ports for last two weeks.
-prstats		Generate statistics about the PR database.
 recoverdisk	Copy as much data as possible from a defective disk.
 scsi-defects	Get at the primary or grown defect list of a SCSI disk.
 sysdoc		Build a manual page with available sysctls for a specific
diff --git a/tools/tools/ath/Makefile b/tools/tools/ath/Makefile
index 99dc58889ecb..b17f4c4b2dcc 100644
--- a/tools/tools/ath/Makefile
+++ b/tools/tools/ath/Makefile
@@ -1,6 +1,6 @@
 #	$FreeBSD$
 
-SUBDIR=	arcode athdebug athdecode athkey athpoke athprom athrd athregs
+SUBDIR=	arcode athdebug athdecode athkey athpoke athprom athrd athregs athalq
 SUBDIR+=	athstats ath_prom_read athradar athaggrstats
 SUBDIR+=	ath_ee_v14_print ath_ee_v4k_print ath_ee_9287_print ath_ee_9300_print
 SUBDIR+=	athsurvey athratestats athspectral
diff --git a/tools/tools/ath/athalq/ar9300_ds.c b/tools/tools/ath/athalq/ar9300_ds.c
index 04455d313207..d303351e708d 100644
--- a/tools/tools/ath/athalq/ar9300_ds.c
+++ b/tools/tools/ath/athalq/ar9300_ds.c
@@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/endian.h>
 
 #include <dev/ath/if_ath_alq.h>
-#include <dev/ath/ath_hal/ar9300/ar9300desc.h>
+#include <ar9300/ar9300desc.h>
 
 #include "ar9300_ds.h"
 
diff --git a/tools/tools/ath/athdecode/main.c b/tools/tools/ath/athdecode/main.c
index 701f8355a9ca..e565698f4fbf 100644
--- a/tools/tools/ath/athdecode/main.c
+++ b/tools/tools/ath/athdecode/main.c
@@ -192,7 +192,7 @@ opmark(FILE *fd, int i, const struct athregrec *r)
 		fprintf(fd, "mark #%u value %u/0x%x", r->reg, r->val, r->val);
 		break;
 	}
-	exit(0);
+	return (NULL);
 }
 
 #include "ah_devid.h"
@@ -260,6 +260,9 @@ opdevice(const struct athregrec *r)
 	case AR9280_DEVID_PCI:
 	case AR9280_DEVID_PCIE:
 	case AR9285_DEVID_PCIE:
+	case AR9287_DEVID_PCI:
+	case AR9287_DEVID_PCIE:
+	case AR9300_DEVID_AR9330:
 		state.chipnum = 5416;
 		state.revs.ah_macVersion = 13;
 		state.revs.ah_macRev = 8;
diff --git a/tools/tools/ath/athpoke/athpoke.c b/tools/tools/ath/athpoke/athpoke.c
index 1749b7b52b78..9f19f47d60d6 100644
--- a/tools/tools/ath/athpoke/athpoke.c
+++ b/tools/tools/ath/athpoke/athpoke.c
@@ -123,7 +123,7 @@ static uint32_t
 regread(int s, struct ath_diag *atd, uint32_t r)
 {
 	HAL_REGRANGE ra;
-	uint32_t v[2];
+	uint32_t v[3];
 
 	ra.start = r;
 	ra.end = 0;
@@ -135,7 +135,7 @@ regread(int s, struct ath_diag *atd, uint32_t r)
 	atd->ad_id = HAL_DIAG_REGS | ATH_DIAG_IN | ATH_DIAG_DYN;
 	if (ioctl(s, SIOCGATHDIAG, atd) < 0)
 		err(1, atd->ad_name);
-	return v[1];
+	return v[2];
 }
 
 static void
diff --git a/tools/tools/ath/athregs/dumpregs.c b/tools/tools/ath/athregs/dumpregs.c
index 50e8a1e03978..4a50726829d6 100644
--- a/tools/tools/ath/athregs/dumpregs.c
+++ b/tools/tools/ath/athregs/dumpregs.c
@@ -182,8 +182,9 @@ main(int argc, char *argv[])
 	dp = (u_int32_t *)atd.ad_out_data;
 	ep = (u_int32_t *)(atd.ad_out_data + atd.ad_out_size);
 	while (dp < ep) {
-		u_int r = dp[0] >> 16;		/* start of range */
-		u_int e = dp[0] & 0xffff;	/* end of range */
+		u_int r = dp[0];	/* start of range */
+		u_int e = dp[1];	/* end of range */
+		dp++;
 		dp++;
 		/* convert offsets to indices */
 		r >>= 2; e >>= 2;
@@ -611,7 +612,7 @@ ath_hal_setupdiagregs(const HAL_REGRANGE regs[], u_int nr)
 
 	space = 0;
 	for (i = 0; i < nr; i++) {
-		u_int n = 2 * sizeof(u_int32_t);	/* reg range + first */
+		u_int n = sizeof(HAL_REGRANGE) + sizeof(u_int32_t);	/* reg range + first */
 		if (regs[i].end) {
 			if (regs[i].end < regs[i].start) {
 				fprintf(stderr, "%s: bad register range, "
diff --git a/tools/tools/cxgbetool/cxgbetool.c b/tools/tools/cxgbetool/cxgbetool.c
index ab6fee55535d..729ad9fb908b 100644
--- a/tools/tools/cxgbetool/cxgbetool.c
+++ b/tools/tools/cxgbetool/cxgbetool.c
@@ -95,7 +95,7 @@ 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"
+	    "\tmodinfo <port> [raw]                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"
@@ -1872,6 +1872,41 @@ tracer_cmd(int argc, const char *argv[])
 	return set_tracer(idx, argc - 1, argv + 1);
 }
 
+static int
+modinfo_raw(int port_id)
+{
+	uint8_t offset;
+	struct t4_i2c_data i2cd;
+	int rc;
+
+	for (offset = 0; offset < 96; offset += sizeof(i2cd.data)) {
+		bzero(&i2cd, sizeof(i2cd));
+		i2cd.port_id = port_id;
+		i2cd.dev_addr = 0xa0;
+		i2cd.offset = offset;
+		i2cd.len = sizeof(i2cd.data);
+		rc = doit(CHELSIO_T4_GET_I2C, &i2cd);
+		if (rc != 0)
+			return (rc);
+		printf("%02x:  %02x %02x %02x %02x  %02x %02x %02x %02x",
+		    offset, i2cd.data[0], i2cd.data[1], i2cd.data[2],
+		    i2cd.data[3], i2cd.data[4], i2cd.data[5], i2cd.data[6],
+		    i2cd.data[7]);
+
+		printf("  %c%c%c%c %c%c%c%c\n",
+		    isprint(i2cd.data[0]) ? i2cd.data[0] : '.',
+		    isprint(i2cd.data[1]) ? i2cd.data[1] : '.',
+		    isprint(i2cd.data[2]) ? i2cd.data[2] : '.',
+		    isprint(i2cd.data[3]) ? i2cd.data[3] : '.',
+		    isprint(i2cd.data[4]) ? i2cd.data[4] : '.',
+		    isprint(i2cd.data[5]) ? i2cd.data[5] : '.',
+		    isprint(i2cd.data[6]) ? i2cd.data[6] : '.',
+		    isprint(i2cd.data[7]) ? i2cd.data[7] : '.');
+	}
+
+	return (0);
+}
+
 static int
 modinfo(int argc, const char *argv[])
 {
@@ -1881,17 +1916,31 @@ modinfo(int argc, const char *argv[])
 	int rc, i;
 	uint16_t temp, vcc, tx_bias, tx_power, rx_power;
 
-	if (argc != 1) {
+	if (argc < 1) {
 		warnx("must supply a port");
 		return (EINVAL);
 	}
 
+	if (argc > 2) {
+		warnx("too many arguments");
+		return (EINVAL);
+	}
+
 	p = str_to_number(argv[0], &port, NULL);
 	if (*p || port > UCHAR_MAX) {
 		warnx("invalid port id \"%s\"", argv[0]);
 		return (EINVAL);
 	}
 
+	if (argc == 2) {
+		if (!strcmp(argv[1], "raw"))
+			return (modinfo_raw(port));
+		else {
+			warnx("second argument can only be \"raw\"");
+			return (EINVAL);
+		}
+	}
+
 	bzero(&i2cd, sizeof(i2cd));
 	i2cd.len = 1;
 	i2cd.port_id = port;
diff --git a/tools/tools/ether_reflect/ether_reflect.1 b/tools/tools/ether_reflect/ether_reflect.1
index 45ee27a85d0d..e6539b184f2c 100644
--- a/tools/tools/ether_reflect/ether_reflect.1
+++ b/tools/tools/ether_reflect/ether_reflect.1
@@ -103,6 +103,7 @@ program first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An George V. Neville-Neil Aq gnn@FreeBSD.org .
+.An George V. Neville-Neil Aq Mt gnn@FreeBSD.org .
 .Sh BUGS
-Should be reported to the author or to net@FreeBSD.org.
+Should be reported to the author or to
+.Aq Mt net@FreeBSD.org .
diff --git a/tools/tools/fixwhite/fixwhite.1 b/tools/tools/fixwhite/fixwhite.1
index ccf5ecec03dc..3ad088d20f82 100644
--- a/tools/tools/fixwhite/fixwhite.1
+++ b/tools/tools/fixwhite/fixwhite.1
@@ -45,4 +45,4 @@ If the whitespace at the beginning of a sentence is exactly a multiple
 of eight spaces, the whitespace is replaced by tabs.
 Also, spaces preceeding tabs will be merged into the tab character.
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/tools/tools/gdb_regofs/ia64.c b/tools/tools/gdb_regofs/ia64.c
deleted file mode 100644
index 59e0055253b6..000000000000
--- a/tools/tools/gdb_regofs/ia64.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (c) 2004 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <stddef.h>
-#include <machine/reg.h>
-
-#define PRESERVED(x)    offsetof(struct reg, r_preserved)       \
-                        + offsetof(struct _callee_saved, x)
-#define SCRATCH(x)      offsetof(struct reg, r_scratch)         \
-                        + offsetof(struct _caller_saved, x)
-#define SPECIAL(x)      offsetof(struct reg, r_special)         \
-                        + offsetof(struct _special, x)
-
-#define HIGH_FP(x)      offsetof(struct fpreg, fpr_high)        \
-                        + offsetof(struct _high_fp, x)
-#define PRESERVED_FP(x) offsetof(struct fpreg, fpr_preserved)   \
-                        + offsetof(struct _callee_saved_fp, x)
-#define SCRATCH_FP(x)   offsetof(struct fpreg, fpr_scratch)     \
-                        + offsetof(struct _caller_saved_fp, x)
-
-static int regofs[] = {
-        /*
-	 * General registers (0-127)
-	 */
-        -1,             /* gr0 */
-        SPECIAL(gp),
-        SCRATCH(gr2),   SCRATCH(gr3),
-        PRESERVED(gr4), PRESERVED(gr5), PRESERVED(gr6), PRESERVED(gr7),
-        SCRATCH(gr8),   SCRATCH(gr9),   SCRATCH(gr10),  SCRATCH(gr11),
-        SPECIAL(sp),    SPECIAL(tp),
-        SCRATCH(gr14),  SCRATCH(gr15),  SCRATCH(gr16),  SCRATCH(gr17),
-        SCRATCH(gr18),  SCRATCH(gr19),  SCRATCH(gr20),  SCRATCH(gr21),
-        SCRATCH(gr22),  SCRATCH(gr23),  SCRATCH(gr24),  SCRATCH(gr25),
-        SCRATCH(gr26),  SCRATCH(gr27),  SCRATCH(gr28),  SCRATCH(gr29),
-        SCRATCH(gr30),  SCRATCH(gr31),
-        /*
-         * gr32 through gr127 are not directly available as they are
-         * stacked registers.
-         */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* gr32-gr39 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* gr40-gr47 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* gr48-gr55 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* gr56-gr63 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* gr64-gr71 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* gr72-gr79 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* gr80-gr87 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* gr88-gr95 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* gr96-gr103 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* gr104-gr111 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* gr112-gr119 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* gr120-gr127 */
-        /*
-         * Floating-point registers (128-255)
-         */
-        -1,             /* fr0: constant 0.0 */
-        -1,             /* fr1: constant 1.0 */
-        PRESERVED_FP(fr2),      PRESERVED_FP(fr3),
-        PRESERVED_FP(fr4),      PRESERVED_FP(fr5),
-        SCRATCH_FP(fr6),        SCRATCH_FP(fr7),
-        SCRATCH_FP(fr8),        SCRATCH_FP(fr9),
-        SCRATCH_FP(fr10),       SCRATCH_FP(fr11),
-        SCRATCH_FP(fr12),       SCRATCH_FP(fr13),
-        SCRATCH_FP(fr14),       SCRATCH_FP(fr15),
-        PRESERVED_FP(fr16),     PRESERVED_FP(fr17),
-        PRESERVED_FP(fr18),     PRESERVED_FP(fr19),
-        PRESERVED_FP(fr20),     PRESERVED_FP(fr21),
-        PRESERVED_FP(fr22),     PRESERVED_FP(fr23),
-        PRESERVED_FP(fr24),     PRESERVED_FP(fr25),
-        PRESERVED_FP(fr26),     PRESERVED_FP(fr27),
-        PRESERVED_FP(fr28),     PRESERVED_FP(fr29),
-        PRESERVED_FP(fr30),     PRESERVED_FP(fr31),
-        HIGH_FP(fr32),  HIGH_FP(fr33),  HIGH_FP(fr34),  HIGH_FP(fr35),
-        HIGH_FP(fr36),  HIGH_FP(fr37),  HIGH_FP(fr38),  HIGH_FP(fr39),
-        HIGH_FP(fr40),  HIGH_FP(fr41),  HIGH_FP(fr42),  HIGH_FP(fr43),
-        HIGH_FP(fr44),  HIGH_FP(fr45),  HIGH_FP(fr46),  HIGH_FP(fr47),
-        HIGH_FP(fr48),  HIGH_FP(fr49),  HIGH_FP(fr50),  HIGH_FP(fr51),
-        HIGH_FP(fr52),  HIGH_FP(fr53),  HIGH_FP(fr54),  HIGH_FP(fr55),
-        HIGH_FP(fr56),  HIGH_FP(fr57),  HIGH_FP(fr58),  HIGH_FP(fr59),
-        HIGH_FP(fr60),  HIGH_FP(fr61),  HIGH_FP(fr62),  HIGH_FP(fr63),
-        HIGH_FP(fr64),  HIGH_FP(fr65),  HIGH_FP(fr66),  HIGH_FP(fr67),
-        HIGH_FP(fr68),  HIGH_FP(fr69),  HIGH_FP(fr70),  HIGH_FP(fr71),
-        HIGH_FP(fr72),  HIGH_FP(fr73),  HIGH_FP(fr74),  HIGH_FP(fr75),
-        HIGH_FP(fr76),  HIGH_FP(fr77),  HIGH_FP(fr78),  HIGH_FP(fr79),
-        HIGH_FP(fr80),  HIGH_FP(fr81),  HIGH_FP(fr82),  HIGH_FP(fr83),
-        HIGH_FP(fr84),  HIGH_FP(fr85),  HIGH_FP(fr86),  HIGH_FP(fr87),
-        HIGH_FP(fr88),  HIGH_FP(fr89),  HIGH_FP(fr90),  HIGH_FP(fr91),
-        HIGH_FP(fr92),  HIGH_FP(fr93),  HIGH_FP(fr94),  HIGH_FP(fr95),
-        HIGH_FP(fr96),  HIGH_FP(fr97),  HIGH_FP(fr98),  HIGH_FP(fr99),
-        HIGH_FP(fr100), HIGH_FP(fr101), HIGH_FP(fr102), HIGH_FP(fr103),
-        HIGH_FP(fr104), HIGH_FP(fr105), HIGH_FP(fr106), HIGH_FP(fr107),
-        HIGH_FP(fr108), HIGH_FP(fr109), HIGH_FP(fr110), HIGH_FP(fr111),
-        HIGH_FP(fr112), HIGH_FP(fr113), HIGH_FP(fr114), HIGH_FP(fr115),
-        HIGH_FP(fr116), HIGH_FP(fr117), HIGH_FP(fr118), HIGH_FP(fr119),
-        HIGH_FP(fr120), HIGH_FP(fr121), HIGH_FP(fr122), HIGH_FP(fr123),
-        HIGH_FP(fr124), HIGH_FP(fr125), HIGH_FP(fr126), HIGH_FP(fr127),
-        /*
-         * Predicate registers (256-319)
-	 * These are not individually available. Predicates are
-	 * in the pr register.
-         */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* pr0-pr7 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* pr8-pr15 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* pr16-pr23 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* pr24-pr31 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* pr32-pr39 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* pr40-pr47 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* pr48-pr55 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* pr56-pr63 */
-        /*
-         * Branch registers (320-327)
-         */
-        SPECIAL(rp),
-        PRESERVED(br1), PRESERVED(br2), PRESERVED(br3), PRESERVED(br4),
-        PRESERVED(br5),
-        SCRATCH(br6),   SCRATCH(br7),
-        /*
-         * Misc other registers (328-333)
-         */
-        -1, -1,
-        SPECIAL(pr),
-        SPECIAL(iip),
-        SPECIAL(psr),
-        SPECIAL(cfm),
-        /*
-         * Application registers (334-461)
-         */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* ar.k0-ar.k7 */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* ar8-ar15 (reserved) */
-        SPECIAL(rsc),                           /* ar.rsc */
-        SPECIAL(ndirty),			/* ar.bsp !!YEDI!! */
-        SPECIAL(bspstore),                      /* ar.bspstore */
-        SPECIAL(rnat),                          /* ar.rnat */
-        -1,                                     /* ar20 (reserved) */
-        -1,                                     /* ar.fcr */
-        -1, -1,                                 /* ar22-ar23 (reserved) */
-        -1,                                     /* ar.eflag */
-        SCRATCH(csd),                           /* ar.csd */
-        SCRATCH(ssd),                           /* ar.ssd */
-        -1,                                     /* ar.cflg */
-        -1,                                     /* ar.fsr */
-        -1,                                     /* ar.fir */
-        -1,                                     /* ar.fdr */
-        -1,                                     /* ar31 (reserved) */
-        SCRATCH(ccv),                           /* ar.ccv */
-        -1, -1, -1,                             /* ar33-ar35 (reserved) */
-        SPECIAL(unat),                          /* ar.unat */
-        -1, -1, -1,                             /* ar37-ar39 (reserved) */
-        SPECIAL(fpsr),                          /* ar.fpsr */
-        -1, -1, -1,                             /* ar41-ar43 (reserved) */
-        -1,                                     /* ar.itc */
-        -1, -1, -1,                             /* ar45-ar47 (reserved) */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* ar48-ar55 (ignored) */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* ar56-ar63 (ignored) */
-        SPECIAL(pfs),                           /* ar.pfs */
-        PRESERVED(lc),                          /* ar.lc */
-        -1,                                     /* ar.ec */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* ar67-ar74 (reserved) */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* ar75-ar82 (reserved) */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* ar83-ar90 (reserved) */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* ar91-ar98 (reserved) */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* ar99-ar106 (reserved) */
-        -1, -1, -1, -1, -1,                     /* ar107-ar111 (reserved) */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* ar112-ar119 (ignored) */
-        -1, -1, -1, -1, -1, -1, -1, -1,         /* ar120-ar127 (ignored) */
-};
-
-int
-main()
-{
-	int elem, nelems;
-
-	nelems = sizeof(regofs)/sizeof(regofs[0]);
-	printf("static int reg_offset[%d] = {", nelems);
-	for (elem = 0; elem < nelems; elem++) {
-		if ((elem & 7) == 0)
-			printf("\n  ");
-		printf("%4d", regofs[elem]);
-		if (elem < nelems - 1)
-			putchar(',');
-		if ((elem & 7) != 7)
-			putchar(' ');
-		else
-			printf("\t/* Regs %d-%d. */", elem - 7, elem);
-	}
-	printf("\n};");
-	return (0);
-}
diff --git a/tools/tools/mcgrab/mcgrab.1 b/tools/tools/mcgrab/mcgrab.1
index 1b83f50182e8..2c6bfa608d56 100644
--- a/tools/tools/mcgrab/mcgrab.1
+++ b/tools/tools/mcgrab/mcgrab.1
@@ -77,7 +77,7 @@ program first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An George V. Neville-Neil Aq gnn@FreeBSD.org .
+.An George V. Neville-Neil Aq Mt gnn@FreeBSD.org .
 .Sh BUGS
 Should be reported to the author or to
-.Aq net@FreeBSD.org .
+.Aq Mt net@FreeBSD.org .
diff --git a/tools/tools/mctest/mctest.1 b/tools/tools/mctest/mctest.1
index c64a5f80ba85..3cec879d4ba6 100644
--- a/tools/tools/mctest/mctest.1
+++ b/tools/tools/mctest/mctest.1
@@ -115,7 +115,7 @@ program first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An George V. Neville-Neil Aq gnn@FreeBSD.org .
+.An George V. Neville-Neil Aq Mt gnn@FreeBSD.org .
 .Sh BUGS
 Should be reported to the author or to
-.Aq net@FreeBSD.org .
+.Aq Mt net@FreeBSD.org .
diff --git a/tools/tools/nanobsd/dhcpd/README b/tools/tools/nanobsd/dhcpd/README
index 8d9960c53cd6..35bc66e21d4f 100644
--- a/tools/tools/nanobsd/dhcpd/README
+++ b/tools/tools/nanobsd/dhcpd/README
@@ -9,6 +9,6 @@ and DHCPd.
 
 This is a work in progress. Generally, to build this you should
      cd tools/tools/nanobsd/dhcpd
-     sudo sh ../nandobsd.sh -C os-base
+     sudo sh ../nanobsd.sh -C os-base
 but do be careful if things are interrupted. There may still be
 bugs lurking that cause your entire FreeBSD tree to disappear.
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
index 600d112e07f7..f19957041c8b 100644
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -178,6 +178,15 @@ SRCCONF=${SRCCONF:=/dev/null}
 #
 #######################################################################
 
+# rm doesn't know -x prior to FreeBSD 10, so cope with a variety of build
+# hosts for now.
+nano_rm ( ) {
+	case $(uname -r) in
+	7*|8*|9*) rm $* ;;
+	*) rm -x $* ;;
+	esac
+}
+
 # run in the world chroot, errors fatal
 CR()
 {
@@ -200,9 +209,9 @@ nano_cleanup ( ) (
 clean_build ( ) (
 	pprint 2 "Clean and create object directory (${MAKEOBJDIRPREFIX})"
 
-	if ! rm -xrf ${MAKEOBJDIRPREFIX}/ > /dev/null 2>&1 ; then
+	if ! nano_rm -rf ${MAKEOBJDIRPREFIX}/ > /dev/null 2>&1 ; then
 		chflags -R noschg ${MAKEOBJDIRPREFIX}/
-		rm -xr ${MAKEOBJDIRPREFIX}/
+		nano_rm -r ${MAKEOBJDIRPREFIX}/
 	fi
 	mkdir -p ${MAKEOBJDIRPREFIX}
 	printenv > ${MAKEOBJDIRPREFIX}/_.env
@@ -256,17 +265,17 @@ build_kernel ( ) (
 clean_world ( ) (
 	if [ "${NANO_OBJ}" != "${MAKEOBJDIRPREFIX}" ]; then
 		pprint 2 "Clean and create object directory (${NANO_OBJ})"
-		if ! rm -rxf ${NANO_OBJ}/ > /dev/null 2>&1 ; then
+		if ! nano_rm -rf ${NANO_OBJ}/ > /dev/null 2>&1 ; then
 			chflags -R noschg ${NANO_OBJ}
-			rm -xr ${NANO_OBJ}/
+			nano_rm -r ${NANO_OBJ}/
 		fi
 		mkdir -p ${NANO_OBJ} ${NANO_WORLDDIR}
 		printenv > ${NANO_OBJ}/_.env
 	else
 		pprint 2 "Clean and create world directory (${NANO_WORLDDIR})"
-		if ! rm -rxf ${NANO_WORLDDIR}/ > /dev/null 2>&1 ; then
+		if ! nano_rm -rf ${NANO_WORLDDIR}/ > /dev/null 2>&1 ; then
 			chflags -R noschg ${NANO_WORLDDIR}
-			rm -rxf ${NANO_WORLDDIR}/
+			nano_rm -rf ${NANO_WORLDDIR}/
 		fi
 		mkdir -p ${NANO_WORLDDIR}
 	fi
@@ -378,7 +387,7 @@ setup_nanobsd ( ) (
 		cd usr/local/etc
 		find . -print | cpio -dumpl ../../../etc/local
 		cd ..
-		rm -rf etc
+		nano_rm -rf etc
 		ln -s ../../etc/local etc
 		)
 	fi
@@ -400,7 +409,7 @@ setup_nanobsd ( ) (
 	echo "mount -o ro /dev/${NANO_DRIVE}s3" > conf/default/etc/remount
 
 	# Put /tmp on the /var ramdisk (could be symlink already)
-	test -d tmp && rmdir tmp || rm -f tmp
+	test -d tmp && rmdir tmp || nano_rm -f tmp
 	ln -s var/tmp tmp
 
 	) > ${NANO_OBJ}/_.dl 2>&1
@@ -560,7 +569,7 @@ create_i386_diskimage ( ) (
 			-y ${NANO_HEADS}`
 	else
 		echo "Creating md backing file..."
-		rm -f ${IMG}
+		nano_rm -f ${IMG}
 		dd if=/dev/zero of=${IMG} seek=${NANO_MEDIASIZE} count=0
 		MD=`mdconfig -a -t vnode -f ${IMG} -x ${NANO_SECTS} \
 			-y ${NANO_HEADS}`
@@ -785,7 +794,7 @@ cust_pkg () (
 			exit 2
 		fi
 	done
-	rm -rxf ${NANO_WORLDDIR}/Pkg
+	nano_rm -rf ${NANO_WORLDDIR}/Pkg
 )
 
 cust_pkgng () (
@@ -820,7 +829,7 @@ cust_pkgng () (
 		echo "FAILED: pkg bootstrapping faied"
 		exit 2
 	fi
-	rm -f ${NANO_WORLDDIR}/Pkg/pkg-*
+	nano_rm -f ${NANO_WORLDDIR}/Pkg/pkg-*
 
 	# Count & report how many we have to install
 	todo=`ls ${NANO_WORLDDIR}/Pkg | /usr/bin/wc -l`
@@ -849,7 +858,7 @@ cust_pkgng () (
 			exit 2
 		fi
 	done
-	rm -rxf ${NANO_WORLDDIR}/Pkg
+	nano_rm -rf ${NANO_WORLDDIR}/Pkg
 )
 
 #######################################################################
@@ -886,8 +895,10 @@ pprint() (
 
 usage () {
 	(
-	echo "Usage: $0 [-bfiknqvw] [-c config_file]"
+	echo "Usage: $0 [-bfiKknqvw] [-c config_file]"
+	echo "	-K	suppress installkernel"
 	echo "	-b	suppress builds (both kernel and world)"
+	echo "	-c	specify config file"
 	echo "	-f	suppress code slice extraction"
 	echo "	-i	suppress disk image build"
 	echo "	-k	suppress buildkernel"
@@ -895,7 +906,6 @@ usage () {
 	echo "	-q	make output more quiet"
 	echo "	-v	make output more verbose"
 	echo "	-w	suppress buildworld"
-	echo "	-c	specify config file"
 	) 1>&2
 	exit 2
 }
@@ -905,12 +915,13 @@ usage () {
 
 do_clean=true
 do_kernel=true
+do_installkernel=true
 do_world=true
 do_image=true
 do_copyout_partition=true
 
 set +e
-args=`getopt bc:fhiknqvw $*`
+args=`getopt Kbc:fhiknqvw $*`
 if [ $? -ne 0 ] ; then
 	usage
 	exit 2
@@ -922,12 +933,12 @@ for i
 do
 	case "$i" 
 	in
-	-b)
-		do_world=false
-		do_kernel=false
+	-K)
+		do_installkernel=false
 		shift
 		;;
-	-k)
+	-b)
+		do_world=false
 		do_kernel=false
 		shift
 		;;
@@ -951,6 +962,10 @@ do
 		do_image=false
 		shift
 		;;
+	-k)
+		do_kernel=false
+		shift
+		;;
 	-n)
 		do_clean=false
 		shift
@@ -983,7 +998,7 @@ trap nano_cleanup EXIT
 #######################################################################
 # Setup and Export Internal variables
 #
-test -n "${NANO_OBJ}" || NANO_OBJ=/usr/obj/nanobsd.${NANO_NAME}/
+test -n "${NANO_OBJ}" || NANO_OBJ=/usr/obj/nanobsd.${NANO_NAME}
 test -n "${MAKEOBJDIRPREFIX}" || MAKEOBJDIRPREFIX=${NANO_OBJ}
 test -n "${NANO_DISKIMGDIR}" || NANO_DISKIMGDIR=${NANO_OBJ}
 
@@ -1074,7 +1089,11 @@ make_conf_install
 install_world
 install_etc
 setup_nanobsd_etc
-install_kernel
+if $do_installkernel ; then
+	install_kernel
+else
+	pprint 2 "Skipping installkernel (as instructed)"
+fi
 
 run_customize
 setup_nanobsd
diff --git a/tools/tools/nanobsd/rescue/R32 b/tools/tools/nanobsd/rescue/R32
new file mode 100644
index 000000000000..3c15ebee49e7
--- /dev/null
+++ b/tools/tools/nanobsd/rescue/R32
@@ -0,0 +1,14 @@
+#
+# R32 -- Generic kernel configuration file with modifications for rescue.
+#
+# $FreeBSD$
+
+include GENERIC
+
+ident	R32
+
+nooptions	INVARIANTS
+nooptions	INVARIANT_SUPPORT
+nooptions	WITNESS
+nooptions	WITNESS_SKIPSPIN
+nooptions	MALLOC_DEBUG_MAXZONES
diff --git a/tools/tools/nanobsd/rescue/R64 b/tools/tools/nanobsd/rescue/R64
new file mode 100644
index 000000000000..17900e2de081
--- /dev/null
+++ b/tools/tools/nanobsd/rescue/R64
@@ -0,0 +1,14 @@
+#
+# R64 -- Generic kernel configuration file with modifications for rescue.
+#
+# $FreeBSD$
+
+include GENERIC
+
+ident	R64
+
+nooptions	INVARIANTS
+nooptions	INVARIANT_SUPPORT
+nooptions	WITNESS
+nooptions	WITNESS_SKIPSPIN
+nooptions	MALLOC_DEBUG_MAXZONES
diff --git a/tools/tools/nanobsd/rescue/build.sh b/tools/tools/nanobsd/rescue/build.sh
index 525b7ba38398..4c109ff96cbb 100755
--- a/tools/tools/nanobsd/rescue/build.sh
+++ b/tools/tools/nanobsd/rescue/build.sh
@@ -3,6 +3,8 @@
 # $FreeBSD$
 #
 
+today=`date '+%Y%m%d'`
+
 if [ -z "${1}" -o \! -f "${1}" ]; then
   echo "Usage: $0 cfg_file [-bhiknw]"
   echo "-i : skip image build"
@@ -15,4 +17,26 @@ fi
 CFG="${1}"
 shift;
 
+if [ \! -d /usr/obj/Rescue ]; then
+  mkdir -p /usr/obj/Rescue
+fi
+
 sh ../nanobsd.sh $* -c ${CFG}
+
+F32="/usr/obj/Rescue/rescue_${today}_x32"
+D32="/usr/obj/nanobsd.rescue_i386"
+if [ -f "${D32}/_.disk.full" ]; then
+  mv "${D32}/_.disk.full" "${F32}.img"
+fi
+if [ -f "${D32}/_.disk.iso" ]; then
+  mv "${D32}/_.disk.iso" "${F32}.iso"
+fi
+
+F64="/usr/obj/Rescue/rescue_${today}_x64"
+D64="/usr/obj/nanobsd.rescue_amd64"
+if [ -f "${D64}/_.disk.full" ]; then
+  mv "${D64}/_.disk.full" "${F64}.img"
+fi
+if [ -f "${D64}/_.disk.iso" ]; then
+  mv "${D64}/_.disk.iso" "${F64}.iso"
+fi
diff --git a/tools/tools/nanobsd/rescue/common b/tools/tools/nanobsd/rescue/common
index d78a1caf560f..c43244079edb 100644
--- a/tools/tools/nanobsd/rescue/common
+++ b/tools/tools/nanobsd/rescue/common
@@ -3,7 +3,7 @@
 #
 NANO_TOOLS=`pwd`
 NANO_PACKAGE_DIR=`pwd`/Pkg
-NANO_RAM_TMPVARSIZE=20480
+NANO_RAM_TMPVARSIZE=40960
 NANO_PMAKE="make -j 8"
 NANO_LABEL="rescue"
 NANO_RAM_TMPVARSIZE=40960
@@ -68,6 +68,7 @@ cust_etc_cfg () (
 	echo "#ifconfig_fxp0=\"AUTO\"" >> etc/rc.conf
 	echo "#sshd_enable=\"YES\"" >> etc/rc.conf
 	echo "/dev/ufs/${NANO_LABEL}s1a / ufs ro,noatime 0 0" > etc/fstab
+	echo "/dev/${NANO_DRIVE}s3 /cfg ufs rw,noauto 2 2" >> etc/fstab
 	echo "tmpfs /boot/zfs tmpfs rw,size=1048576,mode=777 0 0" >> etc/fstab
 	echo "ports:/usr/ports /usr/ports nfs rw,noauto,noatime,bg,soft,intr,nfsv3 0 0" >> etc/fstab
 #	echo "/dev/ad1s1a /scratch ufs rw,noauto,noatime 0 0" >> etc/fstab
@@ -100,9 +101,9 @@ last_orders () (
 	touch conf/default/etc/.keepme
 	touch conf/default/var/.keepme
 	cd ..
-	mkisofs -quiet -r -J -no-emul-boot \
-	-V ${NANO_LABEL} \
-	-b boot/cdboot -o _.disk.iso _.w/
+	makefs -t cd9660 -o rockridge \
+	-o label="${NANO_LABEL}" -o publisher="RMX" \
+	-o bootimage="i386;_.w/boot/cdboot" -o no-emul-boot _.disk.iso _.w/
 	)
 )
 
diff --git a/tools/tools/nanobsd/rescue/merge.sh b/tools/tools/nanobsd/rescue/merge.sh
index 6761c94de4b7..afb66371fe3c 100755
--- a/tools/tools/nanobsd/rescue/merge.sh
+++ b/tools/tools/nanobsd/rescue/merge.sh
@@ -1,18 +1,28 @@
 #!/bin/sh
 # $FreeBSD$
 
-D1="/usr/obj/nanobsd.rescue_i386"
-D2="/usr/obj/nanobsd.rescue_amd64"
+today=`date '+%Y%m%d'`
 
-MD=`mdconfig -a -t vnode -f ${D1}/_.disk.full`
+I32="/usr/obj/Rescue/rescue_${today}_x32.img"
+I64="/usr/obj/Rescue/rescue_${today}_x64.img"
+IAL="/usr/obj/Rescue/rescue_${today}_xal.img"
+D64="/usr/obj/nanobsd.rescue_amd64"
+MNT="/usr/obj/Rescue/_mnt"
 
-dd if=${D2}/_.disk.image of=/dev/${MD}s2 bs=128k
+if [ \! -d "$MNT" ]; then
+  mkdir "$MNT"
+fi
+
+dd if=${I32} of=${IAL} bs=128k
+MD=`mdconfig -a -t vnode -f ${IAL}`
+
+dd if=${D64}/_.disk.image of=/dev/${MD}s2 bs=128k
 tunefs -L rescues2a /dev/${MD}s2a
-mount /dev/${MD}s2a ${D1}/_.mnt
+mount /dev/${MD}s2a ${MNT}
 
-sed -i "" -e 's/rescues1/rescues2/' ${D1}/_.mnt/conf/base/etc/fstab
-sed -i "" -e 's/rescues1/rescues2/' ${D1}/_.mnt/etc/fstab
+sed -i "" -e 's/rescues1/rescues2/' ${MNT}/conf/base/etc/fstab
+sed -i "" -e 's/rescues1/rescues2/' ${MNT}/etc/fstab
 
-umount ${D1}/_.mnt
+umount ${MNT}
 
 mdconfig -d -u ${MD}
diff --git a/tools/tools/nanobsd/rescue/rescue_amd64.conf b/tools/tools/nanobsd/rescue/rescue_amd64.conf
index 8a183ee1d9f9..a82325fd52c0 100644
--- a/tools/tools/nanobsd/rescue/rescue_amd64.conf
+++ b/tools/tools/nanobsd/rescue/rescue_amd64.conf
@@ -1,7 +1,7 @@
 #
 # $FreeBSD$
 #
-NANO_KERNEL=GENERIC
+NANO_KERNEL=R64
 NANO_ARCH=amd64
 TARGET_ARCH=amd64; export TARGET_ARCH
 #TARGET_CPUTYPE=amd64; export TARGET_CPUTYPE
diff --git a/tools/tools/nanobsd/rescue/rescue_i386.conf b/tools/tools/nanobsd/rescue/rescue_i386.conf
index 5e9145335494..97b51d49e21d 100644
--- a/tools/tools/nanobsd/rescue/rescue_i386.conf
+++ b/tools/tools/nanobsd/rescue/rescue_i386.conf
@@ -1,7 +1,7 @@
 #
 # $FreeBSD$
 #
-NANO_KERNEL=GENERIC
+NANO_KERNEL=R32
 NANO_ARCH=i386
 TARGET_ARCH=i386; export TARGET_ARCH
 #TARGET_CPUTYPE=i386; export TARGET_CPUTYPE
diff --git a/tools/tools/net80211/stumbler/Makefile b/tools/tools/net80211/stumbler/Makefile
index c3970b2f635f..e7ea87c25bce 100644
--- a/tools/tools/net80211/stumbler/Makefile
+++ b/tools/tools/net80211/stumbler/Makefile
@@ -2,8 +2,8 @@
 
 PROG=	stumbler
 BINDIR=	/usr/local/bin
-DPADD=	${LIBPCAP} ${LIBNCURSES}
-LDADD=	-lpcap -lncurses
+DPADD=	${LIBPCAP} ${LIBNCURSESW}
+LDADD=	-lpcap -lncursesw
 CFLAGS=-g
 MAN=
 
diff --git a/tools/tools/prstats/prstats.pl b/tools/tools/prstats/prstats.pl
deleted file mode 100644
index c31241edb0b4..000000000000
--- a/tools/tools/prstats/prstats.pl
+++ /dev/null
@@ -1,357 +0,0 @@
-#!/usr/bin/perl -w
-#-
-# Copyright (c) 2001 Dag-Erling Coïdan 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
-#    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.
-# 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$
-#
-
-use strict;
-use Data::Dumper;
-use Fcntl;
-use POSIX qw(isatty mktime strftime tzset);
-use vars qw($TTY $NOW %MONTH %PR @EVENTS @COUNT @AGE);
-use vars qw(%STATE %CATEGORY %OWNER %CLOSER);
-
-%MONTH = (
-    'Jan' => 1,
-    'Feb' => 2,
-    'Mar' => 3,
-    'Apr' => 4,
-    'May' => 5,
-    'Jun' => 6,
-    'Jul' => 7,
-    'Aug' => 8,
-    'Sep' => 9,
-    'Oct' => 10,
-    'Nov' => 11,
-    'Dec' => 12,
-);
-
-@AGE = (
-    [ 0,	7,	0 ],	# Less than one week
-    [ 7,	30,	0 ],	# One week to one month
-    [ 30,	90,	0 ],	# One to three months
-    [ 90,	365,	0 ],	# Three months to a year
-    [ 365,	1095,	0 ],	# One to three years
-    [ 1095,	999999,	0 ],	# More than three years
-);
-
-sub GNATS_DIR			{ "/home/gnats" }
-sub GNATS_TZ			{ "America/Los_Angeles" }
-sub DATFILE			{ "/tmp/prstats.dat.$$" }
-sub GNUPLOT			{ "|/usr/local/bin/gnuplot /dev/stdin" }
-sub TIMEFMT			{ "%Y-%m-%d/%H:%M:%S" }
-
-sub parse_date($) {
-    my $date = shift;		# Date to parse
-
-    my $year;
-    my $month;
-    my $day;
-    my $hour;
-    my $minute;
-    my $second;
-
-    $date =~ s/\s+/ /g;
-    $date =~ s/^(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\w*\s*//;
-    if ($date =~ m/^(\w{3}) (\d\d?) (\d\d):(\d\d):(\d\d) [A-Z ]*(\d{4})$/) {
-	($month, $day, $hour, $minute, $second, $year) =
-	    ($1, $2, $3, $4, $5, $6);
-    } else {
-	die("Unrecognized date format: $date\n");
-    }
-    defined($month = $MONTH{$month})
-	or die("Invalid month: $month\n");
-    return mktime($second, $minute, $hour, $day, $month - 1, $year - 1900);
-}
-
-sub scan_pr($) {
-    my $fn = shift;		# File name
-
-    local *FILE;		# File handle
-    my $pr = {};		# PR hash
-    my $age;			# PR age
-
-    sysopen(FILE, $fn, O_RDONLY)
-	or die("$fn: open(): $!\n");
-    while (<FILE>) {
-	if (m/^>([A-Za-z-]+):\s+(.*?)\s*$/o ||
-	    m/^(Category|Responsible|State-Changed-[A-Za-z-]+):\s+(.*?)\s*$/o) {
-	    $pr->{lc($1)} = $2;
-	}
-    }
-    
-    exists($PR{$pr->{'number'}})
-	and die("$fn: PR $pr->{'number'} already exists\n");
-
-    if ($TTY) {
-	print(" "x40, "\r", scalar(keys(%PR)),
-	      " $pr->{'category'}/$pr->{'number'} ");
-    }
-
-    foreach ('arrival-date', 'closed-date', 'last-modified',
-	     'state-changed-when') {
-	if (defined($pr->{$_}) && length($pr->{$_})) {
-	    $pr->{$_} = parse_date($pr->{$_});
-	}
-    }
-
-    $pr->{'_created'} = $pr->{'arrival-date'};
-    if ($pr->{'state'} eq 'closed') {
-	$pr->{'_closed'} = $pr->{'closed-date'} || $pr->{'state-changed-when'};
-	$pr->{'_closed_by'} = $pr->{'state-changed-by'};
-	if (!defined($pr->{'_closed_by'})) {
-	    warn("PR $pr->{'category'}/$pr->{'number'} is incomplete\n");
-	    return;
-	}
-	++$CLOSER{$pr->{'_closed_by'}};
-    } else {
-	$age = $pr->{'arrival-date'} / 86400;
-	foreach (@AGE) {
-	    if ($age >= $_->[0] && $age < $_->[1]) {
-		++$_->[2];
-		last;
-	    }
-	}
-	++$CATEGORY{$pr->{'category'}};
-	++$OWNER{$pr->{'responsible'}};
-    }
-    ++$STATE{$pr->{'state'}};
-
-    $PR{$pr->{'number'}} = {
-  	'category'	=> $pr->{'category'},
-  	#'number'	=> $pr->{'number'},
-  	'responsible'	=> $pr->{'responsible'},
-  	'created'	=> $pr->{'created'},
-  	'closed'	=> $pr->{'closed'},
-  	'closer'	=> $pr->{'_closed_by'},
-    };
-    push(@EVENTS, [ $pr->{'_created'}, +1 ]);
-    push(@EVENTS, [ $pr->{'_closed'}, -1 ])
-	    if defined($pr->{'_closed'});
-}
-
-sub scan_recurse($);
-sub scan_recurse($) {
-    my $dn = shift;		# Directory name
-
-    local *DIR;			# Directory handle
-    my $entry;			# Entry
-    
-    opendir(DIR, $dn)
-	or die("$dn: opendir(): $!\n");
-    while ($entry = readdir(DIR)) {
-	next if ($entry eq '.' || $entry eq '..');
-	if (-d "$dn/$entry") {
-	    scan_recurse("$dn/$entry");
-	} elsif ($entry =~ m/^\d+$/) {
-	    eval {
-		scan_pr("$dn/$entry");
-	    };
-	}
-    }
-    closedir(DIR);
-}
-
-sub count_prs() {
-
-    my $pr;			# Iterator
-    my @events;			# Creations or closures
-    my $event;			# Iterator
-    my $count;			# PR count
-
-    if ($TTY) {
-	print(int(@EVENTS), " events\n");
-    }
-    @COUNT = ( [ 0, 0 ] );
-    foreach $event (sort({ $a->[0] <=> $b->[0] } @EVENTS)) {
-	if ($event->[0] == $COUNT[-1]->[0]) {
-	    $COUNT[-1]->[1] += $event->[1];
-	} else {
-	    push(@COUNT, [ $event->[0], $COUNT[-1]->[1] + $event->[1] ]);
-	}
-    }
-    if (@COUNT > 1) {
-	$COUNT[0]->[0] = $COUNT[1]->[0] - 1;
-	unshift(@COUNT, [ 0, 0 ]);
-    }
-}
-
-sub gnuplot(@) {
-    my @commands = @_;		# Commands
-
-    my $pid;			# Child PID
-    local *PIPE;		# Pipe
-
-    open(PIPE, &GNUPLOT)
-	or die("fork(): $!\n");
-    print(PIPE join("\n", @commands, ""));
-    close(PIPE);
-    if ($? & 0x7f) {
-        die("gnuplot caught a signal " . ($? & 0x7f) . "\n");
-    } elsif ($?) {
-        die("gunplot returned exit code " . ($? >> 8) . "\n");
-    }
-}
-
-sub write_dat_file($) {
-    my $fn = shift;		# File name
-    
-    local *FILE;		# File handle
-    my $datum;			# Iterator
-    
-    sysopen(FILE, $fn, O_RDWR|O_CREAT|O_TRUNC, 0640)
-	or die("$fn: open(): $!\n");
-    foreach $datum (@COUNT) {
-	print(FILE strftime(&TIMEFMT, localtime($datum->[0])),
-	      " ", $datum->[1],
-	      " ", $COUNT[-1]->[1],
-	      "\n");
-    }
-    close(FILE);
-}
-
-sub graph_open_prs($$$$$) {
-    my $datfn = shift;		# Data file name
-    my $fn = shift;		# File name
-    my $start = shift;		# Starting date
-    my $end = shift;		# Ending date
-    my $title = shift;		# Title
-
-    my $tickfmt;		# Tick format
-    my $timefmt;		# Time format
-
-    if ($end - $start > 86400 * 30) {
-	$tickfmt = "%Y-%m-%d";
-    } else {
-	$tickfmt = "%m-%d";
-    }
-    $start = strftime(&TIMEFMT, localtime($start));
-    $end = strftime(&TIMEFMT, localtime($end));
-    $timefmt = &TIMEFMT;
-    gnuplot("
-set term png small color
-set xdata time
-set timefmt '$timefmt'
-set data style line
-set grid
-set output '$fn'
-set format x '$tickfmt'
-set xrange ['$start':'$end']
-set yrange [0:*]
-set title '$title'
-plot '$datfn' using 1:2 title 'Open PRs'
-");
-}
-
-sub pr_stat_summary() {
-
-    my $n;			# Loop counter
-
-    # Overall stats
-    printf("Total PRs in database: %d\n", scalar(keys(%PR)));
-    printf("Open PRs: %d\n", scalar(keys(%PR)) - $STATE{'closed'});
-    print("\n");
-    
-    # Category ranking
-    print("Number of PRs in each category:\n");
-    foreach (sort({ $CATEGORY{$b} <=> $CATEGORY{$a} } keys(%CATEGORY))) {
-	printf("%12s: %d\n", $_, $CATEGORY{$_});
-    }
-    print("\n");
-    
-    # State ranking
-    print("Number of PRs in each state:\n");
-    foreach (sort({ $STATE{$b} <=> $STATE{$a} } keys(%STATE))) {
-	printf("%12s: %d\n", $_, $STATE{$_});
-    }
-    print("\n");
-
-    # Closer ranking
-    print("Top ten PR busters:\n");
-    $n = 0;
-    foreach (sort({ $CLOSER{$b} <=> $CLOSER{$a} } keys(%CLOSER))) {
-	printf("    %2d. %s (%d)\n", ++$n, $_, $CLOSER{$_});
-	last if ($n == 10);
-    }
-    print("\n");
-    
-    # Owner ranking
-    print("Top ten owners of open PRs:\n");
-    $n = 0;
-    foreach (sort({ $OWNER{$b} <=> $OWNER{$a} } keys(%OWNER))) {
-	next if (m/^freebsd-(bugs|doc|ports)$/);
-	printf("    %2d. %s (%d)\n", ++$n, $_, $OWNER{$_});
-	last if ($n == 10);
-    }
-    print("\n");
-    
-}
-
-MAIN:{
-    $| = 1;
-    $TTY = isatty(*STDOUT);
-
-    # Perl lacks strptime(), and its mktime() doesn't accept a
-    # timezone argument, so we set our local timezone to that of the
-    # FreeBSD cluster and use localtime() instead.
-    $ENV{'TZ'} = &GNATS_TZ;
-    tzset();
-    $NOW = time();
-
-    # Read and count PRs
-    if (@ARGV) {
-	foreach (@ARGV) {
-	    scan_recurse(join('/', &GNATS_DIR, $_));
-	}
-    } else {
-	scan_recurse(&GNATS_DIR);
-    }
-    if ($TTY) {
-	print("\r", scalar(keys(%PR)), " problem reports scanned\n");
-    }
-
-    # Generate graphs
-    if (0) {
-    count_prs();
-    write_dat_file(&DATFILE);
-    graph_open_prs(&DATFILE, "week.png", $NOW - (86400 * 7) + 1, $NOW,
-		   "Open FreeBSD problem reports (week view)");
-    graph_open_prs(&DATFILE, "month.png", $NOW - (86400 * 30) + 1, $NOW,
-		   "Open FreeBSD problem reports (month view)");
-    graph_open_prs(&DATFILE, "year.png", $NOW - (86400 * 365) + 1, $NOW,
-		   "Open FreeBSD problem reports (year view)");
-    graph_open_prs(&DATFILE, "ever.png", $COUNT[1]->[0], $NOW,
-		   "Open FreeBSD problem reports (project history)");
-    graph_open_prs(&DATFILE, "drive.png", mktime(0, 0, 0, 29, 4, 101), $NOW,
-		   "Open FreeBSD problem reports (drive progress)");
-    unlink(&DATFILE);
-    }
-
-    # Print summary
-    pr_stat_summary();
-}
diff --git a/tools/tools/sysbuild/README b/tools/tools/sysbuild/README
index 3b280d1045e5..a1fa5f4e080a 100644
--- a/tools/tools/sysbuild/README
+++ b/tools/tools/sysbuild/README
@@ -65,9 +65,8 @@ Next, install ports and sources:
 	cd /freebsd
 	mkdir ports src packages
 
-	# Or use svn if you prefer
-	csup -h cvsup.???.freebsd.org /usr/share/examples/cvsup/ports-supfile
-	csup -h cvsup.???.freebsd.org /usr/share/examples/cvsup/stable-supfile
+	svn co https://svn0.us-east.FreeBSD.org/base/stable/10 src
+	svn co https://svn0.us-east.FreeBSD.org/ports/head ports
 
 And we should be ready to try a shot:
 
diff --git a/tools/tools/sysdoc/sysdoc.sh b/tools/tools/sysdoc/sysdoc.sh
index b07c53dd69b0..872eabd212c6 100644
--- a/tools/tools/sysdoc/sysdoc.sh
+++ b/tools/tools/sysdoc/sysdoc.sh
@@ -59,12 +59,12 @@ implementation, see the respecting manual pages.
 This manual page is automatically generated
 by a set of scripts written by
 .An -nosplit
-.An Tom Rhodes Aq trhodes@FreeBSD.org ,
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org ,
 with significant contributions from
-.An Giorgos Keramidas Aq keramida@FreeBSD.org ,
-.An Ruslan Ermilov Aq ru@FreeBSD.org ,
+.An Giorgos Keramidas Aq Mt keramida@FreeBSD.org ,
+.An Ruslan Ermilov Aq Mt ru@FreeBSD.org ,
 and
-.An Marc Silver Aq marcs@draenor.org .
+.An Marc Silver Aq Mt marcs@draenor.org .
 .Sh BUGS
 Sometimes
 .Fx
diff --git a/tools/tools/vimage/vimage.8 b/tools/tools/vimage/vimage.8
index e9a24c411a1e..306bf83a90ef 100644
--- a/tools/tools/vimage/vimage.8
+++ b/tools/tools/vimage/vimage.8
@@ -188,8 +188,8 @@ of the main FreeBSD tree.
 As a result of a project sponsored by the FreeBSD Foundation and
 Stiching NLNet, integrated virtualized network stack first appeared
 in FreeBSD 8.0.
+.Sh AUTHORS
+.An Marko Zec Aq Mt zec@fer.hr
 .Sh BUGS
 Deletion of vimages / vnets is known to leak kernel memory and fail at
 stopping various timers, hence may lead to system crashes.
-.Sh AUTHOR
-.An "Marko Zec" Aq zec@fer.hr
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index ba9d0a5efcf4..353816a0cea0 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -143,6 +143,7 @@ SUBDIR=	alias \
 	rwall \
 	script \
 	sed \
+	send-pr \
 	seq \
 	shar \
 	showmount \
@@ -162,6 +163,7 @@ SUBDIR=	alias \
 	${_tests} \
 	tftp \
 	time \
+	timeout \
 	tip \
 	top \
 	touch \
@@ -265,10 +267,6 @@ SUBDIR+=	drill
 SUBDIR+=	host
 .endif
 
-.if ${MK_LIBTHR} != "no"
-SUBDIR+=	csup
-.endif
-
 .if ${MK_LOCATE} != "no"
 SUBDIR+=	locate
 .endif
@@ -362,7 +360,7 @@ SUBDIR+=	yacc
 SUBDIR+=	vi
 .endif
 
-.if ${MK_VT_SUPPORT} != "no"
+.if ${MK_VT} != "no"
 SUBDIR+=	vtfontcvt
 .endif
 
diff --git a/usr.bin/Makefile.ia64 b/usr.bin/Makefile.ia64
deleted file mode 100644
index fee2fb076811..000000000000
--- a/usr.bin/Makefile.ia64
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-SUBDIR+=	smbutil
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 2c4deaea5599..1ef8c89fd7ed 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -570,7 +570,7 @@ An
 command first appeared in AT&T UNIX Version 1.
 In
 .Fx 8.0 ,
-.An "Kai Wang" Aq kaiw@FreeBSD.org
+.An Kai Wang Aq Mt kaiw@FreeBSD.org
 reimplemented
 .Nm
 and
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index a87697439f76..7dc1529f7e5a 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -330,12 +330,13 @@ job-creation lock file
 .Xr cron 8 ,
 .Xr sendmail 8
 .Sh AUTHORS
+.An -nosplit
 At was mostly written by
-.An Thomas Koenig Aq ig25@rz.uni-karlsruhe.de .
+.An Thomas Koenig Aq Mt ig25@rz.uni-karlsruhe.de .
 The time parsing routines are by
-.An David Parsons Aq orc@pell.chi.il.us ,
+.An David Parsons Aq Mt orc@pell.chi.il.us ,
 with minor enhancements by
-.An Joe Halpin Aq joe.halpin@attbi.com .
+.An Joe Halpin Aq Mt joe.halpin@attbi.com .
 .Sh BUGS
 If the file
 .Pa /var/run/utx.active
diff --git a/usr.bin/bluetooth/bthost/bthost.1 b/usr.bin/bluetooth/bthost/bthost.1
index e4a4abc45ecb..6ee4b08431e0 100644
--- a/usr.bin/bluetooth/bthost/bthost.1
+++ b/usr.bin/bluetooth/bthost/bthost.1
@@ -112,4 +112,4 @@ foo: Unknown Protocol/Service Multiplexor
 .Xr bluetooth.hosts 5 ,
 .Xr bluetooth.protocols 5
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/usr.bin/bluetooth/btsockstat/btsockstat.1 b/usr.bin/bluetooth/btsockstat/btsockstat.1
index ad5063da32c7..41bf2a1cce84 100644
--- a/usr.bin/bluetooth/btsockstat/btsockstat.1
+++ b/usr.bin/bluetooth/btsockstat/btsockstat.1
@@ -77,7 +77,7 @@ Display a list of active routing entries (if any) for specified protocol.
 .Sh SEE ALSO
 .Xr ng_btsocket 4
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Most likely.
 Please report if found.
diff --git a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1 b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
index 92c7d4545ab3..0f60089061f5 100644
--- a/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
+++ b/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1
@@ -181,6 +181,6 @@ can be used to talk to the remote serial port on the server.
 .Xr rfcomm_pppd 8 ,
 .Xr sdpd 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Please report if found.
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
index fceee099a17a..2fc2bee673a3 100644
--- a/usr.bin/bmake/Makefile
+++ b/usr.bin/bmake/Makefile
@@ -14,10 +14,10 @@ CFLAGS+= -I${.CURDIR}
 CLEANDIRS+= FreeBSD
 CLEANFILES+= bootstrap
 
-#	$Id: Makefile,v 1.23 2014/01/02 22:20:52 sjg Exp $
+#	$Id: Makefile,v 1.27 2014/06/20 14:51:54 sjg Exp $
 
 # Base version on src date
-MAKE_VERSION= 20140101
+MAKE_VERSION= 20140620
 
 PROG?=	${.CURDIR:T}
 
@@ -106,6 +106,7 @@ COPTS.meta.c += -DHAVE_FILEMON_H -I${FILEMON_H:H}
 SUBDIR+= unit-tests
 .endif
 
+
 MAN= ${PROG}.1
 MAN1= ${MAN}
 
diff --git a/usr.bin/bmake/config.h b/usr.bin/bmake/config.h
index 1edb1d3594d8..0e4e32d2ea8b 100644
--- a/usr.bin/bmake/config.h
+++ b/usr.bin/bmake/config.h
@@ -146,6 +146,9 @@
    `HAVE_STRUCT_STAT_ST_RDEV' instead. */
 #define HAVE_ST_RDEV 1
 
+/* Define to 1 if you have the `sysctl' function. */
+#define HAVE_SYSCTL 1
+
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
    */
 /* #undef HAVE_SYS_DIR_H */
@@ -166,6 +169,9 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#define HAVE_SYS_SYSCTL_H 1
+
 /* Define to 1 if you have the <sys/time.h> header file. */
 #define HAVE_SYS_TIME_H 1
 
@@ -230,7 +236,7 @@
 #define PACKAGE_NAME "bmake"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "bmake 20140101"
+#define PACKAGE_STRING "bmake 20140214"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "bmake"
@@ -239,7 +245,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "20140101"
+#define PACKAGE_VERSION "20140214"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -300,6 +306,9 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 /* #undef _POSIX_SOURCE */
 
+/* C99 function name */
+/* #undef __func__ */
+
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
diff --git a/usr.bin/brandelf/brandelf.1 b/usr.bin/brandelf/brandelf.1
index 467578c15a86..6b8477773c6a 100644
--- a/usr.bin/brandelf/brandelf.1
+++ b/usr.bin/brandelf/brandelf.1
@@ -101,4 +101,4 @@ manual page first appeared in
 .Fx 2.2 .
 .Sh AUTHORS
 This manual page was written by
-.An John-Mark Gurney Aq jmg@FreeBSD.org .
+.An John-Mark Gurney Aq Mt jmg@FreeBSD.org .
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.1 b/usr.bin/bsdiff/bsdiff/bsdiff.1
index f4998ea2b2ba..bca199f3ab90 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.1
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.1
@@ -66,7 +66,7 @@ an absolute minimum working set size of 8 times the size of
 .Sh SEE ALSO
 .Xr bspatch 1
 .Sh AUTHORS
-.An Colin Percival Aq cperciva@FreeBSD.org
+.An Colin Percival Aq Mt cperciva@FreeBSD.org
 .Sh BUGS
 The
 .Nm
diff --git a/usr.bin/bsdiff/bspatch/bspatch.1 b/usr.bin/bsdiff/bspatch/bspatch.1
index 352d0cfa1be6..edbfb198eaed 100644
--- a/usr.bin/bsdiff/bspatch/bspatch.1
+++ b/usr.bin/bsdiff/bspatch/bspatch.1
@@ -62,7 +62,7 @@ of performance.
 .Sh SEE ALSO
 .Xr bsdiff 1
 .Sh AUTHORS
-.An Colin Percival Aq cperciva@FreeBSD.org
+.An Colin Percival Aq Mt cperciva@FreeBSD.org
 .Sh BUGS
 The
 .Nm
diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd
index c1374d08e6e0..9205bd9f23f3 100644
--- a/usr.bin/calendar/calendars/calendar.freebsd
+++ b/usr.bin/calendar/calendars/calendar.freebsd
@@ -36,6 +36,7 @@
 01/26	Andrew Gallatin <gallatin@FreeBSD.org> born in Buffalo, New York, United States, 1970
 01/27	Nick Sayer <nsayer@FreeBSD.org> born in San Diego, California, United States, 1968
 01/27	Jacques Anthony Vidrine <nectar@FreeBSD.org> born in Baton Rouge, Louisiana, United States, 1971
+01/27	Garrett Cooper <ngie@FreeBSD.org> born in Seattle, Washington, United States, 1984
 01/31	Hidetoshi Shimokawa <simokawa@FreeBSD.org> born in Yokohama, Kanagawa, Japan, 1970
 02/01	Doug Rabson <dfr@FreeBSD.org> born in London, England, 1966
 02/01	Nicola Vitale <nivit@FreeBSD.org> born in Busto Arsizio, Varese, Italy, 1976
@@ -284,6 +285,7 @@
 09/03	Cheng-Lung Sung <clsung@FreeBSD.org> born in Taipei, Taiwan, Republic of China, 1977
 09/05	Mark Robert Vaughan Murray <markm@FreeBSD.org> born in Harare, Mashonaland, Zimbabwe, 1961
 09/05	Adrian Harold Chadd <adrian@FreeBSD.org> born in Perth, Western Australia, Australia, 1979
+09/05	Rodrigo Osorio <rodrigo@FreeBSD.org> born in Montevideo, Uruguay, 1975
 09/07	Tim Bishop <tdb@FreeBSD.org> born in Cornwall, United Kingdom, 1978
 09/07	Chris Rees <crees@FreeBSD.org> born in Kettering, United Kingdom, 1987
 09/08	Boris Samorodov <bsam@FreeBSD.org> born in Krasnodar, Russian Federation, 1963
@@ -364,6 +366,7 @@
 12/18	Chris Timmons <cwt@FreeBSD.org> born in Ellensburg, Washington, United States, 1964
 12/18	Dag-Erling Smorgrav <des@FreeBSD.org> born in Brussels, Belgium, 1977
 12/18	Semen Ustimenko <semenu@FreeBSD.org> born in Novosibirsk, Russian Federation, 1979
+12/19	Stephen Hurd <shurd@FreeBSD.org> born in Estevan, Saskatchewan, Canada, 1975
 12/21	Rong-En Fan <rafan@FreeBSD.org> born in Taipei, Taiwan, Republic of China, 1982
 12/22	Maxim Sobolev <sobomax@FreeBSD.org> born in Dnepropetrovsk, Ukraine, 1976
 12/23	Sean Chittenden <seanc@FreeBSD.org> born in Seattle, Washington, United States, 1979
diff --git a/usr.bin/calendar/calendars/calendar.holiday b/usr.bin/calendar/calendars/calendar.holiday
index d2dcd5af003d..3fdee69be713 100644
--- a/usr.bin/calendar/calendars/calendar.holiday
+++ b/usr.bin/calendar/calendars/calendar.holiday
@@ -248,7 +248,7 @@
 06/30	Day of the Army in Guatemala
 06/MonFirst	Jefferson Davis's Birthday in Alabama & Mississippi (1st Monday)
 06/MonFirst	Jefferson Davis's Birthday in Florida, Georgia, & S. Carolina
-07/01	Dominion Day in Canada
+07/01	Canada Day
 07/01	Freedom Day in Suriname
 07/01	Independence Day in Burundi
 07/01	National Day in Rwanda
diff --git a/usr.bin/clang/clang.prog.mk b/usr.bin/clang/clang.prog.mk
index 5f8f7a9af28b..1b4e126b4e1c 100644
--- a/usr.bin/clang/clang.prog.mk
+++ b/usr.bin/clang/clang.prog.mk
@@ -11,8 +11,8 @@ DPADD+=	${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
 LDADD+=	${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a
 .endfor
 
-DPADD+=	${LIBNCURSES}
-LDADD+=	-lncurses
+DPADD+=	${LIBNCURSESW}
+LDADD+=	-lncursesw
 
 BINDIR?= /usr/bin
 
diff --git a/usr.bin/cpuset/cpuset.1 b/usr.bin/cpuset/cpuset.1
index 17d9ce9ed26c..8ea2702499f1 100644
--- a/usr.bin/cpuset/cpuset.1
+++ b/usr.bin/cpuset/cpuset.1
@@ -191,4 +191,4 @@ The
 command first appeared in
 .Fx 7.1 .
 .Sh AUTHORS
-.An Jeffrey Roberson Aq jeff@FreeBSD.org
+.An Jeffrey Roberson Aq Mt jeff@FreeBSD.org
diff --git a/usr.bin/csup/Makefile b/usr.bin/csup/Makefile
deleted file mode 100644
index 0cea8211fa85..000000000000
--- a/usr.bin/csup/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $FreeBSD$
-
-PROG=	csup
-SRCS=	attrstack.c \
-	auth.c \
-	config.c \
-	detailer.c \
-	diff.c \
-	fattr.c \
-	fixups.c \
-	fnmatch.c \
-	globtree.c \
-	idcache.c \
-	keyword.c \
-	lex.rcs.c \
-	lister.c \
-	main.c \
-	misc.c \
-	mux.c \
-	parse.y \
-	pathcomp.c \
-	proto.c \
-	rcsfile.c \
-	rcsparse.c \
-	rsyncfile.c \
-	status.c \
-	stream.c \
-	threads.c \
-	token.l \
-	updater.c
-
-CFLAGS+= -I. -I${.CURDIR}
-CFLAGS+= -DHAVE_FFLAGS -DNDEBUG
-WARNS?=	1
-
-DPADD=	${LIBMD} ${LIBZ} ${LIBPTHREAD}
-LDADD=	-lmd -lz -lpthread
-
-SCRIPTS=	cpasswd.sh
-MAN=		csup.1 cpasswd.1
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/csup/README b/usr.bin/csup/README
deleted file mode 100644
index 879c4811792e..000000000000
--- a/usr.bin/csup/README
+++ /dev/null
@@ -1,39 +0,0 @@
-$FreeBSD$
-
-Authors
--------
-
-CVSup was originally written in Modula-3 by
-	John Polstra <jdp@polstra.com>.
-
-Csup is a rewrite of CVSup in C.  It has been mostly written by
-	Maxime Henrion <mux@FreeBSD.org>.
-
-A few contributors have helped him in his task and they are listed here in
-alphabetical order :
-
-	Olivier Houchard <cognet@FreeBSD.org>
-	Ulf Lilleengen <lulf@kerneled.org>
-	Christoph Mathys <cmathys@bluewin.ch>	(Google SoC Project)
-	Etienne Vidal <etienne.vidal@gmail.com>
-
-
-Building & Installing
----------------------
-
-Csup should build and run fine under any *BSD OS (that includes FreeBSD,
-NetBSD, OpenBSD and DragonFlyBSD), as well as Linux and Darwin.  If you
-have a problem building from source, drop me a mail!
-
-There is one Makefile specifically tailored for *BSD systems named
-Makefile and another one that is gmake-specific for Darwin and Linux
-users named GNUmakefile.  You don't really need to worry about that
-since whatever your "make" command is, it should pick up the correct
-Makefile.
-
-As usual, to build the source code, just run "make".  Once this is done,
-just run "make install" to install the binary and manual page.
-
-Be warned however that if the packaging system of your OS knows about
-csup, it is certainly better to install it from there rather than by
-hand, so that it can then be properly deinstalled.
diff --git a/usr.bin/csup/TODO b/usr.bin/csup/TODO
deleted file mode 100644
index 9854d35acc83..000000000000
--- a/usr.bin/csup/TODO
+++ /dev/null
@@ -1,28 +0,0 @@
-$FreeBSD$
-
-BUGS:
-
-- Fix every XXX in the code :-).
-- The stream API needs some polishing.  It needs proper error numbers
-  and a stream_error() function similar to the ferror() function.
-- The yacc/lex code to parse the configuration file is sub-optimal.  It
-  has global variables because of yacc, but I think it should be possible
-  to do it better by using YYFUNC_PROTOTYPE or something.  I think it
-  should also be possible to completely get rid of the lex file.
-- The $Log$ CVS keyword is not supported.
-- Add missing support for supfile keywords and add sanity checks for
-  some of them.  Also, we're not supposed to choke on unknown keywords
-  to stay in line with CVSup, which just ignores them in order to
-  maintain compatibility with sup configuration files.
-
-MISSING FEATURES:
-
-- Add support for shell commands sent by the server.
-- Add missing support for various CVSup options : -D, -e and -E (requires
-  shell commands support) and the destDir parameter.
-- For now, this code should build fine on FreeBSD, NetBSD, OpenBSD,
-  Linux and Darwin.  Solaris support would also be nice at some point.
-- Implement some new useful options : the ability to generate CVS
-  checkout files (files in CVS/ subdirectores), a command line override
-  to only update a specific collection and a third verbosity level to
-  display commit log messages.
diff --git a/usr.bin/csup/attrstack.c b/usr.bin/csup/attrstack.c
deleted file mode 100644
index f5f56b34b5a3..000000000000
--- a/usr.bin/csup/attrstack.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 2006, Maxime Henrion <mux@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.
- *
- * $Id$
- */
-
-#include <assert.h>
-#include <stdlib.h>
-
-#include "attrstack.h"
-#include "fattr.h"
-#include "misc.h"
-
-#define	ATTRSTACK_DEFSIZE	16	/* Initial size of the stack. */
-
-struct attrstack {
-	struct fattr **stack;
-	size_t cur;
-	size_t size;
-};
-
-struct attrstack *
-attrstack_new(void)
-{
-	struct attrstack *as;
-
-	as = xmalloc(sizeof(struct attrstack));
-	as->stack = xmalloc(sizeof(struct fattr *) * ATTRSTACK_DEFSIZE);
-	as->size = ATTRSTACK_DEFSIZE;
-	as->cur = 0;
-	return (as);
-}
-
-struct fattr *
-attrstack_pop(struct attrstack *as)
-{
-
-	assert(as->cur > 0);
-	return (as->stack[--as->cur]);
-}
-
-void
-attrstack_push(struct attrstack *as, struct fattr *fa)
-{
-
-	if (as->cur >= as->size) {
-		as->size *= 2;
-		as->stack = xrealloc(as->stack,
-		    sizeof(struct fattr *) * as->size);
-	}
-	as->stack[as->cur++] = fa;
-}
-
-size_t
-attrstack_size(struct attrstack *as)
-{
-
-	return (as->cur);
-}
-
-void
-attrstack_free(struct attrstack *as)
-{
-
-	assert(as->cur == 0);
-	free(as->stack);
-	free(as);
-}
diff --git a/usr.bin/csup/attrstack.h b/usr.bin/csup/attrstack.h
deleted file mode 100644
index 721313c16bdb..000000000000
--- a/usr.bin/csup/attrstack.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2006, Maxime Henrion <mux@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.
- *
- * $Id$
- */
-#ifndef _ATTRSTACK_H_
-#define _ATTRSTACK_H_
-
-struct fattr;
-struct attrstack;
-
-struct attrstack	*attrstack_new(void);
-void			 attrstack_push(struct attrstack *, struct fattr *);
-struct fattr		*attrstack_pop(struct attrstack *);
-size_t			 attrstack_size(struct attrstack *);
-void			 attrstack_free(struct attrstack *);
-
-#endif /* !_ATTRSTACK_H_ */
diff --git a/usr.bin/csup/auth.c b/usr.bin/csup/auth.c
deleted file mode 100644
index 1704eba53b23..000000000000
--- a/usr.bin/csup/auth.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/*-
- * Copyright (c) 2003-2007, Petar Zhivkov Petrov <pesho.petrov@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$
- */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/types.h>
-
-#include <arpa/inet.h>
-#include <netinet/in.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "auth.h"
-#include "config.h"
-#include "misc.h"
-#include "proto.h"
-#include "stream.h"
-
-#define MD5_BYTES			16
-
-/* This should be at least 2 * MD5_BYTES + 6 (length of "$md5$" + 1) */
-#define MD5_CHARS_MAX		(2*(MD5_BYTES)+6)
-
-struct srvrecord {
-	char server[MAXHOSTNAMELEN];
-	char client[256];
-	char password[256];
-};
-
-static int		auth_domd5auth(struct config *);
-static int		auth_lookuprecord(char *, struct srvrecord *);
-static int		auth_parsetoken(char **, char *, int);
-static void		auth_makesecret(struct srvrecord *, char *);
-static void		auth_makeresponse(char *, char *, char *);
-static void		auth_readablesum(unsigned char *, char *);
-static void		auth_makechallenge(struct config *, char *);
-static int		auth_checkresponse(char *, char *, char *);
-
-int auth_login(struct config *config)
-{
-	struct stream *s;
-	char hostbuf[MAXHOSTNAMELEN];
-	char *login, *host;
-	int error;
-
-	s = config->server;
-	error = gethostname(hostbuf, sizeof(hostbuf));
-	hostbuf[sizeof(hostbuf) - 1] = '\0';
-	if (error)
-		host = NULL;
-	else
-		host = hostbuf;
-	login = getlogin();
-	proto_printf(s, "USER %s %s\n", login != NULL ? login : "?",
-	    host != NULL ? host : "?");
-	stream_flush(s);
-	error = auth_domd5auth(config);
-	return (error);
-}
-
-static int
-auth_domd5auth(struct config *config)
-{
-	struct stream *s;
-	char *line, *cmd, *challenge, *realm, *client, *srvresponse, *msg;
-	char shrdsecret[MD5_CHARS_MAX], response[MD5_CHARS_MAX];
-	char clichallenge[MD5_CHARS_MAX];
-	struct srvrecord auth;
-	int error;
-
-	lprintf(2, "MD5 authentication started\n");
-	s = config->server;
-	line = stream_getln(s, NULL);
-	cmd = proto_get_ascii(&line);
-	realm = proto_get_ascii(&line);
-	challenge = proto_get_ascii(&line);
-	if (challenge == NULL ||
-	    line != NULL ||
-	    (strcmp(cmd, "AUTHMD5") != 0)) {
-		lprintf(-1, "Invalid server reply to USER\n");
-		return (STATUS_FAILURE);
-	}
-
-	client = NULL;
-	response[0] = clichallenge[0] = '.';
-	response[1] = clichallenge[1] = 0;
-	if (config->reqauth || (strcmp(challenge, ".") != 0)) {
-		if (strcmp(realm, ".") == 0) {
-			lprintf(-1, "Authentication required, but not enabled on server\n");
-			return (STATUS_FAILURE);
-		}
-		error = auth_lookuprecord(realm, &auth);
-		if (error != STATUS_SUCCESS)
-			return (error);
-		client = auth.client;
-		auth_makesecret(&auth, shrdsecret);
-	}
-
-	if (strcmp(challenge, ".") != 0)
-		auth_makeresponse(challenge, shrdsecret, response);
-	if (config->reqauth)
-		auth_makechallenge(config, clichallenge);
-	proto_printf(s, "AUTHMD5 %s %s %s\n",
-		client == NULL ? "." : client, response, clichallenge);
-	stream_flush(s);
-	line = stream_getln(s, NULL);
-	cmd = proto_get_ascii(&line);
-	if (cmd == NULL || line == NULL)
-		goto bad;
-	if (strcmp(cmd, "OK") == 0) {
-		srvresponse = proto_get_ascii(&line);
-		if (srvresponse == NULL)
-			goto bad;
-		if (config->reqauth &&
-		    !auth_checkresponse(srvresponse, clichallenge, shrdsecret)) {
-			lprintf(-1, "Server failed to authenticate itself to client\n");
-			return (STATUS_FAILURE);
-		}
-		lprintf(2, "MD5 authentication successful\n");
-		return (STATUS_SUCCESS);
-	}
-	if (strcmp(cmd, "!") == 0) {
-		msg = proto_get_rest(&line);
-		if (msg == NULL)
-			goto bad;
-		lprintf(-1, "Server error: %s\n", msg);
-		return (STATUS_FAILURE);
-	}
-bad:
-	lprintf(-1, "Invalid server reply to AUTHMD5\n");
-	return (STATUS_FAILURE);
-}
-
-static int
-auth_lookuprecord(char *server, struct srvrecord *auth)
-{
-	char *home, *line, authfile[FILENAME_MAX];
-	struct stream *s;
-	int linenum = 0, error;
-
-	home = getenv("HOME");
-	if (home == NULL) {
-		lprintf(-1, "Environment variable \"HOME\" is not set\n");
-		return (STATUS_FAILURE);
-	}
-	snprintf(authfile, sizeof(authfile), "%s/%s", home, AUTHFILE);
-	s = stream_open_file(authfile, O_RDONLY);
-	if (s == NULL) {
-		lprintf(-1, "Could not open file %s\n", authfile);
-		return (STATUS_FAILURE);
-	}
-
-	while ((line = stream_getln(s, NULL)) != NULL) {
-		linenum++;
-		if (line[0] == '#' || line[0] == '\0')
-			continue;
-		error = auth_parsetoken(&line, auth->server,
-		    sizeof(auth->server));
-		if (error != STATUS_SUCCESS) {
-			lprintf(-1, "%s:%d Missing client name\n", authfile, linenum);
-			goto close;
-		}
-		/* Skip the rest of this line, it isn't what we are looking for. */
-		if (strcasecmp(auth->server, server) != 0)
-			continue;
-		error = auth_parsetoken(&line, auth->client,
-		    sizeof(auth->client));
-		if (error != STATUS_SUCCESS) {
-			lprintf(-1, "%s:%d Missing password\n", authfile, linenum);
-			goto close;
-		}
-		error = auth_parsetoken(&line, auth->password,
-		    sizeof(auth->password));
-		if (error != STATUS_SUCCESS) {
-			lprintf(-1, "%s:%d Missing comment\n", authfile, linenum);
-			goto close;
-		}
-		stream_close(s);
-		lprintf(2, "Found authentication record for server \"%s\"\n",
-		    server);
-		return (STATUS_SUCCESS);
-	}
-	lprintf(-1, "Unknown server \"%s\". Fix your %s\n", server , authfile);
-	memset(auth->password, 0, sizeof(auth->password));
-close:
-	stream_close(s);
-	return (STATUS_FAILURE);
-}
-
-static int
-auth_parsetoken(char **line, char *buf, int len)
-{
-	char *colon;
-
-	colon = strchr(*line, ':');
-	if (colon == NULL)
-		return (STATUS_FAILURE);
-	*colon = 0;
-	buf[len - 1] = 0;
-	strncpy(buf, *line, len - 1);
-	*line = colon + 1;
-	return (STATUS_SUCCESS);
-}
-
-static void
-auth_makesecret(struct srvrecord *auth, char *secret)
-{
-	char *s, ch;
-	const char *md5salt = "$md5$";
-	unsigned char md5sum[MD5_BYTES];
-	MD5_CTX md5;
-
-	MD5_Init(&md5);
-	for (s = auth->client; *s != 0; ++s) {
-		ch = tolower(*s);
-		MD5_Update(&md5, &ch, 1);
-	}
-	MD5_Update(&md5, ":", 1);
-	for (s = auth->server; *s != 0; ++s) {
-		ch = tolower(*s);
-		MD5_Update(&md5, &ch, 1);
-	}
-	MD5_Update(&md5, ":", 1);
-	MD5_Update(&md5, auth->password, strlen(auth->password));
-	MD5_Final(md5sum, &md5);
-	memset(secret, 0, MD5_CHARS_MAX);
-	strcpy(secret, md5salt);
-	auth_readablesum(md5sum, secret + strlen(md5salt));
-}
-
-static void
-auth_makeresponse(char *challenge, char *sharedsecret, char *response)
-{
-	MD5_CTX md5;
-	unsigned char md5sum[MD5_BYTES];
-
-	MD5_Init(&md5);
-	MD5_Update(&md5, sharedsecret, strlen(sharedsecret));
-	MD5_Update(&md5, ":", 1);
-	MD5_Update(&md5, challenge, strlen(challenge));
-	MD5_Final(md5sum, &md5);
-	auth_readablesum(md5sum, response);
-}
-
-/*
- * Generates a challenge string which is an MD5 sum
- * of a fairly random string. The purpose is to decrease
- * the possibility of generating the same challenge
- * string (even by different clients) more then once
- * for the same server.
- */
-static void
-auth_makechallenge(struct config *config, char *challenge)
-{
-	MD5_CTX md5;
-	unsigned char md5sum[MD5_BYTES];
-	char buf[128];
-	struct timeval tv;
-	struct sockaddr_in laddr;
-	pid_t pid, ppid;
-	int error, addrlen;
-
-	gettimeofday(&tv, NULL);
-	pid = getpid();
-	ppid = getppid();
-	srandom(tv.tv_usec ^ tv.tv_sec ^ pid);
-	addrlen = sizeof(laddr);
-	error = getsockname(config->socket, (struct sockaddr *)&laddr, &addrlen);
-	if (error < 0) {
-		memset(&laddr, 0, sizeof(laddr));
-	}
-	gettimeofday(&tv, NULL);
-	MD5_Init(&md5);
-	snprintf(buf, sizeof(buf), "%s:%jd:%ld:%ld:%d:%d",
-	    inet_ntoa(laddr.sin_addr), (intmax_t)tv.tv_sec, tv.tv_usec,
-	    random(), pid, ppid);
-	MD5_Update(&md5, buf, strlen(buf));
-	MD5_Final(md5sum, &md5);
-	auth_readablesum(md5sum, challenge);
-}
-
-static int
-auth_checkresponse(char *response, char *challenge, char *secret)
-{
-	char correctresponse[MD5_CHARS_MAX];
-
-	auth_makeresponse(challenge, secret, correctresponse);
-	return (strcmp(response, correctresponse) == 0);
-}
-
-static void
-auth_readablesum(unsigned char *md5sum, char *readable)
-{
-	unsigned int i;
-	char *s = readable;
-
-	for (i = 0; i < MD5_BYTES; ++i, s+=2) {
-		sprintf(s, "%.2x", md5sum[i]);
-	}
-}
-
diff --git a/usr.bin/csup/auth.h b/usr.bin/csup/auth.h
deleted file mode 100644
index 61052e33a140..000000000000
--- a/usr.bin/csup/auth.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2003-2007, Petar Zhivkov Petrov <pesho.petrov@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 _AUTH_H_
-#define _AUTH_H_
-
-#define	AUTHFILE	".csup/auth" /* user home relative */
-
-struct config;
-
-int auth_login(struct config *);
-
-#endif /* !_AUTH_H_ */
-
diff --git a/usr.bin/csup/config.c b/usr.bin/csup/config.c
deleted file mode 100644
index 46ae6cd0c160..000000000000
--- a/usr.bin/csup/config.c
+++ /dev/null
@@ -1,579 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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/types.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "config.h"
-#include "globtree.h"
-#include "keyword.h"
-#include "misc.h"
-#include "parse.h"
-#include "stream.h"
-#include "token.h"
-
-static int		 config_parse_refusefiles(struct coll *);
-static int		 config_parse_refusefile(struct coll *, char *);
-
-extern FILE *yyin;
-
-/* These are globals because I can't think of a better way with yacc. */
-static STAILQ_HEAD(, coll) colls;
-static struct coll *cur_coll;
-static struct coll *defaults;
-static struct coll *ovcoll;
-static int ovmask;
-static const char *cfgfile;
-
-/*
- * Extract all the configuration information from the config
- * file and some command line parameters.
- */
-struct config *
-config_init(const char *file, struct coll *override, int overridemask)
-{
-	struct config *config;
-	struct coll *coll;
-	size_t slen;
-	char *prefix;
-	int error;
-	mode_t mask;
-
-	config = xmalloc(sizeof(struct config));
-	memset(config, 0, sizeof(struct config));
-	STAILQ_INIT(&colls);
-
-	defaults = coll_new(NULL);
-	/* Set the default umask. */
-	mask = umask(0);
-	umask(mask);
-	defaults->co_umask = mask;
-	ovcoll = override;
-	ovmask = overridemask;
-
-	/* Extract a list of collections from the configuration file. */
-	cur_coll = coll_new(defaults);
-	yyin = fopen(file, "r");
-	if (yyin == NULL) {
-		lprintf(-1, "Cannot open \"%s\": %s\n", file, strerror(errno));
-		goto bad;
-	}
-	cfgfile = file;
-	error = yyparse();
-	fclose(yyin);
-	if (error)
-		goto bad;
-
-	memcpy(&config->colls, &colls, sizeof(colls));
-	if (STAILQ_EMPTY(&config->colls)) {
-		lprintf(-1, "Empty supfile\n");
-		goto bad;
-	}
-
-	/* Fixup the list of collections. */
-	STAILQ_FOREACH(coll, &config->colls, co_next) {
- 		if (coll->co_base == NULL)
-			coll->co_base = xstrdup("/usr/local/etc/cvsup");
-		if (coll->co_colldir == NULL)
-			coll->co_colldir = "sup";
-		if (coll->co_prefix == NULL) {
-			coll->co_prefix = xstrdup(coll->co_base);
-		/*
-		 * If prefix is not an absolute pathname, it is
-		 * interpreted relative to base.
-		 */
-		} else if (coll->co_prefix[0] != '/') {
-			slen = strlen(coll->co_base);
-			if (slen > 0 && coll->co_base[slen - 1] != '/')
-				xasprintf(&prefix, "%s/%s", coll->co_base,
-				    coll->co_prefix);
-			else
-				xasprintf(&prefix, "%s%s", coll->co_base,
-				    coll->co_prefix);
-			free(coll->co_prefix);
-			coll->co_prefix = prefix;
-		}
-		coll->co_prefixlen = strlen(coll->co_prefix);
-		/* Determine whether to checksum RCS files or not. */
-		if (coll->co_options & CO_EXACTRCS)
-			coll->co_options |= CO_CHECKRCS;
-		else
-			coll->co_options &= ~CO_CHECKRCS;
-		/* In recent versions, we always try to set the file modes. */
-		coll->co_options |= CO_SETMODE;
-		coll->co_options |= CO_NORSYNC;
-		error = config_parse_refusefiles(coll);
-		if (error)
-			goto bad;
-	}
-
-	coll_free(cur_coll);
-	coll_free(defaults);
-	config->host = STAILQ_FIRST(&config->colls)->co_host;
-	return (config);
-bad:
-	coll_free(cur_coll);
-	coll_free(defaults);
-	config_free(config);
-	return (NULL);
-}
-
-int
-config_checkcolls(struct config *config)
-{
-	char linkname[4];
-	struct stat sb;
-	struct coll *coll;
-	int error, numvalid, ret;
-
-	numvalid = 0;
-	STAILQ_FOREACH(coll, &config->colls, co_next) {
-		error = stat(coll->co_prefix, &sb);
-		if (error || !S_ISDIR(sb.st_mode)) {
-			/* Skip this collection, and warn about it unless its
-			   prefix is a symbolic link pointing to "SKIP". */
-			coll->co_options |= CO_SKIP;
-			ret = readlink(coll->co_prefix, linkname,
-			    sizeof(linkname));
-			if (ret != 4 || memcmp(linkname, "SKIP", 4) != 0) {
-				lprintf(-1,"Nonexistent prefix \"%s\" for "
-				    "%s/%s\n", coll->co_prefix, coll->co_name,
-				    coll->co_release);
-			}
-			continue;
-		}
-		numvalid++;
-	}
-	return (numvalid);
-}
-
-static int
-config_parse_refusefiles(struct coll *coll)
-{
-	char *collstem, *suffix, *supdir, *path;
-	int error;
-
-	if (coll->co_colldir[0] == '/')
-		supdir = xstrdup(coll->co_colldir);
-	else
-		xasprintf(&supdir, "%s/%s", coll->co_base, coll->co_colldir);
-
-	/* First, the global refuse file that applies to all collections. */
-	xasprintf(&path, "%s/refuse", supdir);
-	error = config_parse_refusefile(coll, path);
-	free(path);
-	if (error) {
-		free(supdir);
-		return (error);
-	}
-
-	/* Next the per-collection refuse files that applies to all release/tag
-	   combinations. */
-	xasprintf(&collstem, "%s/%s/refuse", supdir, coll->co_name);
-	free(supdir);
-	error = config_parse_refusefile(coll, collstem);
-	if (error) {
-		free(collstem);
-		return (error);
-	}
-
-	/* Finally, the per-release and per-tag refuse file. */
-	suffix = coll_statussuffix(coll);
-	if (suffix != NULL) {
-		xasprintf(&path, "%s%s", collstem, suffix);
-		free(suffix);
-		error = config_parse_refusefile(coll, path);
-		free(path);
-	}
-	free(collstem);
-	return (error);
-}
-
-/*
- * Parses a "refuse" file, and records the relevant information in
- * coll->co_refusals.  If the file does not exist, it is silently
- * ignored.
- */
-static int
-config_parse_refusefile(struct coll *coll, char *path)
-{
-	struct stream *rd;
-	char *cp, *line, *pat;
-
-	rd = stream_open_file(path, O_RDONLY);
-	if (rd == NULL)
-		return (0);
-	while ((line = stream_getln(rd, NULL)) != NULL) {
-		pat = line;
-		for (;;) {
-			/* Trim leading whitespace. */
-			pat += strspn(pat, " \t");
-			if (pat[0] == '\0')
-				break;
-			cp = strpbrk(pat, " \t");
-			if (cp != NULL)
-				*cp = '\0';
-			pattlist_add(coll->co_refusals, pat);
-			if (cp == NULL)
-				break;
-			pat = cp + 1;
-		}
-	}
-	if (!stream_eof(rd)) {
-		stream_close(rd);
-		lprintf(-1, "Read failure from \"%s\": %s\n", path,
-		    strerror(errno));
-		return (-1);
-	}
-	stream_close(rd);
-	return (0);
-}
-
-void
-config_free(struct config *config)
-{
-	struct coll *coll;
-
-	while (!STAILQ_EMPTY(&config->colls)) {
-		coll = STAILQ_FIRST(&config->colls);
-		STAILQ_REMOVE_HEAD(&config->colls, co_next);
-		coll_free(coll);
-	}
-	if (config->server != NULL)
-		stream_close(config->server);
-	if (config->laddr != NULL)
-		free(config->laddr);
-	free(config);
-}
-
-/* Create a new collection, inheriting options from the default collection. */
-struct coll *
-coll_new(struct coll *def)
-{
-	struct coll *new;
-
-	new = xmalloc(sizeof(struct coll));
-	memset(new, 0, sizeof(struct coll));
-	if (def != NULL) {
-		new->co_options = def->co_options;
-		new->co_umask = def->co_umask;
-		if (def->co_host != NULL)
-			new->co_host = xstrdup(def->co_host);
-		if (def->co_base != NULL)
-			new->co_base = xstrdup(def->co_base);
-		if (def->co_date != NULL)
-			new->co_date = xstrdup(def->co_date);
-		if (def->co_prefix != NULL)
-			new->co_prefix = xstrdup(def->co_prefix);
-		if (def->co_release != NULL)
-			new->co_release = xstrdup(def->co_release);
-		if (def->co_tag != NULL)
-			new->co_tag = xstrdup(def->co_tag);
-		if (def->co_listsuffix != NULL)
-			new->co_listsuffix = xstrdup(def->co_listsuffix);
-	} else {
-		new->co_tag = xstrdup(".");
-		new->co_date = xstrdup(".");
-	}
-	new->co_keyword = keyword_new();
-	new->co_accepts = pattlist_new();
-	new->co_refusals = pattlist_new();
-	new->co_attrignore = FA_DEV | FA_INODE;
-	return (new);
-}
-
-void
-coll_override(struct coll *coll, struct coll *from, int mask)
-{
-	size_t i;
-	int newoptions, oldoptions;
-
-	newoptions = from->co_options & mask;
-	oldoptions = coll->co_options & (CO_MASK & ~mask);
-
-	if (from->co_release != NULL) {
-		if (coll->co_release != NULL)
-			free(coll->co_release);
-		coll->co_release = xstrdup(from->co_release);
-	}
-	if (from->co_host != NULL) {
-		if (coll->co_host != NULL)
-			free(coll->co_host);
-		coll->co_host = xstrdup(from->co_host);
-	}
-	if (from->co_base != NULL) {
-		if (coll->co_base != NULL)
-			free(coll->co_base);
-		coll->co_base = xstrdup(from->co_base);
-	}
-	if (from->co_colldir != NULL)
-		coll->co_colldir = from->co_colldir;
-	if (from->co_prefix != NULL) {
-		if (coll->co_prefix != NULL)
-			free(coll->co_prefix);
-		coll->co_prefix = xstrdup(from->co_prefix);
-	}
-	if (newoptions & CO_CHECKOUTMODE) {
-		if (from->co_tag != NULL) {
-			if (coll->co_tag != NULL)
-				free(coll->co_tag);
-			coll->co_tag = xstrdup(from->co_tag);
-		}
-		if (from->co_date != NULL) {
-			if (coll->co_date != NULL)
-				free(coll->co_date);
-			coll->co_date = xstrdup(from->co_date);
-		}
-	}
-	if (from->co_listsuffix != NULL) {
-		if (coll->co_listsuffix != NULL)
-			free(coll->co_listsuffix);
-		coll->co_listsuffix = xstrdup(from->co_listsuffix);
-	}
-	for (i = 0; i < pattlist_size(from->co_accepts); i++) {
-		pattlist_add(coll->co_accepts,
-		    pattlist_get(from->co_accepts, i));
-	}
-	for (i = 0; i < pattlist_size(from->co_refusals); i++) {
-		pattlist_add(coll->co_refusals,
-		    pattlist_get(from->co_refusals, i));
-	}
-	coll->co_options = oldoptions | newoptions;
-}
-
-char *
-coll_statussuffix(struct coll *coll)
-{
-	const char *tag;
-	char *suffix;
-
-	if (coll->co_listsuffix != NULL) {
-		xasprintf(&suffix, ".%s", coll->co_listsuffix);
-	} else if (coll->co_options & CO_USERELSUFFIX) {
-		if (coll->co_tag == NULL)
-			tag = ".";
-		else
-			tag = coll->co_tag;
-		if (coll->co_release != NULL) {
-			if (coll->co_options & CO_CHECKOUTMODE) {
-				xasprintf(&suffix, ".%s:%s",
-				    coll->co_release, tag);
-			} else {
-				xasprintf(&suffix, ".%s", coll->co_release);
-			}
-		} else if (coll->co_options & CO_CHECKOUTMODE) {
-			xasprintf(&suffix, ":%s", tag);
-		}
-	} else
-		suffix = NULL;
-	return (suffix);
-}
-
-char *
-coll_statuspath(struct coll *coll)
-{
-	char *path, *suffix;
-
-	suffix = coll_statussuffix(coll);
-	if (suffix != NULL) {
-		if (coll->co_colldir[0] == '/')
-			xasprintf(&path, "%s/%s/checkouts%s", coll->co_colldir,
-			    coll->co_name, suffix);
-		else
-			xasprintf(&path, "%s/%s/%s/checkouts%s", coll->co_base,
-			    coll->co_colldir, coll->co_name, suffix);
-	} else {
-		if (coll->co_colldir[0] == '/')
-			xasprintf(&path, "%s/%s/checkouts", coll->co_colldir,
-			    coll->co_name);
-		else
-			xasprintf(&path, "%s/%s/%s/checkouts", coll->co_base,
-			    coll->co_colldir, coll->co_name);
-	}
-	free(suffix);
-	return (path);
-}
-
-void
-coll_add(char *name)
-{
-	struct coll *coll;
-
-	cur_coll->co_name = name;
-	coll_override(cur_coll, ovcoll, ovmask);
-	if (cur_coll->co_release == NULL) {
-		lprintf(-1, "Release not specified for collection "
-		    "\"%s\"\n", cur_coll->co_name);
-		exit(1);
-	}
-	if (cur_coll->co_host == NULL) {
-		lprintf(-1, "Host not specified for collection "
-		    "\"%s\"\n", cur_coll->co_name);
-		exit(1);
-	}
-	if (!STAILQ_EMPTY(&colls)) {
-		coll = STAILQ_LAST(&colls, coll, co_next);
-		if (strcmp(coll->co_host, cur_coll->co_host) != 0) {
-			lprintf(-1, "All \"host\" fields in the supfile "
-			    "must be the same\n");
-			exit(1);
-		}
-	}
-	STAILQ_INSERT_TAIL(&colls, cur_coll, co_next);
-	cur_coll = coll_new(defaults);
-}
-
-void
-coll_free(struct coll *coll)
-{
-
-	if (coll == NULL)
-		return;
-	if (coll->co_host != NULL)
-		free(coll->co_host);
-	if (coll->co_base != NULL)
-		free(coll->co_base);
-	if (coll->co_date != NULL)
-		free(coll->co_date);
-	if (coll->co_prefix != NULL)
-		free(coll->co_prefix);
-	if (coll->co_release != NULL)
-		free(coll->co_release);
-	if (coll->co_tag != NULL)
-		free(coll->co_tag);
-	if (coll->co_cvsroot != NULL)
-		free(coll->co_cvsroot);
-	if (coll->co_name != NULL)
-		free(coll->co_name);
-	if (coll->co_listsuffix != NULL)
-		free(coll->co_listsuffix);
-	keyword_free(coll->co_keyword);
-	if (coll->co_dirfilter != NULL)
-		globtree_free(coll->co_dirfilter);
-	if (coll->co_dirfilter != NULL)
-		globtree_free(coll->co_filefilter);
-	if (coll->co_norsync != NULL)
-		globtree_free(coll->co_norsync);
-	if (coll->co_accepts != NULL)
-		pattlist_free(coll->co_accepts);
-	if (coll->co_refusals != NULL)
-		pattlist_free(coll->co_refusals);
-	free(coll);
-}
-
-void
-coll_setopt(int opt, char *value)
-{
-	struct coll *coll;
-	int error, mask;
-
-	coll = cur_coll;
-	switch (opt) {
-	case PT_HOST:
-		if (coll->co_host != NULL)
-			free(coll->co_host);
-		coll->co_host = value;
-		break;
-	case PT_BASE:
-		if (coll->co_base != NULL)
-			free(coll->co_base);
-		coll->co_base = value;
-		break;
-	case PT_DATE:
-		if (coll->co_date != NULL)
-			free(coll->co_date);
-		coll->co_date = value;
-		coll->co_options |= CO_CHECKOUTMODE;
-		break;
-	case PT_PREFIX:
-		if (coll->co_prefix != NULL)
-			free(coll->co_prefix);
-		coll->co_prefix = value;
-		break;
-	case PT_RELEASE:
-		if (coll->co_release != NULL)
-			free(coll->co_release);
-		coll->co_release = value;
-		break;
-	case PT_TAG:
-		if (coll->co_tag != NULL)
-			free(coll->co_tag);
-		coll->co_tag = value;
-		coll->co_options |= CO_CHECKOUTMODE;
-		break;
-	case PT_LIST:
-		if (strchr(value, '/') != NULL) {
-			lprintf(-1, "Parse error in \"%s\": \"list\" suffix "
-			    "must not contain slashes\n", cfgfile);
-			exit(1);
-		}
-		if (coll->co_listsuffix != NULL)
-			free(coll->co_listsuffix);
-		coll->co_listsuffix = value;
-		break;
-	case PT_UMASK:
-		error = asciitoint(value, &mask, 8);
-		free(value);
-		if (error) {
-			lprintf(-1, "Parse error in \"%s\": Invalid "
-			    "umask value\n", cfgfile);
-			exit(1);
-		}
-		coll->co_umask = mask;
-		break;
-	case PT_USE_REL_SUFFIX:
-		coll->co_options |= CO_USERELSUFFIX;
-		break;
-	case PT_DELETE:
-		coll->co_options |= CO_DELETE | CO_EXACTRCS;
-		break;
-	case PT_COMPRESS:
-		coll->co_options |= CO_COMPRESS;
-		break;
-	case PT_NORSYNC:
-		coll->co_options |= CO_NORSYNC;
-		break;
-	}
-}
-
-/* Set "coll" as being the default collection. */
-void
-coll_setdef(void)
-{
-
-	coll_free(defaults);
-	defaults = cur_coll;
-	cur_coll = coll_new(defaults);
-}
diff --git a/usr.bin/csup/config.h b/usr.bin/csup/config.h
deleted file mode 100644
index 6068b63bfc75..000000000000
--- a/usr.bin/csup/config.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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 _CONFIG_H_
-#define _CONFIG_H_
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-
-#include <time.h>
-
-#include "fattr.h"
-#include "misc.h"
-
-/*
- * Collection options.
- */
-#define	CO_BACKUP		0x00000001
-#define	CO_DELETE		0x00000002
-#define	CO_KEEP			0x00000004
-#define	CO_OLD			0x00000008
-#define	CO_UNLINKBUSY		0x00000010
-#define	CO_NOUPDATE		0x00000020
-#define	CO_COMPRESS		0x00000040
-#define	CO_USERELSUFFIX		0x00000080
-#define	CO_EXACTRCS		0x00000100
-#define	CO_CHECKRCS		0x00000200
-#define	CO_SKIP			0x00000400
-#define	CO_CHECKOUTMODE		0x00000800
-#define	CO_NORSYNC		0x00001000
-#define	CO_KEEPBADFILES		0x00002000
-#define	CO_EXECUTE		0x00004000
-#define	CO_SETOWNER		0x00008000
-#define	CO_SETMODE		0x00010000
-#define	CO_SETFLAGS		0x00020000
-#define	CO_NORCS		0x00040000
-#define	CO_STRICTCHECKRCS	0x00080000
-#define	CO_TRUSTSTATUSFILE	0x00100000
-#define	CO_DODELETESONLY	0x00200000
-#define	CO_DETAILALLRCSFILES	0x00400000
-
-#define	CO_MASK			0x007fffff
-
-/* Options that the server is allowed to set. */
-#define	CO_SERVMAYSET		(CO_SKIP | CO_NORSYNC | CO_NORCS)
-/* Options that the server is allowed to clear. */
-#define	CO_SERVMAYCLEAR		CO_CHECKRCS
-
-struct coll {
-	char *co_name;
-	char *co_host;
-	char *co_base;
-	char *co_date;
-	char *co_prefix;
-	size_t co_prefixlen;
-	char *co_release;
-	char *co_tag;
-	char *co_cvsroot;
-	int co_attrignore;
-	struct pattlist *co_accepts;
-	struct pattlist *co_refusals;
-	struct globtree *co_dirfilter;
-	struct globtree *co_filefilter;
-	struct globtree *co_norsync;
-	const char *co_colldir;
-	char *co_listsuffix;
-	time_t co_scantime;		/* Set by the detailer thread. */
-	int co_options;
-	mode_t co_umask;
-	struct keyword *co_keyword;
-	STAILQ_ENTRY(coll) co_next;
-};
-
-struct config {
-	STAILQ_HEAD(, coll) colls;
-	struct fixups *fixups;
-	char *host;
-	struct sockaddr *laddr;
-	socklen_t laddrlen;
-	int deletelim;
-	int socket;
-	struct chan *chan0;
-	struct chan *chan1;
-	struct stream *server;
-	fattr_support_t fasupport;
-	int reqauth;
-};
-
-struct config	*config_init(const char *, struct coll *, int);
-int		 config_checkcolls(struct config *);
-void		 config_free(struct config *);
-
-struct coll	*coll_new(struct coll *);
-void		 coll_override(struct coll *, struct coll *, int);
-char		*coll_statuspath(struct coll *);
-char		*coll_statussuffix(struct coll *);
-void		 coll_add(char *);
-void		 coll_free(struct coll *);
-void		 coll_setdef(void);
-void		 coll_setopt(int, char *);
-
-#endif /* !_CONFIG_H_ */
diff --git a/usr.bin/csup/cpasswd.1 b/usr.bin/csup/cpasswd.1
deleted file mode 100644
index 1e5a5c32dda1..000000000000
--- a/usr.bin/csup/cpasswd.1
+++ /dev/null
@@ -1,119 +0,0 @@
-.\" Copyright 1999-2003 John D. Polstra.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must 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 acknowledgment:
-.\"      This product includes software developed by John D. Polstra.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $Id: cvpasswd.1,v 1.4 2003/03/04 18:24:42 jdp Exp $
-.\" $FreeBSD$
-.\"
-.Dd June 27, 2007
-.Dt CPASSWD 1
-.Os FreeBSD
-.Sh NAME
-.Nm cpasswd
-.Nd scramble passwords for csup authentication
-.Sh SYNOPSIS
-.Nm
-.Ar clientName
-.Ar serverName
-.Sh DESCRIPTION
-The
-.Nm
-utility creates scrambled passwords for the
-.Nm CVSup
-server's authentication database.  It is invoked with a client name
-and a server name.
-.Ar ClientName
-is the name the client uses to gain access to the
-server.  By convention, e-mail addresses are used for all client
-names, e.g.,
-.Ql BillyJoe@FreeBSD.org .
-Client names are case-insensitive.
-.Pp
-.Ar ServerName
-is the name of the
-.Nm CVSup
-server which the client wishes to access.  By convention,
-it is the canonical fully-qualified domain name of the server, e.g.,
-.Ql CVSup.FreeBSD.ORG .
-This must agree with the server's own idea of its name.  The name is
-case-insensitive.
-.Pp
-To set up authentication for a given server, one must perform the
-following steps:
-.Bl -enum
-.It
-Obtain the official
-.Ar serverName
-from the administrator of the server or from some other source.
-.It
-Choose an appropriate
-.Ar clientName .
-It should be in the form of a valid e-mail address, to make it easy
-for the server administrator to contact the user if necessary.
-.It
-Choose an arbitrary secret
-.Ar password .
-.It
-Run
-.Nm cpasswd ,
-and type in the
-.Ar password
-when prompted for it.  The utility will print out a line to send
-to the server administrator, and instruct you how to modify your
-.Li $ Ns Ev HOME Ns Pa /.csup/auth
-file.  You should use a secure channel to send the line to the
-server administrator.
-.El
-.Pp
-Since
-.Li $ Ns Ev HOME Ns Pa /.csup/auth
-contains passwords, you should ensure that it is not readable by
-anyone except yourself.
-.Sh FILES
-.Bl -tag -width $HOME/.csup/authxx -compact
-.It Li $ Ns Ev HOME Ns Pa /.csup/auth
-Authentication password file.
-.El
-.Sh SEE ALSO
-.Xr csup 1 ,
-.Xr cvsup 1 ,
-.Xr cvsupd 8 .
-.Bd -literal
-http://www.cvsup.org/
-.Ed
-.Sh AUTHORS
-.An -nosplit
-.An Petar Zhivkov Petrov Aq pesho.petrov@gmail.com
-is the author of
-.Nm ,
-the rewrite of
-.Nm cvpasswd .
-.An John Polstra Aq jdp@polstra.com
-is the author of
-.Nm CVSup .
-.Sh LEGALITIES
-CVSup is a registered trademark of John D. Polstra.
diff --git a/usr.bin/csup/cpasswd.sh b/usr.bin/csup/cpasswd.sh
deleted file mode 100755
index 71e17c5d8150..000000000000
--- a/usr.bin/csup/cpasswd.sh
+++ /dev/null
@@ -1,135 +0,0 @@
-#! /bin/sh
-#
-# Copyright 2007. Petar Zhivkov Petrov 
-# pesho.petrov@gmail.com
-#
-# $FreeBSD$
-
-usage() {
-	echo "Usage: $0 clientName serverName"
-	echo "       $0 -v"
-}
-
-countChars() {
-    _count="`echo "$1" | sed -e "s/[^$2]//g" | tr -d "\n" | wc -c`"
-	return 0
-}
-
-readPassword() {
-	while [ true ]; do
-		stty -echo
-		read -p "$1" _password
-		stty echo
-		echo ""
-		countChars "$_password" ":"
-		if [ $_count != 0 ]; then
-			echo "Sorry, password must not contain \":\" characters"
-			echo ""
-		else
-			break
-		fi
-	done
-	return 0
-}
-
-makeSecret() {
-	local clientLower="`echo "$1" | tr "[:upper:]" "[:lower:]"`"
-	local serverLower="`echo "$2" | tr "[:upper:]" "[:lower:]"`"
-	local secret="`md5 -qs "$clientLower:$serverLower:$3"`"
-	_secret="\$md5\$$secret"
-}
-
-if [ $# -eq 1 -a "X$1" = "X-v" ]; then
-	echo "Csup authentication key generator"
-	usage
-	exit
-elif [ $# -ne 2 ]; then
-	usage
-	exit
-fi
-
-clientName=$1
-serverName=$2
-
-#
-# Client name must contain exactly one '@' and at least one '.'.
-# It must not contain a ':'.
-#
-
-countChars "$clientName" "@"
-aCount=$_count
-
-countChars "$clientName" "."
-dotCount=$_count
-if [ $aCount -ne 1 -o $dotCount -eq 0 ]; then
-	echo "Client name must have the form of an e-mail address,"
-	echo "e.g., \"user@domain.com\""
-	exit
-fi
-
-countChars "$clientName" ":"
-colonCount=$_count
-if [ $colonCount -gt 0 ]; then
-	echo "Client name must not contain \":\" characters"
-	exit
-fi
-
-#
-# Server name must not contain '@' and must have at least one '.'.
-# It also must not contain a ':'.
-#
-
-countChars "$serverName" "@"
-aCount=$_count
-
-countChars "$serverName" "."
-dotCount=$_count
-if [ $aCount != 0 -o $dotCount = 0 ]; then
-	echo "Server name must be a fully-qualified domain name."
-	echo "e.g., \"host.domain.com\""
-	exit
-fi
-
-countChars "$serverName" ":"
-colonCount=$_count
-if [ $colonCount -gt 0 ]; then
-	echo "Server name must not contain \":\" characters"
-	exit
-fi
-
-#
-# Ask for password and generate secret.
-#
-
-while [ true ]; do
-	readPassword "Enter password: "
-	makeSecret "$clientName" "$serverName" "$_password"
-	secret=$_secret
-
-	readPassword "Enter same password again: "
-	makeSecret "$clientName" "$serverName" "$_password"
-	secret2=$_secret
-
-	if [ "X$secret" = "X$secret2" ]; then
-		break
-	else
-		echo "Passwords did not match.  Try again."
-		echo ""
-	fi
-done
-
-echo ""
-echo "Send this line to the server administrator at $serverName:"
-echo "-------------------------------------------------------------------------------"
-echo "$clientName:$secret::"
-echo "-------------------------------------------------------------------------------"
-echo "Be sure to send it using a secure channel!"
-echo ""
-echo "Add this line to your file \"$HOME/.csup/auth\", replacing \"XXX\""
-echo "with the password you typed in:"
-echo "-------------------------------------------------------------------------------"
-echo "$serverName:$clientName:XXX:"
-echo "-------------------------------------------------------------------------------"
-echo "Make sure the file is readable and writable only by you!"
-echo ""
-
diff --git a/usr.bin/csup/csup.1 b/usr.bin/csup/csup.1
deleted file mode 100644
index fcf63edb1347..000000000000
--- a/usr.bin/csup/csup.1
+++ /dev/null
@@ -1,996 +0,0 @@
-.\" Copyright 1996-2003 John D. Polstra.
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this 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.
-.\"
-.\" $Id: cvsup.1,v 1.70 2003/03/04 18:23:46 jdp Exp $
-.\" $FreeBSD$
-.\"
-.Dd February 8, 2013
-.Dt CSUP 1
-.Os FreeBSD
-.Sh NAME
-.Nm csup
-.Nd network distribution package for CVS repositories
-.Sh SYNOPSIS
-.Nm
-.Op Fl 146aksvzZ
-.Op Fl A Ar addr
-.Op Fl b Ar base
-.Op Fl c Ar collDir
-.Op Fl d Ar delLimit
-.Op Fl h Ar host
-.Op Fl i Ar pattern
-.Op Fl l Ar lockfile
-.Op Fl L Ar verbosity
-.Op Fl p Ar port
-.Op Fl r Ar maxRetries
-.Ar supfile
-.Sh DESCRIPTION
-.Nm
-is a software package for updating collections of files across a network.
-It is a rewrite of the
-.Nm CVSup
-software in C.
-This manual page describes the usage of the
-.Nm
-client program.
-.Pp
-Unlike more traditional network distribution packages, such as
-.Nm rdist
-and
-.Nm sup ,
-.Nm
-has specific optimizations for distributing CVS repositories.
-.Nm
-takes advantage of the properties of CVS repositories and the files they
-contain (in particular, RCS files), enabling it to perform updates much
-faster than traditional systems.
-.Pp
-.Nm
-is a general-purpose network file updating package.
-It is extremely fast,
-even for collections of files which have nothing to do with CVS or
-RCS.
-.Sh OPTIONS
-The client program
-.Nm
-requires at least a single argument,
-.Ar supfile .
-It names a file describing one or more collections of files to be
-transferred and/or updated from the server.
-The
-.Ar supfile
-has a format similar to the corresponding file used by
-.Nm sup .
-In most cases,
-.Nm
-can use existing
-.Nm sup Ar supfiles .
-.Pp
-The following options are supported by
-.Nm :
-.Bl -tag -width Fl
-.It Fl 1
-Disables automatic retries when transient failures occur.
-Without this option, a transient failure such as a dropped network
-connection causes
-.Nm
-to retry repeatedly, using randomized exponential backoff to space the
-retries.
-This option is equivalent to
-.Fl r Cm 0 .
-.It Fl 4
-Forces
-.Nm
-to use IPv4 addresses only.
-.It Fl 6
-Forces
-.Nm
-to use IPv6 addresses only.
-.It Fl a
-Requires the server to authenticate itself (prove its identity) to
-the client.  If authentication of the server fails, the update is
-canceled.  See
-.Sx AUTHENTICATION ,
-below.
-.It Fl A Ar addr
-Specifies a local address to bind to when connecting to the server.
-The local address might be a hostname or a numeric host address string
-consisting of a dotted decimal IPv4 address or an IPv6 address.
-This may be useful on hosts which have multiple IP addresses.
-.It Fl b Ar base
-Specifies the base directory under which
-.Nm
-will maintain its bookkeeping files, overriding any
-.Cm base
-specifications in the
-.Ar supfile .
-.It Fl c Ar collDir
-Specifies the subdirectory of
-.Ar base
-where the information about the collections is maintained.
-The default is
-.Pa sup .
-.It Fl d Ar delLimit
-Specifies the maximum number of files that may be deleted in a
-single update run.
-Any attempt to exceed the limit results in a fatal error.
-This can provide some protection against temporary configuration
-mistakes on the server.
-The default limit is infinity.
-.It Fl h Ar host
-Specifies the server host to contact, overriding any
-.Cm host
-specifications in the
-.Ar supfile .
-.It Fl i Ar pattern
-Causes
-.Nm
-to include only files and directories matching
-.Ar pattern
-in the update.  If a directory matches the pattern, then the entire
-subtree rooted at the directory is included.  If this option is
-specified multiple times, the patterns are combined using the
-.Ql or
-operation.  If no
-.Fl i
-options are given, the default is to update all files in each
-collection.
-.Pp
-The
-.Ar pattern
-is a standard file name pattern.
-It is interpreted relative to the collection's prefix directory.
-Slash characters are matched only by explicit slashes in the pattern.
-Leading periods in file name are not treated specially.
-.It Fl k
-Causes
-.Nm
-to keep the temporary copies of any incorrectly edited files, in the
-event of checksum mismatches.
-This option is for debugging, to help determine why the files were
-edited incorrectly.
-Regardless of whether this option is specified, the permanent versions
-of faulty files are replaced with correct versions obtained by
-transferring the files in their entirety.
-Such transfers are called fixups.
-.It Fl l Ar lockfile
-Creates and locks the
-.Ar lockfile
-while the update is in progress.
-If
-.Ar lockfile
-is already locked,
-.Nm
-fails without performing automatic retries.
-This option is useful when
-.Nm
-is executed periodically from
-.Nm cron .
-It prevents a job from interfering with an earlier job that is perhaps
-taking extra long because of network problems.
-.Pp
-The process-ID is written to the lock file in text form when the lock
-is successfully acquired.
-Upon termination of the update, the lock file is removed.
-.It Fl L Ar verbosity
-Sets the verbosity level for output.
-A level of 0 causes
-.Nm
-to be completely silent unless errors occur.
-A level of 1 (the default) causes each updated file to be listed.
-A level of 2 provides more detailed information about the updates
-performed on each file.
-All messages are directed to the standard output.
-.It Fl p Ar port
-Sets the TCP port to which
-.Nm
-attempts to connect on the server host.
-The default port is 5999.
-.It Fl r Ar maxRetries
-Limits the number of automatic retries that will be attempted when
-transient errors such as lost network connections are encountered.
-By default,
-.Nm
-will retry indefinitely until an update is successfully completed.
-The retries are spaced using randomized exponential backoff.
-Note that
-.Fl r Cm 0
-is equivalent to the
-.Fl 1
-option.
-.It Fl s
-Suppresses the check of each client file's status against what is
-recorded in the list file.  Instead, the list file is assumed to be
-accurate.  This option greatly reduces the amount of disk activity and
-results in faster updates with less load on the client host.  However
-it should only be used if client's files are never modified locally in
-any way.  Mirror sites may find this option beneficial to reduce the
-disk load on their systems.  For safety, even mirror sites should run
-.Nm
-occasionally (perhaps once a day) without the
-.Fl s
-option.
-.Pp
-Without the
-.Fl s
-option,
-.Nm
-performs a
-.Xr stat 2
-call on each file and verifies that its attributes match those
-recorded in the list file.  This ensures that any file changes made
-outside of
-.Nm
-are detected and corrected.
-.Pp
-If the
-.Fl s
-option is used when one or more files have been modified locally, the
-results are undefined.  Local file damage may remain uncorrected,
-updates may be missed, or
-.Nm
-may abort prematurely.
-.It Fl v
-Prints the version number and exits, without contacting the server.
-.It Fl z
-Enables compression for all collections, as if the
-.Cm compress
-keyword were added to every collection in the
-.Ar supfile .
-.It Fl Z
-Disables compression for all collections, as if the
-.Cm compress
-keyword were removed from every collection in the
-.Ar supfile .
-.El
-.Pp
-The
-.Ar supfile
-is a text file which specifies the file collections to be updated.
-Comments begin with
-.Ql #
-and extend to the end of the line.  Lines that are empty except for
-comments and white space are ignored.  Each remaining line begins
-with the name of a server-defined collection of files.  Following the
-collection name on the line are zero or more keywords or keyword=value
-pairs.
-.Pp
-Default settings may be specified in lines whose collection name is
-.Cm *default .
-Such defaults will apply to subsequent lines in the
-.Ar supfile .
-Multiple
-.Cm *default
-lines may be present.
-New values augment or override any defaults specified earlier in the
-.Ar supfile .
-Values specified explicitly for a collection override any default
-values.
-.Pp
-The most commonly used keywords are:
-.Bl -tag -width Fl
-.It Cm release= Ns Ar releaseName
-This specifies the release of the files within a collection.
-Like collection names, release names are defined by the server
-configuration files.  Usually there is only one release in each
-collection, but there may be any number.  Collections which come from
-a CVS repository often use
-.Cm release=cvs
-by convention.  Non-CVS collections conventionally use
-.Cm release=current .
-.It Cm base= Ns Ar base
-This specifies a directory under which
-.Nm
-will maintain its bookkeeping files, describing the state of each
-collection on the client machine.
-The
-.Ar base
-directory must already exist;
-.Nm
-will not create it.
-The default
-.Ar base
-directory is
-.Pa /usr/local/etc/cvsup .
-.It Cm prefix= Ns Ar prefix
-This is the directory under which updated files will be placed.
-By default, it is the same as
-.Ar base .
-If it is not an absolute pathname, it is interpreted relative to
-.Ar base .
-The
-.Ar prefix
-directory must already exist;
-.Nm
-will not create it.
-.Pp
-As a special case, if
-.Ar prefix
-is a symbolic link pointing to a nonexistent file named
-.Ql SKIP ,
-then
-.Nm
-will skip the collection.
-The parameters associated with the collection are still checked for
-validity, but none of its files will be updated.
-This feature allows a site to use a standard
-.Ar supfile
-on several machines, yet control which collections get updated on a
-per-machine basis.
-.It Cm host= Ns Ar hostname
-This specifies the server machine from which all files will be taken.
-.Nm
-requires that all collections in a single run come from the same host.
-If you wish to update collections from several different hosts, you must
-run
-.Nm
-several times.
-.It Cm delete
-The presence of this keyword gives
-.Nm
-permission to delete files.
-If it is missing, no files will be deleted.
-.Pp
-The presence of the
-.Cm delete
-keyword puts
-.Nm
-into so-called
-.Em exact
-mode.  In exact mode,
-.Nm
-does its best to make the client's files correspond to those on the server.
-This includes deleting individual deltas and symbolic tags from RCS
-files, as well as deleting entire files.
-In exact mode,
-.Nm
-verifies every edited file with a checksum, to ensure that the edits
-have produced a file identical to the master copy on the server.
-If the checksum test fails for a file, then
-.Nm
-falls back upon transferring the entire file.
-.Pp
-In general,
-.Nm
-deletes only files which are known to the server.
-Extra files present in the client's tree are left alone, even in exact
-mode.
-More precisely,
-.Nm
-is willing to delete two classes of files:
-.Bl -bullet -compact
-.It
-Files that were previously created or updated by
-.Nm
-itself.
-.It
-Checked-out versions of files which are marked as dead on the server.
-.El
-.It Cm use-rel-suffix
-Causes
-.Nm
-to append a suffix constructed from the release and tag to the name of
-each list file that it maintains.
-See
-.Sx THE LIST FILE
-for details.
-.It Cm compress
-This enables compression of all data sent across the network.
-Compression is quite effective, normally eliminating 65% to 75% of the
-bytes that would otherwise need to be transferred.
-However, it is costly in terms of CPU time on both the client and the
-server.
-On local area networks, compression is generally counter-productive; it
-actually slows down file updates.
-On links with speeds of 56K bits/second or less, compression is almost
-always beneficial.
-For network links with speeds between these two extremes, let
-experimentation be your guide.
-.Pp
-The
-.Fl z
-command line option enables the
-.Cm compress
-keyword for all collections, regardless of what is specified in the supfile.
-Likewise, the
-.Fl Z
-command line option disables the
-.Cm compress
-option for all collections.
-.Nm
-uses a looser checksum for RCS files, which ignores harmless
-differences in white space.  Different versions of CVS and RCS produce
-a variety of differences in white space for the same RCS files.  Thus
-the strict checksum can report spurious mismatches for files which are
-logically identical.  This can lead to numerous unneeded
-.Dq fixups ,
-and thus to slow updates.
-.It Cm umask= Ns Ar n
-Causes
-.Nm
-to use a umask value of
-.Ar n
-(an octal number) when updating the files in the collection.
-This option is ignored if
-.Cm preserve
-is specified.
-.El
-.Pp
-Some additional, more specialized keywords are described below.
-Unrecognized keywords are silently ignored for backward compatibility
-with
-.Nm sup .
-.Sh CVS MODE
-.Nm CVSup
-supports two primary modes of operation.
-They are called
-.Em CVS
-mode and
-.Em checkout
-mode.
-.Pp
-In CVS mode, the client receives copies of the actual RCS files making
-up the master CVS repository.  CVS mode is the default mode of operation.
-It is appropriate when the user wishes to maintain a full copy of the
-CVS repository on the client machine.
-.Pp
-CVS mode is also appropriate for file collections which are not
-based upon a CVS repository.  The files are simply transferred
-verbatim, without interpretation.
-.Sh CHECKOUT MODE
-In checkout mode, the client receives specific revisions of files,
-checked out directly from the server's CVS repository.
-Checkout mode allows the client to receive any version from the
-repository, without requiring any extra disk space on the server for
-storing multiple versions in checked-out form.
-Checkout mode provides much flexibility beyond that basic functionality,
-however.
-The client can specify any CVS symbolic tag, or any date, or both, and
-.Nm
-will provide the corresponding checked-out versions of the files in the
-repository.
-.Pp
-Checkout mode is selected on a per-collection basis, by the presence of
-one or both of the following keywords in the
-.Ar supfile :
-.Bl -tag -width Fl
-.It Cm tag= Ns Ar tagname
-This specifies a symbolic tag that should be used to select the
-revisions that are checked out from the CVS repository.
-The tag may refer to either a branch or a specific revision.
-It must be symbolic; numeric revision numbers are not supported.
-.Pp
-For the FreeBSD source repository, the most commonly used tags will be:
-.Bl -tag -width RELENG_6
-.It Li RELENG_6
-The
-.Ql stable
-branch.
-.It Li \&.
-The main branch (the
-.Ql current
-release).
-This is the default, if only the
-.Cm date
-keyword is given.
-.El
-.Sm off
-.It Xo Cm date=
-.Op Ar cc
-.Ar yy.mm.dd.hh.mm.ss
-.Xc
-.Sm on
-This specifies a date that should be used to select the revisions that
-are checked out from the CVS repository.
-The client will receive the revisions that were in effect at the
-specified date and time.
-.Pp
-At present, the date format is inflexible.  All 17 or 19 characters must
-be specified, exactly as shown.
-For the years 2000 and beyond, specify the century
-.Ar cc .
-For earlier years, specify only the last two digits
-.Ar yy .
-Dates and times are considered to
-be GMT.
-The default date is
-.Ql \&. ,
-which means
-.Dq as late as possible .
-.El
-.Pp
-To enable checkout mode, you must specify at least one of these keywords.
-If both are missing,
-.Nm
-defaults to CVS mode.
-.Pp
-If both a branch tag and a date are specified, then the revisions on the
-given branch, as of the given date, will be checked out.  It is
-permitted, but not particularly useful, to specify a date with a
-specific release tag.
-.Pp
-In checkout mode, the tag and/or date may be changed between updates.
-For example, suppose that a collection has been transferred using the
-specification
-.Ql tag=. .
-The user could later change the specification to
-.Ql tag=RELENG_3 .
-This would cause
-.Nm
-to edit the checked-out files in such a way as to transform them from the
-.Ql current
-versions to the
-.Ql stable
-versions.
-In general,
-.Nm
-is willing to transform any tag/date combination into any other tag/date
-combination, by applying the intervening RCS deltas to the existing files.
-.Pp
-When transforming a collection of checked-out files from one tag to
-another, it is important to specify the
-.Cm list
-keyword in the
-.Ar supfile ,
-to ensure that the same list file is used both before and after the
-transformation.
-The list file is described in
-.Sx THE LIST FILE ,
-below.
-.Sh THE LIST FILE
-For efficiency,
-.Nm
-maintains a bookkeeping file for each collection, called the list file.
-The list file contains information about which files and revisions the client
-currently possesses.
-It also contains information used for verifying that the list file
-is consistent with the actual files in the client's tree.
-.Pp
-The list file is not strictly necessary.  If it is deleted, or becomes
-inconsistent with the actual client files,
-.Nm
-falls back upon a less efficient method of identifying the client's
-files and performing its updates.
-Depending on
-.Nm csup Ns No 's
-mode of operation, the fallback method employs time stamps, checksums, or
-analysis of RCS files.
-.Pp
-Because the list file is not essential,
-.Nm
-is able to
-.Dq adopt
-an existing file tree acquired by FTP or from a CD-ROM.
-.Nm
-identifies the client's versions of the files, updates them as
-necessary, and creates a list file for future use.
-Adopting a foreign file tree is not as fast as performing a normal
-update.
-It also produces a heavier load on the server.
-.Pp
-The list file is stored in a collection-specific directory; see
-.Sx FILES
-for details.
-Its name always begins with
-.Ql checkouts .
-If the keyword
-.Cm use-rel-suffix
-is specified in the
-.Ar supfile ,
-a suffix, formed from the release and tag, is appended to the name.
-The default suffix can be overridden by specifying an explicit suffix in
-the
-.Ar supfile :
-.Bl -tag -width Fl
-.It Cm list= Ns Ar suffix
-This specifies a suffix for the name of the list file.  A leading dot is
-provided automatically.
-For example,
-.Ql list=stable
-would produce a list file named
-.Pa checkouts.stable ,
-regardless of the release, tag, or
-.Cm use-rel-suffix
-keyword.
-.El
-.Sh REFUSE FILES
-The user can specify sets of files that he does not wish to receive.
-The files are specified as file name patterns in so-called
-.Em refuse
-files.
-The patterns are separated by whitespace, and multiple patterns are
-permitted on each line.
-Files and directories matching the patterns are neither updated nor
-deleted; they are simply ignored.
-.Pp
-There is currently no provision for comments in refuse files.
-.Pp
-The patterns are similar to those of
-.Xr sh 1 ,
-except that there is no special treatment for slashes or for
-filenames that begin with a period.
-For example, the pattern
-.Ql *.c
-will match any file name ending with
-.Ql \&.c
-including those in subdirectories, such as
-.Ql foo/bar/lam.c .
-All patterns are interpreted relative to the collection's prefix
-directory.
-.Pp
-If the files are coming from a CVS repository, as is usually
-the case, then they will be RCS files. These have a
-.Ql \&,v
-suffix which must be taken into account in the patterns. For
-example, the FreeBSD documentation files are in a sub-directory of
-.Ar base
-called
-.Ql doc .
-If
-.Ql Makefile
-from that directory is not required then the line
-.Pp
-.Bl -item -compact -offset indent
-.It
-.Pa doc/Makefile
-.El
-.Pp
-will not work because the file on the server is called
-.Ql Makefile,v .
-A better solution would be
-.Pp
-.Bl -item -compact -offset indent
-.It
-.Pa doc/Makefile*
-.El
-.Pp
-which will match whether
-.Ql Makefile
-is an RCS file or not.
-.Pp
-As another example, to receive the FreeBSD documentation files without
-the Japanese, Russian, and Chinese translations, create a refuse file
-containing the following lines:
-.Pp
-.Bl -item -compact -offset indent
-.It
-.Pa doc/ja*
-.It
-.Pa doc/ru*
-.It
-.Pa doc/zh*
-.El
-.Pp
-As many as three refuse files are examined for each
-.Ar supfile
-line.
-There can be a global refuse file named
-.Sm off
-.Ar base / Ar collDir Pa /refuse
-.Sm on
-which applies to all collections and releases.
-There can be a per-collection refuse file named
-.Sm off
-.Xo Ar base / Ar collDir / Ar collection
-.Pa /refuse
-.Xc
-.Sm on
-which applies to a specific collection.
-Finally, there can be a per-release and tag refuse file which applies only
-to a given release/tag combination within a collection.
-The name of the latter is formed by suffixing the name of the
-per-collection refuse file in the same manner as described above for the
-list file.
-None of the refuse files are required to exist.
-.Pp
-.Nm
-has a built-in default value of
-.Ar /usr/local/etc/cvsup
-for
-.Ar base
-and
-.Ar sup
-for
-.Ar collDir
-but it is possible to override both of these. The value of
-.Ar base
-can be changed using the
-.Fl b
-option or a
-.Ar base=pathname
-entry in the
-.Ar supfile .
-(If both are used the
-.Fl b
-option will override the
-.Ar supfile
-entry.)  The value of
-.Ar collDir
-can only be changed with the
-.Fl c
-option; there is no
-.Ar supfile
-command to change it.
-.Pp
-As an example, suppose that the
-.Ar base
-and
-.Ar collDir
-both have their default values, and that the collection and release are
-.Ql src-all
-and
-.Ql cvs ,
-respectively.
-Assume further that checkout mode is being used with
-.Ql tag=RELENG_3 .
-The three possible refuse files would then be named:
-.Pp
-.Bl -item -compact -offset indent
-.It
-.Pa /usr/local/etc/cvsup/sup/refuse
-.It
-.Pa /usr/local/etc/cvsup/sup/src-all/refuse
-.It
-.Pa /usr/local/etc/cvsup/sup/src-all/refuse.cvs:RELENG_3
-.El
-.Pp
-If the
-.Ar supfile
-includes the command
-.Ar base=/foo
-the refuse files would be:
-.Pp
-.Bl -item -compact -offset indent
-.It
-.Pa /foo/sup/refuse
-.It
-.Pa /foo/sup/src-all/refuse
-.It
-.Pa /foo/sup/src-all/refuse.cvs:RELENG_3
-.El
-.Pp
-If
-.Fl b
-.Ar /bar
-is used (even with
-.Ar base=/foo
-in the
-.Ar supfile ) :
-.Pp
-.Bl -item -compact -offset indent
-.It
-.Pa /bar/sup/refuse
-.It
-.Pa /bar/sup/src-all/refuse
-.It
-.Pa /bar/sup/src-all/refuse.cvs:RELENG_3
-.El
-.Pp
-and with
-.Fl c
-.Ar stool
-as well:
-.Pp
-.Bl -item -compact -offset indent
-.It
-.Pa /bar/stool/refuse
-.It
-.Pa /bar/stool/src-all/refuse
-.It
-.Pa /bar/stool/src-all/refuse.cvs:RELENG_3
-.El
-.Sh AUTHENTICATION
-.Nm
-implements an optional authentication mechanism which can be used by the
-client and server to verify each other's identities.
-Public CVSup servers normally do not enable authentication.
-.Nm
-users may ignore this section unless they have been informed
-that authentication is required by the administrator of their server.
-.Pp
-The authentication subsystem uses a
-challenge-response protocol which is immune to packet sniffing and
-replay attacks.  No passwords are sent over the network in either
-direction.  Both the client and the server can independently verify
-the identities of each other.
-.Pp
-The file
-.Li $ Ns Ev HOME Ns Pa /.csup/auth
-holds the information used for authentication.  This file contains a
-record for each server that the client is allowed to access.  Each
-record occupies one line in the file.  Lines beginning with
-.Ql #
-are ignored, as are lines containing only white space.  White space is
-significant everywhere else in the file.  Fields are separated by
-.Ql \&:
-characters.
-.Pp
-Each record of the file has the following form:
-.Bd -literal -offset indent
-.Sm off
-.Xo Ar serverName No : Ar clientName No :
-.Ar password No : Ar comment
-.Xc
-.Sm on
-.Ed
-.Pp
-All fields must be present even if some of them are empty.
-.Ar ServerName
-is the name of the server to which the record applies.  By convention,
-it is the canonical fully-qualified domain name of the server, e.g.,
-.Ql CVSup177.FreeBSD.ORG .
-This must agree with the server's own idea of its name.  The name is
-case-insensitive.
-.Pp
-.Ar ClientName
-is the name the client uses to gain access to the server.  By
-convention, e-mail addresses are used for all client names, e.g.,
-.Ql BillyJoe@FreeBSD.org .
-Client names are case-insensitive.
-.Pp
-.Ar Password
-is a secret string of characters that the client uses to prove its
-identity.  It may not contain any
-.Ql \&:
-or newline characters.
-.Pp
-.Ar Comment
-may contain any additional information to identify the record.  It
-is not interpreted by the program.
-.Pp
-To set up authentication for a given server, one must perform the
-following steps:
-.Bl -enum
-.It
-Obtain the official
-.Ar serverName
-from the administrator of the server or from some other source.
-.It
-Choose an appropriate
-.Ar clientName .
-It should be in the form of a valid e-mail address, to make it easy
-for the server administrator to contact the user if necessary.
-.It
-Choose an arbitrary secret
-.Ar password .
-.It
-Run the
-.Nm cpasswd
-utility, and type in the
-.Ar password
-when prompted for it.  The utility will print out a line to send
-to the server administrator, and instruct you how to modify your
-.Li $ Ns Ev HOME Ns Pa /.csup/auth
-file.  You should use a secure channel to send the line to the
-server administrator.
-.El
-.Pp
-Since
-.Li $ Ns Ev HOME Ns Pa /.csup/auth
-contains passwords, you should ensure that it is not readable by
-anyone except yourself.
-.Pp
-Authentication works independently in both directions.  The server
-administrator controls whether you must prove your identity.
-You control whether to check the server's identity, by means of the
-.Fl a
-command line option.
-.Sh csup AND FIREWALLS
-In its default mode,
-.Nm
-will work through any firewall which permits outbound connections to
-port 5999 of the server host.
-.Sh USING csup WITH SOCKS
-.Nm
-can be used through a SOCKS proxy server with the
-.Nm tsocks
-command.
-The
-.Nm
-executable needs to be dynamically-linked with the system
-libraries for
-.Nm tsocks
-to work properly.
-.Sh USING ssh PORT FORWARDING
-As an alternative to SOCKS, a user behind a firewall can penetrate it
-with the TCP port forwarding provided by the Secure Shell package
-.Nm ssh .
-The user must have a login account on the
-.Nm CVSup
-server host in order to do this.
-The procedure is as follows:
-.Bl -enum
-.It
-Establish a connection to the server host with
-.Nm ssh ,
-like this:
-.Bd -literal
-ssh -f -x -L 5999:localhost:5999 serverhost sleep 60
-.Ed
-.Pp
-Replace
-.Ar serverhost
-with the hostname of the CVSup server, but type
-.Ql localhost
-literally.
-This sets up the required port forwarding.
-You must start
-.Nm
-before the 60-second
-.Nm sleep
-finishes.
-Once the update has begun,
-.Nm ssh
-will keep the forwarded channels open as long as they are needed.
-.It
-Run
-.Nm
-on the local host, including the arguments
-.Ql -h localhost
-on the command line.
-.El
-.Sh FILES
-.Bl -tag -width base/sup/collection/checkouts*xx -compact
-.It Pa /usr/local/etc/cvsup
-Default
-.Ar base
-directory.
-.It Pa sup
-Default
-.Ar collDir
-subdirectory.
-.Sm off
-.It Xo Ar base / Ar collDir / Ar collection
-.Pa /checkouts*
-.Xc
-.Sm on
-List files.
-.El
-.Sh SEE ALSO
-.Xr cpasswd 1 ,
-.Xr cvs 1 ,
-.Xr rcsintro 1 ,
-.Xr ssh 1 .
-.Sh AUTHORS
-.An -nosplit
-.An Maxime Henrion Aq mux@FreeBSD.org
-is the author of
-.Nm ,
-the rewrite of
-.Nm CVSup
-in C.
-.An John Polstra Aq jdp@polstra.com
-is the author of
-.Nm CVSup .
-.Sh LEGALITIES
-CVSup is a registered trademark of John D. Polstra.
-.Pp
-.Nm
-is released under a 2-clauses BSD license.
-.Sh BUGS
-An RCS file is not recognized as such unless its name ends with
-.Ql \&,v .
-.Pp
-Any directory named
-.Ql Attic
-is assumed to be a CVS Attic, and is treated specially.
diff --git a/usr.bin/csup/detailer.c b/usr.bin/csup/detailer.c
deleted file mode 100644
index 559265555674..000000000000
--- a/usr.bin/csup/detailer.c
+++ /dev/null
@@ -1,603 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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 <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "config.h"
-#include "detailer.h"
-#include "fixups.h"
-#include "globtree.h"
-#include "misc.h"
-#include "mux.h"
-#include "proto.h"
-#include "rcsfile.h"
-#include "rsyncfile.h"
-#include "status.h"
-#include "stream.h"
-
-/* Internal error codes. */
-#define	DETAILER_ERR_PROTO	(-1)	/* Protocol error. */
-#define	DETAILER_ERR_MSG	(-2)	/* Error is in detailer->errmsg. */
-#define	DETAILER_ERR_READ	(-3)	/* Error reading from server. */
-#define	DETAILER_ERR_WRITE	(-4)	/* Error writing to server. */
-
-struct detailer {
-	struct config *config;
-	struct stream *rd;
-	struct stream *wr;
-	char *errmsg;
-};
-
-static int	detailer_batch(struct detailer *);
-static int	detailer_coll(struct detailer *, struct coll *,
-		    struct status *);
-static int	detailer_dofile_co(struct detailer *, struct coll *,
-		    struct status *, char *);
-static int	detailer_dofile_rcs(struct detailer *, struct coll *, 
-		    char *, char *);
-static int	detailer_dofile_regular(struct detailer *, char *, char *);
-static int	detailer_dofile_rsync(struct detailer *, char *, char *);
-static int	detailer_checkrcsattr(struct detailer *, struct coll *, char *,
-		    struct fattr *, int);
-int		detailer_send_details(struct detailer *, struct coll *, char *,
-		    char *, struct fattr *);
-
-void *
-detailer(void *arg)
-{
-	struct thread_args *args;
-	struct detailer dbuf, *d;
-	int error;
-
-	args = arg;
-
-	d = &dbuf;
-	d->config = args->config;
-	d->rd = args->rd;
-	d->wr = args->wr;
-	d->errmsg = NULL;
-
-	error = detailer_batch(d);
-	switch (error) {
-	case DETAILER_ERR_PROTO:
-		xasprintf(&args->errmsg, "Detailer failed: Protocol error");
-		args->status = STATUS_FAILURE;
-		break;
-	case DETAILER_ERR_MSG:
-		xasprintf(&args->errmsg, "Detailer failed: %s", d->errmsg);
-		free(d->errmsg);
-		args->status = STATUS_FAILURE;
-		break;
-	case DETAILER_ERR_READ:
-		if (stream_eof(d->rd)) {
-			xasprintf(&args->errmsg, "Detailer failed: "
-			    "Premature EOF from server");
-		} else {
-			xasprintf(&args->errmsg, "Detailer failed: "
-			    "Network read failure: %s", strerror(errno));
-		}
-		args->status = STATUS_TRANSIENTFAILURE;
-		break;
-	case DETAILER_ERR_WRITE:
-		xasprintf(&args->errmsg, "Detailer failed: "
-		    "Network write failure: %s", strerror(errno));
-		args->status = STATUS_TRANSIENTFAILURE;
-		break;
-	default:
-		assert(error == 0);
-		args->status = STATUS_SUCCESS;
-	}
-	return (NULL);
-}
-
-static int
-detailer_batch(struct detailer *d)
-{
-	struct config *config;
-	struct stream *rd, *wr;
-	struct coll *coll;
-	struct status *st;
-	struct fixup *fixup;
-	char *cmd, *collname, *line, *release;
-	int error, fixupseof;
-
-	config = d->config;
-	rd = d->rd;
-	wr = d->wr;
-	STAILQ_FOREACH(coll, &config->colls, co_next) {
-		if (coll->co_options & CO_SKIP)
-			continue;
-		line = stream_getln(rd, NULL);
-		cmd = proto_get_ascii(&line);
-		collname = proto_get_ascii(&line);
-		release = proto_get_ascii(&line);
-		error = proto_get_time(&line, &coll->co_scantime);
-		if (error || line != NULL || strcmp(cmd, "COLL") != 0 ||
-		    strcmp(collname, coll->co_name) != 0 ||
-		    strcmp(release, coll->co_release) != 0)
-			return (DETAILER_ERR_PROTO);
-		error = proto_printf(wr, "COLL %s %s\n", coll->co_name,
-		    coll->co_release);
-		if (error)
-			return (DETAILER_ERR_WRITE);
-		stream_flush(wr);
-		if (coll->co_options & CO_COMPRESS) {
-			stream_filter_start(rd, STREAM_FILTER_ZLIB, NULL);
-			stream_filter_start(wr, STREAM_FILTER_ZLIB, NULL);
-		}
-		st = status_open(coll, -1, &d->errmsg);
-		if (st == NULL)
-			return (DETAILER_ERR_MSG);
-		error = detailer_coll(d, coll, st);
-		status_close(st, NULL);
-		if (error)
-			return (error);
-		if (coll->co_options & CO_COMPRESS) {
-			stream_filter_stop(rd);
-			stream_filter_stop(wr);
-		}
-		stream_flush(wr);
-	}
-	line = stream_getln(rd, NULL);
-	if (line == NULL)
-		return (DETAILER_ERR_READ);
-	if (strcmp(line, ".") != 0)
-		return (DETAILER_ERR_PROTO);
-	error = proto_printf(wr, ".\n");
-	if (error)
-		return (DETAILER_ERR_WRITE);
-	stream_flush(wr);
-
-	/* Now send fixups if needed. */
-	fixup = NULL;
-	fixupseof = 0;
-	STAILQ_FOREACH(coll, &config->colls, co_next) {
-		if (coll->co_options & CO_SKIP)
-			continue;
-		error = proto_printf(wr, "COLL %s %s\n", coll->co_name,
-		    coll->co_release);
-		if (error)
-			return (DETAILER_ERR_WRITE);
-		if (coll->co_options & CO_COMPRESS)
-			stream_filter_start(wr, STREAM_FILTER_ZLIB, NULL);
-		while (!fixupseof) {
-			if (fixup == NULL)
-				fixup = fixups_get(config->fixups);
-			if (fixup == NULL) {
-				fixupseof = 1;
-				break;
-			}
-			if (fixup->f_coll != coll)
-				break;
-			if (coll->co_options & CO_CHECKOUTMODE)
-				error = proto_printf(wr, "Y %s %s %s\n",
-				    fixup->f_name, coll->co_tag, coll->co_date);
-			else {
-				error = proto_printf(wr, "A %s\n",
-				    fixup->f_name);
-			}
-			if (error)
-				return (DETAILER_ERR_WRITE);
-			fixup = NULL;
-		}
-		error = proto_printf(wr, ".\n");
-		if (error)
-			return (DETAILER_ERR_WRITE);
-		if (coll->co_options & CO_COMPRESS)
-			stream_filter_stop(wr);
-		stream_flush(wr);
-	}
-	error = proto_printf(wr, ".\n");
-	if (error)
-		return (DETAILER_ERR_WRITE);
-	return (0);
-}
-
-static int
-detailer_coll(struct detailer *d, struct coll *coll, struct status *st)
-{
-	struct fattr *rcsattr;
-	struct stream *rd, *wr;
-	char *attr, *cmd, *file, *line, *msg, *path, *target;
-	int error, attic;
-
-	rd = d->rd;
-	wr = d->wr;
-	attic = 0;
-	line = stream_getln(rd, NULL);
-	if (line == NULL)
-		return (DETAILER_ERR_READ);
-	while (strcmp(line, ".") != 0) {
-		cmd = proto_get_ascii(&line);
-		if (cmd == NULL || strlen(cmd) != 1)
-			return (DETAILER_ERR_PROTO);
-		switch (cmd[0]) {
-		case 'D':
-			/* Delete file. */
-			file = proto_get_ascii(&line);
-			if (file == NULL || line != NULL)
-				return (DETAILER_ERR_PROTO); 
-			error = proto_printf(wr, "D %s\n", file);
-			if (error)
-				return (DETAILER_ERR_WRITE);
-			break;
-		case 'I':
-		case 'i':
-		case 'j':
-			/* Directory operations. */
-			file = proto_get_ascii(&line);
-			if (file == NULL || line != NULL)
-				return (DETAILER_ERR_PROTO);
-			error = proto_printf(wr, "%s %s\n", cmd, file);
-			if (error)
-				return (DETAILER_ERR_WRITE);
-			break;
-		case 'J':
-			/* Set directory attributes. */
-			file = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			if (file == NULL || line != NULL || attr == NULL)
-				return (DETAILER_ERR_PROTO);
-			error = proto_printf(wr, "%s %s %s\n", cmd, file, attr);
-			if (error)
-				return (DETAILER_ERR_WRITE);
-			break;
-		case 'H':
-		case 'h':
-			/* Create a hard link. */
-			file = proto_get_ascii(&line);
-			target = proto_get_ascii(&line);
-			if (file == NULL || target == NULL)
-				return (DETAILER_ERR_PROTO);
-			error = proto_printf(wr, "%s %s %s\n", cmd, file,
-			    target);
-			break;
-		case 't':
-			file = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			if (file == NULL || attr == NULL || line != NULL) {
-				return (DETAILER_ERR_PROTO);
-			}
-			rcsattr = fattr_decode(attr);
-			if (rcsattr == NULL) {
-				return (DETAILER_ERR_PROTO);
-			}
-			error = detailer_checkrcsattr(d, coll, file, rcsattr,
-			    1);
-			break;
-
-		case 'T':
-			file = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			if (file == NULL || attr == NULL || line != NULL)
-				return (DETAILER_ERR_PROTO);
-			rcsattr = fattr_decode(attr);
-			if (rcsattr == NULL)
-				return (DETAILER_ERR_PROTO);
-			error = detailer_checkrcsattr(d, coll, file, rcsattr,
-			    0);
-			break;
-
-		case 'U':
-			/* Add or update file. */
-			file = proto_get_ascii(&line);
-			if (file == NULL || line != NULL)
-				return (DETAILER_ERR_PROTO);
-			if (coll->co_options & CO_CHECKOUTMODE) {
-				error = detailer_dofile_co(d, coll, st, file);
-			} else {
-				path = cvspath(coll->co_prefix, file, 0);
-				rcsattr = fattr_frompath(path, FATTR_NOFOLLOW);
-				error = detailer_send_details(d, coll, file,
-				    path, rcsattr);
-				if (rcsattr != NULL)
-					fattr_free(rcsattr);
-				free(path);
-			}
-			if (error)
-				return (error);
-			break;
-		case '!':
-			/* Warning from server. */
-			msg = proto_get_rest(&line);
-			if (msg == NULL)
-				return (DETAILER_ERR_PROTO);
-			lprintf(-1, "Server warning: %s\n", msg);
-			break;
-		default:
-			return (DETAILER_ERR_PROTO);
-		}
-		stream_flush(wr);
-		line = stream_getln(rd, NULL);
-		if (line == NULL)
-			return (DETAILER_ERR_READ);
-	}
-	error = proto_printf(wr, ".\n");
-	if (error)
-		return (DETAILER_ERR_WRITE);
-	return (0);
-}
-
-/*
- * Tell the server to update a regular file.
- */
-static int
-detailer_dofile_regular(struct detailer *d, char *name, char *path)
-{
-	struct stream *wr;
-	struct stat st;
-	char md5[MD5_DIGEST_SIZE];
-	int error;
-	
-	wr = d->wr;
-	error = stat(path, &st);
-	/* If we don't have it or it's unaccessible, we want it again. */
-	if (error) {
-		proto_printf(wr, "A %s\n", name);
-		return (0);
-	}
-
-	/* If not, we want the file to be updated. */
-	error = MD5_File(path, md5);
-	if (error) {
-		lprintf(-1, "Error reading \"%s\"\n", name);
-		return (error);
-	}
-	error = proto_printf(wr, "R %s %O %s\n", name, st.st_size, md5);
-	if (error)
-		return (DETAILER_ERR_WRITE);
-	return (0);
-}
-
-/*
- * Tell the server to update a file with the rsync algorithm.
- */
-static int
-detailer_dofile_rsync(struct detailer *d, char *name, char *path)
-{
-	struct stream *wr;
-	struct rsyncfile *rf;
-
-	wr = d->wr;
-	rf = rsync_open(path, 0, 1);
-	if (rf == NULL) {
-		/* Fallback if we fail in opening it. */
-		proto_printf(wr, "A %s\n", name);
-		return (0);
-	}
-	proto_printf(wr, "r %s %z %z\n", name, rsync_filesize(rf),
-	    rsync_blocksize(rf));
-	/* Detail the blocks. */
-	while (rsync_nextblock(rf) != 0)
-		proto_printf(wr, "%s %s\n", rsync_rsum(rf), rsync_blockmd5(rf));
-	proto_printf(wr, ".\n");
-	rsync_close(rf);
-	return (0);
-}
-
-/*
- * Tell the server to update an RCS file that we have, or send it if we don't.
- */
-static int
-detailer_dofile_rcs(struct detailer *d, struct coll *coll, char *name,
-    char *path)
-{
-	struct stream *wr;
-	struct fattr *fa;
-	struct rcsfile *rf;
-	int error;
-
-	wr = d->wr;
-	path = atticpath(coll->co_prefix, name);
-	fa = fattr_frompath(path, FATTR_NOFOLLOW);
-	if (fa == NULL) {
-		/* We don't have it, so send request to get it. */
-		error = proto_printf(wr, "A %s\n", name);
-		if (error)
-			return (DETAILER_ERR_WRITE);
-		free(path);
-		return (0);
-	}
-
-	rf = rcsfile_frompath(path, name, coll->co_cvsroot, coll->co_tag, 1);
-	free(path);
-	if (rf == NULL) {
-		error = proto_printf(wr, "A %s\n", name);
-		if (error)
-			return (DETAILER_ERR_WRITE);
-		return (0);
-	}
-	/* Tell to update the RCS file. The client version details follow. */
-	rcsfile_send_details(rf, wr);
-	rcsfile_free(rf);
-	fattr_free(fa);
-	return (0);
-}
-
-static int
-detailer_dofile_co(struct detailer *d, struct coll *coll, struct status *st,
-    char *file)
-{
-	struct stream *wr;
-	struct fattr *fa;
-	struct statusrec *sr;
-	char md5[MD5_DIGEST_SIZE];
-	char *path;
-	int error, ret;
-
-	wr = d->wr;
-	path = checkoutpath(coll->co_prefix, file);
-	if (path == NULL)
-		return (DETAILER_ERR_PROTO);
-	fa = fattr_frompath(path, FATTR_NOFOLLOW);
-	if (fa == NULL) {
-		/* We don't have the file, so the only option at this
-		   point is to tell the server to send it.  The server
-		   may figure out that the file is dead, in which case
-		   it will tell us. */
-		error = proto_printf(wr, "C %s %s %s\n",
-		    file, coll->co_tag, coll->co_date);
-		free(path);
-		if (error)
-			return (DETAILER_ERR_WRITE);
-		return (0);
-	}
-	ret = status_get(st, file, 0, 0, &sr);
-	if (ret == -1) {
-		d->errmsg = status_errmsg(st);
-		free(path);
-		return (DETAILER_ERR_MSG);
-	}
-	if (ret == 0)
-		sr = NULL;
-
-	/* If our recorded information doesn't match the file that the
-	   client has, then ignore the recorded information. */
-	if (sr != NULL && (sr->sr_type != SR_CHECKOUTLIVE ||
-	    !fattr_equal(sr->sr_clientattr, fa)))
-		sr = NULL;
-	fattr_free(fa);
-	if (sr != NULL && strcmp(sr->sr_revdate, ".") != 0) {
-		error = proto_printf(wr, "U %s %s %s %s %s\n", file,
-		    coll->co_tag, coll->co_date, sr->sr_revnum, sr->sr_revdate);
-		free(path);
-		if (error)
-			return (DETAILER_ERR_WRITE);
-		return (0);
-	}
-
-	/*
-	 * We don't have complete and/or accurate recorded information
-	 * about what version of the file we have.  Compute the file's
-	 * checksum as an aid toward identifying which version it is.
-	 */
-	error = MD5_File(path, md5);
-	if (error) {
-		xasprintf(&d->errmsg,
-		    "Cannot calculate checksum for \"%s\": %s", path,
-		    strerror(errno));
-		return (DETAILER_ERR_MSG);
-	}
-	free(path);
-	if (sr == NULL) {
-		error = proto_printf(wr, "S %s %s %s %s\n", file,
-		    coll->co_tag, coll->co_date, md5);
-	} else {
-		error = proto_printf(wr, "s %s %s %s %s %s\n", file,
-		    coll->co_tag, coll->co_date, sr->sr_revnum, md5);
-	}
-	if (error)
-		return (DETAILER_ERR_WRITE);
-	return (0);
-}
-
-int
-detailer_checkrcsattr(struct detailer *d, struct coll *coll, char *name,
-    struct fattr *server_attr, int attic)
-{
-	struct fattr *client_attr;
-	char *attr, *path;
-	int error;
-
-	/*
-	 * I don't think we can use the status file, since it only records file
-	 * attributes in cvsmode.
-	 */
-	client_attr = NULL;
-	path = cvspath(coll->co_prefix, name, attic);
-	if (path == NULL) {
-		return (DETAILER_ERR_PROTO);
-	}
-
-	if (access(path, F_OK) == 0 && 
-	    ((client_attr = fattr_frompath(path, FATTR_NOFOLLOW)) != NULL) &&
-	    fattr_equal(client_attr, server_attr)) {
-		attr = fattr_encode(client_attr, NULL, 0);
-		if (attic) {
-			error = proto_printf(d->wr, "l %s %s\n", name, attr);
-		} else {
-			error = proto_printf(d->wr, "L %s %s\n", name, attr);
-		}
-		free(attr);
-		free(path);
-		fattr_free(client_attr);
-		if (error)
-			return (DETAILER_ERR_WRITE);
-		return (0);
-	}
-	/* We don't have it, so tell the server to send it. */
-	error = detailer_send_details(d, coll, name, path, client_attr);
-	fattr_free(client_attr);
-	free(path);
-	return (error);
-}
-
-int
-detailer_send_details(struct detailer *d, struct coll *coll, char *name,
-    char *path, struct fattr *fa)
-{
-	int error;
-	size_t len;
-
-       /*
-        * Try to check if the file exists either live or dead to see if we can
-        * edit it and put it live or dead, rather than receiving the entire
-        * file.
-	*/
-	if (fa == NULL) {
-		path = atticpath(coll->co_prefix, name); 
-		fa = fattr_frompath(path, FATTR_NOFOLLOW);
-	}
-	if (fa == NULL) {
-		error = proto_printf(d->wr, "A %s\n", name);
-		if (error)
-			return (DETAILER_ERR_WRITE);
-	} else if (fattr_type(fa) == FT_FILE) {
-		if (isrcs(name, &len) && !(coll->co_options & CO_NORCS)) {
-			detailer_dofile_rcs(d, coll, name, path);
-		} else if (!(coll->co_options & CO_NORSYNC) &&
-		    !globtree_test(coll->co_norsync, name)) {
-			detailer_dofile_rsync(d, name, path);
-		} else {
-			detailer_dofile_regular(d, name, path);
-		}
-	} else {
-		error = proto_printf(d->wr, "N %s\n", name);
-		if (error)
-			return (DETAILER_ERR_WRITE);
-	}
-	return (0);
-}
diff --git a/usr.bin/csup/detailer.h b/usr.bin/csup/detailer.h
deleted file mode 100644
index fe82b27f6812..000000000000
--- a/usr.bin/csup/detailer.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * Copyright (c) 2003-2004, Maxime Henrion <mux@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 _DETAILER_H_
-#define _DETAILER_H_
-
-void	*detailer(void *);
-
-#endif /* !_DETAILER_H_ */
diff --git a/usr.bin/csup/diff.c b/usr.bin/csup/diff.c
deleted file mode 100644
index 30a6c354f07a..000000000000
--- a/usr.bin/csup/diff.c
+++ /dev/null
@@ -1,438 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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/queue.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "diff.h"
-#include "keyword.h"
-#include "misc.h"
-#include "stream.h"
-
-typedef long lineno_t;
-
-#define	EC_ADD	0
-#define	EC_DEL	1
-#define	MAXKEY	LONG_MAX
-
-/* Editing command and state. */
-struct editcmd {
-	int cmd;
-	long key;
-	int havetext;
-	int offset;
-	lineno_t where;
-	lineno_t count;
-	lineno_t lasta;
-	lineno_t lastd;
-	lineno_t editline;
-	/* For convenience. */
-	struct keyword *keyword;
-	struct diffinfo *di;
-	struct stream *orig;
-	struct stream *dest;
-	LIST_ENTRY(editcmd) next;
-};
-
-struct diffstart {
-	LIST_HEAD(, editcmd) dhead;
-};
-
-static int	diff_geteditcmd(struct editcmd *, char *);
-static int	diff_copyln(struct editcmd *, lineno_t);
-static int	diff_ignoreln(struct editcmd *, lineno_t);
-static void	diff_write(struct editcmd *, void *, size_t);
-static int	diff_insert_edit(struct diffstart *, struct editcmd *);
-static void	diff_free(struct diffstart *);
-
-int
-diff_apply(struct stream *rd, struct stream *orig, struct stream *dest,
-    struct keyword *keyword, struct diffinfo *di, int comode)
-{
-	struct editcmd ec;
-	lineno_t i;
-	size_t size;
-	char *line;
-	int empty, error, noeol;
-
-	memset(&ec, 0, sizeof(ec));
-	empty = 0;
-	noeol = 0;
-	ec.di = di;
-	ec.keyword = keyword;
-	ec.orig = orig;
-	ec.dest = dest;
-	line = stream_getln(rd, NULL);
-	while (line != NULL && strcmp(line, ".") != 0 &&
-	    strcmp(line, ".+") != 0) {
-		/*
-		 * The server sends an empty line and then terminates
-		 * with .+ for forced (and thus empty) commits.
-		 */
-		if (*line == '\0') {
-			if (empty)
-				return (-1);
-			empty = 1;
-			line = stream_getln(rd, NULL);
-			continue;
-		}
-		error = diff_geteditcmd(&ec, line);
-		if (error)
-			return (-1);
-
-		if (ec.cmd == EC_ADD) {
-			error = diff_copyln(&ec, ec.where);
-			if (error)
-				return (-1);
-			for (i = 0; i < ec.count; i++) {
-				line = stream_getln(rd, &size);
-				if (line == NULL)
-					return (-1);
-				if (comode && line[0] == '.') {
-					line++;
-					size--;
-				}
-				diff_write(&ec, line, size);
-			}
-		} else {
-			assert(ec.cmd == EC_DEL);
-			error = diff_copyln(&ec, ec.where - 1);
-			if (error)
-				return (-1);
-			for (i = 0; i < ec.count; i++) {
-				line = stream_getln(orig, NULL);
-				if (line == NULL)
-					return (-1);
-				ec.editline++;
-			}
-		}
-		line = stream_getln(rd, NULL);
-	}
-	if (comode && line == NULL)
-		return (-1);
-	/* If we got ".+", there's no ending newline. */
-	if (comode && strcmp(line, ".+") == 0 && !empty)
-		noeol = 1;
-	ec.where = 0;
-	while ((line = stream_getln(orig, &size)) != NULL)
-		diff_write(&ec, line, size);
-	stream_flush(dest);
-	if (noeol) {
-		error = stream_truncate_rel(dest, -1);
-		if (error) {
-			warn("stream_truncate_rel");
-			return (-1);
-		}
-	}
-	return (0);
-}
-
-/*
- * Reverse a diff using the same algorithm as in cvsup.
- */
-static int
-diff_write_reverse(struct stream *dest, struct diffstart *ds)
-{
-	struct editcmd *ec, *nextec;
-	long editline, endline, firstoutputlinedeleted;
-	long num_added, num_deleted, startline;
-	int num;
-
-	nextec = LIST_FIRST(&ds->dhead);
-	editline = 0;
-	num = 0;
-	while (nextec != NULL) {
-		ec = nextec;
-		nextec = LIST_NEXT(nextec, next);
-		if (nextec == NULL)
-			break;
-		num++;
-		num_deleted = 0;
-		if (ec->havetext)
-			num_deleted = ec->count;
-		num_added = num_deleted + nextec->offset - ec->offset;
-		if (num_deleted > 0) {
-			firstoutputlinedeleted = ec->key - num_deleted + 1;
-			stream_printf(dest, "d%ld %ld\n", firstoutputlinedeleted,
-			    num_deleted);
-			if (num_added <= 0)
-				continue;
-		}
-		if (num_added > 0) {
-			stream_printf(dest, "a%ld %ld\n", ec->key, num_added);
-			startline = ec->key - num_deleted + 1 + ec->offset;
-			endline = startline + num_added - 1;
-
-			/* Copy lines from original file. First ignore some. */
-			ec->editline = editline;
-			diff_ignoreln(ec,  startline - 1);
-			diff_copyln(ec, endline);
-			editline = ec->editline;
-		}
-	}
-	return (0);
-}
-
-/* 
- * Insert a diff into the list sorted on key. Should perhaps use quicker
- * algorithms than insertion sort, but do this for now.
- */
-static int
-diff_insert_edit(struct diffstart *ds, struct editcmd *ec)
-{
-	struct editcmd *curec;
-
-	if (ec == NULL)
-		return (0);
-
-	if (LIST_EMPTY(&ds->dhead)) {
-		LIST_INSERT_HEAD(&ds->dhead, ec, next);
-		return (0);
-	}
-
-	/* Insertion sort based on key. */
-	LIST_FOREACH(curec, &ds->dhead, next) {
-		if (ec->key < curec->key) {
-			LIST_INSERT_BEFORE(curec, ec, next);
-			return (0);
-		}
-		if (LIST_NEXT(curec, next) == NULL)
-			break;
-	}
-	/* Just insert it after. */
-	LIST_INSERT_AFTER(curec, ec, next);
-	return (0);
-}
-
-static void 
-diff_free(struct diffstart *ds)
-{
-	struct editcmd *ec;
-
-	while(!LIST_EMPTY(&ds->dhead)) {
-		ec = LIST_FIRST(&ds->dhead);
-		LIST_REMOVE(ec, next);
-		free(ec);
-	}
-}
-
-/*
- * Write the reverse diff from the diff in rd, and original file into
- * destination. This algorithm is the same as used in cvsup.
- */
-int
-diff_reverse(struct stream *rd, struct stream *orig, struct stream *dest,
-    struct keyword *keyword, struct diffinfo *di)
-{
-	struct diffstart ds;
-	struct editcmd ec, *addec, *delec;
-	lineno_t i;
-	char *line;
-	int error, offset;
-
-	memset(&ec, 0, sizeof(ec));
-	ec.orig = orig;
-	ec.dest = dest;
-	ec.keyword = keyword;
-	ec.di = di;
-	addec = NULL;
-	delec = NULL;
-	ec.havetext = 0;
-	offset = 0;
-	LIST_INIT(&ds.dhead);
-
-	/* Start with next since we need it. */
-	line = stream_getln(rd, NULL);
-	/* First we build up the list of diffs from input. */
-	while (line != NULL) {
-		error = diff_geteditcmd(&ec, line);
-		if (error)
-			break;
-		if (ec.cmd == EC_ADD) {
-			addec = xmalloc(sizeof(struct editcmd));
-			*addec = ec;
-			addec->havetext = 1;
-			/* Ignore the lines we was supposed to add. */
-			for (i = 0; i < ec.count; i++) {
-				line = stream_getln(rd, NULL);
-				if (line == NULL)
-					return (-1);
-			}
-
-			/* Get the next diff command if we have one. */
-			addec->key = addec->where + addec->count - offset;
-			if (delec != NULL &&
-			    delec->key == addec->key - addec->count) {
-				delec->key = addec->key;
-				delec->havetext = addec->havetext;
-				delec->count = addec->count;
-				diff_insert_edit(&ds, delec);
-				free(addec);
-				delec = NULL;
-				addec = NULL;
-			} else {
-				if (delec != NULL) {
-					diff_insert_edit(&ds, delec);
-				}
-				delec = NULL;
-				addec->offset = offset;
-				diff_insert_edit(&ds, addec);
-				addec = NULL;
-			}
-			offset -= ec.count;
-		} else if (ec.cmd == EC_DEL) {
-			if (delec != NULL) {
-				/* Update offset to our next. */
-				diff_insert_edit(&ds, delec);
-				delec = NULL;
-			}
-			delec = xmalloc(sizeof(struct editcmd));
-			*delec = ec;
-			delec->key = delec->where - 1 - offset;
-			delec->offset = offset;
-			delec->count = 0;
-			delec->havetext = 0;
-			/* Important to use the count we had before reset.*/
-			offset += ec.count;
-		}
-		line = stream_getln(rd, NULL);
-	}
-
-	while (line != NULL)
-		line = stream_getln(rd, NULL);
-	if (delec != NULL) {
-		diff_insert_edit(&ds, delec);
-		delec = NULL;
-	}
-
-	addec = xmalloc(sizeof(struct editcmd));
-	/* Should be filesize, but we set it to max value. */
-	addec->key = MAXKEY;
-	addec->offset = offset;
-	addec->havetext = 0;
-	addec->count = 0;
-	diff_insert_edit(&ds, addec);
-	addec = NULL;
-	diff_write_reverse(dest, &ds);
-	diff_free(&ds);
-	stream_flush(dest);
-	return (0);
-}
-
-/* Get an editing command from the diff. */
-static int
-diff_geteditcmd(struct editcmd *ec, char *line)
-{
-	char *end;
-
-	if (line[0] == 'a')
-		ec->cmd = EC_ADD;
-	else if (line[0] == 'd')
-		ec->cmd = EC_DEL;
-	else
-		return (-1);
-	errno = 0;
-	ec->where = strtol(line + 1, &end, 10);
-	if (errno || ec->where < 0 || *end != ' ')
-		return (-1);
-	line = end + 1;
-	errno = 0;
-	ec->count = strtol(line, &end, 10);
-	if (errno || ec->count <= 0 || *end != '\0')
-		return (-1);
-	if (ec->cmd == EC_ADD) {
-		if (ec->where < ec->lasta)
-			return (-1);
-		ec->lasta = ec->where + 1;
-	} else {
-		if (ec->where < ec->lasta || ec->where < ec->lastd)
-			return (-1);
-		ec->lasta = ec->where;
-		ec->lastd = ec->where + ec->count;
-	}
-	return (0);
-}
-
-/* Copy lines from the original version of the file up to line "to". */
-static int
-diff_copyln(struct editcmd *ec, lineno_t to)
-{
-	size_t size;
-	char *line;
-
-	while (ec->editline < to) {
-		line = stream_getln(ec->orig, &size);
-		if (line == NULL)
-			return (-1);
-		ec->editline++;
-		diff_write(ec, line, size);
-	}
-	return (0);
-}
-
-/* Ignore lines from the original version of the file up to line "to". */
-static int
-diff_ignoreln(struct editcmd *ec, lineno_t to)
-{
-	size_t size;
-	char *line;
-
-	while (ec->editline < to) {
-		line = stream_getln(ec->orig, &size);
-		if (line == NULL)
-			return (-1);
-		ec->editline++;
-	}
-	return (0);
-}
-
-/* Write a new line to the file, expanding RCS keywords appropriately. */
-static void
-diff_write(struct editcmd *ec, void *buf, size_t size)
-{
-	size_t newsize;
-	char *line, *newline;
-	int ret;
-
-	line = buf;
-	ret = keyword_expand(ec->keyword, ec->di, line, size,
-	    &newline, &newsize);
-	if (ret) {
-		stream_write(ec->dest, newline, newsize);
-		free(newline);
-	} else {
-		stream_write(ec->dest, buf, size);
-	}
-}
diff --git a/usr.bin/csup/diff.h b/usr.bin/csup/diff.h
deleted file mode 100644
index b0c8c97581eb..000000000000
--- a/usr.bin/csup/diff.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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 _DIFF_H_
-#define _DIFF_H_
-
-struct stream;
-struct keyword;
-struct file_update;
-
-/* Description of an RCS delta. */
-struct diffinfo {
-	char *di_rcsfile;			/* RCS filename */
-	char *di_cvsroot;			/* CVS root prefix */
-	char *di_revnum;			/* Revision number */
-	char *di_revdate;			/* Revision date */
-	char *di_author;			/* Author of the delta */
-	char *di_tag;				/* CVS tag, if any */
-	char *di_state;				/* State of the branch */
-	int di_expand;				/* CVS expansion mode */
-};
-
-int		 diff_apply(struct stream *, struct stream *, struct stream *,
-		     struct keyword *, struct diffinfo *, int);
-int		 diff_reverse(struct stream *, struct stream *,
-		     struct stream *, struct keyword *, struct diffinfo *);
-
-#endif /* !_DIFF_H_ */
diff --git a/usr.bin/csup/fattr.c b/usr.bin/csup/fattr.c
deleted file mode 100644
index b141c2c855d4..000000000000
--- a/usr.bin/csup/fattr.c
+++ /dev/null
@@ -1,981 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "fattr.h"
-#include "idcache.h"
-#include "misc.h"
-
-/*
- * Include the appropriate definition for the file attributes we support.
- * There are two different files: fattr_bsd.h for BSD-like systems that
- * support the extended file flags a la chflags() and fattr_posix.h for
- * bare POSIX systems that don't.
- */
-#ifdef HAVE_FFLAGS
-#include "fattr_bsd.h"
-#else
-#include "fattr_posix.h"
-#endif
-
-#ifdef __FreeBSD__
-#include <osreldate.h>
-#endif
-
-/* Define fflags_t if we're on a system that doesn't have it. */
-#if !defined(__FreeBSD_version) || __FreeBSD_version < 500030
-typedef uint32_t fflags_t;
-#endif
-
-#define	FA_MASKRADIX		16
-#define	FA_FILETYPERADIX	10
-#define	FA_MODTIMERADIX		10
-#define	FA_SIZERADIX		10
-#define	FA_RDEVRADIX		16
-#define	FA_MODERADIX		8
-#define	FA_FLAGSRADIX		16
-#define	FA_LINKCOUNTRADIX	10
-#define	FA_DEVRADIX		16
-#define	FA_INODERADIX		10
-
-#define	FA_PERMMASK		(S_IRWXU | S_IRWXG | S_IRWXO)
-#define	FA_SETIDMASK		(S_ISUID | S_ISGID | S_ISVTX)
-
-struct fattr {
-	int		mask;
-	int		type;
-	time_t		modtime;
-	off_t		size;
-	char		*linktarget;
-	dev_t		rdev;
-	uid_t		uid;
-	gid_t		gid;
-	mode_t		mode;
-	fflags_t	flags;
-	nlink_t		linkcount;
-	dev_t		dev;
-	ino_t		inode;
-};
-
-static const struct fattr bogus = {
-	FA_MODTIME | FA_SIZE | FA_MODE,
-	FT_UNKNOWN,
-	1,
-	0,
-	NULL,
-	0,
-	0,
-	0,
-	0,
-	0,
-	0,
-	0,
-	0
-};
-
-static struct fattr *defaults[FT_NUMBER];
-
-void
-fattr_init(void)
-{
-	struct fattr *fa;
-	int i;
-
-	for (i = 0; i < FT_NUMBER; i++) {
-		fa = fattr_new(i, -1);
-		if (i == FT_DIRECTORY)
-			fa->mode = 0777;
-		else
-			fa->mode = 0666;
-		fa->mask |= FA_MODE;
-		defaults[i] = fa;
-	}
-	/* Initialize the uid/gid lookup cache. */
-	idcache_init();
-}
-
-void
-fattr_fini(void)
-{
-	int i;
-
-	idcache_fini();
-	for (i = 0; i < FT_NUMBER; i++)
-		fattr_free(defaults[i]);
-}
-
-const struct fattr *fattr_bogus = &bogus;
-
-static char		*fattr_scanattr(struct fattr *, int, const char *);
-
-int
-fattr_supported(int type)
-{
-
-	return (fattr_support[type]);
-}
-
-struct fattr *
-fattr_new(int type, time_t modtime)
-{
-	struct fattr *new;
-
-	new = xmalloc(sizeof(struct fattr));
-	memset(new, 0, sizeof(struct fattr));
-	new->type = type;
-	if (type != FT_UNKNOWN)
-		new->mask |= FA_FILETYPE;
-	if (modtime != -1) {
-		new->modtime = modtime;
-		new->mask |= FA_MODTIME;
-	}
-	if (fattr_supported(new->type) & FA_LINKCOUNT) {
-		new->mask |= FA_LINKCOUNT;
-		new->linkcount = 1;
-	}
-	return (new);
-}
-
-/* Returns a new file attribute structure based on a stat structure. */
-struct fattr *
-fattr_fromstat(struct stat *sb)
-{
-	struct fattr *fa;
-
-	fa = fattr_new(FT_UNKNOWN, -1);
-	if (S_ISREG(sb->st_mode))
-		fa->type = FT_FILE;
-	else if (S_ISDIR(sb->st_mode))
-		fa->type = FT_DIRECTORY;
-	else if (S_ISCHR(sb->st_mode))
-		fa->type = FT_CDEV;
-	else if (S_ISBLK(sb->st_mode))
-		fa->type = FT_BDEV;
-	else if (S_ISLNK(sb->st_mode))
-		fa->type = FT_SYMLINK;
-	else
-		fa->type = FT_UNKNOWN;
-
-	fa->mask = FA_FILETYPE | fattr_supported(fa->type);
-	if (fa->mask & FA_MODTIME)
-		fa->modtime = sb->st_mtime;
-	if (fa->mask & FA_SIZE)
-		fa->size = sb->st_size;
-	if (fa->mask & FA_RDEV)
-		fa->rdev = sb->st_rdev;
-	if (fa->mask & FA_OWNER)
-		fa->uid = sb->st_uid;
-	if (fa->mask & FA_GROUP)
-		fa->gid = sb->st_gid;
-	if (fa->mask & FA_MODE)
-		fa->mode = sb->st_mode & (FA_SETIDMASK | FA_PERMMASK);
-#ifdef HAVE_FFLAGS
-	if (fa->mask & FA_FLAGS)
-		fa->flags = sb->st_flags;
-#endif
-	if (fa->mask & FA_LINKCOUNT)
-		fa->linkcount = sb->st_nlink;
-	if (fa->mask & FA_DEV)
-		fa->dev = sb->st_dev;
-	if (fa->mask & FA_INODE)
-		fa->inode = sb->st_ino;
-	return (fa);
-}
-
-struct fattr *
-fattr_frompath(const char *path, int nofollow)
-{
-	struct fattr *fa;
-	struct stat sb;
-	int error, len;
-
-	if (nofollow)
-		error = lstat(path, &sb);
-	else
-		error = stat(path, &sb);
-	if (error)
-		return (NULL);
-	fa = fattr_fromstat(&sb);
-	if (fa->mask & FA_LINKTARGET) {
-		char buf[1024];
-
-		len = readlink(path, buf, sizeof(buf));
-		if (len == -1) {
-			fattr_free(fa);
-			return (NULL);
-		}
-		if ((unsigned)len > sizeof(buf) - 1) {
-			fattr_free(fa);
-			errno = ENAMETOOLONG;
-			return (NULL);
-		}
-		buf[len] = '\0';
-		fa->linktarget = xstrdup(buf);
-	}
-	return (fa);
-}
-
-struct fattr *
-fattr_fromfd(int fd)
-{
-	struct fattr *fa;
-	struct stat sb;
-	int error;
-
-	error = fstat(fd, &sb);
-	if (error)
-		return (NULL);
-	fa = fattr_fromstat(&sb);
-	return (fa);
-}
-
-int
-fattr_type(const struct fattr *fa)
-{
-
-	return (fa->type);
-}
-
-/* Returns a new file attribute structure from its encoded text form. */
-struct fattr *
-fattr_decode(char *attr)
-{
-	struct fattr *fa;
-	char *next;
-
-	fa = fattr_new(FT_UNKNOWN, -1);
-	next = fattr_scanattr(fa, FA_MASK, attr);
-	if (next == NULL || (fa->mask & ~FA_MASK) > 0)
-		goto bad;
-	if (fa->mask & FA_FILETYPE) {
-		next = fattr_scanattr(fa, FA_FILETYPE, next);
-		if (next == NULL)
-			goto bad;
-		if (fa->type < 0 || fa->type > FT_MAX)
-			fa->type = FT_UNKNOWN;
-	} else {
-		/* The filetype attribute is always valid. */
-		fa->mask |= FA_FILETYPE;
-		fa->type = FT_UNKNOWN;
-	}
-	fa->mask = fa->mask & fattr_supported(fa->type);
-	if (fa->mask & FA_MODTIME)
-		next = fattr_scanattr(fa, FA_MODTIME, next);
-	if (fa->mask & FA_SIZE)
-		next = fattr_scanattr(fa, FA_SIZE, next);
-	if (fa->mask & FA_LINKTARGET)
-		next = fattr_scanattr(fa, FA_LINKTARGET, next);
-	if (fa->mask & FA_RDEV)
-		next = fattr_scanattr(fa, FA_RDEV, next);
-	if (fa->mask & FA_OWNER)
-		next = fattr_scanattr(fa, FA_OWNER, next);
-	if (fa->mask & FA_GROUP)
-		next = fattr_scanattr(fa, FA_GROUP, next);
-	if (fa->mask & FA_MODE)
-		next = fattr_scanattr(fa, FA_MODE, next);
-	if (fa->mask & FA_FLAGS)
-		next = fattr_scanattr(fa, FA_FLAGS, next);
-	if (fa->mask & FA_LINKCOUNT) {
-		next = fattr_scanattr(fa, FA_LINKCOUNT, next);
-	} else if (fattr_supported(fa->type) & FA_LINKCOUNT) {
-		/* If the link count is missing but supported, fake it as 1. */
-		fa->mask |= FA_LINKCOUNT;
-		fa->linkcount = 1;
-	}
-	if (fa->mask & FA_DEV)
-		next = fattr_scanattr(fa, FA_DEV, next);
-	if (fa->mask & FA_INODE)
-		next = fattr_scanattr(fa, FA_INODE, next);
-	if (next == NULL)
-		goto bad;
-	return (fa);
-bad:
-	fattr_free(fa);
-	return (NULL);
-}
-
-char *
-fattr_encode(const struct fattr *fa, fattr_support_t support, int ignore)
-{
-	struct {
-		char val[32];
-		char len[4];
-		int extval;
-		char *ext;
-	} pieces[FA_NUMBER], *piece;
-	char *cp, *s, *username, *groupname;
-	size_t len, vallen;
-	mode_t mode, modemask;
-	int mask, n, i;
-
-	username = NULL;
-	groupname = NULL;
-	if (support == NULL)
-		mask = fa->mask;
-	else
-		mask = fa->mask & support[fa->type];
-	mask &= ~ignore;
-	if (fa->mask & FA_OWNER) {
-		username = getuserbyid(fa->uid);
-		if (username == NULL)
-			mask &= ~FA_OWNER;
-	}
-	if (fa->mask & FA_GROUP) {
-		groupname = getgroupbyid(fa->gid);
-		if (groupname == NULL)
-			mask &= ~FA_GROUP;
-	}
-	if (fa->mask & FA_LINKCOUNT && fa->linkcount == 1)
-		mask &= ~FA_LINKCOUNT;
-
-	memset(pieces, 0, FA_NUMBER * sizeof(*pieces));
-	len = 0;
-	piece = pieces;
-	vallen = snprintf(piece->val, sizeof(piece->val), "%x", mask);
-	len += snprintf(piece->len, sizeof(piece->len), "%lld",
-	    (long long)vallen) + vallen + 1;
-	piece++;
-	if (mask & FA_FILETYPE) {
-		vallen = snprintf(piece->val, sizeof(piece->val),
-		    "%d", fa->type);
-		len += snprintf(piece->len, sizeof(piece->len), "%lld",
-		    (long long)vallen) + vallen + 1;
-		piece++;
-	}
-	if (mask & FA_MODTIME) {
-		vallen = snprintf(piece->val, sizeof(piece->val),
-		    "%lld", (long long)fa->modtime);
-		len += snprintf(piece->len, sizeof(piece->len), "%lld",
-		    (long long)vallen) + vallen + 1;
-		piece++;
-	}
-	if (mask & FA_SIZE) {
-		vallen = snprintf(piece->val, sizeof(piece->val),
-		    "%lld", (long long)fa->size);
-		len += snprintf(piece->len, sizeof(piece->len), "%lld",
-		    (long long)vallen) + vallen + 1;
-		piece++;
-	}
-	if (mask & FA_LINKTARGET) {
-		vallen = strlen(fa->linktarget);
-		piece->extval = 1;
-		piece->ext = fa->linktarget;
-		len += snprintf(piece->len, sizeof(piece->len), "%lld",
-		    (long long)vallen) + vallen + 1;
-		piece++;
-	}
-	if (mask & FA_RDEV) {
-		vallen = snprintf(piece->val, sizeof(piece->val),
-		    "%lld", (long long)fa->rdev);
-		len += snprintf(piece->len, sizeof(piece->len), "%lld",
-		    (long long)vallen) + vallen + 1;
-		piece++;
-	}
-	if (mask & FA_OWNER) {
-		vallen = strlen(username);
-		piece->extval = 1;
-		piece->ext = username;
-		len += snprintf(piece->len, sizeof(piece->len), "%lld",
-		    (long long)vallen) + vallen + 1;
-		piece++;
-	}
-	if (mask & FA_GROUP) {
-		vallen = strlen(groupname);
-		piece->extval = 1;
-		piece->ext = groupname;
-		len += snprintf(piece->len, sizeof(piece->len), "%lld",
-		    (long long)vallen) + vallen + 1;
-		piece++;
-	}
-	if (mask & FA_MODE) {
-		if (mask & FA_OWNER && mask & FA_GROUP)
-			modemask = FA_SETIDMASK | FA_PERMMASK;
-		else
-			modemask = FA_PERMMASK;
-		mode = fa->mode & modemask;
-		vallen = snprintf(piece->val, sizeof(piece->val),
-		    "%o", mode);
-		len += snprintf(piece->len, sizeof(piece->len), "%lld",
-		    (long long)vallen) + vallen + 1;
-		piece++;
-	}
-	if (mask & FA_FLAGS) {
-		vallen = snprintf(piece->val, sizeof(piece->val), "%llx",
-		    (long long)fa->flags);
-		len += snprintf(piece->len, sizeof(piece->len), "%lld",
-		    (long long)vallen) + vallen + 1;
-		piece++;
-	}
-	if (mask & FA_LINKCOUNT) {
-		vallen = snprintf(piece->val, sizeof(piece->val), "%lld",
-		    (long long)fa->linkcount);
-		len += snprintf(piece->len, sizeof(piece->len), "%lld",
-		    (long long)vallen) + vallen + 1;
-		piece++;
-	}
-	if (mask & FA_DEV) {
-		vallen = snprintf(piece->val, sizeof(piece->val), "%llx",
-		    (long long)fa->dev);
-		len += snprintf(piece->len, sizeof(piece->len), "%lld",
-		    (long long)vallen) + vallen + 1;
-		piece++;
-	}
-	if (mask & FA_INODE) {
-		vallen = snprintf(piece->val, sizeof(piece->val), "%lld",
-		    (long long)fa->inode);
-		len += snprintf(piece->len, sizeof(piece->len), "%lld",
-		    (long long)vallen) + vallen + 1;
-		piece++;
-	}
-
-	s = xmalloc(len + 1);
-
-	n = piece - pieces;
-	piece = pieces;
-	cp = s;
-	for (i = 0; i < n; i++) {
-		if (piece->extval)
-			len = sprintf(cp, "%s#%s", piece->len, piece->ext);
-		else
-			len = sprintf(cp, "%s#%s", piece->len, piece->val);
-		cp += len;
-	      	piece++;
-	}
-	return (s);
-}
-
-struct fattr *
-fattr_dup(const struct fattr *from)
-{
-	struct fattr *fa;
-
-	fa = fattr_new(FT_UNKNOWN, -1);
-	fattr_override(fa, from, FA_MASK);
-	return (fa);
-}
-
-void
-fattr_free(struct fattr *fa)
-{
-
-	if (fa == NULL)
-		return;
-	if (fa->linktarget != NULL)
-		free(fa->linktarget);
-	free(fa);
-}
-
-void
-fattr_umask(struct fattr *fa, mode_t newumask)
-{
-
-	if (fa->mask & FA_MODE)
-		fa->mode = fa->mode & ~newumask;
-}
-
-void
-fattr_maskout(struct fattr *fa, int mask)
-{
-
-	/* Don't forget to free() the linktarget attribute if we remove it. */
-	if (mask & FA_LINKTARGET && fa->mask & FA_LINKTARGET) {
-		free(fa->linktarget);
-		fa->linktarget = NULL;
-	}
-	fa->mask &= ~mask;
-}
-
-int
-fattr_getmask(const struct fattr *fa)
-{
-
-	return (fa->mask);
-}
-
-nlink_t
-fattr_getlinkcount(const struct fattr *fa)
-{
-
-	return (fa->linkcount);
-}
-
-char *
-fattr_getlinktarget(const struct fattr *fa)
-{
-
-	return (fa->linktarget);
-}
-
-/*
- * Eat the specified attribute and put it in the file attribute
- * structure.  Returns NULL on error, or a pointer to the next
- * attribute to parse.
- *
- * This would be much prettier if we had strntol() so that we're
- * not forced to write '\0' to the string before calling strtol()
- * and then put back the old value...
- *
- * We need to use (unsigned) long long types here because some
- * of the opaque types we're parsing (off_t, time_t...) may need
- * 64bits to fit.
- */
-static char *
-fattr_scanattr(struct fattr *fa, int type, const char *attr)
-{
-	char *attrend, *attrstart, *end;
-	size_t len;
-	unsigned long attrlen;
-	int error;
-	mode_t modemask;
-	char tmp;
-
-	if (attr == NULL)
-		return (NULL);
-	errno = 0;
-	attrlen = strtoul(attr, &end, 10);
-	if (errno || *end != '#')
-		return (NULL);
-	len = strlen(attr);
-	attrstart = end + 1;
-	attrend = attrstart + attrlen;
-	tmp = *attrend;
-	*attrend = '\0';
-	switch (type) {
-	/* Using FA_MASK here is a bit bogus semantically. */
-	case FA_MASK:
-		errno = 0;
-		fa->mask = (int)strtol(attrstart, &end, FA_MASKRADIX);
-		if (errno || end != attrend)
-			goto bad;
-		break;
-	case FA_FILETYPE:
-		errno = 0;
-		fa->type = (int)strtol(attrstart, &end, FA_FILETYPERADIX);
-		if (errno || end != attrend)
-			goto bad;
-		break;
-	case FA_MODTIME:
-		errno = 0;
-		fa->modtime = (time_t)strtoll(attrstart, &end, FA_MODTIMERADIX);
-		if (errno || end != attrend)
-			goto bad;
-		break;
-	case FA_SIZE:
-		errno = 0;
-		fa->size = (off_t)strtoll(attrstart, &end, FA_SIZERADIX);
-		if (errno || end != attrend)
-			goto bad;
-		break;
-	case FA_LINKTARGET:
-		fa->linktarget = xstrdup(attrstart);
-		break;
-	case FA_RDEV:
-		errno = 0;
-		fa->rdev = (dev_t)strtoll(attrstart, &end, FA_RDEVRADIX);
-		if (errno || end != attrend)
-			goto bad;
-		break;
-	case FA_OWNER:
-		error = getuidbyname(attrstart, &fa->uid);
-		if (error)
-			fa->mask &= ~FA_OWNER;
-		break;
-	case FA_GROUP:
-		error = getgidbyname(attrstart, &fa->gid);
-		if (error)
-			fa->mask &= ~FA_GROUP;
-		break;
-	case FA_MODE:
-		errno = 0;
-		fa->mode = (mode_t)strtol(attrstart, &end, FA_MODERADIX);
-		if (errno || end != attrend)
-			goto bad;
-		if (fa->mask & FA_OWNER && fa->mask & FA_GROUP)
-			modemask = FA_SETIDMASK | FA_PERMMASK;
-		else
-			modemask = FA_PERMMASK;
-		fa->mode &= modemask;
-		break;
-	case FA_FLAGS:
-		errno = 0;
-		fa->flags = (fflags_t)strtoul(attrstart, &end, FA_FLAGSRADIX);
-		if (errno || end != attrend)
-			goto bad;
-		break;
-	case FA_LINKCOUNT:
-		errno = 0;
-		fa->linkcount = (nlink_t)strtol(attrstart, &end, FA_FLAGSRADIX);
-		if (errno || end != attrend)
-			goto bad;
-		break;
-	case FA_DEV:
-		errno = 0;
-		fa->dev = (dev_t)strtoll(attrstart, &end, FA_DEVRADIX);
-		if (errno || end != attrend)
-			goto bad;
-		break;
-	case FA_INODE:
-		errno = 0;
-		fa->inode = (ino_t)strtoll(attrstart, &end, FA_INODERADIX);
-		if (errno || end != attrend)
-			goto bad;
-		break;
-	}
-	*attrend = tmp;
-	return (attrend);
-bad:
-	*attrend = tmp;
-	return (NULL);
-}
-
-/* Return a file attribute structure built from the RCS file attributes. */
-struct fattr *
-fattr_forcheckout(const struct fattr *rcsattr, mode_t mask)
-{
-	struct fattr *fa;
-
-	fa = fattr_new(FT_FILE, -1);
-	if (rcsattr->mask & FA_MODE) {
-		if ((rcsattr->mode & 0111) > 0)
-			fa->mode = 0777;
-		else
-			fa->mode = 0666;
-		fa->mode &= ~mask;
-		fa->mask |= FA_MODE;
-	}
-	return (fa);
-}
-
-/* Merge attributes from "from" that aren't present in "fa". */
-void
-fattr_merge(struct fattr *fa, const struct fattr *from)
-{
-
-	fattr_override(fa, from, from->mask & ~fa->mask);
-}
-
-/* Merge default attributes. */
-void
-fattr_mergedefault(struct fattr *fa)
-{
-
-	fattr_merge(fa, defaults[fa->type]);
-}
-
-/* Override selected attributes of "fa" with values from "from". */
-void
-fattr_override(struct fattr *fa, const struct fattr *from, int mask)
-{
-
-	mask &= from->mask;
-	if (fa->mask & FA_LINKTARGET && mask & FA_LINKTARGET)
-		free(fa->linktarget);
-	fa->mask |= mask;
-	if (mask & FA_FILETYPE)
-		fa->type = from->type;
-	if (mask & FA_MODTIME)
-		fa->modtime = from->modtime;
-	if (mask & FA_SIZE)
-		fa->size = from->size;
-	if (mask & FA_LINKTARGET)
-		fa->linktarget = xstrdup(from->linktarget);
-	if (mask & FA_RDEV)
-		fa->rdev = from->rdev;
-	if (mask & FA_OWNER)
-		fa->uid = from->uid;
-	if (mask & FA_GROUP)
-		fa->gid = from->gid;
-	if (mask & FA_MODE)
-		fa->mode = from->mode;
-	if (mask & FA_FLAGS)
-		fa->flags = from->flags;
-	if (mask & FA_LINKCOUNT)
-		fa->linkcount = from->linkcount;
-	if (mask & FA_DEV)
-		fa->dev = from->dev;
-	if (mask & FA_INODE)
-		fa->inode = from->inode;
-}
-
-/* Create a node. */
-int
-fattr_makenode(const struct fattr *fa, const char *path)
-{
-	mode_t modemask, mode;
-	int error;
-
-	error = 0;
-
-	if (fa->mask & FA_OWNER && fa->mask & FA_GROUP)
-		modemask = FA_SETIDMASK | FA_PERMMASK;
-	else
-		modemask = FA_PERMMASK;
-
-	/* We only implement fattr_makenode() for dirs for now. */
-	if (fa->mask & FA_MODE)
-		mode = fa->mode & modemask;
-	else
-		mode = 0700;
-
-	if (fa->type == FT_DIRECTORY)
-		error = mkdir(path, mode);
-	else if (fa->type == FT_SYMLINK) {
-		error = symlink(fa->linktarget, path);
-	} else if (fa->type == FT_CDEV) {
-		lprintf(-1, "Character devices not supported!\n");
-	} else if (fa->type == FT_BDEV) {
-		lprintf(-1, "Block devices not supported!\n");
-	}
-	return (error);
-}
-
-int
-fattr_delete(const char *path)
-{
-	struct fattr *fa;
-	int error;
-
-	fa = fattr_frompath(path, FATTR_NOFOLLOW);
-	if (fa == NULL) {
-		if (errno == ENOENT)
-			return (0);
-		return (-1);
-	}
-
-#ifdef HAVE_FFLAGS
-	/* Clear flags. */
-	if (fa->mask & FA_FLAGS && fa->flags != 0) {
-		fa->flags = 0;
-		(void)chflags(path, fa->flags);
-	}
-#endif
-
-	if (fa->type == FT_DIRECTORY)
-		error = rmdir(path);
-	else
-		error = unlink(path);
-	fattr_free(fa);
-	return (error);
-}
-
-/*
- * Changes those attributes we can change.  Returns -1 on error,
- * 0 if no update was needed, and 1 if an update was needed and
- * it has been applied successfully.
- */
-int
-fattr_install(struct fattr *fa, const char *topath, const char *frompath)
-{
-	struct timeval tv[2];
-	struct fattr *old;
-	int error, inplace, mask;
-	mode_t modemask, newmode;
-	uid_t uid;
-	gid_t gid;
-
-	mask = fa->mask & fattr_supported(fa->type);
-	if (mask & FA_OWNER && mask & FA_GROUP)
-		modemask = FA_SETIDMASK | FA_PERMMASK;
-	else
-		modemask = FA_PERMMASK;
-
-	inplace = 0;
-	if (frompath == NULL) {
-		/* Changing attributes in place. */
-		frompath = topath;
-		inplace = 1;
-	}
-	old = fattr_frompath(topath, FATTR_NOFOLLOW);
-	if (old != NULL) {
-		if (inplace && fattr_equal(fa, old)) {
-			fattr_free(old);
-			return (0);
-		}
-
-#ifdef HAVE_FFLAGS
-		/*
-		 * Determine whether we need to clear the flags of the target.
-		 * This is bogus in that it assumes a value of 0 is safe and
-		 * that non-zero is unsafe.  I'm not really worried by that
-		 * since as far as I know that's the way things are.
-		 */
-		if ((old->mask & FA_FLAGS) && old->flags > 0) {
-			(void)chflags(topath, 0);
-			old->flags = 0;
-		}
-#endif
-
-		/*
-		 * If it is changed from a file to a symlink, remove the file
-		 * and create the symlink.
-		 */
-		if (inplace && (fa->type == FT_SYMLINK) &&
-		    (old->type == FT_FILE)) {
-			error = unlink(topath);
-			if (error)
-				goto bad;
-			error = symlink(fa->linktarget, topath);
-			if (error)
-				goto bad;
-		}
-		/* Determine whether we need to remove the target first. */
-		if (!inplace && (fa->type == FT_DIRECTORY) !=
-		    (old->type == FT_DIRECTORY)) {
-			if (old->type == FT_DIRECTORY)
-				error = rmdir(topath);
-			else
-				error = unlink(topath);
-			if (error)
-				goto bad;
-		}
-	}
-
-	/* Change those attributes that we can before moving the file
-	 * into place.  That makes installation atomic in most cases. */
-	if (mask & FA_MODTIME) {
-		gettimeofday(tv, NULL);		/* Access time. */
-		tv[1].tv_sec = fa->modtime;	/* Modification time. */
-		tv[1].tv_usec = 0;
-		error = utimes(frompath, tv);
-		if (error)
-			goto bad;
-	}
-	if (mask & FA_OWNER || mask & FA_GROUP) {
-		uid = -1;
-		gid = -1;
-		if (mask & FA_OWNER)
-			uid = fa->uid;
-		if (mask & FA_GROUP)
-			gid = fa->gid;
-		error = chown(frompath, uid, gid);
-		if (error) {
-			goto bad;
-		}
-	}
-	if (mask & FA_MODE) {
-		newmode = fa->mode & modemask;
-		/* Merge in set*id bits from the old attribute. */
-		if (old != NULL && old->mask & FA_MODE) {
-			newmode |= (old->mode & ~modemask);
-			newmode &= (FA_SETIDMASK | FA_PERMMASK);
-		}
-		error = chmod(frompath, newmode);
-		if (error)
-			goto bad;
-	}
-
-	if (!inplace) {
-		error = rename(frompath, topath);
-		if (error)
-			goto bad;
-	}
-
-#ifdef HAVE_FFLAGS
-	/* Set the flags. */
-	if (mask & FA_FLAGS)
-		(void)chflags(topath, fa->flags);
-#endif
-	fattr_free(old);
-	return (1);
-bad:
-	fattr_free(old);
-	return (-1);
-}
-
-/*
- * Returns 1 if both attributes are equal, 0 otherwise.
- *
- * This function only compares attributes that are valid in both
- * files.  A file of unknown type ("FT_UNKNOWN") is unequal to
- * anything, including itself.
- */
-int
-fattr_equal(const struct fattr *fa1, const struct fattr *fa2)
-{
-	int mask;
-
-	mask = fa1->mask & fa2->mask;
-	if (fa1->type == FT_UNKNOWN || fa2->type == FT_UNKNOWN)
-		return (0);
-	if (mask & FA_FILETYPE)
-		if (fa1->type != fa2->type)
-			return (0);
-	if (mask & FA_MODTIME)
-		if (fa1->modtime != fa2->modtime)
-			return (0);
-	if (mask & FA_SIZE)
-		if (fa1->size != fa2->size)
-			return (0);
-	if (mask & FA_LINKTARGET)
-		if (strcmp(fa1->linktarget, fa2->linktarget) != 0)
-			return (0);
-	if (mask & FA_RDEV)
-		if (fa1->rdev != fa2->rdev)
-			return (0);
-	if (mask & FA_OWNER)
-		if (fa1->uid != fa2->uid)
-			return (0);
-	if (mask & FA_GROUP)
-		if (fa1->gid != fa2->gid)
-			return (0);
-	if (mask & FA_MODE)
-		if (fa1->mode != fa2->mode)
-			return (0);
-	if (mask & FA_FLAGS)
-		if (fa1->flags != fa2->flags)
-			return (0);
-	if (mask & FA_LINKCOUNT)
-		if (fa1->linkcount != fa2->linkcount)
-			return (0);
-	if (mask & FA_DEV)
-		if (fa1->dev != fa2->dev)
-			return (0);
-	if (mask & FA_INODE)
-		if (fa1->inode != fa2->inode)
-			return (0);
-	return (1);
-}
-
-/*
- * Must have to get the correct filesize sendt by the server.
- */
-off_t
-fattr_filesize(const struct fattr *fa)
-{
-	return (fa->size);
-}
diff --git a/usr.bin/csup/fattr.h b/usr.bin/csup/fattr.h
deleted file mode 100644
index bd4e64970fcd..000000000000
--- a/usr.bin/csup/fattr.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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 _FATTR_H_
-#define _FATTR_H_
-
-#include <sys/types.h>
-
-#include <fcntl.h>
-#include <time.h>
-
-/*
- * File types.
- */
-#define	FT_UNKNOWN	0			/* Unknown file type. */
-#define	FT_FILE		1			/* Regular file. */
-#define	FT_DIRECTORY	2			/* Directory. */
-#define	FT_CDEV		3			/* Character device. */
-#define	FT_BDEV		4			/* Block device. */
-#define	FT_SYMLINK	5			/* Symbolic link. */
-#define	FT_MAX		FT_SYMLINK		/* Maximum file type number. */
-#define	FT_NUMBER	(FT_MAX + 1)		/* Number of file types. */
-
-/*
- * File attributes.
- */
-#define	FA_FILETYPE	0x0001		/* True for all supported file types. */
-#define	FA_MODTIME	0x0002		/* Last file modification time. */
-#define	FA_SIZE		0x0004		/* Size of the file. */
-#define	FA_LINKTARGET	0x0008		/* Target of a symbolic link. */
-#define	FA_RDEV		0x0010		/* Device for a device node. */
-#define	FA_OWNER	0x0020		/* Owner of the file. */
-#define	FA_GROUP	0x0040		/* Group of the file. */
-#define	FA_MODE		0x0080		/* File permissions. */
-#define	FA_FLAGS	0x0100		/* 4.4BSD flags, a la chflags(2). */
-#define	FA_LINKCOUNT	0x0200		/* Hard link count. */
-#define	FA_DEV		0x0400		/* Device holding the inode. */
-#define	FA_INODE	0x0800		/* Inode number. */
-
-#define	FA_MASK		0x0fff
-
-#define	FA_NUMBER	12		/* Number of file attributes. */
-
-/* Attributes that we might be able to change. */
-#define	FA_CHANGEABLE	(FA_MODTIME | FA_OWNER | FA_GROUP | FA_MODE | FA_FLAGS)
-
-/*
- * Attributes that we don't want to save in the "checkouts" file
- * when in checkout mode.
- */
-#define	FA_COIGNORE	(FA_MASK & ~(FA_FILETYPE|FA_MODTIME|FA_SIZE|FA_MODE))
-
-/* These are for fattr_frompath(). */
-#define	FATTR_FOLLOW	0
-#define	FATTR_NOFOLLOW	1
-
-struct stat;
-struct fattr;
-
-typedef int	fattr_support_t[FT_NUMBER];
-
-extern const struct fattr *fattr_bogus;
-
-void		 fattr_init(void);
-void		 fattr_fini(void);
-
-struct fattr	*fattr_new(int, time_t);
-struct fattr	*fattr_default(int);
-struct fattr	*fattr_fromstat(struct stat *);
-struct fattr	*fattr_frompath(const char *, int);
-struct fattr	*fattr_fromfd(int);
-struct fattr	*fattr_decode(char *);
-struct fattr	*fattr_forcheckout(const struct fattr *, mode_t);
-struct fattr	*fattr_dup(const struct fattr *);
-char		*fattr_encode(const struct fattr *, fattr_support_t, int);
-int		 fattr_type(const struct fattr *);
-void		 fattr_maskout(struct fattr *, int);
-int		 fattr_getmask(const struct fattr *);
-nlink_t		 fattr_getlinkcount(const struct fattr *);
-char		*fattr_getlinktarget(const struct fattr *);
-void		 fattr_umask(struct fattr *, mode_t);
-void		 fattr_merge(struct fattr *, const struct fattr *);
-void		 fattr_mergedefault(struct fattr *);
-void		 fattr_override(struct fattr *, const struct fattr *, int);
-int		 fattr_makenode(const struct fattr *, const char *);
-int		 fattr_delete(const char *path);
-int		 fattr_install(struct fattr *, const char *, const char *);
-int		 fattr_equal(const struct fattr *, const struct fattr *);
-void		 fattr_free(struct fattr *);
-int		 fattr_supported(int);
-off_t		 fattr_filesize(const struct fattr *);
-
-
-#endif /* !_FATTR_H_ */
diff --git a/usr.bin/csup/fattr_bsd.h b/usr.bin/csup/fattr_bsd.h
deleted file mode 100644
index 112a8248a21f..000000000000
--- a/usr.bin/csup/fattr_bsd.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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.
- *
- * $Id$
- */
-
-/*
- * The file attributes we support in a BSD environment.
- *
- * This is similar to fattr_posix.h, except that we support the FA_FLAGS
- * attribute when it makes sense.  The FA_FLAGS attribute is for the
- * extended BSD file flags, see chflags(2).
- */
-fattr_support_t fattr_support = {
-	/* FT_UNKNOWN */
-	0,
-	/* FT_FILE */
-	FA_FILETYPE | FA_MODTIME | FA_SIZE | FA_OWNER | FA_GROUP | FA_MODE |
-	    FA_FLAGS | FA_LINKCOUNT | FA_INODE | FA_DEV,
-	/* FT_DIRECTORY */
-	FA_FILETYPE | FA_OWNER | FA_GROUP | FA_MODE | FA_FLAGS,
-	/* FT_CDEV */
-	FA_FILETYPE | FA_RDEV | FA_OWNER | FA_GROUP | FA_MODE | FA_FLAGS |
-	    FA_LINKCOUNT | FA_DEV | FA_INODE,
-	/* FT_BDEV */
-	FA_FILETYPE | FA_RDEV | FA_OWNER | FA_GROUP | FA_MODE | FA_FLAGS |
-	    FA_LINKCOUNT | FA_DEV | FA_INODE,
-	/* FT_SYMLINK */
-	FA_FILETYPE | FA_LINKTARGET
-};
diff --git a/usr.bin/csup/fattr_posix.h b/usr.bin/csup/fattr_posix.h
deleted file mode 100644
index c4650e4293b7..000000000000
--- a/usr.bin/csup/fattr_posix.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2006, Maxime Henrion <mux@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.
- *
- * $Id$
- */
-
-/*
- * The file attributes we support in a POSIX environment.
- */
-fattr_support_t fattr_support = {
-	/* FT_UNKNOWN */
-	0,
-	/* FT_FILE */
-	FA_FILETYPE | FA_MODTIME | FA_SIZE | FA_OWNER | FA_GROUP | FA_MODE |
-	    FA_LINKCOUNT | FA_INODE | FA_DEV,
-	/* FT_DIRECTORY */
-	FA_FILETYPE | FA_OWNER | FA_GROUP | FA_MODE,
-	/* FT_CDEV */
-	FA_FILETYPE | FA_RDEV | FA_OWNER | FA_GROUP | FA_MODE | FA_LINKCOUNT |
-	    FA_DEV | FA_INODE,
-	/* FT_BDEV */
-	FA_FILETYPE | FA_RDEV | FA_OWNER | FA_GROUP | FA_MODE | FA_LINKCOUNT |
-	    FA_DEV | FA_INODE,
-	/* FT_SYMLINK */
-	FA_FILETYPE | FA_LINKTARGET
-};
diff --git a/usr.bin/csup/fixups.c b/usr.bin/csup/fixups.c
deleted file mode 100644
index c39839788406..000000000000
--- a/usr.bin/csup/fixups.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*-
- * Copyright (c) 2006, Maxime Henrion <mux@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/queue.h>
-
-#include <assert.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "fixups.h"
-#include "misc.h"
-
-/*
- * A synchronized queue to implement fixups.  The updater thread adds
- * fixup requests to the queue with fixups_put() when a checksum
- * mismatch error occurred.  It then calls fixups_close() when he's
- * done requesting fixups.  The detailer thread gets the fixups with
- * fixups_get() and then send the requests to the server.
- *
- * The queue is synchronized with a mutex and a condition variable.
- */
-
-struct fixups {
-	pthread_mutex_t lock;
-	pthread_cond_t cond;
-	STAILQ_HEAD(, fixup) fixupq;
-	struct fixup *cur;
-	size_t size;
-	int closed;
-};
-
-static void		 fixups_lock(struct fixups *);
-static void		 fixups_unlock(struct fixups *);
-
-static struct fixup	*fixup_new(struct coll *, const char *);
-static void		 fixup_free(struct fixup *);
-
-static void
-fixups_lock(struct fixups *f)
-{
-	int error;
-
-	error = pthread_mutex_lock(&f->lock);
-	assert(!error);
-}
-
-static void
-fixups_unlock(struct fixups *f)
-{
-	int error;
-
-	error = pthread_mutex_unlock(&f->lock);
-	assert(!error);
-}
-
-static struct fixup *
-fixup_new(struct coll *coll, const char *name)
-{
-	struct fixup *fixup;
-
-	fixup = xmalloc(sizeof(struct fixup));
-	fixup->f_name = xstrdup(name);
-	fixup->f_coll = coll;
-	return (fixup);
-}
-
-static void
-fixup_free(struct fixup *fixup)
-{
-
-	free(fixup->f_name);
-	free(fixup);
-}
-
-/* Create a new fixup queue. */
-struct fixups *
-fixups_new(void)
-{
-	struct fixups *f;
-
-	f = xmalloc(sizeof(struct fixups));
-	f->size = 0;
-	f->closed = 0;
-	f->cur = NULL;
-	STAILQ_INIT(&f->fixupq);
-	pthread_mutex_init(&f->lock, NULL);
-	pthread_cond_init(&f->cond, NULL);
-	return (f);
-}
-
-/* Add a fixup request to the queue. */
-void
-fixups_put(struct fixups *f, struct coll *coll, const char *name)
-{
-	struct fixup *fixup;
-	int dosignal;
-
-	dosignal = 0;
-	fixup = fixup_new(coll, name);
-	fixups_lock(f);
-	assert(!f->closed);
-	STAILQ_INSERT_TAIL(&f->fixupq, fixup, f_link);
-	if (f->size++ == 0)
-		dosignal = 1;
-	fixups_unlock(f);
-	if (dosignal)
-		pthread_cond_signal(&f->cond);
-}
-
-/* Get a fixup request from the queue. */
-struct fixup *
-fixups_get(struct fixups *f)
-{
-	struct fixup *fixup, *tofree;
-
-	fixups_lock(f);
-	while (f->size == 0 && !f->closed)
-		pthread_cond_wait(&f->cond, &f->lock);
-	if (f->closed && f->size == 0) {
-		fixups_unlock(f);
-		return (NULL);
-	}
-	assert(f->size > 0);
-	fixup = STAILQ_FIRST(&f->fixupq);
-	tofree = f->cur;
-	f->cur = fixup;
-	STAILQ_REMOVE_HEAD(&f->fixupq, f_link);
-	f->size--;
-	fixups_unlock(f);
-	if (tofree != NULL)
-		fixup_free(tofree);
-	return (fixup);
-}
-
-/* Close the writing end of the queue. */
-void
-fixups_close(struct fixups *f)
-{
-	int dosignal;
-
-	dosignal = 0;
-	fixups_lock(f);
-	if (f->size == 0 && !f->closed)
-		dosignal = 1;
-	f->closed = 1;
-	fixups_unlock(f);
-	if (dosignal)
-		pthread_cond_signal(&f->cond);
-}
-
-/* Free a fixups queue. */
-void
-fixups_free(struct fixups *f)
-{
-	struct fixup *fixup, *fixup2;
-
-	assert(f->closed);
-	/*
-	 * Free any fixup that has been left on the queue.
-	 * This can happen if we have been aborted prematurely.
-	 */
-	fixup = STAILQ_FIRST(&f->fixupq);
-	while (fixup != NULL) {
-		fixup2 = STAILQ_NEXT(fixup, f_link);
-		fixup_free(fixup);
-		fixup = fixup2;
-	}
-	if (f->cur != NULL)
-		fixup_free(f->cur);
-	pthread_cond_destroy(&f->cond);
-	pthread_mutex_destroy(&f->lock);
-	free(f);
-}
diff --git a/usr.bin/csup/fnmatch.c b/usr.bin/csup/fnmatch.c
deleted file mode 100644
index 16e4e215bdad..000000000000
--- a/usr.bin/csup/fnmatch.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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.
- *
- * $FreeBSD$
- *
- * From FreeBSD fnmatch.c 1.11
- * $Id: fnmatch.c,v 1.3 1997/08/19 02:34:30 jdp Exp $
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
- * Compares a filename or pathname to a pattern.
- */
-
-#include <ctype.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "fnmatch.h"
-
-#define	EOS	'\0'
-
-static const char *rangematch(const char *, char, int);
-
-int
-fnmatch(const char *pattern, const char *string, int flags)
-{
-	const char *stringstart;
-	char c, test;
-
-	for (stringstart = string;;)
-		switch (c = *pattern++) {
-		case EOS:
-			if ((flags & FNM_LEADING_DIR) && *string == '/')
-				return (0);
-			return (*string == EOS ? 0 : FNM_NOMATCH);
-		case '?':
-			if (*string == EOS)
-				return (FNM_NOMATCH);
-			if (*string == '/' && (flags & FNM_PATHNAME))
-				return (FNM_NOMATCH);
-			if (*string == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-			++string;
-			break;
-		case '*':
-			c = *pattern;
-			/* Collapse multiple stars. */
-			while (c == '*')
-				c = *++pattern;
-
-			if (*string == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-
-			/* Optimize for pattern with * at end or before /. */
-			if (c == EOS)
-				if (flags & FNM_PATHNAME)
-					return ((flags & FNM_LEADING_DIR) ||
-					    strchr(string, '/') == NULL ?
-					    0 : FNM_NOMATCH);
-				else
-					return (0);
-			else if (c == '/' && flags & FNM_PATHNAME) {
-				if ((string = strchr(string, '/')) == NULL)
-					return (FNM_NOMATCH);
-				break;
-			}
-
-			/* General case, use recursion. */
-			while ((test = *string) != EOS) {
-				if (!fnmatch(pattern, string, flags & ~FNM_PERIOD))
-					return (0);
-				if (test == '/' && flags & FNM_PATHNAME)
-					break;
-				++string;
-			}
-			return (FNM_NOMATCH);
-		case '[':
-			if (*string == EOS)
-				return (FNM_NOMATCH);
-			if (*string == '/' && flags & FNM_PATHNAME)
-				return (FNM_NOMATCH);
-			if ((pattern =
-			    rangematch(pattern, *string, flags)) == NULL)
-				return (FNM_NOMATCH);
-			++string;
-			break;
-		case '\\':
-			if (!(flags & FNM_NOESCAPE)) {
-				if ((c = *pattern++) == EOS) {
-					c = '\\';
-					--pattern;
-				}
-			}
-			/* FALLTHROUGH */
-		default:
-			if (c == *string)
-				;
-			else if ((flags & FNM_CASEFOLD) &&
-				 (tolower((unsigned char)c) ==
-				  tolower((unsigned char)*string)))
-				;
-			else if ((flags & FNM_PREFIX_DIRS) && *string == EOS &&
-			     ((c == '/' && string != stringstart) ||
-			     (string == stringstart+1 && *stringstart == '/')))
-				return (0);
-			else
-				return (FNM_NOMATCH);
-			string++;
-			break;
-		}
-	/* NOTREACHED */
-}
-
-static const char *
-rangematch(const char *pattern, char test, int flags)
-{
-	int negate, ok;
-	char c, c2;
-
-	/*
-	 * A bracket expression starting with an unquoted circumflex
-	 * character produces unspecified results (IEEE 1003.2-1992,
-	 * 3.13.2).  This implementation treats it like '!', for
-	 * consistency with the regular expression syntax.
-	 * J.T. Conklin (conklin@ngai.kaleida.com)
-	 */
-	if ( (negate = (*pattern == '!' || *pattern == '^')) )
-		++pattern;
-
-	if (flags & FNM_CASEFOLD)
-		test = tolower((unsigned char)test);
-
-	for (ok = 0; (c = *pattern++) != ']';) {
-		if (c == '\\' && !(flags & FNM_NOESCAPE))
-			c = *pattern++;
-		if (c == EOS)
-			return (NULL);
-
-		if (flags & FNM_CASEFOLD)
-			c = tolower((unsigned char)c);
-
-		if (*pattern == '-'
-		    && (c2 = *(pattern+1)) != EOS && c2 != ']') {
-			pattern += 2;
-			if (c2 == '\\' && !(flags & FNM_NOESCAPE))
-				c2 = *pattern++;
-			if (c2 == EOS)
-				return (NULL);
-
-			if (flags & FNM_CASEFOLD)
-				c2 = tolower((unsigned char)c2);
-
-			if ((unsigned char)c <= (unsigned char)test &&
-			    (unsigned char)test <= (unsigned char)c2)
-				ok = 1;
-		} else if (c == test)
-			ok = 1;
-	}
-	return (ok == negate ? NULL : pattern);
-}
diff --git a/usr.bin/csup/fnmatch.h b/usr.bin/csup/fnmatch.h
deleted file mode 100644
index 6c51e7e4cc57..000000000000
--- a/usr.bin/csup/fnmatch.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- *
- * $FreeBSD$
- *
- *	@(#)fnmatch.h	8.1 (Berkeley) 6/2/93
- *
- * From FreeBSD fnmatch.h 1.7
- * $Id: fnmatch.h,v 1.4 2001/10/04 02:46:21 jdp Exp $
- */
-
-#ifndef	_FNMATCH_H_
-#define	_FNMATCH_H_
-
-#define	FNM_NOMATCH	1	/* Match failed. */
-
-#define	FNM_NOESCAPE	0x01	/* Disable backslash escaping. */
-#define	FNM_PATHNAME	0x02	/* Slash must be matched by slash. */
-#define	FNM_PERIOD	0x04	/* Period must be matched by period. */
-#define	FNM_LEADING_DIR	0x08	/* Ignore /<tail> after Imatch. */
-#define	FNM_CASEFOLD	0x10	/* Case insensitive search. */
-#define FNM_PREFIX_DIRS	0x20	/* Directory prefixes of pattern match too. */
-
-/* Make this compile successfully with "gcc -traditional" */
-#ifndef __STDC__
-#define const	/* empty */
-#endif
-
-int	 fnmatch(const char *, const char *, int);
-
-#endif /* !_FNMATCH_H_ */
diff --git a/usr.bin/csup/globtree.c b/usr.bin/csup/globtree.c
deleted file mode 100644
index 74ac2c162ab1..000000000000
--- a/usr.bin/csup/globtree.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/*-
- * Copyright (c) 2006, Maxime Henrion <mux@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/types.h>
-
-#include <assert.h>
-#include <regex.h>
-#include <stdlib.h>
-
-#include "fnmatch.h"
-#include "globtree.h"
-#include "misc.h"
-
-/*
- * The "GlobTree" interface allows one to construct arbitrarily complex
- * boolean expressions for evaluating whether to accept or reject a
- * filename.  The globtree_test() function returns true or false
- * according to whether the name is accepted or rejected by the
- * expression.
- *
- * Expressions are trees constructed from nodes representing either
- * primitive matching operations (primaries) or operators that are
- * applied to their subexpressions.  The simplest primitives are
- * globtree_false(), which matches nothing, and globtree_true(), which
- * matches everything.
- *
- * A more useful primitive is the matching operation, constructed with
- * globtree_match().  It will call fnmatch() with the suppliedi
- * shell-style pattern to determine if the filename matches.
- *
- * Expressions can be combined with the boolean operators AND, OR, and
- * NOT, to form more complex expressions.
- */
-
-/* Node types. */
-#define	GLOBTREE_NOT		0
-#define	GLOBTREE_AND		1
-#define	GLOBTREE_OR		2
-#define	GLOBTREE_MATCH		3
-#define	GLOBTREE_REGEX		4
-#define	GLOBTREE_TRUE		5
-#define	GLOBTREE_FALSE		6
-
-/* A node. */
-struct globtree {
-	int type;
-	struct globtree *left;
-	struct globtree *right;
-
-	/* The "data" field points to the text pattern for GLOBTREE_MATCH
-	   nodes, and to the regex_t for GLOBTREE_REGEX nodes. For any
-	   other node, it is set to NULL. */
-	void *data;
-	/* The "flags" field contains the flags to pass to fnmatch() for
-	   GLOBTREE_MATCH nodes. */
-	int flags;
-};
-
-static struct globtree	*globtree_new(int);
-static int		 globtree_eval(struct globtree *, const char *);
-
-static struct globtree *
-globtree_new(int type)
-{
-	struct globtree *gt;
-
-	gt = xmalloc(sizeof(struct globtree));
-	gt->type = type;
-	gt->data = NULL;
-	gt->flags = 0;
-	gt->left = NULL;
-	gt->right = NULL;
-	return (gt);
-}
-
-struct globtree *
-globtree_true(void)
-{
-	struct globtree *gt;
-
-	gt = globtree_new(GLOBTREE_TRUE);
-	return (gt);
-}
-
-struct globtree *
-globtree_false(void)
-{
-	struct globtree *gt;
-
-	gt = globtree_new(GLOBTREE_FALSE);
-	return (gt);
-}
-
-struct globtree *
-globtree_match(const char *pattern, int flags)
-{
-	struct globtree *gt;
-
-	gt = globtree_new(GLOBTREE_MATCH);
-	gt->data = xstrdup(pattern);
-	gt->flags = flags;
-	return (gt);
-}
-
-struct globtree *
-globtree_regex(const char *pattern)
-{
-	struct globtree *gt;
-	int error;
-
-	gt = globtree_new(GLOBTREE_REGEX);
-	gt->data = xmalloc(sizeof(regex_t));
-	error = regcomp(gt->data, pattern, REG_NOSUB);
-	assert(!error);
-	return (gt);
-}
-
-struct globtree *
-globtree_and(struct globtree *left, struct globtree *right)
-{
-	struct globtree *gt;
-
-	if (left->type == GLOBTREE_FALSE || right->type == GLOBTREE_FALSE) {
-		globtree_free(left);
-		globtree_free(right);
-		gt = globtree_false();
-		return (gt);
-	}
-	if (left->type == GLOBTREE_TRUE) {
-		globtree_free(left);
-		return (right);
-	}
-	if (right->type == GLOBTREE_TRUE) {
-		globtree_free(right);
-		return (left);
-	}
-	gt = globtree_new(GLOBTREE_AND);
-	gt->left = left;
-	gt->right = right;
-	return (gt);
-}
-
-struct globtree *
-globtree_or(struct globtree *left, struct globtree *right)
-{
-	struct globtree *gt;
-
-	if (left->type == GLOBTREE_TRUE || right->type == GLOBTREE_TRUE) {
-		globtree_free(left);
-		globtree_free(right);
-		gt = globtree_true();
-		return (gt);
-	}
-	if (left->type == GLOBTREE_FALSE) {
-		globtree_free(left);
-		return (right);
-	}
-	if (right->type == GLOBTREE_FALSE) {
-		globtree_free(right);
-		return (left);
-	}
-	gt = globtree_new(GLOBTREE_OR);
-	gt->left = left;
-	gt->right = right;
-	return (gt);
-}
-
-struct globtree *
-globtree_not(struct globtree *child)
-{
-	struct globtree *gt;
-
-	if (child->type == GLOBTREE_TRUE) {
-		globtree_free(child);
-		gt = globtree_new(GLOBTREE_FALSE);
-		return (gt);
-	}
-	if (child->type == GLOBTREE_FALSE) {
-		globtree_free(child);
-		gt = globtree_new(GLOBTREE_TRUE);
-		return (gt);
-	}
-	gt = globtree_new(GLOBTREE_NOT);
-	gt->left = child;
-	return (gt);
-}
-
-/* Evaluate one node (must be a leaf node). */
-static int
-globtree_eval(struct globtree *gt, const char *path)
-{
-	int rv;
-
-	switch (gt->type) {
-	case GLOBTREE_TRUE:
-		return (1);
-	case GLOBTREE_FALSE:
-		return (0);
-	case GLOBTREE_MATCH:
-		assert(gt->data != NULL);
-		rv = fnmatch(gt->data, path, gt->flags);
-		if (rv == 0)
-			return (1);
-		assert(rv == FNM_NOMATCH);
-		return (0);
-	case GLOBTREE_REGEX:
-		assert(gt->data != NULL);
-		rv = regexec(gt->data, path, 0, NULL, 0);
-		if (rv == 0)
-			return (1);
-		assert(rv == REG_NOMATCH);
-		return (0);
-	}
-
-	assert(0);
-	return (-1);
-}
-
-/* Small stack API to walk the tree iteratively. */
-typedef enum {
-	STATE_DOINGLEFT,
-	STATE_DOINGRIGHT
-} walkstate_t;
-
-struct stack {
-	struct stackelem *stack;
-	size_t size;
-	size_t in;
-};
-
-struct stackelem {
-	struct globtree *node;
-	walkstate_t state;
-};
-
-static void
-stack_init(struct stack *stack)
-{
-
-	stack->in = 0;
-	stack->size = 8;	/* Initial size. */
-	stack->stack = xmalloc(sizeof(struct stackelem) * stack->size);
-}
-
-static size_t
-stack_size(struct stack *stack)
-{
-
-	return (stack->in);
-}
-
-static void
-stack_push(struct stack *stack, struct globtree *node, walkstate_t state)
-{
-	struct stackelem *e;
-
-	if (stack->in == stack->size) {
-		stack->size *= 2;
-		stack->stack = xrealloc(stack->stack,
-		    sizeof(struct stackelem) * stack->size);
-	}
-	e = stack->stack + stack->in++;
-	e->node = node;
-	e->state = state;
-}
-
-static void
-stack_pop(struct stack *stack, struct globtree **node, walkstate_t *state)
-{
-	struct stackelem *e;
-
-	assert(stack->in > 0);
-	e = stack->stack + --stack->in;
-	*node = e->node;
-	*state = e->state;
-}
-
-static void
-stack_free(struct stack *s)
-{
-
-	free(s->stack);
-}
-
-/* Tests if the supplied filename matches. */
-int
-globtree_test(struct globtree *gt, const char *path)
-{
-	struct stack stack;
-	walkstate_t state;
-	int val;
-
-	stack_init(&stack);
-	for (;;) {
-doleft:
-		/* Descend to the left until we hit bottom. */
-		while (gt->left != NULL) {
-			stack_push(&stack, gt, STATE_DOINGLEFT);
-			gt = gt->left;
-		}
-
-		/* Now we're at a leaf node.  Evaluate it. */
-		val = globtree_eval(gt, path);
-		/* Ascend, propagating the value through operator nodes. */
-		for (;;) {
-			if (stack_size(&stack) == 0) {
-				stack_free(&stack);
-				return (val);
-			}
-			stack_pop(&stack, &gt, &state);
-			switch (gt->type) {
-			case GLOBTREE_NOT:
-				val = !val;
-				break;
-			case GLOBTREE_AND:
-				/* If we haven't yet evaluated the right subtree
-				   and the partial result is true, descend to
-				   the right.  Otherwise the result is already
-				   determined to be val. */
-				if (state == STATE_DOINGLEFT && val) {
-					stack_push(&stack, gt,
-					    STATE_DOINGRIGHT);
-					gt = gt->right;
-					goto doleft;
-				}
-				break;
-			case GLOBTREE_OR:
-				/* If we haven't yet evaluated the right subtree
-				   and the partial result is false, descend to
-				   the right.  Otherwise the result is already
-				   determined to be val. */
-				if (state == STATE_DOINGLEFT && !val) {
-					stack_push(&stack, gt,
-					    STATE_DOINGRIGHT);
-					gt = gt->right;
-					goto doleft;
-				}
-				break;
-			default:
-				/* We only push nodes that have children. */
-				assert(0);
-				return (-1);
-			}
-		}
-	}
-}
-
-/*
- * We could de-recursify this function using a stack, but it would be
- * overkill since it is never called from a thread context with a
- * limited stack size nor used in a critical path, so I think we can
- * afford keeping it recursive.
- */
-void
-globtree_free(struct globtree *gt)
-{
-
-	if (gt->data != NULL) {
-		if (gt->type == GLOBTREE_REGEX)
-			regfree(gt->data);
-		free(gt->data);
-	}
-	if (gt->left != NULL)
-		globtree_free(gt->left);
-	if (gt->right != NULL)
-		globtree_free(gt->right);
-	free(gt);
-}
diff --git a/usr.bin/csup/globtree.h b/usr.bin/csup/globtree.h
deleted file mode 100644
index 43882e3a8f9a..000000000000
--- a/usr.bin/csup/globtree.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2006, Maxime Henrion <mux@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 _GLOBTREE_H_
-#define	_GLOBTREE_H_
-
-#include "fnmatch.h"
-
-struct globtree;
-
-struct globtree	*globtree_true(void);
-struct globtree	*globtree_false(void);
-struct globtree	*globtree_match(const char *, int);
-struct globtree	*globtree_regex(const char *);
-struct globtree	*globtree_and(struct globtree *, struct globtree *);
-struct globtree	*globtree_or(struct globtree *, struct globtree *);
-struct globtree	*globtree_not(struct globtree *);
-int		 globtree_test(struct globtree *, const char *);
-void		 globtree_free(struct globtree *);
-
-#endif /* !_GLOBTREE_H_ */
diff --git a/usr.bin/csup/idcache.c b/usr.bin/csup/idcache.c
deleted file mode 100644
index 47a3e712c147..000000000000
--- a/usr.bin/csup/idcache.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/*-
- * Copyright (c) 2006, Maxime Henrion <mux@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/types.h>
-
-#include <assert.h>
-#include <grp.h>
-#include <pthread.h>
-#include <pwd.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "idcache.h"
-#include "misc.h"
-
-/*
- * Constants and data structures used to implement the thread-safe
- * group and password file caches.  Cache sizes must be prime.
- */
-#define	UIDTONAME_SZ		317	/* Size of uid -> user name cache */
-#define	NAMETOUID_SZ		317	/* Size of user name -> uid cache */
-#define	GIDTONAME_SZ		317	/* Size of gid -> group name cache */
-#define	NAMETOGID_SZ		317	/* Size of group name -> gid cache */
-
-/* Node structures used to cache lookups. */
-struct uidc {
-	char *name;		/* user name */
-	uid_t uid;		/* cached uid */
-	int valid;		/* is this a valid or a miss entry */
-	struct uidc *next;	/* for collisions */
-};
-
-struct gidc {
-	char *name;		/* group name */
-	gid_t gid;		/* cached gid */
-	int valid;		/* is this a valid or a miss entry */
-	struct gidc *next;	/* for collisions */
-};
-
-static struct uidc **uidtoname;	/* uid to user name cache */
-static struct gidc **gidtoname;	/* gid to group name cache */
-static struct uidc **nametouid;	/* user name to uid cache */
-static struct gidc **nametogid;	/* group name to gid cache */
-
-static pthread_mutex_t uid_mtx;
-static pthread_mutex_t gid_mtx;
-
-static void		uid_lock(void);
-static void		uid_unlock(void);
-static void		gid_lock(void);
-static void		gid_unlock(void);
-
-static uint32_t		hash(const char *);
-
-/* A 32-bit version of Peter Weinberger's (PJW) hash algorithm,
-    as used by ELF for hashing function names. */
-static uint32_t
-hash(const char *name)
-{
-	uint32_t g, h;
-
-	h = 0;
-	while(*name != '\0') {
-		h = (h << 4) + *name++;
-		if ((g = h & 0xF0000000)) {
-			h ^= g >> 24;
-			h &= 0x0FFFFFFF;
-		}
-	}
-	return (h);
-}
-
-static void
-uid_lock(void)
-{
-	int error;
-
-	error = pthread_mutex_lock(&uid_mtx);
-	assert(!error);
-}
-
-static void
-uid_unlock(void)
-{
-	int error;
-
-	error = pthread_mutex_unlock(&uid_mtx);
-	assert(!error);
-}
-
-static void
-gid_lock(void)
-{
-	int error;
-
-	error = pthread_mutex_lock(&gid_mtx);
-	assert(!error);
-}
-
-static void
-gid_unlock(void)
-{
-	int error;
-
-	error = pthread_mutex_unlock(&gid_mtx);
-	assert(!error);
-}
-
-static void
-uidc_insert(struct uidc **tbl, struct uidc *uidc, uint32_t key)
-{
-
-	uidc->next = tbl[key];
-	tbl[key] = uidc;
-}
-
-static void
-gidc_insert(struct gidc **tbl, struct gidc *gidc, uint32_t key)
-{
-
-	gidc->next = tbl[key];
-	tbl[key] = gidc;
-}
-
-/* Return the user name for this uid, or NULL if it's not found. */
-char *
-getuserbyid(uid_t uid)
-{
-	struct passwd *pw;
-	struct uidc *uidc, *uidc2;
-	uint32_t key, key2;
-
-	key = uid % UIDTONAME_SZ;
-	uid_lock();
-	uidc = uidtoname[key];
-	while (uidc != NULL) {
-		if (uidc->uid == uid)
-			break;
-		uidc = uidc->next;
-	}
-
-	if (uidc == NULL) {
-		/* We didn't find this uid, look it up and add it. */
-		uidc = xmalloc(sizeof(struct uidc));
-		uidc->uid = uid;
-		pw = getpwuid(uid);
-		if (pw != NULL) {
-			/* This uid is in the password file. */
-			uidc->name = xstrdup(pw->pw_name);
-			uidc->valid = 1;
-			/* Also add it to the name -> gid table. */
-			uidc2 = xmalloc(sizeof(struct uidc));
-			uidc2->uid = uid;
-			uidc2->name = uidc->name; /* We reuse the pointer. */
-			uidc2->valid = 1;
-			key2 = hash(uidc->name) % NAMETOUID_SZ;
-			uidc_insert(nametouid, uidc2, key2);
-		} else {
-			/* Add a miss entry for this uid. */
-			uidc->name = NULL;
-			uidc->valid = 0;
-		}
-		uidc_insert(uidtoname, uidc, key);
-	}
-	/* It is safe to unlock here since the cache structure
-	   is not going to get freed or changed. */
-	uid_unlock();
-	return (uidc->name);
-}
-
-/* Return the group name for this gid, or NULL if it's not found. */
-char *
-getgroupbyid(gid_t gid)
-{
-	struct group *gr;
-	struct gidc *gidc, *gidc2;
-	uint32_t key, key2;
-
-	key = gid % GIDTONAME_SZ;
-	gid_lock();
-	gidc = gidtoname[key];
-	while (gidc != NULL) {
-		if (gidc->gid == gid)
-			break;
-		gidc = gidc->next;
-	}
-
-	if (gidc == NULL) {
-		/* We didn't find this gid, look it up and add it. */
-		gidc = xmalloc(sizeof(struct gidc));
-		gidc->gid = gid;
-		gr = getgrgid(gid);
-		if (gr != NULL) {
-			/* This gid is in the group file. */
-			gidc->name = xstrdup(gr->gr_name);
-			gidc->valid = 1;
-			/* Also add it to the name -> gid table. */
-			gidc2 = xmalloc(sizeof(struct gidc));
-			gidc2->gid = gid;
-			gidc2->name = gidc->name; /* We reuse the pointer. */
-			gidc2->valid = 1;
-			key2 = hash(gidc->name) % NAMETOGID_SZ;
-			gidc_insert(nametogid, gidc2, key2);
-		} else {
-			/* Add a miss entry for this gid. */
-			gidc->name = NULL;
-			gidc->valid = 0;
-		}
-		gidc_insert(gidtoname, gidc, key);
-	}
-	/* It is safe to unlock here since the cache structure
-	   is not going to get freed or changed. */
-	gid_unlock();
-	return (gidc->name);
-}
-
-/* Finds the uid for this user name.  If it's found, the gid is stored
-   in *uid and 0 is returned.  Otherwise, -1 is returned. */
-int
-getuidbyname(const char *name, uid_t *uid)
-{
-	struct passwd *pw;
-	struct uidc *uidc, *uidc2;
-	uint32_t key, key2;
-
-	uid_lock();
-	key = hash(name) % NAMETOUID_SZ;
-	uidc = nametouid[key];
-	while (uidc != NULL) {
-		if (strcmp(uidc->name, name) == 0)
-			break;
-		uidc = uidc->next;
-	}
-
-	if (uidc == NULL) {
-		uidc = xmalloc(sizeof(struct uidc));
-		uidc->name = xstrdup(name);
-		pw = getpwnam(name);
-		if (pw != NULL) {
-			/* This user name is in the password file. */
-			uidc->valid = 1;
-			uidc->uid = pw->pw_uid;
-			/* Also add it to the uid -> name table. */
-			uidc2 = xmalloc(sizeof(struct uidc));
-			uidc2->name = uidc->name; /* We reuse the pointer. */
-			uidc2->uid = uidc->uid;
-			uidc2->valid = 1;
-			key2 = uidc2->uid % UIDTONAME_SZ;
-			uidc_insert(uidtoname, uidc2, key2);
-		} else {
-			/* Add a miss entry for this user name. */
-			uidc->valid = 0;
-			uidc->uid = (uid_t)-1; /* Should not be accessed. */
-		}
-		uidc_insert(nametouid, uidc, key);
-	}
-	/* It is safe to unlock here since the cache structure
-	   is not going to get freed or changed. */
-	uid_unlock();
-	if (!uidc->valid)
-		return (-1);
-	*uid = uidc->uid;
-	return (0);
-}
-
-/* Finds the gid for this group name.  If it's found, the gid is stored
-   in *gid and 0 is returned.  Otherwise, -1 is returned. */
-int
-getgidbyname(const char *name, gid_t *gid)
-{
-	struct group *gr;
-	struct gidc *gidc, *gidc2;
-	uint32_t key, key2;
-
-	gid_lock();
-	key = hash(name) % NAMETOGID_SZ;
-	gidc = nametogid[key];
-	while (gidc != NULL) {
-		if (strcmp(gidc->name, name) == 0)
-			break;
-		gidc = gidc->next;
-	}
-
-	if (gidc == NULL) {
-		gidc = xmalloc(sizeof(struct gidc));
-		gidc->name = xstrdup(name);
-		gr = getgrnam(name);
-		if (gr != NULL) {
-			/* This group name is in the group file. */
-			gidc->gid = gr->gr_gid;
-			gidc->valid = 1;
-			/* Also add it to the gid -> name table. */
-			gidc2 = xmalloc(sizeof(struct gidc));
-			gidc2->name = gidc->name; /* We reuse the pointer. */
-			gidc2->gid = gidc->gid;
-			gidc2->valid = 1;
-			key2 = gidc2->gid % GIDTONAME_SZ;
-			gidc_insert(gidtoname, gidc2, key2);
-		} else {
-			/* Add a miss entry for this group name. */
-			gidc->gid = (gid_t)-1; /* Should not be accessed. */
-			gidc->valid = 0;
-		}
-		gidc_insert(nametogid, gidc, key);
-	}
-	/* It is safe to unlock here since the cache structure
-	   is not going to get freed or changed. */
-	gid_unlock();
-	if (!gidc->valid)
-		return (-1);
-	*gid = gidc->gid;
-	return (0);
-}
-
-/* Initialize the cache structures. */
-void
-idcache_init(void)
-{
-
-	pthread_mutex_init(&uid_mtx, NULL);
-	pthread_mutex_init(&gid_mtx, NULL);
-	uidtoname = xmalloc(UIDTONAME_SZ * sizeof(struct uidc *));
-	gidtoname = xmalloc(GIDTONAME_SZ * sizeof(struct gidc *));
-	nametouid = xmalloc(NAMETOUID_SZ * sizeof(struct uidc *));
-	nametogid = xmalloc(NAMETOGID_SZ * sizeof(struct gidc *));
-	memset(uidtoname, 0, UIDTONAME_SZ * sizeof(struct uidc *));
-	memset(gidtoname, 0, GIDTONAME_SZ * sizeof(struct gidc *));
-	memset(nametouid, 0, NAMETOUID_SZ * sizeof(struct uidc *));
-	memset(nametogid, 0, NAMETOGID_SZ * sizeof(struct gidc *));
-}
-
-/* Cleanup the cache structures. */
-void
-idcache_fini(void)
-{
-	struct uidc *uidc, *uidc2;
-	struct gidc *gidc, *gidc2;
-	size_t i;
-
-	for (i = 0; i < UIDTONAME_SZ; i++) {
-		uidc = uidtoname[i];
-		while (uidc != NULL) {
-			if (uidc->name != NULL) {
-				assert(uidc->valid);
-				free(uidc->name);
-			}
-			uidc2 = uidc->next;
-			free(uidc);
-			uidc = uidc2;
-		}
-	}
-	free(uidtoname);
-	for (i = 0; i < NAMETOUID_SZ; i++) {
-		uidc = nametouid[i];
-		while (uidc != NULL) {
-			assert(uidc->name != NULL);
-			/* If it's a valid entry, it has been added to both the
-			   uidtoname and nametouid tables, and the name pointer
-			   has been reused for both entries.  Thus, the name
-			   pointer has already been freed in the loop above. */
-			if (!uidc->valid)
-				free(uidc->name);
-			uidc2 = uidc->next;
-			free(uidc);
-			uidc = uidc2;
-		}
-	}
-	free(nametouid);
-	for (i = 0; i < GIDTONAME_SZ; i++) {
-		gidc = gidtoname[i];
-		while (gidc != NULL) {
-			if (gidc->name != NULL) {
-				assert(gidc->valid);
-				free(gidc->name);
-			}
-			gidc2 = gidc->next;
-			free(gidc);
-			gidc = gidc2;
-		}
-	}
-	free(gidtoname);
-	for (i = 0; i < NAMETOGID_SZ; i++) {
-		gidc = nametogid[i];
-		while (gidc != NULL) {
-			assert(gidc->name != NULL);
-			/* See above comment. */
-			if (!gidc->valid)
-				free(gidc->name);
-			gidc2 = gidc->next;
-			free(gidc);
-			gidc = gidc2;
-		}
-	}
-	free(nametogid);
-	pthread_mutex_destroy(&uid_mtx);
-	pthread_mutex_destroy(&gid_mtx);
-}
diff --git a/usr.bin/csup/idcache.h b/usr.bin/csup/idcache.h
deleted file mode 100644
index 558af0ce115f..000000000000
--- a/usr.bin/csup/idcache.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2006, Maxime Henrion <mux@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 _IDCACHE_H_
-#define _IDCACHE_H_
-
-#include <sys/types.h>
-
-void	 idcache_init(void);
-void	 idcache_fini(void);
-
-char	*getuserbyid(uid_t);
-char	*getgroupbyid(gid_t);
-int	 getuidbyname(const char *, uid_t *);
-int	 getgidbyname(const char *, gid_t *);
-
-#endif /* !_IDCACHE_H_ */
diff --git a/usr.bin/csup/keyword.c b/usr.bin/csup/keyword.c
deleted file mode 100644
index 8e03c8d3e373..000000000000
--- a/usr.bin/csup/keyword.c
+++ /dev/null
@@ -1,526 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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/queue.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "diff.h"
-#include "keyword.h"
-#include "misc.h"
-#include "stream.h"
-
-/*
- * The keyword API is used to expand the CVS/RCS keywords in files,
- * such as $Id$, $Revision$, etc.  The server does it for us when it
- * sends us entire files, but we need to handle the expansion when
- * applying a diff update.
- */
-
-enum rcskey {
-	RCSKEY_AUTHOR,
-	RCSKEY_CVSHEADER,
-	RCSKEY_DATE,
-	RCSKEY_HEADER,
-	RCSKEY_ID,
-	RCSKEY_LOCKER,
-	RCSKEY_LOG,
-	RCSKEY_NAME,
-	RCSKEY_RCSFILE,
-	RCSKEY_REVISION,
-	RCSKEY_SOURCE,
-	RCSKEY_STATE
-};
-
-typedef enum rcskey rcskey_t;
-
-struct tag {
-	char *ident;
-	rcskey_t key;
-	int enabled;
-	STAILQ_ENTRY(tag) next;
-};
-
-static struct tag	*tag_new(const char *, rcskey_t);
-static char		*tag_expand(struct tag *, struct diffinfo *);
-static void		 tag_free(struct tag *);
-
-struct keyword {
-	STAILQ_HEAD(, tag) keywords;		/* Enabled keywords. */
-	size_t minkeylen;
-	size_t maxkeylen;
-};
-
-/* Default CVS keywords. */
-static struct {
-	const char *ident;
-	rcskey_t key;
-} tag_defaults[] = {
-	{ "Author",	RCSKEY_AUTHOR },
-	{ "CVSHeader",	RCSKEY_CVSHEADER },
-	{ "Date",	RCSKEY_DATE },
-	{ "Header",	RCSKEY_HEADER },
-	{ "Id",		RCSKEY_ID },
-	{ "Locker",	RCSKEY_LOCKER },
-	{ "Log",	RCSKEY_LOG },
-	{ "Name",	RCSKEY_NAME },
-	{ "RCSfile",	RCSKEY_RCSFILE },
-	{ "Revision",	RCSKEY_REVISION },
-	{ "Source",	RCSKEY_SOURCE },
-	{ "State",	RCSKEY_STATE },
-	{ NULL,		0, }
-};
-
-struct keyword *
-keyword_new(void)
-{
-	struct keyword *new;
-	struct tag *tag;
-	size_t len;
-	int i;
-
-	new = xmalloc(sizeof(struct keyword));
-	STAILQ_INIT(&new->keywords);
-	new->minkeylen = ~0;
-	new->maxkeylen = 0;
-	for (i = 0; tag_defaults[i].ident != NULL; i++) {
-		tag = tag_new(tag_defaults[i].ident, tag_defaults[i].key);
-		STAILQ_INSERT_TAIL(&new->keywords, tag, next);
-		len = strlen(tag->ident);
-		/*
-		 * These values are only computed here and not updated when
-		 * adding an alias.  This is a bug, but CVSup has it and we
-		 * need to be bug-to-bug compatible since the server will
-		 * expect us to do the same, and we will fail with an MD5
-		 * checksum mismatch if we don't.
-		 */
-		new->minkeylen = min(new->minkeylen, len);
-		new->maxkeylen = max(new->maxkeylen, len);
-	}
-	return (new);
-}
-
-int
-keyword_decode_expand(const char *expand)
-{
-
-	if (strcmp(expand, ".") == 0)
-		return (EXPAND_DEFAULT);
-	else if (strcmp(expand, "kv") == 0)
-		return (EXPAND_KEYVALUE);
-	else if (strcmp(expand, "kvl") == 0)
-		return (EXPAND_KEYVALUELOCKER);
-	else if (strcmp(expand, "k") == 0)
-		return (EXPAND_KEY);
-	else if (strcmp(expand, "o") == 0)
-		return (EXPAND_OLD);
-	else if (strcmp(expand, "b") == 0)
-		return (EXPAND_BINARY);
-	else if (strcmp(expand, "v") == 0)
-		return (EXPAND_VALUE);
-	else
-		return (-1);
-}
-
-const char *
-keyword_encode_expand(int expand)
-{
-
-	switch (expand) {
-		case EXPAND_DEFAULT:
-			return (".");
-		case EXPAND_KEYVALUE:
-			return ("kv");
-		case EXPAND_KEYVALUELOCKER:
-			return ("kvl");
-		case EXPAND_KEY:
-			return ("k");
-		case EXPAND_OLD:
-			return ("o");
-		case EXPAND_BINARY:
-			return ("b");
-		case EXPAND_VALUE:
-			return ("v");
-	}
-	return (NULL);
-}
-
-void
-keyword_free(struct keyword *keyword)
-{
-	struct tag *tag;
-
-	if (keyword == NULL)
-		return;
-	while (!STAILQ_EMPTY(&keyword->keywords)) {
-		tag = STAILQ_FIRST(&keyword->keywords);
-		STAILQ_REMOVE_HEAD(&keyword->keywords, next);
-		tag_free(tag);
-	}
-	free(keyword);
-}
-
-int
-keyword_alias(struct keyword *keyword, const char *ident, const char *rcskey)
-{
-	struct tag *new, *tag;
-
-	STAILQ_FOREACH(tag, &keyword->keywords, next) {
-		if (strcmp(tag->ident, rcskey) == 0) {
-			new = tag_new(ident, tag->key);
-			STAILQ_INSERT_HEAD(&keyword->keywords, new, next);
-			return (0);
-		}
-	}
-	errno = ENOENT;
-	return (-1);
-}
-
-int
-keyword_enable(struct keyword *keyword, const char *ident)
-{
-	struct tag *tag;
-	int all;
-
-	all = 0;
-	if (strcmp(ident, ".") == 0)
-		all = 1;
-
-	STAILQ_FOREACH(tag, &keyword->keywords, next) {
-		if (!all && strcmp(tag->ident, ident) != 0)
-			continue;
-		tag->enabled = 1;
-		if (!all)
-			return (0);
-	}
-	if (!all) {
-		errno = ENOENT;
-		return (-1);
-	}
-	return (0);
-}
-
-int
-keyword_disable(struct keyword *keyword, const char *ident)
-{
-	struct tag *tag;
-	int all;
-
-	all = 0;
-	if (strcmp(ident, ".") == 0)
-		all = 1;
-
-	STAILQ_FOREACH(tag, &keyword->keywords, next) {
-		if (!all && strcmp(tag->ident, ident) != 0)
-			continue;
-		tag->enabled = 0;
-		if (!all)
-			return (0);
-	}
-
-	if (!all) {
-		errno = ENOENT;
-		return (-1);
-	}
-	return (0);
-}
-
-void
-keyword_prepare(struct keyword *keyword)
-{
-	struct tag *tag, *temp;
-
-	STAILQ_FOREACH_SAFE(tag, &keyword->keywords, next, temp) {
-		if (!tag->enabled) {
-			STAILQ_REMOVE(&keyword->keywords, tag, tag, next);
-			tag_free(tag);
-			continue;
-		}
-	}
-}
-
-/*
- * Expand appropriate RCS keywords.  If there's no tag to expand,
- * keyword_expand() returns 0, otherwise it returns 1 and writes a
- * pointer to the new line in *buf and the new len in *len.  The
- * new line is allocated with malloc() and needs to be freed by the
- * caller after use.
- */
-int
-keyword_expand(struct keyword *keyword, struct diffinfo *di, char *line,
-    size_t size, char **buf, size_t *len)
-{
-	struct tag *tag;
-	char *dollar, *keystart, *valstart, *vallim, *next;
-	char *linestart, *newline, *newval, *cp, *tmp;
-	size_t left, newsize, vallen;
-
-	if (di->di_expand == EXPAND_OLD || di->di_expand == EXPAND_BINARY)
-		return (0);
-	newline = NULL;
-	newsize = 0;
-	left = size;
-	linestart = cp = line;
-again:
-	dollar = memchr(cp, '$', left);
-	if (dollar == NULL) {
-		if (newline != NULL) {
-			*buf = newline;
-			*len = newsize;
-			return (1);
-		}
-		return (0);
-	}
-	keystart = dollar + 1;
-	left -= keystart - cp;
-	vallim = memchr(keystart, '$', left);
-	if (vallim == NULL) {
-		if (newline != NULL) {
-			*buf = newline;
-			*len = newsize;
-			return (1);
-		}
-		return (0);
-	}
-	if (vallim == keystart) {
-		cp = keystart;
-		goto again;
-	}
-	valstart = memchr(keystart, ':', left);
-	if (valstart == keystart) {
-		cp = vallim;
-		left -= vallim - keystart;
-		goto again;
-	}
-	if (valstart == NULL || valstart > vallim)
-		valstart = vallim;
-
-	if (valstart < keystart + keyword->minkeylen ||
-	    valstart > keystart + keyword->maxkeylen) {
-		cp = vallim;
-		left -= vallim -keystart;
-		goto again;
-	}
-	STAILQ_FOREACH(tag, &keyword->keywords, next) {
-		if (strncmp(tag->ident, keystart, valstart - keystart) == 0 &&
-		    tag->ident[valstart - keystart] == '\0') {
-			if (newline != NULL)
-				tmp = newline;
-			else
-				tmp = NULL;
-			newval = NULL;
-			if (di->di_expand == EXPAND_KEY) {
-				newsize = dollar - linestart + 1 +
-				    valstart - keystart + 1 +
-				    size - (vallim + 1 - linestart);
-				newline = xmalloc(newsize);
-				cp = newline;
-				memcpy(cp, linestart, dollar - linestart);
-				cp += dollar - linestart;
-				*cp++ = '$';
-				memcpy(cp, keystart, valstart - keystart);
-				cp += valstart - keystart;
-				*cp++ = '$';
-				next = cp;
-				memcpy(cp, vallim + 1,
-				    size - (vallim + 1 - linestart));
-			} else if (di->di_expand == EXPAND_VALUE) {
-				newval = tag_expand(tag, di);
-				if (newval == NULL)
-					vallen = 0;
-				else
-					vallen = strlen(newval);
-				newsize = dollar - linestart +
-				    vallen +
-				    size - (vallim + 1 - linestart);
-				newline = xmalloc(newsize);
-				cp = newline;
-				memcpy(cp, linestart, dollar - linestart);
-				cp += dollar - linestart;
-				if (newval != NULL) {
-					memcpy(cp, newval, vallen);
-					cp += vallen;
-				}
-				next = cp;
-				memcpy(cp, vallim + 1,
-				    size - (vallim + 1 - linestart));
-			} else {
-				assert(di->di_expand == EXPAND_DEFAULT ||
-				    di->di_expand == EXPAND_KEYVALUE ||
-				    di->di_expand == EXPAND_KEYVALUELOCKER);
-				newval = tag_expand(tag, di);
-				if (newval == NULL)
-					vallen = 0;
-				else
-					vallen = strlen(newval);
-				newsize = dollar - linestart + 1 +
-				    valstart - keystart + 2 +
-				    vallen + 2 +
-				    size - (vallim + 1 - linestart);
-				newline = xmalloc(newsize);
-				cp = newline;
-				memcpy(cp, linestart, dollar - linestart);
-				cp += dollar - linestart;
-				*cp++ = '$';
-				memcpy(cp, keystart, valstart - keystart);
-				cp += valstart - keystart;
-				*cp++ = ':';
-				*cp++ = ' ';
-				if (newval != NULL) {
-					memcpy(cp, newval, vallen);
-					cp += vallen;
-				}
-				*cp++ = ' ';
-				*cp++ = '$';
-				next = cp;
-				memcpy(cp, vallim + 1,
-				    size - (vallim + 1 - linestart));
-			}
-			if (newval != NULL)
-				free(newval);
-			if (tmp != NULL)
-				free(tmp);
-			/*
-			 * Continue looking for tags in the rest of the line.
-			 */
-			cp = next;
-			size = newsize;
-			left = size - (cp - newline);
-			linestart = newline;
-			goto again;
-		}
-	}
-	cp = vallim;
-	left = size - (cp - linestart);
-	goto again;
-}
-
-static struct tag *
-tag_new(const char *ident, rcskey_t key)
-{
-	struct tag *new;
-
-	new = xmalloc(sizeof(struct tag));
-	new->ident = xstrdup(ident);
-	new->key = key;
-	new->enabled = 1;
-	return (new);
-}
-
-static void
-tag_free(struct tag *tag)
-{
-
-	free(tag->ident);
-	free(tag);
-}
-
-/*
- * Expand a specific tag and return the new value.  If NULL
- * is returned, the tag is empty.
- */
-static char *
-tag_expand(struct tag *tag, struct diffinfo *di)
-{
-	/*
-	 * CVS formats dates as "XXXX/XX/XX XX:XX:XX".  32 bytes
-	 * is big enough until year 10,000,000,000,000,000 :-).
-	 */
-	char cvsdate[32];
-	struct tm tm;
-	char *filename, *val;
-	int error;
-
-	error = rcsdatetotm(di->di_revdate, &tm);
-	if (error)
-		err(1, "strptime");
-	if (strftime(cvsdate, sizeof(cvsdate), "%Y/%m/%d %H:%M:%S", &tm) == 0)
-		err(1, "strftime");
-	filename = strrchr(di->di_rcsfile, '/');
-	if (filename == NULL)
-		filename = di->di_rcsfile;
-	else
-		filename++;
-
-	switch (tag->key) {
-	case RCSKEY_AUTHOR:
-		xasprintf(&val, "%s", di->di_author);
-		break;
-	case RCSKEY_CVSHEADER:
-		xasprintf(&val, "%s %s %s %s %s", di->di_rcsfile,
-		    di->di_revnum, cvsdate, di->di_author, di->di_state);
-		break;
-	case RCSKEY_DATE:
-		xasprintf(&val, "%s", cvsdate);
-		break;
-	case RCSKEY_HEADER:
-		xasprintf(&val, "%s/%s %s %s %s %s", di->di_cvsroot,
-		    di->di_rcsfile, di->di_revnum, cvsdate, di->di_author,
-		    di->di_state);
-		break;
-	case RCSKEY_ID:
-		xasprintf(&val, "%s %s %s %s %s", filename, di->di_revnum,
-		    cvsdate, di->di_author, di->di_state);
-		break;
-	case RCSKEY_LOCKER:
-		/*
-		 * Unimplemented even in CVSup sources.  It seems we don't
-		 * even have this information sent by the server.
-		 */
-		return (NULL);
-	case RCSKEY_LOG:
-		/* XXX */
-		printf("%s: Implement Log keyword expansion\n", __func__);
-		return (NULL);
-	case RCSKEY_NAME:
-		if (di->di_tag != NULL)
-			xasprintf(&val, "%s", di->di_tag);
-		else
-			return (NULL);
-		break;
-	case RCSKEY_RCSFILE:
-		xasprintf(&val, "%s", filename);
-		break;
-	case RCSKEY_REVISION:
-		xasprintf(&val, "%s", di->di_revnum);
-		break;
-	case RCSKEY_SOURCE:
-		xasprintf(&val, "%s/%s", di->di_cvsroot, di->di_rcsfile);
-		break;
-	case RCSKEY_STATE:
-		xasprintf(&val, "%s", di->di_state);
-		break;
-	}
-	return (val);
-}
diff --git a/usr.bin/csup/keyword.h b/usr.bin/csup/keyword.h
deleted file mode 100644
index 033cb0aa6283..000000000000
--- a/usr.bin/csup/keyword.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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 _KEYWORD_H_
-#define _KEYWORD_H_
-
-/* CVS expansion modes. */
-#define	EXPAND_DEFAULT		0
-#define	EXPAND_KEYVALUE		1
-#define	EXPAND_KEYVALUELOCKER	2
-#define	EXPAND_KEY		3
-#define	EXPAND_OLD		4
-#define	EXPAND_BINARY		5
-#define	EXPAND_VALUE		6
-
-struct diffinfo;
-struct keyword;
-
-struct keyword	*keyword_new(void);
-int		 keyword_decode_expand(const char *);
-const char	*keyword_encode_expand(int);
-int		 keyword_alias(struct keyword *, const char *, const char *);
-int		 keyword_enable(struct keyword *, const char *);
-int		 keyword_disable(struct keyword *, const char *);
-void		 keyword_prepare(struct keyword *);
-int		 keyword_expand(struct keyword *, struct diffinfo *, char *,
-		     size_t, char **, size_t *);
-void		 keyword_free(struct keyword *);
-
-#endif /* !_KEYWORD_H_ */
diff --git a/usr.bin/csup/lex.rcs.c b/usr.bin/csup/lex.rcs.c
deleted file mode 100644
index 5db7a7b60887..000000000000
--- a/usr.bin/csup/lex.rcs.c
+++ /dev/null
@@ -1,2094 +0,0 @@
-
-#line 3 "lex.rcs.c"
-
-#define  YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* An opaque pointer. */
-#ifndef YY_TYPEDEF_YY_SCANNER_T
-#define YY_TYPEDEF_YY_SCANNER_T
-typedef void* yyscan_t;
-#endif
-
-/* For convenience, these vars (plus the bison vars far below)
-   are macros in the reentrant scanner. */
-#define yyin yyg->yyin_r
-#define yyout yyg->yyout_r
-#define yyextra yyg->yyextra_r
-#define yyleng yyg->yyleng_r
-#define yytext yyg->yytext_r
-#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
-#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
-#define yy_flex_debug yyg->yy_flex_debug_r
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yyg->yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yyg->yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE rcsrestart(yyin ,yyscanner )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE 16384
-#endif
-
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = yyg->yy_hold_char; \
-		YY_RESTORE_YY_MORE_OFFSET \
-		yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via rcsrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-
-	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \
-                          ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \
-                          : NULL)
-
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top]
-
-void rcsrestart (FILE *input_file ,yyscan_t yyscanner );
-void rcs_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-YY_BUFFER_STATE rcs_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
-void rcs_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void rcs_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void rcspush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-void rcspop_buffer_state (yyscan_t yyscanner );
-
-static void rcsensure_buffer_stack (yyscan_t yyscanner );
-static void rcs_load_buffer_state (yyscan_t yyscanner );
-static void rcs_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner );
-
-#define YY_FLUSH_BUFFER rcs_flush_buffer(YY_CURRENT_BUFFER ,yyscanner)
-
-YY_BUFFER_STATE rcs_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
-YY_BUFFER_STATE rcs_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE rcs_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
-
-void *rcsalloc (yy_size_t ,yyscan_t yyscanner );
-void *rcsrealloc (void *,yy_size_t ,yyscan_t yyscanner );
-void rcsfree (void * ,yyscan_t yyscanner );
-
-#define yy_new_buffer rcs_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        rcsensure_buffer_stack (yyscanner); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            rcs_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        rcsensure_buffer_stack (yyscanner); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            rcs_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-
-/* Begin user sect3 */
-
-#define rcswrap(n) 1
-#define YY_SKIP_YYWRAP
-
-typedef unsigned char YY_CHAR;
-
-typedef int yy_state_type;
-
-#define yytext_ptr yytext_r
-
-static yy_state_type yy_get_previous_state (yyscan_t yyscanner );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  ,yyscan_t yyscanner);
-static int yy_get_next_buffer (yyscan_t yyscanner );
-static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner );
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	yyg->yytext_ptr = yy_bp; \
-	yyleng = (size_t) (yy_cp - yy_bp); \
-	yyg->yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-	yyg->yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 10
-#define YY_END_OF_BUFFER 11
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static yyconst flex_int16_t yy_accept[89] =
-    {   0,
-        0,    0,   11,    5,    9,    8,   10,    4,    4,    7,
-        6,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    9,    5,    4,    4,    5,
-        4,    4,    5,    0,    0,    5,    5,    3,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    3,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    2,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    1,    5,    5,    5,    0
-    } ;
-
-static yyconst flex_int32_t yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    1,    1,    4,    1,    1,    1,    1,
-        1,    1,    1,    4,    1,    5,    1,    6,    6,    6,
-        6,    6,    6,    6,    6,    6,    6,    7,    8,    1,
-        1,    1,    1,    9,    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,   10,   11,   12,   13,
-
-       14,    1,   15,   16,   17,    1,   18,   19,   20,   21,
-       22,   23,    1,   24,   25,   26,   27,    1,    1,   28,
-       29,    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,    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,    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,    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,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst flex_int32_t yy_meta[30] =
-    {   0,
-        1,    2,    2,    2,    1,    1,    2,    2,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1
-    } ;
-
-static yyconst flex_int16_t yy_base[94] =
-    {   0,
-        0,    0,  136,   25,  127,  297,  297,   27,   29,  297,
-      297,   34,   39,   41,   47,   44,   50,   54,   57,   66,
-       68,   70,   76,   80,   82,   91,   84,   86,   90,   93,
-       95,   97,  102,   58,   61,    0,    0,  107,  109,  112,
-      114,  117,  120,  122,  125,  129,  137,  127,  135,  145,
-      148,   74,  152,  155,  157,  162,  167,  174,  164,  178,
-      182,  184,  187,  189,  191,  193,  196,  200,  204,  206,
-      214,  211,  218,  224,  228,  230,  236,  239,  241,  243,
-      245,  248,  250,  254,  260,  265,  267,  297,   76,   56,
-       47,  292,  294
-
-    } ;
-
-static yyconst flex_int16_t yy_def[94] =
-    {   0,
-       88,    1,   88,   89,   88,   88,   88,   90,   91,   88,
-       88,   92,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   88,   89,   90,   91,   89,
-       91,   91,   92,   93,   93,   33,   33,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   88,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
-       89,   89,   89,   89,   89,   89,   89,    0,   88,   88,
-       88,   88,   88
-
-    } ;
-
-static yyconst flex_int16_t yy_nxt[327] =
-    {   0,
-        4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-       14,   15,   16,   17,    4,   18,    4,    4,   19,    4,
-       20,    4,    4,    4,   21,   22,    4,    4,    4,   24,
-       25,   28,   29,   31,   32,   34,   35,   34,   36,   37,
-       34,   34,   38,   24,   25,   24,   25,   30,   24,   25,
-       39,   24,   25,   43,   24,   25,   27,   44,   24,   25,
-       35,   24,   25,   35,   41,   40,   52,   46,   42,   52,
-       24,   25,   24,   25,   24,   25,   23,   45,   47,   48,
-       24,   25,   34,   51,   24,   25,   24,   25,   24,   25,
-       28,   29,   26,   49,   31,   32,   50,   24,   25,   31,
-
-       32,   31,   32,   34,   35,   34,   36,   37,   34,   34,
-       38,   24,   25,   24,   25,   33,   24,   25,   24,   25,
-       53,   24,   25,   55,   24,   25,   24,   25,   26,   24,
-       25,   24,   25,   24,   25,   88,   56,   54,   60,   24,
-       25,   24,   25,   88,   64,   57,   58,   59,   61,   24,
-       25,   62,   24,   25,   63,   88,   24,   25,   65,   24,
-       25,   24,   25,   88,   66,   68,   24,   25,   24,   25,
-       69,   24,   25,   72,   88,   67,   88,   70,   24,   25,
-       62,   71,   24,   25,   88,   62,   24,   25,   24,   25,
-       62,   24,   25,   24,   25,   24,   25,   24,   25,   73,
-
-       24,   25,   88,   76,   24,   25,   88,   75,   24,   25,
-       24,   25,   62,   88,   74,   24,   25,   79,   24,   25,
-       88,   62,   24,   25,   77,   78,   88,   80,   24,   25,
-       88,   81,   24,   25,   24,   25,   88,   62,   88,   82,
-       24,   25,   62,   24,   25,   24,   25,   24,   25,   24,
-       25,   83,   24,   25,   24,   25,   84,   62,   24,   25,
-       62,   88,   62,   85,   24,   25,   88,   87,   86,   24,
-       25,   24,   25,   62,   88,   88,   88,   88,   88,   88,
-       88,   88,   88,   88,   88,   62,   88,   88,   88,   62,
-       88,   62,   33,   33,   34,   34,    3,   88,   88,   88,
-
-       88,   88,   88,   88,   88,   88,   88,   88,   88,   88,
-       88,   88,   88,   88,   88,   88,   88,   88,   88,   88,
-       88,   88,   88,   88,   88,   88
-    } ;
-
-static yyconst flex_int16_t yy_chk[327] =
-    {   0,
-        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,    4,
-        4,    8,    8,    9,    9,   12,   12,   12,   12,   12,
-       12,   12,   12,   13,   13,   14,   14,   91,   16,   16,
-       13,   15,   15,   16,   17,   17,   90,   16,   18,   18,
-       34,   19,   19,   35,   14,   13,   34,   18,   15,   35,
-       20,   20,   21,   21,   22,   22,   89,   17,   19,   20,
-       23,   23,   52,   22,   24,   24,   25,   25,   27,   27,
-       28,   28,   26,   21,   29,   29,   21,   30,   30,   31,
-
-       31,   32,   32,   33,   33,   33,   33,   33,   33,   33,
-       33,   38,   38,   39,   39,   38,   40,   40,   41,   41,
-       39,   42,   42,   41,   43,   43,   44,   44,    5,   45,
-       45,   48,   48,   46,   46,    3,   42,   40,   46,   49,
-       49,   47,   47,    0,   49,   43,   44,   45,   47,   50,
-       50,   47,   51,   51,   48,    0,   53,   53,   49,   54,
-       54,   55,   55,    0,   50,   53,   56,   56,   59,   59,
-       54,   57,   57,   59,    0,   51,    0,   55,   58,   58,
-       57,   56,   60,   60,    0,   58,   61,   61,   62,   62,
-       60,   63,   63,   64,   64,   65,   65,   66,   66,   61,
-
-       67,   67,    0,   66,   68,   68,    0,   65,   69,   69,
-       70,   70,   63,    0,   64,   72,   72,   70,   71,   71,
-        0,   67,   73,   73,   68,   69,    0,   71,   74,   74,
-        0,   72,   75,   75,   76,   76,    0,   74,    0,   75,
-       77,   77,   73,   78,   78,   79,   79,   80,   80,   81,
-       81,   76,   82,   82,   83,   83,   79,   81,   84,   84,
-       77,    0,   78,   80,   85,   85,    0,   84,   83,   86,
-       86,   87,   87,   82,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   85,    0,    0,    0,   86,
-        0,   87,   92,   92,   93,   93,   88,   88,   88,   88,
-
-       88,   88,   88,   88,   88,   88,   88,   88,   88,   88,
-       88,   88,   88,   88,   88,   88,   88,   88,   88,   88,
-       88,   88,   88,   88,   88,   88
-    } ;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "rcstokenizer.l"
-/*-
- * Copyright (c) 2007-2008, Ulf Lilleengen <lulf@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$
- * 
- */
-/*
- * This tokenizer must be generated by a lexxer with support for reentrancy.
- */
-#line 34 "rcstokenizer.l"
-#include <string.h>
-#include "misc.h"
-#include "rcsparse.h"
-
-#line 567 "lex.rcs.c"
-
-#define INITIAL 0
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-/* Holds the entire state of the reentrant scanner. */
-struct yyguts_t
-    {
-
-    /* User-defined. Not touched by flex. */
-    YY_EXTRA_TYPE yyextra_r;
-
-    /* The rest are the same as the globals declared in the non-reentrant scanner. */
-    FILE *yyin_r, *yyout_r;
-    size_t yy_buffer_stack_top; /**< index of top of stack. */
-    size_t yy_buffer_stack_max; /**< capacity of stack. */
-    YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
-    char yy_hold_char;
-    int yy_n_chars;
-    int yyleng_r;
-    char *yy_c_buf_p;
-    int yy_init;
-    int yy_start;
-    int yy_did_buffer_switch_on_eof;
-    int yy_start_stack_ptr;
-    int yy_start_stack_depth;
-    int *yy_start_stack;
-    yy_state_type yy_last_accepting_state;
-    char* yy_last_accepting_cpos;
-
-    int yylineno_r;
-    int yy_flex_debug_r;
-
-    char *yytext_r;
-    int yy_more_flag;
-    int yy_more_len;
-
-    }; /* end struct yyguts_t */
-
-static int yy_init_globals (yyscan_t yyscanner );
-
-int rcslex_init (yyscan_t* scanner);
-
-int rcslex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
-
-/* Accessor methods to globals.
-   These are made visible to non-reentrant scanners for convenience. */
-
-int rcslex_destroy (yyscan_t yyscanner );
-
-int rcsget_debug (yyscan_t yyscanner );
-
-void rcsset_debug (int debug_flag ,yyscan_t yyscanner );
-
-YY_EXTRA_TYPE rcsget_extra (yyscan_t yyscanner );
-
-void rcsset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
-
-FILE *rcsget_in (yyscan_t yyscanner );
-
-void rcsset_in  (FILE * in_str ,yyscan_t yyscanner );
-
-FILE *rcsget_out (yyscan_t yyscanner );
-
-void rcsset_out  (FILE * out_str ,yyscan_t yyscanner );
-
-int rcsget_leng (yyscan_t yyscanner );
-
-char *rcsget_text (yyscan_t yyscanner );
-
-int rcsget_lineno (yyscan_t yyscanner );
-
-void rcsset_lineno (int line_number ,yyscan_t yyscanner );
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int rcswrap (yyscan_t yyscanner );
-#else
-extern int rcswrap (yyscan_t yyscanner );
-#endif
-#endif
-
-    static void yyunput (int c,char *buf_ptr  ,yyscan_t yyscanner);
-    
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
-#endif
-
-#ifndef YY_NO_INPUT
-
-#ifdef __cplusplus
-static int yyinput (yyscan_t yyscanner );
-#else
-static int input (yyscan_t yyscanner );
-#endif
-
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		int n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(yyin); \
-			} \
-		}\
-\
-
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner)
-#endif
-
-/* end tables serialization structures and prototypes */
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int rcslex (yyscan_t yyscanner);
-
-#define YY_DECL int rcslex (yyscan_t yyscanner)
-#endif /* !YY_DECL */
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-#line 51 "rcstokenizer.l"
-
-
-#line 791 "lex.rcs.c"
-
-	if ( !yyg->yy_init )
-		{
-		yyg->yy_init = 1;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! yyg->yy_start )
-			yyg->yy_start = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( ! YY_CURRENT_BUFFER ) {
-			rcsensure_buffer_stack (yyscanner);
-			YY_CURRENT_BUFFER_LVALUE =
-				rcs_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
-		}
-
-		rcs_load_buffer_state(yyscanner );
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = yyg->yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yyg->yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = yyg->yy_start;
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				yyg->yy_last_accepting_state = yy_current_state;
-				yyg->yy_last_accepting_cpos = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 89 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 297 );
-
-yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-		if ( yy_act == 0 )
-			{ /* have to back up */
-			yy_cp = yyg->yy_last_accepting_cpos;
-			yy_current_state = yyg->yy_last_accepting_state;
-			yy_act = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-do_action:	/* This label is used only to access EOF actions. */
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yyg->yy_hold_char;
-			yy_cp = yyg->yy_last_accepting_cpos;
-			yy_current_state = yyg->yy_last_accepting_state;
-			goto yy_find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 53 "rcstokenizer.l"
-{
-	return (KEYWORD_TWO);
-}
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 56 "rcstokenizer.l"
-{
-	return (KEYWORD);
-}
-	YY_BREAK
-case 3:
-/* rule 3 can match eol */
-YY_RULE_SETUP
-#line 59 "rcstokenizer.l"
-{
-	return (STRING);
-}
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 62 "rcstokenizer.l"
-{
-	return (NUM);
-}
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 65 "rcstokenizer.l"
-{
-/* This will use ID as both ID and SYM. Do extra checking elsewhere.*/
-	return (ID);
-}
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 69 "rcstokenizer.l"
-{ return (SEMIC); }
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 70 "rcstokenizer.l"
-{ return (COLON); }
-	YY_BREAK
-case 8:
-/* rule 8 can match eol */
-YY_RULE_SETUP
-#line 71 "rcstokenizer.l"
-;
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 72 "rcstokenizer.l"
-;
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 73 "rcstokenizer.l"
-ECHO;
-	YY_BREAK
-#line 937 "lex.rcs.c"
-case YY_STATE_EOF(INITIAL):
-	yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yyg->yy_hold_char;
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * rcslex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state( yyscanner );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner);
-
-			yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yyg->yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = yyg->yy_c_buf_p;
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer( yyscanner ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yyg->yy_did_buffer_switch_on_eof = 0;
-
-				if ( rcswrap(yyscanner ) )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yyg->yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yyg->yy_c_buf_p =
-					yyg->yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state( yyscanner );
-
-				yy_cp = yyg->yy_c_buf_p;
-				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yyg->yy_c_buf_p =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars];
-
-				yy_current_state = yy_get_previous_state( yyscanner );
-
-				yy_cp = yyg->yy_c_buf_p;
-				yy_bp = yyg->yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-} /* end of rcslex */
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = yyg->yytext_ptr;
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0;
-
-	else
-		{
-			int num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
-
-			int yy_c_buf_p_offset =
-				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					rcsrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-						number_to_move - 1;
-
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			yyg->yy_n_chars, (size_t) num_to_read );
-
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-		}
-
-	if ( yyg->yy_n_chars == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			rcsrestart(yyin  ,yyscanner);
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) rcsrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-	}
-
-	yyg->yy_n_chars += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-	yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-
-	return ret_val;
-}
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-    static yy_state_type yy_get_previous_state (yyscan_t yyscanner)
-{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	yy_current_state = yyg->yy_start;
-
-	for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			yyg->yy_last_accepting_state = yy_current_state;
-			yyg->yy_last_accepting_cpos = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 89 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-}
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state , yyscan_t yyscanner)
-{
-	register int yy_is_jam;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */
-	register char *yy_cp = yyg->yy_c_buf_p;
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		yyg->yy_last_accepting_state = yy_current_state;
-		yyg->yy_last_accepting_cpos = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 89 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 88);
-
-	return yy_is_jam ? 0 : yy_current_state;
-}
-
-    static void yyunput (int c, register char * yy_bp , yyscan_t yyscanner)
-{
-	register char *yy_cp;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-    yy_cp = yyg->yy_c_buf_p;
-
-	/* undo effects of setting up yytext */
-	*yy_cp = yyg->yy_hold_char;
-
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = yyg->yy_n_chars + 2;
-		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
-		register char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
-
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
-
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-	yyg->yytext_ptr = yy_bp;
-	yyg->yy_hold_char = *yy_cp;
-	yyg->yy_c_buf_p = yy_cp;
-}
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-    static int yyinput (yyscan_t yyscanner)
-#else
-    static int input  (yyscan_t yyscanner)
-#endif
-
-{
-	int c;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	*yyg->yy_c_buf_p = yyg->yy_hold_char;
-
-	if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] )
-			/* This was really a NUL. */
-			*yyg->yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
-			++yyg->yy_c_buf_p;
-
-			switch ( yy_get_next_buffer( yyscanner ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					rcsrestart(yyin ,yyscanner);
-
-					/*FALLTHROUGH*/
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( rcswrap(yyscanner ) )
-						return EOF;
-
-					if ( ! yyg->yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput(yyscanner);
-#else
-					return input(yyscanner);
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					yyg->yy_c_buf_p = yyg->yytext_ptr + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) yyg->yy_c_buf_p;	/* cast for 8-bit char's */
-	*yyg->yy_c_buf_p = '\0';	/* preserve yytext */
-	yyg->yy_hold_char = *++yyg->yy_c_buf_p;
-
-	return c;
-}
-#endif	/* ifndef YY_NO_INPUT */
-
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * @param yyscanner The scanner object.
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void rcsrestart  (FILE * input_file , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	if ( ! YY_CURRENT_BUFFER ){
-        rcsensure_buffer_stack (yyscanner);
-		YY_CURRENT_BUFFER_LVALUE =
-            rcs_create_buffer(yyin,YY_BUF_SIZE ,yyscanner);
-	}
-
-	rcs_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner);
-	rcs_load_buffer_state(yyscanner );
-}
-
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * @param yyscanner The scanner object.
- */
-    void rcs_switch_to_buffer  (YY_BUFFER_STATE  new_buffer , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		rcspop_buffer_state();
-	 *		rcspush_buffer_state(new_buffer);
-     */
-	rcsensure_buffer_stack (yyscanner);
-	if ( YY_CURRENT_BUFFER == new_buffer )
-		return;
-
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*yyg->yy_c_buf_p = yyg->yy_hold_char;
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-		}
-
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	rcs_load_buffer_state(yyscanner );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (rcswrap()) processing, but the only time this flag
-	 * is looked at is after rcswrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yyg->yy_did_buffer_switch_on_eof = 1;
-}
-
-static void rcs_load_buffer_state  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	yyg->yy_hold_char = *yyg->yy_c_buf_p;
-}
-
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * @param yyscanner The scanner object.
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE rcs_create_buffer  (FILE * file, int  size , yyscan_t yyscanner)
-{
-	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) rcsalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in rcs_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) rcsalloc(b->yy_buf_size + 2 ,yyscanner );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in rcs_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	rcs_init_buffer(b,file ,yyscanner);
-
-	return b;
-}
-
-/** Destroy the buffer.
- * @param b a buffer created with rcs_create_buffer()
- * @param yyscanner The scanner object.
- */
-    void rcs_delete_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	if ( ! b )
-		return;
-
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		rcsfree((void *) b->yy_ch_buf ,yyscanner );
-
-	rcsfree((void *) b ,yyscanner );
-}
-
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-    
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a rcsrestart() or at EOF.
- */
-    static void rcs_init_buffer  (YY_BUFFER_STATE  b, FILE * file , yyscan_t yyscanner)
-
-{
-	int oerrno = errno;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	rcs_flush_buffer(b ,yyscanner);
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-    /* If b is the current buffer, then rcs_init_buffer was _probably_
-     * called from rcsrestart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-
-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
-	errno = oerrno;
-}
-
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * @param yyscanner The scanner object.
- */
-    void rcs_flush_buffer (YY_BUFFER_STATE  b , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == YY_CURRENT_BUFFER )
-		rcs_load_buffer_state(yyscanner );
-}
-
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  @param yyscanner The scanner object.
- */
-void rcspush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if (new_buffer == NULL)
-		return;
-
-	rcsensure_buffer_stack(yyscanner);
-
-	/* This block is copied from rcs_switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*yyg->yy_c_buf_p = yyg->yy_hold_char;
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p;
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		yyg->yy_buffer_stack_top++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from rcs_switch_to_buffer. */
-	rcs_load_buffer_state(yyscanner );
-	yyg->yy_did_buffer_switch_on_eof = 1;
-}
-
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  @param yyscanner The scanner object.
- */
-void rcspop_buffer_state (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-	if (!YY_CURRENT_BUFFER)
-		return;
-
-	rcs_delete_buffer(YY_CURRENT_BUFFER ,yyscanner);
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if (yyg->yy_buffer_stack_top > 0)
-		--yyg->yy_buffer_stack_top;
-
-	if (YY_CURRENT_BUFFER) {
-		rcs_load_buffer_state(yyscanner );
-		yyg->yy_did_buffer_switch_on_eof = 1;
-	}
-}
-
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void rcsensure_buffer_stack (yyscan_t yyscanner)
-{
-	int num_to_alloc;
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-	if (!yyg->yy_buffer_stack) {
-
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
-         */
-		num_to_alloc = 1;
-		yyg->yy_buffer_stack = (struct yy_buffer_state**)rcsalloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								, yyscanner);
-		if ( ! yyg->yy_buffer_stack )
-			YY_FATAL_ERROR( "out of dynamic memory in rcsensure_buffer_stack()" );
-								  
-		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
-		yyg->yy_buffer_stack_max = num_to_alloc;
-		yyg->yy_buffer_stack_top = 0;
-		return;
-	}
-
-	if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		int grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
-		yyg->yy_buffer_stack = (struct yy_buffer_state**)rcsrealloc
-								(yyg->yy_buffer_stack,
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								, yyscanner);
-		if ( ! yyg->yy_buffer_stack )
-			YY_FATAL_ERROR( "out of dynamic memory in rcsensure_buffer_stack()" );
-
-		/* zero only the new slots.*/
-		memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
-		yyg->yy_buffer_stack_max = num_to_alloc;
-	}
-}
-
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE rcs_scan_buffer  (char * base, yy_size_t  size , yyscan_t yyscanner)
-{
-	YY_BUFFER_STATE b;
-    
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) rcsalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in rcs_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	rcs_switch_to_buffer(b ,yyscanner );
-
-	return b;
-}
-
-/** Setup the input buffer state to scan a string. The next call to rcslex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       rcs_scan_bytes() instead.
- */
-YY_BUFFER_STATE rcs_scan_string (yyconst char * yystr , yyscan_t yyscanner)
-{
-    
-	return rcs_scan_bytes(yystr,strlen(yystr) ,yyscanner);
-}
-
-/** Setup the input buffer state to scan the given bytes. The next call to rcslex() will
- * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE rcs_scan_bytes  (yyconst char * yybytes, int  _yybytes_len , yyscan_t yyscanner)
-{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-    
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) rcsalloc(n ,yyscanner );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in rcs_scan_bytes()" );
-
-	for ( i = 0; i < _yybytes_len; ++i )
-		buf[i] = yybytes[i];
-
-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = rcs_scan_buffer(buf,n ,yyscanner);
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in rcs_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-}
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
-{
-    	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-}
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		yytext[yyleng] = yyg->yy_hold_char; \
-		yyg->yy_c_buf_p = yytext + yyless_macro_arg; \
-		yyg->yy_hold_char = *yyg->yy_c_buf_p; \
-		*yyg->yy_c_buf_p = '\0'; \
-		yyleng = yyless_macro_arg; \
-		} \
-	while ( 0 )
-
-/* Accessor  methods (get/set functions) to struct members. */
-
-/** Get the user-defined data for this scanner.
- * @param yyscanner The scanner object.
- */
-YY_EXTRA_TYPE rcsget_extra  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yyextra;
-}
-
-/** Get the current line number.
- * @param yyscanner The scanner object.
- */
-int rcsget_lineno  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    
-        if (! YY_CURRENT_BUFFER)
-            return 0;
-    
-    return yylineno;
-}
-
-/** Get the current column number.
- * @param yyscanner The scanner object.
- */
-int rcsget_column  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    
-        if (! YY_CURRENT_BUFFER)
-            return 0;
-    
-    return yycolumn;
-}
-
-/** Get the input stream.
- * @param yyscanner The scanner object.
- */
-FILE *rcsget_in  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yyin;
-}
-
-/** Get the output stream.
- * @param yyscanner The scanner object.
- */
-FILE *rcsget_out  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yyout;
-}
-
-/** Get the length of the current token.
- * @param yyscanner The scanner object.
- */
-int rcsget_leng  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yyleng;
-}
-
-/** Get the current token.
- * @param yyscanner The scanner object.
- */
-
-char *rcsget_text  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yytext;
-}
-
-/** Set the user-defined data. This data is never touched by the scanner.
- * @param user_defined The data to be associated with this scanner.
- * @param yyscanner The scanner object.
- */
-void rcsset_extra (YY_EXTRA_TYPE  user_defined , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyextra = user_defined ;
-}
-
-/** Set the current line number.
- * @param line_number
- * @param yyscanner The scanner object.
- */
-void rcsset_lineno (int  line_number , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-        /* lineno is only valid if an input buffer exists. */
-        if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "rcsset_lineno called with no buffer" , yyscanner); 
-    
-    yylineno = line_number;
-}
-
-/** Set the current column.
- * @param line_number
- * @param yyscanner The scanner object.
- */
-void rcsset_column (int  column_no , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-        /* column is only valid if an input buffer exists. */
-        if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "rcsset_column called with no buffer" , yyscanner); 
-    
-    yycolumn = column_no;
-}
-
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * @param yyscanner The scanner object.
- * @see rcs_switch_to_buffer
- */
-void rcsset_in (FILE *  in_str , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyin = in_str ;
-}
-
-void rcsset_out (FILE *  out_str , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yyout = out_str ;
-}
-
-int rcsget_debug  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    return yy_flex_debug;
-}
-
-void rcsset_debug (int  bdebug , yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    yy_flex_debug = bdebug ;
-}
-
-/* Accessor methods for yylval and yylloc */
-
-/* User-visible API */
-
-/* rcslex_init is special because it creates the scanner itself, so it is
- * the ONLY reentrant function that doesn't take the scanner as the last argument.
- * That's why we explicitly handle the declaration, instead of using our macros.
- */
-
-int rcslex_init(yyscan_t* ptr_yy_globals)
-
-{
-    if (ptr_yy_globals == NULL){
-        errno = EINVAL;
-        return 1;
-    }
-
-    *ptr_yy_globals = (yyscan_t) rcsalloc ( sizeof( struct yyguts_t ), NULL );
-
-    if (*ptr_yy_globals == NULL){
-        errno = ENOMEM;
-        return 1;
-    }
-
-    /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */
-    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-
-    return yy_init_globals ( *ptr_yy_globals );
-}
-
-/* rcslex_init_extra has the same functionality as rcslex_init, but follows the
- * convention of taking the scanner as the last argument. Note however, that
- * this is a *pointer* to a scanner, as it will be allocated by this call (and
- * is the reason, too, why this function also must handle its own declaration).
- * The user defined value in the first argument will be available to rcsalloc in
- * the yyextra field.
- */
-
-int rcslex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
-
-{
-    struct yyguts_t dummy_yyguts;
-
-    rcsset_extra (yy_user_defined, &dummy_yyguts);
-
-    if (ptr_yy_globals == NULL){
-        errno = EINVAL;
-        return 1;
-    }
-	
-    *ptr_yy_globals = (yyscan_t) rcsalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
-	
-    if (*ptr_yy_globals == NULL){
-        errno = ENOMEM;
-        return 1;
-    }
-    
-    /* By setting to 0xAA, we expose bugs in
-    yy_init_globals. Leave at 0x00 for releases. */
-    memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-    
-    rcsset_extra (yy_user_defined, *ptr_yy_globals);
-    
-    return yy_init_globals ( *ptr_yy_globals );
-}
-
-static int yy_init_globals (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-    /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from rcslex_destroy(), so don't allocate here.
-     */
-
-    yyg->yy_buffer_stack = 0;
-    yyg->yy_buffer_stack_top = 0;
-    yyg->yy_buffer_stack_max = 0;
-    yyg->yy_c_buf_p = (char *) 0;
-    yyg->yy_init = 0;
-    yyg->yy_start = 0;
-
-    yyg->yy_start_stack_ptr = 0;
-    yyg->yy_start_stack_depth = 0;
-    yyg->yy_start_stack =  NULL;
-
-/* Defined in main.c */
-#ifdef YY_STDINIT
-    yyin = stdin;
-    yyout = stdout;
-#else
-    yyin = (FILE *) 0;
-    yyout = (FILE *) 0;
-#endif
-
-    /* For future reference: Set errno on error, since we are called by
-     * rcslex_init()
-     */
-    return 0;
-}
-
-/* rcslex_destroy is for both reentrant and non-reentrant scanners. */
-int rcslex_destroy  (yyscan_t yyscanner)
-{
-    struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
-    /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		rcs_delete_buffer(YY_CURRENT_BUFFER ,yyscanner );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		rcspop_buffer_state(yyscanner);
-	}
-
-	/* Destroy the stack itself. */
-	rcsfree(yyg->yy_buffer_stack ,yyscanner);
-	yyg->yy_buffer_stack = NULL;
-
-    /* Destroy the start condition stack. */
-        rcsfree(yyg->yy_start_stack ,yyscanner );
-        yyg->yy_start_stack = NULL;
-
-    /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * rcslex() is called, initialization will occur. */
-    yy_init_globals( yyscanner);
-
-    /* Destroy the main struct (reentrant only). */
-    rcsfree ( yyscanner , yyscanner );
-    yyscanner = NULL;
-    return 0;
-}
-
-/*
- * Internal utility routines.
- */
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner)
-{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-}
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner)
-{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-}
-#endif
-
-void *rcsalloc (yy_size_t  size , yyscan_t yyscanner)
-{
-	return (void *) malloc( size );
-}
-
-void *rcsrealloc  (void * ptr, yy_size_t  size , yyscan_t yyscanner)
-{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-}
-
-void rcsfree (void * ptr , yyscan_t yyscanner)
-{
-	free( (char *) ptr );	/* see rcsrealloc() for (char *) cast */
-}
-
-#define YYTABLES_NAME "yytables"
-
-#line 73 "rcstokenizer.l"
-
-
-
diff --git a/usr.bin/csup/lister.c b/usr.bin/csup/lister.c
deleted file mode 100644
index 104963afa85d..000000000000
--- a/usr.bin/csup/lister.c
+++ /dev/null
@@ -1,569 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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 <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "attrstack.h"
-#include "config.h"
-#include "fattr.h"
-#include "globtree.h"
-#include "lister.h"
-#include "misc.h"
-#include "mux.h"
-#include "proto.h"
-#include "status.h"
-#include "stream.h"
-
-/* Internal error codes. */
-#define	LISTER_ERR_WRITE	(-1)	/* Error writing to server. */
-#define	LISTER_ERR_STATUS	(-2)	/* Status file error in lstr->errmsg. */
-
-struct lister {
-	struct config *config;
-	struct stream *wr;
-	char *errmsg;
-};
-
-static int	lister_batch(struct lister *);
-static int	lister_coll(struct lister *, struct coll *, struct status *);
-static int	lister_dodirdown(struct lister *, struct coll *,
-		    struct statusrec *, struct attrstack *as);
-static int	lister_dodirup(struct lister *, struct coll *,
-    		    struct statusrec *, struct attrstack *as);
-static int	lister_dofile(struct lister *, struct coll *,
-		    struct statusrec *);
-static int	lister_dodead(struct lister *, struct coll *,
-		    struct statusrec *);
-static int	lister_dorcsfile(struct lister *, struct coll *,
-		    struct statusrec *);
-static int	lister_dorcsdead(struct lister *, struct coll *,
-		    struct statusrec *);
-
-void *
-lister(void *arg)
-{
-	struct thread_args *args;
-	struct lister lbuf, *l;
-	int error;
-
-	args = arg;
-	l = &lbuf;
-	l->config = args->config;
-	l->wr = args->wr;
-	l->errmsg = NULL;
-	error = lister_batch(l);
-	switch (error) {
-	case LISTER_ERR_WRITE:
-		xasprintf(&args->errmsg,
-		    "TreeList failed: Network write failure: %s",
-		    strerror(errno));
-		args->status = STATUS_TRANSIENTFAILURE;
-		break;
-	case LISTER_ERR_STATUS:
-		xasprintf(&args->errmsg,
-		    "TreeList failed: %s.  Delete it and try again.",
-		    l->errmsg);
-		free(l->errmsg);
-		args->status = STATUS_FAILURE;
-		break;
-	default:
-		assert(error == 0);
-		args->status = STATUS_SUCCESS;
-	};
-	return (NULL);
-}
-
-static int
-lister_batch(struct lister *l)
-{
-	struct config *config;
-	struct stream *wr;
-	struct status *st;
-	struct coll *coll;
-	int error;
-
-	config = l->config;
-	wr = l->wr;
-	STAILQ_FOREACH(coll, &config->colls, co_next) {
-		if (coll->co_options & CO_SKIP)
-			continue;
-		st = status_open(coll, -1, &l->errmsg);
-		if (st == NULL)
-			return (LISTER_ERR_STATUS);
-		error = proto_printf(wr, "COLL %s %s\n", coll->co_name,
-		    coll->co_release);
-		if (error)
-			return (LISTER_ERR_WRITE);
-		stream_flush(wr);
-		if (coll->co_options & CO_COMPRESS)
-			stream_filter_start(wr, STREAM_FILTER_ZLIB, NULL);
-		error = lister_coll(l, coll, st);
-		status_close(st, NULL);
-		if (error)
-			return (error);
-		if (coll->co_options & CO_COMPRESS)
-			stream_filter_stop(wr);
-		stream_flush(wr);
-	}
-	error = proto_printf(wr, ".\n");
-	if (error)
-		return (LISTER_ERR_WRITE);
-	return (0);
-}
-
-/* List a single collection based on the status file. */
-static int
-lister_coll(struct lister *l, struct coll *coll, struct status *st)
-{
-	struct stream *wr;
-	struct attrstack *as;
-	struct statusrec *sr;
-	struct fattr *fa;
-	size_t i;
-	int depth, error, ret, prunedepth;
-
-	wr = l->wr;
-	depth = 0;
-	prunedepth = INT_MAX;
-	as = attrstack_new();
-	while ((ret = status_get(st, NULL, 0, 0, &sr)) == 1) {
-		switch (sr->sr_type) {
-		case SR_DIRDOWN:
-			depth++;
-			if (depth < prunedepth) {
-				error = lister_dodirdown(l, coll, sr, as);
-				if (error < 0)
-					goto bad;
-				if (error)
-					prunedepth = depth;
-			}
-			break;
-		case SR_DIRUP:
-			if (depth < prunedepth) {
-				error = lister_dodirup(l, coll, sr, as);
-				if (error)
-					goto bad;
-			} else if (depth == prunedepth) {
-				/* Finished pruning. */
-				prunedepth = INT_MAX;
-			}
-			depth--;
-			continue;
-		case SR_CHECKOUTLIVE:
-			if (depth < prunedepth) {
-				error = lister_dofile(l, coll, sr);
-				if (error)
-					goto bad;
-			}
-			break;
-		case SR_CHECKOUTDEAD:
-			if (depth < prunedepth) {
-				error = lister_dodead(l, coll, sr);
-				if (error)
-					goto bad;
-			}
-			break;
-		case SR_FILEDEAD:
-			if (depth < prunedepth) {
-				if (!(coll->co_options & CO_CHECKOUTMODE)) {
-					error = lister_dorcsdead(l, coll, sr);
-					if (error)
-						goto bad;
-				}
-			}
-			break;
-		case SR_FILELIVE:
-			if (depth < prunedepth) {
-				if (!(coll->co_options & CO_CHECKOUTMODE)) {
-					error = lister_dorcsfile(l, coll, sr);
-					if (error)
-						goto bad;
-				}
-			}
-			break;
-		}
-	}
-	if (ret == -1) {
-		l->errmsg = status_errmsg(st);
-		error = LISTER_ERR_STATUS;
-		goto bad;
-	}
-	assert(status_eof(st));
-	assert(depth == 0);
-	error = proto_printf(wr, ".\n");
-	attrstack_free(as);
-	if (error)
-		return (LISTER_ERR_WRITE);
-	return (0);
-bad:
-	for (i = 0; i < attrstack_size(as); i++) {
-		fa = attrstack_pop(as);
-		fattr_free(fa);
-	}
-	attrstack_free(as);
-	return (error);
-}
-
-/* Handle a directory up entry found in the status file. */
-static int
-lister_dodirdown(struct lister *l, struct coll *coll, struct statusrec *sr,
-    struct attrstack *as)
-{
-	struct config *config;
-	struct stream *wr;
-	struct fattr *fa, *fa2;
-	char *path;
-	int error;
-
-	config = l->config;
-	wr = l->wr;
-	if (!globtree_test(coll->co_dirfilter, sr->sr_file))
-		return (1);
-	if (coll->co_options & CO_TRUSTSTATUSFILE) {
-		fa = fattr_new(FT_DIRECTORY, -1);
-	} else {
-		xasprintf(&path, "%s/%s", coll->co_prefix, sr->sr_file);
-		fa = fattr_frompath(path, FATTR_NOFOLLOW);
-		if (fa == NULL) {
-			/* The directory doesn't exist, prune
-			 * everything below it. */
-			free(path);
-			return (1);
-		}
-		if (fattr_type(fa) == FT_SYMLINK) {
-			fa2 = fattr_frompath(path, FATTR_FOLLOW);
-			if (fa2 != NULL && fattr_type(fa2) == FT_DIRECTORY) {
-				/* XXX - When not in checkout mode, CVSup warns
-				 * here about the file being a symlink to a
-				 * directory instead of a directory. */
-				fattr_free(fa);
-				fa = fa2;
-			} else {
-				fattr_free(fa2);
-			}
-		}
-		free(path);
-	}
-
-	if (fattr_type(fa) != FT_DIRECTORY) {
-		fattr_free(fa);
-		/* Report it as something bogus so
-		 * that it will be replaced. */
-		error = proto_printf(wr, "F %s %F\n", pathlast(sr->sr_file),
-		    fattr_bogus, config->fasupport, coll->co_attrignore);
-		if (error)
-			return (LISTER_ERR_WRITE);
-		return (1);
-	}
-
-	/* It really is a directory. */
-	attrstack_push(as, fa);
-	error = proto_printf(wr, "D %s\n", pathlast(sr->sr_file));
-	if (error)
-		return (LISTER_ERR_WRITE);
-	return (0);
-}
-
-/* Handle a directory up entry found in the status file. */
-static int
-lister_dodirup(struct lister *l, struct coll *coll, struct statusrec *sr,
-    struct attrstack *as)
-{
-	struct config *config;
-	const struct fattr *sendattr;
-	struct stream *wr;
-	struct fattr *fa, *fa2;
-	int error;
-
-	config = l->config;
-	wr = l->wr;
-	fa = attrstack_pop(as);
-	if (coll->co_options & CO_TRUSTSTATUSFILE) {
-		fattr_free(fa);
-		fa = sr->sr_clientattr;
-	}
-
-	fa2 = sr->sr_clientattr;
-	if (fattr_equal(fa, fa2))
-		sendattr = fa;
-	else
-		sendattr = fattr_bogus;
-	error = proto_printf(wr, "U %F\n", sendattr, config->fasupport,
-	    coll->co_attrignore);
-	if (error)
-		return (LISTER_ERR_WRITE);
-	if (!(coll->co_options & CO_TRUSTSTATUSFILE))
-		fattr_free(fa);
-	/* XXX CVSup flushes here for some reason with a comment saying
-	   "Be smarter".  We don't flush when listing other file types. */
-	stream_flush(wr);
-	return (0);
-}
-
-/* Handle a checkout live entry found in the status file. */
-static int
-lister_dofile(struct lister *l, struct coll *coll, struct statusrec *sr)
-{
-	struct config *config;
-	struct stream *wr;
-	const struct fattr *sendattr, *fa;
-	struct fattr *fa2, *rfa;
-	char *path, *spath;
-	int error;
-
-	if (!globtree_test(coll->co_filefilter, sr->sr_file))
-		return (0);
-	config = l->config;
-	wr = l->wr;
-	rfa = NULL;
-	sendattr = NULL;
-	error = 0;
-	if (!(coll->co_options & CO_TRUSTSTATUSFILE)) {
-		path = checkoutpath(coll->co_prefix, sr->sr_file);
-		if (path == NULL) {
-			spath = coll_statuspath(coll);
-			xasprintf(&l->errmsg, "Error in \"%s\": "
-			    "Invalid filename \"%s\"", spath, sr->sr_file);
-			free(spath);
-			return (LISTER_ERR_STATUS);
-		}
-		rfa = fattr_frompath(path, FATTR_NOFOLLOW);
-		free(path);
-		if (rfa == NULL) {
-			/*
-			 * According to the checkouts file we should have
-			 * this file but we don't.  Maybe the user deleted
-			 * the file, or maybe the checkouts file is wrong.
-			 * List the file with bogus attributes to cause the
-			 * server to get things back in sync again.
-			 */
-			sendattr = fattr_bogus;
-			goto send;
-		}
-		fa = rfa;
-	} else {
-		fa = sr->sr_clientattr;
-	}
-	fa2 = fattr_forcheckout(sr->sr_serverattr, coll->co_umask);
-	if (!fattr_equal(fa, sr->sr_clientattr) || !fattr_equal(fa, fa2) ||
-	    strcmp(coll->co_tag, sr->sr_tag) != 0 ||
-	    strcmp(coll->co_date, sr->sr_date) != 0) {
-		/*
-		 * The file corresponds to the information we have
-		 * recorded about it, and its moded is correct for
-		 * the requested umask setting.
-		 */
-		sendattr = fattr_bogus;
-	} else {
-		/*
-		 * Either the file has been touched, or we are asking
-		 * for a different revision than the one we recorded
-		 * information about, or its mode isn't right (because
-		 * it was last updated using a version of CVSup that
-		 * wasn't so strict about modes).
-		 */
-		sendattr = sr->sr_serverattr;
-	}
-	fattr_free(fa2);
-	if (rfa != NULL)
-		fattr_free(rfa);
-send:
-	error = proto_printf(wr, "F %s %F\n", pathlast(sr->sr_file), sendattr,
-	    config->fasupport, coll->co_attrignore);
-	if (error)
-		return (LISTER_ERR_WRITE);
-	return (0);
-}
-
-/* Handle a rcs file live entry found in the status file. */
-static int
-lister_dorcsfile(struct lister *l, struct coll *coll, struct statusrec *sr)
-{
-	struct config *config;
-	struct stream *wr;
-	const struct fattr *sendattr;
-	struct fattr *fa;
-	char *path, *spath;
-	size_t len;
-	int error;
-
-	if (!globtree_test(coll->co_filefilter, sr->sr_file))
-		return (0);
-	config = l->config;
-	wr = l->wr;
-	if (!(coll->co_options & CO_TRUSTSTATUSFILE)) {
-		path = cvspath(coll->co_prefix, sr->sr_file, 0);
-		if (path == NULL) {
-			spath = coll_statuspath(coll);
-			xasprintf(&l->errmsg, "Error in \"%s\": "
-			    "Invalid filename \"%s\"", spath, sr->sr_file);
-			free(spath);
-			return (LISTER_ERR_STATUS);
-		}
-		fa = fattr_frompath(path, FATTR_NOFOLLOW);
-		free(path);
-	} else 
-		fa = sr->sr_clientattr;
-	if (fa != NULL && fattr_equal(fa, sr->sr_clientattr)) {
-		/*
-		 * If the file is an RCS file, we use "loose" equality, so sizes
-		 * may disagress because of differences in whitespace.
-		 */
-		if (isrcs(sr->sr_file, &len) &&
-		    !(coll->co_options & CO_NORCS) &&
-		    !(coll->co_options & CO_STRICTCHECKRCS)) {
-			fattr_maskout(fa, FA_SIZE);
-		}
-		sendattr = fa;
-	} else {
-		/*
-		 * If different, the user may have changed it, so we report
-		 * bogus attributes to force a full comparison.
-		 */
-		sendattr = fattr_bogus;
-	}
-	error = proto_printf(wr, "F %s %F\n", pathlast(sr->sr_file), sendattr,
-	    config->fasupport, coll->co_attrignore);
-	if (error)
-		return (LISTER_ERR_WRITE);
-	return (0);
-}
-
-/* Handle a checkout dead entry found in the status file. */
-static int
-lister_dodead(struct lister *l, struct coll *coll, struct statusrec *sr)
-{
-	struct config *config;
-	struct stream *wr;
-	const struct fattr *sendattr;
-	struct fattr *fa;
-	char *path, *spath;
-	int error;
-
-	if (!globtree_test(coll->co_filefilter, sr->sr_file))
-		return (0);
-	config = l->config;
-	wr = l->wr;
-	if (!(coll->co_options & CO_TRUSTSTATUSFILE)) {
-		path = checkoutpath(coll->co_prefix, sr->sr_file);
-		if (path == NULL) {
-			spath = coll_statuspath(coll);
-			xasprintf(&l->errmsg, "Error in \"%s\": "
-			    "Invalid filename \"%s\"", spath, sr->sr_file);
-			free(spath);
-			return (LISTER_ERR_STATUS);
-		}
-		fa = fattr_frompath(path, FATTR_NOFOLLOW);
-		free(path);
-		if (fa != NULL && fattr_type(fa) != FT_DIRECTORY) {
-			/*
-			 * We shouldn't have this file but we do.  Report
-			 * it to the server, which will either send a
-			 * deletion request, of (if the file has come alive)
-			 * sent the correct version.
-			 */
-			fattr_free(fa);
-			error = proto_printf(wr, "F %s %F\n",
-			    pathlast(sr->sr_file), fattr_bogus,
-			    config->fasupport, coll->co_attrignore);
-			if (error)
-				return (LISTER_ERR_WRITE);
-			return (0);
-		}
-		fattr_free(fa);
-	}
-	if (strcmp(coll->co_tag, sr->sr_tag) != 0 ||
-	    strcmp(coll->co_date, sr->sr_date) != 0)
-		sendattr = fattr_bogus;
-	else
-		sendattr = sr->sr_serverattr;
-	error = proto_printf(wr, "f %s %F\n", pathlast(sr->sr_file), sendattr,
-	    config->fasupport, coll->co_attrignore);
-	if (error)
-		return (LISTER_ERR_WRITE);
-	return (0);
-}
-
-/* Handle a rcs file dead entry found in the status file. */
-static int
-lister_dorcsdead(struct lister *l, struct coll *coll, struct statusrec *sr)
-{
-	struct config *config;
-	struct stream *wr;
-	const struct fattr *sendattr;
-	struct fattr *fa;
-	char *path, *spath;
-	size_t len;
-	int error;
-
-	if (!globtree_test(coll->co_filefilter, sr->sr_file))
-		return (0);
-	config = l->config;
-	wr = l->wr;
-	if (!(coll->co_options & CO_TRUSTSTATUSFILE)) {
-		path = cvspath(coll->co_prefix, sr->sr_file, 1);
-		if (path == NULL) {
-			spath = coll_statuspath(coll);
-			xasprintf(&l->errmsg, "Error in \"%s\": "
-			    "Invalid filename \"%s\"", spath, sr->sr_file);
-			free(spath);
-			return (LISTER_ERR_STATUS);
-		}
-		fa = fattr_frompath(path, FATTR_NOFOLLOW);
-		free(path);
-	} else 
-		fa = sr->sr_clientattr;
-	if (fattr_equal(fa, sr->sr_clientattr)) {
-		/*
-		 * If the file is an RCS file, we use "loose" equality, so sizes
-		 * may disagress because of differences in whitespace.
-		 */
-		if (isrcs(sr->sr_file, &len) &&
-		    !(coll->co_options & CO_NORCS) &&
-		    !(coll->co_options & CO_STRICTCHECKRCS)) {
-			fattr_maskout(fa, FA_SIZE);
-		}
-		sendattr = fa;
-	} else {
-		/*
-		 * If different, the user may have changed it, so we report
-		 * bogus attributes to force a full comparison.
-		 */
-		sendattr = fattr_bogus;
-	}
-	error = proto_printf(wr, "f %s %F\n", pathlast(sr->sr_file), sendattr,
-	    config->fasupport, coll->co_attrignore);
-	if (error)
-		return (LISTER_ERR_WRITE);
-	return (0);
-}
diff --git a/usr.bin/csup/main.c b/usr.bin/csup/main.c
deleted file mode 100644
index 1363d149f258..000000000000
--- a/usr.bin/csup/main.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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/file.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <libgen.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "config.h"
-#include "fattr.h"
-#include "misc.h"
-#include "proto.h"
-#include "stream.h"
-
-#define	USAGE_OPTFMT	"    %-12s %s\n"
-#define	USAGE_OPTFMTSUB	"    %-14s %s\n", ""
-
-int verbose = 1;
-
-static void
-usage(char *argv0)
-{
-
-	lprintf(-1, "Usage: %s [options] supfile\n", basename(argv0));
-	lprintf(-1, "  Options:\n");
-	lprintf(-1, USAGE_OPTFMT, "-1", "Don't retry automatically on failure "
-	    "(same as \"-r 0\")");
-	lprintf(-1, USAGE_OPTFMT, "-4", "Force usage of IPv4 addresses");
-	lprintf(-1, USAGE_OPTFMT, "-6", "Force usage of IPv6 addresses");
-	lprintf(-1, USAGE_OPTFMT, "-a",
-		"Require server to authenticate itself to us");
-	lprintf(-1, USAGE_OPTFMT, "-A addr",
-	    "Bind local socket to a specific address");
-	lprintf(-1, USAGE_OPTFMT, "-b base",
-	    "Override supfile's \"base\" directory");
-	lprintf(-1, USAGE_OPTFMT, "-c collDir",
-	    "Subdirectory of \"base\" for collections (default \"sup\")");
-	lprintf(-1, USAGE_OPTFMT, "-d delLimit",
-	    "Allow at most \"delLimit\" file deletions (default unlimited)");
-	lprintf(-1, USAGE_OPTFMT, "-h host",
-	    "Override supfile's \"host\" name");
-	lprintf(-1, USAGE_OPTFMT, "-i pattern",
-	    "Include only files/directories matching pattern.");
-	lprintf(-1, USAGE_OPTFMTSUB,
-	    "May be repeated for an OR operation.  Default is");
-	lprintf(-1, USAGE_OPTFMTSUB, "to include each entire collection.");
-	lprintf(-1, USAGE_OPTFMT, "-k",
-	    "Keep bad temporary files when fixups are required");
-	lprintf(-1, USAGE_OPTFMT, "-l lockfile",
-	    "Lock file during update; fail if already locked");
-	lprintf(-1, USAGE_OPTFMT, "-L n",
-	    "Verbosity level (0..2, default 1)");
-	lprintf(-1, USAGE_OPTFMT, "-p port",
-	    "Alternate server port (default 5999)");
-	lprintf(-1, USAGE_OPTFMT, "-r n",
-	    "Maximum retries on transient errors (default unlimited)");
-	lprintf(-1, USAGE_OPTFMT, "-s",
-	    "Don't stat client files; trust the checkouts file");
-	lprintf(-1, USAGE_OPTFMT, "-v", "Print version and exit");
-	lprintf(-1, USAGE_OPTFMT, "-z", "Enable compression for all "
-	    "collections");
-	lprintf(-1, USAGE_OPTFMT, "-Z", "Disable compression for all "
-	    "collections");
-}
-
-int
-main(int argc, char *argv[])
-{
-	struct tm tm;
-	struct backoff_timer *timer;
-	struct config *config;
-	struct coll *override;
-	struct addrinfo *res;
-	struct sockaddr *laddr;
-	socklen_t laddrlen;
-	struct stream *lock;
-	char *argv0, *file, *lockfile;
-	int family, error, lockfd, lflag, overridemask;
-	int c, i, deletelim, port, retries, status, reqauth;
-	time_t nexttry;
-
-	error = 0;
-	family = PF_UNSPEC;
-	deletelim = -1;
-	port = 0;
-	lflag = 0;
-	lockfd = 0;
-	nexttry = 0;
-	retries = -1;
-	argv0 = argv[0];
-	laddr = NULL;
-	laddrlen = 0;
-	lockfile = NULL;
-	override = coll_new(NULL);
-	overridemask = 0;
-	reqauth = 0;
-
-	while ((c = getopt(argc, argv,
-	    "146aA:b:c:d:gh:i:kl:L:p:P:r:svzZ")) != -1) {
-		switch (c) {
-		case '1':
-			retries = 0;
-			break;
-		case '4':
-			family = AF_INET;
-			break;
-		case '6':
-			family = AF_INET6;
-			break;
-		case 'a':
-			/* Require server authentication */
-			reqauth = 1;
-			break;
-		case 'A':
-			error = getaddrinfo(optarg, NULL, NULL, &res);
-			if (error) {
-				lprintf(-1, "%s: %s\n", optarg,
-				    gai_strerror(error));
-				return (1);
-			}
-			laddrlen = res->ai_addrlen;
-			laddr = xmalloc(laddrlen);
-			memcpy(laddr, res->ai_addr, laddrlen);
-			freeaddrinfo(res);
-			break;
-		case 'b':
-			if (override->co_base != NULL)
-				free(override->co_base);
-			override->co_base = xstrdup(optarg);
-			break;
-		case 'c':
-			override->co_colldir = optarg;
-			break;
-		case 'd':
-			error = asciitoint(optarg, &deletelim, 0);
-			if (error || deletelim < 0) {
-				lprintf(-1, "Invalid deletion limit\n");
-				usage(argv0);
-				return (1);
-			}
-			break;
-		case 'g':
-			/* For compatibility. */
-			break;
-		case 'h':
-			if (override->co_host != NULL)
-				free(override->co_host);
-			override->co_host = xstrdup(optarg);
-			break;
-		case 'i':
-			pattlist_add(override->co_accepts, optarg);
-			break;
-		case 'k':
-			override->co_options |= CO_KEEPBADFILES;
-			overridemask |= CO_KEEPBADFILES;
-			break;
-		case 'l':
-			lockfile = optarg;
-			lflag = 1;
-			lockfd = open(lockfile,
-			    O_CREAT | O_WRONLY | O_TRUNC, 0700);
-			if (lockfd != -1) {
-				error = flock(lockfd, LOCK_EX | LOCK_NB);
-				if (error == -1 && errno == EWOULDBLOCK) {
-					if (lockfd != -1)
-						close(lockfd);
-					lprintf(-1, "\"%s\" is already locked "
-					    "by another process\n", lockfile);
-					return (1);
-				}
-			}
-			if (lockfd == -1 || error == -1) {
-				if (lockfd != -1)
-					close(lockfd);
-				lprintf(-1, "Error locking \"%s\": %s\n",
-				    lockfile, strerror(errno));
-				return (1);
-			}
-			lock = stream_open_fd(lockfd,
-			    NULL, stream_write_fd, NULL);
-			(void)stream_printf(lock, "%10ld\n", (long)getpid());
-			stream_close(lock);
-			break;
-		case 'L':
-			error = asciitoint(optarg, &verbose, 0);
-			if (error) {
-				lprintf(-1, "Invalid verbosity\n");
-				usage(argv0);
-				return (1);
-			}
-			break;
-		case 'p':
-			/* Use specified server port. */
-			error = asciitoint(optarg, &port, 0);
-			if (error) {
-				lprintf(-1, "Invalid server port\n");
-				usage(argv0);
-				return (1);
-			}
-			if (port <= 0 || port >= 65536) {
-				lprintf(-1, "Invalid port %d\n", port);
-				return (1);
-			}
-			if (port < 1024) {
-				lprintf(-1, "Reserved port %d not permitted\n",
-				    port);
-				return (1);
-			}
-			break;
-		case 'P':
-			/* For compatibility. */
-			if (strcmp(optarg, "m") != 0) {
-				lprintf(-1,
-				    "Client only supports multiplexed mode\n");
-				return (1);
-			}
-			break;
-		case 'r':
-			error = asciitoint(optarg, &retries, 0);
-			if (error || retries < 0) {
-				lprintf(-1, "Invalid retry limit\n");
-				usage(argv0);
-				return (1);
-			}
-			break;
-		case 's':
-			override->co_options |= CO_TRUSTSTATUSFILE;
-			overridemask |= CO_TRUSTSTATUSFILE;
-			break;
-		case 'v':
-			lprintf(0, "CVSup client written in C\n");
-			lprintf(0, "Software version: %s\n", PROTO_SWVER);
-			lprintf(0, "Protocol version: %d.%d\n",
-			    PROTO_MAJ, PROTO_MIN);
-			return (0);
-			break;
-		case 'z':
-			/* Force compression on all collections. */
-			override->co_options |= CO_COMPRESS;
-			overridemask |= CO_COMPRESS;
-			break;
-		case 'Z':
-			/* Disables compression on all collections. */
-			override->co_options &= ~CO_COMPRESS;
-			overridemask &= ~CO_COMPRESS;
-			break;
-		case '?':
-		default:
-			usage(argv0);
-			return (1);
-		}
-	}
-
-	argc -= optind;
-	argv += optind;
-
-	if (argc < 1) {
-		usage(argv0);
-		return (1);
-	}
-
-	file = argv[0];
-	lprintf(2, "Parsing supfile \"%s\"\n", file);
-	config = config_init(file, override, overridemask);
-	coll_free(override);
-	if (config == NULL)
-		return (1);
-
-	if (config_checkcolls(config) == 0) {
-		lprintf(-1, "No collections selected\n");
-		return (1);
-	}
-
-	if (laddr != NULL) {
-		config->laddr = laddr;
-		config->laddrlen = laddrlen;
-	}
-	config->deletelim = deletelim;
-	config->reqauth = reqauth;
-	lprintf(2, "Connecting to %s\n", config->host);
-
-	i = 0;
-	fattr_init();	/* Initialize the fattr API. */
-	timer = bt_new(300, 7200, 2.0, 0.1);
-	for (;;) {
-		status = proto_connect(config, family, port);
-		if (status == STATUS_SUCCESS) {
-			status = proto_run(config);
-			if (status != STATUS_TRANSIENTFAILURE)
-				break;
-		}
-		if (retries >= 0 && i >= retries)
-			break;
-		nexttry = time(0) + bt_get(timer);
-		localtime_r(&nexttry, &tm);
-		lprintf(1, "Will retry at %02d:%02d:%02d\n",
-		    tm.tm_hour, tm.tm_min, tm.tm_sec);
-		bt_pause(timer);
-		lprintf(1, "Retrying\n");
-		i++;
-	}
-	bt_free(timer);
-	fattr_fini();
-	if (lflag) {
-		unlink(lockfile);
-		flock(lockfd, LOCK_UN);
-		close(lockfd);
-	}
-	config_free(config);
-	if (status != STATUS_SUCCESS)
-		return (1);
-	return (0);
-}
diff --git a/usr.bin/csup/misc.c b/usr.bin/csup/misc.c
deleted file mode 100644
index f4170df9f734..000000000000
--- a/usr.bin/csup/misc.c
+++ /dev/null
@@ -1,644 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <pthread.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "fattr.h"
-#include "main.h"
-#include "misc.h"
-
-struct pattlist {
-	char **patterns;
-	size_t size;
-	size_t in;
-};
-
-struct backoff_timer {
-	time_t min;
-	time_t max;
-	time_t interval;
-	float backoff;
-	float jitter;
-};
-
-static void	bt_update(struct backoff_timer *);
-static void	bt_addjitter(struct backoff_timer *);
-
-int
-asciitoint(const char *s, int *val, int base)
-{
-	char *end;
-	long longval;
-
-	errno = 0;
-	longval = strtol(s, &end, base);
-	if (errno || *end != '\0')
-		return (-1);
-	if (longval > INT_MAX || longval < INT_MIN) {
-		errno = ERANGE;
-		return (-1);
-	}
-	*val = longval;
-	return (0);
-}
-
-int
-lprintf(int level, const char *fmt, ...)
-{
-	FILE *to;
-	va_list ap;
-	int ret;
-
-	if (level > verbose)
-		return (0);
-	if (level == -1)
-		to = stderr;
-	else
-		to = stdout;
-	va_start(ap, fmt);
-	ret = vfprintf(to, fmt, ap);
-	va_end(ap);
-	fflush(to);
-	return (ret);
-}
-
-/*
- * Compute the MD5 checksum of a file.  The md parameter must
- * point to a buffer containing at least MD5_DIGEST_SIZE bytes.
- *
- * Do not confuse OpenSSL's MD5_DIGEST_LENGTH with our own
- * MD5_DIGEST_SIZE macro.
- */
-int
-MD5_File(char *path, char *md)
-{
-	char buf[1024];
-	MD5_CTX ctx;
-	ssize_t n;
-	int fd;
-
-	fd = open(path, O_RDONLY);
-	if (fd == -1)
-		return (-1);
-	MD5_Init(&ctx);
-	while ((n = read(fd, buf, sizeof(buf))) > 0)
-		MD5_Update(&ctx, buf, n);
-	close(fd);
-	if (n == -1)
-		return (-1);
-	MD5_End(md, &ctx);
-	return (0);
-}
-
-/*
- * Wrapper around MD5_Final() that converts the 128 bits MD5 hash
- * to an ASCII string representing this value in hexadecimal.
- */
-void
-MD5_End(char *md, MD5_CTX *c)
-{
-	unsigned char md5[MD5_DIGEST_LENGTH];
-	const char hex[] = "0123456789abcdef";
-	int i, j;
-
-	MD5_Final(md5, c);
-	j = 0;
-	for (i = 0; i < MD5_DIGEST_LENGTH; i++) {
-		md[j++] = hex[md5[i] >> 4];
-		md[j++] = hex[md5[i] & 0xf];
-	}
-	md[j] = '\0';
-}
-
-int
-pathcmp(const char *s1, const char *s2)
-{
-	char c1, c2;
-
-	do {
-		c1 = *s1++;
-		if (c1 == '/')
-			c1 = 1;
-		c2 = *s2++;
-		if (c2 == '/')
-			c2 = 1;
-	} while (c1 == c2 && c1 != '\0');
-
-	return (c1 - c2);
-}
-
-size_t
-commonpathlength(const char *a, size_t alen, const char *b, size_t blen)
-{
-	size_t i, minlen, lastslash;
-
-	minlen = min(alen, blen);
-	lastslash = 0;
-	for (i = 0; i < minlen; i++) {
-		if (a[i] != b[i])
-			return (lastslash);
-		if (a[i] == '/') {
-			if (i == 0)	/* Include the leading slash. */
-				lastslash = 1;
-			else
-				lastslash = i;
-		}
-	}
-
-	/* One path is a prefix of the other/ */
-	if (alen > minlen) {		/* Path "b" is a prefix of "a". */
-		if (a[minlen] == '/')
-			return (minlen);
-		else
-			return (lastslash);
-	} else if (blen > minlen) {	/* Path "a" is a prefix of "b". */
-		if (b[minlen] == '/')
-			return (minlen);
-		else
-			return (lastslash);
-	}
-
-	/* The paths are identical. */
-	return (minlen);
-}
-
-const char *
-pathlast(const char *path)
-{
-	const char *s;
-
-	s = strrchr(path, '/');
-	if (s == NULL)
-		return (path);
-	return (++s);
-}
-
-int
-rcsdatetotm(const char *revdate, struct tm *tm)
-{
-	char *cp;
-	size_t len;
-
-	cp = strchr(revdate, '.');
-	if (cp == NULL)
-		return (-1);
-	len = cp - revdate;
-	if (len >= 4)
-		cp = strptime(revdate, "%Y.%m.%d.%H.%M.%S", tm);
-	else if (len == 2)
-		cp = strptime(revdate, "%y.%m.%d.%H.%M.%S", tm);
-	else
-		return (-1);
-	if (cp == NULL || *cp != '\0')
-		return (-1);
-	return (0);
-}
-
-time_t
-rcsdatetotime(const char *revdate)
-{
-	struct tm tm;
-	time_t t;
-	int error;
-
-	error = rcsdatetotm(revdate, &tm);
-	if (error)
-		return (error);
-	t = timegm(&tm);
-	return (t);
-}
-
-/*
- * Checks if a file is an RCS file.
- */
-int
-isrcs(const char *file, size_t *len)
-{
-	const char *cp;
-
-	if (file[0] == '/')
-		return (0);
-	cp = file;
-	while ((cp = strstr(cp, "..")) != NULL) {
-		if (cp == file || cp[2] == '\0' ||
-		    (cp[-1] == '/' && cp[2] == '/'))
-			return (0);
-		cp += 2;
-	}
-	*len = strlen(file);
-	if (*len < 2 || file[*len - 1] != 'v' || file[*len - 2] != ',') {
-		return (0);
-	}
-
-	return (1);
-}
-
-/*
- * Returns a buffer allocated with malloc() containing the absolute
- * pathname to the checkout file made from the prefix and the path
- * of the corresponding RCS file relatively to the prefix.  If the
- * filename is not an RCS filename, NULL will be returned.
- */
-char *
-checkoutpath(const char *prefix, const char *file)
-{
-	char *path;
-	size_t len;
-
-	if (!isrcs(file, &len))
-		return (NULL);
-	xasprintf(&path, "%s/%.*s", prefix, (int)len - 2, file);
-	return (path);
-}
-
-/*
- * Returns a cvs path allocated with malloc() containing absolute pathname to a
- * file in cvs mode which can reside in the attic. XXX: filename has really no
- * restrictions.
- */
-char *
-cvspath(const char *prefix, const char *file, int attic)
-{
-	const char *last;
-	char *path;
-
-	last = pathlast(file);
-	if (attic)
-		xasprintf(&path, "%s/%.*sAttic/%s", prefix, (int)(last - file),
-		    file, last);
-	else
-		xasprintf(&path, "%s/%s", prefix, file);
-
-	return (path);
-}
-
-/*
- * Regular or attic path if regular fails.
- * XXX: This should perhaps also check if the Attic file exists too, and return
- * NULL if not.
- */
-char *
-atticpath(const char *prefix, const char *file)
-{
-	char *path;
-
-	path = cvspath(prefix, file, 0);
-	if (access(path, F_OK) != 0) {
-		free(path);
-		path = cvspath(prefix, file, 1);
-	}
-	return (path);
-}
-
-int
-mkdirhier(char *path, mode_t mask)
-{
-	struct fattr *fa;
-	size_t i, last, len;
-	int error, finish, rv;
-
-	finish = 0;
-	last = 0;
-	len = strlen(path);
-	for (i = len - 1; i > 0; i--) {
-		if (path[i] == '/') {
-			path[i] = '\0';
-			if (access(path, F_OK) == 0) {
-				path[i] = '/';
-				break;
-			}
-			if (errno != ENOENT) {
-				path[i] = '/';
-				if (last == 0)
-					return (-1);
-				finish = 1;
-				break;
-			}
-			last = i;
-		}
-	}
-	if (last == 0)
-		return (0);
-
-	i = strlen(path);
-	fa = fattr_new(FT_DIRECTORY, -1);
-	fattr_mergedefault(fa);
-	fattr_umask(fa, mask);
-	while (i < len) {
-		if (!finish) {
-			rv = 0;
-			error = fattr_makenode(fa, path);
-			if (!error)
-				rv = fattr_install(fa, path, NULL);
-			if (error || rv == -1)
-				finish = 1;
-		}
-		path[i] = '/';
-		i += strlen(path + i);
-        }
-	assert(i == len);
-	if (finish)
-		return (-1);
-        return (0);
-}
-
-/*
- * Compute temporary pathnames.
- * This can look a bit like overkill but we mimic CVSup's behaviour.
- */
-#define	TEMPNAME_PREFIX		"#cvs.csup"
-
-static pthread_mutex_t tempname_mtx = PTHREAD_MUTEX_INITIALIZER;
-static pid_t tempname_pid = -1;
-static int tempname_count;
-
-char *
-tempname(const char *path)
-{
-	char *cp, *temp;
-	int count, error;
-
-	error = pthread_mutex_lock(&tempname_mtx);
-	assert(!error);
-	if (tempname_pid == -1) {
-		tempname_pid = getpid();
-		tempname_count = 0;
-	}
-	count = tempname_count++;
-	error = pthread_mutex_unlock(&tempname_mtx);
-	assert(!error);
-	cp = strrchr(path, '/');
-	if (cp == NULL)
-		xasprintf(&temp, "%s-%ld.%d", TEMPNAME_PREFIX,
-		    (long)tempname_pid, count);
-	else
-		xasprintf(&temp, "%.*s%s-%ld.%d", (int)(cp - path + 1), path,
-		    TEMPNAME_PREFIX, (long)tempname_pid, count);
-	return (temp);
-}
-
-void *
-xmalloc(size_t size)
-{
-	void *buf;
-
-	buf = malloc(size);
-	if (buf == NULL)
-		err(1, "malloc");
-	return (buf);
-}
-
-void *
-xrealloc(void *buf, size_t size)
-{
-
-	buf = realloc(buf, size);
-	if (buf == NULL)
-		err(1, "realloc");
-	return (buf);
-}
-
-char *
-xstrdup(const char *str)
-{
-	char *buf;
-
-	buf = strdup(str);
-	if (buf == NULL)
-		err(1, "strdup");
-	return (buf);
-}
-
-int
-xasprintf(char **ret, const char *format, ...)
-{
-	va_list ap;
-	int rv;
-
-	va_start(ap, format);
-	rv = vasprintf(ret, format, ap);
-	va_end(ap);
-	if (*ret == NULL)
-		err(1, "asprintf");
-	return (rv);
-}
-
-struct pattlist *
-pattlist_new(void)
-{
-	struct pattlist *p;
-
-	p = xmalloc(sizeof(struct pattlist));
-	p->size = 4;		/* Initial size. */
-	p->patterns = xmalloc(p->size * sizeof(char *));
-	p->in = 0;
-	return (p);
-}
-
-void
-pattlist_add(struct pattlist *p, const char *pattern)
-{
-
-	if (p->in == p->size) {
-		p->size *= 2;
-		p->patterns = xrealloc(p->patterns, p->size * sizeof(char *));
-	}
-	assert(p->in < p->size);
-	p->patterns[p->in++] = xstrdup(pattern);
-}
-
-char *
-pattlist_get(struct pattlist *p, size_t i)
-{
-
-	assert(i < p->in);
-	return (p->patterns[i]);
-}
-
-size_t
-pattlist_size(struct pattlist *p)
-{
-
-	return (p->in);
-}
-
-void
-pattlist_free(struct pattlist *p)
-{
-	size_t i;
-	
-	for (i = 0; i < p->in; i++)
-		free(p->patterns[i]);
-	free(p->patterns);
-	free(p);
-}
-
-/* Creates a backoff timer. */
-struct backoff_timer *
-bt_new(time_t min, time_t max, float backoff, float jitter)
-{
-	struct backoff_timer *bt;
-
-	bt = xmalloc(sizeof(struct backoff_timer));
-	bt->min = min;
-	bt->max = max;
-	bt->backoff = backoff;
-	bt->jitter = jitter;
-	bt->interval = min;
-	bt_addjitter(bt);
-	srandom(time(0));
-	return (bt);
-}
-
-/* Updates the backoff timer. */
-static void
-bt_update(struct backoff_timer *bt)
-{
-
-	bt->interval = (time_t)min(bt->interval * bt->backoff, bt->max);
-	bt_addjitter(bt);
-}
-
-/* Adds some jitter. */
-static void
-bt_addjitter(struct backoff_timer *bt)
-{
-	long mag;
-
-	mag = (long)(bt->jitter * bt->interval);
-	/* We want a random number between -mag and mag. */
-	bt->interval += (time_t)(random() % (2 * mag) - mag);
-}
-
-/* Returns the current timer value. */
-time_t
-bt_get(struct backoff_timer *bt)
-{
-
-	return (bt->interval);
-}
-
-/* Times out for bt->interval seconds. */
-void
-bt_pause(struct backoff_timer *bt)
-{
-
-	sleep(bt->interval);
-	bt_update(bt);
-}
-
-void
-bt_free(struct backoff_timer *bt)
-{
-
-	free(bt);
-}
-
-/* Compare two revisions. */
-int
-rcsnum_cmp(char *revision1, char *revision2)
-{
-        char *ptr1, *ptr2, *dot1, *dot2;
-	int num1len, num2len, ret;
-
-        ptr1 = revision1;
-        ptr2 = revision2;
-        while (*ptr1 != '\0' && *ptr2 != '\0') {
-                dot1 = strchr(ptr1, '.');
-                dot2 = strchr(ptr2, '.');
-                if (dot1 == NULL)
-                        dot1 = strchr(ptr1, '\0');
-                if (dot2 == NULL)
-                        dot2 = strchr(ptr2, '\0');
-
-		num1len = dot1 - ptr1;
-		num2len = dot2 - ptr2;
-                /* Check the distance between each, showing how many digits */
-                if (num1len > num2len)
-                        return (1);
-                else if (num1len < num2len)
-                        return (-1);
-
-                /* Equal distance means we must check each character. */
-		ret = strncmp(ptr1, ptr2, num1len);
-		if (ret != 0)
-			return (ret);
-		ptr1 = (*dot1 == '.') ? (dot1 + 1) : dot1;
-		ptr2 = (*dot2 == '.') ? (dot2 + 1) : dot2;
-        } 
-
-        if (*ptr1 != '\0' && *ptr2 == '\0')
-                return (1);
-        if (*ptr1 == '\0' && *ptr2 != '\0')
-                return (-1);
-        return (0);
-
-}
-
-/* Returns 0 if a rcsrev is not a trunk revision number. */
-int
-rcsrev_istrunk(char *revnum)
-{
-	char *tmp;
-
-	tmp = strchr(revnum, '.');
-	tmp++;
-	if (strchr(tmp, '.') != NULL)
-		return (0);
-	return (1);
-}
-
-/* Return prefix of rcsfile. */
-char *
-rcsrev_prefix(char *revnum)
-{
-	char *modrev, *pos;
-
-	modrev = xstrdup(revnum);
-	pos = strrchr(modrev, '.');
-	if (pos == NULL) {
-		free(modrev);
-		return (NULL);
-	}
-	*pos = '\0';
-	return (modrev);
-}
diff --git a/usr.bin/csup/misc.h b/usr.bin/csup/misc.h
deleted file mode 100644
index b01b77a382af..000000000000
--- a/usr.bin/csup/misc.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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 _MISC_H_
-#define _MISC_H_
-
-#include <sys/types.h>
-
-#ifdef __FreeBSD__
-#include <md5.h>
-#define	MD5_DIGEST_LENGTH	16
-#define	MD5_Init		MD5Init
-#define	MD5_Final		MD5Final
-#define	MD5_Update		MD5Update
-#else
-#include <openssl/md5.h>
-#endif
-
-/* If we're not compiling in a C99 environment, define the C99 types. */
-#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901
-
-#ifdef uint32_t
-#undef uint32_t
-#endif
-#define	uint32_t	u_int32_t
-
-#ifdef uint16_t
-#undef uint16_t
-#endif
-#define	uint16_t	u_int16_t
-
-#ifdef uint8_t
-#undef uint8_t
-#endif
-#define	uint8_t		u_int8_t
-
-#else
-#include <stdint.h>
-#endif
-
-/* This is a GCC-specific keyword but some other compilers (namely icc)
-   understand it, and the code won't work if we can't disable padding
-   anyways. */
-#undef __packed
-#define	__packed		__attribute__((__packed__))
-
-/* We explicitely don't define this with icc because it defines __GNUC__
-   but doesn't support it. */
-#undef __printflike
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && \
-    (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC__MINOR__ >= 7)
-#define	__printflike(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__printf__, fmtarg, firstvararg)))
-#else
-#define	__printflike(fmtarg, firstvararg)
-#endif
-
-/* Exit codes. */
-#define	STATUS_SUCCESS		0
-#define	STATUS_FAILURE		1
-#define	STATUS_TRANSIENTFAILURE	2
-#define	STATUS_INTERRUPTED	3
-
-struct config;
-struct stream;
-
-/* Thread parameters. */
-struct thread_args {
-	struct config *config;
-	struct stream *rd;
-	struct stream *wr;
-	int status;
-	char *errmsg;
-};
-
-/* Minimum size for MD5_File() and MD5_End() buffers. */
-#define	MD5_DIGEST_SIZE		33
-
-#define	min(a, b)		((a) > (b) ? (b) : (a))
-#define	max(a, b)		((a) < (b) ? (b) : (a))
-
-struct backoff_timer;
-struct pattlist;
-struct tm;
-
-int		 asciitoint(const char *, int *, int);
-int		 lprintf(int, const char *, ...) __printflike(2, 3);
-int		 MD5_File(char *, char *);
-void		 MD5_End(char *, MD5_CTX *);
-int		 rcsdatetotm(const char *, struct tm *);
-time_t		 rcsdatetotime(const char *);
-int		 pathcmp(const char *, const char *);
-size_t		 commonpathlength(const char *, size_t, const char *, size_t);
-const char	*pathlast(const char *);
-int		 isrcs(const char *, size_t *);
-char		*checkoutpath(const char *, const char *);
-char		*cvspath(const char *, const char *, int);
-char		*atticpath(const char *, const char *);
-char		*path_prefix(char *);
-char		*path_first(char *);
-int		 mkdirhier(char *, mode_t);
-char		*tempname(const char *);
-void		*xmalloc(size_t);
-void		*xrealloc(void *, size_t);
-char		*xstrdup(const char *);
-int		 xasprintf(char **, const char *, ...) __printflike(2, 3);
-int		 rcsnum_cmp(char *, char *);
-int		 rcsrev_istrunk(char *);
-char		*rcsrev_prefix(char *);
-
-struct pattlist		*pattlist_new(void);
-void			 pattlist_add(struct pattlist *, const char *);
-char			*pattlist_get(struct pattlist *, size_t);
-size_t			 pattlist_size(struct pattlist *);
-void			 pattlist_free(struct pattlist *);
-
-struct backoff_timer	*bt_new(time_t, time_t, float, float);
-time_t			 bt_get(struct backoff_timer *);
-void			 bt_pause(struct backoff_timer *);
-void			 bt_free(struct backoff_timer *);
-
-#endif /* !_MISC_H_ */
diff --git a/usr.bin/csup/mux.c b/usr.bin/csup/mux.c
deleted file mode 100644
index 9335fa988897..000000000000
--- a/usr.bin/csup/mux.c
+++ /dev/null
@@ -1,1202 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "misc.h"
-#include "mux.h"
-
-/*
- * Packet types.
- */
-#define	MUX_STARTUPREQ		0
-#define	MUX_STARTUPREP		1
-#define	MUX_CONNECT		2
-#define	MUX_ACCEPT		3
-#define	MUX_RESET		4
-#define	MUX_DATA		5
-#define	MUX_WINDOW		6
-#define	MUX_CLOSE		7
-
-/*
- * Header sizes.
- */
-#define	MUX_STARTUPHDRSZ	3
-#define	MUX_CONNECTHDRSZ	8
-#define	MUX_ACCEPTHDRSZ		8
-#define	MUX_RESETHDRSZ		2
-#define	MUX_DATAHDRSZ		4
-#define	MUX_WINDOWHDRSZ		6
-#define	MUX_CLOSEHDRSZ		2
-
-#define	MUX_PROTOVER		0		/* Protocol version. */
-
-struct mux_header {
-	uint8_t type;
-	union {
-		struct {
-			uint16_t version;
-		} __packed mh_startup;
-		struct {
-			uint8_t id;
-			uint16_t mss;
-			uint32_t window;
-		} __packed mh_connect;
-		struct {
-			uint8_t id;
-			uint16_t mss;
-			uint32_t window;
-		} __packed mh_accept;
-		struct {
-			uint8_t id;
-		} __packed mh_reset;
-		struct {
-			uint8_t id;
-			uint16_t len;
-		} __packed mh_data;
-		struct {
-			uint8_t id;
-			uint32_t window;
-		} __packed mh_window;
-		struct {
-			uint8_t id;
-		} __packed mh_close;
-	} mh_u;
-} __packed;
-
-#define	mh_startup		mh_u.mh_startup
-#define	mh_connect		mh_u.mh_connect
-#define	mh_accept		mh_u.mh_accept
-#define	mh_reset		mh_u.mh_reset
-#define	mh_data			mh_u.mh_data
-#define	mh_window		mh_u.mh_window
-#define	mh_close		mh_u.mh_close
-
-#define	MUX_MAXCHAN		2
-
-/* Channel states. */
-#define	CS_UNUSED		0
-#define	CS_LISTENING		1
-#define	CS_CONNECTING		2
-#define	CS_ESTABLISHED		3
-#define	CS_RDCLOSED		4
-#define	CS_WRCLOSED		5
-#define	CS_CLOSED		6
-
-/* Channel flags. */
-#define	CF_CONNECT		0x01
-#define	CF_ACCEPT		0x02
-#define	CF_RESET		0x04
-#define	CF_WINDOW		0x08
-#define	CF_DATA			0x10
-#define	CF_CLOSE		0x20
-
-#define	CHAN_SBSIZE		(16 * 1024)	/* Send buffer size. */
-#define	CHAN_RBSIZE		(16 * 1024)	/* Receive buffer size. */
-#define	CHAN_MAXSEGSIZE		1024		/* Maximum segment size. */
-
-/* Circular buffer. */
-struct buf {
-	uint8_t *data;
-	size_t size;
-	size_t in;
-	size_t out;
-};
-
-struct chan {
-	int		flags;
-	int		state;
-	pthread_mutex_t	lock;
-	struct mux	*mux;
-
-	/* Receiver state variables. */
-	struct buf	*recvbuf;
-	pthread_cond_t	rdready;
-	uint32_t	recvseq;
-	uint16_t	recvmss;
-
-	/* Sender state variables. */
-	struct buf	*sendbuf;
-	pthread_cond_t	wrready;
-	uint32_t	sendseq;
-	uint32_t	sendwin;
-	uint16_t	sendmss;
-};
-
-struct mux {
-	int		closed;
-	int		status;
-	int		socket;
-	pthread_mutex_t	lock;
-	pthread_cond_t	done;
-	struct chan	*channels[MUX_MAXCHAN];
-	int		nchans;
-
-	/* Sender thread data. */
-	pthread_t	sender;
-	pthread_cond_t	sender_newwork;
-	pthread_cond_t	sender_started;
-	int		sender_waiting;
-	int		sender_ready;
-	int		sender_lastid;
-
-	/* Receiver thread data. */
-	pthread_t	receiver;
-};
-
-static int		 sock_writev(int, struct iovec *, int);
-static int		 sock_write(int, void *, size_t);
-static ssize_t		 sock_read(int, void *, size_t);
-static int		 sock_readwait(int, void *, size_t);
-
-static int		 mux_init(struct mux *);
-static void		 mux_lock(struct mux *);
-static void		 mux_unlock(struct mux *);
-
-static struct chan	*chan_new(struct mux *);
-static struct chan	*chan_get(struct mux *, int);
-static struct chan	*chan_connect(struct mux *, int);
-static void		 chan_lock(struct chan *);
-static void		 chan_unlock(struct chan *);
-static int		 chan_insert(struct mux *, struct chan *);
-static void		 chan_free(struct chan *);
-
-static struct buf	*buf_new(size_t);
-static size_t		 buf_count(struct buf *);
-static size_t		 buf_avail(struct buf *);
-static void		 buf_get(struct buf *, void *, size_t);
-static void		 buf_put(struct buf *, const void *, size_t);
-static void		 buf_free(struct buf *);
-
-static void		 sender_wakeup(struct mux *);
-static void		*sender_loop(void *);
-static int		 sender_waitforwork(struct mux *, int *);
-static int		 sender_scan(struct mux *, int *);
-static void		 sender_cleanup(void *);
-
-static void		*receiver_loop(void *);
-
-static int
-sock_writev(int s, struct iovec *iov, int iovcnt)
-{
-	ssize_t nbytes;
-
-again:
-	nbytes = writev(s, iov, iovcnt);
-	if (nbytes != -1) {
-		while (nbytes > 0 && (size_t)nbytes >= iov->iov_len) {
-			nbytes -= iov->iov_len;
-			iov++;
-			iovcnt--;
-		}
-		if (nbytes == 0)
-			return (0);
-		iov->iov_len -= nbytes;
-		iov->iov_base = (char *)iov->iov_base + nbytes;
-	} else if (errno != EINTR) {
-		return (-1);
-	}
-	goto again;
-}
-
-static int
-sock_write(int s, void *buf, size_t size)
-{
-	struct iovec iov;
-	int ret;
-
-	iov.iov_base = buf;
-	iov.iov_len = size;
-	ret = sock_writev(s, &iov, 1);
-	return (ret);
-}
-
-static ssize_t
-sock_read(int s, void *buf, size_t size)
-{
-	ssize_t nbytes;
-
-again:
-	nbytes = read(s, buf, size);
-	if (nbytes == -1 && errno == EINTR)
-		goto again;
-	return (nbytes);
-}
-
-static int
-sock_readwait(int s, void *buf, size_t size)
-{
-	char *cp;
-	ssize_t nbytes;
-	size_t left;
-
-	cp = buf;
-	left = size;
-	while (left > 0) {
-		nbytes = sock_read(s, cp, left);
-		if (nbytes == 0) {
-			errno = ECONNRESET;
-			return (-1);
-		}
-		if (nbytes < 0)
-			return (-1);
-		left -= nbytes;
-		cp += nbytes;
-	}
-	return (0);
-}
-
-static void
-mux_lock(struct mux *m)
-{
-	int error;
-
-	error = pthread_mutex_lock(&m->lock);
-	assert(!error);
-}
-
-static void
-mux_unlock(struct mux *m)
-{
-	int error;
-
-	error = pthread_mutex_unlock(&m->lock);
-	assert(!error);
-}
-
-/* Create a TCP multiplexer on the given socket. */
-struct mux *
-mux_open(int sock, struct chan **chan)
-{
-	struct mux *m;
-	struct chan *chan0;
-	int error;
-
-	m = xmalloc(sizeof(struct mux));
-	memset(m->channels, 0, sizeof(m->channels));
-	m->nchans = 0;
-	m->closed = 0;
-	m->status = -1;
-	m->socket = sock;
-
-	m->sender_waiting = 0;
-	m->sender_lastid = 0;
-	m->sender_ready = 0;
-	pthread_mutex_init(&m->lock, NULL);
-	pthread_cond_init(&m->done, NULL);
-	pthread_cond_init(&m->sender_newwork, NULL);
-	pthread_cond_init(&m->sender_started, NULL);
-
-	error = mux_init(m);
-	if (error)
-		goto bad;
-	chan0 = chan_connect(m, 0);
-	if (chan0 == NULL)
-		goto bad;
-	*chan = chan0;
-	return (m);
-bad:
-	mux_shutdown(m, NULL, STATUS_FAILURE);
-	(void)mux_close(m);
-	return (NULL);
-}
-
-int
-mux_close(struct mux *m)
-{
-	struct chan *chan;
-	int i, status;
-
-	assert(m->closed);
-	for (i = 0; i < m->nchans; i++) {
-		chan = m->channels[i];
-		if (chan != NULL)
-			chan_free(chan);
-	}
-	pthread_cond_destroy(&m->sender_started);
-	pthread_cond_destroy(&m->sender_newwork);
-	pthread_cond_destroy(&m->done);
-	pthread_mutex_destroy(&m->lock);
-	status = m->status;
-	free(m);
-	return (status);
-}
-
-/* Close a channel. */
-int
-chan_close(struct chan *chan)
-{
-
-	chan_lock(chan);
-	if (chan->state == CS_ESTABLISHED) {
-		chan->state = CS_WRCLOSED;
-		chan->flags |= CF_CLOSE;
-	} else if (chan->state == CS_RDCLOSED) {
-		chan->state = CS_CLOSED;
-		chan->flags |= CF_CLOSE;
-	} else if (chan->state == CS_WRCLOSED || chan->state == CS_CLOSED) {
-		chan_unlock(chan);
-		return (0);
-	} else {
-		chan_unlock(chan);
-		return (-1);
-	}
-	chan_unlock(chan);
-	sender_wakeup(chan->mux);
-	return (0);
-}
-
-void
-chan_wait(struct chan *chan)
-{
-
-	chan_lock(chan);
-	while (chan->state != CS_CLOSED)
-		pthread_cond_wait(&chan->rdready, &chan->lock);
-	chan_unlock(chan);
-}
-
-/* Returns the ID of an available channel in the listening state. */
-int
-chan_listen(struct mux *m)
-{
-	struct chan *chan;
-	int i;
-
-	mux_lock(m);
-	for (i = 0; i < m->nchans; i++) {
-		chan = m->channels[i];
-		chan_lock(chan);
-		if (chan->state == CS_UNUSED) {
-			mux_unlock(m);
-			chan->state = CS_LISTENING;
-			chan_unlock(chan);
-			return (i);
-		}
-		chan_unlock(chan);
-	}
-	mux_unlock(m);
-	chan = chan_new(m);
-	chan->state = CS_LISTENING;
-	i = chan_insert(m, chan);
-	if (i == -1)
-		chan_free(chan);
-	return (i);
-}
-
-struct chan *
-chan_accept(struct mux *m, int id)
-{
-	struct chan *chan;
-
-	chan = chan_get(m, id);
-	while (chan->state == CS_LISTENING)
-		pthread_cond_wait(&chan->rdready, &chan->lock);
-	if (chan->state != CS_ESTABLISHED) {
-		errno = ECONNRESET;
-		chan_unlock(chan);
-		return (NULL);
-	}
-	chan_unlock(chan);
-	return (chan);
-}
-
-/* Read bytes from a channel. */
-ssize_t
-chan_read(struct chan *chan, void *buf, size_t size)
-{
-	char *cp;
-	size_t count, n;
-
-	cp = buf;
-	chan_lock(chan);
-	for (;;) {
-		if (chan->state == CS_RDCLOSED || chan->state == CS_CLOSED) {
-			chan_unlock(chan);
-			return (0);
-		}
-		if (chan->state != CS_ESTABLISHED &&
-		    chan->state != CS_WRCLOSED) {
-			chan_unlock(chan);
-			errno = EBADF;
-			return (-1);
-		}
-		count = buf_count(chan->recvbuf);
-		if (count > 0)
-			break;
-		pthread_cond_wait(&chan->rdready, &chan->lock);
-	}
-	n = min(count, size);
-	buf_get(chan->recvbuf, cp, n);
-	chan->recvseq += n;
-	chan->flags |= CF_WINDOW;
-	chan_unlock(chan);
-	/* We need to wake up the sender so that it sends a window update. */
-	sender_wakeup(chan->mux);
-	return (n);
-}
-
-/* Write bytes to a channel. */
-ssize_t
-chan_write(struct chan *chan, const void *buf, size_t size)
-{
-	const char *cp;
-	size_t avail, n, pos;
-
-	pos = 0;
-	cp = buf;
-	chan_lock(chan);
-	while (pos < size) {
-		for (;;) {
-			if (chan->state != CS_ESTABLISHED &&
-			    chan->state != CS_RDCLOSED) {
-				chan_unlock(chan);
-				errno = EPIPE;
-				return (-1);
-			}
-			avail = buf_avail(chan->sendbuf);
-			if (avail > 0)
-				break;
-			pthread_cond_wait(&chan->wrready, &chan->lock);
-		}
-		n = min(avail, size - pos);
-		buf_put(chan->sendbuf, cp + pos, n);
-		pos += n;
-	}
-	chan_unlock(chan);
-	sender_wakeup(chan->mux);
-	return (size);
-}
-
-/*
- * Internal channel API.
- */
-
-static struct chan *
-chan_connect(struct mux *m, int id)
-{
-	struct chan *chan;
-
-	chan = chan_get(m, id);
-	if (chan->state != CS_UNUSED) {
-		chan_unlock(chan);
-		return (NULL);
-	}
-	chan->state = CS_CONNECTING;
-	chan->flags |= CF_CONNECT;
-	chan_unlock(chan);
-	sender_wakeup(m);
-	chan_lock(chan);
-	while (chan->state == CS_CONNECTING)
-		pthread_cond_wait(&chan->wrready, &chan->lock);
-	if (chan->state != CS_ESTABLISHED) {
-		chan_unlock(chan);
-		return (NULL);
-	}
-	chan_unlock(chan);
-	return (chan);
-}
-
-/*
- * Get a channel from its ID, creating it if necessary.
- * The channel is returned locked.
- */
-static struct chan *
-chan_get(struct mux *m, int id)
-{
-	struct chan *chan;
-
-	assert(id < MUX_MAXCHAN);
-	mux_lock(m);
-	chan = m->channels[id];
-	if (chan == NULL) {
-		chan = chan_new(m);
-		m->channels[id] = chan;
-		m->nchans++;
-	}
-	chan_lock(chan);
-	mux_unlock(m);
-	return (chan);
-}
-
-/* Lock a channel. */
-static void
-chan_lock(struct chan *chan)
-{
-	int error;
-
-	error = pthread_mutex_lock(&chan->lock);
-	assert(!error);
-}
-
-/* Unlock a channel.  */
-static void
-chan_unlock(struct chan *chan)
-{
-	int error;
-
-	error = pthread_mutex_unlock(&chan->lock);
-	assert(!error);
-}
-
-/*
- * Create a new channel.
- */
-static struct chan *
-chan_new(struct mux *m)
-{
-	struct chan *chan;
-
-	chan = xmalloc(sizeof(struct chan));
-	chan->state = CS_UNUSED;
-	chan->flags = 0;
-	chan->mux = m;
-	chan->sendbuf = buf_new(CHAN_SBSIZE);
-	chan->sendseq = 0;
-	chan->sendwin = 0;
-	chan->sendmss = 0;
-	chan->recvbuf = buf_new(CHAN_RBSIZE);
-	chan->recvseq = 0;
-	chan->recvmss = CHAN_MAXSEGSIZE;
-	pthread_mutex_init(&chan->lock, NULL);
-	pthread_cond_init(&chan->rdready, NULL);
-	pthread_cond_init(&chan->wrready, NULL);
-	return (chan);
-}
-
-/* Free any resources associated with a channel. */
-static void
-chan_free(struct chan *chan)
-{
-
-	pthread_cond_destroy(&chan->rdready);
-	pthread_cond_destroy(&chan->wrready);
-	pthread_mutex_destroy(&chan->lock);
-	buf_free(chan->recvbuf);
-	buf_free(chan->sendbuf);
-	free(chan);
-}
-
-/* Insert the new channel in the channel list. */
-static int
-chan_insert(struct mux *m, struct chan *chan)
-{
-	int i;
-
-	mux_lock(m);
-	for (i = 0; i < MUX_MAXCHAN; i++) {
-		if (m->channels[i] == NULL) {
-			m->channels[i] = chan;
-			m->nchans++;
-			mux_unlock(m);
-			return (i);
-		}
-	}
-	errno = ENOBUFS;
-	return (-1);
-}
-
-/*
- * Initialize the multiplexer protocol.
- *
- * This means negotiating protocol version and starting
- * the receiver and sender threads.
- */
-static int
-mux_init(struct mux *m)
-{
-	struct mux_header mh;
-	int error;
-
-	mh.type = MUX_STARTUPREQ;
-	mh.mh_startup.version = htons(MUX_PROTOVER);
-	error = sock_write(m->socket, &mh, MUX_STARTUPHDRSZ);
-	if (error)
-		return (-1);
-	error = sock_readwait(m->socket, &mh, MUX_STARTUPHDRSZ);
-	if (error)
-		return (-1);
-	if (mh.type != MUX_STARTUPREP ||
-	    ntohs(mh.mh_startup.version) != MUX_PROTOVER)
-		return (-1);
-	mux_lock(m);
-	error = pthread_create(&m->sender, NULL, sender_loop, m);
-	if (error) {
-		mux_unlock(m);
-		return (-1);
-	}
-	/*
-	 * Make sure the sender thread has run and is waiting for new work
-	 * before going on.  Otherwise, it might lose the race and a
-	 * request, which will cause a deadlock.
-	 */
-	while (!m->sender_ready)
-		pthread_cond_wait(&m->sender_started, &m->lock);
-
-	mux_unlock(m);
-	error = pthread_create(&m->receiver, NULL, receiver_loop, m);
-	if (error)
-		return (-1);
-	return (0);
-}
-
-/*
- * Close all the channels, terminate the sender and receiver thread.
- * This is an important function because it is used every time we need
- * to wake up all the worker threads to abort the program.
- *
- * This function accepts an error message that will be printed if the
- * multiplexer wasn't already closed.  This is useful because it ensures
- * that only the first error message will be printed, and that it will
- * be printed before doing the actual shutdown work.  If this is a
- * normal shutdown, NULL can be passed instead.
- *
- * The "status" parameter of the first mux_shutdown() call is retained
- * and then returned by mux_close(),  so that the main thread can know
- * what type of error happened in the end, if any.
- */
-void
-mux_shutdown(struct mux *m, const char *errmsg, int status)
-{
-	pthread_t self, sender, receiver;
-	struct chan *chan;
-	const char *name;
-	void *val;
-	int i, ret;
-
-	mux_lock(m);
-	if (m->closed) {
-		mux_unlock(m);
-		return;
-	}
-	m->closed = 1;
-	m->status = status;
-	self = pthread_self();
-	sender = m->sender;
-	receiver = m->receiver;
-	if (errmsg != NULL) {
-		if (pthread_equal(self, receiver))
-			name = "Receiver";
-		else if (pthread_equal(self, sender))
-			name = "Sender";
-		else
-			name = NULL;
-		if (name == NULL)
-			lprintf(-1, "%s\n", errmsg);
-		else
-			lprintf(-1, "%s: %s\n", name, errmsg);
-	}
-
-	for (i = 0; i < MUX_MAXCHAN; i++) {
-		if (m->channels[i] != NULL) {
-			chan = m->channels[i];
-			chan_lock(chan);
-			if (chan->state != CS_UNUSED) {
-				chan->state = CS_CLOSED;
-				chan->flags = 0;
-				pthread_cond_broadcast(&chan->rdready);
-				pthread_cond_broadcast(&chan->wrready);
-			}
-			chan_unlock(chan);
-		}
-	}
-	mux_unlock(m);
-
-	if (!pthread_equal(self, receiver)) {
-		ret = pthread_cancel(receiver);
-		assert(!ret);
-		pthread_join(receiver, &val);
-		assert(val == PTHREAD_CANCELED);
-	}
-	if (!pthread_equal(self, sender)) {
-		ret = pthread_cancel(sender);
-		assert(!ret);
-		pthread_join(sender, &val);
-		assert(val == PTHREAD_CANCELED);
-	}
-}
-
-static void
-sender_wakeup(struct mux *m)
-{
-	int waiting;
-
-	mux_lock(m);
-	waiting = m->sender_waiting;
-	mux_unlock(m);
-	/*
-	 * We don't care about the race here: if the sender was
-	 * waiting and is not anymore, we'll just send a useless
-	 * signal; if he wasn't waiting then he won't go to sleep
-	 * before having sent what we want him to.
-	 */
-	if (waiting)
-		pthread_cond_signal(&m->sender_newwork);
-}
-
-static void *
-sender_loop(void *arg)
-{
-	struct iovec iov[3];
-	struct mux_header mh;
-	struct mux *m;
-	struct chan *chan;
-	struct buf *buf;
-	uint32_t winsize;
-	uint16_t hdrsize, size, len;
-	int error, id, iovcnt, what = 0;
-
-	m = (struct mux *)arg;
-	what = 0;
-again:
-	id = sender_waitforwork(m, &what);
-	chan = chan_get(m, id);
-	hdrsize = size = 0;
-	switch (what) {
-	case CF_CONNECT:
-		mh.type = MUX_CONNECT;
-		mh.mh_connect.id = id;
-		mh.mh_connect.mss = htons(chan->recvmss);
-		mh.mh_connect.window = htonl(chan->recvseq +
-		    chan->recvbuf->size);
-		hdrsize = MUX_CONNECTHDRSZ;
-		break;
-	case CF_ACCEPT:
-		mh.type = MUX_ACCEPT;
-		mh.mh_accept.id = id;
-		mh.mh_accept.mss = htons(chan->recvmss);
-		mh.mh_accept.window = htonl(chan->recvseq +
-		    chan->recvbuf->size);
-		hdrsize = MUX_ACCEPTHDRSZ;
-		break;
-	case CF_RESET:
-		mh.type = MUX_RESET;
-		mh.mh_reset.id = id;
-		hdrsize = MUX_RESETHDRSZ;
-		break;
-	case CF_WINDOW:
-		mh.type = MUX_WINDOW;
-		mh.mh_window.id = id;
-		mh.mh_window.window = htonl(chan->recvseq +
-		    chan->recvbuf->size);
-		hdrsize = MUX_WINDOWHDRSZ;
-		break;
-	case CF_DATA:
-		mh.type = MUX_DATA;
-		mh.mh_data.id = id;
-		size = min(buf_count(chan->sendbuf), chan->sendmss);
-		winsize = chan->sendwin - chan->sendseq;
-		if (winsize < size)
-			size = winsize;
-		mh.mh_data.len = htons(size);
-		hdrsize = MUX_DATAHDRSZ;
-		break;
-	case CF_CLOSE:
-		mh.type = MUX_CLOSE;
-		mh.mh_close.id = id;
-		hdrsize = MUX_CLOSEHDRSZ;
-		break;
-	}
-	if (size > 0) {
-		assert(mh.type == MUX_DATA);
-		/*
-		 * Older FreeBSD versions (and maybe other OSes) have the
-		 * iov_base field defined as char *.  Cast to char * to
-		 * silence a warning in this case.
-		 */
-		iov[0].iov_base = (char *)&mh;
-		iov[0].iov_len = hdrsize;
-		iovcnt = 1;
-		/* We access the buffer directly to avoid some copying. */
-		buf = chan->sendbuf;
-		len = min(size, buf->size + 1 - buf->out);
-		iov[iovcnt].iov_base = buf->data + buf->out;
-		iov[iovcnt].iov_len = len;
-		iovcnt++;
-		if (size > len) {
-			/* Wrapping around. */
-			iov[iovcnt].iov_base = buf->data;
-			iov[iovcnt].iov_len = size - len;
-			iovcnt++;
-		}
-		/*
-		 * Since we're the only thread sending bytes from the
-		 * buffer and modifying buf->out, it's safe to unlock
-		 * here during I/O.  It avoids keeping the channel lock
-		 * too long, since write() might block.
-		 */
-		chan_unlock(chan);
-		error = sock_writev(m->socket, iov, iovcnt);
-		if (error)
-			goto bad;
-		chan_lock(chan);
-		chan->sendseq += size;
-		buf->out += size;
-		if (buf->out > buf->size)
-			buf->out -= buf->size + 1;
-		pthread_cond_signal(&chan->wrready);
-		chan_unlock(chan);
-	} else {
-		chan_unlock(chan);
-		error = sock_write(m->socket, &mh, hdrsize);
-		if (error)
-			goto bad;
-	}
-	goto again;
-bad:
-	if (error == EPIPE)
-		mux_shutdown(m, strerror(errno), STATUS_TRANSIENTFAILURE);
-	else
-		mux_shutdown(m, strerror(errno), STATUS_FAILURE);
-	return (NULL);
-}
-
-static void
-sender_cleanup(void *arg)
-{
-	struct mux *m;
-
-	m = (struct mux *)arg;
-	mux_unlock(m);
-}
-
-static int
-sender_waitforwork(struct mux *m, int *what)
-{
-	int id;
-
-	mux_lock(m);
-	pthread_cleanup_push(sender_cleanup, m);
-	if (!m->sender_ready) {
-		pthread_cond_signal(&m->sender_started);
-		m->sender_ready = 1;
-	}
-	while ((id = sender_scan(m, what)) == -1) {
-		m->sender_waiting = 1;
-		pthread_cond_wait(&m->sender_newwork, &m->lock);
-	}
-	m->sender_waiting = 0;
-	pthread_cleanup_pop(1);
-	return (id);
-}
-
-/*
- * Scan for work to do for the sender.  Has to be called with
- * the multiplexer lock held.
- */
-static int
-sender_scan(struct mux *m, int *what)
-{
-	struct chan *chan;
-	int id;
-
-	if (m->nchans <= 0)
-		return (-1);
-	id = m->sender_lastid;
-	do {
-		id++;
-		if (id >= m->nchans)
-			id = 0;
-		chan = m->channels[id];
-		chan_lock(chan);
-		if (chan->state != CS_UNUSED) {
-			if (chan->sendseq != chan->sendwin &&
-			    buf_count(chan->sendbuf) > 0)
-				chan->flags |= CF_DATA;
-			if (chan->flags) {
-				/* By order of importance. */
-				if (chan->flags & CF_CONNECT)
-					*what = CF_CONNECT;
-				else if (chan->flags & CF_ACCEPT)
-					*what = CF_ACCEPT;
-				else if (chan->flags & CF_RESET)
-					*what = CF_RESET;
-				else if (chan->flags & CF_WINDOW)
-					*what = CF_WINDOW;
-				else if (chan->flags & CF_DATA)
-					*what = CF_DATA;
-				else if (chan->flags & CF_CLOSE)
-					*what = CF_CLOSE;
-				chan->flags &= ~*what;
-				chan_unlock(chan);
-				m->sender_lastid = id;
-				return (id);
-			}
-		}
-		chan_unlock(chan);
-	} while (id != m->sender_lastid);
-	return (-1);
-}
-
-/* Read the rest of a packet header depending on its type. */
-#define	SOCK_READREST(s, mh, hsize)	\
-    sock_readwait(s, (char *)&mh + sizeof(mh.type), (hsize) - sizeof(mh.type))
-
-void *
-receiver_loop(void *arg)
-{
-	struct mux_header mh;
-	struct mux *m;
-	struct chan *chan;
-	struct buf *buf;
-	uint16_t size, len;
-	int error;
-
-	m = (struct mux *)arg;
-	while ((error = sock_readwait(m->socket, &mh.type,
-	    sizeof(mh.type))) == 0) {
-		switch (mh.type) {
-		case MUX_CONNECT:
-			error = SOCK_READREST(m->socket, mh, MUX_CONNECTHDRSZ);
-			if (error)
-				goto bad;
-			chan = chan_get(m, mh.mh_connect.id);
-			if (chan->state == CS_LISTENING) {
-				chan->state = CS_ESTABLISHED;
-				chan->sendmss = ntohs(mh.mh_connect.mss);
-				chan->sendwin = ntohl(mh.mh_connect.window);
-				chan->flags |= CF_ACCEPT;
-				pthread_cond_signal(&chan->rdready);
-			} else
-				chan->flags |= CF_RESET;
-			chan_unlock(chan);
-			sender_wakeup(m);
-			break;
-		case MUX_ACCEPT:
-			error = SOCK_READREST(m->socket, mh, MUX_ACCEPTHDRSZ);
-			if (error)
-				goto bad;
-			chan = chan_get(m, mh.mh_accept.id);
-			if (chan->state == CS_CONNECTING) {
-				chan->sendmss = ntohs(mh.mh_accept.mss);
-				chan->sendwin = ntohl(mh.mh_accept.window);
-				chan->state = CS_ESTABLISHED;
-				pthread_cond_signal(&chan->wrready);
-				chan_unlock(chan);
-			} else {
-				chan->flags |= CF_RESET;
-				chan_unlock(chan);
-				sender_wakeup(m);
-			}
-			break;
-		case MUX_RESET:
-			error = SOCK_READREST(m->socket, mh, MUX_RESETHDRSZ);
-			if (error)
-				goto bad;
-			goto badproto;
-		case MUX_WINDOW:
-			error = SOCK_READREST(m->socket, mh, MUX_WINDOWHDRSZ);
-			if (error)
-				goto bad;
-			chan = chan_get(m, mh.mh_window.id);
-			if (chan->state == CS_ESTABLISHED ||
-			    chan->state == CS_RDCLOSED) {
-				chan->sendwin = ntohl(mh.mh_window.window);
-				chan_unlock(chan);
-				sender_wakeup(m);
-			} else {
-				chan_unlock(chan);
-			}
-			break;
-		case MUX_DATA:
-			error = SOCK_READREST(m->socket, mh, MUX_DATAHDRSZ);
-			if (error)
-				goto bad;
-			chan = chan_get(m, mh.mh_data.id);
-			len = ntohs(mh.mh_data.len);
-			buf = chan->recvbuf;
-			if ((chan->state != CS_ESTABLISHED &&
-			     chan->state != CS_WRCLOSED) ||
-			    (len > buf_avail(buf) ||
-			     len > chan->recvmss)) {
-				chan_unlock(chan);
-				goto badproto;
-				return (NULL);
-			}
-			/*
-			 * Similarly to the sender code, it's safe to
-			 * unlock the channel here.
-			 */
-			chan_unlock(chan);
-			size = min(buf->size + 1 - buf->in, len);
-			error = sock_readwait(m->socket,
-			    buf->data + buf->in, size);
-			if (error)
-				goto bad;
-			if (len > size) {
-				/* Wrapping around. */
-				error = sock_readwait(m->socket,
-				    buf->data, len - size);
-				if (error)
-					goto bad;
-			}
-			chan_lock(chan);
-			buf->in += len;
-			if (buf->in > buf->size)
-				buf->in -= buf->size + 1;
-			pthread_cond_signal(&chan->rdready);
-			chan_unlock(chan);
-			break;
-		case MUX_CLOSE:
-			error = SOCK_READREST(m->socket, mh, MUX_CLOSEHDRSZ);
-			if (error)
-				goto bad;
-			chan = chan_get(m, mh.mh_close.id);
-			if (chan->state == CS_ESTABLISHED)
-				chan->state = CS_RDCLOSED;
-			else if (chan->state == CS_WRCLOSED)
-				chan->state = CS_CLOSED;
-			else
-				goto badproto;
-			pthread_cond_signal(&chan->rdready);
-			chan_unlock(chan);
-			break;
-		default:
-			goto badproto;
-		}
-	}
-bad:
-	if (errno == ECONNRESET || errno == ECONNABORTED)
-		mux_shutdown(m, strerror(errno), STATUS_TRANSIENTFAILURE);
-	else
-		mux_shutdown(m, strerror(errno), STATUS_FAILURE);
-	return (NULL);
-badproto:
-	mux_shutdown(m, "Protocol error", STATUS_FAILURE);
-	return (NULL);
-}
-
-/*
- * Circular buffers API.
- */
-
-static struct buf *
-buf_new(size_t size)
-{
-	struct buf *buf;
-
-	buf = xmalloc(sizeof(struct buf));
-	buf->data = xmalloc(size + 1);
-	buf->size = size;
-	buf->in = 0;
-	buf->out = 0;
-	return (buf);
-}
-
-static void
-buf_free(struct buf *buf)
-{
-
-	free(buf->data);
-	free(buf);
-}
-
-/* Number of bytes stored in the buffer. */
-static size_t
-buf_count(struct buf *buf)
-{
-	size_t count;
-
-	if (buf->in >= buf->out)
-		count = buf->in - buf->out;
-	else
-		count = buf->size + 1 + buf->in - buf->out;
-	return (count);
-}
-
-/* Number of bytes available in the buffer. */
-static size_t
-buf_avail(struct buf *buf)
-{
-	size_t avail;
-
-	if (buf->out > buf->in)
-		avail = buf->out - buf->in - 1;
-	else
-		avail = buf->size + buf->out - buf->in;
-	return (avail);
-}
-
-static void
-buf_put(struct buf *buf, const void *data, size_t size)
-{
-	const char *cp;
-	size_t len;
-
-	assert(size > 0);
-	assert(buf_avail(buf) >= size);
-	cp = data;
-	len = buf->size + 1 - buf->in;
-	if (len < size) {
-		/* Wrapping around. */
-		memcpy(buf->data + buf->in, cp, len);
-		memcpy(buf->data, cp + len, size - len);
-	} else {
-		/* Not wrapping around. */
-		memcpy(buf->data + buf->in, cp, size);
-	}
-	buf->in += size;
-	if (buf->in > buf->size)
-		buf->in -= buf->size + 1;
-}
-
-static void
-buf_get(struct buf *buf, void *data, size_t size)
-{
-	char *cp;
-	size_t len;
-
-	assert(size > 0);
-	assert(buf_count(buf) >= size);
-	cp = data;
-	len = buf->size + 1 - buf->out;
-	if (len < size) {
-		/* Wrapping around. */
-		memcpy(cp, buf->data + buf->out, len);
-		memcpy(cp + len, buf->data, size - len);
-	} else {
-		/* Not wrapping around. */
-		memcpy(cp, buf->data + buf->out, size);
-	}
-	buf->out += size;
-	if (buf->out > buf->size)
-		buf->out -= buf->size + 1;
-}
diff --git a/usr.bin/csup/mux.h b/usr.bin/csup/mux.h
deleted file mode 100644
index ff36083c3573..000000000000
--- a/usr.bin/csup/mux.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2003-2004, Maxime Henrion <mux@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 _MUX_H_
-#define _MUX_H_
-
-struct mux;
-struct chan;
-
-struct mux	*mux_open(int, struct chan **);
-void		 mux_shutdown(struct mux *, const char *, int);
-int		 mux_close(struct mux *);
-
-void		 chan_wait(struct chan *);
-int		 chan_listen(struct mux *);
-struct chan	*chan_accept(struct mux *, int);
-ssize_t		 chan_read(struct chan *, void *, size_t);
-ssize_t		 chan_write(struct chan *, const void *, size_t);
-int		 chan_close(struct chan *);
-
-#endif /* !_MUX_H_ */
diff --git a/usr.bin/csup/pathcomp.c b/usr.bin/csup/pathcomp.c
deleted file mode 100644
index 380d04298542..000000000000
--- a/usr.bin/csup/pathcomp.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*-
- * Copyright (c) 2006, Maxime Henrion <mux@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 <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "misc.h"
-#include "pathcomp.h"
-
-struct pathcomp {
-	char *target;
-	size_t targetlen;
-	char *trashed;
-	char *prev;
-	size_t prevlen;
-	size_t goal;
-	size_t curlen;
-};
-
-struct pathcomp	*
-pathcomp_new(void)
-{
-	struct pathcomp *pc;
-
-	pc = xmalloc(sizeof(struct pathcomp));
-	pc->curlen = 0;
-	pc->target = NULL;
-	pc->targetlen = 0;
-	pc->trashed = NULL;
-	pc->prev = NULL;
-	pc->prevlen = 0;
-	return (pc);
-}
-
-int
-pathcomp_put(struct pathcomp *pc, int type, char *path)
-{
-	char *cp;
-
-	assert(pc->target == NULL);
-	if (*path == '/')
-		return (-1);
-
-	switch (type) {
-	case PC_DIRDOWN:
-		pc->target = path;
-		pc->targetlen = strlen(path);
-		break;
-	case PC_FILE:
-	case PC_DIRUP:
-		cp = strrchr(path, '/');
-		pc->target = path;
-		if (cp != NULL)
-			pc->targetlen = cp - path;
-		else
-			pc->targetlen = 0;
-		break;
-	}
-	if (pc->prev != NULL)
-		pc->goal = commonpathlength(pc->prev, pc->prevlen, pc->target,
-		    pc->targetlen);
-	else
-		pc->goal = 0;
-	if (pc->curlen == pc->goal)	/* No need to go up. */
-		pc->goal = pc->targetlen;
-	return (0);
-}
-
-int
-pathcomp_get(struct pathcomp *pc, int *type, char **name)
-{
-	char *cp;
-	size_t slashpos, start;
-
-	if (pc->curlen > pc->goal) {		/* Going up. */
-		assert(pc->prev != NULL);
-		pc->prev[pc->curlen] = '\0';
-		cp = pc->prev + pc->curlen - 1;
-		while (cp >= pc->prev) {
-			if (*cp == '/')
-				break;
-			cp--;
-		}
-		if (cp >= pc->prev)
-			slashpos = cp - pc->prev;
-		else
-			slashpos = 0;
-		pc->curlen = slashpos;
-		if (pc->curlen <= pc->goal) {	/* Done going up. */
-			assert(pc->curlen == pc->goal);
-			pc->goal = pc->targetlen;
-		}
-		*type = PC_DIRUP;
-		*name = pc->prev;
-		return (1);
-	} else if (pc->curlen < pc->goal) {	/* Going down. */
-		/* Restore the previously overwritten '/' character. */
-		if (pc->trashed != NULL) {
-			*pc->trashed = '/';
-			pc->trashed = NULL;
-		}
-		if (pc->curlen == 0)
-			start = pc->curlen;
-		else
-			start = pc->curlen + 1;
-		slashpos = start;
-		while (slashpos < pc->goal) {
-			if (pc->target[slashpos] == '/')
-				break;
-			slashpos++;
-		}
-		if (pc->target[slashpos] != '\0') {
-			assert(pc->target[slashpos] == '/');
-			pc->trashed = pc->target + slashpos;
-			pc->target[slashpos] = '\0';
-		}
-		pc->curlen = slashpos;
-		*type = PC_DIRDOWN;
-		*name = pc->target;
-		return (1);
-	} else {	/* Done. */
-		if (pc->target != NULL) {
-			if (pc->trashed != NULL) {
-				*pc->trashed = '/';
-				pc->trashed = NULL;
-			}
-			if (pc->prev != NULL)
-				free(pc->prev);
-			pc->prev = xmalloc(pc->targetlen + 1);
-			memcpy(pc->prev, pc->target, pc->targetlen);
-			pc->prev[pc->targetlen] = '\0';
-			pc->prevlen = pc->targetlen;
-			pc->target = NULL;
-			pc->targetlen = 0;
-		}
-		return (0);
-	}
-}
-
-void
-pathcomp_finish(struct pathcomp *pc)
-{
-
-	pc->target = NULL;
-	pc->targetlen = 0;
-	pc->goal = 0;
-}
-
-void
-pathcomp_free(struct pathcomp *pc)
-{
-
-	if (pc->prev != NULL)
-		free(pc->prev);
-	free(pc);
-}
diff --git a/usr.bin/csup/pathcomp.h b/usr.bin/csup/pathcomp.h
deleted file mode 100644
index 3cea41052f58..000000000000
--- a/usr.bin/csup/pathcomp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 2006, Maxime Henrion <mux@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 _PATHCOMP_H
-#define _PATHCOMP_H
-
-/* File types */
-#define	PC_DIRDOWN	0
-#define	PC_FILE		1
-#define	PC_DIRUP	2
-
-struct pathcomp;
-
-struct pathcomp	*pathcomp_new(void);
-int		 pathcomp_put(struct pathcomp *, int, char *);
-int		 pathcomp_get(struct pathcomp *, int *, char **);
-void		 pathcomp_finish(struct pathcomp *);
-void		 pathcomp_free(struct pathcomp *);
-
-#endif /* !_PATHCOMP_H */
diff --git a/usr.bin/csup/proto.c b/usr.bin/csup/proto.c
deleted file mode 100644
index 3b578e5a0d69..000000000000
--- a/usr.bin/csup/proto.c
+++ /dev/null
@@ -1,1006 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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/select.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/queue.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <inttypes.h>
-#include <netdb.h>
-#include <pthread.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "auth.h"
-#include "config.h"
-#include "detailer.h"
-#include "fattr.h"
-#include "fixups.h"
-#include "globtree.h"
-#include "keyword.h"
-#include "lister.h"
-#include "misc.h"
-#include "mux.h"
-#include "proto.h"
-#include "stream.h"
-#include "threads.h"
-#include "updater.h"
-
-struct killer {
-	pthread_t thread;
-	sigset_t sigset;
-	struct mux *mux;
-	int killedby;
-};
-
-static void		 killer_start(struct killer *, struct mux *);
-static void		*killer_run(void *);
-static void		 killer_stop(struct killer *);
-
-static int		 proto_waitconnect(int);
-static int		 proto_greet(struct config *);
-static int		 proto_negproto(struct config *);
-static int		 proto_fileattr(struct config *);
-static int		 proto_xchgcoll(struct config *);
-static struct mux	*proto_mux(struct config *);
-
-static int		 proto_escape(struct stream *, const char *);
-static void		 proto_unescape(char *);
-
-static int
-proto_waitconnect(int s)
-{
-	fd_set readfd;
-	socklen_t len;
-	int error, rv, soerror;
-
-	FD_ZERO(&readfd);
-	FD_SET(s, &readfd);
-
-	do {
-		rv = select(s + 1, &readfd, NULL, NULL, NULL);
-	} while (rv == -1 && errno == EINTR);
-	if (rv == -1)
-		return (-1);
-	/* Check that the connection was really successful. */
-	len = sizeof(soerror);
-	error = getsockopt(s, SOL_SOCKET, SO_ERROR, &soerror, &len);
-	if (error) {
-		/* We have no choice but faking an error here. */
-		errno = ECONNREFUSED;
-		return (-1);
-	}
-	if (soerror) {
-		errno = soerror;
-		return (-1);
-	}
-	return (0);
-}
-
-/* Connect to the CVSup server. */
-int
-proto_connect(struct config *config, int family, uint16_t port)
-{
-	char addrbuf[NI_MAXHOST];
-	/* Enough to hold sizeof("cvsup") or any port number. */
-	char servname[8];
-	struct addrinfo *res, *ai, hints;
-	int error, opt, s;
-
-	s = -1;
-	if (port != 0)
-		snprintf(servname, sizeof(servname), "%d", port);
-	else {
-		strncpy(servname, "cvsup", sizeof(servname) - 1);
-		servname[sizeof(servname) - 1] = '\0';
-	}
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = family;
-	hints.ai_socktype = SOCK_STREAM;
-	error = getaddrinfo(config->host, servname, &hints, &res);
-	/*
-	 * Try with the hardcoded port number for OSes that don't
-	 * have cvsup defined in the /etc/services file.
-	 */
-	if (error == EAI_SERVICE) {
-		strncpy(servname, "5999", sizeof(servname) - 1);
-		servname[sizeof(servname) - 1] = '\0';
-		error = getaddrinfo(config->host, servname, &hints, &res);
-	}
-	if (error) {
-		lprintf(0, "Name lookup failure for \"%s\": %s\n", config->host,
-		    gai_strerror(error));
-		return (STATUS_TRANSIENTFAILURE);
-	}
-	for (ai = res; ai != NULL; ai = ai->ai_next) {
-		s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-		if (s != -1) {
-			error = 0;
-			if (config->laddr != NULL) {
-				opt = 1;
-				(void)setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
-				    &opt, sizeof(opt));
-				error = bind(s, config->laddr,
-				    config->laddrlen);
-			}
-			if (!error) {
-				error = connect(s, ai->ai_addr, ai->ai_addrlen);
-				if (error && errno == EINTR)
-					error = proto_waitconnect(s);
-			}
-			if (error)
-				close(s);
-		}
-		(void)getnameinfo(ai->ai_addr, ai->ai_addrlen, addrbuf,
-		    sizeof(addrbuf), NULL, 0, NI_NUMERICHOST);
-		if (s == -1 || error) {
-			lprintf(0, "Cannot connect to %s: %s\n", addrbuf,
-			    strerror(errno));
-			continue;
-		}
-		lprintf(1, "Connected to %s\n", addrbuf);
-		freeaddrinfo(res);
-		config->socket = s;
-		return (STATUS_SUCCESS);
-	}
-	freeaddrinfo(res);
-	return (STATUS_TRANSIENTFAILURE);
-}
-
-/* Greet the server. */
-static int
-proto_greet(struct config *config)
-{
-	char *line, *cmd, *msg, *swver;
-	struct stream *s;
-
-	s = config->server;
-	line = stream_getln(s, NULL);
-	cmd = proto_get_ascii(&line);
-	if (cmd == NULL)
-		goto bad;
-	if (strcmp(cmd, "OK") == 0) {
-		(void)proto_get_ascii(&line);	/* major number */
-		(void)proto_get_ascii(&line);	/* minor number */
-		swver = proto_get_ascii(&line);
-	} else if (strcmp(cmd, "!") == 0) {
-		msg = proto_get_rest(&line);
-		if (msg == NULL)
-			goto bad;
-		lprintf(-1, "Rejected by server: %s\n", msg);
-		return (STATUS_TRANSIENTFAILURE);
-	} else
-		goto bad;
-	lprintf(2, "Server software version: %s\n",
-	    swver != NULL ? swver : ".");
-	return (STATUS_SUCCESS);
-bad:
-	lprintf(-1, "Invalid greeting from server\n");
-	return (STATUS_FAILURE);
-}
-
-/* Negotiate protocol version with the server. */
-static int
-proto_negproto(struct config *config)
-{
-	struct stream *s;
-	char *cmd, *line, *msg;
-	int error, maj, min;
-
-	s = config->server;
-	proto_printf(s, "PROTO %d %d %s\n", PROTO_MAJ, PROTO_MIN, PROTO_SWVER);
-	stream_flush(s);
-	line = stream_getln(s, NULL);
-	cmd = proto_get_ascii(&line);
-	if (cmd == NULL || line == NULL)
-		goto bad;
-	if (strcmp(cmd, "!") == 0) {
-		msg = proto_get_rest(&line);
-		lprintf(-1, "Protocol negotiation failed: %s\n", msg);
-		return (1);
-	} else if (strcmp(cmd, "PROTO") != 0)
-		goto bad;
-	error = proto_get_int(&line, &maj, 10);
-	if (!error)
-		error = proto_get_int(&line, &min, 10);
-	if (error)
-		goto bad;
-	if (maj != PROTO_MAJ || min != PROTO_MIN) {
-		lprintf(-1, "Server protocol version %d.%d not supported "
-		    "by client\n", maj, min);
-		return (STATUS_FAILURE);
-	}
-	return (STATUS_SUCCESS);
-bad:
-	lprintf(-1, "Invalid PROTO command from server\n");
-	return (STATUS_FAILURE);
-}
-
-/*
- * File attribute support negotiation.
- */
-static int
-proto_fileattr(struct config *config)
-{
-	fattr_support_t support;
-	struct stream *s;
-	char *line, *cmd;
-	int error, i, n, attr;
-
-	s = config->server;
-	lprintf(2, "Negotiating file attribute support\n");
-	proto_printf(s, "ATTR %d\n", FT_NUMBER);
-	for (i = 0; i < FT_NUMBER; i++)
-		proto_printf(s, "%x\n", fattr_supported(i));
-	proto_printf(s, ".\n");
-	stream_flush(s);
-	line = stream_getln(s, NULL);
-	if (line == NULL)
-		goto bad;
-	cmd = proto_get_ascii(&line);
-	error = proto_get_int(&line, &n, 10);
-	if (error || line != NULL || strcmp(cmd, "ATTR") != 0 || n > FT_NUMBER)
-		goto bad;
-	for (i = 0; i < n; i++) {
-		line = stream_getln(s, NULL);
-		if (line == NULL)
-			goto bad;
-		error = proto_get_int(&line, &attr, 16);
-		if (error)
-			goto bad;
-		support[i] = fattr_supported(i) & attr;
-	}
-	for (i = n; i < FT_NUMBER; i++)
-		support[i] = 0;
-	line = stream_getln(s, NULL);
-	if (line == NULL || strcmp(line, ".") != 0)
-		goto bad;
-	memcpy(config->fasupport, support, sizeof(config->fasupport));
-	return (STATUS_SUCCESS);
-bad:
-	lprintf(-1, "Protocol error negotiating attribute support\n");
-	return (STATUS_FAILURE);
-}
-
-/*
- * Exchange collection information.
- */
-static int
-proto_xchgcoll(struct config *config)
-{
-	struct coll *coll;
-	struct stream *s;
-	struct globtree *diraccept, *dirrefuse;
-	struct globtree *fileaccept, *filerefuse;
-	char *line, *cmd, *collname, *pat;
-	char *msg, *release, *ident, *rcskey, *prefix;
-	size_t i, len;
-	int error, flags, options;
-
-	s = config->server;
-	lprintf(2, "Exchanging collection information\n");
-	STAILQ_FOREACH(coll, &config->colls, co_next) {
-		if (coll->co_options & CO_SKIP)
-			continue;
-		proto_printf(s, "COLL %s %s %o %d\n", coll->co_name,
-		    coll->co_release, coll->co_umask, coll->co_options);
-		for (i = 0; i < pattlist_size(coll->co_accepts); i++) {
-		    proto_printf(s, "ACC %s\n",
-			pattlist_get(coll->co_accepts, i));
-		}
-		for (i = 0; i < pattlist_size(coll->co_refusals); i++) {
-		    proto_printf(s, "REF %s\n",
-			pattlist_get(coll->co_refusals, i));
-		}
-		proto_printf(s, ".\n");
-	}
-	proto_printf(s, ".\n");
-	stream_flush(s);
-
-	STAILQ_FOREACH(coll, &config->colls, co_next) {
-		if (coll->co_options & CO_SKIP)
-			continue;
-		coll->co_norsync = globtree_false();
-		line = stream_getln(s, NULL);
-		if (line == NULL)
-			goto bad;
-		cmd = proto_get_ascii(&line);
-		collname = proto_get_ascii(&line);
-		release = proto_get_ascii(&line);
-		error = proto_get_int(&line, &options, 10);
-		if (error || line != NULL)
-			goto bad;
-		if (strcmp(cmd, "COLL") != 0 ||
-		    strcmp(collname, coll->co_name) != 0 ||
-		    strcmp(release, coll->co_release) != 0)
-			goto bad;
-		coll->co_options =
-		    (coll->co_options | (options & CO_SERVMAYSET)) &
-		    ~(~options & CO_SERVMAYCLEAR);
-		while ((line = stream_getln(s, NULL)) != NULL) {
-		 	if (strcmp(line, ".") == 0)
-				break;
-			cmd = proto_get_ascii(&line);
-			if (cmd == NULL)
-				goto bad;
-			if (strcmp(cmd, "!") == 0) {
-				msg = proto_get_rest(&line);
-				if (msg == NULL)
-					goto bad;
-				lprintf(-1, "Server message: %s\n", msg);
-			} else if (strcmp(cmd, "PRFX") == 0) {
-				prefix = proto_get_ascii(&line);
-				if (prefix == NULL || line != NULL)
-					goto bad;
-				coll->co_cvsroot = xstrdup(prefix);
-			} else if (strcmp(cmd, "KEYALIAS") == 0) {
-				ident = proto_get_ascii(&line);
-				rcskey = proto_get_ascii(&line);
-				if (rcskey == NULL || line != NULL)
-					goto bad;
-				error = keyword_alias(coll->co_keyword, ident,
-				    rcskey);
-				if (error)
-					goto bad;
-			} else if (strcmp(cmd, "KEYON") == 0) {
-				ident = proto_get_ascii(&line);
-				if (ident == NULL || line != NULL)
-					goto bad;
-				error = keyword_enable(coll->co_keyword, ident);
-				if (error)
-					goto bad;
-			} else if (strcmp(cmd, "KEYOFF") == 0) {
-				ident = proto_get_ascii(&line);
-				if (ident == NULL || line != NULL)
-					goto bad;
-				error = keyword_disable(coll->co_keyword,
-				    ident);
-				if (error)
-					goto bad;
-			} else if (strcmp(cmd, "NORS") == 0) {
-				pat = proto_get_ascii(&line);
-				if (pat == NULL || line != NULL)
-					goto bad;
-				coll->co_norsync = globtree_or(coll->co_norsync,
-				    globtree_match(pat, FNM_PATHNAME));
-			} else if (strcmp(cmd, "RNORS") == 0) {
-				pat = proto_get_ascii(&line);
-				if (pat == NULL || line != NULL)
-					goto bad;
-				coll->co_norsync = globtree_or(coll->co_norsync,
-				    globtree_match(pat, FNM_PATHNAME |
-				    FNM_LEADING_DIR));
-			} else
-				goto bad;
-		}
-		if (line == NULL)
-			goto bad;
-		keyword_prepare(coll->co_keyword);
-
-		diraccept = globtree_true();
-		fileaccept = globtree_true();
-		dirrefuse = globtree_false();
-		filerefuse = globtree_false();
-
-		if (pattlist_size(coll->co_accepts) > 0) {
-			globtree_free(diraccept);
-			globtree_free(fileaccept);
-			diraccept = globtree_false();
-			fileaccept = globtree_false();
-			flags = FNM_PATHNAME | FNM_LEADING_DIR |
-			    FNM_PREFIX_DIRS;
-			for (i = 0; i < pattlist_size(coll->co_accepts); i++) {
-				pat = pattlist_get(coll->co_accepts, i);
-				diraccept = globtree_or(diraccept,
-				    globtree_match(pat, flags));
-
-				len = strlen(pat);
-				if (coll->co_options & CO_CHECKOUTMODE &&
-				    (len == 0 || pat[len - 1] != '*')) {
-					/* We must modify the pattern so that it
-					   refers to the RCS file, rather than
-					   the checked-out file. */
-					xasprintf(&pat, "%s,v", pat);
-					fileaccept = globtree_or(fileaccept,
-					    globtree_match(pat, flags));
-					free(pat);
-				} else {
-					fileaccept = globtree_or(fileaccept,
-					    globtree_match(pat, flags));
-				}
-			}
-		}
-
-		for (i = 0; i < pattlist_size(coll->co_refusals); i++) {
-			pat = pattlist_get(coll->co_refusals, i);
-			dirrefuse = globtree_or(dirrefuse,
-			    globtree_match(pat, 0));
-			len = strlen(pat);
-			if (coll->co_options & CO_CHECKOUTMODE &&
-			    (len == 0 || pat[len - 1] != '*')) {
-				/* We must modify the pattern so that it refers
-				   to the RCS file, rather than the checked-out
-				   file. */
-				xasprintf(&pat, "%s,v", pat);
-				filerefuse = globtree_or(filerefuse,
-				    globtree_match(pat, 0));
-				free(pat);
-			} else {
-				filerefuse = globtree_or(filerefuse,
-				    globtree_match(pat, 0));
-			}
-		}
-
-		coll->co_dirfilter = globtree_and(diraccept,
-		    globtree_not(dirrefuse));
-		coll->co_filefilter = globtree_and(fileaccept,
-		    globtree_not(filerefuse));
-
-		/* Set up a mask of file attributes that we don't want to sync
-		   with the server. */
-		if (!(coll->co_options & CO_SETOWNER))
-			coll->co_attrignore |= FA_OWNER | FA_GROUP;
-		if (!(coll->co_options & CO_SETMODE))
-			coll->co_attrignore |= FA_MODE;
-		if (!(coll->co_options & CO_SETFLAGS))
-			coll->co_attrignore |= FA_FLAGS;
-	}
-	return (STATUS_SUCCESS);
-bad:
-	lprintf(-1, "Protocol error during collection exchange\n");
-	return (STATUS_FAILURE);
-}
-
-static struct mux *
-proto_mux(struct config *config)
-{
-	struct mux *m;
-	struct stream *s, *wr;
-	struct chan *chan0, *chan1;
-	int id;
-
-	s = config->server;
-	lprintf(2, "Establishing multiplexed-mode data connection\n");
-	proto_printf(s, "MUX\n");
-	stream_flush(s);
-	m = mux_open(config->socket, &chan0);
-	if (m == NULL) {
-		lprintf(-1, "Cannot open the multiplexer\n");
-		return (NULL);
-	}
-	id = chan_listen(m);
-	if (id == -1) {
-		lprintf(-1, "ChannelMux.Listen failed: %s\n", strerror(errno));
-		mux_close(m);
-		return (NULL);
-	}
-	wr = stream_open(chan0, NULL, (stream_writefn_t *)chan_write, NULL);
-	proto_printf(wr, "CHAN %d\n", id);
-	stream_close(wr);
-	chan1 = chan_accept(m, id);
-	if (chan1 == NULL) {
-		lprintf(-1, "ChannelMux.Accept failed: %s\n", strerror(errno));
-		mux_close(m);
-		return (NULL);
-	}
-	config->chan0 = chan0;
-	config->chan1 = chan1;
-	return (m);
-}
-
-/*
- * Initializes the connection to the CVSup server, that is handle
- * the protocol negotiation, logging in, exchanging file attributes
- * support and collections information, and finally run the update
- * session.
- */
-int
-proto_run(struct config *config)
-{
-	struct thread_args lister_args;
-	struct thread_args detailer_args;
-	struct thread_args updater_args;
-	struct thread_args *args;
-	struct killer killer;
-	struct threads *workers;
-	struct mux *m;
-	int i, status;
-
-	/*
-	 * We pass NULL for the close() function because we'll reuse
-	 * the socket after the stream is closed.
-	 */
-	config->server = stream_open_fd(config->socket, stream_read_fd,
-	    stream_write_fd, NULL);
-	status = proto_greet(config);
-	if (status == STATUS_SUCCESS)
-		status = proto_negproto(config);
-	if (status == STATUS_SUCCESS)
-		status = auth_login(config);
-	if (status == STATUS_SUCCESS)
-		status = proto_fileattr(config);
-	if (status == STATUS_SUCCESS)
-		status = proto_xchgcoll(config);
-	if (status != STATUS_SUCCESS)
-		return (status);
-
-	/* Multi-threaded action starts here. */
-	m = proto_mux(config);
-	if (m == NULL)
-		return (STATUS_FAILURE);
-
-	stream_close(config->server);
-	config->server = NULL;
-	config->fixups = fixups_new();
-	killer_start(&killer, m);
-
-	/* Start the worker threads. */
-	workers = threads_new();
-	args = &lister_args;
-	args->config = config;
-	args->status = -1;
-	args->errmsg = NULL;
-	args->rd = NULL;
-	args->wr = stream_open(config->chan0,
-	    NULL, (stream_writefn_t *)chan_write, NULL);
-	threads_create(workers, lister, args);
-
-	args = &detailer_args;
-	args->config = config;
-	args->status = -1;
-	args->errmsg = NULL;
-	args->rd = stream_open(config->chan0,
-	    (stream_readfn_t *)chan_read, NULL, NULL);
-	args->wr = stream_open(config->chan1,
-	    NULL, (stream_writefn_t *)chan_write, NULL);
-	threads_create(workers, detailer, args);
-
-	args = &updater_args;
-	args->config = config;
-	args->status = -1;
-	args->errmsg = NULL;
-	args->rd = stream_open(config->chan1,
-	    (stream_readfn_t *)chan_read, NULL, NULL);
-	args->wr = NULL;
-	threads_create(workers, updater, args);
-
-	lprintf(2, "Running\n");
-	/* Wait for all the worker threads to finish. */
-	status = STATUS_SUCCESS;
-	for (i = 0; i < 3; i++) {
-		args = threads_wait(workers);
-		if (args->rd != NULL)
-			stream_close(args->rd);
-		if (args->wr != NULL)
-			stream_close(args->wr);
-		if (args->status != STATUS_SUCCESS) {
-			assert(args->errmsg != NULL);
-			if (status == STATUS_SUCCESS) {
-				status = args->status;
-				/* Shutdown the multiplexer to wake up all
-				   the other threads. */
-				mux_shutdown(m, args->errmsg, status);
-			}
-			free(args->errmsg);
-		}
-	}
-	threads_free(workers);
-	if (status == STATUS_SUCCESS) {
-		lprintf(2, "Shutting down connection to server\n");
-		chan_close(config->chan0);
-		chan_close(config->chan1);
-		chan_wait(config->chan0);
-		chan_wait(config->chan1);
-		mux_shutdown(m, NULL, STATUS_SUCCESS);
-	}
-	killer_stop(&killer);
-	fixups_free(config->fixups);
-	status = mux_close(m);
-	if (status == STATUS_SUCCESS) {
-		lprintf(1, "Finished successfully\n");
-	} else if (status == STATUS_INTERRUPTED) {
-		lprintf(-1, "Interrupted\n");
-		if (killer.killedby != -1)
-			kill(getpid(), killer.killedby);
-	}
-	return (status);
-}
-
-/*
- * Write a string into the stream, escaping characters as needed.
- * Characters escaped:
- *
- * SPACE	-> "\_"
- * TAB		->  "\t"
- * NEWLINE	-> "\n"
- * CR		-> "\r"
- * \		-> "\\"
- */
-static int
-proto_escape(struct stream *wr, const char *s)
-{
-	size_t len;
-	ssize_t n;
-	char c;
-
-	/* Handle characters that need escaping. */
-	do {
-		len = strcspn(s, " \t\r\n\\");
-		n = stream_write(wr, s, len);
-		if (n == -1)
-			return (-1);
-		c = s[len];
-		switch (c) {
-		case ' ':
-			n = stream_write(wr, "\\_", 2);
-			break;
-		case '\t':
-			n = stream_write(wr, "\\t", 2);
-			break;
-		case '\r':
-			n = stream_write(wr, "\\r", 2);
-			break;
-		case '\n':
-			n = stream_write(wr, "\\n", 2);
-			break;
-		case '\\':
-			n = stream_write(wr, "\\\\", 2);
-			break;
-		}
-		if (n == -1)
-			return (-1);
-		s += len + 1;
-	} while (c != '\0');
-	return (0);
-}
-
-/*
- * A simple printf() implementation specifically tailored for csup.
- * List of the supported formats:
- *
- * %c		Print a char.
- * %d or %i	Print an int as decimal.
- * %x		Print an int as hexadecimal.
- * %o		Print an int as octal.
- * %t		Print a time_t as decimal.
- * %s		Print a char * escaping some characters as needed.
- * %S		Print a char * without escaping.
- * %f		Print an encoded struct fattr *.
- * %F		Print an encoded struct fattr *, specifying the supported
- * 		attributes.
- */
-int
-proto_printf(struct stream *wr, const char *format, ...)
-{
-	fattr_support_t *support;
-	long long longval;
-	struct fattr *fa;
-	const char *fmt;
-	va_list ap;
-	char *cp, *s, *attr;
-	ssize_t n;
-	size_t size;
-	off_t off;
-	int rv, val, ignore;
-	char c;
-
-	n = 0;
-	rv = 0;
-	fmt = format;
-	va_start(ap, format);
-	while ((cp = strchr(fmt, '%')) != NULL) {
-		if (cp > fmt) {
-			n = stream_write(wr, fmt, cp - fmt);
-			if (n == -1) {
-				va_end(ap);
-				return (-1);
-			}
-		}
-		if (*++cp == '\0')
-			goto done;
-		switch (*cp) {
-		case 'c':
-			c = va_arg(ap, int);
-			rv = stream_printf(wr, "%c", c);
-			break;
-		case 'd':
-		case 'i':
-			val = va_arg(ap, int);
-			rv = stream_printf(wr, "%d", val);
-			break;
-		case 'x':
-			val = va_arg(ap, int);
-			rv = stream_printf(wr, "%x", val);
-			break;
-		case 'o':
-			val = va_arg(ap, int);
-			rv = stream_printf(wr, "%o", val);
-			break;
-		case 'O':
-			off = va_arg(ap, off_t);
-			rv = stream_printf(wr, "%" PRId64, off);
-			break;
-		case 'S':
-			s = va_arg(ap, char *);
-			assert(s != NULL);
-			rv = stream_printf(wr, "%s", s);
-			break;
-		case 's':
-			s = va_arg(ap, char *);
-			assert(s != NULL);
-			rv = proto_escape(wr, s);
-			break;
-		case 't':
-			longval = (long long)va_arg(ap, time_t);
-			rv = stream_printf(wr, "%lld", longval);
-			break;
-		case 'f':
-			fa = va_arg(ap, struct fattr *);
-			attr = fattr_encode(fa, NULL, 0);
-			rv = proto_escape(wr, attr);
-			free(attr);
-			break;
-		case 'F':
-			fa = va_arg(ap, struct fattr *);
-			support = va_arg(ap, fattr_support_t *);
-			ignore = va_arg(ap, int);
-			attr = fattr_encode(fa, *support, ignore);
-			rv = proto_escape(wr, attr);
-			free(attr);
-			break;
-		case 'z':
-			size = va_arg(ap, size_t);
-			rv = stream_printf(wr, "%zu", size);
-			break;
-
-		case '%':
-			n = stream_write(wr, "%", 1);
-			if (n == -1) {
-				va_end(ap);
-				return (-1);
-			}
-			break;
-		}
-		if (rv == -1) {
-			va_end(ap);
-			return (-1);
-		}
-		fmt = cp + 1;
-	}
-	if (*fmt != '\0') {
-		rv = stream_printf(wr, "%s", fmt);
-		if (rv == -1) {
-			va_end(ap);
-			return (-1);
-		}
-	}
-done:
-	va_end(ap);
-	return (0);
-}
-
-/*
- * Unescape the string, see proto_escape().
- */
-static void
-proto_unescape(char *s)
-{
-	char *cp, *cp2;
-
-	cp = s;
-	while ((cp = strchr(cp, '\\')) != NULL) {
-		switch (cp[1]) {
-		case '_':
-			*cp = ' ';
-			break;
-		case 't':
-			*cp = '\t';
-			break;
-		case 'r':
-			*cp = '\r';
-			break;
-		case 'n':
-			*cp = '\n';
-			break;
-		case '\\':
-			*cp = '\\';
-			break;
-		default:
-			*cp = *(cp + 1);
-		}
-		cp2 = ++cp;
-		while (*cp2 != '\0') {
-			*cp2 = *(cp2 + 1);
-			cp2++;
-		}
-	}
-}
-
-/*
- * Get an ascii token in the string.
- */
-char *
-proto_get_ascii(char **s)
-{
-	char *ret;
-
-	ret = strsep(s, " ");
-	if (ret == NULL)
-		return (NULL);
-	/* Make sure we disallow 0-length fields. */
-	if (*ret == '\0') {
-		*s = NULL;
-		return (NULL);
-	}
-	proto_unescape(ret);
-	return (ret);
-}
-
-/*
- * Get the rest of the string.
- */
-char *
-proto_get_rest(char **s)
-{
-	char *ret;
-
-	if (s == NULL)
-		return (NULL);
-	ret = *s;
-	proto_unescape(ret);
-	*s = NULL;
-	return (ret);
-}
-
-/*
- * Get an int token.
- */
-int
-proto_get_int(char **s, int *val, int base)
-{
-	char *cp;
-	int error;
-
-	cp = proto_get_ascii(s);
-	if (cp == NULL)
-		return (-1);
-	error = asciitoint(cp, val, base);
-	return (error);
-}
-
-/*
- * Get a size_t token.
- */
-int
-proto_get_sizet(char **s, size_t *val, int base)
-{
-	unsigned long long tmp;
-	char *cp, *end;
-
-	cp = proto_get_ascii(s);
-	if (cp == NULL)
-		return (-1);
-	errno = 0;
-	tmp = strtoll(cp, &end, base);
-	if (errno || *end != '\0')
-		return (-1);
-	*val = (size_t)tmp;
-	return (0);
-}
-
-/*
- * Get a time_t token.
- *
- * Ideally, we would use an intmax_t and strtoimax() here, but strtoll()
- * is more portable and 64bits should be enough for a timestamp.
- */
-int
-proto_get_time(char **s, time_t *val)
-{
-	long long tmp;
-	char *cp, *end;
-
-	cp = proto_get_ascii(s);
-	if (cp == NULL)
-		return (-1);
-	errno = 0;
-	tmp = strtoll(cp, &end, 10);
-	if (errno || *end != '\0')
-		return (-1);
-	*val = (time_t)tmp;
-	return (0);
-}
-
-/* Start the killer thread.  It is used to protect against some signals
-   during the multi-threaded run so that we can gracefully fail.  */
-static void
-killer_start(struct killer *k, struct mux *m)
-{
-	int error;
-
-	k->mux = m;
-	k->killedby = -1;
-	sigemptyset(&k->sigset);
-	sigaddset(&k->sigset, SIGINT);
-	sigaddset(&k->sigset, SIGHUP);
-	sigaddset(&k->sigset, SIGTERM);
-	sigaddset(&k->sigset, SIGPIPE);
-	pthread_sigmask(SIG_BLOCK, &k->sigset, NULL);
-	error = pthread_create(&k->thread, NULL, killer_run, k);
-	if (error)
-		err(1, "pthread_create");
-}
-
-/* The main loop of the killer thread. */
-static void *
-killer_run(void *arg)
-{
-	struct killer *k;
-	int error, sig, old;
-
-	k = arg;
-again:
-	error = sigwait(&k->sigset, &sig);
-	assert(!error);
-	if (sig == SIGINT || sig == SIGHUP || sig == SIGTERM) {
-		if (k->killedby == -1) {
-			k->killedby = sig;
-			/* Ensure we don't get canceled during the shutdown. */
-			pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old);
-			mux_shutdown(k->mux, "Cleaning up ...",
-			    STATUS_INTERRUPTED);
-			pthread_setcancelstate(old, NULL);
-		}
-	}
-	goto again;
-}
-
-/* Stop the killer thread. */
-static void
-killer_stop(struct killer *k)
-{
-	void *val;
-	int error;
-
-	error = pthread_cancel(k->thread);
-	assert(!error);
-	pthread_join(k->thread, &val);
-	assert(val == PTHREAD_CANCELED);
-	pthread_sigmask(SIG_UNBLOCK, &k->sigset, NULL);
-}
diff --git a/usr.bin/csup/proto.h b/usr.bin/csup/proto.h
deleted file mode 100644
index 0c4a78299f11..000000000000
--- a/usr.bin/csup/proto.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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 _PROTO_H_
-#define _PROTO_H_
-
-#include <time.h>
-
-#include "misc.h"
-
-#define	PROTO_MAJ	17
-#define	PROTO_MIN	0
-#define	PROTO_SWVER	"CSUP_1_0"
-
-struct stream;
-
-int	 proto_connect(struct config *, int, uint16_t);
-int	 proto_run(struct config *);
-int	 proto_printf(struct stream *, const char *, ...);
-char	*proto_get_ascii(char **);
-char	*proto_get_rest(char **);
-int	 proto_get_int(char **, int *, int);
-int	 proto_get_sizet(char **, size_t *, int);
-int	 proto_get_time(char **, time_t *);
-
-#endif /* !_PROTO_H_ */
diff --git a/usr.bin/csup/rcsfile.c b/usr.bin/csup/rcsfile.c
deleted file mode 100644
index 53979326ed47..000000000000
--- a/usr.bin/csup/rcsfile.c
+++ /dev/null
@@ -1,1414 +0,0 @@
-/*-
- * Copyright (c) 2007-2009, Ulf Lilleengen <lulf@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/queue.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "diff.h"
-#include "keyword.h"
-#include "misc.h"
-#include "proto.h"
-#include "rcsfile.h"
-#include "rcsparse.h"
-#include "stream.h"
-
-#define BUF_SIZE_DEFAULT	128
-
-/*
- * RCS parser library. This is the part of the library that handles the
- * importing, editing and exporting of RCS files. It currently supports only the
- * part of the RCS file specification that is needed for csup (for instance,
- * newphrases are not supported), and assumes that you can store the whole RCS
- * file in memory.
- */
-
-/*
- * Linked list for string tokens.
- */
-struct string {
-	char *str;
-	STAILQ_ENTRY(string) string_next;
-};
-
-/*
- * Linked list of tags and revision numbers, in the RCS file header.
- */
-struct tag {
-	char *tag;
-	char *revnum;
-	STAILQ_ENTRY(tag) tag_next;
-};
-
-/*
- * A RCS delta. The delta is identified by a revision number, and contains the
- * most important RCS attributes that is needed by csup. It also contains
- * pointers to other nodes in the RCS file delta structure.
- */
-struct delta {
-	char *revdate;
-	char *revnum;
-	char *author;
-	char *state;
-	struct buf *log;
-	struct buf *text;
-	int placeholder;
-	struct delta *diffbase;
-	struct delta *prev;
-
-	LIST_ENTRY(delta) delta_next;
-	STAILQ_ENTRY(delta) delta_prev;
-	LIST_ENTRY(delta) table_next;
-	STAILQ_ENTRY(delta) stack_next;
-	LIST_HEAD(, branch) branchlist;
-	LIST_ENTRY(delta) branch_next_date;
-};
-
-/*
- * A branch data structure containing information about deltas in the branch as
- * well as a base revision number.
- */
-struct branch {
-	char *revnum;
-	LIST_HEAD(, delta) deltalist; /* Next delta in our branch. */
-	LIST_ENTRY(branch) branch_next;
-};
-
-/*
- * The rcsfile structure is the "main" structure of the RCS parser library. It
- * contains administrative data as well as pointers to the deltas within the
- * file.
- */
-struct rcsfile {
-	char *name;
-	char *head;
-	char *branch;	/* Default branch. */
-	char *cvsroot;
-	char *colltag;
-	STAILQ_HEAD(, string) accesslist;
-	STAILQ_HEAD(, tag) taglist;
-	int strictlock;
-	char *comment;
-	int expand;
-	int ro;
-	struct branch *trunk; /* The tip delta. */
-
-	LIST_HEAD(, delta) deltatable;
-
-	char *desc;
-};
-
-static void		 rcsfile_freedelta(struct delta *);
-static void		 rcsfile_insertdelta(struct branch *, struct delta *,
-			     int);
-static struct delta	*rcsfile_createdelta(char *);
-static int		 rcsfile_write_deltatext(struct rcsfile *,
-			     struct stream *);
-static int		 rcsfile_puttext(struct rcsfile *, struct stream *,
-			     struct delta *, struct delta *);
-static struct branch	*rcsfile_getbranch(struct rcsfile *, char *);
-static void		 rcsfile_insertsorteddelta(struct rcsfile *,
-			     struct delta *);
-static struct stream 	*rcsfile_getdeltatext(struct rcsfile *, struct delta *,
-			     struct buf **);
-static int		 rcsdelta_writestring(char *, size_t, struct stream *);
-static void		 rcsdelta_insertbranch(struct delta *, struct branch *);
-
-/* Space formatting of RCS file. */
-const char *head_space = "\t";
-const char *branch_space = "\t";
-const char *tag_space = "\t";
-const char *date_space = "\t";
-const char *auth_space = "\t";
-const char *state_space = "\t";
-const char *next_space = "\t";
-const char *branches_space = "\t";
-const char *comment_space ="\t";
-const char *expand_space = "\t";
-
-void print_stream(struct stream *);
-
-/* Print the contents of a stream, for debugging. */
-void
-print_stream(struct stream *s)
-{
-	char *line;
-
-	line = stream_getln(s, NULL);
-	while (line != NULL) {
-		lprintf(-1, "%s\n", line);
-		line = stream_getln(s, NULL);
-	}
-	lprintf(-1, "\n");
-}
-
-/*
- * Parse rcsfile from path and return a pointer to it.
- */
-struct rcsfile *
-rcsfile_frompath(const char *path, const char *name, const char *cvsroot,
-    const char *colltag, int ro)
-{
-	struct rcsfile *rf;
-	FILE *infp;
-	int error;
-
-	if (path == NULL || name == NULL || cvsroot == NULL || colltag == NULL)
-		return (NULL);
-
-	rf = xmalloc(sizeof(struct rcsfile));
-	rf->name = xstrdup(name);
-	rf->cvsroot = xstrdup(cvsroot);
-	rf->colltag = xstrdup(colltag);
-
-	/* Initialize head branch. */
-	rf->trunk = xmalloc(sizeof(struct branch));
-	rf->trunk->revnum = xstrdup("1");
-	LIST_INIT(&rf->trunk->deltalist);
-	/* Initialize delta list. */
-	LIST_INIT(&rf->deltatable);
-	/* Initialize tag list. */
-	STAILQ_INIT(&rf->taglist);
-	/* Initialize accesslist. */
-	STAILQ_INIT(&rf->accesslist);
-
-	/* Initialize all fields. */
-	rf->head = NULL;
-	rf->branch = NULL;
-	rf->strictlock = 0;
-	rf->comment = NULL;
-	rf->expand = EXPAND_DEFAULT;
-	rf->desc = NULL;
-	rf->ro = ro;
-
-	infp = fopen(path, "r");
-	if (infp == NULL) {
-		lprintf(-1, "Cannot open \"%s\": %s\n", path, strerror(errno));
-		rcsfile_free(rf);
-		return (NULL);
-	}
-	error = rcsparse_run(rf, infp, ro);
-	fclose(infp);
-	if (error) {
-		lprintf(-1, "Error parsing \"%s\"\n", name);
-		rcsfile_free(rf);
-		return (NULL);
-	}
-	return (rf);
-}
-
-/*
- * Write content of rcsfile to server. Assumes we have a complete RCS file
- * loaded.
- */
-int
-rcsfile_send_details(struct rcsfile *rf, struct stream *wr)
-{
-	struct delta *d;
-	struct tag *t;
-	const char *keyword;
-	int error;
-
-	assert(rf != NULL);
-
-	error = proto_printf(wr, "V %s\n", rf->name);
-	if (error)
-		return(error);
-
-	/* Write default branch. */
-	if (rf->branch == NULL)
-		error = proto_printf(wr, "b\n");
-	else
-		error = proto_printf(wr, "B %s\n", rf->branch);
-	if (error)
-		return(error);
-
-	/* Write deltas to server. */
-	error = proto_printf(wr, "D\n");
-	if (error)
-		return(error);
-
-	LIST_FOREACH(d, &rf->deltatable, table_next) {
-		error = proto_printf(wr, "%s %s\n", d->revnum, d->revdate);
-		if (error)
-			return(error);
-	}
-	error = proto_printf(wr, ".\n");
-
-	if (error)
-		return(error);
-	/* Write expand. */
-	if (rf->expand != EXPAND_DEFAULT) {
-		keyword = keyword_encode_expand(rf->expand);
-		if (keyword != NULL) {
-			error = proto_printf(wr, "E %s\n",
-			    keyword_encode_expand(rf->expand));
-			if (error)
-				return(error);
-		}
-	}
-
-	/* Write tags to server. */
-	error = proto_printf(wr, "T\n");
-	if (error)
-		return(error);
-	STAILQ_FOREACH(t, &rf->taglist, tag_next) {
-		error = proto_printf(wr, "%s %s\n", t->tag, t->revnum);
-		if (error)
-			return(error);
-	}
-	error = proto_printf(wr, ".\n");
-	if (error)
-		return(error);
-	error = proto_printf(wr, ".\n");
-	return (error);
-}
-
-/*
- * Write a RCS file to disk represented by the destination stream. Keep track of
- * deltas with a stack and an inverted stack.
- */
-int
-rcsfile_write(struct rcsfile *rf, struct stream *dest)
-{
-	STAILQ_HEAD(, delta) deltastack;
-	STAILQ_HEAD(, delta) deltalist_inverted;
-	struct tag *t;
-	struct branch *b;
-	struct delta *d, *d_tmp, *d_next;
-	int error;
-
-	/* First write head. */
-	d = LIST_FIRST(&rf->trunk->deltalist);
-	if (stream_printf(dest, "head%s%s;\n", head_space, d->revnum) < 0)
-		return (-1);
-
-	/* Write branch, if we have. */
-	if (rf->branch != NULL) {
-		if (stream_printf(dest, "branch%s%s;\n", branch_space,
-		    rf->branch) < 0)
-			return (-1);
-	}
-
-	/* Write access. */
-	if (stream_printf(dest, "access") < 0)
-		return (-1);
-#if 0
-	if (!STAILQ_EMPTY(&rf->accesslist)) {
-		/*
-		 * XXX: Write out access. This doesn't seem to be necessary for
-		 * the time being.
-		 */
-	}
-#endif
-	if (stream_printf(dest, ";\n") < 0)
-		return (-1);
-
-	/* Write out taglist. */
-	if (stream_printf(dest, "symbols") < 0)
-		return (-1);
-	if (!STAILQ_EMPTY(&rf->taglist)) {
-		STAILQ_FOREACH(t, &rf->taglist, tag_next) {
-			if (stream_printf(dest, "\n%s%s:%s", tag_space, t->tag,
-			    t->revnum) < 0)
-				return (-1);
-		}
-	}
-
-	/* Write out locks and strict. */
-	if (stream_printf(dest, ";\nlocks;") < 0)
-		return (-1);
-	if (rf->strictlock) {
-		if (stream_printf(dest, " strict;") < 0)
-			return (-1);
-	}
-	if (stream_printf(dest, "\n") < 0)
-		return (-1);
-
-	/* Write out the comment. */
-	if (rf->comment != NULL) {
-		if (stream_printf(dest, "comment%s%s;\n", comment_space,
-		    rf->comment) < 0)
-			return (-1);
-	}
-	if (rf->expand != EXPAND_DEFAULT) {
-		if (stream_printf(dest, "expand%s@%s@;\n", expand_space,
-		    keyword_encode_expand(rf->expand)) < 0)
-			return (-1);
-	}
-
-	if (stream_printf(dest, "\n\n") < 0)
-		return (-1);
-
-	/*
-	 * Write out deltas. We use a stack where we push the appropriate deltas
-	 * that is to be written out during the loop.
-	 */
-	STAILQ_INIT(&deltastack);
-	d = LIST_FIRST(&rf->trunk->deltalist);
-	STAILQ_INSERT_HEAD(&deltastack, d, stack_next);
-	while (!STAILQ_EMPTY(&deltastack)) {
-		d = STAILQ_FIRST(&deltastack);
-		STAILQ_REMOVE_HEAD(&deltastack, stack_next);
-		/* Do not write out placeholders just to be safe. */
-		if (d->placeholder)
-			continue;
-		if (stream_printf(dest, "%s\n", d->revnum) < 0)
-			return (-1);
-		if (stream_printf(dest, "date%s%s;%sauthor %s;%sstate",
-		    date_space, d->revdate, auth_space, d->author,
-		    state_space) < 0)
-			return (-1);
-		if (d->state != NULL) {
-			if (stream_printf(dest, " %s", d->state) < 0)
-				return (-1);
-		}
-		if (stream_printf(dest, ";\nbranches") < 0)
-			return (-1);
-		/*
-		 * Write out our branches. Add them to a reversed list for use
-		 * later when we write out the text.
-		 */
-		STAILQ_INIT(&deltalist_inverted);
-		LIST_FOREACH(b, &d->branchlist, branch_next) {
-			d_tmp = LIST_FIRST(&b->deltalist);
-			STAILQ_INSERT_HEAD(&deltalist_inverted, d_tmp, delta_prev);
-			STAILQ_INSERT_HEAD(&deltastack, d_tmp, stack_next);
-		}
-
-		/* Push branch heads on stack. */
-		STAILQ_FOREACH(d_tmp, &deltalist_inverted, delta_prev) {
-			if (d_tmp == NULL) {
-				lprintf(2, "Empty branch!\n");
-				return (-1);
-			}
-			if (stream_printf(dest, "\n%s%s", branches_space,
-			    d_tmp->revnum) < 0)
-				return (-1);
-		}
-
-		if (stream_printf(dest, ";\nnext%s", next_space) < 0)
-			return (-1);
-		/* Push next delta on stack. */
-		d_next = LIST_NEXT(d, delta_next);
-		if (d_next != NULL) {
-			if (stream_printf(dest, "%s", d_next->revnum) < 0)
-				return (-1);
-			STAILQ_INSERT_HEAD(&deltastack, d_next, stack_next);
-		}
-		if (stream_printf(dest, ";\n\n") < 0)
-			return (-1);
-	}
-	/* Write out desc. */
-	if (stream_printf(dest, "\ndesc\n@@") < 0)
-		return (-1);
-	d = LIST_FIRST(&rf->trunk->deltalist);
-
-	/* Write out deltatexts. */
-	error = rcsfile_write_deltatext(rf, dest);
-	if (stream_printf(dest, "\n") < 0)
-		return (-1);
-	return (error);
-}
-
-/*
- * Write out deltatexts of a delta and it's subbranches recursively.
- */
-int
-rcsfile_write_deltatext(struct rcsfile *rf, struct stream *dest)
-{
-	STAILQ_HEAD(, delta) deltastack;
-	LIST_HEAD(, delta) branchlist_datesorted;
-	struct delta *d, *d_tmp, *d_next, *d_tmp2, *d_tmp3;
-	struct stream *in;
-	struct branch *b;
-	size_t size;
-	char *line;
-	int error;
-
-	error = 0;
-	STAILQ_INIT(&deltastack);
-	d = LIST_FIRST(&rf->trunk->deltalist);
-	d->prev = NULL;
-	STAILQ_INSERT_HEAD(&deltastack, d, stack_next);
-	while (!STAILQ_EMPTY(&deltastack)) {
-		d = STAILQ_FIRST(&deltastack);
-		STAILQ_REMOVE_HEAD(&deltastack, stack_next);
-		/* Do not write out placeholders just to be safe. */
-		if (d->placeholder)
-			return (0);
-		if (stream_printf(dest, "\n\n\n%s\n", d->revnum) < 0)
-			return (-1);
-		if (stream_printf(dest, "log\n@") < 0)
-			return (-1);
-		in = stream_open_buf(d->log);
-		line = stream_getln(in, &size);
-		while (line != NULL) {
-			if (stream_write(dest, line, size) == -1)
-				return (-1);
-			line = stream_getln(in, &size);
-		}
-		stream_close(in);
-		if (stream_printf(dest, "@\ntext\n@") < 0)
-			return (-1);
-		error = rcsfile_puttext(rf, dest, d, d->prev);
-		if (error)
-			return (error);
-		if (stream_printf(dest, "@") < 0)
-			return (-1);
-	
-		LIST_INIT(&branchlist_datesorted);
-		d_next = LIST_NEXT(d, delta_next);
-		if (d_next != NULL) {
-			d_next->prev = d;
-			/*
-			 * If it's trunk, treat it like the oldest, if not treat
-			 * it like a child.
-			 */
-			if (rcsrev_istrunk(d_next->revnum))
-				STAILQ_INSERT_HEAD(&deltastack, d_next,
-				    stack_next);
-			else
-				LIST_INSERT_HEAD(&branchlist_datesorted, d_next,
-				    branch_next_date);
-		}
-
-		/*
-		 * First, we need to sort our branches based on their date to
-		 * take into account some self-hacked RCS files.
-		 */
-		LIST_FOREACH(b, &d->branchlist, branch_next) {
-			d_tmp = LIST_FIRST(&b->deltalist);
-			if (LIST_EMPTY(&branchlist_datesorted)) {
-				LIST_INSERT_HEAD(&branchlist_datesorted, d_tmp,
-				    branch_next_date);
-				continue;
-			}
-
-			d_tmp2 = LIST_FIRST(&branchlist_datesorted);
-			if (rcsnum_cmp(d_tmp->revdate, d_tmp2->revdate) <= 0) {
-				LIST_INSERT_BEFORE(d_tmp2, d_tmp,
-				    branch_next_date);
-				continue;
-			}
-			while ((d_tmp3 = LIST_NEXT(d_tmp2, branch_next_date))
-			    != NULL) {
-				if (rcsnum_cmp(d_tmp->revdate, d_tmp3->revdate)
-				    <= 0)
-					break;
-				d_tmp2 = d_tmp3;
-			}
-			LIST_INSERT_AFTER(d_tmp2, d_tmp, branch_next_date);
-		}
-		/*
-		 * Invert the deltalist of a branch, since we're writing them
-		 * the opposite way. 
-		 */
-		LIST_FOREACH(d_tmp, &branchlist_datesorted, branch_next_date) {
-                        d_tmp->prev = d;
-			STAILQ_INSERT_HEAD(&deltastack, d_tmp, stack_next);
-		}
-	}
-	return (0);
-}
-
-/*
- * Generates text given a delta and a diffbase.
- */
-static int
-rcsfile_puttext(struct rcsfile *rf, struct stream *dest, struct delta *d,
-    struct delta *diffbase)
-{
-	struct stream *in, *rd, *orig;
-	struct keyword *k;
-	struct diffinfo dibuf, *di;
-	struct buf *b;
-	size_t size;
-	char *line;
-	int error;
-
-	di = &dibuf;
-	b = NULL;
-	error = 0;
-
-	/* Write if the diffbase is the previous */
-	if (d->diffbase == diffbase) {
-
-		/* Write out the text. */
-		in = stream_open_buf(d->text);
-		line = stream_getln(in, &size);
-		while (line != NULL) {
-			if (stream_write(dest, line, size) == -1) {
-				error = -1;
-				goto cleanup;
-			}
-			line = stream_getln(in, &size);
-		}
-		stream_close(in);
-	/* We need to apply diff to produce text, this is probably HEAD. */
-	} else if (diffbase == NULL) {
-		/* Apply diff. */
-		orig = rcsfile_getdeltatext(rf, d, &b);
-		if (orig == NULL) {
-			error = -1;
-			goto cleanup;
-		}
-		line = stream_getln(orig, &size);
-		while (line != NULL) {
-			if (stream_write(dest, line, size) == -1) {
-				error = -1;
-				goto cleanup;
-			}
-			line = stream_getln(orig, &size);
-		}
-		stream_close(orig);
-	/*
-	 * A new head was probably added, and now the previous HEAD must be
-	 * changed to include the diff instead.
-	 */
-	} else if (diffbase->diffbase == d) {
-		/* Get reverse diff. */
-		orig = rcsfile_getdeltatext(rf, d, &b);
-		if (orig == NULL) {
-			error = -1;
-			goto cleanup;
-		}
-		di->di_rcsfile = rf->name;
-		di->di_cvsroot = rf->cvsroot;
-		di->di_revnum = d->revnum;
-		di->di_revdate = d->revdate;
-		di->di_author = d->author;
-		di->di_tag = rf->colltag;
-		di->di_state = d->state;
-		di->di_expand = EXPAND_OLD;
-		k = keyword_new();
-
-		rd = stream_open_buf(diffbase->text);
-		error = diff_reverse(rd, orig, dest, k, di);
-		if (error) {
-			lprintf(-1, "Error applying reverse diff: %d\n", error);
-			goto cleanup;
-		}
-		keyword_free(k);
-		stream_close(rd);
-		stream_close(orig);
-	}
-cleanup:
-	if (b != NULL)
-		buf_free(b);
-	return (error);
-}
-
-/*
- * Return a stream with an applied diff of a delta.
- * XXX: extra overhead on the last apply. Could write directly to file, but
- * makes things complicated though.
- */
-static struct stream *
-rcsfile_getdeltatext(struct rcsfile *rf, struct delta *d, struct buf **buf_dest)
-{
-	struct diffinfo dibuf, *di;
-	struct stream *orig, *dest, *rd;
-	struct buf *buf_orig;
-	struct keyword *k;
-	int error;
-
-	buf_orig = NULL;
-	error = 0;
-
-	/*
-	 * If diffbase is NULL or we are head (the old head), we have a normal
-	 * complete deltatext.
-	 */
-	if (d->diffbase == NULL && !strcmp(rf->head, d->revnum)) {
-		orig = stream_open_buf(d->text);
-		return (orig);
-	}
-
-	di = &dibuf;
-	/* If not, we need to apply our diff to that of our diffbase. */
-	orig = rcsfile_getdeltatext(rf, d->diffbase, &buf_orig);
-	if (orig == NULL)
-		return (NULL);
-
-	/*
-	 * Now that we are sure we have a complete deltatext in ret, let's apply
-	 * our diff to it.
-	 */
-	*buf_dest = buf_new(BUF_SIZE_DEFAULT);
-	dest = stream_open_buf(*buf_dest);
-
-	di->di_rcsfile = rf->name;
-	di->di_cvsroot = rf->cvsroot;
-	di->di_revnum = d->revnum;
-	di->di_revdate = d->revdate;
-	di->di_author = d->author;
-	di->di_tag = rf->colltag;
-	di->di_state = d->state;
-	di->di_expand = EXPAND_OLD;
-	rd = stream_open_buf(d->text);
-	k = keyword_new();
-	error = diff_apply(rd, orig, dest, k, di, 0);
-	stream_flush(dest);
-	stream_close(rd);
-	stream_close(orig);
-	stream_close(dest);
-	keyword_free(k);
-	if (buf_orig != NULL)
-		buf_free(buf_orig);
-	if (error) {
-		lprintf(-1, "Error applying diff: %d\n", error);
-		return (NULL);
-	}
-	
-	/* Now reopen the stream for the reading. */
-	dest = stream_open_buf(*buf_dest);
-	return (dest);
-}
-
-/* Print content of rcsfile. Useful for debugging. */
-void
-rcsfile_print(struct rcsfile *rf)
-{
-	struct delta *d;
-	struct tag *t;
-	struct string *s;
-	struct stream *in;
-	char *line;
-
-	lprintf(1, "\n");
-	if (rf->name != NULL)
-		lprintf(1, "name: '%s'\n", rf->name);
-	if (rf->head != NULL)
-		lprintf(1, "head: '%s'\n", rf->head);
-	if (rf->branch != NULL)
-		lprintf(1, "branch: '%s'\n", rf->branch);
-	lprintf(1, "Access: ");
-	STAILQ_FOREACH(s, &rf->accesslist, string_next)
-		lprintf(1, "'%s' ", s->str);
-	lprintf(1, "\n");
-
-	/* Print all tags. */
-	STAILQ_FOREACH(t, &rf->taglist, tag_next) {
-		lprintf(1, "Tag: ");
-		if (t->tag != NULL)
-			lprintf(1, "name: %s ", t->tag);
-		if (t->revnum != NULL)
-			lprintf(1, "rev: %s", t->revnum);
-		lprintf(1, "\n");
-	}
-
-	if (rf->strictlock)
-		lprintf(1, "Strict!\n");
-	if (rf->comment != NULL)
-		lprintf(1, "comment: '%s'\n", rf->comment);
-	if (rf->expand != EXPAND_DEFAULT)
-		lprintf(1, "expand: '%s'\n", keyword_encode_expand(rf->expand));
-	
-	/* Print all deltas. */
-	LIST_FOREACH(d, &rf->deltatable, table_next) {
-		lprintf(1, "Delta: ");
-		if (d->revdate != NULL)
-			lprintf(1, "date: %s ", d->revdate);
-		if (d->revnum != NULL)
-			lprintf(1, "rev: %s", d->revnum);
-		if (d->author != NULL)
-			lprintf(1, "author: %s", d->author);
-		if (d->state != NULL)
-			lprintf(1, "state: %s", d->state);
-
-		lprintf(1, "Text:\n");
-		in = stream_open_buf(d->text);
-		line = stream_getln(in, NULL);
-		while (line != NULL) {
-			lprintf(1, "TEXT: %s\n", line);
-			line = stream_getln(in, NULL);
-		}
-		stream_close(in);
-		lprintf(1, "\n");
-	}
-
-	if (rf->desc != NULL)
-		lprintf(1, "desc: '%s'\n", rf->desc);
-}
-
-/* Free all memory associated with a struct rcsfile. */
-void
-rcsfile_free(struct rcsfile *rf)
-{
-	struct delta *d;
-	struct tag *t;
-	struct string *s;
-
-	if (rf->name != NULL)
-		free(rf->name);
-	if (rf->head != NULL)
-		free(rf->head);
-	if (rf->branch != NULL)
-		free(rf->branch);
-	if (rf->cvsroot != NULL)
-		free(rf->cvsroot);
-	if (rf->colltag != NULL)
-		free(rf->colltag);
-
-	/* Free all access ids. */
-	while (!STAILQ_EMPTY(&rf->accesslist)) {
-		s = STAILQ_FIRST(&rf->accesslist);
-		STAILQ_REMOVE_HEAD(&rf->accesslist, string_next);
-		if (s->str != NULL)
-			free(s->str);
-		free(s);
-	}
-
-	/* Free all tags. */
-	while (!STAILQ_EMPTY(&rf->taglist)) {
-		t = STAILQ_FIRST(&rf->taglist);
-		STAILQ_REMOVE_HEAD(&rf->taglist, tag_next);
-		if (t->tag != NULL)
-			free(t->tag);
-		if (t->revnum != NULL)
-			free(t->revnum);
-		free(t);
-	}
-
-	if (rf->comment != NULL)
-		free(rf->comment);
-
-	/* Free all deltas in global list */
-	while (!LIST_EMPTY(&rf->deltatable)) {
-		d = LIST_FIRST(&rf->deltatable);
-		if (!rf->ro)
-			LIST_REMOVE(d, delta_next);
-		LIST_REMOVE(d, table_next);
-		rcsfile_freedelta(d);
-	}
-
-	/* Free global branch. */
-	if (rf->trunk->revnum != NULL)
-		free(rf->trunk->revnum);
-	free(rf->trunk);
-
-	if (rf->desc != NULL)
-		free(rf->desc);
-
-	free(rf);
-}
-
-/*
- * Free a RCS delta.
- */
-static void
-rcsfile_freedelta(struct delta *d)
-{
-	struct branch *b;
-
-	if (d->revdate != NULL)
-		free(d->revdate);
-	if (d->revnum != NULL)
-		free(d->revnum);
-	if (d->author != NULL)
-		free(d->author);
-	if (d->state != NULL)
-		free(d->state);
-	if (d->log != NULL)
-		buf_free(d->log);
-	if (d->text != NULL)
-		buf_free(d->text);
-
-	/* Free all subbranches of a delta. */
-	while (!LIST_EMPTY(&d->branchlist)) {
-		b = LIST_FIRST(&d->branchlist);
-		LIST_REMOVE(b, branch_next);
-		free(b->revnum);
-		free(b);
-	}
-	free(d);
-}
-
-/*
- * Functions for editing RCS deltas.
- */
-
-/* Add a new entry to the access list. */
-void
-rcsfile_addaccess(struct rcsfile *rf, char *id)
-{
-	struct string *s;
-
-	s = xmalloc(sizeof(struct string));
-	s->str = xstrdup(id);
-	STAILQ_INSERT_TAIL(&rf->accesslist, s, string_next);
-}
-
-/* Add a tag to a RCS file. */
-void
-rcsfile_addtag(struct rcsfile *rf, char *tag, char *revnum)
-{
-	struct tag *t;
-
-	t = xmalloc(sizeof(struct tag));
-	t->tag = xstrdup(tag);
-	t->revnum = xstrdup(revnum);
-
-	STAILQ_INSERT_HEAD(&rf->taglist, t, tag_next);
-}
-
-/* Import a tag to a RCS file. */
-void
-rcsfile_importtag(struct rcsfile *rf, char *tag, char *revnum)
-{
-	struct tag *t;
-
-	t = xmalloc(sizeof(struct tag));
-	t->tag = xstrdup(tag);
-	t->revnum = xstrdup(revnum);
-
-	STAILQ_INSERT_TAIL(&rf->taglist, t, tag_next);
-}
-
-/*
- * Delete a revision from the global delta list and the branch it is in. Csup
- * will tell us to delete the tags involved.
- */
-void
-rcsfile_deleterev(struct rcsfile *rf, char *revname)
-{
-	struct delta *d;
-
-	d = rcsfile_getdelta(rf, revname);
-	if (!rf->ro)
-		LIST_REMOVE(d, delta_next);
-	LIST_REMOVE(d, table_next);
-	rcsfile_freedelta(d);
-}
-
-/* Delete a tag from the tag list. */
-void
-rcsfile_deletetag(struct rcsfile *rf, char *tag, char *revnum)
-{
-	struct tag *t;
-
-	STAILQ_FOREACH(t, &rf->taglist, tag_next) {
-		if ((strcmp(tag, t->tag) == 0) &&
-		    (strcmp(revnum, t->revnum) == 0)) {
-			STAILQ_REMOVE(&rf->taglist, t, tag, tag_next);
-			free(t->tag);
-			free(t->revnum);
-			free(t);
-			return;
-		}
-	}
-}
-
-/*
- * Searches the global deltalist for a delta.
- */
-struct delta *
-rcsfile_getdelta(struct rcsfile *rf, char *revnum)
-{
-	struct delta *d;
-
-	LIST_FOREACH(d, &rf->deltatable, table_next) {
-		if (strcmp(revnum, d->revnum) == 0)
-			return (d);
-	}
-	return (NULL);
-}
-
-/* Set rcsfile head. */
-void
-rcsfile_setval(struct rcsfile *rf, int field, char *val)
-{
-	size_t len;
-
-	switch (field) {
-	case RCSFILE_HEAD:
-		if (rf->head != NULL)
-			free(rf->head);
-		rf->head = xstrdup(val);
-		break;
-	case RCSFILE_BRANCH:
-		if (rf->branch != NULL)
-			free(rf->branch);
-		rf->branch = (val == NULL) ? NULL : xstrdup(val);
-		break;
-	case RCSFILE_STRICT:
-		if (val != NULL)
-			rf->strictlock = 1;
-		break;
-	case RCSFILE_COMMENT:
-		if (rf->comment != NULL)
-			free(rf->comment);
-		rf->comment = xstrdup(val);
-		break;
-	case RCSFILE_EXPAND:
-		len = strlen(val) - 1;
-		val++;
-		val[len - 1] = '\0';
-		rf->expand = keyword_decode_expand(val);
-		break;
-	case RCSFILE_DESC:
-		if (rf->desc != NULL)
-			free(rf->desc);
-		rf->desc = xstrdup(val);
-		break;
-	default:
-		lprintf(-1, "Setting invalid RCSfile value.\n");
-		break;
-	}
-}
-
-/* Create and initialize a delta. */
-static struct delta *
-rcsfile_createdelta(char *revnum)
-{
-	struct delta *d;
-
-	d = xmalloc(sizeof(struct delta));
-	d->revnum = xstrdup(revnum);
-	d->revdate = NULL;
-	d->state = NULL;
-	d->author = NULL;
-	d->log = buf_new(BUF_SIZE_DEFAULT);
-	d->text = buf_new(BUF_SIZE_DEFAULT);
-	d->diffbase = NULL;
-
-	LIST_INIT(&d->branchlist);
-	return (d);
-}
-
-/* Add a delta to a imported delta tree. Used by the updater. */
-struct delta *
-rcsfile_addelta(struct rcsfile *rf, char *revnum, char *revdate, char *author,
-    char *diffbase)
-{
-	struct branch *b;
-	struct delta *d, *d_bp, *d_next;
-	char *brev, *bprev;
-	int trunk;
-
-	d_next = NULL;
-	d = rcsfile_getdelta(rf, revnum);
-	if (d != NULL) {
-		lprintf(-1, "Delta %s already exists!\n", revnum);
-		return (NULL);
-	}
-	d = rcsfile_createdelta(revnum);
-	d->placeholder = 0;
-	d->revdate = xstrdup(revdate);
-	d->author = xstrdup(author);
-	d->diffbase = rcsfile_getdelta(rf, diffbase);
-
-	/* If it's trunk, insert it in the head branch list. */
-	b = rcsrev_istrunk(d->revnum) ? rf->trunk :
-	    rcsfile_getbranch(rf, d->revnum);
-
-	/*
-	 * We didn't find a branch, check if we can find a branchpoint and
-	 * create a branch there. 
-	 */
-	if (b == NULL) {
-		brev = rcsrev_prefix(d->revnum);
-		bprev = rcsrev_prefix(brev);
-
-		d_bp = rcsfile_getdelta(rf, bprev);
-		free(bprev);
-		if (d_bp == NULL) {
-			lprintf(-1, "No branch point for adding delta %s\n",
-			    d->revnum);
-			return (NULL);
-		}
-
-		/* Create the branch and insert in delta. */
-		b = xmalloc(sizeof(struct branch));
-		b->revnum = brev;
-		LIST_INIT(&b->deltalist);
-		rcsdelta_insertbranch(d_bp, b);
-	}
-
-	/* Insert both into the tree, and into the lookup list. */
-	trunk = rcsrev_istrunk(d->revnum);
-	rcsfile_insertdelta(b, d, trunk);
-	rcsfile_insertsorteddelta(rf, d);
-	return (d);
-}
-
-/* Adds a delta to a rcsfile struct. Used by the parser. */
-void
-rcsfile_importdelta(struct rcsfile *rf, char *revnum, char *revdate, char *author,
-    char *state, char *next)
-{
-	struct branch *b;
-	struct delta *d, *d_bp, *d_next;
-	char *brev, *bprev;
-	int trunk;
-
-	d_next = NULL;
-	d = rcsfile_getdelta(rf, revnum);
-
-	if (d == NULL) {
-		/* If not, we'll just create a new entry. */
-		d = rcsfile_createdelta(revnum);
-		d->placeholder = 0;
-	} else {
-		if (d->placeholder == 0) {
-			lprintf(-1, "Trying to import already existing delta\n");
-			return;
-		}
-	}
-	/*
-	 * If already exists, assume that only revnum is filled out, and set the
-	 * rest of the fields. This should be an OK assumption given that we can
-	 * be sure internally that the structure is sufficiently initialized so
-	 * we won't have any unfreed memory.
-	 */
-	d->revdate = xstrdup(revdate);
-	d->author = xstrdup(author);
-	if (state != NULL)
-		d->state = xstrdup(state);
-
-	/* If we have a next, create a placeholder for it. */
-	if (next != NULL) {
-		d_next = rcsfile_createdelta(next);
-		d_next->placeholder = 1;
-		/* Diffbase should be the previous. */
-		d_next->diffbase = d;
-	}
-
-	/* If we're opening read-only, do minimal work. */
-	if (rf->ro) {
-		if (!d->placeholder)
-			rcsfile_insertsorteddelta(rf, d);
-		else
-			d->placeholder = 0;
-		if (d_next != NULL)
-			rcsfile_insertsorteddelta(rf, d_next);
-		return;
-	}
-
-	/* If it's trunk, insert it in the head branch list. */
-	b = rcsrev_istrunk(d->revnum) ? rf->trunk : rcsfile_getbranch(rf,
-	    d->revnum);
-
-	/*
-	 * We didn't find a branch, check if we can find a branchpoint and
-	 * create a branch there. 
-	 */
-	if (b == NULL) {
-		brev = rcsrev_prefix(d->revnum);
-		bprev = rcsrev_prefix(brev);
-
-		d_bp = rcsfile_getdelta(rf, bprev);
-		free(bprev);
-		if (d_bp == NULL) {
-			lprintf(-1, "No branch point for adding delta %s\n",
-			    d->revnum);
-			return;
-		}
-
-		/* Create the branch and insert in delta. */
-		b = xmalloc(sizeof(struct branch));
-		b->revnum = brev;
-		LIST_INIT(&b->deltalist);
-		rcsdelta_insertbranch(d_bp, b);
-	}
-
-	/* Insert if not a placeholder. */ 
-	if (!d->placeholder) {
-		/* Insert both into the tree, and into the lookup list. */
-		if (rcsrev_istrunk(d->revnum))
-			rcsfile_insertdelta(b, d, 1);
-		else {
-			rcsfile_insertdelta(b, d, 0);
-			/*
-			 * On import we need to set the diffbase to our
-			 * branchpoint for writing out later.
-			 */
-			if (LIST_FIRST(&b->deltalist) == d) {
-				brev = rcsrev_prefix(d->revnum);
-				bprev = rcsrev_prefix(brev);
-				d_bp = rcsfile_getdelta(rf, bprev);
-				/* This should really not happen. */
-				assert(d_bp != NULL);
-				d->diffbase = d_bp;
-				free(brev);
-				free(bprev);
-			}
-		}
-		rcsfile_insertsorteddelta(rf, d);
-	} else /* Not a placeholder anymore. */ {
-		d->placeholder = 0;
-		/* Put it into the tree. */
-		trunk = rcsrev_istrunk(d->revnum);
-		rcsfile_insertdelta(b, d, trunk);
-	}
-
-	/* If we have a next, insert the placeholder into the lookup list. */
-	if (d_next != NULL)
-		rcsfile_insertsorteddelta(rf, d_next);
-}
-
-/*
- * Find the branch of a revision number.
- */
-static struct branch *
-rcsfile_getbranch(struct rcsfile *rf, char *revnum)
-{
-	struct branch *b;
-	struct delta *d;
-	char *branchrev, *bprev;
-
-	branchrev = rcsrev_prefix(revnum);
-	bprev = rcsrev_prefix(branchrev);
-	d = rcsfile_getdelta(rf, bprev);
-	free(bprev);
-	LIST_FOREACH(b, &d->branchlist, branch_next) {
-		if(rcsnum_cmp(b->revnum, branchrev) == 0) {
-			free(branchrev);
-			return (b);
-		}
-	}
-	free(branchrev);
-	return (NULL);
-}
-
-/* Insert a branch into a delta, sorted by branch revision date. */
-static void
-rcsdelta_insertbranch(struct delta *d, struct branch *b)
-{
-	struct branch *b_iter;
-
-	/* If it's empty, insert into head. */
-	if (LIST_EMPTY(&d->branchlist)) {
-		LIST_INSERT_HEAD(&d->branchlist, b, branch_next);
-		return;
-	}
-
-	/* Just put it in before the revdate that is lower. */
-	LIST_FOREACH(b_iter, &d->branchlist, branch_next) {
-		if (rcsnum_cmp(b->revnum, b_iter->revnum) > 0) {
-			LIST_INSERT_BEFORE(b_iter, b, branch_next);
-			return;
-		}
-		if (LIST_NEXT(b_iter, branch_next) == NULL)
-			break;
-	}
-	/* Insert after last element. */
-	LIST_INSERT_AFTER(b_iter, b, branch_next);
-}
-
-/* Insert a delta into the correct place in the table of the rcsfile. */
-static void
-rcsfile_insertsorteddelta(struct rcsfile *rf, struct delta *d)
-{
-	struct delta *d2;
-
-	/* If it's empty, insert into head. */
-	if (LIST_EMPTY(&rf->deltatable)) {
-		LIST_INSERT_HEAD(&rf->deltatable, d, table_next);
-		return;
-	}
-
-	/* Just put it in before the revdate that is lower. */
-	LIST_FOREACH(d2, &rf->deltatable, table_next) {
-		if (rcsnum_cmp(d->revnum, d2->revnum) <= 0) {
-			LIST_INSERT_BEFORE(d2, d, table_next);
-			return;
-		}
-		if (LIST_NEXT(d2, table_next) == NULL)
-			break;
-	}
-	/* Insert after last element. */
-	LIST_INSERT_AFTER(d2, d, table_next);
-}
-
-/*
- * Insert a delta into the correct place in branch. A trunk branch will have
- * different ordering scheme and be sorted by revision number, but a normal
- * branch will be sorted by date to maintain compatibility with branches that
- * is "hand-hacked".
- */
-static void
-rcsfile_insertdelta(struct branch *b, struct delta *d, int trunk)
-{
-	struct delta *d2;
-
-	/* If it's empty, insert into head. */
-	if (LIST_EMPTY(&b->deltalist)) {
-		LIST_INSERT_HEAD(&b->deltalist, d, delta_next);
-		return;
-	}
-
-	/*
-	 * Just put it in before the revnum that is lower. Sort trunk branch by
-	 * branchnum but the subbranches after deltadate.
-	 */
-	LIST_FOREACH(d2, &b->deltalist, delta_next) {
-		if (trunk) {
-			if (rcsnum_cmp(d->revnum, d2->revnum) >= 0) {
-				LIST_INSERT_BEFORE(d2, d, delta_next);
-				return;
-			}
-		} else {
-			/* XXX: here we depend on the date being set, but it
-			 * should be before this is called anyway. */
-			if (rcsnum_cmp(d->revnum, d2->revnum) < 0) {
-				LIST_INSERT_BEFORE(d2, d, delta_next);
-				return;
-			}
-		}
-		if (LIST_NEXT(d2, delta_next) == NULL)
-			break;
-	}
-	/* Insert after last element. */
-	LIST_INSERT_AFTER(d2, d, delta_next);
-}
-
-
-/* Add logtext to a delta. Assume the delta already exists. */
-int
-rcsdelta_addlog(struct delta *d, char *log, int len)
-{
-	struct stream *dest;
-	int nbytes;
-
-	assert(d != NULL);
-	/* Strip away '@' at beginning and end. */
-	log++;
-	len--;
-	log[len - 1] = '\0';
-	dest = stream_open_buf(d->log);
-	nbytes = stream_write(dest, log, len - 1);
-	stream_close(dest);
-	return ((nbytes == -1) ? -1 : 0);
-}
-
-/* Add deltatext to a delta. Assume the delta already exists. */
-int
-rcsdelta_addtext(struct delta *d, char *text, int len)
-{
-	struct stream *dest;
-	int nbytes;
-
-	assert(d != NULL);
-	/* Strip away '@' at beginning and end. */
-	text++;
-	len--;
-	text[len - 1] = '\0';
-
-	dest = stream_open_buf(d->text);
-	nbytes = stream_write(dest, text, len - 1);
-	stream_close(dest);
-	return ((nbytes == -1) ? -1 : 0);
-}
-
-/* Add a deltatext logline to a delta. */
-int
-rcsdelta_appendlog(struct delta *d, char *logline, size_t size)
-{
-	struct stream *dest;
-	int error;
-
-	assert(d != NULL);
-	dest = stream_open_buf(d->log);
-	error = rcsdelta_writestring(logline, size, dest);
-	stream_close(dest);
-	return (error);
-}
-
-/* Add a deltatext textline to a delta. */
-int
-rcsdelta_appendtext(struct delta *d, char *textline, size_t size)
-{
-	struct stream *dest;
-	int error;
-
-	assert(d != NULL);
-	dest = stream_open_buf(d->text);
-	error = rcsdelta_writestring(textline, size, dest);
-	stream_close(dest);
-	return (error);
-}
-
-static int 
-rcsdelta_writestring(char *textline, size_t size, struct stream *dest)
-{
-	char buf[3];
-	size_t i;
-	int count;
-
-	for (i = 0; i < size; i++) {
-		buf[0] = textline[i];
-		buf[1] = '\0';
-		count = 1;
-		/* Expand @'s */
-		if (buf[0] == '@') {
-			buf[1] = '@';
-			buf[2] = '\0';
-			count = 2;
-		}
-		if (stream_write(dest, buf, count) == -1)
-			return (-1);
-	}
-	return (0);
-}
-
-/* Set delta state. */
-void
-rcsdelta_setstate(struct delta *d, char *state)
-{
-
-	if (d->state != NULL)
-		free(state);
-	if (state != NULL) {
-		d->state = xstrdup(state);
-		return;
-	}
-	d->state = NULL;
-}
-
-/* Truncate the deltalog with a certain offset. */
-void
-rcsdelta_truncatelog(struct delta *d, off_t offset)
-{
-
-	stream_truncate_buf(d->log, offset);
-}
-
-/* Truncate the deltatext with a certain offset. */
-void
-rcsdelta_truncatetext(struct delta *d, off_t offset)
-{
-
-	stream_truncate_buf(d->text, offset);
-}
diff --git a/usr.bin/csup/rcsfile.h b/usr.bin/csup/rcsfile.h
deleted file mode 100644
index 096ac96e0478..000000000000
--- a/usr.bin/csup/rcsfile.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * Copyright (c) 2007-2009, Ulf Lilleengen <lulf@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 _RCSFILE_H_
-#define _RCSFILE_H_
-
-/* RCSFILE fields. */
-#define RCSFILE_HEAD	0
-#define RCSFILE_BRANCH	1
-#define RCSFILE_STRICT	2
-#define RCSFILE_COMMENT	3
-#define RCSFILE_EXPAND	4
-#define RCSFILE_DESC	5
-
-struct rcsfile;
-struct delta;
-struct stream;
-
-/* Fetching, sending and writing an RCS file. */
-struct rcsfile	*rcsfile_frompath(const char *, const char *, const char *,
-		    const char *, int);
-int		 rcsfile_send_details(struct rcsfile *, struct stream *);
-int		 rcsfile_write(struct rcsfile *, struct stream *);
-void		 rcsfile_print(struct rcsfile *);
-void		 rcsfile_free(struct rcsfile *);
-
-/* Used for adding and setting rcsfile values. */
-void		 rcsfile_addaccess(struct rcsfile *, char *);
-void		 rcsfile_addtag(struct rcsfile *, char *, char *);
-void		 rcsfile_importtag(struct rcsfile *, char *, char *);
-void		 rcsfile_deleterev(struct rcsfile *, char *);
-void		 rcsfile_deletetag(struct rcsfile *, char *, char *);
-struct delta	*rcsfile_getdelta(struct rcsfile *, char *);
-void		 rcsfile_setval(struct rcsfile *, int, char *);
-
-/* Functions used for operating on RCS deltas. */
-struct delta	*rcsfile_addelta(struct rcsfile *, char *, char *, char *,
-		    char *);
-void		 rcsfile_importdelta(struct rcsfile *, char *, char *, char *,
-		    char *, char *);
-
-int		 rcsdelta_addlog(struct delta *, char *, int);
-int		 rcsdelta_addtext(struct delta *, char *, int);
-int		 rcsdelta_appendlog(struct delta *, char *, size_t);
-int		 rcsdelta_appendtext(struct delta *, char *, size_t);
-void		 rcsdelta_setstate(struct delta *, char *);
-void		 rcsdelta_truncatetext(struct delta *, off_t);
-void		 rcsdelta_truncatelog(struct delta *, off_t);
-#endif /* !_RCSFILE_H_ */
diff --git a/usr.bin/csup/rcsparse.c b/usr.bin/csup/rcsparse.c
deleted file mode 100644
index bd46381033b4..000000000000
--- a/usr.bin/csup/rcsparse.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/*-
- * Copyright (c) 2008-2009, Ulf Lilleengen <lulf@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/queue.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "misc.h"
-#include "rcsfile.h"
-#include "rcsparse.h"
-#include "rcstokenizer.h"
-
-/*
- * This is an RCS-parser using lex for tokenizing and makes sure the RCS syntax
- * is correct as it constructs an RCS file that is used by csup.
- */
-
-static void	asserttoken(yyscan_t *, int);
-static int	parse_admin(struct rcsfile *, yyscan_t *);
-static int	parse_deltas(struct rcsfile *, yyscan_t *, int);
-static int	parse_deltatexts(struct rcsfile *, yyscan_t *, int);
-static char	*duptext(yyscan_t *, int *);
-
-struct string {
-	char *str;
-	STAILQ_ENTRY(string) next;
-};
-
-static void
-asserttoken(yyscan_t *sp, int token)
-{
-	int t;
-
-	t = token;
-	t = rcslex(*sp);
-	assert(t == token);
-}
-
-static char *
-duptext(yyscan_t *sp, int *arglen)
-{
-	char *tmp, *val;
-	int len;
-
-	tmp = rcsget_text(*sp);
-	len = rcsget_leng(*sp);
-	val = xmalloc(len + 1);
-	memcpy(val, tmp, len);
-	val[len] = '\0';
-	if (arglen != NULL)
-		*arglen = len;
-	return (val);
-}
-
-/*
- * Start up parser, and use the rcsfile hook to add objects.
- */
-int
-rcsparse_run(struct rcsfile *rf, FILE *infp, int ro)
-{
-	yyscan_t scanner;
-	char *desc;
-	int error, tok;
-	
-	error = 0;
-	rcslex_init(&scanner);
-	rcsset_in(infp, scanner);
-	tok = parse_admin(rf, &scanner);
-	tok = parse_deltas(rf, &scanner, tok);
-	assert(tok == KEYWORD);
-	asserttoken(&scanner, STRING);
-	desc = duptext(&scanner, NULL);
-	rcsfile_setval(rf, RCSFILE_DESC, desc);
-	free(desc);
-	tok = rcslex(scanner);
-	/* Parse deltatexts if we need to edit. */
-	if (!ro) {
-		error = parse_deltatexts(rf, &scanner, tok);
-		if (error)
-			return (error);
-	}
-	rcslex_destroy(scanner);
-	return (0);
-}
-
-/*
- * Parse the admin part of a RCS file.
- */
-static int
-parse_admin(struct rcsfile *rf, yyscan_t *sp)
-{
-	char *branch, *comment, *expand, *head, *id, *revnum, *tag, *tmp;
-	int strict, token;
-
-	strict = 0;
-	branch = NULL;
-
-	/* head {num}; */
-	asserttoken(sp, KEYWORD);
-	asserttoken(sp, NUM);
-	head = duptext(sp, NULL);
-	rcsfile_setval(rf, RCSFILE_HEAD, head);
-	free(head);
-	asserttoken(sp, SEMIC);
-
-	/* { branch {num}; } */
-	token = rcslex(*sp);
-	if (token == KEYWORD_TWO) {
-		asserttoken(sp, NUM);
-		branch = duptext(sp, NULL);
-		rcsfile_setval(rf, RCSFILE_BRANCH, branch);
-		free(branch);
-		asserttoken(sp, SEMIC);
-		token = rcslex(*sp);
-	}
-
-	/* access {id]*; */
-	assert(token == KEYWORD);
-	token = rcslex(*sp);
-	while (token == ID) {
-		id = duptext(sp, NULL);
-		rcsfile_addaccess(rf, id);
-		free(id);
-		token = rcslex(*sp);
-	}
-	assert(token == SEMIC);
-
-	/* symbols {sym : num}*; */
-	asserttoken(sp, KEYWORD);
-	token = rcslex(*sp);
-	while (token == ID) {
-		tag = duptext(sp, NULL);
-		asserttoken(sp, COLON);
-		asserttoken(sp, NUM);
-		revnum = duptext(sp, NULL);
-		rcsfile_importtag(rf, tag, revnum);
-		free(tag);
-		free(revnum);
-		token = rcslex(*sp);
-	}
-	assert(token == SEMIC);
-
-	/* locks {id : num}*; */
-	asserttoken(sp, KEYWORD);
-	token = rcslex(*sp);
-	while (token == ID) {
-		/* XXX: locks field is skipped */
-		asserttoken(sp, COLON);
-		asserttoken(sp, NUM);
-		token = rcslex(*sp);
-	}
-	assert(token == SEMIC);
-	token = rcslex(*sp);
-	while (token == KEYWORD) {
-		tmp = rcsget_text(*sp);
-
-		/* {strict  ;} */
-		if (!strcmp(tmp, "strict")) {
-			rcsfile_setval(rf, RCSFILE_STRICT, tmp);
-			asserttoken(sp, SEMIC);
-		/* { comment {string}; } */
-		} else if (!strcmp(tmp, "comment")) {
-			token = rcslex(*sp);
-			if (token == STRING) {
-				comment = duptext(sp, NULL);
-				rcsfile_setval(rf, RCSFILE_COMMENT, comment);
-				free(comment);
-			}
-			asserttoken(sp, SEMIC);
-		/* { expand {string}; } */
-		} else if (!strcmp(tmp, "expand")) {
-			token = rcslex(*sp);
-			if (token == STRING) {
-				expand = duptext(sp, NULL);
-				rcsfile_setval(rf, RCSFILE_EXPAND, expand);
-				free(expand);
-			}
-			asserttoken(sp, SEMIC);
-		} 
-		/* {newphrase }* */
-		token = rcslex(*sp);
-		while (token == ID) {
-			token = rcslex(*sp);
-			/* XXX: newphrases ignored */
-			while (token == ID || token == NUM || token == STRING ||
-			    token == COLON) {
-				token = rcslex(*sp);
-			}
-			asserttoken(sp, SEMIC);
-			token = rcslex(*sp);
-		}
-	}
-	return (token);
-}
-
-/*
- * Parse RCS deltas.
- */
-static int
-parse_deltas(struct rcsfile *rf, yyscan_t *sp, int token)
-{
-	STAILQ_HEAD(, string) branchlist;
-	char *revnum, *revdate, *author, *state, *next;
-
-	/* In case we don't have deltas. */
-	if (token != NUM)
-		return (token);
-	do {
-		next = NULL;
-		state = NULL;
-
-		/* num */
-		assert(token == NUM);
-		revnum = duptext(sp, NULL);
-		/* date num; */
-		asserttoken(sp, KEYWORD);
-		asserttoken(sp, NUM);
-		revdate = duptext(sp, NULL);
-		asserttoken(sp, SEMIC);
-		/* author id; */
-		asserttoken(sp, KEYWORD);
-		asserttoken(sp, ID);
-		author = duptext(sp, NULL);
-		asserttoken(sp, SEMIC);
-		/* state {id}; */
-		asserttoken(sp, KEYWORD);
-		token = rcslex(*sp);
-		if (token == ID) {
-			state = duptext(sp, NULL);
-			token = rcslex(*sp);
-		}
-		assert(token == SEMIC);
-		/* branches {num}*; */
-		asserttoken(sp, KEYWORD);
-		token = rcslex(*sp);
-		STAILQ_INIT(&branchlist);
-		while (token == NUM)
-			token = rcslex(*sp);
-		assert(token == SEMIC);
-		/* next {num}; */
-		asserttoken(sp, KEYWORD);
-		token = rcslex(*sp);
-		if (token == NUM) {
-			next = duptext(sp, NULL);
-			token = rcslex(*sp);
-		}
-		assert(token == SEMIC);
-		/* {newphrase }* */
-		token = rcslex(*sp);
-		while (token == ID) {
-			token = rcslex(*sp);
-			/* XXX: newphrases ignored. */
-			while (token == ID || token == NUM || token == STRING ||
-			    token == COLON) {
-				token = rcslex(*sp);
-			}
-			asserttoken(sp, SEMIC);
-			token = rcslex(*sp);
-		}
-		rcsfile_importdelta(rf, revnum, revdate, author, state, next);
-		free(revnum);
-		free(revdate);
-		free(author);
-		if (state != NULL)
-			free(state);
-		if (next != NULL)
-			free(next);
-	} while (token == NUM);
-
-	return (token);
-}
-
-/*
- * Parse RCS deltatexts.
- */
-static int
-parse_deltatexts(struct rcsfile *rf, yyscan_t *sp, int token)
-{
-	struct delta *d;
-	char *log, *revnum, *text;
-	int error, len;
-
-	error = 0;
-	/* In case we don't have deltatexts. */
-	if (token != NUM)
-		return (-1);
-	do {
-		/* num */
-		assert(token == NUM);
-		revnum = duptext(sp, NULL);
-		/* Get delta we're adding text to. */
-		d = rcsfile_getdelta(rf, revnum);
-		free(revnum);
-
-		/*
-		 * XXX: The RCS file is corrupt, but lie and say it is ok.
-		 * If it is actually broken, then the MD5 mismatch will
-		 * trigger a fixup.
-		 */
-		if (d == NULL)
-			return (0);
-
-		/* log string */
-		asserttoken(sp, KEYWORD);
-		asserttoken(sp, STRING);
-		log = duptext(sp, &len);
-		error = rcsdelta_addlog(d, log, len);
-		free(log);
-		if (error)
-			return (-1);
-		/* { newphrase }* */
-		token = rcslex(*sp);
-		while (token == ID) {
-			token = rcslex(*sp);
-			/* XXX: newphrases ignored. */
-			while (token == ID || token == NUM || token == STRING ||
-			    token == COLON) {
-				token = rcslex(*sp);
-			}
-			asserttoken(sp, SEMIC);
-			token = rcslex(*sp);
-		}
-		/* text string */
-		assert(token == KEYWORD);
-		asserttoken(sp, STRING);
-		text = duptext(sp, &len);
-		error = rcsdelta_addtext(d, text, len);
-		/*
-		 * If this happens, something is wrong with the RCS file, and it
-		 * should be resent.
-		 */
-		free(text);
-		if (error)
-			return (-1);
-		token = rcslex(*sp);
-	} while (token == NUM);
-
-	return (0);
-}
diff --git a/usr.bin/csup/rcsparse.h b/usr.bin/csup/rcsparse.h
deleted file mode 100644
index 01b01563d80c..000000000000
--- a/usr.bin/csup/rcsparse.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2008-2009, Ulf Lilleengen <lulf@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 _RCSPARSE_H_
-#define _RCSPARSE_H_
-#define ID		0
-#define NUM		1
-#define KEYWORD		2
-#define KEYWORD_TWO	3
-#define STRING		4
-#define SEMIC		5
-#define COLON		6
-
-struct rcsfile;
-int	rcsparse_run(struct rcsfile *, FILE *, int);
-#endif /* !_RCSPARSE_H_ */
diff --git a/usr.bin/csup/rcstokenizer.h b/usr.bin/csup/rcstokenizer.h
deleted file mode 100644
index 66ea724d6ea8..000000000000
--- a/usr.bin/csup/rcstokenizer.h
+++ /dev/null
@@ -1,333 +0,0 @@
-#ifndef rcsHEADER_H
-#define rcsHEADER_H 1
-#define rcsIN_HEADER 1
-
-#line 6 "rcstokenizer.h"
-
-#define  YY_INT_ALIGNED short int
-
-/* A lexical scanner generated by flex */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-
-/* First, we deal with  platform-specific or compiler-specific issues. */
-
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/* end standard C headers. */
-
-/* flex integer type definitions */
-
-#ifndef FLEXINT_H
-#define FLEXINT_H
-
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-
-#endif /* ! FLEXINT_H */
-
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-/* An opaque pointer. */
-#ifndef YY_TYPEDEF_YY_SCANNER_T
-#define YY_TYPEDEF_YY_SCANNER_T
-typedef void* yyscan_t;
-#endif
-
-/* For convenience, these vars (plus the bison vars far below)
-   are macros in the reentrant scanner. */
-#define yyin yyg->yyin_r
-#define yyout yyg->yyout_r
-#define yyextra yyg->yyextra_r
-#define yyleng yyg->yyleng_r
-#define yytext yyg->yytext_r
-#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
-#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
-#define yy_flex_debug yyg->yy_flex_debug_r
-
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE 16384
-#endif
-
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-
-	};
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-
-void rcsrestart (FILE *input_file ,yyscan_t yyscanner );
-void rcs_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-YY_BUFFER_STATE rcs_create_buffer (FILE *file,int size ,yyscan_t yyscanner );
-void rcs_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void rcs_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner );
-void rcspush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner );
-void rcspop_buffer_state (yyscan_t yyscanner );
-
-YY_BUFFER_STATE rcs_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
-YY_BUFFER_STATE rcs_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE rcs_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
-
-void *rcsalloc (yy_size_t ,yyscan_t yyscanner );
-void *rcsrealloc (void *,yy_size_t ,yyscan_t yyscanner );
-void rcsfree (void * ,yyscan_t yyscanner );
-
-/* Begin user sect3 */
-
-#define rcswrap(n) 1
-#define YY_SKIP_YYWRAP
-
-#define yytext_ptr yytext_r
-
-#ifdef YY_HEADER_EXPORT_START_CONDITIONS
-#define INITIAL 0
-
-#endif
-
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-
-int rcslex_init (yyscan_t* scanner);
-
-int rcslex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
-
-/* Accessor methods to globals.
-   These are made visible to non-reentrant scanners for convenience. */
-
-int rcslex_destroy (yyscan_t yyscanner );
-
-int rcsget_debug (yyscan_t yyscanner );
-
-void rcsset_debug (int debug_flag ,yyscan_t yyscanner );
-
-YY_EXTRA_TYPE rcsget_extra (yyscan_t yyscanner );
-
-void rcsset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner );
-
-FILE *rcsget_in (yyscan_t yyscanner );
-
-void rcsset_in  (FILE * in_str ,yyscan_t yyscanner );
-
-FILE *rcsget_out (yyscan_t yyscanner );
-
-void rcsset_out  (FILE * out_str ,yyscan_t yyscanner );
-
-int rcsget_leng (yyscan_t yyscanner );
-
-char *rcsget_text (yyscan_t yyscanner );
-
-int rcsget_lineno (yyscan_t yyscanner );
-
-void rcsset_lineno (int line_number ,yyscan_t yyscanner );
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int rcswrap (yyscan_t yyscanner );
-#else
-extern int rcswrap (yyscan_t yyscanner );
-#endif
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner);
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
-#endif
-
-#ifndef YY_NO_INPUT
-
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-
-extern int rcslex (yyscan_t yyscanner);
-
-#define YY_DECL int rcslex (yyscan_t yyscanner)
-#endif /* !YY_DECL */
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-#undef YY_NEW_FILE
-#undef YY_FLUSH_BUFFER
-#undef yy_set_bol
-#undef yy_new_buffer
-#undef yy_set_interactive
-#undef YY_DO_BEFORE_ACTION
-
-#ifdef YY_DECL_IS_OURS
-#undef YY_DECL_IS_OURS
-#undef YY_DECL
-#endif
-
-#line 73 "rcstokenizer.l"
-
-
-#line 332 "rcstokenizer.h"
-#undef rcsIN_HEADER
-#endif /* rcsHEADER_H */
diff --git a/usr.bin/csup/rcstokenizer.l b/usr.bin/csup/rcstokenizer.l
deleted file mode 100644
index 56f0f41ccf07..000000000000
--- a/usr.bin/csup/rcstokenizer.l
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * Copyright (c) 2007-2009, Ulf Lilleengen <lulf@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$
- */
-
-/*
- * This tokenizer must be generated by a lexxer with support for reentrancy.
- */
-%{
-#include <string.h>
-
-#include "misc.h"
-#include "rcsparse.h"
-
-%}
-%option reentrant noyywrap
-%option header-file="rcstokenizer.h"
-
-everything	(.|\n)*
-num		[0-9\.]+
-whitespace	[\t\n ]
-digit		[0-9]
-idchar		[^$,.:;\t\n ]
-string		@([^@]|\n|"@@")*@
-keyword		head|access|symbols|locks|comment|expand|strict|date|author|state|branches|next|desc|log|text
-keyword2	branch
-newline		\n
-%%
-
-{keyword2}	{
-	return (KEYWORD_TWO);
-}
-{keyword}	{
-	return (KEYWORD);
-}
-{string}	{
-	return (STRING);
-}
-{num}		{
-	return (NUM);
-}
-{num}?{idchar}({idchar}|{num})* {
-/* This will use ID as both ID and SYM. Do extra checking elsewhere.*/
-	return (ID);
-}
-;	{ return (SEMIC); }
-:	{ return (COLON); }
-\n	;
-[ \t]+	;
-%%
diff --git a/usr.bin/csup/rsyncfile.c b/usr.bin/csup/rsyncfile.c
deleted file mode 100644
index 7680bccf0ae7..000000000000
--- a/usr.bin/csup/rsyncfile.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*-
- * Copyright (c) 2008-2009, Ulf Lilleengen <lulf@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 <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "misc.h"
-#include "rsyncfile.h"
-
-#define MINBLOCKSIZE 1024
-#define MAXBLOCKSIZE (16 * 1024)
-#define RECEIVEBUFFERSIZE (15 * 1024)
-#define BLOCKINFOSIZE 26
-#define SEARCHREGION 10
-#define MAXBLOCKS (RECEIVEBUFFERSIZE / BLOCKINFOSIZE)
-
-#define CHAR_OFFSET 3
-#define RSUM_SIZE 9
-
-struct rsyncfile {
-	char *start;
-	char *buf;
-	char *end;
-	size_t blocksize;
-	size_t fsize;
-	int fd;
-
-	char *blockptr;
-	int blocknum;
-	char blockmd5[MD5_DIGEST_SIZE];
-	char rsumstr[RSUM_SIZE];
-	uint32_t rsum;
-};
-
-static size_t		rsync_chooseblocksize(size_t);
-static uint32_t		rsync_rollsum(char *, size_t);
-
-/* Open a file and initialize variable for rsync operation. */
-struct rsyncfile *
-rsync_open(char *path, size_t blocksize, int rdonly)
-{
-	struct rsyncfile *rf;
-	struct stat st;
-	int error;
-
-	rf = xmalloc(sizeof(*rf));
-	error = stat(path, &st);
-	if (error) {
-		free(rf);
-		return (NULL);
-	}
-	rf->fsize = st.st_size;
-
-	rf->fd = open(path, rdonly ? O_RDONLY : O_RDWR);
-	if (rf->fd < 0) {
-		free(rf);
-		return (NULL);
-	}
-	rf->buf = mmap(0, rf->fsize, PROT_READ, MAP_SHARED, rf->fd, 0);
-	if (rf->buf == MAP_FAILED) {
-		free(rf);
-		return (NULL);
-	}
-	rf->start = rf->buf;
-	rf->end = rf->buf + rf->fsize;
-	rf->blocksize = (blocksize == 0 ? rsync_chooseblocksize(rf->fsize) :
-	    blocksize);
-	rf->blockptr = rf->buf;
-	rf->blocknum = 0;
-	return (rf);
-}
-
-/* Close and free all resources related to an rsync file transfer. */
-int
-rsync_close(struct rsyncfile *rf)
-{
-	int error;
-
-	error = munmap(rf->buf, rf->fsize);
-	if (error)
-		return (error);
-	close(rf->fd);
-	free(rf);
-	return (0);
-}
-
-/*
- * Choose the most appropriate block size for an rsync transfer. Modeled
- * algorithm after cvsup.
- */
-static size_t
-rsync_chooseblocksize(size_t fsize)
-{
-	size_t bestrem, blocksize, bs, hisearch, losearch, rem;
-
-	blocksize = fsize / MAXBLOCKS;
-	losearch = blocksize - SEARCHREGION;
-	hisearch = blocksize + SEARCHREGION;
-
-	if (losearch < MINBLOCKSIZE) {
-		losearch = MINBLOCKSIZE;
-		hisearch = losearch + (2 * SEARCHREGION);
-	} else if (hisearch > MAXBLOCKSIZE) {
-		hisearch = MAXBLOCKSIZE;
-		losearch = hisearch - (2 * SEARCHREGION);
-	}
-
-	bestrem = MAXBLOCKSIZE;
-	for (bs = losearch; bs <= hisearch; bs++) {
-		rem = fsize % bs;
-		if (rem < bestrem) {
-			bestrem = rem;
-			blocksize = bs;
-		}
-	}
-	return (bestrem);
-}
-
-/* Get the next rsync block of a file. */
-int
-rsync_nextblock(struct rsyncfile *rf)
-{
-	MD5_CTX ctx;
-	size_t blocksize;
-
-	if (rf->blockptr >= rf->end)
-		return (0);
-	blocksize = min((size_t)(rf->end - rf->blockptr), rf->blocksize);
-	/* Calculate MD5 of the block. */
-	MD5_Init(&ctx);
-	MD5_Update(&ctx, rf->blockptr, blocksize);
-	MD5_End(rf->blockmd5, &ctx);
-
-	rf->rsum = rsync_rollsum(rf->blockptr, blocksize);
-	snprintf(rf->rsumstr, RSUM_SIZE, "%x", rf->rsum);
-	rf->blocknum++;
-	rf->blockptr += blocksize;
-	return (1);
-}
-
-/* Get the rolling checksum of a file. */
-static uint32_t
-rsync_rollsum(char *buf, size_t len)
-{
-	uint32_t a, b;
-	char *ptr, *limit;
-
-	a = b = 0;
-	ptr = buf;
-	limit = buf + len;
-
-	while (ptr < limit) {
-		a += *ptr + CHAR_OFFSET;
-		b += a;
-		ptr++;
-	}
-	return ((b << 16) | a);
-}
-
-/* Get running sum so far. */
-char *
-rsync_rsum(struct rsyncfile *rf)
-{
-
-	return (rf->rsumstr);
-}
-
-/* Get MD5 of current block. */
-char *
-rsync_blockmd5(struct rsyncfile *rf)
-{
-
-	return (rf->blockmd5);
-}
-
-/* Accessor for blocksize. */
-size_t
-rsync_blocksize(struct rsyncfile *rf)
-{
-
-	return (rf->blocksize);
-}
-
-/* Accessor for filesize. */
-size_t
-rsync_filesize(struct rsyncfile *rf)
-{
-
-	return (rf->fsize);
-}
diff --git a/usr.bin/csup/rsyncfile.h b/usr.bin/csup/rsyncfile.h
deleted file mode 100644
index 2c41a28ee4d2..000000000000
--- a/usr.bin/csup/rsyncfile.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2008-2009, Ulf Lilleengen <lulf@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 _RSYNCFILE_H_
-#define _RSYNCFILE_H_
-
-struct rsyncfile;
-struct rsyncfile	*rsync_open(char *, size_t, int);
-int			 rsync_nextblock(struct rsyncfile *);
-char			*rsync_rsum(struct rsyncfile *);
-char			*rsync_blockmd5(struct rsyncfile *);
-int			 rsync_close(struct rsyncfile *);
-size_t			 rsync_blocksize(struct rsyncfile *);
-size_t			rsync_filesize(struct rsyncfile *);
-
-#endif /* !_RSYNCFILE_H_ */
diff --git a/usr.bin/csup/status.c b/usr.bin/csup/status.c
deleted file mode 100644
index 9cc02db98ec6..000000000000
--- a/usr.bin/csup/status.c
+++ /dev/null
@@ -1,875 +0,0 @@
-/*-
- * Copyright (c) 2006, Maxime Henrion <mux@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/queue.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "config.h"
-#include "fattr.h"
-#include "misc.h"
-#include "pathcomp.h"
-#include "proto.h"
-#include "status.h"
-#include "stream.h"
-
-#define	STATUS_VERSION	5
-
-/* Internal error codes. */
-#define	STATUS_ERR_READ		(-1)
-#define	STATUS_ERR_WRITE	(-2)
-#define	STATUS_ERR_PARSE	(-3)
-#define	STATUS_ERR_UNSORTED	(-4)
-#define	STATUS_ERR_TRUNC	(-5)
-#define	STATUS_ERR_BOGUS_DIRUP	(-6)
-#define	STATUS_ERR_BAD_TYPE	(-7)
-#define	STATUS_ERR_RENAME	(-8)
-
-static struct status	*status_new(char *, time_t, struct stream *);
-static struct statusrec	*status_rd(struct status *);
-static struct statusrec	*status_rdraw(struct status *, char **);
-static int		 status_wr(struct status *, struct statusrec *);
-static int		 status_wrraw(struct status *, struct statusrec *,
-			     char *);
-static struct status	*status_fromrd(char *, struct stream *);
-static struct status	*status_fromnull(char *);
-static void		 status_free(struct status *);
-
-static void		 statusrec_init(struct statusrec *);
-static void		 statusrec_fini(struct statusrec *);
-static int		 statusrec_cook(struct statusrec *, char *);
-static int		 statusrec_cmp(struct statusrec *, struct statusrec *);
-
-struct status {
-	char *path;
-	char *tempfile;
-	int error;
-	int suberror;
-	struct pathcomp *pc;
-	struct statusrec buf;
-	struct statusrec *previous;
-	struct statusrec *current;
-	struct stream *rd;
-	struct stream *wr;
-	time_t scantime;
-	int eof;
-	int linenum;
-	int depth;
-	int dirty;
-};
-
-static void
-statusrec_init(struct statusrec *sr)
-{
-
-	memset(sr, 0, sizeof(*sr));
-}
-
-static int
-statusrec_cook(struct statusrec *sr, char *line)
-{
-	char *clientattr, *serverattr;
-
-	switch (sr->sr_type) {
-	case SR_FILEDEAD:
-	case SR_FILELIVE:
-		clientattr = proto_get_ascii(&line);
-		if (clientattr == NULL || line != NULL)
-			return (-1);
-		sr->sr_clientattr = fattr_decode(clientattr);
-		if (sr->sr_clientattr == NULL)
-			return (-1);
-		break;
-	case SR_DIRDOWN:
-		/* Nothing to do. */
-		if (line != NULL)
-			return (-1);
-		break;
-	case SR_CHECKOUTLIVE:
-		sr->sr_tag = proto_get_ascii(&line);
-		sr->sr_date = proto_get_ascii(&line);
-		serverattr = proto_get_ascii(&line);
-		sr->sr_revnum = proto_get_ascii(&line);
-		sr->sr_revdate = proto_get_ascii(&line);
-		clientattr = proto_get_ascii(&line);
-		if (clientattr == NULL || line != NULL)
-			return (-1);
-		sr->sr_serverattr = fattr_decode(serverattr);
-		if (sr->sr_serverattr == NULL)
-			return (-1);
-		sr->sr_clientattr = fattr_decode(clientattr);
-		if (sr->sr_clientattr == NULL) {
-			fattr_free(sr->sr_serverattr);
-			return (-1);
-		}
-		break;
-	case SR_CHECKOUTDEAD:
-		sr->sr_tag = proto_get_ascii(&line);
-		sr->sr_date = proto_get_ascii(&line);
-		serverattr = proto_get_ascii(&line);
-		if (serverattr == NULL || line != NULL)
-			return (-1);
-		sr->sr_serverattr = fattr_decode(serverattr);
-		if (sr->sr_serverattr == NULL)
-			return (-1);
-		break;
-	case SR_DIRUP:
-		clientattr = proto_get_ascii(&line);
-		if (clientattr == NULL || line != NULL)
-			return (-1);
-		sr->sr_clientattr = fattr_decode(clientattr);
-		if (sr->sr_clientattr == NULL)
-			return (-1);
-		break;
-	default:
-		return (-1);
-	}
-	return (0);
-}
-
-static struct statusrec *
-status_rd(struct status *st)
-{
-	struct statusrec *sr;
-	char *line;
-	int error;
-
-	sr = status_rdraw(st, &line);
-	if (sr == NULL)
-		return (NULL);
-	error = statusrec_cook(sr, line);
-	if (error) {
-		st->error = STATUS_ERR_PARSE;
-		return (NULL);
-	}
-	return (sr);
-}
-
-static struct statusrec *
-status_rdraw(struct status *st, char **linep)
-{
-	struct statusrec sr;
-	char *cmd, *line, *file;
-
-	if (st->rd == NULL || st->eof)
-		return (NULL);
-	line = stream_getln(st->rd, NULL);
-	if (line == NULL) {
-		if (stream_eof(st->rd)) {
-			if (st->depth != 0) {
-				st->error = STATUS_ERR_TRUNC;
-				return (NULL);
-			}
-			st->eof = 1;
-			return (NULL);
-		}
-		st->error = STATUS_ERR_READ;
-		st->suberror = errno;
-		return (NULL);
-	}
-	st->linenum++;
-	cmd = proto_get_ascii(&line);
-	file = proto_get_ascii(&line);
-	if (file == NULL || strlen(cmd) != 1) {
-		st->error = STATUS_ERR_PARSE;
-		return (NULL);
-	}
-
-	switch (cmd[0]) {
-	case 'A':
-		sr.sr_type = SR_FILELIVE;
-		break;
-	case 'D':
-		sr.sr_type = SR_DIRDOWN;
-		st->depth++;
-		break;
-	case 'C':
-		sr.sr_type = SR_CHECKOUTLIVE;
-		break;
-	case 'c':
-		sr.sr_type = SR_CHECKOUTDEAD;
-		break;
-	case 'U':
-		sr.sr_type = SR_DIRUP;
-		if (st->depth <= 0) {
-			st->error = STATUS_ERR_BOGUS_DIRUP;
-			return (NULL);
-		}
-		st->depth--;
-		break;
-	case 'V':
-		sr.sr_type = SR_FILELIVE;
-		break;
-	case 'v':
-		sr.sr_type = SR_FILEDEAD;
-		break;
-	default:
-		st->error = STATUS_ERR_BAD_TYPE;
-		st->suberror = cmd[0];
-		return (NULL);
-	}
-
-	sr.sr_file = xstrdup(file);
-	if (st->previous != NULL &&
-	    statusrec_cmp(st->previous, &sr) >= 0) {
-		st->error = STATUS_ERR_UNSORTED;
-		free(sr.sr_file);
-		return (NULL);
-	}
-
-	if (st->previous == NULL) {
-		st->previous = &st->buf;
-	} else {
-		statusrec_fini(st->previous);
-		statusrec_init(st->previous);
-	}
-	st->previous->sr_type = sr.sr_type;
-	st->previous->sr_file = sr.sr_file;
-	*linep = line;
-	return (st->previous);
-}
-
-static int
-status_wr(struct status *st, struct statusrec *sr)
-{
-	struct pathcomp *pc;
-	const struct fattr *fa;
-	char *name;
-	int error, type, usedirupattr;
-
-	pc = st->pc;
-	error = 0;
-	usedirupattr = 0;
-	if (sr->sr_type == SR_DIRDOWN) {
-		pathcomp_put(pc, PC_DIRDOWN, sr->sr_file);
-	} else if (sr->sr_type == SR_DIRUP) {
-		pathcomp_put(pc, PC_DIRUP, sr->sr_file);
-		usedirupattr = 1;
-	} else {
-		pathcomp_put(pc, PC_FILE, sr->sr_file);
-	}
-
-	while (pathcomp_get(pc, &type, &name)) {
-		if (type == PC_DIRDOWN) {
-			error = proto_printf(st->wr, "D %s\n", name);
-		} else if (type == PC_DIRUP) {
-			if (usedirupattr)
-				fa = sr->sr_clientattr;
-			else
-				fa = fattr_bogus;
-			usedirupattr = 0;
-			error = proto_printf(st->wr, "U %s %f\n", name, fa);
-		}
-		if (error)
-			goto bad;
-	}
-
-	switch (sr->sr_type) {
-	case SR_DIRDOWN:
-	case SR_DIRUP:
-		/* Already emitted above. */
-		break;
-	case SR_CHECKOUTLIVE:
-		error = proto_printf(st->wr, "C %s %s %s %f %s %s %f\n",
-		    sr->sr_file, sr->sr_tag, sr->sr_date, sr->sr_serverattr,
-		    sr->sr_revnum, sr->sr_revdate, sr->sr_clientattr);
-		break;
-	case SR_CHECKOUTDEAD:
-		error = proto_printf(st->wr, "c %s %s %s %f\n", sr->sr_file,
-		    sr->sr_tag, sr->sr_date, sr->sr_serverattr);
-		break;
-	case SR_FILELIVE:
-		error = proto_printf(st->wr, "V %s %f\n", sr->sr_file,
-		    sr->sr_clientattr);
-		break;
-	case SR_FILEDEAD:
-		error = proto_printf(st->wr, "v %s %f\n", sr->sr_file,
-		    sr->sr_clientattr);
-		break;
-	}
-	if (error)
-		goto bad;
-	return (0);
-bad:
-	st->error = STATUS_ERR_WRITE;
-	st->suberror = errno;
-	return (-1);
-}
-
-static int
-status_wrraw(struct status *st, struct statusrec *sr, char *line)
-{
-	char *name;
-	char cmd;
-	int error, ret, type;
-
-	if (st->wr == NULL)
-		return (0);
-
-	/*
-	 * Keep the compressor in sync.  At this point, the necessary
-	 * DirDowns and DirUps should have already been emitted, so the
-	 * compressor should return exactly one value in the PC_DIRDOWN
-	 * and PC_DIRUP case and none in the PC_FILE case.
-	 */
-	if (sr->sr_type == SR_DIRDOWN)
-		pathcomp_put(st->pc, PC_DIRDOWN, sr->sr_file);
-	else if (sr->sr_type == SR_DIRUP)
-		pathcomp_put(st->pc, PC_DIRUP, sr->sr_file);
-	else
-		pathcomp_put(st->pc, PC_FILE, sr->sr_file);
-	if (sr->sr_type == SR_DIRDOWN || sr->sr_type == SR_DIRUP) {
-		ret = pathcomp_get(st->pc, &type, &name);
-		assert(ret);
-		if (sr->sr_type == SR_DIRDOWN)
-			assert(type == PC_DIRDOWN);
-		else
-			assert(type == PC_DIRUP);
-	}
-	ret = pathcomp_get(st->pc, &type, &name);
-	assert(!ret);
-
-	switch (sr->sr_type) {
-	case SR_DIRDOWN:
-		cmd = 'D';
-		break;
-	case SR_DIRUP:
-		cmd = 'U';
-		break;
-	case SR_CHECKOUTLIVE:
-		cmd = 'C';
-		break;
-	case SR_CHECKOUTDEAD:
-		cmd = 'c';
-		break;
-	case SR_FILELIVE:
-		cmd = 'V';
-		break;
-	case SR_FILEDEAD:
-		cmd = 'v';
-		break;
-	default:
-		assert(0);
-		return (-1);
-	}
-	if (sr->sr_type == SR_DIRDOWN)
-		error = proto_printf(st->wr, "%c %S\n", cmd, sr->sr_file);
-	else
-		error = proto_printf(st->wr, "%c %s %S\n", cmd, sr->sr_file,
-		    line);
-	if (error) {
-		st->error = STATUS_ERR_WRITE;
-		st->suberror = errno;
-		return (-1);
-	}
-	return (0);
-}
-
-static void
-statusrec_fini(struct statusrec *sr)
-{
-
-	fattr_free(sr->sr_serverattr);
-	fattr_free(sr->sr_clientattr);
-	free(sr->sr_file);
-}
-
-static int
-statusrec_cmp(struct statusrec *a, struct statusrec *b)
-{
-	size_t lena, lenb;
-
-	if (a->sr_type == SR_DIRUP || b->sr_type == SR_DIRUP) {
-		lena = strlen(a->sr_file);
-		lenb = strlen(b->sr_file);
-		if (a->sr_type == SR_DIRUP &&
-		    ((lena < lenb && b->sr_file[lena] == '/') || lena == lenb)
-		    && strncmp(a->sr_file, b->sr_file, lena) == 0)
-			return (1);
-		if (b->sr_type == SR_DIRUP &&
-		    ((lenb < lena && a->sr_file[lenb] == '/') || lenb == lena)
-		    && strncmp(a->sr_file, b->sr_file, lenb) == 0)
-			return (-1);
-	}
-	return (pathcmp(a->sr_file, b->sr_file));
-}
-
-static struct status *
-status_new(char *path, time_t scantime, struct stream *file)
-{
-	struct status *st;
-
-	st = xmalloc(sizeof(struct status));
-	st->path = path;
-	st->error = 0;
-	st->suberror = 0;
-	st->tempfile = NULL;
-	st->scantime = scantime;
-	st->rd = file;
-	st->wr = NULL;
-	st->previous = NULL;
-	st->current = NULL;
-	st->dirty = 0;
-	st->eof = 0;
-	st->linenum = 0;
-	st->depth = 0;
-	st->pc = pathcomp_new();
-	statusrec_init(&st->buf);
-	return (st);
-}
-
-static void
-status_free(struct status *st)
-{
-
-	if (st->previous != NULL)
-		statusrec_fini(st->previous);
-	if (st->rd != NULL)
-		stream_close(st->rd);
-	if (st->wr != NULL)
-		stream_close(st->wr);
-	if (st->tempfile != NULL)
-		free(st->tempfile);
-	free(st->path);
-	pathcomp_free(st->pc);
-	free(st);
-}
-
-static struct status *
-status_fromrd(char *path, struct stream *file)
-{
-	struct status *st;
-	char *id, *line;
-	time_t scantime;
-	int error, ver;
-
-	/* Get the first line of the file and validate it. */
-	line = stream_getln(file, NULL);
-	if (line == NULL) {
-		stream_close(file);
-		return (NULL);
-	}
-	id = proto_get_ascii(&line);
-	error = proto_get_int(&line, &ver, 10);
-	if (error) {
-		stream_close(file);
-		return (NULL);
-	}
-	error = proto_get_time(&line, &scantime);
-	if (error || line != NULL) {
-		stream_close(file);
-		return (NULL);
-	}
-
-	if (strcmp(id, "F") != 0 || ver != STATUS_VERSION) {
-		stream_close(file);
-		return (NULL);
-	}
-
-	st = status_new(path, scantime, file);
-	st->linenum = 1;
-	return (st);
-}
-
-static struct status *
-status_fromnull(char *path)
-{
-	struct status *st;
-
-	st = status_new(path, -1, NULL);
-	st->eof = 1;
-	return (st);
-}
-
-/*
- * Open the status file.  If scantime is not -1, the file is opened
- * for updating, otherwise, it is opened read-only. If the status file
- * couldn't be opened, NULL is returned and errmsg is set to the error
- * message.
- */
-struct status *
-status_open(struct coll *coll, time_t scantime, char **errmsg)
-{
-	struct status *st;
-	struct stream *file;
-	struct fattr *fa;
-	char *destpath, *path;
-	int error, rv;
-
-	path = coll_statuspath(coll);
-	file = stream_open_file(path, O_RDONLY);
-	if (file == NULL) {
-		if (errno != ENOENT) {
-			xasprintf(errmsg, "Could not open \"%s\": %s\n",
-			    path, strerror(errno));
-			free(path);
-			return (NULL);
-		}
-		st = status_fromnull(path);
-	} else {
-		st = status_fromrd(path, file);
-		if (st == NULL) {
-			xasprintf(errmsg, "Error in \"%s\": Bad header line",
-			    path);
-			free(path);
-			return (NULL);
-		}
-	}
-
-	if (scantime != -1) {
-		/* Open for writing too. */
-		xasprintf(&destpath, "%s/%s/%s/", coll->co_base,
-		    coll->co_colldir, coll->co_name);
-		st->tempfile = tempname(destpath);
-		if (mkdirhier(destpath, coll->co_umask) != 0) {
-			xasprintf(errmsg, "Cannot create directories leading "
-			    "to \"%s\": %s", destpath, strerror(errno));
-			free(destpath);
-			status_free(st);
-			return (NULL);
-		}
-		free(destpath);
-		st->wr = stream_open_file(st->tempfile,
-		    O_CREAT | O_TRUNC | O_WRONLY, 0644);
-		if (st->wr == NULL) {
-			xasprintf(errmsg, "Cannot create \"%s\": %s",
-			    st->tempfile, strerror(errno));
-			status_free(st);
-			return (NULL);
-		}
-		fa = fattr_new(FT_FILE, -1);
-		fattr_mergedefault(fa);
-		fattr_umask(fa, coll->co_umask);
-		rv = fattr_install(fa, st->tempfile, NULL);
-		fattr_free(fa);
-		if (rv == -1) {
-			xasprintf(errmsg,
-			    "Cannot set attributes for \"%s\": %s",
-			    st->tempfile, strerror(errno));
-			status_free(st);
-			return (NULL);
-		}
-		if (scantime != st->scantime)
-			st->dirty = 1;
-		error = proto_printf(st->wr, "F %d %t\n", STATUS_VERSION,
-		    scantime);
-		if (error) {
-			st->error = STATUS_ERR_WRITE;
-			st->suberror = errno;
-			*errmsg = status_errmsg(st);
-			status_free(st);
-			return (NULL);
-		}
-	}
-	return (st);
-}
-
-/*
- * Get an entry from the status file.  If name is NULL, the next entry
- * is returned.  If name is not NULL, the entry matching this name is
- * returned, or NULL if it couldn't be found.  If deleteto is set to 1,
- * all the entries read from the status file while looking for the
- * given name are deleted.
- */
-int
-status_get(struct status *st, char *name, int isdirup, int deleteto,
-    struct statusrec **psr)
-{
-	struct statusrec key;
-	struct statusrec *sr;
-	char *line;
-	int c, error;
-
-	if (st->eof)
-		return (0);
-
-	if (st->error)
-		return (-1);
-
-	if (name == NULL) {
-		sr = status_rd(st);
-		if (sr == NULL) {
-			if (st->error)
-				return (-1);
-			return (0);
-		}
-		*psr = sr;
-		return (1);
-	}
-
-	if (st->current != NULL) {
-		sr = st->current;
-		st->current = NULL;
-	} else {
-		sr = status_rd(st);
-		if (sr == NULL) {
-			if (st->error)
-				return (-1);
-			return (0);
-		}
-	}
-
-	key.sr_file = name;
-	if (isdirup)
-		key.sr_type = SR_DIRUP;
-	else
-		key.sr_type = SR_CHECKOUTLIVE;
-
-	c = statusrec_cmp(sr, &key);
-	if (c < 0) {
-		if (st->wr != NULL && !deleteto) {
-			error = status_wr(st, sr);
-			if (error)
-				return (-1);
-		}
-		/* Loop until we find the good entry. */
-		for (;;) {
-			sr = status_rdraw(st, &line);
-			if (sr == NULL) {
-				if (st->error)
-					return (-1);
-				return (0);
-			}
-			c = statusrec_cmp(sr, &key);
-			if (c >= 0)
-				break;
-			if (st->wr != NULL && !deleteto) {
-				error = status_wrraw(st, sr, line);
-				if (error)
-					return (-1);
-			}
-		}
-		error = statusrec_cook(sr, line);
-		if (error) {
-			st->error = STATUS_ERR_PARSE;
-			return (-1);
-		}
-	}
-	st->current = sr;
-	if (c != 0)
-		return (0);
-	*psr = sr;
-	return (1);
-}
-
-/*
- * Put this entry into the status file.  If an entry with the same name
- * existed in the status file, it is replaced by this one, otherwise,
- * the entry is added to the status file.
- */
-int
-status_put(struct status *st, struct statusrec *sr)
-{
-	struct statusrec *old;
-	int error, ret;
-
-	ret = status_get(st, sr->sr_file, sr->sr_type == SR_DIRUP, 0, &old);
-	if (ret == -1)
-		return (-1);
-	if (ret) {
-		if (old->sr_type == SR_DIRDOWN) {
-			/* DirUp should never match DirDown */
-			assert(old->sr_type != SR_DIRUP);
-			if (sr->sr_type == SR_CHECKOUTLIVE ||
-			    sr->sr_type == SR_CHECKOUTDEAD) {
-				/* We are replacing a directory with a file.
-				   Delete all entries inside the directory we
-				   are replacing. */
-				ret = status_get(st, sr->sr_file, 1, 1, &old);
-				if (ret == -1)
-					return (-1);
-				assert(ret);
-			}
-		} else
-			st->current = NULL;
-	}
-	st->dirty = 1;
-	error = status_wr(st, sr);
-	if (error)
-		return (-1);
-	return (0);
-}
-
-/*
- * Delete the specified entry from the status file.
- */
-int
-status_delete(struct status *st, char *name, int isdirup)
-{
-	struct statusrec *sr;
-	int ret;
-
-	ret = status_get(st, name, isdirup, 0, &sr);
-	if (ret == -1)
-		return (-1);
-	if (ret) {
-		st->current = NULL;
-		st->dirty = 1;
-	}
-	return (0);
-}
-
-/*
- * Check whether we hit the end of file.
- */
-int
-status_eof(struct status *st)
-{
-
-	return (st->eof);
-}
-
-/*
- * Returns the error message if there was an error, otherwise returns
- * NULL.  The error message is allocated dynamically and needs to be
- * freed by the caller after use.
- */
-char *
-status_errmsg(struct status *st)
-{
-	char *errmsg;
-
-	if (!st->error)
-		return (NULL);
-	switch (st->error) {
-	case STATUS_ERR_READ:
-		xasprintf(&errmsg, "Read failure on \"%s\": %s",
-		    st->path, strerror(st->suberror));
-		break;
-	case STATUS_ERR_WRITE:
-		xasprintf(&errmsg, "Write failure on \"%s\": %s",
-		    st->tempfile, strerror(st->suberror));
-		break;
-	case STATUS_ERR_PARSE:
-		xasprintf(&errmsg, "Error in \"%s\": %d: "
-		    "Could not parse status record", st->path, st->linenum);
-		break;
-	case STATUS_ERR_UNSORTED:
-		xasprintf(&errmsg, "Error in \"%s\": %d: "
-		    "File is not sorted properly", st->path, st->linenum);
-		break;
-	case STATUS_ERR_TRUNC:
-		xasprintf(&errmsg, "Error in \"%s\": "
-		    "File is truncated", st->path);
-		break;
-	case STATUS_ERR_BOGUS_DIRUP:
-		xasprintf(&errmsg, "Error in \"%s\": %d: "
-		    "\"U\" entry has no matching \"D\"", st->path, st->linenum);
-		break;
-	case STATUS_ERR_BAD_TYPE:
-		xasprintf(&errmsg, "Error in \"%s\": %d: "
-		    "Invalid file type \"%c\"", st->path, st->linenum,
-		    st->suberror);
-		break;
-	case STATUS_ERR_RENAME:
-		xasprintf(&errmsg, "Cannot rename \"%s\" to \"%s\": %s",
-		    st->tempfile, st->path, strerror(st->suberror));
-		break;
-	default:
-		assert(0);
-		return (NULL);
-	}
-	return (errmsg);
-}
-
-/*
- * Close the status file and free any resource associated with it.
- * It is OK to pass NULL for errmsg only if the status file was
- * opened read-only.  If it wasn't opened read-only, status_close()
- * can produce an error and errmsg is not allowed to be NULL.  If
- * there was no errors, errmsg is set to NULL.
- */
-void
-status_close(struct status *st, char **errmsg)
-{
-	struct statusrec *sr;
-	char *line, *name;
-	int error, type;
-
-	if (st->wr != NULL) {
-		if (st->dirty) {
-			if (st->current != NULL) {
-				error = status_wr(st, st->current);
-				if (error) {
-					*errmsg = status_errmsg(st);
-					goto bad;
-				}
-				st->current = NULL;
-			}
-			/* Copy the rest of the file. */
-			while ((sr = status_rdraw(st, &line)) != NULL) {
-				error = status_wrraw(st, sr, line);
-				if (error) {
-					*errmsg = status_errmsg(st);
-					goto bad;
-				}
-			}
-			if (st->error) {
-				*errmsg = status_errmsg(st);
-				goto bad;
-			}
-
-			/* Close off all the open directories. */
-			pathcomp_finish(st->pc);
-			while (pathcomp_get(st->pc, &type, &name)) {
-				assert(type == PC_DIRUP);
-				error = proto_printf(st->wr, "U %s %f\n",
-				    name, fattr_bogus);
-				if (error) {
-					st->error = STATUS_ERR_WRITE;
-					st->suberror = errno;
-					*errmsg = status_errmsg(st);
-					goto bad;
-				}
-			}
-
-			/* Rename tempfile. */
-			error = rename(st->tempfile, st->path);
-			if (error) {
-				st->error = STATUS_ERR_RENAME;
-				st->suberror = errno;
-				*errmsg = status_errmsg(st);
-				goto bad;
-			}
-		} else {
-			/* Just discard the tempfile. */
-			unlink(st->tempfile);
-		}
-		*errmsg = NULL;
-	}
-	status_free(st);
-	return;
-bad:
-	status_free(st);
-}
diff --git a/usr.bin/csup/status.h b/usr.bin/csup/status.h
deleted file mode 100644
index 86efdda0e38c..000000000000
--- a/usr.bin/csup/status.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 2006, Maxime Henrion <mux@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 _STATUS_H_
-#define _STATUS_H_
-
-#include <time.h>
-
-struct coll;
-struct fattr;
-struct status;
-
-#define	SR_DIRDOWN			0
-#define	SR_CHECKOUTLIVE			1
-#define	SR_CHECKOUTDEAD			2
-#define	SR_FILELIVE			3
-#define	SR_FILEDEAD			4
-#define	SR_DIRUP			5
-
-struct statusrec {
-	int		sr_type;
-	char		*sr_file;
-	char		*sr_tag;
-	char		*sr_date;
-	char		*sr_revnum;
-	char		*sr_revdate;
-
-	/*
-	 * "clientrttr" contains the attributes of the client's file if there
-	 * is one. "serverattr" contains the attributes of the corresponding
-	 * file on the server.  In CVS mode, these are identical.  But in
-	 * checkout mode, "clientattr" represents the checked-out file while
-	 * "serverattr" represents the corresponding RCS file on the server.
-	 */
-	struct fattr	*sr_serverattr;
-	struct fattr	*sr_clientattr;
-};
-
-struct status	*status_open(struct coll *, time_t, char **);
-int		 status_get(struct status *, char *, int, int,
-		     struct statusrec **);
-int		 status_put(struct status *, struct statusrec *);
-int		 status_eof(struct status *);
-char		*status_errmsg(struct status *);
-int		 status_delete(struct status *, char *, int);
-void		 status_close(struct status *, char **);
-
-#endif /* !_STATUS_H_ */
diff --git a/usr.bin/csup/stream.c b/usr.bin/csup/stream.c
deleted file mode 100644
index aa229b497164..000000000000
--- a/usr.bin/csup/stream.c
+++ /dev/null
@@ -1,1303 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <zlib.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "misc.h"
-#include "stream.h"
-
-/*
- * Simple stream API to make my life easier.  If the fgetln() and
- * funopen() functions were standard and if funopen() wasn't using
- * wrong types for the function pointers, I could have just used
- * stdio, but life sucks.
- *
- * For now, streams are always block-buffered.
- */
-
-/*
- * Try to quiet warnings as much as possible with GCC while staying
- * compatible with other compilers.
- */
-#ifndef __unused
-#if defined(__GNUC__) && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-#define	__unused	__attribute__((__unused__))
-#else
-#define	__unused
-#endif
-#endif
-
-/*
- * Flags passed to the flush methods.
- *
- * STREAM_FLUSH_CLOSING is passed during the last flush call before
- * closing a stream.  This allows the zlib filter to emit the EOF
- * marker as appropriate.  In all other cases, STREAM_FLUSH_NORMAL
- * should be passed.
- *
- * These flags are completely unused in the default flush method,
- * but they are very important for the flush method of the zlib
- * filter.
- */
-typedef enum {
-	STREAM_FLUSH_NORMAL,
-	STREAM_FLUSH_CLOSING
-} stream_flush_t;
-
-/*
- * This is because buf_new() will always allocate size + 1 bytes,
- * so our buffer sizes will still be power of 2 values.
- */
-#define	STREAM_BUFSIZ	1023
-
-struct buf {
-	char *buf;
-	size_t size;
-	size_t in;
-	size_t off;
-};
-
-struct stream {
-	void *cookie;
-	int fd;
-	int buf;
-	struct buf *rdbuf;
-	struct buf *wrbuf;
-	stream_readfn_t *readfn;
-	stream_writefn_t *writefn;
-	stream_closefn_t *closefn;
-	int eof;
-	struct stream_filter *filter;
-	void *fdata;
-};
-
-typedef int	stream_filter_initfn_t(struct stream *, void *);
-typedef void	stream_filter_finifn_t(struct stream *);
-typedef int	stream_filter_flushfn_t(struct stream *, struct buf *,
-		    stream_flush_t);
-typedef ssize_t	stream_filter_fillfn_t(struct stream *, struct buf *);
-
-struct stream_filter {
-	stream_filter_t id;
-	stream_filter_initfn_t *initfn;
-	stream_filter_finifn_t *finifn;
-	stream_filter_fillfn_t *fillfn;
-	stream_filter_flushfn_t *flushfn;
-};
-
-/* Low-level buffer API. */
-#define	buf_avail(buf)		((buf)->size - (buf)->off - (buf)->in)
-#define	buf_count(buf)		((buf)->in)
-#define	buf_size(buf)		((buf)->size)
-
-static void		 buf_more(struct buf *, size_t);
-static void		 buf_less(struct buf *, size_t);
-static void		 buf_grow(struct buf *, size_t);
-
-/* Internal stream functions. */
-static ssize_t		 stream_fill(struct stream *);
-static ssize_t		 stream_fill_default(struct stream *, struct buf *);
-static int		 stream_flush_int(struct stream *, stream_flush_t);
-static int		 stream_flush_default(struct stream *, struct buf *,
-			     stream_flush_t);
-
-/* Filters specific functions. */
-static struct stream_filter *stream_filter_lookup(stream_filter_t);
-static int		 stream_filter_init(struct stream *, void *);
-static void		 stream_filter_fini(struct stream *);
-
-/* The zlib stream filter declarations. */
-#define	ZFILTER_EOF	1				/* Got Z_STREAM_END. */
-
-struct zfilter {
-	int flags;
-	struct buf *rdbuf;
-	struct buf *wrbuf;
-	z_stream *rdstate;
-	z_stream *wrstate;
-};
-
-static int		 zfilter_init(struct stream *, void *);
-static void		 zfilter_fini(struct stream *);
-static ssize_t		 zfilter_fill(struct stream *, struct buf *);
-static int		 zfilter_flush(struct stream *, struct buf *,
-			     stream_flush_t);
-
-/* The MD5 stream filter. */
-struct md5filter {
-	MD5_CTX ctx;
-	char *md5;
-	char lastc;
-#define PRINT	1
-#define WS	2
-#define STRING	3
-#define SEEN	4
-	int state;
-};
-
-static int		 md5filter_init(struct stream *, void *);
-static void		 md5filter_fini(struct stream *);
-static ssize_t		 md5filter_fill(struct stream *, struct buf *);
-static int		 md5filter_flush(struct stream *, struct buf *,
-			     stream_flush_t);
-static int		 md5rcsfilter_flush(struct stream *, struct buf *,
-			     stream_flush_t);
-
-/* The available stream filters. */
-struct stream_filter stream_filters[] = {
-	{
-		STREAM_FILTER_NULL,
-		NULL,
-		NULL,
-		stream_fill_default,
-		stream_flush_default
-	},
-	{
-	       	STREAM_FILTER_ZLIB,
-		zfilter_init,
-		zfilter_fini,
-		zfilter_fill,
-		zfilter_flush
-	},
-	{
-		STREAM_FILTER_MD5,
-		md5filter_init,
-		md5filter_fini,
-		md5filter_fill,
-		md5filter_flush
-	},
-	{
-		STREAM_FILTER_MD5RCS,
-		md5filter_init,
-		md5filter_fini,
-		md5filter_fill,
-		md5rcsfilter_flush
-	}
-
-};
-
-
-/* Create a new buffer. */
-struct buf *
-buf_new(size_t size)
-{
-	struct buf *buf;
-
-	buf = xmalloc(sizeof(struct buf));
-	/*
-	 * We keep one spare byte so that stream_getln() can put a '\0'
-	 * there in case the stream doesn't have an ending newline.
-	 */
-	buf->buf = xmalloc(size + 1);
-	memset(buf->buf, 0, size + 1);
-	buf->size = size;
-	buf->in = 0;
-	buf->off = 0;
-	return (buf);
-}
-
-/*
- * Grow the size of the buffer.  If "need" is 0, bump its size to the
- * next power of 2 value.  Otherwise, bump it to the next power of 2
- * value bigger than "need".
- */
-static void
-buf_grow(struct buf *buf, size_t need)
-{
-
-	if (need == 0)
-		buf->size = buf->size * 2 + 1; /* Account for the spare byte. */
-	else {
-		assert(need > buf->size);
-		while (buf->size < need)
-			buf->size = buf->size * 2 + 1;
-	}
-	buf->buf = xrealloc(buf->buf, buf->size + 1);
-}
-
-/* Make more room in the buffer if needed. */
-static void
-buf_prewrite(struct buf *buf)
-{
-
-	if (buf_count(buf) == buf_size(buf))
-		buf_grow(buf, 0);
-	if (buf_count(buf) > 0 && buf_avail(buf) == 0) {
-		memmove(buf->buf, buf->buf + buf->off, buf_count(buf));
-		buf->off = 0;
-	}
-}
-
-/* Account for "n" bytes being added in the buffer. */
-static void
-buf_more(struct buf *buf, size_t n)
-{
-
-	assert(n <= buf_avail(buf));
-	buf->in += n;
-}
-
-/* Account for "n" bytes having been read in the buffer. */
-static void
-buf_less(struct buf *buf, size_t n)
-{
-
-	assert(n <= buf_count(buf));
-	buf->in -= n;
-	if (buf->in == 0)
-		buf->off = 0;
-	else
-		buf->off += n;
-}
-
-/* Free a buffer. */
-void
-buf_free(struct buf *buf)
-{
-
-	free(buf->buf);
-	free(buf);
-}
-
-static struct stream *
-stream_new(stream_readfn_t *readfn, stream_writefn_t *writefn,
-    stream_closefn_t *closefn)
-{
-	struct stream *stream;
-
-	stream = xmalloc(sizeof(struct stream));
-	if (readfn == NULL && writefn == NULL) {
-		errno = EINVAL;
-		return (NULL);
-	}
-	if (readfn != NULL)
-		stream->rdbuf = buf_new(STREAM_BUFSIZ);
-	else
-		stream->rdbuf = NULL;
-	if (writefn != NULL)
-		stream->wrbuf = buf_new(STREAM_BUFSIZ);
-	else
-		stream->wrbuf = NULL;
-	stream->cookie = NULL;
-	stream->fd = -1;
-	stream->buf = 0;
-	stream->readfn = readfn;
-	stream->writefn = writefn;
-	stream->closefn = closefn;
-	stream->filter = stream_filter_lookup(STREAM_FILTER_NULL);
-	stream->fdata = NULL;
-	stream->eof = 0;
-	return (stream);
-}
-
-/* Create a new stream associated with a void *. */
-struct stream *
-stream_open(void *cookie, stream_readfn_t *readfn, stream_writefn_t *writefn,
-    stream_closefn_t *closefn)
-{
-	struct stream *stream;
-
-	stream = stream_new(readfn, writefn, closefn);
-	stream->cookie = cookie;
-	return (stream);
-}
-
-/* Associate a file descriptor with a stream. */
-struct stream *
-stream_open_fd(int fd, stream_readfn_t *readfn, stream_writefn_t *writefn,
-    stream_closefn_t *closefn)
-{
-	struct stream *stream;
-
-	stream = stream_new(readfn, writefn, closefn);
-	stream->cookie = &stream->fd;
-	stream->fd = fd;
-	return (stream);
-}
-
-/* Associate a buf with a stream. */
-struct stream *
-stream_open_buf(struct buf *b)
-{
-	struct stream *stream;
-
-	stream = stream_new(stream_read_buf, stream_append_buf, stream_close_buf);
-	stream->cookie = b;
-	stream->buf = 1;
-	b->in = 0;
-	return (stream);
-}
-
-/*
- * Truncate a buffer, just decrease offset pointer.
- * XXX: this can be dangerous if not used correctly.
- */
-void
-stream_truncate_buf(struct buf *b, off_t off)
-{
-	b->off += off;
-}
-
-/* Like open() but returns a stream. */
-struct stream *
-stream_open_file(const char *path, int flags, ...)
-{
-	struct stream *stream;
-	stream_readfn_t *readfn;
-	stream_writefn_t *writefn;
-	va_list ap;
-	mode_t mode;
-	int fd;
-
-	va_start(ap, flags);
-	if (flags & O_CREAT) {
-		/*
-		 * GCC says I should not be using mode_t here since it's
-		 * promoted to an int when passed through `...'.
-		 */
-		mode = va_arg(ap, int);
-		fd = open(path, flags, mode);
-	} else
-		fd = open(path, flags);
-	va_end(ap);
-	if (fd == -1)
-		return (NULL);
-
-	flags &= O_ACCMODE;
-	if (flags == O_RDONLY) {
-		readfn = stream_read_fd;
-		writefn = NULL;
-	} else if (flags == O_WRONLY) {
-		readfn = NULL;
-		writefn = stream_write_fd;
-	} else if (flags == O_RDWR) {
-		assert(flags == O_RDWR);
-		readfn = stream_read_fd;
-		writefn = stream_write_fd;
-	} else {
-		errno = EINVAL;
-		close(fd);
-		return (NULL);
-	}
-
-	stream = stream_open_fd(fd, readfn, writefn, stream_close_fd);
-	if (stream == NULL)
-		close(fd);
-	return (stream);
-}
-
-/* Return the file descriptor associated with this stream, or -1. */
-int
-stream_fileno(struct stream *stream)
-{
-
-	return (stream->fd);
-}
-
-/* Convenience read function for character buffers. */
-ssize_t
-stream_read_buf(void *cookie, void *buf, size_t size)
-{
-	struct buf *b;
-	size_t avail;
-
-	/* Use in to be read offset. */
-	b = (struct buf *)cookie;
-	/* Just return what we have if the request is to large. */
-	avail = b->off - b->in;
-	if (avail < size) {
-		memcpy(buf, (b->buf + b->in), avail);
-		b->in += avail;
-		return (avail);
-	}
-	memcpy(buf, (b->buf + b->in), size);
-	b->in += size;
-	return (size);
-}
-
-/* Convenience write function for appending character buffers. */
-ssize_t
-stream_append_buf(void *cookie, const void *buf, size_t size)
-{
-	struct buf *b;
-	size_t avail;
-
-	/* Use off to be write offset. */
-	b = (struct buf *)cookie;
-
-	avail = b->size - b->off;
-	if (size > avail)
-		buf_grow(b, b->size + size);
-	memcpy((b->buf + b->off), buf, size);
-	b->off += size;
-	b->buf[b->off] = '\0';
-	return (size);
-}
-
-/* Convenience close function for freeing character buffers. */
-int
-stream_close_buf(void *cookie)
-{
-	void *data;
-
-	data = cookie;
-	/* Basically a NOP. */
-	return (0);
-}
-
-/* Convenience read function for file descriptors. */
-ssize_t
-stream_read_fd(void *cookie, void *buf, size_t size)
-{
-	ssize_t nbytes;
-	int fd;
-
-	fd = *(int *)cookie;
-	nbytes = read(fd, buf, size);
-	return (nbytes);
-}
-
-/* Convenience write function for file descriptors. */
-ssize_t
-stream_write_fd(void *cookie, const void *buf, size_t size)
-{
-	ssize_t nbytes;
-	int fd;
-
-	fd = *(int *)cookie;
-	nbytes = write(fd, buf, size);
-	return (nbytes);
-}
-
-/* Convenience close function for file descriptors. */
-int
-stream_close_fd(void *cookie)
-{
-	int fd, ret;
-
-	fd = *(int *)cookie;
-	ret = close(fd);
-	return (ret);
-}
-
-/* Read some bytes from the stream. */
-ssize_t
-stream_read(struct stream *stream, void *buf, size_t size)
-{
-	struct buf *rdbuf;
-	ssize_t ret;
-	size_t n;
-
-	rdbuf = stream->rdbuf;
-	if (buf_count(rdbuf) == 0) {
-		ret = stream_fill(stream);
-		if (ret <= 0)
-			return (-1);
-	}
-	n = min(size, buf_count(rdbuf));
-	memcpy(buf, rdbuf->buf + rdbuf->off, n);
-	buf_less(rdbuf, n);
-	return (n);
-}
-
-/* A blocking stream_read call. */
-ssize_t
-stream_read_blocking(struct stream *stream, void *buf, size_t size)
-{
-	struct buf *rdbuf;
-	ssize_t ret;
-	size_t n;
-
-	rdbuf = stream->rdbuf;
-	while (buf_count(rdbuf) <= size) {
-		ret = stream_fill(stream);
-		if (ret <= 0)
-			return (-1);
-	}
-	/* XXX: Should be at least size bytes in the buffer, right? */
-	/* Just do this to make sure. */
-	n = min(size, buf_count(rdbuf));
-	memcpy(buf, rdbuf->buf + rdbuf->off, n);
-	buf_less(rdbuf, n);
-	return (n);
-}
-
-/*
- * Read a line from the stream and return a pointer to it.
- *
- * If "len" is non-NULL, the length of the string will be put into it.
- * The pointer is only valid until the next stream API call.  The line
- * can be modified by the caller, provided he doesn't write before or
- * after it.
- *
- * This is somewhat similar to the BSD fgetln() function, except that
- * "len" can be NULL here.  In that case the string is terminated by
- * overwriting the '\n' character with a NUL character.  If it's the
- * last line in the stream and it has no ending newline, we can still
- * add '\0' after it, because we keep one spare byte in the buffers.
- *
- * However, be warned that one can't handle binary lines properly
- * without knowing the size of the string since those can contain
- * NUL characters.
- */
-char *
-stream_getln(struct stream *stream, size_t *len)
-{
-	struct buf *buf;
-	char *cp, *line;
-	ssize_t n;
-	size_t done, size;
-
-	buf = stream->rdbuf;
-	if (buf_count(buf) == 0) {
-		n = stream_fill(stream);
-		if (n <= 0)
-			return (NULL);
-	}
-	cp = memchr(buf->buf + buf->off, '\n', buf_count(buf));
-	for (done = buf_count(buf); cp == NULL; done += n) {
-		n = stream_fill(stream);
-		if (n < 0)
-			return (NULL);
-		if (n == 0)
-			/* Last line of the stream. */
-			cp = buf->buf + buf->off + buf->in - 1;
-		else
-			cp = memchr(buf->buf + buf->off + done, '\n',
-			    buf_count(buf) - done);
-	}
-	line = buf->buf + buf->off;
-	assert(cp >= line);
-	size = cp - line + 1;
-	buf_less(buf, size);
-	if (len != NULL) {
-		*len = size;
-	} else {
-		/* Terminate the string when len == NULL. */
-		if (line[size - 1] == '\n')
-			line[size - 1] = '\0';
-		else
-			line[size] = '\0';
-	}
-	return (line);
-}
-
-/* Write some bytes to a stream. */
-ssize_t
-stream_write(struct stream *stream, const void *src, size_t nbytes)
-{
-	struct buf *buf;
-	int error;
-
-	buf = stream->wrbuf;
-	if (nbytes > buf_size(buf))
-		buf_grow(buf, nbytes);
-	if (nbytes > buf_avail(buf)) {
-		error = stream_flush_int(stream, STREAM_FLUSH_NORMAL);
-		if (error)
-			return (-1);
-	}
-	memcpy(buf->buf + buf->off + buf->in, src, nbytes);
-	buf_more(buf, nbytes);
-	return (nbytes);
-}
-
-/* Formatted output to a stream. */
-int
-stream_printf(struct stream *stream, const char *fmt, ...)
-{
-	struct buf *buf;
-	va_list ap;
-	int error, ret;
-
-	buf = stream->wrbuf;
-again:
-	va_start(ap, fmt);
-	ret = vsnprintf(buf->buf + buf->off + buf->in, buf_avail(buf), fmt, ap);
-	va_end(ap);
-	if (ret < 0)
-		return (ret);
-	if ((unsigned)ret >= buf_avail(buf)) {
-		if ((unsigned)ret >= buf_size(buf))
-			buf_grow(buf, ret + 1);
-		if ((unsigned)ret >= buf_avail(buf)) {
-			error = stream_flush_int(stream, STREAM_FLUSH_NORMAL);
-			if (error)
-				return (-1);
-		}
-		goto again;
-	}
-	buf_more(buf, ret);
-	return (ret);
-}
-
-/* Flush the entire write buffer of the stream. */
-int
-stream_flush(struct stream *stream)
-{
-	int error;
-
-	error = stream_flush_int(stream, STREAM_FLUSH_NORMAL);
-	return (error);
-}
-
-/* Internal flush API. */
-static int
-stream_flush_int(struct stream *stream, stream_flush_t how)
-{
-	struct buf *buf;
-	int error;
-
-	buf = stream->wrbuf;
-	error = (*stream->filter->flushfn)(stream, buf, how);
-	assert(buf_count(buf) == 0);
-	return (error);
-}
-
-/* The default flush method. */
-static int
-stream_flush_default(struct stream *stream, struct buf *buf,
-    stream_flush_t __unused how)
-{
-	ssize_t n;
-
-	while (buf_count(buf) > 0) {
-		do {
-			n = (*stream->writefn)(stream->cookie,
-			    buf->buf + buf->off, buf_count(buf));
-		} while (n == -1 && errno == EINTR);
-		if (n <= 0)
-			return (-1);
-		buf_less(buf, n);
-	}
-	return (0);
-}
-
-/* Flush the write buffer and call fsync() on the file descriptor. */
-int
-stream_sync(struct stream *stream)
-{
-	int error;
-
-	if (stream->fd == -1) {
-		errno = EINVAL;
-		return (-1);
-	}
-	error = stream_flush_int(stream, STREAM_FLUSH_NORMAL);
-	if (error)
-		return (-1);
-	error = fsync(stream->fd);
-	return (error);
-}
-
-/* Like truncate() but on a stream. */
-int
-stream_truncate(struct stream *stream, off_t size)
-{
-	int error;
-
-	if (stream->fd == -1) {
-		errno = EINVAL;
-		return (-1);
-	}
-	error = stream_flush_int(stream, STREAM_FLUSH_NORMAL);
-	if (error)
-		return (-1);
-	error = ftruncate(stream->fd, size);
-	return (error);
-}
-
-/* Like stream_truncate() except the off_t parameter is an offset. */
-int
-stream_truncate_rel(struct stream *stream, off_t off)
-{
-	struct stat sb;
-	int error;
-
-	if (stream->buf) {
-		stream_truncate_buf(stream->cookie, off);
-		return (0);
-	}
-	if (stream->fd == -1) {
-		errno = EINVAL;
-		return (-1);
-	}
-	error = stream_flush_int(stream, STREAM_FLUSH_NORMAL);
-	if (error)
-		return (-1);
-	error = fstat(stream->fd, &sb);
-	if (error)
-		return (-1);
-	error = stream_truncate(stream, sb.st_size + off);
-	return (error);
-}
-
-/* Rewind the stream. */
-int
-stream_rewind(struct stream *stream)
-{
-	int error;
-
-	if (stream->fd == -1) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (stream->rdbuf != NULL)
-		buf_less(stream->rdbuf, buf_count(stream->rdbuf));
-	if (stream->wrbuf != NULL) {
-		error = stream_flush_int(stream, STREAM_FLUSH_NORMAL);
-		if (error)
-			return (error);
-	}
-	error = lseek(stream->fd, 0, SEEK_SET);
-	return (error);
-}
-
-/* Return EOF status. */
-int
-stream_eof(struct stream *stream)
-{
-
-	return (stream->eof);
-}
-
-/* Close a stream and free any resources held by it. */
-int
-stream_close(struct stream *stream)
-{
-	int error;
-
-	if (stream == NULL)
-		return (0);
-
-	error = 0;
-	if (stream->wrbuf != NULL)
-		error = stream_flush_int(stream, STREAM_FLUSH_CLOSING);
-	stream_filter_fini(stream);
-	if (stream->closefn != NULL)
-		/*
-		 * We might overwrite a previous error from stream_flush(),
-		 * but we have no choice, because wether it had worked or
-		 * not, we need to close the file descriptor.
-		 */
-		error = (*stream->closefn)(stream->cookie);
-	if (stream->rdbuf != NULL)
-		buf_free(stream->rdbuf);
-	if (stream->wrbuf != NULL)
-		buf_free(stream->wrbuf);
-	free(stream);
-	return (error);
-}
-
-/* The default fill method. */
-static ssize_t
-stream_fill_default(struct stream *stream, struct buf *buf)
-{
-	ssize_t n;
-
-	if (stream->eof)
-		return (0);
-	assert(buf_avail(buf) > 0);
-	n = (*stream->readfn)(stream->cookie, buf->buf + buf->off + buf->in,
-	    buf_avail(buf));
-	if (n < 0)
-		return (-1);
-	if (n == 0) {
-		stream->eof = 1;
-		return (0);
-	}
-	buf_more(buf, n);
-	return (n);
-}
-
-/*
- * Refill the read buffer.  This function is not permitted to return
- * without having made more bytes available, unless there was an error.
- * Moreover, stream_fill() returns the number of bytes added.
- */
-static ssize_t
-stream_fill(struct stream *stream)
-{
-	struct stream_filter *filter;
-	struct buf *buf;
-#ifndef NDEBUG
-	size_t oldcount;
-#endif
-	ssize_t n;
-
-	filter = stream->filter;
-	buf = stream->rdbuf;
-	buf_prewrite(buf);
-#ifndef NDEBUG
-	oldcount = buf_count(buf);
-#endif
-	n = (*filter->fillfn)(stream, buf);
-	assert((n > 0 && n == (signed)(buf_count(buf) - oldcount)) ||
-	    (n <= 0 && buf_count(buf) == oldcount));
-	return (n);
-}
-
-/*
- * Lookup a stream filter.
- *
- * We are not supposed to get passed an invalid filter id, since
- * filter ids are an enum type and we don't have invalid filter
- * ids in the enum :-).  Thus, we are not checking for out of
- * bounds access here.  If it happens, it's the caller's fault
- * anyway.
- */
-static struct stream_filter *
-stream_filter_lookup(stream_filter_t id)
-{
-	struct stream_filter *filter;
-
-	filter = stream_filters;
-	while (filter->id != id)
-		filter++;
-	return (filter);
-}
-
-static int
-stream_filter_init(struct stream *stream, void *data)
-{
-	struct stream_filter *filter;
-	int error;
-
-	filter = stream->filter;
-	if (filter->initfn == NULL)
-		return (0);
-	error = (*filter->initfn)(stream, data);
-	return (error);
-}
-
-static void
-stream_filter_fini(struct stream *stream)
-{
-	struct stream_filter *filter;
-
-	filter = stream->filter;
-	if (filter->finifn != NULL)
-		(*filter->finifn)(stream);
-}
-
-/*
- * Start a filter on a stream.
- */
-int
-stream_filter_start(struct stream *stream, stream_filter_t id, void *data)
-{
-	struct stream_filter *filter;
-	int error;
-
-	filter = stream->filter;
-	if (id == filter->id)
-		return (0);
-	stream_filter_fini(stream);
-	stream->filter = stream_filter_lookup(id);
-	stream->fdata = NULL;
-	error = stream_filter_init(stream, data);
-	return (error);
-}
-
-
-/* Stop a filter, this is equivalent to setting the null filter. */
-void
-stream_filter_stop(struct stream *stream)
-{
-
-	stream_filter_start(stream, STREAM_FILTER_NULL, NULL);
-}
-
-/* The zlib stream filter implementation. */
-
-/* Take no chances with zlib... */
-static void *
-zfilter_alloc(void __unused *opaque, unsigned int items, unsigned int size)
-{
-
-	return (xmalloc(items * size));
-}
-
-static void
-zfilter_free(void __unused *opaque, void *ptr)
-{
-
-	free(ptr);
-}
-
-static int
-zfilter_init(struct stream *stream, void __unused *data)
-{
-	struct zfilter *zf;
-	struct buf *buf;
-	z_stream *state;
-	int rv;
-
-	zf = xmalloc(sizeof(struct zfilter));
-	memset(zf, 0, sizeof(struct zfilter));
-	if (stream->rdbuf != NULL) {
-		state = xmalloc(sizeof(z_stream));
-		state->zalloc = zfilter_alloc;
-		state->zfree = zfilter_free;
-		state->opaque = Z_NULL;
-		rv = inflateInit(state);
-		if (rv != Z_OK)
-			errx(1, "inflateInit: %s", state->msg);
-		buf = buf_new(buf_size(stream->rdbuf));
-		zf->rdbuf = stream->rdbuf;
-		stream->rdbuf = buf;
-		zf->rdstate = state;
-	}
-	if (stream->wrbuf != NULL) {
-		state = xmalloc(sizeof(z_stream));
-		state->zalloc = zfilter_alloc;
-		state->zfree = zfilter_free;
-		state->opaque = Z_NULL;
-		rv = deflateInit(state, Z_DEFAULT_COMPRESSION);
-		if (rv != Z_OK)
-			errx(1, "deflateInit: %s", state->msg);
-		buf = buf_new(buf_size(stream->wrbuf));
-		zf->wrbuf = stream->wrbuf;
-		stream->wrbuf = buf;
-		zf->wrstate = state;
-	}
-	stream->fdata = zf;
-	return (0);
-}
-
-static void
-zfilter_fini(struct stream *stream)
-{
-	struct zfilter *zf;
-	struct buf *zbuf;
-	z_stream *state;
-	ssize_t n;
-
-	zf = stream->fdata;
-	if (zf->rdbuf != NULL) {
-		state = zf->rdstate;
-		zbuf = zf->rdbuf;
-		/*
-		 * Even if it has produced all the bytes, zlib sometimes
-		 * hasn't seen the EOF marker, so we need to call inflate()
-		 * again to make sure we have eaten all the zlib'ed bytes.
-		 */
-		if ((zf->flags & ZFILTER_EOF) == 0) {
-			n = zfilter_fill(stream, stream->rdbuf);
-			assert(n == 0 && zf->flags & ZFILTER_EOF);
-		}
-		inflateEnd(state);
-		free(state);
-		buf_free(stream->rdbuf);
-		stream->rdbuf = zbuf;
-	}
-	if (zf->wrbuf != NULL) {
-		state = zf->wrstate;
-		zbuf = zf->wrbuf;
-		/*
-		 * Compress the remaining bytes in the buffer, if any,
-		 * and emit an EOF marker as appropriate.  We ignore
-		 * the error because we can't do anything about it at
-		 * this point, and it can happen if we're getting
-		 * disconnected.
-		 */
-		(void)zfilter_flush(stream, stream->wrbuf,
-		    STREAM_FLUSH_CLOSING);
-		deflateEnd(state);
-		free(state);
-		buf_free(stream->wrbuf);
-		stream->wrbuf = zbuf;
-	}
-	free(zf);
-}
-
-static int
-zfilter_flush(struct stream *stream, struct buf *buf, stream_flush_t how)
-{
-	struct zfilter *zf;
-	struct buf *zbuf;
-	z_stream *state;
-	size_t lastin, lastout, ate, prod;
-	int done, error, flags, rv;
-
-	zf = stream->fdata;
-	state = zf->wrstate;
-	zbuf = zf->wrbuf;
-
-	if (how == STREAM_FLUSH_NORMAL)
-		flags = Z_SYNC_FLUSH;
-	else
-		flags = Z_FINISH;
-
-	done = 0;
-	rv = Z_OK;
-
-again:
-	/*
-	 * According to zlib.h, we should have at least 6 bytes
-	 * available when using deflate() with Z_SYNC_FLUSH.
-	 */
-	if ((buf_avail(zbuf) < 6 && flags == Z_SYNC_FLUSH) ||
-	    rv == Z_BUF_ERROR || buf_avail(buf) == 0) {
-		error = stream_flush_default(stream, zbuf, how);
-		if (error)
-			return (error);
-	}
-
-	state->next_in = (Bytef *)(buf->buf + buf->off);
-	state->avail_in = buf_count(buf);
-	state->next_out = (Bytef *)(zbuf->buf + zbuf->off + zbuf->in);
-	state->avail_out = buf_avail(zbuf);
-	lastin = state->avail_in;
-	lastout = state->avail_out;
-	rv = deflate(state, flags);
-	if (rv != Z_BUF_ERROR && rv != Z_OK && rv != Z_STREAM_END)
-		errx(1, "deflate: %s", state->msg);
-	ate = lastin - state->avail_in;
-	prod = lastout - state->avail_out;
-	buf_less(buf, ate);
-	buf_more(zbuf, prod);
-	if ((flags == Z_SYNC_FLUSH && buf_count(buf) > 0) ||
-	    (flags == Z_FINISH && rv != Z_STREAM_END) ||
-	    (rv == Z_BUF_ERROR))
-		goto again;
-
-	assert(rv == Z_OK || (rv == Z_STREAM_END && flags == Z_FINISH));
-	error = stream_flush_default(stream, zbuf, how);
-	return (error);
-}
-
-static ssize_t
-zfilter_fill(struct stream *stream, struct buf *buf)
-{
-	struct zfilter *zf;
-	struct buf *zbuf;
-	z_stream *state;
-	size_t lastin, lastout, new;
-	ssize_t n;
-	int rv;
-
-	zf = stream->fdata;
-	state = zf->rdstate;
-	zbuf = zf->rdbuf;
-
-	assert(buf_avail(buf) > 0);
-	if (buf_count(zbuf) == 0) {
-		n = stream_fill_default(stream, zbuf);
-		if (n <= 0)
-			return (n);
-	}
-again:
-	assert(buf_count(zbuf) > 0);
-	state->next_in = (Bytef *)(zbuf->buf + zbuf->off);
-	state->avail_in = buf_count(zbuf);
-	state->next_out = (Bytef *)(buf->buf + buf->off + buf->in);
-	state->avail_out = buf_avail(buf);
-	lastin = state->avail_in;
-	lastout = state->avail_out;
-	rv = inflate(state, Z_SYNC_FLUSH);
-	buf_less(zbuf, lastin - state->avail_in);
-	new = lastout - state->avail_out;
-	if (new == 0 && rv != Z_STREAM_END) {
-		n = stream_fill_default(stream, zbuf);
-		if (n == -1)
-			return (-1);
-		if (n == 0)
-			return (0);
-		goto again;
-	}
-	if (rv != Z_STREAM_END && rv != Z_OK)
-		errx(1, "inflate: %s", state->msg);
-	if (rv == Z_STREAM_END)
-		zf->flags |= ZFILTER_EOF;
-	buf_more(buf, new);
-	return (new);
-}
-
-/* The MD5 stream filter implementation. */
-static int
-md5filter_init(struct stream *stream, void *data)
-{
-	struct md5filter *mf;
-
-	mf = xmalloc(sizeof(struct md5filter));
-	MD5_Init(&mf->ctx);
-	mf->md5 = data;
-	mf->lastc = ';';
-	mf->state = PRINT;
-	stream->fdata = mf;
-	return (0);
-}
-
-static void
-md5filter_fini(struct stream *stream)
-{
-	struct md5filter *mf;
-
-	mf = stream->fdata;
-	MD5_End(mf->md5, &mf->ctx);
-	free(stream->fdata);
-}
-
-static ssize_t
-md5filter_fill(struct stream *stream, struct buf *buf)
-{
-	ssize_t n;
-
-	assert(buf_avail(buf) > 0);
-	n = stream_fill_default(stream, buf);
-	return (n);
-}
-
-static int
-md5filter_flush(struct stream *stream, struct buf *buf, stream_flush_t how)
-{
-	struct md5filter *mf;
-	int error;
-
-	mf = stream->fdata;
-	MD5_Update(&mf->ctx, buf->buf + buf->off, buf->in);
-	error = stream_flush_default(stream, buf, how);
-	return (error);
-}
-
-/* MD5 flush for RCS, where whitespaces are omitted. */
-static int
-md5rcsfilter_flush(struct stream *stream, struct buf *buf, stream_flush_t how)
-{
-	struct md5filter *mf;
-	char *ptr, *end;
-	char *start;
-	char space[2];
-	int error;
-
-	mf = stream->fdata;
-	space[0] = ' ';
-	space[1] = '\0';
-	ptr = buf->buf + buf->off;
-	end = buf->buf + buf->off + buf->in;
-
-#define IS_WS(var) ((var) == ' ' || (var) == '\n' || (var) == '\t' || \
-                    (var) == '\010' || (var) == '\013' || (var) == '\f' || \
-                    (var) == '\r')
-
-#define IS_SPECIAL(var) ((var) == '$' || (var) == ',' || (var) == ':' || \
-			 (var) == ';' || (var) == '@')
-
-#define IS_PRINT(var) (!IS_WS(var) && (var) != '@')
-
-	/* XXX: We can do better than this state machine. */
-	while (ptr < end) {
-		switch (mf->state) {
-			/* Outside RCS statements. */
-			case PRINT:
-				start = ptr;
-				while (ptr < end && IS_PRINT(*ptr)) {
-					mf->lastc = *ptr;
-					ptr++;
-				}
-				MD5_Update(&mf->ctx, start, (ptr - start));
-				if (ptr < end) {
-					if (*ptr == '@') {
-						MD5_Update(&mf->ctx, ptr, 1);
-						ptr++;
-						mf->state = STRING;
-					} else {
-						mf->state = WS;
-					}
-				}
-				break;
-			case WS:
-				while (ptr < end && IS_WS(*ptr)) {
-					ptr++;
-				}
-				if (ptr < end) {
-					if (*ptr == '@') {
-						if (mf->lastc == '@') {
-							MD5_Update(&mf->ctx,
-							    space, 1);
-						}
-						MD5_Update(&mf->ctx, ptr, 1);
-						ptr++;
-						mf->state = STRING;
-					} else {
-						if (!IS_SPECIAL(*ptr) &&
-						    !IS_SPECIAL(mf->lastc)) {
-							MD5_Update(&mf->ctx,
-							    space, 1);
-						}
-						mf->state = PRINT;
-					}
-				}
-				break;
-			case STRING:
-				start = ptr;
-				while (ptr < end && *ptr != '@') {
-					ptr++;
-				}
-				MD5_Update(&mf->ctx, start, (ptr - start));
-				if (ptr < end) {
-					MD5_Update(&mf->ctx, ptr, 1);
-					ptr++;
-					mf->state = SEEN;
-				}
-				break;
-			case SEEN:
-				if (*ptr == '@') {
-					MD5_Update(&mf->ctx, ptr, 1);
-					ptr++;
-					mf->state = STRING;
-				} else if(IS_WS(*ptr)) {
-					mf->lastc = '@';
-					mf->state = WS;
-				} else {
-					mf->state = PRINT;
-				}
-				break;
-			default:
-				err(1, "Invalid state");
-				break;
-		}
-	}
-
-	error = stream_flush_default(stream, buf, how);
-	return (error);
-}
-
diff --git a/usr.bin/csup/stream.h b/usr.bin/csup/stream.h
deleted file mode 100644
index 212863572849..000000000000
--- a/usr.bin/csup/stream.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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 _STREAM_H_
-#define _STREAM_H_
-
-#include "misc.h"
-
-/* Stream filters. */
-typedef enum {
-	STREAM_FILTER_NULL,
-	STREAM_FILTER_ZLIB,
-	STREAM_FILTER_MD5,
-	STREAM_FILTER_MD5RCS
-} stream_filter_t;
-
-struct stream;
-struct buf;
-
-typedef ssize_t	stream_readfn_t(void *, void *, size_t);
-typedef ssize_t	stream_writefn_t(void *, const void *, size_t);
-typedef int	stream_closefn_t(void *);
-
-/* Convenience functions for handling file descriptors. */
-stream_readfn_t		stream_read_fd;
-stream_writefn_t	stream_write_fd;
-stream_closefn_t	stream_close_fd;
-
-/* Convenience functions for handling character buffers. */
-stream_readfn_t		stream_read_buf;
-stream_writefn_t	stream_append_buf;
-stream_closefn_t	stream_close_buf;
-
-struct stream	*stream_open(void *, stream_readfn_t *, stream_writefn_t *,
-		     stream_closefn_t *);
-struct stream	*stream_open_fd(int, stream_readfn_t *, stream_writefn_t *,
-		     stream_closefn_t *);
-struct stream	*stream_open_buf(struct buf *);
-struct stream	*stream_open_file(const char *, int, ...);
-int		 stream_fileno(struct stream *);
-ssize_t		 stream_read(struct stream *, void *, size_t);
-ssize_t		 stream_read_blocking(struct stream *, void *, size_t);
-ssize_t		 stream_write(struct stream *, const void *, size_t);
-char		*stream_getln(struct stream *, size_t *);
-int		 stream_printf(struct stream *, const char *, ...)
-		     __printflike(2, 3);
-int		 stream_flush(struct stream *);
-int		 stream_sync(struct stream *);
-int		 stream_truncate(struct stream *, off_t);
-void		 stream_truncate_buf(struct buf *, off_t);
-int		 stream_truncate_rel(struct stream *, off_t);
-int		 stream_rewind(struct stream *);
-int		 stream_eof(struct stream *);
-int		 stream_close(struct stream *);
-int		 stream_filter_start(struct stream *, stream_filter_t, void *);
-void		 stream_filter_stop(struct stream *);
-
-struct buf	*buf_new(size_t);
-void		 buf_free(struct buf *);
-#endif /* !_STREAM_H_ */
diff --git a/usr.bin/csup/threads.c b/usr.bin/csup/threads.c
deleted file mode 100644
index 34e6e327b76e..000000000000
--- a/usr.bin/csup/threads.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*-
- * Copyright (c) 2004-2006, Maxime Henrion <mux@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/queue.h>
-
-#include <assert.h>
-#include <err.h>
-#include <pthread.h>
-#include <stdlib.h>
-
-#include "misc.h"
-#include "threads.h"
-
-/*
- * This API is a wrapper around the pthread(3) API, which mainly
- * allows me to wait for multiple threads to exit.  We use a
- * condition variable to signal a thread's death.  All threads
- * created with this API have a common entry/exit point, so we
- * don't need to add any code in the threads themselves.
- */
-
-/* Structure describing a thread. */
-struct thread {
-	pthread_t thread;
-	void *(*start)(void *);
-	void *data;
-	struct threads *threads;
-	LIST_ENTRY(thread) runlist;
-	STAILQ_ENTRY(thread) deadlist;
-};
-
-/* A set of threads. */
-struct threads {
-	pthread_mutex_t threads_mtx;
-	pthread_cond_t thread_exited;
-	LIST_HEAD(, thread) threads_running;
-	STAILQ_HEAD(, thread) threads_dead;
-};
-
-static void	*thread_start(void *);	/* Common entry point for threads. */
-
-static void	 threads_lock(struct threads *);
-static void	 threads_unlock(struct threads *);
-
-static void
-threads_lock(struct threads *tds)
-{
-	int error;
-
-	error = pthread_mutex_lock(&tds->threads_mtx);
-	assert(!error);
-}
-
-static void
-threads_unlock(struct threads *tds)
-{
-	int error;
-
-	error = pthread_mutex_unlock(&tds->threads_mtx);
-	assert(!error);
-}
-
-/* Create a new set of threads. */
-struct threads *
-threads_new(void)
-{
-	struct threads *tds;
-
-	tds = xmalloc(sizeof(struct threads));
-	pthread_mutex_init(&tds->threads_mtx, NULL);
-	pthread_cond_init(&tds->thread_exited, NULL);
-	LIST_INIT(&tds->threads_running);
-	STAILQ_INIT(&tds->threads_dead);
-	return (tds);
-}
-
-/* Create a new thread in this set. */
-void
-threads_create(struct threads *tds, void *(*start)(void *), void *data)
-{
-	pthread_attr_t attr;
-	struct thread *td;
-	int error;
-
-	td = xmalloc(sizeof(struct thread));
-	td->threads = tds;
-	td->start = start;
-	td->data = data;
-	/* We don't use pthread_join() to wait for the threads to finish. */
-	pthread_attr_init(&attr);
-	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-	threads_lock(tds);
-	error = pthread_create(&td->thread, &attr, thread_start, td);
-	if (error)
-		err(1, "pthread_create");
-	LIST_INSERT_HEAD(&tds->threads_running, td, runlist);
-	threads_unlock(tds);
-}
-
-/* Wait for a thread in the set to exit, and return its data pointer. */
-void *
-threads_wait(struct threads *tds)
-{
-	struct thread *td;
-	void *data;
-
-	threads_lock(tds);
-	while (STAILQ_EMPTY(&tds->threads_dead)) {
-		assert(!LIST_EMPTY(&tds->threads_running));
-		pthread_cond_wait(&tds->thread_exited, &tds->threads_mtx);
-	}
-	td = STAILQ_FIRST(&tds->threads_dead);
-	STAILQ_REMOVE_HEAD(&tds->threads_dead, deadlist);
-	threads_unlock(tds);
-	data = td->data;
-	free(td);
-	return (data);
-}
-
-/* Free a threads set. */
-void
-threads_free(struct threads *tds)
-{
-
-	assert(LIST_EMPTY(&tds->threads_running));
-	assert(STAILQ_EMPTY(&tds->threads_dead));
-	pthread_cond_destroy(&tds->thread_exited);
-	pthread_mutex_destroy(&tds->threads_mtx);
-	free(tds);
-}
-
-/*
- * Common entry point for threads.  This just calls the real start
- * routine, and then signals the thread's death, after having
- * removed the thread from the list.
- */
-static void *
-thread_start(void *data)
-{
-	struct threads *tds;
-	struct thread *td;
-
-	td = data;
-	tds = td->threads;
-	td->start(td->data);
-	threads_lock(tds);
-	LIST_REMOVE(td, runlist);
-	STAILQ_INSERT_TAIL(&tds->threads_dead, td, deadlist);
-	pthread_cond_signal(&tds->thread_exited);
-	threads_unlock(tds);
-	return (NULL);
-}
diff --git a/usr.bin/csup/threads.h b/usr.bin/csup/threads.h
deleted file mode 100644
index 66153ce5589d..000000000000
--- a/usr.bin/csup/threads.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2004, Maxime Henrion <mux@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 _THREADS_H_
-#define _THREADS_H_
-
-struct threads;
-
-struct threads	*threads_new(void);
-void		 threads_create(struct threads *, void *(*)(void *), void *);
-void		*threads_wait(struct threads *);
-void		 threads_free(struct threads *);
-
-#endif /* !_THREADS_H_ */
diff --git a/usr.bin/csup/token.h b/usr.bin/csup/token.h
deleted file mode 100644
index 0dc3ec03fbef..000000000000
--- a/usr.bin/csup/token.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2003-2004, Maxime Henrion <mux@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 _TOKEN_H_
-#define _TOKEN_H_
-
-void	yyerror(const char *);
-int	yylex(void);
-int	yyparse(void);
-
-/* Parsing tokens. */
-#define PT_BASE 		0
-#define PT_DATE 		1
-#define PT_HOST 		2
-#define PT_PREFIX 		3
-#define PT_RELEASE		4
-#define PT_TAG			5
-#define PT_UMASK		6
-#define PT_COMPRESS		7
-#define PT_DELETE		8
-#define PT_USE_REL_SUFFIX	9
-#define PT_LIST			10
-#define PT_NORSYNC		11
-
-#endif /* !_TOKEN_H_ */
diff --git a/usr.bin/csup/token.l b/usr.bin/csup/token.l
deleted file mode 100644
index 69f5ea4b65a1..000000000000
--- a/usr.bin/csup/token.l
+++ /dev/null
@@ -1,79 +0,0 @@
-%{
-/*-
- * Copyright (c) 2003-2004, Maxime Henrion <mux@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 <err.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "parse.h"
-#include "misc.h"
-#include "token.h"
-
-int lineno = 1;
-
-%}
-
-%option nounput
-%option noyywrap
-
-%%
-
-[ \t]+			;
-#.*			;
-\*default		{ return DEFAULT; }
-base			{ yylval.i = PT_BASE; return NAME; }
-date			{ yylval.i = PT_DATE; return NAME; }
-host			{ yylval.i = PT_HOST; return NAME; }
-prefix			{ yylval.i = PT_PREFIX; return NAME; }
-release			{ yylval.i = PT_RELEASE; return NAME; }
-tag			{ yylval.i = PT_TAG; return NAME; }
-umask			{ yylval.i = PT_UMASK; return NAME; }
-list			{ yylval.i = PT_LIST; return NAME; }
-norsync			{ yylval.i = PT_NORSYNC; return NAME; }
-=			{ return EQUAL; }
-compress		{ yylval.i = PT_COMPRESS; return BOOLEAN; }
-delete			{ yylval.i = PT_DELETE; return BOOLEAN; }
-use-rel-suffix		{ yylval.i = PT_USE_REL_SUFFIX; return BOOLEAN; }
-[a-zA-Z0-9./_-]+	{
-			  yylval.str = strdup(yytext);
-			  if (yylval.str == NULL)
-			  	err(1, "strdup");
-			  return STRING;
-			}
-\n			lineno++;
-
-%%
-
-void
-yyerror(const char *s)
-{
-
-	lprintf(-1, "Parse error line %d: %s: %s\n", lineno, s, yytext);
-	exit(1);
-}
diff --git a/usr.bin/csup/updater.c b/usr.bin/csup/updater.c
deleted file mode 100644
index e95ec107bbee..000000000000
--- a/usr.bin/csup/updater.c
+++ /dev/null
@@ -1,2043 +0,0 @@
-/*-
- * Copyright (c) 2003-2006, Maxime Henrion <mux@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/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "config.h"
-#include "diff.h"
-#include "fattr.h"
-#include "fixups.h"
-#include "keyword.h"
-#include "updater.h"
-#include "misc.h"
-#include "mux.h"
-#include "proto.h"
-#include "rcsfile.h"
-#include "status.h"
-#include "stream.h"
-
-/* Internal error codes. */
-#define	UPDATER_ERR_PROTO	(-1)	/* Protocol error. */
-#define	UPDATER_ERR_MSG		(-2)	/* Error is in updater->errmsg. */
-#define	UPDATER_ERR_READ	(-3)	/* Error reading from server. */
-#define	UPDATER_ERR_DELETELIM	(-4)	/* File deletion limit exceeded. */
-
-#define BUFSIZE 4096
-
-/* Everything needed to update a file. */
-struct file_update {
-	struct statusrec srbuf;
-	char *destpath;
-	char *temppath;
-	char *origpath;
-	char *coname;		/* Points somewhere in destpath. */
-	char *wantmd5;
-	struct coll *coll;
-	struct status *st;
-	/* Those are only used for diff updating. */
-	char *author;
-	struct stream *orig;
-	struct stream *to;
-	int attic;
-	int expand;
-};
-
-struct updater {
-	struct config *config;
-	struct stream *rd;
-	char *errmsg;
-	int deletecount;
-};
-
-static struct file_update	*fup_new(struct coll *, struct status *);
-static int	 fup_prepare(struct file_update *, char *, int);
-static void	 fup_cleanup(struct file_update *);
-static void	 fup_free(struct file_update *);
-
-static void	 updater_prunedirs(char *, char *);
-static int	 updater_batch(struct updater *, int);
-static int	 updater_docoll(struct updater *, struct file_update *, int);
-static int	 updater_delete(struct updater *, struct file_update *);
-static void	 updater_deletefile(const char *);
-static int	 updater_checkout(struct updater *, struct file_update *, int);
-static int	 updater_addfile(struct updater *, struct file_update *,
-		     char *, int);
-int		 updater_addelta(struct rcsfile *, struct stream *, char *);
-static int	 updater_setattrs(struct updater *, struct file_update *,
-		     char *, char *, char *, char *, char *, struct fattr *);
-static int	updater_setdirattrs(struct updater *, struct coll *,
-		     struct file_update *, char *, char *);
-static int	 updater_updatefile(struct updater *, struct file_update *fup,
-		     const char *, int);
-static int	 updater_updatenode(struct updater *, struct coll *, 
-		     struct file_update *, char *, char *);
-static int	 updater_diff(struct updater *, struct file_update *);
-static int	 updater_diff_batch(struct updater *, struct file_update *);
-static int	 updater_diff_apply(struct updater *, struct file_update *,
-		     char *);
-static int	 updater_rcsedit(struct updater *, struct file_update *, char *,
-		     char *);
-int		 updater_append_file(struct updater *, struct file_update *,
-		     off_t);
-static int	 updater_rsync(struct updater *, struct file_update *, size_t);
-static int	 updater_read_checkout(struct stream *, struct stream *);
-
-static struct file_update *
-fup_new(struct coll *coll, struct status *st)
-{
-	struct file_update *fup;
-
-	fup = xmalloc(sizeof(struct file_update));
-	memset(fup, 0, sizeof(*fup));
-	fup->coll = coll;
-	fup->st = st;
-	return (fup);
-}
-
-static int
-fup_prepare(struct file_update *fup, char *name, int attic)
-{
-	struct coll *coll;
-
-	coll = fup->coll;
-	fup->attic = 0;
-	fup->origpath = NULL;
-
-	if (coll->co_options & CO_CHECKOUTMODE)
-		fup->destpath = checkoutpath(coll->co_prefix, name);
-	else {
-		fup->destpath = cvspath(coll->co_prefix, name, attic);
-		fup->origpath = atticpath(coll->co_prefix, name);
-		/* If they're equal, we don't need special care. */
-		if (fup->origpath != NULL &&
-		    strcmp(fup->origpath, fup->destpath) == 0) {
-			free(fup->origpath);
-			fup->origpath = NULL;
-		}
-		fup->attic = attic;
-	}
-	if (fup->destpath == NULL)
-		return (-1);
-	fup->coname = fup->destpath + coll->co_prefixlen + 1;
-	return (0);
-}
-
-/* Called after each file update to reinit the structure. */
-static void
-fup_cleanup(struct file_update *fup)
-{
-	struct statusrec *sr;
-
-	sr = &fup->srbuf;
-
-	if (fup->destpath != NULL) {
-		free(fup->destpath);
-		fup->destpath = NULL;
-	}
-	if (fup->temppath != NULL) {
-		free(fup->temppath);
-		fup->temppath = NULL;
-	}
-	if (fup->origpath != NULL) {
-		free(fup->origpath);
-		fup->origpath = NULL;
-	}
-	fup->coname = NULL;
-	if (fup->author != NULL) {
-		free(fup->author);
-		fup->author = NULL;
-	}
-	fup->expand = 0;
-	if (fup->wantmd5 != NULL) {
-		free(fup->wantmd5);
-		fup->wantmd5 = NULL;
-	}
-	if (fup->orig != NULL) {
-		stream_close(fup->orig);
-		fup->orig = NULL;
-	}
-	if (fup->to != NULL) {
-		stream_close(fup->to);
-		fup->to = NULL;
-	}
-	if (sr->sr_file != NULL)
-		free(sr->sr_file);
-	if (sr->sr_tag != NULL)
-		free(sr->sr_tag);
-	if (sr->sr_date != NULL)
-		free(sr->sr_date);
-	if (sr->sr_revnum != NULL)
-		free(sr->sr_revnum);
-	if (sr->sr_revdate != NULL)
-		free(sr->sr_revdate);
-	fattr_free(sr->sr_clientattr);
-	fattr_free(sr->sr_serverattr);
-	memset(sr, 0, sizeof(*sr));
-}
-
-static void
-fup_free(struct file_update *fup)
-{
-
-	fup_cleanup(fup);
-	free(fup);
-}
-
-void *
-updater(void *arg)
-{
-	struct thread_args *args;
-	struct updater upbuf, *up;
-	int error;
-
-	args = arg;
-
-	up = &upbuf;
-	up->config = args->config;
-	up->rd = args->rd;
-	up->errmsg = NULL;
-	up->deletecount = 0;
-
-	error = updater_batch(up, 0);
-
-	/*
-	 * Make sure to close the fixups even in case of an error,
-	 * so that the detailer thread doesn't block indefinitely.
-	 */
-	fixups_close(up->config->fixups);
-	if (!error)
-		error = updater_batch(up, 1);
-	switch (error) {
-	case UPDATER_ERR_PROTO:
-		xasprintf(&args->errmsg, "Updater failed: Protocol error");
-		args->status = STATUS_FAILURE;
-		break;
-	case UPDATER_ERR_MSG:
-		xasprintf(&args->errmsg, "Updater failed: %s", up->errmsg);
-		free(up->errmsg);
-		args->status = STATUS_FAILURE;
-		break;
-	case UPDATER_ERR_READ:
-		if (stream_eof(up->rd)) {
-			xasprintf(&args->errmsg, "Updater failed: "
-			    "Premature EOF from server");
-		} else {
-			xasprintf(&args->errmsg, "Updater failed: "
-			    "Network read failure: %s", strerror(errno));
-		}
-		args->status = STATUS_TRANSIENTFAILURE;
-		break;
-	case UPDATER_ERR_DELETELIM:
-		xasprintf(&args->errmsg, "Updater failed: "
-		    "File deletion limit exceeded");
-		args->status = STATUS_FAILURE;
-		break;
-	default:
-		assert(error == 0);
-		args->status = STATUS_SUCCESS;
-	};
-	return (NULL);
-}
-
-static int
-updater_batch(struct updater *up, int isfixups)
-{
-	struct stream *rd;
-	struct coll *coll;
-	struct status *st;
-	struct file_update *fup;
-	char *line, *cmd, *errmsg, *collname, *release;
-	int error;
-
-	rd = up->rd;
-	STAILQ_FOREACH(coll, &up->config->colls, co_next) {
-		if (coll->co_options & CO_SKIP)
-			continue;
-		umask(coll->co_umask);
-		line = stream_getln(rd, NULL);
-		if (line == NULL)
-			return (UPDATER_ERR_READ);
-		cmd = proto_get_ascii(&line);
-		collname = proto_get_ascii(&line);
-		release = proto_get_ascii(&line);
-		if (release == NULL || line != NULL)
-			return (UPDATER_ERR_PROTO);
-		if (strcmp(cmd, "COLL") != 0 ||
-		    strcmp(collname, coll->co_name) != 0 ||
-		    strcmp(release, coll->co_release) != 0)
-			return (UPDATER_ERR_PROTO);
-
-		if (!isfixups)
-			lprintf(1, "Updating collection %s/%s\n", coll->co_name,
-			    coll->co_release);
-
-		if (coll->co_options & CO_COMPRESS)
-			stream_filter_start(rd, STREAM_FILTER_ZLIB, NULL);
-
-		st = status_open(coll, coll->co_scantime, &errmsg);
-		if (st == NULL) {
-			up->errmsg = errmsg;
-			return (UPDATER_ERR_MSG);
-		}
-		fup = fup_new(coll, st);
-		error = updater_docoll(up, fup, isfixups);
-		status_close(st, &errmsg);
-		fup_free(fup);
-		if (errmsg != NULL) {
-			/* Discard previous error. */
-			if (up->errmsg != NULL)
-				free(up->errmsg);
-			up->errmsg = errmsg;
-			return (UPDATER_ERR_MSG);
-		}
-		if (error)
-			return (error);
-
-		if (coll->co_options & CO_COMPRESS)
-			stream_filter_stop(rd);
-	}
-	line = stream_getln(rd, NULL);
-	if (line == NULL)
-		return (UPDATER_ERR_READ);
-	if (strcmp(line, ".") != 0)
-		return (UPDATER_ERR_PROTO);
-	return (0);
-}
-
-static int
-updater_docoll(struct updater *up, struct file_update *fup, int isfixups)
-{
-	struct stream *rd;
-	struct coll *coll;
-	struct statusrec srbuf, *sr;
-	struct fattr *rcsattr, *tmp;
-	char *attr, *cmd, *blocksize, *line, *msg;
-	char *name, *tag, *date, *revdate;
-	char *expand, *wantmd5, *revnum;
-	char *optstr, *rcsopt, *pos;
-	time_t t;
-	off_t position;
-	int attic, error, needfixupmsg;
-
-	error = 0;
-	rd = up->rd;
-	coll = fup->coll;
-	needfixupmsg = isfixups;
-	while ((line = stream_getln(rd, NULL)) != NULL) {
-		if (strcmp(line, ".") == 0)
-			break;
-		memset(&srbuf, 0, sizeof(srbuf));
-		if (needfixupmsg) {
-			lprintf(1, "Applying fixups for collection %s/%s\n",
-			    coll->co_name, coll->co_release);
-			needfixupmsg = 0;
-		}
-		cmd = proto_get_ascii(&line);
-		if (cmd == NULL || strlen(cmd) != 1)
-			return (UPDATER_ERR_PROTO);
-		switch (cmd[0]) {
-		case 'T':
-			/* Update recorded information for checked-out file. */
-			name = proto_get_ascii(&line);
-			tag = proto_get_ascii(&line);
-			date = proto_get_ascii(&line);
-			revnum = proto_get_ascii(&line);
-			revdate = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			if (attr == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-
-			rcsattr = fattr_decode(attr);
-			if (rcsattr == NULL)
-				return (UPDATER_ERR_PROTO);
-
-			error = fup_prepare(fup, name, 0);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-			error = updater_setattrs(up, fup, name, tag, date,
-			    revnum, revdate, rcsattr);
-			fattr_free(rcsattr);
-			if (error)
-				return (error);
-			break;
-		case 'c':
-			/* Checkout dead file. */
-			name = proto_get_ascii(&line);
-			tag = proto_get_ascii(&line);
-			date = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			if (attr == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-
-			error = fup_prepare(fup, name, 0);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-			/* Theoritically, the file does not exist on the client.
-			   Just to make sure, we'll delete it here, if it
-			   exists. */
-			if (access(fup->destpath, F_OK) == 0) {
-				error = updater_delete(up, fup);
-				if (error)
-					return (error);
-			}
-
-			sr = &srbuf;
-			sr->sr_type = SR_CHECKOUTDEAD;
-			sr->sr_file = name;
-			sr->sr_tag = tag;
-			sr->sr_date = date;
-			sr->sr_serverattr = fattr_decode(attr);
-			if (sr->sr_serverattr == NULL)
-				return (UPDATER_ERR_PROTO);
-
-			error = status_put(fup->st, sr);
-			fattr_free(sr->sr_serverattr);
-			if (error) {
-				up->errmsg = status_errmsg(fup->st);
-				return (UPDATER_ERR_MSG);
-			}
-			break;
-		case 'U':
-			/* Update live checked-out file. */
-			name = proto_get_ascii(&line);
-			tag = proto_get_ascii(&line);
-			date = proto_get_ascii(&line);
-			proto_get_ascii(&line);	/* XXX - oldRevNum */
-			proto_get_ascii(&line);	/* XXX - fromAttic */
-			proto_get_ascii(&line);	/* XXX - logLines */
-			expand = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			wantmd5 = proto_get_ascii(&line);
-			if (wantmd5 == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-
-			sr = &fup->srbuf;
-			sr->sr_type = SR_CHECKOUTLIVE;
-			sr->sr_file = xstrdup(name);
-			sr->sr_date = xstrdup(date);
-			sr->sr_tag = xstrdup(tag);
-			sr->sr_serverattr = fattr_decode(attr);
-			if (sr->sr_serverattr == NULL)
-				return (UPDATER_ERR_PROTO);
-
-			fup->expand = keyword_decode_expand(expand);
-			if (fup->expand == -1)
-				return (UPDATER_ERR_PROTO);
-			error = fup_prepare(fup, name, 0);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-
-			fup->wantmd5 = xstrdup(wantmd5);
-			fup->temppath = tempname(fup->destpath);
-			error = updater_diff(up, fup);
-			if (error)
-				return (error);
-			break;
-		case 'u':
-			/* Update dead checked-out file. */
-			name = proto_get_ascii(&line);
-			tag = proto_get_ascii(&line);
-			date = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			if (attr == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-
-			error = fup_prepare(fup, name, 0);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-			error = updater_delete(up, fup);
-			if (error)
-				return (error);
-			sr = &srbuf;
-			sr->sr_type = SR_CHECKOUTDEAD;
-			sr->sr_file = name;
-			sr->sr_tag = tag;
-			sr->sr_date = date;
-			sr->sr_serverattr = fattr_decode(attr);
-			if (sr->sr_serverattr == NULL)
-				return (UPDATER_ERR_PROTO);
-			error = status_put(fup->st, sr);
-			fattr_free(sr->sr_serverattr);
-			if (error) {
-				up->errmsg = status_errmsg(fup->st);
-				return (UPDATER_ERR_MSG);
-			}
-			break;
-		case 'C':
-		case 'Y':
-			/* Checkout file. */
-			name = proto_get_ascii(&line);
-			tag = proto_get_ascii(&line);
-			date = proto_get_ascii(&line);
-			revnum = proto_get_ascii(&line);
-			revdate = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			if (attr == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-
-			sr = &fup->srbuf;
-			sr->sr_type = SR_CHECKOUTLIVE;
-			sr->sr_file = xstrdup(name);
-			sr->sr_tag = xstrdup(tag);
-			sr->sr_date = xstrdup(date);
-			sr->sr_revnum = xstrdup(revnum);
-			sr->sr_revdate = xstrdup(revdate);
-			sr->sr_serverattr = fattr_decode(attr);
-			if (sr->sr_serverattr == NULL)
-				return (UPDATER_ERR_PROTO);
-
-			t = rcsdatetotime(revdate);
-			if (t == -1)
-				return (UPDATER_ERR_PROTO);
-
-			sr->sr_clientattr = fattr_new(FT_FILE, t);
-			tmp = fattr_forcheckout(sr->sr_serverattr,
-			    coll->co_umask);
-			fattr_override(sr->sr_clientattr, tmp, FA_MASK);
-			fattr_free(tmp);
-			fattr_mergedefault(sr->sr_clientattr);
-			error = fup_prepare(fup, name, 0);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-			fup->temppath = tempname(fup->destpath);
-			if (*cmd == 'Y')
-				error = updater_checkout(up, fup, 1);
-			else
-				error = updater_checkout(up, fup, 0);
-			if (error)
-				return (error);
-			break;
-		case 'D':
-			/* Delete file. */
-			name = proto_get_ascii(&line);
-			if (name == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-			error = fup_prepare(fup, name, 0);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-			error = updater_delete(up, fup);
-			if (error)
-				return (error);
-			error = status_delete(fup->st, name, 0);
-			if (error) {
-				up->errmsg = status_errmsg(fup->st);
-				return (UPDATER_ERR_MSG);
-			}
-			break;
-		case 'A':
-		case 'a':
-		case 'R':
-			name = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			if (name == NULL || attr == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-			attic = (cmd[0] == 'a');
-			error = fup_prepare(fup, name, attic);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-
-			fup->temppath = tempname(fup->destpath);
-			sr = &fup->srbuf;
-			sr->sr_type = attic ? SR_FILEDEAD : SR_FILELIVE;
-			sr->sr_file = xstrdup(name);
-			sr->sr_serverattr = fattr_decode(attr);
-			if (sr->sr_serverattr == NULL)
-				return (UPDATER_ERR_PROTO);
-			if (attic)
-				lprintf(1, " Create %s -> Attic\n", name);
-			else
-				lprintf(1, " Create %s\n", name);
-			error = updater_addfile(up, fup, attr, 0);
-			if (error)
-				return (error);
-			break;
-		case 'r':
-			name = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			blocksize = proto_get_ascii(&line);
-			wantmd5 = proto_get_ascii(&line);
-			if (name == NULL || attr == NULL || blocksize == NULL ||
-			    wantmd5 == NULL) {
-				return (UPDATER_ERR_PROTO);
-			}
-			error = fup_prepare(fup, name, 0);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-			fup->wantmd5 = xstrdup(wantmd5);
-			fup->temppath = tempname(fup->destpath);
-			sr = &fup->srbuf;
-			sr->sr_file = xstrdup(name);
-			sr->sr_serverattr = fattr_decode(attr);
-			sr->sr_type = SR_FILELIVE;
-			if (sr->sr_serverattr == NULL)
-				return (UPDATER_ERR_PROTO);
-			error = updater_rsync(up, fup, strtol(blocksize, NULL,
-			    10));
-			if (error)
-				return (error);
-			break;
-		case 'I':
-			/*
-			 * Create directory and add DirDown entry in status
-			 * file.
-			 */
-			name = proto_get_ascii(&line);
-			if (name == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-			error = fup_prepare(fup, name, 0);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-			sr = &fup->srbuf;
-			sr->sr_type = SR_DIRDOWN;
-			sr->sr_file = xstrdup(name);
-			sr->sr_serverattr = NULL;
-			sr->sr_clientattr = fattr_new(FT_DIRECTORY, -1);
-			fattr_mergedefault(sr->sr_clientattr);
-
-			error = mkdirhier(fup->destpath, coll->co_umask);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-			if (access(fup->destpath, F_OK) != 0) {
-				lprintf(1, " Mkdir %s\n", name);
-				error = fattr_makenode(sr->sr_clientattr,
-				    fup->destpath);
-				if (error)
-					return (UPDATER_ERR_PROTO);
-			}
-			error = status_put(fup->st, sr);
-			if (error) {
-				up->errmsg = status_errmsg(fup->st);
-				return (UPDATER_ERR_MSG);
-			}
-			break;
-		case 'i':
-			/* Remove DirDown entry in status file. */
-			name = proto_get_ascii(&line);
-			if (name == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-			error = fup_prepare(fup, name, 0);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-			error = status_delete(fup->st, name, 0);
-			if (error) {
-				up->errmsg = status_errmsg(fup->st);
-				return (UPDATER_ERR_MSG);
-			}
-			break;
-		case 'J':
-			/*
-			 * Set attributes of directory and update DirUp entry in
-			 * status file.
-			 */
-			name = proto_get_ascii(&line);
-			if (name == NULL)
-				return (UPDATER_ERR_PROTO);
-			attr = proto_get_ascii(&line);
-			if (attr == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-			error = fup_prepare(fup, name, 0);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-			error = updater_setdirattrs(up, coll, fup, name, attr);
-			if (error)
-				return (error);
-			break;
-		case 'j':
-			/*
-			 * Remove directory and delete its DirUp entry in status
-			 * file.
-			 */
-			name = proto_get_ascii(&line);
-			if (name == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-			error = fup_prepare(fup, name, 0);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-			lprintf(1, " Rmdir %s\n", name);
-			updater_deletefile(fup->destpath);
-			error = status_delete(fup->st, name, 0);
-			if (error) {
-				up->errmsg = status_errmsg(fup->st);
-				return (UPDATER_ERR_MSG);
-			}
-			break;
-		case 'L':
-		case 'l':
-			name = proto_get_ascii(&line);
-			if (name == NULL)
-				return (UPDATER_ERR_PROTO);
-			attr = proto_get_ascii(&line);
-			if (attr == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-			attic = (cmd[0] == 'l');
-			sr = &fup->srbuf;
-			sr->sr_type = attic ? SR_FILEDEAD : SR_FILELIVE;
-			sr->sr_file = xstrdup(name);
-			sr->sr_serverattr = fattr_decode(attr);
-			sr->sr_clientattr = fattr_decode(attr);
-			if (sr->sr_serverattr == NULL ||
-			    sr->sr_clientattr == NULL)
-				return (UPDATER_ERR_PROTO);
-			
-			/* Save space. Described in detail in updatefile. */
-			if (!(fattr_getmask(sr->sr_clientattr) & FA_LINKCOUNT)
-			    || fattr_getlinkcount(sr->sr_clientattr) <= 1)
-				fattr_maskout(sr->sr_clientattr,
-				    FA_DEV | FA_INODE);
-			fattr_maskout(sr->sr_clientattr, FA_FLAGS);
-			error = status_put(fup->st, sr);
-			if (error) {
-				up->errmsg = status_errmsg(fup->st);
-				return (UPDATER_ERR_MSG);
-			}
-			break;
-		case 'N':
-		case 'n':
-			name = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			if (name == NULL || attr == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-			attic = (cmd[0] == 'n');
-			error = fup_prepare(fup, name, attic);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-			sr = &fup->srbuf;
-			sr->sr_type = (attic ? SR_FILEDEAD : SR_FILELIVE);
-			sr->sr_file = xstrdup(name);
-			sr->sr_serverattr = fattr_decode(attr);
-			sr->sr_clientattr = fattr_new(FT_SYMLINK, -1);
-			fattr_mergedefault(sr->sr_clientattr);
-			fattr_maskout(sr->sr_clientattr, FA_FLAGS);
-			error = updater_updatenode(up, coll, fup, name, attr);
-			if (error)
-				return (error);
-			break;
-		case 'V':
-		case 'v':
-			name = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			optstr = proto_get_ascii(&line);
-			wantmd5 = proto_get_ascii(&line);
-			rcsopt = NULL; /* XXX: Not supported. */
-			if (attr == NULL || line != NULL || wantmd5 == NULL)
-				return (UPDATER_ERR_PROTO);
-			attic = (cmd[0] == 'v');
-			error = fup_prepare(fup, name, attic);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-			fup->temppath = tempname(fup->destpath);
-			fup->wantmd5 = xstrdup(wantmd5);
-			sr = &fup->srbuf;
-			sr->sr_type = attic ? SR_FILEDEAD : SR_FILELIVE;
-			sr->sr_file = xstrdup(name);
-			sr->sr_serverattr = fattr_decode(attr);
-			if (sr->sr_serverattr == NULL)
-				return (UPDATER_ERR_PROTO);
-
-			error = updater_rcsedit(up, fup, name, rcsopt);
-			if (error)
-				return (error);
-			break;
-		case 'X':
-		case 'x':
-			name = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			if (name == NULL || attr == NULL || line != NULL)
-				return (UPDATER_ERR_PROTO);
-			attic = (cmd[0] == 'x');
-			error = fup_prepare(fup, name, attic);
-			if (error)
-				return (UPDATER_ERR_PROTO);
-
-			fup->temppath = tempname(fup->destpath);
-			sr = &fup->srbuf;
-			sr->sr_type = attic ? SR_FILEDEAD : SR_FILELIVE;
-			sr->sr_file = xstrdup(name);
-			sr->sr_serverattr = fattr_decode(attr);
-			if (sr->sr_serverattr == NULL)
-				return (UPDATER_ERR_PROTO);
-			lprintf(1, " Fixup %s\n", name);
-			error = updater_addfile(up, fup, attr, 1);
-			if (error)
-				return (error);
-			break;
-		case 'Z':
-			name = proto_get_ascii(&line);
-			attr = proto_get_ascii(&line);
-			pos  = proto_get_ascii(&line);
-			if (name == NULL || attr == NULL || pos == NULL ||
-			    line != NULL)
-				return (UPDATER_ERR_PROTO);
-			error = fup_prepare(fup, name, 0);
-			fup->temppath = tempname(fup->destpath);
-			sr = &fup->srbuf;
-			sr->sr_type = SR_FILELIVE;
-			sr->sr_file = xstrdup(name);
-			sr->sr_serverattr = fattr_decode(attr);
-			if (sr->sr_serverattr == NULL)
-				return (UPDATER_ERR_PROTO);
-			position = strtol(pos, NULL, 10);
-			lprintf(1, " Append to %s\n", name);
-			error = updater_append_file(up, fup, position);
-			if (error)
-				return (error);
-			break;
-		case '!':
-			/* Warning from server. */
-			msg = proto_get_rest(&line);
-			if (msg == NULL)
-				return (UPDATER_ERR_PROTO);
-			lprintf(-1, "Server warning: %s\n", msg);
-			break;
-		default:
-			return (UPDATER_ERR_PROTO);
-		}
-		fup_cleanup(fup);
-	}
-	if (line == NULL)
-		return (UPDATER_ERR_READ);
-	return (0);
-}
-
-/* Delete file. */
-static int
-updater_delete(struct updater *up, struct file_update *fup)
-{
-	struct config *config;
-	struct coll *coll;
-
-	config = up->config;
-	coll = fup->coll;
-	if (coll->co_options & CO_DELETE) {
-		lprintf(1, " Delete %s\n", fup->coname);
-		if (config->deletelim >= 0 &&
-		    up->deletecount >= config->deletelim)
-			return (UPDATER_ERR_DELETELIM);
-		up->deletecount++;
-		updater_deletefile(fup->destpath);
-		if (coll->co_options & CO_CHECKOUTMODE)
-			updater_prunedirs(coll->co_prefix, fup->destpath);
-	} else {
-		lprintf(1," NoDelete %s\n", fup->coname);
-	}
-	return (0);
-}
-
-static void
-updater_deletefile(const char *path)
-{
-	int error;
-
-	error = fattr_delete(path);
-	if (error && errno != ENOENT) {
-		lprintf(-1, "Cannot delete \"%s\": %s\n",
-		    path, strerror(errno));
-	}
-}
-
-static int
-updater_setattrs(struct updater *up, struct file_update *fup, char *name,
-    char *tag, char *date, char *revnum, char *revdate, struct fattr *rcsattr)
-{
-	struct statusrec sr;
-	struct status *st;
-	struct coll *coll;
-	struct fattr *fileattr, *fa;
-	char *path;
-	int error, rv;
-
-	coll = fup->coll;
-	st = fup->st;
-	path = fup->destpath;
-
-	fileattr = fattr_frompath(path, FATTR_NOFOLLOW);
-	if (fileattr == NULL) {
-		/* The file has vanished. */
-		error = status_delete(st, name, 0);
-		if (error) {
-			up->errmsg = status_errmsg(st);
-			return (UPDATER_ERR_MSG);
-		}
-		return (0);
-	}
-	fa = fattr_forcheckout(rcsattr, coll->co_umask);
-	fattr_override(fileattr, fa, FA_MASK);
-	fattr_free(fa);
-
-	rv = fattr_install(fileattr, path, NULL);
-	if (rv == -1) {
-		lprintf(1, " SetAttrs %s\n", fup->coname);
-		fattr_free(fileattr);
-		xasprintf(&up->errmsg, "Cannot set attributes for \"%s\": %s",
-		    path, strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	if (rv == 1) {
-		lprintf(1, " SetAttrs %s\n", fup->coname);
-		fattr_free(fileattr);
-		fileattr = fattr_frompath(path, FATTR_NOFOLLOW);
-		if (fileattr == NULL) {
-			/* We're being very unlucky. */
-			error = status_delete(st, name, 0);
-			if (error) {
-				up->errmsg = status_errmsg(st);
-				return (UPDATER_ERR_MSG);
-			}
-			return (0);
-		}
-	}
-
-	fattr_maskout(fileattr, FA_COIGNORE);
-
-	sr.sr_type = SR_CHECKOUTLIVE;
-	sr.sr_file = name;
-	sr.sr_tag = tag;
-	sr.sr_date = date;
-	sr.sr_revnum = revnum;
-	sr.sr_revdate = revdate;
-	sr.sr_clientattr = fileattr;
-	sr.sr_serverattr = rcsattr;
-
-	error = status_put(st, &sr);
-	fattr_free(fileattr);
-	if (error) {
-		up->errmsg = status_errmsg(st);
-		return (UPDATER_ERR_MSG);
-	}
-	return (0);
-}
-
-static int
-updater_updatefile(struct updater *up, struct file_update *fup,
-    const char *md5, int isfixup)
-{
-	struct coll *coll;
-	struct status *st;
-	struct statusrec *sr;
-	struct fattr *fileattr;
-	int error, rv;
-
-	coll = fup->coll;
-	sr = &fup->srbuf;
-	st = fup->st;
-
-	if (strcmp(fup->wantmd5, md5) != 0) {
-		if (isfixup) {
-			lprintf(-1, "%s: Checksum mismatch -- "
-			    "file not updated\n", fup->destpath);
-		} else {
-			lprintf(-1, "%s: Checksum mismatch -- "
-			    "will transfer entire file\n", fup->destpath);
-			fixups_put(up->config->fixups, fup->coll, sr->sr_file);
-		}
-		if (coll->co_options & CO_KEEPBADFILES)
-			lprintf(-1, "Bad version saved in %s\n", fup->temppath);
-		else
-			updater_deletefile(fup->temppath);
-		return (0);
-	}
-
-	fattr_umask(sr->sr_clientattr, coll->co_umask);
-	rv = fattr_install(sr->sr_clientattr, fup->destpath, fup->temppath);
-	if (rv == -1) {
-		xasprintf(&up->errmsg, "Cannot install \"%s\" to \"%s\": %s",
-		    fup->temppath, fup->destpath, strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-
-	/* XXX Executes */
-	/*
-	 * We weren't necessarily able to set all the file attributes to the
-	 * desired values, and any executes may have altered the attributes.
-	 * To make sure we record the actual attribute values, we fetch
-	 * them from the file.
-	 *
-	 * However, we preserve the link count as received from the
-	 * server.  This is important for preserving hard links in mirror
-	 * mode.
-	 */
-	fileattr = fattr_frompath(fup->destpath, FATTR_NOFOLLOW);
-	if (fileattr == NULL) {
-		xasprintf(&up->errmsg, "Cannot stat \"%s\": %s", fup->destpath,
-		    strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	fattr_override(fileattr, sr->sr_clientattr, FA_LINKCOUNT);
-	fattr_free(sr->sr_clientattr);
-	sr->sr_clientattr = fileattr;
-
-	/*
-	 * To save space, don't write out the device and inode unless
-	 * the link count is greater than 1.  These attributes are used
-	 * only for detecting hard links.  If the link count is 1 then we
-	 * know there aren't any hard links.
-	 */
-	if (!(fattr_getmask(sr->sr_clientattr) & FA_LINKCOUNT) ||
-	    fattr_getlinkcount(sr->sr_clientattr) <= 1)
-		fattr_maskout(sr->sr_clientattr, FA_DEV | FA_INODE);
-
-	if (coll->co_options & CO_CHECKOUTMODE)
-		fattr_maskout(sr->sr_clientattr, FA_COIGNORE);
-
-	error = status_put(st, sr);
-	if (error) {
-		up->errmsg = status_errmsg(st);
-		return (UPDATER_ERR_MSG);
-	}
-	return (0);
-}
-
-/*
- * Update attributes of a directory.
- */
-static int
-updater_setdirattrs(struct updater *up, struct coll *coll,
-    struct file_update *fup, char *name, char *attr)
-{
-	struct statusrec *sr;
-	struct fattr *fa;
-	int error, rv;
-
-	sr = &fup->srbuf;
-	sr->sr_type = SR_DIRUP;
-	sr->sr_file = xstrdup(name);
-	sr->sr_clientattr = fattr_decode(attr);
-	sr->sr_serverattr = fattr_decode(attr);
-	if (sr->sr_clientattr == NULL || sr->sr_serverattr == NULL) 
-		return (UPDATER_ERR_PROTO);
-	fattr_mergedefault(sr->sr_clientattr);
-	fattr_umask(sr->sr_clientattr, coll->co_umask);
-	rv = fattr_install(sr->sr_clientattr, fup->destpath, NULL);
-	lprintf(1, " SetAttrs %s\n", name);
-	if (rv == -1) {
-		xasprintf(&up->errmsg, "Cannot install \"%s\" to \"%s\": %s",
-		    fup->temppath, fup->destpath, strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	/*
-	 * Now, make sure they were set and record what was set in the status
-	 * file.
-	 */
-	fa = fattr_frompath(fup->destpath, FATTR_NOFOLLOW);
-	if (fa == NULL) {
-		xasprintf(&up->errmsg, "Cannot open \%s\": %s", fup->destpath,
-		    strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	fattr_free(sr->sr_clientattr);
-	fattr_maskout(fa, FA_FLAGS);
-	sr->sr_clientattr = fa;
-	error = status_put(fup->st, sr);
-	if (error) {
-		up->errmsg = status_errmsg(fup->st);
-		return (UPDATER_ERR_MSG);
-	}
-
-	return (0);
-}
-
-static int
-updater_diff(struct updater *up, struct file_update *fup)
-{
-	char md5[MD5_DIGEST_SIZE];
-	struct coll *coll;
-	struct statusrec *sr;
-	struct fattr *fa, *tmp;
-	char *author, *path, *revnum, *revdate;
-	char *line, *cmd;
-	int error;
-
-	coll = fup->coll;
-	sr = &fup->srbuf;
-	path = fup->destpath;
-
-	lprintf(1, " Edit %s\n", fup->coname);
-	while ((line = stream_getln(up->rd, NULL)) != NULL) {
-		if (strcmp(line, ".") == 0)
-			break;
-		cmd = proto_get_ascii(&line);
-		if (cmd == NULL || strcmp(cmd, "D") != 0)
-			return (UPDATER_ERR_PROTO);
-		revnum = proto_get_ascii(&line);
-		proto_get_ascii(&line); /* XXX - diffbase */
-		revdate = proto_get_ascii(&line);
-		author = proto_get_ascii(&line);
-		if (author == NULL || line != NULL)
-			return (UPDATER_ERR_PROTO);
-		if (sr->sr_revnum != NULL)
-			free(sr->sr_revnum);
-		if (sr->sr_revdate != NULL)
-			free(sr->sr_revdate);
-		if (fup->author != NULL)
-			free(fup->author);
-		sr->sr_revnum = xstrdup(revnum);
-		sr->sr_revdate = xstrdup(revdate);
-		fup->author = xstrdup(author);
-		if (fup->orig == NULL) {
-			/* First patch, the "origin" file is the one we have. */
-			fup->orig = stream_open_file(path, O_RDONLY);
-			if (fup->orig == NULL) {
-				xasprintf(&up->errmsg, "%s: Cannot open: %s",
-				    path, strerror(errno));
-				return (UPDATER_ERR_MSG);
-			}
-		} else {
-			/* Subsequent patches. */
-			stream_close(fup->orig);
-			fup->orig = fup->to;
-			stream_rewind(fup->orig);
-			unlink(fup->temppath);
-			free(fup->temppath);
-			fup->temppath = tempname(path);
-		}
-		fup->to = stream_open_file(fup->temppath,
-		    O_RDWR | O_CREAT | O_TRUNC, 0600);
-		if (fup->to == NULL) {
-			xasprintf(&up->errmsg, "%s: Cannot open: %s",
-			    fup->temppath, strerror(errno));
-			return (UPDATER_ERR_MSG);
-		}
-		lprintf(2, "  Add delta %s %s %s\n", sr->sr_revnum,
-		    sr->sr_revdate, fup->author);
-		error = updater_diff_batch(up, fup);
-		if (error)
-			return (error);
-	}
-	if (line == NULL)
-		return (UPDATER_ERR_READ);
-
-	fa = fattr_frompath(path, FATTR_FOLLOW);
-	tmp = fattr_forcheckout(sr->sr_serverattr, coll->co_umask);
-	fattr_override(fa, tmp, FA_MASK);
-	fattr_free(tmp);
-	fattr_maskout(fa, FA_MODTIME);
-	sr->sr_clientattr = fa;
-
-	if (MD5_File(fup->temppath, md5) == -1) {
-		xasprintf(&up->errmsg,
-		    "Cannot calculate checksum for \"%s\": %s",
-		    path, strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	error = updater_updatefile(up, fup, md5, 0);
-	return (error);
-}
-
-/*
- * Edit a file and add delta.
- */
-static int
-updater_diff_batch(struct updater *up, struct file_update *fup)
-{
-	struct stream *rd;
-	char *cmd, *line, *state, *tok;
-	int error;
-
-	state = NULL;
-	rd = up->rd;
-	while ((line = stream_getln(rd, NULL)) != NULL) {
-		if (strcmp(line, ".") == 0)
-			break;
-		cmd = proto_get_ascii(&line);
-		if (cmd == NULL || strlen(cmd) != 1) {
-			error = UPDATER_ERR_PROTO;
-			goto bad;
-		}
-		switch (cmd[0]) {
-		case 'L':
-			line = stream_getln(rd, NULL);
-			/* XXX - We're just eating the log for now. */
-			while (line != NULL && strcmp(line, ".") != 0 &&
-			    strcmp(line, ".+") != 0)
-				line = stream_getln(rd, NULL);
-			if (line == NULL) {
-				error = UPDATER_ERR_READ;
-				goto bad;
-			}
-			break;
-		case 'S':
-			tok = proto_get_ascii(&line);
-			if (tok == NULL || line != NULL) {
-				error = UPDATER_ERR_PROTO;
-				goto bad;
-			}
-			if (state != NULL)
-				free(state);
-			state = xstrdup(tok);
-			break;
-		case 'T':
-			error = updater_diff_apply(up, fup, state);
-			if (error)
-				goto bad;
-			break;
-		default:
-			error = UPDATER_ERR_PROTO;
-			goto bad;
-		}
-	}
-	if (line == NULL) {
-		error = UPDATER_ERR_READ;
-		goto bad;
-	}
-	if (state != NULL)
-		free(state);
-	return (0);
-bad:
-	if (state != NULL)
-		free(state);
-	return (error);
-}
-
-int
-updater_diff_apply(struct updater *up, struct file_update *fup, char *state)
-{
-	struct diffinfo dibuf, *di;
-	struct coll *coll;
-	struct statusrec *sr;
-	int error;
-
-	coll = fup->coll;
-	sr = &fup->srbuf;
-	di = &dibuf;
-
-	di->di_rcsfile = sr->sr_file;
-	di->di_cvsroot = coll->co_cvsroot;
-	di->di_revnum = sr->sr_revnum;
-	di->di_revdate = sr->sr_revdate;
-	di->di_author = fup->author;
-	di->di_tag = sr->sr_tag;
-	di->di_state = state;
-	di->di_expand = fup->expand;
-
-	error = diff_apply(up->rd, fup->orig, fup->to, coll->co_keyword, di, 1);
-	if (error) {
-		/* XXX Bad error message */
-		xasprintf(&up->errmsg, "Bad diff from server");
-		return (UPDATER_ERR_MSG);
-	}
-	return (0);
-}
-
-/* Update or create a node. */
-static int
-updater_updatenode(struct updater *up, struct coll *coll,
-    struct file_update *fup, char *name, char *attr)
-{
-	struct fattr *fa, *fileattr;
-	struct status *st;
-	struct statusrec *sr;
-	int error, rv;
-
-	sr = &fup->srbuf;
-	st = fup->st;
-	fa = fattr_decode(attr);
-
-	if (fattr_type(fa) == FT_SYMLINK) {
-		lprintf(1, " Symlink %s -> %s\n", name, 
-		    fattr_getlinktarget(fa));
-	} else {
-		lprintf(1, " Mknod %s\n", name);
-	}
-
-	/* Create directory. */
-	error = mkdirhier(fup->destpath, coll->co_umask);
-	if (error)
-		return (UPDATER_ERR_PROTO);
-
-	/* If it does not exist, create it. */
-	if (access(fup->destpath, F_OK) != 0)
-		fattr_makenode(fa, fup->destpath);
-
-	/*
-	 * Coming from attic? I don't think this is a problem since we have
-	 * determined attic before we call this function (Look at UpdateNode in
-	 * cvsup).
-	 */
-	fattr_umask(fa, coll->co_umask);
-	rv = fattr_install(fa, fup->destpath, fup->temppath);
-	if (rv == -1) {
-		xasprintf(&up->errmsg, "Cannot update attributes on "
-	    "\"%s\": %s", fup->destpath, strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	/*
-	 * XXX: Executes not implemented. Have not encountered much use for it
-	 * yet.
-	 */
-	/*
-	 * We weren't necessarily able to set all the file attributes to the
-	 * desired values, and any executes may have altered the attributes.
-	 * To make sure we record the actual attribute values, we fetch
-	 * them from the file.
-	 *
-	 * However, we preserve the link count as received from the
-	 * server.  This is important for preserving hard links in mirror
-	 * mode.
-	 */
-	fileattr = fattr_frompath(fup->destpath, FATTR_NOFOLLOW);
-	if (fileattr == NULL) {
-		xasprintf(&up->errmsg, "Cannot stat \"%s\": %s", fup->destpath,
-		    strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	fattr_override(fileattr, sr->sr_clientattr, FA_LINKCOUNT);
-	fattr_free(sr->sr_clientattr);
-	sr->sr_clientattr = fileattr;
-
-	/*
-	 * To save space, don't write out the device and inode unless
-	 * the link count is greater than 1.  These attributes are used
-	 * only for detecting hard links.  If the link count is 1 then we
-	 * know there aren't any hard links.
-	 */
-	if (!(fattr_getmask(sr->sr_clientattr) & FA_LINKCOUNT) ||
-	    fattr_getlinkcount(sr->sr_clientattr) <= 1)
-		fattr_maskout(sr->sr_clientattr, FA_DEV | FA_INODE);
-
-	/* If it is a symlink, write only out it's path. */
-	if (fattr_type(fa) == FT_SYMLINK) {
-		fattr_maskout(sr->sr_clientattr, ~(FA_FILETYPE |
-		    FA_LINKTARGET));
-	}
-	fattr_maskout(sr->sr_clientattr, FA_FLAGS);
-	error = status_put(st, sr);
-	if (error) {
-		up->errmsg = status_errmsg(st);
-		return (UPDATER_ERR_MSG);
-	}
-	fattr_free(fa);
-
-	return (0);
-}
-
-/*
- * Fetches a new file in CVS mode.
- */
-static int
-updater_addfile(struct updater *up, struct file_update *fup, char *attr,
-    int isfixup)
-{
-	struct coll *coll;
-	struct stream *to;
-	struct statusrec *sr;
-	struct fattr *fa;
-	char buf[BUFSIZE];
-	char md5[MD5_DIGEST_SIZE];
-	ssize_t nread;
-	off_t fsize, remains;
-	char *cmd, *line, *path;
-	int error; 
-
-	coll = fup->coll;
-	path = fup->destpath;
-	sr = &fup->srbuf;
-	fa = fattr_decode(attr);
-	fsize = fattr_filesize(fa);
-
-	error = mkdirhier(path, coll->co_umask);
-	if (error)
-		return (UPDATER_ERR_PROTO);
-	to = stream_open_file(fup->temppath, O_WRONLY | O_CREAT | O_TRUNC, 0755);
-	if (to == NULL) {
-		xasprintf(&up->errmsg, "%s: Cannot create: %s",
-		    fup->temppath, strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	stream_filter_start(to, STREAM_FILTER_MD5, md5);
-	remains = fsize;
-	do {
-		nread = stream_read(up->rd, buf, (BUFSIZE > remains ?
-		    remains : BUFSIZE));
-		if (nread == -1)
-			return (UPDATER_ERR_PROTO);
-		remains -= nread;
-		if (stream_write(to, buf, nread) == -1)
-			goto bad;
-	} while (remains > 0);
-	stream_close(to);
-	line = stream_getln(up->rd, NULL);
-	if (line == NULL)
-		return (UPDATER_ERR_PROTO);
-	/* Check for EOF. */
-	if (!(*line == '.' || (strncmp(line, ".<", 2) != 0)))
-		return (UPDATER_ERR_PROTO);
-	line = stream_getln(up->rd, NULL);
-	if (line == NULL)
-		return (UPDATER_ERR_PROTO);
-
-	cmd = proto_get_ascii(&line);
-	fup->wantmd5 = proto_get_ascii(&line);
-	if (fup->wantmd5 == NULL || line != NULL || strcmp(cmd, "5") != 0)
-		return (UPDATER_ERR_PROTO);
-
-	sr->sr_clientattr = fattr_frompath(fup->temppath, FATTR_NOFOLLOW);
-	if (sr->sr_clientattr == NULL)
-		return (UPDATER_ERR_PROTO);
-	fattr_override(sr->sr_clientattr, sr->sr_serverattr,
-	    FA_MODTIME | FA_MASK);
-	error = updater_updatefile(up, fup, md5, isfixup);
-	fup->wantmd5 = NULL;	/* So that it doesn't get freed. */
-	return (error);
-bad:
-	xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath,
-	    strerror(errno));
-	return (UPDATER_ERR_MSG);
-}
-
-static int
-updater_checkout(struct updater *up, struct file_update *fup, int isfixup)
-{
-	char md5[MD5_DIGEST_SIZE];
-	struct statusrec *sr;
-	struct coll *coll;
-	struct stream *to;
-	ssize_t nbytes;
-	size_t size;
-	char *cmd, *path, *line;
-	int error, first;
-
-	coll = fup->coll;
-	sr = &fup->srbuf;
-	path = fup->destpath;
-
-	if (isfixup)
-		lprintf(1, " Fixup %s\n", fup->coname);
-	else
-		lprintf(1, " Checkout %s\n", fup->coname);
-	error = mkdirhier(path, coll->co_umask);
-	if (error) {
-		xasprintf(&up->errmsg,
-		    "Cannot create directories leading to \"%s\": %s",
-		    path, strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-
-	to = stream_open_file(fup->temppath,
-	    O_WRONLY | O_CREAT | O_TRUNC, 0600);
-	if (to == NULL) {
-		xasprintf(&up->errmsg, "%s: Cannot create: %s",
-		    fup->temppath, strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	stream_filter_start(to, STREAM_FILTER_MD5, md5);
-	line = stream_getln(up->rd, &size);
-	first = 1;
-	while (line != NULL) {
-		if (line[size - 1] == '\n')
-			size--;
-	       	if ((size == 1 && *line == '.') ||
-		    (size == 2 && memcmp(line, ".+", 2) == 0))
-			break;
-		if (size >= 2 && memcmp(line, "..", 2) == 0) {
-			size--;
-			line++;
-		}
-		if (!first) {
-			nbytes = stream_write(to, "\n", 1);
-			if (nbytes == -1)
-				goto bad;
-		}
-		nbytes = stream_write(to, line, size);
-		if (nbytes == -1)
-			goto bad;
-		line = stream_getln(up->rd, &size);
-		first = 0;
-	}
-	if (line == NULL) {
-		stream_close(to);
-		return (UPDATER_ERR_READ);
-	}
-	if (size == 1 && *line == '.') {
-		nbytes = stream_write(to, "\n", 1);
-		if (nbytes == -1)
-			goto bad;
-	}
-	stream_close(to);
-	/* Get the checksum line. */
-	line = stream_getln(up->rd, NULL);
-	if (line == NULL)
-		return (UPDATER_ERR_READ);
-	cmd = proto_get_ascii(&line);
-	fup->wantmd5 = proto_get_ascii(&line);
-	if (fup->wantmd5 == NULL || line != NULL || strcmp(cmd, "5") != 0)
-		return (UPDATER_ERR_PROTO);
-	error = updater_updatefile(up, fup, md5, isfixup);
-	fup->wantmd5 = NULL;	/* So that it doesn't get freed. */
-	if (error)
-		return (error);
-	return (0);
-bad:
-	xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath,
-	    strerror(errno));
-	return (UPDATER_ERR_MSG);
-}
-
-/*
- * Remove all empty directories below file.
- * This function will trash the path passed to it.
- */
-static void
-updater_prunedirs(char *base, char *file)
-{
-	char *cp;
-	int error;
-
-	while ((cp = strrchr(file, '/')) != NULL) {
-		*cp = '\0';
-		if (strcmp(base, file) == 0)
-			return;
-		error = rmdir(file);
-		if (error)
-			return;
-	}
-}
-
-/*
- * Edit an RCS file.
- */
-static int
-updater_rcsedit(struct updater *up, struct file_update *fup, char *name,
-    char *rcsopt)
-{
-	struct coll *coll;
-	struct stream *dest;
-	struct statusrec *sr;
-	struct status *st;
-	struct rcsfile *rf;
-	struct fattr *oldfattr;
-	char md5[MD5_DIGEST_SIZE];
-	char *branch, *cmd, *expand, *line, *path, *revnum, *tag, *temppath;
-	int error;
-
-	coll = fup->coll;
-	sr = &fup->srbuf;
-	st = fup->st;
-	temppath = fup->temppath;
-	path = fup->origpath != NULL ? fup->origpath : fup->destpath;
-	error = 0;
-
-	/* If the path is new, we must create the Attic dir if needed. */
-	if (fup->origpath != NULL) {
-		error = mkdirhier(fup->destpath, coll->co_umask);
-		if (error) {
-			xasprintf(&up->errmsg, "Unable to create Attic dir for "
-			    "%s\n", fup->origpath);
-			return (UPDATER_ERR_MSG);
-		}
-	}
-	/*
-	 * XXX: we could avoid parsing overhead if we're reading ahead before we
-	 * parse the file.
-	 */
-	oldfattr = fattr_frompath(path, FATTR_NOFOLLOW);
-	if (oldfattr == NULL) {
-		xasprintf(&up->errmsg, "%s: Cannot get attributes: %s", path,
-		    strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	fattr_merge(sr->sr_serverattr, oldfattr);
-	rf = NULL;
-
-	/* Macro for making touching an RCS file faster. */
-#define UPDATER_OPENRCS(rf, up, path, name, cvsroot, tag) do {		\
-	if ((rf) == NULL) {						\
-		lprintf(1, " Edit %s", fup->coname);			\
-		if (fup->attic)						\
-			lprintf(1, " -> Attic");			\
-		lprintf(1, "\n");					\
-		(rf) = rcsfile_frompath((path), (name), (cvsroot),	\
-		    (tag), 0);						\
-		if ((rf) == NULL) {					\
-			xasprintf(&(up)->errmsg,			\
-			    "Error reading rcsfile %s\n", (name));	\
-			return (UPDATER_ERR_MSG);			\
-		}							\
-	}								\
-} while (0)
-
-	while ((line = stream_getln(up->rd, NULL)) != NULL) {
-		if (strcmp(line, ".") == 0)
-			break;
-		cmd = proto_get_ascii(&line);
-		if (cmd == NULL) {
-			lprintf(-1, "Error editing %s\n", name);
-			return (UPDATER_ERR_PROTO);
-		}
-		switch(cmd[0]) {
-			case 'B':
-				branch = proto_get_ascii(&line);
-				if (branch == NULL || line != NULL)
-					return (UPDATER_ERR_PROTO);
-				UPDATER_OPENRCS(rf, up, path, name,
-				    coll->co_cvsroot, coll->co_tag);
-				break;
-			case 'b':
-				UPDATER_OPENRCS(rf, up, path, name,
-				    coll->co_cvsroot, coll->co_tag);
-				rcsfile_setval(rf, RCSFILE_BRANCH, NULL);
-				break;
-			case 'D':
-				UPDATER_OPENRCS(rf, up, path, name,
-				    coll->co_cvsroot, coll->co_tag);
-				error = updater_addelta(rf, up->rd, line);
-				if (error)
-					return (error);
-				break;
-			case 'd':
-				revnum = proto_get_ascii(&line);
-				if (revnum == NULL || line != NULL)
-					return (UPDATER_ERR_PROTO);
-				UPDATER_OPENRCS(rf, up, path, name,
-				    coll->co_cvsroot, coll->co_tag);
-				rcsfile_deleterev(rf, revnum);
-				break;
-			case 'E':
-				expand = proto_get_ascii(&line);
-				if (expand == NULL || line != NULL)
-					return (UPDATER_ERR_PROTO);
-				UPDATER_OPENRCS(rf, up, path, name,
-				    coll->co_cvsroot, coll->co_tag);
-				rcsfile_setval(rf, RCSFILE_EXPAND, expand);
-				break;
-			case 'T':
-				tag = proto_get_ascii(&line);
-				revnum = proto_get_ascii(&line);
-				if (tag == NULL || revnum == NULL ||
-				    line != NULL)
-					return (UPDATER_ERR_PROTO);
-				UPDATER_OPENRCS(rf, up, path, name,
-				    coll->co_cvsroot, coll->co_tag);
-				rcsfile_addtag(rf, tag, revnum);
-				break;
-			case 't':
-				tag = proto_get_ascii(&line);
-				revnum = proto_get_ascii(&line);
-				if (tag == NULL || revnum == NULL ||
-				    line != NULL)
-					return (UPDATER_ERR_PROTO);
-				UPDATER_OPENRCS(rf, up, path, name,
-				    coll->co_cvsroot, coll->co_tag);
-				rcsfile_deletetag(rf, tag, revnum);
-				break;
-			default:
-				return (UPDATER_ERR_PROTO);
-		}
-	}
-
-	if (rf == NULL) {
-		fattr_maskout(oldfattr, ~FA_MODTIME);
-		if (fattr_equal(oldfattr, sr->sr_serverattr))
-		 	lprintf(1, " SetAttrs %s", fup->coname);
-		else
-			lprintf(1, " Touch %s", fup->coname);
-		/* Install new attributes. */
-		fattr_umask(sr->sr_serverattr, coll->co_umask);
-		fattr_install(sr->sr_serverattr, fup->destpath, NULL);
-		if (fup->attic)
-			lprintf(1, " -> Attic");
-		lprintf(1, "\n");
-		fattr_free(oldfattr);
-		goto finish;
-	}
-
-	/* Write and rename temp file. */
-	dest = stream_open_file(fup->temppath,
-	    O_RDWR | O_CREAT | O_TRUNC, 0600);
-	if (dest == NULL) {
-		xasprintf(&up->errmsg, "Error opening file %s for writing: %s\n", 
-		    fup->temppath, strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	stream_filter_start(dest, STREAM_FILTER_MD5RCS, md5);
-	error = rcsfile_write(rf, dest);
-	stream_close(dest);
-	rcsfile_free(rf);
-	if (error) {
-		xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath,
-		    strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-
-finish:
-	sr->sr_clientattr = fattr_frompath(path, FATTR_NOFOLLOW);
-	if (sr->sr_clientattr == NULL) {
-		xasprintf(&up->errmsg, "%s: Cannot get attributes: %s",
-		    fup->destpath, strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	fattr_override(sr->sr_clientattr, sr->sr_serverattr,
-	    FA_MODTIME | FA_MASK);
-	if (rf != NULL) {
-		error = updater_updatefile(up, fup, md5, 0);
-		fup->wantmd5 = NULL;	/* So that it doesn't get freed. */
-		if (error)
-			return (error);
-	} else {
-		/* Record its attributes since we touched it. */
-		if (!(fattr_getmask(sr->sr_clientattr) & FA_LINKCOUNT) ||
-		    fattr_getlinkcount(sr->sr_clientattr) <= 1)
-		fattr_maskout(sr->sr_clientattr, FA_DEV | FA_INODE);
-		error = status_put(st, sr);
-		if (error) {
-			up->errmsg = status_errmsg(st);
-			return (UPDATER_ERR_MSG);
-		}
-	}
-
-	/* In this case, we need to remove the old file afterwards. */
-	/* XXX: Can we be sure that a file not edited is moved? I don't think
-	 * this is a problem, since if a file is moved, it should be edited to
-	 * show if it's dead or not.
-	 */
-	if (fup->origpath != NULL)
-		updater_deletefile(fup->origpath);
-	return (0);
-}
-
-/*
- * Add a delta to a RCS file.
- */
-int
-updater_addelta(struct rcsfile *rf, struct stream *rd, char *cmdline)
-{
-	struct delta *d;
-	size_t size;
-	char *author, *cmd, *diffbase, *line, *logline;
-	char *revdate, *revnum, *state, *textline;
-
-	revnum = proto_get_ascii(&cmdline);
-	diffbase = proto_get_ascii(&cmdline);
-	revdate = proto_get_ascii(&cmdline);
-	author = proto_get_ascii(&cmdline);
-	size = 0;
-
-	if (revnum == NULL || revdate == NULL || author == NULL)
-		return (UPDATER_ERR_PROTO);
-
-	/* First add the delta so we have it. */
-	d = rcsfile_addelta(rf, revnum, revdate, author, diffbase);
-	if (d == NULL) {
-		lprintf(-1, "Error adding delta %s\n", revnum);
-		return (UPDATER_ERR_READ);
-	}
-	while ((line = stream_getln(rd, NULL)) != NULL) {
-		if (strcmp(line, ".") == 0)
-			break;
-		cmd = proto_get_ascii(&line);
-		switch (cmd[0]) {
-			case 'L':
-				/* Do the same as in 'C' command. */
-				logline = stream_getln(rd, &size);
-				while (logline != NULL) {
-					if (size == 2 && *logline == '.')
-						break;
-					if (size == 3 && 
-					    memcmp(logline, ".+", 2) == 0) {
-						rcsdelta_truncatelog(d, -1);
-						break;
-					}
-					if (size >= 3 &&
-					    memcmp(logline, "..", 2) == 0) {
-						size--;
-						logline++;
-					}
-					if (rcsdelta_appendlog(d, logline, size)
-					    < 0)
-						return (-1);
-					logline = stream_getln(rd, &size);
-				}
-			break;
-			case 'N':
-			case 'n':
-				/* XXX: Not supported. */
-			break;
-			case 'S':
-				state = proto_get_ascii(&line);
-				if (state == NULL)
-					return (UPDATER_ERR_PROTO);
-				rcsdelta_setstate(d, state);
-			break;
-			case 'T':
-				/* Do the same as in 'C' command. */
-				textline = stream_getln(rd, &size);
-				while (textline != NULL) {
-					if (size == 2 && *textline == '.')
-						break;
-					if (size == 3 &&
-					    memcmp(textline, ".+", 2) == 0) {
-						/* Truncate newline. */
-						rcsdelta_truncatetext(d, -1);
-						break;
-					}
-					if (size >= 3 &&
-					    memcmp(textline, "..", 2) == 0) {
-						size--;
-						textline++;
-					}
-					if (rcsdelta_appendtext(d, textline,
-					    size) < 0)
-						return (-1);
-					textline = stream_getln(rd, &size);
-				}
-			break;
-		}
-	}
-
-	return (0);
-}
-
-int
-updater_append_file(struct updater *up, struct file_update *fup, off_t pos)
-{
-	struct fattr *fa;
-	struct stream *to;
-	struct statusrec *sr;
-	ssize_t nread;
-	off_t bytes;
-	char buf[BUFSIZE], md5[MD5_DIGEST_SIZE];
-	char *line, *cmd;
-	int error, fd;
-
-	sr = &fup->srbuf;
-	fa = sr->sr_serverattr;
-	to = stream_open_file(fup->temppath, O_WRONLY | O_CREAT | O_TRUNC,
-	    0755);
-	if (to == NULL) {
-		xasprintf(&up->errmsg, "%s: Cannot open: %s", fup->temppath,
-		    strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	fd = open(fup->destpath, O_RDONLY);
-	if (fd < 0) {
-		xasprintf(&up->errmsg, "%s: Cannot open: %s", fup->destpath,
-		    strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-
-	stream_filter_start(to, STREAM_FILTER_MD5, md5);
-	/* First write the existing content. */
-	while ((nread = read(fd, buf, BUFSIZE)) > 0) {
-		if (stream_write(to, buf, nread) == -1)
-			goto bad;
-	}
-	if (nread == -1) {
-		xasprintf(&up->errmsg, "%s: Error reading: %s", fup->destpath,
-		    strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	close(fd);
-
-	bytes = fattr_filesize(fa) - pos;
-	/* Append the new data. */
-	do {
-		nread = stream_read(up->rd, buf,
-		    (BUFSIZE > bytes) ? bytes : BUFSIZE);
-		if (nread == -1)
-			return (UPDATER_ERR_PROTO);
-		bytes -= nread;
-		if (stream_write(to, buf, nread) == -1)
-			goto bad;
-	} while (bytes > 0);
-	stream_close(to);
-
-	line = stream_getln(up->rd, NULL);
-	if (line == NULL)
-		return (UPDATER_ERR_PROTO);
-	/* Check for EOF. */
-	if (!(*line == '.' || (strncmp(line, ".<", 2) != 0)))
-		return (UPDATER_ERR_PROTO);
-	line = stream_getln(up->rd, NULL);
-	if (line == NULL)
-		return (UPDATER_ERR_PROTO);
-
-	cmd = proto_get_ascii(&line);
-	fup->wantmd5 = proto_get_ascii(&line);
-	if (fup->wantmd5 == NULL || line != NULL || strcmp(cmd, "5") != 0)
-		return (UPDATER_ERR_PROTO);
-
-	sr->sr_clientattr = fattr_frompath(fup->destpath, FATTR_NOFOLLOW);
-	if (sr->sr_clientattr == NULL)
-		return (UPDATER_ERR_PROTO);
-	fattr_override(sr->sr_clientattr, sr->sr_serverattr,
-	    FA_MODTIME | FA_MASK);
-	error = updater_updatefile(up, fup, md5, 0);
-	fup->wantmd5 = NULL;	/* So that it doesn't get freed. */
-	return (error);
-bad:
-	xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath,
-	    strerror(errno));
-	return (UPDATER_ERR_MSG);
-}
-
-/*
- * Read file data from stream of checkout commands, and write it to the
- * destination.
- */
-static int
-updater_read_checkout(struct stream *src, struct stream *dest)
-{
-	ssize_t nbytes;
-	size_t size;
-	char *line;
-	int first;
-
-	first = 1;
-	line = stream_getln(src, &size);
-	while (line != NULL) {
-		if (line[size - 1] == '\n')
-			size--;
-		if ((size == 1 && *line == '.') ||
-		    (size == 2 && strncmp(line, ".+", 2) == 0))
-			break;
-		if (size >= 2 && strncmp(line, "..", 2) == 0) {
-			size--;
-			line++;
-		}
-		if (!first) {
-			nbytes = stream_write(dest, "\n", 1);
-			if (nbytes == -1)
-				return (UPDATER_ERR_MSG);
-		}
-		nbytes = stream_write(dest, line, size);
-		if (nbytes == -1)
-			return (UPDATER_ERR_MSG);
-		line = stream_getln(src, &size);
-		first = 0;
-	}
-	if (line == NULL)
-		return (UPDATER_ERR_READ);
-	if (size == 1 && *line == '.') {
-		nbytes = stream_write(dest, "\n", 1);
-		if (nbytes == -1)
-			return (UPDATER_ERR_MSG);
-	}
-	return (0);
-}
-
-/* Update file using the rsync protocol. */
-static int
-updater_rsync(struct updater *up, struct file_update *fup, size_t blocksize)
-{
-	struct statusrec *sr;
-	struct stream *to;
-	char md5[MD5_DIGEST_SIZE];
-	ssize_t nbytes;
-	size_t blocknum, blockstart, blockcount;
-	char *buf, *line;
-	int error, orig;
-
-	sr = &fup->srbuf;
-
-	lprintf(1, " Rsync %s\n", fup->coname);
-	/* First open all files that we are going to work on. */
-	to = stream_open_file(fup->temppath, O_WRONLY | O_CREAT | O_TRUNC,
-	    0600);
-	if (to == NULL) {
-		xasprintf(&up->errmsg, "%s: Cannot create: %s",
-		    fup->temppath, strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	orig = open(fup->destpath, O_RDONLY);
-	if (orig < 0) {
-		xasprintf(&up->errmsg, "%s: Cannot open: %s",
-		    fup->destpath, strerror(errno));
-		return (UPDATER_ERR_MSG);
-	}
-	stream_filter_start(to, STREAM_FILTER_MD5, md5);
-
-	error = updater_read_checkout(up->rd, to);
-	if (error) {
-		xasprintf(&up->errmsg, "%s: Cannot write: %s", fup->temppath,
-		    strerror(errno));
-		return (error);
-	}
-
-	/* Buffer must contain blocksize bytes. */
-	buf = xmalloc(blocksize);
-	/* Done with the initial text, read and write chunks. */
-	line = stream_getln(up->rd, NULL);
-	while (line != NULL) {
-		if (strcmp(line, ".") == 0)
-			break;
-		error = UPDATER_ERR_PROTO;
-		if (proto_get_sizet(&line, &blockstart, 10) != 0)
-			goto bad;
-		if (proto_get_sizet(&line, &blockcount, 10) != 0)
-			goto bad;
-		/* Read blocks from original file. */
-		lseek(orig, (blocksize * blockstart), SEEK_SET);
-		error = UPDATER_ERR_MSG;
-		for (blocknum = 0; blocknum < blockcount; blocknum++) {
-			nbytes = read(orig, buf, blocksize);
-			if (nbytes < 0) {
-				xasprintf(&up->errmsg, "%s: Cannot read: %s",
-				    fup->destpath, strerror(errno));
-				goto bad;
-			}
-			nbytes = stream_write(to, buf, nbytes);
-			if (nbytes == -1) {
-				xasprintf(&up->errmsg, "%s: Cannot write: %s",
-				    fup->temppath, strerror(errno));
-				goto bad;
-			}
-		}
-		/* Get the remaining text from the server. */
-		error = updater_read_checkout(up->rd, to);
-		if (error) {
-			xasprintf(&up->errmsg, "%s: Cannot write: %s",
-			    fup->temppath, strerror(errno));
-			goto bad;
-		}
-		line = stream_getln(up->rd, NULL);
-	}
-	stream_close(to);
-	close(orig);
-
-	sr->sr_clientattr = fattr_frompath(fup->destpath, FATTR_NOFOLLOW);
-	if (sr->sr_clientattr == NULL)
-		return (UPDATER_ERR_PROTO);
-	fattr_override(sr->sr_clientattr, sr->sr_serverattr,
-	    FA_MODTIME | FA_MASK);
-
-	error = updater_updatefile(up, fup, md5, 0);
-	fup->wantmd5 = NULL;	/* So that it doesn't get freed. */
-bad:
-	free(buf);
-	return (error);
-}
diff --git a/usr.bin/csup/updater.h b/usr.bin/csup/updater.h
deleted file mode 100644
index b71c9c572f53..000000000000
--- a/usr.bin/csup/updater.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * Copyright (c) 2003-2004, Maxime Henrion <mux@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 _UPDATER_H_
-#define _UPDATER_H_
-
-void	*updater(void *);
-
-#endif /* !_UPDATER_H_ */
diff --git a/usr.bin/ctlstat/ctlstat.8 b/usr.bin/ctlstat/ctlstat.8
index fef1ff859aeb..22da2bfd2a5a 100644
--- a/usr.bin/ctlstat/ctlstat.8
+++ b/usr.bin/ctlstat/ctlstat.8
@@ -119,5 +119,5 @@ every 10 seconds.
 .Xr ctladm 8 ,
 .Xr iostat 8
 .Sh AUTHORS
-.An Ken Merry Aq ken@FreeBSD.org
-.An Will Andrews Aq will@FreeBSD.org
+.An Ken Merry Aq Mt ken@FreeBSD.org
+.An Will Andrews Aq Mt will@FreeBSD.org
diff --git a/usr.bin/drill/Makefile b/usr.bin/drill/Makefile
index a963bfc79d1e..0db060482379 100644
--- a/usr.bin/drill/Makefile
+++ b/usr.bin/drill/Makefile
@@ -13,7 +13,7 @@ NO_WERROR= true
 MAN=	drill.1
 
 DPADD+=	${LIBLDNS} ${LIBCRYPTO}
-LDADD+=	-lldns -lcrypto
+LDADD+=	${LDLDNS} -lcrypto
 USEPRIVATELIB= ldns
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/ee/Makefile b/usr.bin/ee/Makefile
index 7437731ade21..8dcf2f569318 100644
--- a/usr.bin/ee/Makefile
+++ b/usr.bin/ee/Makefile
@@ -8,8 +8,8 @@ CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \
 PROG=	ee
 LINKS=	${BINDIR}/ee ${BINDIR}/ree ${BINDIR}/ee ${BINDIR}/edit
 MLINKS=	ee.1 ree.1 ee.1 edit.1
-DPADD=	${LIBNCURSES}
-LDADD=	-lncurses
+DPADD=	${LIBNCURSESW}
+LDADD=	-lncursesw
 
 WARNS?=	2
 
diff --git a/usr.bin/elf2aout/elf2aout.1 b/usr.bin/elf2aout/elf2aout.1
index 0f4be221348d..33c603629868 100644
--- a/usr.bin/elf2aout/elf2aout.1
+++ b/usr.bin/elf2aout/elf2aout.1
@@ -59,6 +59,6 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jake Burkholder Aq jake@FreeBSD.org .
+.An Jake Burkholder Aq Mt jake@FreeBSD.org .
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
diff --git a/usr.bin/elfdump/elfdump.1 b/usr.bin/elfdump/elfdump.1
index 5818297d82e8..dbb3171213ee 100644
--- a/usr.bin/elfdump/elfdump.1
+++ b/usr.bin/elfdump/elfdump.1
@@ -102,10 +102,10 @@ The
 .Nm
 utility
 was written by
-.An Jake Burkholder Aq jake@FreeBSD.org .
+.An Jake Burkholder Aq Mt jake@FreeBSD.org .
 This
 manual page was written by
-.An David O'Brien Aq obrien@FreeBSD.org .
+.An David O'Brien Aq Mt obrien@FreeBSD.org .
 .Sh BUGS
 Does not fully implement the
 .Tn ELF
diff --git a/usr.bin/elfdump/elfdump.c b/usr.bin/elfdump/elfdump.c
index c86e6fca0608..49c2aae86ca9 100644
--- a/usr.bin/elfdump/elfdump.c
+++ b/usr.bin/elfdump/elfdump.c
@@ -167,77 +167,83 @@ static int elf64_offsets[] = {
 
 /* http://www.sco.com/developers/gabi/latest/ch5.dynamic.html#tag_encodings */
 static const char *
-d_tags(u_int64_t tag) {
+d_tags(u_int64_t tag)
+{
+	static char unknown_tag[48];
+
 	switch (tag) {
-	case 0: return "DT_NULL";
-	case 1: return "DT_NEEDED";
-	case 2: return "DT_PLTRELSZ";
-	case 3: return "DT_PLTGOT";
-	case 4: return "DT_HASH";
-	case 5: return "DT_STRTAB";
-	case 6: return "DT_SYMTAB";
-	case 7: return "DT_RELA";
-	case 8: return "DT_RELASZ";
-	case 9: return "DT_RELAENT";
-	case 10: return "DT_STRSZ";
-	case 11: return "DT_SYMENT";
-	case 12: return "DT_INIT";
-	case 13: return "DT_FINI";
-	case 14: return "DT_SONAME";
-	case 15: return "DT_RPATH";
-	case 16: return "DT_SYMBOLIC";
-	case 17: return "DT_REL";
-	case 18: return "DT_RELSZ";
-	case 19: return "DT_RELENT";
-	case 20: return "DT_PLTREL";
-	case 21: return "DT_DEBUG";
-	case 22: return "DT_TEXTREL";
-	case 23: return "DT_JMPREL";
-	case 24: return "DT_BIND_NOW";
-	case 25: return "DT_INIT_ARRAY";
-	case 26: return "DT_FINI_ARRAY";
-	case 27: return "DT_INIT_ARRAYSZ";
-	case 28: return "DT_FINI_ARRAYSZ";
-	case 29: return "DT_RUNPATH";
-	case 30: return "DT_FLAGS";
-	case 32: return "DT_PREINIT_ARRAY"; /* XXX: DT_ENCODING */
-	case 33: return "DT_PREINIT_ARRAYSZ";
+	case DT_NULL:		return "DT_NULL";
+	case DT_NEEDED:		return "DT_NEEDED";
+	case DT_PLTRELSZ:	return "DT_PLTRELSZ";
+	case DT_PLTGOT:		return "DT_PLTGOT";
+	case DT_HASH:		return "DT_HASH";
+	case DT_STRTAB:		return "DT_STRTAB";
+	case DT_SYMTAB:		return "DT_SYMTAB";
+	case DT_RELA:		return "DT_RELA";
+	case DT_RELASZ:		return "DT_RELASZ";
+	case DT_RELAENT:	return "DT_RELAENT";
+	case DT_STRSZ:		return "DT_STRSZ";
+	case DT_SYMENT:		return "DT_SYMENT";
+	case DT_INIT:		return "DT_INIT";
+	case DT_FINI:		return "DT_FINI";
+	case DT_SONAME:		return "DT_SONAME";
+	case DT_RPATH:		return "DT_RPATH";
+	case DT_SYMBOLIC:	return "DT_SYMBOLIC";
+	case DT_REL:		return "DT_REL";
+	case DT_RELSZ:		return "DT_RELSZ";
+	case DT_RELENT:		return "DT_RELENT";
+	case DT_PLTREL:		return "DT_PLTREL";
+	case DT_DEBUG:		return "DT_DEBUG";
+	case DT_TEXTREL:	return "DT_TEXTREL";
+	case DT_JMPREL:		return "DT_JMPREL";
+	case DT_BIND_NOW:	return "DT_BIND_NOW";
+	case DT_INIT_ARRAY:	return "DT_INIT_ARRAY";
+	case DT_FINI_ARRAY:	return "DT_FINI_ARRAY";
+	case DT_INIT_ARRAYSZ:	return "DT_INIT_ARRAYSZ";
+	case DT_FINI_ARRAYSZ:	return "DT_FINI_ARRAYSZ";
+	case DT_RUNPATH:	return "DT_RUNPATH";
+	case DT_FLAGS:		return "DT_FLAGS";
+	case DT_PREINIT_ARRAY:	return "DT_PREINIT_ARRAY"; /* XXX DT_ENCODING */
+	case DT_PREINIT_ARRAYSZ:return "DT_PREINIT_ARRAYSZ";
 	/* 0x6000000D - 0x6ffff000 operating system-specific semantics */
-	case 0x6ffffdf5: return "DT_GNU_PRELINKED";
-	case 0x6ffffdf6: return "DT_GNU_CONFLICTSZ";
-	case 0x6ffffdf7: return "DT_GNU_LIBLISTSZ";
-	case 0x6ffffdf8: return "DT_SUNW_CHECKSUM";
-	case 0x6ffffdf9: return "DT_PLTPADSZ";
-	case 0x6ffffdfa: return "DT_MOVEENT";
-	case 0x6ffffdfb: return "DT_MOVESZ";
-	case 0x6ffffdfc: return "DT_FEATURE";
-	case 0x6ffffdfd: return "DT_POSFLAG_1";
-	case 0x6ffffdfe: return "DT_SYMINSZ";
-	case 0x6ffffdff: return "DT_SYMINENT (DT_VALRNGHI)";
-	case 0x6ffffe00: return "DT_ADDRRNGLO";
-	case 0x6ffffef8: return "DT_GNU_CONFLICT";
-	case 0x6ffffef9: return "DT_GNU_LIBLIST";
-	case 0x6ffffefa: return "DT_SUNW_CONFIG";
-	case 0x6ffffefb: return "DT_SUNW_DEPAUDIT";
-	case 0x6ffffefc: return "DT_SUNW_AUDIT";
-	case 0x6ffffefd: return "DT_SUNW_PLTPAD";
-	case 0x6ffffefe: return "DT_SUNW_MOVETAB";
-	case 0x6ffffeff: return "DT_SYMINFO (DT_ADDRRNGHI)";
-	case 0x6ffffff9: return "DT_RELACOUNT";
-	case 0x6ffffffa: return "DT_RELCOUNT";
-	case 0x6ffffffb: return "DT_FLAGS_1";
-	case 0x6ffffffc: return "DT_VERDEF";
-	case 0x6ffffffd: return "DT_VERDEFNUM";
-	case 0x6ffffffe: return "DT_VERNEED";
-	case 0x6fffffff: return "DT_VERNEEDNUM";
-	case 0x6ffffff0: return "DT_GNU_VERSYM";
+	case 0x6ffffdf5:	return "DT_GNU_PRELINKED";
+	case 0x6ffffdf6:	return "DT_GNU_CONFLICTSZ";
+	case 0x6ffffdf7:	return "DT_GNU_LIBLISTSZ";
+	case 0x6ffffdf8:	return "DT_SUNW_CHECKSUM";
+	case DT_PLTPADSZ:	return "DT_PLTPADSZ";
+	case DT_MOVEENT:	return "DT_MOVEENT";
+	case DT_MOVESZ:		return "DT_MOVESZ";
+	case 0x6ffffdfc:	return "DT_FEATURE";
+	case DT_POSFLAG_1:	return "DT_POSFLAG_1";
+	case DT_SYMINSZ:	return "DT_SYMINSZ";
+	case DT_SYMINENT :	return "DT_SYMINENT (DT_VALRNGHI)";
+	case DT_ADDRRNGLO:	return "DT_ADDRRNGLO";
+	case DT_GNU_HASH:	return "DT_GNU_HASH";
+	case 0x6ffffef8:	return "DT_GNU_CONFLICT";
+	case 0x6ffffef9:	return "DT_GNU_LIBLIST";
+	case 0x6ffffefa:	return "DT_SUNW_CONFIG";
+	case 0x6ffffefb:	return "DT_SUNW_DEPAUDIT";
+	case 0x6ffffefc:	return "DT_SUNW_AUDIT";
+	case 0x6ffffefd:	return "DT_SUNW_PLTPAD";
+	case 0x6ffffefe:	return "DT_SUNW_MOVETAB";
+	case DT_SYMINFO :	return "DT_SYMINFO (DT_ADDRRNGHI)";
+	case DT_RELACOUNT:	return "DT_RELACOUNT";
+	case DT_RELCOUNT:	return "DT_RELCOUNT";
+	case DT_FLAGS_1:	return "DT_FLAGS_1";
+	case DT_VERDEF:		return "DT_VERDEF";
+	case DT_VERDEFNUM:	return "DT_VERDEFNUM";
+	case DT_VERNEED:	return "DT_VERNEED";
+	case DT_VERNEEDNUM:	return "DT_VERNEEDNUM";
+	case 0x6ffffff0:	return "DT_GNU_VERSYM";
 	/* 0x70000000 - 0x7fffffff processor-specific semantics */
-	case 0x70000000: return "DT_IA_64_PLT_RESERVE";
-	case 0x7ffffffd: return "DT_SUNW_AUXILIARY";
-	case 0x7ffffffe: return "DT_SUNW_USED";
-	case 0x7fffffff: return "DT_SUNW_FILTER";
-	default: return "ERROR: TAG NOT DEFINED";
+	case 0x70000000:	return "DT_IA_64_PLT_RESERVE";
+	case 0x7ffffffd:	return "DT_SUNW_AUXILIARY";
+	case 0x7ffffffe:	return "DT_SUNW_USED";
+	case 0x7fffffff:	return "DT_SUNW_FILTER";
 	}
+	snprintf(unknown_tag, sizeof(unknown_tag),
+		"ERROR: TAG NOT DEFINED -- tag 0x%jx", (uintmax_t)tag);
+	return (unknown_tag);
 }
 
 static const char *
@@ -261,6 +267,7 @@ e_machines(u_int mach)
 	case EM_SPARCV9:return "EM_SPARCV9";
 	case EM_IA_64:	return "EM_IA_64";
 	case EM_X86_64:	return "EM_X86_64";
+	case EM_AARCH64:return "EM_AARCH64";
 	}
 	snprintf(machdesc, sizeof(machdesc),
 	    "(unknown machine) -- type 0x%x", mach);
@@ -303,40 +310,88 @@ static const char *p_flags[] = {
 
 /* http://www.sco.com/developers/gabi/latest/ch4.sheader.html#sh_type */
 static const char *
-sh_types(u_int64_t sht) {
-	switch (sht) {
-	case 0:	return "SHT_NULL";
-	case 1: return "SHT_PROGBITS";
-	case 2: return "SHT_SYMTAB";
-	case 3: return "SHT_STRTAB";
-	case 4: return "SHT_RELA";
-	case 5: return "SHT_HASH";
-	case 6: return "SHT_DYNAMIC";
-	case 7: return "SHT_NOTE";
-	case 8: return "SHT_NOBITS";
-	case 9: return "SHT_REL";
-	case 10: return "SHT_SHLIB";
-	case 11: return "SHT_DYNSYM";
-	case 14: return "SHT_INIT_ARRAY";
-	case 15: return "SHT_FINI_ARRAY";
-	case 16: return "SHT_PREINIT_ARRAY";
-	case 17: return "SHT_GROUP";
-	case 18: return "SHT_SYMTAB_SHNDX";
-	/* 0x60000000 - 0x6fffffff operating system-specific semantics */
-	case 0x6ffffff0: return "XXX:VERSYM";
-	case 0x6ffffff4: return "SHT_SUNW_dof";
-	case 0x6ffffff7: return "SHT_GNU_LIBLIST";
-	case 0x6ffffffc: return "XXX:VERDEF";
-	case 0x6ffffffd: return "SHT_SUNW(GNU)_verdef";
-	case 0x6ffffffe: return "SHT_SUNW(GNU)_verneed";
-	case 0x6fffffff: return "SHT_SUNW(GNU)_versym";
-	/* 0x70000000 - 0x7fffffff processor-specific semantics */
-	case 0x70000000: return "SHT_IA_64_EXT";
-	case 0x70000001: return "SHT_IA_64_UNWIND";
-	case 0x7ffffffd: return "XXX:AUXILIARY";
-	case 0x7fffffff: return "XXX:FILTER";
-	/* 0x80000000 - 0xffffffff application programs */
-	default: return "ERROR: SHT NOT DEFINED";
+sh_types(uint64_t machine, uint64_t sht) {
+	static char unknown_buf[64]; 
+
+	if (sht < 0x60000000) {
+		switch (sht) {
+		case SHT_NULL:		return "SHT_NULL";
+		case SHT_PROGBITS:	return "SHT_PROGBITS";
+		case SHT_SYMTAB:	return "SHT_SYMTAB";
+		case SHT_STRTAB:	return "SHT_STRTAB";
+		case SHT_RELA:		return "SHT_RELA";
+		case SHT_HASH:		return "SHT_HASH";
+		case SHT_DYNAMIC:	return "SHT_DYNAMIC";
+		case SHT_NOTE:		return "SHT_NOTE";
+		case SHT_NOBITS:	return "SHT_NOBITS";
+		case SHT_REL:		return "SHT_REL";
+		case SHT_SHLIB:		return "SHT_SHLIB";
+		case SHT_DYNSYM:	return "SHT_DYNSYM";
+		case SHT_INIT_ARRAY:	return "SHT_INIT_ARRAY";
+		case SHT_FINI_ARRAY:	return "SHT_FINI_ARRAY";
+		case SHT_PREINIT_ARRAY:	return "SHT_PREINIT_ARRAY";
+		case SHT_GROUP:		return "SHT_GROUP";
+		case SHT_SYMTAB_SHNDX:	return "SHT_SYMTAB_SHNDX";
+		}
+		snprintf(unknown_buf, sizeof(unknown_buf),
+		    "ERROR: SHT %ju NOT DEFINED", (uintmax_t)sht);
+		return (unknown_buf);
+	} else if (sht < 0x70000000) {
+		/* 0x60000000-0x6fffffff operating system-specific semantics */
+		switch (sht) {
+		case 0x6ffffff0:	return "XXX:VERSYM";
+		case SHT_SUNW_dof:	return "SHT_SUNW_dof";
+		case SHT_GNU_HASH:	return "SHT_GNU_HASH";
+		case 0x6ffffff7:	return "SHT_GNU_LIBLIST";
+		case 0x6ffffffc:	return "XXX:VERDEF";
+		case SHT_SUNW_verdef:	return "SHT_SUNW(GNU)_verdef";
+		case SHT_SUNW_verneed:	return "SHT_SUNW(GNU)_verneed";
+		case SHT_SUNW_versym:	return "SHT_SUNW(GNU)_versym";
+		}
+		snprintf(unknown_buf, sizeof(unknown_buf),
+		    "ERROR: OS-SPECIFIC SHT 0x%jx NOT DEFINED",
+		     (uintmax_t)sht);
+		return (unknown_buf);
+	} else if (sht < 0x80000000) {
+		/* 0x70000000-0x7fffffff processor-specific semantics */
+		switch (machine) {
+		case EM_ARM:
+			switch (sht) {
+			case SHT_ARM_EXIDX: return "SHT_ARM_EXIDX";
+			case SHT_ARM_PREEMPTMAP:return "SHT_ARM_PREEMPTMAP";
+			case SHT_ARM_ATTRIBUTES:return "SHT_ARM_ATTRIBUTES";
+			case SHT_ARM_DEBUGOVERLAY:
+			    return "SHT_ARM_DEBUGOVERLAY";
+			case SHT_ARM_OVERLAYSECTION:
+			    return "SHT_ARM_OVERLAYSECTION";
+			}
+			break;
+		case EM_IA_64:
+			switch (sht) {
+			case 0x70000000: return "SHT_IA_64_EXT";
+			case 0x70000001: return "SHT_IA_64_UNWIND";
+			}
+			break;
+		case EM_MIPS:
+			switch (sht) {
+			case SHT_MIPS_OPTIONS: return "SHT_MIPS_OPTIONS";
+			}
+			break;
+		}
+		switch (sht) {
+		case 0x7ffffffd: return "XXX:AUXILIARY";
+		case 0x7fffffff: return "XXX:FILTER";
+		}
+		snprintf(unknown_buf, sizeof(unknown_buf),
+		    "ERROR: PROCESSOR-SPECIFIC SHT 0x%jx NOT DEFINED",
+		     (uintmax_t)sht);
+		return (unknown_buf);
+	} else {
+		/* 0x80000000-0xffffffff application programs */
+		snprintf(unknown_buf, sizeof(unknown_buf),
+		    "ERROR: SHT 0x%jx NOT DEFINED",
+		     (uintmax_t)sht);
+		return (unknown_buf);
 	}
 }
 
@@ -495,11 +550,19 @@ main(int ac, char **av)
 	phnum = elf_get_quarter(e, e, E_PHNUM);
 	shentsize = elf_get_quarter(e, e, E_SHENTSIZE);
 	p = (char *)e + phoff;
-	sh = (char *)e + shoff;
-	shnum = elf_get_shnum(e, sh);
-	shstrndx = elf_get_shstrndx(e, sh);
-	offset = elf_get_off(e, (char *)sh + shstrndx * shentsize, SH_OFFSET);
-	shstrtab = (char *)e + offset;
+	if (shoff > 0) {
+		sh = (char *)e + shoff;
+		shnum = elf_get_shnum(e, sh);
+		shstrndx = elf_get_shstrndx(e, sh);
+		offset = elf_get_off(e, (char *)sh + shstrndx * shentsize,
+		    SH_OFFSET);
+		shstrtab = (char *)e + offset;
+	} else {
+		sh = NULL;
+		shnum = 0;
+		shstrndx = 0;
+		shstrtab = NULL;
+	}
 	for (i = 0; (u_int64_t)i < shnum; i++) {
 		name = elf_get_word(e, (char *)sh + i * shentsize, SH_NAME);
 		offset = elf_get_off(e, (char *)sh + i * shentsize, SH_OFFSET);
@@ -616,8 +679,6 @@ elf_print_ehdr(Elf32_Ehdr *e, void *sh)
 	phentsize = elf_get_quarter(e, e, E_PHENTSIZE);
 	phnum = elf_get_quarter(e, e, E_PHNUM);
 	shentsize = elf_get_quarter(e, e, E_SHENTSIZE);
-	shnum = elf_get_shnum(e, sh);
-	shstrndx = elf_get_shstrndx(e, sh);
 	fprintf(out, "\nelf header:\n");
 	fprintf(out, "\n");
 	fprintf(out, "\te_ident: %s %s %s\n", ei_classes[class], ei_data[data],
@@ -633,8 +694,12 @@ elf_print_ehdr(Elf32_Ehdr *e, void *sh)
 	fprintf(out, "\te_phentsize: %jd\n", (intmax_t)phentsize);
 	fprintf(out, "\te_phnum: %jd\n", (intmax_t)phnum);
 	fprintf(out, "\te_shentsize: %jd\n", (intmax_t)shentsize);
-	fprintf(out, "\te_shnum: %jd\n", (intmax_t)shnum);
-	fprintf(out, "\te_shstrndx: %jd\n", (intmax_t)shstrndx);
+	if (sh != NULL) {
+		shnum = elf_get_shnum(e, sh);
+		shstrndx = elf_get_shstrndx(e, sh);
+		fprintf(out, "\te_shnum: %jd\n", (intmax_t)shnum);
+		fprintf(out, "\te_shstrndx: %jd\n", (intmax_t)shstrndx);
+	}
 }
 
 static void
@@ -694,9 +759,16 @@ elf_print_shdr(Elf32_Ehdr *e, void *sh)
 	u_int64_t info;
 	u_int64_t addralign;
 	u_int64_t entsize;
+	u_int64_t machine;
 	void *v;
 	int i;
 
+	if (sh == NULL) {
+		fprintf(out, "\nNo section headers\n");
+		return;
+	}
+
+	machine = elf_get_quarter(e, e, E_MACHINE);
 	shentsize = elf_get_quarter(e, e, E_SHENTSIZE);
 	shnum = elf_get_shnum(e, sh);
 	fprintf(out, "\nsection header:\n");
@@ -715,7 +787,7 @@ elf_print_shdr(Elf32_Ehdr *e, void *sh)
 		fprintf(out, "\n");
 		fprintf(out, "entry: %d\n", i);
 		fprintf(out, "\tsh_name: %s\n", shstrtab + name);
-		fprintf(out, "\tsh_type: %s\n", sh_types(type));
+		fprintf(out, "\tsh_type: %s\n", sh_types(machine, type));
 		fprintf(out, "\tsh_flags: %s\n", sh_flags[flags & 0x7]);
 		fprintf(out, "\tsh_addr: %#jx\n", addr);
 		fprintf(out, "\tsh_offset: %jd\n", (intmax_t)offset);
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index b9d47855edc4..10df42153c53 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -389,17 +389,17 @@ This implementation first appeared in
 The original implementation of
 .Nm
 was done by
-.An Jean-Marc Zucconi Aq jmz@FreeBSD.org .
+.An Jean-Marc Zucconi Aq Mt jmz@FreeBSD.org .
 It was extensively re-worked for
 .Fx 2.2
 by
-.An Garrett Wollman Aq wollman@FreeBSD.org ,
+.An Garrett Wollman Aq Mt wollman@FreeBSD.org ,
 and later completely rewritten to use the
 .Xr fetch 3
 library by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org
 and
-.An Michael Gmelin Aq freebsd@grem.de .
+.An Michael Gmelin Aq Mt freebsd@grem.de .
 .Sh NOTES
 The
 .Fl b
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index da32084e7214..405436568594 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -21,7 +21,8 @@
 # 4. This notice may not be removed or altered.
 
 SRCDIR=	${.CURDIR}/../../contrib/file
-.PATH: ${SRCDIR}
+.PATH: ${SRCDIR}/src
+.PATH: ${SRCDIR}/doc
 
 PROG=	file
 
diff --git a/usr.bin/fstat/fuser.1 b/usr.bin/fstat/fuser.1
index d13e2b5b0369..7bae409698fa 100644
--- a/usr.bin/fstat/fuser.1
+++ b/usr.bin/fstat/fuser.1
@@ -139,7 +139,7 @@ utility appeared in
 The
 .Nm
 utility and this manual page was written by
-.An Stanislav Sedov Aq stas@FreeBSD.org .
+.An Stanislav Sedov Aq Mt stas@FreeBSD.org .
 .Sh BUGS
 Since
 .Nm
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index abdd6b7cdf74..2cd7f36ebc56 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -20,8 +20,8 @@ CFLAGS+= -DINET6
 .endif
 
 CFLAGS+= -I${.CURDIR} -I${TNFTP}
-LDADD=	-ledit -ltermcap -lutil
-DPADD=	${LIBEDIT} ${LIBTERMCAP} ${LIBUTIL}
+LDADD=	-ledit -ltermcapw -lutil
+DPADD=	${LIBEDIT} ${LIBTERMCAPW} ${LIBUTIL}
 
 WARNS?=	2
 
diff --git a/usr.bin/gcore/Makefile b/usr.bin/gcore/Makefile
index 0f37281e42ff..7fff5403e50e 100644
--- a/usr.bin/gcore/Makefile
+++ b/usr.bin/gcore/Makefile
@@ -6,6 +6,10 @@ SRCS=	elfcore.c gcore.c
 DPADD=	${LIBSBUF} ${LIBUTIL}
 LDADD=	-lsbuf -lutil
 
+.if ${MACHINE_ARCH} == "amd64"
+SRCS+=	elf32core.c
+.endif
+
 WARNS?=	1
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/gcore/elf32core.c b/usr.bin/gcore/elf32core.c
new file mode 100644
index 000000000000..de48500a1f71
--- /dev/null
+++ b/usr.bin/gcore/elf32core.c
@@ -0,0 +1,66 @@
+/* $FreeBSD$ */
+#ifndef __LP64__
+#error "this file must be compiled for LP64."
+#endif
+
+#define __ELF_WORD_SIZE 32
+#define _MACHINE_ELF_WANT_32BIT
+
+#include <sys/procfs.h>
+
+struct prpsinfo32 {
+	int	pr_version;
+	u_int	pr_psinfosz;
+	char	pr_fname[PRFNAMESZ+1];
+	char	pr_psargs[PRARGSZ+1];
+};
+
+struct prstatus32 {
+	int	pr_version;
+	u_int	pr_statussz;
+	u_int	pr_gregsetsz;
+	u_int	pr_fpregsetsz;
+	int	pr_osreldate;
+	int	pr_cursig;
+	pid_t	pr_pid;
+	struct reg32 pr_reg;
+};
+
+#define	ELFCORE_COMPAT_32	1
+#include "elfcore.c"
+
+static void
+elf_convert_gregset(elfcore_gregset_t *rd, struct reg *rs)
+{
+#ifdef __amd64__
+	rd->r_gs = rs->r_gs;
+	rd->r_fs = rs->r_fs;
+	rd->r_es = rs->r_es;
+	rd->r_ds = rs->r_ds;
+	rd->r_edi = rs->r_rdi;
+	rd->r_esi = rs->r_rsi;
+	rd->r_ebp = rs->r_rbp;
+	rd->r_ebx = rs->r_rbx;
+	rd->r_edx = rs->r_rdx;
+	rd->r_ecx = rs->r_rcx;
+	rd->r_eax = rs->r_rax;
+	rd->r_eip = rs->r_rip;
+	rd->r_cs = rs->r_cs;
+	rd->r_eflags = rs->r_rflags;
+	rd->r_esp = rs->r_rsp;
+	rd->r_ss = rs->r_ss;
+#else
+#error Unsupported architecture
+#endif
+}
+
+static void
+elf_convert_fpregset(elfcore_fpregset_t *rd, struct fpreg *rs)
+{
+#ifdef __amd64__
+	/* XXX this is wrong... */
+	memcpy(rd, rs, sizeof(*rd));
+#else
+#error Unsupported architecture
+#endif
+}
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index 20e801a4f531..037854c34d03 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -28,6 +28,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/endian.h>
 #include <sys/param.h>
 #include <sys/procfs.h>
 #include <sys/ptrace.h>
@@ -73,6 +74,22 @@ struct sseg_closure {
 	size_t size;		/* Total size of all writable segments. */
 };
 
+#ifdef ELFCORE_COMPAT_32
+typedef struct fpreg32 elfcore_fpregset_t;
+typedef struct reg32   elfcore_gregset_t;
+typedef struct prpsinfo32 elfcore_prpsinfo_t;
+typedef struct prstatus32 elfcore_prstatus_t;
+static void elf_convert_gregset(elfcore_gregset_t *rd, struct reg *rs);
+static void elf_convert_fpregset(elfcore_fpregset_t *rd, struct fpreg *rs);
+#else
+typedef fpregset_t elfcore_fpregset_t;
+typedef gregset_t  elfcore_gregset_t;
+typedef prpsinfo_t elfcore_prpsinfo_t;
+typedef prstatus_t elfcore_prstatus_t;
+#define elf_convert_gregset(d,s)	*d = *s
+#define elf_convert_fpregset(d,s)	*d = *s
+#endif
+
 typedef void* (*notefunc_t)(void *, size_t *);
 
 static void cb_put_phdr(vm_map_entry_t, void *);
@@ -108,13 +125,28 @@ elf_ident(int efd, pid_t pid __unused, char *binfile __unused)
 {
 	Elf_Ehdr hdr;
 	int cnt;
+	uint16_t machine;
 
 	cnt = read(efd, &hdr, sizeof(hdr));
 	if (cnt != sizeof(hdr))
 		return (0);
-	if (IS_ELF(hdr))
-		return (1);
-	return (0);
+	if (!IS_ELF(hdr))
+		return (0);
+	switch (hdr.e_ident[EI_DATA]) {
+	case ELFDATA2LSB:
+		machine = le16toh(hdr.e_machine);
+		break;
+	case ELFDATA2MSB:
+		machine = be16toh(hdr.e_machine);
+		break;
+	default:
+		return (0);
+	}
+	if (!ELF_MACHINE_OK(machine))
+		return (0);
+
+	/* Looks good. */
+	return (1);
 }
 
 static void
@@ -194,7 +226,7 @@ elf_coredump(int efd __unused, int fd, pid_t pid)
 		uintmax_t nleft = php->p_filesz;
 
 		iorequest.piod_op = PIOD_READ_D;
-		iorequest.piod_offs = (caddr_t)php->p_vaddr;
+		iorequest.piod_offs = (caddr_t)(uintptr_t)php->p_vaddr;
 		while (nleft > 0) {
 			char buf[8*1024];
 			size_t nwant;
@@ -311,6 +343,7 @@ elf_putnotes(pid_t pid, struct sbuf *sb, size_t *sizep)
 		elf_putnote(NT_THRMISC, elf_note_thrmisc, tids + i, sb);
 	}
 
+#ifndef ELFCORE_COMPAT_32
 	elf_putnote(NT_PROCSTAT_PROC, elf_note_procstat_proc, &pid, sb);
 	elf_putnote(NT_PROCSTAT_FILES, elf_note_procstat_files, &pid, sb);
 	elf_putnote(NT_PROCSTAT_VMMAP, elf_note_procstat_vmmap, &pid, sb);
@@ -321,6 +354,7 @@ elf_putnotes(pid_t pid, struct sbuf *sb, size_t *sizep)
 	elf_putnote(NT_PROCSTAT_PSSTRINGS, elf_note_procstat_psstrings, &pid,
 	    sb);
 	elf_putnote(NT_PROCSTAT_AUXV, elf_note_procstat_auxv, &pid, sb);
+#endif
 
 	size = sbuf_end_section(sb, old_len, 1, 0);
 	if (size == -1)
@@ -491,7 +525,7 @@ static void *
 elf_note_prpsinfo(void *arg, size_t *sizep)
 {
 	pid_t pid;
-	prpsinfo_t *psinfo;
+	elfcore_prpsinfo_t *psinfo;
 	struct kinfo_proc kip;
 	size_t len;
 	int name[4];
@@ -501,7 +535,7 @@ elf_note_prpsinfo(void *arg, size_t *sizep)
 	if (psinfo == NULL)
 		errx(1, "out of memory");
 	psinfo->pr_version = PRPSINFO_VERSION;
-	psinfo->pr_psinfosz = sizeof(prpsinfo_t);
+	psinfo->pr_psinfosz = sizeof(*psinfo);
 
 	name[0] = CTL_KERN;
 	name[1] = KERN_PROC;
@@ -523,19 +557,21 @@ static void *
 elf_note_prstatus(void *arg, size_t *sizep)
 {
 	lwpid_t tid;
-	prstatus_t *status;
+	elfcore_prstatus_t *status;
+	struct reg greg;
 
 	tid = *(lwpid_t *)arg;
 	status = calloc(1, sizeof(*status));
 	if (status == NULL)
 		errx(1, "out of memory");
 	status->pr_version = PRSTATUS_VERSION;
-	status->pr_statussz = sizeof(prstatus_t);
-	status->pr_gregsetsz = sizeof(gregset_t);
-	status->pr_fpregsetsz = sizeof(fpregset_t);
+	status->pr_statussz = sizeof(*status);
+	status->pr_gregsetsz = sizeof(elfcore_gregset_t);
+	status->pr_fpregsetsz = sizeof(elfcore_fpregset_t);
 	status->pr_osreldate = __FreeBSD_version;
 	status->pr_pid = tid;
-	ptrace(PT_GETREGS, tid, (void *)&status->pr_reg, 0);
+	ptrace(PT_GETREGS, tid, (void *)&greg, 0);
+	elf_convert_gregset(&status->pr_reg, &greg);
 
 	*sizep = sizeof(*status);
 	return (status);
@@ -545,13 +581,15 @@ static void *
 elf_note_fpregset(void *arg, size_t *sizep)
 {
 	lwpid_t tid;
-	prfpregset_t *fpregset;
+	elfcore_fpregset_t *fpregset;
+	fpregset_t fpreg;
 
 	tid = *(lwpid_t *)arg;
 	fpregset = calloc(1, sizeof(*fpregset));
 	if (fpregset == NULL)
 		errx(1, "out of memory");
-	ptrace(PT_GETFPREGS, tid, (void *)fpregset, 0);
+	ptrace(PT_GETFPREGS, tid, (void *)&fpreg, 0);
+	elf_convert_fpregset(fpregset, &fpreg);
 
 	*sizep = sizeof(*fpregset);
 	return (fpregset);
@@ -580,7 +618,7 @@ elf_note_thrmisc(void *arg, size_t *sizep)
 static void *
 procstat_sysctl(void *arg, int what, size_t structsz, size_t *sizep)
 {
-	size_t len, oldlen;
+	size_t len;
 	pid_t pid;
 	int name[4], structsize;
 	void *buf, *p;
@@ -700,5 +738,5 @@ elf_note_procstat_rlimit(void *arg, size_t *sizep)
 	return (buf);
 }
 
-struct dumpers elfdump = { elf_ident, elf_coredump };
-TEXT_SET(dumpset, elfdump);
+struct dumpers __elfN(dump) = { elf_ident, elf_coredump };
+TEXT_SET(dumpset, __elfN(dump));
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index c3baed94b1fa..29a2026e5ea1 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -204,4 +204,4 @@ The
 utility first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Garrett A. Wollman Aq wollman@lcs.mit.edu
+.An Garrett A. Wollman Aq Mt wollman@lcs.mit.edu
diff --git a/usr.bin/gprof/gprof.h b/usr.bin/gprof/gprof.h
index c841a20e9bdc..c8140eb8dde6 100644
--- a/usr.bin/gprof/gprof.h
+++ b/usr.bin/gprof/gprof.h
@@ -46,9 +46,6 @@
 #if __i386__
 #   include "i386.h"
 #endif
-#if __ia64__
-#   include "ia64.h"
-#endif
 #if __mips__
 #   include "mips.h"
 #endif
diff --git a/usr.bin/gprof/ia64.h b/usr.bin/gprof/ia64.h
deleted file mode 100644
index 58b92c577283..000000000000
--- a/usr.bin/gprof/ia64.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- *
- *	@(#)i386.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
- */
-
-    /*
-     *	offset (in bytes) of the code from the entry address of a routine.
-     *	(see asgnsamples for use and explanation.)
-     */
-#define OFFSET_OF_CODE	0
-
-enum opermodes { dummy };
-typedef enum opermodes	operandenum;
diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index 74446b62c5dd..5631877ede5d 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grep.c,v 1.4 2011/02/16 01:31:33 joerg Exp $	*/
+/*	$NetBSD: grep.c,v 1.6 2011/04/18 03:48:23 joerg Exp $	*/
 /* 	$FreeBSD$	*/
 /*	$OpenBSD: grep.c,v 1.42 2010/07/02 22:18:03 tedu Exp $	*/
 
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <libgen.h>
 #include <locale.h>
 #include <stdbool.h>
+#define _WITH_GETLINE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -304,6 +305,7 @@ read_patterns(const char *fn)
 	FILE *f;
 	char *line;
 	size_t len;
+	ssize_t rlen;
 
 	if ((f = fopen(fn, "r")) == NULL)
 		err(2, "%s", fn);
@@ -311,8 +313,11 @@ read_patterns(const char *fn)
 		fclose(f);
 		return;
 	}
-	while ((line = fgetln(f, &len)) != NULL)
+	len = 0;
+	line = NULL;
+	while ((rlen = getline(&line, &len, f)) != -1)
 		add_pattern(line, line[0] == '\n' ? 0 : len);
+	free(line);
 	if (ferror(f))
 		err(2, "%s", fn);
 	fclose(f);
diff --git a/usr.bin/grep/queue.c b/usr.bin/grep/queue.c
index afcb82701933..18878880a36c 100644
--- a/usr.bin/grep/queue.c
+++ b/usr.bin/grep/queue.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: queue.c,v 1.2 2011/02/16 01:31:33 joerg Exp $	*/
+/*	$NetBSD: queue.c,v 1.5 2011/08/31 16:24:57 plunky Exp $	*/
 /*	$FreeBSD$	*/
 
 /*-
@@ -68,8 +68,11 @@ enqueue(struct str *x)
 
 	STAILQ_INSERT_TAIL(&queue, item, list);
 
-	if (++count > Bflag)
-		free(dequeue());
+	if (++count > Bflag) {
+		item = dequeue();
+		free(item->data.dat);
+		free(item);
+	}
 }
 
 static struct qentry *
@@ -92,7 +95,8 @@ printqueue(void)
 	struct qentry *item;
 
 	while ((item = dequeue()) != NULL) {
-		printline(&item->data, '-', (regmatch_t *)NULL, 0);
+		printline(&item->data, '-', NULL, 0);
+		free(item->data.dat);
 		free(item);
 	}
 }
@@ -102,6 +106,8 @@ clearqueue(void)
 {
 	struct qentry *item;
 
-	while ((item = dequeue()) != NULL)
+	while ((item = dequeue()) != NULL) {
+		free(item->data.dat);
 		free(item);
+	}
 }
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index 0a3706fad306..3ec12fa75203 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -302,7 +302,7 @@ procline(struct str *l, int nottext)
 					r = REG_NOMATCH;
 			/* Check for whole word match */
 			if (r == 0 && (wflag || fg_pattern[i].word)) {
-				wint_t wbegin, wend;
+				wchar_t wbegin, wend;
 
 				wbegin = wend = L' ';
 				if (pmatch.rm_so != 0 &&
@@ -336,7 +336,7 @@ procline(struct str *l, int nottext)
 		}
 
 		/* One pass if we are not recording matches */
-		if ((color == NULL && !oflag) || qflag || lflag)
+		if (!wflag && ((color == NULL && !oflag) || qflag || lflag))
 			break;
 
 		if (st == (size_t)pmatch.rm_so)
diff --git a/usr.bin/gzip/gzip.1 b/usr.bin/gzip/gzip.1
index ca1ca157ebb7..ba78bd060b30 100644
--- a/usr.bin/gzip/gzip.1
+++ b/usr.bin/gzip/gzip.1
@@ -214,9 +214,9 @@ and first appeared in
 This implementation of
 .Nm
 was written by
-.An Matthew R. Green Aq mrg@eterna.com.au
+.An Matthew R. Green Aq Mt mrg@eterna.com.au
 with unpack support written by
-.An Xin LI Aq delphij@FreeBSD.org .
+.An Xin LI Aq Mt delphij@FreeBSD.org .
 .Sh BUGS
 According to RFC 1952, the recorded file size is stored in a 32-bit
 integer, therefore, it can not represent files larger than 4GB.
diff --git a/usr.bin/gzip/zuncompress.c b/usr.bin/gzip/zuncompress.c
index f1b05fd23572..6069cae2d41d 100644
--- a/usr.bin/gzip/zuncompress.c
+++ b/usr.bin/gzip/zuncompress.c
@@ -145,7 +145,7 @@ zuncompress(FILE *in, FILE *out, char *pre, size_t prelen,
 	else
 		compressed_pre = NULL;
 
-	while ((bin = fread(buf, 1, sizeof(buf), in)) != 0) {
+	while ((bin = fread(buf, 1, BUFSIZE, in)) != 0) {
 		if (tflag == 0 && (off_t)fwrite(buf, 1, bin, out) != bin) {
 			free(buf);
 			return -1;
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index 596245499bfe..385bf1b35e73 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -15,7 +15,7 @@ host.1: ldns-host.1
 
 CFLAGS+=	-I${LDNSDIR}
 DPADD+=		${LIBLDNS} ${LIBCRYPTO}
-LDADD+=		-lldns -lcrypto
+LDADD+=		${LDLDNS} -lcrypto
 USEPRIVATELIB=	ldns
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/iconv/iconv.c b/usr.bin/iconv/iconv.c
index 77dd11ad84ae..dc2aec0bc942 100644
--- a/usr.bin/iconv/iconv.c
+++ b/usr.bin/iconv/iconv.c
@@ -41,13 +41,11 @@
 #include <string.h>
 #include <unistd.h>
 
-static unsigned long long invalids;
+static int		do_conv(FILE *, const char *, const char *, bool, bool);
+static int		do_list(unsigned int, const char * const *, void *);
+static void		usage(void) __dead2;
 
-static void		 do_conv(FILE *, const char *, const char *, bool, bool);
-static int		 do_list(unsigned int, const char * const *, void *);
-static void		 usage(void);
-
-static struct option long_options[] = {
+static const struct option long_options[] = {
 	{"from-code",		required_argument,	NULL, 'f'},
 	{"list",		no_argument,		NULL, 'l'},
 	{"silent",		no_argument,		NULL, 's'},
@@ -68,12 +66,13 @@ usage(void)
 
 #define INBUFSIZE 1024
 #define OUTBUFSIZE (INBUFSIZE * 2)
-static void
+static int
 do_conv(FILE *fp, const char *from, const char *to, bool silent,
     bool hide_invalid)
 {
 	iconv_t cd;
 	char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], *out;
+	unsigned long long invalids;
 	const char *in;
 	size_t inbytes, outbytes, ret;
 
@@ -84,8 +83,9 @@ do_conv(FILE *fp, const char *from, const char *to, bool silent,
 		int arg = 1;
 
 		if (iconvctl(cd, ICONV_SET_DISCARD_ILSEQ, (void *)&arg) == -1)
-			err(1, NULL);
+			err(EXIT_FAILURE, NULL);
 	}
+	invalids = 0;
 	while ((inbytes = fread(inbuf, 1, INBUFSIZE, fp)) > 0) {
 		in = inbuf;
 		while (inbytes > 0) {
@@ -135,6 +135,7 @@ do_conv(FILE *fp, const char *from, const char *to, bool silent,
 		warnx("warning: invalid characters: %llu", invalids);
 
 	iconv_close(cd);
+	return (invalids > 0);
 }
 
 static int
@@ -157,7 +158,7 @@ main(int argc, char **argv)
 {
 	FILE *fp;
 	char *opt_f, *opt_t;
-	int ch, i;
+	int ch, i, res;
 	bool opt_c = false, opt_s = false;
 
 	opt_f = opt_t = strdup("");
@@ -202,18 +203,18 @@ main(int argc, char **argv)
 	if ((strcmp(opt_f, "") == 0) && (strcmp(opt_t, "") == 0))
 		usage();
 	if (argc == 0)
-		do_conv(stdin, opt_f, opt_t, opt_s, opt_c);
+		res = do_conv(stdin, opt_f, opt_t, opt_s, opt_c);
 	else {
+		res = 0;
 		for (i = 0; i < argc; i++) {
 			fp = (strcmp(argv[i], "-") != 0) ?
 			    fopen(argv[i], "r") : stdin;
 			if (fp == NULL)
 				err(EXIT_FAILURE, "Cannot open `%s'",
 				    argv[i]);
-			do_conv(fp, opt_f, opt_t, opt_s,
-			    opt_c);
+			res |= do_conv(fp, opt_f, opt_t, opt_s, opt_c);
 			(void)fclose(fp);
 		}
 	}
-	return (EXIT_SUCCESS);
+	return (res == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
 }
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index 7d231342d68b..22cf3db79fbd 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -169,7 +169,7 @@ default system name list
 .Sh SEE ALSO
 .Xr ipcrm 1
 .Sh AUTHORS
-.An Thorsten Lockert Aq tholo@sigmasoft.com
+.An Thorsten Lockert Aq Mt tholo@sigmasoft.com
 .Sh BUGS
 This manual page is woefully incomplete, because it does not
 at all attempt to explain the information printed by
diff --git a/usr.bin/iscsictl/iscsictl.8 b/usr.bin/iscsictl/iscsictl.8
index 1fab1d7a5f83..845718beada3 100644
--- a/usr.bin/iscsictl/iscsictl.8
+++ b/usr.bin/iscsictl/iscsictl.8
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 24, 2014
+.Dd July 18, 2014
 .Dt ISCSICTL 8
 .Os
 .Sh NAME
@@ -47,6 +47,17 @@
 .Fl A
 .Fl n Ar nickname Op Fl c Ar path
 .Nm
+.Fl M
+.Fl i Ar session-id
+.Op Fl p Ar portal
+.Op Fl t Ar target
+.Op Fl u Ar user
+.Op Fl s Ar secret
+.Nm
+.Fl M
+.Fl i Ar session-id
+.Op Fl n Ar nickname Op Fl c Ar path
+.Nm
 .Fl R
 .Op Fl p Ar portal
 .Op Fl t Ar target
@@ -68,6 +79,8 @@ The following options are available:
 .Bl -tag -width ".Fl A"
 .It Fl A
 Add session.
+.It Fl M
+Modify session.
 .It Fl R
 Remove session.
 .It Fl L
@@ -83,7 +96,11 @@ The default is
 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.
+and the temporary discovery session will be removed.
+.It Fl i
+Session ID, as displayed by
+.Nm
+.Fl v .
 .It Fl n
 The "nickname" of session defined in the configuration file.
 .It Fl p
@@ -98,7 +115,7 @@ CHAP login.
 Verbose mode.
 .El
 .Pp
-Certain parameters are neccessary when adding a session.
+Certain parameters are necessary when adding a session.
 One can specify these either via command line (using the
 .Fl t ,
 .Fl p ,
@@ -165,5 +182,5 @@ command appeared in
 The
 .Nm
 was developed by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
 under sponsorship from the FreeBSD Foundation.
diff --git a/usr.bin/iscsictl/iscsictl.c b/usr.bin/iscsictl/iscsictl.c
index 39a31c658b26..75d329f81fe2 100644
--- a/usr.bin/iscsictl/iscsictl.c
+++ b/usr.bin/iscsictl/iscsictl.c
@@ -349,6 +349,82 @@ kernel_add(int iscsi_fd, const struct target *targ)
 	return (error);
 }
 
+static int
+kernel_modify(int iscsi_fd, unsigned int session_id, const struct target *targ)
+{
+	struct iscsi_session_modify ism;
+	int error;
+
+	memset(&ism, 0, sizeof(ism));
+	ism.ism_session_id = session_id;
+	conf_from_target(&ism.ism_conf, targ);
+	error = ioctl(iscsi_fd, ISCSISMODIFY, &ism);
+	if (error != 0)
+		warn("ISCSISMODIFY");
+	return (error);
+}
+
+static void
+kernel_modify_some(int iscsi_fd, unsigned int session_id, const char *target,
+  const char *target_addr, const char *user, const char *secret)
+{
+	struct iscsi_session_state *states = NULL;
+	struct iscsi_session_state *state;
+	struct iscsi_session_conf *conf;
+	struct iscsi_session_list isl;
+	struct iscsi_session_modify ism;
+	unsigned int i, nentries = 1;
+	int error;
+
+	for (;;) {
+		states = realloc(states,
+		    nentries * sizeof(struct iscsi_session_state));
+		if (states == NULL)
+			err(1, "realloc");
+
+		memset(&isl, 0, sizeof(isl));
+		isl.isl_nentries = nentries;
+		isl.isl_pstates = states;
+
+		error = ioctl(iscsi_fd, ISCSISLIST, &isl);
+		if (error != 0 && errno == EMSGSIZE) {
+			nentries *= 4;
+			continue;
+		}
+		break;
+	}
+	if (error != 0)
+		errx(1, "ISCSISLIST");
+
+	for (i = 0; i < isl.isl_nentries; i++) {
+		state = &states[i];
+
+		if (state->iss_id == session_id)
+			break;
+	}
+	if (i == isl.isl_nentries)
+		errx(1, "session-id %u not found", session_id);
+
+	conf = &state->iss_conf;
+
+	if (target != NULL)
+		strlcpy(conf->isc_target, target, sizeof(conf->isc_target));
+	if (target_addr != NULL)
+		strlcpy(conf->isc_target_addr, target_addr,
+		    sizeof(conf->isc_target_addr));
+	if (user != NULL)
+		strlcpy(conf->isc_user, user, sizeof(conf->isc_user));
+	if (secret != NULL)
+		strlcpy(conf->isc_secret, secret, sizeof(conf->isc_secret));
+
+	memset(&ism, 0, sizeof(ism));
+	ism.ism_session_id = session_id;
+	memcpy(&ism.ism_conf, conf, sizeof(ism.ism_conf));
+	error = ioctl(iscsi_fd, ISCSISMODIFY, &ism);
+	if (error != 0)
+		warn("ISCSISMODIFY");
+}
+
 static int
 kernel_remove(int iscsi_fd, const struct target *targ)
 {
@@ -404,7 +480,7 @@ 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("Session ID:       %u\n", state->iss_id);
 			printf("Initiator name:   %s\n", conf->isc_initiator);
 			printf("Initiator portal: %s\n",
 			    conf->isc_initiator_addr);
@@ -482,6 +558,10 @@ usage(void)
 	    "[-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 -M -i session-id [-p portal] "
+	    "[-t target] [-u user] [-s secret]\n");
+	fprintf(stderr, "       iscsictl -M -i session-id -n nickname "
+	    "[-c path]\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");
@@ -503,20 +583,25 @@ checked_strdup(const char *s)
 int
 main(int argc, char **argv)
 {
-	int Aflag = 0, Rflag = 0, Lflag = 0, aflag = 0, vflag = 0;
+	int Aflag = 0, Mflag = 0, Rflag = 0, Lflag = 0, aflag = 0, vflag = 0;
 	const char *conf_path = DEFAULT_CONFIG_PATH;
-	char *nickname = NULL, *discovery_host = NULL, *host = NULL,
+	char *nickname = NULL, *discovery_host = NULL, *portal = NULL,
 	     *target = NULL, *user = NULL, *secret = NULL;
+	long long session_id = -1;
+	char *end;
 	int ch, error, iscsi_fd, retval, saved_errno;
 	int failed = 0;
 	struct conf *conf;
 	struct target *targ;
 
-	while ((ch = getopt(argc, argv, "ARLac:d:n:p:t:u:s:v")) != -1) {
+	while ((ch = getopt(argc, argv, "AMRLac:d:i:n:p:t:u:s:v")) != -1) {
 		switch (ch) {
 		case 'A':
 			Aflag = 1;
 			break;
+		case 'M':
+			Mflag = 1;
+			break;
 		case 'R':
 			Rflag = 1;
 			break;
@@ -532,11 +617,21 @@ main(int argc, char **argv)
 		case 'd':
 			discovery_host = optarg;
 			break;
+		case 'i':
+			session_id = strtol(optarg, &end, 10);
+			if ((size_t)(end - optarg) != strlen(optarg))
+				errx(1, "trailing characters after session-id");
+			if (session_id < 0)
+				errx(1, "session-id cannot be negative");
+			if (session_id > UINT_MAX)
+				errx(1, "session-id cannot be greater than %u",
+				    UINT_MAX);
+			break;
 		case 'n':
 			nickname = optarg;
 			break;
 		case 'p':
-			host = optarg;
+			portal = optarg;
 			break;
 		case 't':
 			target = optarg;
@@ -559,10 +654,10 @@ main(int argc, char **argv)
 	if (argc != 0)
 		usage();
 
-	if (Aflag + Rflag + Lflag == 0)
+	if (Aflag + Mflag + Rflag + Lflag == 0)
 		Lflag = 1;
-	if (Aflag + Rflag + Lflag > 1)
-		errx(1, "at most one of -A, -R, or -L may be specified");
+	if (Aflag + Mflag + Rflag + Lflag > 1)
+		errx(1, "at most one of -A, -M, -R, or -L may be specified");
 
 	/*
 	 * Note that we ignore unneccessary/inapplicable "-c" flag; so that
@@ -571,7 +666,7 @@ main(int argc, char **argv)
 	 */
 	if (Aflag != 0) {
 		if (aflag != 0) {
-			if (host != NULL)
+			if (portal != NULL)
 				errx(1, "-a and -p and mutually exclusive");
 			if (target != NULL)
 				errx(1, "-a and -t and mutually exclusive");
@@ -584,7 +679,7 @@ main(int argc, char **argv)
 			if (discovery_host != NULL)
 				errx(1, "-a and -d and mutually exclusive");
 		} else if (nickname != NULL) {
-			if (host != NULL)
+			if (portal != NULL)
 				errx(1, "-n and -p and mutually exclusive");
 			if (target != NULL)
 				errx(1, "-n and -t and mutually exclusive");
@@ -595,17 +690,17 @@ main(int argc, char **argv)
 			if (discovery_host != NULL)
 				errx(1, "-n and -d and mutually exclusive");
 		} else if (discovery_host != NULL) {
-			if (host != NULL)
+			if (portal != NULL)
 				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)
+			if (target == NULL && portal == NULL)
 				errx(1, "must specify -a, -n or -t/-p");
 
-			if (target != NULL && host == NULL)
+			if (target != NULL && portal == NULL)
 				errx(1, "-t must always be used with -p");
-			if (host != NULL && target == NULL)
+			if (portal != NULL && target == NULL)
 				errx(1, "-p must always be used with -t");
 		}
 
@@ -614,9 +709,33 @@ main(int argc, char **argv)
 		if (secret != NULL && user == NULL)
 			errx(1, "-s must always be used with -u");
 
+		if (session_id != -1)
+			errx(1, "-i cannot be used with -A");
 		if (vflag != 0)
 			errx(1, "-v cannot be used with -A");
 
+	} else if (Mflag != 0) {
+		if (session_id == -1)
+			errx(1, "-M requires -i");
+
+		if (discovery_host != NULL)
+			errx(1, "-M and -d are mutually exclusive");
+		if (aflag != 0)
+			errx(1, "-M and -a are mutually exclusive");
+		if (nickname != NULL) {
+			if (portal != NULL)
+				errx(1, "-n and -p and mutually exclusive");
+			if (target != NULL)
+				errx(1, "-n and -t and mutually exclusive");
+			if (user != NULL)
+				errx(1, "-n and -u and mutually exclusive");
+			if (secret != NULL)
+				errx(1, "-n and -s and mutually exclusive");
+		}
+
+		if (vflag != 0)
+			errx(1, "-v cannot be used with -M");
+
 	} else if (Rflag != 0) {
 		if (user != NULL)
 			errx(1, "-R and -u are mutually exclusive");
@@ -626,33 +745,35 @@ main(int argc, char **argv)
 			errx(1, "-R and -d are mutually exclusive");
 
 		if (aflag != 0) {
-			if (host != NULL)
+			if (portal != NULL)
 				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)
+			if (portal != NULL)
 				errx(1, "-n and -p and mutually exclusive");
 			if (target != NULL)
 				errx(1, "-n and -t and mutually exclusive");
-		} else if (host != NULL) {
+		} else if (portal != NULL) {
 			if (target != NULL)
 				errx(1, "-p and -t and mutually exclusive");
 		} else if (target != NULL) {
-			if (host != NULL)
+			if (portal != NULL)
 				errx(1, "-t and -p and mutually exclusive");
 		} else
 			errx(1, "must specify either -a, -n, -t, or -p");
 
+		if (session_id != -1)
+			errx(1, "-i cannot be used with -R");
 		if (vflag != 0)
 			errx(1, "-v cannot be used with -R");
 
 	} else {
 		assert(Lflag != 0);
 
-		if (host != NULL)
+		if (portal != NULL)
 			errx(1, "-L and -p and mutually exclusive");
 		if (target != NULL)
 			errx(1, "-L and -t and mutually exclusive");
@@ -664,6 +785,9 @@ main(int argc, char **argv)
 			errx(1, "-L and -n and mutually exclusive");
 		if (discovery_host != NULL)
 			errx(1, "-L and -d and mutually exclusive");
+
+		if (session_id != -1)
+			errx(1, "-i cannot be used with -L");
 	}
 
 	iscsi_fd = open(ISCSI_PATH, O_RDWR);
@@ -687,15 +811,20 @@ main(int argc, char **argv)
 		conf = conf_new_from_file(conf_path);
 		targ = target_find(conf, nickname);
 		if (targ == NULL)
-			errx(1, "target %s not found in the configuration file",
-			    nickname);
+			errx(1, "target %s not found in %s",
+			    nickname, conf_path);
 
 		if (Aflag != 0)
 			failed += kernel_add(iscsi_fd, targ);
+		else if (Mflag != 0)
+			failed += kernel_modify(iscsi_fd, session_id, targ);
 		else if (Rflag != 0)
 			failed += kernel_remove(iscsi_fd, targ);
 		else
 			failed += kernel_list(iscsi_fd, targ, vflag);
+	} else if (Mflag != 0) {
+		kernel_modify_some(iscsi_fd, session_id, target, portal,
+		    user, secret);
 	} else {
 		if (Aflag != 0 && target != NULL) {
 			if (valid_iscsi_name(target) == false)
@@ -712,7 +841,7 @@ main(int argc, char **argv)
 			targ->t_address = discovery_host;
 		} else {
 			targ->t_session_type = SESSION_TYPE_NORMAL;
-			targ->t_address = host;
+			targ->t_address = portal;
 		}
 		targ->t_user = user;
 		targ->t_secret = secret;
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index f6e1c794ce90..5978a631b1fa 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1089,6 +1089,14 @@ ktrsyscall(struct ktr_syscall *ktr, u_int flags)
 				ip++;
 				narg--;
 				break;
+			case SYS_shm_open:
+				print_number(ip, narg, c);
+				putchar(',');
+				flagsname(ip[0]);
+				printf(",0%o", ip[1]);
+				ip += 3;
+				narg -= 3;
+				break;
 			case SYS_minherit:
 				print_number(ip, narg, c);
 				print_number(ip, narg, c);
diff --git a/usr.bin/ktrdump/ktrdump.8 b/usr.bin/ktrdump/ktrdump.8
index 9a77bfc3c7e2..697e418479fb 100644
--- a/usr.bin/ktrdump/ktrdump.8
+++ b/usr.bin/ktrdump/ktrdump.8
@@ -86,7 +86,7 @@ utility first appeared in
 The
 .Nm
 utility was implemented by
-.An Jake Burkholder Aq jake@FreeBSD.org .
+.An Jake Burkholder Aq Mt jake@FreeBSD.org .
 .Pp
 This manual page was written by
-.An Chad David Aq davidc@FreeBSD.org .
+.An Chad David Aq Mt davidc@FreeBSD.org .
diff --git a/usr.bin/ldd/ldd.1 b/usr.bin/ldd/ldd.1
index b245631fdae0..483825bfdd5a 100644
--- a/usr.bin/ldd/ldd.1
+++ b/usr.bin/ldd/ldd.1
@@ -77,4 +77,4 @@ utility first appeared in SunOS 4.0, it appeared in its current form in
 The
 .Fl v
 support is based on code written by
-.An John Polstra Aq jdp@polstra.com
+.An John Polstra Aq Mt jdp@polstra.com
diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile
index 3bfadfae3efb..22147cd564fd 100644
--- a/usr.bin/less/Makefile
+++ b/usr.bin/less/Makefile
@@ -8,8 +8,8 @@ SRCS=	main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c cvt.c \
 	signal.c tags.c ttyin.c version.c
 SCRIPTS=lesspipe.sh zless.sh
 SCRIPTSNAME_lesspipe.sh=lesspipe.sh
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
+DPADD=	${LIBTERMCAPW}
+LDADD=	-ltermcapw
 LINKS=	${BINDIR}/less ${BINDIR}/more \
 	${BINDIR}/zless ${BINDIR}/bzless \
 	${BINDIR}/zless ${BINDIR}/xzless \
diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1
index be9d9ccc61a6..57119e53768b 100644
--- a/usr.bin/lockf/lockf.1
+++ b/usr.bin/lockf/lockf.1
@@ -169,4 +169,4 @@ A
 utility first appeared in
 .Fx 2.2 .
 .Sh AUTHORS
-.An John Polstra Aq jdp@polstra.com
+.An John Polstra Aq Mt jdp@polstra.com
diff --git a/usr.bin/logins/logins.1 b/usr.bin/logins/logins.1
index 6ac7acc8a5fd..d84284a5e386 100644
--- a/usr.bin/logins/logins.1
+++ b/usr.bin/logins/logins.1
@@ -100,5 +100,5 @@ utility appeared in
 The
 .Nm
 utility was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org
 based on similar utilities in other operating systems.
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index 471898fa9c46..e6f70bbfe7d7 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -63,12 +63,12 @@ alphabetic characters is ignored.
 .Pp
 The following options are available:
 .Bl -tag -width indent
-.It Fl d
+.It Fl d , -alphanum
 Dictionary character set and order, i.e., only alphanumeric characters
 are compared.
-.It Fl f
+.It Fl f , -ignore-case
 Ignore the case of alphabetic characters.
-.It Fl t
+.It Fl t , -terminate Ar termchar
 Specify a string termination character, i.e., only the characters
 in
 .Ar string
@@ -106,7 +106,9 @@ implementation.
 .Pp
 The
 .Fl a
-flag is ignored for compability.
+and
+.Fl -alternative
+flags are ignored for compability.
 .Sh SEE ALSO
 .Xr grep 1 ,
 .Xr sort 1
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index 5f830d0857e7..ada6e2595744 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <getopt.h>
 #include <limits.h>
 #include <locale.h>
 #include <stdint.h>
@@ -88,6 +89,14 @@ static void	 print_from(wchar_t *, unsigned char *, unsigned char *);
 
 static void usage(void);
 
+static struct option longopts[] = {
+	{ "alternative",no_argument,	NULL, 'a' },
+	{ "alphanum",	no_argument,	NULL, 'd' },
+	{ "ignore-case",no_argument,	NULL, 'i' },
+	{ "terminate",	required_argument, NULL, 't'},
+	{ NULL,		0,		NULL, 0 },
+};
+
 int
 main(int argc, char *argv[])
 {
@@ -102,7 +111,7 @@ main(int argc, char *argv[])
 
 	file = _path_words;
 	termchar = L'\0';
-	while ((ch = getopt(argc, argv, "adft:")) != -1)
+	while ((ch = getopt_long(argc, argv, "+adft:", longopts, NULL)) != -1)
 		switch(ch) {
 		case 'a':
 			/* COMPATIBILITY */
diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile
index 13b99c8d0269..9153e719eaed 100644
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2002/04/26 13:13:41 espie Exp $
+#	$OpenBSD: Makefile,v 1.13 2014/05/12 19:11:19 espie Exp $
 # $FreeBSD$
 
 # -DEXTENDED 
@@ -7,18 +7,15 @@
 .include <src.opts.mk>
 
 PROG=	m4
-CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/lib
-DPADD=	${LIBY} ${LIBL} ${LIBM}
-LDADD=	-ly -ll -lm
+CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/../../lib/libohash
+DPADD=	${LIBY} ${LIBL} ${LIBM} ${LIBOHASH}
+LDADD=	-ly -ll -lm ${LDOHASH}
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
 SRCS=	eval.c expr.c look.c main.c misc.c gnum4.c trace.c parser.y tokenizer.l
-.PATH: ${.CURDIR}/lib
-SRCS+=	ohash_create_entry.c ohash_delete.c ohash_do.c ohash_entries.c \
-	ohash_enum.c ohash_init.c ohash_int.h ohash_interval.c \
-	ohash_lookup_interval.c ohash_lookup_memory.c ohash_qlookup.c \
-	ohash_qlookupi.c
+
+WARNS=	3
 
 tokenizer.o: parser.h
 
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index fbd42aa9e796..b4b025e642c3 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eval.c,v 1.70 2012/04/12 17:00:11 espie Exp $	*/
+/*	$OpenBSD: eval.c,v 1.73 2014/07/11 21:04:17 espie Exp $ */
 /*	$NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $	*/
 
 /*
@@ -267,7 +267,7 @@ expand_builtin(const char *argv[], int argc, int td)
 			doesyscmd(argv[2]);
 		break;
 	case INCLTYPE:
-		if (argc > 2)
+		if (argc > 2) {
 			if (!doincl(argv[2])) {
 				if (mimic_gnu) {
 					warn("%s at line %lu: include(%s)",
@@ -277,6 +277,7 @@ expand_builtin(const char *argv[], int argc, int td)
 					err(1, "%s at line %lu: include(%s)",
 					    CURRENT_NAME, CURRENT_LINE, argv[2]);
 			}
+		}
 		break;
 
 	case SINCTYPE:
@@ -794,7 +795,7 @@ dom4wrap(const char *text)
 			maxwraps = 16;
 		else
 			maxwraps *= 2;
-		m4wraps = xrealloc(m4wraps, maxwraps * sizeof(*m4wraps),
+		m4wraps = xreallocarray(m4wraps, maxwraps, sizeof(*m4wraps),
 		   "too many m4wraps");
 	}
 	m4wraps[wrapindex++] = xstrdup(text);
@@ -821,11 +822,10 @@ dodiv(int n)
 	if (outfile[n] == NULL) {
 		char fname[] = _PATH_DIVNAME;
 
-		if ((fd = mkstemp(fname)) < 0 || 
-			(outfile[n] = fdopen(fd, "w+")) == NULL)
-				err(1, "%s: cannot divert", fname);
-		if (unlink(fname) == -1)
-			err(1, "%s: cannot unlink", fname);
+		if ((fd = mkstemp(fname)) < 0 ||
+		    unlink(fname) == -1 ||
+		    (outfile[n] = fdopen(fd, "w+")) == NULL)
+			err(1, "%s: cannot divert", fname);
 	}
 	active = outfile[n];
 }
diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index 7753c32c8a0e..fd2d3ae57099 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.52 2012/04/12 17:00:11 espie Exp $	*/
+/*	$OpenBSD: extern.h,v 1.54 2014/05/12 19:11:19 espie Exp $ */
 /*	$NetBSD: extern.h,v 1.3 1996/01/13 23:25:24 pk Exp $	*/
 
 /*-
@@ -104,8 +104,10 @@ extern void	pbnumbase(int, int, int);
 extern void	pbunsigned(unsigned long);
 extern void	pbstr(const char *);
 extern void	pushback(int);
-extern void	*xalloc(size_t, const char *fmt, ...);
-extern void	*xrealloc(void *, size_t, const char *fmt, ...);
+extern void	*xalloc(size_t, const char *, ...);
+extern void	*xcalloc(size_t, size_t, const char *, ...);
+extern void	*xrealloc(void *, size_t, const char *, ...);
+extern void	*xreallocarray(void *, size_t, size_t, const char *, ...);
 extern char	*xstrdup(const char *);
 extern void	usage(void);
 extern void	resizedivs(int);
diff --git a/usr.bin/m4/gnum4.c b/usr.bin/m4/gnum4.c
index 342751a15215..cac01ece6818 100644
--- a/usr.bin/m4/gnum4.c
+++ b/usr.bin/m4/gnum4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gnum4.c,v 1.42 2011/11/06 12:25:43 espie Exp $ */
+/* $OpenBSD: gnum4.c,v 1.46 2014/07/10 14:12:31 espie Exp $ */
 
 /*
  * Copyright (c) 1999 Marc Espie
@@ -196,10 +196,12 @@ static void addchars(const char *, size_t);
 static void addchar(int);
 static char *twiddle(const char *);
 static char *getstring(void);
-static void exit_regerror(int, regex_t *);
-static void do_subst(const char *, regex_t *, const char *, regmatch_t *);
-static void do_regexpindex(const char *, regex_t *, regmatch_t *);
-static void do_regexp(const char *, regex_t *, const char *, regmatch_t *);
+static void exit_regerror(int, regex_t *, const char *);
+static void do_subst(const char *, regex_t *, const char *, const char *,
+    regmatch_t *);
+static void do_regexpindex(const char *, regex_t *, const char *, regmatch_t *);
+static void do_regexp(const char *, regex_t *, const char *, const char *,
+    regmatch_t *);
 static void add_sub(int, const char *, regex_t *, regmatch_t *);
 static void add_replace(const char *, regex_t *, const char *, regmatch_t *);
 #define addconstantstring(s) addchars((s), sizeof(s)-1)
@@ -243,7 +245,7 @@ getstring(void)
 
 
 static void
-exit_regerror(int er, regex_t *re)
+exit_regerror(int er, regex_t *re, const char *source)
 {
 	size_t	errlen;
 	char	*errbuf;
@@ -252,7 +254,7 @@ exit_regerror(int er, regex_t *re)
 	errbuf = xalloc(errlen,
 	    "malloc in regerror: %lu", (unsigned long)errlen);
 	regerror(er, re, errbuf, errlen);
-	m4errx(1, "regular expression error: %s.", errbuf);
+	m4errx(1, "regular expression error in %s: %s.", source, errbuf);
 }
 
 static void
@@ -296,7 +298,7 @@ add_replace(const char *string, regex_t *re, const char *replace, regmatch_t *pm
 				p++;
 				continue;
 			}
-			if (isdigit(p[1])) {
+			if (isdigit((unsigned char)p[1])) {
 				add_sub(*(++p) - '0', string, re, pm);
 				continue;
 			}
@@ -306,7 +308,8 @@ add_replace(const char *string, regex_t *re, const char *replace, regmatch_t *pm
 }
 
 static void
-do_subst(const char *string, regex_t *re, const char *replace, regmatch_t *pm)
+do_subst(const char *string, regex_t *re, const char *source,
+    const char *replace, regmatch_t *pm)
 {
 	int error;
 	int flags = 0;
@@ -341,12 +344,13 @@ do_subst(const char *string, regex_t *re, const char *replace, regmatch_t *pm)
 		string += pm[0].rm_eo;
 	}
 	if (error != REG_NOMATCH)
-		exit_regerror(error, re);
+		exit_regerror(error, re, source);
 	pbstr(string);
 }
 
 static void
-do_regexp(const char *string, regex_t *re, const char *replace, regmatch_t *pm)
+do_regexp(const char *string, regex_t *re, const char *source,
+    const char *replace, regmatch_t *pm)
 {
 	int error;
 
@@ -358,12 +362,13 @@ do_regexp(const char *string, regex_t *re, const char *replace, regmatch_t *pm)
 	case REG_NOMATCH:
 		break;
 	default:
-		exit_regerror(error, re);
+		exit_regerror(error, re, source);
 	}
 }
 
 static void
-do_regexpindex(const char *string, regex_t *re, regmatch_t *pm)
+do_regexpindex(const char *string, regex_t *re, const char *source,
+    regmatch_t *pm)
 {
 	int error;
 
@@ -375,7 +380,7 @@ do_regexpindex(const char *string, regex_t *re, regmatch_t *pm)
 		pbnum(-1);
 		break;
 	default:
-		exit_regerror(error, re);
+		exit_regerror(error, re, source);
 	}
 }
 
@@ -459,6 +464,7 @@ dopatsubst(const char *argv[], int argc)
 		regex_t re;
 		regmatch_t *pmatch;
 		int mode = REG_EXTENDED;
+		const char *source;
 		size_t l = strlen(argv[3]);
 
 		if (!mimic_gnu ||
@@ -466,13 +472,14 @@ dopatsubst(const char *argv[], int argc)
 		    (l > 0 && argv[3][l-1] == '$'))
 			mode |= REG_NEWLINE;
 
-		error = regcomp(&re, mimic_gnu ? twiddle(argv[3]) : argv[3],
-		    mode);
+		source = mimic_gnu ? twiddle(argv[3]) : argv[3];
+		error = regcomp(&re, source, mode);
 		if (error != 0)
-			exit_regerror(error, &re);
+			exit_regerror(error, &re, source);
 
-		pmatch = xalloc(sizeof(regmatch_t) * (re.re_nsub+1), NULL);
-		do_subst(argv[2], &re,
+		pmatch = xreallocarray(NULL, re.re_nsub+1, sizeof(regmatch_t),
+		    NULL);
+		do_subst(argv[2], &re, source,
 		    argc > 4 && argv[4] != NULL ? argv[4] : "", pmatch);
 		free(pmatch);
 		regfree(&re);
@@ -486,6 +493,7 @@ doregexp(const char *argv[], int argc)
 	int error;
 	regex_t re;
 	regmatch_t *pmatch;
+	const char *source;
 
 	if (argc <= 3) {
 		warnx("Too few arguments to regexp");
@@ -498,16 +506,16 @@ doregexp(const char *argv[], int argc)
 		else
 			pbstr(argv[4]);
 	}
-	error = regcomp(&re, mimic_gnu ? twiddle(argv[3]) : argv[3],
-	    REG_EXTENDED|REG_NEWLINE);
+	source = mimic_gnu ? twiddle(argv[3]) : argv[3];
+	error = regcomp(&re, source, REG_EXTENDED|REG_NEWLINE);
 	if (error != 0)
-		exit_regerror(error, &re);
+		exit_regerror(error, &re, source);
 
-	pmatch = xalloc(sizeof(regmatch_t) * (re.re_nsub+1), NULL);
+	pmatch = xreallocarray(NULL, re.re_nsub+1, sizeof(regmatch_t), NULL);
 	if (argc == 4 || argv[4] == NULL)
-		do_regexpindex(argv[2], &re, pmatch);
+		do_regexpindex(argv[2], &re, source, pmatch);
 	else
-		do_regexp(argv[2], &re, argv[4], pmatch);
+		do_regexp(argv[2], &re, source, argv[4], pmatch);
 	free(pmatch);
 	regfree(&re);
 }
diff --git a/usr.bin/m4/lib/ohash_create_entry.c b/usr.bin/m4/lib/ohash_create_entry.c
deleted file mode 100644
index b0959dd5a312..000000000000
--- a/usr.bin/m4/lib/ohash_create_entry.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $OpenBSD: ohash_create_entry.c,v 1.2 2004/06/22 20:00:16 espie Exp $ */
-/* ex:ts=8 sw=4: 
- */
-
-/* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "ohash_int.h"
-
-/* This handles the common case of variable length keys, where the 
- * key is stored at the end of the record.
- */
-void *
-ohash_create_entry(struct ohash_info *i, const char *start, const char **end)
-{
-	char *p;
-
-	if (!*end)
-		*end = start + strlen(start);
-	p = (i->alloc)(i->key_offset + (*end - start) + 1, i->data);
-	if (p) {
-	    memcpy(p+i->key_offset, start, *end-start);
-	    p[i->key_offset + (*end - start)] = '\0';
-	}
-	return (void *)p;
-}
diff --git a/usr.bin/m4/lib/ohash_delete.c b/usr.bin/m4/lib/ohash_delete.c
deleted file mode 100644
index b0ec7b546ee8..000000000000
--- a/usr.bin/m4/lib/ohash_delete.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* $OpenBSD: ohash_delete.c,v 1.2 2004/06/22 20:00:16 espie Exp $ */
-/* ex:ts=8 sw=4: 
- */
-
-/* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "ohash_int.h"
-/* hash_delete only frees the hash structure. Use hash_first/hash_next
- * to free entries as well.  */
-void 
-ohash_delete(struct ohash *h)
-{
-	(h->info.hfree)(h->t, sizeof(struct _ohash_record) * h->size,
-		h->info.data);
-#ifndef NDEBUG
-	h->t = NULL;
-#endif
-}
diff --git a/usr.bin/m4/lib/ohash_do.c b/usr.bin/m4/lib/ohash_do.c
deleted file mode 100644
index dffe6b614880..000000000000
--- a/usr.bin/m4/lib/ohash_do.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* $OpenBSD: ohash_do.c,v 1.4 2004/06/22 20:00:16 espie Exp $ */
-/* ex:ts=8 sw=4: 
- */
-
-/* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "ohash_int.h"
-
-static void ohash_resize(struct ohash *);
-
-static void 
-ohash_resize(struct ohash *h)
-{
-	struct _ohash_record *n;
-	unsigned int 	ns, j;
-	unsigned int	i, incr;
-
-	if (4 * h->deleted < h->total)
-		ns = h->size << 1;
-	else if (3 * h->deleted > 2 * h->total)
-		ns = h->size >> 1;
-	else
-		ns = h->size;
-	if (ns < MINSIZE)
-		ns = MINSIZE;
-#ifdef STATS_HASH
-	STAT_HASH_EXPAND++;
-	STAT_HASH_SIZE += ns - h->size;
-#endif
-	n = (h->info.halloc)(sizeof(struct _ohash_record) * ns, h->info.data);
-	if (!n)
-		return;
-
-	for (j = 0; j < h->size; j++) {
-		if (h->t[j].p != NULL && h->t[j].p != DELETED) {
-			i = h->t[j].hv % ns;
-			incr = ((h->t[j].hv % (ns - 2)) & ~1) + 1;
-			while (n[i].p != NULL) {
-				i += incr;
-				if (i >= ns)
-					i -= ns;
-		    	}
-			n[i].hv = h->t[j].hv;
-			n[i].p = h->t[j].p;
-		}
-	}
-	(h->info.hfree)(h->t, sizeof(struct _ohash_record) * h->size, 
-		h->info.data);
-	h->t = n;
-	h->size = ns;
-	h->total -= h->deleted;
-	h->deleted = 0;
-}
-
-void *
-ohash_remove(struct ohash *h, unsigned int i)
-{
-	void 		*result = __DECONST(void *, h->t[i].p);
-
-	if (result == NULL || result == DELETED)
-		return NULL;
-
-#ifdef STATS_HASH
-	STAT_HASH_ENTRIES--;
-#endif
-	h->t[i].p = DELETED;
-	h->deleted++;
-	if (h->deleted >= MINDELETED && 4 * h->deleted > h->total)
-		ohash_resize(h);
-	return result;
-}
-
-void *
-ohash_find(struct ohash *h, unsigned int i)
-{
-	if (h->t[i].p == DELETED)
-		return NULL;
-	else
-		return __DECONST(void *, h->t[i].p);
-}
-
-void *
-ohash_insert(struct ohash *h, unsigned int i, void *p)
-{
-#ifdef STATS_HASH
-	STAT_HASH_ENTRIES++;
-#endif
-	if (h->t[i].p == DELETED) {
-		h->deleted--;
-		h->t[i].p = p;
-	} else {
-		h->t[i].p = p;
-	/* Arbitrary resize boundary.  Tweak if not efficient enough.  */
-		if (++h->total * 4 > h->size * 3)
-			ohash_resize(h);
-	}
-    	return p;
-}
diff --git a/usr.bin/m4/lib/ohash_entries.c b/usr.bin/m4/lib/ohash_entries.c
deleted file mode 100644
index c6c5d3e5ee23..000000000000
--- a/usr.bin/m4/lib/ohash_entries.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* $OpenBSD: ohash_entries.c,v 1.2 2004/06/22 20:00:16 espie Exp $ */
-/* ex:ts=8 sw=4: 
- */
-
-/* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "ohash_int.h"
-
-unsigned int
-ohash_entries(struct ohash *h)
-{
-	return h->total - h->deleted;
-}
diff --git a/usr.bin/m4/lib/ohash_enum.c b/usr.bin/m4/lib/ohash_enum.c
deleted file mode 100644
index 85a3bbc4fb8a..000000000000
--- a/usr.bin/m4/lib/ohash_enum.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $OpenBSD: ohash_enum.c,v 1.3 2004/06/22 20:00:16 espie Exp $ */
-/* ex:ts=8 sw=4: 
- */
-
-/* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "ohash_int.h"
-
-void *
-ohash_first(struct ohash *h, unsigned int *pos)
-{
-	*pos = 0;
-	return ohash_next(h, pos);
-}
-	
-void *
-ohash_next(struct ohash *h, unsigned int *pos)
-{
-	for (; *pos < h->size; (*pos)++) 
-		if (h->t[*pos].p != DELETED && h->t[*pos].p != NULL) 
-			return __DECONST(void *, h->t[(*pos)++].p);
-	return NULL;
-}
diff --git a/usr.bin/m4/lib/ohash_init.c b/usr.bin/m4/lib/ohash_init.c
deleted file mode 100644
index a98673d4f0d2..000000000000
--- a/usr.bin/m4/lib/ohash_init.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $OpenBSD: ohash_init.c,v 1.2 2004/06/22 20:00:16 espie Exp $ */
-/* ex:ts=8 sw=4: 
- */
-
-/* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "ohash_int.h"
-
-void 
-ohash_init(struct ohash *h, unsigned int size, struct ohash_info *info)
-{
-	h->size = 1UL << size;
-	if (h->size < MINSIZE)
-		h->size = MINSIZE;
-#ifdef STATS_HASH
-	STAT_HASH_CREATION++;
-	STAT_HASH_SIZE += h->size;
-#endif
-	/* Copy info so that caller may free it.  */
-	h->info.key_offset = info->key_offset;
-	h->info.halloc = info->halloc;
-	h->info.hfree = info->hfree;
-	h->info.alloc = info->alloc;
-	h->info.data = info->data;
-	h->t = (h->info.halloc)(sizeof(struct _ohash_record) * h->size,
-	    h->info.data);
-	h->total = h->deleted = 0;
-}
diff --git a/usr.bin/m4/lib/ohash_int.h b/usr.bin/m4/lib/ohash_int.h
deleted file mode 100644
index 49e01a4a40f6..000000000000
--- a/usr.bin/m4/lib/ohash_int.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*	$OpenBSD: ohash_int.h,v 1.3 2006/01/16 15:52:25 espie Exp $	*/
-/* $FreeBSD$ */
-
-#if HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
-#include <sys/types.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include "ohash.h"
-
-struct _ohash_record {
-	u_int32_t	hv;
-	const char 	*p;
-};
-
-#define DELETED		((const char *)h)
-#define NONE		(h->size)
-
-/* Don't bother changing the hash table if the change is small enough.  */
-#define MINSIZE		(1UL << 4)
-#define MINDELETED	4
diff --git a/usr.bin/m4/lib/ohash_interval.c b/usr.bin/m4/lib/ohash_interval.c
deleted file mode 100644
index f6884c08e836..000000000000
--- a/usr.bin/m4/lib/ohash_interval.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $OpenBSD: ohash_interval.c,v 1.3 2006/01/16 15:52:25 espie Exp $ */
-/* ex:ts=8 sw=4: 
- */
-
-/* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "ohash_int.h"
-
-uint32_t
-ohash_interval(const char *s, const char **e)
-{
-	uint32_t k;
-
-	if (!*e)
-		*e = s + strlen(s);
-	if (s == *e)
-		k = 0;
-	else
-		k = *s++;
-	while (s != *e)
-		k =  ((k << 2) | (k >> 30)) ^ *s++;
-	return k;
-}
diff --git a/usr.bin/m4/lib/ohash_lookup_interval.c b/usr.bin/m4/lib/ohash_lookup_interval.c
deleted file mode 100644
index 196f5fa47902..000000000000
--- a/usr.bin/m4/lib/ohash_lookup_interval.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $OpenBSD: ohash_lookup_interval.c,v 1.3 2006/01/16 15:52:25 espie Exp $ */
-/* ex:ts=8 sw=4: 
- */
-
-/* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "ohash_int.h"
-	
-unsigned int
-ohash_lookup_interval(struct ohash *h, const char *start, const char *end, 
-    uint32_t hv)
-{
-	unsigned int 	i, incr;
-	unsigned int	empty;
-	
-#ifdef STATS_HASH
-	STAT_HASH_LOOKUP++;
-#endif
-	empty = NONE;
-	i = hv % h->size;
-	incr = ((hv % (h->size-2)) & ~1) + 1;
-	while (h->t[i].p != NULL) {
-#ifdef STATS_HASH
-		STAT_HASH_LENGTH++;
-#endif
-		if (h->t[i].p == DELETED) {
-			if (empty == NONE)
-				empty = i;
-		} else if (h->t[i].hv == hv && 
-		    strncmp(h->t[i].p+h->info.key_offset, start, 
-		    	end - start) == 0 &&
-		    (h->t[i].p+h->info.key_offset)[end-start] == '\0') {
-		    	if (empty != NONE) {
-				h->t[empty].hv = hv;
-				h->t[empty].p = h->t[i].p;
-				h->t[i].p = DELETED;
-				return empty;
-			} else {
-#ifdef STATS_HASH
-				STAT_HASH_POSITIVE++;
-#endif
-				return i;
-			}
-		}
-		i += incr;
-		if (i >= h->size) 
-			i -= h->size;
-	}
-
-	/* Found an empty position.  */
-	if (empty != NONE) 
-		i = empty;
-	h->t[i].hv = hv;
-	return i;
-}
diff --git a/usr.bin/m4/lib/ohash_lookup_memory.c b/usr.bin/m4/lib/ohash_lookup_memory.c
deleted file mode 100644
index 0c448e03a3b6..000000000000
--- a/usr.bin/m4/lib/ohash_lookup_memory.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* $OpenBSD: ohash_lookup_memory.c,v 1.3 2006/01/16 15:52:25 espie Exp $ */
-/* ex:ts=8 sw=4: 
- */
-
-/* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "ohash_int.h"
-
-unsigned int
-ohash_lookup_memory(struct ohash *h, const char *k, size_t size, uint32_t hv)
-{
-	unsigned int	i, incr;
-	unsigned int	empty;
-	
-#ifdef STATS_HASH
-	STAT_HASH_LOOKUP++;
-#endif
-	empty = NONE;
-	i = hv % h->size;
-	incr = ((hv % (h->size-2)) & ~1) + 1;
-	while (h->t[i].p != NULL) {
-#ifdef STATS_HASH
-		STAT_HASH_LENGTH++;
-#endif
-		if (h->t[i].p == DELETED) {
-			if (empty == NONE)
-				empty = i;
-		} else if (h->t[i].hv == hv && 
-		    memcmp(h->t[i].p+h->info.key_offset, k, size) == 0) {
-		    	if (empty != NONE) {
-				h->t[empty].hv = hv;
-				h->t[empty].p = h->t[i].p;
-				h->t[i].p = DELETED;
-				return empty;
-			} else {
-#ifdef STATS_HASH
-				STAT_HASH_POSITIVE++;
-#endif
-			}	return i;
-		}
-		i += incr;
-		if (i >= h->size) 
-			i -= h->size;
-	}
-
-	/* Found an empty position.  */
-	if (empty != NONE) 
-		i = empty;
-	h->t[i].hv = hv;
-	return i;
-}
diff --git a/usr.bin/m4/lib/ohash_qlookup.c b/usr.bin/m4/lib/ohash_qlookup.c
deleted file mode 100644
index 81e7d55474aa..000000000000
--- a/usr.bin/m4/lib/ohash_qlookup.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* $OpenBSD: ohash_qlookup.c,v 1.2 2004/06/22 20:00:17 espie Exp $ */
-/* ex:ts=8 sw=4: 
- */
-
-/* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "ohash_int.h"
-
-unsigned int
-ohash_qlookup(struct ohash *h, const char *s)
-{
-	const char *e = NULL;
-	return ohash_qlookupi(h, s, &e);
-}
diff --git a/usr.bin/m4/lib/ohash_qlookupi.c b/usr.bin/m4/lib/ohash_qlookupi.c
deleted file mode 100644
index ab90fe30cf73..000000000000
--- a/usr.bin/m4/lib/ohash_qlookupi.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* $OpenBSD: ohash_qlookupi.c,v 1.2 2004/06/22 20:00:17 espie Exp $ */
-/* ex:ts=8 sw=4: 
- */
-
-/* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "ohash_int.h"
-
-unsigned int
-ohash_qlookupi(struct ohash *h, const char *s, const char **e)
-{
-	u_int32_t hv;
-
-	hv = ohash_interval(s, e);
-	return ohash_lookup_interval(h, s, *e, hv);
-}
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index 904c05545198..70497e01e593 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: look.c,v 1.22 2010/09/07 19:58:09 marco Exp $	*/
+/*	$OpenBSD: look.c,v 1.23 2014/05/12 19:11:19 espie Exp $ */
 
 /*
  * Copyright (c) 1989, 1993
@@ -51,36 +51,34 @@ __FBSDID("$FreeBSD$");
 #include "stdd.h"
 #include "extern.h"
 
-static void *hash_alloc(size_t, void *);
-static void hash_free(void *, size_t, void *);
+static void *hash_calloc(size_t, size_t, void *);
+static void hash_free(void *, void *);
 static void *element_alloc(size_t, void *);
 static void setup_definition(struct macro_definition *, const char *,
     const char *);
 
 static struct ohash_info macro_info = {
 	offsetof(struct ndblock, name),
-	NULL, hash_alloc, hash_free, element_alloc };
+	NULL, hash_calloc, hash_free, element_alloc };
 
 struct ohash macros;
 
 /* Support routines for hash tables.  */
 void *
-hash_alloc(size_t s, __unused void *u)
+hash_calloc(size_t n, size_t s, void *u __unused)
 {
-	void *storage = xalloc(s, "hash alloc");
-	if (storage)
-		memset(storage, 0, s);
+	void *storage = xcalloc(n, s, "hash alloc");
 	return storage;
 }
 
 void
-hash_free(void *p, __unused size_t s, __unused void *u)
+hash_free(void *p, void *u __unused)
 {
 	free(p);
 }
 
 void *
-element_alloc(size_t s, __unused void *u)
+element_alloc(size_t s, void *u __unused)
 {
 	return xalloc(s, "element alloc");
 }
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index d0669c127dd6..0e1d83a85319 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
 .\"	$NetBSD: m4.1,v 1.23 2012/04/08 22:00:39 wiz Exp $
-.\"	@(#) $OpenBSD: m4.1,v 1.59 2010/10/21 13:20:51 jmc Exp $
+.\"	@(#) $OpenBSD: m4.1,v 1.62 2014/04/14 07:00:47 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 21, 2010
+.Dd January 12, 2014
 .Dt M4 1
 .Os
 .Sh NAME
@@ -88,9 +88,7 @@ In arguments to macros, leading unquoted space, tab, and newline
 .Pq Sq \en
 characters are ignored.
 To quote strings, use left and right single quotes
-.Po e.g.,\ \&
-.Sq "\ this is a string with a leading space"
-.Pc .
+.Pq e.g., Sq \ \&this is a string with a leading space .
 You can change the quote characters with the
 .Ic changequote
 built-in macro.
@@ -258,15 +256,17 @@ Prints the first argument on the standard error output stream.
 Passes its first argument to a shell and returns the shell's standard output.
 Note that the shell shares its standard input and standard error with
 .Nm .
-.It Fn eval expr
+.It Fn eval expr[,radix[,minimum]]
 Computes the first argument as an arithmetic expression using 32-bit
 arithmetic.
 Operators are the standard C ternary, arithmetic, logical,
 shift, relational, bitwise, and parentheses operators.
 You can specify
 octal, decimal, and hexadecimal numbers as in C.
-The second argument (if any)
-specifies the radix for the result and the third argument (if any)
+The optional second argument
+.Fa radix
+specifies the radix for the result and the optional third argument
+.Fa minimum
 specifies the minimum number of digits in the result.
 .It Fn expr expr
 This is an alias for
@@ -441,12 +441,12 @@ macro can modify the exit status.
 .Sh STANDARDS
 The
 .Nm
-utility is mostly compliant with the
+utility is compliant with the
 .St -p1003.1-2008
 specification.
 .Pp
 The flags
-.Op Fl dgIot
+.Op Fl dgIPot
 and the macros
 .Ic builtin ,
 .Ic esyscmd ,
@@ -467,9 +467,13 @@ are extensions to that specification.
 is not supposed to be a synonym for
 .Ic mkstemp ,
 but instead to be an insecure temporary file name creation function.
-The change causes no known compatibility issues.
+It is marked by
+.St -p1003.1-2008
+as being obsolescent and should not be used if portability is a concern.
 .Pp
-The output format of tracing and of
+The output format of
+.Ic traceon
+and
 .Ic dumpdef
 are not specified in any standard,
 are likely to change and should not be relied upon.
@@ -500,9 +504,9 @@ Many other
 have dire size limitations with respect to buffer sizes.
 .Sh AUTHORS
 .An -nosplit
-.An Ozan Yigit Aq oz@sis.yorku.ca
+.An Ozan Yigit Aq Mt oz@sis.yorku.ca
 and
-.An Richard A. O'Keefe Aq ok@goanna.cs.rmit.OZ.AU .
+.An Richard A. O'Keefe Aq Mt ok@goanna.cs.rmit.OZ.AU .
 .Pp
 GNU-m4 compatibility extensions by
-.An Marc Espie Aq espie@cvs.openbsd.org .
+.An Marc Espie Aq Mt espie@cvs.openbsd.org .
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index 1cb0340fbdd4..ced881b2ca91 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.81 2012/04/12 17:00:11 espie Exp $	*/
+/*	$OpenBSD: main.c,v 1.83 2014/05/12 19:11:19 espie Exp $ */
 /*	$NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $	*/
 
 /*-
@@ -180,8 +180,8 @@ main(int argc, char *argv[])
 	initspaces();
 	STACKMAX = INITSTACKMAX;
 
-	mstack = (stae *)xalloc(sizeof(stae) * STACKMAX, NULL);
-	sstack = (char *)xalloc(STACKMAX, NULL);
+	mstack = xreallocarray(NULL, STACKMAX, sizeof(stae), NULL);
+	sstack = xalloc(STACKMAX, NULL);
 
 	maxout = 0;
 	outfile = NULL;
@@ -415,7 +415,8 @@ macro(void)
 				}
 			}
 		} else if (t == EOF) {
-			if (sp > -1 && ilevel <= 0) {
+			if (!mimic_gnu /* you can puke right there */
+			    && sp > -1 && ilevel <= 0) {
 				warnx( "unexpected end of input, unclosed parenthesis:");
 				dump_stack(paren, PARLEV);
 				exit(1);
@@ -625,7 +626,7 @@ static void
 enlarge_stack(void)
 {
 	STACKMAX += STACKMAX/2;
-	mstack = xrealloc(mstack, sizeof(stae) * STACKMAX,
+	mstack = xreallocarray(mstack, STACKMAX, sizeof(stae),
 	    "Evaluation stack overflow (%lu)",
 	    (unsigned long)STACKMAX);
 	sstack = xrealloc(sstack, STACKMAX,
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index c5bcfbf4fce1..19594486e958 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.42 2010/09/07 19:58:09 marco Exp $	*/
+/*	$OpenBSD: misc.c,v 1.44 2014/05/12 19:11:19 espie Exp $	*/
 /*	$NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $	*/
 
 /*
@@ -32,6 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
@@ -40,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
@@ -165,7 +167,7 @@ initspaces(void)
 	strspace = xalloc(strsize+1, NULL);
 	ep = strspace;
 	endest = strspace+strsize;
-	buf = (unsigned char *)xalloc(bufsize, NULL);
+	buf = xalloc(bufsize, NULL);
 	bufbase = buf;
 	bp = buf;
 	endpbb = buf + bufsize;
@@ -239,7 +241,7 @@ getdiv(int n)
 }
 
 void
-onintr(__unused int signo)
+onintr(int signo __unused)
 {
 #define intrmessage	"m4: interrupted.\n"
 	write(STDERR_FILENO, intrmessage, sizeof(intrmessage)-1);
@@ -263,7 +265,7 @@ killdiv(void)
 extern char *__progname;
 
 void
-m4errx(int evaluation, const char *fmt, ...)
+m4errx(int exitstatus, const char *fmt, ...)
 {
 	fprintf(stderr, "%s: ", __progname);
 	fprintf(stderr, "%s at line %lu: ", CURRENT_NAME, CURRENT_LINE);
@@ -275,7 +277,7 @@ m4errx(int evaluation, const char *fmt, ...)
 		va_end(ap);
 	}
 	fprintf(stderr, "\n");
-	exit(evaluation);
+	exit(exitstatus);
 }
 
 /*
@@ -285,7 +287,7 @@ resizedivs(int n)
 {
 	int i;
 
-	outfile = (FILE **)xrealloc(outfile, sizeof(FILE *) * n,
+	outfile = xreallocarray(outfile, n, sizeof(FILE *),
 	    "too many diverts %d", n);
 	for (i = maxout; i < n; i++)
 		outfile[i] = NULL;
@@ -311,6 +313,25 @@ xalloc(size_t n, const char *fmt, ...)
 	return p;
 }
 
+void *
+xcalloc(size_t n, size_t s, const char *fmt, ...)
+{
+	void *p = calloc(n, s);
+
+	if (p == NULL) {
+		if (fmt == NULL)
+			err(1, "calloc");
+		else {
+			va_list va;
+
+			va_start(va, fmt);
+			verr(1, fmt, va);
+			va_end(va);
+		}
+	}
+	return p;
+}
+
 void *
 xrealloc(void *old, size_t n, const char *fmt, ...)
 {
@@ -331,6 +352,43 @@ xrealloc(void *old, size_t n, const char *fmt, ...)
 	return p;
 }
 
+/*
+ * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
+ * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
+ */
+#define MUL_NO_OVERFLOW	(1UL << (sizeof(size_t) * 4))
+
+static void *
+reallocarray(void *optr, size_t nmemb, size_t size)
+{
+	if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
+	    nmemb > 0 && SIZE_MAX / nmemb < size) {
+		errno = ENOMEM;
+		return NULL;
+	}
+	return realloc(optr, size * nmemb);
+}
+
+void *
+xreallocarray(void *old, size_t s1, size_t s2, const char *fmt, ...)
+{
+	void *p = reallocarray(old, s1, s2);
+
+	if (p == NULL) {
+		free(old);
+		if (fmt == NULL)
+			err(1, "reallocarray");
+		else {
+			va_list va;
+
+			va_start(va, fmt);
+			verr(1, fmt, va);
+			va_end(va);
+		}
+	}
+	return p;
+}
+
 char *
 xstrdup(const char *s)
 {
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index dbc545f0f61b..bfdeca04b5ef 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -113,6 +113,7 @@ CFLAGS+=	-DDEFSHELLNAME=\"${MAKE_SHELL}\"
 
 # if we are here we don't want this called 'make'
 PROG=	fmake
+CLEANFILES+=	fmake.1
 fmake.1: make.1
 	cp ${.ALLSRC} ${.TARGET}
 
diff --git a/usr.bin/mkcsmapper/mkcsmapper.1 b/usr.bin/mkcsmapper/mkcsmapper.1
index 650df500b77d..cf1fde233687 100644
--- a/usr.bin/mkcsmapper/mkcsmapper.1
+++ b/usr.bin/mkcsmapper/mkcsmapper.1
@@ -86,4 +86,4 @@ first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
diff --git a/usr.bin/mkesdb/mkesdb.1 b/usr.bin/mkesdb/mkesdb.1
index 66eb3908804d..c5d2edfed720 100644
--- a/usr.bin/mkesdb/mkesdb.1
+++ b/usr.bin/mkesdb/mkesdb.1
@@ -81,4 +81,4 @@ first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
 This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
+.An Gabor Kovesdan Aq Mt gabor@FreeBSD.org .
diff --git a/usr.bin/mkimg/Makefile b/usr.bin/mkimg/Makefile
index 582ca6032514..b802799f96ed 100644
--- a/usr.bin/mkimg/Makefile
+++ b/usr.bin/mkimg/Makefile
@@ -9,6 +9,7 @@ CFLAGS+=-DSPARSE_WRITE
 # List of formats to support
 SRCS+= \
 	raw.c \
+	vhd.c \
 	vmdk.c
 
 # List of schemes to support
diff --git a/usr.bin/mkimg/apm.c b/usr.bin/mkimg/apm.c
index 1877a545f163..12add8e4cb8a 100644
--- a/usr.bin/mkimg/apm.c
+++ b/usr.bin/mkimg/apm.c
@@ -39,6 +39,9 @@ __FBSDID("$FreeBSD$");
 #include "mkimg.h"
 #include "scheme.h"
 
+#ifndef APM_ENT_TYPE_APPLE_BOOT
+#define	APM_ENT_TYPE_APPLE_BOOT		"Apple_Bootstrap"
+#endif
 #ifndef APM_ENT_TYPE_FREEBSD_NANDFS
 #define	APM_ENT_TYPE_FREEBSD_NANDFS	"FreeBSD-nandfs"
 #endif
diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c
index 47fa64a133f1..959deb37bc0d 100644
--- a/usr.bin/mkimg/gpt.c
+++ b/usr.bin/mkimg/gpt.c
@@ -211,7 +211,7 @@ gpt_mktbl(u_int tblsz)
 	STAILQ_FOREACH(part, &partlist, link) {
 		ent = tbl + part->index;
 		gpt_uuid_enc(&ent->ent_type, ALIAS_TYPE2PTR(part->type));
-		uuidgen(&uuid, 1);
+		mkimg_uuid(&uuid);
 		gpt_uuid_enc(&ent->ent_uuid, &uuid);
 		le64enc(&ent->ent_lba_start, part->block);
 		le64enc(&ent->ent_lba_end, part->block + part->size - 1);
@@ -279,7 +279,7 @@ gpt_write(lba_t imgsz, void *bootcode)
 	le32enc(&hdr->hdr_size, offsetof(struct gpt_hdr, padding));
 	le64enc(&hdr->hdr_lba_start, 2 + tblsz);
 	le64enc(&hdr->hdr_lba_end, imgsz - tblsz - 2);
-	uuidgen(&uuid, 1);
+	mkimg_uuid(&uuid);
 	gpt_uuid_enc(&hdr->hdr_uuid, &uuid);
 	le32enc(&hdr->hdr_entries, nparts);
 	le32enc(&hdr->hdr_entsz, sizeof(struct gpt_ent));
diff --git a/usr.bin/mkimg/image.c b/usr.bin/mkimg/image.c
index e8dc8fe2082f..f448d98f0f92 100644
--- a/usr.bin/mkimg/image.c
+++ b/usr.bin/mkimg/image.c
@@ -93,22 +93,50 @@ image_copyin(lba_t blk, int fd, uint64_t *sizep)
 
 int
 image_copyout(int fd)
+{
+	int error;
+
+	error = image_copyout_region(fd, 0, image_size);
+	if (!error)
+		error = image_copyout_done(fd);
+	return (error);
+}
+
+int
+image_copyout_done(int fd)
+{
+	off_t ofs;
+	int error;
+
+	ofs = lseek(fd, 0L, SEEK_CUR);
+	if (ofs == -1)
+		return (0);
+	error = (ftruncate(fd, ofs) == -1) ? errno : 0;
+	return (error);
+}
+
+int
+image_copyout_region(int fd, lba_t blk, lba_t size)
 {
 	char *buffer;
 	off_t ofs;
+	size_t sz;
 	ssize_t rdsz, wrsz;
 	int error;
 
 	ofs = lseek(fd, 0L, SEEK_CUR);
 
-	if (lseek(image_fd, 0, SEEK_SET) != 0)
+	blk *= secsz;
+	if (lseek(image_fd, blk, SEEK_SET) != blk)
 		return (errno);
 	buffer = malloc(BUFFER_SIZE);
 	if (buffer == NULL)
 		return (errno);
 	error = 0;
-	while (1) {
-		rdsz = read(image_fd, buffer, BUFFER_SIZE);
+	size *= secsz;
+	while (size > 0) {
+		sz = (BUFFER_SIZE < size) ? BUFFER_SIZE : size;
+		rdsz = read(image_fd, buffer, sz);
 		if (rdsz <= 0) {
 			error = (rdsz < 0) ? errno : 0;
 			break;
@@ -120,17 +148,40 @@ image_copyout(int fd)
 			error = errno;
 			break;
 		}
+		assert(wrsz == rdsz);
+		size -= rdsz;
 	}
 	free(buffer);
-	if (error)
-		return (error);
-	ofs = lseek(fd, 0L, SEEK_CUR);
-	if (ofs == -1)
-		return (errno);
-	error = (ftruncate(fd, ofs) == -1) ? errno : 0;
 	return (error);
 }
 
+int
+image_data(lba_t blk, lba_t size)
+{
+	char *buffer, *p;
+
+	blk *= secsz;
+	if (lseek(image_fd, blk, SEEK_SET) != blk)
+		return (1);
+
+	size *= secsz;
+	buffer = malloc(size);
+	if (buffer == NULL)
+		return (1);
+
+	if (read(image_fd, buffer, size) != (ssize_t)size) {
+		free(buffer);
+		return (1);
+	}
+
+	p = buffer;
+	while (size > 0 && *p == '\0')
+		size--, p++;
+
+	free(buffer);
+	return ((size == 0) ? 0 : 1);
+}
+
 lba_t
 image_get_size(void)
 {
diff --git a/usr.bin/mkimg/image.h b/usr.bin/mkimg/image.h
index d30e11b84236..ce195d9b41ee 100644
--- a/usr.bin/mkimg/image.h
+++ b/usr.bin/mkimg/image.h
@@ -33,6 +33,9 @@ typedef int64_t lba_t;
 
 int image_copyin(lba_t blk, int fd, uint64_t *sizep);
 int image_copyout(int fd);
+int image_copyout_done(int fd);
+int image_copyout_region(int fd, lba_t blk, lba_t size);
+int image_data(lba_t blk, lba_t size);
 lba_t image_get_size(void);
 int image_init(void);
 int image_set_size(lba_t blk);
diff --git a/usr.bin/mkimg/mkimg.1 b/usr.bin/mkimg/mkimg.1
index 28773eb1ce7a..ed14cc8f9f74 100644
--- a/usr.bin/mkimg/mkimg.1
+++ b/usr.bin/mkimg/mkimg.1
@@ -24,12 +24,12 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 22, 2014
+.Dd July 4, 2014
 .Dt MKIMG 1
 .Os
 .Sh NAME
 .Nm mkimg
-.Nd "utility to make a disk image"
+.Nd "utility to make disk images"
 .Sh SYNOPSIS
 .Nm
 .Op Fl H Ar heads
@@ -40,6 +40,7 @@
 .Op Fl f Ar format
 .Op Fl o Ar outfile
 .Op Fl v
+.Op Fl y
 .Fl s Ar scheme
 .Fl p Ar partition
 .Op Fl p Ar partition ...
@@ -111,6 +112,16 @@ option increases the level of output that the
 .Nm
 utility prints.
 .Pp
+The
+.Op Fl y
+option is used for testing purposes only and is not to be used in production.
+When present, the
+.Nm
+utility will generate predictable values for Universally Unique Identifiers
+(UUIDs) and time stamps so that consecutive runs of the
+.Nm
+utility will create images that are identical.
+.Pp
 For a complete list of supported partitioning schemes or supported output
 format, or for a detailed description of how to specify partitions, run the
 .Nm
@@ -173,8 +184,8 @@ In the following example the file system partition is labeled as 'backup':
 .Sh HISTORY
 The
 .Nm
-utility appeared in
-.Fx 11.0
+utility first appeared in
+.Fx 10.1 .
 .Sh AUTHORS
 The
 .Nm
diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c
index 45d09d5cd72a..4513e665e443 100644
--- a/usr.bin/mkimg/mkimg.c
+++ b/usr.bin/mkimg/mkimg.c
@@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/uuid.h>
 #include <errno.h>
 #include <err.h>
 #include <fcntl.h>
@@ -50,6 +51,7 @@ __FBSDID("$FreeBSD$");
 struct partlisthead partlist = STAILQ_HEAD_INITIALIZER(partlist);
 u_int nparts = 0;
 
+u_int unit_testing;
 u_int verbose;
 
 u_int ncyls = 0;
@@ -73,6 +75,8 @@ usage(const char *why)
 	fprintf(stderr, "\t-o <file>\t-  file to write image into\n");
 	fprintf(stderr, "\t-p <partition>\n");
 	fprintf(stderr, "\t-s <scheme>\n");
+	fprintf(stderr, "\t-v\t\t-  increase verbosity\n");
+	fprintf(stderr, "\t-y\t\t-  [developers] enable unit test\n");
 	fprintf(stderr, "\t-H <num>\t-  number of heads to simulate\n");
 	fprintf(stderr, "\t-P <num>\t-  physical sector size\n");
 	fprintf(stderr, "\t-S <num>\t-  logical sector size\n");
@@ -258,6 +262,22 @@ sparse_write(int fd, const void *ptr, size_t sz)
 }
 #endif /* SPARSE_WRITE */
 
+void
+mkimg_uuid(struct uuid *uuid)
+{
+	static uint8_t gen[sizeof(struct uuid)];
+	u_int i;
+
+	if (!unit_testing) {
+		uuidgen(uuid, 1);
+		return;
+	}
+
+	for (i = 0; i < sizeof(gen); i++)
+		gen[i]++;
+	memcpy(uuid, gen, sizeof(uuid_t));
+}
+
 static void
 mkimg(void)
 {
@@ -337,7 +357,7 @@ main(int argc, char *argv[])
 
 	bcfd = -1;
 	outfd = 1;	/* Write to stdout by default */
-	while ((c = getopt(argc, argv, "b:f:o:p:s:vH:P:S:T:")) != -1) {
+	while ((c = getopt(argc, argv, "b:f:o:p:s:vyH:P:S:T:")) != -1) {
 		switch (c) {
 		case 'b':	/* BOOT CODE */
 			if (bcfd != -1)
@@ -373,6 +393,9 @@ main(int argc, char *argv[])
 			if (error)
 				errc(EX_DATAERR, error, "scheme");
 			break;
+		case 'y':
+			unit_testing++;
+			break;
 		case 'v':
 			verbose++;
 			break;
diff --git a/usr.bin/mkimg/mkimg.h b/usr.bin/mkimg/mkimg.h
index 290ca1efc201..9558b863d36d 100644
--- a/usr.bin/mkimg/mkimg.h
+++ b/usr.bin/mkimg/mkimg.h
@@ -50,6 +50,7 @@ struct part {
 extern STAILQ_HEAD(partlisthead, part) partlist;
 extern u_int nparts;
 
+extern u_int unit_testing;
 extern u_int verbose;
 
 extern u_int ncyls;
@@ -71,4 +72,7 @@ round_block(lba_t n)
 ssize_t sparse_write(int, const void *, size_t);
 #endif
 
+struct uuid;
+void mkimg_uuid(struct uuid *);
+
 #endif /* _MKIMG_MKIMG_H_ */
diff --git a/usr.bin/mkimg/raw.c b/usr.bin/mkimg/raw.c
index ea13931240c0..759debf322bf 100644
--- a/usr.bin/mkimg/raw.c
+++ b/usr.bin/mkimg/raw.c
@@ -28,7 +28,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <sys/apm.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <stdlib.h>
diff --git a/usr.bin/mkimg/vhd.c b/usr.bin/mkimg/vhd.c
new file mode 100644
index 000000000000..af3d95eaccd7
--- /dev/null
+++ b/usr.bin/mkimg/vhd.c
@@ -0,0 +1,386 @@
+/*-
+ * Copyright (c) 2014 Marcel Moolenaar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/endian.h>
+#include <sys/errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <uuid.h>
+
+#include "image.h"
+#include "format.h"
+#include "mkimg.h"
+
+#ifndef __has_extension
+#define	__has_extension(x)	0
+#endif
+
+/*
+ * General notes:
+ * o   File is in network byte order.
+ * o   The timestamp is seconds since 1/1/2000 12:00:00 AM UTC
+ *
+ * This file is divided in 3 parts:
+ * 1.  Common definitions
+ * 2.  Dynamic VHD support
+ * 3.  Fixed VHD support
+ */
+
+/*
+ * PART 1: Common definitions
+ */
+
+#define	VHD_SECTOR_SIZE	512
+#define	VHD_BLOCK_SIZE	(4096 * VHD_SECTOR_SIZE)	/* 2MB blocks */
+
+struct vhd_footer {
+	uint64_t	cookie;
+#define	VHD_FOOTER_COOKIE	0x636f6e6563746978
+	uint32_t	features;
+#define	VHD_FEATURES_TEMPORARY	0x01
+#define	VHD_FEATURES_RESERVED	0x02
+	uint32_t	version;
+#define	VHD_VERSION		0x00010000
+	uint64_t	data_offset;
+	uint32_t	timestamp;
+	uint32_t	creator_tool;
+#define	VHD_CREATOR_TOOL	0x2a696d67	/* FreeBSD mkimg */
+	uint32_t	creator_version;
+#define	VHD_CREATOR_VERSION	0x00010000
+	uint32_t	creator_os;
+#define	VHD_CREATOR_OS		0x46425344
+	uint64_t	original_size;
+	uint64_t	current_size;
+	uint16_t	cylinders;
+	uint8_t		heads;
+	uint8_t		sectors;
+	uint32_t	disk_type;
+#define	VHD_DISK_TYPE_FIXED	2
+#define	VHD_DISK_TYPE_DYNAMIC	3
+#define	VHD_DISK_TYPE_DIFF	4
+	uint32_t	checksum;
+	uuid_t		id;
+	uint8_t		saved_state;
+	uint8_t		_reserved[427];
+};
+#if __has_extension(c_static_assert)
+_Static_assert(sizeof(struct vhd_footer) == VHD_SECTOR_SIZE,
+    "Wrong size for footer");
+#endif
+
+static uint32_t
+vhd_checksum(void *buf, size_t sz)
+{
+	uint8_t *p = buf;
+	uint32_t sum;
+	size_t ofs;
+
+	sum = 0;
+	for (ofs = 0; ofs < sz; ofs++)
+		sum += p[ofs];
+	return (~sum);
+}
+
+static void
+vhd_geometry(struct vhd_footer *footer, uint64_t image_size)
+{
+	lba_t imgsz;
+	long cth;
+
+	/* Respect command line options if possible. */
+	if (nheads > 1 && nheads < 256 &&
+	    nsecs > 1 && nsecs < 256 &&
+	    ncyls < 65536) {
+		be16enc(&footer->cylinders, ncyls);
+		footer->heads = nheads;
+		footer->sectors = nsecs;
+		return;
+	}
+
+	imgsz = image_size / VHD_SECTOR_SIZE;
+	if (imgsz > 65536 * 16 * 255)
+		imgsz = 65536 * 16 * 255;
+	if (imgsz >= 65535 * 16 * 63) {
+		be16enc(&footer->cylinders, imgsz / (16 * 255));
+		footer->heads = 16;
+		footer->sectors = 255;
+		return;
+	}
+	footer->sectors = 17;
+	cth = imgsz / 17;
+	footer->heads = (cth + 1023) / 1024;
+	if (footer->heads < 4)
+		footer->heads = 4;
+	if (cth >= (footer->heads * 1024) || footer->heads > 16) {
+		footer->heads = 16;
+		footer->sectors = 31;
+		cth = imgsz / 31;
+	}
+	if (cth >= (footer->heads * 1024)) {
+		footer->heads = 16;
+		footer->sectors = 63;
+		cth = imgsz / 63;
+	}
+	be16enc(&footer->cylinders, cth / footer->heads);
+}
+
+static uint32_t
+vhd_timestamp(void)
+{
+	time_t t;
+
+	if (!unit_testing) {
+		t = time(NULL);
+		return (t - 0x386d4380);
+	}
+
+	return (0x01234567);
+}
+
+static void
+vhd_uuid_enc(void *buf, const uuid_t *uuid)
+{
+	uint8_t *p = buf;
+	int i;
+
+	be32enc(p, uuid->time_low);
+	be16enc(p + 4, uuid->time_mid);
+	be16enc(p + 6, uuid->time_hi_and_version);
+	p[8] = uuid->clock_seq_hi_and_reserved;
+	p[9] = uuid->clock_seq_low;
+	for (i = 0; i < _UUID_NODE_LEN; i++)
+		p[10 + i] = uuid->node[i];
+}
+
+static void
+vhd_make_footer(struct vhd_footer *footer, uint64_t image_size,
+    uint32_t disk_type, uint64_t data_offset)
+{
+	uuid_t id;
+
+	memset(footer, 0, sizeof(*footer));
+	be64enc(&footer->cookie, VHD_FOOTER_COOKIE);
+	be32enc(&footer->features, VHD_FEATURES_RESERVED);
+	be32enc(&footer->version, VHD_VERSION);
+	be64enc(&footer->data_offset, data_offset);
+	be32enc(&footer->timestamp, vhd_timestamp());
+	be32enc(&footer->creator_tool, VHD_CREATOR_TOOL);
+	be32enc(&footer->creator_version, VHD_CREATOR_VERSION);
+	be32enc(&footer->creator_os, VHD_CREATOR_OS);
+	be64enc(&footer->original_size, image_size);
+	be64enc(&footer->current_size, image_size);
+	vhd_geometry(footer, image_size);
+	be32enc(&footer->disk_type, disk_type);
+	mkimg_uuid(&id);
+	vhd_uuid_enc(&footer->id, &id);
+	be32enc(&footer->checksum, vhd_checksum(footer, sizeof(*footer)));
+}
+
+/*
+ * We round the image size to 2MB for both the dynamic and
+ * fixed VHD formats. For dynamic VHD, this is needed to
+ * have the image size be a multiple of the grain size. For
+ * fixed VHD this is not really needed, but makes sure that
+ * it's easy to convert from fixed VHD to dynamic VHD.
+ */
+static int
+vhd_resize(lba_t imgsz)
+{
+	uint64_t imagesz;
+
+	imagesz = imgsz * secsz;
+	imagesz = (imagesz + VHD_BLOCK_SIZE - 1) & ~(VHD_BLOCK_SIZE - 1);
+	return (image_set_size(imagesz / secsz));
+}
+
+/*
+ * PART 2: Dynamic VHD support
+ *
+ * Notes:
+ * o   File layout:
+ *	copy of disk footer
+ *	dynamic disk header
+ *	block allocation table (BAT)
+ *	data blocks
+ *	disk footer
+ */
+
+struct vhd_dyn_header {
+	uint64_t	cookie;
+#define	VHD_HEADER_COOKIE	0x6378737061727365
+	uint64_t	data_offset;
+	uint64_t	table_offset;
+	uint32_t	version;
+	uint32_t	max_entries;
+	uint32_t	block_size;
+	uint32_t	checksum;
+	uuid_t		parent_id;
+	uint32_t	parent_timestamp;
+	char		_reserved1[4];
+	uint16_t	parent_name[256];	/* UTF-16 */
+	struct {
+		uint32_t	code;
+		uint32_t	data_space;
+		uint32_t	data_length;
+		uint32_t	_reserved;
+		uint64_t	data_offset;
+	} parent_locator[8];
+	char		_reserved2[256];
+};
+#if __has_extension(c_static_assert)
+_Static_assert(sizeof(struct vhd_dyn_header) == VHD_SECTOR_SIZE * 2,
+    "Wrong size for header");
+#endif
+
+static int
+vhd_dyn_write(int fd)
+{
+	struct vhd_footer footer;
+	struct vhd_dyn_header header;
+	uint64_t imgsz;
+	lba_t blk, blkcnt, nblks;
+	uint32_t *bat;
+	void *bitmap;
+	size_t batsz;
+	uint32_t sector;
+	int bat_entries, error, entry;
+
+	imgsz = image_get_size() * secsz;
+	bat_entries = imgsz / VHD_BLOCK_SIZE;
+
+	vhd_make_footer(&footer, imgsz, VHD_DISK_TYPE_DYNAMIC, sizeof(footer));
+	if (sparse_write(fd, &footer, sizeof(footer)) < 0)
+		return (errno);
+
+	memset(&header, 0, sizeof(header));
+	be64enc(&header.cookie, VHD_HEADER_COOKIE);
+	be64enc(&header.data_offset, ~0ULL);
+	be64enc(&header.table_offset, sizeof(footer) + sizeof(header));
+	be32enc(&header.version, VHD_VERSION);
+	be32enc(&header.max_entries, bat_entries);
+	be32enc(&header.block_size, VHD_BLOCK_SIZE);
+	be32enc(&header.checksum, vhd_checksum(&header, sizeof(header)));
+	if (sparse_write(fd, &header, sizeof(header)) < 0)
+		return (errno);
+
+	batsz = bat_entries * sizeof(uint32_t);
+	batsz = (batsz + VHD_SECTOR_SIZE - 1) & ~(VHD_SECTOR_SIZE - 1);
+	bat = malloc(batsz);
+	if (bat == NULL)
+		return (errno);
+	memset(bat, 0xff, batsz);
+	blkcnt = VHD_BLOCK_SIZE / secsz;
+	sector = (sizeof(footer) + sizeof(header) + batsz) / VHD_SECTOR_SIZE;
+	for (entry = 0; entry < bat_entries; entry++) {
+		blk = entry * blkcnt;
+		if (image_data(blk, blkcnt)) {
+			be32enc(&bat[entry], sector);
+			sector += (VHD_BLOCK_SIZE / VHD_SECTOR_SIZE) + 1;
+		}
+	}
+	if (sparse_write(fd, bat, batsz) < 0) {
+		free(bat);
+		return (errno);
+	}
+	free(bat);
+
+	bitmap = malloc(VHD_SECTOR_SIZE);
+	if (bitmap == NULL)
+		return (errno);
+	memset(bitmap, 0xff, VHD_SECTOR_SIZE);
+
+	blk = 0;
+	blkcnt = VHD_BLOCK_SIZE / secsz;
+	error = 0;
+	nblks = image_get_size();
+	while (blk < nblks) {
+		if (!image_data(blk, blkcnt)) {
+			blk += blkcnt;
+			continue;
+		}
+		if (sparse_write(fd, bitmap, VHD_SECTOR_SIZE) < 0) {
+			error = errno;
+			break;
+		}
+		error = image_copyout_region(fd, blk, blkcnt);
+		if (error)
+			break;
+		blk += blkcnt;
+	}
+	free(bitmap);
+	if (blk != nblks)
+		return (error);
+
+	if (sparse_write(fd, &footer, sizeof(footer)) < 0)
+		return (errno);
+
+	return (0);
+}
+
+static struct mkimg_format vhd_dyn_format = {
+	.name = "vhd",
+	.description = "Virtual Hard Disk",
+	.resize = vhd_resize,
+	.write = vhd_dyn_write,
+};
+
+FORMAT_DEFINE(vhd_dyn_format);
+
+/*
+ * PART 2: Fixed VHD
+ */
+
+static int
+vhd_fix_write(int fd)
+{
+	struct vhd_footer footer;
+	uint64_t imgsz;
+	int error;
+
+	error = image_copyout(fd);
+	if (!error) {
+		imgsz = image_get_size() * secsz;
+		vhd_make_footer(&footer, imgsz, VHD_DISK_TYPE_FIXED, ~0ULL);
+		if (sparse_write(fd, &footer, sizeof(footer)) < 0)
+			error = errno;
+	}
+	return (error);
+}
+
+static struct mkimg_format vhd_fix_format = {
+        .name = "vhdf",
+        .description = "Fixed Virtual Hard Disk",
+        .resize = vhd_resize,
+        .write = vhd_fix_write,
+};
+
+FORMAT_DEFINE(vhd_fix_format);
diff --git a/usr.bin/mkimg/vmdk.c b/usr.bin/mkimg/vmdk.c
index b2770032cf2d..a07d0b80e36a 100644
--- a/usr.bin/mkimg/vmdk.c
+++ b/usr.bin/mkimg/vmdk.c
@@ -28,7 +28,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <sys/apm.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <stdint.h>
@@ -111,12 +110,13 @@ static int
 vmdk_write(int fd)
 {
 	struct vmdk_header hdr;
-	uint32_t *gt, *gd;
+	uint32_t *gt, *gd, *rgd;
 	char *buf, *desc;
 	off_t cur, lim;
 	uint64_t imagesz;
+	lba_t blkofs, blkcnt;
 	size_t gdsz, gtsz;
-	uint32_t sec;
+	uint32_t sec, cursec;
 	int error, desc_len, n, ngrains, ngts;
 
 	imagesz = (image_get_size() * secsz) / VMDK_SECTOR_SIZE;
@@ -143,25 +143,37 @@ vmdk_write(int fd)
 	le32enc(&hdr.ngtes, VMDK_NGTES);
 
 	sec = desc_len / VMDK_SECTOR_SIZE + 1;
-	le64enc(&hdr.rgd_offset, sec);
-	le64enc(&hdr.gd_offset, sec);
 
 	ngrains = imagesz / grainsz;
 	ngts = (ngrains + VMDK_NGTES - 1) / VMDK_NGTES;
 	gdsz = (ngts * sizeof(uint32_t) + VMDK_SECTOR_SIZE - 1) &
 	    ~(VMDK_SECTOR_SIZE - 1);
+
 	gd = calloc(gdsz, 1);
 	if (gd == NULL) {
 		free(desc);
 		return (ENOMEM);
 	}
-
+	le64enc(&hdr.gd_offset, sec);
 	sec += gdsz / VMDK_SECTOR_SIZE;
 	for (n = 0; n < ngts; n++) {
 		le32enc(gd + n, sec);
 		sec += VMDK_NGTES * sizeof(uint32_t) / VMDK_SECTOR_SIZE;
 	}
 
+	rgd = calloc(gdsz, 1);
+	if (rgd == NULL) {
+		free(gd);
+		free(desc);
+		return (ENOMEM);
+	}
+	le64enc(&hdr.rgd_offset, sec);
+	sec += gdsz / VMDK_SECTOR_SIZE;
+	for (n = 0; n < ngts; n++) {
+		le32enc(rgd + n, sec);
+		sec += VMDK_NGTES * sizeof(uint32_t) / VMDK_SECTOR_SIZE;
+	}
+
 	sec = (sec + grainsz - 1) & ~(grainsz - 1);
 
 	if (verbose)
@@ -174,13 +186,21 @@ vmdk_write(int fd)
 	gtsz = ngts * VMDK_NGTES * sizeof(uint32_t);
 	gt = calloc(gtsz, 1);
 	if (gt == NULL) {
+		free(rgd);
 		free(gd);
 		free(desc);
 		return (ENOMEM);
 	}
 
-	for (n = 0; n < ngrains; n++)
-		le32enc(gt + n, sec + n * grainsz);
+	cursec = sec;
+	blkcnt = (grainsz * VMDK_SECTOR_SIZE) / secsz;
+	for (n = 0; n < ngrains; n++) {
+		blkofs = n * blkcnt;
+		if (image_data(blkofs, blkcnt)) {
+			le32enc(gt + n, cursec);
+			cursec += grainsz;
+		}
+	}
 
 	error = 0;
 	if (!error && sparse_write(fd, &hdr, VMDK_SECTOR_SIZE) < 0)
@@ -191,13 +211,18 @@ vmdk_write(int fd)
 		error = errno;
 	if (!error && sparse_write(fd, gt, gtsz) < 0)
 		error = errno;
+	if (!error && sparse_write(fd, rgd, gdsz) < 0)
+		error = errno;
+	if (!error && sparse_write(fd, gt, gtsz) < 0)
+		error = errno;
 	free(gt);
+	free(rgd);
 	free(gd);
 	free(desc);
 	if (error)
 		return (error);
 
-	cur = VMDK_SECTOR_SIZE + desc_len + gdsz + gtsz;
+	cur = VMDK_SECTOR_SIZE + desc_len + (gdsz + gtsz) * 2;
 	lim = sec * VMDK_SECTOR_SIZE;
 	if (cur < lim) {
 		buf = calloc(VMDK_SECTOR_SIZE, 1);
@@ -211,9 +236,19 @@ vmdk_write(int fd)
 		if (buf != NULL)
 			free(buf);
 	}
-	if (!error)
-		error = image_copyout(fd);
-	return (error);
+	if (error)
+		return (error);
+
+	blkcnt = (grainsz * VMDK_SECTOR_SIZE) / secsz;
+	for (n = 0; n < ngrains; n++) {
+		blkofs = n * blkcnt;
+		if (image_data(blkofs, blkcnt)) {
+			error = image_copyout_region(fd, blkofs, blkcnt);
+			if (error)
+				return (error);
+		}
+	}
+	return (image_copyout_done(fd));
 }
 
 static struct mkimg_format vmdk_format = {
diff --git a/usr.bin/mkulzma/mkulzma.8 b/usr.bin/mkulzma/mkulzma.8
index d61519864e3a..b4ac33fe64ba 100644
--- a/usr.bin/mkulzma/mkulzma.8
+++ b/usr.bin/mkulzma/mkulzma.8
@@ -103,5 +103,5 @@ on the mount point provided as the first argument to the script.
 .Xr mdconfig 8 ,
 .Xr mount_cd9660 8
 .Sh AUTHORS
-.An Maxim Sobolev Aq sobomax@FreeBSD.org
-.An Aleksandr Rybalko Aq ray@ddteam.net
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org
+.An Aleksandr Rybalko Aq Mt ray@ddteam.net
diff --git a/usr.bin/mkuzip/mkuzip.8 b/usr.bin/mkuzip/mkuzip.8
index e6aeb4b15528..c0b8315d891b 100644
--- a/usr.bin/mkuzip/mkuzip.8
+++ b/usr.bin/mkuzip/mkuzip.8
@@ -103,4 +103,4 @@ on the mount point provided as the first argument to the script.
 .Xr mdconfig 8 ,
 .Xr mount_cd9660 8
 .Sh AUTHORS
-.An Maxim Sobolev Aq sobomax@FreeBSD.org
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index 21cb15155568..6c5a8d9b803a 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PROG=	msgs
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
+DPADD=	${LIBTERMCAPW}
+LDADD=	-ltermcapw
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile
index b26605fbac21..1422ce1aae14 100644
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@@ -4,8 +4,8 @@
 
 PROG=	ncal
 
-DPADD=	${LIBCALENDAR} ${LIBTERMCAP}
-LDADD=	-lcalendar -ltermcap
+DPADD=	${LIBCALENDAR} ${LIBTERMCAPW}
+LDADD=	-lcalendar -ltermcapw
 
 LINKS=	${BINDIR}/ncal ${BINDIR}/cal
 MLINKS=	ncal.1 cal.1
diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1
index 3d71ec321776..329db6d7687a 100644
--- a/usr.bin/ncal/ncal.1
+++ b/usr.bin/ncal/ncal.1
@@ -189,7 +189,7 @@ command appeared in
 The
 .Nm ncal
 command and manual were written by
-.An Wolfgang Helbig Aq helbig@FreeBSD.org .
+.An Wolfgang Helbig Aq Mt helbig@FreeBSD.org .
 .Sh BUGS
 The assignment of Julian\(enGregorian switching dates to country
 codes is historically naive for many countries.
diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile
index e017f4d044a5..0ee85700f68c 100644
--- a/usr.bin/opiekey/Makefile
+++ b/usr.bin/opiekey/Makefile
@@ -15,9 +15,9 @@ LDADD=	-lopie -lmd
 
 LINKS=	${BINDIR}/opiekey ${BINDIR}/otp-md4
 LINKS+=	${BINDIR}/opiekey ${BINDIR}/otp-md5
-LINKS+=	${BINDIR}/opiekey ${BINDIR}/otp-sha
+LINKS+=	${BINDIR}/opiekey ${BINDIR}/otp-sha1
 
-MLINKS=	opiekey.1 otp-md4.1 opiekey.1 otp-md5.1 opiekey.1 otp-sha.1
+MLINKS=	opiekey.1 otp-md4.1 opiekey.1 otp-md5.1 opiekey.1 otp-sha1.1
 
 .PATH:	${OPIE_DIST}
 
diff --git a/usr.bin/patch/patch.1 b/usr.bin/patch/patch.1
index 587b166eb10e..aac69dee9ce0 100644
--- a/usr.bin/patch/patch.1
+++ b/usr.bin/patch/patch.1
@@ -19,9 +19,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $OpenBSD: patch.1,v 1.26 2010/09/03 11:09:29 jmc Exp $
+.\" $OpenBSD: patch.1,v 1.27 2014/04/15 06:26:54 jmc Exp $
 .\" $FreeBSD$
-.Dd January 29, 2013
+.Dd June 15, 2014
 .Dt PATCH 1
 .Os
 .Sh NAME
@@ -107,7 +107,7 @@ This is equivalent to specifying
 This option is currently the default, unless
 .Fl -posix
 is specified.
-.It Fl C , Fl Fl check
+.It Fl C , Fl Fl check , Fl Fl dry-run
 Checks that the patch would apply cleanly, but does not modify anything.
 .It Fl c , Fl Fl context
 Forces
@@ -639,13 +639,10 @@ The
 .Nm
 utility is compliant with the
 .St -p1003.1-2008
-specification
-(except as detailed above for the
+specification,
+except as detailed above for the
 .Fl -posix
-option),
-though the presence of
-.Nm
-itself is optional.
+option.
 .Pp
 The flags
 .Op Fl BCEFfstVvxz
diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c
index 1743678626c5..85daf7ff3388 100644
--- a/usr.bin/patch/patch.c
+++ b/usr.bin/patch/patch.c
@@ -469,6 +469,7 @@ get_some_switches(void)
 		{"context",		no_argument,		0,	'c'},
 		{"debug",		required_argument,	0,	'x'},
 		{"directory",		required_argument,	0,	'd'},
+		{"dry-run",		no_argument,		0,	'C'},
 		{"ed",			no_argument,		0,	'e'},
 		{"force",		no_argument,		0,	'f'},
 		{"forward",		no_argument,		0,	'N'},
@@ -742,14 +743,18 @@ abort_context_hunk(void)
 static void
 rej_line(int ch, LINENUM i)
 {
-	size_t len;
+	unsigned short len;
 	const char *line = pfetch(i);
 
-	len = strlen(line);
+	len = strnlen(line, USHRT_MAX);
 
 	fprintf(rejfp, "%c%s", ch, line);
-	if (len == 0 || line[len-1] != '\n')
-		fprintf(rejfp, "\n\\ No newline at end of file\n");
+	if (len == 0 || line[len-1] != '\n') {
+		if (len >= USHRT_MAX)
+			fprintf(rejfp, "\n\\ Line too long\n");
+		else
+			fprintf(rejfp, "\n\\ No newline at end of line\n");
+	}
 }
 
 static void
@@ -1016,7 +1021,7 @@ patch_match(LINENUM base, LINENUM offset, LINENUM fuzz)
 	LINENUM		pat_lines = pch_ptrn_lines() - fuzz;
 	const char	*ilineptr;
 	const char	*plineptr;
-	short		plinelen;
+	unsigned short	plinelen;
 
 	for (iline = base + offset + fuzz; pline <= pat_lines; pline++, iline++) {
 		ilineptr = ifetch(iline, offset >= 0);
diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c
index eca12ad06f81..d9c4b3d0c4b6 100644
--- a/usr.bin/patch/pch.c
+++ b/usr.bin/patch/pch.c
@@ -56,7 +56,7 @@ static LINENUM	p_max;		/* max allowed value of p_end */
 static LINENUM	p_context = 3;	/* # of context lines */
 static LINENUM	p_input_line = 0;	/* current line # from patch file */
 static char	**p_line = NULL;/* the text of the hunk */
-static short	*p_len = NULL;	/* length of each line */
+static unsigned short	*p_len = NULL; /* length of each line */
 static char	*p_char = NULL;	/* +, -, and ! */
 static int	hunkmax = INITHUNKMAX;	/* size of above arrays to begin with */
 static int	p_indent;	/* indent to patch */
@@ -132,11 +132,11 @@ void
 set_hunkmax(void)
 {
 	if (p_line == NULL)
-		p_line = calloc((size_t) hunkmax, sizeof(char *));
+		p_line = malloc(hunkmax * sizeof(char *));
 	if (p_len == NULL)
-		p_len = calloc((size_t) hunkmax, sizeof(short));
+		p_len = malloc(hunkmax * sizeof(unsigned short));
 	if (p_char == NULL)
-		p_char = calloc((size_t) hunkmax, sizeof(char));
+		p_char = malloc(hunkmax * sizeof(char));
 }
 
 /*
@@ -145,31 +145,14 @@ set_hunkmax(void)
 static void
 grow_hunkmax(void)
 {
-	int		new_hunkmax;
-	char		**new_p_line;
-	short		*new_p_len;
-	char		*new_p_char;
-
-	new_hunkmax = hunkmax * 2;
+	int new_hunkmax = hunkmax * 2;
 
 	if (p_line == NULL || p_len == NULL || p_char == NULL)
 		fatal("Internal memory allocation error\n");
 
-	new_p_line = realloc(p_line, new_hunkmax * sizeof(char *));
-	if (new_p_line == NULL)
-		free(p_line);
-
-	new_p_len = realloc(p_len, new_hunkmax * sizeof(short));
-	if (new_p_len == NULL)
-		free(p_len);
-
-	new_p_char = realloc(p_char, new_hunkmax * sizeof(char));
-	if (new_p_char == NULL)
-		free(p_char);
-
-	p_char = new_p_char;
-	p_len = new_p_len;
-	p_line = new_p_line;
+	p_line = reallocf(p_line, new_hunkmax * sizeof(char *));
+	p_len = reallocf(p_len, new_hunkmax * sizeof(unsigned short));
+	p_char = reallocf(p_char, new_hunkmax * sizeof(char));
 
 	if (p_line != NULL && p_len != NULL && p_char != NULL) {
 		hunkmax = new_hunkmax;
@@ -1218,7 +1201,7 @@ bool
 pch_swap(void)
 {
 	char	**tp_line;	/* the text of the hunk */
-	short	*tp_len;	/* length of each line */
+	unsigned short	*tp_len;/* length of each line */
 	char	*tp_char;	/* +, -, and ! */
 	LINENUM	i;
 	LINENUM	n;
@@ -1375,7 +1358,7 @@ pch_context(void)
 /*
  * Return the length of a particular patch line.
  */
-short
+unsigned short
 pch_line_len(LINENUM line)
 {
 	return p_len[line];
diff --git a/usr.bin/patch/pch.h b/usr.bin/patch/pch.h
index e60cc8694e9d..da7a08d4008b 100644
--- a/usr.bin/patch/pch.h
+++ b/usr.bin/patch/pch.h
@@ -44,7 +44,7 @@ bool		there_is_another_patch(void);
 bool		another_hunk(void);
 bool		pch_swap(void);
 char		*pfetch(LINENUM);
-short		pch_line_len(LINENUM);
+unsigned short	pch_line_len(LINENUM);
 LINENUM		pch_first(void);
 LINENUM		pch_ptrn_lines(void);
 LINENUM		pch_newfirst(void);
diff --git a/usr.bin/procstat/procstat.1 b/usr.bin/procstat/procstat.1
index eb7a68907d45..f33c746bc736 100644
--- a/usr.bin/procstat/procstat.1
+++ b/usr.bin/procstat/procstat.1
@@ -445,7 +445,7 @@ private resident pages
 reference count
 .It SHD
 shadow page count
-.It FL
+.It FLAG
 mapping flags
 .It TP
 VM object type
diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c
index af4f11f8f6e9..85c51f36da71 100644
--- a/usr.bin/procstat/procstat_files.c
+++ b/usr.bin/procstat/procstat_files.c
@@ -114,7 +114,7 @@ addr_to_string(struct sockaddr_storage *ss, char *buffer, int buflen)
 			snprintf(buffer, buflen, "%s.%d", buffer2,
 			    ntohs(sin6->sin6_port));
 		else
-			strlcpy(buffer, "-", sizeof(buffer));
+			strlcpy(buffer, "-", buflen);
 		break;
 
 	default:
@@ -317,12 +317,12 @@ procstat_files(struct procstat *procstat, struct kinfo_proc *kipp)
 
 	if (!hflag) {
 		if (Cflag)
-			printf("%5s %-16s %4s %1s %-9s %-*s "
+			printf("%5s %-16s %5s %1s %-8s %-*s "
 			    "%-3s %-12s\n", "PID", "COMM", "FD", "T",
 			    "FLAGS", capwidth, "CAPABILITIES", "PRO",
 			    "NAME");
 		else
-			printf("%5s %-16s %4s %1s %1s %-9s "
+			printf("%5s %-16s %5s %1s %1s %-8s "
 			    "%3s %7s %-3s %-12s\n", "PID", "COMM", "FD", "T",
 			    "V", "FLAGS", "REF", "OFFSET", "PRO", "NAME");
 	}
@@ -450,6 +450,7 @@ procstat_files(struct procstat *procstat, struct kinfo_proc *kipp)
 		printf("%s", fst->fs_fflags & PS_FST_FFLAG_NONBLOCK ? "n" : "-");
 		printf("%s", fst->fs_fflags & PS_FST_FFLAG_DIRECT ? "d" : "-");
 		printf("%s", fst->fs_fflags & PS_FST_FFLAG_HASLOCK ? "l" : "-");
+		printf(" ");
 		if (!Cflag) {
 			if (fst->fs_ref_count > -1)
 				printf("%3d ", fst->fs_ref_count);
diff --git a/usr.bin/procstat/procstat_vm.c b/usr.bin/procstat/procstat_vm.c
index 80fe6a1b04cb..e4de4921621e 100644
--- a/usr.bin/procstat/procstat_vm.c
+++ b/usr.bin/procstat/procstat_vm.c
@@ -50,9 +50,9 @@ procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp)
 
 	ptrwidth = 2*sizeof(void *) + 2;
 	if (!hflag)
-		printf("%5s %*s %*s %3s %4s %4s %3s %3s %4s %-2s %-s\n",
+		printf("%5s %*s %*s %3s %4s %4s %3s %3s %-4s %-2s %-s\n",
 		    "PID", ptrwidth, "START", ptrwidth, "END", "PRT", "RES",
-		    "PRES", "REF", "SHD", "FL", "TP", "PATH");
+		    "PRES", "REF", "SHD", "FLAG", "TP", "PATH");
 
 	freep = procstat_getvmmap(procstat, kipp, &cnt);
 	if (freep == NULL)
diff --git a/usr.bin/rctl/rctl.8 b/usr.bin/rctl/rctl.8
index 02bdd0caf936..f7afee99aede 100644
--- a/usr.bin/rctl/rctl.8
+++ b/usr.bin/rctl/rctl.8
@@ -268,7 +268,7 @@ command appeared in
 The
 .Nm
 was developed by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
 under sponsorship from the FreeBSD Foundation.
 .Sh BUGS
 Limiting
diff --git a/usr.bin/revoke/revoke.1 b/usr.bin/revoke/revoke.1
index 6dd6e2f22f4a..2ab52c38fd48 100644
--- a/usr.bin/revoke/revoke.1
+++ b/usr.bin/revoke/revoke.1
@@ -53,4 +53,4 @@ The
 program first appeared in
 .Fx 8.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/usr.bin/sed/defs.h b/usr.bin/sed/defs.h
index d4f434ee84eb..fb336765d639 100644
--- a/usr.bin/sed/defs.h
+++ b/usr.bin/sed/defs.h
@@ -143,6 +143,7 @@ typedef struct {
 	char *space;		/* Current space pointer. */
 	size_t len;		/* Current length. */
 	int deleted;		/* If deleted. */
+	int append_newline;	/* If originally terminated by \n. */
 	char *back;		/* Backing memory. */
 	size_t blen;		/* Backing memory length. */
 } SPACE;
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 2062c680b3b9..76e186f96b8a 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -132,7 +132,7 @@ main(int argc, char *argv[])
 	fflag = 0;
 	inplace = NULL;
 
-	while ((c = getopt(argc, argv, "EI:ae:f:i:lnr")) != -1)
+	while ((c = getopt(argc, argv, "EI:ae:f:i:lnru")) != -1)
 		switch (c) {
 		case 'r':		/* Gnu sed compat */
 		case 'E':
@@ -162,12 +162,16 @@ main(int argc, char *argv[])
 			ispan = 0;	/* don't span across input files */
 			break;
 		case 'l':
-			if(setlinebuf(stdout) != 0)
-				warnx("setlinebuf() failed");
+			if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)
+				warnx("setting line buffered output failed");
 			break;
 		case 'n':
 			nflag = 1;
 			break;
+		case 'u':
+			if(setvbuf(stdout, NULL, _IONBF, 0) != 0)
+				warnx("setting unbuffered output failed");
+			break;
 		default:
 		case '?':
 			usage();
@@ -199,9 +203,10 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "%s\n%s\n",
-		"usage: sed script [-Ealn] [-i extension] [file ...]",
-		"       sed [-Ealn] [-i extension] [-e script] ... [-f script_file] ... [file ...]");
+	(void)fprintf(stderr,
+	    "usage: %s script [-Ealnru] [-i extension] [file ...]\n"
+	    "\t%s [-Ealnu] [-i extension] [-e script] ... [-f script_file]"
+	    " ... [file ...]\n", getprogname(), getprogname());
 	exit(1);
 }
 
@@ -434,8 +439,14 @@ mf_fgets(SPACE *sp, enum e_spflag spflag)
 	len = getline(&p, &plen, infile);
 	if (len == -1)
 		err(1, "%s", fname);
-	if (len != 0 && p[len - 1] == '\n')
+	if (len != 0 && p[len - 1] == '\n') {
+		sp->append_newline = 1;
 		len--;
+	} else if (!lastline()) {
+		sp->append_newline = 1;
+	} else {
+		sp->append_newline = 0;
+	}
 	cspace(sp, p, len, spflag);
 
 	linenum++;
@@ -476,15 +487,49 @@ add_file(char *s)
 	fl_nextp = &fp->next;
 }
 
+static int
+next_files_have_lines()
+{
+	struct s_flist *file;
+	FILE *file_fd;
+	int ch;
+
+	file = files;
+	while ((file = file->next) != NULL) {
+		if ((file_fd = fopen(file->fname, "r")) == NULL)
+			continue;
+
+		if ((ch = getc(file_fd)) != EOF) {
+			/*
+			 * This next file has content, therefore current
+			 * file doesn't contains the last line.
+			 */
+			ungetc(ch, file_fd);
+			fclose(file_fd);
+			return (1);
+		}
+
+		fclose(file_fd);
+	}
+
+	return (0);
+}
+
 int
 lastline(void)
 {
 	int ch;
 
-	if (files->next != NULL && (inplace == NULL || ispan))
-		return (0);
-	if ((ch = getc(infile)) == EOF)
-		return (1);
+	if (feof(infile)) {
+		return !(
+		    (inplace == NULL || ispan) &&
+		    next_files_have_lines());
+	}
+	if ((ch = getc(infile)) == EOF) {
+		return !(
+		    (inplace == NULL || ispan) &&
+		    next_files_have_lines());
+	}
 	ungetc(ch, infile);
 	return (0);
 }
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index 5e2618ae98fd..9cd2c2e87b24 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -63,6 +63,7 @@ static SPACE HS, PS, SS, YS;
 #define	pd		PS.deleted
 #define	ps		PS.space
 #define	psl		PS.len
+#define	psanl		PS.append_newline
 #define	hs		HS.space
 #define	hsl		HS.len
 
@@ -85,7 +86,10 @@ static regex_t *defpreg;
 size_t maxnsub;
 regmatch_t *match;
 
-#define OUT() do {fwrite(ps, 1, psl, outfile); fputc('\n', outfile);} while (0)
+#define OUT() do {							\
+	fwrite(ps, 1, psl, outfile);					\
+	if (psanl) fputc('\n', outfile);				\
+} while (0)
 
 void
 process(void)
@@ -94,6 +98,7 @@ process(void)
 	SPACE tspace;
 	size_t oldpsl = 0;
 	char *p;
+	int oldpsanl;
 
 	p = NULL;
 
@@ -190,11 +195,15 @@ process(void)
 					break;
 				if ((p = memchr(ps, '\n', psl)) != NULL) {
 					oldpsl = psl;
+					oldpsanl = psanl;
 					psl = p - ps;
+					psanl = 1;
 				}
 				OUT();
-				if (p != NULL)
+				if (p != NULL) {
 					psl = oldpsl;
+					psanl = oldpsanl;
+				}
 				break;
 			case 'q':
 				if (!nflag && !pd)
@@ -244,6 +253,7 @@ process(void)
 					cspace(&HS, "", 0, REPLACE);
 				tspace = PS;
 				PS = HS;
+				psanl = tspace.append_newline;
 				HS = tspace;
 				break;
 			case 'y':
@@ -288,24 +298,32 @@ applies(struct s_command *cp)
 		r = 1;
 	else if (cp->a2)
 		if (cp->startline > 0) {
-			if (MATCH(cp->a2)) {
-				cp->startline = 0;
-				lastaddr = 1;
-				r = 1;
-			} else if (linenum - cp->startline <= cp->a2->u.l)
-				r = 1;
-			else if ((cp->a2->type == AT_LINE &&
-				   linenum > cp->a2->u.l) ||
-				   (cp->a2->type == AT_RELLINE &&
-				   linenum - cp->startline > cp->a2->u.l)) {
-				/*
-				 * We missed the 2nd address due to a branch,
-				 * so just close the range and return false.
-				 */
-				cp->startline = 0;
-				r = 0;
-			} else
-				r = 1;
+                        switch (cp->a2->type) {
+                        case AT_RELLINE:
+                                if (linenum - cp->startline <= cp->a2->u.l)
+                                        r = 1;
+                                else {
+				        cp->startline = 0;
+				        r = 0;
+                                }
+                                break;
+                        default:
+                                if (MATCH(cp->a2)) {
+                                        cp->startline = 0;
+                                        lastaddr = 1;
+                                        r = 1;
+                                } else if (cp->a2->type == AT_LINE &&
+                                            linenum > cp->a2->u.l) {
+                                        /*
+                                         * We missed the 2nd address due to a
+                                         * branch, so just close the range and
+                                         * return false.
+                                         */
+                                        cp->startline = 0;
+                                        r = 0;
+                                } else
+                                        r = 1;
+                        }
 		} else if (MATCH(cp->a1)) {
 			/*
 			 * If the second address is a number less than or
@@ -444,6 +462,7 @@ substitute(struct s_command *cp)
 	 */
 	tspace = PS;
 	PS = SS;
+	psanl = tspace.append_newline;
 	SS = tspace;
 	SS.space = SS.back;
 
@@ -513,6 +532,7 @@ do_tr(struct s_tr *y)
 		/* Swap the translation space and the pattern space. */
 		tmp = PS;
 		PS = YS;
+		psanl = tmp.append_newline;
 		YS = tmp;
 		YS.space = YS.back;
 	}
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index cf2749601297..955c2776108a 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 December 9, 2013
+.Dd June 20, 2014
 .Dt SED 1
 .Os
 .Sh NAME
@@ -39,7 +39,7 @@
 .Nd stream editor
 .Sh SYNOPSIS
 .Nm
-.Op Fl Ealnr
+.Op Fl Ealnru
 .Ar command
 .Op Ar
 .Nm
@@ -148,6 +148,8 @@ option suppresses this behavior.
 Same as
 .Fl E
 for compatibility with GNU sed.
+.It Fl u
+Make output unbuffered.
 .El
 .Pp
 The form of a
@@ -618,7 +620,7 @@ command, written by
 appeared in
 .At v7 .
 .Sh AUTHORS
-.An "Diomidis D. Spinellis" Aq dds@FreeBSD.org
+.An Diomidis D. Spinellis Aq Mt dds@FreeBSD.org
 .Sh BUGS
 Multibyte characters containing a byte with value 0x5C
 .Tn ( ASCII
diff --git a/usr.bin/sed/tests/regress.y.out b/usr.bin/sed/tests/regress.y.out
index 829a68180276..22f4f051cef1 100644
--- a/usr.bin/sed/tests/regress.y.out
+++ b/usr.bin/sed/tests/regress.y.out
@@ -1 +1 @@
-fOO
+fOO
\ No newline at end of file
diff --git a/sbin/mca/Makefile b/usr.bin/send-pr/Makefile
similarity index 63%
rename from sbin/mca/Makefile
rename to usr.bin/send-pr/Makefile
index 261672578a73..2b422bf315a8 100644
--- a/sbin/mca/Makefile
+++ b/usr.bin/send-pr/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
-PROG=	mca
-MAN=	mca.8
+
+SCRIPTS= send-pr.sh
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/send-pr/send-pr.sh b/usr.bin/send-pr/send-pr.sh
new file mode 100755
index 000000000000..ab59040dd6ef
--- /dev/null
+++ b/usr.bin/send-pr/send-pr.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+echo
+echo "FreeBSD has migrated away from GNATS for tracking bugs, and so send-pr"
+echo "is no longer used for submitting bug reports."
+echo "Please see https://www.freebsd.org/support.html for more information."
+echo
+exit 1
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index fe9f760a09a6..f49df8437f6a 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -40,7 +40,8 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl a | d
-.Op Fl e3
+.Op Fl e
+.Op Fl 3
 .Op Ar host
 .Sh DESCRIPTION
 The
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index 8f744ed135a9..b27a7841b56a 100644
--- a/usr.bin/sockstat/sockstat.1
+++ b/usr.bin/sockstat/sockstat.1
@@ -160,4 +160,4 @@ command appeared in
 The
 .Nm
 command and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/usr.bin/sort/sort.1.in b/usr.bin/sort/sort.1.in
index 11330fb414ec..1a836a893553 100644
--- a/usr.bin/sort/sort.1.in
+++ b/usr.bin/sort/sort.1.in
@@ -581,7 +581,7 @@ An error occurred.
 .Sh SEE ALSO
 .Xr comm 1 ,
 .Xr join 1 ,
-.Xr uniq 1 .
+.Xr uniq 1
 .Sh STANDARDS
 The
 .Nm
diff --git a/usr.bin/ssh-copy-id/ssh-copy-id.1 b/usr.bin/ssh-copy-id/ssh-copy-id.1
index b22c323d9e11..5974d03ec98a 100644
--- a/usr.bin/ssh-copy-id/ssh-copy-id.1
+++ b/usr.bin/ssh-copy-id/ssh-copy-id.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd Feburary 28, 2014
+.Dd February 28, 2014
 .Dt SSH-COPY-ID 1
 .Os
 .Sh NAME
@@ -85,6 +85,6 @@ To send a specific key to multiple hosts:
 The
 .Nm
 utility was written by
-.An Eitan Adler Aq eadler@FreeBSD.org
+.An Eitan Adler Aq Mt eadler@FreeBSD.org
 as a drop-in replacement for an existing utility included with
 OpenSSH.
diff --git a/usr.bin/stat/stat.1 b/usr.bin/stat/stat.1
index 0d6f3a2cba32..96e172415e33 100644
--- a/usr.bin/stat/stat.1
+++ b/usr.bin/stat/stat.1
@@ -601,8 +601,6 @@ and
 The
 .Nm
 utility was written by
-.An Andrew Brown
-.Aq atatat@NetBSD.org .
+.An Andrew Brown Aq Mt atatat@NetBSD.org .
 This man page was written by
-.An Jan Schaumann
-.Aq jschauma@NetBSD.org .
+.An Jan Schaumann Aq Mt jschauma@NetBSD.org .
diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile
index bb823c718c9b..d6944f1f23f7 100644
--- a/usr.bin/svn/svn/Makefile
+++ b/usr.bin/svn/svn/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-MAN=
-
 .include "${.CURDIR}/../Makefile.inc"
 
 .PATH:	${SVNDIR}/svn
@@ -64,4 +62,8 @@ freebsd-organization.h:
 	    > freebsd-organization.h
 .endif
 
+svnlite.1: svn.1
+	# Avoid the website
+	sed -E 's,(^| |B|`)svn,\1svnlite,g' ${SVNDIR}/svn/svn.1 > ${.OBJDIR}/svnlite.1
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h
index 9e0ac1542f06..3583d6e79555 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.9"
+#define PACKAGE_STRING "subversion 1.8.10"
 
 /* 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.9"
+#define PACKAGE_VERSION "1.8.10"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 5fc3257c59b5..6b7bcb9bc978 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -119,7 +119,7 @@ of the list. For example:
 .Pp
 .Dl Nm Fl ifstat Fl match Ar bge0,em1 Fl pps
 .Pp
-This will display statistics of packets per second for network interfaces 
+This will display statistics of packets per second for network interfaces
 named as bge0 and em1.
 .Pp
 .Dl Nm Fl iostat Fl numeric Fl - Ar 2.1
diff --git a/usr.bin/tabs/Makefile b/usr.bin/tabs/Makefile
index 4b5d40e0d302..2c5f729905a1 100644
--- a/usr.bin/tabs/Makefile
+++ b/usr.bin/tabs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	tabs
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
+DPADD=	${LIBTERMCAPW}
+LDADD=	-ltermcapw
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index 295223742823..a683f0a46650 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -23,8 +23,8 @@ WARNS?=		2
 
 LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
 
-DPADD=		${LIBTERMCAP} ${LIBTELNET}
-LDADD=		-ltermcap ${LIBTELNET}
+DPADD=		${LIBTERMCAPW} ${LIBTELNET}
+LDADD=		-ltermcapw ${LIBTELNET}
 
 .if !defined(RELEASE_CRUNCH)
 CFLAGS+=	-DIPSEC
diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile
index 7521e4e41a1b..88f8c373ac38 100644
--- a/usr.bin/tftp/Makefile
+++ b/usr.bin/tftp/Makefile
@@ -7,7 +7,7 @@ PROG=	tftp
 SRCS=	main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c
 SRCS+=	tftp-utils.c tftp.c
 CFLAGS+=-I${.CURDIR}/../../libexec/tftpd
-DPADD=	${LIBEDIT} ${LIBTERMCAP}
-LDADD=	-ledit -ltermcap
+DPADD=	${LIBEDIT} ${LIBTERMCAPW}
+LDADD=	-ledit -ltermcapw
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/timeout/Makefile b/usr.bin/timeout/Makefile
new file mode 100644
index 000000000000..46ca6e36e8a9
--- /dev/null
+++ b/usr.bin/timeout/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+PROG=	timeout
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/timeout/timeout.1 b/usr.bin/timeout/timeout.1
new file mode 100644
index 000000000000..028fc622380f
--- /dev/null
+++ b/usr.bin/timeout/timeout.1
@@ -0,0 +1,114 @@
+.\" Copyright (c) 2014 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 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 19, 2014
+.Dt TIMEOUT 1
+.Os
+.Sh NAME
+.Nm timeout
+.Nd run a command with a time limit
+.Sh SYNOPSIS
+.Nm
+.Op Fl -signal Ar sig | Fl s Ar sig
+.Op Fl -preserve-status
+.Op Fl -kill-after Ar time | Fl k Ar time
+.Op Fl -foreground
+.Ao Ar duration Ac
+.Ao Ar command Ac
+.Ao Ar args ... Ac
+.Sh DESCRIPTION
+.Nm
+starts the
+.Ar command
+with its
+.Ar args.
+If
+.Ar command
+is still running after
+.Ar duration ,
+it is killed.
+By default,
+.Ar SIGTERM.
+is sent.
+.Bl -tag -width "-k time, --kill-after time"
+.It Fl -preserve-status
+Always exits with the same status as
+.Ar command
+even if it times out.
+.It Fl -foreground
+Do not propagate timeout to the
+.Ar command
+children.
+.It Fl s Ar sig , Fl -signal Ar sig
+Specify the signal to send on timeout.
+By default,
+.Ar SIGTERM .
+is sent.
+.It Fl k Ar time , Fl -kill-after Ar time
+Send a second kill signal if
+.Ar command
+is still running after
+.Ar time
+after the first signal was sent.
+.El
+.Sh DURATION FORMAT
+.Ar duration
+and
+.Ar time
+can be integer or decimal numbers.
+Values without unit symbols are interpreted as seconds.
+.Pp
+Supported unit symbols are:
+.Bl -tag -width indent -compact
+.It s
+seconds
+.It m
+minutes
+.It h
+hours
+.It d
+days
+.El
+.Sh EXIT STATUS
+If the timeout was not reached, the exit status of
+.Ar command
+is returned.
+.Pp
+If the timeout was reached and
+.Fl -preserve-status
+is set, the exit status of
+.Ar command
+is returned.
+If
+.Fl -preserve-status
+is not set, an exit status of 124 is returned.
+.Pp
+If
+.Ar command
+exits after receiving a signal, the exit status returned is the signal number plus 128.
+.Sh SEE ALSO
+.Xr kill 1 ,
+.Xr signal 3
diff --git a/usr.bin/timeout/timeout.c b/usr.bin/timeout/timeout.c
new file mode 100644
index 000000000000..817160003e36
--- /dev/null
+++ b/usr.bin/timeout/timeout.c
@@ -0,0 +1,333 @@
+/*-
+ * Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org>
+ * Copyright (c) 2014 Vsevolod Stakhov <vsevolod@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
+ *    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(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/time.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <getopt.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sysexits.h>
+#include <unistd.h>
+
+#define EXIT_TIMEOUT 124
+
+static sig_atomic_t sig_chld = 0;
+static sig_atomic_t sig_term = 0;
+static sig_atomic_t sig_alrm = 0;
+static sig_atomic_t sig_ign = 0;
+
+static void
+usage(void)
+{
+
+	fprintf(stderr, "Usage: %s [--signal sig | -s sig] [--preserve-status]"
+	    " [--kill-after time | -k time] [--foreground] <duration> <command>"
+	    " <arg ...>\n", getprogname());
+
+	exit(EX_USAGE);
+}
+
+static double
+parse_duration(const char *duration)
+{
+	double ret;
+	char *end;
+
+	ret = strtod(duration, &end);
+	if (ret == 0 && end == duration)
+		errx(EXIT_FAILURE, "invalid duration");
+
+	if (end == NULL || *end == '\0')
+		return (ret);
+
+	if (end != NULL && *(end + 1) != '\0')
+		errx(EX_USAGE, "invalid duration");
+
+	switch (*end) {
+	case 's':
+		break;
+	case 'm':
+		ret *= 60;
+		break;
+	case 'h':
+		ret *= 60 * 60;
+		break;
+	case 'd':
+		ret *= 60 * 60 * 24;
+		break;
+	default:
+		errx(EX_USAGE, "invalid duration");
+	}
+
+	if (ret < 0 || ret >= 100000000UL)
+		errx(EX_USAGE, "invalid duration");
+
+	return (ret);
+}
+
+static int
+parse_signal(const char *str)
+{
+	int sig, i;
+	const char *errstr;
+
+	sig = strtonum(str, 0, sys_nsig, &errstr);
+
+	if (errstr == NULL)
+		return (sig);
+	if (strncasecmp(str, "SIG", 3) == 0)
+		str += 3;
+
+	for (i = 1; i < sys_nsig; i++) {
+		if (strcasecmp(str, sys_signame[i]) == 0)
+			return (i);
+	}
+
+	errx(EX_USAGE, "invalid signal");
+}
+
+static void
+sig_handler(int signo)
+{
+	if (sig_ign != 0 && signo == sig_ign) {
+		sig_ign = 0;
+		return;
+	}
+
+	switch(signo) {
+	case 0:
+	case SIGINT:
+	case SIGHUP:
+	case SIGQUIT:
+	case SIGTERM:
+		sig_term = signo;
+		break;
+	case SIGCHLD:
+		sig_chld = 1;
+		break;
+	case SIGALRM:
+		sig_alrm = 1;
+		break;
+	}
+}
+
+static void
+set_interval(double iv)
+{
+	struct itimerval tim;
+
+	memset(&tim, 0, sizeof(tim));
+	tim.it_value.tv_sec = (time_t)iv;
+	iv -= (time_t)iv;
+	tim.it_value.tv_usec = (suseconds_t)(iv * 1000000UL);
+
+	if (setitimer(ITIMER_REAL, &tim, NULL) == -1)
+		err(EX_OSERR, "setitimer()");
+}
+
+int
+main(int argc, char **argv)
+{
+	int ch;
+	unsigned long i;
+	int foreground, preserve;
+	int error, pstat, status;
+	int killsig = SIGTERM;
+	pid_t pgid, pid, cpid;
+	double first_kill;
+	double second_kill;
+	bool timedout = false;
+	bool do_second_kill = false;
+	struct sigaction signals;
+	int signums[] = {
+		-1,
+		SIGTERM,
+		SIGINT,
+		SIGHUP,
+		SIGCHLD,
+		SIGALRM,
+		SIGQUIT,
+	};
+
+	foreground = preserve = 0;
+	second_kill = 0;
+	cpid = -1;
+	pgid = -1;
+
+	const struct option longopts[] = {
+		{ "preserve-status", no_argument,       &preserve,    1 },
+		{ "foreground",      no_argument,       &foreground,  1 },
+		{ "kill-after",      required_argument, NULL,        'k'},
+		{ "signal",          required_argument, NULL,        's'},
+		{ "help",            no_argument,       NULL,        'h'},
+		{ NULL,              0,                 NULL,         0 }
+	};
+
+	while ((ch = getopt_long(argc, argv, "+k:s:h", longopts, NULL)) != -1) {
+		switch (ch) {
+			case 'k':
+				do_second_kill = true;
+				second_kill = parse_duration(optarg);
+				break;
+			case 's':
+				killsig = parse_signal(optarg);
+				break;
+			case 0:
+				break;
+			case 'h':
+			default:
+				usage();
+				break;
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+
+	if (argc < 2)
+		usage();
+
+	first_kill = parse_duration(argv[0]);
+	argc--;
+	argv++;
+
+	if (!foreground) {
+		pgid = setpgid(0,0);
+
+		if (pgid == -1)
+			err(EX_OSERR, "setpgid()");
+	}
+
+	memset(&signals, 0, sizeof(signals));
+	sigemptyset(&signals.sa_mask);
+
+	if (killsig != SIGKILL && killsig != SIGSTOP)
+		signums[0] = killsig;
+
+	for (i = 0; i < sizeof(signums) / sizeof(signums[0]); i ++)
+		sigaddset(&signals.sa_mask, signums[i]);
+
+	signals.sa_handler = sig_handler;
+	signals.sa_flags = SA_RESTART;
+
+	for (i = 0; i < sizeof(signums) / sizeof(signums[0]); i ++)
+		if (signums[i] != -1 && signums[i] != 0 &&
+		    sigaction(signums[i], &signals, NULL) == -1)
+			err(EX_OSERR, "sigaction()");
+
+	signal(SIGTTIN, SIG_IGN);
+	signal(SIGTTOU, SIG_IGN);
+
+	pid = fork();
+	if (pid == -1)
+		err(EX_OSERR, "fork()");
+	else if (pid == 0) {
+		/* child process */
+		signal(SIGTTIN, SIG_DFL);
+		signal(SIGTTOU, SIG_DFL);
+
+		error = execvp(argv[0], argv);
+		if (error == -1)
+			err(EX_UNAVAILABLE, "exec()");
+	}
+
+	if (sigprocmask(SIG_BLOCK, &signals.sa_mask, NULL) == -1)
+		err(EX_OSERR, "sigprocmask()");
+
+	/* parent continues here */
+	set_interval(first_kill);
+
+	for (;;) {
+		sigemptyset(&signals.sa_mask);
+		sigsuspend(&signals.sa_mask);
+
+		if (sig_chld) {
+			sig_chld = 0;
+			while (((cpid = wait(&status)) < 0) && errno == EINTR)
+				continue;
+
+			if (cpid == pid) {
+				pstat = status;
+				break;
+			}
+		} else if (sig_alrm) {
+			sig_alrm = 0;
+
+			timedout = true;
+			if (!foreground)
+				killpg(pgid, killsig);
+			else
+				kill(pid, killsig);
+
+			if (do_second_kill) {
+				set_interval(second_kill);
+				second_kill = 0;
+				sig_ign = killsig;
+				killsig = SIGKILL;
+			} else
+				break;
+
+		} else if (sig_term) {
+			if (!foreground)
+				killpg(pgid, killsig);
+			else
+				kill(pid, sig_term);
+
+			if (do_second_kill) {
+				set_interval(second_kill);
+				second_kill = 0;
+				sig_ign = killsig;
+				killsig = SIGKILL;
+			} else
+				break;
+		}
+	}
+
+	while (cpid != pid  && wait(&pstat) == -1) {
+		if (errno != EINTR)
+			err(EX_OSERR, "waitpid()");
+	}
+
+	if (WEXITSTATUS(pstat))
+		pstat = WEXITSTATUS(pstat);
+	else if(WIFSIGNALED(pstat))
+		pstat = 128 + WTERMSIG(pstat);
+
+	if (timedout && !preserve)
+		pstat = EXIT_TIMEOUT;
+
+	return (pstat);
+}
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index 92f6c241c1bf..de57b94a8965 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -850,6 +850,8 @@ get_process_info(struct system_info *si, struct process_select *sel,
 			continue;
 
 		PCTCPU(pp) = proc_calc_pctcpu(pp);
+		if (sel->thread && PCTCPU(pp) > 1.0)
+			PCTCPU(pp) = 1.0;
 		if (displaymode == DISP_CPU && !show_idle &&
 		    (!proc_used_cpu(pp) ||
 		     pp->ki_stat == SSTOP || pp->ki_stat == SIDL))
diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile
index 143dc651e135..c42ef7925190 100644
--- a/usr.bin/tput/Makefile
+++ b/usr.bin/tput/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PROG=	tput
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
+DPADD=	${LIBTERMCAPW}
+LDADD=	-ltermcapw
 SCRIPTS=clear.sh
 MLINKS=	tput.1 clear.1
 
diff --git a/usr.bin/truncate/truncate.1 b/usr.bin/truncate/truncate.1
index 827097ce6c6f..117fe700a432 100644
--- a/usr.bin/truncate/truncate.1
+++ b/usr.bin/truncate/truncate.1
@@ -149,5 +149,4 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Sheldon Hearn
-.Aq sheldonh@starjuice.net .
+.An Sheldon Hearn Aq Mt sheldonh@starjuice.net .
diff --git a/usr.bin/truss/extern.h b/usr.bin/truss/extern.h
index c60c6c79500e..820f4f0b8e16 100644
--- a/usr.bin/truss/extern.h
+++ b/usr.bin/truss/extern.h
@@ -55,10 +55,6 @@ extern long i386_syscall_exit(struct trussinfo *, int);
 extern void i386_linux_syscall_entry(struct trussinfo *, int);
 extern long i386_linux_syscall_exit(struct trussinfo *, int);
 #endif
-#ifdef __ia64__
-extern void ia64_syscall_entry(struct trussinfo *, int);
-extern long ia64_syscall_exit(struct trussinfo *, int);
-#endif
 #ifdef __powerpc__
 extern void powerpc_syscall_entry(struct trussinfo *, int);
 extern long powerpc_syscall_exit(struct trussinfo *, int);
diff --git a/usr.bin/truss/ia64-fbsd.c b/usr.bin/truss/ia64-fbsd.c
deleted file mode 100644
index 2218fe51fb6e..000000000000
--- a/usr.bin/truss/ia64-fbsd.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright 1997 Sean Eric Fagan
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Sean Eric Fagan
- * 4. Neither 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 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 lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-/*
- * FreeBSD/ia64-specific system call handling.  This is probably the most
- * complex part of the entire truss program, although I've got lots of
- * it handled relatively cleanly now.  The system call names are generated
- * automatically, thanks to /usr/src/sys/kern/syscalls.master.  The
- * names used for the various structures are confusing, I sadly admit.
- */
-
-#include <sys/types.h>
-#include <sys/ptrace.h>
-#include <sys/syscall.h>
-
-#include <machine/reg.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "truss.h"
-#include "syscall.h"
-#include "extern.h"
-
-#include "syscalls.h"
-
-static int nsyscalls = sizeof(syscallnames) / sizeof(syscallnames[0]);
-
-/*
- * This is what this particular file uses to keep track of a system call.
- * It is probably not quite sufficient -- I can probably use the same
- * structure for the various syscall personalities, and I also probably
- * need to nest system calls (for signal handlers).
- *
- * 'struct syscall' describes the system call; it may be NULL, however,
- * if we don't know about this particular system call yet.
- */
-struct freebsd_syscall {
-	struct syscall *sc;
-	const char *name;
-	int number;
-	unsigned long *args;
-	int nargs;	/* number of arguments -- *not* number of words! */
-	char **s_args;	/* the printable arguments */
-};
-
-static struct freebsd_syscall *
-alloc_fsc(void)
-{
-
-	return (malloc(sizeof(struct freebsd_syscall)));
-}
-
-/* Clear up and free parts of the fsc structure. */
-static void
-free_fsc(struct freebsd_syscall *fsc)
-{
-	int i;
-
-	free(fsc->args);
-	if (fsc->s_args) {
-		for (i = 0; i < fsc->nargs; i++)
-			free(fsc->s_args[i]);
-		free(fsc->s_args);
-	}
-	free(fsc);
-}
-
-/*
- * Called when a process has entered a system call.  nargs is the
- * number of words, not number of arguments (a necessary distinction
- * in some cases).  Note that if the STOPEVENT() code in ia64/ia64/trap.c
- * is ever changed these functions need to keep up.
- */
-
-void
-ia64_syscall_entry(struct trussinfo *trussinfo, int nargs)
-{
-	struct reg regs;
-	struct freebsd_syscall *fsc;
-	struct syscall *sc;
-	unsigned long *parm_offset;
-	lwpid_t tid;
-	int i, syscall_num;
-
-	tid = trussinfo->curthread->tid;
-
-	if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
-		fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
-		return;
-	}
-	parm_offset = &regs.r_scratch.gr16;
-
-	/*
-	 * FreeBSD has two special kinds of system call redirctions --
-	 * SYS_syscall, and SYS___syscall.  The former is the old syscall()
-	 * routine, basically; the latter is for quad-aligned arguments.
-	 */
-	syscall_num = regs.r_scratch.gr15;	/* XXX double-check. */
-	if (syscall_num == SYS_syscall || syscall_num == SYS___syscall)
-		syscall_num = (int)*parm_offset++;
-
-	fsc = alloc_fsc();
-	if (fsc == NULL)
-		return;
-	fsc->number = syscall_num;
-	fsc->name = (syscall_num < 0 || syscall_num >= nsyscalls) ?
-	    NULL : syscallnames[syscall_num];
-	if (!fsc->name) {
-		fprintf(trussinfo->outfile, "-- UNKNOWN SYSCALL %d --\n",
-		    syscall_num);
-	}
-
-	if (fsc->name && (trussinfo->flags & FOLLOWFORKS) &&
-	    (strcmp(fsc->name, "fork") == 0 ||
-	    strcmp(fsc->name, "rfork") == 0 ||
-	    strcmp(fsc->name, "vfork") == 0))
-		trussinfo->curthread->in_fork = 1;
-
-	if (nargs == 0)
-		return;
-
-	fsc->args = malloc((1 + nargs) * sizeof(unsigned long));
-	memcpy(fsc->args, parm_offset, nargs * sizeof(long));
-
-	sc = get_syscall(fsc->name);
-	if (sc)
-		fsc->nargs = sc->nargs;
-	else {
-#if DEBUG
-		fprintf(trussinfo->outfile, "unknown syscall %s -- setting "
-		    "args to %d\n", fsc->name, nargs);
-#endif
-		fsc->nargs = nargs;
-	}
-
-	fsc->s_args = calloc(1, (1 + fsc->nargs) * sizeof(char *));
-	fsc->sc = sc;
-
-	/*
-	 * At this point, we set up the system call arguments.
-	 * We ignore any OUT ones, however -- those are arguments that
-	 * are set by the system call, and so are probably meaningless
-	 * now.	This doesn't currently support arguments that are
-	 * passed in *and* out, however.
-	 */
-
-	if (fsc->name) {
-#if DEBUG
-		fprintf(stderr, "syscall %s(", fsc->name);
-#endif
-		for (i = 0; i < fsc->nargs; i++) {
-#if DEBUG
-			fprintf(stderr, "0x%x%s", sc ?
-			    fsc->args[sc->args[i].offset] : fsc->args[i],
-			    i < (fsc->nargs - 1) ? "," : "");
-#endif
-			if (sc && !(sc->args[i].type & OUT)) {
-				fsc->s_args[i] = print_arg(&sc->args[i],
-				    fsc->args, 0, trussinfo);
-			}
-		}
-#if DEBUG
-		fprintf(stderr, ")\n");
-#endif
-	}
-
-#if DEBUG
-	fprintf(trussinfo->outfile, "\n");
-#endif
-
-	if (fsc->name != NULL && (strcmp(fsc->name, "execve") == 0 ||
-	    strcmp(fsc->name, "exit") == 0)) {
-		/*
-		 * XXX
-		 * This could be done in a more general
-		 * manner but it still wouldn't be very pretty.
-		 */
-		if (strcmp(fsc->name, "execve") == 0) {
-			if ((trussinfo->flags & EXECVEARGS) == 0) {
-				if (fsc->s_args[1]) {
-					free(fsc->s_args[1]);
-					fsc->s_args[1] = NULL;
-				}
-			}
-			if ((trussinfo->flags & EXECVEENVS) == 0) {
-				if (fsc->s_args[2]) {
-					free(fsc->s_args[2]);
-					fsc->s_args[2] = NULL;
-				}
-			}
-		}
-	}
-	trussinfo->curthread->fsc = fsc;
-}
-
-/*
- * And when the system call is done, we handle it here.
- * Currently, no attempt is made to ensure that the system calls
- * match -- this needs to be fixed (and is, in fact, why S_SCX includes
- * the system call number instead of, say, an error status).
- */
-
-long
-ia64_syscall_exit(struct trussinfo *trussinfo, int syscall_num __unused)
-{
-	struct reg regs;
-	struct freebsd_syscall *fsc;
-	struct syscall *sc;
-	lwpid_t tid;
-	long retval;
-	int errorp, i;
-
-	if (trussinfo->curthread->fsc == NULL)
-		return (-1);
-
-	tid = trussinfo->curthread->tid;
-
-	if (ptrace(PT_GETREGS, tid, (caddr_t)&regs, 0) < 0) {
-		fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
-		return (-1);
-	}
-
-	retval = regs.r_scratch.gr8;
-	errorp = (regs.r_scratch.gr10 != 0) ? 1 : 0;
-
-	/*
-	 * This code, while simpler than the initial versions I used, could
-	 * stand some significant cleaning.
-	 */
-
-	fsc = trussinfo->curthread->fsc;
-	sc = fsc->sc;
-	if (!sc) {
-		for (i = 0; i < fsc->nargs; i++)
-			asprintf(&fsc->s_args[i], "0x%lx", fsc->args[i]);
-	} else {
-		/*
-		 * Here, we only look for arguments that have OUT masked in --
-		 * otherwise, they were handled in the syscall_entry function.
-		 */
-		for (i = 0; i < sc->nargs; i++) {
-			char *temp;
-			if (sc->args[i].type & OUT) {
-				/*
-				 * If an error occurred, then don't bother
-				 * getting the data; it may not be valid.
-				 */
-				if (errorp) {
-					asprintf(&temp, "0x%lx",
-					    fsc->args[sc->args[i].offset]);
-				} else {
-					temp = print_arg(&sc->args[i],
-					    fsc->args, retval, trussinfo);
-				}
-				fsc->s_args[i] = temp;
-			}
-		}
-	}
-
-	if (fsc->name != NULL && (strcmp(fsc->name, "execve") == 0 ||
-	    strcmp(fsc->name, "exit") == 0))
-		trussinfo->curthread->in_syscall = 1;
-
-	/*
-	 * It would probably be a good idea to merge the error handling,
-	 * but that complicates things considerably.
-	 */
-
-	print_syscall_ret(trussinfo, fsc->name, fsc->nargs, fsc->s_args, errorp,
-	    retval, fsc->sc);
-	free_fsc(fsc);
-
-	return (retval);
-}
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index ecaa0dbad2d5..7792caf0f9d7 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -93,9 +93,6 @@ static struct ex_types {
 	{ "FreeBSD ELF32", i386_syscall_entry, i386_syscall_exit },
 	{ "Linux ELF", i386_linux_syscall_entry, i386_linux_syscall_exit },
 #endif
-#ifdef __ia64__
-	{ "FreeBSD ELF64", ia64_syscall_entry, ia64_syscall_exit },
-#endif
 #ifdef __powerpc__
 	{ "FreeBSD ELF", powerpc_syscall_entry, powerpc_syscall_exit },
 	{ "FreeBSD ELF32", powerpc_syscall_entry, powerpc_syscall_exit },
diff --git a/usr.bin/tset/Makefile b/usr.bin/tset/Makefile
index 126cf321bda9..c486bf8eaca8 100644
--- a/usr.bin/tset/Makefile
+++ b/usr.bin/tset/Makefile
@@ -1,10 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
+# $FreeBSD$
 
 PROG=	tset
 SRCS=	map.c misc.c set.c term.c tset.c wrterm.c
 
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
+DPADD=	${LIBTERMCAPW}
+LDADD=	-ltermcapw
 LINKS=	${BINDIR}/tset ${BINDIR}/reset
 MLINKS=	tset.1 reset.1
 
diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile
index 9aaf7754de52..685e4a4a292c 100644
--- a/usr.bin/ul/Makefile
+++ b/usr.bin/ul/Makefile
@@ -3,7 +3,7 @@
 
 PROG=	ul
 
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
+DPADD=	${LIBTERMCAPW}
+LDADD=	-ltermcapw
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index d362eaf197e4..f09a2448a05f 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -415,9 +415,10 @@ command appeared in
 support was added in
 .Fx 4.7 .
 .Sh AUTHORS
+.An -nosplit
 The original implementation was written by
-.An Dave Yost Aq Dave@Yost.com .
-.An Tony Finch Aq dot@dotat.at
+.An Dave Yost Aq Mt Dave@Yost.com .
+.An Tony Finch Aq Mt dot@dotat.at
 rewrote it to support
 .Tn ANSI\~C .
 .Sh BUGS
diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile
index ebd1e0724f3a..3757c857509e 100644
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@@ -1,10 +1,16 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	units
 FILES=	units.lib
 FILESDIR=	${SHAREDIR}/misc
 
-LDADD+=-ledit -ltermcap
-DPADD+=${LIBEDIT} ${LIBTERMCAP}
+LDADD+=-ledit -ltermcapw
+DPADD+=${LIBEDIT} ${LIBTERMCAPW}
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/units/tests/Makefile b/usr.bin/units/tests/Makefile
new file mode 100644
index 000000000000..0694effd12a8
--- /dev/null
+++ b/usr.bin/units/tests/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=      ${TESTSBASE}/usr.bin/units
+
+TAP_TESTS_SH=	basics_test
+
+.include <bsd.test.mk>
diff --git a/usr.bin/units/tests/basics_test.sh b/usr.bin/units/tests/basics_test.sh
new file mode 100644
index 000000000000..adc28e031fa9
--- /dev/null
+++ b/usr.bin/units/tests/basics_test.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $FreeBSD$
+
+base=`basename $0`
+
+echo "1..3"
+
+assert_equals() {
+    testnum="$1"
+    expected="$2"
+    fn="$3"
+    if [ "$expected" = "$($fn)" ]
+    then
+        echo "ok $testnum - $fn"
+    else
+        echo "not ok $testnum - $fn"
+    fi
+}
+
+assert_equals 1 1 "units -t ft ft"
+assert_equals 2 12 "units -t ft in"
+assert_equals 3 0.083333333 "units -t in ft"
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index 83f2d9ed094f..751d9cef2534 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.Dd April 14, 2014
+.Dd July 4, 2014
 .Dt UNITS 1
 .Os
 .Sh NAME
@@ -13,17 +13,31 @@
 .Sh OPTIONS
 The following options are available:
 .Bl -tag -width indent
-.It Fl f Ar filename
+.It Fl h No , Fl -help
+Show an overview of options
+.It Fl f Ar filename No , Fl -file Ar filename
 Specify the name of the units data file to load.
-.It Fl q
+.It Fl e , Fl -exponential
+Behave as if -o '%6e' was typed.
+.It Fl q No , Fl -quiet
 Suppress prompting of the user for units and the display of statistics
 about the number of units loaded.
-.It Fl U
-If the default unit file exists prints its location.  If not, print
+.It Fl U No , Fl -unitsfile
+If the default unit file exists prints its location.
+If not, print
 .Qo
 Units data file not found
 .Qc
-.It Fl V
+.It Fl t No , Fl -terse
+Only print the result.  This is used when calling
+.Nm
+from other programs for easy to parse results.
+.It Fl v No , Fl -verbose
+Print the units in the conversion output.
+Be more verbose in general.
+.It Fl o Ar format No , Fl -output-format Ar format
+Select the output format string by which numbers are printed.
+.It Fl V No , Fl -version
 Print the version number, usage, and then exit.
 .It Ar from-unit to-unit
 Allow a single unit conversion to be done directly from the command
@@ -31,8 +45,6 @@ line.
 The program will not print prompts.
 It will print out the
 result of the single specified conversion.
-.It Fl v
-Print the units in the conversion output.  Be more verbose in general.
 .El
 .Sh DESCRIPTION
 The
@@ -141,7 +153,7 @@ The
 program will not detect infinite loops that could be caused
 by careless unit definitions.
 Comments in the unit definition file
-begin with a '/' character at the beginning of a line.
+begin with a '#' or '/' character at the beginning of a line.
 .Pp
 Prefixes are defined in the same was as standard units, but with
 a trailing dash at the end of the prefix name.
@@ -170,7 +182,7 @@ units.
 the standard units library
 .El
 .Sh AUTHORS
-.An Adrian Mariano Aq adrian@cam.cornell.edu
+.An Adrian Mariano Aq Mt adrian@cam.cornell.edu
 .Sh BUGS
 The effect of including a '/' in a prefix is surprising.
 .Pp
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index be52adf71549..3d39d0e98131 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -24,6 +24,7 @@ static const char rcsid[] =
 #include <err.h>
 #include <errno.h>
 #include <histedit.h>
+#include <getopt.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -68,15 +69,13 @@ static struct {
 
 static char NULLUNIT[] = "";
 
-#ifdef MSDOS
-#define SEPARATOR      ";"
-#else
 #define SEPARATOR      ":"
-#endif
 
 static int unitcount;
 static int prefixcount;
 static bool verbose = false;
+static bool terse = false;
+static const char * outputformat;
 static const char * havestr;
 static const char * wantstr;
 
@@ -105,7 +104,7 @@ static const char * prompt(EditLine *e __unused) {
 	return promptstr;
 }
 
-char *
+static char *
 dupstr(const char *str)
 {
 	char *ret;
@@ -117,7 +116,7 @@ dupstr(const char *str)
 }
 
 
-void 
+static void 
 readunits(const char *userfile)
 {
 	FILE *unitfile;
@@ -164,7 +163,7 @@ readunits(const char *userfile)
 			break;
 		linenum++;
 		lineptr = line;
-		if (*lineptr == '/')
+		if (*lineptr == '/' || *lineptr == '#')
 			continue;
 		lineptr += strspn(lineptr, " \n\t");
 		len = strcspn(lineptr, " \n\t");
@@ -222,7 +221,7 @@ readunits(const char *userfile)
 	fclose(unitfile);
 }
 
-void 
+static void 
 initializeunit(struct unittype * theunit)
 {
 	theunit->numerator[0] = theunit->denominator[0] = NULL;
@@ -232,7 +231,7 @@ initializeunit(struct unittype * theunit)
 }
 
 
-int 
+static int 
 addsubunit(char *product[], char *toadd)
 {
 	char **ptr;
@@ -249,7 +248,7 @@ addsubunit(char *product[], char *toadd)
 }
 
 
-void 
+static void 
 showunit(struct unittype * theunit)
 {
 	char **ptr;
@@ -311,7 +310,7 @@ zeroerror(void)
    Returns 0 for successful addition, nonzero on error.
 */
 
-int 
+static int 
 addunit(struct unittype * theunit, const char *toadd, int flip, int quantity)
 {
 	char *scratch, *savescr;
@@ -419,14 +418,14 @@ addunit(struct unittype * theunit, const char *toadd, int flip, int quantity)
 }
 
 
-int 
+static int 
 compare(const void *item1, const void *item2)
 {
 	return strcmp(*(const char * const *)item1, *(const char * const *)item2);
 }
 
 
-void 
+static void 
 sortunit(struct unittype * theunit)
 {
 	char **ptr;
@@ -547,7 +546,7 @@ lookupunit(const char *unit)
 
 #define ERROR 4
 
-int 
+static int 
 reduceproduct(struct unittype * theunit, int flip)
 {
 
@@ -590,7 +589,7 @@ reduceproduct(struct unittype * theunit, int flip)
    Returns 0 on success, or 1 on unknown unit error.
 */
 
-int 
+static int 
 reduceunit(struct unittype * theunit)
 {
 	int ret;
@@ -605,7 +604,7 @@ reduceunit(struct unittype * theunit)
 }
 
 
-int 
+static int 
 compareproducts(char **one, char **two)
 {
 	while (*one || *two) {
@@ -628,7 +627,7 @@ compareproducts(char **one, char **two)
 
 /* Return zero if units are compatible, nonzero otherwise */
 
-int 
+static int 
 compareunits(struct unittype * first, struct unittype * second)
 {
 	return
@@ -637,7 +636,7 @@ compareunits(struct unittype * first, struct unittype * second)
 }
 
 
-int 
+static int 
 completereduce(struct unittype * unit)
 {
 	if (reduceunit(unit))
@@ -647,32 +646,40 @@ completereduce(struct unittype * unit)
 	return 0;
 }
 
-void 
+static void 
 showanswer(struct unittype * have, struct unittype * want)
 {
 	double ans;
+	char* oformat;
 
 	if (compareunits(have, want)) {
 		printf("conformability error\n");
 		if (verbose)
 			printf("\t%s = ", havestr);
-		else
+		else if (!terse)
 			printf("\t");
 		showunit(have);
-		if (verbose)
-			printf("\t%s = ", wantstr);
-		else
-			printf("\t");
-		showunit(want);
+		if (!terse) {
+			if (verbose)
+				printf("\t%s = ", wantstr);
+			else
+				printf("\t");
+			showunit(want);
+		}
 	}
 	else if (have->offset != want->offset) {
 		if (want->quantity)
 			printf("WARNING: conversion of non-proportional quantities.\n");
-		if (have->quantity)
-			printf("\t%.8g\n",
+		if (have->quantity) {
+			asprintf(&oformat, "\t%s\n", outputformat);
+			printf(oformat,
 			    (have->factor + have->offset-want->offset)/want->factor);
+			free(oformat);
+		}
 		else {
-			printf("\t (-> x*%.8g %+.8g)\n\t (<- y*%.8g %+.8g)\n",
+			asprintf(&oformat, "\t (-> x*%sg %sg)\n\t (<- y*%sg %sg)\n",
+			    outputformat, outputformat, outputformat, outputformat);
+			printf(oformat,
 			    have->factor / want->factor,
 			    (have->offset-want->offset)/want->factor,
 			    want->factor / have->factor,
@@ -681,20 +688,38 @@ showanswer(struct unittype * have, struct unittype * want)
 	}
 	else {
 		ans = have->factor / want->factor;
-		if (verbose)
-			printf("\t%s = %.8g * %s\n", havestr, ans, wantstr);
-		else
-			printf("\t* %.8g\n", ans);
 
-		if (verbose)
-			printf("\t%s = (1 / %.8g) * %s\n", havestr, 1/ans,  wantstr);
-		else
-			printf("\t/ %.8g\n", 1/ans);
+		if (verbose) {
+			printf("\t%s = ", havestr);
+			printf(outputformat, ans);
+			printf(" * %s", wantstr);
+			printf("\n");
+		}
+		else if (terse) {
+			printf(outputformat, ans);
+			printf("\n");
+		}
+		else {
+			printf("\t* ");
+			printf(outputformat, ans);
+			printf("\n");
+		}
+
+		if (verbose) {
+			printf("\t%s = (1 / ", havestr);
+			printf(outputformat, 1/ans);
+			printf(") * %s\n", wantstr);
+		}
+		else if (!terse) {
+			printf("\t/ ");
+			printf(outputformat, 1/ans);
+			printf("\n");
+		}
 	}
 }
 
 
-void 
+static void 
 usage(void)
 {
 	fprintf(stderr,
@@ -702,6 +727,19 @@ usage(void)
 	exit(3);
 }
 
+static struct option longopts[] = {
+	{"help", no_argument, NULL, 'h'},
+	{"exponential", no_argument, NULL, 'e'},
+	{"file", required_argument, NULL, 'f'},
+	{"output-format", required_argument, NULL, 'o'},
+	{"quiet", no_argument, NULL, 'q'},
+	{"terse", no_argument, NULL, 't'},
+	{"unitsfile", no_argument, NULL, 'U'},
+	{"verbose", no_argument, NULL, 'v'},
+	{"version", no_argument, NULL, 'V'},
+	{ 0, 0, 0, 0 }
+};
+
 
 int
 main(int argc, char **argv)
@@ -718,8 +756,12 @@ main(int argc, char **argv)
 
 	quiet = false;
 	readfile = false;
-	while ((optchar = getopt(argc, argv, "f:qvUV")) != -1) {
+	outputformat = "%.8g";
+	while ((optchar = getopt_long(argc, argv, "+ehf:oqtvUV", longopts, NULL)) != -1) {
 		switch (optchar) {
+		case 'e':
+			outputformat = "%6e";
+			break;
 		case 'f':
 			readfile = true;
 			if (strlen(optarg) == 0)
@@ -730,6 +772,12 @@ main(int argc, char **argv)
 		case 'q':
 			quiet = true;
 			break;
+		case 't':
+			terse = true;
+			break;
+		case 'o':
+			outputformat = optarg;
+			break;
 		case 'v':
 			verbose = true;
 			break;
@@ -743,6 +791,9 @@ main(int argc, char **argv)
 				printf("Units data file not found");
 			exit(0);
 			break;
+		case 'h':
+			/* FALLTHROUGH */
+
 		default:
 			usage();
 		}
@@ -811,5 +862,5 @@ main(int argc, char **argv)
 
 	history_end(inhistory);
 	el_end(el);
-	return(0);
+	return (0);
 }
diff --git a/usr.bin/units/units.lib b/usr.bin/units/units.lib
index 4c48322454b2..3efafd82797f 100644
--- a/usr.bin/units/units.lib
+++ b/usr.bin/units/units.lib
@@ -1,6 +1,6 @@
-/ $FreeBSD$
+# $FreeBSD$
 
-/ primitive units
+# primitive units
 
 m			!a!
 kg			!b!
@@ -13,7 +13,7 @@ bit			!h!
 erlang			!i!
 K			!j!
 
-/ prefixes
+# prefixes
 
 yotta-			1e24
 zetta-			1e21
@@ -68,7 +68,7 @@ a-			atto
 z-			zopto
 y-			yocto
 
-/ binary prefixes introduced in 1999
+# binary prefixes introduced in 1999
 exbi-			1152921504606846976
 pebi-			1125899906842624
 tebi-			1099511627776
@@ -83,7 +83,7 @@ Gi-			gibi
 Mi-			mebi
 Ki-			kibi
 
-/ constants
+# constants
 
 fuzz			1
 pi			3.14159265358979323846
@@ -109,7 +109,7 @@ electronmass		9.1093821545-31 kg
 protonmass		1.6726217129-27 kg
 neutronmass		1.6749272928-27 kg
 
-/ dimensionless
+# dimensionless
 
 radian			.5 / pi
 degree			1|180 pi-radian
@@ -127,7 +127,7 @@ steradian		radian2
 sphere			4 pi-steradian
 sr			steradian
 
-/ Time
+# Time
 
 second			sec
 s			sec
@@ -143,13 +143,13 @@ yr			year
 month			1|12 year
 us			microsec
 
-/ Mass
+# Mass
 
 gram			millikg
 gm			gram
 metricton		kilokg
 
-/ Avoirdupois
+# Avoirdupois
 
 lb			.45359237 kg
 pound			lb
@@ -164,7 +164,7 @@ shortton		2000 lb
 ton			shortton
 longton			2240 lb
 
-/ Apothecary
+# Apothecary
 
 scruple			20 grain
 apdram			60 grain
@@ -172,7 +172,7 @@ apounce			480 grain
 appound			5760 grain
 troypound		appound
 
-/ Mining
+# Mining
 
 troyounce		apounce
 troz			apounce
@@ -180,7 +180,7 @@ pennyweight		1|20 troz
 pwt			pennyweight
 dwt			pennyweight
 
-/ Length
+# Length
 
 meter			m
 micron			micrometer
@@ -208,7 +208,7 @@ cc			cm3
 liter			kilocc
 ml			milliliter
 
-/ US Liquid
+# US Liquid
 
 gallon			231 in3
 imperial		1.20095
@@ -222,7 +222,7 @@ floz			1|16 pt
 fldr			1|8 floz
 shot			3|2 floz
 
-/ US Dry
+# US Dry
 
 dry			268.8025 in3/gallon fuzz
 peck			8 dry-quart
@@ -231,7 +231,7 @@ bushel			4 peck
 bu			bushel
 chaldron		36 bushel
 
-/ British
+# British
 
 brgallon		277.420 in3 fuzz
 brquart			1|4 brgallon
@@ -241,10 +241,10 @@ brpeck			554.84 in3 fuzz
 brbushel		4 brpeck
 brhundredweight		112 lb
 
-/ Bottles
+# Bottles
 
 bottle			750 milliliter
-/bottle			fifth
+#bottle			fifth
 
 miniature		100 milliliter
 split			1|4 bottle
@@ -258,7 +258,7 @@ balthazar		16 bottle
 nebuchadnezzar		20 bottle
 sovereign		34 bottle
 
-/ Bottles - alternate names and spellings
+# Bottles - alternate names and spellings
 
 pony			split
 fillette		half
@@ -266,7 +266,7 @@ tappit-hen		3 imperial
 rheoboam		rehoboam
 shalmaneser		salmanazar
 
-/ Russian
+# Russian
 berkovets		10 pood
 pood			40 funt
 funt			0.40951 kg
@@ -279,7 +279,7 @@ verst			1066.8 m
 sazhen			1|500 verst
 kosayasazhen		1|430.2 verst
 arshin			1|1500 verst
-/ is not exactly defined
+# is not exactly defined
 ruell			16.54 in
 liniya			1|10 in
 vershok			1.75 in
@@ -296,7 +296,7 @@ sqverst			104.2 desyatina_state
 sqarshin		1|21600 desyatina_state
 sqfoot			1|117600 desyatina_state
 
-/ Energy Work
+# Energy Work
 
 newton			kg-m/sec2
 nt			newton
@@ -306,7 +306,7 @@ J			joule
 cal			4.1868 joule
 ergon			erg
 
-/ Electrical
+# Electrical
 
 coulomb			coul
 C			coul
@@ -325,14 +325,14 @@ H			henry
 weber			volt-sec
 Wb			weber
 
-/ Light
+# Light
 
 cd			candela
 lumen			cd sr
 lux			cd sr/m2
 
-/ EMU currencies have constant exchange rate against Euro since 1.1.1999.
-/ See http://en.wikipedia.org/wiki/Euro for details.
+# EMU currencies have constant exchange rate against Euro since 1.1.1999.
+# See http://en.wikipedia.org/wiki/Euro for details.
 austriaschilling	1|13.7603 euro
 belgiumfranc		1|40.3399 euro
 finlandmarkka		1|5.94573 euro
@@ -350,8 +350,8 @@ cypriotpound		1|0.585274 euro
 malteselira		1|0.429300 euro
 slovakkoruna		1|30.1260 euro
 
-/ These ones are pegged to the Euro
-/ See http://en.wikipedia.org/wiki/Euro for details.
+# These ones are pegged to the Euro
+# See http://en.wikipedia.org/wiki/Euro for details.
 bosniaherzegovinamark	1|1.95583 euro
 bulgarianlev		1|1.95583 euro
 capeverdeanescudo	1|110.265 euro
@@ -363,8 +363,8 @@ lithuanianlitas		1|3.45280 euro
 pacificfrancexchange	1|0.00838 euro
 westafricancfafranc	1|655.957 euro
 
-/ These ones are pegged on the US Dollar
-/ See http://en.wikipedia.org/wiki/USD for details.
+# These ones are pegged on the US Dollar
+# See http://en.wikipedia.org/wiki/USD for details.
 dollar			usdollar
 arubanflorin		1|1.75 usdollar
 bahamiandollar		1|1 usdollar
@@ -404,7 +404,7 @@ markka			finlandmarkka
 peseta			spainpeseta
 rand			southafricarand
 
-/ computer
+# computer
 
 baud			bit/sec
 nibble			4 bit
@@ -424,7 +424,7 @@ kilobyte		kbyte
 meg			megabyte
 
 
-/ Trivia
+# Trivia
 
 %			1|100
 abampere		10 ampere
diff --git a/usr.bin/unzip/unzip.1 b/usr.bin/unzip/unzip.1
index 0c540515de8a..fd9b10fa6555 100644
--- a/usr.bin/unzip/unzip.1
+++ b/usr.bin/unzip/unzip.1
@@ -182,8 +182,8 @@ utility appeared in
 The
 .Nm
 utility and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
 It uses the
 .Xr archive 3
 library developed by
-.An Tim Kientzle Aq kientzle@FreeBSD.org .
+.An Tim Kientzle Aq Mt kientzle@FreeBSD.org .
diff --git a/usr.bin/users/Makefile b/usr.bin/users/Makefile
index 3d6524bc7a29..dd04a112b2a8 100644
--- a/usr.bin/users/Makefile
+++ b/usr.bin/users/Makefile
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
-PROG=	users
+WARNS=		3
+PROG_CXX=	users
+CXXFLAGS+=	-fno-rtti
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
deleted file mode 100644
index e0d04e7256b7..000000000000
--- a/usr.bin/users/users.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 1980, 1987, 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.
- */
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1980, 1987, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)users.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <utmpx.h>
-
-typedef char namebuf[sizeof(((struct utmpx *)0)->ut_user) + 1];
-typedef int (*scmp)(const void *, const void *);
-
-static void usage(void);
-
-int
-main(int argc, char **argv)
-{
-	namebuf *names = NULL;
-	int ncnt = 0;
-	int nmax = 0;
-	int cnt;
-	struct utmpx *ut;
-	int ch;
-
-	while ((ch = getopt(argc, argv, "")) != -1)
-		switch(ch) {
-		case '?':
-		default:
-			usage();
-		}
-	argc -= optind;
-	argv += optind;
-
-	setutxent();
-	while ((ut = getutxent()) != NULL) {
-		if (ut->ut_type != USER_PROCESS)
-			continue;
-		if (ncnt >= nmax) {
-			nmax += 32;
-			names = realloc(names, sizeof(*names) * nmax);
-			if (!names) {
-				errx(1, "realloc");
-				/* NOTREACHED */
-			}
-		}
-		strlcpy(names[ncnt], ut->ut_user, sizeof(*names));
-		++ncnt;
-	}
-	endutxent();
-	if (ncnt > 0) {
-		qsort(names, ncnt, sizeof(*names), (scmp)strcmp);
-		printf("%s", names[0]);
-		for (cnt = 1; cnt < ncnt; ++cnt)
-			if (strcmp(names[cnt], names[cnt - 1]) != 0)
-				printf(" %s", names[cnt]);
-		printf("\n");
-	}
-	exit(0);
-}
-
-static void
-usage(void)
-{
-	fprintf(stderr, "usage: users\n");
-	exit(1);
-}
diff --git a/sys/ia64/include/limits.h b/usr.bin/users/users.cc
similarity index 69%
rename from sys/ia64/include/limits.h
rename to usr.bin/users/users.cc
index 62772bcc48b1..914888d98870 100644
--- a/sys/ia64/include/limits.h
+++ b/usr.bin/users/users.cc
@@ -1,9 +1,6 @@
-/* $FreeBSD$ */
-/* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp */
-
 /*-
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 2014 Pietro Cerutti <gahr@FreeBSD.org>
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -28,19 +25,41 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)limits.h	8.3 (Berkeley) 1/4/94
  */
 
-#ifndef _MACHINE_LIMITS_H_
-#define	_MACHINE_LIMITS_H_
-
 #include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
-#ifdef __CC_SUPPORTS_WARNING
-#warning "machine/limits.h is deprecated.  Include sys/limits.h instead."
-#endif
+#include <utmpx.h>
 
-#include <sys/limits.h>
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+#include <set>
+#include <string>
+using namespace std;
 
-#endif /* !_MACHINE_LIMITS_H_ */
+int
+main(int argc, char **)
+{
+	struct utmpx *ut;
+	set<string> names;
+
+	if (argc > 1) {
+		cerr << "usage: users" << endl;
+		return (1);
+	}
+
+	setutxent();
+	while ((ut = getutxent()) != NULL)
+		if (ut->ut_type == USER_PROCESS)
+			names.insert(ut->ut_user);
+	endutxent();
+
+	if (!names.empty()) {
+		set<string>::iterator last = names.end();
+		--last;
+		copy(names.begin(), last, ostream_iterator<string>(cout, " "));
+		cout << *last << endl;
+	}
+}
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index e3ee3f6e8081..6ed95ee29b24 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -36,14 +36,9 @@ CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/regex
 DPADD=		${LIBUTIL}
 LDADD=		-lutil
 
-.if defined(RESCUE) || defined(RELEASE_CRUNCH)
-DPADD+=		${LIBNCURSES}
-LDADD+=		-lncurses
-.else
 CFLAGS+=	-DUSE_WIDECHAR
 DPADD+=		${LIBNCURSESW}
 LDADD+=		-lncursesw
-.endif
 
 .if ${MK_ICONV} == "yes" && !defined(RESCUE) && !defined(RELEASE_CRUNCH)
 CFLAGS+=	-DUSE_ICONV
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index f04cc42877ba..4566ad2a421d 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -28,7 +28,7 @@
 .\"	@(#)vmstat.8	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd October 21, 2006
+.Dd August 8, 2014
 .Dt VMSTAT 8
 .Os
 .Sh NAME
@@ -38,9 +38,8 @@
 .Nm
 .\" .Op Fl fimst
 .Op Fl afHhimPsz
-.Op Fl c Ar count
 .Op Fl M Ar core Op Fl N Ar system
-.Op Fl w Ar wait
+.Op Fl c Ar count
 .Op Fl n Ar devs
 .Oo
 .Fl p
@@ -48,7 +47,9 @@
 .Ar type , if , pass
 .Sm on
 .Oc
-.Op Ar disks
+.Op Fl w Ar wait
+.Op Ar disks ...
+.Op wait Op count
 .Sh DESCRIPTION
 The
 .Nm
@@ -91,10 +92,12 @@ and
 system calls since system startup, and the number of pages of virtual memory
 involved in each.
 .It Fl h
-Changes memory columns into more easily human readable form.  Default if
+Changes memory columns into more easily human readable form.
+The default if
 standard output is a terminal device.
 .It Fl H
-Changes memory columns into straight numbers.  Default if standard output
+Changes memory columns into straight numbers.
+The default if standard output
 is not a terminal device (such as a script).
 .It Fl i
 Report on the number of interrupts taken by each device since system
@@ -214,6 +217,21 @@ Report on memory used by the kernel zone allocator,
 by zone.
 .El
 .Pp
+The
+.Ar wait
+and
+.Ar count
+arguments may be given after their respective flags at any point
+on the command line before the
+.Ar disks
+argument(s), or without their flags, as the final argument(s).
+The latter form is accepted for backwards compatibility, but it is
+preferred to use the forms with
+.Fl w
+and
+.Fl c
+to avoid ambiguity.
+.Pp
 By default,
 .Nm
 displays the following information:
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index c089dbfacbad..227f3c26adc2 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -80,7 +80,7 @@ static char da[] = "da";
 
 static struct nlist namelist[] = {
 #define X_SUM		0
-	{ "_cnt" },
+	{ "_vm_cnt" },
 #define X_HZ		1
 	{ "_hz" },
 #define X_STATHZ	2
@@ -259,8 +259,18 @@ main(int argc, char *argv[])
 			errx(1, "kvm_openfiles: %s", errbuf);
 	}
 
+retry_nlist:
 	if (kd != NULL && (c = kvm_nlist(kd, namelist)) != 0) {
 		if (c > 0) {
+			/*
+			 * 'cnt' was renamed to 'vm_cnt'. If 'vm_cnt' is not
+			 * found try looking up older 'cnt' symbol.
+			 * */
+			if (namelist[X_SUM].n_type == 0 &&
+			    strcmp(namelist[X_SUM].n_name, "_vm_cnt") == 0) {
+				namelist[X_SUM].n_name = "_cnt";
+				goto retry_nlist;
+			}
 			warnx("undefined symbols:");
 			for (c = 0;
 			     c < (int)(sizeof(namelist)/sizeof(namelist[0]));
@@ -289,15 +299,12 @@ main(int argc, char *argv[])
 		argv = getdrivedata(argv);
 	}
 
-#define	BACKWARD_COMPATIBILITY
-#ifdef	BACKWARD_COMPATIBILITY
 	if (*argv) {
 		f = atof(*argv);
 		interval = f * 1000;
 		if (*++argv)
 			reps = atoi(*argv);
 	}
-#endif
 
 	if (interval) {
 		if (!reps)
@@ -1350,7 +1357,7 @@ static void
 usage(void)
 {
 	(void)fprintf(stderr, "%s%s",
-		"usage: vmstat [-afHhimPsz] [-c count] [-M core [-N system]] [-w wait]\n",
-		"              [-n devs] [-p type,if,pass] [disks]\n");
+		"usage: vmstat [-afHhimPsz] [-M core [-N system]] [-c count] [-n devs]\n",
+		"              [-p type,if,pass] [-w wait] [disks] [wait [count]]\n");
 	exit(1);
 }
diff --git a/usr.bin/vtfontcvt/vtfontcvt.8 b/usr.bin/vtfontcvt/vtfontcvt.8
index 677e503f2f42..5a9d9b95ae37 100644
--- a/usr.bin/vtfontcvt/vtfontcvt.8
+++ b/usr.bin/vtfontcvt/vtfontcvt.8
@@ -71,4 +71,4 @@ comment before any font data.
 The
 .Nm
 utility first appeared in
-.Fx 11.0 .
+.Fx 10.1 .
diff --git a/usr.bin/vtfontcvt/vtfontcvt.c b/usr.bin/vtfontcvt/vtfontcvt.c
index a6735b4468c7..21c519b5f65a 100644
--- a/usr.bin/vtfontcvt/vtfontcvt.c
+++ b/usr.bin/vtfontcvt/vtfontcvt.c
@@ -91,7 +91,7 @@ static void
 usage(void)
 {
 
-	errx(1,
+	(void)fprintf(stderr,
 "usage: vtfontcvt [-w width] [-h height] [-v] normal.bdf [bold.bdf] out.fnt\n");
 	exit(1);
 }
@@ -111,10 +111,8 @@ add_mapping(struct glyph *gl, unsigned int c, unsigned int map_idx)
 
 	ml = &maps[map_idx];
 	if (TAILQ_LAST(ml, mapping_list) != NULL &&
-	    TAILQ_LAST(ml, mapping_list)->m_char >= c) {
+	    TAILQ_LAST(ml, mapping_list)->m_char >= c)
 		errx(1, "Bad ordering at character %u\n", c);
-		return (1);
-	}
 	TAILQ_INSERT_TAIL(ml, mp, m_list);
 
 	map_count[map_idx]++;
@@ -134,11 +132,9 @@ dedup_mapping(unsigned int map_idx)
 	TAILQ_FOREACH_SAFE(mp_bold, &maps[map_idx], m_list, mp_temp) {
 		while (mp_normal->m_char < mp_bold->m_char)
 			mp_normal = TAILQ_NEXT(mp_normal, m_list);
-		if (mp_bold->m_char != mp_normal->m_char) {
+		if (mp_bold->m_char != mp_normal->m_char)
 			errx(1, "Character %u not in normal font!\n",
 			    mp_bold->m_char);
-			return (1);
-		}
 		if (mp_bold->m_glyph != mp_normal->m_glyph)
 			continue;
 
@@ -211,11 +207,8 @@ parse_bitmap_line(uint8_t *left, uint8_t *right, unsigned int line,
 	uint8_t *p;
 	unsigned int i, subline;
 
-	if (dwidth != width && dwidth != width * 2) {
-		errx(1,
-		    "Bitmap with unsupported width %u!\n", dwidth);
-		return (1);
-	}
+	if (dwidth != width && dwidth != width * 2)
+		errx(1, "Bitmap with unsupported width %u!\n", dwidth);
 
 	/* Move pixel data right to simplify splitting double characters. */
 	line >>= (howmany(dwidth, 8) * 8) - dwidth;
@@ -232,9 +225,7 @@ parse_bitmap_line(uint8_t *left, uint8_t *right, unsigned int line,
 			*p++ = subline >> 8;
 			*p = subline;
 		} else {
-			errx(1,
-			    "Unsupported wbytes %u!\n", wbytes);
-			return (1);
+			errx(1, "Unsupported wbytes %u!\n", wbytes);
 		}
 
 		line >>= width;
@@ -265,10 +256,8 @@ parse_bdf(FILE *fp, unsigned int map_idx)
 		if (strncmp(ln, "BITMAP", 6) == 0 &&
 		    (ln[6] == ' ' || ln[6] == '\0')) {
 			for (i = 0; i < height; i++) {
-				if ((ln = fgetln(fp, &length)) == NULL) {
+				if ((ln = fgetln(fp, &length)) == NULL)
 					errx(1, "Unexpected EOF!\n");
-					return (1);
-				}
 				ln[length - 1] = '\0';
 				sscanf(ln, "%x", &line);
 				if (parse_bitmap_line(bytes + i * wbytes,
@@ -285,6 +274,16 @@ parse_bdf(FILE *fp, unsigned int map_idx)
 	return (0);
 }
 
+static void
+set_width(int w)
+{
+
+	if (w <= 0 || w > 128)
+		errx(1, "invalid width %d", w);
+	width = w;
+	wbytes = howmany(width, 8);
+}
+
 static int
 parse_hex(FILE *fp, unsigned int map_idx)
 {
@@ -300,12 +299,12 @@ parse_hex(FILE *fp, unsigned int map_idx)
 		if (strncmp(ln, "# Height: ", 10) == 0) {
 			height = atoi(ln + 10);
 		} else if (strncmp(ln, "# Width: ", 9) == 0) {
-			width = atoi(ln + 9);
+			set_width(atoi(ln + 9));
 		} else if (sscanf(ln, "%4x:", &curchar)) {
 			p = ln + 5;
 			chars_per_row = strlen(p) / height;
 			dwidth = width;
-			if (chars_per_row / 2 > width / 8)
+			if (chars_per_row / 2 > (width + 7) / 8)
 				dwidth *= 2; /* Double-width character. */
 			snprintf(fmt_str, sizeof(fmt_str), "%%%ux",
 			    chars_per_row);
@@ -518,22 +517,15 @@ main(int argc, char *argv[])
 		switch (ch) {
 		case 'h':
 			val = atoi(optarg);
-			if (val <= 0 || val > 128) {
+			if (val <= 0 || val > 128)
 				errx(1, "Invalid height %d", val);
-				return (1);
-			}
 			height = val;
 			break;
 		case 'v':
 			verbose = 1;
 			break;
 		case 'w':
-			val = atoi(optarg);
-			if (val <= 0 || val > 128) {
-				errx(1, "Invalid width %d", val);
-				return (1);
-			}
-			width = val;
+			set_width(atoi(optarg));
 			break;
 		case '?':
 		default:
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index 52e010adb0a4..0c0dce82e769 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -78,8 +78,8 @@ command first appeared in
 The
 .Nm
 utility was originally written in Perl and was contributed by
-.An Wolfram Schneider Aq wosch@FreeBSD.org .
+.An Wolfram Schneider Aq Mt wosch@FreeBSD.org .
 The current version of
 .Nm
 was rewritten in C by
-.An Daniel Papasian Aq dpapasia@andrew.cmu.edu .
+.An Daniel Papasian Aq Mt dpapasia@andrew.cmu.edu .
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 99926b8e111a..3f6f93a8751f 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -179,10 +179,12 @@ main(int argc, char *argv[])
 	 * back to NICHOST.
 	 */
 	if (host == NULL && country == NULL) {
-		use_qnichost = 1;
-		host = NICHOST;
-		if (!(flags & WHOIS_QUICK))
-			flags |= WHOIS_RECURSE;
+		if ((host = getenv("RA_SERVER")) == NULL) {
+			use_qnichost = 1;
+			host = NICHOST;
+			if (!(flags & WHOIS_QUICK))
+				flags |= WHOIS_RECURSE;
+		}
 	}
 	while (argc-- > 0) {
 		if (country != NULL) {
diff --git a/usr.bin/xlint/arch/ia64/targparam.h b/usr.bin/xlint/arch/ia64/targparam.h
deleted file mode 100644
index 7ec1038156f7..000000000000
--- a/usr.bin/xlint/arch/ia64/targparam.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $FreeBSD$ */
-/*	$NetBSD: targparam.h,v 1.1 2002/01/18 20:39:18 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 Jochen Pohl
- * All Rights Reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Jochen Pohl for
- *	The NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Machine-dependent target parameters for lint1.
- */
-
-#include "lp64.h"
-
-/*    
- * Should be set to 1 if the difference of two pointers is of type long
- * or the value of sizeof is of type unsigned long.  Note this MUST be
- * kept in sync with the compiler!
- */     
-
-#define	PTRDIFF_IS_LONG		1
-#define	SIZEOF_IS_ULONG		1
-
-#define	FLOAT_SIZE		(4 * CHAR_BIT)
-#define	DOUBLE_SIZE		(8 * CHAR_BIT)
-#define	LDOUBLE_SIZE		(16 * CHAR_BIT)
-
-#define	ENUM_SIZE		(4 * CHAR_BIT)
diff --git a/usr.bin/xlint/lint1/param.h b/usr.bin/xlint/lint1/param.h
index 27de69240552..94d8947a3b52 100644
--- a/usr.bin/xlint/lint1/param.h
+++ b/usr.bin/xlint/lint1/param.h
@@ -62,10 +62,7 @@
  * Should be set to 1 if the difference of two pointers is of type long
  * or the value of sizeof is of type unsigned long.
  */
-#ifdef __ia64__
-#define PTRDIFF_IS_LONG		1
-#define SIZEOF_IS_ULONG		1
-#elif __amd64__
+#if __amd64__
 #define PTRDIFF_IS_LONG		1
 #define SIZEOF_IS_ULONG		1
 #elif __alpha__
diff --git a/usr.bin/yacc/tests/Makefile b/usr.bin/yacc/tests/Makefile
index f8b7d85249c9..c8125a6f39c3 100644
--- a/usr.bin/yacc/tests/Makefile
+++ b/usr.bin/yacc/tests/Makefile
@@ -1,41 +1,332 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
+TEST_DIR=	${.CURDIR}/../../../contrib/byacc/test
+
+.PATH: ${TEST_DIR} ${TEST_DIR}/yacc
+
 TESTSDIR=	${TESTSBASE}/usr.bin/yacc
 
-TAP_TESTS_SH=	legacy_test
+PLAIN_TESTS_SH=	yacc_tests
+# NOTE: due to caveats with how permissions are handled on FreeBSD
+# with root, this must be run as a non-privileged user; otherwise
+# the testcases will fail unexpectedly.
+TEST_METADATA.yacc_tests+=	required_user="unprivileged"
 
-FILESDIR=	${TESTSDIR}
-FILES=		calc.y
-FILES+=		calc1.y
-FILES+=		calc2.y
-FILES+=		calc3.y
-FILES+=		code_calc.y
-FILES+=		code_error.y
-FILES+=		error.y
-FILES+=		ftp.y
-FILES+=		grammar.y
-FILES+=		pure_calc.y
-FILES+=		pure_error.y
-FILES+=		quote_calc.y
-FILES+=		quote_calc2.y
-FILES+=		quote_calc3.y
-FILES+=		quote_calc4.y
-FILES+=		regress.00.out
-FILES+=		regress.01.out
-FILES+=		regress.02.out
-FILES+=		regress.03.out
-FILES+=		regress.04.out
-FILES+=		regress.05.out
-FILES+=		regress.06.out
-FILES+=		regress.07.out
-FILES+=		regress.08.out
-FILES+=		regress.09.out
-FILES+=		regress.10.out
-FILES+=		regress.11.out
-FILES+=		regress.12.out
-FILES+=		regress.13.out
-FILES+=		regress.14.out
-FILES+=		regress.sh
-FILES+=		undefined.y
+SCRIPTS=	run_test
+SCRIPTSDIR=	${TESTSDIR}
+
+FILESGROUPS=	FILES FILEStest FILEStest_yacc
+
+FILEStestDIR=	${TESTSDIR}
+
+FILEStest+=	btyacc_calc1.y
+FILEStest+=	btyacc_demo.y
+FILEStest+=	calc.y
+FILEStest+=	calc1.y
+FILEStest+=	calc2.y
+FILEStest+=	calc3.y
+FILEStest+=	code_calc.y
+FILEStest+=	code_debug.y
+FILEStest+=	code_error.y
+FILEStest+=	empty.y
+FILEStest+=	err_inherit1.y
+FILEStest+=	err_inherit2.y
+FILEStest+=	err_inherit3.y
+FILEStest+=	err_inherit4.y
+FILEStest+=	err_inherit5.y
+FILEStest+=	err_syntax1.y
+FILEStest+=	err_syntax10.y
+FILEStest+=	err_syntax11.y
+FILEStest+=	err_syntax12.y
+FILEStest+=	err_syntax13.y
+FILEStest+=	err_syntax14.y
+FILEStest+=	err_syntax15.y
+FILEStest+=	err_syntax16.y
+FILEStest+=	err_syntax17.y
+FILEStest+=	err_syntax18.y
+FILEStest+=	err_syntax19.y
+FILEStest+=	err_syntax2.y
+FILEStest+=	err_syntax20.y
+FILEStest+=	err_syntax21.y
+FILEStest+=	err_syntax22.y
+FILEStest+=	err_syntax23.y
+FILEStest+=	err_syntax24.y
+FILEStest+=	err_syntax25.y
+FILEStest+=	err_syntax26.y
+FILEStest+=	err_syntax27.y
+FILEStest+=	err_syntax3.y
+FILEStest+=	err_syntax4.y
+FILEStest+=	err_syntax5.y
+FILEStest+=	err_syntax6.y
+FILEStest+=	err_syntax7.y
+FILEStest+=	err_syntax7a.y
+FILEStest+=	err_syntax7b.y
+FILEStest+=	err_syntax8.y
+FILEStest+=	err_syntax8a.y
+FILEStest+=	err_syntax9.y
+FILEStest+=	error.y
+FILEStest+=	grammar.y
+FILEStest+=	inherit0.y
+FILEStest+=	inherit1.y
+FILEStest+=	inherit2.y
+FILEStest+=	ok_syntax1.y
+FILEStest+=	pure_calc.y
+FILEStest+=	pure_error.y
+FILEStest+=	quote_calc.y
+FILEStest+=	quote_calc2.y
+FILEStest+=	quote_calc3.y
+FILEStest+=	quote_calc4.y
+FILEStest+=	varsyntax_calc1.y
+
+FILEStest_yaccDIR=	${TESTSDIR}/yacc
+
+FILEStest_yacc+=	big_b.error
+FILEStest_yacc+=	big_b.output
+FILEStest_yacc+=	big_l.error
+FILEStest_yacc+=	big_l.output
+FILEStest_yacc+=	calc.error
+FILEStest_yacc+=	calc.output
+FILEStest_yacc+=	calc.tab.c
+FILEStest_yacc+=	calc.tab.h
+FILEStest_yacc+=	calc1.error
+FILEStest_yacc+=	calc1.output
+FILEStest_yacc+=	calc1.tab.c
+FILEStest_yacc+=	calc1.tab.h
+FILEStest_yacc+=	calc2.error
+FILEStest_yacc+=	calc2.output
+FILEStest_yacc+=	calc2.tab.c
+FILEStest_yacc+=	calc2.tab.h
+FILEStest_yacc+=	calc3.error
+FILEStest_yacc+=	calc3.output
+FILEStest_yacc+=	calc3.tab.c
+FILEStest_yacc+=	calc3.tab.h
+FILEStest_yacc+=	code_calc.code.c
+FILEStest_yacc+=	code_calc.error
+FILEStest_yacc+=	code_calc.output
+FILEStest_yacc+=	code_calc.tab.c
+FILEStest_yacc+=	code_calc.tab.h
+FILEStest_yacc+=	code_error.code.c
+FILEStest_yacc+=	code_error.error
+FILEStest_yacc+=	code_error.output
+FILEStest_yacc+=	code_error.tab.c
+FILEStest_yacc+=	code_error.tab.h
+FILEStest_yacc+=	empty.error
+FILEStest_yacc+=	empty.output
+FILEStest_yacc+=	empty.tab.c
+FILEStest_yacc+=	empty.tab.h
+FILEStest_yacc+=	err_syntax1.error
+FILEStest_yacc+=	err_syntax1.output
+FILEStest_yacc+=	err_syntax1.tab.c
+FILEStest_yacc+=	err_syntax1.tab.h
+FILEStest_yacc+=	err_syntax10.error
+FILEStest_yacc+=	err_syntax10.output
+FILEStest_yacc+=	err_syntax10.tab.c
+FILEStest_yacc+=	err_syntax10.tab.h
+FILEStest_yacc+=	err_syntax11.error
+FILEStest_yacc+=	err_syntax11.output
+FILEStest_yacc+=	err_syntax11.tab.c
+FILEStest_yacc+=	err_syntax11.tab.h
+FILEStest_yacc+=	err_syntax12.error
+FILEStest_yacc+=	err_syntax12.output
+FILEStest_yacc+=	err_syntax12.tab.c
+FILEStest_yacc+=	err_syntax12.tab.h
+FILEStest_yacc+=	err_syntax13.error
+FILEStest_yacc+=	err_syntax13.output
+FILEStest_yacc+=	err_syntax13.tab.c
+FILEStest_yacc+=	err_syntax13.tab.h
+FILEStest_yacc+=	err_syntax14.error
+FILEStest_yacc+=	err_syntax14.output
+FILEStest_yacc+=	err_syntax14.tab.c
+FILEStest_yacc+=	err_syntax14.tab.h
+FILEStest_yacc+=	err_syntax15.error
+FILEStest_yacc+=	err_syntax15.output
+FILEStest_yacc+=	err_syntax15.tab.c
+FILEStest_yacc+=	err_syntax15.tab.h
+FILEStest_yacc+=	err_syntax16.error
+FILEStest_yacc+=	err_syntax16.output
+FILEStest_yacc+=	err_syntax16.tab.c
+FILEStest_yacc+=	err_syntax16.tab.h
+FILEStest_yacc+=	err_syntax17.error
+FILEStest_yacc+=	err_syntax17.output
+FILEStest_yacc+=	err_syntax17.tab.c
+FILEStest_yacc+=	err_syntax17.tab.h
+FILEStest_yacc+=	err_syntax18.error
+FILEStest_yacc+=	err_syntax18.output
+FILEStest_yacc+=	err_syntax18.tab.c
+FILEStest_yacc+=	err_syntax18.tab.h
+FILEStest_yacc+=	err_syntax19.error
+FILEStest_yacc+=	err_syntax19.output
+FILEStest_yacc+=	err_syntax19.tab.c
+FILEStest_yacc+=	err_syntax19.tab.h
+FILEStest_yacc+=	err_syntax2.error
+FILEStest_yacc+=	err_syntax2.output
+FILEStest_yacc+=	err_syntax2.tab.c
+FILEStest_yacc+=	err_syntax2.tab.h
+FILEStest_yacc+=	err_syntax20.error
+FILEStest_yacc+=	err_syntax20.output
+FILEStest_yacc+=	err_syntax20.tab.c
+FILEStest_yacc+=	err_syntax20.tab.h
+FILEStest_yacc+=	err_syntax21.error
+FILEStest_yacc+=	err_syntax21.output
+FILEStest_yacc+=	err_syntax21.tab.c
+FILEStest_yacc+=	err_syntax21.tab.h
+FILEStest_yacc+=	err_syntax22.error
+FILEStest_yacc+=	err_syntax22.output
+FILEStest_yacc+=	err_syntax22.tab.c
+FILEStest_yacc+=	err_syntax22.tab.h
+FILEStest_yacc+=	err_syntax23.error
+FILEStest_yacc+=	err_syntax23.output
+FILEStest_yacc+=	err_syntax23.tab.c
+FILEStest_yacc+=	err_syntax23.tab.h
+FILEStest_yacc+=	err_syntax24.error
+FILEStest_yacc+=	err_syntax24.output
+FILEStest_yacc+=	err_syntax24.tab.c
+FILEStest_yacc+=	err_syntax24.tab.h
+FILEStest_yacc+=	err_syntax25.error
+FILEStest_yacc+=	err_syntax25.output
+FILEStest_yacc+=	err_syntax25.tab.c
+FILEStest_yacc+=	err_syntax25.tab.h
+FILEStest_yacc+=	err_syntax26.error
+FILEStest_yacc+=	err_syntax26.output
+FILEStest_yacc+=	err_syntax26.tab.c
+FILEStest_yacc+=	err_syntax26.tab.h
+FILEStest_yacc+=	err_syntax27.error
+FILEStest_yacc+=	err_syntax27.output
+FILEStest_yacc+=	err_syntax27.tab.c
+FILEStest_yacc+=	err_syntax27.tab.h
+FILEStest_yacc+=	err_syntax3.error
+FILEStest_yacc+=	err_syntax3.output
+FILEStest_yacc+=	err_syntax3.tab.c
+FILEStest_yacc+=	err_syntax3.tab.h
+FILEStest_yacc+=	err_syntax4.error
+FILEStest_yacc+=	err_syntax4.output
+FILEStest_yacc+=	err_syntax4.tab.c
+FILEStest_yacc+=	err_syntax4.tab.h
+FILEStest_yacc+=	err_syntax5.error
+FILEStest_yacc+=	err_syntax5.output
+FILEStest_yacc+=	err_syntax5.tab.c
+FILEStest_yacc+=	err_syntax5.tab.h
+FILEStest_yacc+=	err_syntax6.error
+FILEStest_yacc+=	err_syntax6.output
+FILEStest_yacc+=	err_syntax6.tab.c
+FILEStest_yacc+=	err_syntax6.tab.h
+FILEStest_yacc+=	err_syntax7.error
+FILEStest_yacc+=	err_syntax7.output
+FILEStest_yacc+=	err_syntax7.tab.c
+FILEStest_yacc+=	err_syntax7.tab.h
+FILEStest_yacc+=	err_syntax7a.error
+FILEStest_yacc+=	err_syntax7a.output
+FILEStest_yacc+=	err_syntax7a.tab.c
+FILEStest_yacc+=	err_syntax7a.tab.h
+FILEStest_yacc+=	err_syntax7b.error
+FILEStest_yacc+=	err_syntax7b.output
+FILEStest_yacc+=	err_syntax7b.tab.c
+FILEStest_yacc+=	err_syntax7b.tab.h
+FILEStest_yacc+=	err_syntax8.error
+FILEStest_yacc+=	err_syntax8.output
+FILEStest_yacc+=	err_syntax8.tab.c
+FILEStest_yacc+=	err_syntax8.tab.h
+FILEStest_yacc+=	err_syntax8a.error
+FILEStest_yacc+=	err_syntax8a.output
+FILEStest_yacc+=	err_syntax8a.tab.c
+FILEStest_yacc+=	err_syntax8a.tab.h
+FILEStest_yacc+=	err_syntax9.error
+FILEStest_yacc+=	err_syntax9.output
+FILEStest_yacc+=	err_syntax9.tab.c
+FILEStest_yacc+=	err_syntax9.tab.h
+FILEStest_yacc+=	error.error
+FILEStest_yacc+=	error.output
+FILEStest_yacc+=	error.tab.c
+FILEStest_yacc+=	error.tab.h
+FILEStest_yacc+=	grammar.dot
+FILEStest_yacc+=	grammar.error
+FILEStest_yacc+=	grammar.output
+FILEStest_yacc+=	grammar.tab.c
+FILEStest_yacc+=	grammar.tab.h
+FILEStest_yacc+=	help.error
+FILEStest_yacc+=	help.output
+FILEStest_yacc+=	no_b_opt.error
+FILEStest_yacc+=	no_b_opt.output
+FILEStest_yacc+=	no_b_opt1.error
+FILEStest_yacc+=	no_b_opt1.output
+FILEStest_yacc+=	no_code_c.error
+FILEStest_yacc+=	no_code_c.output
+FILEStest_yacc+=	no_defines.error
+FILEStest_yacc+=	no_defines.output
+FILEStest_yacc+=	no_graph.error
+FILEStest_yacc+=	no_graph.output
+FILEStest_yacc+=	no_include.error
+FILEStest_yacc+=	no_include.output
+FILEStest_yacc+=	no_opts.error
+FILEStest_yacc+=	no_opts.output
+FILEStest_yacc+=	no_output.error
+FILEStest_yacc+=	no_output.output
+FILEStest_yacc+=	no_output1.error
+FILEStest_yacc+=	no_output1.output
+FILEStest_yacc+=	no_output2.error
+FILEStest_yacc+=	no_output2.output
+FILEStest_yacc+=	no_p_opt.error
+FILEStest_yacc+=	no_p_opt.output
+FILEStest_yacc+=	no_p_opt1.error
+FILEStest_yacc+=	no_p_opt1.output
+FILEStest_yacc+=	no_verbose.error
+FILEStest_yacc+=	no_verbose.output
+FILEStest_yacc+=	nostdin.error
+FILEStest_yacc+=	nostdin.output
+FILEStest_yacc+=	ok_syntax1.error
+FILEStest_yacc+=	ok_syntax1.output
+FILEStest_yacc+=	ok_syntax1.tab.c
+FILEStest_yacc+=	ok_syntax1.tab.h
+FILEStest_yacc+=	pure_calc.error
+FILEStest_yacc+=	pure_calc.output
+FILEStest_yacc+=	pure_calc.tab.c
+FILEStest_yacc+=	pure_calc.tab.h
+FILEStest_yacc+=	pure_error.error
+FILEStest_yacc+=	pure_error.output
+FILEStest_yacc+=	pure_error.tab.c
+FILEStest_yacc+=	pure_error.tab.h
+FILEStest_yacc+=	quote_calc-s.error
+FILEStest_yacc+=	quote_calc-s.output
+FILEStest_yacc+=	quote_calc-s.tab.c
+FILEStest_yacc+=	quote_calc-s.tab.h
+FILEStest_yacc+=	quote_calc.error
+FILEStest_yacc+=	quote_calc.output
+FILEStest_yacc+=	quote_calc.tab.c
+FILEStest_yacc+=	quote_calc.tab.h
+FILEStest_yacc+=	quote_calc2-s.error
+FILEStest_yacc+=	quote_calc2-s.output
+FILEStest_yacc+=	quote_calc2-s.tab.c
+FILEStest_yacc+=	quote_calc2-s.tab.h
+FILEStest_yacc+=	quote_calc2.error
+FILEStest_yacc+=	quote_calc2.output
+FILEStest_yacc+=	quote_calc2.tab.c
+FILEStest_yacc+=	quote_calc2.tab.h
+FILEStest_yacc+=	quote_calc3-s.error
+FILEStest_yacc+=	quote_calc3-s.output
+FILEStest_yacc+=	quote_calc3-s.tab.c
+FILEStest_yacc+=	quote_calc3-s.tab.h
+FILEStest_yacc+=	quote_calc3.error
+FILEStest_yacc+=	quote_calc3.output
+FILEStest_yacc+=	quote_calc3.tab.c
+FILEStest_yacc+=	quote_calc3.tab.h
+FILEStest_yacc+=	quote_calc4-s.error
+FILEStest_yacc+=	quote_calc4-s.output
+FILEStest_yacc+=	quote_calc4-s.tab.c
+FILEStest_yacc+=	quote_calc4-s.tab.h
+FILEStest_yacc+=	quote_calc4.error
+FILEStest_yacc+=	quote_calc4.output
+FILEStest_yacc+=	quote_calc4.tab.c
+FILEStest_yacc+=	quote_calc4.tab.h
+FILEStest_yacc+=	rename_debug.c
+FILEStest_yacc+=	rename_debug.error
+FILEStest_yacc+=	rename_debug.h
+FILEStest_yacc+=	rename_debug.i
+FILEStest_yacc+=	rename_debug.output
+FILEStest_yacc+=	varsyntax_calc1.error
+FILEStest_yacc+=	varsyntax_calc1.output
+FILEStest_yacc+=	varsyntax_calc1.tab.c
+FILEStest_yacc+=	varsyntax_calc1.tab.h
 
 .include <bsd.test.mk>
diff --git a/usr.bin/yacc/tests/calc.y b/usr.bin/yacc/tests/calc.y
deleted file mode 100644
index c2e5a898c93d..000000000000
--- a/usr.bin/yacc/tests/calc.y
+++ /dev/null
@@ -1,106 +0,0 @@
-%{
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-extern int yylex(void);
-static void yyerror(const char *s);
-
-%}
-
-%start list
-
-%token DIGIT LETTER
-
-%left '|'
-%left '&'
-%left '+' '-'
-%left '*' '/' '%'
-%left UMINUS   /* supplies precedence for unary minus */
-
-%% /* beginning of rules section */
-
-list  :  /* empty */
-      |  list stat '\n'
-      |  list error '\n'
-            {  yyerrok ; }
-      ;
-
-stat  :  expr
-            {  printf("%d\n",$1);}
-      |  LETTER '=' expr
-            {  regs[$1] = $3; }
-      ;
-
-expr  :  '(' expr ')'
-            {  $$ = $2; }
-      |  expr '+' expr
-            {  $$ = $1 + $3; }
-      |  expr '-' expr
-            {  $$ = $1 - $3; }
-      |  expr '*' expr
-            {  $$ = $1 * $3; }
-      |  expr '/' expr
-            {  $$ = $1 / $3; }
-      |  expr '%' expr
-            {  $$ = $1 % $3; }
-      |  expr '&' expr
-            {  $$ = $1 & $3; }
-      |  expr '|' expr
-            {  $$ = $1 | $3; }
-      |  '-' expr %prec UMINUS
-            {  $$ = - $2; }
-      |  LETTER
-            {  $$ = regs[$1]; }
-      |  number
-      ;
-
-number:  DIGIT
-         {  $$ = $1; base = ($1==0) ? 8 : 10; }
-      |  number DIGIT
-         {  $$ = base * $1 + $2; }
-      ;
-
-%% /* start of programs */
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void)
-{
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
diff --git a/usr.bin/yacc/tests/calc1.y b/usr.bin/yacc/tests/calc1.y
deleted file mode 100644
index ec89736f47a5..000000000000
--- a/usr.bin/yacc/tests/calc1.y
+++ /dev/null
@@ -1,305 +0,0 @@
-%{
-
-/* http://dinosaur.compilertools.net/yacc/index.html */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <math.h>
-
-typedef struct interval
-{
-    double lo, hi;
-}
-INTERVAL;
-
-INTERVAL vmul(double, double, INTERVAL);
-INTERVAL vdiv(double, double, INTERVAL);
-
-extern int yylex(void);
-static void yyerror(const char *s);
-
-int dcheck(INTERVAL);
-
-double dreg[26];
-INTERVAL vreg[26];
-
-%}
-%expect 18
-
-%start line
-%union
-{
-	int ival;
-	double dval;
-	INTERVAL vval;
-}
-
-%token <ival> DREG VREG		/* indices into dreg, vreg arrays */
-%token <dval> CONST		/* floating point constant */
-
-%type <dval> dexp		/* expression */
-%type <vval> vexp		/* interval expression */
-
-	/* precedence information about the operators */
-
-%left '+' '-'
-%left '*' '/'
-%left UMINUS			/* precedence for unary minus */
-
-%%	/* beginning of rules section */
-
-lines   : /* empty */
-	| lines line
-	;
-
-line	: dexp '\n'
-	{
-		(void) printf("%15.8f\n", $1);
-	}
-	| vexp '\n'
-	{
-		(void) printf("(%15.8f, %15.8f)\n", $1.lo, $1.hi);
-	}
-	| DREG '=' dexp '\n'
-	{
-		dreg[$1] = $3;
-	}
-	| VREG '=' vexp '\n'
-	{
-		vreg[$1] = $3;
-	}
-	| error '\n'
-	{
-		yyerrok;
-	}
-	;
-
-dexp	: CONST
-	| DREG
-	{
-		$$ = dreg[$1];
-	}
-	| dexp '+' dexp
-	{
-		$$ = $1 + $3;
-	}
-	| dexp '-' dexp
-	{
-		$$ = $1 - $3;
-	}
-	| dexp '*' dexp
-	{
-		$$ = $1 * $3;
-	}
-	| dexp '/' dexp
-	{
-		$$ = $1 / $3;
-	}
-	| '-' dexp %prec UMINUS
-	{
-		$$ = -$2;
-	}
-	| '(' dexp ')'
-	{
-		$$ = $2;
-	}
-	;
-
-vexp	: dexp
-	{
-		$$.hi = $$.lo = $1;
-	}
-	| '(' dexp ',' dexp ')'
-	{
-		$$.lo = $2;
-		$$.hi = $4;
-		if ( $$.lo > $$.hi ) 
-		{
-			(void) printf("interval out of order\n");
-			YYERROR;
-		}
-	}
-	| VREG
-	{
-		$$ = vreg[$1];
-	}
-	| vexp '+' vexp
-	{
-		$$.hi = $1.hi + $3.hi;
-		$$.lo = $1.lo + $3.lo;
-	}
-	| dexp '+' vexp
-	{
-		$$.hi = $1 + $3.hi;
-		$$.lo = $1 + $3.lo;
-	}
-	| vexp '-' vexp
-	{
-		$$.hi = $1.hi - $3.lo;
-		$$.lo = $1.lo - $3.hi;
-	}
-	| dexp '-' vexp
-	{
-		$$.hi = $1 - $3.lo;
-		$$.lo = $1 - $3.hi;
-	}
-	| vexp '*' vexp
-	{
-		$$ = vmul( $1.lo, $1.hi, $3 );
-	}
-	| dexp '*' vexp
-	{
-		$$ = vmul ($1, $1, $3 );
-	}
-	| vexp '/' vexp
-	{
-		if (dcheck($3)) YYERROR;
-		$$ = vdiv ( $1.lo, $1.hi, $3 );
-	}
-	| dexp '/' vexp
-	{
-		if (dcheck ( $3 )) YYERROR;
-		$$ = vdiv ($1, $1, $3 );
-	}
-	| '-' vexp %prec UMINUS
-	{
-		$$.hi = -$2.lo;
-		$$.lo = -$2.hi;
-	}
-	| '(' vexp ')'
-	{
-		$$ = $2;
-	}
-	;
-
-%%	/* beginning of subroutines section */
-
-#define BSZ 50			/* buffer size for floating point numbers */
-
-	/* lexical analysis */
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void)
-{
-    int c;
-
-    while ((c = getchar()) == ' ')
-    {				/* skip over blanks */
-    }
-
-    if (isupper(c))
-    {
-	yylval.ival = c - 'A';
-	return (VREG);
-    }
-    if (islower(c))
-    {
-	yylval.ival = c - 'a';
-	return (DREG);
-    }
-
-    if (isdigit(c) || c == '.')
-    {
-	/* gobble up digits, points, exponents */
-	char buf[BSZ + 1], *cp = buf;
-	int dot = 0, expr = 0;
-
-	for (; (cp - buf) < BSZ; ++cp, c = getchar())
-	{
-
-	    *cp = c;
-	    if (isdigit(c))
-		continue;
-	    if (c == '.')
-	    {
-		if (dot++ || expr)
-		    return ('.');	/* will cause syntax error */
-		continue;
-	    }
-
-	    if (c == 'e')
-	    {
-		if (expr++)
-		    return ('e');	/*  will  cause  syntax  error  */
-		continue;
-	    }
-
-	    /*  end  of  number  */
-	    break;
-	}
-	*cp = '\0';
-
-	if ((cp - buf) >= BSZ)
-	    printf("constant  too  long:  truncated\n");
-	else
-	    ungetc(c, stdin);	/*  push  back  last  char  read  */
-	yylval.dval = atof(buf);
-	return (CONST);
-    }
-    return (c);
-}
-
-static INTERVAL
-hilo(double a, double b, double c, double d)
-{
-    /*  returns  the  smallest  interval  containing  a,  b,  c,  and  d  */
-    /*  used  by  *,  /  routines  */
-    INTERVAL v;
-
-    if (a > b)
-    {
-	v.hi = a;
-	v.lo = b;
-    }
-    else
-    {
-	v.hi = b;
-	v.lo = a;
-    }
-
-    if (c > d)
-    {
-	if (c > v.hi)
-	    v.hi = c;
-	if (d < v.lo)
-	    v.lo = d;
-    }
-    else
-    {
-	if (d > v.hi)
-	    v.hi = d;
-	if (c < v.lo)
-	    v.lo = c;
-    }
-    return (v);
-}
-
-INTERVAL
-vmul(double a, double b, INTERVAL v)
-{
-    return (hilo(a * v.hi, a * v.lo, b * v.hi, b * v.lo));
-}
-
-int
-dcheck(INTERVAL v)
-{
-    if (v.hi >= 0. && v.lo <= 0.)
-    {
-	printf("divisor  interval  contains  0.\n");
-	return (1);
-    }
-    return (0);
-}
-
-INTERVAL
-vdiv(double a, double b, INTERVAL v)
-{
-    return (hilo(a / v.hi, a / v.lo, b / v.hi, b / v.lo));
-}
diff --git a/usr.bin/yacc/tests/calc2.y b/usr.bin/yacc/tests/calc2.y
deleted file mode 100644
index e742ff34c215..000000000000
--- a/usr.bin/yacc/tests/calc2.y
+++ /dev/null
@@ -1,120 +0,0 @@
-%parse-param { int regs[26] }
-%parse-param { int *base }
-
-%lex-param { int *base }
-
-%{
-# include <stdio.h>
-# include <ctype.h>
-
-#ifdef YYBISON
-#define YYLEX_PARAM base
-#define YYLEX_DECL() yylex(int *YYLEX_PARAM)
-#define YYERROR_DECL() yyerror(int regs[26], int *base, const char *s)
-int YYLEX_DECL();
-static void YYERROR_DECL();
-#endif
-
-%}
-
-%start list
-
-%token DIGIT LETTER
-
-%left '|'
-%left '&'
-%left '+' '-'
-%left '*' '/' '%'
-%left UMINUS   /* supplies precedence for unary minus */
-
-%% /* beginning of rules section */
-
-list  :  /* empty */
-      |  list stat '\n'
-      |  list error '\n'
-            {  yyerrok ; }
-      ;
-
-stat  :  expr
-            {  printf("%d\n",$1);}
-      |  LETTER '=' expr
-            {  regs[$1] = $3; }
-      ;
-
-expr  :  '(' expr ')'
-            {  $$ = $2; }
-      |  expr '+' expr
-            {  $$ = $1 + $3; }
-      |  expr '-' expr
-            {  $$ = $1 - $3; }
-      |  expr '*' expr
-            {  $$ = $1 * $3; }
-      |  expr '/' expr
-            {  $$ = $1 / $3; }
-      |  expr '%' expr
-            {  $$ = $1 % $3; }
-      |  expr '&' expr
-            {  $$ = $1 & $3; }
-      |  expr '|' expr
-            {  $$ = $1 | $3; }
-      |  '-' expr %prec UMINUS
-            {  $$ = - $2; }
-      |  LETTER
-            {  $$ = regs[$1]; }
-      |  number
-      ;
-
-number:  DIGIT
-         {  $$ = $1; (*base) = ($1==0) ? 8 : 10; }
-      |  number DIGIT
-         {  $$ = (*base) * $1 + $2; }
-      ;
-
-%% /* start of programs */
-
-#ifdef YYBYACC
-extern int YYLEX_DECL();
-#endif
-
-int
-main (void)
-{
-    int regs[26];
-    int base = 10;
-
-    while(!feof(stdin)) {
-	yyparse(regs, &base);
-    }
-    return 0;
-}
-
-static void
-YYERROR_DECL()
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-YYLEX_DECL()
-{
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	yylval = (c - '0') % (*base);
-	return ( DIGIT );
-    }
-    return( c );
-}
diff --git a/usr.bin/yacc/tests/calc3.y b/usr.bin/yacc/tests/calc3.y
deleted file mode 100644
index 252faa961f4b..000000000000
--- a/usr.bin/yacc/tests/calc3.y
+++ /dev/null
@@ -1,123 +0,0 @@
-%pure-parser
-
-%parse-param { int regs[26] }
-%parse-param { int *base }
-
-%lex-param { int *base }
-
-%{
-# include <stdio.h>
-# include <ctype.h>
-
-#ifdef YYBISON
-#define YYSTYPE int
-#define YYLEX_PARAM base
-#define YYLEX_DECL() yylex(YYSTYPE *yylval, int *YYLEX_PARAM)
-#define YYERROR_DECL() yyerror(int regs[26], int *base, const char *s)
-int YYLEX_DECL();
-static void YYERROR_DECL();
-#endif
-
-%}
-
-%start list
-
-%token DIGIT LETTER
-
-%left '|'
-%left '&'
-%left '+' '-'
-%left '*' '/' '%'
-%left UMINUS   /* supplies precedence for unary minus */
-
-%% /* beginning of rules section */
-
-list  :  /* empty */
-      |  list stat '\n'
-      |  list error '\n'
-            {  yyerrok ; }
-      ;
-
-stat  :  expr
-            {  printf("%d\n",$1);}
-      |  LETTER '=' expr
-            {  regs[$1] = $3; }
-      ;
-
-expr  :  '(' expr ')'
-            {  $$ = $2; }
-      |  expr '+' expr
-            {  $$ = $1 + $3; }
-      |  expr '-' expr
-            {  $$ = $1 - $3; }
-      |  expr '*' expr
-            {  $$ = $1 * $3; }
-      |  expr '/' expr
-            {  $$ = $1 / $3; }
-      |  expr '%' expr
-            {  $$ = $1 % $3; }
-      |  expr '&' expr
-            {  $$ = $1 & $3; }
-      |  expr '|' expr
-            {  $$ = $1 | $3; }
-      |  '-' expr %prec UMINUS
-            {  $$ = - $2; }
-      |  LETTER
-            {  $$ = regs[$1]; }
-      |  number
-      ;
-
-number:  DIGIT
-         {  $$ = $1; (*base) = ($1==0) ? 8 : 10; }
-      |  number DIGIT
-         {  $$ = (*base) * $1 + $2; }
-      ;
-
-%% /* start of programs */
-
-#ifdef YYBYACC
-extern int YYLEX_DECL();
-#endif
-
-int
-main (void)
-{
-    int regs[26];
-    int base = 10;
-
-    while(!feof(stdin)) {
-	yyparse(regs, &base);
-    }
-    return 0;
-}
-
-static void
-YYERROR_DECL()
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-YYLEX_DECL()
-{
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	*yylval = (c - 'a');
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	*yylval = (c - '0') % (*base);
-	return ( DIGIT );
-    }
-    return( c );
-}
diff --git a/usr.bin/yacc/tests/code_calc.y b/usr.bin/yacc/tests/code_calc.y
deleted file mode 100644
index 0a99456e7f89..000000000000
--- a/usr.bin/yacc/tests/code_calc.y
+++ /dev/null
@@ -1,112 +0,0 @@
-%{
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-#ifdef YYBISON
-int yylex(void);
-static void yyerror(const char *s);
-#endif
-
-%}
-
-%start list
-
-%token DIGIT LETTER
-
-%left '|'
-%left '&'
-%left '+' '-'
-%left '*' '/' '%'
-%left UMINUS   /* supplies precedence for unary minus */
-
-%% /* beginning of rules section */
-
-list  :  /* empty */
-      |  list stat '\n'
-      |  list error '\n'
-            {  yyerrok ; }
-      ;
-
-stat  :  expr
-            {  printf("%d\n",$1);}
-      |  LETTER '=' expr
-            {  regs[$1] = $3; }
-      ;
-
-expr  :  '(' expr ')'
-            {  $$ = $2; }
-      |  expr '+' expr
-            {  $$ = $1 + $3; }
-      |  expr '-' expr
-            {  $$ = $1 - $3; }
-      |  expr '*' expr
-            {  $$ = $1 * $3; }
-      |  expr '/' expr
-            {  $$ = $1 / $3; }
-      |  expr '%' expr
-            {  $$ = $1 % $3; }
-      |  expr '&' expr
-            {  $$ = $1 & $3; }
-      |  expr '|' expr
-            {  $$ = $1 | $3; }
-      |  '-' expr %prec UMINUS
-            {  $$ = - $2; }
-      |  LETTER
-            {  $$ = regs[$1]; }
-      |  number
-      ;
-
-number:  DIGIT
-         {  $$ = $1; base = ($1==0) ? 8 : 10; }
-      |  number DIGIT
-         {  $$ = base * $1 + $2; }
-      ;
-
-%% /* start of programs */
-
-#ifdef YYBYACC
-extern int YYLEX_DECL();
-#endif
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void)
-{
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
diff --git a/usr.bin/yacc/tests/code_error.y b/usr.bin/yacc/tests/code_error.y
deleted file mode 100644
index bb771567606a..000000000000
--- a/usr.bin/yacc/tests/code_error.y
+++ /dev/null
@@ -1,36 +0,0 @@
-%{
-
-#ifdef YYBISON
-int yylex(void);
-static void yyerror(const char *);
-#endif
-
-%}
-%%
-S: error
-%%
-
-#include <stdio.h>
-
-#ifdef YYBYACC
-extern int YYLEX_DECL();
-#endif
-
-int
-main(void)
-{
-    printf("yyparse() = %d\n", yyparse());
-    return 0;
-}
-
-int
-yylex(void)
-{
-    return -1;
-}
-
-static void
-yyerror(const char* s)
-{
-    printf("%s\n", s);
-}
diff --git a/usr.bin/yacc/tests/error.y b/usr.bin/yacc/tests/error.y
deleted file mode 100644
index 673c68d68e92..000000000000
--- a/usr.bin/yacc/tests/error.y
+++ /dev/null
@@ -1,28 +0,0 @@
-%{
-int yylex(void);
-static void yyerror(const char *);
-%}
-%%
-S: error
-%%
-
-#include <stdio.h>
-
-int
-main(void)
-{
-    printf("yyparse() = %d\n", yyparse());
-    return 0;
-}
-
-int
-yylex(void)
-{
-    return -1;
-}
-
-static void
-yyerror(const char* s)
-{
-    printf("%s\n", s);
-}
diff --git a/usr.bin/yacc/tests/ftp.y b/usr.bin/yacc/tests/ftp.y
deleted file mode 100644
index 42c210bf4ef6..000000000000
--- a/usr.bin/yacc/tests/ftp.y
+++ /dev/null
@@ -1,1228 +0,0 @@
-/*
- * Copyright (c) 1985, 1988 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- *	@(#)ftpcmd.y	5.20.1.1 (Berkeley) 3/2/89
- */
-
-/*
- * Grammar for FTP commands.
- * See RFC 959.
- */
-
-%{
-
-/* sccsid[] = "@(#)ftpcmd.y	5.20.1.1 (Berkeley) 3/2/89"; */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
-#include <arpa/ftp.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <signal.h>
-#include <ctype.h>
-#include <pwd.h>
-#include <setjmp.h>
-#include <syslog.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <time.h>
-#include <assert.h>
-
-#ifdef YYBISON
-int yylex(void);
-static void yyerror(const char *);
-#endif
-
-extern	struct sockaddr_in data_dest;
-extern	int logged_in;
-extern	struct passwd *pw;
-extern	int guest;
-extern	int logging;
-extern	int type;
-extern	int form;
-extern	int debug;
-extern	int timeout;
-extern	int maxtimeout;
-extern  int pdata;
-extern	char hostname[], remotehost[];
-extern	char proctitle[];
-extern	char *globerr;
-extern	int usedefault;
-extern  int transflag;
-extern  char tmpline[];
-
-extern char **glob(char *);
-extern char *renamefrom(char *);
-extern void cwd(const char *);
-
-extern void dologout(int);
-extern void fatal(const char *);
-extern void makedir(const char *);
-extern void nack(const char *);
-extern void pass(const char *);
-extern void passive(void);
-extern void pwd(void);
-extern void removedir(char *);
-extern void renamecmd(char *, char *);
-extern void retrieve(const char *, const char *);
-extern void send_file_list(const char *);
-extern void statcmd(void);
-extern void statfilecmd(const char *);
-extern void store(char *, const char *, int);
-extern void user(const char *);
-
-extern void perror_reply(int, const char *, ...);
-extern void reply(int, const char *, ...);
-extern void lreply(int, const char *, ...);
-
-static	int cmd_type;
-static	int cmd_form;
-static	int cmd_bytesz;
-char	cbuf[512];
-char	*fromname;
-
-struct tab {
-	const char *name;
-	short	token;
-	short	state;
-	short	implemented;	/* 1 if command is implemented */
-	const char *help;
-};
-
-static char * copy(const char *);
-
-#ifdef YYBISON
-static void sizecmd(char *filename);
-static void help(struct tab *ctab, char *s);
-struct tab cmdtab[];
-struct tab sitetab[];
-#endif
-
-static void
-yyerror(const char *msg)
-{
-	perror(msg);
-}
-%}
-
-%token
-	A	B	C	E	F	I
-	L	N	P	R	S	T
-
-	SP	CRLF	COMMA	STRING	NUMBER
-
-	USER	PASS	ACCT	REIN	QUIT	PORT
-	PASV	TYPE	STRU	MODE	RETR	STOR
-	APPE	MLFL	MAIL	MSND	MSOM	MSAM
-	MRSQ	MRCP	ALLO	REST	RNFR	RNTO
-	ABOR	DELE	CWD	LIST	NLST	SITE
-	STAT	HELP	NOOP	MKD	RMD	PWD
-	CDUP	STOU	SMNT	SYST	SIZE	MDTM
-
-	UMASK	IDLE	CHMOD
-
-	LEXERR
-
-%start	cmd_list
-
-%%
-
-cmd_list:	/* empty */
-	|	cmd_list cmd
-		{
-			fromname = (char *) 0;
-		}
-	|	cmd_list rcmd
-	;
-
-cmd:		USER SP username CRLF
-		{
-			user((char *) $3);
-			free((char *) $3);
-		}
-	|	PASS SP password CRLF
-		{
-			pass((char *) $3);
-			free((char *) $3);
-		}
-	|	PORT SP host_port CRLF
-		{
-			usedefault = 0;
-			if (pdata >= 0) {
-				(void) close(pdata);
-				pdata = -1;
-			}
-			reply(200, "PORT command successful.");
-		}
-	|	PASV CRLF
-		{
-			passive();
-		}
-	|	TYPE SP type_code CRLF
-		{
-			switch (cmd_type) {
-
-			case TYPE_A:
-				if (cmd_form == FORM_N) {
-					reply(200, "Type set to A.");
-					type = cmd_type;
-					form = cmd_form;
-				} else
-					reply(504, "Form must be N.");
-				break;
-
-			case TYPE_E:
-				reply(504, "Type E not implemented.");
-				break;
-
-			case TYPE_I:
-				reply(200, "Type set to I.");
-				type = cmd_type;
-				break;
-
-			case TYPE_L:
-#if NBBY == 8
-				if (cmd_bytesz == 8) {
-					reply(200,
-					    "Type set to L (byte size 8).");
-					type = cmd_type;
-				} else
-					reply(504, "Byte size must be 8.");
-#else /* NBBY == 8 */
-				UNIMPLEMENTED for NBBY != 8
-#endif /* NBBY == 8 */
-			}
-		}
-	|	STRU SP struct_code CRLF
-		{
-			switch ($3) {
-
-			case STRU_F:
-				reply(200, "STRU F ok.");
-				break;
-
-			default:
-				reply(504, "Unimplemented STRU type.");
-			}
-		}
-	|	MODE SP mode_code CRLF
-		{
-			switch ($3) {
-
-			case MODE_S:
-				reply(200, "MODE S ok.");
-				break;
-
-			default:
-				reply(502, "Unimplemented MODE type.");
-			}
-		}
-	|	ALLO SP NUMBER CRLF
-		{
-			reply(202, "ALLO command ignored.");
-		}
-	|	ALLO SP NUMBER SP R SP NUMBER CRLF
-		{
-			reply(202, "ALLO command ignored.");
-		}
-	|	RETR check_login SP pathname CRLF
-		{
-			if ($2 && $4 != 0)
-				retrieve((char *) 0, (char *) $4);
-			if ($4 != 0)
-				free((char *) $4);
-		}
-	|	STOR check_login SP pathname CRLF
-		{
-			if ($2 && $4 != 0)
-				store((char *) $4, "w", 0);
-			if ($4 != 0)
-				free((char *) $4);
-		}
-	|	APPE check_login SP pathname CRLF
-		{
-			if ($2 && $4 != 0)
-				store((char *) $4, "a", 0);
-			if ($4 != 0)
-				free((char *) $4);
-		}
-	|	NLST check_login CRLF
-		{
-			if ($2)
-				send_file_list(".");
-		}
-	|	NLST check_login SP STRING CRLF
-		{
-			if ($2 && $4 != 0)
-				send_file_list((char *) $4);
-			if ($4 != 0)
-				free((char *) $4);
-		}
-	|	LIST check_login CRLF
-		{
-			if ($2)
-				retrieve("/bin/ls -lgA", "");
-		}
-	|	LIST check_login SP pathname CRLF
-		{
-			if ($2 && $4 != 0)
-				retrieve("/bin/ls -lgA %s", (char *) $4);
-			if ($4 != 0)
-				free((char *) $4);
-		}
-	|	STAT check_login SP pathname CRLF
-		{
-			if ($2 && $4 != 0)
-				statfilecmd((char *) $4);
-			if ($4 != 0)
-				free((char *) $4);
-		}
-	|	STAT CRLF
-		{
-			statcmd();
-		}
-	|	DELE check_login SP pathname CRLF
-		{
-			if ($2 && $4 != 0)
-				remove((char *) $4);
-			if ($4 != 0)
-				free((char *) $4);
-		}
-	|	RNTO SP pathname CRLF
-		{
-			if (fromname) {
-				renamecmd(fromname, (char *) $3);
-				free(fromname);
-				fromname = (char *) 0;
-			} else {
-				reply(503, "Bad sequence of commands.");
-			}
-			free((char *) $3);
-		}
-	|	ABOR CRLF
-		{
-			reply(225, "ABOR command successful.");
-		}
-	|	CWD check_login CRLF
-		{
-			if ($2)
-				cwd(pw->pw_dir);
-		}
-	|	CWD check_login SP pathname CRLF
-		{
-			if ($2 && $4 != 0)
-				cwd((char *) $4);
-			if ($4 != 0)
-				free((char *) $4);
-		}
-	|	HELP CRLF
-		{
-			help(cmdtab, (char *) 0);
-		}
-	|	HELP SP STRING CRLF
-		{
-			register char *cp = (char *)$3;
-
-			if (strncasecmp(cp, "SITE", 4) == 0) {
-				cp = (char *)$3 + 4;
-				if (*cp == ' ')
-					cp++;
-				if (*cp)
-					help(sitetab, cp);
-				else
-					help(sitetab, (char *) 0);
-			} else
-				help(cmdtab, (char *) $3);
-		}
-	|	NOOP CRLF
-		{
-			reply(200, "NOOP command successful.");
-		}
-	|	MKD check_login SP pathname CRLF
-		{
-			if ($2 && $4 != 0)
-				makedir((char *) $4);
-			if ($4 != 0)
-				free((char *) $4);
-		}
-	|	RMD check_login SP pathname CRLF
-		{
-			if ($2 && $4 != 0)
-				removedir((char *) $4);
-			if ($4 != 0)
-				free((char *) $4);
-		}
-	|	PWD check_login CRLF
-		{
-			if ($2)
-				pwd();
-		}
-	|	CDUP check_login CRLF
-		{
-			if ($2)
-				cwd("..");
-		}
-	|	SITE SP HELP CRLF
-		{
-			help(sitetab, (char *) 0);
-		}
-	|	SITE SP HELP SP STRING CRLF
-		{
-			help(sitetab, (char *) $5);
-		}
-	|	SITE SP UMASK check_login CRLF
-		{
-			int oldmask;
-
-			if ($4) {
-				oldmask = umask(0);
-				(void) umask(oldmask);
-				reply(200, "Current UMASK is %03o", oldmask);
-			}
-		}
-	|	SITE SP UMASK check_login SP octal_number CRLF
-		{
-			int oldmask;
-
-			if ($4) {
-				if (($6 == -1) || ($6 > 0777)) {
-					reply(501, "Bad UMASK value");
-				} else {
-					oldmask = umask($6);
-					reply(200,
-					    "UMASK set to %03o (was %03o)",
-					    $6, oldmask);
-				}
-			}
-		}
-	|	SITE SP CHMOD check_login SP octal_number SP pathname CRLF
-		{
-			if ($4 && ($8 != 0)) {
-				if ($6 > 0777)
-					reply(501,
-				"CHMOD: Mode value must be between 0 and 0777");
-				else if (chmod((char *) $8, $6) < 0)
-					perror_reply(550, (char *) $8);
-				else
-					reply(200, "CHMOD command successful.");
-			}
-			if ($8 != 0)
-				free((char *) $8);
-		}
-	|	SITE SP IDLE CRLF
-		{
-			reply(200,
-			    "Current IDLE time limit is %d seconds; max %d",
-				timeout, maxtimeout);
-		}
-	|	SITE SP IDLE SP NUMBER CRLF
-		{
-			if ($5 < 30 || $5 > maxtimeout) {
-				reply(501,
-			"Maximum IDLE time must be between 30 and %d seconds",
-				    maxtimeout);
-			} else {
-				timeout = $5;
-				(void) alarm((unsigned) timeout);
-				reply(200,
-				    "Maximum IDLE time set to %d seconds",
-				    timeout);
-			}
-		}
-	|	STOU check_login SP pathname CRLF
-		{
-			if ($2 && $4 != 0)
-				store((char *) $4, "w", 1);
-			if ($4 != 0)
-				free((char *) $4);
-		}
-	|	SYST CRLF
-		{
-#ifdef unix
-#ifdef BSD
-			reply(215, "UNIX Type: L%d Version: BSD-%d",
-				NBBY, BSD);
-#else /* BSD */
-			reply(215, "UNIX Type: L%d", NBBY);
-#endif /* BSD */
-#else /* unix */
-			reply(215, "UNKNOWN Type: L%d", NBBY);
-#endif /* unix */
-		}
-
-		/*
-		 * SIZE is not in RFC959, but Postel has blessed it and
-		 * it will be in the updated RFC.
-		 *
-		 * Return size of file in a format suitable for
-		 * using with RESTART (we just count bytes).
-		 */
-	|	SIZE check_login SP pathname CRLF
-		{
-			if ($2 && $4 != 0)
-				sizecmd((char *) $4);
-			if ($4 != 0)
-				free((char *) $4);
-		}
-
-		/*
-		 * MDTM is not in RFC959, but Postel has blessed it and
-		 * it will be in the updated RFC.
-		 *
-		 * Return modification time of file as an ISO 3307
-		 * style time. E.g. YYYYMMDDHHMMSS or YYYYMMDDHHMMSS.xxx
-		 * where xxx is the fractional second (of any precision,
-		 * not necessarily 3 digits)
-		 */
-	|	MDTM check_login SP pathname CRLF
-		{
-			if ($2 && $4 != 0) {
-				struct stat stbuf;
-				if (stat((char *) $4, &stbuf) < 0)
-					perror_reply(550, "%s", (char *) $4);
-				else if ((stbuf.st_mode&S_IFMT) != S_IFREG) {
-					reply(550, "%s: not a plain file.",
-						(char *) $4);
-				} else {
-					register struct tm *t;
-					t = gmtime(&stbuf.st_mtime);
-					reply(213,
-					    "%04d%02d%02d%02d%02d%02d",
-					    1900 + t->tm_year,
-					    t->tm_mon+1, t->tm_mday,
-					    t->tm_hour, t->tm_min, t->tm_sec);
-				}
-			}
-			if ($4 != 0)
-				free((char *) $4);
-		}
-	|	QUIT CRLF
-		{
-			reply(221, "Goodbye.");
-			dologout(0);
-		}
-	|	error CRLF
-		{
-			yyerrok;
-		}
-	;
-rcmd:		RNFR check_login SP pathname CRLF
-		{
-			if ($2 && $4) {
-				fromname = renamefrom((char *) $4);
-				if (fromname == (char *) 0 && $4) {
-					free((char *) $4);
-				}
-			}
-		}
-	;
-
-username:	STRING
-	;
-
-password:	/* empty */
-		{
-			*(const char **)(&($$)) = "";
-		}
-	|	STRING
-	;
-
-byte_size:	NUMBER
-	;
-
-host_port:	NUMBER COMMA NUMBER COMMA NUMBER COMMA NUMBER COMMA
-		NUMBER COMMA NUMBER
-		{
-			register char *a, *p;
-
-			a = (char *)&data_dest.sin_addr;
-			a[0] = $1; a[1] = $3; a[2] = $5; a[3] = $7;
-			p = (char *)&data_dest.sin_port;
-			p[0] = $9; p[1] = $11;
-			data_dest.sin_family = AF_INET;
-		}
-	;
-
-form_code:	N
-	{
-		$$ = FORM_N;
-	}
-	|	T
-	{
-		$$ = FORM_T;
-	}
-	|	C
-	{
-		$$ = FORM_C;
-	}
-	;
-
-type_code:	A
-	{
-		cmd_type = TYPE_A;
-		cmd_form = FORM_N;
-	}
-	|	A SP form_code
-	{
-		cmd_type = TYPE_A;
-		cmd_form = $3;
-	}
-	|	E
-	{
-		cmd_type = TYPE_E;
-		cmd_form = FORM_N;
-	}
-	|	E SP form_code
-	{
-		cmd_type = TYPE_E;
-		cmd_form = $3;
-	}
-	|	I
-	{
-		cmd_type = TYPE_I;
-	}
-	|	L
-	{
-		cmd_type = TYPE_L;
-		cmd_bytesz = NBBY;
-	}
-	|	L SP byte_size
-	{
-		cmd_type = TYPE_L;
-		cmd_bytesz = $3;
-	}
-	/* this is for a bug in the BBN ftp */
-	|	L byte_size
-	{
-		cmd_type = TYPE_L;
-		cmd_bytesz = $2;
-	}
-	;
-
-struct_code:	F
-	{
-		$$ = STRU_F;
-	}
-	|	R
-	{
-		$$ = STRU_R;
-	}
-	|	P
-	{
-		$$ = STRU_P;
-	}
-	;
-
-mode_code:	S
-	{
-		$$ = MODE_S;
-	}
-	|	B
-	{
-		$$ = MODE_B;
-	}
-	|	C
-	{
-		$$ = MODE_C;
-	}
-	;
-
-pathname:	pathstring
-	{
-		/*
-		 * Problem: this production is used for all pathname
-		 * processing, but only gives a 550 error reply.
-		 * This is a valid reply in some cases but not in others.
-		 */
-		if (logged_in && $1 && strncmp((char *) $1, "~", 1) == 0) {
-			*(char **)&($$) = *glob((char *) $1);
-			if (globerr != 0) {
-				reply(550, globerr);
-				$$ = 0;
-			}
-			free((char *) $1);
-		} else
-			$$ = $1;
-	}
-	;
-
-pathstring:	STRING
-	;
-
-octal_number:	NUMBER
-	{
-		register int ret, dec, multby, digit;
-
-		/*
-		 * Convert a number that was read as decimal number
-		 * to what it would be if it had been read as octal.
-		 */
-		dec = $1;
-		multby = 1;
-		ret = 0;
-		while (dec) {
-			digit = dec%10;
-			if (digit > 7) {
-				ret = -1;
-				break;
-			}
-			ret += digit * multby;
-			multby *= 8;
-			dec /= 10;
-		}
-		$$ = ret;
-	}
-	;
-
-check_login:	/* empty */
-	{
-		if (logged_in)
-			$$ = 1;
-		else {
-			reply(530, "Please login with USER and PASS.");
-			$$ = 0;
-		}
-	}
-	;
-
-%%
-
-#ifdef YYBYACC
-extern int YYLEX_DECL();
-#endif
-
-extern jmp_buf errcatch;
-
-static void upper(char *);
-
-#define	CMD	0	/* beginning of command */
-#define	ARGS	1	/* expect miscellaneous arguments */
-#define	STR1	2	/* expect SP followed by STRING */
-#define	STR2	3	/* expect STRING */
-#define	OSTR	4	/* optional SP then STRING */
-#define	ZSTR1	5	/* SP then optional STRING */
-#define	ZSTR2	6	/* optional STRING after SP */
-#define	SITECMD	7	/* SITE command */
-#define	NSTR	8	/* Number followed by a string */
-
-struct tab cmdtab[] = {		/* In order defined in RFC 765 */
-	{ "USER", USER, STR1, 1,	"<sp> username" },
-	{ "PASS", PASS, ZSTR1, 1,	"<sp> password" },
-	{ "ACCT", ACCT, STR1, 0,	"(specify account)" },
-	{ "SMNT", SMNT, ARGS, 0,	"(structure mount)" },
-	{ "REIN", REIN, ARGS, 0,	"(reinitialize server state)" },
-	{ "QUIT", QUIT, ARGS, 1,	"(terminate service)", },
-	{ "PORT", PORT, ARGS, 1,	"<sp> b0, b1, b2, b3, b4" },
-	{ "PASV", PASV, ARGS, 1,	"(set server in passive mode)" },
-	{ "TYPE", TYPE, ARGS, 1,	"<sp> [ A | E | I | L ]" },
-	{ "STRU", STRU, ARGS, 1,	"(specify file structure)" },
-	{ "MODE", MODE, ARGS, 1,	"(specify transfer mode)" },
-	{ "RETR", RETR, STR1, 1,	"<sp> file-name" },
-	{ "STOR", STOR, STR1, 1,	"<sp> file-name" },
-	{ "APPE", APPE, STR1, 1,	"<sp> file-name" },
-	{ "MLFL", MLFL, OSTR, 0,	"(mail file)" },
-	{ "MAIL", MAIL, OSTR, 0,	"(mail to user)" },
-	{ "MSND", MSND, OSTR, 0,	"(mail send to terminal)" },
-	{ "MSOM", MSOM, OSTR, 0,	"(mail send to terminal or mailbox)" },
-	{ "MSAM", MSAM, OSTR, 0,	"(mail send to terminal and mailbox)" },
-	{ "MRSQ", MRSQ, OSTR, 0,	"(mail recipient scheme question)" },
-	{ "MRCP", MRCP, STR1, 0,	"(mail recipient)" },
-	{ "ALLO", ALLO, ARGS, 1,	"allocate storage (vacuously)" },
-	{ "REST", REST, ARGS, 0,	"(restart command)" },
-	{ "RNFR", RNFR, STR1, 1,	"<sp> file-name" },
-	{ "RNTO", RNTO, STR1, 1,	"<sp> file-name" },
-	{ "ABOR", ABOR, ARGS, 1,	"(abort operation)" },
-	{ "DELE", DELE, STR1, 1,	"<sp> file-name" },
-	{ "CWD",  CWD,  OSTR, 1,	"[ <sp> directory-name ]" },
-	{ "XCWD", CWD,	OSTR, 1,	"[ <sp> directory-name ]" },
-	{ "LIST", LIST, OSTR, 1,	"[ <sp> path-name ]" },
-	{ "NLST", NLST, OSTR, 1,	"[ <sp> path-name ]" },
-	{ "SITE", SITE, SITECMD, 1,	"site-cmd [ <sp> arguments ]" },
-	{ "SYST", SYST, ARGS, 1,	"(get type of operating system)" },
-	{ "STAT", STAT, OSTR, 1,	"[ <sp> path-name ]" },
-	{ "HELP", HELP, OSTR, 1,	"[ <sp> <string> ]" },
-	{ "NOOP", NOOP, ARGS, 1,	"" },
-	{ "MKD",  MKD,  STR1, 1,	"<sp> path-name" },
-	{ "XMKD", MKD,  STR1, 1,	"<sp> path-name" },
-	{ "RMD",  RMD,  STR1, 1,	"<sp> path-name" },
-	{ "XRMD", RMD,  STR1, 1,	"<sp> path-name" },
-	{ "PWD",  PWD,  ARGS, 1,	"(return current directory)" },
-	{ "XPWD", PWD,  ARGS, 1,	"(return current directory)" },
-	{ "CDUP", CDUP, ARGS, 1,	"(change to parent directory)" },
-	{ "XCUP", CDUP, ARGS, 1,	"(change to parent directory)" },
-	{ "STOU", STOU, STR1, 1,	"<sp> file-name" },
-	{ "SIZE", SIZE, OSTR, 1,	"<sp> path-name" },
-	{ "MDTM", MDTM, OSTR, 1,	"<sp> path-name" },
-	{ 0,   0,    0,    0,	0 }
-};
-
-struct tab sitetab[] = {
-	{ "UMASK", UMASK, ARGS, 1,	"[ <sp> umask ]" },
-	{ "IDLE", IDLE, ARGS, 1,	"[ <sp> maximum-idle-time ]" },
-	{ "CHMOD", CHMOD, NSTR, 1,	"<sp> mode <sp> file-name" },
-	{ "HELP", HELP, OSTR, 1,	"[ <sp> <string> ]" },
-	{ 0,   0,    0,    0,	0 }
-};
-
-static struct tab *
-lookup(struct tab *p, char *cmd)
-{
-
-	for (; p->name != 0; p++)
-		if (strcmp(cmd, p->name) == 0)
-			return (p);
-	return (0);
-}
-
-#include <arpa/telnet.h>
-
-/*
- * get_line - a hacked up version of fgets to ignore TELNET escape codes.
- */
-static char *
-get_line(char *s, int n, FILE *iop)
-{
-	register int c;
-	register char *cs;
-
-	cs = s;
-/* tmpline may contain saved command from urgent mode interruption */
-	for (c = 0; tmpline[c] != '\0' && --n > 0; ++c) {
-		*cs++ = tmpline[c];
-		if (tmpline[c] == '\n') {
-			*cs = '\0';
-			if (debug)
-				syslog(LOG_DEBUG, "command: %s", s);
-			tmpline[0] = '\0';
-			return(s);
-		}
-		if (c == 0)
-			tmpline[0] = '\0';
-	}
-	while ((c = getc(iop)) != EOF) {
-		c &= 0377;
-		if (c == IAC) {
-		    if ((c = getc(iop)) != EOF) {
-			c &= 0377;
-			switch (c) {
-			case WILL:
-			case WONT:
-				c = getc(iop);
-				printf("%c%c%c", IAC, DONT, 0377&c);
-				(void) fflush(stdout);
-				continue;
-			case DO:
-			case DONT:
-				c = getc(iop);
-				printf("%c%c%c", IAC, WONT, 0377&c);
-				(void) fflush(stdout);
-				continue;
-			case IAC:
-				break;
-			default:
-				continue;	/* ignore command */
-			}
-		    }
-		}
-		*cs++ = c;
-		if (--n <= 0 || c == '\n')
-			break;
-	}
-	if (c == EOF && cs == s)
-		return (0);
-	*cs = '\0';
-	if (debug)
-		syslog(LOG_DEBUG, "command: %s", s);
-	return (s);
-}
-
-static void
-toolong(int sig)
-{
-	time_t now;
-
-	(void) sig;
-	reply(421,
-	  "Timeout (%d seconds): closing control connection.", timeout);
-	(void) time(&now);
-	if (logging) {
-		syslog(LOG_INFO,
-			"User %s timed out after %d seconds at %s",
-			(pw ? pw -> pw_name : "unknown"), timeout, ctime(&now));
-	}
-	dologout(1);
-}
-
-int
-yylex(void)
-{
-	static int cpos, state;
-	register char *cp, *cp2;
-	register struct tab *p;
-	int n;
-	char c;
-
-	for (;;) {
-		switch (state) {
-
-		case CMD:
-			(void) signal(SIGALRM, toolong);
-			(void) alarm((unsigned) timeout);
-			if (get_line(cbuf, sizeof(cbuf)-1, stdin) == 0) {
-				reply(221, "You could at least say goodbye.");
-				dologout(0);
-			}
-			(void) alarm(0);
-#ifdef SETPROCTITLE
-			if (strncasecmp(cbuf, "PASS", 4) != 0)
-				setproctitle("%s: %s", proctitle, cbuf);
-#endif /* SETPROCTITLE */
-			if ((cp = strchr(cbuf, '\r'))) {
-				*cp++ = '\n';
-				*cp = '\0';
-			}
-			if ((cp = strpbrk(cbuf, " \n")))
-				cpos = cp - cbuf;
-			if (cpos == 0)
-				cpos = 4;
-			c = cbuf[cpos];
-			cbuf[cpos] = '\0';
-			upper(cbuf);
-			p = lookup(cmdtab, cbuf);
-			cbuf[cpos] = c;
-			if (p != 0) {
-				if (p->implemented == 0) {
-					nack(p->name);
-					longjmp(errcatch,0);
-					/* NOTREACHED */
-				}
-				state = p->state;
-				*(const char **)(&yylval) = p->name;
-				return (p->token);
-			}
-			break;
-
-		case SITECMD:
-			if (cbuf[cpos] == ' ') {
-				cpos++;
-				return (SP);
-			}
-			cp = &cbuf[cpos];
-			if ((cp2 = strpbrk(cp, " \n")))
-				cpos = cp2 - cbuf;
-			c = cbuf[cpos];
-			cbuf[cpos] = '\0';
-			upper(cp);
-			p = lookup(sitetab, cp);
-			cbuf[cpos] = c;
-			if (p != 0) {
-				if (p->implemented == 0) {
-					state = CMD;
-					nack(p->name);
-					longjmp(errcatch,0);
-					/* NOTREACHED */
-				}
-				state = p->state;
-				*(const char **)(&yylval) = p->name;
-				return (p->token);
-			}
-			state = CMD;
-			break;
-
-		case OSTR:
-			if (cbuf[cpos] == '\n') {
-				state = CMD;
-				return (CRLF);
-			}
-			/* FALLTHROUGH */
-
-		case STR1:
-		case ZSTR1:
-		dostr1:
-			if (cbuf[cpos] == ' ') {
-				cpos++;
-				if (state == OSTR)
-					state = STR2;
-				else
-					++state;
-				return (SP);
-			}
-			break;
-
-		case ZSTR2:
-			if (cbuf[cpos] == '\n') {
-				state = CMD;
-				return (CRLF);
-			}
-			/* FALLTHROUGH */
-
-		case STR2:
-			cp = &cbuf[cpos];
-			n = strlen(cp);
-			cpos += n - 1;
-			/*
-			 * Make sure the string is nonempty and \n terminated.
-			 */
-			if (n > 1 && cbuf[cpos] == '\n') {
-				cbuf[cpos] = '\0';
-				*(char **)&yylval = copy(cp);
-				cbuf[cpos] = '\n';
-				state = ARGS;
-				return (STRING);
-			}
-			break;
-
-		case NSTR:
-			if (cbuf[cpos] == ' ') {
-				cpos++;
-				return (SP);
-			}
-			if (isdigit(cbuf[cpos])) {
-				cp = &cbuf[cpos];
-				while (isdigit(cbuf[++cpos]))
-					;
-				c = cbuf[cpos];
-				cbuf[cpos] = '\0';
-				yylval = atoi(cp);
-				cbuf[cpos] = c;
-				state = STR1;
-				return (NUMBER);
-			}
-			state = STR1;
-			goto dostr1;
-
-		case ARGS:
-			if (isdigit(cbuf[cpos])) {
-				cp = &cbuf[cpos];
-				while (isdigit(cbuf[++cpos]))
-					;
-				c = cbuf[cpos];
-				cbuf[cpos] = '\0';
-				yylval = atoi(cp);
-				cbuf[cpos] = c;
-				return (NUMBER);
-			}
-			switch (cbuf[cpos++]) {
-
-			case '\n':
-				state = CMD;
-				return (CRLF);
-
-			case ' ':
-				return (SP);
-
-			case ',':
-				return (COMMA);
-
-			case 'A':
-			case 'a':
-				return (A);
-
-			case 'B':
-			case 'b':
-				return (B);
-
-			case 'C':
-			case 'c':
-				return (C);
-
-			case 'E':
-			case 'e':
-				return (E);
-
-			case 'F':
-			case 'f':
-				return (F);
-
-			case 'I':
-			case 'i':
-				return (I);
-
-			case 'L':
-			case 'l':
-				return (L);
-
-			case 'N':
-			case 'n':
-				return (N);
-
-			case 'P':
-			case 'p':
-				return (P);
-
-			case 'R':
-			case 'r':
-				return (R);
-
-			case 'S':
-			case 's':
-				return (S);
-
-			case 'T':
-			case 't':
-				return (T);
-
-			}
-			break;
-
-		default:
-			fatal("Unknown state in scanner.");
-		}
-		yyerror((char *) 0);
-		state = CMD;
-		longjmp(errcatch,0);
-	}
-}
-
-static void
-upper(char *s)
-{
-	while (*s != '\0') {
-		if (islower(*s))
-			*s = toupper(*s);
-		s++;
-	}
-}
-
-static char *
-copy(const char *s)
-{
-	char *p;
-
-	p = (char * )malloc(strlen(s) + 1);
-	if (p == 0)
-		fatal("Ran out of memory.");
-	else
-		(void) strcpy(p, s);
-	return (p);
-}
-
-static void
-help(struct tab *ctab, char *s)
-{
-	register struct tab *c;
-	register int width, NCMDS;
-	const char *help_type;
-
-	if (ctab == sitetab)
-		help_type = "SITE ";
-	else
-		help_type = "";
-	width = 0, NCMDS = 0;
-	for (c = ctab; c->name != 0; c++) {
-		int len = strlen(c->name);
-
-		if (len > width)
-			width = len;
-		NCMDS++;
-	}
-	width = (width + 8) &~ 7;
-	if (s == 0) {
-		register int i, j, w;
-		int columns, lines;
-
-		lreply(214, "The following %scommands are recognized %s.",
-		    help_type, "(* =>'s unimplemented)");
-		columns = 76 / width;
-		if (columns == 0)
-			columns = 1;
-		lines = (NCMDS + columns - 1) / columns;
-		for (i = 0; i < lines; i++) {
-			printf("   ");
-			for (j = 0; j < columns; j++) {
-				c = ctab + j * lines + i;
-				assert(c->name != 0);
-				printf("%s%c", c->name,
-					c->implemented ? ' ' : '*');
-				if (c + lines >= &ctab[NCMDS])
-					break;
-				w = strlen(c->name) + 1;
-				while (w < width) {
-					putchar(' ');
-					w++;
-				}
-			}
-			printf("\r\n");
-		}
-		(void) fflush(stdout);
-		reply(214, "Direct comments to ftp-bugs@%s.", hostname);
-		return;
-	}
-	upper(s);
-	c = lookup(ctab, s);
-	if (c == (struct tab *)0) {
-		reply(502, "Unknown command %s.", s);
-		return;
-	}
-	if (c->implemented)
-		reply(214, "Syntax: %s%s %s", help_type, c->name, c->help);
-	else
-		reply(214, "%s%-*s\t%s; unimplemented.", help_type, width,
-		    c->name, c->help);
-}
-
-static void
-sizecmd(char *filename)
-{
-	switch (type) {
-	case TYPE_L:
-	case TYPE_I: {
-		struct stat stbuf;
-		if (stat(filename, &stbuf) < 0 ||
-		    (stbuf.st_mode&S_IFMT) != S_IFREG)
-			reply(550, "%s: not a plain file.", filename);
-		else
-#ifdef HAVE_LONG_LONG
-			reply(213, "%llu", (long long) stbuf.st_size);
-#else
-			reply(213, "%lu", stbuf.st_size);
-#endif
-		break;}
-	case TYPE_A: {
-		FILE *fin;
-		register int c, count;
-		struct stat stbuf;
-		fin = fopen(filename, "r");
-		if (fin == 0) {
-			perror_reply(550, filename);
-			return;
-		}
-		if (fstat(fileno(fin), &stbuf) < 0 ||
-		    (stbuf.st_mode&S_IFMT) != S_IFREG) {
-			reply(550, "%s: not a plain file.", filename);
-			(void) fclose(fin);
-			return;
-		}
-
-		count = 0;
-		while((c=getc(fin)) != EOF) {
-			if (c == '\n')	/* will get expanded to \r\n */
-				count++;
-			count++;
-		}
-		(void) fclose(fin);
-
-		reply(213, "%ld", count);
-		break;}
-	default:
-		reply(504, "SIZE not implemented for Type %c.", "?AEIL"[type]);
-	}
-}
diff --git a/usr.bin/yacc/tests/grammar.y b/usr.bin/yacc/tests/grammar.y
deleted file mode 100644
index a2f188397c17..000000000000
--- a/usr.bin/yacc/tests/grammar.y
+++ /dev/null
@@ -1,1183 +0,0 @@
-/* $Id: grammar.y,v 1.5 2012/01/15 20:00:59 tom Exp $
- *
- * yacc grammar for C function prototype generator
- * This was derived from the grammar in Appendix A of
- * "The C Programming Language" by Kernighan and Ritchie.
- */
-%expect 1
-%{
-#ifdef YYBISON
-#include <stdlib.h>
-#define YYSTYPE_IS_DECLARED
-#define yyerror yaccError
-#endif
-
-#if defined(YYBISON) || !defined(YYBYACC)
-static void yyerror(const char *s);
-#endif
-%}
-
-%token <text> '(' '*' '&'
-	/* identifiers that are not reserved words */
-	T_IDENTIFIER T_TYPEDEF_NAME T_DEFINE_NAME
-
-	/* storage class */
-	T_AUTO T_EXTERN T_REGISTER T_STATIC T_TYPEDEF
-	/* This keyword included for compatibility with C++. */
-	T_INLINE
-	/* This keyword included for compatibility with GCC */
-	T_EXTENSION
-
-	/* type specifiers */
-	T_CHAR T_DOUBLE T_FLOAT T_INT T_VOID
-	T_LONG T_SHORT T_SIGNED T_UNSIGNED
-	T_ENUM T_STRUCT T_UNION
-	/* C9X new types */
-	T_Bool T_Complex T_Imaginary
-
-	/* type qualifiers */
-	T_TYPE_QUALIFIER
-
-	/* paired square brackets and everything between them: [ ... ] */
-	T_BRACKETS
-
-%token
-	/* left brace */
-	T_LBRACE
-	/* all input to the matching right brace */
-	T_MATCHRBRACE
-
-	/* three periods */
-	T_ELLIPSIS
-
-	/* constant expression or paired braces following an equal sign */
-	T_INITIALIZER
-
-	/* string literal */
-	T_STRING_LITERAL
-
-	/* asm */
-	T_ASM
-	/* ( "string literal" ) following asm keyword */
-	T_ASMARG
-
-	/* va_dcl from <varargs.h> */
-	T_VA_DCL
-
-%type <decl_spec> decl_specifiers decl_specifier
-%type <decl_spec> storage_class type_specifier type_qualifier
-%type <decl_spec> struct_or_union_specifier enum_specifier
-%type <decl_list> init_declarator_list
-%type <declarator> init_declarator declarator direct_declarator
-%type <declarator> abs_declarator direct_abs_declarator
-%type <param_list> parameter_type_list parameter_list
-%type <parameter> parameter_declaration
-%type <param_list> opt_identifier_list identifier_list
-%type <text> struct_or_union pointer opt_type_qualifiers type_qualifier_list
-	any_id identifier_or_ref
-%type <text> enumeration
-
-%{
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-
-#define OPT_LINTLIBRARY 1
-
-#ifndef TRUE
-#define	TRUE	(1)
-#endif
-
-#ifndef FALSE
-#define	FALSE	(0)
-#endif
-
-/* #include "cproto.h" */
-#define MAX_TEXT_SIZE 1024
-
-/* Prototype styles */
-#if OPT_LINTLIBRARY
-#define PROTO_ANSI_LLIB		-2	/* form ANSI lint-library source */
-#define PROTO_LINTLIBRARY	-1	/* form lint-library source */
-#endif
-#define PROTO_NONE		0	/* do not output any prototypes */
-#define PROTO_TRADITIONAL	1	/* comment out parameters */
-#define PROTO_ABSTRACT		2	/* comment out parameter names */
-#define PROTO_ANSI		3	/* ANSI C prototype */
-
-typedef int PrototypeStyle;
-
-typedef char boolean;
-
-extern boolean types_out;
-extern PrototypeStyle proto_style;
-
-#define ansiLintLibrary() (proto_style == PROTO_ANSI_LLIB)
-#define knrLintLibrary()  (proto_style == PROTO_LINTLIBRARY)
-#define lintLibrary()     (knrLintLibrary() || ansiLintLibrary())
-
-#if OPT_LINTLIBRARY
-#define FUNC_UNKNOWN		-1	/* unspecified */
-#else
-#define FUNC_UNKNOWN		0	/* unspecified (same as FUNC_NONE) */
-#endif
-#define FUNC_NONE		0	/* not a function definition */
-#define FUNC_TRADITIONAL	1	/* traditional style */
-#define FUNC_ANSI		2	/* ANSI style */
-#define FUNC_BOTH		3	/* both styles */
-
-typedef int FuncDefStyle;
-
-/* Source file text */
-typedef struct text {
-    char text[MAX_TEXT_SIZE];	/* source text */
-    long begin; 		/* offset in temporary file */
-} Text;
-
-/* Declaration specifier flags */
-#define DS_NONE 	0	/* default */
-#define DS_EXTERN	1	/* contains "extern" specifier */
-#define DS_STATIC	2	/* contains "static" specifier */
-#define DS_CHAR 	4	/* contains "char" type specifier */
-#define DS_SHORT	8	/* contains "short" type specifier */
-#define DS_FLOAT	16	/* contains "float" type specifier */
-#define DS_INLINE	32	/* contains "inline" specifier */
-#define DS_JUNK 	64	/* we're not interested in this declaration */
-
-/* This structure stores information about a declaration specifier. */
-typedef struct decl_spec {
-    unsigned short flags;	/* flags defined above */
-    char *text; 		/* source text */
-    long begin; 		/* offset in temporary file */
-} DeclSpec;
-
-/* This is a list of function parameters. */
-typedef struct _ParameterList {
-    struct parameter *first;	/* pointer to first parameter in list */
-    struct parameter *last;	/* pointer to last parameter in list */  
-    long begin_comment; 	/* begin offset of comment */
-    long end_comment;		/* end offset of comment */
-    char *comment;		/* comment at start of parameter list */
-} ParameterList;
-
-/* This structure stores information about a declarator. */
-typedef struct _Declarator {
-    char *name; 			/* name of variable or function */
-    char *text; 			/* source text */
-    long begin; 			/* offset in temporary file */
-    long begin_comment; 		/* begin offset of comment */
-    long end_comment;			/* end offset of comment */
-    FuncDefStyle func_def;		/* style of function definition */
-    ParameterList params;		/* function parameters */
-    boolean pointer;			/* TRUE if it declares a pointer */
-    struct _Declarator *head;		/* head function declarator */
-    struct _Declarator *func_stack;	/* stack of function declarators */
-    struct _Declarator *next;		/* next declarator in list */
-} Declarator;
-
-/* This structure stores information about a function parameter. */
-typedef struct parameter {
-    struct parameter *next;	/* next parameter in list */
-    DeclSpec decl_spec;
-    Declarator *declarator;
-    char *comment;		/* comment following the parameter */
-} Parameter;
-
-/* This is a list of declarators. */
-typedef struct declarator_list {
-    Declarator *first;		/* pointer to first declarator in list */
-    Declarator *last;		/* pointer to last declarator in list */  
-} DeclaratorList;
-
-/* #include "symbol.h" */
-typedef struct symbol {
-    struct symbol *next;	/* next symbol in list */
-    char *name; 		/* name of symbol */
-    char *value;		/* value of symbol (for defines) */
-    short flags;		/* symbol attributes */
-} Symbol;
-
-/* parser stack entry type */
-typedef union {
-    Text text;
-    DeclSpec decl_spec;
-    Parameter *parameter;
-    ParameterList param_list;
-    Declarator *declarator;
-    DeclaratorList decl_list;
-} YYSTYPE;
-
-/* The hash table length should be a prime number. */
-#define SYM_MAX_HASH 251
-
-typedef struct symbol_table {
-    Symbol *bucket[SYM_MAX_HASH];	/* hash buckets */
-} SymbolTable;
-
-extern SymbolTable *new_symbol_table	/* Create symbol table */
-	(void);
-extern void free_symbol_table		/* Destroy symbol table */
-	(SymbolTable *s);
-extern Symbol *find_symbol		/* Lookup symbol name */
-	(SymbolTable *s, const char *n);
-extern Symbol *new_symbol		/* Define new symbol */
-	(SymbolTable *s, const char *n, const char *v, int f);
-
-/* #include "semantic.h" */
-extern void new_decl_spec (DeclSpec *, const char *, long, int);
-extern void free_decl_spec (DeclSpec *);
-extern void join_decl_specs (DeclSpec *, DeclSpec *, DeclSpec *);
-extern void check_untagged (DeclSpec *);
-extern Declarator *new_declarator (const char *, const char *, long);
-extern void free_declarator (Declarator *);
-extern void new_decl_list (DeclaratorList *, Declarator *);
-extern void free_decl_list (DeclaratorList *);
-extern void add_decl_list (DeclaratorList *, DeclaratorList *, Declarator *);
-extern Parameter *new_parameter (DeclSpec *, Declarator *);
-extern void free_parameter (Parameter *);
-extern void new_param_list (ParameterList *, Parameter *);
-extern void free_param_list (ParameterList *);
-extern void add_param_list (ParameterList *, ParameterList *, Parameter *);
-extern void new_ident_list (ParameterList *);
-extern void add_ident_list (ParameterList *, ParameterList *, const char *);
-extern void set_param_types (ParameterList *, DeclSpec *, DeclaratorList *);
-extern void gen_declarations (DeclSpec *, DeclaratorList *);
-extern void gen_prototype (DeclSpec *, Declarator *);
-extern void gen_func_declarator (Declarator *);
-extern void gen_func_definition (DeclSpec *, Declarator *);
-
-extern void init_parser     (void);
-extern void process_file    (FILE *infile, char *name);
-extern char *cur_text       (void);
-extern char *cur_file_name  (void);
-extern char *implied_typedef (void);
-extern void include_file    (char *name, int convert);
-extern char *supply_parm    (int count);
-extern char *xstrdup        (const char *);
-extern int already_declared (char *name);
-extern int is_actual_func   (Declarator *d);
-extern int lint_ellipsis    (Parameter *p);
-extern int want_typedef     (void);
-extern void begin_tracking  (void);
-extern void begin_typedef   (void);
-extern void copy_typedef    (char *s);
-extern void ellipsis_varargs (Declarator *d);
-extern void end_typedef     (void);
-extern void flush_varargs   (void);
-extern void fmt_library     (int code);
-extern void imply_typedef   (const char *s);
-extern void indent          (FILE *outf);
-extern void put_blankline   (FILE *outf);
-extern void put_body        (FILE *outf, DeclSpec *decl_spec, Declarator *declarator);
-extern void put_char        (FILE *outf, int c);
-extern void put_error       (void);
-extern void put_newline     (FILE *outf);
-extern void put_padded      (FILE *outf, const char *s);
-extern void put_string      (FILE *outf, const char *s);
-extern void track_in        (void);
-
-extern boolean file_comments;
-extern FuncDefStyle func_style;
-extern char base_file[];
-
-extern	int	yylex (void);
-
-/* declaration specifier attributes for the typedef statement currently being
- * scanned
- */
-static int cur_decl_spec_flags;
-
-/* pointer to parameter list for the current function definition */
-static ParameterList *func_params;
-
-/* A parser semantic action sets this pointer to the current declarator in
- * a function parameter declaration in order to catch any comments following
- * the parameter declaration on the same line.  If the lexer scans a comment
- * and <cur_declarator> is not NULL, then the comment is attached to the
- * declarator.  To ignore subsequent comments, the lexer sets this to NULL
- * after scanning a comment or end of line.
- */
-static Declarator *cur_declarator;
-
-/* temporary string buffer */
-static char buf[MAX_TEXT_SIZE];
-
-/* table of typedef names */
-static SymbolTable *typedef_names;
-
-/* table of define names */
-static SymbolTable *define_names;
-
-/* table of type qualifiers */
-static SymbolTable *type_qualifiers;
-
-/* information about the current input file */
-typedef struct {
-    char *base_name;		/* base input file name */
-    char *file_name;		/* current file name */
-    FILE *file; 		/* input file */
-    unsigned line_num;		/* current line number in input file */
-    FILE *tmp_file;		/* temporary file */
-    long begin_comment; 	/* tmp file offset after last written ) or ; */
-    long end_comment;		/* tmp file offset after last comment */
-    boolean convert;		/* if TRUE, convert function definitions */
-    boolean changed;		/* TRUE if conversion done in this file */
-} IncludeStack;
-
-static IncludeStack *cur_file;	/* current input file */
-
-/* #include "yyerror.c" */
-
-static int haveAnsiParam (void);
-
-
-/* Flags to enable us to find if a procedure returns a value.
- */
-static int return_val;	/* nonzero on BRACES iff return-expression found */
-
-static const char *
-dft_decl_spec (void)
-{
-    return (lintLibrary() && !return_val) ? "void" : "int";
-}
-
-static int
-haveAnsiParam (void)
-{
-    Parameter *p;
-    if (func_params != 0) {
-	for (p = func_params->first; p != 0; p = p->next) {
-	    if (p->declarator->func_def == FUNC_ANSI) {
-		return TRUE;
-	    }
-	}
-    }
-    return FALSE;
-}
-%}
-%%
-
-program
-	: /* empty */
-	| translation_unit
-	;
-
-translation_unit
-	: external_declaration
-	| translation_unit external_declaration
-	;
-
-external_declaration
-	: declaration
-	| function_definition
-	| ';'
-	| linkage_specification
-	| T_ASM T_ASMARG ';'
-	| error T_MATCHRBRACE
-	{
-	    yyerrok;
-	}
-	| error ';'
-	{
-	    yyerrok;
-	}
-	;
-
-braces
-	: T_LBRACE T_MATCHRBRACE
-	;
-
-linkage_specification
-	: T_EXTERN T_STRING_LITERAL braces
-	{
-	    /* Provide an empty action here so bison will not complain about
-	     * incompatible types in the default action it normally would
-	     * have generated.
-	     */
-	}
-	| T_EXTERN T_STRING_LITERAL declaration
-	{
-	    /* empty */
-	}
-	;
-
-declaration
-	: decl_specifiers ';'
-	{
-#if OPT_LINTLIBRARY
-	    if (types_out && want_typedef()) {
-		gen_declarations(&$1, (DeclaratorList *)0);
-		flush_varargs();
-	    }
-#endif
-	    free_decl_spec(&$1);
-	    end_typedef();
-	}
-	| decl_specifiers init_declarator_list ';'
-	{
-	    if (func_params != NULL) {
-		set_param_types(func_params, &$1, &$2);
-	    } else {
-		gen_declarations(&$1, &$2);
-#if OPT_LINTLIBRARY
-		flush_varargs();
-#endif
-		free_decl_list(&$2);
-	    }
-	    free_decl_spec(&$1);
-	    end_typedef();
-	}
-	| any_typedef decl_specifiers
-	{
-	    cur_decl_spec_flags = $2.flags;
-	    free_decl_spec(&$2);
-	}
-	  opt_declarator_list ';'
-	{
-	    end_typedef();
-	}
-	;
-
-any_typedef
-	: T_EXTENSION T_TYPEDEF
-	{
-	    begin_typedef();
-	}
-	| T_TYPEDEF
-	{
-	    begin_typedef();
-	}
-	;
-
-opt_declarator_list
-	: /* empty */
-	| declarator_list
-	;
-
-declarator_list
-	: declarator
-	{
-	    int flags = cur_decl_spec_flags;
-
-	    /* If the typedef is a pointer type, then reset the short type
-	     * flags so it does not get promoted.
-	     */
-	    if (strcmp($1->text, $1->name) != 0)
-		flags &= ~(DS_CHAR | DS_SHORT | DS_FLOAT);
-	    new_symbol(typedef_names, $1->name, NULL, flags);
-	    free_declarator($1);
-	}
-	| declarator_list ',' declarator
-	{
-	    int flags = cur_decl_spec_flags;
-
-	    if (strcmp($3->text, $3->name) != 0)
-		flags &= ~(DS_CHAR | DS_SHORT | DS_FLOAT);
-	    new_symbol(typedef_names, $3->name, NULL, flags);
-	    free_declarator($3);
-	}
-	;
-
-function_definition
-	: decl_specifiers declarator
-	{
-	    check_untagged(&$1);
-	    if ($2->func_def == FUNC_NONE) {
-		yyerror("syntax error");
-		YYERROR;
-	    }
-	    func_params = &($2->head->params);
-	    func_params->begin_comment = cur_file->begin_comment;
-	    func_params->end_comment = cur_file->end_comment;
-	}
-	  opt_declaration_list T_LBRACE
-	{
-	    /* If we're converting to K&R and we've got a nominally K&R
-	     * function which has a parameter which is ANSI (i.e., a prototyped
-	     * function pointer), then we must override the deciphered value of
-	     * 'func_def' so that the parameter will be converted.
-	     */
-	    if (func_style == FUNC_TRADITIONAL
-	     && haveAnsiParam()
-	     && $2->head->func_def == func_style) {
-		$2->head->func_def = FUNC_BOTH;
-	    }
-
-	    func_params = NULL;
-
-	    if (cur_file->convert)
-		gen_func_definition(&$1, $2);
-	    gen_prototype(&$1, $2);
-#if OPT_LINTLIBRARY
-	    flush_varargs();
-#endif
-	    free_decl_spec(&$1);
-	    free_declarator($2);
-	}
-	  T_MATCHRBRACE
-	| declarator
-	{
-	    if ($1->func_def == FUNC_NONE) {
-		yyerror("syntax error");
-		YYERROR;
-	    }
-	    func_params = &($1->head->params);
-	    func_params->begin_comment = cur_file->begin_comment;
-	    func_params->end_comment = cur_file->end_comment;
-	}
-	  opt_declaration_list T_LBRACE T_MATCHRBRACE
-	{
-	    DeclSpec decl_spec;
-
-	    func_params = NULL;
-
-	    new_decl_spec(&decl_spec, dft_decl_spec(), $1->begin, DS_NONE);
-	    if (cur_file->convert)
-		gen_func_definition(&decl_spec, $1);
-	    gen_prototype(&decl_spec, $1);
-#if OPT_LINTLIBRARY
-	    flush_varargs();
-#endif
-	    free_decl_spec(&decl_spec);
-	    free_declarator($1);
-	}
-	;
-
-opt_declaration_list
-	: /* empty */
-	| T_VA_DCL
-	| declaration_list
-	;
-
-declaration_list
-	: declaration
-	| declaration_list declaration
-	;
-
-decl_specifiers
-	: decl_specifier
-	| decl_specifiers decl_specifier
-	{
-	    join_decl_specs(&$$, &$1, &$2);
-	    free($1.text);
-	    free($2.text);
-	}
-	;
-
-decl_specifier
-	: storage_class
-	| type_specifier
-	| type_qualifier
-	;
-
-storage_class
-	: T_AUTO
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
-	}
-	| T_EXTERN
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_EXTERN);
-	}
-	| T_REGISTER
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
-	}
-	| T_STATIC
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_STATIC);
-	}
-	| T_INLINE
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_INLINE);
-	}
-	| T_EXTENSION
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_JUNK);
-	}
-	;
-
-type_specifier
-	: T_CHAR
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_CHAR);
-	}
-	| T_DOUBLE
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
-	}
-	| T_FLOAT
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_FLOAT);
-	}
-	| T_INT
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
-	}
-	| T_LONG
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
-	}
-	| T_SHORT
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_SHORT);
-	}
-	| T_SIGNED
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
-	}
-	| T_UNSIGNED
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
-	}
-	| T_VOID
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
-	}
-	| T_Bool
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_CHAR);
-	}
-	| T_Complex
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
-	}
-	| T_Imaginary
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
-	}
-	| T_TYPEDEF_NAME
-	{
-	    Symbol *s;
-	    s = find_symbol(typedef_names, $1.text);
-	    if (s != NULL)
-		new_decl_spec(&$$, $1.text, $1.begin, s->flags);
-	}
-	| struct_or_union_specifier
-	| enum_specifier
-	;
-
-type_qualifier
-	: T_TYPE_QUALIFIER
-	{
-	    new_decl_spec(&$$, $1.text, $1.begin, DS_NONE);
-	}
-	| T_DEFINE_NAME
-	{
-	    /* This rule allows the <pointer> nonterminal to scan #define
-	     * names as if they were type modifiers.
-	     */
-	    Symbol *s;
-	    s = find_symbol(define_names, $1.text);
-	    if (s != NULL)
-		new_decl_spec(&$$, $1.text, $1.begin, s->flags);
-	}
-	;
-
-struct_or_union_specifier
-	: struct_or_union any_id braces
-	{
-	    char *s;
-	    if ((s = implied_typedef()) == 0)
-	        (void)sprintf(s = buf, "%s %s", $1.text, $2.text);
-	    new_decl_spec(&$$, s, $1.begin, DS_NONE);
-	}
-	| struct_or_union braces
-	{
-	    char *s;
-	    if ((s = implied_typedef()) == 0)
-		(void)sprintf(s = buf, "%s {}", $1.text);
-	    new_decl_spec(&$$, s, $1.begin, DS_NONE);
-	}
-	| struct_or_union any_id
-	{
-	    (void)sprintf(buf, "%s %s", $1.text, $2.text);
-	    new_decl_spec(&$$, buf, $1.begin, DS_NONE);
-	}
-	;
-
-struct_or_union
-	: T_STRUCT
-	{
-	    imply_typedef($$.text);
-	}
-	| T_UNION
-	{
-	    imply_typedef($$.text);
-	}
-	;
-
-init_declarator_list
-	: init_declarator
-	{
-	    new_decl_list(&$$, $1);
-	}
-	| init_declarator_list ',' init_declarator
-	{
-	    add_decl_list(&$$, &$1, $3);
-	}
-	;
-
-init_declarator
-	: declarator
-	{
-	    if ($1->func_def != FUNC_NONE && func_params == NULL &&
-		func_style == FUNC_TRADITIONAL && cur_file->convert) {
-		gen_func_declarator($1);
-		fputs(cur_text(), cur_file->tmp_file);
-	    }
-	    cur_declarator = $$;
-	}
-	| declarator '='
-	{
-	    if ($1->func_def != FUNC_NONE && func_params == NULL &&
-		func_style == FUNC_TRADITIONAL && cur_file->convert) {
-		gen_func_declarator($1);
-		fputs(" =", cur_file->tmp_file);
-	    }
-	}
-	  T_INITIALIZER
-	;
-
-enum_specifier
-	: enumeration any_id braces
-	{
-	    char *s;
-	    if ((s = implied_typedef()) == 0)
-		(void)sprintf(s = buf, "enum %s", $2.text);
-	    new_decl_spec(&$$, s, $1.begin, DS_NONE);
-	}
-	| enumeration braces
-	{
-	    char *s;
-	    if ((s = implied_typedef()) == 0)
-		(void)sprintf(s = buf, "%s {}", $1.text);
-	    new_decl_spec(&$$, s, $1.begin, DS_NONE);
-	}
-	| enumeration any_id
-	{
-	    (void)sprintf(buf, "enum %s", $2.text);
-	    new_decl_spec(&$$, buf, $1.begin, DS_NONE);
-	}
-	;
-
-enumeration
-	: T_ENUM
-	{
-	    imply_typedef("enum");
-	    $$ = $1;
-	}
-	;
-
-any_id
-	: T_IDENTIFIER
-	| T_TYPEDEF_NAME
-	;
-
-declarator
-	: pointer direct_declarator
-	{
-	    $$ = $2;
-	    (void)sprintf(buf, "%s%s", $1.text, $$->text);
-	    free($$->text);
-	    $$->text = xstrdup(buf);
-	    $$->begin = $1.begin;
-	    $$->pointer = TRUE;
-	}
-	| direct_declarator
-	;
-
-direct_declarator
-	: identifier_or_ref
-	{
-	    $$ = new_declarator($1.text, $1.text, $1.begin);
-	}
-	| '(' declarator ')'
-	{
-	    $$ = $2;
-	    (void)sprintf(buf, "(%s)", $$->text);
-	    free($$->text);
-	    $$->text = xstrdup(buf);
-	    $$->begin = $1.begin;
-	}
-	| direct_declarator T_BRACKETS
-	{
-	    $$ = $1;
-	    (void)sprintf(buf, "%s%s", $$->text, $2.text);
-	    free($$->text);
-	    $$->text = xstrdup(buf);
-	}
-	| direct_declarator '(' parameter_type_list ')'
-	{
-	    $$ = new_declarator("%s()", $1->name, $1->begin);
-	    $$->params = $3;
-	    $$->func_stack = $1;
-	    $$->head = ($1->func_stack == NULL) ? $$ : $1->head;
-	    $$->func_def = FUNC_ANSI;
-	}
-	| direct_declarator '(' opt_identifier_list ')'
-	{
-	    $$ = new_declarator("%s()", $1->name, $1->begin);
-	    $$->params = $3;
-	    $$->func_stack = $1;
-	    $$->head = ($1->func_stack == NULL) ? $$ : $1->head;
-	    $$->func_def = FUNC_TRADITIONAL;
-	}
-	;
-
-pointer
-	: '*' opt_type_qualifiers
-	{
-	    (void)sprintf($$.text, "*%s", $2.text);
-	    $$.begin = $1.begin;
-	}
-	| '*' opt_type_qualifiers pointer
-	{
-	    (void)sprintf($$.text, "*%s%s", $2.text, $3.text);
-	    $$.begin = $1.begin;
-	}
-	;
-
-opt_type_qualifiers
-	: /* empty */
-	{
-	    strcpy($$.text, "");
-	    $$.begin = 0L;
-	}
-	| type_qualifier_list
-	;
-
-type_qualifier_list
-	: type_qualifier
-	{
-	    (void)sprintf($$.text, "%s ", $1.text);
-	    $$.begin = $1.begin;
-	    free($1.text);
-	}
-	| type_qualifier_list type_qualifier
-	{
-	    (void)sprintf($$.text, "%s%s ", $1.text, $2.text);
-	    $$.begin = $1.begin;
-	    free($2.text);
-	}
-	;
-
-parameter_type_list
-	: parameter_list
-	| parameter_list ',' T_ELLIPSIS
-	{
-	    add_ident_list(&$$, &$1, "...");
-	}
-	;
-
-parameter_list
-	: parameter_declaration
-	{
-	    new_param_list(&$$, $1);
-	}
-	| parameter_list ',' parameter_declaration
-	{
-	    add_param_list(&$$, &$1, $3);
-	}
-	;
-
-parameter_declaration
-	: decl_specifiers declarator
-	{
-	    check_untagged(&$1);
-	    $$ = new_parameter(&$1, $2);
-	}
-	| decl_specifiers abs_declarator
-	{
-	    check_untagged(&$1);
-	    $$ = new_parameter(&$1, $2);
-	}
-	| decl_specifiers
-	{
-	    check_untagged(&$1);
-	    $$ = new_parameter(&$1, (Declarator *)0);
-	}
-	;
-
-opt_identifier_list
-	: /* empty */
-	{
-	    new_ident_list(&$$);
-	}
-	| identifier_list
-	;
-
-identifier_list
-	: any_id
-	{
-	    new_ident_list(&$$);
-	    add_ident_list(&$$, &$$, $1.text);
-	}
-	| identifier_list ',' any_id
-	{
-	    add_ident_list(&$$, &$1, $3.text);
-	}
-	;
-
-identifier_or_ref
-	: any_id
-	{
-	    $$ = $1;
-	}
-	| '&' any_id
-	{
-#if OPT_LINTLIBRARY
-	    if (lintLibrary()) { /* Lint doesn't grok C++ ref variables */
-		$$ = $2;
-	    } else
-#endif
-		(void)sprintf($$.text, "&%s", $2.text);
-	    $$.begin = $1.begin;
-	}
-	;
-
-abs_declarator
-	: pointer
-	{
-	    $$ = new_declarator($1.text, "", $1.begin);
-	}
-	| pointer direct_abs_declarator
-	{
-	    $$ = $2;
-	    (void)sprintf(buf, "%s%s", $1.text, $$->text);
-	    free($$->text);
-	    $$->text = xstrdup(buf);
-	    $$->begin = $1.begin;
-	}
-	| direct_abs_declarator
-	;
-
-direct_abs_declarator
-	: '(' abs_declarator ')'
-	{
-	    $$ = $2;
-	    (void)sprintf(buf, "(%s)", $$->text);
-	    free($$->text);
-	    $$->text = xstrdup(buf);
-	    $$->begin = $1.begin;
-	}
-	| direct_abs_declarator T_BRACKETS
-	{
-	    $$ = $1;
-	    (void)sprintf(buf, "%s%s", $$->text, $2.text);
-	    free($$->text);
-	    $$->text = xstrdup(buf);
-	}
-	| T_BRACKETS
-	{
-	    $$ = new_declarator($1.text, "", $1.begin);
-	}
-	| direct_abs_declarator '(' parameter_type_list ')'
-	{
-	    $$ = new_declarator("%s()", "", $1->begin);
-	    $$->params = $3;
-	    $$->func_stack = $1;
-	    $$->head = ($1->func_stack == NULL) ? $$ : $1->head;
-	    $$->func_def = FUNC_ANSI;
-	}
-	| direct_abs_declarator '(' ')'
-	{
-	    $$ = new_declarator("%s()", "", $1->begin);
-	    $$->func_stack = $1;
-	    $$->head = ($1->func_stack == NULL) ? $$ : $1->head;
-	    $$->func_def = FUNC_ANSI;
-	}
-	| '(' parameter_type_list ')'
-	{
-	    Declarator *d;
-
-	    d = new_declarator("", "", $1.begin);
-	    $$ = new_declarator("%s()", "", $1.begin);
-	    $$->params = $2;
-	    $$->func_stack = d;
-	    $$->head = $$;
-	    $$->func_def = FUNC_ANSI;
-	}
-	| '(' ')'
-	{
-	    Declarator *d;
-
-	    d = new_declarator("", "", $1.begin);
-	    $$ = new_declarator("%s()", "", $1.begin);
-	    $$->func_stack = d;
-	    $$->head = $$;
-	    $$->func_def = FUNC_ANSI;
-	}
-	;
-
-%%
-
-/* lex.yy.c */
-#define BEGIN yy_start = 1 + 2 *
-
-#define CPP1 1
-#define INIT1 2
-#define INIT2 3
-#define CURLY 4
-#define LEXYACC 5
-#define ASM 6
-#define CPP_INLINE 7
-
-extern char *yytext;
-extern FILE *yyin, *yyout;
-
-static int curly;			/* number of curly brace nesting levels */
-static int ly_count;			/* number of occurrences of %% */
-static int inc_depth;			/* include nesting level */
-static SymbolTable *included_files;	/* files already included */
-static int yy_start = 0;		/* start state number */
-
-#define grammar_error(s) yaccError(s)
-
-static void
-yaccError (const char *msg)
-{
-    func_params = NULL;
-    put_error();		/* tell what line we're on, and what file */
-    fprintf(stderr, "%s at token '%s'\n", msg, yytext);
-}
-
-/* Initialize the table of type qualifier keywords recognized by the lexical
- * analyzer.
- */
-void
-init_parser (void)
-{
-    static const char *keywords[] = {
-	"const",
-	"restrict",
-	"volatile",
-	"interrupt",
-#ifdef vms
-	"noshare",
-	"readonly",
-#endif
-#if defined(MSDOS) || defined(OS2)
-	"__cdecl",
-	"__export",
-	"__far",
-	"__fastcall",
-	"__fortran",
-	"__huge",
-	"__inline",
-	"__interrupt",
-	"__loadds",
-	"__near",
-	"__pascal",
-	"__saveregs",
-	"__segment",
-	"__stdcall",
-	"__syscall",
-	"_cdecl",
-	"_cs",
-	"_ds",
-	"_es",
-	"_export",
-	"_far",
-	"_fastcall",
-	"_fortran",
-	"_huge",
-	"_interrupt",
-	"_loadds",
-	"_near",
-	"_pascal",
-	"_saveregs",
-	"_seg",
-	"_segment",
-	"_ss",
-	"cdecl",
-	"far",
-	"huge",
-	"near",
-	"pascal",
-#ifdef OS2
-	"__far16",
-#endif
-#endif
-#ifdef __GNUC__
-	/* gcc aliases */
-	"__builtin_va_arg",
-	"__builtin_va_list",
-	"__const",
-	"__const__",
-	"__inline",
-	"__inline__",
-	"__restrict",
-	"__restrict__",
-	"__volatile",
-	"__volatile__",
-#endif
-    };
-    unsigned i;
-
-    /* Initialize type qualifier table. */
-    type_qualifiers = new_symbol_table();
-    for (i = 0; i < sizeof(keywords)/sizeof(keywords[0]); ++i) {
-	new_symbol(type_qualifiers, keywords[i], NULL, DS_NONE);
-    }
-}
-
-/* Process the C source file.  Write function prototypes to the standard
- * output.  Convert function definitions and write the converted source
- * code to a temporary file.
- */
-void
-process_file (FILE *infile, char *name)
-{
-    char *s;
-
-    if (strlen(name) > 2) {
-	s = name + strlen(name) - 2;
-	if (*s == '.') {
-	    ++s;
-	    if (*s == 'l' || *s == 'y')
-		BEGIN LEXYACC;
-#if defined(MSDOS) || defined(OS2)
-	    if (*s == 'L' || *s == 'Y')
-		BEGIN LEXYACC;
-#endif
-	}
-    }
-
-    included_files = new_symbol_table();
-    typedef_names = new_symbol_table();
-    define_names = new_symbol_table();
-    inc_depth = -1;
-    curly = 0;
-    ly_count = 0;
-    func_params = NULL;
-    yyin = infile;
-    include_file(strcpy(base_file, name), func_style != FUNC_NONE);
-    if (file_comments) {
-#if OPT_LINTLIBRARY
-    	if (lintLibrary()) {
-	    put_blankline(stdout);
-	    begin_tracking();
-	}
-#endif
-	put_string(stdout, "/* ");
-	put_string(stdout, cur_file_name());
-	put_string(stdout, " */\n");
-    }
-    yyparse();
-    free_symbol_table(define_names);
-    free_symbol_table(typedef_names);
-    free_symbol_table(included_files);
-}
-
-#ifdef NO_LEAKS
-void
-free_parser(void)
-{
-    free_symbol_table (type_qualifiers);
-#ifdef FLEX_SCANNER
-    if (yy_current_buffer != 0)
-	yy_delete_buffer(yy_current_buffer);
-#endif
-}
-#endif
diff --git a/usr.bin/yacc/tests/legacy_test.sh b/usr.bin/yacc/tests/legacy_test.sh
deleted file mode 100644
index 1b6b806c5980..000000000000
--- a/usr.bin/yacc/tests/legacy_test.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-SRCDIR="$(dirname "${0}")"; export SRCDIR
-
-m4 "${SRCDIR}/../regress.m4" "${SRCDIR}/regress.sh" | sh
diff --git a/usr.bin/yacc/tests/pure_calc.y b/usr.bin/yacc/tests/pure_calc.y
deleted file mode 100644
index 3cd04332dcdd..000000000000
--- a/usr.bin/yacc/tests/pure_calc.y
+++ /dev/null
@@ -1,116 +0,0 @@
-%{
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-#ifdef YYBISON
-#define YYSTYPE int
-#define YYLEX_PARAM &yylval
-#define YYLEX_DECL() yylex(YYSTYPE *yylval)
-#define YYERROR_DECL() yyerror(const char *s)
-int YYLEX_DECL();
-static void YYERROR_DECL();
-#endif
-
-%}
-
-%start list
-
-%token DIGIT LETTER
-
-%left '|'
-%left '&'
-%left '+' '-'
-%left '*' '/' '%'
-%left UMINUS   /* supplies precedence for unary minus */
-
-%% /* beginning of rules section */
-
-list  :  /* empty */
-      |  list stat '\n'
-      |  list error '\n'
-            {  yyerrok ; }
-      ;
-
-stat  :  expr
-            {  printf("%d\n",$1);}
-      |  LETTER '=' expr
-            {  regs[$1] = $3; }
-      ;
-
-expr  :  '(' expr ')'
-            {  $$ = $2; }
-      |  expr '+' expr
-            {  $$ = $1 + $3; }
-      |  expr '-' expr
-            {  $$ = $1 - $3; }
-      |  expr '*' expr
-            {  $$ = $1 * $3; }
-      |  expr '/' expr
-            {  $$ = $1 / $3; }
-      |  expr '%' expr
-            {  $$ = $1 % $3; }
-      |  expr '&' expr
-            {  $$ = $1 & $3; }
-      |  expr '|' expr
-            {  $$ = $1 | $3; }
-      |  '-' expr %prec UMINUS
-            {  $$ = - $2; }
-      |  LETTER
-            {  $$ = regs[$1]; }
-      |  number
-      ;
-
-number:  DIGIT
-         {  $$ = $1; base = ($1==0) ? 8 : 10; }
-      |  number DIGIT
-         {  $$ = base * $1 + $2; }
-      ;
-
-%% /* start of programs */
-
-#ifdef YYBYACC
-static int YYLEX_DECL();
-#endif
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-YYERROR_DECL()
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-YYLEX_DECL()
-{
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	*yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	*yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
diff --git a/usr.bin/yacc/tests/pure_error.y b/usr.bin/yacc/tests/pure_error.y
deleted file mode 100644
index fe7a3c3094f2..000000000000
--- a/usr.bin/yacc/tests/pure_error.y
+++ /dev/null
@@ -1,41 +0,0 @@
-%{
-
-#ifdef YYBISON
-#define YYSTYPE int
-#define YYLEX_PARAM &yylval
-#define YYLEX_DECL() yylex(YYSTYPE *yylval)
-#define YYERROR_DECL() yyerror(const char *s)
-int YYLEX_DECL();
-static void YYERROR_DECL();
-#endif
-
-%}
-
-%%
-S: error
-%%
-
-#include <stdio.h>
-
-#ifdef YYBYACC
-extern int YYLEX_DECL();
-#endif
-
-int
-main(void)
-{
-    printf("yyparse() = %d\n", yyparse());
-    return 0;
-}
-
-int
-yylex(YYSTYPE *value)
-{
-    return value ? 0 : -1;
-}
-
-static void
-yyerror(const char* s)
-{
-    printf("%s\n", s);
-}
diff --git a/usr.bin/yacc/tests/quote_calc.y b/usr.bin/yacc/tests/quote_calc.y
deleted file mode 100644
index 9304dd8a7006..000000000000
--- a/usr.bin/yacc/tests/quote_calc.y
+++ /dev/null
@@ -1,112 +0,0 @@
-%{
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-int yylex(void);
-static void yyerror(const char *s);
-
-%}
-
-%start list
-
-%token OP_ADD "ADD"
-%token OP_SUB "SUB"
-%token OP_MUL "MUL"
-%token OP_DIV "DIV"
-%token OP_MOD "MOD"
-%token OP_AND "AND"
-
-%token DIGIT LETTER
-
-%left '|'
-%left '&'
-%left '+' '-'
-%left '*' '/' '%'
-%left UMINUS   /* supplies precedence for unary minus */
-
-%% /* beginning of rules section */
-
-list  :  /* empty */
-      |  list stat '\n'
-      |  list error '\n'
-            {  yyerrok ; }
-      ;
-
-stat  :  expr
-            {  printf("%d\n",$1);}
-      |  LETTER '=' expr
-            {  regs[$1] = $3; }
-      ;
-
-expr  :  '(' expr ')'
-            {  $$ = $2; }
-      |  expr OP_ADD expr
-            {  $$ = $1 + $3; }
-      |  expr OP_SUB expr
-            {  $$ = $1 - $3; }
-      |  expr OP_MUL expr
-            {  $$ = $1 * $3; }
-      |  expr OP_DIV expr
-            {  $$ = $1 / $3; }
-      |  expr OP_MOD expr
-            {  $$ = $1 % $3; }
-      |  expr OP_AND expr
-            {  $$ = $1 & $3; }
-      |  expr '|' expr
-            {  $$ = $1 | $3; }
-      |  OP_SUB expr %prec UMINUS
-            {  $$ = - $2; }
-      |  LETTER
-            {  $$ = regs[$1]; }
-      |  number
-      ;
-
-number:  DIGIT
-         {  $$ = $1; base = ($1==0) ? 8 : 10; }
-      |  number DIGIT
-         {  $$ = base * $1 + $2; }
-      ;
-
-%% /* start of programs */
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void) {
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
diff --git a/usr.bin/yacc/tests/quote_calc2.y b/usr.bin/yacc/tests/quote_calc2.y
deleted file mode 100644
index ab72a285fcb5..000000000000
--- a/usr.bin/yacc/tests/quote_calc2.y
+++ /dev/null
@@ -1,112 +0,0 @@
-%{
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-int yylex(void);
-static void yyerror(const char *s);
-
-%}
-
-%start list
-
-%token OP_ADD "ADD"
-%token OP_SUB "SUB"
-%token OP_MUL "MUL"
-%token OP_DIV "DIV"
-%token OP_MOD "MOD"
-%token OP_AND "AND"
-
-%token DIGIT LETTER
-
-%left '|'
-%left '&'
-%left '+' '-'
-%left '*' '/' '%'
-%left UMINUS   /* supplies precedence for unary minus */
-
-%% /* beginning of rules section */
-
-list  :  /* empty */
-      |  list stat '\n'
-      |  list error '\n'
-            {  yyerrok ; }
-      ;
-
-stat  :  expr
-            {  printf("%d\n",$1);}
-      |  LETTER '=' expr
-            {  regs[$1] = $3; }
-      ;
-
-expr  :  '(' expr ')'
-            {  $$ = $2; }
-      |  expr "ADD" expr
-            {  $$ = $1 + $3; }
-      |  expr "SUB" expr
-            {  $$ = $1 - $3; }
-      |  expr "MUL" expr
-            {  $$ = $1 * $3; }
-      |  expr "DIV" expr
-            {  $$ = $1 / $3; }
-      |  expr "MOD" expr
-            {  $$ = $1 % $3; }
-      |  expr "AND" expr
-            {  $$ = $1 & $3; }
-      |  expr '|' expr
-            {  $$ = $1 | $3; }
-      |  "SUB" expr %prec UMINUS
-            {  $$ = - $2; }
-      |  LETTER
-            {  $$ = regs[$1]; }
-      |  number
-      ;
-
-number:  DIGIT
-         {  $$ = $1; base = ($1==0) ? 8 : 10; }
-      |  number DIGIT
-         {  $$ = base * $1 + $2; }
-      ;
-
-%% /* start of programs */
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void) {
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
diff --git a/usr.bin/yacc/tests/quote_calc3.y b/usr.bin/yacc/tests/quote_calc3.y
deleted file mode 100644
index 5feeb4a03ed6..000000000000
--- a/usr.bin/yacc/tests/quote_calc3.y
+++ /dev/null
@@ -1,112 +0,0 @@
-%{
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-int yylex(void);
-static void yyerror(const char *s);
-
-%}
-
-%start list
-
-%token OP_ADD "ADD-operator"
-%token OP_SUB "SUB-operator"
-%token OP_MUL "MUL-operator"
-%token OP_DIV "DIV-operator"
-%token OP_MOD "MOD-operator"
-%token OP_AND "AND-operator"
-
-%token DIGIT LETTER
-
-%left '|'
-%left '&'
-%left '+' '-'
-%left '*' '/' '%'
-%left UMINUS   /* supplies precedence for unary minus */
-
-%% /* beginning of rules section */
-
-list  :  /* empty */
-      |  list stat '\n'
-      |  list error '\n'
-            {  yyerrok ; }
-      ;
-
-stat  :  expr
-            {  printf("%d\n",$1);}
-      |  LETTER '=' expr
-            {  regs[$1] = $3; }
-      ;
-
-expr  :  '(' expr ')'
-            {  $$ = $2; }
-      |  expr OP_ADD expr
-            {  $$ = $1 + $3; }
-      |  expr OP_SUB expr
-            {  $$ = $1 - $3; }
-      |  expr OP_MUL expr
-            {  $$ = $1 * $3; }
-      |  expr OP_DIV expr
-            {  $$ = $1 / $3; }
-      |  expr OP_MOD expr
-            {  $$ = $1 % $3; }
-      |  expr OP_AND expr
-            {  $$ = $1 & $3; }
-      |  expr '|' expr
-            {  $$ = $1 | $3; }
-      |  OP_SUB expr %prec UMINUS
-            {  $$ = - $2; }
-      |  LETTER
-            {  $$ = regs[$1]; }
-      |  number
-      ;
-
-number:  DIGIT
-         {  $$ = $1; base = ($1==0) ? 8 : 10; }
-      |  number DIGIT
-         {  $$ = base * $1 + $2; }
-      ;
-
-%% /* start of programs */
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void) {
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
diff --git a/usr.bin/yacc/tests/quote_calc4.y b/usr.bin/yacc/tests/quote_calc4.y
deleted file mode 100644
index 34b790e67f12..000000000000
--- a/usr.bin/yacc/tests/quote_calc4.y
+++ /dev/null
@@ -1,112 +0,0 @@
-%{
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-int yylex(void);
-static void yyerror(const char *s);
-
-%}
-
-%start list
-
-%token OP_ADD "ADD-operator"
-%token OP_SUB "SUB-operator"
-%token OP_MUL "MUL-operator"
-%token OP_DIV "DIV-operator"
-%token OP_MOD "MOD-operator"
-%token OP_AND "AND-operator"
-
-%token DIGIT LETTER
-
-%left '|'
-%left '&'
-%left '+' '-'
-%left '*' '/' '%'
-%left UMINUS   /* supplies precedence for unary minus */
-
-%% /* beginning of rules section */
-
-list  :  /* empty */
-      |  list stat '\n'
-      |  list error '\n'
-            {  yyerrok ; }
-      ;
-
-stat  :  expr
-            {  printf("%d\n",$1);}
-      |  LETTER '=' expr
-            {  regs[$1] = $3; }
-      ;
-
-expr  :  '(' expr ')'
-            {  $$ = $2; }
-      |  expr "ADD-operator" expr
-            {  $$ = $1 + $3; }
-      |  expr "SUB-operator" expr
-            {  $$ = $1 - $3; }
-      |  expr "MUL-operator" expr
-            {  $$ = $1 * $3; }
-      |  expr "DIV-operator" expr
-            {  $$ = $1 / $3; }
-      |  expr "MOD-operator" expr
-            {  $$ = $1 % $3; }
-      |  expr "AND-operator" expr
-            {  $$ = $1 & $3; }
-      |  expr '|' expr
-            {  $$ = $1 | $3; }
-      |  "SUB-operator" expr %prec UMINUS
-            {  $$ = - $2; }
-      |  LETTER
-            {  $$ = regs[$1]; }
-      |  number
-      ;
-
-number:  DIGIT
-         {  $$ = $1; base = ($1==0) ? 8 : 10; }
-      |  number DIGIT
-         {  $$ = base * $1 + $2; }
-      ;
-
-%% /* start of programs */
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void) {
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
diff --git a/usr.bin/yacc/tests/regress.00.out b/usr.bin/yacc/tests/regress.00.out
deleted file mode 100644
index 39a8ca28a5f3..000000000000
--- a/usr.bin/yacc/tests/regress.00.out
+++ /dev/null
@@ -1,386 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,
-};
-static const short yylen[] = {                            2,
-    0,
-};
-static const short yydefred[] = {                         1,
-    0,
-};
-static const short yydgoto[] = {                          1,
-};
-static const short yysindex[] = {                         0,
-    0,
-};
-static const short yyrindex[] = {                         0,
-    0,
-};
-static const short yygindex[] = {                         0,
-};
-#define YYTABLESIZE 0
-static const short yytable[] = {                          0,
-};
-static const short yycheck[] = {                         -1,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 0
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file","illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : rule",
-"rule :",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.01.out b/usr.bin/yacc/tests/regress.01.out
deleted file mode 100644
index 8187502fa21a..000000000000
--- a/usr.bin/yacc/tests/regress.01.out
+++ /dev/null
@@ -1,589 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 2 "calc.y"
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-extern int yylex(void);
-static void yyerror(const char *s);
-
-#line 29 "/dev/stdout"
-
-#ifndef YYSTYPE
-typedef int YYSTYPE;
-#endif
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define DIGIT 257
-#define LETTER 258
-#define UMINUS 259
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    0,    0,    1,    1,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    3,    3,
-};
-static const short yylen[] = {                            2,
-    0,    3,    3,    1,    3,    3,    3,    3,    3,    3,
-    3,    3,    3,    2,    1,    1,    1,    2,
-};
-static const short yydefred[] = {                         1,
-    0,    0,   17,    0,    0,    0,    0,    0,    0,    3,
-    0,   15,   14,    0,    2,    0,    0,    0,    0,    0,
-    0,    0,   18,    0,    6,    0,    0,    0,    0,    9,
-   10,   11,
-};
-static const short yydgoto[] = {                          1,
-    7,    8,    9,
-};
-static const short yysindex[] = {                         0,
-  -40,   -7,    0,  -55,  -38,  -38,    1,  -29, -247,    0,
-  -38,    0,    0,   22,    0,  -38,  -38,  -38,  -38,  -38,
-  -38,  -38,    0,  -29,    0,   51,   60,  -20,  -20,    0,
-    0,    0,
-};
-static const short yyrindex[] = {                         0,
-    0,    0,    0,    2,    0,    0,    0,    9,   -9,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   10,    0,   -6,   14,    5,   13,    0,
-    0,    0,
-};
-static const short yygindex[] = {                         0,
-    0,   65,    0,
-};
-#define YYTABLESIZE 220
-static const short yytable[] = {                          6,
-   16,    6,   10,   13,    5,   11,    5,   22,   17,   23,
-   15,   15,   20,   18,    7,   19,   22,   21,    4,    5,
-    0,   20,    8,   12,    0,    0,   21,   16,   16,    0,
-    0,   16,   16,   16,   13,   16,    0,   16,   15,   15,
-    0,    0,    7,   15,   15,    7,   15,    7,   15,    7,
-    8,   12,    0,    8,   12,    8,    0,    8,   22,   17,
-    0,    0,   25,   20,   18,    0,   19,    0,   21,   13,
-   14,    0,    0,    0,    0,   24,    0,    0,    0,    0,
-   26,   27,   28,   29,   30,   31,   32,   22,   17,    0,
-    0,    0,   20,   18,   16,   19,   22,   21,    0,    0,
-    0,   20,   18,    0,   19,    0,   21,    0,    0,    0,
-    0,    0,    0,    0,   16,    0,    0,   13,    0,    0,
-    0,    0,    0,    0,    0,   15,    0,    0,    7,    0,
-    0,    0,    0,    0,    0,    0,    8,   12,    0,    0,
-    0,    0,    0,    0,    0,   16,    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,    2,    3,    4,    3,   12,
-};
-static const short yycheck[] = {                         40,
-   10,   40,   10,   10,   45,   61,   45,   37,   38,  257,
-   10,   10,   42,   43,   10,   45,   37,   47,   10,   10,
-   -1,   42,   10,   10,   -1,   -1,   47,   37,   38,   -1,
-   -1,   41,   42,   43,   41,   45,   -1,   47,   37,   38,
-   -1,   -1,   38,   42,   43,   41,   45,   43,   47,   45,
-   38,   38,   -1,   41,   41,   43,   -1,   45,   37,   38,
-   -1,   -1,   41,   42,   43,   -1,   45,   -1,   47,    5,
-    6,   -1,   -1,   -1,   -1,   11,   -1,   -1,   -1,   -1,
-   16,   17,   18,   19,   20,   21,   22,   37,   38,   -1,
-   -1,   -1,   42,   43,  124,   45,   37,   47,   -1,   -1,
-   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  124,   -1,   -1,  124,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  124,   -1,   -1,  124,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  124,  124,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  124,   -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,   -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,
-   -1,   -1,   -1,   -1,   -1,  256,  257,  258,  257,  258,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 259
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file",0,0,0,0,0,0,0,0,0,"'\\n'",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,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,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,"DIGIT","LETTER","UMINUS","illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : list",
-"list :",
-"list : list stat '\\n'",
-"list : list error '\\n'",
-"stat : expr",
-"stat : LETTER '=' expr",
-"expr : '(' expr ')'",
-"expr : expr '+' expr",
-"expr : expr '-' expr",
-"expr : expr '*' expr",
-"expr : expr '/' expr",
-"expr : expr '%' expr",
-"expr : expr '&' expr",
-"expr : expr '|' expr",
-"expr : '-' expr",
-"expr : LETTER",
-"expr : number",
-"number : DIGIT",
-"number : number DIGIT",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 66 "calc.y"
- /* start of programs */
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void)
-{
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
-#line 267 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-case 3:
-#line 28 "calc.y"
-	{  yyerrok ; }
-break;
-case 4:
-#line 32 "calc.y"
-	{  printf("%d\n",yystack.l_mark[0]);}
-break;
-case 5:
-#line 34 "calc.y"
-	{  regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
-break;
-case 6:
-#line 38 "calc.y"
-	{  yyval = yystack.l_mark[-1]; }
-break;
-case 7:
-#line 40 "calc.y"
-	{  yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
-break;
-case 8:
-#line 42 "calc.y"
-	{  yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
-break;
-case 9:
-#line 44 "calc.y"
-	{  yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
-break;
-case 10:
-#line 46 "calc.y"
-	{  yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
-break;
-case 11:
-#line 48 "calc.y"
-	{  yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
-break;
-case 12:
-#line 50 "calc.y"
-	{  yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
-break;
-case 13:
-#line 52 "calc.y"
-	{  yyval = yystack.l_mark[-2] | yystack.l_mark[0]; }
-break;
-case 14:
-#line 54 "calc.y"
-	{  yyval = - yystack.l_mark[0]; }
-break;
-case 15:
-#line 56 "calc.y"
-	{  yyval = regs[yystack.l_mark[0]]; }
-break;
-case 17:
-#line 61 "calc.y"
-	{  yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
-break;
-case 18:
-#line 63 "calc.y"
-	{  yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
-break;
-#line 529 "/dev/stdout"
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.02.out b/usr.bin/yacc/tests/regress.02.out
deleted file mode 100644
index 30de536da40e..000000000000
--- a/usr.bin/yacc/tests/regress.02.out
+++ /dev/null
@@ -1,831 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 2 "calc1.y"
-
-/* http://dinosaur.compilertools.net/yacc/index.html */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <math.h>
-
-typedef struct interval
-{
-    double lo, hi;
-}
-INTERVAL;
-
-INTERVAL vmul(double, double, INTERVAL);
-INTERVAL vdiv(double, double, INTERVAL);
-
-extern int yylex(void);
-static void yyerror(const char *s);
-
-int dcheck(INTERVAL);
-
-double dreg[26];
-INTERVAL vreg[26];
-
-#line 31 "calc1.y"
-#ifdef YYSTYPE
-#undef  YYSTYPE_IS_DECLARED
-#define YYSTYPE_IS_DECLARED 1
-#endif
-#ifndef YYSTYPE_IS_DECLARED
-#define YYSTYPE_IS_DECLARED 1
-typedef union
-{
-	int ival;
-	double dval;
-	INTERVAL vval;
-} YYSTYPE;
-#endif /* !YYSTYPE_IS_DECLARED */
-#line 59 "/dev/stdout"
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define DREG 257
-#define VREG 258
-#define CONST 259
-#define UMINUS 260
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    3,    3,    0,    0,    0,    0,    0,    1,    1,    1,
-    1,    1,    1,    1,    1,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    2,    2,
-};
-static const short yylen[] = {                            2,
-    0,    2,    2,    2,    4,    4,    2,    1,    1,    3,
-    3,    3,    3,    2,    3,    1,    5,    1,    3,    3,
-    3,    3,    3,    3,    3,    3,    2,    3,
-};
-static const short yydefred[] = {                         0,
-    0,    0,    0,    8,    0,    0,    0,    0,    0,    7,
-    0,    0,    9,   18,   14,   27,    0,    0,    0,    0,
-    0,    0,    3,    0,    0,    0,    0,    4,    0,    0,
-    0,    0,    0,   15,    0,   28,    0,    0,    0,    0,
-   12,   24,   13,   26,    0,    0,   23,   25,   14,    0,
-    0,    0,    0,    0,    5,    6,    0,    0,    0,   12,
-   13,   17,
-};
-static const short yydgoto[] = {                          7,
-   32,    9,    0,
-};
-static const short yysindex[] = {                       -40,
-   -8,  -48,  -47,    0,  -37,  -37,    0,    2,   17,    0,
-  -34,  -37,    0,    0,    0,    0,  -25,   90,  -37,  -37,
-  -37,  -37,    0,  -37,  -37,  -37,  -37,    0,  -34,  -34,
-   25,  125,   31,    0,  -34,    0,  -11,   37,  -11,   37,
-    0,    0,    0,    0,   37,   37,    0,    0,    0,  111,
-  -34,  -34,  -34,  -34,    0,    0,  118,   69,   69,    0,
-    0,    0,
-};
-static const short yyrindex[] = {                         0,
-    0,   38,   44,    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,   -9,    0,    0,    0,    0,   51,   -3,   56,   61,
-    0,    0,    0,    0,   67,   72,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,   78,   83,    0,
-    0,    0,
-};
-static const short yygindex[] = {                         0,
-    4,  124,    0,
-};
-#define YYTABLESIZE 225
-static const short yytable[] = {                          6,
-   16,   10,    6,    8,    5,   30,   20,    5,   15,   17,
-   29,   23,   11,   12,   31,   34,   21,   19,   35,   20,
-    0,   22,   37,   39,   41,   43,   28,    0,    0,    0,
-   21,   16,   49,   50,   55,   22,    0,   20,   57,   20,
-   56,   20,    0,   21,   19,    0,   20,    9,   22,    0,
-    0,    0,    0,   18,   58,   59,   60,   61,   26,   24,
-   10,   25,    0,   27,    0,   11,   53,   51,    0,   52,
-   22,   54,   26,   24,    0,   25,   19,   27,   26,    9,
-    9,   21,    9,   27,    9,   18,   18,   10,   18,    0,
-   18,   10,   11,   10,   10,   10,   11,    0,   11,   11,
-   11,   22,    0,   22,    0,   22,    0,   19,    0,   19,
-   53,   19,   21,    0,   21,   54,   21,    0,   10,    0,
-   10,    0,   10,   11,    0,   11,    0,   11,   16,   18,
-   36,   26,   24,    0,   25,   33,   27,    0,    0,    0,
-    0,    0,   38,   40,   42,   44,    0,   45,   46,   47,
-   48,   34,   53,   51,    0,   52,    0,   54,   62,   53,
-   51,    0,   52,    0,   54,    0,   21,   19,    0,   20,
-    0,   22,    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,    1,    2,    3,    4,   13,
-   14,    4,   13,    0,    4,
-};
-static const short yycheck[] = {                         40,
-   10,   10,   40,    0,   45,   40,   10,   45,    5,    6,
-   45,   10,   61,   61,   11,   41,   42,   43,   44,   45,
-   -1,   47,   19,   20,   21,   22,   10,   -1,   -1,   -1,
-   42,   41,   29,   30,   10,   47,   -1,   41,   35,   43,
-   10,   45,   -1,   42,   43,   -1,   45,   10,   47,   -1,
-   -1,   -1,   -1,   10,   51,   52,   53,   54,   42,   43,
-   10,   45,   -1,   47,   -1,   10,   42,   43,   -1,   45,
-   10,   47,   42,   43,   -1,   45,   10,   47,   42,   42,
-   43,   10,   45,   47,   47,   42,   43,   10,   45,   -1,
-   47,   41,   10,   43,   44,   45,   41,   -1,   43,   44,
-   45,   41,   -1,   43,   -1,   45,   -1,   41,   -1,   43,
-   42,   45,   41,   -1,   43,   47,   45,   -1,   41,   -1,
-   43,   -1,   45,   41,   -1,   43,   -1,   45,    5,    6,
-   41,   42,   43,   -1,   45,   12,   47,   -1,   -1,   -1,
-   -1,   -1,   19,   20,   21,   22,   -1,   24,   25,   26,
-   27,   41,   42,   43,   -1,   45,   -1,   47,   41,   42,
-   43,   -1,   45,   -1,   47,   -1,   42,   43,   -1,   45,
-   -1,   47,   -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,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  256,  257,  258,  259,  257,
-  258,  259,  257,   -1,  259,
-};
-#define YYFINAL 7
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 260
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file",0,0,0,0,0,0,0,0,0,"'\\n'",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,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,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,"DREG","VREG","CONST","UMINUS","illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : line",
-"lines :",
-"lines : lines line",
-"line : dexp '\\n'",
-"line : vexp '\\n'",
-"line : DREG '=' dexp '\\n'",
-"line : VREG '=' vexp '\\n'",
-"line : error '\\n'",
-"dexp : CONST",
-"dexp : DREG",
-"dexp : dexp '+' dexp",
-"dexp : dexp '-' dexp",
-"dexp : dexp '*' dexp",
-"dexp : dexp '/' dexp",
-"dexp : '-' dexp",
-"dexp : '(' dexp ')'",
-"vexp : dexp",
-"vexp : '(' dexp ',' dexp ')'",
-"vexp : VREG",
-"vexp : vexp '+' vexp",
-"vexp : dexp '+' vexp",
-"vexp : vexp '-' vexp",
-"vexp : dexp '-' vexp",
-"vexp : vexp '*' vexp",
-"vexp : dexp '*' vexp",
-"vexp : vexp '/' vexp",
-"vexp : dexp '/' vexp",
-"vexp : '-' vexp",
-"vexp : '(' vexp ')'",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 176 "calc1.y"
-	/* beginning of subroutines section */
-
-#define BSZ 50			/* buffer size for floating point numbers */
-
-	/* lexical analysis */
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void)
-{
-    int c;
-
-    while ((c = getchar()) == ' ')
-    {				/* skip over blanks */
-    }
-
-    if (isupper(c))
-    {
-	yylval.ival = c - 'A';
-	return (VREG);
-    }
-    if (islower(c))
-    {
-	yylval.ival = c - 'a';
-	return (DREG);
-    }
-
-    if (isdigit(c) || c == '.')
-    {
-	/* gobble up digits, points, exponents */
-	char buf[BSZ + 1], *cp = buf;
-	int dot = 0, expr = 0;
-
-	for (; (cp - buf) < BSZ; ++cp, c = getchar())
-	{
-
-	    *cp = c;
-	    if (isdigit(c))
-		continue;
-	    if (c == '.')
-	    {
-		if (dot++ || expr)
-		    return ('.');	/* will cause syntax error */
-		continue;
-	    }
-
-	    if (c == 'e')
-	    {
-		if (expr++)
-		    return ('e');	/*  will  cause  syntax  error  */
-		continue;
-	    }
-
-	    /*  end  of  number  */
-	    break;
-	}
-	*cp = '\0';
-
-	if ((cp - buf) >= BSZ)
-	    printf("constant  too  long:  truncated\n");
-	else
-	    ungetc(c, stdin);	/*  push  back  last  char  read  */
-	yylval.dval = atof(buf);
-	return (CONST);
-    }
-    return (c);
-}
-
-static INTERVAL
-hilo(double a, double b, double c, double d)
-{
-    /*  returns  the  smallest  interval  containing  a,  b,  c,  and  d  */
-    /*  used  by  *,  /  routines  */
-    INTERVAL v;
-
-    if (a > b)
-    {
-	v.hi = a;
-	v.lo = b;
-    }
-    else
-    {
-	v.hi = b;
-	v.lo = a;
-    }
-
-    if (c > d)
-    {
-	if (c > v.hi)
-	    v.hi = c;
-	if (d < v.lo)
-	    v.lo = d;
-    }
-    else
-    {
-	if (d > v.hi)
-	    v.hi = d;
-	if (c < v.lo)
-	    v.lo = c;
-    }
-    return (v);
-}
-
-INTERVAL
-vmul(double a, double b, INTERVAL v)
-{
-    return (hilo(a * v.hi, a * v.lo, b * v.hi, b * v.lo));
-}
-
-int
-dcheck(INTERVAL v)
-{
-    if (v.hi >= 0. && v.lo <= 0.)
-    {
-	printf("divisor  interval  contains  0.\n");
-	return (1);
-    }
-    return (0);
-}
-
-INTERVAL
-vdiv(double a, double b, INTERVAL v)
-{
-    return (hilo(a / v.hi, a / v.lo, b / v.hi, b / v.lo));
-}
-#line 406 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-case 3:
-#line 57 "calc1.y"
-	{
-		(void) printf("%15.8f\n", yystack.l_mark[-1].dval);
-	}
-break;
-case 4:
-#line 61 "calc1.y"
-	{
-		(void) printf("(%15.8f, %15.8f)\n", yystack.l_mark[-1].vval.lo, yystack.l_mark[-1].vval.hi);
-	}
-break;
-case 5:
-#line 65 "calc1.y"
-	{
-		dreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].dval;
-	}
-break;
-case 6:
-#line 69 "calc1.y"
-	{
-		vreg[yystack.l_mark[-3].ival] = yystack.l_mark[-1].vval;
-	}
-break;
-case 7:
-#line 73 "calc1.y"
-	{
-		yyerrok;
-	}
-break;
-case 9:
-#line 80 "calc1.y"
-	{
-		yyval.dval = dreg[yystack.l_mark[0].ival];
-	}
-break;
-case 10:
-#line 84 "calc1.y"
-	{
-		yyval.dval = yystack.l_mark[-2].dval + yystack.l_mark[0].dval;
-	}
-break;
-case 11:
-#line 88 "calc1.y"
-	{
-		yyval.dval = yystack.l_mark[-2].dval - yystack.l_mark[0].dval;
-	}
-break;
-case 12:
-#line 92 "calc1.y"
-	{
-		yyval.dval = yystack.l_mark[-2].dval * yystack.l_mark[0].dval;
-	}
-break;
-case 13:
-#line 96 "calc1.y"
-	{
-		yyval.dval = yystack.l_mark[-2].dval / yystack.l_mark[0].dval;
-	}
-break;
-case 14:
-#line 100 "calc1.y"
-	{
-		yyval.dval = -yystack.l_mark[0].dval;
-	}
-break;
-case 15:
-#line 104 "calc1.y"
-	{
-		yyval.dval = yystack.l_mark[-1].dval;
-	}
-break;
-case 16:
-#line 110 "calc1.y"
-	{
-		yyval.vval.hi = yyval.vval.lo = yystack.l_mark[0].dval;
-	}
-break;
-case 17:
-#line 114 "calc1.y"
-	{
-		yyval.vval.lo = yystack.l_mark[-3].dval;
-		yyval.vval.hi = yystack.l_mark[-1].dval;
-		if ( yyval.vval.lo > yyval.vval.hi ) 
-		{
-			(void) printf("interval out of order\n");
-			YYERROR;
-		}
-	}
-break;
-case 18:
-#line 124 "calc1.y"
-	{
-		yyval.vval = vreg[yystack.l_mark[0].ival];
-	}
-break;
-case 19:
-#line 128 "calc1.y"
-	{
-		yyval.vval.hi = yystack.l_mark[-2].vval.hi + yystack.l_mark[0].vval.hi;
-		yyval.vval.lo = yystack.l_mark[-2].vval.lo + yystack.l_mark[0].vval.lo;
-	}
-break;
-case 20:
-#line 133 "calc1.y"
-	{
-		yyval.vval.hi = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.hi;
-		yyval.vval.lo = yystack.l_mark[-2].dval + yystack.l_mark[0].vval.lo;
-	}
-break;
-case 21:
-#line 138 "calc1.y"
-	{
-		yyval.vval.hi = yystack.l_mark[-2].vval.hi - yystack.l_mark[0].vval.lo;
-		yyval.vval.lo = yystack.l_mark[-2].vval.lo - yystack.l_mark[0].vval.hi;
-	}
-break;
-case 22:
-#line 143 "calc1.y"
-	{
-		yyval.vval.hi = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.lo;
-		yyval.vval.lo = yystack.l_mark[-2].dval - yystack.l_mark[0].vval.hi;
-	}
-break;
-case 23:
-#line 148 "calc1.y"
-	{
-		yyval.vval = vmul( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval );
-	}
-break;
-case 24:
-#line 152 "calc1.y"
-	{
-		yyval.vval = vmul (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval );
-	}
-break;
-case 25:
-#line 156 "calc1.y"
-	{
-		if (dcheck(yystack.l_mark[0].vval)) YYERROR;
-		yyval.vval = vdiv ( yystack.l_mark[-2].vval.lo, yystack.l_mark[-2].vval.hi, yystack.l_mark[0].vval );
-	}
-break;
-case 26:
-#line 161 "calc1.y"
-	{
-		if (dcheck ( yystack.l_mark[0].vval )) YYERROR;
-		yyval.vval = vdiv (yystack.l_mark[-2].dval, yystack.l_mark[-2].dval, yystack.l_mark[0].vval );
-	}
-break;
-case 27:
-#line 166 "calc1.y"
-	{
-		yyval.vval.hi = -yystack.l_mark[0].vval.lo;
-		yyval.vval.lo = -yystack.l_mark[0].vval.hi;
-	}
-break;
-case 28:
-#line 171 "calc1.y"
-	{
-		yyval.vval = yystack.l_mark[-1].vval;
-	}
-break;
-#line 771 "/dev/stdout"
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.03.out b/usr.bin/yacc/tests/regress.03.out
deleted file mode 100644
index a8c9f8c924eb..000000000000
--- a/usr.bin/yacc/tests/regress.03.out
+++ /dev/null
@@ -1,603 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 1
-
-#line 9 "calc3.y"
-# include <stdio.h>
-# include <ctype.h>
-
-#ifdef YYBISON
-#define YYSTYPE int
-#define YYLEX_PARAM base
-#define YYLEX_DECL() yylex(YYSTYPE *yylval, int *YYLEX_PARAM)
-#define YYERROR_DECL() yyerror(int regs[26], int *base, const char *s)
-int YYLEX_DECL();
-static void YYERROR_DECL();
-#endif
-
-#line 32 "/dev/stdout"
-
-#ifndef YYSTYPE
-typedef int YYSTYPE;
-#endif
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(int  regs[26], int * base)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# ifdef YYLEX_PARAM_TYPE
-#  define YYLEX_DECL() yylex(YYSTYPE *yylval, YYLEX_PARAM_TYPE YYLEX_PARAM)
-# else
-#  define YYLEX_DECL() yylex(YYSTYPE *yylval, void * YYLEX_PARAM)
-# endif
-# define YYLEX yylex(&yylval, YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(YYSTYPE *yylval, int * base)
-# define YYLEX yylex(&yylval, base)
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(int  regs[26], int * base, const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(regs, base, msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define DIGIT 257
-#define LETTER 258
-#define UMINUS 259
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    0,    0,    1,    1,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    3,    3,
-};
-static const short yylen[] = {                            2,
-    0,    3,    3,    1,    3,    3,    3,    3,    3,    3,
-    3,    3,    3,    2,    1,    1,    1,    2,
-};
-static const short yydefred[] = {                         1,
-    0,    0,   17,    0,    0,    0,    0,    0,    0,    3,
-    0,   15,   14,    0,    2,    0,    0,    0,    0,    0,
-    0,    0,   18,    0,    6,    0,    0,    0,    0,    9,
-   10,   11,
-};
-static const short yydgoto[] = {                          1,
-    7,    8,    9,
-};
-static const short yysindex[] = {                         0,
-  -40,   -7,    0,  -55,  -38,  -38,    1,  -29, -247,    0,
-  -38,    0,    0,   22,    0,  -38,  -38,  -38,  -38,  -38,
-  -38,  -38,    0,  -29,    0,   51,   60,  -20,  -20,    0,
-    0,    0,
-};
-static const short yyrindex[] = {                         0,
-    0,    0,    0,    2,    0,    0,    0,    9,   -9,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   10,    0,   -6,   14,    5,   13,    0,
-    0,    0,
-};
-static const short yygindex[] = {                         0,
-    0,   65,    0,
-};
-#define YYTABLESIZE 220
-static const short yytable[] = {                          6,
-   16,    6,   10,   13,    5,   11,    5,   22,   17,   23,
-   15,   15,   20,   18,    7,   19,   22,   21,    4,    5,
-    0,   20,    8,   12,    0,    0,   21,   16,   16,    0,
-    0,   16,   16,   16,   13,   16,    0,   16,   15,   15,
-    0,    0,    7,   15,   15,    7,   15,    7,   15,    7,
-    8,   12,    0,    8,   12,    8,    0,    8,   22,   17,
-    0,    0,   25,   20,   18,    0,   19,    0,   21,   13,
-   14,    0,    0,    0,    0,   24,    0,    0,    0,    0,
-   26,   27,   28,   29,   30,   31,   32,   22,   17,    0,
-    0,    0,   20,   18,   16,   19,   22,   21,    0,    0,
-    0,   20,   18,    0,   19,    0,   21,    0,    0,    0,
-    0,    0,    0,    0,   16,    0,    0,   13,    0,    0,
-    0,    0,    0,    0,    0,   15,    0,    0,    7,    0,
-    0,    0,    0,    0,    0,    0,    8,   12,    0,    0,
-    0,    0,    0,    0,    0,   16,    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,    2,    3,    4,    3,   12,
-};
-static const short yycheck[] = {                         40,
-   10,   40,   10,   10,   45,   61,   45,   37,   38,  257,
-   10,   10,   42,   43,   10,   45,   37,   47,   10,   10,
-   -1,   42,   10,   10,   -1,   -1,   47,   37,   38,   -1,
-   -1,   41,   42,   43,   41,   45,   -1,   47,   37,   38,
-   -1,   -1,   38,   42,   43,   41,   45,   43,   47,   45,
-   38,   38,   -1,   41,   41,   43,   -1,   45,   37,   38,
-   -1,   -1,   41,   42,   43,   -1,   45,   -1,   47,    5,
-    6,   -1,   -1,   -1,   -1,   11,   -1,   -1,   -1,   -1,
-   16,   17,   18,   19,   20,   21,   22,   37,   38,   -1,
-   -1,   -1,   42,   43,  124,   45,   37,   47,   -1,   -1,
-   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  124,   -1,   -1,  124,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  124,   -1,   -1,  124,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  124,  124,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  124,   -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,   -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,
-   -1,   -1,   -1,   -1,   -1,  256,  257,  258,  257,  258,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 259
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file",0,0,0,0,0,0,0,0,0,"'\\n'",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,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,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,"DIGIT","LETTER","UMINUS","illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : list",
-"list :",
-"list : list stat '\\n'",
-"list : list error '\\n'",
-"stat : expr",
-"stat : LETTER '=' expr",
-"expr : '(' expr ')'",
-"expr : expr '+' expr",
-"expr : expr '-' expr",
-"expr : expr '*' expr",
-"expr : expr '/' expr",
-"expr : expr '%' expr",
-"expr : expr '&' expr",
-"expr : expr '|' expr",
-"expr : '-' expr",
-"expr : LETTER",
-"expr : number",
-"number : DIGIT",
-"number : number DIGIT",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-#line 76 "calc3.y"
- /* start of programs */
-
-#ifdef YYBYACC
-extern int YYLEX_DECL();
-#endif
-
-int
-main (void)
-{
-    int regs[26];
-    int base = 10;
-
-    while(!feof(stdin)) {
-	yyparse(regs, &base);
-    }
-    return 0;
-}
-
-static void
-YYERROR_DECL()
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-YYLEX_DECL()
-{
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	*yylval = (c - 'a');
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	*yylval = (c - '0') % (*base);
-	return ( DIGIT );
-    }
-    return( c );
-}
-#line 274 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int      yyerrflag;
-    int      yychar;
-    YYSTYPE  yyval;
-    YYSTYPE  yylval;
-
-    /* variables for the parser stack */
-    YYSTACKDATA yystack;
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror(regs, base, "syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-case 3:
-#line 38 "calc3.y"
-	{  yyerrok ; }
-break;
-case 4:
-#line 42 "calc3.y"
-	{  printf("%d\n",yystack.l_mark[0]);}
-break;
-case 5:
-#line 44 "calc3.y"
-	{  regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
-break;
-case 6:
-#line 48 "calc3.y"
-	{  yyval = yystack.l_mark[-1]; }
-break;
-case 7:
-#line 50 "calc3.y"
-	{  yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
-break;
-case 8:
-#line 52 "calc3.y"
-	{  yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
-break;
-case 9:
-#line 54 "calc3.y"
-	{  yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
-break;
-case 10:
-#line 56 "calc3.y"
-	{  yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
-break;
-case 11:
-#line 58 "calc3.y"
-	{  yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
-break;
-case 12:
-#line 60 "calc3.y"
-	{  yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
-break;
-case 13:
-#line 62 "calc3.y"
-	{  yyval = yystack.l_mark[-2] | yystack.l_mark[0]; }
-break;
-case 14:
-#line 64 "calc3.y"
-	{  yyval = - yystack.l_mark[0]; }
-break;
-case 15:
-#line 66 "calc3.y"
-	{  yyval = regs[yystack.l_mark[0]]; }
-break;
-case 17:
-#line 71 "calc3.y"
-	{  yyval = yystack.l_mark[0]; (*base) = (yystack.l_mark[0]==0) ? 8 : 10; }
-break;
-case 18:
-#line 73 "calc3.y"
-	{  yyval = (*base) * yystack.l_mark[-1] + yystack.l_mark[0]; }
-break;
-#line 543 "/dev/stdout"
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror(regs, base, "yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.04.out b/usr.bin/yacc/tests/regress.04.out
deleted file mode 100644
index cd93e8652c2c..000000000000
--- a/usr.bin/yacc/tests/regress.04.out
+++ /dev/null
@@ -1,595 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 2 "code_calc.y"
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-#ifdef YYBISON
-int yylex(void);
-static void yyerror(const char *s);
-#endif
-
-#line 31 "/dev/stdout"
-
-#ifndef YYSTYPE
-typedef int YYSTYPE;
-#endif
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define DIGIT 257
-#define LETTER 258
-#define UMINUS 259
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    0,    0,    1,    1,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    3,    3,
-};
-static const short yylen[] = {                            2,
-    0,    3,    3,    1,    3,    3,    3,    3,    3,    3,
-    3,    3,    3,    2,    1,    1,    1,    2,
-};
-static const short yydefred[] = {                         1,
-    0,    0,   17,    0,    0,    0,    0,    0,    0,    3,
-    0,   15,   14,    0,    2,    0,    0,    0,    0,    0,
-    0,    0,   18,    0,    6,    0,    0,    0,    0,    9,
-   10,   11,
-};
-static const short yydgoto[] = {                          1,
-    7,    8,    9,
-};
-static const short yysindex[] = {                         0,
-  -40,   -7,    0,  -55,  -38,  -38,    1,  -29, -247,    0,
-  -38,    0,    0,   22,    0,  -38,  -38,  -38,  -38,  -38,
-  -38,  -38,    0,  -29,    0,   51,   60,  -20,  -20,    0,
-    0,    0,
-};
-static const short yyrindex[] = {                         0,
-    0,    0,    0,    2,    0,    0,    0,    9,   -9,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   10,    0,   -6,   14,    5,   13,    0,
-    0,    0,
-};
-static const short yygindex[] = {                         0,
-    0,   65,    0,
-};
-#define YYTABLESIZE 220
-static const short yytable[] = {                          6,
-   16,    6,   10,   13,    5,   11,    5,   22,   17,   23,
-   15,   15,   20,   18,    7,   19,   22,   21,    4,    5,
-    0,   20,    8,   12,    0,    0,   21,   16,   16,    0,
-    0,   16,   16,   16,   13,   16,    0,   16,   15,   15,
-    0,    0,    7,   15,   15,    7,   15,    7,   15,    7,
-    8,   12,    0,    8,   12,    8,    0,    8,   22,   17,
-    0,    0,   25,   20,   18,    0,   19,    0,   21,   13,
-   14,    0,    0,    0,    0,   24,    0,    0,    0,    0,
-   26,   27,   28,   29,   30,   31,   32,   22,   17,    0,
-    0,    0,   20,   18,   16,   19,   22,   21,    0,    0,
-    0,   20,   18,    0,   19,    0,   21,    0,    0,    0,
-    0,    0,    0,    0,   16,    0,    0,   13,    0,    0,
-    0,    0,    0,    0,    0,   15,    0,    0,    7,    0,
-    0,    0,    0,    0,    0,    0,    8,   12,    0,    0,
-    0,    0,    0,    0,    0,   16,    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,    2,    3,    4,    3,   12,
-};
-static const short yycheck[] = {                         40,
-   10,   40,   10,   10,   45,   61,   45,   37,   38,  257,
-   10,   10,   42,   43,   10,   45,   37,   47,   10,   10,
-   -1,   42,   10,   10,   -1,   -1,   47,   37,   38,   -1,
-   -1,   41,   42,   43,   41,   45,   -1,   47,   37,   38,
-   -1,   -1,   38,   42,   43,   41,   45,   43,   47,   45,
-   38,   38,   -1,   41,   41,   43,   -1,   45,   37,   38,
-   -1,   -1,   41,   42,   43,   -1,   45,   -1,   47,    5,
-    6,   -1,   -1,   -1,   -1,   11,   -1,   -1,   -1,   -1,
-   16,   17,   18,   19,   20,   21,   22,   37,   38,   -1,
-   -1,   -1,   42,   43,  124,   45,   37,   47,   -1,   -1,
-   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  124,   -1,   -1,  124,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  124,   -1,   -1,  124,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  124,  124,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  124,   -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,   -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,
-   -1,   -1,   -1,   -1,   -1,  256,  257,  258,  257,  258,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 259
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file",0,0,0,0,0,0,0,0,0,"'\\n'",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,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,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,"DIGIT","LETTER","UMINUS","illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : list",
-"list :",
-"list : list stat '\\n'",
-"list : list error '\\n'",
-"stat : expr",
-"stat : LETTER '=' expr",
-"expr : '(' expr ')'",
-"expr : expr '+' expr",
-"expr : expr '-' expr",
-"expr : expr '*' expr",
-"expr : expr '/' expr",
-"expr : expr '%' expr",
-"expr : expr '&' expr",
-"expr : expr '|' expr",
-"expr : '-' expr",
-"expr : LETTER",
-"expr : number",
-"number : DIGIT",
-"number : number DIGIT",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 68 "code_calc.y"
- /* start of programs */
-
-#ifdef YYBYACC
-extern int YYLEX_DECL();
-#endif
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void)
-{
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
-#line 273 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-case 3:
-#line 30 "code_calc.y"
-	{  yyerrok ; }
-break;
-case 4:
-#line 34 "code_calc.y"
-	{  printf("%d\n",yystack.l_mark[0]);}
-break;
-case 5:
-#line 36 "code_calc.y"
-	{  regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
-break;
-case 6:
-#line 40 "code_calc.y"
-	{  yyval = yystack.l_mark[-1]; }
-break;
-case 7:
-#line 42 "code_calc.y"
-	{  yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
-break;
-case 8:
-#line 44 "code_calc.y"
-	{  yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
-break;
-case 9:
-#line 46 "code_calc.y"
-	{  yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
-break;
-case 10:
-#line 48 "code_calc.y"
-	{  yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
-break;
-case 11:
-#line 50 "code_calc.y"
-	{  yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
-break;
-case 12:
-#line 52 "code_calc.y"
-	{  yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
-break;
-case 13:
-#line 54 "code_calc.y"
-	{  yyval = yystack.l_mark[-2] | yystack.l_mark[0]; }
-break;
-case 14:
-#line 56 "code_calc.y"
-	{  yyval = - yystack.l_mark[0]; }
-break;
-case 15:
-#line 58 "code_calc.y"
-	{  yyval = regs[yystack.l_mark[0]]; }
-break;
-case 17:
-#line 63 "code_calc.y"
-	{  yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
-break;
-case 18:
-#line 65 "code_calc.y"
-	{  yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
-break;
-#line 535 "/dev/stdout"
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.05.out b/usr.bin/yacc/tests/regress.05.out
deleted file mode 100644
index 2fbf0d93b211..000000000000
--- a/usr.bin/yacc/tests/regress.05.out
+++ /dev/null
@@ -1,425 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 2 "code_error.y"
-
-#ifdef YYBISON
-int yylex(void);
-static void yyerror(const char *);
-#endif
-
-#line 26 "/dev/stdout"
-
-#ifndef YYSTYPE
-typedef int YYSTYPE;
-#endif
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,
-};
-static const short yylen[] = {                            2,
-    1,
-};
-static const short yydefred[] = {                         0,
-    1,    0,
-};
-static const short yydgoto[] = {                          2,
-};
-static const short yysindex[] = {                      -256,
-    0,    0,
-};
-static const short yyrindex[] = {                         0,
-    0,    0,
-};
-static const short yygindex[] = {                         0,
-};
-#define YYTABLESIZE 0
-static const short yytable[] = {                          1,
-};
-static const short yycheck[] = {                        256,
-};
-#define YYFINAL 2
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 0
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file","illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : S",
-"S : error",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 12 "code_error.y"
-
-#include <stdio.h>
-
-#ifdef YYBYACC
-extern int YYLEX_DECL();
-#endif
-
-int
-main(void)
-{
-    printf("yyparse() = %d\n", yyparse());
-    return 0;
-}
-
-int
-yylex(void)
-{
-    return -1;
-}
-
-static void
-yyerror(const char* s)
-{
-    printf("%s\n", s);
-}
-#line 164 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.06.out b/usr.bin/yacc/tests/regress.06.out
deleted file mode 100644
index d2305e197152..000000000000
--- a/usr.bin/yacc/tests/regress.06.out
+++ /dev/null
@@ -1,417 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 2 "error.y"
-int yylex(void);
-static void yyerror(const char *);
-#line 22 "/dev/stdout"
-
-#ifndef YYSTYPE
-typedef int YYSTYPE;
-#endif
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,
-};
-static const short yylen[] = {                            2,
-    1,
-};
-static const short yydefred[] = {                         0,
-    1,    0,
-};
-static const short yydgoto[] = {                          2,
-};
-static const short yysindex[] = {                      -256,
-    0,    0,
-};
-static const short yyrindex[] = {                         0,
-    0,    0,
-};
-static const short yygindex[] = {                         0,
-};
-#define YYTABLESIZE 0
-static const short yytable[] = {                          1,
-};
-static const short yycheck[] = {                        256,
-};
-#define YYFINAL 2
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 0
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file","illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : S",
-"S : error",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 8 "error.y"
-
-#include <stdio.h>
-
-int
-main(void)
-{
-    printf("yyparse() = %d\n", yyparse());
-    return 0;
-}
-
-int
-yylex(void)
-{
-    return -1;
-}
-
-static void
-yyerror(const char* s)
-{
-    printf("%s\n", s);
-}
-#line 156 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.07.out b/usr.bin/yacc/tests/regress.07.out
deleted file mode 100644
index ae185a01ea6c..000000000000
--- a/usr.bin/yacc/tests/regress.07.out
+++ /dev/null
@@ -1,1912 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 26 "ftp.y"
-
-/* sccsid[] = "@(#)ftpcmd.y	5.20.1.1 (Berkeley) 3/2/89"; */
-
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
-#include <arpa/ftp.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <signal.h>
-#include <ctype.h>
-#include <pwd.h>
-#include <setjmp.h>
-#include <syslog.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <time.h>
-#include <assert.h>
-
-#ifdef YYBISON
-int yylex(void);
-static void yyerror(const char *);
-#endif
-
-extern	struct sockaddr_in data_dest;
-extern	int logged_in;
-extern	struct passwd *pw;
-extern	int guest;
-extern	int logging;
-extern	int type;
-extern	int form;
-extern	int debug;
-extern	int timeout;
-extern	int maxtimeout;
-extern  int pdata;
-extern	char hostname[], remotehost[];
-extern	char proctitle[];
-extern	char *globerr;
-extern	int usedefault;
-extern  int transflag;
-extern  char tmpline[];
-
-extern char **glob(char *);
-extern char *renamefrom(char *);
-extern void cwd(const char *);
-
-extern void dologout(int);
-extern void fatal(const char *);
-extern void makedir(const char *);
-extern void nack(const char *);
-extern void pass(const char *);
-extern void passive(void);
-extern void pwd(void);
-extern void removedir(char *);
-extern void renamecmd(char *, char *);
-extern void retrieve(const char *, const char *);
-extern void send_file_list(const char *);
-extern void statcmd(void);
-extern void statfilecmd(const char *);
-extern void store(char *, const char *, int);
-extern void user(const char *);
-
-extern void perror_reply(int, const char *, ...);
-extern void reply(int, const char *, ...);
-extern void lreply(int, const char *, ...);
-
-static	int cmd_type;
-static	int cmd_form;
-static	int cmd_bytesz;
-char	cbuf[512];
-char	*fromname;
-
-struct tab {
-	const char *name;
-	short	token;
-	short	state;
-	short	implemented;	/* 1 if command is implemented */
-	const char *help;
-};
-
-static char * copy(const char *);
-
-#ifdef YYBISON
-static void sizecmd(char *filename);
-static void help(struct tab *ctab, char *s);
-struct tab cmdtab[];
-struct tab sitetab[];
-#endif
-
-static void
-yyerror(const char *msg)
-{
-	perror(msg);
-}
-#line 118 "/dev/stdout"
-
-#ifndef YYSTYPE
-typedef int YYSTYPE;
-#endif
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define A 257
-#define B 258
-#define C 259
-#define E 260
-#define F 261
-#define I 262
-#define L 263
-#define N 264
-#define P 265
-#define R 266
-#define S 267
-#define T 268
-#define SP 269
-#define CRLF 270
-#define COMMA 271
-#define STRING 272
-#define NUMBER 273
-#define USER 274
-#define PASS 275
-#define ACCT 276
-#define REIN 277
-#define QUIT 278
-#define PORT 279
-#define PASV 280
-#define TYPE 281
-#define STRU 282
-#define MODE 283
-#define RETR 284
-#define STOR 285
-#define APPE 286
-#define MLFL 287
-#define MAIL 288
-#define MSND 289
-#define MSOM 290
-#define MSAM 291
-#define MRSQ 292
-#define MRCP 293
-#define ALLO 294
-#define REST 295
-#define RNFR 296
-#define RNTO 297
-#define ABOR 298
-#define DELE 299
-#define CWD 300
-#define LIST 301
-#define NLST 302
-#define SITE 303
-#define STAT 304
-#define HELP 305
-#define NOOP 306
-#define MKD 307
-#define RMD 308
-#define PWD 309
-#define CDUP 310
-#define STOU 311
-#define SMNT 312
-#define SYST 313
-#define SIZE 314
-#define MDTM 315
-#define UMASK 316
-#define IDLE 317
-#define CHMOD 318
-#define LEXERR 319
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    0,    0,    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,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    2,    3,    4,    4,
-   12,    5,   13,   13,   13,    6,    6,    6,    6,    6,
-    6,    6,    6,    7,    7,    7,    8,    8,    8,   10,
-   14,   11,    9,
-};
-static const short yylen[] = {                            2,
-    0,    2,    2,    4,    4,    4,    2,    4,    4,    4,
-    4,    8,    5,    5,    5,    3,    5,    3,    5,    5,
-    2,    5,    4,    2,    3,    5,    2,    4,    2,    5,
-    5,    3,    3,    4,    6,    5,    7,    9,    4,    6,
-    5,    2,    5,    5,    2,    2,    5,    1,    0,    1,
-    1,   11,    1,    1,    1,    1,    3,    1,    3,    1,
-    1,    3,    2,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    0,
-};
-static const short yydefred[] = {                         1,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   73,   73,   73,    0,   73,    0,    0,   73,   73,   73,
-   73,    0,    0,    0,    0,   73,   73,   73,   73,   73,
-    0,   73,   73,    2,    3,   46,    0,    0,   45,    0,
-    7,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   24,    0,    0,    0,    0,    0,   21,    0,    0,   27,
-   29,    0,    0,    0,    0,    0,   42,    0,    0,   48,
-    0,   50,    0,    0,    0,    0,    0,   60,    0,    0,
-   64,   66,   65,    0,   68,   69,   67,    0,    0,    0,
-    0,    0,    0,   71,    0,   70,    0,    0,   25,    0,
-   18,    0,   16,    0,   73,    0,   73,    0,    0,    0,
-    0,   32,   33,    0,    0,    0,    4,    5,    0,    6,
-    0,    0,    0,   51,   63,    8,    9,   10,    0,    0,
-    0,    0,   11,    0,   23,    0,    0,    0,    0,    0,
-   34,    0,    0,   39,    0,    0,   28,    0,    0,    0,
-    0,    0,    0,   55,   53,   54,   57,   59,   62,   13,
-   14,   15,    0,   47,   22,   26,   19,   17,    0,    0,
-   36,    0,    0,   20,   30,   31,   41,   43,   44,    0,
-    0,   35,   72,    0,   40,    0,    0,    0,   37,    0,
-    0,   12,    0,    0,   38,    0,    0,    0,   52,
-};
-static const short yydgoto[] = {                          1,
-   34,   35,   71,   73,   75,   80,   84,   88,   45,   95,
-  184,  125,  157,   96,
-};
-static const short yysindex[] = {                         0,
- -224, -247, -239, -236, -232, -222, -204, -200, -181, -177,
-    0,    0,    0, -166,    0, -161, -199,    0,    0,    0,
-    0, -160, -159, -264, -158,    0,    0,    0,    0,    0,
- -157,    0,    0,    0,    0,    0, -167, -162,    0, -156,
-    0, -250, -198, -165, -155, -154, -153, -151, -150, -152,
-    0, -145, -252, -229, -217, -302,    0, -144, -146,    0,
-    0, -142, -141, -140, -139, -137,    0, -136, -135,    0,
- -134,    0, -133, -132, -130, -131, -128,    0, -249, -127,
-    0,    0,    0, -126,    0,    0,    0, -125, -152, -152,
- -152, -205, -152,    0, -124,    0, -152, -152,    0, -152,
-    0, -143,    0, -173,    0, -171,    0, -152, -123, -152,
- -152,    0,    0, -152, -152, -152,    0,    0, -138,    0,
- -164, -164, -122,    0,    0,    0,    0,    0, -121, -120,
- -118, -148,    0, -117,    0, -116, -115, -114, -113, -112,
-    0, -163, -111,    0, -110, -109,    0, -107, -106, -105,
- -104, -103, -129,    0,    0,    0,    0,    0,    0,    0,
-    0,    0, -101,    0,    0,    0,    0,    0, -100, -102,
-    0,  -98, -102,    0,    0,    0,    0,    0,    0,  -99,
-  -97,    0,    0,  -95,    0,  -96,  -94,  -92,    0, -152,
-  -93,    0,  -91,  -90,    0,  -88,  -87,  -86,    0,
-};
-static const short yyrindex[] = {                         0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  -83,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  -82,    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,  -81,  -80,    0, -158,    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,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,
-};
-static const short yygindex[] = {                         0,
-    0,    0,    0,    0,    0,    0,    0,    0,   16,  -89,
-  -25,   35,   47,    0,
-};
-#define YYTABLESIZE 190
-static const short yytable[] = {                        129,
-  130,  131,  104,  134,   59,   60,   76,  136,  137,   77,
-  138,   78,   79,  105,  106,  107,   98,   99,  146,  123,
-  148,  149,   36,  124,  150,  151,  152,   46,   47,   37,
-   49,    2,   38,   52,   53,   54,   55,   39,   58,  100,
-  101,   62,   63,   64,   65,   66,   40,   68,   69,    3,
-    4,  102,  103,    5,    6,    7,    8,    9,   10,   11,
-   12,   13,   81,  132,  133,   41,   82,   83,   42,   14,
-   51,   15,   16,   17,   18,   19,   20,   21,   22,   23,
-   24,   25,   26,   27,   28,   29,   30,   43,   31,   32,
-   33,   44,   85,   86,  154,  140,  141,  143,  144,  155,
-  193,   87,   48,  156,   70,  170,  171,   50,   56,   72,
-   57,   61,   67,   89,   90,   91,   74,  163,   93,   94,
-  142,   92,  145,   97,  108,  109,  110,  111,  139,  112,
-  113,  114,  115,  116,  153,  117,  118,  121,  119,  120,
-  122,  180,  126,  127,  128,  135,  147,  186,  160,  161,
-  124,  162,  164,  165,  166,  167,  168,  159,  173,  169,
-  174,  172,  175,  176,  177,  178,  179,  181,  158,  182,
-  183,  185,  190,  187,  189,  188,  191,  192,  195,  194,
-  196,    0,    0,  198,  197,   73,  199,   49,   56,   58,
-};
-static const short yycheck[] = {                         89,
-   90,   91,  305,   93,  269,  270,  257,   97,   98,  260,
-  100,  262,  263,  316,  317,  318,  269,  270,  108,  269,
-  110,  111,  270,  273,  114,  115,  116,   12,   13,  269,
-   15,  256,  269,   18,   19,   20,   21,  270,   23,  269,
-  270,   26,   27,   28,   29,   30,  269,   32,   33,  274,
-  275,  269,  270,  278,  279,  280,  281,  282,  283,  284,
-  285,  286,  261,  269,  270,  270,  265,  266,  269,  294,
-  270,  296,  297,  298,  299,  300,  301,  302,  303,  304,
-  305,  306,  307,  308,  309,  310,  311,  269,  313,  314,
-  315,  269,  258,  259,  259,  269,  270,  269,  270,  264,
-  190,  267,  269,  268,  272,  269,  270,  269,  269,  272,
-  270,  270,  270,  269,  269,  269,  273,  266,  269,  272,
-  105,  273,  107,  269,  269,  272,  269,  269,  272,  270,
-  270,  269,  269,  269,  273,  270,  270,  269,  271,  270,
-  269,  271,  270,  270,  270,  270,  270,  173,  270,  270,
-  273,  270,  270,  270,  270,  270,  270,  123,  269,  272,
-  270,  273,  270,  270,  270,  270,  270,  269,  122,  270,
-  273,  270,  269,  273,  270,  273,  271,  270,  270,  273,
-  271,   -1,   -1,  271,  273,  269,  273,  270,  270,  270,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 319
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file",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,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,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,"A","B","C","E","F","I","L","N",
-"P","R","S","T","SP","CRLF","COMMA","STRING","NUMBER","USER","PASS","ACCT",
-"REIN","QUIT","PORT","PASV","TYPE","STRU","MODE","RETR","STOR","APPE","MLFL",
-"MAIL","MSND","MSOM","MSAM","MRSQ","MRCP","ALLO","REST","RNFR","RNTO","ABOR",
-"DELE","CWD","LIST","NLST","SITE","STAT","HELP","NOOP","MKD","RMD","PWD","CDUP",
-"STOU","SMNT","SYST","SIZE","MDTM","UMASK","IDLE","CHMOD","LEXERR",
-"illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : cmd_list",
-"cmd_list :",
-"cmd_list : cmd_list cmd",
-"cmd_list : cmd_list rcmd",
-"cmd : USER SP username CRLF",
-"cmd : PASS SP password CRLF",
-"cmd : PORT SP host_port CRLF",
-"cmd : PASV CRLF",
-"cmd : TYPE SP type_code CRLF",
-"cmd : STRU SP struct_code CRLF",
-"cmd : MODE SP mode_code CRLF",
-"cmd : ALLO SP NUMBER CRLF",
-"cmd : ALLO SP NUMBER SP R SP NUMBER CRLF",
-"cmd : RETR check_login SP pathname CRLF",
-"cmd : STOR check_login SP pathname CRLF",
-"cmd : APPE check_login SP pathname CRLF",
-"cmd : NLST check_login CRLF",
-"cmd : NLST check_login SP STRING CRLF",
-"cmd : LIST check_login CRLF",
-"cmd : LIST check_login SP pathname CRLF",
-"cmd : STAT check_login SP pathname CRLF",
-"cmd : STAT CRLF",
-"cmd : DELE check_login SP pathname CRLF",
-"cmd : RNTO SP pathname CRLF",
-"cmd : ABOR CRLF",
-"cmd : CWD check_login CRLF",
-"cmd : CWD check_login SP pathname CRLF",
-"cmd : HELP CRLF",
-"cmd : HELP SP STRING CRLF",
-"cmd : NOOP CRLF",
-"cmd : MKD check_login SP pathname CRLF",
-"cmd : RMD check_login SP pathname CRLF",
-"cmd : PWD check_login CRLF",
-"cmd : CDUP check_login CRLF",
-"cmd : SITE SP HELP CRLF",
-"cmd : SITE SP HELP SP STRING CRLF",
-"cmd : SITE SP UMASK check_login CRLF",
-"cmd : SITE SP UMASK check_login SP octal_number CRLF",
-"cmd : SITE SP CHMOD check_login SP octal_number SP pathname CRLF",
-"cmd : SITE SP IDLE CRLF",
-"cmd : SITE SP IDLE SP NUMBER CRLF",
-"cmd : STOU check_login SP pathname CRLF",
-"cmd : SYST CRLF",
-"cmd : SIZE check_login SP pathname CRLF",
-"cmd : MDTM check_login SP pathname CRLF",
-"cmd : QUIT CRLF",
-"cmd : error CRLF",
-"rcmd : RNFR check_login SP pathname CRLF",
-"username : STRING",
-"password :",
-"password : STRING",
-"byte_size : NUMBER",
-"host_port : NUMBER COMMA NUMBER COMMA NUMBER COMMA NUMBER COMMA NUMBER COMMA NUMBER",
-"form_code : N",
-"form_code : T",
-"form_code : C",
-"type_code : A",
-"type_code : A SP form_code",
-"type_code : E",
-"type_code : E SP form_code",
-"type_code : I",
-"type_code : L",
-"type_code : L SP byte_size",
-"type_code : L byte_size",
-"struct_code : F",
-"struct_code : R",
-"struct_code : P",
-"mode_code : S",
-"mode_code : B",
-"mode_code : C",
-"pathname : pathstring",
-"pathstring : STRING",
-"octal_number : NUMBER",
-"check_login :",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 707 "ftp.y"
-
-#ifdef YYBYACC
-extern int YYLEX_DECL();
-#endif
-
-extern jmp_buf errcatch;
-
-static void upper(char *);
-
-#define	CMD	0	/* beginning of command */
-#define	ARGS	1	/* expect miscellaneous arguments */
-#define	STR1	2	/* expect SP followed by STRING */
-#define	STR2	3	/* expect STRING */
-#define	OSTR	4	/* optional SP then STRING */
-#define	ZSTR1	5	/* SP then optional STRING */
-#define	ZSTR2	6	/* optional STRING after SP */
-#define	SITECMD	7	/* SITE command */
-#define	NSTR	8	/* Number followed by a string */
-
-struct tab cmdtab[] = {		/* In order defined in RFC 765 */
-	{ "USER", USER, STR1, 1,	"<sp> username" },
-	{ "PASS", PASS, ZSTR1, 1,	"<sp> password" },
-	{ "ACCT", ACCT, STR1, 0,	"(specify account)" },
-	{ "SMNT", SMNT, ARGS, 0,	"(structure mount)" },
-	{ "REIN", REIN, ARGS, 0,	"(reinitialize server state)" },
-	{ "QUIT", QUIT, ARGS, 1,	"(terminate service)", },
-	{ "PORT", PORT, ARGS, 1,	"<sp> b0, b1, b2, b3, b4" },
-	{ "PASV", PASV, ARGS, 1,	"(set server in passive mode)" },
-	{ "TYPE", TYPE, ARGS, 1,	"<sp> [ A | E | I | L ]" },
-	{ "STRU", STRU, ARGS, 1,	"(specify file structure)" },
-	{ "MODE", MODE, ARGS, 1,	"(specify transfer mode)" },
-	{ "RETR", RETR, STR1, 1,	"<sp> file-name" },
-	{ "STOR", STOR, STR1, 1,	"<sp> file-name" },
-	{ "APPE", APPE, STR1, 1,	"<sp> file-name" },
-	{ "MLFL", MLFL, OSTR, 0,	"(mail file)" },
-	{ "MAIL", MAIL, OSTR, 0,	"(mail to user)" },
-	{ "MSND", MSND, OSTR, 0,	"(mail send to terminal)" },
-	{ "MSOM", MSOM, OSTR, 0,	"(mail send to terminal or mailbox)" },
-	{ "MSAM", MSAM, OSTR, 0,	"(mail send to terminal and mailbox)" },
-	{ "MRSQ", MRSQ, OSTR, 0,	"(mail recipient scheme question)" },
-	{ "MRCP", MRCP, STR1, 0,	"(mail recipient)" },
-	{ "ALLO", ALLO, ARGS, 1,	"allocate storage (vacuously)" },
-	{ "REST", REST, ARGS, 0,	"(restart command)" },
-	{ "RNFR", RNFR, STR1, 1,	"<sp> file-name" },
-	{ "RNTO", RNTO, STR1, 1,	"<sp> file-name" },
-	{ "ABOR", ABOR, ARGS, 1,	"(abort operation)" },
-	{ "DELE", DELE, STR1, 1,	"<sp> file-name" },
-	{ "CWD",  CWD,  OSTR, 1,	"[ <sp> directory-name ]" },
-	{ "XCWD", CWD,	OSTR, 1,	"[ <sp> directory-name ]" },
-	{ "LIST", LIST, OSTR, 1,	"[ <sp> path-name ]" },
-	{ "NLST", NLST, OSTR, 1,	"[ <sp> path-name ]" },
-	{ "SITE", SITE, SITECMD, 1,	"site-cmd [ <sp> arguments ]" },
-	{ "SYST", SYST, ARGS, 1,	"(get type of operating system)" },
-	{ "STAT", STAT, OSTR, 1,	"[ <sp> path-name ]" },
-	{ "HELP", HELP, OSTR, 1,	"[ <sp> <string> ]" },
-	{ "NOOP", NOOP, ARGS, 1,	"" },
-	{ "MKD",  MKD,  STR1, 1,	"<sp> path-name" },
-	{ "XMKD", MKD,  STR1, 1,	"<sp> path-name" },
-	{ "RMD",  RMD,  STR1, 1,	"<sp> path-name" },
-	{ "XRMD", RMD,  STR1, 1,	"<sp> path-name" },
-	{ "PWD",  PWD,  ARGS, 1,	"(return current directory)" },
-	{ "XPWD", PWD,  ARGS, 1,	"(return current directory)" },
-	{ "CDUP", CDUP, ARGS, 1,	"(change to parent directory)" },
-	{ "XCUP", CDUP, ARGS, 1,	"(change to parent directory)" },
-	{ "STOU", STOU, STR1, 1,	"<sp> file-name" },
-	{ "SIZE", SIZE, OSTR, 1,	"<sp> path-name" },
-	{ "MDTM", MDTM, OSTR, 1,	"<sp> path-name" },
-	{ 0,   0,    0,    0,	0 }
-};
-
-struct tab sitetab[] = {
-	{ "UMASK", UMASK, ARGS, 1,	"[ <sp> umask ]" },
-	{ "IDLE", IDLE, ARGS, 1,	"[ <sp> maximum-idle-time ]" },
-	{ "CHMOD", CHMOD, NSTR, 1,	"<sp> mode <sp> file-name" },
-	{ "HELP", HELP, OSTR, 1,	"[ <sp> <string> ]" },
-	{ 0,   0,    0,    0,	0 }
-};
-
-static struct tab *
-lookup(struct tab *p, char *cmd)
-{
-
-	for (; p->name != 0; p++)
-		if (strcmp(cmd, p->name) == 0)
-			return (p);
-	return (0);
-}
-
-#include <arpa/telnet.h>
-
-/*
- * get_line - a hacked up version of fgets to ignore TELNET escape codes.
- */
-static char *
-get_line(char *s, int n, FILE *iop)
-{
-	register int c;
-	register char *cs;
-
-	cs = s;
-/* tmpline may contain saved command from urgent mode interruption */
-	for (c = 0; tmpline[c] != '\0' && --n > 0; ++c) {
-		*cs++ = tmpline[c];
-		if (tmpline[c] == '\n') {
-			*cs = '\0';
-			if (debug)
-				syslog(LOG_DEBUG, "command: %s", s);
-			tmpline[0] = '\0';
-			return(s);
-		}
-		if (c == 0)
-			tmpline[0] = '\0';
-	}
-	while ((c = getc(iop)) != EOF) {
-		c &= 0377;
-		if (c == IAC) {
-		    if ((c = getc(iop)) != EOF) {
-			c &= 0377;
-			switch (c) {
-			case WILL:
-			case WONT:
-				c = getc(iop);
-				printf("%c%c%c", IAC, DONT, 0377&c);
-				(void) fflush(stdout);
-				continue;
-			case DO:
-			case DONT:
-				c = getc(iop);
-				printf("%c%c%c", IAC, WONT, 0377&c);
-				(void) fflush(stdout);
-				continue;
-			case IAC:
-				break;
-			default:
-				continue;	/* ignore command */
-			}
-		    }
-		}
-		*cs++ = c;
-		if (--n <= 0 || c == '\n')
-			break;
-	}
-	if (c == EOF && cs == s)
-		return (0);
-	*cs = '\0';
-	if (debug)
-		syslog(LOG_DEBUG, "command: %s", s);
-	return (s);
-}
-
-static void
-toolong(int sig)
-{
-	time_t now;
-
-	(void) sig;
-	reply(421,
-	  "Timeout (%d seconds): closing control connection.", timeout);
-	(void) time(&now);
-	if (logging) {
-		syslog(LOG_INFO,
-			"User %s timed out after %d seconds at %s",
-			(pw ? pw -> pw_name : "unknown"), timeout, ctime(&now));
-	}
-	dologout(1);
-}
-
-int
-yylex(void)
-{
-	static int cpos, state;
-	register char *cp, *cp2;
-	register struct tab *p;
-	int n;
-	char c;
-
-	for (;;) {
-		switch (state) {
-
-		case CMD:
-			(void) signal(SIGALRM, toolong);
-			(void) alarm((unsigned) timeout);
-			if (get_line(cbuf, sizeof(cbuf)-1, stdin) == 0) {
-				reply(221, "You could at least say goodbye.");
-				dologout(0);
-			}
-			(void) alarm(0);
-#ifdef SETPROCTITLE
-			if (strncasecmp(cbuf, "PASS", 4) != 0)
-				setproctitle("%s: %s", proctitle, cbuf);
-#endif /* SETPROCTITLE */
-			if ((cp = strchr(cbuf, '\r'))) {
-				*cp++ = '\n';
-				*cp = '\0';
-			}
-			if ((cp = strpbrk(cbuf, " \n")))
-				cpos = cp - cbuf;
-			if (cpos == 0)
-				cpos = 4;
-			c = cbuf[cpos];
-			cbuf[cpos] = '\0';
-			upper(cbuf);
-			p = lookup(cmdtab, cbuf);
-			cbuf[cpos] = c;
-			if (p != 0) {
-				if (p->implemented == 0) {
-					nack(p->name);
-					longjmp(errcatch,0);
-					/* NOTREACHED */
-				}
-				state = p->state;
-				*(const char **)(&yylval) = p->name;
-				return (p->token);
-			}
-			break;
-
-		case SITECMD:
-			if (cbuf[cpos] == ' ') {
-				cpos++;
-				return (SP);
-			}
-			cp = &cbuf[cpos];
-			if ((cp2 = strpbrk(cp, " \n")))
-				cpos = cp2 - cbuf;
-			c = cbuf[cpos];
-			cbuf[cpos] = '\0';
-			upper(cp);
-			p = lookup(sitetab, cp);
-			cbuf[cpos] = c;
-			if (p != 0) {
-				if (p->implemented == 0) {
-					state = CMD;
-					nack(p->name);
-					longjmp(errcatch,0);
-					/* NOTREACHED */
-				}
-				state = p->state;
-				*(const char **)(&yylval) = p->name;
-				return (p->token);
-			}
-			state = CMD;
-			break;
-
-		case OSTR:
-			if (cbuf[cpos] == '\n') {
-				state = CMD;
-				return (CRLF);
-			}
-			/* FALLTHROUGH */
-
-		case STR1:
-		case ZSTR1:
-		dostr1:
-			if (cbuf[cpos] == ' ') {
-				cpos++;
-				if (state == OSTR)
-					state = STR2;
-				else
-					++state;
-				return (SP);
-			}
-			break;
-
-		case ZSTR2:
-			if (cbuf[cpos] == '\n') {
-				state = CMD;
-				return (CRLF);
-			}
-			/* FALLTHROUGH */
-
-		case STR2:
-			cp = &cbuf[cpos];
-			n = strlen(cp);
-			cpos += n - 1;
-			/*
-			 * Make sure the string is nonempty and \n terminated.
-			 */
-			if (n > 1 && cbuf[cpos] == '\n') {
-				cbuf[cpos] = '\0';
-				*(char **)&yylval = copy(cp);
-				cbuf[cpos] = '\n';
-				state = ARGS;
-				return (STRING);
-			}
-			break;
-
-		case NSTR:
-			if (cbuf[cpos] == ' ') {
-				cpos++;
-				return (SP);
-			}
-			if (isdigit(cbuf[cpos])) {
-				cp = &cbuf[cpos];
-				while (isdigit(cbuf[++cpos]))
-					;
-				c = cbuf[cpos];
-				cbuf[cpos] = '\0';
-				yylval = atoi(cp);
-				cbuf[cpos] = c;
-				state = STR1;
-				return (NUMBER);
-			}
-			state = STR1;
-			goto dostr1;
-
-		case ARGS:
-			if (isdigit(cbuf[cpos])) {
-				cp = &cbuf[cpos];
-				while (isdigit(cbuf[++cpos]))
-					;
-				c = cbuf[cpos];
-				cbuf[cpos] = '\0';
-				yylval = atoi(cp);
-				cbuf[cpos] = c;
-				return (NUMBER);
-			}
-			switch (cbuf[cpos++]) {
-
-			case '\n':
-				state = CMD;
-				return (CRLF);
-
-			case ' ':
-				return (SP);
-
-			case ',':
-				return (COMMA);
-
-			case 'A':
-			case 'a':
-				return (A);
-
-			case 'B':
-			case 'b':
-				return (B);
-
-			case 'C':
-			case 'c':
-				return (C);
-
-			case 'E':
-			case 'e':
-				return (E);
-
-			case 'F':
-			case 'f':
-				return (F);
-
-			case 'I':
-			case 'i':
-				return (I);
-
-			case 'L':
-			case 'l':
-				return (L);
-
-			case 'N':
-			case 'n':
-				return (N);
-
-			case 'P':
-			case 'p':
-				return (P);
-
-			case 'R':
-			case 'r':
-				return (R);
-
-			case 'S':
-			case 's':
-				return (S);
-
-			case 'T':
-			case 't':
-				return (T);
-
-			}
-			break;
-
-		default:
-			fatal("Unknown state in scanner.");
-		}
-		yyerror((char *) 0);
-		state = CMD;
-		longjmp(errcatch,0);
-	}
-}
-
-static void
-upper(char *s)
-{
-	while (*s != '\0') {
-		if (islower(*s))
-			*s = toupper(*s);
-		s++;
-	}
-}
-
-static char *
-copy(const char *s)
-{
-	char *p;
-
-	p = (char * )malloc(strlen(s) + 1);
-	if (p == 0)
-		fatal("Ran out of memory.");
-	else
-		(void) strcpy(p, s);
-	return (p);
-}
-
-static void
-help(struct tab *ctab, char *s)
-{
-	register struct tab *c;
-	register int width, NCMDS;
-	const char *help_type;
-
-	if (ctab == sitetab)
-		help_type = "SITE ";
-	else
-		help_type = "";
-	width = 0, NCMDS = 0;
-	for (c = ctab; c->name != 0; c++) {
-		int len = strlen(c->name);
-
-		if (len > width)
-			width = len;
-		NCMDS++;
-	}
-	width = (width + 8) &~ 7;
-	if (s == 0) {
-		register int i, j, w;
-		int columns, lines;
-
-		lreply(214, "The following %scommands are recognized %s.",
-		    help_type, "(* =>'s unimplemented)");
-		columns = 76 / width;
-		if (columns == 0)
-			columns = 1;
-		lines = (NCMDS + columns - 1) / columns;
-		for (i = 0; i < lines; i++) {
-			printf("   ");
-			for (j = 0; j < columns; j++) {
-				c = ctab + j * lines + i;
-				assert(c->name != 0);
-				printf("%s%c", c->name,
-					c->implemented ? ' ' : '*');
-				if (c + lines >= &ctab[NCMDS])
-					break;
-				w = strlen(c->name) + 1;
-				while (w < width) {
-					putchar(' ');
-					w++;
-				}
-			}
-			printf("\r\n");
-		}
-		(void) fflush(stdout);
-		reply(214, "Direct comments to ftp-bugs@%s.", hostname);
-		return;
-	}
-	upper(s);
-	c = lookup(ctab, s);
-	if (c == (struct tab *)0) {
-		reply(502, "Unknown command %s.", s);
-		return;
-	}
-	if (c->implemented)
-		reply(214, "Syntax: %s%s %s", help_type, c->name, c->help);
-	else
-		reply(214, "%s%-*s\t%s; unimplemented.", help_type, width,
-		    c->name, c->help);
-}
-
-static void
-sizecmd(char *filename)
-{
-	switch (type) {
-	case TYPE_L:
-	case TYPE_I: {
-		struct stat stbuf;
-		if (stat(filename, &stbuf) < 0 ||
-		    (stbuf.st_mode&S_IFMT) != S_IFREG)
-			reply(550, "%s: not a plain file.", filename);
-		else
-#ifdef HAVE_LONG_LONG
-			reply(213, "%llu", (long long) stbuf.st_size);
-#else
-			reply(213, "%lu", stbuf.st_size);
-#endif
-		break;}
-	case TYPE_A: {
-		FILE *fin;
-		register int c, count;
-		struct stat stbuf;
-		fin = fopen(filename, "r");
-		if (fin == 0) {
-			perror_reply(550, filename);
-			return;
-		}
-		if (fstat(fileno(fin), &stbuf) < 0 ||
-		    (stbuf.st_mode&S_IFMT) != S_IFREG) {
-			reply(550, "%s: not a plain file.", filename);
-			(void) fclose(fin);
-			return;
-		}
-
-		count = 0;
-		while((c=getc(fin)) != EOF) {
-			if (c == '\n')	/* will get expanded to \r\n */
-				count++;
-			count++;
-		}
-		(void) fclose(fin);
-
-		reply(213, "%ld", count);
-		break;}
-	default:
-		reply(504, "SIZE not implemented for Type %c.", "?AEIL"[type]);
-	}
-}
-#line 1013 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-case 2:
-#line 150 "ftp.y"
-	{
-			fromname = (char *) 0;
-		}
-break;
-case 4:
-#line 157 "ftp.y"
-	{
-			user((char *) yystack.l_mark[-1]);
-			free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 5:
-#line 162 "ftp.y"
-	{
-			pass((char *) yystack.l_mark[-1]);
-			free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 6:
-#line 167 "ftp.y"
-	{
-			usedefault = 0;
-			if (pdata >= 0) {
-				(void) close(pdata);
-				pdata = -1;
-			}
-			reply(200, "PORT command successful.");
-		}
-break;
-case 7:
-#line 176 "ftp.y"
-	{
-			passive();
-		}
-break;
-case 8:
-#line 180 "ftp.y"
-	{
-			switch (cmd_type) {
-
-			case TYPE_A:
-				if (cmd_form == FORM_N) {
-					reply(200, "Type set to A.");
-					type = cmd_type;
-					form = cmd_form;
-				} else
-					reply(504, "Form must be N.");
-				break;
-
-			case TYPE_E:
-				reply(504, "Type E not implemented.");
-				break;
-
-			case TYPE_I:
-				reply(200, "Type set to I.");
-				type = cmd_type;
-				break;
-
-			case TYPE_L:
-#if NBBY == 8
-				if (cmd_bytesz == 8) {
-					reply(200,
-					    "Type set to L (byte size 8).");
-					type = cmd_type;
-				} else
-					reply(504, "Byte size must be 8.");
-#else /* NBBY == 8 */
-				UNIMPLEMENTED for NBBY != 8
-#endif /* NBBY == 8 */
-			}
-		}
-break;
-case 9:
-#line 215 "ftp.y"
-	{
-			switch (yystack.l_mark[-1]) {
-
-			case STRU_F:
-				reply(200, "STRU F ok.");
-				break;
-
-			default:
-				reply(504, "Unimplemented STRU type.");
-			}
-		}
-break;
-case 10:
-#line 227 "ftp.y"
-	{
-			switch (yystack.l_mark[-1]) {
-
-			case MODE_S:
-				reply(200, "MODE S ok.");
-				break;
-
-			default:
-				reply(502, "Unimplemented MODE type.");
-			}
-		}
-break;
-case 11:
-#line 239 "ftp.y"
-	{
-			reply(202, "ALLO command ignored.");
-		}
-break;
-case 12:
-#line 243 "ftp.y"
-	{
-			reply(202, "ALLO command ignored.");
-		}
-break;
-case 13:
-#line 247 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0)
-				retrieve((char *) 0, (char *) yystack.l_mark[-1]);
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 14:
-#line 254 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0)
-				store((char *) yystack.l_mark[-1], "w", 0);
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 15:
-#line 261 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0)
-				store((char *) yystack.l_mark[-1], "a", 0);
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 16:
-#line 268 "ftp.y"
-	{
-			if (yystack.l_mark[-1])
-				send_file_list(".");
-		}
-break;
-case 17:
-#line 273 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0)
-				send_file_list((char *) yystack.l_mark[-1]);
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 18:
-#line 280 "ftp.y"
-	{
-			if (yystack.l_mark[-1])
-				retrieve("/bin/ls -lgA", "");
-		}
-break;
-case 19:
-#line 285 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0)
-				retrieve("/bin/ls -lgA %s", (char *) yystack.l_mark[-1]);
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 20:
-#line 292 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0)
-				statfilecmd((char *) yystack.l_mark[-1]);
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 21:
-#line 299 "ftp.y"
-	{
-			statcmd();
-		}
-break;
-case 22:
-#line 303 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0)
-				remove((char *) yystack.l_mark[-1]);
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 23:
-#line 310 "ftp.y"
-	{
-			if (fromname) {
-				renamecmd(fromname, (char *) yystack.l_mark[-1]);
-				free(fromname);
-				fromname = (char *) 0;
-			} else {
-				reply(503, "Bad sequence of commands.");
-			}
-			free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 24:
-#line 321 "ftp.y"
-	{
-			reply(225, "ABOR command successful.");
-		}
-break;
-case 25:
-#line 325 "ftp.y"
-	{
-			if (yystack.l_mark[-1])
-				cwd(pw->pw_dir);
-		}
-break;
-case 26:
-#line 330 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0)
-				cwd((char *) yystack.l_mark[-1]);
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 27:
-#line 337 "ftp.y"
-	{
-			help(cmdtab, (char *) 0);
-		}
-break;
-case 28:
-#line 341 "ftp.y"
-	{
-			register char *cp = (char *)yystack.l_mark[-1];
-
-			if (strncasecmp(cp, "SITE", 4) == 0) {
-				cp = (char *)yystack.l_mark[-1] + 4;
-				if (*cp == ' ')
-					cp++;
-				if (*cp)
-					help(sitetab, cp);
-				else
-					help(sitetab, (char *) 0);
-			} else
-				help(cmdtab, (char *) yystack.l_mark[-1]);
-		}
-break;
-case 29:
-#line 356 "ftp.y"
-	{
-			reply(200, "NOOP command successful.");
-		}
-break;
-case 30:
-#line 360 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0)
-				makedir((char *) yystack.l_mark[-1]);
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 31:
-#line 367 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0)
-				removedir((char *) yystack.l_mark[-1]);
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 32:
-#line 374 "ftp.y"
-	{
-			if (yystack.l_mark[-1])
-				pwd();
-		}
-break;
-case 33:
-#line 379 "ftp.y"
-	{
-			if (yystack.l_mark[-1])
-				cwd("..");
-		}
-break;
-case 34:
-#line 384 "ftp.y"
-	{
-			help(sitetab, (char *) 0);
-		}
-break;
-case 35:
-#line 388 "ftp.y"
-	{
-			help(sitetab, (char *) yystack.l_mark[-1]);
-		}
-break;
-case 36:
-#line 392 "ftp.y"
-	{
-			int oldmask;
-
-			if (yystack.l_mark[-1]) {
-				oldmask = umask(0);
-				(void) umask(oldmask);
-				reply(200, "Current UMASK is %03o", oldmask);
-			}
-		}
-break;
-case 37:
-#line 402 "ftp.y"
-	{
-			int oldmask;
-
-			if (yystack.l_mark[-3]) {
-				if ((yystack.l_mark[-1] == -1) || (yystack.l_mark[-1] > 0777)) {
-					reply(501, "Bad UMASK value");
-				} else {
-					oldmask = umask(yystack.l_mark[-1]);
-					reply(200,
-					    "UMASK set to %03o (was %03o)",
-					    yystack.l_mark[-1], oldmask);
-				}
-			}
-		}
-break;
-case 38:
-#line 417 "ftp.y"
-	{
-			if (yystack.l_mark[-5] && (yystack.l_mark[-1] != 0)) {
-				if (yystack.l_mark[-3] > 0777)
-					reply(501,
-				"CHMOD: Mode value must be between 0 and 0777");
-				else if (chmod((char *) yystack.l_mark[-1], yystack.l_mark[-3]) < 0)
-					perror_reply(550, (char *) yystack.l_mark[-1]);
-				else
-					reply(200, "CHMOD command successful.");
-			}
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 39:
-#line 431 "ftp.y"
-	{
-			reply(200,
-			    "Current IDLE time limit is %d seconds; max %d",
-				timeout, maxtimeout);
-		}
-break;
-case 40:
-#line 437 "ftp.y"
-	{
-			if (yystack.l_mark[-1] < 30 || yystack.l_mark[-1] > maxtimeout) {
-				reply(501,
-			"Maximum IDLE time must be between 30 and %d seconds",
-				    maxtimeout);
-			} else {
-				timeout = yystack.l_mark[-1];
-				(void) alarm((unsigned) timeout);
-				reply(200,
-				    "Maximum IDLE time set to %d seconds",
-				    timeout);
-			}
-		}
-break;
-case 41:
-#line 451 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0)
-				store((char *) yystack.l_mark[-1], "w", 1);
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 42:
-#line 458 "ftp.y"
-	{
-#ifdef unix
-#ifdef BSD
-			reply(215, "UNIX Type: L%d Version: BSD-%d",
-				NBBY, BSD);
-#else /* BSD */
-			reply(215, "UNIX Type: L%d", NBBY);
-#endif /* BSD */
-#else /* unix */
-			reply(215, "UNKNOWN Type: L%d", NBBY);
-#endif /* unix */
-		}
-break;
-case 43:
-#line 479 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0)
-				sizecmd((char *) yystack.l_mark[-1]);
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 44:
-#line 496 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1] != 0) {
-				struct stat stbuf;
-				if (stat((char *) yystack.l_mark[-1], &stbuf) < 0)
-					perror_reply(550, "%s", (char *) yystack.l_mark[-1]);
-				else if ((stbuf.st_mode&S_IFMT) != S_IFREG) {
-					reply(550, "%s: not a plain file.",
-						(char *) yystack.l_mark[-1]);
-				} else {
-					register struct tm *t;
-					t = gmtime(&stbuf.st_mtime);
-					reply(213,
-					    "%04d%02d%02d%02d%02d%02d",
-					    1900 + t->tm_year,
-					    t->tm_mon+1, t->tm_mday,
-					    t->tm_hour, t->tm_min, t->tm_sec);
-				}
-			}
-			if (yystack.l_mark[-1] != 0)
-				free((char *) yystack.l_mark[-1]);
-		}
-break;
-case 45:
-#line 518 "ftp.y"
-	{
-			reply(221, "Goodbye.");
-			dologout(0);
-		}
-break;
-case 46:
-#line 523 "ftp.y"
-	{
-			yyerrok;
-		}
-break;
-case 47:
-#line 528 "ftp.y"
-	{
-			if (yystack.l_mark[-3] && yystack.l_mark[-1]) {
-				fromname = renamefrom((char *) yystack.l_mark[-1]);
-				if (fromname == (char *) 0 && yystack.l_mark[-1]) {
-					free((char *) yystack.l_mark[-1]);
-				}
-			}
-		}
-break;
-case 49:
-#line 542 "ftp.y"
-	{
-			*(const char **)(&(yyval)) = "";
-		}
-break;
-case 52:
-#line 553 "ftp.y"
-	{
-			register char *a, *p;
-
-			a = (char *)&data_dest.sin_addr;
-			a[0] = yystack.l_mark[-10]; a[1] = yystack.l_mark[-8]; a[2] = yystack.l_mark[-6]; a[3] = yystack.l_mark[-4];
-			p = (char *)&data_dest.sin_port;
-			p[0] = yystack.l_mark[-2]; p[1] = yystack.l_mark[0];
-			data_dest.sin_family = AF_INET;
-		}
-break;
-case 53:
-#line 565 "ftp.y"
-	{
-		yyval = FORM_N;
-	}
-break;
-case 54:
-#line 569 "ftp.y"
-	{
-		yyval = FORM_T;
-	}
-break;
-case 55:
-#line 573 "ftp.y"
-	{
-		yyval = FORM_C;
-	}
-break;
-case 56:
-#line 579 "ftp.y"
-	{
-		cmd_type = TYPE_A;
-		cmd_form = FORM_N;
-	}
-break;
-case 57:
-#line 584 "ftp.y"
-	{
-		cmd_type = TYPE_A;
-		cmd_form = yystack.l_mark[0];
-	}
-break;
-case 58:
-#line 589 "ftp.y"
-	{
-		cmd_type = TYPE_E;
-		cmd_form = FORM_N;
-	}
-break;
-case 59:
-#line 594 "ftp.y"
-	{
-		cmd_type = TYPE_E;
-		cmd_form = yystack.l_mark[0];
-	}
-break;
-case 60:
-#line 599 "ftp.y"
-	{
-		cmd_type = TYPE_I;
-	}
-break;
-case 61:
-#line 603 "ftp.y"
-	{
-		cmd_type = TYPE_L;
-		cmd_bytesz = NBBY;
-	}
-break;
-case 62:
-#line 608 "ftp.y"
-	{
-		cmd_type = TYPE_L;
-		cmd_bytesz = yystack.l_mark[0];
-	}
-break;
-case 63:
-#line 614 "ftp.y"
-	{
-		cmd_type = TYPE_L;
-		cmd_bytesz = yystack.l_mark[0];
-	}
-break;
-case 64:
-#line 621 "ftp.y"
-	{
-		yyval = STRU_F;
-	}
-break;
-case 65:
-#line 625 "ftp.y"
-	{
-		yyval = STRU_R;
-	}
-break;
-case 66:
-#line 629 "ftp.y"
-	{
-		yyval = STRU_P;
-	}
-break;
-case 67:
-#line 635 "ftp.y"
-	{
-		yyval = MODE_S;
-	}
-break;
-case 68:
-#line 639 "ftp.y"
-	{
-		yyval = MODE_B;
-	}
-break;
-case 69:
-#line 643 "ftp.y"
-	{
-		yyval = MODE_C;
-	}
-break;
-case 70:
-#line 649 "ftp.y"
-	{
-		/*
-		 * Problem: this production is used for all pathname
-		 * processing, but only gives a 550 error reply.
-		 * This is a valid reply in some cases but not in others.
-		 */
-		if (logged_in && yystack.l_mark[0] && strncmp((char *) yystack.l_mark[0], "~", 1) == 0) {
-			*(char **)&(yyval) = *glob((char *) yystack.l_mark[0]);
-			if (globerr != 0) {
-				reply(550, globerr);
-				yyval = 0;
-			}
-			free((char *) yystack.l_mark[0]);
-		} else
-			yyval = yystack.l_mark[0];
-	}
-break;
-case 72:
-#line 671 "ftp.y"
-	{
-		register int ret, dec, multby, digit;
-
-		/*
-		 * Convert a number that was read as decimal number
-		 * to what it would be if it had been read as octal.
-		 */
-		dec = yystack.l_mark[0];
-		multby = 1;
-		ret = 0;
-		while (dec) {
-			digit = dec%10;
-			if (digit > 7) {
-				ret = -1;
-				break;
-			}
-			ret += digit * multby;
-			multby *= 8;
-			dec /= 10;
-		}
-		yyval = ret;
-	}
-break;
-case 73:
-#line 696 "ftp.y"
-	{
-		if (logged_in)
-			yyval = 1;
-		else {
-			reply(530, "Please login with USER and PASS.");
-			yyval = 0;
-		}
-	}
-break;
-#line 1852 "/dev/stdout"
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.08.out b/usr.bin/yacc/tests/regress.08.out
deleted file mode 100644
index d5d3ae0545b6..000000000000
--- a/usr.bin/yacc/tests/regress.08.out
+++ /dev/null
@@ -1,1942 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 9 "grammar.y"
-#ifdef YYBISON
-#include <stdlib.h>
-#define YYSTYPE_IS_DECLARED
-#define yyerror yaccError
-#endif
-
-#if defined(YYBISON) || !defined(YYBYACC)
-static void yyerror(const char *s);
-#endif
-#line 81 "grammar.y"
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-
-#define OPT_LINTLIBRARY 1
-
-#ifndef TRUE
-#define	TRUE	(1)
-#endif
-
-#ifndef FALSE
-#define	FALSE	(0)
-#endif
-
-/* #include "cproto.h" */
-#define MAX_TEXT_SIZE 1024
-
-/* Prototype styles */
-#if OPT_LINTLIBRARY
-#define PROTO_ANSI_LLIB		-2	/* form ANSI lint-library source */
-#define PROTO_LINTLIBRARY	-1	/* form lint-library source */
-#endif
-#define PROTO_NONE		0	/* do not output any prototypes */
-#define PROTO_TRADITIONAL	1	/* comment out parameters */
-#define PROTO_ABSTRACT		2	/* comment out parameter names */
-#define PROTO_ANSI		3	/* ANSI C prototype */
-
-typedef int PrototypeStyle;
-
-typedef char boolean;
-
-extern boolean types_out;
-extern PrototypeStyle proto_style;
-
-#define ansiLintLibrary() (proto_style == PROTO_ANSI_LLIB)
-#define knrLintLibrary()  (proto_style == PROTO_LINTLIBRARY)
-#define lintLibrary()     (knrLintLibrary() || ansiLintLibrary())
-
-#if OPT_LINTLIBRARY
-#define FUNC_UNKNOWN		-1	/* unspecified */
-#else
-#define FUNC_UNKNOWN		0	/* unspecified (same as FUNC_NONE) */
-#endif
-#define FUNC_NONE		0	/* not a function definition */
-#define FUNC_TRADITIONAL	1	/* traditional style */
-#define FUNC_ANSI		2	/* ANSI style */
-#define FUNC_BOTH		3	/* both styles */
-
-typedef int FuncDefStyle;
-
-/* Source file text */
-typedef struct text {
-    char text[MAX_TEXT_SIZE];	/* source text */
-    long begin; 		/* offset in temporary file */
-} Text;
-
-/* Declaration specifier flags */
-#define DS_NONE 	0	/* default */
-#define DS_EXTERN	1	/* contains "extern" specifier */
-#define DS_STATIC	2	/* contains "static" specifier */
-#define DS_CHAR 	4	/* contains "char" type specifier */
-#define DS_SHORT	8	/* contains "short" type specifier */
-#define DS_FLOAT	16	/* contains "float" type specifier */
-#define DS_INLINE	32	/* contains "inline" specifier */
-#define DS_JUNK 	64	/* we're not interested in this declaration */
-
-/* This structure stores information about a declaration specifier. */
-typedef struct decl_spec {
-    unsigned short flags;	/* flags defined above */
-    char *text; 		/* source text */
-    long begin; 		/* offset in temporary file */
-} DeclSpec;
-
-/* This is a list of function parameters. */
-typedef struct _ParameterList {
-    struct parameter *first;	/* pointer to first parameter in list */
-    struct parameter *last;	/* pointer to last parameter in list */  
-    long begin_comment; 	/* begin offset of comment */
-    long end_comment;		/* end offset of comment */
-    char *comment;		/* comment at start of parameter list */
-} ParameterList;
-
-/* This structure stores information about a declarator. */
-typedef struct _Declarator {
-    char *name; 			/* name of variable or function */
-    char *text; 			/* source text */
-    long begin; 			/* offset in temporary file */
-    long begin_comment; 		/* begin offset of comment */
-    long end_comment;			/* end offset of comment */
-    FuncDefStyle func_def;		/* style of function definition */
-    ParameterList params;		/* function parameters */
-    boolean pointer;			/* TRUE if it declares a pointer */
-    struct _Declarator *head;		/* head function declarator */
-    struct _Declarator *func_stack;	/* stack of function declarators */
-    struct _Declarator *next;		/* next declarator in list */
-} Declarator;
-
-/* This structure stores information about a function parameter. */
-typedef struct parameter {
-    struct parameter *next;	/* next parameter in list */
-    DeclSpec decl_spec;
-    Declarator *declarator;
-    char *comment;		/* comment following the parameter */
-} Parameter;
-
-/* This is a list of declarators. */
-typedef struct declarator_list {
-    Declarator *first;		/* pointer to first declarator in list */
-    Declarator *last;		/* pointer to last declarator in list */  
-} DeclaratorList;
-
-/* #include "symbol.h" */
-typedef struct symbol {
-    struct symbol *next;	/* next symbol in list */
-    char *name; 		/* name of symbol */
-    char *value;		/* value of symbol (for defines) */
-    short flags;		/* symbol attributes */
-} Symbol;
-
-/* parser stack entry type */
-typedef union {
-    Text text;
-    DeclSpec decl_spec;
-    Parameter *parameter;
-    ParameterList param_list;
-    Declarator *declarator;
-    DeclaratorList decl_list;
-} YYSTYPE;
-
-/* The hash table length should be a prime number. */
-#define SYM_MAX_HASH 251
-
-typedef struct symbol_table {
-    Symbol *bucket[SYM_MAX_HASH];	/* hash buckets */
-} SymbolTable;
-
-extern SymbolTable *new_symbol_table	/* Create symbol table */
-	(void);
-extern void free_symbol_table		/* Destroy symbol table */
-	(SymbolTable *s);
-extern Symbol *find_symbol		/* Lookup symbol name */
-	(SymbolTable *s, const char *n);
-extern Symbol *new_symbol		/* Define new symbol */
-	(SymbolTable *s, const char *n, const char *v, int f);
-
-/* #include "semantic.h" */
-extern void new_decl_spec (DeclSpec *, const char *, long, int);
-extern void free_decl_spec (DeclSpec *);
-extern void join_decl_specs (DeclSpec *, DeclSpec *, DeclSpec *);
-extern void check_untagged (DeclSpec *);
-extern Declarator *new_declarator (const char *, const char *, long);
-extern void free_declarator (Declarator *);
-extern void new_decl_list (DeclaratorList *, Declarator *);
-extern void free_decl_list (DeclaratorList *);
-extern void add_decl_list (DeclaratorList *, DeclaratorList *, Declarator *);
-extern Parameter *new_parameter (DeclSpec *, Declarator *);
-extern void free_parameter (Parameter *);
-extern void new_param_list (ParameterList *, Parameter *);
-extern void free_param_list (ParameterList *);
-extern void add_param_list (ParameterList *, ParameterList *, Parameter *);
-extern void new_ident_list (ParameterList *);
-extern void add_ident_list (ParameterList *, ParameterList *, const char *);
-extern void set_param_types (ParameterList *, DeclSpec *, DeclaratorList *);
-extern void gen_declarations (DeclSpec *, DeclaratorList *);
-extern void gen_prototype (DeclSpec *, Declarator *);
-extern void gen_func_declarator (Declarator *);
-extern void gen_func_definition (DeclSpec *, Declarator *);
-
-extern void init_parser     (void);
-extern void process_file    (FILE *infile, char *name);
-extern char *cur_text       (void);
-extern char *cur_file_name  (void);
-extern char *implied_typedef (void);
-extern void include_file    (char *name, int convert);
-extern char *supply_parm    (int count);
-extern char *xstrdup        (const char *);
-extern int already_declared (char *name);
-extern int is_actual_func   (Declarator *d);
-extern int lint_ellipsis    (Parameter *p);
-extern int want_typedef     (void);
-extern void begin_tracking  (void);
-extern void begin_typedef   (void);
-extern void copy_typedef    (char *s);
-extern void ellipsis_varargs (Declarator *d);
-extern void end_typedef     (void);
-extern void flush_varargs   (void);
-extern void fmt_library     (int code);
-extern void imply_typedef   (const char *s);
-extern void indent          (FILE *outf);
-extern void put_blankline   (FILE *outf);
-extern void put_body        (FILE *outf, DeclSpec *decl_spec, Declarator *declarator);
-extern void put_char        (FILE *outf, int c);
-extern void put_error       (void);
-extern void put_newline     (FILE *outf);
-extern void put_padded      (FILE *outf, const char *s);
-extern void put_string      (FILE *outf, const char *s);
-extern void track_in        (void);
-
-extern boolean file_comments;
-extern FuncDefStyle func_style;
-extern char base_file[];
-
-extern	int	yylex (void);
-
-/* declaration specifier attributes for the typedef statement currently being
- * scanned
- */
-static int cur_decl_spec_flags;
-
-/* pointer to parameter list for the current function definition */
-static ParameterList *func_params;
-
-/* A parser semantic action sets this pointer to the current declarator in
- * a function parameter declaration in order to catch any comments following
- * the parameter declaration on the same line.  If the lexer scans a comment
- * and <cur_declarator> is not NULL, then the comment is attached to the
- * declarator.  To ignore subsequent comments, the lexer sets this to NULL
- * after scanning a comment or end of line.
- */
-static Declarator *cur_declarator;
-
-/* temporary string buffer */
-static char buf[MAX_TEXT_SIZE];
-
-/* table of typedef names */
-static SymbolTable *typedef_names;
-
-/* table of define names */
-static SymbolTable *define_names;
-
-/* table of type qualifiers */
-static SymbolTable *type_qualifiers;
-
-/* information about the current input file */
-typedef struct {
-    char *base_name;		/* base input file name */
-    char *file_name;		/* current file name */
-    FILE *file; 		/* input file */
-    unsigned line_num;		/* current line number in input file */
-    FILE *tmp_file;		/* temporary file */
-    long begin_comment; 	/* tmp file offset after last written ) or ; */
-    long end_comment;		/* tmp file offset after last comment */
-    boolean convert;		/* if TRUE, convert function definitions */
-    boolean changed;		/* TRUE if conversion done in this file */
-} IncludeStack;
-
-static IncludeStack *cur_file;	/* current input file */
-
-/* #include "yyerror.c" */
-
-static int haveAnsiParam (void);
-
-
-/* Flags to enable us to find if a procedure returns a value.
- */
-static int return_val;	/* nonzero on BRACES iff return-expression found */
-
-static const char *
-dft_decl_spec (void)
-{
-    return (lintLibrary() && !return_val) ? "void" : "int";
-}
-
-static int
-haveAnsiParam (void)
-{
-    Parameter *p;
-    if (func_params != 0) {
-	for (p = func_params->first; p != 0; p = p->next) {
-	    if (p->declarator->func_def == FUNC_ANSI) {
-		return TRUE;
-	    }
-	}
-    }
-    return FALSE;
-}
-#line 306 "/dev/stdout"
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define T_IDENTIFIER 257
-#define T_TYPEDEF_NAME 258
-#define T_DEFINE_NAME 259
-#define T_AUTO 260
-#define T_EXTERN 261
-#define T_REGISTER 262
-#define T_STATIC 263
-#define T_TYPEDEF 264
-#define T_INLINE 265
-#define T_EXTENSION 266
-#define T_CHAR 267
-#define T_DOUBLE 268
-#define T_FLOAT 269
-#define T_INT 270
-#define T_VOID 271
-#define T_LONG 272
-#define T_SHORT 273
-#define T_SIGNED 274
-#define T_UNSIGNED 275
-#define T_ENUM 276
-#define T_STRUCT 277
-#define T_UNION 278
-#define T_Bool 279
-#define T_Complex 280
-#define T_Imaginary 281
-#define T_TYPE_QUALIFIER 282
-#define T_BRACKETS 283
-#define T_LBRACE 284
-#define T_MATCHRBRACE 285
-#define T_ELLIPSIS 286
-#define T_INITIALIZER 287
-#define T_STRING_LITERAL 288
-#define T_ASM 289
-#define T_ASMARG 290
-#define T_VA_DCL 291
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    0,   26,   26,   27,   27,   27,   27,   27,   27,
-   27,   31,   30,   30,   28,   28,   34,   28,   32,   32,
-   33,   33,   35,   35,   37,   38,   29,   39,   29,   36,
-   36,   36,   40,   40,    1,    1,    2,    2,    2,    3,
-    3,    3,    3,    3,    3,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-    5,    5,    6,    6,    6,   19,   19,    8,    8,    9,
-   41,    9,    7,    7,    7,   25,   23,   23,   10,   10,
-   11,   11,   11,   11,   11,   20,   20,   21,   21,   22,
-   22,   14,   14,   15,   15,   16,   16,   16,   17,   17,
-   18,   18,   24,   24,   12,   12,   12,   13,   13,   13,
-   13,   13,   13,   13,
-};
-static const short yylen[] = {                            2,
-    0,    1,    1,    2,    1,    1,    1,    1,    3,    2,
-    2,    2,    3,    3,    2,    3,    0,    5,    2,    1,
-    0,    1,    1,    3,    0,    0,    7,    0,    5,    0,
-    1,    1,    1,    2,    1,    2,    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,    3,    2,    2,    1,    1,    1,    3,    1,
-    0,    4,    3,    2,    2,    1,    1,    1,    2,    1,
-    1,    3,    2,    4,    4,    2,    3,    0,    1,    1,
-    2,    1,    3,    1,    3,    2,    2,    1,    0,    1,
-    1,    3,    1,    2,    1,    2,    1,    3,    2,    1,
-    4,    3,    3,    2,
-};
-static const short yydefred[] = {                         0,
-    0,    0,    0,    0,   77,    0,   62,   40,    0,   42,
-   43,   20,   44,    0,   46,   47,   48,   49,   54,   50,
-   51,   52,   53,   76,   66,   67,   55,   56,   57,   61,
-    0,    7,    0,    0,   35,   37,   38,   39,   59,   60,
-   28,    0,    0,    0,  103,   81,    0,    0,    3,    5,
-    6,    8,    0,   10,   11,   78,    0,   90,    0,    0,
-  104,    0,   19,    0,   41,   45,   15,   36,    0,   68,
-    0,    0,    0,   83,    0,    0,   64,    0,    0,   74,
-    4,   58,    0,   82,   87,   91,    0,   14,   13,    9,
-   16,    0,   71,    0,   31,   33,    0,    0,    0,    0,
-    0,   94,    0,    0,  101,   12,   63,   73,    0,    0,
-   69,    0,    0,    0,   34,    0,  110,   96,   97,    0,
-    0,   84,    0,   85,    0,   23,    0,    0,   72,   26,
-   29,  114,    0,    0,    0,  109,    0,   93,   95,  102,
-   18,    0,    0,  108,  113,  112,    0,   24,   27,  111,
-};
-static const short yydgoto[] = {                         33,
-   87,   35,   36,   37,   38,   39,   40,   69,   70,   41,
-   42,  119,  120,  100,  101,  102,  103,  104,   43,   44,
-   59,   60,   45,   46,   47,   48,   49,   50,   51,   52,
-   77,   53,  127,  109,  128,   97,   94,  143,   72,   98,
-  112,
-};
-static const short yysindex[] = {                        -2,
-   -3,   27, -239, -177,    0,    0,    0,    0, -274,    0,
-    0,    0,    0, -246,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
- -266,    0,    0,  455,    0,    0,    0,    0,    0,    0,
-    0,  -35, -245,  128,    0,    0, -245,   -2,    0,    0,
-    0,    0,  642,    0,    0,    0,  -15,    0,  -12, -239,
-    0,  590,    0,  -27,    0,    0,    0,    0,  -10,    0,
-  -11,  534,  -72,    0, -237, -232,    0,  -35, -232,    0,
-    0,    0,  642,    0,    0,    0,  455,    0,    0,    0,
-    0,   27,    0,  534,    0,    0, -222,  617,  209,   34,
-   39,    0,   44,   42,    0,    0,    0,    0,   27,  -11,
-    0, -200, -196, -195,    0,  174,    0,    0,    0,  -33,
-  243,    0,  561,    0, -177,    0,   33,   49,    0,    0,
-    0,    0,   53,   55,  417,    0,  -33,    0,    0,    0,
-    0,   27, -188,    0,    0,    0,   57,    0,    0,    0,
-};
-static const short yyrindex[] = {                        99,
-    0,    0,  275,    0,    0,  -38,    0,    0,  481,    0,
-    0,    0,    0,  509,    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,   30,    0,    0,    0,    0,    0,  101,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,  343,  309,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-   98, -182,   62,    0,    0,  133,    0,   64,  379,    0,
-    0,    0,   -5,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0, -182,    0,    0,    0, -180,  -19,    0,
-   65,    0,    0,   68,    0,    0,    0,    0,   51,    9,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  -13,
-   19,    0,    0,    0,    0,    0,    0,   52,    0,    0,
-    0,    0,    0,    0,    0,    0,   35,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-};
-static const short yygindex[] = {                         0,
-   11,  -17,    0,    0,   13,    0,    0,    0,   20,    8,
-  -43,   -1,   -8,  -89,    0,   -9,    0,    0,    0,  -44,
-    0,    0,    4,    0,    0,    0,   70,  -53,    0,    0,
-  -18,    0,    0,    0,    0,   22,    0,    0,    0,    0,
-    0,
-};
-#define YYTABLESIZE 924
-static const short yytable[] = {                         58,
-   78,   58,   58,   58,   73,   58,  135,   61,   88,   57,
-   34,    5,   56,   62,   85,   58,   68,   63,   96,    7,
-   58,   98,   78,   64,   98,   84,  134,  107,   80,    3,
-  107,   90,   17,   92,   17,    4,   17,    2,   75,    3,
-   96,   71,   30,   89,  115,  147,   76,  106,   91,   93,
-   79,   75,   70,   17,  121,   55,   32,  107,   34,  105,
-  108,  114,  105,   83,    4,   68,    2,   70,    3,   68,
-   80,  121,   86,   80,  122,  106,  105,   78,  106,    5,
-   56,   68,  123,   99,  124,  125,  129,  130,   80,  131,
-   80,  141,  142,  144,  110,  145,  149,  150,    1,  110,
-    2,   30,   99,   32,   79,   92,  118,   79,  100,   21,
-   22,  111,  137,  139,  133,  113,  126,   81,    0,    0,
-    0,    0,   79,   57,   79,    0,   99,    0,  140,    0,
-    0,    0,    0,   99,    0,    0,    0,    0,    0,    0,
-    0,   70,    0,    0,    0,   99,    0,    0,    0,  148,
-    0,    0,    0,    0,    0,    0,   70,    0,    0,    0,
-    0,    0,    0,    0,    0,    4,    0,    2,    0,    0,
-   65,    0,   65,   65,   65,    0,   65,    0,    0,    0,
-    0,    0,    0,    0,    5,    6,    7,    8,   65,   10,
-   11,   65,   13,   66,   15,   16,   17,   18,   19,   20,
-   21,   22,   23,   24,   25,   26,   27,   28,   29,   30,
-    0,    4,    0,  116,  132,    3,    0,    0,   58,   58,
-   58,   58,   58,   58,   58,   78,   58,   58,   58,   58,
-   58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-   58,   58,   58,   58,   58,   78,    4,   74,  116,  136,
-    3,   17,   78,    1,    5,    6,    7,    8,    9,   10,
-   11,   12,   13,   14,   15,   16,   17,   18,   19,   20,
-   21,   22,   23,   24,   25,   26,   27,   28,   29,   30,
-    4,   54,  116,    5,   56,    0,   31,   80,   80,   80,
-   80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-   80,   80,   80,   80,   80,   80,   80,   80,   80,   80,
-   80,   80,   88,   80,   88,   88,   88,    0,   88,    0,
-   80,   79,   79,   79,   79,   79,   79,   79,   79,   79,
-   79,   79,   79,   79,   79,   79,   79,   79,   79,   79,
-   79,   79,   79,   79,   79,   79,   89,   79,   89,   89,
-   89,    0,   89,    0,   79,   25,   25,   25,   25,   25,
-   25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-   25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-   86,   25,   86,   86,    5,   56,   86,    0,   25,   65,
-   65,   65,   65,   65,   65,   65,    0,   65,   65,   65,
-   65,   65,   65,   65,   65,   65,   65,   65,   65,   65,
-   65,   65,   65,   65,   65,   65,   75,    0,   75,   75,
-   75,    0,   75,    0,    0,    0,    0,    0,    0,    0,
-    5,    6,    7,    8,   65,   10,   11,   75,   13,   66,
-   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
-   25,   26,   27,   28,   29,   30,  117,  146,    0,    0,
-    0,    0,    0,    0,    0,    5,    6,    7,    8,   65,
-   10,   11,    0,   13,   66,   15,   16,   17,   18,   19,
-   20,   21,   22,   23,   24,   25,   26,   27,   28,   29,
-   30,  117,    4,    0,    2,    0,    3,    0,    0,    5,
-   56,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   67,    0,    0,    0,    0,   41,    0,
-   41,    0,   41,    0,    0,  117,    0,    0,    0,    0,
-    0,   88,   88,    0,    0,    0,    0,    0,    0,   41,
-    0,    0,    0,    0,    0,    0,   45,    0,   45,    0,
-   45,    0,    0,    0,    0,    0,    0,   88,    0,    0,
-    0,    0,    0,    0,    0,   89,   89,   45,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   89,    0,    0,    0,    0,    0,    0,    0,   86,
-   86,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   86,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   75,   75,   75,   75,   75,
-   75,   75,    0,   75,   75,   75,   75,   75,   75,   75,
-   75,   75,   75,   75,   75,   75,   75,   75,   75,   75,
-   75,   75,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   82,    7,    8,   65,   10,   11,
-    0,   13,   66,   15,   16,   17,   18,   19,   20,   21,
-   22,   23,   24,   25,   26,   27,   28,   29,   30,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    5,    6,    7,    8,   65,   10,   11,    0,   13,
-   66,   15,   16,   17,   18,   19,   20,   21,   22,   23,
-   24,   25,   26,   27,   28,   29,   30,   41,   41,   41,
-   41,   41,   41,   41,    0,   41,   41,   41,   41,   41,
-   41,   41,   41,   41,   41,   41,   41,   41,   41,   41,
-   41,   41,   41,    0,    0,   45,   45,   45,   45,   45,
-   45,   45,    0,   45,   45,   45,   45,   45,   45,   45,
-   45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-   45,   82,    7,    8,   65,   10,   11,   12,   13,   14,
-   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
-   25,   26,   27,   28,   29,   30,    0,    0,   82,    7,
-    8,   65,   10,   11,   95,   13,   66,   15,   16,   17,
-   18,   19,   20,   21,   22,   23,   24,   25,   26,   27,
-   28,   29,   30,    0,    0,    0,  138,   82,    7,    8,
-   65,   10,   11,   12,   13,   14,   15,   16,   17,   18,
-   19,   20,   21,   22,   23,   24,   25,   26,   27,   28,
-   29,   30,    0,   75,   82,    7,    8,   65,   10,   11,
-   12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
-   22,   23,   24,   25,   26,   27,   28,   29,   30,   82,
-    7,    8,   65,   10,   11,    0,   13,   66,   15,   16,
-   17,   18,   19,   20,   21,   22,   23,   24,   25,   26,
-   27,   28,   29,   30,
-};
-static const short yycheck[] = {                         38,
-   44,   40,   41,   42,   40,   44,   40,    4,   62,    2,
-    0,  257,  258,  288,   59,    3,   34,  264,   72,  259,
-   59,   41,   61,  290,   44,   41,  116,   41,   47,   42,
-   44,   59,   38,   44,   40,   38,   42,   40,  284,   42,
-   94,   34,  282,   62,   98,  135,   43,  285,   59,   61,
-   47,  284,   44,   59,   99,   59,   59,   76,   48,   41,
-   79,  284,   44,   53,   38,   83,   40,   59,   42,   87,
-   41,  116,   60,   44,   41,   41,   73,  121,   44,  257,
-  258,   99,   44,   73,   41,   44,  287,  284,   59,  285,
-   61,   59,   44,   41,   87,   41,  285,   41,    0,   92,
-    0,  284,   41,  284,   41,   41,   99,   44,   41,   59,
-   59,   92,  121,  123,  116,   94,  109,   48,   -1,   -1,
-   -1,   -1,   59,  116,   61,   -1,  116,   -1,  125,   -1,
-   -1,   -1,   -1,  123,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   44,   -1,   -1,   -1,  135,   -1,   -1,   -1,  142,
-   -1,   -1,   -1,   -1,   -1,   -1,   59,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   38,   -1,   40,   -1,   -1,
-   38,   -1,   40,   41,   42,   -1,   44,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  257,  258,  259,  260,  261,  262,
-  263,   59,  265,  266,  267,  268,  269,  270,  271,  272,
-  273,  274,  275,  276,  277,  278,  279,  280,  281,  282,
-   -1,   38,   -1,   40,   41,   42,   -1,   -1,  257,  258,
-  259,  260,  261,  262,  263,  264,  265,  266,  267,  268,
-  269,  270,  271,  272,  273,  274,  275,  276,  277,  278,
-  279,  280,  281,  282,  283,  284,   38,  283,   40,  283,
-   42,  257,  291,  256,  257,  258,  259,  260,  261,  262,
-  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
-  273,  274,  275,  276,  277,  278,  279,  280,  281,  282,
-   38,  285,   40,  257,  258,   -1,  289,  258,  259,  260,
-  261,  262,  263,  264,  265,  266,  267,  268,  269,  270,
-  271,  272,  273,  274,  275,  276,  277,  278,  279,  280,
-  281,  282,   38,  284,   40,   41,   42,   -1,   44,   -1,
-  291,  258,  259,  260,  261,  262,  263,  264,  265,  266,
-  267,  268,  269,  270,  271,  272,  273,  274,  275,  276,
-  277,  278,  279,  280,  281,  282,   38,  284,   40,   41,
-   42,   -1,   44,   -1,  291,  258,  259,  260,  261,  262,
-  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
-  273,  274,  275,  276,  277,  278,  279,  280,  281,  282,
-   38,  284,   40,   41,  257,  258,   44,   -1,  291,  257,
-  258,  259,  260,  261,  262,  263,   -1,  265,  266,  267,
-  268,  269,  270,  271,  272,  273,  274,  275,  276,  277,
-  278,  279,  280,  281,  282,  283,   38,   -1,   40,   41,
-   42,   -1,   44,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  257,  258,  259,  260,  261,  262,  263,   59,  265,  266,
-  267,  268,  269,  270,  271,  272,  273,  274,  275,  276,
-  277,  278,  279,  280,  281,  282,  283,   41,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,  261,
-  262,  263,   -1,  265,  266,  267,  268,  269,  270,  271,
-  272,  273,  274,  275,  276,  277,  278,  279,  280,  281,
-  282,  283,   38,   -1,   40,   -1,   42,   -1,   -1,  257,
-  258,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   59,   -1,   -1,   -1,   -1,   38,   -1,
-   40,   -1,   42,   -1,   -1,  283,   -1,   -1,   -1,   -1,
-   -1,  257,  258,   -1,   -1,   -1,   -1,   -1,   -1,   59,
-   -1,   -1,   -1,   -1,   -1,   -1,   38,   -1,   40,   -1,
-   42,   -1,   -1,   -1,   -1,   -1,   -1,  283,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,  258,   59,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  257,
-  258,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  283,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,  258,  259,  260,  261,
-  262,  263,   -1,  265,  266,  267,  268,  269,  270,  271,
-  272,  273,  274,  275,  276,  277,  278,  279,  280,  281,
-  282,  283,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  258,  259,  260,  261,  262,  263,
-   -1,  265,  266,  267,  268,  269,  270,  271,  272,  273,
-  274,  275,  276,  277,  278,  279,  280,  281,  282,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,  257,  258,  259,  260,  261,  262,  263,   -1,  265,
-  266,  267,  268,  269,  270,  271,  272,  273,  274,  275,
-  276,  277,  278,  279,  280,  281,  282,  257,  258,  259,
-  260,  261,  262,  263,   -1,  265,  266,  267,  268,  269,
-  270,  271,  272,  273,  274,  275,  276,  277,  278,  279,
-  280,  281,  282,   -1,   -1,  257,  258,  259,  260,  261,
-  262,  263,   -1,  265,  266,  267,  268,  269,  270,  271,
-  272,  273,  274,  275,  276,  277,  278,  279,  280,  281,
-  282,  258,  259,  260,  261,  262,  263,  264,  265,  266,
-  267,  268,  269,  270,  271,  272,  273,  274,  275,  276,
-  277,  278,  279,  280,  281,  282,   -1,   -1,  258,  259,
-  260,  261,  262,  263,  291,  265,  266,  267,  268,  269,
-  270,  271,  272,  273,  274,  275,  276,  277,  278,  279,
-  280,  281,  282,   -1,   -1,   -1,  286,  258,  259,  260,
-  261,  262,  263,  264,  265,  266,  267,  268,  269,  270,
-  271,  272,  273,  274,  275,  276,  277,  278,  279,  280,
-  281,  282,   -1,  284,  258,  259,  260,  261,  262,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,  272,  273,
-  274,  275,  276,  277,  278,  279,  280,  281,  282,  258,
-  259,  260,  261,  262,  263,   -1,  265,  266,  267,  268,
-  269,  270,  271,  272,  273,  274,  275,  276,  277,  278,
-  279,  280,  281,  282,
-};
-#define YYFINAL 33
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 291
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file",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,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,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,
-"T_IDENTIFIER","T_TYPEDEF_NAME","T_DEFINE_NAME","T_AUTO","T_EXTERN",
-"T_REGISTER","T_STATIC","T_TYPEDEF","T_INLINE","T_EXTENSION","T_CHAR",
-"T_DOUBLE","T_FLOAT","T_INT","T_VOID","T_LONG","T_SHORT","T_SIGNED",
-"T_UNSIGNED","T_ENUM","T_STRUCT","T_UNION","T_Bool","T_Complex","T_Imaginary",
-"T_TYPE_QUALIFIER","T_BRACKETS","T_LBRACE","T_MATCHRBRACE","T_ELLIPSIS",
-"T_INITIALIZER","T_STRING_LITERAL","T_ASM","T_ASMARG","T_VA_DCL",
-"illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : program",
-"program :",
-"program : translation_unit",
-"translation_unit : external_declaration",
-"translation_unit : translation_unit external_declaration",
-"external_declaration : declaration",
-"external_declaration : function_definition",
-"external_declaration : ';'",
-"external_declaration : linkage_specification",
-"external_declaration : T_ASM T_ASMARG ';'",
-"external_declaration : error T_MATCHRBRACE",
-"external_declaration : error ';'",
-"braces : T_LBRACE T_MATCHRBRACE",
-"linkage_specification : T_EXTERN T_STRING_LITERAL braces",
-"linkage_specification : T_EXTERN T_STRING_LITERAL declaration",
-"declaration : decl_specifiers ';'",
-"declaration : decl_specifiers init_declarator_list ';'",
-"$$1 :",
-"declaration : any_typedef decl_specifiers $$1 opt_declarator_list ';'",
-"any_typedef : T_EXTENSION T_TYPEDEF",
-"any_typedef : T_TYPEDEF",
-"opt_declarator_list :",
-"opt_declarator_list : declarator_list",
-"declarator_list : declarator",
-"declarator_list : declarator_list ',' declarator",
-"$$2 :",
-"$$3 :",
-"function_definition : decl_specifiers declarator $$2 opt_declaration_list T_LBRACE $$3 T_MATCHRBRACE",
-"$$4 :",
-"function_definition : declarator $$4 opt_declaration_list T_LBRACE T_MATCHRBRACE",
-"opt_declaration_list :",
-"opt_declaration_list : T_VA_DCL",
-"opt_declaration_list : declaration_list",
-"declaration_list : declaration",
-"declaration_list : declaration_list declaration",
-"decl_specifiers : decl_specifier",
-"decl_specifiers : decl_specifiers decl_specifier",
-"decl_specifier : storage_class",
-"decl_specifier : type_specifier",
-"decl_specifier : type_qualifier",
-"storage_class : T_AUTO",
-"storage_class : T_EXTERN",
-"storage_class : T_REGISTER",
-"storage_class : T_STATIC",
-"storage_class : T_INLINE",
-"storage_class : T_EXTENSION",
-"type_specifier : T_CHAR",
-"type_specifier : T_DOUBLE",
-"type_specifier : T_FLOAT",
-"type_specifier : T_INT",
-"type_specifier : T_LONG",
-"type_specifier : T_SHORT",
-"type_specifier : T_SIGNED",
-"type_specifier : T_UNSIGNED",
-"type_specifier : T_VOID",
-"type_specifier : T_Bool",
-"type_specifier : T_Complex",
-"type_specifier : T_Imaginary",
-"type_specifier : T_TYPEDEF_NAME",
-"type_specifier : struct_or_union_specifier",
-"type_specifier : enum_specifier",
-"type_qualifier : T_TYPE_QUALIFIER",
-"type_qualifier : T_DEFINE_NAME",
-"struct_or_union_specifier : struct_or_union any_id braces",
-"struct_or_union_specifier : struct_or_union braces",
-"struct_or_union_specifier : struct_or_union any_id",
-"struct_or_union : T_STRUCT",
-"struct_or_union : T_UNION",
-"init_declarator_list : init_declarator",
-"init_declarator_list : init_declarator_list ',' init_declarator",
-"init_declarator : declarator",
-"$$5 :",
-"init_declarator : declarator '=' $$5 T_INITIALIZER",
-"enum_specifier : enumeration any_id braces",
-"enum_specifier : enumeration braces",
-"enum_specifier : enumeration any_id",
-"enumeration : T_ENUM",
-"any_id : T_IDENTIFIER",
-"any_id : T_TYPEDEF_NAME",
-"declarator : pointer direct_declarator",
-"declarator : direct_declarator",
-"direct_declarator : identifier_or_ref",
-"direct_declarator : '(' declarator ')'",
-"direct_declarator : direct_declarator T_BRACKETS",
-"direct_declarator : direct_declarator '(' parameter_type_list ')'",
-"direct_declarator : direct_declarator '(' opt_identifier_list ')'",
-"pointer : '*' opt_type_qualifiers",
-"pointer : '*' opt_type_qualifiers pointer",
-"opt_type_qualifiers :",
-"opt_type_qualifiers : type_qualifier_list",
-"type_qualifier_list : type_qualifier",
-"type_qualifier_list : type_qualifier_list type_qualifier",
-"parameter_type_list : parameter_list",
-"parameter_type_list : parameter_list ',' T_ELLIPSIS",
-"parameter_list : parameter_declaration",
-"parameter_list : parameter_list ',' parameter_declaration",
-"parameter_declaration : decl_specifiers declarator",
-"parameter_declaration : decl_specifiers abs_declarator",
-"parameter_declaration : decl_specifiers",
-"opt_identifier_list :",
-"opt_identifier_list : identifier_list",
-"identifier_list : any_id",
-"identifier_list : identifier_list ',' any_id",
-"identifier_or_ref : any_id",
-"identifier_or_ref : '&' any_id",
-"abs_declarator : pointer",
-"abs_declarator : pointer direct_abs_declarator",
-"abs_declarator : direct_abs_declarator",
-"direct_abs_declarator : '(' abs_declarator ')'",
-"direct_abs_declarator : direct_abs_declarator T_BRACKETS",
-"direct_abs_declarator : T_BRACKETS",
-"direct_abs_declarator : direct_abs_declarator '(' parameter_type_list ')'",
-"direct_abs_declarator : direct_abs_declarator '(' ')'",
-"direct_abs_declarator : '(' parameter_type_list ')'",
-"direct_abs_declarator : '(' ')'",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 1014 "grammar.y"
-
-/* lex.yy.c */
-#define BEGIN yy_start = 1 + 2 *
-
-#define CPP1 1
-#define INIT1 2
-#define INIT2 3
-#define CURLY 4
-#define LEXYACC 5
-#define ASM 6
-#define CPP_INLINE 7
-
-extern char *yytext;
-extern FILE *yyin, *yyout;
-
-static int curly;			/* number of curly brace nesting levels */
-static int ly_count;			/* number of occurrences of %% */
-static int inc_depth;			/* include nesting level */
-static SymbolTable *included_files;	/* files already included */
-static int yy_start = 0;		/* start state number */
-
-#define grammar_error(s) yaccError(s)
-
-static void
-yaccError (const char *msg)
-{
-    func_params = NULL;
-    put_error();		/* tell what line we're on, and what file */
-    fprintf(stderr, "%s at token '%s'\n", msg, yytext);
-}
-
-/* Initialize the table of type qualifier keywords recognized by the lexical
- * analyzer.
- */
-void
-init_parser (void)
-{
-    static const char *keywords[] = {
-	"const",
-	"restrict",
-	"volatile",
-	"interrupt",
-#ifdef vms
-	"noshare",
-	"readonly",
-#endif
-#if defined(MSDOS) || defined(OS2)
-	"__cdecl",
-	"__export",
-	"__far",
-	"__fastcall",
-	"__fortran",
-	"__huge",
-	"__inline",
-	"__interrupt",
-	"__loadds",
-	"__near",
-	"__pascal",
-	"__saveregs",
-	"__segment",
-	"__stdcall",
-	"__syscall",
-	"_cdecl",
-	"_cs",
-	"_ds",
-	"_es",
-	"_export",
-	"_far",
-	"_fastcall",
-	"_fortran",
-	"_huge",
-	"_interrupt",
-	"_loadds",
-	"_near",
-	"_pascal",
-	"_saveregs",
-	"_seg",
-	"_segment",
-	"_ss",
-	"cdecl",
-	"far",
-	"huge",
-	"near",
-	"pascal",
-#ifdef OS2
-	"__far16",
-#endif
-#endif
-#ifdef __GNUC__
-	/* gcc aliases */
-	"__builtin_va_arg",
-	"__builtin_va_list",
-	"__const",
-	"__const__",
-	"__inline",
-	"__inline__",
-	"__restrict",
-	"__restrict__",
-	"__volatile",
-	"__volatile__",
-#endif
-    };
-    unsigned i;
-
-    /* Initialize type qualifier table. */
-    type_qualifiers = new_symbol_table();
-    for (i = 0; i < sizeof(keywords)/sizeof(keywords[0]); ++i) {
-	new_symbol(type_qualifiers, keywords[i], NULL, DS_NONE);
-    }
-}
-
-/* Process the C source file.  Write function prototypes to the standard
- * output.  Convert function definitions and write the converted source
- * code to a temporary file.
- */
-void
-process_file (FILE *infile, char *name)
-{
-    char *s;
-
-    if (strlen(name) > 2) {
-	s = name + strlen(name) - 2;
-	if (*s == '.') {
-	    ++s;
-	    if (*s == 'l' || *s == 'y')
-		BEGIN LEXYACC;
-#if defined(MSDOS) || defined(OS2)
-	    if (*s == 'L' || *s == 'Y')
-		BEGIN LEXYACC;
-#endif
-	}
-    }
-
-    included_files = new_symbol_table();
-    typedef_names = new_symbol_table();
-    define_names = new_symbol_table();
-    inc_depth = -1;
-    curly = 0;
-    ly_count = 0;
-    func_params = NULL;
-    yyin = infile;
-    include_file(strcpy(base_file, name), func_style != FUNC_NONE);
-    if (file_comments) {
-#if OPT_LINTLIBRARY
-    	if (lintLibrary()) {
-	    put_blankline(stdout);
-	    begin_tracking();
-	}
-#endif
-	put_string(stdout, "/* ");
-	put_string(stdout, cur_file_name());
-	put_string(stdout, " */\n");
-    }
-    yyparse();
-    free_symbol_table(define_names);
-    free_symbol_table(typedef_names);
-    free_symbol_table(included_files);
-}
-
-#ifdef NO_LEAKS
-void
-free_parser(void)
-{
-    free_symbol_table (type_qualifiers);
-#ifdef FLEX_SCANNER
-    if (yy_current_buffer != 0)
-	yy_delete_buffer(yy_current_buffer);
-#endif
-}
-#endif
-#line 1006 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-case 10:
-#line 377 "grammar.y"
-	{
-	    yyerrok;
-	}
-break;
-case 11:
-#line 381 "grammar.y"
-	{
-	    yyerrok;
-	}
-break;
-case 13:
-#line 392 "grammar.y"
-	{
-	    /* Provide an empty action here so bison will not complain about
-	     * incompatible types in the default action it normally would
-	     * have generated.
-	     */
-	}
-break;
-case 14:
-#line 399 "grammar.y"
-	{
-	    /* empty */
-	}
-break;
-case 15:
-#line 406 "grammar.y"
-	{
-#if OPT_LINTLIBRARY
-	    if (types_out && want_typedef()) {
-		gen_declarations(&yystack.l_mark[-1].decl_spec, (DeclaratorList *)0);
-		flush_varargs();
-	    }
-#endif
-	    free_decl_spec(&yystack.l_mark[-1].decl_spec);
-	    end_typedef();
-	}
-break;
-case 16:
-#line 417 "grammar.y"
-	{
-	    if (func_params != NULL) {
-		set_param_types(func_params, &yystack.l_mark[-2].decl_spec, &yystack.l_mark[-1].decl_list);
-	    } else {
-		gen_declarations(&yystack.l_mark[-2].decl_spec, &yystack.l_mark[-1].decl_list);
-#if OPT_LINTLIBRARY
-		flush_varargs();
-#endif
-		free_decl_list(&yystack.l_mark[-1].decl_list);
-	    }
-	    free_decl_spec(&yystack.l_mark[-2].decl_spec);
-	    end_typedef();
-	}
-break;
-case 17:
-#line 431 "grammar.y"
-	{
-	    cur_decl_spec_flags = yystack.l_mark[0].decl_spec.flags;
-	    free_decl_spec(&yystack.l_mark[0].decl_spec);
-	}
-break;
-case 18:
-#line 436 "grammar.y"
-	{
-	    end_typedef();
-	}
-break;
-case 19:
-#line 443 "grammar.y"
-	{
-	    begin_typedef();
-	}
-break;
-case 20:
-#line 447 "grammar.y"
-	{
-	    begin_typedef();
-	}
-break;
-case 23:
-#line 459 "grammar.y"
-	{
-	    int flags = cur_decl_spec_flags;
-
-	    /* If the typedef is a pointer type, then reset the short type
-	     * flags so it does not get promoted.
-	     */
-	    if (strcmp(yystack.l_mark[0].declarator->text, yystack.l_mark[0].declarator->name) != 0)
-		flags &= ~(DS_CHAR | DS_SHORT | DS_FLOAT);
-	    new_symbol(typedef_names, yystack.l_mark[0].declarator->name, NULL, flags);
-	    free_declarator(yystack.l_mark[0].declarator);
-	}
-break;
-case 24:
-#line 471 "grammar.y"
-	{
-	    int flags = cur_decl_spec_flags;
-
-	    if (strcmp(yystack.l_mark[0].declarator->text, yystack.l_mark[0].declarator->name) != 0)
-		flags &= ~(DS_CHAR | DS_SHORT | DS_FLOAT);
-	    new_symbol(typedef_names, yystack.l_mark[0].declarator->name, NULL, flags);
-	    free_declarator(yystack.l_mark[0].declarator);
-	}
-break;
-case 25:
-#line 483 "grammar.y"
-	{
-	    check_untagged(&yystack.l_mark[-1].decl_spec);
-	    if (yystack.l_mark[0].declarator->func_def == FUNC_NONE) {
-		yyerror("syntax error");
-		YYERROR;
-	    }
-	    func_params = &(yystack.l_mark[0].declarator->head->params);
-	    func_params->begin_comment = cur_file->begin_comment;
-	    func_params->end_comment = cur_file->end_comment;
-	}
-break;
-case 26:
-#line 494 "grammar.y"
-	{
-	    /* If we're converting to K&R and we've got a nominally K&R
-	     * function which has a parameter which is ANSI (i.e., a prototyped
-	     * function pointer), then we must override the deciphered value of
-	     * 'func_def' so that the parameter will be converted.
-	     */
-	    if (func_style == FUNC_TRADITIONAL
-	     && haveAnsiParam()
-	     && yystack.l_mark[-3].declarator->head->func_def == func_style) {
-		yystack.l_mark[-3].declarator->head->func_def = FUNC_BOTH;
-	    }
-
-	    func_params = NULL;
-
-	    if (cur_file->convert)
-		gen_func_definition(&yystack.l_mark[-4].decl_spec, yystack.l_mark[-3].declarator);
-	    gen_prototype(&yystack.l_mark[-4].decl_spec, yystack.l_mark[-3].declarator);
-#if OPT_LINTLIBRARY
-	    flush_varargs();
-#endif
-	    free_decl_spec(&yystack.l_mark[-4].decl_spec);
-	    free_declarator(yystack.l_mark[-3].declarator);
-	}
-break;
-case 28:
-#line 519 "grammar.y"
-	{
-	    if (yystack.l_mark[0].declarator->func_def == FUNC_NONE) {
-		yyerror("syntax error");
-		YYERROR;
-	    }
-	    func_params = &(yystack.l_mark[0].declarator->head->params);
-	    func_params->begin_comment = cur_file->begin_comment;
-	    func_params->end_comment = cur_file->end_comment;
-	}
-break;
-case 29:
-#line 529 "grammar.y"
-	{
-	    DeclSpec decl_spec;
-
-	    func_params = NULL;
-
-	    new_decl_spec(&decl_spec, dft_decl_spec(), yystack.l_mark[-4].declarator->begin, DS_NONE);
-	    if (cur_file->convert)
-		gen_func_definition(&decl_spec, yystack.l_mark[-4].declarator);
-	    gen_prototype(&decl_spec, yystack.l_mark[-4].declarator);
-#if OPT_LINTLIBRARY
-	    flush_varargs();
-#endif
-	    free_decl_spec(&decl_spec);
-	    free_declarator(yystack.l_mark[-4].declarator);
-	}
-break;
-case 36:
-#line 560 "grammar.y"
-	{
-	    join_decl_specs(&yyval.decl_spec, &yystack.l_mark[-1].decl_spec, &yystack.l_mark[0].decl_spec);
-	    free(yystack.l_mark[-1].decl_spec.text);
-	    free(yystack.l_mark[0].decl_spec.text);
-	}
-break;
-case 40:
-#line 575 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
-	}
-break;
-case 41:
-#line 579 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_EXTERN);
-	}
-break;
-case 42:
-#line 583 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
-	}
-break;
-case 43:
-#line 587 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_STATIC);
-	}
-break;
-case 44:
-#line 591 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_INLINE);
-	}
-break;
-case 45:
-#line 595 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_JUNK);
-	}
-break;
-case 46:
-#line 602 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_CHAR);
-	}
-break;
-case 47:
-#line 606 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
-	}
-break;
-case 48:
-#line 610 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_FLOAT);
-	}
-break;
-case 49:
-#line 614 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
-	}
-break;
-case 50:
-#line 618 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
-	}
-break;
-case 51:
-#line 622 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_SHORT);
-	}
-break;
-case 52:
-#line 626 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
-	}
-break;
-case 53:
-#line 630 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
-	}
-break;
-case 54:
-#line 634 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
-	}
-break;
-case 55:
-#line 638 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_CHAR);
-	}
-break;
-case 56:
-#line 642 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
-	}
-break;
-case 57:
-#line 646 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
-	}
-break;
-case 58:
-#line 650 "grammar.y"
-	{
-	    Symbol *s;
-	    s = find_symbol(typedef_names, yystack.l_mark[0].text.text);
-	    if (s != NULL)
-		new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, s->flags);
-	}
-break;
-case 61:
-#line 662 "grammar.y"
-	{
-	    new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, DS_NONE);
-	}
-break;
-case 62:
-#line 666 "grammar.y"
-	{
-	    /* This rule allows the <pointer> nonterminal to scan #define
-	     * names as if they were type modifiers.
-	     */
-	    Symbol *s;
-	    s = find_symbol(define_names, yystack.l_mark[0].text.text);
-	    if (s != NULL)
-		new_decl_spec(&yyval.decl_spec, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin, s->flags);
-	}
-break;
-case 63:
-#line 679 "grammar.y"
-	{
-	    char *s;
-	    if ((s = implied_typedef()) == 0)
-	        (void)sprintf(s = buf, "%s %s", yystack.l_mark[-2].text.text, yystack.l_mark[-1].text.text);
-	    new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-2].text.begin, DS_NONE);
-	}
-break;
-case 64:
-#line 686 "grammar.y"
-	{
-	    char *s;
-	    if ((s = implied_typedef()) == 0)
-		(void)sprintf(s = buf, "%s {}", yystack.l_mark[-1].text.text);
-	    new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-1].text.begin, DS_NONE);
-	}
-break;
-case 65:
-#line 693 "grammar.y"
-	{
-	    (void)sprintf(buf, "%s %s", yystack.l_mark[-1].text.text, yystack.l_mark[0].text.text);
-	    new_decl_spec(&yyval.decl_spec, buf, yystack.l_mark[-1].text.begin, DS_NONE);
-	}
-break;
-case 66:
-#line 701 "grammar.y"
-	{
-	    imply_typedef(yyval.text.text);
-	}
-break;
-case 67:
-#line 705 "grammar.y"
-	{
-	    imply_typedef(yyval.text.text);
-	}
-break;
-case 68:
-#line 712 "grammar.y"
-	{
-	    new_decl_list(&yyval.decl_list, yystack.l_mark[0].declarator);
-	}
-break;
-case 69:
-#line 716 "grammar.y"
-	{
-	    add_decl_list(&yyval.decl_list, &yystack.l_mark[-2].decl_list, yystack.l_mark[0].declarator);
-	}
-break;
-case 70:
-#line 723 "grammar.y"
-	{
-	    if (yystack.l_mark[0].declarator->func_def != FUNC_NONE && func_params == NULL &&
-		func_style == FUNC_TRADITIONAL && cur_file->convert) {
-		gen_func_declarator(yystack.l_mark[0].declarator);
-		fputs(cur_text(), cur_file->tmp_file);
-	    }
-	    cur_declarator = yyval.declarator;
-	}
-break;
-case 71:
-#line 732 "grammar.y"
-	{
-	    if (yystack.l_mark[-1].declarator->func_def != FUNC_NONE && func_params == NULL &&
-		func_style == FUNC_TRADITIONAL && cur_file->convert) {
-		gen_func_declarator(yystack.l_mark[-1].declarator);
-		fputs(" =", cur_file->tmp_file);
-	    }
-	}
-break;
-case 73:
-#line 744 "grammar.y"
-	{
-	    char *s;
-	    if ((s = implied_typedef()) == 0)
-		(void)sprintf(s = buf, "enum %s", yystack.l_mark[-1].text.text);
-	    new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-2].text.begin, DS_NONE);
-	}
-break;
-case 74:
-#line 751 "grammar.y"
-	{
-	    char *s;
-	    if ((s = implied_typedef()) == 0)
-		(void)sprintf(s = buf, "%s {}", yystack.l_mark[-1].text.text);
-	    new_decl_spec(&yyval.decl_spec, s, yystack.l_mark[-1].text.begin, DS_NONE);
-	}
-break;
-case 75:
-#line 758 "grammar.y"
-	{
-	    (void)sprintf(buf, "enum %s", yystack.l_mark[0].text.text);
-	    new_decl_spec(&yyval.decl_spec, buf, yystack.l_mark[-1].text.begin, DS_NONE);
-	}
-break;
-case 76:
-#line 766 "grammar.y"
-	{
-	    imply_typedef("enum");
-	    yyval.text = yystack.l_mark[0].text;
-	}
-break;
-case 79:
-#line 779 "grammar.y"
-	{
-	    yyval.declarator = yystack.l_mark[0].declarator;
-	    (void)sprintf(buf, "%s%s", yystack.l_mark[-1].text.text, yyval.declarator->text);
-	    free(yyval.declarator->text);
-	    yyval.declarator->text = xstrdup(buf);
-	    yyval.declarator->begin = yystack.l_mark[-1].text.begin;
-	    yyval.declarator->pointer = TRUE;
-	}
-break;
-case 81:
-#line 792 "grammar.y"
-	{
-	    yyval.declarator = new_declarator(yystack.l_mark[0].text.text, yystack.l_mark[0].text.text, yystack.l_mark[0].text.begin);
-	}
-break;
-case 82:
-#line 796 "grammar.y"
-	{
-	    yyval.declarator = yystack.l_mark[-1].declarator;
-	    (void)sprintf(buf, "(%s)", yyval.declarator->text);
-	    free(yyval.declarator->text);
-	    yyval.declarator->text = xstrdup(buf);
-	    yyval.declarator->begin = yystack.l_mark[-2].text.begin;
-	}
-break;
-case 83:
-#line 804 "grammar.y"
-	{
-	    yyval.declarator = yystack.l_mark[-1].declarator;
-	    (void)sprintf(buf, "%s%s", yyval.declarator->text, yystack.l_mark[0].text.text);
-	    free(yyval.declarator->text);
-	    yyval.declarator->text = xstrdup(buf);
-	}
-break;
-case 84:
-#line 811 "grammar.y"
-	{
-	    yyval.declarator = new_declarator("%s()", yystack.l_mark[-3].declarator->name, yystack.l_mark[-3].declarator->begin);
-	    yyval.declarator->params = yystack.l_mark[-1].param_list;
-	    yyval.declarator->func_stack = yystack.l_mark[-3].declarator;
-	    yyval.declarator->head = (yystack.l_mark[-3].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-3].declarator->head;
-	    yyval.declarator->func_def = FUNC_ANSI;
-	}
-break;
-case 85:
-#line 819 "grammar.y"
-	{
-	    yyval.declarator = new_declarator("%s()", yystack.l_mark[-3].declarator->name, yystack.l_mark[-3].declarator->begin);
-	    yyval.declarator->params = yystack.l_mark[-1].param_list;
-	    yyval.declarator->func_stack = yystack.l_mark[-3].declarator;
-	    yyval.declarator->head = (yystack.l_mark[-3].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-3].declarator->head;
-	    yyval.declarator->func_def = FUNC_TRADITIONAL;
-	}
-break;
-case 86:
-#line 830 "grammar.y"
-	{
-	    (void)sprintf(yyval.text.text, "*%s", yystack.l_mark[0].text.text);
-	    yyval.text.begin = yystack.l_mark[-1].text.begin;
-	}
-break;
-case 87:
-#line 835 "grammar.y"
-	{
-	    (void)sprintf(yyval.text.text, "*%s%s", yystack.l_mark[-1].text.text, yystack.l_mark[0].text.text);
-	    yyval.text.begin = yystack.l_mark[-2].text.begin;
-	}
-break;
-case 88:
-#line 843 "grammar.y"
-	{
-	    strcpy(yyval.text.text, "");
-	    yyval.text.begin = 0L;
-	}
-break;
-case 90:
-#line 852 "grammar.y"
-	{
-	    (void)sprintf(yyval.text.text, "%s ", yystack.l_mark[0].decl_spec.text);
-	    yyval.text.begin = yystack.l_mark[0].decl_spec.begin;
-	    free(yystack.l_mark[0].decl_spec.text);
-	}
-break;
-case 91:
-#line 858 "grammar.y"
-	{
-	    (void)sprintf(yyval.text.text, "%s%s ", yystack.l_mark[-1].text.text, yystack.l_mark[0].decl_spec.text);
-	    yyval.text.begin = yystack.l_mark[-1].text.begin;
-	    free(yystack.l_mark[0].decl_spec.text);
-	}
-break;
-case 93:
-#line 868 "grammar.y"
-	{
-	    add_ident_list(&yyval.param_list, &yystack.l_mark[-2].param_list, "...");
-	}
-break;
-case 94:
-#line 875 "grammar.y"
-	{
-	    new_param_list(&yyval.param_list, yystack.l_mark[0].parameter);
-	}
-break;
-case 95:
-#line 879 "grammar.y"
-	{
-	    add_param_list(&yyval.param_list, &yystack.l_mark[-2].param_list, yystack.l_mark[0].parameter);
-	}
-break;
-case 96:
-#line 886 "grammar.y"
-	{
-	    check_untagged(&yystack.l_mark[-1].decl_spec);
-	    yyval.parameter = new_parameter(&yystack.l_mark[-1].decl_spec, yystack.l_mark[0].declarator);
-	}
-break;
-case 97:
-#line 891 "grammar.y"
-	{
-	    check_untagged(&yystack.l_mark[-1].decl_spec);
-	    yyval.parameter = new_parameter(&yystack.l_mark[-1].decl_spec, yystack.l_mark[0].declarator);
-	}
-break;
-case 98:
-#line 896 "grammar.y"
-	{
-	    check_untagged(&yystack.l_mark[0].decl_spec);
-	    yyval.parameter = new_parameter(&yystack.l_mark[0].decl_spec, (Declarator *)0);
-	}
-break;
-case 99:
-#line 904 "grammar.y"
-	{
-	    new_ident_list(&yyval.param_list);
-	}
-break;
-case 101:
-#line 912 "grammar.y"
-	{
-	    new_ident_list(&yyval.param_list);
-	    add_ident_list(&yyval.param_list, &yyval.param_list, yystack.l_mark[0].text.text);
-	}
-break;
-case 102:
-#line 917 "grammar.y"
-	{
-	    add_ident_list(&yyval.param_list, &yystack.l_mark[-2].param_list, yystack.l_mark[0].text.text);
-	}
-break;
-case 103:
-#line 924 "grammar.y"
-	{
-	    yyval.text = yystack.l_mark[0].text;
-	}
-break;
-case 104:
-#line 928 "grammar.y"
-	{
-#if OPT_LINTLIBRARY
-	    if (lintLibrary()) { /* Lint doesn't grok C++ ref variables */
-		yyval.text = yystack.l_mark[0].text;
-	    } else
-#endif
-		(void)sprintf(yyval.text.text, "&%s", yystack.l_mark[0].text.text);
-	    yyval.text.begin = yystack.l_mark[-1].text.begin;
-	}
-break;
-case 105:
-#line 941 "grammar.y"
-	{
-	    yyval.declarator = new_declarator(yystack.l_mark[0].text.text, "", yystack.l_mark[0].text.begin);
-	}
-break;
-case 106:
-#line 945 "grammar.y"
-	{
-	    yyval.declarator = yystack.l_mark[0].declarator;
-	    (void)sprintf(buf, "%s%s", yystack.l_mark[-1].text.text, yyval.declarator->text);
-	    free(yyval.declarator->text);
-	    yyval.declarator->text = xstrdup(buf);
-	    yyval.declarator->begin = yystack.l_mark[-1].text.begin;
-	}
-break;
-case 108:
-#line 957 "grammar.y"
-	{
-	    yyval.declarator = yystack.l_mark[-1].declarator;
-	    (void)sprintf(buf, "(%s)", yyval.declarator->text);
-	    free(yyval.declarator->text);
-	    yyval.declarator->text = xstrdup(buf);
-	    yyval.declarator->begin = yystack.l_mark[-2].text.begin;
-	}
-break;
-case 109:
-#line 965 "grammar.y"
-	{
-	    yyval.declarator = yystack.l_mark[-1].declarator;
-	    (void)sprintf(buf, "%s%s", yyval.declarator->text, yystack.l_mark[0].text.text);
-	    free(yyval.declarator->text);
-	    yyval.declarator->text = xstrdup(buf);
-	}
-break;
-case 110:
-#line 972 "grammar.y"
-	{
-	    yyval.declarator = new_declarator(yystack.l_mark[0].text.text, "", yystack.l_mark[0].text.begin);
-	}
-break;
-case 111:
-#line 976 "grammar.y"
-	{
-	    yyval.declarator = new_declarator("%s()", "", yystack.l_mark[-3].declarator->begin);
-	    yyval.declarator->params = yystack.l_mark[-1].param_list;
-	    yyval.declarator->func_stack = yystack.l_mark[-3].declarator;
-	    yyval.declarator->head = (yystack.l_mark[-3].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-3].declarator->head;
-	    yyval.declarator->func_def = FUNC_ANSI;
-	}
-break;
-case 112:
-#line 984 "grammar.y"
-	{
-	    yyval.declarator = new_declarator("%s()", "", yystack.l_mark[-2].declarator->begin);
-	    yyval.declarator->func_stack = yystack.l_mark[-2].declarator;
-	    yyval.declarator->head = (yystack.l_mark[-2].declarator->func_stack == NULL) ? yyval.declarator : yystack.l_mark[-2].declarator->head;
-	    yyval.declarator->func_def = FUNC_ANSI;
-	}
-break;
-case 113:
-#line 991 "grammar.y"
-	{
-	    Declarator *d;
-
-	    d = new_declarator("", "", yystack.l_mark[-2].text.begin);
-	    yyval.declarator = new_declarator("%s()", "", yystack.l_mark[-2].text.begin);
-	    yyval.declarator->params = yystack.l_mark[-1].param_list;
-	    yyval.declarator->func_stack = d;
-	    yyval.declarator->head = yyval.declarator;
-	    yyval.declarator->func_def = FUNC_ANSI;
-	}
-break;
-case 114:
-#line 1002 "grammar.y"
-	{
-	    Declarator *d;
-
-	    d = new_declarator("", "", yystack.l_mark[-1].text.begin);
-	    yyval.declarator = new_declarator("%s()", "", yystack.l_mark[-1].text.begin);
-	    yyval.declarator->func_stack = d;
-	    yyval.declarator->head = yyval.declarator;
-	    yyval.declarator->func_def = FUNC_ANSI;
-	}
-break;
-#line 1882 "/dev/stdout"
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.09.out b/usr.bin/yacc/tests/regress.09.out
deleted file mode 100644
index b6c13e222cc6..000000000000
--- a/usr.bin/yacc/tests/regress.09.out
+++ /dev/null
@@ -1,599 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 2 "pure_calc.y"
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-#ifdef YYBISON
-#define YYSTYPE int
-#define YYLEX_PARAM &yylval
-#define YYLEX_DECL() yylex(YYSTYPE *yylval)
-#define YYERROR_DECL() yyerror(const char *s)
-int YYLEX_DECL();
-static void YYERROR_DECL();
-#endif
-
-#line 35 "/dev/stdout"
-
-#ifndef YYSTYPE
-typedef int YYSTYPE;
-#endif
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define DIGIT 257
-#define LETTER 258
-#define UMINUS 259
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    0,    0,    1,    1,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    3,    3,
-};
-static const short yylen[] = {                            2,
-    0,    3,    3,    1,    3,    3,    3,    3,    3,    3,
-    3,    3,    3,    2,    1,    1,    1,    2,
-};
-static const short yydefred[] = {                         1,
-    0,    0,   17,    0,    0,    0,    0,    0,    0,    3,
-    0,   15,   14,    0,    2,    0,    0,    0,    0,    0,
-    0,    0,   18,    0,    6,    0,    0,    0,    0,    9,
-   10,   11,
-};
-static const short yydgoto[] = {                          1,
-    7,    8,    9,
-};
-static const short yysindex[] = {                         0,
-  -40,   -7,    0,  -55,  -38,  -38,    1,  -29, -247,    0,
-  -38,    0,    0,   22,    0,  -38,  -38,  -38,  -38,  -38,
-  -38,  -38,    0,  -29,    0,   51,   60,  -20,  -20,    0,
-    0,    0,
-};
-static const short yyrindex[] = {                         0,
-    0,    0,    0,    2,    0,    0,    0,    9,   -9,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   10,    0,   -6,   14,    5,   13,    0,
-    0,    0,
-};
-static const short yygindex[] = {                         0,
-    0,   65,    0,
-};
-#define YYTABLESIZE 220
-static const short yytable[] = {                          6,
-   16,    6,   10,   13,    5,   11,    5,   22,   17,   23,
-   15,   15,   20,   18,    7,   19,   22,   21,    4,    5,
-    0,   20,    8,   12,    0,    0,   21,   16,   16,    0,
-    0,   16,   16,   16,   13,   16,    0,   16,   15,   15,
-    0,    0,    7,   15,   15,    7,   15,    7,   15,    7,
-    8,   12,    0,    8,   12,    8,    0,    8,   22,   17,
-    0,    0,   25,   20,   18,    0,   19,    0,   21,   13,
-   14,    0,    0,    0,    0,   24,    0,    0,    0,    0,
-   26,   27,   28,   29,   30,   31,   32,   22,   17,    0,
-    0,    0,   20,   18,   16,   19,   22,   21,    0,    0,
-    0,   20,   18,    0,   19,    0,   21,    0,    0,    0,
-    0,    0,    0,    0,   16,    0,    0,   13,    0,    0,
-    0,    0,    0,    0,    0,   15,    0,    0,    7,    0,
-    0,    0,    0,    0,    0,    0,    8,   12,    0,    0,
-    0,    0,    0,    0,    0,   16,    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,    2,    3,    4,    3,   12,
-};
-static const short yycheck[] = {                         40,
-   10,   40,   10,   10,   45,   61,   45,   37,   38,  257,
-   10,   10,   42,   43,   10,   45,   37,   47,   10,   10,
-   -1,   42,   10,   10,   -1,   -1,   47,   37,   38,   -1,
-   -1,   41,   42,   43,   41,   45,   -1,   47,   37,   38,
-   -1,   -1,   38,   42,   43,   41,   45,   43,   47,   45,
-   38,   38,   -1,   41,   41,   43,   -1,   45,   37,   38,
-   -1,   -1,   41,   42,   43,   -1,   45,   -1,   47,    5,
-    6,   -1,   -1,   -1,   -1,   11,   -1,   -1,   -1,   -1,
-   16,   17,   18,   19,   20,   21,   22,   37,   38,   -1,
-   -1,   -1,   42,   43,  124,   45,   37,   47,   -1,   -1,
-   -1,   42,   43,   -1,   45,   -1,   47,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  124,   -1,   -1,  124,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  124,   -1,   -1,  124,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  124,  124,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  124,   -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,   -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,
-   -1,   -1,   -1,   -1,   -1,  256,  257,  258,  257,  258,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 259
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file",0,0,0,0,0,0,0,0,0,"'\\n'",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,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,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,"DIGIT","LETTER","UMINUS","illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : list",
-"list :",
-"list : list stat '\\n'",
-"list : list error '\\n'",
-"stat : expr",
-"stat : LETTER '=' expr",
-"expr : '(' expr ')'",
-"expr : expr '+' expr",
-"expr : expr '-' expr",
-"expr : expr '*' expr",
-"expr : expr '/' expr",
-"expr : expr '%' expr",
-"expr : expr '&' expr",
-"expr : expr '|' expr",
-"expr : '-' expr",
-"expr : LETTER",
-"expr : number",
-"number : DIGIT",
-"number : number DIGIT",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 72 "pure_calc.y"
- /* start of programs */
-
-#ifdef YYBYACC
-static int YYLEX_DECL();
-#endif
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-YYERROR_DECL()
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-YYLEX_DECL()
-{
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	*yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	*yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
-#line 277 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-case 3:
-#line 34 "pure_calc.y"
-	{  yyerrok ; }
-break;
-case 4:
-#line 38 "pure_calc.y"
-	{  printf("%d\n",yystack.l_mark[0]);}
-break;
-case 5:
-#line 40 "pure_calc.y"
-	{  regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
-break;
-case 6:
-#line 44 "pure_calc.y"
-	{  yyval = yystack.l_mark[-1]; }
-break;
-case 7:
-#line 46 "pure_calc.y"
-	{  yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
-break;
-case 8:
-#line 48 "pure_calc.y"
-	{  yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
-break;
-case 9:
-#line 50 "pure_calc.y"
-	{  yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
-break;
-case 10:
-#line 52 "pure_calc.y"
-	{  yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
-break;
-case 11:
-#line 54 "pure_calc.y"
-	{  yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
-break;
-case 12:
-#line 56 "pure_calc.y"
-	{  yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
-break;
-case 13:
-#line 58 "pure_calc.y"
-	{  yyval = yystack.l_mark[-2] | yystack.l_mark[0]; }
-break;
-case 14:
-#line 60 "pure_calc.y"
-	{  yyval = - yystack.l_mark[0]; }
-break;
-case 15:
-#line 62 "pure_calc.y"
-	{  yyval = regs[yystack.l_mark[0]]; }
-break;
-case 17:
-#line 67 "pure_calc.y"
-	{  yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
-break;
-case 18:
-#line 69 "pure_calc.y"
-	{  yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
-break;
-#line 539 "/dev/stdout"
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.10.out b/usr.bin/yacc/tests/regress.10.out
deleted file mode 100644
index f4a5ba4348b0..000000000000
--- a/usr.bin/yacc/tests/regress.10.out
+++ /dev/null
@@ -1,429 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 2 "pure_error.y"
-
-#ifdef YYBISON
-#define YYSTYPE int
-#define YYLEX_PARAM &yylval
-#define YYLEX_DECL() yylex(YYSTYPE *yylval)
-#define YYERROR_DECL() yyerror(const char *s)
-int YYLEX_DECL();
-static void YYERROR_DECL();
-#endif
-
-#line 30 "/dev/stdout"
-
-#ifndef YYSTYPE
-typedef int YYSTYPE;
-#endif
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,
-};
-static const short yylen[] = {                            2,
-    1,
-};
-static const short yydefred[] = {                         0,
-    1,    0,
-};
-static const short yydgoto[] = {                          2,
-};
-static const short yysindex[] = {                      -256,
-    0,    0,
-};
-static const short yyrindex[] = {                         0,
-    0,    0,
-};
-static const short yygindex[] = {                         0,
-};
-#define YYTABLESIZE 0
-static const short yytable[] = {                          1,
-};
-static const short yycheck[] = {                        256,
-};
-#define YYFINAL 2
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 0
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file","illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : S",
-"S : error",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 17 "pure_error.y"
-
-#include <stdio.h>
-
-#ifdef YYBYACC
-extern int YYLEX_DECL();
-#endif
-
-int
-main(void)
-{
-    printf("yyparse() = %d\n", yyparse());
-    return 0;
-}
-
-int
-yylex(YYSTYPE *value)
-{
-    return value ? 0 : -1;
-}
-
-static void
-yyerror(const char* s)
-{
-    printf("%s\n", s);
-}
-#line 168 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.11.out b/usr.bin/yacc/tests/regress.11.out
deleted file mode 100644
index 8668971b4208..000000000000
--- a/usr.bin/yacc/tests/regress.11.out
+++ /dev/null
@@ -1,610 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 2 "quote_calc.y"
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-int yylex(void);
-static void yyerror(const char *s);
-
-#line 29 "/dev/stdout"
-
-#ifndef YYSTYPE
-typedef int YYSTYPE;
-#endif
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define OP_ADD 257
-#define ADD 258
-#define OP_SUB 259
-#define SUB 260
-#define OP_MUL 261
-#define MUL 262
-#define OP_DIV 263
-#define DIV 264
-#define OP_MOD 265
-#define MOD 266
-#define OP_AND 267
-#define AND 268
-#define DIGIT 269
-#define LETTER 270
-#define UMINUS 271
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    0,    0,    1,    1,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    3,    3,
-};
-static const short yylen[] = {                            2,
-    0,    3,    3,    1,    3,    3,    3,    3,    3,    3,
-    3,    3,    3,    2,    1,    1,    1,    2,
-};
-static const short yydefred[] = {                         1,
-    0,    0,    0,   17,    0,    0,    0,    0,    0,    3,
-   15,    0,    0,    0,    2,    0,    0,    0,    0,    0,
-    0,    0,   18,    0,    6,    0,    0,    0,    0,    0,
-    0,    0,
-};
-static const short yydgoto[] = {                          1,
-    7,    8,    9,
-};
-static const short yysindex[] = {                         0,
-  -38,    5,  -36,    0,  -51,  -36,    7, -121, -248,    0,
-    0, -243,  -36,  -22,    0,  -36,  -36,  -36,  -36,  -36,
-  -36,  -36,    0, -121,    0, -121, -121, -121, -121, -121,
- -121, -243,
-};
-static const short yyrindex[] = {                         0,
-    0,    0,    0,    0,   -9,    0,    0,   13,  -10,    0,
-    0,   -5,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   15,    0,   -3,   -2,   -1,    1,    2,
-    3,   -4,
-};
-static const short yygindex[] = {                         0,
-    0,   42,    0,
-};
-#define YYTABLESIZE 258
-static const short yytable[] = {                         16,
-   15,    6,   22,    6,   14,   13,    7,    8,    9,   13,
-   10,   11,   12,   16,   10,   17,   15,   18,   25,   19,
-   23,   20,    4,   21,    5,    0,    0,    0,    0,    0,
-   16,    0,    0,    0,    0,   14,   13,    7,    8,    9,
-    0,   10,   11,   12,   12,    0,    0,   14,    0,    0,
-    0,    0,    0,    0,   24,    0,    0,   26,   27,   28,
-   29,   30,   31,   32,    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,   22,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   16,   15,    0,    0,    0,   14,   13,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   16,    0,   17,    0,   18,
-    0,   19,    0,   20,    0,   21,    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,    2,    0,    0,
-    3,    0,    3,    0,    0,    0,    0,    0,    0,    0,
-    4,    5,    4,   11,   16,    0,   17,    0,   18,    0,
-   19,    0,   20,    0,   21,    0,   16,   15,   16,   15,
-   16,   15,   16,   15,   16,   15,   16,   15,
-};
-static const short yycheck[] = {                         10,
-   10,   40,  124,   40,   10,   10,   10,   10,   10,   61,
-   10,   10,   10,  257,   10,  259,   10,  261,   41,  263,
-  269,  265,   10,  267,   10,   -1,   -1,   -1,   -1,   -1,
-   41,   -1,   -1,   -1,   -1,   41,   41,   41,   41,   41,
-   -1,   41,   41,   41,    3,   -1,   -1,    6,   -1,   -1,
-   -1,   -1,   -1,   -1,   13,   -1,   -1,   16,   17,   18,
-   19,   20,   21,   22,   -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,   -1,   -1,   -1,   -1,
-   -1,  124,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  124,  124,   -1,   -1,   -1,  124,  124,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,   -1,  259,   -1,  261,
-   -1,  263,   -1,  265,   -1,  267,   -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,   -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,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256,   -1,   -1,
-  259,   -1,  259,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  269,  270,  269,  270,  257,   -1,  259,   -1,  261,   -1,
-  263,   -1,  265,   -1,  267,   -1,  257,  257,  259,  259,
-  261,  261,  263,  263,  265,  265,  267,  267,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 271
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file",0,0,0,0,0,0,0,0,0,"'\\n'",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,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,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,"OP_ADD","\"ADD\"","OP_SUB","\"SUB\"","OP_MUL","\"MUL\"","OP_DIV",
-"\"DIV\"","OP_MOD","\"MOD\"","OP_AND","\"AND\"","DIGIT","LETTER","UMINUS",
-"illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : list",
-"list :",
-"list : list stat '\\n'",
-"list : list error '\\n'",
-"stat : expr",
-"stat : LETTER '=' expr",
-"expr : '(' expr ')'",
-"expr : expr OP_ADD expr",
-"expr : expr OP_SUB expr",
-"expr : expr OP_MUL expr",
-"expr : expr OP_DIV expr",
-"expr : expr OP_MOD expr",
-"expr : expr OP_AND expr",
-"expr : expr '|' expr",
-"expr : OP_SUB expr",
-"expr : LETTER",
-"expr : number",
-"number : DIGIT",
-"number : number DIGIT",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 73 "quote_calc.y"
- /* start of programs */
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void) {
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
-#line 288 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-case 3:
-#line 35 "quote_calc.y"
-	{  yyerrok ; }
-break;
-case 4:
-#line 39 "quote_calc.y"
-	{  printf("%d\n",yystack.l_mark[0]);}
-break;
-case 5:
-#line 41 "quote_calc.y"
-	{  regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
-break;
-case 6:
-#line 45 "quote_calc.y"
-	{  yyval = yystack.l_mark[-1]; }
-break;
-case 7:
-#line 47 "quote_calc.y"
-	{  yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
-break;
-case 8:
-#line 49 "quote_calc.y"
-	{  yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
-break;
-case 9:
-#line 51 "quote_calc.y"
-	{  yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
-break;
-case 10:
-#line 53 "quote_calc.y"
-	{  yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
-break;
-case 11:
-#line 55 "quote_calc.y"
-	{  yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
-break;
-case 12:
-#line 57 "quote_calc.y"
-	{  yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
-break;
-case 13:
-#line 59 "quote_calc.y"
-	{  yyval = yystack.l_mark[-2] | yystack.l_mark[0]; }
-break;
-case 14:
-#line 61 "quote_calc.y"
-	{  yyval = - yystack.l_mark[0]; }
-break;
-case 15:
-#line 63 "quote_calc.y"
-	{  yyval = regs[yystack.l_mark[0]]; }
-break;
-case 17:
-#line 68 "quote_calc.y"
-	{  yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
-break;
-case 18:
-#line 70 "quote_calc.y"
-	{  yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
-break;
-#line 550 "/dev/stdout"
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.12.out b/usr.bin/yacc/tests/regress.12.out
deleted file mode 100644
index 757c977d430a..000000000000
--- a/usr.bin/yacc/tests/regress.12.out
+++ /dev/null
@@ -1,610 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 2 "quote_calc2.y"
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-int yylex(void);
-static void yyerror(const char *s);
-
-#line 29 "/dev/stdout"
-
-#ifndef YYSTYPE
-typedef int YYSTYPE;
-#endif
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define OP_ADD 257
-#define ADD 258
-#define OP_SUB 259
-#define SUB 260
-#define OP_MUL 261
-#define MUL 262
-#define OP_DIV 263
-#define DIV 264
-#define OP_MOD 265
-#define MOD 266
-#define OP_AND 267
-#define AND 268
-#define DIGIT 269
-#define LETTER 270
-#define UMINUS 271
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    0,    0,    1,    1,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    3,    3,
-};
-static const short yylen[] = {                            2,
-    0,    3,    3,    1,    3,    3,    3,    3,    3,    3,
-    3,    3,    3,    2,    1,    1,    1,    2,
-};
-static const short yydefred[] = {                         1,
-    0,    0,    0,   17,    0,    0,    0,    0,    0,    3,
-   15,    0,    0,    0,    2,    0,    0,    0,    0,    0,
-    0,    0,   18,    0,    6,    0,    0,    0,    0,    0,
-    0,    0,
-};
-static const short yydgoto[] = {                          1,
-    7,    8,    9,
-};
-static const short yysindex[] = {                         0,
-  -38,    4,  -36,    0,  -51,  -36,    6, -121, -249,    0,
-    0, -243,  -36,  -23,    0,  -36,  -36,  -36,  -36,  -36,
-  -36,  -36,    0, -121,    0, -121, -121, -121, -121, -121,
- -121, -243,
-};
-static const short yyrindex[] = {                         0,
-    0,    0,    0,    0,   -9,    0,    0,   12,  -10,    0,
-    0,   -5,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   14,    0,   -3,   -2,   -1,    1,    2,
-    3,   -4,
-};
-static const short yygindex[] = {                         0,
-    0,   42,    0,
-};
-#define YYTABLESIZE 259
-static const short yytable[] = {                         16,
-   15,    6,   22,    6,   14,   13,    7,    8,    9,   13,
-   10,   11,   12,   10,   16,   15,   17,   25,   18,   23,
-   19,    4,   20,    5,   21,    0,    0,    0,    0,    0,
-   16,    0,    0,    0,    0,   14,   13,    7,    8,    9,
-    0,   10,   11,   12,   12,    0,    0,   14,    0,    0,
-    0,    0,    0,    0,   24,    0,    0,   26,   27,   28,
-   29,   30,   31,   32,    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,
-   22,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   16,   15,    0,    0,    0,   14,   13,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   16,    0,   17,    0,
-   18,    0,   19,    0,   20,    0,   21,    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,    2,    0,    0,
-    0,    3,    0,    3,    0,    0,    0,    0,    0,    0,
-    4,    5,    4,   11,   16,    0,   17,    0,   18,    0,
-   19,    0,   20,    0,   21,    0,    0,   16,   15,   16,
-   15,   16,   15,   16,   15,   16,   15,   16,   15,
-};
-static const short yycheck[] = {                         10,
-   10,   40,  124,   40,   10,   10,   10,   10,   10,   61,
-   10,   10,   10,   10,  258,   10,  260,   41,  262,  269,
-  264,   10,  266,   10,  268,   -1,   -1,   -1,   -1,   -1,
-   41,   -1,   -1,   -1,   -1,   41,   41,   41,   41,   41,
-   -1,   41,   41,   41,    3,   -1,   -1,    6,   -1,   -1,
-   -1,   -1,   -1,   -1,   13,   -1,   -1,   16,   17,   18,
-   19,   20,   21,   22,   -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,   -1,   -1,   -1,   -1,
-  124,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  124,  124,   -1,   -1,   -1,  124,  124,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  258,   -1,  260,   -1,
-  262,   -1,  264,   -1,  266,   -1,  268,   -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,   -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,   -1,   -1,   -1,   -1,   -1,   -1,  256,   -1,   -1,
-   -1,  260,   -1,  260,   -1,   -1,   -1,   -1,   -1,   -1,
-  269,  270,  269,  270,  258,   -1,  260,   -1,  262,   -1,
-  264,   -1,  266,   -1,  268,   -1,   -1,  258,  258,  260,
-  260,  262,  262,  264,  264,  266,  266,  268,  268,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 271
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file",0,0,0,0,0,0,0,0,0,"'\\n'",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,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,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,"OP_ADD","\"ADD\"","OP_SUB","\"SUB\"","OP_MUL","\"MUL\"","OP_DIV",
-"\"DIV\"","OP_MOD","\"MOD\"","OP_AND","\"AND\"","DIGIT","LETTER","UMINUS",
-"illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : list",
-"list :",
-"list : list stat '\\n'",
-"list : list error '\\n'",
-"stat : expr",
-"stat : LETTER '=' expr",
-"expr : '(' expr ')'",
-"expr : expr \"ADD\" expr",
-"expr : expr \"SUB\" expr",
-"expr : expr \"MUL\" expr",
-"expr : expr \"DIV\" expr",
-"expr : expr \"MOD\" expr",
-"expr : expr \"AND\" expr",
-"expr : expr '|' expr",
-"expr : \"SUB\" expr",
-"expr : LETTER",
-"expr : number",
-"number : DIGIT",
-"number : number DIGIT",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 73 "quote_calc2.y"
- /* start of programs */
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void) {
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
-#line 288 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-case 3:
-#line 35 "quote_calc2.y"
-	{  yyerrok ; }
-break;
-case 4:
-#line 39 "quote_calc2.y"
-	{  printf("%d\n",yystack.l_mark[0]);}
-break;
-case 5:
-#line 41 "quote_calc2.y"
-	{  regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
-break;
-case 6:
-#line 45 "quote_calc2.y"
-	{  yyval = yystack.l_mark[-1]; }
-break;
-case 7:
-#line 47 "quote_calc2.y"
-	{  yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
-break;
-case 8:
-#line 49 "quote_calc2.y"
-	{  yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
-break;
-case 9:
-#line 51 "quote_calc2.y"
-	{  yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
-break;
-case 10:
-#line 53 "quote_calc2.y"
-	{  yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
-break;
-case 11:
-#line 55 "quote_calc2.y"
-	{  yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
-break;
-case 12:
-#line 57 "quote_calc2.y"
-	{  yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
-break;
-case 13:
-#line 59 "quote_calc2.y"
-	{  yyval = yystack.l_mark[-2] | yystack.l_mark[0]; }
-break;
-case 14:
-#line 61 "quote_calc2.y"
-	{  yyval = - yystack.l_mark[0]; }
-break;
-case 15:
-#line 63 "quote_calc2.y"
-	{  yyval = regs[yystack.l_mark[0]]; }
-break;
-case 17:
-#line 68 "quote_calc2.y"
-	{  yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
-break;
-case 18:
-#line 70 "quote_calc2.y"
-	{  yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
-break;
-#line 550 "/dev/stdout"
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.13.out b/usr.bin/yacc/tests/regress.13.out
deleted file mode 100644
index 94b717ef9624..000000000000
--- a/usr.bin/yacc/tests/regress.13.out
+++ /dev/null
@@ -1,604 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 2 "quote_calc3.y"
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-int yylex(void);
-static void yyerror(const char *s);
-
-#line 29 "/dev/stdout"
-
-#ifndef YYSTYPE
-typedef int YYSTYPE;
-#endif
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define OP_ADD 257
-#define OP_SUB 259
-#define OP_MUL 261
-#define OP_DIV 263
-#define OP_MOD 265
-#define OP_AND 267
-#define DIGIT 269
-#define LETTER 270
-#define UMINUS 271
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    0,    0,    1,    1,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    3,    3,
-};
-static const short yylen[] = {                            2,
-    0,    3,    3,    1,    3,    3,    3,    3,    3,    3,
-    3,    3,    3,    2,    1,    1,    1,    2,
-};
-static const short yydefred[] = {                         1,
-    0,    0,    0,   17,    0,    0,    0,    0,    0,    3,
-   15,    0,    0,    0,    2,    0,    0,    0,    0,    0,
-    0,    0,   18,    0,    6,    0,    0,    0,    0,    0,
-    0,    0,
-};
-static const short yydgoto[] = {                          1,
-    7,    8,    9,
-};
-static const short yysindex[] = {                         0,
-  -38,    5,  -36,    0,  -51,  -36,    7, -121, -248,    0,
-    0, -243,  -36,  -22,    0,  -36,  -36,  -36,  -36,  -36,
-  -36,  -36,    0, -121,    0, -121, -121, -121, -121, -121,
- -121, -243,
-};
-static const short yyrindex[] = {                         0,
-    0,    0,    0,    0,   -9,    0,    0,   13,  -10,    0,
-    0,   -5,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   15,    0,   -3,   -2,   -1,    1,    2,
-    3,   -4,
-};
-static const short yygindex[] = {                         0,
-    0,   42,    0,
-};
-#define YYTABLESIZE 258
-static const short yytable[] = {                         16,
-   15,    6,   22,    6,   14,   13,    7,    8,    9,   13,
-   10,   11,   12,   16,   10,   17,   15,   18,   25,   19,
-   23,   20,    4,   21,    5,    0,    0,    0,    0,    0,
-   16,    0,    0,    0,    0,   14,   13,    7,    8,    9,
-    0,   10,   11,   12,   12,    0,    0,   14,    0,    0,
-    0,    0,    0,    0,   24,    0,    0,   26,   27,   28,
-   29,   30,   31,   32,    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,   22,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   16,   15,    0,    0,    0,   14,   13,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   16,    0,   17,    0,   18,
-    0,   19,    0,   20,    0,   21,    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,    2,    0,    0,
-    3,    0,    3,    0,    0,    0,    0,    0,    0,    0,
-    4,    5,    4,   11,   16,    0,   17,    0,   18,    0,
-   19,    0,   20,    0,   21,    0,   16,   15,   16,   15,
-   16,   15,   16,   15,   16,   15,   16,   15,
-};
-static const short yycheck[] = {                         10,
-   10,   40,  124,   40,   10,   10,   10,   10,   10,   61,
-   10,   10,   10,  257,   10,  259,   10,  261,   41,  263,
-  269,  265,   10,  267,   10,   -1,   -1,   -1,   -1,   -1,
-   41,   -1,   -1,   -1,   -1,   41,   41,   41,   41,   41,
-   -1,   41,   41,   41,    3,   -1,   -1,    6,   -1,   -1,
-   -1,   -1,   -1,   -1,   13,   -1,   -1,   16,   17,   18,
-   19,   20,   21,   22,   -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,   -1,   -1,   -1,   -1,
-   -1,  124,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  124,  124,   -1,   -1,   -1,  124,  124,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,  257,   -1,  259,   -1,  261,
-   -1,  263,   -1,  265,   -1,  267,   -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,   -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,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,  256,   -1,   -1,
-  259,   -1,  259,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  269,  270,  269,  270,  257,   -1,  259,   -1,  261,   -1,
-  263,   -1,  265,   -1,  267,   -1,  257,  257,  259,  259,
-  261,  261,  263,  263,  265,  265,  267,  267,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 271
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file",0,0,0,0,0,0,0,0,0,"'\\n'",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,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,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,"OP_ADD","\"ADD-operator\"","OP_SUB","\"SUB-operator\"","OP_MUL",
-"\"MUL-operator\"","OP_DIV","\"DIV-operator\"","OP_MOD","\"MOD-operator\"",
-"OP_AND","\"AND-operator\"","DIGIT","LETTER","UMINUS","illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : list",
-"list :",
-"list : list stat '\\n'",
-"list : list error '\\n'",
-"stat : expr",
-"stat : LETTER '=' expr",
-"expr : '(' expr ')'",
-"expr : expr OP_ADD expr",
-"expr : expr OP_SUB expr",
-"expr : expr OP_MUL expr",
-"expr : expr OP_DIV expr",
-"expr : expr OP_MOD expr",
-"expr : expr OP_AND expr",
-"expr : expr '|' expr",
-"expr : OP_SUB expr",
-"expr : LETTER",
-"expr : number",
-"number : DIGIT",
-"number : number DIGIT",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 73 "quote_calc3.y"
- /* start of programs */
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void) {
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
-#line 282 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-case 3:
-#line 35 "quote_calc3.y"
-	{  yyerrok ; }
-break;
-case 4:
-#line 39 "quote_calc3.y"
-	{  printf("%d\n",yystack.l_mark[0]);}
-break;
-case 5:
-#line 41 "quote_calc3.y"
-	{  regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
-break;
-case 6:
-#line 45 "quote_calc3.y"
-	{  yyval = yystack.l_mark[-1]; }
-break;
-case 7:
-#line 47 "quote_calc3.y"
-	{  yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
-break;
-case 8:
-#line 49 "quote_calc3.y"
-	{  yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
-break;
-case 9:
-#line 51 "quote_calc3.y"
-	{  yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
-break;
-case 10:
-#line 53 "quote_calc3.y"
-	{  yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
-break;
-case 11:
-#line 55 "quote_calc3.y"
-	{  yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
-break;
-case 12:
-#line 57 "quote_calc3.y"
-	{  yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
-break;
-case 13:
-#line 59 "quote_calc3.y"
-	{  yyval = yystack.l_mark[-2] | yystack.l_mark[0]; }
-break;
-case 14:
-#line 61 "quote_calc3.y"
-	{  yyval = - yystack.l_mark[0]; }
-break;
-case 15:
-#line 63 "quote_calc3.y"
-	{  yyval = regs[yystack.l_mark[0]]; }
-break;
-case 17:
-#line 68 "quote_calc3.y"
-	{  yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
-break;
-case 18:
-#line 70 "quote_calc3.y"
-	{  yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
-break;
-#line 544 "/dev/stdout"
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.14.out b/usr.bin/yacc/tests/regress.14.out
deleted file mode 100644
index aecfb49d161d..000000000000
--- a/usr.bin/yacc/tests/regress.14.out
+++ /dev/null
@@ -1,604 +0,0 @@
-#ifndef lint
-static const char yysccsid[] = "@(#)yaccpar	1.9 (Berkeley) 02/21/93";
-#endif
-
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYPATCH 20140101
-
-#define YYEMPTY        (-1)
-#define yyclearin      (yychar = YYEMPTY)
-#define yyerrok        (yyerrflag = 0)
-#define YYRECOVERING() (yyerrflag != 0)
-
-#define YYPREFIX "yy"
-
-#define YYPURE 0
-
-#line 2 "quote_calc4.y"
-# include <stdio.h>
-# include <ctype.h>
-
-int regs[26];
-int base;
-
-int yylex(void);
-static void yyerror(const char *s);
-
-#line 29 "/dev/stdout"
-
-#ifndef YYSTYPE
-typedef int YYSTYPE;
-#endif
-
-/* compatibility with bison */
-#ifdef YYPARSE_PARAM
-/* compatibility with FreeBSD */
-# ifdef YYPARSE_PARAM_TYPE
-#  define YYPARSE_DECL() yyparse(YYPARSE_PARAM_TYPE YYPARSE_PARAM)
-# else
-#  define YYPARSE_DECL() yyparse(void *YYPARSE_PARAM)
-# endif
-#else
-# define YYPARSE_DECL() yyparse(void)
-#endif
-
-/* Parameters sent to lex. */
-#ifdef YYLEX_PARAM
-# define YYLEX_DECL() yylex(void *YYLEX_PARAM)
-# define YYLEX yylex(YYLEX_PARAM)
-#else
-# define YYLEX_DECL() yylex(void)
-# define YYLEX yylex()
-#endif
-
-/* Parameters sent to yyerror. */
-#ifndef YYERROR_DECL
-#define YYERROR_DECL() yyerror(const char *s)
-#endif
-#ifndef YYERROR_CALL
-#define YYERROR_CALL(msg) yyerror(msg)
-#endif
-
-extern int YYPARSE_DECL();
-
-#define OP_ADD 257
-#define OP_SUB 259
-#define OP_MUL 261
-#define OP_DIV 263
-#define OP_MOD 265
-#define OP_AND 267
-#define DIGIT 269
-#define LETTER 270
-#define UMINUS 271
-#define YYERRCODE 256
-static const short yylhs[] = {                           -1,
-    0,    0,    0,    1,    1,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    2,    2,    3,    3,
-};
-static const short yylen[] = {                            2,
-    0,    3,    3,    1,    3,    3,    3,    3,    3,    3,
-    3,    3,    3,    2,    1,    1,    1,    2,
-};
-static const short yydefred[] = {                         1,
-    0,    0,    0,   17,    0,    0,    0,    0,    0,    3,
-   15,    0,    0,    0,    2,    0,    0,    0,    0,    0,
-    0,    0,   18,    0,    6,    0,    0,    0,    0,    0,
-    0,    0,
-};
-static const short yydgoto[] = {                          1,
-    7,    8,    9,
-};
-static const short yysindex[] = {                         0,
-  -38,    4,  -36,    0,  -51,  -36,    6, -121, -249,    0,
-    0, -243,  -36,  -23,    0,  -36,  -36,  -36,  -36,  -36,
-  -36,  -36,    0, -121,    0, -121, -121, -121, -121, -121,
- -121, -243,
-};
-static const short yyrindex[] = {                         0,
-    0,    0,    0,    0,   -9,    0,    0,   12,  -10,    0,
-    0,   -5,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   14,    0,   -3,   -2,   -1,    1,    2,
-    3,   -4,
-};
-static const short yygindex[] = {                         0,
-    0,   42,    0,
-};
-#define YYTABLESIZE 259
-static const short yytable[] = {                         16,
-   15,    6,   22,    6,   14,   13,    7,    8,    9,   13,
-   10,   11,   12,   10,   16,   15,   17,   25,   18,   23,
-   19,    4,   20,    5,   21,    0,    0,    0,    0,    0,
-   16,    0,    0,    0,    0,   14,   13,    7,    8,    9,
-    0,   10,   11,   12,   12,    0,    0,   14,    0,    0,
-    0,    0,    0,    0,   24,    0,    0,   26,   27,   28,
-   29,   30,   31,   32,    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,
-   22,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   16,   15,    0,    0,    0,   14,   13,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   16,    0,   17,    0,
-   18,    0,   19,    0,   20,    0,   21,    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,    2,    0,    0,
-    0,    3,    0,    3,    0,    0,    0,    0,    0,    0,
-    4,    5,    4,   11,   16,    0,   17,    0,   18,    0,
-   19,    0,   20,    0,   21,    0,    0,   16,   15,   16,
-   15,   16,   15,   16,   15,   16,   15,   16,   15,
-};
-static const short yycheck[] = {                         10,
-   10,   40,  124,   40,   10,   10,   10,   10,   10,   61,
-   10,   10,   10,   10,  258,   10,  260,   41,  262,  269,
-  264,   10,  266,   10,  268,   -1,   -1,   -1,   -1,   -1,
-   41,   -1,   -1,   -1,   -1,   41,   41,   41,   41,   41,
-   -1,   41,   41,   41,    3,   -1,   -1,    6,   -1,   -1,
-   -1,   -1,   -1,   -1,   13,   -1,   -1,   16,   17,   18,
-   19,   20,   21,   22,   -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,   -1,   -1,   -1,   -1,
-  124,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  124,  124,   -1,   -1,   -1,  124,  124,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,  258,   -1,  260,   -1,
-  262,   -1,  264,   -1,  266,   -1,  268,   -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,   -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,   -1,   -1,   -1,   -1,   -1,   -1,  256,   -1,   -1,
-   -1,  260,   -1,  260,   -1,   -1,   -1,   -1,   -1,   -1,
-  269,  270,  269,  270,  258,   -1,  260,   -1,  262,   -1,
-  264,   -1,  266,   -1,  268,   -1,   -1,  258,  258,  260,
-  260,  262,  262,  264,  264,  266,  266,  268,  268,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 271
-#define YYTRANSLATE(a) ((a) > YYMAXTOKEN ? (YYMAXTOKEN + 1) : (a))
-#if YYDEBUG
-static const char *yyname[] = {
-
-"end-of-file",0,0,0,0,0,0,0,0,0,"'\\n'",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,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,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,"OP_ADD","\"ADD-operator\"","OP_SUB","\"SUB-operator\"","OP_MUL",
-"\"MUL-operator\"","OP_DIV","\"DIV-operator\"","OP_MOD","\"MOD-operator\"",
-"OP_AND","\"AND-operator\"","DIGIT","LETTER","UMINUS","illegal-symbol",
-};
-static const char *yyrule[] = {
-"$accept : list",
-"list :",
-"list : list stat '\\n'",
-"list : list error '\\n'",
-"stat : expr",
-"stat : LETTER '=' expr",
-"expr : '(' expr ')'",
-"expr : expr \"ADD-operator\" expr",
-"expr : expr \"SUB-operator\" expr",
-"expr : expr \"MUL-operator\" expr",
-"expr : expr \"DIV-operator\" expr",
-"expr : expr \"MOD-operator\" expr",
-"expr : expr \"AND-operator\" expr",
-"expr : expr '|' expr",
-"expr : \"SUB-operator\" expr",
-"expr : LETTER",
-"expr : number",
-"number : DIGIT",
-"number : number DIGIT",
-
-};
-#endif
-
-int      yydebug;
-int      yynerrs;
-
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
-/* define the initial stack-sizes */
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH  YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH  10000
-#endif
-#endif
-
-#define YYINITSTACKSIZE 200
-
-typedef struct {
-    unsigned stacksize;
-    short    *s_base;
-    short    *s_mark;
-    short    *s_last;
-    YYSTYPE  *l_base;
-    YYSTYPE  *l_mark;
-} YYSTACKDATA;
-/* variables for the parser stack */
-static YYSTACKDATA yystack;
-#line 73 "quote_calc4.y"
- /* start of programs */
-
-int
-main (void)
-{
-    while(!feof(stdin)) {
-	yyparse();
-    }
-    return 0;
-}
-
-static void
-yyerror(const char *s)
-{
-    fprintf(stderr, "%s\n", s);
-}
-
-int
-yylex(void) {
-	/* lexical analysis routine */
-	/* returns LETTER for a lower case letter, yylval = 0 through 25 */
-	/* return DIGIT for a digit, yylval = 0 through 9 */
-	/* all other characters are returned immediately */
-
-    int c;
-
-    while( (c=getchar()) == ' ' )   { /* skip blanks */ }
-
-    /* c is now nonblank */
-
-    if( islower( c )) {
-	yylval = c - 'a';
-	return ( LETTER );
-    }
-    if( isdigit( c )) {
-	yylval = c - '0';
-	return ( DIGIT );
-    }
-    return( c );
-}
-#line 282 "/dev/stdout"
-
-#if YYDEBUG
-#include <stdio.h>		/* needed for printf */
-#endif
-
-#include <stdlib.h>	/* needed for malloc, etc */
-#include <string.h>	/* needed for memset */
-
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack(YYSTACKDATA *data)
-{
-    int i;
-    unsigned newsize;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = data->stacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-
-    i = (int) (data->s_mark - data->s_base);
-    newss = (short *)realloc(data->s_base, newsize * sizeof(*newss));
-    if (newss == 0)
-        return -1;
-
-    data->s_base = newss;
-    data->s_mark = newss + i;
-
-    newvs = (YYSTYPE *)realloc(data->l_base, newsize * sizeof(*newvs));
-    if (newvs == 0)
-        return -1;
-
-    data->l_base = newvs;
-    data->l_mark = newvs + i;
-
-    data->stacksize = newsize;
-    data->s_last = data->s_base + newsize - 1;
-    return 0;
-}
-
-#if YYPURE || defined(YY_NO_LEAKS)
-static void yyfreestack(YYSTACKDATA *data)
-{
-    free(data->s_base);
-    free(data->l_base);
-    memset(data, 0, sizeof(*data));
-}
-#else
-#define yyfreestack(data) /* nothing */
-#endif
-
-#define YYABORT  goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR  goto yyerrlab
-
-int
-YYPARSE_DECL()
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")) != 0)
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = YYEMPTY;
-    yystate = 0;
-
-#if YYPURE
-    memset(&yystack, 0, sizeof(yystack));
-#endif
-
-    if (yystack.s_base == NULL && yygrowstack(&yystack)) goto yyoverflow;
-    yystack.s_mark = yystack.s_base;
-    yystack.l_mark = yystack.l_base;
-    yystate = 0;
-    *yystack.s_mark = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate]) != 0) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-        {
-            goto yyoverflow;
-        }
-        yystate = yytable[yyn];
-        *++yystack.s_mark = yytable[yyn];
-        *++yystack.l_mark = yylval;
-        yychar = YYEMPTY;
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-
-    yyerror("syntax error");
-
-    goto yyerrlab;
-
-yyerrlab:
-    ++yynerrs;
-
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
-#endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-                {
-                    goto yyoverflow;
-                }
-                yystate = yytable[yyn];
-                *++yystack.s_mark = yytable[yyn];
-                *++yystack.l_mark = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yystack.s_mark);
-#endif
-                if (yystack.s_mark <= yystack.s_base) goto yyabort;
-                --yystack.s_mark;
-                --yystack.l_mark;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = yyname[YYTRANSLATE(yychar)];
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = YYEMPTY;
-        goto yyloop;
-    }
-
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    if (yym)
-        yyval = yystack.l_mark[1-yym];
-    else
-        memset(&yyval, 0, sizeof yyval);
-    switch (yyn)
-    {
-case 3:
-#line 35 "quote_calc4.y"
-	{  yyerrok ; }
-break;
-case 4:
-#line 39 "quote_calc4.y"
-	{  printf("%d\n",yystack.l_mark[0]);}
-break;
-case 5:
-#line 41 "quote_calc4.y"
-	{  regs[yystack.l_mark[-2]] = yystack.l_mark[0]; }
-break;
-case 6:
-#line 45 "quote_calc4.y"
-	{  yyval = yystack.l_mark[-1]; }
-break;
-case 7:
-#line 47 "quote_calc4.y"
-	{  yyval = yystack.l_mark[-2] + yystack.l_mark[0]; }
-break;
-case 8:
-#line 49 "quote_calc4.y"
-	{  yyval = yystack.l_mark[-2] - yystack.l_mark[0]; }
-break;
-case 9:
-#line 51 "quote_calc4.y"
-	{  yyval = yystack.l_mark[-2] * yystack.l_mark[0]; }
-break;
-case 10:
-#line 53 "quote_calc4.y"
-	{  yyval = yystack.l_mark[-2] / yystack.l_mark[0]; }
-break;
-case 11:
-#line 55 "quote_calc4.y"
-	{  yyval = yystack.l_mark[-2] % yystack.l_mark[0]; }
-break;
-case 12:
-#line 57 "quote_calc4.y"
-	{  yyval = yystack.l_mark[-2] & yystack.l_mark[0]; }
-break;
-case 13:
-#line 59 "quote_calc4.y"
-	{  yyval = yystack.l_mark[-2] | yystack.l_mark[0]; }
-break;
-case 14:
-#line 61 "quote_calc4.y"
-	{  yyval = - yystack.l_mark[0]; }
-break;
-case 15:
-#line 63 "quote_calc4.y"
-	{  yyval = regs[yystack.l_mark[0]]; }
-break;
-case 17:
-#line 68 "quote_calc4.y"
-	{  yyval = yystack.l_mark[0]; base = (yystack.l_mark[0]==0) ? 8 : 10; }
-break;
-case 18:
-#line 70 "quote_calc4.y"
-	{  yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
-break;
-#line 544 "/dev/stdout"
-    }
-    yystack.s_mark -= yym;
-    yystate = *yystack.s_mark;
-    yystack.l_mark -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yystack.s_mark = YYFINAL;
-        *++yystack.l_mark = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = YYLEX) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = yyname[YYTRANSLATE(yychar)];
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
-#endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack))
-    {
-        goto yyoverflow;
-    }
-    *++yystack.s_mark = (short) yystate;
-    *++yystack.l_mark = yyval;
-    goto yyloop;
-
-yyoverflow:
-    yyerror("yacc stack overflow");
-
-yyabort:
-    yyfreestack(&yystack);
-    return (1);
-
-yyaccept:
-    yyfreestack(&yystack);
-    return (0);
-}
diff --git a/usr.bin/yacc/tests/regress.sh b/usr.bin/yacc/tests/regress.sh
deleted file mode 100644
index fb3b5a5df44b..000000000000
--- a/usr.bin/yacc/tests/regress.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-# $FreeBSD$
-
-echo 1..15
-
-test_yacc() {
-	yacc "${@}" | sed -e "s,${SRCDIR}/,,g"
-}
-
-REGRESSION_START($1)
-
-REGRESSION_TEST(`00', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/undefined.y')
-REGRESSION_TEST(`01', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/calc.y')
-REGRESSION_TEST(`02', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/calc1.y')
-REGRESSION_TEST(`03', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/calc3.y')
-REGRESSION_TEST(`04', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/code_calc.y')
-REGRESSION_TEST(`05', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/code_error.y')
-REGRESSION_TEST(`06', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/error.y')
-REGRESSION_TEST(`07', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/ftp.y')
-REGRESSION_TEST(`08', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/grammar.y')
-REGRESSION_TEST(`09', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/pure_calc.y')
-REGRESSION_TEST(`10', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/pure_error.y')
-REGRESSION_TEST(`11', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/quote_calc.y')
-REGRESSION_TEST(`12', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/quote_calc2.y')
-REGRESSION_TEST(`13', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/quote_calc3.y')
-REGRESSION_TEST(`14', `test_yacc -b regress -o /dev/stdout ${SRCDIR}/quote_calc4.y')
-
-REGRESSION_END()
-
diff --git a/usr.bin/yacc/tests/undefined.y b/usr.bin/yacc/tests/undefined.y
deleted file mode 100644
index 33ba005e4f57..000000000000
--- a/usr.bin/yacc/tests/undefined.y
+++ /dev/null
@@ -1,5 +0,0 @@
-%type <int> rule
-%%
-rule:
-    ;
-%%
diff --git a/usr.bin/yacc/tests/yacc_tests.sh b/usr.bin/yacc/tests/yacc_tests.sh
new file mode 100755
index 000000000000..6ad69161f876
--- /dev/null
+++ b/usr.bin/yacc/tests/yacc_tests.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# $FreeBSD$
+
+set -e
+
+# Setup the environment for run_test
+# - run_test looks for `#define YYBTYACC` in ../config.h
+# - run_test assumes a yacc binary exists in ../yacc instead of running "yacc"
+# - run_test spams the test dir with files (polluting subsequent test runs),
+#   so it's better to copy all the files to a temporary directory created by
+#   kyua
+echo > "./config.h"
+mkdir "test"
+cp -Rf "$(dirname "$0")"/* "test"
+cp -p /usr/bin/yacc ./yacc
+
+cd "test" && ./run_test
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 8a2565200354..7106383ce4ef 100644
--- a/usr.bin/ypcat/ypcat.1
+++ b/usr.bin/ypcat/ypcat.1
@@ -71,4 +71,4 @@ Display the map nickname table.
 .Xr ypbind 8 ,
 .Xr ypset 8
 .Sh AUTHORS
-.An Theo De Raadt Aq deraadt@theos.com .
+.An Theo De Raadt Aq Mt deraadt@theos.com .
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index 5f4a4cab278d..4291de24fa0b 100644
--- a/usr.bin/ypmatch/ypmatch.1
+++ b/usr.bin/ypmatch/ypmatch.1
@@ -72,4 +72,4 @@ Display the map nickname table.
 .Xr ypbind 8 ,
 .Xr ypset 8
 .Sh AUTHORS
-.An Theo De Raadt Aq deraadt@theos.com .
+.An Theo De Raadt Aq Mt deraadt@theos.com .
diff --git a/usr.sbin/Makefile.ia64 b/usr.sbin/Makefile.ia64
deleted file mode 100644
index 0a897b40b316..000000000000
--- a/usr.sbin/Makefile.ia64
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.if ${MK_ACPI} != "no"
-SUBDIR+=	acpi
-.endif
-SUBDIR+=	kgmon
-SUBDIR+=	mount_smbfs
-SUBDIR:=	${SUBDIR:Nuathload}
-SUBDIR+=	zzz
diff --git a/usr.sbin/acpi/acpiconf/acpiconf.8 b/usr.sbin/acpi/acpiconf/acpiconf.8
index 9ddd06748eaa..805e090f5f38 100644
--- a/usr.sbin/acpi/acpiconf/acpiconf.8
+++ b/usr.sbin/acpi/acpiconf/acpiconf.8
@@ -91,6 +91,6 @@ utility appeared in
 The
 .Nm
 utility was written by
-.An Mitsuru Iwasaki Aq iwasaki@FreeBSD.org .
+.An Mitsuru Iwasaki Aq Mt iwasaki@FreeBSD.org .
 This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/usr.sbin/acpi/acpidb/acpidb.8 b/usr.sbin/acpi/acpidb/acpidb.8
index 4ed97a6a399c..67fab31c346d 100644
--- a/usr.sbin/acpi/acpidb/acpidb.8
+++ b/usr.sbin/acpi/acpidb/acpidb.8
@@ -161,7 +161,7 @@ It was imported for
 The
 .Nm
 utility was written by
-.An Mitsuru Iwasaki Aq iwasaki@FreeBSD.org
+.An Mitsuru Iwasaki Aq Mt iwasaki@FreeBSD.org
 and uses Intel ACPI-CA for the backend.
 This manual page was written by
 .An Nate Lawson .
diff --git a/usr.sbin/acpi/acpidump/acpidump.8 b/usr.sbin/acpi/acpidump/acpidump.8
index f1c7a18def32..a03917a1baba 100644
--- a/usr.sbin/acpi/acpidump/acpidump.8
+++ b/usr.sbin/acpi/acpidump/acpidump.8
@@ -181,20 +181,20 @@ and was rewritten to use
 for
 .Fx 5.2 .
 .Sh AUTHORS
-.An Doug Rabson Aq dfr@FreeBSD.org
-.An Mitsuru IWASAKI Aq iwasaki@FreeBSD.org
-.An Yasuo YOKOYAMA Aq yokoyama@jp.FreeBSD.org
-.An Nate Lawson Aq njl@FreeBSD.org
+.An Doug Rabson Aq Mt dfr@FreeBSD.org
+.An Mitsuru IWASAKI Aq Mt iwasaki@FreeBSD.org
+.An Yasuo YOKOYAMA Aq Mt yokoyama@jp.FreeBSD.org
+.An Nate Lawson Aq Mt njl@FreeBSD.org
 .Pp
 .An -nosplit
 Some contributions made by
-.An Chitoshi Ohsawa Aq ohsawa@catv1.ccn-net.ne.jp ,
-.An Takayasu IWANASHI Aq takayasu@wendy.a.perfect-liberty.or.jp ,
-.An Yoshihiko SARUMARU Aq mistral@imasy.or.jp ,
-.An Hiroki Sato Aq hrs@FreeBSD.org ,
-.An Michael Lucas Aq mwlucas@blackhelicopters.org
+.An Chitoshi Ohsawa Aq Mt ohsawa@catv1.ccn-net.ne.jp ,
+.An Takayasu IWANASHI Aq Mt takayasu@wendy.a.perfect-liberty.or.jp ,
+.An Yoshihiko SARUMARU Aq Mt mistral@imasy.or.jp ,
+.An Hiroki Sato Aq Mt hrs@FreeBSD.org ,
+.An Michael Lucas Aq Mt mwlucas@blackhelicopters.org
 and
-.An Michael Smith Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Sh BUGS
 The current implementation does not dump the BOOT structure or
 other miscellaneous tables.
diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8
index f23ecffd5b59..2e6a5b5a3897 100644
--- a/usr.sbin/adduser/adduser.8
+++ b/usr.sbin/adduser/adduser.8
@@ -450,11 +450,11 @@ command appeared in
 .Sh AUTHORS
 .An -nosplit
 This manual page and the original script, in Perl, was written by
-.An Wolfram Schneider Aq wosch@FreeBSD.org .
+.An Wolfram Schneider Aq Mt wosch@FreeBSD.org .
 The replacement script, written as a Bourne
 shell script with some enhancements, and the man page modification that
 came with it were done by
-.An Mike Makonnen Aq mtm@identd.net .
+.An Mike Makonnen Aq Mt mtm@identd.net .
 .Sh BUGS
 In order for
 .Nm
diff --git a/usr.sbin/adduser/adduser.conf.5 b/usr.sbin/adduser/adduser.conf.5
index c7c4f5d067b9..af9fe22cfb3a 100644
--- a/usr.sbin/adduser/adduser.conf.5
+++ b/usr.sbin/adduser/adduser.conf.5
@@ -210,7 +210,7 @@ manual page first appeared in
 .Fx 5.3 .
 .Sh AUTHORS
 This manual page was written by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
+.An Tom Rhodes Aq Mt trhodes@FreeBSD.org .
 .Sh BUGS
 The internal variables documented here may change without notice.
 Do not rely on them.
diff --git a/usr.sbin/ancontrol/ancontrol.8 b/usr.sbin/ancontrol/ancontrol.8
index 5ce4377ab90f..25fa5aefa061 100644
--- a/usr.sbin/ancontrol/ancontrol.8
+++ b/usr.sbin/ancontrol/ancontrol.8
@@ -540,7 +540,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Bill Paul Aq wpaul@ee.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ee.columbia.edu .
 .Sh BUGS
 The statistics counters do not seem to show the amount of transmit
 and received frames as increasing.
diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index 3e039b08b1b8..96eb9732b7e6 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -133,7 +133,7 @@ replaces all of its functionality.
 .Xr apm 4 ,
 .Xr zzz 8
 .Sh AUTHORS
-.An Tatsumi Hosokawa Aq hosokawa@jp.FreeBSD.org
+.An Tatsumi Hosokawa Aq Mt hosokawa@jp.FreeBSD.org
 .Sh BUGS
 Some APM implementations do not support parameters needed by
 .Nm .
diff --git a/usr.sbin/apmd/apmd.8 b/usr.sbin/apmd/apmd.8
index 633217fd3295..afecd47a3759 100644
--- a/usr.sbin/apmd/apmd.8
+++ b/usr.sbin/apmd/apmd.8
@@ -308,15 +308,15 @@ The
 utility appeared in
 .Fx 3.3 .
 .Sh AUTHORS
-.An Mitsuru IWASAKI Aq iwasaki@FreeBSD.org
-.An KOIE Hidetaka Aq koie@suri.co.jp
+.An Mitsuru IWASAKI Aq Mt iwasaki@FreeBSD.org
+.An KOIE Hidetaka Aq Mt koie@suri.co.jp
 .Pp
 .An -nosplit
 Some contributions made by
-.An Warner Losh Aq imp@FreeBSD.org ,
-.An Hiroshi Yamashita Aq bluemoon@msj.biglobe.ne.jp ,
-.An Yoshihiko SARUMARU Aq mistral@imasy.or.jp ,
-.An Norihiro Kumagai Aq kuma@nk.rim.or.jp ,
-.An NAKAGAWA Yoshihisa Aq nakagawa@jp.FreeBSD.org ,
+.An Warner Losh Aq Mt imp@FreeBSD.org ,
+.An Hiroshi Yamashita Aq Mt bluemoon@msj.biglobe.ne.jp ,
+.An Yoshihiko SARUMARU Aq Mt mistral@imasy.or.jp ,
+.An Norihiro Kumagai Aq Mt kuma@nk.rim.or.jp ,
+.An NAKAGAWA Yoshihisa Aq Mt nakagawa@jp.FreeBSD.org ,
 and
-.An Nick Hilliard Aq nick@foobar.org .
+.An Nick Hilliard Aq Mt nick@foobar.org .
diff --git a/usr.sbin/asf/asf.8 b/usr.sbin/asf/asf.8
index 92edb4b790d8..39281375417b 100644
--- a/usr.sbin/asf/asf.8
+++ b/usr.sbin/asf/asf.8
@@ -170,7 +170,7 @@ The
 utility first appeared in
 .Fx 5.2 .
 .Sh AUTHORS
-.An Greg Lehey Aq grog@FreeBSD.org
+.An Greg Lehey Aq Mt grog@FreeBSD.org
 .Sh BUGS
 Module paths are guessed in a rather naive way by default.
 It is likely to lag behind the changes to the build tree layout.
diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
index 23e16cb7d0d3..1c95f77dff2b 100644
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -35,6 +35,7 @@ SRCS=	\
 	post.c			\
 	rtc.c			\
 	smbiostbl.c		\
+	task_switch.c		\
 	uart_emul.c		\
 	virtio.c		\
 	xmsr.c			\
diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
index c4ec020bd5e1..5dea3001de22 100644
--- a/usr.sbin/bhyve/acpi.c
+++ b/usr.sbin/bhyve/acpi.c
@@ -40,12 +40,13 @@
  *  Layout
  *  ------
  *   RSDP  ->   0xf2400    (36 bytes fixed)
- *     RSDT  ->   0xf2440    (36 bytes + 4*N table addrs, 2 used)
- *     XSDT  ->   0xf2480    (36 bytes + 8*N table addrs, 2 used)
+ *     RSDT  ->   0xf2440    (36 bytes + 4*7 table addrs, 4 used)
+ *     XSDT  ->   0xf2480    (36 bytes + 8*7 table addrs, 4 used)
  *       MADT  ->   0xf2500  (depends on #CPUs)
  *       FADT  ->   0xf2600  (268 bytes)
  *       HPET  ->   0xf2740  (56 bytes)
- *         FACS  ->   0xf2780 (64 bytes)
+ *       MCFG  ->   0xf2780  (60 bytes)
+ *         FACS  ->   0xf27C0 (64 bytes)
  *         DSDT  ->   0xf2800 (variable - can go up to 0x100000)
  */
 
@@ -80,7 +81,8 @@ __FBSDID("$FreeBSD$");
 #define MADT_OFFSET		0x100
 #define FADT_OFFSET		0x200
 #define	HPET_OFFSET		0x340
-#define FACS_OFFSET		0x380
+#define	MCFG_OFFSET		0x380
+#define FACS_OFFSET		0x3C0
 #define DSDT_OFFSET		0x400
 
 #define	BHYVE_ASL_TEMPLATE	"bhyve.XXXXXXX"
@@ -178,6 +180,8 @@ basl_fwrite_rsdt(FILE *fp)
 	    basl_acpi_base + FADT_OFFSET);
 	EFPRINTF(fp, "[0004]\t\tACPI Table Address 2 : %08X\n",
 	    basl_acpi_base + HPET_OFFSET);
+	EFPRINTF(fp, "[0004]\t\tACPI Table Address 3 : %08X\n",
+	    basl_acpi_base + MCFG_OFFSET);
 
 	EFFLUSH(fp);
 
@@ -216,6 +220,8 @@ basl_fwrite_xsdt(FILE *fp)
 	    basl_acpi_base + FADT_OFFSET);
 	EFPRINTF(fp, "[0004]\t\tACPI Table Address 2 : 00000000%08X\n",
 	    basl_acpi_base + HPET_OFFSET);
+	EFPRINTF(fp, "[0004]\t\tACPI Table Address 3 : 00000000%08X\n",
+	    basl_acpi_base + MCFG_OFFSET);
 
 	EFFLUSH(fp);
 
@@ -582,6 +588,39 @@ basl_fwrite_hpet(FILE *fp)
 	return (errno);
 }
 
+static int
+basl_fwrite_mcfg(FILE *fp)
+{
+	int err = 0;
+
+	EFPRINTF(fp, "/*\n");
+	EFPRINTF(fp, " * bhyve MCFG template\n");
+	EFPRINTF(fp, " */\n");
+	EFPRINTF(fp, "[0004]\t\tSignature : \"MCFG\"\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 : \"BVMCFG  \"\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, "[0008]\t\tReserved : 0\n");
+	EFPRINTF(fp, "\n");
+
+	EFPRINTF(fp, "[0008]\t\tBase Address : %016lX\n", pci_ecfg_base());
+	EFPRINTF(fp, "[0002]\t\tSegment Group: 0000\n");
+	EFPRINTF(fp, "[0001]\t\tStart Bus: 00\n");
+	EFPRINTF(fp, "[0001]\t\tEnd Bus: FF\n");
+	EFPRINTF(fp, "[0004]\t\tReserved : 0\n");
+	EFFLUSH(fp);
+	return (0);
+err_exit:
+	return (errno);
+}
+
 static int
 basl_fwrite_facs(FILE *fp)
 {
@@ -921,6 +960,7 @@ static struct {
 	{ basl_fwrite_madt, MADT_OFFSET },
 	{ basl_fwrite_fadt, FADT_OFFSET },
 	{ basl_fwrite_hpet, HPET_OFFSET },
+	{ basl_fwrite_mcfg, MCFG_OFFSET },
 	{ basl_fwrite_facs, FACS_OFFSET },
 	{ basl_fwrite_dsdt, DSDT_OFFSET },
 	{ NULL }
diff --git a/usr.sbin/bhyve/atkbdc.c b/usr.sbin/bhyve/atkbdc.c
index 1b7d66cdfdd6..930b7af95f3d 100644
--- a/usr.sbin/bhyve/atkbdc.c
+++ b/usr.sbin/bhyve/atkbdc.c
@@ -31,6 +31,10 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/vmm.h>
 
+#include <vmmapi.h>
+
+#include <assert.h>
+#include <errno.h>
 #include <stdio.h>
 
 #include "inout.h"
@@ -39,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #define	KBD_DATA_PORT		0x60
 
 #define	KBD_STS_CTL_PORT	0x64
-#define	 KDB_SYS_FLAG		0x4
+#define	 KBD_SYS_FLAG		0x4
 
 #define	KBDC_RESET		0xfe
 
@@ -48,29 +52,30 @@ atkbdc_data_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
     uint32_t *eax, void *arg)
 {
 	if (bytes != 1)
-		return (INOUT_ERROR);
+		return (-1);
 
 	*eax = 0;
 
-	return (INOUT_OK);
+	return (0);
 }
 
 static int
 atkbdc_sts_ctl_handler(struct vmctx *ctx, int vcpu, int in, int port,
     int bytes, uint32_t *eax, void *arg)
 {
-	int retval;
+	int error, retval;
 
 	if (bytes != 1)
-		return (INOUT_ERROR);
+		return (-1);
 
-	retval = INOUT_OK;
+	retval = 0;
 	if (in) {
-		*eax = KDB_SYS_FLAG;	/* system passed POST */
+		*eax = KBD_SYS_FLAG;	/* system passed POST */
 	} else {
 		switch (*eax) {
 		case KBDC_RESET:	/* Pulse "reset" line. */
-			retval = INOUT_RESET;
+			error = vm_suspend(ctx, VM_SUSPEND_RESET);
+			assert(error == 0 || errno == EALREADY);
 			break;
 		}
 	}
diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8
index aad1aef70635..114aaf162533 100644
--- a/usr.sbin/bhyve/bhyve.8
+++ b/usr.sbin/bhyve/bhyve.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 2, 2014
+.Dd June 26, 2014
 .Dt BHYVE 8
 .Os
 .Sh NAME
@@ -32,12 +32,14 @@
 .Nd "run a guest operating system inside a virtual machine"
 .Sh SYNOPSIS
 .Nm
-.Op Fl aehwxACHPW
+.Op Fl abehwxACHPWY
 .Op Fl c Ar numcpus
 .Op Fl g Ar gdbport
+.Op Fl l Ar lpcdev Ns Op , Ns Ar conf
+.Op Fl m Ar size Ns Op Ar K|k|M|m|G|g|T|t
 .Op Fl p Ar vcpu:hostcpu
 .Op Fl s Ar slot,emulation Ns Op , Ns Ar conf
-.Op Fl l Ar lpcdev Ns Op , Ns Ar conf
+.Op Fl U Ar uuid
 .Ar vmname
 .Sh DESCRIPTION
 .Nm
@@ -66,21 +68,49 @@ Generate ACPI tables.
 Required for
 .Fx Ns /amd64
 guests.
+.It Fl b
+Enable a low-level console device supported by
+.Fx kernels compiled with
+.Cd "device bvmconsole" .
+This option will be deprecated in a future version.
 .It Fl c Ar numcpus
 Number of guest virtual CPUs.
 The default is 1 and the maximum is 16.
 .It Fl C
 Include guest memory in core file.
-.It Fl H
-Yield the virtual CPU thread when a HLT instruction is detected.
-If this option is not specified, virtual CPUs will use 100% of a host CPU.
+.It Fl e
+Force
+.Nm
+to exit when a guest issues an access to an I/O port that is not emulated.
+This is intended for debug purposes.
 .It Fl g Ar gdbport
 For
-.Fx Ns /amd64 kernels compiled with
-.Cd "option bvmdebug" ,
+.Fx
+kernels compiled with
+.Cd "device bvmdebug" ,
 allow a remote kernel kgdb to be relayed to the guest kernel gdb stub
 via a local IPv4 address and this port.
 This option will be deprecated in a future version.
+.It Fl h
+Print help message and exit.
+.It Fl H
+Yield the virtual CPU thread when a HLT instruction is detected.
+If this option is not specified, virtual CPUs will use 100% of a host CPU.
+.It Fl l Ar lpcdev Ns Op , Ns Ar conf
+Allow devices behind the LPC PCI-ISA bridge to be configured.
+The only supported devices are the TTY-class devices,
+.Li com1
+and
+.Li com2 .
+.It Fl m Ar size Ns Op Ar K|k|M|m|G|g|T|t
+Guest physical memory size in bytes.
+This must be the same size that was given to
+.Xr bhyveload 8 .
+.Pp
+The size argument may be suffixed with one of K, M, G or T (either upper
+or lower case) to indicate a multiple of kilobytes, megabytes, gigabytes,
+or terabytes.
+If no suffix is given, the value is assumed to be in megabytes.
 .It Fl p Ar vcpu:hostcpu
 Pin guest's virtual CPU
 .Em vcpu
@@ -88,9 +118,6 @@ to
 .Em hostcpu .
 .It Fl P
 Force the guest virtual CPU to exit when a PAUSE instruction is detected.
-.It Fl W
-Force virtio PCI device emulations to use MSI interrupts instead of MSI-X
-interrupts.
 .It Fl s Ar slot,emulation Ns Op , Ns Ar conf
 Configure a virtual PCI slot and function.
 .Pp
@@ -211,34 +238,21 @@ The host device must have been reserved at boot-time using the
 loader variable as described in
 .Xr vmm 4 .
 .El
-.It Fl l Ar lpcdev Ns Op , Ns Ar conf
-Allow devices behind the LPC PCI-ISA bridge to be configured.
-The only supported devices are the TTY-class devices,
-.Li com1
-and
-.Li com2 .
-.It Fl m Ar size Ns Op Ar K|k|M|m|G|g|T|t
-Guest physical memory size in bytes.
-This must be the same size that was given to
-.Xr bhyveload 8 .
-.Pp
-The size argument may be suffixed with one of K, M, G or T (either upper
-or lower case) to indicate a multiple of kilobytes, megabytes, gigabytes,
-or terabytes.
-If no suffix is given, the value is assumed to be in megabytes.
-.It Fl e
-Force
-.Nm
-to exit when a guest issues an access to an I/O port that is not emulated.
-This is intended for debug purposes.
+.It Fl U Ar uuid
+Set the universally unique identifier
+.Pq UUID
+in the guest's System Management BIOS System Information structure.
+By default a UUID is generated from the host's hostname and
+.Ar vmname .
 .It Fl w
 Ignore accesses to unimplemented Model Specific Registers (MSRs). This is intended for debug purposes.
+.It Fl W
+Force virtio PCI device emulations to use MSI interrupts instead of MSI-X
+interrupts.
 .It Fl x
 The guest's local APIC is configured in x2APIC mode.
 .It Fl Y
 Disable MPtable generation.
-.It Fl h
-Print help message and exit.
 .It Ar vmname
 Alphanumeric name of the guest.
 This should be the same as that created by
@@ -303,5 +317,5 @@ bhyve -c 4 \e\
 first appeared in
 .Fx 10.0 .
 .Sh AUTHORS
-.An Neel Natu Aq neel@freebsd.org
-.An Peter Grehan Aq grehan@freebsd.org
+.An Neel Natu Aq Mt neel@freebsd.org
+.An Peter Grehan Aq Mt grehan@freebsd.org
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
index 1e5d3b33abd2..7dcf6d016b87 100644
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -69,16 +69,11 @@ __FBSDID("$FreeBSD$");
 
 #define GUEST_NIO_PORT		0x488	/* guest upcalls via i/o port */
 
-#define	VMEXIT_CONTINUE		1	/* continue from next instruction */
-#define	VMEXIT_RESTART		2	/* restart current instruction */
-#define	VMEXIT_ABORT		3	/* abort the vm run loop */
-#define	VMEXIT_RESET		4	/* guest machine has reset */
-#define	VMEXIT_POWEROFF		5	/* guest machine has powered off */
-
 #define MB		(1024UL * 1024)
 #define GB		(1024UL * MB)
 
 typedef int (*vmexit_handler_t)(struct vmctx *, struct vm_exit *, int *vcpu);
+extern int vmexit_task_switch(struct vmctx *, struct vm_exit *, int *vcpu);
 
 char *vmname;
 
@@ -101,7 +96,7 @@ static cpuset_t cpumask;
 
 static void vm_loop(struct vmctx *ctx, int vcpu, uint64_t rip);
 
-struct vm_exit vmexit[VM_MAXCPU];
+static struct vm_exit vmexit[VM_MAXCPU];
 
 struct bhyvestats {
         uint64_t        vmexit_bogus;
@@ -112,8 +107,6 @@ struct bhyvestats {
         uint64_t        vmexit_inst_emul;
         uint64_t        cpu_switch_rotate;
         uint64_t        cpu_switch_direct;
-        int             io_reset;
-	int		io_poweroff;
 } stats;
 
 struct mt_vmm_info {
@@ -129,26 +122,26 @@ usage(int code)
 {
 
         fprintf(stderr,
-                "Usage: %s [-aehwAHIPW] [-g <gdb port>] [-s <pci>] [-c vcpus]\n"
-		"       %*s [-p vcpu:hostcpu] [-m mem] [-l <lpc>] <vm>\n"
+                "Usage: %s [-abehwxACHPWY] [-c vcpus] [-g <gdb port>] [-l <lpc>]\n"
+		"       %*s [-m mem] [-p vcpu:hostcpu] [-s <pci>] [-U uuid] <vm>\n"
 		"       -a: local apic is in xAPIC mode (deprecated)\n"
-		"       -A: create an ACPI table\n"
-		"       -g: gdb port\n"
+		"       -A: create ACPI tables\n"
 		"       -c: # cpus (default 1)\n"
 		"       -C: include guest memory in core file\n"
-		"       -p: pin 'vcpu' to 'hostcpu'\n"
-		"       -H: vmexit from the guest on hlt\n"
-		"       -P: vmexit from the guest on pause\n"
-		"       -W: force virtio to use single-vector MSI\n"
 		"       -e: exit on unhandled I/O access\n"
+		"       -g: gdb port\n"
 		"       -h: help\n"
-		"       -s: <slot,driver,configinfo> PCI slot config\n"
+		"       -H: vmexit from the guest on hlt\n"
 		"       -l: LPC device configuration\n"
 		"       -m: memory size in MB\n"
+		"       -p: pin 'vcpu' to 'hostcpu'\n"
+		"       -P: vmexit from the guest on pause\n"
+		"       -s: <slot,driver,configinfo> PCI slot config\n"
+		"       -U: uuid\n"
 		"       -w: ignore unimplemented MSRs\n"
+		"       -W: force virtio to use single-vector MSI\n"
 		"       -x: local apic is in x2APIC mode\n"
-		"       -Y: disable MPtable generation\n"
-		"       -U: uuid\n",
+		"       -Y: disable MPtable generation\n",
 		progname, (int)strlen(progname), "");
 
 	exit(code);
@@ -187,6 +180,27 @@ pincpu_parse(const char *opt)
 	return (0);
 }
 
+void
+vm_inject_fault(void *arg, int vcpu, int vector, int errcode_valid,
+    int errcode)
+{
+	struct vmctx *ctx;
+	int error;
+
+	ctx = arg;
+	if (errcode_valid)
+		error = vm_inject_exception2(ctx, vcpu, vector, errcode);
+	else
+		error = vm_inject_exception(ctx, vcpu, vector);
+	assert(error == 0);
+
+	/*
+	 * Set the instruction length to 0 to ensure that the instruction is
+	 * restarted when the fault handler returns.
+	 */
+	vmexit[vcpu].inst_length = 0;
+}
+
 void *
 paddr_guest2host(struct vmctx *ctx, uintptr_t gaddr, size_t len)
 {
@@ -315,27 +329,18 @@ vmexit_inout(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu)
 	}
 
 	error = emulate_inout(ctx, vcpu, vme, strictio);
-	if (error == INOUT_OK && in && !string) {
+	if (!error && in && !string) {
 		error = vm_set_register(ctx, vcpu, VM_REG_GUEST_RAX,
 		    vme->u.inout.eax);
+		assert(error == 0);
 	}
 
-	switch (error) {
-	case INOUT_OK:
-		return (VMEXIT_CONTINUE);
-	case INOUT_RESTART:
-		return (VMEXIT_RESTART);
-	case INOUT_RESET:
-		stats.io_reset++;
-		return (VMEXIT_RESET);
-	case INOUT_POWEROFF:
-		stats.io_poweroff++;
-		return (VMEXIT_POWEROFF);
-	default:
-		fprintf(stderr, "Unhandled %s%c 0x%04x\n",
-			in ? "in" : "out",
-			bytes == 1 ? 'b' : (bytes == 2 ? 'w' : 'l'), port);
+	if (error) {
+		fprintf(stderr, "Unhandled %s%c 0x%04x\n", in ? "in" : "out",
+		    bytes == 1 ? 'b' : (bytes == 2 ? 'w' : 'l'), port);
 		return (VMEXIT_ABORT);
+	} else {
+		return (VMEXIT_CONTINUE);
 	}
 }
 
@@ -352,8 +357,7 @@ vmexit_rdmsr(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu)
 		fprintf(stderr, "rdmsr to register %#x on vcpu %d\n",
 		    vme->u.msr.code, *pvcpu);
 		if (strictmsr) {
-			error = vm_inject_exception2(ctx, *pvcpu, IDT_GP, 0);
-			assert(error == 0);
+			vm_inject_gp(ctx, *pvcpu);
 			return (VMEXIT_RESTART);
 		}
 	}
@@ -379,8 +383,7 @@ vmexit_wrmsr(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu)
 		fprintf(stderr, "wrmsr to register %#x(%#lx) on vcpu %d\n",
 		    vme->u.msr.code, vme->u.msr.wval, *pvcpu);
 		if (strictmsr) {
-			error = vm_inject_exception2(ctx, *pvcpu, IDT_GP, 0);
-			assert(error == 0);
+			vm_inject_gp(ctx, *pvcpu);
 			return (VMEXIT_RESTART);
 		}
 	}
@@ -399,6 +402,16 @@ vmexit_spinup_ap(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu)
 	return (retval);
 }
 
+#define	DEBUG_EPT_MISCONFIG
+#ifdef DEBUG_EPT_MISCONFIG
+#define	EXIT_REASON_EPT_MISCONFIG	49
+#define	VMCS_GUEST_PHYSICAL_ADDRESS	0x00002400
+#define	VMCS_IDENT(x)			((x) | 0x80000000)
+
+static uint64_t ept_misconfig_gpa, ept_misconfig_pte[4];
+static int ept_misconfig_ptenum;
+#endif
+
 static int
 vmexit_vmx(struct vmctx *ctx, struct vm_exit *vmexit, int *pvcpu)
 {
@@ -413,7 +426,21 @@ vmexit_vmx(struct vmctx *ctx, struct vm_exit *vmexit, int *pvcpu)
 	    vmexit->u.vmx.exit_qualification);
 	fprintf(stderr, "\tinst_type\t\t%d\n", vmexit->u.vmx.inst_type);
 	fprintf(stderr, "\tinst_error\t\t%d\n", vmexit->u.vmx.inst_error);
-
+#ifdef DEBUG_EPT_MISCONFIG
+	if (vmexit->u.vmx.exit_reason == EXIT_REASON_EPT_MISCONFIG) {
+		vm_get_register(ctx, *pvcpu,
+		    VMCS_IDENT(VMCS_GUEST_PHYSICAL_ADDRESS),
+		    &ept_misconfig_gpa);
+		vm_get_gpa_pmap(ctx, ept_misconfig_gpa, ept_misconfig_pte,
+		    &ept_misconfig_ptenum);
+		fprintf(stderr, "\tEPT misconfiguration:\n");
+		fprintf(stderr, "\t\tGPA: %#lx\n", ept_misconfig_gpa);
+		fprintf(stderr, "\t\tPTE(%d): %#lx %#lx %#lx %#lx\n",
+		    ept_misconfig_ptenum, ept_misconfig_pte[0],
+		    ept_misconfig_pte[1], ept_misconfig_pte[2],
+		    ept_misconfig_pte[3]);
+	}
+#endif	/* DEBUG_EPT_MISCONFIG */
 	return (VMEXIT_ABORT);
 }
 
@@ -465,7 +492,7 @@ vmexit_inst_emul(struct vmctx *ctx, struct vm_exit *vmexit, int *pvcpu)
 	stats.vmexit_inst_emul++;
 
 	err = emulate_mem(ctx, *pvcpu, vmexit->u.inst_emul.gpa,
-			  &vmexit->u.inst_emul.vie);
+	    &vmexit->u.inst_emul.vie, &vmexit->u.inst_emul.paging);
 
 	if (err) {
 		if (err == EINVAL) {
@@ -515,6 +542,8 @@ vmexit_suspend(struct vmctx *ctx, struct vm_exit *vmexit, int *pvcpu)
 		exit(1);
 	case VM_SUSPEND_HALT:
 		exit(2);
+	case VM_SUSPEND_TRIPLEFAULT:
+		exit(3);
 	default:
 		fprintf(stderr, "vmexit_suspend: invalid reason %d\n", how);
 		exit(100);
@@ -532,7 +561,8 @@ 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_SUSPENDED] = vmexit_suspend
+	[VM_EXITCODE_SUSPENDED] = vmexit_suspend,
+	[VM_EXITCODE_TASK_SWITCH] = vmexit_task_switch,
 };
 
 static void
@@ -540,7 +570,6 @@ vm_loop(struct vmctx *ctx, int vcpu, uint64_t rip)
 {
 	int error, rc, prevcpu;
 	enum vm_exitcode exitcode;
-	enum vm_suspend_how how;
 	cpuset_t active_cpus;
 
 	if (vcpumap[vcpu] != NULL) {
@@ -575,16 +604,6 @@ vm_loop(struct vmctx *ctx, int vcpu, uint64_t rip)
 		case VMEXIT_RESTART:
                         rip = vmexit[vcpu].rip;
 			break;
-		case VMEXIT_RESET:
-		case VMEXIT_POWEROFF:
-			if (rc == VMEXIT_RESET)
-				how = VM_SUSPEND_RESET;
-			else
-				how = VM_SUSPEND_POWEROFF;
-			error = vm_suspend(ctx, how);
-			assert(error == 0 || errno == EALREADY);
-                        rip = vmexit[vcpu].rip + vmexit[vcpu].inst_length;
-			break;
 		case VMEXIT_ABORT:
 			abort();
 		default:
diff --git a/usr.sbin/bhyve/bhyverun.h b/usr.sbin/bhyve/bhyverun.h
index f18d42fc3f01..87824ef9f4f4 100644
--- a/usr.sbin/bhyve/bhyverun.h
+++ b/usr.sbin/bhyve/bhyverun.h
@@ -35,6 +35,10 @@
 #define	__CTASSERT(x, y)	typedef char __assert ## y[(x) ? 1 : -1]
 #endif
 
+#define	VMEXIT_CONTINUE		1	/* continue from next instruction */
+#define	VMEXIT_RESTART		2	/* restart current instruction */
+#define	VMEXIT_ABORT		3	/* abort the vm run loop */
+
 struct vmctx;
 extern int guest_ncpus;
 extern char *guest_uuid_str;
diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c
index b29bc7856e86..1ec0344f3fca 100644
--- a/usr.sbin/bhyve/block_if.c
+++ b/usr.sbin/bhyve/block_if.c
@@ -389,6 +389,55 @@ blockif_close(struct blockif_ctxt *bc)
 	return (0);
 }
 
+/*
+ * Return virtual C/H/S values for a given block. Use the algorithm
+ * outlined in the VHD specification to calculate values.
+ */
+void
+blockif_chs(struct blockif_ctxt *bc, uint16_t *c, uint8_t *h, uint8_t *s)
+{
+	off_t sectors;		/* total sectors of the block dev */
+	off_t hcyl;		/* cylinders times heads */
+	uint16_t secpt;		/* sectors per track */
+	uint8_t heads;
+
+	assert(bc->bc_magic == BLOCKIF_SIG);
+
+	sectors = bc->bc_size / bc->bc_sectsz;
+
+	/* Clamp the size to the largest possible with CHS */
+	if (sectors > 65535UL*16*255)
+		sectors = 65535UL*16*255;
+
+	if (sectors >= 65536UL*16*63) {
+		secpt = 255;
+		heads = 16;
+		hcyl = sectors / secpt;
+	} else {
+		secpt = 17;
+		hcyl = sectors / secpt;
+		heads = (hcyl + 1023) / 1024;
+
+		if (heads < 4)
+			heads = 4;
+
+		if (hcyl >= (heads * 1024) || heads > 16) {
+			secpt = 31;
+			heads = 16;
+			hcyl = sectors / secpt;
+		}
+		if (hcyl >= (heads * 1024)) {
+			secpt = 63;
+			heads = 16;
+			hcyl = sectors / secpt;
+		}
+	}
+
+	*c = hcyl / heads;
+	*h = heads;
+	*s = secpt;
+}
+
 /*
  * Accessors
  */
diff --git a/usr.sbin/bhyve/block_if.h b/usr.sbin/bhyve/block_if.h
index e0c0bb1f8c8b..c2c21f657446 100644
--- a/usr.sbin/bhyve/block_if.h
+++ b/usr.sbin/bhyve/block_if.h
@@ -52,6 +52,8 @@ struct blockif_req {
 struct blockif_ctxt;
 struct blockif_ctxt *blockif_open(const char *optstr, const char *ident);
 off_t	blockif_size(struct blockif_ctxt *bc);
+void	blockif_chs(struct blockif_ctxt *bc, uint16_t *c, uint8_t *h,
+    uint8_t *s);
 int	blockif_sectsz(struct blockif_ctxt *bc);
 int	blockif_queuesz(struct blockif_ctxt *bc);
 int	blockif_is_ro(struct blockif_ctxt *bc);
diff --git a/usr.sbin/bhyve/inout.c b/usr.sbin/bhyve/inout.c
index fe9e0d85625b..1041a59d2194 100644
--- a/usr.sbin/bhyve/inout.c
+++ b/usr.sbin/bhyve/inout.c
@@ -154,31 +154,28 @@ emulate_inout(struct vmctx *ctx, int vcpu, struct vm_exit *vmexit, int strict)
 		/* Limit number of back-to-back in/out emulations to 16 */
 		iterations = MIN(count, 16);
 		while (iterations > 0) {
+			assert(retval == 0);
 			if (vie_calculate_gla(vis->paging.cpu_mode,
 			    vis->seg_name, &vis->seg_desc, index, bytes,
 			    addrsize, prot, &gla)) {
-				error = vm_inject_exception2(ctx, vcpu,
-				    IDT_GP, 0);
-				assert(error == 0);
-				retval = INOUT_RESTART;
+				vm_inject_gp(ctx, vcpu);
 				break;
 			}
 
-			error = vm_gla2gpa(ctx, vcpu, &vis->paging, gla, bytes,
-			    prot, iov, nitems(iov));
-			assert(error == 0 || error == 1 || error == -1);
-			if (error) {
-				retval = (error == 1) ? INOUT_RESTART :
-				    INOUT_ERROR;
+			error = vm_copy_setup(ctx, vcpu, &vis->paging, gla,
+			    bytes, prot, iov, nitems(iov));
+			if (error == -1) {
+				retval = -1;  /* Unrecoverable error */
+				break;
+			} else if (error == 1) {
+				retval = 0;  /* Resume guest to handle fault */
 				break;
 			}
 
 			if (vie_alignment_check(vis->paging.cpl, bytes,
 			    vis->cr0, vis->rflags, gla)) {
-				error = vm_inject_exception2(ctx, vcpu,
-				    IDT_AC, 0);
-				assert(error == 0);
-				return (INOUT_RESTART);
+				vm_inject_ac(ctx, vcpu, 0);
+				break;
 			}
 
 			val = 0;
@@ -217,8 +214,8 @@ emulate_inout(struct vmctx *ctx, int vcpu, struct vm_exit *vmexit, int strict)
 		}
 
 		/* Restart the instruction if more iterations remain */
-		if (retval == INOUT_OK && count != 0)
-			retval = INOUT_RESTART;
+		if (retval == 0 && count != 0)
+			vmexit->inst_length = 0;
 	} else {
 		if (!in) {
 			val = vmexit->u.inout.eax & vie_size2mask(bytes);
diff --git a/usr.sbin/bhyve/inout.h b/usr.sbin/bhyve/inout.h
index f15a2c87db72..7f390951d418 100644
--- a/usr.sbin/bhyve/inout.h
+++ b/usr.sbin/bhyve/inout.h
@@ -34,13 +34,9 @@
 struct vmctx;
 struct vm_exit;
 
-/* Handler return values. */
-#define	INOUT_ERROR	-1
-#define	INOUT_OK	0
-#define	INOUT_RESTART	1
-#define	INOUT_RESET	2
-#define	INOUT_POWEROFF	3
-
+/*
+ * inout emulation handlers return 0 on success and -1 on failure.
+ */
 typedef int (*inout_func_t)(struct vmctx *ctx, int vcpu, int in, int port,
 			    int bytes, uint32_t *eax, void *arg);
 
diff --git a/usr.sbin/bhyve/mem.c b/usr.sbin/bhyve/mem.c
index 7ea630f2a587..2a9f430c8262 100644
--- a/usr.sbin/bhyve/mem.c
+++ b/usr.sbin/bhyve/mem.c
@@ -157,10 +157,12 @@ mem_write(void *ctx, int vcpu, uint64_t gpa, uint64_t wval, int size, void *arg)
 }
 
 int
-emulate_mem(struct vmctx *ctx, int vcpu, uint64_t paddr, struct vie *vie)
+emulate_mem(struct vmctx *ctx, int vcpu, uint64_t paddr, struct vie *vie,
+    struct vm_guest_paging *paging)
+
 {
 	struct mmio_rb_range *entry;
-	int err;
+	int err, immutable;
 	
 	pthread_rwlock_rdlock(&mmio_rwlock);
 	/*
@@ -184,10 +186,28 @@ emulate_mem(struct vmctx *ctx, int vcpu, uint64_t paddr, struct vie *vie)
 	}
 
 	assert(entry != NULL);
-	err = vmm_emulate_instruction(ctx, vcpu, paddr, vie,
+
+	/*
+	 * An 'immutable' memory range is guaranteed to be never removed
+	 * so there is no need to hold 'mmio_rwlock' while calling the
+	 * handler.
+	 *
+	 * XXX writes to the PCIR_COMMAND register can cause register_mem()
+	 * to be called. If the guest is using PCI extended config space
+	 * to modify the PCIR_COMMAND register then register_mem() can
+	 * deadlock on 'mmio_rwlock'. However by registering the extended
+	 * config space window as 'immutable' the deadlock can be avoided.
+	 */
+	immutable = (entry->mr_param.flags & MEM_F_IMMUTABLE);
+	if (immutable)
+		pthread_rwlock_unlock(&mmio_rwlock);
+
+	err = vmm_emulate_instruction(ctx, vcpu, paddr, vie, paging,
 				      mem_read, mem_write, &entry->mr_param);
-	pthread_rwlock_unlock(&mmio_rwlock);
-	
+
+	if (!immutable)
+		pthread_rwlock_unlock(&mmio_rwlock);
+
 	return (err);
 }
 
@@ -244,6 +264,7 @@ unregister_mem(struct mem_range *memp)
 		mr = &entry->mr_param;
 		assert(mr->name == memp->name);
 		assert(mr->base == memp->base && mr->size == memp->size); 
+		assert((mr->flags & MEM_F_IMMUTABLE) == 0);
 		RB_REMOVE(mmio_rb_tree, &mmio_rb_root, entry);
 
 		/* flush Per-vCPU cache */	
diff --git a/usr.sbin/bhyve/mem.h b/usr.sbin/bhyve/mem.h
index 264bff9e82b0..f671eaedf786 100644
--- a/usr.sbin/bhyve/mem.h
+++ b/usr.sbin/bhyve/mem.h
@@ -48,9 +48,11 @@ struct mem_range {
 #define	MEM_F_READ		0x1
 #define	MEM_F_WRITE		0x2
 #define	MEM_F_RW		0x3
+#define	MEM_F_IMMUTABLE		0x4	/* mem_range cannot be unregistered */
 
 void	init_mem(void);
-int     emulate_mem(struct vmctx *, int vcpu, uint64_t paddr, struct vie *vie);
+int     emulate_mem(struct vmctx *, int vcpu, uint64_t paddr, struct vie *vie,
+		    struct vm_guest_paging *paging);
 		    
 int	register_mem(struct mem_range *memp);
 int	register_mem_fallback(struct mem_range *memp);
diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c
index 9f6110730b09..214237df3757 100644
--- a/usr.sbin/bhyve/pci_ahci.c
+++ b/usr.sbin/bhyve/pci_ahci.c
@@ -336,8 +336,9 @@ ahci_write_fis_d2h(struct ahci_port *p, int slot, uint8_t *cfis, uint32_t tfd)
 	fis[13] = cfis[13];
 	if (fis[2] & ATA_S_ERROR)
 		p->is |= AHCI_P_IX_TFE;
+	else
+		p->ci &= ~(1 << slot);
 	p->tfd = tfd;
-	p->ci &= ~(1 << slot);
 	ahci_write_fis(p, FIS_TYPE_REGD2H, fis);
 }
 
@@ -598,10 +599,16 @@ handle_identify(struct ahci_port *p, int slot, uint8_t *cfis)
 	} else {
 		uint16_t buf[256];
 		uint64_t sectors;
+		uint16_t cyl;
+		uint8_t sech, heads;
 
 		sectors = blockif_size(p->bctx) / blockif_sectsz(p->bctx);
+		blockif_chs(p->bctx, &cyl, &heads, &sech);
 		memset(buf, 0, sizeof(buf));
 		buf[0] = 0x0040;
+		buf[1] = cyl;
+		buf[3] = heads;
+		buf[6] = sech;
 		/* TODO emulate different serial? */
 		ata_string((uint8_t *)(buf+10), "123456", 20);
 		ata_string((uint8_t *)(buf+23), "001", 8);
@@ -645,8 +652,8 @@ handle_identify(struct ahci_port *p, int slot, uint8_t *cfis)
 		write_prdt(p, slot, cfis, (void *)buf, sizeof(buf));
 		p->tfd = ATA_S_DSC | ATA_S_READY;
 		p->is |= AHCI_P_IX_DP;
+		p->ci &= ~(1 << slot);
 	}
-	p->ci &= ~(1 << slot);
 	ahci_generate_intr(p->pr_sc);
 }
 
@@ -688,8 +695,8 @@ handle_atapi_identify(struct ahci_port *p, int slot, uint8_t *cfis)
 		write_prdt(p, slot, cfis, (void *)buf, sizeof(buf));
 		p->tfd = ATA_S_DSC | ATA_S_READY;
 		p->is |= AHCI_P_IX_DHR;
+		p->ci &= ~(1 << slot);
 	}
-	p->ci &= ~(1 << slot);
 	ahci_generate_intr(p->pr_sc);
 }
 
@@ -1292,7 +1299,6 @@ ahci_handle_cmd(struct ahci_port *p, int slot, uint8_t *cfis)
 		if (!p->atapi) {
 			p->tfd = (ATA_E_ABORT << 8) | ATA_S_READY | ATA_S_ERROR;
 			p->is |= AHCI_P_IX_TFE;
-			p->ci &= ~(1 << slot);
 			ahci_generate_intr(p->pr_sc);
 		} else
 			handle_packet_cmd(p, slot, cfis);
@@ -1301,7 +1307,6 @@ ahci_handle_cmd(struct ahci_port *p, int slot, uint8_t *cfis)
 		WPRINTF("Unsupported cmd:%02x\n", cfis[2]);
 		p->tfd = (ATA_E_ABORT << 8) | ATA_S_READY | ATA_S_ERROR;
 		p->is |= AHCI_P_IX_TFE;
-		p->ci &= ~(1 << slot);
 		ahci_generate_intr(p->pr_sc);
 		break;
 	}
@@ -1369,8 +1374,11 @@ ahci_handle_port(struct ahci_port *p)
 	 * are already in-flight.
 	 */
 	for (i = 0; (i < 32) && p->ci; i++) {
-		if ((p->ci & (1 << i)) && !(p->pending & (1 << i)))
+		if ((p->ci & (1 << i)) && !(p->pending & (1 << i))) {
+			p->cmd &= ~AHCI_P_CMD_CCS_MASK;
+			p->cmd |= i << AHCI_P_CMD_CCS_SHIFT;
 			ahci_handle_slot(p, i);
+		}
 	}
 }
 
diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
index a2c47ec0509c..6b906ede42fc 100644
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -109,16 +109,20 @@ static uint64_t pci_emul_membase64;
 #define	PCI_EMUL_IOBASE		0x2000
 #define	PCI_EMUL_IOLIMIT	0x10000
 
-#define	PCI_EMUL_MEMLIMIT32	0xE0000000	/* 3.5GB */
+#define	PCI_EMUL_ECFG_BASE	0xE0000000		    /* 3.5GB */
+#define	PCI_EMUL_ECFG_SIZE	(MAXBUSES * 1024 * 1024)    /* 1MB per bus */
+SYSRES_MEM(PCI_EMUL_ECFG_BASE, PCI_EMUL_ECFG_SIZE);
+
+#define	PCI_EMUL_MEMLIMIT32	PCI_EMUL_ECFG_BASE
 
 #define	PCI_EMUL_MEMBASE64	0xD000000000UL
 #define	PCI_EMUL_MEMLIMIT64	0xFD00000000UL
 
 static struct pci_devemu *pci_emul_finddev(char *name);
-static void	pci_lintr_route(struct pci_devinst *pi);
-static void	pci_lintr_update(struct pci_devinst *pi);
-
-static struct mem_range pci_mem_hole;
+static void pci_lintr_route(struct pci_devinst *pi);
+static void pci_lintr_update(struct pci_devinst *pi);
+static void pci_cfgrw(struct vmctx *ctx, int vcpu, int in, int bus, int slot,
+    int func, int coff, int bytes, uint32_t *val);
 
 /*
  * I/O access
@@ -1023,12 +1027,37 @@ pci_emul_fallback_handler(struct vmctx *ctx, int vcpu, int dir, uint64_t addr,
 	return (0);
 }
 
+static int
+pci_emul_ecfg_handler(struct vmctx *ctx, int vcpu, int dir, uint64_t addr,
+    int bytes, uint64_t *val, void *arg1, long arg2)
+{
+	int bus, slot, func, coff, in;
+
+	coff = addr & 0xfff;
+	func = (addr >> 12) & 0x7;
+	slot = (addr >> 15) & 0x1f;
+	bus = (addr >> 20) & 0xff;
+	in = (dir == MEM_F_READ);
+	if (in)
+		*val = ~0UL;
+	pci_cfgrw(ctx, vcpu, in, bus, slot, func, coff, bytes, (uint32_t *)val);
+	return (0);
+}
+
+uint64_t
+pci_ecfg_base(void)
+{
+
+	return (PCI_EMUL_ECFG_BASE);
+}
+
 #define	BUSIO_ROUNDUP		32
 #define	BUSMEM_ROUNDUP		(1024 * 1024)
 
 int
 init_pci(struct vmctx *ctx)
 {
+	struct mem_range mr;
 	struct pci_devemu *pde;
 	struct businfo *bi;
 	struct slotinfo *si;
@@ -1112,23 +1141,34 @@ init_pci(struct vmctx *ctx)
 	 * The guest physical memory map looks like the following:
 	 * [0,		    lowmem)		guest system memory
 	 * [lowmem,	    lowmem_limit)	memory hole (may be absent)
-	 * [lowmem_limit,   4GB)		PCI hole (32-bit BAR allocation)
+	 * [lowmem_limit,   0xE0000000)		PCI hole (32-bit BAR allocation)
+	 * [0xE0000000,	    0xF0000000)		PCI extended config window
+	 * [0xF0000000,	    4GB)		LAPIC, IOAPIC, HPET, firmware
 	 * [4GB,	    4GB + highmem)
-	 *
+	 */
+
+	/*
 	 * Accesses to memory addresses that are not allocated to system
 	 * memory or PCI devices return 0xff's.
 	 */
-	error = vm_get_memory_seg(ctx, 0, &lowmem, NULL);
+	lowmem = vm_get_lowmem_size(ctx);
+	bzero(&mr, sizeof(struct mem_range));
+	mr.name = "PCI hole";
+	mr.flags = MEM_F_RW | MEM_F_IMMUTABLE;
+	mr.base = lowmem;
+	mr.size = (4ULL * 1024 * 1024 * 1024) - lowmem;
+	mr.handler = pci_emul_fallback_handler;
+	error = register_mem_fallback(&mr);
 	assert(error == 0);
 
-	memset(&pci_mem_hole, 0, sizeof(struct mem_range));
-	pci_mem_hole.name = "PCI hole";
-	pci_mem_hole.flags = MEM_F_RW;
-	pci_mem_hole.base = lowmem;
-	pci_mem_hole.size = (4ULL * 1024 * 1024 * 1024) - lowmem;
-	pci_mem_hole.handler = pci_emul_fallback_handler;
-
-	error = register_mem_fallback(&pci_mem_hole);
+	/* PCI extended config space */
+	bzero(&mr, sizeof(struct mem_range));
+	mr.name = "PCI ECFG";
+	mr.flags = MEM_F_RW | MEM_F_IMMUTABLE;
+	mr.base = PCI_EMUL_ECFG_BASE;
+	mr.size = PCI_EMUL_ECFG_SIZE;
+	mr.handler = pci_emul_ecfg_handler;
+	error = register_mem(&mr);
 	assert(error == 0);
 
 	return (0);
@@ -1613,41 +1653,6 @@ pci_emul_hdrtype_fixup(int bus, int slot, int off, int bytes, uint32_t *rv)
 	}
 }
 
-static int cfgenable, cfgbus, cfgslot, cfgfunc, cfgoff;
-
-static int
-pci_emul_cfgaddr(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
-		 uint32_t *eax, void *arg)
-{
-	uint32_t x;
-
-	if (bytes != 4) {
-		if (in)
-			*eax = (bytes == 2) ? 0xffff : 0xff;
-		return (0);
-	}
-
-	if (in) {
-		x = (cfgbus << 16) |
-		    (cfgslot << 11) |
-		    (cfgfunc << 8) |
-		    cfgoff;
-                if (cfgenable)
-			x |= CONF1_ENABLE;	       
-		*eax = x;
-	} else {
-		x = *eax;
-		cfgenable = (x & CONF1_ENABLE) == CONF1_ENABLE;
-		cfgoff = x & PCI_REGMAX;
-		cfgfunc = (x >> 8) & PCI_FUNCMAX;
-		cfgslot = (x >> 11) & PCI_SLOTMAX;
-		cfgbus = (x >> 16) & PCI_BUSMAX;
-	}
-
-	return (0);
-}
-INOUT_PORT(pci_cfgaddr, CONF1_ADDR_PORT, IOPORT_F_INOUT, pci_emul_cfgaddr);
-
 static uint32_t
 bits_changed(uint32_t old, uint32_t new, uint32_t mask)
 {
@@ -1710,41 +1715,51 @@ pci_emul_cmdwrite(struct pci_devinst *pi, uint32_t new, int bytes)
 	pci_lintr_update(pi);
 }	
 
-static int
-pci_emul_cfgdata(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
-		 uint32_t *eax, void *arg)
+static void
+pci_cfgrw(struct vmctx *ctx, int vcpu, int in, int bus, int slot, int func,
+    int coff, int bytes, uint32_t *eax)
 {
 	struct businfo *bi;
 	struct slotinfo *si;
 	struct pci_devinst *pi;
 	struct pci_devemu *pe;
-	int coff, idx, needcfg;
+	int idx, needcfg;
 	uint64_t addr, bar, mask;
 
-	assert(bytes == 1 || bytes == 2 || bytes == 4);
-
-	if ((bi = pci_businfo[cfgbus]) != NULL) {
-		si = &bi->slotinfo[cfgslot];
-		pi = si->si_funcs[cfgfunc].fi_devi;
+	if ((bi = pci_businfo[bus]) != NULL) {
+		si = &bi->slotinfo[slot];
+		pi = si->si_funcs[func].fi_devi;
 	} else
 		pi = NULL;
 
-	coff = cfgoff + (port - CONF1_DATA_PORT);
-
-#if 0
-	printf("pcicfg-%s from 0x%0x of %d bytes (%d/%d/%d)\n\r",
-		in ? "read" : "write", coff, bytes, cfgbus, cfgslot, cfgfunc);
-#endif
-
 	/*
-	 * Just return if there is no device at this cfgslot:cfgfunc,
-	 * if the guest is doing an un-aligned access, or if the config
-	 * address word isn't enabled.
+	 * Just return if there is no device at this slot:func or if the
+	 * the guest is doing an un-aligned access.
 	 */
-	if (!cfgenable || pi == NULL || (coff & (bytes - 1)) != 0) {
+	if (pi == NULL || (bytes != 1 && bytes != 2 && bytes != 4) ||
+	    (coff & (bytes - 1)) != 0) {
 		if (in)
 			*eax = 0xffffffff;
-		return (0);
+		return;
+	}
+
+	/*
+	 * Ignore all writes beyond the standard config space and return all
+	 * ones on reads.
+	 */
+	if (coff >= PCI_REGMAX + 1) {
+		if (in) {
+			*eax = 0xffffffff;
+			/*
+			 * Extended capabilities begin at offset 256 in config
+			 * space. Absence of extended capabilities is signaled
+			 * with all 0s in the extended capability header at
+			 * offset 256.
+			 */
+			if (coff <= PCI_REGMAX + 4)
+				*eax = 0x00000000;
+		}
+		return;
 	}
 
 	pe = pi->pi_d;
@@ -1755,8 +1770,8 @@ pci_emul_cfgdata(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
 	if (in) {
 		/* Let the device emulation override the default handler */
 		if (pe->pe_cfgread != NULL) {
-			needcfg = pe->pe_cfgread(ctx, vcpu, pi,
-						    coff, bytes, eax);
+			needcfg = pe->pe_cfgread(ctx, vcpu, pi, coff, bytes,
+			    eax);
 		} else {
 			needcfg = 1;
 		}
@@ -1770,12 +1785,12 @@ pci_emul_cfgdata(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
 				*eax = pci_get_cfgdata32(pi, coff);
 		}
 
-		pci_emul_hdrtype_fixup(cfgbus, cfgslot, coff, bytes, eax);
+		pci_emul_hdrtype_fixup(bus, slot, coff, bytes, eax);
 	} else {
 		/* Let the device emulation override the default handler */
 		if (pe->pe_cfgwrite != NULL &&
 		    (*pe->pe_cfgwrite)(ctx, vcpu, pi, coff, bytes, *eax) == 0)
-			return (0);
+			return;
 
 		/*
 		 * Special handling for write to BAR registers
@@ -1786,7 +1801,7 @@ pci_emul_cfgdata(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
 			 * 4-byte aligned.
 			 */
 			if (bytes != 4 || (coff & 0x3) != 0)
-				return (0);
+				return;
 			idx = (coff - PCIR_BAR(0)) / 4;
 			mask = ~(pi->pi_bar[idx].size - 1);
 			switch (pi->pi_bar[idx].type) {
@@ -1844,7 +1859,57 @@ pci_emul_cfgdata(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
 			CFGWRITE(pi, coff, *eax, bytes);
 		}
 	}
+}
 
+static int cfgenable, cfgbus, cfgslot, cfgfunc, cfgoff;
+
+static int
+pci_emul_cfgaddr(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
+		 uint32_t *eax, void *arg)
+{
+	uint32_t x;
+
+	if (bytes != 4) {
+		if (in)
+			*eax = (bytes == 2) ? 0xffff : 0xff;
+		return (0);
+	}
+
+	if (in) {
+		x = (cfgbus << 16) | (cfgslot << 11) | (cfgfunc << 8) | cfgoff;
+		if (cfgenable)
+			x |= CONF1_ENABLE;
+		*eax = x;
+	} else {
+		x = *eax;
+		cfgenable = (x & CONF1_ENABLE) == CONF1_ENABLE;
+		cfgoff = x & PCI_REGMAX;
+		cfgfunc = (x >> 8) & PCI_FUNCMAX;
+		cfgslot = (x >> 11) & PCI_SLOTMAX;
+		cfgbus = (x >> 16) & PCI_BUSMAX;
+	}
+
+	return (0);
+}
+INOUT_PORT(pci_cfgaddr, CONF1_ADDR_PORT, IOPORT_F_INOUT, pci_emul_cfgaddr);
+
+static int
+pci_emul_cfgdata(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
+		 uint32_t *eax, void *arg)
+{
+	int coff;
+
+	assert(bytes == 1 || bytes == 2 || bytes == 4);
+
+	coff = cfgoff + (port - CONF1_DATA_PORT);
+	if (cfgenable) {
+		pci_cfgrw(ctx, vcpu, in, cfgbus, cfgslot, cfgfunc, coff, bytes,
+		    eax);
+	} else {
+		/* Ignore accesses to cfgdata if not enabled by cfgaddr */
+		if (in)
+			*eax = 0xffffffff;
+	}
 	return (0);
 }
 
diff --git a/usr.sbin/bhyve/pci_emul.h b/usr.sbin/bhyve/pci_emul.h
index 866ffc5b8224..6b8c4e0fd31c 100644
--- a/usr.sbin/bhyve/pci_emul.h
+++ b/usr.sbin/bhyve/pci_emul.h
@@ -235,6 +235,7 @@ uint64_t pci_emul_msix_tread(struct pci_devinst *pi, uint64_t offset, int size);
 int	pci_count_lintr(int bus);
 void	pci_walk_lintr(int bus, pci_lintr_cb cb, void *arg);
 void	pci_write_dsdt(void);
+uint64_t pci_ecfg_base(void);
 int	pci_bus_configured(int bus);
 
 static __inline void 
diff --git a/usr.sbin/bhyve/pci_irq.c b/usr.sbin/bhyve/pci_irq.c
index 653aeb0ff1f6..20e033f2c40e 100644
--- a/usr.sbin/bhyve/pci_irq.c
+++ b/usr.sbin/bhyve/pci_irq.c
@@ -115,7 +115,7 @@ void
 pci_irq_reserve(int irq)
 {
 
-	assert(irq < nitems(irq_counts));
+	assert(irq >= 0 && irq < nitems(irq_counts));
 	assert(pirq_cold);
 	assert(irq_counts[irq] == 0 || irq_counts[irq] == IRQ_DISABLED);
 	irq_counts[irq] = IRQ_DISABLED;
@@ -125,10 +125,10 @@ void
 pci_irq_use(int irq)
 {
 
-	assert(irq < nitems(irq_counts));
+	assert(irq >= 0 && irq < nitems(irq_counts));
 	assert(pirq_cold);
-	if (irq_counts[irq] != IRQ_DISABLED)
-		irq_counts[irq]++;
+	assert(irq_counts[irq] != IRQ_DISABLED);
+	irq_counts[irq]++;
 }
 
 void
@@ -197,7 +197,7 @@ pirq_alloc_pin(struct vmctx *ctx)
 {
 	int best_count, best_irq, best_pin, irq, pin;
 
-	pirq_cold = 1;
+	pirq_cold = 0;
 
 	/* First, find the least-used PIRQ pin. */
 	best_pin = 0;
@@ -222,7 +222,7 @@ pirq_alloc_pin(struct vmctx *ctx)
 				best_count = irq_counts[irq];
 			}
 		}
-		assert(best_irq != 0);
+		assert(best_irq >= 0);
 		irq_counts[best_irq]++;
 		pirqs[best_pin].reg = best_irq;
 		vm_isa_set_irq_trigger(ctx, best_irq, LEVEL_TRIGGER);
@@ -234,9 +234,6 @@ pirq_alloc_pin(struct vmctx *ctx)
 int
 pirq_irq(int pin)
 {
-
-	if (pin == -1)
-		return (255);
 	assert(pin > 0 && pin <= nitems(pirqs));
 	return (pirqs[pin - 1].reg & PIRQ_IRQ);
 }
diff --git a/usr.sbin/bhyve/pm.c b/usr.sbin/bhyve/pm.c
index 67126d8765c7..f5a2d438be7f 100644
--- a/usr.sbin/bhyve/pm.c
+++ b/usr.sbin/bhyve/pm.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/vmm.h>
 
 #include <assert.h>
+#include <errno.h>
 #include <pthread.h>
 #include <signal.h>
 #include <vmmapi.h>
@@ -56,6 +57,8 @@ static int
 reset_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
     uint32_t *eax, void *arg)
 {
+	int error;
+
 	static uint8_t reset_control;
 
 	if (bytes != 1)
@@ -66,8 +69,10 @@ reset_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
 		reset_control = *eax;
 
 		/* Treat hard and soft resets the same. */
-		if (reset_control & 0x4)
-			return (INOUT_RESET);
+		if (reset_control & 0x4) {
+			error = vm_suspend(ctx, VM_SUSPEND_RESET);
+			assert(error == 0 || errno == EALREADY);
+		}
 	}
 	return (0);
 }
@@ -224,6 +229,7 @@ static int
 pm1_control_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
     uint32_t *eax, void *arg)
 {
+	int error;
 
 	if (bytes != 2)
 		return (-1);
@@ -243,8 +249,10 @@ pm1_control_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
 		 * says that '5' should be stored in SLP_TYP for S5.
 		 */
 		if (*eax & PM1_SLP_EN) {
-			if ((pm1_control & PM1_SLP_TYP) >> 10 == 5)
-				return (INOUT_POWEROFF);
+			if ((pm1_control & PM1_SLP_TYP) >> 10 == 5) {
+				error = vm_suspend(ctx, VM_SUSPEND_POWEROFF);
+				assert(error == 0 || errno == EALREADY);
+			}
 		}
 	}
 	return (0);
diff --git a/usr.sbin/bhyve/rtc.c b/usr.sbin/bhyve/rtc.c
index 11877479807c..b3631fc07228 100644
--- a/usr.sbin/bhyve/rtc.c
+++ b/usr.sbin/bhyve/rtc.c
@@ -343,19 +343,14 @@ rtc_init(struct vmctx *ctx)
 	 * 0x34/0x35 - 64KB chunks above 16MB, below 4GB
 	 * 0x5b/0x5c/0x5d - 64KB chunks above 4GB
 	 */
-	err = vm_get_memory_seg(ctx, 0, &lomem, NULL);
-	assert(err == 0);
-
-	lomem = (lomem - m_16MB) / m_64KB;
+	lomem = (vm_get_lowmem_size(ctx) - m_16MB) / m_64KB;
 	rtc_nvram[nvoff(RTC_LMEM_LSB)] = lomem;
 	rtc_nvram[nvoff(RTC_LMEM_MSB)] = lomem >> 8;
 
-	if (vm_get_memory_seg(ctx, m_4GB, &himem, NULL) == 0) {	  
-		himem /= m_64KB;
-		rtc_nvram[nvoff(RTC_HMEM_LSB)] = himem;
-		rtc_nvram[nvoff(RTC_HMEM_SB)]  = himem >> 8;
-		rtc_nvram[nvoff(RTC_HMEM_MSB)] = himem >> 16;
-	}
+	himem = vm_get_highmem_size(ctx) / m_64KB;
+	rtc_nvram[nvoff(RTC_HMEM_LSB)] = himem;
+	rtc_nvram[nvoff(RTC_HMEM_SB)]  = himem >> 8;
+	rtc_nvram[nvoff(RTC_HMEM_MSB)] = himem >> 16;
 }
 
 INOUT_PORT(rtc, IO_RTC, IOPORT_F_INOUT, rtc_addr_handler);
diff --git a/usr.sbin/bhyve/smbiostbl.c b/usr.sbin/bhyve/smbiostbl.c
index 9d1cfb3198be..28c7eb2c74b4 100644
--- a/usr.sbin/bhyve/smbiostbl.c
+++ b/usr.sbin/bhyve/smbiostbl.c
@@ -321,8 +321,8 @@ struct smbios_table_type0 smbios_type0_template = {
 
 const char *smbios_type0_strings[] = {
 	"BHYVE",	/* vendor string */
-	__TIME__,	/* bios version string */
-	__DATE__,	/* bios release date string */
+	"1.00",		/* bios version string */
+	"03/14/2014",	/* bios release date string */
 	NULL
 };
 
@@ -779,13 +779,8 @@ smbios_build(struct vmctx *ctx)
 	int				i;
 	int				err;
 
-	err = vm_get_memory_seg(ctx, 0, &guest_lomem, NULL);
-	if (err != 0)
-		return (err);
-
-	err = vm_get_memory_seg(ctx, 4*GB, &guest_himem, NULL);
-	if (err != 0)
-		return (err);
+	guest_lomem = vm_get_lowmem_size(ctx);
+	guest_himem = vm_get_highmem_size(ctx);
 
 	startaddr = paddr_guest2host(ctx, SMBIOS_BASE, SMBIOS_MAX_LENGTH);
 	if (startaddr == NULL) {
diff --git a/usr.sbin/bhyve/task_switch.c b/usr.sbin/bhyve/task_switch.c
new file mode 100644
index 000000000000..0002da8df8ef
--- /dev/null
+++ b/usr.sbin/bhyve/task_switch.c
@@ -0,0 +1,932 @@
+/*-
+ * Copyright (c) 2014 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 THE AUTHOR ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/_iovec.h>
+#include <sys/mman.h>
+
+#include <x86/psl.h>
+#include <x86/segments.h>
+#include <x86/specialreg.h>
+#include <machine/vmm.h>
+#include <machine/vmm_instruction_emul.h>
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <errno.h>
+
+#include <vmmapi.h>
+
+#include "bhyverun.h"
+
+/*
+ * Using 'struct i386tss' is tempting but causes myriad sign extension
+ * issues because all of its fields are defined as signed integers.
+ */
+struct tss32 {
+	uint16_t	tss_link;
+	uint16_t	rsvd1;
+	uint32_t	tss_esp0;
+	uint16_t	tss_ss0;
+	uint16_t	rsvd2;
+	uint32_t	tss_esp1;
+	uint16_t	tss_ss1;
+	uint16_t	rsvd3;
+	uint32_t	tss_esp2;
+	uint16_t	tss_ss2;
+	uint16_t	rsvd4;
+	uint32_t	tss_cr3;
+	uint32_t	tss_eip;
+	uint32_t	tss_eflags;
+	uint32_t	tss_eax;
+	uint32_t	tss_ecx;
+	uint32_t	tss_edx;
+	uint32_t	tss_ebx;
+	uint32_t	tss_esp;
+	uint32_t	tss_ebp;
+	uint32_t	tss_esi;
+	uint32_t	tss_edi;
+	uint16_t	tss_es;
+	uint16_t	rsvd5;
+	uint16_t	tss_cs;
+	uint16_t	rsvd6;
+	uint16_t	tss_ss;
+	uint16_t	rsvd7;
+	uint16_t	tss_ds;
+	uint16_t	rsvd8;
+	uint16_t	tss_fs;
+	uint16_t	rsvd9;
+	uint16_t	tss_gs;
+	uint16_t	rsvd10;
+	uint16_t	tss_ldt;
+	uint16_t	rsvd11;
+	uint16_t	tss_trap;
+	uint16_t	tss_iomap;
+};
+CTASSERT(sizeof(struct tss32) == 104);
+
+#define	SEL_START(sel)	(((sel) & ~0x7))
+#define	SEL_LIMIT(sel)	(((sel) | 0x7))
+#define	TSS_BUSY(type)	(((type) & 0x2) != 0)
+
+static uint64_t
+GETREG(struct vmctx *ctx, int vcpu, int reg)
+{
+	uint64_t val;
+	int error;
+
+	error = vm_get_register(ctx, vcpu, reg, &val);
+	assert(error == 0);
+	return (val);
+}
+
+static void
+SETREG(struct vmctx *ctx, int vcpu, int reg, uint64_t val)
+{
+	int error;
+
+	error = vm_set_register(ctx, vcpu, reg, val);
+	assert(error == 0);
+}
+
+static struct seg_desc
+usd_to_seg_desc(struct user_segment_descriptor *usd)
+{
+	struct seg_desc seg_desc;
+
+	seg_desc.base = (u_int)USD_GETBASE(usd);
+	if (usd->sd_gran)
+		seg_desc.limit = (u_int)(USD_GETLIMIT(usd) << 12) | 0xfff;
+	else
+		seg_desc.limit = (u_int)USD_GETLIMIT(usd);
+	seg_desc.access = usd->sd_type | usd->sd_dpl << 5 | usd->sd_p << 7;
+	seg_desc.access |= usd->sd_xx << 12;
+	seg_desc.access |= usd->sd_def32 << 14;
+	seg_desc.access |= usd->sd_gran << 15;
+
+	return (seg_desc);
+}
+
+/*
+ * Inject an exception with an error code that is a segment selector.
+ * The format of the error code is described in section 6.13, "Error Code",
+ * Intel SDM volume 3.
+ *
+ * Bit 0 (EXT) denotes whether the exception occurred during delivery
+ * of an external event like an interrupt.
+ *
+ * Bit 1 (IDT) indicates whether the selector points to a gate descriptor
+ * in the IDT.
+ *
+ * Bit 2(GDT/LDT) has the usual interpretation of Table Indicator (TI).
+ */
+static void
+sel_exception(struct vmctx *ctx, int vcpu, int vector, uint16_t sel, int ext)
+{
+	/*
+	 * Bit 2 from the selector is retained as-is in the error code.
+	 *
+	 * Bit 1 can be safely cleared because none of the selectors
+	 * encountered during task switch emulation refer to a task
+	 * gate in the IDT.
+	 *
+	 * Bit 0 is set depending on the value of 'ext'.
+	 */
+	sel &= ~0x3;
+	if (ext)
+		sel |= 0x1;
+	vm_inject_fault(ctx, vcpu, vector, 1, sel);
+}
+
+/*
+ * Return 0 if the selector 'sel' in within the limits of the GDT/LDT
+ * and non-zero otherwise.
+ */
+static int
+desc_table_limit_check(struct vmctx *ctx, int vcpu, uint16_t sel)
+{
+	uint64_t base;
+	uint32_t limit, access;
+	int error, reg;
+
+	reg = ISLDT(sel) ? VM_REG_GUEST_LDTR : VM_REG_GUEST_GDTR;
+	error = vm_get_desc(ctx, vcpu, reg, &base, &limit, &access);
+	assert(error == 0);
+
+	if (reg == VM_REG_GUEST_LDTR) {
+		if (SEG_DESC_UNUSABLE(access) || !SEG_DESC_PRESENT(access))
+			return (-1);
+	}
+
+	if (limit < SEL_LIMIT(sel))
+		return (-1);
+	else
+		return (0);
+}
+
+/*
+ * Read/write the segment descriptor 'desc' into the GDT/LDT slot referenced
+ * by the selector 'sel'.
+ *
+ * Returns 0 on success.
+ * Returns 1 if an exception was injected into the guest.
+ * Returns -1 otherwise.
+ */
+static int
+desc_table_rw(struct vmctx *ctx, int vcpu, struct vm_guest_paging *paging,
+    uint16_t sel, struct user_segment_descriptor *desc, bool doread)
+{
+	struct iovec iov[2];
+	uint64_t base;
+	uint32_t limit, access;
+	int error, reg;
+
+	reg = ISLDT(sel) ? VM_REG_GUEST_LDTR : VM_REG_GUEST_GDTR;
+	error = vm_get_desc(ctx, vcpu, reg, &base, &limit, &access);
+	assert(error == 0);
+	assert(limit >= SEL_LIMIT(sel));
+
+	error = vm_copy_setup(ctx, vcpu, paging, base + SEL_START(sel),
+	    sizeof(*desc), doread ? PROT_READ : PROT_WRITE, iov, nitems(iov));
+	if (error == 0) {
+		if (doread)
+			vm_copyin(ctx, vcpu, iov, desc, sizeof(*desc));
+		else
+			vm_copyout(ctx, vcpu, desc, iov, sizeof(*desc));
+	}
+	return (error);
+}
+
+static int
+desc_table_read(struct vmctx *ctx, int vcpu, struct vm_guest_paging *paging,
+    uint16_t sel, struct user_segment_descriptor *desc)
+{
+	return (desc_table_rw(ctx, vcpu, paging, sel, desc, true));
+}
+
+static int
+desc_table_write(struct vmctx *ctx, int vcpu, struct vm_guest_paging *paging,
+    uint16_t sel, struct user_segment_descriptor *desc)
+{
+	return (desc_table_rw(ctx, vcpu, paging, sel, desc, false));
+}
+
+/*
+ * Read the TSS descriptor referenced by 'sel' into 'desc'.
+ *
+ * Returns 0 on success.
+ * Returns 1 if an exception was injected into the guest.
+ * Returns -1 otherwise.
+ */
+static int
+read_tss_descriptor(struct vmctx *ctx, int vcpu, struct vm_task_switch *ts,
+    uint16_t sel, struct user_segment_descriptor *desc)
+{
+	struct vm_guest_paging sup_paging;
+	int error;
+
+	assert(!ISLDT(sel));
+	assert(IDXSEL(sel) != 0);
+
+	/* Fetch the new TSS descriptor */
+	if (desc_table_limit_check(ctx, vcpu, sel)) {
+		if (ts->reason == TSR_IRET)
+			sel_exception(ctx, vcpu, IDT_TS, sel, ts->ext);
+		else
+			sel_exception(ctx, vcpu, IDT_GP, sel, ts->ext);
+		return (1);
+	}
+
+	sup_paging = ts->paging;
+	sup_paging.cpl = 0;		/* implicit supervisor mode */
+	error = desc_table_read(ctx, vcpu, &sup_paging, sel, desc);
+	return (error);
+}
+
+static bool
+code_desc(int sd_type)
+{
+	/* code descriptor */
+	return ((sd_type & 0x18) == 0x18);
+}
+
+static bool
+stack_desc(int sd_type)
+{
+	/* writable data descriptor */
+	return ((sd_type & 0x1A) == 0x12);
+}
+
+static bool
+data_desc(int sd_type)
+{
+	/* data descriptor or a readable code descriptor */
+	return ((sd_type & 0x18) == 0x10 || (sd_type & 0x1A) == 0x1A);
+}
+
+static bool
+ldt_desc(int sd_type)
+{
+
+	return (sd_type == SDT_SYSLDT);
+}
+
+/*
+ * Validate the descriptor 'seg_desc' associated with 'segment'.
+ *
+ * Returns 0 on success.
+ * Returns 1 if an exception was injected into the guest.
+ * Returns -1 otherwise.
+ */
+static int
+validate_seg_desc(struct vmctx *ctx, int vcpu, struct vm_task_switch *ts,
+    int segment, struct seg_desc *seg_desc)
+{
+	struct vm_guest_paging sup_paging;
+	struct user_segment_descriptor usd;
+	int error, idtvec;
+	int cpl, dpl, rpl;
+	uint16_t sel, cs;
+	bool ldtseg, codeseg, stackseg, dataseg, conforming;
+
+	ldtseg = codeseg = stackseg = dataseg = false;
+	switch (segment) {
+	case VM_REG_GUEST_LDTR:
+		ldtseg = true;
+		break;
+	case VM_REG_GUEST_CS:
+		codeseg = true;
+		break;
+	case VM_REG_GUEST_SS:
+		stackseg = true;
+		break;
+	case VM_REG_GUEST_DS:
+	case VM_REG_GUEST_ES:
+	case VM_REG_GUEST_FS:
+	case VM_REG_GUEST_GS:
+		dataseg = true;
+		break;
+	default:
+		assert(0);
+	}
+
+	/* Get the segment selector */
+	sel = GETREG(ctx, vcpu, segment);
+
+	/* LDT selector must point into the GDT */
+	if (ldtseg && ISLDT(sel)) {
+		sel_exception(ctx, vcpu, IDT_TS, sel, ts->ext);
+		return (1);
+	}
+
+	/* Descriptor table limit check */
+	if (desc_table_limit_check(ctx, vcpu, sel)) {
+		sel_exception(ctx, vcpu, IDT_TS, sel, ts->ext);
+		return (1);
+	}
+
+	/* NULL selector */
+	if (IDXSEL(sel) == 0) {
+		/* Code and stack segment selectors cannot be NULL */
+		if (codeseg || stackseg) {
+			sel_exception(ctx, vcpu, IDT_TS, sel, ts->ext);
+			return (1);
+		}
+		seg_desc->base = 0;
+		seg_desc->limit = 0;
+		seg_desc->access = 0x10000;	/* unusable */
+		return (0);
+	}
+
+	/* Read the descriptor from the GDT/LDT */
+	sup_paging = ts->paging;
+	sup_paging.cpl = 0;	/* implicit supervisor mode */
+	error = desc_table_read(ctx, vcpu, &sup_paging, sel, &usd);
+	if (error)
+		return (error);
+
+	/* Verify that the descriptor type is compatible with the segment */
+	if ((ldtseg && !ldt_desc(usd.sd_type)) ||
+	    (codeseg && !code_desc(usd.sd_type)) ||
+	    (dataseg && !data_desc(usd.sd_type)) ||
+	    (stackseg && !stack_desc(usd.sd_type))) {
+		sel_exception(ctx, vcpu, IDT_TS, sel, ts->ext);
+		return (1);
+	}
+
+	/* Segment must be marked present */
+	if (!usd.sd_p) {
+		if (ldtseg)
+			idtvec = IDT_TS;
+		else if (stackseg)
+			idtvec = IDT_SS;
+		else
+			idtvec = IDT_NP;
+		sel_exception(ctx, vcpu, idtvec, sel, ts->ext);
+		return (1);
+	}
+
+	cs = GETREG(ctx, vcpu, VM_REG_GUEST_CS);
+	cpl = cs & SEL_RPL_MASK;
+	rpl = sel & SEL_RPL_MASK;
+	dpl = usd.sd_dpl;
+
+	if (stackseg && (rpl != cpl || dpl != cpl)) {
+		sel_exception(ctx, vcpu, IDT_TS, sel, ts->ext);
+		return (1);
+	}
+
+	if (codeseg) {
+		conforming = (usd.sd_type & 0x4) ? true : false;
+		if ((conforming && (cpl < dpl)) ||
+		    (!conforming && (cpl != dpl))) {
+			sel_exception(ctx, vcpu, IDT_TS, sel, ts->ext);
+			return (1);
+		}
+	}
+
+	if (dataseg) {
+		/*
+		 * A data segment is always non-conforming except when it's
+		 * descriptor is a readable, conforming code segment.
+		 */
+		if (code_desc(usd.sd_type) && (usd.sd_type & 0x4) != 0)
+			conforming = true;
+		else
+			conforming = false;
+
+		if (!conforming && (rpl > dpl || cpl > dpl)) {
+			sel_exception(ctx, vcpu, IDT_TS, sel, ts->ext);
+			return (1);
+		}
+	}
+	*seg_desc = usd_to_seg_desc(&usd);
+	return (0);
+}
+
+static void
+tss32_save(struct vmctx *ctx, int vcpu, struct vm_task_switch *task_switch,
+    uint32_t eip, struct tss32 *tss, struct iovec *iov)
+{
+
+	/* General purpose registers */
+	tss->tss_eax = GETREG(ctx, vcpu, VM_REG_GUEST_RAX);
+	tss->tss_ecx = GETREG(ctx, vcpu, VM_REG_GUEST_RCX);
+	tss->tss_edx = GETREG(ctx, vcpu, VM_REG_GUEST_RDX);
+	tss->tss_ebx = GETREG(ctx, vcpu, VM_REG_GUEST_RBX);
+	tss->tss_esp = GETREG(ctx, vcpu, VM_REG_GUEST_RSP);
+	tss->tss_ebp = GETREG(ctx, vcpu, VM_REG_GUEST_RBP);
+	tss->tss_esi = GETREG(ctx, vcpu, VM_REG_GUEST_RSI);
+	tss->tss_edi = GETREG(ctx, vcpu, VM_REG_GUEST_RDI);
+
+	/* Segment selectors */
+	tss->tss_es = GETREG(ctx, vcpu, VM_REG_GUEST_ES);
+	tss->tss_cs = GETREG(ctx, vcpu, VM_REG_GUEST_CS);
+	tss->tss_ss = GETREG(ctx, vcpu, VM_REG_GUEST_SS);
+	tss->tss_ds = GETREG(ctx, vcpu, VM_REG_GUEST_DS);
+	tss->tss_fs = GETREG(ctx, vcpu, VM_REG_GUEST_FS);
+	tss->tss_gs = GETREG(ctx, vcpu, VM_REG_GUEST_GS);
+
+	/* eflags and eip */
+	tss->tss_eflags = GETREG(ctx, vcpu, VM_REG_GUEST_RFLAGS);
+	if (task_switch->reason == TSR_IRET)
+		tss->tss_eflags &= ~PSL_NT;
+	tss->tss_eip = eip;
+
+	/* Copy updated old TSS into guest memory */
+	vm_copyout(ctx, vcpu, tss, iov, sizeof(struct tss32));
+}
+
+static void
+update_seg_desc(struct vmctx *ctx, int vcpu, int reg, struct seg_desc *sd)
+{
+	int error;
+
+	error = vm_set_desc(ctx, vcpu, reg, sd->base, sd->limit, sd->access);
+	assert(error == 0);
+}
+
+/*
+ * Update the vcpu registers to reflect the state of the new task.
+ *
+ * Returns 0 on success.
+ * Returns 1 if an exception was injected into the guest.
+ * Returns -1 otherwise.
+ */
+static int
+tss32_restore(struct vmctx *ctx, int vcpu, struct vm_task_switch *ts,
+    uint16_t ot_sel, struct tss32 *tss, struct iovec *iov)
+{
+	struct seg_desc seg_desc, seg_desc2;
+	uint64_t *pdpte, maxphyaddr, reserved;
+	uint32_t eflags;
+	int error, i;
+	bool nested;
+
+	nested = false;
+	if (ts->reason != TSR_IRET && ts->reason != TSR_JMP) {
+		tss->tss_link = ot_sel;
+		nested = true;
+	}
+
+	eflags = tss->tss_eflags;
+	if (nested)
+		eflags |= PSL_NT;
+
+	/* LDTR */
+	SETREG(ctx, vcpu, VM_REG_GUEST_LDTR, tss->tss_ldt);
+
+	/* PBDR */
+	if (ts->paging.paging_mode != PAGING_MODE_FLAT) {
+		if (ts->paging.paging_mode == PAGING_MODE_PAE) {
+			/*
+			 * XXX Assuming 36-bit MAXPHYADDR.
+			 */
+			maxphyaddr = (1UL << 36) - 1;
+			pdpte = paddr_guest2host(ctx, tss->tss_cr3 & ~0x1f, 32);
+			for (i = 0; i < 4; i++) {
+				/* Check reserved bits if the PDPTE is valid */
+				if (!(pdpte[i] & 0x1))
+					continue;
+				/*
+				 * Bits 2:1, 8:5 and bits above the processor's
+				 * maximum physical address are reserved.
+				 */
+				reserved = ~maxphyaddr | 0x1E6;
+				if (pdpte[i] & reserved) {
+					vm_inject_gp(ctx, vcpu);
+					return (1);
+				}
+			}
+			SETREG(ctx, vcpu, VM_REG_GUEST_PDPTE0, pdpte[0]);
+			SETREG(ctx, vcpu, VM_REG_GUEST_PDPTE1, pdpte[1]);
+			SETREG(ctx, vcpu, VM_REG_GUEST_PDPTE2, pdpte[2]);
+			SETREG(ctx, vcpu, VM_REG_GUEST_PDPTE3, pdpte[3]);
+		}
+		SETREG(ctx, vcpu, VM_REG_GUEST_CR3, tss->tss_cr3);
+		ts->paging.cr3 = tss->tss_cr3;
+	}
+
+	/* eflags and eip */
+	SETREG(ctx, vcpu, VM_REG_GUEST_RFLAGS, eflags);
+	SETREG(ctx, vcpu, VM_REG_GUEST_RIP, tss->tss_eip);
+
+	/* General purpose registers */
+	SETREG(ctx, vcpu, VM_REG_GUEST_RAX, tss->tss_eax);
+	SETREG(ctx, vcpu, VM_REG_GUEST_RCX, tss->tss_ecx);
+	SETREG(ctx, vcpu, VM_REG_GUEST_RDX, tss->tss_edx);
+	SETREG(ctx, vcpu, VM_REG_GUEST_RBX, tss->tss_ebx);
+	SETREG(ctx, vcpu, VM_REG_GUEST_RSP, tss->tss_esp);
+	SETREG(ctx, vcpu, VM_REG_GUEST_RBP, tss->tss_ebp);
+	SETREG(ctx, vcpu, VM_REG_GUEST_RSI, tss->tss_esi);
+	SETREG(ctx, vcpu, VM_REG_GUEST_RDI, tss->tss_edi);
+
+	/* Segment selectors */
+	SETREG(ctx, vcpu, VM_REG_GUEST_ES, tss->tss_es);
+	SETREG(ctx, vcpu, VM_REG_GUEST_CS, tss->tss_cs);
+	SETREG(ctx, vcpu, VM_REG_GUEST_SS, tss->tss_ss);
+	SETREG(ctx, vcpu, VM_REG_GUEST_DS, tss->tss_ds);
+	SETREG(ctx, vcpu, VM_REG_GUEST_FS, tss->tss_fs);
+	SETREG(ctx, vcpu, VM_REG_GUEST_GS, tss->tss_gs);
+
+	/*
+	 * If this is a nested task then write out the new TSS to update
+	 * the previous link field.
+	 */
+	if (nested)
+		vm_copyout(ctx, vcpu, tss, iov, sizeof(*tss));
+
+	/* Validate segment descriptors */
+	error = validate_seg_desc(ctx, vcpu, ts, VM_REG_GUEST_LDTR, &seg_desc);
+	if (error)
+		return (error);
+	update_seg_desc(ctx, vcpu, VM_REG_GUEST_LDTR, &seg_desc);
+
+	/*
+	 * Section "Checks on Guest Segment Registers", Intel SDM, Vol 3.
+	 *
+	 * The SS and CS attribute checks on VM-entry are inter-dependent so
+	 * we need to make sure that both segments are valid before updating
+	 * either of them. This ensures that the VMCS state can pass the
+	 * VM-entry checks so the guest can handle any exception injected
+	 * during task switch emulation.
+	 */
+	error = validate_seg_desc(ctx, vcpu, ts, VM_REG_GUEST_CS, &seg_desc);
+	if (error)
+		return (error);
+	error = validate_seg_desc(ctx, vcpu, ts, VM_REG_GUEST_SS, &seg_desc2);
+	if (error)
+		return (error);
+	update_seg_desc(ctx, vcpu, VM_REG_GUEST_CS, &seg_desc);
+	update_seg_desc(ctx, vcpu, VM_REG_GUEST_SS, &seg_desc2);
+	ts->paging.cpl = tss->tss_cs & SEL_RPL_MASK;
+
+	error = validate_seg_desc(ctx, vcpu, ts, VM_REG_GUEST_DS, &seg_desc);
+	if (error)
+		return (error);
+	update_seg_desc(ctx, vcpu, VM_REG_GUEST_DS, &seg_desc);
+
+	error = validate_seg_desc(ctx, vcpu, ts, VM_REG_GUEST_ES, &seg_desc);
+	if (error)
+		return (error);
+	update_seg_desc(ctx, vcpu, VM_REG_GUEST_ES, &seg_desc);
+
+	error = validate_seg_desc(ctx, vcpu, ts, VM_REG_GUEST_FS, &seg_desc);
+	if (error)
+		return (error);
+	update_seg_desc(ctx, vcpu, VM_REG_GUEST_FS, &seg_desc);
+
+	error = validate_seg_desc(ctx, vcpu, ts, VM_REG_GUEST_GS, &seg_desc);
+	if (error)
+		return (error);
+	update_seg_desc(ctx, vcpu, VM_REG_GUEST_GS, &seg_desc);
+
+	return (0);
+}
+
+/*
+ * Push an error code on the stack of the new task. This is needed if the
+ * task switch was triggered by a hardware exception that causes an error
+ * code to be saved (e.g. #PF).
+ *
+ * Returns 0 on success.
+ * Returns 1 if an exception was injected into the guest.
+ * Returns -1 otherwise.
+ */
+static int
+push_errcode(struct vmctx *ctx, int vcpu, struct vm_guest_paging *paging,
+    int task_type, uint32_t errcode)
+{
+	struct iovec iov[2];
+	struct seg_desc seg_desc;
+	int stacksize, bytes, error;
+	uint64_t gla, cr0, rflags;
+	uint32_t esp;
+	uint16_t stacksel;
+
+	cr0 = GETREG(ctx, vcpu, VM_REG_GUEST_CR0);
+	rflags = GETREG(ctx, vcpu, VM_REG_GUEST_RFLAGS);
+	stacksel = GETREG(ctx, vcpu, VM_REG_GUEST_SS);
+
+	error = vm_get_desc(ctx, vcpu, VM_REG_GUEST_SS, &seg_desc.base,
+	    &seg_desc.limit, &seg_desc.access);
+	assert(error == 0);
+
+	/*
+	 * Section "Error Code" in the Intel SDM vol 3: the error code is
+	 * pushed on the stack as a doubleword or word (depending on the
+	 * default interrupt, trap or task gate size).
+	 */
+	if (task_type == SDT_SYS386BSY || task_type == SDT_SYS386TSS)
+		bytes = 4;
+	else
+		bytes = 2;
+
+	/*
+	 * PUSH instruction from Intel SDM vol 2: the 'B' flag in the
+	 * stack-segment descriptor determines the size of the stack
+	 * pointer outside of 64-bit mode.
+	 */
+	if (SEG_DESC_DEF32(seg_desc.access))
+		stacksize = 4;
+	else
+		stacksize = 2;
+
+	esp = GETREG(ctx, vcpu, VM_REG_GUEST_RSP);
+	esp -= bytes;
+
+	if (vie_calculate_gla(paging->cpu_mode, VM_REG_GUEST_SS,
+	    &seg_desc, esp, bytes, stacksize, PROT_WRITE, &gla)) {
+		sel_exception(ctx, vcpu, IDT_SS, stacksel, 1);
+		return (1);
+	}
+
+	if (vie_alignment_check(paging->cpl, bytes, cr0, rflags, gla)) {
+		vm_inject_ac(ctx, vcpu, 1);
+		return (1);
+	}
+
+	error = vm_copy_setup(ctx, vcpu, paging, gla, bytes, PROT_WRITE,
+	    iov, nitems(iov));
+	if (error)
+		return (error);
+
+	vm_copyout(ctx, vcpu, &errcode, iov, bytes);
+	SETREG(ctx, vcpu, VM_REG_GUEST_RSP, esp);
+	return (0);
+}
+
+/*
+ * Evaluate return value from helper functions and potentially return to
+ * the VM run loop.
+ *  0: success
+ * +1: an exception was injected into the guest vcpu
+ * -1: unrecoverable/programming error
+ */
+#define	CHKERR(x)							\
+	do {								\
+		assert(((x) == 0) || ((x) == 1) || ((x) == -1));	\
+		if ((x) == -1)						\
+			return (VMEXIT_ABORT);				\
+		else if ((x) == 1)					\
+			return (VMEXIT_CONTINUE);			\
+	} while (0)
+
+int
+vmexit_task_switch(struct vmctx *ctx, struct vm_exit *vmexit, int *pvcpu)
+{
+	struct seg_desc nt;
+	struct tss32 oldtss, newtss;
+	struct vm_task_switch *task_switch;
+	struct vm_guest_paging *paging, sup_paging;
+	struct user_segment_descriptor nt_desc, ot_desc;
+	struct iovec nt_iov[2], ot_iov[2];
+	uint64_t cr0, ot_base;
+	uint32_t eip, ot_lim, access;
+	int error, ext, minlimit, nt_type, ot_type, vcpu;
+	enum task_switch_reason reason;
+	uint16_t nt_sel, ot_sel;
+
+	task_switch = &vmexit->u.task_switch;
+	nt_sel = task_switch->tsssel;
+	ext = vmexit->u.task_switch.ext;
+	reason = vmexit->u.task_switch.reason;
+	paging = &vmexit->u.task_switch.paging;
+	vcpu = *pvcpu;
+
+	assert(paging->cpu_mode == CPU_MODE_PROTECTED);
+
+	/*
+	 * Section 4.6, "Access Rights" in Intel SDM Vol 3.
+	 * The following page table accesses are implicitly supervisor mode:
+	 * - accesses to GDT or LDT to load segment descriptors
+	 * - accesses to the task state segment during task switch
+	 */
+	sup_paging = *paging;
+	sup_paging.cpl = 0;	/* implicit supervisor mode */
+
+	/* Fetch the new TSS descriptor */
+	error = read_tss_descriptor(ctx, vcpu, task_switch, nt_sel, &nt_desc);
+	CHKERR(error);
+
+	nt = usd_to_seg_desc(&nt_desc);
+
+	/* Verify the type of the new TSS */
+	nt_type = SEG_DESC_TYPE(nt.access);
+	if (nt_type != SDT_SYS386BSY && nt_type != SDT_SYS386TSS &&
+	    nt_type != SDT_SYS286BSY && nt_type != SDT_SYS286TSS) {
+		sel_exception(ctx, vcpu, IDT_TS, nt_sel, ext);
+		goto done;
+	}
+
+	/* TSS descriptor must have present bit set */
+	if (!SEG_DESC_PRESENT(nt.access)) {
+		sel_exception(ctx, vcpu, IDT_NP, nt_sel, ext);
+		goto done;
+	}
+
+	/*
+	 * TSS must have a minimum length of 104 bytes for a 32-bit TSS and
+	 * 44 bytes for a 16-bit TSS.
+	 */
+	if (nt_type == SDT_SYS386BSY || nt_type == SDT_SYS386TSS)
+		minlimit = 104 - 1;
+	else if (nt_type == SDT_SYS286BSY || nt_type == SDT_SYS286TSS)
+		minlimit = 44 - 1;
+	else
+		minlimit = 0;
+
+	assert(minlimit > 0);
+	if (nt.limit < minlimit) {
+		sel_exception(ctx, vcpu, IDT_TS, nt_sel, ext);
+		goto done;
+	}
+
+	/* TSS must be busy if task switch is due to IRET */
+	if (reason == TSR_IRET && !TSS_BUSY(nt_type)) {
+		sel_exception(ctx, vcpu, IDT_TS, nt_sel, ext);
+		goto done;
+	}
+
+	/*
+	 * TSS must be available (not busy) if task switch reason is
+	 * CALL, JMP, exception or interrupt.
+	 */
+	if (reason != TSR_IRET && TSS_BUSY(nt_type)) {
+		sel_exception(ctx, vcpu, IDT_GP, nt_sel, ext);
+		goto done;
+	}
+
+	/* Fetch the new TSS */
+	error = vm_copy_setup(ctx, vcpu, &sup_paging, nt.base, minlimit + 1,
+	    PROT_READ | PROT_WRITE, nt_iov, nitems(nt_iov));
+	CHKERR(error);
+	vm_copyin(ctx, vcpu, nt_iov, &newtss, minlimit + 1);
+
+	/* Get the old TSS selector from the guest's task register */
+	ot_sel = GETREG(ctx, vcpu, VM_REG_GUEST_TR);
+	if (ISLDT(ot_sel) || IDXSEL(ot_sel) == 0) {
+		/*
+		 * This might happen if a task switch was attempted without
+		 * ever loading the task register with LTR. In this case the
+		 * TR would contain the values from power-on:
+		 * (sel = 0, base = 0, limit = 0xffff).
+		 */
+		sel_exception(ctx, vcpu, IDT_TS, ot_sel, task_switch->ext);
+		goto done;
+	}
+
+	/* Get the old TSS base and limit from the guest's task register */
+	error = vm_get_desc(ctx, vcpu, VM_REG_GUEST_TR, &ot_base, &ot_lim,
+	    &access);
+	assert(error == 0);
+	assert(!SEG_DESC_UNUSABLE(access) && SEG_DESC_PRESENT(access));
+	ot_type = SEG_DESC_TYPE(access);
+	assert(ot_type == SDT_SYS386BSY || ot_type == SDT_SYS286BSY);
+
+	/* Fetch the old TSS descriptor */
+	error = read_tss_descriptor(ctx, vcpu, task_switch, ot_sel, &ot_desc);
+	CHKERR(error);
+
+	/* Get the old TSS */
+	error = vm_copy_setup(ctx, vcpu, &sup_paging, ot_base, minlimit + 1,
+	    PROT_READ | PROT_WRITE, ot_iov, nitems(ot_iov));
+	CHKERR(error);
+	vm_copyin(ctx, vcpu, ot_iov, &oldtss, minlimit + 1);
+
+	/*
+	 * Clear the busy bit in the old TSS descriptor if the task switch
+	 * due to an IRET or JMP instruction.
+	 */
+	if (reason == TSR_IRET || reason == TSR_JMP) {
+		ot_desc.sd_type &= ~0x2;
+		error = desc_table_write(ctx, vcpu, &sup_paging, ot_sel,
+		    &ot_desc);
+		CHKERR(error);
+	}
+
+	if (nt_type == SDT_SYS286BSY || nt_type == SDT_SYS286TSS) {
+		fprintf(stderr, "Task switch to 16-bit TSS not supported\n");
+		return (VMEXIT_ABORT);
+	}
+
+	/* Save processor state in old TSS */
+	eip = vmexit->rip + vmexit->inst_length;
+	tss32_save(ctx, vcpu, task_switch, eip, &oldtss, ot_iov);
+
+	/*
+	 * If the task switch was triggered for any reason other than IRET
+	 * then set the busy bit in the new TSS descriptor.
+	 */
+	if (reason != TSR_IRET) {
+		nt_desc.sd_type |= 0x2;
+		error = desc_table_write(ctx, vcpu, &sup_paging, nt_sel,
+		    &nt_desc);
+		CHKERR(error);
+	}
+
+	/* Update task register to point at the new TSS */
+	SETREG(ctx, vcpu, VM_REG_GUEST_TR, nt_sel);
+
+	/* Update the hidden descriptor state of the task register */
+	nt = usd_to_seg_desc(&nt_desc);
+	update_seg_desc(ctx, vcpu, VM_REG_GUEST_TR, &nt);
+
+	/* Set CR0.TS */
+	cr0 = GETREG(ctx, vcpu, VM_REG_GUEST_CR0);
+	SETREG(ctx, vcpu, VM_REG_GUEST_CR0, cr0 | CR0_TS);
+
+	/*
+	 * We are now committed to the task switch. Any exceptions encountered
+	 * after this point will be handled in the context of the new task and
+	 * the saved instruction pointer will belong to the new task.
+	 */
+	vmexit->rip = newtss.tss_eip;
+	vmexit->inst_length = 0;
+
+	/* Load processor state from new TSS */
+	error = tss32_restore(ctx, vcpu, task_switch, ot_sel, &newtss, nt_iov);
+	CHKERR(error);
+
+	/*
+	 * Section "Interrupt Tasks" in Intel SDM, Vol 3: if an exception
+	 * caused an error code to be generated, this error code is copied
+	 * to the stack of the new task.
+	 */
+	if (task_switch->errcode_valid) {
+		assert(task_switch->ext);
+		assert(task_switch->reason == TSR_IDT_GATE);
+		error = push_errcode(ctx, vcpu, &task_switch->paging, nt_type,
+		    task_switch->errcode);
+		CHKERR(error);
+	}
+
+	/*
+	 * Treatment of virtual-NMI blocking if NMI is delivered through
+	 * a task gate.
+	 *
+	 * Section "Architectural State Before A VM Exit", Intel SDM, Vol3:
+	 * If the virtual NMIs VM-execution control is 1, VM entry injects
+	 * an NMI, and delivery of the NMI causes a task switch that causes
+	 * a VM exit, virtual-NMI blocking is in effect before the VM exit
+	 * commences.
+	 *
+	 * Thus, virtual-NMI blocking is in effect at the time of the task
+	 * switch VM exit.
+	 */
+
+	/*
+	 * Treatment of virtual-NMI unblocking on IRET from NMI handler task.
+	 *
+	 * Section "Changes to Instruction Behavior in VMX Non-Root Operation"
+	 * If "virtual NMIs" control is 1 IRET removes any virtual-NMI blocking.
+	 * This unblocking of virtual-NMI occurs even if IRET causes a fault.
+	 *
+	 * Thus, virtual-NMI blocking is cleared at the time of the task switch
+	 * VM exit.
+	 */
+
+	/*
+	 * If the task switch was triggered by an event delivered through
+	 * the IDT then extinguish the pending event from the vcpu's
+	 * exitintinfo.
+	 */
+	if (task_switch->reason == TSR_IDT_GATE) {
+		error = vm_set_intinfo(ctx, vcpu, 0);
+		assert(error == 0);
+	}
+
+	/*
+	 * XXX should inject debug exception if 'T' bit is 1
+	 */
+done:
+	return (VMEXIT_CONTINUE);
+}
diff --git a/usr.sbin/bhyve/virtio.c b/usr.sbin/bhyve/virtio.c
index 4e58dd62a0e7..1f2730092936 100644
--- a/usr.sbin/bhyve/virtio.c
+++ b/usr.sbin/bhyve/virtio.c
@@ -437,7 +437,7 @@ vq_endchains(struct vqueue_info *vq, int used_all_avail)
 	if (used_all_avail &&
 	    (vs->vs_negotiated_caps & VIRTIO_F_NOTIFY_ON_EMPTY))
 		intr = 1;
-	else if (vs->vs_flags & VIRTIO_EVENT_IDX) {
+	else if (vs->vs_negotiated_caps & VIRTIO_RING_F_EVENT_IDX) {
 		event_idx = VQ_USED_EVENT_IDX(vq);
 		/*
 		 * This calculation is per docs and the kernel
diff --git a/usr.sbin/bhyve/virtio.h b/usr.sbin/bhyve/virtio.h
index 01b5f7b9112d..1f29dfa8ef73 100644
--- a/usr.sbin/bhyve/virtio.h
+++ b/usr.sbin/bhyve/virtio.h
@@ -352,7 +352,7 @@ struct virtio_consts {
 					/* called to read config regs */
 	int	(*vc_cfgwrite)(void *, int, int, uint32_t);
 					/* called to write config regs */
-	uint32_t vc_hv_caps;		/* hypervisor-provided capabilities */
+	uint64_t vc_hv_caps;		/* hypervisor-provided capabilities */
 };
 
 /*
diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c
index e77f0d77df6f..b6006b72a767 100644
--- a/usr.sbin/bhyvectl/bhyvectl.c
+++ b/usr.sbin/bhyvectl/bhyvectl.c
@@ -195,7 +195,8 @@ usage(void)
 	"       [--force-reset]\n"
 	"       [--force-poweroff]\n"
 	"       [--get-active-cpus]\n"
-	"       [--get-suspended-cpus]\n",
+	"       [--get-suspended-cpus]\n"
+	"       [--get-intinfo]\n",
 	progname);
 	exit(1);
 }
@@ -205,6 +206,7 @@ static int inject_nmi, assert_lapic_lvt;
 static int force_reset, force_poweroff;
 static const char *capname;
 static int create, destroy, get_lowmem, get_highmem;
+static int get_intinfo;
 static int get_active_cpus, get_suspended_cpus;
 static uint64_t memsize;
 static int set_cr0, get_cr0, set_cr3, get_cr3, set_cr4, get_cr4;
@@ -412,6 +414,37 @@ print_cpus(const char *banner, const cpuset_t *cpus)
 	printf("\n");
 }
 
+static void
+print_intinfo(const char *banner, uint64_t info)
+{
+	int type;
+
+	printf("%s:\t", banner);
+	if (info & VM_INTINFO_VALID) {
+		type = info & VM_INTINFO_TYPE;
+		switch (type) {
+		case VM_INTINFO_HWINTR:
+			printf("extint");
+			break;
+		case VM_INTINFO_NMI:
+			printf("nmi");
+			break;
+		case VM_INTINFO_SWINTR:
+			printf("swint");
+			break;
+		default:
+			printf("exception");
+			break;
+		}
+		printf(" vector %d", (int)VM_INTINFO_VECTOR(info));
+		if (info & VM_INTINFO_DEL_ERRCODE)
+			printf(" errcode %#x", (u_int)(info >> 32));
+	} else {
+		printf("n/a");
+	}
+	printf("\n");
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -420,7 +453,7 @@ main(int argc, char *argv[])
 	vm_paddr_t gpa, gpa_pmap;
 	size_t len;
 	struct vm_exit vmexit;
-	uint64_t ctl, eptp, bm, addr, u64, pteval[4], *pte;
+	uint64_t ctl, eptp, bm, addr, u64, pteval[4], *pte, info[2];
 	struct vmctx *ctx;
 	int wired;
 	cpuset_t cpus;
@@ -595,6 +628,7 @@ main(int argc, char *argv[])
 		{ "force-poweroff", NO_ARG,	&force_poweroff, 1 },
 		{ "get-active-cpus", NO_ARG,	&get_active_cpus, 1 },
 		{ "get-suspended-cpus", NO_ARG,	&get_suspended_cpus, 1 },
+		{ "get-intinfo", NO_ARG,	&get_intinfo,	1 },
 		{ NULL,		0,		NULL,		0 }
 	};
 
@@ -1566,6 +1600,14 @@ main(int argc, char *argv[])
 			print_cpus("suspended cpus", &cpus);
 	}
 
+	if (!error && (get_intinfo || get_all)) {
+		error = vm_get_intinfo(ctx, vcpu, &info[0], &info[1]);
+		if (!error) {
+			print_intinfo("pending", info[0]);
+			print_intinfo("current", info[1]);
+		}
+	}
+
 	if (!error && run) {
 		error = vm_get_register(ctx, vcpu, VM_REG_GUEST_RIP, &rip);
 		assert(error == 0);
diff --git a/usr.sbin/bhyveload/bhyveload.8 b/usr.sbin/bhyveload/bhyveload.8
index 3a300cc00f85..c1688322cc75 100644
--- a/usr.sbin/bhyveload/bhyveload.8
+++ b/usr.sbin/bhyveload/bhyveload.8
@@ -35,11 +35,11 @@
 guest inside a bhyve virtual machine
 .Sh SYNOPSIS
 .Nm
-.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
+.Op Fl d Ar disk-path
+.Op Fl e Ar name=value
+.Op Fl h Ar host-path
+.Op Fl m Ar mem-size
 .Ar vmname
 .Sh DESCRIPTION
 .Nm
@@ -62,6 +62,32 @@ and will be created if it does not already exist.
 .Sh OPTIONS
 The following options are available:
 .Bl -tag -width indent
+.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.
+.It Fl d Ar disk-path
+The
+.Ar disk-path
+is the pathname of the guest's boot disk image.
+.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 h Ar host-path
+The
+.Ar host-path
+is the directory at the top of the guest's boot filesystem.
 .It Fl m Ar mem-size Xo
 .Sm off
 .Op Cm K | k | M | m | G | g | T | t
@@ -85,32 +111,6 @@ respectively.
 The default value of
 .Ar mem-size
 is 256M.
-.It Fl d Ar disk-path
-The
-.Ar disk-path
-is the pathname of the guest's boot disk image.
-.It Fl h Ar host-path
-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
@@ -147,9 +147,9 @@ and was developed at NetApp Inc.
 .Nm
 was developed by
 .An -nosplit
-.An "Neel Natu" Aq neel@FreeBSD.org
+.An Neel Natu Aq Mt neel@FreeBSD.org
 at NetApp Inc with a lot of help from
-.An Doug Rabson Aq dfr@FreeBSD.org
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
 .Sh BUGS
 .Nm
 can only load
diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c
index 44424963fed0..eaf71a819373 100644
--- a/usr.sbin/bhyveload/bhyveload.c
+++ b/usr.sbin/bhyveload/bhyveload.c
@@ -505,8 +505,8 @@ static void
 cb_getmem(void *arg, uint64_t *ret_lowmem, uint64_t *ret_highmem)
 {
 
-	vm_get_memory_seg(ctx, 0, ret_lowmem, NULL);
-	vm_get_memory_seg(ctx, 4 * GB, ret_highmem, NULL);
+	*ret_lowmem = vm_get_lowmem_size(ctx);
+	*ret_highmem = vm_get_highmem_size(ctx);
 }
 
 struct env {
@@ -629,8 +629,8 @@ usage(void)
 {
 
 	fprintf(stderr,
-	    "usage: %s [-m mem-size] [-d <disk-path>] [-h <host-path>]\n"
-	    "       %*s [-e <name=value>] [-c <console-device>] <vmname>\n",
+	    "usage: %s [-c <console-device>] [-d <disk-path>] [-e <name=value>]\n"
+	    "       %*s [-h <host-path>] [-m mem-size] <vmname>\n",
 	    progname,
 	    (int)strlen(progname), "");
 	exit(1);
diff --git a/usr.sbin/binmiscctl/binmiscctl.8 b/usr.sbin/binmiscctl/binmiscctl.8
index 646a5a3c2adb..761810e60646 100644
--- a/usr.sbin/binmiscctl/binmiscctl.8
+++ b/usr.sbin/binmiscctl/binmiscctl.8
@@ -28,7 +28,7 @@
 .\" Support for miscellaneous binary image activators
 .\"
 .Dd April 10, 2014
-.Dt BINMISCCTL 8 
+.Dt BINMISCCTL 8
 .Os
 .Sh NAME
 .Nm binmiscctl
@@ -142,14 +142,14 @@ Enable the activator entry identified with
 .It Cm lookup Ar name
 Look up and print out the activator entry identified with
 .Ar name .
-.It Cm list 
+.It Cm list
 Take a snapshot and print all the activator entries currently configured.
 .El
 .Sh EXAMPLES
-.Bl
-# binmiscctl add llvmbc --interpreter ''/usr/bin/lli --fake-argv0=#a'' \\
-  --magic ''BC\\xc0\\xde'' --size 4 --set-enabled
-.El
+.Bd -ragged -offset indent
+# binmiscctl add llvmbc --interpreter ''/usr/bin/lli --fake-argv0=#a''
+--magic ''BC\\xc0\\xde'' --size 4 --set-enabled
+.Ed
 .Pp
 Add an image activator to run the LLVM interpreter (lli) on bitcode
 compiled files.
@@ -162,13 +162,13 @@ Set its state to enabled.
 .Pp
 .Dl # binmiscctl disable llvmbc
 .Pp
-Set the state of the 
+Set the state of the
 .Ar llvmbc
 image activator to disabled.
 .Pp
 .Dl # binmiscctl enable llvmbc
 .Pp
-Set the state of the 
+Set the state of the
 .Ar llvmbc
 image activator to enabled.
 .Pp
diff --git a/usr.sbin/bluetooth/ath3kfw/ath3kfw.8 b/usr.sbin/bluetooth/ath3kfw/ath3kfw.8
index 9198853c2213..3a37343d253a 100644
--- a/usr.sbin/bluetooth/ath3kfw/ath3kfw.8
+++ b/usr.sbin/bluetooth/ath3kfw/ath3kfw.8
@@ -72,7 +72,7 @@ Display usage message and exit.
 .Xr ugen 4 ,
 .Xr devd 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Most likely.
 Please report if found.
diff --git a/usr.sbin/bluetooth/bcmfw/bcmfw.8 b/usr.sbin/bluetooth/bcmfw/bcmfw.8
index e79935070725..d82d701531b3 100644
--- a/usr.sbin/bluetooth/bcmfw/bcmfw.8
+++ b/usr.sbin/bluetooth/bcmfw/bcmfw.8
@@ -99,7 +99,7 @@ device:
 .Xr ubtbcmfw 4 ,
 .Xr ugen 4
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Most likely.
 Please report if found.
diff --git a/usr.sbin/bluetooth/bt3cfw/bt3cfw.8 b/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
index 54df178741fd..ec1ef341aea7 100644
--- a/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
+++ b/usr.sbin/bluetooth/bt3cfw/bt3cfw.8
@@ -68,6 +68,6 @@ Connect to the specified Netgraph driver node of type
 .Sh SEE ALSO
 .Xr ng_bt3c 4
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Please report if found.
diff --git a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8 b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
index 690b9422d175..50774f18d03b 100644
--- a/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
+++ b/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
@@ -99,4 +99,4 @@ are:
 .Sh SEE ALSO
 .Xr bthidd 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/usr.sbin/bluetooth/bthidd/bthidd.8 b/usr.sbin/bluetooth/bthidd/bthidd.8
index 8dd052edf094..53db4cb810d8 100644
--- a/usr.sbin/bluetooth/bthidd/bthidd.8
+++ b/usr.sbin/bluetooth/bthidd/bthidd.8
@@ -107,7 +107,7 @@ configuration file is needed as well.
 .Xr vkbd 4 ,
 .Xr bthidcontrol 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh CAVEATS
 Any Bluetooth HID device that has
 .Dv HUP_KEYBOARD
diff --git a/usr.sbin/bluetooth/hccontrol/hccontrol.8 b/usr.sbin/bluetooth/hccontrol/hccontrol.8
index 54be8237b2c8..af0a67f1cd86 100644
--- a/usr.sbin/bluetooth/hccontrol/hccontrol.8
+++ b/usr.sbin/bluetooth/hccontrol/hccontrol.8
@@ -178,7 +178,7 @@ are:
 .Xr ng_hci 4 ,
 .Xr hcseriald 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Most likely.
 Please report if found.
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.8 b/usr.sbin/bluetooth/hcsecd/hcsecd.8
index 8b7084d2de30..a55e85e5ab8c 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.8
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.8
@@ -120,7 +120,7 @@ Display usage message and exit.
 .Xr hccontrol 8 ,
 .Xr hcseriald 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Currently there is no way to select the link key or the PIN code based on
 which local device received the request.
diff --git a/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5 b/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
index 189ca66606c5..a6342aa67cf3 100644
--- a/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
+++ b/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5
@@ -128,4 +128,4 @@ device {
 .Sh SEE ALSO
 .Xr hcsecd 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/usr.sbin/bluetooth/hcseriald/hcseriald.8 b/usr.sbin/bluetooth/hcseriald/hcseriald.8
index 8d2dd47be61f..c2d94efd0744 100644
--- a/usr.sbin/bluetooth/hcseriald/hcseriald.8
+++ b/usr.sbin/bluetooth/hcseriald/hcseriald.8
@@ -83,4 +83,4 @@ is an H4 Netgraph node name.
 .Xr tty 4 ,
 .Xr hccontrol 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
diff --git a/usr.sbin/bluetooth/l2control/l2control.8 b/usr.sbin/bluetooth/l2control/l2control.8
index 7636d9422e22..5974167439d1 100644
--- a/usr.sbin/bluetooth/l2control/l2control.8
+++ b/usr.sbin/bluetooth/l2control/l2control.8
@@ -94,4 +94,4 @@ are:
 .Xr ng_l2cap 4 ,
 .Xr l2ping 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq emax@FreeBSD.org
+.An Maksim Yevmenkin Aq Mt emax@FreeBSD.org
diff --git a/usr.sbin/bluetooth/l2ping/l2ping.8 b/usr.sbin/bluetooth/l2ping/l2ping.8
index 73774eccf339..b6233e8407da 100644
--- a/usr.sbin/bluetooth/l2ping/l2ping.8
+++ b/usr.sbin/bluetooth/l2ping/l2ping.8
@@ -108,7 +108,7 @@ Some implementations may not like large sizes and may hang or even crash.
 .Xr ng_l2cap 4 ,
 .Xr l2control 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq emax@FreeBSD.org
+.An Maksim Yevmenkin Aq Mt emax@FreeBSD.org
 .Sh BUGS
 Could collect more statistic.
 Could check for duplicated, corrupted and lost packets.
diff --git a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8 b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
index 0588d0c3f5db..6763008bd047 100644
--- a/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
+++ b/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
@@ -343,7 +343,7 @@ label.
 .Xr sdpcontrol 8 ,
 .Xr sdpd 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh CAVEATS
 The
 .Nm
diff --git a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
index 8104bba7adec..89db90b85955 100644
--- a/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
+++ b/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
@@ -96,7 +96,7 @@ are:
 .Xr bluetooth 3 ,
 .Xr sdp 3
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh CAVEATS
 The
 .Nm
diff --git a/usr.sbin/bluetooth/sdpd/sdpd.8 b/usr.sbin/bluetooth/sdpd/sdpd.8
index 0844e30ee15d..6a7b162a43a5 100644
--- a/usr.sbin/bluetooth/sdpd/sdpd.8
+++ b/usr.sbin/bluetooth/sdpd/sdpd.8
@@ -134,7 +134,7 @@ as RFCOMM channels etc., before registering the service.
 .Xr sdp 3 ,
 .Xr sdpcontrol 8
 .Sh AUTHORS
-.An Maksim Yevmenkin Aq m_evmenkin@yahoo.com
+.An Maksim Yevmenkin Aq Mt m_evmenkin@yahoo.com
 .Sh BUGS
 Most likely.
 Please report if found.
diff --git a/usr.sbin/boot0cfg/boot0cfg.8 b/usr.sbin/boot0cfg/boot0cfg.8
index 27f94e062d04..9e413c0a6114 100644
--- a/usr.sbin/boot0cfg/boot0cfg.8
+++ b/usr.sbin/boot0cfg/boot0cfg.8
@@ -190,7 +190,7 @@ to install the default MBR:
 .Xr fdisk 8 ,
 .Xr gpart 8
 .Sh AUTHORS
-.An Robert Nordier Aq rnordier@FreeBSD.org .
+.An Robert Nordier Aq Mt rnordier@FreeBSD.org
 .Sh BUGS
 Use of the
 .Sq packet
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.8 b/usr.sbin/bootparamd/bootparamd/bootparamd.8
index 4d97cb52c37a..183302aa4748 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.8
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.8
@@ -69,7 +69,7 @@ The alias address must of course be free for use.
 .Xr diskless 8
 .Sh AUTHORS
 Written by
-.An Klas Heggemann Aq klas@nada.kth.se .
+.An Klas Heggemann Aq Mt klas@nada.kth.se .
 .Sh BUGS
 You may find the
 .Xr syslog 3
diff --git a/usr.sbin/bsdconfig/bsdconfig.8 b/usr.sbin/bsdconfig/bsdconfig.8
index b99cac248d81..3f25c95ccd1d 100644
--- a/usr.sbin/bsdconfig/bsdconfig.8
+++ b/usr.sbin/bsdconfig/bsdconfig.8
@@ -236,7 +236,7 @@ first appeared in
 .Fx 9.2 .
 .Sh AUTHORS
 .An Ron McDowell
-.An Devin Teske Aq dteske@FreeBSD.org
+.An Devin Teske Aq Mt dteske@FreeBSD.org
 .Sh BUGS
 The docsinstall and diskmgmt modules call bsdinstall.
 Bugs found in these modules should be considered those of bsdinstall, not
diff --git a/usr.sbin/bsdconfig/dot/dot b/usr.sbin/bsdconfig/dot/dot
index 9093d633dd28..f71c0e81487f 100755
--- a/usr.sbin/bsdconfig/dot/dot
+++ b/usr.sbin/bsdconfig/dot/dot
@@ -249,6 +249,7 @@ if [ "$SHOW_INCLUDES" ]; then
 			$menu_program_list \
 			$submenu_program_list \
 			$cmd_program_list \
+			$BSDCFG_SHARE/script.subr \
 		; do
 			[ -e "$file" ] && echo $file
 		done | sort -u
@@ -298,12 +299,6 @@ if [ "$SHOW_INCLUDES" ]; then
 	done
 fi
 
-#
-# Add script.subr to includes if it exists
-#
-[ -f $BSDCFG_SHARE/script.subr ] &&
-	include_file_list="$include_file_list script.subr"
-
 #
 # Start the directional-graph (digraph) output
 #
@@ -352,7 +347,7 @@ printf '\tnode [\n'
 printf '\t\tfontname = "Times-Roman",\n'
 printf '\t\tfontsize = 12,\n'
 printf '\t\twidth = 2.5, // arbitrary minimum width for all nodes\n'
-printf '\t\tfixedsize,   // turn minimum width into exact width\n'
+printf '\t\tfixedsize = true, // turn minimum width into exact width\n'
 printf '\t];\n'
 
 #
@@ -546,34 +541,36 @@ printf '\t\tbgcolor = "%s";\n' "$bgcolor_bsdconfig"
 printf '\t\tlabel = "bsdconfig(8)";\n'
 printf '\t\ttooltip = "bsdconfig(8)";\n'
 print_node "bsdconfig"
+end_nodelist
 if [ "$SHOW_INCLUDES" ]; then
-	printf '\t\tsubgraph "cluster_includes" {\n'
-	printf '\t\t\tbgcolor = "%s";\n' "$bgcolor_includes"
-	printf '\t\t\tlabel = "%s";\n' "$msg_includes"
-
 	for include_file in $include_file_list; do
 		echo $include_file
-	done | awk -v bgcolor="$bgcolor_bsdconfig" '
-	BEGIN { created = 0 }
-	function end_subgraph() { printf "\t\t\t};\n" }
-	( $0 !~ "/" ) {
-		if ( ! created )
-		{
-			printf "\t\t\tsubgraph \"%s\" {\n",
-			       "cluster_bsdconfig_includes"
-			printf "\t\t\t\tbgcolor = \"%s\";\n", bgcolor
-			printf "\t\t\t\tlabel = \"bsdconfig\";\n"
-			created++
+	done | awk \
+		-v bgcolor="$bgcolor_bsdconfig" \
+		-v msg_subroutines="$msg_subroutines" \
+	'
+		BEGIN { created = 0 }
+		function end_subgraph() { printf "\t};\n" }
+		( $0 !~ "/" ) {
+			if ( ! created )
+			{
+				printf "\tsubgraph \"%s\" {\n",
+				       "cluster_bsdconfig_includes"
+				printf "\t\tbgcolor = \"%s\";\n", bgcolor
+				printf "\t\tlabel = \"bsdconfig %s\";\n",
+				       msg_subroutines
+				created++
+			}
+			printf "\t\t\"%s\";\n", $1
 		}
-		printf "\t\t\t\t\"%s\";\n", $1
-	}
-	END { created && end_subgraph() }'
+		END { created && end_subgraph() }
+	' # END-QUOTE
 
 	for include_file in $include_file_list; do
 		echo $include_file
-	done | awk '
+	done | awk -v msg_subroutines="$msg_subroutines" '
 	BEGIN { created = 0 }
-	function end_subgraph() { printf "\t\t\t};\n" }
+	function end_subgraph() { printf "\t};\n" }
 	( $0 ~ "/" ) {
 		include_dir_tmp = $1
 		sub("/[^/]*$", "", include_dir_tmp)
@@ -588,20 +585,18 @@ if [ "$SHOW_INCLUDES" ]; then
 		if ( ! created )
 		{
 			include_dir = include_dir_tmp
-			printf "\t\t\tsubgraph \"cluster_%s_includes\" {\n",
+			printf "\tsubgraph \"cluster_%s_includes\" {\n",
 			       include_dir
-			printf "\t\t\t\tbgcolor = \"white\";\n"
-			printf "\t\t\t\tlabel = \"%s\";\n", include_dir
+			printf "\t\tbgcolor = \"thistle\";\n"
+			printf "\t\tlabel = \"%s %s\";\n", include_dir,
+			       msg_subroutines
 			created++
 		}
 
-		printf "\t\t\t\t\"%s\";\n", $1
+		printf "\t\t\"%s\";\n", $1
 	}
 	END { created && end_subgraph() }'
-
-	printf '\t\t};\n'
 fi
-end_nodelist
 for INDEX in */INDEX; do
 	menu_title=
 	menu_help=
@@ -676,7 +671,7 @@ for INDEX in */INDEX; do
 	end_nodelist
 done
 
-printf '\n};\n'
+printf '\n}\n'
 
 ################################################################################
 # END
diff --git a/usr.sbin/bsdconfig/dot/include/messages.subr b/usr.sbin/bsdconfig/dot/include/messages.subr
index 527f30885ab0..f1095f7e4995 100644
--- a/usr.sbin/bsdconfig/dot/include/messages.subr
+++ b/usr.sbin/bsdconfig/dot/include/messages.subr
@@ -28,3 +28,4 @@ msg_graph_label_with_command="bsdconfig(8)\\\ndot(1) output generated by \`\`%s'
 msg_graph_label_with_command_and_date="bsdconfig(8)\\\ndot(1) output generated by \`\`%s'' on\\\n%s"
 msg_includes="Includes"
 msg_shortcuts="Shortcuts"
+msg_subroutines="Subroutines"
diff --git a/usr.sbin/bsdconfig/examples/Makefile b/usr.sbin/bsdconfig/examples/Makefile
index d8813ce2646b..156ccaff9ace 100644
--- a/usr.sbin/bsdconfig/examples/Makefile
+++ b/usr.sbin/bsdconfig/examples/Makefile
@@ -3,7 +3,7 @@
 NO_OBJ=
 
 FILESDIR=	${SHAREDIR}/examples/bsdconfig
-FILES=		browse_packages_ftp.sh browse_packages_http.sh bsdconfigrc
+FILES=		add_some_packages.sh browse_packages_http.sh bsdconfigrc
 
 beforeinstall:
 	mkdir -p ${DESTDIR}${FILESDIR}
diff --git a/usr.sbin/bsdconfig/examples/add_some_packages.sh b/usr.sbin/bsdconfig/examples/add_some_packages.sh
new file mode 100755
index 000000000000..8750908dbb2c
--- /dev/null
+++ b/usr.sbin/bsdconfig/examples/add_some_packages.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# $FreeBSD$
+#
+# This sample installs a short list of packages from the main HTTP site.
+#
+[ "$_SCRIPT_SUBR" ] || . /usr/share/bsdconfig/script.subr || exit 1
+nonInteractive=1
+_httpPath=http://pkg.freebsd.org
+mediaSetHTTP
+mediaOpen
+for package in wget bash rsync; do
+	packageAdd
+done
diff --git a/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh b/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh
deleted file mode 100755
index 015d799f801c..000000000000
--- a/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-# This sample downloads the package INDEX file from FTP to /tmp (if it doesn't
-# already exist) and then displays the package configuration/management screen
-# using the local INDEX file (results in faster browsing of packages from-start
-# since the INDEX can be loaded from local media).
-#
-# NOTE: Packages cannot be installed unless staged to /tmp/packages/All
-#
-. /usr/share/bsdconfig/script.subr
-nonInteractive=1
-TMPDIR=/tmp
-if [ ! -e "$TMPDIR/packages/INDEX" ]; then
-	[ -d "$TMPDIR/packages" ] || mkdir -p "$TMPDIR/packages" || exit 1
-	_ftpPath=ftp://ftp.freebsd.org
-	# For older releases, use ftp://ftp-archive.freebsd.org
-	mediaSetFTP
-	mediaOpen
-	f_show_info "Downloading packages/INDEX from\n %s" "$_ftpPath" 
-	f_device_get device_media packages/INDEX > $TMPDIR/packages/INDEX
-fi
-_directoryPath=$TMPDIR
-mediaSetDirectory
-configPackages
diff --git a/usr.sbin/bsdconfig/examples/browse_packages_http.sh b/usr.sbin/bsdconfig/examples/browse_packages_http.sh
index a0e68013ad3a..91b928d183bb 100755
--- a/usr.sbin/bsdconfig/examples/browse_packages_http.sh
+++ b/usr.sbin/bsdconfig/examples/browse_packages_http.sh
@@ -1,25 +1,32 @@
 #!/bin/sh
 # $FreeBSD$
 #
-# This sample downloads the package INDEX file from HTTP to /tmp (if it doesn't
-# already exist) and then displays the package configuration/management screen
-# using the local INDEX file (results in faster browsing of packages from-start
-# since the INDEX can be loaded from local media).
+# This sample downloads the package digests.txz and packagesite.txz files from
+# HTTP to /tmp (if they don't already exist) and then displays the package
+# configuration/management screen using the local files (resulting in faster
+# browsing of packages from-start since digests.txz/packagesite.txz can be
+# loaded from local media).
 #
-# NOTE: Packages cannot be installed unless staged to /tmp/packages/All
+# NOTE: Packages cannot be installed unless staged to
+#       /tmp/packages/$PKG_ABI/All
 #
-. /usr/share/bsdconfig/script.subr
+[ "$_SCRIPT_SUBR" ] || . /usr/share/bsdconfig/script.subr || exit 1
 nonInteractive=1
+f_musthavepkg_init # Make sure we have a usable pkg(8) with $PKG_ABI
 TMPDIR=/tmp
-if [ ! -e "$TMPDIR/packages/INDEX" ]; then
-	[ -d "$TMPDIR/packages" ] || mkdir -p "$TMPDIR/packages" || exit 1
-	_httpPath=http://ftp.freebsd.org
-	# For older releases, use http://ftp-archive.freebsd.org
-	mediaSetHTTP
-	mediaOpen
-	f_show_info "Downloading packages/INDEX from\n %s" "$_httpPath"
-	f_device_get device_media packages/INDEX > $TMPDIR/packages/INDEX
-fi
+PKGDIR=$TMPDIR/packages/$PKG_ABI
+[ -d "$PKGDIR" ] || mkdir -p "$PKGDIR" || exit 1
+for file in digests.txz packagesite.txz; do
+	[ -s "$PKGDIR/$file" ] && continue
+	if [ ! "$HTTP_INITIALIZED" ]; then
+		_httpPath=http://pkg.freebsd.org
+		mediaSetHTTP
+		mediaOpen
+	fi
+	f_show_info "Downloading %s from\n %s" "$file" "$_httpPath"
+	f_device_get device_media "/$PKG_ABI/latest/$file" > $PKGDIR/$file ||
+		exit 1
+done
 _directoryPath=$TMPDIR
 mediaSetDirectory
 configPackages
diff --git a/usr.sbin/bsdconfig/include/messages.subr b/usr.sbin/bsdconfig/include/messages.subr
index bf16e0875586..3d6aad0cec8d 100644
--- a/usr.sbin/bsdconfig/include/messages.subr
+++ b/usr.sbin/bsdconfig/include/messages.subr
@@ -57,6 +57,7 @@ msg_back="Back"
 msg_becoming_root_via_sudo="Becoming root via sudo(8)..."
 msg_benchmarks_desc="Utilities for measuring system performance."
 msg_biology_desc="Software related to biology."
+msg_bootstrapping_pkg="Bootstrapping pkg(8)..."
 msg_brazil="Brazil"
 msg_building_package_menus="Building package menu(s)..."
 msg_cad_desc="Computer Aided Design utilities."
@@ -142,8 +143,6 @@ msg_generating_index_from_pkg_database="Generating INDEX from pkg(8) database\n(
 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."
@@ -219,6 +218,7 @@ msg_misc_desc="Miscellaneous utilities."
 msg_missing_ftp_host_or_directory="Missing FTP host or directory specification.  FTP media not initialized."
 msg_multimedia_desc="Multimedia software."
 msg_must_be_root_to_execute="%s: must be root to execute"
+msg_must_have_pkg_to_execute="%s: must have pkg(8) to execute"
 msg_must_specify_a_host_name_of_some_sort="Must specify a host name of some sort!"
 msg_name_server="Name server"
 msg_net_desc="Networking utilities."
@@ -274,6 +274,7 @@ msg_perl5_desc="Utilities/modules for the PERL5 language."
 msg_permission_denied="%s: %s: Permission denied"
 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_pkg_not_yet_installed_install_now="pkg(8) not yet installed. Install now?"
 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):"
@@ -376,15 +377,13 @@ 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(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?"
+msg_url_was_not_found="%s was not found,\nmaybe directory or release-version are wrong?"
 msg_usa="USA"
 msg_usage="Usage"
 msg_usb="USB"
diff --git a/usr.sbin/bsdconfig/share/common.subr b/usr.sbin/bsdconfig/share/common.subr
index 762fd39e0342..57c4125c1f97 100644
--- a/usr.sbin/bsdconfig/share/common.subr
+++ b/usr.sbin/bsdconfig/share/common.subr
@@ -62,12 +62,6 @@ 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.
@@ -226,6 +220,36 @@ f_have()
 	f_quietly type "$@"
 }
 
+# setvar $var_to_set [$value]
+#
+# Implement setvar for shells unlike FreeBSD sh(1).
+#
+if ! f_have setvar; then
+setvar()
+{
+	[ $# -gt 0 ] || return $SUCCESS
+	local __setvar_var_to_set="$1" __setvar_right="$2" __setvar_left=
+	case $# in
+	1) unset "$__setvar_var_to_set"
+	   return $? ;;
+	2) : fall through ;;
+	*) f_err "setvar: too many arguments\n"
+	   return $FAILURE
+	esac
+	case "$__setvar_var_to_set" in *[!0-9A-Za-z_]*)
+		f_err "setvar: %s: bad variable name\n" "$__setvar_var_to_set"
+		return 2
+	esac
+	while case "$__setvar_r" in *\'*) : ;; *) false ; esac
+	do
+		__setvar_left="$__setvar_left${__setvar_right%%\'*}'\\''"
+		__setvar_right="${__setvar_right#*\'}"
+	done
+	__setvar_left="$__setvar_left${__setvar_right#*\'}"
+	eval "$__setvar_var_to_set='$__setvar_left'"
+}
+fi
+
 # f_which $anything [$var_to_set]
 #
 # A fast built-in replacement for syntaxes such as foo=$( which bar ). In a
diff --git a/usr.sbin/bsdconfig/share/dialog.subr b/usr.sbin/bsdconfig/share/dialog.subr
index e0dfe8063633..49e72ee575e1 100644
--- a/usr.sbin/bsdconfig/share/dialog.subr
+++ b/usr.sbin/bsdconfig/share/dialog.subr
@@ -1557,12 +1557,22 @@ f_dialog_info()
 # EOF. This implies that you must execute this either as an rvalue to a pipe,
 # lvalue to indirection or in a sub-shell that provides data on stdin.
 #
+# To open an Xdialog(1) infobox that does not disappear until expeclitly dis-
+# missed, use the following:
+#
+# 	f_xdialog_info "$info_text" < /dev/tty &
+# 	pid=$!
+# 	# Perform some lengthy actions
+# 	kill $pid
+#
+# NB: Check $USE_XDIALOG if you need to support both dialog(1) and Xdialog(1).
+#
 f_xdialog_info()
 {
 	local info_text="$*" height width
 	f_dialog_infobox_size height width \
 		"$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$info_text"
-	$DIALOG \
+	exec $DIALOG \
 		--title "$DIALOG_TITLE"               \
 		--backtitle "$DIALOG_BACKTITLE"       \
 		--no-close --no-buttons               \
@@ -2099,9 +2109,13 @@ f_dialog_init()
 	#
 	# Process stored command-line arguments
 	#
+	# NB: Using backticks instead of $(...) for portability since Linux
+	#     bash(1) balks at the right parentheses encountered in the case-
+	#     statement (incorrectly interpreting it as the close of $(...)).
+	#
 	f_dprintf "f_dialog_init: ARGV=[%s] GETOPTS_STDARGS=[%s]" \
 	          "$ARGV" "$GETOPTS_STDARGS"
-	SECURE=$( set -- $ARGV
+	SECURE=`set -- $ARGV
 		while getopts \
 			"$GETOPTS_STDARGS$GETOPTS_EXTRA$GETOPTS_ALLFLAGS" \
 		flag > /dev/null; do
@@ -2109,8 +2123,8 @@ f_dialog_init()
 			S) echo 1 ;;
 			esac
 		done
-	)
-	USE_XDIALOG=$( set -- $ARGV
+	` # END-BACKTICK
+	USE_XDIALOG=`set -- $ARGV
 		while getopts \
 			"$GETOPTS_STDARGS$GETOPTS_EXTRA$GETOPTS_ALLFLAGS" \
 		flag > /dev/null; do
@@ -2118,7 +2132,7 @@ f_dialog_init()
 			S|X) echo 1 ;;
 			esac
 		done
-	)
+	` # END-BACKTICK
 	f_dprintf "f_dialog_init: SECURE=[%s] USE_XDIALOG=[%s]" \
 	          "$SECURE" "$USE_XDIALOG"
 
diff --git a/usr.sbin/bsdconfig/share/media/http.subr b/usr.sbin/bsdconfig/share/media/http.subr
index 6d6aa10433b4..b928f7d6a78f 100644
--- a/usr.sbin/bsdconfig/share/media/http.subr
+++ b/usr.sbin/bsdconfig/share/media/http.subr
@@ -515,10 +515,7 @@ f_media_init_http()
 			fi
 		esac
 
-		if [ $http_found -eq $SUCCESS ]; then
-			HTTP_INITIALIZED=YES
-			break
-		fi
+		[ $http_found -eq $SUCCESS ] && HTTP_INITIALIZED=YES break
 
 		f_getvar $VAR_HTTP_PATH http_path
 		f_show_msg "$msg_please_check_the_url_and_try_again" \
@@ -668,7 +665,7 @@ f_media_get_http()
 	 44) f_show_msg "$msg_url_was_not_found" "$url" ;;
 	  4) f_show_msg "$msg_client_error" ;;
 	  *) f_show_msg "$msg_error_when_requesting_url" "$url" ;;
-	esac
+	esac 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
 	return $FAILURE
 }
 
diff --git a/usr.sbin/bsdconfig/share/media/httpproxy.subr b/usr.sbin/bsdconfig/share/media/httpproxy.subr
index 66e5be4a9934..1ef516f76463 100644
--- a/usr.sbin/bsdconfig/share/media/httpproxy.subr
+++ b/usr.sbin/bsdconfig/share/media/httpproxy.subr
@@ -452,7 +452,7 @@ f_media_get_http_proxy()
 	 44) f_show_msg "$msg_url_was_not_found" "$url" ;;
 	  4) f_show_msg "$msg_client_error" ;;
 	  *) f_show_msg "$msg_error_when_requesting_url" "$url" ;;
-	esac
+	esac 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
 	return $FAILURE
 }
 
diff --git a/usr.sbin/bsdconfig/share/packages/Makefile b/usr.sbin/bsdconfig/share/packages/Makefile
index 2a0235399c1a..cb06b80ff1ea 100644
--- a/usr.sbin/bsdconfig/share/packages/Makefile
+++ b/usr.sbin/bsdconfig/share/packages/Makefile
@@ -3,7 +3,7 @@
 NO_OBJ=
 
 FILESDIR=	${SHAREDIR}/bsdconfig/packages
-FILES=		categories.subr index.subr packages.subr
+FILES=		categories.subr index.subr musthavepkg.subr packages.subr
 
 beforeinstall:
 	mkdir -p ${DESTDIR}${FILESDIR}
diff --git a/usr.sbin/bsdconfig/share/packages/categories.subr b/usr.sbin/bsdconfig/share/packages/categories.subr
old mode 100755
new mode 100644
diff --git a/usr.sbin/bsdconfig/share/packages/index.subr b/usr.sbin/bsdconfig/share/packages/index.subr
old mode 100755
new mode 100644
index 9586501228ba..35ef0dad14e1
--- a/usr.sbin/bsdconfig/share/packages/index.subr
+++ b/usr.sbin/bsdconfig/share/packages/index.subr
@@ -33,6 +33,7 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 f_dprintf "%s: loading includes..." packages/index.subr
 f_include $BSDCFG_SHARE/device.subr
 f_include $BSDCFG_SHARE/media/common.subr
+f_include $BSDCFG_SHARE/packages/musthavepkg.subr
 f_include $BSDCFG_SHARE/strings.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig"
@@ -53,27 +54,6 @@ SQLITE_REPO="/var/db/pkg/repo-packagesite.sqlite"
 #
 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 [$var_to_set]
@@ -87,13 +67,16 @@ INDEX_FORMAT="$INDEX_FORMAT|"			# disc
 f_index_initialize()
 {
 	local __funcname=f_index_initialize
-	local __var_to_set="${2:-PACKAGE_INDEX}"
+	local __var_to_set="${1:-PACKAGE_INDEX}"
 
 	[ "$_INDEX_INITTED" ] && return $SUCCESS
 
 	# Got any media?
 	f_media_verify || return $FAILURE
 
+	# Make sure we have a usable pkg(8) with $PKG_ABI
+	f_musthavepkg_init
+
 	# Does it move when you kick it?
 	f_device_init device_media || return $FAILURE
 
@@ -126,9 +109,10 @@ f_index_initialize()
 		__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_dprintf "PACKAGESITE=[%s]" "$__site"
+	if ! f_eval_catch $__funcname pkg \
+		'PACKAGESITE="%s" pkg update' "$__site"
+	then
 		f_show_err "$msg_unable_to_update_pkg_from_selected_media"
 		f_device_shutdown device_media
 		return $FAILURE
@@ -195,53 +179,8 @@ f_index_initialize()
 	# 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 device_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 device_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 )'
+	eval "$__var_to_set"='$( pkg rquery -I | sort )'
 
 	#
 	# Attempt to create the persistant on-disk cache
@@ -258,7 +197,7 @@ f_index_initialize()
 
 		# Finally, move the temporary file into place
 		case "$PACKAGES_INDEX_CACHEFILE" in
-		*/*) f_eval_catch -d $funcname mkdir \
+		*/*) f_eval_catch -d $__funcname mkdir \
 			'mkdir -p "%s"' "${PACKAGES_INDEX_CACHEFILE%/*}"
 		esac
 		f_eval_catch -d $__funcname mv 'mv -f "%s" "%s"' \
diff --git a/usr.sbin/bsdconfig/share/packages/musthavepkg.subr b/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
new file mode 100644
index 000000000000..929823e4f21e
--- /dev/null
+++ b/usr.sbin/bsdconfig/share/packages/musthavepkg.subr
@@ -0,0 +1,87 @@
+if [ ! "$_PACKAGES_MUSTHAVEPKG_SUBR" ]; then _PACKAGES_MUSTHAVEPKG_SUBR=1
+#
+# Copyright (c) 2014 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..." packages/musthavepkg.subr
+f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+
+############################################################ FUNCTIONS
+
+# f_musthavepkg_init
+#
+# Validate pkg(8) is installed and set $PKG_ABI global if not already set.
+# Returns success unless pkg(8) is not installed and user refuses to install
+# it (upon prompt when running interactively).
+#
+f_musthavepkg_init()
+{
+	local funcname=f_musthavepkg_init
+	local pkg_abi_awk='$1~/^ABI/{print $NF; exit}'
+
+	if [ "$PKG_ABI" ]; then # Already set
+		f_dprintf "PKG_ABI=[%s]" "$PKG_ABI"
+		export PKG_ABI
+		f_quietly pkg -N -vv # return status (pkg(8) functional?)
+		return $?
+	fi
+
+	# Attempt to get PKG_ABI without prematurely bootstrapping pkg(8)
+	if f_eval_catch -k PKG_ABI $funcname pkg \
+		"pkg -N -vv | awk '%s'" "$pkg_abi_awk"
+	then
+		f_dprintf "PKG_ABI=[%s]" "$PKG_ABI"
+		export PKG_ABI
+		return $SUCCESS
+	fi
+
+	# pkg(8) not yet bootstrapped; ask for permission unless nonInteractive
+	f_dialog_yesno "$msg_pkg_not_yet_installed_install_now" ||
+		f_die 1 "$msg_must_have_pkg_to_execute" "$pgm"
+
+	f_mustberoot_init # Have to be root to install pkg(8)
+
+	# Bootstrap pkg(8)
+	f_dialog_info "$msg_bootstrapping_pkg"
+	f_eval_catch -k PKG_ABI $funcname pkg \
+		"ASSUME_ALWAYS_YES=1 pkg -vv | awk '%s'" "$pkg_abi_awk" ||
+		f_die 1 "$msg_must_have_pkg_to_execute" "$pgm"
+
+	f_dprintf "PKG_ABI=[%s]" "$PKG_ABI"
+	export PKG_ABI
+	return $SUCCESS
+}
+
+############################################################ MAIN
+
+f_dprintf "%s: Successfully loaded." packages/musthavepkg.subr
+
+fi # ! $_PACKAGES_MUSTHAVEPKG_SUBR
diff --git a/usr.sbin/bsdconfig/share/packages/packages.subr b/usr.sbin/bsdconfig/share/packages/packages.subr
old mode 100755
new mode 100644
index 6fc936fe9e9d..a041fb643749
--- a/usr.sbin/bsdconfig/share/packages/packages.subr
+++ b/usr.sbin/bsdconfig/share/packages/packages.subr
@@ -36,6 +36,7 @@ f_include $BSDCFG_SHARE/device.subr
 f_include $BSDCFG_SHARE/media/common.subr
 f_include $BSDCFG_SHARE/packages/categories.subr
 f_include $BSDCFG_SHARE/packages/index.subr
+f_include $BSDCFG_SHARE/packages/musthavepkg.subr
 f_include $BSDCFG_SHARE/strings.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig"
@@ -662,7 +663,7 @@ f_package_review()
 f_package_config()
 {
 	# Did we get an INDEX?
-	f_index_initialize packages/INDEX || return $FAILURE
+	f_index_initialize || return $FAILURE
 		# Creates following variables (indirectly via f_index_read())
 		#   CATEGORY_MENU_LIST _categories_{varpkg} _rundeps_{varpkg}
 		#   PACKAGE_CATEGORIES _npkgs
@@ -839,7 +840,7 @@ f_package_add()
 	{ # Verify and initialize device media if-defined
 		f_media_verify &&
 		f_device_init device_media &&
-		f_index_initialize packages/INDEX
+		f_index_initialize
 	} || return $FAILURE
 
 	# Now we have (indirectly via f_index_read()):
@@ -946,6 +947,8 @@ f_package_extract()
 	local device="$1" name="$2" depended="$3"
 	local devname=
 
+	f_musthavepkg_init # Make sure we have a usable pkg(8) with $PKG_ABI
+
 	$device get name devname
 	f_dprintf "$funcname: device=[%s] name=[%s] depended=[%s]" \
 	          "$devname" "$name" "$depended"
@@ -1065,7 +1068,7 @@ f_package_delete()
 	{ # Verify and initialize device media if-defined
 		f_media_verify &&
 		f_device_init device_media &&
-		f_index_initialize packages/INDEX
+		f_index_initialize
 	} || return $FAILURE
 
 	# Now we have (indirectly via f_index_read()):
diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8
index b841c36df815..98bab0a52bad 100644
--- a/usr.sbin/bsdinstall/bsdinstall.8
+++ b/usr.sbin/bsdinstall/bsdinstall.8
@@ -367,5 +367,4 @@ This version of
 first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
-.An -nosplit
-.An Nathan Whitehorn Aq nwhitehorn@FreeBSD.org
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org
diff --git a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
index 4fa2e0530e28..77c682a6b94d 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
@@ -60,7 +60,8 @@ is_scheme_bootable(const char *part_type) {
 	if (strcmp(platform, "ps3") == 0 && strcmp(part_type, "GPT") == 0)
 		return (1);
 	if (strcmp(platform, "chrp") == 0 &&
-	    (strcmp(part_type, "MBR") == 0 || strcmp(part_type, "BSD") == 0))
+	    (strcmp(part_type, "MBR") == 0 || strcmp(part_type, "BSD") == 0 ||
+	     strcmp(part_type, "GPT") == 0))
 		return (1);
 
 	return (0);
@@ -68,13 +69,28 @@ is_scheme_bootable(const char *part_type) {
 
 size_t
 bootpart_size(const char *part_type) {
+	size_t platlen = sizeof(platform);
+	if (strlen(platform) == 0)
+		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
+
 	if (strcmp(part_type, "APM") == 0 || strcmp(part_type, "MBR") == 0)
 		return (800*1024);
+	if (strcmp(platform, "chrp") == 0 && strcmp(part_type, "GPT") == 0)
+		return (800*1024);
 	return (0);
 }
 
 const char *
 bootpart_type(const char *scheme) {
+	size_t platlen = sizeof(platform);
+	if (strlen(platform) == 0)
+		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
+
+	if (strcmp(platform, "chrp") == 0)
+		return ("prep-boot");
+	if (strcmp(platform, "powermac") == 0)
+		return ("apple-boot");
+
 	return ("freebsd-boot");
 }
 
@@ -85,9 +101,14 @@ bootcode_path(const char *part_type) {
 	
 const char *
 partcode_path(const char *part_type) {
+	size_t platlen = sizeof(platform);
+	if (strlen(platform) == 0)
+		sysctlbyname("hw.platform", platform, &platlen, NULL, -1);
+
 	if (strcmp(part_type, "APM") == 0)
 		return ("/boot/boot1.hfs");
-	if (strcmp(part_type, "MBR") == 0)
+	if (strcmp(part_type, "MBR") == 0 ||
+	    (strcmp(platform, "chrp") == 0 && strcmp(part_type, "GPT") == 0))
 		return ("/boot/boot1.elf");
 	return (NULL);
 }
diff --git a/usr.sbin/bsdinstall/partedit/partedit_x86.c b/usr.sbin/bsdinstall/partedit/partedit_x86.c
index 156674bda0d4..b458475fe6c6 100644
--- a/usr.sbin/bsdinstall/partedit/partedit_x86.c
+++ b/usr.sbin/bsdinstall/partedit/partedit_x86.c
@@ -69,7 +69,7 @@ bootpart_size(const char *scheme) {
 		return (0);
 
 	if (strcmp(platform, "BIOS") == 0)
-		return (64*1024);
+		return (512*1024);
 	else 
 		return (800*1024);
 
diff --git a/usr.sbin/bsdinstall/partedit/sade.8 b/usr.sbin/bsdinstall/partedit/sade.8
index 441ddc02ab90..79df079e371b 100644
--- a/usr.sbin/bsdinstall/partedit/sade.8
+++ b/usr.sbin/bsdinstall/partedit/sade.8
@@ -64,12 +64,11 @@ installer. It was replaced in
 with the equivalent part of
 .Xr bsdinstall 8 .
 .Sh AUTHORS
-.An Nathan Whitehorn Aq nwhitehorn@FreeBSD.org
+.An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org
 .Sh BUGS
 The utility misses a lot of nice features, such as tools for
 manipulating
 .Xr gmirror 8
 or
-.Xr zfs 8
-.
+.Xr zfs 8 .
 These will be added later.
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
index c2d8fc054771..d2ac83ddeaa3 100755
--- a/usr.sbin/bsdinstall/scripts/auto
+++ b/usr.sbin/bsdinstall/scripts/auto
@@ -35,11 +35,15 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 ############################################################ FUNCTIONS
 
 error() {
+	local msg
+	if [ -n "$1" ]; then
+		msg="$1\n\n"
+	fi
 	test -n "$DISTDIR_IS_UNIONFS" && umount -f $BSDINSTALL_DISTDIR
 	test -f $PATH_FSTAB && bsdinstall umount
 	dialog --backtitle "FreeBSD Installer" --title "Abort" \
 	    --no-label "Exit" --yes-label "Restart" --yesno \
-	    "An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0
+	    "${msg}An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0
 	if [ $? -ne 0 ]; then
 		exit 1
 	else
@@ -58,7 +62,7 @@ trap true SIGINT	# This section is optional
 bsdinstall keymap
 
 trap error SIGINT	# Catch cntrl-C here
-bsdinstall hostname || error
+bsdinstall hostname || error "Set hostname failed"
 
 export DISTRIBUTIONS="base.txz kernel.txz"
 if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
@@ -95,7 +99,7 @@ if [ -n "$FETCH_DISTRIBUTIONS" ]; then
 	BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3)
 	MIRROR_BUTTON=$?
 	exec 3>&-
-	test $MIRROR_BUTTON -eq 0 || error
+	test $MIRROR_BUTTON -eq 0 || error "No mirror selected"
 	export BSDINSTALL_DISTSITE
 fi
 
@@ -125,8 +129,8 @@ exec 3>&-
 
 case "$PARTMODE" in
 "Guided")	# Guided
-	bsdinstall autopart || error
-	bsdinstall mount || error
+	bsdinstall autopart || error "Partitioning error"
+	bsdinstall mount || error "Failed to mount filesystem"
 	;;
 "Shell")	# Shell
 	clear
@@ -136,18 +140,18 @@ case "$PARTMODE" in
 "Manual")	# Manual
 	if f_isset debugFile; then
 		# Give partedit the path to our logfile so it can append
-		BSDINSTALL_LOG="${debugFile#+}" bsdinstall partedit || error
+		BSDINSTALL_LOG="${debugFile#+}" bsdinstall partedit || error "Partitioning error"
 	else
-		bsdinstall partedit || error
+		bsdinstall partedit || error "Partitioning error"
 	fi
-	bsdinstall mount || error
+	bsdinstall mount || error "Failed to mount filesystem"
 	;;
 "ZFS")	# ZFS
-	bsdinstall zfsboot || error
-	bsdinstall mount || error
+	bsdinstall zfsboot || error "ZFS setup failed"
+	bsdinstall mount || error "Failed to mount filesystem"
 	;;
 *)
-	error
+	error "Unknown partitioning mode"
 	;;
 esac
 
@@ -156,7 +160,7 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
 
 	# Download to a directory in the new system as scratch space
 	BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist"
-	mkdir -p "$BSDINSTALL_FETCHDEST" || error
+	mkdir -p "$BSDINSTALL_FETCHDEST" || error "Could not create directory $BSDINSTALL_FETCHDEST"
 
 	export DISTRIBUTIONS="$FETCH_DISTRIBUTIONS"
 	# Try to use any existing distfiles
@@ -169,13 +173,13 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
 	fi
 		
 	export FTP_PASSIVE_MODE=YES
-	bsdinstall distfetch || error
+	bsdinstall distfetch || error "Failed to fetch distribution"
 	export DISTRIBUTIONS="$ALL_DISTRIBUTIONS"
 fi
 
-bsdinstall checksum || error
-bsdinstall distextract || error
-bsdinstall rootpass || error
+bsdinstall checksum || error "Distribution checksum failed"
+bsdinstall distextract || error "Distribution extract failed"
+bsdinstall rootpass || error "Could not set root password"
 
 trap true SIGINT	# This section is optional
 if [ "$NETCONFIG_DONE" != yes ]; then
@@ -239,7 +243,7 @@ finalconfig() {
 finalconfig
 
 trap error SIGINT	# SIGINT is bad again
-bsdinstall config  || error
+bsdinstall config  || error "Failed to save config"
 
 if [ ! -z "$BSDINSTALL_FETCHDEST" ]; then
 	[ "$BSDINSTALL_FETCHDEST" != "$BSDINSTALL_DISTDIR" ] && \
diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail
index e709145dd8dc..cb86060b03fd 100755
--- a/usr.sbin/bsdinstall/scripts/jail
+++ b/usr.sbin/bsdinstall/scripts/jail
@@ -38,9 +38,13 @@ f_dprintf "Began Installation at %s" "$( date )"
 export BSDINSTALL_CHROOT=$1
 
 error() {
+	local msg
+	if [ -n "$1" ]; then
+		msg="$1\n\n"
+	fi
 	dialog --backtitle "FreeBSD Installer" --title "Abort" \
 	    --no-label "Exit" --yes-label "Restart" --yesno \
-	    "An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0
+	    "${msg}An installation step has been aborted. Would you like to restart the installation or exit the installer?" 0 0
 	if [ $? -ne 0 ]; then
 		exit
 	else
@@ -51,7 +55,7 @@ error() {
 
 rm -rf $BSDINSTALL_TMPETC
 mkdir $BSDINSTALL_TMPETC
-mkdir -p $1 || error
+mkdir -p $1 || error "mkdir failed for $1"
 
 test ! -d $BSDINSTALL_DISTDIR && mkdir -p $BSDINSTALL_DISTDIR
 
@@ -60,9 +64,9 @@ if [ ! -f $BSDINSTALL_DISTDIR/MANIFEST -a -z "$BSDINSTALL_DISTSITE" ]; then
 	BSDINSTALL_DISTSITE=$(`dirname $0`/mirrorselect 2>&1 1>&3)
 	MIRROR_BUTTON=$?
 	exec 3>&-
-	test $MIRROR_BUTTON -eq 0 || error
+	test $MIRROR_BUTTON -eq 0 || error "No mirror selected"
 	export BSDINSTALL_DISTSITE
-	fetch -o $BSDINSTALL_DISTDIR/MANIFEST $BSDINSTALL_DISTSITE/MANIFEST || error
+	fetch -o $BSDINSTALL_DISTDIR/MANIFEST $BSDINSTALL_DISTSITE/MANIFEST || error "Could not download $BSDINSTALL_DISTSITE/MANIFEST"
 fi
 
 export DISTRIBUTIONS="base.txz"
@@ -94,17 +98,17 @@ if [ -n "$FETCH_DISTRIBUTIONS" -a -z "$BSDINSTALL_DISTSITE" ]; then
 	BSDINSTALL_DISTSITE=`bsdinstall mirrorselect 2>&1 1>&3`
 	MIRROR_BUTTON=$?
 	exec 3>&-
-	test $MIRROR_BUTTON -eq 0 || error
+	test $MIRROR_BUTTON -eq 0 || error "No mirror selected"
 	export BSDINSTALL_DISTSITE
 fi
 
 if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
-	bsdinstall distfetch || error
+	bsdinstall distfetch || error "Failed to fetch distribution"
 fi
 
-bsdinstall checksum || error
-bsdinstall distextract || error
-bsdinstall rootpass || error
+bsdinstall checksum || error "Distribution checksum failed"
+bsdinstall distextract || error "Distribution extract failed"
+bsdinstall rootpass || error "Could not set root password"
 
 trap true SIGINT	# This section is optional
 bsdinstall services
@@ -114,7 +118,7 @@ dialog --backtitle "FreeBSD Installer" --title "Add User Accounts" --yesno \
     bsdinstall adduser
 
 trap error SIGINT	# SIGINT is bad again
-bsdinstall config  || error
+bsdinstall config  || error "Failed to save config"
 cp /etc/resolv.conf $1/etc
 cp /etc/localtime $1/etc
 
diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect
index ef17cfe61a2c..af87f443653b 100755
--- a/usr.sbin/bsdinstall/scripts/mirrorselect
+++ b/usr.sbin/bsdinstall/scripts/mirrorselect
@@ -158,6 +158,7 @@ MIRROR_BUTTON=$?
 exec 3>&-
 
 _UNAME_R=`uname -r`
+_UNAME_R=${_UNAME_R%-p*}
 
 case ${_UNAME_R} in
 	*-CURRENT|*-STABLE|*-PRERELEASE)
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
index f8644f4f8ec3..b8e66a69ef07 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
@@ -584,7 +584,7 @@ bridge_get_basemac(const char *bif_name, u_char *mac, size_t mlen)
 
 		/*
 		 * Not just casting because of alignment constraints
-		 * on sparc64 and ia64.
+		 * on sparc64.
 		 */
 		bcopy(ifa->ifa_addr, &sdl, sizeof(struct sockaddr_dl));
 
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3 b/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
index b77b5f7ed6f5..677a276c1897 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3
@@ -116,4 +116,4 @@ This is the private BEGEMOT-BRIDGE-MIB that is implemented by this module.
 .Xr ifconfig 8 ,
 .Xr snmpmod 3
 .Sh AUTHORS
-.An Shteryana Shopova Aq syrinx@FreeBSD.org
+.An Shteryana Shopova Aq Mt syrinx@FreeBSD.org
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3 b/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3
index 6c0aba3b5b29..44a1590562b3 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3
+++ b/usr.sbin/bsnmpd/modules/snmp_hast/snmp_hast.3
@@ -67,4 +67,4 @@ configuration file.
 .Xr hastctl 8 ,
 .Xr hastd 8
 .Sh AUTHORS
-.An Mikolaj Golub Aq trociny@FreeBSD.org
+.An Mikolaj Golub Aq Mt trociny@FreeBSD.org
diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3 b/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
index 774c027dafca..73036c0ed3f0 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
+++ b/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3
@@ -85,4 +85,4 @@ This is the MIB that is implemented by this module.
 .Xr gensnmptree 1 ,
 .Xr snmpmod 3
 .Sh AUTHORS
-.An Victor Cruceru Aq soc-victor@FreeBSD.org
+.An Victor Cruceru Aq Mt soc-victor@FreeBSD.org
diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.3 b/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.3
index da095ee7eb47..cd9d5796d4cb 100644
--- a/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.3
+++ b/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.3
@@ -57,4 +57,4 @@ The private BEGEMOT-LM75-MIB that is implemented by this module.
 .Xr snmpmod 3 ,
 .Xr lm75 4
 .Sh AUTHORS
-.An Luiz Otavio O Souza Aq loos@FreeBSD.org .
+.An Luiz Otavio O Souza Aq Mt loos@FreeBSD.org
diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c b/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c
index 386dc5f885e1..1822f7801e80 100644
--- a/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c
+++ b/usr.sbin/bsnmpd/modules/snmp_lm75/snmp_lm75.c
@@ -140,7 +140,7 @@ sysctlname(int *oid, int nlen, char *name, size_t len)
 {
 	int mib[12];
 
-	if (nlen > (int)sizeof(mib) + 2)
+	if (nlen > (int)(sizeof(mib) / sizeof(int) - 2))
 		return (-1);
 
 	mib[0] = 0;
@@ -158,7 +158,7 @@ sysctlgetnext(int *oid, int nlen, int *next, size_t *nextlen)
 {
 	int mib[12];
 
-	if (nlen  > (int)sizeof(mib) + 2)
+	if (nlen > (int)(sizeof(mib) / sizeof(int) - 2))
 		return (-1);
 
 	mib[0] = 0;
@@ -172,7 +172,7 @@ sysctlgetnext(int *oid, int nlen, int *next, size_t *nextlen)
 }
 
 static int
-update_sensor_sysctl(char *obuf, size_t *obuflen, int idx, const char *name)
+update_sensor_sysctl(void *obuf, size_t *obuflen, int idx, const char *name)
 {
 	char buf[LM75BUF];
 	int mib[5];
@@ -180,10 +180,13 @@ update_sensor_sysctl(char *obuf, size_t *obuflen, int idx, const char *name)
 
 	/* Fill out the mib information. */
 	snprintf(buf, sizeof(buf) - 1, "dev.lm75.%d.%s", idx, name);
-	len = 4;
+	len = sizeof(mib) / sizeof(int);
 	if (sysctlnametomib(buf, mib, &len) == -1)
 		return (-1);
 
+	if (len != 4)
+		return (-1);
+
 	/* Read the sysctl data. */
 	if (sysctl(mib, len, obuf, obuflen, NULL, 0) == -1)
 		return (-1);
@@ -210,22 +213,18 @@ update_sensor(struct lm75_snmp_sensor *sensor, int idx)
 }
 
 static int
-add_sensor(char *buf, size_t nlen)
+add_sensor(char *buf)
 {
-	int idx, mib[5], temp;
+	int idx, temp;
 	size_t len;
 	struct lm75_snmp_sensor *sensor;
 
 	if (sscanf(buf, "dev.lm75.%d.temperature", &idx) != 1)
 		return (-1);
 
-	/* Fill out the mib information. */
-	if (sysctlnametomib(buf, mib, &nlen) == -1)
-		return (-1);
-
 	/* Read the sensor temperature. */
 	len = sizeof(temp);
-	if (sysctl(mib, nlen, &temp, &len, NULL, 0) == -1)
+	if (update_sensor_sysctl(&temp, &len, idx, "temperature") != 0)
 		return (-1);
 
 	/* Add the sensor data to the table. */
@@ -323,7 +322,7 @@ update_sensors(void)
 			continue;
 
 		if (strstr(buf, "temperature"))
-			if (add_sensor(buf, len) != 0) {
+			if (add_sensor(buf) != 0) {
 				free(oid);
 				return (-1);
 			}
diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3 b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
index 9d9e5991008e..d40aef5e2425 100644
--- a/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
+++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
@@ -433,4 +433,4 @@ This is the MIB that is implemented by this module.
 .Xr gensnmptree 1 ,
 .Xr snmpmod 3
 .Sh AUTHORS
-.An Hartmut Brandt Aq harti@FreeBSD.org
+.An Hartmut Brandt Aq Mt harti@FreeBSD.org
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3 b/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3
index 6c6af4708e7c..205f11fd26fc 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3
@@ -157,4 +157,4 @@ The private BEGEMOT-WIRELESS-MIB that is implemented by this module.
 .Xr ifconfig 8 ,
 .Xr snmpmod 3
 .Sh AUTHORS
-.An Shteryana Shopova Aq syrinx@FreeBSD.org
+.An Shteryana Shopova Aq Mt syrinx@FreeBSD.org
diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1 b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1
index 41e505696a30..a2a118679f40 100644
--- a/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1
+++ b/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1
@@ -430,4 +430,4 @@ SNMPv3 is the default version to use for outgoing requests.
 .Sh SEE ALSO
 .Xr gensnmpdef 1
 .Sh AUTHORS
-.An Shteryana Shopova Aq syrinx@FreeBSD.org
+.An Shteryana Shopova Aq Mt syrinx@FreeBSD.org
diff --git a/usr.sbin/btxld/btxld.8 b/usr.sbin/btxld/btxld.8
index 5b514f619cbd..cfa4623e49d9 100644
--- a/usr.sbin/btxld/btxld.8
+++ b/usr.sbin/btxld/btxld.8
@@ -95,4 +95,4 @@ combined .text and .data segments of the client image.
 .Xr ld 1 ,
 .Xr boot 8
 .Sh AUTHORS
-.An Robert Nordier Aq rnordier@FreeBSD.org .
+.An Robert Nordier Aq Mt rnordier@FreeBSD.org
diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile
index a505e3a3e4a2..fa0dc2c094cf 100644
--- a/usr.sbin/cdcontrol/Makefile
+++ b/usr.sbin/cdcontrol/Makefile
@@ -2,7 +2,7 @@
 
 PROG= cdcontrol
 
-DPADD=	${LIBEDIT} ${LIBTERMCAP}
-LDADD=	-ledit -ltermcap
+DPADD=	${LIBEDIT} ${LIBTERMCAPW}
+LDADD=	-ledit -ltermcapw
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/chkgrp/chkgrp.8 b/usr.sbin/chkgrp/chkgrp.8
index 6a57356086b2..c0d71562b4f9 100644
--- a/usr.sbin/chkgrp/chkgrp.8
+++ b/usr.sbin/chkgrp/chkgrp.8
@@ -86,8 +86,8 @@ utility appeared in
 The
 .Nm
 utility and this manual page were written by
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
 Further functionality was added by
-.An Liam J. Foy Aq liamfoy@dragonflybsd.org .
+.An Liam J. Foy Aq Mt liamfoy@dragonflybsd.org .
 .Sh BUGS
 Should check the range of the group ID.
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile
index 97972e5684ed..7bcb67724832 100644
--- a/usr.sbin/chown/Makefile
+++ b/usr.sbin/chown/Makefile
@@ -1,8 +1,14 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	chown
 LINKS=	${BINDIR}/chown /usr/bin/chgrp
 MAN=	chgrp.1 chown.8
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/chown/tests/Makefile b/usr.sbin/chown/tests/Makefile
new file mode 100644
index 000000000000..fb13f3fb0abe
--- /dev/null
+++ b/usr.sbin/chown/tests/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/bin/chown
+
+TAP_TESTS_SH=			chown-f_test
+
+.include <bsd.test.mk>
diff --git a/usr.sbin/chown/tests/chown-f_test.sh b/usr.sbin/chown/tests/chown-f_test.sh
new file mode 100755
index 000000000000..c66b0085fc25
--- /dev/null
+++ b/usr.sbin/chown/tests/chown-f_test.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+# $FreeBSD$
+
+base=`basename $0`
+
+echo "1..1"
+
+name="chown -f root:wheel file"
+if [ `id -u` -eq 0 ]; then
+	echo "ok 1 - $name # skip Test must not be uid 0."
+else
+    touch file
+    output=$(chown -f root:wheel file 2>&1)
+    if [ $? -eq 0 -a -z "$output" ]
+    then
+        echo "ok 1 - $name"
+    else
+        echo "not ok 1 - $name"
+    fi
+    rm file
+fi
diff --git a/usr.sbin/config/config.5 b/usr.sbin/config/config.5
index 7513db1fa0ff..dfc9fc8f2c35 100644
--- a/usr.sbin/config/config.5
+++ b/usr.sbin/config/config.5
@@ -182,8 +182,6 @@ The ARM architecture.
 The AMD x86-64 architecture.
 .It Cm i386
 The Intel x86 based PC architecture.
-.It Cm ia64
-The Intel IA64 architecture.
 .It Cm mips
 The MIPS architecture.
 .It Cm pc98
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index 79520a736b31..bfaded9c0ecd 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -73,7 +73,7 @@ This flag is kept for backward compatibility.
 .It Fl I Ar path
 Search in
 .Ar path
-for any file included by the 
+for any file included by the
 .Ic include
 directive.  This option may be specified more than once.
 .It Fl d Ar destdir
diff --git a/usr.sbin/cpucontrol/cpucontrol.8 b/usr.sbin/cpucontrol/cpucontrol.8
index 0998b2056593..91946d3fd7e7 100644
--- a/usr.sbin/cpucontrol/cpucontrol.8
+++ b/usr.sbin/cpucontrol/cpucontrol.8
@@ -65,6 +65,12 @@ device
 .Ek
 .Nm
 .Op Fl vh
+.Fl i Ar level,level_type
+.Bk
+.Ar device
+.Ek
+.Nm
+.Op Fl vh
 .Op Fl d Ar datadir
 .Fl u
 .Bk
@@ -114,6 +120,9 @@ In this case the inverted value of mask will be used.
 .It Fl i Ar level
 Retrieve CPUID info.
 Level should be given as a hex number.
+.It Fl i Ar level,level_type
+Retrieve CPUID info.
+Level and level_type should be given as hex numbers.
 .It Fl u
 Apply CPU firmware updates.
 The
@@ -168,6 +177,6 @@ utility first appeared in
 The
 .Nm
 utility and this manual page was written by
-.An Stanislav Sedov Aq stas@FreeBSD.org .
+.An Stanislav Sedov Aq Mt stas@FreeBSD.org .
 .Sh BUGS
 Yes, probably, report if any.
diff --git a/usr.sbin/cpucontrol/cpucontrol.c b/usr.sbin/cpucontrol/cpucontrol.c
index c0d5a3132d8d..69fdf3aa76f2 100644
--- a/usr.sbin/cpucontrol/cpucontrol.c
+++ b/usr.sbin/cpucontrol/cpucontrol.c
@@ -99,6 +99,7 @@ static struct ucode_handler {
 static void	usage(void);
 static int	isdir(const char *path);
 static int	do_cpuid(const char *cmdarg, const char *dev);
+static int	do_cpuid_count(const char *cmdarg, const char *dev);
 static int	do_msr(const char *cmdarg, const char *dev);
 static int	do_update(const char *dev);
 static void	datadir_add(const char *path);
@@ -112,7 +113,7 @@ usage(void)
 	if (name == NULL)
 		name = "cpuctl";
 	fprintf(stderr, "Usage: %s [-vh] [-d datadir] [-m msr[=value] | "
-	    "-i level | -u] device\n", name);
+	    "-i level | -i level,level_type | -u] device\n", name);
 	exit(EX_USAGE);
 }
 
@@ -169,6 +170,57 @@ do_cpuid(const char *cmdarg, const char *dev)
 	return (0);
 }
 
+static int
+do_cpuid_count(const char *cmdarg, const char *dev)
+{
+	char *cmdarg1, *endptr, *endptr1;
+	unsigned int level, level_type;
+	cpuctl_cpuid_count_args_t args;
+	int fd, error;
+
+	assert(cmdarg != NULL);
+	assert(dev != NULL);
+
+	level = strtoul(cmdarg, &endptr, 16);
+	if (*cmdarg == '\0' || *endptr == '\0') {
+		WARNX(0, "incorrect or missing operand: %s", cmdarg);
+		usage();
+		/* NOTREACHED */
+	}
+	/* Locate the comma... */
+	cmdarg1 = strstr(endptr, ",");
+	/* ... and skip past it */
+	cmdarg1 += 1;
+	level_type = strtoul(cmdarg1, &endptr1, 16);
+	if (*cmdarg1 == '\0' || *endptr1 != '\0') {
+		WARNX(0, "incorrect or missing operand: %s", cmdarg);
+		usage();
+		/* NOTREACHED */
+	}
+
+	/*
+	 * Fill ioctl argument structure.
+	 */
+	args.level = level;
+	args.level_type = level_type;
+	fd = open(dev, O_RDONLY);
+	if (fd < 0) {
+		WARN(0, "error opening %s for reading", dev);
+		return (1);
+	}
+	error = ioctl(fd, CPUCTL_CPUID_COUNT, &args);
+	if (error < 0) {
+		WARN(0, "ioctl(%s, CPUCTL_CPUID_COUNT)", dev);
+		close(fd);
+		return (error);
+	}
+	fprintf(stdout, "cpuid level 0x%x, level_type 0x%x: 0x%.8x 0x%.8x "
+	    "0x%.8x 0x%.8x\n", level, level_type, args.data[0], args.data[1],
+	    args.data[2], args.data[3]);
+	close(fd);
+	return (0);
+}
+
 static int
 do_msr(const char *cmdarg, const char *dev)
 {
@@ -414,7 +466,10 @@ main(int argc, char *argv[])
 	c = flags & (FLAG_I | FLAG_M | FLAG_U);
 	switch (c) {
 		case FLAG_I:
-			error = do_cpuid(cmdarg, dev);
+			if (strstr(cmdarg, ",") != NULL)
+				error = do_cpuid_count(cmdarg, dev);
+			else
+				error = do_cpuid(cmdarg, dev);
 			break;
 		case FLAG_M:
 			error = do_msr(cmdarg, dev);
diff --git a/usr.sbin/cron/cron/cron.8 b/usr.sbin/cron/cron/cron.8
index 5d5a8d9a9ab9..697629f618cd 100644
--- a/usr.sbin/cron/cron/cron.8
+++ b/usr.sbin/cron/cron/cron.8
@@ -218,4 +218,4 @@ Directory for personal crontab files
 .Xr crontab 5 ,
 .Xr pam.conf 5
 .Sh AUTHORS
-.An Paul Vixie Aq paul@vix.com
+.An Paul Vixie Aq Mt paul@vix.com
diff --git a/usr.sbin/cron/cron/do_command.c b/usr.sbin/cron/cron/do_command.c
index fee4131101eb..8dfd4f66aa8f 100644
--- a/usr.sbin/cron/cron/do_command.c
+++ b/usr.sbin/cron/cron/do_command.c
@@ -481,14 +481,17 @@ child_process(e, u)
 				auto char	mailcmd[MAX_COMMAND];
 				auto char	hostname[MAXHOSTNAMELEN];
 
-				(void) gethostname(hostname, MAXHOSTNAMELEN);
+				if (gethostname(hostname, MAXHOSTNAMELEN) == -1)
+					hostname[0] = '\0';
+				hostname[sizeof(hostname) - 1] = '\0';
 				(void) snprintf(mailcmd, sizeof(mailcmd),
 					       MAILARGS, MAILCMD);
 				if (!(mail = cron_popen(mailcmd, "w", e))) {
 					warn("%s", MAILCMD);
 					(void) _exit(ERROR_EXIT);
 				}
-				fprintf(mail, "From: %s (Cron Daemon)\n", usernm);
+				fprintf(mail, "From: Cron Daemon <%s@%s>\n",
+					usernm, hostname);
 				fprintf(mail, "To: %s\n", mailto);
 				fprintf(mail, "Subject: Cron <%s@%s> %s\n",
 					usernm, first_word(hostname, "."),
diff --git a/usr.sbin/cron/crontab/crontab.1 b/usr.sbin/cron/crontab/crontab.1
index eed515ee159d..0183c39bdfa3 100644
--- a/usr.sbin/cron/crontab/crontab.1
+++ b/usr.sbin/cron/crontab/crontab.1
@@ -142,4 +142,4 @@ The new command syntax
 differs from previous versions of Vixie Cron, as well as from the classic
 SVR3 syntax.
 .Sh AUTHORS
-.An Paul Vixie Aq paul@vix.com
+.An Paul Vixie Aq Mt paul@vix.com
diff --git a/usr.sbin/cron/crontab/crontab.5 b/usr.sbin/cron/crontab/crontab.5
index 9be37df264e5..5222d2d99334 100644
--- a/usr.sbin/cron/crontab/crontab.5
+++ b/usr.sbin/cron/crontab/crontab.5
@@ -295,7 +295,7 @@ All of the
 commands that can appear in place of the first five fields
 are extensions.
 .Sh AUTHORS
-.An Paul Vixie Aq paul@vix.com
+.An Paul Vixie Aq Mt paul@vix.com
 .Sh BUGS
 If you are in one of the 70-odd countries that observe Daylight
 Savings Time, jobs scheduled during the rollback or advance may be
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.1 b/usr.sbin/crunch/crunchgen/crunchgen.1
index 66fe8f3f6df2..b9aef315e4fc 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.1
+++ b/usr.sbin/crunch/crunchgen/crunchgen.1
@@ -444,7 +444,7 @@ would also need to be copied to the install floppy.
 The
 .Nm
 utility was written by
-.An James da Silva Aq jds@cs.umd.edu .
+.An James da Silva Aq Mt jds@cs.umd.edu .
 .Pp
 Copyright (c) 1994 University of Maryland.
 All Rights Reserved.
@@ -452,9 +452,9 @@ All Rights Reserved.
 The
 .Ic libs_so
 keyword was added in 2005 by
-.An Adrian Steinmann Aq ast@marabu.ch
+.An Adrian Steinmann Aq Mt ast@marabu.ch
 and
-.An Ceri Davies Aq ceri@FreeBSD.org .
+.An Ceri Davies Aq Mt ceri@FreeBSD.org .
 .Sh CAVEATS
 While
 .Nm
diff --git a/usr.sbin/crunch/crunchide/Makefile b/usr.sbin/crunch/crunchide/Makefile
index c959a3e1b9b3..e328aa412c2c 100644
--- a/usr.sbin/crunch/crunchide/Makefile
+++ b/usr.sbin/crunch/crunchide/Makefile
@@ -12,9 +12,8 @@ CFLAGS+=-DNLIST_AOUT
 SRCS+=	exec_aout.c
 .endif
 
-.if ${TARGET_ARCH} == ia64 || ${TARGET_ARCH} == powerpc64 || \
-    ${TARGET_ARCH} == sparc64 || ${TARGET_ARCH} == amd64 || \
-    ${TARGET_ARCH:Mmips64*}
+.if ${TARGET_ARCH} == amd64 || ${TARGET_ARCH} == powerpc64 || \
+    ${TARGET_ARCH} == sparc64 || ${TARGET_ARCH:Mmips64*}
 CFLAGS+=-DNLIST_ELF64
 SRCS+=	exec_elf64.c
 exec_elf64.o: exec_elf32.c
diff --git a/usr.sbin/crunch/crunchide/crunchide.1 b/usr.sbin/crunch/crunchide/crunchide.1
index ef9947dae56c..4bdda5f451d7 100644
--- a/usr.sbin/crunch/crunchide/crunchide.1
+++ b/usr.sbin/crunch/crunchide/crunchide.1
@@ -76,12 +76,12 @@ multiple component programs.
 The
 .Nm crunch
 utility was written by
-.An James da Silva Aq jds@cs.umd.edu .
+.An James da Silva Aq Mt jds@cs.umd.edu .
 .Pp
 Copyright (c) 1994 University of Maryland.
 All Rights Reserved.
 .Pp
-.An Chris Demetriou Aq cgd@netbsd.org
+.An Chris Demetriou Aq Mt cgd@netbsd.org
 reorganized
 .Nm
 so that it supported multiple object formats, and added
diff --git a/usr.sbin/crunch/crunchide/exec_elf32.c b/usr.sbin/crunch/crunchide/exec_elf32.c
index 752007f45f26..e9bc22798bde 100644
--- a/usr.sbin/crunch/crunchide/exec_elf32.c
+++ b/usr.sbin/crunch/crunchide/exec_elf32.c
@@ -186,10 +186,6 @@ ELFNAMEEND(check)(int fd, const char *fn)
 #endif
 	case EM_MIPS: break;
 	case /* EM_MIPS_RS3_LE */ EM_MIPS_RS4_BE: break;
-#ifndef EM_IA_64
-#define	EM_IA_64	50
-#endif
-	case EM_IA_64: break;
 #ifndef EM_PPC
 #define	EM_PPC		20
 #endif
diff --git a/usr.sbin/ctladm/ctladm.8 b/usr.sbin/ctladm/ctladm.8
index 005225c41a9c..f58a760f39d3 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 October 30, 2013
+.Dd July 9, 2014
 .Dt CTLADM 8
 .Os
 .Sh NAME
@@ -499,7 +499,7 @@ Specify relative addressing for the starting LBA.  CTL does not support
 relative addressing, since it only works for linked commands, and CTL
 does not support linked commands.
 .It Fl i
-Tell the target to return status immediately after issuing the SYHCHRONIZE CACHE
+Tell the target to return status immediately after issuing the SYNCHRONIZE CACHE
 command rather than waiting for the cache to finish syncing.  CTL does not
 support this bit.
 .It Fl c Ar cdbsize
@@ -933,6 +933,43 @@ Display
 .Nm
 usage information.
 .El
+.Sh OPTIONS
+Number of additional configuration options may be specified for LUNs.
+Some options are global, others are backend-specific.
+.Pp
+Global options:
+.Bl -tag -width 12n
+.It Va vendor
+Specifies LUN vendor string up to 8 chars.
+.It Va product
+Specifies LUN product string up to 16 chars.
+.It Va revision
+Specifies LUN revision string up to 4 chars.
+.It Va scsiname
+Specifies LUN SCSI name string.
+.It Va eui
+Specifies LUN EUI-64 identifier.
+.It Va naa
+Specifies LUN NAA identifier.
+Either EUI or NAA identifier should be set to UNIQUE value to allow
+EXTENDED COPY command access the LUN.
+Non-unique LUN identifiers may lead to data corruption.
+.It Va insecure_tpc
+Setting to "on" allows EXTENDED COPY command sent to this LUN access
+other LUNs on this host, not accessible otherwise.
+This allows to offload copying between different iSCSI targets residing
+on the same host in trusted environments.
+.It Va unmap
+Set to "on", enables UNMAP support for the LUN.
+.El
+.Pp
+Options specific for block backend:
+.Bl -tag -width 12n
+.It Va file
+Specifies file or device name to use for backing store.
+.It Va num_threads
+Specifies number of backend threads to use for this LUN.
+.El
 .Sh EXAMPLES
 .Dl ctladm tur 0:1
 .Pp
@@ -1030,4 +1067,4 @@ The
 utility was originally written during the Winter/Spring of 2003 as an
 interface to CTL.
 .Sh AUTHORS
-.An Ken Merry Aq ken@FreeBSD.org
+.An Ken Merry Aq Mt ken@FreeBSD.org
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
index 783315524a30..c362f5cb83ef 100644
--- a/usr.sbin/ctladm/ctladm.c
+++ b/usr.sbin/ctladm/ctladm.c
@@ -95,6 +95,7 @@ typedef enum {
 	CTLADM_CMD_READ,
 	CTLADM_CMD_WRITE,
 	CTLADM_CMD_PORT,
+	CTLADM_CMD_PORTLIST,
 	CTLADM_CMD_READCAPACITY,
 	CTLADM_CMD_MODESENSE,
 	CTLADM_CMD_DUMPOOA,
@@ -190,6 +191,7 @@ static struct ctladm_opts option_table[] = {
 	{"modesense", CTLADM_CMD_MODESENSE, CTLADM_ARG_NEED_TL, "P:S:dlm:c:"},
 	{"modify", CTLADM_CMD_MODIFY, CTLADM_ARG_NONE, "b:l:s:"},
 	{"port", CTLADM_CMD_PORT, CTLADM_ARG_NONE, "lo:p:qt:w:W:x"},
+	{"portlist", CTLADM_CMD_PORTLIST, CTLADM_ARG_NONE, "f:vx"},
 	{"prin", CTLADM_CMD_PRES_IN, CTLADM_ARG_NEED_TL, "a:"},
 	{"prout", CTLADM_CMD_PRES_OUT, CTLADM_ARG_NEED_TL, "a:k:r:s:"},
 	{"read", CTLADM_CMD_READ, CTLADM_ARG_NEED_TL, rw_opts},
@@ -498,6 +500,9 @@ cctl_port_dump(int fd, int quiet, int xml, int32_t targ_port,
 		case CTL_PORT_ISCSI:
 			type = "ISCSI";
 			break;
+		case CTL_PORT_SAS:
+			type = "SAS";
+			break;
 		default:
 			type = "UNKNOWN";
 			break;
@@ -588,6 +593,7 @@ static struct ctladm_opts cctl_fe_table[] = {
 	{"scsi", CTL_PORT_SCSI, CTLADM_ARG_NONE, NULL},
 	{"internal", CTL_PORT_INTERNAL, CTLADM_ARG_NONE, NULL},
 	{"iscsi", CTL_PORT_ISCSI, CTLADM_ARG_NONE, NULL},
+	{"sas", CTL_PORT_SAS, CTLADM_ARG_NONE, NULL},
 	{"all", CTL_PORT_ALL, CTLADM_ARG_NONE, NULL},
 	{NULL, 0, 0, NULL}
 };
@@ -4073,6 +4079,269 @@ cctl_devlist(int fd, int argc, char **argv, char *combinedopt)
 	return (retval);
 }
 
+/*
+ * Port information.
+ */
+struct cctl_port {
+	uint64_t port_id;
+	char *online;
+	char *frontend_type;
+	char *name;
+	int pp, vp;
+	char *wwnn, *wwpn;
+	STAILQ_HEAD(,cctl_lun_nv) attr_list;
+	STAILQ_ENTRY(cctl_port) links;
+};
+
+struct cctl_portlist_data {
+	int num_ports;
+	STAILQ_HEAD(,cctl_port) port_list;
+	struct cctl_port *cur_port;
+	int level;
+	struct sbuf *cur_sb[32];
+};
+
+static void
+cctl_start_pelement(void *user_data, const char *name, const char **attr)
+{
+	int i;
+	struct cctl_portlist_data *portlist;
+	struct cctl_port *cur_port;
+
+	portlist = (struct cctl_portlist_data *)user_data;
+	cur_port = portlist->cur_port;
+	portlist->level++;
+	if ((u_int)portlist->level >= (sizeof(portlist->cur_sb) /
+	    sizeof(portlist->cur_sb[0])))
+		errx(1, "%s: too many nesting levels, %zd max", __func__,
+		     sizeof(portlist->cur_sb) / sizeof(portlist->cur_sb[0]));
+
+	portlist->cur_sb[portlist->level] = sbuf_new_auto();
+	if (portlist->cur_sb[portlist->level] == NULL)
+		err(1, "%s: Unable to allocate sbuf", __func__);
+
+	if (strcmp(name, "targ_port") == 0) {
+		if (cur_port != NULL)
+			errx(1, "%s: improper port element nesting", __func__);
+
+		cur_port = calloc(1, sizeof(*cur_port));
+		if (cur_port == NULL)
+			err(1, "%s: cannot allocate %zd bytes", __func__,
+			    sizeof(*cur_port));
+
+		portlist->num_ports++;
+		portlist->cur_port = cur_port;
+
+		STAILQ_INIT(&cur_port->attr_list);
+		STAILQ_INSERT_TAIL(&portlist->port_list, cur_port, links);
+
+		for (i = 0; attr[i] != NULL; i += 2) {
+			if (strcmp(attr[i], "id") == 0) {
+				cur_port->port_id = strtoull(attr[i+1], NULL, 0);
+			} else {
+				errx(1, "%s: invalid LUN attribute %s = %s",
+				     __func__, attr[i], attr[i+1]);
+			}
+		}
+	}
+}
+
+static void
+cctl_end_pelement(void *user_data, const char *name)
+{
+	struct cctl_portlist_data *portlist;
+	struct cctl_port *cur_port;
+	char *str;
+
+	portlist = (struct cctl_portlist_data *)user_data;
+	cur_port = portlist->cur_port;
+
+	if ((cur_port == NULL)
+	 && (strcmp(name, "ctlportlist") != 0))
+		errx(1, "%s: cur_port == NULL! (name = %s)", __func__, name);
+
+	if (portlist->cur_sb[portlist->level] == NULL)
+		errx(1, "%s: no valid sbuf at level %d (name %s)", __func__,
+		     portlist->level, name);
+
+	if (sbuf_finish(portlist->cur_sb[portlist->level]) != 0)
+		err(1, "%s: sbuf_finish", __func__);
+	str = strdup(sbuf_data(portlist->cur_sb[portlist->level]));
+	if (str == NULL)
+		err(1, "%s can't allocate %zd bytes for string", __func__,
+		    sbuf_len(portlist->cur_sb[portlist->level]));
+
+	if (strlen(str) == 0) {
+		free(str);
+		str = NULL;
+	}
+
+	sbuf_delete(portlist->cur_sb[portlist->level]);
+	portlist->cur_sb[portlist->level] = NULL;
+	portlist->level--;
+
+	if (strcmp(name, "frontend_type") == 0) {
+		cur_port->frontend_type = str;
+		str = NULL;
+	} else if (strcmp(name, "port_name") == 0) {
+		cur_port->name = str;
+		str = NULL;
+	} else if (strcmp(name, "online") == 0) {
+		cur_port->online = str;
+		str = NULL;
+	} else if (strcmp(name, "physical_port") == 0) {
+		cur_port->pp = strtoull(str, NULL, 0);
+	} else if (strcmp(name, "virtual_port") == 0) {
+		cur_port->vp = strtoull(str, NULL, 0);
+	} else if (strcmp(name, "wwnn") == 0) {
+		cur_port->wwnn = str;
+		str = NULL;
+	} else if (strcmp(name, "wwpn") == 0) {
+		cur_port->wwpn = str;
+		str = NULL;
+	} else if (strcmp(name, "targ_port") == 0) {
+		portlist->cur_port = NULL;
+	} else if (strcmp(name, "ctlportlist") == 0) {
+		
+	} else {
+		struct cctl_lun_nv *nv;
+
+		nv = calloc(1, sizeof(*nv));
+		if (nv == NULL)
+			err(1, "%s: can't allocate %zd bytes for nv pair",
+			    __func__, sizeof(*nv));
+
+		nv->name = strdup(name);
+		if (nv->name == NULL)
+			err(1, "%s: can't allocated %zd bytes for string",
+			    __func__, strlen(name));
+
+		nv->value = str;
+		str = NULL;
+		STAILQ_INSERT_TAIL(&cur_port->attr_list, nv, links);
+	}
+
+	free(str);
+}
+
+static void
+cctl_char_phandler(void *user_data, const XML_Char *str, int len)
+{
+	struct cctl_portlist_data *portlist;
+
+	portlist = (struct cctl_portlist_data *)user_data;
+
+	sbuf_bcat(portlist->cur_sb[portlist->level], str, len);
+}
+
+static int
+cctl_portlist(int fd, int argc, char **argv, char *combinedopt)
+{
+	struct ctl_lun_list list;
+	struct cctl_portlist_data portlist;
+	struct cctl_port *port;
+	XML_Parser parser;
+	char *port_str;
+	int port_len;
+	int dump_xml = 0;
+	int retval, c;
+	char *frontend = NULL;
+	int verbose = 0;
+
+	retval = 0;
+	port_len = 4096;
+
+	bzero(&portlist, sizeof(portlist));
+	STAILQ_INIT(&portlist.port_list);
+
+	while ((c = getopt(argc, argv, combinedopt)) != -1) {
+		switch (c) {
+		case 'f':
+			frontend = strdup(optarg);
+			break;
+		case 'v':
+			verbose++;
+			break;
+		case 'x':
+			dump_xml = 1;
+			break;
+		default:
+			break;
+		}
+	}
+
+retry:
+	port_str = malloc(port_len);
+
+	bzero(&list, sizeof(list));
+	list.alloc_len = port_len;
+	list.status = CTL_LUN_LIST_NONE;
+	list.lun_xml = port_str;
+
+	if (ioctl(fd, CTL_PORT_LIST, &list) == -1) {
+		warn("%s: error issuing CTL_PORT_LIST ioctl", __func__);
+		retval = 1;
+		goto bailout;
+	}
+
+	if (list.status == CTL_LUN_LIST_ERROR) {
+		warnx("%s: error returned from CTL_PORT_LIST ioctl:\n%s",
+		      __func__, list.error_str);
+	} else if (list.status == CTL_LUN_LIST_NEED_MORE_SPACE) {
+		port_len = port_len << 1;
+		goto retry;
+	}
+
+	if (dump_xml != 0) {
+		printf("%s", port_str);
+		goto bailout;
+	}
+
+	parser = XML_ParserCreate(NULL);
+	if (parser == NULL) {
+		warn("%s: Unable to create XML parser", __func__);
+		retval = 1;
+		goto bailout;
+	}
+
+	XML_SetUserData(parser, &portlist);
+	XML_SetElementHandler(parser, cctl_start_pelement, cctl_end_pelement);
+	XML_SetCharacterDataHandler(parser, cctl_char_phandler);
+
+	retval = XML_Parse(parser, port_str, strlen(port_str), 1);
+	XML_ParserFree(parser);
+	if (retval != 1) {
+		retval = 1;
+		goto bailout;
+	}
+
+	printf("Port Online Frontend %-12s pp vp %-18s %-18s\n",
+	    "Name", "WWNN", "WWPN");
+	STAILQ_FOREACH(port, &portlist.port_list, links) {
+		struct cctl_lun_nv *nv;
+
+		if ((frontend != NULL)
+		 && (strcmp(port->frontend_type, frontend) != 0))
+			continue;
+
+		printf("%-4ju %-6s %-8s %-12s %-2d %-2d %-18s %-18s\n",
+		    (uintmax_t)port->port_id, port->online,
+		    port->frontend_type, port->name, port->pp, port->vp,
+		    port->wwnn, port->wwpn);
+
+		if (verbose == 0)
+			continue;
+
+		STAILQ_FOREACH(nv, &port->attr_list, links) {
+			printf("      %s=%s\n", nv->name, nv->value);
+		}
+	}
+bailout:
+	free(port_str);
+
+	return (retval);
+}
+
 void
 usage(int error)
 {
@@ -4104,7 +4373,7 @@ usage(int error)
 "                            [-S serial_num] [-t dev_type]\n"
 "         ctladm remove      <-b backend> <-l lun_id> [-o name=value]\n"
 "         ctladm modify      <-b backend> <-l lun_id> <-s size_bytes>\n"
-"         ctladm devlist     [-b][-v][-x]\n"
+"         ctladm devlist     [-b backend] [-v] [-x]\n"
 "         ctladm shutdown\n"
 "         ctladm startup\n"
 "         ctladm hardstop\n"
@@ -4120,6 +4389,7 @@ usage(int error)
 "                            [-s len fmt [args]] [-c] [-d delete_id]\n"
 "         ctladm port        <-l | -o <on|off> | [-w wwnn][-W wwpn]>\n"
 "                            [-p targ_port] [-t port_type] [-q] [-x]\n"
+"         ctladm portlist    [-f frontend] [-v] [-x]\n"
 "         ctladm islist      [-v | -x]\n"
 "         ctladm islogout    <-a | -c connection-id | -i name | -p portal>\n"
 "         ctladm isterminate <-a | -c connection-id | -i name | -p portal>\n"
@@ -4429,6 +4699,9 @@ main(int argc, char **argv)
 	case CTLADM_CMD_PORT:
 		retval = cctl_port(fd, argc, argv, combinedopt);
 		break;
+	case CTLADM_CMD_PORTLIST:
+		retval = cctl_portlist(fd, argc, argv, combinedopt);
+		break;
 	case CTLADM_CMD_READCAPACITY:
 		retval = cctl_read_capacity(fd, target, lun, initid, retries,
 					    argc, argv, combinedopt);
diff --git a/usr.sbin/ctld/ctl.conf.5 b/usr.sbin/ctld/ctl.conf.5
index 35706670c0aa..0c73f64d6bf4 100644
--- a/usr.sbin/ctld/ctl.conf.5
+++ b/usr.sbin/ctld/ctl.conf.5
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 24, 2014
+.Dd July 28, 2014
 .Dt CTL.CONF 5
 .Os
 .Sh NAME
@@ -104,14 +104,14 @@ The following statements are available at the auth-group level:
 .It Ic auth-type Ao Ar type Ac
 Specifies authentication type.
 Type can be either "none", "deny", "chap", or "chap-mutual".
-In most cases it is not neccessary to set the type using this clause;
+In most cases it is not necessary to set the type using this clause;
 it is usually used to disable authentication for a given auth-group.
 .It Ic chap Ao Ar user Ac Aq Ar secret
 Specifies CHAP authentication credentials.
 .It Ic chap-mutual Ao Ar user Ac Ao Ar secret Ac Ao Ar mutualuser Ac Aq Ar mutualsecret
 Specifies mutual CHAP authentication credentials.
 Note that for any auth-group, configuration may contain either chap,
-or chap-mutual entries; it's an error to mix them.
+or chap-mutual entries; it is an error to mix them.
 .It Ic initiator-name Ao Ar initiator-name Ac
 Specifies iSCSI initiator name.
 If not defined, there will be no restrictions based on initiator
@@ -119,7 +119,7 @@ name.
 Otherwise, only initiators with names matching one of defined
 ones will be allowed to connect.
 .It Ic initiator-portal Ao Ar address Ac
-Specifies iSCSI initiator portal - IPv4 or IPv6 address.
+Specifies iSCSI initiator portal - IPv4 or IPv6 address or network.
 If not defined, there will be no restrictions based on initiator
 address.
 Otherwise, only initiators with addresses matching one of defined
@@ -158,18 +158,18 @@ without authentication.
 .It Ic auth-type Ao Ar type Ac
 Specifies authentication type.
 Type can be either "none", "deny", "chap", or "chap-mutual".
-In most cases it is not neccessary to set the type using this clause;
+In most cases it is not necessary to set the type using this clause;
 it is usually used to disable authentication for a given target.
 This clause is mutually exclusive with auth-group; one cannot use
 both in a single target.
 .It Ic chap Ao Ar user Ac Aq Ar secret
 Specifies CHAP authentication credentials.
 Note that targets must use either auth-group, or chap,
-or chap-mutual clauses; it's a configuration error to mix them in one target.
+or chap-mutual clauses; it is a configuration error to mix them in one target.
 .It Ic chap-mutual Ao Ar user Ac Ao Ar secret Ac Ao Ar mutualuser Ac Aq Ar mutualsecret
 Specifies mutual CHAP authentication credentials.
 Note that targets must use either auth-group, chap, or
-chap-mutual clauses; it's a configuration error to mix them in one target.
+chap-mutual clauses; it is a configuration error to mix them in one target.
 .It Ic initiator-name Ao Ar initiator-name Ac
 Specifies iSCSI initiator name.
 If not defined, there will be no restrictions based on initiator
@@ -283,5 +283,5 @@ The
 configuration file functionality for
 .Xr ctld 8
 was developed by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
 under sponsorship from the FreeBSD Foundation.
diff --git a/usr.sbin/ctld/ctld.8 b/usr.sbin/ctld/ctld.8
index 60ffbfcf478a..9cff3a82b422 100644
--- a/usr.sbin/ctld/ctld.8
+++ b/usr.sbin/ctld/ctld.8
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 20, 2012
+.Dd July 20, 2014
 .Dt CTLD 8
 .Os
 .Sh NAME
@@ -51,7 +51,7 @@ Then it compares the configuration with the kernel list of LUNs managed
 by previously running
 .Nm
 instances, removes LUNs no longer existing in the configuration file,
-and creates new LUNs as neccessary.
+and creates new LUNs as necessary.
 After that it listens for the incoming iSCSI connections, performs
 authentication, and, if successful, passes the connections to the kernel part
 of CTL iSCSI target, which handles it from that point.
@@ -59,13 +59,13 @@ of CTL iSCSI target, which handles it from that point.
 When it receives a SIGHUP signal, the
 .Nm
 reloads its configuration and applies the changes to the kernel.
-Changes are applied in a way that avoids unneccessary disruptions;
+Changes are applied in a way that avoids unnecessary disruptions;
 for example removing one LUN does not affect other LUNs.
 .Pp
 When exiting gracefully, the
 .Nm
 daemon removes LUNs it managed and forcibly disconnects all the clients.
-Otherwise - e.g. when killed with SIGKILL - LUNs stay configured
+Otherwise - for example, when killed with SIGKILL - LUNs stay configured
 and clients remain connected.
 .Pp
 To perform administrative actions that apply to already connected
@@ -109,5 +109,5 @@ utility exits 0 on success, and >0 if an error occurs.
 The
 .Nm
 was developed by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
 under sponsorship from the FreeBSD Foundation.
diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c
index 2cda31690ac4..c14be2124004 100644
--- a/usr.sbin/ctld/ctld.c
+++ b/usr.sbin/ctld/ctld.c
@@ -34,6 +34,7 @@
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -319,14 +320,56 @@ const struct auth_portal *
 auth_portal_new(struct auth_group *ag, const char *portal)
 {
 	struct auth_portal *ap;
+	char *net, *mask, *str, *tmp;
+	int len, dm, m;
 
 	ap = calloc(1, sizeof(*ap));
 	if (ap == NULL)
 		log_err(1, "calloc");
 	ap->ap_auth_group = ag;
 	ap->ap_initator_portal = checked_strdup(portal);
+	mask = str = checked_strdup(portal);
+	net = strsep(&mask, "/");
+	if (net[0] == '[')
+		net++;
+	len = strlen(net);
+	if (len == 0)
+		goto error;
+	if (net[len - 1] == ']')
+		net[len - 1] = 0;
+	if (strchr(net, ':') != NULL) {
+		struct sockaddr_in6 *sin6 =
+		    (struct sockaddr_in6 *)&ap->ap_sa;
+
+		sin6->sin6_len = sizeof(*sin6);
+		sin6->sin6_family = AF_INET6;
+		if (inet_pton(AF_INET6, net, &sin6->sin6_addr) <= 0)
+			goto error;
+		dm = 128;
+	} else {
+		struct sockaddr_in *sin =
+		    (struct sockaddr_in *)&ap->ap_sa;
+
+		sin->sin_len = sizeof(*sin);
+		sin->sin_family = AF_INET;
+		if (inet_pton(AF_INET, net, &sin->sin_addr) <= 0)
+			goto error;
+		dm = 32;
+	}
+	if (mask != NULL) {
+		m = strtol(mask, &tmp, 0);
+		if (m < 0 || m > dm || tmp[0] != 0)
+			goto error;
+	} else
+		m = dm;
+	ap->ap_mask = m;
+	free(str);
 	TAILQ_INSERT_TAIL(&ag->ag_portals, ap, ap_next);
 	return (ap);
+
+error:
+	log_errx(1, "Incorrect initiator portal '%s'", portal);
+	return (NULL);
 }
 
 static void
@@ -347,13 +390,39 @@ auth_portal_defined(const struct auth_group *ag)
 }
 
 const struct auth_portal *
-auth_portal_find(const struct auth_group *ag, const char *portal)
+auth_portal_find(const struct auth_group *ag, const struct sockaddr_storage *ss)
 {
-	const struct auth_portal *auth_portal;
+	const struct auth_portal *ap;
+	const uint8_t *a, *b;
+	int i;
+	uint8_t bmask;
 
-	TAILQ_FOREACH(auth_portal, &ag->ag_portals, ap_next) {
-		if (strcmp(auth_portal->ap_initator_portal, portal) == 0)
-			return (auth_portal);
+	TAILQ_FOREACH(ap, &ag->ag_portals, ap_next) {
+		if (ap->ap_sa.ss_family != ss->ss_family)
+			continue;
+		if (ss->ss_family == AF_INET) {
+			a = (const uint8_t *)
+			    &((const struct sockaddr_in *)ss)->sin_addr;
+			b = (const uint8_t *)
+			    &((const struct sockaddr_in *)&ap->ap_sa)->sin_addr;
+		} else {
+			a = (const uint8_t *)
+			    &((const struct sockaddr_in6 *)ss)->sin6_addr;
+			b = (const uint8_t *)
+			    &((const struct sockaddr_in6 *)&ap->ap_sa)->sin6_addr;
+		}
+		for (i = 0; i < ap->ap_mask / 8; i++) {
+			if (a[i] != b[i])
+				goto next;
+		}
+		if (ap->ap_mask % 8) {
+			bmask = 0xff << (8 - (ap->ap_mask % 8));
+			if ((a[i] & bmask) != (b[i] & bmask))
+				goto next;
+		}
+		return (ap);
+next:
+		;
 	}
 
 	return (NULL);
@@ -950,7 +1019,8 @@ lun_option_set(struct lun_option *lo, const char *value)
 }
 
 static struct connection *
-connection_new(struct portal *portal, int fd, const char *host)
+connection_new(struct portal *portal, int fd, const char *host,
+    const struct sockaddr *client_sa)
 {
 	struct connection *conn;
 
@@ -960,6 +1030,7 @@ connection_new(struct portal *portal, int fd, const char *host)
 	conn->conn_portal = portal;
 	conn->conn_socket = fd;
 	conn->conn_initiator_addr = checked_strdup(host);
+	memcpy(&conn->conn_initiator_sa, client_sa, client_sa->sa_len);
 
 	/*
 	 * Default values, from RFC 3720, section 12.
@@ -1120,7 +1191,6 @@ conf_verify(struct conf *conf)
 		if (!found_lun) {
 			log_warnx("no LUNs defined for target \"%s\"",
 			    targ->t_name);
-			return (1);
 		}
 	}
 	TAILQ_FOREACH(pg, &conf->conf_portal_groups, pg_next) {
@@ -1209,19 +1279,6 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 		}
 	}
 
-	if (oldconf->conf_kernel_port_on != newconf->conf_kernel_port_on) {
-		if (newconf->conf_kernel_port_on == true) {
-			log_debugx("enabling CTL iSCSI port");
-			error = kernel_port_on();
-			if (error != 0)
-				log_errx(1, "failed to enable CTL iSCSI port; exiting");
-		} else {
-			error = kernel_port_off();
-			if (error != 0)
-				log_warnx("failed to disable CTL iSCSI port");
-		}
-	}
-
 	/*
 	 * XXX: If target or lun removal fails, we should somehow "move"
 	 * 	the old lun or target into newconf, so that subsequent
@@ -1253,6 +1310,7 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 				}
 				lun_delete(oldlun);
 			}
+			kernel_port_remove(oldtarg);
 			target_delete(oldtarg);
 			continue;
 		}
@@ -1387,6 +1445,8 @@ conf_apply(struct conf *oldconf, struct conf *newconf)
 				cumulated_error++;
 			}
 		}
+		if (oldtarg == NULL)
+			kernel_port_add(newtarg);
 	}
 
 	/*
@@ -1597,7 +1657,7 @@ wait_for_children(bool block)
 
 static void
 handle_connection(struct portal *portal, int fd,
-    const struct sockaddr *client_sa, socklen_t client_salen, bool dont_fork)
+    const struct sockaddr *client_sa, bool dont_fork)
 {
 	struct connection *conn;
 	int error;
@@ -1632,7 +1692,7 @@ handle_connection(struct portal *portal, int fd,
 	}
 	pidfile_close(conf->conf_pidfh);
 
-	error = getnameinfo(client_sa, client_salen,
+	error = getnameinfo(client_sa, client_sa->sa_len,
 	    host, sizeof(host), NULL, 0, NI_NUMERICHOST);
 	if (error != 0)
 		log_errx(1, "getnameinfo: %s", gai_strerror(error));
@@ -1642,7 +1702,7 @@ handle_connection(struct portal *portal, int fd,
 	log_set_peer_addr(host);
 	setproctitle("%s", host);
 
-	conn = connection_new(portal, fd, host);
+	conn = connection_new(portal, fd, host, client_sa);
 	set_timeout(conf);
 	kernel_capsicate();
 	login(conn);
@@ -1698,6 +1758,9 @@ main_loop(struct conf *conf, bool dont_fork)
 			client_salen = sizeof(client_sa);
 			kernel_accept(&connection_id, &portal_id,
 			    (struct sockaddr *)&client_sa, &client_salen);
+			if (client_salen < client_sa.ss_len)
+				log_errx(1, "salen %u < %u",
+				    client_salen, client_sa.ss_len);
 
 			log_debugx("incoming connection, id %d, portal id %d",
 			    connection_id, portal_id);
@@ -1714,8 +1777,7 @@ main_loop(struct conf *conf, bool dont_fork)
 
 found:
 			handle_connection(portal, connection_id,
-			    (struct sockaddr *)&client_sa, client_salen,
-			    dont_fork);
+			    (struct sockaddr *)&client_sa, dont_fork);
 		} else {
 #endif
 			assert(proxy_mode == false);
@@ -1742,9 +1804,13 @@ main_loop(struct conf *conf, bool dont_fork)
 					    &client_salen);
 					if (client_fd < 0)
 						log_err(1, "accept");
+					if (client_salen < client_sa.ss_len)
+						log_errx(1, "salen %u < %u",
+						    client_salen,
+						    client_sa.ss_len);
 					handle_connection(portal, client_fd,
 					    (struct sockaddr *)&client_sa,
-					    client_salen, dont_fork);
+					    dont_fork);
 					break;
 				}
 			}
diff --git a/usr.sbin/ctld/ctld.h b/usr.sbin/ctld/ctld.h
index 33996483f25b..98d612f3fe2a 100644
--- a/usr.sbin/ctld/ctld.h
+++ b/usr.sbin/ctld/ctld.h
@@ -35,8 +35,8 @@
 #include <sys/queue.h>
 #ifdef ICL_KERNEL_PROXY
 #include <sys/types.h>
-#include <sys/socket.h>
 #endif
+#include <sys/socket.h>
 #include <stdbool.h>
 #include <libutil.h>
 
@@ -67,6 +67,8 @@ struct auth_portal {
 	TAILQ_ENTRY(auth_portal)	ap_next;
 	struct auth_group		*ap_auth_group;
 	char				*ap_initator_portal;
+	struct sockaddr_storage		ap_sa;
+	int				ap_mask;
 };
 
 #define	AG_TYPE_UNKNOWN			0
@@ -178,6 +180,8 @@ struct connection {
 	char			*conn_initiator_name;
 	char			*conn_initiator_addr;
 	char			*conn_initiator_alias;
+	uint8_t			conn_initiator_isid[6];
+	struct sockaddr_storage	conn_initiator_sa;
 	uint32_t		conn_cmdsn;
 	uint32_t		conn_statsn;
 	size_t			conn_max_data_segment_length;
@@ -234,7 +238,7 @@ const struct auth_portal	*auth_portal_new(struct auth_group *ag,
 				    const char *initiator_portal);
 bool			auth_portal_defined(const struct auth_group *ag);
 const struct auth_portal	*auth_portal_find(const struct auth_group *ag,
-				    const char *initiator_portal);
+				    const struct sockaddr_storage *sa);
 
 struct portal_group	*portal_group_new(struct conf *conf, const char *name);
 void			portal_group_delete(struct portal_group *pg);
@@ -272,8 +276,8 @@ int			kernel_lun_add(struct lun *lun);
 int			kernel_lun_resize(struct lun *lun);
 int			kernel_lun_remove(struct lun *lun);
 void			kernel_handoff(struct connection *conn);
-int			kernel_port_on(void);
-int			kernel_port_off(void);
+int			kernel_port_add(struct target *targ);
+int			kernel_port_remove(struct target *targ);
 void			kernel_capsicate(void);
 
 #ifdef ICL_KERNEL_PROXY
diff --git a/usr.sbin/ctld/discovery.c b/usr.sbin/ctld/discovery.c
index 3612ce39c1d4..9908b961df7d 100644
--- a/usr.sbin/ctld/discovery.c
+++ b/usr.sbin/ctld/discovery.c
@@ -35,6 +35,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <netinet/in.h>
+#include <netdb.h>
+#include <sys/socket.h>
 
 #include "ctld.h"
 #include "iscsi_proto.h"
@@ -155,6 +157,48 @@ logout_new_response(struct pdu *request)
 	return (response);
 }
 
+static void
+discovery_add_target(struct keys *response_keys, struct target *targ)
+{
+	struct portal *portal;
+	char *buf;
+	char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
+	struct addrinfo *ai;
+	int ret;
+
+	keys_add(response_keys, "TargetName", targ->t_name);
+	TAILQ_FOREACH(portal, &targ->t_portal_group->pg_portals, p_next) {
+		ai = portal->p_ai;
+		ret = getnameinfo(ai->ai_addr, ai->ai_addrlen,
+		    hbuf, sizeof(hbuf), sbuf, sizeof(sbuf),
+		    NI_NUMERICHOST | NI_NUMERICSERV);
+		if (ret != 0) {
+			log_warnx("getnameinfo: %s", gai_strerror(ret));
+			continue;
+		}
+		switch (ai->ai_addr->sa_family) {
+		case AF_INET:
+			if (strcmp(hbuf, "0.0.0.0") == 0)
+				continue;
+			ret = asprintf(&buf, "%s:%s,%d", hbuf, sbuf,
+			    targ->t_portal_group->pg_tag);
+			break;
+		case AF_INET6:
+			if (strcmp(hbuf, "::") == 0)
+				continue;
+			ret = asprintf(&buf, "[%s]:%s,%d", hbuf, sbuf,
+			    targ->t_portal_group->pg_tag);
+			break;
+		default:
+			continue;
+		}
+		if (ret <= 0)
+		    log_err(1, "asprintf");
+		keys_add(response_keys, "TargetAddress", buf);
+		free(buf);
+	}
+}
+
 void
 discovery(struct connection *conn)
 {
@@ -186,7 +230,7 @@ discovery(struct connection *conn)
 				    targ->t_name);
 				continue;
 			}
-			keys_add(response_keys, "TargetName", targ->t_name);
+			discovery_add_target(response_keys, targ);
 		}
 	} else {
 		targ = target_find(conn->conn_portal->p_portal_group->pg_conf,
@@ -194,9 +238,8 @@ discovery(struct connection *conn)
 		if (targ == NULL) {
 			log_debugx("initiator requested information on unknown "
 			    "target \"%s\"; returning nothing", send_targets);
-		} else {
-			keys_add(response_keys, "TargetName", targ->t_name);
-		}
+		} else
+			discovery_add_target(response_keys, targ);
 	}
 	keys_save(response_keys, response);
 
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
index 0d8383c704ff..3996e2164053 100644
--- a/usr.sbin/ctld/kernel.c
+++ b/usr.sbin/ctld/kernel.c
@@ -113,16 +113,27 @@ struct cctl_lun {
 	char *serial_number;
 	char *device_id;
 	char *cfiscsi_target;
-	char *cfiscsi_target_alias;
 	int cfiscsi_lun;
 	STAILQ_HEAD(,cctl_lun_nv) attr_list;
 	STAILQ_ENTRY(cctl_lun) links;
 };
 
+struct cctl_port {
+	uint32_t port_id;
+	int cfiscsi_status;
+	char *cfiscsi_target;
+	uint16_t cfiscsi_portal_group_tag;
+	STAILQ_HEAD(,cctl_lun_nv) attr_list;
+	STAILQ_ENTRY(cctl_port) links;
+};
+
 struct cctl_devlist_data {
 	int num_luns;
 	STAILQ_HEAD(,cctl_lun) lun_list;
 	struct cctl_lun *cur_lun;
+	int num_ports;
+	STAILQ_HEAD(,cctl_port) port_list;
+	struct cctl_port *cur_port;
 	int level;
 	struct sbuf *cur_sb[32];
 };
@@ -219,9 +230,6 @@ cctl_end_element(void *user_data, const char *name)
 	} else if (strcmp(name, "cfiscsi_target") == 0) {
 		cur_lun->cfiscsi_target = str;
 		str = NULL;
-	} else if (strcmp(name, "cfiscsi_target_alias") == 0) {
-		cur_lun->cfiscsi_target_alias = str;
-		str = NULL;
 	} else if (strcmp(name, "cfiscsi_lun") == 0) {
 		cur_lun->cfiscsi_lun = strtoul(str, NULL, 0);
 	} else if (strcmp(name, "lun") == 0) {
@@ -246,6 +254,111 @@ cctl_end_element(void *user_data, const char *name)
 	free(str);
 }
 
+static void
+cctl_start_pelement(void *user_data, const char *name, const char **attr)
+{
+	int i;
+	struct cctl_devlist_data *devlist;
+	struct cctl_port *cur_port;
+
+	devlist = (struct cctl_devlist_data *)user_data;
+	cur_port = devlist->cur_port;
+	devlist->level++;
+	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]));
+
+	devlist->cur_sb[devlist->level] = sbuf_new_auto();
+	if (devlist->cur_sb[devlist->level] == NULL)
+		log_err(1, "%s: unable to allocate sbuf", __func__);
+
+	if (strcmp(name, "targ_port") == 0) {
+		if (cur_port != NULL)
+			log_errx(1, "%s: improper port element nesting (%s)",
+			    __func__, name);
+
+		cur_port = calloc(1, sizeof(*cur_port));
+		if (cur_port == NULL)
+			log_err(1, "%s: cannot allocate %zd bytes", __func__,
+			    sizeof(*cur_port));
+
+		devlist->num_ports++;
+		devlist->cur_port = cur_port;
+
+		STAILQ_INIT(&cur_port->attr_list);
+		STAILQ_INSERT_TAIL(&devlist->port_list, cur_port, links);
+
+		for (i = 0; attr[i] != NULL; i += 2) {
+			if (strcmp(attr[i], "id") == 0) {
+				cur_port->port_id = strtoul(attr[i+1], NULL, 0);
+			} else {
+				log_errx(1, "%s: invalid LUN attribute %s = %s",
+				     __func__, attr[i], attr[i+1]);
+			}
+		}
+	}
+}
+
+static void
+cctl_end_pelement(void *user_data, const char *name)
+{
+	struct cctl_devlist_data *devlist;
+	struct cctl_port *cur_port;
+	char *str;
+
+	devlist = (struct cctl_devlist_data *)user_data;
+	cur_port = devlist->cur_port;
+
+	if ((cur_port == NULL)
+	 && (strcmp(name, "ctlportlist") != 0))
+		log_errx(1, "%s: cur_port == NULL! (name = %s)", __func__, name);
+
+	if (devlist->cur_sb[devlist->level] == NULL)
+		log_errx(1, "%s: no valid sbuf at level %d (name %s)", __func__,
+		     devlist->level, name);
+
+	sbuf_finish(devlist->cur_sb[devlist->level]);
+	str = checked_strdup(sbuf_data(devlist->cur_sb[devlist->level]));
+
+	if (strlen(str) == 0) {
+		free(str);
+		str = NULL;
+	}
+
+	sbuf_delete(devlist->cur_sb[devlist->level]);
+	devlist->cur_sb[devlist->level] = NULL;
+	devlist->level--;
+
+	if (strcmp(name, "cfiscsi_target") == 0) {
+		cur_port->cfiscsi_target = str;
+		str = NULL;
+	} else if (strcmp(name, "cfiscsi_status") == 0) {
+		cur_port->cfiscsi_status = strtoul(str, NULL, 0);
+	} else if (strcmp(name, "cfiscsi_portal_group_tag") == 0) {
+		cur_port->cfiscsi_portal_group_tag = strtoul(str, NULL, 0);
+	} else if (strcmp(name, "targ_port") == 0) {
+		devlist->cur_port = NULL;
+	} else if (strcmp(name, "ctlportlist") == 0) {
+		
+	} else {
+		struct cctl_lun_nv *nv;
+
+		nv = calloc(1, sizeof(*nv));
+		if (nv == NULL)
+			log_err(1, "%s: can't allocate %zd bytes for nv pair",
+			    __func__, sizeof(*nv));
+
+		nv->name = checked_strdup(name);
+
+		nv->value = str;
+		str = NULL;
+		STAILQ_INSERT_TAIL(&cur_port->attr_list, nv, links);
+	}
+
+	free(str);
+}
+
 static void
 cctl_char_handler(void *user_data, const XML_Char *str, int len)
 {
@@ -266,50 +379,51 @@ conf_new_from_kernel(void)
 	struct ctl_lun_list list;
 	struct cctl_devlist_data devlist;
 	struct cctl_lun *lun;
+	struct cctl_port *port;
 	XML_Parser parser;
-	char *lun_str = NULL;
-	int lun_len;
-	int retval;
-
-	lun_len = 4096;
+	char *str;
+	int len, retval;
 
 	bzero(&devlist, sizeof(devlist));
 	STAILQ_INIT(&devlist.lun_list);
+	STAILQ_INIT(&devlist.port_list);
 
 	log_debugx("obtaining previously configured CTL luns from the kernel");
 
+	str = NULL;
+	len = 4096;
 retry:
-	lun_str = realloc(lun_str, lun_len);
-	if (lun_str == NULL)
+	str = realloc(str, len);
+	if (str == NULL)
 		log_err(1, "realloc");
 
 	bzero(&list, sizeof(list));
-	list.alloc_len = lun_len;
+	list.alloc_len = len;
 	list.status = CTL_LUN_LIST_NONE;
-	list.lun_xml = lun_str;
+	list.lun_xml = str;
 
 	if (ioctl(ctl_fd, CTL_LUN_LIST, &list) == -1) {
 		log_warn("error issuing CTL_LUN_LIST ioctl");
-		free(lun_str);
+		free(str);
 		return (NULL);
 	}
 
 	if (list.status == CTL_LUN_LIST_ERROR) {
 		log_warnx("error returned from CTL_LUN_LIST ioctl: %s",
 		    list.error_str);
-		free(lun_str);
+		free(str);
 		return (NULL);
 	}
 
 	if (list.status == CTL_LUN_LIST_NEED_MORE_SPACE) {
-		lun_len = lun_len << 1;
+		len = len << 1;
 		goto retry;
 	}
 
 	parser = XML_ParserCreate(NULL);
 	if (parser == NULL) {
 		log_warnx("unable to create XML parser");
-		free(lun_str);
+		free(str);
 		return (NULL);
 	}
 
@@ -317,9 +431,58 @@ conf_new_from_kernel(void)
 	XML_SetElementHandler(parser, cctl_start_element, cctl_end_element);
 	XML_SetCharacterDataHandler(parser, cctl_char_handler);
 
-	retval = XML_Parse(parser, lun_str, strlen(lun_str), 1);
+	retval = XML_Parse(parser, str, strlen(str), 1);
 	XML_ParserFree(parser);
-	free(lun_str);
+	free(str);
+	if (retval != 1) {
+		log_warnx("XML_Parse failed");
+		return (NULL);
+	}
+
+	str = NULL;
+	len = 4096;
+retry_port:
+	str = realloc(str, len);
+	if (str == NULL)
+		log_err(1, "realloc");
+
+	bzero(&list, sizeof(list));
+	list.alloc_len = len;
+	list.status = CTL_LUN_LIST_NONE;
+	list.lun_xml = str;
+
+	if (ioctl(ctl_fd, CTL_PORT_LIST, &list) == -1) {
+		log_warn("error issuing CTL_PORT_LIST ioctl");
+		free(str);
+		return (NULL);
+	}
+
+	if (list.status == CTL_PORT_LIST_ERROR) {
+		log_warnx("error returned from CTL_PORT_LIST ioctl: %s",
+		    list.error_str);
+		free(str);
+		return (NULL);
+	}
+
+	if (list.status == CTL_LUN_LIST_NEED_MORE_SPACE) {
+		len = len << 1;
+		goto retry_port;
+	}
+
+	parser = XML_ParserCreate(NULL);
+	if (parser == NULL) {
+		log_warnx("unable to create XML parser");
+		free(str);
+		return (NULL);
+	}
+
+	XML_SetUserData(parser, &devlist);
+	XML_SetElementHandler(parser, cctl_start_pelement, cctl_end_pelement);
+	XML_SetCharacterDataHandler(parser, cctl_char_handler);
+
+	retval = XML_Parse(parser, str, strlen(str), 1);
+	XML_ParserFree(parser);
+	free(str);
 	if (retval != 1) {
 		log_warnx("XML_Parse failed");
 		return (NULL);
@@ -327,6 +490,33 @@ conf_new_from_kernel(void)
 
 	conf = conf_new();
 
+	STAILQ_FOREACH(port, &devlist.port_list, links) {
+
+		if (port->cfiscsi_target == NULL) {
+			log_debugx("CTL port %ju wasn't managed by ctld; "
+			    "ignoring", (uintmax_t)port->port_id);
+			continue;
+		}
+		if (port->cfiscsi_status != 1) {
+			log_debugx("CTL port %ju is not active (%d); ignoring",
+			    (uintmax_t)port->port_id, port->cfiscsi_status);
+			continue;
+		}
+
+		targ = target_find(conf, port->cfiscsi_target);
+		if (targ == NULL) {
+#if 0
+			log_debugx("found new kernel target %s for CTL port %ld",
+			    port->cfiscsi_target, port->port_id);
+#endif
+			targ = target_new(conf, port->cfiscsi_target);
+			if (targ == NULL) {
+				log_warnx("target_new failed");
+				continue;
+			}
+		}
+	}
+
 	STAILQ_FOREACH(lun, &devlist.lun_list, links) {
 		struct cctl_lun_nv *nv;
 
@@ -391,6 +581,17 @@ conf_new_from_kernel(void)
 	return (conf);
 }
 
+static void
+str_arg(struct ctl_be_arg *arg, const char *name, const char *value)
+{
+
+	arg->namelen = strlen(name) + 1;
+	arg->name = __DECONST(char *, name);
+	arg->vallen = strlen(value) + 1;
+	arg->value = __DECONST(char *, value);
+	arg->flags = CTL_BEARG_ASCII | CTL_BEARG_RD;
+}
+
 int
 kernel_lun_add(struct lun *lun)
 {
@@ -413,13 +614,13 @@ kernel_lun_add(struct lun *lun)
 	req.reqdata.create.device_type = T_DIRECT;
 
 	if (lun->l_serial != NULL) {
-		strlcpy(req.reqdata.create.serial_num, lun->l_serial,
+		strncpy(req.reqdata.create.serial_num, lun->l_serial,
 			sizeof(req.reqdata.create.serial_num));
 		req.reqdata.create.flags |= CTL_LUN_FLAG_SERIAL_NUM;
 	}
 
 	if (lun->l_device_id != NULL) {
-		strlcpy(req.reqdata.create.device_id, lun->l_device_id,
+		strncpy(req.reqdata.create.device_id, lun->l_device_id,
 			sizeof(req.reqdata.create.device_id));
 		req.reqdata.create.flags |= CTL_LUN_FLAG_DEVID;
 	}
@@ -443,17 +644,6 @@ kernel_lun_add(struct lun *lun)
 		assert(lo != NULL);
 	}
 
-	if (lun->l_target->t_alias != NULL) {
-		lo = lun_option_find(lun, "cfiscsi_target_alias");
-		if (lo != NULL) {
-			lun_option_set(lo, lun->l_target->t_alias);
-		} else {
-			lo = lun_option_new(lun, "cfiscsi_target_alias",
-			    lun->l_target->t_alias);
-			assert(lo != NULL);
-		}
-	}
-
 	asprintf(&tmp, "%d", lun->l_lun);
 	if (tmp == NULL)
 		log_errx(1, "asprintf");
@@ -467,6 +657,19 @@ kernel_lun_add(struct lun *lun)
 		assert(lo != NULL);
 	}
 
+	asprintf(&tmp, "%s,lun,%d", lun->l_target->t_name, lun->l_lun);
+	if (tmp == NULL)
+		log_errx(1, "asprintf");
+	lo = lun_option_find(lun, "scsiname");
+	if (lo != NULL) {
+		lun_option_set(lo, tmp);
+		free(tmp);
+	} else {
+		lo = lun_option_new(lun, "scsiname", tmp);
+		free(tmp);
+		assert(lo != NULL);
+	}
+
 	num_options = 0;
 	TAILQ_FOREACH(lo, &lun->l_options, lo_next)
 		num_options++;
@@ -482,14 +685,7 @@ kernel_lun_add(struct lun *lun)
 
 		i = 0;
 		TAILQ_FOREACH(lo, &lun->l_options, lo_next) {
-			 /*
-			  * +1 for the terminating '\0'
-			  */
-			req.be_args[i].namelen = strlen(lo->lo_name) + 1;
-			req.be_args[i].name = lo->lo_name;
-			req.be_args[i].vallen = strlen(lo->lo_value) + 1;
-			req.be_args[i].value = lo->lo_value;
-			req.be_args[i].flags = CTL_BEARG_ASCII | CTL_BEARG_RD;
+			str_arg(&req.be_args[i], lo->lo_name, lo->lo_value);
 			i++;
 		}
 		assert(i == num_options);
@@ -599,6 +795,8 @@ kernel_handoff(struct connection *conn)
 		strlcpy(req.data.handoff.initiator_alias,
 		    conn->conn_initiator_alias, sizeof(req.data.handoff.initiator_alias));
 	}
+	memcpy(req.data.handoff.initiator_isid, conn->conn_initiator_isid,
+	    sizeof(req.data.handoff.initiator_isid));
 	strlcpy(req.data.handoff.target_name,
 	    conn->conn_target->t_name, sizeof(req.data.handoff.target_name));
 #ifdef ICL_KERNEL_PROXY
@@ -634,15 +832,53 @@ kernel_handoff(struct connection *conn)
 }
 
 int
-kernel_port_on(void)
+kernel_port_add(struct target *targ)
 {
 	struct ctl_port_entry entry;
+	struct ctl_req req;
+	char tagstr[16];
 	int error;
+	uint32_t port_id = -1;
+
+	bzero(&req, sizeof(req));
+	strlcpy(req.driver, "iscsi", sizeof(req.driver));
+	req.reqtype = CTL_REQ_CREATE;
+	req.num_args = 4;
+	req.args = malloc(req.num_args * sizeof(*req.args));
+	req.args[0].namelen = sizeof("port_id");
+	req.args[0].name = __DECONST(char *, "port_id");
+	req.args[0].vallen = sizeof(port_id);
+	req.args[0].value = &port_id;
+	req.args[0].flags = CTL_BEARG_WR;
+	str_arg(&req.args[1], "cfiscsi_target", targ->t_name);
+	snprintf(tagstr, sizeof(tagstr), "%d", targ->t_portal_group->pg_tag);
+	str_arg(&req.args[2], "cfiscsi_portal_group_tag", tagstr);
+	if (targ->t_alias)
+		str_arg(&req.args[3], "cfiscsi_target_alias", targ->t_alias);
+	else
+		req.num_args--;
+
+	error = ioctl(ctl_fd, CTL_PORT_REQ, &req);
+	free(req.args);
+	if (error != 0) {
+		log_warn("error issuing CTL_PORT_REQ ioctl");
+		return (1);
+	}
+
+	if (req.status == CTL_LUN_ERROR) {
+		log_warnx("error returned from port creation request: %s",
+		    req.error_str);
+		return (1);
+	}
+
+	if (req.status != CTL_LUN_OK) {
+		log_warnx("unknown port creation request status %d",
+		    req.status);
+		return (1);
+	}
 
 	bzero(&entry, sizeof(entry));
-
-	entry.port_type = CTL_PORT_ISCSI;
-	entry.targ_port = -1;
+	entry.targ_port = port_id;
 
 	error = ioctl(ctl_fd, CTL_ENABLE_PORT, &entry);
 	if (error != 0) {
@@ -654,20 +890,42 @@ kernel_port_on(void)
 }
 
 int
-kernel_port_off(void)
+kernel_port_remove(struct target *targ)
 {
-	struct ctl_port_entry entry;
+	struct ctl_req req;
+	char tagstr[16];
 	int error;
 
-	bzero(&entry, sizeof(entry));
+	bzero(&req, sizeof(req));
+	strlcpy(req.driver, "iscsi", sizeof(req.driver));
+	req.reqtype = CTL_REQ_REMOVE;
+	req.num_args = 2;
+	req.args = malloc(req.num_args * sizeof(*req.args));
+	str_arg(&req.args[0], "cfiscsi_target", targ->t_name);
+	if (targ->t_portal_group) {
+		snprintf(tagstr, sizeof(tagstr), "%d",
+		    targ->t_portal_group->pg_tag);
+		str_arg(&req.args[1], "cfiscsi_portal_group_tag", tagstr);
+	} else
+		req.num_args--;
 
-	entry.port_type = CTL_PORT_ISCSI;
-	entry.targ_port = -1;
-
-	error = ioctl(ctl_fd, CTL_DISABLE_PORT, &entry);
+	error = ioctl(ctl_fd, CTL_PORT_REQ, &req);
+	free(req.args);
 	if (error != 0) {
-		log_warn("CTL_DISABLE_PORT ioctl failed");
-		return (-1);
+		log_warn("error issuing CTL_PORT_REQ ioctl");
+		return (1);
+	}
+
+	if (req.status == CTL_LUN_ERROR) {
+		log_warnx("error returned from port removal request: %s",
+		    req.error_str);
+		return (1);
+	}
+
+	if (req.status != CTL_LUN_OK) {
+		log_warnx("unknown port removal request status %d",
+		    req.status);
+		return (1);
 	}
 
 	return (0);
diff --git a/usr.sbin/ctld/login.c b/usr.sbin/ctld/login.c
index f830d15fc929..20ed464011fa 100644
--- a/usr.sbin/ctld/login.c
+++ b/usr.sbin/ctld/login.c
@@ -850,6 +850,9 @@ login(struct connection *conn)
 		log_errx(1, "received Login PDU with non-zero TSIH");
 	}
 
+	memcpy(conn->conn_initiator_isid, bhslr->bhslr_isid,
+	    sizeof(conn->conn_initiator_isid));
+
 	/*
 	 * XXX: Implement the C flag some day.
 	 */
@@ -951,7 +954,7 @@ login(struct connection *conn)
 	}
 
 	if (auth_portal_defined(ag)) {
-		if (auth_portal_find(ag, conn->conn_initiator_addr) == NULL) {
+		if (auth_portal_find(ag, &conn->conn_initiator_sa) == NULL) {
 			login_send_error(request, 0x02, 0x02);
 			log_errx(1, "initiator does not match allowed "
 			    "initiator portals");
diff --git a/usr.sbin/ctld/parse.y b/usr.sbin/ctld/parse.y
index e4b160e204b1..645201be94d1 100644
--- a/usr.sbin/ctld/parse.y
+++ b/usr.sbin/ctld/parse.y
@@ -659,6 +659,19 @@ lun_serial:	SERIAL STR
 		}
 		lun_set_serial(lun, $2);
 		free($2);
+	} |	SERIAL NUM
+	{
+		char *str = NULL;
+
+		if (lun->l_serial != NULL) {
+			log_warnx("serial for lun %d, target \"%s\" "
+			    "specified more than once",
+			    lun->l_lun, target->t_name);
+			return (1);
+		}
+		asprintf(&str, "%ju", $2);
+		lun_set_serial(lun, str);
+		free(str);
 	}
 	;
 
diff --git a/usr.sbin/ctld/token.l b/usr.sbin/ctld/token.l
index 2846097e3b73..a47bf9a00ae0 100644
--- a/usr.sbin/ctld/token.l
+++ b/usr.sbin/ctld/token.l
@@ -74,8 +74,9 @@ target			{ return TARGET; }
 timeout			{ return TIMEOUT; }
 [0-9]+[kKmMgGtTpPeE]?	{ if (expand_number(yytext, &yylval.num) == 0)
 				return NUM;
-			  else
-				return STR;
+			  else {
+				yylval.str = strdup(yytext); return STR;
+			  }
 			}
 \"[^"]+\"		{ yylval.str = strndup(yytext + 1,
 			    strlen(yytext) - 2); return STR; }
diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1
index d5cc6144d1d6..3684b9ff5e7c 100644
--- a/usr.sbin/ctm/ctm/ctm.1
+++ b/usr.sbin/ctm/ctm/ctm.1
@@ -316,10 +316,9 @@ The
 command appeared in
 .Fx 2.1 .
 .Sh AUTHORS
+.An -nosplit
 The CTM system has been designed and implemented by
-.An Poul-Henning Kamp
-.Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 .Pp
-.An Joerg Wunsch
-.Aq joerg@FreeBSD.org
+.An Joerg Wunsch Aq Mt joerg@FreeBSD.org
 wrote this man-page.
diff --git a/usr.sbin/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5
index a51c93b00698..e48b09fc85bd 100644
--- a/usr.sbin/ctm/ctm/ctm.5
+++ b/usr.sbin/ctm/ctm/ctm.5
@@ -174,10 +174,9 @@ methods were hashed out.
 The CTM system has been made publicly available in
 .Fx 2.1 .
 .Sh AUTHORS
+.An -nosplit
 The CTM system has been designed and implemented by
-.An Poul-Henning Kamp
-.Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 .Pp
-.An Joerg Wunsch
-.Aq joerg@FreeBSD.org
+.An Joerg Wunsch Aq Mt joerg@FreeBSD.org
 wrote this man-page.
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index 5476e491f4ef..232f646529f8 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
@@ -507,4 +507,4 @@ Error messages should be self explanatory.
 .Xr ctm 5
 .\" .Sh HISTORY
 .Sh AUTHORS
-.An Stephen McKay Aq mckay@FreeBSD.org
+.An Stephen McKay Aq Mt mckay@FreeBSD.org
diff --git a/usr.sbin/ctm/mkCTM/ctm_conf.gnats b/usr.sbin/ctm/mkCTM/ctm_conf.gnats
deleted file mode 100644
index c2223f02cd1d..000000000000
--- a/usr.sbin/ctm/mkCTM/ctm_conf.gnats
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/local/bin/tclsh
-
-#set CTMfirst	1
-set CTMname	gnats
-set CTMref	/home/gnats
-set CTMdest	$CTMSW/../CTM-pub/$CTMname
-set CTMignore	{\\.lock$}
-set CTMmail	ctm-gnats@freebsd.org
diff --git a/usr.sbin/dconschat/dconschat.8 b/usr.sbin/dconschat/dconschat.8
index 4f8dcd459803..330f44c530c5 100644
--- a/usr.sbin/dconschat/dconschat.8
+++ b/usr.sbin/dconschat/dconschat.8
@@ -323,7 +323,7 @@ console remote {
 .Xr eui64 5 ,
 .Xr fwcontrol 8
 .Sh AUTHORS
-.An Hidetoshi Shimokawa Aq simokawa@FreeBSD.org
+.An Hidetoshi Shimokawa Aq Mt simokawa@FreeBSD.org
 .Sh BUGS
 This utility is
 .Ud
diff --git a/usr.sbin/devinfo/devinfo.8 b/usr.sbin/devinfo/devinfo.8
index ecb3b0126370..a1743fff3851 100644
--- a/usr.sbin/devinfo/devinfo.8
+++ b/usr.sbin/devinfo/devinfo.8
@@ -73,4 +73,4 @@ Without this flag, only those devices that have attached are reported.
 .Xr devclass 9 ,
 .Xr device 9
 .Sh AUTHORS
-.An Mike Smith Aq msmith@FreeBSD.org
+.An Mike Smith Aq Mt msmith@FreeBSD.org
diff --git a/usr.sbin/dumpcis/dumpcis.8 b/usr.sbin/dumpcis/dumpcis.8
index 518eadd69074..86949df6f28b 100644
--- a/usr.sbin/dumpcis/dumpcis.8
+++ b/usr.sbin/dumpcis/dumpcis.8
@@ -44,6 +44,5 @@ utility translates a raw CIS stream into human readable form.
 .Xr cbb 4 ,
 .Xr pccard 4
 .Sh AUTHORS
-.An -nosplit
 The original version was written by
-.An Warner Losh Aq imp@FreeBSD.org .
+.An Warner Losh Aq Mt imp@FreeBSD.org .
diff --git a/usr.sbin/eeprom/eeprom.8 b/usr.sbin/eeprom/eeprom.8
index e132da98b7e6..b5b08bb9ae4e 100644
--- a/usr.sbin/eeprom/eeprom.8
+++ b/usr.sbin/eeprom/eeprom.8
@@ -684,15 +684,15 @@ The
 utility uses base code from the
 .Nx
 version written by
-.An "Jason R. Thorpe" .
+.An Jason R. Thorpe .
 The handlers for the Open Firmware
 .Pa /options
 node were written by
-.An "Marius Strobl" Aq marius@FreeBSD.org .
+.An Marius Strobl Aq Mt marius@FreeBSD.org .
 The code for accessing the Open Firmware device tree is shared with the
 .Xr ofwdump 8
 utility written by
-.An "Thomas Moestl" Aq tmm@FreeBSD.org .
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org .
 .Sh BUGS
 Currently,
 .Nm
diff --git a/usr.sbin/etcupdate/etcupdate.8 b/usr.sbin/etcupdate/etcupdate.8
index ffd051607312..1e722f9b2c12 100644
--- a/usr.sbin/etcupdate/etcupdate.8
+++ b/usr.sbin/etcupdate/etcupdate.8
@@ -801,7 +801,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An John Baldwin Aq jhb@FreeBSD.org .
+.An John Baldwin Aq Mt jhb@FreeBSD.org .
 .Sh BUGS
 Rerunning a merge does not automatically delete conflicts left over from a
 previous merge.
diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1
index 1c231a19bcdd..9f1270f72f03 100644
--- a/usr.sbin/fdwrite/fdwrite.1
+++ b/usr.sbin/fdwrite/fdwrite.1
@@ -104,7 +104,7 @@ Some of the code was taken from
 .Xr fdformat 1 .
 .Sh AUTHORS
 The program has been contributed by
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 .Sh BUGS
 Diagnostics are less than complete at present.
 .Pp
diff --git a/usr.sbin/flowctl/flowctl.8 b/usr.sbin/flowctl/flowctl.8
index 5780e10a62d0..a8a1ce1c0bd2 100644
--- a/usr.sbin/flowctl/flowctl.8
+++ b/usr.sbin/flowctl/flowctl.8
@@ -83,8 +83,8 @@ parameter can be specify to show selected flows in human-readable format.
 The
 .Nm
 utility was written by
-.An Gleb Smirnoff Aq glebius@FreeBSD.org ,
+.An Gleb Smirnoff Aq Mt glebius@FreeBSD.org ,
 based on
 .Nm ipacctctl
 written by
-.An Roman V. Palagin Aq romanp@unshadow.net .
+.An Roman V. Palagin Aq Mt romanp@unshadow.net .
diff --git a/usr.sbin/freebsd-update/freebsd-update.8 b/usr.sbin/freebsd-update/freebsd-update.8
index f372587eee8b..b85a4e4b7682 100644
--- a/usr.sbin/freebsd-update/freebsd-update.8
+++ b/usr.sbin/freebsd-update/freebsd-update.8
@@ -174,4 +174,4 @@ stores temporary files and downloaded updates.
 .Sh SEE ALSO
 .Xr freebsd-update.conf 5
 .Sh AUTHORS
-.An Colin Percival Aq cperciva@FreeBSD.org
+.An Colin Percival Aq Mt cperciva@FreeBSD.org
diff --git a/usr.sbin/fwcontrol/fwcontrol.8 b/usr.sbin/fwcontrol/fwcontrol.8
index a2767ebc240e..4e9b61b77c39 100644
--- a/usr.sbin/fwcontrol/fwcontrol.8
+++ b/usr.sbin/fwcontrol/fwcontrol.8
@@ -211,9 +211,9 @@ The
 utility first appeared in
 .Fx 5.0 .
 .Sh AUTHORS
-.An Hidetoshi Shimokawa Aq simokawa@FreeBSD.org
-.An Petr Holub Aq hopet@ics.muni.cz
-- MPEG TS mode.
+.An Hidetoshi Shimokawa Aq Mt simokawa@FreeBSD.org
+.An Petr Holub Aq Mt hopet@ics.muni.cz
+(MPEG TS mode)
 .Sh BUGS
 This utility is still under development and provided for debugging purposes.
 Especially MPEG TS reception support is very rudimental and supports only
diff --git a/usr.sbin/gpioctl/gpioctl.8 b/usr.sbin/gpioctl/gpioctl.8
index 4db6714f5bdc..8a433726391a 100644
--- a/usr.sbin/gpioctl/gpioctl.8
+++ b/usr.sbin/gpioctl/gpioctl.8
@@ -121,5 +121,4 @@ utility appeared in
 The
 .Nm
 utility and this manual page were written by
-.An Oleksandr Tymoshenko
-.Aq gonzo@freebsd.org
+.An Oleksandr Tymoshenko Aq Mt gonzo@freebsd.org .
diff --git a/usr.sbin/gssd/gssd.8 b/usr.sbin/gssd/gssd.8
index 82c531701669..82611f847a15 100644
--- a/usr.sbin/gssd/gssd.8
+++ b/usr.sbin/gssd/gssd.8
@@ -116,4 +116,4 @@ manual page first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Doug Rabson Aq dfr@FreeBSD.org .
+.An Doug Rabson Aq Mt dfr@FreeBSD.org .
diff --git a/usr.sbin/gstat/gstat.8 b/usr.sbin/gstat/gstat.8
index 7897a627ae5f..6c0430e58f78 100644
--- a/usr.sbin/gstat/gstat.8
+++ b/usr.sbin/gstat/gstat.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 17, 2014
+.Dd July 3, 2014
 .Dt GSTAT 8
 .Os
 .Sh NAME
@@ -32,7 +32,7 @@
 .Nd print statistics about GEOM disks
 .Sh SYNOPSIS
 .Nm
-.Op Fl abcdo
+.Op Fl abcdop
 .Op Fl f Ar filter
 .Op Fl I Ar interval
 .Sh DESCRIPTION
@@ -84,6 +84,8 @@ or
 .Cm us
 (the default) indicates that the update interval is specified in
 seconds, milliseconds, or microseconds, respectively.
+.It Fl p
+Only display physical providers (those with rank of 1).
 .El
 .Sh EXIT STATUS
 .Ex -std
diff --git a/usr.sbin/gstat/gstat.c b/usr.sbin/gstat/gstat.c
index d3aeae0f27d4..d83ef79d4874 100644
--- a/usr.sbin/gstat/gstat.c
+++ b/usr.sbin/gstat/gstat.c
@@ -51,7 +51,7 @@
 #include <sysexits.h>
 #include <unistd.h>
 
-static int flag_a, flag_b, flag_c, flag_d, flag_o;
+static int flag_a, flag_b, flag_c, flag_d, flag_o, flag_p;
 static int flag_I = 1000000;
 
 #define PRINTMSG(...) do {						\
@@ -104,7 +104,7 @@ main(int argc, char **argv)
 		flag_b = 1;
 
 	f_s[0] = '\0';
-	while ((i = getopt(argc, argv, "abdcf:oI:")) != -1) {
+	while ((i = getopt(argc, argv, "abdcf:I:op")) != -1) {
 		switch (i) {
 		case 'a':
 			flag_a = 1;
@@ -143,6 +143,9 @@ main(int argc, char **argv)
 				i *= 1;
 			flag_I = i;
 			break;
+		case 'p':
+			flag_p = 1;
+			break;
 		case '?':
 		default:
 			usage();
@@ -254,6 +257,9 @@ main(int argc, char **argv)
 				continue;
 			if (gid->lg_what == ISCONSUMER && !flag_c)
 				continue;
+			if (flag_p && gid->lg_what == ISPROVIDER &&
+			   ((struct gprovider *)(gid->lg_ptr))->lg_geom->lg_rank != 1)
+				continue;
 			/* Do not print past end of window */
 			if (!flag_b) {
 				getyx(stdscr, cury, curx);
@@ -443,7 +449,7 @@ main(int argc, char **argv)
 static void
 usage(void)
 {
-	fprintf(stderr, "usage: gstat [-abcd] [-f filter] [-I interval]\n");
+	fprintf(stderr, "usage: gstat [-abcdp] [-f filter] [-I interval]\n");
 	exit(EX_USAGE);
         /* NOTREACHED */
 }
diff --git a/usr.sbin/i2c/i2c.8 b/usr.sbin/i2c/i2c.8
index cd269fa6e1ae..27f7621156b6 100644
--- a/usr.sbin/i2c/i2c.8
+++ b/usr.sbin/i2c/i2c.8
@@ -159,8 +159,6 @@ utility appeared in
 The
 .Nm
 utility and this manual page were written by
-.An Bartlomiej Sieka
-.Aq tur@semihalf.com
+.An Bartlomiej Sieka Aq Mt tur@semihalf.com
 and
-.An Michal Hajduk
-.Aq mih@semihalf.com .
+.An Michal Hajduk Aq Mt mih@semihalf.com .
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 1d2d517e328e..5223b72cf5f7 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -506,7 +506,7 @@ This version of
 first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Kenneth Merry Aq ken@FreeBSD.org
+.An Kenneth Merry Aq Mt ken@FreeBSD.org
 .Sh BUGS
 The use of
 .Nm
diff --git a/usr.sbin/ipfwpcap/ipfwpcap.8 b/usr.sbin/ipfwpcap/ipfwpcap.8
index 523b059a156f..a161ebbffb47 100644
--- a/usr.sbin/ipfwpcap/ipfwpcap.8
+++ b/usr.sbin/ipfwpcap/ipfwpcap.8
@@ -127,6 +127,6 @@ utility first appeared in
 .An -nosplit
 .Nm
 was written by
-.An P. Kern Aq pkern@cns.utoronto.ca .
+.An P. Kern Aq Mt pkern@cns.utoronto.ca .
 This manual page was written by
-.An Niclas Zeising Aq zeising@FreeBSD.org .
+.An Niclas Zeising Aq Mt zeising@FreeBSD.org .
diff --git a/usr.sbin/iscsid/iscsid.8 b/usr.sbin/iscsid/iscsid.8
index 89c7c257e7f0..fbfc55d72c2c 100644
--- a/usr.sbin/iscsid/iscsid.8
+++ b/usr.sbin/iscsid/iscsid.8
@@ -109,5 +109,5 @@ command appeared in
 The
 .Nm
 was developed by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org
+.An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
 under sponsorship from the FreeBSD Foundation.
diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c
index cea996de6c3e..4e85b1ce345c 100644
--- a/usr.sbin/iscsid/iscsid.c
+++ b/usr.sbin/iscsid/iscsid.c
@@ -149,8 +149,8 @@ resolve_addr(const struct connection *conn, const char *address,
 }
 
 static struct connection *
-connection_new(unsigned int session_id, const struct iscsi_session_conf *conf,
-    int iscsi_fd)
+connection_new(unsigned int session_id, const uint8_t isid[8], uint16_t tsih,
+    const struct iscsi_session_conf *conf, int iscsi_fd)
 {
 	struct connection *conn;
 	struct addrinfo *from_ai, *to_ai;
@@ -176,6 +176,8 @@ connection_new(unsigned int session_id, const struct iscsi_session_conf *conf,
 	conn->conn_first_burst_length = 65536;
 
 	conn->conn_session_id = session_id;
+	memcpy(&conn->conn_isid, isid, sizeof(conn->conn_isid));
+	conn->conn_tsih = tsih;
 	conn->conn_iscsi_fd = iscsi_fd;
 
 	/*
@@ -264,7 +266,7 @@ handoff(struct connection *conn)
 	idh.idh_socket = conn->conn_socket;
 	strlcpy(idh.idh_target_alias, conn->conn_target_alias,
 	    sizeof(idh.idh_target_alias));
-	memcpy(idh.idh_isid, conn->conn_isid, sizeof(idh.idh_isid));
+	idh.idh_tsih = conn->conn_tsih;
 	idh.idh_statsn = conn->conn_statsn;
 	idh.idh_header_digest = conn->conn_header_digest;
 	idh.idh_data_digest = conn->conn_data_digest;
@@ -304,10 +306,10 @@ capsicate(struct connection *conn)
 	cap_rights_t rights;
 #ifdef ICL_KERNEL_PROXY
 	const unsigned long cmds[] = { ISCSIDCONNECT, ISCSIDSEND, ISCSIDRECEIVE,
-	    ISCSIDHANDOFF, ISCSIDFAIL, ISCSISADD, ISCSISREMOVE };
+	    ISCSIDHANDOFF, ISCSIDFAIL, ISCSISADD, ISCSISREMOVE, ISCSISMODIFY };
 #else
 	const unsigned long cmds[] = { ISCSIDHANDOFF, ISCSIDFAIL, ISCSISADD,
-	    ISCSISREMOVE };
+	    ISCSISREMOVE, ISCSISMODIFY };
 #endif
 
 	cap_rights_init(&rights, CAP_IOCTL);
@@ -430,7 +432,8 @@ handle_request(int iscsi_fd, const struct iscsi_daemon_request *request, int tim
 		setproctitle("%s", request->idr_conf.isc_target_addr);
 	}
 
-	conn = connection_new(request->idr_session_id, &request->idr_conf, iscsi_fd);
+	conn = connection_new(request->idr_session_id, request->idr_isid,
+	    request->idr_tsih, &request->idr_conf, iscsi_fd);
 	set_timeout(timeout);
 	capsicate(conn);
 	login(conn);
diff --git a/usr.sbin/iscsid/iscsid.h b/usr.sbin/iscsid/iscsid.h
index b19542d24250..962355947a4f 100644
--- a/usr.sbin/iscsid/iscsid.h
+++ b/usr.sbin/iscsid/iscsid.h
@@ -51,6 +51,7 @@ struct connection {
 	struct iscsi_session_conf	conn_conf;
 	char			conn_target_alias[ISCSI_ADDR_LEN];
 	uint8_t			conn_isid[6];
+	uint16_t		conn_tsih;
 	uint32_t		conn_statsn;
 	int			conn_header_digest;
 	int			conn_data_digest;
diff --git a/usr.sbin/iscsid/login.c b/usr.sbin/iscsid/login.c
index 09dcddfe20da..f4fd29f2c3bf 100644
--- a/usr.sbin/iscsid/login.c
+++ b/usr.sbin/iscsid/login.c
@@ -30,6 +30,7 @@
  */
 
 #include <sys/types.h>
+#include <sys/ioctl.h>
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -158,12 +159,67 @@ login_target_error_str(int class, int detail)
 	}
 }
 
+static void
+kernel_modify(const struct connection *conn, const char *target_address)
+{
+	struct iscsi_session_modify ism;
+	int error;
+
+	memset(&ism, 0, sizeof(ism));
+	ism.ism_session_id = conn->conn_session_id;
+	memcpy(&ism.ism_conf, &conn->conn_conf, sizeof(ism.ism_conf));
+	strlcpy(ism.ism_conf.isc_target_addr, target_address,
+	    sizeof(ism.ism_conf.isc_target));
+	error = ioctl(conn->conn_iscsi_fd, ISCSISMODIFY, &ism);
+	if (error != 0) {
+		log_err(1, "failed to redirect to %s: ISCSISMODIFY",
+		    target_address);
+	}
+}
+
+/*
+ * XXX:	The way it works is suboptimal; what should happen is described
+ *	in draft-gilligan-iscsi-fault-tolerance-00.  That, however, would
+ *	be much more complicated: we would need to keep "dependencies"
+ *	for sessions, so that, in case described in draft and using draft
+ *	terminology, we would have three sessions: one for discovery,
+ *	one for initial target portal, and one for redirect portal.  
+ *	This would allow us to "backtrack" on connection failure,
+ *	as described in draft.
+ */
+static void
+login_handle_redirection(struct connection *conn, struct pdu *response)
+{
+	struct iscsi_bhs_login_response *bhslr;
+	struct keys *response_keys;
+	const char *target_address;
+
+	bhslr = (struct iscsi_bhs_login_response *)response->pdu_bhs;
+	assert (bhslr->bhslr_status_class == 1);
+
+	response_keys = keys_new();
+	keys_load(response_keys, response);
+
+	target_address = keys_find(response_keys, "TargetAddress");
+	if (target_address == NULL)
+		log_errx(1, "received redirection without TargetAddress");
+	if (target_address[0] == '\0')
+		log_errx(1, "received redirection with empty TargetAddress");
+	if (strlen(target_address) >=
+	    sizeof(conn->conn_conf.isc_target_addr) - 1)
+		log_errx(1, "received TargetAddress is too long");
+
+	log_debugx("received redirection to \"%s\"", target_address);
+	kernel_modify(conn, target_address);
+}
+
 static struct pdu *
-login_receive(struct connection *conn, bool initial)
+login_receive(struct connection *conn)
 {
 	struct pdu *response;
 	struct iscsi_bhs_login_response *bhslr;
 	const char *errorstr;
+	static bool initial = true;
 
 	response = pdu_new(conn);
 	pdu_receive(response);
@@ -183,6 +239,11 @@ login_receive(struct connection *conn, bool initial)
 	if (bhslr->bhslr_version_active != 0x00)
 		log_errx(1, "received Login PDU with unsupported "
 		    "Version-active 0x%x", bhslr->bhslr_version_active);
+	if (bhslr->bhslr_status_class == 1) {
+		login_handle_redirection(conn, response);
+		log_debugx("redirection handled; exiting");
+		exit(0);
+	}
 	if (bhslr->bhslr_status_class != 0) {
 		errorstr = login_target_error_str(bhslr->bhslr_status_class,
 		    bhslr->bhslr_status_detail);
@@ -199,25 +260,43 @@ login_receive(struct connection *conn, bool initial)
 		    "is %d, should be %d", ntohl(bhslr->bhslr_statsn),
 		    conn->conn_statsn + 1);
 	}
+	conn->conn_tsih = ntohs(bhslr->bhslr_tsih);
 	conn->conn_statsn = ntohl(bhslr->bhslr_statsn);
 
+	initial = false;
+
 	return (response);
 }
 
 static struct pdu *
-login_new_request(struct connection *conn)
+login_new_request(struct connection *conn, int csg)
 {
 	struct pdu *request;
 	struct iscsi_bhs_login_request *bhslr;
+	int nsg;
 
 	request = pdu_new(conn);
 	bhslr = (struct iscsi_bhs_login_request *)request->pdu_bhs;
 	bhslr->bhslr_opcode = ISCSI_BHS_OPCODE_LOGIN_REQUEST |
 	    ISCSI_BHS_OPCODE_IMMEDIATE;
+
 	bhslr->bhslr_flags = BHSLR_FLAGS_TRANSIT;
-	login_set_csg(request, BHSLR_STAGE_SECURITY_NEGOTIATION);
-	login_set_nsg(request, BHSLR_STAGE_OPERATIONAL_NEGOTIATION);
+	switch (csg) {
+	case BHSLR_STAGE_SECURITY_NEGOTIATION:
+		nsg = BHSLR_STAGE_OPERATIONAL_NEGOTIATION;
+		break;
+	case BHSLR_STAGE_OPERATIONAL_NEGOTIATION:
+		nsg = BHSLR_STAGE_FULL_FEATURE_PHASE;
+		break;
+	default:
+		assert(!"invalid csg");
+		log_errx(1, "invalid csg %d", csg);
+	}
+	login_set_csg(request, csg);
+	login_set_nsg(request, nsg);
+
 	memcpy(bhslr->bhslr_isid, &conn->conn_isid, sizeof(bhslr->bhslr_isid));
+	bhslr->bhslr_tsih = htons(conn->conn_tsih);
 	bhslr->bhslr_initiator_task_tag = 0;
 	bhslr->bhslr_cmdsn = 0;
 	bhslr->bhslr_expstatsn = htonl(conn->conn_statsn + 1);
@@ -495,10 +574,8 @@ login_negotiate(struct connection *conn)
 	struct iscsi_bhs_login_response *bhslr;
 	int i;
 
-	log_debugx("beginning parameter negotiation");
-	request = login_new_request(conn);
-	login_set_csg(request, BHSLR_STAGE_OPERATIONAL_NEGOTIATION);
-	login_set_nsg(request, BHSLR_STAGE_FULL_FEATURE_PHASE);
+	log_debugx("beginning operational parameter negotiation");
+	request = login_new_request(conn, BHSLR_STAGE_OPERATIONAL_NEGOTIATION);
 	request_keys = keys_new();
 
 	/*
@@ -538,7 +615,7 @@ login_negotiate(struct connection *conn)
 	pdu_delete(request);
 	request = NULL;
 
-	response = login_receive(conn, false);
+	response = login_receive(conn);
 	response_keys = keys_new();
 	keys_load(response_keys, response);
 	for (i = 0; i < KEYS_MAX; i++) {
@@ -557,7 +634,7 @@ login_negotiate(struct connection *conn)
 		log_warnx("received final login response with wrong NSG 0x%x",
 		    login_nsg(response));
 
-	log_debugx("parameter negotiation done; "
+	log_debugx("operational parameter negotiation done; "
 	    "transitioning to Full Feature phase");
 
 	keys_delete(response_keys);
@@ -570,7 +647,7 @@ login_send_chap_a(struct connection *conn)
 	struct pdu *request;
 	struct keys *request_keys;
 
-	request = login_new_request(conn);
+	request = login_new_request(conn, BHSLR_STAGE_SECURITY_NEGOTIATION);
 	request_keys = keys_new();
 	keys_add(request_keys, "CHAP_A", "5");
 	keys_save(request_keys, request);
@@ -632,7 +709,7 @@ login_send_chap_r(struct pdu *response)
 
 	keys_delete(response_keys);
 
-	request = login_new_request(conn);
+	request = login_new_request(conn, BHSLR_STAGE_SECURITY_NEGOTIATION);
 	request_keys = keys_new();
 	keys_add(request_keys, "CHAP_N", conn->conn_conf.isc_user);
 	keys_add(request_keys, "CHAP_R", chap_r);
@@ -730,7 +807,7 @@ login_chap(struct connection *conn)
 	login_send_chap_a(conn);
 
 	log_debugx("waiting for CHAP_A/CHAP_C/CHAP_I");
-	response = login_receive(conn, false);
+	response = login_receive(conn);
 
 	log_debugx("sending CHAP_N/CHAP_R");
 	login_send_chap_r(response);
@@ -741,7 +818,7 @@ login_chap(struct connection *conn)
 	 */
 
 	log_debugx("waiting for CHAP result");
-	response = login_receive(conn, false);
+	response = login_receive(conn);
 	if (conn->conn_conf.isc_mutual_user[0] != '\0')
 		login_verify_mutual(response);
 	pdu_delete(response);
@@ -749,24 +826,6 @@ login_chap(struct connection *conn)
 	log_debugx("CHAP authentication done");
 }
 
-static void
-login_create_isid(struct connection *conn)
-{
-	int rv;
-
-	/*
-	 * RFC 3720, 10.12.5: 10b, "Random" ISID.
-	 *
-	 */
-	conn->conn_isid[0] = 0x80; 
-
-	rv = RAND_bytes(&conn->conn_isid[1], 3);
-	if (rv != 1) {
-		log_errx(1, "RAND_bytes failed: %s",
-		    ERR_error_string(ERR_get_error(), NULL));
-	}
-}
-
 void
 login(struct connection *conn)
 {
@@ -776,10 +835,8 @@ login(struct connection *conn)
 	const char *auth_method;
 	int i;
 
-	login_create_isid(conn);
-
 	log_debugx("beginning Login phase; sending Login PDU");
-	request = login_new_request(conn);
+	request = login_new_request(conn, BHSLR_STAGE_SECURITY_NEGOTIATION);
 	request_keys = keys_new();
 	if (conn->conn_conf.isc_mutual_user[0] != '\0') {
 		keys_add(request_keys, "AuthMethod", "CHAP");
@@ -819,7 +876,7 @@ login(struct connection *conn)
 	pdu_send(request);
 	pdu_delete(request);
 
-	response = login_receive(conn, true);
+	response = login_receive(conn);
 
 	response_keys = keys_new();
 	keys_load(response_keys, response);
@@ -848,12 +905,12 @@ login(struct connection *conn)
 	    login_nsg(response) == BHSLR_STAGE_OPERATIONAL_NEGOTIATION) {
 		if (conn->conn_conf.isc_mutual_user[0] != '\0') {
 			log_errx(1, "target requested transition "
-			    "to operational negotiation, but we require "
-			    "mutual CHAP");
+			    "to operational parameter negotiation, "
+			    "but we require mutual CHAP");
 		}
 
 		log_debugx("target requested transition "
-		    "to operational negotiation");
+		    "to operational parameter negotiation");
 		keys_delete(response_keys);
 		pdu_delete(response);
 		login_negotiate(conn);
diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c
index 04a4514da368..0d1c89857067 100644
--- a/usr.sbin/jail/command.c
+++ b/usr.sbin/jail/command.c
@@ -268,7 +268,7 @@ run_command(struct cfjail *j)
 	pid_t pid;
 	int argc, bg, clean, consfd, down, fib, i, injail, sjuser, timeout;
 #if defined(INET) || defined(INET6)
-	char *addr;
+	char *addr, *extrap, *p, *val;
 #endif
 
 	static char *cleanenv;
@@ -317,16 +317,30 @@ run_command(struct cfjail *j)
 	switch (comparam) {
 #ifdef INET
 	case IP__IP4_IFADDR:
-		argv = alloca(8 * sizeof(char *));
+		argc = 0;
+		val = alloca(strlen(comstring->s) + 1);
+		strcpy(val, comstring->s);
+		cs = val;
+		extrap = NULL;
+		while ((p = strchr(cs, ' ')) != NULL && strlen(p) > 1) {
+			if (extrap == NULL) {
+				*p = '\0';
+				extrap = p + 1;
+			}
+			cs = p + 1;
+			argc++;
+		}
+
+		argv = alloca((8 + argc) * sizeof(char *));
 		*(const char **)&argv[0] = _PATH_IFCONFIG;
-		if ((cs = strchr(comstring->s, '|'))) {
-			argv[1] = alloca(cs - comstring->s + 1);
-			strlcpy(argv[1], comstring->s, cs - comstring->s + 1);
+		if ((cs = strchr(val, '|'))) {
+			argv[1] = alloca(cs - val + 1);
+			strlcpy(argv[1], val, cs - val + 1);
 			addr = cs + 1;
 		} else {
 			*(const char **)&argv[1] =
 			    string_param(j->intparams[IP_INTERFACE]);
-			addr = comstring->s;
+			addr = val;
 		}
 		*(const char **)&argv[2] = "inet";
 		if (!(cs = strchr(addr, '/'))) {
@@ -344,6 +358,15 @@ run_command(struct cfjail *j)
 			argv[3] = addr;
 			argc = 4;
 		}
+
+		if (!down) {
+			for (cs = strtok(extrap, " "); cs; cs = strtok(NULL, " ")) {
+				size_t len = strlen(cs) + 1;
+				argv[argc] = alloca(len);
+				strlcpy(argv[argc++], cs, len);
+			}
+		}
+
 		*(const char **)&argv[argc] = down ? "-alias" : "alias";
 		argv[argc + 1] = NULL;
 		break;
@@ -351,16 +374,30 @@ run_command(struct cfjail *j)
 
 #ifdef INET6
 	case IP__IP6_IFADDR:
-		argv = alloca(8 * sizeof(char *));
+		argc = 0;
+		val = alloca(strlen(comstring->s) + 1);
+		strcpy(val, comstring->s);
+		cs = val;
+		extrap = NULL;
+		while ((p = strchr(cs, ' ')) != NULL && strlen(p) > 1) {
+			if (extrap == NULL) {
+				*p = '\0';
+				extrap = p + 1;
+			}
+			cs = p + 1;
+			argc++;
+		}
+
+		argv = alloca((8 + argc) * sizeof(char *));
 		*(const char **)&argv[0] = _PATH_IFCONFIG;
-		if ((cs = strchr(comstring->s, '|'))) {
-			argv[1] = alloca(cs - comstring->s + 1);
-			strlcpy(argv[1], comstring->s, cs - comstring->s + 1);
+		if ((cs = strchr(val, '|'))) {
+			argv[1] = alloca(cs - val + 1);
+			strlcpy(argv[1], val, cs - val + 1);
 			addr = cs + 1;
 		} else {
 			*(const char **)&argv[1] =
 			    string_param(j->intparams[IP_INTERFACE]);
-			addr = comstring->s;
+			addr = val;
 		}
 		*(const char **)&argv[2] = "inet6";
 		argv[3] = addr;
@@ -370,6 +407,15 @@ run_command(struct cfjail *j)
 			argc = 6;
 		} else
 			argc = 4;
+
+		if (!down) {
+			for (cs = strtok(extrap, " "); cs; cs = strtok(NULL, " ")) {
+				size_t len = strlen(cs) + 1;
+				argv[argc] = alloca(len);
+				strlcpy(argv[argc++], cs, len);
+			}
+		}
+
 		*(const char **)&argv[argc] = down ? "-alias" : "alias";
 		argv[argc + 1] = NULL;
 		break;	
diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c
index 57967082b9f2..cd02a500c544 100644
--- a/usr.sbin/jail/config.c
+++ b/usr.sbin/jail/config.c
@@ -576,7 +576,9 @@ check_intparams(struct cfjail *j)
 
 	/*
 	 * IP addresses may include an interface to set that address on,
-	 * and a netmask/suffix for that address.
+	 * a netmask/suffix for that address and options for ifconfig.
+	 * These are copied to an internal command parameter and then stripped
+	 * so they won't be passed on to jailparam_set.
 	 */
 	defif = string_param(j->intparams[IP_INTERFACE]) != NULL;
 #ifdef INET
@@ -601,6 +603,10 @@ check_intparams(struct cfjail *j)
 				*cs = '\0';
 				s->len = cs - s->s;
 			}
+			if ((cs = strchr(s->s, ' ')) != NULL) {
+				*cs = '\0';
+				s->len = cs - s->s;
+			}
 		}
 	}
 #endif
@@ -625,6 +631,10 @@ check_intparams(struct cfjail *j)
 				*cs = '\0';
 				s->len = cs - s->s;
 			}
+			if ((cs = strchr(s->s, ' ')) != NULL) {
+				*cs = '\0';
+				s->len = cs - s->s;
+			}
 		}
 	}
 #endif
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 046c022d93cf..927e2bb449eb 100644
--- a/usr.sbin/jail/jail.8
+++ b/usr.sbin/jail/jail.8
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 16, 2014
+.Dd August 4, 2014
 .Dt JAIL 8
 .Os
 .Sh NAME
@@ -655,8 +655,9 @@ file, instead of in the jail's file.
 The user to run commands as, when running in the system environment.
 The default is to run the commands as the current user.
 .It Va exec.timeout
-The maximum amount of time to wait for a command to complete.
-If a command is still running after this many seconds have passed,
+The maximum amount of time to wait for a command to complete, in
+seconds.
+If a command is still running after this timeout has passed,
 the jail will not be created or removed, as appropriate.
 .It Va exec.consolelog
 A file to direct command output (stdout and stderr) to.
@@ -686,18 +687,24 @@ jail is created, and will be removed from the interface after the
 jail is removed.
 .It Va ip4.addr
 In addition to the IP addresses that are passed to the kernel, an
-interface and/or a netmask may also be specified, in the form
-.Dq Ar interface Ns | Ns Ar ip-address Ns / Ns Ar netmask .
+interface, netmask and additional paramters (as supported by
+.Xr ifconfig 8 Ns )
+may also be specified, in the form
+.Dq Ar interface Ns | Ns Ar ip-address Ns / Ns Ar netmask param ... .
 If an interface is given before the IP address, an alias for the address
 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 an IP address, it will be used when adding the IP alias.
+If additional parameters are specified then they will also be used when
+adding the IP alias.
 .It Va ip6.addr
 In addition to the IP addresses that are passed to the kernel,
-an interface and/or a prefix may also be specified, in the form
-.Dq Ar interface Ns | Ns Ar ip-address Ns / Ns Ar prefix .
+an interface, prefix and additional parameters (as supported by
+.Xr ifconfig 8 Ns )
+may also be specified, in the form
+.Dq Ar interface Ns | Ns Ar ip-address Ns / Ns Ar prefix param ... .
 .It Va vnet.interface
 A network interface to give to a vnet-enabled jail after is it created.
 The interface will automatically be released when the jail is removed.
@@ -1176,6 +1183,7 @@ environment of the first jail.
 .Xr pkill 1 ,
 .Xr ps 1 ,
 .Xr quota 1 ,
+.Xr ifconfig 8 ,
 .Xr jail_set 2 ,
 .Xr devfs 5 ,
 .Xr fdescfs 5 ,
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index 76cc5bb38032..3ffa2709601c 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/usr.sbin/kbdcontrol/kbdcontrol.1
@@ -271,6 +271,6 @@ kbdcontrol -k /dev/kbdmux0 < /dev/console
 .Xr kbdmap 5 ,
 .Xr rc.conf 5
 .Sh AUTHORS
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
 .Sh BUGS
 Report when found.
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c
index d38eda091357..241e10d3fcf2 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -146,11 +146,12 @@ static void	usage(void) __dead2;
 static int
 is_vt4(void)
 {
+	char vty_name[4] = "";
+	size_t len = sizeof(vty_name);
 
-	if (sysctlbyname("kern.vt.deadtimer", NULL, NULL, NULL, 0) == 0)
-		return (1);
-
-	return (0);
+	if (sysctlbyname("kern.vty", vty_name, &len, NULL, 0) != 0)
+		return (0);
+	return (strcmp(vty_name, "vt") == 0);
 }
 
 static char *
@@ -799,7 +800,7 @@ load_keymap(char *opt, int dumponly)
 	char	*name, *cp;
 	char	blank[] = "", keymap_path[] = KEYMAP_PATH;
 	char	vt_keymap_path[] = VT_KEYMAP_PATH, dotkbd[] = ".kbd";
-	char	*prefix[]  = {blank, blank, keymap_path, NULL};
+	char	*prefix[]  = {blank, blank, blank, keymap_path, NULL};
 	char	*postfix[] = {blank, dotkbd, NULL};
 
 	if (is_vt4())
diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index 4201fde148d7..6769c307fbbc 100644
--- a/usr.sbin/kbdmap/kbdmap.1
+++ b/usr.sbin/kbdmap/kbdmap.1
@@ -131,12 +131,10 @@ commands appeared in
 .Fx 2.1 .
 .Sh AUTHORS
 .An -nosplit
-.An Wolfram Schneider
-.Aq wosch@FreeBSD.org
+.An Wolfram Schneider Aq Mt wosch@FreeBSD.org
 wrote the original Perl version.
 The current version was rewritten in C by
-.An Jonathan Belson
-.Aq jon@witchspace.com
+.An Jonathan Belson Aq Mt jon@witchspace.com
 for
 .Fx 5.0 .
 .Sh BUGS
diff --git a/usr.sbin/kgzip/kgzip.8 b/usr.sbin/kgzip/kgzip.8
index 7f810d4e6460..72d0bf5cfe86 100644
--- a/usr.sbin/kgzip/kgzip.8
+++ b/usr.sbin/kgzip/kgzip.8
@@ -132,7 +132,7 @@ The default loader
 .Xr boot 8 ,
 .Xr loader 8
 .Sh AUTHORS
-.An Robert Nordier Aq rnordier@FreeBSD.org .
+.An Robert Nordier Aq Mt rnordier@FreeBSD.org
 .Sh BUGS
 As symbols are lost, the usefulness of this utility for compressing
 kernels is limited to situations where
diff --git a/usr.sbin/kldxref/kldxref.8 b/usr.sbin/kldxref/kldxref.8
index a69af33d1829..1a3b9118dd5c 100644
--- a/usr.sbin/kldxref/kldxref.8
+++ b/usr.sbin/kldxref/kldxref.8
@@ -88,8 +88,8 @@ utility first appeared in
 The
 .Nm
 utility was implemented by
-.An Boris Popov Aq bp@FreeBSD.org .
+.An Boris Popov Aq Mt bp@FreeBSD.org .
 This manual page was written by
-.An Boris Popov Aq bp@FreeBSD.org
+.An Boris Popov Aq Mt bp@FreeBSD.org
 and
-.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org .
diff --git a/usr.sbin/lmcconfig/lmcconfig.8 b/usr.sbin/lmcconfig/lmcconfig.8
index 06fcc9e1a224..6eac2574c8b1 100644
--- a/usr.sbin/lmcconfig/lmcconfig.8
+++ b/usr.sbin/lmcconfig/lmcconfig.8
@@ -718,6 +718,6 @@ the user is not privileged and tried to alter an interface's configuration.
 This is a total rewrite of the program
 .Nm lmcctl
 by
-.An "Andrew Stanley-Jones" .
+.An Andrew Stanley-Jones .
 .Sh AUTHORS
-.An "David Boggs" Aq boggs@boggs.palo-alto.ca.us
+.An David Boggs Aq Mt boggs@boggs.palo-alto.ca.us
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.8 b/usr.sbin/lpr/chkprintcap/chkprintcap.8
index c2524a159c70..b41546242b15 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.8
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.8
@@ -88,7 +88,7 @@ capability in the database (default 1, which corresponds to user
 The
 .Nm
 utility was written by
-.An Garrett A. Wollman Aq wollman@lcs.mit.edu .
+.An Garrett A. Wollman Aq Mt wollman@lcs.mit.edu .
 .Sh BUGS
 Not enough sanity-checking is done.
 At a minimum, the ownership and
diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile
index 65a8010ecda4..7f228d666c38 100644
--- a/usr.sbin/lpr/lpc/Makefile
+++ b/usr.sbin/lpr/lpc/Makefile
@@ -13,8 +13,8 @@ CFLAGS+= -I${.CURDIR}/../common_source
 
 WARNS?=	0
 
-DPADD=	${LIBLPR} ${LIBEDIT} ${LIBTERMCAP}
-LDADD=	${LIBLPR} -ledit -ltermcap
+DPADD=	${LIBLPR} ${LIBEDIT} ${LIBTERMCAPW}
+LDADD=	${LIBLPR} -ledit -ltermcapw
 
 NO_PIE=	yes
 
diff --git a/usr.sbin/mailwrapper/mailwrapper.8 b/usr.sbin/mailwrapper/mailwrapper.8
index 6e498f643f1b..11bfe9539585 100644
--- a/usr.sbin/mailwrapper/mailwrapper.8
+++ b/usr.sbin/mailwrapper/mailwrapper.8
@@ -153,7 +153,7 @@ utility first appeared in
 and then
 .Fx 4.0 .
 .Sh AUTHORS
-.An Perry E. Metzger Aq perry@piermont.com
+.An Perry E. Metzger Aq Mt perry@piermont.com
 .Sh BUGS
 The entire reason this program exists is a crock.
 Instead, a command
diff --git a/usr.sbin/makefs/makefs.8 b/usr.sbin/makefs/makefs.8
index 51e536f030ae..91ab2048718d 100644
--- a/usr.sbin/makefs/makefs.8
+++ b/usr.sbin/makefs/makefs.8
@@ -363,12 +363,11 @@ The
 utility appeared in
 .Nx 1.6 .
 .Sh AUTHORS
-.An Luke Mewburn
-.Aq lukem@NetBSD.org
+.An Luke Mewburn Aq Mt lukem@NetBSD.org
 (original program)
-.An Daniel Watt ,
-.An Walter Deignan ,
-.An Ryan Gabrys ,
-.An Alan Perez-Rathke ,
+.An Daniel Watt
+.An Walter Deignan
+.An Ryan Gabrys
+.An Alan Perez-Rathke
 .An Ram Vedam
 (cd9660 support)
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8
index 1cff9841ebd7..c3e22a055961 100644
--- a/usr.sbin/mergemaster/mergemaster.8
+++ b/usr.sbin/mergemaster/mergemaster.8
@@ -473,4 +473,4 @@ temporary root environment comes from Nik Clayton's
 make world tutorial which is referenced above.
 .Sh AUTHORS
 This manual page and the script itself were written by
-.An Douglas Barton Aq dougb@FreeBSD.org .
+.An Douglas Barton Aq Mt dougb@FreeBSD.org .
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index a200088b1194..9bf4f9f67a01 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -760,7 +760,7 @@ CONFIRMED_UMASK=${NEW_UMASK:-0022}
 # Warn users who still have old rc files
 #
 for file in atm devfs diskless1 diskless2 network network6 pccard \
-  serial syscons sysctl alpha amd64 i386 ia64 sparc64; do
+  serial syscons sysctl alpha amd64 i386 sparc64; do
   if [ -f "${DESTDIR}/etc/rc.${file}" ]; then
     OLD_RC_PRESENT=1
     break
@@ -786,7 +786,7 @@ case "${OLD_RC_PRESENT}" in
     *)
       mkdir -p /var/tmp/mergemaster/old_rc
         for file in atm devfs diskless1 diskless2 network network6 pccard \
-          serial syscons sysctl alpha amd64 i386 ia64 sparc64; do
+          serial syscons sysctl alpha amd64 i386 sparc64; do
           if [ -f "${DESTDIR}/etc/rc.${file}" ]; then
             mv ${DESTDIR}/etc/rc.${file} /var/tmp/mergemaster/old_rc/
           fi
diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8
index 5c5f6bf3e31d..6e569cc8cfd9 100644
--- a/usr.sbin/mixer/mixer.8
+++ b/usr.sbin/mixer/mixer.8
@@ -171,11 +171,11 @@ utility first appeared in
 .Sh AUTHORS
 .An -nosplit
 Original source by
-.An Craig Metz Aq cmetz@thor.tjhsst.edu
+.An Craig Metz Aq Mt cmetz@thor.tjhsst.edu
 and
 .An Hannu Savolainen .
 Mostly rewritten by
-.An John-Mark Gurney Aq jmg@FreeBSD.org .
+.An John-Mark Gurney Aq Mt jmg@FreeBSD.org .
 This
 manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.org .
+.An Mike Pritchard Aq Mt mpp@FreeBSD.org .
diff --git a/usr.sbin/mlxcontrol/mlxcontrol.8 b/usr.sbin/mlxcontrol/mlxcontrol.8
index 4ad6b63b8c6c..33788b94b070 100644
--- a/usr.sbin/mlxcontrol/mlxcontrol.8
+++ b/usr.sbin/mlxcontrol/mlxcontrol.8
@@ -136,9 +136,10 @@ Print usage information for
 .Ar command .
 .El
 .Sh AUTHORS
-The mlxcontrol utility was written by
-.An Michael Smith
-.Aq msmith@FreeBSD.org .
+The
+.Nm
+utility was written by
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 .Sh BUGS
 The
 .Ar config
diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8
index 5e4dd432a7f1..27990929e7be 100644
--- a/usr.sbin/moused/moused.8
+++ b/usr.sbin/moused/moused.8
@@ -819,11 +819,11 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Michael Smith Aq msmith@FreeBSD.org .
+.An Michael Smith Aq Mt msmith@FreeBSD.org .
 This manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.org .
+.An Mike Pritchard Aq Mt mpp@FreeBSD.org .
 The command and manual page have since been updated by
-.An Kazutaka Yokota Aq yokota@FreeBSD.org .
+.An Kazutaka Yokota Aq Mt yokota@FreeBSD.org .
 .Sh CAVEATS
 Many pad devices behave as if the first (left) button were pressed if
 the user
diff --git a/usr.sbin/mptable/mptable.1 b/usr.sbin/mptable/mptable.1
index 56f901a7c7ce..83e4cea1908e 100644
--- a/usr.sbin/mptable/mptable.1
+++ b/usr.sbin/mptable/mptable.1
@@ -66,4 +66,4 @@ The
 command first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Steve Passe Aq fsmp@FreeBSD.org
+.An Steve Passe Aq Mt fsmp@FreeBSD.org
diff --git a/usr.sbin/nandsim/nandsim.8 b/usr.sbin/nandsim/nandsim.8
index 5b318a233dae..c7bdb9a4f019 100644
--- a/usr.sbin/nandsim/nandsim.8
+++ b/usr.sbin/nandsim/nandsim.8
@@ -224,6 +224,6 @@ The
 .Nm
 utility first appeared in
 .Fx 10.0 .
-.Sh AUTHOR
+.Sh AUTHORS
 This utility was written by
 .An Lukasz Wojcik .
diff --git a/usr.sbin/ndiscvt/ndiscvt.8 b/usr.sbin/ndiscvt/ndiscvt.8
index a9bc916141f2..f4974958e005 100644
--- a/usr.sbin/ndiscvt/ndiscvt.8
+++ b/usr.sbin/ndiscvt/ndiscvt.8
@@ -273,11 +273,11 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
 The
 .Xr lex 1
 and
 .Xr yacc 1
 .Pa INF
 file parser was written by
-.An Matthew Dodd Aq mdodd@FreeBSD.org .
+.An Matthew Dodd Aq Mt mdodd@FreeBSD.org .
diff --git a/usr.sbin/ndiscvt/ndisgen.8 b/usr.sbin/ndiscvt/ndisgen.8
index c4ad4950be49..2fb4f401596e 100644
--- a/usr.sbin/ndiscvt/ndisgen.8
+++ b/usr.sbin/ndiscvt/ndisgen.8
@@ -83,4 +83,4 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index 809d758d6499..e8960102de25 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -188,9 +188,9 @@ main(int argc, char **argv)
 			mode = ch;
 			arg = NULL;
 			break;
-		case 'd':
 		case 'f':
 			exit(file(optarg) ? 1 : 0);
+		case 'd':
 		case 'i':
 			if (mode) {
 				usage();
diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8
index 19e56449532b..660e5e88a934 100644
--- a/usr.sbin/nfsd/nfsd.8
+++ b/usr.sbin/nfsd/nfsd.8
@@ -28,7 +28,7 @@
 .\"	@(#)nfsd.8	8.4 (Berkeley) 3/29/95
 .\" $FreeBSD$
 .\"
-.Dd April 23, 2011
+.Dd August 10, 2014
 .Dt NFSD 8
 .Os
 .Sh NAME
@@ -53,7 +53,7 @@ At least one
 .Nm
 must be running for a machine to operate as a server.
 .Pp
-Unless otherwise specified, four servers for
+Unless otherwise specified, eight servers per CPU for
 .Tn UDP
 transport are started.
 .Pp
@@ -175,6 +175,24 @@ utility
 would then be used to block nfs-related packets that come in on the outside
 interface.
 .Pp
+If the server has stopped servicing clients and has generated a console message
+like
+.Dq Li "nfsd server cache flooded..." ,
+the value for vfs.nfsd.tcphighwater needs to be increased.
+This should allow the server to again handle requests without a reboot.
+Also, you may want to consider decreasing the value for
+vfs.nfsd.tcpcachetimeo to several minutes (in seconds) instead of 12 hours
+when this occurs.
+.Pp
+Unfortunately making vfs.nfsd.tcphighwater too large can result in the mbuf
+limit being reached, as indicated by a console message
+like
+.Dq Li "kern.ipc.nmbufs limit reached" .
+If you cannot find values of the above
+.Nm sysctl
+values that work, you can disable the DRC cache for TCP by setting
+vfs.nfsd.cachetcp to 0.
+.Pp
 The
 .Nm
 utility has to be terminated with
diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile
index a1d1e6b375c8..cf72f39a6644 100644
--- a/usr.sbin/ngctl/Makefile
+++ b/usr.sbin/ngctl/Makefile
@@ -22,8 +22,8 @@ LDADD=	-lnetgraph
 
 .if !defined(NGCTL_NO_LIBEDIT)
 CFLAGS+= -DEDITLINE
-DPADD+=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
-LDADD+=	-lpthread -ledit -ltermcap
+DPADD+=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAPW}
+LDADD+=	-lpthread -ledit -ltermcapw
 .endif
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ngctl/ngctl.8 b/usr.sbin/ngctl/ngctl.8
index ce77069d3185..8ba9f5d2854d 100644
--- a/usr.sbin/ngctl/ngctl.8
+++ b/usr.sbin/ngctl/ngctl.8
@@ -138,4 +138,4 @@ a version of
 .Fx 2.2
 customized for the Whistle InterJet.
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@whistle.com
+.An Archie Cobbs Aq Mt archie@whistle.com
diff --git a/usr.sbin/nghook/nghook.8 b/usr.sbin/nghook/nghook.8
index 7d2c7fa5f5cc..651a6fad1bc0 100644
--- a/usr.sbin/nghook/nghook.8
+++ b/usr.sbin/nghook/nghook.8
@@ -135,7 +135,7 @@ in a version of
 .Fx 2.2
 customized for the Whistle InterJet.
 .Sh AUTHORS
-.An Archie Cobbs Aq archie@whistle.com
+.An Archie Cobbs Aq Mt archie@whistle.com
 .Sh BUGS
 Although all input is read in unbuffered mode,
 there is no way to control the packetization of the input.
diff --git a/usr.sbin/nscd/nscd.8 b/usr.sbin/nscd/nscd.8
index 7e19af93cd5b..f54c18582ee3 100644
--- a/usr.sbin/nscd/nscd.8
+++ b/usr.sbin/nscd/nscd.8
@@ -159,7 +159,7 @@ The default configuration file.
 .Xr nscd.conf 5 ,
 .Xr nsswitch.conf 5
 .Sh AUTHORS
-.An Michael Bushkov Aq bushman@FreeBSD.org
+.An Michael Bushkov Aq Mt bushman@FreeBSD.org
 .Sh BUGS
 Please send bug reports and suggestions to
-.Aq bushman@FreeBSD.org .
+.Aq Mt bushman@FreeBSD.org .
diff --git a/usr.sbin/nscd/nscd.conf.5 b/usr.sbin/nscd/nscd.conf.5
index b59449b11157..eb28eca7db2f 100644
--- a/usr.sbin/nscd/nscd.conf.5
+++ b/usr.sbin/nscd/nscd.conf.5
@@ -152,8 +152,7 @@ symbol at the beginning of the line for comments.
 .Sh SEE ALSO
 .Xr nscd 8
 .Sh AUTHORS
-.An Michael Bushkov
-.Aq bushman@FreeBSD.org
+.An Michael Bushkov Aq Mt bushman@FreeBSD.org
 .Sh BUGS
 Please send bug reports and suggestions to
-.Aq bushman@FreeBSD.org .
+.Aq Mt bushman@FreeBSD.org .
diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h
index 41622f10c862..d4b3685f471a 100644
--- a/usr.sbin/ntp/config.h
+++ b/usr.sbin/ntp/config.h
@@ -1176,7 +1176,7 @@
 /* #undef SCO5_CLOCK */
 
 /* The size of a `char*', as computed by sizeof. */
-#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__)
+#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__)
 #define SIZEOF_CHARP 8
 #else
 #define SIZEOF_CHARP 4
@@ -1186,7 +1186,7 @@
 #define SIZEOF_INT 4
 
 /* The size of a `long', as computed by sizeof. */
-#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__)
+#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__)
 #define SIZEOF_LONG 8
 #else
 #define SIZEOF_LONG 4
@@ -1199,7 +1199,7 @@
 #define SIZEOF_SIGNED_CHAR 1
 
 /* The size of a `time_t', as computed by sizeof. */
-#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__)
+#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__)
 #define SIZEOF_TIME_T 8
 #else
 #define SIZEOF_TIME_T 4
@@ -1227,8 +1227,6 @@
 #define STR_SYSTEM "sparc64-undermydesk-freebsd"
 #elif defined(__amd64__)
 #define STR_SYSTEM "amd64-undermydesk-freebsd"
-#elif defined(__ia64__)
-#define STR_SYSTEM "ia64-undermydesk-freebsd"
 #else
 #define STR_SYSTEM "i386-undermydesk-freebsd"
 #endif
diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile
index d4ea36f31e49..e4e8960982d4 100644
--- a/usr.sbin/ntp/ntpdc/Makefile
+++ b/usr.sbin/ntp/ntpdc/Makefile
@@ -15,8 +15,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \
 DPADD=	${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS}
 LDADD=	${LIBNTP} -lm -lmd ${LIBOPTS}
 
-DPADD+=		${LIBEDIT} ${LIBTERMCAP}
-LDADD+=		-ledit -ltermcap
+DPADD+=		${LIBEDIT} ${LIBTERMCAPW}
+LDADD+=		-ledit -ltermcapw
 CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
 		-I${DESTDIR}/${INCLUDEDIR}/edit
 
diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile
index 7fcdd2be3b2d..a1ddcd4cd931 100644
--- a/usr.sbin/ntp/ntpq/Makefile
+++ b/usr.sbin/ntp/ntpq/Makefile
@@ -17,8 +17,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \
 DPADD=	${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS}
 LDADD=	${LIBNTP} -lm -lmd ${LIBOPTS}
 
-DPADD+=		${LIBEDIT} ${LIBTERMCAP}
-LDADD+=		-ledit -ltermcap
+DPADD+=		${LIBEDIT} ${LIBTERMCAPW}
+LDADD+=		-ledit -ltermcapw
 CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
 		-I${DESTDIR}/${INCLUDEDIR}/edit
 
diff --git a/usr.sbin/nvram/nvram.8 b/usr.sbin/nvram/nvram.8
index 5c41a41454dd..ffc005e4364f 100644
--- a/usr.sbin/nvram/nvram.8
+++ b/usr.sbin/nvram/nvram.8
@@ -110,7 +110,7 @@ Darwin/Mac OS X
 .Nm
 utility.
 .Sh AUTHORS
-.An Maxim Sobolev Aq sobomax@FreeBSD.org
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org
 .Sh BUGS
 Currently,
 .Nm
diff --git a/usr.sbin/ofwdump/ofwdump.8 b/usr.sbin/ofwdump/ofwdump.8
index ad9cfa76890b..b21d87822a10 100644
--- a/usr.sbin/ofwdump/ofwdump.8
+++ b/usr.sbin/ofwdump/ofwdump.8
@@ -104,4 +104,4 @@ The
 .Nm
 utility
 was written by
-.An Thomas Moestl Aq tmm@FreeBSD.org .
+.An Thomas Moestl Aq Mt tmm@FreeBSD.org .
diff --git a/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8 b/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8
index c3eef64d276f..bcc1f30c309e 100644
--- a/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8
+++ b/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8
@@ -112,7 +112,7 @@ This version of
 first appeared in
 .Fx 9.0 .
 .Sh AUTHORS
-.An Kris Moore Aq kmoore@FreeBSD.org
+.An Kris Moore Aq Mt kmoore@FreeBSD.org
 .Sh BUGS
 This utility was written to install PC-BSD and has seen limited use as an
 installer for FreeBSD.  It's likely that usage to install FreeBSD will expose
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index 22a96a2a647d..175119de5a39 100644
--- a/usr.sbin/periodic/periodic.8
+++ b/usr.sbin/periodic/periodic.8
@@ -245,8 +245,8 @@ The
 utility first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Paul Traina Aq pst@FreeBSD.org
-.An Brian Somers Aq brian@Awfulhak.org
+.An Paul Traina Aq Mt pst@FreeBSD.org
+.An Brian Somers Aq Mt brian@Awfulhak.org
 .Sh BUGS
 Since one specifies information about a directory using shell
 variables containing the string,
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile
index 3892ecc59d58..6a6c1ddea8e7 100644
--- a/usr.sbin/pkg/Makefile
+++ b/usr.sbin/pkg/Makefile
@@ -8,7 +8,7 @@ CFLAGS+=-I${.CURDIR}/../../contrib/libucl/include
 .PATH:	${.CURDIR}/../../contrib/libucl/include
 DPADD=	${LIBARCHIVE} ${LIBELF} ${LIBFETCH} ${LIBUCL} ${LIBSBUF} ${LIBSSL} \
 	${LIBCRYPTO} ${LIBM}
-LDADD=	-larchive -lelf -lfetch -lucl -lsbuf -lssl -lcrypto -lm
+LDADD=	-larchive -lelf -lfetch ${LDUCL} -lsbuf -lssl -lcrypto -lm
 USEPRIVATELIB=	ucl
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pkg/elf_tables.h b/usr.sbin/pkg/elf_tables.h
index 0589ecf9425e..55fd3bbd2e95 100644
--- a/usr.sbin/pkg/elf_tables.h
+++ b/usr.sbin/pkg/elf_tables.h
@@ -42,7 +42,6 @@ static struct _elf_corres mach_corres[] = {
 	{ EM_PPC, "powerpc" },
 	{ EM_PPC64, "powerpc" },
 	{ EM_SPARCV9, "sparc64" },
-	{ EM_IA_64, "ia64" },
 	{ -1, NULL },
 };
 
diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c
index 1b1a01cf60eb..8f26c611e016 100644
--- a/usr.sbin/pkg/pkg.c
+++ b/usr.sbin/pkg/pkg.c
@@ -126,7 +126,8 @@ extract_pkg_static(int fd, char *p, int sz)
 	if (r == ARCHIVE_OK)
 		ret = 0;
 	else
-		warnx("fail to extract pkg-static");
+		warnx("failed to extract pkg-static: %s",
+		    archive_error_string(a));
 
 cleanup:
 	archive_read_free(a);
diff --git a/usr.sbin/pmcannotate/pmcannotate.8 b/usr.sbin/pmcannotate/pmcannotate.8
index 8f791c15cc9d..08967d9d7bf9 100644
--- a/usr.sbin/pmcannotate/pmcannotate.8
+++ b/usr.sbin/pmcannotate/pmcannotate.8
@@ -106,4 +106,4 @@ of interest.
 .Xr objdump 1 ,
 .Xr pmcstat 8
 .Sh AUTHORS
-.An Attilio Rao Aq attilio@FreeBSD.org
+.An Attilio Rao Aq Mt attilio@FreeBSD.org
diff --git a/usr.sbin/pmccontrol/pmccontrol.8 b/usr.sbin/pmccontrol/pmccontrol.8
index f436753dd372..a5b6baa2874f 100644
--- a/usr.sbin/pmccontrol/pmccontrol.8
+++ b/usr.sbin/pmccontrol/pmccontrol.8
@@ -124,4 +124,4 @@ The
 utility first appeared in
 .Fx 6.0 .
 .Sh AUTHORS
-.An Joseph Koshy Aq jkoshy@FreeBSD.org
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org
diff --git a/usr.sbin/pmcstat/Makefile b/usr.sbin/pmcstat/Makefile
index b8c8081b6f61..78cde444948e 100644
--- a/usr.sbin/pmcstat/Makefile
+++ b/usr.sbin/pmcstat/Makefile
@@ -5,8 +5,8 @@
 PROG=	pmcstat
 MAN=	pmcstat.8
 
-DPADD=	${LIBELF} ${LIBKVM} ${LIBPMC} ${LIBM} ${LIBNCURSES}
-LDADD=	-lelf -lkvm -lpmc -lm -lncurses
+DPADD=	${LIBELF} ${LIBKVM} ${LIBPMC} ${LIBM} ${LIBNCURSESW}
+LDADD=	-lelf -lkvm -lpmc -lm -lncursesw
 
 SRCS=	pmcstat.c pmcstat.h pmcstat_log.c \
 pmcpl_callgraph.c pmcpl_gprof.c pmcpl_annotate.c \
diff --git a/usr.sbin/pmcstat/pmcstat.8 b/usr.sbin/pmcstat/pmcstat.8
index 4ac611f647cb..8f54f5f0a96a 100644
--- a/usr.sbin/pmcstat/pmcstat.8
+++ b/usr.sbin/pmcstat/pmcstat.8
@@ -235,7 +235,7 @@ lookup information is available.
 This option requires the
 .Fl R
 option to read in samples that were previously collected and
-saved with the 
+saved with the
 .Fl o
 option.
 .It Fl c Ar cpu-spec
@@ -471,7 +471,7 @@ utility first appeared in
 It is
 .Ud
 .Sh AUTHORS
-.An Joseph Koshy Aq jkoshy@FreeBSD.org
+.An Joseph Koshy Aq Mt jkoshy@FreeBSD.org
 .Sh BUGS
 The
 .Nm
diff --git a/usr.sbin/portsnap/portsnap/portsnap.8 b/usr.sbin/portsnap/portsnap/portsnap.8
index 0e9bd7efce3e..db215f184332 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.8
+++ b/usr.sbin/portsnap/portsnap/portsnap.8
@@ -274,4 +274,4 @@ Default location where the ports tree is extracted.
 .Xr fetch 3 ,
 .Xr portsnap.conf 5
 .Sh AUTHORS
-.An Colin Percival Aq cperciva@FreeBSD.org
+.An Colin Percival Aq Mt cperciva@FreeBSD.org
diff --git a/usr.sbin/ppp/ppp.8 b/usr.sbin/ppp/ppp.8
index c4ebe501c725..59eeaed23d33 100644
--- a/usr.sbin/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp.8
@@ -6061,14 +6061,14 @@ This socket is used to pass links between different instances of
 .Xr vipw 8
 .Sh HISTORY
 This program was originally written by
-.An Toshiharu OHNO Aq tony-o@iij.ad.jp ,
+.An Toshiharu OHNO Aq Mt tony-o@iij.ad.jp ,
 and was submitted to
 .Fx 2.0.5
 by
-.An Atsushi Murai Aq amurai@spec.co.jp .
+.An Atsushi Murai Aq Mt amurai@spec.co.jp .
 .Pp
 It was substantially modified during 1997 by
-.An Brian Somers Aq brian@Awfulhak.org ,
+.An Brian Somers Aq Mt brian@Awfulhak.org ,
 and was ported to
 .Ox
 in November that year
diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile
index 2f2be4bb5035..4a03b86ad48a 100644
--- a/usr.sbin/pppctl/Makefile
+++ b/usr.sbin/pppctl/Makefile
@@ -5,7 +5,7 @@ MAN=	pppctl.8
 
 WARNS?=	2
 
-DPADD=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
-LDADD=	-lpthread -ledit -ltermcap
+DPADD=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAPW}
+LDADD=	-lpthread -ledit -ltermcapw
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index 4b3f55007f6b..36c5d9df527c 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -438,14 +438,13 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
 				delgrent(GETGRNAM(a_name->val));
 			SETGRENT();
 			while ((grp = GETGRENT()) != NULL) {
-				int i;
+				int i, j;
 				char group[MAXLOGNAME];
 				if (grp->gr_mem != NULL) {
 					for (i = 0; grp->gr_mem[i] != NULL; i++) {
 						if (!strcmp(grp->gr_mem[i], a_name->val)) {
-							while (grp->gr_mem[i] != NULL) {
-								grp->gr_mem[i] = grp->gr_mem[i+1];
-							}	
+							for (j = i; grp->gr_mem[j] != NULL; j++)
+								grp->gr_mem[j] = grp->gr_mem[j+1];
 							strlcpy(group, grp->gr_name, MAXLOGNAME);
 							chggrent(group, grp);
 						}
diff --git a/usr.sbin/pw/pwupd.c b/usr.sbin/pw/pwupd.c
index 22662dbd0b34..c2a9a535ec45 100644
--- a/usr.sbin/pw/pwupd.c
+++ b/usr.sbin/pw/pwupd.c
@@ -45,9 +45,6 @@ static const char rcsid[] =
 
 #include "pwupd.h"
 
-#define HAVE_PWDB_C	1
-#define	HAVE_PWDB_U	1
-
 static char pathpwd[] = _PATH_PWD;
 static char * pwpath = pathpwd;
  
@@ -112,22 +109,14 @@ pw_update(struct passwd * pwd, char const * user)
 {
 	int             rc = 0;
 
-	/*
-	 * First, let's check the see if the database is alright
-	 * Note: -C is only available in FreeBSD 2.2 and above
-	 */
-#ifdef HAVE_PWDB_C
 	rc = pwdb("-C", (char *)NULL);	/* Check only */
 	if (rc == 0) {
-#else
-	{				/* No -C */
-#endif
 		int pfd, tfd;
 		struct passwd *pw = NULL;
 		struct passwd *old_pw = NULL;
 
-	       	if (pwd != NULL)
-		       pw = pw_dup(pwd);
+		if (pwd != NULL)
+			pw = pw_dup(pwd);
 
 		if (user != NULL)
 			old_pw = GETPWNAM(user);
@@ -150,7 +139,7 @@ pw_update(struct passwd * pwd, char const * user)
 		 * in case of deletion of a user, the whole database
 		 * needs to be regenerated
 		 */
-		if (pw_mkdb(pw != NULL ? user : NULL) == -1) {
+		if (pw_mkdb(pw != NULL ? pw->pw_name : NULL) == -1) {
 			pw_fini();
 			err(1, "pw_mkdb()");
 		}
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index 3c75de0032fa..4b00c9e7b83a 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -141,9 +141,9 @@ Enable verbose syslogging.
 .Re
 .Sh AUTHORS
 .An -nosplit
-.An Craig Leres Aq leres@ee.lbl.gov
+.An Craig Leres Aq Mt leres@ee.lbl.gov
 and
-.An Steven McCanne Aq mccanne@ee.lbl.gov .
+.An Steven McCanne Aq Mt mccanne@ee.lbl.gov .
 Lawrence Berkeley Laboratory, University of California, Berkeley, CA.
 .Sh BUGS
 The
diff --git a/usr.sbin/rpc.umntall/rpc.umntall.8 b/usr.sbin/rpc.umntall/rpc.umntall.8
index 623663575532..7f294a0457d3 100644
--- a/usr.sbin/rpc.umntall/rpc.umntall.8
+++ b/usr.sbin/rpc.umntall/rpc.umntall.8
@@ -123,4 +123,4 @@ The
 utility first appeared in
 .Fx 4.0 .
 .Sh AUTHORS
-.An Martin Blapp Aq mb@imp.ch
+.An Martin Blapp Aq Mt mb@imp.ch
diff --git a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
index 376390866a84..3d0b48664ba6 100644
--- a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
+++ b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
@@ -335,7 +335,7 @@ The template password file(s) for non-default domains
 .Xr ypserv 8 ,
 .Xr ypxfr 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
 .Sh BUGS
 As listed in the yppasswd.x protocol definition, the YPPASSWDPROC_UPDATE
 procedure takes two arguments: a V7-style passwd structure containing
diff --git a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8 b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
index ad0c03e04575..5a7f8dab24b9 100644
--- a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
+++ b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
@@ -134,7 +134,7 @@ The NIS maps for a particular NIS domain.
 .Xr ypserv 8 ,
 .Xr ypxfr 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
 .Sh BUGS
 The
 .Fx
diff --git a/usr.sbin/rtadvctl/rtadvctl.8 b/usr.sbin/rtadvctl/rtadvctl.8
index be3eefea7c54..5df6e5cc2349 100644
--- a/usr.sbin/rtadvctl/rtadvctl.8
+++ b/usr.sbin/rtadvctl/rtadvctl.8
@@ -102,4 +102,4 @@ command first appeared in
 .Sh AUTHORS
 .Nm
 was written by
-.An "Hiroki Sato" Aq hrs@FreeBSD.org .
+.An Hiroki Sato Aq Mt hrs@FreeBSD.org .
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index 22d064513a82..85130c87f7e0 100644
--- a/usr.sbin/rtprio/rtprio.1
+++ b/usr.sbin/rtprio/rtprio.1
@@ -171,7 +171,7 @@ utility appeared in
 but is similar to the HP-UX version.
 .Sh AUTHORS
 .An -nosplit
-.An Henrik Vestergaard Draboel Aq hvd@terry.ping.dk
+.An Henrik Vestergaard Draboel Aq Mt hvd@terry.ping.dk
 is the original author.
 This
 implementation in
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 30a4ae857d2c..ed45fe9aa0b5 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -488,7 +488,6 @@ sender_process(void)
 		for (we = mywd.wd_we; we < wend; we++) {
 			if (stat(we->we_utmp.out_line, &stb) >= 0)
 				we->we_idle = htonl(now - stb.st_atime);
-			we++;
 		}
 		(void) getloadavg(avenrun,
 		    sizeof(avenrun) / sizeof(avenrun[0]));
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index 56c6994dc516..1b66ac2a12e9 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -235,7 +235,7 @@ per-user accounting summary database
 .Xr ac 8 ,
 .Xr accton 8
 .Sh AUTHORS
-.An Chris G. Demetriou Aq cgd@postgres.berkeley.edu
+.An Chris G. Demetriou Aq Mt cgd@postgres.berkeley.edu
 .Sh CAVEATS
 While the behavior of the options in this version of
 .Nm
diff --git a/usr.sbin/service/service.8 b/usr.sbin/service/service.8
index 0c2b2d30c912..81d24a035c4a 100644
--- a/usr.sbin/service/service.8
+++ b/usr.sbin/service/service.8
@@ -132,4 +132,4 @@ utility first appeared in
 .Sh AUTHORS
 This
 manual page was written by
-.An Douglas Barton <dougb@FreeBSD.org> .
+.An Douglas Barton Aq Mt dougb@FreeBSD.org .
diff --git a/usr.sbin/service/service.sh b/usr.sbin/service/service.sh
index 8c12b8984a7c..b5fd60750d61 100755
--- a/usr.sbin/service/service.sh
+++ b/usr.sbin/service/service.sh
@@ -109,7 +109,7 @@ fi
 if [ -n "$LIST" ]; then
 	for dir in /etc/rc.d $local_startup; do
 		[ -n "$VERBOSE" ] && echo "From ${dir}:"
-		cd $dir && for file in *; do echo $file; done
+		[ -d ${dir} ] && /bin/ls -1 ${dir}
 	done
 	exit 0
 fi
diff --git a/usr.sbin/sicontrol/sicontrol.8 b/usr.sbin/sicontrol/sicontrol.8
index a3aa87a191a8..1503591ecf51 100644
--- a/usr.sbin/sicontrol/sicontrol.8
+++ b/usr.sbin/sicontrol/sicontrol.8
@@ -99,11 +99,11 @@ The
 utility is loosely based on a utility called
 .Nm siconfig
 which was written by
-.An Andy Rutter Aq andy@acronym.co.uk
+.An Andy Rutter Aq Mt andy@acronym.co.uk .
 .Pp
 Specialix International do not support this device driver in any way.
 .Sh AUTHORS
-.An Peter Wemm Aq peter@FreeBSD.org
+.An Peter Wemm Aq Mt peter@FreeBSD.org
 .Sh BUGS
 Bound to be many...
 :-)
diff --git a/usr.sbin/snapinfo/snapinfo.8 b/usr.sbin/snapinfo/snapinfo.8
index a7857fca8b47..010291ecb2c7 100644
--- a/usr.sbin/snapinfo/snapinfo.8
+++ b/usr.sbin/snapinfo/snapinfo.8
@@ -63,4 +63,4 @@ The
 utility first appeared in
 .Fx 6.1 .
 .Sh AUTHORS
-.An Mark Santcroos Aq marks@FreeBSD.org
+.An Mark Santcroos Aq Mt marks@FreeBSD.org
diff --git a/usr.sbin/sysrc/sysrc b/usr.sbin/sysrc/sysrc
index bc603b1c6998..f37a496aecad 100644
--- a/usr.sbin/sysrc/sysrc
+++ b/usr.sbin/sysrc/sysrc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #-
-# Copyright (c) 2010-2013 Devin Teske
+# Copyright (c) 2010-2014 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,7 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 #
 # Version information
 #
-SYSRC_VERSION="6.0 Nov-07,2013"
+SYSRC_VERSION="6.1 Jul-18,2014"
 
 #
 # Options
@@ -102,7 +102,7 @@ help()
 	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."
+	      "Check. Return success if set or no changes, else error."
 	f_err "$optfmt" "-d" \
 	      "Print a description of the given variable."
 	f_err "$optfmt" "-D" \
@@ -134,7 +134,7 @@ help()
 	f_err "$optfmt" "-N" \
 	      "Show only variable names, not their values."
 	f_err "$optfmt" "-q" \
-	      "Quiet. Ignore previous \`-v' and/or SYSRC_VERBOSE."
+	      "Quiet. Disable verbose and hide certain errors."
 	f_err "$optfmt" "-R dir" \
 	      "Operate within the root directory \`dir' rather than \`/'."
 	f_err "$optfmt" "-v" \
@@ -152,8 +152,6 @@ help()
 	      "Override default rc_conf_files (even if set to NULL)."
 	f_err "$envfmt" "RC_DEFAULTS" \
 	      "Location of \`/etc/defaults/rc.conf' file."
-	f_err "$envfmt" "SYSRC_VERBOSE" \
-	      "Default verbosity. Set to non-NULL to enable."
 
 	die
 }
@@ -527,7 +525,7 @@ fi
 #
 # Process command-line arguments
 #
-costatus=$SUCCESS
+status=$SUCCESS
 while [ $# -gt 0 ]; do
 	NAME="${1%%=*}"
 
@@ -558,7 +556,7 @@ while [ $# -gt 0 ]; do
 		# desire to set some value
 		#
 		if [ "$DELETE" ]; then
-			f_sysrc_delete "$NAME"
+			f_sysrc_delete "$NAME" || status=$FAILURE
 			shift 1
 			continue
 		fi
@@ -568,10 +566,23 @@ while [ $# -gt 0 ]; do
 		#
 		if [ "$CHECK_ONLY" ]; then
 			if ! IGNORED=$( f_sysrc_get "$NAME?" ); then
-				costatus=$FAILURE
-			else
-				value=$( f_sysrc_get "$NAME" )
-				[ "$value" = "${1#*=}" ] || costatus=$FAILURE
+				status=$FAILURE
+				[ "$SYSRC_VERBOSE" ] &&
+					echo "$NAME: not currently set"
+				shift 1
+				continue
+			fi
+			value=$( f_sysrc_get "$NAME" )
+			if [ "$value" != "${1#*=}" ]; then
+				status=$FAILURE
+				if [ "$SYSRC_VERBOSE" ]; then
+					echo -n "$( f_sysrc_find "$NAME" ): "
+					echo -n "$NAME: would change from "
+					echo "\`$value' to \`${1#*=}'"
+				fi
+			elif [ "$SYSRC_VERBOSE" ]; then
+				echo -n "$( f_sysrc_find "$NAME" ): "
+				echo "$NAME: already set to \`$value'"
 			fi
 			shift 1
 			continue
@@ -604,10 +615,10 @@ while [ $# -gt 0 ]; do
 		;;
 	*)
 		if ! IGNORED=$( f_sysrc_get "$NAME?" ); then
-			[ "$IGNORE_UNKNOWNS" ] ||
+			[ "$IGNORE_UNKNOWNS" -o "$QUIET" ] ||
 				echo "$pgm: unknown variable '$NAME'"
 			shift 1
-			costatus=$FAILURE
+			status=$FAILURE
 			continue
 		fi
 
@@ -631,7 +642,7 @@ while [ $# -gt 0 ]; do
 		# If `-x' or `-X' is passed, delete the variable
 		#
 		if [ "$DELETE" ]; then
-			f_sysrc_delete "$NAME"
+			f_sysrc_delete "$NAME" || status=$FAILURE
 			shift 1
 			continue
 		fi
@@ -667,7 +678,7 @@ while [ $# -gt 0 ]; do
 	shift 1
 done
 
-[ ! "$CHECK_ONLY" ] || exit $costatus
+exit $status # $SUCCESS unless error occurred with either `-c' or `-x'
 
 ################################################################################
 # END
diff --git a/usr.sbin/sysrc/sysrc.8 b/usr.sbin/sysrc/sysrc.8
index e3b873fee1a9..28d8de61e113 100644
--- a/usr.sbin/sysrc/sysrc.8
+++ b/usr.sbin/sysrc/sysrc.8
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2011-2013 Devin Teske
+.\" Copyright (c) 2011-2014 Devin Teske
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd Nov 20, 2013
+.Dd Jul 18, 2014
 .Dt SYSRC 8
 .Os
 .Sh NAME
@@ -58,11 +58,14 @@ Dump a list of all non-default configuration variables.
 Dump a list of all configuration variables
 .Pq incl. defaults .
 .It Fl c
-Check if the value will change when assigning a new value.
+Check only.
+For querying, return success if all requested variables are set
+.Pq even if NULL ,
+otherwise return error status.
+For assignments, return success if no changes are required, otherwise failure.
 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.
+prints a message stating whether variables are set and/or changes are required.
 .It Fl d
 Print a description of the given variable.
 .It Fl D
@@ -108,14 +111,12 @@ Show only variable values, not their names.
 Show only variable names, not their values.
 .It Fl q
 Quiet.
-Ignore previous occurrences of
-.Fl v
-flag.
+Disable verbose and hide certain errors.
 .It Fl R Ar dir
 Operate within the root directory
-.Pq Sq Ar dir
+.Sq Ar dir
 rather than
-.Pq Sq / .
+.Sq / .
 .It Fl v
 Verbose.
 Print the pathname of the specific
@@ -127,13 +128,13 @@ Print version information to stdout and exit.
 Remove variable(s) from specified file(s).
 .El
 .Pp
-This utility works similar to
+This utility has a similar syntax to
 .Xr sysctl 8 .
 It shares the `-e' and `-n' options
 .Pq detailed above
 and also has the same
 .Ql name[=value]
-syntax for querying/setting configuration options.
+syntax for making queries/assignments.
 .Pp
 However, while
 .Xr sysctl 8
@@ -301,8 +302,8 @@ A
 utility first appeared in
 .Fx 9.2 .
 .Sh AUTHORS
-.An Devin Teske Aq dteske@FreeBSD.org
+.An Devin Teske Aq Mt dteske@FreeBSD.org
 .Sh THANKS TO
 Brandon Gooch, Garrett Cooper, Julian Elischer, Pawel Jakub Dawidek,
-Cyrille Lefevre, Ross West, Stefan Esser, Marco Steinbach, and Jilles Tjoelker
-for suggestions and help.
+Cyrille Lefevre, Ross West, Stefan Esser, Marco Steinbach, Jilles Tjoelker,
+Allan Jude, and Lars Engels for suggestions, help, and testing.
diff --git a/usr.sbin/tcpdrop/tcpdrop.8 b/usr.sbin/tcpdrop/tcpdrop.8
index 9649dec81419..61c3f372c762 100644
--- a/usr.sbin/tcpdrop/tcpdrop.8
+++ b/usr.sbin/tcpdrop/tcpdrop.8
@@ -93,5 +93,5 @@ port 22, the port used by
 .Xr netstat 1 ,
 .Xr sockstat 1
 .Sh AUTHORS
-.An Markus Friedl Aq markus@openbsd.org
-.An Juli Mallett Aq jmallett@FreeBSD.org
+.An Markus Friedl Aq Mt markus@openbsd.org
+.An Juli Mallett Aq Mt jmallett@FreeBSD.org
diff --git a/usr.sbin/uhsoctl/uhsoctl.c b/usr.sbin/uhsoctl/uhsoctl.c
index 46a9d0aacf7a..21b62209aaad 100644
--- a/usr.sbin/uhsoctl/uhsoctl.c
+++ b/usr.sbin/uhsoctl/uhsoctl.c
@@ -601,7 +601,7 @@ at_cmd(struct ctx *ctx, const char *resp, resp_cb cb, resp_arg *ra, const char *
 	if (resp != NULL) {
 		l = strlen(resp);
 #ifdef DEBUG
-		fprintf(stderr, "SYNC_EXP: %s (%d)\n", resp, l);
+		fprintf(stderr, "SYNC_EXP: %s (%zu)\n", resp, l);
 #endif
 	}
 
diff --git a/usr.sbin/unbound/anchor/Makefile b/usr.sbin/unbound/anchor/Makefile
index 14047662b3bb..970fb705e183 100644
--- a/usr.sbin/unbound/anchor/Makefile
+++ b/usr.sbin/unbound/anchor/Makefile
@@ -11,7 +11,7 @@ PROG=	unbound-anchor
 SRCS=	unbound-anchor.c
 CFLAGS=	-I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib
 DPADD=	${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBBSDXML} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD}
-LDADD=	-lunbound -lldns -lutil -lbsdxml -lssl -lcrypto -lpthread
+LDADD=	${LDUNBOUND} ${LDLDNS} -lutil -lbsdxml -lssl -lcrypto -lpthread
 USEPRIVATELIB=	ldns
 MAN=	unbound-anchor.8
 
diff --git a/usr.sbin/unbound/checkconf/Makefile b/usr.sbin/unbound/checkconf/Makefile
index 6a588066cbd7..0993d3d5745c 100644
--- a/usr.sbin/unbound/checkconf/Makefile
+++ b/usr.sbin/unbound/checkconf/Makefile
@@ -10,7 +10,7 @@ PROG=	unbound-checkconf
 SRCS=	unbound-checkconf.c worker_cb.c
 CFLAGS=	-I${UNBOUNDDIR} -I${LDNSDIR}
 DPADD=	${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD}
-LDADD=	-lunbound -lldns -lutil -lssl -lcrypto -lpthread
+LDADD=	${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread
 USEPRIVATELIB=	ldns
 MAN=	unbound-checkconf.8
 
diff --git a/usr.sbin/unbound/control/Makefile b/usr.sbin/unbound/control/Makefile
index 7056a9e24edd..2989e739ed25 100644
--- a/usr.sbin/unbound/control/Makefile
+++ b/usr.sbin/unbound/control/Makefile
@@ -11,7 +11,7 @@ SCRIPTS=	unbound-control-setup.sh
 SRCS=	unbound-control.c worker_cb.c
 CFLAGS=	-I${UNBOUNDDIR} -I${LDNSDIR}
 DPADD=	${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD}
-LDADD=	-lunbound -lldns -lutil -lssl -lcrypto -lpthread
+LDADD=	${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread
 USEPRIVATELIB=	ldns
 MAN=	unbound-control.8
 
diff --git a/usr.sbin/unbound/daemon/Makefile b/usr.sbin/unbound/daemon/Makefile
index 0f9044f885ae..a8b1bb263865 100644
--- a/usr.sbin/unbound/daemon/Makefile
+++ b/usr.sbin/unbound/daemon/Makefile
@@ -10,7 +10,7 @@ PROG=	unbound
 SRCS=	acl_list.c cachedump.c daemon.c remote.c stats.c unbound.c worker.c
 CFLAGS=	-I${UNBOUNDDIR} -I${LDNSDIR}
 DPADD=	${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD}
-LDADD=	-lunbound -lldns -lutil -lssl -lcrypto -lpthread
+LDADD=	${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread
 USEPRIVATELIB=	ldns
 MAN=	unbound.8 unbound.conf.5
 
diff --git a/usr.sbin/unbound/local-setup/local-unbound-setup.sh b/usr.sbin/unbound/local-setup/local-unbound-setup.sh
index ca3eced13fe5..837cf9a19148 100755
--- a/usr.sbin/unbound/local-setup/local-unbound-setup.sh
+++ b/usr.sbin/unbound/local-setup/local-unbound-setup.sh
@@ -33,6 +33,7 @@
 user=""
 unbound_conf=""
 forward_conf=""
+lanzones_conf=""
 workdir=""
 confdir=""
 chrootdir=""
@@ -59,6 +60,7 @@ set_defaults() {
 	: ${confdir:=${workdir}/conf.d}
 	: ${unbound_conf:=${workdir}/unbound.conf}
 	: ${forward_conf:=${workdir}/forward.conf}
+	: ${lanzones_conf:=${workdir}/lan-zones.conf}
 	: ${anchor:=${workdir}/root.key}
 	: ${pidfile:=/var/run/local_unbound.pid}
 	: ${resolv_conf:=/etc/resolv.conf}
@@ -73,7 +75,8 @@ set_defaults() {
 #
 set_chrootdir() {
 	chrootdir="${workdir}"
-	for file in "${unbound_conf}" "${forward_conf}" "${anchor}" ; do
+	for file in "${unbound_conf}" "${forward_conf}" \
+	    "${lanzones_conf}" "${anchor}" ; do
 		if [ "${file#${workdir%/}/}" = "${file}" ] ; then
 			echo "warning: ${file} is outside ${workdir}" >&2
 			chrootdir=""
@@ -171,6 +174,7 @@ gen_resolvconf_conf() {
 #
 gen_forward_conf() {
 	echo "# Generated by $self"
+	echo "# Do not edit this file."
 	echo "forward-zone:"
 	echo "        name: ."
 	for forwarder ; do
@@ -182,6 +186,42 @@ gen_forward_conf() {
 	done
 }
 
+#
+# Generate lan-zones.conf
+#
+gen_lanzones_conf() {
+	echo "# Generated by $self"
+	echo "# Do not edit this file."
+	echo "server:"
+	echo "        # Unblock reverse lookups for LAN addresses"
+	echo "        unblock-lan-zones: yes"
+	echo "        domain-insecure: 10.in-addr.arpa."
+	echo "        domain-insecure: 127.in-addr.arpa."
+	echo "        domain-insecure: 16.172.in-addr.arpa."
+	echo "        domain-insecure: 17.172.in-addr.arpa."
+	echo "        domain-insecure: 18.172.in-addr.arpa."
+	echo "        domain-insecure: 19.172.in-addr.arpa."
+	echo "        domain-insecure: 20.172.in-addr.arpa."
+	echo "        domain-insecure: 21.172.in-addr.arpa."
+	echo "        domain-insecure: 22.172.in-addr.arpa."
+	echo "        domain-insecure: 23.172.in-addr.arpa."
+	echo "        domain-insecure: 24.172.in-addr.arpa."
+	echo "        domain-insecure: 25.172.in-addr.arpa."
+	echo "        domain-insecure: 26.172.in-addr.arpa."
+	echo "        domain-insecure: 27.172.in-addr.arpa."
+	echo "        domain-insecure: 28.172.in-addr.arpa."
+	echo "        domain-insecure: 29.172.in-addr.arpa."
+	echo "        domain-insecure: 30.172.in-addr.arpa."
+	echo "        domain-insecure: 31.172.in-addr.arpa."
+	echo "        domain-insecure: 168.192.in-addr.arpa."
+	echo "        domain-insecure: 254.169.in-addr.arpa."
+	echo "        domain-insecure: d.f.ip6.arpa."
+	echo "        domain-insecure: 8.e.ip6.arpa."
+	echo "        domain-insecure: 9.e.ip6.arpa."
+	echo "        domain-insecure: a.e.ip6.arpa."
+	echo "        domain-insecure: b.e.ip6.arpa."
+}
+
 #
 # Generate unbound.conf
 #
@@ -197,6 +237,9 @@ gen_unbound_conf() {
 	if [ -f "${forward_conf}" ] ; then
 		echo "include: ${forward_conf}"
 	fi
+	if [ -f "${lanzones_conf}" ] ; then
+		echo "include: ${lanzones_conf}"
+	fi
 	if [ -d "${confdir}" ] ; then
 		echo "include: ${confdir}/*.conf"
 	fi
@@ -322,6 +365,13 @@ main() {
 		replace "${forward_conf}" "${tmp_forward_conf}"
 	fi
 
+	#
+	# Generate lan-zones.conf.
+	#
+	local tmp_lanzones_conf=$(mktemp -u "${lanzones_conf}.XXXXX")
+	gen_lanzones_conf >"${tmp_lanzones_conf}"
+	replace "${lanzones_conf}" "${tmp_lanzones_conf}"
+
 	#
 	# Generate unbound.conf.
 	#
diff --git a/usr.sbin/usbdump/usbdump.8 b/usr.sbin/usbdump/usbdump.8
index 05ff3f9668cc..475e832cd03b 100644
--- a/usr.sbin/usbdump/usbdump.8
+++ b/usr.sbin/usbdump/usbdump.8
@@ -154,5 +154,4 @@ Optional field used for printing an error string if the packet is from USB done.
 .Sh SEE ALSO
 .Xr usbconfig 8
 .Sh AUTHORS
-.An Weongyo Jeong
-.Aq weongyo@FreeBSD.org
+.An Weongyo Jeong Aq Mt weongyo@FreeBSD.org
diff --git a/usr.sbin/utx/utx.8 b/usr.sbin/utx/utx.8
index 363a46a281d4..21794964add3 100644
--- a/usr.sbin/utx/utx.8
+++ b/usr.sbin/utx/utx.8
@@ -94,4 +94,4 @@ utility replaced
 in
 .Fx 10.0 .
 .Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
+.An Ed Schouten Aq Mt ed@FreeBSD.org
diff --git a/usr.sbin/vidcontrol/vidcontrol.1 b/usr.sbin/vidcontrol/vidcontrol.1
index a36d3780c8b7..d46bd6d71681 100644
--- a/usr.sbin/vidcontrol/vidcontrol.1
+++ b/usr.sbin/vidcontrol/vidcontrol.1
@@ -535,8 +535,9 @@ and
 categories of the
 .Em "Ports Collection" .
 .Sh AUTHORS
-.An S\(/oren Schmidt Aq sos@FreeBSD.org
-.An Sascha Wildner
+.An S\(/oren Schmidt Aq Mt sos@FreeBSD.org
+.An Sascha Wildner Aq Mt saw@online.de
 .Sh CONTRIBUTORS
-.An Maxim Sobolev Aq sobomax@FreeBSD.org ,
-.An Nik Clayton Aq nik@FreeBSD.org
+.An -split
+.An Maxim Sobolev Aq Mt sobomax@FreeBSD.org
+.An Nik Clayton Aq Mt nik@FreeBSD.org
diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c
index 2096e2abcbb6..32e4de64fbe6 100644
--- a/usr.sbin/vidcontrol/vidcontrol.c
+++ b/usr.sbin/vidcontrol/vidcontrol.c
@@ -216,11 +216,12 @@ usage(void)
 static int
 is_vt4(void)
 {
+	char vty_name[4] = "";
+	size_t len = sizeof(vty_name);
 
-	if (sysctlbyname("kern.vt.deadtimer", NULL, NULL, NULL, 0) == 0)
-		return (1);
-
-	return (0);
+	if (sysctlbyname("kern.vty", vty_name, &len, NULL, 0) != 0)
+		return (0);
+	return (strcmp(vty_name, "vt") == 0);
 }
 
 /*
diff --git a/usr.sbin/wake/wake.8 b/usr.sbin/wake/wake.8
index 53249073b6fa..4abd607f11e2 100644
--- a/usr.sbin/wake/wake.8
+++ b/usr.sbin/wake/wake.8
@@ -65,4 +65,4 @@ Ethernet host name data base.
 .Sh AUTHORS
 .Nm
 was written by
-.Ar Marc Balmer Aq marc@msys.ch .
+.Ar Marc Balmer Aq Mt marc@msys.ch .
diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile
index e8a8ea6ab698..184d33187157 100644
--- a/usr.sbin/watch/Makefile
+++ b/usr.sbin/watch/Makefile
@@ -5,7 +5,7 @@ MAN=	watch.8
 
 WARNS?=	2
 
-DPADD=	${LIBTERMCAP}
-LDADD=	-ltermcap
+DPADD=	${LIBTERMCAPW}
+LDADD=	-ltermcapw
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8
index 99c6b6feab94..052c95d49b87 100644
--- a/usr.sbin/watch/watch.8
+++ b/usr.sbin/watch/watch.8
@@ -114,7 +114,7 @@ The
 utility first appeared in
 .Fx 2.1 .
 .Sh AUTHORS
-.An Ugen J.S. Antsilevich Aq ugen@NetVision.net.il
+.An Ugen J.S. Antsilevich Aq Mt ugen@NetVision.net.il
 .Sh BUGS
 No terminal emulation is performed.
 All user output is reproduced as-is.
diff --git a/usr.sbin/watchdogd/watchdog.8 b/usr.sbin/watchdogd/watchdog.8
index 9ca9fe0ef27f..a82f6e310c29 100644
--- a/usr.sbin/watchdogd/watchdog.8
+++ b/usr.sbin/watchdogd/watchdog.8
@@ -65,9 +65,9 @@ utility appeared in
 The
 .Nm
 utility and manual page were written by
-.An Sean Kelly Aq smkelly@FreeBSD.org
+.An Sean Kelly Aq Mt smkelly@FreeBSD.org
 and
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 .Pp
 Some contributions made by
-.An Jeff Roberson Aq jeff@FreeBSD.org .
+.An Jeff Roberson Aq Mt jeff@FreeBSD.org .
diff --git a/usr.sbin/watchdogd/watchdogd.8 b/usr.sbin/watchdogd/watchdogd.8
index d50a964cb994..1d76eeeaf8d4 100644
--- a/usr.sbin/watchdogd/watchdogd.8
+++ b/usr.sbin/watchdogd/watchdogd.8
@@ -302,12 +302,12 @@ utility appeared in
 The
 .Nm
 utility and manual page were written by
-.An Sean Kelly Aq smkelly@FreeBSD.org
+.An Sean Kelly Aq Mt smkelly@FreeBSD.org
 and
-.An Poul-Henning Kamp Aq phk@FreeBSD.org .
+.An Poul-Henning Kamp Aq Mt phk@FreeBSD.org .
 .Pp
 Some contributions made by
-.An Jeff Roberson Aq jeff@FreeBSD.org .
+.An Jeff Roberson Aq Mt jeff@FreeBSD.org .
 .Pp
 The pretimeout and softtimeout action system was added by
-.An Alfred Perlstein Aq alfred@freebsd.org .
+.An Alfred Perlstein Aq Mt alfred@freebsd.org .
diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile
index 7f0304c6af15..7ab542f11386 100644
--- a/usr.sbin/wpa/hostapd/Makefile
+++ b/usr.sbin/wpa/hostapd/Makefile
@@ -46,8 +46,8 @@ CFLAGS+=-DCONFIG_DRIVER_BSD \
 CFLAGS+= -DCONFIG_IPV6
 .endif
 #CFLAGS+= -g
-DPADD+=	${LIBPCAP}
-LDADD+=	-lpcap
+DPADD+=	${LIBPCAP} ${LIBUTIL}
+LDADD+=	-lpcap -lutil
 
 # User customizations for wpa_supplicant/hostapd build environment
 CFLAGS+=${HOSTAPD_CFLAGS}
diff --git a/usr.sbin/wpa/hostapd/hostapd.8 b/usr.sbin/wpa/hostapd/hostapd.8
index f624cac03e52..9edbd65438c3 100644
--- a/usr.sbin/wpa/hostapd/hostapd.8
+++ b/usr.sbin/wpa/hostapd/hostapd.8
@@ -129,7 +129,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
 This manual page is derived from the
 .Pa README
 file included in the
diff --git a/usr.sbin/wpa/hostapd/hostapd.conf.5 b/usr.sbin/wpa/hostapd/hostapd.conf.5
index 08a04fe9282c..e166f365745c 100644
--- a/usr.sbin/wpa/hostapd/hostapd.conf.5
+++ b/usr.sbin/wpa/hostapd/hostapd.conf.5
@@ -208,4 +208,4 @@ and
 files in the
 .Nm hostapd
 distribution provided by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
diff --git a/usr.sbin/wpa/hostapd_cli/Makefile b/usr.sbin/wpa/hostapd_cli/Makefile
index 8677fbfb2f86..3542aacfdfdd 100644
--- a/usr.sbin/wpa/hostapd_cli/Makefile
+++ b/usr.sbin/wpa/hostapd_cli/Makefile
@@ -10,6 +10,9 @@ SRCS=	common.c edit.c eloop.c hostapd_cli.c os_unix.c wpa_ctrl.c wpa_debug.c
 CFLAGS+= -DCONFIG_CTRL_IFACE
 CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
 
+DPADD+=	${LIBUTIL}
+LDADD+=	-lutil
+
 MAN=	hostapd_cli.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/hostapd_cli/hostapd_cli.8 b/usr.sbin/wpa/hostapd_cli/hostapd_cli.8
index eb7f60f028a6..605a7f5d2a94 100644
--- a/usr.sbin/wpa/hostapd_cli/hostapd_cli.8
+++ b/usr.sbin/wpa/hostapd_cli/hostapd_cli.8
@@ -104,7 +104,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
 This manual page is derived from the
 .Pa README
 file included in the
diff --git a/usr.sbin/wpa/ndis_events/ndis_events.8 b/usr.sbin/wpa/ndis_events/ndis_events.8
index 44ce6b9bca71..bf11c1943fec 100644
--- a/usr.sbin/wpa/ndis_events/ndis_events.8
+++ b/usr.sbin/wpa/ndis_events/ndis_events.8
@@ -132,4 +132,4 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Bill Paul Aq wpaul@windriver.com .
+.An Bill Paul Aq Mt wpaul@windriver.com .
diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile
index da2532505b3b..93a1ba7ca063 100644
--- a/usr.sbin/wpa/wpa_cli/Makefile
+++ b/usr.sbin/wpa/wpa_cli/Makefile
@@ -15,7 +15,7 @@ CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
 CFLAGS+= -D_DIRENT_HAVE_D_TYPE
 
 CFLAGS+= -DCONFIG_READLINE -I${DESTDIR}/${INCLUDEDIR}/edit
-LDADD+= -ledit -ltermcap
-DPADD+= ${LIBEDIT} ${LIBTERMCAP}
+LDADD+= -ledit -ltermcapw -lutil
+DPADD+= ${LIBEDIT} ${LIBTERMCAPW} ${LIBUTIL}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/wpa_cli/wpa_cli.8 b/usr.sbin/wpa/wpa_cli/wpa_cli.8
index fdb24fc49f0f..a2bf189a3f8c 100644
--- a/usr.sbin/wpa/wpa_cli/wpa_cli.8
+++ b/usr.sbin/wpa/wpa_cli/wpa_cli.8
@@ -214,7 +214,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
 This manual page is derived from the
 .Pa README
 file included in the
diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile b/usr.sbin/wpa/wpa_passphrase/Makefile
index 16321c42a210..d0f51985ba79 100644
--- a/usr.sbin/wpa/wpa_passphrase/Makefile
+++ b/usr.sbin/wpa/wpa_passphrase/Makefile
@@ -11,6 +11,9 @@ SRCS=	common.c md5-internal.c md5.c os_unix.c sha1-internal.c sha1-pbkdf2.c sha1
 CFLAGS+= -DINTERNAL_SHA1
 CFLAGS+= -DINTERNAL_MD5
 
+DPADD+=	${LIBUTIL}
+LDADD+=	-lutil
+
 MAN=	wpa_passphrase.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8 b/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8
index c66d658d31ae..b661a792dd73 100644
--- a/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8
+++ b/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8
@@ -55,12 +55,11 @@ The
 utility first appeared in
 .Fx 6.3 .
 .Sh AUTHORS
+.An -nosplit
 The
 .Nm
 utility was written by
-.An Jouni Malinen
-.Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
 .Pp
 This manual page was written by
-.An Henrik Brix Andersen
-.Aq henrik@brixandersen.dk .
+.An Henrik Brix Andersen Aq Mt henrik@brixandersen.dk .
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 11cccf3ee492..673a04d27a7c 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -49,8 +49,8 @@ CFLAGS+=-DCONFIG_BACKEND_FILE \
 	-DCONFIG_GAS \
 	-DPKCS12_FUNCS
 #CFLAGS+= -g
-DPADD+=	${LIBPCAP}
-LDADD+=	-lpcap
+DPADD+=	${LIBPCAP} ${LIBUTIL}
+LDADD+=	-lpcap -lutil
 
 # User customizations to the wpa_supplicant build environment
 CFLAGS+=${WPA_SUPPLICANT_CFLAGS}
diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8
index 466759dd2e61..fe9fdce4f7fa 100644
--- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8
+++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8
@@ -176,7 +176,7 @@ utility first appeared in
 The
 .Nm
 utility was written by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
 This manual page is derived from the
 .Pa README
 file included in the
diff --git a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5 b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
index 5d6914fccb9d..94e3100bcab4 100644
--- a/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
+++ b/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
@@ -575,4 +575,4 @@ and
 files in the
 .Nm wpa_supplicant
 distribution provided by
-.An Jouni Malinen Aq j@w1.fi .
+.An Jouni Malinen Aq Mt j@w1.fi .
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.8 b/usr.sbin/yp_mkdb/yp_mkdb.8
index 125123519c05..2689f292332c 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.8
+++ b/usr.sbin/yp_mkdb/yp_mkdb.8
@@ -206,4 +206,4 @@ to build the NIS databases
 .Xr db 3 ,
 .Xr ypserv 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8
index 34ce2175a9f1..acd20eb06273 100644
--- a/usr.sbin/ypbind/ypbind.8
+++ b/usr.sbin/ypbind/ypbind.8
@@ -199,4 +199,4 @@ ypbind startup options are specified
 .Xr ypserv 8 ,
 .Xr ypset 8
 .Sh AUTHORS
-.An Theo de Raadt Aq deraadt@fsa.ca
+.An Theo de Raadt Aq Mt deraadt@fsa.ca
diff --git a/usr.sbin/yppush/yppush.8 b/usr.sbin/yppush/yppush.8
index 1acac3f7fc97..b82c8f72a258 100644
--- a/usr.sbin/yppush/yppush.8
+++ b/usr.sbin/yppush/yppush.8
@@ -171,7 +171,7 @@ a particular NIS domain
 .Xr ypserv 8 ,
 .Xr ypxfr 8
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
 .Sh BUGS
 The mechanism for transferring NIS maps in NIS v1 is different
 than that in NIS version 2.
diff --git a/usr.sbin/ypserv/ypinit.8 b/usr.sbin/ypserv/ypinit.8
index 524ec5ee4c12..e161a4a21f41 100644
--- a/usr.sbin/ypserv/ypinit.8
+++ b/usr.sbin/ypserv/ypinit.8
@@ -191,8 +191,8 @@ It first appeared in
 .Sh AUTHORS
 .An -nosplit
 The original script was written by
-.An Mats O Jansson Aq moj@stacken.kth.se .
+.An Mats O Jansson Aq Mt moj@stacken.kth.se .
 It was modified for
 .Fx
 by
-.An Bill Paul Aq wpaul@ctr.columbia.edu .
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu .
diff --git a/usr.sbin/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv.8
index b212c49805c0..f255118179e3 100644
--- a/usr.sbin/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv.8
@@ -460,4 +460,4 @@ This version of
 first appeared in
 .Fx 2.2 .
 .Sh AUTHORS
-.An Bill Paul Aq wpaul@ctr.columbia.edu
+.An Bill Paul Aq Mt wpaul@ctr.columbia.edu
diff --git a/usr.sbin/zzz/zzz.8 b/usr.sbin/zzz/zzz.8
index 583d5fd963ae..365950f64389 100644
--- a/usr.sbin/zzz/zzz.8
+++ b/usr.sbin/zzz/zzz.8
@@ -62,4 +62,4 @@ will be issued.
 .Xr apm 8
 .Sh AUTHORS
 This manual page was written by
-.An Nate Lawson Aq njl@FreeBSD.org .
+.An Nate Lawson Aq Mt njl@FreeBSD.org .